From 232f20100706b9d93c5e081f670d7daf44b892fd Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Sun, 23 Feb 2020 17:02:08 +0100
Subject: [PATCH 001/888] Merge remote-tracking branch 'Dolibarr/11.0' into 11

---
 htdocs/compta/facture/class/facture.class.php        |  9 +++++++++
 htdocs/core/lib/pdf.lib.php                          |  2 +-
 htdocs/cron/class/cronjob.class.php                  |  4 ++--
 .../framework/Luracast/Restler/AutoLoader.php        |  8 +-------
 .../framework/Luracast/Restler/CommentParser.php     | 12 ++++++------
 .../framework/Luracast/Restler/Format/XmlFormat.php  |  2 +-
 .../restler/framework/Luracast/Restler/Resources.php |  6 +++---
 .../restler/framework/Luracast/Restler/Restler.php   |  4 ++--
 .../restler/framework/Luracast/Restler/Routes.php    |  6 +++---
 .../restler/framework/Luracast/Restler/Scope.php     |  2 +-
 .../restler/framework/Luracast/Restler/UI/Emmet.php  |  4 ++--
 htdocs/projet/element.php                            |  2 +-
 htdocs/theme/eldy/global.inc.php                     |  2 +-
 13 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index d4a7efd3cf4..99cc638c36f 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1156,6 +1156,14 @@ class Facture extends CommonInvoice
 			$line->date_start = $object->lines[$i]->date_start;
 			$line->date_end = $object->lines[$i]->date_end;
 
+			// Multicurrency
+			$line->fk_multicurrency = $object->lines[$i]->fk_multicurrency;
+			$line->multicurrency_code = $object->lines[$i]->multicurrency_code;
+			$line->multicurrency_subprice = $object->lines[$i]->multicurrency_subprice;
+			$line->multicurrency_total_ht = $object->lines[$i]->multicurrency_total_ht;
+			$line->multicurrency_total_tva = $object->lines[$i]->multicurrency_total_tva;
+			$line->multicurrency_total_ttc = $object->lines[$i]->multicurrency_total_ttc;
+
 			$line->fk_fournprice = $object->lines[$i]->fk_fournprice;
 			$marginInfos			= getMarginInfos($object->lines[$i]->subprice, $object->lines[$i]->remise_percent, $object->lines[$i]->tva_tx, $object->lines[$i]->localtax1_tx, $object->lines[$i]->localtax2_tx, $object->lines[$i]->fk_fournprice, $object->lines[$i]->pa_ht);
 			$line->pa_ht			= $marginInfos[0];
@@ -1170,6 +1178,7 @@ class Facture extends CommonInvoice
 
 		$this->socid                = $object->socid;
 		$this->fk_project           = $object->fk_project;
+		$this->fk_account = $object->fk_account;
 		$this->cond_reglement_id    = $object->cond_reglement_id;
 		$this->mode_reglement_id    = $object->mode_reglement_id;
 		$this->availability_id      = $object->availability_id;
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index a5ba08bb139..59035258c74 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1401,7 +1401,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		foreach ($tblcateg as $cate)
 		{
 			// Adding the descriptions if they are filled
-			$desccateg = $cate->add_description;
+			$desccateg = $cate->description;
 			if ($desccateg)
 				$libelleproduitservice .= '__N__'.$desccateg;
 		}
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 5cde792bbb5..6139f157f8a 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -1320,9 +1320,9 @@ class Cronjob extends CommonObject
 			if ($processing) $moretext = ' ('.$langs->trans("Running").')';
 			elseif ($lastresult) $moretext .= ' ('.$langs->trans("Error").')';
 
-			$this->labelStatus[self::STATUS_DISABLED] = $langs->trans('Draft').$moretext;
+			$this->labelStatus[self::STATUS_DISABLED] = $langs->trans('Disabled').$moretext;
 			$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Enabled').$moretext;
-			$this->labelStatusShort[self::STATUS_DISABLED] = $langs->trans('Draft');
+			$this->labelStatusShort[self::STATUS_DISABLED] = $langs->trans('Disabled');
 			$this->labelStatusShort[self::STATUS_ENABLED] = $langs->trans('Enabled');
 		}
 
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php b/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
index eff8bb61f29..d8445fdc70c 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
@@ -263,13 +263,7 @@ class AutoLoader
      * @return bool false unless className now exists
      */
     private function loadLastResort($className, $loader = null) {
-    	// @CHANGE LDR Add protection to avoid conflict with other autoloader
-    	/*print 'Try to load '.$className."\n";
-    	 if (in_array($className, array('Google_Client')))
-    	 {
-    	 return false;
-    	 }*/
-    	$loaders = array_unique(static::$rogueLoaders);
+        $loaders = array_unique(static::$rogueLoaders);
         if (isset($loader)) {
             if (false === array_search($loader, $loaders))
                 static::$rogueLoaders[] = $loader;
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php b/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php
index e8248a385fa..2815f1f6c70 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php
@@ -159,7 +159,7 @@ class CommentParser
                     $addNewline = true;
                 }
                 continue;
-            } elseif ($line{0} == '@') {
+            } elseif ($line[0] == '@') {
                 $mode = 2;
                 $newParam = true;
             }
@@ -353,7 +353,7 @@ class CommentParser
                     $data = $format->decode($str);
                 }
             } else { // auto detect
-                if ($str{0} == '{') {
+                if ($str[0] == '{') {
                     $d = json_decode($str, true);
                     if (json_last_error() != JSON_ERROR_NONE) {
                         throw new Exception('Error parsing embedded JSON data'
@@ -445,7 +445,7 @@ class CommentParser
     {
         $r = array();
         $email = end($value);
-        if ($email{0} == '<') {
+        if ($email[0] == '<') {
             $email = substr($email, 1, -1);
             array_pop($value);
             $r['email'] = $email;
@@ -470,7 +470,7 @@ class CommentParser
         $data = array_shift($value);
         if (empty($data)) {
             $r['type'] = 'mixed';
-        } elseif ($data{0} == '$') {
+        } elseif ($data[0] == '$') {
             $r['name'] = substr($data, 1);
             $r['type'] = 'mixed';
         } else {
@@ -478,7 +478,7 @@ class CommentParser
             $r['type'] = count($data) == 1 ? $data[0] : $data;
 
             $data = array_shift($value);
-            if (!empty($data) && $data{0} == '$') {
+            if (!empty($data) && $data[0] == '$') {
                 $r['name'] = substr($data, 1);
             }
         }
@@ -498,7 +498,7 @@ class CommentParser
         $data = array_shift($value);
         if (empty($data)) {
             $r['type'] = 'mixed';
-        } elseif ($data{0} == '$') {
+        } elseif ($data[0] == '$') {
             $r['name'] = substr($data, 1);
             $r['type'] = 'mixed';
         } else {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php
index b51fa707a53..ceec32e4cb5 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php
@@ -221,7 +221,7 @@ class XmlFormat extends Format
                 $namespaces = $xml->getNamespaces();
                 if (count($namespaces)) {
                     $p = strpos($data, $xml->getName());
-                    if ($p && $data{$p - 1} == ':') {
+                    if ($p && $data[$p - 1] == ':') {
                         $s = strpos($data, '<') + 1;
                         $prefix = substr($data, $s, $p - $s - 1);
                         static::$namespacedProperties[static::$rootName] = $prefix;
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Resources.php b/htdocs/includes/restler/framework/Luracast/Restler/Resources.php
index 43e95fa02be..2986968a990 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Resources.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Resources.php
@@ -198,7 +198,7 @@ class Resources implements iUseAuthentication, iProvideMultiVersionApi
         } elseif (false !== ($pos = strpos($id, '-v'))) {
             //$version = intval(substr($id, $pos + 2));
             $id = substr($id, 0, $pos);
-        } elseif ($id{0} == 'v' && is_numeric($v = substr($id, 1))) {
+        } elseif ($id[0] == 'v' && is_numeric($v = substr($id, 1))) {
             $id = '';
             //$version = $v;
         } elseif ($id == 'root' || $id == 'index') {
@@ -233,7 +233,7 @@ class Resources implements iUseAuthentication, iProvideMultiVersionApi
                 if ($tSlash) {
                     if ($fLen != $tLen && !Text::beginsWith($fullPath, $target . '/'))
                         continue;
-                } elseif ($fLen > $tLen + 1 && $fullPath{$tLen + 1} != '{' && !Text::beginsWith($fullPath, '{')) {
+                } elseif ($fLen > $tLen + 1 && $fullPath[$tLen + 1] != '{' && !Text::beginsWith($fullPath, '{')) {
                     //when mapped to root exclude paths that have static parts
                     //they are listed else where under that static part name
                     continue;
@@ -275,7 +275,7 @@ class Resources implements iUseAuthentication, iProvideMultiVersionApi
                 if (count($parts) == 1 && $httpMethod == 'GET') {
                 } else {
                     for ($i = 0; $i < count($parts); $i++) {
-                        if (strlen($parts[$i]) && $parts[$i]{0} == '{') {
+                        if (strlen($parts[$i]) && $parts[$i][0] == '{') {
                             $pos = $i - 1;
                             break;
                         }
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Restler.php b/htdocs/includes/restler/framework/Luracast/Restler/Restler.php
index c2e9b1acb73..fcb5388726c 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Restler.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Restler.php
@@ -533,7 +533,7 @@ class Restler extends EventDispatcher
             rtrim($path, '/') //remove trailing slash if found
         );
 
-        if (Defaults::$useUrlBasedVersioning && strlen($path) && $path{0} == 'v') {
+        if (Defaults::$useUrlBasedVersioning && strlen($path) && $path[0] == 'v') {
             $version = intval(substr($path, 1));
             if ($version && $version <= $this->apiVersion) {
                 $this->requestedApiVersion = $version;
@@ -1599,7 +1599,7 @@ class Restler extends EventDispatcher
      */
     public function __get($name)
     {
-        if ($name{0} == '_') {
+        if ($name[0] == '_') {
             $hiddenProperty = substr($name, 1);
             if (isset($this->$hiddenProperty)) {
                 return $this->$hiddenProperty;
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Routes.php b/htdocs/includes/restler/framework/Luracast/Restler/Routes.php
index 73e78dc0039..999094dec4c 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Routes.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Routes.php
@@ -87,7 +87,7 @@ class Routes
         foreach ($methods as $method) {
             $methodUrl = strtolower($method->getName());
             //method name should not begin with _
-            if ($methodUrl{0} == '_') {
+            if ($methodUrl[0] == '_') {
                 continue;
             }
             $doc = $method->getDocComment();
@@ -330,7 +330,7 @@ class Routes
         if (!$type) {
             return 's';
         }
-        switch ($type{0}) {
+        switch ($type[0]) {
             case 'i':
             case 'f':
                 return 'n';
@@ -428,7 +428,7 @@ class Routes
                     }
                     $index = intval(substr($k, 1));
                     $details = $value[$httpMethod]['metadata']['param'][$index];
-                    if ($k{0} == 's' || strpos($k, static::pathVarTypeOf($v)) === 0) {
+                    if ($k[0] == 's' || strpos($k, static::pathVarTypeOf($v)) === 0) {
                         //remove the newlines
                         $data[$details['name']] = trim($v, PHP_EOL);
                     } else {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Scope.php b/htdocs/includes/restler/framework/Luracast/Restler/Scope.php
index 251262017c3..16ccdd33561 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Scope.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Scope.php
@@ -203,7 +203,7 @@ class Scope
 
         $divider = '\\';
         $qualified = false;
-        if ($className{0} == $divider) {
+        if ($className[0] == $divider) {
             $qualified = trim($className, $divider);
         } elseif (array_key_exists($className, $scope)) {
             $qualified = $scope[$className];
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php b/htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php
index abd4a3a73ba..435804b4469 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php
@@ -356,7 +356,7 @@ class Emmet
             $pos = strpos($string, $f, $start);
             $tokens = array();
             for ($i = $start; $i < $pos; $i++) {
-                $token = $string{$i};
+                $token = $string[$i];
                 if (('#' == $token || '.' == $token) &&
                     (!empty($tokens) || $i == 0)
                 ) {
@@ -368,7 +368,7 @@ class Emmet
             $r[] = $f;
         } while (false != ($f = strtok(static::DELIMITERS)));
         for ($i = $pos; $i < strlen($string); $i++) {
-            $token = $string{$i};
+            $token = $string[$i];
             $r[] = $tokens[] = $token;
         }
         return $r;
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 46cf12356c5..ffd083d2359 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -606,7 +606,7 @@ foreach ($listofreferent as $key => $value)
 
 		$elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee, !empty($project_field)?$project_field:'fk_projet');
 
-		if (count($elementarray)>0 && is_array($elementarray))
+		if (is_array($elementarray) && count($elementarray) > 0)
 		{
 			$total_ht = 0;
 			$total_ttc = 0;
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index fa4f751d6a6..2eebcb19a6b 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1297,7 +1297,7 @@ div.fichetwothirdright {
 	<?php if ($conf->browser->layout == 'phone') { print "padding-bottom: 6px\n"; } ?>
 }
 div.fichetwothirdright div.ficheaddleft {
-    padding-left: 20px;
+    padding-<?php echo $left; ?>: 20px;
 }
 div.fichehalfleft {
 	<?php if ($conf->browser->layout != 'phone') { print "float: ".$left.";\n"; } ?>

From 8320546641a3cadeb16712cd15213ed04b66ea08 Mon Sep 17 00:00:00 2001
From: davidNDU <david.bensel@gmail.com>
Date: Fri, 9 Oct 2020 16:28:11 +0300
Subject: [PATCH 002/888] Fix: Module Builder creation and listing of events

---
 htdocs/modulebuilder/template/myobject_agenda.php | 7 ++++---
 htdocs/modulebuilder/template/myobject_card.php   | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index e05b4e93491..ce17b93a660 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -223,13 +223,14 @@ if ($object->id > 0)
 	$objthirdparty = $object;
 	$objcon = new stdClass();
 
-	$out = '&origin='.$object->element.'&originid='.$object->id;
+	$out = '&amp;origin='.$object->element.'%40'.$object->module.'&amp;originid='.$object->id;
+	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
+	$out .= '&amp;backtopage='.urlencode($urlbacktopage);
 	$permok = $user->rights->agenda->myactions->create;
 	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
 	{
-		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
 		if (get_class($objthirdparty) == 'Societe') $out .= '&amp;socid='.$objthirdparty->id;
-		$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage=1&amp;percentage=-1';
+		$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;percentage=-1';
 		//$out.=$langs->trans("AddAnAction").' ';
 		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
 		//$out.="</a>";
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 49841fe24b9..1dacbcaac87 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -569,7 +569,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 		$formactions = new FormActions($db);
-		$somethingshown = $formactions->showactions($object, $object->element.'@mymodule', (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlright);
+		$somethingshown = $formactions->showactions($object, $object->element.'@'.$object->module, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlright);
 
 		print '</div></div></div>';
 	}

From 7c2b5b614f63611e8cfc28cbdfb7977f3054ef2e Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Sun, 25 Oct 2020 19:13:09 +0100
Subject: [PATCH 003/888] NEW: preload product description on selection for
 customer propal/order/invoice

---
 htdocs/comm/propal/card.php               |  7 +++-
 htdocs/commande/card.php                  |  5 +++
 htdocs/compta/facture/card.php            |  5 +++
 htdocs/contrat/card.php                   |  6 ++++
 htdocs/core/tpl/objectline_create.tpl.php | 40 ++++++++++++++++-------
 htdocs/fourn/facture/card.php             |  5 +++
 htdocs/product/ajax/products.php          | 35 ++++++++++++++++++--
 7 files changed, 87 insertions(+), 16 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 4a4cf3c37dd..3a9fc38fbaf 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -995,11 +995,16 @@ if (empty($reshook))
 						$outputlangs->setDefaultLang($newlang);
 					}
 
-					$desc = (!empty($prod->multilangs [$outputlangs->defaultlang] ["description"])) ? $prod->multilangs [$outputlangs->defaultlang] ["description"] : $prod->description;
+					$desc = (!empty($prod->multilangs[$outputlangs->defaultlang]["description"])) ? $prod->multilangs[$outputlangs->defaultlang]["description"] : $prod->description;
 				} else {
 					$desc = $prod->description;
 				}
 
+				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
+				if ($product_desc==$desc) {
+					$product_desc='';
+				}
+
 				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) $desc = $product_desc;
 				else $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
 
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 596fe4e94bc..585b85def0b 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -854,6 +854,11 @@ if (empty($reshook))
 					$desc = $prod->description;
 				}
 
+				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
+				if ($product_desc==$desc) {
+					$product_desc='';
+				}
+
 				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) $desc = $product_desc;
 				else $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
 
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 94f817114aa..6b56d39ba3f 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2068,6 +2068,11 @@ if (empty($reshook))
 					$desc = $prod->description;
 				}
 
+				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
+				if ($product_desc==$desc) {
+					$product_desc='';
+				}
+
 				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) $desc = $product_desc;
 				else $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
 
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 64b3275379a..f3dc0355331 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -499,6 +499,12 @@ if (empty($reshook))
 				}
 
 			   	$desc = $prod->description;
+
+				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
+				if ($product_desc==$desc) {
+					$product_desc='';
+				}
+
 			   	if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) $desc = $product_desc;
 				else $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
 
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index d177ce7637c..ec73bf9725b 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -514,13 +514,13 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 	<?php
 	if (!empty($conf->global->DISPLAY_MARGIN_RATES)) { ?>
 		$("input[name='np_marginRate']:first").blur(function(e) {
-		return checkFreeLine(e, "np_marginRate");
+			return checkFreeLine(e, "np_marginRate");
 		});
 		<?php
 	}
 	if (!empty($conf->global->DISPLAY_MARK_RATES)) { ?>
 		$("input[name='np_markRate']:first").blur(function(e) {
-		return checkFreeLine(e, "np_markRate");
+			return checkFreeLine(e, "np_markRate");
 		});
 		<?php
 	}
@@ -535,21 +535,21 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 
 	var rate = $("input[name='"+npRate+"']:first");
 	if (rate.val() == '')
-	return true;
+		return true;
 
 	if (! $.isNumeric(rate.val().replace(',','.')))
 	{
-	alert('<?php echo dol_escape_js($langs->trans("rateMustBeNumeric")); ?>');
-	e.stopPropagation();
-	setTimeout(function () { rate.focus() }, 50);
-	return false;
+		alert('<?php echo dol_escape_js($langs->trans("rateMustBeNumeric")); ?>');
+		e.stopPropagation();
+		setTimeout(function () { rate.focus() }, 50);
+		return false;
 	}
 	if (npRate == "np_markRate" && rate.val() >= 100)
 	{
-	alert('<?php echo dol_escape_js($langs->trans("markRateShouldBeLesserThan100")); ?>');
-	e.stopPropagation();
-	setTimeout(function () { rate.focus() }, 50);
-	return false;
+		alert('<?php echo dol_escape_js($langs->trans("markRateShouldBeLesserThan100")); ?>');
+		e.stopPropagation();
+		setTimeout(function () { rate.focus() }, 50);
+		return false;
 	}
 
 	var price = 0;
@@ -659,7 +659,6 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 			?>
 			var pbq = parseInt($('option:selected', this).attr('data-pbq'));	/* If product was selected with a HTML select */
 			if (isNaN(pbq)) { pbq = jQuery('#idprod').attr('data-pbq'); } 		/* If product was selected with a HTML input with autocomplete */
-			//console.log(pbq);
 
 			if ((jQuery('#idprod').val() > 0 || jQuery('#idprodfournprice').val()) && ! isNaN(pbq) && pbq > 0)
 			{
@@ -675,6 +674,23 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 					function(data) {
 						console.log("Load unit price end, we got value "+data.price_ht);
 						jQuery("#price_ht").val(data.price_ht);
+						<?php if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) { ?>
+						var proddesc = data.desc_trans;
+						<?php } else { ?>
+						var proddesc = data.desc;
+						<?php } ?>
+						console.log("Load desciption into text area : "+proddesc);
+						<?php if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) { ?>
+						if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined")
+						{
+							var editor = CKEDITOR.instances['dp_desc'];
+							if (editor) {
+								editor.setData(proddesc);
+							}
+						}
+						<?php } else { ?>
+						jQuery('#dp_desc').text(proddesc);
+						<?php } ?>
 					},
 					'json'
 				);
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 542a4a09274..45fb10b525a 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1294,6 +1294,11 @@ if (empty($reshook))
 					$desc = $productsupplier->desc_supplier;
 				} else $desc = $productsupplier->description;
 
+				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
+				if ($product_desc==$desc) {
+					$product_desc='';
+				}
+
 				if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
 
 				$type = $productsupplier->type;
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 7441d88abc0..273eef35300 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -71,7 +71,9 @@ if (!empty($action) && $action == 'fetch' && !empty($id))
 	{
 		$outref = $object->ref;
 		$outlabel = $object->label;
+		$outlabel_trans ='';
 		$outdesc = $object->description;
+		$outdesc_trans ='';
 		$outtype = $object->type;
 		$outqty = 1;
 		$outdiscount = 0;
@@ -79,10 +81,25 @@ if (!empty($action) && $action == 'fetch' && !empty($id))
 		$found = false;
 
 		$price_level = 1;
-		if ($socid > 0 && !empty($conf->global->PRODUIT_MULTIPRICES)) {
+
+		if ($socid > 0) {
 			$thirdpartytemp = new Societe($db);
 			$thirdpartytemp->fetch($socid);
-			$price_level = $thirdpartytemp->price_level;
+			//Load translation description and label
+			if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+				$newlang = $thirdpartytemp->default_lang;
+
+				if (!empty($newlang)) {
+					$outputlangs = new Translate("", $conf);
+					$outputlangs->setDefaultLang($newlang);
+					$outdesc_trans = (!empty($object->multilangs[$outputlangs->defaultlang]["description"])) ? $object->multilangs[$outputlangs->defaultlang]["description"] : $object->description;
+					$outlabel_trans = (!empty($object->multilangs[$outputlangs->defaultlang]["label"])) ? $object->multilangs[$outputlangs->defaultlang]["label"] : $object->label;
+				}
+			}
+
+			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+				$price_level = $thirdpartytemp->price_level;
+			}
 		}
 
 		// Price by qty
@@ -158,7 +175,19 @@ if (!empty($action) && $action == 'fetch' && !empty($id))
 			$outtva_tx = $object->tva_tx;
 		}
 
-		$outjson = array('ref' => $outref, 'label' => $outlabel, 'desc' => $outdesc, 'type' => $outtype, 'price_ht' => $outprice_ht, 'price_ttc' => $outprice_ttc, 'pricebasetype' => $outpricebasetype, 'tva_tx' => $outtva_tx, 'qty' => $outqty, 'discount' => $outdiscount);
+		$outjson = array(
+			'ref' => $outref,
+			'label' => $outlabel,
+			'label_trans' => $outlabel_trans,
+			'desc' => $outdesc,
+			'desc_trans' => $outdesc_trans,
+			'type' => $outtype,
+			'price_ht' => $outprice_ht,
+			'price_ttc' => $outprice_ttc,
+			'pricebasetype' => $outpricebasetype,
+			'tva_tx' => $outtva_tx,
+			'qty' => $outqty,
+			'discount' => $outdiscount);
 	}
 
 	echo json_encode($outjson);

From 925dfd36b5d4559a9075c218d40250fde8ff39ea Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Sun, 25 Oct 2020 19:15:10 +0100
Subject: [PATCH 004/888] syntax

---
 htdocs/fourn/facture/card.php    | 5 -----
 htdocs/product/ajax/products.php | 9 +++++----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 45fb10b525a..542a4a09274 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1294,11 +1294,6 @@ if (empty($reshook))
 					$desc = $productsupplier->desc_supplier;
 				} else $desc = $productsupplier->description;
 
-				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
-				if ($product_desc==$desc) {
-					$product_desc='';
-				}
-
 				if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
 
 				$type = $productsupplier->type;
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 273eef35300..c2b698c8e04 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -85,6 +85,11 @@ if (!empty($action) && $action == 'fetch' && !empty($id))
 		if ($socid > 0) {
 			$thirdpartytemp = new Societe($db);
 			$thirdpartytemp->fetch($socid);
+
+			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+				$price_level = $thirdpartytemp->price_level;
+			}
+
 			//Load translation description and label
 			if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 				$newlang = $thirdpartytemp->default_lang;
@@ -96,10 +101,6 @@ if (!empty($action) && $action == 'fetch' && !empty($id))
 					$outlabel_trans = (!empty($object->multilangs[$outputlangs->defaultlang]["label"])) ? $object->multilangs[$outputlangs->defaultlang]["label"] : $object->label;
 				}
 			}
-
-			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
-				$price_level = $thirdpartytemp->price_level;
-			}
 		}
 
 		// Price by qty

From 76824c868bdadc3268cfab95a4b49820bfaa224d Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 26 Oct 2020 16:31:07 +0100
Subject: [PATCH 005/888] clean get price for fourn and labal for supplier
 coducment

---
 htdocs/core/class/html.form.class.php     | 30 +++++++-
 htdocs/core/lib/ajax.lib.php              | 40 ++++++++---
 htdocs/core/tpl/objectline_create.tpl.php | 83 +++++++++++++++++------
 htdocs/fourn/commande/card.php            |  4 +-
 htdocs/fourn/facture/card.php             |  2 +-
 htdocs/product/fournisseurs.php           |  2 +-
 6 files changed, 127 insertions(+), 34 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index bf52ff5871a..397d1a008cf 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2737,6 +2737,12 @@ class Form
 		$sql .= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.remise_percent, pfp.remise, pfp.unitprice,";
 		$sql .= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, pfp.fk_soc, s.nom as name,";
 		$sql .= " pfp.supplier_reputation";
+		// if we use supplier description of the products
+		if (!empty($conf->global->PRODUIT_FOURN_TEXTS)) {
+			$sql .= " ,pfp.desc_fourn as description";
+		} else {
+			$sql .= " ,p.description";
+		}
 		// Units
 		if ($conf->global->PRODUCT_USE_UNITS) {
 			$sql .= ", u.label as unit_long, u.short_label as unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units";
@@ -2766,7 +2772,11 @@ class Form
 			foreach ($scrit as $crit)
 			{
 				if ($i > 0) $sql .= " AND ";
-				$sql .= "(pfp.ref_fourn LIKE '".$this->db->escape($prefix.$crit)."%' OR p.ref LIKE '".$this->db->escape($prefix.$crit)."%' OR p.label LIKE '".$this->db->escape($prefix.$crit)."%')";
+				$sql .= "(pfp.ref_fourn LIKE '".$this->db->escape($prefix.$crit)."%' OR p.ref LIKE '".$this->db->escape($prefix.$crit)."%' OR p.label LIKE '".$this->db->escape($prefix.$crit)."%'";
+				if (!empty($conf->global->PRODUIT_FOURN_TEXTS)) {
+					$sql .= " OR pfp.desc_fourn LIKE '".$this->db->escape($prefix.$crit)."%'";
+				}
+				$sql .= ")";
 				$i++;
 			}
 			if (count($scrit) > 1) $sql .= ")";
@@ -2956,8 +2966,9 @@ class Form
 				if (empty($objp->idprodfournprice) && empty($alsoproductwithnosupplierprice)) $opt .= ' disabled';
 				if (!empty($objp->idprodfournprice) && $objp->idprodfournprice > 0)
 				{
-					$opt .= ' pbq="'.$objp->idprodfournprice.'" data-pbq="'.$objp->idprodfournprice.'" data-pbqqty="'.$objp->quantity.'" data-pbqup="'.$objp->unitprice.'" data-pbqpercent="'.$objp->remise_percent.'"';
+					$opt .= ' data-qty="'.$objp->quantity.'" data-up="'.$objp->unitprice.'" data-discount="'.$outdiscount.'"';
 				}
+				$opt .= ' data-description="'.dol_escape_htmltag($objp->description).'"';
 				$opt .= ' data-html="'.dol_escape_htmltag($optlabel).'"';
 				$opt .= '>';
 
@@ -2971,7 +2982,20 @@ class Form
 				// "key" value of json key array is used by jQuery automatically as selected value
 				// "label" value of json key array is used by jQuery automatically as text for combo box
 				$out .= $opt;
-				array_push($outarray, array('key'=>$outkey, 'value'=>$outref, 'label'=>$outval, 'qty'=>$outqty, 'up'=>$objp->unitprice, 'discount'=>$outdiscount, 'type'=>$outtype, 'duration_value'=>$outdurationvalue, 'duration_unit'=>$outdurationunit, 'disabled'=>(empty($objp->idprodfournprice) ?true:false)));
+				array_push($outarray,
+					array('key'=>$outkey,
+						'value'=>$outref,
+						'label'=>$outval,
+						'qty'=>$outqty,
+						'up'=>$objp->unitprice,
+						'discount'=>$outdiscount,
+						'type'=>$outtype,
+						'duration_value'=>$outdurationvalue,
+						'duration_unit'=>$outdurationunit,
+						'disabled'=>(empty($objp->idprodfournprice) ?true:false),
+						'description'=>$objp->description
+					)
+				);
 				// Exemple of var_dump $outarray
 				// array(1) {[0]=>array(6) {[key"]=>string(1) "2" ["value"]=>string(3) "ppp"
 				//           ["label"]=>string(76) "ppp (<strong>f</strong>ff2) - ppp - 20,00 Euros/1unité (20,00 Euros/unité)"
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 10fa477600a..9b225967eb1 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -134,7 +134,11 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
 										}
 										return { label: label, value: item.value, id: item.key, disabled: item.disabled,
 												 update: update, textarea: textarea,
-												 pbq: item.pbq, type: item.type, qty: item.qty, discount: item.discount, pricebasetype: item.pricebasetype, price_ht: item.price_ht, price_ttc: item.price_ttc }
+												 pbq: item.pbq,
+												 type: item.type, qty: item.qty, discount: item.discount,
+												 pricebasetype: item.pricebasetype, price_ht: item.price_ht,
+												 price_ttc: item.price_ttc,
+												 up: item.up, description : item.description}
 									}));
 								}
 								else console.error("Error: Ajax url '.$url.($urloption ? '?'.$urloption : '').' has returned an empty page. Should be an empty json array.");
@@ -146,14 +150,34 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
     						console.log("Call change on input '.$htmlname.' because of select definition of autocomplete select call on input#search_'.$htmlname.'");
     					    console.log("Selected id = "+ui.item.id+" - If this value is null, it means you select a record with key that is null so selection is not effective");
 
-							//console.log(ui.item);
-							$("#'.$htmlname.'").attr("data-pbq", ui.item.pbq);
-							$("#'.$htmlname.'").attr("data-pbqup", ui.item.price_ht);
-							$("#'.$htmlname.'").attr("data-pbqbase", ui.item.pricebasetype);
-							$("#'.$htmlname.'").attr("data-pbqqty", ui.item.qty);
-							$("#'.$htmlname.'").attr("data-pbqpercent", ui.item.discount);
+							console.log(ui.item);
+							//For supplier price
+							$("#'.$htmlname.'").attr("data-up", ui.item.up);
+							$("#'.$htmlname.'").attr("data-discount", ui.item.discount);
+							$("#'.$htmlname.'").attr("data-qty", ui.item.qty);
+							$("#'.$htmlname.'").attr("data-description", ui.item.description);
 
-    						$("#'.$htmlname.'").val(ui.item.id).trigger("change");	// Select new value
+							//For customer price
+		';
+
+	if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
+		$script .= '
+							$("#' . $htmlname . '").attr("data-pbq", ui.item.pbq);
+							$("#' . $htmlname . '").attr("data-pbqup", ui.item.price_ht);
+							$("#' . $htmlname . '").attr("data-pbqbase", ui.item.pricebasetype);
+							$("#' . $htmlname . '").attr("data-pbqqty", ui.item.qty);
+							$("#' . $htmlname . '").attr("data-pbqpercent", ui.item.discount);
+		';
+	} else {
+		$script .= '
+							$("#' . $htmlname . '").attr("data-up", ui.item.price_ht);
+							$("#' . $htmlname . '").attr("data-base", ui.item.pricebasetype);
+							$("#' . $htmlname . '").attr("data-qty", ui.item.qty);
+							$("#' . $htmlname . '").attr("data-discount", ui.item.discount);
+		';
+	}
+	$script .= '
+							$("#'.$htmlname.'").val(ui.item.id).trigger("change");	// Select new value
     						// Disable an element
     						if (options.option_disabled) {
     							console.log("Make action option_disabled on #"+options.option_disabled+" with disabled="+ui.item.disabled)
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index ec73bf9725b..ba6b4e1bb1b 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -602,39 +602,39 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 	});
 
 	$("#prod_entry_mode_free").on( "click", function() {
-	setforfree();
+		setforfree();
 	});
 	$("#select_type").change(function()
 	{
-	setforfree();
+		setforfree();
 	if (jQuery('#select_type').val() >= 0)
 	{
 	/* focus work on a standard textarea but not if field was replaced with CKEDITOR */
-	jQuery('#dp_desc').focus();
-	/* focus if CKEDITOR */
-	if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined")
-	{
-	var editor = CKEDITOR.instances['dp_desc'];
-	if (editor) { editor.focus(); }
-	}
+		jQuery('#dp_desc').focus();
+		/* focus if CKEDITOR */
+		if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined")
+		{
+			var editor = CKEDITOR.instances['dp_desc'];
+			if (editor) { editor.focus(); }
+		}
 	}
 	console.log("Hide/show date according to product type");
 	if (jQuery('#select_type').val() == '0')
 	{
-	jQuery('#trlinefordates').hide();
-	jQuery('.divlinefordates').hide();
+		jQuery('#trlinefordates').hide();
+		jQuery('.divlinefordates').hide();
 	}
 	else
 	{
-	jQuery('#trlinefordates').show();
-	jQuery('.divlinefordates').show();
+		jQuery('#trlinefordates').show();
+		jQuery('.divlinefordates').show();
 	}
 	});
 
 	$("#prod_entry_mode_predef").on( "click", function() {
-	console.log("click prod_entry_mode_predef");
-	setforpredef();
-	jQuery('#trlinefordates').show();
+		console.log("click prod_entry_mode_predef");
+		setforpredef();
+		jQuery('#trlinefordates').show();
 	});
 
 	<?php
@@ -695,7 +695,7 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 					'json'
 				);
 			}
-			<?php
+		<?php
 		}
 
 		if (!empty($usemargins) && $user->rights->margins->creer)
@@ -804,7 +804,10 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 		}
 		?>
 
-		/* To process customer price per quantity (CUSTOMER_PRICE_PER_QTY works only if combo product is not an ajax after x key pressed) */
+		<?php
+		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
+		{?>
+		/* To process customer price per quantity (PRODUIT_CUSTOMER_PRICES_BY_QTY works only if combo product is not an ajax after x key pressed) */
 		var pbq = parseInt($('option:selected', this).attr('data-pbq'));				// When select is done from HTML select
 		if (isNaN(pbq)) { pbq = jQuery('#idprod').attr('data-pbq');	}					// When select is done from HTML input with autocomplete
 		var pbqup = parseFloat($('option:selected', this).attr('data-pbqup'));
@@ -816,7 +819,7 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 		var pbqpercent = parseFloat($('option:selected', this).attr('data-pbqpercent'));
 		if (isNaN(pbqpercent)) { pbqpercent = jQuery('#idprod').attr('data-pbqpercent');	}
 
-		if ((jQuery('#idprod').val() > 0 || jQuery('#idprodfournprice').val()) && ! isNaN(pbq) && pbq > 0)
+		if ((jQuery('#idprod').val() > 0) && ! isNaN(pbq) && pbq > 0)
 		{
 			var pbqupht = pbqup;	/* TODO support of price per qty TTC not yet available */
 
@@ -832,6 +835,48 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 				jQuery("#remise_percent").val(pbqpercent);
 			}
 		}
+		<?php
+		}
+		?>
+		//Deal with supplier
+		if (jQuery('#idprodfournprice').val() >0)
+		{
+			var up = parseFloat($('option:selected', this).attr('data-up')); 							// When select is done from HTML select
+			if (isNaN(up)) { up = parseFloat(jQuery('#idprodfournprice').attr('data-up'));}				// When select is done from HTML input with autocomplete
+
+			var qty = parseFloat($('option:selected', this).attr('data-qty'));
+			if (isNaN(qty)) { qty = parseFloat(jQuery('#idprodfournprice').attr('data-qty'));}
+
+			var discount = parseFloat($('option:selected', this).attr('data-discount'));
+			if (isNaN(discount)) { discount = parseFloat(jQuery('#idprodfournprice').attr('data-discount'));}
+
+			var description = $('option:selected', this).attr('data-description');
+			if (typeof description == 'undefined') { description = jQuery('#idprodfournprice').attr('data-description');	}
+			console.log("We find supplier price :"+up+" qty: "+qty+" discount: "+discount+" for product "+jQuery('#idprodfournprice').val());
+
+			jQuery("#price_ht").val(up);
+			if (jQuery("#qty").val() < qty)
+			{
+				jQuery("#qty").val(qty);
+			}
+			if (jQuery("#remise_percent").val() < discount)
+			{
+				jQuery("#remise_percent").val(discount);
+			}
+
+			console.log("Load desciption into text area : "+description);
+		<?php if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) { ?>
+			if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined")
+			{
+				var editor = CKEDITOR.instances['dp_desc'];
+				if (editor) {
+				editor.setData(description);
+				}
+			}
+		<?php } else { ?>
+			jQuery('#dp_desc').text(description);
+		<?php } ?>
+		}
 		else
 		{
 			jQuery("#pbq").val('');
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index e202b3e8efd..e5ddc3b1b75 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -356,7 +356,7 @@ if (empty($reshook))
 
 		// Set if we used free entry or predefined product
 		$predef = '';
-		$product_desc = (GETPOST('dp_desc') ?GETPOST('dp_desc') : '');
+		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
 		$date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
 		$date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
 		$prod_entry_mode = GETPOST('prod_entry_mode');
@@ -475,7 +475,7 @@ if (empty($reshook))
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
 					}
-					$desc = (!empty($productsupplier->multilangs [$outputlangs->defaultlang] ["description"])) ? $productsupplier->multilangs [$outputlangs->defaultlang] ["description"] : $productsupplier->description;
+					$desc = (!empty($productsupplier->multilangs[$outputlangs->defaultlang]["description"])) ? $productsupplier->multilangs[$outputlangs->defaultlang]["description"] : $productsupplier->description;
 				} else {
 					$desc = $productsupplier->description;
 				}
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index c304a4edce7..3f9ea28c420 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1180,7 +1180,7 @@ if (empty($reshook))
 
 		// Set if we used free entry or predefined product
 		$predef = '';
-		$product_desc = (GETPOST('dp_desc') ?GETPOST('dp_desc') : '');
+		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
 		$date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
 		$date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
 
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index b9a8d6c3b68..41c38c82ba7 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -166,7 +166,7 @@ if (empty($reshook))
 		$price_expression = GETPOST('eid', 'int') ? GETPOST('eid', 'int') : ''; // Discard expression if not in expression mode
 		$delivery_time_days = GETPOST('delivery_time_days', 'int') ? GETPOST('delivery_time_days', 'int') : '';
 		$supplier_reputation = GETPOST('supplier_reputation');
-		$supplier_description = GETPOST('supplier_description', 'alpha');
+		$supplier_description = GETPOST('supplier_description', 'restricthtml');
         $barcode = GETPOST('barcode', 'alpha');
         $fk_barcode_type = GETPOST('fk_barcode_type', 'int');
 		$packaging = price2num(GETPOST("packaging", 'alphanohtml'), 'MS');

From a53e9077069e4ab467ac94f90a527b8991d3204b Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 26 Oct 2020 15:32:00 +0000
Subject: [PATCH 006/888] Fixing style errors.

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

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index ba6b4e1bb1b..c69b57a90d0 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -695,7 +695,7 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 					'json'
 				);
 			}
-		<?php
+			<?php
 		}
 
 		if (!empty($usemargins) && $user->rights->margins->creer)
@@ -835,7 +835,7 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 				jQuery("#remise_percent").val(pbqpercent);
 			}
 		}
-		<?php
+			<?php
 		}
 		?>
 		//Deal with supplier

From 9aa3368627a052592a342cdeb41dc22d279444fd Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 26 Oct 2020 16:33:13 +0100
Subject: [PATCH 007/888] syntax

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

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 9b225967eb1..f8ec1d5ead1 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -150,7 +150,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
     						console.log("Call change on input '.$htmlname.' because of select definition of autocomplete select call on input#search_'.$htmlname.'");
     					    console.log("Selected id = "+ui.item.id+" - If this value is null, it means you select a record with key that is null so selection is not effective");
 
-							console.log(ui.item);
+							//console.log(ui.item);
 							//For supplier price
 							$("#'.$htmlname.'").attr("data-up", ui.item.up);
 							$("#'.$htmlname.'").attr("data-discount", ui.item.discount);

From 2c772cd8bb2b046e5490d3f0f73db6bd9dc2876b Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 27 Oct 2020 09:52:04 +0100
Subject: [PATCH 008/888] try to make it work for experimental
 PRODUIT_CUSTOMER_PRICES_BY_QTY option

---
 htdocs/core/class/html.form.class.php | 45 +++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 397d1a008cf..ff83173be5e 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2150,7 +2150,9 @@ class Form
 		if (!empty($conf->global->MAIN_MULTILANGS))
 		{
 			$sql .= ", pl.label as label_translated";
+			$sql .= ", pl.description as description_translated";
 			$selectFields .= ", label_translated";
+			$selectFields .= ", description_translated";
 		}
 		// Price by quantity
 		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
@@ -2190,7 +2192,18 @@ class Form
 		// Multilang : we add translation
 		if (!empty($conf->global->MAIN_MULTILANGS))
 		{
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND pl.lang='".$this->db->escape($langs->getDefaultLang())."'";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid ";
+			if (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && !empty($socid)) {
+				$soc = new Societe($db);
+				$result = $soc->fetch($socid);
+				if ($result > 0 && !empty($soc->default_lang)) {
+					$sql .= " AND pl.lang='" . $this->db->escape($soc->default_lang) . "'";
+				} else {
+					$sql .= " AND pl.lang='".$this->db->escape($langs->getDefaultLang())."'";
+				}
+			} else {
+				$sql .= " AND pl.lang='".$this->db->escape($langs->getDefaultLang())."'";
+			}
 		}
 
 		if (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD)) {
@@ -2403,7 +2416,9 @@ class Form
 		$outval = '';
 		$outref = '';
 		$outlabel = '';
+		$outlabel_translated = '';
 		$outdesc = '';
+		$outdesc_translated = '';
 		$outbarcode = '';
 		$outorigin = '';
 		$outtype = '';
@@ -2424,6 +2439,11 @@ class Form
 		$outref = $objp->ref;
 		$outlabel = $objp->label;
 		$outdesc = $objp->description;
+		if (!empty($conf->global->MAIN_MULTILANGS))
+		{
+			$outlabel_translated = $objp->label_translated;
+			$outdesc_translated = $objp->description_translated;
+		}
 		$outbarcode = $objp->barcode;
 		$outorigin = $objp->fk_country;
 		$outpbq = empty($objp->price_by_qty_rowid) ? '' : $objp->price_by_qty_rowid;
@@ -2485,6 +2505,10 @@ class Form
 		   		elseif ($objp->stock <= 0) $opt .= ' class="product_line_stock_too_low"';
 			}
 		}
+		if (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+			$opt .= ' data-labeltrans="'.$outlabel_translated.'"';
+			$opt .= ' data-desctrans="'.dol_escape_htmltag($outdesc_translated).'"';
+		}
 		$opt .= '>';
 		$opt .= $objp->ref;
 		if ($outbarcode) $opt .= ' ('.$outbarcode.')';
@@ -2655,7 +2679,24 @@ class Form
 		}
 
 		$opt .= "</option>\n";
-		$optJson = array('key'=>$outkey, 'value'=>$outref, 'label'=>$outval, 'label2'=>$outlabel, 'desc'=>$outdesc, 'type'=>$outtype, 'price_ht'=>price2num($outprice_ht), 'price_ttc'=>price2num($outprice_ttc), 'pricebasetype'=>$outpricebasetype, 'tva_tx'=>$outtva_tx, 'qty'=>$outqty, 'discount'=>$outdiscount, 'duration_value'=>$outdurationvalue, 'duration_unit'=>$outdurationunit, 'pbq'=>$outpbq);
+		$optJson = array(
+			'key'=>$outkey,
+			'value'=>$outref,
+			'label'=>$outval,
+			'label2'=>$outlabel,
+			'desc'=>$outdesc,
+			'type'=>$outtype,
+			'price_ht'=>price2num($outprice_ht),
+			'price_ttc'=>price2num($outprice_ttc),
+			'pricebasetype'=>$outpricebasetype,
+			'tva_tx'=>$outtva_tx, 'qty'=>$outqty,
+			'discount'=>$outdiscount,
+			'duration_value'=>$outdurationvalue,
+			'duration_unit'=>$outdurationunit,
+			'pbq'=>$outpbq,
+			'labeltrans'=>$outlabel_translated,
+			'desctrans'=>$outdesc_translated
+		);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

From d77a0b40a8923049710455d633911416cd66ada8 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 28 Oct 2020 16:37:41 +0100
Subject: [PATCH 009/888] tested and approuve feaure  #15036

---
 htdocs/comm/propal/card.php               |  4 +-
 htdocs/commande/card.php                  |  4 +-
 htdocs/compta/facture/card.php            |  4 +-
 htdocs/contrat/card.php                   |  4 +-
 htdocs/core/tpl/objectline_create.tpl.php | 65 +++++++++++++++++------
 htdocs/fourn/commande/card.php            |  8 ++-
 htdocs/fourn/facture/card.php             |  7 ++-
 htdocs/langs/en_US/admin.lang             |  4 +-
 htdocs/product/admin/product.php          | 23 ++++++++
 htdocs/product/ajax/products.php          |  3 ++
 10 files changed, 98 insertions(+), 28 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index f03986d471c..47dd722b5b1 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -793,7 +793,7 @@ if (empty($reshook))
 	} elseif ($action == 'addline' && $usercancreate) {		// Add line
 		// Set if we used free entry or predefined product
 		$predef = '';
-		$product_desc = (GETPOSTISSET('dp_desc') ?GETPOST('dp_desc', 'restricthtml') : '');
+		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
 		$price_ht = price2num(GETPOST('price_ht'));
 		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'));
 		$prod_entry_mode = GETPOST('prod_entry_mode');
@@ -1001,7 +1001,7 @@ if (empty($reshook))
 				}
 
 				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
-				if ($product_desc==$desc) {
+				if ($product_desc==$desc && !empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
 					$product_desc='';
 				}
 
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 6572a383532..1bdce17f564 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -640,7 +640,7 @@ if (empty($reshook))
 
 		// Set if we used free entry or predefined product
 		$predef = '';
-		$product_desc = (GETPOST('dp_desc') ?GETPOST('dp_desc') : '');
+		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
 		$price_ht = GETPOST('price_ht');
 		$price_ht_devise = GETPOST('multicurrency_price_ht');
 		$prod_entry_mode = GETPOST('prod_entry_mode');
@@ -855,7 +855,7 @@ if (empty($reshook))
 				}
 
 				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
-				if ($product_desc==$desc) {
+				if ($product_desc==$desc && !empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
 					$product_desc='';
 				}
 
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 80e60dd8784..4602e968220 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1902,7 +1902,7 @@ if (empty($reshook))
 
 		// Set if we used free entry or predefined product
 		$predef = '';
-		$product_desc = (GETPOST('dp_desc', 'none') ?GETPOST('dp_desc', 'restricthtml') : '');
+		$product_desc =(GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
 		$price_ht = price2num(GETPOST('price_ht'));
 		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'));
 		$prod_entry_mode = GETPOST('prod_entry_mode', 'alpha');
@@ -2073,7 +2073,7 @@ if (empty($reshook))
 				}
 
 				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
-				if ($product_desc==$desc) {
+				if ($product_desc==$desc && !empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
 					$product_desc='';
 				}
 
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 034709ef110..3265e2f5866 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -383,7 +383,7 @@ if (empty($reshook))
 	{
 		// Set if we used free entry or predefined product
 		$predef = '';
-		$product_desc = (GETPOST('dp_desc') ?GETPOST('dp_desc') : '');
+		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
 		$price_ht = price2num(GETPOST('price_ht'));
 		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'));
 		if (GETPOST('prod_entry_mode', 'alpha') == 'free')
@@ -501,7 +501,7 @@ if (empty($reshook))
 			   	$desc = $prod->description;
 
 				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
-				if ($product_desc==$desc) {
+				if ($product_desc==$desc && !empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
 					$product_desc='';
 				}
 
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index c69b57a90d0..f1faf50e991 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -674,13 +674,18 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 					function(data) {
 						console.log("Load unit price end, we got value "+data.price_ht);
 						jQuery("#price_ht").val(data.price_ht);
-						<?php if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) { ?>
+						<?php
+						if (!empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
+							if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) { ?>
 						var proddesc = data.desc_trans;
-						<?php } else { ?>
+						<?php
+							} else { ?>
 						var proddesc = data.desc;
-						<?php } ?>
+						<?php
+							} ?>
 						console.log("Load desciption into text area : "+proddesc);
-						<?php if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) { ?>
+						<?php
+							if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) { ?>
 						if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined")
 						{
 							var editor = CKEDITOR.instances['dp_desc'];
@@ -688,9 +693,13 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 								editor.setData(proddesc);
 							}
 						}
-						<?php } else { ?>
+						<?php
+							} else { ?>
 						jQuery('#dp_desc').text(proddesc);
-						<?php } ?>
+						<?php
+							} ?>
+						<?php
+						} ?>
 					},
 					'json'
 				);
@@ -834,7 +843,7 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 			{
 				jQuery("#remise_percent").val(pbqpercent);
 			}
-		}
+		} else { jQuery("#pbq").val(''); }
 			<?php
 		}
 		?>
@@ -850,8 +859,6 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 			var discount = parseFloat($('option:selected', this).attr('data-discount'));
 			if (isNaN(discount)) { discount = parseFloat(jQuery('#idprodfournprice').attr('data-discount'));}
 
-			var description = $('option:selected', this).attr('data-description');
-			if (typeof description == 'undefined') { description = jQuery('#idprodfournprice').attr('data-description');	}
 			console.log("We find supplier price :"+up+" qty: "+qty+" discount: "+discount+" for product "+jQuery('#idprodfournprice').val());
 
 			jQuery("#price_ht").val(up);
@@ -864,24 +871,48 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 				jQuery("#remise_percent").val(discount);
 			}
 
+			<?php
+			if (!empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
+			?>
+			var description = $('option:selected', this).attr('data-description');
+			if (typeof description == 'undefined') { description = jQuery('#idprodfournprice').attr('data-description');	}
+
 			console.log("Load desciption into text area : "+description);
-		<?php if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) { ?>
+			<?php
+				if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) { ?>
 			if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined")
 			{
 				var editor = CKEDITOR.instances['dp_desc'];
 				if (editor) {
-				editor.setData(description);
+					editor.setData(description);
 				}
 			}
-		<?php } else { ?>
+			<?php
+				} else { ?>
 			jQuery('#dp_desc').text(description);
-		<?php } ?>
-		}
-		else
-		{
-			jQuery("#pbq").val('');
+			<?php
+				}
+			}?>
+		} else if (jQuery('#idprodfournprice').length > 0) {
+			<?php
+			if (!empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
+				if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) { ?>
+			if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined")
+			{
+				var editor = CKEDITOR.instances['dp_desc'];
+				if (editor) {
+					editor.setData('');
+				}
+			}
+			<?php
+			} else { ?>
+			jQuery('#dp_desc').text('');
+			<?php
+				}
+			}?>
 		}
 
+
 		/* To set focus */
 		if (jQuery('#idprod').val() > 0 || jQuery('#idprodfournprice').val() > 0)
 		{
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 42817e2ea28..f7c963f5e29 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -484,7 +484,13 @@ if (empty($reshook))
 					$desc = $productsupplier->desc_supplier;
 				}
 
-				if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
+				if ($product_desc==$desc && !empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
+					$product_desc='';
+				}
+
+				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) $desc = $product_desc;
+				if (!empty($product_desc) && trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
 
 				$type = $productsupplier->type;
 				if ($price_ht != '' || $price_ht_devise != '') {
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 9849e3b6223..a6bc58879c1 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1294,7 +1294,12 @@ if (empty($reshook))
 					$desc = $productsupplier->desc_supplier;
 				} else $desc = $productsupplier->description;
 
-				if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
+				if ($product_desc==$desc && !empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
+					$product_desc='';
+				}
+				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) $desc = $product_desc;
+				if (!empty($product_desc) && trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
 
 				$type = $productsupplier->type;
 				if ($price_ht != '' || $price_ht_devise != '') {
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index e47390b9ce0..c2bcdef711f 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1587,6 +1587,8 @@ ServiceSetup=Services module setup
 ProductServiceSetup=Products and Services modules setup
 NumberOfProductShowInSelect=Maximum number of products to show in combo select lists (0=no limit)
 ViewProductDescInFormAbility=Display product descriptions in forms (otherwise shown in a tooltip popup)
+DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
+OnProductSelectAddProductDesc=On product selection in forms get the production description into description line
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
 ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in the language of the third party
 UseSearchToSelectProductTooltip=Also if you have a large number of products (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
@@ -2067,4 +2069,4 @@ TemplateDeleted=Template deleted
 MailToSendEventPush=Event reminder email
 SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
 DictionaryProductNature= Nature of product
-CountryIfSpecificToOneCountry=Country (if specific to a given country)
\ No newline at end of file
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 313a27884ff..e7003c6ee47 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -145,6 +145,12 @@ if ($action == 'other')
 	$value = GETPOST('activate_useProdFournDesc', 'alpha');
 	$res = dolibarr_set_const($db, "PRODUIT_FOURN_TEXTS", $value, 'chaine', 0, '', $conf->entity);
 
+	$value = GETPOST('activate_FillProductDescAuto', 'alpha');
+	$res = dolibarr_set_const($db, "PRODUIT_AUTOFILL_DESC", $value, 'chaine', 0, '', $conf->entity);
+
+	$value = GETPOST('activate_DoNotAddStdProductDescOnAddLine', 'alpha');
+	$res = dolibarr_set_const($db, "MAIN_NO_CONCAT_DESCRIPTION", $value, 'chaine', 0, '', $conf->entity);
+
 	if ($value) {
 	    $sql_test = "SELECT count(desc_fourn) as cpt FROM ".MAIN_DB_PREFIX."product_fournisseur_price WHERE 1";
 	    $resql = $db->query($sql_test);
@@ -630,6 +636,23 @@ print $form->selectyesno("activate_viewProdDescInForm", $conf->global->PRODUIT_D
 print '</td>';
 print '</tr>';
 
+// Do Not Add Product description on add lines
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("DoNotAddProductDescAtAddLines").'</td>';
+print '<td class="right">';
+print $form->selectyesno("activate_DoNotAddStdProductDescOnAddLine", $conf->global->MAIN_NO_CONCAT_DESCRIPTION, 1);
+print '</td>';
+print '</tr>';
+
+// Do Not Add Product description on add lines
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("OnProductSelectAddProductDesc").'</td>';
+print '<td class="right">';
+print $form->selectyesno("activate_FillProductDescAuto", $conf->global->PRODUIT_AUTOFILL_DESC, 1);
+print '</td>';
+print '</tr>';
+
+
 // Activate propal merge produt card
 /* Kept as hidden feature only. PRODUIT_PDF_MERGE_PROPAL can be added manually. Still did not understand how this feature works.
 
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index c2b698c8e04..40249e4041e 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -99,6 +99,9 @@ if (!empty($action) && $action == 'fetch' && !empty($id))
 					$outputlangs->setDefaultLang($newlang);
 					$outdesc_trans = (!empty($object->multilangs[$outputlangs->defaultlang]["description"])) ? $object->multilangs[$outputlangs->defaultlang]["description"] : $object->description;
 					$outlabel_trans = (!empty($object->multilangs[$outputlangs->defaultlang]["label"])) ? $object->multilangs[$outputlangs->defaultlang]["label"] : $object->label;
+				} else {
+					$outdesc_trans = $object->description;
+					$outlabel_trans = $object->label;
 				}
 			}
 		}

From 88b570926f7ab66c829d979545a8b700445128bd Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 28 Oct 2020 15:38:31 +0000
Subject: [PATCH 010/888] Fixing style errors.

---
 htdocs/core/tpl/objectline_create.tpl.php | 26 +++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index f1faf50e991..bc04e7b6614 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -678,13 +678,13 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 						if (!empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
 							if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) { ?>
 						var proddesc = data.desc_trans;
-						<?php
+								<?php
 							} else { ?>
 						var proddesc = data.desc;
-						<?php
+								<?php
 							} ?>
 						console.log("Load desciption into text area : "+proddesc);
-						<?php
+							<?php
 							if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) { ?>
 						if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined")
 						{
@@ -693,12 +693,12 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 								editor.setData(proddesc);
 							}
 						}
-						<?php
+								<?php
 							} else { ?>
 						jQuery('#dp_desc').text(proddesc);
-						<?php
+								<?php
 							} ?>
-						<?php
+							<?php
 						} ?>
 					},
 					'json'
@@ -873,12 +873,12 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 
 			<?php
 			if (!empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
-			?>
+				?>
 			var description = $('option:selected', this).attr('data-description');
 			if (typeof description == 'undefined') { description = jQuery('#idprodfournprice').attr('data-description');	}
 
 			console.log("Load desciption into text area : "+description);
-			<?php
+				<?php
 				if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) { ?>
 			if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined")
 			{
@@ -887,10 +887,10 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 					editor.setData(description);
 				}
 			}
-			<?php
+					<?php
 				} else { ?>
 			jQuery('#dp_desc').text(description);
-			<?php
+					<?php
 				}
 			}?>
 		} else if (jQuery('#idprodfournprice').length > 0) {
@@ -904,10 +904,10 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 					editor.setData('');
 				}
 			}
-			<?php
-			} else { ?>
+					<?php
+				} else { ?>
 			jQuery('#dp_desc').text('');
-			<?php
+					<?php
 				}
 			}?>
 		}

From 518a225f7baa8f577877392562f1906aa86723ab Mon Sep 17 00:00:00 2001
From: jcp <jcprieto@virtual20.com>
Date: Tue, 3 Nov 2020 19:48:23 +0100
Subject: [PATCH 011/888] NEW massaction for BankTransfer

---
 htdocs/fourn/facture/list.php       | 101 ++++++++++++++++++++++++++++
 htdocs/langs/en_US/withdrawals.lang |   1 +
 2 files changed, 102 insertions(+)

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 0ebfd024658..c1c6329cb43 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -270,6 +270,103 @@ if (empty($reshook))
 }
 
 
+if ($massaction == 'transfer_request')
+{
+	$langs->load("withdrawals");
+
+	if (!$user->rights->paymentbybanktransfer->create)
+	{
+		$error++;
+		setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
+	}
+	else
+	{
+		//Checking error
+		$error = 0;
+
+		$arrayofselected = is_array($toselect) ? $toselect : array();
+		$listofbills = array();
+		foreach ($arrayofselected as $toselectid)
+		{
+			$objecttmp = new FactureFournisseur($db);
+			$result = $objecttmp->fetch($toselectid);
+			if ($result > 0)
+			{
+				$totalpaye = $objecttmp->getSommePaiement();
+				$totalcreditnotes = $objecttmp->getSumCreditNotesUsed();
+				$totaldeposits = $objecttmp->getSumDepositsUsed();
+				$objecttmp->resteapayer = price2num($objecttmp->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+				if ($objecttmp->paye || $objecttmp->resteapayer == 0) {
+					$error++;
+					setEventMessages($objecttmp->ref.' '.$langs->trans("AlreadyPaid"), $objecttmp->errors, 'errors');
+				} elseif ($objecttmp->resteapayer < 0) {
+					$error++;
+					setEventMessages($objecttmp->ref.' '.$langs->trans("AmountMustBePositive"), $objecttmp->errors, 'errors');
+				}
+				if (!($objecttmp->statut > FactureFournisseur::STATUS_DRAFT)) {
+					$error++;
+					setEventMessages($objecttmp->ref.' '.$langs->trans("Draft"), $objecttmp->errors, 'errors');
+				}
+
+				$rsql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande as date_demande";
+				$rsql .= " , pfd.date_traite as date_traite";
+				$rsql .= " , pfd.amount";
+				$rsql .= " , u.rowid as user_id, u.lastname, u.firstname, u.login";
+				$rsql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+				$rsql .= " , ".MAIN_DB_PREFIX."user as u";
+				$rsql .= " WHERE fk_facture_fourn = ".$objecttmp->id;
+				$rsql .= " AND pfd.fk_user_demande = u.rowid";
+				$rsql .= " AND pfd.traite = 0";
+				$rsql .= " ORDER BY pfd.date_demande DESC";
+
+				$result_sql = $db->query($rsql);
+				if ($result_sql)
+				{
+					$numprlv = $db->num_rows($result_sql);
+				}
+
+				if ($numprlv > 0) {
+					$error++;
+					setEventMessages($objecttmp->ref.' '.$langs->trans("RequestAlreadyDone"), $objecttmp->errors, 'warnings');
+				}
+				elseif (!empty($objecttmp->mode_reglement_code) && $objecttmp->mode_reglement_code != 'VIR') {
+					$error++;
+					setEventMessages($objecttmp->ref.' '.$langs->trans("BadPaymentMethod"), $objecttmp->errors, 'errors');
+				}
+				else {
+					$listofbills[] = $objecttmp; // $listofbills will only contains invoices with good payment method and no request already done
+				}
+			}
+		}
+
+		//Massive withdraw request for request with no errors
+		if (!empty($listofbills))
+		{
+			$nbwithdrawrequestok = 0;
+			foreach ($listofbills as $aBill)
+			{
+				$db->begin();
+				$result = $aBill->demande_prelevement($user, $aBill->resteapayer, 'bank-transfer', 'supplier_invoice');
+				if ($result > 0)
+				{
+					$db->commit();
+					$nbwithdrawrequestok++;
+				}
+				else
+				{
+					$db->rollback();
+					setEventMessages($aBill->error, $aBill->errors, 'errors');
+				}
+			}
+			if ($nbwithdrawrequestok > 0)
+			{
+				setEventMessages($langs->trans("BankTransferRequestsDone", $nbwithdrawrequestok), null, 'mesgs');
+			}
+		}
+	}
+}
+
+
 /*
  * View
  */
@@ -505,6 +602,10 @@ if ($resql)
 		//'builddoc'=>$langs->trans("PDFMerge"),
 	    //'presend'=>$langs->trans("SendByMail"),
 	);
+	if ($conf->paymentbybanktransfer->enabled) {
+        	$langs->load("withdrawals");
+        	$arrayofmassactions['transfer_request'] = $langs->trans("MakeBankTransferOrder");
+	}
 	//if($user->rights->fournisseur->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
 	if ($user->rights->fournisseur->facture->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 	if (in_array($massaction, array('presend', 'predelete', 'createbills'))) $arrayofmassactions = array();
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index a18ff7a8d31..1b8f2441b33 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited

From 61bca50fa62c0b51127e5802e3926f031afb9812 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 5 Nov 2020 16:56:28 +0100
Subject: [PATCH 012/888] NEW: Dictionary for availability - Add column
 position

---
 htdocs/admin/dict.php                         | 14 ++++----
 htdocs/core/class/html.form.class.php         |  7 ++--
 .../install/mysql/data/llx_c_availability.sql |  9 ++---
 .../install/mysql/migration/13.0.0-14.0.0.sql | 35 +++++++++++++++++++
 .../mysql/tables/llx_c_availability.sql       |  5 +--
 5 files changed, 54 insertions(+), 16 deletions(-)
 create mode 100644 htdocs/install/mysql/migration/13.0.0-14.0.0.sql

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 43ce69f6e02..adacc0d7b8e 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2011		Remy Younes				<ryounes@gmail.com>
  * Copyright (C) 2012-2015	Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2012		Christophe Battarel		<christophe.battarel@ltairis.fr>
- * Copyright (C) 2011-2019	Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2011-2020	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2015		Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2016		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2019-2020  Frédéric France         <frederic.france@netlogic.fr>
@@ -205,7 +205,7 @@ $tabsql[17] = "SELECT id      as rowid, code, label, accountancy_code, active FR
 $tabsql[18] = "SELECT rowid   as rowid, code, libelle, tracking, active FROM ".MAIN_DB_PREFIX."c_shipment_mode";
 $tabsql[19] = "SELECT id      as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_effectif";
 $tabsql[20] = "SELECT rowid   as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_input_method";
-$tabsql[21] = "SELECT c.rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_availability AS c";
+$tabsql[21] = "SELECT c.rowid as rowid, c.code, c.label, c.active, c.position FROM ".MAIN_DB_PREFIX."c_availability AS c";
 $tabsql[22] = "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_input_reason";
 $tabsql[23] = "SELECT t.rowid as rowid, t.taux, t.revenuestamp_type, c.label as country, c.code as country_code, t.fk_pays as country_id, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_revenuestamp as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid";
 $tabsql[24] = "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_type_resource";
@@ -250,7 +250,7 @@ $tabsqlsort[17] = "code ASC";
 $tabsqlsort[18] = "code ASC, libelle ASC";
 $tabsqlsort[19] = "id ASC";
 $tabsqlsort[20] = "code ASC, libelle ASC";
-$tabsqlsort[21] = "code ASC, label ASC";
+$tabsqlsort[21] = "code ASC, label ASC, position ASC";
 $tabsqlsort[22] = "code ASC, label ASC";
 $tabsqlsort[23] = "country ASC, taux ASC";
 $tabsqlsort[24] = "code ASC, label ASC";
@@ -295,7 +295,7 @@ $tabfield[17] = "code,label,accountancy_code";
 $tabfield[18] = "code,libelle,tracking";
 $tabfield[19] = "code,libelle";
 $tabfield[20] = "code,libelle";
-$tabfield[21] = "code,label";
+$tabfield[21] = "code,label,position";
 $tabfield[22] = "code,label";
 $tabfield[23] = "country_id,country,taux,revenuestamp_type,accountancy_code_sell,accountancy_code_buy,note";
 $tabfield[24] = "code,label";
@@ -340,7 +340,7 @@ $tabfieldvalue[17] = "code,label,accountancy_code";
 $tabfieldvalue[18] = "code,libelle,tracking";
 $tabfieldvalue[19] = "code,libelle";
 $tabfieldvalue[20] = "code,libelle";
-$tabfieldvalue[21] = "code,label";
+$tabfieldvalue[21] = "code,label,position";
 $tabfieldvalue[22] = "code,label";
 $tabfieldvalue[23] = "country,taux,revenuestamp_type,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldvalue[24] = "code,label";
@@ -385,7 +385,7 @@ $tabfieldinsert[17] = "code,label,accountancy_code";
 $tabfieldinsert[18] = "code,libelle,tracking";
 $tabfieldinsert[19] = "code,libelle";
 $tabfieldinsert[20] = "code,libelle";
-$tabfieldinsert[21] = "code,label";
+$tabfieldinsert[21] = "code,label,position";
 $tabfieldinsert[22] = "code,label";
 $tabfieldinsert[23] = "fk_pays,taux,revenuestamp_type,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldinsert[24] = "code,label";
@@ -523,7 +523,7 @@ $tabhelp[17] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[18] = array('code'=>$langs->trans("EnterAnyCode"), 'tracking'=>$langs->trans("UrlTrackingDesc"));
 $tabhelp[19] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[20] = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[21] = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[21] = array('code'=>$langs->trans("EnterAnyCode"), 'position'=>$langs->trans("PositionIntoComboList"));
 $tabhelp[22] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[23] = array('revenuestamp_type'=>'FixedOrPercent');
 $tabhelp[24] = array('code'=>$langs->trans("EnterAnyCode"));
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 5c457a2a28c..fac12b48d52 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -15,7 +15,7 @@
  * Copyright (C) 2012-2016  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2012       Cedric Salvador         <csalvador@gpcsolutions.fr>
  * Copyright (C) 2012-2015  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2014       Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2014-2020  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2018       Nicolas ZABOURI	        <info@inovea-conseil.com>
@@ -3218,7 +3218,7 @@ class Form
 
 		$langs->load('propal');
 
-		$sql = "SELECT rowid, code, label";
+		$sql = "SELECT rowid, code, label, position";
 		$sql .= " FROM ".MAIN_DB_PREFIX.'c_availability';
 		$sql .= " WHERE active > 0";
 
@@ -3235,10 +3235,11 @@ class Form
 				$label = ($langs->trans("AvailabilityType".$obj->code) != ("AvailabilityType".$obj->code) ? $langs->trans("AvailabilityType".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
 				$this->cache_availability[$obj->rowid]['code'] = $obj->code;
 				$this->cache_availability[$obj->rowid]['label'] = $label;
+				$this->cache_availability[$obj->rowid]['position'] = $obj->position;
 				$i++;
 			}
 
-			$this->cache_availability = dol_sort_array($this->cache_availability, 'label', 'asc', 0, 0, 1);
+			$this->cache_availability = dol_sort_array($this->cache_availability, 'position', 'asc', 0, 0, 1);
 
 			return $num;
 		} else {
diff --git a/htdocs/install/mysql/data/llx_c_availability.sql b/htdocs/install/mysql/data/llx_c_availability.sql
index 7d834aa2809..2e06d1de8b3 100644
--- a/htdocs/install/mysql/data/llx_c_availability.sql
+++ b/htdocs/install/mysql/data/llx_c_availability.sql
@@ -1,4 +1,5 @@
 -- Copyright (C) 2011 Philippe GRAND      <philippe.grand@atoo-net.com>
+-- Copyright (C) 2020 Alexandre SPANGARO  <aspangaro@open-dsi.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
@@ -25,7 +26,7 @@
 --
 
 delete from llx_c_availability;
-INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (1, 'AV_NOW', 'Immediate', 1);
-INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (2, 'AV_1W',  '1 week', 1);
-INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (3, 'AV_2W',  '2 weeks', 1);
-INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (4, 'AV_3W',  '3 weeks', 1);
+INSERT INTO llx_c_availability (rowid,code,label,active,position) VALUES (1, 'AV_NOW', 'Immediate', 1, 10);
+INSERT INTO llx_c_availability (rowid,code,label,active,position) VALUES (2, 'AV_1W',  '1 week', 1, 20);
+INSERT INTO llx_c_availability (rowid,code,label,active,position) VALUES (3, 'AV_2W',  '2 weeks', 1, 30);
+INSERT INTO llx_c_availability (rowid,code,label,active,position) VALUES (4, 'AV_3W',  '3 weeks', 1, 40);
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
new file mode 100644
index 00000000000..58a3f962e3c
--- /dev/null
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -0,0 +1,35 @@
+--
+-- Be carefull to requests order.
+-- This file must be loaded by calling /install/index.php page
+-- when current version is 14.0.0 or higher.
+--
+-- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y
+-- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y
+-- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
+-- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
+-- To rename a column:      ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);
+-- To drop a column:        ALTER TABLE llx_table DROP COLUMN oldname;
+-- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
+-- To drop a foreign key:   ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
+-- To create a unique index ALTER TABLE llx_table ADD UNIQUE INDEX uk_table_field (field);
+-- To drop an index:        -- VMYSQL4.1 DROP INDEX nomindex on llx_table
+-- To drop an index:        -- VPGSQL8.2 DROP INDEX nomindex
+-- To make pk to be auto increment (mysql):    -- VMYSQL4.3 ALTER TABLE llx_table CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (postgres):
+-- -- VPGSQL8.2 CREATE SEQUENCE llx_table_rowid_seq OWNED BY llx_table.rowid;
+-- -- VPGSQL8.2 ALTER TABLE llx_table ADD PRIMARY KEY (rowid);
+-- -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN rowid SET DEFAULT nextval('llx_table_rowid_seq');
+-- -- VPGSQL8.2 SELECT setval('llx_table_rowid_seq', MAX(rowid)) FROM llx_table;
+-- To set a field as NULL:                     -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NULL;
+-- To set a field as NULL:                     -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
+-- To set a field as NOT NULL:                 -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NOT NULL;
+-- To set a field as NOT NULL:                 -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET NOT NULL;
+-- To set a field as default NULL:             -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
+-- Note: fields with type BLOB/TEXT can't have default value.
+
+
+-- Missing in v13 or lower
+
+-- For v14
+
+ALTER TABLE llx_c_availability ADD COLUMN position integer NOT NULL DEFAULT 0;
diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql
index cef03abe548..4cdc8d6203c 100644
--- a/htdocs/install/mysql/tables/llx_c_availability.sql
+++ b/htdocs/install/mysql/tables/llx_c_availability.sql
@@ -1,5 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2011 Philippe GRAND      <philippe.grand@atoo-net.com>
+-- Copyright (C) 2020 Alexandre SPANGARO  <aspangaro@open-dsi.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
@@ -21,6 +22,6 @@ create table llx_c_availability
 	rowid		integer	 	AUTO_INCREMENT PRIMARY KEY,
 	code		varchar(30) NOT NULL,
 	label		varchar(60) NOT NULL,
-	active		tinyint 	DEFAULT 1  NOT NULL
-
+	active		tinyint 	DEFAULT 1  NOT NULL,
+	position    integer NOT NULL DEFAULT 0
 )ENGINE=innodb;

From 11099132da9783cc3b4b0f7eacec8ee1e9d7f086 Mon Sep 17 00:00:00 2001
From: bahfir abbes <bafbes@gmail.com>
Date: Fri, 6 Nov 2020 00:45:30 +0100
Subject: [PATCH 013/888] New: add notification on ACTION_CREATE event

---
 htdocs/core/class/notify.class.php            | 27 ++++++++++++++-----
 ..._50_modNotification_Notification.class.php |  3 ++-
 .../mysql/data/llx_c_action_trigger.sql       |  2 +-
 htdocs/langs/en_US/other.lang                 |  2 ++
 htdocs/langs/fr_FR/other.lang                 |  2 ++
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 6547b98471a..fb0ce5a91f5 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -81,7 +81,8 @@ class Notify
 		'EXPENSE_REPORT_VALIDATE',
 		'EXPENSE_REPORT_APPROVE',
 		'HOLIDAY_VALIDATE',
-		'HOLIDAY_APPROVE'
+		'HOLIDAY_APPROVE',
+        'ACTION_CREATE'
 	);
 
 
@@ -502,12 +503,18 @@ class Notify
 								$object_type = 'holiday';
 								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextHolidayValidated", $link);
 								break;
-							case 'HOLIDAY_APPROVE':
-								$link = '<a href="'.$urlwithroot.'/holiday/card.php?id='.$object->id.'">'.$newref.'</a>';
-								$dir_output = $conf->holiday->dir_output;
-								$object_type = 'holiday';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextHolidayApproved", $link);
-								break;
+                            case 'HOLIDAY_APPROVE':
+                                $link = '<a href="'.$urlwithroot.'/holiday/card.php?id='.$object->id.'">'.$newref.'</a>';
+                                $dir_output = $conf->holiday->dir_output;
+                                $object_type = 'holiday';
+                                $mesg = $outputlangs->transnoentitiesnoconv("EMailTextHolidayApproved", $link);
+                                break;
+                            case 'ACTION_CREATE':
+                                $link = '<a href="'.$urlwithroot.'/actioncomm/card.php?id='.$object->id.'">'.$newref.'</a>';
+                                $dir_output = $conf->agenda->dir_output;
+                                $object_type = 'action';
+                                $mesg = $outputlangs->transnoentitiesnoconv("EMailTextActionAdded", $link);
+                                break;
 						}
 						$ref = dol_sanitizeFileName($newref);
 						$pdf_path = $dir_output."/".$ref."/".$ref.".pdf";
@@ -718,6 +725,12 @@ class Notify
 						$object_type = 'holiday';
 						$mesg = $langs->transnoentitiesnoconv("EMailTextHolidayApproved", $link);
 						break;
+                    case 'ACTION_CREATE':
+                        $link = '<a href="'.$urlwithroot.'/actioncomm/card.php?id='.$object->id.'">'.$newref.'</a>';
+                        $dir_output = $conf->agenda->dir_output;
+                        $object_type = 'action';
+                        $mesg = $langs->transnoentitiesnoconv("EMailTextActionAdded", $link);
+                        break;
 				}
 				$ref = dol_sanitizeFileName($newref);
 				$pdf_path = $dir_output."/".$ref."/".$ref.".pdf";
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index c5a4f450e42..a6078796478 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -46,7 +46,8 @@ class InterfaceNotification extends DolibarrTriggers
 		'EXPENSE_REPORT_VALIDATE',
 		'EXPENSE_REPORT_APPROVE',
 		'HOLIDAY_VALIDATE',
-		'HOLIDAY_APPROVE'
+		'HOLIDAY_APPROVE',
+        'ACTION_CREATE'
 	);
 
 	/**
diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql
index eeca137dbc0..c72a8ab7f40 100644
--- a/htdocs/install/mysql/data/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql
@@ -145,4 +145,4 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_CREATE','Task created','Executed when a project task is created','project',150);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_MODIFY','Task modified','Executed when a project task is modified','project',151);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_DELETE','Task deleted','Executed when a project task is deleted','project',152);
-
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ACTION_CREATE','Action added','Executed when an action is added to the agenda','agenda',700);
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 7495291cf3f..40f4f019793 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+Notify_ACTION_CREATE=Added action to Agenda
 SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Number of attached files/documents
 TotalSizeOfAttachedFiles=Total size of attached files/documents
@@ -215,6 +216,7 @@ EMailTextExpenseReportValidated=Expense report %s has been validated.
 EMailTextExpenseReportApproved=Expense report %s has been approved.
 EMailTextHolidayValidated=Leave request %s has been validated.
 EMailTextHolidayApproved=Leave request %s has been approved.
+EMailTextActionAdded=The action %s has been added to the Agenda.
 ImportedWithSet=Importation data set
 DolibarrNotification=Automatic notification
 ResizeDesc=Enter new width <b>OR</b> new height. Ratio will be kept during resizing...
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 0a5abbfbf3a..5120fd52e67 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Note de frais validée (approbation requise)
 Notify_EXPENSE_REPORT_APPROVE=Note de frais approuvé
 Notify_HOLIDAY_VALIDATE=Demande de congé validée (approbation requise)
 Notify_HOLIDAY_APPROVE=Demande de congé approuvée
+Notify_ACTION_CREATE=Ajout d'action à l'agenda
 SeeModuleSetup=Voir la configuration du module %s
 NbOfAttachedFiles=Nombre de fichiers/documents liés
 TotalSizeOfAttachedFiles=Taille totale fichiers/documents liés
@@ -218,6 +219,7 @@ EMailTextExpenseReportValidated=La note de frais %s a été validée.
 EMailTextExpenseReportApproved=La note de frais %s a été approuvée.
 EMailTextHolidayValidated=La demande de congé %s a été validée.
 EMailTextHolidayApproved=La demande de congé %s a été approuvée.
+EMailTextActionAdded=L'action %s a été ajoutée à l'Agenda.
 ImportedWithSet=Lot d'importation (Import key)
 DolibarrNotification=Notification automatique
 ResizeDesc=Entrer la nouvelle largeur <b>OU</b> la nouvelle hauteur. Le ratio d'aspect est conservé lors du redimensionnement…

From 1bdd617feb8edb25e07ebdf0c520dee4489e821c Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Sat, 7 Nov 2020 15:31:27 +0100
Subject: [PATCH 014/888] NEW: Multiselect ledger account code filter on book
 keeping list

---
 htdocs/accountancy/admin/index.php            | 20 ++++-
 htdocs/accountancy/bookkeeping/list.php       | 14 +++-
 .../core/class/html.formaccounting.class.php  | 82 ++++++++++++++++++-
 htdocs/core/modules/modAccounting.class.php   |  6 ++
 htdocs/langs/en_US/accountancy.lang           |  2 +-
 htdocs/langs/fr_FR/accountancy.lang           |  2 +-
 6 files changed, 117 insertions(+), 9 deletions(-)

diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 516af988334..92c2df3ba0e 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -48,6 +48,7 @@ $action = GETPOST('action', 'aZ09');
 $list = array(
 	'ACCOUNTING_LENGTH_GACCOUNT',
 	'ACCOUNTING_LENGTH_AACCOUNT',
+	'ACCOUNTING_LIMIT_LIST_VENTILATION'
 //    'ACCOUNTING_LENGTH_DESCRIPTION',         // adjust size displayed for lines description for dol_trunc
 //    'ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT', // adjust size displayed for select account description for dol_trunc
 );
@@ -248,7 +249,7 @@ if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL)) {
 print '</tr>';
 */
 
-print '<tr class="oddeven">';
+/*print '<tr class="oddeven">';
 print '<td>'.$langs->trans("BANK_DISABLE_DIRECT_INPUT").'</td>';
 if (!empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
 	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&disabledirectinput&value=0">';
@@ -259,7 +260,7 @@ if (!empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
 	print img_picto($langs->trans("Disabled"), 'switch_off');
 	print '</a></td>';
 }
-print '</tr>';
+print '</tr>';*/
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ACCOUNTANCY_COMBO_FOR_AUX").'</td>';
@@ -313,6 +314,21 @@ print '<tr class="liste_titre">';
 print '<td colspan="2">'.$langs->trans('BindingOptions').'</td>';
 print "</tr>\n";
 
+
+// TO DO Mutualize code for yes/no constants
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("").'</td>';
+if (!empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO)) {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&listsorttodo&value=0">';
+	print img_picto($langs->trans("Activated"), 'switch_on');
+	print '</a></td>';
+} else {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&listsorttodo&value=1">';
+	print img_picto($langs->trans("Disabled"), 'switch_off');
+	print '</a></td>';
+}
+print '</tr>';
+
 // TO DO Mutualize code for yes/no constants
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ACCOUNTING_LIST_SORT_VENTILATION_TODO").'</td>';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 6d663edcf4e..7219136c2da 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -85,7 +85,7 @@ $search_mvt_label = GETPOST('search_mvt_label', 'alpha');
 $search_direction = GETPOST('search_direction', 'alpha');
 $search_debit = GETPOST('search_debit', 'alpha');
 $search_credit = GETPOST('search_credit', 'alpha');
-$search_ledger_code = GETPOST('search_ledger_code', 'alpha');
+$search_ledger_code = GETPOST('search_ledger_code', 'array');
 $search_lettering_code = GETPOST('search_lettering_code', 'alpha');
 $search_not_reconciled = GETPOST('search_reconciled_option', 'alpha');
 
@@ -192,7 +192,7 @@ if (empty($reshook))
 		$search_accountancy_aux_code_end = '';
 		$search_mvt_label = '';
 		$search_direction = '';
-		$search_ledger_code = '';
+		$search_ledger_code = array();
 		$search_date_start = '';
 		$search_date_end = '';
 		$search_date_creation_start = '';
@@ -267,7 +267,9 @@ if (empty($reshook))
 	}
 	if (!empty($search_ledger_code)) {
 		$filter['t.code_journal'] = $search_ledger_code;
-		$param .= '&search_ledger_code='.urlencode($search_ledger_code);
+		foreach ($search_ledger_code as $code) {
+			$param .= '&search_ledger_code[]='.urlencode($code);
+		}
 	}
 	if (!empty($search_mvt_num)) {
 		$filter['t.piece_num'] = $search_mvt_num;
@@ -447,6 +449,8 @@ if (count($filter) > 0) {
 			$sqlwhere[] = natural_search($key, $value, 1, 1);
 		} elseif ($key == 't.reconciled_option') {
 			$sqlwhere[] = 't.lettering_code IS NULL';
+		} elseif ($key == 't.code_journal' && !empty($value)) {
+			$sqlwhere[] = natural_search("t.code_journal", join(',', $value), 3, 1);
 		} else {
 			$sqlwhere[] = natural_search($key, $value, 0, 1);
 		}
@@ -756,7 +760,9 @@ if (!empty($arrayfields['t.lettering_code']['checked']))
 // Code journal
 if (!empty($arrayfields['t.code_journal']['checked']))
 {
-	print '<td class="liste_titre center"><input type="text" name="search_ledger_code" size="3" value="'.$search_ledger_code.'"></td>';
+	print '<td class="liste_titre center">';
+	print $formaccounting->multi_select_journal($search_ledger_code, 'search_ledger_code', 0, 1, 1, 1);
+	print '</td>';
 }
 
 // Fields from hook
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index d6f7b269da1..373501a7adf 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -59,7 +59,7 @@ class FormAccounting extends Form
 	/**
 	 * Return list of journals with label by nature
 	 *
-	 * @param	string	$selectid	Preselected pcg_type
+	 * @param	string	$selectid	Preselected journal code
 	 * @param	string	$htmlname	Name of field in html form
 	 * @param	int		$nature		Limit the list to a particular type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
 	 * @param	int		$showempty	Add an empty field
@@ -136,6 +136,86 @@ class FormAccounting extends Form
 		return $out;
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return list of journals with label by nature
+	 *
+	 * @param	array	$selectids	Preselected journal code
+	 * @param	string	$htmlname	Name of field in html form
+	 * @param	int		$nature		Limit the list to a particular type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
+	 * @param	int		$showempty	Add an empty field
+	 * @param	int		$select_in	0=selectid value is the journal rowid (default) or 1=selectid is journal code
+	 * @param	int		$select_out	Set value returned by select. 0=rowid (default), 1=code
+	 * @param	string	$morecss	More css non HTML object
+	 * @param	string	$usecache	Key to use to store result into a cache. Next call with same key will reuse the cache.
+	 * @param   int     $disabledajaxcombo Disable ajax combo box.
+	 * @return	string				String with HTML select
+	 */
+	public function multi_select_journal($selectedIds=array(), $htmlname = 'journal', $nature = 0, $showempty = 0, $select_in = 0, $select_out = 0, $morecss = '', $usecache = '', $disabledajaxcombo = 0)
+	{
+		// phpcs:enable
+		global $conf, $langs;
+
+		$out = '';
+
+		$options = array();
+		if ($usecache && !empty($this->options_cache[$usecache]))
+		{
+			$options = $this->options_cache[$usecache];
+			$selected = $selectedIds;
+		} else {
+			$sql = "SELECT rowid, code, label, nature, entity, active";
+			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_journal";
+			$sql .= " WHERE active = 1";
+			$sql .= " AND entity = ".$conf->entity;
+			if ($nature && is_numeric($nature))   $sql .= " AND nature = ".$nature;
+			$sql .= " ORDER BY code";
+
+			dol_syslog(get_class($this)."::multi_select_journal", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+
+			if (!$resql) {
+				$this->error = "Error ".$this->db->lasterror();
+				dol_syslog(get_class($this)."::multi_select_journal ".$this->error, LOG_ERR);
+				return -1;
+			}
+
+			$selected = array();
+			$langs->load('accountancy');
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$label = $langs->trans($obj->label);
+
+				$select_value_in = $obj->rowid;
+				$select_value_out = $obj->rowid;
+
+				// Try to guess if we have found default value
+				if ($select_in == 1) {
+					$select_value_in = $obj->code;
+				}
+				if ($select_out == 1) {
+					$select_value_out = $obj->code;
+				}
+				// Remember guy's we store in database llx_accounting_bookkeeping the code of accounting_journal and not the rowid
+				if (!empty($selectedIds) && in_array($select_value_in, $selectedIds)) {
+					//var_dump("Found ".$selectid." ".$select_value_in);
+					$selected[] = $select_value_out;
+				}
+				$options[$select_value_out] = $label;
+			}
+			$this->db->free($resql);
+
+			if ($usecache)
+			{
+				$this->options_cache[$usecache] = $options;
+			}
+		}
+
+		$out .= Form::multiselectarray($htmlname, $options, $selected, $showempty, 0, $morecss, 0, 0, 0, 'code_journal', '',($disabledajaxcombo ? 0 : 1));
+
+		return $out;
+	}
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return list of accounting category.
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 811dd57544e..7eff70422ee 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -154,6 +154,12 @@ class modAccounting extends DolibarrModules
 				"csv",
 				"", 0, 'current', 0
 		);
+		$this->const[14] = array(
+			"ACCOUNTING_LIMIT_LIST_VENTILATION",
+			"chaine",
+			"50",
+			"", 0, 'current', 0
+		);
 
 		// Tabs
 		$this->tabs = array();
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 1d75fa153e8..c35d85e7bcb 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -144,7 +144,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to on list and bind shown by page (maximum recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index 6381caebbec..5309adfae93 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -137,7 +137,7 @@ NotVentilatedinAccount=Non lié au compte comptable
 XLineSuccessfullyBinded=%s produits/service correctement liés à un compte comptable
 XLineFailedToBeBinded=%s produits/services n'ont pu être liés à un compte comptable
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Nombre d'éléments à lier représentés par page (maximum recommandé: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Nombre de ligne des listes et d'éléments à lier représentés par page (maximum recommandé: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Commencez le tri de la page "Lien à réaliser" par les éléments les plus récents
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Commencez le tri de la page "Liens réalisés" par les éléments les plus récents
 

From c9373e318ed68b9944074e16b743a2ca66e0d8d2 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Sat, 7 Nov 2020 15:33:23 +0100
Subject: [PATCH 015/888] fix admin

---
 htdocs/accountancy/admin/index.php | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 92c2df3ba0e..6a33d009765 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -249,7 +249,7 @@ if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL)) {
 print '</tr>';
 */
 
-/*print '<tr class="oddeven">';
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("BANK_DISABLE_DIRECT_INPUT").'</td>';
 if (!empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
 	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&disabledirectinput&value=0">';
@@ -260,7 +260,7 @@ if (!empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
 	print img_picto($langs->trans("Disabled"), 'switch_off');
 	print '</a></td>';
 }
-print '</tr>';*/
+print '</tr>';
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ACCOUNTANCY_COMBO_FOR_AUX").'</td>';
@@ -314,21 +314,6 @@ print '<tr class="liste_titre">';
 print '<td colspan="2">'.$langs->trans('BindingOptions').'</td>';
 print "</tr>\n";
 
-
-// TO DO Mutualize code for yes/no constants
-print '<tr class="oddeven">';
-print '<td>'.$langs->trans("").'</td>';
-if (!empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO)) {
-	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&listsorttodo&value=0">';
-	print img_picto($langs->trans("Activated"), 'switch_on');
-	print '</a></td>';
-} else {
-	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&listsorttodo&value=1">';
-	print img_picto($langs->trans("Disabled"), 'switch_off');
-	print '</a></td>';
-}
-print '</tr>';
-
 // TO DO Mutualize code for yes/no constants
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ACCOUNTING_LIST_SORT_VENTILATION_TODO").'</td>';

From 259462b53a2f372a1094a820d42ece8642d7fc64 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sat, 7 Nov 2020 14:36:28 +0000
Subject: [PATCH 016/888] Fixing style errors.

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

diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 373501a7adf..14f97d23ebf 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -151,7 +151,7 @@ class FormAccounting extends Form
 	 * @param   int     $disabledajaxcombo Disable ajax combo box.
 	 * @return	string				String with HTML select
 	 */
-	public function multi_select_journal($selectedIds=array(), $htmlname = 'journal', $nature = 0, $showempty = 0, $select_in = 0, $select_out = 0, $morecss = '', $usecache = '', $disabledajaxcombo = 0)
+	public function multi_select_journal($selectedIds = array(), $htmlname = 'journal', $nature = 0, $showempty = 0, $select_in = 0, $select_out = 0, $morecss = '', $usecache = '', $disabledajaxcombo = 0)
 	{
 		// phpcs:enable
 		global $conf, $langs;
@@ -211,7 +211,7 @@ class FormAccounting extends Form
 			}
 		}
 
-		$out .= Form::multiselectarray($htmlname, $options, $selected, $showempty, 0, $morecss, 0, 0, 0, 'code_journal', '',($disabledajaxcombo ? 0 : 1));
+		$out .= Form::multiselectarray($htmlname, $options, $selected, $showempty, 0, $morecss, 0, 0, 0, 'code_journal', '', ($disabledajaxcombo ? 0 : 1));
 
 		return $out;
 	}

From 58cb63adf74c8648037b5067605f9770de4f34d5 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Sat, 7 Nov 2020 15:48:12 +0100
Subject: [PATCH 017/888] fix stockler

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

diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 373501a7adf..08268d6bb32 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -140,7 +140,7 @@ class FormAccounting extends Form
 	/**
 	 * Return list of journals with label by nature
 	 *
-	 * @param	array	$selectids	Preselected journal code
+	 * @param	array	$selectedIds	Preselected journal code array
 	 * @param	string	$htmlname	Name of field in html form
 	 * @param	int		$nature		Limit the list to a particular type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
 	 * @param	int		$showempty	Add an empty field

From 50d530733e7450ff3481baead7cbfb51a9e9fd26 Mon Sep 17 00:00:00 2001
From: jcp <jcprieto@virtual20.com>
Date: Mon, 9 Nov 2020 13:17:24 +0100
Subject: [PATCH 018/888] NEW: ICS fields moved into bank account table

---
 htdocs/admin/paymentbybanktransfer.php        |  6 ++-
 htdocs/admin/prelevement.php                  |  9 ++++-
 htdocs/compta/bank/card.php                   | 22 ++++++++++-
 htdocs/compta/bank/class/account.class.php    | 20 +++++++++-
 htdocs/compta/paymentbybanktransfer/index.php |  2 +-
 .../class/bonprelevement.class.php            |  7 ++--
 htdocs/compta/prelevement/create.php          | 39 +++++++++++++++----
 htdocs/core/lib/prelevement.lib.php           | 18 ++++++---
 .../bank/doc/pdf_sepamandate.modules.php      |  2 +-
 htdocs/langs/en_US/withdrawals.lang           |  6 ++-
 10 files changed, 107 insertions(+), 24 deletions(-)

diff --git a/htdocs/admin/paymentbybanktransfer.php b/htdocs/admin/paymentbybanktransfer.php
index 6a419d39e53..5449e927a4f 100644
--- a/htdocs/admin/paymentbybanktransfer.php
+++ b/htdocs/admin/paymentbybanktransfer.php
@@ -71,10 +71,10 @@ if ($action == "set")
         if (! $res > 0) $error++;
         */
 	} else $error++;
-
+/* Moved to account
 	$res = dolibarr_set_const($db, "PAYMENTBYBANKTRANSFER_ICS", GETPOST("PAYMENTBYBANKTRANSFER_ICS"), 'chaine', 0, '', $conf->entity);
 	if (!$res > 0) $error++;
-
+*/
 	if (GETPOST("PAYMENTBYBANKTRANSFER_USER") > 0)
 	{
 		$res = dolibarr_set_const($db, "PAYMENTBYBANKTRANSFER_USER", GETPOST("PAYMENTBYBANKTRANSFER_USER"), 'chaine', 0, '', $conf->entity);
@@ -156,11 +156,13 @@ print '<td class="left">';
 $form->select_comptes($conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT, 'PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT', 0, "courant=1", 1);
 print '</td></tr>';
 
+/* Moved to bank account data
 // ICS
 print '<tr class="oddeven"><td class="fieldrequired">'.$langs->trans("ICS").'</td>';
 print '<td class="left">';
 print '<input type="text" name="PAYMENTBYBANKTRANSFER_ICS" value="'.$conf->global->PAYMENTBYBANKTRANSFER_ICS.'" size="15" ></td>';
 print '</td></tr>';
+*/
 
 //User
 print '<tr class="oddeven"><td class="fieldrequired">'.$langs->trans("ResponsibleUser").'</td>';
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index c16b5c30c47..601cefc1dd2 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -70,11 +70,14 @@ if ($action == "set")
         $res = dolibarr_set_const($db, "PRELEVEMENT_RAISON_SOCIALE", $account->proprio,'chaine',0,'',$conf->entity);
         if (! $res > 0) $error++;
         */
+
 	} else $error++;
 
+/* Moved to account
+
 	$res = dolibarr_set_const($db, "PRELEVEMENT_ICS", GETPOST("PRELEVEMENT_ICS"), 'chaine', 0, '', $conf->entity);
 	if (!$res > 0) $error++;
-
+*/
 	if (GETPOST("PRELEVEMENT_USER") > 0)
 	{
 		$res = dolibarr_set_const($db, "PRELEVEMENT_USER", GETPOST("PRELEVEMENT_USER"), 'chaine', 0, '', $conf->entity);
@@ -149,13 +152,16 @@ print '<td class="titlefieldcreate">'.$langs->trans("Parameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>";
 
+
 // Bank account (from Banks module)
 print '<tr class="oddeven"><td class="fieldrequired">'.$langs->trans("BankToReceiveWithdraw").'</td>';
 print '<td class="left">';
 $form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT, 'PRELEVEMENT_ID_BANKACCOUNT', 0, "courant=1", 1);
 print '</td></tr>';
 
+/* Moved to bank account data
 // ICS
+
 print '<tr class="oddeven"><td class="fieldrequired">';
 $htmltext = $langs->trans("AskThisIDToYourBank");
 print $form->textwithpicto($langs->trans("ICS"), $htmltext);
@@ -164,6 +170,7 @@ print '<td class="left">';
 print '<input type="text" name="PRELEVEMENT_ICS" value="'.$conf->global->PRELEVEMENT_ICS.'" size="15" >';
 print '</td>';
 print '</td></tr>';
+*/
 
 //User
 print '<tr class="oddeven"><td class="fieldrequired">'.$langs->trans("ResponsibleUser").'</td>';
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 8b086516351..83940f4ac43 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -94,6 +94,9 @@ if ($action == 'add')
 
 	$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
 	$object->owner_address   = trim(GETPOST("owner_address", 'nohtml'));
+	
+	$object->ics             = trim($_POST["ics"]);
+	$object->ics_transfer    = trim($_POST["ics_transfer"]);
 
 	$account_number = GETPOST('account_number', 'alphanohtml');
 	if (empty($account_number) || $account_number == '-1')
@@ -195,6 +198,9 @@ if ($action == 'update')
 
 	$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
 	$object->owner_address   = trim(GETPOST("owner_address", 'nohtml'));
+	
+	$object->ics             = trim($_POST["ics"]);
+	$object->ics_transfer    = trim($_POST["ics_transfer"]);
 
 	$account_number = GETPOST('account_number', 'alpha');
 	if (empty($account_number) || $account_number == '-1')
@@ -730,6 +736,14 @@ if ($action == 'create')
 				}
 			}
 			print '</td></tr>';
+			
+			print '<tr><td>'.$langs->trans("ICS").'</td>';
+			print '<td>'.$object->ics.'</td>';
+			print '</tr>';
+			
+			print '<tr><td>'.$langs->trans("ICSTransfer").'</td>';
+			print '<td>'.$object->ics_transfer.'</td>';
+			print '</tr>';
 
 			print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
 			print nl2br($object->domiciliation);
@@ -1010,7 +1024,13 @@ if ($action == 'create')
 
 			print '<tr><td>'.$langs->trans($bickey).'</td>';
 			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="bic" value="'.$object->bic.'"></td></tr>';
-
+			
+			print '<tr><td>'.$langs->trans("ICS").'</td>';
+			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="ics" value="'.$object->ics.'"></td></tr>';
+			
+			print '<tr><td>'.$langs->trans("ICSTransfer").'</td>';
+			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="ics_transfer" value="'.$object->ics_transfer.'"></td></tr>';
+			
 			print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
 			print '<textarea class="flat quatrevingtpercent" name="domiciliation" rows="'.ROWS_2.'">';
 			print $object->domiciliation;
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index e93491ceee4..0e80b21f644 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2015-2016	Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2015-2017	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2016		Ferran Marcet   		<fmarcet@2byte.es>
+ * Copyright (C) 2019		JC Prieto				<jcprieto@virtual20.com><prietojc@gmail.com>
  *
  * 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
@@ -213,6 +214,14 @@ class Account extends CommonObject
 	 * @var int
 	 */
 	public $date_solde;
+	
+	/**
+	 * Creditor Identifier CI and Transfer ICS. Some banks use different ICS for direct debit and bank tranfer
+	 * @var string
+	 */
+	public $ics;
+	public $ics_transfer;
+	
 
 
 	/**
@@ -652,6 +661,8 @@ class Account extends CommonObject
 		$sql .= ", comment";
 		$sql .= ", state_id";
 		$sql .= ", fk_pays";
+		$sql .= ", ics";
+		$sql .= ", ics_transfer";
 		$sql .= ") VALUES (";
 		$sql .= "'".$this->db->idate($now)."'";
 		$sql .= ", '".$this->db->escape($this->ref)."'";
@@ -676,6 +687,8 @@ class Account extends CommonObject
 		$sql .= ", '".$this->db->escape($this->comment)."'";
 		$sql .= ", ".($this->state_id > 0 ? $this->state_id : "null");
 		$sql .= ", ".$this->country_id;
+		$sql .= ", ".$this->db->escape($this->ics);
+		$sql .= ", ".$this->db->escape($this->ics_transfer);
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -804,6 +817,8 @@ class Account extends CommonObject
 
 		$sql .= ",state_id = ".($this->state_id > 0 ? $this->state_id : "null");
 		$sql .= ",fk_pays = ".$this->country_id;
+		$sql .= ",ics='".$this->db->escape($this->ics)."'";
+		$sql .= ",ics_transfer='".$this->db->escape($this->ics_transfer)."'";
 
 		$sql .= " WHERE rowid = ".$this->id;
 
@@ -922,7 +937,7 @@ class Account extends CommonObject
 		$sql .= " ba.domiciliation, ba.proprio, ba.owner_address, ba.state_id, ba.fk_pays as country_id,";
 		$sql .= " ba.account_number, ba.fk_accountancy_journal, ba.currency_code,";
 		$sql .= " ba.min_allowed, ba.min_desired, ba.comment,";
-		$sql .= " ba.datec as date_creation, ba.tms as date_update,";
+		$sql .= " ba.datec as date_creation, ba.tms as date_update, ba.ics, ba.ics_transfer,";
 		$sql .= ' c.code as country_code, c.label as country,';
 		$sql .= ' d.code_departement as state_code, d.nom as state';
 		$sql .= ' , aj.code as accountancy_journal';
@@ -983,6 +998,9 @@ class Account extends CommonObject
 
 				$this->date_creation  = $this->db->jdate($obj->date_creation);
 				$this->date_update    = $this->db->jdate($obj->date_update);
+				
+				$this->ics           = $obj->ics;
+				$this->ics_transfer  = $obj->ics_transfer;
 
 				// Retrieve all extrafield
 				// fetch optionals attributes and labels
diff --git a/htdocs/compta/paymentbybanktransfer/index.php b/htdocs/compta/paymentbybanktransfer/index.php
index 78425398017..c6788d0edc6 100644
--- a/htdocs/compta/paymentbybanktransfer/index.php
+++ b/htdocs/compta/paymentbybanktransfer/index.php
@@ -55,7 +55,7 @@ $result = restrictedArea($user, 'paymentbybanktransfer', '', '');
 
 llxHeader('', $langs->trans("SuppliersStandingOrdersArea"));
 
-if (prelevement_check_config() < 0)
+if (prelevement_check_config('bank-transfer') < 0)
 {
 	$langs->load("errors");
 	setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Withdraw")), null, 'errors');
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index bcf0ce8aa5a..24cd58a7601 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2010-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2014-2016 Ferran Marcet       <fmarcet@2byte.es>
  * Copyright (C) 2018      Nicolas ZABOURI     <info@inovea-conseil.com>
+ * Copyright (C) 2019		JC Prieto			<jcprieto@virtual20.com><prietojc@gmail.com>
  *
  * 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
@@ -1154,7 +1155,7 @@ class BonPrelevement extends CommonObject
 						$this->emetteur_iban               = $account->iban;
 						$this->emetteur_bic                = $account->bic;
 
-						$this->emetteur_ics                = $conf->global->PRELEVEMENT_ICS; // Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
+						$this->emetteur_ics                = ($type == 'bank-transfer' ? $account->ics_transfer : $account->ics); 
 
 						$this->raison_sociale              = $account->proprio;
 					}
@@ -1585,7 +1586,7 @@ class BonPrelevement extends CommonObject
 				fputs($this->file, '				<Id>'.$CrLf);
 				fputs($this->file, '				    <PrvtId>'.$CrLf);
 				fputs($this->file, '					<Othr>'.$CrLf);
-				fputs($this->file, '						<Id>'.$conf->global->PRELEVEMENT_ICS.'</Id>'.$CrLf);
+				fputs($this->file, '						<Id>'.$this->emetteur_ics.'</Id>'.$CrLf);
 				fputs($this->file, '					</Othr>'.$CrLf);
 				fputs($this->file, '				    </PrvtId>'.$CrLf);
 				fputs($this->file, '				</Id>'.$CrLf);
@@ -2126,7 +2127,7 @@ class BonPrelevement extends CommonObject
 			$this->emetteur_iban = $account->iban;
 			$this->emetteur_bic = $account->bic;
 
-			$this->emetteur_ics = $conf->global->PRELEVEMENT_ICS; // Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
+			$this->emetteur_ics = $account->ics; // Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
 
 			$this->raison_sociale = $account->proprio;
 		}
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index e93b2a7472d..0d29c578a8e 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -49,6 +49,7 @@ $type = GETPOST('type', 'aZ09');
 $action = GETPOST('action', 'aZ09');
 $mode = GETPOST('mode', 'alpha') ?GETPOST('mode', 'alpha') : 'real';
 $format = GETPOST('format', 'aZ09');
+$id_bankaccount = GETPOST ( 'id_bankaccount','int' );
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
@@ -77,11 +78,28 @@ if (empty($reshook))
 	}
 	if ($action == 'create')
 	{
+		$default_account=($type == 'bank-transfer' ? 'PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT' : 'PRELEVEMENT_ID_BANKACCOUNT');
+		
+		if($id_bankaccount != $conf->global->{$default_account}){
+			$res = dolibarr_set_const($db, $default_account, $id_bankaccount, 'chaine', 0, '', $conf->entity);	//Set as default
+			
+		}
+		
+		require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+		$bank = new Account($db);
+		$bank->fetch($conf->global->{$default_account});
+		if (empty($bank->ics) || empty($bank->ics_transfer)){
+			setEventMessages($langs->trans("ErrorICSmissing", $bank->getNomUrl(1)), null, 'errors');
+			header("Location: ".DOL_URL_ROOT.'/compta/prelevement/create.php');
+			exit;
+		}
+			
+
 		$delayindays = 0;
 		if ($type != 'bank-transfer') {
-			$conf->global->PRELEVEMENT_ADDDAYS;
+			$delayindays = $conf->global->PRELEVEMENT_ADDDAYS;
 		} else {
-			$conf->global->PAYMENTBYBANKTRANSFER_ADDDAYS;
+			$delayindays = $conf->global->PAYMENTBYBANKTRANSFER_ADDDAYS;
 		}
 		$bprev = new BonPrelevement($db);
 		$executiondate = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), (GETPOST('reday', 'int') + $delayindays), GETPOST('reyear', 'int'));
@@ -128,12 +146,13 @@ $bprev = new BonPrelevement($db);
 
 llxHeader('', $langs->trans("NewStandingOrder"));
 
-if (prelevement_check_config() < 0)
+if (prelevement_check_config($type) < 0)
 {
 	$langs->load("errors");
 	setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Withdraw")), null, 'errors');
 }
 
+
 /*$h=0;
 $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/create.php';
 $head[$h][1] = $langs->trans("NewStandingOrder");
@@ -188,10 +207,16 @@ print '<form action="'.$_SERVER['PHP_SELF'].'?action=create" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="type" value="'.$type.'">';
 if ($nb) {
-	if ($pricetowithdraw) {
-		print $langs->trans('ExecutionDate').' ';
-		$datere = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-		print $form->selectDate($datere, 're');
+
+    if ($pricetowithdraw) {
+    	print $langs->trans('BankToReceiveWithdraw').': ';
+    	$form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT, 'id_bankaccount', 0, "courant=1");
+    	print ' - ';
+    	
+        print $langs->trans('ExecutionDate').' ';
+        $datere = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+        print $form->selectDate($datere, 're');
+
 
 		if ($mysoc->isInEEC()) {
 			$title = $langs->trans("CreateForSepa");
diff --git a/htdocs/core/lib/prelevement.lib.php b/htdocs/core/lib/prelevement.lib.php
index 8008c9fd51f..ac3c7b8b0fd 100644
--- a/htdocs/core/lib/prelevement.lib.php
+++ b/htdocs/core/lib/prelevement.lib.php
@@ -78,13 +78,21 @@ function prelevement_prepare_head(BonPrelevement $object)
 /**
  *	Check need data to create standigns orders receipt file
  *
+ *	@param	string	$type		'bank-transfer' or 'direct-debit'
+ *
  *	@return    	int		-1 if ko 0 if ok
  */
-function prelevement_check_config()
+function prelevement_check_config($type='direct-debit')
 {
-	global $conf;
-	if (empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) return -1;
-	if (empty($conf->global->PRELEVEMENT_ICS)) return -1;
-	if (empty($conf->global->PRELEVEMENT_USER)) return -1;
+	global $conf, $db;
+	if ($type == 'bank-transfer'){
+		if (empty($conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT)) return -1;
+		//if (empty($conf->global->PRELEVEMENT_ICS)) return -1;
+		if (empty($conf->global->PAYMENTBYBANKTRANSFER_USER)) return -1;
+	}else{
+		if (empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) return -1;
+		//if (empty($conf->global->PRELEVEMENT_ICS)) return -1;
+		if (empty($conf->global->PRELEVEMENT_USER)) return -1;
+	}
 	return 0;
 }
diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index 2b8987958f4..17f1252925a 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -229,7 +229,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$posY += 2;
 				$pdf->SetXY($this->marge_gauche, $posY);
 				$ics = '';
-				if (!empty($conf->global->PRELEVEMENT_ICS)) $ics = $conf->global->PRELEVEMENT_ICS;
+				if (!empty($conf->global->PRELEVEMENT_ICS)) $ics = $conf->global->PRELEVEMENT_ICS;	
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("CreditorIdentifier").' ('.$outputlangs->transnoentitiesnoconv("ICS").') : '.$ics, 0, 'L');
 
 				$posY = $pdf->GetY();
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index 553e3ac0eaa..c044ba16613 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -131,7 +131,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -145,4 +146,5 @@ InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
-ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
\ No newline at end of file
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s 
\ No newline at end of file

From eb0fd1674d26a8157ff133173f9177ee6a23e81f Mon Sep 17 00:00:00 2001
From: jcp <jcprieto@virtual20.com>
Date: Mon, 9 Nov 2020 18:39:34 +0100
Subject: [PATCH 019/888] Update ICS

---
 htdocs/compta/prelevement/class/bonprelevement.class.php | 2 +-
 htdocs/install/mysql/tables/llx_bank_account.sql         | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 24cd58a7601..2fff6336985 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -2127,7 +2127,7 @@ class BonPrelevement extends CommonObject
 			$this->emetteur_iban = $account->iban;
 			$this->emetteur_bic = $account->bic;
 
-			$this->emetteur_ics = $account->ics; // Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
+			$this->emetteur_ics = ($type == 'bank-transfer' ? $account->ics_transfer : $account->ics);  // Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
 
 			$this->raison_sociale = $account->proprio;
 		}
diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql
index 4ac90dd961d..aed803cc7ea 100644
--- a/htdocs/install/mysql/tables/llx_bank_account.sql
+++ b/htdocs/install/mysql/tables/llx_bank_account.sql
@@ -59,5 +59,7 @@ create table llx_bank_account
   note_public				text,
   model_pdf					varchar(255),
   import_key				varchar(14),
-  extraparams			    varchar(255)				-- for other parameters with json format
+  extraparams			    varchar(255),				-- for other parameters with json format
+  ics						varchar(32),			-- Creditor Identifier CI
+  ics_transfer			varchar(32)				-- Creditor Identifier CI for transfer
 )ENGINE=innodb;

From f4566fe0f1fa8dace06466e45e65ccc690bb1ffd Mon Sep 17 00:00:00 2001
From: Bahfir Abbes <bafbes@gmail.com>
Date: Mon, 9 Nov 2020 22:20:20 +0100
Subject: [PATCH 020/888] fix:link name

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

diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index fb0ce5a91f5..75d6a33c43b 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -510,7 +510,7 @@ class Notify
                                 $mesg = $outputlangs->transnoentitiesnoconv("EMailTextHolidayApproved", $link);
                                 break;
                             case 'ACTION_CREATE':
-                                $link = '<a href="'.$urlwithroot.'/actioncomm/card.php?id='.$object->id.'">'.$newref.'</a>';
+                                $link = '<a href="'.$urlwithroot.'/comm/action/card.php?id='.$object->id.'">'.$newref.'</a>';
                                 $dir_output = $conf->agenda->dir_output;
                                 $object_type = 'action';
                                 $mesg = $outputlangs->transnoentitiesnoconv("EMailTextActionAdded", $link);
@@ -726,7 +726,7 @@ class Notify
 						$mesg = $langs->transnoentitiesnoconv("EMailTextHolidayApproved", $link);
 						break;
                     case 'ACTION_CREATE':
-                        $link = '<a href="'.$urlwithroot.'/actioncomm/card.php?id='.$object->id.'">'.$newref.'</a>';
+                        $link = '<a href="'.$urlwithroot.'/comm/action/card.php?id='.$object->id.'">'.$newref.'</a>';
                         $dir_output = $conf->agenda->dir_output;
                         $object_type = 'action';
                         $mesg = $langs->transnoentitiesnoconv("EMailTextActionAdded", $link);

From 25fd41fa93023b1e9e4bbc20c5ca52a951d98c68 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 10 Nov 2020 04:17:07 +0100
Subject: [PATCH 021/888] Dev multifilter jounal on ledger (complete)

---
 htdocs/accountancy/bookkeeping/listbyaccount.php | 16 ++++++++++------
 .../accountancy/bookkeeping/listbysubaccount.php | 14 +++++++++-----
 htdocs/accountancy/class/bookkeeping.class.php   |  4 +++-
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 45e8c6aee70..a46a12625fa 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2016       Neil Orley          <neil.orley@oeris.fr>
  * Copyright (C) 2013-2016  Olivier Geffroy     <jeff@jeffinfo.com>
- * Copyright (C) 2013-2016  Florian Henry       <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2020  Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2013-2020  Alexandre Spangaro  <aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Frédéric France     <frederic.france@netlogic.fr>
  *
@@ -22,7 +22,7 @@
 /**
  * \file 		htdocs/accountancy/bookkeeping/listbyaccount.php
  * \ingroup 	Accountancy (Double entries)
- * \brief 		List operation of book keeping ordered by account number
+ * \brief 		List operation of ledger ordered by account number
  */
 
 require '../../main.inc.php';
@@ -56,7 +56,7 @@ $search_doc_ref = GETPOST('search_doc_ref', 'alpha');
 $search_label_operation = GETPOST('search_label_operation', 'alpha');
 $search_mvt_num = GETPOST('search_mvt_num', 'int');
 $search_direction = GETPOST('search_direction', 'alpha');
-$search_ledger_code = GETPOST('search_ledger_code', 'alpha');
+$search_ledger_code = GETPOST('search_ledger_code', 'array');
 $search_debit = GETPOST('search_debit', 'alpha');
 $search_credit = GETPOST('search_credit', 'alpha');
 $search_lettering_code = GETPOST('search_lettering_code', 'alpha');
@@ -151,7 +151,7 @@ if (empty($reshook))
 		$search_label_operation = '';
 		$search_mvt_num = '';
 		$search_direction = '';
-		$search_ledger_code = '';
+		$search_ledger_code = array();
 		$search_date_start = '';
 		$search_date_end = '';
 		$search_date_startyear = '';
@@ -212,7 +212,9 @@ if (empty($reshook))
 	}
 	if (!empty($search_ledger_code)) {
 		$filter['t.code_journal'] = $search_ledger_code;
-		$param .= '&search_ledger_code='.urlencode($search_ledger_code);
+		foreach ($search_ledger_code as $code) {
+			$param .= '&search_ledger_code[]='.urlencode($code);
+		}
 	}
 	if (!empty($search_debit)) {
 		$filter['t.debit'] = $search_debit;
@@ -426,7 +428,9 @@ print '<tr class="liste_titre_filter">';
 
 // Code journal
 if (!empty($arrayfields['t.code_journal']['checked'])) {
-	print '<td class="liste_titre center"><input type="text" name="search_ledger_code" size="3" value="'.dol_escape_htmltag($search_ledger_code).'"></td>';
+	print '<td class="liste_titre center">';
+	print $formaccounting->multi_select_journal($search_ledger_code, 'search_ledger_code', 0, 1, 1, 1);
+	print '</td>';
 }
 // Date document
 if (!empty($arrayfields['t.doc_date']['checked'])) {
diff --git a/htdocs/accountancy/bookkeeping/listbysubaccount.php b/htdocs/accountancy/bookkeeping/listbysubaccount.php
index c286780e572..a7ceeaa2114 100644
--- a/htdocs/accountancy/bookkeeping/listbysubaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbysubaccount.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2016       Neil Orley          <neil.orley@oeris.fr>
  * Copyright (C) 2013-2016  Olivier Geffroy     <jeff@jeffinfo.com>
- * Copyright (C) 2013-2016  Florian Henry       <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2020  Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2013-2020  Alexandre Spangaro  <aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  *
@@ -56,7 +56,7 @@ $search_doc_ref = GETPOST('search_doc_ref', 'alpha');
 $search_label_operation = GETPOST('search_label_operation', 'alpha');
 $search_mvt_num = GETPOST('search_mvt_num', 'int');
 $search_direction = GETPOST('search_direction', 'alpha');
-$search_ledger_code = GETPOST('search_ledger_code', 'alpha');
+$search_ledger_code = GETPOST('search_ledger_code', 'array');
 $search_debit = GETPOST('search_debit', 'alpha');
 $search_credit = GETPOST('search_credit', 'alpha');
 $search_lettering_code = GETPOST('search_lettering_code', 'alpha');
@@ -151,7 +151,7 @@ if (empty($reshook))
 		$search_label_operation = '';
 		$search_mvt_num = '';
 		$search_direction = '';
-		$search_ledger_code = '';
+		$search_ledger_code = array();
 		$search_date_start = '';
 		$search_date_end = '';
 		$search_date_startyear = '';
@@ -212,7 +212,9 @@ if (empty($reshook))
 	}
 	if (!empty($search_ledger_code)) {
 		$filter['t.code_journal'] = $search_ledger_code;
-		$param .= '&search_ledger_code='.urlencode($search_ledger_code);
+		foreach ($search_ledger_code as $code) {
+			$param .= '&search_ledger_code[]='.urlencode($code);
+		}
 	}
 	if (!empty($search_debit)) {
 		$filter['t.debit'] = $search_debit;
@@ -423,7 +425,9 @@ print '<tr class="liste_titre_filter">';
 
 // Code journal
 if (!empty($arrayfields['t.code_journal']['checked'])) {
-	print '<td class="liste_titre center"><input type="text" name="search_ledger_code" size="3" value="'.dol_escape_htmltag($search_ledger_code).'"></td>';
+	print '<td class="liste_titre center">';
+	print $formaccounting->multi_select_journal($search_ledger_code, 'search_ledger_code', 0, 1, 1, 1);
+	print '</td>';
 }
 // Date document
 if (!empty($arrayfields['t.doc_date']['checked'])) {
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 505c51d27fe..fa5df691fdc 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2014-2017  Olivier Geffroy     <jeff@jeffinfo.com>
  * Copyright (C) 2015-2017  Alexandre Spangaro  <aspangaro@open-dsi.fr>
- * Copyright (C) 2015-2017  Florian Henry       <florian.henry@open-concept.pro>
+ * Copyright (C) 2015-2020  Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2018-2020  Frédéric France     <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -825,6 +825,8 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.credit' || $key == 't.debit') {
 					$sqlwhere[] = natural_search($key, $value, 1, 1);
+                } elseif ($key == 't.code_journal' && !empty($value)) {
+                    $sqlwhere[] = natural_search("t.code_journal", join(',', $value), 3, 1);
 				} else {
 					$sqlwhere[] = natural_search($key, $value, 0, 1);
 				}

From 7e3ef08b253e988d067eeae151ea7211989a4916 Mon Sep 17 00:00:00 2001
From: jcp <jcprieto@virtual20.com>
Date: Tue, 10 Nov 2020 19:14:49 +0100
Subject: [PATCH 022/888] ICS update

---
 htdocs/compta/bank/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 83940f4ac43..1e79b801385 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -1026,10 +1026,10 @@ if ($action == 'create')
 			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="bic" value="'.$object->bic.'"></td></tr>';
 			
 			print '<tr><td>'.$langs->trans("ICS").'</td>';
-			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="ics" value="'.$object->ics.'"></td></tr>';
+			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="32" type="text" class="flat" name="ics" value="'.$object->ics.'"></td></tr>';
 			
 			print '<tr><td>'.$langs->trans("ICSTransfer").'</td>';
-			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="ics_transfer" value="'.$object->ics_transfer.'"></td></tr>';
+			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="32" type="text" class="flat" name="ics_transfer" value="'.$object->ics_transfer.'"></td></tr>';
 			
 			print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
 			print '<textarea class="flat quatrevingtpercent" name="domiciliation" rows="'.ROWS_2.'">';

From 8650054c34e8ced41ecf0a1ce69ae2e960f7ddf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 10 Nov 2020 22:11:03 +0100
Subject: [PATCH 023/888] Update llx_adherent.sql

---
 htdocs/install/mysql/tables/llx_adherent.sql | 47 ++++++++++----------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql
index 6b5490b282d..41646dc7d01 100644
--- a/htdocs/install/mysql/tables/llx_adherent.sql
+++ b/htdocs/install/mysql/tables/llx_adherent.sql
@@ -27,6 +27,7 @@
 create table llx_adherent
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
+  ref						   varchar(30) NOT NULL,	      -- member reference number
   entity           integer DEFAULT 1 NOT NULL,	-- multi company id
   ref_ext          varchar(128),                -- reference into an external system (not used by dolibarr)
 
@@ -34,13 +35,13 @@ create table llx_adherent
   civility         varchar(6),
   lastname         varchar(50),
   firstname        varchar(50),
-  login            varchar(50),          -- login
-  pass             varchar(50),          -- password
+  login            varchar(50),                 -- login
+  pass             varchar(50),                 -- password
   pass_crypted     varchar(128),
   fk_adherent_type integer NOT NULL,
-  morphy           varchar(3) NOT NULL, -- personne morale / personne physique
-  societe          varchar(128),			-- company name (should be same length than societe.name). No more used.
-  fk_soc           integer NULL,		-- Link to third party linked to member
+  morphy           varchar(3) NOT NULL,         -- personne morale / personne physique
+  societe          varchar(128),			          -- company name (should be same length than societe.name). No more used.
+  fk_soc           integer NULL,		            -- Link to third party linked to member
   address          text,
   zip              varchar(30),
   town             varchar(50),
@@ -48,34 +49,34 @@ create table llx_adherent
   country          integer,
   email            varchar(255),
 
-  socialnetworks   text DEFAULT NULL,       -- json with socialnetworks
-  skype            varchar(255),
-  twitter          varchar(255),                        		--
-  facebook         varchar(255),                        		--
-  linkedin         varchar(255),                        		--
-  instagram        varchar(255),                        		--
-  snapchat         varchar(255),                        		--
-  googleplus       varchar(255),                        		--
-  youtube          varchar(255),                        		--
-  whatsapp         varchar(255),                        		--
+  socialnetworks   text DEFAULT NULL,           -- json with socialnetworks
+  skype            varchar(255),                -- deprecated
+  twitter          varchar(255),                -- deprecated
+  facebook         varchar(255),                -- deprecated
+  linkedin         varchar(255),                -- deprecated
+  instagram        varchar(255),                -- deprecated
+  snapchat         varchar(255),                -- deprecated
+  googleplus       varchar(255),                -- deprecated
+  youtube          varchar(255),                -- deprecated
+  whatsapp         varchar(255),                -- deprecated
 
   phone            varchar(30),
   phone_perso      varchar(30),
   phone_mobile     varchar(30),
-  birth            date,             -- birthday
-  photo            varchar(255),     -- filename or url of photo
+  birth            date,                        -- birthday
+  photo            varchar(255),                -- filename or url of photo
   statut           smallint NOT NULL DEFAULT 0,
   public           smallint NOT NULL DEFAULT 0, -- certain champ de la fiche sont ils public ou pas ?
-  datefin          datetime,  -- date de fin de validite de la cotisation
+  datefin          datetime,                    -- date de fin de validite de la cotisation
   note_private     text DEFAULT NULL,
   note_public      text DEFAULT NULL,
-  model_pdf		   varchar(255),
-  datevalid        datetime,  -- date de validation
-  datec            datetime,  -- date de creation
+  model_pdf		     varchar(255),
+  datevalid        datetime,                    -- date de validation
+  datec            datetime,                    -- date de creation
   tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, -- last modification date
-  fk_user_author   integer,   -- can be null because member can be create by a guest
+  fk_user_author   integer,                     -- can be null because member can be create by a guest
   fk_user_mod      integer,
   fk_user_valid    integer,
-  canvas		   varchar(32),			                        -- type of canvas if used (null by default)
+  canvas		       varchar(32),			            -- type of canvas if used (null by default)
   import_key       varchar(14)                  -- Import key
 )ENGINE=innodb;

From 87678bff7fcd43995d7642d69816907016976043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 10 Nov 2020 22:14:37 +0100
Subject: [PATCH 024/888] Update 12.0.0-13.0.0.sql

---
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index e0fd93aa005..c8567cbee4b 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -58,6 +58,9 @@ ALTER TABLE llx_mrp_mo_extrafields ADD INDEX idx_mrp_mo_fk_object(fk_object);
 
 
 -- For v13
+-- members
+ALTER TABLE llx_adherent ADD COLUMN ref varchar(30) NOT NULL AFTER rowid;
+UPDATE llx_adherent SET ref=rowid;
 
 ALTER TABLE llx_bom_bom ADD COLUMN bomtype integer DEFAULT 0;
 

From 22713ae9fb17dd9c7cf35775a6bcd50942423531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 10 Nov 2020 22:19:21 +0100
Subject: [PATCH 025/888] Update llx_adherent.key.sql

---
 htdocs/install/mysql/tables/llx_adherent.key.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/mysql/tables/llx_adherent.key.sql b/htdocs/install/mysql/tables/llx_adherent.key.sql
index 2b176bef2d1..750caff808a 100644
--- a/htdocs/install/mysql/tables/llx_adherent.key.sql
+++ b/htdocs/install/mysql/tables/llx_adherent.key.sql
@@ -19,6 +19,7 @@
 
 
 ALTER TABLE llx_adherent ADD UNIQUE INDEX uk_adherent_login (login, entity);
+ALTER TABLE llx_adherent ADD UNIQUE INDEX uk_adherent_ref (ref, entity);
 ALTER TABLE llx_adherent ADD UNIQUE INDEX uk_adherent_fk_soc (fk_soc);
 
 ALTER TABLE llx_adherent ADD INDEX idx_adherent_fk_adherent_type (fk_adherent_type);

From 016c9915ef329f8bd8c450c7a80833b1211fbd2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 10 Nov 2020 22:19:58 +0100
Subject: [PATCH 026/888] Update 12.0.0-13.0.0.sql

add ref in class

add ref in getNomUrl

add ref on card
---
 htdocs/adherents/card.php                     |  2 +-
 htdocs/adherents/class/adherent.class.php     | 26 +++++++++++++------
 htdocs/adherents/list.php                     | 25 +++++++++++-------
 .../install/mysql/migration/12.0.0-13.0.0.sql |  1 +
 htdocs/install/mysql/tables/llx_adherent.sql  |  6 ++---
 5 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index bd3ad481cd8..ecfcc9caad3 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1066,7 +1066,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<table class="border centpercent">';
 
 		// Ref
-		print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td class="valeur">'.$object->id.'</td></tr>';
+		print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td class="valeur">'.$object->ref.'</td></tr>';
 
 		// Login
 		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 009c73cf318..539524756c9 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -287,6 +287,7 @@ class Adherent extends CommonObject
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
+		'ref' => array('type' => 'varchar(30)', 'label' => 'Ref', 'default' => 1, 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 12, 'index' => 1),
 		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
 		'ref_ext' => array('type' => 'varchar(128)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 0, 'position' => 20),
 		'civility' => array('type' => 'varchar(6)', 'label' => 'Civility', 'enabled' => 1, 'visible' => -1, 'position' => 25),
@@ -416,6 +417,7 @@ class Adherent extends CommonObject
 		$infos = '';
 		if ($this->civility_id) $infos .= $langs->transnoentities("UserTitle").": ".$this->getCivilityLabel()."\n";
 		$infos .= $langs->transnoentities("id").": ".$this->id."\n";
+		$infos .= $langs->transnoentities("ref").": ".$this->ref."\n";
 		$infos .= $langs->transnoentities("Lastname").": ".$this->lastname."\n";
 		$infos .= $langs->transnoentities("Firstname").": ".$this->firstname."\n";
 		$infos .= $langs->transnoentities("Company").": ".$this->company."\n";
@@ -437,15 +439,20 @@ class Adherent extends CommonObject
 
 		// Substitutions
 		$substitutionarray = array(
-			'__ID__' => $this->id, '__MEMBER_ID__' => $this->id, '__CIVILITY__' => $this->getCivilityLabel(),
+			'__ID__' => $this->id,
+			'__REF__' => $this->ref,
+			'__MEMBER_ID__' => $this->id,
+			'__CIVILITY__' => $this->getCivilityLabel(),
 			'__FIRSTNAME__' => $msgishtml ? dol_htmlentitiesbr($this->firstname) : ($this->firstname ? $this->firstname : ''),
 			'__LASTNAME__' => $msgishtml ? dol_htmlentitiesbr($this->lastname) : ($this->lastname ? $this->lastname : ''),
 			'__FULLNAME__' => $msgishtml ? dol_htmlentitiesbr($this->getFullName($langs)) : $this->getFullName($langs),
 			'__COMPANY__' => $msgishtml ? dol_htmlentitiesbr($this->company) : ($this->company ? $this->company : ''),
 			'__ADDRESS__' => $msgishtml ? dol_htmlentitiesbr($this->address) : ($this->address ? $this->address : ''),
-			'__ZIP__' => $msgishtml ? dol_htmlentitiesbr($this->zip) : ($this->zip ? $this->zip : ''), '__TOWN__' => $msgishtml ? dol_htmlentitiesbr($this->town) : ($this->town ? $this->town : ''),
+			'__ZIP__' => $msgishtml ? dol_htmlentitiesbr($this->zip) : ($this->zip ? $this->zip : ''),
+			'__TOWN__' => $msgishtml ? dol_htmlentitiesbr($this->town) : ($this->town ? $this->town : ''),
 			'__COUNTRY__' => $msgishtml ? dol_htmlentitiesbr($this->country) : ($this->country ? $this->country : ''),
-			'__EMAIL__' => $msgishtml ? dol_htmlentitiesbr($this->email) : ($this->email ? $this->email : ''), '__BIRTH__' => $msgishtml ? dol_htmlentitiesbr($birthday) : ($birthday ? $birthday : ''),
+			'__EMAIL__' => $msgishtml ? dol_htmlentitiesbr($this->email) : ($this->email ? $this->email : ''),
+			'__BIRTH__' => $msgishtml ? dol_htmlentitiesbr($birthday) : ($birthday ? $birthday : ''),
 			'__PHOTO__' => $msgishtml ? dol_htmlentitiesbr($this->photo) : ($this->photo ? $this->photo : ''),
 			'__LOGIN__' => $msgishtml ? dol_htmlentitiesbr($this->login) : ($this->login ? $this->login : ''),
 			'__PASSWORD__' => $msgishtml ? dol_htmlentitiesbr($this->pass) : ($this->pass ? $this->pass : ''),
@@ -634,7 +641,8 @@ class Adherent extends CommonObject
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET";
-		$sql .= " civility = ".($this->civility_id ? "'".$this->db->escape($this->civility_id)."'" : "null");
+		$sql .= " ref = '".$this->db->escape($this->ref)."'";
+		$sql .= ", civility = ".($this->civility_id ? "'".$this->db->escape($this->civility_id)."'" : "null");
 		$sql .= ", firstname = ".($this->firstname ? "'".$this->db->escape($this->firstname)."'" : "null");
 		$sql .= ", lastname = ".($this->lastname ? "'".$this->db->escape($this->lastname)."'" : "null");
 		$sql .= ", gender = ".($this->gender != -1 ? "'".$this->db->escape($this->gender)."'" : "null"); // 'man' or 'woman'
@@ -751,6 +759,7 @@ class Adherent extends CommonObject
 						// If option ADHERENT_LOGIN_NOT_REQUIRED is on, there is no login of member, so we do not overwrite user login to keep existing one.
 						if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) $luser->login = $this->login;
 
+						$luser->ref = $this->ref;
 						$luser->civility_id = $this->civility_id;
 						$luser->firstname = $this->firstname;
 						$luser->lastname = $this->lastname;
@@ -1241,7 +1250,8 @@ class Adherent extends CommonObject
 	{
 		global $langs;
 
-		$sql = "SELECT d.rowid, d.ref_ext, d.civility as civility_code, d.gender, d.firstname, d.lastname, d.societe as company, d.fk_soc, d.statut, d.public, d.address, d.zip, d.town, d.note_private,";
+		$sql = "SELECT d.rowid, d.ref, d.ref_ext, d.civility as civility_code, d.gender, d.firstname, d.lastname,";
+		$sql .= " d.societe as company, d.fk_soc, d.statut, d.public, d.address, d.zip, d.town, d.note_private,";
 		$sql .= " d.note_public,";
 		$sql .= " d.email, d.socialnetworks, d.phone, d.phone_perso, d.phone_mobile, d.login, d.pass, d.pass_crypted,";
 		$sql .= " d.photo, d.fk_adherent_type, d.morphy, d.entity,";
@@ -1267,7 +1277,7 @@ class Adherent extends CommonObject
 		elseif ($ref || $fk_soc) {
 			$sql .= " AND d.entity IN (".getEntity('adherent').")";
 			if ($ref)
-				$sql .= " AND d.rowid='".$this->db->escape($ref)."'";
+				$sql .= " AND d.ref='".$this->db->escape($ref)."'";
 			elseif ($fk_soc > 0)
 				$sql .= " AND d.fk_soc=".$fk_soc;
 		} elseif ($ref_ext) {
@@ -1281,8 +1291,8 @@ class Adherent extends CommonObject
 				$obj = $this->db->fetch_object($resql);
 
 				$this->entity = $obj->entity;
-				$this->ref = $obj->rowid;
 				$this->id = $obj->rowid;
+				$this->ref = $obj->ref;
 				$this->ref_ext = $obj->ref_ext;
 
 				$this->civility_id = $obj->civility_code; // Bad. Kept for backard compatibility
@@ -2070,7 +2080,7 @@ class Adherent extends CommonObject
 			if ($mode == 'login') {
 				$result .= dol_trunc($this->login, $maxlen);
 			} elseif ($mode == 'ref') {
-				$result .= $this->id;
+				$result .= $this->ref;
 			} else {
 				$result .= $this->getFullName($langs, '', ($mode == 'firstname' ? 2 : -1), $maxlen);
 			}
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index c9aaa856d22..1af60db5bee 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -101,7 +101,7 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	'd.rowid'=>'Ref',
+	'd.ref'=>'Ref',
 	'd.login'=>'Login',
 	'd.lastname'=>'Lastname',
 	'd.firstname'=>'Firstname',
@@ -251,7 +251,7 @@ $memberstatic = new Adherent($db);
 
 $now = dol_now();
 
-$sql = "SELECT d.rowid, d.login, d.lastname, d.firstname, d.gender, d.societe as company, d.fk_soc,";
+$sql = "SELECT d.rowid, d.ref, d.login, d.lastname, d.firstname, d.gender, d.societe as company, d.fk_soc,";
 $sql .= " d.civility, d.datefin, d.address, d.zip, d.town, d.state_id, d.country,";
 $sql .= " d.email, d.phone, d.phone_perso, d.phone_mobile, d.skype, d.birth, d.public, d.photo,";
 $sql .= " d.fk_adherent_type as type_id, d.morphy, d.statut, d.datec as date_creation, d.tms as date_update,";
@@ -268,8 +268,13 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // N
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (d.rowid = ef.fk_object)";
-if (!empty($search_categ) || !empty($catid)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_member as cm ON d.rowid = cm.fk_member"; // We need this table joined to the select in order to filter by categ
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (d.rowid = ef.fk_object)";
+}
+if (!empty($search_categ) || !empty($catid)) {
+	// We need this table joined to the select in order to filter by categ
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_member as cm ON d.rowid = cm.fk_member";
+}
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = d.country)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = d.state_id)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on (s.rowid = d.fk_soc)";
@@ -285,10 +290,12 @@ if ($search_type > 0) $sql .= " AND t.rowid=".$db->escape($search_type);
 if ($search_filter == 'withoutsubscription') $sql .= " AND (datefin IS NULL OR t.subscription = 0)";
 if ($search_filter == 'uptodate') $sql .= " AND (datefin >= '".$db->idate($now)."' OR t.subscription = 0)";
 if ($search_filter == 'outofdate') $sql .= " AND (datefin < '".$db->idate($now)."' AND t.subscription = 1)";
-if ($search_status != '') $sql .= " AND d.statut in (".$db->sanitize($db->escape($search_status)).")"; // Peut valoir un nombre ou liste de nombre separes par virgules
+if ($search_status != '') {
+	// Peut valoir un nombre ou liste de nombre separes par virgules
+	$sql .= " AND d.statut in (".$db->sanitize($db->escape($search_status)).")";
+}
 if ($search_ref) {
-	if (is_numeric($search_ref)) $sql .= " AND (d.rowid = ".$db->escape($search_ref).")";
-	else $sql .= " AND 1 = 2"; // Always wrong
+	$sql .= natural_search("d.ref", $search_ref);
 }
 if ($search_civility) $sql .= natural_search("d.civility", $search_civility);
 if ($search_firstname) $sql .= natural_search("d.firstname", $search_firstname);
@@ -607,7 +614,7 @@ print "</tr>\n";
 
 print '<tr class="liste_titre">';
 if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID))       print_liste_field_titre("ID", $_SERVER["PHP_SELF"], '', '', $param, 'align="center"', $sortfield, $sortorder);
-if (!empty($arrayfields['d.ref']['checked']))            print_liste_field_titre($arrayfields['d.ref']['label'], $_SERVER["PHP_SELF"], 'd.rowid', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['d.ref']['checked']))            print_liste_field_titre($arrayfields['d.ref']['label'], $_SERVER["PHP_SELF"], 'd.ref', '', $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['d.civility']['checked']))       print_liste_field_titre($arrayfields['d.civility']['label'], $_SERVER["PHP_SELF"], 'd.civility', '', $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['d.firstname']['checked']))      print_liste_field_titre($arrayfields['d.firstname']['label'], $_SERVER["PHP_SELF"], 'd.firstname', '', $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['d.lastname']['checked']))       print_liste_field_titre($arrayfields['d.lastname']['label'], $_SERVER["PHP_SELF"], 'd.lastname', '', $param, '', $sortfield, $sortorder);
@@ -647,7 +654,7 @@ while ($i < min($num, $limit)) {
 
 	$datefin = $db->jdate($obj->datefin);
 	$memberstatic->id = $obj->rowid;
-	$memberstatic->ref = $obj->rowid;
+	$memberstatic->ref = $obj->ref;
 	$memberstatic->civility_id = $obj->civility;
 	$memberstatic->lastname = $obj->lastname;
 	$memberstatic->firstname = $obj->firstname;
diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index c8567cbee4b..67a0aba6cba 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -61,6 +61,7 @@ ALTER TABLE llx_mrp_mo_extrafields ADD INDEX idx_mrp_mo_fk_object(fk_object);
 -- members
 ALTER TABLE llx_adherent ADD COLUMN ref varchar(30) NOT NULL AFTER rowid;
 UPDATE llx_adherent SET ref=rowid;
+ALTER TABLE llx_adherent ADD UNIQUE INDEX uk_adherent_ref (ref, entity);
 
 ALTER TABLE llx_bom_bom ADD COLUMN bomtype integer DEFAULT 0;
 
diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql
index 41646dc7d01..787a2b15bd7 100644
--- a/htdocs/install/mysql/tables/llx_adherent.sql
+++ b/htdocs/install/mysql/tables/llx_adherent.sql
@@ -27,8 +27,8 @@
 create table llx_adherent
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  ref						   varchar(30) NOT NULL,	      -- member reference number
-  entity           integer DEFAULT 1 NOT NULL,	-- multi company id
+  ref              varchar(30) NOT NULL,        -- member reference number
+  entity           integer DEFAULT 1 NOT NULL,  -- multi company id
   ref_ext          varchar(128),                -- reference into an external system (not used by dolibarr)
 
   gender           varchar(10),
@@ -77,6 +77,6 @@ create table llx_adherent
   fk_user_author   integer,                     -- can be null because member can be create by a guest
   fk_user_mod      integer,
   fk_user_valid    integer,
-  canvas		       varchar(32),			            -- type of canvas if used (null by default)
+  canvas           varchar(32),                 -- type of canvas if used (null by default)
   import_key       varchar(14)                  -- Import key
 )ENGINE=innodb;

From c796d3e3e7e76810da6427b7987d79b89455409e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 10 Nov 2020 23:10:42 +0100
Subject: [PATCH 027/888] do not reset ref if already entered

---
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index 67a0aba6cba..1a42a065af4 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -60,7 +60,7 @@ ALTER TABLE llx_mrp_mo_extrafields ADD INDEX idx_mrp_mo_fk_object(fk_object);
 -- For v13
 -- members
 ALTER TABLE llx_adherent ADD COLUMN ref varchar(30) NOT NULL AFTER rowid;
-UPDATE llx_adherent SET ref=rowid;
+UPDATE llx_adherent SET ref=rowid WHERE ref = '';
 ALTER TABLE llx_adherent ADD UNIQUE INDEX uk_adherent_ref (ref, entity);
 
 ALTER TABLE llx_bom_bom ADD COLUMN bomtype integer DEFAULT 0;
@@ -408,7 +408,7 @@ ALTER TABLE llx_projet_task_time MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIM
 ALTER TABLE llx_projet_task_time MODIFY COLUMN datec datetime;
 
 
-DELETE FROM llx_user_rights WHERE fk_id IN (SELECT id FROM llx_rights_def where module = 'holiday' and perms = 'lire_tous'); 
+DELETE FROM llx_user_rights WHERE fk_id IN (SELECT id FROM llx_rights_def where module = 'holiday' and perms = 'lire_tous');
 DELETE FROM llx_rights_def where module = 'holiday' and perms = 'lire_tous';
 
 CREATE TABLE llx_c_product_nature (

From d4f633ee7422a1643112c82ed5e005aacbebeeef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 10 Nov 2020 23:41:15 +0100
Subject: [PATCH 028/888] check in card pdf

---
 htdocs/adherents/cartes/carte.php | 34 +++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
index b62f58117a2..ca194f8d51d 100644
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -63,19 +63,24 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg) {
 	$arrayofmembers = array();
 
 	// request taking into account member with up to date subscriptions
-	$sql = "SELECT d.rowid, d.firstname, d.lastname, d.login, d.societe as company, d.datefin,";
+	$sql = "SELECT d.rowid, d.ref, d.firstname, d.lastname, d.login, d.societe as company, d.datefin,";
 	$sql .= " d.address, d.zip, d.town, d.country, d.birth, d.email, d.photo,";
 	$sql .= " t.libelle as type,";
 	$sql .= " c.code as country_code, c.label as country";
 	// Add fields from extrafields
-	if (!empty($extrafields->attributes[$object->table_element]['label']))
-		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+	if (!empty($extrafields->attributes[$object->table_element]['label'])) {
+		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+			$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+		}
+	}
 	$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as t, ".MAIN_DB_PREFIX."adherent as d";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.country = c.rowid";
-	if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_extrafields as ef on (d.rowid = ef.fk_object)";
+	if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_extrafields as ef on (d.rowid = ef.fk_object)";
+	}
 	$sql .= " WHERE d.fk_adherent_type = t.rowid AND d.statut = 1";
 	$sql .= " AND d.entity IN (".getEntity('adherent').")";
-	if (is_numeric($foruserid)) $sql .= " AND d.rowid=".$foruserid;
+	if (is_numeric($foruserid)) $sql .= " AND d.rowid=".(int) $foruserid;
 	if ($foruserlogin) $sql .= " AND d.login='".$db->escape($foruserlogin)."'";
 	$sql .= " ORDER BY d.rowid ASC";
 
@@ -90,6 +95,7 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg) {
 			if ($objp->country == '-') $objp->country = '';
 
 			$adherentstatic->id = $objp->rowid;
+			$adherentstatic->ref = $objp->ref;
 			$adherentstatic->lastname = $objp->lastname;
 			$adherentstatic->firstname = $objp->firstname;
 
@@ -110,6 +116,7 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg) {
 			// List of values to scan for a replacement
 			$substitutionarray = array(
 				'__ID__'=>$objp->rowid,
+				'__REF__'=>$objp->ref,
 				'__LOGIN__'=>$objp->login,
 				'__FIRSTNAME__'=>$objp->firstname,
 				'__LASTNAME__'=>$objp->lastname,
@@ -149,6 +156,7 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg) {
 							'textfooter'=>$textfooter,
 							'textright'=>$textright,
 							'id'=>$objp->rowid,
+							'ref'=>$objp->ref,
 							'photo'=>$objp->photo
 						);
 					}
@@ -159,6 +167,7 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg) {
 						'textfooter'=>$textfooter,
 						'textright'=>$textright,
 						'id'=>$objp->rowid,
+						'ref'=>$objp->ref,
 						'photo'=>$objp->photo
 					);
 				}
@@ -172,12 +181,15 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg) {
 				$textfooter = '';
 				$textright = '';
 
-				$arrayofmembers[] = array('textleft'=>$textleft,
-										'textheader'=>$textheader,
-										'textfooter'=>$textfooter,
-										'textright'=>$textright,
-										'id'=>$objp->rowid,
-										'photo'=>$objp->photo);
+				$arrayofmembers[] = array(
+					'textleft'=>$textleft,
+					'textheader'=>$textheader,
+					'textfooter'=>$textfooter,
+					'textright'=>$textright,
+					'id'=>$objp->rowid,
+					'ref'=>$objp->ref,
+					'photo'=>$objp->photo,
+				);
 			}
 
 			$i++;

From c7557fdb8af54ae4745986dd8f19ffd492d1213b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 11 Nov 2020 11:12:19 +0100
Subject: [PATCH 029/888] specimen

---
 htdocs/adherents/class/adherent.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 539524756c9..967002b0b6e 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -2325,6 +2325,7 @@ class Adherent extends CommonObject
 
 		// Initialise parametres
 		$this->id = 0;
+		$this->ref = 'ABC001';
 		$this->entity = 1;
 		$this->specimen = 1;
 		$this->civility_id = 0;

From 073599383936029a3adf5cc1c8776c59f97901be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 11 Nov 2020 12:17:23 +0100
Subject: [PATCH 030/888] set ref at create

---
 htdocs/adherents/class/adherent.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 967002b0b6e..76f7fd8485c 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -525,9 +525,10 @@ class Adherent extends CommonObject
 
 		// Insert member
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."adherent";
-		$sql .= " (datec,login,fk_user_author,fk_user_mod,fk_user_valid,morphy,fk_adherent_type,entity,import_key)";
+		$sql .= " (ref, datec,login,fk_user_author,fk_user_mod,fk_user_valid,morphy,fk_adherent_type,entity,import_key)";
 		$sql .= " VALUES (";
-		$sql .= " '".$this->db->idate($this->datec)."'";
+		$sql .= " '(PROV)'";
+		$sql .= ", '".$this->db->idate($this->datec)."'";
 		$sql .= ", ".($this->login ? "'".$this->db->escape($this->login)."'" : "null");
 		$sql .= ", ".($user->id > 0 ? $user->id : "null"); // Can be null because member can be created by a guest or a script
 		$sql .= ", null, null, '".$this->db->escape($this->morphy)."'";

From 7d6e70c4c05dac91f46fa43ae0f110e2c4da165d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 11 Nov 2020 13:14:39 +0100
Subject: [PATCH 031/888] add log

---
 test/phpunit/AdherentTest.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php
index f19e88c36a6..0e0cdf3f962 100644
--- a/test/phpunit/AdherentTest.php
+++ b/test/phpunit/AdherentTest.php
@@ -180,7 +180,10 @@ class AdherentTest extends PHPUnit\Framework\TestCase
         $localobject->initAsSpecimen();
         $localobject->typeid=$fk_adherent_type;
         $result=$localobject->create($user);
-        print __METHOD__." result=".$result."\n";
+		print __METHOD__." result=".$result."\n";
+		if ($result < 0) {
+			print $localobject->error;
+		}
         $this->assertLessThan($result, 0);
 
         return $result;

From 1b6dfee2bd0224b56e2d78fa71f37be0eb20233d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 11 Nov 2020 13:56:45 +0100
Subject: [PATCH 032/888] modify sql

---
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index 1a42a065af4..ec0abb5f597 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -59,8 +59,9 @@ ALTER TABLE llx_mrp_mo_extrafields ADD INDEX idx_mrp_mo_fk_object(fk_object);
 
 -- For v13
 -- members
-ALTER TABLE llx_adherent ADD COLUMN ref varchar(30) NOT NULL AFTER rowid;
-UPDATE llx_adherent SET ref=rowid WHERE ref = '';
+ALTER TABLE llx_adherent ADD COLUMN ref varchar(30) AFTER rowid;
+UPDATE llx_adherent SET ref = rowid WHERE ref = '';
+ALTER TABLE llx_adherent MODIFY COLUMN ref varchar(30) NOT NULL;
 ALTER TABLE llx_adherent ADD UNIQUE INDEX uk_adherent_ref (ref, entity);
 
 ALTER TABLE llx_bom_bom ADD COLUMN bomtype integer DEFAULT 0;

From 615342aa77d5bc23911ad686010295af535fbf52 Mon Sep 17 00:00:00 2001
From: JC Prieto <jcprieto@virtual20.com>
Date: Thu, 12 Nov 2020 10:32:52 +0100
Subject: [PATCH 033/888] Update account.class.php

Doc on ics_transfer var
---
 htdocs/compta/bank/class/account.class.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 0e80b21f644..ea6491c7636 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -216,10 +216,15 @@ class Account extends CommonObject
 	public $date_solde;
 	
 	/**
-	 * Creditor Identifier CI and Transfer ICS. Some banks use different ICS for direct debit and bank tranfer
+	 * Creditor Identifier CI. Some banks use different ICS for direct debit and bank tranfer
 	 * @var string
 	 */
 	public $ics;
+	
+	/**
+	 * Creditor Identifier for Bank Transfer.
+	 * @var string
+	 */
 	public $ics_transfer;
 	
 

From 10ae18fe44cadd964bf48f66b96af5d994c5020c Mon Sep 17 00:00:00 2001
From: jcp <jcprieto@virtual20.com>
Date: Thu, 12 Nov 2020 19:42:20 +0100
Subject: [PATCH 034/888] Update SQL migration

---
 htdocs/compta/bank/card.php                      | 8 ++++----
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 3 +++
 htdocs/langs/en_US/withdrawals.lang              | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 1e79b801385..469165b4b6e 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -95,8 +95,8 @@ if ($action == 'add')
 	$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
 	$object->owner_address   = trim(GETPOST("owner_address", 'nohtml'));
 	
-	$object->ics             = trim($_POST["ics"]);
-	$object->ics_transfer    = trim($_POST["ics_transfer"]);
+	$object->ics             = trim(GETPOST("ics", 'alpha');
+	$object->ics_transfer    = trim(GETPOST("ics_transfer", 'alpha');
 
 	$account_number = GETPOST('account_number', 'alphanohtml');
 	if (empty($account_number) || $account_number == '-1')
@@ -199,8 +199,8 @@ if ($action == 'update')
 	$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
 	$object->owner_address   = trim(GETPOST("owner_address", 'nohtml'));
 	
-	$object->ics             = trim($_POST["ics"]);
-	$object->ics_transfer    = trim($_POST["ics_transfer"]);
+	$object->ics             = trim(GETPOST("ics", 'alpha');
+	$object->ics_transfer    = trim(GETPOST("ics_transfer", 'alpha');
 
 	$account_number = GETPOST('account_number', 'alpha');
 	if (empty($account_number) || $account_number == '-1')
diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index e0fd93aa005..c55da956241 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -372,6 +372,9 @@ ALTER TABLE llx_bank ADD COLUMN origin_id integer;
 ALTER TABLE llx_bank ADD COLUMN origin_type varchar(64) NULL;
 ALTER TABLE llx_bank ADD COLUMN import_key varchar(14);
 
+ALTER TABLE llx_bank_account ADD COLUMN ics varchar(32) NULL;
+ALTER TABLE llx_bank_account ADD COLUMN ics_transfer varchar(32) NULL;
+
 ALTER TABLE llx_menu MODIFY COLUMN enabled text;
 
 CREATE TABLE llx_ecm_files_extrafields
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index c044ba16613..0f64f8fbece 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -147,4 +147,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
-ErrorICSmissing=Missing ICS in Bank account %s 
\ No newline at end of file
+ErrorICSmissing=Missing ICS in Bank account %s 

From a40d63296a1168977c672ac80f7029ba3a475967 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 17 Nov 2020 13:14:16 +0100
Subject: [PATCH 035/888] add good date filter

---
 .../modulebuilder/template/myobject_list.php  | 44 ++++++++++++++++---
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 8e3a4da30e8..49962635fc6 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -115,6 +115,10 @@ $search = array();
 foreach ($object->fields as $key => $val)
 {
 	if (GETPOST('search_'.$key, 'alpha') !== '') $search[$key] = GETPOST('search_'.$key, 'alpha');
+	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+	}
 }
 
 // List of fields to search into when doing a "search in all"
@@ -185,6 +189,10 @@ if (empty($reshook))
 		foreach ($object->fields as $key => $val)
 		{
 			$search[$key] = '';
+			if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+				$search[$key.'_dtstart'] = '';
+				$search[$key.'_dtend'] = '';
+			}
 		}
 		$toselect = '';
 		$search_array_options = array();
@@ -243,13 +251,27 @@ if ($object->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (".getEntity
 else $sql .= " WHERE 1 = 1";
 foreach ($search as $key => $val)
 {
-	if ($key == 'status' && $search[$key] == -1) continue;
-	$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
-	if (strpos($object->fields[$key]['type'], 'integer:') === 0) {
-		if ($search[$key] == '-1') $search[$key] = '';
-		$mode_search = 2;
+	if (in_array($key,$object->fields)) {
+		if ($key == 'status' && $search[$key] == -1) continue;
+		$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
+		if (strpos($object->fields[$key]['type'], 'integer:') === 0) {
+			if ($search[$key] == '-1') $search[$key] = '';
+			$mode_search = 2;
+		}
+		if ($search[$key] != '') $sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+	} else {
+		if(preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
+			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key);
+			if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
+				if (preg_match('/_dtstart$/', $key)) {
+					$sql .= " AND t." . $columnName . " >= '" . $db->idate($search[$key]) . "'";
+				}
+				if (preg_match('/_dtend$/', $key)) {
+					$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+				}
+			}
+		}
 	}
-	if ($search[$key] != '') $sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
 }
 if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 //$sql.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear);
@@ -434,7 +456,15 @@ foreach ($object->fields as $key => $val)
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
-		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+			print '<div class="nowrap">';
+			print $form->selectDate($search[$key.'_dtstart'] ? $search[$key.'_dtstart'] : '', "search_".$key."_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+			print '</div>';
+			print '<div class="nowrap">';
+			print $form->selectDate($search[$key.'_dtend'] ? $search[$key.'_dtend'] : '', "search_".$key."_dtend", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+			print '</div>';
+		}
 		print '</td>';
 	}
 }

From e22c8f76a68fac9dfdf0ed252aba17b1659920b2 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 17 Nov 2020 13:15:50 +0100
Subject: [PATCH 036/888] add good date filter

---
 htdocs/modulebuilder/template/myobject_list.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 49962635fc6..59e7e650572 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -456,8 +456,9 @@ foreach ($object->fields as $key => $val)
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
-		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
-		elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
 			print '<div class="nowrap">';
 			print $form->selectDate($search[$key.'_dtstart'] ? $search[$key.'_dtstart'] : '', "search_".$key."_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 			print '</div>';

From dc5d67e1cd74dcd5344c8c23c0202f914951c2de Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 17 Nov 2020 12:18:27 +0000
Subject: [PATCH 037/888] Fixing style errors.

---
 htdocs/modulebuilder/template/myobject_list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 59e7e650572..289eabbe0ca 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -251,7 +251,7 @@ if ($object->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (".getEntity
 else $sql .= " WHERE 1 = 1";
 foreach ($search as $key => $val)
 {
-	if (in_array($key,$object->fields)) {
+	if (in_array($key, $object->fields)) {
 		if ($key == 'status' && $search[$key] == -1) continue;
 		$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
 		if (strpos($object->fields[$key]['type'], 'integer:') === 0) {
@@ -260,7 +260,7 @@ foreach ($search as $key => $val)
 		}
 		if ($search[$key] != '') $sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
 	} else {
-		if(preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
+		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
 			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key);
 			if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
 				if (preg_match('/_dtstart$/', $key)) {

From c7d886c918eb6b454017281396952800f76792db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 23 Nov 2020 23:25:09 +0100
Subject: [PATCH 038/888] fix status on tooltip in box last product

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

diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 38f9a73f57f..7f4b66f5f58 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -133,6 +133,8 @@ class box_produits extends ModeleBoxes
                     $productstatic->type = $objp->fk_product_type;
                     $productstatic->label = $objp->label;
 					$productstatic->entity = $objp->entity;
+					$productstatic->status = $objp->tosell;
+					$productstatic->status_buy = $objp->tobuy;
 
 					$this->info_box_contents[$line][] = array(
                         'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',

From 69ea0ea791a4daa0e030aed894eae5b39eb37d80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 23 Nov 2020 23:44:15 +0100
Subject: [PATCH 039/888] Update box_produits.php

---
 htdocs/core/boxes/box_produits.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 7f4b66f5f58..5b490ac32f4 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -87,6 +87,11 @@ class box_produits extends ModeleBoxes
 		if ($user->rights->produit->lire || $user->rights->service->lire)
 		{
 			$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.fk_price_expression, p.entity";
+			$sql .= ", p.accountancy_code_sell";
+			$sql .= ", p.accountancy_code_sell_intra";
+			$sql .= ", p.accountancy_code_sell_export";
+			$sql .= ", p.accountancy_code_buy";
+			$sql .= ', p.barcode';
 			$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 			$sql.= ' WHERE p.entity IN ('.getEntity($productstatic->element).')';
 			if (empty($user->rights->produit->lire)) $sql.=' AND p.fk_product_type != 0';
@@ -135,6 +140,11 @@ class box_produits extends ModeleBoxes
 					$productstatic->entity = $objp->entity;
 					$productstatic->status = $objp->tosell;
 					$productstatic->status_buy = $objp->tobuy;
+					$productstatic->barcode = $objp->barcode;
+					$productstatic->accountancy_code_sell = $objp->accountancy_code_sell;
+					$productstatic->accountancy_code_sell_intra = $objp->accountancy_code_sell_intra;
+					$productstatic->accountancy_code_sell_export = $objp->accountancy_code_sell_export;
+					$productstatic->accountancy_code_buy = $objp->accountancy_code_buy;
 
 					$this->info_box_contents[$line][] = array(
                         'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',

From 886945829e255dc16ad427d6920ef22576d7d3c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 23 Nov 2020 23:56:03 +0100
Subject: [PATCH 040/888] Update llx_ecm_directories.sql

---
 htdocs/install/mysql/tables/llx_ecm_directories.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.sql b/htdocs/install/mysql/tables/llx_ecm_directories.sql
index 4616a763b81..3ef599df05e 100644
--- a/htdocs/install/mysql/tables/llx_ecm_directories.sql
+++ b/htdocs/install/mysql/tables/llx_ecm_directories.sql
@@ -33,5 +33,7 @@ CREATE TABLE llx_ecm_directories
   tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_c			integer,
   fk_user_m			integer,
+  note_private		text,
+  note_public		text,
   acl				text
 ) ENGINE=innodb;

From 909a723d487771a5f40bd301a54259d2d5cfd92b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 23 Nov 2020 23:57:56 +0100
Subject: [PATCH 041/888] Update llx_ecm_files.sql

---
 htdocs/install/mysql/tables/llx_ecm_files.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/install/mysql/tables/llx_ecm_files.sql b/htdocs/install/mysql/tables/llx_ecm_files.sql
index 635945a256d..cf9f3a8f148 100644
--- a/htdocs/install/mysql/tables/llx_ecm_files.sql
+++ b/htdocs/install/mysql/tables/llx_ecm_files.sql
@@ -38,5 +38,7 @@ CREATE TABLE llx_ecm_files
   tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_c			integer,
   fk_user_m			integer,
+  note_private		text,
+  note_public		text,
   acl				text							-- for future permission 'per file'
 ) ENGINE=innodb;

From 2225ff0ba4d59b8d11882ab04634313827182f98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 23 Nov 2020 23:59:37 +0100
Subject: [PATCH 042/888] Update 12.0.0-13.0.0.sql

---
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index d4cfaddb4eb..a9f5a3fed37 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -395,6 +395,8 @@ CREATE TABLE llx_ecm_files_extrafields
 ) ENGINE=innodb;
 
 ALTER TABLE llx_ecm_files_extrafields ADD INDEX idx_ecm_files_extrafields (fk_object);
+ALTER TABLE llx_ecm_files ADD COLUMN note_private text AFTER fk_user_m;
+ALTER TABLE llx_ecm_files ADD COLUMN note_public text AFTER note_private;
 
 CREATE TABLE llx_ecm_directories_extrafields
 (
@@ -405,6 +407,9 @@ CREATE TABLE llx_ecm_directories_extrafields
 ) ENGINE=innodb;
 
 ALTER TABLE llx_ecm_directories_extrafields ADD INDEX idx_ecm_directories_extrafields (fk_object);
+ALTER TABLE llx_ecm_directories ADD COLUMN note_private text AFTER fk_user_m;
+ALTER TABLE llx_ecm_directories ADD COLUMN note_public text AFTER note_private;
+
 ALTER TABLE llx_website_page ADD COLUMN object_type varchar(255);
 ALTER TABLE llx_website_page ADD COLUMN fk_object varchar(255);
 

From 66ad0e5b1397ff34b5d31198e8a5d8cec12dbacb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 24 Nov 2020 18:54:59 +0100
Subject: [PATCH 043/888] add note on ecm files

---
 htdocs/core/class/commonobject.class.php |  21 ++-
 htdocs/core/lib/ecm.lib.php              |  10 ++
 htdocs/core/tpl/notes.tpl.php            |   9 +-
 htdocs/ecm/class/ecmfiles.class.php      |   4 +
 htdocs/ecm/file_note.php                 | 176 +++++++++++++++++++++++
 5 files changed, 211 insertions(+), 9 deletions(-)
 create mode 100644 htdocs/ecm/file_note.php

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index ac0900f0c29..4160f281fc8 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2934,18 +2934,25 @@ abstract class CommonObject
 
 		// Special cas
 		if ($this->table_element == 'product' && $newsuffix == '_private') $newsuffix = '';
-
+		if (in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) {
+			$fieldusermod =  "fk_user_mod";
+		} elseif ($this->table_element == 'ecm_files') {
+			$fieldusermod = "fk_user_m";
+		} else {
+			$fieldusermod = "fk_user_modif";
+		}
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 		$sql .= " SET note".$newsuffix." = ".(!empty($note) ? ("'".$this->db->escape($note)."'") : "NULL");
-		$sql .= " ,".(in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment')) ? "fk_user_mod" : "fk_user_modif")." = ".$user->id;
+		$sql .= " ,".$fieldusermod." = ".$user->id;
 		$sql .= " WHERE rowid =".$this->id;
 
 		dol_syslog(get_class($this)."::update_note", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
-			if ($suffix == '_public') $this->note_public = $note;
-			elseif ($suffix == '_private') $this->note_private = $note;
-			else {
+		if ($this->db->query($sql)) {
+			if ($suffix == '_public') {
+				$this->note_public = $note;
+			} elseif ($suffix == '_private') {
+				$this->note_private = $note;
+			} else {
 				$this->note = $note; // deprecated
 				$this->note_private = $note;
 			}
diff --git a/htdocs/core/lib/ecm.lib.php b/htdocs/core/lib/ecm.lib.php
index 1f22e464358..2c1edc5e675 100644
--- a/htdocs/core/lib/ecm.lib.php
+++ b/htdocs/core/lib/ecm.lib.php
@@ -111,6 +111,16 @@ function ecm_file_prepare_head($object)
 	$head[$h][2] = 'card';
 	$h++;
 
+	// Notes
+	$head[$h][0] = DOL_URL_ROOT.'/ecm/file_note.php?section='.$object->section_id.'&urlfile='.urlencode($object->label);
+	$head[$h][1] = $langs->trans("Notes");
+	$nbNote = 0;
+	if (!empty($object->note_private)) $nbNote++;
+	if (!empty($object->note_public)) $nbNote++;
+	if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+	$head[$h][2] = 'note';
+	$h++;
+
 	return $head;
 }
 
diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
index 283f9eeb873..ec098be9db7 100644
--- a/htdocs/core/tpl/notes.tpl.php
+++ b/htdocs/core/tpl/notes.tpl.php
@@ -79,11 +79,16 @@ if ($module == 'propal') {
 	$permission = $user->rights->expedition->creer;
 } elseif ($module == 'product') {
 	$permission = $user->rights->produit->creer;
+} elseif ($module == 'ecmfiles') {
+	$permission = $user->rights->ecm->setup;
 }
 //else dol_print_error('','Bad value '.$module.' for param module');
 
-if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) $typeofdata = 'ckeditor:dolibarr_notes:100%:200::1:12:95%:0'; // Rem: This var is for all notes, not only thirdparties note.
-else $typeofdata = 'textarea:12:95%';
+if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) {
+	$typeofdata = 'ckeditor:dolibarr_notes:100%:200::1:12:95%:0'; // Rem: This var is for all notes, not only thirdparties note.
+} else {
+	$typeofdata = 'textarea:12:95%';
+}
 
 print '<!-- BEGIN PHP TEMPLATE NOTES -->'."\n";
 print '<div class="tagtable border table-border tableforfield centpercent">'."\n";
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index e229663e55f..136a3ebc7e2 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -336,6 +336,8 @@ class EcmFiles extends CommonObject
 		$sql .= " t.tms as date_m,";
 		$sql .= " t.fk_user_c,";
 		$sql .= " t.fk_user_m,";
+		$sql .= ' t.note_private,';
+		$sql .= ' t.note_public,';
 		$sql .= " t.acl,";
 		$sql .= " t.src_object_type,";
 		$sql .= " t.src_object_id";
@@ -398,6 +400,8 @@ class EcmFiles extends CommonObject
 				$this->date_m = $this->db->jdate($obj->date_m);
 				$this->fk_user_c = $obj->fk_user_c;
 				$this->fk_user_m = $obj->fk_user_m;
+				$this->note_private = $obj->note_private;
+				$this->note_public = $obj->note_public;
 				$this->acl = $obj->acl;
 				$this->src_object_type = $obj->src_object_type;
 				$this->src_object_id = $obj->src_object_id;
diff --git a/htdocs/ecm/file_note.php b/htdocs/ecm/file_note.php
new file mode 100644
index 00000000000..f7810dec887
--- /dev/null
+++ b/htdocs/ecm/file_note.php
@@ -0,0 +1,176 @@
+<?php
+/* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2013      Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2017      Ferran Marcet       	 <fmarcet@2byte.es>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/ecm/file_note.php
+ *  \ingroup    ecm
+ *  \brief      Fiche de notes sur une ecm file
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
+require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('ecm'));
+
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$socid = GETPOST('socid', 'int');
+$action = GETPOST('action', 'aZ09');
+
+if (!$user->rights->ecm->setup) accessforbidden();
+
+// Get parameters
+$socid = GETPOST("socid", "int");
+// Security check
+if ($user->socid > 0) {
+	$action = '';
+	$socid = $user->socid;
+}
+
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "label";
+
+$section = GETPOST("section", 'alpha');
+if (!$section) {
+	dol_print_error('', 'Error, section parameter missing');
+	exit;
+}
+$urlfile = GETPOST("urlfile");
+if (!$urlfile) {
+	dol_print_error('', "ErrorParamNotDefined");
+	exit;
+}
+
+// Load ecm object
+$ecmdir = new EcmDirectory($db);
+$result = $ecmdir->fetch(GETPOST("section", 'alpha'));
+if (!$result > 0) {
+	dol_print_error($db, $ecmdir->error);
+	exit;
+}
+$relativepath = $ecmdir->getRelativePath();
+$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
+
+$fullpath = $conf->ecm->dir_output.'/'.$relativepath.$urlfile;
+
+$file = new stdClass();
+$file->section_id = $ecmdir->id;
+$file->label = $urlfile;
+
+$relativetodocument = 'ecm/'.$relativepath; // $relativepath is relative to ECM dir, we need relative to document
+$filepath = $relativepath.$file->label;
+$filepathtodocument = $relativetodocument.$file->label;
+
+// Try to load object from index
+$object = new ECMFiles($db);
+$extrafields = new ExtraFields($db);
+// fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+$result = $object->fetch(0, '', $filepathtodocument);
+if ($result < 0) {
+	dol_print_error($db, $object->error, $object->errors);
+	exit;
+}
+
+$permissionnote = $user->rights->ecm->setup; // Used by the include of actions_setnotes.inc.php
+
+/*
+ * Actions
+ */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+
+
+/*
+ * View
+ */
+
+llxHeader('', $langs->trans('EcmFiles'));
+
+$form = new Form($db);
+
+$head = ecm_file_prepare_head($file);
+
+print dol_get_fiche_head($head, 'note', $langs->trans("File"), -1, 'generic');
+
+$s = '';
+$tmpecmdir = new EcmDirectory($db); // Need to create a new one
+$tmpecmdir->fetch($ecmdir->id);
+$result = 1;
+$i = 0;
+while ($tmpecmdir && $result > 0) {
+	$tmpecmdir->ref = $tmpecmdir->label;
+	$s = $tmpecmdir->getNomUrl(1).$s;
+	if ($tmpecmdir->fk_parent)
+	{
+		$s = ' -> '.$s;
+		$result = $tmpecmdir->fetch($tmpecmdir->fk_parent);
+	} else {
+		$tmpecmdir = 0;
+	}
+	$i++;
+}
+
+$urlfiletoshow = preg_replace('/\.noexe$/', '', $urlfile);
+
+$s = img_picto('', 'object_dir').' <a href="'.DOL_URL_ROOT.'/ecm/index.php">'.$langs->trans("ECMRoot").'</a> -> '.$s.' -> ';
+if ($action == 'edit') $s .= '<input type="text" name="label" class="quatrevingtpercent" value="'.$urlfiletoshow.'">';
+else $s .= $urlfiletoshow;
+
+$linkback = '';
+if ($backtopage) {
+	$linkback = '<a href="'.$backtopage.'">'.$langs->trans("BackToTree").'</a>';
+}
+
+$object->ref = ''; // Force to hide ref
+dol_banner_tab($object, '', $linkback, 0, '', '', $s);
+
+
+
+print '<div class="fichecenter">';
+print '<div class="underbanner clearboth"></div>';
+
+
+$cssclass = "titlefield";
+$moreparam = '&amp;section='.$section.'&amp;urlfile='.$urlfile;
+include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+
+print '</div>';
+
+print dol_get_fiche_end();
+
+
+// End of page
+llxFooter();
+$db->close();

From 21f3ac3405deb73e819435bcde393fa6a1b2956b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 24 Nov 2020 19:02:41 +0100
Subject: [PATCH 044/888] add note on ecm files

---
 htdocs/ecm/file_note.php | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/htdocs/ecm/file_note.php b/htdocs/ecm/file_note.php
index f7810dec887..dba96710f60 100644
--- a/htdocs/ecm/file_note.php
+++ b/htdocs/ecm/file_note.php
@@ -39,7 +39,9 @@ $ref = GETPOST('ref', 'alpha');
 $socid = GETPOST('socid', 'int');
 $action = GETPOST('action', 'aZ09');
 
-if (!$user->rights->ecm->setup) accessforbidden();
+if (!$user->rights->ecm->setup) {
+	accessforbidden();
+}
 
 // Get parameters
 $socid = GETPOST("socid", "int");
@@ -53,12 +55,18 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "label";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "label";
+}
 
 $section = GETPOST("section", 'alpha');
 if (!$section) {
@@ -83,13 +91,9 @@ $upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
 
 $fullpath = $conf->ecm->dir_output.'/'.$relativepath.$urlfile;
 
-$file = new stdClass();
-$file->section_id = $ecmdir->id;
-$file->label = $urlfile;
-
 $relativetodocument = 'ecm/'.$relativepath; // $relativepath is relative to ECM dir, we need relative to document
-$filepath = $relativepath.$file->label;
-$filepathtodocument = $relativetodocument.$file->label;
+$filepath = $relativepath.$urlfile;
+$filepathtodocument = $relativetodocument.$urlfile;
 
 // Try to load object from index
 $object = new ECMFiles($db);
@@ -120,7 +124,9 @@ llxHeader('', $langs->trans('EcmFiles'));
 
 $form = new Form($db);
 
-$head = ecm_file_prepare_head($file);
+$object->section_id = $ecmdir->id;
+$object->label = $urlfile;
+$head = ecm_file_prepare_head($object);
 
 print dol_get_fiche_head($head, 'note', $langs->trans("File"), -1, 'generic');
 
@@ -132,8 +138,7 @@ $i = 0;
 while ($tmpecmdir && $result > 0) {
 	$tmpecmdir->ref = $tmpecmdir->label;
 	$s = $tmpecmdir->getNomUrl(1).$s;
-	if ($tmpecmdir->fk_parent)
-	{
+	if ($tmpecmdir->fk_parent) {
 		$s = ' -> '.$s;
 		$result = $tmpecmdir->fetch($tmpecmdir->fk_parent);
 	} else {
@@ -145,8 +150,11 @@ while ($tmpecmdir && $result > 0) {
 $urlfiletoshow = preg_replace('/\.noexe$/', '', $urlfile);
 
 $s = img_picto('', 'object_dir').' <a href="'.DOL_URL_ROOT.'/ecm/index.php">'.$langs->trans("ECMRoot").'</a> -> '.$s.' -> ';
-if ($action == 'edit') $s .= '<input type="text" name="label" class="quatrevingtpercent" value="'.$urlfiletoshow.'">';
-else $s .= $urlfiletoshow;
+if ($action == 'edit') {
+	$s .= '<input type="text" name="label" class="quatrevingtpercent" value="'.$urlfiletoshow.'">';
+} else {
+	$s .= $urlfiletoshow;
+}
 
 $linkback = '';
 if ($backtopage) {

From e68eb2a2650b1de3b7934ccb2e51252cae59f2d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 24 Nov 2020 19:05:51 +0100
Subject: [PATCH 045/888] add note on ecm files

---
 htdocs/ecm/file_card.php | 170 ++++++++++++++++++++-------------------
 1 file changed, 87 insertions(+), 83 deletions(-)

diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index 496afbf8568..d89e94861c0 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -36,14 +36,15 @@ $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-if (!$user->rights->ecm->setup) accessforbidden();
+if (!$user->rights->ecm->setup) {
+	accessforbidden();
+}
 
 // Get parameters
 $socid = GETPOST("socid", "int");
 
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
@@ -52,22 +53,26 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "label";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "label";
+}
 
 $section = GETPOST("section", 'alpha');
-if (!$section)
-{
+if (!$section) {
 	dol_print_error('', 'Error, section parameter missing');
 	exit;
 }
 $urlfile = GETPOST("urlfile");
-if (!$urlfile)
-{
+if (!$urlfile) {
 	dol_print_error('', "ErrorParamNotDefined");
 	exit;
 }
@@ -75,8 +80,7 @@ if (!$urlfile)
 // Load ecm object
 $ecmdir = new EcmDirectory($db);
 $result = $ecmdir->fetch(GETPOST("section", 'alpha'));
-if (!$result > 0)
-{
+if (!$result > 0) {
 	dol_print_error($db, $ecmdir->error);
 	exit;
 }
@@ -85,13 +89,9 @@ $upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
 
 $fullpath = $conf->ecm->dir_output.'/'.$relativepath.$urlfile;
 
-$file = new stdClass();
-$file->section_id = $ecmdir->id;
-$file->label = $urlfile;
-
 $relativetodocument = 'ecm/'.$relativepath; // $relativepath is relative to ECM dir, we need relative to document
-$filepath = $relativepath.$file->label;
-$filepathtodocument = $relativetodocument.$file->label;
+$filepath = $relativepath.$urlfile;
+$filepathtodocument = $relativetodocument.$urlfile;
 
 // Try to load object from index
 $object = new ECMFiles($db);
@@ -100,8 +100,7 @@ $extrafields = new ExtraFields($db);
 $extrafields->fetch_name_optionals_label($object->table_element);
 
 $result = $object->fetch(0, '', $filepathtodocument);
-if ($result < 0)
-{
+if ($result < 0) {
 	dol_print_error($db, $object->error, $object->errors);
 	exit;
 }
@@ -112,11 +111,9 @@ if ($result < 0)
  * Actions
  */
 
-if ($cancel)
-{
+if ($cancel) {
 	$action = '';
-	if ($backtopage)
-	{
+	if ($backtopage) {
 		header("Location: ".$backtopage);
 		exit;
 	} else {
@@ -126,8 +123,7 @@ if ($cancel)
 }
 
 // Rename file
-if ($action == 'update')
-{
+if ($action == 'update') {
 	$error = 0;
 
 	$oldlabel = GETPOST('urlfile', 'alpha');
@@ -154,11 +150,9 @@ if ($action == 'update')
 	// Now we update index of file
 	$db->begin();
 	//print $oldfile.' - '.$newfile;
-	if ($newlabel != $oldlabel)
-	{
+	if ($newlabel != $oldlabel) {
 		$result = dol_move($oldfile, $newfileformove); // This include update of database
-		if (!$result)
-		{
+		if (!$result) {
 			$langs->load('errors');
 			setEventMessages($langs->trans('ErrorFailToRenameFile', $oldfile, $newfile), null, 'errors');
 			$error++;
@@ -166,27 +160,25 @@ if ($action == 'update')
 
 		// Reload object after the move
 		$result = $object->fetch(0, '', $newdirrelativetodocument.$newlabel);
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			dol_print_error($db, $object->error, $object->errors);
 			exit;
 		}
 	}
 
-	if (!$error)
-	{
-		if ($shareenabled)
-		{
+	if (!$error) {
+		if ($shareenabled) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 			$object->share = getRandomPassword(true);
 		} else {
 			$object->share = '';
 		}
 
-		if ($object->id > 0)
-		{
+		if ($object->id > 0) {
 			$ret = $extrafields->setOptionalsFromPost(null, $object);
-			if ($ret < 0) $error++;
+			if ($ret < 0) {
+				$error++;
+			}
 			if (!$error) {
 				// Actions on extra fields
 				$result = $object->insertExtraFields();
@@ -197,8 +189,7 @@ if ($action == 'update')
 			}
 			// Call update to set the share key
 			$result = $object->update($user);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'warnings');
 			}
 		} else {
@@ -212,15 +203,13 @@ if ($action == 'update')
 			$object->description = ''; // indexed content
 			$object->keyword = ''; // keyword content
 			$result = $object->create($user);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'warnings');
 			}
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$db->commit();
 
 		$urlfile = $newlabel;
@@ -246,10 +235,11 @@ $form = new Form($db);
 
 llxHeader();
 
-$head = ecm_file_prepare_head($file);
+$object->section_id = $ecmdir->id;
+$object->label = $urlfile;
+$head = ecm_file_prepare_head($object);
 
-if ($action == 'edit')
-{
+if ($action == 'edit') {
 	print '<form name="update" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="section" value="'.$section.'">';
@@ -267,12 +257,10 @@ $tmpecmdir = new EcmDirectory($db); // Need to create a new one
 $tmpecmdir->fetch($ecmdir->id);
 $result = 1;
 $i = 0;
-while ($tmpecmdir && $result > 0)
-{
+while ($tmpecmdir && $result > 0) {
 	$tmpecmdir->ref = $tmpecmdir->label;
 	$s = $tmpecmdir->getNomUrl(1).$s;
-	if ($tmpecmdir->fk_parent)
-	{
+	if ($tmpecmdir->fk_parent) {
 		$s = ' -> '.$s;
 		$result = $tmpecmdir->fetch($tmpecmdir->fk_parent);
 	} else {
@@ -284,8 +272,11 @@ while ($tmpecmdir && $result > 0)
 $urlfiletoshow = preg_replace('/\.noexe$/', '', $urlfile);
 
 $s = img_picto('', 'object_dir').' <a href="'.DOL_URL_ROOT.'/ecm/index.php">'.$langs->trans("ECMRoot").'</a> -> '.$s.' -> ';
-if ($action == 'edit') $s .= '<input type="text" name="label" class="quatrevingtpercent" value="'.$urlfiletoshow.'">';
-else $s .= $urlfiletoshow;
+if ($action == 'edit') {
+	$s .= '<input type="text" name="label" class="quatrevingtpercent" value="'.$urlfiletoshow.'">';
+} else {
+	$s .= $urlfiletoshow;
+}
 
 $linkback = '';
 if ($backtopage) {
@@ -317,8 +308,7 @@ print '</td></tr>';
 print '<tr><td>'.$langs->trans("HashOfFileContent").'</td><td>';
 $object = new EcmFiles($db);
 $object->fetch(0, '', $filepathtodocument);
-if (!empty($object->label))
-{
+if (!empty($object->label)) {
 	print $object->label;
 } else {
 	print img_warning().' '.$langs->trans("FileNotYetIndexedInDatabase");
@@ -335,45 +325,63 @@ print '<tr><td>'.$langs->trans("DirectDownloadInternalLink").'</td><td>';
 $modulepart = 'ecm';
 $forcedownload = 1;
 $rellink = '/document.php?modulepart='.$modulepart;
-if ($forcedownload) $rellink .= '&attachment=1';
-if (!empty($object->entity)) $rellink .= '&entity='.$object->entity;
+if ($forcedownload) {
+	$rellink .= '&attachment=1';
+}
+if (!empty($object->entity)) {
+	$rellink .= '&entity='.$object->entity;
+}
 $rellink .= '&file='.urlencode($filepath);
 $fulllink = $urlwithroot.$rellink;
 print img_picto('', 'globe').' ';
-if ($action != 'edit') print '<input type="text" class="quatrevingtpercent" id="downloadinternallink" name="downloadinternellink" value="'.dol_escape_htmltag($fulllink).'">';
-else print $fulllink;
-if ($action != 'edit') print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>'; // No target here.
+if ($action != 'edit') {
+	print '<input type="text" class="quatrevingtpercent" id="downloadinternallink" name="downloadinternellink" value="'.dol_escape_htmltag($fulllink).'">';
+} else {
+	print $fulllink;
+}
+if ($action != 'edit') {
+	print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>'; // No target here.
+}
 print '</td></tr>';
 
 // Link for direct external download
 print '<tr><td>';
-if ($action != 'edit') print $langs->trans("DirectDownloadLink");
-else print $langs->trans("FileSharedViaALink");
+if ($action != 'edit') {
+	print $langs->trans("DirectDownloadLink");
+} else {
+	print $langs->trans("FileSharedViaALink");
+}
 print '</td><td>';
-if (!empty($object->share))
-{
-	if ($action != 'edit')
-	{
+if (!empty($object->share)) {
+	if ($action != 'edit') {
 		$forcedownload = 0;
 
 		$paramlink = '';
-		if (!empty($object->share)) $paramlink .= ($paramlink ? '&' : '').'hashp='.$object->share; // Hash for public share
-		if ($forcedownload) $paramlink .= ($paramlink ? '&' : '').'attachment=1';
+		if (!empty($object->share)) {
+			$paramlink .= ($paramlink ? '&' : '').'hashp='.$object->share; // Hash for public share
+		}
+		if ($forcedownload) {
+			$paramlink .= ($paramlink ? '&' : '').'attachment=1';
+		}
 
 		$fulllink = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');
 		//if (! empty($object->ref))       $fulllink.='&hashn='.$object->ref;		// Hash of file path
 		//elseif (! empty($object->label)) $fulllink.='&hashc='.$object->label;		// Hash of file content
 
 		print img_picto('', 'globe').' ';
-		if ($action != 'edit') print '<input type="text" class="quatrevingtpercent" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
-		else print $fulllink;
-		if ($action != 'edit') print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>'; // No target here
+		if ($action != 'edit') {
+			print '<input type="text" class="quatrevingtpercent" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
+		} else {
+			print $fulllink;
+		}
+		if ($action != 'edit') {
+			print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>'; // No target here
+		}
 	} else {
 		print '<input type="checkbox" name="shareenabled"'.($object->share ? ' checked="checked"' : '').' /> ';
 	}
 } else {
-	if ($action != 'edit')
-	{
+	if ($action != 'edit') {
 		print '<span class="opacitymedium">'.$langs->trans("FileNotShared").'</span>';
 	} else {
 		print '<input type="checkbox" name="shareenabled"'.($object->share ? ' checked="checked"' : '').' /> ';
@@ -390,8 +398,7 @@ print ajax_autoselect('downloadlink');
 
 print dol_get_fiche_end();
 
-if ($action == 'edit')
-{
+if ($action == 'edit') {
 	print '<div class="center">';
 	print '<input type="submit" class="button button-save" name="submit" value="'.$langs->trans("Save").'">';
 	print ' &nbsp; &nbsp; ';
@@ -403,18 +410,15 @@ if ($action == 'edit')
 
 
 // Confirmation de la suppression d'une ligne categorie
-if ($action == 'delete_file')
-{
+if ($action == 'delete_file') {
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.urlencode($section), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile', $urlfile), 'confirm_deletefile', '', 1, 1);
 }
 
-if ($action != 'edit')
-{
+if ($action != 'edit') {
 	// Actions buttons
 	print '<div class="tabsAction">';
 
-	if ($user->rights->ecm->setup)
-	{
+	if ($user->rights->ecm->setup) {
 		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&section='.urlencode($section).'&urlfile='.urlencode($urlfile).'">'.$langs->trans('Edit').'</a>';
 	}
 	/*
@@ -426,7 +430,7 @@ if ($action != 'edit')
 	{
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Delete').'</a>';
 	}
-    */
+	*/
 	print '</div>';
 }
 

From ba352c2374a74cd77fe51f5117b03eec10a32441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 27 Nov 2020 20:20:04 +0100
Subject: [PATCH 046/888] remove warnings

---
 htdocs/comm/mailing/card.php | 529 ++++++++++++++++-------------------
 1 file changed, 245 insertions(+), 284 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 7b401374b07..52f0f467226 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -23,7 +23,9 @@
  *       \brief      Fiche mailing, onglet general
  */
 
-if (!defined('NOSTYLECHECK')) define('NOSTYLECHECK', '1');
+if (!defined('NOSTYLECHECK')) {
+	define('NOSTYLECHECK', '1');
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/emailing.lib.php';
@@ -38,7 +40,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 // Load translation files required by the page
 $langs->load("mails");
 
-if (!$user->rights->mailing->lire || (empty($conf->global->EXTERNAL_USERS_ARE_AUTHORIZED) && $user->socid > 0)) accessforbidden();
+if (!$user->rights->mailing->lire || (empty($conf->global->EXTERNAL_USERS_ARE_AUTHORIZED) && $user->socid > 0)) {
+	accessforbidden();
+}
 
 $id = (GETPOST('mailid', 'int') ? GETPOST('mailid', 'int') : GETPOST('id', 'int'));
 $action = GETPOST('action', 'aZ09');
@@ -83,20 +87,18 @@ $listofmethods['smtps'] = 'SMTP/SMTPS socket library';
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	// Action clone object
-	if ($action == 'confirm_clone' && $confirm == 'yes')
-	{
-		if (!GETPOST("clone_content", 'alpha') && !GETPOST("clone_receivers", 'alpha'))
-		{
+	if ($action == 'confirm_clone' && $confirm == 'yes') {
+		if (!GETPOST("clone_content", 'alpha') && !GETPOST("clone_receivers", 'alpha')) {
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 		} else {
 			$result = $object->createFromClone($user, $object->id, GETPOST("clone_content", 'alpha'), GETPOST("clone_receivers", 'alpha'));
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 				exit;
 			} else {
@@ -107,24 +109,20 @@ if (empty($reshook))
 	}
 
 	// Action send emailing for everybody
-	if ($action == 'sendallconfirmed' && $confirm == 'yes')
-	{
-		if (empty($conf->global->MAILING_LIMIT_SENDBYWEB))
-		{
+	if ($action == 'sendallconfirmed' && $confirm == 'yes') {
+		if (empty($conf->global->MAILING_LIMIT_SENDBYWEB)) {
 			// As security measure, we don't allow send from the GUI
 			setEventMessages($langs->trans("MailingNeedCommand"), null, 'warnings');
 			setEventMessages('<textarea cols="70" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>', null, 'warnings');
 			setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings');
 			$action = '';
-		} elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
-		{
+		} elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0) {
 			setEventMessages($langs->trans("NotEnoughPermissions"), null, 'warnings');
 			$action = '';
 		} else {
 			$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
 
-			if ($object->statut == 0)
-			{
+			if ($object->statut == 0) {
 				dol_print_error('', 'ErrorMailIsNotValidated');
 				exit;
 			}
@@ -137,7 +135,9 @@ if (empty($reshook))
 			$errorsto = $object->email_errorsto;
 			// Is the message in html
 			$msgishtml = -1; // Unknown by default
-			if (preg_match('/[\s\t]*<html>/i', $message)) $msgishtml = 1;
+			if (preg_match('/[\s\t]*<html>/i', $message)) {
+				$msgishtml = 1;
+			}
 
 			// Warning, we must not use begin-commit transaction here
 			// because we want to save update for each mail sent.
@@ -153,12 +153,10 @@ if (empty($reshook))
 
 			dol_syslog("card.php: select targets", LOG_DEBUG);
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$num = $db->num_rows($resql); // Number of possible recipients
 
-				if ($num)
-				{
+				if ($num) {
 					dol_syslog("comm/mailing/card.php: nb of targets = ".$num, LOG_DEBUG);
 
 					$now = dol_now();
@@ -166,16 +164,14 @@ if (empty($reshook))
 					// Positioning date of start sending
 					$sql = "UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi='".$db->idate($now)."' WHERE rowid=".$object->id;
 					$resql2 = $db->query($sql);
-					if (!$resql2)
-					{
+					if (!$resql2) {
 						dol_print_error($db);
 					}
 
 					// Loop on each email and send it
 					$i = 0;
 
-					while ($i < $num && $i < $conf->global->MAILING_LIMIT_SENDBYWEB)
-					{
+					while ($i < $num && $i < $conf->global->MAILING_LIMIT_SENDBYWEB) {
 						// Here code is common with same loop ino mailing-send.php
 						$res = 1;
 						$now = dol_now();
@@ -215,14 +211,18 @@ if (empty($reshook))
 						$substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.$obj->tag.'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>';
 
 						$onlinepaymentenabled = 0;
-						if (!empty($conf->paypal->enabled)) $onlinepaymentenabled++;
-						if (!empty($conf->paybox->enabled)) $onlinepaymentenabled++;
-						if (!empty($conf->stripe->enabled)) $onlinepaymentenabled++;
-						if ($onlinepaymentenabled && !empty($conf->global->PAYMENT_SECURITY_TOKEN))
-						{
+						if (!empty($conf->paypal->enabled)) {
+							$onlinepaymentenabled++;
+						}
+						if (!empty($conf->paybox->enabled)) {
+							$onlinepaymentenabled++;
+						}
+						if (!empty($conf->stripe->enabled)) {
+							$onlinepaymentenabled++;
+						}
+						if ($onlinepaymentenabled && !empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 							$substitutionarray['__SECUREKEYPAYMENT__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-							if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
-							{
+							if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
@@ -235,21 +235,32 @@ if (empty($reshook))
 							}
 						}
 						/* For backward compatibility, deprecated */
-						if (!empty($conf->paypal->enabled) && !empty($conf->global->PAYPAL_SECURITY_TOKEN))
-						{
+						if (!empty($conf->paypal->enabled) && !empty($conf->global->PAYPAL_SECURITY_TOKEN)) {
 							$substitutionarray['__SECUREKEYPAYPAL__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
 
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'membersubscription'.$obj->source_id, 2);
+							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) {
+								$substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+							} else {
+								$substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'membersubscription'.$obj->source_id, 2);
+							}
 
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'order'.$obj->source_id, 2);
+							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) {
+								$substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+							} else {
+								$substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'order'.$obj->source_id, 2);
+							}
 
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'invoice'.$obj->source_id, 2);
+							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) {
+								$substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+							} else {
+								$substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'invoice'.$obj->source_id, 2);
+							}
 
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'contractline'.$obj->source_id, 2);
+							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) {
+								$substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+							} else {
+								$substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'contractline'.$obj->source_id, 2);
+							}
 						}
 						//$substitutionisok=true;
 
@@ -263,10 +274,8 @@ if (empty($reshook))
 						$arr_css  = array();
 
 						$listofpaths = dol_dir_list($upload_dir, 'all', 0, '', '', 'name', SORT_ASC, 0);
-						if (count($listofpaths))
-						{
-							foreach ($listofpaths as $key => $val)
-							{
+						if (count($listofpaths)) {
+							foreach ($listofpaths as $key => $val) {
 								$arr_file[] = $listofpaths[$key]['fullname'];
 								$arr_mime[] = dol_mimetype($listofpaths[$key]['name']);
 								$arr_name[] = $listofpaths[$key]['name'];
@@ -277,8 +286,7 @@ if (empty($reshook))
 						$trackid = 'emailing-'.$obj->fk_mailing.'-'.$obj->rowid;
 						$mail = new CMailFile($newsubject, $sendto, $from, $newmessage, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $errorsto, $arr_css, $trackid, '', 'emailing');
 
-						if ($mail->error)
-						{
+						if ($mail->error) {
 							$res = 0;
 						}
 						/*if (! $substitutionisok)
@@ -288,13 +296,11 @@ if (empty($reshook))
 						}*/
 
 						// Send mail
-						if ($res)
-						{
+						if ($res) {
 							$res = $mail->sendfile();
 						}
 
-						if ($res)
-						{
+						if ($res) {
 							// Mail successful
 							$nbok++;
 
@@ -303,19 +309,16 @@ if (empty($reshook))
 							$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
 							$sql .= " SET statut=1, date_envoi='".$db->idate($now)."' WHERE rowid=".$obj->rowid;
 							$resql2 = $db->query($sql);
-							if (!$resql2)
-							{
+							if (!$resql2) {
 								dol_print_error($db);
 							} else {
 								//if cheack read is use then update prospect contact status
-								if (strpos($message, '__CHECK_READ__') !== false)
-								{
+								if (strpos($message, '__CHECK_READ__') !== false) {
 									//Update status communication of thirdparty prospect
 									$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".$obj->rowid.")";
 									dol_syslog("card.php: set prospect thirdparty status", LOG_DEBUG);
 									$resql2 = $db->query($sql);
-									if (!$resql2)
-									{
+									if (!$resql2) {
 										dol_print_error($db);
 									}
 
@@ -324,15 +327,13 @@ if (empty($reshook))
 									dol_syslog("card.php: set prospect contact status", LOG_DEBUG);
 
 									$resql2 = $db->query($sql);
-									if (!$resql2)
-									{
+									if (!$resql2) {
 										dol_print_error($db);
 									}
 								}
 							}
 
-							if (!empty($conf->global->MAILING_DELAY))
-							{
+							if (!empty($conf->global->MAILING_DELAY)) {
 								dol_syslog("Wait a delay of MAILING_DELAY=".$conf->global->MAILING_DELAY);
 								sleep($conf->global->MAILING_DELAY);
 							}
@@ -347,8 +348,7 @@ if (empty($reshook))
 							$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
 							$sql .= " SET statut=-1, error_text='".$db->escape($mail->error)."', date_envoi='".$db->idate($now)."' WHERE rowid=".$obj->rowid;
 							$resql2 = $db->query($sql);
-							if (!$resql2)
-							{
+							if (!$resql2) {
 								dol_print_error($db);
 							}
 						}
@@ -360,14 +360,15 @@ if (empty($reshook))
 				}
 
 				// Loop finished, set global statut of mail
-				if ($nbko > 0)
-				{
+				if ($nbko > 0) {
 					$statut = 2; // Status 'sent partially' (because at least one error)
-					if ($nbok > 0) 	setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
-					else setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
+					if ($nbok > 0) {
+						setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
+					} else {
+						setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
+					}
 				} else {
-					if ($nbok >= $num)
-					{
+					if ($nbok >= $num) {
 						$statut = 3; // Send to everybody
 						setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
 					} else {
@@ -379,8 +380,7 @@ if (empty($reshook))
 				$sql = "UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$object->id;
 				dol_syslog("comm/mailing/card.php: update global status", LOG_DEBUG);
 				$resql2 = $db->query($sql);
-				if (!$resql2)
-				{
+				if (!$resql2) {
 					dol_print_error($db);
 				}
 			} else {
@@ -393,24 +393,23 @@ if (empty($reshook))
 	}
 
 	// Action send test emailing
-	if ($action == 'send' && empty($_POST["cancel"]))
-	{
+	if ($action == 'send' && empty($_POST["cancel"])) {
 		$error = 0;
 
 		$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
 
 		$object->sendto = $_POST["sendto"];
-		if (!$object->sendto)
-		{
+		if (!$object->sendto) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("MailTo")), null, 'errors');
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Is the message in html
 			$msgishtml = -1; // Unknow by default
-			if (preg_match('/[\s\t]*<html>/i', $object->body)) $msgishtml = 1;
+			if (preg_match('/[\s\t]*<html>/i', $object->body)) {
+				$msgishtml = 1;
+			}
 
 			// other are set at begin of page
 			$object->substitutionarrayfortest['__EMAIL__'] = $object->sendto;
@@ -427,15 +426,17 @@ if (empty($reshook))
 			$arr_css  = array();
 
 			// Add CSS
-			if (!empty($object->bgcolor)) $arr_css['bgcolor'] = (preg_match('/^#/', $object->bgcolor) ? '' : '#').$object->bgcolor;
-			if (!empty($object->bgimage)) $arr_css['bgimage'] = $object->bgimage;
+			if (!empty($object->bgcolor)) {
+				$arr_css['bgcolor'] = (preg_match('/^#/', $object->bgcolor) ? '' : '#').$object->bgcolor;
+			}
+			if (!empty($object->bgimage)) {
+				$arr_css['bgimage'] = $object->bgimage;
+			}
 
 			// Attached files
 			$listofpaths = dol_dir_list($upload_dir, 'all', 0, '', '', 'name', SORT_ASC, 0);
-			if (count($listofpaths))
-			{
-				foreach ($listofpaths as $key => $val)
-				{
+			if (count($listofpaths)) {
+				foreach ($listofpaths as $key => $val) {
 					$arr_file[] = $listofpaths[$key]['fullname'];
 					$arr_mime[] = dol_mimetype($listofpaths[$key]['name']);
 					$arr_name[] = $listofpaths[$key]['name'];
@@ -446,8 +447,7 @@ if (empty($reshook))
 			$mailfile = new CMailFile($tmpsujet, $object->sendto, $object->email_from, $tmpbody, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $object->email_errorsto, $arr_css, $trackid, '', 'emailing');
 
 			$result = $mailfile->sendfile();
-			if ($result)
-			{
+			if ($result) {
 				setEventMessages($langs->trans("MailSuccessfulySent", $mailfile->getValidAddress($object->email_from, 2), $mailfile->getValidAddress($object->sendto, 2)), null, 'mesgs');
 				$action = '';
 			} else {
@@ -458,18 +458,17 @@ if (empty($reshook))
 	}
 
 	// Action add emailing
-	if ($action == 'add')
-	{
+	if ($action == 'add') {
 		$mesgs = array();
 
-		$object->email_from     = GETPOST("from", "none"); // Must allow 'name <email>'
-		$object->email_replyto  = GETPOST("replyto", "none"); // Must allow 'name <email>'
-		$object->email_errorsto = GETPOST("errorsto", "none"); // Must allow 'name <email>'
-		$object->title          = GETPOST("title");
-		$object->sujet          = GETPOST("sujet");
-		$object->body           = GETPOST("bodyemail", 'restricthtml');
-		$object->bgcolor        = GETPOST("bgcolor");
-		$object->bgimage        = GETPOST("bgimage");
+		$object->email_from     = (string) GETPOST("from", "none"); // Must allow 'name <email>'
+		$object->email_replyto  = (string) GETPOST("replyto", "none"); // Must allow 'name <email>'
+		$object->email_errorsto = (string) GETPOST("errorsto", "none"); // Must allow 'name <email>'
+		$object->title          = (string) GETPOST("title");
+		$object->sujet          = (string) GETPOST("sujet");
+		$object->body           = (string) GETPOST("bodyemail", 'restricthtml');
+		$object->bgcolor        = (string) GETPOST("bgcolor");
+		$object->bgimage        = (string) GETPOST("bgimage");
 
 		if (!$object->title) {
 			$mesgs[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailTitle"));
@@ -481,10 +480,8 @@ if (empty($reshook))
 			$mesgs[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailMessage"));
 		}
 
-		if (!count($mesgs))
-		{
-			if ($object->create($user) >= 0)
-			{
+		if (!count($mesgs)) {
+			if ($object->create($user) >= 0) {
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
 			}
@@ -496,24 +493,25 @@ if (empty($reshook))
 	}
 
 	// Action update description of emailing
-	if ($action == 'settitle' || $action == 'setemail_from' || $action == 'setreplyto' || $action == 'setemail_errorsto')
-	{
+	if ($action == 'settitle' || $action == 'setemail_from' || $action == 'setreplyto' || $action == 'setemail_errorsto') {
 		$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
 
-		if ($action == 'settitle') $object->title = trim(GETPOST('title', 'alpha'));
-		elseif ($action == 'setemail_from') $object->email_from = trim(GETPOST('email_from', 'none')); // Must allow 'name <email>'
-		elseif ($action == 'setemail_replyto') $object->email_replyto = trim(GETPOST('email_replyto', 'none')); // Must allow 'name <email>'
-		elseif ($action == 'setemail_errorsto') $object->email_errorsto = trim(GETPOST('email_errorsto', 'none')); // Must allow 'name <email>'
-		elseif ($action == 'settitle' && empty($object->title)) {
+		if ($action == 'settitle') {
+			$object->title = trim(GETPOST('title', 'alpha'));
+		} elseif ($action == 'setemail_from') {
+			$object->email_from = trim(GETPOST('email_from', 'none')); // Must allow 'name <email>'
+		} elseif ($action == 'setemail_replyto') {
+			$object->email_replyto = trim(GETPOST('email_replyto', 'none')); // Must allow 'name <email>'
+		} elseif ($action == 'setemail_errorsto') {
+			$object->email_errorsto = trim(GETPOST('email_errorsto', 'none')); // Must allow 'name <email>'
+		} elseif ($action == 'settitle' && empty($object->title)) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailTitle"));
 		} elseif ($action == 'setfrom' && empty($object->email_from)) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailFrom"));
 		}
 
-		if (!$mesg)
-		{
-			if ($object->update($user) >= 0)
-			{
+		if (!$mesg) {
+			if ($object->update($user) >= 0) {
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
 			}
@@ -527,8 +525,7 @@ if (empty($reshook))
 	/*
 	 * Add file in email form
 	 */
-	if (!empty($_POST['addfile']))
-	{
+	if (!empty($_POST['addfile'])) {
 		$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -540,8 +537,7 @@ if (empty($reshook))
 	}
 
 	// Action of file remove
-	if (!empty($_POST["removedfile"]))
-	{
+	if (!empty($_POST["removedfile"])) {
 		$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -552,20 +548,18 @@ if (empty($reshook))
 	}
 
 	// Action of emailing update
-	if ($action == 'update' && empty($_POST["removedfile"]) && empty($_POST["cancel"]))
-	{
+	if ($action == 'update' && empty($_POST["removedfile"]) && empty($_POST["cancel"])) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$isupload = 0;
 
-		if (!$isupload)
-		{
+		if (!$isupload) {
 			$mesgs = array();
 
-			$object->sujet          = GETPOST("sujet");
-			$object->body           = GETPOST("bodyemail", 'restricthtml');
-			$object->bgcolor        = GETPOST("bgcolor");
-			$object->bgimage        = GETPOST("bgimage");
+			$object->sujet          = (string) GETPOST("sujet");
+			$object->body           = (string) GETPOST("bodyemail", 'restricthtml');
+			$object->bgcolor        = (string) GETPOST("bgcolor");
+			$object->bgimage        = (string) GETPOST("bgimage");
 
 			if (!$object->sujet) {
 				$mesgs[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailTopic"));
@@ -574,10 +568,8 @@ if (empty($reshook))
 				$mesgs[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailMessage"));
 			}
 
-			if (!count($mesgs))
-			{
-				if ($object->update($user) >= 0)
-				{
+			if (!count($mesgs)) {
+				if ($object->update($user) >= 0) {
 					header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 					exit;
 				}
@@ -592,10 +584,8 @@ if (empty($reshook))
 	}
 
 	// Action of validation confirmation
-	if ($action == 'confirm_valid' && $confirm == 'yes')
-	{
-		if ($object->id > 0)
-		{
+	if ($action == 'confirm_valid' && $confirm == 'yes') {
+		if ($object->id > 0) {
 			$object->valid($user);
 			setEventMessages($langs->trans("MailingSuccessfullyValidated"), null, 'mesgs');
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
@@ -606,13 +596,10 @@ if (empty($reshook))
 	}
 
 	// Action of validation confirmation
-	if ($action == 'confirm_settodraft' && $confirm == 'yes')
-	{
-		if ($object->id > 0)
-		{
+	if ($action == 'confirm_settodraft' && $confirm == 'yes') {
+		if ($object->id > 0) {
 			$result = $object->setStatut(0);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				//setEventMessages($langs->trans("MailingSuccessfullyValidated"), null, 'mesgs');
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
@@ -625,20 +612,16 @@ if (empty($reshook))
 	}
 
 	// Resend
-	if ($action == 'confirm_reset' && $confirm == 'yes')
-	{
-		if ($object->id > 0)
-		{
+	if ($action == 'confirm_reset' && $confirm == 'yes') {
+		if ($object->id > 0) {
 			$db->begin();
 
 			$result = $object->valid($user);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$result = $object->reset_targets_status($user);
 			}
 
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$db->commit();
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
@@ -652,18 +635,15 @@ if (empty($reshook))
 	}
 
 	// Action of delete confirmation
-	if ($action == 'confirm_delete' && $confirm == 'yes')
-	{
-		if ($object->delete($object->id))
-		{
+	if ($action == 'confirm_delete' && $confirm == 'yes') {
+		if ($object->delete($object->id)) {
 			$url = (!empty($urlfrom) ? $urlfrom : 'list.php');
 			header("Location: ".$url);
 			exit;
 		}
 	}
 
-	if (!empty($_POST["cancel"]))
-	{
+	if (!empty($_POST["cancel"])) {
 		$action = '';
 	}
 }
@@ -677,24 +657,30 @@ $form = new Form($db);
 $htmlother = new FormOther($db);
 
 $help_url = 'EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing';
-llxHeader('', $langs->trans("Mailing"), $help_url, '', 0, 0,
+llxHeader(
+	'',
+	$langs->trans("Mailing"),
+	$help_url,
+	'',
+	0,
+	0,
 	array(
-	'/includes/ace/src/ace.js',
-	'/includes/ace/src/ext-statusbar.js',
-	'/includes/ace/src/ext-language_tools.js',
-	//'/includes/ace/src/ext-chromevox.js'
-	), array());
+		'/includes/ace/src/ace.js',
+		'/includes/ace/src/ext-statusbar.js',
+		'/includes/ace/src/ext-language_tools.js',
+		//'/includes/ace/src/ext-chromevox.js'
+	),
+	array()
+);
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	// EMailing in creation mode
 	print '<form name="new_mailing" action="'.$_SERVER['PHP_SELF'].'" method="POST">'."\n";
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 
 	$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
-	foreach ($object->substitutionarray as $key => $val)
-	{
+	foreach ($object->substitutionarray as $key => $val) {
 		$htmltext .= $key.' = '.$langs->trans($val).'<br>';
 	}
 	$htmltext .= '</i>';
@@ -718,8 +704,7 @@ if ($action == 'create')
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	if (empty($reshook))
-	{
+	if (empty($reshook)) {
 		print $object->showOptionals($extrafields, 'edit');
 	}
 
@@ -747,79 +732,80 @@ if ($action == 'create')
 
 	print '</form>';
 } else {
-	if ($object->id > 0)
-	{
+	if ($object->id > 0) {
 		$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
 
 		$head = emailing_prepare_head($object);
 
-		// Confirmation back to draft
-		if ($action == 'settodraft')
-		{
+		if ($action == 'settodraft') {
+			// Confirmation back to draft
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("SetToDraft"), $langs->trans("ConfirmUnvalidateEmailing"), "confirm_settodraft", '', '', 1);
-		}
-		// Confirmation of mailing validation
-		if ($action == 'valid')
-		{
+		} elseif ($action == 'valid') {
+			// Confirmation of mailing validation
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ValidMailing"), $langs->trans("ConfirmValidMailing"), "confirm_valid", '', '', 1);
-		} // Confirm reset
-		elseif ($action == 'reset')
-		{
+		} elseif ($action == 'reset') {
+			// Confirm reset
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ResetMailing"), $langs->trans("ConfirmResetMailing", $object->ref), "confirm_reset", '', '', 2);
-		} // Confirm delete
-		elseif ($action == 'delete')
-		{
+		} elseif ($action == 'delete') {
+			// Confirm delete
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id.(!empty($urlfrom) ? '&urlfrom='.urlencode($urlfrom) : ''), $langs->trans("DeleteAMailing"), $langs->trans("ConfirmDeleteMailing"), "confirm_delete", '', '', 1);
 		}
 
-
-		if ($action != 'edit' && $action != 'edithtml')
-		{
+		if ($action != 'edit' && $action != 'edithtml') {
 			print dol_get_fiche_head($head, 'card', $langs->trans("Mailing"), -1, 'email');
 
 			/*
 			 * View mode mailing
 			 */
-			if ($action == 'sendall')
-			{
+			if ($action == 'sendall') {
 				// Define message to recommand from command line
 				$sendingmode = $conf->global->EMAILING_MAIL_SENDMODE;
-				if (empty($sendingmode)) $sendingmode = $conf->global->MAIN_MAIL_SENDMODE;
-				if (empty($sendingmode)) $sendingmode = 'mail'; // If not defined, we use php mail function
+				if (empty($sendingmode)) {
+					$sendingmode = $conf->global->MAIN_MAIL_SENDMODE;
+				}
+				if (empty($sendingmode)) {
+					$sendingmode = 'mail'; // If not defined, we use php mail function
+				}
 
 				// MAILING_NO_USING_PHPMAIL may be defined or not.
 				// MAILING_LIMIT_SENDBYWEB is always defined to something != 0 (-1=forbidden).
 				// MAILING_LIMIT_SENDBYCLI may be defined ot not (-1=forbidden, 0 or undefined=no limit).
-				if (!empty($conf->global->MAILING_NO_USING_PHPMAIL) && $sendingmode == 'mail')
-				{
+				if (!empty($conf->global->MAILING_NO_USING_PHPMAIL) && $sendingmode == 'mail') {
 					// EMailing feature may be a spam problem, so when you host several users/instance, having this option may force each user to use their own SMTP agent.
 					// You ensure that every user is using its own SMTP server when using the mass emailing module.
 					$linktoadminemailbefore = '<a href="'.DOL_URL_ROOT.'/admin/mails_emailing.php">';
 					$linktoadminemailend = '</a>';
 					setEventMessages($langs->trans("MailSendSetupIs", $listofmethods[$sendingmode]), null, 'warnings');
 					setEventMessages($langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']), null, 'warnings');
-					if (!empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS)) setEventMessages($langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS), null, 'warnings');
+					if (!empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS)) {
+						setEventMessages($langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS), null, 'warnings');
+					}
 					$_GET["action"] = '';
-				} elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
-				{
-					if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
-					if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
+				} elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0) {
+					if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') {
+						setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
+					}
+					if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') {
+						setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
+					}
 
 					// The feature is forbidden from GUI, we show just message to use from command line.
 					setEventMessages($langs->trans("MailingNeedCommand"), null, 'warnings');
 					setEventMessages('<textarea cols="60" rows="'.ROWS_1.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>', null, 'warnings');
-					if ($conf->file->mailing_limit_sendbyweb != '-1')  // MAILING_LIMIT_SENDBYWEB was set to -1 in database, but it is allowed ot increase it.
-					{
+					if ($conf->file->mailing_limit_sendbyweb != '-1') {  // MAILING_LIMIT_SENDBYWEB was set to -1 in database, but it is allowed ot increase it.
 						setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings'); // You can send online with constant...
 					}
 					$_GET["action"] = '';
 				} else {
-					if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
-					if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
+					if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') {
+						setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
+					}
+					if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') {
+						setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
+					}
 
 					$text = '';
-					if ($conf->global->MAILING_LIMIT_SENDBYCLI >= 0)
-					{
+					if ($conf->global->MAILING_LIMIT_SENDBYCLI >= 0) {
 						$text .= $langs->trans("MailingNeedCommand");
 						$text .= '<br><textarea cols="60" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.' '.$user->login.'</textarea>';
 						$text .= '<br><br>';
@@ -834,13 +820,14 @@ if ($action == 'create')
 
 			$morehtmlright = '';
 			$nbtry = $nbok = 0;
-			if ($object->statut == 2 || $object->statut == 3)
-			{
+			if ($object->statut == 2 || $object->statut == 3) {
 				$nbtry = $object->countNbOfTargets('alreadysent');
 				$nbko  = $object->countNbOfTargets('alreadysentko');
 
 				$morehtmlright .= ' ('.$nbtry.'/'.$object->nbemail;
-				if ($nbko) $morehtmlright .= ' - '.$nbko.' '.$langs->trans("Error");
+				if ($nbko) {
+					$morehtmlright .= ' - '.$nbko.' '.$langs->trans("Error");
+				}
 				$morehtmlright .= ') &nbsp; ';
 			}
 
@@ -894,21 +881,19 @@ if ($action == 'create')
 			print $langs->trans("TotalNbOfDistinctRecipients");
 			print '</td><td colspan="3">';
 			$nbemail = ($object->nbemail ? $object->nbemail : 0);
-			if (is_numeric($nbemail))
-			{
+			if (is_numeric($nbemail)) {
 				$text = '';
-				if ((!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || ($object->statut == 2 && $nbtry < $nbemail)))
-				{
-					if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
-					{
+				if ((!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || ($object->statut == 2 && $nbtry < $nbemail))) {
+					if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0) {
 						$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
 					} else {
 						$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
 					}
 				}
-				if (empty($nbemail)) $nbemail .= ' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
-				if ($text)
-				{
+				if (empty($nbemail)) {
+					$nbemail .= ' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
+				}
+				if ($text) {
 					print $form->textwithpicto($nbemail, $text, 1, 'warning');
 				} else {
 					print $nbemail;
@@ -927,8 +912,7 @@ if ($action == 'create')
 
 
 			// Clone confirmation
-			if ($action == 'clone')
-			{
+			if ($action == 'clone') {
 				// Create an array for form
 				$formquestion = array(
 					'text' => $langs->trans("ConfirmClone"),
@@ -943,81 +927,67 @@ if ($action == 'create')
 			 * Actions Buttons
 			 */
 
-			if (GETPOST('cancel', 'alpha') || $confirm == 'no' || $action == '' || in_array($action, array('settodraft', 'valid', 'delete', 'sendall', 'clone', 'test')))
-			{
+			if (GETPOST('cancel', 'alpha') || $confirm == 'no' || $action == '' || in_array($action, array('settodraft', 'valid', 'delete', 'sendall', 'clone', 'test'))) {
 				print "\n\n<div class=\"tabsAction\">\n";
 
-				if (($object->statut == 1) && ($user->rights->mailing->valider || $object->fk_user_valid == $user->id))
-				{
+				if (($object->statut == 1) && ($user->rights->mailing->valider || $object->fk_user_valid == $user->id)) {
 					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=settodraft&amp;id='.$object->id.'">'.$langs->trans("SetToDraft").'</a>';
 				}
 
-				if (($object->statut == 0 || $object->statut == 1 || $object->statut == 2) && $user->rights->mailing->creer)
-				{
-					if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_MAILING))
-					{
+				if (($object->statut == 0 || $object->statut == 1 || $object->statut == 2) && $user->rights->mailing->creer) {
+					if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_MAILING)) {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("EditWithEditor").'</a>';
 					} else {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("EditWithTextEditor").'</a>';
 					}
 
-					if (!empty($conf->use_javascript_ajax)) print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edithtml&amp;id='.$object->id.'">'.$langs->trans("EditHTMLSource").'</a>';
+					if (!empty($conf->use_javascript_ajax)) {
+						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edithtml&amp;id='.$object->id.'">'.$langs->trans("EditHTMLSource").'</a>';
+					}
 				}
 
 				//print '<a class="butAction" href="card.php?action=test&amp;id='.$object->id.'">'.$langs->trans("PreviewMailing").'</a>';
 
-				if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send)
-				{
+				if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send) {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("TestMailing").'</a>';
 				} else {
 					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=test&amp;id='.$object->id.'">'.$langs->trans("TestMailing").'</a>';
 				}
 
-				if ($object->statut == 0)
-				{
-					if ($object->nbemail <= 0)
-					{
+				if ($object->statut == 0) {
+					if ($object->nbemail <= 0) {
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NoTargetYet")).'">'.$langs->trans("ValidMailing").'</a>';
-					} elseif (empty($user->rights->mailing->valider))
-					{
+					} elseif (empty($user->rights->mailing->valider)) {
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("ValidMailing").'</a>';
 					} else {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=valid&amp;id='.$object->id.'">'.$langs->trans("ValidMailing").'</a>';
 					}
 				}
 
-				if (($object->statut == 1 || $object->statut == 2) && $object->nbemail > 0 && $user->rights->mailing->valider)
-				{
-					if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
-					{
+				if (($object->statut == 1 || $object->statut == 2) && $object->nbemail > 0 && $user->rights->mailing->valider) {
+					if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0) {
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("SendingFromWebInterfaceIsNotAllowed")).'">'.$langs->trans("SendMailing").'</a>';
-					} elseif (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send)
-					{
+					} elseif (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send) {
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("SendMailing").'</a>';
 					} else {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=sendall&amp;id='.$object->id.'">'.$langs->trans("SendMailing").'</a>';
 					}
 				}
 
-				if ($user->rights->mailing->creer)
-				{
+				if ($user->rights->mailing->creer) {
 					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=clone&amp;object=emailing&amp;id='.$object->id.'">'.$langs->trans("ToClone").'</a>';
 				}
 
-				if (($object->statut == 2 || $object->statut == 3) && $user->rights->mailing->valider)
-				{
-					if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send)
-					{
+				if (($object->statut == 2 || $object->statut == 3) && $user->rights->mailing->valider) {
+					if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send) {
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("ResetMailing").'</a>';
 					} else {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=reset&amp;id='.$object->id.'">'.$langs->trans("ResetMailing").'</a>';
 					}
 				}
 
-				if (($object->statut <= 1 && $user->rights->mailing->creer) || $user->rights->mailing->supprimer)
-				{
-					if ($object->statut > 0 && (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->delete))
-					{
+				if (($object->statut <= 1 && $user->rights->mailing->creer) || $user->rights->mailing->supprimer) {
+					if ($object->statut > 0 && (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->delete)) {
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("DeleteMailing").'</a>';
 					} else {
 						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;token='.newToken().'&amp;id='.$object->id.(!empty($urlfrom) ? '&urlfrom='.$urlfrom : '').'">'.$langs->trans("DeleteMailing").'</a>';
@@ -1028,8 +998,7 @@ if ($action == 'create')
 			}
 
 			// Display of the TEST form
-			if ($action == 'test')
-			{
+			if ($action == 'test') {
 				print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 				print load_fiche_titre($langs->trans("TestMailing"));
 
@@ -1071,8 +1040,7 @@ if ($action == 'create')
 
 
 			$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
-			foreach ($object->substitutionarray as $key => $val)
-			{
+			foreach ($object->substitutionarray as $key => $val) {
 				$htmltext .= $key.' = '.$langs->trans($val).'<br>';
 			}
 			$htmltext .= '</i>';
@@ -1091,10 +1059,8 @@ if ($action == 'create')
 			print '<tr><td>'.$langs->trans("MailFile").'</td><td colspan="3">';
 			// List of files
 			$listofpaths = dol_dir_list($upload_dir, 'all', 0, '', '', 'name', SORT_ASC, 0);
-			if (count($listofpaths))
-			{
-				foreach ($listofpaths as $key => $val)
-				{
+			if (count($listofpaths)) {
+				foreach ($listofpaths as $key => $val) {
 					print img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name'];
 					print '<br>';
 				}
@@ -1105,21 +1071,22 @@ if ($action == 'create')
 
 			// Background color
 			/*print '<tr><td width="15%">'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
-            print $htmlother->selectColor($object->bgcolor,'bgcolor','',0);
-            print '</td></tr>';*/
+			print $htmlother->selectColor($object->bgcolor,'bgcolor','',0);
+			print '</td></tr>';*/
 
 			print '</table>';
 
 			// Message
 			print '<div style="padding-top: 10px; background: '.($object->bgcolor ? (preg_match('/^#/', $object->bgcolor) ? '' : '#').$object->bgcolor : 'white').'">';
-			if (empty($object->bgcolor) || strtolower($object->bgcolor) == 'ffffff')	// CKEditor does not apply the color of the div into its content area
-			{
+			if (empty($object->bgcolor) || strtolower($object->bgcolor) == 'ffffff') {	// CKEditor does not apply the color of the div into its content area
 				$readonly = 1;
 				// wysiwyg editor
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', false, true, empty($conf->global->FCKEDITOR_ENABLE_MAILING) ? 0 : 1, 20, '90%', $readonly);
 				$doleditor->Create();
-			} else print dol_htmlentitiesbr($object->body);
+			} else {
+				print dol_htmlentitiesbr($object->body);
+			}
 			print '</div>';
 
 			print dol_get_fiche_end();
@@ -1133,7 +1100,9 @@ if ($action == 'create')
 			$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 			$morehtmlright = '';
-			if ($object->statut == 2) $morehtmlright .= ' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
+			if ($object->statut == 2) {
+				$morehtmlright .= ' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
+			}
 
 			dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
 
@@ -1161,21 +1130,19 @@ if ($action == 'create')
 			print $langs->trans("TotalNbOfDistinctRecipients");
 			print '</td><td colspan="3">';
 			$nbemail = ($object->nbemail ? $object->nbemail : 0);
-			if (is_numeric($nbemail))
-			{
+			if (is_numeric($nbemail)) {
 				$text = '';
-				if ((!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || $object->statut == 2))
-				{
-					if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
-					{
+				if ((!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || $object->statut == 2)) {
+					if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0) {
 						$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
 					} else {
 						$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
 					}
 				}
-				if (empty($nbemail)) $nbemail .= ' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
-				if ($text)
-				{
+				if (empty($nbemail)) {
+					$nbemail .= ' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
+				}
+				if ($text) {
 					print $form->textwithpicto($nbemail, $text, 1, 'warning');
 				} else {
 					print $nbemail;
@@ -1187,8 +1154,7 @@ if ($action == 'create')
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
-			if (empty($reshook))
-			{
+			if (empty($reshook)) {
 				print $object->showOptionals($extrafields, 'edit', $parameters);
 			}
 
@@ -1207,8 +1173,7 @@ if ($action == 'create')
 			print '<input type="hidden" name="id" value="'.$object->id.'">';
 
 			$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
-			foreach ($object->substitutionarray as $key => $val)
-			{
+			foreach ($object->substitutionarray as $key => $val) {
 				$htmltext .= $key.' = '.$langs->trans($val).'<br>';
 			}
 			$htmltext .= '</i>';
@@ -1242,10 +1207,8 @@ if ($action == 'create')
 			$out .= '    });';
 			$out .= '})';
 			$out .= '</script>'."\n";
-			if (count($listofpaths))
-			{
-				foreach ($listofpaths as $key => $val)
-				{
+			if (count($listofpaths)) {
+				foreach ($listofpaths as $key => $val) {
 					$out .= '<div id="attachfile_'.$key.'">';
 					$out .= img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name'];
 					$out .= ' <input type="image" style="border: 0px;" src="'.img_picto($langs->trans("Search"), 'delete.png', '', '', 1).'" value="'.($key + 1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
@@ -1271,15 +1234,13 @@ if ($action == 'create')
 			// Message
 			print '<div style="padding-top: 10px">';
 
-			if ($action == 'edit')
-			{
+			if ($action == 'edit') {
 				// wysiwyg editor
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', true, true, $conf->global->FCKEDITOR_ENABLE_MAILING, 20, '90%');
 				$doleditor->Create();
 			}
-			if ($action == 'edithtml')
-			{
+			if ($action == 'edithtml') {
 				// HTML source editor
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', true, true, 'ace', 20, '90%');

From 391e643eb7381cece0612ed406f490f5ba0698d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 27 Nov 2020 20:33:40 +0100
Subject: [PATCH 047/888] doxygen

---
 htdocs/comm/mailing/class/mailing.class.php | 20 ++++++++++++++++++--
 htdocs/comm/mailing/info.php                | 19 ++++++++-----------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 2f2b16bd119..b93030d0262 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -118,36 +118,48 @@ class Mailing extends CommonObject
 
 	/**
 	 * @var int id of user create
-	 * @deprecated
 	 */
 	public $user_creation;
 
 	/**
 	 * @var int id of user create
+	 * @deprecated
 	 */
 	public $user_creat;
 
 	/**
 	 * @var int id of user validate
-	 * @deprecated
 	 */
 	public $user_validation;
 
 	/**
 	 * @var int id of user validate
+	 * @deprecated
 	 */
 	public $user_valid;
 
 	/**
 	 * @var integer|string date_creation
+	 * @deprecated
 	 */
 	public $date_creat;
 
+	/**
+	 * @var integer|string date_creation
+	 */
+	public $date_creation;
+
 	/**
 	 * @var int date validate
+	 * @deprecated
 	 */
 	public $date_valid;
 
+	/**
+	 * @var int date validate
+	 */
+	public $date_validation;
+
 	/**
 	 * @var array extraparams
 	 */
@@ -314,10 +326,14 @@ class Mailing extends CommonObject
 				$this->email_errorsto = $obj->email_errorsto;
 
 				$this->user_creat = $obj->fk_user_creat;
+				$this->user_creation = $obj->fk_user_creat;
 				$this->user_valid = $obj->fk_user_valid;
+				$this->user_validation = $obj->fk_user_valid;
 
 				$this->date_creat = $this->db->jdate($obj->date_creat);
+				$this->date_creation = $this->db->jdate($obj->date_creat);
 				$this->date_valid = $this->db->jdate($obj->date_valid);
+				$this->date_validation = $this->db->jdate($obj->date_valid);
 				$this->date_envoi = $this->db->jdate($obj->date_envoi);
 
 				$this->extraparams = (array) json_decode($obj->extraparams, true);
diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php
index 199a5caad8b..4bd39309701 100644
--- a/htdocs/comm/mailing/info.php
+++ b/htdocs/comm/mailing/info.php
@@ -33,8 +33,9 @@ $id = GETPOST('id', 'int');
 $langs->load("mails");
 
 // Security check
-if (!$user->rights->mailing->lire || $user->socid > 0)
-accessforbidden();
+if (!$user->rights->mailing->lire || $user->socid > 0) {
+	accessforbidden();
+}
 
 
 
@@ -48,8 +49,7 @@ $form = new Form($db);
 
 $object = new Mailing($db);
 
-if ($object->fetch($id) >= 0)
-{
+if ($object->fetch($id) >= 0) {
 	$head = emailing_prepare_head($object);
 
 	print dol_get_fiche_head($head, 'info', $langs->trans("Mailing"), -1, 'email');
@@ -58,13 +58,14 @@ if ($object->fetch($id) >= 0)
 
 	$morehtmlright = '';
 	$nbtry = $nbok = 0;
-	if ($object->statut == 2 || $object->statut == 3)
-	{
+	if ($object->statut == 2 || $object->statut == 3) {
 		$nbtry = $object->countNbOfTargets('alreadysent');
 		$nbko  = $object->countNbOfTargets('alreadysentko');
 
 		$morehtmlright .= ' ('.$nbtry.'/'.$object->nbemail;
-		if ($nbko) $morehtmlright .= ' - '.$nbko.' '.$langs->trans("Error");
+		if ($nbko) {
+			$morehtmlright .= ' - '.$nbko.' '.$langs->trans("Error");
+		}
 		$morehtmlright .= ') &nbsp; ';
 	}
 
@@ -73,10 +74,6 @@ if ($object->fetch($id) >= 0)
 	print '<div class="underbanner clearboth"></div><br>';
 
 	//print '<table width="100%"><tr><td>';
-	$object->user_creation = $object->user_creat;
-	$object->date_creation = $object->date_creat;
-	$object->user_validation = $object->user_valid;
-	$object->date_validation = $object->date_valid;
 	dol_print_object_info($object, 0);
 	//print '</td></tr></table>';
 

From 00dca7ff9b6ceb5d383e96aece0e889919b64aab Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Mon, 30 Nov 2020 13:01:45 +0100
Subject: [PATCH 048/888] =?UTF-8?q?NEW=20:=20Encours=20d=C3=A9pass=C3=A9?=
 =?UTF-8?q?=20#15307?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...box_customers_outstanding_bill_reached.php | 194 ++++++++++++++++++
 htdocs/core/modules/modFacture.class.php      |   3 +-
 2 files changed, 196 insertions(+), 1 deletion(-)
 create mode 100644 htdocs/core/boxes/box_customers_outstanding_bill_reached.php

diff --git a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
new file mode 100644
index 00000000000..2baa02a912c
--- /dev/null
+++ b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
@@ -0,0 +1,194 @@
+<?php
+/* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2010 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>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/core/boxes/box_clients.php
+ *	\ingroup    societes
+ *	\brief      Module de generation de l'affichage de la box clients
+ */
+
+include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
+
+
+/**
+ * Class to manage the box to show last thirdparties
+ */
+class box_customers_outstanding_bill_reached extends ModeleBoxes
+{
+	public $boxcode = "customersoutstandingbillreached";
+	public $boximg = "object_company";
+	public $boxlabel = "BoxCustomersOutstandingBillReached";
+	public $depends = array("facture","societe");
+
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
+
+	public $enabled = 1;
+
+	public $info_box_head = array();
+	public $info_box_contents = array();
+
+
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB	$db      	Database handler
+	 *  @param	string	$param		More parameters
+	 */
+	public function __construct($db, $param = '')
+	{
+		global $conf, $user;
+
+		$this->db = $db;
+
+		// disable box for such cases
+		if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled = 0; // disabled by this option
+
+		$this->hidden = !($user->rights->societe->lire && empty($user->socid));
+	}
+
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $user, $langs, $conf;
+		$langs->load("boxes");
+
+		$this->max = $max;
+
+		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		$thirdpartystatic = new Societe($this->db);
+
+		$this->info_box_head = array('text' => "Last Cutomers Outstanding Bill Reached");
+
+		if ($user->rights->societe->lire)
+		{
+			$sql = "SELECT s.nom as name, s.rowid as socid";
+			$sql .= ", s.code_client";
+			$sql .= ", s.client";
+			$sql .= ", s.code_fournisseur";
+			$sql .= ", s.fournisseur";
+			$sql .= ", s.code_compta";
+			$sql .= ", s.code_compta_fournisseur";
+			$sql .= ", s.logo";
+			$sql .= ", s.email";
+			$sql .= ", s.outstanding_limit";
+			$sql .= ", s.datec, s.tms, s.status, s.entity";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE s.client IN (1, 3)";
+			$sql .= " AND s.entity IN (".getEntity('societe').")";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($user->socid) $sql .= " AND s.rowid = $user->socid";
+			$sql .= " ORDER BY s.tms DESC";
+			$sql .= $this->db->plimit($max, 0);
+
+			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
+			$result = $this->db->query($sql);
+			if ($result)
+			{
+				$num = $this->db->num_rows($result);
+
+				$line = 0;
+				while ($line < $num)
+				{
+					$objp = $this->db->fetch_object($result);
+					$datec = $this->db->jdate($objp->datec);
+					$datem = $this->db->jdate($objp->tms);
+					$thirdpartystatic->id = $objp->socid;
+					$thirdpartystatic->name = $objp->name;
+					$thirdpartystatic->code_client = $objp->code_client;
+					$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartystatic->code_compta = $objp->code_compta;
+					$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
+					$thirdpartystatic->client = $objp->client;
+					$thirdpartystatic->fournisseur = $objp->fournisseur;
+					$thirdpartystatic->logo = $objp->logo;
+					$thirdpartystatic->email = $objp->email;
+					$thirdpartystatic->entity = $objp->entity;
+					$thirdpartystatic->outstanding_limit = $objp->outstanding_limit;
+
+					$outstandingtotal = $thirdpartystatic->getOutstandingBills()['opened'];
+					$outstandinglimit = $thirdpartystatic->outstanding_limit;
+
+					$nboutstandingbillreachedcustomers = 0;
+
+					if ($outstandingtotal >= $outstandinglimit) {
+
+						$this->info_box_contents[$line][] = array(
+							'td' => '',
+							'text' => $thirdpartystatic->getNomUrl(1),
+							'asis' => 1,
+						);
+
+						$this->info_box_contents[$line][] = array(
+							'td' => 'class="right"',
+							'text' => dol_print_date($datem, "day")
+						);
+
+						$this->info_box_contents[$line][] = array(
+							'td' => 'class="right" width="18"',
+							'text' => $thirdpartystatic->LibStatut($objp->status, 3)
+						);
+						$nboutstandingbillreachedcustomers++;
+					}
+					$line++;
+				}
+
+				if ($num == 0 || $nboutstandingbillreachedcustomers == 0) $this->info_box_contents[$line][0] = array(
+					'td' => 'class="center opacitymedium"',
+					'text'=>$langs->trans("NoRecordedCustomers")
+				);
+
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql)
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
+
+	/**
+	 *	Method to show box
+	 *
+	 *	@param	array	$head       Array with properties of box title
+	 *	@param  array	$contents   Array with properties of box lines
+	 *  @param	int		$nooutput	No print, only return string
+	 *	@return	string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
+}
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index fdd7205b19c..c58752395d3 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -111,7 +111,8 @@ class modFacture extends DolibarrModules
 		$this->boxes = array(
 				0=>array('file'=>'box_factures_imp.php', 'enabledbydefaulton'=>'Home'),
 				1=>array('file'=>'box_factures.php', 'enabledbydefaulton'=>'Home'),
-				2=>array('file'=>'box_graph_invoices_permonth.php', 'enabledbydefaulton'=>'Home')
+				2=>array('file'=>'box_graph_invoices_permonth.php', 'enabledbydefaulton'=>'Home'),
+				3=>array('file'=>'box_customers_outstanding_bill_reached.php','enabledbydefaulton'=>'Home')
 		);
 
 		// Cronjobs

From 6e9a3c05f43fcc651c175ac64e880817b638a27d Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Mon, 30 Nov 2020 13:52:02 +0100
Subject: [PATCH 049/888] =?UTF-8?q?Close=20:=20Encours=20d=C3=A9pass=C3=A9?=
 =?UTF-8?q?=20#15307?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/boxes/box_customers_outstanding_bill_reached.php  | 7 +------
 htdocs/langs/en_US/boxes.lang                              | 1 +
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
index 2baa02a912c..49b9de88d03 100644
--- a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
+++ b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
@@ -82,7 +82,7 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
 		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 		$thirdpartystatic = new Societe($this->db);
 
-		$this->info_box_head = array('text' => "Last Cutomers Outstanding Bill Reached");
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastOutstandingBillReached", $max));
 
 		if ($user->rights->societe->lire)
 		{
@@ -144,11 +144,6 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
 							'asis' => 1,
 						);
 
-						$this->info_box_contents[$line][] = array(
-							'td' => 'class="right"',
-							'text' => dol_print_date($datem, "day")
-						);
-
 						$this->info_box_contents[$line][] = array(
 							'td' => 'class="right" width="18"',
 							'text' => $thirdpartystatic->LibStatut($objp->status, 3)
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index 14db79809bc..75f8eb14f49 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -46,6 +46,7 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Latest %s customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers

From 595bb893bec7c18dbf05e2481e764f51dd6a6f61 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Mon, 30 Nov 2020 14:01:56 +0100
Subject: [PATCH 050/888] =?UTF-8?q?Close=20:=20Encours=20d=C3=A9pass=C3=A9?=
 =?UTF-8?q?=20#15307?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
index 49b9de88d03..f83ed7a663e 100644
--- a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
+++ b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
@@ -136,8 +136,8 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
 
 					$nboutstandingbillreachedcustomers = 0;
 
-					if ($outstandingtotal >= $outstandinglimit) {
-
+					if ($outstandingtotal >= $outstandinglimit)
+					{
 						$this->info_box_contents[$line][] = array(
 							'td' => '',
 							'text' => $thirdpartystatic->getNomUrl(1),

From cee1b3cee44c2995ad23c529c4510449df9f2fdc Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Mon, 30 Nov 2020 14:52:27 +0100
Subject: [PATCH 051/888] =?UTF-8?q?=20Close=20:=20Encours=20d=C3=A9pass?=
 =?UTF-8?q?=C3=A9=20#15307?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
index f83ed7a663e..f3c358d2335 100644
--- a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
+++ b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
@@ -20,8 +20,8 @@
 
 /**
  *	\file       htdocs/core/boxes/box_clients.php
- *	\ingroup    societes
- *	\brief      Module de generation de l'affichage de la box clients
+ *	\ingroup    Facture
+ *	\brief      Module d'affichage pour les encours dépassés
  */
 
 include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';

From f801dd7d662cc08b5928e258d612fe600e39cc94 Mon Sep 17 00:00:00 2001
From: Christian Foellmann <foellmann@foe-services.de>
Date: Mon, 30 Nov 2020 14:54:44 +0100
Subject: [PATCH 052/888] PR toggle FCKeditor on public/private notes

---
 htdocs/admin/fckeditor.php         | 58 ++++++++++++++++--------------
 htdocs/comm/propal/card.php        |  4 +--
 htdocs/commande/card.php           |  4 +--
 htdocs/compta/deplacement/card.php |  8 ++---
 htdocs/compta/facture/card-rec.php |  4 +--
 htdocs/compta/facture/card.php     |  4 +--
 htdocs/contact/card.php            |  4 +--
 htdocs/contrat/card.php            |  4 +--
 htdocs/don/card.php                |  4 +--
 htdocs/expedition/card.php         |  4 +--
 htdocs/expensereport/card.php      |  4 +--
 htdocs/fichinter/card.php          |  4 +--
 htdocs/fourn/commande/card.php     |  4 +--
 htdocs/fourn/facture/card.php      |  4 +--
 htdocs/loan/card.php               |  4 +--
 htdocs/reception/card.php          |  4 +--
 16 files changed, 64 insertions(+), 58 deletions(-)

diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index bc6b0dc33ac..6523ec833b3 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -21,7 +21,7 @@
 /**
  *  \file       htdocs/admin/fckeditor.php
  *  \ingroup    fckeditor
- *  \brief      Page d'activation du module FCKeditor dans les autres modules
+ *  \brief      Activation page for the FCKeditor module in the other modules
  */
 
 require '../main.inc.php';
@@ -43,35 +43,41 @@ $mode = GETPOST('mode') ?GETPOST('mode', 'alpha') : 'dolibarr_notes';
 
 if (!$user->admin) accessforbidden();
 
-// Constante et traduction de la description du module
+// Constant and translation of the module description
 $modules = array(
-'SOCIETE' => 'FCKeditorForCompany',
-'PRODUCTDESC' => 'FCKeditorForProduct',
-'DETAILS' => 'FCKeditorForProductDetails',
-'USERSIGN' => 'FCKeditorForUserSignature',
-'MAILING' => 'FCKeditorForMailing',
-'MAIL' => 'FCKeditorForMail',
-'TICKET' => 'FCKeditorForTicket'
+	'SOCIETE' => 'FCKeditorForCompany',
+	'PRODUCTDESC' => 'FCKeditorForProduct',
+	'DETAILS' => 'FCKeditorForProductDetails',
+	'USERSIGN' => 'FCKeditorForUserSignature',
+	'MAILING' => 'FCKeditorForMailing',
+	'MAIL' => 'FCKeditorForMail',
+	'TICKET' => 'FCKeditorForTicket',
+	'NOTE_PUBLIC' => 'FCKeditorForNotePublic',
+	'NOTE_PRIVATE' => 'FCKeditorForNotePrivate',
 );
-// Conditions pour que l'option soit proposee
+// Conditions for the option to be offered
 $conditions = array(
-'SOCIETE' => 1,
-'PRODUCTDESC' => (!empty($conf->product->enabled) || !empty($conf->service->enabled)),
-'DETAILS' => (!empty($conf->facture->enabled) || !empty($conf->propal->enabled) || !empty($conf->commande->enabled) || !empty($conf->supplier_proposal->enabled) || !empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)),
-'USERSIGN' => 1,
-'MAILING' => !empty($conf->mailing->enabled),
-'MAIL' => (!empty($conf->facture->enabled) || !empty($conf->propal->enabled) || !empty($conf->commande->enabled)),
-'TICKET' => !empty($conf->ticket->enabled)
+	'SOCIETE' => 1,
+	'PRODUCTDESC' => (!empty($conf->product->enabled) || !empty($conf->service->enabled)),
+	'DETAILS' => (!empty($conf->facture->enabled) || !empty($conf->propal->enabled) || !empty($conf->commande->enabled) || !empty($conf->supplier_proposal->enabled) || !empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)),
+	'USERSIGN' => 1,
+	'MAILING' => !empty($conf->mailing->enabled),
+	'MAIL' => (!empty($conf->facture->enabled) || !empty($conf->propal->enabled) || !empty($conf->commande->enabled)),
+	'TICKET' => !empty($conf->ticket->enabled),
+	'NOTE_PUBLIC' => 1,
+	'NOTE_PRIVATE' => 1,
 );
 // Picto
 $picto = array(
-'SOCIETE' => 'generic',
-'PRODUCTDESC' => 'product',
-'DETAILS' => 'product',
-'USERSIGN' => 'user',
-'MAILING' => 'email',
-'MAIL' => 'email',
-'TICKET' => 'ticket'
+	'SOCIETE' => 'generic',
+	'PRODUCTDESC' => 'product',
+	'DETAILS' => 'product',
+	'USERSIGN' => 'user',
+	'MAILING' => 'email',
+	'MAIL' => 'email',
+	'TICKET' => 'ticket',
+	'NOTE_PUBLIC' => 'generic',
+	'NOTE_PRIVATE' => 'generic',
 );
 
 
@@ -85,7 +91,7 @@ foreach ($modules as $const => $desc)
 	if ($action == 'activate_'.strtolower($const))
 	{
 		dolibarr_set_const($db, "FCKEDITOR_ENABLE_".$const, "1", 'chaine', 0, '', $conf->entity);
-		// Si fckeditor est active dans la description produit/service, on l'active dans les formulaires
+		// If fckeditor is active in the product/service description, it is activated in the forms
 		if ($const == 'PRODUCTDESC' && !empty($conf->global->PRODUIT_DESC_IN_FORM))
 		{
 			dolibarr_set_const($db, "FCKEDITOR_ENABLE_DETAILS", "1", 'chaine', 0, '', $conf->entity);
@@ -154,7 +160,7 @@ if (empty($conf->use_javascript_ajax))
 	// Modules
 	foreach ($modules as $const => $desc)
 	{
-		// Si condition non remplie, on ne propose pas l'option
+		// If this condition is not met, the option is not offered
 		if (!$conditions[$const]) continue;
 
 		print '<tr class="oddeven">';
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 4742aebfde0..464f6aca20a 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1659,7 +1659,7 @@ if ($action == 'create')
 	print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
 	print '<td valign="top">';
 	$note_public = $object->getDefaultCreateValueFor('note_public', (is_object($objectsrc) ? $objectsrc->note_public : null));
-	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
 	print $doleditor->Create(1);
 
 	// Private note
@@ -1669,7 +1669,7 @@ if ($action == 'create')
 		print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
 		print '<td valign="top">';
 		$note_private = $object->getDefaultCreateValueFor('note_private', ((!empty($origin) && !empty($originid) && is_object($objectsrc)) ? $objectsrc->note_private : null));
-		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
 		print $doleditor->Create(1);
 		// print '<textarea name="note_private" wrap="soft" cols="70" rows="'.ROWS_3.'">'.$note_private.'.</textarea>
 		print '</td></tr>';
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 16e53e0a23b..f0a6d601a42 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1734,7 +1734,7 @@ if ($action == 'create' && $usercancreate)
 	print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
 	print '<td>';
 
-	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
 	print $doleditor->Create(1);
 	// print '<textarea name="note_public" wrap="soft" cols="70" rows="'.ROWS_3.'">'.$note_public.'</textarea>';
 	print '</td></tr>';
@@ -1745,7 +1745,7 @@ if ($action == 'create' && $usercancreate)
 		print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
 		print '<td>';
 
-		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
 		print $doleditor->Create(1);
 		// print '<textarea name="note" wrap="soft" cols="70" rows="'.ROWS_3.'">'.$note_private.'</textarea>';
 		print '</td></tr>';
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 0a18d68b5db..f1e34e99985 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -252,7 +252,7 @@ if ($action == 'create')
 	print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
 	print '<td>';
 
-	$doleditor = new DolEditor('note_public', GETPOST('note_public', 'restricthtml'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
+	$doleditor = new DolEditor('note_public', GETPOST('note_public', 'restricthtml'), '', 200, 'dolibarr_notes', 'In', false, true, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_8, '90%');
 	print $doleditor->Create(1);
 
 	print '</td></tr>';
@@ -264,7 +264,7 @@ if ($action == 'create')
 		print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
 		print '<td>';
 
-		$doleditor = new DolEditor('note_private', GETPOST('note_private', 'restricthtml'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
+		$doleditor = new DolEditor('note_private', GETPOST('note_private', 'restricthtml'), '', 200, 'dolibarr_notes', 'In', false, true, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_8, '90%');
 		print $doleditor->Create(1);
 
 		print '</td></tr>';
@@ -349,7 +349,7 @@ if ($action == 'create')
 			print '<tr><td class="tdtop">'.$langs->trans("NotePublic").'</td>';
 			print '<td>';
 
-			$doleditor = new DolEditor('note_public', $object->note_public, '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
+			$doleditor = new DolEditor('note_public', $object->note_public, '', 200, 'dolibarr_notes', 'In', false, true, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_8, '90%');
 			print $doleditor->Create(1);
 
 			print "</td></tr>";
@@ -360,7 +360,7 @@ if ($action == 'create')
 				print '<tr><td class="tdtop">'.$langs->trans("NotePrivate").'</td>';
 				print '<td>';
 
-				$doleditor = new DolEditor('note_private', $object->note_private, '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
+				$doleditor = new DolEditor('note_private', $object->note_private, '', 200, 'dolibarr_notes', 'In', false, true, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_8, '90%');
 				print $doleditor->Create(1);
 
 				print "</td></tr>";
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 4f754fbd173..4c25d3df652 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -998,7 +998,7 @@ if ($action == 'create')
 		print $form->textwithpicto($langs->trans('NotePublic'), $htmltext, 1, 'help', '', 0, 2, 'notepublic');
 		print '</td>';
 		print '<td>';
-		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
 		print $doleditor->Create(1);
 
 		// Private note
@@ -1009,7 +1009,7 @@ if ($action == 'create')
 			print $form->textwithpicto($langs->trans('NotePrivate'), $htmltext, 1, 'help', '', 0, 2, 'noteprivate');
 			print '</td>';
 			print '<td>';
-			$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+			$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
 			print $doleditor->Create(1);
 			// print '<textarea name="note_private" wrap="soft" cols="70" rows="'.ROWS_3.'">'.$note_private.'.</textarea>
 			print '</td></tr>';
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index def74e173a3..37f236e875a 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3534,7 +3534,7 @@ if ($action == 'create')
 	print $form->textwithpicto($langs->trans('NotePublic'), $htmltext);
 	print '</td>';
 	print '<td valign="top" colspan="2">';
-	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
 	print $doleditor->Create(1);
 
 	// Private note
@@ -3545,7 +3545,7 @@ if ($action == 'create')
 		print $form->textwithpicto($langs->trans('NotePrivate'), $htmltext);
 		print '</td>';
 		print '<td valign="top" colspan="2">';
-		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
 		print $doleditor->Create(1);
 		// print '<textarea name="note_private" wrap="soft" cols="70" rows="'.ROWS_3.'">'.$note_private.'.</textarea>
 		print '</td></tr>';
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 752bdc4d642..23297438e19 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -1129,13 +1129,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 			// Note Public
 			print '<tr><td class="tdtop"><label for="note_public">'.$langs->trans("NotePublic").'</label></td><td colspan="3">';
-			$doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+			$doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
 			print $doleditor->Create(1);
 			print '</td></tr>';
 
 			// Note Private
 			print '<tr><td class="tdtop"><label for="note_private">'.$langs->trans("NotePrivate").'</label></td><td colspan="3">';
-			$doleditor = new DolEditor('note_private', $object->note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+			$doleditor = new DolEditor('note_private', $object->note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
 			print $doleditor->Create(1);
 			print '</td></tr>';
 
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index a92ac8a1e73..dcca2fe816c 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1174,14 +1174,14 @@ if ($action == 'create')
 	}
 
 	print '<tr><td>'.$langs->trans("NotePublic").'</td><td class="tdtop">';
-	$doleditor = new DolEditor('note_public', $note_public, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, '90%');
+	$doleditor = new DolEditor('note_public', $note_public, '', '100', 'dolibarr_notes', 'In', 1, true, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
 	print $doleditor->Create(1);
 	print '</td></tr>';
 
 	if (empty($user->socid))
 	{
 		print '<tr><td>'.$langs->trans("NotePrivate").'</td><td class="tdtop">';
-		$doleditor = new DolEditor('note_private', $note_private, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, '90%');
+		$doleditor = new DolEditor('note_private', $note_private, '', '100', 'dolibarr_notes', 'In', 1, true, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
 		print $doleditor->Create(1);
 		print '</td></tr>';
 	}
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index c55751e913f..cd3175cdce0 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -443,7 +443,7 @@ if ($action == 'create')
 	print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
 	print '<td>';
 
-	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
 	print $doleditor->Create(1);
 	print '</td></tr>';
 
@@ -453,7 +453,7 @@ if ($action == 'create')
 		print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
 		print '<td>';
 
-		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
 		print $doleditor->Create(1);
 		print '</td></tr>';
 	}
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index fd1e38e2438..a0541120ec6 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -942,7 +942,7 @@ if ($action == 'create')
 			// Note Public
 			print '<tr><td>'.$langs->trans("NotePublic").'</td>';
 			print '<td colspan="3">';
-			$doleditor = new DolEditor('note_public', $object->note_public, '', 60, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+			$doleditor = new DolEditor('note_public', $object->note_public, '', 60, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
 			print $doleditor->Create(1);
 			print "</td></tr>";
 
@@ -951,7 +951,7 @@ if ($action == 'create')
 			{
 				print '<tr><td>'.$langs->trans("NotePrivate").'</td>';
 				print '<td colspan="3">';
-				$doleditor = new DolEditor('note_private', $object->note_private, '', 60, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+				$doleditor = new DolEditor('note_private', $object->note_private, '', 60, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
 				print $doleditor->Create(1);
 				print "</td></tr>";
 			}
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 83e1173fcb4..71f190a08f9 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1457,7 +1457,7 @@ if ($action == 'create')
 	print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
 	print '<td>';
 
-	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
 	print $doleditor->Create(1);
 	print '</td></tr>';
 
@@ -1467,7 +1467,7 @@ if ($action == 'create')
 		print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
 		print '<td>';
 
-		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
 		print $doleditor->Create(1);
 		print '</td></tr>';
 	}
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 07c0146c2a8..f96bab63e2f 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -941,7 +941,7 @@ if ($action == 'create')
 		print '<tr>';
 		print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
 		print '<td>';
-		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
 		print $doleditor->Create(1);
 		//print '<textarea name="note_public" cols="80" rows="'.ROWS_3.'">'.$note_public.'</textarea>';
 		print '</td></tr>';
@@ -952,7 +952,7 @@ if ($action == 'create')
 			print '<tr>';
 			print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
 			print '<td>';
-			$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+			$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
 			print $doleditor->Create(1);
 			//print '<textarea name="note_private" cols="80" rows="'.ROWS_3.'">'.$note_private.'</textarea>';
 			print '</td></tr>';
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index cf6543c96e0..470a5cf0b0c 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1708,7 +1708,7 @@ if ($action == 'create')
 
 	print '<tr><td>'.$langs->trans('NotePublic').'</td>';
 	print '<td>';
-	$doleditor = new DolEditor('note_public', isset($note_public) ? $note_public : GETPOST('note_public', 'restricthtml'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+	$doleditor = new DolEditor('note_public', isset($note_public) ? $note_public : GETPOST('note_public', 'restricthtml'), '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
 	print $doleditor->Create(1);
 	print '</td>';
 	//print '<textarea name="note_public" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea>';
@@ -1716,7 +1716,7 @@ if ($action == 'create')
 
 	print '<tr><td>'.$langs->trans('NotePrivate').'</td>';
 	print '<td>';
-	$doleditor = new DolEditor('note_private', isset($note_private) ? $note_private : GETPOST('note_private', 'restricthtml'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+	$doleditor = new DolEditor('note_private', isset($note_private) ? $note_private : GETPOST('note_private', 'restricthtml'), '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
 	print $doleditor->Create(1);
 	print '</td>';
 	//print '<td><textarea name="note_private" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea></td>';
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index b439e5cad45..d9a8be9903c 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2109,7 +2109,7 @@ if ($action == 'create')
 	// Public note
 	print '<tr><td>'.$langs->trans('NotePublic').'</td>';
 	print '<td>';
-	$doleditor = new DolEditor('note_public', (GETPOSTISSET('note_public') ?GETPOST('note_public', 'restricthtml') : $note_public), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+	$doleditor = new DolEditor('note_public', (GETPOSTISSET('note_public') ?GETPOST('note_public', 'restricthtml') : $note_public), '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
 	print $doleditor->Create(1);
 	print '</td>';
 	// print '<td><textarea name="note" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea></td>';
@@ -2118,7 +2118,7 @@ if ($action == 'create')
 	// Private note
 	print '<tr><td>'.$langs->trans('NotePrivate').'</td>';
 	print '<td>';
-	$doleditor = new DolEditor('note_private', (GETPOSTISSET('note_private') ?GETPOST('note_private', 'restricthtml') : $note_private), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+	$doleditor = new DolEditor('note_private', (GETPOSTISSET('note_private') ?GETPOST('note_private', 'restricthtml') : $note_private), '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
 	print $doleditor->Create(1);
 	print '</td>';
 	// print '<td><textarea name="note" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea></td>';
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 17454356c76..29cae07e11d 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -315,7 +315,7 @@ if ($action == 'create')
 	print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
 	print '<td>';
 
-	$doleditor = new DolEditor('note_private', GETPOST('note_private', 'alpha'), '', 160, 'dolibarr_notes', 'In', false, true, true, ROWS_6, '90%');
+	$doleditor = new DolEditor('note_private', GETPOST('note_private', 'alpha'), '', 160, 'dolibarr_notes', 'In', false, true, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_6, '90%');
 	print $doleditor->Create(1);
 
 	print '</td></tr>';
@@ -324,7 +324,7 @@ if ($action == 'create')
 	print '<tr>';
 	print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
 	print '<td>';
-	$doleditor = new DolEditor('note_public', GETPOST('note_public', 'alpha'), '', 160, 'dolibarr_notes', 'In', false, true, true, ROWS_6, '90%');
+	$doleditor = new DolEditor('note_public', GETPOST('note_public', 'alpha'), '', 160, 'dolibarr_notes', 'In', false, true, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_6, '90%');
 	print $doleditor->Create(1);
 	print '</td></tr>';
 
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 3bac7265606..0cf53b7dd4f 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -785,7 +785,7 @@ if ($action == 'create')
 			// Note Public
 			print '<tr><td>'.$langs->trans("NotePublic").'</td>';
 			print '<td colspan="3">';
-			$doleditor = new DolEditor('note_public', $object->note_public, '', 60, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+			$doleditor = new DolEditor('note_public', $object->note_public, '', 60, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
 			print $doleditor->Create(1);
 			print "</td></tr>";
 
@@ -794,7 +794,7 @@ if ($action == 'create')
 			{
 				print '<tr><td>'.$langs->trans("NotePrivate").'</td>';
 				print '<td colspan="3">';
-				$doleditor = new DolEditor('note_private', $object->note_private, '', 60, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+				$doleditor = new DolEditor('note_private', $object->note_private, '', 60, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
 				print $doleditor->Create(1);
 				print "</td></tr>";
 			}

From ff30021d3588a9971f3c9e8613d4b1e79abe449c Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Mon, 30 Nov 2020 16:50:12 +0100
Subject: [PATCH 053/888] =?UTF-8?q?Close=20#15307=20Encours=20dpass=C3=A9?=
 =?UTF-8?q?=20with=20eldy=20suggestions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
index f3c358d2335..24690895ff5 100644
--- a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
+++ b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
@@ -103,6 +103,8 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
 			$sql .= " AND s.entity IN (".getEntity('societe').")";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 			if ($user->socid) $sql .= " AND s.rowid = $user->socid";
+			$sql .= " AND s.outstanding_limit > 0";
+			$sql .= " AND s.rowid IN (SELECT fk_soc from ".MAIN_DB_PREFIX."facture as f WHERE f.fk_statut = 1 and f.fk_soc = s.rowid)";
 			$sql .= " ORDER BY s.tms DESC";
 			$sql .= $this->db->plimit($max, 0);
 

From fc91e70e47a61e59144afddf05b04462b48fa90d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 30 Nov 2020 18:37:07 +0100
Subject: [PATCH 054/888] Update modFacture.class.php

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

diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index c58752395d3..8f4172112b5 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -112,7 +112,7 @@ class modFacture extends DolibarrModules
 				0=>array('file'=>'box_factures_imp.php', 'enabledbydefaulton'=>'Home'),
 				1=>array('file'=>'box_factures.php', 'enabledbydefaulton'=>'Home'),
 				2=>array('file'=>'box_graph_invoices_permonth.php', 'enabledbydefaulton'=>'Home'),
-				3=>array('file'=>'box_customers_outstanding_bill_reached.php','enabledbydefaulton'=>'Home')
+				3=>array('file'=>'box_customers_outstanding_bill_reached.php', 'enabledbydefaulton'=>'Home')
 		);
 
 		// Cronjobs

From 7b02aa4c38022d7e3de2bef41c34e6f2caf5a0ba Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 1 Dec 2020 09:28:24 +0100
Subject: [PATCH 055/888] Update checkVatService.xml

http -> https at
 <wsdlsoap:address location="https://ec.europa.eu/taxation_customs/vies/services/checkVatService"/>
---
 htdocs/societe/checkvat/checkVatService.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/societe/checkvat/checkVatService.xml b/htdocs/societe/checkvat/checkVatService.xml
index 373775c2487..b6d7661cdc6 100644
--- a/htdocs/societe/checkvat/checkVatService.xml
+++ b/htdocs/societe/checkvat/checkVatService.xml
@@ -167,7 +167,7 @@
   </wsdl:binding>
   <wsdl:service name="checkVatService">
     <wsdl:port name="checkVatPort" binding="impl:checkVatBinding">
-      <wsdlsoap:address location="http://ec.europa.eu/taxation_customs/vies/services/checkVatService"/>
+      <wsdlsoap:address location="https://ec.europa.eu/taxation_customs/vies/services/checkVatService"/>
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>

From 20aa1e29f60c166050d1d95f73a4369137ae14aa Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Tue, 1 Dec 2020 09:58:55 +0100
Subject: [PATCH 056/888] NEW address column in company list

---
 htdocs/societe/list.php | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 5a843e9856a..48a01a94390 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -72,6 +72,7 @@ $search_customer_code = trim(GETPOST('search_customer_code', 'alpha'));
 $search_supplier_code = trim(GETPOST('search_supplier_code', 'alpha'));
 $search_account_customer_code = trim(GETPOST('search_account_customer_code', 'alpha'));
 $search_account_supplier_code = trim(GETPOST('search_account_supplier_code', 'alpha'));
+$search_address = trim(GETPOST('search_address', 'alpha'));
 $search_town = trim(GETPOST("search_town", 'alpha'));
 $search_zip = trim(GETPOST("search_zip", 'alpha'));
 $search_state = trim(GETPOST("search_state", 'alpha'));
@@ -186,6 +187,7 @@ $arrayfields = array(
 	's.code_fournisseur'=>array('label'=>"SupplierCodeShort", 'position'=>11, 'checked'=>$checkedsuppliercode, 'enabled'=>(!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))),
 	's.code_compta'=>array('label'=>"CustomerAccountancyCodeShort", 'position'=>13, 'checked'=>$checkedcustomeraccountcode),
 	's.code_compta_fournisseur'=>array('label'=>"SupplierAccountancyCodeShort", 'position'=>14, 'checked'=>$checkedsupplieraccountcode, 'enabled'=>(!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))),
+	's.address'=>array('label'=>"Address", 'position'=>19, 'checked'=>1),
 	's.town'=>array('label'=>"Town", 'position'=>20, 'checked'=>1),
 	's.zip'=>array('label'=>"Zip", 'position'=>21, 'checked'=>1),
 	'state.nom'=>array('label'=>"State", 'position'=>22, 'checked'=>0),
@@ -289,6 +291,7 @@ if (empty($reshook))
 		$search_supplier_code = '';
 		$search_account_customer_code = '';
 		$search_account_supplier_code = '';
+		$search_address = '';
 		$search_town = "";
 		$search_zip = "";
 		$search_state = "";
@@ -386,7 +389,7 @@ if ($resql)
 	}
 } else dol_print_error($db);
 
-$sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.barcode, s.town, s.zip, s.datec, s.code_client, s.code_fournisseur, s.logo,";
+$sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.barcode, s.address, s.town, s.zip, s.datec, s.code_client, s.code_fournisseur, s.logo,";
 $sql .= " s.entity,";
 $sql .= " st.libelle as stcomm, st.picto as stcomm_picto, s.fk_stcomm as stcomm_id, s.fk_prospectlevel, s.prefix_comm, s.client, s.fournisseur, s.canvas, s.status as status,";
 $sql .= " s.email, s.phone, s.fax, s.url, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4 as idprof4, s.idprof5 as idprof5, s.idprof6 as idprof6, s.tva_intra, s.fk_pays,";
@@ -448,6 +451,7 @@ if ($search_customer_code) $sql .= natural_search("s.code_client", $search_custo
 if ($search_supplier_code) $sql .= natural_search("s.code_fournisseur", $search_supplier_code);
 if ($search_account_customer_code) $sql .= natural_search("s.code_compta", $search_account_customer_code);
 if ($search_account_supplier_code) $sql .= natural_search("s.code_compta_fournisseur", $search_account_supplier_code);
+if ($search_address)	   $sql.= natural_search('s.address', $search_address);
 if ($search_town)          $sql .= natural_search("s.town", $search_town);
 if (strlen($search_zip))   $sql .= natural_search("s.zip", $search_zip);
 if ($search_state)         $sql .= natural_search("state.nom", $search_state);
@@ -545,6 +549,7 @@ if ($search_sale > 0)	   $param .= '&search_sale='.urlencode($search_sale);
 if ($search_id > 0)        $param .= "&search_id=".urlencode($search_id);
 if ($search_nom != '')     $param .= "&search_nom=".urlencode($search_nom);
 if ($search_alias != '')   $param .= "&search_alias=".urlencode($search_alias);
+if ($search_address != '') $param .= '&search_address=' . urlencode($search_address);
 if ($search_town != '')    $param .= "&search_town=".urlencode($search_town);
 if ($search_zip != '')     $param .= "&search_zip=".urlencode($search_zip);
 if ($search_phone != '')   $param .= "&search_phone=".urlencode($search_phone);
@@ -766,6 +771,13 @@ if (!empty($arrayfields['s.code_compta_fournisseur']['checked']))
 	print '<input class="flat maxwidth75imp" type="text" name="search_account_supplier_code" value="'.dol_escape_htmltag($search_account_supplier_code).'">';
 	print '</td>';
 }
+// Address
+if (!empty($arrayfields['s.address']['checked']))
+{
+	print '<td class="liste_titre">';
+	print '<input class="flat searchstring maxwidth50imp" type="text" name="search_address" value="'.dol_escape_htmltag($search_address).'">';
+	print '</td>';
+}
 // Town
 if (!empty($arrayfields['s.town']['checked']))
 {
@@ -975,6 +987,7 @@ if (!empty($arrayfields['s.code_client']['checked']))             print_liste_fi
 if (!empty($arrayfields['s.code_fournisseur']['checked']))        print_liste_field_titre($arrayfields['s.code_fournisseur']['label'], $_SERVER["PHP_SELF"], "s.code_fournisseur", "", $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['s.code_compta']['checked']))             print_liste_field_titre($arrayfields['s.code_compta']['label'], $_SERVER["PHP_SELF"], "s.code_compta", "", $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['s.code_compta_fournisseur']['checked'])) print_liste_field_titre($arrayfields['s.code_compta_fournisseur']['label'], $_SERVER["PHP_SELF"], "s.code_compta_fournisseur", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['s.address']['checked']))		 print_liste_field_titre($arrayfields['s.address']['label'], $_SERVER['PHP_SELF'], 's.address', '', $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], "s.town", "", $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], "s.zip", "", $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['state.nom']['checked']))        print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
@@ -1103,6 +1116,12 @@ while ($i < min($num, $limit))
 		print '<td>'.$obj->code_compta_fournisseur.'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
+	// Address
+	if (!empty($arrayfields['s.address']['checked']))
+	{
+		print '<td>'.$obj->address.'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
 	// Town
 	if (!empty($arrayfields['s.town']['checked']))
 	{

From 3b3f9acdbb6cced9372afaad9fafa9fb01f55c1d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 1 Dec 2020 11:35:30 +0100
Subject: [PATCH 057/888] Remove warning

---
 htdocs/core/class/CMailFile.class.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index e7bcb208a1e..b2149cd187f 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -58,6 +58,8 @@ class CMailFile
 	public $alternative_boundary;
 	public $deliveryreceipt;
 
+	public $atleastonefile;
+
 	public $eol;
 	public $eol2;
 
@@ -338,8 +340,7 @@ class CMailFile
 			$text_body = $this->write_body($msg);
 
 			// Add attachments to text_encoded
-			if ($this->atleastonefile)
-			{
+			if (!empty($this->atleastonefile)) {
 				$files_encoded = $this->write_files($filename_list, $mimetype_list, $mimefilename_list);
 			}
 
@@ -401,7 +402,7 @@ class CMailFile
 				}
 			}
 
-			if ($this->atleastonefile)
+			if (!empty($this->atleastonefile))
 			{
 				foreach ($filename_list as $i => $val)
 				{
@@ -530,7 +531,7 @@ class CMailFile
 				$this->message->addPart(dol_nl2br($msg), 'text/html');
 			}
 
-			if ($this->atleastonefile)
+			if (!empty($this->atleastonefile))
 			{
 				foreach ($filename_list as $i => $val)
 				{

From 3538e485a8fa309deeb7f361393c4ba768524092 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 1 Dec 2020 11:38:46 +0100
Subject: [PATCH 058/888] Fix phpunit

---
 htdocs/takepos/invoice.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index cee4a1495db..9dbbbb44f1d 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -583,7 +583,7 @@ if ($action == "delete") {
 
 			// We delete the lines
 			$resdeletelines = 1;
-			foreach($invoice->lines as $line){
+			foreach($invoice->lines as $line) {
 				$tmpres = $invoice->deleteline($line->id);
 				if ($tmpres < 0) {
 					$resdeletelines = 0;
@@ -595,12 +595,9 @@ if ($action == "delete") {
 			$sql .= " WHERE ref='(PROV-POS".$db->escape($_SESSION["takeposterminal"]."-".$place).")'";
 			$resql1 = $db->query($sql);
 
-			if ($resdeletelines && $resql1)
-            {
+			if ($resdeletelines && $resql1) {
             	$db->commit();
-            }
-            else
-            {
+            } else {
             	$db->rollback();
             }
 

From f847425f23252a2b59ddd92c0d50f7234be8b428 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 1 Dec 2020 13:48:18 +0100
Subject: [PATCH 059/888] Update llx_accounting_abc.sql

---
 .../install/mysql/data/llx_accounting_abc.sql | 77 +++++++++++++------
 1 file changed, 52 insertions(+), 25 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_accounting_abc.sql b/htdocs/install/mysql/data/llx_accounting_abc.sql
index d3f9ad5fd69..9118b7a4651 100644
--- a/htdocs/install/mysql/data/llx_accounting_abc.sql
+++ b/htdocs/install/mysql/data/llx_accounting_abc.sql
@@ -8,7 +8,12 @@
 -- Copyright (C) 2011-2018 Alexandre Spangaro   <aspangaro@open-dsi.fr>
 -- Copyright (C) 2015-2017 Juanjo Menent        <jmenent@2byte.es>
 -- Copyright (C) 2018      Abbes bahfir         <dolipar@dolipar.org>
+-- Copyright (C) 2020      Udo Tamm             <dev@dolibit.de>
 --
+--
+--------------------------------------------------------------------------------------
+-- License
+-- #######
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
 -- the Free Software Foundation; either version 3 of the License, or
@@ -22,14 +27,25 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <https://www.gnu.org/licenses/>.
 --
---
+--------------------------------------------------------------------------------------
 
+-- Comment
+-- #######
+-- (EN)
+-- Do not place a comment at the end of the line, this file is parsed at the end of the line.
+-- from the install and all '--' are removed.
 --
+-- (FR)
 -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
 -- de l'install et tous les sigles '--' sont supprimés.
 --
+--------------------------------------------------------------------------------------
+-- PCG = Plan Comptable Général (FR) - General Accounting Plan (EN)
+--------------------------------------------------------------------------------------
 
 
+-- Accounting Journals 
+
 INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('VT',  'ACCOUNTING_SELL_JOURNAL',          2, 1, 1);
 INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('AC',  'ACCOUNTING_PURCHASE_JOURNAL',      3, 1, 1);
 INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('BQ',  'FinanceJournal',                   4, 1, 1);
@@ -39,6 +55,9 @@ INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES
 INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('INV', 'InventoryJournal',                 8, 1, 1);
 
 
+
+-- Accounting Charts / Plans (Templates) for Countries
+
 -- Description of chart of account FR PCG99-ABREGE
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  1, 'PCG99-ABREGE', 'The simple accountancy french plan', 1);
 -- Description of chart of account FR PCG99-BASE
@@ -56,8 +75,9 @@ INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUE
 -- Description of chart of account ES PCG08-PYME
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  4, 'PCG08-PYME', 'The PYME accountancy spanish plan', 1);
 
--- Description of chart of account DE SKR03
+-- Description of chart of account DE SKR-03
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  5, 'SKR03', 'Standardkontenrahmen SKR 03', 1);
+-- Description of chart of account DE SKR-04
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  5, 'SKR04', 'Standardkontenrahmen SKR 04', 1);
 
 -- Description of chart of account CH PCG_SUISSE
@@ -69,6 +89,18 @@ INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUE
 -- Description of chart of account TN PCT
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 10, 'PCT', 'The Tunisia plan', 1);
 
+-- Description of chart of account MA PCG
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 12, 'PCG', 'The Moroccan chart of accounts', 1);
+
+-- Description of chart of account DZ NSCF
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 13, 'NSCF', 'Nouveau système comptable financier', 1);
+
+-- Description of chart of account NL NL-VERKORT
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 17, 'NL-VERKORT', 'Verkort rekeningschema', 1);
+
+-- Description of chart of account SE BAS-K1-MINI
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 20, 'BAS-K1-MINI', 'The Swedish mini chart of accounts', 1);
+
 -- Description of chart of account AT AT-BASE
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 41, 'AT-BASE', 'Plan Austria', 1);
 
@@ -78,54 +110,60 @@ INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUE
 -- Description of chart of account DK DK-STD
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 80, 'DK-STD', 'Standardkontoplan fra SKAT', 1);
 
+-- Description of chart of account EC EC-SUPERCIAS
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 84, 'EC-SUPERCIAS', 'Plan de cuentas Ecuador', 1);
+
+
 -- Description of chart of account LU PCN-LUXEMBURG
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (140, 'PCN-LUXEMBURG', 'Plan comptable normalisé Luxembourgeois', 1);
 
--- Description of chart of account MA PCG
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 12, 'PCG', 'The Moroccan chart of accounts', 1);
 
--- Description of chart of account SE BAS-K1-MINI
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 20, 'BAS-K1-MINI', 'The Swedish mini chart of accounts', 1);
+-- Description of chart of account RO RO-BASE
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (188, 'RO-BASE', 'Plan de conturi romanesc', 1);
+
+
 
 
 --DELETE FROM llx_accounting_system WHERE pcg_version = 'SYSCOHADA';
 
+-- Plans SYSCOAHA Western Africa -- sorted alphabetical by countries abbreviations
+
 -- Description of chart of account BJ SYSCOHADA
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 49,'SYSCOHADA-BJ', 'Plan comptable Ouest-Africain', 1);
 
 -- Description of chart of account BF SYSCOHADA
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 60,'SYSCOHADA-BF', 'Plan comptable Ouest-Africain', 1);
 
--- Description of chart of account CM SYSCOHADA
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 24,'SYSCOHADA-CM', 'Plan comptable Ouest-Africain', 1);
+-- Description of chart of account CD SYSCOHADA
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 73,'SYSCOHADA-CD', 'Plan comptable Ouest-Africain', 1);
 
 -- Description of chart of account CF SYSCOHADA
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 65,'SYSCOHADA-CF', 'Plan comptable Ouest-Africain', 1);
 
--- Description of chart of account KM SYSCOHADA
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 71,'SYSCOHADA-KM', 'Plan comptable Ouest-Africain', 1);
-
 -- Description of chart of account CG SYSCOHADA
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 72,'SYSCOHADA-CG', 'Plan comptable Ouest-Africain', 1);
 
 -- Description of chart of account CI SYSCOHADA
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 21,'SYSCOHADA-CI', 'Plan comptable Ouest-Africain', 1);
 
+-- Description of chart of account CM SYSCOHADA
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 24,'SYSCOHADA-CM', 'Plan comptable Ouest-Africain', 1);
+
 -- Description of chart of account GA SYSCOHADA
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 16,'SYSCOHADA-GA', 'Plan comptable Ouest-Africain', 1);
 
 -- Description of chart of account GQ SYSCOHADA
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 87,'SYSCOHADA-GQ', 'Plan comptable Ouest-Africain', 1);
 
+-- Description of chart of account KM SYSCOHADA
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 71,'SYSCOHADA-KM', 'Plan comptable Ouest-Africain', 1);
+
 -- Description of chart of account ML SYSCOHADA
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (147,'SYSCOHADA-ML', 'Plan comptable Ouest-Africain', 1);
 
 -- Description of chart of account NE SYSCOHADA
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (168,'SYSCOHADA-NE', 'Plan comptable Ouest-Africain', 1);
 
--- Description of chart of account CD SYSCOHADA
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 73,'SYSCOHADA-CD', 'Plan comptable Ouest-Africain', 1);
-
 -- Description of chart of account SN SYSCOHADA
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 22,'SYSCOHADA-SN', 'Plan comptable Ouest-Africain', 1);
 
@@ -135,14 +173,3 @@ INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUE
 -- Description of chart of account TG SYSCOHADA
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 15,'SYSCOHADA-TG', 'Plan comptable Ouest-Africain', 1);
 
--- Description of chart of account RO RO-BASE
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  188, 'RO-BASE', 'Plan de conturi romanesc', 1);
-
--- Description of chart of account DZ NSCF
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  13, 'NSCF', 'Nouveau système comptable financier', 1);
-
--- Description of chart of account NL NL-VERKORT
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  17, 'NL-VERKORT', 'Verkort rekeningschema', 1);
-
--- Description of chart of account EC EC-SUPERCIAS
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  84, 'EC-SUPERCIAS', 'Plan de cuentas Ecuador', 1);
\ No newline at end of file

From 9d1da25f0361981be3cdaf91efbc82fd45a80dc1 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 1 Dec 2020 13:57:33 +0100
Subject: [PATCH 060/888] Update llx_const.sql

---
 htdocs/install/mysql/data/llx_const.sql | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql
index 99da23f53a5..7cd039a2c19 100644
--- a/htdocs/install/mysql/data/llx_const.sql
+++ b/htdocs/install/mysql/data/llx_const.sql
@@ -47,17 +47,17 @@ insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_U
 -- Hidden but specific to one entity
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_ENABLE_OVERWRITE_TRANSLATION','1','chaine','Enable translation overwrite',0,1);
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_ENABLE_DEFAULT_VALUES','1','chaine','Enable default value overwrite',0,1);
-insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MONNAIE','EUR','chaine','Monnaie',0,1);
+insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MONNAIE','EUR','chaine','Currency',0,1);
 
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MAIL_SMTP_SERVER','','chaine','Host or ip address for SMTP server',0,1);
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MAIL_SMTP_PORT','','chaine','Port for SMTP server',0,1);
-insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MAIL_EMAIL_FROM','robot@domain.com','chaine','EMail emetteur pour les emails automatiques Dolibarr',0,1);
+insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MAIL_EMAIL_FROM','robot@domain.com','chaine','email emitter for Dolibarr automatic emails',0,1);
 
 --
 -- IHM
 --
-insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SIZE_LISTE_LIMIT','25','chaine','Longueur maximum des listes',0,0);
-insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SIZE_SHORTLIST_LIMIT','3','chaine','Longueur maximum des listes courtes (fiche client)',0,0);
+insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SIZE_LISTE_LIMIT','25','chaine','Maximum length of lists',0,0);
+insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SIZE_SHORTLIST_LIMIT','3','chaine','Maximum length of short lists',0,0);
 
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MENU_STANDARD','eldy_menu.php','chaine','Menu manager for internal users',0,0);
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MENUFRONT_STANDARD','eldy_menu.php','chaine','Menu manager for external users',0,0);

From c215764627616bf16d8b23782e6fc13bf2bc89cc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 1 Dec 2020 15:45:19 +0100
Subject: [PATCH 061/888] Fix phpcs

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

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 9dbbbb44f1d..db6745e8885 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -583,7 +583,7 @@ if ($action == "delete") {
 
 			// We delete the lines
 			$resdeletelines = 1;
-			foreach($invoice->lines as $line) {
+			foreach ($invoice->lines as $line) {
 				$tmpres = $invoice->deleteline($line->id);
 				if ($tmpres < 0) {
 					$resdeletelines = 0;

From 3632a7a02ac65df5ea95fd08e8a4356fc2b23245 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 1 Dec 2020 15:50:59 +0100
Subject: [PATCH 062/888] Fix warning

---
 htdocs/societe/class/societe.class.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 6b1ca1ad3a6..38c6479d0f2 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3115,10 +3115,10 @@ class Societe extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Returns if a profid sould be verified
+	 *  Returns if a profid sould be verified to be unique
 	 *
-	 *  @param	int		$idprof		1,2,3,4,5,6 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm,5=idprof5,6=idprof6)
-	 *  @return boolean         	true , false
+	 *  @param	int		$idprof		1,2,3,4,5,6 (Example: 1=siren, 2=siret, 3=naf, 4=rcs/rm, 5=eori, 6=idprof6)
+	 *  @return boolean         	true if the ID must be unique
 	 */
 	public function id_prof_verifiable($idprof)
 	{
@@ -3128,22 +3128,22 @@ class Societe extends CommonObject
 	 	switch ($idprof)
 		{
 			case 1:
-				$ret = (!$conf->global->SOCIETE_IDPROF1_UNIQUE ?false:true);
+				$ret = (empty($conf->global->SOCIETE_IDPROF1_UNIQUE) ? false : true);
 				break;
 			case 2:
-				$ret = (!$conf->global->SOCIETE_IDPROF2_UNIQUE ?false:true);
+				$ret = (empty($conf->global->SOCIETE_IDPROF2_UNIQUE) ? false : true);
 				break;
 			case 3:
-				$ret = (!$conf->global->SOCIETE_IDPROF3_UNIQUE ?false:true);
+				$ret = (empty($conf->global->SOCIETE_IDPROF3_UNIQUE) ? false : true);
 				break;
 			case 4:
-				$ret = (!$conf->global->SOCIETE_IDPROF4_UNIQUE ?false:true);
+				$ret = (empty($conf->global->SOCIETE_IDPROF4_UNIQUE) ? false : true);
 				break;
 			case 5:
-				$ret = (!$conf->global->SOCIETE_IDPROF5_UNIQUE ?false:true);
+				$ret = (empty($conf->global->SOCIETE_IDPROF5_UNIQUE) ? false : true);
 				break;
 			case 6:
-				$ret = (!$conf->global->SOCIETE_IDPROF6_UNIQUE ?false:true);
+				$ret = (empty($conf->global->SOCIETE_IDPROF6_UNIQUE) ? false : true);
 				break;
 			default:
 				$ret = false;

From c0c03f5270a8afb79d52386a01365af9bdcde5c6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 1 Dec 2020 15:59:54 +0100
Subject: [PATCH 063/888] Fix allow tag <center> into translation strings

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

diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 3c0aa7fba9e..4202191b39a 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -623,8 +623,8 @@ class Translate
 			// We replace some HTML tags by __xx__ to avoid having them encoded by htmlentities because
 			// we want to keep '"' '<b>' '</b>' '<strong' '</strong>' '<a ' '</a>' '<br>' '< ' '<span' '</span>' that are reliable HTML tags inside translation strings.
 			$str = str_replace(
-				array('"', '<b>', '</b>', '<strong>', '</strong>', '<a ', '</a>', '<br>', '<span', '</span>', '< ', '>'), // We accept '< ' but not '<'. We can accept however '>'
-				array('__quot__', '__tagbold__', '__tagboldend__', '__tagbold__', '__tagboldend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__lt__', '__gt__'),
+				array('"', '<b>', '</b>', '<center>', '</center>', '<strong>', '</strong>', '<a ', '</a>', '<br>', '<span', '</span>', '< ', '>'), // We accept '< ' but not '<'. We can accept however '>'
+				array('__quot__', '__tagbold__', '__tagboldend__', '__tagcenter__', '__tagcenterend__', '__tagbold__', '__tagboldend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__lt__', '__gt__'),
 				$str
 			);
 
@@ -638,8 +638,8 @@ class Translate
 
 			// Restore reliable HTML tags into original translation string
 			$str = str_replace(
-				array('__quot__', '__tagbold__', '__tagboldend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__lt__', '__gt__'),
-				array('"', '<b>', '</b>', '<a ', '</a>', '<br>', '<span', '</span>', '< ', '> '),
+				array('__quot__', '__tagbold__', '__tagboldend__', '__tagcenter__', '__tagcenterend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__lt__', '__gt__'),
+				array('"', '<b>', '</b>', '<center>', '</center>', '<a ', '</a>', '<br>', '<span', '</span>', '< ', '> '),
 				$str
 			);
 

From c8b0570c90425be9ab4f4a10671ddc1159fe4a0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric?= <35066297+c3do@users.noreply.github.com>
Date: Tue, 1 Dec 2020 16:32:36 +0100
Subject: [PATCH 064/888] NEW API: Get the list of ordering reasons

---
 htdocs/api/class/api_setup.class.php | 65 ++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 4516d2e1d45..9045626bde4 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -111,6 +111,71 @@ class Setup extends DolibarrApi
 		return $list;
 	}
 
+    /**
+     * Get the list of ordering reasons.
+     *
+     * @param string    $sortfield  Sort field
+     * @param string    $sortorder  Sort order
+     * @param int       $limit      Number of items per page
+     * @param int       $page       Page number {@min 0}
+     * @param int       $active     Payment type is active or not {@min 0} {@max 1}
+     * @param string    $sqlfilters SQL criteria to filter with. Syntax example "(t.code:=:'OrderByWWW')"
+     *
+     * @url     GET dictionary/ordering_reasons
+     *
+     * @return array [List of ordering reasons]
+     *
+     * @throws RestException 400
+     */
+    public function getOrderingReasons($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+    {
+        $list = array();
+
+        if (!DolibarrApiAccess::$user->rights->commande->lire) {
+            throw new RestException(401);
+        }
+
+        $sql = "SELECT rowid, code, label, module";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_input_reason as t";
+        $sql .= " WHERE t.active = ".$active;
+        // Add sql filters
+        if ($sqlfilters)
+        {
+            if (!DolibarrApi::_checkFilters($sqlfilters))
+            {
+                throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
+            }
+            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+        }
+
+
+        $sql .= $this->db->order($sortfield, $sortorder);
+
+        if ($limit) {
+            if ($page < 0) {
+                $page = 0;
+            }
+            $offset = $limit * $page;
+
+            $sql .= $this->db->plimit($limit, $offset);
+        }
+
+        $result = $this->db->query($sql);
+
+        if ($result) {
+            $num = $this->db->num_rows($result);
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            for ($i = 0; $i < $min; $i++) {
+                $list[] = $this->db->fetch_object($result);
+            }
+        } else {
+            throw new RestException(400, $this->db->lasterror());
+        }
+
+        return $list;
+    }
+
 	/**
 	 * Get the list of payments types.
 	 *

From 7788157b199a9c61397bb8fa582a14aa1040c2b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric?= <35066297+c3do@users.noreply.github.com>
Date: Tue, 1 Dec 2020 16:55:43 +0100
Subject: [PATCH 065/888] API orders: Update demand reason on order update

---
 htdocs/commande/class/api_orders.class.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index 71a26eea698..2f4eb6ea996 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -623,6 +623,12 @@ class Orders extends DolibarrApi
 			throw new RestException(400, 'Error while updating availability');
 		}
 
+        // Update demand reason
+        if (!empty($this->commande->demand_reason_id) && $this->commande->demand_reason_id > 0) {
+            if ($this->commande->demand_reason($this->commande->demand_reason_id) < 0)
+                throw new RestException(400, 'Error while updating demand reason');
+        }
+
 		if ($this->commande->update(DolibarrApiAccess::$user) > 0)
 		{
 			return $this->get($id);

From c5ff32c2d2178f677d16384f4b3c2d51bdd27a20 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 1 Dec 2020 17:01:35 +0100
Subject: [PATCH 066/888] Fix accept <u> and <i> into translation strings

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

diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 4202191b39a..7655d6033d9 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -623,8 +623,8 @@ class Translate
 			// We replace some HTML tags by __xx__ to avoid having them encoded by htmlentities because
 			// we want to keep '"' '<b>' '</b>' '<strong' '</strong>' '<a ' '</a>' '<br>' '< ' '<span' '</span>' that are reliable HTML tags inside translation strings.
 			$str = str_replace(
-				array('"', '<b>', '</b>', '<center>', '</center>', '<strong>', '</strong>', '<a ', '</a>', '<br>', '<span', '</span>', '< ', '>'), // We accept '< ' but not '<'. We can accept however '>'
-				array('__quot__', '__tagbold__', '__tagboldend__', '__tagcenter__', '__tagcenterend__', '__tagbold__', '__tagboldend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__lt__', '__gt__'),
+				array('"', '<b>', '</b>', '<u>', '</u>', '<i>', '</i>', '<center>', '</center>', '<strong>', '</strong>', '<a ', '</a>', '<br>', '<span', '</span>', '< ', '>'), // We accept '< ' but not '<'. We can accept however '>'
+				array('__quot__', '__tagb__', '__tagbend__', '__tagu__', '__taguend__', '__tagi__', '__tagiend__', '__tagcenter__', '__tagcenterend__', '__tagb__', '__tagbend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__lt__', '__gt__'),
 				$str
 			);
 
@@ -638,8 +638,8 @@ class Translate
 
 			// Restore reliable HTML tags into original translation string
 			$str = str_replace(
-				array('__quot__', '__tagbold__', '__tagboldend__', '__tagcenter__', '__tagcenterend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__lt__', '__gt__'),
-				array('"', '<b>', '</b>', '<center>', '</center>', '<a ', '</a>', '<br>', '<span', '</span>', '< ', '> '),
+				array('__quot__', '__tagb__', '__tagbend__', '__tagu__', '__taguend__', '__tagi__', '__tagiend__', '__tagcenter__', '__tagcenterend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__lt__', '__gt__'),
+				array('"', '<b>', '</b>', '<u>', '</u>', '<i>', '</i>', '<center>', '</center>', '<a ', '</a>', '<br>', '<span', '</span>', '< ', '> '),
 				$str
 			);
 

From ea1393a7cb7c607814ce2734d7f2d1e41c0c794b Mon Sep 17 00:00:00 2001
From: Marcio Zebedeu <marciozebedeu@gmail.com>
Date: Tue, 1 Dec 2020 19:29:11 +0100
Subject: [PATCH 067/888] New add VAT RAT for Angola

VAT rate support for Angola was added.
---
 htdocs/install/mysql/data/llx_c_tva.sql | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index 19c6070eb2a..08e327d5ce1 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -366,6 +366,10 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 1
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 132, 13,  '9','0','TVA 9%',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 133, 13,     '19','0','TVA 19%',   1);
 
+-- ANGOLA (id country=35)
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 351,  35,   '0','0','VAT Rate 0', 1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 352,  35,  '7','0','VAT reduced rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 353,  35,  '14','0','VAT standard rate',1);
 
 -- Example of code to insert a vat rate 0 for each country
 --delete from llx_c_tva where rowid = 1181;		-- to delete a record that does not follow rules for rowid (fk_pays+'1')

From 3caf65ce6f9b9da799925aa52fd247252d20df55 Mon Sep 17 00:00:00 2001
From: Stephane Lesage <stephane.lesage@ateis.com>
Date: Tue, 1 Dec 2020 19:30:09 +0100
Subject: [PATCH 068/888] Create/Edit extra-field with multi-line text area for
 computed value

---
 htdocs/core/tpl/admin_extrafields_add.tpl.php  | 7 +++++--
 htdocs/core/tpl/admin_extrafields_edit.tpl.php | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 6c25b5c07b5..fca100b2e07 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -180,11 +180,14 @@ $langs->load("modulebuilder");
 <!-- Language file -->
 <tr><td class="titlefield"><?php echo $langs->trans("LanguageFile"); ?></td><td class="valeur"><input type="text" id="langfile" name="langfile" class="minwidth200" value="<?php echo dol_escape_htmltag(GETPOST('langfile', 'alpha')); ?>"></td></tr>
 <!-- Computed Value -->
+<tr class="extra_computed_value">
 <?php if (empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS)) { ?>
-	<tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?></td><td class="valeur"><input id="computed_value" type="text" name="computed_value" class="quatrevingtpercent" value="<?php echo (GETPOST('computed_value', 'none') ?GETPOST('computed_value', 'none') : ''); ?>"></td></tr>
+	<td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?></td>
 <?php } else { ?>
-	<tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc")).$form->textwithpicto($langs->trans("Computedpersistent"), $langs->trans("ComputedpersistentDesc"), 1, 'warning'); ?></td><td class="valeur"><input id="computed_value" class="quatrevingtpercent" type="text" name="computed_value" value="<?php echo dol_escape_htmltag($computed); ?>"></td></tr>
+	<td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc")).$form->textwithpicto($langs->trans("Computedpersistent"), $langs->trans("ComputedpersistentDesc"), 1, 'warning'); ?></td>
 <?php } ?>
+<td class="valeur"><textarea name="computed_value" id="computed_value" class="quatrevingtpercent" rows="<?php echo ROWS_4 ?>"><?php echo (GETPOST('computed_value', 'none') ?GETPOST('computed_value', 'none') : ''); ?></textarea></td>
+</tr>
 <!-- Default Value (at sql setup level) -->
 <tr class="extra_default_value"><td><?php echo $langs->trans("DefaultValue").' ('.$langs->trans("Database").')'; ?></td><td class="valeur"><input id="default_value" type="text" name="default_value" size="5" value="<?php echo (GETPOST('default_value', 'alpha') ?GETPOST('default_value', 'alpha') : ''); ?>"></td></tr>
 <!-- Unique -->
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index 191b4cf40c8..3af89dcede5 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -263,11 +263,14 @@ else
 <tr><td class="titlefield"><?php echo $langs->trans("LanguageFile"); ?></td><td class="valeur"><input type="text" name="langfile" class="minwidth200" value="<?php echo dol_escape_htmltag($langfile); ?>"></td></tr>
 
 <!-- Computed value -->
+<tr class="extra_computed_value">
 <?php if (empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS)) { ?>
-	<tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?></td><td class="valeur"><input id="computed_value" class="quatrevingtpercent" type="text" name="computed_value" value="<?php echo dol_escape_htmltag($computed); ?>"></td></tr>
+	<td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?></td>
 <?php } else { ?>
-	<tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc")).$form->textwithpicto($langs->trans("Computedpersistent"), $langs->trans("ComputedpersistentDesc"), 1, 'warning'); ?></td><td class="valeur"><input id="computed_value" class="quatrevingtpercent" type="text" name="computed_value" value="<?php echo dol_escape_htmltag($computed); ?>"></td></tr>
+	<td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc")).$form->textwithpicto($langs->trans("Computedpersistent"), $langs->trans("ComputedpersistentDesc"), 1, 'warning'); ?></td>
 <?php } ?>
+<td class="valeur"><textarea name="computed_value" id="computed_value" class="quatrevingtpercent" rows="<?php echo ROWS_4 ?>"><?php echo dol_htmlcleanlastbr($computed); ?></textarea></td>
+</tr>
 
 <!-- Default Value (at sql setup level) -->
 <tr class="extra_default_value"><td><?php echo $langs->trans("DefaultValue").' ('.$langs->trans("Database").')'; ?></td><td class="valeur"><input id="default_value" type="text" name="default_value" size="5" value="<?php echo dol_escape_htmltag($default); ?>"></td></tr>

From de9a32972fa910c86e2878516f0331282375d36a Mon Sep 17 00:00:00 2001
From: Marcio Zebedeu <marciozebedeu@gmail.com>
Date: Tue, 1 Dec 2020 19:48:49 +0100
Subject: [PATCH 069/888] New currency for Angolan  added

Support for Angolan currency added
---
 htdocs/install/mysql/data/llx_c_currencies.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/mysql/data/llx_c_currencies.sql b/htdocs/install/mysql/data/llx_c_currencies.sql
index 41cb07416bb..d05015721c8 100644
--- a/htdocs/install/mysql/data/llx_c_currencies.sql
+++ b/htdocs/install/mysql/data/llx_c_currencies.sql
@@ -37,6 +37,7 @@
 
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ALL', '[76,101,107]', 1,	  'Albania Lek');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'DZD', NULL, 1,              'Algeria Dinar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'AOA', NULL, 1,					    'Angola Kwanza');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'AFN', '[1547]', 1,				  'Afghanistan Afghani');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ARS', '[36]', 1,            'Argentino Peso');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'AWG', '[402]', 1,				    'Aruba Guilder');

From 800f8977b95b3ede565f5cf7480499da5e967e17 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 1 Dec 2020 20:00:02 +0100
Subject: [PATCH 070/888] Fix tooltips

---
 htdocs/website/index.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index f2734483acb..3a8e8bda794 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -3009,7 +3009,7 @@ if ($action == 'editcss')
 
 	print dol_get_fiche_head();
 
-	print '<!-- Edit CSS -->'."\n";
+	print '<!-- Edit Website properties -->'."\n";
 	print '<table class="border centpercent">';
 
 	// Website
@@ -3039,8 +3039,8 @@ if ($action == 'editcss')
 
 	// Other languages
 	print '<tr><td class="tdtop">';
-	$htmltext = '';
-	print $form->textwithpicto($langs->trans('OtherLanguages'), $htmltext, 1, 'help', '', 0, 2, 'WEBSITE_OTHERLANG');
+	$htmltext = $langs->trans("Example").': fr,de,sv,it,pt';
+	print $form->textwithpicto($langs->trans('OtherLanguages'), $htmltext, 1, 'help', '', 0, 2);
 	print '</td><td>';
 	print '<input type="text" class="flat" value="'.(GETPOSTISSET('WEBSITE_OTHERLANG') ? GETPOST('WEBSITE_OTHERLANG', 'alpha') : $object->otherlang).'" name="WEBSITE_OTHERLANG">';
 	print '</td>';
@@ -3049,10 +3049,11 @@ if ($action == 'editcss')
 	// VirtualHost
 	print '<tr><td class="tdtop">';
 
-	$htmltext = $langs->trans("SetHereVirtualHost", DOL_DATA_ROOT.'/website/<i>'.$websitekey.'</i>');
+	$htmltext = $langs->trans("SetHereVirtualHost", DOL_DATA_ROOT.'/website/{s1}'.$websitekey.'{s2}');
+	$htmltext = str_replace(array('{s1}', '{s2}'), array('<i>', '</i>'), $htmltext);
 	$htmltext .= '<br>';
-	$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
-	$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
+	$htmltext .= '<br>'.$langs->transnoentitiesnoconv("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
+	$htmltext .= '<br>'.$langs->transnoentitiesnoconv("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
 
 	print $form->textwithpicto($langs->trans('Virtualhost'), $htmltext, 1, 'help', '', 0, 2, 'virtualhosttooltip');
 	print '</td><td>';

From f7a8a02b9833ebc514ac3f03c28f2c991f5c88d0 Mon Sep 17 00:00:00 2001
From: Marcio Zebedeu <marciozebedeu@gmail.com>
Date: Tue, 1 Dec 2020 20:07:58 +0100
Subject: [PATCH 071/888] Update llx_c_tva.sql

---
 htdocs/install/mysql/data/llx_c_tva.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index 08e327d5ce1..793b29ab640 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -368,7 +368,7 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 1
 
 -- ANGOLA (id country=35)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 351,  35,   '0','0','VAT Rate 0', 1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 352,  35,  '7','0','VAT reduced rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 352,  35,   '7','0','VAT reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 353,  35,  '14','0','VAT standard rate',1);
 
 -- Example of code to insert a vat rate 0 for each country

From 1c4876b417d24e80aa380a7deaf179afc302aa5b Mon Sep 17 00:00:00 2001
From: Stephane Lesage <stephane.lesage@ateis.com>
Date: Tue, 1 Dec 2020 21:17:03 +0100
Subject: [PATCH 072/888] more transporters in llx_c_shipment_mode.sql

---
 htdocs/install/mysql/data/llx_c_shipment_mode.sql | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql
index af3cf09f9f8..e5026f8d2f7 100644
--- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql
+++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql
@@ -37,3 +37,9 @@ INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active)
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (6,'KIALA','KIALA','Relais Kiala','http://www.kiala.fr/tnt/delivery/{TRACKID}', 0);
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (7,'GLS','GLS','General Logistics Systems','https://gls-group.eu/FR/fr/suivi-colis?match={TRACKID}', 0);
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (8,'CHRONO','Chronopost','Chronopost','http://www.chronopost.fr/expedier/inputLTNumbersNoJahia.do?listeNumeros={TRACKID}', 0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (9,'INPERSON', 'In person at your site', NULL, NULL, 0, NULL),
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (10,'FEDEX', 'Fedex', NULL, 'https://www.fedex.com/apps/fedextrack/index.html?tracknumbers={TRACKID}', 0, NULL),
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (11,'TNT', 'TNT', NULL, 'https://www.tnt.com/express/fr_fr/site/outils-expedition/suivi.html?searchType=con&cons=={TRACKID}', 0, NULL),
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (12,'DHL', 'DHL', NULL, 'https://www.dhl.com/fr-fr/home/tracking/tracking-global-forwarding.html?submit=1&tracking-id={TRACKID}', 0, NULL),
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (13,'DPD', 'DPD', NULL, 'https://www.dpd.fr/trace/{TRACKID}', 0, NULL),
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (14,'MAINFREIGHT', 'Mainfreight', NULL, 'https://www.mainfreight.com/track?{TRACKID}', 0, NULL);

From 80a5882d9ef14eacb7b586f9a241cf108084f817 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 1 Dec 2020 23:04:36 +0100
Subject: [PATCH 073/888] Update ChangeLog

NEW: VAT rate for Angola #15606
---
 ChangeLog | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 17cebdf9a73..637a8a27407 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -167,7 +167,8 @@ NEW: Thirdparty module : box on customer/supplier tab for invoice outsantding am
 NEW: ticket classification on create from email collector
 NEW: Ticket message notifications when edited from public interface
 NEW: translate classification labels in ticket
-NEW: Add VAT and juridical status for Algeria
+NEW: VAT rate for Angola #15606
+NEW: VAT and juridical status for Algeria
 NEW: VAT report - Invert constant to show by default zero VAT in reports
 NEW: website page fields selection
 NEW: Weighing Scale compatibility with TakePOS connector
@@ -211,7 +212,6 @@ NEW: Triggers Attributes and Attributes values
 NEW: added incoterms data into the substitution array
 NEW: add send context for ticket
 NEW: add a message in error_log after detection of SQL or script injection
-NEW: add two hooks printFieldListFrom and printFieldSearchParam
 NEW: add __TYPE__ substitution key
 NEW: add validation of MX domain for emails
 NEW: calculate the virtual stock in transverse mode ( not on getEntity('commande'), ... but on getEntity('stock') )
@@ -221,6 +221,7 @@ NEW: Hook on propal card
 NEW: add hooks on newpayment page to allow external payment modules
 NEW: add hooks on stats pages
 NEW: add formConfirm hook on product page
+NEW: add two hooks printFieldListFrom and printFieldSearchParam
 
 
 WARNING:
@@ -269,7 +270,7 @@ FIX: Look and feel v12: First tab must be name of object
 FIX: missing entity check
 FIX: missing param for hook
 FIX: Missing transaction on PO actions
-FIX: MySql Strict mode
+FIX: MySQL Strict mode
 FIX: param entity in html form file
 FIX: Problems on FEC format
 FIX: round stock value on product list

From 8944670c03df10896025464de4bacabbfeea0502 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 2 Dec 2020 08:28:16 +0100
Subject: [PATCH 074/888] Update llx_accounting_account_ca.sql

subtype_pcg removed
---
 .../mysql/data/llx_accounting_account_ca.sql  | 306 +++++++++---------
 1 file changed, 153 insertions(+), 153 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_accounting_account_ca.sql b/htdocs/install/mysql/data/llx_accounting_account_ca.sql
index 45d856414c5..e219ad7e67f 100644
--- a/htdocs/install/mysql/data/llx_accounting_account_ca.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_ca.sql
@@ -32,157 +32,157 @@
 -- ID 1000 - 9999
 -- ADD 1400000 to rowid # Do no remove this comment --
 
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1000,'CA-ENG-BASE','ASSETS',         'XXXXXX',   '1',   '0', 'Assets', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 2000,'CA-ENG-BASE','LIABILITIES',    'XXXXXX',   '2',   '0', 'Liabilities', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 3000,'CA-ENG-BASE','CAPITAL',        'XXXXXX',   '3',   '0', 'Equity', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 4000,'CA-ENG-BASE','INCOME',        'XXXXXX',   '4',   '0', 'Revenue', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 5000,'CA-ENG-BASE','COGS',           'XXXXXX',   '5',   '0', 'Cost of Goods Sold', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 6000,'CA-ENG-BASE','EXPENSE',       'XXXXXX',   '6',   '0', 'Expenses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1000,'CA-ENG-BASE','ASSETS',   '1',   '0', 'Assets', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 2000,'CA-ENG-BASE','LIABILITIES',   '2',   '0', 'Liabilities', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 3000,'CA-ENG-BASE','CAPITAL',   '3',   '0', 'Equity', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4000,'CA-ENG-BASE','INCOME',   '4',   '0', 'Revenue', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 5000,'CA-ENG-BASE','COGS',   '5',   '0', 'Cost of Goods Sold', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 6000,'CA-ENG-BASE','EXPENSE',   '6',   '0', 'Expenses', 1);
 
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1010, 'CA-ENG-BASE', 'ASSETS', 'CASH', '1010', '1000', 'Cash', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1011, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1030', '1000', 'Investments and Securities', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1012, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1100', '1000', 'Accounts Receivable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1013, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1120', '1000', 'Other Receivables', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1014, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1140', '1000', 'Allowance for Doubtful Accounts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1015, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1160', '1000', 'Customers Account Receivable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1016, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1200', '1000', 'Raw Materials Inventory', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1017, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1220', '1000', 'Supplies Inventory', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1018, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1240', '1000', 'Work in Progress Inventory', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1019, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1260', '1000', 'Finished Goods Inventory', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1020, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1300', '1000', 'Prepaid Expenses', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1021, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1350', '1000', 'Employee Advances', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1022, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1400', '1000', 'Notes Receivable - Current', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1023, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1430', '1000', 'Prepaid Interest', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1024, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1450', '1000', 'Other Current Assets', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1025, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1500', '1000', 'Furniture and Fixtures', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1026, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1520', '1000', 'Equipment', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1027, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1540', '1000', 'Vehicles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1028, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1560', '1000', 'Other Depreciable Property', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1029, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1580', '1000', 'Buildings', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1030, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1600', '1000', 'Building Improvements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1031, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1620', '1000', 'Land', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1032, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1640', '1000', 'Accumulated Depreciation, Furniture and Fixtures', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1033, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1660', '1000', 'Accumulated Depreciation, Equipment', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1034, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1680', '1000', 'Accumulated Depreciation, Vehicles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1035, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1700', '1000', 'Accumulated Depreciation, Buildings', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1036, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1720', '1000', 'Accumulated Depreciation, Building Improvements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1037, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1740', '1000', 'Accumulated Depreciation, Other', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1038, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1760', '1000', 'Goods and Services Tax (GST) Receivable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1039, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1800', '1000', 'Harmonized Sales Tax (HST) Receivable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1040, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1820', '1000', 'Provincial Sales Tax (PST) Receivable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1041, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1840', '1000', 'Québec Sales Tax (QST) Receivable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1042, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1860', '1000', 'Deposits', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1043, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1880', '1000', 'Accumulated Amortization', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1044, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1900', '1000', 'Notes Receivable - Non-current', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1045, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1940', '1000', 'Other Non-current Assets', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1046, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2100', '2000', 'Accounts Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1047, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2200', '2000', 'Accrued Expenses', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1048, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2300', '2000', 'Current Financial Debts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1049, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2320', '2000', 'Employment Insurance Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1050, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2321', '2000', 'Employment insurance (EI) Employees Contribution', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1051, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2322', '2000', 'Employment insurance (EI) Employer Contribution', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1052, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2340', '2000', 'Federal Income Tax', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1053, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2350', '2000', 'Annuities Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1054, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2351', '2000', 'Annuities - Employee Contribution', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1055, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2352', '2000', 'Annuities - Employer Contribution', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1056, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2360', '2000', 'Health Services Fund Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1057, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2370', '2000', 'Labour Health and Safety Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1058, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2380', '2000', 'Labour Standards to Pay', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1059, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2390', '2000', 'Parental Insurance Plan Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1060, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2391', '2000', 'Parental Insurance Plan Payable - Employee Contribution', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1061, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2392', '2000', 'Parental Insurance Plan Payable - Employer Contribution', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1062, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2400', '2000', 'Provincial Income Tax', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1063, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2410', '2000', 'Other Accounts Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1064, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2420', '2000', 'Goods and Services Tax (GST) Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1065, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2430', '2000', 'Harmonized Sales Tax (HST) Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1066, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2440', '2000', 'Provincial Sales Tax (PST) Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1067, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2450', '2000', 'Québec Sales Tax (QST) Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1068, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2460', '2000', 'Other Taxes Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1069, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2470', '2000', 'Employee Benefits Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1070, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2480', '2000', 'Deposits from Customers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1071, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2490', '2000', 'Other Current Liabilities', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1072, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2500', '2000', 'Notes Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1073, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2600', '2000', 'Land Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1074, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2630', '2000', 'Equipment Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1075, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2660', '2000', 'Vehicles Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1076, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2700', '2000', 'Bank Loans Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1077, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2730', '2000', 'Non-current Financial Debts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1078, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2760', '2000', 'Other Non-current Liabilities', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1079, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2800', '2000', 'Deferred Revenue', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1080, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2900', '2000', 'Deferred Fees', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1081, 'CA-ENG-BASE', 'CAPITAL', 'XXXXXX', '3100', '3000', 'Common Shares', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1082, 'CA-ENG-BASE', 'CAPITAL', 'XXXXXX', '3200', '3000', 'Preferred Shares (Voting)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1083, 'CA-ENG-BASE', 'CAPITAL', 'XXXXXX', '3300', '3000', 'Preferred Shares (Non-voting)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1084, 'CA-ENG-BASE', 'CAPITAL', 'XXXXXX', '3400', '3000', 'Contributed Surplus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1085, 'CA-ENG-BASE', 'CAPITAL', 'XXXXXX', '3500', '3000', 'Retained Earnings', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1086, 'CA-ENG-BASE', 'CAPITAL', 'XXXXXX', '3600', '3000', 'Dividends', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1087, 'CA-ENG-BASE', 'INCOME', 'XXXXXX', '4100', '4000', 'Harmonized Provinces Sales', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1088, 'CA-ENG-BASE', 'INCOME', 'XXXXXX', '4200', '4000', 'Non-Harmonized Provinces Sales', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1089, 'CA-ENG-BASE', 'INCOME', 'XXXXXX', '4300', '4000', 'Inside Sales', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1090, 'CA-ENG-BASE', 'INCOME', 'XXXXXX', '4400', '4000', 'International Sales', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1091, 'CA-ENG-BASE', 'INCOME', 'XXXXXX', '4500', '4000', 'Reimbursible Expenses', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1092, 'CA-ENG-BASE', 'INCOME', 'XXXXXX', '4600', '4000', 'Shipping Charges Reimbursed', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1093, 'CA-ENG-BASE', 'INCOME', 'XXXXXX', '4700', '4000', 'Other Operating Revenues', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1094, 'CA-ENG-BASE', 'INCOME', 'XXXXXX', '4800', '4000', 'Interests', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1095, 'CA-ENG-BASE', 'INCOME', 'XXXXXX', '4900', '4000', 'Other Non-operating Revenues', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1096, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5010', '5000', 'Inside Purchases', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1097, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5050', '5000', 'International Purchases', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1098, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5100', '5000', 'Purchases in Harmonized Provinces', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1099, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5150', '5000', 'Purchases in Non-harmonized Provinces', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1100, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5200', '5000', 'Direct Labor Costs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1101, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5250', '5000', 'Indirect Labor Costs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1102, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5270', '5000', 'Heat and Power', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1103, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5300', '5000', 'Commissions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1104, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5350', '5000', 'Miscellaneous Factory Costs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1105, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5400', '5000', 'Cost of Goods Sold, Salaries and Wages', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1106, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5450', '5000', 'Cost of Goods Sold, Contract Labor', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1107, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5500', '5000', 'Cost of Goods Sold, Freight', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1108, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5550', '5000', 'Cost of Goods Sold, Other', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1109, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5600', '5000', 'Inventory Adjustments', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1110, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5700', '5000', 'Purchase Returns and Allowances', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1111, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6010', '6000', 'Federal Income Tax', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1112, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6020', '6000', 'Health Services Fund', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1113, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6030', '6000', 'Holidays', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1114, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6040', '6000', 'Labour Health and Safety', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1115, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6050', '6000', 'Labour Standards', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1116, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6060', '6000', 'Parental Insurance', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1117, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6080', '6000', 'Provincial Income Tax', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1118, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6100', '6000', 'Salaries, wages', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1119, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6130', '6000', 'Employee Benefit Expense, Pension Plans', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1120, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6160', '6000', 'Employee Benefit Expense, Profit Sharing Plan', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1121, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6180', '6000', 'Employee Benefit Expense, Other', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1122, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6200', '6000', 'Commissions and Fees Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1123, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6230', '6000', 'Annuities', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1124, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6250', '6000', 'Employment Insurance', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1125, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6280', '6000', 'Insurance Expense, Product Liability', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1126, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6300', '6000', 'Insurance Expense, Vehicle', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1127, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6340', '6000', 'Payroll Tax Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1128, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6360', '6000', 'Penalties and Fines Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1129, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6380', '6000', 'Other Taxes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1130, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6400', '6000', 'Advertising Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1131, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6420', '6000', 'Amortization Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1132, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6460', '6000', 'Auto Expenses', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1133, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6480', '6000', 'Legal and Professional Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1134, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6500', '6000', 'Licenses Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1135, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6520', '6000', 'Maintenance Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1136, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6540', '6000', 'Repair and Maintenance Expense, Office', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1137, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6560', '6000', 'Repair and Maintenance Expense, Vehicle', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1138, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6580', '6000', 'Office Supplies Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1139, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6600', '6000', 'Telephone Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1140, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6610', '6000', 'Training Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1141, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6630', '6000', 'Travel Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1142, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6650', '6000', 'Utilities Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1143, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6670', '6000', 'Postage Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1144, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6690', '6000', 'Freight Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1145, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6700', '6000', 'Rent or Lease Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1146, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6720', '6000', 'Meals and Entertainment Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1147, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6730', '6000', 'Gain/Loss on Sale of Assets', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1148, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6740', '6000', 'Depreciation Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1149, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6750', '6000', 'Bad Debt Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1150, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6760', '6000', 'Bank Fees', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1151, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6790', '6000', 'Loss on Non-sufficient Funds Checks', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1152, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6800', '6000', 'Gifts Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1153, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6820', '6000', 'Charitable Contributions Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1154, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6840', '6000', 'Other Operating Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1155, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6860', '6000', 'Interests Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1156, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6900', '6000', 'Other Non-operating Expense', 1);
\ No newline at end of file
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1010, 'CA-ENG-BASE', 'ASSETS', '1010', '1000', 'Cash', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1011, 'CA-ENG-BASE', 'ASSETS', '1030', '1000', 'Investments and Securities', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1012, 'CA-ENG-BASE', 'ASSETS', '1100', '1000', 'Accounts Receivable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1013, 'CA-ENG-BASE', 'ASSETS', '1120', '1000', 'Other Receivables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1014, 'CA-ENG-BASE', 'ASSETS', '1140', '1000', 'Allowance for Doubtful Accounts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1015, 'CA-ENG-BASE', 'ASSETS', '1160', '1000', 'Customers Account Receivable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1016, 'CA-ENG-BASE', 'ASSETS', '1200', '1000', 'Raw Materials Inventory', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1017, 'CA-ENG-BASE', 'ASSETS', '1220', '1000', 'Supplies Inventory', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1018, 'CA-ENG-BASE', 'ASSETS', '1240', '1000', 'Work in Progress Inventory', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1019, 'CA-ENG-BASE', 'ASSETS', '1260', '1000', 'Finished Goods Inventory', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1020, 'CA-ENG-BASE', 'ASSETS', '1300', '1000', 'Prepaid Expenses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1021, 'CA-ENG-BASE', 'ASSETS', '1350', '1000', 'Employee Advances', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1022, 'CA-ENG-BASE', 'ASSETS', '1400', '1000', 'Notes Receivable - Current', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1023, 'CA-ENG-BASE', 'ASSETS', '1430', '1000', 'Prepaid Interest', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1024, 'CA-ENG-BASE', 'ASSETS', '1450', '1000', 'Other Current Assets', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1025, 'CA-ENG-BASE', 'ASSETS', '1500', '1000', 'Furniture and Fixtures', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1026, 'CA-ENG-BASE', 'ASSETS', '1520', '1000', 'Equipment', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1027, 'CA-ENG-BASE', 'ASSETS', '1540', '1000', 'Vehicles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1028, 'CA-ENG-BASE', 'ASSETS', '1560', '1000', 'Other Depreciable Property', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1029, 'CA-ENG-BASE', 'ASSETS', '1580', '1000', 'Buildings', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1030, 'CA-ENG-BASE', 'ASSETS', '1600', '1000', 'Building Improvements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1031, 'CA-ENG-BASE', 'ASSETS', '1620', '1000', 'Land', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1032, 'CA-ENG-BASE', 'ASSETS', '1640', '1000', 'Accumulated Depreciation, Furniture and Fixtures', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1033, 'CA-ENG-BASE', 'ASSETS', '1660', '1000', 'Accumulated Depreciation, Equipment', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1034, 'CA-ENG-BASE', 'ASSETS', '1680', '1000', 'Accumulated Depreciation, Vehicles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1035, 'CA-ENG-BASE', 'ASSETS', '1700', '1000', 'Accumulated Depreciation, Buildings', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1036, 'CA-ENG-BASE', 'ASSETS', '1720', '1000', 'Accumulated Depreciation, Building Improvements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1037, 'CA-ENG-BASE', 'ASSETS', '1740', '1000', 'Accumulated Depreciation, Other', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1038, 'CA-ENG-BASE', 'ASSETS', '1760', '1000', 'Goods and Services Tax (GST) Receivable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1039, 'CA-ENG-BASE', 'ASSETS', '1800', '1000', 'Harmonized Sales Tax (HST) Receivable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1040, 'CA-ENG-BASE', 'ASSETS', '1820', '1000', 'Provincial Sales Tax (PST) Receivable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1041, 'CA-ENG-BASE', 'ASSETS', '1840', '1000', 'Québec Sales Tax (QST) Receivable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1042, 'CA-ENG-BASE', 'ASSETS', '1860', '1000', 'Deposits', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1043, 'CA-ENG-BASE', 'ASSETS', '1880', '1000', 'Accumulated Amortization', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1044, 'CA-ENG-BASE', 'ASSETS', '1900', '1000', 'Notes Receivable - Non-current', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1045, 'CA-ENG-BASE', 'ASSETS', '1940', '1000', 'Other Non-current Assets', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1046, 'CA-ENG-BASE', 'LIABILITIES', '2100', '2000', 'Accounts Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1047, 'CA-ENG-BASE', 'LIABILITIES', '2200', '2000', 'Accrued Expenses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1048, 'CA-ENG-BASE', 'LIABILITIES', '2300', '2000', 'Current Financial Debts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1049, 'CA-ENG-BASE', 'LIABILITIES', '2320', '2000', 'Employment Insurance Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1050, 'CA-ENG-BASE', 'LIABILITIES', '2321', '2000', 'Employment insurance (EI) Employees Contribution', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1051, 'CA-ENG-BASE', 'LIABILITIES', '2322', '2000', 'Employment insurance (EI) Employer Contribution', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1052, 'CA-ENG-BASE', 'LIABILITIES', '2340', '2000', 'Federal Income Tax', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1053, 'CA-ENG-BASE', 'LIABILITIES', '2350', '2000', 'Annuities Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1054, 'CA-ENG-BASE', 'LIABILITIES', '2351', '2000', 'Annuities - Employee Contribution', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1055, 'CA-ENG-BASE', 'LIABILITIES', '2352', '2000', 'Annuities - Employer Contribution', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1056, 'CA-ENG-BASE', 'LIABILITIES', '2360', '2000', 'Health Services Fund Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1057, 'CA-ENG-BASE', 'LIABILITIES', '2370', '2000', 'Labour Health and Safety Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1058, 'CA-ENG-BASE', 'LIABILITIES', '2380', '2000', 'Labour Standards to Pay', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1059, 'CA-ENG-BASE', 'LIABILITIES', '2390', '2000', 'Parental Insurance Plan Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1060, 'CA-ENG-BASE', 'LIABILITIES', '2391', '2000', 'Parental Insurance Plan Payable - Employee Contribution', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1061, 'CA-ENG-BASE', 'LIABILITIES', '2392', '2000', 'Parental Insurance Plan Payable - Employer Contribution', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1062, 'CA-ENG-BASE', 'LIABILITIES', '2400', '2000', 'Provincial Income Tax', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1063, 'CA-ENG-BASE', 'LIABILITIES', '2410', '2000', 'Other Accounts Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1064, 'CA-ENG-BASE', 'LIABILITIES', '2420', '2000', 'Goods and Services Tax (GST) Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1065, 'CA-ENG-BASE', 'LIABILITIES', '2430', '2000', 'Harmonized Sales Tax (HST) Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1066, 'CA-ENG-BASE', 'LIABILITIES', '2440', '2000', 'Provincial Sales Tax (PST) Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1067, 'CA-ENG-BASE', 'LIABILITIES', '2450', '2000', 'Québec Sales Tax (QST) Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1068, 'CA-ENG-BASE', 'LIABILITIES', '2460', '2000', 'Other Taxes Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1069, 'CA-ENG-BASE', 'LIABILITIES', '2470', '2000', 'Employee Benefits Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1070, 'CA-ENG-BASE', 'LIABILITIES', '2480', '2000', 'Deposits from Customers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1071, 'CA-ENG-BASE', 'LIABILITIES', '2490', '2000', 'Other Current Liabilities', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1072, 'CA-ENG-BASE', 'LIABILITIES', '2500', '2000', 'Notes Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1073, 'CA-ENG-BASE', 'LIABILITIES', '2600', '2000', 'Land Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1074, 'CA-ENG-BASE', 'LIABILITIES', '2630', '2000', 'Equipment Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1075, 'CA-ENG-BASE', 'LIABILITIES', '2660', '2000', 'Vehicles Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1076, 'CA-ENG-BASE', 'LIABILITIES', '2700', '2000', 'Bank Loans Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1077, 'CA-ENG-BASE', 'LIABILITIES', '2730', '2000', 'Non-current Financial Debts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1078, 'CA-ENG-BASE', 'LIABILITIES', '2760', '2000', 'Other Non-current Liabilities', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1079, 'CA-ENG-BASE', 'LIABILITIES', '2800', '2000', 'Deferred Revenue', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1080, 'CA-ENG-BASE', 'LIABILITIES', '2900', '2000', 'Deferred Fees', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1081, 'CA-ENG-BASE', 'CAPITAL', '3100', '3000', 'Common Shares', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1082, 'CA-ENG-BASE', 'CAPITAL', '3200', '3000', 'Preferred Shares (Voting)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1083, 'CA-ENG-BASE', 'CAPITAL', '3300', '3000', 'Preferred Shares (Non-voting)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1084, 'CA-ENG-BASE', 'CAPITAL', '3400', '3000', 'Contributed Surplus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1085, 'CA-ENG-BASE', 'CAPITAL', '3500', '3000', 'Retained Earnings', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1086, 'CA-ENG-BASE', 'CAPITAL', '3600', '3000', 'Dividends', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1087, 'CA-ENG-BASE', 'INCOME', '4100', '4000', 'Harmonized Provinces Sales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1088, 'CA-ENG-BASE', 'INCOME', '4200', '4000', 'Non-Harmonized Provinces Sales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1089, 'CA-ENG-BASE', 'INCOME', '4300', '4000', 'Inside Sales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1090, 'CA-ENG-BASE', 'INCOME', '4400', '4000', 'International Sales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1091, 'CA-ENG-BASE', 'INCOME', '4500', '4000', 'Reimbursible Expenses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1092, 'CA-ENG-BASE', 'INCOME', '4600', '4000', 'Shipping Charges Reimbursed', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1093, 'CA-ENG-BASE', 'INCOME', '4700', '4000', 'Other Operating Revenues', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1094, 'CA-ENG-BASE', 'INCOME', '4800', '4000', 'Interests', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1095, 'CA-ENG-BASE', 'INCOME', '4900', '4000', 'Other Non-operating Revenues', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1096, 'CA-ENG-BASE', 'COGS', '5010', '5000', 'Inside Purchases', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1097, 'CA-ENG-BASE', 'COGS', '5050', '5000', 'International Purchases', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1098, 'CA-ENG-BASE', 'COGS', '5100', '5000', 'Purchases in Harmonized Provinces', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1099, 'CA-ENG-BASE', 'COGS', '5150', '5000', 'Purchases in Non-harmonized Provinces', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1100, 'CA-ENG-BASE', 'COGS', '5200', '5000', 'Direct Labor Costs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1101, 'CA-ENG-BASE', 'COGS', '5250', '5000', 'Indirect Labor Costs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1102, 'CA-ENG-BASE', 'COGS', '5270', '5000', 'Heat and Power', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1103, 'CA-ENG-BASE', 'COGS', '5300', '5000', 'Commissions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1104, 'CA-ENG-BASE', 'COGS', '5350', '5000', 'Miscellaneous Factory Costs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1105, 'CA-ENG-BASE', 'COGS', '5400', '5000', 'Cost of Goods Sold, Salaries and Wages', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1106, 'CA-ENG-BASE', 'COGS', '5450', '5000', 'Cost of Goods Sold, Contract Labor', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1107, 'CA-ENG-BASE', 'COGS', '5500', '5000', 'Cost of Goods Sold, Freight', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1108, 'CA-ENG-BASE', 'COGS', '5550', '5000', 'Cost of Goods Sold, Other', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1109, 'CA-ENG-BASE', 'COGS', '5600', '5000', 'Inventory Adjustments', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1110, 'CA-ENG-BASE', 'COGS', '5700', '5000', 'Purchase Returns and Allowances', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1111, 'CA-ENG-BASE', 'EXPENSE', '6010', '6000', 'Federal Income Tax', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1112, 'CA-ENG-BASE', 'EXPENSE', '6020', '6000', 'Health Services Fund', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1113, 'CA-ENG-BASE', 'EXPENSE', '6030', '6000', 'Holidays', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1114, 'CA-ENG-BASE', 'EXPENSE', '6040', '6000', 'Labour Health and Safety', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1115, 'CA-ENG-BASE', 'EXPENSE', '6050', '6000', 'Labour Standards', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1116, 'CA-ENG-BASE', 'EXPENSE', '6060', '6000', 'Parental Insurance', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1117, 'CA-ENG-BASE', 'EXPENSE', '6080', '6000', 'Provincial Income Tax', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1118, 'CA-ENG-BASE', 'EXPENSE', '6100', '6000', 'Salaries, wages', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1119, 'CA-ENG-BASE', 'EXPENSE', '6130', '6000', 'Employee Benefit Expense, Pension Plans', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1120, 'CA-ENG-BASE', 'EXPENSE', '6160', '6000', 'Employee Benefit Expense, Profit Sharing Plan', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1121, 'CA-ENG-BASE', 'EXPENSE', '6180', '6000', 'Employee Benefit Expense, Other', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1122, 'CA-ENG-BASE', 'EXPENSE', '6200', '6000', 'Commissions and Fees Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1123, 'CA-ENG-BASE', 'EXPENSE', '6230', '6000', 'Annuities', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1124, 'CA-ENG-BASE', 'EXPENSE', '6250', '6000', 'Employment Insurance', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1125, 'CA-ENG-BASE', 'EXPENSE', '6280', '6000', 'Insurance Expense, Product Liability', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1126, 'CA-ENG-BASE', 'EXPENSE', '6300', '6000', 'Insurance Expense, Vehicle', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1127, 'CA-ENG-BASE', 'EXPENSE', '6340', '6000', 'Payroll Tax Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1128, 'CA-ENG-BASE', 'EXPENSE', '6360', '6000', 'Penalties and Fines Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1129, 'CA-ENG-BASE', 'EXPENSE', '6380', '6000', 'Other Taxes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1130, 'CA-ENG-BASE', 'EXPENSE', '6400', '6000', 'Advertising Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1131, 'CA-ENG-BASE', 'EXPENSE', '6420', '6000', 'Amortization Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1132, 'CA-ENG-BASE', 'EXPENSE', '6460', '6000', 'Auto Expenses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1133, 'CA-ENG-BASE', 'EXPENSE', '6480', '6000', 'Legal and Professional Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1134, 'CA-ENG-BASE', 'EXPENSE', '6500', '6000', 'Licenses Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1135, 'CA-ENG-BASE', 'EXPENSE', '6520', '6000', 'Maintenance Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1136, 'CA-ENG-BASE', 'EXPENSE', '6540', '6000', 'Repair and Maintenance Expense, Office', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1137, 'CA-ENG-BASE', 'EXPENSE', '6560', '6000', 'Repair and Maintenance Expense, Vehicle', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1138, 'CA-ENG-BASE', 'EXPENSE', '6580', '6000', 'Office Supplies Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1139, 'CA-ENG-BASE', 'EXPENSE', '6600', '6000', 'Telephone Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1140, 'CA-ENG-BASE', 'EXPENSE', '6610', '6000', 'Training Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1141, 'CA-ENG-BASE', 'EXPENSE', '6630', '6000', 'Travel Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1142, 'CA-ENG-BASE', 'EXPENSE', '6650', '6000', 'Utilities Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1143, 'CA-ENG-BASE', 'EXPENSE', '6670', '6000', 'Postage Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1144, 'CA-ENG-BASE', 'EXPENSE', '6690', '6000', 'Freight Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1145, 'CA-ENG-BASE', 'EXPENSE', '6700', '6000', 'Rent or Lease Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1146, 'CA-ENG-BASE', 'EXPENSE', '6720', '6000', 'Meals and Entertainment Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1147, 'CA-ENG-BASE', 'EXPENSE', '6730', '6000', 'Gain/Loss on Sale of Assets', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1148, 'CA-ENG-BASE', 'EXPENSE', '6740', '6000', 'Depreciation Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1149, 'CA-ENG-BASE', 'EXPENSE', '6750', '6000', 'Bad Debt Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1150, 'CA-ENG-BASE', 'EXPENSE', '6760', '6000', 'Bank Fees', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1151, 'CA-ENG-BASE', 'EXPENSE', '6790', '6000', 'Loss on Non-sufficient Funds Checks', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1152, 'CA-ENG-BASE', 'EXPENSE', '6800', '6000', 'Gifts Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1153, 'CA-ENG-BASE', 'EXPENSE', '6820', '6000', 'Charitable Contributions Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1154, 'CA-ENG-BASE', 'EXPENSE', '6840', '6000', 'Other Operating Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1155, 'CA-ENG-BASE', 'EXPENSE', '6860', '6000', 'Interests Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1156, 'CA-ENG-BASE', 'EXPENSE', '6900', '6000', 'Other Non-operating Expense', 1);

From e19d0c9eeaeadd9c18b3fc39f3522c30db10a24f Mon Sep 17 00:00:00 2001
From: teleassist <30868208+teleassist@users.noreply.github.com>
Date: Wed, 2 Dec 2020 09:07:24 +0100
Subject: [PATCH 075/888] Add translation

Add translation for option TakeposNumpadForcePaymentLabels
---
 htdocs/langs/en_US/cashdesk.lang | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index 549646ab110..c0245790e76 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -122,4 +122,5 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
-WeighingScale=Weighing scale
\ No newline at end of file
+WeighingScale=Weighing scale
+TakeposNumpadForcePaymentLabels=Show text with icons of payment buttons of numpad

From 7e9a12a2f8bef1f6947522654e1470661844f054 Mon Sep 17 00:00:00 2001
From: teleassist <30868208+teleassist@users.noreply.github.com>
Date: Wed, 2 Dec 2020 09:19:18 +0100
Subject: [PATCH 076/888] Add TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS

Add option TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS to show labels at the bottom of payment icons of the numpad
---
 htdocs/takepos/admin/setup.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index 88911f10b7d..bd4c18bda0c 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -307,6 +307,13 @@ print '<td colspan="2">';
 print ajax_constantonoff("TAKEPOS_NUMPAD_USE_PAYMENT_ICON", array(), $conf->entity, 0, 0, 1, 0);
 print "</td></tr>\n";
 
+// Numpad show labels for icons
+print '<tr class="oddeven"><td>';
+print $langs->trans('TakeposNumpadForcePaymentLabels');
+print '<td colspan="2">';
+print ajax_constantonoff("TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS", array(), $conf->entity, 0, 0, 1, 0);
+print "</td></tr>\n";
+
 // Direct Payment
 print '<tr class="oddeven"><td>';
 print $langs->trans('DirectPaymentButton');

From 0730cab90fd9357477c6aebfd9728f0e5becc31b Mon Sep 17 00:00:00 2001
From: teleassist <30868208+teleassist@users.noreply.github.com>
Date: Wed, 2 Dec 2020 09:38:30 +0100
Subject: [PATCH 077/888] Add class for icons labels

---
 htdocs/takepos/css/pos.css.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php
index 416980633ca..4b1f4c0bbb7 100644
--- a/htdocs/takepos/css/pos.css.php
+++ b/htdocs/takepos/css/pos.css.php
@@ -125,6 +125,10 @@ button.calcbutton2 {
     border-radius: 3px;
 }
 
+button.calcbutton2 .iconwithlabel {
+	padding-bottom: 10px;
+}
+
 button.calcbutton3 {
 	display: inline-block;
 	position: relative;

From dd2d5259de40db7803bdddf11c86b2b40f489d59 Mon Sep 17 00:00:00 2001
From: teleassist <30868208+teleassist@users.noreply.github.com>
Date: Wed, 2 Dec 2020 09:46:53 +0100
Subject: [PATCH 078/888] Add icons labels for payment buttons

Add labels to icons when TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS is set
---
 htdocs/takepos/pay.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index b0e745e2211..31acc4433c6 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -286,6 +286,7 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 <?php if (count($arrayOfValidPaymentModes) > 0) {
 	$paycode = $arrayOfValidPaymentModes[0]->code;
 	$payIcon = '';
+	$payLabel = '';
 	if ($paycode == 'LIQ') {
 		$paycode = 'cash';
 		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'coins';
@@ -297,7 +298,8 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
 	}
 
-	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.'"></span>' : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code)).'</button>';
+	if(!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS)) $payLabel = ' iconwithlabel';
+	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.$payLabel.'"></span>'.(!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS) ? '<br/> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code) : '') : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code)).'</button>';
 } else {
 	print '<button type="button" class="calcbutton2">'.$langs->trans("NoPaimementModesDefined").'</button>';
 }
@@ -309,6 +311,7 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 <?php if (count($arrayOfValidPaymentModes) > 1) {
 	$paycode = $arrayOfValidPaymentModes[1]->code;
 	$payIcon = '';
+	$payLabel = '';
 	if ($paycode == 'LIQ') {
 		$paycode = 'cash';
 		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'coins';
@@ -320,7 +323,8 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
 	}
 
-	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.'"></span>' : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[1]->code)).'</button>';
+	if(!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS)) $payLabel = ' iconwithlabel';
+	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.$payLabel.'"></span>'.(!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS) ? '<br/> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[1]->code) : '') : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[1]->code)).'</button>';
 } else {
 	$button = array_pop($action_buttons);
 	print '<button type="button" class="calcbutton2" onclick="'.$button["function"].'"><span '.$button["span"].'>'.$button["text"].'</span></button>';
@@ -333,6 +337,7 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 <?php if (count($arrayOfValidPaymentModes) > 2) {
 	$paycode = $arrayOfValidPaymentModes[2]->code;
 	$payIcon = '';
+	$payLabel = '';
 	if ($paycode == 'LIQ') {
 		$paycode = 'cash';
 		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'coins';
@@ -344,7 +349,8 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
 	}
 
-	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.'"></span>' : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[2]->code)).'</button>';
+	if(!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS)) $payLabel = ' iconwithlabel';
+	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.$payLabel.'"></span>'.(!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS) ? '<br/> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[2]->code) : '') : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[2]->code)).'</button>';
 } else {
 	$button = array_pop($action_buttons);
 	print '<button type="button" class="calcbutton2" onclick="'.$button["function"].'"><span '.$button["span"].'>'.$button["text"].'</span></button>';

From 87ee62c2ff8c503069f62b816c9b9d475d4599d6 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 2 Dec 2020 08:54:33 +0000
Subject: [PATCH 079/888] Fixing style errors.

---
 htdocs/takepos/pay.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index 31acc4433c6..89b936bef6c 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -298,7 +298,7 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
 	}
 
-	if(!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS)) $payLabel = ' iconwithlabel';
+	if (!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS)) $payLabel = ' iconwithlabel';
 	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.$payLabel.'"></span>'.(!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS) ? '<br/> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code) : '') : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code)).'</button>';
 } else {
 	print '<button type="button" class="calcbutton2">'.$langs->trans("NoPaimementModesDefined").'</button>';
@@ -323,7 +323,7 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
 	}
 
-	if(!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS)) $payLabel = ' iconwithlabel';
+	if (!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS)) $payLabel = ' iconwithlabel';
 	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.$payLabel.'"></span>'.(!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS) ? '<br/> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[1]->code) : '') : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[1]->code)).'</button>';
 } else {
 	$button = array_pop($action_buttons);
@@ -349,7 +349,7 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
 	}
 
-	if(!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS)) $payLabel = ' iconwithlabel';
+	if (!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS)) $payLabel = ' iconwithlabel';
 	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.$payLabel.'"></span>'.(!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS) ? '<br/> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[2]->code) : '') : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[2]->code)).'</button>';
 } else {
 	$button = array_pop($action_buttons);

From 73edd081dd7a256c3b2c3225f7099823668d16d9 Mon Sep 17 00:00:00 2001
From: Marcio Zebedeu <marciozebedeu@gmail.com>
Date: Wed, 2 Dec 2020 12:04:35 +0100
Subject: [PATCH 080/888] New Support for Angolan currency added

Support for Region  Angola added
---
 htdocs/install/mysql/data/llx_10_c_regions.sql | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql
index bbb7af35bb7..43d2652298f 100644
--- a/htdocs/install/mysql/data/llx_10_c_regions.sql
+++ b/htdocs/install/mysql/data/llx_10_c_regions.sql
@@ -380,3 +380,7 @@ insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,931,
 insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,932, '新',0,'新疆维吾尔自治区');
 insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,933, '港',0,'香港特别行政区');
 insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,934, '澳',0,'澳门特别行政区');
+
+-- Regions Angola (rowid country=35)
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES (35, 35001, 'AO', NULL, 'Angola');
+

From 561c7438bc3b3d4830544f52c91160647cdf4f7e Mon Sep 17 00:00:00 2001
From: Marcio Zebedeu <marciozebedeu@gmail.com>
Date: Wed, 2 Dec 2020 12:36:15 +0100
Subject: [PATCH 081/888] New Add Angola City name

Angola province/city support added
---
 .../mysql/data/llx_20_c_departements.sql      | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql
index 54ab237c9b8..00f30fab0be 100644
--- a/htdocs/install/mysql/data/llx_20_c_departements.sql
+++ b/htdocs/install/mysql/data/llx_20_c_departements.sql
@@ -1606,3 +1606,23 @@ INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('20204', 'SI038', NULL, NULL, 'UPPER CARNIOLA', 'Upper Carniola');
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('20204', 'SI043', NULL, NULL, 'GORIZIA', 'Gorizia');
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('20204', 'SI044', NULL, NULL, 'COASTAL–KARST', 'Coastal–Karst');
+
+-- Provinces (postal districts) Angola (rowid country=35)
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-ABO', NULL, NULL, 'BENGO', 'Bengo');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-BGU', NULL, NULL, 'BENGUELA', 'Benguela');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-BIE', NULL, NULL, 'BIÉ', 'Bié');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-CAB', NULL, NULL, 'CABINDA', 'Cabinda');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-CCU', NULL, NULL, 'KUANDO KUBANGO', 'Kuando Kubango');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-CNO', NULL, NULL, 'KWANZA NORTE', 'Kwanza Norte');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-CUS', NULL, NULL, 'KWANZA SUL', 'Kwanza Sul');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-CNN', NULL, NULL, 'CUNENE', 'Cunene');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-HUA', NULL, NULL, 'HUAMBO', 'Huambo');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-HUI', NULL, NULL, 'HUÍLA', 'Huila');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-LUA', NULL, NULL, 'LUANDA', 'Luanda');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-LNO', NULL, NULL, 'LUNDA-NORTE', 'Lunda-Norte');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-LSU',NULL, NULL,  'LUNDA-SUL', 'Lunda-Sul');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-MAL', NULL, NULL, 'MALANGE', 'Malange');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-MOX', NULL, NULL, 'MOXICO', 'Moxico');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-NAM', NULL, NULL, 'NAMÍBE', 'Namíbe');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-UIG', NULL, NULL, 'UÍGE', 'Uíge');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-ZAI', NULL, NULL, 'ZAÍRE', 'Zaíre');

From 49be354c3e12ad96036f46a2d1f288776dcf9aab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 2 Dec 2020 14:05:17 +0100
Subject: [PATCH 082/888] Fix warning

---
 htdocs/core/class/commonobject.class.php | 27 ++++++++----------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 9d2317d3c2c..243d4d57f7c 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -5417,26 +5417,20 @@ abstract class CommonObject
 					$sql .= ",".$attributeKey;
 			}
 			// We must insert a default value for fields for other entities that are mandatory to avoid not null error
-			if (is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']))
-			{
-				foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
-				{
-					if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey]))    // If field not already added previously
-					{
+			if (!empty($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']) && is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'])) {
+				foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval) {
+					if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) {    // If field not already added previously
 						$sql .= ",".$tmpkey;
 					}
 				}
 			}
 			$sql .= ") VALUES (".$this->id;
 
-			foreach ($new_array_options as $key => $value)
-			{
+			foreach ($new_array_options as $key => $value) {
 				$attributeKey = substr($key, 8); // Remove 'options_' prefix
 				// Add field of attribute
-				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator)
-				{
-					if ($new_array_options[$key] != '' || $new_array_options[$key] == '0')
-					{
+				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') { // Only for other type than separator)
+					if ($new_array_options[$key] != '' || $new_array_options[$key] == '0') {
 						$sql .= ",'".$this->db->escape($new_array_options[$key])."'";
 					} else {
 						$sql .= ",null";
@@ -5444,12 +5438,9 @@ abstract class CommonObject
 				}
 			}
 			// We must insert a default value for fields for other entities that are mandatory to avoid not null error
-			if (is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']))
-			{
-				foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
-				{
-					if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey]))    // If field not already added previously
-					{
+			if (!empty($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']) && is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'])) {
+				foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval) {
+					if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) {   // If field not already added previously
 						if (in_array($tmpval, array('int', 'double', 'price'))) $sql .= ", 0";
 						else $sql .= ", ''";
 					}

From 25bedc34971abddab215c70f54899425691b8d4f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 2 Dec 2020 14:09:03 +0100
Subject: [PATCH 083/888] Fix warning

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

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index a94fe759125..52f9a60d2be 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -717,7 +717,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$langs->loadLangs(array("admin", "help"));
 
 				$warnpicto = '';
-				if (!empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY))
+				if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY))
 				{
 					$langs->load("errors");
 					$warnpicto = img_warning($langs->trans("WarningMandatorySetupNotComplete"));
@@ -725,7 +725,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/admin/company.php?mainmenu=home", $langs->trans("MenuCompanySetup").$warnpicto, 1);
 
 				$warnpicto = '';
-				if (1 || count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING) ? 1 : $conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING))	// If only user module enabled
+				if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING) ? 1 : $conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING))	// If only user module enabled
 				{
 					$langs->load("errors");
 					$warnpicto = img_warning($langs->trans("WarningMandatorySetupNotComplete"));

From c7a31b245815a1277853669ac7c2e788303ba73b Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Wed, 2 Dec 2020 14:42:56 +0100
Subject: [PATCH 084/888] new widget funnel of prospection

---
 .../core/boxes/box_funnel_of_prospection.php  | 268 ++++++++++++++++++
 htdocs/core/modules/modProjet.class.php       |   2 +
 2 files changed, 270 insertions(+)
 create mode 100644 htdocs/core/boxes/box_funnel_of_prospection.php

diff --git a/htdocs/core/boxes/box_funnel_of_prospection.php b/htdocs/core/boxes/box_funnel_of_prospection.php
new file mode 100644
index 00000000000..6e63a80353c
--- /dev/null
+++ b/htdocs/core/boxes/box_funnel_of_prospection.php
@@ -0,0 +1,268 @@
+<?php
+/* Copyright (C) 2012-2014 Charles-François BENKE <charles.fr@benke.fr>
+ * Copyright (C) 2014      Marcos García          <marcosgdf@gmail.com>
+ * Copyright (C) 2015      Frederic France        <frederic.france@free.fr>
+ * Copyright (C) 2016      Juan José Menent       <jmenent@2byte.es>
+ * Copyright (C) 2020      Pierre Ardoin          <mapiolca@me.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/core/boxes/box_funnel_of_prospection.php
+ *  \ingroup    projet
+ *  \brief      Module to show the funnel of prospection
+ */
+include_once DOL_DOCUMENT_ROOT . "/core/boxes/modules_boxes.php";
+
+/**
+ * Class to manage the box to show last projet
+ */
+class box_funnel_of_prospection extends ModeleBoxes
+{
+	public $boxcode = "FunnelOfProspection";
+	public $boximg = "object_projectpub";
+	public $boxlabel = "BoxFunnelOfProspection";
+	public $depends = array("projet");
+
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
+
+	public $param;
+
+	public $info_box_head = array();
+	public $info_box_contents = array();
+
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param = '')
+	{
+		global $user, $langs, $conf;
+
+		// Load translation files required by the page
+		$langs->loadLangs(array('boxes', 'projects'));
+
+		$this->db = $db;
+
+		$this->hidden = !($user->rights->projet->lire);
+	}
+
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @param   int		$max        Maximum number of records to load
+	 *  @return  void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf;
+		include DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php';
+		$listofoppstatus = array();
+		$listofopplabel = array();
+		$listofoppcode = array();
+		$colorseriesstat = array();
+		$sql = "SELECT cls.rowid, cls.code, cls.percent, cls.label";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "c_lead_status as cls";
+		$sql .= " WHERE active=1";
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+
+			while ($i < $num) {
+				$objp = $this->db->fetch_object($resql);
+				$listofoppstatus[$objp->rowid] = $objp->percent;
+				$listofopplabel[$objp->rowid] = $objp->label;
+				$listofoppcode[$objp->rowid] = $objp->code;
+				switch ($objp->code) {
+					case 'PROSP':
+						$colorseriesstat[$objp->rowid] = "-" . $badgeStatus0;
+						break;
+					case 'QUAL':
+						$colorseriesstat[$objp->rowid] = "-" . $badgeStatus1;
+						break;
+					case 'PROPO':
+						$colorseriesstat[$objp->rowid] = $badgeStatus1;
+						break;
+					case 'NEGO':
+						$colorseriesstat[$objp->rowid] = $badgeStatus4;
+						break;
+					case 'LOST':
+						$colorseriesstat[$objp->rowid] = $badgeStatus9;
+						break;
+					case 'WON':
+						$colorseriesstat[$objp->rowid] = $badgeStatus6;
+						break;
+					default:
+						$colorseriesstat[$objp->rowid] = $badgeStatus2;
+						break;
+				}
+				$i++;
+			}
+		} else dol_print_error($this->db);
+
+		global $conf, $user, $langs;
+
+		$this->max = $max;
+
+		$this->info_box_head = array(
+			'text' => $langs->trans("Statistics") . ' - ' . $langs->trans("OpportunitiesStatusForOpenedProjects"),
+			$max
+		);
+
+		if ($user->rights->projet->lire || !empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+			$sql = "SELECT p.fk_opp_status as opp_status, cls.code, COUNT(p.rowid) as nb, SUM(p.opp_amount) as opp_amount, SUM(p.opp_amount * p.opp_percent) as ponderated_opp_amount";
+			$sql .= " FROM " . MAIN_DB_PREFIX . "projet as p, " . MAIN_DB_PREFIX . "c_lead_status as cls";
+			$sql .= " WHERE p.entity IN (" . getEntity('project') . ")";
+			$sql .= " AND p.fk_opp_status = cls.rowid";
+			$sql .= " AND p.fk_statut = 1"; // Opend projects only
+			$sql .= " GROUP BY p.fk_opp_status, cls.code";
+			$resql = $this->db->query($sql);
+
+			$form = new Form($ths->db);
+			if ($resql) {
+				$num = $this->db->num_rows($resql);
+				$i = 0;
+
+				$totalnb = 0;
+				$totaloppnb = 0;
+				$totalamount = 0;
+				$ponderated_opp_amount = 0;
+				$valsnb = array();
+				$valsamount = array();
+				$dataseries = array();
+
+				while ($i < $num) {
+					$obj = $this->db->fetch_object($resql);
+					if ($obj) {
+						$valsnb[$obj->opp_status] = $obj->nb;
+						$valsamount[$obj->opp_status] = $obj->opp_amount;
+						$totalnb += $obj->nb;
+						if ($obj->opp_status) $totaloppnb += $obj->nb;
+						if (!in_array($obj->code, array('WON', 'LOST'))) {
+							$totalamount += $obj->opp_amount;
+							$ponderated_opp_amount += $obj->ponderated_opp_amount;
+						}
+					}
+					$i++;
+				}
+				$this->db->free($resql);
+				$ponderated_opp_amount = $ponderated_opp_amount / 100;
+
+				$stringtoprint = '';
+				$stringtoprint .= '<div class="div-table-responsive-no-min ">';
+				$listofstatus = array_keys($listofoppstatus);
+				foreach ($listofstatus as $status) {
+					$labelStatus = '';
+
+					$code = dol_getIdFromCode($this->db, $status, 'c_lead_status', 'rowid', 'code');
+					if ($code) $labelStatus = $langs->transnoentitiesnoconv("OppStatus" . $code);
+					if (empty($labelStatus)) $labelStatus = $listofopplabel[$status];
+
+					$dataseries[] = array($labelStatus, (isset($valsamount[$status]) ? (float) $valsamount[$status] : 0));
+					if (!$conf->use_javascript_ajax) {
+						$stringtoprint .= '<tr class="oddeven">';
+						$stringtoprint .= '<td>' . $labelStatus . '</td>';
+						$stringtoprint .= '<td class="right"><a href="list.php?statut=' . $status . '">' . price((isset($valsamount[$status]) ? (float) $valsamount[$status] : 0), 0, '', 1, -1, -1, $conf->currency) . '</a></td>';
+						$stringtoprint .= "</tr>\n";
+					}
+				}
+				if ($conf->use_javascript_ajax) {
+					include_once DOL_DOCUMENT_ROOT . '/core/class/dolgraph.class.php';
+					$dolgraph = new DolGraph();
+					$dolgraph->SetData($dataseries);
+					$dolgraph->SetDataColor(array_values($colorseriesstat));
+					$dolgraph->setShowLegend(2);
+					$dolgraph->setShowPercent(1);
+					$dolgraph->SetType(array('pie'));
+					$dolgraph->SetHeight('200');
+					$dolgraph->draw('idgraphstatus');
+					$stringtoprint .= $dolgraph->show($totaloppnb ? 0 : 1);
+				}
+				$stringtoprint .= '</div>';
+
+				$line = 0;
+				$this->info_box_contents[$line][] = array(
+					'tr' => 'class="nohover left "',
+					'text' => ''
+				);
+				$this->info_box_contents[$line][] = array(
+					'tr' => 'class="nohover left "',
+					'text' => ''
+				);
+				$line++;
+				$this->info_box_contents[$line][] = array(
+					'tr' => '',
+					'td' => 'class="center nopaddingleftimp nopaddingrightimp" colspan="2"',
+					'text' => $stringtoprint
+				);
+				$line++;
+				$this->info_box_contents[$line][] = array(
+					'tr' => 'class="oddeven"',
+					'td' => 'class="left "',
+					'maxlength' => 500,
+					'text' => $langs->trans("OpportunityTotalAmount") . ' (' . $langs->trans("WonLostExcluded") . ')'
+				);
+				$this->info_box_contents[$line][] = array(
+					'tr' => 'class="oddeven"',
+					'td' => 'class="right "',
+					'maxlength' => 500,
+					'text' => price($totalamount, 0, '', 1, -1, -1, $conf->currency)
+				);
+				$line++;
+				$this->info_box_contents[$line][] = array(
+					'tr' => 'class="oddeven"',
+					'td' => 'class="left "',
+					'maxlength' => 500,
+					'text' => $form->textwithpicto($langs->trans("OpportunityPonderatedAmount").' ('.$langs->trans("WonLostExcluded").')', $langs->trans("OpportunityPonderatedAmountDesc"), 1)
+
+				);
+				$this->info_box_contents[$line][] = array(
+					'td' => 'class="right "',
+					'maxlength' => 500,
+					'text' => price(price2num($ponderated_opp_amount, 'MT'), 0, '', 1, -1, -1, $conf->currency)
+				);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => 'class="center opacitymedium"',
+					'text' => $langs->trans("NoRecordedCustomers")
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => '',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
+
+	/**
+	 *	Method to show box
+	 *
+	 *	@param	array	$head       Array with properties of box title
+	 *	@param  array	$contents   Array with properties of box lines
+	 *  @param	int		$nooutput	No $stringtoprint .=, only return string
+	 *	@return	string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
+}
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index af6398c7a6d..fcd3e2e1e22 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -146,6 +146,8 @@ class modProjet extends DolibarrModules
 		$r++;
 		$this->boxes[$r][1] = "box_validated_projects.php";
 		$r++;
+		$this->boxes[$r][1] = "box_funnel_of_prospection.php";
+		$r++;
 
 		// Permissions
 		$this->rights = array();

From 409b73fe2c16fd1568e275cf0a9f8b1c09c303d6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 2 Dec 2020 15:16:04 +0100
Subject: [PATCH 085/888] FIX #15582

---
 .../box_customers_outstanding_bill_reached.php     | 14 ++++++++------
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql   |  1 +
 htdocs/langs/en_US/boxes.lang                      |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
index 24690895ff5..f4f4d5015cc 100644
--- a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
+++ b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
@@ -106,7 +106,7 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
 			$sql .= " AND s.outstanding_limit > 0";
 			$sql .= " AND s.rowid IN (SELECT fk_soc from ".MAIN_DB_PREFIX."facture as f WHERE f.fk_statut = 1 and f.fk_soc = s.rowid)";
 			$sql .= " ORDER BY s.tms DESC";
-			$sql .= $this->db->plimit($max, 0);
+			//$sql .= $this->db->plimit($max, 0);
 
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
 			$result = $this->db->query($sql);
@@ -114,10 +114,13 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
 			{
 				$num = $this->db->num_rows($result);
 
+				$nboutstandingbillreachedcustomers = 0;
+
 				$line = 0;
 				while ($line < $num)
 				{
 					$objp = $this->db->fetch_object($result);
+
 					$datec = $this->db->jdate($objp->datec);
 					$datem = $this->db->jdate($objp->tms);
 					$thirdpartystatic->id = $objp->socid;
@@ -136,22 +139,21 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
 					$outstandingtotal = $thirdpartystatic->getOutstandingBills()['opened'];
 					$outstandinglimit = $thirdpartystatic->outstanding_limit;
 
-					$nboutstandingbillreachedcustomers = 0;
-
 					if ($outstandingtotal >= $outstandinglimit)
 					{
-						$this->info_box_contents[$line][] = array(
+						$this->info_box_contents[$nboutstandingbillreachedcustomers][] = array(
 							'td' => '',
-							'text' => $thirdpartystatic->getNomUrl(1),
+							'text' => $thirdpartystatic->getNomUrl(1, 'customer'),
 							'asis' => 1,
 						);
 
-						$this->info_box_contents[$line][] = array(
+						$this->info_box_contents[$nboutstandingbillreachedcustomers][] = array(
 							'td' => 'class="right" width="18"',
 							'text' => $thirdpartystatic->LibStatut($objp->status, 3)
 						);
 						$nboutstandingbillreachedcustomers++;
 					}
+
 					$line++;
 				}
 
diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index 18802301e5a..7d3118fe891 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -542,3 +542,4 @@ CREATE TABLE llx_session(
   user_agent varchar(128) NULL
 )ENGINE=innodb;
 
+INSERT INTO llx_boxes_def(file, entity) VALUES ('box_customers_outstanding_bill_reached', 1);
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index 75f8eb14f49..502a3642afe 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -46,7 +46,7 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
-BoxTitleLastOutstandingBillReached=Latest %s customers with maximum outstanding exceeded
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers

From ea1c55cf1e1ce149c42176c30822f2c88560816e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 2 Dec 2020 15:16:20 +0100
Subject: [PATCH 086/888] Fix widgets that has disappeared

---
 htdocs/core/boxes/box_last_modified_ticket.php | 2 +-
 htdocs/core/boxes/box_last_ticket.php          | 2 +-
 htdocs/core/boxes/box_lastlogin.php            | 2 +-
 htdocs/index.php                               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/boxes/box_last_modified_ticket.php b/htdocs/core/boxes/box_last_modified_ticket.php
index 2950eb9cfd8..94734894ad7 100644
--- a/htdocs/core/boxes/box_last_modified_ticket.php
+++ b/htdocs/core/boxes/box_last_modified_ticket.php
@@ -204,6 +204,6 @@ class box_last_modified_ticket extends ModeleBoxes
 	 */
 	public function showBox($head = null, $contents = null, $nooutput = 0)
 	{
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_last_ticket.php b/htdocs/core/boxes/box_last_ticket.php
index 9ada300901c..268a6861524 100644
--- a/htdocs/core/boxes/box_last_ticket.php
+++ b/htdocs/core/boxes/box_last_ticket.php
@@ -202,6 +202,6 @@ class box_last_ticket extends ModeleBoxes
 	 */
 	public function showBox($head = null, $contents = null, $nooutput = 0)
 	{
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_lastlogin.php b/htdocs/core/boxes/box_lastlogin.php
index b45986387a8..c3ddb0fcdff 100644
--- a/htdocs/core/boxes/box_lastlogin.php
+++ b/htdocs/core/boxes/box_lastlogin.php
@@ -111,6 +111,6 @@ class box_lastlogin extends ModeleBoxes
 	 */
 	public function showBox($head = null, $contents = null, $nooutput = 0)
 	{
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/index.php b/htdocs/index.php
index 887baa04e78..33fd93e649e 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -888,7 +888,7 @@ print '<div class="fichecenter fichecenterbis">';
 
 
 /*
- * Show boxes
+ * Show widgets (boxes)
  */
 
 $boxlist .= '<div class="twocolumns">';

From 5bdd52500d5255ff2fa0f79d08106be1b949b016 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 2 Dec 2020 15:47:56 +0100
Subject: [PATCH 087/888] Fix warning

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

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 38c6479d0f2..73c41aeb782 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3241,7 +3241,7 @@ class Societe extends CommonObject
 			// si son index (position dans la chaîne en commence à 0 au premier caractère) est impair
 			// on double sa valeur et si cette dernière est supérieure à 9, on lui retranche 9
 			// on ajoute cette valeur à la somme totale
-
+			$sum = 0;
 			for ($index = 0; $index < 9; $index++)
 			{
 				$number = (int) $chaine[$index];
@@ -3266,7 +3266,7 @@ class Societe extends CommonObject
 			// si son index (position dans la chaîne en commence à 0 au premier caractère) est pair
 			// on double sa valeur et si cette dernière est supérieure à 9, on lui retranche 9
 			// on ajoute cette valeur à la somme totale
-
+			$sum = 0;
 			for ($index = 0; $index < 14; $index++)
 			{
 				$number = (int) $chaine[$index];
@@ -3343,10 +3343,6 @@ class Societe extends CommonObject
 			$string = trim($this->idprof1);
 			$string = preg_replace('/(\s)/', '', $string);
 
-			for ($i = 0; $i < 9; $i++) {
-				$num[$i] = substr($string, $i, 1);
-			}
-
 			//Check NIF
 			if (preg_match('/(^[0-9]{9}$)/', $string)) {
 				return 1;

From 8a86593b13d5f6bd5d2d86748e1f5a52ade29bd8 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Wed, 2 Dec 2020 16:24:01 +0100
Subject: [PATCH 088/888] Fix a bug in bank's graph with option and mode

---
 htdocs/compta/bank/graph.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index 524877746f8..f4fa779fd7d 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -771,11 +771,11 @@ print '<table class="notopnoleftnoright" width="100%">';
 print '<tr><td class="right">'.$morehtml.' &nbsp; &nbsp; ';
 if ($mode == 'showalltime')
 {
-	print '<a href="'.$_SERVER["PHP_SELF"].'?account='.$account.'">';
+	print '<a href="'.$_SERVER["PHP_SELF"].'?account='.$account.(GETPOST("option") != 'all' ? '' : '&option=all').'">';
 	print $langs->trans("GoBack");
 	print '</a>';
 } else {
-	print '<a href="'.$_SERVER["PHP_SELF"].'?mode=showalltime&account='.$account.'">';
+	print '<a href="'.$_SERVER["PHP_SELF"].'?mode=showalltime&account='.$account.(GETPOST("option") != 'all' ? '' : '&option=all').'">';
 	print $langs->trans("ShowAllTimeBalance");
 	print '</a>';
 }
@@ -793,7 +793,7 @@ if ($mode == 'standard')
 	if ($nextmonth > 12) { $nextmonth = 1; $nextyear++; }
 
 	// For month
-	$link = "<a href='".$_SERVER["PHP_SELF"]."?account=".$account.(GETPOST("option") != 'all' ? '' : '&option=all')."&year=".$prevyear."&month=".$prevmonth."'>".img_previous('', 'class="valignbottom"')."</a> ".$langs->trans("Month")." <a href='".$_SERVER["PHP_SELF"]."?account=".$account."&year=".$nextyear."&month=".$nextmonth."'>".img_next('', 'class="valignbottom"')."</a>";
+	$link = "<a href='".$_SERVER["PHP_SELF"]."?account=".$account.(GETPOST("option") != 'all' ? '' : '&option=all')."&year=".$prevyear."&month=".$prevmonth."'>".img_previous('', 'class="valignbottom"')."</a> ".$langs->trans("Month")." <a href='".$_SERVER["PHP_SELF"]."?account=".$account.(GETPOST("option") != 'all' ? '' : '&option=all')."&year=".$nextyear."&month=".$nextmonth."'>".img_next('', 'class="valignbottom"')."</a>";
 	print '<div class="right clearboth">'.$link.'</div>';
 
 	print '<div class="center clearboth margintoponly">';
@@ -807,7 +807,7 @@ if ($mode == 'standard')
 
 	// For year
 	$prevyear = $year - 1; $nextyear = $year + 1;
-	$link = "<a href='".$_SERVER["PHP_SELF"]."?account=".$account.(GETPOST("option") != 'all' ? '' : '&option=all')."&year=".($prevyear)."'>".img_previous('', 'class="valignbottom"')."</a> ".$langs->trans("Year")." <a href='".$_SERVER["PHP_SELF"]."?account=".$account."&year=".($nextyear)."'>".img_next('', 'class="valignbottom"')."</a>";
+	$link = "<a href='".$_SERVER["PHP_SELF"]."?account=".$account.(GETPOST("option") != 'all' ? '' : '&option=all')."&year=".($prevyear)."'>".img_previous('', 'class="valignbottom"')."</a> ".$langs->trans("Year")." <a href='".$_SERVER["PHP_SELF"]."?account=".$account.(GETPOST("option") != 'all' ? '' : '&option=all')."&year=".($nextyear)."'>".img_next('', 'class="valignbottom"')."</a>";
 
 	print '<div class="right clearboth margintoponly">'.$link.'</div>';
 

From 9e18997e64ec3b4ef7ec360c1cf17a67c9dd8331 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 2 Dec 2020 16:35:43 +0100
Subject: [PATCH 089/888] FIX #15595

---
 htdocs/compta/facture/card-rec.php       | 14 ++++++++++++--
 htdocs/compta/facture/card.php           |  2 +-
 htdocs/core/class/commonobject.class.php |  6 +++++-
 htdocs/langs/en_US/errors.lang           |  1 +
 htdocs/langs/fr_FR/errors.lang           |  1 +
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 4f754fbd173..11dec142a17 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -117,6 +117,8 @@ $usercancreatewithdrarequest = $user->rights->prelevement->bons->creer;
 
 $now = dol_now();
 
+$error = 0;
+
 
 /*
  * Actions
@@ -287,13 +289,21 @@ if (empty($reshook))
 	elseif ($action == 'setref' && $user->rights->facture->creer)
 	{
 		//var_dump(GETPOST('ref', 'alpha'));exit;
-		$result = $object->setValueFrom('titre', GETPOST('ref', 'alpha'), '', null, 'text', '', $user, 'BILLREC_MODIFY');
+		$result = $object->setValueFrom('titre', $ref, '', null, 'text', '', $user, 'BILLREC_MODIFY');
 		if ($result > 0)
 		{
 			$object->titre = GETPOST('ref', 'alpha'); // deprecated
 			$object->title = GETPOST('ref', 'alpha');
 			$object->ref = $object->title;
-		} else dol_print_error($db, $object->error, $object->errors);
+		} else {
+			$error++;
+			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				$langs->load("errors");
+				setEventMessages($langs->trans('ErrorRefAlreadyExists', $ref), null, 'errors');
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
 	} // Set bank account
 	elseif ($action == 'setbankaccount' && $user->rights->facture->creer)
 	{
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index def74e173a3..110db6d8166 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4074,7 +4074,7 @@ if ($action == 'create')
 	print $object->getLibType();
 	print '</span>';
 	if ($object->module_source) {
-		print ' <span class="opacitymediumbycolor paddingleft">('.$langs->trans("POS").' '.$object->module_source.' - '.$langs->trans("Terminal").' '.$object->pos_source.')</span>';
+		print ' <span class="opacitymediumbycolor paddingleft">('.$langs->trans("POS").' '.ucfirst($object->module_source).' - '.$langs->trans("Terminal").' '.$object->pos_source.')</span>';
 	}
 	if ($object->type == Facture::TYPE_REPLACEMENT) {
 		$facreplaced = new Facture($db);
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 243d4d57f7c..ec03bb66524 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1817,7 +1817,11 @@ abstract class CommonObject
 				return -2;
 			}
 		} else {
-			$this->error = $this->db->lasterror();
+			if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				$this->error = 'DB_ERROR_RECORD_ALREADY_EXISTS';
+			} else {
+				$this->error = $this->db->lasterror();
+			}
 			$this->db->rollback();
 			return -1;
 		}
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 255bce66531..2413e6d76ba 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -8,6 +8,7 @@ ErrorBadEMail=Email %s is wrong
 ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 97d3e48f512..abd1c6ec9f9 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -7,6 +7,7 @@ ErrorButCommitIsDone=Erreurs trouvées mais on valide malgré tout
 ErrorBadEMail=email %s invalide
 ErrorBadUrl=Url %s invalide
 ErrorBadValueForParamNotAString=Mauvaise valeur de paramètre. Ceci arrive lors d'une tentative de traduction d'une clé non renseignée.
+ErrorRefAlreadyExists=La référence %s existe déjà.
 ErrorLoginAlreadyExists=L'identifiant %s existe déjà.
 ErrorGroupAlreadyExists=Le groupe %s existe déjà.
 ErrorRecordNotFound=Enregistrement non trouvé.

From 6440dcbd93787a090ddf938edab17dcf4a9c0b57 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 Dec 2020 18:21:13 +0100
Subject: [PATCH 090/888] doxygen

---
 htdocs/zapier/class/hook.class.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index 8e6d3fa725f..5d5a9c84eda 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -212,9 +212,14 @@ class Hook extends CommonObject
 	public $label;
 
 	/**
-	 * @var string amount
+	 * @var string url of webhook
 	 */
-	public $amount;
+	public $url;
+
+	/**
+	 * @var int ID of user owner webhook
+	 */
+	public $fk_user;
 
 	/**
 	 * @var int Status

From a2dca42965f1f64c6d32699bd7302d1863b71d7e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 2 Dec 2020 18:55:55 +0100
Subject: [PATCH 091/888] Revert "Create/Edit extra-field with multi-line text
 area for computed value"

---
 htdocs/core/tpl/admin_extrafields_add.tpl.php  | 7 ++-----
 htdocs/core/tpl/admin_extrafields_edit.tpl.php | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index fca100b2e07..6c25b5c07b5 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -180,14 +180,11 @@ $langs->load("modulebuilder");
 <!-- Language file -->
 <tr><td class="titlefield"><?php echo $langs->trans("LanguageFile"); ?></td><td class="valeur"><input type="text" id="langfile" name="langfile" class="minwidth200" value="<?php echo dol_escape_htmltag(GETPOST('langfile', 'alpha')); ?>"></td></tr>
 <!-- Computed Value -->
-<tr class="extra_computed_value">
 <?php if (empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS)) { ?>
-	<td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?></td>
+	<tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?></td><td class="valeur"><input id="computed_value" type="text" name="computed_value" class="quatrevingtpercent" value="<?php echo (GETPOST('computed_value', 'none') ?GETPOST('computed_value', 'none') : ''); ?>"></td></tr>
 <?php } else { ?>
-	<td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc")).$form->textwithpicto($langs->trans("Computedpersistent"), $langs->trans("ComputedpersistentDesc"), 1, 'warning'); ?></td>
+	<tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc")).$form->textwithpicto($langs->trans("Computedpersistent"), $langs->trans("ComputedpersistentDesc"), 1, 'warning'); ?></td><td class="valeur"><input id="computed_value" class="quatrevingtpercent" type="text" name="computed_value" value="<?php echo dol_escape_htmltag($computed); ?>"></td></tr>
 <?php } ?>
-<td class="valeur"><textarea name="computed_value" id="computed_value" class="quatrevingtpercent" rows="<?php echo ROWS_4 ?>"><?php echo (GETPOST('computed_value', 'none') ?GETPOST('computed_value', 'none') : ''); ?></textarea></td>
-</tr>
 <!-- Default Value (at sql setup level) -->
 <tr class="extra_default_value"><td><?php echo $langs->trans("DefaultValue").' ('.$langs->trans("Database").')'; ?></td><td class="valeur"><input id="default_value" type="text" name="default_value" size="5" value="<?php echo (GETPOST('default_value', 'alpha') ?GETPOST('default_value', 'alpha') : ''); ?>"></td></tr>
 <!-- Unique -->
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index 3af89dcede5..191b4cf40c8 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -263,14 +263,11 @@ else
 <tr><td class="titlefield"><?php echo $langs->trans("LanguageFile"); ?></td><td class="valeur"><input type="text" name="langfile" class="minwidth200" value="<?php echo dol_escape_htmltag($langfile); ?>"></td></tr>
 
 <!-- Computed value -->
-<tr class="extra_computed_value">
 <?php if (empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS)) { ?>
-	<td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?></td>
+	<tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?></td><td class="valeur"><input id="computed_value" class="quatrevingtpercent" type="text" name="computed_value" value="<?php echo dol_escape_htmltag($computed); ?>"></td></tr>
 <?php } else { ?>
-	<td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc")).$form->textwithpicto($langs->trans("Computedpersistent"), $langs->trans("ComputedpersistentDesc"), 1, 'warning'); ?></td>
+	<tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc")).$form->textwithpicto($langs->trans("Computedpersistent"), $langs->trans("ComputedpersistentDesc"), 1, 'warning'); ?></td><td class="valeur"><input id="computed_value" class="quatrevingtpercent" type="text" name="computed_value" value="<?php echo dol_escape_htmltag($computed); ?>"></td></tr>
 <?php } ?>
-<td class="valeur"><textarea name="computed_value" id="computed_value" class="quatrevingtpercent" rows="<?php echo ROWS_4 ?>"><?php echo dol_htmlcleanlastbr($computed); ?></textarea></td>
-</tr>
 
 <!-- Default Value (at sql setup level) -->
 <tr class="extra_default_value"><td><?php echo $langs->trans("DefaultValue").' ('.$langs->trans("Database").')'; ?></td><td class="valeur"><input id="default_value" type="text" name="default_value" size="5" value="<?php echo dol_escape_htmltag($default); ?>"></td></tr>

From d88173d7baceaa66646c92420aa390636fefce6d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 2 Dec 2020 19:13:32 +0100
Subject: [PATCH 092/888] Fix bad column

---
 htdocs/core/class/commonobject.class.php           | 2 +-
 htdocs/install/mysql/tables/llx_c_input_reason.sql | 2 ++
 htdocs/projet/card.php                             | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index ec03bb66524..33ac1aba696 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6889,7 +6889,7 @@ abstract class CommonObject
 						$helptoshow = $langs->trans($extrafields->attributes[$this->table_element]['help'][$key]);
 
 						$out .= '<tr '.($html_id ? 'id="'.$html_id.'" ' : '').$csstyle.' class="'.$class.$this->element.'_extras_'.$key.' trextrafields_collapse'.$extrafields_collapse_num.'" '.$domData.' >';
-						if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+						if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER) && $action == 'view') {
 							$out .= '<td></td>';
 						}
 						$out .= '<td class="wordbreak';
diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.sql b/htdocs/install/mysql/tables/llx_c_input_reason.sql
index d82e39eb6f5..dba58dbbecc 100644
--- a/htdocs/install/mysql/tables/llx_c_input_reason.sql
+++ b/htdocs/install/mysql/tables/llx_c_input_reason.sql
@@ -17,6 +17,8 @@
 --
 -- ========================================================================
 
+--  This is the dictionary of sales orders origin
+
 create table llx_c_input_reason
 (
   rowid		integer AUTO_INCREMENT PRIMARY KEY,
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 771998fbb6c..d0c507617e6 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -672,7 +672,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 	print $hookmanager->resPrint;
 	if (empty($reshook))
 	{
-		print $object->showOptionals($extrafields, 'edit');
+		print $object->showOptionals($extrafields, 'create');
 	}
 
 	print '</table>';

From 8ace020ba8331c1754acebd57135ab18d9b635ae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 2 Dec 2020 19:16:42 +0100
Subject: [PATCH 093/888] Update api_setup.class.php

---
 htdocs/api/class/api_setup.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 9045626bde4..02bb5afbafd 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -112,7 +112,7 @@ class Setup extends DolibarrApi
 	}
 
     /**
-     * Get the list of ordering reasons.
+     * Get the list of ordering origins.
      *
      * @param string    $sortfield  Sort field
      * @param string    $sortorder  Sort order
@@ -121,13 +121,13 @@ class Setup extends DolibarrApi
      * @param int       $active     Payment type is active or not {@min 0} {@max 1}
      * @param string    $sqlfilters SQL criteria to filter with. Syntax example "(t.code:=:'OrderByWWW')"
      *
-     * @url     GET dictionary/ordering_reasons
+     * @url     GET dictionary/ordering_origins
      *
      * @return array [List of ordering reasons]
      *
      * @throws RestException 400
      */
-    public function getOrderingReasons($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+    public function getOrderingOrigins($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
     {
         $list = array();
 

From bc1dc1e9f01aafb109858533c54c3a67578bf92a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 2 Dec 2020 19:34:04 +0100
Subject: [PATCH 094/888] FIX #15590 manually

---
 htdocs/core/modules/modProduct.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 87f11decb5e..b029448cd58 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -194,7 +194,7 @@ class modProduct extends DolibarrModules
 		);
 		if (is_object($mysoc) && $mysoc->useNPR()) $this->export_fields_array[$r]['p.recuperableonly'] = 'NPR';
 		if (!empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.cost_price'=>'CostPrice'));
-		if (!empty($conf->stock->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.stock'=>'Stock', 'p.seuil_stock_alerte'=>'StockLimit', 'p.desiredstock'=>'DesiredStock', 'p.pmp'=>'PMPValue'));
+		if (!empty($conf->stock->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.tobatch'=>'ManageLotSerial', 'p.stock'=>'Stock', 'p.seuil_stock_alerte'=>'StockLimit', 'p.desiredstock'=>'DesiredStock', 'p.pmp'=>'PMPValue'));
 		if (!empty($conf->barcode->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode'=>'BarCode'));
 		$keyforselect = 'product'; $keyforelement = 'product'; $keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
@@ -216,7 +216,7 @@ class modProduct extends DolibarrModules
 			'p.price_base_type'=>"Text", 'p.price'=>"Numeric", 'p.price_ttc'=>"Numeric", 'p.tva_tx'=>'Numeric',
 			'p.datec'=>'Date', 'p.tms'=>'Date'
 		);
-		if (!empty($conf->stock->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.stock'=>'Numeric', 'p.seuil_stock_alerte'=>'Numeric', 'p.desiredstock'=>'Numeric', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric'));
+		if (!empty($conf->stock->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.tobatch'=>'Numeric', 'p.stock'=>'Numeric', 'p.seuil_stock_alerte'=>'Numeric', 'p.desiredstock'=>'Numeric', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric'));
 		if (!empty($conf->barcode->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode'=>'Text'));
 		if (!empty($conf->fournisseur->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('s.nom'=>'Text', 'pf.ref_fourn'=>'Text', 'pf.unitprice'=>'Numeric', 'pf.quantity'=>'Numeric', 'pf.remise_percent'=>'Numeric', 'pf.delivery_time_days'=>'Numeric'));
 		if (!empty($conf->global->MAIN_MULTILANGS)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('l.lang'=>'Text', 'l.label'=>'Text', 'l.description'=>'Text', 'l.note'=>'Text'));
@@ -559,6 +559,7 @@ class modProduct extends DolibarrModules
         );
         //clauses copied from import_fields_array
         if (!empty($conf->stock->enabled)) $import_sample = array_merge($import_sample, array(
+        		'p.tobatch'=>"0 (don't use) / 1 (use batch/serial number)",
                 'p.seuil_stock_alerte' => '',
                 'p.pmp' => '0',
                 'p.desiredstock' => ''

From 46171a6ec8eb434c139e6130582c0ba3d0b39b11 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 2 Dec 2020 21:27:15 +0100
Subject: [PATCH 095/888] Fix option MAIN_USE_COMPANY_NAME_OF_CONTACT

---
 .../modules/bom/doc/doc_generic_bom_odt.modules.php |  7 ++++---
 .../commande/doc/doc_generic_order_odt.modules.php  |  8 ++++----
 .../modules/commande/doc/pdf_einstein.modules.php   |  5 ++---
 .../commande/doc/pdf_eratosthene.modules.php        |  3 +--
 .../doc/doc_generic_contract_odt.modules.php        |  5 ++---
 .../modules/contract/doc/pdf_strato.modules.php     |  5 ++---
 .../core/modules/delivery/doc/pdf_storm.modules.php |  5 ++---
 .../modules/delivery/doc/pdf_typhon.modules.php     |  5 ++---
 .../doc/doc_generic_shipment_odt.modules.php        |  7 +++----
 .../modules/expedition/doc/pdf_espadon.modules.php  |  5 ++---
 .../modules/expedition/doc/pdf_merou.modules.php    |  3 +--
 .../modules/expedition/doc/pdf_rouget.modules.php   |  5 ++---
 .../facture/doc/doc_generic_invoice_odt.modules.php |  5 ++---
 .../core/modules/facture/doc/pdf_crabe.modules.php  |  5 ++---
 .../core/modules/facture/doc/pdf_sponge.modules.php |  5 ++---
 .../modules/fichinter/doc/pdf_soleil.modules.php    |  5 ++---
 .../member/doc/doc_generic_member_odt.class.php     |  3 +--
 .../modules/mrp/doc/doc_generic_mo_odt.modules.php  |  9 ++++-----
 .../product/doc/doc_generic_product_odt.modules.php |  6 ++----
 .../doc/doc_generic_proposal_odt.modules.php        |  6 +++---
 .../core/modules/propale/doc/pdf_azur.modules.php   |  5 ++---
 .../core/modules/propale/doc/pdf_cyan.modules.php   |  5 ++---
 .../doc/doc_generic_reception_odt.modules.php       | 13 ++++++++-----
 .../modules/reception/doc/pdf_squille.modules.php   |  5 ++---
 .../stock/doc/doc_generic_stock_odt.modules.php     |  3 +--
 .../supplier_invoice/doc/pdf_canelle.modules.php    |  5 ++---
 .../doc/doc_generic_supplier_order_odt.modules.php  |  6 +++---
 .../supplier_order/doc/pdf_cornas.modules.php       |  5 ++---
 .../supplier_order/doc/pdf_muscadet.modules.php     |  5 ++---
 .../doc_generic_supplier_proposal_odt.modules.php   |  9 +++------
 .../supplier_proposal/doc/pdf_aurore.modules.php    | 13 ++++++++-----
 .../user/doc/doc_generic_user_odt.modules.php       |  6 +++---
 .../doc/doc_generic_usergroup_odt.modules.php       |  6 +++---
 .../doc/doc_generic_myobject_odt.modules.php        |  6 +++---
 .../mymodule/doc/pdf_standard_myobject.modules.php  |  2 +-
 ...c_generic_recruitmentjobposition_odt.modules.php |  6 +++---
 .../pdf_standard_recruitmentjobposition.modules.php |  2 +-
 37 files changed, 94 insertions(+), 115 deletions(-)

diff --git a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
index 750f1a7ab39..b5e1fc80a1d 100644
--- a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
+++ b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
@@ -294,10 +294,11 @@ class doc_generic_bom_odt extends ModelePDFBom
 				if (!empty($usecontact))
 				{
 					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else {
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+						$socobject = $object->contact;
+					} else {
 						$socobject = $object->thirdparty;
-			   			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+			   			// if we have a CUSTOMER contact and we dont use as recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index eb2c8121397..3165760b541 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -305,11 +305,11 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				$contactobject = null;
 				if (!empty($usecontact))
 				{
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else {
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+						$socobject = $object->contact;
+					} else {
 						$socobject = $object->thirdparty;
-			   			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+						// if we have a CUSTOMER contact and we dont use as recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 3536daab5eb..5a0bbc30327 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -1446,9 +1446,8 @@ class pdf_einstein extends ModelePDFCommandes
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 7fda31f4c71..97354c5c266 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -1628,8 +1628,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			}
 
 			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
index 7a0b1f91109..edad675857f 100644
--- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
+++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
@@ -291,12 +291,11 @@ class doc_generic_contract_odt extends ModelePDFContract
 				// Recipient name
 				$contactobject = null;
 				if (!empty($usecontact)) {
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 						$socobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
-						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+						// if we have a CUSTOMER contact and we dont use as recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index 08fefaf5634..e28cd62efae 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -711,9 +711,8 @@ class pdf_strato extends ModelePDFContract
 
 			$this->recipient = $object->thirdparty;
 
-			//Recipient name
-			// You can use the name of the contact company
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
diff --git a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
index e6da731fb21..d6376e6cd17 100644
--- a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
@@ -860,9 +860,8 @@ class pdf_storm extends ModelePDFDeliveryOrder
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
diff --git a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
index 8b7c899af91..3b8baa107ad 100644
--- a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
@@ -850,9 +850,8 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
index 039ef128cd7..254bb5bf377 100644
--- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
+++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
@@ -304,12 +304,11 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				// Recipient name
 				$contactobject = null;
 				if (!empty($usecontact)) {
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 						$socobject = $object->contact;
-					else {
+					} else {
 						$socobject = $object->thirdparty;
-						// if we have a SHIIPPING contact and we dont use it as recipient we store the contact object for later use
+						// if we have a SHIPPING contact and we dont use as recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index a48e28ecef6..5cdeaa693a7 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -1020,9 +1020,8 @@ class pdf_espadon extends ModelePdfExpedition
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// You can use the name of the contact company
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index be163ea4c18..f530121ec08 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -678,8 +678,7 @@ class pdf_merou extends ModelePdfExpedition
 		}
 
 		// Recipient name
-		// You can use the name of the contact company
-		if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+		if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 			$thirdparty = $object->contact;
 		} else {
 			$thirdparty = $object->thirdparty;
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index 8b0dd134d65..a43c6aba352 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -1054,9 +1054,8 @@ class pdf_rouget extends ModelePdfExpedition
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index 1d4b65fdb32..f2f4ee31823 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -305,10 +305,9 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				// Recipient name
 				$contactobject = null;
 				if (!empty($usecontact)) {
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 						$socobject = $object->contact;
-					else {
+					} else {
 						$socobject = $object->thirdparty;
 						// if we have a BILLING contact and we dont use it as recipient we store the contact object for later use
 						$contactobject = $object->contact;
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 32c58f21eac..f1c90305bef 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1842,9 +1842,8 @@ class pdf_crabe extends ModelePDFFactures
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 66035df58db..4087e3db098 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -2108,9 +2108,8 @@ class pdf_sponge extends ModelePDFFactures
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index c79b2ac4137..622cd0b2250 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -665,9 +665,8 @@ class pdf_soleil extends ModelePDFFicheinter
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
diff --git a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
index 6d2f2772610..be91acd7a3f 100644
--- a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
+++ b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
@@ -280,8 +280,7 @@ class doc_generic_member_odt extends ModelePDFMember
 
 				// Recipient name
 				if (!empty($usecontact)) {
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 						$socobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
diff --git a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
index 84f225dfb6e..eeaeb2c8e54 100644
--- a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
+++ b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
@@ -298,11 +298,10 @@ class doc_generic_mo_odt extends ModelePDFMo
 
 				// Recipient name
 				$contactobject = null;
-				if (!empty($usecontact))
-				{
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else {
+				if (!empty($usecontact)) {
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+						$socobject = $object->contact;
+					} else {
 						$socobject = $object->thirdparty;
 			   			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
 						$contactobject = $object->contact;
diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
index d017a559b37..ef5e97997f9 100644
--- a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
+++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
@@ -315,10 +315,8 @@ class doc_generic_product_odt extends ModelePDFProduct
 
 				// Recipient name
 				$contactobject = null;
-				if (!empty($usecontact))
-				{
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+				if (!empty($usecontact)) {
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 						$socobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index 59df720269b..b27e94b46b7 100644
--- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
+++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
@@ -334,9 +334,9 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				$contactobject = null;
 				if (!empty($usecontact))
 				{
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else {
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+						$socobject = $object->contact;
+					} else {
 						$socobject = $object->thirdparty;
 						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
 						$contactobject = $object->contact;
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index a5a6b850f7f..a889dec7815 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -1618,9 +1618,8 @@ class pdf_azur extends ModelePDFPropales
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 1baf9712cdb..119932949b2 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -1729,9 +1729,8 @@ class pdf_cyan extends ModelePDFPropales
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
diff --git a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
index 45bfabe4b62..1105a5f6d4c 100644
--- a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
+++ b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
@@ -294,11 +294,14 @@ class doc_generic_reception_odt extends ModelePdfReception
 				}
 
 				// Recipient name
-				if (!empty($usecontact))
-				{
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else $socobject = $object->thirdparty;
+				if (!empty($usecontact)) {
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+						$socobject = $object->contact;
+					} else {
+						$socobject = $object->thirdparty;
+						// if we have a BILLING contact and we dont use it as recipient we store the contact object for later use
+						$contactobject = $object->contact;
+					}
 				} else {
 					$socobject = $object->thirdparty;
 				}
diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index 446b03daf0a..8043f9f9ba6 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -944,9 +944,8 @@ class pdf_squille extends ModelePdfReception
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
index 89a5ea9d784..1b3053aaaaf 100644
--- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
+++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
@@ -306,8 +306,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 				$contactobject = null;
 				if (!empty($usecontact))
 				{
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 						$socobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
diff --git a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
index 5e2e4380a0b..7a3ecf88e19 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -1209,9 +1209,8 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// We can use the name of the contact's company
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $mysoc;
diff --git a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
index 37f773783cc..18c3a9a3574 100644
--- a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
@@ -295,9 +295,9 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				$contactobject = null;
 				if (!empty($usecontact))
 				{
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else {
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+						$socobject = $object->contact;
+					} else {
 						$socobject = $object->thirdparty;
 			   			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
 						$contactobject = $object->contact;
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index 0d66fe5b83b..3a4bc56f64a 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -1371,9 +1371,8 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
index bc91d690f36..c8edef0679c 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -1283,9 +1283,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
index b5efe6801ff..918f5fd9215 100644
--- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
@@ -330,15 +330,12 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 
 				// Recipient name
 				$contactobject = null;
-				if (!empty($usecontact))
-				{
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))
-					{
+				if (!empty($usecontact)) {
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 						$socobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
-						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+						// if we have a BILLING contact and we dont use it as recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index 3aafb09aa86..8c82198999a 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -1417,14 +1417,17 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			// Recipient name
 			if (!empty($usecontact))
 			{
-				// On peut utiliser le nom de la societe du contact
-				if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname;
-				else $socname = $object->thirdparty->name;
-				$carac_client_name = $outputlangs->convToOutputCharset($socname);
+				if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+					$socname = $object->contact->socname;
+				} else {
+					$socname = $object->thirdparty->name;
+				}
 			} else {
-				$carac_client_name = $outputlangs->convToOutputCharset($object->thirdparty->name);
+				$socname = $object->thirdparty->name;
 			}
 
+			$carac_client_name = pdfBuildThirdpartyName($socname, $outputlangs);
+
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, 'target', $object);
 
 			// Show recipient
diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
index 771231e6041..2a326282fa0 100644
--- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
+++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
@@ -323,9 +323,9 @@ class doc_generic_user_odt extends ModelePDFUser
 				// Recipient name
 				if (!empty($usecontact))
 				{
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else {
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+						$socobject = $object->contact;
+					} else {
 						$socobject = $object->thirdparty;
 						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
 						$contactobject = $object->contact;
diff --git a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
index 3cbce44511f..6fcc6160a97 100644
--- a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
+++ b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
@@ -314,9 +314,9 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				// Recipient name
 				if (!empty($usecontact))
 				{
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else {
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+						$socobject = $object->contact;
+					} else {
 						$socobject = $object->thirdparty;
 						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
 						$contactobject = $object->contact;
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
index 80b4f4ecb5a..d6cb191a405 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
@@ -299,9 +299,9 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				$contactobject = null;
 				if (!empty($usecontact))
 				{
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else {
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+						$socobject = $object->contact;
+					} else {
 						$socobject = $object->thirdparty;
 						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
 						$contactobject = $object->contact;
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
index e8e39ec2adb..fbab4d53b0f 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
@@ -1091,7 +1091,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 			}
 
 			// Recipient name
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
index 6e9788c2e9f..be36b96682c 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
@@ -299,9 +299,9 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 				$contactobject = null;
 				if (!empty($usecontact))
 				{
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else {
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+						$socobject = $object->contact;
+					} else {
 						$socobject = $object->thirdparty;
 						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
 						$contactobject = $object->contact;
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
index af62344296b..cad6888f7c5 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
@@ -1002,7 +1002,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 			}
 
 			// Recipient name
-			/*if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			/*if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;

From 17d5bb5cd450f659634dbf4e6e79d03a5cd9b8ea Mon Sep 17 00:00:00 2001
From: Florian Mortgat <florian.mortgat@atm-consulting.fr>
Date: Wed, 2 Dec 2020 22:25:08 +0100
Subject: [PATCH 096/888] FIX 12.0 - error when displaying lines on order after
 adding a line if both MAIN_MULTILANGS and MAIN_DISABLE_PDF_AUTOUPDATE are
 activated

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

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 8ba4620b108..2c5157ff228 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -966,6 +966,8 @@ if (empty($reshook))
 						}
 
 						$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+					} else {
+						$object->fetch_thirdparty();
 					}
 
 					unset($_POST['prod_entry_mode']);

From 9137713056a504de874ff6a401ad2206efdd87cc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 3 Dec 2020 00:40:41 +0100
Subject: [PATCH 097/888] Debug v13

---
 htdocs/salaries/card.php         |  29 ++++---
 htdocs/salaries/list.php         |   6 +-
 htdocs/user/class/user.class.php |   4 +-
 htdocs/user/list.php             | 138 ++++++++++++++++---------------
 4 files changed, 90 insertions(+), 87 deletions(-)

diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 487757ad567..7fb8427a517 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2011-2019  Alexandre Spangaro      <aspangaro@open-dsi.fr>
- * Copyright (C) 2014       Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2014-2020  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2015       Charlie BENKE           <charlie@patas-monkey.com>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
@@ -265,7 +265,7 @@ if ($action == 'create')
 	// Date payment
 	print '<tr><td>';
 	print $form->editfieldkey('DatePayment', 'datep', '', $object, 0, 'string', '', 1).'</td><td>';
-	print $form->selectDate((empty($datep) ?-1 : $datep), "datep", '', '', '', 'add', 1, 1);
+	print $form->selectDate((empty($datep) ? '' : $datep), "datep", 0, 0, 0, 'add', 1, 1);
 	print '</td></tr>';
 
 	// Date value for bank
@@ -305,16 +305,6 @@ if ($action == 'create')
 	print '<input name="amount" id="amount" class="minwidth100" value="'.GETPOST("amount").'">';
 	print '</td></tr>';
 
-	// Project
-	if (!empty($conf->projet->enabled))
-	{
-		$formproject = new FormProjets($db);
-
-		print '<tr><td>'.$langs->trans("Project").'</td><td>';
-		$formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1);
-		print '</td></tr>';
-	}
-
 	// Bank
 	if (!empty($conf->banque->enabled))
 	{
@@ -340,6 +330,16 @@ if ($action == 'create')
 		print '<td><input name="num_payment" id="num_payment" type="text" value="'.GETPOST("num_payment").'"></td></tr>'."\n";
 	}
 
+	// Project
+	if (!empty($conf->projet->enabled))
+	{
+	    $formproject = new FormProjets($db);
+
+	    print '<tr><td>'.$langs->trans("Project").'</td><td>';
+	    $formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1);
+	    print '</td></tr>';
+	}
+
 	// Other attributes
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
@@ -476,9 +476,8 @@ if ($id)
 	print dol_get_fiche_end();
 
 
-	/*
-	 * Action buttons
-	 */
+	// Action buttons
+
 	print '<div class="tabsAction">'."\n";
 	if ($object->rappro == 0)
 	{
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 3ef6531e6fd..726710f52de 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -113,17 +113,17 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON s.fk_bank = b.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid,";
 $sql .= " ".MAIN_DB_PREFIX."user as u";
 $sql .= " WHERE u.rowid = s.fk_user";
-$sql .= " AND s.entity = ".$conf->entity;
+$sql .= " AND s.entity IN (".getEntity('payment_salaries').")";
 if (empty($user->rights->salaries->readall)) $sql .= " AND s.fk_user IN (".join(',', $childids).")";
 
 // Search criteria
-if ($search_ref)			$sql .= " AND s.rowid=".$search_ref;
+if ($search_ref)			$sql .= " AND s.rowid=".((int) $search_ref);
 if ($search_user)			$sql .= natural_search(array('u.login', 'u.lastname', 'u.firstname', 'u.email'), $search_user);
 if ($search_label)			$sql .= natural_search(array('s.label'), $search_label);
 if ($search_date_start)     $sql .= " AND s.datep >= '".$db->idate($search_date_start)."'";
 if ($search_date_end)		$sql .= " AND s.datep <= '".$db->idate($search_date_end)."'";
 if ($search_amount)			$sql .= natural_search("s.amount", $search_amount, 1);
-if ($search_account > 0)	$sql .= " AND b.fk_account=".$search_account;
+if ($search_account > 0)	$sql .= " AND b.fk_account=".((int) $search_account);
 if ($filtre) {
 	$filtre = str_replace(":", "=", $filtre);
 	$sql .= " AND ".$filtre;
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 7a40af26ac0..3288571d2a7 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -342,8 +342,8 @@ class User extends CommonObject
 
 	public $fields = array(
 		'rowid'=>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
-		'lastname'=>array('type'=>'varchar(50)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>20, 'searchall'=>1, 'comment'=>'Reference of object'),
-		'firstname'=>array('type'=>'varchar(50)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
+		'lastname'=>array('type'=>'varchar(50)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>20, 'searchall'=>1),
+		'firstname'=>array('type'=>'varchar(50)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1),
 	);
 
 
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 257bcd4c6be..1a85ed309db 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -109,45 +109,32 @@ if (!empty($conf->api->enabled))
 
 // Definition of fields for list
 $arrayfields = array(
-	'u.login'=>array('label'=>$langs->trans("Login"), 'checked'=>1),
-	'u.lastname'=>array('label'=>$langs->trans("Lastname"), 'checked'=>1),
-	'u.firstname'=>array('label'=>$langs->trans("Firstname"), 'checked'=>1),
-	'u.gender'=>array('label'=>$langs->trans("Gender"), 'checked'=>0),
-	'u.employee'=>array('label'=>$langs->trans("Employee"), 'checked'=>($mode == 'employee' ? 1 : 0)),
-	'u.accountancy_code'=>array('label'=>$langs->trans("AccountancyCode"), 'checked'=>0),
-	'u.email'=>array('label'=>$langs->trans("EMail"), 'checked'=>1),
-	'u.api_key'=>array('label'=>$langs->trans("ApiKey"), 'checked'=>0, "enabled"=>($conf->api->enabled && $user->admin)),
-	'u.fk_soc'=>array('label'=>$langs->trans("Company"), 'checked'=>1),
-	'u.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))),
-	'u.fk_user'=>array('label'=>$langs->trans("HierarchicalResponsible"), 'checked'=>1),
-	'u.datelastlogin'=>array('label'=>$langs->trans("LastConnexion"), 'checked'=>1, 'position'=>100),
-	'u.datepreviouslogin'=>array('label'=>$langs->trans("PreviousConnexion"), 'checked'=>0, 'position'=>110),
-	'u.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-	'u.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
-	'u.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
+	'u.login'=>array('label'=>"Login", 'checked'=>1, 'position'=>10),
+    'u.lastname'=>array('label'=>"Lastname", 'checked'=>1, 'position'=>15),
+    'u.firstname'=>array('label'=>"Firstname", 'checked'=>1, 'position'=>20),
+    'u.entity'=>array('label'=>"Entity", 'checked'=>1, 'position'=>50, 'enabled'=>(!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))),
+    'u.gender'=>array('label'=>"Gender", 'checked'=>0, 'position'=>22),
+    'u.employee'=>array('label'=>"Employee", 'checked'=>($mode == 'employee' ? 1 : 0), 'position'=>25),
+    'u.fk_user'=>array('label'=>"HierarchicalResponsible", 'checked'=>1, 'position'=>27),
+    'u.accountancy_code'=>array('label'=>"AccountancyCode", 'checked'=>0, 'position'=>30),
+    'u.email'=>array('label'=>"EMail", 'checked'=>1, 'position'=>35),
+    'u.api_key'=>array('label'=>"ApiKey", 'checked'=>0, 'position'=>40, "enabled"=>($conf->api->enabled && $user->admin)),
+    'u.fk_soc'=>array('label'=>"Company", 'checked'=>1, 'position'=>45),
+    'u.salary'=>array('label'=>"Salary", 'checked'=>1, 'position'=>80, 'enabled'=>($conf->salaries->enabled && !empty($user->rights->salaries->readall))),
+    'u.datelastlogin'=>array('label'=>"LastConnexion", 'checked'=>1, 'position'=>100),
+	'u.datepreviouslogin'=>array('label'=>"PreviousConnexion", 'checked'=>0, 'position'=>110),
+	'u.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
+	'u.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
+	'u.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
-			$arrayfields["ef.".$key] = array(
-				'label'=>$extrafields->attributes[$object->table_element]['label'][$key],
-				'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1),
-				'position'=>$extrafields->attributes[$object->table_element]['pos'][$key],
-				'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]),
-				'langfile'=>$extrafields->attributes[$object->table_element]['langfile'][$key],
-				'help'=>$extrafields->attributes[$object->table_element]['help'][$key]
-			);
-		}
-	}
-}
+include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
 // Init search fields
-$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_user = GETPOST('search_user', 'alpha');
 $search_login = GETPOST('search_login', 'alpha');
 $search_lastname = GETPOST('search_lastname', 'alpha');
@@ -183,6 +170,8 @@ if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 
 $error = 0;
 
+$childids = $user->getAllChildIds(1);
+
 
 /*
  * Actions
@@ -308,7 +297,7 @@ if ($contextpage == 'employeelist' && $search_employee == 1) {
 $user2 = new User($db);
 
 $sql = "SELECT DISTINCT u.rowid, u.lastname, u.firstname, u.admin, u.fk_soc, u.login, u.email, u.api_key, u.accountancy_code, u.gender, u.employee, u.photo,";
-$sql .= " u.datelastlogin, u.datepreviouslogin,";
+$sql .= " u.salary, u.datelastlogin, u.datepreviouslogin,";
 $sql .= " u.ldap_sid, u.statut, u.entity,";
 $sql .= " u.tms as date_update, u.datec as date_creation,";
 $sql .= " u2.rowid as id2, u2.login as login2, u2.firstname as firstname2, u2.lastname as lastname2, u2.admin as admin2, u2.fk_soc as fk_soc2, u2.email as email2, u2.gender as gender2, u2.photo as photo2, u2.entity as entity2, u2.statut as statut2,";
@@ -356,6 +345,7 @@ if ($catid > 0)     $sql .= " AND cu.fk_categorie = ".((int) $catid);
 if ($catid == -2)   $sql .= " AND cu.fk_categorie IS NULL";
 if ($search_categ > 0)   $sql .= " AND cu.fk_categorie = ".$db->escape($search_categ);
 if ($search_categ == -2) $sql .= " AND cu.fk_categorie IS NULL";
+if ($mode == 'employee' && empty($user->rights->salaries->readall)) $sql .= " AND s.fk_user IN (".join(',', $childids).")";
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
@@ -541,6 +531,13 @@ if (!empty($arrayfields['u.employee']['checked']))
 	print $form->selectyesno('search_employee', $search_employee, 1, false, 1);
 	print '</td>';
 }
+// Supervisor
+if (!empty($arrayfields['u.fk_user']['checked']))
+{
+    print '<td class="liste_titre">';
+    print $form->select_dolusers($search_supervisor, 'search_supervisor', 1, array(), 0, '', 0, 0, 0, 0, '', 0, '', 'maxwidth200');
+    print '</td>';
+}
 if (!empty($arrayfields['u.accountancy_code']['checked']))
 {
 	print '<td class="liste_titre"><input type="text" name="search_accountancy_code" class="maxwidth50" value="'.$search_accountancy_code.'"></td>';
@@ -561,12 +558,9 @@ if (!empty($arrayfields['u.entity']['checked']))
 {
 	print '<td class="liste_titre"></td>';
 }
-// Supervisor
-if (!empty($arrayfields['u.fk_user']['checked']))
+if (!empty($arrayfields['u.salary']['checked']))
 {
-	print '<td class="liste_titre">';
-	print $form->select_dolusers($search_supervisor, 'search_supervisor', 1, array(), 0, '', 0, 0, 0, 0, '', 0, '', 'maxwidth200');
-	print '</td>';
+    print '<td class="liste_titre"></td>';
 }
 if (!empty($arrayfields['u.datelastlogin']['checked']))
 {
@@ -615,12 +609,13 @@ if (!empty($arrayfields['u.lastname']['checked']))       print_liste_field_titre
 if (!empty($arrayfields['u.firstname']['checked']))      print_liste_field_titre("FirstName", $_SERVER['PHP_SELF'], "u.firstname", $param, "", "", $sortfield, $sortorder);
 if (!empty($arrayfields['u.gender']['checked']))         print_liste_field_titre("Gender", $_SERVER['PHP_SELF'], "u.gender", $param, "", "", $sortfield, $sortorder);
 if (!empty($arrayfields['u.employee']['checked']))       print_liste_field_titre("Employee", $_SERVER['PHP_SELF'], "u.employee", $param, "", "", $sortfield, $sortorder);
+if (!empty($arrayfields['u.fk_user']['checked']))        print_liste_field_titre("HierarchicalResponsible", $_SERVER['PHP_SELF'], "u.fk_user", $param, "", "", $sortfield, $sortorder);
 if (!empty($arrayfields['u.accountancy_code']['checked'])) print_liste_field_titre("AccountancyCode", $_SERVER['PHP_SELF'], "u.accountancy_code", $param, "", "", $sortfield, $sortorder);
 if (!empty($arrayfields['u.email']['checked']))          print_liste_field_titre("EMail", $_SERVER['PHP_SELF'], "u.email", $param, "", "", $sortfield, $sortorder);
 if (!empty($arrayfields['u.api_key']['checked']))        print_liste_field_titre("ApiKey", $_SERVER['PHP_SELF'], "u.api_key", $param, "", "", $sortfield, $sortorder);
 if (!empty($arrayfields['u.fk_soc']['checked']))         print_liste_field_titre("Company", $_SERVER['PHP_SELF'], "u.fk_soc", $param, "", "", $sortfield, $sortorder);
 if (!empty($arrayfields['u.entity']['checked']))         print_liste_field_titre("Entity", $_SERVER['PHP_SELF'], "u.entity", $param, "", "", $sortfield, $sortorder);
-if (!empty($arrayfields['u.fk_user']['checked']))        print_liste_field_titre("HierarchicalResponsible", $_SERVER['PHP_SELF'], "u.fk_user", $param, "", "", $sortfield, $sortorder);
+if (!empty($arrayfields['u.salary']['checked']))         print_liste_field_titre("Salary", $_SERVER['PHP_SELF'], "u.salary", $param, "", "", $sortfield, $sortorder, 'right ');
 if (!empty($arrayfields['u.datelastlogin']['checked']))  print_liste_field_titre("LastConnexion", $_SERVER['PHP_SELF'], "u.datelastlogin", $param, "", '', $sortfield, $sortorder, 'center ');
 if (!empty($arrayfields['u.datepreviouslogin']['checked'])) print_liste_field_titre("PreviousConnexion", $_SERVER['PHP_SELF'], "u.datepreviouslogin", $param, "", '', $sortfield, $sortorder, 'center ');
 // Extra fields
@@ -713,6 +708,37 @@ while ($i < ($limit ? min($num, $limit) : $num))
 		print '<td>'.yn($obj->employee).'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
+
+	// Supervisor
+	if (!empty($arrayfields['u.fk_user']['checked']))
+	{
+	    // Resp
+	    print '<td class="nowrap">';
+	    if ($obj->login2)
+	    {
+	        $user2->id = $obj->id2;
+	        $user2->login = $obj->login2;
+	        $user2->lastname = $obj->lastname2;
+	        $user2->firstname = $obj->firstname2;
+	        $user2->gender = $obj->gender2;
+	        $user2->photo = $obj->photo2;
+	        $user2->admin = $obj->admin2;
+	        $user2->email = $obj->email2;
+	        $user2->socid = $obj->fk_soc2;
+	        $user2->statut = $obj->statut2;
+	        print $user2->getNomUrl(-1, '', 0, 0, 24, 0, '', '', 1);
+	        if (!empty($conf->multicompany->enabled) && $obj->admin2 && !$obj->entity2)
+	        {
+	            print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
+	        } elseif ($obj->admin2)
+	        {
+	            print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
+	        }
+	    }
+	    print '</td>';
+	    if (!$i) $totalarray['nbfield']++;
+	}
+
 	if (!empty($arrayfields['u.accountancy_code']['checked']))
 	{
 		print '<td>'.$obj->accountancy_code.'</td>';
@@ -763,34 +789,12 @@ while ($i < ($limit ? min($num, $limit) : $num))
 			if (!$i) $totalarray['nbfield']++;
 		}
 	}
-	// Supervisor
-	if (!empty($arrayfields['u.fk_user']['checked']))
+
+	// Salary
+	if (!empty($arrayfields['u.salary']['checked']))
 	{
-		// Resp
-		print '<td class="nowrap">';
-		if ($obj->login2)
-		{
-			$user2->id = $obj->id2;
-			$user2->login = $obj->login2;
-			$user2->lastname = $obj->lastname2;
-			$user2->firstname = $obj->firstname2;
-			$user2->gender = $obj->gender2;
-			$user2->photo = $obj->photo2;
-			$user2->admin = $obj->admin2;
-			$user2->email = $obj->email2;
-			$user2->socid = $obj->fk_soc2;
-			$user2->statut = $obj->statut2;
-			print $user2->getNomUrl(-1, '', 0, 0, 24, 0, '', '', 1);
-			if (!empty($conf->multicompany->enabled) && $obj->admin2 && !$obj->entity2)
-			{
-			  	print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
-			} elseif ($obj->admin2)
-			{
-				print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
-			}
-		}
-		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+	    print '<td class="nowraponall right">'.($obj->salary ? price($obj->salary) : '').'</td>';
+	    if (!$i) $totalarray['nbfield']++;
 	}
 
 	// Date last login

From 62e3b5d214a0e559ecd0acf6c452969dcab9b1e6 Mon Sep 17 00:00:00 2001
From: teleassist <contact@teleassist.fr>
Date: Thu, 3 Dec 2020 10:04:21 +0100
Subject: [PATCH 098/888] Revert "Add translation"

This reverts commit e19d0c9eeaeadd9c18b3fc39f3522c30db10a24f.
---
 htdocs/langs/en_US/cashdesk.lang | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index c0245790e76..549646ab110 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -122,5 +122,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
-WeighingScale=Weighing scale
-TakeposNumpadForcePaymentLabels=Show text with icons of payment buttons of numpad
+WeighingScale=Weighing scale
\ No newline at end of file

From 450b04c1ad14131d1185b1d230042ed453218349 Mon Sep 17 00:00:00 2001
From: teleassist <contact@teleassist.fr>
Date: Thu, 3 Dec 2020 10:04:28 +0100
Subject: [PATCH 099/888] Revert "Add
 TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS"

This reverts commit 7e9a12a2f8bef1f6947522654e1470661844f054.
---
 htdocs/takepos/admin/setup.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index bd4c18bda0c..88911f10b7d 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -307,13 +307,6 @@ print '<td colspan="2">';
 print ajax_constantonoff("TAKEPOS_NUMPAD_USE_PAYMENT_ICON", array(), $conf->entity, 0, 0, 1, 0);
 print "</td></tr>\n";
 
-// Numpad show labels for icons
-print '<tr class="oddeven"><td>';
-print $langs->trans('TakeposNumpadForcePaymentLabels');
-print '<td colspan="2">';
-print ajax_constantonoff("TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS", array(), $conf->entity, 0, 0, 1, 0);
-print "</td></tr>\n";
-
 // Direct Payment
 print '<tr class="oddeven"><td>';
 print $langs->trans('DirectPaymentButton');

From 032116b23511601561fce10f67f797dc543b576b Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Thu, 3 Dec 2020 10:11:16 +0100
Subject: [PATCH 100/888] changes to not diplay  won and lost and add on
 migration

---
 .../core/boxes/box_funnel_of_prospection.php  | 38 ++++++++-----------
 .../install/mysql/migration/12.0.0-13.0.0.sql |  3 +-
 htdocs/langs/en_US/boxes.lang                 |  1 +
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/htdocs/core/boxes/box_funnel_of_prospection.php b/htdocs/core/boxes/box_funnel_of_prospection.php
index 6e63a80353c..7062509a13b 100644
--- a/htdocs/core/boxes/box_funnel_of_prospection.php
+++ b/htdocs/core/boxes/box_funnel_of_prospection.php
@@ -33,7 +33,7 @@ class box_funnel_of_prospection extends ModeleBoxes
 {
 	public $boxcode = "FunnelOfProspection";
 	public $boximg = "object_projectpub";
-	public $boxlabel = "BoxFunnelOfProspection";
+	public $boxlabel = "BoxTitleFunnelOfProspection";
 	public $depends = array("projet");
 
 	/**
@@ -104,12 +104,6 @@ class box_funnel_of_prospection extends ModeleBoxes
 					case 'NEGO':
 						$colorseriesstat[$objp->rowid] = $badgeStatus4;
 						break;
-					case 'LOST':
-						$colorseriesstat[$objp->rowid] = $badgeStatus9;
-						break;
-					case 'WON':
-						$colorseriesstat[$objp->rowid] = $badgeStatus6;
-						break;
 					default:
 						$colorseriesstat[$objp->rowid] = $badgeStatus2;
 						break;
@@ -133,6 +127,7 @@ class box_funnel_of_prospection extends ModeleBoxes
 			$sql .= " WHERE p.entity IN (" . getEntity('project') . ")";
 			$sql .= " AND p.fk_opp_status = cls.rowid";
 			$sql .= " AND p.fk_statut = 1"; // Opend projects only
+			$sql .= " AND cls.code NOT IN ('WON', 'LOST')";
 			$sql .= " GROUP BY p.fk_opp_status, cls.code";
 			$resql = $this->db->query($sql);
 
@@ -156,10 +151,8 @@ class box_funnel_of_prospection extends ModeleBoxes
 						$valsamount[$obj->opp_status] = $obj->opp_amount;
 						$totalnb += $obj->nb;
 						if ($obj->opp_status) $totaloppnb += $obj->nb;
-						if (!in_array($obj->code, array('WON', 'LOST'))) {
-							$totalamount += $obj->opp_amount;
-							$ponderated_opp_amount += $obj->ponderated_opp_amount;
-						}
+						$totalamount += $obj->opp_amount;
+						$ponderated_opp_amount += $obj->ponderated_opp_amount;
 					}
 					$i++;
 				}
@@ -171,17 +164,18 @@ class box_funnel_of_prospection extends ModeleBoxes
 				$listofstatus = array_keys($listofoppstatus);
 				foreach ($listofstatus as $status) {
 					$labelStatus = '';
+					if ($status != 7 && $status != 6) {
+						$code = dol_getIdFromCode($this->db, $status, 'c_lead_status', 'rowid', 'code');
+						if ($code) $labelStatus = $langs->transnoentitiesnoconv("OppStatus" . $code);
+						if (empty($labelStatus)) $labelStatus = $listofopplabel[$status];
 
-					$code = dol_getIdFromCode($this->db, $status, 'c_lead_status', 'rowid', 'code');
-					if ($code) $labelStatus = $langs->transnoentitiesnoconv("OppStatus" . $code);
-					if (empty($labelStatus)) $labelStatus = $listofopplabel[$status];
-
-					$dataseries[] = array($labelStatus, (isset($valsamount[$status]) ? (float) $valsamount[$status] : 0));
-					if (!$conf->use_javascript_ajax) {
-						$stringtoprint .= '<tr class="oddeven">';
-						$stringtoprint .= '<td>' . $labelStatus . '</td>';
-						$stringtoprint .= '<td class="right"><a href="list.php?statut=' . $status . '">' . price((isset($valsamount[$status]) ? (float) $valsamount[$status] : 0), 0, '', 1, -1, -1, $conf->currency) . '</a></td>';
-						$stringtoprint .= "</tr>\n";
+						$dataseries[] = array($labelStatus, (isset($valsamount[$status]) ? (float) $valsamount[$status] : 0));
+						if (!$conf->use_javascript_ajax) {
+							$stringtoprint .= '<tr class="oddeven">';
+							$stringtoprint .= '<td>' . $labelStatus . '</td>';
+							$stringtoprint .= '<td class="right"><a href="list.php?statut=' . $status . '">' . price((isset($valsamount[$status]) ? (float) $valsamount[$status] : 0), 0, '', 1, -1, -1, $conf->currency) . '</a></td>';
+							$stringtoprint .= "</tr>\n";
+						}
 					}
 				}
 				if ($conf->use_javascript_ajax) {
@@ -231,7 +225,7 @@ class box_funnel_of_prospection extends ModeleBoxes
 					'tr' => 'class="oddeven"',
 					'td' => 'class="left "',
 					'maxlength' => 500,
-					'text' => $form->textwithpicto($langs->trans("OpportunityPonderatedAmount").' ('.$langs->trans("WonLostExcluded").')', $langs->trans("OpportunityPonderatedAmountDesc"), 1)
+					'text' => $form->textwithpicto($langs->trans("OpportunityPonderatedAmount") . ' (' . $langs->trans("WonLostExcluded") . ')', $langs->trans("OpportunityPonderatedAmountDesc"), 1)
 
 				);
 				$this->info_box_contents[$line][] = array(
diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index 18802301e5a..7b5fc0aab22 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -439,7 +439,6 @@ INSERT INTO llx_c_product_nature (code, label, active) VALUES (1, 'Finished', 1)
 ALTER TABLE llx_product MODIFY COLUMN finished tinyint DEFAULT NULL;
 ALTER TABLE llx_product ADD CONSTRAINT fk_product_finished FOREIGN KEY (finished) REFERENCES llx_c_product_nature (code);
 
-
 -- MIGRATION TO DO AFTER RENAMING AN OBJECT
 
 -- drop constraint
@@ -542,3 +541,5 @@ CREATE TABLE llx_session(
   user_agent varchar(128) NULL
 )ENGINE=innodb;
 
+INSERT INTO llx_boxes_def(file,entity) VALUES ('box_funnel_of_prospection.php',1);
+INSERT INTO llx_boxes (box_id, position, box_order, maxline, params) VALUES ((SELECT b.rowid FROM llx_boxes_def as b WHERE file = 'box_funnel_of_prospection.php'), 0, 0, NULL, NULL);
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index 75f8eb14f49..40fdc11ba32 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -50,6 +50,7 @@ BoxTitleLastOutstandingBillReached=Latest %s customers with maximum outstanding
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxTitleFunnelOfProspection=Amount of prospection by status
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=No bookmarks defined.

From f6adb6ae5530cda5e1e1910fbdf018de41defda7 Mon Sep 17 00:00:00 2001
From: teleassist <30868208+teleassist@users.noreply.github.com>
Date: Thu, 3 Dec 2020 10:12:03 +0100
Subject: [PATCH 101/888] Update pay.php

Always show labels with payment icons
---
 htdocs/takepos/pay.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index 89b936bef6c..ab621a964b5 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -286,7 +286,6 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 <?php if (count($arrayOfValidPaymentModes) > 0) {
 	$paycode = $arrayOfValidPaymentModes[0]->code;
 	$payIcon = '';
-	$payLabel = '';
 	if ($paycode == 'LIQ') {
 		$paycode = 'cash';
 		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'coins';
@@ -298,8 +297,7 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
 	}
 
-	if (!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS)) $payLabel = ' iconwithlabel';
-	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.$payLabel.'"></span>'.(!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS) ? '<br/> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code) : '') : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code)).'</button>';
+	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span><br/> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code) : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code)).'</button>';
 } else {
 	print '<button type="button" class="calcbutton2">'.$langs->trans("NoPaimementModesDefined").'</button>';
 }
@@ -311,7 +309,6 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 <?php if (count($arrayOfValidPaymentModes) > 1) {
 	$paycode = $arrayOfValidPaymentModes[1]->code;
 	$payIcon = '';
-	$payLabel = '';
 	if ($paycode == 'LIQ') {
 		$paycode = 'cash';
 		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'coins';
@@ -323,8 +320,7 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
 	}
 
-	if (!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS)) $payLabel = ' iconwithlabel';
-	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.$payLabel.'"></span>'.(!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS) ? '<br/> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[1]->code) : '') : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[1]->code)).'</button>';
+	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span><br/> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[1]->code) : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[1]->code)).'</button>';
 } else {
 	$button = array_pop($action_buttons);
 	print '<button type="button" class="calcbutton2" onclick="'.$button["function"].'"><span '.$button["span"].'>'.$button["text"].'</span></button>';
@@ -337,7 +333,6 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 <?php if (count($arrayOfValidPaymentModes) > 2) {
 	$paycode = $arrayOfValidPaymentModes[2]->code;
 	$payIcon = '';
-	$payLabel = '';
 	if ($paycode == 'LIQ') {
 		$paycode = 'cash';
 		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'coins';
@@ -349,8 +344,7 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
 	}
 
-	if (!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS)) $payLabel = ' iconwithlabel';
-	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.$payLabel.'"></span>'.(!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS) ? '<br/> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[2]->code) : '') : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[2]->code)).'</button>';
+	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span>'.(!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS) ? '<br/> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[2]->code) : '') : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[2]->code)).'</button>';
 } else {
 	$button = array_pop($action_buttons);
 	print '<button type="button" class="calcbutton2" onclick="'.$button["function"].'"><span '.$button["span"].'>'.$button["text"].'</span></button>';

From dd54d28dc6197ce5b8812fee6a9aa140d49ef82b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Dec 2020 10:13:13 +0100
Subject: [PATCH 102/888] Debug v13

---
 htdocs/bom/bom_list.php          |  17 +-
 htdocs/core/tpl/contacts.tpl.php |   4 +-
 htdocs/projet/info.php           |   4 +-
 htdocs/projet/list.php           |  24 +-
 htdocs/salaries/list.php         | 563 +++++++++++++++++++++----------
 htdocs/ticket/agenda.php         |   4 +-
 htdocs/ticket/messaging.php      |   4 +-
 7 files changed, 396 insertions(+), 224 deletions(-)

diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index 1135f5df5dd..8f8c13f2556 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -383,21 +383,6 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 
 llxHeader('', $title, $help_url);
 
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
-
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
@@ -469,7 +454,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">';
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index fc24f1aa02a..a1abc3a9240 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -239,8 +239,8 @@ foreach (array('internal', 'external') as $source)
 }
 
 
-$sortfield = GETPOST("sortfield", "alpha");
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST("sortfield", "aZ09comma");
+$sortorder = GETPOST("sortorder", 'aZ09comma');
 
 if (!$sortfield) $sortfield = "nature";
 if (!$sortorder) $sortorder = "asc";
diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index ba1b0629365..5b408717f40 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -37,8 +37,8 @@ $socid  = GETPOST('socid', 'int');
 $action = GETPOST('action', 'aZ09');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", "alpha");
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST("sortfield", "aZ09comma");
+$sortorder = GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $page = is_numeric($page) ? $page : 0;
 $page = $page == -1 ? 0 : $page;
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 63bb21527e5..586d78ae7b3 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -67,8 +67,8 @@ if (!$user->rights->projet->lire) accessforbidden();
 $diroutputmassaction = $conf->projet->dir_output.'/temp/massgeneration/'.$user->id;
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", "alpha");
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST("sortfield", "aZ09comma");
+$sortorder = GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $page = is_numeric($page) ? $page : 0;
 $page = $page == -1 ? 0 : $page;
@@ -144,15 +144,7 @@ $fieldstosearchall['s.nom'] = "ThirdPartyName";
 $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
-	if (empty($val['visible'])) {
-		continue;
-	}
-
-	$arrayfields['p.'.$key] = array(
-		'label'=>$val['label'],
-		'checked'=>(($val['visible'] < 0) ? 0 : 1),
-		'enabled'=>($val['enabled'] && ($val['visible'] != 3)),
-		'position'=>$val['position']);
+	if (!empty($val['visible'])) $arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>($val['enabled'] && ($val['visible'] != 3)), 'position'=>$val['position']);
 }
 
 // Add none object fields to fields for list
@@ -165,8 +157,14 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
 	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
+		if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
+			$arrayfields["ef.".$key] = array(
+				'label'=>$extrafields->attributes[$object->table_element]['label'][$key],
+				'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1),
+				'position'=>$extrafields->attributes[$object->table_element]['pos'][$key],
+				'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key])
+			);
+		}
 	}
 }
 
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 726710f52de..135e2f53080 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -31,7 +31,42 @@ if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/account
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "salaries", "bills", "hrm"));
 
+$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
+$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
+$cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
+$toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'bomlist'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
+$optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+
+// Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortfield) $sortfield = "s.datep,s.rowid";
+if (!$sortorder) $sortorder = "DESC,DESC";
+
+// Initialize technical objects
+$object = new PaymentSalary($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->user->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('salarieslist')); // Note that conf->hooks_modules contains array
+
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+if (!$sortfield) $sortfield = "s.datep,s.rowid";
+if (!$sortorder) $sortorder = "DESC,DESC";
+
 $search_ref = GETPOST('search_ref', 'int');
 $search_user = GETPOST('search_user', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
@@ -40,30 +75,19 @@ $search_date_end = dol_mktime(23, 59, 59, GETPOST('search_date_endmonth', 'int')
 $search_amount = GETPOST('search_amount', 'alpha');
 $search_account = GETPOST('search_account', 'int');
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
-$offset = $limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (!$sortfield) $sortfield = "s.datep,s.rowid";
-if (!$sortorder) $sortorder = "DESC,DESC";
-$optioncss = GETPOST('optioncss', 'alpha');
-
 $filtre = GETPOST("filtre", 'restricthtml');
 
-if (!GETPOST('typeid', 'int'))
+if (!GETPOST('search_type_id', 'int'))
 {
 	$newfiltre = str_replace('filtre=', '', $filtre);
 	$filterarray = explode('-', $newfiltre);
 	foreach ($filterarray as $val)
 	{
 		$part = explode(':', $val);
-		if ($part[0] == 's.fk_typepayment') $typeid = $part[1];
+		if ($part[0] == 's.fk_typepayment') $search_type_id = $part[1];
 	}
 } else {
-	$typeid = GETPOST('typeid', 'int');
+	$search_type_id = GETPOST('search_type_id', 'int');
 }
 
 $childids = $user->getAllChildIds(1);
@@ -73,36 +97,92 @@ $socid = GETPOST("socid", "int");
 if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'salaries', '', '', '');
 
+// Initialize array of search criterias
+$search_all = GETPOST("search_all", 'alpha');
+$search = array();
+foreach ($object->fields as $key => $val)
+{
+	if (GETPOST('search_'.$key, 'alpha') !== '') $search[$key] = GETPOST('search_'.$key, 'alpha');
+}
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array();
+foreach ($object->fields as $key => $val)
+{
+	if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
+}
+
+$permissiontoread = $user->rights->salaries->read;
+$permissiontoadd = $user->rights->salaries->write;
+$permissiontodelete = $user->rights->salaries->delete;
 
 
 /*
  * Actions
  */
 
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-{
-	$search_ref = "";
-	$search_user = "";
-	$search_label = "";
-	$search_date_start = '';
-	$search_date_end = '';
-	$search_amount = "";
-	$search_account = '';
-	$typeid = "";
-}
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
 
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
+	{
+		$search_ref = "";
+		$search_user = "";
+		$search_label = "";
+		$search_date_start = '';
+		$search_date_end = '';
+		$search_amount = "";
+		$search_account = '';
+		$search_type_id = "";
+	}
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
+	{
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+	}
+
+	// Mass actions
+	$objectclass = 'PaymentSalary';
+	$objectlabel = 'SalariesPayments';
+	$permissiontoread = $user->rights->salaries->read;
+	$permissiontodelete = $user->rights->salaries->delete;
+	$uploaddir = $conf->bom->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+
+	// Validate records
+	if (!$error && $massaction == 'buildsepa' && $permissiontoadd)
+	{
+		$objecttmp = new $objectclass($db);
+
+		// TODO
+	}
+}
 
 /*
  * View
  */
 
-llxHeader('', $langs->trans("Salaries"));
-
 $form = new Form($db);
 $salstatic = new PaymentSalary($db);
 $userstatic = new User($db);
 $accountstatic = new Account($db);
 
+$now = dol_now();
+
+//$help_url="EN:Module_BillOfMaterials|FR:Module_BillOfMaterials_FR|ES:Módulo_BillOfMaterials";
+$help_url = '';
+$title = $langs->trans('SalariesPayments');
+
 $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.admin, u.salary as current_salary, u.fk_soc as fk_soc, u.statut as status,";
 $sql .= " s.rowid, s.fk_user, s.amount, s.salary, s.label, s.datep as datep, s.datev as datev, s.fk_typepayment as type, s.num_payment, s.fk_bank,";
 $sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel,";
@@ -128,195 +208,304 @@ if ($filtre) {
 	$filtre = str_replace(":", "=", $filtre);
 	$sql .= " AND ".$filtre;
 }
-if ($typeid) {
-	$sql .= " AND s.fk_typepayment=".$typeid;
+if ($search_type_id) {
+	$sql .= " AND s.fk_typepayment=".$search_type_id;
 }
 $sql .= $db->order($sortfield, $sortorder);
 
-//$sql.= " GROUP BY u.rowid, u.lastname, u.firstname, s.rowid, s.fk_user, s.amount, s.label, s.datev, s.fk_typepayment, s.num_payment, pst.code";
-$totalnboflines = 0;
-$result = $db->query($sql);
-if ($result)
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-	$totalnboflines = $db->num_rows($result);
+	$resql = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($resql);
+	if (($page * $limit) > $nbtotalofrecords)	// if total of record found is smaller than page * limit, goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
-$sql .= $db->plimit($limit + 1, $offset);
-
-
-$result = $db->query($sql);
-if ($result)
+// if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
+if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
 {
-	$num = $db->num_rows($result);
-	$i = 0;
-	$total = 0;
+	$num = $nbtotalofrecords;
+} else {
+	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
-	$param = '';
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
-	if ($typeid) $param .= '&amp;typeid='.$typeid;
-	if ($optioncss != '') $param .= '&amp;optioncss='.$optioncss;
+	$resql = $db->query($sql);
+	if (!$resql)
+	{
+		dol_print_error($db);
+		exit;
+	}
 
-	$url = DOL_URL_ROOT.'/salaries/card.php?action=create';
-	if (!empty($socid)) $url .= '&socid='.$socid;
-	$newcardbutton = dolGetButtonTitle($langs->trans('NewSalaryPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->salaries->write);
+	$num = $db->num_rows($resql);
+}
 
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-	print '<input type="hidden" name="action" value="list">';
-	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+// Output page
+// --------------------------------------------------------------------
 
-	print_barre_liste($langs->trans("SalariesPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $newcardbutton, '', $limit, 0, 0, 1);
+llxHeader('', $title, $help_url);
 
-	print '<div class="div-table-responsive">';
-	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+$arrayofselected = is_array($toselect) ? $toselect : array();
 
-	print '<tr class="liste_titre_filter">';
-	// Ref
-	print '<td class="liste_titre left">';
-	print '<input class="flat" type="text" size="3" name="search_ref" value="'.$db->escape($search_ref).'">';
-	print '</td>';
-	// Employee
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+if ($search_type_id) $param .= '&search_type_id='.urlencode($search_type_id);
+if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
+if ($search_ref) $param .= '&search_ref='.urlencode($search_ref);
+if ($search_user > 0) $param .= '&search_user='.urlencode($search_user);
+if ($search_label) $param .= '&search_label='.urlencode($search_label);
+if ($search_account) $param .= '&search_account='.urlencode($search_account);
+if ($search_date_start) $param .= '&search_date_startday='.urlencode(GETPOST('search_date_startday', 'int')).'&search_date_startmonth='.urlencode(GETPOST('search_date_startmonth', 'int')).'&search_date_startyear='.urlencode(GETPOST('search_date_startyear', 'int'));
+if ($search_date_end) $param .= '&search_date_endday='.urlencode(GETPOST('search_date_endday', 'int')).'&search_date_endmonth='.urlencode(GETPOST('search_date_endmonth', 'int')).'&search_date_endyear='.urlencode(GETPOST('search_date_endyear', 'int'));
+// Add $param from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+
+// List of mass actions available
+$arrayofmassactions = array(
+	//'presend'=>$langs->trans("SendByMail"),
+	'buildsepa'=>$langs->trans("BuildSepa"),
+);
+//if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+$url = DOL_URL_ROOT.'/salaries/card.php?action=create';
+if (!empty($socid)) $url .= '&socid='.$socid;
+$newcardbutton = dolGetButtonTitle($langs->trans('NewSalaryPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->salaries->write);
+
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $totalnboflines, 'object_payment', 0, $newcardbutton, '', $limit, 0, 0, 1);
+
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+//$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = '';
+$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
+
+print '<div class="div-table-responsive">';
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+
+// Fields title search
+// --------------------------------------------------------------------
+print '<tr class="liste_titre_filter">';
+// Ref
+print '<td class="liste_titre left">';
+print '<input class="flat" type="text" size="3" name="search_ref" value="'.$db->escape($search_ref).'">';
+print '</td>';
+// Employee
+print '<td class="liste_titre">';
+print '<input class="flat" type="text" size="6" name="search_user" value="'.$db->escape($search_user).'">';
+print '</td>';
+// Label
+print '<td class="liste_titre"><input type="text" class="flat width150" name="search_label" value="'.$db->escape($search_label).'"></td>';
+// Date
+print '<td class="liste_titre center">';
+print '<div class="nowrap">';
+print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+print '</div>';
+print '<div class="nowrap">';
+print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+print '</div>';
+print '</td>';
+// Type
+print '<td class="liste_titre left">';
+$form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16);
+print '</td>';
+// Account
+if (!empty($conf->banque->enabled))
+{
 	print '<td class="liste_titre">';
-	print '<input class="flat" type="text" size="6" name="search_user" value="'.$db->escape($search_user).'">';
-	print '</td>';
-	// Label
-	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_label" value="'.$db->escape($search_label).'"></td>';
-	// Date
-	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
-	print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
-	print '</div>';
-	print '<div class="nowrap">';
-	print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
-	print '</div>';
+	$form->select_comptes($search_account, 'search_account', 0, '', 1);
 	print '</td>';
+}
+// Amount
+print '<td class="liste_titre right"><input name="search_amount" class="flat" type="text" size="8" value="'.$db->escape($search_amount).'"></td>';
+
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
+
+// Fields from hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+// Action column
+print '<td class="liste_titre maxwidthsearch">';
+$searchpicto = $form->showFilterButtons();
+print $searchpicto;
+print '</td>';
+print '</tr>'."\n";
+
+
+// Fields title label
+// --------------------------------------------------------------------
+print '<tr class="liste_titre">';
+print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "s.rowid", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "u.rowid", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "s.label", "", $param, 'class="left"', $sortfield, $sortorder);
+print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "s.datep,s.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre("PaymentMode", $_SERVER["PHP_SELF"], "type", "", $param, 'class="left"', $sortfield, $sortorder);
+if (!empty($conf->banque->enabled)) print_liste_field_titre("BankAccount", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "s.amount", "", $param, 'class="right"', $sortfield, $sortorder);
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+// Hook fields
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+// Action column
+print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+print '</tr>'."\n";
+
+
+// Detect if we need a fetch on each output line
+$needToFetchEachLine = 0;
+if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0)
+{
+	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val)
+	{
+		if (preg_match('/\$object/', $val)) $needToFetchEachLine++; // There is at least one compute field that use $object
+	}
+}
+
+// Loop on record
+// --------------------------------------------------------------------
+$i = 0;
+$total = 0;
+$totalarray = array();
+while ($i < ($limit ? min($num, $limit) : $num))
+{
+	$obj = $db->fetch_object($resql);
+	if (empty($obj)) break; // Should not happen
+
+	// Store properties in $object
+	$object->setVarsFromFetchObj($obj);
+
+	// Show here line of result
+	print '<tr class="oddeven">';
+
+	$userstatic->id = $obj->uid;
+	$userstatic->lastname = $obj->lastname;
+	$userstatic->firstname = $obj->firstname;
+	$userstatic->admin = $obj->admin;
+	$userstatic->login = $obj->login;
+	$userstatic->email = $obj->email;
+	$userstatic->socid = $obj->fk_soc;
+	$userstatic->statut = $obj->status;
+
+	$salstatic->id = $obj->rowid;
+	$salstatic->ref = $obj->rowid;
+
+	// Ref
+	print "<td>".$salstatic->getNomUrl(1)."</td>\n";
+	if (!$i) $totalarray['nbfield']++;
+
+	// Employee
+	print "<td>".$userstatic->getNomUrl(1)."</td>\n";
+	if (!$i) $totalarray['nbfield']++;
+
+	// Label payment
+	print "<td>".dol_trunc($obj->label, 40)."</td>\n";
+	if (!$i) $totalarray['nbfield']++;
+
+	// Date payment
+	print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
+	if (!$i) $totalarray['nbfield']++;
+
 	// Type
-	print '<td class="liste_titre left">';
-	$form->select_types_paiements($typeid, 'typeid', '', 0, 1, 1, 16);
-	print '</td>';
+	print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
+	if (!$i) $totalarray['nbfield']++;
+
 	// Account
 	if (!empty($conf->banque->enabled))
 	{
-		print '<td class="liste_titre">';
-		$form->select_comptes($search_account, 'search_account', 0, '', 1);
-		print '</td>';
-	}
-	// Amount
-	print '<td class="liste_titre right"><input name="search_amount" class="flat" type="text" size="8" value="'.$db->escape($search_amount).'"></td>';
-
-	print '<td class="liste_titre maxwidthsearch">';
-	$searchpicto = $form->showFilterAndCheckAddButtons(0);
-	print $searchpicto;
-	print '</td>';
-
-	print '<tr class="liste_titre">';
-	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "s.rowid", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "u.rowid", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "s.label", "", $param, 'class="left"', $sortfield, $sortorder);
-	print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "s.datep,s.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
-	print_liste_field_titre("PaymentMode", $_SERVER["PHP_SELF"], "type", "", $param, 'class="left"', $sortfield, $sortorder);
-	if (!empty($conf->banque->enabled)) print_liste_field_titre("BankAccount", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "s.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-	print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
-	print "</tr>\n";
-
-	print "</tr>\n";
-
-	while ($i < min($num, $limit))
-	{
-		$obj = $db->fetch_object($result);
-
-		print '<tr class="oddeven">';
-
-		$userstatic->id = $obj->uid;
-		$userstatic->lastname = $obj->lastname;
-		$userstatic->firstname = $obj->firstname;
-		$userstatic->admin = $obj->admin;
-		$userstatic->login = $obj->login;
-		$userstatic->email = $obj->email;
-		$userstatic->socid = $obj->fk_soc;
-		$userstatic->statut = $obj->status;
-
-		$salstatic->id = $obj->rowid;
-		$salstatic->ref = $obj->rowid;
-
-		// Ref
-		print "<td>".$salstatic->getNomUrl(1)."</td>\n";
-		if (!$i) $totalarray['nbfield']++;
-
-		// Employee
-		print "<td>".$userstatic->getNomUrl(1)."</td>\n";
-		if (!$i) $totalarray['nbfield']++;
-
-		// Label payment
-		print "<td>".dol_trunc($obj->label, 40)."</td>\n";
-		if (!$i) $totalarray['nbfield']++;
-
-		// Date payment
-		print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
-		if (!$i) $totalarray['nbfield']++;
-
-		// Type
-		print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
-		if (!$i) $totalarray['nbfield']++;
-
-		// Account
-		if (!empty($conf->banque->enabled))
+		print '<td>';
+		if ($obj->fk_bank > 0)
 		{
-			print '<td>';
-			if ($obj->fk_bank > 0)
+			//$accountstatic->fetch($obj->fk_bank);
+			$accountstatic->id = $obj->bid;
+			$accountstatic->ref = $obj->bref;
+			$accountstatic->number = $obj->bnumber;
+
+			if (!empty($conf->accounting->enabled))
 			{
-				//$accountstatic->fetch($obj->fk_bank);
-				$accountstatic->id = $obj->bid;
-				$accountstatic->ref = $obj->bref;
-				$accountstatic->number = $obj->bnumber;
+				$accountstatic->account_number = $obj->account_number;
 
-				if (!empty($conf->accounting->enabled))
-				{
-					$accountstatic->account_number = $obj->account_number;
+				$accountingjournal = new AccountingJournal($db);
+				$accountingjournal->fetch($obj->fk_accountancy_journal);
 
-					$accountingjournal = new AccountingJournal($db);
-					$accountingjournal->fetch($obj->fk_accountancy_journal);
-
-					$accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
-				}
-				$accountstatic->label = $obj->blabel;
-				print $accountstatic->getNomUrl(1);
-			} else print '&nbsp;';
-			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
-		}
-
-		// Amount
-		print '<td class="nowrap right">'.price($obj->amount).'</td>';
+				$accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+			}
+			$accountstatic->label = $obj->blabel;
+			print $accountstatic->getNomUrl(1);
+		} else print '&nbsp;';
+		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
-		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
-		$totalarray['val']['totalttcfield'] += $obj->amount;
-
-		print '<td></td>';
-
-		if (!$i) $totalarray['nbfield']++;
-
-		print "</tr>\n";
-
-		$i++;
 	}
 
-	// Show total line
-	include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+	// Amount
+	print '<td class="nowrap right">'.price($obj->amount).'</td>';
+	if (!$i) $totalarray['nbfield']++;
+	if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
+	$totalarray['val']['totalttcfield'] += $obj->amount;
 
-	print "</table>";
-	print '</div>';
-	print '</form>';
+	// Extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+	// Fields from hook
+	$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	// Action column
+	print '<td class="nowrap center">';
+	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+	{
+		$selected = 0;
+		if (in_array($object->id, $arrayofselected)) $selected = 1;
+		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+	}
+	print '</td>';
+	if (!$i) $totalarray['nbfield']++;
 
-	$db->free($result);
-} else {
-	dol_print_error($db);
+	print '</tr>'."\n";
+
+	$i++;
 }
 
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+
+// If no record found
+if ($num == 0)
+{
+	$colspan = 1;
+	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
+	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+}
+
+
+$db->free($resql);
+
+$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print '</table>'."\n";
+print '</div>'."\n";
+
+print '</form>'."\n";
+
+
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/ticket/agenda.php b/htdocs/ticket/agenda.php
index b14e5b718ba..be68e1f68ee 100644
--- a/htdocs/ticket/agenda.php
+++ b/htdocs/ticket/agenda.php
@@ -41,8 +41,8 @@ $socid    = GETPOST('socid', 'int');
 $action   = GETPOST('action', 'aZ09');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", "alpha");
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST("sortfield", "aZ09comma");
+$sortorder = GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $page = is_numeric($page) ? $page : 0;
 $page = $page == -1 ? 0 : $page;
diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php
index af6f78fe98c..49f15412965 100644
--- a/htdocs/ticket/messaging.php
+++ b/htdocs/ticket/messaging.php
@@ -41,8 +41,8 @@ $socid    = GETPOST('socid', 'int');
 $action   = GETPOST('action', 'aZ09');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", "alpha");
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST("sortfield", "aZ09comma");
+$sortorder = GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $page = is_numeric($page) ? $page : 0;
 $page = $page == -1 ? 0 : $page;

From 56d5cd040238a04280c465b0417639cc232b43e5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Dec 2020 10:22:17 +0100
Subject: [PATCH 103/888] Fix missing .php into name of boxes added into
 llx_boxes_def

---
 ChangeLog                                        | 1 +
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 637a8a27407..2d0fd358c2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@ NEW: Accountancy - change menu disposition
 NEW: Accountancy - on transfers, select the periodicity by default
 NEW: Accountancy - Add export for Gestinum (v3 & v5)
 NEW: new currency rate editor
+NEW: add a widget to show the customers with outstanding limits reached
 NEW: add 2 rules for emailcollector: Message send/not sent from Dolibarr
 NEW: add a counter of number of words for pages in website module
 NEW: add alert before changing thirdparty in TakePOS
diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index 7d3118fe891..4a804e5fe4a 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -542,4 +542,4 @@ CREATE TABLE llx_session(
   user_agent varchar(128) NULL
 )ENGINE=innodb;
 
-INSERT INTO llx_boxes_def(file, entity) VALUES ('box_customers_outstanding_bill_reached', 1);
+INSERT INTO llx_boxes_def(file, entity) VALUES ('box_customers_outstanding_bill_reached.php', 1);

From e08f6aeb2be50bd115cee54cf0e17687613aa556 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Thu, 3 Dec 2020 11:00:29 +0100
Subject: [PATCH 104/888] Fix #15383

---
 htdocs/core/boxes/box_funnel_of_prospection.php  | 13 +++++++++----
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql |  1 -
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/boxes/box_funnel_of_prospection.php b/htdocs/core/boxes/box_funnel_of_prospection.php
index 7062509a13b..fa65e696fa6 100644
--- a/htdocs/core/boxes/box_funnel_of_prospection.php
+++ b/htdocs/core/boxes/box_funnel_of_prospection.php
@@ -104,6 +104,9 @@ class box_funnel_of_prospection extends ModeleBoxes
 					case 'NEGO':
 						$colorseriesstat[$objp->rowid] = $badgeStatus4;
 						break;
+					case 'WON':
+						$colorseriesstat[$objp->rowid] = $badgeStatus6;
+						break;
 					default:
 						$colorseriesstat[$objp->rowid] = $badgeStatus2;
 						break;
@@ -127,7 +130,7 @@ class box_funnel_of_prospection extends ModeleBoxes
 			$sql .= " WHERE p.entity IN (" . getEntity('project') . ")";
 			$sql .= " AND p.fk_opp_status = cls.rowid";
 			$sql .= " AND p.fk_statut = 1"; // Opend projects only
-			$sql .= " AND cls.code NOT IN ('WON', 'LOST')";
+			$sql .= " AND cls.code NOT IN ('LOST')";
 			$sql .= " GROUP BY p.fk_opp_status, cls.code";
 			$resql = $this->db->query($sql);
 
@@ -151,8 +154,10 @@ class box_funnel_of_prospection extends ModeleBoxes
 						$valsamount[$obj->opp_status] = $obj->opp_amount;
 						$totalnb += $obj->nb;
 						if ($obj->opp_status) $totaloppnb += $obj->nb;
-						$totalamount += $obj->opp_amount;
-						$ponderated_opp_amount += $obj->ponderated_opp_amount;
+						if (!in_array($obj->code, array('WON', 'LOST'))) {
+							$totalamount += $obj->opp_amount;
+							$ponderated_opp_amount += $obj->ponderated_opp_amount;
+						}
 					}
 					$i++;
 				}
@@ -164,7 +169,7 @@ class box_funnel_of_prospection extends ModeleBoxes
 				$listofstatus = array_keys($listofoppstatus);
 				foreach ($listofstatus as $status) {
 					$labelStatus = '';
-					if ($status != 7 && $status != 6) {
+					if ($status != 7) {
 						$code = dol_getIdFromCode($this->db, $status, 'c_lead_status', 'rowid', 'code');
 						if ($code) $labelStatus = $langs->transnoentitiesnoconv("OppStatus" . $code);
 						if (empty($labelStatus)) $labelStatus = $listofopplabel[$status];
diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index fc8ac7ce102..5865a3e7919 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -544,7 +544,6 @@ CREATE TABLE llx_session(
 
 
 INSERT INTO llx_boxes_def(file,entity) VALUES ('box_funnel_of_prospection.php',1);
-INSERT INTO llx_boxes (box_id, position, box_order, maxline, params) VALUES ((SELECT b.rowid FROM llx_boxes_def as b WHERE file = 'box_funnel_of_prospection.php'), 0, 0, NULL, NULL);
 
 INSERT INTO llx_boxes_def(file, entity) VALUES ('box_customers_outstanding_bill_reached.php', 1);
 

From 3d21a00f2ba289bc5d6876c951e5ce79ae873e9d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Dec 2020 11:03:02 +0100
Subject: [PATCH 105/888] Removed not working code

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

diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 135e2f53080..26477900be2 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -266,7 +266,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 // List of mass actions available
 $arrayofmassactions = array(
 	//'presend'=>$langs->trans("SendByMail"),
-	'buildsepa'=>$langs->trans("BuildSepa"),
+	//'buildsepa'=>$langs->trans("BuildSepa"),	// TODO
 );
 //if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();

From 28ac9764389ca5e6b68192181dc3367b534d91dd Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Thu, 3 Dec 2020 11:14:58 +0100
Subject: [PATCH 106/888] Show won on graph

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

diff --git a/htdocs/core/boxes/box_funnel_of_prospection.php b/htdocs/core/boxes/box_funnel_of_prospection.php
index fa65e696fa6..c4cebfcf68a 100644
--- a/htdocs/core/boxes/box_funnel_of_prospection.php
+++ b/htdocs/core/boxes/box_funnel_of_prospection.php
@@ -174,7 +174,7 @@ class box_funnel_of_prospection extends ModeleBoxes
 						if ($code) $labelStatus = $langs->transnoentitiesnoconv("OppStatus" . $code);
 						if (empty($labelStatus)) $labelStatus = $listofopplabel[$status];
 
-						$dataseries[] = array($labelStatus, (isset($valsamount[$status]) ? (float) $valsamount[$status] : 0));
+						$dataseries[] = array($labelStatus,(isset($valsamount[$status]) ? (float) $valsamount[$status] : 0));
 						if (!$conf->use_javascript_ajax) {
 							$stringtoprint .= '<tr class="oddeven">';
 							$stringtoprint .= '<td>' . $labelStatus . '</td>';
@@ -188,6 +188,7 @@ class box_funnel_of_prospection extends ModeleBoxes
 					$dolgraph = new DolGraph();
 					$dolgraph->SetData($dataseries);
 					$dolgraph->SetDataColor(array_values($colorseriesstat));
+					//$dolgraph->SetLegend(array('PROSP',$dataseries['PROSP']));
 					$dolgraph->setShowLegend(2);
 					$dolgraph->setShowPercent(1);
 					$dolgraph->SetType(array('pie'));

From 748630eb2590588bd853d62d777cd2a6ca13f63e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Dec 2020 11:15:06 +0100
Subject: [PATCH 107/888] FIX Better error message when IMAP connection fails

---
 htdocs/admin/emailcollector_card.php | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index fd3361515fb..11f5dcd3bc3 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -223,21 +223,6 @@ $help_url = "EN:Module_EMail_Collector|FR:Module_Collecteur_de_courrier_électro
 
 llxHeader('', 'EmailCollector', $help_url);
 
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
-
 // Part to create
 if ($action == 'create') {
 	print load_fiche_titre($langs->trans("NewEmailCollector", $langs->transnoentitiesnoconv("EmailCollector")));

From 0fd865d8afb6b64fcfe8f926a2131ffba47c9fb5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Dec 2020 11:16:02 +0100
Subject: [PATCH 108/888] FIX Better error message with IMAP when connection
 fails

---
 htdocs/admin/emailcollector_card.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index 80161eaadc6..b7c7e4abca2 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -448,6 +448,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	if (!$connection)
 	{
 		$morehtml .= 'Failed to open IMAP connection '.$connectstringsource;
+		$morehtml .= '<br>'.imap_last_error();
 	}
 	else
 	{

From b324425db815d4a90a7f11c43d7f241a5b39c2e0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Dec 2020 11:19:41 +0100
Subject: [PATCH 109/888] code comment

---
 htdocs/admin/emailcollector_card.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index b7c7e4abca2..07cd5be7b78 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -449,6 +449,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	{
 		$morehtml .= 'Failed to open IMAP connection '.$connectstringsource;
 		$morehtml .= '<br>'.imap_last_error();
+		//var_dump(imap_errors())
 	}
 	else
 	{

From 1ec3d4cfdf4699892ad61cb6cfedbe3b82a99492 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Dec 2020 13:19:35 +0100
Subject: [PATCH 110/888] CSS

---
 htdocs/admin/agenda_other.php                   |  2 +-
 htdocs/admin/bank.php                           |  2 +-
 htdocs/admin/bom.php                            |  2 +-
 htdocs/admin/commande.php                       |  2 +-
 htdocs/admin/contract.php                       |  2 +-
 htdocs/admin/delivery.php                       |  2 +-
 htdocs/admin/expedition.php                     |  2 +-
 htdocs/admin/expensereport.php                  |  2 +-
 htdocs/admin/facture.php                        |  2 +-
 htdocs/admin/fichinter.php                      |  2 +-
 htdocs/admin/holiday.php                        |  2 +-
 htdocs/admin/mrp.php                            |  2 +-
 htdocs/admin/paymentbybanktransfer.php          |  2 +-
 htdocs/admin/prelevement.php                    |  2 +-
 htdocs/admin/propal.php                         |  2 +-
 htdocs/admin/reception_setup.php                |  2 +-
 htdocs/admin/stock.php                          |  2 +-
 htdocs/admin/supplier_invoice.php               |  2 +-
 htdocs/admin/supplier_order.php                 |  2 +-
 htdocs/admin/supplier_payment.php               |  2 +-
 htdocs/admin/supplier_proposal.php              |  2 +-
 htdocs/admin/user.php                           |  2 +-
 htdocs/admin/usergroup.php                      |  2 +-
 htdocs/core/lib/functions.lib.php               | 17 +++++++++--------
 .../expedition/doc/pdf_espadon.modules.php      |  4 ++--
 .../expedition/doc/pdf_merou.modules.php        |  6 +++---
 .../expedition/doc/pdf_rouget.modules.php       |  4 ++--
 htdocs/modulebuilder/template/admin/setup.php   |  2 +-
 28 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 2ffbf15d7ce..c1f77f4995e 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -292,7 +292,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 						print $form->textwithpicto('', $htmltooltip, 1, 0);
 						print '</td>';
 						print '<td class="center">';
-						print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'order').'</a>';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 						print '</td>';
 
 						print "</tr>\n";
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index 88babe27385..d21ffdb1630 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -391,7 +391,7 @@ foreach ($dirmodels as $reldir) {
 								// Preview
 								print '<td class="center">';
 								if ($module->type == 'pdf') {
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php
index 19ca39c21f3..34c3af89c53 100644
--- a/htdocs/admin/bom.php
+++ b/htdocs/admin/bom.php
@@ -414,7 +414,7 @@ foreach ($dirmodels as $reldir)
 								print '<td class="center">';
 								if ($module->type == 'pdf')
 								{
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index daf015f68eb..25a220e8e2d 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -484,7 +484,7 @@ foreach ($dirmodels as $reldir)
 								print '<td class="center">';
 								if ($module->type == 'pdf')
 								{
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 517a547cea6..b5e4c0ddf45 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -414,7 +414,7 @@ foreach ($dirmodels as $reldir)
 								print '<td class="center">';
 								if ($module->type == 'pdf')
 								{
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
diff --git a/htdocs/admin/delivery.php b/htdocs/admin/delivery.php
index 3707c395437..b1606268205 100644
--- a/htdocs/admin/delivery.php
+++ b/htdocs/admin/delivery.php
@@ -398,7 +398,7 @@ foreach ($dirmodels as $reldir)
 							print '<td class="center">';
 							if ($module->type == 'pdf')
 							{
-								print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'sending').'</a>';
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 							} else {
 								print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 							}
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 9e65af2d06c..9a09c62b818 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -415,7 +415,7 @@ foreach ($dirmodels as $reldir)
 								print '<td class="center">';
 								if ($module->type == 'pdf')
 								{
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'sending').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index 8ffd4ab58c0..a93f5c3c608 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -411,7 +411,7 @@ foreach ($dirmodels as $reldir)
 							print '<td class="center">';
 							if ($module->type == 'pdf')
 							{
-								print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'intervention').'</a>';
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 							} else {
 								print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 							}
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 7da8044ee07..00dcb7c3180 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -549,7 +549,7 @@ foreach ($dirmodels as $reldir)
 								print '<td class="center">';
 								if ($module->type == 'pdf')
 								{
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 3d9e23cf61c..e3178d946a0 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -467,7 +467,7 @@ foreach ($dirmodels as $reldir)
 							print '<td class="center">';
 							if ($module->type == 'pdf')
 							{
-								print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'intervention').'</a>';
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 							} else {
 								print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 							}
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index 9a3845ace5b..eca8319d661 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -426,7 +426,7 @@ foreach ($dirmodels as $reldir)
 								print '<td class="center">';
 								if ($module->type == 'pdf')
 								{
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php
index 36e5eaf1efc..af6210eee1f 100644
--- a/htdocs/admin/mrp.php
+++ b/htdocs/admin/mrp.php
@@ -415,7 +415,7 @@ foreach ($dirmodels as $reldir)
 								print '<td class="center">';
 								if ($module->type == 'pdf')
 								{
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
diff --git a/htdocs/admin/paymentbybanktransfer.php b/htdocs/admin/paymentbybanktransfer.php
index 0ea8db95aec..cd0db2a1def 100644
--- a/htdocs/admin/paymentbybanktransfer.php
+++ b/htdocs/admin/paymentbybanktransfer.php
@@ -340,7 +340,7 @@ foreach ($dirmodels as $reldir)
                                 print '<td class="center">';
                                 if ($module->type == 'pdf')
                                 {
-                                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
+                                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
                                 }
                                 else
                                 {
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index 97a45c77a42..72e116ab3a7 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -347,7 +347,7 @@ foreach ($dirmodels as $reldir)
                                 print '<td class="center">';
                                 if ($module->type == 'pdf')
                                 {
-                                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
+                                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
                                 }
                                 else
                                 {
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index e88ed6a4864..78c22e7b397 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -444,7 +444,7 @@ foreach ($dirmodels as $reldir)
 								print '<td class="center">';
 								if ($module->type == 'pdf')
 								{
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php
index c095994832d..5da0dd84630 100644
--- a/htdocs/admin/reception_setup.php
+++ b/htdocs/admin/reception_setup.php
@@ -424,7 +424,7 @@ foreach ($dirmodels as $reldir)
 								print '<td class="center">';
 								if ($module->type == 'pdf')
 								{
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'reception').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 134aeb663b4..031b0ef102f 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -638,7 +638,7 @@ foreach ($dirmodels as $reldir)
 								print '<td class="center">';
 								if ($module->type == 'pdf')
 								{
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 384deec0b62..8df357df07e 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -426,7 +426,7 @@ foreach ($dirmodels as $reldir)
 					print $form->textwithpicto('', $htmltooltip, 1, 0);
 					print '</td>';
 					print '<td class="center">';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'order').'</a>';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 					print '</td>';
 
 					print "</tr>\n";
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 0125bb58fdb..e2433c5348b 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -439,7 +439,7 @@ foreach ($dirmodels as $reldir)
 					print $form->textwithpicto('', $htmltooltip, 1, 0);
 					print '</td>';
 					print '<td class="center">';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'order').'</a>';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 					print '</td>';
 
 					print "</tr>\n";
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index ab3093a02f7..3408496de31 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -412,7 +412,7 @@ foreach ($dirmodels as $reldir)
 					print $form->textwithpicto('', $htmltooltip, 1, 0);
 					print '</td>';
 					print '<td class="center">';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'order').'</a>';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 					print '</td>';
 
 					print "</tr>\n";
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 77a78fe0aa8..0855a41cf8f 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -437,7 +437,7 @@ foreach ($dirmodels as $reldir)
 								print '<td class="center">';
 								if ($module->type == 'pdf')
 								{
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index ea39cc1dce9..ea6cdf2b6f8 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -312,7 +312,7 @@ foreach ($dirmodels as $reldir)
 								print '<td class="center">';
 								if ($module->type == 'pdf')
 								{
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php
index dd12584b276..0725cc83f18 100644
--- a/htdocs/admin/usergroup.php
+++ b/htdocs/admin/usergroup.php
@@ -241,7 +241,7 @@ foreach ($dirmodels as $reldir)
 								print '<td class="center">';
 								if ($module->type == 'pdf')
 								{
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 7523d2f5d77..1143766f451 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3221,14 +3221,15 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'object_cash-register', 'object_company', 'object_contact', 'object_contract', 'object_donation', 'object_dynamicprice',
 				'object_globe', 'object_holiday', 'object_hrm', 'object_invoice', 'object_intervention', 'object_label',
 				'object_margin', 'object_money-bill-alt', 'object_multicurrency', 'object_order', 'object_payment',
-				'object_lot', 'object_mrp', 'object_payment', 'object_product', 'object_propal',
-				'object_other', 'object_paragraph', 'object_poll', 'object_printer', 'object_project', 'object_projectpub', 'object_propal', 'object_resource', 'object_rss', 'object_projecttask',
+				'object_lot', 'object_mrp', 'object_other',
+				'object_payment', 'object_pdf', 'object_product', 'object_propal',
+				'object_paragraph', 'object_poll', 'object_printer', 'object_project', 'object_projectpub', 'object_propal', 'object_resource', 'object_rss', 'object_projecttask',
 				'object_recruitmentjobposition', 'object_recruitmentcandidature',
 				'object_shipment', 'object_share-alt', 'object_supplier_invoice', 'object_supplier_invoicea', 'object_supplier_invoiced', 'object_supplier_order', 'object_supplier_proposal', 'object_service', 'object_stock',
 				'object_technic', 'object_ticket', 'object_trip', 'object_user', 'object_group', 'object_member',
 				'object_phoning', 'object_phoning_mobile', 'object_phoning_fax', 'object_email', 'object_website',
 				'off', 'on', 'order',
-				'paiment', 'play', 'playdisabled', 'previous', 'poll', 'printer', 'product', 'propal', 'projecttask', 'stock', 'resize', 'service', 'stats', 'trip',
+				'paiment', 'play', 'pdf', 'playdisabled', 'previous', 'poll', 'printer', 'product', 'propal', 'projecttask', 'stock', 'resize', 'service', 'stats', 'trip',
 				'setup', 'share-alt', 'sign-out', 'split', 'stripe-s', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'vcard', 'wrench',
 				'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
 				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top', 'commercial', 'companies',
@@ -3240,18 +3241,18 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda'
 			)
 		)) {
+			$pictowithouttext = str_replace('object_', '', $pictowithouttext);
+
 			$fakey = $pictowithouttext;
 			$facolor = ''; $fasize = '';
 			$fa = 'fas';
-			if (in_array($pictowithouttext, array('clock', 'object_generic', 'note', 'off', 'on', 'object_bookmark', 'bookmark', 'vcard'))) {
+			if (in_array($pictowithouttext, array('clock', 'generic', 'object_generic', 'pdf', 'note', 'off', 'on', 'object_bookmark', 'bookmark', 'vcard'))) {
 				$fa = 'far';
 			}
 			if (in_array($pictowithouttext, array('black-tie', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'stripe-s', 'youtube', 'google-plus-g', 'whatsapp'))) {
 				$fa = 'fab';
 			}
 
-			$pictowithouttext = str_replace('object_', '', $pictowithouttext);
-
 			$arrayconvpictotofa = array(
 				'account'=>'university', 'accountline'=>'receipt', 'accountancy'=>'money-check-alt', 'action'=>'calendar-alt', 'add'=>'plus-circle', 'address'=> 'address-book',
 				'bank_account'=>'university', 'bill'=>'file-invoice-dollar', 'billa'=>'file-excel', 'supplier_invoicea'=>'file-excel', 'billd'=>'file-medical', 'supplier_invoiced'=>'file-medical', 'bom'=>'cubes',
@@ -3271,10 +3272,10 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'intervention'=>'ambulance', 'invoice'=>'file-invoice-dollar', 'multicurrency'=>'dollar-sign', 'order'=>'file-invoice',
 				'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle',
 				'other'=>'square',
-				'playdisabled'=>'play', 'poll'=>'check-double', 'preview'=>'binoculars', 'project'=>'sitemap', 'projectpub'=>'sitemap', 'projecttask'=>'tasks', 'propal'=>'file-signature',
+				'playdisabled'=>'play', 'pdf'=>'file-pdf',  'poll'=>'check-double', 'preview'=>'binoculars', 'project'=>'sitemap', 'projectpub'=>'sitemap', 'projecttask'=>'tasks', 'propal'=>'file-signature',
+				'payment'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'previous'=>'arrow-alt-circle-left', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
 				'recruitmentjobposition'=>'id-card-alt', 'recruitmentcandidature'=>'id-badge',
 				'resize'=>'crop', 'supplier_order'=>'dol-order_supplier', 'supplier_proposal'=>'file-signature',
-				'payment'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'previous'=>'arrow-alt-circle-left', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
 				'refresh'=>'redo', 'resource'=>'laptop-house',
 				'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'supplier_invoice'=>'file-invoice-dollar', 'technic'=>'cogs', 'ticket'=>'ticket-alt',
 				'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index 5cdeaa693a7..165e83a8e87 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -166,14 +166,14 @@ class pdf_espadon extends ModelePdfExpedition
 		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
 
 		// Load traductions files required by page
-		$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
+		$outputlangs->loadLangs(array("main", "bills", "orders", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
 
 		global $outputlangsbis;
 		$outputlangsbis = null;
 		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
 			$outputlangsbis = new Translate('', $conf);
 			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
-			$outputlangsbis->loadLangs(array("main", "bills", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
+			$outputlangsbis->loadLangs(array("main", "bills", "orders", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
 		}
 
 		$nblines = count($object->lines);
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index f530121ec08..bad252bf799 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -453,7 +453,7 @@ class pdf_merou extends ModelePdfExpedition
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		// Translations
-		$langs->loadLangs(array("main", "bills"));
+		$langs->loadLangs(array("main", "bills", "orders"));
 
 		if (empty($hidetop))
 		{
@@ -620,12 +620,12 @@ class pdf_merou extends ModelePdfExpedition
 
 		$pdf->SetFont('', 'B', $default_font_size - 3);
 		$pdf->SetTextColor(0, 0, 0);
-		$pdf->MultiCell(50, 8, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_delivery, 'day', false, $outputlangs, true), '', 'L');
+		$pdf->MultiCell(70, 8, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_delivery, 'day', false, $outputlangs, true), '', 'L');
 
 		$pdf->SetXY($blSocX - 80, $blSocY + 20);
 		$pdf->SetFont('', 'B', $default_font_size - 3);
 		$pdf->SetTextColor(0, 0, 0);
-		$pdf->MultiCell(50, 8, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, '', 'L');
+		$pdf->MultiCell(70, 8, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, '', 'L');
 
 		// Deliverer
 		$pdf->SetXY($blSocX - 80, $blSocY + 23);
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index a43c6aba352..6698495f983 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -142,8 +142,8 @@ class pdf_rouget extends ModelePdfExpedition
 
 		// Define position of columns
 		$this->posxdesc = $this->marge_gauche + 1;
-		$this->posxweightvol = $this->page_largeur - $this->marge_droite - 78;
-		$this->posxqtyordered = $this->page_largeur - $this->marge_droite - 56;
+		$this->posxweightvol = $this->page_largeur - $this->marge_droite - 82;
+		$this->posxqtyordered = $this->page_largeur - $this->marge_droite - 60;
 		$this->posxqtytoship = $this->page_largeur - $this->marge_droite - 28;
 		$this->posxpuht = $this->page_largeur - $this->marge_droite;
 
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index c17f4a0095d..420eb13940d 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -495,7 +495,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										print '<td class="center">';
 										if ($module->type == 'pdf')
 										{
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&object='.$myTmpObjectKey.'">'.img_object($langs->trans("Preview"), 'generic').'</a>';
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&object='.$myTmpObjectKey.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 										} else {
 											print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 										}

From 068587fcee84f7016418ca4064243758a98010e4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Dec 2020 14:30:07 +0100
Subject: [PATCH 111/888] Update card.php

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

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 2c5157ff228..d9817dc38c3 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -953,7 +953,8 @@ if (empty($reshook))
 
 				if ($result > 0) {
 					$ret = $object->fetch($object->id); // Reload to get new records
-
+					$object->fetch_thirdparty();
+					
 					if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 						// Define output language
 						$outputlangs = $langs;
@@ -966,8 +967,6 @@ if (empty($reshook))
 						}
 
 						$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-					} else {
-						$object->fetch_thirdparty();
 					}
 
 					unset($_POST['prod_entry_mode']);

From 1f58b49aea03418c9e3bcd65db5a613a300a0ca9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Dec 2020 14:31:39 +0100
Subject: [PATCH 112/888] No xml inside HTML

---
 htdocs/takepos/pay.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index ab621a964b5..0d80eeffbc0 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -297,7 +297,7 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
 	}
 
-	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span><br/> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code) : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code)).'</button>';
+	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span><br> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code) : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code)).'</button>';
 } else {
 	print '<button type="button" class="calcbutton2">'.$langs->trans("NoPaimementModesDefined").'</button>';
 }
@@ -320,7 +320,7 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
 	}
 
-	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span><br/> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[1]->code) : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[1]->code)).'</button>';
+	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span><br> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[1]->code) : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[1]->code)).'</button>';
 } else {
 	$button = array_pop($action_buttons);
 	print '<button type="button" class="calcbutton2" onclick="'.$button["function"].'"><span '.$button["span"].'>'.$button["text"].'</span></button>';
@@ -344,7 +344,7 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
 	}
 
-	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span>'.(!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS) ? '<br/> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[2]->code) : '') : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[2]->code)).'</button>';
+	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span>'.(!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS) ? '<br> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[2]->code) : '') : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[2]->code)).'</button>';
 } else {
 	$button = array_pop($action_buttons);
 	print '<button type="button" class="calcbutton2" onclick="'.$button["function"].'"><span '.$button["span"].'>'.$button["text"].'</span></button>';

From 5bd6d6f388c6cbfaa84500bdf33df99f271cca53 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Dec 2020 14:34:15 +0100
Subject: [PATCH 113/888] Look and feel v13

---
 htdocs/comm/action/card.php             | 4 ++--
 htdocs/comm/action/index.php            | 6 +++---
 htdocs/compta/bank/card.php             | 4 ++--
 htdocs/core/class/extrafields.class.php | 4 ++--
 htdocs/core/class/html.form.class.php   | 8 ++++++--
 htdocs/core/lib/functions.lib.php       | 2 +-
 htdocs/margin/customerMargins.php       | 2 +-
 htdocs/margin/productMargins.php        | 2 +-
 htdocs/product/card.php                 | 4 ++--
 htdocs/product/stock/card.php           | 4 ++--
 htdocs/theme/eldy/global.inc.php        | 2 ++
 htdocs/website/index.php                | 2 +-
 12 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 1a61a4a0c82..f26ad2a36e2 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1104,7 +1104,7 @@ if ($action == 'create')
 		// Categories
 		print '<tr><td>'.$langs->trans("Categories").'</td><td>';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_ACTIONCOMM, '', 'parent', 64, 0, 1);
-		print $form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'minwidth300 quatrevingtpercent', 0, 0);
+		print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'minwidth300 quatrevingtpercent widthcentpercentminusx', 0, 0);
 		print "</td></tr>";
 	}
 
@@ -1578,7 +1578,7 @@ if ($id > 0)
 			foreach ($cats as $cat) {
 				$arrayselected[] = $cat->id;
 			}
-			print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
+			print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 			print "</td></tr>";
 		}
 
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index f540a8d6e4e..83b3c0514aa 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -1492,19 +1492,19 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 
 	if ($nonew <= 0)
 	{
-		print '<div class="tagtr"><div class="nowrap tagtd">';
+		print '<div class="tagtr"><div class="nowrap tagtd"><div class="left inline-block">';
 		print '<a class="dayevent-aday" style="color: #666" href="'.$urltoshow.'">';
 		if ($showinfo) print dol_print_date($curtime, 'daytextshort');
 		else print dol_print_date($curtime, '%d');
 		print '</a>';
-		print '</div><div class="nowrap tagtd right">';
+		print '</div><div class="nowrap floatright inline-block marginrightonly">';
 		if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
 		{
 			print '<a class="cursoradd" href="'.$urltocreate.'">'; // Explicit link, usefull for nojs interfaces
 			print img_picto($langs->trans("NewAction"), 'edit_add.png');
 			print '</a>';
 		}
-		print '</div></div>'."\n";
+		print '</div></div></div>'."\n";
 	}
 
 	if ($nonew < 0)
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 813e0baa1b7..30e483fdfa9 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -407,7 +407,7 @@ if ($action == 'create')
 				$arrayselected[] = $cat->id;
 			}
 		}
-		print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
+		print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 		print "</td></tr>";
 	}
 
@@ -904,7 +904,7 @@ if ($action == 'create')
 					$arrayselected[] = $cat->id;
 				}
 			}
-			print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
+			print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 			print "</td></tr>";
 		}
 
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 87cee951170..d041aba45f4 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1937,10 +1937,10 @@ class ExtraFields
 					$out .= '<script type="text/javascript">';
 					$out .= 'jQuery(document).ready(function(){';
 					if ($collapse_display === false) {
-						$out .= '   jQuery("#trextrafieldseparator'.$key.' td").prepend("<span class=\"cursorpointer fa fa-plus-square\"></span>&nbsp;");'."\n";
+						$out .= '   jQuery("#trextrafieldseparator'.$key.' td").prepend("<span class=\"cursorpointer far fa-plus-square\"></span>&nbsp;");'."\n";
 						$out .= '   jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").hide();'."\n";
 					} else {
-						$out .= '   jQuery("#trextrafieldseparator'.$key.' td").prepend("<span class=\"cursorpointer fa fa-minus-square\"></span>&nbsp;");'."\n";
+						$out .= '   jQuery("#trextrafieldseparator'.$key.' td").prepend("<span class=\"cursorpointer far fa-minus-square\"></span>&nbsp;");'."\n";
 						$out .= '   document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=1; path='.$_SERVER["PHP_SELF"].'"'."\n";
 					}
 					$out .= '   jQuery("#trextrafieldseparator'.$key.'").click(function(){'."\n";
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index edde06227ba..eed09e3c92c 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1447,9 +1447,10 @@ class Form
 	 *  @param	string		$moreparam		Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container
 	 *  @param	string		$htmlid			Html id to use instead of htmlname
 	 *  @param	bool		$multiple		add [] in the name of element and add 'multiple' attribut
+	 *  @param	integer		$disableifempty Set tag 'disabled' on select if there is no choice
 	 *	@return	 int						<0 if KO, Nb of contact in list if OK
 	 */
-	public function selectcontacts($socid, $selected = '', $htmlname = 'contactid', $showempty = 0, $exclude = '', $limitto = '', $showfunction = 0, $moreclass = '', $options_only = false, $showsoc = 0, $forcecombo = 0, $events = array(), $moreparam = '', $htmlid = '', $multiple = false)
+	public function selectcontacts($socid, $selected = '', $htmlname = 'contactid', $showempty = 0, $exclude = '', $limitto = '', $showfunction = 0, $moreclass = '', $options_only = false, $showsoc = 0, $forcecombo = 0, $events = array(), $moreparam = '', $htmlid = '', $multiple = false, $disableifempty = 0)
 	{
 		global $conf, $langs, $hookmanager, $action;
 
@@ -1490,7 +1491,10 @@ class Form
 				$out .= ajax_combobox($htmlid, $events, $conf->global->CONTACT_USE_SEARCH_TO_SELECT);
 			}
 
-			if ($htmlname != 'none' && !$options_only) $out .= '<select class="flat'.($moreclass ? ' '.$moreclass : '').'"'.($num ? '' : ' disabled').' id="'.$htmlid.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.(!empty($moreparam) ? $moreparam : '').'>';
+			if ($htmlname != 'none' && !$options_only) {
+				$out .= '<select class="flat'.($moreclass ? ' '.$moreclass : '').'"'.' id="'.$htmlid.'" name="'.$htmlname.(($num || empty($disableifempty)) ? '' : ' disabled').($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.(!empty($moreparam) ? $moreparam : '').'>';
+			}
+
 			if (($showempty == 1 || ($showempty == 3 && $num > 1)) && !$multiple) $out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>&nbsp;</option>';
 			if ($showempty == 2) $out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>-- '.$langs->trans("Internal").' --</option>';
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 1143766f451..c30d123b7e3 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3246,7 +3246,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 			$fakey = $pictowithouttext;
 			$facolor = ''; $fasize = '';
 			$fa = 'fas';
-			if (in_array($pictowithouttext, array('clock', 'generic', 'object_generic', 'pdf', 'note', 'off', 'on', 'object_bookmark', 'bookmark', 'vcard'))) {
+			if (in_array($pictowithouttext, array('clock', 'generic', 'minus-square', 'object_generic', 'pdf', 'plus-square', 'note', 'off', 'on', 'object_bookmark', 'bookmark', 'vcard'))) {
 				$fa = 'far';
 			}
 			if (in_array($pictowithouttext, array('black-tie', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'stripe-s', 'youtube', 'google-plus-g', 'whatsapp'))) {
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index ec05d59b07f..1174e23e915 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -149,7 +149,7 @@ $TCats = $form->select_all_categories(0, array(), '', 64, 0, 1);
 print '<tr>';
 print '<td class="titlefield">'.$langs->trans('ChooseCategory').'</td>';
 print '<td class="maxwidthonsmartphone" colspan="4">';
-print $form->multiselectarray('categories', $TCats, $TSelectedCats, 0, 0, 'minwidth500');
+print img_picto('', 'category').$form->multiselectarray('categories', $TCats, $TSelectedCats, 0, 0, 'quatrevingtpercent widthcentpercentminusx');
 print '</td>';
 print '</tr>';
 
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index d3af8726d89..46f128b2f36 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -125,7 +125,7 @@ $TCats = $form->select_all_categories(0, array(), '', 64, 0, 1);
 print '<tr>';
 print '<td class="titlefield">'.$langs->trans('ChooseCategory').'</td>';
 print '<td class="maxwidthonsmartphone" colspan="4">';
-print $form->multiselectarray('categories', $TCats, $TSelectedCats, 0, 0, 'minwidth500');
+print img_picto('', 'category').$form->multiselectarray('categories', $TCats, $TSelectedCats, 0, 0, 'quatrevingtpercent widthcentpercentminusx');
 print '</td>';
 print '</tr>';
 
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index ea0bc19eecb..0e2429df730 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1214,7 +1214,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			// Categories
 			print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 1);
-			print $form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, '', 0, '100%');
+			print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 			print "</td></tr>";
 		}
 
@@ -1666,7 +1666,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 						$arrayselected[] = $cat->id;
 					}
 				}
-				print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
+				print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 				print "</td></tr>";
 			}
 
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 535da42eeba..ffd7add3c20 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -319,7 +319,7 @@ if ($action == 'create')
 		// Categories
 		print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_WAREHOUSE, '', 'parent', 64, 0, 1);
-		print $form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, '', 0, '100%');
+		print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 		print "</td></tr>";
 	}
 	print '</table>';
@@ -767,7 +767,7 @@ if ($action == 'create')
 				foreach ($cats as $cat) {
 					$arrayselected[] = $cat->id;
 				}
-				print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
+				print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 				print "</td></tr>";
 			}
 
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index a3e71882264..8eafdbad140 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -2535,6 +2535,8 @@ img.login, img.printer, img.entity {
     border-radius: 50%;
     background-size: contain;
     background-size: contain;
+    border: 1px solid;
+    border-color: rgba(255, 255, 255, 0.2);
 }
 img.userphoto {			/* size for user photo in lists */
 	border-radius: 0.72em;
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 3a8e8bda794..d8ad8163dde 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -3574,7 +3574,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')	// Edit properties of
 		}
 
 		print '<tr class="visibleifsupplier"><td class="toptd">'.$form->editfieldkey('Categories', 'categories', '', $objectpage, 0).'</td><td colspan="3">';
-		print img_picto('', 'category', 'class="paddingright"').$form->multiselectarray('categories', $cate_arbo, (GETPOSTISSET('categories') ? GETPOST('categories', 'array') : $arrayselected), null, null, null, null, "90%");
+		print img_picto('', 'category', 'class="paddingright"').$form->multiselectarray('categories', $cate_arbo, (GETPOSTISSET('categories') ? GETPOST('categories', 'array') : $arrayselected), null, null, 'quatrevingtpercent widthcentpercentminusx');
 		print "</td></tr>";
 	}
 

From d8d825f6158b21895910faa9c7e178a162bc2dad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Dec 2020 14:40:14 +0100
Subject: [PATCH 114/888] FIX #15519

---
 htdocs/commande/list.php       | 2 +-
 htdocs/compta/facture/list.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 53359a0cb5e..72a5e179f25 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -109,7 +109,7 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1 || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 09acbcb7eb7..c61bfdf6819 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -128,7 +128,7 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1 || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters
 $offset = $limit * $page;
 if (!$sortorder && !empty($conf->global->INVOICE_DEFAULT_UNPAYED_SORT_ORDER) && $search_status == '1') $sortorder = $conf->global->INVOICE_DEFAULT_UNPAYED_SORT_ORDER;
 if (!$sortorder) $sortorder = 'DESC';

From dcc3ecf0129a771d4f20b280384ee33140d85dd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric?= <35066297+c3do@users.noreply.github.com>
Date: Thu, 3 Dec 2020 16:01:17 +0100
Subject: [PATCH 115/888] Update commande.class.php

---
 htdocs/commande/class/commande.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 506cf84c8fd..0b68095c5d0 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3273,6 +3273,7 @@ class Commande extends CommonOrder
 		$sql .= " fk_cond_reglement=".(isset($this->cond_reglement_id) ? $this->cond_reglement_id : "null").",";
 		$sql .= " fk_mode_reglement=".(isset($this->mode_reglement_id) ? $this->mode_reglement_id : "null").",";
 		$sql .= " fk_account=".($this->fk_account > 0 ? $this->fk_account : "null").",";
+		$sql .= " fk_input_reason=".($this->demand_reason_id > 0 ? $this->demand_reason_id : "null").",";
 		$sql .= " note_private=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
 		$sql .= " note_public=".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null").",";
 		$sql .= " model_pdf=".(isset($this->modelpdf) ? "'".$this->db->escape($this->modelpdf)."'" : "null").",";

From 2751d5cefdcc63703a549d04fe6c6161115b6971 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric?= <35066297+c3do@users.noreply.github.com>
Date: Thu, 3 Dec 2020 16:02:49 +0100
Subject: [PATCH 116/888] Update api_orders.class.php

---
 htdocs/commande/class/api_orders.class.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index 2f4eb6ea996..3442b9316f7 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -622,13 +622,7 @@ class Orders extends DolibarrApi
 			if ($this->commande->availability($this->commande->availability_id) < 0)
 			throw new RestException(400, 'Error while updating availability');
 		}
-
-        // Update demand reason
-        if (!empty($this->commande->demand_reason_id) && $this->commande->demand_reason_id > 0) {
-            if ($this->commande->demand_reason($this->commande->demand_reason_id) < 0)
-                throw new RestException(400, 'Error while updating demand reason');
-        }
-
+		
 		if ($this->commande->update(DolibarrApiAccess::$user) > 0)
 		{
 			return $this->get($id);

From 9875e73ee2169d0ed9dca59f91cb25e203438b49 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 3 Dec 2020 15:04:48 +0000
Subject: [PATCH 117/888] Fixing style errors.

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

diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index 3442b9316f7..71a26eea698 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -622,7 +622,7 @@ class Orders extends DolibarrApi
 			if ($this->commande->availability($this->commande->availability_id) < 0)
 			throw new RestException(400, 'Error while updating availability');
 		}
-		
+
 		if ($this->commande->update(DolibarrApiAccess::$user) > 0)
 		{
 			return $this->get($id);

From f06d920460db8f00bbc6fa87193779c390f37c0f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Dec 2020 16:22:03 +0100
Subject: [PATCH 118/888] FIX #15583

---
 htdocs/comm/card.php                    |  9 +++++++++
 htdocs/core/lib/security.lib.php        |  2 +-
 htdocs/core/menus/standard/eldy.lib.php |  4 ++--
 htdocs/fourn/card.php                   |  9 +++++++++
 htdocs/societe/card.php                 | 10 ++++++++++
 5 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 47c8431072d..fe41203e946 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -86,6 +86,15 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('thirdpartycomm', 'globalcard'));
 
+// Security check
+$result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', 0);
+
+if ($object->id > 0) {
+	if (!($object->client > 0) || empty($user->rights->societe->lire)) {
+		accessforbidden();
+	}
+}
+
 $now = dol_now();
 
 
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 3df92993091..9667a67d360 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -639,7 +639,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
  *	@param	int			$printheader		Show header before
  *  @param  int			$printfooter        Show footer after
  *  @param  int			$showonlymessage    Show only message parameter. Otherwise add more information.
- *  @param  array|null  $params         	Send params
+ *  @param  array|null  $params         	More parameters provided to hook
  *  @return	void
  */
 function accessforbidden($message = '', $printheader = 1, $printfooter = 1, $showonlymessage = 0, $params = null)
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 52f9a60d2be..625e1ef00b3 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -865,8 +865,8 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			if (!empty($conf->societe->enabled) && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) || !empty($conf->supplier_proposal->enabled)))
 			{
 				$langs->load("suppliers");
-				$newmenu->add("/societe/list.php?type=f&amp;leftmenu=suppliers", $langs->trans("ListSuppliersShort"), 2, ($user->rights->fournisseur->lire || $user->rights->supplier_proposal->lire), '', $mainmenu, 'suppliers');
-				$newmenu->add("/societe/card.php?leftmenu=suppliers&amp;action=create&amp;type=f", $langs->trans("MenuNewSupplier"), 3, $user->rights->societe->creer && ($user->rights->fournisseur->lire || $user->rights->supplier_proposal->lire));
+				$newmenu->add("/societe/list.php?type=f&amp;leftmenu=suppliers", $langs->trans("ListSuppliersShort"), 2, ($user->rights->fournisseur->lire), '', $mainmenu, 'suppliers');
+				$newmenu->add("/societe/card.php?leftmenu=suppliers&amp;action=create&amp;type=f", $langs->trans("MenuNewSupplier"), 3, $user->rights->societe->creer && ($user->rights->fournisseur->lire));
 			}
 
 			// Categories
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 85ab93d17ec..728710b97ba 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -65,6 +65,15 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('suppliercard', 'globalcard'));
 
+// Security check
+$result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', 0);
+
+if ($object->id > 0) {
+	if (!($object->fournisseur > 0) || empty($user->rights->fournisseur->lire)) {
+		accessforbidden();
+	}
+}
+
 
 /*
  * Action
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 1edd5492a81..7d7dcbe86c3 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -97,6 +97,16 @@ if (!empty($canvas))
 // Security check
 $result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', 0);
 
+/*
+if ($object->id > 0) {
+	if ($object->client == 0 && $object->fournisseur > 0) {
+		if (!empty($user->rights->fournisseur->lire)) {
+			accessforbidden();
+		}
+	}
+}
+*/
+
 $permissiontoread = $user->rights->societe->lire;
 $permissiontoadd = $user->rights->societe->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontodelete = $user->rights->societe->delete || ($permissiontoadd && isset($object->status) && $object->status == 0);

From ac29db92cbd2f462c7ead86f86a61cb0f8d4af35 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Dec 2020 16:35:42 +0100
Subject: [PATCH 119/888] FIX #15618

---
 htdocs/admin/system/dolibarr.php | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 97e7370a148..a2dcc434723 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -83,17 +83,23 @@ else
     if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_UPGRADE) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, $conf->global->MAIN_VERSION_LAST_UPGRADE));
 }
 
+$version = DOL_VERSION;
+if (preg_match('/[a-z]+/i', $version)) $version = 'develop'; // If version contains text, it is not an official tagged version, so we use the full change log.
+print ' &nbsp; <a href="https://raw.githubusercontent.com/Dolibarr/dolibarr/'.$version.'/ChangeLog" target="_blank">'.$langs->trans("SeeChangeLog").'</a>';
+
+$newversion = '';
 if (function_exists('curl_init'))
 {
     $conf->global->MAIN_USE_RESPONSE_TIMEOUT = 10;
     print ' &nbsp; &nbsp; - &nbsp; &nbsp; ';
     if ($action == 'getlastversion')
     {
-        if ($sfurl)
-        {
+        if ($sfurl) {
+        	$i = 0;
             while (!empty($sfurl->channel[0]->item[$i]->title) && $i < 10000)
             {
                 $title = $sfurl->channel[0]->item[$i]->title;
+                $reg = array();
                 if (preg_match('/([0-9]+\.([0-9\.]+))/', $title, $reg))
                 {
                     $newversion = $reg[1];
@@ -107,25 +113,23 @@ if (function_exists('curl_init'))
 
             // Show version
             print $langs->trans("LastStableVersion").' : <b>'.(($version != '0.0') ? $version : $langs->trans("Unknown")).'</b>';
-        }
-        else
-        {
+            if ($version != '0.0') {
+            	print ' &nbsp; <a href="https://raw.githubusercontent.com/Dolibarr/dolibarr/'.$version.'/ChangeLog" target="_blank">'.$langs->trans("SeeChangeLog").'</a>';
+            }
+        } else {
             print $langs->trans("LastStableVersion").' : <b>'.$langs->trans("UpdateServerOffline").'</b>';
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="butAction">'.$langs->trans("Check").'</a>';
     }
 }
 
 // Now show link to the changelog
-print ' &nbsp; &nbsp; - &nbsp; &nbsp; ';
+//print ' &nbsp; &nbsp; - &nbsp; &nbsp; ';
 
 $version = DOL_VERSION;
 if (preg_match('/[a-z]+/i', $version)) $version = 'develop'; // If version contains text, it is not an official tagged version, so we use the full change log.
 
-print '<a href="https://raw.githubusercontent.com/Dolibarr/dolibarr/'.$version.'/ChangeLog" target="_blank">'.$langs->trans("SeeChangeLog").'</a>';
 print '</td></tr>'."\n";
 print '<tr class="oddeven"><td>'.$langs->trans("VersionLastUpgrade").' ('.$langs->trans("Database").')</td><td>'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</td></tr>'."\n";
 print '<tr class="oddeven"><td>'.$langs->trans("VersionLastInstall").'</td><td>'.$conf->global->MAIN_VERSION_LAST_INSTALL.'</td></tr>'."\n";

From a1428c963b642d09d00d7b6df2483b9ae03709c6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Dec 2020 16:53:26 +0100
Subject: [PATCH 120/888] Fix phpcs

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

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index d9817dc38c3..f59038aceae 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -954,7 +954,7 @@ if (empty($reshook))
 				if ($result > 0) {
 					$ret = $object->fetch($object->id); // Reload to get new records
 					$object->fetch_thirdparty();
-					
+
 					if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 						// Define output language
 						$outputlangs = $langs;

From e3037c7e1a8ff5e6deba79436340665f2cc2c295 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 Dec 2020 17:33:22 +0100
Subject: [PATCH 121/888] doxygen

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

diff --git a/htdocs/core/boxes/box_lastlogin.php b/htdocs/core/boxes/box_lastlogin.php
index c3ddb0fcdff..aa7b5ca2ea5 100644
--- a/htdocs/core/boxes/box_lastlogin.php
+++ b/htdocs/core/boxes/box_lastlogin.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2012      Charles-François BENKE <charles.fr@benke.fr>
  * Copyright (C) 2005-2017 Laurent Destailleur    <eldy@users.sourceforge.net>
- * Copyright (C) 2014-2015 Frederic France        <frederic.france@free.fr>
+ * Copyright (C) 2014-2020 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
@@ -107,7 +107,7 @@ class box_lastlogin extends ModeleBoxes
 	 *  @param	array	$head       Array with properties of box title
 	 *  @param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *  @return	void
+	 *  @return	string
 	 */
 	public function showBox($head = null, $contents = null, $nooutput = 0)
 	{

From 333d5fe1ca1a5c1fbb892ff02eb72442b54f4fbb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Dec 2020 17:45:38 +0100
Subject: [PATCH 122/888] Debug script to clean emails

---
 scripts/emailings/reset-invalid-emails.php | 119 ++++++++++++++-------
 1 file changed, 78 insertions(+), 41 deletions(-)

diff --git a/scripts/emailings/reset-invalid-emails.php b/scripts/emailings/reset-invalid-emails.php
index 59c7e5372dd..c66f6082a9f 100755
--- a/scripts/emailings/reset-invalid-emails.php
+++ b/scripts/emailings/reset-invalid-emails.php
@@ -35,14 +35,15 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 	exit(-1);
 }
 
-if (!isset($argv[2]) || !$argv[2]) {
-	print "Usage: ".$script_file." inputfile-with-invalid-emails type\n";
+if (!isset($argv[3]) || !$argv[3]) {
+	print "Usage: ".$script_file." inputfile-with-invalid-emails type [test|confirm]\n";
 	print "- inputfile-with-invalid-emails is a file with list of invalid email\n";
 	print "- type can be 'all' or 'thirdparties', 'contacts', 'members', 'users'\n";
 	exit(-1);
 }
 $fileofinvalidemail = $argv[1];
 $type = $argv[2];
+$mode = $argv[3];
 
 require_once $path."../../htdocs/master.inc.php";
 require_once DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php";
@@ -56,15 +57,15 @@ $error = 0;
  * Main
  */
 
+$user = new User($db);
+
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 
-
-$user = new User($db);
-// for signature, we use user send as parameter
-if (!empty($login))
-	$user->fetch('', $login);
-
+if (!in_array($type, array('thirdparties', 'contacts', 'users', 'members'))) {
+	print "Bad value for parameter type.\n";
+	exit(-1);
+}
 
 $db->begin();
 
@@ -77,6 +78,9 @@ if (!$myfile)
 }
 
 $tmp = 1;
+$counter = 1;
+$numerasedtotal = 0;
+
 while ($tmp != null)
 {
 	$groupofemails = array();
@@ -90,49 +94,82 @@ while ($tmp != null)
 		$groupofemails[$i] = trim($tmp, "\n");
 	}
 
+	// Generate the string tp allow a mass update (with a limit of MAXEMAILS per request).
+	$emailsin = '';
+	foreach($groupofemails as $email) {
+		$emailsin .= ($emailsin ? ", " : "")."'".$db->escape($email)."'";
+	}
+
 	// For each groupofemail, we update tables to set email field to empty
+	$nbingroup = count($groupofemails);
+
+	print "Process group of ".$nbingroup." emails (".$counter." - ".($counter + $nbingroup - 1)."), type = ".$type."\n";
+
+	$numerased = 0;
 
 	$sql_base = "UPDATE ".MAIN_DB_PREFIX;
-	foreach ($groupofemails as $email)
+
+	if ($type == 'all' || $type == 'users')
 	{
-		if ($type == 'all' || $type == 'thirdparty')
-		{
-			// Loop on each record and update the email to null if email into $groupofemails
-
-			$sql = $sql_base."societe as s SET s.email = NULL WHERE s.email = '".$db->escape($email)."';";
-			$db->query($sql);
+		// Loop on each record and update the email to null if email into $groupofemails
+		$sql = $sql_base."user as u SET u.email = NULL WHERE u.email IN (".$emailsin.");";
+		print "Try to update users, ";
+		$resql = $db->query($sql);
+		if (!$resql) {
+			dol_print_error($db);
 		}
-
-		if ($type == 'all' || $type == 'contact')
-		{
-			// Loop on each record and update the email to null if email into $groupofemails
-
-			$sql = $sql_base."socpeople as s SET s.email = NULL WHERE s.email = '".$db->escape($email)."';";
-			$db->query($sql);
-		}
-
-		if ($type == 'all' || $type == 'user')
-		{
-			// Loop on each record and update the email to null if email into $groupofemails
-
-			$sql = $sql_base."user as u SET u.email = NULL WHERE u.email = '".$db->escape($email)."';";
-			$db->query($sql);
-		}
-
-		if ($type == 'all' || $type == 'member')
-		{
-			// Loop on each record and update the email to null if email into $groupofemails
-
-			$sql = $sql_base."adherent as a SET a.email = NULL WHERE a.email = '".$db->escape($email)."';";
-			$resql = $db->query($sql);
-		}
-		echo $email;
+		$numerased += $db->affected_rows($resql);
 	}
+
+	if ($type == 'all' || $type == 'thirdparties')
+	{
+		// Loop on each record and update the email to null if email into $groupofemails
+		$sql = $sql_base."societe as s SET s.email = NULL WHERE s.email IN (".$emailsin.");";
+		print "Try to update thirdparties, ";
+		$resql = $db->query($sql);
+		if (!$resql) {
+			dol_print_error($db);
+		}
+		$numerased += $db->affected_rows($resql);
+	}
+
+	if ($type == 'all' || $type == 'contacts')
+	{
+		// Loop on each record and update the email to null if email into $groupofemails
+
+		$sql = $sql_base."socpeople as s SET s.email = NULL WHERE s.email IN (".$emailsin.");";
+		print "Try to update contacts, ";
+		$resql = $db->query($sql);
+		if (!$resql) {
+			dol_print_error($db);
+		}
+		$numerased += $db->affected_rows($resql);
+	}
+
+	if ($type == 'all' || $type == 'members')
+	{
+		// Loop on each record and update the email to null if email into $groupofemails
+
+		$sql = $sql_base."adherent as a SET a.email = NULL WHERE a.email IN (".$emailsin.");";
+		print "Try to update members, ";
+		$resql = $db->query($sql);
+		if (!$resql) {
+			dol_print_error($db);
+		}
+		$numerased += $db->affected_rows($resql);
+	}
+
+	$numerasedtotal += $numerased;
+
+	print $numerased." emails cleared.\n";
+	$counter = $counter + $nbingroup;
 }
 
-if (!$error) {
+if (!$error && $mode == 'confirm') {
+	print "Commit - ".$numerasedtotal." operations validated.\n";
 	$db->commit();
 } else {
+	print "Rollback - ".$numerasedtotal." Operations canceled.\n";
 	$db->rollback();
 }
 

From 210ccc4b43ca4435aca9706f81c8e4eae4470113 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Dec 2020 18:34:32 +0100
Subject: [PATCH 123/888] FIX Missing very important performance indexes

---
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql               | 3 +++
 .../install/mysql/tables/llx_commande_fournisseurdet.key.sql   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index 4a804e5fe4a..2aebd3e5cea 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -517,6 +517,9 @@ UPDATE llx_rights_def set perms = 'delivery' WHERE perms = 'livraison' and modul
 UPDATE llx_rights_def set perms = 'delivery_advance' WHERE perms = 'livraison_advance' and module = 'expedition';
 
 
+ALTER TABLE llx_commande_fournisseurdet ADD INDEX idx_commande_fournisseurdet_fk_commande (fk_commande);
+ALTER TABLE llx_commande_fournisseurdet ADD INDEX idx_commande_fournisseurdet_fk_product (fk_product);
+
 
 CREATE TABLE llx_zapier_hook(
     rowid integer AUTO_INCREMENT PRIMARY KEY,
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.key.sql
index 6c2da9cf094..5d30ddf8817 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.key.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.key.sql
@@ -17,3 +17,6 @@
 -- ============================================================================
 
 ALTER TABLE llx_commande_fournisseurdet ADD CONSTRAINT fk_commande_fournisseurdet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid);
+
+ALTER TABLE llx_commande_fournisseurdet ADD INDEX idx_commande_fournisseurdet_fk_commande (fk_commande);
+ALTER TABLE llx_commande_fournisseurdet ADD INDEX idx_commande_fournisseurdet_fk_product (fk_product);

From 8a7f7b355134e8572b93e48b0a97dc20e0d55b82 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Dec 2020 18:38:18 +0100
Subject: [PATCH 124/888] FIX Request on purchase orders in timeout even on
 very small databases

---
 htdocs/install/mysql/migration/11.0.0-12.0.0.sql               | 3 +++
 .../install/mysql/tables/llx_commande_fournisseurdet.key.sql   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index a7cb8a4729f..8d80486fcf8 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -338,3 +338,6 @@ ALTER TABLE llx_expedition ADD COLUMN billed smallint    DEFAULT 0;
 
 -- VMYSQL4.3 ALTER TABLE llx_mrp_mo MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
+ALTER TABLE llx_commande_fournisseurdet ADD INDEX idx_commande_fournisseurdet_fk_commande (fk_commande);
+ALTER TABLE llx_commande_fournisseurdet ADD INDEX idx_commande_fournisseurdet_fk_product (fk_product);
+
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.key.sql
index 6c2da9cf094..5d30ddf8817 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.key.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.key.sql
@@ -17,3 +17,6 @@
 -- ============================================================================
 
 ALTER TABLE llx_commande_fournisseurdet ADD CONSTRAINT fk_commande_fournisseurdet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid);
+
+ALTER TABLE llx_commande_fournisseurdet ADD INDEX idx_commande_fournisseurdet_fk_commande (fk_commande);
+ALTER TABLE llx_commande_fournisseurdet ADD INDEX idx_commande_fournisseurdet_fk_product (fk_product);

From df48704154522ad77ebefb323ebfd88ddd471e35 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Dec 2020 18:45:56 +0100
Subject: [PATCH 125/888] Fix label

---
 htdocs/fourn/commande/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 69db75ce5fc..ce638cdffcb 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -129,7 +129,7 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
 	'cf.ref'=>'Ref',
-	'cf.ref_supplier'=>'RefSupplierOrder',
+	'cf.ref_supplier'=>'RefOrderSupplier',
 	'pd.description'=>'Description',
 	's.nom'=>"ThirdParty",
 	'cf.note_public'=>'NotePublic',

From 1ff55100d4eca8cdb09a4562cf2202db54935376 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Dec 2020 19:13:40 +0100
Subject: [PATCH 126/888] Fix use combobox for warehousr selection

---
 htdocs/fourn/commande/dispatch.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 4dc090a85b6..d739f70e76e 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -763,9 +763,9 @@ if ($id > 0 || !empty($ref)) {
 
 				// Select warehouse to force it everywhere
 				if (count($listwarehouses) > 1) {
-					print '<br>'.$langs->trans("ForceTo").' '.$form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 1, 0, 0, '', 0, 0, $disabled);
+					print '<br>'.$langs->trans("ForceTo").' '.$form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 1, 0, 0, '', 0, 0, $disabled, '', 'minwidth100 maxwidth300', 1);
 				} elseif (count($listwarehouses) == 1) {
-					print '<br>'.$langs->trans("ForceTo").' '.$form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 0, 0, 0, '', 0, 0, $disabled);
+					print '<br>'.$langs->trans("ForceTo").' '.$form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 0, 0, 0, '', 0, 0, $disabled, '', 'minwidth100 maxwidth300', 1);
 				}
 
 				print '</td>';

From ac30348081c0bde8005541a6e471fdb5dc746ac0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Dec 2020 19:16:34 +0100
Subject: [PATCH 127/888] Prepare 12.0.4

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

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index e1aced7ddf0..b57228f24e9 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -31,7 +31,7 @@
  */
 
 if (!defined('DOL_APPLICATION_TITLE')) define('DOL_APPLICATION_TITLE', 'Dolibarr');
-if (!defined('DOL_VERSION')) define('DOL_VERSION', '12.0.3'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+if (!defined('DOL_VERSION')) define('DOL_VERSION', '12.0.4'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 
 if (!defined('EURO')) define('EURO', chr(128));
 

From 0db72852fb198d036d1918cd20ae5e33f4999ac1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Dec 2020 20:18:37 +0100
Subject: [PATCH 128/888] Fix height of graph

---
 htdocs/compta/facture/index.php | 4 ++--
 htdocs/fourn/facture/index.php  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/facture/index.php b/htdocs/compta/facture/index.php
index eb73132c69f..e96371ad4f4 100644
--- a/htdocs/compta/facture/index.php
+++ b/htdocs/compta/facture/index.php
@@ -192,10 +192,10 @@ function getPieChart($socid = 0)
 	{
 		$dolgraph = new DolGraph();
 		$dolgraph->SetData($dataseries);
-		$dolgraph->setShowLegend(1);
+		$dolgraph->setShowLegend(2);
 		$dolgraph->setShowPercent(1);
 		$dolgraph->SetType(['pie']);
-		$dolgraph->setWidth('100%');
+		$dolgraph->setHeight('200');
 		$dolgraph->draw('idgraphthirdparties');
 
 		$result .= '<tr>';
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index 3c223ce0837..494f5d2aa03 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -193,10 +193,10 @@ function getPieChart($socid = 0)
 	{
 		$dolgraph = new DolGraph();
 		$dolgraph->SetData($dataseries);
-		$dolgraph->setShowLegend(1);
+		$dolgraph->setShowLegend(2);
 		$dolgraph->setShowPercent(1);
 		$dolgraph->SetType(['pie']);
-		$dolgraph->setWidth('100%');
+		$dolgraph->setHeight('200');
 		$dolgraph->draw('idgraphthirdparties');
 
 		$result .= '<tr>';

From e7adde4019995a125efa6ec8607c10882197ee52 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Dec 2020 23:50:45 +0100
Subject: [PATCH 129/888] css

---
 htdocs/takepos/css/pos.css.php   | 2 +-
 htdocs/theme/eldy/global.inc.php | 6 +++---
 htdocs/theme/eldy/style.css.php  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php
index 4b1f4c0bbb7..6cd6073eb48 100644
--- a/htdocs/takepos/css/pos.css.php
+++ b/htdocs/takepos/css/pos.css.php
@@ -467,7 +467,7 @@ div.description_content {
 .header{
 	margin: 0 auto;
 	width: 100%;
-	height: 50px;
+	height: 52px;
 	background: rgb(60,70,100);
 }
 
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 8eafdbad140..3a849c33b3a 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -2078,7 +2078,7 @@ a.tmenudisabled:link, a.tmenudisabled:visited, a.tmenudisabled:hover, a.tmenudis
 }
 
 a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active {
-	padding: 0px 4px 0px 4px;
+	padding: 0px 2px 0px 2px;
 	white-space: nowrap;
 	color: var(--colortextbackhmenu);
     text-decoration: none;
@@ -2530,8 +2530,8 @@ img.login, img.printer, img.entity {
 	font-weight: bold;
 }
 .userimg.atoplogin img.userphoto, .userimgatoplogin img.userphoto {		/* size for user photo in login bar */
-	width: <?php echo $disableimages ? '26' : '32'; ?>px;
-    height: <?php echo $disableimages ? '26' : '32'; ?>px;
+	width: <?php echo $disableimages ? '26' : '30'; ?>px;
+    height: <?php echo $disableimages ? '26' : '30'; ?>px;
     border-radius: 50%;
     background-size: contain;
     background-size: contain;
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 9d8c2b26017..319789b6fde 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -199,7 +199,7 @@ if ($conf->browser->layout == 'phone') $nbtopmenuentries = max($nbtopmenuentries
 
 
 $minwidthtmenu = 66; /* minimum width for one top menu entry */
-$heightmenu = 48; /* height of top menu, part with image */
+$heightmenu = 50; /* height of top menu, part with image */
 $heightmenu2 = 49; /* height of top menu, part with login  */
 $disableimages = 0;
 $maxwidthloginblock = 180;

From 6b0092c30ac3c52ac74f5fc98783cb3d77849c6a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Dec 2020 00:58:51 +0100
Subject: [PATCH 130/888] Several minor bugfixes. Hide option
 TAKEPOS_NUMPAD_USE_PAYMENT_ICON.

---
 htdocs/takepos/admin/setup.php |  7 +++-
 htdocs/takepos/index.php       |  6 ++-
 htdocs/takepos/invoice.php     | 68 +++++++++++++++++++++-------------
 htdocs/takepos/pay.php         | 30 +++++++++------
 htdocs/takepos/reduction.php   |  4 +-
 5 files changed, 72 insertions(+), 43 deletions(-)

diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index 88911f10b7d..84efe32839e 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -232,6 +232,8 @@ foreach ($dirmodels as $reldir)
 }
 print "</table><br>\n";
 
+print '<br>';
+
 // Mode
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -241,7 +243,7 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
-print '<td class="titlefield">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
+print '<td class="notitlefield">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
 // Terminals
@@ -301,11 +303,12 @@ print $form->selectarray('TAKEPOS_NUMPAD', $array, (empty($conf->global->TAKEPOS
 print "</td></tr>\n";
 
 // Numpad use payment icons
-print '<tr class="oddeven"><td>';
+/*print '<tr class="oddeven"><td>';
 print $langs->trans('TakeposNumpadUsePaymentIcon');
 print '<td colspan="2">';
 print ajax_constantonoff("TAKEPOS_NUMPAD_USE_PAYMENT_ICON", array(), $conf->entity, 0, 0, 1, 0);
 print "</td></tr>\n";
+*/
 
 // Direct Payment
 print '<tr class="oddeven"><td>';
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index f76f46fa579..a2293786924 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -813,7 +813,9 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 			</a>
 			<?php
 			if (!empty($conf->multicurrency->enabled)) {
-				print '<a class="valignmiddle tdoverflowmax100 minwidth75" id="multicurrency" onclick="ModalBox(\'ModalCurrency\');" title=""><span class="fas fa-coins paddingrightonly"></span>'.$langs->trans("Currency").'</a>';
+				print '<a class="valignmiddle tdoverflowmax100" id="multicurrency" onclick="ModalBox(\'ModalCurrency\');" title=""><span class="fas fa-coins paddingrightonly"></span>';
+				print '<span class="hideonsmartphone">'.$langs->trans("Currency").'</span>';
+				print '</a>';
 			}
 			?>
 			</div>
@@ -830,7 +832,7 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 				<a onclick="ClearSearch();"><span class="fa fa-backspace"></span></a>
 				<a onclick="window.location.href='<?php echo DOL_URL_ROOT.'/'; ?>';"><span class="fas fa-home"></span></a>
 				<?php if (empty($conf->dol_use_jmobile)) { ?>
-				<a onclick="FullScreen();"><span class="fa fa-expand-arrows-alt"></span></a>
+				<a class="hideonsmartphone" onclick="FullScreen();"><span class="fa fa-expand-arrows-alt"></span></a>
 				<?php } ?>
 				</div>
 				<div class="login_block_user">
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index db6745e8885..9ac81f1ccf9 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -46,11 +46,17 @@ $action = GETPOST('action', 'aZ09');
 $idproduct = GETPOST('idproduct', 'int');
 $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Bar or Restaurant
 $placeid = 0; // $placeid is ID of invoice
+// Terminal is stored into $_SESSION["takeposterminal"];
 
 if (empty($user->rights->takepos->run) && !defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 	accessforbidden();
 }
 
+
+/*
+ * View
+ */
+
 if (($conf->global->TAKEPOS_PHONE_BASIC_LAYOUT == 1 && $conf->browser->layout == 'phone') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE'))
 {
 	// DIRECT LINK TO THIS PAGE FROM MOBILE AND NO TERMINAL SELECTED
@@ -110,9 +116,8 @@ $sql = "SELECT id FROM ".MAIN_DB_PREFIX."c_paiement";
 $sql .= " WHERE entity IN (".getEntity('c_paiement').")";
 $sql .= " AND code = '".$db->escape($paycode)."'";
 $resql = $db->query($sql);
-$codes = $db->fetch_array($resql);
-$paiementid = $codes[0];
-
+$obj = $db->fetch_object($resql);
+$paiementid = $obj->id;
 
 $invoice = new Facture($db);
 if ($invoiceid > 0)
@@ -145,8 +150,7 @@ if ($action == 'valid' && $user->rights->facture->creer)
 
 	if (!empty($conf->global->TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT)) {
 		$bankaccount = GETPOST('accountid', 'int');
-	}
-	else {
+	} else {
 		if ($pay == "cash") $bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$_SESSION["takeposterminal"]};            // For backward compatibility
 		elseif ($pay == "card") $bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CB'.$_SESSION["takeposterminal"]};          // For backward compatibility
 		elseif ($pay == "cheque") $bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$_SESSION["takeposterminal"]};    // For backward compatibility
@@ -226,6 +230,10 @@ if ($action == 'valid' && $user->rights->facture->creer)
 		$conf->global->STOCK_CALCULATE_ON_BILL = $savconst;
 	} else {
 		$res = $invoice->validate($user);
+		if ($res < 0) {
+			$error++;
+			dol_htmloutput_errors($invoice->error, $invoice->errors, 1);
+		}
 	}
 
 	// Restore save values
@@ -1006,7 +1014,7 @@ $( document ).ready(function() {
 
     $("#customerandsales").html('');
 
-	$("#customerandsales").append('<a class="valignmiddle tdoverflowmax100 minwidth75" id="customer" onclick="Customer();" title="<?php print dol_escape_js($s); ?>"><span class="fas fa-building paddingrightonly"></span><?php print dol_escape_js($s); ?></a>');
+	$("#customerandsales").append('<a class="valignmiddle tdoverflowmax100 minwidth100" id="customer" onclick="Customer();" title="<?php print dol_escape_js($s); ?>"><span class="fas fa-building paddingrightonly"></span><?php print dol_escape_js($s); ?></a>');
 
 	<?php
 	$sql = "SELECT rowid, datec, ref FROM ".MAIN_DB_PREFIX."facture";
@@ -1234,7 +1242,7 @@ if ($placeid > 0)
 
 	if (is_array($invoice->lines) && count($invoice->lines))
 	{
-		print '<!-- Show lines of invoices -->'."\n";
+		print '<!-- invoice.php show lines of invoices -->'."\n";
 		$tmplines = array_reverse($invoice->lines);
 		foreach ($tmplines as $line)
 		{
@@ -1307,7 +1315,9 @@ if ($placeid > 0)
 				}
 			}
 			if (!empty($line->array_options['options_order_notes'])) $htmlforlines .= "<br>(".$line->array_options['options_order_notes'].")";
-			if ($_SESSION["basiclayout"] == 1) $htmlforlines .= '</td><td class="right phonetable"><button type="button" onclick="SetQty(place, '.$line->rowid.', '.($line->qty - 1).');" class="publicphonebutton2 phonered">-</button>&nbsp;&nbsp;<button type="button" onclick="SetQty(place, '.$line->rowid.', '.($line->qty + 1).');" class="publicphonebutton2 phonegreen">+</button>';
+			if ($_SESSION["basiclayout"] == 1) {
+				$htmlforlines .= '</td><td class="right phonetable"><button type="button" onclick="SetQty(place, '.$line->rowid.', '.($line->qty - 1).');" class="publicphonebutton2 phonered">-</button>&nbsp;&nbsp;<button type="button" onclick="SetQty(place, '.$line->rowid.', '.($line->qty + 1).');" class="publicphonebutton2 phonegreen">+</button>';
+			}
 			if ($_SESSION["basiclayout"] != 1)
 			{
 				$moreinfo = '';
@@ -1318,32 +1328,40 @@ if ($placeid > 0)
 				$moreinfo .= '<br>'.$langs->transcountry("TotalLT2", $mysoc->country_code).': '.price($line->total_localtax2);
 				$moreinfo .= '<br>'.$langs->transcountry("TotalTTC", $mysoc->country_code).': '.price($line->total_ttc);
 				//$moreinfo .= $langs->trans("TotalHT").': '.$line->total_ht;
-				if ($line->date_start || $line->date_end) $htmlforlines .= '<br><div class="clearboth nowraponall">'.get_date_range($line->date_start, $line->date_end, $format).'</div>';
+				if ($line->date_start || $line->date_end) $htmlforlines .= '<br><div class="clearboth nowraponall">'.get_date_range($line->date_start, $line->date_end).'</div>';
 				$htmlforlines .= '</td>';
 				$htmlforlines .= '<td class="right">'.vatrate($line->remise_percent, true).'</td>';
 				$htmlforlines .= '<td class="right">';
 				if (!empty($conf->stock->enabled) && !empty($user->rights->stock->mouvement->lire))
 				{
 					$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
-					$sql = "SELECT e.rowid, e.ref, e.lieu, e.fk_parent, e.statut, ps.reel, ps.rowid as product_stock_id, p.pmp";
-					$sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e,";
-					$sql .= " ".MAIN_DB_PREFIX."product_stock as ps";
-					$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = ps.fk_product";
-					$sql .= " WHERE ps.reel != 0";
-					$sql .= " AND ps.fk_entrepot = ".$conf->global->$constantforkey;
-					$sql .= " AND e.entity IN (".getEntity('stock').")";
-					$sql .= " AND ps.fk_product = ".$line->fk_product;
-					$resql = $db->query($sql);
-					if ($resql) {
-						$obj = $db->fetch_object($resql);
-						$stock_real = price2num($obj->reel, 'MS');
+					if (!empty($conf->global->$constantforkey)) {
+						$sql = "SELECT e.rowid, e.ref, e.lieu, e.fk_parent, e.statut, ps.reel, ps.rowid as product_stock_id, p.pmp";
+						$sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e,";
+						$sql .= " ".MAIN_DB_PREFIX."product_stock as ps";
+						$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = ps.fk_product";
+						$sql .= " WHERE ps.reel != 0";
+						$sql .= " AND ps.fk_entrepot = ".$conf->global->$constantforkey;
+						$sql .= " AND e.entity IN (".getEntity('stock').")";
+						$sql .= " AND ps.fk_product = ".$line->fk_product;
+						$resql = $db->query($sql);
+						if ($resql) {
+							$obj = $db->fetch_object($resql);
+							$stock_real = price2num($obj->reel, 'MS');
+							$htmlforlines .= $line->qty;
+							if ($line->qty && $line->qty > $stock_real) $htmlforlines .= '<span style="color: var(--amountremaintopaycolor)">';
+							$htmlforlines .= ' <span class="posstocktoolow">('.$langs->trans("Stock").' '.$stock_real.')</span>';
+							if ($line->qty && $line->qty > $stock_real) $htmlforlines .= "</span>";
+						} else {
+							dol_print_error($db);
+						}
+					} else {
 						$htmlforlines .= $line->qty;
-						if ($line->qty && $line->qty > $stock_real) $htmlforlines .= '<span style="color: var(--amountremaintopaycolor)">';
-						$htmlforlines .= ' <span class="posstocktoolow">('.$langs->trans("Stock").' '.$stock_real.')</span>';
-						if ($line->qty && $line->qty > $stock_real) $htmlforlines .= "</span>";
 					}
+				} else {
+					$htmlforlines .= $line->qty;
 				}
-				else $htmlforlines .= $line->qty;
+
 				$htmlforlines .= '</td>';
 				$htmlforlines .= '<td class="right classfortooltip" title="'.$moreinfo.'">';
 				$htmlforlines .= price($line->total_ttc, 1, '', 1, -1, -1, $conf->currency);
diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index 0d80eeffbc0..c1683073371 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -192,8 +192,14 @@ else print "var received=0;";
 		}
 		console.log("We click on the payment mode to pay amount = "+amountpayed);
 		parent.$("#poslines").load("invoice.php?place=<?php echo $place; ?>&action=valid&pay="+payment+"&amount="+amountpayed+"&excess="+excess+"&invoiceid="+invoiceid+"&accountid="+accountid, function() {
-		    if (amountpayed > <?php echo $remaintopay; ?> || amountpayed == <?php echo $remaintopay; ?> || amountpayed==0 ) parent.$.colorbox.close();
-			else location.reload();
+		    if (amountpayed > <?php echo $remaintopay; ?> || amountpayed == <?php echo $remaintopay; ?> || amountpayed==0 ) {
+		    	console.log("Close popup");
+		    	parent.$.colorbox.close();
+		    }
+			else {
+				console.log("Amount is not comple, so we do NOT close popup and reload it.");
+				location.reload();
+			}
 		});
 	}
 
@@ -288,16 +294,16 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 	$payIcon = '';
 	if ($paycode == 'LIQ') {
 		$paycode = 'cash';
-		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'coins';
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'coins';
 	} elseif ($paycode == 'CB') {
 		$paycode = 'card';
-		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'credit-card';
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'credit-card';
 	} elseif ($paycode == 'CHQ') {
 		$paycode = 'cheque';
-		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
 	}
 
-	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span><br> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code) : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code)).'</button>';
+	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span><span class="hideonsmartphone"><br>'. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code) : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code)).'</span></button>';
 } else {
 	print '<button type="button" class="calcbutton2">'.$langs->trans("NoPaimementModesDefined").'</button>';
 }
@@ -311,13 +317,13 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 	$payIcon = '';
 	if ($paycode == 'LIQ') {
 		$paycode = 'cash';
-		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'coins';
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'coins';
 	} elseif ($paycode == 'CB') {
 		$paycode = 'card';
-		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'credit-card';
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'credit-card';
 	} elseif ($paycode == 'CHQ') {
 		$paycode = 'cheque';
-		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
 	}
 
 	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span><br> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[1]->code) : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[1]->code)).'</button>';
@@ -335,13 +341,13 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 	$payIcon = '';
 	if ($paycode == 'LIQ') {
 		$paycode = 'cash';
-		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'coins';
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'coins';
 	} elseif ($paycode == 'CB') {
 		$paycode = 'card';
-		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'credit-card';
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'credit-card';
 	} elseif ($paycode == 'CHQ') {
 		$paycode = 'cheque';
-		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
 	}
 
 	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span>'.(!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS) ? '<br> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[2]->code) : '') : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[2]->code)).'</button>';
diff --git a/htdocs/takepos/reduction.php b/htdocs/takepos/reduction.php
index fa458d96318..dd808d9a19d 100644
--- a/htdocs/takepos/reduction.php
+++ b/htdocs/takepos/reduction.php
@@ -74,9 +74,9 @@ top_htmlhead($head, '', 0, 0, $arrayofjs, $arrayofcss);
 
 $langs->loadLangs(array('main', 'bills', 'cashdesk'));
 
-if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
+if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
 	$htmlReductionPercent = '<span class="fa fa-2x fa-percent"></span>';
-	$htmlReductionAmount = '<span class="fa fa-2x fa-money"></span>';
+	$htmlReductionAmount = '<span class="fa fa-2x fa-money"></span><br>'.$langs->trans('Amount');
 } else {
 	$htmlReductionPercent = $langs->trans('ReductionShort').'<br>%';
 	$htmlReductionAmount = $langs->trans('ReductionShort').'<br>'.$langs->trans('Amount');

From 040d22ef0a2b3ead1ec0595fd8820aabe67fc1d4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Dec 2020 01:59:47 +0100
Subject: [PATCH 131/888] Fix phpcs

---
 htdocs/commande/card.php                   | 2 +-
 htdocs/core/class/html.form.class.php      | 2 +-
 scripts/emailings/reset-invalid-emails.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index c4c45df4bc7..80ff2180801 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -920,7 +920,7 @@ if (empty($reshook))
 				if ($result > 0) {
 					$ret = $object->fetch($object->id); // Reload to get new records
 					$object->fetch_thirdparty();
-					
+
 					if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 						// Define output language
 						$outputlangs = $langs;
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index eed09e3c92c..00bfd60e4ad 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1492,7 +1492,7 @@ class Form
 			}
 
 			if ($htmlname != 'none' && !$options_only) {
-				$out .= '<select class="flat'.($moreclass ? ' '.$moreclass : '').'"'.' id="'.$htmlid.'" name="'.$htmlname.(($num || empty($disableifempty)) ? '' : ' disabled').($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.(!empty($moreparam) ? $moreparam : '').'>';
+				$out .= '<select class="flat'.($moreclass ? ' '.$moreclass : '').'" id="'.$htmlid.'" name="'.$htmlname.(($num || empty($disableifempty)) ? '' : ' disabled').($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.(!empty($moreparam) ? $moreparam : '').'>';
 			}
 
 			if (($showempty == 1 || ($showempty == 3 && $num > 1)) && !$multiple) $out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>&nbsp;</option>';
diff --git a/scripts/emailings/reset-invalid-emails.php b/scripts/emailings/reset-invalid-emails.php
index c66f6082a9f..bc35f0f4240 100755
--- a/scripts/emailings/reset-invalid-emails.php
+++ b/scripts/emailings/reset-invalid-emails.php
@@ -96,7 +96,7 @@ while ($tmp != null)
 
 	// Generate the string tp allow a mass update (with a limit of MAXEMAILS per request).
 	$emailsin = '';
-	foreach($groupofemails as $email) {
+	foreach ($groupofemails as $email) {
 		$emailsin .= ($emailsin ? ", " : "")."'".$db->escape($email)."'";
 	}
 

From 0a242983859f864d36ea2760af713098cbc49041 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Fri, 4 Dec 2020 02:57:40 +0100
Subject: [PATCH 132/888] FIX: Problem on supplier payment card

---
 htdocs/fourn/class/paiementfourn.class.php | 1 +
 htdocs/fourn/paiement/card.php             | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index b48fef9759a..fd07cc7bf89 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -118,6 +118,7 @@ class PaiementFourn extends Paiement
 				$this->bank_account   = $obj->fk_account;
 				$this->bank_line      = $obj->fk_bank;
 				$this->montant        = $obj->amount;
+				$this->amount        = $obj->amount;
 				$this->note           = $obj->note;
 				$this->type_code      = $obj->paiement_code;
 				$this->type_libelle   = $obj->paiement_type;
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index 6d9661ded5d..6aec24bb0a8 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -274,10 +274,9 @@ if ($result > 0)
 
 		$i = 0;
 		$total = 0;
-		print '<b>'.$langs->trans("Invoices").'</b><br>';
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td>'.$langs->trans('Ref').'</td>';
+		print '<td>'.$langs->trans('Invoice').'</td>';
 		print '<td>'.$langs->trans('RefSupplier').'</td>';
 		print '<td>'.$langs->trans('Company').'</td>';
 		print '<td class="right">'.$langs->trans('ExpectedToPay').'</td>';

From 7a5a6a14f0d3ea5f53a6295ddb4c9a6f664d32ad Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 4 Dec 2020 09:10:36 +0100
Subject: [PATCH 133/888] fix At install insert shipment mode failed

---
 htdocs/install/mysql/data/llx_c_shipment_mode.sql | 12 ++++++------
 htdocs/install/mysql/migration/11.0.0-12.0.0.sql  |  8 ++++++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql
index e5026f8d2f7..0dd00f27bb4 100644
--- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql
+++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql
@@ -37,9 +37,9 @@ INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active)
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (6,'KIALA','KIALA','Relais Kiala','http://www.kiala.fr/tnt/delivery/{TRACKID}', 0);
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (7,'GLS','GLS','General Logistics Systems','https://gls-group.eu/FR/fr/suivi-colis?match={TRACKID}', 0);
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (8,'CHRONO','Chronopost','Chronopost','http://www.chronopost.fr/expedier/inputLTNumbersNoJahia.do?listeNumeros={TRACKID}', 0);
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (9,'INPERSON', 'In person at your site', NULL, NULL, 0, NULL),
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (10,'FEDEX', 'Fedex', NULL, 'https://www.fedex.com/apps/fedextrack/index.html?tracknumbers={TRACKID}', 0, NULL),
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (11,'TNT', 'TNT', NULL, 'https://www.tnt.com/express/fr_fr/site/outils-expedition/suivi.html?searchType=con&cons=={TRACKID}', 0, NULL),
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (12,'DHL', 'DHL', NULL, 'https://www.dhl.com/fr-fr/home/tracking/tracking-global-forwarding.html?submit=1&tracking-id={TRACKID}', 0, NULL),
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (13,'DPD', 'DPD', NULL, 'https://www.dpd.fr/trace/{TRACKID}', 0, NULL),
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (14,'MAINFREIGHT', 'Mainfreight', NULL, 'https://www.mainfreight.com/track?{TRACKID}', 0, NULL);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (9,'INPERSON', 'In person at your site', NULL, NULL, 0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (10,'FEDEX', 'Fedex', NULL, 'https://www.fedex.com/apps/fedextrack/index.html?tracknumbers={TRACKID}', 0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (11,'TNT', 'TNT', NULL, 'https://www.tnt.com/express/fr_fr/site/outils-expedition/suivi.html?searchType=con&cons=={TRACKID}', 0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (12,'DHL', 'DHL', NULL, 'https://www.dhl.com/fr-fr/home/tracking/tracking-global-forwarding.html?submit=1&tracking-id={TRACKID}', 0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (13,'DPD', 'DPD', NULL, 'https://www.dpd.fr/trace/{TRACKID}', 0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (14,'MAINFREIGHT', 'Mainfreight', NULL, 'https://www.mainfreight.com/track?{TRACKID}', 0);
diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index 8d80486fcf8..fddfb8c8097 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -341,3 +341,11 @@ ALTER TABLE llx_expedition ADD COLUMN billed smallint    DEFAULT 0;
 ALTER TABLE llx_commande_fournisseurdet ADD INDEX idx_commande_fournisseurdet_fk_commande (fk_commande);
 ALTER TABLE llx_commande_fournisseurdet ADD INDEX idx_commande_fournisseurdet_fk_product (fk_product);
 
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (9,'INPERSON', 'In person at your site', NULL, NULL, 0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (10,'FEDEX', 'Fedex', NULL, 'https://www.fedex.com/apps/fedextrack/index.html?tracknumbers={TRACKID}', 0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (11,'TNT', 'TNT', NULL, 'https://www.tnt.com/express/fr_fr/site/outils-expedition/suivi.html?searchType=con&cons=={TRACKID}', 0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (12,'DHL', 'DHL', NULL, 'https://www.dhl.com/fr-fr/home/tracking/tracking-global-forwarding.html?submit=1&tracking-id={TRACKID}', 0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (13,'DPD', 'DPD', NULL, 'https://www.dpd.fr/trace/{TRACKID}', 0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (14,'MAINFREIGHT', 'Mainfreight', NULL, 'https://www.mainfreight.com/track?{TRACKID}', 0);
+
+

From d712e1e6d46fdb58eb8db0e78a2ad39e3cc68109 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Fri, 4 Dec 2020 09:42:30 +0100
Subject: [PATCH 134/888] Fix limit product in customer margins

Fix limit of 20 products in product list/search
---
 htdocs/margin/customerMargins.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 3cdd9c3c650..a0b5ad2be04 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -134,7 +134,7 @@ if (!$sortfield)
 }
 
 // Products
-$TRes = $form->select_produits_list('', '', '', 20, 0, '', 1, 2, 1, 0, '', 1);
+$TRes = $form->select_produits_list('', '', '', '', 0, '', 1, 2, 1, 0, '', 1);
 
 $TProducts = array();
 foreach ($TRes as $prod) {

From c752bfe1a6b39f409c3d4c900b338b4da922291c Mon Sep 17 00:00:00 2001
From: Florian Mortgat <florian.mortgat@atm-consulting.fr>
Date: Fri, 4 Dec 2020 10:02:39 +0100
Subject: [PATCH 135/888] FIX 12.0 - set entity to $conf->entity (instead of 1
 by default) when creating a survey; otherwise the survey cannot be listed
 from the entity it was created on unless it is the main entity

---
 htdocs/opensurvey/class/opensurveysondage.class.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index c971b69b208..83902f8c678 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -128,6 +128,7 @@ class Opensurveysondage extends CommonObject
      */
     public function create(User $user, $notrigger = 0)
     {
+        global $conf;
         $error = 0;
 
         // Clean parameters
@@ -153,7 +154,8 @@ class Opensurveysondage extends CommonObject
         $sql .= "mailsonde,";
         $sql .= "allow_comments,";
         $sql .= "allow_spy,";
-        $sql .= "sujet";
+        $sql .= "sujet,";
+        $sql .= "entity";
         $sql .= ") VALUES (";
         $sql .= "'".$this->db->escape($this->id_sondage)."',";
         $sql .= " ".(empty($this->commentaires) ? 'NULL' : "'".$this->db->escape($this->commentaires)."'").",";
@@ -165,7 +167,8 @@ class Opensurveysondage extends CommonObject
         $sql .= " ".$this->db->escape($this->mailsonde).",";
         $sql .= " ".$this->db->escape($this->allow_comments).",";
         $sql .= " ".$this->db->escape($this->allow_spy).",";
-        $sql .= " '".$this->db->escape($this->sujet)."'";
+        $sql .= " '".$this->db->escape($this->sujet)."',";
+        $sql .= " '".$conf->entity."',";
         $sql .= ")";
 
         $this->db->begin();

From 94d57cd462ca57ee7ad8283321822dabaa34f3e2 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 4 Dec 2020 10:03:06 +0100
Subject: [PATCH 136/888] fix rounding

---
 htdocs/fourn/class/fournisseur.commande.class.php | 2 +-
 htdocs/fourn/class/fournisseur.product.class.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index dc3113f2554..af283d8cdf0 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1729,9 +1729,9 @@ class CommandeFournisseur extends CommonOrder
 						{
 							$coeff = intval($qty / $prod->packaging) + 1;
 							$qty = $prod->packaging * $coeff;
-							setEventMessage($langs->trans('QtyRecalculatedWithPackaging'), 'mesgs');
 						}
 					}
+					setEventMessage($langs->trans('QtyRecalculatedWithPackaging'), 'mesgs');
 				}
             }
             else
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 1643ae69846..5a36e6bdabf 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -274,7 +274,7 @@ class ProductFournisseur extends Product
 		$charges = price2num($charges, 'MU');
         $qty = price2num($qty, 'MS');
 		$unitBuyPrice = price2num($buyprice / $qty, 'MU');
-		$packaging = ($this->packaging < $qty) ? $qty : $this->packaging;
+		$packaging = price2num((($this->packaging < $qty) ? $qty : $this->packaging), 'MS');
 
 		$error = 0;
 		$now = dol_now();

From 7685ed8295ab60e6c3668610fdba56ad18e45d98 Mon Sep 17 00:00:00 2001
From: Florian Mortgat <florian.mortgat@atm-consulting.fr>
Date: Fri, 4 Dec 2020 10:10:44 +0100
Subject: [PATCH 137/888] FIX excess comma

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

diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index 83902f8c678..9d7462e87b6 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -168,7 +168,7 @@ class Opensurveysondage extends CommonObject
         $sql .= " ".$this->db->escape($this->allow_comments).",";
         $sql .= " ".$this->db->escape($this->allow_spy).",";
         $sql .= " '".$this->db->escape($this->sujet)."',";
-        $sql .= " '".$conf->entity."',";
+        $sql .= " ".$conf->entity;
         $sql .= ")";
 
         $this->db->begin();

From 2173b8566e83ac7a10fe831e54dc580e671ffb14 Mon Sep 17 00:00:00 2001
From: Denis <contact@vin-benassy.fr>
Date: Fri, 4 Dec 2020 10:58:29 +0100
Subject: [PATCH 138/888] Corrected "cash fence" to "cash desk closing" on
 english .lang files

---
 htdocs/langs/en_US/banks.lang      | 4 ++--
 htdocs/langs/en_US/blockedlog.lang | 2 +-
 htdocs/langs/en_US/cashdesk.lang   | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index 9500a5b8b2e..a0dc27f86c4 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/en_US/blockedlog.lang b/htdocs/langs/en_US/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/en_US/blockedlog.lang
+++ b/htdocs/langs/en_US/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index 549646ab110..8e529fe92f2 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,8 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+ControlCashOpening=Control cash desk at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use

From 0d4121c5bdb34c43adb5b4bdb3cce1b0338703bf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Dec 2020 12:01:41 +0100
Subject: [PATCH 139/888] Fix warning

---
 htdocs/contact/class/contact.class.php | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 59423ec2b42..6c6133e906a 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -805,19 +805,16 @@ class Contact extends CommonObject
 		}
 
 		// Mis a jour alerte birthday
-		if ($this->birthday_alert)
-		{
+		if (!empty($this->birthday_alert)) {
 			//check existing
 			$sql_check = "SELECT rowid FROM ".MAIN_DB_PREFIX."user_alert WHERE type=1 AND fk_contact=".$this->db->escape($id)." AND fk_user=".$user->id;
 			$result_check = $this->db->query($sql_check);
-			if (!$result_check || ($this->db->num_rows($result_check) < 1))
-			{
+			if (!$result_check || ($this->db->num_rows($result_check) < 1)) {
 				//insert
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_alert(type,fk_contact,fk_user) ";
 				$sql .= "VALUES (1,".$this->db->escape($id).",".$user->id.")";
 				$result = $this->db->query($sql);
-				if (!$result)
-				{
+				if (!$result) {
 					$error++;
 					$this->error = $this->db->lasterror();
 				}
@@ -828,23 +825,20 @@ class Contact extends CommonObject
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_alert ";
 			$sql .= "WHERE type=1 AND fk_contact=".$this->db->escape($id)." AND fk_user=".$user->id;
 			$result = $this->db->query($sql);
-			if (!$result)
-			{
+			if (!$result) {
 				$error++;
 				$this->error = $this->db->lasterror();
 			}
 		}
 
-		if (!$error && !$notrigger)
-		{
+		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('CONTACT_MODIFY', $user);
 			if ($result < 0) { $error++; }
 			// End call triggers
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {

From 34679c3bc1f43aa5f4dbf667384739c7a79e7666 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Dec 2020 13:22:47 +0100
Subject: [PATCH 140/888] Fix warning in phpunit

---
 htdocs/main.inc.php           | 4 ++--
 test/phpunit/SecurityTest.php | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 1724ae9dd42..90e173ec168 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -243,12 +243,12 @@ $prefix = dol_getprefix(''); // This uses the $conf file
 $sessionname = 'DOLSESSID_'.$prefix;
 $sessiontimeout = 'DOLSESSTIMEOUT_'.$prefix;
 if (!empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime', $_COOKIE[$sessiontimeout]);
-session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
-session_name($sessionname);
 // This create lock, released by session_write_close() or end of page.
 // We need this lock as long as we read/write $_SESSION ['vars']. We can remove lock when finished.
 if (!defined('NOSESSION'))
 {
+	session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
+	session_name($sessionname);
 	session_start();
 }
 
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 008a2dcafd1..f6eb7783c4f 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -34,6 +34,7 @@ if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no
 if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
 if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
 if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+if (! defined("NOSESSION"))      define("NOSESSION", '1');
 
 require_once dirname(__FILE__).'/../../htdocs/main.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security.lib.php';

From c8f918265a1cfbf0b28917465667c598d33fd40e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Dec 2020 13:25:56 +0100
Subject: [PATCH 141/888] Removed dead code

---
 test/phpunit/SocieteTest.php | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php
index 4ed0771d668..0ca6cc8792b 100755
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php
@@ -382,25 +382,6 @@ class SocieteTest extends PHPUnit\Framework\TestCase
         return $result;
     }
 
-    /**
-     * testSocieteStatic
-     *
-     * @return  void
-     */
-    public function testSocieteStatic()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $localobject=new Societe($db);
-
-
-        return;
-    }
-
 
     /**
      * testSocieteGetFullAddress

From 575bb7d420a3f8f2638c40baca817f5618f562b8 Mon Sep 17 00:00:00 2001
From: atm-benoit <benoit.costechareyre@atm-consulting.fr>
Date: Fri, 4 Dec 2020 14:20:25 +0100
Subject: [PATCH 142/888] FIX SHIP MODE install v12 bug insert

---
 htdocs/install/mysql/data/llx_c_shipment_mode.sql | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql
index e5026f8d2f7..97c05b13d0c 100644
--- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql
+++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql
@@ -37,9 +37,9 @@ INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active)
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (6,'KIALA','KIALA','Relais Kiala','http://www.kiala.fr/tnt/delivery/{TRACKID}', 0);
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (7,'GLS','GLS','General Logistics Systems','https://gls-group.eu/FR/fr/suivi-colis?match={TRACKID}', 0);
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (8,'CHRONO','Chronopost','Chronopost','http://www.chronopost.fr/expedier/inputLTNumbersNoJahia.do?listeNumeros={TRACKID}', 0);
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (9,'INPERSON', 'In person at your site', NULL, NULL, 0, NULL),
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (10,'FEDEX', 'Fedex', NULL, 'https://www.fedex.com/apps/fedextrack/index.html?tracknumbers={TRACKID}', 0, NULL),
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (11,'TNT', 'TNT', NULL, 'https://www.tnt.com/express/fr_fr/site/outils-expedition/suivi.html?searchType=con&cons=={TRACKID}', 0, NULL),
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (12,'DHL', 'DHL', NULL, 'https://www.dhl.com/fr-fr/home/tracking/tracking-global-forwarding.html?submit=1&tracking-id={TRACKID}', 0, NULL),
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (13,'DPD', 'DPD', NULL, 'https://www.dpd.fr/trace/{TRACKID}', 0, NULL),
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (14,'MAINFREIGHT', 'Mainfreight', NULL, 'https://www.mainfreight.com/track?{TRACKID}', 0, NULL);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (9,'INPERSON', 'In person at your site', NULL, NULL, 0),
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (10,'FEDEX', 'Fedex', NULL, 'https://www.fedex.com/apps/fedextrack/index.html?tracknumbers={TRACKID}', 0),
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (11,'TNT', 'TNT', NULL, 'https://www.tnt.com/express/fr_fr/site/outils-expedition/suivi.html?searchType=con&cons=={TRACKID}', 0),
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (12,'DHL', 'DHL', NULL, 'https://www.dhl.com/fr-fr/home/tracking/tracking-global-forwarding.html?submit=1&tracking-id={TRACKID}', 0),
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (13,'DPD', 'DPD', NULL, 'https://www.dpd.fr/trace/{TRACKID}', 0, ),
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (14,'MAINFREIGHT', 'Mainfreight', NULL, 'https://www.mainfreight.com/track?{TRACKID}', 0);

From 9c191cda431f2a465576359d17d4adea7623a46d Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 4 Dec 2020 14:28:09 +0100
Subject: [PATCH 143/888] New #8172 : PHPExcel replace by PHPSpreadSheet

---
 .../modules/import/import_xlsx.modules.php    | 264 ++++++++----------
 1 file changed, 117 insertions(+), 147 deletions(-)

diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index 858dc8e1076..783370eae0f 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -25,7 +25,11 @@
  *		\brief      File to load import files with Excel format
  */
 
-require_once DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php';
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+
+require_once DOL_DOCUMENT_ROOT . '/core/modules/import/modules_import.php';
 
 
 /**
@@ -107,24 +111,29 @@ class ImportXlsx extends ModeleImports
 		$this->extension = 'xlsx'; // Extension for generated file by this driver
 		$this->picto = 'mime/xls'; // Picto (This is not used by the example file code as Mime type, too bad ...)
 		$this->version = '1.0'; // Driver version
-
 		// If driver use an external library, put its name here
-		require_once PHPEXCEL_PATH.'PHPExcel.php';
-		require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
-		if (!class_exists('ZipArchive')) // For Excel2007, PHPExcel need ZipArchive
+		require_once DOL_DOCUMENT_ROOT . '/includes/phpoffice/autoloader.php';
+		require_once DOL_DOCUMENT_ROOT . '/includes/Psr/autoloader.php';
+		require_once PHPEXCELNEW_PATH . 'Spreadsheet.php';
+		$this->workbook = new Spreadsheet();
+		
+		//if ($this->id == 'excel2007new')
 		{
+			if (!class_exists('ZipArchive'))	// For Excel2007
+			{
 				$langs->load("errors");
 				$this->error = $langs->trans('ErrorPHPNeedModule', 'zip');
 				return -1;
+			}
 		}
-		$this->label_lib = 'PhpExcel';
+		$this->label_lib = 'PhpSpreadSheet';
 		$this->version_lib = '1.8.0';
-
+		
 		$this->datatoimport = $datatoimport;
 		if (preg_match('/^societe_/', $datatoimport)) $this->thirpartyobject = new Societe($this->db);
 	}
-
-
+	
+	
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output header of an example file for this format
@@ -135,21 +144,12 @@ class ImportXlsx extends ModeleImports
 	public function write_header_example($outputlangs)
 	{
 		// phpcs:enable
-		global $user, $conf, $langs;
+		global $user, $conf, $langs, $file;
 		// create a temporary object, the final output will be generated in footer
-		if (!empty($conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR)) {
-			$cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_discISAM;
-			$cacheSettings = array(
-				'dir' => $conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR
-			);
-			PHPExcel_Settings::setCacheStorageMethod($cacheMethod, $cacheSettings);
-		}
-
-		$this->workbook = new PHPExcel();
-		$this->workbook->getProperties()->setCreator($user->getFullName($outputlangs).' - Dolibarr '.DOL_VERSION);
-		$this->workbook->getProperties()->setTitle($outputlangs->trans("Import").' - '.$file);
-		$this->workbook->getProperties()->setSubject($outputlangs->trans("Import").' - '.$file);
-		$this->workbook->getProperties()->setDescription($outputlangs->trans("Import").' - '.$file);
+		$this->workbook->getProperties()->setCreator($user->getFullName($outputlangs) . ' - Dolibarr ' . DOL_VERSION);
+		$this->workbook->getProperties()->setTitle($outputlangs->trans("Import") . ' - ' . $file);
+		$this->workbook->getProperties()->setSubject($outputlangs->trans("Import") . ' - ' . $file);
+		$this->workbook->getProperties()->setDescription($outputlangs->trans("Import") . ' - ' . $file);
 
 		$this->workbook->setActiveSheetIndex(0);
 		$this->workbook->getActiveSheet()->setTitle($outputlangs->trans("Sheet"));
@@ -171,7 +171,7 @@ class ImportXlsx extends ModeleImports
 		// phpcs:enable
 		global $conf;
 		$this->workbook->getActiveSheet()->getStyle('1')->getFont()->setBold(true);
-		$this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
+		$this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(Alignment::HORIZONTAL_LEFT);
 
 		$col = 0;
 		foreach ($headerlinefields as $field) {
@@ -217,7 +217,7 @@ class ImportXlsx extends ModeleImports
 		// phpcs:enable
 		// return the file content as a string
 		$tempfile = tempnam(sys_get_temp_dir(), 'dol');
-		$objWriter = new PHPExcel_Writer_Excel2007($this->workbook);
+		$objWriter = new PhpOffice\PhpSpreadsheet\Writer\Xlsx($this->workbook);
 		$objWriter->save($tempfile);
 		$this->workbook->disconnectWorksheets();
 		unset($this->workbook);
@@ -242,9 +242,9 @@ class ImportXlsx extends ModeleImports
 		global $langs;
 		$ret = 1;
 
-		dol_syslog(get_class($this)."::open_file file=".$file);
+		dol_syslog(get_class($this) . "::open_file file=" . $file);
 
-		$reader = new PHPExcel_Reader_Excel2007();
+		$reader = new Xlsx();
 		$this->workbook = $reader->load($file);
 		$this->record = 1;
 		$this->file = $file;
@@ -263,7 +263,7 @@ class ImportXlsx extends ModeleImports
 	public function import_get_nb_of_lines($file)
 	{
 		// phpcs:enable
-		$reader = new PHPExcel_Reader_Excel2007();
+		$reader = new Xlsx();
 		$this->workbook = $reader->load($file);
 
 		$rowcount = $this->workbook->getActiveSheet()->getHighestDataRow();
@@ -286,8 +286,10 @@ class ImportXlsx extends ModeleImports
 		// phpcs:enable
 		// This is not called by the import code !!!
 		$this->headers = array();
-		$colcount = PHPExcel_Cell::columnIndexFromString($this->workbook->getActiveSheet()->getHighestDataColumn());
-		for ($col = 0; $col < $colcount; $col++) {
+		$xlsx = new Xlsx();
+		$info = $xlsx->listWorksheetinfo($this->file);
+		$countcolumns = $info[0]['totalColumns'];
+		for ($col = 0; $col < $countcolumns; $col++) {
 			$this->headers[$col] = $this->workbook->getActiveSheet()->getCellByColumnAndRow($col, 1)->getValue();
 		}
 		return 0;
@@ -309,8 +311,10 @@ class ImportXlsx extends ModeleImports
 		if ($this->record > $rowcount)
 			return false;
 		$array = array();
-		$colcount = PHPExcel_Cell::columnIndexFromString($this->workbook->getActiveSheet()->getHighestDataColumn(0));
-		for ($col = 0; $col < $colcount; $col++) {
+		$xlsx = new Xlsx();
+		$info = $xlsx->listWorksheetinfo($this->file);
+		$countcolumns = $info[0]['totalColumns'];
+		for ($col = 0; $col < $countcolumns; $col++) {
 			$val = $this->workbook->getActiveSheet()->getCellByColumnAndRow($col, $this->record)->getValue();
 			$array[$col]['val'] = $val;
 			$array[$col]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we consider it null
@@ -368,8 +372,7 @@ class ImportXlsx extends ModeleImports
 
 		//var_dump($sort_array_match_file_to_database);
 
-		if (count($arrayrecord) == 0 || (count($arrayrecord) == 1 && empty($arrayrecord[0]['val'])))
-		{
+		if (count($arrayrecord) == 0 || (count($arrayrecord) == 1 && empty($arrayrecord[0]['val']))) {
 			//print 'W';
 			$this->warnings[$warning]['lib'] = $langs->trans('EmptyLine');
 			$this->warnings[$warning]['type'] = 'EMPTY';
@@ -379,8 +382,7 @@ class ImportXlsx extends ModeleImports
 			$updatedone = false;
 			$insertdone = false;
 			// For each table to insert, me make a separate insert
-			foreach ($objimport->array_import_tables[0] as $alias => $tablename)
-			{
+			foreach ($objimport->array_import_tables[0] as $alias => $tablename) {
 				// Build sql request
 				$sql = '';
 				$listfields = array();
@@ -391,10 +393,9 @@ class ImportXlsx extends ModeleImports
 				// Define $tablewithentity_cache[$tablename] if not already defined
 				if (!isset($tablewithentity_cache[$tablename]))	// keep this test with "isset"
 				{
-					dol_syslog("Check if table ".$tablename." has an entity field");
+					dol_syslog("Check if table " . $tablename . " has an entity field");
 					$resql = $this->db->DDLDescTable($tablename, 'entity');
-					if ($resql)
-					{
+					if ($resql) {
 						$obj = $this->db->fetch_object($resql);
 						if ($obj) $tablewithentity_cache[$tablename] = 1; // table contains entity field
 						else $tablewithentity_cache[$tablename] = 0; // table does not contains entity field
@@ -410,15 +411,13 @@ class ImportXlsx extends ModeleImports
 				}
 
 				// Loop on each fields in the match array: $key = 1..n, $val=alias of field (s.nom)
-				foreach ($sort_array_match_file_to_database as $key => $val)
-				{
+				foreach ($sort_array_match_file_to_database as $key => $val) {
 					$fieldalias = preg_replace('/\..*$/i', '', $val);
 					$fieldname = preg_replace('/^.*\./i', '', $val);
 
 					if ($alias != $fieldalias) continue; // Not a field of current table
 
-					if ($key <= $maxfields)
-					{
+					if ($key <= $maxfields) {
 						// Set $newval with value to insert and set $listvalues with sql request part for insert
 						$newval = '';
 						if ($arrayrecord[($key - 1)]['type'] > 0) $newval = $arrayrecord[($key - 1)]['val']; // If type of field into input file is not empty string (so defined into input file), we get value
@@ -426,8 +425,7 @@ class ImportXlsx extends ModeleImports
 						// Make some tests on $newval
 
 						// Is it a required field ?
-						if (preg_match('/\*/', $objimport->array_import_fields[0][$val]) && ((string) $newval == ''))
-						{
+						if (preg_match('/\*/', $objimport->array_import_fields[0][$val]) && ((string) $newval == '')) {
 							$this->errors[$error]['lib'] = $langs->trans('ErrorMissingMandatoryValue', $key);
 							$this->errors[$error]['type'] = 'NOTNULL';
 							$errorforthistable++;
@@ -436,14 +434,13 @@ class ImportXlsx extends ModeleImports
 						// Test format only if field is not a missing mandatory field (field may be a value or empty but not mandatory)
 						else {
 							// We convert field if required
-							if (!empty($objimport->array_import_convertvalue[0][$val]))
-							{
+							if (!empty($objimport->array_import_convertvalue[0][$val])) {
 								//print 'Must convert '.$newval.' with rule '.join(',',$objimport->array_import_convertvalue[0][$val]).'. ';
-								if ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeid'
+								if (
+									$objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeid'
 									|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromref'
 									|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel'
-									)
-								{
+								) {
 									// New val can be an id or ref. If it start with id: it is forced to id, if it start with ref: it is forced to ref. It not, we try to guess.
 									$isidorref = 'id';
 									if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
@@ -454,21 +451,18 @@ class ImportXlsx extends ModeleImports
 										$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
 										$class = $objimport->array_import_convertvalue[0][$val]['class'];
 										$method = $objimport->array_import_convertvalue[0][$val]['method'];
-										if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
-										{
-											$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
+										if ($this->cacheconvert[$file . '_' . $class . '_' . $method . '_'][$newval] != '') {
+											$newval = $this->cacheconvert[$file . '_' . $class . '_' . $method . '_'][$newval];
 										} else {
 											$resultload = dol_include_once($file);
-											if (empty($resultload))
-											{
-												dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
+											if (empty($resultload)) {
+												dol_print_error('', 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method);
 												break;
 											}
 											$classinstance = new $class($this->db);
 											// Try the fetch from code or ref
 											$param_array = array('', $newval);
-											if ($class == 'AccountingAccount')
-											{
+											if ($class == 'AccountingAccount') {
 												//var_dump($arrayrecord[0]['val']);
 												/*include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancysystem.class.php';
                                                 $tmpchartofaccount = new AccountancySystem($this->db);
@@ -485,12 +479,11 @@ class ImportXlsx extends ModeleImports
 											}
 											call_user_func_array(array($classinstance, $method), $param_array);
 											// If not found, try the fetch from label
-											if (!($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel')
-											{
+											if (!($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel') {
 												$param_array = array('', '', $newval);
 												call_user_func_array(array($classinstance, $method), $param_array);
 											}
-											$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] = $classinstance->id;
+											$this->cacheconvert[$file . '_' . $class . '_' . $method . '_'][$newval] = $classinstance->id;
 											//print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
 											if ($classinstance->id != '')	// id may be 0, it is a found value
 											{
@@ -516,19 +509,19 @@ class ImportXlsx extends ModeleImports
 										$method = $objimport->array_import_convertvalue[0][$val]['method'];
 										$codefromfield = $objimport->array_import_convertvalue[0][$val]['codefromfield'];
 										$code = $arrayrecord[$arrayfield[$codefromfield]]['val'];
-										if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval] != '') {
-											$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval];
+										if ($this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $code][$newval] != '') {
+											$newval = $this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $code][$newval];
 										} else {
 											$resultload = dol_include_once($file);
 											if (empty($resultload)) {
-												dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method.', code='.$code);
+												dol_print_error('', 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method . ', code=' . $code);
 												break;
 											}
 											$classinstance = new $class($this->db);
 											// Try the fetch from code and ref
 											$param_array = array('', $newval, $code);
 											call_user_func_array(array($classinstance, $method), $param_array);
-											$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval] = $classinstance->id;
+											$this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $code][$newval] = $classinstance->id;
 											if ($classinstance->id > 0)    // we found record
 											{
 												$newval = $classinstance->id;
@@ -548,21 +541,19 @@ class ImportXlsx extends ModeleImports
 									$class = $objimport->array_import_convertvalue[0][$val]['class'];
 									$method = $objimport->array_import_convertvalue[0][$val]['method'];
 									$units = $objimport->array_import_convertvalue[0][$val]['units'];
-									if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] != '')
-									{
-										$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval];
+									if ($this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $units][$newval] != '') {
+										$newval = $this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $units][$newval];
 									} else {
 										$resultload = dol_include_once($file);
-										if (empty($resultload))
-										{
-											dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method.', units='.$units);
+										if (empty($resultload)) {
+											dol_print_error('', 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method . ', units=' . $units);
 											break;
 										}
 										$classinstance = new $class($this->db);
 										// Try the fetch from code or ref
 										call_user_func_array(array($classinstance, $method), array('', '', $newval, $units));
 										$scaleorid = (($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits') ? $classinstance->id : $classinstance->scale);
-										$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] = $scaleorid;
+										$this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $units][$newval] = $scaleorid;
 										//print 'We have made a '.$class.'->'.$method." to get a value from key '".$newval."' and we got '".$scaleorid."'.";exit;
 										if ($classinstance->id > 0)	// we found record
 										{
@@ -576,32 +567,28 @@ class ImportXlsx extends ModeleImports
 										}
 									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto') {
-									if (strtolower($newval) == 'auto')
-									{
+									if (strtolower($newval) == 'auto') {
 										$this->thirpartyobject->get_codeclient(0, 0);
 										$newval = $this->thirpartyobject->code_client;
 										//print 'code_client='.$newval;
 									}
 									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto') {
-									if (strtolower($newval) == 'auto')
-									{
+									if (strtolower($newval) == 'auto') {
 										$newval = $this->thirpartyobject->get_codefournisseur(0, 1);
 										$newval = $this->thirpartyobject->code_fournisseur;
 										//print 'code_fournisseur='.$newval;
 									}
 									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto') {
-									if (strtolower($newval) == 'auto')
-									{
+									if (strtolower($newval) == 'auto') {
 										$this->thirpartyobject->get_codecompta('customer');
 										$newval = $this->thirpartyobject->code_compta;
 										//print 'code_compta='.$newval;
 									}
 									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto') {
-									if (strtolower($newval) == 'auto')
-									{
+									if (strtolower($newval) == 'auto') {
 										$this->thirpartyobject->get_codecompta('supplier');
 										$newval = $this->thirpartyobject->code_compta_fournisseur;
 										if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
@@ -612,9 +599,8 @@ class ImportXlsx extends ModeleImports
 									$defaultref = '';
 									// TODO provide the $modTask (module of generation of ref) as parameter of import_insert function
 									$obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
-									if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php"))
-									{
-										require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
+									if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT . "/core/modules/project/task/" . $conf->global->PROJECT_TASK_ADDON . ".php")) {
+										require_once DOL_DOCUMENT_ROOT . "/core/modules/project/task/" . $conf->global->PROJECT_TASK_ADDON . '.php';
 										$modTask = new $obj;
 										$defaultref = $modTask->getNextValue(null, null);
 									}
@@ -625,9 +611,8 @@ class ImportXlsx extends ModeleImports
 									$class = $objimport->array_import_convertvalue[0][$val]['class'];
 									$method = $objimport->array_import_convertvalue[0][$val]['method'];
 									$resultload = dol_include_once($file);
-									if (empty($resultload))
-									{
-										dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
+									if (empty($resultload)) {
+										dol_print_error('', 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method);
 										break;
 									}
 									$classinstance = new $class($this->db);
@@ -649,34 +634,29 @@ class ImportXlsx extends ModeleImports
 							}
 
 							// Test regexp
-							if (!empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
-							{
+							if (!empty($objimport->array_import_regex[0][$val]) && ($newval != '')) {
 								// If test is "Must exist in a field@table or field@table:..."
-								if (preg_match('/^(.+)@([^:]+)(:.+)?$/', $objimport->array_import_regex[0][$val], $reg))
-								{
+								if (preg_match('/^(.+)@([^:]+)(:.+)?$/', $objimport->array_import_regex[0][$val], $reg)) {
 									$field = $reg[1];
 									$table = $reg[2];
-									$filter = !empty($reg[3]) ?substr($reg[3], 1) : '';
+									$filter = !empty($reg[3]) ? substr($reg[3], 1) : '';
 
-									$cachekey = $field.'@'.$table;
-									if (!empty($filter)) $cachekey .= ':'.$filter;
+									$cachekey = $field . '@' . $table;
+									if (!empty($filter)) $cachekey .= ':' . $filter;
 
 									// Load content of field@table into cache array
 									if (!is_array($this->cachefieldtable[$cachekey])) // If content of field@table not already loaded into cache
 									{
-										$sql = "SELECT ".$field." as aliasfield FROM ".$table;
-										if (!empty($filter))
-										{
-											$sql .= ' WHERE '.$filter;
+										$sql = "SELECT " . $field . " as aliasfield FROM " . $table;
+										if (!empty($filter)) {
+											$sql .= ' WHERE ' . $filter;
 										}
 
 										$resql = $this->db->query($sql);
-										if ($resql)
-										{
+										if ($resql) {
 											$num = $this->db->num_rows($resql);
 											$i = 0;
-											while ($i < $num)
-											{
+											while ($i < $num) {
 												$obj = $this->db->fetch_object($resql);
 												if ($obj) $this->cachefieldtable[$cachekey][] = $obj->aliasfield;
 												$i++;
@@ -687,10 +667,9 @@ class ImportXlsx extends ModeleImports
 									}
 
 									// Now we check cache is not empty (should not) and key is into cache
-									if (!is_array($this->cachefieldtable[$cachekey]) || !in_array($newval, $this->cachefieldtable[$cachekey]))
-									{
+									if (!is_array($this->cachefieldtable[$cachekey]) || !in_array($newval, $this->cachefieldtable[$cachekey])) {
 										$tableforerror = $table;
-										if (!empty($filter)) $tableforerror .= ':'.$filter;
+										if (!empty($filter)) $tableforerror .= ':' . $filter;
 										$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorFieldValueNotIn', $key, $newval, $field, $tableforerror);
 										$this->errors[$error]['type'] = 'FOREIGNKEY';
 										$errorforthistable++;
@@ -698,7 +677,7 @@ class ImportXlsx extends ModeleImports
 									}
 								}
 								// If test is just a static regex
-								elseif (!preg_match('/'.$objimport->array_import_regex[0][$val].'/i', $newval)) {
+								elseif (!preg_match('/' . $objimport->array_import_regex[0][$val] . '/i', $newval)) {
 									//if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
 									$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorWrongValueForField', $key, $newval, $objimport->array_import_regex[0][$val]);
 									$this->errors[$error]['type'] = 'REGEX';
@@ -717,37 +696,32 @@ class ImportXlsx extends ModeleImports
 						// Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
 						if (empty($newval) && $arrayrecord[($key - 1)]['type'] < 0)		 $listvalues[] = ($newval == '0' ? $newval : "null");
 						elseif (empty($newval) && $arrayrecord[($key - 1)]['type'] == 0)	 $listvalues[] = "''";
-						else $listvalues[] = "'".$this->db->escape($newval)."'";
+						else $listvalues[] = "'" . $this->db->escape($newval) . "'";
 					}
 					$i++;
 				}
 
 				// We add hidden fields (but only if there is at least one field to add into table)
-				if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0]))
-				{
+				if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0])) {
 					// Loop on each hidden fields to add them into listfields/listvalues
-					foreach ($objimport->array_import_fieldshidden[0] as $key => $val)
-					{
-						if (!preg_match('/^'.preg_quote($alias, '/').'\./', $key)) continue; // Not a field of current table
-						if ($val == 'user->id')
-						{
-							$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
+					foreach ($objimport->array_import_fieldshidden[0] as $key => $val) {
+						if (!preg_match('/^' . preg_quote($alias, '/') . '\./', $key)) continue; // Not a field of current table
+						if ($val == 'user->id') {
+							$listfields[] = preg_replace('/^' . preg_quote($alias, '/') . '\./', '', $key);
 							$listvalues[] = $user->id;
-						} elseif (preg_match('/^lastrowid-/', $val))
-						{
+						} elseif (preg_match('/^lastrowid-/', $val)) {
 							$tmp = explode('-', $val);
 							$lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
-							$keyfield = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
+							$keyfield = preg_replace('/^' . preg_quote($alias, '/') . '\./', '', $key);
 							$listfields[] = $keyfield;
 							$listvalues[] = $lastinsertid;
 							//print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
-						} elseif (preg_match('/^const-/', $val))
-						{
+						} elseif (preg_match('/^const-/', $val)) {
 							$tmp = explode('-', $val, 2);
-							$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
-							$listvalues[] = "'".$tmp[1]."'";
+							$listfields[] = preg_replace('/^' . preg_quote($alias, '/') . '\./', '', $key);
+							$listvalues[] = "'" . $tmp[1] . "'";
 						} else {
-							$this->errors[$error]['lib'] = 'Bad value of profile setup '.$val.' for array_import_fieldshidden';
+							$this->errors[$error]['lib'] = 'Bad value of profile setup ' . $val . ' for array_import_fieldshidden';
 							$this->errors[$error]['type'] = 'Import profile setup';
 							$error++;
 						}
@@ -757,18 +731,16 @@ class ImportXlsx extends ModeleImports
 
 				// If no error for this $alias/$tablename, we have a complete $listfields and $listvalues that are defined
 				// so we can try to make the insert or update now.
-				if (!$errorforthistable)
-				{
+				if (!$errorforthistable) {
 					//print "$alias/$tablename/$listfields/$listvalues<br>";
-					if (!empty($listfields))
-					{
+					if (!empty($listfields)) {
 						$updatedone = false;
 						$insertdone = false;
 						if (!empty($updatekeys)) {
 							// We do SELECT to get the rowid, if we already have the rowid, it's to be used below for related tables (extrafields)
 
 							if (empty($lastinsertid)) {	// No insert done yet for a parent table
-								$sqlSelect = 'SELECT rowid FROM '.$tablename;
+								$sqlSelect = 'SELECT rowid FROM ' . $tablename;
 
 								$data = array_combine($listfields, $listvalues);
 								$where = array();
@@ -776,10 +748,10 @@ class ImportXlsx extends ModeleImports
 								foreach ($updatekeys as $key) {
 									$col = $objimport->array_import_updatekeys[0][$key];
 									$key = preg_replace('/^.*\./i', '', $key);
-									$where[] = $key.' = '.$data[$key];
-									$filters[] = $col.' = '.$data[$key];
+									$where[] = $key . ' = ' . $data[$key];
+									$filters[] = $col . ' = ' . $data[$key];
 								}
-								$sqlSelect .= ' WHERE '.implode(' AND ', $where);
+								$sqlSelect .= ' WHERE ' . implode(' AND ', $where);
 
 								$resql = $this->db->query($sqlSelect);
 								if ($resql) {
@@ -806,10 +778,10 @@ class ImportXlsx extends ModeleImports
 								// a direct insert into subtable extrafields, but when me wake an update, the insertid is defined and the child record
 								// may already exists. So we rescan the extrafield table to know if record exists or not for the rowid.
 								// Note: For extrafield tablename, we have in importfieldshidden_array an enty 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
-								$sqlSelect = 'SELECT rowid FROM '.$tablename;
+								$sqlSelect = 'SELECT rowid FROM ' . $tablename;
 
 								if (empty($keyfield)) $keyfield = 'rowid';
-								$sqlSelect .= ' WHERE '.$keyfield.' = '.$lastinsertid;
+								$sqlSelect .= ' WHERE ' . $keyfield . ' = ' . $lastinsertid;
 
 								$resql = $this->db->query($sqlSelect);
 								if ($resql) {
@@ -831,19 +803,19 @@ class ImportXlsx extends ModeleImports
 
 							if (!empty($lastinsertid)) {
 								// Build SQL UPDATE request
-								$sqlstart = 'UPDATE '.$tablename;
+								$sqlstart = 'UPDATE ' . $tablename;
 
 								$data = array_combine($listfields, $listvalues);
 								$set = array();
 								foreach ($data as $key => $val) {
-									$set[] = $key.' = '.$val;
+									$set[] = $key . ' = ' . $val;
 								}
-								$sqlstart .= ' SET '.implode(', ', $set);
+								$sqlstart .= ' SET ' . implode(', ', $set);
 
 								if (empty($keyfield)) $keyfield = 'rowid';
-								$sqlend = ' WHERE '.$keyfield.' = '.$lastinsertid;
+								$sqlend = ' WHERE ' . $keyfield . ' = ' . $lastinsertid;
 
-								$sql = $sqlstart.$sqlend;
+								$sql = $sqlstart . $sqlend;
 
 								// Run update request
 								$resql = $this->db->query($sql);
@@ -862,25 +834,23 @@ class ImportXlsx extends ModeleImports
 						// Update not done, we do insert
 						if (!$error && !$updatedone) {
 							// Build SQL INSERT request
-							$sqlstart = 'INSERT INTO '.$tablename.'('.implode(', ', $listfields).', import_key';
-							$sqlend = ') VALUES('.implode(', ', $listvalues).", '".$this->db->escape($importid)."'";
+							$sqlstart = 'INSERT INTO ' . $tablename . '(' . implode(', ', $listfields) . ', import_key';
+							$sqlend = ') VALUES(' . implode(', ', $listvalues) . ", '" . $this->db->escape($importid) . "'";
 							if (!empty($tablewithentity_cache[$tablename])) {
 								$sqlstart .= ', entity';
-								$sqlend .= ', '.$conf->entity;
+								$sqlend .= ', ' . $conf->entity;
 							}
 							if (!empty($objimport->array_import_tables_creator[0][$alias])) {
-								$sqlstart .= ', '.$objimport->array_import_tables_creator[0][$alias];
-								$sqlend .= ', '.$user->id;
+								$sqlstart .= ', ' . $objimport->array_import_tables_creator[0][$alias];
+								$sqlend .= ', ' . $user->id;
 							}
-							$sql = $sqlstart.$sqlend.')';
+							$sql = $sqlstart . $sqlend . ')';
 							dol_syslog("import_xlsx.modules", LOG_DEBUG);
 
 							// Run insert request
-							if ($sql)
-							{
+							if ($sql) {
 								$resql = $this->db->query($sql);
-								if ($resql)
-								{
+								if ($resql) {
 									$last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
 									$insertdone = true;
 								} else {

From 6a2d842d3ed5c2eefad048354b9e21f0ca7fa99a Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 4 Dec 2020 13:47:55 +0000
Subject: [PATCH 144/888] Fixing style errors.

---
 .../modules/import/import_xlsx.modules.php     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index 783370eae0f..c427e01a758 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -116,24 +116,24 @@ class ImportXlsx extends ModeleImports
 		require_once DOL_DOCUMENT_ROOT . '/includes/Psr/autoloader.php';
 		require_once PHPEXCELNEW_PATH . 'Spreadsheet.php';
 		$this->workbook = new Spreadsheet();
-		
+
 		//if ($this->id == 'excel2007new')
 		{
-			if (!class_exists('ZipArchive'))	// For Excel2007
+		if (!class_exists('ZipArchive'))	// For Excel2007
 			{
-				$langs->load("errors");
-				$this->error = $langs->trans('ErrorPHPNeedModule', 'zip');
-				return -1;
-			}
+			$langs->load("errors");
+			$this->error = $langs->trans('ErrorPHPNeedModule', 'zip');
+			return -1;
+		}
 		}
 		$this->label_lib = 'PhpSpreadSheet';
 		$this->version_lib = '1.8.0';
-		
+
 		$this->datatoimport = $datatoimport;
 		if (preg_match('/^societe_/', $datatoimport)) $this->thirpartyobject = new Societe($this->db);
 	}
-	
-	
+
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output header of an example file for this format

From 6d4a90b54334370459cc7f097a1f92e6945ab7f5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Dec 2020 14:53:52 +0100
Subject: [PATCH 145/888] Clean code

---
 htdocs/adherents/class/adherent.class.php  | 14 ++++----
 htdocs/core/class/html.formother.class.php | 30 ++++++++++------
 htdocs/holiday/card.php                    |  4 +--
 htdocs/holiday/common.inc.php              | 42 ----------------------
 htdocs/holiday/define_holiday.php          | 17 +++++++--
 htdocs/holiday/list.php                    | 13 +++++--
 htdocs/holiday/month_report.php            |  4 +--
 htdocs/holiday/view_log.php                | 18 +++++++---
 test/phpunit/phpunittest.xml               | 29 ++++++++-------
 9 files changed, 85 insertions(+), 86 deletions(-)
 delete mode 100644 htdocs/holiday/common.inc.php

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 0e57b274258..5df6db52f3d 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -103,6 +103,7 @@ class Adherent extends CommonObject
 	 * @var int Thirdparty ID
 	 */
 	public $fk_soc;
+	public $socid;
 
 	/**
 	 * @var string Address
@@ -1262,14 +1263,15 @@ class Adherent extends CommonObject
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as dep ON d.state_id = dep.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON d.rowid = u.fk_member";
 		$sql .= " WHERE d.fk_adherent_type = t.rowid";
-		if ($rowid)
-			$sql .= " AND d.rowid=".$rowid;
-		elseif ($ref || $fk_soc) {
+		if ($rowid) {
+			$sql .= " AND d.rowid=".((int) $rowid);
+		} elseif ($ref || $fk_soc) {
 			$sql .= " AND d.entity IN (".getEntity('adherent').")";
-			if ($ref)
+			if ($ref) {
 				$sql .= " AND d.rowid='".$this->db->escape($ref)."'";
-			elseif ($fk_soc > 0)
-				$sql .= " AND d.fk_soc=".$fk_soc;
+			} elseif ($fk_soc > 0) {
+				$sql .= " AND d.fk_soc=".((int) $fk_soc);
+			}
 		} elseif ($ref_ext) {
 			$sql .= " AND d.ref_ext='".$this->db->escape($ref_ext)."'";
 		}
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index f1e5ff9921c..3b9d9db2906 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -918,9 +918,10 @@ class FormOther
 	 *      @param  int         $useempty          	Show empty in list
 	 *      @param  int         $longlabel         	Show long label
 	 *      @param	string		$morecss			More Css
+	 *  	@param  bool		$addjscombo			Add js combo
 	 *      @return string
 	 */
-	public function select_month($selected = '', $htmlname = 'monthid', $useempty = 0, $longlabel = 0, $morecss = 'maxwidth50imp valignmiddle')
+	public function select_month($selected = '', $htmlname = 'monthid', $useempty = 0, $longlabel = 0, $morecss = 'minwidth50 maxwidth75imp valignmiddle', $addjscombo = false)
 	{
 		// phpcs:enable
 		global $langs;
@@ -947,6 +948,15 @@ class FormOther
 			$select_month .= '</option>';
 		}
 		$select_month .= '</select>';
+
+		// Add code for jquery to use multiselect
+		if ($addjscombo)
+		{
+			// Enhance with select2
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+			$select_month .= ajax_combobox($htmlname);
+		}
+
 		return $select_month;
 	}
 
@@ -986,18 +996,10 @@ class FormOther
 	 *  @param  bool	$addjscombo		Add js combo
 	 *  @return	string
 	 */
-	public function selectyear($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle maxwidth75imp', $addjscombo = false)
+	public function selectyear($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle width75', $addjscombo = false)
 	{
 		$out = '';
 
-		// Add code for jquery to use multiselect
-		if ($addjscombo)
-		{
-			// Enhance with select2
-			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-			$out .= ajax_combobox($htmlname);
-		}
-
 		$currentyear = date("Y") + $offset;
 		$max_year = $currentyear + $max_year;
 		$min_year = $currentyear - $min_year;
@@ -1028,6 +1030,14 @@ class FormOther
 		}
 		$out .= "</select>\n";
 
+		// Add code for jquery to use multiselect
+		if ($addjscombo)
+		{
+			// Enhance with select2
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+			$out .= ajax_combobox($htmlname);
+		}
+
 		return $out;
 	}
 
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 7248f385994..4adecb20235 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/holiday.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Get parameters
@@ -49,7 +49,7 @@ $ref = GETPOST('ref', 'alpha');
 $fuserid = (GETPOST('fuserid', 'int') ?GETPOST('fuserid', 'int') : $user->id);
 
 // Load translation files required by the page
-$langs->loadLangs(array("holiday", "mails"));
+$langs->loadLangs(array("other", "holiday", "mails"));
 
 $now = dol_now();
 
diff --git a/htdocs/holiday/common.inc.php b/htdocs/holiday/common.inc.php
deleted file mode 100644
index f8a09e85ad5..00000000000
--- a/htdocs/holiday/common.inc.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/* Copyright (C) 2011	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2011	Dimitri Mouillard	<dmouillard@teclib.com>
- * Copyright (C) 2012	Regis Houssin		<regis.houssin@inodbox.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *   	\file       htdocs/holiday/common.inc.php
- *		\ingroup    holiday
- *		\brief      Common load of data
- */
-
-require_once realpath(__DIR__).'/../main.inc.php';
-if (!class_exists('Holiday')) {
-	require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
-}
-
-// Load translation files required by the page
-$langs->loadLangs(array('user', 'other', 'holiday'));
-
-if (empty($conf->holiday->enabled))
-{
-	llxHeader('', $langs->trans('CPTitreMenu'));
-	print '<div class="tabBar">';
-	print '<span style="color: #FF0000;">'.$langs->trans('NotActiveModCP').'</span>';
-	print '</div>';
-	llxFooter();
-	exit();
-}
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 585c80e3e6d..45442e6170d 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -28,10 +28,10 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 
 // Load translation files required by the page
-$langs->loadlangs(array('users', 'hrm'));
+$langs->loadlangs(array('users', 'other', 'holiday', 'hrm'));
 
 $action = GETPOST('action', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'defineholidaylist';
@@ -56,7 +56,7 @@ if (!$sortorder) $sortorder = "ASC";
 if ($user->socid > 0) accessforbidden();
 
 // If the user does not have perm to read the page
-if (!$user->rights->holiday->read) accessforbidden();
+if (empty($user->rights->holiday->read)) accessforbidden();
 
 
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
@@ -65,6 +65,17 @@ $extrafields = new ExtraFields($db);
 
 $holiday = new Holiday($db);
 
+if (empty($conf->holiday->enabled))
+{
+	llxHeader('', $langs->trans('CPTitreMenu'));
+	print '<div class="tabBar">';
+	print '<span style="color: #FF0000;">'.$langs->trans('NotActiveModCP').'</span>';
+	print '</div>';
+	llxFooter();
+	exit();
+}
+
+
 
 /*
  * Actions
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index bfdef939be3..41ae8a6956f 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -32,12 +32,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
-require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('users', 'holiday', 'hrm'));
+$langs->loadLangs(array('users', 'other', 'holiday', 'hrm'));
 
 // Protection if external user
 if ($user->socid > 0) accessforbidden();
@@ -152,6 +152,15 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 	}
 }
 
+if (empty($conf->holiday->enabled))
+{
+	llxHeader('', $langs->trans('CPTitreMenu'));
+	print '<div class="tabBar">';
+	print '<span style="color: #FF0000;">'.$langs->trans('NotActiveModCP').'</span>';
+	print '</div>';
+	llxFooter();
+	exit();
+}
 
 
 /*
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index 5108c97f54a..b83d957b27f 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -179,8 +179,8 @@ print load_fiche_titre($langs->trans('MenuReportMonth'), '', 'title_hrm');
 
 // Selection filter
 print '<div class="tabBar">';
-print $formother->select_month($search_month, 'remonth');
-print $formother->select_year($search_year, 'reyear');
+print $formother->select_month($search_month, 'remonth', 0, 0, 'minwidth50 maxwidth75imp valignmiddle', true);
+print $formother->selectyear($search_year, 'reyear', 0, 10, 5, 0, 0, '', 'valignmiddle width75', true);
 print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Search")).'" />';
 print '</div>';
 print '<br>';
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index 54049a201ea..2f2e223c87c 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -34,7 +34,7 @@ if (empty($user->rights->holiday->define_holiday) || $user->socid > 0) {
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 
 $action             = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction         = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
@@ -72,7 +72,7 @@ if (!$sortorder) $sortorder = "DESC";
 if (!$user->rights->holiday->readall) accessforbidden();
 
 // Load translation files required by the page
-$langs->load('users');
+$langs->loadLangs(array('users', 'other', 'holiday'));
 
 // Initialize technical objects
 $object = new Holiday($db);
@@ -83,6 +83,16 @@ $hookmanager->initHooks(array('leavemovementlist')); // Note that conf->hooks_mo
 $arrayfields = array();
 $arrayofmassactions = array();
 
+if (empty($conf->holiday->enabled))
+{
+	llxHeader('', $langs->trans('CPTitreMenu'));
+	print '<div class="tabBar">';
+	print '<span style="color: #FF0000;">'.$langs->trans('NotActiveModCP').'</span>';
+	print '</div>';
+	llxFooter();
+	exit();
+}
+
 
 /*
  * Actions
@@ -263,9 +273,9 @@ if (!empty($arrayfields['cpl.rowid']['checked'])) {
 
 // Filter: Date
 if (!empty($arrayfields['cpl.date_action']['checked'])) {
-	print '<td class="liste_titre right">';
+	print '<td class="liste_titre center">';
 	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.dol_escape_htmltag($search_month).'">';
-	print $formother->selectyear($search_year, 'search_year', 1, 10, 5, 0, 0, '', 'maxwidth200', true);
+	print $formother->selectyear($search_year, 'search_year', 1, 10, 5, 0, 0, '', 'valignmiddle width75', true);
 	print '</td>';
 }
 
diff --git a/test/phpunit/phpunittest.xml b/test/phpunit/phpunittest.xml
index d648edb6814..7e903daa16d 100644
--- a/test/phpunit/phpunittest.xml
+++ b/test/phpunit/phpunittest.xml
@@ -17,20 +17,6 @@
         <!-- Also don't forget to change suhosin.memory_limit=4G -->
 	</php>
 	<filter>
-	  <blacklist>
-	    <directory suffix=".php">../../build/</directory>
-	    <directory suffix=".php">../../dev/</directory>
-	    <directory suffix=".php">../../doc/</directory>
-	    <directory suffix=".php">../../test/</directory>
-	    <directory suffix=".php">../../documents/</directory>
-	    <directory suffix=".php">../../htdocs/custom/</directory>
-	    <directory suffix=".php">../../htdocs/documents/custom/</directory>
-	    <directory suffix=".php">../../htdocs/nltechno/</directory>
-	    <directory suffix=".php">../../htdocs/products/canvas/</directory>
-	    <directory suffix=".php">../../htdocs/contact/canvas/</directory>
-	    <directory suffix=".php">../../htdocs/societe/canvas/</directory>
-	    <directory suffix=".php">../../htdocs/includes/</directory>
-	  </blacklist>
 	  <whitelist addUncoveredFilesFromWhitelist="true">
 	    <directory suffix=".class.php">../../htdocs/</directory>
 	    <directory suffix=".lib.php">../../htdocs/</directory>
@@ -54,8 +40,21 @@
 	    <directory suffix=".php">../../htdocs/contact/canvas/</directory>
 	    <directory suffix=".php">../../htdocs/societe/canvas/</directory>
 	    <directory suffix=".php">../../htdocs/includes/</directory>
-	    <file>../../htdocs/holiday/common.inc.php</file>
 	    </exclude>
 	  </whitelist>
+	  <blacklist>
+	    <directory suffix=".php">../../build/</directory>
+	    <directory suffix=".php">../../dev/</directory>
+	    <directory suffix=".php">../../doc/</directory>
+	    <directory suffix=".php">../../test/</directory>
+	    <directory suffix=".php">../../documents/</directory>
+	    <directory suffix=".php">../../htdocs/custom/</directory>
+	    <directory suffix=".php">../../htdocs/documents/custom/</directory>
+	    <directory suffix=".php">../../htdocs/nltechno/</directory>
+	    <directory suffix=".php">../../htdocs/products/canvas/</directory>
+	    <directory suffix=".php">../../htdocs/contact/canvas/</directory>
+	    <directory suffix=".php">../../htdocs/societe/canvas/</directory>
+	    <directory suffix=".php">../../htdocs/includes/</directory>
+	  </blacklist>
 	</filter>
 </phpunit>

From e7306625f0425648f7ee5aca0815f0c8fa6e9dbb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Dec 2020 15:28:12 +0100
Subject: [PATCH 146/888] Fix look and feel v13

---
 htdocs/admin/dict.php   |  2 +-
 htdocs/holiday/card.php | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 3048625cd5f..d06f8a2ce31 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -682,7 +682,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
 	{
 		// Discard check of mandatory fields for country for some tables
 		if ($value == 'country_id' && in_array($tablib[$id], array('DictionaryPublicHolidays', 'DictionaryVAT', 'DictionaryRegion', 'DictionaryCompanyType', 'DictionaryHolidayTypes', 'DictionaryRevenueStamp', 'DictionaryAccountancysystem', 'DictionaryAccountancyCategory'))) continue; // For some pages, country is not mandatory
-		if ($value == 'country' && in_array($tablib[$id], array('DictionaryPublicHolidays', 'DictionaryCanton', 'DictionaryCompanyType', 'DictionaryRevenueStamp'))) continue; // For some pages, country is not mandatory
+		if ($value == 'country' && in_array($tablib[$id], array('DictionaryPublicHolidays', 'DictionaryCanton', 'DictionaryCompanyType', 'DictionaryHolidayTypes', 'DictionaryRevenueStamp'))) continue; // For some pages, country is not mandatory
 		// Discard check of mandatory fiedls for other fields
 		if ($value == 'localtax1' && empty($_POST['localtax1_type'])) continue;
 		if ($value == 'localtax2' && empty($_POST['localtax2_type'])) continue;
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 4adecb20235..e0685789799 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -999,10 +999,10 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 
 		if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->holiday->writeall_advance))
 		{
-			print $form->select_dolusers(($fuserid ? $fuserid : $user->id), 'fuserid', 0, '', 0, 'hierarchyme', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'maxwidth300');
+			print img_picto('', 'user').$form->select_dolusers(($fuserid ? $fuserid : $user->id), 'fuserid', 0, '', 0, 'hierarchyme', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'maxwidth500');
 			//print '<input type="hidden" name="fuserid" value="'.($fuserid?$fuserid:$user->id).'">';
 		} else {
-			print $form->select_dolusers(GETPOST('fuserid', 'int') ? GETPOST('fuserid', 'int') : $user->id, 'fuserid', 0, '', 0, '', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'maxwidth300');
+			print img_picto('', 'user').$form->select_dolusers(GETPOST('fuserid', 'int') ? GETPOST('fuserid', 'int') : $user->id, 'fuserid', 0, '', 0, '', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'maxwidth500');
 		}
 		print '</td>';
 		print '</tr>';
@@ -1019,7 +1019,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 			$labeltoshow .= ($val['delay'] > 0 ? ' ('.$langs->trans("NoticePeriod").': '.$val['delay'].' '.$langs->trans("days").')' : '');
 			$arraytypeleaves[$val['rowid']] = $labeltoshow;
 		}
-		print $form->selectarray('type', $arraytypeleaves, (GETPOST('type', 'alpha') ?GETPOST('type', 'alpha') : ''), 1);
+		print $form->selectarray('type', $arraytypeleaves, (GETPOST('type', 'alpha') ?GETPOST('type', 'alpha') : ''), 1, 0, 0, '', 0, 0, 0, '', '', true);
 		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		print '</td>';
 		print '</tr>';
@@ -1048,7 +1048,6 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 		print $form->textwithpicto($langs->trans("DateFinCP"), $langs->trans("LastDayOfHoliday"));
 		print '</td>';
 		print '<td>';
-		// Si la demande ne vient pas de l'agenda
 		if (!GETPOST('date_fin_')) {
 			print $form->selectDate(-1, 'date_fin_', 0, 0, 0, '', 1, 1);
 		} else {
@@ -1067,13 +1066,14 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 
 		$object = new Holiday($db);
 		$include_users = $object->fetch_users_approver_holiday();
-		if (empty($include_users)) print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateHolidays");
-		else {
+		if (empty($include_users)) {
+			print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateHolidays");
+		} else {
 			$defaultselectuser = (empty($user->fk_user_holiday_validator) ? $user->fk_user : $user->fk_user_holiday_validator); // Will work only if supervisor has permission to approve so is inside include_users
 			if (!empty($conf->global->HOLIDAY_DEFAULT_VALIDATOR)) $defaultselectuser = $conf->global->HOLIDAY_DEFAULT_VALIDATOR; // Can force default approver
 			if (GETPOST('valideur', 'int') > 0) $defaultselectuser = GETPOST('valideur', 'int');
-			$s = $form->select_dolusers($defaultselectuser, "valideur", 1, "", 0, $include_users);
-			print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
+			$s = $form->select_dolusers($defaultselectuser, "valideur", 1, '', 0, $include_users, '', '0,'.$conf->entity, 0, 0, '', 0, '', 'maxwidth500');
+			print img_picto('', 'user').$form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
 		}
 
 		//print $form->select_dolusers((GETPOST('valideur','int')>0?GETPOST('valideur','int'):$user->fk_user), "valideur", 1, ($user->admin ? '' : array($user->id)), 0, '', 0, 0, 0, 0, '', 0, '', '', 1);	// By default, hierarchical parent

From d7f56b42cfeca58d036dceee8eb1310cc28b6dee Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 4 Dec 2020 15:29:57 +0100
Subject: [PATCH 147/888] Fix #15646 : patch of this bug

---
 htdocs/projet/tasks/time.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index e076bee598d..c18ec6e4434 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -897,7 +897,6 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		if ($id) $param .= '&id='.urlencode($id);
 		if ($projectid) $param .= '&projectid='.urlencode($projectid);
 		if ($withproject) $param .= '&withproject='.urlencode($withproject);
-		if ($page) $param .= '&page='.urlencode($page);
 
 		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 		if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';

From 2e5ac9b40af78e97aa79a61faa7cd9723c65f06f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Dec 2020 15:36:14 +0100
Subject: [PATCH 148/888] CSS

---
 htdocs/holiday/card.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index e0685789799..11d3c70c4a8 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -999,10 +999,10 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 
 		if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->holiday->writeall_advance))
 		{
-			print img_picto('', 'user').$form->select_dolusers(($fuserid ? $fuserid : $user->id), 'fuserid', 0, '', 0, 'hierarchyme', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'maxwidth500');
+			print img_picto('', 'user').$form->select_dolusers(($fuserid ? $fuserid : $user->id), 'fuserid', 0, '', 0, 'hierarchyme', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'minwidth200 maxwidth500');
 			//print '<input type="hidden" name="fuserid" value="'.($fuserid?$fuserid:$user->id).'">';
 		} else {
-			print img_picto('', 'user').$form->select_dolusers(GETPOST('fuserid', 'int') ? GETPOST('fuserid', 'int') : $user->id, 'fuserid', 0, '', 0, '', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'maxwidth500');
+			print img_picto('', 'user').$form->select_dolusers(GETPOST('fuserid', 'int') ? GETPOST('fuserid', 'int') : $user->id, 'fuserid', 0, '', 0, '', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'minwidth200 maxwidth500');
 		}
 		print '</td>';
 		print '</tr>';
@@ -1072,7 +1072,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 			$defaultselectuser = (empty($user->fk_user_holiday_validator) ? $user->fk_user : $user->fk_user_holiday_validator); // Will work only if supervisor has permission to approve so is inside include_users
 			if (!empty($conf->global->HOLIDAY_DEFAULT_VALIDATOR)) $defaultselectuser = $conf->global->HOLIDAY_DEFAULT_VALIDATOR; // Can force default approver
 			if (GETPOST('valideur', 'int') > 0) $defaultselectuser = GETPOST('valideur', 'int');
-			$s = $form->select_dolusers($defaultselectuser, "valideur", 1, '', 0, $include_users, '', '0,'.$conf->entity, 0, 0, '', 0, '', 'maxwidth500');
+			$s = $form->select_dolusers($defaultselectuser, "valideur", 1, '', 0, $include_users, '', '0,'.$conf->entity, 0, 0, '', 0, '', 'minwidth200 maxwidth500');
 			print img_picto('', 'user').$form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
 		}
 

From b9461322d9cc10370c56f7e120725d60a30d8bbc Mon Sep 17 00:00:00 2001
From: atm-benoit <benoit.costechareyre@atm-consulting.fr>
Date: Fri, 4 Dec 2020 15:37:00 +0100
Subject: [PATCH 149/888] FIX SUPPLIER PROPOSAL v12 bug add

---
 htdocs/supplier_proposal/card.php | 66 +++++++++++++++----------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 08479b95871..529c446df4d 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -554,8 +554,8 @@ if (empty($reshook))
 		}
 		else
 		{
-			$idprod = GETPOST('idprod', 'int');
-			$price_ht = '';
+		    $idprod = GETPOST('idprod', 'int');
+		    $price_ht = GETPOST('price_ht');
 			$tva_tx = '';
 		}
 
@@ -589,8 +589,8 @@ if (empty($reshook))
 			$error++;
 		}
 		if (!$error && ($qty >= 0)) {
-			$pu_ht = 0;
-			$pu_ttc = 0;
+		    $pu_ht = price2num($price_ht, 'MU');
+		    $pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 			$price_min = 0;
 			$price_base_type = (GETPOST('price_base_type', 'alpha') ? GETPOST('price_base_type', 'alpha') : 'HT');
 
@@ -658,41 +658,41 @@ if (empty($reshook))
 					$localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $object->thirdparty, $tva_npr);
 					$localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $object->thirdparty, $tva_npr);
 
-					$pu_ht = $productsupplier->fourn_pu;
 					if (empty($pu_ht)) $pu_ht = 0; // If pu is '' or null, we force to have a numeric value
 
 					// If GETPOST('idprodfournprice') is a numeric, we can use it. If it is empty or if it is 'idprod_123', we should use -1 (not used)
 					$fournprice = (is_numeric(GETPOST('idprodfournprice', 'alpha')) ? GETPOST('idprodfournprice', 'alpha') : -1);
 					$buyingprice = 0;
-
+					$pu_ht_devise = price2num($price_ht_devise, 'MU');
+					
 					$result = $object->addline(
-						$desc,
-						$pu_ht,
-						$qty,
-						$tva_tx,
-						$localtax1_tx,
-						$localtax2_tx,
-						$productsupplier->id,
-						$remise_percent,
-						$price_base_type,
-						$pu_ttc,
-						$tva_npr,
-						$type,
-						-1,
-						0,
-						GETPOST('fk_parent_line'),
-						$fournprice,
-						$buyingprice,
-						$label,
-						$array_options,
-						$ref_supplier,
-						$productsupplier->fk_unit,
-						'',
-						0,
-						$productsupplier->fourn_multicurrency_unitprice,
-						$date_start,
-						$date_end
-                    );
+					    $desc,
+					    $pu_ht,
+					    $qty,
+					    $tva_tx,
+					    $localtax1_tx,
+					    $localtax2_tx,
+					    $productsupplier->id,
+					    $remise_percent,
+					    $price_base_type,
+					    $pu_ttc,
+					    $tva_npr,
+					    $type,
+					    -1,
+					    0,
+					    GETPOST('fk_parent_line'),
+					    $fournprice,
+					    $buyingprice,
+					    $label,
+					    $array_options,
+					    $ref_supplier,
+					    $productsupplier->fk_unit,
+					    '',
+					    0,
+					    $pu_ht_devise,
+					    $date_start,
+					    $date_end
+					    );
 
 					//var_dump($tva_tx);var_dump($productsupplier->fourn_pu);var_dump($price_base_type);exit;
 					if ($result < 0)

From f0dec80dae23e3b6537777d79b5e30e0c57800ff Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Dec 2020 15:39:30 +0100
Subject: [PATCH 150/888] css

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 00bfd60e4ad..44fee06446f 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1728,7 +1728,7 @@ class Form
 				$out .= ajax_combobox($htmlname);
 
 				// do not use maxwidthonsmartphone by default. Set it by caller so auto size to 100% will work when not defined
-				$out .= '<select class="flat'.($morecss ? ' minwidth100imp '.$morecss : ' minwidth200').'" id="'.$htmlname.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.($disabled ? ' disabled' : '').'>';
+				$out .= '<select class="flat'.($morecss ? ' '.$morecss : ' minwidth200').'" id="'.$htmlname.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.($disabled ? ' disabled' : '').'>';
 				if ($show_empty && !$multiple) $out .= '<option value="-1"'.((empty($selected) || in_array(-1, $selected)) ? ' selected' : '').'>&nbsp;</option>'."\n";
 				if ($show_every) $out .= '<option value="-2"'.((in_array(-2, $selected)) ? ' selected' : '').'>-- '.$langs->trans("Everybody").' --</option>'."\n";
 

From ddf82f3e7a69d75cc414279eeed0250e560d525c Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 4 Dec 2020 14:45:26 +0000
Subject: [PATCH 151/888] Fixing style errors.

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

diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 529c446df4d..708844b71c8 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -664,7 +664,7 @@ if (empty($reshook))
 					$fournprice = (is_numeric(GETPOST('idprodfournprice', 'alpha')) ? GETPOST('idprodfournprice', 'alpha') : -1);
 					$buyingprice = 0;
 					$pu_ht_devise = price2num($price_ht_devise, 'MU');
-					
+
 					$result = $object->addline(
 					    $desc,
 					    $pu_ht,

From d22646e6ae8df3f811d2b85b291940c662bd9ad5 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Fri, 4 Dec 2020 16:06:10 +0100
Subject: [PATCH 152/888] pricetonum() - preg-replace() delete "-" negativ
 number

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 2a9052d0916..5094fad392a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4724,7 +4724,7 @@ function price2num($amount, $rounding = '', $option = 0)
 	if ($option != 1) {	// If not a PHP number or unknown, we change or clean format
 		//print 'PP'.$amount.' - '.$dec.' - '.$thousand.' - '.intval($amount).'<br>';
 		if (!is_numeric($amount)) {
-			$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\-]/', '', $amount);
+			$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>]/', '', $amount);
 		}
 
 		if ($option == 2 && $thousand == '.' && preg_match('/\.(\d\d\d)$/', (string) $amount)) {	// It means the . is used as a thousand separator and string come frominput data, so 1.123 is 1123

From 223205cf9db90f85a2763aebb7fc8697e9c960ce Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Fri, 4 Dec 2020 16:54:40 +0100
Subject: [PATCH 153/888] Fix volume calcution, depends on surface not
 surface_units surface_unit can be 0 for m2

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 0e9841201de..7d1d326cabb 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -854,7 +854,7 @@ class Product extends CommonObject
             $this->surface = $this->length * $this->width;
             $this->surface_units = measuring_units_squared($this->length_units);
         }
-        if (empty($this->volume) && !empty($this->surface_units) && !empty($this->height) && $this->length_units == $this->height_units) {
+        if (empty($this->volume) && !empty($this->surface) && !empty($this->height) && $this->length_units == $this->height_units) {
             $this->volume = $this->surface * $this->height;
             $this->volume_units = measuring_units_cubed($this->height_units);
         }

From b0e40aa21548d91848f6ab6423f250d37e992b95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 4 Dec 2020 18:00:31 +0100
Subject: [PATCH 154/888] fix type_user not define in left menu

---
 htdocs/core/menus/standard/eldy.lib.php  | 666 +++++++++++------------
 htdocs/core/menus/standard/eldy_menu.php | 166 +++---
 htdocs/core/menus/standard/empty.php     | 221 ++++----
 3 files changed, 511 insertions(+), 542 deletions(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 625e1ef00b3..fdf95e37aa1 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -54,13 +54,14 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	$substitarray = getCommonSubstitutionArray($langs, 0, null, null);
 
-	if (empty($noout)) print_start_menu_array();
+	if (empty($noout)) {
+		print_start_menu_array();
+	}
 
 	$usemenuhider = 1;
 
 	// Show/Hide vertical menu. The hamburger icon for .menuhider action.
-	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-	{
+	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 		$showmode = 1;
 		$classname = 'class="tmenu menuhider"';
 		$idsel = 'menu';
@@ -412,29 +413,23 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	);
 
 	// Add menus
-	foreach ($menu_arr as $key => $smenu)
-	{
+	foreach ($menu_arr as $key => $smenu) {
 		$smenu = (object) $smenu;
 
-		if ($smenu->enabled)
-		{
-			if ($smenu->session)
-			{
+		if ($smenu->enabled) {
+			if ($smenu->session) {
 				$_SESSION['idmenu'] = '';
 			}
 
 			// Load Langue
-			if (!empty($smenu->loadLangs))
-			{
+			if (!empty($smenu->loadLangs)) {
 				$langs->loadLangs($smenu->loadLangs);
 			}
 
 			// Trans title
 			$mtitle = '';
-			if (is_array($smenu->title))
-			{
-				foreach ($smenu->title as $item)
-				{
+			if (is_array($smenu->title)) {
+				foreach ($smenu->title as $item) {
 					$mtitle .= $langs->trans($item);
 				}
 			} else {
@@ -451,8 +446,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	$newTabMenu = $menuArbo->menuTopCharger('', '', $type_user, 'eldy', $tabMenu); // Return tabMenu with only top entries
 
 	$num = count($newTabMenu);
-	for ($i = 0; $i < $num; $i++)
-	{
+	for ($i = 0; $i < $num; $i++) {
 		//var_dump($type_user.' '.$newTabMenu[$i]['url'].' '.$showmode.' '.$newTabMenu[$i]['perms']);
 		$idsel = (empty($newTabMenu[$i]['mainmenu']) ? 'none' : $newTabMenu[$i]['mainmenu']);
 
@@ -460,35 +454,50 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 		// url = url from host, shorturl = relative path into dolibarr sources
 		$url = $shorturl = $newTabMenu[$i]['url'];
-		if (!preg_match("/^(http:\/\/|https:\/\/)/i", $newTabMenu[$i]['url']))	// Do not change url content for external links
-		{
+		if (!preg_match("/^(http:\/\/|https:\/\/)/i", $newTabMenu[$i]['url'])) {	// Do not change url content for external links
 			$tmp = explode('?', $newTabMenu[$i]['url'], 2);
 			$url = $shorturl = $tmp[0];
 			$param = (isset($tmp[1]) ? $tmp[1] : '');
 
-			if (!preg_match('/mainmenu/i', $param) || !preg_match('/leftmenu/i', $param)) $param .= ($param ? '&' : '').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&amp;leftmenu=';
+			if (!preg_match('/mainmenu/i', $param) || !preg_match('/leftmenu/i', $param)) {
+				$param .= ($param ? '&' : '').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&amp;leftmenu=';
+			}
 			//$url.="idmenu=".$newTabMenu[$i]['rowid'];    // Already done by menuLoad
 			$url = dol_buildpath($url, 1).($param ? '?'.$param : '');
 			//$shorturl = $shorturl.($param?'?'.$param:'');
 			$shorturl = $url;
-			if (DOL_URL_ROOT) $shorturl = preg_replace('/^'.preg_quote(DOL_URL_ROOT, '/').'/', '', $shorturl);
+			if (DOL_URL_ROOT) {
+				$shorturl = preg_replace('/^'.preg_quote(DOL_URL_ROOT, '/').'/', '', $shorturl);
+			}
 		}
 
 		$showmode = isVisibleToUserType($type_user, $newTabMenu[$i], $listofmodulesforexternal);
-		if ($showmode == 1)
-		{
+		if ($showmode == 1) {
 			// Define the class (top menu selected or not)
-			if (!empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname = 'class="tmenusel"';
-			elseif (!empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname = 'class="tmenusel"';
-			else $classname = 'class="tmenu"';
+			if (!empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) {
+				$classname = 'class="tmenusel"';
+			} elseif (!empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) {
+				$classname = 'class="tmenusel"';
+			} else {
+				$classname = 'class="tmenu"';
+			}
 		} elseif ($showmode == 2) {
 			$classname = 'class="tmenu"';
 		}
 
-		$menu->add($shorturl, $newTabMenu[$i]['titre'], 0, $showmode, ($newTabMenu[$i]['target'] ? $newTabMenu[$i]['target'] : $atarget),
+		$menu->add(
+			$shorturl,
+			$newTabMenu[$i]['titre'],
+			0,
+			$showmode,
+			($newTabMenu[$i]['target'] ? $newTabMenu[$i]['target'] : $atarget),
 			($newTabMenu[$i]['mainmenu'] ? $newTabMenu[$i]['mainmenu'] : $newTabMenu[$i]['rowid']),
 			($newTabMenu[$i]['leftmenu'] ? $newTabMenu[$i]['leftmenu'] : ''),
-			$newTabMenu[$i]['position'], $id, $idsel, $classname);
+			$newTabMenu[$i]['position'],
+			$id,
+			$idsel,
+			$classname
+		);
 	}
 
 	// Sort on position
@@ -496,8 +505,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Output menu entries
 	// Show logo company
-	if (empty($conf->global->MAIN_MENU_INVERT) && empty($noout) && !empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-	{
+	if (empty($conf->global->MAIN_MENU_INVERT) && empty($noout) && !empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 		//$mysoc->logo_mini=(empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI);
 		$mysoc->logo_squarred_mini = (empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI) ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI);
 
@@ -506,8 +514,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 			$logoContainerAdditionalClass = '';
 		}
 
-		if (!empty($mysoc->logo_squarred_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini))
-		{
+		if (!empty($mysoc->logo_squarred_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini)) {
 			$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
 		}
 		/*elseif (! empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
@@ -570,8 +577,7 @@ function print_start_menu_array()
  */
 function print_start_menu_entry($idsel, $classname, $showmode)
 {
-	if ($showmode)
-	{
+	if ($showmode) {
 		print '<li '.$classname.' id="mainmenutd_'.$idsel.'">';
 		//print '<div class="tmenuleft tmenusep"></div>';
 		print '<div class="tmenucenter">';
@@ -621,8 +627,7 @@ function print_text_menu_entry($text, $showmode, $url, $id, $idsel, $classname,
  */
 function print_end_menu_entry($showmode)
 {
-	if ($showmode)
-	{
+	if ($showmode) {
 		print '</div></li>';
 	}
 	print "\n";
@@ -655,9 +660,10 @@ function print_end_menu_array()
  * @param	string		$forcemainmenu		'x'=Force mainmenu to mainmenu='x'
  * @param	string		$forceleftmenu		'all'=Force leftmenu to '' (= all). If value come being '', we change it to value in session and 'none' if not defined in session.
  * @param	array		$moredata			An array with more data to output
+ * @param 	int			$type_user     		0=Menu for backoffice, 1=Menu for front office
  * @return	int								Nb of menu entries
  */
-function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabMenu, &$menu, $noout = 0, $forcemainmenu = '', $forceleftmenu = '', $moredata = null)
+function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabMenu, &$menu, $noout = 0, $forcemainmenu = '', $forceleftmenu = '', $moredata = null, $type_user = 0)
 {
 	global $user, $conf, $langs, $dolibarr_main_db_name, $mysoc;
 
@@ -670,8 +676,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 	$usemenuhider = 0;
 
-	if (is_array($moredata) && !empty($moredata['searchform']))	// searchform can contains select2 code or link to show old search form or link to switch on search page
-	{
+	if (is_array($moredata) && !empty($moredata['searchform'])) {	// searchform can contains select2 code or link to show old search form or link to switch on search page
 		print "\n";
 		print "<!-- Begin SearchForm -->\n";
 		print '<div id="blockvmenusearch" class="blockvmenusearch">'."\n";
@@ -680,8 +685,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		print "<!-- End SearchForm -->\n";
 	}
 
-	if (is_array($moredata) && !empty($moredata['bookmarks']))
-	{
+	if (is_array($moredata) && !empty($moredata['bookmarks'])) {
 		print "\n";
 		print "<!-- Begin Bookmarks -->\n";
 		print '<div id="blockvmenubookmarks" class="blockvmenubookmarks">'."\n";
@@ -696,13 +700,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 	 * We update newmenu with entries found into database
 	 * --------------------------------------------------
 	 */
-	if ($mainmenu)	// If this is empty, loading hard coded menu and loading personalised menu will fail
-	{
-		/*
+	if ($mainmenu) {	// If this is empty, loading hard coded menu and loading personalised menu will fail
+	/*
 		 * Menu HOME
 		 */
-		if ($mainmenu == 'home')
-		{
+		if ($mainmenu == 'home') {
 			$langs->load("users");
 
 			// Home - dashboard
@@ -711,22 +713,19 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			// Setup
 			$newmenu->add("/admin/index.php?mainmenu=home&amp;leftmenu=setup", $langs->trans("Setup"), 0, $user->admin, '', $mainmenu, 'setup', 0, '', '', '', '<i class="fa fa-wrench fa-fw paddingright"></i>');
 
-			if ($usemenuhider || empty($leftmenu) || $leftmenu == "setup")
-			{
+			if ($usemenuhider || empty($leftmenu) || $leftmenu == "setup") {
 				// Load translation files required by the page
 				$langs->loadLangs(array("admin", "help"));
 
 				$warnpicto = '';
-				if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY))
-				{
+				if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY)) {
 					$langs->load("errors");
 					$warnpicto = img_warning($langs->trans("WarningMandatorySetupNotComplete"));
 				}
 				$newmenu->add("/admin/company.php?mainmenu=home", $langs->trans("MenuCompanySetup").$warnpicto, 1);
 
 				$warnpicto = '';
-				if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING) ? 1 : $conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING))	// If only user module enabled
-				{
+				if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING) ? 1 : $conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)) {	// If only user module enabled
 					$langs->load("errors");
 					$warnpicto = img_warning($langs->trans("WarningMandatorySetupNotComplete"));
 				}
@@ -760,8 +759,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 			// System tools
 			$newmenu->add("/admin/tools/index.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("AdminTools"), 0, $user->admin, '', $mainmenu, 'admintools', 0, '', '', '', '<i class="fa fa-server fa-fw paddingright"></i>');
-			if ($usemenuhider || empty($leftmenu) || preg_match('/^admintools/', $leftmenu))
-			{
+			if ($usemenuhider || empty($leftmenu) || preg_match('/^admintools/', $leftmenu)) {
 				// Load translation files required by the page
 				$langs->loadLangs(array('admin', 'help'));
 
@@ -788,24 +786,20 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/admin/tools/listsessions.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Sessions"), 1);
 				$newmenu->add('/admin/system/about.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('ExternalResources'), 1);
 
-				if (!empty($conf->product->enabled) || !empty($conf->service->enabled))
-				{
+				if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
 					$langs->load("products");
 					$newmenu->add("/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("ProductVatMassChange"), 1, $user->admin);
 				}
 			}
 
 			$newmenu->add("/user/home.php?leftmenu=users", $langs->trans("MenuUsersAndGroups"), 0, $user->rights->user->user->lire, '', $mainmenu, 'users', 0, '', '', '', '<i class="fa fa-users fa-fw paddingright"></i>');
-			if ($user->rights->user->user->lire)
-			{
-				if ($usemenuhider || empty($leftmenu) || $leftmenu == "users")
-				{
+			if ($user->rights->user->user->lire) {
+				if ($usemenuhider || empty($leftmenu) || $leftmenu == "users") {
 					$newmenu->add("", $langs->trans("Users"), 1, $user->rights->user->user->lire || $user->admin);
 					$newmenu->add("/user/card.php?leftmenu=users&action=create", $langs->trans("NewUser"), 2, ($user->rights->user->user->creer || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE), '', 'home');
 					$newmenu->add("/user/list.php?leftmenu=users", $langs->trans("ListOfUsers"), 2, $user->rights->user->user->lire || $user->admin);
 					$newmenu->add("/user/hierarchy.php?leftmenu=users", $langs->trans("HierarchicView"), 2, $user->rights->user->user->lire || $user->admin);
-					if (!empty($conf->categorie->enabled))
-					{
+					if (!empty($conf->categorie->enabled)) {
 						$langs->load("categories");
 						$newmenu->add("/categories/index.php?leftmenu=users&type=7", $langs->trans("UsersCategoriesShort"), 2, $user->rights->categorie->lire, '', $mainmenu, 'cat');
 					}
@@ -820,26 +814,24 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		/*
 		 * Menu THIRDPARTIES
 		 */
-		if ($mainmenu == 'companies')
-		{
+		if ($mainmenu == 'companies') {
 			// Societes
-			if (!empty($conf->societe->enabled))
-			{
+			if (!empty($conf->societe->enabled)) {
 				$langs->load("companies");
 				$newmenu->add("/societe/index.php?leftmenu=thirdparties", $langs->trans("ThirdParty"), 0, $user->rights->societe->lire, '', $mainmenu, 'thirdparties');
 
-				if ($user->rights->societe->creer)
-				{
+				if ($user->rights->societe->creer) {
 					$newmenu->add("/societe/card.php?action=create", $langs->trans("MenuNewThirdParty"), 1);
-					if (!$conf->use_javascript_ajax) $newmenu->add("/societe/card.php?action=create&amp;private=1", $langs->trans("MenuNewPrivateIndividual"), 1);
+					if (!$conf->use_javascript_ajax) {
+						$newmenu->add("/societe/card.php?action=create&amp;private=1", $langs->trans("MenuNewPrivateIndividual"), 1);
+					}
 				}
 			}
 
 			$newmenu->add("/societe/list.php?leftmenu=thirdparties", $langs->trans("List"), 1);
 
 			// Prospects
-			if (!empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
-			{
+			if (!empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
 				$langs->load("commercial");
 				$newmenu->add("/societe/list.php?type=p&amp;leftmenu=prospects", $langs->trans("ListProspectsShort"), 2, $user->rights->societe->lire, '', $mainmenu, 'prospects');
 				/* no more required, there is a filter that can do more
@@ -853,8 +845,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Customers/Prospects
-			if (!empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
-			{
+			if (!empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
 				$langs->load("commercial");
 				$newmenu->add("/societe/list.php?type=c&amp;leftmenu=customers", $langs->trans("ListCustomersShort"), 2, $user->rights->societe->lire, '', $mainmenu, 'customers');
 
@@ -862,28 +853,28 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Suppliers
-			if (!empty($conf->societe->enabled) && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) || !empty($conf->supplier_proposal->enabled)))
-			{
+			if (!empty($conf->societe->enabled) && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) || !empty($conf->supplier_proposal->enabled))) {
 				$langs->load("suppliers");
 				$newmenu->add("/societe/list.php?type=f&amp;leftmenu=suppliers", $langs->trans("ListSuppliersShort"), 2, ($user->rights->fournisseur->lire), '', $mainmenu, 'suppliers');
 				$newmenu->add("/societe/card.php?leftmenu=suppliers&amp;action=create&amp;type=f", $langs->trans("MenuNewSupplier"), 3, $user->rights->societe->creer && ($user->rights->fournisseur->lire));
 			}
 
 			// Categories
-			if (!empty($conf->categorie->enabled))
-			{
+			if (!empty($conf->categorie->enabled)) {
 				$langs->load("categories");
-				if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
-				{
+				if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
 					// Categories prospects/customers
 					$menutoshow = $langs->trans("CustomersProspectsCategoriesShort");
-					if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $menutoshow = $langs->trans("CustomersCategoriesShort");
-					if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $menutoshow = $langs->trans("ProspectsCategoriesShort");
+					if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+						$menutoshow = $langs->trans("CustomersCategoriesShort");
+					}
+					if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+						$menutoshow = $langs->trans("ProspectsCategoriesShort");
+					}
 					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=2", $menutoshow, 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
 				}
 				// Categories suppliers
-				if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
-				{
+				if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
 					$newmenu->add("/categories/index.php?leftmenu=catfournish&amp;type=1", $langs->trans("SuppliersCategoriesShort"), 1, $user->rights->categorie->lire);
 				}
 			}
@@ -892,15 +883,20 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			$newmenu->add("/societe/index.php?leftmenu=thirdparties", (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses")), 0, $user->rights->societe->contact->lire, '', $mainmenu, 'contacts');
 			$newmenu->add("/contact/card.php?leftmenu=contacts&amp;action=create", (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("NewContact") : $langs->trans("NewContactAddress")), 1, $user->rights->societe->contact->creer);
 			$newmenu->add("/contact/list.php?leftmenu=contacts", $langs->trans("List"), 1, $user->rights->societe->contact->lire);
-			if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $newmenu->add("/contact/list.php?leftmenu=contacts&type=p", $langs->trans("Prospects"), 2, $user->rights->societe->contact->lire);
-			if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $newmenu->add("/contact/list.php?leftmenu=contacts&type=c", $langs->trans("Customers"), 2, $user->rights->societe->contact->lire);
-			if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) $newmenu->add("/contact/list.php?leftmenu=contacts&type=f", $langs->trans("Suppliers"), 2, $user->rights->societe->contact->lire);
+			if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+				$newmenu->add("/contact/list.php?leftmenu=contacts&type=p", $langs->trans("Prospects"), 2, $user->rights->societe->contact->lire);
+			}
+			if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+				$newmenu->add("/contact/list.php?leftmenu=contacts&type=c", $langs->trans("Customers"), 2, $user->rights->societe->contact->lire);
+			}
+			if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
+				$newmenu->add("/contact/list.php?leftmenu=contacts&type=f", $langs->trans("Suppliers"), 2, $user->rights->societe->contact->lire);
+			}
 			$newmenu->add("/contact/list.php?leftmenu=contacts&type=o", $langs->trans("ContactOthers"), 2, $user->rights->societe->contact->lire);
 			//$newmenu->add("/contact/list.php?userid=$user->id", $langs->trans("MyContacts"), 1, $user->rights->societe->contact->lire);
 
 			// Categories
-			if (!empty($conf->categorie->enabled))
-			{
+			if (!empty($conf->categorie->enabled)) {
 				$langs->load("categories");
 				// Categories Contact
 				$newmenu->add("/categories/index.php?leftmenu=catcontact&amp;type=4", $langs->trans("ContactCategoriesShort"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
@@ -910,13 +906,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		/*
 		 * Menu COMMERCIAL (propal, commande, supplier_proposal, supplier_order, contrat, ficheinter)
 		 */
-		if ($mainmenu == 'commercial')
-		{
+		if ($mainmenu == 'commercial') {
 			$langs->load("companies");
 
 			// Customer proposal
-			if (!empty($conf->propal->enabled))
-			{
+			if (!empty($conf->propal->enabled)) {
 				$langs->load("propal");
 				$newmenu->add("/comm/propal/index.php?leftmenu=propals", $langs->trans("Proposals"), 0, $user->rights->propale->lire, '', $mainmenu, 'propals', 100);
 				$newmenu->add("/comm/propal/card.php?action=create&amp;leftmenu=propals", $langs->trans("NewPropal"), 1, $user->rights->propale->creer);
@@ -933,8 +927,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Customers orders
-			if (!empty($conf->commande->enabled))
-			{
+			if (!empty($conf->commande->enabled)) {
 				$langs->load("orders");
 				$newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders', 200);
 				$newmenu->add("/commande/card.php?action=create&amp;leftmenu=orders", $langs->trans("NewOrder"), 1, $user->rights->commande->creer);
@@ -942,7 +935,9 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders") {
 					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire);
 					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire);
-					if (!empty($conf->expedition->enabled)) $newmenu->add("/commande/list.php?leftmenu=orders&search_status=2", $langs->trans("StatusOrderSentShort"), 2, $user->rights->commande->lire);
+					if (!empty($conf->expedition->enabled)) {
+						$newmenu->add("/commande/list.php?leftmenu=orders&search_status=2", $langs->trans("StatusOrderSentShort"), 2, $user->rights->commande->lire);
+					}
 					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=3", $langs->trans("StatusOrderDelivered"), 2, $user->rights->commande->lire);
 					//$newmenu->add("/commande/list.php?leftmenu=orders&search_status=4", $langs->trans("StatusOrderProcessed"), 2, $user->rights->commande->lire);
 					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->rights->commande->lire);
@@ -951,8 +946,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Supplier proposal
-			if (!empty($conf->supplier_proposal->enabled))
-			{
+			if (!empty($conf->supplier_proposal->enabled)) {
 				$langs->load("supplier_proposal");
 				$newmenu->add("/supplier_proposal/index.php?leftmenu=propals_supplier", $langs->trans("SupplierProposalsShort"), 0, $user->rights->supplier_proposal->lire, '', $mainmenu, 'propals_supplier', 300);
 				$newmenu->add("/supplier_proposal/card.php?action=create&amp;leftmenu=supplier_proposals", $langs->trans("SupplierProposalNew"), 1, $user->rights->supplier_proposal->creer);
@@ -961,8 +955,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Suppliers orders
-			if (!empty($conf->supplier_order->enabled))
-			{
+			if (!empty($conf->supplier_order->enabled)) {
 				$langs->load("orders");
 				$newmenu->add("/fourn/commande/index.php?leftmenu=orders_suppliers", $langs->trans("SuppliersOrders"), 0, $user->rights->fournisseur->commande->lire, '', $mainmenu, 'orders_suppliers', 400);
 				$newmenu->add("/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers", $langs->trans("NewOrder"), 1, $user->rights->fournisseur->commande->creer);
@@ -970,7 +963,9 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders_suppliers") {
 					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=0", $langs->trans("StatusSupplierOrderDraftShort"), 2, $user->rights->fournisseur->commande->lire);
-					if (empty($conf->global->SUPPLIER_ORDER_HIDE_VALIDATED)) $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=1", $langs->trans("StatusSupplierOrderValidated"), 2, $user->rights->fournisseur->commande->lire);
+					if (empty($conf->global->SUPPLIER_ORDER_HIDE_VALIDATED)) {
+						$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=1", $langs->trans("StatusSupplierOrderValidated"), 2, $user->rights->fournisseur->commande->lire);
+					}
 					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=2", $langs->trans("StatusSupplierOrderApprovedShort"), 2, $user->rights->fournisseur->commande->lire);
 					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=3", $langs->trans("StatusSupplierOrderOnProcessShort"), 2, $user->rights->fournisseur->commande->lire);
 					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=4", $langs->trans("StatusSupplierOrderReceivedPartiallyShort"), 2, $user->rights->fournisseur->commande->lire);
@@ -985,8 +980,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Contrat
-			if (!empty($conf->contrat->enabled))
-			{
+			if (!empty($conf->contrat->enabled)) {
 				$langs->load("contracts");
 				$newmenu->add("/contrat/index.php?leftmenu=contracts", $langs->trans("ContractsSubscriptions"), 0, $user->rights->contrat->lire, '', $mainmenu, 'contracts', 2000);
 				$newmenu->add("/contrat/card.php?action=create&amp;leftmenu=contracts", $langs->trans("NewContractSubscription"), 1, $user->rights->contrat->creer);
@@ -1001,13 +995,14 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Interventions
-			if (!empty($conf->ficheinter->enabled))
-			{
+			if (!empty($conf->ficheinter->enabled)) {
 				$langs->load("interventions");
 				$newmenu->add("/fichinter/index.php?leftmenu=ficheinter", $langs->trans("Interventions"), 0, $user->rights->ficheinter->lire, '', $mainmenu, 'ficheinter', 2200);
 				$newmenu->add("/fichinter/card.php?action=create&amp;leftmenu=ficheinter", $langs->trans("NewIntervention"), 1, $user->rights->ficheinter->creer, '', '', '', 201);
 				$newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("List"), 1, $user->rights->ficheinter->lire, '', '', '', 202);
-				if ($conf->global->MAIN_FEATURES_LEVEL >= 2) $newmenu->add("/fichinter/card-rec.php?leftmenu=ficheinter", $langs->trans("ListOfTemplates"), 1, $user->rights->ficheinter->lire, '', '', '', 203);
+				if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+					$newmenu->add("/fichinter/card-rec.php?leftmenu=ficheinter", $langs->trans("ListOfTemplates"), 1, $user->rights->ficheinter->lire, '', '', '', 203);
+				}
 				$newmenu->add("/fichinter/stats/index.php?leftmenu=ficheinter", $langs->trans("Statistics"), 1, $user->rights->ficheinter->lire);
 			}
 		}
@@ -1016,20 +1011,17 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		/*
 		 * Menu COMPTA-FINANCIAL
 		 */
-		if ($mainmenu == 'billing')
-		{
+		if ($mainmenu == 'billing') {
 			$langs->load("companies");
 
 			// Customers invoices
-			if (!empty($conf->facture->enabled))
-			{
+			if (!empty($conf->facture->enabled)) {
 				$langs->load("bills");
 				$newmenu->add("/compta/facture/index.php?leftmenu=customers_bills", $langs->trans("BillsCustomers"), 0, $user->rights->facture->lire, '', $mainmenu, 'customers_bills');
 				$newmenu->add("/compta/facture/card.php?action=create", $langs->trans("NewBill"), 1, $user->rights->facture->creer);
 				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills", $langs->trans("List"), 1, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_list');
 
-				if ($usemenuhider || empty($leftmenu) || preg_match('/customers_bills(|_draft|_notpaid|_paid|_canceled)$/', $leftmenu))
-				{
+				if ($usemenuhider || empty($leftmenu) || preg_match('/customers_bills(|_draft|_notpaid|_paid|_canceled)$/', $leftmenu)) {
 					$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_draft&amp;search_status=0", $langs->trans("BillShortStatusDraft"), 2, $user->rights->facture->lire);
 					$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_notpaid&amp;search_status=1", $langs->trans("BillShortStatusNotPaid"), 2, $user->rights->facture->lire);
 					$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_paid&amp;search_status=2", $langs->trans("BillShortStatusPaid"), 2, $user->rights->facture->lire);
@@ -1039,8 +1031,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 				$newmenu->add("/compta/paiement/list.php?leftmenu=customers_bills_payment", $langs->trans("Payments"), 1, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_payment');
 
-				if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
-				{
+				if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) {
 					$newmenu->add("/compta/paiement/tovalidate.php?leftmenu=customers_bills_tovalid", $langs->trans("MenuToValid"), 2, $user->rights->facture->lire, '', $mainmenu, 'customer_bills_tovalid');
 				}
 				$newmenu->add("/compta/paiement/rapport.php?leftmenu=customers_bills_reports", $langs->trans("Reportings"), 2, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_reports');
@@ -1049,8 +1040,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Suppliers invoices
-			if (!empty($conf->societe->enabled) && !empty($conf->supplier_invoice->enabled))
-			{
+			if (!empty($conf->societe->enabled) && !empty($conf->supplier_invoice->enabled)) {
 				$langs->load("bills");
 				$newmenu->add("/fourn/facture/index.php?leftmenu=suppliers_bills", $langs->trans("BillsSuppliers"), 0, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills');
 				$newmenu->add("/fourn/facture/card.php?leftmenu=suppliers_bills&amp;action=create", $langs->trans("NewBill"), 1, $user->rights->fournisseur->facture->creer, '', $mainmenu, 'suppliers_bills_create');
@@ -1070,18 +1060,17 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Orders
-			if (!empty($conf->commande->enabled))
-			{
+			if (!empty($conf->commande->enabled)) {
 				$langs->load("orders");
-				if (!empty($conf->facture->enabled)) $newmenu->add("/commande/list.php?leftmenu=orders&amp;search_status=-3&amp;billed=0&amp;contextpage=billableorders", $langs->trans("MenuOrdersToBill2"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');
+				if (!empty($conf->facture->enabled)) {
+					$newmenu->add("/commande/list.php?leftmenu=orders&amp;search_status=-3&amp;billed=0&amp;contextpage=billableorders", $langs->trans("MenuOrdersToBill2"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');
+				}
 				//if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire);
 			}
 
 			// Supplier Orders to bill
-			if (!empty($conf->supplier_invoice->enabled))
-			{
-				if (!empty($conf->global->SUPPLIER_MENU_ORDER_RECEIVED_INTO_INVOICE))
-				{
+			if (!empty($conf->supplier_invoice->enabled)) {
+				if (!empty($conf->global->SUPPLIER_MENU_ORDER_RECEIVED_INTO_INVOICE)) {
 					$langs->load("supplier");
 					$newmenu->add("/fourn/commande/list.php?leftmenu=orders&amp;search_status=5&amp;billed=0", $langs->trans("MenuOrdersSupplierToBill"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');
 					//if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire);
@@ -1090,8 +1079,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 
 			// Donations
-			if (!empty($conf->don->enabled))
-			{
+			if (!empty($conf->don->enabled)) {
 				$langs->load("donations");
 				$newmenu->add("/don/index.php?leftmenu=donations&amp;mainmenu=billing", $langs->trans("Donations"), 0, $user->rights->don->lire, '', $mainmenu, 'donations');
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "donations") {
@@ -1102,8 +1090,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Taxes and social contributions
-			if (!empty($conf->tax->enabled))
-			{
+			if (!empty($conf->tax->enabled)) {
 				$newmenu->add("/compta/charges/index.php?leftmenu=tax&amp;mainmenu=billing", $langs->trans("MenuTaxesAndSpecialExpenses"), 0, $user->rights->tax->charges->lire, '', $mainmenu, 'tax');
 
 				$newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", $langs->trans("MenuSocialContributions"), 1, $user->rights->tax->charges->lire);
@@ -1113,8 +1100,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					$newmenu->add("/compta/sociales/payments.php?leftmenu=tax_social&amp;mainmenu=billing", $langs->trans("Payments"), 2, $user->rights->tax->charges->lire);
 				}
 				// VAT
-				if (empty($conf->global->TAX_DISABLE_VAT_MENUS))
-				{
+				if (empty($conf->global->TAX_DISABLE_VAT_MENUS)) {
 					global $mysoc;
 
 					$newmenu->add("/compta/tva/list.php?leftmenu=tax_vat&amp;mainmenu=billing", $langs->transcountry("VAT", $mysoc->country_code), 1, $user->rights->tax->charges->lire, '', $mainmenu, 'tax_vat');
@@ -1127,8 +1113,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					}
 
 					//Local Taxes 1
-					if ($mysoc->useLocalTax(1) && (isset($mysoc->localtax1_assuj) && $mysoc->localtax1_assuj == "1"))
-					{
+					if ($mysoc->useLocalTax(1) && (isset($mysoc->localtax1_assuj) && $mysoc->localtax1_assuj == "1")) {
 						$newmenu->add("/compta/localtax/list.php?leftmenu=tax_1_vat&amp;mainmenu=billing&amp;localTaxType=1", $langs->transcountry("LT1", $mysoc->country_code), 1, $user->rights->tax->charges->lire);
 						if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_1_vat/i', $leftmenu)) {
 							$newmenu->add("/compta/localtax/card.php?leftmenu=tax_1_vat&action=create&amp;localTaxType=1", $langs->trans("New"), 2, $user->rights->tax->charges->creer);
@@ -1139,8 +1124,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 						}
 					}
 					//Local Taxes 2
-					if ($mysoc->useLocalTax(2) && (isset($mysoc->localtax2_assuj) && $mysoc->localtax2_assuj == "1"))
-					{
+					if ($mysoc->useLocalTax(2) && (isset($mysoc->localtax2_assuj) && $mysoc->localtax2_assuj == "1")) {
 						$newmenu->add("/compta/localtax/list.php?leftmenu=tax_2_vat&amp;mainmenu=billing&amp;localTaxType=2", $langs->transcountry("LT2", $mysoc->country_code), 1, $user->rights->tax->charges->lire);
 						if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_2_vat/i', $leftmenu)) {
 							$newmenu->add("/compta/localtax/card.php?leftmenu=tax_2_vat&action=create&amp;localTaxType=2", $langs->trans("New"), 2, $user->rights->tax->charges->creer);
@@ -1154,8 +1138,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Salaries
-			if (!empty($conf->salaries->enabled))
-			{
+			if (!empty($conf->salaries->enabled)) {
 				$langs->load("salaries");
 				$newmenu->add("/salaries/list.php?leftmenu=tax_salary&amp;mainmenu=billing", $langs->trans("Salaries"), 0, $user->rights->salaries->read, '', $mainmenu, 'tax_salary');
 				if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_salary/i', $leftmenu)) {
@@ -1166,8 +1149,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Loan
-			if (!empty($conf->loan->enabled))
-			{
+			if (!empty($conf->loan->enabled)) {
 				$langs->load("loan");
 				$newmenu->add("/loan/list.php?leftmenu=tax_loan&amp;mainmenu=billing", $langs->trans("Loans"), 0, $user->rights->loan->read, '', $mainmenu, 'tax_loan');
 				if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_loan/i', $leftmenu)) {
@@ -1177,8 +1159,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Various payment
-			if (!empty($conf->banque->enabled) && empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT))
-			{
+			if (!empty($conf->banque->enabled) && empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT)) {
 				$langs->load("banks");
 				$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various&amp;mainmenu=billing", $langs->trans("MenuVariousPayment"), 0, $user->rights->banque->lire, '', $mainmenu, 'tax_various');
 				if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_various/i', $leftmenu)) {
@@ -1191,13 +1172,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		/*
 		 * Menu COMPTA-FINANCIAL
 		 */
-		if ($mainmenu == 'accountancy')
-		{
+		if ($mainmenu == 'accountancy') {
 			$langs->load("companies");
 
 			// Accounting (Double entries)
-			if (!empty($conf->accounting->enabled))
-			{
+			if (!empty($conf->accounting->enabled)) {
 				$permtoshowmenu = (!empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire);
 				//$newmenu->add("/accountancy/index.php?leftmenu=accountancy", $langs->trans("MenuAccountancy"), 0, $permtoshowmenu, '', $mainmenu, 'accountancy');
 
@@ -1241,24 +1220,21 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 				// Binding
 				// $newmenu->add("", $langs->trans("Binding"), 0, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch');
-				if (!empty($conf->facture->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES))
-				{
+				if (!empty($conf->facture->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)) {
 					$newmenu->add("/accountancy/customer/index.php?leftmenu=accountancy_dispatch_customer&amp;mainmenu=accountancy", $langs->trans("CustomersVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_customer');
 					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_customer/', $leftmenu)) {
 						$newmenu->add("/accountancy/customer/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);
 						$newmenu->add("/accountancy/customer/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);
 					}
 				}
-				if (!empty($conf->supplier_invoice->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES))
-				{
+				if (!empty($conf->supplier_invoice->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES)) {
 					$newmenu->add("/accountancy/supplier/index.php?leftmenu=accountancy_dispatch_supplier&amp;mainmenu=accountancy", $langs->trans("SuppliersVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_supplier');
 					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_supplier/', $leftmenu)) {
 						$newmenu->add("/accountancy/supplier/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);
 						$newmenu->add("/accountancy/supplier/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);
 					}
 				}
-				if (!empty($conf->expensereport->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS))
-				{
+				if (!empty($conf->expensereport->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS)) {
 					$newmenu->add("/accountancy/expensereport/index.php?leftmenu=accountancy_dispatch_expensereport&amp;mainmenu=accountancy", $langs->trans("ExpenseReportsVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_expensereport');
 					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_expensereport/', $leftmenu)) {
 						$newmenu->add("/accountancy/expensereport/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);
@@ -1267,8 +1243,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				}
 
 				// Journals
-				if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy')
-				{
+				if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
 					$newmenu->add('', $langs->trans("RegistrationInAccounting"), 1, $user->rights->accounting->comptarapport->lire);
 
 					// Multi journal
@@ -1279,39 +1254,49 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					$sql .= " ORDER BY label DESC";
 
 					$resql = $db->query($sql);
-					if ($resql)
-					{
+					if ($resql) {
 						$numr = $db->num_rows($resql);
 						$i = 0;
 
-						if ($numr > 0)
-						{
-							while ($i < $numr)
-							{
+						if ($numr > 0) {
+							while ($i < $numr) {
 								$objp = $db->fetch_object($resql);
 
 								$nature = '';
 
 								// Must match array $sourceList defined into journals_list.php
-								if ($objp->nature == 2 && !empty($conf->facture->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)) $nature = "sells";
+								if ($objp->nature == 2 && !empty($conf->facture->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)) {
+									$nature = "sells";
+								}
 								if ($objp->nature == 3
 									&& (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled))
-									&& empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES))
+									&& empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES)) {
 									$nature = "purchases";
-								if ($objp->nature == 4 && !empty($conf->banque->enabled)) $nature = "bank";
-								if ($objp->nature == 5 && !empty($conf->expensereport->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS)) $nature = "expensereports";
-								if ($objp->nature == 1) $nature = "various";
-								if ($objp->nature == 8) $nature = "inventory";
-								if ($objp->nature == 9) $nature = "hasnew";
-
-								// To enable when page exists
-								if (empty($conf->global->ACCOUNTANCY_SHOW_DEVELOP_JOURNAL))
-								{
-									if ($nature == 'various' || $nature == 'hasnew' || $nature == 'inventory') $nature = '';
+								}
+								if ($objp->nature == 4 && !empty($conf->banque->enabled)) {
+									$nature = "bank";
+								}
+								if ($objp->nature == 5 && !empty($conf->expensereport->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS)) {
+									$nature = "expensereports";
+								}
+								if ($objp->nature == 1) {
+									$nature = "various";
+								}
+								if ($objp->nature == 8) {
+									$nature = "inventory";
+								}
+								if ($objp->nature == 9) {
+									$nature = "hasnew";
 								}
 
-								if ($nature)
-								{
+								// To enable when page exists
+								if (empty($conf->global->ACCOUNTANCY_SHOW_DEVELOP_JOURNAL)) {
+									if ($nature == 'various' || $nature == 'hasnew' || $nature == 'inventory') {
+										$nature = '';
+									}
+								}
+
+								if ($nature) {
 									$langs->load('accountancy');
 									$journallabel = $langs->transnoentities($objp->label); // Labels in this table are set by loading llx_accounting_abc.sql. Label can be 'ACCOUNTING_SELL_JOURNAL', 'InventoryJournal', ...
 									$newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $journallabel, 2, $user->rights->accounting->comptarapport->lire);
@@ -1322,7 +1307,9 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 							// Should not happend. Entries are added
 							$newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->rights->accounting->comptarapport->lire);
 						}
-					} else dol_print_error($db);
+					} else {
+						dol_print_error($db);
+					}
 					$db->free($resql);
 				}
 
@@ -1339,8 +1326,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/accountancy/bookkeeping/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Journals"), 1, $user->rights->accounting->mouvements->lire);
 
 				// Files
-				if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU))
-				{
+				if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU)) {
 					$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 1, $user->rights->accounting->mouvements->lire);
 				}
 
@@ -1363,9 +1349,10 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				}
 
 				$modecompta = 'CREANCES-DETTES';
-				if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') $modecompta = 'BOOKKEEPING'; // Not yet implemented. Should be BOOKKEEPINGCOLLECTED
-				if ($modecompta)
-				{
+				if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
+					$modecompta = 'BOOKKEEPING'; // Not yet implemented. Should be BOOKKEEPINGCOLLECTED
+				}
+				if ($modecompta) {
 					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
 						$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnover"), 2, $user->rights->accounting->comptarapport->lire);
 						$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
@@ -1377,8 +1364,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 				$modecompta = 'RECETTES-DEPENSES';
 				//if (! empty($conf->accounting->enabled) && ! empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') $modecompta='';	// Not yet implemented. Should be BOOKKEEPINGCOLLECTED
-				if ($modecompta)
-				{
+				if ($modecompta) {
 					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
 						$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnoverCollected"), 2, $user->rights->accounting->comptarapport->lire);
 						$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
@@ -1389,9 +1375,10 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				}
 
 				$modecompta = 'CREANCES-DETTES';
-				if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') $modecompta = 'BOOKKEEPING'; // Not yet implemented. Should be BOOKKEEPINGCOLLECTED
-				if ($modecompta && $conf->fournisseur->enabled)
-				{
+				if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
+					$modecompta = 'BOOKKEEPING'; // Not yet implemented. Should be BOOKKEEPINGCOLLECTED
+				}
+				if ($modecompta && $conf->fournisseur->enabled) {
 					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
 						$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnover"), 2, $user->rights->accounting->comptarapport->lire);
 						$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
@@ -1401,8 +1388,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 				$modecompta = 'RECETTES-DEPENSES';
 				//if (! empty($conf->accounting->enabled) && ! empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') $modecompta='';	// Not yet implemented. Should be BOOKKEEPINGCOLLECTED
-				if ($modecompta && $conf->fournisseur->enabled)
-				{
+				if ($modecompta && $conf->fournisseur->enabled) {
 					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
 						$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnoverCollected"), 2, $user->rights->accounting->comptarapport->lire);
 						$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
@@ -1411,11 +1397,9 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Accountancy (simple)
-			if (!empty($conf->comptabilite->enabled))
-			{
+			if (!empty($conf->comptabilite->enabled)) {
 				// Files
-				if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU))
-				{
+				if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU)) {
 					$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'files');
 				}
 
@@ -1426,18 +1410,18 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					$newmenu->add("/compta/resultat/index.php?leftmenu=report", $langs->trans("MenuReportInOut"), 1, $user->rights->compta->resultat->lire);
 					$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
 					/* On verra ca avec module compabilite expert
-                    $newmenu->add("/compta/resultat/compteres.php?leftmenu=report","Compte de resultat",2,$user->rights->compta->resultat->lire);
-                    $newmenu->add("/compta/resultat/bilan.php?leftmenu=report","Bilan",2,$user->rights->compta->resultat->lire);
-                    */
+					$newmenu->add("/compta/resultat/compteres.php?leftmenu=report","Compte de resultat",2,$user->rights->compta->resultat->lire);
+					$newmenu->add("/compta/resultat/bilan.php?leftmenu=report","Bilan",2,$user->rights->compta->resultat->lire);
+					*/
 					$newmenu->add("/compta/stats/index.php?leftmenu=report", $langs->trans("ReportTurnover"), 1, $user->rights->compta->resultat->lire);
 
 					/*
-                    $newmenu->add("/compta/stats/cumul.php?leftmenu=report","Cumule",2,$user->rights->compta->resultat->lire);
-                    if (! empty($conf->propal->enabled)) {
-                        $newmenu->add("/compta/stats/prev.php?leftmenu=report","Previsionnel",2,$user->rights->compta->resultat->lire);
-                        $newmenu->add("/compta/stats/comp.php?leftmenu=report","Transforme",2,$user->rights->compta->resultat->lire);
-                    }
-                    */
+					$newmenu->add("/compta/stats/cumul.php?leftmenu=report","Cumule",2,$user->rights->compta->resultat->lire);
+					if (! empty($conf->propal->enabled)) {
+						$newmenu->add("/compta/stats/prev.php?leftmenu=report","Previsionnel",2,$user->rights->compta->resultat->lire);
+						$newmenu->add("/compta/stats/comp.php?leftmenu=report","Transforme",2,$user->rights->compta->resultat->lire);
+					}
+					*/
 					$newmenu->add("/compta/stats/casoc.php?leftmenu=report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
 					$newmenu->add("/compta/stats/cabyuser.php?leftmenu=report", $langs->trans("ByUsers"), 2, $user->rights->compta->resultat->lire);
 					$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=report", $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);
@@ -1454,8 +1438,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Intracomm report
-			if (!empty($conf->intracommreport->enabled))
-			{
+			if (!empty($conf->intracommreport->enabled)) {
 				$newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReport"), 0, $user->rights->intracommreport->read, '', $mainmenu, 'intracommreport', 1);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/intracommreport/', $leftmenu)) {
 					// DEB / DES
@@ -1465,8 +1448,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Assets
-			if (!empty($conf->asset->enabled))
-			{
+			if (!empty($conf->asset->enabled)) {
 				$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuAssets"), 0, $user->rights->asset->read, '', $mainmenu, 'asset');
 				$newmenu->add("/asset/card.php?leftmenu=asset&amp;action=create", $langs->trans("MenuNewAsset"), 1, $user->rights->asset->write);
 				$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuListAssets"), 1, $user->rights->asset->read);
@@ -1482,14 +1464,12 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		/*
 		 * Menu BANK
 		 */
-		if ($mainmenu == 'bank')
-		{
+		if ($mainmenu == 'bank') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("withdrawals", "banks", "bills", "categories"));
 
 			// Bank-Cash account
-			if (!empty($conf->banque->enabled))
-			{
+			if (!empty($conf->banque->enabled)) {
 				$newmenu->add("/compta/bank/list.php?leftmenu=bank&amp;mainmenu=bank", $langs->trans("MenuBankCash"), 0, $user->rights->banque->lire, '', $mainmenu, 'bank');
 
 				$newmenu->add("/compta/bank/card.php?action=create", $langs->trans("MenuNewFinancialAccount"), 1, $user->rights->banque->configurer);
@@ -1500,16 +1480,14 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/compta/bank/transfer.php", $langs->trans("MenuBankInternalTransfer"), 1, $user->rights->banque->transfer);
 			}
 
-			if (!empty($conf->categorie->enabled))
-			{
+			if (!empty($conf->categorie->enabled)) {
 				$langs->load("categories");
 				$newmenu->add("/categories/index.php?type=5", $langs->trans("Rubriques"), 1, $user->rights->categorie->creer, '', $mainmenu, 'tags');
 				$newmenu->add("/compta/bank/categ.php", $langs->trans("RubriquesTransactions"), 1, $user->rights->banque->configurer, '', $mainmenu, 'tags');
 			}
 
 			// Direct debit order
-			if (!empty($conf->prelevement->enabled))
-			{
+			if (!empty($conf->prelevement->enabled)) {
 				$newmenu->add("/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank", $langs->trans("PaymentByDirectDebit"), 0, $user->rights->prelevement->bons->lire, '', $mainmenu, 'withdraw');
 
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "withdraw") {
@@ -1523,8 +1501,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Bank transfer order
-			if (!empty($conf->paymentbybanktransfer->enabled))
-			{
+			if (!empty($conf->paymentbybanktransfer->enabled)) {
 				$newmenu->add("/compta/paymentbybanktransfer/index.php?leftmenu=banktransfer&amp;mainmenu=bank", $langs->trans("PaymentByBankTransfer"), 0, $user->rights->paymentbybanktransfer->read, '', $mainmenu, 'banktransfer');
 
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "banktransfer") {
@@ -1538,8 +1515,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Management of checks
-			if (empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && !empty($conf->banque->enabled) && (!empty($conf->facture->enabled) || !empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)))
-			{
+			if (empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && !empty($conf->banque->enabled) && (!empty($conf->facture->enabled) || !empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))) {
 				$newmenu->add("/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank", $langs->trans("MenuChequeDeposits"), 0, $user->rights->banque->cheque, '', $mainmenu, 'checks');
 				if (preg_match('/checks/', $leftmenu)) {
 					$newmenu->add("/compta/paiement/cheque/card.php?leftmenu=checks_bis&amp;action=new&amp;mainmenu=bank", $langs->trans("NewChequeDeposit"), 1, $user->rights->banque->cheque);
@@ -1548,8 +1524,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Cash Control
-			if (!empty($conf->takepos->enabled) || !empty($conf->cashdesk->enabled))
-			{
+			if (!empty($conf->takepos->enabled) || !empty($conf->cashdesk->enabled)) {
 				$permtomakecashfence = ($user->rights->cashdesk->run || $user->rights->takepos->run);
 				$newmenu->add("/compta/cashcontrol/cashcontrol_list.php?action=list", $langs->trans("POS"), 0, $permtomakecashfence, '', $mainmenu, 'cashcontrol');
 				$newmenu->add("/compta/cashcontrol/cashcontrol_card.php?action=create", $langs->trans("NewCashFence"), 1, $permtomakecashfence);
@@ -1560,36 +1535,29 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		/*
 		 * Menu PRODUCTS-SERVICES
 		 */
-		if ($mainmenu == 'products')
-		{
+		if ($mainmenu == 'products') {
 			// Products
-			if (!empty($conf->product->enabled))
-			{
+			if (!empty($conf->product->enabled)) {
 				$newmenu->add("/product/index.php?leftmenu=product&amp;type=0", $langs->trans("Products"), 0, $user->rights->produit->lire, '', $mainmenu, 'product');
 				$newmenu->add("/product/card.php?leftmenu=product&amp;action=create&amp;type=0", $langs->trans("NewProduct"), 1, $user->rights->produit->creer);
 				$newmenu->add("/product/list.php?leftmenu=product&amp;type=0", $langs->trans("List"), 1, $user->rights->produit->lire);
-				if (!empty($conf->stock->enabled))
-				{
+				if (!empty($conf->stock->enabled)) {
 					$newmenu->add("/product/reassort.php?type=0", $langs->trans("MenuStocks"), 1, $user->rights->produit->lire && $user->rights->stock->lire);
 				}
-				if (!empty($conf->productbatch->enabled))
-				{
+				if (!empty($conf->productbatch->enabled)) {
 					$langs->load("stocks");
 					$newmenu->add("/product/reassortlot.php?type=0", $langs->trans("StocksByLotSerial"), 1, $user->rights->produit->lire && $user->rights->stock->lire);
 					$newmenu->add("/product/stock/productlot_list.php", $langs->trans("LotSerial"), 1, $user->rights->produit->lire && $user->rights->stock->lire);
 				}
-				if (!empty($conf->variants->enabled))
-				{
+				if (!empty($conf->variants->enabled)) {
 					$newmenu->add("/variants/list.php", $langs->trans("VariantAttributes"), 1, $user->rights->produit->lire);
 				}
-				if (!empty($conf->propal->enabled) || !empty($conf->commande->enabled) || !empty($conf->facture->enabled) || !empty($conf->fournisseur->enabled) || !empty($conf->supplier_proposal->enabled))
-				{
+				if (!empty($conf->propal->enabled) || !empty($conf->commande->enabled) || !empty($conf->facture->enabled) || !empty($conf->fournisseur->enabled) || !empty($conf->supplier_proposal->enabled)) {
 					$newmenu->add("/product/stats/card.php?id=all&leftmenu=stats&type=0", $langs->trans("Statistics"), 1, $user->rights->produit->lire && $user->rights->propale->lire);
 				}
 
 				// Categories
-				if (!empty($conf->categorie->enabled))
-				{
+				if (!empty($conf->categorie->enabled)) {
 					$langs->load("categories");
 					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=0", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
 					//if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire);
@@ -1597,18 +1565,15 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Services
-			if (!empty($conf->service->enabled))
-			{
+			if (!empty($conf->service->enabled)) {
 				$newmenu->add("/product/index.php?leftmenu=service&amp;type=1", $langs->trans("Services"), 0, $user->rights->service->lire, '', $mainmenu, 'service');
 				$newmenu->add("/product/card.php?leftmenu=service&amp;action=create&amp;type=1", $langs->trans("NewService"), 1, $user->rights->service->creer);
 				$newmenu->add("/product/list.php?leftmenu=service&amp;type=1", $langs->trans("List"), 1, $user->rights->service->lire);
-				if (!empty($conf->propal->enabled) || !empty($conf->commande->enabled) || !empty($conf->facture->enabled) || !empty($conf->fournisseur->enabled) || !empty($conf->supplier_proposal->enabled))
-				{
+				if (!empty($conf->propal->enabled) || !empty($conf->commande->enabled) || !empty($conf->facture->enabled) || !empty($conf->fournisseur->enabled) || !empty($conf->supplier_proposal->enabled)) {
 					$newmenu->add("/product/stats/card.php?id=all&leftmenu=stats&type=1", $langs->trans("Statistics"), 1, $user->rights->service->lire && $user->rights->propale->lire);
 				}
 				// Categories
-				if (!empty($conf->categorie->enabled))
-				{
+				if (!empty($conf->categorie->enabled)) {
 					$langs->load("categories");
 					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=0", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
 					//if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire);
@@ -1616,8 +1581,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Warehouse
-			if (!empty($conf->stock->enabled))
-			{
+			if (!empty($conf->stock->enabled)) {
 				$langs->load("stocks");
 				$newmenu->add("/product/stock/index.php?leftmenu=stock", $langs->trans("Warehouses"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock');
 				$newmenu->add("/product/stock/card.php?action=create", $langs->trans("MenuNewWarehouse"), 1, $user->rights->stock->creer);
@@ -1625,24 +1589,22 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/product/stock/movement_list.php", $langs->trans("Movements"), 1, $user->rights->stock->mouvement->lire);
 
 				$newmenu->add("/product/stock/massstockmove.php", $langs->trans("MassStockTransferShort"), 1, $user->rights->stock->mouvement->creer);
-				if ($conf->supplier_order->enabled) $newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire);
+				if ($conf->supplier_order->enabled) {
+					$newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire);
+				}
 				$newmenu->add("/product/stock/stockatdate.php", $langs->trans("StockAtDate"), 1, $user->rights->produit->lire && $user->rights->stock->lire && $conf->global->MAIN_FEATURES_LEVEL >= 2);
 
 				// Categories for warehouses
-				if (!empty($conf->categorie->enabled))
-				{
+				if (!empty($conf->categorie->enabled)) {
 					$newmenu->add("/categories/index.php?leftmenu=stock&amp;type=9", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
 				}
 			}
 
 			// Inventory
-			if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
-			{
-				if (!empty($conf->stock->enabled))
-				{
+			if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+				if (!empty($conf->stock->enabled)) {
 					$langs->load("stocks");
-					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
-					{
+					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 						$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock');
 						if ($usemenuhider || empty($leftmenu) || $leftmenu == "stock_inventories") {
 							$newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->rights->stock->creer);
@@ -1659,8 +1621,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Shipments
-			if (!empty($conf->expedition->enabled))
-			{
+			if (!empty($conf->expedition->enabled)) {
 				$langs->load("sendings");
 				$newmenu->add("/expedition/index.php?leftmenu=sendings", $langs->trans("Shipments"), 0, $user->rights->expedition->lire, '', $mainmenu, 'sendings');
 				$newmenu->add("/expedition/card.php?action=create2&amp;leftmenu=sendings", $langs->trans("NewSending"), 1, $user->rights->expedition->creer);
@@ -1674,15 +1635,20 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Receptions
-			if (!empty($conf->reception->enabled))
-			{
+			if (!empty($conf->reception->enabled)) {
 				$langs->load("receptions");
 				$newmenu->add("/reception/index.php?leftmenu=receptions", $langs->trans("Receptions"), 0, $user->rights->reception->lire, '', $mainmenu, 'receptions');
 				$newmenu->add("/reception/card.php?action=create2&amp;leftmenu=receptions", $langs->trans("NewReception"), 1, $user->rights->reception->creer);
 				$newmenu->add("/reception/list.php?leftmenu=receptions", $langs->trans("List"), 1, $user->rights->reception->lire);
-				if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") $newmenu->add("/reception/list.php?leftmenu=receptions&search_status=0", $langs->trans("StatusReceptionDraftShort"), 2, $user->rights->reception->lire);
-				if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") $newmenu->add("/reception/list.php?leftmenu=receptions&search_status=1", $langs->trans("StatusReceptionValidatedShort"), 2, $user->rights->reception->lire);
-				if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") $newmenu->add("/reception/list.php?leftmenu=receptions&search_status=2", $langs->trans("StatusReceptionProcessedShort"), 2, $user->rights->reception->lire);
+				if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") {
+					$newmenu->add("/reception/list.php?leftmenu=receptions&search_status=0", $langs->trans("StatusReceptionDraftShort"), 2, $user->rights->reception->lire);
+				}
+				if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") {
+					$newmenu->add("/reception/list.php?leftmenu=receptions&search_status=1", $langs->trans("StatusReceptionValidatedShort"), 2, $user->rights->reception->lire);
+				}
+				if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") {
+					$newmenu->add("/reception/list.php?leftmenu=receptions&search_status=2", $langs->trans("StatusReceptionProcessedShort"), 2, $user->rights->reception->lire);
+				}
 				$newmenu->add("/reception/stats/index.php?leftmenu=receptions", $langs->trans("Statistics"), 1, $user->rights->reception->lire);
 			}
 		}
@@ -1690,11 +1656,9 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		/*
 		 * Menu PRODUCTS-SERVICES MRP - GPAO
 		 */
-		if ($mainmenu == 'mrp')
-		{
+		if ($mainmenu == 'mrp') {
 			// BOM
-			if (!empty($conf->bom->enabled) || !empty($conf->mrp->enabled))
-			{
+			if (!empty($conf->bom->enabled) || !empty($conf->mrp->enabled)) {
 				$langs->load("mrp");
 
 				$newmenu->add("", $langs->trans("MenuBOM"), 0, $user->rights->bom->read, '', $mainmenu, 'bom');
@@ -1702,8 +1666,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/bom/bom_list.php?leftmenu=bom", $langs->trans("List"), 1, $user->rights->bom->read, '', $mainmenu, 'bom');
 			}
 
-			if (!empty($conf->mrp->enabled))
-			{
+			if (!empty($conf->mrp->enabled)) {
 				$langs->load("mrp");
 
 				$newmenu->add("", $langs->trans("MenuMRP"), 0, $user->rights->mrp->read, '', $mainmenu, 'mo');
@@ -1715,10 +1678,8 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		/*
 		 * Menu PROJECTS
 		 */
-		if ($mainmenu == 'project')
-		{
-			if (!empty($conf->projet->enabled))
-			{
+		if ($mainmenu == 'project') {
+			if (!empty($conf->projet->enabled)) {
 				$langs->load("projects");
 
 				$search_project_user = GETPOST('search_project_user', 'int');
@@ -1732,8 +1693,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 				$titleboth = $langs->trans("LeadsOrProjects");
 				$titlenew = $langs->trans("NewLeadOrProject"); // Leads and opportunities by default
-				if ($conf->global->PROJECT_USE_OPPORTUNITIES == 0)
-				{
+				if ($conf->global->PROJECT_USE_OPPORTUNITIES == 0) {
 					$titleboth = $langs->trans("Projects");
 					$titlenew = $langs->trans("NewProject");
 				}
@@ -1746,11 +1706,9 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/projet/index.php?leftmenu=projects".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titleboth, 0, $user->rights->projet->lire, '', $mainmenu, 'projects');
 				$newmenu->add("/projet/card.php?leftmenu=projects&action=create".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titlenew, 1, $user->rights->projet->creer);
 
-				if ($conf->global->PROJECT_USE_OPPORTUNITIES == 0)
-				{
+				if ($conf->global->PROJECT_USE_OPPORTUNITIES == 0) {
 					$newmenu->add("/projet/list.php?leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : '').'&search_status=99', $langs->trans("List"), 1, $showmode, '', 'project', 'list');
-				} elseif ($conf->global->PROJECT_USE_OPPORTUNITIES == 1)
-				{
+				} elseif ($conf->global->PROJECT_USE_OPPORTUNITIES == 1) {
 					$newmenu->add("/projet/list.php?leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $showmode, '', 'project', 'list');
 					$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_usage_opportunity=1&search_status=99&search_opp_status=openedopp&contextpage=lead', $langs->trans("ListOpenLeads"), 2, $showmode);
 					$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_opp_status=notopenedopp&search_status=99&contextpage=project', $langs->trans("ListOpenProjects"), 2, $showmode);
@@ -1761,14 +1719,12 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/projet/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);
 
 				// Categories
-				if (!empty($conf->categorie->enabled))
-				{
+				if (!empty($conf->categorie->enabled)) {
 					$langs->load("categories");
 					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=6", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
 				}
 
-				if (empty($conf->global->PROJECT_HIDE_TASKS))
-				{
+				if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 					// Project affected to user
 					$newmenu->add("/projet/activity/index.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("Activities"), 0, $user->rights->projet->lire, '', 'project', 'tasks');
 					$newmenu->add("/projet/tasks.php?leftmenu=tasks&action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer);
@@ -1783,11 +1739,9 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		/*
 		 * Menu HRM
 		*/
-		if ($mainmenu == 'hrm')
-		{
+		if ($mainmenu == 'hrm') {
 			// HRM module
-			if (!empty($conf->hrm->enabled))
-			{
+			if (!empty($conf->hrm->enabled)) {
 				$langs->load("hrm");
 
 				$newmenu->add("/user/list.php?mainmenu=hrm&leftmenu=hrm&mode=employee", $langs->trans("Employees"), 0, $user->rights->hrm->employee->read, '', $mainmenu, 'hrm');
@@ -1796,8 +1750,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Leave/Holiday/Vacation module
-			if (!empty($conf->holiday->enabled))
-			{
+			if (!empty($conf->holiday->enabled)) {
 				// Load translation files required by the page
 				$langs->loadLangs(array("holiday", "trips"));
 
@@ -1817,8 +1770,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Trips and expenses (old module)
-			if (!empty($conf->deplacement->enabled))
-			{
+			if (!empty($conf->deplacement->enabled)) {
 				$langs->load("trips");
 				$newmenu->add("/compta/deplacement/index.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("TripsAndExpenses"), 0, $user->rights->deplacement->lire, '', $mainmenu, 'tripsandexpenses');
 				$newmenu->add("/compta/deplacement/card.php?action=create&amp;leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("New"), 1, $user->rights->deplacement->creer);
@@ -1827,8 +1779,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Expense report
-			if (!empty($conf->expensereport->enabled))
-			{
+			if (!empty($conf->expensereport->enabled)) {
 				$langs->load("trips");
 				$newmenu->add("/expensereport/index.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("TripsAndExpenses"), 0, $user->rights->expensereport->lire, '', $mainmenu, 'expensereport');
 				$newmenu->add("/expensereport/card.php?action=create&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("New"), 1, $user->rights->expensereport->creer);
@@ -1844,10 +1795,8 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/expensereport/stats/index.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Statistics"), 1, $user->rights->expensereport->lire);
 			}
 
-			if (!empty($conf->projet->enabled))
-			{
-				if (empty($conf->global->PROJECT_HIDE_TASKS))
-				{
+			if (!empty($conf->projet->enabled)) {
+				if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 					$langs->load("projects");
 
 					$search_project_user = GETPOST('search_project_user', 'int');
@@ -1861,31 +1810,26 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		/*
 		 * Menu TOOLS
 		 */
-		if ($mainmenu == 'tools')
-		{
-			if (empty($user->socid)) // limit to internal users
-			{
+		if ($mainmenu == 'tools') {
+			if (empty($user->socid)) { // limit to internal users
 				$langs->load("mails");
 				$newmenu->add("/admin/mails_templates.php?leftmenu=email_templates", $langs->trans("EMailTemplates"), 0, 1, '', $mainmenu, 'email_templates');
 			}
 
-			if (!empty($conf->mailing->enabled))
-			{
+			if (!empty($conf->mailing->enabled)) {
 				$newmenu->add("/comm/mailing/index.php?leftmenu=mailing", $langs->trans("EMailings"), 0, $user->rights->mailing->lire, '', $mainmenu, 'mailing');
 				$newmenu->add("/comm/mailing/card.php?leftmenu=mailing&amp;action=create", $langs->trans("NewMailing"), 1, $user->rights->mailing->creer);
 				$newmenu->add("/comm/mailing/list.php?leftmenu=mailing", $langs->trans("List"), 1, $user->rights->mailing->lire);
 			}
 
-			if (!empty($conf->export->enabled))
-			{
+			if (!empty($conf->export->enabled)) {
 				$langs->load("exports");
 				$newmenu->add("/exports/index.php?leftmenu=export", $langs->trans("FormatedExport"), 0, $user->rights->export->lire, '', $mainmenu, 'export');
 				$newmenu->add("/exports/export.php?leftmenu=export", $langs->trans("NewExport"), 1, $user->rights->export->creer);
 				//$newmenu->add("/exports/export.php?leftmenu=export",$langs->trans("List"),1, $user->rights->export->lire);
 			}
 
-			if (!empty($conf->import->enabled))
-			{
+			if (!empty($conf->import->enabled)) {
 				$langs->load("exports");
 				$newmenu->add("/imports/index.php?leftmenu=import", $langs->trans("FormatedImport"), 0, $user->rights->import->run, '', $mainmenu, 'import');
 				$newmenu->add("/imports/import.php?leftmenu=import", $langs->trans("NewImport"), 1, $user->rights->import->run);
@@ -1895,10 +1839,8 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		/*
 		 * Menu MEMBERS
 		 */
-		if ($mainmenu == 'members')
-		{
-			if (!empty($conf->adherent->enabled))
-			{
+		if ($mainmenu == 'members') {
+			if (!empty($conf->adherent->enabled)) {
 				// Load translation files required by the page
 				$langs->loadLangs(array("members", "compta"));
 
@@ -1914,10 +1856,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/adherents/stats/index.php?leftmenu=members", $langs->trans("MenuMembersStats"), 1, $user->rights->adherent->lire);
 
 				$newmenu->add("/adherents/cartes/carte.php?leftmenu=export", $langs->trans("MembersCards"), 1, $user->rights->adherent->export);
-				if (!empty($conf->global->MEMBER_LINK_TO_HTPASSWDFILE) && ($usemenuhider || empty($leftmenu) || $leftmenu == 'none' || $leftmenu == "members" || $leftmenu == "export")) $newmenu->add("/adherents/htpasswd.php?leftmenu=export", $langs->trans("Filehtpasswd"), 1, $user->rights->adherent->export);
+				if (!empty($conf->global->MEMBER_LINK_TO_HTPASSWDFILE) && ($usemenuhider || empty($leftmenu) || $leftmenu == 'none' || $leftmenu == "members" || $leftmenu == "export")) {
+					$newmenu->add("/adherents/htpasswd.php?leftmenu=export", $langs->trans("Filehtpasswd"), 1, $user->rights->adherent->export);
+				}
 
-				if (!empty($conf->categorie->enabled))
-				{
+				if (!empty($conf->categorie->enabled)) {
 					$langs->load("categories");
 					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=3", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
 				}
@@ -1943,16 +1886,13 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		$newmenu = $menuArbo->menuLeftCharger($newmenu, $mainmenu, $leftmenu, (empty($user->socid) ? 0 : 1), 'eldy', $tabMenu);
 		//var_dump($newmenu->liste);    //
 
-		if (!empty($conf->ftp->enabled) && $mainmenu == 'ftp')	// Entry for FTP
-		{
+		if (!empty($conf->ftp->enabled) && $mainmenu == 'ftp') {	// Entry for FTP
 			$MAXFTP = 20;
 			$i = 1;
-			while ($i <= $MAXFTP)
-			{
+			while ($i <= $MAXFTP) {
 				$paramkey = 'FTP_NAME_'.$i;
 				//print $paramkey;
-				if (!empty($conf->global->$paramkey))
-				{
+				if (!empty($conf->global->$paramkey)) {
 					$link = "/ftp/index.php?idmenu=".$_SESSION["idmenu"]."&numero_ftp=".$i;
 
 					$newmenu->add($link, dol_trunc($conf->global->$paramkey, 24));
@@ -1969,10 +1909,16 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 	//var_dump($menu_array_before);exit;
 	//var_dump($menu_array_after);exit;
 	$menu_array = $newmenu->liste;
-	if (is_array($menu_array_before)) $menu_array = array_merge($menu_array_before, $menu_array);
-	if (is_array($menu_array_after))  $menu_array = array_merge($menu_array, $menu_array_after);
+	if (is_array($menu_array_before)) {
+		$menu_array = array_merge($menu_array_before, $menu_array);
+	}
+	if (is_array($menu_array_after)) {
+		$menu_array = array_merge($menu_array, $menu_array_after);
+	}
 	//var_dump($menu_array);exit;
-	if (!is_array($menu_array)) return 0;
+	if (!is_array($menu_array)) {
+		return 0;
+	}
 
 	// TODO Use the position property in menu_array to reorder the $menu_array
 	//var_dump($menu_array);
@@ -1982,19 +1928,19 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 	while (findNextEntryForLevel($menu_array, $cursor, $position, $level))
 	{
 
-	    $cursor++;
+		$cursor++;
 	}*/
 
 	// Show menu
 	$invert = empty($conf->global->MAIN_MENU_INVERT) ? "" : "invert";
-	if (empty($noout))
-	{
+	if (empty($noout)) {
 		$altok = 0; $blockvmenuopened = false; $lastlevel0 = '';
 		$num = count($menu_array);
-		for ($i = 0; $i < $num; $i++)     // Loop on each menu entry
-		{
+		for ($i = 0; $i < $num; $i++) {     // Loop on each menu entry
 			$showmenu = true;
-			if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) 	$showmenu = false;
+			if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) {
+				$showmenu = false;
+			}
 
 			// Begin of new left menu block
 			if (empty($menu_array[$i]['level']) && $showmenu) {
@@ -2002,7 +1948,9 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$blockvmenuopened = true;
 				$lastopened = true;
 				for ($j = ($i + 1); $j < $num; $j++) {
-					if (empty($menu_array[$j]['level'])) $lastopened = false;
+					if (empty($menu_array[$j]['level'])) {
+						$lastopened = false;
+					}
 				}
 				if ($altok % 2 == 0) {
 					print '<div class="blockvmenu blockvmenuimpair'.$invert.($lastopened ? ' blockvmenulast' : '').($altok == 1 ? ' blockvmenufirst' : '').'">'."\n";
@@ -2025,19 +1973,16 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			$menu_array[$i]['url'] = make_substitutions($menu_array[$i]['url'], $substitarray);
 
 			$url = $shorturl = $shorturlwithoutparam = $menu_array[$i]['url'];
-			if (!preg_match("/^(http:\/\/|https:\/\/)/i", $menu_array[$i]['url']))
-			{
+			if (!preg_match("/^(http:\/\/|https:\/\/)/i", $menu_array[$i]['url'])) {
 				$tmp = explode('?', $menu_array[$i]['url'], 2);
 				$url = $shorturl = $tmp[0];
 				$param = (isset($tmp[1]) ? $tmp[1] : ''); // params in url of the menu link
 
 				// Complete param to force leftmenu to '' to close open menu when we click on a link with no leftmenu defined.
-				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && !empty($menu_array[$i]['mainmenu']))
-				{
+				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && !empty($menu_array[$i]['mainmenu'])) {
 					$param .= ($param ? '&' : '').'mainmenu='.$menu_array[$i]['mainmenu'].'&leftmenu=';
 				}
-				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && empty($menu_array[$i]['mainmenu']))
-				{
+				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && empty($menu_array[$i]['mainmenu'])) {
 					$param .= ($param ? '&' : '').'leftmenu=';
 				}
 				//$url.="idmenu=".$menu_array[$i]['rowid'];    // Already done by menuLoad
@@ -2050,64 +1995,77 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			print '<!-- Process menu entry with mainmenu='.$menu_array[$i]['mainmenu'].', leftmenu='.$menu_array[$i]['leftmenu'].', level='.$menu_array[$i]['level'].' enabled='.$menu_array[$i]['enabled'].', position='.$menu_array[$i]['position'].' -->'."\n";
 
 			// Menu level 0
-			if ($menu_array[$i]['level'] == 0)
-			{
-				if ($menu_array[$i]['enabled'])     // Enabled so visible
-				{
+			if ($menu_array[$i]['level'] == 0) {
+				if ($menu_array[$i]['enabled']) {     // Enabled so visible
 					print '<div class="menu_titre">'.$tabstring;
-					if ($shorturlwithoutparam) print '<a class="vmenu" title="'.dol_escape_htmltag(dol_string_nohtmltag($menu_array[$i]['titre'])).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';
-					else print '<span class="vmenu">';
+					if ($shorturlwithoutparam) {
+						print '<a class="vmenu" title="'.dol_escape_htmltag(dol_string_nohtmltag($menu_array[$i]['titre'])).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';
+					} else {
+						print '<span class="vmenu">';
+					}
 					print ($menu_array[$i]['prefix'] ? $menu_array[$i]['prefix'] : '').$menu_array[$i]['titre'];
-					if ($shorturlwithoutparam) print '</a>';
-					else print '</span>';
+					if ($shorturlwithoutparam) {
+						print '</a>';
+					} else {
+						print '</span>';
+					}
 					print '</div>'."\n";
 					$lastlevel0 = 'enabled';
-				} elseif ($showmenu)                 // Not enabled but visible (so greyed)
-				{
+				} elseif ($showmenu) {                 // Not enabled but visible (so greyed)
 					print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
 					$lastlevel0 = 'greyed';
 				} else {
 					$lastlevel0 = 'hidden';
 				}
-				if ($showmenu)
-				{
+				if ($showmenu) {
 					print '<div class="menu_top"></div>'."\n";
 				}
 			}
 
 			// Menu level > 0
-			if ($menu_array[$i]['level'] > 0)
-			{
+			if ($menu_array[$i]['level'] > 0) {
 				$cssmenu = '';
-				if ($menu_array[$i]['url']) $cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $menu_array[$i]['url']));
+				if ($menu_array[$i]['url']) {
+					$cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $menu_array[$i]['url']));
+				}
 
-				if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled')     // Enabled so visible, except if parent was not enabled.
-				{
+				if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled') {     // Enabled so visible, except if parent was not enabled.
 					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring;
-					if ($shorturlwithoutparam) print '<a class="vsmenu" title="'.dol_escape_htmltag(dol_string_nohtmltag($menu_array[$i]['titre'])).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';
-					else print '<span class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'">';
+					if ($shorturlwithoutparam) {
+						print '<a class="vsmenu" title="'.dol_escape_htmltag(dol_string_nohtmltag($menu_array[$i]['titre'])).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';
+					} else {
+						print '<span class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'">';
+					}
 					print $menu_array[$i]['titre'];
-					if ($shorturlwithoutparam) print '</a>';
-					else print '</span>';
+					if ($shorturlwithoutparam) {
+						print '</a>';
+					} else {
+						print '</span>';
+					}
 					// If title is not pure text and contains a table, no carriage return added
-					if (!strstr($menu_array[$i]['titre'], '<table')) print '<br>';
+					if (!strstr($menu_array[$i]['titre'], '<table')) {
+						print '<br>';
+					}
 					print '</div>'."\n";
-				} elseif ($showmenu && $lastlevel0 == 'enabled')       // Not enabled but visible (so greyed), except if parent was not enabled.
-				{
+				} elseif ($showmenu && $lastlevel0 == 'enabled') {       // Not enabled but visible (so greyed), except if parent was not enabled.
 					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
 				}
 			}
 
 			// If next is a new block or if there is nothing after
-			if (empty($menu_array[$i + 1]['level']))               // End menu block
-			{
-				if ($showmenu)
+			if (empty($menu_array[$i + 1]['level'])) {               // End menu block
+				if ($showmenu) {
 					print '<div class="menu_end"></div>'."\n";
-				if ($blockvmenuopened) { print '</div>'."\n"; $blockvmenuopened = false; }
+				}
+				if ($blockvmenuopened) {
+					print '</div>'."\n"; $blockvmenuopened = false;
+				}
 			}
 		}
 
-		if ($altok) print '<div class="blockvmenuend"></div>'; // End menu block
+		if ($altok) {
+			print '<div class="blockvmenuend"></div>'; // End menu block
+		}
 	}
 
 	return count($menu_array);
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index 56a56d3af9b..5a6519dd95c 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -67,12 +67,15 @@ class MenuManager
 		global $conf, $user, $langs;
 
 		// We save into session the main menu selected
-		if (GETPOSTISSET("mainmenu")) $_SESSION["mainmenu"] = GETPOST("mainmenu", 'aZ09');
-		if (GETPOSTISSET("idmenu"))   $_SESSION["idmenu"] = GETPOST("idmenu", 'int');
+		if (GETPOSTISSET("mainmenu")) {
+			$_SESSION["mainmenu"] = GETPOST("mainmenu", 'aZ09');
+		}
+		if (GETPOSTISSET("idmenu")) {
+			$_SESSION["idmenu"] = GETPOST("idmenu", 'int');
+		}
 
 		// Read now mainmenu and leftmenu that define which menu to show
-		if (GETPOSTISSET("mainmenu"))
-		{
+		if (GETPOSTISSET("mainmenu")) {
 			// On sauve en session le menu principal choisi
 			$mainmenu = GETPOST("mainmenu", 'aZ09');
 			$_SESSION["mainmenu"] = $mainmenu;
@@ -81,17 +84,17 @@ class MenuManager
 			// On va le chercher en session si non defini par le lien
 			$mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';
 		}
-		if (!empty($forcemainmenu)) $mainmenu = $forcemainmenu;
+		if (!empty($forcemainmenu)) {
+			$mainmenu = $forcemainmenu;
+		}
 
-		if (GETPOSTISSET("leftmenu"))
-		{
+		if (GETPOSTISSET("leftmenu")) {
 			// On sauve en session le menu principal choisi
 			$leftmenu = GETPOST("leftmenu", 'aZ09');
 			$_SESSION["leftmenu"] = $leftmenu;
 
-			if ($_SESSION["leftmenuopened"] == $leftmenu)	// To collapse
-			{
-				//$leftmenu="";
+			if ($_SESSION["leftmenuopened"] == $leftmenu) {	// To collapse
+			//$leftmenu="";
 				$_SESSION["leftmenuopened"] = "";
 			} else {
 				$_SESSION["leftmenuopened"] = $leftmenu;
@@ -100,7 +103,9 @@ class MenuManager
 			// On va le chercher en session si non defini par le lien
 			$leftmenu = isset($_SESSION["leftmenu"]) ? $_SESSION["leftmenu"] : '';
 		}
-		if (!empty($forceleftmenu)) $leftmenu = $forceleftmenu;
+		if (!empty($forceleftmenu)) {
+			$leftmenu = $forceleftmenu;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
 		$tabMenu = array();
@@ -129,8 +134,7 @@ class MenuManager
 
 		require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php';
 
-		if ($this->type_user == 1)
-		{
+		if ($this->type_user == 1) {
 			$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED = 1;
 			$conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED = 1;
 		}
@@ -138,36 +142,39 @@ class MenuManager
 		require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
 		$this->menu = new Menu();
 
-		if (empty($conf->global->MAIN_MENU_INVERT))
-		{
-			if ($mode == 'top')  print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
-			if ($mode == 'left') print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata);
+		if (empty($conf->global->MAIN_MENU_INVERT)) {
+			if ($mode == 'top') {
+				print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
+			}
+			if ($mode == 'left') {
+				print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata, $this->type_user);
+			}
 		} else {
 			$conf->global->MAIN_SHOW_LOGO = 0;
-			if ($mode == 'top')  print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0);
-			if ($mode == 'left') print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
+			if ($mode == 'top') {
+				print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata, $this->type_user);
+			}
+			if ($mode == 'left') {
+				print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
+			}
 		}
-		if ($mode == 'topnb')
-		{
+		if ($mode == 'topnb') {
 			print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode); // no output
 			return $this->menu->getNbOfVisibleMenuEntries();
 		}
 
-		if ($mode == 'jmobile')     // Used to get menu in xml ul/li
-		{
+		if ($mode == 'jmobile') {     // Used to get menu in xml ul/li
 			print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode); // Fill this->menu that is empty with top menu
 
 			// $this->menu->liste is top menu
 			//var_dump($this->menu->liste);exit;
 			$lastlevel = array();
 			print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
-			foreach ($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-			{
+			foreach ($this->menu->liste as $key => $val) {		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
 				print '<ul class="ulmenu" data-inset="true">';
 				print '<li class="lilevel0">';
 
-				if ($val['enabled'] == 1)
-				{
+				if ($val['enabled'] == 1) {
 					$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
 					$substitarray['__USERID__'] = $user->id; // For backward compatibility
 					$val['url'] = make_substitutions($val['url'], $substitarray);
@@ -178,7 +185,9 @@ class MenuManager
 					print '<a class="alilevel0" href="#">';
 
 					// Add font-awesome
-					if ($val['level'] == 0 && $val['mainmenu'] == 'home') print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
+					if ($val['level'] == 0 && $val['mainmenu'] == 'home') {
+						print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
+					}
 
 					print $val['titre'];
 					print '</a>'."\n";
@@ -187,7 +196,7 @@ class MenuManager
 					$tmpmainmenu = $val['mainmenu'];
 					$tmpleftmenu = 'all';
 					$submenu = new Menu();
-					print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $submenu, 1, $tmpmainmenu, $tmpleftmenu); // Fill $submenu (example with tmpmainmenu='home' tmpleftmenu='all', return left menu tree of Home)
+					print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $submenu, 1, $tmpmainmenu, $tmpleftmenu, null, $this->type_user); // Fill $submenu (example with tmpmainmenu='home' tmpleftmenu='all', return left menu tree of Home)
 					// Note: $submenu contains menu entry with substitution not yet done
 					//if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }
 					//if ($tmpmainmenu=='accountancy') { var_dump($submenu->liste); exit; }
@@ -199,27 +208,27 @@ class MenuManager
 					//var_dump($canonnexturl);
 					print '<ul>'."\n";
 					if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools')))
-						|| (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false))
-					{
+						|| (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false)) {
 						// We add sub entry
 						print str_pad('', 1).'<li class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
 						print '<a href="'.$relurl.'">';
-						if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation
-						{
-							if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab'))) print $langs->trans("Access");
-							else print $langs->trans("Dashboard");
-						} else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
+						if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard") {  // No translation
+							if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab'))) {
+								print $langs->trans("Access");
+							} else {
+								print $langs->trans("Dashboard");
+							}
+						} else {
+							print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
+						}
 						print '</a>';
 						print '</li>'."\n";
 					}
 
-					if ($val['level'] == 0)
-					{
-						if ($val['enabled'])
-						{
+					if ($val['level'] == 0) {
+						if ($val['enabled']) {
 							$lastlevel[0] = 'enabled';
-						} elseif ($showmenu)                 // Not enabled but visible (so greyed)
-						{
+						} elseif ($showmenu) {                 // Not enabled but visible (so greyed)
 							$lastlevel[0] = 'greyed';
 						} else {
 							$lastlevel[0] = 'hidden';
@@ -227,52 +236,52 @@ class MenuManager
 					}
 
 					$lastlevel2 = array();
-	   				foreach ($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-	   				{
+					foreach ($submenu->liste as $key2 => $val2) {		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
 						$showmenu = true;
-						if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu = false;
+						if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) {
+							$showmenu = false;
+						}
 
 						// If at least one parent is not enabled, we do not show any menu of all children
-						if ($val2['level'] > 0)
-						{
+						if ($val2['level'] > 0) {
 							$levelcursor = $val2['level'] - 1;
-							while ($levelcursor >= 0)
-							{
-								if ($lastlevel2[$levelcursor] != 'enabled') $showmenu = false;
+							while ($levelcursor >= 0) {
+								if ($lastlevel2[$levelcursor] != 'enabled') {
+									$showmenu = false;
+								}
 								$levelcursor--;
 							}
 						}
 
-	   					if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)
-	   					{
-	   						$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
-	   						$substitarray['__USERID__'] = $user->id; // For backward compatibility
-	   						$val2['url'] = make_substitutions($val2['url'], $substitarray); // Make also substitution of __(XXX)__ and __[XXX]__
+						if ($showmenu) {		// Visible (option to hide when not allowed is off or allowed)
+							$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
+							$substitarray['__USERID__'] = $user->id; // For backward compatibility
+							$val2['url'] = make_substitutions($val2['url'], $substitarray); // Make also substitution of __(XXX)__ and __[XXX]__
 
-	   						if (!preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url']))
-	   						{
-	   							$relurl2 = dol_buildpath($val2['url'], 1);
-	   						} else {
-	   							$relurl2 = $val2['url'];
-	   						}
+							if (!preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url'])) {
+								$relurl2 = dol_buildpath($val2['url'], 1);
+							} else {
+								$relurl2 = $val2['url'];
+							}
 							$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
 							//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
-							if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php'))) $relurl2 = '';
+							if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php'))) {
+								$relurl2 = '';
+							}
 
 							$disabled = '';
-							if (!$val2['enabled'])
-							{
+							if (!$val2['enabled']) {
 								$disabled = " vsmenudisabled";
 							}
 
 							print str_pad('', $val2['level'] + 1);
 							print '<li class="lilevel'.($val2['level'] + 1);
-							if ($val2['level'] == 0) print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic
+							if ($val2['level'] == 0) {
+								print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic
+							}
 							print $disabled.'">'; // ui-btn to highlight on clic
-							if ($relurl2)
-							{
-								if ($val2['enabled'])	// Allowed
-								{
+							if ($relurl2) {
+								if ($val2['enabled']) {	// Allowed
 									print '<a href="'.$relurl2.'"';
 									//print ' data-ajax="false"';
 									print '>';
@@ -283,28 +292,27 @@ class MenuManager
 									$lastlevel2[$val2['level']] = 'greyed';
 								}
 							} else {
-								if ($val2['enabled'])	// Allowed
-								{
+								if ($val2['enabled']) {	// Allowed
 									$lastlevel2[$val2['level']] = 'enabled';
 								} else {
 									$lastlevel2[$val2['level']] = 'greyed';
 								}
 							}
 							print $val2['titre'];
-							if ($relurl2)
-							{
-								if ($val2['enabled'])	// Allowed
+							if ($relurl2) {
+								if ($val2['enabled']) {	// Allowed
 									print '</a>';
-								else print '</a>';
+								} else {
+									print '</a>';
+								}
 							}
 							print '</li>'."\n";
-	   					}
-	   				}
+						}
+					}
 					//var_dump($submenu);
 					print '</ul>';
 				}
-				if ($val['enabled'] == 2)
-				{
+				if ($val['enabled'] == 2) {
 					print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
 				}
 				print '</li>';
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 3a16b76079e..7372849b124 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -84,20 +84,19 @@ class MenuManager
 		$noout = 0;
 		//if ($mode == 'jmobile') $noout=1;
 
-		if ($mode == 'topnb')
-		{
+		if ($mode == 'topnb') {
 			return 1;
 		}
 
-		if ($mode == 'top')
-		{
-			if (empty($noout)) print_start_menu_array_empty();
+		if ($mode == 'top') {
+			if (empty($noout)) {
+				print_start_menu_array_empty();
+			}
 
 			$usemenuhider = 1;
 
 			// Show/Hide vertical menu
-			if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+			if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$showmode = 1;
 				$classname = 'class="tmenu menuhider"';
 				$idsel = 'menu';
@@ -117,29 +116,38 @@ class MenuManager
 			$this->menu->liste = dol_sort_array($this->menu->liste, 'position');
 
 			// Output menu entries
-			foreach ($this->menu->liste as $menkey => $menuval)
-			{
-				if (empty($noout)) print_start_menu_entry_empty($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
-				if (empty($noout)) print_text_menu_entry_empty($menuval['titre'], $menuval['enabled'], ($menuval['url'] != '#' ?DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));
-				if (empty($noout)) print_end_menu_entry_empty($menuval['enabled']);
+			foreach ($this->menu->liste as $menkey => $menuval) {
+				if (empty($noout)) {
+					print_start_menu_entry_empty($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
+				}
+				if (empty($noout)) {
+					print_text_menu_entry_empty($menuval['titre'], $menuval['enabled'], ($menuval['url'] != '#' ?DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));
+				}
+				if (empty($noout)) {
+					print_end_menu_entry_empty($menuval['enabled']);
+				}
 			}
 
 			$showmode = 1;
-			if (empty($noout)) print_start_menu_entry_empty('', 'class="tmenuend"', $showmode);
-			if (empty($noout)) print_end_menu_entry_empty($showmode);
+			if (empty($noout)) {
+				print_start_menu_entry_empty('', 'class="tmenuend"', $showmode);
+			}
+			if (empty($noout)) {
+				print_end_menu_entry_empty($showmode);
+			}
 
-			if (empty($noout)) print_end_menu_array_empty();
+			if (empty($noout)) {
+				print_end_menu_array_empty();
+			}
 
-			if ($mode == 'jmobile')
-			{
+			if ($mode == 'jmobile') {
 				$this->topmenu = clone $this->menu;
 				unset($this->menu->liste);
 			}
 		}
 
-		if ($mode == 'jmobile')     // Used to get menu in xml ul/li
-		{
-			// Home
+		if ($mode == 'jmobile') {     // Used to get menu in xml ul/li
+		// Home
 			$showmode = 1;
 			$classname = 'class="tmenusel"';
 			$idsel = 'home';
@@ -152,22 +160,22 @@ class MenuManager
 			//var_dump($this->menu->liste);exit;
 			$lastlevel = array();
 			print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
-			foreach ($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-			{
+			foreach ($this->menu->liste as $key => $val) {		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
 				print '<ul class="ulmenu" data-inset="true">';
 				print '<li class="lilevel0">';
 
 				$val['url'] = make_substitutions($val['url'], $substitarray);
 
-				if ($val['enabled'] == 1)
-				{
+				if ($val['enabled'] == 1) {
 					$relurl = dol_buildpath($val['url'], 1);
 					$canonurl = preg_replace('/\?.*$/', '', $val['url']);
 
 					print '<a class="alilevel0" href="#">';
 
 					// Add font-awesome
-					if ($val['level'] == 0 && $val['mainmenu'] == 'home') print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
+					if ($val['level'] == 0 && $val['mainmenu'] == 'home') {
+						print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
+					}
 
 					print $val['titre'];
 					print '</a>'."\n";
@@ -206,27 +214,27 @@ class MenuManager
 					//var_dump($canonnexturl);
 					print '<ul>'."\n";
 					if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools')))
-						|| (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false))
-					{
+						|| (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false)) {
 						// We add sub entry
 						print str_pad('', 1).'<li class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
 						print '<a href="'.$relurl.'">';
-						if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation
-						{
-							if (in_array($val['mainmenu'], array('cashdesk', 'websites'))) print $langs->trans("Access");
-							else print $langs->trans("Dashboard");
-						} else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
+						if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard") {  // No translation
+							if (in_array($val['mainmenu'], array('cashdesk', 'websites'))) {
+								print $langs->trans("Access");
+							} else {
+								print $langs->trans("Dashboard");
+							}
+						} else {
+							print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
+						}
 						print '</a>';
 						print '</li>'."\n";
 					}
 
-					if ($val['level'] == 0)
-					{
-						if ($val['enabled'])
-						{
+					if ($val['level'] == 0) {
+						if ($val['enabled']) {
 							$lastlevel[0] = 'enabled';
-						} elseif ($showmenu)                 // Not enabled but visible (so greyed)
-						{
+						} elseif ($showmenu) {                 // Not enabled but visible (so greyed)
 							$lastlevel[0] = 'greyed';
 						} else {
 							$lastlevel[0] = 'hidden';
@@ -234,45 +242,46 @@ class MenuManager
 					}
 
 					$lastlevel2 = array();
-					foreach ($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-					{
+					foreach ($submenu->liste as $key2 => $val2) {		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
 						$showmenu = true;
-						if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu = false;
+						if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) {
+							$showmenu = false;
+						}
 
 						// If at least one parent is not enabled, we do not show any menu of all children
-						if ($val2['level'] > 0)
-						{
+						if ($val2['level'] > 0) {
 							$levelcursor = $val2['level'] - 1;
-							while ($levelcursor >= 0)
-							{
-								if ($lastlevel2[$levelcursor] != 'enabled') $showmenu = false;
+							while ($levelcursor >= 0) {
+								if ($lastlevel2[$levelcursor] != 'enabled') {
+									$showmenu = false;
+								}
 								$levelcursor--;
 							}
 						}
 
-						if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)
-						{
+						if ($showmenu) {		// Visible (option to hide when not allowed is off or allowed)
 							$val2['url'] = make_substitutions($val2['url'], $substitarray);
 
 							$relurl2 = dol_buildpath($val2['url'], 1);
 							$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
 							//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
-							if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php'))) $relurl2 = '';
+							if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php'))) {
+								$relurl2 = '';
+							}
 
 							$disabled = '';
-							if (!$val2['enabled'])
-							{
+							if (!$val2['enabled']) {
 								$disabled = " vsmenudisabled";
 							}
 
 							print str_pad('', $val2['level'] + 1);
 							print '<li class="lilevel'.($val2['level'] + 1);
-							if ($val2['level'] == 0) print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic
+							if ($val2['level'] == 0) {
+								print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic
+							}
 							print $disabled.'">'; // ui-btn to highlight on clic
-							if ($relurl2)
-							{
-								if ($val2['enabled'])	// Allowed
-								{
+							if ($relurl2) {
+								if ($val2['enabled']) {	// Allowed
 									print '<a href="'.$relurl2.'"';
 									//print ' data-ajax="false"';
 									print '>';
@@ -283,8 +292,7 @@ class MenuManager
 									$lastlevel2[$val2['level']] = 'greyed';
 								}
 							} else {
-								if ($val2['enabled'])	// Allowed
-								{
+								if ($val2['enabled']) {	// Allowed
 									$lastlevel2[$val2['level']] = 'enabled';
 								} else {
 									$lastlevel2[$val2['level']] = 'greyed';
@@ -293,8 +301,7 @@ class MenuManager
 							//var_dump($val2['level']);
 							//var_dump($lastlevel2);
 							print $val2['titre'];
-							if ($relurl2)
-							{
+							if ($relurl2) {
 								if ($val2['enabled']) {
 									// Allowed
 									print '</a>';
@@ -308,8 +315,7 @@ class MenuManager
 					//var_dump($submenu);
 					print '</ul>';
 				}
-				if ($val['enabled'] == 2)
-				{
+				if ($val['enabled'] == 2) {
 					print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
 				}
 				print '</li>';
@@ -317,8 +323,7 @@ class MenuManager
 			}
 		}
 
-		if ($mode == 'left')
-		{
+		if ($mode == 'left') {
 			// Put here left menu entries
 			// ***** START *****
 
@@ -345,26 +350,23 @@ class MenuManager
 
 			// do not change code after this
 
-			if (empty($noout))
-			{
+			if (empty($noout)) {
 				$alt = 0; $altok = 0; $blockvmenuopened = false;
 				$num = count($this->menu->liste);
-				for ($i = 0; $i < $num; $i++)
-				{
+				for ($i = 0; $i < $num; $i++) {
 					$alt++;
-					if (empty($this->menu->liste[$i]['level']))
-					{
+					if (empty($this->menu->liste[$i]['level'])) {
 						$altok++;
 						$blockvmenuopened = true;
 						$lastopened = true;
-						for ($j = ($i + 1); $j < $num; $j++)
-						{
-							if (empty($menu_array[$j]['level'])) $lastopened = false;
+						for ($j = ($i + 1); $j < $num; $j++) {
+							if (empty($menu_array[$j]['level'])) {
+								$lastopened = false;
+							}
 						}
 						$alt = 0; // For menu manager "empty", we force to not have blockvmenufirst defined
 						$lastopened = 1; // For menu manager "empty", we force to not have blockvmenulast defined
-						if (($alt % 2 == 0))
-						{
+						if (($alt % 2 == 0)) {
 							print '<div class="blockvmenub lockvmenuimpair blockvmenuunique'.($lastopened ? ' blockvmenulast' : '').($alt == 1 ? ' blockvmenufirst' : '').'">'."\n";
 						} else {
 							print '<div class="blockvmenu blockvmenupair blockvmenuunique'.($lastopened ? ' blockvmenulast' : '').($alt == 1 ? ' blockvmenufirst' : '').'">'."\n";
@@ -374,17 +376,14 @@ class MenuManager
 					// Add tabulation
 					$tabstring = '';
 					$tabul = ($this->menu->liste[$i]['level'] - 1);
-					if ($tabul > 0)
-					{
-						for ($j = 0; $j < $tabul; $j++)
-						{
+					if ($tabul > 0) {
+						for ($j = 0; $j < $tabul; $j++) {
 							$tabstring .= '&nbsp; &nbsp;';
 						}
 					}
 
 					if ($this->menu->liste[$i]['level'] == 0) {
-						if ($this->menu->liste[$i]['enabled'])
-						{
+						if ($this->menu->liste[$i]['enabled']) {
 							print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.dol_buildpath($this->menu->liste[$i]['url'], 1).'"'.($this->menu->liste[$i]['target'] ? ' target="'.$this->menu->liste[$i]['target'].'"' : '').'>'.$this->menu->liste[$i]['titre'].'</a></div>'."\n";
 						} else {
 							print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$this->menu->liste[$i]['titre'].'</font></div>'."\n";
@@ -392,42 +391,50 @@ class MenuManager
 						print '<div class="menu_top"></div>'."\n";
 					}
 
-					if ($this->menu->liste[$i]['level'] > 0)
-					{
+					if ($this->menu->liste[$i]['level'] > 0) {
 						$cssmenu = '';
-						if ($this->menu->liste[$i]['url']) $cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $this->menu->liste[$i]['url']));
+						if ($this->menu->liste[$i]['url']) {
+							$cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $this->menu->liste[$i]['url']));
+						}
 
 						print '<div class="menu_contenu'.$cssmenu.'">';
 
-						if ($this->menu->liste[$i]['enabled'])
-						{
+						if ($this->menu->liste[$i]['enabled']) {
 							print $tabstring;
-							if ($this->menu->liste[$i]['url']) print '<a class="vsmenu"  itle="'.dol_escape_htmltag($this->menu->liste[$i]['titre']).'" href="'.dol_buildpath($this->menu->liste[$i]['url'], 1).'"'.($this->menu->liste[$i]['target'] ? ' target="'.$this->menu->liste[$i]['target'].'"' : '').'>';
-							else print '<span class="vsmenu" title="'.dol_escape_htmltag($this->menu->liste[$i]['titre']).'">';
-							if ($this->menu->liste[$i]['url']) print $this->menu->liste[$i]['titre'].'</a>';
-							else print '</span>';
+							if ($this->menu->liste[$i]['url']) {
+								print '<a class="vsmenu"  itle="'.dol_escape_htmltag($this->menu->liste[$i]['titre']).'" href="'.dol_buildpath($this->menu->liste[$i]['url'], 1).'"'.($this->menu->liste[$i]['target'] ? ' target="'.$this->menu->liste[$i]['target'].'"' : '').'>';
+							} else {
+								print '<span class="vsmenu" title="'.dol_escape_htmltag($this->menu->liste[$i]['titre']).'">';
+							}
+							if ($this->menu->liste[$i]['url']) {
+								print $this->menu->liste[$i]['titre'].'</a>';
+							} else {
+								print '</span>';
+							}
 						} else {
 							print $tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$this->menu->liste[$i]['titre'].'</font>';
 						}
 
 						// If title is not pure text and contains a table, no carriage return added
-						if (!strstr($this->menu->liste[$i]['titre'], '<table')) print '<br>';
+						if (!strstr($this->menu->liste[$i]['titre'], '<table')) {
+							print '<br>';
+						}
 						print '</div>'."\n";
 					}
 
 					// If next is a new block or end
-					if (empty($this->menu->liste[$i + 1]['level']))
-					{
+					if (empty($this->menu->liste[$i + 1]['level'])) {
 						print '<div class="menu_end"></div>'."\n";
 						print "</div>\n";
 					}
 				}
 
-				if ($altok) print '<div class="blockvmenuend"></div>';
+				if ($altok) {
+					print '<div class="blockvmenuend"></div>';
+				}
 			}
 
-			if ($mode == 'jmobile')
-			{
+			if ($mode == 'jmobile') {
 				$this->leftmenu = clone $this->menu;
 				unset($this->menu->liste);
 			}
@@ -442,7 +449,7 @@ class MenuManager
 				print '<ul class="ulmenu" data-inset="true">';
 				print '<li class="lilevel0">';
 
-		        $val['url'] = make_substitutions($val['url'], $substitarray);
+				$val['url'] = make_substitutions($val['url'], $substitarray);
 
 				if ($val['enabled'] == 1)
 				{
@@ -453,7 +460,7 @@ class MenuManager
 					$tmpmainmenu=$val['mainmenu'];
 					$tmpleftmenu='all';
 					//$submenu=new Menu();
-					//$res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$submenu,1,$tmpmainmenu,$tmpleftmenu);
+					//$res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$submenu,1,$tmpmainmenu,$tmpleftmenu, null, $this->type_user);
 					//$nexturl=dol_buildpath($submenu->liste[0]['url'],1);
 					$submenu=$this->leftmenu;
 
@@ -462,14 +469,14 @@ class MenuManager
 					//var_dump($canonrelurl);
 					//var_dump($canonnexturl);
 					print '<ul>';
-        			if ($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('home','tools')))
+					if ($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('home','tools')))
 					{
 						// We add sub entry
 						print '<li><a href="'.$relurl.'">'.$langs->trans("MainArea").'-'.$val['titre'].'</a></li>'."\n";
 					}
 					foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
 					{
-	                	$val2['url'] = make_substitutions($val2['url'], $substitarray);
+						$val2['url'] = make_substitutions($val2['url'], $substitarray);
 
 						$relurl2=dol_buildpath($val2['url'],1);
 						//var_dump($val2);
@@ -488,7 +495,7 @@ class MenuManager
 				break;	// Only first menu entry (so home)
 			}
 		}
-        */
+		*/
 		unset($this->menu);
 
 		return $res;
@@ -519,8 +526,7 @@ function print_start_menu_array_empty()
  */
 function print_start_menu_entry_empty($idsel, $classname, $showmode)
 {
-	if ($showmode)
-	{
+	if ($showmode) {
 		print '<li '.$classname.' id="mainmenutd_'.$idsel.'">';
 		//print '<div class="tmenuleft tmenusep"></div>';
 		print '<div class="tmenucenter">';
@@ -543,8 +549,7 @@ function print_text_menu_entry_empty($text, $showmode, $url, $id, $idsel, $class
 {
 	global $conf, $langs;
 
-	if ($showmode == 1)
-	{
+	if ($showmode == 1) {
 		print '<a class="tmenuimage" tabindex="-1" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').'>';
 		print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
 		print '</a>';
@@ -554,8 +559,7 @@ function print_text_menu_entry_empty($text, $showmode, $url, $id, $idsel, $class
 		print '</span>';
 		print '</a>';
 	}
-	if ($showmode == 2)
-	{
+	if ($showmode == 2) {
 		print '<div class="'.$id.' '.$idsel.' tmenudisabled"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
 		print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
 	}
@@ -569,8 +573,7 @@ function print_text_menu_entry_empty($text, $showmode, $url, $id, $idsel, $class
  */
 function print_end_menu_entry_empty($showmode)
 {
-	if ($showmode)
-	{
+	if ($showmode) {
 		print '</div></li>';
 		print "\n";
 	}

From 08e6fcad0dc93294f9c698625decf7c0e37cacae Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 4 Dec 2020 17:10:39 +0000
Subject: [PATCH 155/888] Fixing style errors.

---
 htdocs/core/menus/standard/eldy.lib.php  | 2 +-
 htdocs/core/menus/standard/eldy_menu.php | 2 +-
 htdocs/core/menus/standard/empty.php     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index fdf95e37aa1..b103a309f59 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -701,7 +701,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 	 * --------------------------------------------------
 	 */
 	if ($mainmenu) {	// If this is empty, loading hard coded menu and loading personalised menu will fail
-	/*
+		/*
 		 * Menu HOME
 		 */
 		if ($mainmenu == 'home') {
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index 5a6519dd95c..a024e6743e8 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -94,7 +94,7 @@ class MenuManager
 			$_SESSION["leftmenu"] = $leftmenu;
 
 			if ($_SESSION["leftmenuopened"] == $leftmenu) {	// To collapse
-			//$leftmenu="";
+				//$leftmenu="";
 				$_SESSION["leftmenuopened"] = "";
 			} else {
 				$_SESSION["leftmenuopened"] = $leftmenu;
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 7372849b124..b3151e15748 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -147,7 +147,7 @@ class MenuManager
 		}
 
 		if ($mode == 'jmobile') {     // Used to get menu in xml ul/li
-		// Home
+			// Home
 			$showmode = 1;
 			$classname = 'class="tmenusel"';
 			$idsel = 'home';

From 49db52134ba5e09c8cf022bc1cdbe763917c1f7e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Dec 2020 18:19:51 +0100
Subject: [PATCH 156/888] Fix for negative numbers

---
 test/phpunit/FunctionsLibTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index 3d098131f21..a54b1a04674 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -1267,9 +1267,9 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
         $this->assertEquals(1234, price2num('1.234', '', 2), 'Test 1.234 give 1234 with spanish language if user input');
         $this->assertEquals(1.234, price2num('1,234', '', 2), 'Test 1,234 give 1234 with spanish language if user input');
         $this->assertEquals(1234, price2num('1 234', '', 2), 'Test 1 234 give 1234 with spanish language if user input');
-        $this->assertEquals(1.234, price2num('1.234'), 'Test 1.234 give 1.234 with spanish language');
-        $this->assertEquals(1.234, price2num('1,234'), 'Test 1,234 give 1234 with spanish language');
-        $this->assertEquals(1234, price2num('1 234'), 'Test 1 234 give 1234 with spanish language');
+        $this->assertEquals(-1.234, price2num('-1.234'), 'Test 1.234 give 1.234 with spanish language');
+        $this->assertEquals(-1.234, price2num('-1,234'), 'Test 1,234 give 1234 with spanish language');
+        $this->assertEquals(-1234, price2num('-1 234'), 'Test 1 234 give 1234 with spanish language');
         $this->assertEquals(21500123, price2num('21.500.123'), 'Test 21.500.123 give 21500123 with spanish language');
         $this->assertEquals(21500123, price2num('21500.123', 0, 2), 'Test 21500.123 give 21500123 with spanish language if user input');
         $this->assertEquals(21500.123, price2num('21500.123'), 'Test 21500.123 give 21500123 with spanish language');

From 9cbdbc460d74516acfdb08ece2e93bb664843fb4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Dec 2020 19:10:43 +0100
Subject: [PATCH 157/888] Fix multicurrency

---
 .../fourn/class/fournisseur.product.class.php | 44 +++++++++++++------
 htdocs/product/fournisseurs.php               |  5 +--
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 43a9f271f04..64fbabedb2b 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -61,11 +61,15 @@ class ProductFournisseur extends Product
 	 * @see $ref_supplier
 	 */
 	public $fourn_ref;
+
 	public $delivery_time_days;
 	public $ref_supplier; // ref supplier (can be set by get_buyprice)
 	public $desc_supplier;
 	public $vatrate_supplier; // default vat rate for this supplier/qty/product (can be set by get_buyprice)
 
+	public $product_id;
+	public $product_ref;
+
 	public $fourn_id; //supplier id
 	public $fourn_qty; // quantity for price (can be set by get_buyprice)
 	public $fourn_pu; // unit price for quantity (can be set by get_buyprice)
@@ -73,7 +77,9 @@ class ProductFournisseur extends Product
 	public $fourn_price; // price for quantity
 	public $fourn_remise_percent; // discount for quantity (percent)
 	public $fourn_remise; // discount for quantity (amount)
+
 	public $product_fourn_id; // product-supplier id
+	public $product_fourn_entity;
 
 	/**
 	 * @var int ID user_id - user who created/updated supplier price
@@ -612,15 +618,15 @@ class ProductFournisseur extends Product
 		// phpcs:enable
 		global $conf;
 
-		$sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id,";
+		$sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id, p.ref as product_ref,";
 		$sql .= " pfp.rowid as product_fourn_pri_id, pfp.entity, pfp.ref_fourn, pfp.desc_fourn, pfp.fk_product as product_fourn_id, pfp.fk_supplier_price_expression,";
 		$sql .= " pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.fk_availability, pfp.charges, pfp.info_bits, pfp.delivery_time_days, pfp.supplier_reputation,";
 		$sql .= " pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code, pfp.datec, pfp.tms,";
 		$sql .= " pfp.barcode, pfp.fk_barcode_type";
 		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) $sql .= ", pfp.packaging";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp, ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp, ".MAIN_DB_PREFIX."product as p, ".MAIN_DB_PREFIX."societe as s";
 		$sql .= " WHERE pfp.entity IN (".getEntity('productsupplierprice').")";
-		$sql .= " AND pfp.fk_soc = s.rowid";
+		$sql .= " AND pfp.fk_soc = s.rowid AND pfp.fk_product = p.rowid";
 		$sql .= " AND s.status=1"; // only enabled company selected
 		$sql .= " AND pfp.fk_product = ".$prodid;
 		if (empty($sortfield)) $sql .= " ORDER BY s.nom, pfp.quantity, pfp.price";
@@ -638,11 +644,12 @@ class ProductFournisseur extends Product
 				//define base attribute
 				$prodfourn = new ProductFournisseur($this->db);
 
+				$prodfourn->product_ref = $record["product_ref"];
 				$prodfourn->product_fourn_price_id = $record["product_fourn_pri_id"];
 				$prodfourn->product_fourn_id = $record["product_fourn_id"];
 				$prodfourn->product_fourn_entity = $record["entity"];
-				$prodfourn->fourn_ref = $record["ref_fourn"];
 				$prodfourn->ref_supplier			= $record["ref_fourn"];
+				$prodfourn->fourn_ref = $record["ref_fourn"];
 				$prodfourn->desc_supplier = $record["desc_fourn"];
 				$prodfourn->fourn_price				= $record["price"];
 				$prodfourn->fourn_qty = $record["quantity"];
@@ -958,11 +965,13 @@ class ProductFournisseur extends Product
 	public function listProductFournisseurPriceLog($product_fourn_price_id, $sortfield = '', $sortorder = '', $limit = 0, $offset = 0)
 	{
 		$sql = "SELECT";
-		$sql .= " pfpl.rowid, pfp.ref_fourn as supplier_ref, pfpl.datec, u.lastname,";
-		$sql .= " pfpl.price, pfpl.quantity";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price_log as pfpl";
-		$sql .= ", ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
-		$sql .= ", ".MAIN_DB_PREFIX."user as u";
+		$sql .= " u.lastname,";
+		$sql .= " pfpl.rowid, pfp.ref_fourn as supplier_ref, pfpl.datec,";
+		$sql .= " pfpl.price, pfpl.quantity,";
+		$sql .= " pfpl.fk_multicurrency, pfpl.multicurrency_code, pfpl.multicurrency_tx, pfpl.multicurrency_price, pfpl.multicurrency_unitprice";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price_log as pfpl,";
+		$sql .= " ".MAIN_DB_PREFIX."product_fournisseur_price as pfp,";
+		$sql .= " ".MAIN_DB_PREFIX."user as u";
 		$sql .= " WHERE pfp.entity IN (".getEntity('productprice').")";
 		$sql .= " AND pfpl.fk_user = u.rowid";
 		$sql .= " AND pfp.rowid = pfpl.fk_product_fournisseur";
@@ -986,6 +995,11 @@ class ProductFournisseur extends Product
 				$tmparray['lastname'] = $obj->lastname;
 				$tmparray['price'] = $obj->price;
 				$tmparray['quantity'] = $obj->quantity;
+				$tmparray['fk_multicurrency'] = $obj->fk_multicurrency;
+				$tmparray['multicurrency_code'] = $obj->multicurrency_code;
+				$tmparray['multicurrency_tx'] = $obj->multicurrency_tx;
+				$tmparray['multicurrency_price'] = $obj->multicurrency_price;
+				$tmparray['multicurrency_unitprice'] = $obj->multicurrency_unitprice;
 
 				$retarray[] = $tmparray;
 			}
@@ -1007,19 +1021,23 @@ class ProductFournisseur extends Product
 	 */
 	public function displayPriceProductFournisseurLog($productFournLogList = array())
 	{
-		global $langs;
+		global $conf, $langs;
 
 		$out = '';
 		$langs->load("suppliers");
 		if (count($productFournLogList) > 0) {
-			$out .= '<table class="nobordernopadding" width="100%">';
+			$out .= '<table class="noborder centpercent">';
 			$out .= '<tr class="liste_titre"><td class="liste_titre">'.$langs->trans("Date").'</td>';
 			$out .= '<td class="liste_titre right">'.$langs->trans("Price").'</td>';
 			//$out .= '<td class="liste_titre right">'.$langs->trans("QtyMin").'</td>';
 			$out .= '<td class="liste_titre">'.$langs->trans("User").'</td></tr>';
 			foreach ($productFournLogList as $productFournLog) {
 				$out .= '<tr><td class="right">'.dol_print_date($productFournLog['datec'], 'dayhour', 'tzuser').'</td>';
-				$out .= '<td class="right">'.price($productFournLog['price']).'</td>';
+				$out .= '<td class="right">'.price($productFournLog['price'], 0, $langs, 1, -1, -1, $conf->currency);
+				if ($productFournLog['multicurrency_code'] != $conf->currency) {
+					$out .= ' ('.price($productFournLog['multicurrency_price'], 0, $langs, 1, -1, -1, $productFournLog['multicurrency_code']).')';
+				}
+				$out .= '</td>';
 				//$out.= '<td class="right">'.$productFournLog['quantity'].'</td>';
 				$out .= '<td>'.$productFournLog['lastname'].'</td></tr>';
 			}
@@ -1050,7 +1068,7 @@ class ProductFournisseur extends Product
 
 		$label = '<u>'.$langs->trans("SupplierRef").'</u>';
 		$label .= '<br>';
-		$label .= '<b>'.$langs->trans('Product').':</b> '.$this->ref;
+		$label .= '<b>'.$langs->trans('Product').':</b> '.$this->product_ref;
 		$label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_supplier;
 
 		$logPrices = $this->listProductFournisseurPriceLog($this->product_fourn_price_id, 'pfpl.datec', 'DESC'); // set sort order here
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 4853d04f120..edd7622d82b 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -980,8 +980,7 @@ END;
 						}
 
 						// Supplier ref
-						if ($usercancreate) // change required right here
-						{
+						if ($usercancreate) { // change required right here
 							print '<td class="left">'.$productfourn->getNomUrl().'</td>';
 						} else {
 							print '<td class="left">'.$productfourn->fourn_ref.'</td>';
@@ -1138,7 +1137,7 @@ END;
 
 						if ($usercancreate)
 						{
-							print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$productfourn->fourn_id.'&amp;action=update_price&amp;rowid='.$productfourn->product_fourn_price_id.'">'.img_edit()."</a>";
+							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$productfourn->fourn_id.'&amp;action=update_price&amp;rowid='.$productfourn->product_fourn_price_id.'">'.img_edit()."</a>";
 							print ' &nbsp; ';
 							print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$productfourn->fourn_id.'&amp;action=ask_remove_pf&amp;rowid='.$productfourn->product_fourn_price_id.'">'.img_picto($langs->trans("Remove"), 'delete').'</a>';
 						}

From 4ba31ae52eb627d68aa0e9449c290a37867444d3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Dec 2020 19:40:56 +0100
Subject: [PATCH 158/888] Debug missing column packaging

---
 htdocs/fourn/class/fournisseur.product.class.php   | 14 +++++++++-----
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql   |  2 ++
 .../mysql/tables/llx_product_fournisseur_price.sql |  1 +
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 64fbabedb2b..67343e549b2 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -522,10 +522,11 @@ class ProductFournisseur extends Product
 		$sql .= " pfp.fk_soc, pfp.ref_fourn, pfp.desc_fourn, pfp.fk_product, pfp.charges, pfp.fk_supplier_price_expression, pfp.delivery_time_days,";
 		$sql .= " pfp.supplier_reputation, pfp.fk_user, pfp.datec,";
 		$sql .= " pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code,";
-		$sql .= "  pfp.barcode, pfp.fk_barcode_type";
-		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) $sql .= ", pfp.packaging";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
+		$sql .= " pfp.barcode, pfp.fk_barcode_type, pfp.packaging,";
+		$sql .= " p.ref as product_ref";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp, ".MAIN_DB_PREFIX."product as p";
 		$sql .= " WHERE pfp.rowid = ".(int) $rowid;
+		$sql .= " AND pfp.fk_product = p.rowid";
 
 		dol_syslog(get_class($this)."::fetch_product_fournisseur_price", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -536,8 +537,11 @@ class ProductFournisseur extends Product
 			{
 				$this->product_fourn_price_id = $rowid;
 				$this->id = $obj->fk_product;
+
 				$this->fk_product				= $obj->fk_product;
-				$this->product_id				= $obj->fk_product; // deprecated
+				$this->product_id				= $obj->fk_product;
+				$this->product_ref				= $obj->product_ref;
+
 				$this->fourn_id					= $obj->fk_soc;
 				$this->fourn_ref				= $obj->ref_fourn; // deprecated
 				$this->ref_supplier             = $obj->ref_fourn;
@@ -596,7 +600,7 @@ class ProductFournisseur extends Product
 				return 0;
 			}
 		} else {
-			$this->error = $this->db->error();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index 2aebd3e5cea..2bfb4784206 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -546,3 +546,5 @@ CREATE TABLE llx_session(
 )ENGINE=innodb;
 
 INSERT INTO llx_boxes_def(file, entity) VALUES ('box_customers_outstanding_bill_reached.php', 1);
+
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN packaging varchar(64); 
diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
index 20d4db7492b..4e1d75dd1dd 100644
--- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
@@ -50,6 +50,7 @@ create table llx_product_fournisseur_price
   import_key			varchar(14),                -- Import key
   delivery_time_days    integer,
   supplier_reputation varchar(10),
+  packaging			    varchar(64),
   
   fk_multicurrency		integer,
   multicurrency_code	varchar(255),

From 3770eef8dc4e3b75b2ee89e73c483851c85c8874 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Dec 2020 19:51:14 +0100
Subject: [PATCH 159/888] Fix can import all categories

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

diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index 0ea473ed95b..138de679f51 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -374,7 +374,7 @@ class modCategorie extends DolibarrModules
             'ca.label'=>"Label*", 'ca.type'=>"Type*", 'ca.description'=>"Description",
             'ca.fk_parent' => 'Parent'
         );
-		$this->import_regex_array[$r] = array('ca.type'=>'^[0|1|2|3]');
+		$this->import_regex_array[$r] = array('ca.type'=>'^(0|1|2|3|4|5|6|7|8|9|10|11)$');
         $this->import_convertvalue_array[$r] = array(
             'ca.fk_parent' => array(
                 'rule'          => 'fetchidfromcodeandlabel',

From aa853f9259c7947332c79ce9db56bb6ffa590c00 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Dec 2020 20:02:04 +0100
Subject: [PATCH 160/888] Debug v13

---
 htdocs/imports/import.php | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index e9ee3d0bece..e8551a74a2f 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -424,7 +424,11 @@ if ($step == 2 && $datatoimport)
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="max_file_size" value="'.$conf->maxfilesize.'">';
 
-	print '<span class="opacitymedium">'.$langs->trans("ChooseFormatOfFileToImport", img_picto('', 'next', '')).'</span><br><br>';
+	print '<span class="opacitymedium">';
+	$s = $langs->trans("ChooseFormatOfFileToImport", '{s1}');
+	$s = str_replace('{s1}', img_picto('', 'next'), $s);
+	print $s;
+	print '</span><br><br>';
 
 	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 	print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
@@ -542,14 +546,18 @@ if ($step == 3 && $datatoimport)
 	print '<input type="hidden" name="max_file_size" value="'.$conf->maxfilesize.'">';
 
 	print '<input type="hidden" value="'.$step.'" name="step">';
-	print '<input type="hidden" value="'.$format.'" name="format">';
+	print '<input type="hidden" value="'.dol_escape_htmltag($format).'" name="format">';
 	print '<input type="hidden" value="'.$excludefirstline.'" name="excludefirstline">';
 	print '<input type="hidden" value="'.$endatlinenb.'" name="endatlinenb">';
 	print '<input type="hidden" value="'.dol_escape_htmltag($separator).'" name="separator">';
 	print '<input type="hidden" value="'.dol_escape_htmltag($enclosure).'" name="enclosure">';
-	print '<input type="hidden" value="'.$datatoimport.'" name="datatoimport">';
+	print '<input type="hidden" value="'.dol_escape_htmltag($datatoimport).'" name="datatoimport">';
 
-	print '<span class="opacitymedium">'.$langs->trans("ChooseFileToImport", img_picto('', 'next')).'</span><br><br>';
+	print '<span class="opacitymedium">';
+	$s = $langs->trans("ChooseFileToImport", '{s1}');
+	$s = str_replace('{s1}', img_picto('', 'next'), $s);
+	print $s;
+	print '</span><br><br>';
 
 	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 	print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
@@ -857,7 +865,11 @@ if ($step == 4 && $datatoimport)
 	print '<input type="hidden" name="enclosure" value="'.dol_escape_htmltag($enclosure).'">';
 
 	print '<div class="marginbottomonly">';
-	print '<span class="opacitymedium">'.$langs->trans("SelectImportFields", img_picto('', 'grip_title', '', false, 0, 0, '', '', 0)).'</span> ';
+	print '<span class="opacitymedium">';
+	$s = $langs->trans("SelectImportFields", '{s1}');
+	$s = str_replace('{s1}', img_picto('', 'grip_title', '', false, 0, 0, '', '', 0), $s);
+	print $s;
+	print '</span> ';
 	$htmlother->select_import_model($importmodelid, 'importmodelid', $datatoimport, 1);
 	print '<input type="submit" class="button" value="'.$langs->trans("Select").'">';
 	print '</div>';

From 2b267cf8e4c78d59a9916bdcd0728119cf8e0587 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Dec 2020 20:06:55 +0100
Subject: [PATCH 161/888] Fix warnings

---
 .../core/modules/societe/modules_societe.class.php   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
index 7658c9f3150..03463f364bd 100644
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -28,8 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
 
 
 /**
- *	\class      ModeleThirdPartyDoc
- *	\brief      Parent class for third parties models of doc generators
+ *	Parent class for third parties models of doc generators
  */
 abstract class ModeleThirdPartyDoc extends CommonDocGenerator
 {
@@ -62,8 +61,7 @@ abstract class ModeleThirdPartyDoc extends CommonDocGenerator
 }
 
 /**
- *	    \class      ModeleThirdPartyCode
- *		\brief  	Parent class for third parties code generators
+ *		Parent class for third parties code generators
  */
 abstract class ModeleThirdPartyCode
 {
@@ -72,6 +70,12 @@ abstract class ModeleThirdPartyCode
 	 */
 	public $error = '';
 
+	/**
+	 * @var array Error code (or message) array
+	 */
+	public $errors;
+
+
 	/**     Renvoi la description par defaut du modele de numerotation
 	 *
 	 *		@param	Translate	$langs		Object langs

From c8407b2f91202ec559efc5c5ac0153e827d366b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 4 Dec 2020 20:28:05 +0100
Subject: [PATCH 162/888] keep common if wanted

---
 htdocs/admin/modules.php      | 633 ++++++++++++++--------------
 htdocs/core/lib/admin.lib.php | 757 ++++++++++++++++++----------------
 2 files changed, 738 insertions(+), 652 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index d7e0962239b..7d6a3ff0454 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -28,7 +28,9 @@
  *  \brief      Page to activate/disable all modules
  */
 
-if (!defined('CSRFCHECK_WITH_TOKEN')) define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
+if (!defined('CSRFCHECK_WITH_TOKEN')) {
+	define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
+}
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
@@ -41,7 +43,9 @@ require_once DOL_DOCUMENT_ROOT.'/admin/dolistore/class/dolistore.class.php';
 $langs->loadLangs(array("errors", "admin", "modulebuilder"));
 
 $mode = GETPOSTISSET('mode') ? GETPOST('mode', 'alpha') : (empty($conf->global->MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT) ? 'commonkanban' : 'common');
-if (empty($mode)) $mode = 'common';
+if (empty($mode)) {
+	$mode = 'common';
+}
 $action = GETPOST('action', 'aZ09');
 //var_dump($_POST);exit;
 $value = GETPOST('value', 'alpha');
@@ -62,8 +66,9 @@ $options['search']    = GETPOST('search_keyword', 'alpha');
 $dolistore            = new Dolistore(false);
 
 
-if (!$user->admin)
+if (!$user->admin) {
 	accessforbidden();
+}
 
 $familyinfo = array(
 	'hr'=>array('position'=>'001', 'label'=>$langs->trans("ModuleFamilyHr")),
@@ -81,12 +86,19 @@ $familyinfo = array(
 );
 
 $param = '';
-if (!GETPOST('buttonreset', 'alpha'))
-{
-	if ($search_keyword) $param .= '&search_keyword='.urlencode($search_keyword);
-	if ($search_status && $search_status != '-1')  $param .= '&search_status='.urlencode($search_status);
-	if ($search_nature && $search_nature != '-1')  $param .= '&search_nature='.urlencode($search_nature);
-	if ($search_version && $search_version != '-1') $param .= '&search_version='.urlencode($search_version);
+if (!GETPOST('buttonreset', 'alpha')) {
+	if ($search_keyword) {
+		$param .= '&search_keyword='.urlencode($search_keyword);
+	}
+	if ($search_status && $search_status != '-1') {
+		$param .= '&search_status='.urlencode($search_status);
+	}
+	if ($search_nature && $search_nature != '-1') {
+		$param .= '&search_nature='.urlencode($search_nature);
+	}
+	if ($search_version && $search_version != '-1') {
+		$param .= '&search_version='.urlencode($search_version);
+	}
 }
 
 $dirins = DOL_DOCUMENT_ROOT.'/custom';
@@ -104,18 +116,18 @@ $formconfirm = '';
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (GETPOST('buttonreset', 'alpha'))
-{
+if (GETPOST('buttonreset', 'alpha')) {
 	$search_keyword = '';
 	$search_status = '';
 	$search_nature = '';
 	$search_version = '';
 }
 
-if ($action == 'install')
-{
+if ($action == 'install') {
 	$error = 0;
 
 	// $original_file should match format module_modulename-x.y[.z].zip
@@ -123,54 +135,45 @@ if ($action == 'install')
 	$original_file = preg_replace('/\(\d+\)\.zip$/i', '.zip', $original_file);
 	$newfile = $conf->admin->dir_temp.'/'.$original_file.'/'.$original_file;
 
-	if (!$original_file)
-	{
+	if (!$original_file) {
 		$langs->load("Error");
 		setEventMessages($langs->trans("ErrorModuleFileRequired"), null, 'warnings');
 		$error++;
 	} else {
-		if (!$error && !preg_match('/\.zip$/i', $original_file))
-		{
+		if (!$error && !preg_match('/\.zip$/i', $original_file)) {
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorFileMustBeADolibarrPackage", $original_file), null, 'errors');
 			$error++;
 		}
-		if (!$error && !preg_match('/^(module[a-zA-Z0-9]*|theme)_.*\-([0-9][0-9\.]*)\.zip$/i', $original_file))
-		{
+		if (!$error && !preg_match('/^(module[a-zA-Z0-9]*|theme)_.*\-([0-9][0-9\.]*)\.zip$/i', $original_file)) {
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorFilenameDosNotMatchDolibarrPackageRules", $original_file, 'module_*-x.y*.zip'), null, 'errors');
 			$error++;
 		}
-		if (empty($_FILES['fileinstall']['tmp_name']))
-		{
+		if (empty($_FILES['fileinstall']['tmp_name'])) {
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
 			$error++;
 		}
 	}
 
-	if (!$error)
-	{
-		if ($original_file)
-		{
+	if (!$error) {
+		if ($original_file) {
 			@dol_delete_dir_recursive($conf->admin->dir_temp.'/'.$original_file);
 			dol_mkdir($conf->admin->dir_temp.'/'.$original_file);
 		}
 
 		$tmpdir = preg_replace('/\.zip$/i', '', $original_file).'.dir';
-		if ($tmpdir)
-		{
+		if ($tmpdir) {
 			@dol_delete_dir_recursive($conf->admin->dir_temp.'/'.$tmpdir);
 			dol_mkdir($conf->admin->dir_temp.'/'.$tmpdir);
 		}
 
 		$result = dol_move_uploaded_file($_FILES['fileinstall']['tmp_name'], $newfile, 1, 0, $_FILES['fileinstall']['error']);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			$result = dol_uncompress($newfile, $conf->admin->dir_temp.'/'.$tmpdir);
 
-			if (!empty($result['error']))
-			{
+			if (!empty($result['error'])) {
 				$langs->load("errors");
 				setEventMessages($langs->trans($result['error'], $original_file), null, 'errors');
 				$error++;
@@ -181,19 +184,16 @@ if ($action == 'install')
 				// Search dir $modulename
 				$modulenamedir = $conf->admin->dir_temp.'/'.$tmpdir.'/'.$modulename; // Example ./mymodule
 
-				if (!dol_is_dir($modulenamedir))
-				{
+				if (!dol_is_dir($modulenamedir)) {
 					$modulenamedir = $conf->admin->dir_temp.'/'.$tmpdir.'/htdocs/'.$modulename; // Example ./htdocs/mymodule
 					//var_dump($modulenamedir);
-					if (!dol_is_dir($modulenamedir))
-					{
+					if (!dol_is_dir($modulenamedir)) {
 						setEventMessages($langs->trans("ErrorModuleFileSeemsToHaveAWrongFormat").'<br>'.$langs->trans("ErrorModuleFileSeemsToHaveAWrongFormat2", $modulename, 'htdocs/'.$modulename), null, 'errors');
 						$error++;
 					}
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					// TODO Make more test
 				}
 
@@ -209,18 +209,22 @@ if ($action == 'install')
 				//var_dump($modulenamearrays);exit;
 
 				foreach ($modulenamearrays as $modulenameval) {
-					if (strpos($modulenameval, '#') === 0) continue; // Discard comments
-					if (strpos($modulenameval, '//') === 0) continue; // Discard comments
-					if (!trim($modulenameval)) continue;
+					if (strpos($modulenameval, '#') === 0) {
+						continue; // Discard comments
+					}
+					if (strpos($modulenameval, '//') === 0) {
+						continue; // Discard comments
+					}
+					if (!trim($modulenameval)) {
+						continue;
+					}
 
 					// Now we install the module
-					if (!$error)
-					{
+					if (!$error) {
 						@dol_delete_dir_recursive($dirins.'/'.$modulenameval); // delete the zip file
 						dol_syslog("We copy now directory ".$conf->admin->dir_temp.'/'.$tmpdir.'/htdocs/'.$modulenameval." into target dir ".$dirins.'/'.$modulenameval);
 						$result = dolCopyDir($modulenamedir, $dirins.'/'.$modulenameval, '0444', 1);
-						if ($result <= 0)
-						{
+						if ($result <= 0) {
 							dol_syslog('Failed to call dolCopyDir result='.$result." with param ".$modulenamedir." and ".$dirins.'/'.$modulenameval, LOG_WARNING);
 							$langs->load("errors");
 							setEventMessages($langs->trans("ErrorFailToCopyDir", $modulenamedir, $dirins.'/'.$modulenameval), null, 'errors');
@@ -235,40 +239,39 @@ if ($action == 'install')
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		setEventMessages($langs->trans("SetupIsReadyForUse", DOL_URL_ROOT.'/admin/modules.php?mainmenu=home', $langs->transnoentitiesnoconv("Home").' - '.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Modules")), null, 'warnings');
 	}
 }
 
-if ($action == 'set' && $user->admin)
-{
+if ($action == 'set' && $user->admin) {
 	$resarray = activateModule($value);
-	if (!empty($resarray['errors'])) setEventMessages('', $resarray['errors'], 'errors');
-	else {
+	if (!empty($resarray['errors'])) {
+		setEventMessages('', $resarray['errors'], 'errors');
+	} else {
 		//var_dump($resarray);exit;
-		if ($resarray['nbperms'] > 0)
-		{
+		if ($resarray['nbperms'] > 0) {
 			$tmpsql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."user WHERE admin <> 1";
 			$resqltmp = $db->query($tmpsql);
-			if ($resqltmp)
-			{
+			if ($resqltmp) {
 				$obj = $db->fetch_object($resqltmp);
 				//var_dump($obj->nb);exit;
-				if ($obj && $obj->nb > 1)
-				{
+				if ($obj && $obj->nb > 1) {
 					$msg = $langs->trans('ModuleEnabledAdminMustCheckRights');
 					setEventMessages($msg, null, 'warnings');
 				}
-			} else dol_print_error($db);
+			} else {
+				dol_print_error($db);
+			}
 		}
 	}
 	header("Location: ".$_SERVER["PHP_SELF"]."?mode=".$mode.$param.($page_y ? '&page_y='.$page_y : ''));
 	exit;
-} elseif ($action == 'reset' && $user->admin && GETPOST('confirm') == 'yes')
-{
+} elseif ($action == 'reset' && $user->admin && GETPOST('confirm') == 'yes') {
 	$result = unActivateModule($value);
-	if ($result) setEventMessages($result, null, 'errors');
+	if ($result) {
+		setEventMessages($result, null, 'errors');
+	}
 	header("Location: ".$_SERVER["PHP_SELF"]."?mode=".$mode.$param.($page_y ? '&page_y='.$page_y : ''));
 	exit;
 }
@@ -285,8 +288,7 @@ $morejs = array();
 $morecss = array("/admin/dolistore/css/dolistore.css");
 
 // Set dir where external modules are installed
-if (!dol_is_dir($dirins))
-{
+if (!dol_is_dir($dirins)) {
 	dol_mkdir($dirins);
 }
 $dirins_ok = (dol_is_dir($dirins));
@@ -310,25 +312,19 @@ $i = 0; // is a sequencer of modules found
 $j = 0; // j is module number. Automatically affected if module number not defined.
 $modNameLoaded = array();
 
-foreach ($modulesdir as $dir)
-{
+foreach ($modulesdir as $dir) {
 	// Load modules attributes in arrays (name, numero, orders) from dir directory
 	//print $dir."\n<br>";
 	dol_syslog("Scan directory ".$dir." for module descriptor files (modXXX.class.php)");
 	$handle = @opendir($dir);
-	if (is_resource($handle))
-	{
-		while (($file = readdir($handle)) !== false)
-		{
+	if (is_resource($handle)) {
+		while (($file = readdir($handle)) !== false) {
 			//print "$i ".$file."\n<br>";
-			if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php')
-			{
+			if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php') {
 				$modName = substr($file, 0, dol_strlen($file) - 10);
 
-				if ($modName)
-				{
-					if (!empty($modNameLoaded[$modName]))   // In cache of already loaded modules ?
-					{
+				if ($modName) {
+					if (!empty($modNameLoaded[$modName])) {   // In cache of already loaded modules ?
 						$mesg = "Error: Module ".$modName." was found twice: Into ".$modNameLoaded[$modName]." and ".$dir.". You probably have an old file on your disk.<br>";
 						setEventMessages($mesg, null, 'warnings');
 						dol_syslog($mesg, LOG_ERR);
@@ -337,14 +333,12 @@ foreach ($modulesdir as $dir)
 
 					try {
 						$res = include_once $dir.$file; // A class already exists in a different file will send a non catchable fatal error.
-						if (class_exists($modName))
-						{
+						if (class_exists($modName)) {
 							try {
 								$objMod = new $modName($db);
 								$modNameLoaded[$modName] = $dir;
-								if (!$objMod->numero > 0 && $modName != 'modUser')
-								{
-					 				dol_syslog('The module descriptor '.$modName.' must have a numero property', LOG_ERR);
+								if (!$objMod->numero > 0 && $modName != 'modUser') {
+									dol_syslog('The module descriptor '.$modName.' must have a numero property', LOG_ERR);
 								}
 								$j = $objMod->numero;
 
@@ -352,21 +346,26 @@ foreach ($modulesdir as $dir)
 
 								// We discard modules according to features level (PS: if module is activated we always show it)
 								$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
-								if ($objMod->version == 'development' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 2))) $modulequalified = 0;
-								if ($objMod->version == 'experimental' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 1))) $modulequalified = 0;
-								if (preg_match('/deprecated/', $objMod->version) && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL >= 0))) $modulequalified = 0;
+								if ($objMod->version == 'development' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 2))) {
+									$modulequalified = 0;
+								}
+								if ($objMod->version == 'experimental' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 1))) {
+									$modulequalified = 0;
+								}
+								if (preg_match('/deprecated/', $objMod->version) && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL >= 0))) {
+									$modulequalified = 0;
+								}
 
 								// We discard modules according to property ->hidden
-								if (!empty($objMod->hidden)) $modulequalified = 0;
+								if (!empty($objMod->hidden)) {
+									$modulequalified = 0;
+								}
 
-								if ($modulequalified > 0)
-								{
+								if ($modulequalified > 0) {
 									$publisher = dol_escape_htmltag($objMod->getPublisher());
 									$external = ($objMod->isCoreOrExternalModule() == 'external');
-									if ($external)
-									{
-										if ($publisher)
-										{
+									if ($external) {
+										if ($publisher) {
 											$arrayofnatures['external_'.$publisher] = $langs->trans("External").' - '.$publisher;
 										} else {
 											$arrayofnatures['external_'] = $langs->trans("External").' - '.$langs->trans("UnknownPublishers");
@@ -387,25 +386,21 @@ foreach ($modulesdir as $dir)
 									}
 
 									$moduleposition = ($objMod->module_position ? $objMod->module_position : '50');
-									if ($moduleposition == '50' && ($objMod->isCoreOrExternalModule() == 'external'))
-									{
+									if ($moduleposition == '50' && ($objMod->isCoreOrExternalModule() == 'external')) {
 										$moduleposition = '80'; // External modules at end by default
 									}
 
 									// Add list of warnings to show into arrayofwarnings and arrayofwarningsext
-									if (!empty($objMod->warnings_activation))
-									{
+									if (!empty($objMod->warnings_activation)) {
 										$arrayofwarnings[$modName] = $objMod->warnings_activation;
 									}
-									if (!empty($objMod->warnings_activation_ext))
-									{
+									if (!empty($objMod->warnings_activation_ext)) {
 										$arrayofwarningsext[$modName] = $objMod->warnings_activation_ext;
 									}
 
 									$familyposition = (empty($familyinfo[$familykey]['position']) ? 0 : $familyinfo[$familykey]['position']);
 									$listOfOfficialModuleGroups = array('hr', 'technic', 'interface', 'technic', 'portal', 'financial', 'crm', 'base', 'products', 'srm', 'ecm', 'projects', 'other');
-									if ($external && !in_array($familykey, $listOfOfficialModuleGroups))
-									{
+									if ($external && !in_array($familykey, $listOfOfficialModuleGroups)) {
 										// If module is extern and into a custom group (not into an official predefined one), it must appear at end (custom groups should not be before official groups).
 										if (is_numeric($familyposition)) {
 											$familyposition = sprintf("%03d", (int) $familyposition + 100);
@@ -416,21 +411,26 @@ foreach ($modulesdir as $dir)
 
 									// Set categ[$i]
 									$specialstring = 'unknown';
-									if ($objMod->version == 'development' || $objMod->version == 'experimental') $specialstring = 'expdev';
-									if (isset($categ[$specialstring])) $categ[$specialstring]++; // Array of all different modules categories
-									else $categ[$specialstring] = 1;
+									if ($objMod->version == 'development' || $objMod->version == 'experimental') {
+										$specialstring = 'expdev';
+									}
+									if (isset($categ[$specialstring])) {
+										$categ[$specialstring]++; // Array of all different modules categories
+									} else {
+										$categ[$specialstring] = 1;
+									}
 									$j++;
 									$i++;
-								} else dol_syslog("Module ".get_class($objMod)." not qualified");
-							} catch (Exception $e)
-							{
+								} else {
+									dol_syslog("Module ".get_class($objMod)." not qualified");
+								}
+							} catch (Exception $e) {
 								 dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
 							}
 						} else {
 							print "Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)<br>";
 						}
-					} catch (Exception $e)
-					{
+					} catch (Exception $e) {
 						 dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
 					}
 				}
@@ -442,12 +442,13 @@ foreach ($modulesdir as $dir)
 	}
 }
 
-if ($action == 'reset_confirm' && $user->admin)
-{
+if ($action == 'reset_confirm' && $user->admin) {
 	if (!empty($modules[$value])) {
 		$objMod = $modules[$value];
 
-		if (!empty($objMod->langfiles)) $langs->loadLangs($objMod->langfiles);
+		if (!empty($objMod->langfiles)) {
+			$langs->loadLangs($objMod->langfiles);
+		}
 
 		$form = new Form($db);
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?value='.$value.'&mode='.$mode.$param, $langs->trans('ConfirmUnactivation'), $langs->trans(GETPOST('confirm_message_code')), 'reset', '', 'no', 1);
@@ -464,16 +465,27 @@ asort($orders);
 $nbofactivatedmodules = count($conf->modules);
 $moreinfo = $langs->trans("TitleNumberOfActivatedModules");
 $moreinfo2 = ($nbofactivatedmodules - 1)." / ".count($modules);
-if ($nbofactivatedmodules <= 1) $moreinfo2 .= ' '.img_warning($langs->trans("YouMustEnableOneModule"));
+if ($nbofactivatedmodules <= 1) {
+	$moreinfo2 .= ' '.img_warning($langs->trans("YouMustEnableOneModule"));
+}
 
 print load_fiche_titre($langs->trans("ModulesSetup"), '', 'title_setup');
 
 // Start to show page
-if ($mode == 'common')       print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDesc", img_picto('', 'switch_off'))."<br></span>\n";
-if ($mode == 'commonkanban') print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDesc", img_picto('', 'switch_off'))."<br></span>\n";
-if ($mode == 'marketplace')  print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesMarketPlaceDesc")."<br></span>\n";
-if ($mode == 'deploy')       print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules"))."<br></span>\n";
-if ($mode == 'develop')      print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDevelopDesc")."<br></span>\n";
+if ($mode == 'common' || $mode == 'commonkanban') {
+	$desc = $langs->trans("ModulesDesc", '{picto}');
+	$desc = str_replace('{picto}', img_picto('', 'switch_off'), $desc);
+	print '<span class="opacitymedium hideonsmartphone">'.$desc."<br></span>\n";
+}
+if ($mode == 'marketplace') {
+	print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesMarketPlaceDesc")."<br></span>\n";
+}
+if ($mode == 'deploy') {
+	print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules"))."<br></span>\n";
+}
+if ($mode == 'develop') {
+	print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDevelopDesc")."<br></span>\n";
+}
 
 $head = modules_prepare_head();
 
@@ -481,22 +493,20 @@ $head = modules_prepare_head();
 print "<br>\n";
 
 
-if ($mode == 'common' || $mode == 'commonkanban')
-{
+if ($mode == 'common' || $mode == 'commonkanban') {
 	dol_set_focus('#search_keyword');
 
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') {
+		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	}
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="mode" value="'.$mode.'">';
 
-	$newmode = $mode;
-	if ($newmode == 'common') $newmode = 'commonkanban';
-
-	print dol_get_fiche_head($head, $newmode, '', -1);
+	print dol_get_fiche_head($head, 'modules', '', -1);
 
 	$moreforfilter = '<div class="valignmiddle">';
 
@@ -514,12 +524,17 @@ if ($mode == 'common' || $mode == 'commonkanban')
 	$moreforfilter .= '<div class="divsearchfield paddingtop">';
 	$moreforfilter .= $langs->trans('Origin').': '.$form->selectarray('search_nature', $arrayofnatures, dol_escape_htmltag($search_nature), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth200', 1);
 	$moreforfilter .= '</div>';
-	if (!empty($conf->global->MAIN_FEATURES_LEVEL))
-	{
+	if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
 		$array_version = array('stable'=>$langs->transnoentitiesnoconv("Stable"));
-		if ($conf->global->MAIN_FEATURES_LEVEL < 0) $array_version['deprecated'] = $langs->trans("Deprecated");
-		if ($conf->global->MAIN_FEATURES_LEVEL > 0) $array_version['experimental'] = $langs->trans("Experimental");
-		if ($conf->global->MAIN_FEATURES_LEVEL > 1) $array_version['development'] = $langs->trans("Development");
+		if ($conf->global->MAIN_FEATURES_LEVEL < 0) {
+			$array_version['deprecated'] = $langs->trans("Deprecated");
+		}
+		if ($conf->global->MAIN_FEATURES_LEVEL > 0) {
+			$array_version['experimental'] = $langs->trans("Experimental");
+		}
+		if ($conf->global->MAIN_FEATURES_LEVEL > 1) {
+			$array_version['development'] = $langs->trans("Development");
+		}
 		$moreforfilter .= '<div class="divsearchfield paddingtop">';
 		$moreforfilter .= $langs->trans('Version').': '.$form->selectarray('search_version', $array_version, $search_version, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1);
 		$moreforfilter .= '</div>';
@@ -537,8 +552,7 @@ if ($mode == 'common' || $mode == 'commonkanban')
 
 	$moreforfilter .= '</div>';
 
-	if (!empty($moreforfilter))
-	{
+	if (!empty($moreforfilter)) {
 		print $moreforfilter;
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
@@ -552,14 +566,15 @@ if ($mode == 'common' || $mode == 'commonkanban')
 	$object = new stdClass();
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('insertExtraHeader', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	if ($reshook < 0) {
+		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	}
 
 	// Show list of modules
 	$oldfamily = '';
 	$linenum = 0;
 
-	foreach ($orders as $key => $value)
-	{
+	foreach ($orders as $key => $value) {
 		$linenum++;
 		$tab = explode('_', $value);
 		$familykey = $tab[1];
@@ -569,12 +584,13 @@ if ($mode == 'common' || $mode == 'commonkanban')
 		$objMod = $modules[$modName];
 
 		//print $objMod->name." - ".$key." - ".$objMod->version."<br>";
-		if ($mode == 'expdev' && $objMod->version != 'development' && $objMod->version != 'experimental') continue; // Discard if not for current tab
+		if ($mode == 'expdev' && $objMod->version != 'development' && $objMod->version != 'experimental') {
+			continue; // Discard if not for current tab
+		}
 
-		if (!$objMod->getName())
-		{
+		if (!$objMod->getName()) {
 			dol_syslog("Error for module ".$key." - Property name of module looks empty", LOG_WARNING);
-	  		continue;
+			continue;
 		}
 
 		$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
@@ -587,48 +603,65 @@ if ($mode == 'common' || $mode == 'commonkanban')
 		$moduleauthor = $objMod->getPublisher();
 
 		// We discard showing according to filters
-		if ($search_keyword)
-		{
+		if ($search_keyword) {
 			$qualified = 0;
 			if (preg_match('/'.preg_quote($search_keyword).'/i', $modulename)
 				|| preg_match('/'.preg_quote($search_keyword).'/i', $moduletechnicalname)
 				|| preg_match('/'.preg_quote($search_keyword).'/i', $moduledesc)
 				|| preg_match('/'.preg_quote($search_keyword).'/i', $moduledesclong)
 				|| preg_match('/'.preg_quote($search_keyword).'/i', $moduleauthor)
-				) $qualified = 1;
-			if (!$qualified) continue;
+				) {
+				$qualified = 1;
+			}
+			if (!$qualified) {
+				continue;
+			}
 		}
-		if ($search_status)
-		{
-			if ($search_status == 'active' && empty($conf->global->$const_name)) continue;
-			if ($search_status == 'disabled' && !empty($conf->global->$const_name)) continue;
+		if ($search_status) {
+			if ($search_status == 'active' && empty($conf->global->$const_name)) {
+				continue;
+			}
+			if ($search_status == 'disabled' && !empty($conf->global->$const_name)) {
+				continue;
+			}
 		}
-		if ($search_nature)
-		{
-			if (preg_match('/^external/', $search_nature) && $objMod->isCoreOrExternalModule() != 'external') continue;
+		if ($search_nature) {
+			if (preg_match('/^external/', $search_nature) && $objMod->isCoreOrExternalModule() != 'external') {
+				continue;
+			}
 			$reg = array();
-			if (preg_match('/^external_(.*)$/', $search_nature, $reg))
-			{
+			if (preg_match('/^external_(.*)$/', $search_nature, $reg)) {
 				//print $reg[1].'-'.dol_escape_htmltag($objMod->getPublisher());
 				$publisher = dol_escape_htmltag($objMod->getPublisher());
-				if ($reg[1] && dol_escape_htmltag($reg[1]) != $publisher) continue;
-				if (!$reg[1] && !empty($publisher)) continue;
+				if ($reg[1] && dol_escape_htmltag($reg[1]) != $publisher) {
+					continue;
+				}
+				if (!$reg[1] && !empty($publisher)) {
+					continue;
+				}
+			}
+			if ($search_nature == 'core' && $objMod->isCoreOrExternalModule() == 'external') {
+				continue;
 			}
-			if ($search_nature == 'core' && $objMod->isCoreOrExternalModule() == 'external') continue;
 		}
-		if ($search_version)
-		{
-			if (($objMod->version == 'development' || $objMod->version == 'experimental' || preg_match('/deprecated/', $objMod->version)) && $search_version == 'stable') continue;
-			if ($objMod->version != 'development' && ($search_version == 'development')) continue;
-			if ($objMod->version != 'experimental' && ($search_version == 'experimental')) continue;
-			if (!preg_match('/deprecated/', $objMod->version) && ($search_version == 'deprecated')) continue;
+		if ($search_version) {
+			if (($objMod->version == 'development' || $objMod->version == 'experimental' || preg_match('/deprecated/', $objMod->version)) && $search_version == 'stable') {
+				continue;
+			}
+			if ($objMod->version != 'development' && ($search_version == 'development')) {
+				continue;
+			}
+			if ($objMod->version != 'experimental' && ($search_version == 'experimental')) {
+				continue;
+			}
+			if (!preg_match('/deprecated/', $objMod->version) && ($search_version == 'deprecated')) {
+				continue;
+			}
 		}
 
 		// Load all lang files of module
-		if (isset($objMod->langfiles) && is_array($objMod->langfiles))
-		{
-			foreach ($objMod->langfiles as $domain)
-			{
+		if (isset($objMod->langfiles) && is_array($objMod->langfiles)) {
+			foreach ($objMod->langfiles as $domain) {
 				$langs->load($domain);
 			}
 		}
@@ -655,8 +688,7 @@ if ($mode == 'common' || $mode == 'commonkanban')
 
 		$atleastoneforfamily++;
 
-		if ($familykey != $oldfamily)
-		{
+		if ($familykey != $oldfamily) {
 			$familytext = empty($familyinfo[$familykey]['label']) ? $familykey : $familyinfo[$familykey]['label'];
 			$oldfamily = $familykey;
 		}
@@ -664,17 +696,22 @@ if ($mode == 'common' || $mode == 'commonkanban')
 		// Version (with picto warning or not)
 		$version = $objMod->getVersion(0);
 		$versiontrans = '';
-		if (preg_match('/development/i', $version))  $versiontrans .= img_warning($langs->trans("Development"), '', 'floatleft paddingright');
-		if (preg_match('/experimental/i', $version)) $versiontrans .= img_warning($langs->trans("Experimental"), '', 'floatleft paddingright');
-		if (preg_match('/deprecated/i', $version))   $versiontrans .= img_warning($langs->trans("Deprecated"), '', 'floatleft paddingright');
+		if (preg_match('/development/i', $version)) {
+			$versiontrans .= img_warning($langs->trans("Development"), '', 'floatleft paddingright');
+		}
+		if (preg_match('/experimental/i', $version)) {
+			$versiontrans .= img_warning($langs->trans("Experimental"), '', 'floatleft paddingright');
+		}
+		if (preg_match('/deprecated/i', $version)) {
+			$versiontrans .= img_warning($langs->trans("Deprecated"), '', 'floatleft paddingright');
+		}
 		if ($objMod->isCoreOrExternalModule() == 'external' || preg_match('/development|experimental|deprecated/i', $version)) {
 			$versiontrans .= $objMod->getVersion(1);
 		}
 
 		// Define imginfo
 		$imginfo = "info";
-		if ($objMod->isCoreOrExternalModule() == 'external')
-		{
+		if ($objMod->isCoreOrExternalModule() == 'external') {
 			$imginfo = "info_black";
 		}
 
@@ -682,25 +719,24 @@ if ($mode == 'common' || $mode == 'commonkanban')
 		$codetoconfig = '';
 
 		// Activate/Disable and Setup (2 columns)
-		if (!empty($conf->global->$const_name))	// If module is already activated
-		{
-			// Set $codeenabledisable
+		if (!empty($conf->global->$const_name)) {	// If module is already activated
+		// Set $codeenabledisable
 			$disableSetup = 0;
-			if (!empty($arrayofwarnings[$modName]))
-			{
+			if (!empty($arrayofwarnings[$modName])) {
 				$codeenabledisable .= '<!-- This module has a warning to show when we activate it (note: your country is '.$mysoc->country_code.') -->'."\n";
 			}
-			if (!empty($objMod->disabled))
-			{
+			if (!empty($objMod->disabled)) {
 				$codeenabledisable .= $langs->trans("Disabled");
-			} elseif (!empty($objMod->always_enabled) || ((!empty($conf->multicompany->enabled) && $objMod->core_enabled) && ($user->entity || $conf->entity != 1)))
-			{
-				if (method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) $codeenabledisable .= $langs->trans("Used");
-				else {
+			} elseif (!empty($objMod->always_enabled) || ((!empty($conf->multicompany->enabled) && $objMod->core_enabled) && ($user->entity || $conf->entity != 1))) {
+				if (method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) {
+					$codeenabledisable .= $langs->trans("Used");
+				} else {
 					$codeenabledisable .= img_picto($langs->trans("Required"), 'switch_on', '', false, 0, 0, '', 'opacitymedium valignmiddle');
 					//print $langs->trans("Required");
 				}
-				if (!empty($conf->multicompany->enabled) && $user->entity) $disableSetup++;
+				if (!empty($conf->multicompany->enabled) && $user->entity) {
+					$disableSetup++;
+				}
 			} else {
 				if (!empty($objMod->warnings_unactivation[$mysoc->country_code]) && method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) {
 					$codeenabledisable .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;token='.newToken().'&amp;module_position='.$module_position.'&amp;action=reset_confirm&amp;confirm_message_code='.$objMod->warnings_unactivation[$mysoc->country_code].'&amp;value='.$modName.'&amp;mode='.$mode.$param.'">';
@@ -714,29 +750,32 @@ if ($mode == 'common' || $mode == 'commonkanban')
 			}
 
 			// Set $codetoconfig
-			if (!empty($objMod->config_page_url) && !$disableSetup)
-			{
+			if (!empty($objMod->config_page_url) && !$disableSetup) {
 				$backtourlparam = '';
-				if ($search_keyword != '') $backtourlparam .= ($backtourlparam ? '&' : '?').'search_keyword='.$search_keyword; // No urlencode here, done later
-				if ($search_nature > -1)   $backtourlparam .= ($backtourlparam ? '&' : '?').'search_nature='.$search_nature;
-				if ($search_version > -1)  $backtourlparam .= ($backtourlparam ? '&' : '?').'search_version='.$search_version;
-				if ($search_status > -1)   $backtourlparam .= ($backtourlparam ? '&' : '?').'search_status='.$search_status;
+				if ($search_keyword != '') {
+					$backtourlparam .= ($backtourlparam ? '&' : '?').'search_keyword='.$search_keyword; // No urlencode here, done later
+				}
+				if ($search_nature > -1) {
+					$backtourlparam .= ($backtourlparam ? '&' : '?').'search_nature='.$search_nature;
+				}
+				if ($search_version > -1) {
+					$backtourlparam .= ($backtourlparam ? '&' : '?').'search_version='.$search_version;
+				}
+				if ($search_status > -1) {
+					$backtourlparam .= ($backtourlparam ? '&' : '?').'search_status='.$search_status;
+				}
 				$backtourl = $_SERVER["PHP_SELF"].$backtourlparam;
 
 				$regs = array();
-				if (is_array($objMod->config_page_url))
-				{
+				if (is_array($objMod->config_page_url)) {
 					$i = 0;
-					foreach ($objMod->config_page_url as $page)
-					{
+					foreach ($objMod->config_page_url as $page) {
 						$urlpage = $page;
-						if ($i++)
-						{
+						if ($i++) {
 							$codetoconfig .= '<a href="'.$urlpage.'" title="'.$langs->trans($page).'">'.img_picto(ucfirst($page), "setup").'</a>';
 							//    print '<a href="'.$page.'">'.ucfirst($page).'</a>&nbsp;';
 						} else {
-							if (preg_match('/^([^@]+)@([^@]+)$/i', $urlpage, $regs))
-							{
+							if (preg_match('/^([^@]+)@([^@]+)$/i', $urlpage, $regs)) {
 								$urltouse = dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1);
 								$codetoconfig .= '<a href="'.$urltouse.(preg_match('/\?/', $urltouse) ? '&' : '?').'save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
 							} else {
@@ -745,8 +784,7 @@ if ($mode == 'common' || $mode == 'commonkanban')
 							}
 						}
 					}
-				} elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs))
-				{
+				} elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs)) {
 					$codetoconfig .= '<a class="valignmiddle" href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1).'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
 				} else {
 					$codetoconfig .= '<a class="valignmiddle" href="'.$objMod->config_page_url.'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
@@ -757,42 +795,36 @@ if ($mode == 'common' || $mode == 'commonkanban')
 		} else // Module not yet activated
 		{
 			// Set $codeenabledisable
-			if (!empty($objMod->always_enabled))
-			{
+			if (!empty($objMod->always_enabled)) {
 				// Should never happened
-			} elseif (!empty($objMod->disabled))
-			{
+			} elseif (!empty($objMod->disabled)) {
 				$codeenabledisable .= $langs->trans("Disabled");
 			} else {
 				// Module qualified for activation
 				$warningmessage = '';
-				if (!empty($arrayofwarnings[$modName]))
-				{
+				if (!empty($arrayofwarnings[$modName])) {
 					$codeenabledisable .= '<!-- This module is a core module and it may have a warning to show when we activate it (note: your country is '.$mysoc->country_code.') -->'."\n";
-					foreach ($arrayofwarnings[$modName] as $keycountry => $cursorwarningmessage)
-					{
-						if (preg_match('/^always/', $keycountry) || ($mysoc->country_code && preg_match('/^'.$mysoc->country_code.'/', $keycountry)))
-						{
+					foreach ($arrayofwarnings[$modName] as $keycountry => $cursorwarningmessage) {
+						if (preg_match('/^always/', $keycountry) || ($mysoc->country_code && preg_match('/^'.$mysoc->country_code.'/', $keycountry))) {
 							$warningmessage .= ($warningmessage ? "\n" : "").$langs->trans($cursorwarningmessage, $objMod->getName(), $mysoc->country_code);
 						}
 					}
 				}
-				if ($objMod->isCoreOrExternalModule() == 'external' && !empty($arrayofwarningsext))
-				{
+				if ($objMod->isCoreOrExternalModule() == 'external' && !empty($arrayofwarningsext)) {
 					$codeenabledisable .= '<!-- This module is an external module and it may have a warning to show (note: your country is '.$mysoc->country_code.') -->'."\n";
-					foreach ($arrayofwarningsext as $keymodule => $arrayofwarningsextbycountry)
-					{
+					foreach ($arrayofwarningsext as $keymodule => $arrayofwarningsextbycountry) {
 						$keymodulelowercase = strtolower(preg_replace('/^mod/', '', $keymodule));
-						if (in_array($keymodulelowercase, $conf->modules))    // If module that request warning is on
-						{
-							foreach ($arrayofwarningsextbycountry as $keycountry => $cursorwarningmessage)
-							{
-								if (preg_match('/^always/', $keycountry) || ($mysoc->country_code && preg_match('/^'.$mysoc->country_code.'/', $keycountry)))
-								{
+						if (in_array($keymodulelowercase, $conf->modules)) {    // If module that request warning is on
+							foreach ($arrayofwarningsextbycountry as $keycountry => $cursorwarningmessage) {
+								if (preg_match('/^always/', $keycountry) || ($mysoc->country_code && preg_match('/^'.$mysoc->country_code.'/', $keycountry))) {
 									$warningmessage .= ($warningmessage ? "\n" : "").$langs->trans($cursorwarningmessage, $objMod->getName(), $mysoc->country_code, $modules[$keymodule]->getName());
 									$warningmessage .= ($warningmessage ? "\n" : "").($warningmessage ? "\n" : "").$langs->trans("Module").' : '.$objMod->getName();
-									if (!empty($objMod->editor_name)) $warningmessage .= ($warningmessage ? "\n" : "").$langs->trans("Publisher").' : '.$objMod->editor_name;
-									if (!empty($objMod->editor_name)) $warningmessage .= ($warningmessage ? "\n" : "").$langs->trans("ModuleTriggeringThisWarning").' : '.$modules[$keymodule]->getName();
+									if (!empty($objMod->editor_name)) {
+										$warningmessage .= ($warningmessage ? "\n" : "").$langs->trans("Publisher").' : '.$objMod->editor_name;
+									}
+									if (!empty($objMod->editor_name)) {
+										$warningmessage .= ($warningmessage ? "\n" : "").$langs->trans("ModuleTriggeringThisWarning").' : '.$modules[$keymodule]->getName();
+									}
 								}
 							}
 						}
@@ -800,7 +832,9 @@ if ($mode == 'common' || $mode == 'commonkanban')
 				}
 				$codeenabledisable .= '<!-- Message to show: '.$warningmessage.' -->'."\n";
 				$codeenabledisable .= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;token='.newToken().'&amp;module_position='.$module_position.'&amp;action=set&amp;value='.$modName.'&amp;mode='.$mode.$param.'"';
-				if ($warningmessage) $codeenabledisable .= ' onclick="return confirm(\''.dol_escape_js($warningmessage).'\');"';
+				if ($warningmessage) {
+					$codeenabledisable .= ' onclick="return confirm(\''.dol_escape_js($warningmessage).'\');"';
+				}
 				$codeenabledisable .= '>';
 				$codeenabledisable .= img_picto($langs->trans("Disabled"), 'switch_off');
 				$codeenabledisable .= "</a>\n";
@@ -815,17 +849,21 @@ if ($mode == 'common' || $mode == 'commonkanban')
 			print $objMod->getKanbanView($codeenabledisable, $codetoconfig);
 		} else {
 			print '<tr class="oddeven">'."\n";
-			if (!empty($conf->global->MAIN_MODULES_SHOW_LINENUMBERS)) print '<td width="20px">'.$linenum.'</td>';
+			if (!empty($conf->global->MAIN_MODULES_SHOW_LINENUMBERS)) {
+				print '<td width="20px">'.$linenum.'</td>';
+			}
 
 			// Picto + Name of module
 			print '  <td width="200px">';
 			$alttext = '';
 			//if (is_array($objMod->need_dolibarr_version)) $alttext.=($alttext?' - ':'').'Dolibarr >= '.join('.',$objMod->need_dolibarr_version);
 			//if (is_array($objMod->phpmin)) $alttext.=($alttext?' - ':'').'PHP >= '.join('.',$objMod->phpmin);
-			if (!empty($objMod->picto))
-			{
-				if (preg_match('/^\//i', $objMod->picto)) print img_picto($alttext, $objMod->picto, 'class="valignmiddle pictomodule paddingrightonly"', 1);
-				else print img_object($alttext, $objMod->picto, 'class="valignmiddle pictomodule paddingrightonly"');
+			if (!empty($objMod->picto)) {
+				if (preg_match('/^\//i', $objMod->picto)) {
+					print img_picto($alttext, $objMod->picto, 'class="valignmiddle pictomodule paddingrightonly"', 1);
+				} else {
+					print img_object($alttext, $objMod->picto, 'class="valignmiddle pictomodule paddingrightonly"');
+				}
 			} else {
 				print img_object($alttext, 'generic', 'class="valignmiddle paddingrightonly"');
 			}
@@ -873,8 +911,7 @@ if ($mode == 'common' || $mode == 'commonkanban')
 		}
 	}
 
-	if ($oldfamily)
-	{
+	if ($oldfamily) {
 		if ($mode == 'commonkanban') {
 			print '</div>';
 		} else {
@@ -893,8 +930,7 @@ if ($mode == 'common' || $mode == 'commonkanban')
 	print '</form>';
 }
 
-if ($mode == 'marketplace')
-{
+if ($mode == 'marketplace') {
 	print dol_get_fiche_head($head, $mode, '', -1);
 
 	// Marketplace
@@ -920,8 +956,7 @@ if ($mode == 'marketplace')
 
 	print '<br>';
 
-	if (empty($conf->global->MAIN_DISABLE_DOLISTORE_SEARCH) && $conf->global->MAIN_FEATURES_LEVEL >= 1)
-	{
+	if (empty($conf->global->MAIN_DISABLE_DOLISTORE_SEARCH) && $conf->global->MAIN_FEATURES_LEVEL >= 1) {
 		// $options is array with filter criterias
 		//var_dump($options);
 		$dolistore->getRemoteCategories();
@@ -937,17 +972,17 @@ if ($mode == 'marketplace')
 		print '<form method="POST" class="centpercent" id="searchFormList" action="'.$dolistore->url.'">';
 		?>
 					<input type="hidden" name="token" value="<?php echo newToken(); ?>">
-	            	<input type="hidden" name="mode" value="marketplace">
-	                <div class="divsearchfield"><?php echo $langs->trans('Keyword') ?>:
-	                    <input name="search_keyword" placeholder="<?php echo $langs->trans('Chercher un module') ?>" id="search_keyword" type="text" size="50" value="<?php echo $options['search'] ?>"><br>
-	                </div>
-	                <div class="divsearchfield">
-	                    <input class="button buttongen" value="<?php echo $langs->trans('Rechercher') ?>" type="submit">
-	                    <a class="buttonreset" href="<?php echo $dolistore->url ?>"><?php echo $langs->trans('Reset') ?></a>
-
-	                    &nbsp;
+					<input type="hidden" name="mode" value="marketplace">
+					<div class="divsearchfield"><?php echo $langs->trans('Keyword') ?>:
+						<input name="search_keyword" placeholder="<?php echo $langs->trans('Chercher un module') ?>" id="search_keyword" type="text" size="50" value="<?php echo $options['search'] ?>"><br>
 					</div>
-	    <?php
+					<div class="divsearchfield">
+						<input class="button buttongen" value="<?php echo $langs->trans('Rechercher') ?>" type="submit">
+						<a class="buttonreset" href="<?php echo $dolistore->url ?>"><?php echo $langs->trans('Reset') ?></a>
+
+						&nbsp;
+					</div>
+		<?php
 		print $previouslink;
 		print $nextlink;
 		print '</form>';
@@ -958,48 +993,45 @@ if ($mode == 'marketplace')
 
 		?>
 
-	        <div id="category-tree-left">
-	            <ul class="tree">
-	                <?php echo $dolistore->get_categories(); ?>
-	            </ul>
-	        </div>
-	        <div id="listing-content">
-	            <table summary="list_of_modules" id="list_of_modules" class="productlist centpercent">
-	                <tbody id="listOfModules">
-	                    <?php echo $dolistore->get_products($categorie); ?>
-	                </tbody>
-	            </table>
-	        </div>
+			<div id="category-tree-left">
+				<ul class="tree">
+					<?php echo $dolistore->get_categories(); ?>
+				</ul>
+			</div>
+			<div id="listing-content">
+				<table summary="list_of_modules" id="list_of_modules" class="productlist centpercent">
+					<tbody id="listOfModules">
+						<?php echo $dolistore->get_products($categorie); ?>
+					</tbody>
+				</table>
+			</div>
 
-	    <?php
+		<?php
 	}
 }
 
 
 // Install external module
 
-if ($mode == 'deploy')
-{
+if ($mode == 'deploy') {
 	print dol_get_fiche_head($head, $mode, '', -1);
 
 	$dolibarrdataroot = preg_replace('/([\\/]+)$/i', '', DOL_DATA_ROOT);
 	$allowonlineinstall = true;
 	$allowfromweb = 1;
-	if (dol_is_file($dolibarrdataroot.'/installmodules.lock')) $allowonlineinstall = false;
+	if (dol_is_file($dolibarrdataroot.'/installmodules.lock')) {
+		$allowonlineinstall = false;
+	}
 
 	$fullurl = '<a href="'.$urldolibarrmodules.'" target="_blank">'.$urldolibarrmodules.'</a>';
 	$message = '';
-	if (!empty($allowonlineinstall))
-	{
-		if (!in_array('/custom', explode(',', $dolibarr_main_url_root_alt)))
-		{
+	if (!empty($allowonlineinstall)) {
+		if (!in_array('/custom', explode(',', $dolibarr_main_url_root_alt))) {
 			$message = info_admin($langs->trans("ConfFileMustContainCustom", DOL_DOCUMENT_ROOT.'/custom', DOL_DOCUMENT_ROOT));
 			$allowfromweb = -1;
 		} else {
-			if ($dirins_ok)
-			{
-				if (!is_writable(dol_osencode($dirins)))
-				{
+			if ($dirins_ok) {
+				if (!is_writable(dol_osencode($dirins))) {
 					$langs->load("errors");
 					$message = info_admin($langs->trans("ErrorFailedToWriteInDir", $dirins), 0, 0, '1', 'warning');
 					$allowfromweb = 0;
@@ -1014,8 +1046,7 @@ if ($mode == 'deploy')
 		$allowfromweb = 0;
 	}
 
-	if ($allowfromweb < 1)
-	{
+	if ($allowfromweb < 1) {
 		print $langs->trans("SomethingMakeInstallFromWebNotPossible");
 		print $message;
 		//print $langs->trans("SomethingMakeInstallFromWebNotPossible2");
@@ -1024,10 +1055,8 @@ if ($mode == 'deploy')
 
 	print '<br>';
 
-	if ($allowfromweb >= 0)
-	{
-		if ($allowfromweb == 1)
-		{
+	if ($allowfromweb >= 0) {
+		if ($allowfromweb == 1) {
 			//print $langs->trans("ThisIsProcessToFollow").'<br>';
 		} else {
 			print $langs->trans("ThisIsAlternativeProcessToFollow").'<br>';
@@ -1038,8 +1067,7 @@ if ($mode == 'deploy')
 			print '<b>'.$langs->trans("StepNb", 3).'</b>: ';
 		}
 
-		if ($allowfromweb == 1)
-		{
+		if ($allowfromweb == 1) {
 			print $langs->trans("UnpackPackageInModulesRoot", $dirins).'<br>';
 
 			print '<br>';
@@ -1053,36 +1081,48 @@ if ($mode == 'deploy')
 
 			$max = $conf->global->MAIN_UPLOAD_DOC; // In Kb
 			$maxphp = @ini_get('upload_max_filesize'); // In unknown
-			if (preg_match('/k$/i', $maxphp)) $maxphp = $maxphp * 1;
-			if (preg_match('/m$/i', $maxphp)) $maxphp = $maxphp * 1024;
-			if (preg_match('/g$/i', $maxphp)) $maxphp = $maxphp * 1024 * 1024;
-			if (preg_match('/t$/i', $maxphp)) $maxphp = $maxphp * 1024 * 1024 * 1024;
+			if (preg_match('/k$/i', $maxphp)) {
+				$maxphp = $maxphp * 1;
+			}
+			if (preg_match('/m$/i', $maxphp)) {
+				$maxphp = $maxphp * 1024;
+			}
+			if (preg_match('/g$/i', $maxphp)) {
+				$maxphp = $maxphp * 1024 * 1024;
+			}
+			if (preg_match('/t$/i', $maxphp)) {
+				$maxphp = $maxphp * 1024 * 1024 * 1024;
+			}
 			$maxphp2 = @ini_get('post_max_size'); // In unknown
-			if (preg_match('/k$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1;
-			if (preg_match('/m$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1024;
-			if (preg_match('/g$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1024 * 1024;
-			if (preg_match('/t$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1024 * 1024 * 1024;
+			if (preg_match('/k$/i', $maxphp2)) {
+				$maxphp2 = $maxphp2 * 1;
+			}
+			if (preg_match('/m$/i', $maxphp2)) {
+				$maxphp2 = $maxphp2 * 1024;
+			}
+			if (preg_match('/g$/i', $maxphp2)) {
+				$maxphp2 = $maxphp2 * 1024 * 1024;
+			}
+			if (preg_match('/t$/i', $maxphp2)) {
+				$maxphp2 = $maxphp2 * 1024 * 1024 * 1024;
+			}
 			// Now $max and $maxphp and $maxphp2 are in Kb
 			$maxmin = $max;
 			$maxphptoshow = $maxphptoshowparam = '';
-			if ($maxphp > 0)
-			{
+			if ($maxphp > 0) {
 				$maxmin = min($max, $maxphp);
 				$maxphptoshow = $maxphp;
 				$maxphptoshowparam = 'upload_max_filesize';
 			}
-			if ($maxphp2 > 0)
-			{
+			if ($maxphp2 > 0) {
 				$maxmin = min($max, $maxphp2);
-				if ($maxphp2 < $maxphp)
-				{
+				if ($maxphp2 < $maxphp) {
 					$maxphptoshow = $maxphp2;
 					$maxphptoshowparam = 'post_max_size';
 				}
 			}
 
-			if ($maxmin > 0)
-			{
+			if ($maxmin > 0) {
 				print '<script type="text/javascript">
 				$(document).ready(function() {
 					jQuery("#fileinstall").on("change", function() {
@@ -1101,10 +1141,8 @@ if ($mode == 'deploy')
 
 			print '<input type="submit" name="send" value="'.dol_escape_htmltag($langs->trans("Send")).'" class="button">';
 
-			if (!empty($conf->global->MAIN_UPLOAD_DOC))
-			{
-				if ($user->admin)
-				{
+			if (!empty($conf->global->MAIN_UPLOAD_DOC)) {
+				if ($user->admin) {
 					$langs->load('other');
 					print ' ';
 					print info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphptoshow, $maxphptoshowparam), 1);
@@ -1126,12 +1164,10 @@ if ($mode == 'deploy')
 		}
 	}
 
-	if (!empty($result['return']))
-	{
+	if (!empty($result['return'])) {
 		print '<br>';
 
-		foreach ($result['return'] as $value)
-		{
+		foreach ($result['return'] as $value) {
 			echo $value.'<br>';
 		}
 	}
@@ -1139,8 +1175,7 @@ if ($mode == 'deploy')
 	print dol_get_fiche_end();
 }
 
-if ($mode == 'develop')
-{
+if ($mode == 'develop') {
 	print dol_get_fiche_head($head, $mode, '', -1);
 
 	// Marketplace
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index a697fcdfdc5..5206b7a47b7 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -36,9 +36,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 function versiontostring($versionarray)
 {
 	$string = '?';
-	if (isset($versionarray[0])) $string = $versionarray[0];
-	if (isset($versionarray[1])) $string .= '.'.$versionarray[1];
-	if (isset($versionarray[2])) $string .= '.'.$versionarray[2];
+	if (isset($versionarray[0])) {
+		$string = $versionarray[0];
+	}
+	if (isset($versionarray[1])) {
+		$string .= '.'.$versionarray[1];
+	}
+	if (isset($versionarray[2])) {
+		$string .= '.'.$versionarray[2];
+	}
 	return $string;
 }
 
@@ -64,24 +70,47 @@ function versioncompare($versionarray1, $versionarray2)
 	$count1 = count($versionarray1);
 	$count2 = count($versionarray2);
 	$maxcount = max($count1, $count2);
-	while ($level < $maxcount)
-	{
+	while ($level < $maxcount) {
 		$operande1 = isset($versionarray1[$level]) ? $versionarray1[$level] : 0;
 		$operande2 = isset($versionarray2[$level]) ? $versionarray2[$level] : 0;
-		if (preg_match('/alpha|dev/i', $operande1)) $operande1 = -5;
-		if (preg_match('/alpha|dev/i', $operande2)) $operande2 = -5;
-		if (preg_match('/beta$/i', $operande1)) $operande1 = -4;
-		if (preg_match('/beta$/i', $operande2)) $operande2 = -4;
-		if (preg_match('/beta([0-9])+/i', $operande1)) $operande1 = -3;
-		if (preg_match('/beta([0-9])+/i', $operande2)) $operande2 = -3;
-		if (preg_match('/rc$/i', $operande1)) $operande1 = -2;
-		if (preg_match('/rc$/i', $operande2)) $operande2 = -2;
-		if (preg_match('/rc([0-9])+/i', $operande1)) $operande1 = -1;
-		if (preg_match('/rc([0-9])+/i', $operande2)) $operande2 = -1;
+		if (preg_match('/alpha|dev/i', $operande1)) {
+			$operande1 = -5;
+		}
+		if (preg_match('/alpha|dev/i', $operande2)) {
+			$operande2 = -5;
+		}
+		if (preg_match('/beta$/i', $operande1)) {
+			$operande1 = -4;
+		}
+		if (preg_match('/beta$/i', $operande2)) {
+			$operande2 = -4;
+		}
+		if (preg_match('/beta([0-9])+/i', $operande1)) {
+			$operande1 = -3;
+		}
+		if (preg_match('/beta([0-9])+/i', $operande2)) {
+			$operande2 = -3;
+		}
+		if (preg_match('/rc$/i', $operande1)) {
+			$operande1 = -2;
+		}
+		if (preg_match('/rc$/i', $operande2)) {
+			$operande2 = -2;
+		}
+		if (preg_match('/rc([0-9])+/i', $operande1)) {
+			$operande1 = -1;
+		}
+		if (preg_match('/rc([0-9])+/i', $operande2)) {
+			$operande2 = -1;
+		}
 		$level++;
 		//print 'level '.$level.' '.$operande1.'-'.$operande2.'<br>';
-		if ($operande1 < $operande2) { $ret = -$level; break; }
-		if ($operande1 > $operande2) { $ret = $level; break; }
+		if ($operande1 < $operande2) {
+			$ret = -$level; break;
+		}
+		if ($operande1 > $operande2) {
+			$ret = $level; break;
+		}
 	}
 	//print join('.',$versionarray1).'('.count($versionarray1).') / '.join('.',$versionarray2).'('.count($versionarray2).') => '.$ret.'<br>'."\n";
 	return $ret;
@@ -135,8 +164,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 
 	dol_syslog("Admin.lib::run_sql run sql file ".$sqlfile." silent=".$silent." entity=".$entity." usesavepoint=".$usesavepoint." handler=".$handler." okerror=".$okerror, LOG_DEBUG);
 
-	if (!is_numeric($linelengthlimit))
-	{
+	if (!is_numeric($linelengthlimit)) {
 		dol_syslog("Admin.lib::run_sql param linelengthlimit is not a numeric", LOG_ERR);
 		return -1;
 	}
@@ -151,38 +179,35 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 	$versionarray = $db->getVersionArray();
 
 	$fp = fopen($sqlfile, "r");
-	if ($fp)
-	{
-		while (!feof($fp))
-		{
+	if ($fp) {
+		while (!feof($fp)) {
 			// Warning fgets with second parameter that is null or 0 hang.
-			if ($linelengthlimit > 0) $buf = fgets($fp, $linelengthlimit);
-			else $buf = fgets($fp);
+			if ($linelengthlimit > 0) {
+				$buf = fgets($fp, $linelengthlimit);
+			} else {
+				$buf = fgets($fp);
+			}
 
 			// Test if request must be ran only for particular database or version (if yes, we must remove the -- comment)
 			$reg = array();
-			if (preg_match('/^--\sV(MYSQL|PGSQL)([^\s]*)/i', $buf, $reg))
-			{
+			if (preg_match('/^--\sV(MYSQL|PGSQL)([^\s]*)/i', $buf, $reg)) {
 				$qualified = 1;
 
 				// restrict on database type
-				if (!empty($reg[1]))
-				{
-					if (!preg_match('/'.preg_quote($reg[1]).'/i', $db->type)) $qualified = 0;
+				if (!empty($reg[1])) {
+					if (!preg_match('/'.preg_quote($reg[1]).'/i', $db->type)) {
+						$qualified = 0;
+					}
 				}
 
 				// restrict on version
-				if ($qualified)
-				{
-					if (!empty($reg[2]))
-					{
-						if (is_numeric($reg[2]))	// This is a version
-						{
+				if ($qualified) {
+					if (!empty($reg[2])) {
+						if (is_numeric($reg[2])) {	// This is a version
 							$versionrequest = explode('.', $reg[2]);
 							//print var_dump($versionrequest);
 							//print var_dump($versionarray);
-							if (!count($versionrequest) || !count($versionarray) || versioncompare($versionrequest, $versionarray) > 0)
-							{
+							if (!count($versionrequest) || !count($versionarray) || versioncompare($versionrequest, $versionarray) > 0) {
 								$qualified = 0;
 							}
 						} else // This is a test on a constant. For example when we have -- VMYSQLUTF8UNICODE, we test constant $conf->global->UTF8UNICODE
@@ -190,14 +215,15 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 							$dbcollation = strtoupper(preg_replace('/_/', '', $conf->db->dolibarr_main_db_collation));
 							//var_dump($reg[2]);
 							//var_dump($dbcollation);
-							if (empty($conf->db->dolibarr_main_db_collation) || ($reg[2] != $dbcollation)) $qualified = 0;
+							if (empty($conf->db->dolibarr_main_db_collation) || ($reg[2] != $dbcollation)) {
+								$qualified = 0;
+							}
 							//var_dump($qualified);
 						}
 					}
 				}
 
-				if ($qualified)
-				{
+				if ($qualified) {
 					// Version qualified, delete SQL comments
 					$buf = preg_replace('/^--\sV(MYSQL|PGSQL)([^\s]*)/i', '', $buf);
 					//print "Ligne $i qualifi?e par version: ".$buf.'<br>';
@@ -205,24 +231,28 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 			}
 
 			// Add line buf to buffer if not a comment
-			if ($nocommentremoval || !preg_match('/^\s*--/', $buf))
-			{
-				if (empty($nocommentremoval)) $buf = preg_replace('/([,;ERLT\)])\s*--.*$/i', '\1', $buf); //remove comment from a line that not start with -- before add it to the buffer
+			if ($nocommentremoval || !preg_match('/^\s*--/', $buf)) {
+				if (empty($nocommentremoval)) {
+					$buf = preg_replace('/([,;ERLT\)])\s*--.*$/i', '\1', $buf); //remove comment from a line that not start with -- before add it to the buffer
+				}
 				$buffer .= trim($buf);
 			}
 
 			//print $buf.'<br>';exit;
 
-			if (preg_match('/;/', $buffer))	// If string contains ';', it's end of a request string, we save it in arraysql.
-			{
-				// Found new request
-				if ($buffer) $arraysql[$i] = $buffer;
+			if (preg_match('/;/', $buffer)) {	// If string contains ';', it's end of a request string, we save it in arraysql.
+			// Found new request
+				if ($buffer) {
+					$arraysql[$i] = $buffer;
+				}
 				$i++;
 				$buffer = '';
 			}
 		}
 
-		if ($buffer) $arraysql[$i] = $buffer;
+		if ($buffer) {
+			$arraysql[$i] = $buffer;
+		}
 		fclose($fp);
 	} else {
 		dol_syslog("Admin.lib::run_sql failed to open file ".$sqlfile, LOG_ERR);
@@ -230,28 +260,32 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 
 	// Loop on each request to see if there is a __+MAX_table__ key
 	$listofmaxrowid = array(); // This is a cache table
-	foreach ($arraysql as $i => $sql)
-	{
+	foreach ($arraysql as $i => $sql) {
 		$newsql = $sql;
 
 		// Replace __+MAX_table__ with max of table
-		while (preg_match('/__\+MAX_([A-Za-z0-9_]+)__/i', $newsql, $reg))
-		{
+		while (preg_match('/__\+MAX_([A-Za-z0-9_]+)__/i', $newsql, $reg)) {
 			$table = $reg[1];
-			if (!isset($listofmaxrowid[$table]))
-			{
+			if (!isset($listofmaxrowid[$table])) {
 				//var_dump($db);
 				$sqlgetrowid = 'SELECT MAX(rowid) as max from '.preg_replace('/^llx_/', MAIN_DB_PREFIX, $table);
 				$resql = $db->query($sqlgetrowid);
-				if ($resql)
-				{
+				if ($resql) {
 					$obj = $db->fetch_object($resql);
 					$listofmaxrowid[$table] = $obj->max;
-					if (empty($listofmaxrowid[$table])) $listofmaxrowid[$table] = 0;
+					if (empty($listofmaxrowid[$table])) {
+						$listofmaxrowid[$table] = 0;
+					}
 				} else {
-					if (!$silent) print '<tr><td class="tdtop" colspan="2">';
-					if (!$silent) print '<div class="error">'.$langs->trans("Failed to get max rowid for ".$table)."</div></td>";
-					if (!$silent) print '</tr>';
+					if (!$silent) {
+						print '<tr><td class="tdtop" colspan="2">';
+					}
+					if (!$silent) {
+						print '<div class="error">'.$langs->trans("Failed to get max rowid for ".$table)."</div></td>";
+					}
+					if (!$silent) {
+						print '</tr>';
+					}
 					$error++;
 					break;
 				}
@@ -265,8 +299,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 			$arraysql[$i] = $newsql;
 		}
 
-		if ($offsetforchartofaccount > 0)
-		{
+		if ($offsetforchartofaccount > 0) {
 			// Replace lines
 			// 'INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1401, 'PCG99-ABREGE', 'CAPIT', '1234', 1400, '...', 1);'
 			// with
@@ -282,32 +315,31 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 	// Loop on each request to execute request
 	$cursorinsert = 0;
 	$listofinsertedrowid = array();
-	foreach ($arraysql as $i => $sql)
-	{
-		if ($sql)
-		{
+	foreach ($arraysql as $i => $sql) {
+		if ($sql) {
 			// Replace the prefix tables
-			if (MAIN_DB_PREFIX != 'llx_')
-			{
+			if (MAIN_DB_PREFIX != 'llx_') {
 				$sql = preg_replace('/llx_/i', MAIN_DB_PREFIX, $sql);
 			}
 
-			if (!empty($handler)) $sql = preg_replace('/__HANDLER__/i', "'".$db->escape($handler)."'", $sql);
+			if (!empty($handler)) {
+				$sql = preg_replace('/__HANDLER__/i', "'".$db->escape($handler)."'", $sql);
+			}
 
 			$newsql = preg_replace('/__ENTITY__/i', (!empty($entity) ? $entity : $conf->entity), $sql);
 
 			// Add log of request
-			if (!$silent) print '<tr class="trforrunsql"><td class="tdtop opacitymedium">'.$langs->trans("Request").' '.($i + 1)." sql='".dol_htmlentities($newsql, ENT_NOQUOTES)."'</td></tr>\n";
+			if (!$silent) {
+				print '<tr class="trforrunsql"><td class="tdtop opacitymedium">'.$langs->trans("Request").' '.($i + 1)." sql='".dol_htmlentities($newsql, ENT_NOQUOTES)."'</td></tr>\n";
+			}
 			dol_syslog('Admin.lib::run_sql Request '.($i + 1), LOG_DEBUG);
 			$sqlmodified = 0;
 
 			// Replace for encrypt data
-			if (preg_match_all('/__ENCRYPT\(\'([^\']+)\'\)__/i', $newsql, $reg))
-			{
+			if (preg_match_all('/__ENCRYPT\(\'([^\']+)\'\)__/i', $newsql, $reg)) {
 				$num = count($reg[0]);
 
-				for ($j = 0; $j < $num; $j++)
-				{
+				for ($j = 0; $j < $num; $j++) {
 					$from = $reg[0][$j];
 					$to = $db->encrypt($reg[1][$j], 1);
 					$newsql = str_replace($from, $to, $newsql);
@@ -316,12 +348,10 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 			}
 
 			// Replace for decrypt data
-			if (preg_match_all('/__DECRYPT\(\'([A-Za-z0-9_]+)\'\)__/i', $newsql, $reg))
-			{
+			if (preg_match_all('/__DECRYPT\(\'([A-Za-z0-9_]+)\'\)__/i', $newsql, $reg)) {
 				$num = count($reg[0]);
 
-				for ($j = 0; $j < $num; $j++)
-				{
+				for ($j = 0; $j < $num; $j++) {
 					$from = $reg[0][$j];
 					$to = $db->decrypt($reg[1][$j]);
 					$newsql = str_replace($from, $to, $newsql);
@@ -330,14 +360,18 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 			}
 
 			// Replace __x__ with rowid of insert nb x
-			while (preg_match('/__([0-9]+)__/', $newsql, $reg))
-			{
+			while (preg_match('/__([0-9]+)__/', $newsql, $reg)) {
 				$cursor = $reg[1];
-				if (empty($listofinsertedrowid[$cursor]))
-				{
-					if (!$silent) print '<tr><td class="tdtop" colspan="2">';
-					if (!$silent) print '<div class="error">'.$langs->trans("FileIsNotCorrect")."</div></td>";
-					if (!$silent) print '</tr>';
+				if (empty($listofinsertedrowid[$cursor])) {
+					if (!$silent) {
+						print '<tr><td class="tdtop" colspan="2">';
+					}
+					if (!$silent) {
+						print '<div class="error">'.$langs->trans("FileIsNotCorrect")."</div></td>";
+					}
+					if (!$silent) {
+						print '</tr>';
+					}
 					$error++;
 					break;
 				}
@@ -347,15 +381,17 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 				$sqlmodified++;
 			}
 
-			if ($sqlmodified) dol_syslog('Admin.lib::run_sql New Request '.($i + 1), LOG_DEBUG);
+			if ($sqlmodified) {
+				dol_syslog('Admin.lib::run_sql New Request '.($i + 1), LOG_DEBUG);
+			}
 
 			$result = $db->query($newsql, $usesavepoint);
-			if ($result)
-			{
-				if (!$silent) print '<!-- Result = OK -->'."\n";
+			if ($result) {
+				if (!$silent) {
+					print '<!-- Result = OK -->'."\n";
+				}
 
-				if (preg_replace('/insert into ([^\s]+)/i', $newsql, $reg))
-				{
+				if (preg_replace('/insert into ([^\s]+)/i', $newsql, $reg)) {
 					$cursorinsert++;
 
 					// It's an insert
@@ -367,7 +403,9 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 				// 	          print '<td class="right">OK</td>';
 			} else {
 				$errno = $db->errno();
-				if (!$silent) print '<!-- Result = '.$errno.' -->'."\n";
+				if (!$silent) {
+					print '<!-- Result = '.$errno.' -->'."\n";
+				}
 
 				// Define list of errors we accept (array $okerrors)
 				$okerrors = array(	// By default
@@ -385,20 +423,29 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 					'DB_ERROR_PRIMARY_KEY_ALREADY_EXISTS',
 					'DB_ERROR_22P02'
 				);
-				if ($okerror == 'none') $okerrors = array();
+				if ($okerror == 'none') {
+					$okerrors = array();
+				}
 
 				// Is it an error we accept
-				if (!in_array($errno, $okerrors))
-				{
-					if (!$silent) print '<tr><td class="tdtop" colspan="2">';
-					if (!$silent) print '<div class="error">'.$langs->trans("Error")." ".$db->errno().": ".$newsql."<br>".$db->error()."</div></td>";
-					if (!$silent) print '</tr>'."\n";
+				if (!in_array($errno, $okerrors)) {
+					if (!$silent) {
+						print '<tr><td class="tdtop" colspan="2">';
+					}
+					if (!$silent) {
+						print '<div class="error">'.$langs->trans("Error")." ".$db->errno().": ".$newsql."<br>".$db->error()."</div></td>";
+					}
+					if (!$silent) {
+						print '</tr>'."\n";
+					}
 					dol_syslog('Admin.lib::run_sql Request '.($i + 1)." Error ".$db->errno()." ".$newsql."<br>".$db->error(), LOG_ERR);
 					$error++;
 				}
 			}
 
-			if (!$silent) print '</tr>'."\n";
+			if (!$silent) {
+				print '</tr>'."\n";
+			}
 		}
 	}
 
@@ -453,22 +500,24 @@ function dolibarr_del_const($db, $name, $entity = 1)
 {
 	global $conf;
 
-	if (empty($name))
-	{
+	if (empty($name)) {
 		dol_print_error('', 'Error call dolibar_del_const with parameter name empty');
 		return -1;
 	}
 
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
 	$sql .= " WHERE (".$db->decrypt('name')." = '".$db->escape($name)."'";
-	if (is_numeric($name)) $sql .= " OR rowid = '".$db->escape($name)."'";
+	if (is_numeric($name)) {
+		$sql .= " OR rowid = '".$db->escape($name)."'";
+	}
 	$sql .= ")";
-	if ($entity >= 0) $sql .= " AND entity = ".$entity;
+	if ($entity >= 0) {
+		$sql .= " AND entity = ".$entity;
+	}
 
 	dol_syslog("admin.lib::dolibarr_del_const", LOG_DEBUG);
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$conf->global->$name = '';
 		return 1;
 	} else {
@@ -499,10 +548,11 @@ function dolibarr_get_const($db, $name, $entity = 1)
 
 	dol_syslog("admin.lib::dolibarr_get_const", LOG_DEBUG);
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$obj = $db->fetch_object($resql);
-		if ($obj) $value = $obj->value;
+		if ($obj) {
+			$value = $obj->value;
+		}
 	}
 	return $value;
 }
@@ -530,8 +580,7 @@ function dolibarr_set_const($db, $name, $value, $type = 'chaine', $visible = 0,
 	$name = trim($name);
 
 	// Check parameters
-	if (empty($name))
-	{
+	if (empty($name)) {
 		dol_print_error($db, "Error: Call to function dolibarr_set_const with wrong parameters", LOG_ERR);
 		exit;
 	}
@@ -542,13 +591,14 @@ function dolibarr_set_const($db, $name, $value, $type = 'chaine', $visible = 0,
 
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
 	$sql .= " WHERE name = ".$db->encrypt($name, 1);
-	if ($entity >= 0) $sql .= " AND entity = ".$entity;
+	if ($entity >= 0) {
+		$sql .= " AND entity = ".$entity;
+	}
 
 	dol_syslog("admin.lib::dolibarr_set_const", LOG_DEBUG);
 	$resql = $db->query($sql);
 
-	if (strcmp($value, ''))	// true if different. Must work for $value='0' or $value=0
-	{
+	if (strcmp($value, '')) {	// true if different. Must work for $value='0' or $value=0
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity)";
 		$sql .= " VALUES (";
 		$sql .= $db->encrypt($name, 1);
@@ -561,8 +611,7 @@ function dolibarr_set_const($db, $name, $value, $type = 'chaine', $visible = 0,
 		$resql = $db->query($sql);
 	}
 
-	if ($resql)
-	{
+	if ($resql) {
 		$db->commit();
 		$conf->global->$name = $value;
 		return 1;
@@ -586,10 +635,10 @@ function modules_prepare_head()
 	global $langs, $conf, $user;
 	$h = 0;
 	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=commonkanban";
+	$mode = empty($conf->global->MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT) ? 'commonkanban' : 'common';
+	$head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=".$mode;
 	$head[$h][1] = $langs->trans("AvailableModules");
-	$head[$h][2] = 'commonkanban';
+	$head[$h][2] = 'modules';
 	$h++;
 
 	$head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=marketplace";
@@ -638,10 +687,10 @@ function security_prepare_head()
 	$h++;
 
 	/*
-    $head[$h][0] = DOL_URL_ROOT."/admin/security_file_download.php";
-    $head[$h][1] = $langs->trans("Files").' ('.$langs->trans("Download").')';
-    $head[$h][2] = 'filedownload';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/security_file_download.php";
+	$head[$h][1] = $langs->trans("Files").' ('.$langs->trans("Download").')';
+	$head[$h][2] = 'filedownload';
+	$h++;
 	*/
 
 	$head[$h][0] = DOL_URL_ROOT."/admin/proxy.php";
@@ -662,17 +711,24 @@ function security_prepare_head()
 	$sql .= " WHERE r.libelle NOT LIKE 'tou%'"; // On ignore droits "tous"
 	$sql .= " AND entity = ".$conf->entity;
 	$sql .= " AND bydefault = 1";
-	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) $sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is not enabled
+	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+		$sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is not enabled
+	}
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$obj = $db->fetch_object($resql);
-		if ($obj) $nbPerms = $obj->nb;
-	} else dol_print_error($db);
+		if ($obj) {
+			$nbPerms = $obj->nb;
+		}
+	} else {
+		dol_print_error($db);
+	}
 
 	$head[$h][0] = DOL_URL_ROOT."/admin/perms.php";
 	$head[$h][1] = $langs->trans("DefaultRights");
-	if ($nbPerms > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbPerms.'</span>' : '');
+	if ($nbPerms > 0) {
+		$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbPerms.'</span>' : '');
+	}
 	$head[$h][2] = 'default';
 	$h++;
 
@@ -703,8 +759,7 @@ function modulehelp_prepare_head($object)
 	$head[$h][2] = 'feature';
 	$h++;
 
-	if ($object->isCoreOrExternalModule() == 'external')
-	{
+	if ($object->isCoreOrExternalModule() == 'external') {
 		$head[$h][0] = DOL_URL_ROOT."/admin/modulehelp.php?id=".$object->id.'&mode=changelog';
 		$head[$h][1] = $langs->trans("ChangeLog");
 		$head[$h][2] = 'changelog';
@@ -774,8 +829,7 @@ function defaultvalues_prepare_head()
 	$head[$h][2] = 'sortorder';
 	$h++;
 
-	if (!empty($conf->use_javascript_ajax))
-	{
+	if (!empty($conf->use_javascript_ajax)) {
 		$head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=focus";
 		$head[$h][1] = $langs->trans("DefaultFocus");
 		$head[$h][2] = 'focus';
@@ -788,9 +842,9 @@ function defaultvalues_prepare_head()
 	}
 
 	/*$head[$h][0] = DOL_URL_ROOT."/admin/translation.php?mode=searchkey";
-    $head[$h][1] = $langs->trans("TranslationKeySearch");
-    $head[$h][2] = 'searchkey';
-    $h++;*/
+	$head[$h][1] = $langs->trans("TranslationKeySearch");
+	$head[$h][2] = 'searchkey';
+	$h++;*/
 
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'defaultvalues_admin');
 
@@ -821,15 +875,11 @@ function listOfSessions()
 	dol_syslog('admin.lib:listOfSessions sessPath='.$sessPath);
 
 	$dh = @opendir(dol_osencode($sessPath));
-	if ($dh)
-	{
-		while (($file = @readdir($dh)) !== false)
-		{
-			if (preg_match('/^sess_/i', $file) && $file != "." && $file != "..")
-			{
+	if ($dh) {
+		while (($file = @readdir($dh)) !== false) {
+			if (preg_match('/^sess_/i', $file) && $file != "." && $file != "..") {
 				$fullpath = $sessPath.$file;
-				if (!@is_dir($fullpath) && is_readable($fullpath))
-				{
+				if (!@is_dir($fullpath) && is_readable($fullpath)) {
 					$sessValues = file_get_contents($fullpath); // get raw session data
 					// Example of possible value
 					//$sessValues = 'newtoken|s:32:"1239f7a0c4b899200fe9ca5ea394f307";dol_loginmesg|s:0:"";newtoken|s:32:"1236457104f7ae0f328c2928973f3cb5";dol_loginmesg|s:0:"";token|s:32:"123615ad8d650c5cc4199b9a1a76783f";
@@ -838,13 +888,14 @@ function listOfSessions()
 
 					if (preg_match('/dol_login/i', $sessValues) && // limit to dolibarr session
 						(preg_match('/dol_entity\|i:'.$conf->entity.';/i', $sessValues) || preg_match('/dol_entity\|s:([0-9]+):"'.$conf->entity.'"/i', $sessValues)) && // limit to current entity
-					preg_match('/dol_company\|s:([0-9]+):"('.$conf->global->MAIN_INFO_SOCIETE_NOM.')"/i', $sessValues)) // limit to company name
-					{
+					preg_match('/dol_company\|s:([0-9]+):"('.$conf->global->MAIN_INFO_SOCIETE_NOM.')"/i', $sessValues)) { // limit to company name
 						$tmp = explode('_', $file);
 						$idsess = $tmp[1];
 						$regs = array();
 						$loginfound = preg_match('/dol_login\|s:[0-9]+:"([A-Za-z0-9]+)"/i', $sessValues, $regs);
-						if ($loginfound) $arrayofSessions[$idsess]["login"] = $regs[1];
+						if ($loginfound) {
+							$arrayofSessions[$idsess]["login"] = $regs[1];
+						}
 						$arrayofSessions[$idsess]["age"] = time() - filectime($fullpath);
 						$arrayofSessions[$idsess]["creation"] = filectime($fullpath);
 						$arrayofSessions[$idsess]["modification"] = filemtime($fullpath);
@@ -874,26 +925,23 @@ function purgeSessions($mysessionid)
 
 	$error = 0;
 	$dh = @opendir(dol_osencode($sessPath));
-	while (($file = @readdir($dh)) !== false)
-	{
-		if ($file != "." && $file != "..")
-		{
+	while (($file = @readdir($dh)) !== false) {
+		if ($file != "." && $file != "..") {
 			$fullpath = $sessPath.$file;
-			if (!@is_dir($fullpath))
-			{
+			if (!@is_dir($fullpath)) {
 				$sessValues = file_get_contents($fullpath); // get raw session data
 
 				if (preg_match('/dol_login/i', $sessValues) && // limit to dolibarr session
 				preg_match('/dol_entity\|s:([0-9]+):"('.$conf->entity.')"/i', $sessValues) && // limit to current entity
-				preg_match('/dol_company\|s:([0-9]+):"('.$conf->global->MAIN_INFO_SOCIETE_NOM.')"/i', $sessValues)) // limit to company name
-				{
+				preg_match('/dol_company\|s:([0-9]+):"('.$conf->global->MAIN_INFO_SOCIETE_NOM.')"/i', $sessValues)) { // limit to company name
 					$tmp = explode('_', $file);
 					$idsess = $tmp[1];
 					// We remove session if it's not ourself
-					if ($idsess != $mysessionid)
-					{
+					if ($idsess != $mysessionid) {
 						$res = @unlink($fullpath);
-						if (!$res) $error++;
+						if (!$res) {
+							$error++;
+						}
 					}
 				}
 			}
@@ -901,8 +949,11 @@ function purgeSessions($mysessionid)
 	}
 	@closedir($dh);
 
-	if (!$error) return 1;
-	else return -$error;
+	if (!$error) {
+		return 1;
+	} else {
+		return -$error;
+	}
 }
 
 
@@ -935,12 +986,12 @@ function activateModule($value, $withdeps = 1)
 
 	// Loop on each modulesdir directories
 	$found = false;
-	foreach ($modulesdir as $dir)
-	{
-		if (file_exists($dir.$modFile))
-		{
+	foreach ($modulesdir as $dir) {
+		if (file_exists($dir.$modFile)) {
 			$found = @include_once $dir.$modFile;
-			if ($found) break;
+			if ($found) {
+				break;
+			}
 		}
 	}
 
@@ -976,29 +1027,22 @@ function activateModule($value, $withdeps = 1)
 
 	$result = $objMod->init(); // Enable module
 
-	if ($result <= 0)
-	{
+	if ($result <= 0) {
 		$ret['errors'][] = $objMod->error;
 	} else {
-		if ($withdeps)
-		{
-			if (isset($objMod->depends) && is_array($objMod->depends) && !empty($objMod->depends))
-			{
+		if ($withdeps) {
+			if (isset($objMod->depends) && is_array($objMod->depends) && !empty($objMod->depends)) {
 				// Activation of modules this module depends on
 				// this->depends may be array('modModule1', 'mmodModule2') or array('always1'=>"modModule1", 'FR'=>'modModule2')
-				foreach ($objMod->depends as $key => $modulestring)
-				{
+				foreach ($objMod->depends as $key => $modulestring) {
 					//var_dump((! is_numeric($key)) && ! preg_match('/^always/', $key) && $mysoc->country_code && ! preg_match('/^'.$mysoc->country_code.'/', $key));exit;
-					if ((!is_numeric($key)) && !preg_match('/^always/', $key) && $mysoc->country_code && !preg_match('/^'.$mysoc->country_code.'/', $key))
-					{
+					if ((!is_numeric($key)) && !preg_match('/^always/', $key) && $mysoc->country_code && !preg_match('/^'.$mysoc->country_code.'/', $key)) {
 						dol_syslog("We are not concerned by dependency with key=".$key." because our country is ".$mysoc->country_code);
 						continue;
 					}
 					$activate = false;
-					foreach ($modulesdir as $dir)
-					{
-						if (file_exists($dir.$modulestring.".class.php"))
-						{
+					foreach ($modulesdir as $dir) {
+						if (file_exists($dir.$modulestring.".class.php")) {
 							$resarray = activateModule($modulestring);
 							if (empty($resarray['errors'])) {
 								$activate = true;
@@ -1011,8 +1055,7 @@ function activateModule($value, $withdeps = 1)
 						}
 					}
 
-					if ($activate)
-					{
+					if ($activate) {
 						$ret['nbmodules'] += $resarray['nbmodules'];
 						$ret['nbperms'] += $resarray['nbperms'];
 					} else {
@@ -1021,16 +1064,12 @@ function activateModule($value, $withdeps = 1)
 				}
 			}
 
-			if (isset($objMod->conflictwith) && is_array($objMod->conflictwith) && !empty($objMod->conflictwith))
-			{
+			if (isset($objMod->conflictwith) && is_array($objMod->conflictwith) && !empty($objMod->conflictwith)) {
 				// Desactivation des modules qui entrent en conflit
 				$num = count($objMod->conflictwith);
-				for ($i = 0; $i < $num; $i++)
-				{
-					foreach ($modulesdir as $dir)
-					{
-						if (file_exists($dir.$objMod->conflictwith[$i].".class.php"))
-						{
+				for ($i = 0; $i < $num; $i++) {
+					foreach ($modulesdir as $dir) {
+						if (file_exists($dir.$objMod->conflictwith[$i].".class.php")) {
 							unActivateModule($objMod->conflictwith[$i], 0);
 						}
 					}
@@ -1039,8 +1078,7 @@ function activateModule($value, $withdeps = 1)
 		}
 	}
 
-	if (!count($ret['errors']))
-	{
+	if (!count($ret['errors'])) {
 		$ret['nbmodules']++;
 		$ret['nbperms'] += count($objMod->rights);
 	}
@@ -1061,7 +1099,9 @@ function unActivateModule($value, $requiredby = 1)
 	global $db, $modules, $conf;
 
 	// Check parameters
-	if (empty($value)) return 'ErrorBadParameter';
+	if (empty($value)) {
+		return 'ErrorBadParameter';
+	}
 
 	$ret = '';
 	$modName = $value;
@@ -1072,20 +1112,21 @@ function unActivateModule($value, $requiredby = 1)
 
 	// Loop on each modulesdir directories
 	$found = false;
-	foreach ($modulesdir as $dir)
-	{
-		if (file_exists($dir.$modFile))
-		{
+	foreach ($modulesdir as $dir) {
+		if (file_exists($dir.$modFile)) {
 			$found = @include_once $dir.$modFile;
-			if ($found) break;
+			if ($found) {
+				break;
+			}
 		}
 	}
 
-	if ($found)
-	{
+	if ($found) {
 		$objMod = new $modName($db);
 		$result = $objMod->remove();
-		if ($result <= 0) $ret = $objMod->error;
+		if ($result <= 0) {
+			$ret = $objMod->error;
+		}
 	} else // We come here when we try to unactivate a module when module does not exists anymore in sources
 	{
 		//print $dir.$modFile;exit;
@@ -1100,11 +1141,9 @@ function unActivateModule($value, $requiredby = 1)
 	}
 
 	// Disable modules that depends on module we disable
-	if (!$ret && $requiredby && is_object($objMod) && is_array($objMod->requiredby))
-	{
+	if (!$ret && $requiredby && is_object($objMod) && is_array($objMod->requiredby)) {
 		$countrb = count($objMod->requiredby);
-		for ($i = 0; $i < $countrb; $i++)
-		{
+		for ($i = 0; $i < $countrb; $i++) {
 			//var_dump($objMod->requiredby[$i]);
 			unActivateModule($objMod->requiredby[$i]);
 		}
@@ -1143,28 +1182,22 @@ function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tab
 	$i = 0; // is a sequencer of modules found
 	$j = 0; // j is module number. Automatically affected if module number not defined.
 
-	foreach ($modulesdir as $dir)
-	{
+	foreach ($modulesdir as $dir) {
 		// Load modules attributes in arrays (name, numero, orders) from dir directory
 		//print $dir."\n<br>";
 		dol_syslog("Scan directory ".$dir." for modules");
 		$handle = @opendir(dol_osencode($dir));
-		if (is_resource($handle))
-		{
-			while (($file = readdir($handle)) !== false)
-			{
+		if (is_resource($handle)) {
+			while (($file = readdir($handle)) !== false) {
 				//print "$i ".$file."\n<br>";
-				if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php')
-				{
+				if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php') {
 					$modName = substr($file, 0, dol_strlen($file) - 10);
 
-					if ($modName)
-					{
+					if ($modName) {
 						include_once $dir.$file;
 						$objMod = new $modName($db);
 
-						if ($objMod->numero > 0)
-						{
+						if ($objMod->numero > 0) {
 							$j = $objMod->numero;
 						} else {
 							$j = 1000 + $i;
@@ -1174,13 +1207,18 @@ function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tab
 
 						// We discard modules according to features level (PS: if module is activated we always show it)
 						$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
-						if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && !$conf->global->$const_name) $modulequalified = 0;
-						if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && !$conf->global->$const_name) $modulequalified = 0;
+						if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && !$conf->global->$const_name) {
+							$modulequalified = 0;
+						}
+						if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && !$conf->global->$const_name) {
+							$modulequalified = 0;
+						}
 						//If module is not activated disqualified
-						if (empty($conf->global->$const_name)) $modulequalified = 0;
+						if (empty($conf->global->$const_name)) {
+							$modulequalified = 0;
+						}
 
-						if ($modulequalified)
-						{
+						if ($modulequalified) {
 							// Load languages files of module
 							if (isset($objMod->langfiles) && is_array($objMod->langfiles)) {
 								foreach ($objMod->langfiles as $langfile) {
@@ -1189,26 +1227,52 @@ function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tab
 							}
 
 							// Complete the arrays &$tabname,&$tablib,&$tabsql,&$tabsqlsort,&$tabfield,&$tabfieldvalue,&$tabfieldinsert,&$tabrowid,&$tabcond
-							if (empty($objMod->dictionaries) && !empty($objMod->dictionnaries)) $objMod->dictionaries = $objMod->dictionnaries; // For backward compatibility
+							if (empty($objMod->dictionaries) && !empty($objMod->dictionnaries)) {
+								$objMod->dictionaries = $objMod->dictionnaries; // For backward compatibility
+							}
 
-							if (!empty($objMod->dictionaries))
-							{
+							if (!empty($objMod->dictionaries)) {
 								//var_dump($objMod->dictionaries['tabname']);
 								$nbtabname = $nbtablib = $nbtabsql = $nbtabsqlsort = $nbtabfield = $nbtabfieldvalue = $nbtabfieldinsert = $nbtabrowid = $nbtabcond = $nbtabfieldcheck = $nbtabhelp = 0;
-								foreach ($objMod->dictionaries['tabname'] as $val) { $nbtabname++; $taborder[] = max($taborder) + 1; $tabname[] = $val; }		// Position
-								foreach ($objMod->dictionaries['tablib'] as $val) { $nbtablib++; $tablib[] = $val; }
-								foreach ($objMod->dictionaries['tabsql'] as $val) { $nbtabsql++; $tabsql[] = $val; }
-								foreach ($objMod->dictionaries['tabsqlsort'] as $val) { $nbtabsqlsort++; $tabsqlsort[] = $val; }
-								foreach ($objMod->dictionaries['tabfield'] as $val) { $nbtabfield++; $tabfield[] = $val; }
-								foreach ($objMod->dictionaries['tabfieldvalue'] as $val) { $nbtabfieldvalue++; $tabfieldvalue[] = $val; }
-								foreach ($objMod->dictionaries['tabfieldinsert'] as $val) { $nbtabfieldinsert++; $tabfieldinsert[] = $val; }
-								foreach ($objMod->dictionaries['tabrowid'] as $val) { $nbtabrowid++; $tabrowid[] = $val; }
-								foreach ($objMod->dictionaries['tabcond'] as $val) { $nbtabcond++; $tabcond[] = $val; }
-								if (!empty($objMod->dictionaries['tabhelp']))       foreach ($objMod->dictionaries['tabhelp'] as $val) { $nbtabhelp++; $tabhelp[] = $val; }
-								if (!empty($objMod->dictionaries['tabfieldcheck'])) foreach ($objMod->dictionaries['tabfieldcheck'] as $val) { $nbtabfieldcheck++; $tabfieldcheck[] = $val; }
+								foreach ($objMod->dictionaries['tabname'] as $val) {
+									$nbtabname++; $taborder[] = max($taborder) + 1; $tabname[] = $val;
+								}		// Position
+								foreach ($objMod->dictionaries['tablib'] as $val) {
+									$nbtablib++; $tablib[] = $val;
+								}
+								foreach ($objMod->dictionaries['tabsql'] as $val) {
+									$nbtabsql++; $tabsql[] = $val;
+								}
+								foreach ($objMod->dictionaries['tabsqlsort'] as $val) {
+									$nbtabsqlsort++; $tabsqlsort[] = $val;
+								}
+								foreach ($objMod->dictionaries['tabfield'] as $val) {
+									$nbtabfield++; $tabfield[] = $val;
+								}
+								foreach ($objMod->dictionaries['tabfieldvalue'] as $val) {
+									$nbtabfieldvalue++; $tabfieldvalue[] = $val;
+								}
+								foreach ($objMod->dictionaries['tabfieldinsert'] as $val) {
+									$nbtabfieldinsert++; $tabfieldinsert[] = $val;
+								}
+								foreach ($objMod->dictionaries['tabrowid'] as $val) {
+									$nbtabrowid++; $tabrowid[] = $val;
+								}
+								foreach ($objMod->dictionaries['tabcond'] as $val) {
+									$nbtabcond++; $tabcond[] = $val;
+								}
+								if (!empty($objMod->dictionaries['tabhelp'])) {
+									foreach ($objMod->dictionaries['tabhelp'] as $val) {
+										$nbtabhelp++; $tabhelp[] = $val;
+									}
+								}
+								if (!empty($objMod->dictionaries['tabfieldcheck'])) {
+									foreach ($objMod->dictionaries['tabfieldcheck'] as $val) {
+										$nbtabfieldcheck++; $tabfieldcheck[] = $val;
+									}
+								}
 
-								if ($nbtabname != $nbtablib || $nbtablib != $nbtabsql || $nbtabsql != $nbtabsqlsort)
-								{
+								if ($nbtabname != $nbtablib || $nbtablib != $nbtabsql || $nbtabsql != $nbtabsqlsort) {
 									print 'Error in descriptor of module '.$const_name.'. Array ->dictionaries has not same number of record for key "tabname", "tablib", "tabsql" and "tabsqlsort"';
 									//print "$const_name: $nbtabname=$nbtablib=$nbtabsql=$nbtabsqlsort=$nbtabfield=$nbtabfieldvalue=$nbtabfieldinsert=$nbtabrowid=$nbtabcond=$nbtabfieldcheck=$nbtabhelp\n";
 								} else {
@@ -1218,7 +1282,9 @@ function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tab
 
 							$j++;
 							$i++;
-						} else dol_syslog("Module ".get_class($objMod)." not qualified");
+						} else {
+							dol_syslog("Module ".get_class($objMod)." not qualified");
+						}
 					}
 				}
 			}
@@ -1245,21 +1311,16 @@ function activateModulesRequiredByCountry($country_code)
 
 	$modulesdir = dolGetModulesDirs();
 
-	foreach ($modulesdir as $dir)
-	{
+	foreach ($modulesdir as $dir) {
 		// Load modules attributes in arrays (name, numero, orders) from dir directory
 		dol_syslog("Scan directory ".$dir." for modules");
 		$handle = @opendir(dol_osencode($dir));
-		if (is_resource($handle))
-		{
-			while (($file = readdir($handle)) !== false)
-			{
-				if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php')
-				{
+		if (is_resource($handle)) {
+			while (($file = readdir($handle)) !== false) {
+				if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php') {
 					$modName = substr($file, 0, dol_strlen($file) - 10);
 
-					if ($modName)
-					{
+					if ($modName) {
 						include_once $dir.$file;
 						$objMod = new $modName($db);
 
@@ -1268,20 +1329,26 @@ function activateModulesRequiredByCountry($country_code)
 						// We discard modules according to features level (PS: if module is activated we always show it)
 						$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
 
-						if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
-						if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
-						if (!empty($conf->global->$const_name)) $modulequalified = 0; // already activated
+						if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							$modulequalified = 0;
+						}
+						if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							$modulequalified = 0;
+						}
+						if (!empty($conf->global->$const_name)) {
+							$modulequalified = 0; // already activated
+						}
 
-						if ($modulequalified)
-						{
+						if ($modulequalified) {
 							// Load languages files of module
-							if (isset($objMod->automatic_activation) && is_array($objMod->automatic_activation) && isset($objMod->automatic_activation[$country_code]))
-							{
+							if (isset($objMod->automatic_activation) && is_array($objMod->automatic_activation) && isset($objMod->automatic_activation[$country_code])) {
 								activateModule($modName);
 
 								setEventMessages($objMod->automatic_activation[$country_code], null, 'warnings');
 							}
-						} else dol_syslog("Module ".get_class($objMod)." not qualified");
+						} else {
+							dol_syslog("Module ".get_class($objMod)." not qualified");
+						}
 					}
 				}
 			}
@@ -1318,28 +1385,22 @@ function complete_elementList_with_modules(&$elementList)
 
 	$modulesdir = dolGetModulesDirs();
 
-	foreach ($modulesdir as $dir)
-	{
+	foreach ($modulesdir as $dir) {
 		// Load modules attributes in arrays (name, numero, orders) from dir directory
 		//print $dir."\n<br>";
 		dol_syslog("Scan directory ".$dir." for modules");
 		$handle = @opendir(dol_osencode($dir));
-		if (is_resource($handle))
-		{
-			while (($file = readdir($handle)) !== false)
-			{
+		if (is_resource($handle)) {
+			while (($file = readdir($handle)) !== false) {
 				//print "$i ".$file."\n<br>";
-				if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php')
-				{
+				if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php') {
 					$modName = substr($file, 0, dol_strlen($file) - 10);
 
-					if ($modName)
-					{
+					if ($modName) {
 						include_once $dir.$file;
 						$objMod = new $modName($db);
 
-						if ($objMod->numero > 0)
-						{
+						if ($objMod->numero > 0) {
 							$j = $objMod->numero;
 						} else {
 							$j = 1000 + $i;
@@ -1349,21 +1410,24 @@ function complete_elementList_with_modules(&$elementList)
 
 						// We discard modules according to features level (PS: if module is activated we always show it)
 						$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
-						if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && !$conf->global->$const_name) $modulequalified = 0;
-						if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && !$conf->global->$const_name) $modulequalified = 0;
+						if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && !$conf->global->$const_name) {
+							$modulequalified = 0;
+						}
+						if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && !$conf->global->$const_name) {
+							$modulequalified = 0;
+						}
 						//If module is not activated disqualified
-						if (empty($conf->global->$const_name)) $modulequalified = 0;
+						if (empty($conf->global->$const_name)) {
+							$modulequalified = 0;
+						}
 
-						if ($modulequalified)
-						{
+						if ($modulequalified) {
 							// Load languages files of module
-							if (isset($objMod->langfiles) && is_array($objMod->langfiles))
-							{
-							 	foreach ($objMod->langfiles as $langfile)
-							  	{
-							   		$langs->load($langfile);
-							   	}
-						   	}
+							if (isset($objMod->langfiles) && is_array($objMod->langfiles)) {
+								foreach ($objMod->langfiles as $langfile) {
+									$langs->load($langfile);
+								}
+							}
 
 							$modules[$i] = $objMod;
 							$filename[$i] = $modName;
@@ -1371,14 +1435,15 @@ function complete_elementList_with_modules(&$elementList)
 							$dirmod[$i] = $dir;
 							//print "x".$modName." ".$orders[$i]."\n<br>";
 
-							if (!empty($objMod->module_parts['contactelement']))
-							{
+							if (!empty($objMod->module_parts['contactelement'])) {
 								$elementList[$objMod->name] = $langs->trans($objMod->name);
 							}
 
 							$j++;
 							$i++;
-						} else dol_syslog("Module ".get_class($objMod)." not qualified");
+						} else {
+							dol_syslog("Module ".get_class($objMod)." not qualified");
+						}
 					}
 				}
 			}
@@ -1412,8 +1477,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
 	if (empty($strictw3c)) {
 		dol_syslog("Warning: Function form_constantes is calle with parameter strictw3c = 0, this is deprecated. Value must be 2 now.", LOG_DEBUG);
 	}
-	if (!empty($strictw3c) && $strictw3c == 1)
-	{
+	if (!empty($strictw3c) && $strictw3c == 1) {
 		print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="updateall">';
@@ -1426,19 +1490,19 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
 	$text = $langs->trans("Value");
 	print $form->textwithpicto($text, $helptext, 1, 'help', '', 0, 2, 'idhelptext');
 	print '</td>';
-	if (empty($strictw3c)) print '<td class="center" width="80">'.$langs->trans("Action").'</td>';
+	if (empty($strictw3c)) {
+		print '<td class="center" width="80">'.$langs->trans("Action").'</td>';
+	}
 	print "</tr>\n";
 
 	$label = '';
-	foreach ($tableau as $key => $const)	// Loop on each param
-	{
+	foreach ($tableau as $key => $const) {	// Loop on each param
 		$label = '';
 		// $const is a const key like 'MYMODULE_ABC'
 		if (is_numeric($key)) {		// Very old behaviour
 			$type = 'string';
 		} else {
-			if (is_array($const))
-			{
+			if (is_array($const)) {
 				$type = $const['type'];
 				$label = $const['label'];
 				$const = $key;
@@ -1461,17 +1525,14 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
 		$result = $db->query($sql);
 
 		dol_syslog("List params", LOG_DEBUG);
-		if ($result)
-		{
+		if ($result) {
 			$obj = $db->fetch_object($result); // Take first result of select
 
-			if (empty($obj))	// If not yet into table
-			{
+			if (empty($obj)) {	// If not yet into table
 				$obj = (object) array('rowid'=>'', 'name'=>$const, 'value'=>'', 'type'=>$type, 'note'=>'');
 			}
 
-			if (empty($strictw3c))
-			{
+			if (empty($strictw3c)) {
 				print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
 			}
@@ -1480,7 +1541,9 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
 
 			// Show constant
 			print '<td>';
-			if (empty($strictw3c)) print '<input type="hidden" name="action" value="update">';
+			if (empty($strictw3c)) {
+				print '<input type="hidden" name="action" value="update">';
+			}
 			print '<input type="hidden" name="rowid'.(empty($strictw3c) ? '' : '[]').'" value="'.$obj->rowid.'">';
 			print '<input type="hidden" name="constname'.(empty($strictw3c) ? '' : '[]').'" value="'.$const.'">';
 			print '<input type="hidden" name="constnote_'.$obj->name.'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
@@ -1488,30 +1551,29 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
 
 			print ($label ? $label : $langs->trans('Desc'.$const));
 
-			if ($const == 'ADHERENT_MAILMAN_URL')
-			{
+			if ($const == 'ADHERENT_MAILMAN_URL') {
 				print '. '.$langs->trans("Example").': <a href="#" id="exampleclick1">'.img_down().'</a><br>';
 				//print 'http://lists.exampe.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&subscribees=%EMAIL%&send_welcome_msg_to_this_batch=1';
 				print '<div id="example1" class="hidden">';
 				print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/add?subscribees_upload=%EMAIL%&amp;adminpw=%MAILMAN_ADMINPW%&amp;subscribe_or_invite=0&amp;send_welcome_msg_to_this_batch=0&amp;notification_to_list_owner=0';
 				print '</div>';
 			}
-			if ($const == 'ADHERENT_MAILMAN_UNSUB_URL')
-			{
+			if ($const == 'ADHERENT_MAILMAN_UNSUB_URL') {
 				print '. '.$langs->trans("Example").': <a href="#" id="exampleclick2">'.img_down().'</a><br>';
 				print '<div id="example2" class="hidden">';
 				print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/remove?unsubscribees_upload=%EMAIL%&amp;adminpw=%MAILMAN_ADMINPW%&amp;send_unsub_ack_to_this_batch=0&amp;send_unsub_notifications_to_list_owner=0';
 				print '</div>';
 				//print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/remove?adminpw=%MAILMAN_ADMINPW%&unsubscribees=%EMAIL%';
 			}
-			if ($const == 'ADHERENT_MAILMAN_LISTS')
-			{
+			if ($const == 'ADHERENT_MAILMAN_LISTS') {
 				print '. '.$langs->trans("Example").': <a href="#" id="exampleclick3">'.img_down().'</a><br>';
 				print '<div id="example3" class="hidden">';
 				print 'mymailmanlist<br>';
 				print 'mymailmanlist1,mymailmanlist2<br>';
 				print 'TYPE:Type1:mymailmanlist1,TYPE:Type2:mymailmanlist2<br>';
-				if ($conf->categorie->enabled) print 'CATEG:Categ1:mymailmanlist1,CATEG:Categ2:mymailmanlist2<br>';
+				if ($conf->categorie->enabled) {
+					print 'CATEG:Categ1:mymailmanlist1,CATEG:Categ2:mymailmanlist2<br>';
+				}
 				print '</div>';
 				//print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/remove?adminpw=%MAILMAN_ADMINPW%&unsubscribees=%EMAIL%';
 			}
@@ -1519,14 +1581,12 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
 			print "</td>\n";
 
 			// Value
-			if ($const == 'ADHERENT_CARD_TYPE' || $const == 'ADHERENT_ETIQUETTE_TYPE')
-			{
+			if ($const == 'ADHERENT_CARD_TYPE' || $const == 'ADHERENT_ETIQUETTE_TYPE') {
 				print '<td>';
 				// List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php)
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';
 				$arrayoflabels = array();
-				foreach (array_keys($_Avery_Labels) as $codecards)
-				{
+				foreach (array_keys($_Avery_Labels) as $codecards) {
 					$arrayoflabels[$codecards] = $_Avery_Labels[$codecards]['name'];
 				}
 				print $form->selectarray('constvalue'.(empty($strictw3c) ? '' : '[]'), $arrayoflabels, ($obj->value ? $obj->value : 'CARD'), 1, 0, 0);
@@ -1537,21 +1597,17 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
 				print '<td>';
 				print '<input type="hidden" name="consttype'.(empty($strictw3c) ? '' : '[]').'" value="'.($obj->type ? $obj->type : 'string').'">';
 				print '<input type="hidden" name="constnote'.(empty($strictw3c) ? '' : '[]').'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
-				if ($obj->type == 'textarea' || in_array($const, array('ADHERENT_CARD_TEXT', 'ADHERENT_CARD_TEXT_RIGHT', 'ADHERENT_ETIQUETTE_TEXT')))
-				{
+				if ($obj->type == 'textarea' || in_array($const, array('ADHERENT_CARD_TEXT', 'ADHERENT_CARD_TEXT_RIGHT', 'ADHERENT_ETIQUETTE_TEXT'))) {
 					print '<textarea class="flat" name="constvalue'.(empty($strictw3c) ? '' : '[]').'" cols="50" rows="5" wrap="soft">'."\n";
 					print $obj->value;
 					print "</textarea>\n";
-				} elseif ($obj->type == 'html')
-				{
+				} elseif ($obj->type == 'html') {
 					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 					$doleditor = new DolEditor('constvalue_'.$const.(empty($strictw3c) ? '' : '[]'), $obj->value, '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
 					$doleditor->Create();
-				} elseif ($obj->type == 'yesno')
-				{
+				} elseif ($obj->type == 'yesno') {
 					print $form->selectyesno('constvalue'.(empty($strictw3c) ? '' : '[]'), $obj->value, 1);
-				} elseif (preg_match('/emailtemplate/', $obj->type))
-				{
+				} elseif (preg_match('/emailtemplate/', $obj->type)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 					$formmail = new FormMail($db);
 
@@ -1560,13 +1616,13 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
 					$nboftemplates = $formmail->fetchAllEMailTemplate($tmp[1], $user, null, -1); // We set lang=null to get in priority record with no lang
 					//$arraydefaultmessage = $formmail->getEMailTemplate($db, $tmp[1], $user, null, 0, 1, '');
 					$arrayofmessagename = array();
-					if (is_array($formmail->lines_model))
-					{
-						foreach ($formmail->lines_model as $modelmail)
-						{
+					if (is_array($formmail->lines_model)) {
+						foreach ($formmail->lines_model as $modelmail) {
 							//var_dump($modelmail);
 							$moreonlabel = '';
-							if (!empty($arrayofmessagename[$modelmail->label])) $moreonlabel = ' <span class="opacitymedium">('.$langs->trans("SeveralLangugeVariatFound").')</span>';
+							if (!empty($arrayofmessagename[$modelmail->label])) {
+								$moreonlabel = ' <span class="opacitymedium">('.$langs->trans("SeveralLangugeVariatFound").')</span>';
+							}
 							// The 'label' is the key that is unique if we exclude the language
 							$arrayofmessagename[$modelmail->label.':'.$tmp[1]] = $langs->trans(preg_replace('/\(|\)/', '', $modelmail->label)).$moreonlabel;
 						}
@@ -1581,21 +1637,21 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
 				print '</td>';
 			}
 			// Submit
-			if (empty($strictw3c))
-			{
+			if (empty($strictw3c)) {
 				print '<td class="center">';
 				print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
 				print "</td>";
 			}
 			print "</tr>\n";
 
-			if (empty($strictw3c)) print "</form>\n";
+			if (empty($strictw3c)) {
+				print "</form>\n";
+			}
 		}
 	}
 	print '</table>';
 
-	if (!empty($strictw3c) && $strictw3c == 1)
-	{
+	if (!empty($strictw3c) && $strictw3c == 1) {
 		print '<div align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
 		print "</form>\n";
 	}
@@ -1616,18 +1672,22 @@ function showModulesExludedForExternal($modules)
 	$listofmodules = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
 	$i = 0;
 	if (!empty($modules)) {
-		foreach ($modules as $module)
-		{
+		foreach ($modules as $module) {
 			$moduleconst = $module->const_name;
 			$modulename = strtolower($module->name);
 			//print 'modulename='.$modulename;
 
 			//if (empty($conf->global->$moduleconst)) continue;
-			if (!in_array($modulename, $listofmodules)) continue;
+			if (!in_array($modulename, $listofmodules)) {
+				continue;
+			}
 			//var_dump($modulename.' - '.$langs->trans('Module'.$module->numero.'Name'));
 
-			if ($i > 0) $text .= ', ';
-			else $text .= ' ';
+			if ($i > 0) {
+				$text .= ', ';
+			} else {
+				$text .= ' ';
+			}
 			$i++;
 			$text .= $langs->trans('Module'.$module->numero.'Name');
 		}
@@ -1659,8 +1719,7 @@ function addDocumentModel($name, $type, $label = '', $description = '')
 
 	dol_syslog("admin.lib::addDocumentModel", LOG_DEBUG);
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$db->commit();
 		return 1;
 	} else {
@@ -1690,8 +1749,7 @@ function delDocumentModel($name, $type)
 
 	dol_syslog("admin.lib::delDocumentModel", LOG_DEBUG);
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$db->commit();
 		return 1;
 	} else {
@@ -1717,17 +1775,14 @@ function phpinfo_array()
 	$info_arr = array();
 	$info_lines = explode("\n", strip_tags($phpinfostring, "<tr><td><h2>"));
 	$cat = "General";
-	foreach ($info_lines as $line)
-	{
+	foreach ($info_lines as $line) {
 		// new cat?
 		$title = array();
 		preg_match("~<h2>(.*)</h2>~", $line, $title) ? $cat = $title[1] : null;
 		$val = array();
-		if (preg_match("~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~", $line, $val))
-		{
+		if (preg_match("~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~", $line, $val)) {
 			$info_arr[trim($cat)][trim($val[1])] = $val[2];
-		} elseif (preg_match("~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~", $line, $val))
-		{
+		} elseif (preg_match("~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~", $line, $val)) {
 			$info_arr[trim($cat)][trim($val[1])] = array("local" => $val[2], "master" => $val[3]);
 		}
 	}
@@ -1751,10 +1806,10 @@ function company_admin_prepare_head()
 	$head[$h][2] = 'company';
 	$h++;
 
-   	$head[$h][0] = DOL_URL_ROOT."/admin/openinghours.php";
-   	$head[$h][1] = $langs->trans("OpeningHours");
-   	$head[$h][2] = 'openinghours';
-   	$h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/openinghours.php";
+	$head[$h][1] = $langs->trans("OpeningHours");
+	$head[$h][2] = 'openinghours';
+	$h++;
 
 	$head[$h][0] = DOL_URL_ROOT."/admin/accountant.php";
 	$head[$h][1] = $langs->trans("Accountant");
@@ -1780,23 +1835,20 @@ function email_admin_prepare_head()
 	$h = 0;
 	$head = array();
 
-	if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates'))
-	{
+	if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates')) {
 		$head[$h][0] = DOL_URL_ROOT."/admin/mails.php";
 		$head[$h][1] = $langs->trans("OutGoingEmailSetup");
 		$head[$h][2] = 'common';
 		$h++;
 
-		if ($conf->mailing->enabled)
-		{
+		if ($conf->mailing->enabled) {
 			$head[$h][0] = DOL_URL_ROOT."/admin/mails_emailing.php";
 			$head[$h][1] = $langs->trans("OutGoingEmailSetupForEmailing", $langs->transnoentitiesnoconv("EMailing"));
 			$head[$h][2] = 'common_emailing';
 			$h++;
 		}
 
-		if ($conf->ticket->enabled)
-		{
+		if ($conf->ticket->enabled) {
 			$head[$h][0] = DOL_URL_ROOT."/admin/mails_ticket.php";
 			$head[$h][1] = $langs->trans("OutGoingEmailSetupForEmailing", $langs->transnoentitiesnoconv("Ticket"));
 			$head[$h][2] = 'common_ticket';
@@ -1809,8 +1861,7 @@ function email_admin_prepare_head()
 	$head[$h][2] = 'templates';
 	$h++;
 
-	if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates'))
-	{
+	if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates')) {
 		$head[$h][0] = DOL_URL_ROOT."/admin/mails_senderprofile_list.php";
 		$head[$h][1] = $langs->trans("EmailSenderProfiles");
 		$head[$h][2] = 'senderprofiles';

From d89970ddd1244fa91a8d0aa9299476d4100f3461 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 4 Dec 2020 19:31:53 +0000
Subject: [PATCH 163/888] Fixing style errors.

---
 htdocs/admin/modules.php      | 2 +-
 htdocs/core/lib/admin.lib.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 7d6a3ff0454..e9984316394 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -720,7 +720,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 
 		// Activate/Disable and Setup (2 columns)
 		if (!empty($conf->global->$const_name)) {	// If module is already activated
-		// Set $codeenabledisable
+			// Set $codeenabledisable
 			$disableSetup = 0;
 			if (!empty($arrayofwarnings[$modName])) {
 				$codeenabledisable .= '<!-- This module has a warning to show when we activate it (note: your country is '.$mysoc->country_code.') -->'."\n";
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 5206b7a47b7..b8cdf8cd085 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -241,7 +241,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 			//print $buf.'<br>';exit;
 
 			if (preg_match('/;/', $buffer)) {	// If string contains ';', it's end of a request string, we save it in arraysql.
-			// Found new request
+				// Found new request
 				if ($buffer) {
 					$arraysql[$i] = $buffer;
 				}

From 05a560c2e3a732da1b2e636474a026361022b58f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Dec 2020 20:43:11 +0100
Subject: [PATCH 164/888] Fix warning

---
 htdocs/contact/class/contact.class.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 6c6133e906a..367a2e7cd62 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -1336,9 +1336,10 @@ class Contact extends CommonObject
 		if (!empty($this->poste)) $label .= '<br><b>'.$langs->trans("Poste").':</b> '.$this->poste;
 		$label .= '<br><b>'.$langs->trans("EMail").':</b> '.$this->email;
 		$phonelist = array();
-		if ($this->phone_pro) $phonelist[] = dol_print_phone($this->phone_pro, $this->country_code, $this->id, 0, '', '&nbsp;', 'phone');
-		if ($this->phone_mobile) $phonelist[] = dol_print_phone($this->phone_mobile, $this->country_code, $this->id, 0, '', '&nbsp;', 'mobile');
-		if ($this->phone_perso) $phonelist[] = dol_print_phone($this->phone_perso, $this->country_code, $this->id, 0, '', '&nbsp;', 'phone');
+		$country_code = empty($this->country_code) ? '': $this->country_code;
+		if ($this->phone_pro) $phonelist[] = dol_print_phone($this->phone_pro, $country_code, $this->id, 0, '', '&nbsp;', 'phone');
+		if ($this->phone_mobile) $phonelist[] = dol_print_phone($this->phone_mobile, $country_code, $this->id, 0, '', '&nbsp;', 'mobile');
+		if ($this->phone_perso) $phonelist[] = dol_print_phone($this->phone_perso, $country_code, $this->id, 0, '', '&nbsp;', 'phone');
 		$label .= '<br><b>'.$langs->trans("Phone").':</b> '.implode('&nbsp;', $phonelist);
 		$label .= '<br><b>'.$langs->trans("Address").':</b> '.dol_format_address($this, 1, ' ', $langs);
 

From 4039ca269fa7182b75b274cd49d37df412ef60d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Fri, 4 Dec 2020 21:08:51 +0100
Subject: [PATCH 165/888] fix translation removing html

---
 htdocs/admin/tools/purge.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php
index d450b5aa888..e9d0f5a8ac1 100644
--- a/htdocs/admin/tools/purge.php
+++ b/htdocs/admin/tools/purge.php
@@ -90,18 +90,18 @@ print '<table class="border centpercent">';
 
 print '<tr class="border"><td style="padding: 4px">';
 
-if (!empty($conf->syslog->enabled))
-{
+if (!empty($conf->syslog->enabled)) {
 	print '<input type="radio" name="choice" value="logfile"';
 	print ($choice && $choice == 'logfile') ? ' checked' : '';
 	$filelogparam = $filelog;
-	if ($user->admin && preg_match('/^dolibarr.*\.log$/', basename($filelog)))
-	{
+	if ($user->admin && preg_match('/^dolibarr.*\.log$/', basename($filelog))) {
 		$filelogparam = '<a class="wordbreak" href="'.DOL_URL_ROOT.'/document.php?modulepart=logs&file=';
 		$filelogparam .= basename($filelog);
 		$filelogparam .= '">'.$filelog.'</a>';
 	}
-	print '> '.$langs->trans("PurgeDeleteLogFile", $filelogparam);
+	$desc = $langs->trans("PurgeDeleteLogFile", '{filelogparam}');
+	$desc = str_replace('{filelogparam}', $filelogparam, $desc);
+	print '> '.$desc;
 	print '<br><br>';
 }
 
@@ -123,8 +123,7 @@ print '</td></tr></table>';
 
 print '</form>';
 
-if (preg_match('/^confirm/i', $choice))
-{
+if (preg_match('/^confirm/i', $choice)) {
 	print '<br>';
 	$formquestion = array();
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?choice=allfiles', $langs->trans('Purge'), $langs->trans('ConfirmPurge').img_warning().' ', 'purge', $formquestion, 'no', 2);

From 0536ed87a2818166d04a59c4de2f6faf6e1e8c55 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Dec 2020 21:38:33 +0100
Subject: [PATCH 166/888] Avoid to process too large user agent

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8813cb4daa9..890c16627aa 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -154,6 +154,8 @@ function getBrowserInfo($user_agent)
 	$os = 'unknown';
 	$phone = '';
 
+	$user_agent = substr($user_agent, 0, 512);	// Avoid to process too large user agent
+
 	$detectmobile = new Mobile_Detect(null, $user_agent);
 	$tablet = $detectmobile->isTablet();
 

From d8b01d9a3301d1c648357556d07da2ed4add293d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Dec 2020 22:12:20 +0100
Subject: [PATCH 167/888] Fix chart is default graph lib

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

diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 0ff627ba20c..1f5cc82825e 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -41,7 +41,7 @@ class DolGraph
 {
 	public $type = array(); // Array with type of each series. Example: array('bars', 'lines', ...)
 	public $mode = 'side'; // Mode bars graph: side, depth
-	private $_library = 'jflot'; // Graphic library to use (jflot, artichow)
+	private $_library = 'chart'; // Graphic library to use (jflot, chart, artichow)
 
 	//! Array of data
 	public $data; // Data of graph: array(array('abs1',valA1,valB1), array('abs2',valA2,valB2), ...)
@@ -115,7 +115,7 @@ class DolGraph
 
 		$this->_library = $library;
 		if ($this->_library == 'auto') {
-			$this->_library = (empty($conf->global->MAIN_JS_GRAPH) ? 'jflot' : $conf->global->MAIN_JS_GRAPH);
+			$this->_library = (empty($conf->global->MAIN_JS_GRAPH) ? 'chart' : $conf->global->MAIN_JS_GRAPH);
 		}
 	}
 

From af1bb093383bb4b46b6b4d9030acf31cc58f34e0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Dec 2020 22:30:34 +0100
Subject: [PATCH 168/888] NEW: Graphics can be horizontal bars.

---
 ChangeLog                            | 1 +
 htdocs/core/class/dolgraph.class.php | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2d0fd358c2b..7b685eb3381 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -216,6 +216,7 @@ NEW: add a message in error_log after detection of SQL or script injection
 NEW: add __TYPE__ substitution key
 NEW: add validation of MX domain for emails
 NEW: calculate the virtual stock in transverse mode ( not on getEntity('commande'), ... but on getEntity('stock') )
+NEW: Graphics can be horizontal bars.
 
 HOOKs
 NEW: Hook on propal card
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 1f5cc82825e..80314bcf9ed 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -39,7 +39,7 @@
  */
 class DolGraph
 {
-	public $type = array(); // Array with type of each series. Example: array('bars', 'lines', ...)
+	public $type = array(); // Array with type of each series. Example: array('bars', 'horizontalbars', 'lines', 'pies', 'piesemicircle', 'polar'...)
 	public $mode = 'side'; // Mode bars graph: side, depth
 	private $_library = 'chart'; // Graphic library to use (jflot, chart, artichow)
 
@@ -261,7 +261,7 @@ class DolGraph
 	 * Set type
 	 *
 	 * @param 	array	$type		Array with type for each serie. Example: array('type1', 'type2', ...) where type can be:
-	 * 								'pie', 'piesemicircle', 'polar', 'lines', 'linesnopoint', 'bars', ...
+	 * 								'pie', 'piesemicircle', 'polar', 'lines', 'linesnopoint', 'bars', 'horirontalbars'...
 	 * @return	void
 	 */
 	public function SetType($type)
@@ -1156,6 +1156,7 @@ class DolGraph
 		else {
 			$type = 'bar';
 			if (!isset($this->type[$firstlot]) || $this->type[$firstlot] == 'bars') $type = 'bar';
+			if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'horizontalbars') $type = 'horizontalBar';
 			if (isset($this->type[$firstlot]) && ($this->type[$firstlot] == 'lines' || $this->type[$firstlot] == 'linesnopoint')) $type = 'line';
 
 			$this->stringtoshow .= 'var options = { maintainAspectRatio: false, aspectRatio: 2.5, ';

From 613ed8bcfa372099c1c33bc216f7fe3d3c1faf14 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Dec 2020 23:50:55 +0100
Subject: [PATCH 169/888] FIX No use of $_SESSION into master.inc.php

---
 htdocs/index.php      |  2 --
 htdocs/main.inc.php   | 45 ++++++++++++++++++++++++++++++++++++++++++-
 htdocs/master.inc.php | 28 +--------------------------
 htdocs/user/card.php  |  3 +--
 4 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/htdocs/index.php b/htdocs/index.php
index 33fd93e649e..a4060278c50 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -101,8 +101,6 @@ if (!empty($conf->global->MAIN_MOTD))
 
 
 
-
-
 /*
  * Dashboard Dolibarr states (statistics)
  * Hidden for external users
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 90e173ec168..0c54b68734d 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -250,8 +250,51 @@ if (!defined('NOSESSION'))
 	session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
 	session_name($sessionname);
 	session_start();
+
+	// By default conf->entity is 1, but we change this if we ask another value.
+	if (session_id() && !empty($_SESSION["dol_entity"])) {
+		// Entity inside an opened session
+		$conf->entity = $_SESSION["dol_entity"];
+	} elseif (!empty($_ENV["dol_entity"])) {
+		// Entity inside a CLI script
+		$conf->entity = $_ENV["dol_entity"];
+	} elseif (GETPOSTISSET("loginfunction") && GETPOST("entity", 'int')) {
+		// Just after a login page
+		$conf->entity = GETPOST("entity", 'int');
+	} elseif (defined('DOLENTITY') && is_numeric(constant('DOLENTITY'))) {
+		// For public page with MultiCompany module
+		$conf->entity = constant('DOLENTITY');
+	}
 }
 
+
+// If software has been locked. Only login $conf->global->MAIN_ONLY_LOGIN_ALLOWED is allowed.
+if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
+{
+	$ok = 0;
+	if ((!session_id() || !isset($_SESSION["dol_login"])) && !isset($_POST["username"]) && !empty($_SERVER["GATEWAY_INTERFACE"])) $ok = 1; // We let working pages if not logged and inside a web browser (login form, to allow login by admin)
+	elseif (isset($_POST["username"]) && $_POST["username"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok = 1; // We let working pages that is a login submission (login submit, to allow login by admin)
+	elseif (defined('NOREQUIREDB'))   $ok = 1; // We let working pages that don't need database access (xxx.css.php)
+	elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) $ok = 1; // We let working pages that ask to work even if only login enabled (logout.php)
+	elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok = 1; // We let working if user is allowed admin
+	if (!$ok)
+	{
+		if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != $conf->global->MAIN_ONLY_LOGIN_ALLOWED)
+		{
+			print 'Sorry, your application is offline.'."\n";
+			print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
+			$nexturl = DOL_URL_ROOT.'/user/logout.php';
+			print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";
+		} else {
+			print 'Sorry, your application is offline. Only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
+			$nexturl = DOL_URL_ROOT.'/';
+			print 'Please try later or <a href="'.$nexturl.'">click here to change login user</a>...'."\n";
+		}
+		exit;
+	}
+}
+
+
 // Activate end of page function
 register_shutdown_function('dol_shutdown');
 
@@ -2586,7 +2629,7 @@ function main_area($title = '')
 
 	print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
 
-	if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED));
+	if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED), 0, 0, 1, 'warning maintenancemode');
 
 	// Permit to add user company information on each printed document by set SHOW_SOCINFO_ON_PRINT
 	if (!empty($conf->global->SHOW_SOCINFO_ON_PRINT) && GETPOST('optioncss', 'aZ09') == 'print' && empty(GETPOST('disable_show_socinfo_on_print', 'az09')))
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 5c6f2d9359e..28790c3c5a3 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -203,32 +203,6 @@ if (empty($conf->global->MAILING_LIMIT_SENDBYCLI))
 	$conf->global->MAILING_LIMIT_SENDBYCLI = 0;
 }
 
-// If software has been locked. Only login $conf->global->MAIN_ONLY_LOGIN_ALLOWED is allowed.
-if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
-{
-	$ok = 0;
-	if ((!session_id() || !isset($_SESSION["dol_login"])) && !isset($_POST["username"]) && !empty($_SERVER["GATEWAY_INTERFACE"])) $ok = 1; // We let working pages if not logged and inside a web browser (login form, to allow login by admin)
-	elseif (isset($_POST["username"]) && $_POST["username"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok = 1; // We let working pages that is a login submission (login submit, to allow login by admin)
-	elseif (defined('NOREQUIREDB'))   $ok = 1; // We let working pages that don't need database access (xxx.css.php)
-	elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) $ok = 1; // We let working pages that ask to work even if only login enabled (logout.php)
-	elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok = 1; // We let working if user is allowed admin
-	if (!$ok)
-	{
-		if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != $conf->global->MAIN_ONLY_LOGIN_ALLOWED)
-		{
-			print 'Sorry, your application is offline.'."\n";
-			print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
-			$nexturl = DOL_URL_ROOT.'/user/logout.php';
-			print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";
-		} else {
-			print 'Sorry, your application is offline. Only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
-			$nexturl = DOL_URL_ROOT.'/';
-			print 'Please try later or <a href="'.$nexturl.'">click here to change login user</a>...'."\n";
-		}
-		exit;
-	}
-}
-
 // Create object $mysoc (A thirdparty object that contains properties of companies managed by Dolibarr.
 if (!defined('NOREQUIREDB') && !defined('NOREQUIRESOC'))
 {
@@ -245,7 +219,7 @@ if (!defined('NOREQUIREDB') && !defined('NOREQUIRESOC'))
 // Set default language (must be after the setValues setting global $conf->global->MAIN_LANG_DEFAULT. Page main.inc.php will overwrite langs->defaultlang with user value later)
 if (!defined('NOREQUIRETRAN'))
 {
-	$langcode = (GETPOST('lang', 'aZ09') ?GETPOST('lang', 'aZ09', 1) : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
+	$langcode = (GETPOST('lang', 'aZ09') ? GETPOST('lang', 'aZ09', 1) : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
 	if (defined('MAIN_LANG_DEFAULT')) $langcode = constant('MAIN_LANG_DEFAULT');
 	$langs->setDefaultLang($langcode);
 }
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index ba7cd546d54..8934d8d87ec 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1840,8 +1840,7 @@ if ($action == 'create' || $action == 'adduserldap')
 
 				if ($caneditfield && (empty($conf->multicompany->enabled) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
 				{
-					if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
-					{
+					if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("DisabledInMonoUserMode")).'">'.$langs->trans("Modify").'</a></div>';
 					} else {
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>';

From 9cfb0ac969edde1428ee693f048b1511daf69a12 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Dec 2020 23:55:47 +0100
Subject: [PATCH 170/888] Clean API

---
 htdocs/api/class/api_setup.class.php            | 8 ++++++++
 htdocs/societe/class/api_thirdparties.class.php | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 02bb5afbafd..5e6abbeeb6e 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -1608,6 +1608,14 @@ class Setup extends DolibarrApi
 	{
 		global $mysoc;
 
+		unset($mysoc->skype);
+		unset($mysoc->twitter);
+		unset($mysoc->facebook);
+		unset($mysoc->linkedin);
+
+		unset($mysoc->note);
+		unset($mysoc->lines);
+
 		return $this->_cleanObjectDatas($mysoc);
 	}
 
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index ce2689a990e..7a793b04a8c 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -1762,6 +1762,11 @@ class Thirdparties extends DolibarrApi
 
 		unset($object->fk_delivery_address); // deprecated feature
 
+		unset($object->skype);
+		unset($object->twitter);
+		unset($object->facebook);
+		unset($object->linkedin);
+
 		return $object;
 	}
 

From 6332ce5eea1fd7619c5ee93ad39feb19bdae6f01 Mon Sep 17 00:00:00 2001
From: Alfredo Altamirano <Ahuahuachi@users.noreply.github.com>
Date: Fri, 4 Dec 2020 17:01:56 -0600
Subject: [PATCH 171/888] Translate phpDocs

---
 .../fourn/class/fournisseur.facture.class.php | 60 +++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 09c74dd5d92..0073b7d3f77 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -336,7 +336,7 @@ class FactureFournisseur extends CommonInvoice
 	/**
 	 *    Create supplier invoice into database
 	 *
-	 *    @param      User		$user       object utilisateur qui cree
+	 *    @param      User		$user       user object that creates
 	 *    @return     int    	     		Id invoice created if OK, < 0 if KO
 	 */
 	public function create($user)
@@ -1251,8 +1251,8 @@ class FactureFournisseur extends CommonInvoice
 	 *  Tag invoice as a payed invoice
 	 *
 	 *	@param  User	$user       Object user
-	 *	@param  string	$close_code	Code renseigne si on classe a payee completement alors que paiement incomplet. Not implementd yet.
-	 *	@param  string	$close_note	Commentaire renseigne si on classe a payee alors que paiement incomplet. Not implementd yet.
+	 *	@param  string	$close_code	Code indicates whether the class has paid in full while payment is incomplete. Not implementd yet.
+	 *	@param  string	$close_note	Comment informs if the class has been paid while payment is incomplete. Not implementd yet.
 	 *	@return int         		<0 si ko, >0 si ok
 	 */
 	public function set_paid($user, $close_code = '', $close_note = '')
@@ -1294,9 +1294,9 @@ class FactureFournisseur extends CommonInvoice
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *	Tag la facture comme non payee completement + appel trigger BILL_UNPAYED
-	 *	Fonction utilisee quand un paiement prelevement est refuse,
-	 *	ou quand une facture annulee et reouverte.
+	 *	Tag the invoice as not fully paid + trigger call BILL_UNPAYED
+	 *	Function used when a direct debit payment is refused,
+	 *	or when the invoice was canceled and reopened.
 	 *
 	 *	@param      User	$user       Object user that change status
 	 *	@return     int         		<0 si ok, >0 si ok
@@ -1579,25 +1579,25 @@ class FactureFournisseur extends CommonInvoice
 
 
 	/**
-	 *	Ajoute une ligne de facture (associe a aucun produit/service predefini)
-	 *	Les parametres sont deja cense etre juste et avec valeurs finales a l'appel
-	 *	de cette methode. Aussi, pour le taux tva, il doit deja avoir ete defini
-	 *	par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,idprod)
-	 *	et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue).
+	 *	Adds an invoice line (associated with no predefined product/service)
+	 *	The parameters are already supposed to be correct and with final values when calling
+	 *	this method. Also, for the VAT rate, it must already have been defined by the caller by
+	 *	by the get_default_tva method(vendor_company, buying company, idprod) and the desc must
+	 *	already have the right value (the caller has to manage the multilanguage).
 	 *
-	 *	@param    	string	$desc            	Description de la ligne
-	 *	@param    	double	$pu              	Prix unitaire (HT ou TTC selon price_base_type, > 0 even for credit note)
+	 *	@param    	string	$desc            	Description of the line
+	 *	@param    	double	$pu              	Unit price (HT or TTC according to price_base_type, > 0 even for credit note)
 	 *	@param    	double	$txtva           	Force Vat rate to use, -1 for auto.
 	 *	@param		double	$txlocaltax1		LocalTax1 Rate
 	 *	@param		double	$txlocaltax2		LocalTax2 Rate
-	 *	@param    	double	$qty             	Quantite
+	 *	@param    	double	$qty             	Quantity
 	 *	@param    	int		$fk_product      	Product/Service ID predefined
 	 *	@param    	double	$remise_percent  	Percentage discount of the line
-	 *	@param    	integer	$date_start      	Date de debut de validite du service
-	 * 	@param    	integer	$date_end        	Date de fin de validite du service
-	 * 	@param    	string	$ventil          	Code de ventilation comptable
-	 *	@param    	int		$info_bits			Bits de type de lines
-	 *	@param    	string	$price_base_type 	HT ou TTC
+	 *	@param    	integer	$date_start      	Service start date
+	 * 	@param    	integer	$date_end        	Service expiry date
+	 * 	@param    	string	$ventil          	Accounting breakdown code
+	 *	@param    	int		$info_bits			Line type bits
+	 *	@param    	string	$price_base_type 	HT or TTC
 	 *	@param		int		$type				Type of line (0=product, 1=service)
 	 *  @param      int		$rang            	Position of line
 	 *  @param		int		$notrigger			Disable triggers
@@ -2046,9 +2046,9 @@ class FactureFournisseur extends CommonInvoice
 
 
 	/**
-	 *	Charge les informations d'ordre info dans l'objet facture
+	 *	Loads the info order information into the invoice object
 	 *
-	 *	@param  int		$id       	Id de la facture a charger
+	 *	@param  int		$id       	Id of the invoice to load
 	 *	@return	void
 	 */
 	public function info($id)
@@ -2095,11 +2095,11 @@ class FactureFournisseur extends CommonInvoice
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *	Renvoi liste des factures remplacables
-	 *	Statut validee ou abandonnee pour raison autre + non payee + aucun paiement + pas deja remplacee
+	 *	Return list of replaceable invoices
+	 *	Status valid or abandoned for other reason + not paid + no payment + not already replaced
 	 *
-	 *	@param      int		$socid		Id societe
-	 *	@return    	array|int			Tableau des factures ('id'=>id, 'ref'=>ref, 'status'=>status, 'paymentornot'=>0/1)
+	 *	@param      int		$socid		Thirdparty id
+	 *	@return    	array|int			Table of invoices ('id'=>id, 'ref'=>ref, 'status'=>status, 'paymentornot'=>0/1)
 	 *                                  <0 if error
 	 */
 	public function list_replacable_supplier_invoices($socid = 0)
@@ -2144,12 +2144,12 @@ class FactureFournisseur extends CommonInvoice
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *	Renvoi liste des factures qualifiables pour correction par avoir
-	 *	Les factures qui respectent les regles suivantes sont retournees:
-	 *	(validee + paiement en cours) ou classee (payee completement ou payee partiellement) + pas deja remplacee + pas deja avoir
+	 *	Return list of qualifying invoices for correction by credit note
+	 *	Invoices that respect the following rules are returned:
+	 *	(validated + payment in progress) or classified (paid in full or paid in part) + not already replaced + not already having
 	 *
-	 *	@param		int		$socid		Id societe
-	 *	@return    	array|int			Tableau des factures ($id => array('ref'=>,'paymentornot'=>,'status'=>,'paye'=>)
+	 *	@param		int		$socid		Thirdparty id
+	 *	@return    	array|int			Table of invoices ($id => array('ref'=>,'paymentornot'=>,'status'=>,'paye'=>)
 	 *                                  <0 if error
 	 */
 	public function list_qualified_avoir_supplier_invoices($socid = 0)

From fb3c4ab8657a71cff3fcebbec1a4e891d24e924a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Dec 2020 00:02:40 +0100
Subject: [PATCH 172/888] Clean returned object with APIs

---
 htdocs/api/class/api.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 80a608a0581..c8ff1078977 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -113,6 +113,7 @@ class DolibarrApi
 
 		unset($object->error);
 		unset($object->errors);
+		unset($object->errorhidden);
 
 		unset($object->ref_previous);
 		unset($object->ref_next);

From cccc670c05c7d7a7948940c7ef2b9799a38f7e61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 5 Dec 2020 08:45:58 +0100
Subject: [PATCH 173/888] fix trans removing html

---
 htdocs/admin/sms.php | 92 ++++++++++++++++++++++++--------------------
 1 file changed, 50 insertions(+), 42 deletions(-)

diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index 823d4804121..fd1bcb69bdb 100644
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2007-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2009      Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2013 	   Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2020      Frédéric 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
@@ -30,15 +31,16 @@ $langs->loadLangs(array("companies", "admin", "products", "sms", "other", "error
 
 $cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 
-if (!$user->admin)
-accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 $substitutionarrayfortest = array(
-'__ID__' => 'TESTIdRecord',
-'__PHONEFROM__' => 'TESTPhoneFrom',
-'__PHONETO__' => 'TESTPhoneTo',
-'__LASTNAME__' => 'TESTLastname',
-'__FIRSTNAME__' => 'TESTFirstname'
+	'__ID__' => 'TESTIdRecord',
+	'__PHONEFROM__' => 'TESTPhoneFrom',
+	'__PHONETO__' => 'TESTPhoneTo',
+	'__LASTNAME__' => 'TESTLastname',
+	'__FIRSTNAME__' => 'TESTFirstname'
 );
 
 $action = GETPOST('action', 'aZ09');
@@ -48,8 +50,7 @@ $action = GETPOST('action', 'aZ09');
  * Actions
  */
 
-if ($action == 'update' && !$cancel)
-{
+if ($action == 'update' && !$cancel) {
 	dolibarr_set_const($db, "MAIN_DISABLE_ALL_SMS", GETPOST("MAIN_DISABLE_ALL_SMS", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 
 	dolibarr_set_const($db, "MAIN_SMS_SENDMODE", GETPOST("MAIN_SMS_SENDMODE", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
@@ -64,13 +65,16 @@ if ($action == 'update' && !$cancel)
 /*
  * Send sms
  */
-if ($action == 'send' && !$_POST['cancel'])
-{
+if ($action == 'send' && !$_POST['cancel']) {
 	$error = 0;
 
 	$smsfrom = '';
-	if (!empty($_POST["fromsms"])) $smsfrom = GETPOST("fromsms", 'alphanohtml');
-	if (empty($smsfrom)) $smsfrom = GETPOST("fromname", 'alphanohtml');
+	if (!empty($_POST["fromsms"])) {
+		$smsfrom = GETPOST("fromsms", 'alphanohtml');
+	}
+	if (empty($smsfrom)) {
+		$smsfrom = GETPOST("fromname", 'alphanohtml');
+	}
 	$sendto     = GETPOST("sendto", 'alphanohtml');
 	$body       = GETPOST('message', 'alphanohtml');
 	$deliveryreceipt = GETPOST("deliveryreceipt", 'alphanohtml');
@@ -83,32 +87,27 @@ if ($action == 'send' && !$_POST['cancel'])
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formsms.class.php';
 	$formsms = new FormSms($db);
 
-	if (!empty($formsms->error))
-	{
+	if (!empty($formsms->error)) {
 		setEventMessages($formsms->error, $formsms->errors, 'errors');
 		$action = 'test';
 		$error++;
 	}
-	if (empty($body))
-	{
+	if (empty($body)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Message")), null, 'errors');
 		$action = 'test';
 		$error++;
 	}
-	if (empty($smsfrom) || !str_replace('+', '', $smsfrom))
-	{
+	if (empty($smsfrom) || !str_replace('+', '', $smsfrom)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("SmsFrom")), null, 'errors');
 		$action = 'test';
 		$error++;
 	}
-	if (empty($sendto) || !str_replace('+', '', $sendto))
-	{
+	if (empty($sendto) || !str_replace('+', '', $sendto)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("SmsTo")), null, 'errors');
 		$action = 'test';
 		$error++;
 	}
-	if (!$error)
-	{
+	if (!$error) {
 		// Make substitutions into message
 		complete_substitutions_array($substitutionarrayfortest, $langs);
 		$body = make_substitutions($body, $substitutionarrayfortest);
@@ -118,8 +117,7 @@ if ($action == 'send' && !$_POST['cancel'])
 		$smsfile = new CSMSFile($sendto, $smsfrom, $body, $deliveryreceipt, $deferred, $priority, $class); // This define OvhSms->login, pass, session and account
 		$result = $smsfile->sendfile(); // This send SMS
 
-		if ($result)
-		{
+		if ($result) {
 			setEventMessages($langs->trans("SmsSuccessfulySent", $smsfrom, $sendto), null, 'mesgs');
 			setEventMessages($smsfile->error, $smsfile->errors, 'mesgs');
 		} else {
@@ -138,8 +136,12 @@ if ($action == 'send' && !$_POST['cancel'])
  */
 
 $linuxlike = 1;
-if (preg_match('/^win/i', PHP_OS)) $linuxlike = 0;
-if (preg_match('/^mac/i', PHP_OS)) $linuxlike = 0;
+if (preg_match('/^win/i', PHP_OS)) {
+	$linuxlike = 0;
+}
+if (preg_match('/^mac/i', PHP_OS)) {
+	$linuxlike = 0;
+}
 
 $wikihelp = 'EN:Setup Sms|FR:Paramétrage Sms|ES:Configuración Sms';
 llxHeader('', $langs->trans("Setup"), $wikihelp);
@@ -153,11 +155,14 @@ print "<br>\n";
 $listofmethods = (is_array($conf->modules_parts['sms']) ? $conf->modules_parts['sms'] : array());
 asort($listofmethods);
 
-if ($action == 'edit')
-{
-	$form = new Form($db);
+if (!count($listofmethods)) {
+	$descnosms = $langs->trans("NoSmsEngine", '{Dolistore}');
+	$descnosms = str_replace('{Dolistore}', '<a href="http://www.dolistore.com/search.php?orderby=position&orderway=desc&search_query=smsmanager">DoliStore</a>', $descnosms);
+	print '<div class="warning">'.$descnosms.'</div>';
+}
 
-	if (!count($listofmethods)) print '<div class="warning">'.$langs->trans("NoSmsEngine", '<a href="http://www.dolistore.com/search.php?orderby=position&orderway=desc&search_query=smsmanager">DoliStore</a>').'</div>';
+if ($action == 'edit') {
+	$form = new Form($db);
 
 	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -178,8 +183,11 @@ if ($action == 'edit')
 
 	// Method
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_SMS_SENDMODE").'</td><td>';
-	if (count($listofmethods)) print $form->selectarray('MAIN_SMS_SENDMODE', $listofmethods, $conf->global->MAIN_SMS_SENDMODE, 1);
-	else print '<font class="error">'.$langs->trans("None").'</font>';
+	if (count($listofmethods)) {
+		print $form->selectarray('MAIN_SMS_SENDMODE', $listofmethods, $conf->global->MAIN_SMS_SENDMODE, 1);
+	} else {
+		print '<font class="error">'.$langs->trans("None").'</font>';
+	}
 	print '</td></tr>';
 
 	// From
@@ -204,8 +212,6 @@ if ($action == 'edit')
 	print '</form>';
 	print '<br>';
 } else {
-	if (!count($listofmethods)) print '<div class="warning">'.$langs->trans("NoSmsEngine", '<a target="_blank" href="http://www.dolistore.com/search.php?orderby=position&orderway=desc&search_query=smsmanager">DoliStore</a>').'</div>';
-
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
@@ -218,14 +224,18 @@ if ($action == 'edit')
 	// Method
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_SMS_SENDMODE").'</td><td>';
 	$text = $listofmethods[$conf->global->MAIN_SMS_SENDMODE];
-	if (empty($text)) $text = $langs->trans("Undefined").' '.img_warning();
+	if (empty($text)) {
+		$text = $langs->trans("Undefined").' '.img_warning();
+	}
 	print $text;
 	print '</td></tr>';
 
 	// From
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMS_FROM", $langs->transnoentities("Undefined")).'</td>';
 	print '<td>'.$conf->global->MAIN_MAIL_SMS_FROM;
-	if (!empty($conf->global->MAIN_MAIL_SMS_FROM) && !isValidPhone($conf->global->MAIN_MAIL_SMS_FROM)) print ' '.img_warning($langs->trans("ErrorBadPhone"));
+	if (!empty($conf->global->MAIN_MAIL_SMS_FROM) && !isValidPhone($conf->global->MAIN_MAIL_SMS_FROM)) {
+		print ' '.img_warning($langs->trans("ErrorBadPhone"));
+	}
 	print '</td></tr>';
 
 	// Autocopy to
@@ -234,7 +244,7 @@ if ($action == 'edit')
 	print '<td>'.$conf->global->MAIN_MAIL_AUTOCOPY_TO;
 	if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO) && ! isValidEmail($conf->global->MAIN_MAIL_AUTOCOPY_TO)) print img_warning($langs->trans("ErrorBadEMail"));
 	print '</td></tr>';
-    */
+	*/
 
 	print '</table>';
 
@@ -257,8 +267,7 @@ if ($action == 'edit')
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("FeatureNotAvailableOnLinux").'">'.$langs->trans("DoTestServerAvailability").'</a>';
 	}*/
 
-	if (count($listofmethods) && !empty($conf->global->MAIN_SMS_SENDMODE))
-	{
+	if (count($listofmethods) && !empty($conf->global->MAIN_SMS_SENDMODE)) {
 		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=test&amp;mode=init">'.$langs->trans("DoTestSend").'</a>';
 	} else {
 		print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("DoTestSend").'</a>';
@@ -290,8 +299,7 @@ if ($action == 'edit')
 	}*/
 
 	// Affichage formulaire de TEST simple
-	if ($action == 'test')
-	{
+	if ($action == 'test') {
 		print '<br>';
 		print load_fiche_titre($langs->trans("DoTestSend"));
 

From e9a12b5324064adc35e5cd3a4ae0ea7f9cf5058f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 5 Dec 2020 08:56:17 +0100
Subject: [PATCH 174/888] fix missing fields in box

---
 htdocs/core/boxes/box_produits.php | 43 ++++++++++++++++--------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index dc7f79721d1..57f964d09ce 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -84,21 +84,25 @@ class box_produits extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastProducts", $max));
 
-		if ($user->rights->produit->lire || $user->rights->service->lire)
-		{
+		if ($user->rights->produit->lire || $user->rights->service->lire) {
 			$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.fk_price_expression, p.entity";
 			$sql .= ", p.accountancy_code_sell";
 			$sql .= ", p.accountancy_code_sell_intra";
 			$sql .= ", p.accountancy_code_sell_export";
 			$sql .= ", p.accountancy_code_buy";
+			$sql .= ", p.accountancy_code_buy_intra";
+			$sql .= ", p.accountancy_code_buy_export";
 			$sql .= ', p.barcode';
 			$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 			$sql .= ' WHERE p.entity IN ('.getEntity($productstatic->element).')';
-			if (empty($user->rights->produit->lire)) $sql .= ' AND p.fk_product_type != 0';
-			if (empty($user->rights->service->lire)) $sql .= ' AND p.fk_product_type != 1';
+			if (empty($user->rights->produit->lire)) {
+				$sql .= ' AND p.fk_product_type != 0';
+			}
+			if (empty($user->rights->service->lire)) {
+				$sql .= ' AND p.fk_product_type != 1';
+			}
 			// Add where from hooks
-			if (is_object($hookmanager))
-			{
+			if (is_object($hookmanager)) {
 				$parameters = array('boxproductlist'=>1);
 				$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 				$sql .= $hookmanager->resPrint;
@@ -107,18 +111,15 @@ class box_produits extends ModeleBoxes
 			$sql .= $this->db->plimit($max, 0);
 
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$num = $this->db->num_rows($result);
 				$line = 0;
-				while ($line < $num)
-				{
+				while ($line < $num) {
 					$objp = $this->db->fetch_object($result);
 					$datem = $this->db->jdate($objp->tms);
 
 					// Multilangs
-					if (!empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
-					{
+					if (!empty($conf->global->MAIN_MULTILANGS)) { // si l'option est active
 						$sqld = "SELECT label";
 						$sqld .= " FROM ".MAIN_DB_PREFIX."product_lang";
 						$sqld .= " WHERE fk_product=".$objp->rowid;
@@ -126,11 +127,11 @@ class box_produits extends ModeleBoxes
 						$sqld .= " LIMIT 1";
 
 						$resultd = $this->db->query($sqld);
-						if ($resultd)
-						{
+						if ($resultd) {
 							$objtp = $this->db->fetch_object($resultd);
-							if (isset($objtp->label) && $objtp->label != '')
+							if (isset($objtp->label) && $objtp->label != '') {
 								$objp->label = $objtp->label;
+							}
 						}
 					}
 					$productstatic->id = $objp->rowid;
@@ -145,6 +146,8 @@ class box_produits extends ModeleBoxes
 					$productstatic->accountancy_code_sell_intra = $objp->accountancy_code_sell_intra;
 					$productstatic->accountancy_code_sell_export = $objp->accountancy_code_sell_export;
 					$productstatic->accountancy_code_buy = $objp->accountancy_code_buy;
+					$productstatic->accountancy_code_buy_intra = $objp->accountancy_code_buy_intra;
+					$productstatic->accountancy_code_buy_export = $objp->accountancy_code_buy_export;
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
@@ -162,13 +165,12 @@ class box_produits extends ModeleBoxes
 						$price_base_type = $langs->trans($objp->price_base_type);
 						$price = ($objp->price_base_type == 'HT') ?price($objp->price) : $price = price($objp->price_ttc);
 					} else //Parse the dynamic price
-				   	{
+					{
 						$productstatic->fetch($objp->rowid, '', '', 1);
 						$priceparser = new PriceParser($this->db);
 						$price_result = $priceparser->parseProduct($productstatic);
 						if ($price_result >= 0) {
-							if ($objp->price_base_type == 'HT')
-							{
+							if ($objp->price_base_type == 'HT') {
 								$price_base_type = $langs->trans("HT");
 							} else {
 								$price_result = $price_result * (1 + ($productstatic->tva_tx / 100));
@@ -176,7 +178,7 @@ class box_produits extends ModeleBoxes
 							}
 							$price = price($price_result);
 						}
-				   	}
+					}
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
 						'text' => $price,
@@ -206,11 +208,12 @@ class box_produits extends ModeleBoxes
 
 					$line++;
 				}
-				if ($num == 0)
+				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
 						'td' => 'class="center"',
 						'text'=>$langs->trans("NoRecordedProducts"),
 					);
+				}
 
 				$this->db->free($result);
 			} else {

From 325951877be9ae30aef2fbc30f78e8ff5a7f1138 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 5 Dec 2020 08:58:20 +0100
Subject: [PATCH 175/888] fix missing fields in box

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

diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 57f964d09ce..f36b0500655 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -164,8 +164,8 @@ class box_produits extends ModeleBoxes
 					if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression)) {
 						$price_base_type = $langs->trans($objp->price_base_type);
 						$price = ($objp->price_base_type == 'HT') ?price($objp->price) : $price = price($objp->price_ttc);
-					} else //Parse the dynamic price
-					{
+					} else {
+						//Parse the dynamic price
 						$productstatic->fetch($objp->rowid, '', '', 1);
 						$priceparser = new PriceParser($this->db);
 						$price_result = $priceparser->parseProduct($productstatic);

From 8996dd9803d4ed0cdba3b71491daddb5bc0d4c9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 5 Dec 2020 10:28:40 +0100
Subject: [PATCH 176/888] fix style

---
 htdocs/admin/boxes.php | 151 +++++++++++++++++++----------------------
 1 file changed, 70 insertions(+), 81 deletions(-)

diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 4fc1ad28da7..63c3350fd9d 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -31,7 +31,9 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'boxes', 'accountancy'));
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 $rowid = GETPOST('rowid', 'int');
 $action = GETPOST('action', 'aZ09');
@@ -46,8 +48,7 @@ $boxes = array();
  * Actions
  */
 
-if ($action == 'addconst')
-{
+if ($action == 'addconst') {
 	dolibarr_set_const($db, "MAIN_BOXES_MAXLINES", $_POST["MAIN_BOXES_MAXLINES"], '', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_ACTIVATE_FILECACHE", $_POST["MAIN_ACTIVATE_FILECACHE"], 'chaine', 0, '', $conf->entity);
 }
@@ -59,8 +60,7 @@ if ($action == 'add') {
 	$db->begin();
 	if (is_array($boxids)) {
 		foreach ($boxids as $boxid) {
-			if (is_numeric($boxid['pos']) && $boxid['pos'] >= 0)	// 0=Home, 1=...
-			{
+			if (is_numeric($boxid['pos']) && $boxid['pos'] >= 0) {	// 0=Home, 1=...
 				$pos = $boxid['pos'];
 
 				// Initialize distinct fk_user with all already existing values of fk_user (user that use a personalized view of boxes for page "pos")
@@ -72,12 +72,10 @@ if ($action == 'add') {
 					$sql .= " AND entity = ".$conf->entity;
 					dol_syslog("boxes.php search fk_user to activate box for", LOG_DEBUG);
 					$resql = $db->query($sql);
-					if ($resql)
-					{
+					if ($resql) {
 						$num = $db->num_rows($resql);
 						$i = 0;
-						while ($i < $num)
-						{
+						while ($i < $num) {
 							$obj = $db->fetch_object($resql);
 							$distinctfkuser[$obj->fk_user] = $obj->fk_user;
 							$i++;
@@ -90,26 +88,28 @@ if ($action == 'add') {
 
 				$distinctfkuser['0'] = '0'; // Add entry for fk_user = 0. We must use string as key and val
 
-				foreach ($distinctfkuser as $fk_user)
-				{
-					if (!$error && $fk_user != '')
-					{
+				foreach ($distinctfkuser as $fk_user) {
+					if (!$error && $fk_user != '') {
 						$arrayofexistingboxid = array();
 						$nbboxonleft = $nbboxonright = 0;
 						$sql = "SELECT box_id, box_order FROM ".MAIN_DB_PREFIX."boxes";
 						$sql .= " WHERE position = ".$pos." AND fk_user = ".$fk_user." AND entity = ".$conf->entity;
 						dol_syslog("boxes.php activate box", LOG_DEBUG);
 						$resql = $db->query($sql);
-						if ($resql)
-						{
-							while ($obj = $db->fetch_object($resql))
-							{
+						if ($resql) {
+							while ($obj = $db->fetch_object($resql)) {
 								$boxorder = $obj->box_order;
-								if (preg_match('/A/', $boxorder)) $nbboxonleft++;
-								if (preg_match('/B/', $boxorder)) $nbboxonright++;
+								if (preg_match('/A/', $boxorder)) {
+									$nbboxonleft++;
+								}
+								if (preg_match('/B/', $boxorder)) {
+									$nbboxonright++;
+								}
 								$arrayofexistingboxid[$obj->box_id] = 1;
 							}
-						} else dol_print_error($db);
+						} else {
+							dol_print_error($db);
+						}
 
 						if (empty($arrayofexistingboxid[$boxid['value']])) {
 							$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (";
@@ -120,8 +120,7 @@ if ($action == 'add') {
 
 							dol_syslog("boxes.php activate box", LOG_DEBUG);
 							$resql = $db->query($sql);
-							if (!$resql)
-							{
+							if (!$resql) {
 								setEventMessages($db->lasterror(), null, 'errors');
 								$error++;
 							}
@@ -133,8 +132,7 @@ if ($action == 'add') {
 			}
 		}
 	}
-	if (!$error)
-	{
+	if (!$error) {
 		$db->commit();
 		$action = '';
 	} else {
@@ -142,15 +140,13 @@ if ($action == 'add') {
 	}
 }
 
-if ($action == 'delete')
-{
+if ($action == 'delete') {
 	$sql = "SELECT box_id FROM ".MAIN_DB_PREFIX."boxes";
 	$sql .= " WHERE rowid=".((int) $rowid);
 
 	$resql = $db->query($sql);
 	$obj = $db->fetch_object($resql);
-	if (!empty($obj->box_id))
-	{
+	if (!empty($obj->box_id)) {
 		$db->begin();
 
 		// Remove all personalized setup when a box is activated or disabled (why removing all ? We removed only removed boxes)
@@ -168,8 +164,7 @@ if ($action == 'delete')
 	}
 }
 
-if ($action == 'switch')
-{
+if ($action == 'switch') {
 	// We switch values of field box_order for the 2 lines of table boxes
 	$db->begin();
 
@@ -181,12 +176,10 @@ if ($action == 'switch')
 
 	$resultupdatefrom = 0;
 	$resultupdateto = 0;
-	if (is_object($objfrom) && is_object($objto))
-	{
+	if (is_object($objfrom) && is_object($objto)) {
 		$newfirst = $objto->box_order;
 		$newsecond = $objfrom->box_order;
-		if ($newfirst == $newsecond)
-		{
+		if ($newfirst == $newsecond) {
 			 $newsecondchar = preg_replace('/[0-9]+/', '', $newsecond);
 			 $newsecondnum = preg_replace('/[a-zA-Z]+/', '', $newsecond);
 			 $newsecond = sprintf("%s%02d", $newsecondchar ? $newsecondchar : 'A', $newsecondnum + 1);
@@ -194,16 +187,19 @@ if ($action == 'switch')
 		$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order='".$db->escape($newfirst)."' WHERE rowid=".((int) $objfrom->rowid);
 		dol_syslog($sql);
 		$resultupdatefrom = $db->query($sql);
-		if (!$resultupdatefrom) { dol_print_error($db); }
+		if (!$resultupdatefrom) {
+			dol_print_error($db);
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order='".$db->escape($newsecond)."' WHERE rowid=".((int) $objto->rowid);
 		dol_syslog($sql);
 		$resultupdateto = $db->query($sql);
-		if (!$resultupdateto) { dol_print_error($db); }
+		if (!$resultupdateto) {
+			dol_print_error($db);
+		}
 	}
 
-	if ($resultupdatefrom && $resultupdateto)
-	{
+	if ($resultupdatefrom && $resultupdateto) {
 		$db->commit();
 	} else {
 		$db->rollback();
@@ -240,33 +236,31 @@ $sql .= " ORDER by b.position, b.box_order";
 
 dol_syslog("Search available boxes", LOG_DEBUG);
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 
 	// Check record to know if we must recalculate sort order
 	$i = 0;
 	$decalage = 0;
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$obj = $db->fetch_object($resql);
 		$boxes[$obj->position][$obj->box_id] = 1;
 		$i++;
 
 		array_push($actives, $obj->box_id);
 
-		if ($obj->box_order == '' || $obj->box_order == '0' || $decalage) $decalage++;
+		if ($obj->box_order == '' || $obj->box_order == '0' || $decalage) {
+			$decalage++;
+		}
 		// We renumber the order of the boxes if one of them is in ''
 		// This occurs just after an insert.
-		if ($decalage)
-		{
+		if ($decalage) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order='".$db->escape($decalage)."' WHERE rowid=".$obj->rowid;
 			$db->query($sql);
 		}
 	}
 
-	if ($decalage)
-	{
+	if ($decalage) {
 		// If we have renumbered, we correct the field box_order
 		// This occurs just after an insert.
 		$sql = "SELECT box_order";
@@ -276,32 +270,24 @@ if ($resql)
 
 		dol_syslog("Execute requests to renumber box order", LOG_DEBUG);
 		$result = $db->query($sql);
-		if ($result)
-		{
-			while ($record = $db->fetch_array($result))
-			{
-				if (dol_strlen($record['box_order']) == 1)
-				{
-					if (preg_match("/[13579]{1}/", substr($record['box_order'], -1)))
-					{
+		if ($result) {
+			while ($record = $db->fetch_array($result)) {
+				if (dol_strlen($record['box_order']) == 1) {
+					if (preg_match("/[13579]{1}/", substr($record['box_order'], -1))) {
 						$box_order = "A0".$record['box_order'];
 						$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$db->escape($box_order)."' WHERE entity = ".$conf->entity." AND box_order = '".$db->escape($record['box_order'])."'";
 						$resql = $db->query($sql);
-					} elseif (preg_match("/[02468]{1}/", substr($record['box_order'], -1)))
-					{
+					} elseif (preg_match("/[02468]{1}/", substr($record['box_order'], -1))) {
 						$box_order = "B0".$record['box_order'];
 						$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$db->escape($box_order)."' WHERE entity = ".$conf->entity." AND box_order = '".$db->escape($record['box_order'])."'";
 						$resql = $db->query($sql);
 					}
-				} elseif (dol_strlen($record['box_order']) == 2)
-				{
-					if (preg_match("/[13579]{1}/", substr($record['box_order'], -1)))
-					{
+				} elseif (dol_strlen($record['box_order']) == 2) {
+					if (preg_match("/[13579]{1}/", substr($record['box_order'], -1))) {
 						$box_order = "A".$record['box_order'];
 						$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$db->escape($box_order)."' WHERE entity = ".$conf->entity." AND box_order = '".$db->escape($record['box_order'])."'";
 						$resql = $db->query($sql);
-					} elseif (preg_match("/[02468]{1}/", substr($record['box_order'], -1)))
-					{
+					} elseif (preg_match("/[02468]{1}/", substr($record['box_order'], -1))) {
 						$box_order = "B".$record['box_order'];
 						$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$db->escape($box_order)."' WHERE entity = ".$conf->entity." AND box_order = '".$db->escape($record['box_order'])."'";
 						$resql = $db->query($sql);
@@ -336,10 +322,8 @@ print '<td>'.$langs->trans("SourceFile").'</td>';
 print '<td width="160" class="center">'.$langs->trans("ActivateOn").'</td>';
 print "</tr>\n";
 
-foreach ($boxtoadd as $box)
-{
-	if (preg_match('/^([^@]+)@([^@]+)$/i', $box->boximg))
-	{
+foreach ($boxtoadd as $box) {
+	if (preg_match('/^([^@]+)@([^@]+)$/i', $box->boximg)) {
 		$logo = $box->boximg;
 	} else {
 		$logo = preg_replace("/^object_/i", "", $box->boximg);
@@ -348,14 +332,17 @@ foreach ($boxtoadd as $box)
 	print "\n".'<!-- Box '.$box->boxcode.' -->'."\n";
 	print '<tr class="oddeven">'."\n";
 	print '<td>'.img_object("", $logo, 'height="14px"').' '.$langs->transnoentitiesnoconv($box->boxlabel);
-	if (!empty($box->class) && preg_match('/graph_/', $box->class)) print ' ('.$langs->trans("Graph").')';
+	if (!empty($box->class) && preg_match('/graph_/', $box->class)) {
+		print ' ('.$langs->trans("Graph").')';
+	}
 	print '</td>'."\n";
 	print '<td>';
-	if ($box->note == '(WarningUsingThisBoxSlowDown)')
-	{
+	if ($box->note == '(WarningUsingThisBoxSlowDown)') {
 		$langs->load("errors");
 		print $langs->trans("WarningUsingThisBoxSlowDown");
-	} else print ($box->note ? $box->note : '&nbsp;');
+	} else {
+		print ($box->note ? $box->note : '&nbsp;');
+	}
 	print '</td>'."\n";
 	print '<td>'.$box->sourcefile.'</td>'."\n";
 
@@ -367,8 +354,7 @@ foreach ($boxtoadd as $box)
 
 	print '</tr>'."\n";
 }
-if (!count($boxtoadd) && count($boxactivated))
-{
+if (!count($boxtoadd) && count($boxactivated)) {
 	print '<tr><td class="opacitymedium" colspan="4">'.$langs->trans("AllWidgetsWereEnabled").'</td></tr>';
 }
 print '</table>'."\n";
@@ -398,10 +384,8 @@ print '</tr>'."\n";
 
 $box_order = 1;
 $foundrupture = 1;
-foreach ($boxactivated as $key => $box)
-{
-	if (preg_match('/^([^@]+)@([^@]+)$/i', $box->boximg))
-	{
+foreach ($boxactivated as $key => $box) {
+	if (preg_match('/^([^@]+)@([^@]+)$/i', $box->boximg)) {
 		$logo = $box->boximg;
 	} else {
 		$logo = preg_replace("/^object_/i", "", $box->boximg);
@@ -410,14 +394,17 @@ foreach ($boxactivated as $key => $box)
 	print "\n".'<!-- Box '.$box->boxcode.' -->'."\n";
 	print '<tr class="oddeven">';
 	print '<td>'.img_object("", $logo, 'height="14px"').' '.$langs->transnoentitiesnoconv($box->boxlabel);
-	if (!empty($box->class) && preg_match('/graph_/', $box->class)) print ' ('.$langs->trans("Graph").')';
+	if (!empty($box->class) && preg_match('/graph_/', $box->class)) {
+		print ' ('.$langs->trans("Graph").')';
+	}
 	print '</td>';
 	print '<td>';
-	if ($box->note == '(WarningUsingThisBoxSlowDown)')
-	{
+	if ($box->note == '(WarningUsingThisBoxSlowDown)') {
 		$langs->load("errors");
 		print img_warning('', 0).' '.$langs->trans("WarningUsingThisBoxSlowDown");
-	} else print ($box->note ? $box->note : '&nbsp;');
+	} else {
+		print ($box->note ? $box->note : '&nbsp;');
+	}
 	print '</td>';
 	print '<td class="center">'.(empty($pos_name[$box->position]) ? '' : $langs->trans($pos_name[$box->position])).'</td>';
 	$hasnext = ($key < (count($boxactivated) - 1));
@@ -446,6 +433,7 @@ print load_fiche_titre($langs->trans("Other"), '', '');
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="addconst">';
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
@@ -471,6 +459,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL == 2 || !empty($conf->global->MAIN_ACTIVA
 }
 
 print '</table>';
+print '</div>';
 
 print '<br>';
 print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'" name="Button"></div>';

From 6d2159e8f0a3faa88b7468a6fe1fbcb580e33c33 Mon Sep 17 00:00:00 2001
From: Zebedeu <marciozebedeu@gmail.com>
Date: Sat, 5 Dec 2020 11:30:18 +0100
Subject: [PATCH 177/888] New #8472 personal and professional titles added

personal and professional titles added for employee users
---
 htdocs/user/card.php             | 12 ++++++++++++
 htdocs/user/class/user.class.php | 15 +++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index ba7cd546d54..f57c329d5a1 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -204,6 +204,7 @@ if (empty($reshook)) {
 		}
 
 		if (!$error) {
+			$object->civility_code = GETPOST("civility_code", 'aZ09');
 			$object->lastname = GETPOST("lastname", 'alphanohtml');
 			$object->firstname = GETPOST("firstname", 'alphanohtml');
 			$object->login = GETPOST("login", 'alphanohtml');
@@ -366,6 +367,7 @@ if (empty($reshook)) {
 
 				$db->begin();
 
+				$object->civility_code = GETPOST("civility_code", 'aZ09');
 				$object->lastname = GETPOST("lastname", 'alphanohtml');
 				$object->firstname = GETPOST("firstname", 'alphanohtml');
 				$object->login = GETPOST("login", 'alphanohtml');
@@ -789,6 +791,11 @@ if ($action == 'create' || $action == 'adduserldap')
 
 	print '<table class="border centpercent">';
 
+	// Civility
+	print '<tr><td><label for="civility_code">'.$langs->trans("UserTitle").'</label></td><td colspan="3">';
+	print $formcompany->select_civility(GETPOSTISSET("civility_code") ? GETPOST("civility_code", 'aZ09') : $object->civility_code, 'civility_code');
+	print '</td></tr>';
+
 	// Lastname
 	print '<tr>';
 	print '<td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Lastname").'</span></td>';
@@ -2037,6 +2044,11 @@ if ($action == 'create' || $action == 'adduserldap')
 				print '</tr>';
 			}
 
+			// Civility
+			print '<tr><td><label for="civility_code">'.$langs->trans("UserTitle").'</label></td><td colspan="3">';
+			print $formcompany->select_civility( GETPOSTISSET( "civility_code" ) ? GETPOST( "civility_code" , 'aZ09' ) : $object->civility_code , 'civility_code' );
+			print '</td></tr>';
+
 			// Lastname
 			print "<tr>";
 			print '<td class="titlefield fieldrequired">'.$langs->trans("Lastname").'</td>';
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 3288571d2a7..be1cd4514e3 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -74,6 +74,7 @@ class User extends CommonObject
 	public $ldap_sid;
 	public $search_sid;
 	public $employee;
+	public $civility_code;
 
 	/**
 	 * @var string gender
@@ -400,7 +401,7 @@ class User extends CommonObject
 		$login = trim($login);
 
 		// Get user
-		$sql = "SELECT u.rowid, u.lastname, u.firstname, u.employee, u.gender, u.birth, u.email, u.personal_email, u.job,";
+		$sql = "SELECT u.rowid, u.lastname, u.firstname, u.employee, u.gender, u.civility as civility_code, u.birth, u.email, u.personal_email, u.job,";
 		$sql .= " u.socialnetworks,";
 		$sql .= " u.signature, u.office_phone, u.office_fax, u.user_mobile, u.personal_mobile,";
 		$sql .= " u.address, u.zip, u.town, u.fk_state as state_id, u.fk_country as country_id,";
@@ -470,6 +471,7 @@ class User extends CommonObject
 				$this->ref_ext = $obj->ref_ext;
 
 				$this->ldap_sid = $obj->ldap_sid;
+				$this->civility_code = $obj->civility_code;
 				$this->lastname = $obj->lastname;
 				$this->firstname = $obj->firstname;
 
@@ -1293,6 +1295,8 @@ class User extends CommonObject
 
 		// Clean parameters
 		$this->setUpperOrLowerCase();
+
+		$this->civility_code = trim($this->civility_code);
 		$this->login = trim($this->login);
 		if (!isset($this->entity)) {
 			$this->entity = $conf->entity; // If not defined, we use default value
@@ -1419,6 +1423,7 @@ class User extends CommonObject
 
 		// Define parameters
 		$this->admin = 0;
+		$this->civility_code = $contact->civility_code;
 		$this->lastname = $contact->lastname;
 		$this->firstname = $contact->firstname;
 		$this->gender = $contact->gender;
@@ -1447,6 +1452,7 @@ class User extends CommonObject
 		if ($result > 0) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."user";
 			$sql .= " SET fk_socpeople=".$contact->id;
+			$sql .= ", civility=".$contact->civility_code;
 			if ($contact->socid) {
 				$sql .= ", fk_soc=".$contact->socid;
 			}
@@ -1497,6 +1503,7 @@ class User extends CommonObject
 
 		// Set properties on new user
 		$this->admin = 0;
+		$this->civility_code = $member->civility_id;
 		$this->lastname     = $member->lastname;
 		$this->firstname    = $member->firstname;
 		$this->gender = $member->gender;
@@ -1632,6 +1639,7 @@ class User extends CommonObject
 		dol_syslog(get_class($this)."::update notrigger=".$notrigger.", nosyncmember=".$nosyncmember.", nosyncmemberpass=".$nosyncmemberpass);
 
 		// Clean parameters
+		$this->civility_code = trim($this->civility_code);
 		$this->lastname     = trim($this->lastname);
 		$this->firstname    = trim($this->firstname);
 		$this->employee    	= $this->employee ? $this->employee : 0;
@@ -1686,7 +1694,8 @@ class User extends CommonObject
 
 		// Update datas
 		$sql = "UPDATE ".MAIN_DB_PREFIX."user SET";
-		$sql .= " lastname = '".$this->db->escape($this->lastname)."'";
+		$sql .= " civility = '".$this->db->escape($this->civility_code)."'";
+		$sql .= ", lastname = '".$this->db->escape($this->lastname)."'";
 		$sql .= ", firstname = '".$this->db->escape($this->firstname)."'";
 		$sql .= ", employee = ".(int) $this->employee;
 		$sql .= ", login = '".$this->db->escape($this->login)."'";
@@ -1788,6 +1797,7 @@ class User extends CommonObject
 					$result = $adh->fetch($this->fk_member);
 
 					if ($result > 0) {
+						$adh->civility_code = $this->civility_code;
 						$adh->firstname = $this->firstname;
 						$adh->lastname = $this->lastname;
 						$adh->login = $this->login;
@@ -1838,6 +1848,7 @@ class User extends CommonObject
 					$result = $tmpobj->fetch($this->contact_id);
 
 					if ($result >= 0) {
+						$tmpobj->civility_code = $this->civility_code;
 						$tmpobj->firstname = $this->firstname;
 						$tmpobj->lastname = $this->lastname;
 						$tmpobj->login = $this->login;

From f035bd774d55b515b8c1c175a4fa9aa4da18d03e Mon Sep 17 00:00:00 2001
From: Zebedeu <marciozebedeu@gmail.com>
Date: Sat, 5 Dec 2020 11:59:30 +0100
Subject: [PATCH 178/888] New | personal and professional titles added for
 employee users in vcard

personal and professional titles added for employee users in vcard
---
 htdocs/user/vcard.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/user/vcard.php b/htdocs/user/vcard.php
index ada3a992f44..6cdcd04417f 100644
--- a/htdocs/user/vcard.php
+++ b/htdocs/user/vcard.php
@@ -61,7 +61,7 @@ $v = new vCard();
 $v->setProdId('Dolibarr '.DOL_VERSION);
 
 $v->setUid('DOLIBARR-USERID-'.$user2->id);
-$v->setName($user2->lastname, $user2->firstname, "", $user2->civility, "");
+$v->setName($user2->lastname, $user2->firstname, "", $user2->civility_code, "");
 $v->setFormattedName($user2->getFullName($langs, 1));
 
 $v->setPhoneNumber($user2->phone_pro, "TYPE=WORK;VOICE");

From 1c221302cd9230ef1b1316cd2d0ca32c2ecf15fe Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sat, 5 Dec 2020 11:09:16 +0000
Subject: [PATCH 179/888] Fixing style errors.

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

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index f57c329d5a1..3d5c8b1852a 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -2046,7 +2046,7 @@ if ($action == 'create' || $action == 'adduserldap')
 
 			// Civility
 			print '<tr><td><label for="civility_code">'.$langs->trans("UserTitle").'</label></td><td colspan="3">';
-			print $formcompany->select_civility( GETPOSTISSET( "civility_code" ) ? GETPOST( "civility_code" , 'aZ09' ) : $object->civility_code , 'civility_code' );
+			print $formcompany->select_civility(GETPOSTISSET("civility_code") ? GETPOST("civility_code", 'aZ09') : $object->civility_code, 'civility_code');
 			print '</td></tr>';
 
 			// Lastname

From aa1cb5cfa8c01bd47499b3bb5f86c6558537c749 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Dec 2020 12:14:25 +0100
Subject: [PATCH 180/888] Fix lang load

---
 htdocs/blockedlog/ajax/block-info.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/blockedlog/ajax/block-info.php b/htdocs/blockedlog/ajax/block-info.php
index e83a71ea9b7..ac501e6bdca 100644
--- a/htdocs/blockedlog/ajax/block-info.php
+++ b/htdocs/blockedlog/ajax/block-info.php
@@ -39,6 +39,8 @@ $block = new BlockedLog($db);
 
 if ((!$user->admin && !$user->rights->blockedlog->read) || empty($conf->blockedlog->enabled)) accessforbidden();
 
+$langs->loadLangs(array("admin"));
+
 
 /*
  * View

From 038850fe2598817847606fd402d1b8e34eab68c8 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sat, 5 Dec 2020 12:22:36 +0100
Subject: [PATCH 181/888] Update ChangeLog

---
 ChangeLog | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7b685eb3381..28fa231709b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,7 +31,7 @@ NEW: add column payment term into list of supplier invoices
 NEW: add column quantity in product margin page
 NEW: add column vat rate in page to define accounting account on product/service
 NEW: add costprice in fields of products list
-NEW: added an import profile for CUSTOMER ORDER, PO, PROPOSAL MODULE, SUPPLIER INVOICE
+NEW: add an import profile for CUSTOMER ORDER, PO, PROPOSAL MODULE, SUPPLIER INVOICE
 NEW: add employee link in expense report binding page
 NEW: add EORI No. as ProfID5
 NEW: add export for various payments
@@ -181,10 +181,9 @@ NEW: #15065 Add option to put the product label in bold in the PDF templates if
 For developers:
 ---------------
 NEW: add __MEMBER_TYPE__ substitution key
+NEW: add __TYPE__ substitution key
 NEW: add function dolButtonToOpenUrlInDialogPopup() to be able to open page into a popup
 NEW: show line number on intervention card (via MAIN_VIEW_LINE_NUMBER)
-NEW: API get contacts list of a given order
-NEW: API endpoint getContacts and Clean results
 NEW: Add some fields to link website page to an other object
 NEW: fill ECM src object fields in dol_add_file_process
 NEW: conf to allow to show the full tree in warehouse popup
@@ -194,10 +193,6 @@ NEW: can add event to log into blockedlog module with a constant
 NEW: add property cssview when declaring fields of an object
 NEW: Can use dynamic code into the 'enabled' property of DAO fields
 NEW: allow to edit "demand reason" field though API
-NEW: API can update a payment
-NEW: API get member by thirdparty
-NEW: API get thirdparty by barcode
-NEW: API get users by email / login
 NEW: fetch contact by email with REST API
 NEW: field ref_ext in llx_commandedet
 NEW: fields ref_ext for Attributes and Combinations
@@ -213,10 +208,17 @@ NEW: Triggers Attributes and Attributes values
 NEW: added incoterms data into the substitution array
 NEW: add send context for ticket
 NEW: add a message in error_log after detection of SQL or script injection
-NEW: add __TYPE__ substitution key
 NEW: add validation of MX domain for emails
 NEW: calculate the virtual stock in transverse mode ( not on getEntity('commande'), ... but on getEntity('stock') )
-NEW: Graphics can be horizontal bars.
+NEW: Graphics can be horizontal bars
+
+APIs
+NEW: API get contacts list of a given order
+NEW: API endpoint getContacts and Clean results
+NEW: API can update a payment
+NEW: API get member by thirdparty
+NEW: API get thirdparty by barcode
+NEW: API get users by email / login
 
 HOOKs
 NEW: Hook on propal card
@@ -380,8 +382,8 @@ FIX: SQL Problem in customer invoice list
 FIX: SQL Problem in social contribution list
 FIX: SQL Problem in supplier invoice list
 FIX: SQL syntax error when editing extrafields
-FIX: Sql type
-FIX: takepos 12 hook
+FIX: SQL type
+FIX: TakePOS 12 hook
 FIX: Update form erased extrafields that were hidden
 FIX: Update of extrafields date
 FIX: Update of extrafiels on draft object
@@ -395,7 +397,7 @@ For users:
 
 NEW: Module MO (Manufacturing Order) is available as stable module.
 NEW: Receipt printer module moved from 'development' to 'experimental'
-NEW: Add option MAIN_VIEW_LINE_NUMBER_IN_LIST for some lists.
+NEW: add option MAIN_VIEW_LINE_NUMBER_IN_LIST for some lists
 NEW: add numbering module for TakePOS module
 NEW: 2 new options when creating an invoice from time spent on a project : by period or by task
 NEW: Accountancy add column thirdparty on binding page
@@ -406,19 +408,19 @@ NEW: Accountancy - Add possibility to manage a short alternative label for accou
 NEW: Accountancy - General ledger - Add an option to search not reconciled lines
 NEW: Add accountancy code of thirdparty in contact and supplier export
 NEW: support webp image format
-NEW: Add checkbox "overwrite if exists" into ECM/DMS module
+NEW: add checkbox "overwrite if exists" into ECM/DMS module
 NEW: add a link to notes in members list
 NEW: add a parameter to group same products in TakePOS
 NEW: add a parameter to sort product by label in TakePOS
-NEW: Add a profil to import contact categories
-NEW: Add company extrafields into order export
+NEW: add a profil to import contact categories
+NEW: add company extrafields into order export
 NEW: add const CASHDESK_FORCE_DECREASE_STOCK to force batch decrementation
 NEW: add const TAKEPOS_NUMPAD_USE_PAYMENT_ICON to use icons on payment buttons
 NEW: add csv separator setup in module admin
 NEW: add dedicated substitutions keys for extrafields of type date and datetime
 NEW: add default warehouse for dispatch
-NEW: Add due date in feature "Export accounting documents"
-NEW: Add duration information for fichinter
+NEW: add due date in feature "Export accounting documents"
+NEW: add duration information for fichinter
 NEW: Start support of Dark theme into ELDY theme
 NEW: Add field author public alias for blog post on website module
 NEW: Add "finished" field on product list

From 3b55eb1d8228af1f6361a4b1b0caa8c3a2658b18 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Dec 2020 13:26:58 +0100
Subject: [PATCH 182/888] FIX master must be after session_start but
 dol_getprefix must be before and after filefunc.inc.php.

---
 htdocs/comm/mailing/card.php           |  7 +++----
 htdocs/core/lib/functions.lib.php      | 17 ++++++++++------
 htdocs/core/lib/phpsessionindb.lib.php |  2 +-
 htdocs/main.inc.php                    | 28 +++++++-------------------
 htdocs/master.inc.php                  | 17 +++++-----------
 scripts/emailings/mailing-send.php     |  6 ++++++
 6 files changed, 33 insertions(+), 44 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 7b401374b07..1a3a1c9fe62 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -800,8 +800,7 @@ if ($action == 'create')
 					setEventMessages($langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']), null, 'warnings');
 					if (!empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS)) setEventMessages($langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS), null, 'warnings');
 					$_GET["action"] = '';
-				} elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
-				{
+				} elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0) {
 					if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
 					if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
 
@@ -818,7 +817,7 @@ if ($action == 'create')
 					if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
 
 					$text = '';
-					if ($conf->global->MAILING_LIMIT_SENDBYCLI >= 0)
+					if (!isset($conf->global->MAILING_LIMIT_SENDBYCLI) || $conf->global->MAILING_LIMIT_SENDBYCLI >= 0)
 					{
 						$text .= $langs->trans("MailingNeedCommand");
 						$text .= '<br><textarea cols="60" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.' '.$user->login.'</textarea>';
@@ -826,7 +825,7 @@ if ($action == 'create')
 					}
 					$text .= $langs->trans('ConfirmSendingEmailing').'<br>';
 					$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
-					print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('SendMailing'), $text, 'sendallconfirmed', $formquestion, '', 1, 330, 600);
+					print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('SendMailing'), $text, 'sendallconfirmed', '', '', 1, 330, 600);
 				}
 			}
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 890c16627aa..6abfd2312e3 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -711,11 +711,11 @@ if (!function_exists('dol_getprefix'))
 	 */
 	function dol_getprefix($mode = '')
 	{
-		global $conf;
-
-		// If prefix is for email
+		// If prefix is for email (we need to have $conf alreayd loaded for this case)
 		if ($mode == 'email')
 		{
+			global $conf;
+
 			if (!empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID))	// If MAIL_PREFIX_FOR_EMAIL_ID is set (a value initialized with a random value is recommended)
 			{
 				if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;
@@ -729,12 +729,17 @@ if (!function_exists('dol_getprefix'))
 			return dol_hash(DOL_DOCUMENT_ROOT.DOL_URL_ROOT, '3');
 		}
 
+		// If prefix is for session (no need to have $conf loaded)
+		global $dolibarr_main_instance_unique_id, $dolibarr_main_cookie_cryptkey;	// This is loaded by filefunc.inc.php
+		$tmp_instance_unique_id = empty($dolibarr_main_instance_unique_id) ? (empty($dolibarr_main_cookie_cryptkey) ? '' : $dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id; // Unique id of instance
+
 		// The recommended value (may be not defined for old versions)
-		if (!empty($conf->file->instance_unique_id)) return $conf->file->instance_unique_id;
+		if (!empty($tmp_instance_unique_id)) {
+			return $tmp_instance_unique_id;
+		}
 
 		// For backward compatibility
-		if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"]))
-		{
+		if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"])) {
 			return dol_hash($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT, '3');
 		}
 
diff --git a/htdocs/core/lib/phpsessionindb.lib.php b/htdocs/core/lib/phpsessionindb.lib.php
index f2e7d42597e..132036ba23d 100644
--- a/htdocs/core/lib/phpsessionindb.lib.php
+++ b/htdocs/core/lib/phpsessionindb.lib.php
@@ -19,7 +19,7 @@
 /**
  *  \file		htdocs/core/lib/phpsessionindb.lib.php
  *  \ingroup    core
- *  \brief		Set function handlers for PHP session management in DB
+ *  \brief		Set function handlers for PHP session management in DB.
  */
 
 // The session handler file must be included just after the call of the master.inc.php into main.inc.php
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 0c54b68734d..81f560d662c 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -228,18 +228,15 @@ if (!empty($_POST["DOL_AUTOSET_COOKIE"]))
 }
 
 
-// Init the 5 global objects, this include will make the 'new Xxx()' and set properties for: $conf, $db, $langs, $user, $mysoc
-require_once 'master.inc.php';
-
 // Set the handler of session
 if (ini_get('session.save_handler') == 'user') {
 	require_once 'core/lib/phpsessionindb.lib.php';
 }
 
 // Init session. Name of session is specific to Dolibarr instance.
-// Must be done after the include of master.inc.php so $conf file is loaded and vars like $dolibarr_main_force_https are set.
-// Note: the function dol_getprefix may have been redefined to return a different key to manage another area to protect.
-$prefix = dol_getprefix(''); // This uses the $conf file
+// Must be done after the include of filefunc.inc.php so global variables of conf file are defined (like $dolibarr_main_instance_unique_id or $dolibarr_main_force_https).
+// Note: the function dol_getprefix is defined into functions.lib.php but may have been defined to return a different key to manage another area to protect.
+$prefix = dol_getprefix('');
 $sessionname = 'DOLSESSID_'.$prefix;
 $sessiontimeout = 'DOLSESSTIMEOUT_'.$prefix;
 if (!empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime', $_COOKIE[$sessiontimeout]);
@@ -250,24 +247,13 @@ if (!defined('NOSESSION'))
 	session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
 	session_name($sessionname);
 	session_start();
-
-	// By default conf->entity is 1, but we change this if we ask another value.
-	if (session_id() && !empty($_SESSION["dol_entity"])) {
-		// Entity inside an opened session
-		$conf->entity = $_SESSION["dol_entity"];
-	} elseif (!empty($_ENV["dol_entity"])) {
-		// Entity inside a CLI script
-		$conf->entity = $_ENV["dol_entity"];
-	} elseif (GETPOSTISSET("loginfunction") && GETPOST("entity", 'int')) {
-		// Just after a login page
-		$conf->entity = GETPOST("entity", 'int');
-	} elseif (defined('DOLENTITY') && is_numeric(constant('DOLENTITY'))) {
-		// For public page with MultiCompany module
-		$conf->entity = constant('DOLENTITY');
-	}
 }
 
 
+// Init the 5 global objects, this include will make the 'new Xxx()' and set properties for: $conf, $db, $langs, $user, $mysoc
+require_once 'master.inc.php';
+
+
 // If software has been locked. Only login $conf->global->MAIN_ONLY_LOGIN_ALLOWED is allowed.
 if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
 {
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 28790c3c5a3..9efff08306f 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -169,9 +169,9 @@ if (session_id() && !empty($_SESSION["dol_entity"])) {
 } elseif (GETPOSTISSET("loginfunction") && GETPOST("entity", 'int')) {
 	// Just after a login page
 	$conf->entity = GETPOST("entity", 'int');
-} elseif (defined('DOLENTITY') && is_numeric(DOLENTITY)) {
+} elseif (defined('DOLENTITY') && is_numeric(constant('DOLENTITY'))) {
 	// For public page with MultiCompany module
-	$conf->entity = DOLENTITY;
+	$conf->entity = constant('DOLENTITY');
 }
 
 // Sanitize entity
@@ -186,22 +186,15 @@ if (!defined('NOREQUIREDB'))
 }
 
 // Overwrite database value
-if (!empty($conf->file->mailing_limit_sendbyweb))
-{
+if (!empty($conf->file->mailing_limit_sendbyweb)) {
 	$conf->global->MAILING_LIMIT_SENDBYWEB = $conf->file->mailing_limit_sendbyweb;
 }
-if (empty($conf->global->MAILING_LIMIT_SENDBYWEB))
-{
+if (empty($conf->global->MAILING_LIMIT_SENDBYWEB)) {
 	$conf->global->MAILING_LIMIT_SENDBYWEB = 25;
 }
-if (!empty($conf->file->mailing_limit_sendbycli))
-{
+if (!empty($conf->file->mailing_limit_sendbycli)) {
 	$conf->global->MAILING_LIMIT_SENDBYCLI = $conf->file->mailing_limit_sendbycli;
 }
-if (empty($conf->global->MAILING_LIMIT_SENDBYCLI))
-{
-	$conf->global->MAILING_LIMIT_SENDBYCLI = 0;
-}
 
 // Create object $mysoc (A thirdparty object that contains properties of companies managed by Dolibarr.
 if (!defined('NOREQUIREDB') && !defined('NOREQUIRESOC'))
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index b4354e086b5..fab2452c2b8 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -61,6 +61,12 @@ require_once DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php";
 $version = DOL_VERSION;
 $error = 0;
 
+if (empty($conf->global->MAILING_LIMIT_SENDBYCLI))
+{
+	$conf->global->MAILING_LIMIT_SENDBYCLI = 0;
+}
+
+
 /*
  * Main
  */

From 333449ca50baf810860c7fa7a4261c258e6d8eab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Dec 2020 13:40:03 +0100
Subject: [PATCH 183/888] Fix security trans

---
 htdocs/accountancy/index.php | 83 ++++++++++++++++++------------------
 1 file changed, 41 insertions(+), 42 deletions(-)

diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index 20010cc8f5c..834af1ff06a 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2016       Laurent Destailleur		<eldy@users.sourceforge.net>
+/* Copyright (C) 2016-2020  Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2016-2019  Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2019       Frédéric France			<frederic.france@netlogic.fr>
  *
@@ -103,13 +103,19 @@ if ($conf->accounting->enabled)
 
 	// STEPS
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescJournalSetup", $step, '<a href="'.DOL_URL_ROOT.'/accountancy/admin/journals_list.php?id=35"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("AccountingJournals").'</strong></a>');
+	$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescJournalSetup", $step, '{s}');
+	$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/admin/journals_list.php?id=35"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("AccountingJournals").'</strong></a>', $s);
+	print $s;
 	print "<br>\n";
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChartModel", $step, '<a href="'.DOL_URL_ROOT.'/accountancy/admin/accountmodel.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Pcg_version").'</strong></a>');
+	$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChartModel", $step, '{s}');
+	$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/admin/accountmodel.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Pcg_version").'</strong></a>', $s);
+	print $s;
 	print "<br>\n";
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChart", $step, '<a href="'.DOL_URL_ROOT.'/accountancy/admin/account.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Chartofaccounts").'</strong></a>');
+	$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChart", $step, '{s}');
+	$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/admin/account.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Chartofaccounts").'</strong></a>', $s);
+	print $s;
 	print "<br>\n";
 
 	print "<br>\n";
@@ -118,60 +124,45 @@ if ($conf->accounting->enabled)
 	print "<br>\n";
 
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescDefault", $step, '<a href="'.DOL_URL_ROOT.'/accountancy/admin/defaultaccounts.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong></a>');
+	$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescDefault", $step, '{s}');
+	$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/admin/defaultaccounts.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong></a>', $s);
+	print $s;
 	print "<br>\n";
 
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBank", $step, '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuBankAccounts").'</strong></a>')."\n";
+	$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBank", $step, '{s}')."\n";
+	$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuBankAccounts").'</strong></a>', $s);
+	print $s;
 	print "<br>\n";
 
 	$step++;
 	$textlink = '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=10&from=accountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuVatAccounts").'</strong></a>';
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescVat", $step, $textlink);
+	$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescVat", $step, '{s}');
+	$s = str_replace('{s}', $textlink, $s);
+	print $s;
 	print "<br>\n";
 	if (!empty($conf->tax->enabled))
 	{
 		$textlink = '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=7&from=accountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuTaxAccounts").'</strong></a>';
 		$step++;
-		print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescContrib", $step, $textlink);
+		$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescContrib", $step, '{s}');
+		$s = str_replace('{s}', $textlink, $s);
+		print $s;
 		print "<br>\n";
 	}
-	/*if (! empty($conf->salaries->enabled))
-	{
-	    $step++;
-	    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescSal", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").' - '.$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
-	    // htdocs/admin/salaries.php
-	    print "<br>\n";
-	    print "<br>\n";
-	}*/
 	if (!empty($conf->expensereport->enabled))  // TODO Move this in the default account page because this is only one accounting account per purpose, not several.
 	{
 		$step++;
-		print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescExpenseReport", $step, '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=17&from=accountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuExpenseReportAccounts").'</strong></a>');
+		$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescExpenseReport", $step, '{s}');
+		$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=17&from=accountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuExpenseReportAccounts").'</strong></a>', $s);
+		print $s;
 		print "<br>\n";
 	}
-	/*
-	if (! empty($conf->loan->enabled))
-	{
-	    $step++;
-	    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescLoan", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuSpecialExpenses").' - '.$langs->transnoentitiesnoconv("Loans").'</strong> '.$langs->transnoentitiesnoconv("or").' <strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
-	    print "<br>\n";
-	}
-	if (! empty($conf->don->enabled))
-	{
-	    $step++;
-	    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescDonation", $step, '<strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
-	    print "<br>\n";
-	}
-	if (! empty($conf->adherents->enabled))
-	{
-	    $step++;
-	    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescSubscription", $step, '<strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
-	    print "<br>\n";
-	}*/
 
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescProd", $step, '<a href="'.DOL_URL_ROOT.'/accountancy/admin/productaccount.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("ProductsBinding").'</strong></a>');
+	$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescProd", $step, '{s}');
+	$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/admin/productaccount.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("ProductsBinding").'</strong></a>', $s);
+	print $s;
 	print "<br>\n";
 
 
@@ -188,26 +179,34 @@ if ($conf->accounting->enabled)
 	$langs->loadLangs(array('bills', 'trips'));
 
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("BillsCustomers"), '<a href="'.DOL_URL_ROOT.'/accountancy/customer/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("CustomersVentilation").'</strong></a>')."\n";
+	$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("BillsCustomers"), '{s}')."\n";
+	$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/customer/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("CustomersVentilation").'</strong></a>', $s);
+	print $s;
 	print "<br>\n";
 
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("BillsSuppliers"), '<a href="'.DOL_URL_ROOT.'/accountancy/supplier/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("SuppliersVentilation").'</strong></a>')."\n";
+	$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("BillsSuppliers"), '{s}')."\n";
+	$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/supplier/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("SuppliersVentilation").'</strong></a>', $s);
+	print $s;
 	print "<br>\n";
 
 	if (!empty($conf->expensereport->enabled) || !empty($conf->deplacement->enabled))
 	{
 		$step++;
-		print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("ExpenseReports"), '<a href="'.DOL_URL_ROOT.'/accountancy/expensereport/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'</strong></a>')."\n";
+		$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("ExpenseReports"), '{s}')."\n";
+		$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/expensereport/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'</strong></a>', $s);
+		print $s;
 		print "<br>\n";
 	}
 
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescWriteRecords", chr(64 + $step), $langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("RegistrationInAccounting"), $langs->transnoentitiesnoconv("WriteBookKeeping"))."\n";
+	$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescWriteRecords", chr(64 + $step), $langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("RegistrationInAccounting"), $langs->transnoentitiesnoconv("WriteBookKeeping"))."\n";
+	print $s;
 	print "<br>\n";
 
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescAnalyze", chr(64 + $step))."<br>\n";
+	$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescAnalyze", chr(64 + $step))."<br>\n";
+	print $s;
 	print "<br>\n";
 
 	print '<br>';

From 5860bf69cefbcfe18f6f659299ac301ff941b87c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Dec 2020 13:48:51 +0100
Subject: [PATCH 184/888] fix warning

---
 htdocs/core/lib/functions.lib.php | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 6abfd2312e3..c99683601d8 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1888,8 +1888,7 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 		$ret .= ($extralangcode ? $object->array_languages['address'][$extralangcode] : $object->address);
 	}
 	// Zip/Town/State
-	if (in_array($object->country_code, array('AU', 'CA', 'US')) || !empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS))   	// US: title firstname name \n address lines \n town, state, zip \n country
-	{
+	if (isset($object->country_code) && in_array($object->country_code, array('AU', 'CA', 'US')) || !empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)) {  	// US: title firstname name \n address lines \n town, state, zip \n country
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= ($ret ? $sep : '').$town;
 		if ($object->state)
@@ -1897,8 +1896,7 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 			$ret .= ($ret ? ", " : '').$object->state;
 		}
 		if ($object->zip) $ret .= ($ret ? ", " : '').$object->zip;
-	} elseif (in_array($object->country_code, array('GB', 'UK'))) // UK: title firstname name \n address lines \n town state \n zip \n country
-	{
+	} elseif (isset($object->country_code) && in_array($object->country_code, array('GB', 'UK'))) { // UK: title firstname name \n address lines \n town state \n zip \n country
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= ($ret ? $sep : '').$town;
 		if ($object->state)
@@ -1906,8 +1904,7 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 			$ret .= ($ret ? ", " : '').$object->state;
 		}
 		if ($object->zip) $ret .= ($ret ? $sep : '').$object->zip;
-	} elseif (in_array($object->country_code, array('ES', 'TR'))) // ES: title firstname name \n address lines \n zip town \n state \n country
-	{
+	} elseif (isset($object->country_code) && in_array($object->country_code, array('ES', 'TR'))) { // ES: title firstname name \n address lines \n zip town \n state \n country
 		$ret .= ($ret ? $sep : '').$object->zip;
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= ($town ? (($object->zip ? ' ' : '').$town) : '');
@@ -1915,14 +1912,12 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 		{
 			$ret .= "\n".$object->state;
 		}
-	} elseif (in_array($object->country_code, array('IT'))) // IT: tile firstname name\n address lines \n zip (Code Departement) \n country
-	{
+	} elseif (isset($object->country_code) && in_array($object->country_code, array('IT'))) { // IT: tile firstname name\n address lines \n zip (Code Departement) \n country
 		$ret .= ($ret ? $sep : '').$object->zip;
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= ($town ? (($object->zip ? ' ' : '').$town) : '');
 		$ret .= ($object->state_code ? (' '.($object->state_code)) : '');
-	} else // Other: title firstname name \n address lines \n zip town \n country
-	{
+	} else { // Other: title firstname name \n address lines \n zip town \n country
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= $object->zip ? (($ret ? $sep : '').$object->zip) : '';
 		$ret .= ($town ? (($object->zip ? ' ' : ($ret ? $sep : '')).$town) : '');
@@ -1932,10 +1927,9 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 		}
 	}
 	if (!is_object($outputlangs)) $outputlangs = $langs;
-	if ($withcountry)
-	{
+	if ($withcountry) {
 		$langs->load("dict");
-		$ret .= ($object->country_code ? ($ret ? $sep : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->country_code)) : '');
+		$ret .= (empty($object->country_code) ? '' : ($ret ? $sep : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->country_code)));
 	}
 
 	return $ret;

From 15455690b971782e7214b94097177a8eeb9fbac0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Dec 2020 14:06:50 +0100
Subject: [PATCH 185/888] Fix setup

---
 htdocs/core/class/conf.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 5bb441ceb0a..09f2b0a44ae 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -537,6 +537,8 @@ class Conf
 		if (!empty($this->global->MAILING_EMAIL_FROM))	$this->mailing->email_from = $this->global->MAILING_EMAIL_FROM;
 		if (!isset($this->global->MAIN_EMAIL_ADD_TRACK_ID)) $this->global->MAIN_EMAIL_ADD_TRACK_ID = 1;
 
+		if (!isset($this->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP)) $this->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP = 1;
+
 		// Format for date (used by default when not found or not searched in lang)
 		$this->format_date_short = "%d/%m/%Y"; // Format of day with PHP/C tags (strftime functions)
 		$this->format_date_short_java = "dd/MM/yyyy"; // Format of day with Java tags

From cb9d6318e7c88f1d2f43b2a53b555c12e733e242 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Dec 2020 14:09:51 +0100
Subject: [PATCH 186/888] Fix warning

---
 htdocs/core/lib/functions.lib.php | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c99683601d8..babf1129e6e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1891,16 +1891,14 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 	if (isset($object->country_code) && in_array($object->country_code, array('AU', 'CA', 'US')) || !empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)) {  	// US: title firstname name \n address lines \n town, state, zip \n country
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= ($ret ? $sep : '').$town;
-		if ($object->state)
-		{
+		if (!empty($object->state))	{
 			$ret .= ($ret ? ", " : '').$object->state;
 		}
 		if ($object->zip) $ret .= ($ret ? ", " : '').$object->zip;
 	} elseif (isset($object->country_code) && in_array($object->country_code, array('GB', 'UK'))) { // UK: title firstname name \n address lines \n town state \n zip \n country
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= ($ret ? $sep : '').$town;
-		if ($object->state)
-		{
+		if (!empty($object->state)) {
 			$ret .= ($ret ? ", " : '').$object->state;
 		}
 		if ($object->zip) $ret .= ($ret ? $sep : '').$object->zip;
@@ -1908,21 +1906,19 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 		$ret .= ($ret ? $sep : '').$object->zip;
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= ($town ? (($object->zip ? ' ' : '').$town) : '');
-		if ($object->state)
-		{
+		if (!empty($object->state)) {
 			$ret .= "\n".$object->state;
 		}
 	} elseif (isset($object->country_code) && in_array($object->country_code, array('IT'))) { // IT: tile firstname name\n address lines \n zip (Code Departement) \n country
 		$ret .= ($ret ? $sep : '').$object->zip;
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= ($town ? (($object->zip ? ' ' : '').$town) : '');
-		$ret .= ($object->state_code ? (' '.($object->state_code)) : '');
+		$ret .= (empty($object->state_code) ? '' : (' '.$object->state_code));
 	} else { // Other: title firstname name \n address lines \n zip town \n country
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= $object->zip ? (($ret ? $sep : '').$object->zip) : '';
 		$ret .= ($town ? (($object->zip ? ' ' : ($ret ? $sep : '')).$town) : '');
-		if ($object->state && in_array($object->country_code, $countriesusingstate))
-		{
+		if (!empty($object->state) && in_array($object->country_code, $countriesusingstate)) {
 			$ret .= ($ret ? ", " : '').$object->state;
 		}
 	}

From 991cfde0a2bd05a96f5ef55d9fab1f84a874c0d9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Dec 2020 14:46:29 +0100
Subject: [PATCH 187/888] Fix css

---
 htdocs/admin/company.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 75dcb9b179f..51d7f84aae7 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -728,7 +728,7 @@ if ($mysoc->useLocalTax(1))
 	print '<div class="nobordernopadding">';
 	$tooltiphelp = $langs->transcountry("LocalTax1IsUsedExample", $mysoc->country_code);
 	$tooltiphelp = ($tooltiphelp != "LocalTax1IsUsedExample" ? "<i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsUsedExample", $mysoc->country_code)."</i>\n" : "");
-	print "<label for=\"lt1\">".$form->textwithpicto($langs->transcountry("LocalTax1IsUsedDesc", $mysoc->country_code), $tooltiphelp)."</label>";
+	print '<label for="lt1">'.$form->textwithpicto($langs->transcountry("LocalTax1IsUsedDesc", $mysoc->country_code), $tooltiphelp)."</label>";
 	if (!isOnlyOneLocalTax(1))
 	{
 		print '<br><label for="lt1">'.$langs->trans("LTRate").'</label>: ';
@@ -751,9 +751,9 @@ if ($mysoc->useLocalTax(1))
 } else {
 	if (empty($mysoc->country_code))
 	{
-		print '<tr class="oddeven nohover"><td class="opacitymedium">'.$countrynotdefined.'</td><td></td><td></td></tr>';
+		print '<tr class="oddeven nohover"><td class="">'.$countrynotdefined.'</td><td></td><td></td></tr>';
 	} else {
-		print '<tr class="oddeven nohover"><td class="opacitymedium" colspan="3">'.$langs->trans("NoLocalTaxXForThisCountry", $langs->transnoentitiesnoconv("Setup"), $langs->transnoentitiesnoconv("Dictionaries"), $langs->transnoentitiesnoconv("DictionaryVAT"), $langs->transnoentitiesnoconv("LocalTax1Management")).'</td></tr>';
+		print '<tr class="oddeven nohover"><td class="" colspan="3">'.$langs->trans("NoLocalTaxXForThisCountry", $langs->transnoentitiesnoconv("Setup"), $langs->transnoentitiesnoconv("Dictionaries"), $langs->transnoentitiesnoconv("DictionaryVAT"), $langs->transnoentitiesnoconv("LocalTax1Management")).'</td></tr>';
 	}
 }
 
@@ -773,7 +773,7 @@ if ($mysoc->useLocalTax(2))
 	print "<tr class=\"oddeven\"><td><input type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on") ? " checked" : "")."> ".$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code)."</td>";
 	print '<td colspan="2">';
 	print '<div class="nobordernopadding">';
-	print "<label for=\"lt2\">".$langs->transcountry("LocalTax2IsUsedDesc", $mysoc->country_code)."</label>";
+	print '<label for="lt2">'.$langs->transcountry("LocalTax2IsUsedDesc", $mysoc->country_code)."</label>";
 	$tooltiphelp = $langs->transcountry("LocalTax2IsUsedExample", $mysoc->country_code);
 	$tooltiphelp = ($tooltiphelp != "LocalTax2IsUsedExample" ? "<i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsUsedExample", $mysoc->country_code)."</i>\n" : "");
 	if (!isOnlyOneLocalTax(2))
@@ -797,9 +797,9 @@ if ($mysoc->useLocalTax(2))
 } else {
 	if (empty($mysoc->country_code))
 	{
-		print '<tr class="oddeven nohover"><td class="opacitymedium">'.$countrynotdefined.'</td><td></td><td></td></tr>';
+		print '<tr class="oddeven nohover"><td class="">'.$countrynotdefined.'</td><td></td><td></td></tr>';
 	} else {
-		print '<tr class="oddeven nohover"><td class="opacitymedium" colspan="3">'.$langs->trans("NoLocalTaxXForThisCountry", $langs->transnoentitiesnoconv("Setup"), $langs->transnoentitiesnoconv("Dictionaries"), $langs->transnoentitiesnoconv("DictionaryVAT"), $langs->transnoentitiesnoconv("LocalTax2Management")).'</td></tr>';
+		print '<tr class="oddeven nohover"><td class="" colspan="3">'.$langs->trans("NoLocalTaxXForThisCountry", $langs->transnoentitiesnoconv("Setup"), $langs->transnoentitiesnoconv("Dictionaries"), $langs->transnoentitiesnoconv("DictionaryVAT"), $langs->transnoentitiesnoconv("LocalTax2Management")).'</td></tr>';
 	}
 }
 
@@ -825,9 +825,9 @@ if ($mysoc->useRevenueStamp())
 } else {
 	if (empty($mysoc->country_code))
 	{
-		print '<tr class="oddeven nohover"><td class="opacitymedium">'.$countrynotdefined.'</td><td></td><td></td></tr>';
+		print '<tr class="oddeven nohover"><td class="">'.$countrynotdefined.'</td><td></td><td></td></tr>';
 	} else {
-		print '<tr class="oddeven nohover"><td class="opacitymedium" colspan="3">'.$langs->trans("NoLocalTaxXForThisCountry", $langs->transnoentitiesnoconv("Setup"), $langs->transnoentitiesnoconv("Dictionaries"), $langs->transnoentitiesnoconv("DictionaryRevenueStamp"), $langs->transnoentitiesnoconv("RevenueStamp")).'</td></tr>';
+		print '<tr class="oddeven nohover"><td class="" colspan="3">'.$langs->trans("NoLocalTaxXForThisCountry", $langs->transnoentitiesnoconv("Setup"), $langs->transnoentitiesnoconv("Dictionaries"), $langs->transnoentitiesnoconv("DictionaryRevenueStamp"), $langs->transnoentitiesnoconv("RevenueStamp")).'</td></tr>';
 	}
 }
 

From 6023f2e16f79fca7d03a07e5a5db1ffd801763af Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Dec 2020 14:57:41 +0100
Subject: [PATCH 188/888] Fix php8

---
 .../interface_50_modAgenda_ActionsAuto.class.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index fd082884ce2..3d4c4ed63b7 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -717,20 +717,20 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			if (empty($object->actionmsg2)) {
 				$langs->loadLangs(array("agenda", "other"));
-				if ($langs->transnoentities($action."InDolibarr", ($object->newref ? $object->newref : $object->ref)) != $action."InDolibarr") {	// specific translation key
-					$object->actionmsg2 = $langs->transnoentities($action."InDolibarr", ($object->newref ? $object->newref : $object->ref));
+				if ($langs->transnoentities($action."InDolibarr", (empty($object->newref) ? $object->ref : $object->newref)) != $action."InDolibarr") {	// specific translation key
+					$object->actionmsg2 = $langs->transnoentities($action."InDolibarr", (empty($object->newref) ? $object->ref : $object->newref));
 				} else {	// generic translation key
 					$tmp = explode('_', $action);
-					$object->actionmsg2 = $langs->transnoentities($tmp[count($tmp) - 1]."InDolibarr", ($object->newref ? $object->newref : $object->ref));
+					$object->actionmsg2 = $langs->transnoentities($tmp[count($tmp) - 1]."InDolibarr", (empty($object->newref) ? $object->ref : $object->newref));
 				}
 			}
 			if (empty($object->actionmsg)) {
 				$langs->loadLangs(array("agenda", "other"));
-				if ($langs->transnoentities($action."InDolibarr", ($object->newref ? $object->newref : $object->ref)) != $action."InDolibarr") {	// specific translation key
-					$object->actionmsg = $langs->transnoentities($action."InDolibarr", ($object->newref ? $object->newref : $object->ref));
+				if ($langs->transnoentities($action."InDolibarr", (empty($object->newref) ? $object->ref : $object->newref)) != $action."InDolibarr") {	// specific translation key
+					$object->actionmsg = $langs->transnoentities($action."InDolibarr", (empty($object->newref) ? $object->ref : $object->newref));
 				} else {	// generic translation key
 					$tmp = explode('_', $action);
-					$object->actionmsg = $langs->transnoentities($tmp[count($tmp) - 1]."InDolibarr", ($object->newref ? $object->newref : $object->ref));
+					$object->actionmsg = $langs->transnoentities($tmp[count($tmp) - 1]."InDolibarr", (empty($object->newref) ? $object->ref : $object->newref));
 				}
 			}
 
@@ -787,8 +787,8 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			if ($object->sendtoid > 0) $contactforaction->fetch($object->sendtoid);
 		}
 		// Set societeforaction.
-		if ($object->socid > 0)			$societeforaction->fetch($object->socid);
-		elseif ($object->fk_soc > 0)	$societeforaction->fetch($object->fk_soc);
+		if (isset($object->socid) && $object->socid > 0)		$societeforaction->fetch($object->socid);
+		elseif (isset($object->fk_soc) && $object->fk_soc > 0)	$societeforaction->fetch($object->fk_soc);
 
 		$projectid = isset($object->fk_project) ? $object->fk_project : 0;
 		if ($object->element == 'project') $projectid = $object->id;

From d1204e5e9b0a849834843367efceb61e2839533b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 5 Dec 2020 15:35:52 +0100
Subject: [PATCH 189/888] typo ortho

---
 htdocs/admin/mails_templates.php                             | 2 +-
 htdocs/compta/facture/card.php                               | 2 +-
 htdocs/core/lib/website2.lib.php                             | 2 +-
 htdocs/modulebuilder/template/admin/myobject_extrafields.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index de98c42b35a..6538d5c3011 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -1074,7 +1074,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print '<td class="center">';
 			if ($context == 'edit' && !empty($obj->{$fieldlist[$field]}) && !in_array($obj->{$fieldlist[$field]}, array_keys($elementList)))
 			{
-				// Current tempalte type is an unknown type, so we must keep it as it is.
+				// Current template type is an unknown type, so we must keep it as it is.
 				print '<input type="hidden" name="type_template" value="'.$obj->{$fieldlist[$field]}.'">';
 				print $obj->{$fieldlist[$field]};
 			} else {
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 110db6d8166..4451f13bd77 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3551,7 +3551,7 @@ if ($action == 'create')
 		print '</td></tr>';
 	}
 
-	// Lines from source (TODO Show them also when creating invoice from tempalte invoice)
+	// Lines from source (TODO Show them also when creating invoice from template invoice)
 	if (!empty($origin) && !empty($originid) && is_object($objectsrc))
 	{
 		// TODO for compatibility
diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 673b904b743..1ed80ece372 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -442,7 +442,7 @@ function dolSaveReadme($file, $content)
 /**
  * 	Show list of themes. Show all thumbs of themes/skins
  *
- *	@param	Website		$website		Object website to load the tempalte into
+ *	@param	Website		$website		Object website to load the template into
  * 	@return	void
  */
 function showWebsiteTemplates(Website $website)
diff --git a/htdocs/modulebuilder/template/admin/myobject_extrafields.php b/htdocs/modulebuilder/template/admin/myobject_extrafields.php
index fdc2161f504..fdd50d0e89b 100644
--- a/htdocs/modulebuilder/template/admin/myobject_extrafields.php
+++ b/htdocs/modulebuilder/template/admin/myobject_extrafields.php
@@ -21,7 +21,7 @@
  */
 
 /**
- *      \file       htdocs/modulebuilder/tempalte/admin/myobject_extrafields.php
+ *      \file       htdocs/modulebuilder/template/admin/myobject_extrafields.php
  *		\ingroup    mymodule
  *		\brief      Page to setup extra fields of myobject
  */

From 025523c6c0e4162f824896a73fdfac99ffd73ccc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 5 Dec 2020 15:40:23 +0100
Subject: [PATCH 190/888] Update myobject_extrafields.php

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

diff --git a/htdocs/modulebuilder/template/admin/myobject_extrafields.php b/htdocs/modulebuilder/template/admin/myobject_extrafields.php
index fdd50d0e89b..c844f80e4cc 100644
--- a/htdocs/modulebuilder/template/admin/myobject_extrafields.php
+++ b/htdocs/modulebuilder/template/admin/myobject_extrafields.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/bom.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('mrp@mrp', 'admin'));
+$langs->loadLangs(array('mymodule@mymodule', 'admin'));
 
 $extrafields = new ExtraFields($db);
 $form = new Form($db);

From 0c0566201053036c9f0b8014ca7d4df1ca8387d2 Mon Sep 17 00:00:00 2001
From: Zebedeu <marciozebedeu@gmail.com>
Date: Sat, 5 Dec 2020 16:31:44 +0100
Subject: [PATCH 191/888] Fix/FIX html tag formatting errors in the accounting
 area

---
 htdocs/accountancy/index.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index 20010cc8f5c..ef7e8f1c5fc 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -103,13 +103,13 @@ if ($conf->accounting->enabled)
 
 	// STEPS
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescJournalSetup", $step, '<a href="'.DOL_URL_ROOT.'/accountancy/admin/journals_list.php?id=35"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("AccountingJournals").'</strong></a>');
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescJournalSetup", $step). '<a href="'.DOL_URL_ROOT.'/accountancy/admin/journals_list.php?id=35"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("AccountingJournals").'</strong></a>';
 	print "<br>\n";
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChartModel", $step, '<a href="'.DOL_URL_ROOT.'/accountancy/admin/accountmodel.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Pcg_version").'</strong></a>');
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChartModel", $step). '<a href="'.DOL_URL_ROOT.'/accountancy/admin/accountmodel.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Pcg_version").'</strong></a>';
 	print "<br>\n";
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChart", $step, '<a href="'.DOL_URL_ROOT.'/accountancy/admin/account.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Chartofaccounts").'</strong></a>');
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChart", $step). '<a href="'.DOL_URL_ROOT.'/accountancy/admin/account.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Chartofaccounts").'</strong></a>';
 	print "<br>\n";
 
 	print "<br>\n";
@@ -118,22 +118,22 @@ if ($conf->accounting->enabled)
 	print "<br>\n";
 
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescDefault", $step, '<a href="'.DOL_URL_ROOT.'/accountancy/admin/defaultaccounts.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong></a>');
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescDefault", $step). '<a href="'.DOL_URL_ROOT.'/accountancy/admin/defaultaccounts.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong></a>';
 	print "<br>\n";
 
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBank", $step, '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuBankAccounts").'</strong></a>')."\n";
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBank", $step). '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuBankAccounts").'</strong></a>'."\n";
 	print "<br>\n";
 
 	$step++;
 	$textlink = '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=10&from=accountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuVatAccounts").'</strong></a>';
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescVat", $step, $textlink);
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescVat", $step). $textlink;
 	print "<br>\n";
 	if (!empty($conf->tax->enabled))
 	{
 		$textlink = '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=7&from=accountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuTaxAccounts").'</strong></a>';
 		$step++;
-		print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescContrib", $step, $textlink);
+		print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescContrib", $step). $textlink;
 		print "<br>\n";
 	}
 	/*if (! empty($conf->salaries->enabled))
@@ -147,7 +147,7 @@ if ($conf->accounting->enabled)
 	if (!empty($conf->expensereport->enabled))  // TODO Move this in the default account page because this is only one accounting account per purpose, not several.
 	{
 		$step++;
-		print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescExpenseReport", $step, '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=17&from=accountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuExpenseReportAccounts").'</strong></a>');
+		print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescExpenseReport", $step). '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=17&from=accountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuExpenseReportAccounts").'</strong></a>';
 		print "<br>\n";
 	}
 	/*
@@ -171,7 +171,7 @@ if ($conf->accounting->enabled)
 	}*/
 
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescProd", $step, '<a href="'.DOL_URL_ROOT.'/accountancy/admin/productaccount.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("ProductsBinding").'</strong></a>');
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescProd", $step). '<a href="'.DOL_URL_ROOT.'/accountancy/admin/productaccount.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("ProductsBinding").'</strong></a>';
 	print "<br>\n";
 
 
@@ -188,22 +188,22 @@ if ($conf->accounting->enabled)
 	$langs->loadLangs(array('bills', 'trips'));
 
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("BillsCustomers"), '<a href="'.DOL_URL_ROOT.'/accountancy/customer/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("CustomersVentilation").'</strong></a>')."\n";
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step)) . $langs->transnoentitiesnoconv("BillsCustomers") . '<a href="'.DOL_URL_ROOT.'/accountancy/customer/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("CustomersVentilation").'</strong></a>'."\n";
 	print "<br>\n";
 
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("BillsSuppliers"), '<a href="'.DOL_URL_ROOT.'/accountancy/supplier/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("SuppliersVentilation").'</strong></a>')."\n";
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step)). $langs->transnoentitiesnoconv("BillsSuppliers"). '<a href="'.DOL_URL_ROOT.'/accountancy/supplier/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("SuppliersVentilation").'</strong></a>'."\n";
 	print "<br>\n";
 
 	if (!empty($conf->expensereport->enabled) || !empty($conf->deplacement->enabled))
 	{
 		$step++;
-		print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("ExpenseReports"), '<a href="'.DOL_URL_ROOT.'/accountancy/expensereport/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'</strong></a>')."\n";
+		print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step)). $langs->transnoentitiesnoconv("ExpenseReports"). '<a href="'.DOL_URL_ROOT.'/accountancy/expensereport/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'</strong></a>'."\n";
 		print "<br>\n";
 	}
 
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescWriteRecords", chr(64 + $step), $langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("RegistrationInAccounting"), $langs->transnoentitiesnoconv("WriteBookKeeping"))."\n";
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescWriteRecords", chr(64 + $step)). $langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("RegistrationInAccounting") . $langs->transnoentitiesnoconv("WriteBookKeeping") ."\n";
 	print "<br>\n";
 
 	$step++;

From e126f9ce5de8f3d0e884a199514c6f44fb91f104 Mon Sep 17 00:00:00 2001
From: Zebedeu <marciozebedeu@gmail.com>
Date: Sat, 5 Dec 2020 16:41:36 +0100
Subject: [PATCH 192/888] Revert "Fix/FIX html tag formatting errors in the
 accounting area"

This reverts commit 0c0566201053036c9f0b8014ca7d4df1ca8387d2.
---
 htdocs/accountancy/index.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index ef7e8f1c5fc..20010cc8f5c 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -103,13 +103,13 @@ if ($conf->accounting->enabled)
 
 	// STEPS
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescJournalSetup", $step). '<a href="'.DOL_URL_ROOT.'/accountancy/admin/journals_list.php?id=35"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("AccountingJournals").'</strong></a>';
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescJournalSetup", $step, '<a href="'.DOL_URL_ROOT.'/accountancy/admin/journals_list.php?id=35"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("AccountingJournals").'</strong></a>');
 	print "<br>\n";
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChartModel", $step). '<a href="'.DOL_URL_ROOT.'/accountancy/admin/accountmodel.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Pcg_version").'</strong></a>';
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChartModel", $step, '<a href="'.DOL_URL_ROOT.'/accountancy/admin/accountmodel.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Pcg_version").'</strong></a>');
 	print "<br>\n";
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChart", $step). '<a href="'.DOL_URL_ROOT.'/accountancy/admin/account.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Chartofaccounts").'</strong></a>';
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChart", $step, '<a href="'.DOL_URL_ROOT.'/accountancy/admin/account.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Chartofaccounts").'</strong></a>');
 	print "<br>\n";
 
 	print "<br>\n";
@@ -118,22 +118,22 @@ if ($conf->accounting->enabled)
 	print "<br>\n";
 
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescDefault", $step). '<a href="'.DOL_URL_ROOT.'/accountancy/admin/defaultaccounts.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong></a>';
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescDefault", $step, '<a href="'.DOL_URL_ROOT.'/accountancy/admin/defaultaccounts.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong></a>');
 	print "<br>\n";
 
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBank", $step). '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuBankAccounts").'</strong></a>'."\n";
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBank", $step, '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuBankAccounts").'</strong></a>')."\n";
 	print "<br>\n";
 
 	$step++;
 	$textlink = '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=10&from=accountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuVatAccounts").'</strong></a>';
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescVat", $step). $textlink;
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescVat", $step, $textlink);
 	print "<br>\n";
 	if (!empty($conf->tax->enabled))
 	{
 		$textlink = '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=7&from=accountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuTaxAccounts").'</strong></a>';
 		$step++;
-		print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescContrib", $step). $textlink;
+		print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescContrib", $step, $textlink);
 		print "<br>\n";
 	}
 	/*if (! empty($conf->salaries->enabled))
@@ -147,7 +147,7 @@ if ($conf->accounting->enabled)
 	if (!empty($conf->expensereport->enabled))  // TODO Move this in the default account page because this is only one accounting account per purpose, not several.
 	{
 		$step++;
-		print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescExpenseReport", $step). '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=17&from=accountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuExpenseReportAccounts").'</strong></a>';
+		print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescExpenseReport", $step, '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=17&from=accountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuExpenseReportAccounts").'</strong></a>');
 		print "<br>\n";
 	}
 	/*
@@ -171,7 +171,7 @@ if ($conf->accounting->enabled)
 	}*/
 
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescProd", $step). '<a href="'.DOL_URL_ROOT.'/accountancy/admin/productaccount.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("ProductsBinding").'</strong></a>';
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescProd", $step, '<a href="'.DOL_URL_ROOT.'/accountancy/admin/productaccount.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("ProductsBinding").'</strong></a>');
 	print "<br>\n";
 
 
@@ -188,22 +188,22 @@ if ($conf->accounting->enabled)
 	$langs->loadLangs(array('bills', 'trips'));
 
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step)) . $langs->transnoentitiesnoconv("BillsCustomers") . '<a href="'.DOL_URL_ROOT.'/accountancy/customer/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("CustomersVentilation").'</strong></a>'."\n";
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("BillsCustomers"), '<a href="'.DOL_URL_ROOT.'/accountancy/customer/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("CustomersVentilation").'</strong></a>')."\n";
 	print "<br>\n";
 
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step)). $langs->transnoentitiesnoconv("BillsSuppliers"). '<a href="'.DOL_URL_ROOT.'/accountancy/supplier/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("SuppliersVentilation").'</strong></a>'."\n";
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("BillsSuppliers"), '<a href="'.DOL_URL_ROOT.'/accountancy/supplier/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("SuppliersVentilation").'</strong></a>')."\n";
 	print "<br>\n";
 
 	if (!empty($conf->expensereport->enabled) || !empty($conf->deplacement->enabled))
 	{
 		$step++;
-		print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step)). $langs->transnoentitiesnoconv("ExpenseReports"). '<a href="'.DOL_URL_ROOT.'/accountancy/expensereport/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'</strong></a>'."\n";
+		print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("ExpenseReports"), '<a href="'.DOL_URL_ROOT.'/accountancy/expensereport/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'</strong></a>')."\n";
 		print "<br>\n";
 	}
 
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescWriteRecords", chr(64 + $step)). $langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("RegistrationInAccounting") . $langs->transnoentitiesnoconv("WriteBookKeeping") ."\n";
+	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescWriteRecords", chr(64 + $step), $langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("RegistrationInAccounting"), $langs->transnoentitiesnoconv("WriteBookKeeping"))."\n";
 	print "<br>\n";
 
 	$step++;

From 6c2d520e214a513a10172b8992ef0253c708eceb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Dec 2020 17:41:05 +0100
Subject: [PATCH 193/888] FIX caluclation of open days must not depends on TZ.

---
 htdocs/core/lib/date.lib.php | 283 +++++++++++++++++++----------------
 1 file changed, 154 insertions(+), 129 deletions(-)

diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 1e7f9b299c6..df20f0a9a67 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -597,10 +597,24 @@ function dol_get_first_day_week($day, $month, $year, $gm = false)
 	return array('year' => $year, 'month' => $month, 'week' => $week, 'first_day' => $tmpday, 'first_month' => $tmpmonth, 'first_year' => $tmpyear, 'prev_year' => $prev_year, 'prev_month' => $prev_month, 'prev_day' => $prev_day);
 }
 
+/**
+ *	Return the easte day in GMT time.
+ *  This function replaces easter_date() that returns a date in local TZ.
+ *
+ *	@param	    int			$year     			Year
+ *	@return   	int								GMT Date
+ */
+function getGMTEasterDatetime($year) {
+	$base = new DateTime("$year-03-21");
+	$days = easter_days($year);	// Return number of days between 21 march and easter day.
+	$tmp = $base->add(new DateInterval("P{$days}D"));
+	return $tmp->getTimestamp();
+}
+
 /**
  *	Return the number of non working days including saturday and sunday (or not) between 2 dates in timestamp.
  *  Dates must be UTC with hour, day, min to 0.
- *	Called by function num_open_day
+ *	Called by function num_open_day()
  *
  *	@param	    int			$timestampStart     Timestamp de debut
  *	@param	    int			$timestampEnd       Timestamp de fin
@@ -616,7 +630,6 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 	global $db, $conf, $mysoc;
 
 	$nbFerie = 0;
-	$specialdayrule = array();
 
 	// Check to ensure we use correct parameters
 	if ((($timestampEnd - $timestampStart) % 86400) != 0) return 'Error Dates must use same hours and must be GMT dates';
@@ -626,20 +639,23 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 	if ($includesaturday < 0) $includesaturday = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY : 1);
 	if ($includesunday < 0)   $includesunday   = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY : 1);
 
+	$country_id = dol_getIdFromCode($db, $country_code, 'c_country', 'code', 'rowid');
 
 	$i = 0;
 	while ((($lastday == 0 && $timestampStart < $timestampEnd) || ($lastday && $timestampStart <= $timestampEnd))
 		&& ($i < 50000))		// Loop end when equals (Test on i is a security loop to avoid infinite loop)
 	{
 		$ferie = false;
+		$specialdayrule = array();
 
-		$jour  = date("d", $timestampStart);
-		$mois  = date("m", $timestampStart);
-		$annee = date("Y", $timestampStart);
+		$jour  = gmdate("d", $timestampStart);
+		$mois  = gmdate("m", $timestampStart);
+		$annee = gmdate("Y", $timestampStart);
 
-		$country_id = dol_getIdFromCode($db, $country_code, 'c_country', 'code', 'rowid');
+		//print "jour=".$jour." month=".$mois." year=".$annee." includesaturday=".$includesaturday." includesunday=".$includesunday."\n";
 
-		// Loop on public holiday defined into hrm_public_holiday
+		// Loop on public holiday defined into hrm_public_holiday for the day, month and year analyzed
+		// TODO Execute this request first and store results into an array, then reuse this array.
 		$sql = "SELECT code, entity, fk_country, dayrule, year, month, day, active";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_hrm_public_holiday";
 		$sql .= " WHERE active = 1 and fk_country IN (0".($country_id > 0 ? ", ".$country_id : 0).")";
@@ -671,139 +687,147 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 			dol_syslog($db->lasterror(), LOG_ERR);
 			return 'Error sql '.$db->lasterror();
 		}
+		//var_dump($specialdayrule)."\n";
+		//print "ferie=".$ferie."\n";
 
-		// Special dayrules
-		if (in_array('easter', $specialdayrule))
-		{
-			// Calculation for easter date
-			$date_paques = easter_date($annee);
-			$jour_paques = date("d", $date_paques);
-			$mois_paques = date("m", $date_paques);
-			if ($jour_paques == $jour && $mois_paques == $mois) $ferie = true;
-			// Easter (sunday)
-		}
+		if (!$ferie) {
+			// Special dayrules
+			if (in_array('easter', $specialdayrule))
+			{
+				// Calculation for easter date
+				$date_paques = getGMTEasterDatetime($annee);
+				$jour_paques = gmdate("d", $date_paques);
+				$mois_paques = gmdate("m", $date_paques);
+				if ($jour_paques == $jour && $mois_paques == $mois) $ferie = true;
+				// Easter (sunday)
+			}
 
-		if (in_array('eastermonday', $specialdayrule))
-		{
-			// Calculation for the monday of easter date
-			$date_paques = easter_date($annee);
-			$date_lundi_paques = mktime(
-				date("H", $date_paques),
-				date("i", $date_paques),
-				date("s", $date_paques),
-				date("m", $date_paques),
-				date("d", $date_paques) + 1,
-				date("Y", $date_paques)
-			);
-			$jour_lundi_ascension = date("d", $date_lundi_paques);
-			$mois_lundi_ascension = date("m", $date_lundi_paques);
-			if ($jour_lundi_ascension == $jour && $mois_lundi_ascension == $mois) $ferie = true;
-			// Easter (monday)
-		}
-
-		if (in_array('ascension', $specialdayrule))
-		{
-			// Calcul du jour de l'ascension (39 days after easter day)
-			$date_paques = easter_date($annee);
-			$date_ascension = mktime(
-				date("H", $date_paques),
-				date("i", $date_paques),
-				date("s", $date_paques),
-				date("m", $date_paques),
-				date("d", $date_paques) + 39,
-				date("Y", $date_paques)
-			);
-			$jour_ascension = date("d", $date_ascension);
-			$mois_ascension = date("m", $date_ascension);
-			if ($jour_ascension == $jour && $mois_ascension == $mois) $ferie = true;
-			// Ascension (thursday)
-		}
-
-		if (in_array('pentecote', $specialdayrule))
-		{
-			// Calculation of "Pentecote" (49 days after easter day)
-			$date_paques = easter_date($annee);
-			$date_pentecote = mktime(
-				date("H", $date_paques),
-				date("i", $date_paques),
-				date("s", $date_paques),
-				date("m", $date_paques),
-				date("d", $date_paques) + 49,
-				date("Y", $date_paques)
-			);
-			$jour_pentecote = date("d", $date_pentecote);
-			$mois_pentecote = date("m", $date_pentecote);
-			if ($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie = true;
-			// "Pentecote" (sunday)
-		}
-		if (in_array('pentecotemonday', $specialdayrule))
-		{
-			// Calculation of "Pentecote" (49 days after easter day)
-			$date_paques = easter_date($annee);
-			$date_pentecote = mktime(
-				date("H", $date_paques),
-				date("i", $date_paques),
-				date("s", $date_paques),
-				date("m", $date_paques),
-				date("d", $date_paques) + 50,
-				date("Y", $date_paques)
+			if (in_array('eastermonday', $specialdayrule))
+			{
+				// Calculation for the monday of easter date
+				$date_paques = getGMTEasterDatetime($annee);
+				$date_lundi_paques = mktime(
+					gmdate("H", $date_paques),
+					gmdate("i", $date_paques),
+					gmdate("s", $date_paques),
+					gmdate("m", $date_paques),
+					gmdate("d", $date_paques) + 1,
+					gmdate("Y", $date_paques)
 				);
-			$jour_pentecote = date("d", $date_pentecote);
-			$mois_pentecote = date("m", $date_pentecote);
-			if ($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie = true;
-			// "Pentecote" (monday)
-		}
+				$jour_lundi_paques = gmdate("d", $date_lundi_paques);
+				$mois_lundi_paques = gmdate("m", $date_lundi_paques);
+				if ($jour_lundi_paques == $jour && $mois_lundi_paques == $mois) $ferie = true;
+				// Easter (monday)
+			}
 
-		if (in_array('viernessanto', $specialdayrule))
-		{
-			// Viernes Santo
-			$date_paques = easter_date($annee);
-			$date_viernes = mktime(
-				date("H", $date_paques),
-				date("i", $date_paques),
-				date("s", $date_paques),
-				date("m", $date_paques),
-				date("d", $date_paques) - 2,
-				date("Y", $date_paques)
-			);
-			$jour_viernes = date("d", $date_viernes);
-			$mois_viernes = date("m", $date_viernes);
-			if ($jour_viernes == $jour && $mois_viernes == $mois) $ferie = true;
-			//Viernes Santo
-		}
-
-		if (in_array('fronleichnam', $specialdayrule))
-		{
-			// Fronleichnam (60 days after easter sunday)
-			$date_paques = easter_date($annee);
-			$date_fronleichnam = mktime(
-				date("H", $date_paques),
-				date("i", $date_paques),
-				date("s", $date_paques),
-				date("m", $date_paques),
-				date("d", $date_paques) + 60,
-				date("Y", $date_paques)
+			if (in_array('ascension', $specialdayrule))
+			{
+				// Calcul du jour de l'ascension (39 days after easter day)
+				$date_paques = getGMTEasterDatetime($annee);
+				$date_ascension = mktime(
+					gmdate("H", $date_paques),
+					gmdate("i", $date_paques),
+					gmdate("s", $date_paques),
+					gmdate("m", $date_paques),
+					gmdate("d", $date_paques) + 39,
+					gmdate("Y", $date_paques)
 				);
-			$jour_fronleichnam = date("d", $date_fronleichnam);
-			$mois_fronleichnam = date("m", $date_fronleichnam);
-			if ($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) $ferie = true;
-			// Fronleichnam
+				$jour_ascension = gmdate("d", $date_ascension);
+				$mois_ascension = gmdate("m", $date_ascension);
+				if ($jour_ascension == $jour && $mois_ascension == $mois) $ferie = true;
+				// Ascension (thursday)
+			}
+
+			if (in_array('pentecote', $specialdayrule))
+			{
+				// Calculation of "Pentecote" (49 days after easter day)
+				$date_paques = getGMTEasterDatetime($annee);
+				$date_pentecote = mktime(
+					gmdate("H", $date_paques),
+					gmdate("i", $date_paques),
+					gmdate("s", $date_paques),
+					gmdate("m", $date_paques),
+					gmdate("d", $date_paques) + 49,
+					gmdate("Y", $date_paques)
+				);
+				$jour_pentecote = gmdate("d", $date_pentecote);
+				$mois_pentecote = gmdate("m", $date_pentecote);
+				if ($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie = true;
+				// "Pentecote" (sunday)
+			}
+			if (in_array('pentecotemonday', $specialdayrule))
+			{
+				// Calculation of "Pentecote" (49 days after easter day)
+				$date_paques = getGMTEasterDatetime($annee);
+				$date_pentecote = mktime(
+					gmdate("H", $date_paques),
+					gmdate("i", $date_paques),
+					gmdate("s", $date_paques),
+					gmdate("m", $date_paques),
+					gmdate("d", $date_paques) + 50,
+					gmdate("Y", $date_paques)
+					);
+				$jour_pentecote = gmdate("d", $date_pentecote);
+				$mois_pentecote = gmdate("m", $date_pentecote);
+				if ($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie = true;
+				// "Pentecote" (monday)
+			}
+
+			if (in_array('viernessanto', $specialdayrule))
+			{
+				// Viernes Santo
+				$date_paques = getGMTEasterDatetime($annee);
+				$date_viernes = mktime(
+					gmdate("H", $date_paques),
+					gmdate("i", $date_paques),
+					gmdate("s", $date_paques),
+					gmdate("m", $date_paques),
+					gmdate("d", $date_paques) - 2,
+					gmdate("Y", $date_paques)
+				);
+				$jour_viernes = gmdate("d", $date_viernes);
+				$mois_viernes = gmdate("m", $date_viernes);
+				if ($jour_viernes == $jour && $mois_viernes == $mois) $ferie = true;
+				//Viernes Santo
+			}
+
+			if (in_array('fronleichnam', $specialdayrule))
+			{
+				// Fronleichnam (60 days after easter sunday)
+				$date_paques = getGMTEasterDatetime($annee);
+				$date_fronleichnam = mktime(
+					gmdate("H", $date_paques),
+					gmdate("i", $date_paques),
+					gmdate("s", $date_paques),
+					gmdate("m", $date_paques),
+					gmdate("d", $date_paques) + 60,
+					gmdate("Y", $date_paques)
+					);
+				$jour_fronleichnam = gmdate("d", $date_fronleichnam);
+				$mois_fronleichnam = gmdate("m", $date_fronleichnam);
+				if ($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) $ferie = true;
+				// Fronleichnam
+			}
 		}
+		//print "ferie=".$ferie."\n";
 
 		// If we have to include saturday and sunday
-		if ($includesaturday || $includesunday)
-		{
-			$jour_julien = unixtojd($timestampStart);
-			$jour_semaine = jddayofweek($jour_julien, 0);
-			if ($includesaturday)					//Saturday (6) and Sunday (0)
+		if (!$ferie) {
+			if ($includesaturday || $includesunday)
 			{
-				if ($jour_semaine == 6) $ferie = true;
-			}
-			if ($includesunday)						//Saturday (6) and Sunday (0)
-			{
-				if ($jour_semaine == 0) $ferie = true;
+				$jour_julien = unixtojd($timestampStart);
+				$jour_semaine = jddayofweek($jour_julien, 0);
+				if ($includesaturday)					//Saturday (6) and Sunday (0)
+				{
+					if ($jour_semaine == 6) $ferie = true;
+				}
+				if ($includesunday)						//Saturday (6) and Sunday (0)
+				{
+					if ($jour_semaine == 0) $ferie = true;
+				}
 			}
 		}
+		//print "ferie=".$ferie."\n";
 
 		// We increase the counter of non working day
 		if ($ferie) $nbFerie++;
@@ -815,6 +839,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 		$i++;
 	}
 
+	//print "nbFerie=".$nbFerie."\n";
 	return $nbFerie;
 }
 

From 18319f4fd31a0197c923bb83d8aaff5e63b2e44d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 5 Dec 2020 18:05:09 +0100
Subject: [PATCH 194/888] fix trans replace html

---
 htdocs/accountancy/journal/bankjournal.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 0acb4e0bedd..2fbdd57c786 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2013-2019  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2013-2014  Florian Henry           <florian.henry@open-concept.pro>
  * Copyright (C) 2013-2014  Olivier Geffroy         <jeff@jeffinfo.com>
- * Copyright (C) 2017-2018  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2017-2020  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2018		Ferran Marcet	        <fmarcet@2byte.es>
  * Copyright (C) 2018		Eric Seigne	            <eric.seigne@cap-rel.fr>
  *
@@ -970,10 +970,11 @@ if (empty($action) || $action == 'view') {
 	if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
-		if ($obj->nb > 0)
-		{
+		if ($obj->nb > 0) {
 			print '<br><div class="warning">'.img_warning().' '.$langs->trans("TheJournalCodeIsNotDefinedOnSomeBankAccount");
-			print ' : '.$langs->trans("AccountancyAreaDescBank", 9, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("BankAccounts").'</strong>');
+			$desc = ' : '.$langs->trans("AccountancyAreaDescBank", 9, '{link}');
+			$desc = str_replace('{link}', '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("BankAccounts").'</strong>', $desc);
+			print $desc;
 			print '</div>';
 		}
 	} else dol_print_error($db);

From 7099dbbb05817e62f42ce4868f3e9064d9a5f47d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 5 Dec 2020 18:17:04 +0100
Subject: [PATCH 195/888] fix trans removeing html

---
 htdocs/compta/stats/index.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index 1a1de43709d..93f91b25449 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2012  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2017       Olivier Geffroy         <jeff@jeffinfo.com>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric 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
@@ -122,7 +122,9 @@ if ($modecompta == "CREANCES-DETTES")
 	$name = $langs->trans("Turnover");
 	$calcmode = $langs->trans("CalcModeDebt");
 	//$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
-	$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '<a class="bold" href="'.$_SERVER["PHP_SELF"].'?'.($param ? $param : 'year_start='.$year_start).'&modecompta=BOOKKEEPING">', '</a>').')';
+	$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '{links1}', '{link2}').')';
+	$calcmode = str_replace('{link1}', '<a class="bold" href="'.$_SERVER["PHP_SELF"].'?'.($param ? $param : 'year_start='.$year_start).'&modecompta=BOOKKEEPING">', $calcmode);
+	$calcmode = str_replace('{link2}', '</a>', $calcmode);
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesCADue");
@@ -146,7 +148,9 @@ if ($modecompta == "CREANCES-DETTES")
 {
 	$name = $langs->trans("Turnover");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
-	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '<a class="bold" href="'.$_SERVER["PHP_SELF"].'?'.($param ? $param : 'year_start='.$year_start).'&modecompta=CREANCES-DETTES">', '</a>').')';
+	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '{link1}', '{link2}').')';
+	$calcmode = str_replace('{link1}', '<a class="bold" href="'.$_SERVER["PHP_SELF"].'?'.($param ? $param : 'year_start='.$year_start).'&modecompta=CREANCES-DETTES">', $calcmode);
+	$calcmode = str_replace('{link2}', '</a>', $calcmode);
 	//$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");

From 90a5c90a5a8fe775fb2bcb2a6ae816b0acceb4f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 5 Dec 2020 18:19:33 +0100
Subject: [PATCH 196/888] fix trans removeing html

---
 htdocs/accountancy/journal/bankjournal.php | 414 +++++++++++----------
 1 file changed, 217 insertions(+), 197 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 0acb4e0bedd..5e6650562ab 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -73,15 +73,18 @@ $date_endmonth = GETPOST('date_endmonth', 'int');
 $date_endday = GETPOST('date_endday', 'int');
 $date_endyear = GETPOST('date_endyear', 'int');
 $in_bookkeeping = GETPOST('in_bookkeeping', 'aZ09');
-if ($in_bookkeeping == '') $in_bookkeeping = 'notyet';
+if ($in_bookkeeping == '') {
+	$in_bookkeeping = 'notyet';
+}
 
 $now = dol_now();
 
 $action = GETPOST('action', 'aZ09');
 
 // Security check
-if ($user->socid > 0 && empty($id_journal))
+if ($user->socid > 0 && empty($id_journal)) {
 	accessforbidden();
+}
 
 
 /*
@@ -93,8 +96,7 @@ $error = 0;
 $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
 $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 
-if (empty($date_startmonth) || empty($date_endmonth))
-{
+if (empty($date_startmonth) || empty($date_endmonth)) {
 	// Period by default on transfer
 	$dates = getDefaultDatesForTransfer();
 	$date_start = $dates['date_start'];
@@ -103,8 +105,7 @@ if (empty($date_startmonth) || empty($date_endmonth))
 	$pastmonth = $dates['pastmonth'];
 }
 
-if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))) // We define date_start and date_end, only if we did not submit the form
-{
+if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))) { // We define date_start and date_end, only if we did not submit the form
 	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
 	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
@@ -124,19 +125,18 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as soc on bu1.url_id=soc.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on bu2.url_id=u.rowid";
 $sql .= " WHERE ba.fk_accountancy_journal=".$id_journal;
 $sql .= ' AND b.amount != 0 AND ba.entity IN ('.getEntity('bank_account', 0).')'; // We don't share object for accountancy
-if ($date_start && $date_end)
+if ($date_start && $date_end) {
 	$sql .= " AND b.dateo >= '".$db->idate($date_start)."' AND b.dateo <= '".$db->idate($date_end)."'";
+}
 // Define begin binding date
 if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
 	$sql .= " AND b.dateo >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
 }
 // Already in bookkeeping or not
-if ($in_bookkeeping == 'already')
-{
+if ($in_bookkeeping == 'already') {
 	$sql .= " AND (b.rowid IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab  WHERE ab.doc_type='bank') )";
 }
-if ($in_bookkeeping == 'notyet')
-{
+if ($in_bookkeeping == 'notyet') {
 	$sql .= " AND (b.rowid NOT IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab  WHERE ab.doc_type='bank') )";
 }
 $sql .= " ORDER BY b.datev";
@@ -177,9 +177,9 @@ if ($result) {
 	//print $sql;
 
 	// Variables
-	$account_supplier			= (($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER != "") ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : 'NotDefined'); // NotDefined is a reserved word
-	$account_customer			= (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER != "") ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : 'NotDefined'); // NotDefined is a reserved word
-	$account_employee			= (!empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) ? $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT : 'NotDefined'); // NotDefined is a reserved word
+	$account_supplier = (($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER != "") ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : 'NotDefined'); // NotDefined is a reserved word
+	$account_customer = (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER != "") ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : 'NotDefined'); // NotDefined is a reserved word
+	$account_employee = (!empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) ? $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT : 'NotDefined'); // NotDefined is a reserved word
 	$account_pay_vat = (!empty($conf->global->ACCOUNTING_VAT_PAY_ACCOUNT) ? $conf->global->ACCOUNTING_VAT_PAY_ACCOUNT : 'NotDefined'); // NotDefined is a reserved word
 	$account_pay_donation = (!empty($conf->global->DONATION_ACCOUNTINGACCOUNT) ? $conf->global->DONATION_ACCOUNTINGACCOUNT : 'NotDefined'); // NotDefined is a reserved word
 	$account_pay_subscription = (!empty($conf->global->ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT) ? $conf->global->ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT : 'NotDefined'); // NotDefined is a reserved word
@@ -198,23 +198,28 @@ if ($result) {
 	// one line for bank record = tabbq
 	// one line for thirdparty record = tabtp
 	$i = 0;
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$obj = $db->fetch_object($result);
 
 		$lineisapurchase = -1;
 		$lineisasale = -1;
 		// Old method to detect if it's a sale or purchase
-		if ($obj->label == '(SupplierInvoicePayment)' || $obj->label == '(SupplierInvoicePaymentBack)') $lineisapurchase = 1;
-		if ($obj->label == '(CustomerInvoicePayment)' || $obj->label == '(CustomerInvoicePaymentBack)') $lineisasale = 1;
-		// Try a more reliable method to detect if record is a supplier payment or a customer payment
-		if ($lineisapurchase < 0)
-		{
-			if ($obj->typeop_payment_supplier == 'payment_supplier') $lineisapurchase = 1;
+		if ($obj->label == '(SupplierInvoicePayment)' || $obj->label == '(SupplierInvoicePaymentBack)') {
+			$lineisapurchase = 1;
 		}
-		if ($lineisasale < 0)
-		{
-			if ($obj->typeop_payment == 'payment') $lineisasale = 1;
+		if ($obj->label == '(CustomerInvoicePayment)' || $obj->label == '(CustomerInvoicePaymentBack)') {
+			$lineisasale = 1;
+		}
+		// Try a more reliable method to detect if record is a supplier payment or a customer payment
+		if ($lineisapurchase < 0) {
+			if ($obj->typeop_payment_supplier == 'payment_supplier') {
+				$lineisapurchase = 1;
+			}
+		}
+		if ($lineisasale < 0) {
+			if ($obj->typeop_payment == 'payment') {
+				$lineisasale = 1;
+			}
 		}
 		//var_dump($obj->type_payment); var_dump($obj->type_payment_supplier);
 		//var_dump($lineisapurchase); //var_dump($lineisasale);
@@ -224,28 +229,30 @@ if ($result) {
 
 		// Set accountancy code for thirdparty (example: '411CU...' or '411' if no subledger account defined on customer)
 		$compta_soc = 'NotDefined';
-		if ($lineisapurchase > 0)
+		if ($lineisapurchase > 0) {
 			$compta_soc = (($obj->code_compta_fournisseur != "") ? $obj->code_compta_fournisseur : $account_supplier);
-		if ($lineisasale > 0)
+		}
+		if ($lineisasale > 0) {
 			$compta_soc = (!empty($obj->code_compta) ? $obj->code_compta : $account_customer);
+		}
 
 		$tabcompany[$obj->rowid] = array(
-				'id' => $obj->socid,
-				'name' => $obj->name,
-				'code_compta' => $compta_soc,
-				'email' => $obj->email
+			'id' => $obj->socid,
+			'name' => $obj->name,
+			'code_compta' => $compta_soc,
+			'email' => $obj->email
 		);
 
 		// Set accountancy code for user
 		$compta_user = (!empty($obj->accountancy_code) ? $obj->accountancy_code : '');
 
 		$tabuser[$obj->rowid] = array(
-				'id' => $obj->userid,
-				'name' => dolGetFirstLastname($obj->firstname, $obj->lastname),
-				'lastname' => $obj->lastname,
-				'firstname' => $obj->firstname,
-				'email' => $obj->useremail,
-				'accountancy_code' => $compta_user
+			'id' => $obj->userid,
+			'name' => dolGetFirstLastname($obj->firstname, $obj->lastname),
+			'lastname' => $obj->lastname,
+			'firstname' => $obj->firstname,
+			'email' => $obj->useremail,
+			'accountancy_code' => $compta_user
 		);
 
 		// Variable bookkeeping ($obj->rowid is Bank Id)
@@ -264,10 +271,6 @@ if ($result) {
 		// Load of url links to the line into llx_bank
 		$links = $object->get_url($obj->rowid); // Get an array('url'=>, 'url_id'=>, 'label'=>, 'type'=> 'fk_bank'=> )
 
-		//var_dump($i);
-		//var_dump($tabpay);
-		//var_dump($tabcompany);
-
 		// By default
 		$tabpay[$obj->rowid]['type'] = 'unknown'; // Can be SOLD, miscellaneous entry, payment of patient, or any old record with no links in bank_url.
 		$tabtype[$obj->rowid] = 'unknown';
@@ -277,17 +280,14 @@ if ($result) {
 		if (is_array($links) && count($links) > 0) {
 			// Now loop on each link of record in bank.
 			foreach ($links as $key => $val) {
-				if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation', 'member', 'payment_loan', 'payment_salary', 'payment_various')))
-				{
+				if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation', 'member', 'payment_loan', 'payment_salary', 'payment_various'))) {
 					// So we excluded 'company' and 'user' here. We want only payment lines
 
 					// We save tabtype for a future use, to remember what kind of payment it is
 					$tabpay[$obj->rowid]['type'] = $links[$key]['type'];
 					$tabtype[$obj->rowid] = $links[$key]['type'];
-				} elseif (in_array($links[$key]['type'], array('company', 'user')))
-				{
-					if ($tabpay[$obj->rowid]['type'] == 'unknown')
-					{
+				} elseif (in_array($links[$key]['type'], array('company', 'user'))) {
+					if ($tabpay[$obj->rowid]['type'] == 'unknown') {
 						// We can guess here it is a bank record for a thirdparty company or a user.
 						// But we won't be able to record somewhere else than into a waiting account, because there is no other journal to record the contreparty.
 					}
@@ -312,16 +312,23 @@ if ($result) {
 					$societestatic->name = $links[$key]['label'];
 					$societestatic->email = $tabcompany[$obj->rowid]['email'];
 					$tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30);
-					if ($compta_soc) $tabtp[$obj->rowid][$compta_soc] += $obj->amount;
+					if ($compta_soc) {
+						$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
+					}
 				} elseif ($links[$key]['type'] == 'user') {
 					$userstatic->id = $links[$key]['url_id'];
 					$userstatic->name = $links[$key]['label'];
 					$userstatic->email = $tabuser[$obj->rowid]['email'];
 					$userstatic->firstname = $tabuser[$obj->rowid]['firstname'];
 					$userstatic->lastname = $tabuser[$obj->rowid]['lastname'];
-					if ($userstatic->id > 0) $tabpay[$obj->rowid]["soclib"] = $userstatic->getNomUrl(1, '', 30);
-					else $tabpay[$obj->rowid]["soclib"] = '???'; // Should not happen, but happens with old data when id of user was not saved on expense report payment.
-					if ($compta_user) $tabtp[$obj->rowid][$compta_user] += $obj->amount;
+					if ($userstatic->id > 0) {
+						$tabpay[$obj->rowid]["soclib"] = $userstatic->getNomUrl(1, '', 30);
+					} else {
+						$tabpay[$obj->rowid]["soclib"] = '???'; // Should not happen, but happens with old data when id of user was not saved on expense report payment.
+					}
+					if ($compta_user) {
+						$tabtp[$obj->rowid][$compta_user] += $obj->amount;
+					}
 				} elseif ($links[$key]['type'] == 'sc') {
 					$chargestatic->id = $links[$key]['url_id'];
 					$chargestatic->ref = $links[$key]['url_id'];
@@ -329,8 +336,9 @@ if ($result) {
 					$tabpay[$obj->rowid]["lib"] .= ' '.$chargestatic->getNomUrl(2);
 					$reg = array();
 					if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg)) {
-						if ($reg[1] == 'socialcontribution')
+						if ($reg[1] == 'socialcontribution') {
 							$reg[1] = 'SocialContribution';
+						}
 						$chargestatic->label = $langs->trans($reg[1]);
 					} else {
 						$chargestatic->label = $links[$key]['label'];
@@ -430,20 +438,17 @@ if ($result) {
 
 		// If no links were found to know the amount on thirdparty, we try to guess it.
 		// This may happens on bank entries without the links lines to 'company'.
-		if (empty($tabtp[$obj->rowid]) && !empty($tabmoreinfo[$obj->rowid]['withdraw']))	// If we dont find 'company' link because it is an old 'withdraw' record
-		{
+		if (empty($tabtp[$obj->rowid]) && !empty($tabmoreinfo[$obj->rowid]['withdraw'])) {	// If we dont find 'company' link because it is an old 'withdraw' record
 			foreach ($links as $key => $val) {
 				if ($links[$key]['type'] == 'payment') {
 					// Get thirdparty
 					$tmppayment->fetch($links[$key]['url_id']);
 					$arrayofamounts = $tmppayment->getAmountsArray();
 					if (is_array($arrayofamounts)) {
-						foreach ($arrayofamounts as $invoiceid => $amount)
-						{
+						foreach ($arrayofamounts as $invoiceid => $amount) {
 							$tmpinvoice->fetch($invoiceid);
 							$tmpinvoice->fetch_thirdparty();
-							if ($tmpinvoice->thirdparty->code_compta)
-							{
+							if ($tmpinvoice->thirdparty->code_compta) {
 								$tabtp[$obj->rowid][$tmpinvoice->thirdparty->code_compta] += $amount;
 							}
 						}
@@ -453,7 +458,9 @@ if ($result) {
 		}
 
 		// If no links were found to know the amount on thirdparty, we init it to account 'NotDefined'.
-		if (empty($tabtp[$obj->rowid])) $tabtp[$obj->rowid]['NotDefined'] = $tabbq[$obj->rowid][$compta_bank];
+		if (empty($tabtp[$obj->rowid])) {
+			$tabtp[$obj->rowid]['NotDefined'] = $tabbq[$obj->rowid][$compta_bank];
+		}
 
 		// Check account number is ok
 		/*if ($action == 'writebookkeeping')		// Make test now in such a case
@@ -494,8 +501,7 @@ if (!$error && $action == 'writebookkeeping') {
 	$now = dol_now();
 
 	$error = 0;
-	foreach ($tabpay as $key => $val)		// $key is rowid into llx_bank
-	{
+	foreach ($tabpay as $key => $val) {		// $key is rowid into llx_bank
 		$date = dol_print_date($db->jdate($val["date"]), 'day');
 
 		$ref = getSourceDocRef($val, $tabtype[$key]);
@@ -513,17 +519,18 @@ if (!$error && $action == 'writebookkeeping') {
 		var_dump($tabbq);exit;*/
 
 		// Bank
-		if (!$errorforline && is_array($tabbq[$key]))
-		{
+		if (!$errorforline && is_array($tabbq[$key])) {
 			// Line into bank account
-			foreach ($tabbq[$key] as $k => $mt)
-			{
-				if ($mt)
-				{
+			foreach ($tabbq[$key] as $k => $mt) {
+				if ($mt) {
 					$reflabel = '';
-					if (!empty($val['lib'])) $reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+					if (!empty($val['lib'])) {
+						$reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+					}
 					$reflabel .= $langs->trans("Bank").' '.dol_string_nohtmltag($val['bank_account_ref']);
-					if (!empty($val['soclib'])) $reflabel .= " - ".dol_string_nohtmltag($val['soclib']);
+					if (!empty($val['soclib'])) {
+						$reflabel .= " - ".dol_string_nohtmltag($val['soclib']);
+					}
 
 					$bookkeeping = new BookKeeping($db);
 					$bookkeeping->doc_date = $val["date"];
@@ -556,8 +563,7 @@ if (!$error && $action == 'writebookkeeping') {
 
 					$result = $bookkeeping->create($user);
 					if ($result < 0) {
-						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-						{
+						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
 							$error++;
 							$errorforline++;
 							setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
@@ -572,18 +578,16 @@ if (!$error && $action == 'writebookkeeping') {
 		}
 
 		// Third party
-		if (!$errorforline)
-		{
-			if (is_array($tabtp[$key]))
-			{
+		if (!$errorforline) {
+			if (is_array($tabtp[$key])) {
 				// Line into thirdparty account
 				foreach ($tabtp[$key] as $k => $mt) {
-					if ($mt)
-					{
+					if ($mt) {
 						$reflabel = '';
-						if (!empty($val['lib'])) $reflabel .= dol_string_nohtmltag($val['lib']).($val['soclib'] ? " - " : "");
-						if ($tabtype[$key] == 'banktransfert')
-						{
+						if (!empty($val['lib'])) {
+							$reflabel .= dol_string_nohtmltag($val['lib']).($val['soclib'] ? " - " : "");
+						}
+						if ($tabtype[$key] == 'banktransfert') {
 							$reflabel .= dol_string_nohtmltag($langs->transnoentitiesnoconv('TransitionalAccount').' '.$account_transfer);
 						} else {
 							$reflabel .= dol_string_nohtmltag($val['soclib']);
@@ -683,9 +687,8 @@ if (!$error && $action == 'writebookkeeping') {
 							$accountingaccount->fetch(null, $k, true);
 							$bookkeeping->label_compte = $accountingaccount->label;
 						} else {
-							if ($tabtype[$key] == 'unknown')	// Unknown transaction, we will use a waiting account for thirdparty.
-							{
-								// Temporary account
+							if ($tabtype[$key] == 'unknown') {	// Unknown transaction, we will use a waiting account for thirdparty.
+							// Temporary account
 								$bookkeeping->subledger_account = '';
 								$bookkeeping->subledger_label = '';
 								$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE;
@@ -702,8 +705,7 @@ if (!$error && $action == 'writebookkeeping') {
 
 						$result = $bookkeeping->create($user);
 						if ($result < 0) {
-							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-							{
+							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
 								$error++;
 								$errorforline++;
 								setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
@@ -717,10 +719,11 @@ if (!$error && $action == 'writebookkeeping') {
 				}
 			} else {	// If thirdparty unknown, output the waiting account
 				foreach ($tabbq[$key] as $k => $mt) {
-					if ($mt)
-					{
+					if ($mt) {
 						$reflabel = '';
-						if (!empty($val['lib'])) $reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+						if (!empty($val['lib'])) {
+							$reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+						}
 						$reflabel .= dol_string_nohtmltag('WaitingAccount');
 
 						$bookkeeping = new BookKeeping($db);
@@ -747,8 +750,7 @@ if (!$error && $action == 'writebookkeeping') {
 						$result = $bookkeeping->create($user);
 
 						if ($result < 0) {
-							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-							{
+							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
 								$error++;
 								$errorforline++;
 								setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
@@ -763,23 +765,20 @@ if (!$error && $action == 'writebookkeeping') {
 			}
 		}
 
-		if (price2num($totaldebit, 'MT') != price2num($totalcredit, 'MT'))
-		{
+		if (price2num($totaldebit, 'MT') != price2num($totalcredit, 'MT')) {
 			$error++;
 			$errorforline++;
 			setEventMessages('Try to insert a non balanced transaction in book for '.$ref.'. Canceled. Surely a bug.', null, 'errors');
 		}
 
-		if (!$errorforline)
-		{
+		if (!$errorforline) {
 			$db->commit();
 		} else {
 			//print 'KO for line '.$key.' '.$error.'<br>';
 			$db->rollback();
 
 			$MAXNBERRORS = 5;
-			if ($error >= $MAXNBERRORS)
-			{
+			if ($error >= $MAXNBERRORS) {
 				setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped").' (>'.$MAXNBERRORS.')', null, 'errors');
 				break; // Break in the foreach
 			}
@@ -788,8 +787,7 @@ if (!$error && $action == 'writebookkeeping') {
 
 	if (empty($error) && count($tabpay) > 0) {
 		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
-	} elseif (count($tabpay) == $error)
-	{
+	} elseif (count($tabpay) == $error) {
 		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
 	} else {
 		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
@@ -798,8 +796,7 @@ if (!$error && $action == 'writebookkeeping') {
 	$action = '';
 
 	// Must reload data, so we make a redirect
-	if (count($tabpay) != $error)
-	{
+	if (count($tabpay) != $error) {
 		$param = 'id_journal='.$id_journal;
 		$param .= '&date_startday='.$date_startday;
 		$param .= '&date_startmonth='.$date_startmonth;
@@ -837,20 +834,22 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 	print '"'.$langs->transnoentitiesnoconv("Note").'"'.$sep;
 	print "\n";
 
-	foreach ($tabpay as $key => $val)
-	{
+	foreach ($tabpay as $key => $val) {
 		$date = dol_print_date($db->jdate($val["date"]), 'day');
 
 		$ref = getSourceDocRef($val, $tabtype[$key]);
 
 		// Bank
 		foreach ($tabbq[$key] as $k => $mt) {
-			if ($mt)
-			{
+			if ($mt) {
 				$reflabel = '';
-				if (!empty($val['lib'])) $reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+				if (!empty($val['lib'])) {
+					$reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+				}
 				$reflabel .= $langs->trans("Bank").' '.dol_string_nohtmltag($val['bank_account_ref']);
-				if (!empty($val['soclib'])) $reflabel .= " - ".dol_string_nohtmltag($val['soclib']);
+				if (!empty($val['soclib'])) {
+					$reflabel .= " - ".dol_string_nohtmltag($val['soclib']);
+				}
 
 				print '"'.$key.'"'.$sep;
 				print '"'.$date.'"'.$sep;
@@ -870,12 +869,12 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 		// Third party
 		if (is_array($tabtp[$key])) {
 			foreach ($tabtp[$key] as $k => $mt) {
-				if ($mt)
-				{
+				if ($mt) {
 					$reflabel = '';
-					if (!empty($val['lib'])) $reflabel .= dol_string_nohtmltag($val['lib']).($val['soclib'] ? " - " : "");
-					if ($tabtype[$key] == 'banktransfert')
-					{
+					if (!empty($val['lib'])) {
+						$reflabel .= dol_string_nohtmltag($val['lib']).($val['soclib'] ? " - " : "");
+					}
+					if ($tabtype[$key] == 'banktransfert') {
 						$reflabel .= dol_string_nohtmltag($langs->transnoentitiesnoconv('TransitionalAccount').' '.$account_transfer);
 					} else {
 						$reflabel .= dol_string_nohtmltag($val['soclib']);
@@ -907,10 +906,11 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 			}
 		} else {	// If thirdparty unkown, output the waiting account
 			foreach ($tabbq[$key] as $k => $mt) {
-				if ($mt)
-				{
+				if ($mt) {
 					$reflabel = '';
-					if (!empty($val['lib'])) $reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+					if (!empty($val['lib'])) {
+						$reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+					}
 					$reflabel .= dol_string_nohtmltag('WaitingAccount');
 
 					print '"'.$key.'"'.$sep;
@@ -967,16 +967,16 @@ if (empty($action) || $action == 'view') {
 	// Test that setup is complete (we are in accounting, so test on entity is always on $conf->entity only, no sharing allowed)
 	$sql = 'SELECT COUNT(rowid) as nb FROM '.MAIN_DB_PREFIX.'bank_account WHERE entity = '.$conf->entity.' AND fk_accountancy_journal IS NULL AND clos=0';
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$obj = $db->fetch_object($resql);
-		if ($obj->nb > 0)
-		{
+		if ($obj->nb > 0) {
 			print '<br><div class="warning">'.img_warning().' '.$langs->trans("TheJournalCodeIsNotDefinedOnSomeBankAccount");
 			print ' : '.$langs->trans("AccountancyAreaDescBank", 9, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("BankAccounts").'</strong>');
 			print '</div>';
 		}
-	} else dol_print_error($db);
+	} else {
+		dol_print_error($db);
+	}
 
 
 	// Button to write into Ledger
@@ -990,14 +990,19 @@ if (empty($action) || $action == 'view') {
 
 	print '<div class="tabsAction tabsActionNoBottom">';
 
-	if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
+	if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') {
+		print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
+	}
 
 	if (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == "") || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1'
 		|| ($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == "") || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1') {
 		print '<input type="button" class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="'.$langs->trans("WriteBookKeeping").'" />';
 	} else {
-		if ($in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
-		else print '<a class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
+		if ($in_bookkeeping == 'notyet') {
+			print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
+		} else {
+			print '<a class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
+		}
 	}
 
 	print '</div>';
@@ -1040,21 +1045,22 @@ if (empty($action) || $action == 'view') {
 
 	$r = '';
 
-	foreach ($tabpay as $key => $val)			  // $key is rowid in llx_bank
-	{
+	foreach ($tabpay as $key => $val) {			  // $key is rowid in llx_bank
 		$date = dol_print_date($db->jdate($val["date"]), 'day');
 
 		$ref = getSourceDocRef($val, $tabtype[$key]);
 
 		// Bank
-		foreach ($tabbq[$key] as $k => $mt)
-		{
-			if ($mt)
-			{
+		foreach ($tabbq[$key] as $k => $mt) {
+			if ($mt) {
 				$reflabel = '';
-				if (!empty($val['lib'])) $reflabel .= $val['lib']." - ";
+				if (!empty($val['lib'])) {
+					$reflabel .= $val['lib']." - ";
+				}
 				$reflabel .= $langs->trans("Bank").' '.$val['bank_account_ref'];
-				if (!empty($val['soclib'])) $reflabel .= " - ".$val['soclib'];
+				if (!empty($val['soclib'])) {
+					$reflabel .= " - ".$val['soclib'];
+				}
 
 				//var_dump($tabpay[$key]);
 				print '<!-- Bank bank.rowid='.$key.' type='.$tabpay[$key]['type'].' ref='.$tabpay[$key]['ref'].'-->';
@@ -1064,10 +1070,11 @@ if (empty($action) || $action == 'view') {
 				// Ledger account
 				print "<td>";
 				$accounttoshow = length_accountg($k);
-				if (empty($accounttoshow) || $accounttoshow == 'NotDefined')
-				{
+				if (empty($accounttoshow) || $accounttoshow == 'NotDefined') {
 					print '<span class="error">'.$langs->trans("BankAccountNotDefined").'</span>';
-				} else print $accounttoshow;
+				} else {
+					print $accounttoshow;
+				}
 				print "</td>";
 				// Subledger account
 				print "<td>";
@@ -1091,12 +1098,12 @@ if (empty($action) || $action == 'view') {
 		// Third party
 		if (is_array($tabtp[$key])) {
 			foreach ($tabtp[$key] as $k => $mt) {
-				if ($mt)
-				{
+				if ($mt) {
 					$reflabel = '';
-					if (!empty($val['lib'])) $reflabel .= $val['lib'].($val['soclib'] ? " - " : "");
-					if ($tabtype[$key] == 'banktransfert')
-					{
+					if (!empty($val['lib'])) {
+						$reflabel .= $val['lib'].($val['soclib'] ? " - " : "");
+					}
+					if ($tabtype[$key] == 'banktransfert') {
 						$reflabel .= $langs->trans('TransitionalAccount').' '.$account_transfer;
 					} else {
 						$reflabel .= $val['soclib'];
@@ -1110,21 +1117,32 @@ if (empty($action) || $action == 'view') {
 					print "<td>";
 					$account_ledger = $k;
 					// Try to force general ledger account depending on type
-					if ($tabtype[$key] == 'payment')				$account_ledger = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
-					if ($tabtype[$key] == 'payment_supplier')		$account_ledger = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
-					if ($tabtype[$key] == 'payment_expensereport')	$account_ledger = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
-					if ($tabtype[$key] == 'payment_salary')			$account_ledger = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
-					if ($tabtype[$key] == 'payment_vat')			$account_ledger = $conf->global->ACCOUNTING_VAT_PAY_ACCOUNT;
-					if ($tabtype[$key] == 'member')					$account_ledger = $conf->global->ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT;
-					if ($tabtype[$key] == 'payment_various')	    $account_ledger = $tabpay[$key]["account_various"];
+					if ($tabtype[$key] == 'payment') {
+						$account_ledger = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
+					}
+					if ($tabtype[$key] == 'payment_supplier') {
+						$account_ledger = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
+					}
+					if ($tabtype[$key] == 'payment_expensereport') {
+						$account_ledger = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
+					}
+					if ($tabtype[$key] == 'payment_salary') {
+						$account_ledger = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
+					}
+					if ($tabtype[$key] == 'payment_vat') {
+						$account_ledger = $conf->global->ACCOUNTING_VAT_PAY_ACCOUNT;
+					}
+					if ($tabtype[$key] == 'member') {
+						$account_ledger = $conf->global->ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT;
+					}
+					if ($tabtype[$key] == 'payment_various') {
+						$account_ledger = $tabpay[$key]["account_various"];
+					}
 					$accounttoshow = length_accountg($account_ledger);
-					if (empty($accounttoshow) || $accounttoshow == 'NotDefined')
-					{
-						if ($tabtype[$key] == 'unknown')
-						{
+					if (empty($accounttoshow) || $accounttoshow == 'NotDefined') {
+						if ($tabtype[$key] == 'unknown') {
 							// We will accept writing, but into a waiting account
-							if (empty($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) || $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE == '-1')
-							{
+							if (empty($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) || $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE == '-1') {
 								print '<span class="error">'.$langs->trans('UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking').'</span>';
 							} else {
 								print '<span class="warning">'.$langs->trans('UnknownAccountForThirdparty', length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE)).'</span>'; // We will use a waiting account
@@ -1132,32 +1150,42 @@ if (empty($action) || $action == 'view') {
 						} else {
 							// We will refuse writing
 							$errorstring = 'UnknownAccountForThirdpartyBlocking';
-							if ($tabtype[$key] == 'payment')				$errorstring = 'MainAccountForCustomersNotDefined';
-							if ($tabtype[$key] == 'payment_supplier')		$errorstring = 'MainAccountForSuppliersNotDefined';
-							if ($tabtype[$key] == 'payment_expensereport')	$errorstring = 'MainAccountForUsersNotDefined';
-							if ($tabtype[$key] == 'payment_salary')			$errorstring = 'MainAccountForUsersNotDefined';
-							if ($tabtype[$key] == 'payment_vat')			$errorstring = 'MainAccountForVatPaymentNotDefined';
-							if ($tabtype[$key] == 'member')					$errorstring = 'MainAccountForSubscriptionPaymentNotDefined';
+							if ($tabtype[$key] == 'payment') {
+								$errorstring = 'MainAccountForCustomersNotDefined';
+							}
+							if ($tabtype[$key] == 'payment_supplier') {
+								$errorstring = 'MainAccountForSuppliersNotDefined';
+							}
+							if ($tabtype[$key] == 'payment_expensereport') {
+								$errorstring = 'MainAccountForUsersNotDefined';
+							}
+							if ($tabtype[$key] == 'payment_salary') {
+								$errorstring = 'MainAccountForUsersNotDefined';
+							}
+							if ($tabtype[$key] == 'payment_vat') {
+								$errorstring = 'MainAccountForVatPaymentNotDefined';
+							}
+							if ($tabtype[$key] == 'member') {
+								$errorstring = 'MainAccountForSubscriptionPaymentNotDefined';
+							}
 							print '<span class="error">'.$langs->trans($errorstring).'</span>';
 						}
-					} else print $accounttoshow;
+					} else {
+						print $accounttoshow;
+					}
 					print "</td>";
 
 					// Subledger account
 					print "<td>";
-					if (in_array($tabtype[$key], array('payment', 'payment_supplier', 'payment_expensereport', 'payment_salary', 'payment_various')))	// Type of payment with subledger
-					{
+					if (in_array($tabtype[$key], array('payment', 'payment_supplier', 'payment_expensereport', 'payment_salary', 'payment_various'))) {	// Type of payment with subledger
 						$accounttoshowsubledger = length_accounta($k);
-						if ($accounttoshow != $accounttoshowsubledger)
-						{
-							if (empty($accounttoshowsubledger) || $accounttoshowsubledger == 'NotDefined')
-							{
+						if ($accounttoshow != $accounttoshowsubledger) {
+							if (empty($accounttoshowsubledger) || $accounttoshowsubledger == 'NotDefined') {
 								/*var_dump($tabpay[$key]);
 								var_dump($tabtype[$key]);
 								var_dump($tabbq[$key]);*/
 								//print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
-								if (!empty($tabcompany[$key]['code_compta']))
-								{
+								if (!empty($tabcompany[$key]['code_compta'])) {
 									if (in_array($tabtype[$key], array('payment_various'))) {
 										// For such case, if subledger is not defined, we won't use subledger accounts.
 										print '<span class="warning">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored").'</span>';
@@ -1167,7 +1195,9 @@ if (empty($action) || $action == 'view') {
 								} else {
 									print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking").'</span>';
 								}
-							} else print $accounttoshowsubledger;
+							} else {
+								print $accounttoshowsubledger;
+							}
 						}
 					}
 					print "</td>";
@@ -1180,10 +1210,11 @@ if (empty($action) || $action == 'view') {
 			}
 		} else {	// Waiting account
 			foreach ($tabbq[$key] as $k => $mt) {
-				if ($mt)
-				{
+				if ($mt) {
 					$reflabel = '';
-					if (!empty($val['lib'])) $reflabel .= $val['lib']." - ";
+					if (!empty($val['lib'])) {
+						$reflabel .= $val['lib']." - ";
+					}
 					$reflabel .= 'WaitingAccount';
 
 					print '<!-- Wait bank.rowid='.$key.' -->';
@@ -1267,78 +1298,67 @@ function getSourceDocRef($val, $typerecord)
 	}
 
 	$sqlmid = '';
-	if ($typerecord == 'payment')
-	{
+	if ($typerecord == 'payment') {
 		$sqlmid = 'SELECT payfac.fk_facture as id, f.ref as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiement_facture as payfac, ".MAIN_DB_PREFIX."facture as f";
 		$sqlmid .= " WHERE payfac.fk_facture = f.rowid AND payfac.fk_paiement=".$val["paymentid"];
 		$ref = $langs->transnoentitiesnoconv("Invoice");
-	} elseif ($typerecord == 'payment_supplier')
-	{
+	} elseif ($typerecord == 'payment_supplier') {
 		$sqlmid = 'SELECT payfac.fk_facturefourn as id, f.ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiementfourn_facturefourn as payfac, ".MAIN_DB_PREFIX."facture_fourn as f";
 		$sqlmid .= " WHERE payfac.fk_facturefourn = f.rowid AND payfac.fk_paiementfourn=".$val["paymentsupplierid"];
 		$ref = $langs->transnoentitiesnoconv("SupplierInvoice");
-	} elseif ($typerecord == 'payment_expensereport')
-	{
+	} elseif ($typerecord == 'payment_expensereport') {
 		$sqlmid = 'SELECT e.rowid as id, e.ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_expensereport as pe, ".MAIN_DB_PREFIX."expensereport as e";
 		$sqlmid .= " WHERE pe.rowid=".$val["paymentexpensereport"]." AND pe.fk_expensereport = e.rowid";
 		$ref = $langs->transnoentitiesnoconv("ExpenseReport");
-	} elseif ($typerecord == 'payment_salary')
-	{
+	} elseif ($typerecord == 'payment_salary') {
 		$sqlmid = 'SELECT s.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_salary as s";
 		$sqlmid .= " WHERE s.rowid=".$val["paymentsalid"];
 		$ref = $langs->transnoentitiesnoconv("SalaryPayment");
-	} elseif ($typerecord == 'sc')
-	{
+	} elseif ($typerecord == 'sc') {
 		$sqlmid = 'SELECT sc.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiementcharge as sc";
 		$sqlmid .= " WHERE sc.rowid=".$val["paymentscid"];
 		$ref = $langs->transnoentitiesnoconv("SocialContribution");
-	} elseif ($typerecord == 'payment_vat')
-	{
+	} elseif ($typerecord == 'payment_vat') {
 		$sqlmid = 'SELECT v.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."tva as v";
 		$sqlmid .= " WHERE v.rowid=".$val["paymentvatid"];
 		$ref = $langs->transnoentitiesnoconv("PaymentVat");
-	} elseif ($typerecord == 'payment_donation')
-	{
+	} elseif ($typerecord == 'payment_donation') {
 		$sqlmid = 'SELECT payd.fk_donation as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_donation as payd";
 		$sqlmid .= " WHERE payd.fk_donation=".$val["paymentdonationid"];
 		$ref = $langs->transnoentitiesnoconv("Donation");
-	} elseif ($typerecord == 'payment_loan')
-	{
+	} elseif ($typerecord == 'payment_loan') {
 		$sqlmid = 'SELECT l.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_loan as l";
 		$sqlmid .= " WHERE l.rowid=".$val["paymentloanid"];
 		$ref = $langs->transnoentitiesnoconv("LoanPayment");
-	} elseif ($typerecord == 'payment_various')
-	{
+	} elseif ($typerecord == 'payment_various') {
 		$sqlmid = 'SELECT v.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_various as v";
 		$sqlmid .= " WHERE v.rowid=".$val["paymentvariousid"];
 		$ref = $langs->transnoentitiesnoconv("VariousPayment");
 	}
 	// Add warning
-	if (empty($sqlmid))
-	{
+	if (empty($sqlmid)) {
 		dol_syslog("Found a typerecord=".$typerecord." not supported", LOG_WARNING);
 	}
 
-	if ($sqlmid)
-	{
+	if ($sqlmid) {
 		dol_syslog("accountancy/journal/bankjournal.php::sqlmid=".$sqlmid, LOG_DEBUG);
 		$resultmid = $db->query($sqlmid);
-		if ($resultmid)
-		{
-			while ($objmid = $db->fetch_object($resultmid))
-			{
+		if ($resultmid) {
+			while ($objmid = $db->fetch_object($resultmid)) {
 				$ref .= ' '.$objmid->ref;
 			}
-		} else dol_print_error($db);
+		} else {
+			dol_print_error($db);
+		}
 	}
 
 	$ref = dol_trunc($langs->transnoentitiesnoconv("BankId").' '.$val['fk_bank'].' - '.$ref, 295); // 295 + 3 dots (...) is < than max size of 300

From 3fc4fb79e0dbb3d9eec46029ebd21d40e5cace04 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sat, 5 Dec 2020 17:20:28 +0000
Subject: [PATCH 197/888] Fixing style errors.

---
 htdocs/accountancy/journal/bankjournal.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 5e6650562ab..032ed7c13cc 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -688,7 +688,7 @@ if (!$error && $action == 'writebookkeeping') {
 							$bookkeeping->label_compte = $accountingaccount->label;
 						} else {
 							if ($tabtype[$key] == 'unknown') {	// Unknown transaction, we will use a waiting account for thirdparty.
-							// Temporary account
+								// Temporary account
 								$bookkeeping->subledger_account = '';
 								$bookkeeping->subledger_label = '';
 								$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE;

From 758bb20750f9d325b518993648f394bbde3f2969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 5 Dec 2020 18:55:39 +0100
Subject: [PATCH 198/888] fix undefined variable

---
 htdocs/product/class/product.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index dfb5a7e042a..c86e00602ea 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -828,7 +828,8 @@ class Product extends CommonObject
 		$error = 0;
 
 		// Check parameters
-		if (!$this->label) { $this->label = 'MISSING LABEL';
+		if (!$this->label) {
+			$this->label = 'MISSING LABEL';
 		}
 
 		// Clean parameters
@@ -919,6 +920,9 @@ class Product extends CommonObject
 		// If error, this->errors[] is filled
 		if ($action != 'add') {
 			$result = $this->verify(); // We don't check when update called during a create because verify was already done
+		} else {
+			// we can continue
+			$result = 0;
 		}
 
 		if ($result >= 0) {

From 7a8d031d56dc5cf823c300d24c9f701dc87a5dac Mon Sep 17 00:00:00 2001
From: Zebedeu <marciozebedeu@gmail.com>
Date: Sat, 5 Dec 2020 20:17:57 +0100
Subject: [PATCH 199/888] Fix #15675 fixed the error of installation start of
 version 13.0.0-beta

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 890c16627aa..17474f840ad 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3191,9 +3191,10 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 	// We forge fullpathpicto for image to $path/img/$picto. By default, we take DOL_URL_ROOT/theme/$conf->theme/img/$picto
 	$url = DOL_URL_ROOT;
-	$theme = $conf->theme;
-	$path = 'theme/'.$theme;
 
+	if(isset($conf->theme)) {
+		$theme = $conf->theme;
+	}
 	// Define fullpathpicto to use into src
 	if ($pictoisfullpath) {
 		// Clean parameters

From 1917d9b5084084bdd0ad43af7c1862f1929dc2c4 Mon Sep 17 00:00:00 2001
From: Zebedeu <marciozebedeu@gmail.com>
Date: Sat, 5 Dec 2020 20:23:31 +0100
Subject: [PATCH 200/888] Revert "Fix #15675 fixed the error of installation
 start of version 13.0.0-beta"

This reverts commit 7a8d031d56dc5cf823c300d24c9f701dc87a5dac.
---
 htdocs/core/lib/functions.lib.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 17474f840ad..890c16627aa 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3191,10 +3191,9 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 	// We forge fullpathpicto for image to $path/img/$picto. By default, we take DOL_URL_ROOT/theme/$conf->theme/img/$picto
 	$url = DOL_URL_ROOT;
+	$theme = $conf->theme;
+	$path = 'theme/'.$theme;
 
-	if(isset($conf->theme)) {
-		$theme = $conf->theme;
-	}
 	// Define fullpathpicto to use into src
 	if ($pictoisfullpath) {
 		// Clean parameters

From 1a1850c6f16d361bd86c0e521b42d50e3afc38af Mon Sep 17 00:00:00 2001
From: Zebedeu <marciozebedeu@gmail.com>
Date: Sat, 5 Dec 2020 20:28:55 +0100
Subject: [PATCH 201/888] Fix | fixed the error of installation start of
 version 13.0.0-beta

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 890c16627aa..4bee0a0de80 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3191,9 +3191,10 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 	// We forge fullpathpicto for image to $path/img/$picto. By default, we take DOL_URL_ROOT/theme/$conf->theme/img/$picto
 	$url = DOL_URL_ROOT;
-	$theme = $conf->theme;
-	$path = 'theme/'.$theme;
 
+	if (isset($conf->theme)) {
+		$theme = $conf->theme;
+	}
 	// Define fullpathpicto to use into src
 	if ($pictoisfullpath) {
 		// Clean parameters

From f6eb10f6e5bdbb867f1ca827135bc987b3ac7626 Mon Sep 17 00:00:00 2001
From: Nicolas Streng <nicolas@nicolasstr.eu>
Date: Sat, 5 Dec 2020 21:10:57 +0100
Subject: [PATCH 202/888] Fix #15676 Hide Password when importing from LDAP

Refers to Issue #15676
---
 htdocs/user/card.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 8934d8d87ec..61a4405fbfa 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -737,10 +737,12 @@ if ($action == 'create' || $action == 'adduserldap')
 					$label = '';
 					foreach ($required_fields as $value)
 					{
-						if ($value)
-						{
-							$label .= $value."=".$ldapuser[$value]." ";
-						}
+						if ($value === $conf->global->LDAP_FIELD_PASSWORD || $value === $conf->global->LDAP_FIELD_PASSWORD_CRYPTED)
+ 						{
+ 							$label .= $value."=******* ";
+ 						} else if ($value) {
+ 							$label .= $value."=".$ldapuser[$value]." ";
+ 						}
 					}
 					$liste[$key] = $label;
 				}

From e078d3005fbc8bbc794c896119b9f7152921a406 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sat, 5 Dec 2020 20:13:54 +0000
Subject: [PATCH 203/888] Fixing style errors.

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

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 61a4405fbfa..a8c67a9cb73 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -740,7 +740,7 @@ if ($action == 'create' || $action == 'adduserldap')
 						if ($value === $conf->global->LDAP_FIELD_PASSWORD || $value === $conf->global->LDAP_FIELD_PASSWORD_CRYPTED)
  						{
  							$label .= $value."=******* ";
- 						} else if ($value) {
+ 						} elseif ($value) {
  							$label .= $value."=".$ldapuser[$value]." ";
  						}
 					}

From 4e18f46f28597e50b8885d82259abd093ca1d7a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 5 Dec 2020 23:53:55 +0100
Subject: [PATCH 204/888] doxygen

---
 .../class/accountingjournal.class.php         |  2 +-
 htdocs/asset/class/asset.class.php            | 40 +++++++-------
 htdocs/bom/class/bom.class.php                | 12 ++---
 .../mailing/class/advtargetemailing.class.php |  2 +-
 htdocs/comm/propal/class/propal.class.php     |  2 +-
 .../deplacement/class/deplacement.class.php   |  4 +-
 .../facture/class/facture-rec.class.php       |  4 +-
 htdocs/compta/facture/class/facture.class.php |  4 +-
 htdocs/contrat/class/contrat.class.php        |  4 +-
 htdocs/core/class/comment.class.php           |  7 ++-
 .../core/class/emailsenderprofile.class.php   | 40 +++++++-------
 htdocs/core/class/fiscalyear.class.php        |  7 ++-
 htdocs/delivery/class/delivery.class.php      |  4 +-
 htdocs/don/class/don.class.php                |  2 +-
 .../class/emailcollector.class.php            | 10 +++-
 .../class/emailcollectoraction.class.php      |  6 +--
 htdocs/expedition/class/expedition.class.php  |  4 +-
 .../class/expensereport.class.php             |  7 +++
 .../class/expensereport_ik.class.php          |  2 +-
 .../class/expensereport_rule.class.php        |  2 +-
 htdocs/fichinter/class/fichinter.class.php    |  4 +-
 htdocs/fichinter/class/fichinterrec.class.php |  4 ++
 .../class/fournisseur.commande.class.php      |  4 +-
 .../fourn/class/fournisseur.facture.class.php |  4 +-
 htdocs/holiday/class/holiday.class.php        |  2 +-
 htdocs/hrm/class/establishment.class.php      |  4 +-
 .../class/intracommreport.class.php           |  2 +-
 .../template/class/myobject.class.php         | 52 +++++++++----------
 htdocs/mrp/class/mo.class.php                 |  6 +--
 htdocs/product/class/product.class.php        | 12 ++++-
 .../inventory/class/inventory.class.php       |  9 ++--
 htdocs/projet/class/project.class.php         |  6 +--
 htdocs/projet/class/task.class.php            |  2 +-
 htdocs/reception/class/reception.class.php    |  7 +++
 .../class/recruitmentcandidature.class.php    | 52 +++++++++----------
 .../class/recruitmentjobposition.class.php    | 48 ++++++++---------
 .../class/companypaymentmode.class.php        |  6 +--
 htdocs/societe/class/societe.class.php        |  2 +-
 htdocs/societe/class/societeaccount.class.php | 30 +++++------
 .../class/supplier_proposal.class.php         |  4 +-
 htdocs/user/class/user.class.php              |  2 +-
 htdocs/user/class/usergroup.class.php         |  7 ++-
 htdocs/website/class/websitepage.class.php    | 14 ++---
 htdocs/zapier/class/hook.class.php            | 30 +++++------
 44 files changed, 261 insertions(+), 217 deletions(-)

diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index c002abf2a89..a76be081471 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -37,7 +37,7 @@ class AccountingJournal extends CommonObject
 	public $table_element = 'accounting_journal';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Fieldname with ID of parent key if this field has a parent
 	 */
 	public $fk_element = '';
 
diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index 25cac778264..31397be4c02 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -160,26 +160,26 @@ class Asset extends CommonObject
 
 	// If this object has a subtable with lines
 
-	/**
-	 * @var int    Name of subtable line
-	 */
-	//public $table_element_line = 'assetdet';
-	/**
-	 * @var int    Field with ID of parent key if this field has a parent
-	 */
-	//public $fk_element = 'fk_asset';
-	/**
-	 * @var int    Name of subtable class that manage subtable lines
-	 */
-	//public $class_element_line = 'Assetline';
-	/**
-	 * @var array	List of child tables. To test if we can delete object.
-	 */
-	//protected $childtables=array();
-	/**
-	 * @var AssetLine[]     Array of subtable lines
-	 */
-	//public $lines = array();
+	// /**
+	//  * @var int    Name of subtable line
+	//  */
+	// public $table_element_line = 'assetdet';
+	// /**
+	//  * @var string    Fieldname with ID of parent key if this field has a parent
+	//  */
+	// public $fk_element = 'fk_asset';
+	// /**
+	//  * @var string    Name of subtable class that manage subtable lines
+	//  */
+	// public $class_element_line = 'Assetline';
+	// /**
+	//  * @var array	List of child tables. To test if we can delete object.
+	//  */
+	// protected $childtables=array();
+	// /**
+	//  * @var AssetLine[]     Array of subtable lines
+	//  */
+	// public $lines = array();
 
 	/**
 	 * Constructor
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 868abac9e54..8444c4e1812 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -183,19 +183,19 @@ class BOM extends CommonObject
 	public $table_element_line = 'bom_bomline';
 
 	/**
-	 * @var int    Field with ID of parent key if this field has a parent
+	 * @var string    Fieldname with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_bom';
 
 	/**
-	 * @var int    Name of subtable class that manage subtable lines
+	 * @var string    Name of subtable class that manage subtable lines
 	 */
 	public $class_element_line = 'BOMLine';
 
-	/**
-	 * @var array	List of child tables. To test if we can delete object.
-	 */
-	//protected $childtables=array();
+	// /**
+	//  * @var array	List of child tables. To test if we can delete object.
+	//  */
+	// protected $childtables=array();
 
 	/**
 	 * @var array	List of child tables. To know object to delete on cascade.
diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index 8a4ebfa90c9..b7f20319229 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -54,7 +54,7 @@ class AdvanceTargetingMailing extends CommonObject
 	public $name;
 
 	/**
-	 * @var int	element id
+	 * @var int	element id (it's not the name of a field)
 	 */
 	public $fk_element;
 
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index c761f8b3321..1886ce87293 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -66,7 +66,7 @@ class Propal extends CommonObject
 	public $table_element_line = 'propaldet';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Fieldname with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_propal';
 
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index 1a1fd42d21b..75d2f71284c 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -43,12 +43,12 @@ class Deplacement extends CommonObject
 	public $table_element = 'deplacement';
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	public $table_element_line = '';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Fieldname with ID of parent key if this field has a parent
 	 */
 	public $fk_element = '';
 
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index e4187a4e906..48e2ad574ed 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -50,12 +50,12 @@ class FactureRec extends CommonInvoice
 	public $table_element = 'facture_rec';
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	public $table_element_line = 'facturedet_rec';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_facture';
 
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 20be732da17..ee9012ede48 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -64,12 +64,12 @@ class Facture extends CommonInvoice
 	public $table_element = 'facture';
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	public $table_element_line = 'facturedet';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Fieldname with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_facture';
 
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 9e277fd706b..49ac3fa4807 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -53,12 +53,12 @@ class Contrat extends CommonObject
 	public $table_element = 'contrat';
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	public $table_element_line = 'contratdet';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Fieldname with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_contrat';
 
diff --git a/htdocs/core/class/comment.class.php b/htdocs/core/class/comment.class.php
index d2c6221a598..d748b0e5d50 100644
--- a/htdocs/core/class/comment.class.php
+++ b/htdocs/core/class/comment.class.php
@@ -32,10 +32,13 @@ class Comment extends CommonObject
 	public $table_element = 'comment';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var int ID of parent key (it's nome the name of a field)
 	 */
-	public $fk_element = '';
+	public $fk_element;
 
+	/**
+	 * @var string element type
+	 */
 	public $element_type;
 
 	/**
diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index efb2e554da9..77d11f4840d 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -137,26 +137,26 @@ class EmailSenderProfile extends CommonObject
 
 	// If this object has a subtable with lines
 
-	/**
-	 * @var int    Name of subtable line
-	 */
-	//public $table_element_line = 'emailsenderprofiledet';
-	/**
-	 * @var int    Field with ID of parent key if this field has a parent
-	 */
-	//public $fk_element = 'fk_emailsenderprofile';
-	/**
-	 * @var int    Name of subtable class that manage subtable lines
-	 */
-	//public $class_element_line = 'EmailSenderProfileline';
-	/**
-	 * @var array	List of child tables. To test if we can delete object.
-	 */
-	//protected $childtables=array();
-	/**
-	 * @var EmailSenderProfileLine[]     Array of subtable lines
-	 */
-	//public $lines = array();
+	// /**
+	//  * @var string    Name of subtable line
+	//  */
+	// public $table_element_line = 'emailsenderprofiledet';
+	// /**
+	//  * @var string    Field with ID of parent key if this field has a parent
+	//  */
+	// public $fk_element = 'fk_emailsenderprofile';
+	// /**
+	//  * @var string    Name of subtable class that manage subtable lines
+	//  */
+	// public $class_element_line = 'EmailSenderProfileline';
+	// /**
+	//  * @var array	List of child tables. To test if we can delete object.
+	//  */
+	// protected $childtables=array();
+	// /**
+	//  * @var EmailSenderProfileLine[]     Array of subtable lines
+	//  */
+	// public $lines = array();
 
 
 
diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index 0e822076641..ebbdb2c3274 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -35,6 +35,9 @@ class Fiscalyear extends CommonObject
 	 */
 	public $element = 'fiscalyear';
 
+	/**
+	 * @var string picto
+	 */
 	public $picto = 'technic';
 
 	/**
@@ -43,12 +46,12 @@ class Fiscalyear extends CommonObject
 	public $table_element = 'accounting_fiscalyear';
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	public $table_element_line = '';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = '';
 
diff --git a/htdocs/delivery/class/delivery.class.php b/htdocs/delivery/class/delivery.class.php
index 394e86fdd78..9c1e9682a10 100644
--- a/htdocs/delivery/class/delivery.class.php
+++ b/htdocs/delivery/class/delivery.class.php
@@ -48,7 +48,7 @@ class Delivery extends CommonObject
 	public $element = "delivery";
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = "fk_delivery";
 
@@ -58,7 +58,7 @@ class Delivery extends CommonObject
 	public $table_element = "delivery";
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	public $table_element_line = "deliverydet";
 
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 042b22b3a1c..be9426415fe 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -47,7 +47,7 @@ class Don extends CommonObject
 	public $table_element = 'don';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_donation';
 
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 1776e9855d5..2c55b11f8d2 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -52,13 +52,14 @@ class EmailCollector extends CommonObject
 	 * @var int  Does emailcollector support extrafields ? 0=No, 1=Yes
 	 */
 	public $isextrafieldmanaged = 0;
+
 	/**
 	 * @var string String with name of icon for emailcollector. Must be the part after the 'object_' into object_emailcollector.png
 	 */
 	public $picto = 'generic';
 
 	/**
-	 * @var int    Field with ID of parent key if this field has a parent
+	 * @var string    Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_emailcollector';
 
@@ -158,7 +159,9 @@ class EmailCollector extends CommonObject
 	 */
 	public $date_creation;
 
-
+	/**
+	 * @var int timestamp
+	 */
 	public $tms;
 
 	/**
@@ -171,6 +174,9 @@ class EmailCollector extends CommonObject
 	 */
 	public $fk_user_modif;
 
+	/**
+	 * @var string import key
+	 */
 	public $import_key;
 
 
diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php
index 9b7c8bbca49..58aaf9efdb7 100644
--- a/htdocs/emailcollector/class/emailcollectoraction.class.php
+++ b/htdocs/emailcollector/class/emailcollectoraction.class.php
@@ -118,17 +118,17 @@ class EmailCollectorAction extends CommonObject
 	// If this object has a subtable with lines
 
 	// /**
-	//  * @var int    Name of subtable line
+	//  * @var string    Name of subtable line
 	//  */
 	//public $table_element_line = 'emailcollectoractiondet';
 
 	// /**
-	//  * @var int    Field with ID of parent key if this field has a parent
+	//  * @var string    Field with ID of parent key if this field has a parent
 	//  */
 	//public $fk_element = 'fk_emailcollectoraction';
 
 	// /**
-	//  * @var int    Name of subtable class that manage subtable lines
+	//  * @var string    Name of subtable class that manage subtable lines
 	//  */
 	//public $class_element_line = 'EmailcollectorActionline';
 
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 09a46f94bb8..e652dc5a3c1 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -55,7 +55,7 @@ class Expedition extends CommonObject
 	public $element = "shipping";
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = "fk_expedition";
 
@@ -65,7 +65,7 @@ class Expedition extends CommonObject
 	public $table_element = "expedition";
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	public $table_element_line = "expeditiondet";
 
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index ac1d052486f..3ecba5d5286 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -44,7 +44,14 @@ class ExpenseReport extends CommonObject
 	 */
 	public $table_element = 'expensereport';
 
+	/**
+	 * @var string table element line name
+	 */
 	public $table_element_line = 'expensereport_det';
+
+	/**
+	 * @var string Fieldname with ID of parent key if this field has a parent
+	 */
 	public $fk_element = 'fk_expensereport';
 
 	/**
diff --git a/htdocs/expensereport/class/expensereport_ik.class.php b/htdocs/expensereport/class/expensereport_ik.class.php
index 489b2671cf5..55af1eb00ed 100644
--- a/htdocs/expensereport/class/expensereport_ik.class.php
+++ b/htdocs/expensereport/class/expensereport_ik.class.php
@@ -40,7 +40,7 @@ class ExpenseReportIk extends CoreObject
 	public $table_element = 'expensereport_ik';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_expense_ik';
 
diff --git a/htdocs/expensereport/class/expensereport_rule.class.php b/htdocs/expensereport/class/expensereport_rule.class.php
index 7ed3a5ecb09..9a172cd7563 100644
--- a/htdocs/expensereport/class/expensereport_rule.class.php
+++ b/htdocs/expensereport/class/expensereport_rule.class.php
@@ -40,7 +40,7 @@ class ExpenseReportRule extends CoreObject
 	public $table_element = 'expensereport_rules';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Fieldname with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_expense_rule';
 
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 617da1963b8..7145605cb85 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -76,7 +76,7 @@ class Fichinter extends CommonObject
 	public $table_element = 'fichinter';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_fichinter';
 
@@ -1435,7 +1435,7 @@ class FichinterLigne extends CommonObjectLine
 	public $table_element = 'fichinterdet';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_fichinter';
 
diff --git a/htdocs/fichinter/class/fichinterrec.class.php b/htdocs/fichinter/class/fichinterrec.class.php
index 377b97b2abb..046d35b62ce 100644
--- a/htdocs/fichinter/class/fichinterrec.class.php
+++ b/htdocs/fichinter/class/fichinterrec.class.php
@@ -41,6 +41,10 @@ class FichinterRec extends Fichinter
 	public $element = 'fichinterrec';
 	public $table_element = 'fichinter_rec';
 	public $table_element_line = 'fichinter_rec';
+
+	/**
+	 * @var string Fieldname with ID of parent key if this field has a parent
+	 */
 	public $fk_element = 'fk_fichinter';
 
 	/**
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index b03faf7f629..c1be4db7be3 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -53,12 +53,12 @@ class CommandeFournisseur extends CommonOrder
 	public $table_element = 'commande_fournisseur';
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	public $table_element_line = 'commande_fournisseurdet';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_commande';
 
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 09c74dd5d92..4ddc552daa2 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -57,12 +57,12 @@ class FactureFournisseur extends CommonInvoice
 	public $table_element = 'facture_fourn';
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	public $table_element_line = 'facture_fourn_det';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_facture_fourn';
 
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 0677cd2f601..fb489338cb7 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -50,7 +50,7 @@ class Holiday extends CommonObject
 	public $ismultientitymanaged = 0;
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_holiday';
 
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index 02083ccd819..dc97787ae6e 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -40,12 +40,12 @@ class Establishment extends CommonObject
 	public $table_element = 'establishment';
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	public $table_element_line = '';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_establishment';
 
diff --git a/htdocs/intracommreport/class/intracommreport.class.php b/htdocs/intracommreport/class/intracommreport.class.php
index dc12427ec33..13df902d9b8 100644
--- a/htdocs/intracommreport/class/intracommreport.class.php
+++ b/htdocs/intracommreport/class/intracommreport.class.php
@@ -40,7 +40,7 @@ class IntracommReport extends CommonObject
 	public $table_element = 'intracommreport';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_intracommreport';
 
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 5d0281a5ea3..c0798fd52b8 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -187,37 +187,37 @@ class MyObject extends CommonObject
 
 	// If this object has a subtable with lines
 
-	/**
-	 * @var int    Name of subtable line
-	 */
-	//public $table_element_line = 'mymodule_myobjectline';
+	// /**
+	//  * @var string    Name of subtable line
+	//  */
+	// public $table_element_line = 'mymodule_myobjectline';
 
-	/**
-	 * @var int    Field with ID of parent key if this object has a parent
-	 */
-	//public $fk_element = 'fk_myobject';
+	// /**
+	//  * @var string    Field with ID of parent key if this object has a parent
+	//  */
+	// public $fk_element = 'fk_myobject';
 
-	/**
-	 * @var int    Name of subtable class that manage subtable lines
-	 */
-	//public $class_element_line = 'MyObjectline';
+	// /**
+	//  * @var string    Name of subtable class that manage subtable lines
+	//  */
+	// public $class_element_line = 'MyObjectline';
 
-	/**
-	 * @var array	List of child tables. To test if we can delete object.
-	 */
-	//protected $childtables = array();
+	// /**
+	//  * @var array	List of child tables. To test if we can delete object.
+	//  */
+	// protected $childtables = array();
 
-	/**
-	 * @var array    List of child tables. To know object to delete on cascade.
-	 *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
-	 *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
-	 */
-	//protected $childtablesoncascade = array('mymodule_myobjectdet');
+	// /**
+	//  * @var array    List of child tables. To know object to delete on cascade.
+	//  *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
+	//  *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
+	//  */
+	// protected $childtablesoncascade = array('mymodule_myobjectdet');
 
-	/**
-	 * @var MyObjectLine[]     Array of subtable lines
-	 */
-	//public $lines = array();
+	// /**
+	//  * @var MyObjectLine[]     Array of subtable lines
+	//  */
+	// public $lines = array();
 
 
 
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 2f58c90a433..b4e6b776cdd 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -166,17 +166,17 @@ class Mo extends CommonObject
 	// If this object has a subtable with lines
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	public $table_element_line = 'mo_production';
 
 	/**
-	 * @var int    Field with ID of parent key if this field has a parent
+	 * @var string    Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_mo';
 
 	/**
-	 * @var int    Name of subtable class that manage subtable lines
+	 * @var string    Name of subtable class that manage subtable lines
 	 */
 	public $class_element_line = 'MoLine';
 
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index dfb5a7e042a..ab8e1a22a80 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -56,14 +56,22 @@ class Product extends CommonObject
 	public $table_element = 'product';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_product';
 
 	/**
 	 * @var array	List of child tables. To test if we can delete object.
 	 */
-	protected $childtables = array('supplier_proposaldet', 'propaldet', 'commandedet', 'facturedet', 'contratdet', 'facture_fourn_det', 'commande_fournisseurdet');
+	protected $childtables = array(
+		'supplier_proposaldet',
+		'propaldet',
+		'commandedet',
+		'facturedet',
+		'contratdet',
+		'facture_fourn_det',
+		'commande_fournisseurdet'
+	);
 
 	/**
 	 * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index cb9da997d18..47d9425530f 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -170,6 +170,9 @@ class Inventory extends CommonObject
 	 */
 	public $fk_user_valid;
 
+	/**
+	 * @var string import key
+	 */
 	public $import_key;
 	// END MODULEBUILDER PROPERTIES
 
@@ -178,17 +181,17 @@ class Inventory extends CommonObject
 	// If this object has a subtable with lines
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	public $table_element_line = 'inventorydet';
 
 	/**
-	 * @var int    Field with ID of parent key if this field has a parent
+	 * @var string    Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_inventory';
 
 	/**
-	 * @var int    Name of subtable class that manage subtable lines
+	 * @var string    Name of subtable class that manage subtable lines
 	 */
 	public $class_element_line = 'Inventoryline';
 
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index f3442d759ed..4185d21d653 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -45,17 +45,17 @@ class Project extends CommonObject
 	public $table_element = 'projet';
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	public $table_element_line = 'projet_task';
 
 	/**
-	 * @var int    Name of field date
+	 * @var string    Name of field date
 	 */
 	public $table_element_date;
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_projet';
 
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index d71ac0852bc..a51e68c095e 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -45,7 +45,7 @@ class Task extends CommonObject
 	public $table_element = 'projet_task';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_task';
 
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index 07e32b64432..ef12d844ddc 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -46,7 +46,14 @@ class Reception extends CommonObject
 {
 	use CommonIncoterm;
 
+	/**
+	 * @var string element name
+	 */
 	public $element = "reception";
+
+	/**
+	 * @var string Fieldname with ID of parent key if this field has a parent
+	 */
 	public $fk_element = "fk_reception";
 	public $table_element = "reception";
 	public $table_element_line = "commande_fournisseur_dispatch";
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index 6c61ae55a1a..e997bfb7a3a 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -155,37 +155,37 @@ class RecruitmentCandidature extends CommonObject
 
 	// If this object has a subtable with lines
 
-	/**
-	 * @var int    Name of subtable line
-	 */
-	//public $table_element_line = 'recruitment_recruitmentcandidatureline';
+	// /**
+	//  * @var string    Name of subtable line
+	//  */
+	// public $table_element_line = 'recruitment_recruitmentcandidatureline';
 
-	/**
-	 * @var int    Field with ID of parent key if this object has a parent
-	 */
-	//public $fk_element = 'fk_recruitmentcandidature';
+	// /**
+	//  * @var string    Field with ID of parent key if this object has a parent
+	//  */
+	// public $fk_element = 'fk_recruitmentcandidature';
 
-	/**
-	 * @var int    Name of subtable class that manage subtable lines
-	 */
-	//public $class_element_line = 'RecruitmentCandidatureline';
+	// /**
+	//  * @var string    Name of subtable class that manage subtable lines
+	//  */
+	// public $class_element_line = 'RecruitmentCandidatureline';
 
-	/**
-	 * @var array	List of child tables. To test if we can delete object.
-	 */
-	//protected $childtables = array();
+	// /**
+	//  * @var array	List of child tables. To test if we can delete object.
+	//  */
+	// protected $childtables = array();
 
-	/**
-	 * @var array    List of child tables. To know object to delete on cascade.
-	 *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
-	 *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
-	 */
-	//protected $childtablesoncascade = array('recruitment_recruitmentcandidaturedet');
+	// /**
+	//  * @var array    List of child tables. To know object to delete on cascade.
+	//  *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
+	//  *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
+	//  */
+	// protected $childtablesoncascade = array('recruitment_recruitmentcandidaturedet');
 
-	/**
-	 * @var RecruitmentCandidatureLine[]     Array of subtable lines
-	 */
-	//public $lines = array();
+	// /**
+	//  * @var RecruitmentCandidatureLine[]     Array of subtable lines
+	//  */
+	// public $lines = array();
 
 
 
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index a75e915baee..4d475b17cfe 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -170,35 +170,35 @@ class RecruitmentJobPosition extends CommonObject
 
 	// If this object has a subtable with lines
 
-	/**
-	 * @var int    Name of subtable line
-	 */
-	//public $table_element_line = 'recruitment_recruitmentjobpositionline';
+	// /**
+	//  * @var string    Name of subtable line
+	//  */
+	// public $table_element_line = 'recruitment_recruitmentjobpositionline';
 
-	/**
-	 * @var int    Field with ID of parent key if this field has a parent
-	 */
-	//public $fk_element = 'fk_recruitmentjobposition';
+	// /**
+	//  * @var string    Field with ID of parent key if this field has a parent
+	//  */
+	// public $fk_element = 'fk_recruitmentjobposition';
 
-	/**
-	 * @var int    Name of subtable class that manage subtable lines
-	 */
-	//public $class_element_line = 'RecruitmentJobPositionline';
+	// /**
+	//  * @var string    Name of subtable class that manage subtable lines
+	//  */
+	// public $class_element_line = 'RecruitmentJobPositionline';
 
-	/**
-	 * @var array	List of child tables. To test if we can delete object.
-	 */
-	//protected $childtables=array();
+	// /**
+	//  * @var array	List of child tables. To test if we can delete object.
+	//  */
+	// protected $childtables=array();
 
-	/**
-	 * @var array	List of child tables. To know object to delete on cascade.
-	 */
-	//protected $childtablesoncascade=array('recruitment_recruitmentjobpositiondet');
+	// /**
+	//  * @var array	List of child tables. To know object to delete on cascade.
+	//  */
+	// protected $childtablesoncascade=array('recruitment_recruitmentjobpositiondet');
 
-	/**
-	 * @var RecruitmentJobPositionLine[]     Array of subtable lines
-	 */
-	//public $lines = array();
+	// /**
+	//  * @var RecruitmentJobPositionLine[]     Array of subtable lines
+	//  */
+	// public $lines = array();
 
 
 
diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php
index ec6a3e77363..e88ea0e4f7c 100644
--- a/htdocs/societe/class/companypaymentmode.class.php
+++ b/htdocs/societe/class/companypaymentmode.class.php
@@ -199,15 +199,15 @@ class CompanyPaymentMode extends CommonObject
 	// If this object has a subtable with lines
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	//public $table_element_line = 'companypaymentmodedet';
 	/**
-	 * @var int    Field with ID of parent key if this field has a parent
+	 * @var string    Field with ID of parent key if this field has a parent
 	 */
 	//public $fk_element = 'fk_companypaymentmode';
 	/**
-	 * @var int    Name of subtable class that manage subtable lines
+	 * @var string    Name of subtable class that manage subtable lines
 	 */
 	//public $class_element_line = 'CompanyPaymentModeline';
 	/**
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 73c41aeb782..f18a6e1b9a8 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -59,7 +59,7 @@ class Societe extends CommonObject
 	public $table_element = 'societe';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent or for child tables
+	 * @var string Field with ID of parent key if this field has a parent or for child tables
 	 */
 	public $fk_element = 'fk_soc';
 
diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index fe67c87674e..435be20b9f1 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -165,25 +165,25 @@ class SocieteAccount extends CommonObject
 
 	// If this object has a subtable with lines
 
-	/**
-	 * @var int    Name of subtable line
-	 */
+	// /**
+	//  * @var string    Name of subtable line
+	//  */
 	//public $table_element_line = 'societe_accountdet';
-	/**
-	 * @var int    Field with ID of parent key if this field has a parent
-	 */
+	// /**
+	//  * @var string    Field with ID of parent key if this field has a parent
+	//  */
 	//public $fk_element = 'fk_societe_account';
-	/**
-	 * @var int    Name of subtable class that manage subtable lines
-	 */
+	// /**
+	//  * @var string    Name of subtable class that manage subtable lines
+	//  */
 	//public $class_element_line = 'societeAccountline';
-	/**
-	 * @var array	List of child tables. To test if we can delete object.
-	 */
+	// /**
+	//  * @var array	List of child tables. To test if we can delete object.
+	//  */
 	//protected $childtables=array();
-	/**
-	 * @var societeAccountLine[]     Array of subtable lines
-	 */
+	// /**
+	//  * @var societeAccountLine[]     Array of subtable lines
+	//  */
 	//public $lines = array();
 
 
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index b46ed476629..ad4f47389d5 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -61,12 +61,12 @@ class SupplierProposal extends CommonObject
 	public $table_element = 'supplier_proposal';
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	public $table_element_line = 'supplier_proposaldet';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_supplier_proposal';
 
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 3288571d2a7..36b50d82055 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -54,7 +54,7 @@ class User extends CommonObject
 	public $table_element = 'user';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_user';
 
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 882d33bd562..5ba6b5553af 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -90,7 +90,10 @@ class UserGroup extends CommonObject
 	 */
 	public $datem;
 
-	public $note; // Description
+	/**
+	 * @var string Description
+	 */
+	public $note;
 
 	public $members = array(); // Array of users
 
@@ -111,7 +114,7 @@ class UserGroup extends CommonObject
 	);
 
 	/**
-	 * @var int    Field with ID of parent key if this field has a parent
+	 * @var string    Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_usergroup';
 
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index ff072827423..ff3c8d9c780 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -181,19 +181,19 @@ class WebsitePage extends CommonObject
 
 	// If this object has a subtable with lines
 
-	/**
-	 * @var int    Name of subtable line
-	 */
+	// /**
+	//  * @var string    Name of subtable line
+	//  */
 	//public $table_element_line = 'mymodule_myobjectline';
 
 	/**
-	 * @var int 	Field with ID of parent key if this field has a parent or for child tables
+	 * @var string 	Field with ID of parent key if this field has a parent or for child tables
 	 */
 	public $fk_element = 'fk_website_page';
 
-	/**
-	 * @var int    Name of subtable class that manage subtable lines
-	 */
+	// /**
+	//  * @var string    Name of subtable class that manage subtable lines
+	//  */
 	//public $class_element_line = 'MyObjectline';
 
 	/**
diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index 5d5a9c84eda..53f060346b9 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -254,29 +254,29 @@ class Hook extends CommonObject
 
 	// If this object has a subtable with lines
 
-	/**
-	 * @var int    Name of subtable line
-	 */
+	// /**
+	//  * @var string    Name of subtable line
+	//  */
 	//public $table_element_line = 'hookdet';
 
-	/**
-	 * @var int    Field with ID of parent key if this field has a parent
-	 */
+	// /**
+	//  * @var string    Field with ID of parent key if this field has a parent
+	//  */
 	//public $fk_element = 'fk_hook';
 
-	/**
-	 * @var int    Name of subtable class that manage subtable lines
-	 */
+	// /**
+	//  * @var string    Name of subtable class that manage subtable lines
+	//  */
 	//public $class_element_line = 'MyObjectline';
 
-	/**
-	 * @var array  Array of child tables (child tables to delete before deleting a record)
-	 */
+	// /**
+	//  * @var array  Array of child tables (child tables to delete before deleting a record)
+	//  */
 	//protected $childtables=array('hookdet');
 
-	/**
-	 * @var MyObjectLine[]     Array of subtable lines
-	 */
+	// /**
+	//  * @var MyObjectLine[]     Array of subtable lines
+	//  */
 	//public $lines = array();
 
 

From fbc0be3a438b301a90458ea801ec83cadbf09ae7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 5 Dec 2020 23:57:31 +0100
Subject: [PATCH 205/888] doxygen

---
 htdocs/core/class/comment.class.php | 98 ++++++++++++++++-------------
 1 file changed, 53 insertions(+), 45 deletions(-)

diff --git a/htdocs/core/class/comment.class.php b/htdocs/core/class/comment.class.php
index d748b0e5d50..3f9ca42e136 100644
--- a/htdocs/core/class/comment.class.php
+++ b/htdocs/core/class/comment.class.php
@@ -32,7 +32,7 @@ class Comment extends CommonObject
 	public $table_element = 'comment';
 
 	/**
-	 * @var int ID of parent key (it's nome the name of a field)
+	 * @var int ID of parent key (it's not the name of a field)
 	 */
 	public $fk_element;
 
@@ -75,10 +75,16 @@ class Comment extends CommonObject
 	 */
 	public $entity;
 
+	/**
+	 * @var string import key
+	 */
 	public $import_key;
 
 	public $comments = array();
 
+	/**
+	 * @var Comment Object oldcopy
+	 */
 	public $oldcopy;
 
 
@@ -134,26 +140,26 @@ class Comment extends CommonObject
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 
-			if (!$notrigger)
-			{
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('TASK_COMMENT_CREATE', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -193,12 +199,10 @@ class Comment extends CommonObject
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num_rows = $this->db->num_rows($resql);
 
-			if ($num_rows)
-			{
+			if ($num_rows) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
@@ -215,8 +219,11 @@ class Comment extends CommonObject
 
 			$this->db->free($resql);
 
-			if ($num_rows) return 1;
-			else return 0;
+			if ($num_rows) {
+				return 1;
+			} else {
+				return 0;
+			}
 		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
@@ -237,8 +244,12 @@ class Comment extends CommonObject
 		$error = 0;
 
 		// Clean parameters
-		if (isset($this->fk_element)) $this->fk_project = (int) trim($this->fk_element);
-		if (isset($this->description)) $this->description = trim($this->description);
+		if (isset($this->fk_element)) {
+			$this->fk_project = (int) trim($this->fk_element);
+		}
+		if (isset($this->description)) {
+			$this->description = trim($this->description);
+		}
 
 
 		// Update request
@@ -256,24 +267,24 @@ class Comment extends CommonObject
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
-		if (!$error)
-		{
-			if (!$notrigger)
-			{
+		if (!$error) {
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('TASK_COMMENT_MODIFY', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -306,24 +317,24 @@ class Comment extends CommonObject
 		$sql .= " WHERE rowid=".$this->id;
 
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
-		if (!$error)
-		{
-			if (!$notrigger)
-			{
+		if (!$error) {
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('TASK_COMMENT_DELETE', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -358,13 +369,10 @@ class Comment extends CommonObject
 
 			dol_syslog(get_class($this).'::'.__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$num_rows = $this->db->num_rows($resql);
-				if ($num_rows > 0)
-				{
-					while ($obj = $this->db->fetch_object($resql))
-					{
+				if ($num_rows > 0) {
+					while ($obj = $this->db->fetch_object($resql)) {
 						$comment = new self($db);
 						$comment->fetch($obj->rowid);
 						$this->comments[] = $comment;

From f70806544537d44a78b2efc80c5acfca5d4df5b9 Mon Sep 17 00:00:00 2001
From: Zebedeu <marciozebedeu@gmail.com>
Date: Sun, 6 Dec 2020 07:14:11 +0100
Subject: [PATCH 206/888] Revert "Fix | fixed the error of installation start
 of version 13.0.0-beta"

This reverts commit 1a1850c6f16d361bd86c0e521b42d50e3afc38af.
---
 htdocs/core/lib/functions.lib.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4bee0a0de80..890c16627aa 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3191,10 +3191,9 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 	// We forge fullpathpicto for image to $path/img/$picto. By default, we take DOL_URL_ROOT/theme/$conf->theme/img/$picto
 	$url = DOL_URL_ROOT;
+	$theme = $conf->theme;
+	$path = 'theme/'.$theme;
 
-	if (isset($conf->theme)) {
-		$theme = $conf->theme;
-	}
 	// Define fullpathpicto to use into src
 	if ($pictoisfullpath) {
 		// Clean parameters

From 8697fda78b18588e87cc3e974cc1d81ba4bbb920 Mon Sep 17 00:00:00 2001
From: Zebedeu <marciozebedeu@gmail.com>
Date: Sun, 6 Dec 2020 07:22:06 +0100
Subject: [PATCH 207/888] fix | fixed the error of installation start of
 version 13.0.0-beta

this patch fixed the problem but nevertheless does not pass the test because at the time of installation the variable $conf->theme is null
---
 htdocs/core/lib/functions.lib.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 890c16627aa..b7ea582702a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3191,7 +3191,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 	// We forge fullpathpicto for image to $path/img/$picto. By default, we take DOL_URL_ROOT/theme/$conf->theme/img/$picto
 	$url = DOL_URL_ROOT;
-	$theme = $conf->theme;
+
+	$theme = isset($conf->theme) ? $conf->theme : null;
 	$path = 'theme/'.$theme;
 
 	// Define fullpathpicto to use into src

From 2a4fe639aebf4f66925f20ea7eb51bbb8d07fa9d Mon Sep 17 00:00:00 2001
From: Zebedeu <marciozebedeu@gmail.com>
Date: Sun, 6 Dec 2020 07:28:18 +0100
Subject: [PATCH 208/888] Revert "fix | fixed the error of installation start
 of version 13.0.0-beta"

This reverts commit 8697fda78b18588e87cc3e974cc1d81ba4bbb920.
---
 htdocs/core/lib/functions.lib.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index b7ea582702a..890c16627aa 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3191,8 +3191,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 	// We forge fullpathpicto for image to $path/img/$picto. By default, we take DOL_URL_ROOT/theme/$conf->theme/img/$picto
 	$url = DOL_URL_ROOT;
-
-	$theme = isset($conf->theme) ? $conf->theme : null;
+	$theme = $conf->theme;
 	$path = 'theme/'.$theme;
 
 	// Define fullpathpicto to use into src

From 3b7e510e6100f7f3d4768cf7a92e55e1d2a00a0b Mon Sep 17 00:00:00 2001
From: Zebedeu <marciozebedeu@gmail.com>
Date: Sun, 6 Dec 2020 07:31:54 +0100
Subject: [PATCH 209/888] Fix #15675 fixed the error of installation start of
 version 13.0.0-beta

this patch fixed the problem but nevertheless does not pass the test because at the time of installation the variable $conf->theme is null
---
 htdocs/core/lib/functions.lib.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 890c16627aa..bc0ab3b382e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3191,9 +3191,10 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 	// We forge fullpathpicto for image to $path/img/$picto. By default, we take DOL_URL_ROOT/theme/$conf->theme/img/$picto
 	$url = DOL_URL_ROOT;
-	$theme = $conf->theme;
-	$path = 'theme/'.$theme;
 
+	$theme = isset($conf->theme) ? $conf->theme : null;
+	$path = 'theme/'.$theme;
+	
 	// Define fullpathpicto to use into src
 	if ($pictoisfullpath) {
 		// Clean parameters

From e38c6e4322b757ebdde714b2fbd512d716e0847c Mon Sep 17 00:00:00 2001
From: Zebedeu <marciozebedeu@gmail.com>
Date: Sun, 6 Dec 2020 07:42:45 +0100
Subject: [PATCH 210/888] Revert "Fix #15675 fixed the error of installation
 start of version 13.0.0-beta"

This reverts commit 3b7e510e6100f7f3d4768cf7a92e55e1d2a00a0b.
---
 htdocs/core/lib/functions.lib.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index bc0ab3b382e..890c16627aa 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3191,10 +3191,9 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 	// We forge fullpathpicto for image to $path/img/$picto. By default, we take DOL_URL_ROOT/theme/$conf->theme/img/$picto
 	$url = DOL_URL_ROOT;
-
-	$theme = isset($conf->theme) ? $conf->theme : null;
+	$theme = $conf->theme;
 	$path = 'theme/'.$theme;
-	
+
 	// Define fullpathpicto to use into src
 	if ($pictoisfullpath) {
 		// Clean parameters

From 35ea990cffe509ba2a9abf3a043c067057c393ab Mon Sep 17 00:00:00 2001
From: Zebedeu <marciozebedeu@gmail.com>
Date: Sun, 6 Dec 2020 07:49:22 +0100
Subject: [PATCH 211/888] Fix #15675 fixed the error of installation start of
 version 13.0.0-beta

this patch fixed the problem but nevertheless does not pass the test because at the time of installation the variable $conf->theme is null
---
 htdocs/core/lib/functions.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 890c16627aa..66f0ea78abf 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3191,9 +3191,9 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 	// We forge fullpathpicto for image to $path/img/$picto. By default, we take DOL_URL_ROOT/theme/$conf->theme/img/$picto
 	$url = DOL_URL_ROOT;
-	$theme = $conf->theme;
+	$theme = isset($conf->theme) ? $conf->theme : null;
 	$path = 'theme/'.$theme;
-
+	
 	// Define fullpathpicto to use into src
 	if ($pictoisfullpath) {
 		// Clean parameters

From 50b80785f527f08893d3e4fec3d897f1c2dd9600 Mon Sep 17 00:00:00 2001
From: Zebedeu <marciozebedeu@gmail.com>
Date: Sun, 6 Dec 2020 07:56:18 +0100
Subject: [PATCH 212/888] Revert "Fix #15675 fixed the error of installation
 start of version 13.0.0-beta"

This reverts commit 35ea990cffe509ba2a9abf3a043c067057c393ab.
---
 htdocs/core/lib/functions.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 66f0ea78abf..890c16627aa 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3191,9 +3191,9 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 	// We forge fullpathpicto for image to $path/img/$picto. By default, we take DOL_URL_ROOT/theme/$conf->theme/img/$picto
 	$url = DOL_URL_ROOT;
-	$theme = isset($conf->theme) ? $conf->theme : null;
+	$theme = $conf->theme;
 	$path = 'theme/'.$theme;
-	
+
 	// Define fullpathpicto to use into src
 	if ($pictoisfullpath) {
 		// Clean parameters

From dadb257c85719df681d67e2f80a2393fa9458355 Mon Sep 17 00:00:00 2001
From: Zebedeu <marciozebedeu@gmail.com>
Date: Sun, 6 Dec 2020 07:58:46 +0100
Subject: [PATCH 213/888] Fix #15675 fixed the error of installation start of
 version 13.0.0-beta

this patch fixed the problem but nevertheless does not pass the test because at the time of installation the variable $conf->theme is null
---
 htdocs/core/lib/functions.lib.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 890c16627aa..6fe7454aabf 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3191,9 +3191,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 	// We forge fullpathpicto for image to $path/img/$picto. By default, we take DOL_URL_ROOT/theme/$conf->theme/img/$picto
 	$url = DOL_URL_ROOT;
-	$theme = $conf->theme;
+	$theme = isset($conf->theme) ? $conf->theme : null;
 	$path = 'theme/'.$theme;
-
 	// Define fullpathpicto to use into src
 	if ($pictoisfullpath) {
 		// Clean parameters

From b3fe38d6bb3e22eb4fcdfb5dbe1b3bf94c965ee6 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sun, 6 Dec 2020 14:20:16 +0100
Subject: [PATCH 214/888] Fix list current ticket in takepos with multicompany

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

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 9ac81f1ccf9..d2d5621ace6 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -1018,7 +1018,7 @@ $( document ).ready(function() {
 
 	<?php
 	$sql = "SELECT rowid, datec, ref FROM ".MAIN_DB_PREFIX."facture";
-	$sql .= " WHERE ref LIKE '(PROV-POS".$_SESSION["takeposterminal"]."-0%'";
+	$sql .= " WHERE ref LIKE '(PROV-POS".$_SESSION["takeposterminal"]."-0%' AND entity IN (".getEntity('invoice').")";
 	$sql .= $db->order('datec', 'ASC');
 	$resql = $db->query($sql);
 	if ($resql) {
@@ -1400,4 +1400,4 @@ if ($action == "search")
 	</center>';
 }
 
-print '</div>';
\ No newline at end of file
+print '</div>';

From 1f83e22aea73245b13391db27a9bb6a53001e78d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 6 Dec 2020 15:59:19 +0100
Subject: [PATCH 215/888] Fix set of translation of website page during cloning

---
 htdocs/core/class/html.form.class.php      |  2 +-
 htdocs/core/class/html.formadmin.class.php | 11 ++++++----
 htdocs/core/class/translate.class.php      | 16 ++++++++------
 htdocs/langs/en_US/website.lang            |  3 ++-
 htdocs/website/class/websitepage.class.php |  1 +
 htdocs/website/index.php                   | 25 ++++++++++++----------
 6 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 44fee06446f..8a125f65f86 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4221,7 +4221,7 @@ class Form
 	 *     @param	string			$title       	   	Title
 	 *     @param	string			$question    	   	Question
 	 *     @param 	string			$action      	   	Action
-	 *	   @param  	array|string	$formquestion	   	An array with complementary inputs to add into forms: array(array('label'=> ,'type'=> , ))
+	 *	   @param  	array|string	$formquestion	   	An array with complementary inputs to add into forms: array(array('label'=> ,'type'=> , 'size'=>, 'morecss'=>, 'moreattr'=>))
 	 *													type can be 'hidden', 'text', 'password', 'checkbox', 'radio', 'date', 'morecss', ...
 	 * 	   @param  	string			$selectedchoice  	'' or 'no', or 'yes' or '1' or '0'
 	 * 	   @param  	int|string		$useajax		   	0=No, 1=Yes, 2=Yes but submit page with &confirm=no if choice is No, 'xxx'=Yes and preoutput confirm box with div id=dialog-confirm-xxx
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index b0b979dcf46..3e8eb04c430 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -51,14 +51,14 @@ class FormAdmin
 	 *  @param      string		$htmlname       Name of HTML select
 	 *  @param      int			$showauto       Show 'auto' choice
 	 *  @param      array		$filter         Array of keys to exclude in list (opposite of $onlykeys)
-	 *  @param		string		$showempty		'1'=Add empty value or string to show
+	 *  @param		string		$showempty		'1'=Add empty value or 'string to show'
 	 *  @param      int			$showwarning    Show a warning if language is not complete
 	 *  @param		int			$disabled		Disable edit of select
 	 *  @param		string		$morecss		Add more css styles
 	 *  @param      int         $showcode       1=Add language code into label at begining, 2=Add language code into label at end
 	 *  @param		int			$forcecombo		Force to use combo box (so no ajax beautify effect)
 	 *  @param		int			$multiselect	Make the combo a multiselect
-	 *  @param		array		$onlykeys		Show only the following keys (opposite of $filter). Example array('fr', 'es', ...)
+	 *  @param		array		$onlykeys		Array of language keys to restrict list with the following keys (opposite of $filter). Example array('fr', 'es', ...)
 	 *  @param		int			$mainlangonly	1=Show only main languages ('fr_FR' no' fr_BE', 'es_ES' not 'es_MX', ...)
 	 *  @return		string						Return HTML select string with list of languages
 	 */
@@ -95,9 +95,12 @@ class FormAdmin
 		foreach ($langs_available as $key => $value)
 		{
 			$valuetoshow = $value;
-			if ($showcode == 1) $valuetoshow = $key.' - '.$value;
+			if ($showcode == 1) {
+				if ($mainlangonly) $valuetoshow = '<span class="opacitymedium">'.preg_replace('/[_-].*$/', '', $key).'</span> - '.$value;
+				else $valuetoshow = '<span class="opacitymedium">'.$key.'</span> - '.$value;
+			}
 			if ($showcode == 2) {
-				if ($mainlangonly) $valuetoshow = $value.' ('.preg_replace('/[_-].*$/', '', $key).')';
+				if ($mainlangonly) $valuetoshow = $value.' <span class="opacitymedium">('.preg_replace('/[_-].*$/', '', $key).')</span>';
 				else $valuetoshow = $value.' <span class="opacitymedium">('.$key.')</span>';
 			}
 
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 7655d6033d9..18169c8e5ce 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -794,29 +794,33 @@ class Translate
 				if ($mainlangonly) {
 					$arrayofspecialmainlanguages = array(
 						'en'=>'en_US',
-						'sq'=>'sq_AL',
+						'am'=>'am_ET',
 						'ar'=>'ar_SA',
-						'eu'=>'eu_ES',
 						'bn'=>'bn_DB',
 						'bs'=>'bs_BA',
 						'ca'=>'ca_ES',
-						'zh'=>'zh_TW',
 						'cs'=>'cs_CZ',
 						'da'=>'da_DK',
 						'et'=>'et_EE',
-						'ka'=>'ka_GE',
 						'el'=>'el_GR',
+						'eu'=>'eu_ES',
+						'fa'=>'fa_IR',
 						'he'=>'he_IL',
-						'kn'=>'kn_IN',
+						'ka'=>'ka_GE',
 						'km'=>'km_KH',
+						'kn'=>'kn_IN',
 						'ko'=>'ko_KR',
+						'ja'=>'ja_JP',
 						'lo'=>'lo_LA',
 						'nb'=>'nb_NO',
 						'fa'=>'fa_IR',
+						'sq'=>'sq_AL',
 						'sr'=>'sr_RS',
+						'sv'=>'sv_SE',
 						'sl'=>'sl_SI',
 						'uk'=>'uk_UA',
-						'vi'=>'vi_VN'
+						'vi'=>'vi_VN',
+						'zh'=>'zh_CN'
 					);
 					if (strtolower($regs[1]) != strtolower($regs[2]) && !in_array($dir, $arrayofspecialmainlanguages)) continue;
 				}
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 27a5d607fb8..b6dbee28994 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -135,4 +135,5 @@ RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
-AllowedInFrames=Allowed in Frames
\ No newline at end of file
+AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
\ No newline at end of file
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index ff072827423..ecdb9fa6f15 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -682,6 +682,7 @@ class WebsitePage extends CommonObject
 		$object->author_alias = '';
 		$object->date_creation = $now;
 		$object->title = ($newtitle == '1' ? $object->title : ($newtitle ? $newtitle : $object->title));
+		$object->description = $object->title;
 		if (!empty($newlang)) $object->lang = $newlang;
 		if ($istranslation) $object->fk_page = $fromid;
 		else $object->fk_page = 0;
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index d8ad8163dde..b6f274c375d 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -1824,8 +1824,7 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 		// Protection if it is a translation page
 		if ($istranslation)
 		{
-			if (GETPOST('newlang', 'aZ09') == $objectpage->lang)
-			{
+			if (GETPOST('newlang', 'aZ09') == $objectpage->lang || !GETPOST('newlang', 'aZ09')) {
 				$error++;
 				setEventMessages($langs->trans("LanguageMustNotBeSameThanClonedPage"), null, 'errors');
 				$action = 'preview';
@@ -2631,24 +2630,28 @@ if (!GETPOST('hide_websitemenu'))
 					$onlylang = array();
 					if ($website->otherlang) {
 						if (!empty($website->lang)) {
-							$onlylang[$website->lang] = $website->lang;
+							$onlylang[$website->lang] = $website->lang.' ('.$langs->trans("Default").')';
 						}
 						foreach (explode(',', $website->otherlang) as $langkey) {
 							$onlylang[$langkey] = $langkey;
 						}
-						$textifempty = 1;
+						$textifempty = $langs->trans("Default");
 					} else {
-						$onlylang['none'] = '';
+						$onlylang['none'] = 'none';
+						$textifempty = $langs->trans("Default");
 					}
-					$textifempty = 1;
 					$formquestion = array(
 						array('type' => 'hidden', 'name' => 'sourcepageurl', 'value'=> $objectpage->pageurl),
 						array('type' => 'other', 'tdclass'=>'fieldrequired', 'name' => 'newwebsite', 'label' => $langs->trans("WebSite"), 'value' => $formwebsite->selectWebsite($object->id, 'newwebsite', 0)),
-						array('type' => 'text', 'tdclass'=>'maxwidth200 fieldrequired', 'name' => 'newtitle', 'label'=> $langs->trans("WEBSITE_TITLE"), 'value'=> $langs->trans("CopyOf").' '.$objectpage->title),
-						array('type' => 'text', 'tdclass'=>'maxwidth200', 'name' => 'newpageurl', 'label'=> $langs->trans("WEBSITE_PAGENAME"), 'value'=> ''),
-						array('type' => 'checkbox', 'tdclass'=>'maxwidth200', 'name' => 'is_a_translation', 'label' => $langs->trans("PageIsANewTranslation"), 'value' => 0, 'morecss'=>'margintoponly'),
-						array('type' => 'other', 'name' => 'newlang', 'label' => $form->textwithpicto($langs->trans("Language"), $langs->trans("DefineListOfAltLanguagesInWebsiteProperties")), 'value' => $formadmin->select_language($preselectedlanguage, 'newlang', 0, null, $textifempty, 0, 0, 'minwidth200', 0, 1, 0, $onlylang, 1)),
-					);
+						array('type' => 'text', 'tdclass'=>'maxwidth200 fieldrequired', 'moreattr'=>'autofocus="autofocus"', 'name' => 'newtitle', 'label'=> $langs->trans("WEBSITE_TITLE"), 'value'=> $langs->trans("CopyOf").' '.$objectpage->title),
+						array('type' => 'text', 'tdclass'=>'maxwidth200', 'name' => 'newpageurl', 'label'=> $langs->trans("WEBSITE_PAGENAME"), 'value'=> '')
+						);
+					if (count($onlylang) > 1) {
+						$formquestion[] = array('type' => 'checkbox', 'tdclass'=>'maxwidth200', 'name' => 'is_a_translation', 'label' => $langs->trans("PageIsANewTranslation"), 'value' => 0, 'morecss'=>'margintoponly');
+					}
+
+					$value= $formadmin->select_language($preselectedlanguage, 'newlang', 0, null, $textifempty, 0, 0, 'minwidth200', 1, 0, 0, $onlylang, 1);
+					$formquestion[] = array('type' => 'other', 'name' => 'newlang', 'label' => $form->textwithpicto($langs->trans("Language"), $langs->trans("DefineListOfAltLanguagesInWebsiteProperties")), 'value' => $value);
 
 				   	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid, $langs->trans('ClonePage'), '', 'confirm_createpagefromclone', $formquestion, 0, 1, 300, 550);
 

From eac2a42b1c6a19114c7a7c1f3d6ff338248f06d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 6 Dec 2020 16:44:21 +0100
Subject: [PATCH 216/888] remove warning

---
 htdocs/accountancy/bookkeeping/card.php | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index b250459bdce..d0f43cfe3dd 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2013-2017  Florian Henry           <florian.henry@open-concept.pro>
  * Copyright (C) 2013-2018  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2017       Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric 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
@@ -128,8 +128,7 @@ if ($action == "confirm_update") {
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 			} else {
-				if ($mode != '_tmp')
-				{
+				if ($mode != '_tmp') {
 					setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 				}
 
@@ -165,14 +164,14 @@ if ($action == "confirm_update") {
 		$object->label_operation = $label_operation;
 		$object->debit = $debit;
 		$object->credit = $credit;
-		$object->doc_date = GETPOST('doc_date', 'alpha');
-		$object->doc_type = GETPOST('doc_type', 'alpha');
+		$object->doc_date = (string) GETPOST('doc_date', 'alpha');
+		$object->doc_type = (string) GETPOST('doc_type', 'alpha');
 		$object->piece_num = $piece_num;
-		$object->doc_ref = GETPOST('doc_ref', 'alpha');
+		$object->doc_ref = (string) GETPOST('doc_ref', 'alpha');
 		$object->code_journal = $journal_code;
 		$object->journal_label = $journal_label;
-		$object->fk_doc = (int) GETPOST('fk_doc', 'int');
-		$object->fk_docdet = (int) GETPOST('fk_docdet', 'int');
+		$object->fk_doc = GETPOSTINT('fk_doc');
+		$object->fk_docdet = GETPOSTINT('fk_docdet');
 
 		if (floatval($debit) != 0.0) {
 			$object->montant = $debit; // deprecated
@@ -190,8 +189,7 @@ if ($action == "confirm_update") {
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		} else {
-			if ($mode != '_tmp')
-			{
+			if ($mode != '_tmp') {
 				setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 			}
 

From de61a7cfd3284e6843dbd4d98c757ca752e6e8bf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 6 Dec 2020 17:30:27 +0100
Subject: [PATCH 217/888] Fix cleaning html tags with trans and with GETPOST.

---
 htdocs/contrat/class/contrat.class.php  | 14 ++++++--------
 htdocs/core/actions_extrafields.inc.php |  7 +++++--
 htdocs/core/class/translate.class.php   |  6 +++---
 htdocs/core/lib/functions.lib.php       | 18 ++++++++++++++----
 htdocs/holiday/class/holiday.class.php  |  2 +-
 test/phpunit/FormTest.php               |  4 ++--
 test/phpunit/SecurityTest.php           | 13 +++++++++++--
 7 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 9e277fd706b..aa146aebf10 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -1032,21 +1032,19 @@ class Contrat extends CommonObject
 			}
 
 			// Insert business contacts ('SALESREPFOLL','contrat')
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->add_contact($this->commercial_suivi_id, 'SALESREPFOLL', 'internal');
 				if ($result < 0) $error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				if (!empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
 				{
 					$this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
 				}
 
 				// Add object linked
-				if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects))
+				if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects))
 				{
 					foreach ($this->linked_objects as $origin => $tmp_origin_id)
 					{
@@ -1144,10 +1142,10 @@ class Contrat extends CommonObject
 
 
 	/**
-	 *  Supprime l'objet de la base
+	 *  Delete object
 	 *
-	 *  @param	User		$user       Utilisateur qui supprime
-	 *  @return int         			< 0 si erreur, > 0 si ok
+	 *  @param	User		$user       User that deletes
+	 *  @return int         			< 0 if KO, > 0 if OK
 	 */
 	public function delete($user)
 	{
diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
index d5936a6dadb..2b5b38441e0 100644
--- a/htdocs/core/actions_extrafields.inc.php
+++ b/htdocs/core/actions_extrafields.inc.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2011-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2011-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -356,6 +356,9 @@ if ($action == 'update')
 				$visibility = GETPOST('list', 'alpha');
 				if ($type == 'separate') $visibility = 3;
 
+				// Example: is_object($object) ? ($object->id < 10 ? round($object->id / 2, 2) : (2 * $user->id) * (int) substr($mysoc->zip, 1, 2)) : 'objnotdefined'
+				$computedvalue = GETPOST('computed_value', 'nohtml');
+
 				$result = $extrafields->update(
 					GETPOST('attrname', 'aZ09'),
 					GETPOST('label', 'alpha'),
@@ -371,7 +374,7 @@ if ($action == 'update')
 					$visibility,
 					GETPOST('help', 'alpha'),
 					GETPOST('default_value', 'alpha'),
-					GETPOST('computed_value', 'alpha'),
+					$computedvalue,
 					(GETPOST('entitycurrentorall', 'alpha') ? 0 : ''),
 					GETPOST('langfile'),
 					GETPOST('enabled', 'alpha'),
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 18169c8e5ce..11e67104f9a 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -624,7 +624,7 @@ class Translate
 			// we want to keep '"' '<b>' '</b>' '<strong' '</strong>' '<a ' '</a>' '<br>' '< ' '<span' '</span>' that are reliable HTML tags inside translation strings.
 			$str = str_replace(
 				array('"', '<b>', '</b>', '<u>', '</u>', '<i>', '</i>', '<center>', '</center>', '<strong>', '</strong>', '<a ', '</a>', '<br>', '<span', '</span>', '< ', '>'), // We accept '< ' but not '<'. We can accept however '>'
-				array('__quot__', '__tagb__', '__tagbend__', '__tagu__', '__taguend__', '__tagi__', '__tagiend__', '__tagcenter__', '__tagcenterend__', '__tagb__', '__tagbend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__lt__', '__gt__'),
+				array('__quot__', '__tagb__', '__tagbend__', '__tagu__', '__taguend__', '__tagi__', '__tagiend__', '__tagcenter__', '__tagcenterend__', '__tagb__', '__tagbend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__ltspace__', '__gt__'),
 				$str
 			);
 
@@ -638,8 +638,8 @@ class Translate
 
 			// Restore reliable HTML tags into original translation string
 			$str = str_replace(
-				array('__quot__', '__tagb__', '__tagbend__', '__tagu__', '__taguend__', '__tagi__', '__tagiend__', '__tagcenter__', '__tagcenterend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__lt__', '__gt__'),
-				array('"', '<b>', '</b>', '<u>', '</u>', '<i>', '</i>', '<center>', '</center>', '<a ', '</a>', '<br>', '<span', '</span>', '< ', '> '),
+				array('__quot__', '__tagb__', '__tagbend__', '__tagu__', '__taguend__', '__tagi__', '__tagiend__', '__tagcenter__', '__tagcenterend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__ltspace__', '__gt__'),
+				array('"', '<b>', '</b>', '<u>', '</u>', '<i>', '</i>', '<center>', '</center>', '<a ', '</a>', '<br>', '<span', '</span>', '< ', '>'),
 				$str
 			);
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index babf1129e6e..2886b140539 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5701,9 +5701,11 @@ function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto =
 	if ($removelinefeed == 2) $stringtoclean = preg_replace('/<br[^>]*>(\n|\r)+/ims', '<br>', $stringtoclean);
 	$temp = preg_replace('/<br[^>]*>/i', "\n", $stringtoclean);
 
-	// We remove entities BEFORE stripping (in case of a separator char is encoded and not the other, the strip will fails)
+	// We remove entities BEFORE stripping (in case of an open separator char that is entity encoded and not the closing other, the strip will fails)
 	$temp = dol_html_entity_decode($temp, ENT_COMPAT | ENT_HTML5, $pagecodeto);
 
+	$temp = str_replace('< ', '__ltspace__', $temp);
+
 	if ($strip_tags) {
 		$temp = strip_tags($temp);
 	} else {
@@ -5727,16 +5729,19 @@ function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto =
 		}
 	}
 
+	$temp = str_replace('__ltspace__', '< ', $temp);
+
 	return trim($temp);
 }
 
 /**
  *	Clean a string to keep only desirable HTML tags.
+ *  WARNING: This also clean HTML comments (used to obfuscate tag name).
  *
  *	@param	string	$stringtoclean			String to clean
  *  @param	int		$cleanalsosomestyles	Remove absolute/fixed positioning from inline styles
  *  @param	int		$removeclassattribute	Remove the class attribute from tags
- *  @param	int		$cleanalsojavascript	Remove also occurence of (javascript:'
+ *  @param	int		$cleanalsojavascript	Remove also occurence of 'javascript:'.
  *	@return string	    					String cleaned
  *
  * 	@see	dol_escape_htmltag() strip_tags() dol_string_nohtmltag() dol_string_neverthesehtmltags()
@@ -5754,16 +5759,21 @@ function dol_string_onlythesehtmltags($stringtoclean, $cleanalsosomestyles = 1,
 	$stringtoclean = dol_string_nounprintableascii($stringtoclean, 0);
 	$stringtoclean = preg_replace('/&colon;/i', ':', $stringtoclean);
 
+	$stringtoclean = preg_replace('/<!--[^>]*-->/', '', $stringtoclean);
+	$stringtoclean = preg_replace('/&#58;|&#0000058|&#x3A/i', '', $stringtoclean); // refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
+	$stringtoclean = preg_replace('/javascript\s*:/i', '', $stringtoclean);
+
 	$temp = strip_tags($stringtoclean, $allowed_tags_string);
 
 	if ($cleanalsosomestyles) {	// Clean for remaining html tags
-		$stringtoclean = preg_replace('/position\s*:\s*(absolute|fixed)\s*!\s*important/i', '', $temp); // Note: If hacker try to introduce css comment into string to bypass this regex, the string must also be encoded by the dol_htmlentitiesbr during output so it become harmless
+		$temp = preg_replace('/position\s*:\s*(absolute|fixed)\s*!\s*important/i', '', $temp); // Note: If hacker try to introduce css comment into string to bypass this regex, the string must also be encoded by the dol_htmlentitiesbr during output so it become harmless
 	}
 	if ($removeclassattribute) {	// Clean for remaining html tags
-		$stringtoclean = preg_replace('/(<[^>]+)\s+class=((["\']).*?\\3|\\w*)/i', '\\1', $temp);
+		$temp = preg_replace('/(<[^>]+)\s+class=((["\']).*?\\3|\\w*)/i', '\\1', $temp);
 	}
 
 	// Remove 'javascript:' that we should not find into a text with
+	// Warning: This is not reliable to fight against obfuscated javascript, there is a lot of other solution to include js into a common html tag (only filtered by the GETPOST).
 	if ($cleanalsojavascript) {
 		$temp = preg_replace('/javascript\s*:/i', '', $temp);
 	}
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 0677cd2f601..4e1272a8f69 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1411,7 +1411,7 @@ class Holiday extends CommonObject
 
 				// Update each user counter
 				foreach ($users as $userCounter) {
-					$nbDaysToAdd = $typeleaves[$userCounter['type']]['newByMonth'];
+					$nbDaysToAdd = (isset($typeleaves[$userCounter['type']]['newByMonth']) ? $typeleaves[$userCounter['type']]['newByMonth'] : 0);
 					if (empty($nbDaysToAdd)) continue;
 
 					dol_syslog("We update leave type id ".$userCounter['type']." for user id ".$userCounter['rowid'], LOG_DEBUG);
diff --git a/test/phpunit/FormTest.php b/test/phpunit/FormTest.php
index bec23048e9f..76e7c4e69a8 100644
--- a/test/phpunit/FormTest.php
+++ b/test/phpunit/FormTest.php
@@ -143,14 +143,14 @@ class FormTest extends PHPUnit\Framework\TestCase
 		$result=$localobject->select_produits_list('', 'productid', '', 5, 0, '', 1, 2, 1);
 
     	$this->assertEquals(count($result), 5);
-    	print __METHOD__." result=".$result."\n";
+    	print __METHOD__." count result=".count($result)."\n";
 
     	$conf->global->ENTREPOT_EXTRA_STATUS = 1;
 
     	// Exclude stock in warehouseinternal
     	$result=$localobject->select_produits_list('', 'productid', '', 5, 0, '', 1, 2, 1, 0, '1', 0, '', 0, 'warehouseclosed,warehouseopen');
     	$this->assertEquals(count($result), 5);
-    	print __METHOD__." result=".$result."\n";
+    	print __METHOD__." count result=".count($result)."\n";
 
     	return $result;
     }
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index f6eb7783c4f..4d642c733b4 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -285,9 +285,10 @@ class SecurityTest extends PHPUnit\Framework\TestCase
         $_POST["param6"]="&quot;&gt;<svg o&#110;load='console.log(&quot;123&quot;)'&gt;";
         $_GET["param7"]='"c:\this is a path~1\aaa&#110;" abc<bad>def</bad>';
         $_POST["param8"]="Hacker<svg o&#110;load='console.log(&quot;123&quot;)'";	// html tag is not closed so it is not detected as html tag but is still harmfull
+		$_POST["param9"]='is_object($object) ? ($object->id < 10 ? round($object->id / 2, 2) : (2 * $user->id) * (int) substr($mysoc->zip, 1, 2)) : \'objnotdefined\'';
+		$_POST["param10"]='is_object($object) ? ($object->id < 10 ? round($object->id / 2, 2) : (2 * $user->id) * (int) substr($mysoc->zip, 1, 2)) : \'<abc>objnotdefined\'';
 
-        // Test int
-        $result=GETPOST('id', 'int');              // Must return nothing
+		$result=GETPOST('id', 'int');              // Must return nothing
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result, '');
 
@@ -347,6 +348,14 @@ class SecurityTest extends PHPUnit\Framework\TestCase
         print __METHOD__." result=".$result."\n";
         $this->assertEquals("Hacker<svg onload='console.log(123)'", $result);
 
+        $result=GETPOST("param9", 'alphanohtml');
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals($_POST["param9"], $result);
+
+        $result=GETPOST("param10", 'alphanohtml');
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals($_POST["param9"], $result, 'We should get param9 after processing param10');
+
         return $result;
     }
 

From a87ef491725cb0054b6010619fa965b5aee62a75 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 6 Dec 2020 17:59:49 +0100
Subject: [PATCH 218/888] Fix remove warning

---
 htdocs/compta/facture/class/facture.class.php |  4 +-
 htdocs/core/lib/functions.lib.php             | 39 +++++++++----------
 htdocs/core/lib/price.lib.php                 | 16 ++++----
 3 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 20be732da17..456a18d8e2c 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3126,8 +3126,8 @@ class Facture extends CommonInvoice
 			$this->line->tva_tx = $txtva;
 			$this->line->localtax1_tx = ($total_localtax1 ? $localtaxes_type[1] : 0);
 			$this->line->localtax2_tx = ($total_localtax2 ? $localtaxes_type[3] : 0);
-			$this->line->localtax1_type = $localtaxes_type[0];
-			$this->line->localtax2_type = $localtaxes_type[2];
+			$this->line->localtax1_type = isset($localtaxes_type[0]) ? $localtaxes_type[0] : '';
+			$this->line->localtax2_type = isset($localtaxes_type[2]) ? $localtaxes_type[2] : '';
 
 			$this->line->total_ht = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_ht) : $total_ht); // For credit note and if qty is negative, total is negative
 			$this->line->total_ttc = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_ttc) : $total_ttc); // For credit note and if qty is negative, total is negative
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 2886b140539..d38cdc69104 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5150,17 +5150,17 @@ function getTaxesFromId($vatrate, $buyer = null, $seller = null, $firstparamisid
 /**
  *  Get type and rate of localtaxes for a particular vat rate/country of a thirdparty.
  *  This does not take into account the seller setup if subject to vat or not, only country.
- *  TODO
- *  This function is ALSO called to retrieve type for building PDF. Such call of function must be removed.
- *  Instead this function must be called when adding a line to get the array of localtax and type, and then
- *  provide it to the function calcul_price_total.
+ *
+ *  TODO This function is ALSO called to retrieve type for building PDF. Such call of function must be removed.
+ *  Instead this function must be called when adding a line to get the array of possible values for localtax and type, and then
+ *  provide the selected value to the function calcul_price_total.
  *
  *  @param	int|string  $vatrate			VAT ID or Rate+Code. Value can be value or the string with code into parenthesis or rowid if $firstparamisid is 1. Example: '8.5' or '8.5 (8.5NPR)' or 123.
  *  @param	int		    $local              Number of localtax (1 or 2, or 0 to return 1 & 2)
  *  @param	Societe	    $buyer         		Company object
  *  @param	Societe	    $seller        		Company object
  *  @param  int         $firstparamisid     1 if first param is ID into table instead of Rate+code (use this if you can)
- *  @return	array    	    				array(localtax_type1(1-6/0 if not found), rate localtax1, localtax_type2, rate localtax2, accountancycodecust, accountancycodesupp)
+ *  @return	array    	    				array(localtax_type1(1-6 or 0 if not found), rate localtax1, localtax_type2, rate localtax2, accountancycodecust, accountancycodesupp)
  *  @see getTaxesFromId()
  */
 function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisid = 0)
@@ -5172,13 +5172,13 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 	// Search local taxes
 	$sql  = "SELECT t.taux as rate, t.code, t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";
 	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";
-	if ($firstparamisid) $sql .= " WHERE t.rowid = ".(int) $vatrate;
-	else {
+	if ($firstparamisid) {
+		$sql .= " WHERE t.rowid = ".(int) $vatrate;
+	} else {
 		$vatratecleaned = $vatrate;
 		$vatratecode = '';
 		$reg = array();
-		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "x.x (yy)"
-		{
+		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {     // If vat is "x.x (yy)"
 			$vatratecleaned = $reg[1];
 			$vatratecode = $reg[2];
 		}
@@ -5191,20 +5191,19 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 	}
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$obj = $db->fetch_object($resql);
 
-		$vateratestring = $obj->rate.($obj->code ? ' ('.$obj->code.')' : '');
+		if ($obj) {
+			$vateratestring = $obj->rate.($obj->code ? ' ('.$obj->code.')' : '');
 
-		if ($local == 1)
-		{
-			return array($obj->localtax1_type, get_localtax($vateratestring, $local, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
-		} elseif ($local == 2)
-		{
-			return array($obj->localtax2_type, get_localtax($vateratestring, $local, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
-		} else {
-			return array($obj->localtax1_type, get_localtax($vateratestring, 1, $buyer, $seller), $obj->localtax2_type, get_localtax($vateratestring, 2, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
+			if ($local == 1) {
+				return array($obj->localtax1_type, get_localtax($vateratestring, $local, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
+			} elseif ($local == 2) {
+				return array($obj->localtax2_type, get_localtax($vateratestring, $local, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
+			} else {
+				return array($obj->localtax1_type, get_localtax($vateratestring, 1, $buyer, $seller), $obj->localtax2_type, get_localtax($vateratestring, 2, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
+			}
 		}
 	}
 
diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index 89ca1bbc1bd..ce14295b4b2 100644
--- a/htdocs/core/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -129,14 +129,14 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 	$localtax1_type = 0;
 	$localtax2_type = 0;
 
-	if (is_array($localtaxes_array))
-	{
+	if (is_array($localtaxes_array)) {
 		$localtax1_type = $localtaxes_array[0];
 		$localtax1_rate = $localtaxes_array[1];
 		$localtax2_type = $localtaxes_array[2];
 		$localtax2_rate = $localtaxes_array[3];
-	} else // deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate using the full vat rate (including text code)
-	{
+	} else {
+		// deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate using the full vat rate (including text code)
+		// also, with this method, we may get several possible values (for example with localtax2 in spain), so we take the first one.
 		dol_syslog("Price.lib::calcul_price_total search vat information using old deprecated method", LOG_WARNING);
 
 		$sql = "SELECT taux, localtax1, localtax2, localtax1_type, localtax2_type";
@@ -149,11 +149,11 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 			$obj = $db->fetch_object($resql);
 			if ($obj)
 			{
-				$localtax1_rate = $obj->localtax1;
-				$localtax2_rate = $obj->localtax2;
+				$localtax1_rate = (float) $obj->localtax1;		// Use float to force to get first numeric value when value is x:y:z
+				$localtax2_rate = (float) $obj->localtax2;		// Use float to force to get first numeric value when value is -19:-15:-9
 				$localtax1_type = $obj->localtax1_type;
 				$localtax2_type = $obj->localtax2_type;
-				//var_dump($localtax1_rate.' '.$localtax2_rate.' '.$localtax1_type.' '.$localtax2_type);exit;
+				//var_dump($localtax1_rate.' '.$localtax2_rate.' '.$localtax1_type.' '.$localtax2_type);
 			}
 		} else dol_print_error($db);
 	}
@@ -417,7 +417,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 	// initialize result array
 	//for ($i=0; $i <= 18; $i++) $result[$i] = (float) $result[$i];
 
-	dol_syslog('Price.lib::calcul_price_total MAIN_ROUNDING_RULE_TOT='.$conf->global->MAIN_ROUNDING_RULE_TOT.' pu='.$pu.' qty='.$qty.' price_base_type='.$price_base_type.' total_ht='.$result[0].'-total_vat='.$result[1].'-total_ttc='.$result[2]);
+	dol_syslog('Price.lib::calcul_price_total MAIN_ROUNDING_RULE_TOT='.(empty($conf->global->MAIN_ROUNDING_RULE_TOT)?'':$conf->global->MAIN_ROUNDING_RULE_TOT).' pu='.$pu.' qty='.$qty.' price_base_type='.$price_base_type.' total_ht='.$result[0].'-total_vat='.$result[1].'-total_ttc='.$result[2]);
 
 	return $result;
 }

From e0d656e0c81f2b83f188ac9dd826c594d3394c70 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 6 Dec 2020 18:01:23 +0100
Subject: [PATCH 219/888] Fix phpcs

---
 htdocs/core/lib/date.lib.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index df20f0a9a67..163f6d85b6d 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -598,13 +598,14 @@ function dol_get_first_day_week($day, $month, $year, $gm = false)
 }
 
 /**
- *	Return the easte day in GMT time.
+ *	Return the easter day in GMT time.
  *  This function replaces easter_date() that returns a date in local TZ.
  *
  *	@param	    int			$year     			Year
- *	@return   	int								GMT Date
+ *	@return   	int								GMT Date of easter day
  */
-function getGMTEasterDatetime($year) {
+function getGMTEasterDatetime($year)
+{
 	$base = new DateTime("$year-03-21");
 	$days = easter_days($year);	// Return number of days between 21 march and easter day.
 	$tmp = $base->add(new DateInterval("P{$days}D"));

From 025cbe85575cdfe670a031542e1ba0e1ae9500c5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 6 Dec 2020 19:01:09 +0100
Subject: [PATCH 220/888] Add missing tag order_ref and order_ref_customer on
 shipments for ODT generation.

---
 htdocs/core/class/commondocgenerator.class.php              | 6 ++++++
 .../expedition/doc/doc_generic_shipment_odt.modules.php     | 1 +
 2 files changed, 7 insertions(+)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 49a303208a8..03a5154f23f 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -743,6 +743,12 @@ abstract class CommonDocGenerator
 			$array_shipment = $this->fill_substitutionarray_with_extrafields($object, $array_shipment, $extrafields, $array_key, $outputlangs);
 		}
 
+		// Add infor from $object->xxx where xxx has been loaded by fetch_origin() of shipment
+		if (!empty($object->commande) && is_object($object->commande)) {
+			$array_shipment['order_ref'] = $object->commande->ref;
+			$array_shipment['order_ref_customer'] = $object->commande->ref_customer;
+		}
+
 		return $array_shipment;
 	}
 
diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
index 254bb5bf377..b5ce775bcdc 100644
--- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
+++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
@@ -454,6 +454,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 
 				// Replace tags of object + external modules
 				$tmparray = $this->get_substitutionarray_shipment($object, $outputlangs);
+
 				complete_substitutions_array($tmparray, $outputlangs, $object);
 				// Call the ODTSubstitution hook
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);

From d1c66059cd7ef147285b7c914a8fa1dd8ac87432 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 6 Dec 2020 19:01:09 +0100
Subject: [PATCH 221/888] Add missing tag order_ref and order_ref_customer on
 shipments for ODT generation.

Conflicts:
	htdocs/core/class/commondocgenerator.class.php
---
 htdocs/core/class/commondocgenerator.class.php         | 10 ++++++++--
 .../doc/doc_generic_shipment_odt.modules.php           |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 90cfd84cf69..aa8cb7a1301 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -690,8 +690,14 @@ abstract class CommonDocGenerator
 		    $array_shipment = $this->fill_substitutionarray_with_extrafields($object, $array_shipment, $extrafields, $array_key, $outputlangs);
 	    }
 
-    	return $array_shipment;
-    }
+		// Add infor from $object->xxx where xxx has been loaded by fetch_origin() of shipment
+		if (!empty($object->commande) && is_object($object->commande)) {
+			$array_shipment['order_ref'] = $object->commande->ref;
+			$array_shipment['order_ref_customer'] = $object->commande->ref_customer;
+		}
+
+		return $array_shipment;
+	}
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
index 8b255e146d5..dffe3197c7b 100644
--- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
+++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
@@ -468,6 +468,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 
 				// Replace tags of object + external modules
 				$tmparray = $this->get_substitutionarray_shipment($object, $outputlangs);
+
 				complete_substitutions_array($tmparray, $outputlangs, $object);
 				// Call the ODTSubstitution hook
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);

From ebacb45239ccde64c7f556a8c054a4747564d6c0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 6 Dec 2020 19:21:47 +0100
Subject: [PATCH 222/888] File was moved into wiki

---
 .../erp_comparison_translation.txt            | 25 -------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 dev/translation/erp_comparison_translation.txt

diff --git a/dev/translation/erp_comparison_translation.txt b/dev/translation/erp_comparison_translation.txt
deleted file mode 100644
index 6cf7c4f7c60..00000000000
--- a/dev/translation/erp_comparison_translation.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-comparison of terms
-
-
-Dolibarr             SAP ERP					      Odoo							    
--------------------------------------------------------------------------
-Thirdparty			     Contact partner	    	Partner/Contact (company)
-Contact/address		   Contact person	  	    Partner/Contact (individual)
-
-Financial 			     Finance (FI)				  	Accounting
-Accounting
-
-
-Income / Expense	       ??					        Profit / Loss
-Balance				           ??					        Net profit
-Subledger account	   Subledger account	        ??
-
-CRM                  Sales & Distribution   Sales 
-Proposal                ??                  Quotation                         
-
-
-
-Proposal is ok but proposition looks better (proposal is for a detailed proposition). 
-We can say also "business proposition or business proposal".
-In India they are using "Quotation".
-                                                                        

From abadd2b803482c21d6b7897ae7305e377e7c2d79 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 6 Dec 2020 19:33:43 +0100
Subject: [PATCH 223/888] Clean phpunit

---
 htdocs/product/class/product.class.php | 18 +++++-----
 test/phpunit/ProductTest.php           | 50 +++-----------------------
 2 files changed, 13 insertions(+), 55 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index dfb5a7e042a..740a2633a80 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -915,8 +915,8 @@ class Product extends CommonObject
 
 		$this->db->begin();
 
-		// Check name is required and codes are ok or unique.
-		// If error, this->errors[] is filled
+		$result = 0;
+		// Check name is required and codes are ok or unique. If error, this->errors[] is filled
 		if ($action != 'add') {
 			$result = $this->verify(); // We don't check when update called during a create because verify was already done
 		}
@@ -2186,14 +2186,14 @@ class Product extends CommonObject
 						if ($resql) {
 							$result = $this->db->fetch_array($resql);
 
-							$this->multiprices[$i] = $result["price"];
-							$this->multiprices_ttc[$i] = $result["price_ttc"];
-							$this->multiprices_min[$i] = $result["price_min"];
-							$this->multiprices_min_ttc[$i] = $result["price_min_ttc"];
-							$this->multiprices_base_type[$i] = $result["price_base_type"];
+							$this->multiprices[$i] = $result ? $result["price"] : null;
+							$this->multiprices_ttc[$i] = $result ? $result["price_ttc"] : null;
+							$this->multiprices_min[$i] =  $result ? $result["price_min"] : null;
+							$this->multiprices_min_ttc[$i] = $result ? $result["price_min_ttc"] : null;
+							$this->multiprices_base_type[$i] = $result ? $result["price_base_type"] : null;
 							// Next two fields are used only if PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL is on
-							$this->multiprices_tva_tx[$i] = $result["tva_tx"]; // TODO Add ' ('.$result['default_vat_code'].')'
-							$this->multiprices_recuperableonly[$i] = $result["recuperableonly"];
+							$this->multiprices_tva_tx[$i] = $result ? $result["tva_tx"].($result ? ' ('.$result['default_vat_code'].')' : '') : null;
+							$this->multiprices_recuperableonly[$i] = $result ? $result["recuperableonly"] : null;
 
 							// Price by quantity
 							/*
diff --git a/test/phpunit/ProductTest.php b/test/phpunit/ProductTest.php
index 650d8a93e37..e574d3e1d20 100644
--- a/test/phpunit/ProductTest.php
+++ b/test/phpunit/ProductTest.php
@@ -147,7 +147,7 @@ class ProductTest extends PHPUnit\Framework\TestCase
         $result=$localobject->create($user);
 
         print __METHOD__." result=".$result."\n";
-        $this->assertLessThanOrEqual($result, 0);
+        $this->assertLessThanOrEqual($result, 0, "Creation of product");
 
         return $result;
     }
@@ -177,31 +177,6 @@ class ProductTest extends PHPUnit\Framework\TestCase
         return $localobject;
     }
 
-    /**
-     * testProductGetArboEachProd
-     *
-     * @return  void
-     */
-    public function testProductGetArboEachProd()
-    {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-		/*
-    	$localobject=new Product($db);
-    	$localobject->fetch(208);
-    	$localobject->get_sousproduits_arbo();
-    	$localobject->get_arbo_each_prod();
-
-    	var_dump($localobject->res); print (json_encode($localobject->res)); exit;
-		*/
-
-    	return;
-    }
-
     /**
      * testProductUpdate
      *
@@ -219,7 +194,8 @@ class ProductTest extends PHPUnit\Framework\TestCase
         $langs=$this->savlangs;
         $db=$this->savdb;
 
-        $localobject->note='New note after update';
+        $localobject->note_public = 'New public note after update';
+        $localobject->note_private = 'New private note after update';
         $result=$localobject->update($localobject->id, $user);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
@@ -244,6 +220,7 @@ class ProductTest extends PHPUnit\Framework\TestCase
         $langs=$this->savlangs;
         $db=$this->savdb;
 
+        $this->assertEquals(0, 0);
 
         return $localobject->id;
     }
@@ -274,23 +251,4 @@ class ProductTest extends PHPUnit\Framework\TestCase
 
         return $result;
     }
-
-    /**
-     * testProductStatic
-     *
-     * @return  void
-     */
-    public function testProductStatic()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $localobject=new Product($db);
-
-
-        return;
-    }
 }

From ccf95542f1a5dcf6d81f21ddd9c3c7801c0dd6e3 Mon Sep 17 00:00:00 2001
From: Romain DESCHAMPS <romain.deschamps@live.fr>
Date: Mon, 7 Dec 2020 09:52:25 +0100
Subject: [PATCH 224/888] Enabling StockAtDate menu

---
 htdocs/core/menus/standard/eldy.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index b103a309f59..c57ec5ac457 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1592,7 +1592,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				if ($conf->supplier_order->enabled) {
 					$newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire);
 				}
-				$newmenu->add("/product/stock/stockatdate.php", $langs->trans("StockAtDate"), 1, $user->rights->produit->lire && $user->rights->stock->lire && $conf->global->MAIN_FEATURES_LEVEL >= 2);
+				$newmenu->add("/product/stock/stockatdate.php", $langs->trans("StockAtDate"), 1, $user->rights->produit->lire && $user->rights->stock->lire);
 
 				// Categories for warehouses
 				if (!empty($conf->categorie->enabled)) {

From 8b3edd36eaea2985180e5d51666834563976582e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 10:37:55 +0100
Subject: [PATCH 225/888] Fix warning

---
 htdocs/product/class/product.class.php |  2 +-
 test/phpunit/ContactTest.php           | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 740a2633a80..f6c31f8ac41 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1091,7 +1091,7 @@ class Product extends CommonObject
 				}
 
 				if (!$error) {
-					if ($conf->variants->enabled) {
+					if (!empty($conf->variants->enabled)) {
 						include_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 
 						$comb = new ProductCombination($this->db);
diff --git a/test/phpunit/ContactTest.php b/test/phpunit/ContactTest.php
index 0c5687e67c9..7d7e2740bc1 100755
--- a/test/phpunit/ContactTest.php
+++ b/test/phpunit/ContactTest.php
@@ -334,25 +334,6 @@ class ContactTest extends PHPUnit\Framework\TestCase
     	return $result;
     }
 
-    /**
-	 *	testContactStatic
-	 *
-	 *	@return	void
-     */
-    public function testContactStatic()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $localobject=new Contact($db);
-
-
-        return;
-    }
-
     /**
      * testContactGetFullAddress
      *

From 030df716a222403ce3d4531a0d2403877b483dd3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 11:01:08 +0100
Subject: [PATCH 226/888] Clean dead code: Function showStripePaymentUrl,
 getStripePaymentUrl, showPaypalPaymentUrl and getPaypalPaymentUrl has been
 removed. The generic one showOnlinePaymentUrl and getOnlinePaymentUrl are
 always used.

---
 ChangeLog                        |   2 +-
 htdocs/paypal/lib/paypal.lib.php | 127 +------------------------
 htdocs/stripe/lib/stripe.lib.php |  83 +---------------
 test/phpunit/AllTests.php        |   2 +
 test/phpunit/PaypalTest.php      |   8 +-
 test/phpunit/StripeTest.php      | 156 +++++++++++++++++++++++++++++++
 6 files changed, 167 insertions(+), 211 deletions(-)
 create mode 100644 test/phpunit/StripeTest.php

diff --git a/ChangeLog b/ChangeLog
index 7b685eb3381..9b29fe30e51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -243,7 +243,7 @@ Following changes may create regressions for some external modules, but were nec
 * The API addPayment for api_invoice has evolved to accept amount into a foreign currency. You must provide array(amount=>X,mutlicurrency_ammount=>Y) instead of simple amount.
 * The method select_thirdparty(), deprecated since 3.8, into html.form.class.php has been removed.
 * Depreciate all methods with name ->valide(). Use instead methods ->validate().
-
+* Function showStripePaymentUrl, getStripePaymentUrl, showPaypalPaymentUrl and getPaypalPaymentUrl has been removed. The generic one showOnlinePaymentUrl and getOnlinePaymentUrl are always used.
 
 
 ***** ChangeLog for 12.0.3 compared to 12.0.2 *****
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 00db8797a1f..655d501cac3 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -22,6 +22,8 @@
  *  \brief			Library for common paypal functions
  */
 
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+
 
 /**
  *  Define head array for tabs of paypal tools setup pages
@@ -54,131 +56,6 @@ function paypaladmin_prepare_head()
 }
 
 
-
-/**
- * Return string with full Url
- *
- * @param   string	$type		Type of URL ('free', 'order', 'invoice', 'contractline', 'membersubscription' ...)
- * @param	string	$ref		Ref of object
- * @return	string				Url string
- */
-function showPaypalPaymentUrl($type, $ref)
-{
-	global $conf, $langs;
-
-	$langs->load("paypal");
-	$langs->load("paybox");
-	$servicename = 'PayPal';
-	$out = '<br><br>';
-	$out .= img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'<br>';
-	$url = getPaypalPaymentUrl(0, $type, $ref);
-	$out .= '<input type="text" id="paypalurl" class="quatrevingtpercent" value="'.$url.'">';
-	$out .= ajax_autoselect("paypalurl", 0);
-	return $out;
-}
-
-
-/**
- * Return string with full Url
- *
- * @param   int		$mode		0=True url, 1=Url formated with colors
- * @param   string	$type		Type of URL ('free', 'order', 'invoice', 'contractline', 'membersubscription' ...)
- * @param	string	$ref		Ref of object
- * @param	int		$amount		Amount
- * @param	string	$freetag	Free tag
- * @return	string				Url string
- */
-function getPaypalPaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag = 'your_tag')
-{
-	global $conf;
-
-	$ref = str_replace(' ', '', $ref);
-
-	if ($type == 'free')
-	{
-		$out = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?amount='.($mode ? '<font color="#666666">' : '').$amount.($mode ? '</font>' : '').'&tag='.($mode ? '<font color="#666666">' : '').$freetag.($mode ? '</font>' : '');
-		if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
-		{
-			if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-			else $out .= '&securekey='.dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-		}
-	}
-	if ($type == 'order')
-	{
-		$out = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=order&ref='.($mode ? '<font color="#666666">' : '');
-		if ($mode == 1) $out .= 'order_ref';
-		if ($mode == 0) $out .= urlencode($ref);
-		$out .= ($mode ? '</font>' : '');
-		if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
-		{
-			if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-			else {
-				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
-				if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + order_ref)";
-				if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
-				$out .= ($mode ? '</font>' : '');
-			}
-		}
-	}
-	if ($type == 'invoice')
-	{
-		$out = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=invoice&ref='.($mode ? '<font color="#666666">' : '');
-		if ($mode == 1) $out .= 'invoice_ref';
-		if ($mode == 0) $out .= urlencode($ref);
-		$out .= ($mode ? '</font>' : '');
-		if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
-		{
-			if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-			else {
-				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
-				if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
-				if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
-				$out .= ($mode ? '</font>' : '');
-			}
-		}
-	}
-	if ($type == 'contractline')
-	{
-		$out = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=contractline&ref='.($mode ? '<font color="#666666">' : '');
-		if ($mode == 1) $out .= 'contractline_ref';
-		if ($mode == 0) $out .= urlencode($ref);
-		$out .= ($mode ? '</font>' : '');
-		if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
-		{
-			if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-			else {
-				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
-				if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
-				if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
-				$out .= ($mode ? '</font>' : '');
-			}
-		}
-	}
-	if ($type == 'membersubscription')
-	{
-		$out = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=membersubscription&ref='.($mode ? '<font color="#666666">' : '');
-		if ($mode == 1) $out .= 'member_ref';
-		if ($mode == 0) $out .= urlencode($ref);
-		$out .= ($mode ? '</font>' : '');
-		if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
-		{
-			if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-			else {
-				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
-				if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + member_ref)";
-				if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
-				$out .= ($mode ? '</font>' : '');
-			}
-		}
-	}
-
-	// For multicompany
-	$out .= "&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
-
-	return $out;
-}
-
-
 /**
  * Send redirect to paypal to browser
  *
diff --git a/htdocs/stripe/lib/stripe.lib.php b/htdocs/stripe/lib/stripe.lib.php
index bdd05fb47d9..f1d03ae39be 100644
--- a/htdocs/stripe/lib/stripe.lib.php
+++ b/htdocs/stripe/lib/stripe.lib.php
@@ -21,6 +21,8 @@
  *  \brief			Library for common stripe functions
  */
 
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+
 /**
  *  Define head array for tabs of stripe tools setup pages
  *
@@ -52,87 +54,6 @@ function stripeadmin_prepare_head()
 }
 
 
-
-/**
- * Return string with full Url
- *
- * @param   string	$type		Type of URL ('free', 'order', 'invoice', 'contractline', 'membersubscription' ...)
- * @param	string	$ref		Ref of object
- * @return	string				Url string
- */
-function showStripePaymentUrl($type, $ref)
-{
-	global $conf, $langs;
-
-	$langs->load("paypal");
-	$langs->load("paybox");
-	$langs->load("stripe");
-
-	$servicename = 'Stripe';
-	$out = '<br><br>';
-	$out .= img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'<br>';
-	$url = getStripePaymentUrl(0, $type, $ref);
-	$out .= '<input type="text" id="stripeurl" class="quatrevingtpercent" value="'.$url.'"><br>';
-	$out .= ajax_autoselect("stripeurl", 0);
-	return $out;
-}
-
-/**
- * Return string with full Url
- *
- * @param   int		$mode		0=True url, 1=Url formated with colors
- * @param   string	$type		Type of URL ('free', 'order', 'invoice', 'contractline', 'membersubscription' ...)
- * @param	string	$ref		Ref of object
- * @param	int		$amount		Amount
- * @param	string	$freetag	Free tag
- * @return	string				Url string
- */
-function getStripePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag = 'your_tag')
-{
-	global $conf;
-
-	$ref = str_replace(' ', '', $ref);
-
-	if ($type == 'free')
-	{
-		$out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?amount='.($mode ? '<font color="#666666">' : '').$amount.($mode ? '</font>' : '').'&tag='.($mode ? '<font color="#666666">' : '').$freetag.($mode ? '</font>' : '');
-	}
-	if ($type == 'order')
-	{
-		$out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=order&ref='.($mode ? '<font color="#666666">' : '');
-		if ($mode == 1) $out .= 'order_ref';
-		if ($mode == 0) $out .= urlencode($ref);
-		$out .= ($mode ? '</font>' : '');
-	}
-	if ($type == 'invoice')
-	{
-		$out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=invoice&ref='.($mode ? '<font color="#666666">' : '');
-		if ($mode == 1) $out .= 'invoice_ref';
-		if ($mode == 0) $out .= urlencode($ref);
-		$out .= ($mode ? '</font>' : '');
-	}
-	if ($type == 'contractline')
-	{
-		$out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=contractline&ref='.($mode ? '<font color="#666666">' : '');
-		if ($mode == 1) $out .= 'contractline_ref';
-		if ($mode == 0) $out .= urlencode($ref);
-		$out .= ($mode ? '</font>' : '');
-	}
-	if ($type == 'membersubscription')
-	{
-		$out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=membersubscription&ref='.($mode ? '<font color="#666666">' : '');
-		if ($mode == 1) $out .= 'member_ref';
-		if ($mode == 0) $out .= urlencode($ref);
-		$out .= ($mode ? '</font>' : '');
-	}
-
-	// For multicompany
-	$out .= "&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
-
-	return $out;
-}
-
-
 /**
  * Show footer of company in HTML pages
  *
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index 09c075c1083..0d195560d1c 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -258,6 +258,8 @@ class AllTests
 
         require_once dirname(__FILE__).'/PaypalTest.php';
         $suite->addTestSuite('PaypalTest');
+        require_once dirname(__FILE__).'/StripeTest.php';
+        $suite->addTestSuite('StripeTest');
 
         return $suite;
     }
diff --git a/test/phpunit/PaypalTest.php b/test/phpunit/PaypalTest.php
index 19774a11c09..7a2e31cbdad 100644
--- a/test/phpunit/PaypalTest.php
+++ b/test/phpunit/PaypalTest.php
@@ -131,7 +131,7 @@ class PaypalTest extends PHPUnit\Framework\TestCase
     }
 
     /**
-     * testProductCreate
+     * testPaypalOk
      *
      * @return	void
      */
@@ -143,13 +143,13 @@ class PaypalTest extends PHPUnit\Framework\TestCase
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
-		$urltotest=getPaypalPaymentUrl(0, 'free');
+		$urltotest=getOnlinePaymentUrl(0, 'free');
 		print "urltotest=".$urltotest."\n";
 
 		$result=getURLContent($urltotest, 'GET', '', 1, array(), array('http', 'https'), 2);
 
-        print __METHOD__." result=".$result."\n";
-    	$this->assertLessThanOrEqual($result, 0);
+        print __METHOD__." result=".$result['http_code']."\n";
+        $this->assertEquals(200, $result['http_code']);
 
     	return $result;
     }
diff --git a/test/phpunit/StripeTest.php b/test/phpunit/StripeTest.php
new file mode 100644
index 00000000000..72d4722b34e
--- /dev/null
+++ b/test/phpunit/StripeTest.php
@@ -0,0 +1,156 @@
+<?php
+/* Copyright (C) 2020 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ *      \file       test/phpunit/StripeTest.php
+ *		\ingroup    test
+ *      \brief      PHPUnit test
+ *		\remarks	To run this script as CLI:  phpunit filename.php
+ */
+
+global $conf,$user,$langs,$db;
+//define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
+//require_once 'PHPUnit/Autoload.php';
+require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/geturl.lib.php';
+require_once dirname(__FILE__).'/../../htdocs/stripe/lib/stripe.lib.php';
+
+if (empty($user->id))
+{
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
+}
+$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+
+
+/**
+ * Class for PHPUnit tests
+ *
+ * @backupGlobals disabled
+ * @backupStaticAttributes enabled
+ * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
+ */
+class StripeTest extends PHPUnit\Framework\TestCase
+{
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
+
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return ProductTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
+
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
+
+    /**
+     * setUpBeforeClass
+     *
+     * @return void
+     */
+    public static function setUpBeforeClass()
+    {
+    	global $conf,$user,$langs,$db;
+
+    	if (empty($conf->stripe->enabled)) { print __METHOD__." Module Stripe must be enabled.\n"; die(); }
+
+        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+
+    	print __METHOD__."\n";
+    }
+
+    /**
+     * tearDownAfterClass
+     *
+     * @return	void
+     */
+    public static function tearDownAfterClass()
+    {
+    	global $conf,$user,$langs,$db;
+		$db->rollback();
+
+		print __METHOD__."\n";
+    }
+
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return	void
+	 */
+    protected function setUp()
+    {
+    	global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		print __METHOD__."\n";
+    }
+
+	/**
+	 * End phpunit tests
+	 *
+	 * @return	void
+	 */
+    protected function tearDown()
+    {
+    	print __METHOD__."\n";
+    }
+
+    /**
+     * testStripeOk
+     *
+     * @return	void
+     */
+    public function testStripeOk()
+    {
+    	global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$urltotest=getOnlinePaymentUrl(0, 'free');
+		print "urltotest=".$urltotest."\n";
+
+		$result=getURLContent($urltotest, 'GET', '', 1, array(), array('http', 'https'), 2);
+
+        print __METHOD__." result=".$result['http_code']."\n";
+        $this->assertEquals(200, $result['http_code']);
+
+    	return $result;
+    }
+}

From aa2f0f766d5a23f09aa7b5f001515be68a1aad99 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Mon, 7 Dec 2020 11:25:06 +0100
Subject: [PATCH 227/888] Fix #15689 patch of Bug project filters in
 projet/list.php

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

diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 586d78ae7b3..16c56ee7dc0 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -144,7 +144,7 @@ $fieldstosearchall['s.nom'] = "ThirdPartyName";
 $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
-	if (!empty($val['visible'])) $arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>($val['enabled'] && ($val['visible'] != 3)), 'position'=>$val['position']);
+	if (!empty($val['visible'])) $arrayfields['p.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>($val['enabled'] && ($val['visible'] != 3)), 'position'=>$val['position']);
 }
 
 // Add none object fields to fields for list

From 0361d3afde474e49582451285c6ddafc71e9f9e6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 11:42:35 +0100
Subject: [PATCH 228/888] Debug v13

---
 htdocs/core/modules/DolibarrModules.class.php |  7 +--
 htdocs/core/modules/modBookmark.class.php     |  4 +-
 htdocs/core/modules/modCategorie.class.php    |  6 +--
 htdocs/core/modules/modProjet.class.php       | 13 ++----
 htdocs/core/modules/modSociete.class.php      | 22 ++++-----
 htdocs/core/modules/modTicket.class.php       | 13 ++----
 htdocs/paypal/admin/paypal.php                | 36 ++++++++++++---
 htdocs/stripe/admin/stripe.php                | 46 +++++++++++++------
 8 files changed, 89 insertions(+), 58 deletions(-)

diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 794cfd0cef4..510ec8ef55a 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -1250,12 +1250,13 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 				//print "Remove box ".$file.'<br>';
 				if ($file == 'box_graph_product_distribution.php') {
 					if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
-						dol_syslog("We discard disabling of module ".$file." because another module still active require it.");
+						dol_syslog("We discard deleting module ".$file." because another module still active requires it.");
 						continue;
 					}
 				}
 
-				if (empty($file)) { $file = isset($this->boxes[$key][1]) ? $this->boxes[$key][1] : ''; // For backward compatibility
+				if (empty($file)) {
+					$file = isset($this->boxes[$key][1]) ? $this->boxes[$key][1] : ''; // For backward compatibility
 				}
 
 				if ($this->db->type == 'sqlite3') {
@@ -1284,7 +1285,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def";
 				$sql .= " WHERE file = '".$this->db->escape($file)."'";
-				$sql .= " AND entity = ".$conf->entity;
+				$sql .= " AND entity = ".$conf->entity;		// Do not use getEntity here, we want to delete only in current company
 
 				dol_syslog(get_class($this)."::delete_boxes", LOG_DEBUG);
 				$resql = $this->db->query($sql);
diff --git a/htdocs/core/modules/modBookmark.class.php b/htdocs/core/modules/modBookmark.class.php
index 0a3d9ccd11b..e6ac76f0178 100644
--- a/htdocs/core/modules/modBookmark.class.php
+++ b/htdocs/core/modules/modBookmark.class.php
@@ -69,7 +69,9 @@ class modBookmark extends DolibarrModules
 		$this->const = array();
 
 		// Boxes
-		$this->boxes = array(0=>array('file'=>'box_bookmarks.php', 'enabledbydefaulton'=>'Home'));
+		$this->boxes = array(
+			0=>array('file'=>'box_bookmarks.php', 'enabledbydefaulton'=>'Home')
+		);
 
 		// Permissions
 		$this->rights = array();
diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index a70593a5e1e..bb6c36b353c 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -386,10 +386,10 @@ class modCategorie extends DolibarrModules
 			)
 		);
 		$typeexample = "";
-		if ($conf->product->enabled) { $typeexample .= ($typeexample ? "/" : "")."0=Product"; }
+		if (!empty($conf->product->enabled)) { $typeexample .= ($typeexample ? "/" : "")."0=Product"; }
 		if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) { $typeexample .= ($typeexample ? "/" : "")."1=Supplier"; }
-		if ($conf->societe->enabled) { $typeexample .= ($typeexample ? "/" : "")."2=Customer-Prospect"; }
-		if ($conf->adherent->enabled) { $typeexample .= ($typeexample ? "/" : "")."3=Member"; }
+		if (!empty($conf->societe->enabled)) { $typeexample .= ($typeexample ? "/" : "")."2=Customer-Prospect"; }
+		if (!empty($conf->adherent->enabled)) { $typeexample .= ($typeexample ? "/" : "")."3=Member"; }
 		$this->import_examplevalues_array[$r] = array(
 			'ca.label'=>"Supplier Category", 'ca.type'=>$typeexample, 'ca.description'=>"My Category description",
 			'ca.fk_parent' => '0'
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index af6398c7a6d..42513a5b9f2 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -138,14 +138,11 @@ class modProjet extends DolibarrModules
 		$r++;
 
 		// Boxes
-		$this->boxes = array();
-		$r = 0;
-		$this->boxes[$r][1] = "box_project.php";
-		$r++;
-		$this->boxes[$r][1] = "box_task.php";
-		$r++;
-		$this->boxes[$r][1] = "box_validated_projects.php";
-		$r++;
+		$this->boxes = array(
+			0=>array('file'=>'box_project.php', 'enabledbydefaulton'=>'Home'),
+			1=>array('file'=>'box_task.php', 'enabledbydefaulton'=>'Home'),
+			2=>array('file'=>'box_validated_projects.php', 'enabledbydefaulton'=>'Home'),
+		);
 
 		// Permissions
 		$this->rights = array();
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index c8bbc50e490..9c82306b641 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -122,20 +122,14 @@ class modSociete extends DolibarrModules
 		$r++;
 
 		// Boxes
-		$this->boxes = array();
-		$r = 0;
-		$this->boxes[$r][1] = "box_clients.php";
-		$r++;
-		$this->boxes[$r][1] = "box_prospect.php";
-		$r++;
-		$this->boxes[$r][1] = "box_contacts.php";
-		$r++;
-		$this->boxes[$r][1] = "box_activity.php";
-		$this->boxes[$r][2] = '(WarningUsingThisBoxSlowDown)';
-		$r++;
-		$this->boxes[$r][1] = "box_goodcustomers.php";
-		$this->boxes[$r][2] = '(WarningUsingThisBoxSlowDown)';
-		$r++;
+		$this->boxes = array(
+			0=>array('file'=>'box_clients.php', 'enabledbydefaulton'=>'Home'),
+			1=>array('file'=>'box_prospect.php', 'enabledbydefaulton'=>'Home'),
+			2=>array('file'=>'box_contacts.php', 'enabledbydefaulton'=>'Home'),
+			3=>array('file'=>'box_activity.php', 'enabledbydefaulton'=>'Home', 'note'=>'(WarningUsingThisBoxSlowDown)'),
+			4=>array('file'=>'box_goodcustomers.php', 'enabledbydefaulton'=>'Home', 'note'=>'(WarningUsingThisBoxSlowDown)'),
+		);
+
 		// Permissions
 		$this->rights = array();
 		$this->rights_class = 'societe';
diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index d19327bcea7..def2a7f7e69 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -139,15 +139,10 @@ class modTicket extends DolibarrModules
 
 		// Boxes
 		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
-		$this->boxes = array(); // Boxes list
-		$r = 0;
-		// Example:
-
-		$this->boxes[$r][1] = "box_last_ticket";
-		$r++;
-
-		$this->boxes[$r][1] = "box_last_modified_ticket";
-		$r++;
+		$this->boxes = array(
+			0=>array('file'=>'box_last_ticket.php', 'enabledbydefaulton'=>'Home'),
+			1=>array('file'=>'box_last_modified_ticket.php', 'enabledbydefaulton'=>'Home')
+		); // Boxes list
 
 		// Permissions
 		$this->rights = array(); // Permission array used by this module
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 04ee6dbe228..5ab913f7ce9 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -135,6 +135,7 @@ if (!function_exists('curl_version'))
 
 print '<br>';
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 
 // Account Parameters
@@ -144,7 +145,7 @@ print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
 print '<tr class="oddeven">';
-print '<td class="titlefield">';
+print '<td>';
 print $langs->trans("PaypalLiveEnabled").'</td><td>';
 if (empty($conf->global->PAYPAL_API_SANDBOX))
 {
@@ -181,6 +182,15 @@ print $langs->trans("PAYPAL_SSLVERSION").'</td><td>';
 print $form->selectarray("PAYPAL_SSLVERSION", array('1'=> $langs->trans('TLSv1'), '6'=> $langs->trans('TLSv1.2')), $conf->global->PAYPAL_SSLVERSION);
 print '</td></tr>';
 
+print '</table>';
+print '</div>';
+
+print '<br>';
+
+
+print '<div class="div-table-responsive-no-min">';
+print '<table class="noborder centpercent">';
+
 // Usage Parameters
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("UsageParameter").'</td>';
@@ -211,6 +221,7 @@ if (!empty($conf->banque->enabled))
 {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("BankAccount").'</td><td>';
+	print img_picto('', 'bank_account').' ';
 	$form->select_comptes($conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS, 'PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
 	print '</td></tr>';
 }
@@ -255,6 +266,14 @@ print '<input class="minwidth200" type="text" name="ONLINE_PAYMENT_SENDEMAIL" va
 print ' &nbsp;  <span class="opacitymedium">'.$langs->trans("Example").': myemail@myserver.com, Payment service &lt;myemail2@myserver2.com&gt;</span>';
 print '</td></tr>';
 
+print '</table>';
+print '</div>';
+
+print '<br>';
+
+print '<div class="div-table-responsive-no-min">';
+print '<table class="noborder centpercent">';
+
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("UrlGenerationParameters").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
@@ -284,6 +303,7 @@ if ($conf->use_javascript_ajax) {
 print '</td></tr>';
 
 print '</table>';
+print '</div>';
 
 print dol_get_fiche_end();
 
@@ -296,7 +316,7 @@ print '<br><br>';
 // Help doc
 print '<u>'.$langs->trans("InformationToFindParameters", "Paypal").'</u>:<br>';
 if (!empty($conf->use_javascript_ajax))
-	print '<a href="#" class="reposition" id="apidoca">'.$langs->trans("ClickHere").'...</a>';
+	print '<a class="reposition" id="apidoca">'.$langs->trans("ClickHere").'...</a>';
 
 $realpaypalurl = 'www.paypal.com';
 $sandboxpaypalurl = 'developer.paypal.com';
@@ -318,11 +338,13 @@ if (!empty($conf->use_javascript_ajax))
 {
 	print "\n".'<script type="text/javascript">';
 	print '$(document).ready(function () {
-            $("#apidoc").hide();
-            $("#apidoca").click(function() {
-                $("#apidoc").show();
-            	$("#apidoca").hide();
-            })
+	            $("#apidoc").hide();
+	            $("#apidoca").click(function() {
+					console.log("We click on apidoca show/hide");
+	                $("#apidoc").show();
+	            	$("#apidoca").hide();
+					return false;
+	            })
 			});';
 	print '</script>';
 }
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 26d540e4093..c304a00ce3f 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -169,6 +169,7 @@ print '<span class="opacitymedium">'.$langs->trans("StripeDesc")."</span><br>\n"
 
 print '<br>';
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("AccountParameter").'</td>';
@@ -177,7 +178,7 @@ print '<td></td>';
 print "</tr>\n";
 
 print '<tr class="oddeven">';
-print '<td class="titlefield">';
+print '<td>';
 print $langs->trans("StripeLiveEnabled").'</td><td>';
 if ($conf->use_javascript_ajax) {
 	print ajax_constantonoff('STRIPE_LIVE');
@@ -209,9 +210,9 @@ if (empty($conf->stripeconnect->enabled))
 	}
 	print '<input class="minwidth300" type="text" name="STRIPE_TEST_WEBHOOK_KEY" value="'.$conf->global->STRIPE_TEST_WEBHOOK_KEY.'">';
 	print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx</span>';
-	  $out = img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForTestWebhook").' ';
+	  $out = img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForTestWebhook").'</span> ';
 	$url = dol_buildpath('/public/stripe/ipn.php?test', 3);
-	$out .= '<input type="text" id="onlinetestwebhookurl" class="minwidth500" value="'.$url.'">';
+	$out .= '<input type="text" id="onlinetestwebhookurl" class="minwidth500" value="'.$url.'" disabled>';
 	$out .= ajax_autoselect("onlinetestwebhookurl", 0);
 	print '<br>'.$out;
 	print '</td><td>';
@@ -278,9 +279,9 @@ if (empty($conf->stripeconnect->enabled))
 	}
 	print '<input class="minwidth300" type="text" name="STRIPE_LIVE_WEBHOOK_KEY" value="'.$conf->global->STRIPE_LIVE_WEBHOOK_KEY.'">';
 	print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx</span>';
-	$out = img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForLiveWebhook").' ';
+	$out = img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForLiveWebhook").'</span> ';
 	$url = dol_buildpath('/public/stripe/ipn.php', 3);
-	$out .= '<input type="text" id="onlinelivewebhookurl" class="minwidth500" value="'.$url.'">';
+	$out .= '<input type="text" id="onlinelivewebhookurl" class="minwidth500" value="'.$url.'" disabled>';
 	$out .= ajax_autoselect("onlinelivewebhookurl", 0);
 	print '<br>'.$out;
 	print '</td><td>';
@@ -321,13 +322,15 @@ if (empty($conf->stripeconnect->enabled))
 
 
 print '</table>';
+print '</div>';
 
 print '<br>';
 
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
-print '<td class="titlefield">'.$langs->trans("UsageParameter").'</td>';
+print '<td>'.$langs->trans("UsageParameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
@@ -339,11 +342,12 @@ print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("StripeUserAccountForActions").'</td><td>';
-print $form->select_dolusers($conf->global->STRIPE_USER_ACCOUNT_FOR_ACTIONS, 'STRIPE_USER_ACCOUNT_FOR_ACTIONS', 0);
+print img_picto('', 'user').$form->select_dolusers($conf->global->STRIPE_USER_ACCOUNT_FOR_ACTIONS, 'STRIPE_USER_ACCOUNT_FOR_ACTIONS', 0);
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("BankAccount").'</td><td>';
+print img_picto('', 'bank_account').' ';
 $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS, 'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
 print '</td></tr>';
 
@@ -437,6 +441,19 @@ print '<input class="minwidth200" type="text" name="ONLINE_PAYMENT_SENDEMAIL" va
 print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': myemail@myserver.com, Payment service &lt;myemail2@myserver2.com&gt;</span>';
 print '</td></tr>';
 
+print '</table>';
+print '</div>';
+
+print '<br>';
+
+print '<div class="div-table-responsive-no-min">';
+print '<table class="noborder centpercent">';
+
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("UrlGenerationParameters").'</td>';
+print '<td>'.$langs->trans("Value").'</td>';
+print "</tr>\n";
+
 // Payment token for URL
 print '<tr class="oddeven"><td>';
 print $langs->trans("SecurityToken").'</td><td>';
@@ -461,6 +478,7 @@ if ($conf->use_javascript_ajax) {
 print '</td></tr>';
 
 print '</table>';
+print '</div>';
 
 print dol_get_fiche_end();
 
@@ -481,12 +499,14 @@ if (!empty($conf->use_javascript_ajax))
 {
 	print "\n".'<script type="text/javascript">';
 	print '$(document).ready(function () {
-            $("#apidoc").hide();
-            $("#apidoca").click(function() {
-                $("#apidoc").show();
-            	$("#apidoca").hide();
-            });
-    });';
+	            $("#apidoc").hide();
+	            $("#apidoca").click(function() {
+					console.log("We click on apidoca show/hide");
+	                $("#apidoc").show();
+	            	$("#apidoca").hide();
+					return false;
+	            });
+		   });';
 	print '</script>';
 }
 

From 4f826fae2641398d12fffea32570bea9634c7ff7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 12:15:59 +0100
Subject: [PATCH 229/888] Fix warnings

---
 htdocs/core/modules/modExpedition.class.php |  4 +--
 htdocs/core/modules/modPropale.class.php    |  4 +--
 htdocs/exports/class/export.class.php       | 34 ++++++++++++---------
 test/phpunit/AllTests.php                   |  8 ++---
 test/phpunit/ExportTest.php                 |  4 +--
 test/phpunit/ImportTest.php                 |  2 +-
 test/phpunit/ScriptsTest.php                | 14 ++++++++-
 7 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index 8d11989f02a..54fecd1a5af 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -291,7 +291,7 @@ class modExpedition extends DolibarrModules
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'expedition as c';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'expedition_extrafields as extra ON c.rowid = extra.fk_object,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'societe as s';
-		if (!$user->rights->societe->client->voir) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'expeditiondet as ed';
@@ -306,7 +306,7 @@ class modExpedition extends DolibarrModules
 		}
 		$this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = ed.fk_expedition AND ed.fk_origin_line = cd.rowid';
 		$this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('expedition').')';
-		if (!$user->rights->societe->client->voir) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
 	}
 
 
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index f06496e781a..f1de32bd1a9 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -241,7 +241,7 @@ class modPropale extends DolibarrModules
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s ';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra4 ON s.rowid = extra4.fk_object';
 
-		if (!$user->rights->societe->client->voir) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'propal as c';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON c.fk_projet = pj.rowid';
@@ -254,7 +254,7 @@ class modPropale extends DolibarrModules
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
 		$this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_propal';
 		$this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('propal').')';
-		if (!$user->rights->societe->client->voir) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
 
 		// Imports
 		//--------
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index cf63b85879c..3ecece7e886 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -35,6 +35,8 @@ class Export
 	 */
 	public $db;
 
+	public $error;
+
 	public $array_export_code = array(); // Tableau de "idmodule_numlot"
 	public $array_export_module = array(); // Tableau de "nom de modules"
 	public $array_export_label = array(); // Tableau de "libelle de lots"
@@ -139,11 +141,10 @@ class Export
 										{
 											$perm = $val;
 											//print_r("$perm[0]-$perm[1]-$perm[2]<br>");
-											if (!empty($perm[2]))
-											{
-												$bool = $user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]};
+											if (!empty($perm[2])) {
+												$bool = isset($user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]}) ? $user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]} : false;
 											} else {
-												$bool = $user->rights->{$perm[0]}->{$perm[1]};
+												$bool = isset($user->rights->{$perm[0]}->{$perm[1]}) ? $user->rights->{$perm[0]}->{$perm[1]} : false;
 											}
 											if ($perm[0] == 'user' && $user->admin) $bool = true;
 											if (!$bool) break;
@@ -185,14 +186,14 @@ class Export
 									// Tableau des operations speciales sur champ
 									$this->array_export_special[$i] = (!empty($module->export_special_array[$r]) ? $module->export_special_array[$r] : '');
 									// Array of examples
-									$this->array_export_examplevalues[$i] = $module->export_examplevalues_array[$r];
+									$this->array_export_examplevalues[$i] = (!empty($module->export_examplevalues_array[$r]) ? $module->export_examplevalues_array[$r] : null);
 									// Array of help tooltips
 									$this->array_export_help[$i] = (!empty($module->export_help_array[$r]) ? $module->export_help_array[$r] : '');
 
 									// Requete sql du dataset
 									$this->array_export_sql_start[$i] = $module->export_sql_start[$r];
 									$this->array_export_sql_end[$i] = $module->export_sql_end[$r];
-									$this->array_export_sql_order[$i] = $module->export_sql_order[$r];
+									$this->array_export_sql_order[$i] = (!empty($module->export_sql_order[$r]) ? $module->export_sql_order[$r] : null);
 									//$this->array_export_sql[$i]=$module->export_sql[$r];
 
 									dol_syslog(get_class($this)."::load_arrays loaded for module ".$modulename." with index ".$i.", dataset=".$module->export_code[$r].", nb of fields=".(!empty($module->export_fields_code[$r]) ?count($module->export_fields_code[$r]) : ''));
@@ -580,9 +581,12 @@ class Export
 		if ($resql)
 		{
 			//$this->array_export_label[$indice]
-			if ($conf->global->EXPORT_PREFIX_SPEC)
+			if (!empty($conf->global->EXPORT_PREFIX_SPEC)) {
 				$filename = $conf->global->EXPORT_PREFIX_SPEC."_".$datatoexport;
-			else $filename = "export_".$datatoexport;
+			}
+			else {
+				$filename = "export_".$datatoexport;
+			}
 			$filename .= '.'.$objmodel->getDriverExtension();
 			$dirname = $conf->export->dir_temp.'/'.$user->id;
 
@@ -598,7 +602,7 @@ class Export
 				$objmodel->write_header($outputlangs);
 
 				// Genere ligne de titre
-				$objmodel->write_title($this->array_export_fields[$indice], $array_selected, $outputlangs, $this->array_export_TypeFields[$indice]);
+				$objmodel->write_title($this->array_export_fields[$indice], $array_selected, $outputlangs, isset($this->array_export_TypeFields[$indice]) ? $this->array_export_TypeFields[$indice] : null);
 
 				while ($obj = $this->db->fetch_object($resql))
 				{
@@ -651,18 +655,20 @@ class Export
 								}
 								$obj->$alias = $remaintopay;
 							} else {
-								// TODO FIXME Export of compute field does not work. $obj containt $obj->alias_field and formulat will contains $obj->field
+								// TODO FIXME
+								// Export of compute field does not work. $obj contains $obj->alias_field and formula may contains $obj->field
+								// Also the formula may contains objects of class that are not loaded.
 								$computestring = $this->array_export_special[$indice][$key];
-								$tmp = dol_eval($computestring, 1, 0);
-								$obj->$alias = $tmp;
+								//$tmp = dol_eval($computestring, 1, 0);
+								//$obj->$alias = $tmp;
 
-								$this->error = "ERROPNOTSUPPORTED. Operation ".$this->array_export_special[$indice][$key]." not supported. Export of 'computed' extrafields is not yet supported, please remove field.";
+								$this->error = "ERROPNOTSUPPORTED. Operation ".$computestring." not supported. Export of 'computed' extrafields is not yet supported, please remove field.";
 								return -1;
 							}
 						}
 					}
 					// end of special operation processing
-					$objmodel->write_record($array_selected, $obj, $outputlangs, $this->array_export_TypeFields[$indice]);
+					$objmodel->write_record($array_selected, $obj, $outputlangs, isset($this->array_export_TypeFields[$indice]) ? $this->array_export_TypeFields[$indice] : null);
 				}
 
 				// Genere en-tete
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index 0d195560d1c..163bf320075 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -242,11 +242,6 @@ class AllTests
         require_once dirname(__FILE__).'/ScriptsTest.php';
         $suite->addTestSuite('ScriptsTest');
 
-        require_once dirname(__FILE__).'/FormAdminTest.php';
-        $suite->addTestSuite('FormAdminTest');
-        require_once dirname(__FILE__).'/FormTest.php';
-        $suite->addTestSuite('FormTest');
-
         require_once dirname(__FILE__).'/ModulesTest.php';  // At end because it's the longer
         $suite->addTestSuite('ModulesTest');
 
@@ -254,8 +249,11 @@ class AllTests
         // GUI
         require_once dirname(__FILE__).'/FormAdminTest.php';
         $suite->addTestSuite('FormAdminTest');
+        require_once dirname(__FILE__).'/FormTest.php';
+        $suite->addTestSuite('FormTest');
 
 
+        // Payment services
         require_once dirname(__FILE__).'/PaypalTest.php';
         $suite->addTestSuite('PaypalTest');
         require_once dirname(__FILE__).'/StripeTest.php';
diff --git a/test/phpunit/ExportTest.php b/test/phpunit/ExportTest.php
index 2a3cb079baf..0f5b0bd82e3 100644
--- a/test/phpunit/ExportTest.php
+++ b/test/phpunit/ExportTest.php
@@ -149,7 +149,7 @@ class ExportTest extends PHPUnit\Framework\TestCase
         $file = "export_".$model.".modules.php";
         $classname = "Export".$model;
         require_once $dir.$file;
-        $objmodel = new $classname($this->db);
+        $objmodel = new $classname($db);
 
         // First test without option USE_STRICT_CSV_RULES
         unset($conf->global->USE_STRICT_CSV_RULES);
@@ -364,7 +364,7 @@ class ExportTest extends PHPUnit\Framework\TestCase
         	$sql = "";
 			$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
 			$expectedresult = 1;
-	        $this->assertEquals($expectedresult, $result, "Call build_file() to export ".$exportfile.' failed');
+	        $this->assertEquals($expectedresult, $result, "Call build_file() to export ".$exportfile.' failed: '.$objexport->error);
 	        $result=dol_is_file($exportfile);
 	        $this->assertTrue($result, 'File '.$exportfile.' not found');
         }
diff --git a/test/phpunit/ImportTest.php b/test/phpunit/ImportTest.php
index ce689fda4a4..e9bf019740c 100644
--- a/test/phpunit/ImportTest.php
+++ b/test/phpunit/ImportTest.php
@@ -140,7 +140,7 @@ class ImportTest extends PHPUnit\Framework\TestCase
         // TODO
         // Run import on file and check the record with field "auto" are filled
         // according to option
-
+        $this->assertEquals(0, 0);
 
 		return true;
     }
diff --git a/test/phpunit/ScriptsTest.php b/test/phpunit/ScriptsTest.php
index 16884214418..82d1ee28e39 100644
--- a/test/phpunit/ScriptsTest.php
+++ b/test/phpunit/ScriptsTest.php
@@ -68,7 +68,7 @@ class ScriptsTest extends PHPUnit\Framework\TestCase
 	 * Constructor
 	 * We save global variables into local variables
 	 *
-	 * @return SecurityTest
+	 * @return ScriptsTest
 	 */
 	public function __construct()
 	{
@@ -152,6 +152,10 @@ class ScriptsTest extends PHPUnit\Framework\TestCase
 		$db=$this->savdb;
 
 		$script=dirname(__FILE__).'/../../scripts/bank/export-bank-receipts.php BANKDUMMY RECEIPTDUMMY excel2007 lang=fr_FR';
+
+		$returnvar = 0;
+		$output = array();
+
 		$result=exec($script, $output, $returnvar);
 
 		print __METHOD__." result=".$result."\n";
@@ -187,6 +191,8 @@ class ScriptsTest extends PHPUnit\Framework\TestCase
 		$this->assertEquals($result,'Failed to find bank account with ref BANKDUMMY.');
 		$this->assertEquals($returnvar,255);
 		*/
+		$this->assertEquals(0, 0);
+
         return '';
     }
 
@@ -204,6 +210,9 @@ class ScriptsTest extends PHPUnit\Framework\TestCase
     	$langs=$this->savlangs;
     	$db=$this->savdb;
 
+    	$returnvar = 0;
+    	$output = array();
+
     	$script=dirname(__FILE__).'/../../scripts/contracts/email_expire_services_to_customers.php test thirdparties';
     	$result=exec($script, $output, $returnvar);
     	print __METHOD__." result=".$result."\n";
@@ -242,6 +251,9 @@ class ScriptsTest extends PHPUnit\Framework\TestCase
     	$langs=$this->savlangs;
     	$db=$this->savdb;
 
+    	$returnvar = 0;
+    	$output = array();
+
     	$script=dirname(__FILE__).'/../../scripts/invoices/email_unpaid_invoices_to_customers.php test thirdparties';
     	$result=exec($script, $output, $returnvar);
     	print __METHOD__." result=".$result."\n";

From ca2ce88bd2c0446a3025580121c5d5bf975b856a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 13:29:56 +0100
Subject: [PATCH 230/888] Fix warning

---
 .../core/triggers/interface_50_modTicket_TicketEmail.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index 3743d044e44..f6157c38edc 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -132,8 +132,9 @@ class InterfaceTicketEmail extends DolibarrTriggers
 				$langs->load('ticket');
 
 				// Send email to notification email
-				$sendto = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
 				if (!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO) && empty($object->context['disableticketemail'])) {
+					$sendto = empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO) ? '' : $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
+
 					if ($sendto) {
 						// Init to avoid errors
 						$filepath = array();

From f21fc43e7efd730bca9d31e17371b1313a129759 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 14:25:49 +0100
Subject: [PATCH 231/888] Fix label of field

---
 htdocs/core/menus/standard/eldy.lib.php |  3 +-
 htdocs/user/card.php                    | 70 ++++++++++++-------------
 2 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index b103a309f59..c9a3ba48dab 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -360,10 +360,11 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// HRM
 	$tmpentry = array(
-		'enabled'=>(!empty($conf->hrm->enabled) || !empty($conf->holiday->enabled) || !empty($conf->deplacement->enabled) || !empty($conf->expensereport->enabled) || !empty($conf->recruitment->enabled)),
+		'enabled'=>(!empty($conf->hrm->enabled) || (!empty($conf->holiday->enabled)) || !empty($conf->deplacement->enabled) || !empty($conf->expensereport->enabled) || !empty($conf->recruitment->enabled)),
 		'perms'=>(!empty($user->rights->hrm->employee->read) || !empty($user->rights->holiday->write) || !empty($user->rights->deplacement->lire) || !empty($user->rights->expensereport->lire) || !empty($user->rights->recruitment->recruitmentjobposition->read)),
 		'module'=>'hrm|holiday|deplacement|expensereport|recruitment'
 	);
+
 	$menu_arr[] = array(
 		'name' => 'HRM',
 		'link' => '/hrm/index.php?mainmenu=hrm&amp;leftmenu=',
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 8934d8d87ec..9d676c9423f 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -930,12 +930,6 @@ if ($action == 'create' || $action == 'adduserldap')
 		print "</td></tr>\n";
 	}
 
-	// Type
-	print '<tr><td>'.$langs->trans("Type").'</td>';
-	print '<td>';
-	print $form->textwithpicto($langs->trans("Internal"), $langs->trans("InternalExternalDesc"), 1, 'help', '', 0, 2);
-	print '</td></tr>';
-
 	// Gender
 	print '<tr><td>'.$langs->trans("Gender").'</td>';
 	print '<td>';
@@ -983,6 +977,11 @@ if ($action == 'create' || $action == 'adduserldap')
 		print "</tr>\n";
 	}
 
+	// External user
+	print '<tr><td>'.$langs->trans("ExternalUser").' ?</td>';
+	print '<td>';
+	print $form->textwithpicto($langs->trans("Internal"), $langs->trans("InternalExternalDesc"), 1, 'help', '', 0, 2);
+	print '</td></tr>';
 
 	print '</table><hr><table class="border centpercent">';
 
@@ -2196,36 +2195,6 @@ if ($action == 'create' || $action == 'adduserldap')
 				print '</td></tr>';
 			}
 
-		   	// Type
-		   	print '<tr><td>'.$langs->trans("Type").'</td>';
-		   	print '<td>';
-		   	if ($user->id == $object->id || !$user->admin)
-		   	{
-		   		// Read mode
-			   	$type = $langs->trans("Internal");
-			   	if ($object->socid) $type = $langs->trans("External");
-			   	print $form->textwithpicto($type, $langs->trans("InternalExternalDesc"));
-			   	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
-		   	} else {
-				// Select mode
-				$type = 0;
-				if ($object->contact_id) $type = $object->contact_id;
-
-				if ($object->socid > 0 && !($object->contact_id > 0)) {	// external user but no link to a contact
-					print img_picto('', 'company').$form->select_company($object->socid, 'socid', '', '&nbsp;');
-					print img_picto('', 'contact').$form->selectcontacts(0, 0, 'contactid', 1, '', '', 1, '', false, 1);
-					if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
-				} elseif ($object->socid > 0 && $object->contact_id > 0) {	// external user with a link to a contact
-					print img_picto('', 'company').$form->select_company(0, 'socid', '', '&nbsp;'); // We keep thirdparty empty, contact is already set
-					print img_picto('', 'contact').$form->selectcontacts(0, $object->contact_id, 'contactid', 1, '', '', 1, '', false, 1);
-			   		if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
-				} else {	// $object->socid is not > 0 here
-					print img_picto('', 'company').$form->select_company(0, 'socid', '', '&nbsp;'); // We keep thirdparty empty, contact is already set
-					print img_picto('', 'contact').$form->selectcontacts(0, 0, 'contactid', 1, '', '', 1, '', false, 1);
-				}
-			}
-		   	print '</td></tr>';
-
 		   	// Gender
 		   	print '<tr><td>'.$langs->trans("Gender").'</td>';
 		   	print '<td>';
@@ -2306,6 +2275,35 @@ if ($action == 'create' || $action == 'adduserldap')
 				print "</tr>\n";
 			}
 
+			// External user ?
+			print '<tr><td>'.$langs->trans("ExternalUser").' ?</td>';
+			print '<td>';
+			if ($user->id == $object->id || !$user->admin)
+			{
+				// Read mode
+				$type = $langs->trans("Internal");
+				if ($object->socid) $type = $langs->trans("External");
+				print $form->textwithpicto($type, $langs->trans("InternalExternalDesc"));
+				if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
+			} else {
+				// Select mode
+				$type = 0;
+				if ($object->contact_id) $type = $object->contact_id;
+
+				if ($object->socid > 0 && !($object->contact_id > 0)) {	// external user but no link to a contact
+					print img_picto('', 'company').$form->select_company($object->socid, 'socid', '', '&nbsp;');
+					print img_picto('', 'contact').$form->selectcontacts(0, 0, 'contactid', 1, '', '', 1, '', false, 1);
+					if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
+				} elseif ($object->socid > 0 && $object->contact_id > 0) {	// external user with a link to a contact
+					print img_picto('', 'company').$form->select_company(0, 'socid', '', '&nbsp;'); // We keep thirdparty empty, contact is already set
+					print img_picto('', 'contact').$form->selectcontacts(0, $object->contact_id, 'contactid', 1, '', '', 1, '', false, 1);
+					if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
+				} else {	// $object->socid is not > 0 here
+					print img_picto('', 'company').$form->select_company(0, 'socid', '', '&nbsp;'); // We keep thirdparty empty, contact is already set
+					print img_picto('', 'contact').$form->selectcontacts(0, 0, 'contactid', 1, '', '', 1, '', false, 1);
+				}
+			}
+			print '</td></tr>';
 
 		   	print '</table><hr><table class="border centpercent">';
 

From 2457d07d1a327edfdd8c645968d8effb306f7d05 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 14:29:51 +0100
Subject: [PATCH 232/888] Fix permission on creation of leave requests

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

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 11d3c70c4a8..3de5c2a5e19 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -148,11 +148,11 @@ if (empty($reshook))
 			$description = trim(GETPOST('description', 'restricthtml'));
 
 			// Check that leave is for a user inside the hierarchy or advanced permission for all is set
-			if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->expensereport->creer)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->expensereport->writeall_advance))) {
+			if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->holiday->create)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->holiday->writeall_advance))) {
 				$error++;
 				setEventMessages($langs->trans("NotEnoughPermission"), null, 'errors');
 			} else {
-				if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)) {
+				if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->holiday->writeall_advance)) {
 					if (!in_array($fuserid, $childids)) {
 						$error++;
 						setEventMessages($langs->trans("UserNotInHierachy"), null, 'errors');

From 7ad70c7c218410575065b6fff36acfe9604ead0e Mon Sep 17 00:00:00 2001
From: Frans Bosman <frans@fbosman.nl>
Date: Mon, 7 Dec 2020 14:33:44 +0100
Subject: [PATCH 233/888] Update product.class.php

Added Hidden Option STOCK_DEFAULT_BATCH, in order to replace the default '000000' batchnumber for the existing stock  when batchnumbers are enabled for a product.
---
 htdocs/product/class/product.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index ac931da8702..9abd1d82da5 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -934,6 +934,7 @@ class Product extends CommonObject
             if ($this->hasbatch() && !$this->oldcopy->hasbatch()) {
                 //$valueforundefinedlot = 'Undefined';  // In previous version, 39 and lower
                 $valueforundefinedlot = '000000';
+				if ($conf->global->STOCK_DEFAULT_BATCH) $valueforundefinedlot = $conf->global->STOCK_DEFAULT_BATCH;
 
                 dol_syslog("Flag batch of product id=".$this->id." is set to ON, so we will create missing records into product_batch");
 

From 936699786a208dd3d9d2ae5d1d8cc973ce454644 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 14:44:20 +0100
Subject: [PATCH 234/888] Fix translation

---
 htdocs/holiday/card.php | 2 +-
 htdocs/hrm/index.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 3de5c2a5e19..3899990b425 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -973,7 +973,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 				$nb_type = $object->getCPforUser($user->id, $val['rowid']);
 				$nb_holiday += $nb_type;
 
-				$out .= ' - '.($langs->trans($val['code']) != $val['code'] ? $langs->trans($val['code']) : $val['label']).': <strong>'.($nb_type ?price2num($nb_type) : 0).'</strong><br>';
+				$out .= ' - '.($langs->trans($val['code']) != $val['code'] ? $langs->trans($val['code']) : $val['label']).': <strong>'.($nb_type ? price2num($nb_type) : 0).'</strong><br>';
 				//$out .= ' - '.$val['label'].': <strong>'.($nb_type ?price2num($nb_type) : 0).'</strong><br>';
 			}
 			print $langs->trans('SoldeCPUser', round($nb_holiday, 5)).'<br>';
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index 3ec2a3b898f..f0bbb442acc 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -153,7 +153,7 @@ if (!empty($conf->holiday->enabled))
 		{
 			$nb_type = $holiday->getCPforUser($user->id, $val['rowid']);
 			$nb_holiday += $nb_type;
-			$out .= ' - '.$val['label'].': <strong>'.($nb_type ?price2num($nb_type) : 0).'</strong><br>';
+			$out .= ' - '.($langs->trans($val['code']) != $val['code'] ? $langs->trans($val['code']) : $val['label']).': <strong>'.($nb_type ? price2num($nb_type) : 0).'</strong><br>';
 		}
 		print $langs->trans('SoldeCPUser', round($nb_holiday, 5)).'<br>';
 		print $out;

From e18035c0fc2541e43a51a596b1a4697346a1eadc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 14:46:33 +0100
Subject: [PATCH 235/888] Fix bad permission on module holiday

---
 htdocs/holiday/card.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 3899990b425..500d678d357 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -148,7 +148,7 @@ if (empty($reshook))
 			$description = trim(GETPOST('description', 'restricthtml'));
 
 			// Check that leave is for a user inside the hierarchy or advanced permission for all is set
-			if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->holiday->create)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->holiday->writeall_advance))) {
+			if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->holiday->write)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->holiday->writeall_advance))) {
 				$error++;
 				setEventMessages($langs->trans("NotEnoughPermission"), null, 'errors');
 			} else {
@@ -962,8 +962,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 		print '<input type="hidden" name="token" value="'.newToken().'" />'."\n";
 		print '<input type="hidden" name="action" value="add" />'."\n";
 
-		if (empty($conf->global->HOLIDAY_HIDE_BALANCE))
-		{
+		if (empty($conf->global->HOLIDAY_HIDE_BALANCE)) {
 			print dol_get_fiche_head('', '', '', -1);
 
 			$out = '';
@@ -980,8 +979,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 			print $out;
 
 			print dol_get_fiche_end();
-		} elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE))
-		{
+		} elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE)) {
 			print $langs->trans($conf->global->HOLIDAY_HIDE_BALANCE).'<br>';
 		}
 

From f871ade5452630ad12bab6608eb53e18fcdb870e Mon Sep 17 00:00:00 2001
From: Florian Mortgat <florian.mortgat@atm-consulting.fr>
Date: Mon, 7 Dec 2020 15:15:41 +0100
Subject: [PATCH 236/888] FIX 12.0 - the stringent XSS prodection provided by
 'alphanohtml' causes problems with some clients who used basic tags (bold,
 italic, underline) in product labels. Using 'restricthtml' instead could be a
 good compromise.

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

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 8b4654ba921..8659e5bcc23 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -201,7 +201,7 @@ if (empty($reshook))
     {
         $error = 0;
 
-        if (!GETPOST('label', 'alphanohtml'))
+        if (!GETPOST('label', 'restricthtml'))
         {
             setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Label')), null, 'errors');
             $action = "create";
@@ -225,7 +225,7 @@ if (empty($reshook))
 	        $units = GETPOST('units', 'int');
 
             $object->ref                   = $ref;
-            $object->label                 = GETPOST('label', 'alphanohtml');
+            $object->label                 = GETPOST('label', 'restricthtml');
             $object->price_base_type       = GETPOST('price_base_type', 'aZ09');
 
             if ($object->price_base_type == 'TTC')
@@ -406,7 +406,7 @@ if (empty($reshook))
 				$object->oldcopy = clone $object;
 
                 $object->ref                    = $ref;
-                $object->label                  = GETPOST('label', 'alphanohtml');
+                $object->label                  = GETPOST('label', 'restricthtml');
                 $object->description            = dol_htmlcleanlastbr(GETPOST('desc', 'none'));
             	$object->url = GETPOST('url');
     			if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB))
@@ -1005,7 +1005,7 @@ else
         print '</td></tr>';
 
         // Label
-        print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="label" class="minwidth300 maxwidth400onsmartphone" maxlength="255" value="'.dol_escape_htmltag(GETPOST('label', 'alphanohtml')).'"></td></tr>';
+        print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="label" class="minwidth300 maxwidth400onsmartphone" maxlength="255" value="'.dol_escape_htmltag(GETPOST('label', 'restricthtml')).'"></td></tr>';
 
         // On sell
         print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="3">';

From cc44ce7dddf31627c9ef52191799ff8f8f85df62 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 15:35:38 +0100
Subject: [PATCH 237/888] Fix warning

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

diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index f6157c38edc..7bb8988e18e 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -247,7 +247,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 						$message_customer .= '<p>'.$langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer').' : <a href="'.$url_public_ticket.'">'.$url_public_ticket.'</a></p>';
 						$message_customer .= '<p>'.$langs->trans('TicketEmailPleaseDoNotReplyToThisEmail').'</p>';
 
-						$from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
+						$from = (empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? '' : $conf->global->MAIN_INFO_SOCIETE_NOM.' ').'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
 						$replyto = $from;
 
 						$trackid = 'tic'.$object->id;

From e77413e1e4640286d9c34015839f8c18e5281c91 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 15:36:37 +0100
Subject: [PATCH 238/888] Fix warning

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

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index b2149cd187f..faf0a294dfe 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -242,6 +242,7 @@ class CMailFile
 		{
 			$this->html = $msg;
 
+			$findimg = 0;
 			if (!empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS))
 			{
 				$findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias');

From 3fb63e6a4b8846eb8a4353efccdbfd827cfc290b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 15:51:22 +0100
Subject: [PATCH 239/888] Look and feel v13

---
 htdocs/admin/limits.php              |  12 ++-
 htdocs/core/lib/admin.lib.php        |  37 +++++----
 htdocs/core/menus/standard/empty.php | 112 +++++++++------------------
 3 files changed, 64 insertions(+), 97 deletions(-)

diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index 43c4cc84776..34da6f7d34e 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -100,9 +100,12 @@ if ($action == 'update')
 
 $form = new Form($db);
 
-llxHeader();
+$title = $langs->trans("LimitsSetup");
+$help_url = '';
 
-print load_fiche_titre($langs->trans("LimitsSetup"), '', 'title_setup');
+llxHeader('', $title, $help_url);
+
+print load_fiche_titre($title, '', 'title_setup');
 
 $aCurrencies = array($conf->currency); // Default currency always first position
 
@@ -125,7 +128,8 @@ if (!empty($conf->multicurrency->enabled) && !empty($conf->global->MULTICURRENCY
 	if (!empty($aCurrencies) && count($aCurrencies) > 1)
 	{
 		$head = multicurrencyLimitPrepareHead($aCurrencies);
-		print dol_get_fiche_head($head, $currencycode, '', -1, "multicurrency");
+
+		print dol_get_fiche_head($head, $currencycode, '', -1, '');
 	}
 }
 
@@ -172,6 +176,7 @@ if ($action == 'edit')
 	print '</form>';
 	print '<br>';
 } else {
+	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
@@ -191,6 +196,7 @@ if ($action == 'edit')
 	print '</td><td align="right">'.(isset($conf->global->$mainroundingruletot) ? $conf->global->$mainroundingruletot : $conf->global->MAIN_ROUNDING_RULE_TOT).'</td></tr>';
 
 	print '</table>';
+	print '</div>';
 
 	print '<div class="tabsAction">';
 	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit'.(!empty($currencycode) ? '&currencycode='.$currencycode : '').'">'.$langs->trans("Modify").'</a>';
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index b8cdf8cd085..704a4496d03 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -924,30 +924,33 @@ function purgeSessions($mysessionid)
 	dol_syslog('admin.lib:purgeSessions mysessionid='.$mysessionid.' sessPath='.$sessPath);
 
 	$error = 0;
-	$dh = @opendir(dol_osencode($sessPath));
-	while (($file = @readdir($dh)) !== false) {
-		if ($file != "." && $file != "..") {
-			$fullpath = $sessPath.$file;
-			if (!@is_dir($fullpath)) {
-				$sessValues = file_get_contents($fullpath); // get raw session data
 
-				if (preg_match('/dol_login/i', $sessValues) && // limit to dolibarr session
-				preg_match('/dol_entity\|s:([0-9]+):"('.$conf->entity.')"/i', $sessValues) && // limit to current entity
-				preg_match('/dol_company\|s:([0-9]+):"('.$conf->global->MAIN_INFO_SOCIETE_NOM.')"/i', $sessValues)) { // limit to company name
-					$tmp = explode('_', $file);
-					$idsess = $tmp[1];
-					// We remove session if it's not ourself
-					if ($idsess != $mysessionid) {
-						$res = @unlink($fullpath);
-						if (!$res) {
-							$error++;
+	$dh = @opendir(dol_osencode($sessPath));
+	if ($dh) {
+		while (($file = @readdir($dh)) !== false) {
+			if ($file != "." && $file != "..") {
+				$fullpath = $sessPath.$file;
+				if (!@is_dir($fullpath)) {
+					$sessValues = file_get_contents($fullpath); // get raw session data
+
+					if (preg_match('/dol_login/i', $sessValues) && // limit to dolibarr session
+					preg_match('/dol_entity\|s:([0-9]+):"('.$conf->entity.')"/i', $sessValues) && // limit to current entity
+					preg_match('/dol_company\|s:([0-9]+):"('.$conf->global->MAIN_INFO_SOCIETE_NOM.')"/i', $sessValues)) { // limit to company name
+						$tmp = explode('_', $file);
+						$idsess = $tmp[1];
+						// We remove session if it's not ourself
+						if ($idsess != $mysessionid) {
+							$res = @unlink($fullpath);
+							if (!$res) {
+								$error++;
+							}
 						}
 					}
 				}
 			}
 		}
+		@closedir($dh);
 	}
-	@closedir($dh);
 
 	if (!$error) {
 		return 1;
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index b3151e15748..213cd14e9b0 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -348,14 +348,29 @@ class MenuManager
 
 			// ***** END *****
 
+			$menu_array_before = array();
+			$menu_array_after = array();
+
 			// do not change code after this
 
+			$menu_array = $this->menu->liste;
+			if (is_array($menu_array_before)) {
+				$menu_array = array_merge($menu_array_before, $menu_array);
+			}
+			if (is_array($menu_array_after)) {
+				$menu_array = array_merge($menu_array, $menu_array_after);
+			}
+			//var_dump($menu_array);exit;
+			if (!is_array($menu_array)) {
+				return 0;
+			}
+
 			if (empty($noout)) {
 				$alt = 0; $altok = 0; $blockvmenuopened = false;
-				$num = count($this->menu->liste);
+				$num = count($menu_array);
 				for ($i = 0; $i < $num; $i++) {
 					$alt++;
-					if (empty($this->menu->liste[$i]['level'])) {
+					if (empty($menu_array[$i]['level'])) {
 						$altok++;
 						$blockvmenuopened = true;
 						$lastopened = true;
@@ -375,55 +390,55 @@ class MenuManager
 
 					// Add tabulation
 					$tabstring = '';
-					$tabul = ($this->menu->liste[$i]['level'] - 1);
+					$tabul = ($menu_array[$i]['level'] - 1);
 					if ($tabul > 0) {
 						for ($j = 0; $j < $tabul; $j++) {
 							$tabstring .= '&nbsp; &nbsp;';
 						}
 					}
 
-					if ($this->menu->liste[$i]['level'] == 0) {
-						if ($this->menu->liste[$i]['enabled']) {
-							print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.dol_buildpath($this->menu->liste[$i]['url'], 1).'"'.($this->menu->liste[$i]['target'] ? ' target="'.$this->menu->liste[$i]['target'].'"' : '').'>'.$this->menu->liste[$i]['titre'].'</a></div>'."\n";
+					if ($menu_array[$i]['level'] == 0) {
+						if ($menu_array[$i]['enabled']) {
+							print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.dol_buildpath($menu_array[$i]['url'], 1).'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>'.$menu_array[$i]['titre'].'</a></div>'."\n";
 						} else {
-							print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$this->menu->liste[$i]['titre'].'</font></div>'."\n";
+							print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
 						}
 						print '<div class="menu_top"></div>'."\n";
 					}
 
-					if ($this->menu->liste[$i]['level'] > 0) {
+					if ($menu_array[$i]['level'] > 0) {
 						$cssmenu = '';
-						if ($this->menu->liste[$i]['url']) {
-							$cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $this->menu->liste[$i]['url']));
+						if ($menu_array[$i]['url']) {
+							$cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $menu_array[$i]['url']));
 						}
 
 						print '<div class="menu_contenu'.$cssmenu.'">';
 
-						if ($this->menu->liste[$i]['enabled']) {
+						if ($menu_array[$i]['enabled']) {
 							print $tabstring;
-							if ($this->menu->liste[$i]['url']) {
-								print '<a class="vsmenu"  itle="'.dol_escape_htmltag($this->menu->liste[$i]['titre']).'" href="'.dol_buildpath($this->menu->liste[$i]['url'], 1).'"'.($this->menu->liste[$i]['target'] ? ' target="'.$this->menu->liste[$i]['target'].'"' : '').'>';
+							if ($menu_array[$i]['url']) {
+								print '<a class="vsmenu"  itle="'.dol_escape_htmltag($menu_array[$i]['titre']).'" href="'.dol_buildpath($menu_array[$i]['url'], 1).'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';
 							} else {
-								print '<span class="vsmenu" title="'.dol_escape_htmltag($this->menu->liste[$i]['titre']).'">';
+								print '<span class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'">';
 							}
-							if ($this->menu->liste[$i]['url']) {
-								print $this->menu->liste[$i]['titre'].'</a>';
+							if ($menu_array[$i]['url']) {
+								print $menu_array[$i]['titre'].'</a>';
 							} else {
 								print '</span>';
 							}
 						} else {
-							print $tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$this->menu->liste[$i]['titre'].'</font>';
+							print $tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font>';
 						}
 
 						// If title is not pure text and contains a table, no carriage return added
-						if (!strstr($this->menu->liste[$i]['titre'], '<table')) {
+						if (!strstr($menu_array[$i]['titre'], '<table')) {
 							print '<br>';
 						}
 						print '</div>'."\n";
 					}
 
 					// If next is a new block or end
-					if (empty($this->menu->liste[$i + 1]['level'])) {
+					if (empty($menu_array[$i + 1]['level'])) {
 						print '<div class="menu_end"></div>'."\n";
 						print "</div>\n";
 					}
@@ -436,66 +451,9 @@ class MenuManager
 
 			if ($mode == 'jmobile') {
 				$this->leftmenu = clone $this->menu;
-				unset($this->menu->liste);
+				unset($menu_array);
 			}
 		}
-		/*
-		if ($mode == 'jmobile')
-		{
-			$substitarray = getCommonSubstitutionArray($langs, 0, null, null);
-
-			foreach($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-			{
-				print '<ul class="ulmenu" data-inset="true">';
-				print '<li class="lilevel0">';
-
-				$val['url'] = make_substitutions($val['url'], $substitarray);
-
-				if ($val['enabled'] == 1)
-				{
-					$relurl=dol_buildpath($val['url'],1);
-
-					print '<a href="#">'.$val['titre'].'</a>'."\n";
-					// Search submenu fot this entry
-					$tmpmainmenu=$val['mainmenu'];
-					$tmpleftmenu='all';
-					//$submenu=new Menu();
-					//$res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$submenu,1,$tmpmainmenu,$tmpleftmenu, null, $this->type_user);
-					//$nexturl=dol_buildpath($submenu->liste[0]['url'],1);
-					$submenu=$this->leftmenu;
-
-					$canonrelurl=preg_replace('/\?.*$/','',$relurl);
-					$canonnexturl=preg_replace('/\?.*$/','',$nexturl);
-					//var_dump($canonrelurl);
-					//var_dump($canonnexturl);
-					print '<ul>';
-					if ($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('home','tools')))
-					{
-						// We add sub entry
-						print '<li><a href="'.$relurl.'">'.$langs->trans("MainArea").'-'.$val['titre'].'</a></li>'."\n";
-					}
-					foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-					{
-						$val2['url'] = make_substitutions($val2['url'], $substitarray);
-
-						$relurl2=dol_buildpath($val2['url'],1);
-						//var_dump($val2);
-						print '<li><a href="'.$relurl2.'">'.$val2['titre'].'</a></li>'."\n";
-					}
-					//var_dump($submenu);
-					print '</ul>';
-				}
-				if ($val['enabled'] == 2)
-				{
-					print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
-				}
-				print '</li>';
-				print '</ul>'."\n";
-
-				break;	// Only first menu entry (so home)
-			}
-		}
-		*/
 		unset($this->menu);
 
 		return $res;

From ee0e8826076abd26aef3c7cd08878e9c6fe78894 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 16:15:47 +0100
Subject: [PATCH 240/888] Clear code

---
 htdocs/core/menus/standard/empty.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 213cd14e9b0..1ab7778bb01 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -32,10 +32,13 @@ class MenuManager
 
 	public $type_user = 0; // Put 0 for internal users, 1 for external users
 	public $atarget = ""; // To store default target to use onto links
+	public $name = "empty";
 
 	public $menu;
 	public $menu_array_after;
 
+	public $tabMenu;
+
 
 	/**
 	 *  Constructor
@@ -60,6 +63,7 @@ class MenuManager
 	public function loadMenu($forcemainmenu = '', $forceleftmenu = '')
 	{
 		// Do nothing
+		$this->tabMenu = array();
 	}
 
 

From 7ad5a89a16ba069f18169de57026d46e8587a211 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 16:40:20 +0100
Subject: [PATCH 241/888] FIX A service email must always be sent using the
 service email

---
 htdocs/holiday/card.php | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 500d678d357..4c88cdf53b3 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -403,7 +403,7 @@ if (empty($reshook))
 	{
 		$object->fetch($id);
 
-		// Si brouillon et créateur
+		// If draft and owner of leave
 		if ($object->statut == Holiday::STATUS_DRAFT && $cancreate)
 		{
 			$object->oldcopy = dol_clone($object);
@@ -430,7 +430,8 @@ if (empty($reshook))
 				// From
 				$expediteur = new User($db);
 				$expediteur->fetch($object->fk_user);
-				$emailFrom = $expediteur->email;
+				//$emailFrom = $expediteur->email;		Email of user can be an email into another company. Sending will fails, we must use the generic email.
+				$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
 
 				// Subject
 				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
@@ -441,6 +442,7 @@ if (empty($reshook))
 				// Content
 				$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
 				$message .= "\n";
+
 				$message .= $langs->transnoentities("HolidaysToValidateBody")."\n";
 
 				$delayForRequest = $object->getConfCP('delayForRequest');
@@ -525,7 +527,7 @@ if (empty($reshook))
 	{
 		$object->fetch($id);
 
-		// Si statut en attente de validation et valideur = utilisateur
+		// If status is waiting approval and approver is also user
 		if ($object->statut == Holiday::STATUS_VALIDATED && $user->id == $object->fk_validator)
 		{
 			$object->oldcopy = dol_clone($object);
@@ -582,7 +584,8 @@ if (empty($reshook))
 					// From
 					$expediteur = new User($db);
 					$expediteur->fetch($object->fk_validator);
-					$emailFrom = $expediteur->email;
+					//$emailFrom = $expediteur->email;		Email of user can be an email into another company. Sending will fails, we must use the generic email.
+					$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
 
 					// Subject
 					$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
@@ -593,6 +596,7 @@ if (empty($reshook))
 					// Content
 					$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
 					$message .= "\n";
+
 					$message .= $langs->transnoentities("HolidaysValidatedBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."\n";
 
 					$message .= "- ".$langs->transnoentitiesnoconv("ValidatedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
@@ -666,7 +670,8 @@ if (empty($reshook))
 						// From
 						$expediteur = new User($db);
 						$expediteur->fetch($object->fk_validator);
-						$emailFrom = $expediteur->email;
+						//$emailFrom = $expediteur->email;		Email of user can be an email into another company. Sending will fails, we must use the generic email.
+						$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
 
 						// Subject
 						$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
@@ -677,6 +682,7 @@ if (empty($reshook))
 						// Content
 						$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
 						$message .= "\n";
+
 						$message .= $langs->transnoentities("HolidaysRefusedBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."\n";
 						$message .= GETPOST('detail_refuse', 'alpha')."\n\n";
 
@@ -813,7 +819,8 @@ if (empty($reshook))
 				// From
 				$expediteur = new User($db);
 				$expediteur->fetch($object->fk_user_cancel);
-				$emailFrom = $expediteur->email;
+				//$emailFrom = $expediteur->email;		Email of user can be an email into another company. Sending will fails, we must use the generic email.
+				$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
 
 				// Subject
 				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;

From 6e403e6ce0097af91ba420b2f679c6d55d3b5a52 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 18:29:14 +0100
Subject: [PATCH 242/888] Fix warnings

---
 htdocs/comm/propal/class/propal.class.php | 12 ++++++++++--
 htdocs/core/class/commonobject.class.php  |  2 +-
 test/phpunit/PropalTest.php               |  6 +++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index c761f8b3321..dfbae271881 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1099,7 +1099,7 @@ class Propal extends CommonObject
 			if ($this->id)
 			{
 				$this->ref = '(PROV'.$this->id.')';
-				$sql = 'UPDATE '.MAIN_DB_PREFIX."propal SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
+				$sql = 'UPDATE '.MAIN_DB_PREFIX."propal SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".((int) $this->id);
 
 				dol_syslog(get_class($this)."::create", LOG_DEBUG);
 				$resql = $this->db->query($sql);
@@ -1111,7 +1111,7 @@ class Propal extends CommonObject
 				}
 
 				// Add object linked
-				if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects))
+				if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects))
 				{
 					foreach ($this->linked_objects as $origin => $tmp_origin_id)
 					{
@@ -3753,7 +3753,10 @@ class PropaleLigne extends CommonObjectLine
 	public $product_type = Product::TYPE_PRODUCT;
 
 	public $qty;
+
 	public $tva_tx;
+	public $vat_src_code;
+
 	public $subprice;
 	public $remise_percent;
 	public $fk_remise_except;
@@ -3805,6 +3808,11 @@ class PropaleLigne extends CommonObjectLine
 	 * @see $product_label
 	 */
 	public $libelle;
+	/**
+	 * @deprecated
+	 * @see $product_label
+	 */
+	public $label;
 	/**
 	 *  Product label
 	 * @var string
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 33ac1aba696..6ecdfb93bb5 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3161,7 +3161,7 @@ abstract class CommonObject
 			$this->multicurrency_total_ttc += isset($this->revenuestamp) ? ($this->revenuestamp * $multicurrency_tx) : 0;
 
 			// Situations totals
-			if ($this->situation_cycle_ref && $this->situation_counter > 1 && method_exists($this, 'get_prev_sits') && $this->type != $this::TYPE_CREDIT_NOTE)
+			if (!empty($this->situation_cycle_ref) && $this->situation_counter > 1 && method_exists($this, 'get_prev_sits') && $this->type != $this::TYPE_CREDIT_NOTE)
 			{
 				$prev_sits = $this->get_prev_sits();
 
diff --git a/test/phpunit/PropalTest.php b/test/phpunit/PropalTest.php
index 068fb53b052..ea678e8df34 100644
--- a/test/phpunit/PropalTest.php
+++ b/test/phpunit/PropalTest.php
@@ -190,11 +190,11 @@ class PropalTest extends PHPUnit\Framework\TestCase
     	$langs=$this->savlangs;
     	$db=$this->savdb;
 
-    	$localobject->note_private='New note private after update';
-    	$result=$localobject->update($user);
+    	$localobject->note_private = 'New note private after update';
+    	$result = $localobject->update($user);
 
     	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$id." result=".$result."\n";
+    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
     	return $localobject;
     }
 

From 669205af1c05f879a59f57a2160b7515991d964b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 19:02:49 +0100
Subject: [PATCH 243/888] Update product.class.php

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 9abd1d82da5..ccca1a85f47 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -934,7 +934,7 @@ class Product extends CommonObject
             if ($this->hasbatch() && !$this->oldcopy->hasbatch()) {
                 //$valueforundefinedlot = 'Undefined';  // In previous version, 39 and lower
                 $valueforundefinedlot = '000000';
-				if ($conf->global->STOCK_DEFAULT_BATCH) $valueforundefinedlot = $conf->global->STOCK_DEFAULT_BATCH;
+				if (!empty($conf->global->STOCK_DEFAULT_BATCH)) $valueforundefinedlot = $conf->global->STOCK_DEFAULT_BATCH;
 
                 dol_syslog("Flag batch of product id=".$this->id." is set to ON, so we will create missing records into product_batch");
 

From 92b430495baaf679070c75a0fb772f514a58cab6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 19:23:40 +0100
Subject: [PATCH 244/888] Stupid composer, the package that makes you lose your
 time.

---
 composer.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 9fede994525..dbc72b09bd1 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,7 @@
 {
 	"name" : "dolibarr/dolibarr",
 	"type" : "project",
+	"version": "999.999.999",
 	"description" : "Dolibarr ERP & CRM is a modern and easy to use web software to manage your business",
 	"keywords" : [
 		"erp",
@@ -35,7 +36,7 @@
 		"nnnick/chartjs" : "^2.9",
 		"stripe/stripe-php" : "6.43.1",
 		"maximebf/debugbar" : "1.15.1",
-		"symfony/var-dumper": "3"
+		"symfony/var-dumper" : "3"
 	},
 	"require-dev" : {
 		"php-parallel-lint/php-parallel-lint" : "^0",
@@ -59,4 +60,4 @@
 		"ext-zip" : "ODT, Excel and file compression support",
 		"ext-xml" : "Excel support"
 	}
-}
+}
\ No newline at end of file

From d8d5524766d8c4c68e058d6fc2ed8af319503d24 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 19:51:22 +0100
Subject: [PATCH 245/888] Update security file

---
 SECURITY.md   | 3 +--
 composer.json | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index 56e1da679ed..77307516f73 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -12,8 +12,7 @@ This file contains some policies about the security reports on Dolibarr ERP CRM
 
 ## Reporting a Vulnerability
 
-To report a vulnerability, please send an email to security@dolibarr.org
-In most cases, after fixing the security, we make an answer by email to say the issue has been fixed.
+To report a vulnerability, please use GitHub security advisory (alternatively send an email to security@dolibarr.org)
 
 
 ## Hunting vulnerabilities on Dolibarr
diff --git a/composer.json b/composer.json
index dbc72b09bd1..bd81e101cfc 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,6 @@
 {
 	"name" : "dolibarr/dolibarr",
 	"type" : "project",
-	"version": "999.999.999",
 	"description" : "Dolibarr ERP & CRM is a modern and easy to use web software to manage your business",
 	"keywords" : [
 		"erp",

From 078e395bfb91154e5f4481c4403c019c5117af81 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 20:25:54 +0100
Subject: [PATCH 246/888] Fix gitignore

---
 htdocs/includes/mike42/escpos-php/.gitignore   |  2 ++
 htdocs/includes/mike42/escpos-php/autoload.php | 18 +++++++++---------
 .../PrintConnectors/CupsPrintConnector.php     |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/htdocs/includes/mike42/escpos-php/.gitignore b/htdocs/includes/mike42/escpos-php/.gitignore
index 8632f891ad4..e7dd4b6263a 100644
--- a/htdocs/includes/mike42/escpos-php/.gitignore
+++ b/htdocs/includes/mike42/escpos-php/.gitignore
@@ -14,3 +14,5 @@ vendor/
 # other build files
 build/*
 *.phar
+/example/
+/test/
diff --git a/htdocs/includes/mike42/escpos-php/autoload.php b/htdocs/includes/mike42/escpos-php/autoload.php
index 47ed7d9e9c3..7779486b824 100644
--- a/htdocs/includes/mike42/escpos-php/autoload.php
+++ b/htdocs/includes/mike42/escpos-php/autoload.php
@@ -1,26 +1,26 @@
 <?php
 /**
  * Users who do not have 'composer' to manage dependencies, include this
- * file to provide auto-loading of the classes in this library.
+ * file to provide auto-loading of the classes in this library. 
  */
-spl_autoload_register( function ($class) {
+spl_autoload_register ( function ($class) {
 	/*
 	 * PSR-4 autoloader, based on PHP Framework Interop Group snippet (Under MIT License.)
 	 * https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-4-autoloader-examples.md
 	 */
 	$prefix = "Mike42\\";
 	$base_dir = __DIR__ . "/src/Mike42/";
-
+	
 	/* Only continue for classes in this namespace */
-	$len = strlen($prefix);
-	if (strncmp($prefix, $class, $len) !== 0) {
+	$len = strlen ( $prefix );
+	if (strncmp ( $prefix, $class, $len ) !== 0) {
 		return;
 	}
-
+	
 	/* Require the file if it exists */
-	$relative_class = substr($class, $len);
-	$file = $base_dir . str_replace('\\', '/', $relative_class) . '.php';
-	if (file_exists($file)) {
+	$relative_class = substr ( $class, $len );
+	$file = $base_dir . str_replace ( '\\', '/', $relative_class ) . '.php';
+	if (file_exists ( $file )) {
 		require $file;
 	}
 } );
diff --git a/htdocs/includes/mike42/escpos-php/src/Mike42/Escpos/PrintConnectors/CupsPrintConnector.php b/htdocs/includes/mike42/escpos-php/src/Mike42/Escpos/PrintConnectors/CupsPrintConnector.php
index 64b48332199..045e8b9ce4c 100644
--- a/htdocs/includes/mike42/escpos-php/src/Mike42/Escpos/PrintConnectors/CupsPrintConnector.php
+++ b/htdocs/includes/mike42/escpos-php/src/Mike42/Escpos/PrintConnectors/CupsPrintConnector.php
@@ -78,7 +78,7 @@ class CupsPrintConnector implements PrintConnector
         
         // Build command to work on data
         $tmpfname = tempnam(sys_get_temp_dir(), 'print-');
-		if ($tmpfname==false) dol_syslog("CupsPrintConnector.php::Permission denied to write into target directory ".sys_get_temp_dir(), LOG_WARNING);
+        if ($tmpfname==false) dol_syslog("CupsPrintConnector.php::Permission denied to write into target directory ".sys_get_temp_dir(), LOG_WARNING);
         file_put_contents($tmpfname, $data);
         $cmd = sprintf(
             "lp -d %s %s",

From af040dd6756a5dc7b8529ccd639395a4fabbee06 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 20:33:13 +0100
Subject: [PATCH 247/888] Update lib

---
 htdocs/includes/symfony/var-dumper/.gitignore |  3 +
 .../includes/symfony/var-dumper/composer.json | 83 +++++++++----------
 .../symfony/var-dumper/phpunit.xml.dist       | 29 +++++++
 3 files changed, 72 insertions(+), 43 deletions(-)
 create mode 100644 htdocs/includes/symfony/var-dumper/.gitignore
 create mode 100644 htdocs/includes/symfony/var-dumper/phpunit.xml.dist

diff --git a/htdocs/includes/symfony/var-dumper/.gitignore b/htdocs/includes/symfony/var-dumper/.gitignore
new file mode 100644
index 00000000000..5414c2c655e
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/.gitignore
@@ -0,0 +1,3 @@
+composer.lock
+phpunit.xml
+vendor/
diff --git a/htdocs/includes/symfony/var-dumper/composer.json b/htdocs/includes/symfony/var-dumper/composer.json
index a90729b6bbe..05955f69430 100644
--- a/htdocs/includes/symfony/var-dumper/composer.json
+++ b/htdocs/includes/symfony/var-dumper/composer.json
@@ -1,44 +1,41 @@
 {
-	"name" : "symfony/var-dumper",
-	"type" : "library",
-	"description" : "Symfony mechanism for exploring and dumping PHP variables",
-	"keywords" : [
-		"dump",
-		"debug"
-	],
-	"homepage" : "https://symfony.com",
-	"license" : "MIT",
-	"authors" : [{
-			"name" : "Nicolas Grekas",
-			"email" : "p@tchwork.com"
-		}, {
-			"name" : "Symfony Community",
-			"homepage" : "https://symfony.com/contributors"
-		}
-	],
-	"require" : {
-		"php" : ">=5.5.9",
-		"symfony/polyfill-mbstring" : "~1.0"
-	},
-	"require-dev" : {
-		"twig/twig" : "~1.20|~2.0"
-	},
-	"suggest" : {},
-	"autoload" : {
-		"files" : [
-			"Resources/functions/dump.php"
-		],
-		"psr-4" : {
-			"Symfony\\Component\\VarDumper\\" : ""
-		},
-		"exclude-from-classmap" : [
-			"/Tests/"
-		]
-	},
-	"minimum-stability" : "dev",
-	"extra" : {
-		"branch-alias" : {
-			"dev-master" : "3.0-dev"
-		}
-	}
-}
\ No newline at end of file
+    "name": "symfony/var-dumper",
+    "type": "library",
+    "description": "Symfony mechanism for exploring and dumping PHP variables",
+    "keywords": ["dump", "debug"],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Nicolas Grekas",
+            "email": "p@tchwork.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=5.5.9",
+        "symfony/polyfill-mbstring": "~1.0"
+    },
+    "require-dev": {
+        "twig/twig": "~1.20|~2.0"
+    },
+    "suggest": {
+        "ext-symfony_debug": ""
+    },
+    "autoload": {
+        "files": [ "Resources/functions/dump.php" ],
+        "psr-4": { "Symfony\\Component\\VarDumper\\": "" },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "minimum-stability": "dev",
+    "extra": {
+        "branch-alias": {
+            "dev-master": "3.0-dev"
+        }
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/phpunit.xml.dist b/htdocs/includes/symfony/var-dumper/phpunit.xml.dist
new file mode 100644
index 00000000000..bb16a3a4ec0
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/phpunit.xml.dist
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+    </php>
+
+    <testsuites>
+        <testsuite name="Symfony VarDumper Component Test Suite">
+            <directory>./Tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>./</directory>
+            <exclude>
+                <directory>./Resources</directory>
+                <directory>./Tests</directory>
+                <directory>./vendor</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>

From d5b009a22a53303fced917cfaab81be5e0bb1d79 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 20:36:42 +0100
Subject: [PATCH 248/888] Add .gitignore

---
 htdocs/includes/tecnickcom/tcpdf/.gitignore | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 htdocs/includes/tecnickcom/tcpdf/.gitignore

diff --git a/htdocs/includes/tecnickcom/tcpdf/.gitignore b/htdocs/includes/tecnickcom/tcpdf/.gitignore
new file mode 100644
index 00000000000..56fd659871f
--- /dev/null
+++ b/htdocs/includes/tecnickcom/tcpdf/.gitignore
@@ -0,0 +1,2 @@
+/examples/
+/tools/
\ No newline at end of file

From bb217db31e6b9abb3aa25825516943425122a0c2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 20:38:15 +0100
Subject: [PATCH 249/888] Ad .gitignore

---
 htdocs/includes/restler/framework/Luracast/Restler/.gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 htdocs/includes/restler/framework/Luracast/Restler/.gitignore

diff --git a/htdocs/includes/restler/framework/Luracast/Restler/.gitignore b/htdocs/includes/restler/framework/Luracast/Restler/.gitignore
new file mode 100644
index 00000000000..5fe55bc3882
--- /dev/null
+++ b/htdocs/includes/restler/framework/Luracast/Restler/.gitignore
@@ -0,0 +1 @@
+/Explorer/

From 644bac0b808285ca9093924709157d2f6141725b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 20:39:59 +0100
Subject: [PATCH 250/888] Removed gitignore

---
 htdocs/includes/restler/framework/Luracast/Restler/.gitignore | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 htdocs/includes/restler/framework/Luracast/Restler/.gitignore

diff --git a/htdocs/includes/restler/framework/Luracast/Restler/.gitignore b/htdocs/includes/restler/framework/Luracast/Restler/.gitignore
deleted file mode 100644
index 5fe55bc3882..00000000000
--- a/htdocs/includes/restler/framework/Luracast/Restler/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Explorer/

From 6abf1b6ac2139fc781593d73cc92a6fa2bec0956 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 20:59:07 +0100
Subject: [PATCH 251/888] Error message

---
 htdocs/api/admin/index.php     | 3 ++-
 htdocs/langs/en_US/errors.lang | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/api/admin/index.php b/htdocs/api/admin/index.php
index b4ebb6cb30e..1d15d5b9e75 100644
--- a/htdocs/api/admin/index.php
+++ b/htdocs/api/admin/index.php
@@ -160,7 +160,8 @@ if (dol_is_dir(DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/e
 	$url = DOL_MAIN_URL_ROOT.'/api/index.php/explorer';
 	print img_picto('', 'globe').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
 } else {
-	print $langs->trans("NotAvailableWithThisDistribution");
+	$langs->load("errors");
+	print info_admin($langs->trans("ErrorNotAvailableWithThisDistribution"), 0, 0, 'error');
 }
 
 llxFooter();
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 2413e6d76ba..056c9240bd0 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -250,6 +250,7 @@ ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be
 ErrorLoginDateValidity=Error, this login is outside the validity date range
 ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
 ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.

From f738c875d8257a63917c5cae9dc3062e6fa04973 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 21:10:10 +0100
Subject: [PATCH 252/888] Update gitignore

---
 composer.lock                                |  4 +-
 htdocs/includes/nnnick/chartjs/.gitignore    |  7 ++-
 htdocs/includes/nnnick/chartjs/composer.json | 49 ++++++++++----------
 3 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/composer.lock b/composer.lock
index 5afe0ca34f2..93226d8f2c8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -217,7 +217,7 @@
         },
         {
             "name": "nnnick/chartjs",
-            "version": "v2.9.3",
+            "version": "v2.9.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/chartjs/Chart.js.git",
@@ -315,7 +315,7 @@
             "time": "2015-05-01T07:00:55+00:00"
         },
         {
-            "name": "psr/log",
+            "name": "Psr/log",
             "version": "1.1.3",
             "source": {
                 "type": "git",
diff --git a/htdocs/includes/nnnick/chartjs/.gitignore b/htdocs/includes/nnnick/chartjs/.gitignore
index 6a066b92f38..8a4a4294d61 100644
--- a/htdocs/includes/nnnick/chartjs/.gitignore
+++ b/htdocs/includes/nnnick/chartjs/.gitignore
@@ -1,8 +1,13 @@
+.github
 /_book
 /coverage
 /custom
 /dist
-/docs/index.md
+/docs
+/samples
+/scripts
+/src
+/test
 /gh-pages
 /jsdoc
 /node_modules
diff --git a/htdocs/includes/nnnick/chartjs/composer.json b/htdocs/includes/nnnick/chartjs/composer.json
index b332bb0f595..9df2b22fc50 100644
--- a/htdocs/includes/nnnick/chartjs/composer.json
+++ b/htdocs/includes/nnnick/chartjs/composer.json
@@ -1,26 +1,25 @@
 {
-    "name": "nnnick/chartjs",
-    "type": "library",
-    "description": "Simple HTML5 charts using the canvas element.",
-    "keywords": [
-        "chart",
-        "js"
-    ],
-    "homepage": "https://www.chartjs.org/",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "NICK DOWNIE",
-            "email": "hello@nickdownie.com"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.3"
-    },
-    "minimum-stability": "stable",
-    "extra": {
-        "branch-alias": {
-            "release/2.0": "v2.0-dev"
-        }
-    }
-}
+	"name" : "nnnick/chartjs",
+	"type" : "library",
+	"description" : "Simple HTML5 charts using the canvas element.",
+	"keywords" : [
+		"chart",
+		"js"
+	],
+	"homepage" : "https://www.chartjs.org/",
+	"license" : "MIT",
+	"authors" : [{
+			"name" : "NICK DOWNIE",
+			"email" : "hello@nickdownie.com"
+		}
+	],
+	"require" : {
+		"php" : ">=5.3.3"
+	},
+	"minimum-stability" : "stable",
+	"extra" : {
+		"branch-alias" : {
+			"release/2.0" : "v2.0-dev"
+		}
+	}
+}
\ No newline at end of file

From 4bc2e791a8b29aa7ac858a479b316747db41953e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 21:44:19 +0100
Subject: [PATCH 253/888] Update .gitignore

---
 htdocs/includes/mike42/escpos-php/.gitignore | 6 +-----
 package.json                                 | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/htdocs/includes/mike42/escpos-php/.gitignore b/htdocs/includes/mike42/escpos-php/.gitignore
index e7dd4b6263a..2b6e1a8d17c 100644
--- a/htdocs/includes/mike42/escpos-php/.gitignore
+++ b/htdocs/includes/mike42/escpos-php/.gitignore
@@ -4,9 +4,7 @@
 .buildpath
 
 # doxygen files
-doc/html
-doc/latex
-doc/doxygen_sqlite3.db
+doc
 
 # composer files
 vendor/
@@ -14,5 +12,3 @@ vendor/
 # other build files
 build/*
 *.phar
-/example/
-/test/
diff --git a/package.json b/package.json
index 01d3a4300ee..56f8ced1d4b 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
     "test:e2e": "node_modules/cucumber/bin/cucumber-js --require test/acceptance/index.js --require test/acceptance/setup.js --require test/acceptance/stepDefinitions -f node_modules/cucumber-pretty"
   },
   "dependencies": {
+    "chart.js": "^2.9.4",
     "cucumber-pretty": "^6.0.0",
     "node-fetch": "^2.6.1"
   }

From 796fe5cd8af0f23b9dc556ba92e5cd9d7c67cb0c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 21:47:57 +0100
Subject: [PATCH 254/888] Update .gitignore

---
 htdocs/includes/mobiledetect/mobiledetectlib/.gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 htdocs/includes/mobiledetect/mobiledetectlib/.gitignore

diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/.gitignore b/htdocs/includes/mobiledetect/mobiledetectlib/.gitignore
new file mode 100644
index 00000000000..2f88269126d
--- /dev/null
+++ b/htdocs/includes/mobiledetect/mobiledetectlib/.gitignore
@@ -0,0 +1 @@
+/docs

From 85bb3fa909b4e18faecca48ce7d7f1e9c05c0aad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 21:57:29 +0100
Subject: [PATCH 255/888] Update chart.js to 2.9.4

---
 COPYRIGHT                                     |    2 +-
 build/makepack-dolibarr.pl                    |   31 +-
 composer.json                                 |    2 +-
 composer.lock                                 |  261 +-
 htdocs/includes/mike42/escpos-php/doc/FAQ.md  |  142 -
 .../includes/mike42/escpos-php/doc/Makefile   |   20 -
 .../mike42/escpos-php/doc/escpos.doxyfile     | 2352 -----------------
 .../mobiledetectlib/docs/CONTRIBUTING.md      |   48 -
 .../mobiledetectlib/docs/HISTORY.md           |   11 -
 .../mobiledetectlib/docs/ISSUE_TEMPLATE.md    |   15 -
 .../mobiledetectlib/docs/KNOWN_LIMITATIONS.md |   12 -
 htdocs/includes/nnnick/chartjs/.travis.yml    |    4 +-
 htdocs/includes/nnnick/chartjs/composer.json  |   49 +-
 .../nnnick/chartjs/dist/Chart.bundle.js       |   45 +-
 .../nnnick/chartjs/dist/Chart.bundle.min.js   |    6 +-
 htdocs/includes/nnnick/chartjs/dist/Chart.js  |   45 +-
 .../includes/nnnick/chartjs/dist/Chart.min.js |    6 +-
 .../includes/nnnick/chartjs/package-lock.json |    2 +-
 htdocs/includes/nnnick/chartjs/package.json   |    2 +-
 19 files changed, 180 insertions(+), 2875 deletions(-)
 delete mode 100644 htdocs/includes/mike42/escpos-php/doc/FAQ.md
 delete mode 100644 htdocs/includes/mike42/escpos-php/doc/Makefile
 delete mode 100644 htdocs/includes/mike42/escpos-php/doc/escpos.doxyfile
 delete mode 100644 htdocs/includes/mobiledetect/mobiledetectlib/docs/CONTRIBUTING.md
 delete mode 100644 htdocs/includes/mobiledetect/mobiledetectlib/docs/HISTORY.md
 delete mode 100644 htdocs/includes/mobiledetect/mobiledetectlib/docs/ISSUE_TEMPLATE.md
 delete mode 100644 htdocs/includes/mobiledetect/mobiledetectlib/docs/KNOWN_LIMITATIONS.md

diff --git a/COPYRIGHT b/COPYRIGHT
index d43f4d506f1..adf7d38c04b 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -39,7 +39,7 @@ TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes
 
 JS libraries:
 Ace                    1.4.8         BSD                         Yes             JS library to get code syntaxique coloration in a textarea.
-ChartJS				   2.9.3         MIT License                 Yes             JS library for graph
+ChartJS				   2.9.4         MIT License                 Yes             JS library for graph
 jQuery                 3.5.1         MIT License                 Yes             JS library
 jQuery UI              1.12.1        GPL and MIT License         Yes             JS library plugin UI
 jQuery select2         4.0.13         GPL and Apache License      Yes             JS library plugin for sexier multiselect. Warning: 4.0.6+ create troubles without patching css
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 314aaff7177..17a935f6234 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -581,23 +581,36 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/workstation*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/oblyon*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/allscreen*`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/theme/common/octicons/LICENSE`;
+		
 		# Removed other test files
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/test`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/.gitignore $BUILDROOT/$PROJECT/*/.gitignore $BUILDROOT/$PROJECT/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.gitignore`;
+		
+		# Removed files installed by the awful composer   	    
    	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/geoip/sample*.*`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/bin`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/ckeditor/adapters`;		# Keep this removal in case we embed libraries
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/ckeditor/samples`;		# Keep this removal in case we embed libraries
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;					# _source must be kept into tarball for official debian, not for the rest
-   	    
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/composer`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/doctrine`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/select2/release.sh`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/doc`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/example`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/test`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/example`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/test`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mobiledetect/mobiledetectlib/.gitmodules`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mobiledetect/mobiledetectlib/docs`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/.github`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/docs`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/samples`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/scripts`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/src`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/test`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/parsedown/LICENSE.txt`;
@@ -612,21 +625,17 @@ if ($nboftargetok) {
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/sabre/sabre/*/tests`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/stripe/tests`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/stripe/LICENSE`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-*`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-*`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/ae_fonts_*`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/examples`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/utils`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/LICENSE.TXT`;
-
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/vendor`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/webmozart`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/autoload.php`;
-
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/theme/common/octicons/LICENSE`;
 	}
 
 	# Build package for each target
diff --git a/composer.json b/composer.json
index bd81e101cfc..a943fbe0aa3 100644
--- a/composer.json
+++ b/composer.json
@@ -59,4 +59,4 @@
 		"ext-zip" : "ODT, Excel and file compression support",
 		"ext-xml" : "Excel support"
 	}
-}
\ No newline at end of file
+}
diff --git a/composer.lock b/composer.lock
index 93226d8f2c8..e0462435f5e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -6,6 +6,53 @@
     ],
     "content-hash": "1dbd2d05cc0836acfca5988f29005cf2",
     "packages": [
+        {
+            "name": "Psr/log",
+            "version": "1.1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
+                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Log\\": "Psr/Log/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
+            "time": "2020-03-23T09:12:05+00:00"
+        },
         {
             "name": "ckeditor/ckeditor",
             "version": "4.12.1",
@@ -221,12 +268,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/chartjs/Chart.js.git",
-                "reference": "06f73dc3590084b2c464bf08189c7aee2b6b92d2"
+                "reference": "9bd4cf82fda9f50a5fb50b72843e06ab88124278"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/chartjs/Chart.js/zipball/06f73dc3590084b2c464bf08189c7aee2b6b92d2",
-                "reference": "06f73dc3590084b2c464bf08189c7aee2b6b92d2",
+                "url": "https://api.github.com/repos/chartjs/Chart.js/zipball/9bd4cf82fda9f50a5fb50b72843e06ab88124278",
+                "reference": "9bd4cf82fda9f50a5fb50b72843e06ab88124278",
                 "shasum": ""
             },
             "require": {
@@ -254,7 +301,11 @@
                 "JS",
                 "chart"
             ],
-            "time": "2019-11-14T18:37:30+00:00"
+            "support": {
+                "issues": "https://github.com/chartjs/Chart.js/issues",
+                "source": "https://github.com/chartjs/Chart.js/tree/v2.9.4"
+            },
+            "time": "2020-10-19T12:22:11+00:00"
         },
         {
             "name": "phpoffice/phpexcel",
@@ -314,53 +365,6 @@
             "abandoned": "phpoffice/phpspreadsheet",
             "time": "2015-05-01T07:00:55+00:00"
         },
-        {
-            "name": "Psr/log",
-            "version": "1.1.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/log.git",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Log\\": "Psr/Log/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for logging libraries",
-            "homepage": "https://github.com/php-fig/log",
-            "keywords": [
-                "log",
-                "psr",
-                "psr-3"
-            ],
-            "time": "2020-03-23T09:12:05+00:00"
-        },
         {
             "name": "restler/framework",
             "version": "3.0.0-RC6",
@@ -2037,159 +2041,6 @@
             ],
             "time": "2019-08-06T08:03:45+00:00"
         },
-        {
-            "name": "symfony/polyfill-php72",
-            "version": "v1.18.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "639447d008615574653fb3bc60d1986d7172eaae"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/639447d008615574653fb3bc60d1986d7172eaae",
-                "reference": "639447d008615574653fb3bc60d1986d7172eaae",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.18-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php72\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-07-14T12:35:20+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php80",
-            "version": "v1.18.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/d87d5766cbf48d72388a9f6b85f280c8ad51f981",
-                "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.0.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.18-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ],
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Ion Bazan",
-                    "email": "ion.bazan@gmail.com"
-                },
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-07-14T12:35:20+00:00"
-        },
         {
             "name": "symfony/yaml",
             "version": "v3.4.32",
@@ -2312,5 +2163,5 @@
         "ext-curl": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "1.1.0"
+    "plugin-api-version": "2.0.0"
 }
diff --git a/htdocs/includes/mike42/escpos-php/doc/FAQ.md b/htdocs/includes/mike42/escpos-php/doc/FAQ.md
deleted file mode 100644
index 6b7a6247bca..00000000000
--- a/htdocs/includes/mike42/escpos-php/doc/FAQ.md
+++ /dev/null
@@ -1,142 +0,0 @@
-# Frequently Asked Questions (FAQ)
-
-## Can I print to File Format X with this?
-
-If you are trying to generate XPS, PDF or DOCX or HTML files from PHP, then you are most likely in the wrong place.
-
-The purpose of this driver it to generate binary ESC/POS code, which is understood by many embedded thermal receipt and impact printers.
-
-## I have Printer X. Can I use this driver?
-
-If the printer understands ESC/POS, and you know how to get raw binary data to it, then yes. Otherwise, no.
-
-The [list of printers that are known to work](https://github.com/mike42/escpos-php/blob/development/README.md#printers) is crowd-sourced. We appreciate it when developers try out the driver, then [file information on the bug tracker](https://github.com/mike42/escpos-php/issues/new) with some information about which features worked on their model of printer.
-
-To see how well your printer works, first check that it supports ESC/POS, then begin by attempting to send the text "Hello World" to your printer on the command-line, from the computer that will run PHP.
-
-Once you solve this, [try to do the same from PHP](https://github.com/mike42/escpos-php/blob/development/README.md#basic-usage) using the default profile. Further details are in the [README](https://github.com/mike42/escpos-php/blob/development/README.md) file.
-
-## Can you add support for Printer X?
-
-Features vary between printers, so we collaborate on an ESC/POS printer compatibility database to collect known differences: [receipt-print-hq/escpos-printer-db](https://github.com/receipt-print-hq/escpos-printer-db).
-
-If you encounter garbage output when you try to print images or special characters, then please submit a test page and a link to vendor documentation to the `escpos-printer-db` project, so that support can be improved for future versions.
-
-## I have a printer that does not understand ESC/POS. Can I use this driver?
-
-No. The purpose of this driver it to generate binary ESC/POS code. If your printer doesn't understand that, then this code wont be much use to you.
-
-Some printers do have an emulation mode for ESC/POS. The vendor docs will tell if this is the case, and how to enable it.
-
-## Why do I get this error when I try to print?
-
-Start by testing that you can send text to your printer outside of escpos-php. The examples linked to in the README are commented with some commands to get you started.
-
-Generally, initial setup problems seem to have one of these causes:
-
-1. You are writing to the wrong place. Writing to `LPT1` does not output to parallel port on Linux, and `/dev/ttyS0` is not a serial printer on Windows.
-2. The printer has not been set up to accept printing the way you expect. This means permissions on Linux, network printers being configured, and shared printers having user accounts and firewalls set up correctly on the print server.
-3. Your printer actually doesn't work (rare but possible).
-
-To be clear, these are not escpos-php issues: No amount of PHP code can set up your printer for you. Instead, the driver relies on developers determining how their setup is going to work before using a connector to transport data to their printer.
-
-Once you have a working command to send text to your printer (from the PHP server), you are ready to use escpos-php. You can try to use a PrintConnector now, based on your operating system and printer interface. A table is located in the README to help you select the right one.
-
-The connectors are-
-
-- `FilePrintConnector` and `NetworkPrintConnector` directly use files or network sockets.
-- `WindowsPrintConnector` and `CupsPrintConnector` tie in with Windows and Unix system printing.
-- `DummyPrintConnector` does not connect to a real printer, and can be used to save ESC/POS receipts to a database, for example.
-
-At this point, you might find that the way you would like to print is not supported by escpos-php. You can post your printing command as a feature request on the issue tracker.
-
-Lastly, you may run in to the final common trap:
-
-4. Your PHP is not running with the same sort of permissions as your login account. Again, no amount of PHP code can fix this. For example, on LAMP, your `www-data` user needs to be in the `lp` group, while on WAMP, `Local Service` account may run in to problems. SELinux and firewalls are also worth a look.
-
-When printing fails, you can expect a PHP Exception that explains what went wrong. They are all clues:
-
-- `Warning: copy(\\pc\printer): failed to open stream: Permission denied`
-- `/dev/usb/lp0: Permission denied`
-- `User name or password is incorrect`
-
-Ensure that while you are developing, you configure PHP to show error messages, so that you can see these problems.
-
-Please file a bug if you think that there is a specific situation which escpos-php could provide better error messages for.
-
-## Can I print over the network?
-
-Certainly, as long as your printer is available over the network.
-
-- `NetworkPrintConnector` will speak directly to an Ethernet-connected printer on port 9100.
-
-For USB or Serial printers, you need to install the printer on a computer and then share it, so that it becomes network-accessible.
-
-- `WindowsPrintConnector` will connect to Windows shared printers from Windows or Linux (Linux users will need Samba).
-- `CupsPrintConnector` will connect to CUPS-shared printers from Linux or Mac.
-
-Always start by testing your shared printer setup outside of escpos-php. The examples linked to in the README are commented with some example commands to get you started. Typically, networks, firewalls and permissions need to be set up.
-
-Once you have a working command to send text to your printer (from the PHP server), you are ready to use escpos-php.
-
-If you have any issues at this stage, please ask on the issue tracker, and include the commands that you used to verify your setup.
-
-## Can I print from my server on the Internet?
-
-Since PHP is a server-side language, escpos-php is a server-side print library. The driver is able to transport data between a server and a printer in a few different ways, all of them server-side. For example, you may print to a USB printer *connected to the server running PHP*, or an Ethernet printer *on a network accessible to the server*.
-
-Many developers dream of having an application that is hosted on the public Internet, with POS terminals accessing it, and printing via a web browser. Because the webserver cannot see the printer in this sort of setup, a server-side print driver is not much use.
-
-Because of this, there are no cut-and-paste recipes available, but here are two top-level approaches you could take:
-
-1. Architect your application so that the server can see your printer
-2. Use an application which runs client-side to deliver print data instead
-
-### Option 1: Allow the server to print
-
-Server-side printing is viable if the server can get to the printer. Here are some ways it could work:
-
-- Run your server on the LAN instead, and read the section above about printing over the network
-- Set up a VPN so that your cloud-hosted server can also access the LAN
-- Expose the printer via some other secure tunnel to the server, via SSH or TLS
-
-Please do your own research to determine how these may apply to your setup- the escpos-php issue tracker is not a place where you should be requesting network support.
-
-### Option 2: Use client software to print
-
-If you aren't able to set up some network infrastructure to implement the above, then you cannot use a server-side print driver.
-
-Here are some browser-based printing tools which you may like to consider instead.
-
-- Use system printing with a vendor driver, and some good `@media print` CSS
-- [Chrome Raw Print](https://github.com/receipt-print-hq/chrome-raw-print) app
-- [qz](https://qz.io/)
-- [ePOS-Device SDK for JavaScript](https://reference.epson-biz.com/modules/ref_epos_device_js_en/index.php?content_id=139). Requires network interface card that supports ePOS (UB-E04/R04)
-
-Please direct queries about client-side printing products to the appropriate project.
-
-## Why is image printing slow?
-
-Three things tend to slow down the image processing:
-
-1. Slow PHP code
-2. Data link
-3. The printer itself
-
-First, ensure you have the Imagick plugin loaded. The driver will avoid a slower image processing implementation once you've got it.
-
-Next, connect over a faster interface. Serial printers have a low bit-rate, and the printer spends a lot of time waiting for data. If you have USB or Ethernet, then use it (note: storing graphics to the printer memory is not currently implemented).
-
-Lastly, the printer will go faster if you use less pixels. Since images are two-dimensional, scaling down by 50% removes 75% of the pixels. The driver can then print at a half the density, so that your lower resolution image appears the same size when printed.
-
-## How can I get the status of the printer?
-
-This feature is not implemented, but a solution for some Epson printers is planned.
-
-Only `FilePrintConnector` or `NetworkPrintConnector` will support reading from the printer, ensure that you migrate to those if you would like these features.
-
-## How do I produce this complex layout?
-
-ESC/POS "page mode" is not currently supported, which would allow some printers to render some more complex layouts natively
-
-Since the output is raster anyway, it is suggested that you render your output to an image and print that instead. The driver supports PDF printing via Imagick, and an example that uses `wkhtmltoimage` is available in the repository.
diff --git a/htdocs/includes/mike42/escpos-php/doc/Makefile b/htdocs/includes/mike42/escpos-php/doc/Makefile
deleted file mode 100644
index 4e01c2ac0a1..00000000000
--- a/htdocs/includes/mike42/escpos-php/doc/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-html: escpos.doxyfile
-	# Compile
-	doxygen escpos.doxyfile
-	# Filter out warnings on README.md- doxygen cannot handle image links that
-	# are used there: [![Caption](https://example.com/target)](https://example.com/image)
-	sed -i '/README.md\:/d' warnings.log
-	# Show warnings log
-	cat warnings.log
-	# Return failure if there were any doc warnings
-	[ ! -s warnings.log ]
-
-latex: html
-	# Do nothing
-
-xml: html
-	xsltproc xml/combine.xslt xml/index.xml > all.xml
-
-clean:
-	rm --preserve-root -Rf html latex xml doxygen_sqlite3.db all.xml warnings.log
-
diff --git a/htdocs/includes/mike42/escpos-php/doc/escpos.doxyfile b/htdocs/includes/mike42/escpos-php/doc/escpos.doxyfile
deleted file mode 100644
index 0c48656e15b..00000000000
--- a/htdocs/includes/mike42/escpos-php/doc/escpos.doxyfile
+++ /dev/null
@@ -1,2352 +0,0 @@
-# Doxyfile 1.8.8
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a double hash (##) is considered a comment and is placed in
-# front of the TAG it is preceding.
-#
-# All text after a single hash (#) is considered a comment and will be ignored.
-# The format is:
-# TAG = value [value, ...]
-# For lists, items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (\" \").
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all text
-# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
-# for the list of possible encodings.
-# The default value is: UTF-8.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
-# double-quotes, unless you are using Doxywizard) that should identify the
-# project for which the documentation is generated. This name is used in the
-# title of most generated pages and in a few other places.
-# The default value is: My Project.
-
-PROJECT_NAME           = "escpos-php"
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
-# could be handy for archiving the generated documentation or if some version
-# control system is used.
-
-PROJECT_NUMBER         =
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer a
-# quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF          =
-
-# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
-# the documentation. The maximum height of the logo should not exceed 55 pixels
-# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
-# to the output directory.
-
-PROJECT_LOGO           = ../example/resources/escpos-php-small.png
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
-# into which the generated documentation will be written. If a relative path is
-# entered, it will be relative to the location where doxygen was started. If
-# left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       =
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
-# option can be useful when feeding doxygen a huge amount of source files, where
-# putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
-# The default value is: NO.
-
-CREATE_SUBDIRS         = NO
-
-# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
-# characters to appear in the names of generated files. If set to NO, non-ASCII
-# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
-# U+3044.
-# The default value is: NO.
-
-ALLOW_UNICODE_NAMES    = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
-# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
-# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
-# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
-# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
-# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
-# Ukrainian and Vietnamese.
-# The default value is: English.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
-# descriptions after the members that are listed in the file and class
-# documentation (similar to Javadoc). Set to NO to disable this.
-# The default value is: YES.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
-# description of a member or function before the detailed description
-#
-# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-# The default value is: YES.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator that is
-# used to form the text in various listings. Each string in this list, if found
-# as the leading text of the brief description, will be stripped from the text
-# and the result, after processing the whole list, is used as the annotated
-# text. Otherwise, the brief description is used as-is. If left blank, the
-# following values are used ($name is automatically replaced with the name of
-# the entity):The $name class, The $name widget, The $name file, is, provides,
-# specifies, contains, represents, a, an and the.
-
-ABBREVIATE_BRIEF       =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# doxygen will generate a detailed section even if there is only a brief
-# description.
-# The default value is: NO.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-# The default value is: NO.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
-# before files name in the file list and in the header files. If set to NO the
-# shortest path that makes the file name unique will be used
-# The default value is: YES.
-
-FULL_PATH_NAMES        = YES
-
-# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
-# Stripping is only done if one of the specified strings matches the left-hand
-# part of the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the path to
-# strip.
-#
-# Note that you can specify absolute paths here, but also relative paths, which
-# will be relative from the directory where doxygen is started.
-# This tag requires that the tag FULL_PATH_NAMES is set to YES.
-
-STRIP_FROM_PATH        =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
-# path mentioned in the documentation of a class, which tells the reader which
-# header file to include in order to use a class. If left blank only the name of
-# the header file containing the class definition is used. Otherwise one should
-# specify the list of include paths that are normally passed to the compiler
-# using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
-# less readable) file names. This can be useful is your file systems doesn't
-# support long names like on DOS, Mac, or CD-ROM.
-# The default value is: NO.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
-# first line (until the first dot) of a Javadoc-style comment as the brief
-# description. If set to NO, the Javadoc-style will behave just like regular Qt-
-# style comments (thus requiring an explicit @brief command for a brief
-# description.)
-# The default value is: NO.
-
-JAVADOC_AUTOBRIEF      = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
-# line (until the first dot) of a Qt-style comment as the brief description. If
-# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
-# requiring an explicit \brief command for a brief description.)
-# The default value is: NO.
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
-# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
-# a brief description. This used to be the default behavior. The new default is
-# to treat a multi-line C++ comment block as a detailed description. Set this
-# tag to YES if you prefer the old behavior instead.
-#
-# Note that setting this tag to YES also means that rational rose comments are
-# not recognized any more.
-# The default value is: NO.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
-# documentation from any documented member that it re-implements.
-# The default value is: YES.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
-# new page for each member. If set to NO, the documentation of a member will be
-# part of the file/class/namespace that contains it.
-# The default value is: NO.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
-# uses this value to replace tabs by spaces in code fragments.
-# Minimum value: 1, maximum value: 16, default value: 4.
-
-TAB_SIZE               = 4
-
-# This tag can be used to specify a number of aliases that act as commands in
-# the documentation. An alias has the form:
-# name=value
-# For example adding
-# "sideeffect=@par Side Effects:\n"
-# will allow you to put the command \sideeffect (or @sideeffect) in the
-# documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines.
-
-ALIASES                =
-
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C. For
-# instance, some of the names that are used will be different. The list of all
-# members will be omitted, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
-# Python sources only. Doxygen will then generate output that is more tailored
-# for that language. For instance, namespaces will be presented as packages,
-# qualified scopes will look different, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources. Doxygen will then generate output that is tailored for Fortran.
-# The default value is: NO.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for VHDL.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given
-# extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
-# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
-# Fortran. In the later case the parser tries to guess whether the code is fixed
-# or free formatted code, this is the default for Fortran type files), VHDL. For
-# instance to make doxygen treat .inc files as Fortran files (default is PHP),
-# and .f files as C (default is Fortran), use: inc=Fortran f=C.
-#
-# Note For files without extension you can use no_extension as a placeholder.
-#
-# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen.
-
-EXTENSION_MAPPING      =
-
-# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
-# according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you can
-# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
-# case of backward compatibilities issues.
-# The default value is: YES.
-
-MARKDOWN_SUPPORT       = YES
-
-# When enabled doxygen tries to link words that correspond to documented
-# classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by by putting a % sign in front of the word
-# or globally by setting AUTOLINK_SUPPORT to NO.
-# The default value is: YES.
-
-AUTOLINK_SUPPORT       = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should set this
-# tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string);
-# versus func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-# The default value is: NO.
-
-BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-# The default value is: NO.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
-# will parse them like normal C++ but will assume all classes use public instead
-# of private inheritance when no explicit protection keyword is present.
-# The default value is: NO.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES will make
-# doxygen to replace the get and set methods by a property in the documentation.
-# This will only work if the methods are indeed getting or setting a simple
-# type. If this is not the case, or you want to show the methods anyway, you
-# should set this option to NO.
-# The default value is: YES.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-# The default value is: NO.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# Set the SUBGROUPING tag to YES to allow class member groups of the same type
-# (for instance a group of public functions) to be put as a subgroup of that
-# type (e.g. under the Public Functions section). Set it to NO to prevent
-# subgrouping. Alternatively, this can be done per class using the
-# \nosubgrouping command.
-# The default value is: YES.
-
-SUBGROUPING            = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
-# are shown inside the group in which they are included (e.g. using \ingroup)
-# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
-# and RTF).
-#
-# Note that this feature does not work in combination with
-# SEPARATE_MEMBER_PAGES.
-# The default value is: NO.
-
-INLINE_GROUPED_CLASSES = NO
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
-# with only public data fields or simple typedef fields will be shown inline in
-# the documentation of the scope in which they are defined (i.e. file,
-# namespace, or group documentation), provided this scope is documented. If set
-# to NO, structs, classes, and unions are shown on a separate page (for HTML and
-# Man pages) or section (for LaTeX and RTF).
-# The default value is: NO.
-
-INLINE_SIMPLE_STRUCTS  = NO
-
-# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
-# enum is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically be
-# useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-# The default value is: NO.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
-# cache is used to resolve symbols given their name and scope. Since this can be
-# an expensive process and often the same symbol appears multiple times in the
-# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
-# doxygen will become slower. If the cache is too large, memory is wasted. The
-# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
-# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
-# symbols. At the end of a run doxygen will report the cache usage and suggest
-# the optimal cache size from a speed point of view.
-# Minimum value: 0, maximum value: 9, default value: 0.
-
-LOOKUP_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available. Private
-# class members and static file members will be hidden unless the
-# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
-# Note: This will also disable the warnings about undocumented members that are
-# normally produced when WARNINGS is set to YES.
-# The default value is: NO.
-
-EXTRACT_ALL            = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
-# be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
-# scope will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PACKAGE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file will be
-# included in the documentation.
-# The default value is: NO.
-
-EXTRACT_STATIC         = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
-# locally in source files will be included in the documentation. If set to NO
-# only classes defined in header files are included. Does not have any effect
-# for Java sources.
-# The default value is: YES.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local methods,
-# which are defined in the implementation section but not in the interface are
-# included in the documentation. If set to NO only methods in the interface are
-# included.
-# The default value is: NO.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base name of
-# the file that contains the anonymous namespace. By default anonymous namespace
-# are hidden.
-# The default value is: NO.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
-# undocumented members inside documented classes or files. If set to NO these
-# members will be included in the various overviews, but no documentation
-# section is generated. This option has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy. If set
-# to NO these classes will be included in the various overviews. This option has
-# no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO these declarations will be
-# included in the documentation.
-# The default value is: NO.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
-# documentation blocks found inside the body of a function. If set to NO these
-# blocks will be appended to the function's detailed documentation block.
-# The default value is: NO.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation that is typed after a
-# \internal command is included. If the tag is set to NO then the documentation
-# will be excluded. Set it to YES to include the internal documentation.
-# The default value is: NO.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-# The default value is: system dependent.
-
-CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
-# their full class and namespace scopes in the documentation. If set to YES the
-# scope will be hidden.
-# The default value is: NO.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
-# the files that are included by a file in the documentation of that file.
-# The default value is: YES.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
-# grouped member an include statement to the documentation, telling the reader
-# which file to include in order to use the member.
-# The default value is: NO.
-
-SHOW_GROUPED_MEMB_INC  = NO
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
-# files with double quotes in the documentation rather than with sharp brackets.
-# The default value is: NO.
-
-FORCE_LOCAL_INCLUDES   = NO
-
-# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
-# documentation for inline members.
-# The default value is: YES.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
-# (detailed) documentation of file and class members alphabetically by member
-# name. If set to NO the members will appear in declaration order.
-# The default value is: YES.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
-# descriptions of file, namespace and class members alphabetically by member
-# name. If set to NO the members will appear in declaration order. Note that
-# this will also influence the order of the classes in the class list.
-# The default value is: NO.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
-# (brief and detailed) documentation of class members so that constructors and
-# destructors are listed first. If set to NO the constructors will appear in the
-# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
-# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
-# member documentation.
-# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
-# detailed member documentation.
-# The default value is: NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
-# of group names into alphabetical order. If set to NO the group names will
-# appear in their defined order.
-# The default value is: NO.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
-# fully-qualified names, including namespaces. If set to NO, the class list will
-# be sorted only by class name, not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the alphabetical
-# list.
-# The default value is: NO.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
-# type resolution of all parameters of a function it will reject a match between
-# the prototype and the implementation of a member function even if there is
-# only one candidate or it is obvious which candidate to choose by doing a
-# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
-# accept a match between prototype and implementation in such cases.
-# The default value is: NO.
-
-STRICT_PROTO_MATCHING  = NO
-
-# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the
-# todo list. This list is created by putting \todo commands in the
-# documentation.
-# The default value is: YES.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the
-# test list. This list is created by putting \test commands in the
-# documentation.
-# The default value is: YES.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug
-# list. This list is created by putting \bug commands in the documentation.
-# The default value is: YES.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO)
-# the deprecated list. This list is created by putting \deprecated commands in
-# the documentation.
-# The default value is: YES.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional documentation
-# sections, marked by \if <section_label> ... \endif and \cond <section_label>
-# ... \endcond blocks.
-
-ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
-# initial value of a variable or macro / define can have for it to appear in the
-# documentation. If the initializer consists of more lines than specified here
-# it will be hidden. Use a value of 0 to hide initializers completely. The
-# appearance of the value of individual variables and macros / defines can be
-# controlled using \showinitializer or \hideinitializer command in the
-# documentation regardless of this setting.
-# Minimum value: 0, maximum value: 10000, default value: 30.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
-# the bottom of the documentation of classes and structs. If set to YES the list
-# will mention the files that were used to generate the documentation.
-# The default value is: YES.
-
-SHOW_USED_FILES        = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
-# will remove the Files entry from the Quick Index and from the Folder Tree View
-# (if specified).
-# The default value is: YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
-# page. This will remove the Namespaces entry from the Quick Index and from the
-# Folder Tree View (if specified).
-# The default value is: YES.
-
-SHOW_NAMESPACES        = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command command input-file, where command is the value of the
-# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
-# by doxygen. Whatever the program writes to standard output is used as the file
-# version. For an example see the documentation.
-
-FILE_VERSION_FILTER    =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option. You can
-# optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
-#
-# Note that if you run doxygen from a directory containing a file called
-# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
-# tag is left empty.
-
-LAYOUT_FILE            =
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
-# the reference definitions. This must be a list of .bib files. The .bib
-# extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
-# For LaTeX the style of the bibliography can be controlled using
-# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
-# search path. See also \cite for info how to create references.
-
-CITE_BIB_FILES         =
-
-#---------------------------------------------------------------------------
-# Configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated to
-# standard output by doxygen. If QUIET is set to YES this implies that the
-# messages are off.
-# The default value is: NO.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
-# this implies that the warnings are on.
-#
-# Tip: Turn warnings on while writing the documentation.
-# The default value is: YES.
-
-WARNINGS               = YES
-
-# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate
-# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
-# will automatically be disabled.
-# The default value is: YES.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
-# The default value is: YES.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
-# are documented, but have no documentation for their parameters or return
-# value. If set to NO doxygen will only warn about wrong or incomplete parameter
-# documentation, but not about the absence of documentation.
-# The default value is: NO.
-
-WARN_NO_PARAMDOC       = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that doxygen
-# can produce. The string should contain the $file, $line, and $text tags, which
-# will be replaced by the file and line number from which the warning originated
-# and the warning text. Optionally the format may contain $version, which will
-# be replaced by the version of the file (if it could be obtained via
-# FILE_VERSION_FILTER)
-# The default value is: $file:$line: $text.
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning and error
-# messages should be written. If left blank the output is written to standard
-# error (stderr).
-
-WARN_LOGFILE           = warnings.log
-
-#---------------------------------------------------------------------------
-# Configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag is used to specify the files and/or directories that contain
-# documented source files. You may enter file names like myfile.cpp or
-# directories like /usr/src/myproject. Separate the files or directories with
-# spaces.
-# Note: If this tag is empty the current directory is searched.
-
-INPUT                  = ../src ../README.md ./
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
-# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: http://www.gnu.org/software/libiconv) for the list of
-# possible encodings.
-# The default value is: UTF-8.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank the
-# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
-# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
-# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
-# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
-# *.qsf, *.as and *.js.
-
-FILE_PATTERNS          = *.php *.md
-
-# The RECURSIVE tag can be used to specify whether or not subdirectories should
-# be searched for input files as well.
-# The default value is: NO.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-#
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE                =
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-# The default value is: NO.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       =
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
-
-EXCLUDE_SYMBOLS        =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or directories
-# that contain example code fragments that are included (see the \include
-# command).
-
-EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank all
-# files are included.
-
-EXAMPLE_PATTERNS       =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude commands
-# irrespective of the value of the RECURSIVE tag.
-# The default value is: NO.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or directories
-# that contain images that are to be included in the documentation (see the
-# \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command:
-#
-# <filter> <input-file>
-#
-# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
-# name of an input file. Doxygen will then use the output that the filter
-# program writes to standard output. If FILTER_PATTERNS is specified, this tag
-# will be ignored.
-#
-# Note that the filter must not add or remove lines; it is applied before the
-# code is scanned, but not when the output code is generated. If lines are added
-# or removed, the anchors will not be placed correctly.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form: pattern=filter
-# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
-# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
-# patterns match the file name, INPUT_FILTER is applied.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER ) will also be used to filter the input files that are used for
-# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
-# The default value is: NO.
-
-FILTER_SOURCE_FILES    = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
-# it is also possible to disable source filtering for a specific pattern using
-# *.ext= (so without naming a filter).
-# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
-
-FILTER_SOURCE_PATTERNS =
-
-# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
-# is part of the input, its contents will be placed on the main page
-# (index.html). This can be useful if you have a project on for instance GitHub
-# and want to reuse the introduction page also for the doxygen output.
-
-USE_MDFILE_AS_MAINPAGE = ../README.md
-
-#---------------------------------------------------------------------------
-# Configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
-# generated. Documented entities will be cross-referenced with these sources.
-#
-# Note: To get rid of all source code in the generated output, make sure that
-# also VERBATIM_HEADERS is set to NO.
-# The default value is: NO.
-
-SOURCE_BROWSER         = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
-# The default value is: NO.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
-# special comment blocks from generated source code fragments. Normal C, C++ and
-# Fortran comments will always remain visible.
-# The default value is: YES.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
-# The default value is: NO.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES then for each documented function
-# all documented entities called/used by that function will be listed.
-# The default value is: NO.
-
-REFERENCES_RELATION    = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
-# to YES, then the hyperlinks from functions in REFERENCES_RELATION and
-# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
-# link to the documentation.
-# The default value is: YES.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
-# source code will show a tooltip with additional information such as prototype,
-# brief description and links to the definition and documentation. Since this
-# will make the HTML file larger and loading of large files a bit slower, you
-# can opt to disable this feature.
-# The default value is: YES.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-SOURCE_TOOLTIPS        = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code will
-# point to the HTML generated by the htags(1) tool instead of doxygen built-in
-# source browser. The htags tool is part of GNU's global source tagging system
-# (see http://www.gnu.org/software/global/global.html). You will need version
-# 4.8.6 or higher.
-#
-# To use it do the following:
-# - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
-# - Make sure the INPUT points to the root of the source tree
-# - Run doxygen as normal
-#
-# Doxygen will invoke htags (and that will in turn invoke gtags), so these
-# tools must be available from the command line (i.e. in the search path).
-#
-# The result: instead of the source browser generated by doxygen, the links to
-# source code will now point to the output of htags.
-# The default value is: NO.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
-# verbatim copy of the header file for each class for which an include is
-# specified. Set to NO to disable this.
-# See also: Section \class.
-# The default value is: YES.
-
-VERBATIM_HEADERS       = YES
-
-# If the CLANG_ASSISTED_PARSING tag is set to YES, then doxygen will use the
-# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
-# cost of reduced performance. This can be particularly helpful with template
-# rich C++ code for which doxygen's built-in parser lacks the necessary type
-# information.
-# Note: The availability of this option depends on whether or not doxygen was
-# compiled with the --with-libclang option.
-# The default value is: NO.
-
-CLANG_ASSISTED_PARSING = NO
-
-# If clang assisted parsing is enabled you can provide the compiler with command
-# line options that you would normally use when invoking the compiler. Note that
-# the include paths will already be set by doxygen for the files and directories
-# specified with INPUT and INCLUDE_PATH.
-# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
-
-CLANG_OPTIONS          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
-# compounds will be generated. Enable this if the project contains a lot of
-# classes, structs, unions or interfaces.
-# The default value is: YES.
-
-ALPHABETICAL_INDEX     = YES
-
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output
-# The default value is: YES.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
-# generated HTML page (for example: .htm, .php, .asp).
-# The default value is: .html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
-# each generated HTML page. If the tag is left blank doxygen will generate a
-# standard header.
-#
-# To get valid HTML the header file that includes any scripts and style sheets
-# that doxygen needs, which is dependent on the configuration options used (e.g.
-# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
-# default header using
-# doxygen -w html new_header.html new_footer.html new_stylesheet.css
-# YourConfigFile
-# and then modify the file new_header.html. See also section "Doxygen usage"
-# for information on how to generate the default header that doxygen normally
-# uses.
-# Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of doxygen. For a description
-# of the possible markers and block names see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_HEADER            =
-
-# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
-# generated HTML page. If the tag is left blank doxygen will generate a standard
-# footer. See HTML_HEADER for more information on how to generate a default
-# footer and what special commands can be used inside the footer. See also
-# section "Doxygen usage" for information on how to generate the default footer
-# that doxygen normally uses.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FOOTER            =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
-# sheet that is used by each HTML page. It can be used to fine-tune the look of
-# the HTML output. If left blank doxygen will generate a default style sheet.
-# See also section "Doxygen usage" for information on how to generate the style
-# sheet that doxygen normally uses.
-# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
-# it is more robust and this tag (HTML_STYLESHEET) will in the future become
-# obsolete.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_STYLESHEET        =
-
-# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# cascading style sheets that are included after the standard style sheets
-# created by doxygen. Using this option one can overrule certain style aspects.
-# This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefor more robust against future updates.
-# Doxygen will copy the style sheet files to the output directory.
-# Note: The order of the extra stylesheet files is of importance (e.g. the last
-# stylesheet in the list overrules the setting of the previous ones in the
-# list). For an example see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_STYLESHEET  =
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
-# files will be copied as-is; there are no commands or markers available.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_FILES       =
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
-# will adjust the colors in the stylesheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
-# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
-# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
-# purple, and 360 is red again.
-# Minimum value: 0, maximum value: 359, default value: 220.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_HUE    = 220
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
-# value of 255 will produce the most vivid colors.
-# Minimum value: 0, maximum value: 255, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_SAT    = 100
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
-# luminance component of the colors in the HTML output. Values below 100
-# gradually make the output lighter, whereas values above 100 make the output
-# darker. The value divided by 100 is the actual gamma applied, so 80 represents
-# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
-# change the gamma.
-# Minimum value: 40, maximum value: 240, default value: 80.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_GAMMA  = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_SECTIONS  = NO
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
-# shown in the various tree structured indices initially; the user can expand
-# and collapse entries dynamically later on. Doxygen will expand the tree to
-# such a level that at most the specified number of entries are visible (unless
-# a fully collapsed tree already exceeds this amount). So setting the number of
-# entries 1 will produce a full collapsed tree by default. 0 is a special value
-# representing an infinite number of entries and will result in a full expanded
-# tree by default.
-# Minimum value: 0, maximum value: 9999, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files will be
-# generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: http://developer.apple.com/tools/xcode/), introduced with
-# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
-# Makefile in the HTML output directory. Running make will produce the docset in
-# that directory and running make install will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_DOCSET        = NO
-
-# This tag determines the name of the docset feed. A documentation feed provides
-# an umbrella under which multiple documentation sets from a single provider
-# (such as a company or product suite) can be grouped.
-# The default value is: Doxygen generated docs.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# This tag specifies a string that should uniquely identify the documentation
-# set bundle. This should be a reverse domain-name style string, e.g.
-# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
-# the documentation publisher. This should be a reverse domain-name style
-# string, e.g. com.mycompany.MyDocSet.documentation.
-# The default value is: org.doxygen.Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-
-# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
-# The default value is: Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_NAME  = Publisher
-
-# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
-# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
-# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
-# Windows.
-#
-# The HTML Help Workshop contains a compiler that can convert all HTML output
-# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
-# files are now used as the Windows 98 help format, and will replace the old
-# Windows help format (.hlp) on all Windows platforms in the future. Compressed
-# HTML files also contain an index, a table of contents, and you can search for
-# words in the documentation. The HTML workshop also contains a viewer for
-# compressed HTML files.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_HTMLHELP      = NO
-
-# The CHM_FILE tag can be used to specify the file name of the resulting .chm
-# file. You can add a path in front of the file if the result should not be
-# written to the html output directory.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_FILE               =
-
-# The HHC_LOCATION tag can be used to specify the location (absolute path
-# including file name) of the HTML help compiler ( hhc.exe). If non-empty
-# doxygen will try to run the HTML help compiler on the generated index.hhp.
-# The file has to be specified with full path.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-HHC_LOCATION           =
-
-# The GENERATE_CHI flag controls if a separate .chi index file is generated (
-# YES) or that it should be included in the master .chm file ( NO).
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-GENERATE_CHI           = NO
-
-# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc)
-# and project file content.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_INDEX_ENCODING     =
-
-# The BINARY_TOC flag controls whether a binary table of contents is generated (
-# YES) or a normal table of contents ( NO) in the .chm file. Furthermore it
-# enables the Previous and Next buttons.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members to
-# the table of contents of the HTML help documentation and to the tree view.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
-# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
-# (.qch) of the generated HTML documentation.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
-# the file name of the resulting .qch file. The path specified is relative to
-# the HTML output folder.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QCH_FILE               =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
-# Project output. For more information please see Qt Help Project / Namespace
-# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_NAMESPACE          = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
-# Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
-# folders).
-# The default value is: doc.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
-# filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_NAME   =
-
-# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_ATTRS  =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_SECT_FILTER_ATTRS  =
-
-# The QHG_LOCATION tag can be used to specify the location of Qt's
-# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
-# generated .qhp file.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHG_LOCATION           =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
-# generated, together with the HTML files, they form an Eclipse help plugin. To
-# install this plugin and make it available under the help contents menu in
-# Eclipse, the contents of the directory containing the HTML and XML files needs
-# to be copied into the plugins directory of eclipse. The name of the directory
-# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
-# After copying Eclipse needs to be restarted before the help appears.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the Eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have this
-# name. Each documentation set should have its own identifier.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
-
-ECLIPSE_DOC_ID         = org.doxygen.Project
-
-# If you want full control over the layout of the generated HTML pages it might
-# be necessary to disable the index and replace it with your own. The
-# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
-# of each HTML page. A value of NO enables the index and the value YES disables
-# it. Since the tabs in the index contain the same information as the navigation
-# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-DISABLE_INDEX          = NO
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information. If the tag
-# value is set to YES, a side panel will be generated containing a tree-like
-# index structure (just like the one that is generated for HTML Help). For this
-# to work a browser that supports JavaScript, DHTML, CSS and frames is required
-# (i.e. any modern browser). Windows users are probably better off using the
-# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_TREEVIEW      = NO
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
-# doxygen will group on one line in the generated HTML documentation.
-#
-# Note that a value of 0 will completely suppress the enum values from appearing
-# in the overview section.
-# Minimum value: 0, maximum value: 20, default value: 4.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
-# to set the initial width (in pixels) of the frame in which the tree is shown.
-# Minimum value: 0, maximum value: 1500, default value: 250.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-TREEVIEW_WIDTH         = 250
-
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to
-# external symbols imported via tag files in a separate window.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-EXT_LINKS_IN_WINDOW    = NO
-
-# Use this tag to change the font size of LaTeX formulas included as images in
-# the HTML documentation. When you change the font size after a successful
-# doxygen run you need to manually remove any form_*.png images from the HTML
-# output directory to force them to be regenerated.
-# Minimum value: 8, maximum value: 50, default value: 10.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_FONTSIZE       = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_TRANSPARENT    = YES
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
-# instead of using prerendered bitmaps. Use this if you do not have LaTeX
-# installed or if you want to formulas look prettier in the HTML output. When
-# enabled you may also need to install MathJax separately and configure the path
-# to it using the MATHJAX_RELPATH option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-USE_MATHJAX            = NO
-
-# When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/latest/output.html) for more details.
-# Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
-# The default value is: HTML-CSS.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_FORMAT         = HTML-CSS
-
-# When MathJax is enabled you need to specify the location relative to the HTML
-# output directory using the MATHJAX_RELPATH option. The destination directory
-# should contain the MathJax.js script. For instance, if the mathjax directory
-# is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
-# Content Delivery Network so you can quickly see the result without installing
-# MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from http://www.mathjax.org before deployment.
-# The default value is: http://cdn.mathjax.org/mathjax/latest.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
-# extension names that should be enabled during MathJax rendering. For example
-# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_EXTENSIONS     =
-
-# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
-# of code that will be used on startup of the MathJax code. See the MathJax site
-# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
-# example see the documentation.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_CODEFILE       =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
-# the HTML output. The underlying search engine uses javascript and DHTML and
-# should work on any modern browser. Note that when using HTML help
-# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
-# there is already a search function so this one should typically be disabled.
-# For large projects the javascript based search engine can be slow, then
-# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
-# search using the keyboard; to jump to the search box use <access key> + S
-# (what the <access key> is depends on the OS and browser, but it is typically
-# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
-# key> to jump into the search results window, the results can be navigated
-# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
-# the search. The filter options can be selected when the cursor is inside the
-# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
-# to select a filter and <Enter> or <escape> to activate or cancel the filter
-# option.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-SEARCHENGINE           = YES
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
-# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
-# setting. When disabled, doxygen will generate a PHP script for searching and
-# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
-# and searching needs to be provided by external tools. See the section
-# "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SERVER_BASED_SEARCH    = NO
-
-# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
-# script for searching. Instead the search results are written to an XML file
-# which needs to be processed by an external indexer. Doxygen will invoke an
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
-# search results.
-#
-# Doxygen ships with an example indexer ( doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/).
-#
-# See the section "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH        = NO
-
-# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-# which will return the search results when EXTERNAL_SEARCH is enabled.
-#
-# Doxygen ships with an example indexer ( doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/). See the section "External Indexing and
-# Searching" for details.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHENGINE_URL       =
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-# search data is written to a file for indexing by an external tool. With the
-# SEARCHDATA_FILE tag the name of this file can be specified.
-# The default file is: searchdata.xml.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHDATA_FILE        = searchdata.xml
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
-# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-# projects and redirect the results back to the right project.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH_ID     =
-
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-# projects other than the one defined by this configuration file, but that are
-# all added to the same external search index. Each project needs to have a
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
-# to a relative location where the documentation can be found. The format is:
-# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTRA_SEARCH_MAPPINGS  =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
-# The default value is: YES.
-
-GENERATE_LATEX         = YES
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked.
-#
-# Note that when enabling USE_PDFLATEX this option is only used for generating
-# bitmaps for formulas in the HTML output, but not in the Makefile that is
-# written to the output directory.
-# The default file is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
-# index for LaTeX.
-# The default file is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used by the
-# printer.
-# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
-# 14 inches) and executive (7.25 x 10.5 inches).
-# The default value is: a4.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PAPER_TYPE             = a4
-
-# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. To get the times font for
-# instance you can specify
-# EXTRA_PACKAGES=times
-# If left blank no extra packages will be included.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
-#
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empy string,
-# for the replacement values of the other commands the user is refered to
-# HTML_HEADER.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HEADER           =
-
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
-# LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_FOOTER           =
-
-# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the LATEX_OUTPUT output
-# directory. Note that the files will be copied as-is; there are no commands or
-# markers available.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_FILES      =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
-# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
-# contain links (just like the HTML output) instead of page references. This
-# makes the output suitable for online browsing using a PDF viewer.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PDF_HYPERLINKS         = YES
-
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES to get a
-# higher quality PDF documentation.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-USE_PDFLATEX           = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BATCHMODE        = NO
-
-# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
-# index chapters (such as File Index, Compound Index, etc.) in the output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HIDE_INDICES     = NO
-
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. See
-# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
-# The default value is: plain.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BIB_STYLE        = plain
-
-#---------------------------------------------------------------------------
-# Configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The
-# RTF output is optimized for Word 97 and may not look too pretty with other RTF
-# readers/editors.
-# The default value is: NO.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: rtf.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
-# contain hyperlink fields. The RTF file will contain links (just like the HTML
-# output) instead of page references. This makes the output suitable for online
-# browsing using Word or some other Word compatible readers that support those
-# fields.
-#
-# Note: WordPad (write) and others do not support links.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's config
-# file, i.e. a series of assignments. You only have to provide replacements,
-# missing definitions are set to their default value.
-#
-# See also section "Doxygen usage" for information on how to generate the
-# default style sheet that doxygen normally uses.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_EXTENSIONS_FILE    =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for
-# classes and files.
-# The default value is: NO.
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it. A directory man3 will be created inside the directory specified by
-# MAN_OUTPUT.
-# The default directory is: man.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to the generated
-# man pages. In case the manual section does not start with a number, the number
-# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
-# optional.
-# The default value is: .3.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_EXTENSION          = .3
-
-# The MAN_SUBDIR tag determines the name of the directory created within
-# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
-# MAN_EXTENSION with the initial . removed.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_SUBDIR             =
-
-# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
-# will generate one additional man file for each entity documented in the real
-# man page(s). These additional files only source the real man page, but without
-# them the man command would be unable to find the correct page.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that
-# captures the structure of the code including all documentation.
-# The default value is: NO.
-
-GENERATE_XML           = YES
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: xml.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_OUTPUT             = xml
-
-# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
-# listings (including syntax highlighting and cross-referencing information) to
-# the XML output. Note that enabling this will significantly increase the size
-# of the XML output.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the DOCBOOK output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files
-# that can be used to generate PDF.
-# The default value is: NO.
-
-GENERATE_DOCBOOK       = NO
-
-# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
-# front of it.
-# The default directory is: docbook.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_OUTPUT         = docbook
-
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
-#---------------------------------------------------------------------------
-# Configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen
-# Definitions (see http://autogen.sf.net) file that captures the structure of
-# the code including all documentation. Note that this feature is still
-# experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module
-# file that captures the structure of the code including all documentation.
-#
-# Note that this feature is still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary
-# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
-# output from the Perl module output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely
-# formatted so it can be parsed by a human reader. This is useful if you want to
-# understand what is going on. On the other hand, if this tag is set to NO the
-# size of the Perl module output will be much smaller and Perl will parse it
-# just the same.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file are
-# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
-# so different doxyrules.make files included by the same Makefile don't
-# overwrite each other's variables.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all
-# C-preprocessor directives found in the sources and include files.
-# The default value is: YES.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names
-# in the source code. If set to NO only conditional compilation will be
-# performed. Macro expansion can be done in a controlled way by setting
-# EXPAND_ONLY_PREDEF to YES.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
-# the macro expansion is limited to the macros specified with the PREDEFINED and
-# EXPAND_AS_DEFINED tags.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES the includes files in the
-# INCLUDE_PATH will be searched if a #include is found.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by the
-# preprocessor.
-# This tag requires that the tag SEARCH_INCLUDES is set to YES.
-
-INCLUDE_PATH           =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will be
-# used.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that are
-# defined before the preprocessor is started (similar to the -D option of e.g.
-# gcc). The argument of the tag is a list of macros of the form: name or
-# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
-# is assumed. To prevent a macro definition from being undefined via #undef or
-# recursively expanded use the := operator instead of the = operator.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-PREDEFINED             =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
-# tag can be used to specify a list of macro names that should be expanded. The
-# macro definition that is found in the sources will be used. Use the PREDEFINED
-# tag if you want to use a different macro definition that overrules the
-# definition found in the source code.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all references to function-like macros that are alone on a line, have
-# an all uppercase name, and do not end with a semicolon. Such function macros
-# are typically used for boiler-plate code, and will confuse the parser if not
-# removed.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES tag can be used to specify one or more tag files. For each tag
-# file the location of the external documentation should be added. The format of
-# a tag file without this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where loc1 and loc2 can be relative or absolute paths or URLs. See the
-# section "Linking to external documentation" for more information about the use
-# of tag files.
-# Note: Each tag file must have a unique name (where the name does NOT include
-# the path). If a tag file is not located in the directory in which doxygen is
-# run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
-# tag file that is based on the input files it reads. See section "Linking to
-# external documentation" for more information about the usage of tag files.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES all external class will be listed in the
-# class index. If set to NO only the inherited external classes will be listed.
-# The default value is: NO.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in
-# the modules index. If set to NO, only the current project's groups will be
-# listed.
-# The default value is: YES.
-
-EXTERNAL_GROUPS        = YES
-
-# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in
-# the related pages index. If set to NO, only the current project's pages will
-# be listed.
-# The default value is: YES.
-
-EXTERNAL_PAGES         = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see:
-# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            =
-
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-
-DIA_PATH               =
-
-# If set to YES, the inheritance and collaboration graphs will hide inheritance
-# and usage relations if the target is undocumented or is not a class.
-# The default value is: YES.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
-# Bell Labs. The other options in this section have no effect if this option is
-# set to NO
-# The default value is: YES.
-
-HAVE_DOT               = YES
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
-# to run in parallel. When set to 0 doxygen will base this on the number of
-# processors available in the system. You can set it explicitly to a value
-# larger than 0 to get control over the balance between CPU load and processing
-# speed.
-# Minimum value: 0, maximum value: 32, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_NUM_THREADS        = 0
-
-# When you want a differently looking font in the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTNAME           = Helvetica
-
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTPATH           =
-
-# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
-# graph for each documented class showing the direct and indirect implementation
-# dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LOOK               = NO
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
-# class node. If there are many fields or methods and many nodes the graph may
-# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
-# number of items for each type to make the size more manageable. Set this to 0
-# for no limit. Note that the threshold may be exceeded by 50% before the limit
-# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
-# but if the number exceeds 15, the total amount of fields shown is limited to
-# 10.
-# Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LIMIT_NUM_FIELDS   = 10
-
-# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
-# collaboration graphs will show the relations between templates and their
-# instances.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
-# YES then doxygen will generate a graph for each documented file showing the
-# direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDE_GRAPH          = YES
-
-# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
-# set to YES then doxygen will generate a graph for each documented file showing
-# the direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALL_GRAPH             = NO
-
-# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
-# hierarchy of all classes instead of a textual one.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
-# dependencies a directory has on other directories in a graphical way. The
-# dependency relations are determined by the #include relations between the
-# files in the directories.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot.
-# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
-# to make the SVG files visible in IE 9+ (other browsers do not have this
-# requirement).
-# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
-# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
-# gif:cairo:gd, gif:gd, gif:gd:gd and svg.
-# The default value is: png.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_IMAGE_FORMAT       = png
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-#
-# Note that this requires a modern browser other than Internet Explorer. Tested
-# and working are Firefox, Chrome, Safari, and Opera.
-# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
-# the SVG files visible. Older versions of IE do not have SVG support.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INTERACTIVE_SVG        = NO
-
-# The DOT_PATH tag can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the \dotfile
-# command).
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOTFILE_DIRS           =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
-
-MSCFILE_DIRS           =
-
-# The DIAFILE_DIRS tag can be used to specify one or more directories that
-# contain dia files that are included in the documentation (see the \diafile
-# command).
-
-DIAFILE_DIRS           =
-
-# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
-# path where java can find the plantuml.jar file. If left blank, it is assumed
-# PlantUML is not used or called during a preprocessing step. Doxygen will
-# generate a warning when it encounters a \startuml command in this case and
-# will not generate output for the diagram.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-PLANTUML_JAR_PATH      =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
-# that will be shown in the graph. If the number of nodes in a graph becomes
-# larger than this value, doxygen will truncate the graph, which is visualized
-# by representing a node as a red box. Note that doxygen if the number of direct
-# children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
-# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-# Minimum value: 0, maximum value: 10000, default value: 50.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
-# generated by dot. A depth value of 3 means that only nodes reachable from the
-# root by following a path via at most 3 edges will be shown. Nodes that lay
-# further from the root node will be omitted. Note that setting this option to 1
-# or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-# Minimum value: 0, maximum value: 1000, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10) support
-# this, this feature is disabled by default.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
-# explaining the meaning of the various boxes and arrows in the dot generated
-# graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot
-# files that are used to generate the various graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_CLEANUP            = YES
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/docs/CONTRIBUTING.md b/htdocs/includes/mobiledetect/mobiledetectlib/docs/CONTRIBUTING.md
deleted file mode 100644
index 01a266ed83c..00000000000
--- a/htdocs/includes/mobiledetect/mobiledetectlib/docs/CONTRIBUTING.md
+++ /dev/null
@@ -1,48 +0,0 @@
-**Reporting issues**
-
-1. Specify the User-agent by visiting [http://demo.mobiledetect.net](http://demo.mobiledetect.net).
-1. Specify the expected behaviour.
-
-**Developing**
-
-1. Fork Mobile Detect repository. See ["How to fork"](https://help.github.com/articles/fork-a-repo/#fork-an-example-repository) example.
-1. `git clone https://github.com/[yourname]/Mobile-Detect.git`
-1. `git add remote serbanghita https://github.com/serbanghita/Mobile-Detect.git`
-1. `git remote -v` - You should see:
-    ```
-    origin       git@github.com:serbanghita/Mobile-Detect.git
-    serbanghita  https://github.com/serbanghita/Mobile-Detect.git
-    ```
-1. `git checkout -b devel origin/devel`
-1. `composer install`
-1. Start working on your changes.
-    1. If you add new methods or make structural changes to the `Mobile_Detect.php` class
-    you need to add unit tests!
-    1. If you add new regexes make sure you commit the User-Agents in [`tests/providers/vendors`](https://github.com/serbanghita/Mobile-Detect/tree/master/tests/providers/vendors)
-1. Run tests `vendor/bin/phpunit -v -c tests/phpunit.xml --coverage-text --strict-coverage --stop-on-risky`
-1. `git status` or `git diff` - inspect your changes
-1  `git stage .`
-1. `git commit -m "[your commit message here]`
-1. `git push origin devel`
-1. Go to your repo on GitHub and ["Submit the PR"](https://help.github.com/articles/about-pull-requests/)
-
-**New module, plugin, plugin or port**
-
-[Submit new module, plugin, port](../../issues/new?title=New%203rd%20party%20module&body=Name,%20Link%20and%20Description%20of%20the%20module.)
- including the following information:
-* Module name
-* Description
-* Link
-* Author
-
-Or you can submit a PR against `README.md`.
-
-**Website updates**
-
-1. Our official website is hosted at [http://mobiledetect.net](http://mobiledetect.net).
-1. The files are found on the `gh-pages` branch.
-1. `git checkout gh-pages`
-1. `npm install -g browser-sync`
-1. `browser-sync start --s . --f . --port 3000 --reload-debounce 1500 --no-ui`
-1. Go to `http://localhost:3000` and make changes.
-1. Commit, push and submit the PR against `serbanghita:gh-pages`.
\ No newline at end of file
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/docs/HISTORY.md b/htdocs/includes/mobiledetect/mobiledetectlib/docs/HISTORY.md
deleted file mode 100644
index 3483985258e..00000000000
--- a/htdocs/includes/mobiledetect/mobiledetectlib/docs/HISTORY.md
+++ /dev/null
@@ -1,11 +0,0 @@
-The first version of the script was developed in 2009 and it was hosted at https://code.google.com/p/php-mobile-detect/, it was a small project with around 30 stars. (Original blog post by Victor: http://victorstanciu.ro/detectarea-platformelor-mobile-in-php/)
-
-In December 2011 it received a major update from the first version, an important number of issues were fixed, then 2.0 was launched. The new version marks a new mindset and also featuring tablet detection.
-
-Throughout 2012 the script has been updated constantly and we have received tons of feedback and requests. 
-
-In July 2012 we moved the repository from Google Code to GitHub in order to quickly accommodate the frequent updates and to involve more people.
-
-In August 2013 the library has 1800+ stargazers and support for: composer, PHPUnit tests, PSR standards and a new webpage http://mobiledetect.net
-
-Mobile Detect library and user contributions are <a href="https://github.com/serbanghita/Mobile-Detect/blob/master/LICENSE.txt">MIT Licensed</a>.
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/docs/ISSUE_TEMPLATE.md b/htdocs/includes/mobiledetect/mobiledetectlib/docs/ISSUE_TEMPLATE.md
deleted file mode 100644
index 8d6384fce89..00000000000
--- a/htdocs/includes/mobiledetect/mobiledetectlib/docs/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,15 +0,0 @@
--------------delete this message-------------
-* By submitting a new issue I acknowledge that I already read the README, CODE EXAMPLES and KNOWN LIMITATIONS. 
-* I understand that the current version `2.x` is only meant to detect `mobile` devices.
-* Please post your User-Agent string! On a real device/s, the library is expected to work correctly.
--------------delete this message-------------
-
-
-
-**Issue description**
-
-
-**User-Agent(s)**
-
-
-**Suggestions**
\ No newline at end of file
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/docs/KNOWN_LIMITATIONS.md b/htdocs/includes/mobiledetect/mobiledetectlib/docs/KNOWN_LIMITATIONS.md
deleted file mode 100644
index 5887092f1f8..00000000000
--- a/htdocs/includes/mobiledetect/mobiledetectlib/docs/KNOWN_LIMITATIONS.md
+++ /dev/null
@@ -1,12 +0,0 @@
-**Known limitations**
-
-* Mobile Detect script was designed to detect `mobile` devices. Implicitly other devices are considered to be `desktop`.
-* User-Agent and HTTP headers sniffing is a non reliable method of detecting a mobile device.
-* If the mobile browser is set on `Desktop mode`, the Mobile Detect script has no way of knowing that the device is `mobile`.
-* Some touchscreen devices (eg. Microsoft Surface) are tough to detect as mobile since they can be used in a laptop mode. See: [#32](https://github.com/serbanghita/Mobile-Detect/issues/32), [#461](https://github.com/serbanghita/Mobile-Detect/issues/461), [#667](https://github.com/serbanghita/Mobile-Detect/issues/667)
-* Some mobile devices (eg. IPadOS, Google Pixel Slate). See: [#795](https://github.com/serbanghita/Mobile-Detect/issues/795), [#788](https://github.com/serbanghita/Mobile-Detect/issues/788)
-* Detecting the device brand (eg. Apple, Samsung, HTC) is not 100% reliable.
-* We don't monitor the quality of the 3rd party tools based on Mobile Detect script. 
-We cannot guarantee that they are using the class properly or if they provide the latest version.
-* Version `2.x` is made to be PHP 5.3 compatible because of the backward compatibility changes of PHP.
-* There are hundreds of devices launched every month, we cannot keep a 100% up to date detection rate.
\ No newline at end of file
diff --git a/htdocs/includes/nnnick/chartjs/.travis.yml b/htdocs/includes/nnnick/chartjs/.travis.yml
index beb8789b46b..6271892d310 100644
--- a/htdocs/includes/nnnick/chartjs/.travis.yml
+++ b/htdocs/includes/nnnick/chartjs/.travis.yml
@@ -1,6 +1,8 @@
 language: node_js
 node_js:
-  - lts/*
+# Using node 12.18.2 instead of lts
+# https://github.com/chartjs/Chart.js/issues/7863#issuecomment-705222874
+  - "12.18.2"
 
 before_install:
   - "export CHROME_BIN=/usr/bin/google-chrome"
diff --git a/htdocs/includes/nnnick/chartjs/composer.json b/htdocs/includes/nnnick/chartjs/composer.json
index 9df2b22fc50..b332bb0f595 100644
--- a/htdocs/includes/nnnick/chartjs/composer.json
+++ b/htdocs/includes/nnnick/chartjs/composer.json
@@ -1,25 +1,26 @@
 {
-	"name" : "nnnick/chartjs",
-	"type" : "library",
-	"description" : "Simple HTML5 charts using the canvas element.",
-	"keywords" : [
-		"chart",
-		"js"
-	],
-	"homepage" : "https://www.chartjs.org/",
-	"license" : "MIT",
-	"authors" : [{
-			"name" : "NICK DOWNIE",
-			"email" : "hello@nickdownie.com"
-		}
-	],
-	"require" : {
-		"php" : ">=5.3.3"
-	},
-	"minimum-stability" : "stable",
-	"extra" : {
-		"branch-alias" : {
-			"release/2.0" : "v2.0-dev"
-		}
-	}
-}
\ No newline at end of file
+    "name": "nnnick/chartjs",
+    "type": "library",
+    "description": "Simple HTML5 charts using the canvas element.",
+    "keywords": [
+        "chart",
+        "js"
+    ],
+    "homepage": "https://www.chartjs.org/",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "NICK DOWNIE",
+            "email": "hello@nickdownie.com"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.3"
+    },
+    "minimum-stability": "stable",
+    "extra": {
+        "branch-alias": {
+            "release/2.0": "v2.0-dev"
+        }
+    }
+}
diff --git a/htdocs/includes/nnnick/chartjs/dist/Chart.bundle.js b/htdocs/includes/nnnick/chartjs/dist/Chart.bundle.js
index 204156a8fc7..b5e956c38bf 100644
--- a/htdocs/includes/nnnick/chartjs/dist/Chart.bundle.js
+++ b/htdocs/includes/nnnick/chartjs/dist/Chart.bundle.js
@@ -1,7 +1,7 @@
 /*!
- * Chart.js v2.9.3
+ * Chart.js v2.9.4
  * https://www.chartjs.org
- * (c) 2019 Chart.js Contributors
+ * (c) 2020 Chart.js Contributors
  * Released under the MIT License
  */
 (function (global, factory) {
@@ -2107,6 +2107,10 @@ if (typeof window !== 'undefined') {
 
 var chartjsColor = Color;
 
+function isValidKey(key) {
+	return ['__proto__', 'prototype', 'constructor'].indexOf(key) === -1;
+}
+
 /**
  * @namespace Chart.helpers
  */
@@ -2282,7 +2286,7 @@ var helpers = {
 		}
 
 		if (helpers.isObject(source)) {
-			var target = {};
+			var target = Object.create(source);
 			var keys = Object.keys(source);
 			var klen = keys.length;
 			var k = 0;
@@ -2303,6 +2307,12 @@ var helpers = {
 	 * @private
 	 */
 	_merger: function(key, target, source, options) {
+		if (!isValidKey(key)) {
+			// We want to ensure we do not copy prototypes over
+			// as this can pollute global namespaces
+			return;
+		}
+
 		var tval = target[key];
 		var sval = source[key];
 
@@ -2318,6 +2328,12 @@ var helpers = {
 	 * @private
 	 */
 	_mergerIf: function(key, target, source) {
+		if (!isValidKey(key)) {
+			// We want to ensure we do not copy prototypes over
+			// as this can pollute global namespaces
+			return;
+		}
+
 		var tval = target[key];
 		var sval = source[key];
 
@@ -3816,7 +3832,7 @@ helpers$1.extend(DatasetController.prototype, {
 	 */
 	_configure: function() {
 		var me = this;
-		me._config = helpers$1.merge({}, [
+		me._config = helpers$1.merge(Object.create(null), [
 			me.chart.options.datasets[me._type],
 			me.getDataset(),
 		], {
@@ -7086,7 +7102,8 @@ function updateDims(chartArea, params, layout) {
 		chartArea.h = newHeight;
 
 		// return true if chart area changed in layout's direction
-		return layout.horizontal ? newWidth !== chartArea.w : newHeight !== chartArea.h;
+		var sizes = layout.horizontal ? [newWidth, chartArea.w] : [newHeight, chartArea.h];
+		return sizes[0] !== sizes[1] && (!isNaN(sizes[0]) || !isNaN(sizes[1]));
 	}
 }
 
@@ -8098,7 +8115,7 @@ var core_scaleService = {
 	},
 	getScaleDefaults: function(type) {
 		// Return the scale defaults merged with the global settings so that we always use the latest ones
-		return this.defaults.hasOwnProperty(type) ? helpers$1.merge({}, [core_defaults.scale, this.defaults[type]]) : {};
+		return this.defaults.hasOwnProperty(type) ? helpers$1.merge(Object.create(null), [core_defaults.scale, this.defaults[type]]) : {};
 	},
 	updateScaleDefaults: function(type, additions) {
 		var me = this;
@@ -9173,7 +9190,7 @@ core_defaults._set('global', {
  * returns a deep copy of the result, thus doesn't alter inputs.
  */
 function mergeScaleConfig(/* config objects ... */) {
-	return helpers$1.merge({}, [].slice.call(arguments), {
+	return helpers$1.merge(Object.create(null), [].slice.call(arguments), {
 		merger: function(key, target, source, options) {
 			if (key === 'xAxes' || key === 'yAxes') {
 				var slen = source[key].length;
@@ -9213,9 +9230,9 @@ function mergeScaleConfig(/* config objects ... */) {
  * a deep copy of the result, thus doesn't alter inputs.
  */
 function mergeConfig(/* config objects ... */) {
-	return helpers$1.merge({}, [].slice.call(arguments), {
+	return helpers$1.merge(Object.create(null), [].slice.call(arguments), {
 		merger: function(key, target, source, options) {
-			var tval = target[key] || {};
+			var tval = target[key] || Object.create(null);
 			var sval = source[key];
 
 			if (key === 'scales') {
@@ -9232,7 +9249,7 @@ function mergeConfig(/* config objects ... */) {
 }
 
 function initConfig(config) {
-	config = config || {};
+	config = config || Object.create(null);
 
 	// Do NOT use mergeConfig for the data object because this method merges arrays
 	// and so would change references to labels and datasets, preventing data updates.
@@ -11213,6 +11230,8 @@ function computeLabelSizes(ctx, tickFonts, ticks, caches) {
 	var widths = [];
 	var heights = [];
 	var offsets = [];
+	var widestLabelSize = 0;
+	var highestLabelSize = 0;
 	var i, j, jlen, label, tickFont, fontString, cache, lineHeight, width, height, nestedLabel, widest, highest;
 
 	for (i = 0; i < length; ++i) {
@@ -11240,11 +11259,13 @@ function computeLabelSizes(ctx, tickFonts, ticks, caches) {
 		widths.push(width);
 		heights.push(height);
 		offsets.push(lineHeight / 2);
+		widestLabelSize = Math.max(width, widestLabelSize);
+		highestLabelSize = Math.max(height, highestLabelSize);
 	}
 	garbageCollect(caches, length);
 
-	widest = widths.indexOf(Math.max.apply(null, widths));
-	highest = heights.indexOf(Math.max.apply(null, heights));
+	widest = widths.indexOf(widestLabelSize);
+	highest = heights.indexOf(highestLabelSize);
 
 	function valueAt(idx) {
 		return {
diff --git a/htdocs/includes/nnnick/chartjs/dist/Chart.bundle.min.js b/htdocs/includes/nnnick/chartjs/dist/Chart.bundle.min.js
index 55d9eb03f82..7134d267b67 100644
--- a/htdocs/includes/nnnick/chartjs/dist/Chart.bundle.min.js
+++ b/htdocs/includes/nnnick/chartjs/dist/Chart.bundle.min.js
@@ -1,7 +1,7 @@
 /*!
- * Chart.js v2.9.3
+ * Chart.js v2.9.4
  * https://www.chartjs.org
- * (c) 2019 Chart.js Contributors
+ * (c) 2020 Chart.js Contributors
  * Released under the MIT License
  */
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t=t||self).Chart=e()}(this,(function(){"use strict";"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self&&self;function t(){throw new Error("Dynamic requires are not currently supported by rollup-plugin-commonjs")}function e(t,e){return t(e={exports:{}},e.exports),e.exports}var n={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},i=e((function(t){var e={};for(var i in n)n.hasOwnProperty(i)&&(e[n[i]]=i);var a=t.exports={rgb:{channels:3,labels:"rgb"},hsl:{channels:3,labels:"hsl"},hsv:{channels:3,labels:"hsv"},hwb:{channels:3,labels:"hwb"},cmyk:{channels:4,labels:"cmyk"},xyz:{channels:3,labels:"xyz"},lab:{channels:3,labels:"lab"},lch:{channels:3,labels:"lch"},hex:{channels:1,labels:["hex"]},keyword:{channels:1,labels:["keyword"]},ansi16:{channels:1,labels:["ansi16"]},ansi256:{channels:1,labels:["ansi256"]},hcg:{channels:3,labels:["h","c","g"]},apple:{channels:3,labels:["r16","g16","b16"]},gray:{channels:1,labels:["gray"]}};for(var r in a)if(a.hasOwnProperty(r)){if(!("channels"in a[r]))throw new Error("missing channels property: "+r);if(!("labels"in a[r]))throw new Error("missing channel labels property: "+r);if(a[r].labels.length!==a[r].channels)throw new Error("channel and label counts mismatch: "+r);var o=a[r].channels,s=a[r].labels;delete a[r].channels,delete a[r].labels,Object.defineProperty(a[r],"channels",{value:o}),Object.defineProperty(a[r],"labels",{value:s})}a.rgb.hsl=function(t){var e,n,i=t[0]/255,a=t[1]/255,r=t[2]/255,o=Math.min(i,a,r),s=Math.max(i,a,r),l=s-o;return s===o?e=0:i===s?e=(a-r)/l:a===s?e=2+(r-i)/l:r===s&&(e=4+(i-a)/l),(e=Math.min(60*e,360))<0&&(e+=360),n=(o+s)/2,[e,100*(s===o?0:n<=.5?l/(s+o):l/(2-s-o)),100*n]},a.rgb.hsv=function(t){var e,n,i,a,r,o=t[0]/255,s=t[1]/255,l=t[2]/255,u=Math.max(o,s,l),d=u-Math.min(o,s,l),h=function(t){return(u-t)/6/d+.5};return 0===d?a=r=0:(r=d/u,e=h(o),n=h(s),i=h(l),o===u?a=i-n:s===u?a=1/3+e-i:l===u&&(a=2/3+n-e),a<0?a+=1:a>1&&(a-=1)),[360*a,100*r,100*u]},a.rgb.hwb=function(t){var e=t[0],n=t[1],i=t[2];return[a.rgb.hsl(t)[0],100*(1/255*Math.min(e,Math.min(n,i))),100*(i=1-1/255*Math.max(e,Math.max(n,i)))]},a.rgb.cmyk=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255;return[100*((1-n-(e=Math.min(1-n,1-i,1-a)))/(1-e)||0),100*((1-i-e)/(1-e)||0),100*((1-a-e)/(1-e)||0),100*e]},a.rgb.keyword=function(t){var i=e[t];if(i)return i;var a,r,o,s=1/0;for(var l in n)if(n.hasOwnProperty(l)){var u=n[l],d=(r=t,o=u,Math.pow(r[0]-o[0],2)+Math.pow(r[1]-o[1],2)+Math.pow(r[2]-o[2],2));d<s&&(s=d,a=l)}return a},a.keyword.rgb=function(t){return n[t]},a.rgb.xyz=function(t){var e=t[0]/255,n=t[1]/255,i=t[2]/255;return[100*(.4124*(e=e>.04045?Math.pow((e+.055)/1.055,2.4):e/12.92)+.3576*(n=n>.04045?Math.pow((n+.055)/1.055,2.4):n/12.92)+.1805*(i=i>.04045?Math.pow((i+.055)/1.055,2.4):i/12.92)),100*(.2126*e+.7152*n+.0722*i),100*(.0193*e+.1192*n+.9505*i)]},a.rgb.lab=function(t){var e=a.rgb.xyz(t),n=e[0],i=e[1],r=e[2];return i/=100,r/=108.883,n=(n/=95.047)>.008856?Math.pow(n,1/3):7.787*n+16/116,[116*(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116)-16,500*(n-i),200*(i-(r=r>.008856?Math.pow(r,1/3):7.787*r+16/116))]},a.hsl.rgb=function(t){var e,n,i,a,r,o=t[0]/360,s=t[1]/100,l=t[2]/100;if(0===s)return[r=255*l,r,r];e=2*l-(n=l<.5?l*(1+s):l+s-l*s),a=[0,0,0];for(var u=0;u<3;u++)(i=o+1/3*-(u-1))<0&&i++,i>1&&i--,r=6*i<1?e+6*(n-e)*i:2*i<1?n:3*i<2?e+(n-e)*(2/3-i)*6:e,a[u]=255*r;return a},a.hsl.hsv=function(t){var e=t[0],n=t[1]/100,i=t[2]/100,a=n,r=Math.max(i,.01);return n*=(i*=2)<=1?i:2-i,a*=r<=1?r:2-r,[e,100*(0===i?2*a/(r+a):2*n/(i+n)),100*((i+n)/2)]},a.hsv.rgb=function(t){var e=t[0]/60,n=t[1]/100,i=t[2]/100,a=Math.floor(e)%6,r=e-Math.floor(e),o=255*i*(1-n),s=255*i*(1-n*r),l=255*i*(1-n*(1-r));switch(i*=255,a){case 0:return[i,l,o];case 1:return[s,i,o];case 2:return[o,i,l];case 3:return[o,s,i];case 4:return[l,o,i];case 5:return[i,o,s]}},a.hsv.hsl=function(t){var e,n,i,a=t[0],r=t[1]/100,o=t[2]/100,s=Math.max(o,.01);return i=(2-r)*o,n=r*s,[a,100*(n=(n/=(e=(2-r)*s)<=1?e:2-e)||0),100*(i/=2)]},a.hwb.rgb=function(t){var e,n,i,a,r,o,s,l=t[0]/360,u=t[1]/100,d=t[2]/100,h=u+d;switch(h>1&&(u/=h,d/=h),i=6*l-(e=Math.floor(6*l)),0!=(1&e)&&(i=1-i),a=u+i*((n=1-d)-u),e){default:case 6:case 0:r=n,o=a,s=u;break;case 1:r=a,o=n,s=u;break;case 2:r=u,o=n,s=a;break;case 3:r=u,o=a,s=n;break;case 4:r=a,o=u,s=n;break;case 5:r=n,o=u,s=a}return[255*r,255*o,255*s]},a.cmyk.rgb=function(t){var e=t[0]/100,n=t[1]/100,i=t[2]/100,a=t[3]/100;return[255*(1-Math.min(1,e*(1-a)+a)),255*(1-Math.min(1,n*(1-a)+a)),255*(1-Math.min(1,i*(1-a)+a))]},a.xyz.rgb=function(t){var e,n,i,a=t[0]/100,r=t[1]/100,o=t[2]/100;return n=-.9689*a+1.8758*r+.0415*o,i=.0557*a+-.204*r+1.057*o,e=(e=3.2406*a+-1.5372*r+-.4986*o)>.0031308?1.055*Math.pow(e,1/2.4)-.055:12.92*e,n=n>.0031308?1.055*Math.pow(n,1/2.4)-.055:12.92*n,i=i>.0031308?1.055*Math.pow(i,1/2.4)-.055:12.92*i,[255*(e=Math.min(Math.max(0,e),1)),255*(n=Math.min(Math.max(0,n),1)),255*(i=Math.min(Math.max(0,i),1))]},a.xyz.lab=function(t){var e=t[0],n=t[1],i=t[2];return n/=100,i/=108.883,e=(e/=95.047)>.008856?Math.pow(e,1/3):7.787*e+16/116,[116*(n=n>.008856?Math.pow(n,1/3):7.787*n+16/116)-16,500*(e-n),200*(n-(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116))]},a.lab.xyz=function(t){var e,n,i,a=t[0];e=t[1]/500+(n=(a+16)/116),i=n-t[2]/200;var r=Math.pow(n,3),o=Math.pow(e,3),s=Math.pow(i,3);return n=r>.008856?r:(n-16/116)/7.787,e=o>.008856?o:(e-16/116)/7.787,i=s>.008856?s:(i-16/116)/7.787,[e*=95.047,n*=100,i*=108.883]},a.lab.lch=function(t){var e,n=t[0],i=t[1],a=t[2];return(e=360*Math.atan2(a,i)/2/Math.PI)<0&&(e+=360),[n,Math.sqrt(i*i+a*a),e]},a.lch.lab=function(t){var e,n=t[0],i=t[1];return e=t[2]/360*2*Math.PI,[n,i*Math.cos(e),i*Math.sin(e)]},a.rgb.ansi16=function(t){var e=t[0],n=t[1],i=t[2],r=1 in arguments?arguments[1]:a.rgb.hsv(t)[2];if(0===(r=Math.round(r/50)))return 30;var o=30+(Math.round(i/255)<<2|Math.round(n/255)<<1|Math.round(e/255));return 2===r&&(o+=60),o},a.hsv.ansi16=function(t){return a.rgb.ansi16(a.hsv.rgb(t),t[2])},a.rgb.ansi256=function(t){var e=t[0],n=t[1],i=t[2];return e===n&&n===i?e<8?16:e>248?231:Math.round((e-8)/247*24)+232:16+36*Math.round(e/255*5)+6*Math.round(n/255*5)+Math.round(i/255*5)},a.ansi16.rgb=function(t){var e=t%10;if(0===e||7===e)return t>50&&(e+=3.5),[e=e/10.5*255,e,e];var n=.5*(1+~~(t>50));return[(1&e)*n*255,(e>>1&1)*n*255,(e>>2&1)*n*255]},a.ansi256.rgb=function(t){if(t>=232){var e=10*(t-232)+8;return[e,e,e]}var n;return t-=16,[Math.floor(t/36)/5*255,Math.floor((n=t%36)/6)/5*255,n%6/5*255]},a.rgb.hex=function(t){var e=(((255&Math.round(t[0]))<<16)+((255&Math.round(t[1]))<<8)+(255&Math.round(t[2]))).toString(16).toUpperCase();return"000000".substring(e.length)+e},a.hex.rgb=function(t){var e=t.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);if(!e)return[0,0,0];var n=e[0];3===e[0].length&&(n=n.split("").map((function(t){return t+t})).join(""));var i=parseInt(n,16);return[i>>16&255,i>>8&255,255&i]},a.rgb.hcg=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255,r=Math.max(Math.max(n,i),a),o=Math.min(Math.min(n,i),a),s=r-o;return e=s<=0?0:r===n?(i-a)/s%6:r===i?2+(a-n)/s:4+(n-i)/s+4,e/=6,[360*(e%=1),100*s,100*(s<1?o/(1-s):0)]},a.hsl.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=1,a=0;return(i=n<.5?2*e*n:2*e*(1-n))<1&&(a=(n-.5*i)/(1-i)),[t[0],100*i,100*a]},a.hsv.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=e*n,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.hcg.rgb=function(t){var e=t[0]/360,n=t[1]/100,i=t[2]/100;if(0===n)return[255*i,255*i,255*i];var a,r=[0,0,0],o=e%1*6,s=o%1,l=1-s;switch(Math.floor(o)){case 0:r[0]=1,r[1]=s,r[2]=0;break;case 1:r[0]=l,r[1]=1,r[2]=0;break;case 2:r[0]=0,r[1]=1,r[2]=s;break;case 3:r[0]=0,r[1]=l,r[2]=1;break;case 4:r[0]=s,r[1]=0,r[2]=1;break;default:r[0]=1,r[1]=0,r[2]=l}return a=(1-n)*i,[255*(n*r[0]+a),255*(n*r[1]+a),255*(n*r[2]+a)]},a.hcg.hsv=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e),i=0;return n>0&&(i=e/n),[t[0],100*i,100*n]},a.hcg.hsl=function(t){var e=t[1]/100,n=t[2]/100*(1-e)+.5*e,i=0;return n>0&&n<.5?i=e/(2*n):n>=.5&&n<1&&(i=e/(2*(1-n))),[t[0],100*i,100*n]},a.hcg.hwb=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e);return[t[0],100*(n-e),100*(1-n)]},a.hwb.hcg=function(t){var e=t[1]/100,n=1-t[2]/100,i=n-e,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.apple.rgb=function(t){return[t[0]/65535*255,t[1]/65535*255,t[2]/65535*255]},a.rgb.apple=function(t){return[t[0]/255*65535,t[1]/255*65535,t[2]/255*65535]},a.gray.rgb=function(t){return[t[0]/100*255,t[0]/100*255,t[0]/100*255]},a.gray.hsl=a.gray.hsv=function(t){return[0,0,t[0]]},a.gray.hwb=function(t){return[0,100,t[0]]},a.gray.cmyk=function(t){return[0,0,0,t[0]]},a.gray.lab=function(t){return[t[0],0,0]},a.gray.hex=function(t){var e=255&Math.round(t[0]/100*255),n=((e<<16)+(e<<8)+e).toString(16).toUpperCase();return"000000".substring(n.length)+n},a.rgb.gray=function(t){return[(t[0]+t[1]+t[2])/3/255*100]}}));i.rgb,i.hsl,i.hsv,i.hwb,i.cmyk,i.xyz,i.lab,i.lch,i.hex,i.keyword,i.ansi16,i.ansi256,i.hcg,i.apple,i.gray;function a(t){var e=function(){for(var t={},e=Object.keys(i),n=e.length,a=0;a<n;a++)t[e[a]]={distance:-1,parent:null};return t}(),n=[t];for(e[t].distance=0;n.length;)for(var a=n.pop(),r=Object.keys(i[a]),o=r.length,s=0;s<o;s++){var l=r[s],u=e[l];-1===u.distance&&(u.distance=e[a].distance+1,u.parent=a,n.unshift(l))}return e}function r(t,e){return function(n){return e(t(n))}}function o(t,e){for(var n=[e[t].parent,t],a=i[e[t].parent][t],o=e[t].parent;e[o].parent;)n.unshift(e[o].parent),a=r(i[e[o].parent][o],a),o=e[o].parent;return a.conversion=n,a}var s={};Object.keys(i).forEach((function(t){s[t]={},Object.defineProperty(s[t],"channels",{value:i[t].channels}),Object.defineProperty(s[t],"labels",{value:i[t].labels});var e=function(t){for(var e=a(t),n={},i=Object.keys(e),r=i.length,s=0;s<r;s++){var l=i[s];null!==e[l].parent&&(n[l]=o(l,e))}return n}(t);Object.keys(e).forEach((function(n){var i=e[n];s[t][n]=function(t){var e=function(e){if(null==e)return e;arguments.length>1&&(e=Array.prototype.slice.call(arguments));var n=t(e);if("object"==typeof n)for(var i=n.length,a=0;a<i;a++)n[a]=Math.round(n[a]);return n};return"conversion"in t&&(e.conversion=t.conversion),e}(i),s[t][n].raw=function(t){var e=function(e){return null==e?e:(arguments.length>1&&(e=Array.prototype.slice.call(arguments)),t(e))};return"conversion"in t&&(e.conversion=t.conversion),e}(i)}))}));var l=s,u={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},d={getRgba:h,getHsla:c,getRgb:function(t){var e=h(t);return e&&e.slice(0,3)},getHsl:function(t){var e=c(t);return e&&e.slice(0,3)},getHwb:f,getAlpha:function(t){var e=h(t);if(e)return e[3];if(e=c(t))return e[3];if(e=f(t))return e[3]},hexString:function(t,e){e=void 0!==e&&3===t.length?e:t[3];return"#"+b(t[0])+b(t[1])+b(t[2])+(e>=0&&e<1?b(Math.round(255*e)):"")},rgbString:function(t,e){if(e<1||t[3]&&t[3]<1)return g(t,e);return"rgb("+t[0]+", "+t[1]+", "+t[2]+")"},rgbaString:g,percentString:function(t,e){if(e<1||t[3]&&t[3]<1)return m(t,e);var n=Math.round(t[0]/255*100),i=Math.round(t[1]/255*100),a=Math.round(t[2]/255*100);return"rgb("+n+"%, "+i+"%, "+a+"%)"},percentaString:m,hslString:function(t,e){if(e<1||t[3]&&t[3]<1)return p(t,e);return"hsl("+t[0]+", "+t[1]+"%, "+t[2]+"%)"},hslaString:p,hwbString:function(t,e){void 0===e&&(e=void 0!==t[3]?t[3]:1);return"hwb("+t[0]+", "+t[1]+"%, "+t[2]+"%"+(void 0!==e&&1!==e?", "+e:"")+")"},keyword:function(t){return y[t.slice(0,3)]}};function h(t){if(t){var e=[0,0,0],n=1,i=t.match(/^#([a-fA-F0-9]{3,4})$/i),a="";if(i){a=(i=i[1])[3];for(var r=0;r<e.length;r++)e[r]=parseInt(i[r]+i[r],16);a&&(n=Math.round(parseInt(a+a,16)/255*100)/100)}else if(i=t.match(/^#([a-fA-F0-9]{6}([a-fA-F0-9]{2})?)$/i)){a=i[2],i=i[1];for(r=0;r<e.length;r++)e[r]=parseInt(i.slice(2*r,2*r+2),16);a&&(n=Math.round(parseInt(a,16)/255*100)/100)}else if(i=t.match(/^rgba?\(\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=parseInt(i[r+1]);n=parseFloat(i[4])}else if(i=t.match(/^rgba?\(\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=Math.round(2.55*parseFloat(i[r+1]));n=parseFloat(i[4])}else if(i=t.match(/(\w+)/)){if("transparent"==i[1])return[0,0,0,0];if(!(e=u[i[1]]))return}for(r=0;r<e.length;r++)e[r]=v(e[r],0,255);return n=n||0==n?v(n,0,1):1,e[3]=n,e}}function c(t){if(t){var e=t.match(/^hsla?\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[v(parseInt(e[1]),0,360),v(parseFloat(e[2]),0,100),v(parseFloat(e[3]),0,100),v(isNaN(n)?1:n,0,1)]}}}function f(t){if(t){var e=t.match(/^hwb\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[v(parseInt(e[1]),0,360),v(parseFloat(e[2]),0,100),v(parseFloat(e[3]),0,100),v(isNaN(n)?1:n,0,1)]}}}function g(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"rgba("+t[0]+", "+t[1]+", "+t[2]+", "+e+")"}function m(t,e){return"rgba("+Math.round(t[0]/255*100)+"%, "+Math.round(t[1]/255*100)+"%, "+Math.round(t[2]/255*100)+"%, "+(e||t[3]||1)+")"}function p(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"hsla("+t[0]+", "+t[1]+"%, "+t[2]+"%, "+e+")"}function v(t,e,n){return Math.min(Math.max(e,t),n)}function b(t){var e=t.toString(16).toUpperCase();return e.length<2?"0"+e:e}var y={};for(var x in u)y[u[x]]=x;var _=function(t){return t instanceof _?t:this instanceof _?(this.valid=!1,this.values={rgb:[0,0,0],hsl:[0,0,0],hsv:[0,0,0],hwb:[0,0,0],cmyk:[0,0,0,0],alpha:1},void("string"==typeof t?(e=d.getRgba(t))?this.setValues("rgb",e):(e=d.getHsla(t))?this.setValues("hsl",e):(e=d.getHwb(t))&&this.setValues("hwb",e):"object"==typeof t&&(void 0!==(e=t).r||void 0!==e.red?this.setValues("rgb",e):void 0!==e.l||void 0!==e.lightness?this.setValues("hsl",e):void 0!==e.v||void 0!==e.value?this.setValues("hsv",e):void 0!==e.w||void 0!==e.whiteness?this.setValues("hwb",e):void 0===e.c&&void 0===e.cyan||this.setValues("cmyk",e)))):new _(t);var e};_.prototype={isValid:function(){return this.valid},rgb:function(){return this.setSpace("rgb",arguments)},hsl:function(){return this.setSpace("hsl",arguments)},hsv:function(){return this.setSpace("hsv",arguments)},hwb:function(){return this.setSpace("hwb",arguments)},cmyk:function(){return this.setSpace("cmyk",arguments)},rgbArray:function(){return this.values.rgb},hslArray:function(){return this.values.hsl},hsvArray:function(){return this.values.hsv},hwbArray:function(){var t=this.values;return 1!==t.alpha?t.hwb.concat([t.alpha]):t.hwb},cmykArray:function(){return this.values.cmyk},rgbaArray:function(){var t=this.values;return t.rgb.concat([t.alpha])},hslaArray:function(){var t=this.values;return t.hsl.concat([t.alpha])},alpha:function(t){return void 0===t?this.values.alpha:(this.setValues("alpha",t),this)},red:function(t){return this.setChannel("rgb",0,t)},green:function(t){return this.setChannel("rgb",1,t)},blue:function(t){return this.setChannel("rgb",2,t)},hue:function(t){return t&&(t=(t%=360)<0?360+t:t),this.setChannel("hsl",0,t)},saturation:function(t){return this.setChannel("hsl",1,t)},lightness:function(t){return this.setChannel("hsl",2,t)},saturationv:function(t){return this.setChannel("hsv",1,t)},whiteness:function(t){return this.setChannel("hwb",1,t)},blackness:function(t){return this.setChannel("hwb",2,t)},value:function(t){return this.setChannel("hsv",2,t)},cyan:function(t){return this.setChannel("cmyk",0,t)},magenta:function(t){return this.setChannel("cmyk",1,t)},yellow:function(t){return this.setChannel("cmyk",2,t)},black:function(t){return this.setChannel("cmyk",3,t)},hexString:function(){return d.hexString(this.values.rgb)},rgbString:function(){return d.rgbString(this.values.rgb,this.values.alpha)},rgbaString:function(){return d.rgbaString(this.values.rgb,this.values.alpha)},percentString:function(){return d.percentString(this.values.rgb,this.values.alpha)},hslString:function(){return d.hslString(this.values.hsl,this.values.alpha)},hslaString:function(){return d.hslaString(this.values.hsl,this.values.alpha)},hwbString:function(){return d.hwbString(this.values.hwb,this.values.alpha)},keyword:function(){return d.keyword(this.values.rgb,this.values.alpha)},rgbNumber:function(){var t=this.values.rgb;return t[0]<<16|t[1]<<8|t[2]},luminosity:function(){for(var t=this.values.rgb,e=[],n=0;n<t.length;n++){var i=t[n]/255;e[n]=i<=.03928?i/12.92:Math.pow((i+.055)/1.055,2.4)}return.2126*e[0]+.7152*e[1]+.0722*e[2]},contrast:function(t){var e=this.luminosity(),n=t.luminosity();return e>n?(e+.05)/(n+.05):(n+.05)/(e+.05)},level:function(t){var e=this.contrast(t);return e>=7.1?"AAA":e>=4.5?"AA":""},dark:function(){var t=this.values.rgb;return(299*t[0]+587*t[1]+114*t[2])/1e3<128},light:function(){return!this.dark()},negate:function(){for(var t=[],e=0;e<3;e++)t[e]=255-this.values.rgb[e];return this.setValues("rgb",t),this},lighten:function(t){var e=this.values.hsl;return e[2]+=e[2]*t,this.setValues("hsl",e),this},darken:function(t){var e=this.values.hsl;return e[2]-=e[2]*t,this.setValues("hsl",e),this},saturate:function(t){var e=this.values.hsl;return e[1]+=e[1]*t,this.setValues("hsl",e),this},desaturate:function(t){var e=this.values.hsl;return e[1]-=e[1]*t,this.setValues("hsl",e),this},whiten:function(t){var e=this.values.hwb;return e[1]+=e[1]*t,this.setValues("hwb",e),this},blacken:function(t){var e=this.values.hwb;return e[2]+=e[2]*t,this.setValues("hwb",e),this},greyscale:function(){var t=this.values.rgb,e=.3*t[0]+.59*t[1]+.11*t[2];return this.setValues("rgb",[e,e,e]),this},clearer:function(t){var e=this.values.alpha;return this.setValues("alpha",e-e*t),this},opaquer:function(t){var e=this.values.alpha;return this.setValues("alpha",e+e*t),this},rotate:function(t){var e=this.values.hsl,n=(e[0]+t)%360;return e[0]=n<0?360+n:n,this.setValues("hsl",e),this},mix:function(t,e){var n=t,i=void 0===e?.5:e,a=2*i-1,r=this.alpha()-n.alpha(),o=((a*r==-1?a:(a+r)/(1+a*r))+1)/2,s=1-o;return this.rgb(o*this.red()+s*n.red(),o*this.green()+s*n.green(),o*this.blue()+s*n.blue()).alpha(this.alpha()*i+n.alpha()*(1-i))},toJSON:function(){return this.rgb()},clone:function(){var t,e,n=new _,i=this.values,a=n.values;for(var r in i)i.hasOwnProperty(r)&&(t=i[r],"[object Array]"===(e={}.toString.call(t))?a[r]=t.slice(0):"[object Number]"===e?a[r]=t:console.error("unexpected color value:",t));return n}},_.prototype.spaces={rgb:["red","green","blue"],hsl:["hue","saturation","lightness"],hsv:["hue","saturation","value"],hwb:["hue","whiteness","blackness"],cmyk:["cyan","magenta","yellow","black"]},_.prototype.maxes={rgb:[255,255,255],hsl:[360,100,100],hsv:[360,100,100],hwb:[360,100,100],cmyk:[100,100,100,100]},_.prototype.getValues=function(t){for(var e=this.values,n={},i=0;i<t.length;i++)n[t.charAt(i)]=e[t][i];return 1!==e.alpha&&(n.a=e.alpha),n},_.prototype.setValues=function(t,e){var n,i,a=this.values,r=this.spaces,o=this.maxes,s=1;if(this.valid=!0,"alpha"===t)s=e;else if(e.length)a[t]=e.slice(0,t.length),s=e[t.length];else if(void 0!==e[t.charAt(0)]){for(n=0;n<t.length;n++)a[t][n]=e[t.charAt(n)];s=e.a}else if(void 0!==e[r[t][0]]){var u=r[t];for(n=0;n<t.length;n++)a[t][n]=e[u[n]];s=e.alpha}if(a.alpha=Math.max(0,Math.min(1,void 0===s?a.alpha:s)),"alpha"===t)return!1;for(n=0;n<t.length;n++)i=Math.max(0,Math.min(o[t][n],a[t][n])),a[t][n]=Math.round(i);for(var d in r)d!==t&&(a[d]=l[t][d](a[t]));return!0},_.prototype.setSpace=function(t,e){var n=e[0];return void 0===n?this.getValues(t):("number"==typeof n&&(n=Array.prototype.slice.call(e)),this.setValues(t,n),this)},_.prototype.setChannel=function(t,e,n){var i=this.values[t];return void 0===n?i[e]:n===i[e]?this:(i[e]=n,this.setValues(t,i),this)},"undefined"!=typeof window&&(window.Color=_);var w,k=_,M={noop:function(){},uid:(w=0,function(){return w++}),isNullOrUndef:function(t){return null==t},isArray:function(t){if(Array.isArray&&Array.isArray(t))return!0;var e=Object.prototype.toString.call(t);return"[object"===e.substr(0,7)&&"Array]"===e.substr(-6)},isObject:function(t){return null!==t&&"[object Object]"===Object.prototype.toString.call(t)},isFinite:function(t){return("number"==typeof t||t instanceof Number)&&isFinite(t)},valueOrDefault:function(t,e){return void 0===t?e:t},valueAtIndexOrDefault:function(t,e,n){return M.valueOrDefault(M.isArray(t)?t[e]:t,n)},callback:function(t,e,n){if(t&&"function"==typeof t.call)return t.apply(n,e)},each:function(t,e,n,i){var a,r,o;if(M.isArray(t))if(r=t.length,i)for(a=r-1;a>=0;a--)e.call(n,t[a],a);else for(a=0;a<r;a++)e.call(n,t[a],a);else if(M.isObject(t))for(r=(o=Object.keys(t)).length,a=0;a<r;a++)e.call(n,t[o[a]],o[a])},arrayEquals:function(t,e){var n,i,a,r;if(!t||!e||t.length!==e.length)return!1;for(n=0,i=t.length;n<i;++n)if(a=t[n],r=e[n],a instanceof Array&&r instanceof Array){if(!M.arrayEquals(a,r))return!1}else if(a!==r)return!1;return!0},clone:function(t){if(M.isArray(t))return t.map(M.clone);if(M.isObject(t)){for(var e={},n=Object.keys(t),i=n.length,a=0;a<i;++a)e[n[a]]=M.clone(t[n[a]]);return e}return t},_merger:function(t,e,n,i){var a=e[t],r=n[t];M.isObject(a)&&M.isObject(r)?M.merge(a,r,i):e[t]=M.clone(r)},_mergerIf:function(t,e,n){var i=e[t],a=n[t];M.isObject(i)&&M.isObject(a)?M.mergeIf(i,a):e.hasOwnProperty(t)||(e[t]=M.clone(a))},merge:function(t,e,n){var i,a,r,o,s,l=M.isArray(e)?e:[e],u=l.length;if(!M.isObject(t))return t;for(i=(n=n||{}).merger||M._merger,a=0;a<u;++a)if(e=l[a],M.isObject(e))for(s=0,o=(r=Object.keys(e)).length;s<o;++s)i(r[s],t,e,n);return t},mergeIf:function(t,e){return M.merge(t,e,{merger:M._mergerIf})},extend:Object.assign||function(t){return M.merge(t,[].slice.call(arguments,1),{merger:function(t,e,n){e[t]=n[t]}})},inherits:function(t){var e=this,n=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return e.apply(this,arguments)},i=function(){this.constructor=n};return i.prototype=e.prototype,n.prototype=new i,n.extend=M.inherits,t&&M.extend(n.prototype,t),n.__super__=e.prototype,n},_deprecated:function(t,e,n,i){void 0!==e&&console.warn(t+': "'+n+'" is deprecated. Please use "'+i+'" instead')}},S=M;M.callCallback=M.callback,M.indexOf=function(t,e,n){return Array.prototype.indexOf.call(t,e,n)},M.getValueOrDefault=M.valueOrDefault,M.getValueAtIndexOrDefault=M.valueAtIndexOrDefault;var D={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return(t-=1)*t*t+1},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-((t-=1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return t*t*t*t*t},easeOutQuint:function(t){return(t-=1)*t*t*t*t+1},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return 1-Math.cos(t*(Math.PI/2))},easeOutSine:function(t){return Math.sin(t*(Math.PI/2))},easeInOutSine:function(t){return-.5*(Math.cos(Math.PI*t)-1)},easeInExpo:function(t){return 0===t?0:Math.pow(2,10*(t-1))},easeOutExpo:function(t){return 1===t?1:1-Math.pow(2,-10*t)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(2-Math.pow(2,-10*--t))},easeInCirc:function(t){return t>=1?t:-(Math.sqrt(1-t*t)-1)},easeOutCirc:function(t){return Math.sqrt(1-(t-=1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),-i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n))},easeOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),i*Math.pow(2,-10*t)*Math.sin((t-e)*(2*Math.PI)/n)+1)},easeInOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:2==(t/=.5)?1:(n||(n=.45),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),t<1?i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*-.5:i*Math.pow(2,-10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*.5+1)},easeInBack:function(t){var e=1.70158;return t*t*((e+1)*t-e)},easeOutBack:function(t){var e=1.70158;return(t-=1)*t*((e+1)*t+e)+1},easeInOutBack:function(t){var e=1.70158;return(t/=.5)<1?t*t*((1+(e*=1.525))*t-e)*.5:.5*((t-=2)*t*((1+(e*=1.525))*t+e)+2)},easeInBounce:function(t){return 1-D.easeOutBounce(1-t)},easeOutBounce:function(t){return t<1/2.75?7.5625*t*t:t<2/2.75?7.5625*(t-=1.5/2.75)*t+.75:t<2.5/2.75?7.5625*(t-=2.25/2.75)*t+.9375:7.5625*(t-=2.625/2.75)*t+.984375},easeInOutBounce:function(t){return t<.5?.5*D.easeInBounce(2*t):.5*D.easeOutBounce(2*t-1)+.5}},C={effects:D};S.easingEffects=D;var P=Math.PI,T=P/180,O=2*P,A=P/2,F=P/4,I=2*P/3,L={clear:function(t){t.ctx.clearRect(0,0,t.width,t.height)},roundedRect:function(t,e,n,i,a,r){if(r){var o=Math.min(r,a/2,i/2),s=e+o,l=n+o,u=e+i-o,d=n+a-o;t.moveTo(e,l),s<u&&l<d?(t.arc(s,l,o,-P,-A),t.arc(u,l,o,-A,0),t.arc(u,d,o,0,A),t.arc(s,d,o,A,P)):s<u?(t.moveTo(s,n),t.arc(u,l,o,-A,A),t.arc(s,l,o,A,P+A)):l<d?(t.arc(s,l,o,-P,0),t.arc(s,d,o,0,P)):t.arc(s,l,o,-P,P),t.closePath(),t.moveTo(e,n)}else t.rect(e,n,i,a)},drawPoint:function(t,e,n,i,a,r){var o,s,l,u,d,h=(r||0)*T;if(e&&"object"==typeof e&&("[object HTMLImageElement]"===(o=e.toString())||"[object HTMLCanvasElement]"===o))return t.save(),t.translate(i,a),t.rotate(h),t.drawImage(e,-e.width/2,-e.height/2,e.width,e.height),void t.restore();if(!(isNaN(n)||n<=0)){switch(t.beginPath(),e){default:t.arc(i,a,n,0,O),t.closePath();break;case"triangle":t.moveTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=I,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=I,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),t.closePath();break;case"rectRounded":u=n-(d=.516*n),s=Math.cos(h+F)*u,l=Math.sin(h+F)*u,t.arc(i-s,a-l,d,h-P,h-A),t.arc(i+l,a-s,d,h-A,h),t.arc(i+s,a+l,d,h,h+A),t.arc(i-l,a+s,d,h+A,h+P),t.closePath();break;case"rect":if(!r){u=Math.SQRT1_2*n,t.rect(i-u,a-u,2*u,2*u);break}h+=F;case"rectRot":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+l,a-s),t.lineTo(i+s,a+l),t.lineTo(i-l,a+s),t.closePath();break;case"crossRot":h+=F;case"cross":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"star":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s),h+=F,s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"line":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l);break;case"dash":t.moveTo(i,a),t.lineTo(i+Math.cos(h)*n,a+Math.sin(h)*n)}t.fill(),t.stroke()}},_isPointInArea:function(t,e){return t.x>e.left-1e-6&&t.x<e.right+1e-6&&t.y>e.top-1e-6&&t.y<e.bottom+1e-6},clipArea:function(t,e){t.save(),t.beginPath(),t.rect(e.left,e.top,e.right-e.left,e.bottom-e.top),t.clip()},unclipArea:function(t){t.restore()},lineTo:function(t,e,n,i){var a=n.steppedLine;if(a){if("middle"===a){var r=(e.x+n.x)/2;t.lineTo(r,i?n.y:e.y),t.lineTo(r,i?e.y:n.y)}else"after"===a&&!i||"after"!==a&&i?t.lineTo(e.x,n.y):t.lineTo(n.x,e.y);t.lineTo(n.x,n.y)}else n.tension?t.bezierCurveTo(i?e.controlPointPreviousX:e.controlPointNextX,i?e.controlPointPreviousY:e.controlPointNextY,i?n.controlPointNextX:n.controlPointPreviousX,i?n.controlPointNextY:n.controlPointPreviousY,n.x,n.y):t.lineTo(n.x,n.y)}},R=L;S.clear=L.clear,S.drawRoundedRectangle=function(t){t.beginPath(),L.roundedRect.apply(L,arguments)};var N={_set:function(t,e){return S.merge(this[t]||(this[t]={}),e)}};N._set("global",{defaultColor:"rgba(0,0,0,0.1)",defaultFontColor:"#666",defaultFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",defaultFontSize:12,defaultFontStyle:"normal",defaultLineHeight:1.2,showLines:!0});var W=N,Y=S.valueOrDefault;var z={toLineHeight:function(t,e){var n=(""+t).match(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/);if(!n||"normal"===n[1])return 1.2*e;switch(t=+n[2],n[3]){case"px":return t;case"%":t/=100}return e*t},toPadding:function(t){var e,n,i,a;return S.isObject(t)?(e=+t.top||0,n=+t.right||0,i=+t.bottom||0,a=+t.left||0):e=n=i=a=+t||0,{top:e,right:n,bottom:i,left:a,height:e+i,width:a+n}},_parseFont:function(t){var e=W.global,n=Y(t.fontSize,e.defaultFontSize),i={family:Y(t.fontFamily,e.defaultFontFamily),lineHeight:S.options.toLineHeight(Y(t.lineHeight,e.defaultLineHeight),n),size:n,style:Y(t.fontStyle,e.defaultFontStyle),weight:null,string:""};return i.string=function(t){return!t||S.isNullOrUndef(t.size)||S.isNullOrUndef(t.family)?null:(t.style?t.style+" ":"")+(t.weight?t.weight+" ":"")+t.size+"px "+t.family}(i),i},resolve:function(t,e,n,i){var a,r,o,s=!0;for(a=0,r=t.length;a<r;++a)if(void 0!==(o=t[a])&&(void 0!==e&&"function"==typeof o&&(o=o(e),s=!1),void 0!==n&&S.isArray(o)&&(o=o[n],s=!1),void 0!==o))return i&&!s&&(i.cacheable=!1),o}},E={_factorize:function(t){var e,n=[],i=Math.sqrt(t);for(e=1;e<i;e++)t%e==0&&(n.push(e),n.push(t/e));return i===(0|i)&&n.push(i),n.sort((function(t,e){return t-e})).pop(),n},log10:Math.log10||function(t){var e=Math.log(t)*Math.LOG10E,n=Math.round(e);return t===Math.pow(10,n)?n:e}},V=E;S.log10=E.log10;var H=S,B=C,j=R,U=z,G=V,q={getRtlAdapter:function(t,e,n){return t?function(t,e){return{x:function(n){return t+t+e-n},setWidth:function(t){e=t},textAlign:function(t){return"center"===t?t:"right"===t?"left":"right"},xPlus:function(t,e){return t-e},leftForLtr:function(t,e){return t-e}}}(e,n):{x:function(t){return t},setWidth:function(t){},textAlign:function(t){return t},xPlus:function(t,e){return t+e},leftForLtr:function(t,e){return t}}},overrideTextDirection:function(t,e){var n,i;"ltr"!==e&&"rtl"!==e||(i=[(n=t.canvas.style).getPropertyValue("direction"),n.getPropertyPriority("direction")],n.setProperty("direction",e,"important"),t.prevTextDirection=i)},restoreTextDirection:function(t){var e=t.prevTextDirection;void 0!==e&&(delete t.prevTextDirection,t.canvas.style.setProperty("direction",e[0],e[1]))}};H.easing=B,H.canvas=j,H.options=U,H.math=G,H.rtl=q;var Z=function(t){H.extend(this,t),this.initialize.apply(this,arguments)};H.extend(Z.prototype,{_type:void 0,initialize:function(){this.hidden=!1},pivot:function(){var t=this;return t._view||(t._view=H.extend({},t._model)),t._start={},t},transition:function(t){var e=this,n=e._model,i=e._start,a=e._view;return n&&1!==t?(a||(a=e._view={}),i||(i=e._start={}),function(t,e,n,i){var a,r,o,s,l,u,d,h,c,f=Object.keys(n);for(a=0,r=f.length;a<r;++a)if(u=n[o=f[a]],e.hasOwnProperty(o)||(e[o]=u),(s=e[o])!==u&&"_"!==o[0]){if(t.hasOwnProperty(o)||(t[o]=s),(d=typeof u)===typeof(l=t[o]))if("string"===d){if((h=k(l)).valid&&(c=k(u)).valid){e[o]=c.mix(h,i).rgbString();continue}}else if(H.isFinite(l)&&H.isFinite(u)){e[o]=l+(u-l)*i;continue}e[o]=u}}(i,a,n,t),e):(e._view=H.extend({},n),e._start=null,e)},tooltipPosition:function(){return{x:this._model.x,y:this._model.y}},hasValue:function(){return H.isNumber(this._model.x)&&H.isNumber(this._model.y)}}),Z.extend=H.inherits;var $=Z,X=$.extend({chart:null,currentStep:0,numSteps:60,easing:"",render:null,onAnimationProgress:null,onAnimationComplete:null}),K=X;Object.defineProperty(X.prototype,"animationObject",{get:function(){return this}}),Object.defineProperty(X.prototype,"chartInstance",{get:function(){return this.chart},set:function(t){this.chart=t}}),W._set("global",{animation:{duration:1e3,easing:"easeOutQuart",onProgress:H.noop,onComplete:H.noop}});var J={animations:[],request:null,addAnimation:function(t,e,n,i){var a,r,o=this.animations;for(e.chart=t,e.startTime=Date.now(),e.duration=n,i||(t.animating=!0),a=0,r=o.length;a<r;++a)if(o[a].chart===t)return void(o[a]=e);o.push(e),1===o.length&&this.requestAnimationFrame()},cancelAnimation:function(t){var e=H.findIndex(this.animations,(function(e){return e.chart===t}));-1!==e&&(this.animations.splice(e,1),t.animating=!1)},requestAnimationFrame:function(){var t=this;null===t.request&&(t.request=H.requestAnimFrame.call(window,(function(){t.request=null,t.startDigest()})))},startDigest:function(){this.advance(),this.animations.length>0&&this.requestAnimationFrame()},advance:function(){for(var t,e,n,i,a=this.animations,r=0;r<a.length;)e=(t=a[r]).chart,n=t.numSteps,i=Math.floor((Date.now()-t.startTime)/t.duration*n)+1,t.currentStep=Math.min(i,n),H.callback(t.render,[e,t],e),H.callback(t.onAnimationProgress,[t],e),t.currentStep>=n?(H.callback(t.onAnimationComplete,[t],e),e.animating=!1,a.splice(r,1)):++r}},Q=H.options.resolve,tt=["push","pop","shift","splice","unshift"];function et(t,e){var n=t._chartjs;if(n){var i=n.listeners,a=i.indexOf(e);-1!==a&&i.splice(a,1),i.length>0||(tt.forEach((function(e){delete t[e]})),delete t._chartjs)}}var nt=function(t,e){this.initialize(t,e)};H.extend(nt.prototype,{datasetElementType:null,dataElementType:null,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth"],_dataElementOptions:["backgroundColor","borderColor","borderWidth","pointStyle"],initialize:function(t,e){var n=this;n.chart=t,n.index=e,n.linkScales(),n.addElements(),n._type=n.getMeta().type},updateIndex:function(t){this.index=t},linkScales:function(){var t=this.getMeta(),e=this.chart,n=e.scales,i=this.getDataset(),a=e.options.scales;null!==t.xAxisID&&t.xAxisID in n&&!i.xAxisID||(t.xAxisID=i.xAxisID||a.xAxes[0].id),null!==t.yAxisID&&t.yAxisID in n&&!i.yAxisID||(t.yAxisID=i.yAxisID||a.yAxes[0].id)},getDataset:function(){return this.chart.data.datasets[this.index]},getMeta:function(){return this.chart.getDatasetMeta(this.index)},getScaleForId:function(t){return this.chart.scales[t]},_getValueScaleId:function(){return this.getMeta().yAxisID},_getIndexScaleId:function(){return this.getMeta().xAxisID},_getValueScale:function(){return this.getScaleForId(this._getValueScaleId())},_getIndexScale:function(){return this.getScaleForId(this._getIndexScaleId())},reset:function(){this._update(!0)},destroy:function(){this._data&&et(this._data,this)},createMetaDataset:function(){var t=this.datasetElementType;return t&&new t({_chart:this.chart,_datasetIndex:this.index})},createMetaData:function(t){var e=this.dataElementType;return e&&new e({_chart:this.chart,_datasetIndex:this.index,_index:t})},addElements:function(){var t,e,n=this.getMeta(),i=this.getDataset().data||[],a=n.data;for(t=0,e=i.length;t<e;++t)a[t]=a[t]||this.createMetaData(t);n.dataset=n.dataset||this.createMetaDataset()},addElementAndReset:function(t){var e=this.createMetaData(t);this.getMeta().data.splice(t,0,e),this.updateElement(e,t,!0)},buildOrUpdateElements:function(){var t,e,n=this,i=n.getDataset(),a=i.data||(i.data=[]);n._data!==a&&(n._data&&et(n._data,n),a&&Object.isExtensible(a)&&(e=n,(t=a)._chartjs?t._chartjs.listeners.push(e):(Object.defineProperty(t,"_chartjs",{configurable:!0,enumerable:!1,value:{listeners:[e]}}),tt.forEach((function(e){var n="onData"+e.charAt(0).toUpperCase()+e.slice(1),i=t[e];Object.defineProperty(t,e,{configurable:!0,enumerable:!1,value:function(){var e=Array.prototype.slice.call(arguments),a=i.apply(this,e);return H.each(t._chartjs.listeners,(function(t){"function"==typeof t[n]&&t[n].apply(t,e)})),a}})})))),n._data=a),n.resyncElements()},_configure:function(){this._config=H.merge({},[this.chart.options.datasets[this._type],this.getDataset()],{merger:function(t,e,n){"_meta"!==t&&"data"!==t&&H._merger(t,e,n)}})},_update:function(t){this._configure(),this._cachedDataOpts=null,this.update(t)},update:H.noop,transition:function(t){for(var e=this.getMeta(),n=e.data||[],i=n.length,a=0;a<i;++a)n[a].transition(t);e.dataset&&e.dataset.transition(t)},draw:function(){var t=this.getMeta(),e=t.data||[],n=e.length,i=0;for(t.dataset&&t.dataset.draw();i<n;++i)e[i].draw()},getStyle:function(t){var e,n=this.getMeta(),i=n.dataset;return this._configure(),i&&void 0===t?e=this._resolveDatasetElementOptions(i||{}):(t=t||0,e=this._resolveDataElementOptions(n.data[t]||{},t)),!1!==e.fill&&null!==e.fill||(e.backgroundColor=e.borderColor),e},_resolveDatasetElementOptions:function(t,e){var n,i,a,r,o=this,s=o.chart,l=o._config,u=t.custom||{},d=s.options.elements[o.datasetElementType.prototype._type]||{},h=o._datasetElementOptions,c={},f={chart:s,dataset:o.getDataset(),datasetIndex:o.index,hover:e};for(n=0,i=h.length;n<i;++n)a=h[n],r=e?"hover"+a.charAt(0).toUpperCase()+a.slice(1):a,c[a]=Q([u[r],l[r],d[r]],f);return c},_resolveDataElementOptions:function(t,e){var n=this,i=t&&t.custom,a=n._cachedDataOpts;if(a&&!i)return a;var r,o,s,l,u=n.chart,d=n._config,h=u.options.elements[n.dataElementType.prototype._type]||{},c=n._dataElementOptions,f={},g={chart:u,dataIndex:e,dataset:n.getDataset(),datasetIndex:n.index},m={cacheable:!i};if(i=i||{},H.isArray(c))for(o=0,s=c.length;o<s;++o)f[l=c[o]]=Q([i[l],d[l],h[l]],g,e,m);else for(o=0,s=(r=Object.keys(c)).length;o<s;++o)f[l=r[o]]=Q([i[l],d[c[l]],d[l],h[l]],g,e,m);return m.cacheable&&(n._cachedDataOpts=Object.freeze(f)),f},removeHoverStyle:function(t){H.merge(t._model,t.$previousStyle||{}),delete t.$previousStyle},setHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],n=t._index,i=t.custom||{},a=t._model,r=H.getHoverColor;t.$previousStyle={backgroundColor:a.backgroundColor,borderColor:a.borderColor,borderWidth:a.borderWidth},a.backgroundColor=Q([i.hoverBackgroundColor,e.hoverBackgroundColor,r(a.backgroundColor)],void 0,n),a.borderColor=Q([i.hoverBorderColor,e.hoverBorderColor,r(a.borderColor)],void 0,n),a.borderWidth=Q([i.hoverBorderWidth,e.hoverBorderWidth,a.borderWidth],void 0,n)},_removeDatasetHoverStyle:function(){var t=this.getMeta().dataset;t&&this.removeHoverStyle(t)},_setDatasetHoverStyle:function(){var t,e,n,i,a,r,o=this.getMeta().dataset,s={};if(o){for(r=o._model,a=this._resolveDatasetElementOptions(o,!0),t=0,e=(i=Object.keys(a)).length;t<e;++t)s[n=i[t]]=r[n],r[n]=a[n];o.$previousStyle=s}},resyncElements:function(){var t=this.getMeta(),e=this.getDataset().data,n=t.data.length,i=e.length;i<n?t.data.splice(i,n-i):i>n&&this.insertElements(n,i-n)},insertElements:function(t,e){for(var n=0;n<e;++n)this.addElementAndReset(t+n)},onDataPush:function(){var t=arguments.length;this.insertElements(this.getDataset().data.length-t,t)},onDataPop:function(){this.getMeta().data.pop()},onDataShift:function(){this.getMeta().data.shift()},onDataSplice:function(t,e){this.getMeta().data.splice(t,e),this.insertElements(t,arguments.length-2)},onDataUnshift:function(){this.insertElements(0,arguments.length)}}),nt.extend=H.inherits;var it=nt,at=2*Math.PI;function rt(t,e){var n=e.startAngle,i=e.endAngle,a=e.pixelMargin,r=a/e.outerRadius,o=e.x,s=e.y;t.beginPath(),t.arc(o,s,e.outerRadius,n-r,i+r),e.innerRadius>a?(r=a/e.innerRadius,t.arc(o,s,e.innerRadius-a,i+r,n-r,!0)):t.arc(o,s,a,i+Math.PI/2,n-Math.PI/2),t.closePath(),t.clip()}function ot(t,e,n){var i="inner"===e.borderAlign;i?(t.lineWidth=2*e.borderWidth,t.lineJoin="round"):(t.lineWidth=e.borderWidth,t.lineJoin="bevel"),n.fullCircles&&function(t,e,n,i){var a,r=n.endAngle;for(i&&(n.endAngle=n.startAngle+at,rt(t,n),n.endAngle=r,n.endAngle===n.startAngle&&n.fullCircles&&(n.endAngle+=at,n.fullCircles--)),t.beginPath(),t.arc(n.x,n.y,n.innerRadius,n.startAngle+at,n.startAngle,!0),a=0;a<n.fullCircles;++a)t.stroke();for(t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.startAngle+at),a=0;a<n.fullCircles;++a)t.stroke()}(t,e,n,i),i&&rt(t,n),t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.endAngle),t.arc(n.x,n.y,n.innerRadius,n.endAngle,n.startAngle,!0),t.closePath(),t.stroke()}W._set("global",{elements:{arc:{backgroundColor:W.global.defaultColor,borderColor:"#fff",borderWidth:2,borderAlign:"center"}}});var st=$.extend({_type:"arc",inLabelRange:function(t){var e=this._view;return!!e&&Math.pow(t-e.x,2)<Math.pow(e.radius+e.hoverRadius,2)},inRange:function(t,e){var n=this._view;if(n){for(var i=H.getAngleFromPoint(n,{x:t,y:e}),a=i.angle,r=i.distance,o=n.startAngle,s=n.endAngle;s<o;)s+=at;for(;a>s;)a-=at;for(;a<o;)a+=at;var l=a>=o&&a<=s,u=r>=n.innerRadius&&r<=n.outerRadius;return l&&u}return!1},getCenterPoint:function(){var t=this._view,e=(t.startAngle+t.endAngle)/2,n=(t.innerRadius+t.outerRadius)/2;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},getArea:function(){var t=this._view;return Math.PI*((t.endAngle-t.startAngle)/(2*Math.PI))*(Math.pow(t.outerRadius,2)-Math.pow(t.innerRadius,2))},tooltipPosition:function(){var t=this._view,e=t.startAngle+(t.endAngle-t.startAngle)/2,n=(t.outerRadius-t.innerRadius)/2+t.innerRadius;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},draw:function(){var t,e=this._chart.ctx,n=this._view,i="inner"===n.borderAlign?.33:0,a={x:n.x,y:n.y,innerRadius:n.innerRadius,outerRadius:Math.max(n.outerRadius-i,0),pixelMargin:i,startAngle:n.startAngle,endAngle:n.endAngle,fullCircles:Math.floor(n.circumference/at)};if(e.save(),e.fillStyle=n.backgroundColor,e.strokeStyle=n.borderColor,a.fullCircles){for(a.endAngle=a.startAngle+at,e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),t=0;t<a.fullCircles;++t)e.fill();a.endAngle=a.startAngle+n.circumference%at}e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),e.fill(),n.borderWidth&&ot(e,n,a),e.restore()}}),lt=H.valueOrDefault,ut=W.global.defaultColor;W._set("global",{elements:{line:{tension:.4,backgroundColor:ut,borderWidth:3,borderColor:ut,borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",capBezierPoints:!0,fill:!0}}});var dt=$.extend({_type:"line",draw:function(){var t,e,n,i=this,a=i._view,r=i._chart.ctx,o=a.spanGaps,s=i._children.slice(),l=W.global,u=l.elements.line,d=-1,h=i._loop;if(s.length){if(i._loop){for(t=0;t<s.length;++t)if(e=H.previousItem(s,t),!s[t]._view.skip&&e._view.skip){s=s.slice(t).concat(s.slice(0,t)),h=o;break}h&&s.push(s[0])}for(r.save(),r.lineCap=a.borderCapStyle||u.borderCapStyle,r.setLineDash&&r.setLineDash(a.borderDash||u.borderDash),r.lineDashOffset=lt(a.borderDashOffset,u.borderDashOffset),r.lineJoin=a.borderJoinStyle||u.borderJoinStyle,r.lineWidth=lt(a.borderWidth,u.borderWidth),r.strokeStyle=a.borderColor||l.defaultColor,r.beginPath(),(n=s[0]._view).skip||(r.moveTo(n.x,n.y),d=0),t=1;t<s.length;++t)n=s[t]._view,e=-1===d?H.previousItem(s,t):s[d],n.skip||(d!==t-1&&!o||-1===d?r.moveTo(n.x,n.y):H.canvas.lineTo(r,e._view,n),d=t);h&&r.closePath(),r.stroke(),r.restore()}}}),ht=H.valueOrDefault,ct=W.global.defaultColor;function ft(t){var e=this._view;return!!e&&Math.abs(t-e.x)<e.radius+e.hitRadius}W._set("global",{elements:{point:{radius:3,pointStyle:"circle",backgroundColor:ct,borderColor:ct,borderWidth:1,hitRadius:1,hoverRadius:4,hoverBorderWidth:1}}});var gt=$.extend({_type:"point",inRange:function(t,e){var n=this._view;return!!n&&Math.pow(t-n.x,2)+Math.pow(e-n.y,2)<Math.pow(n.hitRadius+n.radius,2)},inLabelRange:ft,inXRange:ft,inYRange:function(t){var e=this._view;return!!e&&Math.abs(t-e.y)<e.radius+e.hitRadius},getCenterPoint:function(){var t=this._view;return{x:t.x,y:t.y}},getArea:function(){return Math.PI*Math.pow(this._view.radius,2)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y,padding:t.radius+t.borderWidth}},draw:function(t){var e=this._view,n=this._chart.ctx,i=e.pointStyle,a=e.rotation,r=e.radius,o=e.x,s=e.y,l=W.global,u=l.defaultColor;e.skip||(void 0===t||H.canvas._isPointInArea(e,t))&&(n.strokeStyle=e.borderColor||u,n.lineWidth=ht(e.borderWidth,l.elements.point.borderWidth),n.fillStyle=e.backgroundColor||u,H.canvas.drawPoint(n,i,r,o,s,a))}}),mt=W.global.defaultColor;function pt(t){return t&&void 0!==t.width}function vt(t){var e,n,i,a,r;return pt(t)?(r=t.width/2,e=t.x-r,n=t.x+r,i=Math.min(t.y,t.base),a=Math.max(t.y,t.base)):(r=t.height/2,e=Math.min(t.x,t.base),n=Math.max(t.x,t.base),i=t.y-r,a=t.y+r),{left:e,top:i,right:n,bottom:a}}function bt(t,e,n){return t===e?n:t===n?e:t}function yt(t,e,n){var i,a,r,o,s=t.borderWidth,l=function(t){var e=t.borderSkipped,n={};return e?(t.horizontal?t.base>t.x&&(e=bt(e,"left","right")):t.base<t.y&&(e=bt(e,"bottom","top")),n[e]=!0,n):n}(t);return H.isObject(s)?(i=+s.top||0,a=+s.right||0,r=+s.bottom||0,o=+s.left||0):i=a=r=o=+s||0,{t:l.top||i<0?0:i>n?n:i,r:l.right||a<0?0:a>e?e:a,b:l.bottom||r<0?0:r>n?n:r,l:l.left||o<0?0:o>e?e:o}}function xt(t,e,n){var i=null===e,a=null===n,r=!(!t||i&&a)&&vt(t);return r&&(i||e>=r.left&&e<=r.right)&&(a||n>=r.top&&n<=r.bottom)}W._set("global",{elements:{rectangle:{backgroundColor:mt,borderColor:mt,borderSkipped:"bottom",borderWidth:0}}});var _t=$.extend({_type:"rectangle",draw:function(){var t=this._chart.ctx,e=this._view,n=function(t){var e=vt(t),n=e.right-e.left,i=e.bottom-e.top,a=yt(t,n/2,i/2);return{outer:{x:e.left,y:e.top,w:n,h:i},inner:{x:e.left+a.l,y:e.top+a.t,w:n-a.l-a.r,h:i-a.t-a.b}}}(e),i=n.outer,a=n.inner;t.fillStyle=e.backgroundColor,t.fillRect(i.x,i.y,i.w,i.h),i.w===a.w&&i.h===a.h||(t.save(),t.beginPath(),t.rect(i.x,i.y,i.w,i.h),t.clip(),t.fillStyle=e.borderColor,t.rect(a.x,a.y,a.w,a.h),t.fill("evenodd"),t.restore())},height:function(){var t=this._view;return t.base-t.y},inRange:function(t,e){return xt(this._view,t,e)},inLabelRange:function(t,e){var n=this._view;return pt(n)?xt(n,t,null):xt(n,null,e)},inXRange:function(t){return xt(this._view,t,null)},inYRange:function(t){return xt(this._view,null,t)},getCenterPoint:function(){var t,e,n=this._view;return pt(n)?(t=n.x,e=(n.y+n.base)/2):(t=(n.x+n.base)/2,e=n.y),{x:t,y:e}},getArea:function(){var t=this._view;return pt(t)?t.width*Math.abs(t.y-t.base):t.height*Math.abs(t.x-t.base)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y}}}),wt={},kt=st,Mt=dt,St=gt,Dt=_t;wt.Arc=kt,wt.Line=Mt,wt.Point=St,wt.Rectangle=Dt;var Ct=H._deprecated,Pt=H.valueOrDefault;function Tt(t,e,n){var i,a,r=n.barThickness,o=e.stackCount,s=e.pixels[t],l=H.isNullOrUndef(r)?function(t,e){var n,i,a,r,o=t._length;for(a=1,r=e.length;a<r;++a)o=Math.min(o,Math.abs(e[a]-e[a-1]));for(a=0,r=t.getTicks().length;a<r;++a)i=t.getPixelForTick(a),o=a>0?Math.min(o,Math.abs(i-n)):o,n=i;return o}(e.scale,e.pixels):-1;return H.isNullOrUndef(r)?(i=l*n.categoryPercentage,a=n.barPercentage):(i=r*o,a=1),{chunk:i/o,ratio:a,start:s-i/2}}W._set("bar",{hover:{mode:"label"},scales:{xAxes:[{type:"category",offset:!0,gridLines:{offsetGridLines:!0}}],yAxes:[{type:"linear"}]}}),W._set("global",{datasets:{bar:{categoryPercentage:.8,barPercentage:.9}}});var Ot=it.extend({dataElementType:wt.Rectangle,_dataElementOptions:["backgroundColor","borderColor","borderSkipped","borderWidth","barPercentage","barThickness","categoryPercentage","maxBarThickness","minBarLength"],initialize:function(){var t,e,n=this;it.prototype.initialize.apply(n,arguments),(t=n.getMeta()).stack=n.getDataset().stack,t.bar=!0,e=n._getIndexScale().options,Ct("bar chart",e.barPercentage,"scales.[x/y]Axes.barPercentage","dataset.barPercentage"),Ct("bar chart",e.barThickness,"scales.[x/y]Axes.barThickness","dataset.barThickness"),Ct("bar chart",e.categoryPercentage,"scales.[x/y]Axes.categoryPercentage","dataset.categoryPercentage"),Ct("bar chart",n._getValueScale().options.minBarLength,"scales.[x/y]Axes.minBarLength","dataset.minBarLength"),Ct("bar chart",e.maxBarThickness,"scales.[x/y]Axes.maxBarThickness","dataset.maxBarThickness")},update:function(t){var e,n,i=this.getMeta().data;for(this._ruler=this.getRuler(),e=0,n=i.length;e<n;++e)this.updateElement(i[e],e,t)},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=i.getDataset(),o=i._resolveDataElementOptions(t,e);t._xScale=i.getScaleForId(a.xAxisID),t._yScale=i.getScaleForId(a.yAxisID),t._datasetIndex=i.index,t._index=e,t._model={backgroundColor:o.backgroundColor,borderColor:o.borderColor,borderSkipped:o.borderSkipped,borderWidth:o.borderWidth,datasetLabel:r.label,label:i.chart.data.labels[e]},H.isArray(r.data[e])&&(t._model.borderSkipped=null),i._updateElementGeometry(t,e,n,o),t.pivot()},_updateElementGeometry:function(t,e,n,i){var a=this,r=t._model,o=a._getValueScale(),s=o.getBasePixel(),l=o.isHorizontal(),u=a._ruler||a.getRuler(),d=a.calculateBarValuePixels(a.index,e,i),h=a.calculateBarIndexPixels(a.index,e,u,i);r.horizontal=l,r.base=n?s:d.base,r.x=l?n?s:d.head:h.center,r.y=l?h.center:n?s:d.head,r.height=l?h.size:void 0,r.width=l?void 0:h.size},_getStacks:function(t){var e,n,i=this._getIndexScale(),a=i._getMatchingVisibleMetas(this._type),r=i.options.stacked,o=a.length,s=[];for(e=0;e<o&&(n=a[e],(!1===r||-1===s.indexOf(n.stack)||void 0===r&&void 0===n.stack)&&s.push(n.stack),n.index!==t);++e);return s},getStackCount:function(){return this._getStacks().length},getStackIndex:function(t,e){var n=this._getStacks(t),i=void 0!==e?n.indexOf(e):-1;return-1===i?n.length-1:i},getRuler:function(){var t,e,n=this._getIndexScale(),i=[];for(t=0,e=this.getMeta().data.length;t<e;++t)i.push(n.getPixelForValue(null,t,this.index));return{pixels:i,start:n._startPixel,end:n._endPixel,stackCount:this.getStackCount(),scale:n}},calculateBarValuePixels:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._getValueScale(),c=h.isHorizontal(),f=d.data.datasets,g=h._getMatchingVisibleMetas(this._type),m=h._parseValue(f[t].data[e]),p=n.minBarLength,v=h.options.stacked,b=this.getMeta().stack,y=void 0===m.start?0:m.max>=0&&m.min>=0?m.min:m.max,x=void 0===m.start?m.end:m.max>=0&&m.min>=0?m.max-m.min:m.min-m.max,_=g.length;if(v||void 0===v&&void 0!==b)for(i=0;i<_&&(a=g[i]).index!==t;++i)a.stack===b&&(r=void 0===(u=h._parseValue(f[a.index].data[e])).start?u.end:u.min>=0&&u.max>=0?u.max:u.min,(m.min<0&&r<0||m.max>=0&&r>0)&&(y+=r));return o=h.getPixelForValue(y),l=(s=h.getPixelForValue(y+x))-o,void 0!==p&&Math.abs(l)<p&&(l=p,s=x>=0&&!c||x<0&&c?o-p:o+p),{size:l,base:o,head:s,center:s+l/2}},calculateBarIndexPixels:function(t,e,n,i){var a="flex"===i.barThickness?function(t,e,n){var i,a=e.pixels,r=a[t],o=t>0?a[t-1]:null,s=t<a.length-1?a[t+1]:null,l=n.categoryPercentage;return null===o&&(o=r-(null===s?e.end-e.start:s-r)),null===s&&(s=r+r-o),i=r-(r-Math.min(o,s))/2*l,{chunk:Math.abs(s-o)/2*l/e.stackCount,ratio:n.barPercentage,start:i}}(e,n,i):Tt(e,n,i),r=this.getStackIndex(t,this.getMeta().stack),o=a.start+a.chunk*r+a.chunk/2,s=Math.min(Pt(i.maxBarThickness,1/0),a.chunk*a.ratio);return{base:o-s/2,head:o+s/2,center:o,size:s}},draw:function(){var t=this.chart,e=this._getValueScale(),n=this.getMeta().data,i=this.getDataset(),a=n.length,r=0;for(H.canvas.clipArea(t.ctx,t.chartArea);r<a;++r){var o=e._parseValue(i.data[r]);isNaN(o.min)||isNaN(o.max)||n[r].draw()}H.canvas.unclipArea(t.ctx)},_resolveDataElementOptions:function(){var t=this,e=H.extend({},it.prototype._resolveDataElementOptions.apply(t,arguments)),n=t._getIndexScale().options,i=t._getValueScale().options;return e.barPercentage=Pt(n.barPercentage,e.barPercentage),e.barThickness=Pt(n.barThickness,e.barThickness),e.categoryPercentage=Pt(n.categoryPercentage,e.categoryPercentage),e.maxBarThickness=Pt(n.maxBarThickness,e.maxBarThickness),e.minBarLength=Pt(i.minBarLength,e.minBarLength),e}}),At=H.valueOrDefault,Ft=H.options.resolve;W._set("bubble",{hover:{mode:"single"},scales:{xAxes:[{type:"linear",position:"bottom",id:"x-axis-0"}],yAxes:[{type:"linear",position:"left",id:"y-axis-0"}]},tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.datasets[t.datasetIndex].label||"",i=e.datasets[t.datasetIndex].data[t.index];return n+": ("+t.xLabel+", "+t.yLabel+", "+i.r+")"}}}});var It=it.extend({dataElementType:wt.Point,_dataElementOptions:["backgroundColor","borderColor","borderWidth","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth","hoverRadius","hitRadius","pointStyle","rotation"],update:function(t){var e=this,n=e.getMeta().data;H.each(n,(function(n,i){e.updateElement(n,i,t)}))},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=t.custom||{},o=i.getScaleForId(a.xAxisID),s=i.getScaleForId(a.yAxisID),l=i._resolveDataElementOptions(t,e),u=i.getDataset().data[e],d=i.index,h=n?o.getPixelForDecimal(.5):o.getPixelForValue("object"==typeof u?u:NaN,e,d),c=n?s.getBasePixel():s.getPixelForValue(u,e,d);t._xScale=o,t._yScale=s,t._options=l,t._datasetIndex=d,t._index=e,t._model={backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,hitRadius:l.hitRadius,pointStyle:l.pointStyle,rotation:l.rotation,radius:n?0:l.radius,skip:r.skip||isNaN(h)||isNaN(c),x:h,y:c},t.pivot()},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=At(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=At(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=At(n.hoverBorderWidth,n.borderWidth),e.radius=n.radius+n.hoverRadius},_resolveDataElementOptions:function(t,e){var n=this,i=n.chart,a=n.getDataset(),r=t.custom||{},o=a.data[e]||{},s=it.prototype._resolveDataElementOptions.apply(n,arguments),l={chart:i,dataIndex:e,dataset:a,datasetIndex:n.index};return n._cachedDataOpts===s&&(s=H.extend({},s)),s.radius=Ft([r.radius,o.r,n._config.radius,i.options.elements.point.radius],l,e),s}}),Lt=H.valueOrDefault,Rt=Math.PI,Nt=2*Rt,Wt=Rt/2;W._set("doughnut",{animation:{animateRotate:!0,animateScale:!1},hover:{mode:"single"},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r]&&(a.data[r].hidden=!a.data[r].hidden);o.update()}},cutoutPercentage:50,rotation:-Wt,circumference:Nt,tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.labels[t.index],i=": "+e.datasets[t.datasetIndex].data[t.index];return H.isArray(n)?(n=n.slice())[0]+=i:n+=i,n}}}});var Yt=it.extend({dataElementType:wt.Arc,linkScales:H.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],getRingIndex:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&++e;return e},update:function(t){var e,n,i,a,r=this,o=r.chart,s=o.chartArea,l=o.options,u=1,d=1,h=0,c=0,f=r.getMeta(),g=f.data,m=l.cutoutPercentage/100||0,p=l.circumference,v=r._getRingWeight(r.index);if(p<Nt){var b=l.rotation%Nt,y=(b+=b>=Rt?-Nt:b<-Rt?Nt:0)+p,x=Math.cos(b),_=Math.sin(b),w=Math.cos(y),k=Math.sin(y),M=b<=0&&y>=0||y>=Nt,S=b<=Wt&&y>=Wt||y>=Nt+Wt,D=b<=-Wt&&y>=-Wt||y>=Rt+Wt,C=b===-Rt||y>=Rt?-1:Math.min(x,x*m,w,w*m),P=D?-1:Math.min(_,_*m,k,k*m),T=M?1:Math.max(x,x*m,w,w*m),O=S?1:Math.max(_,_*m,k,k*m);u=(T-C)/2,d=(O-P)/2,h=-(T+C)/2,c=-(O+P)/2}for(i=0,a=g.length;i<a;++i)g[i]._options=r._resolveDataElementOptions(g[i],i);for(o.borderWidth=r.getMaxBorderWidth(),e=(s.right-s.left-o.borderWidth)/u,n=(s.bottom-s.top-o.borderWidth)/d,o.outerRadius=Math.max(Math.min(e,n)/2,0),o.innerRadius=Math.max(o.outerRadius*m,0),o.radiusLength=(o.outerRadius-o.innerRadius)/(r._getVisibleDatasetWeightTotal()||1),o.offsetX=h*o.outerRadius,o.offsetY=c*o.outerRadius,f.total=r.calculateTotal(),r.outerRadius=o.outerRadius-o.radiusLength*r._getRingWeightOffset(r.index),r.innerRadius=Math.max(r.outerRadius-o.radiusLength*v,0),i=0,a=g.length;i<a;++i)r.updateElement(g[i],i,t)},updateElement:function(t,e,n){var i=this,a=i.chart,r=a.chartArea,o=a.options,s=o.animation,l=(r.left+r.right)/2,u=(r.top+r.bottom)/2,d=o.rotation,h=o.rotation,c=i.getDataset(),f=n&&s.animateRotate?0:t.hidden?0:i.calculateCircumference(c.data[e])*(o.circumference/Nt),g=n&&s.animateScale?0:i.innerRadius,m=n&&s.animateScale?0:i.outerRadius,p=t._options||{};H.extend(t,{_datasetIndex:i.index,_index:e,_model:{backgroundColor:p.backgroundColor,borderColor:p.borderColor,borderWidth:p.borderWidth,borderAlign:p.borderAlign,x:l+a.offsetX,y:u+a.offsetY,startAngle:d,endAngle:h,circumference:f,outerRadius:m,innerRadius:g,label:H.valueAtIndexOrDefault(c.label,e,a.data.labels[e])}});var v=t._model;n&&s.animateRotate||(v.startAngle=0===e?o.rotation:i.getMeta().data[e-1]._model.endAngle,v.endAngle=v.startAngle+v.circumference),t.pivot()},calculateTotal:function(){var t,e=this.getDataset(),n=this.getMeta(),i=0;return H.each(n.data,(function(n,a){t=e.data[a],isNaN(t)||n.hidden||(i+=Math.abs(t))})),i},calculateCircumference:function(t){var e=this.getMeta().total;return e>0&&!isNaN(t)?Nt*(Math.abs(t)/e):0},getMaxBorderWidth:function(t){var e,n,i,a,r,o,s,l,u=0,d=this.chart;if(!t)for(e=0,n=d.data.datasets.length;e<n;++e)if(d.isDatasetVisible(e)){t=(i=d.getDatasetMeta(e)).data,e!==this.index&&(r=i.controller);break}if(!t)return 0;for(e=0,n=t.length;e<n;++e)a=t[e],r?(r._configure(),o=r._resolveDataElementOptions(a,e)):o=a._options,"inner"!==o.borderAlign&&(s=o.borderWidth,u=(l=o.hoverBorderWidth)>(u=s>u?s:u)?l:u);return u},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=Lt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Lt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Lt(n.hoverBorderWidth,n.borderWidth)},_getRingWeightOffset:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&(e+=this._getRingWeight(n));return e},_getRingWeight:function(t){return Math.max(Lt(this.chart.data.datasets[t].weight,1),0)},_getVisibleDatasetWeightTotal:function(){return this._getRingWeightOffset(this.chart.data.datasets.length)}});W._set("horizontalBar",{hover:{mode:"index",axis:"y"},scales:{xAxes:[{type:"linear",position:"bottom"}],yAxes:[{type:"category",position:"left",offset:!0,gridLines:{offsetGridLines:!0}}]},elements:{rectangle:{borderSkipped:"left"}},tooltips:{mode:"index",axis:"y"}}),W._set("global",{datasets:{horizontalBar:{categoryPercentage:.8,barPercentage:.9}}});var zt=Ot.extend({_getValueScaleId:function(){return this.getMeta().xAxisID},_getIndexScaleId:function(){return this.getMeta().yAxisID}}),Et=H.valueOrDefault,Vt=H.options.resolve,Ht=H.canvas._isPointInArea;function Bt(t,e){var n=t&&t.options.ticks||{},i=n.reverse,a=void 0===n.min?e:0,r=void 0===n.max?e:0;return{start:i?r:a,end:i?a:r}}function jt(t,e,n){var i=n/2,a=Bt(t,i),r=Bt(e,i);return{top:r.end,right:a.end,bottom:r.start,left:a.start}}function Ut(t){var e,n,i,a;return H.isObject(t)?(e=t.top,n=t.right,i=t.bottom,a=t.left):e=n=i=a=t,{top:e,right:n,bottom:i,left:a}}W._set("line",{showLines:!0,spanGaps:!1,hover:{mode:"label"},scales:{xAxes:[{type:"category",id:"x-axis-0"}],yAxes:[{type:"linear",id:"y-axis-0"}]}});var Gt=it.extend({datasetElementType:wt.Line,dataElementType:wt.Point,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth","cubicInterpolationMode","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.options,l=i._config,u=i._showLine=Et(l.showLine,s.showLines);for(i._xScale=i.getScaleForId(a.xAxisID),i._yScale=i.getScaleForId(a.yAxisID),u&&(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=i._yScale,r._datasetIndex=i.index,r._children=o,r._model=i._resolveDatasetElementOptions(r),r.pivot()),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(u&&0!==r._model.tension&&i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i,a,r=this,o=r.getMeta(),s=t.custom||{},l=r.getDataset(),u=r.index,d=l.data[e],h=r._xScale,c=r._yScale,f=o.dataset._model,g=r._resolveDataElementOptions(t,e);i=h.getPixelForValue("object"==typeof d?d:NaN,e,u),a=n?c.getBasePixel():r.calculatePointY(d,e,u),t._xScale=h,t._yScale=c,t._options=g,t._datasetIndex=u,t._index=e,t._model={x:i,y:a,skip:s.skip||isNaN(i)||isNaN(a),radius:g.radius,pointStyle:g.pointStyle,rotation:g.rotation,backgroundColor:g.backgroundColor,borderColor:g.borderColor,borderWidth:g.borderWidth,tension:Et(s.tension,f?f.tension:0),steppedLine:!!f&&f.steppedLine,hitRadius:g.hitRadius}},_resolveDatasetElementOptions:function(t){var e=this,n=e._config,i=t.custom||{},a=e.chart.options,r=a.elements.line,o=it.prototype._resolveDatasetElementOptions.apply(e,arguments);return o.spanGaps=Et(n.spanGaps,a.spanGaps),o.tension=Et(n.lineTension,r.tension),o.steppedLine=Vt([i.steppedLine,n.steppedLine,r.stepped]),o.clip=Ut(Et(n.clip,jt(e._xScale,e._yScale,o.borderWidth))),o},calculatePointY:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._yScale,c=0,f=0;if(h.options.stacked){for(s=+h.getRightValue(t),u=(l=d._getSortedVisibleDatasetMetas()).length,i=0;i<u&&(r=l[i]).index!==n;++i)a=d.data.datasets[r.index],"line"===r.type&&r.yAxisID===h.id&&((o=+h.getRightValue(a.data[e]))<0?f+=o||0:c+=o||0);return s<0?h.getPixelForValue(f+s):h.getPixelForValue(c+s)}return h.getPixelForValue(t)},updateBezierControlPoints:function(){var t,e,n,i,a=this.chart,r=this.getMeta(),o=r.dataset._model,s=a.chartArea,l=r.data||[];function u(t,e,n){return Math.max(Math.min(t,n),e)}if(o.spanGaps&&(l=l.filter((function(t){return!t._model.skip}))),"monotone"===o.cubicInterpolationMode)H.splineCurveMonotone(l);else for(t=0,e=l.length;t<e;++t)n=l[t]._model,i=H.splineCurve(H.previousItem(l,t)._model,n,H.nextItem(l,t)._model,o.tension),n.controlPointPreviousX=i.previous.x,n.controlPointPreviousY=i.previous.y,n.controlPointNextX=i.next.x,n.controlPointNextY=i.next.y;if(a.options.elements.line.capBezierPoints)for(t=0,e=l.length;t<e;++t)n=l[t]._model,Ht(n,s)&&(t>0&&Ht(l[t-1]._model,s)&&(n.controlPointPreviousX=u(n.controlPointPreviousX,s.left,s.right),n.controlPointPreviousY=u(n.controlPointPreviousY,s.top,s.bottom)),t<l.length-1&&Ht(l[t+1]._model,s)&&(n.controlPointNextX=u(n.controlPointNextX,s.left,s.right),n.controlPointNextY=u(n.controlPointNextY,s.top,s.bottom)))},draw:function(){var t,e=this.chart,n=this.getMeta(),i=n.data||[],a=e.chartArea,r=e.canvas,o=0,s=i.length;for(this._showLine&&(t=n.dataset._model.clip,H.canvas.clipArea(e.ctx,{left:!1===t.left?0:a.left-t.left,right:!1===t.right?r.width:a.right+t.right,top:!1===t.top?0:a.top-t.top,bottom:!1===t.bottom?r.height:a.bottom+t.bottom}),n.dataset.draw(),H.canvas.unclipArea(e.ctx));o<s;++o)i[o].draw(a)},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Et(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Et(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Et(n.hoverBorderWidth,n.borderWidth),e.radius=Et(n.hoverRadius,n.radius)}}),qt=H.options.resolve;W._set("polarArea",{scale:{type:"radialLinear",angleLines:{display:!1},gridLines:{circular:!0},pointLabels:{display:!1},ticks:{beginAtZero:!0}},animation:{animateRotate:!0,animateScale:!0},startAngle:-.5*Math.PI,legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r].hidden=!a.data[r].hidden;o.update()}},tooltips:{callbacks:{title:function(){return""},label:function(t,e){return e.labels[t.index]+": "+t.yLabel}}}});var Zt=it.extend({dataElementType:wt.Arc,linkScales:H.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i,a=this,r=a.getDataset(),o=a.getMeta(),s=a.chart.options.startAngle||0,l=a._starts=[],u=a._angles=[],d=o.data;for(a._updateRadius(),o.count=a.countVisibleElements(),e=0,n=r.data.length;e<n;e++)l[e]=s,i=a._computeAngle(e),u[e]=i,s+=i;for(e=0,n=d.length;e<n;++e)d[e]._options=a._resolveDataElementOptions(d[e],e),a.updateElement(d[e],e,t)},_updateRadius:function(){var t=this,e=t.chart,n=e.chartArea,i=e.options,a=Math.min(n.right-n.left,n.bottom-n.top);e.outerRadius=Math.max(a/2,0),e.innerRadius=Math.max(i.cutoutPercentage?e.outerRadius/100*i.cutoutPercentage:1,0),e.radiusLength=(e.outerRadius-e.innerRadius)/e.getVisibleDatasetCount(),t.outerRadius=e.outerRadius-e.radiusLength*t.index,t.innerRadius=t.outerRadius-e.radiusLength},updateElement:function(t,e,n){var i=this,a=i.chart,r=i.getDataset(),o=a.options,s=o.animation,l=a.scale,u=a.data.labels,d=l.xCenter,h=l.yCenter,c=o.startAngle,f=t.hidden?0:l.getDistanceFromCenterForValue(r.data[e]),g=i._starts[e],m=g+(t.hidden?0:i._angles[e]),p=s.animateScale?0:l.getDistanceFromCenterForValue(r.data[e]),v=t._options||{};H.extend(t,{_datasetIndex:i.index,_index:e,_scale:l,_model:{backgroundColor:v.backgroundColor,borderColor:v.borderColor,borderWidth:v.borderWidth,borderAlign:v.borderAlign,x:d,y:h,innerRadius:0,outerRadius:n?p:f,startAngle:n&&s.animateRotate?c:g,endAngle:n&&s.animateRotate?c:m,label:H.valueAtIndexOrDefault(u,e,u[e])}}),t.pivot()},countVisibleElements:function(){var t=this.getDataset(),e=this.getMeta(),n=0;return H.each(e.data,(function(e,i){isNaN(t.data[i])||e.hidden||n++})),n},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor,a=H.valueOrDefault;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=a(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=a(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=a(n.hoverBorderWidth,n.borderWidth)},_computeAngle:function(t){var e=this,n=this.getMeta().count,i=e.getDataset(),a=e.getMeta();if(isNaN(i.data[t])||a.data[t].hidden)return 0;var r={chart:e.chart,dataIndex:t,dataset:i,datasetIndex:e.index};return qt([e.chart.options.elements.arc.angle,2*Math.PI/n],r,t)}});W._set("pie",H.clone(W.doughnut)),W._set("pie",{cutoutPercentage:0});var $t=Yt,Xt=H.valueOrDefault;W._set("radar",{spanGaps:!1,scale:{type:"radialLinear"},elements:{line:{fill:"start",tension:0}}});var Kt=it.extend({datasetElementType:wt.Line,dataElementType:wt.Point,linkScales:H.noop,_datasetElementOptions:["backgroundColor","borderWidth","borderColor","borderCapStyle","borderDash","borderDashOffset","borderJoinStyle","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.scale,l=i._config;for(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=s,r._datasetIndex=i.index,r._children=o,r._loop=!0,r._model=i._resolveDatasetElementOptions(r),r.pivot(),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i=this,a=t.custom||{},r=i.getDataset(),o=i.chart.scale,s=o.getPointPositionForValue(e,r.data[e]),l=i._resolveDataElementOptions(t,e),u=i.getMeta().dataset._model,d=n?o.xCenter:s.x,h=n?o.yCenter:s.y;t._scale=o,t._options=l,t._datasetIndex=i.index,t._index=e,t._model={x:d,y:h,skip:a.skip||isNaN(d)||isNaN(h),radius:l.radius,pointStyle:l.pointStyle,rotation:l.rotation,backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,tension:Xt(a.tension,u?u.tension:0),hitRadius:l.hitRadius}},_resolveDatasetElementOptions:function(){var t=this,e=t._config,n=t.chart.options,i=it.prototype._resolveDatasetElementOptions.apply(t,arguments);return i.spanGaps=Xt(e.spanGaps,n.spanGaps),i.tension=Xt(e.lineTension,n.elements.line.tension),i},updateBezierControlPoints:function(){var t,e,n,i,a=this.getMeta(),r=this.chart.chartArea,o=a.data||[];function s(t,e,n){return Math.max(Math.min(t,n),e)}for(a.dataset._model.spanGaps&&(o=o.filter((function(t){return!t._model.skip}))),t=0,e=o.length;t<e;++t)n=o[t]._model,i=H.splineCurve(H.previousItem(o,t,!0)._model,n,H.nextItem(o,t,!0)._model,n.tension),n.controlPointPreviousX=s(i.previous.x,r.left,r.right),n.controlPointPreviousY=s(i.previous.y,r.top,r.bottom),n.controlPointNextX=s(i.next.x,r.left,r.right),n.controlPointNextY=s(i.next.y,r.top,r.bottom)},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Xt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Xt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Xt(n.hoverBorderWidth,n.borderWidth),e.radius=Xt(n.hoverRadius,n.radius)}});W._set("scatter",{hover:{mode:"single"},scales:{xAxes:[{id:"x-axis-1",type:"linear",position:"bottom"}],yAxes:[{id:"y-axis-1",type:"linear",position:"left"}]},tooltips:{callbacks:{title:function(){return""},label:function(t){return"("+t.xLabel+", "+t.yLabel+")"}}}}),W._set("global",{datasets:{scatter:{showLine:!1}}});var Jt={bar:Ot,bubble:It,doughnut:Yt,horizontalBar:zt,line:Gt,polarArea:Zt,pie:$t,radar:Kt,scatter:Gt};function Qt(t,e){return t.native?{x:t.x,y:t.y}:H.getRelativePosition(t,e)}function te(t,e){var n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas();for(i=0,r=l.length;i<r;++i)for(a=0,o=(n=l[i].data).length;a<o;++a)(s=n[a])._view.skip||e(s)}function ee(t,e){var n=[];return te(t,(function(t){t.inRange(e.x,e.y)&&n.push(t)})),n}function ne(t,e,n,i){var a=Number.POSITIVE_INFINITY,r=[];return te(t,(function(t){if(!n||t.inRange(e.x,e.y)){var o=t.getCenterPoint(),s=i(e,o);s<a?(r=[t],a=s):s===a&&r.push(t)}})),r}function ie(t){var e=-1!==t.indexOf("x"),n=-1!==t.indexOf("y");return function(t,i){var a=e?Math.abs(t.x-i.x):0,r=n?Math.abs(t.y-i.y):0;return Math.sqrt(Math.pow(a,2)+Math.pow(r,2))}}function ae(t,e,n){var i=Qt(e,t);n.axis=n.axis||"x";var a=ie(n.axis),r=n.intersect?ee(t,i):ne(t,i,!1,a),o=[];return r.length?(t._getSortedVisibleDatasetMetas().forEach((function(t){var e=t.data[r[0]._index];e&&!e._view.skip&&o.push(e)})),o):[]}var re={modes:{single:function(t,e){var n=Qt(e,t),i=[];return te(t,(function(t){if(t.inRange(n.x,n.y))return i.push(t),i})),i.slice(0,1)},label:ae,index:ae,dataset:function(t,e,n){var i=Qt(e,t);n.axis=n.axis||"xy";var a=ie(n.axis),r=n.intersect?ee(t,i):ne(t,i,!1,a);return r.length>0&&(r=t.getDatasetMeta(r[0]._datasetIndex).data),r},"x-axis":function(t,e){return ae(t,e,{intersect:!1})},point:function(t,e){return ee(t,Qt(e,t))},nearest:function(t,e,n){var i=Qt(e,t);n.axis=n.axis||"xy";var a=ie(n.axis);return ne(t,i,n.intersect,a)},x:function(t,e,n){var i=Qt(e,t),a=[],r=!1;return te(t,(function(t){t.inXRange(i.x)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a},y:function(t,e,n){var i=Qt(e,t),a=[],r=!1;return te(t,(function(t){t.inYRange(i.y)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a}}},oe=H.extend;function se(t,e){return H.where(t,(function(t){return t.pos===e}))}function le(t,e){return t.sort((function(t,n){var i=e?n:t,a=e?t:n;return i.weight===a.weight?i.index-a.index:i.weight-a.weight}))}function ue(t,e,n,i){return Math.max(t[n],e[n])+Math.max(t[i],e[i])}function de(t,e,n){var i,a,r=n.box,o=t.maxPadding;if(n.size&&(t[n.pos]-=n.size),n.size=n.horizontal?r.height:r.width,t[n.pos]+=n.size,r.getPadding){var s=r.getPadding();o.top=Math.max(o.top,s.top),o.left=Math.max(o.left,s.left),o.bottom=Math.max(o.bottom,s.bottom),o.right=Math.max(o.right,s.right)}if(i=e.outerWidth-ue(o,t,"left","right"),a=e.outerHeight-ue(o,t,"top","bottom"),i!==t.w||a!==t.h)return t.w=i,t.h=a,n.horizontal?i!==t.w:a!==t.h}function he(t,e){var n=e.maxPadding;function i(t){var i={left:0,top:0,right:0,bottom:0};return t.forEach((function(t){i[t]=Math.max(e[t],n[t])})),i}return i(t?["left","right"]:["top","bottom"])}function ce(t,e,n){var i,a,r,o,s,l,u=[];for(i=0,a=t.length;i<a;++i)(o=(r=t[i]).box).update(r.width||e.w,r.height||e.h,he(r.horizontal,e)),de(e,n,r)&&(l=!0,u.length&&(s=!0)),o.fullWidth||u.push(r);return s&&ce(u,e,n)||l}function fe(t,e,n){var i,a,r,o,s=n.padding,l=e.x,u=e.y;for(i=0,a=t.length;i<a;++i)o=(r=t[i]).box,r.horizontal?(o.left=o.fullWidth?s.left:e.left,o.right=o.fullWidth?n.outerWidth-s.right:e.left+e.w,o.top=u,o.bottom=u+o.height,o.width=o.right-o.left,u=o.bottom):(o.left=l,o.right=l+o.width,o.top=e.top,o.bottom=e.top+e.h,o.height=o.bottom-o.top,l=o.right);e.x=l,e.y=u}W._set("global",{layout:{padding:{top:0,right:0,bottom:0,left:0}}});var ge,me={defaults:{},addBox:function(t,e){t.boxes||(t.boxes=[]),e.fullWidth=e.fullWidth||!1,e.position=e.position||"top",e.weight=e.weight||0,e._layers=e._layers||function(){return[{z:0,draw:function(){e.draw.apply(e,arguments)}}]},t.boxes.push(e)},removeBox:function(t,e){var n=t.boxes?t.boxes.indexOf(e):-1;-1!==n&&t.boxes.splice(n,1)},configure:function(t,e,n){for(var i,a=["fullWidth","position","weight"],r=a.length,o=0;o<r;++o)i=a[o],n.hasOwnProperty(i)&&(e[i]=n[i])},update:function(t,e,n){if(t){var i=t.options.layout||{},a=H.options.toPadding(i.padding),r=e-a.width,o=n-a.height,s=function(t){var e=function(t){var e,n,i,a=[];for(e=0,n=(t||[]).length;e<n;++e)i=t[e],a.push({index:e,box:i,pos:i.position,horizontal:i.isHorizontal(),weight:i.weight});return a}(t),n=le(se(e,"left"),!0),i=le(se(e,"right")),a=le(se(e,"top"),!0),r=le(se(e,"bottom"));return{leftAndTop:n.concat(a),rightAndBottom:i.concat(r),chartArea:se(e,"chartArea"),vertical:n.concat(i),horizontal:a.concat(r)}}(t.boxes),l=s.vertical,u=s.horizontal,d=Object.freeze({outerWidth:e,outerHeight:n,padding:a,availableWidth:r,vBoxMaxWidth:r/2/l.length,hBoxMaxHeight:o/2}),h=oe({maxPadding:oe({},a),w:r,h:o,x:a.left,y:a.top},a);!function(t,e){var n,i,a;for(n=0,i=t.length;n<i;++n)(a=t[n]).width=a.horizontal?a.box.fullWidth&&e.availableWidth:e.vBoxMaxWidth,a.height=a.horizontal&&e.hBoxMaxHeight}(l.concat(u),d),ce(l,h,d),ce(u,h,d)&&ce(l,h,d),function(t){var e=t.maxPadding;function n(n){var i=Math.max(e[n]-t[n],0);return t[n]+=i,i}t.y+=n("top"),t.x+=n("left"),n("right"),n("bottom")}(h),fe(s.leftAndTop,h,d),h.x+=h.w,h.y+=h.h,fe(s.rightAndBottom,h,d),t.chartArea={left:h.left,top:h.top,right:h.left+h.w,bottom:h.top+h.h},H.each(s.chartArea,(function(e){var n=e.box;oe(n,t.chartArea),n.update(h.w,h.h)}))}}},pe=(ge=Object.freeze({__proto__:null,default:"@keyframes chartjs-render-animation{from{opacity:.99}to{opacity:1}}.chartjs-render-monitor{animation:chartjs-render-animation 1ms}.chartjs-size-monitor,.chartjs-size-monitor-expand,.chartjs-size-monitor-shrink{position:absolute;direction:ltr;left:0;top:0;right:0;bottom:0;overflow:hidden;pointer-events:none;visibility:hidden;z-index:-1}.chartjs-size-monitor-expand>div{position:absolute;width:1000000px;height:1000000px;left:0;top:0}.chartjs-size-monitor-shrink>div{position:absolute;width:200%;height:200%;left:0;top:0}"}))&&ge.default||ge,ve="$chartjs",be="chartjs-size-monitor",ye="chartjs-render-monitor",xe="chartjs-render-animation",_e=["animationstart","webkitAnimationStart"],we={touchstart:"mousedown",touchmove:"mousemove",touchend:"mouseup",pointerenter:"mouseenter",pointerdown:"mousedown",pointermove:"mousemove",pointerup:"mouseup",pointerleave:"mouseout",pointerout:"mouseout"};function ke(t,e){var n=H.getStyle(t,e),i=n&&n.match(/^(\d+)(\.\d+)?px$/);return i?Number(i[1]):void 0}var Me=!!function(){var t=!1;try{var e=Object.defineProperty({},"passive",{get:function(){t=!0}});window.addEventListener("e",null,e)}catch(t){}return t}()&&{passive:!0};function Se(t,e,n){t.addEventListener(e,n,Me)}function De(t,e,n){t.removeEventListener(e,n,Me)}function Ce(t,e,n,i,a){return{type:t,chart:e,native:a||null,x:void 0!==n?n:null,y:void 0!==i?i:null}}function Pe(t){var e=document.createElement("div");return e.className=t||"",e}function Te(t,e,n){var i,a,r,o,s=t[ve]||(t[ve]={}),l=s.resizer=function(t){var e=Pe(be),n=Pe(be+"-expand"),i=Pe(be+"-shrink");n.appendChild(Pe()),i.appendChild(Pe()),e.appendChild(n),e.appendChild(i),e._reset=function(){n.scrollLeft=1e6,n.scrollTop=1e6,i.scrollLeft=1e6,i.scrollTop=1e6};var a=function(){e._reset(),t()};return Se(n,"scroll",a.bind(n,"expand")),Se(i,"scroll",a.bind(i,"shrink")),e}((i=function(){if(s.resizer){var i=n.options.maintainAspectRatio&&t.parentNode,a=i?i.clientWidth:0;e(Ce("resize",n)),i&&i.clientWidth<a&&n.canvas&&e(Ce("resize",n))}},r=!1,o=[],function(){o=Array.prototype.slice.call(arguments),a=a||this,r||(r=!0,H.requestAnimFrame.call(window,(function(){r=!1,i.apply(a,o)})))}));!function(t,e){var n=t[ve]||(t[ve]={}),i=n.renderProxy=function(t){t.animationName===xe&&e()};H.each(_e,(function(e){Se(t,e,i)})),n.reflow=!!t.offsetParent,t.classList.add(ye)}(t,(function(){if(s.resizer){var e=t.parentNode;e&&e!==l.parentNode&&e.insertBefore(l,e.firstChild),l._reset()}}))}function Oe(t){var e=t[ve]||{},n=e.resizer;delete e.resizer,function(t){var e=t[ve]||{},n=e.renderProxy;n&&(H.each(_e,(function(e){De(t,e,n)})),delete e.renderProxy),t.classList.remove(ye)}(t),n&&n.parentNode&&n.parentNode.removeChild(n)}var Ae={disableCSSInjection:!1,_enabled:"undefined"!=typeof window&&"undefined"!=typeof document,_ensureLoaded:function(t){if(!this.disableCSSInjection){var e=t.getRootNode?t.getRootNode():document;!function(t,e){var n=t[ve]||(t[ve]={});if(!n.containsStyles){n.containsStyles=!0,e="/* Chart.js */\n"+e;var i=document.createElement("style");i.setAttribute("type","text/css"),i.appendChild(document.createTextNode(e)),t.appendChild(i)}}(e.host?e:document.head,pe)}},acquireContext:function(t,e){"string"==typeof t?t=document.getElementById(t):t.length&&(t=t[0]),t&&t.canvas&&(t=t.canvas);var n=t&&t.getContext&&t.getContext("2d");return n&&n.canvas===t?(this._ensureLoaded(t),function(t,e){var n=t.style,i=t.getAttribute("height"),a=t.getAttribute("width");if(t[ve]={initial:{height:i,width:a,style:{display:n.display,height:n.height,width:n.width}}},n.display=n.display||"block",null===a||""===a){var r=ke(t,"width");void 0!==r&&(t.width=r)}if(null===i||""===i)if(""===t.style.height)t.height=t.width/(e.options.aspectRatio||2);else{var o=ke(t,"height");void 0!==r&&(t.height=o)}}(t,e),n):null},releaseContext:function(t){var e=t.canvas;if(e[ve]){var n=e[ve].initial;["height","width"].forEach((function(t){var i=n[t];H.isNullOrUndef(i)?e.removeAttribute(t):e.setAttribute(t,i)})),H.each(n.style||{},(function(t,n){e.style[n]=t})),e.width=e.width,delete e[ve]}},addEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=n[ve]||(n[ve]={});Se(i,e,(a.proxies||(a.proxies={}))[t.id+"_"+e]=function(e){n(function(t,e){var n=we[t.type]||t.type,i=H.getRelativePosition(t,e);return Ce(n,e,i.x,i.y,t)}(e,t))})}else Te(i,n,t)},removeEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=((n[ve]||{}).proxies||{})[t.id+"_"+e];a&&De(i,e,a)}else Oe(i)}};H.addEvent=Se,H.removeEvent=De;var Fe=Ae._enabled?Ae:{acquireContext:function(t){return t&&t.canvas&&(t=t.canvas),t&&t.getContext("2d")||null}},Ie=H.extend({initialize:function(){},acquireContext:function(){},releaseContext:function(){},addEventListener:function(){},removeEventListener:function(){}},Fe);W._set("global",{plugins:{}});var Le={_plugins:[],_cacheId:0,register:function(t){var e=this._plugins;[].concat(t).forEach((function(t){-1===e.indexOf(t)&&e.push(t)})),this._cacheId++},unregister:function(t){var e=this._plugins;[].concat(t).forEach((function(t){var n=e.indexOf(t);-1!==n&&e.splice(n,1)})),this._cacheId++},clear:function(){this._plugins=[],this._cacheId++},count:function(){return this._plugins.length},getAll:function(){return this._plugins},notify:function(t,e,n){var i,a,r,o,s,l=this.descriptors(t),u=l.length;for(i=0;i<u;++i)if("function"==typeof(s=(r=(a=l[i]).plugin)[e])&&((o=[t].concat(n||[])).push(a.options),!1===s.apply(r,o)))return!1;return!0},descriptors:function(t){var e=t.$plugins||(t.$plugins={});if(e.id===this._cacheId)return e.descriptors;var n=[],i=[],a=t&&t.config||{},r=a.options&&a.options.plugins||{};return this._plugins.concat(a.plugins||[]).forEach((function(t){if(-1===n.indexOf(t)){var e=t.id,a=r[e];!1!==a&&(!0===a&&(a=H.clone(W.global.plugins[e])),n.push(t),i.push({plugin:t,options:a||{}}))}})),e.descriptors=i,e.id=this._cacheId,i},_invalidate:function(t){delete t.$plugins}},Re={constructors:{},defaults:{},registerScaleType:function(t,e,n){this.constructors[t]=e,this.defaults[t]=H.clone(n)},getScaleConstructor:function(t){return this.constructors.hasOwnProperty(t)?this.constructors[t]:void 0},getScaleDefaults:function(t){return this.defaults.hasOwnProperty(t)?H.merge({},[W.scale,this.defaults[t]]):{}},updateScaleDefaults:function(t,e){this.defaults.hasOwnProperty(t)&&(this.defaults[t]=H.extend(this.defaults[t],e))},addScalesToLayout:function(t){H.each(t.scales,(function(e){e.fullWidth=e.options.fullWidth,e.position=e.options.position,e.weight=e.options.weight,me.addBox(t,e)}))}},Ne=H.valueOrDefault,We=H.rtl.getRtlAdapter;W._set("global",{tooltips:{enabled:!0,custom:null,mode:"nearest",position:"average",intersect:!0,backgroundColor:"rgba(0,0,0,0.8)",titleFontStyle:"bold",titleSpacing:2,titleMarginBottom:6,titleFontColor:"#fff",titleAlign:"left",bodySpacing:2,bodyFontColor:"#fff",bodyAlign:"left",footerFontStyle:"bold",footerSpacing:2,footerMarginTop:6,footerFontColor:"#fff",footerAlign:"left",yPadding:6,xPadding:6,caretPadding:2,caretSize:5,cornerRadius:6,multiKeyBackground:"#fff",displayColors:!0,borderColor:"rgba(0,0,0,0)",borderWidth:0,callbacks:{beforeTitle:H.noop,title:function(t,e){var n="",i=e.labels,a=i?i.length:0;if(t.length>0){var r=t[0];r.label?n=r.label:r.xLabel?n=r.xLabel:a>0&&r.index<a&&(n=i[r.index])}return n},afterTitle:H.noop,beforeBody:H.noop,beforeLabel:H.noop,label:function(t,e){var n=e.datasets[t.datasetIndex].label||"";return n&&(n+=": "),H.isNullOrUndef(t.value)?n+=t.yLabel:n+=t.value,n},labelColor:function(t,e){var n=e.getDatasetMeta(t.datasetIndex).data[t.index]._view;return{borderColor:n.borderColor,backgroundColor:n.backgroundColor}},labelTextColor:function(){return this._options.bodyFontColor},afterLabel:H.noop,afterBody:H.noop,beforeFooter:H.noop,footer:H.noop,afterFooter:H.noop}}});var Ye={average:function(t){if(!t.length)return!1;var e,n,i=0,a=0,r=0;for(e=0,n=t.length;e<n;++e){var o=t[e];if(o&&o.hasValue()){var s=o.tooltipPosition();i+=s.x,a+=s.y,++r}}return{x:i/r,y:a/r}},nearest:function(t,e){var n,i,a,r=e.x,o=e.y,s=Number.POSITIVE_INFINITY;for(n=0,i=t.length;n<i;++n){var l=t[n];if(l&&l.hasValue()){var u=l.getCenterPoint(),d=H.distanceBetweenPoints(e,u);d<s&&(s=d,a=l)}}if(a){var h=a.tooltipPosition();r=h.x,o=h.y}return{x:r,y:o}}};function ze(t,e){return e&&(H.isArray(e)?Array.prototype.push.apply(t,e):t.push(e)),t}function Ee(t){return("string"==typeof t||t instanceof String)&&t.indexOf("\n")>-1?t.split("\n"):t}function Ve(t){var e=W.global;return{xPadding:t.xPadding,yPadding:t.yPadding,xAlign:t.xAlign,yAlign:t.yAlign,rtl:t.rtl,textDirection:t.textDirection,bodyFontColor:t.bodyFontColor,_bodyFontFamily:Ne(t.bodyFontFamily,e.defaultFontFamily),_bodyFontStyle:Ne(t.bodyFontStyle,e.defaultFontStyle),_bodyAlign:t.bodyAlign,bodyFontSize:Ne(t.bodyFontSize,e.defaultFontSize),bodySpacing:t.bodySpacing,titleFontColor:t.titleFontColor,_titleFontFamily:Ne(t.titleFontFamily,e.defaultFontFamily),_titleFontStyle:Ne(t.titleFontStyle,e.defaultFontStyle),titleFontSize:Ne(t.titleFontSize,e.defaultFontSize),_titleAlign:t.titleAlign,titleSpacing:t.titleSpacing,titleMarginBottom:t.titleMarginBottom,footerFontColor:t.footerFontColor,_footerFontFamily:Ne(t.footerFontFamily,e.defaultFontFamily),_footerFontStyle:Ne(t.footerFontStyle,e.defaultFontStyle),footerFontSize:Ne(t.footerFontSize,e.defaultFontSize),_footerAlign:t.footerAlign,footerSpacing:t.footerSpacing,footerMarginTop:t.footerMarginTop,caretSize:t.caretSize,cornerRadius:t.cornerRadius,backgroundColor:t.backgroundColor,opacity:0,legendColorBackground:t.multiKeyBackground,displayColors:t.displayColors,borderColor:t.borderColor,borderWidth:t.borderWidth}}function He(t,e){return"center"===e?t.x+t.width/2:"right"===e?t.x+t.width-t.xPadding:t.x+t.xPadding}function Be(t){return ze([],Ee(t))}var je=$.extend({initialize:function(){this._model=Ve(this._options),this._lastActive=[]},getTitle:function(){var t=this,e=t._options,n=e.callbacks,i=n.beforeTitle.apply(t,arguments),a=n.title.apply(t,arguments),r=n.afterTitle.apply(t,arguments),o=[];return o=ze(o,Ee(i)),o=ze(o,Ee(a)),o=ze(o,Ee(r))},getBeforeBody:function(){return Be(this._options.callbacks.beforeBody.apply(this,arguments))},getBody:function(t,e){var n=this,i=n._options.callbacks,a=[];return H.each(t,(function(t){var r={before:[],lines:[],after:[]};ze(r.before,Ee(i.beforeLabel.call(n,t,e))),ze(r.lines,i.label.call(n,t,e)),ze(r.after,Ee(i.afterLabel.call(n,t,e))),a.push(r)})),a},getAfterBody:function(){return Be(this._options.callbacks.afterBody.apply(this,arguments))},getFooter:function(){var t=this,e=t._options.callbacks,n=e.beforeFooter.apply(t,arguments),i=e.footer.apply(t,arguments),a=e.afterFooter.apply(t,arguments),r=[];return r=ze(r,Ee(n)),r=ze(r,Ee(i)),r=ze(r,Ee(a))},update:function(t){var e,n,i,a,r,o,s,l,u,d,h=this,c=h._options,f=h._model,g=h._model=Ve(c),m=h._active,p=h._data,v={xAlign:f.xAlign,yAlign:f.yAlign},b={x:f.x,y:f.y},y={width:f.width,height:f.height},x={x:f.caretX,y:f.caretY};if(m.length){g.opacity=1;var _=[],w=[];x=Ye[c.position].call(h,m,h._eventPosition);var k=[];for(e=0,n=m.length;e<n;++e)k.push((i=m[e],a=void 0,r=void 0,o=void 0,s=void 0,l=void 0,u=void 0,d=void 0,a=i._xScale,r=i._yScale||i._scale,o=i._index,s=i._datasetIndex,l=i._chart.getDatasetMeta(s).controller,u=l._getIndexScale(),d=l._getValueScale(),{xLabel:a?a.getLabelForIndex(o,s):"",yLabel:r?r.getLabelForIndex(o,s):"",label:u?""+u.getLabelForIndex(o,s):"",value:d?""+d.getLabelForIndex(o,s):"",index:o,datasetIndex:s,x:i._model.x,y:i._model.y}));c.filter&&(k=k.filter((function(t){return c.filter(t,p)}))),c.itemSort&&(k=k.sort((function(t,e){return c.itemSort(t,e,p)}))),H.each(k,(function(t){_.push(c.callbacks.labelColor.call(h,t,h._chart)),w.push(c.callbacks.labelTextColor.call(h,t,h._chart))})),g.title=h.getTitle(k,p),g.beforeBody=h.getBeforeBody(k,p),g.body=h.getBody(k,p),g.afterBody=h.getAfterBody(k,p),g.footer=h.getFooter(k,p),g.x=x.x,g.y=x.y,g.caretPadding=c.caretPadding,g.labelColors=_,g.labelTextColors=w,g.dataPoints=k,y=function(t,e){var n=t._chart.ctx,i=2*e.yPadding,a=0,r=e.body,o=r.reduce((function(t,e){return t+e.before.length+e.lines.length+e.after.length}),0);o+=e.beforeBody.length+e.afterBody.length;var s=e.title.length,l=e.footer.length,u=e.titleFontSize,d=e.bodyFontSize,h=e.footerFontSize;i+=s*u,i+=s?(s-1)*e.titleSpacing:0,i+=s?e.titleMarginBottom:0,i+=o*d,i+=o?(o-1)*e.bodySpacing:0,i+=l?e.footerMarginTop:0,i+=l*h,i+=l?(l-1)*e.footerSpacing:0;var c=0,f=function(t){a=Math.max(a,n.measureText(t).width+c)};return n.font=H.fontString(u,e._titleFontStyle,e._titleFontFamily),H.each(e.title,f),n.font=H.fontString(d,e._bodyFontStyle,e._bodyFontFamily),H.each(e.beforeBody.concat(e.afterBody),f),c=e.displayColors?d+2:0,H.each(r,(function(t){H.each(t.before,f),H.each(t.lines,f),H.each(t.after,f)})),c=0,n.font=H.fontString(h,e._footerFontStyle,e._footerFontFamily),H.each(e.footer,f),{width:a+=2*e.xPadding,height:i}}(this,g),b=function(t,e,n,i){var a=t.x,r=t.y,o=t.caretSize,s=t.caretPadding,l=t.cornerRadius,u=n.xAlign,d=n.yAlign,h=o+s,c=l+s;return"right"===u?a-=e.width:"center"===u&&((a-=e.width/2)+e.width>i.width&&(a=i.width-e.width),a<0&&(a=0)),"top"===d?r+=h:r-="bottom"===d?e.height+h:e.height/2,"center"===d?"left"===u?a+=h:"right"===u&&(a-=h):"left"===u?a-=c:"right"===u&&(a+=c),{x:a,y:r}}(g,y,v=function(t,e){var n,i,a,r,o,s=t._model,l=t._chart,u=t._chart.chartArea,d="center",h="center";s.y<e.height?h="top":s.y>l.height-e.height&&(h="bottom");var c=(u.left+u.right)/2,f=(u.top+u.bottom)/2;"center"===h?(n=function(t){return t<=c},i=function(t){return t>c}):(n=function(t){return t<=e.width/2},i=function(t){return t>=l.width-e.width/2}),a=function(t){return t+e.width+s.caretSize+s.caretPadding>l.width},r=function(t){return t-e.width-s.caretSize-s.caretPadding<0},o=function(t){return t<=f?"top":"bottom"},n(s.x)?(d="left",a(s.x)&&(d="center",h=o(s.y))):i(s.x)&&(d="right",r(s.x)&&(d="center",h=o(s.y)));var g=t._options;return{xAlign:g.xAlign?g.xAlign:d,yAlign:g.yAlign?g.yAlign:h}}(this,y),h._chart)}else g.opacity=0;return g.xAlign=v.xAlign,g.yAlign=v.yAlign,g.x=b.x,g.y=b.y,g.width=y.width,g.height=y.height,g.caretX=x.x,g.caretY=x.y,h._model=g,t&&c.custom&&c.custom.call(h,g),h},drawCaret:function(t,e){var n=this._chart.ctx,i=this._view,a=this.getCaretPosition(t,e,i);n.lineTo(a.x1,a.y1),n.lineTo(a.x2,a.y2),n.lineTo(a.x3,a.y3)},getCaretPosition:function(t,e,n){var i,a,r,o,s,l,u=n.caretSize,d=n.cornerRadius,h=n.xAlign,c=n.yAlign,f=t.x,g=t.y,m=e.width,p=e.height;if("center"===c)s=g+p/2,"left"===h?(a=(i=f)-u,r=i,o=s+u,l=s-u):(a=(i=f+m)+u,r=i,o=s-u,l=s+u);else if("left"===h?(i=(a=f+d+u)-u,r=a+u):"right"===h?(i=(a=f+m-d-u)-u,r=a+u):(i=(a=n.caretX)-u,r=a+u),"top"===c)s=(o=g)-u,l=o;else{s=(o=g+p)+u,l=o;var v=r;r=i,i=v}return{x1:i,x2:a,x3:r,y1:o,y2:s,y3:l}},drawTitle:function(t,e,n){var i,a,r,o=e.title,s=o.length;if(s){var l=We(e.rtl,e.x,e.width);for(t.x=He(e,e._titleAlign),n.textAlign=l.textAlign(e._titleAlign),n.textBaseline="middle",i=e.titleFontSize,a=e.titleSpacing,n.fillStyle=e.titleFontColor,n.font=H.fontString(i,e._titleFontStyle,e._titleFontFamily),r=0;r<s;++r)n.fillText(o[r],l.x(t.x),t.y+i/2),t.y+=i+a,r+1===s&&(t.y+=e.titleMarginBottom-a)}},drawBody:function(t,e,n){var i,a,r,o,s,l,u,d,h=e.bodyFontSize,c=e.bodySpacing,f=e._bodyAlign,g=e.body,m=e.displayColors,p=0,v=m?He(e,"left"):0,b=We(e.rtl,e.x,e.width),y=function(e){n.fillText(e,b.x(t.x+p),t.y+h/2),t.y+=h+c},x=b.textAlign(f);for(n.textAlign=f,n.textBaseline="middle",n.font=H.fontString(h,e._bodyFontStyle,e._bodyFontFamily),t.x=He(e,x),n.fillStyle=e.bodyFontColor,H.each(e.beforeBody,y),p=m&&"right"!==x?"center"===f?h/2+1:h+2:0,s=0,u=g.length;s<u;++s){for(i=g[s],a=e.labelTextColors[s],r=e.labelColors[s],n.fillStyle=a,H.each(i.before,y),l=0,d=(o=i.lines).length;l<d;++l){if(m){var _=b.x(v);n.fillStyle=e.legendColorBackground,n.fillRect(b.leftForLtr(_,h),t.y,h,h),n.lineWidth=1,n.strokeStyle=r.borderColor,n.strokeRect(b.leftForLtr(_,h),t.y,h,h),n.fillStyle=r.backgroundColor,n.fillRect(b.leftForLtr(b.xPlus(_,1),h-2),t.y+1,h-2,h-2),n.fillStyle=a}y(o[l])}H.each(i.after,y)}p=0,H.each(e.afterBody,y),t.y-=c},drawFooter:function(t,e,n){var i,a,r=e.footer,o=r.length;if(o){var s=We(e.rtl,e.x,e.width);for(t.x=He(e,e._footerAlign),t.y+=e.footerMarginTop,n.textAlign=s.textAlign(e._footerAlign),n.textBaseline="middle",i=e.footerFontSize,n.fillStyle=e.footerFontColor,n.font=H.fontString(i,e._footerFontStyle,e._footerFontFamily),a=0;a<o;++a)n.fillText(r[a],s.x(t.x),t.y+i/2),t.y+=i+e.footerSpacing}},drawBackground:function(t,e,n,i){n.fillStyle=e.backgroundColor,n.strokeStyle=e.borderColor,n.lineWidth=e.borderWidth;var a=e.xAlign,r=e.yAlign,o=t.x,s=t.y,l=i.width,u=i.height,d=e.cornerRadius;n.beginPath(),n.moveTo(o+d,s),"top"===r&&this.drawCaret(t,i),n.lineTo(o+l-d,s),n.quadraticCurveTo(o+l,s,o+l,s+d),"center"===r&&"right"===a&&this.drawCaret(t,i),n.lineTo(o+l,s+u-d),n.quadraticCurveTo(o+l,s+u,o+l-d,s+u),"bottom"===r&&this.drawCaret(t,i),n.lineTo(o+d,s+u),n.quadraticCurveTo(o,s+u,o,s+u-d),"center"===r&&"left"===a&&this.drawCaret(t,i),n.lineTo(o,s+d),n.quadraticCurveTo(o,s,o+d,s),n.closePath(),n.fill(),e.borderWidth>0&&n.stroke()},draw:function(){var t=this._chart.ctx,e=this._view;if(0!==e.opacity){var n={width:e.width,height:e.height},i={x:e.x,y:e.y},a=Math.abs(e.opacity<.001)?0:e.opacity,r=e.title.length||e.beforeBody.length||e.body.length||e.afterBody.length||e.footer.length;this._options.enabled&&r&&(t.save(),t.globalAlpha=a,this.drawBackground(i,e,t,n),i.y+=e.yPadding,H.rtl.overrideTextDirection(t,e.textDirection),this.drawTitle(i,e,t),this.drawBody(i,e,t),this.drawFooter(i,e,t),H.rtl.restoreTextDirection(t,e.textDirection),t.restore())}},handleEvent:function(t){var e,n=this,i=n._options;return n._lastActive=n._lastActive||[],"mouseout"===t.type?n._active=[]:(n._active=n._chart.getElementsAtEventForMode(t,i.mode,i),i.reverse&&n._active.reverse()),(e=!H.arrayEquals(n._active,n._lastActive))&&(n._lastActive=n._active,(i.enabled||i.custom)&&(n._eventPosition={x:t.x,y:t.y},n.update(!0),n.pivot())),e}}),Ue=Ye,Ge=je;Ge.positioners=Ue;var qe=H.valueOrDefault;function Ze(){return H.merge({},[].slice.call(arguments),{merger:function(t,e,n,i){if("xAxes"===t||"yAxes"===t){var a,r,o,s=n[t].length;for(e[t]||(e[t]=[]),a=0;a<s;++a)o=n[t][a],r=qe(o.type,"xAxes"===t?"category":"linear"),a>=e[t].length&&e[t].push({}),!e[t][a].type||o.type&&o.type!==e[t][a].type?H.merge(e[t][a],[Re.getScaleDefaults(r),o]):H.merge(e[t][a],o)}else H._merger(t,e,n,i)}})}function $e(){return H.merge({},[].slice.call(arguments),{merger:function(t,e,n,i){var a=e[t]||{},r=n[t];"scales"===t?e[t]=Ze(a,r):"scale"===t?e[t]=H.merge(a,[Re.getScaleDefaults(r.type),r]):H._merger(t,e,n,i)}})}function Xe(t){var e=t.options;H.each(t.scales,(function(e){me.removeBox(t,e)})),e=$e(W.global,W[t.config.type],e),t.options=t.config.options=e,t.ensureScalesHaveIDs(),t.buildOrUpdateScales(),t.tooltip._options=e.tooltips,t.tooltip.initialize()}function Ke(t,e,n){var i,a=function(t){return t.id===i};do{i=e+n++}while(H.findIndex(t,a)>=0);return i}function Je(t){return"top"===t||"bottom"===t}function Qe(t,e){return function(n,i){return n[t]===i[t]?n[e]-i[e]:n[t]-i[t]}}W._set("global",{elements:{},events:["mousemove","mouseout","click","touchstart","touchmove"],hover:{onHover:null,mode:"nearest",intersect:!0,animationDuration:400},onClick:null,maintainAspectRatio:!0,responsive:!0,responsiveAnimationDuration:0});var tn=function(t,e){return this.construct(t,e),this};H.extend(tn.prototype,{construct:function(t,e){var n=this;e=function(t){var e=(t=t||{}).data=t.data||{};return e.datasets=e.datasets||[],e.labels=e.labels||[],t.options=$e(W.global,W[t.type],t.options||{}),t}(e);var i=Ie.acquireContext(t,e),a=i&&i.canvas,r=a&&a.height,o=a&&a.width;n.id=H.uid(),n.ctx=i,n.canvas=a,n.config=e,n.width=o,n.height=r,n.aspectRatio=r?o/r:null,n.options=e.options,n._bufferedRender=!1,n._layers=[],n.chart=n,n.controller=n,tn.instances[n.id]=n,Object.defineProperty(n,"data",{get:function(){return n.config.data},set:function(t){n.config.data=t}}),i&&a?(n.initialize(),n.update()):console.error("Failed to create chart: can't acquire context from the given item")},initialize:function(){var t=this;return Le.notify(t,"beforeInit"),H.retinaScale(t,t.options.devicePixelRatio),t.bindEvents(),t.options.responsive&&t.resize(!0),t.initToolTip(),Le.notify(t,"afterInit"),t},clear:function(){return H.canvas.clear(this),this},stop:function(){return J.cancelAnimation(this),this},resize:function(t){var e=this,n=e.options,i=e.canvas,a=n.maintainAspectRatio&&e.aspectRatio||null,r=Math.max(0,Math.floor(H.getMaximumWidth(i))),o=Math.max(0,Math.floor(a?r/a:H.getMaximumHeight(i)));if((e.width!==r||e.height!==o)&&(i.width=e.width=r,i.height=e.height=o,i.style.width=r+"px",i.style.height=o+"px",H.retinaScale(e,n.devicePixelRatio),!t)){var s={width:r,height:o};Le.notify(e,"resize",[s]),n.onResize&&n.onResize(e,s),e.stop(),e.update({duration:n.responsiveAnimationDuration})}},ensureScalesHaveIDs:function(){var t=this.options,e=t.scales||{},n=t.scale;H.each(e.xAxes,(function(t,n){t.id||(t.id=Ke(e.xAxes,"x-axis-",n))})),H.each(e.yAxes,(function(t,n){t.id||(t.id=Ke(e.yAxes,"y-axis-",n))})),n&&(n.id=n.id||"scale")},buildOrUpdateScales:function(){var t=this,e=t.options,n=t.scales||{},i=[],a=Object.keys(n).reduce((function(t,e){return t[e]=!1,t}),{});e.scales&&(i=i.concat((e.scales.xAxes||[]).map((function(t){return{options:t,dtype:"category",dposition:"bottom"}})),(e.scales.yAxes||[]).map((function(t){return{options:t,dtype:"linear",dposition:"left"}})))),e.scale&&i.push({options:e.scale,dtype:"radialLinear",isDefault:!0,dposition:"chartArea"}),H.each(i,(function(e){var i=e.options,r=i.id,o=qe(i.type,e.dtype);Je(i.position)!==Je(e.dposition)&&(i.position=e.dposition),a[r]=!0;var s=null;if(r in n&&n[r].type===o)(s=n[r]).options=i,s.ctx=t.ctx,s.chart=t;else{var l=Re.getScaleConstructor(o);if(!l)return;s=new l({id:r,type:o,options:i,ctx:t.ctx,chart:t}),n[s.id]=s}s.mergeTicksOptions(),e.isDefault&&(t.scale=s)})),H.each(a,(function(t,e){t||delete n[e]})),t.scales=n,Re.addScalesToLayout(this)},buildOrUpdateControllers:function(){var t,e,n=this,i=[],a=n.data.datasets;for(t=0,e=a.length;t<e;t++){var r=a[t],o=n.getDatasetMeta(t),s=r.type||n.config.type;if(o.type&&o.type!==s&&(n.destroyDatasetMeta(t),o=n.getDatasetMeta(t)),o.type=s,o.order=r.order||0,o.index=t,o.controller)o.controller.updateIndex(t),o.controller.linkScales();else{var l=Jt[o.type];if(void 0===l)throw new Error('"'+o.type+'" is not a chart type.');o.controller=new l(n,t),i.push(o.controller)}}return i},resetElements:function(){var t=this;H.each(t.data.datasets,(function(e,n){t.getDatasetMeta(n).controller.reset()}),t)},reset:function(){this.resetElements(),this.tooltip.initialize()},update:function(t){var e,n,i=this;if(t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]}),Xe(i),Le._invalidate(i),!1!==Le.notify(i,"beforeUpdate")){i.tooltip._data=i.data;var a=i.buildOrUpdateControllers();for(e=0,n=i.data.datasets.length;e<n;e++)i.getDatasetMeta(e).controller.buildOrUpdateElements();i.updateLayout(),i.options.animation&&i.options.animation.duration&&H.each(a,(function(t){t.reset()})),i.updateDatasets(),i.tooltip.initialize(),i.lastActive=[],Le.notify(i,"afterUpdate"),i._layers.sort(Qe("z","_idx")),i._bufferedRender?i._bufferedRequest={duration:t.duration,easing:t.easing,lazy:t.lazy}:i.render(t)}},updateLayout:function(){var t=this;!1!==Le.notify(t,"beforeLayout")&&(me.update(this,this.width,this.height),t._layers=[],H.each(t.boxes,(function(e){e._configure&&e._configure(),t._layers.push.apply(t._layers,e._layers())}),t),t._layers.forEach((function(t,e){t._idx=e})),Le.notify(t,"afterScaleUpdate"),Le.notify(t,"afterLayout"))},updateDatasets:function(){if(!1!==Le.notify(this,"beforeDatasetsUpdate")){for(var t=0,e=this.data.datasets.length;t<e;++t)this.updateDataset(t);Le.notify(this,"afterDatasetsUpdate")}},updateDataset:function(t){var e=this.getDatasetMeta(t),n={meta:e,index:t};!1!==Le.notify(this,"beforeDatasetUpdate",[n])&&(e.controller._update(),Le.notify(this,"afterDatasetUpdate",[n]))},render:function(t){var e=this;t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]});var n=e.options.animation,i=qe(t.duration,n&&n.duration),a=t.lazy;if(!1!==Le.notify(e,"beforeRender")){var r=function(t){Le.notify(e,"afterRender"),H.callback(n&&n.onComplete,[t],e)};if(n&&i){var o=new K({numSteps:i/16.66,easing:t.easing||n.easing,render:function(t,e){var n=H.easing.effects[e.easing],i=e.currentStep,a=i/e.numSteps;t.draw(n(a),a,i)},onAnimationProgress:n.onProgress,onAnimationComplete:r});J.addAnimation(e,o,i,a)}else e.draw(),r(new K({numSteps:0,chart:e}));return e}},draw:function(t){var e,n,i=this;if(i.clear(),H.isNullOrUndef(t)&&(t=1),i.transition(t),!(i.width<=0||i.height<=0)&&!1!==Le.notify(i,"beforeDraw",[t])){for(n=i._layers,e=0;e<n.length&&n[e].z<=0;++e)n[e].draw(i.chartArea);for(i.drawDatasets(t);e<n.length;++e)n[e].draw(i.chartArea);i._drawTooltip(t),Le.notify(i,"afterDraw",[t])}},transition:function(t){for(var e=0,n=(this.data.datasets||[]).length;e<n;++e)this.isDatasetVisible(e)&&this.getDatasetMeta(e).controller.transition(t);this.tooltip.transition(t)},_getSortedDatasetMetas:function(t){var e,n,i=[];for(e=0,n=(this.data.datasets||[]).length;e<n;++e)t&&!this.isDatasetVisible(e)||i.push(this.getDatasetMeta(e));return i.sort(Qe("order","index")),i},_getSortedVisibleDatasetMetas:function(){return this._getSortedDatasetMetas(!0)},drawDatasets:function(t){var e,n;if(!1!==Le.notify(this,"beforeDatasetsDraw",[t])){for(n=(e=this._getSortedVisibleDatasetMetas()).length-1;n>=0;--n)this.drawDataset(e[n],t);Le.notify(this,"afterDatasetsDraw",[t])}},drawDataset:function(t,e){var n={meta:t,index:t.index,easingValue:e};!1!==Le.notify(this,"beforeDatasetDraw",[n])&&(t.controller.draw(e),Le.notify(this,"afterDatasetDraw",[n]))},_drawTooltip:function(t){var e=this.tooltip,n={tooltip:e,easingValue:t};!1!==Le.notify(this,"beforeTooltipDraw",[n])&&(e.draw(),Le.notify(this,"afterTooltipDraw",[n]))},getElementAtEvent:function(t){return re.modes.single(this,t)},getElementsAtEvent:function(t){return re.modes.label(this,t,{intersect:!0})},getElementsAtXAxis:function(t){return re.modes["x-axis"](this,t,{intersect:!0})},getElementsAtEventForMode:function(t,e,n){var i=re.modes[e];return"function"==typeof i?i(this,t,n):[]},getDatasetAtEvent:function(t){return re.modes.dataset(this,t,{intersect:!0})},getDatasetMeta:function(t){var e=this.data.datasets[t];e._meta||(e._meta={});var n=e._meta[this.id];return n||(n=e._meta[this.id]={type:null,data:[],dataset:null,controller:null,hidden:null,xAxisID:null,yAxisID:null,order:e.order||0,index:t}),n},getVisibleDatasetCount:function(){for(var t=0,e=0,n=this.data.datasets.length;e<n;++e)this.isDatasetVisible(e)&&t++;return t},isDatasetVisible:function(t){var e=this.getDatasetMeta(t);return"boolean"==typeof e.hidden?!e.hidden:!this.data.datasets[t].hidden},generateLegend:function(){return this.options.legendCallback(this)},destroyDatasetMeta:function(t){var e=this.id,n=this.data.datasets[t],i=n._meta&&n._meta[e];i&&(i.controller.destroy(),delete n._meta[e])},destroy:function(){var t,e,n=this,i=n.canvas;for(n.stop(),t=0,e=n.data.datasets.length;t<e;++t)n.destroyDatasetMeta(t);i&&(n.unbindEvents(),H.canvas.clear(n),Ie.releaseContext(n.ctx),n.canvas=null,n.ctx=null),Le.notify(n,"destroy"),delete tn.instances[n.id]},toBase64Image:function(){return this.canvas.toDataURL.apply(this.canvas,arguments)},initToolTip:function(){var t=this;t.tooltip=new Ge({_chart:t,_chartInstance:t,_data:t.data,_options:t.options.tooltips},t)},bindEvents:function(){var t=this,e=t._listeners={},n=function(){t.eventHandler.apply(t,arguments)};H.each(t.options.events,(function(i){Ie.addEventListener(t,i,n),e[i]=n})),t.options.responsive&&(n=function(){t.resize()},Ie.addEventListener(t,"resize",n),e.resize=n)},unbindEvents:function(){var t=this,e=t._listeners;e&&(delete t._listeners,H.each(e,(function(e,n){Ie.removeEventListener(t,n,e)})))},updateHoverStyle:function(t,e,n){var i,a,r,o=n?"set":"remove";for(a=0,r=t.length;a<r;++a)(i=t[a])&&this.getDatasetMeta(i._datasetIndex).controller[o+"HoverStyle"](i);"dataset"===e&&this.getDatasetMeta(t[0]._datasetIndex).controller["_"+o+"DatasetHoverStyle"]()},eventHandler:function(t){var e=this,n=e.tooltip;if(!1!==Le.notify(e,"beforeEvent",[t])){e._bufferedRender=!0,e._bufferedRequest=null;var i=e.handleEvent(t);n&&(i=n._start?n.handleEvent(t):i|n.handleEvent(t)),Le.notify(e,"afterEvent",[t]);var a=e._bufferedRequest;return a?e.render(a):i&&!e.animating&&(e.stop(),e.render({duration:e.options.hover.animationDuration,lazy:!0})),e._bufferedRender=!1,e._bufferedRequest=null,e}},handleEvent:function(t){var e,n=this,i=n.options||{},a=i.hover;return n.lastActive=n.lastActive||[],"mouseout"===t.type?n.active=[]:n.active=n.getElementsAtEventForMode(t,a.mode,a),H.callback(i.onHover||i.hover.onHover,[t.native,n.active],n),"mouseup"!==t.type&&"click"!==t.type||i.onClick&&i.onClick.call(n,t.native,n.active),n.lastActive.length&&n.updateHoverStyle(n.lastActive,a.mode,!1),n.active.length&&a.mode&&n.updateHoverStyle(n.active,a.mode,!0),e=!H.arrayEquals(n.active,n.lastActive),n.lastActive=n.active,e}}),tn.instances={};var en=tn;tn.Controller=tn,tn.types={},H.configMerge=$e,H.scaleMerge=Ze;function nn(){throw new Error("This method is not implemented: either no adapter can be found or an incomplete integration was provided.")}function an(t){this.options=t||{}}H.extend(an.prototype,{formats:nn,parse:nn,format:nn,add:nn,diff:nn,startOf:nn,endOf:nn,_create:function(t){return t}}),an.override=function(t){H.extend(an.prototype,t)};var rn={_date:an},on={formatters:{values:function(t){return H.isArray(t)?t:""+t},linear:function(t,e,n){var i=n.length>3?n[2]-n[1]:n[1]-n[0];Math.abs(i)>1&&t!==Math.floor(t)&&(i=t-Math.floor(t));var a=H.log10(Math.abs(i)),r="";if(0!==t)if(Math.max(Math.abs(n[0]),Math.abs(n[n.length-1]))<1e-4){var o=H.log10(Math.abs(t)),s=Math.floor(o)-Math.floor(a);s=Math.max(Math.min(s,20),0),r=t.toExponential(s)}else{var l=-1*Math.floor(a);l=Math.max(Math.min(l,20),0),r=t.toFixed(l)}else r="0";return r},logarithmic:function(t,e,n){var i=t/Math.pow(10,Math.floor(H.log10(t)));return 0===t?"0":1===i||2===i||5===i||0===e||e===n.length-1?t.toExponential():""}}},sn=H.isArray,ln=H.isNullOrUndef,un=H.valueOrDefault,dn=H.valueAtIndexOrDefault;function hn(t,e,n){var i,a=t.getTicks().length,r=Math.min(e,a-1),o=t.getPixelForTick(r),s=t._startPixel,l=t._endPixel;if(!(n&&(i=1===a?Math.max(o-s,l-o):0===e?(t.getPixelForTick(1)-o)/2:(o-t.getPixelForTick(r-1))/2,(o+=r<e?i:-i)<s-1e-6||o>l+1e-6)))return o}function cn(t,e,n,i){var a,r,o,s,l,u,d,h,c,f,g,m,p,v=n.length,b=[],y=[],x=[];for(a=0;a<v;++a){if(s=n[a].label,l=n[a].major?e.major:e.minor,t.font=u=l.string,d=i[u]=i[u]||{data:{},gc:[]},h=l.lineHeight,c=f=0,ln(s)||sn(s)){if(sn(s))for(r=0,o=s.length;r<o;++r)g=s[r],ln(g)||sn(g)||(c=H.measureText(t,d.data,d.gc,c,g),f+=h)}else c=H.measureText(t,d.data,d.gc,c,s),f=h;b.push(c),y.push(f),x.push(h/2)}function _(t){return{width:b[t]||0,height:y[t]||0,offset:x[t]||0}}return function(t,e){H.each(t,(function(t){var n,i=t.gc,a=i.length/2;if(a>e){for(n=0;n<a;++n)delete t.data[i[n]];i.splice(0,a)}}))}(i,v),m=b.indexOf(Math.max.apply(null,b)),p=y.indexOf(Math.max.apply(null,y)),{first:_(0),last:_(v-1),widest:_(m),highest:_(p)}}function fn(t){return t.drawTicks?t.tickMarkLength:0}function gn(t){var e,n;return t.display?(e=H.options._parseFont(t),n=H.options.toPadding(t.padding),e.lineHeight+n.height):0}function mn(t,e){return H.extend(H.options._parseFont({fontFamily:un(e.fontFamily,t.fontFamily),fontSize:un(e.fontSize,t.fontSize),fontStyle:un(e.fontStyle,t.fontStyle),lineHeight:un(e.lineHeight,t.lineHeight)}),{color:H.options.resolve([e.fontColor,t.fontColor,W.global.defaultFontColor])})}function pn(t){var e=mn(t,t.minor);return{minor:e,major:t.major.enabled?mn(t,t.major):e}}function vn(t){var e,n,i,a=[];for(n=0,i=t.length;n<i;++n)void 0!==(e=t[n])._index&&a.push(e);return a}function bn(t,e,n,i){var a,r,o,s,l=un(n,0),u=Math.min(un(i,t.length),t.length),d=0;for(e=Math.ceil(e),i&&(e=(a=i-n)/Math.floor(a/e)),s=l;s<0;)d++,s=Math.round(l+d*e);for(r=Math.max(l,0);r<u;r++)o=t[r],r===s?(o._index=r,d++,s=Math.round(l+d*e)):delete o.label}W._set("scale",{display:!0,position:"left",offset:!1,gridLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,drawBorder:!0,drawOnChartArea:!0,drawTicks:!0,tickMarkLength:10,zeroLineWidth:1,zeroLineColor:"rgba(0,0,0,0.25)",zeroLineBorderDash:[],zeroLineBorderDashOffset:0,offsetGridLines:!1,borderDash:[],borderDashOffset:0},scaleLabel:{display:!1,labelString:"",padding:{top:4,bottom:4}},ticks:{beginAtZero:!1,minRotation:0,maxRotation:50,mirror:!1,padding:0,reverse:!1,display:!0,autoSkip:!0,autoSkipPadding:0,labelOffset:0,callback:on.formatters.values,minor:{},major:{}}});var yn=$.extend({zeroLineIndex:0,getPadding:function(){return{left:this.paddingLeft||0,top:this.paddingTop||0,right:this.paddingRight||0,bottom:this.paddingBottom||0}},getTicks:function(){return this._ticks},_getLabels:function(){var t=this.chart.data;return this.options.labels||(this.isHorizontal()?t.xLabels:t.yLabels)||t.labels||[]},mergeTicksOptions:function(){},beforeUpdate:function(){H.callback(this.options.beforeUpdate,[this])},update:function(t,e,n){var i,a,r,o,s,l=this,u=l.options.ticks,d=u.sampleSize;if(l.beforeUpdate(),l.maxWidth=t,l.maxHeight=e,l.margins=H.extend({left:0,right:0,top:0,bottom:0},n),l._ticks=null,l.ticks=null,l._labelSizes=null,l._maxLabelLines=0,l.longestLabelWidth=0,l.longestTextCache=l.longestTextCache||{},l._gridLineItems=null,l._labelItems=null,l.beforeSetDimensions(),l.setDimensions(),l.afterSetDimensions(),l.beforeDataLimits(),l.determineDataLimits(),l.afterDataLimits(),l.beforeBuildTicks(),o=l.buildTicks()||[],(!(o=l.afterBuildTicks(o)||o)||!o.length)&&l.ticks)for(o=[],i=0,a=l.ticks.length;i<a;++i)o.push({value:l.ticks[i],major:!1});return l._ticks=o,s=d<o.length,r=l._convertTicksToLabels(s?function(t,e){for(var n=[],i=t.length/e,a=0,r=t.length;a<r;a+=i)n.push(t[Math.floor(a)]);return n}(o,d):o),l._configure(),l.beforeCalculateTickRotation(),l.calculateTickRotation(),l.afterCalculateTickRotation(),l.beforeFit(),l.fit(),l.afterFit(),l._ticksToDraw=u.display&&(u.autoSkip||"auto"===u.source)?l._autoSkip(o):o,s&&(r=l._convertTicksToLabels(l._ticksToDraw)),l.ticks=r,l.afterUpdate(),l.minSize},_configure:function(){var t,e,n=this,i=n.options.ticks.reverse;n.isHorizontal()?(t=n.left,e=n.right):(t=n.top,e=n.bottom,i=!i),n._startPixel=t,n._endPixel=e,n._reversePixels=i,n._length=e-t},afterUpdate:function(){H.callback(this.options.afterUpdate,[this])},beforeSetDimensions:function(){H.callback(this.options.beforeSetDimensions,[this])},setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0},afterSetDimensions:function(){H.callback(this.options.afterSetDimensions,[this])},beforeDataLimits:function(){H.callback(this.options.beforeDataLimits,[this])},determineDataLimits:H.noop,afterDataLimits:function(){H.callback(this.options.afterDataLimits,[this])},beforeBuildTicks:function(){H.callback(this.options.beforeBuildTicks,[this])},buildTicks:H.noop,afterBuildTicks:function(t){var e=this;return sn(t)&&t.length?H.callback(e.options.afterBuildTicks,[e,t]):(e.ticks=H.callback(e.options.afterBuildTicks,[e,e.ticks])||e.ticks,t)},beforeTickToLabelConversion:function(){H.callback(this.options.beforeTickToLabelConversion,[this])},convertTicksToLabels:function(){var t=this.options.ticks;this.ticks=this.ticks.map(t.userCallback||t.callback,this)},afterTickToLabelConversion:function(){H.callback(this.options.afterTickToLabelConversion,[this])},beforeCalculateTickRotation:function(){H.callback(this.options.beforeCalculateTickRotation,[this])},calculateTickRotation:function(){var t,e,n,i,a,r,o,s=this,l=s.options,u=l.ticks,d=s.getTicks().length,h=u.minRotation||0,c=u.maxRotation,f=h;!s._isVisible()||!u.display||h>=c||d<=1||!s.isHorizontal()?s.labelRotation=h:(e=(t=s._getLabelSizes()).widest.width,n=t.highest.height-t.highest.offset,i=Math.min(s.maxWidth,s.chart.width-e),e+6>(a=l.offset?s.maxWidth/d:i/(d-1))&&(a=i/(d-(l.offset?.5:1)),r=s.maxHeight-fn(l.gridLines)-u.padding-gn(l.scaleLabel),o=Math.sqrt(e*e+n*n),f=H.toDegrees(Math.min(Math.asin(Math.min((t.highest.height+6)/a,1)),Math.asin(Math.min(r/o,1))-Math.asin(n/o))),f=Math.max(h,Math.min(c,f))),s.labelRotation=f)},afterCalculateTickRotation:function(){H.callback(this.options.afterCalculateTickRotation,[this])},beforeFit:function(){H.callback(this.options.beforeFit,[this])},fit:function(){var t=this,e=t.minSize={width:0,height:0},n=t.chart,i=t.options,a=i.ticks,r=i.scaleLabel,o=i.gridLines,s=t._isVisible(),l="bottom"===i.position,u=t.isHorizontal();if(u?e.width=t.maxWidth:s&&(e.width=fn(o)+gn(r)),u?s&&(e.height=fn(o)+gn(r)):e.height=t.maxHeight,a.display&&s){var d=pn(a),h=t._getLabelSizes(),c=h.first,f=h.last,g=h.widest,m=h.highest,p=.4*d.minor.lineHeight,v=a.padding;if(u){var b=0!==t.labelRotation,y=H.toRadians(t.labelRotation),x=Math.cos(y),_=Math.sin(y),w=_*g.width+x*(m.height-(b?m.offset:0))+(b?0:p);e.height=Math.min(t.maxHeight,e.height+w+v);var k,M,S=t.getPixelForTick(0)-t.left,D=t.right-t.getPixelForTick(t.getTicks().length-1);b?(k=l?x*c.width+_*c.offset:_*(c.height-c.offset),M=l?_*(f.height-f.offset):x*f.width+_*f.offset):(k=c.width/2,M=f.width/2),t.paddingLeft=Math.max((k-S)*t.width/(t.width-S),0)+3,t.paddingRight=Math.max((M-D)*t.width/(t.width-D),0)+3}else{var C=a.mirror?0:g.width+v+p;e.width=Math.min(t.maxWidth,e.width+C),t.paddingTop=c.height/2,t.paddingBottom=f.height/2}}t.handleMargins(),u?(t.width=t._length=n.width-t.margins.left-t.margins.right,t.height=e.height):(t.width=e.width,t.height=t._length=n.height-t.margins.top-t.margins.bottom)},handleMargins:function(){var t=this;t.margins&&(t.margins.left=Math.max(t.paddingLeft,t.margins.left),t.margins.top=Math.max(t.paddingTop,t.margins.top),t.margins.right=Math.max(t.paddingRight,t.margins.right),t.margins.bottom=Math.max(t.paddingBottom,t.margins.bottom))},afterFit:function(){H.callback(this.options.afterFit,[this])},isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},isFullWidth:function(){return this.options.fullWidth},getRightValue:function(t){if(ln(t))return NaN;if(("number"==typeof t||t instanceof Number)&&!isFinite(t))return NaN;if(t)if(this.isHorizontal()){if(void 0!==t.x)return this.getRightValue(t.x)}else if(void 0!==t.y)return this.getRightValue(t.y);return t},_convertTicksToLabels:function(t){var e,n,i,a=this;for(a.ticks=t.map((function(t){return t.value})),a.beforeTickToLabelConversion(),e=a.convertTicksToLabels(t)||a.ticks,a.afterTickToLabelConversion(),n=0,i=t.length;n<i;++n)t[n].label=e[n];return e},_getLabelSizes:function(){var t=this,e=t._labelSizes;return e||(t._labelSizes=e=cn(t.ctx,pn(t.options.ticks),t.getTicks(),t.longestTextCache),t.longestLabelWidth=e.widest.width),e},_parseValue:function(t){var e,n,i,a;return sn(t)?(e=+this.getRightValue(t[0]),n=+this.getRightValue(t[1]),i=Math.min(e,n),a=Math.max(e,n)):(e=void 0,n=t=+this.getRightValue(t),i=t,a=t),{min:i,max:a,start:e,end:n}},_getScaleLabel:function(t){var e=this._parseValue(t);return void 0!==e.start?"["+e.start+", "+e.end+"]":+this.getRightValue(t)},getLabelForIndex:H.noop,getPixelForValue:H.noop,getValueForPixel:H.noop,getPixelForTick:function(t){var e=this.options.offset,n=this._ticks.length,i=1/Math.max(n-(e?0:1),1);return t<0||t>n-1?null:this.getPixelForDecimal(t*i+(e?i/2:0))},getPixelForDecimal:function(t){return this._reversePixels&&(t=1-t),this._startPixel+t*this._length},getDecimalForPixel:function(t){var e=(t-this._startPixel)/this._length;return this._reversePixels?1-e:e},getBasePixel:function(){return this.getPixelForValue(this.getBaseValue())},getBaseValue:function(){var t=this.min,e=this.max;return this.beginAtZero?0:t<0&&e<0?e:t>0&&e>0?t:0},_autoSkip:function(t){var e,n,i,a,r=this.options.ticks,o=this._length,s=r.maxTicksLimit||o/this._tickSize()+1,l=r.major.enabled?function(t){var e,n,i=[];for(e=0,n=t.length;e<n;e++)t[e].major&&i.push(e);return i}(t):[],u=l.length,d=l[0],h=l[u-1];if(u>s)return function(t,e,n){var i,a,r=0,o=e[0];for(n=Math.ceil(n),i=0;i<t.length;i++)a=t[i],i===o?(a._index=i,o=e[++r*n]):delete a.label}(t,l,u/s),vn(t);if(i=function(t,e,n,i){var a,r,o,s,l=function(t){var e,n,i=t.length;if(i<2)return!1;for(n=t[0],e=1;e<i;++e)if(t[e]-t[e-1]!==n)return!1;return n}(t),u=(e.length-1)/i;if(!l)return Math.max(u,1);for(o=0,s=(a=H.math._factorize(l)).length-1;o<s;o++)if((r=a[o])>u)return r;return Math.max(u,1)}(l,t,0,s),u>0){for(e=0,n=u-1;e<n;e++)bn(t,i,l[e],l[e+1]);return a=u>1?(h-d)/(u-1):null,bn(t,i,H.isNullOrUndef(a)?0:d-a,d),bn(t,i,h,H.isNullOrUndef(a)?t.length:h+a),vn(t)}return bn(t,i),vn(t)},_tickSize:function(){var t=this.options.ticks,e=H.toRadians(this.labelRotation),n=Math.abs(Math.cos(e)),i=Math.abs(Math.sin(e)),a=this._getLabelSizes(),r=t.autoSkipPadding||0,o=a?a.widest.width+r:0,s=a?a.highest.height+r:0;return this.isHorizontal()?s*n>o*i?o/n:s/i:s*i<o*n?s/n:o/i},_isVisible:function(){var t,e,n,i=this.chart,a=this.options.display;if("auto"!==a)return!!a;for(t=0,e=i.data.datasets.length;t<e;++t)if(i.isDatasetVisible(t)&&((n=i.getDatasetMeta(t)).xAxisID===this.id||n.yAxisID===this.id))return!0;return!1},_computeGridLineItems:function(t){var e,n,i,a,r,o,s,l,u,d,h,c,f,g,m,p,v,b=this,y=b.chart,x=b.options,_=x.gridLines,w=x.position,k=_.offsetGridLines,M=b.isHorizontal(),S=b._ticksToDraw,D=S.length+(k?1:0),C=fn(_),P=[],T=_.drawBorder?dn(_.lineWidth,0,0):0,O=T/2,A=H._alignPixel,F=function(t){return A(y,t,T)};for("top"===w?(e=F(b.bottom),s=b.bottom-C,u=e-O,h=F(t.top)+O,f=t.bottom):"bottom"===w?(e=F(b.top),h=t.top,f=F(t.bottom)-O,s=e+O,u=b.top+C):"left"===w?(e=F(b.right),o=b.right-C,l=e-O,d=F(t.left)+O,c=t.right):(e=F(b.left),d=t.left,c=F(t.right)-O,o=e+O,l=b.left+C),n=0;n<D;++n)i=S[n]||{},ln(i.label)&&n<S.length||(n===b.zeroLineIndex&&x.offset===k?(g=_.zeroLineWidth,m=_.zeroLineColor,p=_.zeroLineBorderDash||[],v=_.zeroLineBorderDashOffset||0):(g=dn(_.lineWidth,n,1),m=dn(_.color,n,"rgba(0,0,0,0.1)"),p=_.borderDash||[],v=_.borderDashOffset||0),void 0!==(a=hn(b,i._index||n,k))&&(r=A(y,a,g),M?o=l=d=c=r:s=u=h=f=r,P.push({tx1:o,ty1:s,tx2:l,ty2:u,x1:d,y1:h,x2:c,y2:f,width:g,color:m,borderDash:p,borderDashOffset:v})));return P.ticksLength=D,P.borderValue=e,P},_computeLabelItems:function(){var t,e,n,i,a,r,o,s,l,u,d,h,c=this,f=c.options,g=f.ticks,m=f.position,p=g.mirror,v=c.isHorizontal(),b=c._ticksToDraw,y=pn(g),x=g.padding,_=fn(f.gridLines),w=-H.toRadians(c.labelRotation),k=[];for("top"===m?(r=c.bottom-_-x,o=w?"left":"center"):"bottom"===m?(r=c.top+_+x,o=w?"right":"center"):"left"===m?(a=c.right-(p?0:_)-x,o=p?"left":"right"):(a=c.left+(p?0:_)+x,o=p?"right":"left"),t=0,e=b.length;t<e;++t)i=(n=b[t]).label,ln(i)||(s=c.getPixelForTick(n._index||t)+g.labelOffset,u=(l=n.major?y.major:y.minor).lineHeight,d=sn(i)?i.length:1,v?(a=s,h="top"===m?((w?1:.5)-d)*u:(w?0:.5)*u):(r=s,h=(1-d)*u/2),k.push({x:a,y:r,rotation:w,label:i,font:l,textOffset:h,textAlign:o}));return k},_drawGrid:function(t){var e=this,n=e.options.gridLines;if(n.display){var i,a,r,o,s,l=e.ctx,u=e.chart,d=H._alignPixel,h=n.drawBorder?dn(n.lineWidth,0,0):0,c=e._gridLineItems||(e._gridLineItems=e._computeGridLineItems(t));for(r=0,o=c.length;r<o;++r)i=(s=c[r]).width,a=s.color,i&&a&&(l.save(),l.lineWidth=i,l.strokeStyle=a,l.setLineDash&&(l.setLineDash(s.borderDash),l.lineDashOffset=s.borderDashOffset),l.beginPath(),n.drawTicks&&(l.moveTo(s.tx1,s.ty1),l.lineTo(s.tx2,s.ty2)),n.drawOnChartArea&&(l.moveTo(s.x1,s.y1),l.lineTo(s.x2,s.y2)),l.stroke(),l.restore());if(h){var f,g,m,p,v=h,b=dn(n.lineWidth,c.ticksLength-1,1),y=c.borderValue;e.isHorizontal()?(f=d(u,e.left,v)-v/2,g=d(u,e.right,b)+b/2,m=p=y):(m=d(u,e.top,v)-v/2,p=d(u,e.bottom,b)+b/2,f=g=y),l.lineWidth=h,l.strokeStyle=dn(n.color,0),l.beginPath(),l.moveTo(f,m),l.lineTo(g,p),l.stroke()}}},_drawLabels:function(){var t=this;if(t.options.ticks.display){var e,n,i,a,r,o,s,l,u=t.ctx,d=t._labelItems||(t._labelItems=t._computeLabelItems());for(e=0,i=d.length;e<i;++e){if(o=(r=d[e]).font,u.save(),u.translate(r.x,r.y),u.rotate(r.rotation),u.font=o.string,u.fillStyle=o.color,u.textBaseline="middle",u.textAlign=r.textAlign,s=r.label,l=r.textOffset,sn(s))for(n=0,a=s.length;n<a;++n)u.fillText(""+s[n],0,l),l+=o.lineHeight;else u.fillText(s,0,l);u.restore()}}},_drawTitle:function(){var t=this,e=t.ctx,n=t.options,i=n.scaleLabel;if(i.display){var a,r,o=un(i.fontColor,W.global.defaultFontColor),s=H.options._parseFont(i),l=H.options.toPadding(i.padding),u=s.lineHeight/2,d=n.position,h=0;if(t.isHorizontal())a=t.left+t.width/2,r="bottom"===d?t.bottom-u-l.bottom:t.top+u+l.top;else{var c="left"===d;a=c?t.left+u+l.top:t.right-u-l.top,r=t.top+t.height/2,h=c?-.5*Math.PI:.5*Math.PI}e.save(),e.translate(a,r),e.rotate(h),e.textAlign="center",e.textBaseline="middle",e.fillStyle=o,e.font=s.string,e.fillText(i.labelString,0,0),e.restore()}},draw:function(t){this._isVisible()&&(this._drawGrid(t),this._drawTitle(),this._drawLabels())},_layers:function(){var t=this,e=t.options,n=e.ticks&&e.ticks.z||0,i=e.gridLines&&e.gridLines.z||0;return t._isVisible()&&n!==i&&t.draw===t._draw?[{z:i,draw:function(){t._drawGrid.apply(t,arguments),t._drawTitle.apply(t,arguments)}},{z:n,draw:function(){t._drawLabels.apply(t,arguments)}}]:[{z:n,draw:function(){t.draw.apply(t,arguments)}}]},_getMatchingVisibleMetas:function(t){var e=this,n=e.isHorizontal();return e.chart._getSortedVisibleDatasetMetas().filter((function(i){return(!t||i.type===t)&&(n?i.xAxisID===e.id:i.yAxisID===e.id)}))}});yn.prototype._draw=yn.prototype.draw;var xn=yn,_n=H.isNullOrUndef,wn=xn.extend({determineDataLimits:function(){var t,e=this,n=e._getLabels(),i=e.options.ticks,a=i.min,r=i.max,o=0,s=n.length-1;void 0!==a&&(t=n.indexOf(a))>=0&&(o=t),void 0!==r&&(t=n.indexOf(r))>=0&&(s=t),e.minIndex=o,e.maxIndex=s,e.min=n[o],e.max=n[s]},buildTicks:function(){var t=this._getLabels(),e=this.minIndex,n=this.maxIndex;this.ticks=0===e&&n===t.length-1?t:t.slice(e,n+1)},getLabelForIndex:function(t,e){var n=this.chart;return n.getDatasetMeta(e).controller._getValueScaleId()===this.id?this.getRightValue(n.data.datasets[e].data[t]):this._getLabels()[t]},_configure:function(){var t=this,e=t.options.offset,n=t.ticks;xn.prototype._configure.call(t),t.isHorizontal()||(t._reversePixels=!t._reversePixels),n&&(t._startValue=t.minIndex-(e?.5:0),t._valueRange=Math.max(n.length-(e?0:1),1))},getPixelForValue:function(t,e,n){var i,a,r,o=this;return _n(e)||_n(n)||(t=o.chart.data.datasets[n].data[e]),_n(t)||(i=o.isHorizontal()?t.x:t.y),(void 0!==i||void 0!==t&&isNaN(e))&&(a=o._getLabels(),t=H.valueOrDefault(i,t),e=-1!==(r=a.indexOf(t))?r:e,isNaN(e)&&(e=t)),o.getPixelForDecimal((e-o._startValue)/o._valueRange)},getPixelForTick:function(t){var e=this.ticks;return t<0||t>e.length-1?null:this.getPixelForValue(e[t],t+this.minIndex)},getValueForPixel:function(t){var e=Math.round(this._startValue+this.getDecimalForPixel(t)*this._valueRange);return Math.min(Math.max(e,0),this.ticks.length-1)},getBasePixel:function(){return this.bottom}}),kn={position:"bottom"};wn._defaults=kn;var Mn=H.noop,Sn=H.isNullOrUndef;var Dn=xn.extend({getRightValue:function(t){return"string"==typeof t?+t:xn.prototype.getRightValue.call(this,t)},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;if(e.beginAtZero){var n=H.sign(t.min),i=H.sign(t.max);n<0&&i<0?t.max=0:n>0&&i>0&&(t.min=0)}var a=void 0!==e.min||void 0!==e.suggestedMin,r=void 0!==e.max||void 0!==e.suggestedMax;void 0!==e.min?t.min=e.min:void 0!==e.suggestedMin&&(null===t.min?t.min=e.suggestedMin:t.min=Math.min(t.min,e.suggestedMin)),void 0!==e.max?t.max=e.max:void 0!==e.suggestedMax&&(null===t.max?t.max=e.suggestedMax:t.max=Math.max(t.max,e.suggestedMax)),a!==r&&t.min>=t.max&&(a?t.max=t.min+1:t.min=t.max-1),t.min===t.max&&(t.max++,e.beginAtZero||t.min--)},getTickLimit:function(){var t,e=this.options.ticks,n=e.stepSize,i=e.maxTicksLimit;return n?t=Math.ceil(this.max/n)-Math.floor(this.min/n)+1:(t=this._computeTickLimit(),i=i||11),i&&(t=Math.min(i,t)),t},_computeTickLimit:function(){return Number.POSITIVE_INFINITY},handleDirectionalChanges:Mn,buildTicks:function(){var t=this,e=t.options.ticks,n=t.getTickLimit(),i={maxTicks:n=Math.max(2,n),min:e.min,max:e.max,precision:e.precision,stepSize:H.valueOrDefault(e.fixedStepSize,e.stepSize)},a=t.ticks=function(t,e){var n,i,a,r,o=[],s=t.stepSize,l=s||1,u=t.maxTicks-1,d=t.min,h=t.max,c=t.precision,f=e.min,g=e.max,m=H.niceNum((g-f)/u/l)*l;if(m<1e-14&&Sn(d)&&Sn(h))return[f,g];(r=Math.ceil(g/m)-Math.floor(f/m))>u&&(m=H.niceNum(r*m/u/l)*l),s||Sn(c)?n=Math.pow(10,H._decimalPlaces(m)):(n=Math.pow(10,c),m=Math.ceil(m*n)/n),i=Math.floor(f/m)*m,a=Math.ceil(g/m)*m,s&&(!Sn(d)&&H.almostWhole(d/m,m/1e3)&&(i=d),!Sn(h)&&H.almostWhole(h/m,m/1e3)&&(a=h)),r=(a-i)/m,r=H.almostEquals(r,Math.round(r),m/1e3)?Math.round(r):Math.ceil(r),i=Math.round(i*n)/n,a=Math.round(a*n)/n,o.push(Sn(d)?i:d);for(var p=1;p<r;++p)o.push(Math.round((i+p*m)*n)/n);return o.push(Sn(h)?a:h),o}(i,t);t.handleDirectionalChanges(),t.max=H.max(a),t.min=H.min(a),e.reverse?(a.reverse(),t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max)},convertTicksToLabels:function(){var t=this;t.ticksAsNumbers=t.ticks.slice(),t.zeroLineIndex=t.ticks.indexOf(0),xn.prototype.convertTicksToLabels.call(t)},_configure:function(){var t,e=this,n=e.getTicks(),i=e.min,a=e.max;xn.prototype._configure.call(e),e.options.offset&&n.length&&(i-=t=(a-i)/Math.max(n.length-1,1)/2,a+=t),e._startValue=i,e._endValue=a,e._valueRange=a-i}}),Cn={position:"left",ticks:{callback:on.formatters.linear}};function Pn(t,e,n,i){var a,r,o=t.options,s=function(t,e,n){var i=[n.type,void 0===e&&void 0===n.stack?n.index:"",n.stack].join(".");return void 0===t[i]&&(t[i]={pos:[],neg:[]}),t[i]}(e,o.stacked,n),l=s.pos,u=s.neg,d=i.length;for(a=0;a<d;++a)r=t._parseValue(i[a]),isNaN(r.min)||isNaN(r.max)||n.data[a].hidden||(l[a]=l[a]||0,u[a]=u[a]||0,o.relativePoints?l[a]=100:r.min<0||r.max<0?u[a]+=r.min:l[a]+=r.max)}function Tn(t,e,n){var i,a,r=n.length;for(i=0;i<r;++i)a=t._parseValue(n[i]),isNaN(a.min)||isNaN(a.max)||e.data[i].hidden||(t.min=Math.min(t.min,a.min),t.max=Math.max(t.max,a.max))}var On=Dn.extend({determineDataLimits:function(){var t,e,n,i,a=this,r=a.options,o=a.chart.data.datasets,s=a._getMatchingVisibleMetas(),l=r.stacked,u={},d=s.length;if(a.min=Number.POSITIVE_INFINITY,a.max=Number.NEGATIVE_INFINITY,void 0===l)for(t=0;!l&&t<d;++t)l=void 0!==(e=s[t]).stack;for(t=0;t<d;++t)n=o[(e=s[t]).index].data,l?Pn(a,u,e,n):Tn(a,e,n);H.each(u,(function(t){i=t.pos.concat(t.neg),a.min=Math.min(a.min,H.min(i)),a.max=Math.max(a.max,H.max(i))})),a.min=H.isFinite(a.min)&&!isNaN(a.min)?a.min:0,a.max=H.isFinite(a.max)&&!isNaN(a.max)?a.max:1,a.handleTickRangeOptions()},_computeTickLimit:function(){var t;return this.isHorizontal()?Math.ceil(this.width/40):(t=H.options._parseFont(this.options.ticks),Math.ceil(this.height/t.lineHeight))},handleDirectionalChanges:function(){this.isHorizontal()||this.ticks.reverse()},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForValue:function(t){return this.getPixelForDecimal((+this.getRightValue(t)-this._startValue)/this._valueRange)},getValueForPixel:function(t){return this._startValue+this.getDecimalForPixel(t)*this._valueRange},getPixelForTick:function(t){var e=this.ticksAsNumbers;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])}}),An=Cn;On._defaults=An;var Fn=H.valueOrDefault,In=H.math.log10;var Ln={position:"left",ticks:{callback:on.formatters.logarithmic}};function Rn(t,e){return H.isFinite(t)&&t>=0?t:e}var Nn=xn.extend({determineDataLimits:function(){var t,e,n,i,a,r,o=this,s=o.options,l=o.chart,u=l.data.datasets,d=o.isHorizontal();function h(t){return d?t.xAxisID===o.id:t.yAxisID===o.id}o.min=Number.POSITIVE_INFINITY,o.max=Number.NEGATIVE_INFINITY,o.minNotZero=Number.POSITIVE_INFINITY;var c=s.stacked;if(void 0===c)for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e)&&void 0!==e.stack){c=!0;break}if(s.stacked||c){var f={};for(t=0;t<u.length;t++){var g=[(e=l.getDatasetMeta(t)).type,void 0===s.stacked&&void 0===e.stack?t:"",e.stack].join(".");if(l.isDatasetVisible(t)&&h(e))for(void 0===f[g]&&(f[g]=[]),a=0,r=(i=u[t].data).length;a<r;a++){var m=f[g];n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(m[a]=m[a]||0,m[a]+=n.max)}}H.each(f,(function(t){if(t.length>0){var e=H.min(t),n=H.max(t);o.min=Math.min(o.min,e),o.max=Math.max(o.max,n)}}))}else for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e))for(a=0,r=(i=u[t].data).length;a<r;a++)n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(o.min=Math.min(n.min,o.min),o.max=Math.max(n.max,o.max),0!==n.min&&(o.minNotZero=Math.min(n.min,o.minNotZero)));o.min=H.isFinite(o.min)?o.min:null,o.max=H.isFinite(o.max)?o.max:null,o.minNotZero=H.isFinite(o.minNotZero)?o.minNotZero:null,this.handleTickRangeOptions()},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;t.min=Rn(e.min,t.min),t.max=Rn(e.max,t.max),t.min===t.max&&(0!==t.min&&null!==t.min?(t.min=Math.pow(10,Math.floor(In(t.min))-1),t.max=Math.pow(10,Math.floor(In(t.max))+1)):(t.min=1,t.max=10)),null===t.min&&(t.min=Math.pow(10,Math.floor(In(t.max))-1)),null===t.max&&(t.max=0!==t.min?Math.pow(10,Math.floor(In(t.min))+1):10),null===t.minNotZero&&(t.min>0?t.minNotZero=t.min:t.max<1?t.minNotZero=Math.pow(10,Math.floor(In(t.max))):t.minNotZero=1)},buildTicks:function(){var t=this,e=t.options.ticks,n=!t.isHorizontal(),i={min:Rn(e.min),max:Rn(e.max)},a=t.ticks=function(t,e){var n,i,a=[],r=Fn(t.min,Math.pow(10,Math.floor(In(e.min)))),o=Math.floor(In(e.max)),s=Math.ceil(e.max/Math.pow(10,o));0===r?(n=Math.floor(In(e.minNotZero)),i=Math.floor(e.minNotZero/Math.pow(10,n)),a.push(r),r=i*Math.pow(10,n)):(n=Math.floor(In(r)),i=Math.floor(r/Math.pow(10,n)));var l=n<0?Math.pow(10,Math.abs(n)):1;do{a.push(r),10===++i&&(i=1,l=++n>=0?1:l),r=Math.round(i*Math.pow(10,n)*l)/l}while(n<o||n===o&&i<s);var u=Fn(t.max,r);return a.push(u),a}(i,t);t.max=H.max(a),t.min=H.min(a),e.reverse?(n=!n,t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max),n&&a.reverse()},convertTicksToLabels:function(){this.tickValues=this.ticks.slice(),xn.prototype.convertTicksToLabels.call(this)},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForTick:function(t){var e=this.tickValues;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])},_getFirstTickValue:function(t){var e=Math.floor(In(t));return Math.floor(t/Math.pow(10,e))*Math.pow(10,e)},_configure:function(){var t=this,e=t.min,n=0;xn.prototype._configure.call(t),0===e&&(e=t._getFirstTickValue(t.minNotZero),n=Fn(t.options.ticks.fontSize,W.global.defaultFontSize)/t._length),t._startValue=In(e),t._valueOffset=n,t._valueRange=(In(t.max)-In(e))/(1-n)},getPixelForValue:function(t){var e=this,n=0;return(t=+e.getRightValue(t))>e.min&&t>0&&(n=(In(t)-e._startValue)/e._valueRange+e._valueOffset),e.getPixelForDecimal(n)},getValueForPixel:function(t){var e=this,n=e.getDecimalForPixel(t);return 0===n&&0===e.min?0:Math.pow(10,e._startValue+(n-e._valueOffset)*e._valueRange)}}),Wn=Ln;Nn._defaults=Wn;var Yn=H.valueOrDefault,zn=H.valueAtIndexOrDefault,En=H.options.resolve,Vn={display:!0,animate:!0,position:"chartArea",angleLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,borderDash:[],borderDashOffset:0},gridLines:{circular:!1},ticks:{showLabelBackdrop:!0,backdropColor:"rgba(255,255,255,0.75)",backdropPaddingY:2,backdropPaddingX:2,callback:on.formatters.linear},pointLabels:{display:!0,fontSize:10,callback:function(t){return t}}};function Hn(t){var e=t.ticks;return e.display&&t.display?Yn(e.fontSize,W.global.defaultFontSize)+2*e.backdropPaddingY:0}function Bn(t,e,n,i,a){return t===i||t===a?{start:e-n/2,end:e+n/2}:t<i||t>a?{start:e-n,end:e}:{start:e,end:e+n}}function jn(t){return 0===t||180===t?"center":t<180?"left":"right"}function Un(t,e,n,i){var a,r,o=n.y+i/2;if(H.isArray(e))for(a=0,r=e.length;a<r;++a)t.fillText(e[a],n.x,o),o+=i;else t.fillText(e,n.x,o)}function Gn(t,e,n){90===t||270===t?n.y-=e.h/2:(t>270||t<90)&&(n.y-=e.h)}function qn(t){return H.isNumber(t)?t:0}var Zn=Dn.extend({setDimensions:function(){var t=this;t.width=t.maxWidth,t.height=t.maxHeight,t.paddingTop=Hn(t.options)/2,t.xCenter=Math.floor(t.width/2),t.yCenter=Math.floor((t.height-t.paddingTop)/2),t.drawingArea=Math.min(t.height-t.paddingTop,t.width)/2},determineDataLimits:function(){var t=this,e=t.chart,n=Number.POSITIVE_INFINITY,i=Number.NEGATIVE_INFINITY;H.each(e.data.datasets,(function(a,r){if(e.isDatasetVisible(r)){var o=e.getDatasetMeta(r);H.each(a.data,(function(e,a){var r=+t.getRightValue(e);isNaN(r)||o.data[a].hidden||(n=Math.min(r,n),i=Math.max(r,i))}))}})),t.min=n===Number.POSITIVE_INFINITY?0:n,t.max=i===Number.NEGATIVE_INFINITY?0:i,t.handleTickRangeOptions()},_computeTickLimit:function(){return Math.ceil(this.drawingArea/Hn(this.options))},convertTicksToLabels:function(){var t=this;Dn.prototype.convertTicksToLabels.call(t),t.pointLabels=t.chart.data.labels.map((function(){var e=H.callback(t.options.pointLabels.callback,arguments,t);return e||0===e?e:""}))},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},fit:function(){var t=this.options;t.display&&t.pointLabels.display?function(t){var e,n,i,a=H.options._parseFont(t.options.pointLabels),r={l:0,r:t.width,t:0,b:t.height-t.paddingTop},o={};t.ctx.font=a.string,t._pointLabelSizes=[];var s,l,u,d=t.chart.data.labels.length;for(e=0;e<d;e++){i=t.getPointPosition(e,t.drawingArea+5),s=t.ctx,l=a.lineHeight,u=t.pointLabels[e],n=H.isArray(u)?{w:H.longestText(s,s.font,u),h:u.length*l}:{w:s.measureText(u).width,h:l},t._pointLabelSizes[e]=n;var h=t.getIndexAngle(e),c=H.toDegrees(h)%360,f=Bn(c,i.x,n.w,0,180),g=Bn(c,i.y,n.h,90,270);f.start<r.l&&(r.l=f.start,o.l=h),f.end>r.r&&(r.r=f.end,o.r=h),g.start<r.t&&(r.t=g.start,o.t=h),g.end>r.b&&(r.b=g.end,o.b=h)}t.setReductions(t.drawingArea,r,o)}(this):this.setCenterPoint(0,0,0,0)},setReductions:function(t,e,n){var i=this,a=e.l/Math.sin(n.l),r=Math.max(e.r-i.width,0)/Math.sin(n.r),o=-e.t/Math.cos(n.t),s=-Math.max(e.b-(i.height-i.paddingTop),0)/Math.cos(n.b);a=qn(a),r=qn(r),o=qn(o),s=qn(s),i.drawingArea=Math.min(Math.floor(t-(a+r)/2),Math.floor(t-(o+s)/2)),i.setCenterPoint(a,r,o,s)},setCenterPoint:function(t,e,n,i){var a=this,r=a.width-e-a.drawingArea,o=t+a.drawingArea,s=n+a.drawingArea,l=a.height-a.paddingTop-i-a.drawingArea;a.xCenter=Math.floor((o+r)/2+a.left),a.yCenter=Math.floor((s+l)/2+a.top+a.paddingTop)},getIndexAngle:function(t){var e=this.chart,n=(t*(360/e.data.labels.length)+((e.options||{}).startAngle||0))%360;return(n<0?n+360:n)*Math.PI*2/360},getDistanceFromCenterForValue:function(t){var e=this;if(H.isNullOrUndef(t))return NaN;var n=e.drawingArea/(e.max-e.min);return e.options.ticks.reverse?(e.max-t)*n:(t-e.min)*n},getPointPosition:function(t,e){var n=this.getIndexAngle(t)-Math.PI/2;return{x:Math.cos(n)*e+this.xCenter,y:Math.sin(n)*e+this.yCenter}},getPointPositionForValue:function(t,e){return this.getPointPosition(t,this.getDistanceFromCenterForValue(e))},getBasePosition:function(t){var e=this.min,n=this.max;return this.getPointPositionForValue(t||0,this.beginAtZero?0:e<0&&n<0?n:e>0&&n>0?e:0)},_drawGrid:function(){var t,e,n,i=this,a=i.ctx,r=i.options,o=r.gridLines,s=r.angleLines,l=Yn(s.lineWidth,o.lineWidth),u=Yn(s.color,o.color);if(r.pointLabels.display&&function(t){var e=t.ctx,n=t.options,i=n.pointLabels,a=Hn(n),r=t.getDistanceFromCenterForValue(n.ticks.reverse?t.min:t.max),o=H.options._parseFont(i);e.save(),e.font=o.string,e.textBaseline="middle";for(var s=t.chart.data.labels.length-1;s>=0;s--){var l=0===s?a/2:0,u=t.getPointPosition(s,r+l+5),d=zn(i.fontColor,s,W.global.defaultFontColor);e.fillStyle=d;var h=t.getIndexAngle(s),c=H.toDegrees(h);e.textAlign=jn(c),Gn(c,t._pointLabelSizes[s],u),Un(e,t.pointLabels[s],u,o.lineHeight)}e.restore()}(i),o.display&&H.each(i.ticks,(function(t,n){0!==n&&(e=i.getDistanceFromCenterForValue(i.ticksAsNumbers[n]),function(t,e,n,i){var a,r=t.ctx,o=e.circular,s=t.chart.data.labels.length,l=zn(e.color,i-1),u=zn(e.lineWidth,i-1);if((o||s)&&l&&u){if(r.save(),r.strokeStyle=l,r.lineWidth=u,r.setLineDash&&(r.setLineDash(e.borderDash||[]),r.lineDashOffset=e.borderDashOffset||0),r.beginPath(),o)r.arc(t.xCenter,t.yCenter,n,0,2*Math.PI);else{a=t.getPointPosition(0,n),r.moveTo(a.x,a.y);for(var d=1;d<s;d++)a=t.getPointPosition(d,n),r.lineTo(a.x,a.y)}r.closePath(),r.stroke(),r.restore()}}(i,o,e,n))})),s.display&&l&&u){for(a.save(),a.lineWidth=l,a.strokeStyle=u,a.setLineDash&&(a.setLineDash(En([s.borderDash,o.borderDash,[]])),a.lineDashOffset=En([s.borderDashOffset,o.borderDashOffset,0])),t=i.chart.data.labels.length-1;t>=0;t--)e=i.getDistanceFromCenterForValue(r.ticks.reverse?i.min:i.max),n=i.getPointPosition(t,e),a.beginPath(),a.moveTo(i.xCenter,i.yCenter),a.lineTo(n.x,n.y),a.stroke();a.restore()}},_drawLabels:function(){var t=this,e=t.ctx,n=t.options.ticks;if(n.display){var i,a,r=t.getIndexAngle(0),o=H.options._parseFont(n),s=Yn(n.fontColor,W.global.defaultFontColor);e.save(),e.font=o.string,e.translate(t.xCenter,t.yCenter),e.rotate(r),e.textAlign="center",e.textBaseline="middle",H.each(t.ticks,(function(r,l){(0!==l||n.reverse)&&(i=t.getDistanceFromCenterForValue(t.ticksAsNumbers[l]),n.showLabelBackdrop&&(a=e.measureText(r).width,e.fillStyle=n.backdropColor,e.fillRect(-a/2-n.backdropPaddingX,-i-o.size/2-n.backdropPaddingY,a+2*n.backdropPaddingX,o.size+2*n.backdropPaddingY)),e.fillStyle=s,e.fillText(r,0,-i))})),e.restore()}},_drawTitle:H.noop}),$n=Vn;Zn._defaults=$n;var Xn=H._deprecated,Kn=H.options.resolve,Jn=H.valueOrDefault,Qn=Number.MIN_SAFE_INTEGER||-9007199254740991,ti=Number.MAX_SAFE_INTEGER||9007199254740991,ei={millisecond:{common:!0,size:1,steps:1e3},second:{common:!0,size:1e3,steps:60},minute:{common:!0,size:6e4,steps:60},hour:{common:!0,size:36e5,steps:24},day:{common:!0,size:864e5,steps:30},week:{common:!1,size:6048e5,steps:4},month:{common:!0,size:2628e6,steps:12},quarter:{common:!1,size:7884e6,steps:4},year:{common:!0,size:3154e7}},ni=Object.keys(ei);function ii(t,e){return t-e}function ai(t){return H.valueOrDefault(t.time.min,t.ticks.min)}function ri(t){return H.valueOrDefault(t.time.max,t.ticks.max)}function oi(t,e,n,i){var a=function(t,e,n){for(var i,a,r,o=0,s=t.length-1;o>=0&&o<=s;){if(a=t[(i=o+s>>1)-1]||null,r=t[i],!a)return{lo:null,hi:r};if(r[e]<n)o=i+1;else{if(!(a[e]>n))return{lo:a,hi:r};s=i-1}}return{lo:r,hi:null}}(t,e,n),r=a.lo?a.hi?a.lo:t[t.length-2]:t[0],o=a.lo?a.hi?a.hi:t[t.length-1]:t[1],s=o[e]-r[e],l=s?(n-r[e])/s:0,u=(o[i]-r[i])*l;return r[i]+u}function si(t,e){var n=t._adapter,i=t.options.time,a=i.parser,r=a||i.format,o=e;return"function"==typeof a&&(o=a(o)),H.isFinite(o)||(o="string"==typeof r?n.parse(o,r):n.parse(o)),null!==o?+o:(a||"function"!=typeof r||(o=r(e),H.isFinite(o)||(o=n.parse(o))),o)}function li(t,e){if(H.isNullOrUndef(e))return null;var n=t.options.time,i=si(t,t.getRightValue(e));return null===i?i:(n.round&&(i=+t._adapter.startOf(i,n.round)),i)}function ui(t,e,n,i){var a,r,o,s=ni.length;for(a=ni.indexOf(t);a<s-1;++a)if(o=(r=ei[ni[a]]).steps?r.steps:ti,r.common&&Math.ceil((n-e)/(o*r.size))<=i)return ni[a];return ni[s-1]}function di(t,e,n){var i,a,r=[],o={},s=e.length;for(i=0;i<s;++i)o[a=e[i]]=i,r.push({value:a,major:!1});return 0!==s&&n?function(t,e,n,i){var a,r,o=t._adapter,s=+o.startOf(e[0].value,i),l=e[e.length-1].value;for(a=s;a<=l;a=+o.add(a,1,i))(r=n[a])>=0&&(e[r].major=!0);return e}(t,r,o,n):r}var hi=xn.extend({initialize:function(){this.mergeTicksOptions(),xn.prototype.initialize.call(this)},update:function(){var t=this,e=t.options,n=e.time||(e.time={}),i=t._adapter=new rn._date(e.adapters.date);return Xn("time scale",n.format,"time.format","time.parser"),Xn("time scale",n.min,"time.min","ticks.min"),Xn("time scale",n.max,"time.max","ticks.max"),H.mergeIf(n.displayFormats,i.formats()),xn.prototype.update.apply(t,arguments)},getRightValue:function(t){return t&&void 0!==t.t&&(t=t.t),xn.prototype.getRightValue.call(this,t)},determineDataLimits:function(){var t,e,n,i,a,r,o,s=this,l=s.chart,u=s._adapter,d=s.options,h=d.time.unit||"day",c=ti,f=Qn,g=[],m=[],p=[],v=s._getLabels();for(t=0,n=v.length;t<n;++t)p.push(li(s,v[t]));for(t=0,n=(l.data.datasets||[]).length;t<n;++t)if(l.isDatasetVisible(t))if(a=l.data.datasets[t].data,H.isObject(a[0]))for(m[t]=[],e=0,i=a.length;e<i;++e)r=li(s,a[e]),g.push(r),m[t][e]=r;else m[t]=p.slice(0),o||(g=g.concat(p),o=!0);else m[t]=[];p.length&&(c=Math.min(c,p[0]),f=Math.max(f,p[p.length-1])),g.length&&(g=n>1?function(t){var e,n,i,a={},r=[];for(e=0,n=t.length;e<n;++e)a[i=t[e]]||(a[i]=!0,r.push(i));return r}(g).sort(ii):g.sort(ii),c=Math.min(c,g[0]),f=Math.max(f,g[g.length-1])),c=li(s,ai(d))||c,f=li(s,ri(d))||f,c=c===ti?+u.startOf(Date.now(),h):c,f=f===Qn?+u.endOf(Date.now(),h)+1:f,s.min=Math.min(c,f),s.max=Math.max(c+1,f),s._table=[],s._timestamps={data:g,datasets:m,labels:p}},buildTicks:function(){var t,e,n,i=this,a=i.min,r=i.max,o=i.options,s=o.ticks,l=o.time,u=i._timestamps,d=[],h=i.getLabelCapacity(a),c=s.source,f=o.distribution;for(u="data"===c||"auto"===c&&"series"===f?u.data:"labels"===c?u.labels:function(t,e,n,i){var a,r=t._adapter,o=t.options,s=o.time,l=s.unit||ui(s.minUnit,e,n,i),u=Kn([s.stepSize,s.unitStepSize,1]),d="week"===l&&s.isoWeekday,h=e,c=[];if(d&&(h=+r.startOf(h,"isoWeek",d)),h=+r.startOf(h,d?"day":l),r.diff(n,e,l)>1e5*u)throw e+" and "+n+" are too far apart with stepSize of "+u+" "+l;for(a=h;a<n;a=+r.add(a,u,l))c.push(a);return a!==n&&"ticks"!==o.bounds||c.push(a),c}(i,a,r,h),"ticks"===o.bounds&&u.length&&(a=u[0],r=u[u.length-1]),a=li(i,ai(o))||a,r=li(i,ri(o))||r,t=0,e=u.length;t<e;++t)(n=u[t])>=a&&n<=r&&d.push(n);return i.min=a,i.max=r,i._unit=l.unit||(s.autoSkip?ui(l.minUnit,i.min,i.max,h):function(t,e,n,i,a){var r,o;for(r=ni.length-1;r>=ni.indexOf(n);r--)if(o=ni[r],ei[o].common&&t._adapter.diff(a,i,o)>=e-1)return o;return ni[n?ni.indexOf(n):0]}(i,d.length,l.minUnit,i.min,i.max)),i._majorUnit=s.major.enabled&&"year"!==i._unit?function(t){for(var e=ni.indexOf(t)+1,n=ni.length;e<n;++e)if(ei[ni[e]].common)return ni[e]}(i._unit):void 0,i._table=function(t,e,n,i){if("linear"===i||!t.length)return[{time:e,pos:0},{time:n,pos:1}];var a,r,o,s,l,u=[],d=[e];for(a=0,r=t.length;a<r;++a)(s=t[a])>e&&s<n&&d.push(s);for(d.push(n),a=0,r=d.length;a<r;++a)l=d[a+1],o=d[a-1],s=d[a],void 0!==o&&void 0!==l&&Math.round((l+o)/2)===s||u.push({time:s,pos:a/(r-1)});return u}(i._timestamps.data,a,r,f),i._offsets=function(t,e,n,i,a){var r,o,s=0,l=0;return a.offset&&e.length&&(r=oi(t,"time",e[0],"pos"),s=1===e.length?1-r:(oi(t,"time",e[1],"pos")-r)/2,o=oi(t,"time",e[e.length-1],"pos"),l=1===e.length?o:(o-oi(t,"time",e[e.length-2],"pos"))/2),{start:s,end:l,factor:1/(s+1+l)}}(i._table,d,0,0,o),s.reverse&&d.reverse(),di(i,d,i._majorUnit)},getLabelForIndex:function(t,e){var n=this,i=n._adapter,a=n.chart.data,r=n.options.time,o=a.labels&&t<a.labels.length?a.labels[t]:"",s=a.datasets[e].data[t];return H.isObject(s)&&(o=n.getRightValue(s)),r.tooltipFormat?i.format(si(n,o),r.tooltipFormat):"string"==typeof o?o:i.format(si(n,o),r.displayFormats.datetime)},tickFormatFunction:function(t,e,n,i){var a=this._adapter,r=this.options,o=r.time.displayFormats,s=o[this._unit],l=this._majorUnit,u=o[l],d=n[e],h=r.ticks,c=l&&u&&d&&d.major,f=a.format(t,i||(c?u:s)),g=c?h.major:h.minor,m=Kn([g.callback,g.userCallback,h.callback,h.userCallback]);return m?m(f,e,n):f},convertTicksToLabels:function(t){var e,n,i=[];for(e=0,n=t.length;e<n;++e)i.push(this.tickFormatFunction(t[e].value,e,t));return i},getPixelForOffset:function(t){var e=this._offsets,n=oi(this._table,"time",t,"pos");return this.getPixelForDecimal((e.start+n)*e.factor)},getPixelForValue:function(t,e,n){var i=null;if(void 0!==e&&void 0!==n&&(i=this._timestamps.datasets[n][e]),null===i&&(i=li(this,t)),null!==i)return this.getPixelForOffset(i)},getPixelForTick:function(t){var e=this.getTicks();return t>=0&&t<e.length?this.getPixelForOffset(e[t].value):null},getValueForPixel:function(t){var e=this._offsets,n=this.getDecimalForPixel(t)/e.factor-e.end,i=oi(this._table,"pos",n,"time");return this._adapter._create(i)},_getLabelSize:function(t){var e=this.options.ticks,n=this.ctx.measureText(t).width,i=H.toRadians(this.isHorizontal()?e.maxRotation:e.minRotation),a=Math.cos(i),r=Math.sin(i),o=Jn(e.fontSize,W.global.defaultFontSize);return{w:n*a+o*r,h:n*r+o*a}},getLabelWidth:function(t){return this._getLabelSize(t).w},getLabelCapacity:function(t){var e=this,n=e.options.time,i=n.displayFormats,a=i[n.unit]||i.millisecond,r=e.tickFormatFunction(t,0,di(e,[t],e._majorUnit),a),o=e._getLabelSize(r),s=Math.floor(e.isHorizontal()?e.width/o.w:e.height/o.h);return e.options.offset&&s--,s>0?s:1}}),ci={position:"bottom",distribution:"linear",bounds:"data",adapters:{},time:{parser:!1,unit:!1,round:!1,displayFormat:!1,isoWeekday:!1,minUnit:"millisecond",displayFormats:{}},ticks:{autoSkip:!1,source:"auto",major:{enabled:!1}}};hi._defaults=ci;var fi={category:wn,linear:On,logarithmic:Nn,radialLinear:Zn,time:hi},gi=e((function(e,n){e.exports=function(){var n,i;function a(){return n.apply(null,arguments)}function r(t){return t instanceof Array||"[object Array]"===Object.prototype.toString.call(t)}function o(t){return null!=t&&"[object Object]"===Object.prototype.toString.call(t)}function s(t){return void 0===t}function l(t){return"number"==typeof t||"[object Number]"===Object.prototype.toString.call(t)}function u(t){return t instanceof Date||"[object Date]"===Object.prototype.toString.call(t)}function d(t,e){var n,i=[];for(n=0;n<t.length;++n)i.push(e(t[n],n));return i}function h(t,e){return Object.prototype.hasOwnProperty.call(t,e)}function c(t,e){for(var n in e)h(e,n)&&(t[n]=e[n]);return h(e,"toString")&&(t.toString=e.toString),h(e,"valueOf")&&(t.valueOf=e.valueOf),t}function f(t,e,n,i){return Ie(t,e,n,i,!0).utc()}function g(t){return null==t._pf&&(t._pf={empty:!1,unusedTokens:[],unusedInput:[],overflow:-2,charsLeftOver:0,nullInput:!1,invalidMonth:null,invalidFormat:!1,userInvalidated:!1,iso:!1,parsedDateParts:[],meridiem:null,rfc2822:!1,weekdayMismatch:!1}),t._pf}function m(t){if(null==t._isValid){var e=g(t),n=i.call(e.parsedDateParts,(function(t){return null!=t})),a=!isNaN(t._d.getTime())&&e.overflow<0&&!e.empty&&!e.invalidMonth&&!e.invalidWeekday&&!e.weekdayMismatch&&!e.nullInput&&!e.invalidFormat&&!e.userInvalidated&&(!e.meridiem||e.meridiem&&n);if(t._strict&&(a=a&&0===e.charsLeftOver&&0===e.unusedTokens.length&&void 0===e.bigHour),null!=Object.isFrozen&&Object.isFrozen(t))return a;t._isValid=a}return t._isValid}function p(t){var e=f(NaN);return null!=t?c(g(e),t):g(e).userInvalidated=!0,e}i=Array.prototype.some?Array.prototype.some:function(t){for(var e=Object(this),n=e.length>>>0,i=0;i<n;i++)if(i in e&&t.call(this,e[i],i,e))return!0;return!1};var v=a.momentProperties=[];function b(t,e){var n,i,a;if(s(e._isAMomentObject)||(t._isAMomentObject=e._isAMomentObject),s(e._i)||(t._i=e._i),s(e._f)||(t._f=e._f),s(e._l)||(t._l=e._l),s(e._strict)||(t._strict=e._strict),s(e._tzm)||(t._tzm=e._tzm),s(e._isUTC)||(t._isUTC=e._isUTC),s(e._offset)||(t._offset=e._offset),s(e._pf)||(t._pf=g(e)),s(e._locale)||(t._locale=e._locale),v.length>0)for(n=0;n<v.length;n++)s(a=e[i=v[n]])||(t[i]=a);return t}var y=!1;function x(t){b(this,t),this._d=new Date(null!=t._d?t._d.getTime():NaN),this.isValid()||(this._d=new Date(NaN)),!1===y&&(y=!0,a.updateOffset(this),y=!1)}function _(t){return t instanceof x||null!=t&&null!=t._isAMomentObject}function w(t){return t<0?Math.ceil(t)||0:Math.floor(t)}function k(t){var e=+t,n=0;return 0!==e&&isFinite(e)&&(n=w(e)),n}function M(t,e,n){var i,a=Math.min(t.length,e.length),r=Math.abs(t.length-e.length),o=0;for(i=0;i<a;i++)(n&&t[i]!==e[i]||!n&&k(t[i])!==k(e[i]))&&o++;return o+r}function S(t){!1===a.suppressDeprecationWarnings&&"undefined"!=typeof console&&console.warn&&console.warn("Deprecation warning: "+t)}function D(t,e){var n=!0;return c((function(){if(null!=a.deprecationHandler&&a.deprecationHandler(null,t),n){for(var i,r=[],o=0;o<arguments.length;o++){if(i="","object"==typeof arguments[o]){for(var s in i+="\n["+o+"] ",arguments[0])i+=s+": "+arguments[0][s]+", ";i=i.slice(0,-2)}else i=arguments[o];r.push(i)}S(t+"\nArguments: "+Array.prototype.slice.call(r).join("")+"\n"+(new Error).stack),n=!1}return e.apply(this,arguments)}),e)}var C,P={};function T(t,e){null!=a.deprecationHandler&&a.deprecationHandler(t,e),P[t]||(S(e),P[t]=!0)}function O(t){return t instanceof Function||"[object Function]"===Object.prototype.toString.call(t)}function A(t,e){var n,i=c({},t);for(n in e)h(e,n)&&(o(t[n])&&o(e[n])?(i[n]={},c(i[n],t[n]),c(i[n],e[n])):null!=e[n]?i[n]=e[n]:delete i[n]);for(n in t)h(t,n)&&!h(e,n)&&o(t[n])&&(i[n]=c({},i[n]));return i}function F(t){null!=t&&this.set(t)}a.suppressDeprecationWarnings=!1,a.deprecationHandler=null,C=Object.keys?Object.keys:function(t){var e,n=[];for(e in t)h(t,e)&&n.push(e);return n};var I={};function L(t,e){var n=t.toLowerCase();I[n]=I[n+"s"]=I[e]=t}function R(t){return"string"==typeof t?I[t]||I[t.toLowerCase()]:void 0}function N(t){var e,n,i={};for(n in t)h(t,n)&&(e=R(n))&&(i[e]=t[n]);return i}var W={};function Y(t,e){W[t]=e}function z(t,e,n){var i=""+Math.abs(t),a=e-i.length;return(t>=0?n?"+":"":"-")+Math.pow(10,Math.max(0,a)).toString().substr(1)+i}var E=/(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g,V=/(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g,H={},B={};function j(t,e,n,i){var a=i;"string"==typeof i&&(a=function(){return this[i]()}),t&&(B[t]=a),e&&(B[e[0]]=function(){return z(a.apply(this,arguments),e[1],e[2])}),n&&(B[n]=function(){return this.localeData().ordinal(a.apply(this,arguments),t)})}function U(t,e){return t.isValid()?(e=G(e,t.localeData()),H[e]=H[e]||function(t){var e,n,i,a=t.match(E);for(e=0,n=a.length;e<n;e++)B[a[e]]?a[e]=B[a[e]]:a[e]=(i=a[e]).match(/\[[\s\S]/)?i.replace(/^\[|\]$/g,""):i.replace(/\\/g,"");return function(e){var i,r="";for(i=0;i<n;i++)r+=O(a[i])?a[i].call(e,t):a[i];return r}}(e),H[e](t)):t.localeData().invalidDate()}function G(t,e){var n=5;function i(t){return e.longDateFormat(t)||t}for(V.lastIndex=0;n>=0&&V.test(t);)t=t.replace(V,i),V.lastIndex=0,n-=1;return t}var q=/\d/,Z=/\d\d/,$=/\d{3}/,X=/\d{4}/,K=/[+-]?\d{6}/,J=/\d\d?/,Q=/\d\d\d\d?/,tt=/\d\d\d\d\d\d?/,et=/\d{1,3}/,nt=/\d{1,4}/,it=/[+-]?\d{1,6}/,at=/\d+/,rt=/[+-]?\d+/,ot=/Z|[+-]\d\d:?\d\d/gi,st=/Z|[+-]\d\d(?::?\d\d)?/gi,lt=/[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFF07\uFF10-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i,ut={};function dt(t,e,n){ut[t]=O(e)?e:function(t,i){return t&&n?n:e}}function ht(t,e){return h(ut,t)?ut[t](e._strict,e._locale):new RegExp(ct(t.replace("\\","").replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,(function(t,e,n,i,a){return e||n||i||a}))))}function ct(t){return t.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}var ft={};function gt(t,e){var n,i=e;for("string"==typeof t&&(t=[t]),l(e)&&(i=function(t,n){n[e]=k(t)}),n=0;n<t.length;n++)ft[t[n]]=i}function mt(t,e){gt(t,(function(t,n,i,a){i._w=i._w||{},e(t,i._w,i,a)}))}function pt(t,e,n){null!=e&&h(ft,t)&&ft[t](e,n._a,n,t)}var vt=0,bt=1,yt=2,xt=3,_t=4,wt=5,kt=6,Mt=7,St=8;function Dt(t){return Ct(t)?366:365}function Ct(t){return t%4==0&&t%100!=0||t%400==0}j("Y",0,0,(function(){var t=this.year();return t<=9999?""+t:"+"+t})),j(0,["YY",2],0,(function(){return this.year()%100})),j(0,["YYYY",4],0,"year"),j(0,["YYYYY",5],0,"year"),j(0,["YYYYYY",6,!0],0,"year"),L("year","y"),Y("year",1),dt("Y",rt),dt("YY",J,Z),dt("YYYY",nt,X),dt("YYYYY",it,K),dt("YYYYYY",it,K),gt(["YYYYY","YYYYYY"],vt),gt("YYYY",(function(t,e){e[vt]=2===t.length?a.parseTwoDigitYear(t):k(t)})),gt("YY",(function(t,e){e[vt]=a.parseTwoDigitYear(t)})),gt("Y",(function(t,e){e[vt]=parseInt(t,10)})),a.parseTwoDigitYear=function(t){return k(t)+(k(t)>68?1900:2e3)};var Pt,Tt=Ot("FullYear",!0);function Ot(t,e){return function(n){return null!=n?(Ft(this,t,n),a.updateOffset(this,e),this):At(this,t)}}function At(t,e){return t.isValid()?t._d["get"+(t._isUTC?"UTC":"")+e]():NaN}function Ft(t,e,n){t.isValid()&&!isNaN(n)&&("FullYear"===e&&Ct(t.year())&&1===t.month()&&29===t.date()?t._d["set"+(t._isUTC?"UTC":"")+e](n,t.month(),It(n,t.month())):t._d["set"+(t._isUTC?"UTC":"")+e](n))}function It(t,e){if(isNaN(t)||isNaN(e))return NaN;var n=function(t,e){return(t%e+e)%e}(e,12);return t+=(e-n)/12,1===n?Ct(t)?29:28:31-n%7%2}Pt=Array.prototype.indexOf?Array.prototype.indexOf:function(t){var e;for(e=0;e<this.length;++e)if(this[e]===t)return e;return-1},j("M",["MM",2],"Mo",(function(){return this.month()+1})),j("MMM",0,0,(function(t){return this.localeData().monthsShort(this,t)})),j("MMMM",0,0,(function(t){return this.localeData().months(this,t)})),L("month","M"),Y("month",8),dt("M",J),dt("MM",J,Z),dt("MMM",(function(t,e){return e.monthsShortRegex(t)})),dt("MMMM",(function(t,e){return e.monthsRegex(t)})),gt(["M","MM"],(function(t,e){e[bt]=k(t)-1})),gt(["MMM","MMMM"],(function(t,e,n,i){var a=n._locale.monthsParse(t,i,n._strict);null!=a?e[bt]=a:g(n).invalidMonth=t}));var Lt=/D[oD]?(\[[^\[\]]*\]|\s)+MMMM?/,Rt="January_February_March_April_May_June_July_August_September_October_November_December".split("_"),Nt="Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_");function Wt(t,e,n){var i,a,r,o=t.toLocaleLowerCase();if(!this._monthsParse)for(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[],i=0;i<12;++i)r=f([2e3,i]),this._shortMonthsParse[i]=this.monthsShort(r,"").toLocaleLowerCase(),this._longMonthsParse[i]=this.months(r,"").toLocaleLowerCase();return n?"MMM"===e?-1!==(a=Pt.call(this._shortMonthsParse,o))?a:null:-1!==(a=Pt.call(this._longMonthsParse,o))?a:null:"MMM"===e?-1!==(a=Pt.call(this._shortMonthsParse,o))?a:-1!==(a=Pt.call(this._longMonthsParse,o))?a:null:-1!==(a=Pt.call(this._longMonthsParse,o))?a:-1!==(a=Pt.call(this._shortMonthsParse,o))?a:null}function Yt(t,e){var n;if(!t.isValid())return t;if("string"==typeof e)if(/^\d+$/.test(e))e=k(e);else if(!l(e=t.localeData().monthsParse(e)))return t;return n=Math.min(t.date(),It(t.year(),e)),t._d["set"+(t._isUTC?"UTC":"")+"Month"](e,n),t}function zt(t){return null!=t?(Yt(this,t),a.updateOffset(this,!0),this):At(this,"Month")}var Et=lt,Vt=lt;function Ht(){function t(t,e){return e.length-t.length}var e,n,i=[],a=[],r=[];for(e=0;e<12;e++)n=f([2e3,e]),i.push(this.monthsShort(n,"")),a.push(this.months(n,"")),r.push(this.months(n,"")),r.push(this.monthsShort(n,""));for(i.sort(t),a.sort(t),r.sort(t),e=0;e<12;e++)i[e]=ct(i[e]),a[e]=ct(a[e]);for(e=0;e<24;e++)r[e]=ct(r[e]);this._monthsRegex=new RegExp("^("+r.join("|")+")","i"),this._monthsShortRegex=this._monthsRegex,this._monthsStrictRegex=new RegExp("^("+a.join("|")+")","i"),this._monthsShortStrictRegex=new RegExp("^("+i.join("|")+")","i")}function Bt(t,e,n,i,a,r,o){var s;return t<100&&t>=0?(s=new Date(t+400,e,n,i,a,r,o),isFinite(s.getFullYear())&&s.setFullYear(t)):s=new Date(t,e,n,i,a,r,o),s}function jt(t){var e;if(t<100&&t>=0){var n=Array.prototype.slice.call(arguments);n[0]=t+400,e=new Date(Date.UTC.apply(null,n)),isFinite(e.getUTCFullYear())&&e.setUTCFullYear(t)}else e=new Date(Date.UTC.apply(null,arguments));return e}function Ut(t,e,n){var i=7+e-n;return-(7+jt(t,0,i).getUTCDay()-e)%7+i-1}function Gt(t,e,n,i,a){var r,o,s=1+7*(e-1)+(7+n-i)%7+Ut(t,i,a);return s<=0?o=Dt(r=t-1)+s:s>Dt(t)?(r=t+1,o=s-Dt(t)):(r=t,o=s),{year:r,dayOfYear:o}}function qt(t,e,n){var i,a,r=Ut(t.year(),e,n),o=Math.floor((t.dayOfYear()-r-1)/7)+1;return o<1?i=o+Zt(a=t.year()-1,e,n):o>Zt(t.year(),e,n)?(i=o-Zt(t.year(),e,n),a=t.year()+1):(a=t.year(),i=o),{week:i,year:a}}function Zt(t,e,n){var i=Ut(t,e,n),a=Ut(t+1,e,n);return(Dt(t)-i+a)/7}function $t(t,e){return t.slice(e,7).concat(t.slice(0,e))}j("w",["ww",2],"wo","week"),j("W",["WW",2],"Wo","isoWeek"),L("week","w"),L("isoWeek","W"),Y("week",5),Y("isoWeek",5),dt("w",J),dt("ww",J,Z),dt("W",J),dt("WW",J,Z),mt(["w","ww","W","WW"],(function(t,e,n,i){e[i.substr(0,1)]=k(t)})),j("d",0,"do","day"),j("dd",0,0,(function(t){return this.localeData().weekdaysMin(this,t)})),j("ddd",0,0,(function(t){return this.localeData().weekdaysShort(this,t)})),j("dddd",0,0,(function(t){return this.localeData().weekdays(this,t)})),j("e",0,0,"weekday"),j("E",0,0,"isoWeekday"),L("day","d"),L("weekday","e"),L("isoWeekday","E"),Y("day",11),Y("weekday",11),Y("isoWeekday",11),dt("d",J),dt("e",J),dt("E",J),dt("dd",(function(t,e){return e.weekdaysMinRegex(t)})),dt("ddd",(function(t,e){return e.weekdaysShortRegex(t)})),dt("dddd",(function(t,e){return e.weekdaysRegex(t)})),mt(["dd","ddd","dddd"],(function(t,e,n,i){var a=n._locale.weekdaysParse(t,i,n._strict);null!=a?e.d=a:g(n).invalidWeekday=t})),mt(["d","e","E"],(function(t,e,n,i){e[i]=k(t)}));var Xt="Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),Kt="Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),Jt="Su_Mo_Tu_We_Th_Fr_Sa".split("_");function Qt(t,e,n){var i,a,r,o=t.toLocaleLowerCase();if(!this._weekdaysParse)for(this._weekdaysParse=[],this._shortWeekdaysParse=[],this._minWeekdaysParse=[],i=0;i<7;++i)r=f([2e3,1]).day(i),this._minWeekdaysParse[i]=this.weekdaysMin(r,"").toLocaleLowerCase(),this._shortWeekdaysParse[i]=this.weekdaysShort(r,"").toLocaleLowerCase(),this._weekdaysParse[i]=this.weekdays(r,"").toLocaleLowerCase();return n?"dddd"===e?-1!==(a=Pt.call(this._weekdaysParse,o))?a:null:"ddd"===e?-1!==(a=Pt.call(this._shortWeekdaysParse,o))?a:null:-1!==(a=Pt.call(this._minWeekdaysParse,o))?a:null:"dddd"===e?-1!==(a=Pt.call(this._weekdaysParse,o))?a:-1!==(a=Pt.call(this._shortWeekdaysParse,o))?a:-1!==(a=Pt.call(this._minWeekdaysParse,o))?a:null:"ddd"===e?-1!==(a=Pt.call(this._shortWeekdaysParse,o))?a:-1!==(a=Pt.call(this._weekdaysParse,o))?a:-1!==(a=Pt.call(this._minWeekdaysParse,o))?a:null:-1!==(a=Pt.call(this._minWeekdaysParse,o))?a:-1!==(a=Pt.call(this._weekdaysParse,o))?a:-1!==(a=Pt.call(this._shortWeekdaysParse,o))?a:null}var te=lt,ee=lt,ne=lt;function ie(){function t(t,e){return e.length-t.length}var e,n,i,a,r,o=[],s=[],l=[],u=[];for(e=0;e<7;e++)n=f([2e3,1]).day(e),i=this.weekdaysMin(n,""),a=this.weekdaysShort(n,""),r=this.weekdays(n,""),o.push(i),s.push(a),l.push(r),u.push(i),u.push(a),u.push(r);for(o.sort(t),s.sort(t),l.sort(t),u.sort(t),e=0;e<7;e++)s[e]=ct(s[e]),l[e]=ct(l[e]),u[e]=ct(u[e]);this._weekdaysRegex=new RegExp("^("+u.join("|")+")","i"),this._weekdaysShortRegex=this._weekdaysRegex,this._weekdaysMinRegex=this._weekdaysRegex,this._weekdaysStrictRegex=new RegExp("^("+l.join("|")+")","i"),this._weekdaysShortStrictRegex=new RegExp("^("+s.join("|")+")","i"),this._weekdaysMinStrictRegex=new RegExp("^("+o.join("|")+")","i")}function ae(){return this.hours()%12||12}function re(t,e){j(t,0,0,(function(){return this.localeData().meridiem(this.hours(),this.minutes(),e)}))}function oe(t,e){return e._meridiemParse}j("H",["HH",2],0,"hour"),j("h",["hh",2],0,ae),j("k",["kk",2],0,(function(){return this.hours()||24})),j("hmm",0,0,(function(){return""+ae.apply(this)+z(this.minutes(),2)})),j("hmmss",0,0,(function(){return""+ae.apply(this)+z(this.minutes(),2)+z(this.seconds(),2)})),j("Hmm",0,0,(function(){return""+this.hours()+z(this.minutes(),2)})),j("Hmmss",0,0,(function(){return""+this.hours()+z(this.minutes(),2)+z(this.seconds(),2)})),re("a",!0),re("A",!1),L("hour","h"),Y("hour",13),dt("a",oe),dt("A",oe),dt("H",J),dt("h",J),dt("k",J),dt("HH",J,Z),dt("hh",J,Z),dt("kk",J,Z),dt("hmm",Q),dt("hmmss",tt),dt("Hmm",Q),dt("Hmmss",tt),gt(["H","HH"],xt),gt(["k","kk"],(function(t,e,n){var i=k(t);e[xt]=24===i?0:i})),gt(["a","A"],(function(t,e,n){n._isPm=n._locale.isPM(t),n._meridiem=t})),gt(["h","hh"],(function(t,e,n){e[xt]=k(t),g(n).bigHour=!0})),gt("hmm",(function(t,e,n){var i=t.length-2;e[xt]=k(t.substr(0,i)),e[_t]=k(t.substr(i)),g(n).bigHour=!0})),gt("hmmss",(function(t,e,n){var i=t.length-4,a=t.length-2;e[xt]=k(t.substr(0,i)),e[_t]=k(t.substr(i,2)),e[wt]=k(t.substr(a)),g(n).bigHour=!0})),gt("Hmm",(function(t,e,n){var i=t.length-2;e[xt]=k(t.substr(0,i)),e[_t]=k(t.substr(i))})),gt("Hmmss",(function(t,e,n){var i=t.length-4,a=t.length-2;e[xt]=k(t.substr(0,i)),e[_t]=k(t.substr(i,2)),e[wt]=k(t.substr(a))}));var se,le=Ot("Hours",!0),ue={calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},longDateFormat:{LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},invalidDate:"Invalid date",ordinal:"%d",dayOfMonthOrdinalParse:/\d{1,2}/,relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},months:Rt,monthsShort:Nt,week:{dow:0,doy:6},weekdays:Xt,weekdaysMin:Jt,weekdaysShort:Kt,meridiemParse:/[ap]\.?m?\.?/i},de={},he={};function ce(t){return t?t.toLowerCase().replace("_","-"):t}function fe(n){var i=null;if(!de[n]&&e&&e.exports)try{i=se._abbr,t(),ge(i)}catch(t){}return de[n]}function ge(t,e){var n;return t&&((n=s(e)?pe(t):me(t,e))?se=n:"undefined"!=typeof console&&console.warn&&console.warn("Locale "+t+" not found. Did you forget to load it?")),se._abbr}function me(t,e){if(null!==e){var n,i=ue;if(e.abbr=t,null!=de[t])T("defineLocaleOverride","use moment.updateLocale(localeName, config) to change an existing locale. moment.defineLocale(localeName, config) should only be used for creating a new locale See http://momentjs.com/guides/#/warnings/define-locale/ for more info."),i=de[t]._config;else if(null!=e.parentLocale)if(null!=de[e.parentLocale])i=de[e.parentLocale]._config;else{if(null==(n=fe(e.parentLocale)))return he[e.parentLocale]||(he[e.parentLocale]=[]),he[e.parentLocale].push({name:t,config:e}),null;i=n._config}return de[t]=new F(A(i,e)),he[t]&&he[t].forEach((function(t){me(t.name,t.config)})),ge(t),de[t]}return delete de[t],null}function pe(t){var e;if(t&&t._locale&&t._locale._abbr&&(t=t._locale._abbr),!t)return se;if(!r(t)){if(e=fe(t))return e;t=[t]}return function(t){for(var e,n,i,a,r=0;r<t.length;){for(e=(a=ce(t[r]).split("-")).length,n=(n=ce(t[r+1]))?n.split("-"):null;e>0;){if(i=fe(a.slice(0,e).join("-")))return i;if(n&&n.length>=e&&M(a,n,!0)>=e-1)break;e--}r++}return se}(t)}function ve(t){var e,n=t._a;return n&&-2===g(t).overflow&&(e=n[bt]<0||n[bt]>11?bt:n[yt]<1||n[yt]>It(n[vt],n[bt])?yt:n[xt]<0||n[xt]>24||24===n[xt]&&(0!==n[_t]||0!==n[wt]||0!==n[kt])?xt:n[_t]<0||n[_t]>59?_t:n[wt]<0||n[wt]>59?wt:n[kt]<0||n[kt]>999?kt:-1,g(t)._overflowDayOfYear&&(e<vt||e>yt)&&(e=yt),g(t)._overflowWeeks&&-1===e&&(e=Mt),g(t)._overflowWeekday&&-1===e&&(e=St),g(t).overflow=e),t}function be(t,e,n){return null!=t?t:null!=e?e:n}function ye(t){var e,n,i,r,o,s=[];if(!t._d){for(i=function(t){var e=new Date(a.now());return t._useUTC?[e.getUTCFullYear(),e.getUTCMonth(),e.getUTCDate()]:[e.getFullYear(),e.getMonth(),e.getDate()]}(t),t._w&&null==t._a[yt]&&null==t._a[bt]&&function(t){var e,n,i,a,r,o,s,l;if(null!=(e=t._w).GG||null!=e.W||null!=e.E)r=1,o=4,n=be(e.GG,t._a[vt],qt(Le(),1,4).year),i=be(e.W,1),((a=be(e.E,1))<1||a>7)&&(l=!0);else{r=t._locale._week.dow,o=t._locale._week.doy;var u=qt(Le(),r,o);n=be(e.gg,t._a[vt],u.year),i=be(e.w,u.week),null!=e.d?((a=e.d)<0||a>6)&&(l=!0):null!=e.e?(a=e.e+r,(e.e<0||e.e>6)&&(l=!0)):a=r}i<1||i>Zt(n,r,o)?g(t)._overflowWeeks=!0:null!=l?g(t)._overflowWeekday=!0:(s=Gt(n,i,a,r,o),t._a[vt]=s.year,t._dayOfYear=s.dayOfYear)}(t),null!=t._dayOfYear&&(o=be(t._a[vt],i[vt]),(t._dayOfYear>Dt(o)||0===t._dayOfYear)&&(g(t)._overflowDayOfYear=!0),n=jt(o,0,t._dayOfYear),t._a[bt]=n.getUTCMonth(),t._a[yt]=n.getUTCDate()),e=0;e<3&&null==t._a[e];++e)t._a[e]=s[e]=i[e];for(;e<7;e++)t._a[e]=s[e]=null==t._a[e]?2===e?1:0:t._a[e];24===t._a[xt]&&0===t._a[_t]&&0===t._a[wt]&&0===t._a[kt]&&(t._nextDay=!0,t._a[xt]=0),t._d=(t._useUTC?jt:Bt).apply(null,s),r=t._useUTC?t._d.getUTCDay():t._d.getDay(),null!=t._tzm&&t._d.setUTCMinutes(t._d.getUTCMinutes()-t._tzm),t._nextDay&&(t._a[xt]=24),t._w&&void 0!==t._w.d&&t._w.d!==r&&(g(t).weekdayMismatch=!0)}}var xe=/^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,_e=/^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,we=/Z|[+-]\d\d(?::?\d\d)?/,ke=[["YYYYYY-MM-DD",/[+-]\d{6}-\d\d-\d\d/],["YYYY-MM-DD",/\d{4}-\d\d-\d\d/],["GGGG-[W]WW-E",/\d{4}-W\d\d-\d/],["GGGG-[W]WW",/\d{4}-W\d\d/,!1],["YYYY-DDD",/\d{4}-\d{3}/],["YYYY-MM",/\d{4}-\d\d/,!1],["YYYYYYMMDD",/[+-]\d{10}/],["YYYYMMDD",/\d{8}/],["GGGG[W]WWE",/\d{4}W\d{3}/],["GGGG[W]WW",/\d{4}W\d{2}/,!1],["YYYYDDD",/\d{7}/]],Me=[["HH:mm:ss.SSSS",/\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss,SSSS",/\d\d:\d\d:\d\d,\d+/],["HH:mm:ss",/\d\d:\d\d:\d\d/],["HH:mm",/\d\d:\d\d/],["HHmmss.SSSS",/\d\d\d\d\d\d\.\d+/],["HHmmss,SSSS",/\d\d\d\d\d\d,\d+/],["HHmmss",/\d\d\d\d\d\d/],["HHmm",/\d\d\d\d/],["HH",/\d\d/]],Se=/^\/?Date\((\-?\d+)/i;function De(t){var e,n,i,a,r,o,s=t._i,l=xe.exec(s)||_e.exec(s);if(l){for(g(t).iso=!0,e=0,n=ke.length;e<n;e++)if(ke[e][1].exec(l[1])){a=ke[e][0],i=!1!==ke[e][2];break}if(null==a)return void(t._isValid=!1);if(l[3]){for(e=0,n=Me.length;e<n;e++)if(Me[e][1].exec(l[3])){r=(l[2]||" ")+Me[e][0];break}if(null==r)return void(t._isValid=!1)}if(!i&&null!=r)return void(t._isValid=!1);if(l[4]){if(!we.exec(l[4]))return void(t._isValid=!1);o="Z"}t._f=a+(r||"")+(o||""),Ae(t)}else t._isValid=!1}var Ce=/^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\s)?(\d{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\d{2,4})\s(\d\d):(\d\d)(?::(\d\d))?\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|([+-]\d{4}))$/;function Pe(t){var e=parseInt(t,10);return e<=49?2e3+e:e<=999?1900+e:e}var Te={UT:0,GMT:0,EDT:-240,EST:-300,CDT:-300,CST:-360,MDT:-360,MST:-420,PDT:-420,PST:-480};function Oe(t){var e,n,i,a,r,o,s,l=Ce.exec(t._i.replace(/\([^)]*\)|[\n\t]/g," ").replace(/(\s\s+)/g," ").replace(/^\s\s*/,"").replace(/\s\s*$/,""));if(l){var u=(e=l[4],n=l[3],i=l[2],a=l[5],r=l[6],o=l[7],s=[Pe(e),Nt.indexOf(n),parseInt(i,10),parseInt(a,10),parseInt(r,10)],o&&s.push(parseInt(o,10)),s);if(!function(t,e,n){return!t||Kt.indexOf(t)===new Date(e[0],e[1],e[2]).getDay()||(g(n).weekdayMismatch=!0,n._isValid=!1,!1)}(l[1],u,t))return;t._a=u,t._tzm=function(t,e,n){if(t)return Te[t];if(e)return 0;var i=parseInt(n,10),a=i%100;return(i-a)/100*60+a}(l[8],l[9],l[10]),t._d=jt.apply(null,t._a),t._d.setUTCMinutes(t._d.getUTCMinutes()-t._tzm),g(t).rfc2822=!0}else t._isValid=!1}function Ae(t){if(t._f!==a.ISO_8601)if(t._f!==a.RFC_2822){t._a=[],g(t).empty=!0;var e,n,i,r,o,s=""+t._i,l=s.length,u=0;for(i=G(t._f,t._locale).match(E)||[],e=0;e<i.length;e++)r=i[e],(n=(s.match(ht(r,t))||[])[0])&&((o=s.substr(0,s.indexOf(n))).length>0&&g(t).unusedInput.push(o),s=s.slice(s.indexOf(n)+n.length),u+=n.length),B[r]?(n?g(t).empty=!1:g(t).unusedTokens.push(r),pt(r,n,t)):t._strict&&!n&&g(t).unusedTokens.push(r);g(t).charsLeftOver=l-u,s.length>0&&g(t).unusedInput.push(s),t._a[xt]<=12&&!0===g(t).bigHour&&t._a[xt]>0&&(g(t).bigHour=void 0),g(t).parsedDateParts=t._a.slice(0),g(t).meridiem=t._meridiem,t._a[xt]=function(t,e,n){var i;return null==n?e:null!=t.meridiemHour?t.meridiemHour(e,n):null!=t.isPM?((i=t.isPM(n))&&e<12&&(e+=12),i||12!==e||(e=0),e):e}(t._locale,t._a[xt],t._meridiem),ye(t),ve(t)}else Oe(t);else De(t)}function Fe(t){var e=t._i,n=t._f;return t._locale=t._locale||pe(t._l),null===e||void 0===n&&""===e?p({nullInput:!0}):("string"==typeof e&&(t._i=e=t._locale.preparse(e)),_(e)?new x(ve(e)):(u(e)?t._d=e:r(n)?function(t){var e,n,i,a,r;if(0===t._f.length)return g(t).invalidFormat=!0,void(t._d=new Date(NaN));for(a=0;a<t._f.length;a++)r=0,e=b({},t),null!=t._useUTC&&(e._useUTC=t._useUTC),e._f=t._f[a],Ae(e),m(e)&&(r+=g(e).charsLeftOver,r+=10*g(e).unusedTokens.length,g(e).score=r,(null==i||r<i)&&(i=r,n=e));c(t,n||e)}(t):n?Ae(t):function(t){var e=t._i;s(e)?t._d=new Date(a.now()):u(e)?t._d=new Date(e.valueOf()):"string"==typeof e?function(t){var e=Se.exec(t._i);null===e?(De(t),!1===t._isValid&&(delete t._isValid,Oe(t),!1===t._isValid&&(delete t._isValid,a.createFromInputFallback(t)))):t._d=new Date(+e[1])}(t):r(e)?(t._a=d(e.slice(0),(function(t){return parseInt(t,10)})),ye(t)):o(e)?function(t){if(!t._d){var e=N(t._i);t._a=d([e.year,e.month,e.day||e.date,e.hour,e.minute,e.second,e.millisecond],(function(t){return t&&parseInt(t,10)})),ye(t)}}(t):l(e)?t._d=new Date(e):a.createFromInputFallback(t)}(t),m(t)||(t._d=null),t))}function Ie(t,e,n,i,a){var s,l={};return!0!==n&&!1!==n||(i=n,n=void 0),(o(t)&&function(t){if(Object.getOwnPropertyNames)return 0===Object.getOwnPropertyNames(t).length;var e;for(e in t)if(t.hasOwnProperty(e))return!1;return!0}(t)||r(t)&&0===t.length)&&(t=void 0),l._isAMomentObject=!0,l._useUTC=l._isUTC=a,l._l=n,l._i=t,l._f=e,l._strict=i,(s=new x(ve(Fe(l))))._nextDay&&(s.add(1,"d"),s._nextDay=void 0),s}function Le(t,e,n,i){return Ie(t,e,n,i,!1)}a.createFromInputFallback=D("value provided is not in a recognized RFC2822 or ISO format. moment construction falls back to js Date(), which is not reliable across all browsers and versions. Non RFC2822/ISO date formats are discouraged and will be removed in an upcoming major release. Please refer to http://momentjs.com/guides/#/warnings/js-date/ for more info.",(function(t){t._d=new Date(t._i+(t._useUTC?" UTC":""))})),a.ISO_8601=function(){},a.RFC_2822=function(){};var Re=D("moment().min is deprecated, use moment.max instead. http://momentjs.com/guides/#/warnings/min-max/",(function(){var t=Le.apply(null,arguments);return this.isValid()&&t.isValid()?t<this?this:t:p()})),Ne=D("moment().max is deprecated, use moment.min instead. http://momentjs.com/guides/#/warnings/min-max/",(function(){var t=Le.apply(null,arguments);return this.isValid()&&t.isValid()?t>this?this:t:p()}));function We(t,e){var n,i;if(1===e.length&&r(e[0])&&(e=e[0]),!e.length)return Le();for(n=e[0],i=1;i<e.length;++i)e[i].isValid()&&!e[i][t](n)||(n=e[i]);return n}var Ye=["year","quarter","month","week","day","hour","minute","second","millisecond"];function ze(t){var e=N(t),n=e.year||0,i=e.quarter||0,a=e.month||0,r=e.week||e.isoWeek||0,o=e.day||0,s=e.hour||0,l=e.minute||0,u=e.second||0,d=e.millisecond||0;this._isValid=function(t){for(var e in t)if(-1===Pt.call(Ye,e)||null!=t[e]&&isNaN(t[e]))return!1;for(var n=!1,i=0;i<Ye.length;++i)if(t[Ye[i]]){if(n)return!1;parseFloat(t[Ye[i]])!==k(t[Ye[i]])&&(n=!0)}return!0}(e),this._milliseconds=+d+1e3*u+6e4*l+1e3*s*60*60,this._days=+o+7*r,this._months=+a+3*i+12*n,this._data={},this._locale=pe(),this._bubble()}function Ee(t){return t instanceof ze}function Ve(t){return t<0?-1*Math.round(-1*t):Math.round(t)}function He(t,e){j(t,0,0,(function(){var t=this.utcOffset(),n="+";return t<0&&(t=-t,n="-"),n+z(~~(t/60),2)+e+z(~~t%60,2)}))}He("Z",":"),He("ZZ",""),dt("Z",st),dt("ZZ",st),gt(["Z","ZZ"],(function(t,e,n){n._useUTC=!0,n._tzm=je(st,t)}));var Be=/([\+\-]|\d\d)/gi;function je(t,e){var n=(e||"").match(t);if(null===n)return null;var i=((n[n.length-1]||[])+"").match(Be)||["-",0,0],a=60*i[1]+k(i[2]);return 0===a?0:"+"===i[0]?a:-a}function Ue(t,e){var n,i;return e._isUTC?(n=e.clone(),i=(_(t)||u(t)?t.valueOf():Le(t).valueOf())-n.valueOf(),n._d.setTime(n._d.valueOf()+i),a.updateOffset(n,!1),n):Le(t).local()}function Ge(t){return 15*-Math.round(t._d.getTimezoneOffset()/15)}function qe(){return!!this.isValid()&&this._isUTC&&0===this._offset}a.updateOffset=function(){};var Ze=/^(\-|\+)?(?:(\d*)[. ])?(\d+)\:(\d+)(?:\:(\d+)(\.\d*)?)?$/,$e=/^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/;function Xe(t,e){var n,i,a,r,o,s,u=t,d=null;return Ee(t)?u={ms:t._milliseconds,d:t._days,M:t._months}:l(t)?(u={},e?u[e]=t:u.milliseconds=t):(d=Ze.exec(t))?(n="-"===d[1]?-1:1,u={y:0,d:k(d[yt])*n,h:k(d[xt])*n,m:k(d[_t])*n,s:k(d[wt])*n,ms:k(Ve(1e3*d[kt]))*n}):(d=$e.exec(t))?(n="-"===d[1]?-1:1,u={y:Ke(d[2],n),M:Ke(d[3],n),w:Ke(d[4],n),d:Ke(d[5],n),h:Ke(d[6],n),m:Ke(d[7],n),s:Ke(d[8],n)}):null==u?u={}:"object"==typeof u&&("from"in u||"to"in u)&&(r=Le(u.from),o=Le(u.to),a=r.isValid()&&o.isValid()?(o=Ue(o,r),r.isBefore(o)?s=Je(r,o):((s=Je(o,r)).milliseconds=-s.milliseconds,s.months=-s.months),s):{milliseconds:0,months:0},(u={}).ms=a.milliseconds,u.M=a.months),i=new ze(u),Ee(t)&&h(t,"_locale")&&(i._locale=t._locale),i}function Ke(t,e){var n=t&&parseFloat(t.replace(",","."));return(isNaN(n)?0:n)*e}function Je(t,e){var n={};return n.months=e.month()-t.month()+12*(e.year()-t.year()),t.clone().add(n.months,"M").isAfter(e)&&--n.months,n.milliseconds=+e-+t.clone().add(n.months,"M"),n}function Qe(t,e){return function(n,i){var a;return null===i||isNaN(+i)||(T(e,"moment()."+e+"(period, number) is deprecated. Please use moment()."+e+"(number, period). See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info."),a=n,n=i,i=a),tn(this,Xe(n="string"==typeof n?+n:n,i),t),this}}function tn(t,e,n,i){var r=e._milliseconds,o=Ve(e._days),s=Ve(e._months);t.isValid()&&(i=null==i||i,s&&Yt(t,At(t,"Month")+s*n),o&&Ft(t,"Date",At(t,"Date")+o*n),r&&t._d.setTime(t._d.valueOf()+r*n),i&&a.updateOffset(t,o||s))}Xe.fn=ze.prototype,Xe.invalid=function(){return Xe(NaN)};var en=Qe(1,"add"),nn=Qe(-1,"subtract");function an(t,e){var n=12*(e.year()-t.year())+(e.month()-t.month()),i=t.clone().add(n,"months");return-(n+(e-i<0?(e-i)/(i-t.clone().add(n-1,"months")):(e-i)/(t.clone().add(n+1,"months")-i)))||0}function rn(t){var e;return void 0===t?this._locale._abbr:(null!=(e=pe(t))&&(this._locale=e),this)}a.defaultFormat="YYYY-MM-DDTHH:mm:ssZ",a.defaultFormatUtc="YYYY-MM-DDTHH:mm:ss[Z]";var on=D("moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.",(function(t){return void 0===t?this.localeData():this.locale(t)}));function sn(){return this._locale}var ln=1e3,un=60*ln,dn=60*un,hn=3506328*dn;function cn(t,e){return(t%e+e)%e}function fn(t,e,n){return t<100&&t>=0?new Date(t+400,e,n)-hn:new Date(t,e,n).valueOf()}function gn(t,e,n){return t<100&&t>=0?Date.UTC(t+400,e,n)-hn:Date.UTC(t,e,n)}function mn(t,e){j(0,[t,t.length],0,e)}function pn(t,e,n,i,a){var r;return null==t?qt(this,i,a).year:(e>(r=Zt(t,i,a))&&(e=r),vn.call(this,t,e,n,i,a))}function vn(t,e,n,i,a){var r=Gt(t,e,n,i,a),o=jt(r.year,0,r.dayOfYear);return this.year(o.getUTCFullYear()),this.month(o.getUTCMonth()),this.date(o.getUTCDate()),this}j(0,["gg",2],0,(function(){return this.weekYear()%100})),j(0,["GG",2],0,(function(){return this.isoWeekYear()%100})),mn("gggg","weekYear"),mn("ggggg","weekYear"),mn("GGGG","isoWeekYear"),mn("GGGGG","isoWeekYear"),L("weekYear","gg"),L("isoWeekYear","GG"),Y("weekYear",1),Y("isoWeekYear",1),dt("G",rt),dt("g",rt),dt("GG",J,Z),dt("gg",J,Z),dt("GGGG",nt,X),dt("gggg",nt,X),dt("GGGGG",it,K),dt("ggggg",it,K),mt(["gggg","ggggg","GGGG","GGGGG"],(function(t,e,n,i){e[i.substr(0,2)]=k(t)})),mt(["gg","GG"],(function(t,e,n,i){e[i]=a.parseTwoDigitYear(t)})),j("Q",0,"Qo","quarter"),L("quarter","Q"),Y("quarter",7),dt("Q",q),gt("Q",(function(t,e){e[bt]=3*(k(t)-1)})),j("D",["DD",2],"Do","date"),L("date","D"),Y("date",9),dt("D",J),dt("DD",J,Z),dt("Do",(function(t,e){return t?e._dayOfMonthOrdinalParse||e._ordinalParse:e._dayOfMonthOrdinalParseLenient})),gt(["D","DD"],yt),gt("Do",(function(t,e){e[yt]=k(t.match(J)[0])}));var bn=Ot("Date",!0);j("DDD",["DDDD",3],"DDDo","dayOfYear"),L("dayOfYear","DDD"),Y("dayOfYear",4),dt("DDD",et),dt("DDDD",$),gt(["DDD","DDDD"],(function(t,e,n){n._dayOfYear=k(t)})),j("m",["mm",2],0,"minute"),L("minute","m"),Y("minute",14),dt("m",J),dt("mm",J,Z),gt(["m","mm"],_t);var yn=Ot("Minutes",!1);j("s",["ss",2],0,"second"),L("second","s"),Y("second",15),dt("s",J),dt("ss",J,Z),gt(["s","ss"],wt);var xn,_n=Ot("Seconds",!1);for(j("S",0,0,(function(){return~~(this.millisecond()/100)})),j(0,["SS",2],0,(function(){return~~(this.millisecond()/10)})),j(0,["SSS",3],0,"millisecond"),j(0,["SSSS",4],0,(function(){return 10*this.millisecond()})),j(0,["SSSSS",5],0,(function(){return 100*this.millisecond()})),j(0,["SSSSSS",6],0,(function(){return 1e3*this.millisecond()})),j(0,["SSSSSSS",7],0,(function(){return 1e4*this.millisecond()})),j(0,["SSSSSSSS",8],0,(function(){return 1e5*this.millisecond()})),j(0,["SSSSSSSSS",9],0,(function(){return 1e6*this.millisecond()})),L("millisecond","ms"),Y("millisecond",16),dt("S",et,q),dt("SS",et,Z),dt("SSS",et,$),xn="SSSS";xn.length<=9;xn+="S")dt(xn,at);function wn(t,e){e[kt]=k(1e3*("0."+t))}for(xn="S";xn.length<=9;xn+="S")gt(xn,wn);var kn=Ot("Milliseconds",!1);j("z",0,0,"zoneAbbr"),j("zz",0,0,"zoneName");var Mn=x.prototype;function Sn(t){return t}Mn.add=en,Mn.calendar=function(t,e){var n=t||Le(),i=Ue(n,this).startOf("day"),r=a.calendarFormat(this,i)||"sameElse",o=e&&(O(e[r])?e[r].call(this,n):e[r]);return this.format(o||this.localeData().calendar(r,this,Le(n)))},Mn.clone=function(){return new x(this)},Mn.diff=function(t,e,n){var i,a,r;if(!this.isValid())return NaN;if(!(i=Ue(t,this)).isValid())return NaN;switch(a=6e4*(i.utcOffset()-this.utcOffset()),e=R(e)){case"year":r=an(this,i)/12;break;case"month":r=an(this,i);break;case"quarter":r=an(this,i)/3;break;case"second":r=(this-i)/1e3;break;case"minute":r=(this-i)/6e4;break;case"hour":r=(this-i)/36e5;break;case"day":r=(this-i-a)/864e5;break;case"week":r=(this-i-a)/6048e5;break;default:r=this-i}return n?r:w(r)},Mn.endOf=function(t){var e;if(void 0===(t=R(t))||"millisecond"===t||!this.isValid())return this;var n=this._isUTC?gn:fn;switch(t){case"year":e=n(this.year()+1,0,1)-1;break;case"quarter":e=n(this.year(),this.month()-this.month()%3+3,1)-1;break;case"month":e=n(this.year(),this.month()+1,1)-1;break;case"week":e=n(this.year(),this.month(),this.date()-this.weekday()+7)-1;break;case"isoWeek":e=n(this.year(),this.month(),this.date()-(this.isoWeekday()-1)+7)-1;break;case"day":case"date":e=n(this.year(),this.month(),this.date()+1)-1;break;case"hour":e=this._d.valueOf(),e+=dn-cn(e+(this._isUTC?0:this.utcOffset()*un),dn)-1;break;case"minute":e=this._d.valueOf(),e+=un-cn(e,un)-1;break;case"second":e=this._d.valueOf(),e+=ln-cn(e,ln)-1}return this._d.setTime(e),a.updateOffset(this,!0),this},Mn.format=function(t){t||(t=this.isUtc()?a.defaultFormatUtc:a.defaultFormat);var e=U(this,t);return this.localeData().postformat(e)},Mn.from=function(t,e){return this.isValid()&&(_(t)&&t.isValid()||Le(t).isValid())?Xe({to:this,from:t}).locale(this.locale()).humanize(!e):this.localeData().invalidDate()},Mn.fromNow=function(t){return this.from(Le(),t)},Mn.to=function(t,e){return this.isValid()&&(_(t)&&t.isValid()||Le(t).isValid())?Xe({from:this,to:t}).locale(this.locale()).humanize(!e):this.localeData().invalidDate()},Mn.toNow=function(t){return this.to(Le(),t)},Mn.get=function(t){return O(this[t=R(t)])?this[t]():this},Mn.invalidAt=function(){return g(this).overflow},Mn.isAfter=function(t,e){var n=_(t)?t:Le(t);return!(!this.isValid()||!n.isValid())&&("millisecond"===(e=R(e)||"millisecond")?this.valueOf()>n.valueOf():n.valueOf()<this.clone().startOf(e).valueOf())},Mn.isBefore=function(t,e){var n=_(t)?t:Le(t);return!(!this.isValid()||!n.isValid())&&("millisecond"===(e=R(e)||"millisecond")?this.valueOf()<n.valueOf():this.clone().endOf(e).valueOf()<n.valueOf())},Mn.isBetween=function(t,e,n,i){var a=_(t)?t:Le(t),r=_(e)?e:Le(e);return!!(this.isValid()&&a.isValid()&&r.isValid())&&("("===(i=i||"()")[0]?this.isAfter(a,n):!this.isBefore(a,n))&&(")"===i[1]?this.isBefore(r,n):!this.isAfter(r,n))},Mn.isSame=function(t,e){var n,i=_(t)?t:Le(t);return!(!this.isValid()||!i.isValid())&&("millisecond"===(e=R(e)||"millisecond")?this.valueOf()===i.valueOf():(n=i.valueOf(),this.clone().startOf(e).valueOf()<=n&&n<=this.clone().endOf(e).valueOf()))},Mn.isSameOrAfter=function(t,e){return this.isSame(t,e)||this.isAfter(t,e)},Mn.isSameOrBefore=function(t,e){return this.isSame(t,e)||this.isBefore(t,e)},Mn.isValid=function(){return m(this)},Mn.lang=on,Mn.locale=rn,Mn.localeData=sn,Mn.max=Ne,Mn.min=Re,Mn.parsingFlags=function(){return c({},g(this))},Mn.set=function(t,e){if("object"==typeof t)for(var n=function(t){var e=[];for(var n in t)e.push({unit:n,priority:W[n]});return e.sort((function(t,e){return t.priority-e.priority})),e}(t=N(t)),i=0;i<n.length;i++)this[n[i].unit](t[n[i].unit]);else if(O(this[t=R(t)]))return this[t](e);return this},Mn.startOf=function(t){var e;if(void 0===(t=R(t))||"millisecond"===t||!this.isValid())return this;var n=this._isUTC?gn:fn;switch(t){case"year":e=n(this.year(),0,1);break;case"quarter":e=n(this.year(),this.month()-this.month()%3,1);break;case"month":e=n(this.year(),this.month(),1);break;case"week":e=n(this.year(),this.month(),this.date()-this.weekday());break;case"isoWeek":e=n(this.year(),this.month(),this.date()-(this.isoWeekday()-1));break;case"day":case"date":e=n(this.year(),this.month(),this.date());break;case"hour":e=this._d.valueOf(),e-=cn(e+(this._isUTC?0:this.utcOffset()*un),dn);break;case"minute":e=this._d.valueOf(),e-=cn(e,un);break;case"second":e=this._d.valueOf(),e-=cn(e,ln)}return this._d.setTime(e),a.updateOffset(this,!0),this},Mn.subtract=nn,Mn.toArray=function(){var t=this;return[t.year(),t.month(),t.date(),t.hour(),t.minute(),t.second(),t.millisecond()]},Mn.toObject=function(){var t=this;return{years:t.year(),months:t.month(),date:t.date(),hours:t.hours(),minutes:t.minutes(),seconds:t.seconds(),milliseconds:t.milliseconds()}},Mn.toDate=function(){return new Date(this.valueOf())},Mn.toISOString=function(t){if(!this.isValid())return null;var e=!0!==t,n=e?this.clone().utc():this;return n.year()<0||n.year()>9999?U(n,e?"YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]":"YYYYYY-MM-DD[T]HH:mm:ss.SSSZ"):O(Date.prototype.toISOString)?e?this.toDate().toISOString():new Date(this.valueOf()+60*this.utcOffset()*1e3).toISOString().replace("Z",U(n,"Z")):U(n,e?"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]":"YYYY-MM-DD[T]HH:mm:ss.SSSZ")},Mn.inspect=function(){if(!this.isValid())return"moment.invalid(/* "+this._i+" */)";var t="moment",e="";this.isLocal()||(t=0===this.utcOffset()?"moment.utc":"moment.parseZone",e="Z");var n="["+t+'("]',i=0<=this.year()&&this.year()<=9999?"YYYY":"YYYYYY",a=e+'[")]';return this.format(n+i+"-MM-DD[T]HH:mm:ss.SSS"+a)},Mn.toJSON=function(){return this.isValid()?this.toISOString():null},Mn.toString=function(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},Mn.unix=function(){return Math.floor(this.valueOf()/1e3)},Mn.valueOf=function(){return this._d.valueOf()-6e4*(this._offset||0)},Mn.creationData=function(){return{input:this._i,format:this._f,locale:this._locale,isUTC:this._isUTC,strict:this._strict}},Mn.year=Tt,Mn.isLeapYear=function(){return Ct(this.year())},Mn.weekYear=function(t){return pn.call(this,t,this.week(),this.weekday(),this.localeData()._week.dow,this.localeData()._week.doy)},Mn.isoWeekYear=function(t){return pn.call(this,t,this.isoWeek(),this.isoWeekday(),1,4)},Mn.quarter=Mn.quarters=function(t){return null==t?Math.ceil((this.month()+1)/3):this.month(3*(t-1)+this.month()%3)},Mn.month=zt,Mn.daysInMonth=function(){return It(this.year(),this.month())},Mn.week=Mn.weeks=function(t){var e=this.localeData().week(this);return null==t?e:this.add(7*(t-e),"d")},Mn.isoWeek=Mn.isoWeeks=function(t){var e=qt(this,1,4).week;return null==t?e:this.add(7*(t-e),"d")},Mn.weeksInYear=function(){var t=this.localeData()._week;return Zt(this.year(),t.dow,t.doy)},Mn.isoWeeksInYear=function(){return Zt(this.year(),1,4)},Mn.date=bn,Mn.day=Mn.days=function(t){if(!this.isValid())return null!=t?this:NaN;var e=this._isUTC?this._d.getUTCDay():this._d.getDay();return null!=t?(t=function(t,e){return"string"!=typeof t?t:isNaN(t)?"number"==typeof(t=e.weekdaysParse(t))?t:null:parseInt(t,10)}(t,this.localeData()),this.add(t-e,"d")):e},Mn.weekday=function(t){if(!this.isValid())return null!=t?this:NaN;var e=(this.day()+7-this.localeData()._week.dow)%7;return null==t?e:this.add(t-e,"d")},Mn.isoWeekday=function(t){if(!this.isValid())return null!=t?this:NaN;if(null!=t){var e=function(t,e){return"string"==typeof t?e.weekdaysParse(t)%7||7:isNaN(t)?null:t}(t,this.localeData());return this.day(this.day()%7?e:e-7)}return this.day()||7},Mn.dayOfYear=function(t){var e=Math.round((this.clone().startOf("day")-this.clone().startOf("year"))/864e5)+1;return null==t?e:this.add(t-e,"d")},Mn.hour=Mn.hours=le,Mn.minute=Mn.minutes=yn,Mn.second=Mn.seconds=_n,Mn.millisecond=Mn.milliseconds=kn,Mn.utcOffset=function(t,e,n){var i,r=this._offset||0;if(!this.isValid())return null!=t?this:NaN;if(null!=t){if("string"==typeof t){if(null===(t=je(st,t)))return this}else Math.abs(t)<16&&!n&&(t*=60);return!this._isUTC&&e&&(i=Ge(this)),this._offset=t,this._isUTC=!0,null!=i&&this.add(i,"m"),r!==t&&(!e||this._changeInProgress?tn(this,Xe(t-r,"m"),1,!1):this._changeInProgress||(this._changeInProgress=!0,a.updateOffset(this,!0),this._changeInProgress=null)),this}return this._isUTC?r:Ge(this)},Mn.utc=function(t){return this.utcOffset(0,t)},Mn.local=function(t){return this._isUTC&&(this.utcOffset(0,t),this._isUTC=!1,t&&this.subtract(Ge(this),"m")),this},Mn.parseZone=function(){if(null!=this._tzm)this.utcOffset(this._tzm,!1,!0);else if("string"==typeof this._i){var t=je(ot,this._i);null!=t?this.utcOffset(t):this.utcOffset(0,!0)}return this},Mn.hasAlignedHourOffset=function(t){return!!this.isValid()&&(t=t?Le(t).utcOffset():0,(this.utcOffset()-t)%60==0)},Mn.isDST=function(){return this.utcOffset()>this.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()},Mn.isLocal=function(){return!!this.isValid()&&!this._isUTC},Mn.isUtcOffset=function(){return!!this.isValid()&&this._isUTC},Mn.isUtc=qe,Mn.isUTC=qe,Mn.zoneAbbr=function(){return this._isUTC?"UTC":""},Mn.zoneName=function(){return this._isUTC?"Coordinated Universal Time":""},Mn.dates=D("dates accessor is deprecated. Use date instead.",bn),Mn.months=D("months accessor is deprecated. Use month instead",zt),Mn.years=D("years accessor is deprecated. Use year instead",Tt),Mn.zone=D("moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/",(function(t,e){return null!=t?("string"!=typeof t&&(t=-t),this.utcOffset(t,e),this):-this.utcOffset()})),Mn.isDSTShifted=D("isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information",(function(){if(!s(this._isDSTShifted))return this._isDSTShifted;var t={};if(b(t,this),(t=Fe(t))._a){var e=t._isUTC?f(t._a):Le(t._a);this._isDSTShifted=this.isValid()&&M(t._a,e.toArray())>0}else this._isDSTShifted=!1;return this._isDSTShifted}));var Dn=F.prototype;function Cn(t,e,n,i){var a=pe(),r=f().set(i,e);return a[n](r,t)}function Pn(t,e,n){if(l(t)&&(e=t,t=void 0),t=t||"",null!=e)return Cn(t,e,n,"month");var i,a=[];for(i=0;i<12;i++)a[i]=Cn(t,i,n,"month");return a}function Tn(t,e,n,i){"boolean"==typeof t?(l(e)&&(n=e,e=void 0),e=e||""):(n=e=t,t=!1,l(e)&&(n=e,e=void 0),e=e||"");var a,r=pe(),o=t?r._week.dow:0;if(null!=n)return Cn(e,(n+o)%7,i,"day");var s=[];for(a=0;a<7;a++)s[a]=Cn(e,(a+o)%7,i,"day");return s}Dn.calendar=function(t,e,n){var i=this._calendar[t]||this._calendar.sameElse;return O(i)?i.call(e,n):i},Dn.longDateFormat=function(t){var e=this._longDateFormat[t],n=this._longDateFormat[t.toUpperCase()];return e||!n?e:(this._longDateFormat[t]=n.replace(/MMMM|MM|DD|dddd/g,(function(t){return t.slice(1)})),this._longDateFormat[t])},Dn.invalidDate=function(){return this._invalidDate},Dn.ordinal=function(t){return this._ordinal.replace("%d",t)},Dn.preparse=Sn,Dn.postformat=Sn,Dn.relativeTime=function(t,e,n,i){var a=this._relativeTime[n];return O(a)?a(t,e,n,i):a.replace(/%d/i,t)},Dn.pastFuture=function(t,e){var n=this._relativeTime[t>0?"future":"past"];return O(n)?n(e):n.replace(/%s/i,e)},Dn.set=function(t){var e,n;for(n in t)O(e=t[n])?this[n]=e:this["_"+n]=e;this._config=t,this._dayOfMonthOrdinalParseLenient=new RegExp((this._dayOfMonthOrdinalParse.source||this._ordinalParse.source)+"|"+/\d{1,2}/.source)},Dn.months=function(t,e){return t?r(this._months)?this._months[t.month()]:this._months[(this._months.isFormat||Lt).test(e)?"format":"standalone"][t.month()]:r(this._months)?this._months:this._months.standalone},Dn.monthsShort=function(t,e){return t?r(this._monthsShort)?this._monthsShort[t.month()]:this._monthsShort[Lt.test(e)?"format":"standalone"][t.month()]:r(this._monthsShort)?this._monthsShort:this._monthsShort.standalone},Dn.monthsParse=function(t,e,n){var i,a,r;if(this._monthsParseExact)return Wt.call(this,t,e,n);for(this._monthsParse||(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[]),i=0;i<12;i++){if(a=f([2e3,i]),n&&!this._longMonthsParse[i]&&(this._longMonthsParse[i]=new RegExp("^"+this.months(a,"").replace(".","")+"$","i"),this._shortMonthsParse[i]=new RegExp("^"+this.monthsShort(a,"").replace(".","")+"$","i")),n||this._monthsParse[i]||(r="^"+this.months(a,"")+"|^"+this.monthsShort(a,""),this._monthsParse[i]=new RegExp(r.replace(".",""),"i")),n&&"MMMM"===e&&this._longMonthsParse[i].test(t))return i;if(n&&"MMM"===e&&this._shortMonthsParse[i].test(t))return i;if(!n&&this._monthsParse[i].test(t))return i}},Dn.monthsRegex=function(t){return this._monthsParseExact?(h(this,"_monthsRegex")||Ht.call(this),t?this._monthsStrictRegex:this._monthsRegex):(h(this,"_monthsRegex")||(this._monthsRegex=Vt),this._monthsStrictRegex&&t?this._monthsStrictRegex:this._monthsRegex)},Dn.monthsShortRegex=function(t){return this._monthsParseExact?(h(this,"_monthsRegex")||Ht.call(this),t?this._monthsShortStrictRegex:this._monthsShortRegex):(h(this,"_monthsShortRegex")||(this._monthsShortRegex=Et),this._monthsShortStrictRegex&&t?this._monthsShortStrictRegex:this._monthsShortRegex)},Dn.week=function(t){return qt(t,this._week.dow,this._week.doy).week},Dn.firstDayOfYear=function(){return this._week.doy},Dn.firstDayOfWeek=function(){return this._week.dow},Dn.weekdays=function(t,e){var n=r(this._weekdays)?this._weekdays:this._weekdays[t&&!0!==t&&this._weekdays.isFormat.test(e)?"format":"standalone"];return!0===t?$t(n,this._week.dow):t?n[t.day()]:n},Dn.weekdaysMin=function(t){return!0===t?$t(this._weekdaysMin,this._week.dow):t?this._weekdaysMin[t.day()]:this._weekdaysMin},Dn.weekdaysShort=function(t){return!0===t?$t(this._weekdaysShort,this._week.dow):t?this._weekdaysShort[t.day()]:this._weekdaysShort},Dn.weekdaysParse=function(t,e,n){var i,a,r;if(this._weekdaysParseExact)return Qt.call(this,t,e,n);for(this._weekdaysParse||(this._weekdaysParse=[],this._minWeekdaysParse=[],this._shortWeekdaysParse=[],this._fullWeekdaysParse=[]),i=0;i<7;i++){if(a=f([2e3,1]).day(i),n&&!this._fullWeekdaysParse[i]&&(this._fullWeekdaysParse[i]=new RegExp("^"+this.weekdays(a,"").replace(".","\\.?")+"$","i"),this._shortWeekdaysParse[i]=new RegExp("^"+this.weekdaysShort(a,"").replace(".","\\.?")+"$","i"),this._minWeekdaysParse[i]=new RegExp("^"+this.weekdaysMin(a,"").replace(".","\\.?")+"$","i")),this._weekdaysParse[i]||(r="^"+this.weekdays(a,"")+"|^"+this.weekdaysShort(a,"")+"|^"+this.weekdaysMin(a,""),this._weekdaysParse[i]=new RegExp(r.replace(".",""),"i")),n&&"dddd"===e&&this._fullWeekdaysParse[i].test(t))return i;if(n&&"ddd"===e&&this._shortWeekdaysParse[i].test(t))return i;if(n&&"dd"===e&&this._minWeekdaysParse[i].test(t))return i;if(!n&&this._weekdaysParse[i].test(t))return i}},Dn.weekdaysRegex=function(t){return this._weekdaysParseExact?(h(this,"_weekdaysRegex")||ie.call(this),t?this._weekdaysStrictRegex:this._weekdaysRegex):(h(this,"_weekdaysRegex")||(this._weekdaysRegex=te),this._weekdaysStrictRegex&&t?this._weekdaysStrictRegex:this._weekdaysRegex)},Dn.weekdaysShortRegex=function(t){return this._weekdaysParseExact?(h(this,"_weekdaysRegex")||ie.call(this),t?this._weekdaysShortStrictRegex:this._weekdaysShortRegex):(h(this,"_weekdaysShortRegex")||(this._weekdaysShortRegex=ee),this._weekdaysShortStrictRegex&&t?this._weekdaysShortStrictRegex:this._weekdaysShortRegex)},Dn.weekdaysMinRegex=function(t){return this._weekdaysParseExact?(h(this,"_weekdaysRegex")||ie.call(this),t?this._weekdaysMinStrictRegex:this._weekdaysMinRegex):(h(this,"_weekdaysMinRegex")||(this._weekdaysMinRegex=ne),this._weekdaysMinStrictRegex&&t?this._weekdaysMinStrictRegex:this._weekdaysMinRegex)},Dn.isPM=function(t){return"p"===(t+"").toLowerCase().charAt(0)},Dn.meridiem=function(t,e,n){return t>11?n?"pm":"PM":n?"am":"AM"},ge("en",{dayOfMonthOrdinalParse:/\d{1,2}(th|st|nd|rd)/,ordinal:function(t){var e=t%10;return t+(1===k(t%100/10)?"th":1===e?"st":2===e?"nd":3===e?"rd":"th")}}),a.lang=D("moment.lang is deprecated. Use moment.locale instead.",ge),a.langData=D("moment.langData is deprecated. Use moment.localeData instead.",pe);var On=Math.abs;function An(t,e,n,i){var a=Xe(e,n);return t._milliseconds+=i*a._milliseconds,t._days+=i*a._days,t._months+=i*a._months,t._bubble()}function Fn(t){return t<0?Math.floor(t):Math.ceil(t)}function In(t){return 4800*t/146097}function Ln(t){return 146097*t/4800}function Rn(t){return function(){return this.as(t)}}var Nn=Rn("ms"),Wn=Rn("s"),Yn=Rn("m"),zn=Rn("h"),En=Rn("d"),Vn=Rn("w"),Hn=Rn("M"),Bn=Rn("Q"),jn=Rn("y");function Un(t){return function(){return this.isValid()?this._data[t]:NaN}}var Gn=Un("milliseconds"),qn=Un("seconds"),Zn=Un("minutes"),$n=Un("hours"),Xn=Un("days"),Kn=Un("months"),Jn=Un("years"),Qn=Math.round,ti={ss:44,s:45,m:45,h:22,d:26,M:11};function ei(t,e,n,i,a){return a.relativeTime(e||1,!!n,t,i)}var ni=Math.abs;function ii(t){return(t>0)-(t<0)||+t}function ai(){if(!this.isValid())return this.localeData().invalidDate();var t,e,n=ni(this._milliseconds)/1e3,i=ni(this._days),a=ni(this._months);t=w(n/60),e=w(t/60),n%=60,t%=60;var r=w(a/12),o=a%=12,s=i,l=e,u=t,d=n?n.toFixed(3).replace(/\.?0+$/,""):"",h=this.asSeconds();if(!h)return"P0D";var c=h<0?"-":"",f=ii(this._months)!==ii(h)?"-":"",g=ii(this._days)!==ii(h)?"-":"",m=ii(this._milliseconds)!==ii(h)?"-":"";return c+"P"+(r?f+r+"Y":"")+(o?f+o+"M":"")+(s?g+s+"D":"")+(l||u||d?"T":"")+(l?m+l+"H":"")+(u?m+u+"M":"")+(d?m+d+"S":"")}var ri=ze.prototype;return ri.isValid=function(){return this._isValid},ri.abs=function(){var t=this._data;return this._milliseconds=On(this._milliseconds),this._days=On(this._days),this._months=On(this._months),t.milliseconds=On(t.milliseconds),t.seconds=On(t.seconds),t.minutes=On(t.minutes),t.hours=On(t.hours),t.months=On(t.months),t.years=On(t.years),this},ri.add=function(t,e){return An(this,t,e,1)},ri.subtract=function(t,e){return An(this,t,e,-1)},ri.as=function(t){if(!this.isValid())return NaN;var e,n,i=this._milliseconds;if("month"===(t=R(t))||"quarter"===t||"year"===t)switch(e=this._days+i/864e5,n=this._months+In(e),t){case"month":return n;case"quarter":return n/3;case"year":return n/12}else switch(e=this._days+Math.round(Ln(this._months)),t){case"week":return e/7+i/6048e5;case"day":return e+i/864e5;case"hour":return 24*e+i/36e5;case"minute":return 1440*e+i/6e4;case"second":return 86400*e+i/1e3;case"millisecond":return Math.floor(864e5*e)+i;default:throw new Error("Unknown unit "+t)}},ri.asMilliseconds=Nn,ri.asSeconds=Wn,ri.asMinutes=Yn,ri.asHours=zn,ri.asDays=En,ri.asWeeks=Vn,ri.asMonths=Hn,ri.asQuarters=Bn,ri.asYears=jn,ri.valueOf=function(){return this.isValid()?this._milliseconds+864e5*this._days+this._months%12*2592e6+31536e6*k(this._months/12):NaN},ri._bubble=function(){var t,e,n,i,a,r=this._milliseconds,o=this._days,s=this._months,l=this._data;return r>=0&&o>=0&&s>=0||r<=0&&o<=0&&s<=0||(r+=864e5*Fn(Ln(s)+o),o=0,s=0),l.milliseconds=r%1e3,t=w(r/1e3),l.seconds=t%60,e=w(t/60),l.minutes=e%60,n=w(e/60),l.hours=n%24,o+=w(n/24),a=w(In(o)),s+=a,o-=Fn(Ln(a)),i=w(s/12),s%=12,l.days=o,l.months=s,l.years=i,this},ri.clone=function(){return Xe(this)},ri.get=function(t){return t=R(t),this.isValid()?this[t+"s"]():NaN},ri.milliseconds=Gn,ri.seconds=qn,ri.minutes=Zn,ri.hours=$n,ri.days=Xn,ri.weeks=function(){return w(this.days()/7)},ri.months=Kn,ri.years=Jn,ri.humanize=function(t){if(!this.isValid())return this.localeData().invalidDate();var e=this.localeData(),n=function(t,e,n){var i=Xe(t).abs(),a=Qn(i.as("s")),r=Qn(i.as("m")),o=Qn(i.as("h")),s=Qn(i.as("d")),l=Qn(i.as("M")),u=Qn(i.as("y")),d=a<=ti.ss&&["s",a]||a<ti.s&&["ss",a]||r<=1&&["m"]||r<ti.m&&["mm",r]||o<=1&&["h"]||o<ti.h&&["hh",o]||s<=1&&["d"]||s<ti.d&&["dd",s]||l<=1&&["M"]||l<ti.M&&["MM",l]||u<=1&&["y"]||["yy",u];return d[2]=e,d[3]=+t>0,d[4]=n,ei.apply(null,d)}(this,!t,e);return t&&(n=e.pastFuture(+this,n)),e.postformat(n)},ri.toISOString=ai,ri.toString=ai,ri.toJSON=ai,ri.locale=rn,ri.localeData=sn,ri.toIsoString=D("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",ai),ri.lang=on,j("X",0,0,"unix"),j("x",0,0,"valueOf"),dt("x",rt),dt("X",/[+-]?\d+(\.\d{1,3})?/),gt("X",(function(t,e,n){n._d=new Date(1e3*parseFloat(t,10))})),gt("x",(function(t,e,n){n._d=new Date(k(t))})),a.version="2.24.0",n=Le,a.fn=Mn,a.min=function(){return We("isBefore",[].slice.call(arguments,0))},a.max=function(){return We("isAfter",[].slice.call(arguments,0))},a.now=function(){return Date.now?Date.now():+new Date},a.utc=f,a.unix=function(t){return Le(1e3*t)},a.months=function(t,e){return Pn(t,e,"months")},a.isDate=u,a.locale=ge,a.invalid=p,a.duration=Xe,a.isMoment=_,a.weekdays=function(t,e,n){return Tn(t,e,n,"weekdays")},a.parseZone=function(){return Le.apply(null,arguments).parseZone()},a.localeData=pe,a.isDuration=Ee,a.monthsShort=function(t,e){return Pn(t,e,"monthsShort")},a.weekdaysMin=function(t,e,n){return Tn(t,e,n,"weekdaysMin")},a.defineLocale=me,a.updateLocale=function(t,e){if(null!=e){var n,i,a=ue;null!=(i=fe(t))&&(a=i._config),e=A(a,e),(n=new F(e)).parentLocale=de[t],de[t]=n,ge(t)}else null!=de[t]&&(null!=de[t].parentLocale?de[t]=de[t].parentLocale:null!=de[t]&&delete de[t]);return de[t]},a.locales=function(){return C(de)},a.weekdaysShort=function(t,e,n){return Tn(t,e,n,"weekdaysShort")},a.normalizeUnits=R,a.relativeTimeRounding=function(t){return void 0===t?Qn:"function"==typeof t&&(Qn=t,!0)},a.relativeTimeThreshold=function(t,e){return void 0!==ti[t]&&(void 0===e?ti[t]:(ti[t]=e,"s"===t&&(ti.ss=e-1),!0))},a.calendarFormat=function(t,e){var n=t.diff(e,"days",!0);return n<-6?"sameElse":n<-1?"lastWeek":n<0?"lastDay":n<1?"sameDay":n<2?"nextDay":n<7?"nextWeek":"sameElse"},a.prototype=Mn,a.HTML5_FMT={DATETIME_LOCAL:"YYYY-MM-DDTHH:mm",DATETIME_LOCAL_SECONDS:"YYYY-MM-DDTHH:mm:ss",DATETIME_LOCAL_MS:"YYYY-MM-DDTHH:mm:ss.SSS",DATE:"YYYY-MM-DD",TIME:"HH:mm",TIME_SECONDS:"HH:mm:ss",TIME_MS:"HH:mm:ss.SSS",WEEK:"GGGG-[W]WW",MONTH:"YYYY-MM"},a}()})),mi={datetime:"MMM D, YYYY, h:mm:ss a",millisecond:"h:mm:ss.SSS a",second:"h:mm:ss a",minute:"h:mm a",hour:"hA",day:"MMM D",week:"ll",month:"MMM YYYY",quarter:"[Q]Q - YYYY",year:"YYYY"};rn._date.override("function"==typeof gi?{_id:"moment",formats:function(){return mi},parse:function(t,e){return"string"==typeof t&&"string"==typeof e?t=gi(t,e):t instanceof gi||(t=gi(t)),t.isValid()?t.valueOf():null},format:function(t,e){return gi(t).format(e)},add:function(t,e,n){return gi(t).add(e,n).valueOf()},diff:function(t,e,n){return gi(t).diff(gi(e),n)},startOf:function(t,e,n){return t=gi(t),"isoWeek"===e?t.isoWeekday(n).valueOf():t.startOf(e).valueOf()},endOf:function(t,e){return gi(t).endOf(e).valueOf()},_create:function(t){return gi(t)}}:{}),W._set("global",{plugins:{filler:{propagate:!0}}});var pi={dataset:function(t){var e=t.fill,n=t.chart,i=n.getDatasetMeta(e),a=i&&n.isDatasetVisible(e)&&i.dataset._children||[],r=a.length||0;return r?function(t,e){return e<r&&a[e]._view||null}:null},boundary:function(t){var e=t.boundary,n=e?e.x:null,i=e?e.y:null;return H.isArray(e)?function(t,n){return e[n]}:function(t){return{x:null===n?t.x:n,y:null===i?t.y:i}}}};function vi(t,e,n){var i,a=t._model||{},r=a.fill;if(void 0===r&&(r=!!a.backgroundColor),!1===r||null===r)return!1;if(!0===r)return"origin";if(i=parseFloat(r,10),isFinite(i)&&Math.floor(i)===i)return"-"!==r[0]&&"+"!==r[0]||(i=e+i),!(i===e||i<0||i>=n)&&i;switch(r){case"bottom":return"start";case"top":return"end";case"zero":return"origin";case"origin":case"start":case"end":return r;default:return!1}}function bi(t){return(t.el._scale||{}).getPointPositionForValue?function(t){var e,n,i,a,r,o=t.el._scale,s=o.options,l=o.chart.data.labels.length,u=t.fill,d=[];if(!l)return null;for(e=s.ticks.reverse?o.max:o.min,n=s.ticks.reverse?o.min:o.max,i=o.getPointPositionForValue(0,e),a=0;a<l;++a)r="start"===u||"end"===u?o.getPointPositionForValue(a,"start"===u?e:n):o.getBasePosition(a),s.gridLines.circular&&(r.cx=i.x,r.cy=i.y,r.angle=o.getIndexAngle(a)-Math.PI/2),d.push(r);return d}(t):function(t){var e,n=t.el._model||{},i=t.el._scale||{},a=t.fill,r=null;if(isFinite(a))return null;if("start"===a?r=void 0===n.scaleBottom?i.bottom:n.scaleBottom:"end"===a?r=void 0===n.scaleTop?i.top:n.scaleTop:void 0!==n.scaleZero?r=n.scaleZero:i.getBasePixel&&(r=i.getBasePixel()),null!=r){if(void 0!==r.x&&void 0!==r.y)return r;if(H.isFinite(r))return{x:(e=i.isHorizontal())?r:null,y:e?null:r}}return null}(t)}function yi(t,e,n){var i,a=t[e].fill,r=[e];if(!n)return a;for(;!1!==a&&-1===r.indexOf(a);){if(!isFinite(a))return a;if(!(i=t[a]))return!1;if(i.visible)return a;r.push(a),a=i.fill}return!1}function xi(t){var e=t.fill,n="dataset";return!1===e?null:(isFinite(e)||(n="boundary"),pi[n](t))}function _i(t){return t&&!t.skip}function wi(t,e,n,i,a){var r,o,s,l;if(i&&a){for(t.moveTo(e[0].x,e[0].y),r=1;r<i;++r)H.canvas.lineTo(t,e[r-1],e[r]);if(void 0===n[0].angle)for(t.lineTo(n[a-1].x,n[a-1].y),r=a-1;r>0;--r)H.canvas.lineTo(t,n[r],n[r-1],!0);else for(o=n[0].cx,s=n[0].cy,l=Math.sqrt(Math.pow(n[0].x-o,2)+Math.pow(n[0].y-s,2)),r=a-1;r>0;--r)t.arc(o,s,l,n[r].angle,n[r-1].angle,!0)}}function ki(t,e,n,i,a,r){var o,s,l,u,d,h,c,f,g=e.length,m=i.spanGaps,p=[],v=[],b=0,y=0;for(t.beginPath(),o=0,s=g;o<s;++o)d=n(u=e[l=o%g]._view,l,i),h=_i(u),c=_i(d),r&&void 0===f&&h&&(s=g+(f=o+1)),h&&c?(b=p.push(u),y=v.push(d)):b&&y&&(m?(h&&p.push(u),c&&v.push(d)):(wi(t,p,v,b,y),b=y=0,p=[],v=[]));wi(t,p,v,b,y),t.closePath(),t.fillStyle=a,t.fill()}var Mi={id:"filler",afterDatasetsUpdate:function(t,e){var n,i,a,r,o=(t.data.datasets||[]).length,s=e.propagate,l=[];for(i=0;i<o;++i)r=null,(a=(n=t.getDatasetMeta(i)).dataset)&&a._model&&a instanceof wt.Line&&(r={visible:t.isDatasetVisible(i),fill:vi(a,i,o),chart:t,el:a}),n.$filler=r,l.push(r);for(i=0;i<o;++i)(r=l[i])&&(r.fill=yi(l,i,s),r.boundary=bi(r),r.mapper=xi(r))},beforeDatasetsDraw:function(t){var e,n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas(),u=t.ctx;for(n=l.length-1;n>=0;--n)(e=l[n].$filler)&&e.visible&&(a=(i=e.el)._view,r=i._children||[],o=e.mapper,s=a.backgroundColor||W.global.defaultColor,o&&s&&r.length&&(H.canvas.clipArea(u,t.chartArea),ki(u,r,o,a,s,i._loop),H.canvas.unclipArea(u)))}},Si=H.rtl.getRtlAdapter,Di=H.noop,Ci=H.valueOrDefault;function Pi(t,e){return t.usePointStyle&&t.boxWidth>e?e:t.boxWidth}W._set("global",{legend:{display:!0,position:"top",align:"center",fullWidth:!0,reverse:!1,weight:1e3,onClick:function(t,e){var n=e.datasetIndex,i=this.chart,a=i.getDatasetMeta(n);a.hidden=null===a.hidden?!i.data.datasets[n].hidden:null,i.update()},onHover:null,onLeave:null,labels:{boxWidth:40,padding:10,generateLabels:function(t){var e=t.data.datasets,n=t.options.legend||{},i=n.labels&&n.labels.usePointStyle;return t._getSortedDatasetMetas().map((function(n){var a=n.controller.getStyle(i?0:void 0);return{text:e[n.index].label,fillStyle:a.backgroundColor,hidden:!t.isDatasetVisible(n.index),lineCap:a.borderCapStyle,lineDash:a.borderDash,lineDashOffset:a.borderDashOffset,lineJoin:a.borderJoinStyle,lineWidth:a.borderWidth,strokeStyle:a.borderColor,pointStyle:a.pointStyle,rotation:a.rotation,datasetIndex:n.index}}),this)}}},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data.datasets;for(a.setAttribute("class",t.id+"-legend"),e=0,n=r.length;e<n;e++)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=r[e].backgroundColor,r[e].label&&i.appendChild(document.createTextNode(r[e].label));return a.outerHTML}});var Ti=$.extend({initialize:function(t){H.extend(this,t),this.legendHitBoxes=[],this._hoveredItem=null,this.doughnutMode=!1},beforeUpdate:Di,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Di,beforeSetDimensions:Di,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Di,beforeBuildLabels:Di,buildLabels:function(){var t=this,e=t.options.labels||{},n=H.callback(e.generateLabels,[t.chart],t)||[];e.filter&&(n=n.filter((function(n){return e.filter(n,t.chart.data)}))),t.options.reverse&&n.reverse(),t.legendItems=n},afterBuildLabels:Di,beforeFit:Di,fit:function(){var t=this,e=t.options,n=e.labels,i=e.display,a=t.ctx,r=H.options._parseFont(n),o=r.size,s=t.legendHitBoxes=[],l=t.minSize,u=t.isHorizontal();if(u?(l.width=t.maxWidth,l.height=i?10:0):(l.width=i?10:0,l.height=t.maxHeight),i){if(a.font=r.string,u){var d=t.lineWidths=[0],h=0;a.textAlign="left",a.textBaseline="middle",H.each(t.legendItems,(function(t,e){var i=Pi(n,o)+o/2+a.measureText(t.text).width;(0===e||d[d.length-1]+i+2*n.padding>l.width)&&(h+=o+n.padding,d[d.length-(e>0?0:1)]=0),s[e]={left:0,top:0,width:i,height:o},d[d.length-1]+=i+n.padding})),l.height+=h}else{var c=n.padding,f=t.columnWidths=[],g=t.columnHeights=[],m=n.padding,p=0,v=0;H.each(t.legendItems,(function(t,e){var i=Pi(n,o)+o/2+a.measureText(t.text).width;e>0&&v+o+2*c>l.height&&(m+=p+n.padding,f.push(p),g.push(v),p=0,v=0),p=Math.max(p,i),v+=o+c,s[e]={left:0,top:0,width:i,height:o}})),m+=p,f.push(p),g.push(v),l.width+=m}t.width=l.width,t.height=l.height}else t.width=l.width=t.height=l.height=0},afterFit:Di,isHorizontal:function(){return"top"===this.options.position||"bottom"===this.options.position},draw:function(){var t=this,e=t.options,n=e.labels,i=W.global,a=i.defaultColor,r=i.elements.line,o=t.height,s=t.columnHeights,l=t.width,u=t.lineWidths;if(e.display){var d,h=Si(e.rtl,t.left,t.minSize.width),c=t.ctx,f=Ci(n.fontColor,i.defaultFontColor),g=H.options._parseFont(n),m=g.size;c.textAlign=h.textAlign("left"),c.textBaseline="middle",c.lineWidth=.5,c.strokeStyle=f,c.fillStyle=f,c.font=g.string;var p=Pi(n,m),v=t.legendHitBoxes,b=function(t,i){switch(e.align){case"start":return n.padding;case"end":return t-i;default:return(t-i+n.padding)/2}},y=t.isHorizontal();d=y?{x:t.left+b(l,u[0]),y:t.top+n.padding,line:0}:{x:t.left+n.padding,y:t.top+b(o,s[0]),line:0},H.rtl.overrideTextDirection(t.ctx,e.textDirection);var x=m+n.padding;H.each(t.legendItems,(function(e,i){var f=c.measureText(e.text).width,g=p+m/2+f,_=d.x,w=d.y;h.setWidth(t.minSize.width),y?i>0&&_+g+n.padding>t.left+t.minSize.width&&(w=d.y+=x,d.line++,_=d.x=t.left+b(l,u[d.line])):i>0&&w+x>t.top+t.minSize.height&&(_=d.x=_+t.columnWidths[d.line]+n.padding,d.line++,w=d.y=t.top+b(o,s[d.line]));var k=h.x(_);!function(t,e,i){if(!(isNaN(p)||p<=0)){c.save();var o=Ci(i.lineWidth,r.borderWidth);if(c.fillStyle=Ci(i.fillStyle,a),c.lineCap=Ci(i.lineCap,r.borderCapStyle),c.lineDashOffset=Ci(i.lineDashOffset,r.borderDashOffset),c.lineJoin=Ci(i.lineJoin,r.borderJoinStyle),c.lineWidth=o,c.strokeStyle=Ci(i.strokeStyle,a),c.setLineDash&&c.setLineDash(Ci(i.lineDash,r.borderDash)),n&&n.usePointStyle){var s=p*Math.SQRT2/2,l=h.xPlus(t,p/2),u=e+m/2;H.canvas.drawPoint(c,i.pointStyle,s,l,u,i.rotation)}else c.fillRect(h.leftForLtr(t,p),e,p,m),0!==o&&c.strokeRect(h.leftForLtr(t,p),e,p,m);c.restore()}}(k,w,e),v[i].left=h.leftForLtr(k,v[i].width),v[i].top=w,function(t,e,n,i){var a=m/2,r=h.xPlus(t,p+a),o=e+a;c.fillText(n.text,r,o),n.hidden&&(c.beginPath(),c.lineWidth=2,c.moveTo(r,o),c.lineTo(h.xPlus(r,i),o),c.stroke())}(k,w,e,f),y?d.x+=g+n.padding:d.y+=x})),H.rtl.restoreTextDirection(t.ctx,e.textDirection)}},_getLegendItemAt:function(t,e){var n,i,a,r=this;if(t>=r.left&&t<=r.right&&e>=r.top&&e<=r.bottom)for(a=r.legendHitBoxes,n=0;n<a.length;++n)if(t>=(i=a[n]).left&&t<=i.left+i.width&&e>=i.top&&e<=i.top+i.height)return r.legendItems[n];return null},handleEvent:function(t){var e,n=this,i=n.options,a="mouseup"===t.type?"click":t.type;if("mousemove"===a){if(!i.onHover&&!i.onLeave)return}else{if("click"!==a)return;if(!i.onClick)return}e=n._getLegendItemAt(t.x,t.y),"click"===a?e&&i.onClick&&i.onClick.call(n,t.native,e):(i.onLeave&&e!==n._hoveredItem&&(n._hoveredItem&&i.onLeave.call(n,t.native,n._hoveredItem),n._hoveredItem=e),i.onHover&&e&&i.onHover.call(n,t.native,e))}});function Oi(t,e){var n=new Ti({ctx:t.ctx,options:e,chart:t});me.configure(t,n,e),me.addBox(t,n),t.legend=n}var Ai={id:"legend",_element:Ti,beforeInit:function(t){var e=t.options.legend;e&&Oi(t,e)},beforeUpdate:function(t){var e=t.options.legend,n=t.legend;e?(H.mergeIf(e,W.global.legend),n?(me.configure(t,n,e),n.options=e):Oi(t,e)):n&&(me.removeBox(t,n),delete t.legend)},afterEvent:function(t,e){var n=t.legend;n&&n.handleEvent(e)}},Fi=H.noop;W._set("global",{title:{display:!1,fontStyle:"bold",fullWidth:!0,padding:10,position:"top",text:"",weight:2e3}});var Ii=$.extend({initialize:function(t){H.extend(this,t),this.legendHitBoxes=[]},beforeUpdate:Fi,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Fi,beforeSetDimensions:Fi,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Fi,beforeBuildLabels:Fi,buildLabels:Fi,afterBuildLabels:Fi,beforeFit:Fi,fit:function(){var t,e=this,n=e.options,i=e.minSize={},a=e.isHorizontal();n.display?(t=(H.isArray(n.text)?n.text.length:1)*H.options._parseFont(n).lineHeight+2*n.padding,e.width=i.width=a?e.maxWidth:t,e.height=i.height=a?t:e.maxHeight):e.width=i.width=e.height=i.height=0},afterFit:Fi,isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},draw:function(){var t=this,e=t.ctx,n=t.options;if(n.display){var i,a,r,o=H.options._parseFont(n),s=o.lineHeight,l=s/2+n.padding,u=0,d=t.top,h=t.left,c=t.bottom,f=t.right;e.fillStyle=H.valueOrDefault(n.fontColor,W.global.defaultFontColor),e.font=o.string,t.isHorizontal()?(a=h+(f-h)/2,r=d+l,i=f-h):(a="left"===n.position?h+l:f-l,r=d+(c-d)/2,i=c-d,u=Math.PI*("left"===n.position?-.5:.5)),e.save(),e.translate(a,r),e.rotate(u),e.textAlign="center",e.textBaseline="middle";var g=n.text;if(H.isArray(g))for(var m=0,p=0;p<g.length;++p)e.fillText(g[p],0,m,i),m+=s;else e.fillText(g,0,0,i);e.restore()}}});function Li(t,e){var n=new Ii({ctx:t.ctx,options:e,chart:t});me.configure(t,n,e),me.addBox(t,n),t.titleBlock=n}var Ri={},Ni=Mi,Wi=Ai,Yi={id:"title",_element:Ii,beforeInit:function(t){var e=t.options.title;e&&Li(t,e)},beforeUpdate:function(t){var e=t.options.title,n=t.titleBlock;e?(H.mergeIf(e,W.global.title),n?(me.configure(t,n,e),n.options=e):Li(t,e)):n&&(me.removeBox(t,n),delete t.titleBlock)}};for(var zi in Ri.filler=Ni,Ri.legend=Wi,Ri.title=Yi,en.helpers=H,function(){function t(t,e,n){var i;return"string"==typeof t?(i=parseInt(t,10),-1!==t.indexOf("%")&&(i=i/100*e.parentNode[n])):i=t,i}function e(t){return null!=t&&"none"!==t}function n(n,i,a){var r=document.defaultView,o=H._getParentNode(n),s=r.getComputedStyle(n)[i],l=r.getComputedStyle(o)[i],u=e(s),d=e(l),h=Number.POSITIVE_INFINITY;return u||d?Math.min(u?t(s,n,a):h,d?t(l,o,a):h):"none"}H.where=function(t,e){if(H.isArray(t)&&Array.prototype.filter)return t.filter(e);var n=[];return H.each(t,(function(t){e(t)&&n.push(t)})),n},H.findIndex=Array.prototype.findIndex?function(t,e,n){return t.findIndex(e,n)}:function(t,e,n){n=void 0===n?t:n;for(var i=0,a=t.length;i<a;++i)if(e.call(n,t[i],i,t))return i;return-1},H.findNextWhere=function(t,e,n){H.isNullOrUndef(n)&&(n=-1);for(var i=n+1;i<t.length;i++){var a=t[i];if(e(a))return a}},H.findPreviousWhere=function(t,e,n){H.isNullOrUndef(n)&&(n=t.length);for(var i=n-1;i>=0;i--){var a=t[i];if(e(a))return a}},H.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},H.almostEquals=function(t,e,n){return Math.abs(t-e)<n},H.almostWhole=function(t,e){var n=Math.round(t);return n-e<=t&&n+e>=t},H.max=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.max(t,e)}),Number.NEGATIVE_INFINITY)},H.min=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.min(t,e)}),Number.POSITIVE_INFINITY)},H.sign=Math.sign?function(t){return Math.sign(t)}:function(t){return 0===(t=+t)||isNaN(t)?t:t>0?1:-1},H.toRadians=function(t){return t*(Math.PI/180)},H.toDegrees=function(t){return t*(180/Math.PI)},H._decimalPlaces=function(t){if(H.isFinite(t)){for(var e=1,n=0;Math.round(t*e)/e!==t;)e*=10,n++;return n}},H.getAngleFromPoint=function(t,e){var n=e.x-t.x,i=e.y-t.y,a=Math.sqrt(n*n+i*i),r=Math.atan2(i,n);return r<-.5*Math.PI&&(r+=2*Math.PI),{angle:r,distance:a}},H.distanceBetweenPoints=function(t,e){return Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2))},H.aliasPixel=function(t){return t%2==0?0:.5},H._alignPixel=function(t,e,n){var i=t.currentDevicePixelRatio,a=n/2;return Math.round((e-a)*i)/i+a},H.splineCurve=function(t,e,n,i){var a=t.skip?e:t,r=e,o=n.skip?e:n,s=Math.sqrt(Math.pow(r.x-a.x,2)+Math.pow(r.y-a.y,2)),l=Math.sqrt(Math.pow(o.x-r.x,2)+Math.pow(o.y-r.y,2)),u=s/(s+l),d=l/(s+l),h=i*(u=isNaN(u)?0:u),c=i*(d=isNaN(d)?0:d);return{previous:{x:r.x-h*(o.x-a.x),y:r.y-h*(o.y-a.y)},next:{x:r.x+c*(o.x-a.x),y:r.y+c*(o.y-a.y)}}},H.EPSILON=Number.EPSILON||1e-14,H.splineCurveMonotone=function(t){var e,n,i,a,r,o,s,l,u,d=(t||[]).map((function(t){return{model:t._model,deltaK:0,mK:0}})),h=d.length;for(e=0;e<h;++e)if(!(i=d[e]).model.skip){if(n=e>0?d[e-1]:null,(a=e<h-1?d[e+1]:null)&&!a.model.skip){var c=a.model.x-i.model.x;i.deltaK=0!==c?(a.model.y-i.model.y)/c:0}!n||n.model.skip?i.mK=i.deltaK:!a||a.model.skip?i.mK=n.deltaK:this.sign(n.deltaK)!==this.sign(i.deltaK)?i.mK=0:i.mK=(n.deltaK+i.deltaK)/2}for(e=0;e<h-1;++e)i=d[e],a=d[e+1],i.model.skip||a.model.skip||(H.almostEquals(i.deltaK,0,this.EPSILON)?i.mK=a.mK=0:(r=i.mK/i.deltaK,o=a.mK/i.deltaK,(l=Math.pow(r,2)+Math.pow(o,2))<=9||(s=3/Math.sqrt(l),i.mK=r*s*i.deltaK,a.mK=o*s*i.deltaK)));for(e=0;e<h;++e)(i=d[e]).model.skip||(n=e>0?d[e-1]:null,a=e<h-1?d[e+1]:null,n&&!n.model.skip&&(u=(i.model.x-n.model.x)/3,i.model.controlPointPreviousX=i.model.x-u,i.model.controlPointPreviousY=i.model.y-u*i.mK),a&&!a.model.skip&&(u=(a.model.x-i.model.x)/3,i.model.controlPointNextX=i.model.x+u,i.model.controlPointNextY=i.model.y+u*i.mK))},H.nextItem=function(t,e,n){return n?e>=t.length-1?t[0]:t[e+1]:e>=t.length-1?t[t.length-1]:t[e+1]},H.previousItem=function(t,e,n){return n?e<=0?t[t.length-1]:t[e-1]:e<=0?t[0]:t[e-1]},H.niceNum=function(t,e){var n=Math.floor(H.log10(t)),i=t/Math.pow(10,n);return(e?i<1.5?1:i<3?2:i<7?5:10:i<=1?1:i<=2?2:i<=5?5:10)*Math.pow(10,n)},H.requestAnimFrame="undefined"==typeof window?function(t){t()}:window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)},H.getRelativePosition=function(t,e){var n,i,a=t.originalEvent||t,r=t.target||t.srcElement,o=r.getBoundingClientRect(),s=a.touches;s&&s.length>0?(n=s[0].clientX,i=s[0].clientY):(n=a.clientX,i=a.clientY);var l=parseFloat(H.getStyle(r,"padding-left")),u=parseFloat(H.getStyle(r,"padding-top")),d=parseFloat(H.getStyle(r,"padding-right")),h=parseFloat(H.getStyle(r,"padding-bottom")),c=o.right-o.left-l-d,f=o.bottom-o.top-u-h;return{x:n=Math.round((n-o.left-l)/c*r.width/e.currentDevicePixelRatio),y:i=Math.round((i-o.top-u)/f*r.height/e.currentDevicePixelRatio)}},H.getConstraintWidth=function(t){return n(t,"max-width","clientWidth")},H.getConstraintHeight=function(t){return n(t,"max-height","clientHeight")},H._calculatePadding=function(t,e,n){return(e=H.getStyle(t,e)).indexOf("%")>-1?n*parseInt(e,10)/100:parseInt(e,10)},H._getParentNode=function(t){var e=t.parentNode;return e&&"[object ShadowRoot]"===e.toString()&&(e=e.host),e},H.getMaximumWidth=function(t){var e=H._getParentNode(t);if(!e)return t.clientWidth;var n=e.clientWidth,i=n-H._calculatePadding(e,"padding-left",n)-H._calculatePadding(e,"padding-right",n),a=H.getConstraintWidth(t);return isNaN(a)?i:Math.min(i,a)},H.getMaximumHeight=function(t){var e=H._getParentNode(t);if(!e)return t.clientHeight;var n=e.clientHeight,i=n-H._calculatePadding(e,"padding-top",n)-H._calculatePadding(e,"padding-bottom",n),a=H.getConstraintHeight(t);return isNaN(a)?i:Math.min(i,a)},H.getStyle=function(t,e){return t.currentStyle?t.currentStyle[e]:document.defaultView.getComputedStyle(t,null).getPropertyValue(e)},H.retinaScale=function(t,e){var n=t.currentDevicePixelRatio=e||"undefined"!=typeof window&&window.devicePixelRatio||1;if(1!==n){var i=t.canvas,a=t.height,r=t.width;i.height=a*n,i.width=r*n,t.ctx.scale(n,n),i.style.height||i.style.width||(i.style.height=a+"px",i.style.width=r+"px")}},H.fontString=function(t,e,n){return e+" "+t+"px "+n},H.longestText=function(t,e,n,i){var a=(i=i||{}).data=i.data||{},r=i.garbageCollect=i.garbageCollect||[];i.font!==e&&(a=i.data={},r=i.garbageCollect=[],i.font=e),t.font=e;var o,s,l,u,d,h=0,c=n.length;for(o=0;o<c;o++)if(null!=(u=n[o])&&!0!==H.isArray(u))h=H.measureText(t,a,r,h,u);else if(H.isArray(u))for(s=0,l=u.length;s<l;s++)null==(d=u[s])||H.isArray(d)||(h=H.measureText(t,a,r,h,d));var f=r.length/2;if(f>n.length){for(o=0;o<f;o++)delete a[r[o]];r.splice(0,f)}return h},H.measureText=function(t,e,n,i,a){var r=e[a];return r||(r=e[a]=t.measureText(a).width,n.push(a)),r>i&&(i=r),i},H.numberOfLabelLines=function(t){var e=1;return H.each(t,(function(t){H.isArray(t)&&t.length>e&&(e=t.length)})),e},H.color=k?function(t){return t instanceof CanvasGradient&&(t=W.global.defaultColor),k(t)}:function(t){return console.error("Color.js not found!"),t},H.getHoverColor=function(t){return t instanceof CanvasPattern||t instanceof CanvasGradient?t:H.color(t).saturate(.5).darken(.1).rgbString()}}(),en._adapters=rn,en.Animation=K,en.animationService=J,en.controllers=Jt,en.DatasetController=it,en.defaults=W,en.Element=$,en.elements=wt,en.Interaction=re,en.layouts=me,en.platform=Ie,en.plugins=Le,en.Scale=xn,en.scaleService=Re,en.Ticks=on,en.Tooltip=Ge,en.helpers.each(fi,(function(t,e){en.scaleService.registerScaleType(e,t,t._defaults)})),Ri)Ri.hasOwnProperty(zi)&&en.plugins.register(Ri[zi]);en.platform.initialize();var Ei=en;return"undefined"!=typeof window&&(window.Chart=en),en.Chart=en,en.Legend=Ri.legend._element,en.Title=Ri.title._element,en.pluginService=en.plugins,en.PluginBase=en.Element.extend({}),en.canvasHelpers=en.helpers.canvas,en.layoutService=en.layouts,en.LinearScaleBase=Dn,en.helpers.each(["Bar","Bubble","Doughnut","Line","PolarArea","Radar","Scatter"],(function(t){en[t]=function(e,n){return new en(e,en.helpers.merge(n||{},{type:t.charAt(0).toLowerCase()+t.slice(1)}))}})),Ei}));
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t=t||self).Chart=e()}(this,(function(){"use strict";"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self&&self;function t(){throw new Error("Dynamic requires are not currently supported by rollup-plugin-commonjs")}function e(t,e){return t(e={exports:{}},e.exports),e.exports}var n={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},i=e((function(t){var e={};for(var i in n)n.hasOwnProperty(i)&&(e[n[i]]=i);var a=t.exports={rgb:{channels:3,labels:"rgb"},hsl:{channels:3,labels:"hsl"},hsv:{channels:3,labels:"hsv"},hwb:{channels:3,labels:"hwb"},cmyk:{channels:4,labels:"cmyk"},xyz:{channels:3,labels:"xyz"},lab:{channels:3,labels:"lab"},lch:{channels:3,labels:"lch"},hex:{channels:1,labels:["hex"]},keyword:{channels:1,labels:["keyword"]},ansi16:{channels:1,labels:["ansi16"]},ansi256:{channels:1,labels:["ansi256"]},hcg:{channels:3,labels:["h","c","g"]},apple:{channels:3,labels:["r16","g16","b16"]},gray:{channels:1,labels:["gray"]}};for(var r in a)if(a.hasOwnProperty(r)){if(!("channels"in a[r]))throw new Error("missing channels property: "+r);if(!("labels"in a[r]))throw new Error("missing channel labels property: "+r);if(a[r].labels.length!==a[r].channels)throw new Error("channel and label counts mismatch: "+r);var o=a[r].channels,s=a[r].labels;delete a[r].channels,delete a[r].labels,Object.defineProperty(a[r],"channels",{value:o}),Object.defineProperty(a[r],"labels",{value:s})}a.rgb.hsl=function(t){var e,n,i=t[0]/255,a=t[1]/255,r=t[2]/255,o=Math.min(i,a,r),s=Math.max(i,a,r),l=s-o;return s===o?e=0:i===s?e=(a-r)/l:a===s?e=2+(r-i)/l:r===s&&(e=4+(i-a)/l),(e=Math.min(60*e,360))<0&&(e+=360),n=(o+s)/2,[e,100*(s===o?0:n<=.5?l/(s+o):l/(2-s-o)),100*n]},a.rgb.hsv=function(t){var e,n,i,a,r,o=t[0]/255,s=t[1]/255,l=t[2]/255,u=Math.max(o,s,l),d=u-Math.min(o,s,l),h=function(t){return(u-t)/6/d+.5};return 0===d?a=r=0:(r=d/u,e=h(o),n=h(s),i=h(l),o===u?a=i-n:s===u?a=1/3+e-i:l===u&&(a=2/3+n-e),a<0?a+=1:a>1&&(a-=1)),[360*a,100*r,100*u]},a.rgb.hwb=function(t){var e=t[0],n=t[1],i=t[2];return[a.rgb.hsl(t)[0],100*(1/255*Math.min(e,Math.min(n,i))),100*(i=1-1/255*Math.max(e,Math.max(n,i)))]},a.rgb.cmyk=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255;return[100*((1-n-(e=Math.min(1-n,1-i,1-a)))/(1-e)||0),100*((1-i-e)/(1-e)||0),100*((1-a-e)/(1-e)||0),100*e]},a.rgb.keyword=function(t){var i=e[t];if(i)return i;var a,r,o,s=1/0;for(var l in n)if(n.hasOwnProperty(l)){var u=n[l],d=(r=t,o=u,Math.pow(r[0]-o[0],2)+Math.pow(r[1]-o[1],2)+Math.pow(r[2]-o[2],2));d<s&&(s=d,a=l)}return a},a.keyword.rgb=function(t){return n[t]},a.rgb.xyz=function(t){var e=t[0]/255,n=t[1]/255,i=t[2]/255;return[100*(.4124*(e=e>.04045?Math.pow((e+.055)/1.055,2.4):e/12.92)+.3576*(n=n>.04045?Math.pow((n+.055)/1.055,2.4):n/12.92)+.1805*(i=i>.04045?Math.pow((i+.055)/1.055,2.4):i/12.92)),100*(.2126*e+.7152*n+.0722*i),100*(.0193*e+.1192*n+.9505*i)]},a.rgb.lab=function(t){var e=a.rgb.xyz(t),n=e[0],i=e[1],r=e[2];return i/=100,r/=108.883,n=(n/=95.047)>.008856?Math.pow(n,1/3):7.787*n+16/116,[116*(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116)-16,500*(n-i),200*(i-(r=r>.008856?Math.pow(r,1/3):7.787*r+16/116))]},a.hsl.rgb=function(t){var e,n,i,a,r,o=t[0]/360,s=t[1]/100,l=t[2]/100;if(0===s)return[r=255*l,r,r];e=2*l-(n=l<.5?l*(1+s):l+s-l*s),a=[0,0,0];for(var u=0;u<3;u++)(i=o+1/3*-(u-1))<0&&i++,i>1&&i--,r=6*i<1?e+6*(n-e)*i:2*i<1?n:3*i<2?e+(n-e)*(2/3-i)*6:e,a[u]=255*r;return a},a.hsl.hsv=function(t){var e=t[0],n=t[1]/100,i=t[2]/100,a=n,r=Math.max(i,.01);return n*=(i*=2)<=1?i:2-i,a*=r<=1?r:2-r,[e,100*(0===i?2*a/(r+a):2*n/(i+n)),100*((i+n)/2)]},a.hsv.rgb=function(t){var e=t[0]/60,n=t[1]/100,i=t[2]/100,a=Math.floor(e)%6,r=e-Math.floor(e),o=255*i*(1-n),s=255*i*(1-n*r),l=255*i*(1-n*(1-r));switch(i*=255,a){case 0:return[i,l,o];case 1:return[s,i,o];case 2:return[o,i,l];case 3:return[o,s,i];case 4:return[l,o,i];case 5:return[i,o,s]}},a.hsv.hsl=function(t){var e,n,i,a=t[0],r=t[1]/100,o=t[2]/100,s=Math.max(o,.01);return i=(2-r)*o,n=r*s,[a,100*(n=(n/=(e=(2-r)*s)<=1?e:2-e)||0),100*(i/=2)]},a.hwb.rgb=function(t){var e,n,i,a,r,o,s,l=t[0]/360,u=t[1]/100,d=t[2]/100,h=u+d;switch(h>1&&(u/=h,d/=h),i=6*l-(e=Math.floor(6*l)),0!=(1&e)&&(i=1-i),a=u+i*((n=1-d)-u),e){default:case 6:case 0:r=n,o=a,s=u;break;case 1:r=a,o=n,s=u;break;case 2:r=u,o=n,s=a;break;case 3:r=u,o=a,s=n;break;case 4:r=a,o=u,s=n;break;case 5:r=n,o=u,s=a}return[255*r,255*o,255*s]},a.cmyk.rgb=function(t){var e=t[0]/100,n=t[1]/100,i=t[2]/100,a=t[3]/100;return[255*(1-Math.min(1,e*(1-a)+a)),255*(1-Math.min(1,n*(1-a)+a)),255*(1-Math.min(1,i*(1-a)+a))]},a.xyz.rgb=function(t){var e,n,i,a=t[0]/100,r=t[1]/100,o=t[2]/100;return n=-.9689*a+1.8758*r+.0415*o,i=.0557*a+-.204*r+1.057*o,e=(e=3.2406*a+-1.5372*r+-.4986*o)>.0031308?1.055*Math.pow(e,1/2.4)-.055:12.92*e,n=n>.0031308?1.055*Math.pow(n,1/2.4)-.055:12.92*n,i=i>.0031308?1.055*Math.pow(i,1/2.4)-.055:12.92*i,[255*(e=Math.min(Math.max(0,e),1)),255*(n=Math.min(Math.max(0,n),1)),255*(i=Math.min(Math.max(0,i),1))]},a.xyz.lab=function(t){var e=t[0],n=t[1],i=t[2];return n/=100,i/=108.883,e=(e/=95.047)>.008856?Math.pow(e,1/3):7.787*e+16/116,[116*(n=n>.008856?Math.pow(n,1/3):7.787*n+16/116)-16,500*(e-n),200*(n-(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116))]},a.lab.xyz=function(t){var e,n,i,a=t[0];e=t[1]/500+(n=(a+16)/116),i=n-t[2]/200;var r=Math.pow(n,3),o=Math.pow(e,3),s=Math.pow(i,3);return n=r>.008856?r:(n-16/116)/7.787,e=o>.008856?o:(e-16/116)/7.787,i=s>.008856?s:(i-16/116)/7.787,[e*=95.047,n*=100,i*=108.883]},a.lab.lch=function(t){var e,n=t[0],i=t[1],a=t[2];return(e=360*Math.atan2(a,i)/2/Math.PI)<0&&(e+=360),[n,Math.sqrt(i*i+a*a),e]},a.lch.lab=function(t){var e,n=t[0],i=t[1];return e=t[2]/360*2*Math.PI,[n,i*Math.cos(e),i*Math.sin(e)]},a.rgb.ansi16=function(t){var e=t[0],n=t[1],i=t[2],r=1 in arguments?arguments[1]:a.rgb.hsv(t)[2];if(0===(r=Math.round(r/50)))return 30;var o=30+(Math.round(i/255)<<2|Math.round(n/255)<<1|Math.round(e/255));return 2===r&&(o+=60),o},a.hsv.ansi16=function(t){return a.rgb.ansi16(a.hsv.rgb(t),t[2])},a.rgb.ansi256=function(t){var e=t[0],n=t[1],i=t[2];return e===n&&n===i?e<8?16:e>248?231:Math.round((e-8)/247*24)+232:16+36*Math.round(e/255*5)+6*Math.round(n/255*5)+Math.round(i/255*5)},a.ansi16.rgb=function(t){var e=t%10;if(0===e||7===e)return t>50&&(e+=3.5),[e=e/10.5*255,e,e];var n=.5*(1+~~(t>50));return[(1&e)*n*255,(e>>1&1)*n*255,(e>>2&1)*n*255]},a.ansi256.rgb=function(t){if(t>=232){var e=10*(t-232)+8;return[e,e,e]}var n;return t-=16,[Math.floor(t/36)/5*255,Math.floor((n=t%36)/6)/5*255,n%6/5*255]},a.rgb.hex=function(t){var e=(((255&Math.round(t[0]))<<16)+((255&Math.round(t[1]))<<8)+(255&Math.round(t[2]))).toString(16).toUpperCase();return"000000".substring(e.length)+e},a.hex.rgb=function(t){var e=t.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);if(!e)return[0,0,0];var n=e[0];3===e[0].length&&(n=n.split("").map((function(t){return t+t})).join(""));var i=parseInt(n,16);return[i>>16&255,i>>8&255,255&i]},a.rgb.hcg=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255,r=Math.max(Math.max(n,i),a),o=Math.min(Math.min(n,i),a),s=r-o;return e=s<=0?0:r===n?(i-a)/s%6:r===i?2+(a-n)/s:4+(n-i)/s+4,e/=6,[360*(e%=1),100*s,100*(s<1?o/(1-s):0)]},a.hsl.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=1,a=0;return(i=n<.5?2*e*n:2*e*(1-n))<1&&(a=(n-.5*i)/(1-i)),[t[0],100*i,100*a]},a.hsv.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=e*n,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.hcg.rgb=function(t){var e=t[0]/360,n=t[1]/100,i=t[2]/100;if(0===n)return[255*i,255*i,255*i];var a,r=[0,0,0],o=e%1*6,s=o%1,l=1-s;switch(Math.floor(o)){case 0:r[0]=1,r[1]=s,r[2]=0;break;case 1:r[0]=l,r[1]=1,r[2]=0;break;case 2:r[0]=0,r[1]=1,r[2]=s;break;case 3:r[0]=0,r[1]=l,r[2]=1;break;case 4:r[0]=s,r[1]=0,r[2]=1;break;default:r[0]=1,r[1]=0,r[2]=l}return a=(1-n)*i,[255*(n*r[0]+a),255*(n*r[1]+a),255*(n*r[2]+a)]},a.hcg.hsv=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e),i=0;return n>0&&(i=e/n),[t[0],100*i,100*n]},a.hcg.hsl=function(t){var e=t[1]/100,n=t[2]/100*(1-e)+.5*e,i=0;return n>0&&n<.5?i=e/(2*n):n>=.5&&n<1&&(i=e/(2*(1-n))),[t[0],100*i,100*n]},a.hcg.hwb=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e);return[t[0],100*(n-e),100*(1-n)]},a.hwb.hcg=function(t){var e=t[1]/100,n=1-t[2]/100,i=n-e,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.apple.rgb=function(t){return[t[0]/65535*255,t[1]/65535*255,t[2]/65535*255]},a.rgb.apple=function(t){return[t[0]/255*65535,t[1]/255*65535,t[2]/255*65535]},a.gray.rgb=function(t){return[t[0]/100*255,t[0]/100*255,t[0]/100*255]},a.gray.hsl=a.gray.hsv=function(t){return[0,0,t[0]]},a.gray.hwb=function(t){return[0,100,t[0]]},a.gray.cmyk=function(t){return[0,0,0,t[0]]},a.gray.lab=function(t){return[t[0],0,0]},a.gray.hex=function(t){var e=255&Math.round(t[0]/100*255),n=((e<<16)+(e<<8)+e).toString(16).toUpperCase();return"000000".substring(n.length)+n},a.rgb.gray=function(t){return[(t[0]+t[1]+t[2])/3/255*100]}}));i.rgb,i.hsl,i.hsv,i.hwb,i.cmyk,i.xyz,i.lab,i.lch,i.hex,i.keyword,i.ansi16,i.ansi256,i.hcg,i.apple,i.gray;function a(t){var e=function(){for(var t={},e=Object.keys(i),n=e.length,a=0;a<n;a++)t[e[a]]={distance:-1,parent:null};return t}(),n=[t];for(e[t].distance=0;n.length;)for(var a=n.pop(),r=Object.keys(i[a]),o=r.length,s=0;s<o;s++){var l=r[s],u=e[l];-1===u.distance&&(u.distance=e[a].distance+1,u.parent=a,n.unshift(l))}return e}function r(t,e){return function(n){return e(t(n))}}function o(t,e){for(var n=[e[t].parent,t],a=i[e[t].parent][t],o=e[t].parent;e[o].parent;)n.unshift(e[o].parent),a=r(i[e[o].parent][o],a),o=e[o].parent;return a.conversion=n,a}var s={};Object.keys(i).forEach((function(t){s[t]={},Object.defineProperty(s[t],"channels",{value:i[t].channels}),Object.defineProperty(s[t],"labels",{value:i[t].labels});var e=function(t){for(var e=a(t),n={},i=Object.keys(e),r=i.length,s=0;s<r;s++){var l=i[s];null!==e[l].parent&&(n[l]=o(l,e))}return n}(t);Object.keys(e).forEach((function(n){var i=e[n];s[t][n]=function(t){var e=function(e){if(null==e)return e;arguments.length>1&&(e=Array.prototype.slice.call(arguments));var n=t(e);if("object"==typeof n)for(var i=n.length,a=0;a<i;a++)n[a]=Math.round(n[a]);return n};return"conversion"in t&&(e.conversion=t.conversion),e}(i),s[t][n].raw=function(t){var e=function(e){return null==e?e:(arguments.length>1&&(e=Array.prototype.slice.call(arguments)),t(e))};return"conversion"in t&&(e.conversion=t.conversion),e}(i)}))}));var l=s,u={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},d={getRgba:h,getHsla:c,getRgb:function(t){var e=h(t);return e&&e.slice(0,3)},getHsl:function(t){var e=c(t);return e&&e.slice(0,3)},getHwb:f,getAlpha:function(t){var e=h(t);if(e)return e[3];if(e=c(t))return e[3];if(e=f(t))return e[3]},hexString:function(t,e){e=void 0!==e&&3===t.length?e:t[3];return"#"+b(t[0])+b(t[1])+b(t[2])+(e>=0&&e<1?b(Math.round(255*e)):"")},rgbString:function(t,e){if(e<1||t[3]&&t[3]<1)return g(t,e);return"rgb("+t[0]+", "+t[1]+", "+t[2]+")"},rgbaString:g,percentString:function(t,e){if(e<1||t[3]&&t[3]<1)return m(t,e);var n=Math.round(t[0]/255*100),i=Math.round(t[1]/255*100),a=Math.round(t[2]/255*100);return"rgb("+n+"%, "+i+"%, "+a+"%)"},percentaString:m,hslString:function(t,e){if(e<1||t[3]&&t[3]<1)return p(t,e);return"hsl("+t[0]+", "+t[1]+"%, "+t[2]+"%)"},hslaString:p,hwbString:function(t,e){void 0===e&&(e=void 0!==t[3]?t[3]:1);return"hwb("+t[0]+", "+t[1]+"%, "+t[2]+"%"+(void 0!==e&&1!==e?", "+e:"")+")"},keyword:function(t){return y[t.slice(0,3)]}};function h(t){if(t){var e=[0,0,0],n=1,i=t.match(/^#([a-fA-F0-9]{3,4})$/i),a="";if(i){a=(i=i[1])[3];for(var r=0;r<e.length;r++)e[r]=parseInt(i[r]+i[r],16);a&&(n=Math.round(parseInt(a+a,16)/255*100)/100)}else if(i=t.match(/^#([a-fA-F0-9]{6}([a-fA-F0-9]{2})?)$/i)){a=i[2],i=i[1];for(r=0;r<e.length;r++)e[r]=parseInt(i.slice(2*r,2*r+2),16);a&&(n=Math.round(parseInt(a,16)/255*100)/100)}else if(i=t.match(/^rgba?\(\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=parseInt(i[r+1]);n=parseFloat(i[4])}else if(i=t.match(/^rgba?\(\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=Math.round(2.55*parseFloat(i[r+1]));n=parseFloat(i[4])}else if(i=t.match(/(\w+)/)){if("transparent"==i[1])return[0,0,0,0];if(!(e=u[i[1]]))return}for(r=0;r<e.length;r++)e[r]=v(e[r],0,255);return n=n||0==n?v(n,0,1):1,e[3]=n,e}}function c(t){if(t){var e=t.match(/^hsla?\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[v(parseInt(e[1]),0,360),v(parseFloat(e[2]),0,100),v(parseFloat(e[3]),0,100),v(isNaN(n)?1:n,0,1)]}}}function f(t){if(t){var e=t.match(/^hwb\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[v(parseInt(e[1]),0,360),v(parseFloat(e[2]),0,100),v(parseFloat(e[3]),0,100),v(isNaN(n)?1:n,0,1)]}}}function g(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"rgba("+t[0]+", "+t[1]+", "+t[2]+", "+e+")"}function m(t,e){return"rgba("+Math.round(t[0]/255*100)+"%, "+Math.round(t[1]/255*100)+"%, "+Math.round(t[2]/255*100)+"%, "+(e||t[3]||1)+")"}function p(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"hsla("+t[0]+", "+t[1]+"%, "+t[2]+"%, "+e+")"}function v(t,e,n){return Math.min(Math.max(e,t),n)}function b(t){var e=t.toString(16).toUpperCase();return e.length<2?"0"+e:e}var y={};for(var x in u)y[u[x]]=x;var _=function(t){return t instanceof _?t:this instanceof _?(this.valid=!1,this.values={rgb:[0,0,0],hsl:[0,0,0],hsv:[0,0,0],hwb:[0,0,0],cmyk:[0,0,0,0],alpha:1},void("string"==typeof t?(e=d.getRgba(t))?this.setValues("rgb",e):(e=d.getHsla(t))?this.setValues("hsl",e):(e=d.getHwb(t))&&this.setValues("hwb",e):"object"==typeof t&&(void 0!==(e=t).r||void 0!==e.red?this.setValues("rgb",e):void 0!==e.l||void 0!==e.lightness?this.setValues("hsl",e):void 0!==e.v||void 0!==e.value?this.setValues("hsv",e):void 0!==e.w||void 0!==e.whiteness?this.setValues("hwb",e):void 0===e.c&&void 0===e.cyan||this.setValues("cmyk",e)))):new _(t);var e};_.prototype={isValid:function(){return this.valid},rgb:function(){return this.setSpace("rgb",arguments)},hsl:function(){return this.setSpace("hsl",arguments)},hsv:function(){return this.setSpace("hsv",arguments)},hwb:function(){return this.setSpace("hwb",arguments)},cmyk:function(){return this.setSpace("cmyk",arguments)},rgbArray:function(){return this.values.rgb},hslArray:function(){return this.values.hsl},hsvArray:function(){return this.values.hsv},hwbArray:function(){var t=this.values;return 1!==t.alpha?t.hwb.concat([t.alpha]):t.hwb},cmykArray:function(){return this.values.cmyk},rgbaArray:function(){var t=this.values;return t.rgb.concat([t.alpha])},hslaArray:function(){var t=this.values;return t.hsl.concat([t.alpha])},alpha:function(t){return void 0===t?this.values.alpha:(this.setValues("alpha",t),this)},red:function(t){return this.setChannel("rgb",0,t)},green:function(t){return this.setChannel("rgb",1,t)},blue:function(t){return this.setChannel("rgb",2,t)},hue:function(t){return t&&(t=(t%=360)<0?360+t:t),this.setChannel("hsl",0,t)},saturation:function(t){return this.setChannel("hsl",1,t)},lightness:function(t){return this.setChannel("hsl",2,t)},saturationv:function(t){return this.setChannel("hsv",1,t)},whiteness:function(t){return this.setChannel("hwb",1,t)},blackness:function(t){return this.setChannel("hwb",2,t)},value:function(t){return this.setChannel("hsv",2,t)},cyan:function(t){return this.setChannel("cmyk",0,t)},magenta:function(t){return this.setChannel("cmyk",1,t)},yellow:function(t){return this.setChannel("cmyk",2,t)},black:function(t){return this.setChannel("cmyk",3,t)},hexString:function(){return d.hexString(this.values.rgb)},rgbString:function(){return d.rgbString(this.values.rgb,this.values.alpha)},rgbaString:function(){return d.rgbaString(this.values.rgb,this.values.alpha)},percentString:function(){return d.percentString(this.values.rgb,this.values.alpha)},hslString:function(){return d.hslString(this.values.hsl,this.values.alpha)},hslaString:function(){return d.hslaString(this.values.hsl,this.values.alpha)},hwbString:function(){return d.hwbString(this.values.hwb,this.values.alpha)},keyword:function(){return d.keyword(this.values.rgb,this.values.alpha)},rgbNumber:function(){var t=this.values.rgb;return t[0]<<16|t[1]<<8|t[2]},luminosity:function(){for(var t=this.values.rgb,e=[],n=0;n<t.length;n++){var i=t[n]/255;e[n]=i<=.03928?i/12.92:Math.pow((i+.055)/1.055,2.4)}return.2126*e[0]+.7152*e[1]+.0722*e[2]},contrast:function(t){var e=this.luminosity(),n=t.luminosity();return e>n?(e+.05)/(n+.05):(n+.05)/(e+.05)},level:function(t){var e=this.contrast(t);return e>=7.1?"AAA":e>=4.5?"AA":""},dark:function(){var t=this.values.rgb;return(299*t[0]+587*t[1]+114*t[2])/1e3<128},light:function(){return!this.dark()},negate:function(){for(var t=[],e=0;e<3;e++)t[e]=255-this.values.rgb[e];return this.setValues("rgb",t),this},lighten:function(t){var e=this.values.hsl;return e[2]+=e[2]*t,this.setValues("hsl",e),this},darken:function(t){var e=this.values.hsl;return e[2]-=e[2]*t,this.setValues("hsl",e),this},saturate:function(t){var e=this.values.hsl;return e[1]+=e[1]*t,this.setValues("hsl",e),this},desaturate:function(t){var e=this.values.hsl;return e[1]-=e[1]*t,this.setValues("hsl",e),this},whiten:function(t){var e=this.values.hwb;return e[1]+=e[1]*t,this.setValues("hwb",e),this},blacken:function(t){var e=this.values.hwb;return e[2]+=e[2]*t,this.setValues("hwb",e),this},greyscale:function(){var t=this.values.rgb,e=.3*t[0]+.59*t[1]+.11*t[2];return this.setValues("rgb",[e,e,e]),this},clearer:function(t){var e=this.values.alpha;return this.setValues("alpha",e-e*t),this},opaquer:function(t){var e=this.values.alpha;return this.setValues("alpha",e+e*t),this},rotate:function(t){var e=this.values.hsl,n=(e[0]+t)%360;return e[0]=n<0?360+n:n,this.setValues("hsl",e),this},mix:function(t,e){var n=t,i=void 0===e?.5:e,a=2*i-1,r=this.alpha()-n.alpha(),o=((a*r==-1?a:(a+r)/(1+a*r))+1)/2,s=1-o;return this.rgb(o*this.red()+s*n.red(),o*this.green()+s*n.green(),o*this.blue()+s*n.blue()).alpha(this.alpha()*i+n.alpha()*(1-i))},toJSON:function(){return this.rgb()},clone:function(){var t,e,n=new _,i=this.values,a=n.values;for(var r in i)i.hasOwnProperty(r)&&(t=i[r],"[object Array]"===(e={}.toString.call(t))?a[r]=t.slice(0):"[object Number]"===e?a[r]=t:console.error("unexpected color value:",t));return n}},_.prototype.spaces={rgb:["red","green","blue"],hsl:["hue","saturation","lightness"],hsv:["hue","saturation","value"],hwb:["hue","whiteness","blackness"],cmyk:["cyan","magenta","yellow","black"]},_.prototype.maxes={rgb:[255,255,255],hsl:[360,100,100],hsv:[360,100,100],hwb:[360,100,100],cmyk:[100,100,100,100]},_.prototype.getValues=function(t){for(var e=this.values,n={},i=0;i<t.length;i++)n[t.charAt(i)]=e[t][i];return 1!==e.alpha&&(n.a=e.alpha),n},_.prototype.setValues=function(t,e){var n,i,a=this.values,r=this.spaces,o=this.maxes,s=1;if(this.valid=!0,"alpha"===t)s=e;else if(e.length)a[t]=e.slice(0,t.length),s=e[t.length];else if(void 0!==e[t.charAt(0)]){for(n=0;n<t.length;n++)a[t][n]=e[t.charAt(n)];s=e.a}else if(void 0!==e[r[t][0]]){var u=r[t];for(n=0;n<t.length;n++)a[t][n]=e[u[n]];s=e.alpha}if(a.alpha=Math.max(0,Math.min(1,void 0===s?a.alpha:s)),"alpha"===t)return!1;for(n=0;n<t.length;n++)i=Math.max(0,Math.min(o[t][n],a[t][n])),a[t][n]=Math.round(i);for(var d in r)d!==t&&(a[d]=l[t][d](a[t]));return!0},_.prototype.setSpace=function(t,e){var n=e[0];return void 0===n?this.getValues(t):("number"==typeof n&&(n=Array.prototype.slice.call(e)),this.setValues(t,n),this)},_.prototype.setChannel=function(t,e,n){var i=this.values[t];return void 0===n?i[e]:n===i[e]?this:(i[e]=n,this.setValues(t,i),this)},"undefined"!=typeof window&&(window.Color=_);var w=_;function k(t){return-1===["__proto__","prototype","constructor"].indexOf(t)}var M,S={noop:function(){},uid:(M=0,function(){return M++}),isNullOrUndef:function(t){return null==t},isArray:function(t){if(Array.isArray&&Array.isArray(t))return!0;var e=Object.prototype.toString.call(t);return"[object"===e.substr(0,7)&&"Array]"===e.substr(-6)},isObject:function(t){return null!==t&&"[object Object]"===Object.prototype.toString.call(t)},isFinite:function(t){return("number"==typeof t||t instanceof Number)&&isFinite(t)},valueOrDefault:function(t,e){return void 0===t?e:t},valueAtIndexOrDefault:function(t,e,n){return S.valueOrDefault(S.isArray(t)?t[e]:t,n)},callback:function(t,e,n){if(t&&"function"==typeof t.call)return t.apply(n,e)},each:function(t,e,n,i){var a,r,o;if(S.isArray(t))if(r=t.length,i)for(a=r-1;a>=0;a--)e.call(n,t[a],a);else for(a=0;a<r;a++)e.call(n,t[a],a);else if(S.isObject(t))for(r=(o=Object.keys(t)).length,a=0;a<r;a++)e.call(n,t[o[a]],o[a])},arrayEquals:function(t,e){var n,i,a,r;if(!t||!e||t.length!==e.length)return!1;for(n=0,i=t.length;n<i;++n)if(a=t[n],r=e[n],a instanceof Array&&r instanceof Array){if(!S.arrayEquals(a,r))return!1}else if(a!==r)return!1;return!0},clone:function(t){if(S.isArray(t))return t.map(S.clone);if(S.isObject(t)){for(var e=Object.create(t),n=Object.keys(t),i=n.length,a=0;a<i;++a)e[n[a]]=S.clone(t[n[a]]);return e}return t},_merger:function(t,e,n,i){if(k(t)){var a=e[t],r=n[t];S.isObject(a)&&S.isObject(r)?S.merge(a,r,i):e[t]=S.clone(r)}},_mergerIf:function(t,e,n){if(k(t)){var i=e[t],a=n[t];S.isObject(i)&&S.isObject(a)?S.mergeIf(i,a):e.hasOwnProperty(t)||(e[t]=S.clone(a))}},merge:function(t,e,n){var i,a,r,o,s,l=S.isArray(e)?e:[e],u=l.length;if(!S.isObject(t))return t;for(i=(n=n||{}).merger||S._merger,a=0;a<u;++a)if(e=l[a],S.isObject(e))for(s=0,o=(r=Object.keys(e)).length;s<o;++s)i(r[s],t,e,n);return t},mergeIf:function(t,e){return S.merge(t,e,{merger:S._mergerIf})},extend:Object.assign||function(t){return S.merge(t,[].slice.call(arguments,1),{merger:function(t,e,n){e[t]=n[t]}})},inherits:function(t){var e=this,n=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return e.apply(this,arguments)},i=function(){this.constructor=n};return i.prototype=e.prototype,n.prototype=new i,n.extend=S.inherits,t&&S.extend(n.prototype,t),n.__super__=e.prototype,n},_deprecated:function(t,e,n,i){void 0!==e&&console.warn(t+': "'+n+'" is deprecated. Please use "'+i+'" instead')}},D=S;S.callCallback=S.callback,S.indexOf=function(t,e,n){return Array.prototype.indexOf.call(t,e,n)},S.getValueOrDefault=S.valueOrDefault,S.getValueAtIndexOrDefault=S.valueAtIndexOrDefault;var C={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return(t-=1)*t*t+1},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-((t-=1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return t*t*t*t*t},easeOutQuint:function(t){return(t-=1)*t*t*t*t+1},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return 1-Math.cos(t*(Math.PI/2))},easeOutSine:function(t){return Math.sin(t*(Math.PI/2))},easeInOutSine:function(t){return-.5*(Math.cos(Math.PI*t)-1)},easeInExpo:function(t){return 0===t?0:Math.pow(2,10*(t-1))},easeOutExpo:function(t){return 1===t?1:1-Math.pow(2,-10*t)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(2-Math.pow(2,-10*--t))},easeInCirc:function(t){return t>=1?t:-(Math.sqrt(1-t*t)-1)},easeOutCirc:function(t){return Math.sqrt(1-(t-=1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),-i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n))},easeOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),i*Math.pow(2,-10*t)*Math.sin((t-e)*(2*Math.PI)/n)+1)},easeInOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:2==(t/=.5)?1:(n||(n=.45),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),t<1?i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*-.5:i*Math.pow(2,-10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*.5+1)},easeInBack:function(t){var e=1.70158;return t*t*((e+1)*t-e)},easeOutBack:function(t){var e=1.70158;return(t-=1)*t*((e+1)*t+e)+1},easeInOutBack:function(t){var e=1.70158;return(t/=.5)<1?t*t*((1+(e*=1.525))*t-e)*.5:.5*((t-=2)*t*((1+(e*=1.525))*t+e)+2)},easeInBounce:function(t){return 1-C.easeOutBounce(1-t)},easeOutBounce:function(t){return t<1/2.75?7.5625*t*t:t<2/2.75?7.5625*(t-=1.5/2.75)*t+.75:t<2.5/2.75?7.5625*(t-=2.25/2.75)*t+.9375:7.5625*(t-=2.625/2.75)*t+.984375},easeInOutBounce:function(t){return t<.5?.5*C.easeInBounce(2*t):.5*C.easeOutBounce(2*t-1)+.5}},P={effects:C};D.easingEffects=C;var T=Math.PI,O=T/180,A=2*T,F=T/2,I=T/4,L=2*T/3,R={clear:function(t){t.ctx.clearRect(0,0,t.width,t.height)},roundedRect:function(t,e,n,i,a,r){if(r){var o=Math.min(r,a/2,i/2),s=e+o,l=n+o,u=e+i-o,d=n+a-o;t.moveTo(e,l),s<u&&l<d?(t.arc(s,l,o,-T,-F),t.arc(u,l,o,-F,0),t.arc(u,d,o,0,F),t.arc(s,d,o,F,T)):s<u?(t.moveTo(s,n),t.arc(u,l,o,-F,F),t.arc(s,l,o,F,T+F)):l<d?(t.arc(s,l,o,-T,0),t.arc(s,d,o,0,T)):t.arc(s,l,o,-T,T),t.closePath(),t.moveTo(e,n)}else t.rect(e,n,i,a)},drawPoint:function(t,e,n,i,a,r){var o,s,l,u,d,h=(r||0)*O;if(e&&"object"==typeof e&&("[object HTMLImageElement]"===(o=e.toString())||"[object HTMLCanvasElement]"===o))return t.save(),t.translate(i,a),t.rotate(h),t.drawImage(e,-e.width/2,-e.height/2,e.width,e.height),void t.restore();if(!(isNaN(n)||n<=0)){switch(t.beginPath(),e){default:t.arc(i,a,n,0,A),t.closePath();break;case"triangle":t.moveTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=L,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=L,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),t.closePath();break;case"rectRounded":u=n-(d=.516*n),s=Math.cos(h+I)*u,l=Math.sin(h+I)*u,t.arc(i-s,a-l,d,h-T,h-F),t.arc(i+l,a-s,d,h-F,h),t.arc(i+s,a+l,d,h,h+F),t.arc(i-l,a+s,d,h+F,h+T),t.closePath();break;case"rect":if(!r){u=Math.SQRT1_2*n,t.rect(i-u,a-u,2*u,2*u);break}h+=I;case"rectRot":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+l,a-s),t.lineTo(i+s,a+l),t.lineTo(i-l,a+s),t.closePath();break;case"crossRot":h+=I;case"cross":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"star":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s),h+=I,s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"line":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l);break;case"dash":t.moveTo(i,a),t.lineTo(i+Math.cos(h)*n,a+Math.sin(h)*n)}t.fill(),t.stroke()}},_isPointInArea:function(t,e){return t.x>e.left-1e-6&&t.x<e.right+1e-6&&t.y>e.top-1e-6&&t.y<e.bottom+1e-6},clipArea:function(t,e){t.save(),t.beginPath(),t.rect(e.left,e.top,e.right-e.left,e.bottom-e.top),t.clip()},unclipArea:function(t){t.restore()},lineTo:function(t,e,n,i){var a=n.steppedLine;if(a){if("middle"===a){var r=(e.x+n.x)/2;t.lineTo(r,i?n.y:e.y),t.lineTo(r,i?e.y:n.y)}else"after"===a&&!i||"after"!==a&&i?t.lineTo(e.x,n.y):t.lineTo(n.x,e.y);t.lineTo(n.x,n.y)}else n.tension?t.bezierCurveTo(i?e.controlPointPreviousX:e.controlPointNextX,i?e.controlPointPreviousY:e.controlPointNextY,i?n.controlPointNextX:n.controlPointPreviousX,i?n.controlPointNextY:n.controlPointPreviousY,n.x,n.y):t.lineTo(n.x,n.y)}},N=R;D.clear=R.clear,D.drawRoundedRectangle=function(t){t.beginPath(),R.roundedRect.apply(R,arguments)};var W={_set:function(t,e){return D.merge(this[t]||(this[t]={}),e)}};W._set("global",{defaultColor:"rgba(0,0,0,0.1)",defaultFontColor:"#666",defaultFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",defaultFontSize:12,defaultFontStyle:"normal",defaultLineHeight:1.2,showLines:!0});var Y=W,z=D.valueOrDefault;var E={toLineHeight:function(t,e){var n=(""+t).match(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/);if(!n||"normal"===n[1])return 1.2*e;switch(t=+n[2],n[3]){case"px":return t;case"%":t/=100}return e*t},toPadding:function(t){var e,n,i,a;return D.isObject(t)?(e=+t.top||0,n=+t.right||0,i=+t.bottom||0,a=+t.left||0):e=n=i=a=+t||0,{top:e,right:n,bottom:i,left:a,height:e+i,width:a+n}},_parseFont:function(t){var e=Y.global,n=z(t.fontSize,e.defaultFontSize),i={family:z(t.fontFamily,e.defaultFontFamily),lineHeight:D.options.toLineHeight(z(t.lineHeight,e.defaultLineHeight),n),size:n,style:z(t.fontStyle,e.defaultFontStyle),weight:null,string:""};return i.string=function(t){return!t||D.isNullOrUndef(t.size)||D.isNullOrUndef(t.family)?null:(t.style?t.style+" ":"")+(t.weight?t.weight+" ":"")+t.size+"px "+t.family}(i),i},resolve:function(t,e,n,i){var a,r,o,s=!0;for(a=0,r=t.length;a<r;++a)if(void 0!==(o=t[a])&&(void 0!==e&&"function"==typeof o&&(o=o(e),s=!1),void 0!==n&&D.isArray(o)&&(o=o[n],s=!1),void 0!==o))return i&&!s&&(i.cacheable=!1),o}},V={_factorize:function(t){var e,n=[],i=Math.sqrt(t);for(e=1;e<i;e++)t%e==0&&(n.push(e),n.push(t/e));return i===(0|i)&&n.push(i),n.sort((function(t,e){return t-e})).pop(),n},log10:Math.log10||function(t){var e=Math.log(t)*Math.LOG10E,n=Math.round(e);return t===Math.pow(10,n)?n:e}},H=V;D.log10=V.log10;var B=D,j=P,U=N,G=E,q=H,Z={getRtlAdapter:function(t,e,n){return t?function(t,e){return{x:function(n){return t+t+e-n},setWidth:function(t){e=t},textAlign:function(t){return"center"===t?t:"right"===t?"left":"right"},xPlus:function(t,e){return t-e},leftForLtr:function(t,e){return t-e}}}(e,n):{x:function(t){return t},setWidth:function(t){},textAlign:function(t){return t},xPlus:function(t,e){return t+e},leftForLtr:function(t,e){return t}}},overrideTextDirection:function(t,e){var n,i;"ltr"!==e&&"rtl"!==e||(i=[(n=t.canvas.style).getPropertyValue("direction"),n.getPropertyPriority("direction")],n.setProperty("direction",e,"important"),t.prevTextDirection=i)},restoreTextDirection:function(t){var e=t.prevTextDirection;void 0!==e&&(delete t.prevTextDirection,t.canvas.style.setProperty("direction",e[0],e[1]))}};B.easing=j,B.canvas=U,B.options=G,B.math=q,B.rtl=Z;var $=function(t){B.extend(this,t),this.initialize.apply(this,arguments)};B.extend($.prototype,{_type:void 0,initialize:function(){this.hidden=!1},pivot:function(){var t=this;return t._view||(t._view=B.extend({},t._model)),t._start={},t},transition:function(t){var e=this,n=e._model,i=e._start,a=e._view;return n&&1!==t?(a||(a=e._view={}),i||(i=e._start={}),function(t,e,n,i){var a,r,o,s,l,u,d,h,c,f=Object.keys(n);for(a=0,r=f.length;a<r;++a)if(u=n[o=f[a]],e.hasOwnProperty(o)||(e[o]=u),(s=e[o])!==u&&"_"!==o[0]){if(t.hasOwnProperty(o)||(t[o]=s),(d=typeof u)===typeof(l=t[o]))if("string"===d){if((h=w(l)).valid&&(c=w(u)).valid){e[o]=c.mix(h,i).rgbString();continue}}else if(B.isFinite(l)&&B.isFinite(u)){e[o]=l+(u-l)*i;continue}e[o]=u}}(i,a,n,t),e):(e._view=B.extend({},n),e._start=null,e)},tooltipPosition:function(){return{x:this._model.x,y:this._model.y}},hasValue:function(){return B.isNumber(this._model.x)&&B.isNumber(this._model.y)}}),$.extend=B.inherits;var X=$,K=X.extend({chart:null,currentStep:0,numSteps:60,easing:"",render:null,onAnimationProgress:null,onAnimationComplete:null}),J=K;Object.defineProperty(K.prototype,"animationObject",{get:function(){return this}}),Object.defineProperty(K.prototype,"chartInstance",{get:function(){return this.chart},set:function(t){this.chart=t}}),Y._set("global",{animation:{duration:1e3,easing:"easeOutQuart",onProgress:B.noop,onComplete:B.noop}});var Q={animations:[],request:null,addAnimation:function(t,e,n,i){var a,r,o=this.animations;for(e.chart=t,e.startTime=Date.now(),e.duration=n,i||(t.animating=!0),a=0,r=o.length;a<r;++a)if(o[a].chart===t)return void(o[a]=e);o.push(e),1===o.length&&this.requestAnimationFrame()},cancelAnimation:function(t){var e=B.findIndex(this.animations,(function(e){return e.chart===t}));-1!==e&&(this.animations.splice(e,1),t.animating=!1)},requestAnimationFrame:function(){var t=this;null===t.request&&(t.request=B.requestAnimFrame.call(window,(function(){t.request=null,t.startDigest()})))},startDigest:function(){this.advance(),this.animations.length>0&&this.requestAnimationFrame()},advance:function(){for(var t,e,n,i,a=this.animations,r=0;r<a.length;)e=(t=a[r]).chart,n=t.numSteps,i=Math.floor((Date.now()-t.startTime)/t.duration*n)+1,t.currentStep=Math.min(i,n),B.callback(t.render,[e,t],e),B.callback(t.onAnimationProgress,[t],e),t.currentStep>=n?(B.callback(t.onAnimationComplete,[t],e),e.animating=!1,a.splice(r,1)):++r}},tt=B.options.resolve,et=["push","pop","shift","splice","unshift"];function nt(t,e){var n=t._chartjs;if(n){var i=n.listeners,a=i.indexOf(e);-1!==a&&i.splice(a,1),i.length>0||(et.forEach((function(e){delete t[e]})),delete t._chartjs)}}var it=function(t,e){this.initialize(t,e)};B.extend(it.prototype,{datasetElementType:null,dataElementType:null,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth"],_dataElementOptions:["backgroundColor","borderColor","borderWidth","pointStyle"],initialize:function(t,e){var n=this;n.chart=t,n.index=e,n.linkScales(),n.addElements(),n._type=n.getMeta().type},updateIndex:function(t){this.index=t},linkScales:function(){var t=this.getMeta(),e=this.chart,n=e.scales,i=this.getDataset(),a=e.options.scales;null!==t.xAxisID&&t.xAxisID in n&&!i.xAxisID||(t.xAxisID=i.xAxisID||a.xAxes[0].id),null!==t.yAxisID&&t.yAxisID in n&&!i.yAxisID||(t.yAxisID=i.yAxisID||a.yAxes[0].id)},getDataset:function(){return this.chart.data.datasets[this.index]},getMeta:function(){return this.chart.getDatasetMeta(this.index)},getScaleForId:function(t){return this.chart.scales[t]},_getValueScaleId:function(){return this.getMeta().yAxisID},_getIndexScaleId:function(){return this.getMeta().xAxisID},_getValueScale:function(){return this.getScaleForId(this._getValueScaleId())},_getIndexScale:function(){return this.getScaleForId(this._getIndexScaleId())},reset:function(){this._update(!0)},destroy:function(){this._data&&nt(this._data,this)},createMetaDataset:function(){var t=this.datasetElementType;return t&&new t({_chart:this.chart,_datasetIndex:this.index})},createMetaData:function(t){var e=this.dataElementType;return e&&new e({_chart:this.chart,_datasetIndex:this.index,_index:t})},addElements:function(){var t,e,n=this.getMeta(),i=this.getDataset().data||[],a=n.data;for(t=0,e=i.length;t<e;++t)a[t]=a[t]||this.createMetaData(t);n.dataset=n.dataset||this.createMetaDataset()},addElementAndReset:function(t){var e=this.createMetaData(t);this.getMeta().data.splice(t,0,e),this.updateElement(e,t,!0)},buildOrUpdateElements:function(){var t,e,n=this,i=n.getDataset(),a=i.data||(i.data=[]);n._data!==a&&(n._data&&nt(n._data,n),a&&Object.isExtensible(a)&&(e=n,(t=a)._chartjs?t._chartjs.listeners.push(e):(Object.defineProperty(t,"_chartjs",{configurable:!0,enumerable:!1,value:{listeners:[e]}}),et.forEach((function(e){var n="onData"+e.charAt(0).toUpperCase()+e.slice(1),i=t[e];Object.defineProperty(t,e,{configurable:!0,enumerable:!1,value:function(){var e=Array.prototype.slice.call(arguments),a=i.apply(this,e);return B.each(t._chartjs.listeners,(function(t){"function"==typeof t[n]&&t[n].apply(t,e)})),a}})})))),n._data=a),n.resyncElements()},_configure:function(){this._config=B.merge(Object.create(null),[this.chart.options.datasets[this._type],this.getDataset()],{merger:function(t,e,n){"_meta"!==t&&"data"!==t&&B._merger(t,e,n)}})},_update:function(t){this._configure(),this._cachedDataOpts=null,this.update(t)},update:B.noop,transition:function(t){for(var e=this.getMeta(),n=e.data||[],i=n.length,a=0;a<i;++a)n[a].transition(t);e.dataset&&e.dataset.transition(t)},draw:function(){var t=this.getMeta(),e=t.data||[],n=e.length,i=0;for(t.dataset&&t.dataset.draw();i<n;++i)e[i].draw()},getStyle:function(t){var e,n=this.getMeta(),i=n.dataset;return this._configure(),i&&void 0===t?e=this._resolveDatasetElementOptions(i||{}):(t=t||0,e=this._resolveDataElementOptions(n.data[t]||{},t)),!1!==e.fill&&null!==e.fill||(e.backgroundColor=e.borderColor),e},_resolveDatasetElementOptions:function(t,e){var n,i,a,r,o=this,s=o.chart,l=o._config,u=t.custom||{},d=s.options.elements[o.datasetElementType.prototype._type]||{},h=o._datasetElementOptions,c={},f={chart:s,dataset:o.getDataset(),datasetIndex:o.index,hover:e};for(n=0,i=h.length;n<i;++n)a=h[n],r=e?"hover"+a.charAt(0).toUpperCase()+a.slice(1):a,c[a]=tt([u[r],l[r],d[r]],f);return c},_resolveDataElementOptions:function(t,e){var n=this,i=t&&t.custom,a=n._cachedDataOpts;if(a&&!i)return a;var r,o,s,l,u=n.chart,d=n._config,h=u.options.elements[n.dataElementType.prototype._type]||{},c=n._dataElementOptions,f={},g={chart:u,dataIndex:e,dataset:n.getDataset(),datasetIndex:n.index},m={cacheable:!i};if(i=i||{},B.isArray(c))for(o=0,s=c.length;o<s;++o)f[l=c[o]]=tt([i[l],d[l],h[l]],g,e,m);else for(o=0,s=(r=Object.keys(c)).length;o<s;++o)f[l=r[o]]=tt([i[l],d[c[l]],d[l],h[l]],g,e,m);return m.cacheable&&(n._cachedDataOpts=Object.freeze(f)),f},removeHoverStyle:function(t){B.merge(t._model,t.$previousStyle||{}),delete t.$previousStyle},setHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],n=t._index,i=t.custom||{},a=t._model,r=B.getHoverColor;t.$previousStyle={backgroundColor:a.backgroundColor,borderColor:a.borderColor,borderWidth:a.borderWidth},a.backgroundColor=tt([i.hoverBackgroundColor,e.hoverBackgroundColor,r(a.backgroundColor)],void 0,n),a.borderColor=tt([i.hoverBorderColor,e.hoverBorderColor,r(a.borderColor)],void 0,n),a.borderWidth=tt([i.hoverBorderWidth,e.hoverBorderWidth,a.borderWidth],void 0,n)},_removeDatasetHoverStyle:function(){var t=this.getMeta().dataset;t&&this.removeHoverStyle(t)},_setDatasetHoverStyle:function(){var t,e,n,i,a,r,o=this.getMeta().dataset,s={};if(o){for(r=o._model,a=this._resolveDatasetElementOptions(o,!0),t=0,e=(i=Object.keys(a)).length;t<e;++t)s[n=i[t]]=r[n],r[n]=a[n];o.$previousStyle=s}},resyncElements:function(){var t=this.getMeta(),e=this.getDataset().data,n=t.data.length,i=e.length;i<n?t.data.splice(i,n-i):i>n&&this.insertElements(n,i-n)},insertElements:function(t,e){for(var n=0;n<e;++n)this.addElementAndReset(t+n)},onDataPush:function(){var t=arguments.length;this.insertElements(this.getDataset().data.length-t,t)},onDataPop:function(){this.getMeta().data.pop()},onDataShift:function(){this.getMeta().data.shift()},onDataSplice:function(t,e){this.getMeta().data.splice(t,e),this.insertElements(t,arguments.length-2)},onDataUnshift:function(){this.insertElements(0,arguments.length)}}),it.extend=B.inherits;var at=it,rt=2*Math.PI;function ot(t,e){var n=e.startAngle,i=e.endAngle,a=e.pixelMargin,r=a/e.outerRadius,o=e.x,s=e.y;t.beginPath(),t.arc(o,s,e.outerRadius,n-r,i+r),e.innerRadius>a?(r=a/e.innerRadius,t.arc(o,s,e.innerRadius-a,i+r,n-r,!0)):t.arc(o,s,a,i+Math.PI/2,n-Math.PI/2),t.closePath(),t.clip()}function st(t,e,n){var i="inner"===e.borderAlign;i?(t.lineWidth=2*e.borderWidth,t.lineJoin="round"):(t.lineWidth=e.borderWidth,t.lineJoin="bevel"),n.fullCircles&&function(t,e,n,i){var a,r=n.endAngle;for(i&&(n.endAngle=n.startAngle+rt,ot(t,n),n.endAngle=r,n.endAngle===n.startAngle&&n.fullCircles&&(n.endAngle+=rt,n.fullCircles--)),t.beginPath(),t.arc(n.x,n.y,n.innerRadius,n.startAngle+rt,n.startAngle,!0),a=0;a<n.fullCircles;++a)t.stroke();for(t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.startAngle+rt),a=0;a<n.fullCircles;++a)t.stroke()}(t,e,n,i),i&&ot(t,n),t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.endAngle),t.arc(n.x,n.y,n.innerRadius,n.endAngle,n.startAngle,!0),t.closePath(),t.stroke()}Y._set("global",{elements:{arc:{backgroundColor:Y.global.defaultColor,borderColor:"#fff",borderWidth:2,borderAlign:"center"}}});var lt=X.extend({_type:"arc",inLabelRange:function(t){var e=this._view;return!!e&&Math.pow(t-e.x,2)<Math.pow(e.radius+e.hoverRadius,2)},inRange:function(t,e){var n=this._view;if(n){for(var i=B.getAngleFromPoint(n,{x:t,y:e}),a=i.angle,r=i.distance,o=n.startAngle,s=n.endAngle;s<o;)s+=rt;for(;a>s;)a-=rt;for(;a<o;)a+=rt;var l=a>=o&&a<=s,u=r>=n.innerRadius&&r<=n.outerRadius;return l&&u}return!1},getCenterPoint:function(){var t=this._view,e=(t.startAngle+t.endAngle)/2,n=(t.innerRadius+t.outerRadius)/2;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},getArea:function(){var t=this._view;return Math.PI*((t.endAngle-t.startAngle)/(2*Math.PI))*(Math.pow(t.outerRadius,2)-Math.pow(t.innerRadius,2))},tooltipPosition:function(){var t=this._view,e=t.startAngle+(t.endAngle-t.startAngle)/2,n=(t.outerRadius-t.innerRadius)/2+t.innerRadius;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},draw:function(){var t,e=this._chart.ctx,n=this._view,i="inner"===n.borderAlign?.33:0,a={x:n.x,y:n.y,innerRadius:n.innerRadius,outerRadius:Math.max(n.outerRadius-i,0),pixelMargin:i,startAngle:n.startAngle,endAngle:n.endAngle,fullCircles:Math.floor(n.circumference/rt)};if(e.save(),e.fillStyle=n.backgroundColor,e.strokeStyle=n.borderColor,a.fullCircles){for(a.endAngle=a.startAngle+rt,e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),t=0;t<a.fullCircles;++t)e.fill();a.endAngle=a.startAngle+n.circumference%rt}e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),e.fill(),n.borderWidth&&st(e,n,a),e.restore()}}),ut=B.valueOrDefault,dt=Y.global.defaultColor;Y._set("global",{elements:{line:{tension:.4,backgroundColor:dt,borderWidth:3,borderColor:dt,borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",capBezierPoints:!0,fill:!0}}});var ht=X.extend({_type:"line",draw:function(){var t,e,n,i=this,a=i._view,r=i._chart.ctx,o=a.spanGaps,s=i._children.slice(),l=Y.global,u=l.elements.line,d=-1,h=i._loop;if(s.length){if(i._loop){for(t=0;t<s.length;++t)if(e=B.previousItem(s,t),!s[t]._view.skip&&e._view.skip){s=s.slice(t).concat(s.slice(0,t)),h=o;break}h&&s.push(s[0])}for(r.save(),r.lineCap=a.borderCapStyle||u.borderCapStyle,r.setLineDash&&r.setLineDash(a.borderDash||u.borderDash),r.lineDashOffset=ut(a.borderDashOffset,u.borderDashOffset),r.lineJoin=a.borderJoinStyle||u.borderJoinStyle,r.lineWidth=ut(a.borderWidth,u.borderWidth),r.strokeStyle=a.borderColor||l.defaultColor,r.beginPath(),(n=s[0]._view).skip||(r.moveTo(n.x,n.y),d=0),t=1;t<s.length;++t)n=s[t]._view,e=-1===d?B.previousItem(s,t):s[d],n.skip||(d!==t-1&&!o||-1===d?r.moveTo(n.x,n.y):B.canvas.lineTo(r,e._view,n),d=t);h&&r.closePath(),r.stroke(),r.restore()}}}),ct=B.valueOrDefault,ft=Y.global.defaultColor;function gt(t){var e=this._view;return!!e&&Math.abs(t-e.x)<e.radius+e.hitRadius}Y._set("global",{elements:{point:{radius:3,pointStyle:"circle",backgroundColor:ft,borderColor:ft,borderWidth:1,hitRadius:1,hoverRadius:4,hoverBorderWidth:1}}});var mt=X.extend({_type:"point",inRange:function(t,e){var n=this._view;return!!n&&Math.pow(t-n.x,2)+Math.pow(e-n.y,2)<Math.pow(n.hitRadius+n.radius,2)},inLabelRange:gt,inXRange:gt,inYRange:function(t){var e=this._view;return!!e&&Math.abs(t-e.y)<e.radius+e.hitRadius},getCenterPoint:function(){var t=this._view;return{x:t.x,y:t.y}},getArea:function(){return Math.PI*Math.pow(this._view.radius,2)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y,padding:t.radius+t.borderWidth}},draw:function(t){var e=this._view,n=this._chart.ctx,i=e.pointStyle,a=e.rotation,r=e.radius,o=e.x,s=e.y,l=Y.global,u=l.defaultColor;e.skip||(void 0===t||B.canvas._isPointInArea(e,t))&&(n.strokeStyle=e.borderColor||u,n.lineWidth=ct(e.borderWidth,l.elements.point.borderWidth),n.fillStyle=e.backgroundColor||u,B.canvas.drawPoint(n,i,r,o,s,a))}}),pt=Y.global.defaultColor;function vt(t){return t&&void 0!==t.width}function bt(t){var e,n,i,a,r;return vt(t)?(r=t.width/2,e=t.x-r,n=t.x+r,i=Math.min(t.y,t.base),a=Math.max(t.y,t.base)):(r=t.height/2,e=Math.min(t.x,t.base),n=Math.max(t.x,t.base),i=t.y-r,a=t.y+r),{left:e,top:i,right:n,bottom:a}}function yt(t,e,n){return t===e?n:t===n?e:t}function xt(t,e,n){var i,a,r,o,s=t.borderWidth,l=function(t){var e=t.borderSkipped,n={};return e?(t.horizontal?t.base>t.x&&(e=yt(e,"left","right")):t.base<t.y&&(e=yt(e,"bottom","top")),n[e]=!0,n):n}(t);return B.isObject(s)?(i=+s.top||0,a=+s.right||0,r=+s.bottom||0,o=+s.left||0):i=a=r=o=+s||0,{t:l.top||i<0?0:i>n?n:i,r:l.right||a<0?0:a>e?e:a,b:l.bottom||r<0?0:r>n?n:r,l:l.left||o<0?0:o>e?e:o}}function _t(t,e,n){var i=null===e,a=null===n,r=!(!t||i&&a)&&bt(t);return r&&(i||e>=r.left&&e<=r.right)&&(a||n>=r.top&&n<=r.bottom)}Y._set("global",{elements:{rectangle:{backgroundColor:pt,borderColor:pt,borderSkipped:"bottom",borderWidth:0}}});var wt=X.extend({_type:"rectangle",draw:function(){var t=this._chart.ctx,e=this._view,n=function(t){var e=bt(t),n=e.right-e.left,i=e.bottom-e.top,a=xt(t,n/2,i/2);return{outer:{x:e.left,y:e.top,w:n,h:i},inner:{x:e.left+a.l,y:e.top+a.t,w:n-a.l-a.r,h:i-a.t-a.b}}}(e),i=n.outer,a=n.inner;t.fillStyle=e.backgroundColor,t.fillRect(i.x,i.y,i.w,i.h),i.w===a.w&&i.h===a.h||(t.save(),t.beginPath(),t.rect(i.x,i.y,i.w,i.h),t.clip(),t.fillStyle=e.borderColor,t.rect(a.x,a.y,a.w,a.h),t.fill("evenodd"),t.restore())},height:function(){var t=this._view;return t.base-t.y},inRange:function(t,e){return _t(this._view,t,e)},inLabelRange:function(t,e){var n=this._view;return vt(n)?_t(n,t,null):_t(n,null,e)},inXRange:function(t){return _t(this._view,t,null)},inYRange:function(t){return _t(this._view,null,t)},getCenterPoint:function(){var t,e,n=this._view;return vt(n)?(t=n.x,e=(n.y+n.base)/2):(t=(n.x+n.base)/2,e=n.y),{x:t,y:e}},getArea:function(){var t=this._view;return vt(t)?t.width*Math.abs(t.y-t.base):t.height*Math.abs(t.x-t.base)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y}}}),kt={},Mt=lt,St=ht,Dt=mt,Ct=wt;kt.Arc=Mt,kt.Line=St,kt.Point=Dt,kt.Rectangle=Ct;var Pt=B._deprecated,Tt=B.valueOrDefault;function Ot(t,e,n){var i,a,r=n.barThickness,o=e.stackCount,s=e.pixels[t],l=B.isNullOrUndef(r)?function(t,e){var n,i,a,r,o=t._length;for(a=1,r=e.length;a<r;++a)o=Math.min(o,Math.abs(e[a]-e[a-1]));for(a=0,r=t.getTicks().length;a<r;++a)i=t.getPixelForTick(a),o=a>0?Math.min(o,Math.abs(i-n)):o,n=i;return o}(e.scale,e.pixels):-1;return B.isNullOrUndef(r)?(i=l*n.categoryPercentage,a=n.barPercentage):(i=r*o,a=1),{chunk:i/o,ratio:a,start:s-i/2}}Y._set("bar",{hover:{mode:"label"},scales:{xAxes:[{type:"category",offset:!0,gridLines:{offsetGridLines:!0}}],yAxes:[{type:"linear"}]}}),Y._set("global",{datasets:{bar:{categoryPercentage:.8,barPercentage:.9}}});var At=at.extend({dataElementType:kt.Rectangle,_dataElementOptions:["backgroundColor","borderColor","borderSkipped","borderWidth","barPercentage","barThickness","categoryPercentage","maxBarThickness","minBarLength"],initialize:function(){var t,e,n=this;at.prototype.initialize.apply(n,arguments),(t=n.getMeta()).stack=n.getDataset().stack,t.bar=!0,e=n._getIndexScale().options,Pt("bar chart",e.barPercentage,"scales.[x/y]Axes.barPercentage","dataset.barPercentage"),Pt("bar chart",e.barThickness,"scales.[x/y]Axes.barThickness","dataset.barThickness"),Pt("bar chart",e.categoryPercentage,"scales.[x/y]Axes.categoryPercentage","dataset.categoryPercentage"),Pt("bar chart",n._getValueScale().options.minBarLength,"scales.[x/y]Axes.minBarLength","dataset.minBarLength"),Pt("bar chart",e.maxBarThickness,"scales.[x/y]Axes.maxBarThickness","dataset.maxBarThickness")},update:function(t){var e,n,i=this.getMeta().data;for(this._ruler=this.getRuler(),e=0,n=i.length;e<n;++e)this.updateElement(i[e],e,t)},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=i.getDataset(),o=i._resolveDataElementOptions(t,e);t._xScale=i.getScaleForId(a.xAxisID),t._yScale=i.getScaleForId(a.yAxisID),t._datasetIndex=i.index,t._index=e,t._model={backgroundColor:o.backgroundColor,borderColor:o.borderColor,borderSkipped:o.borderSkipped,borderWidth:o.borderWidth,datasetLabel:r.label,label:i.chart.data.labels[e]},B.isArray(r.data[e])&&(t._model.borderSkipped=null),i._updateElementGeometry(t,e,n,o),t.pivot()},_updateElementGeometry:function(t,e,n,i){var a=this,r=t._model,o=a._getValueScale(),s=o.getBasePixel(),l=o.isHorizontal(),u=a._ruler||a.getRuler(),d=a.calculateBarValuePixels(a.index,e,i),h=a.calculateBarIndexPixels(a.index,e,u,i);r.horizontal=l,r.base=n?s:d.base,r.x=l?n?s:d.head:h.center,r.y=l?h.center:n?s:d.head,r.height=l?h.size:void 0,r.width=l?void 0:h.size},_getStacks:function(t){var e,n,i=this._getIndexScale(),a=i._getMatchingVisibleMetas(this._type),r=i.options.stacked,o=a.length,s=[];for(e=0;e<o&&(n=a[e],(!1===r||-1===s.indexOf(n.stack)||void 0===r&&void 0===n.stack)&&s.push(n.stack),n.index!==t);++e);return s},getStackCount:function(){return this._getStacks().length},getStackIndex:function(t,e){var n=this._getStacks(t),i=void 0!==e?n.indexOf(e):-1;return-1===i?n.length-1:i},getRuler:function(){var t,e,n=this._getIndexScale(),i=[];for(t=0,e=this.getMeta().data.length;t<e;++t)i.push(n.getPixelForValue(null,t,this.index));return{pixels:i,start:n._startPixel,end:n._endPixel,stackCount:this.getStackCount(),scale:n}},calculateBarValuePixels:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._getValueScale(),c=h.isHorizontal(),f=d.data.datasets,g=h._getMatchingVisibleMetas(this._type),m=h._parseValue(f[t].data[e]),p=n.minBarLength,v=h.options.stacked,b=this.getMeta().stack,y=void 0===m.start?0:m.max>=0&&m.min>=0?m.min:m.max,x=void 0===m.start?m.end:m.max>=0&&m.min>=0?m.max-m.min:m.min-m.max,_=g.length;if(v||void 0===v&&void 0!==b)for(i=0;i<_&&(a=g[i]).index!==t;++i)a.stack===b&&(r=void 0===(u=h._parseValue(f[a.index].data[e])).start?u.end:u.min>=0&&u.max>=0?u.max:u.min,(m.min<0&&r<0||m.max>=0&&r>0)&&(y+=r));return o=h.getPixelForValue(y),l=(s=h.getPixelForValue(y+x))-o,void 0!==p&&Math.abs(l)<p&&(l=p,s=x>=0&&!c||x<0&&c?o-p:o+p),{size:l,base:o,head:s,center:s+l/2}},calculateBarIndexPixels:function(t,e,n,i){var a="flex"===i.barThickness?function(t,e,n){var i,a=e.pixels,r=a[t],o=t>0?a[t-1]:null,s=t<a.length-1?a[t+1]:null,l=n.categoryPercentage;return null===o&&(o=r-(null===s?e.end-e.start:s-r)),null===s&&(s=r+r-o),i=r-(r-Math.min(o,s))/2*l,{chunk:Math.abs(s-o)/2*l/e.stackCount,ratio:n.barPercentage,start:i}}(e,n,i):Ot(e,n,i),r=this.getStackIndex(t,this.getMeta().stack),o=a.start+a.chunk*r+a.chunk/2,s=Math.min(Tt(i.maxBarThickness,1/0),a.chunk*a.ratio);return{base:o-s/2,head:o+s/2,center:o,size:s}},draw:function(){var t=this.chart,e=this._getValueScale(),n=this.getMeta().data,i=this.getDataset(),a=n.length,r=0;for(B.canvas.clipArea(t.ctx,t.chartArea);r<a;++r){var o=e._parseValue(i.data[r]);isNaN(o.min)||isNaN(o.max)||n[r].draw()}B.canvas.unclipArea(t.ctx)},_resolveDataElementOptions:function(){var t=this,e=B.extend({},at.prototype._resolveDataElementOptions.apply(t,arguments)),n=t._getIndexScale().options,i=t._getValueScale().options;return e.barPercentage=Tt(n.barPercentage,e.barPercentage),e.barThickness=Tt(n.barThickness,e.barThickness),e.categoryPercentage=Tt(n.categoryPercentage,e.categoryPercentage),e.maxBarThickness=Tt(n.maxBarThickness,e.maxBarThickness),e.minBarLength=Tt(i.minBarLength,e.minBarLength),e}}),Ft=B.valueOrDefault,It=B.options.resolve;Y._set("bubble",{hover:{mode:"single"},scales:{xAxes:[{type:"linear",position:"bottom",id:"x-axis-0"}],yAxes:[{type:"linear",position:"left",id:"y-axis-0"}]},tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.datasets[t.datasetIndex].label||"",i=e.datasets[t.datasetIndex].data[t.index];return n+": ("+t.xLabel+", "+t.yLabel+", "+i.r+")"}}}});var Lt=at.extend({dataElementType:kt.Point,_dataElementOptions:["backgroundColor","borderColor","borderWidth","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth","hoverRadius","hitRadius","pointStyle","rotation"],update:function(t){var e=this,n=e.getMeta().data;B.each(n,(function(n,i){e.updateElement(n,i,t)}))},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=t.custom||{},o=i.getScaleForId(a.xAxisID),s=i.getScaleForId(a.yAxisID),l=i._resolveDataElementOptions(t,e),u=i.getDataset().data[e],d=i.index,h=n?o.getPixelForDecimal(.5):o.getPixelForValue("object"==typeof u?u:NaN,e,d),c=n?s.getBasePixel():s.getPixelForValue(u,e,d);t._xScale=o,t._yScale=s,t._options=l,t._datasetIndex=d,t._index=e,t._model={backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,hitRadius:l.hitRadius,pointStyle:l.pointStyle,rotation:l.rotation,radius:n?0:l.radius,skip:r.skip||isNaN(h)||isNaN(c),x:h,y:c},t.pivot()},setHoverStyle:function(t){var e=t._model,n=t._options,i=B.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Ft(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Ft(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Ft(n.hoverBorderWidth,n.borderWidth),e.radius=n.radius+n.hoverRadius},_resolveDataElementOptions:function(t,e){var n=this,i=n.chart,a=n.getDataset(),r=t.custom||{},o=a.data[e]||{},s=at.prototype._resolveDataElementOptions.apply(n,arguments),l={chart:i,dataIndex:e,dataset:a,datasetIndex:n.index};return n._cachedDataOpts===s&&(s=B.extend({},s)),s.radius=It([r.radius,o.r,n._config.radius,i.options.elements.point.radius],l,e),s}}),Rt=B.valueOrDefault,Nt=Math.PI,Wt=2*Nt,Yt=Nt/2;Y._set("doughnut",{animation:{animateRotate:!0,animateScale:!1},hover:{mode:"single"},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r]&&(a.data[r].hidden=!a.data[r].hidden);o.update()}},cutoutPercentage:50,rotation:-Yt,circumference:Wt,tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.labels[t.index],i=": "+e.datasets[t.datasetIndex].data[t.index];return B.isArray(n)?(n=n.slice())[0]+=i:n+=i,n}}}});var zt=at.extend({dataElementType:kt.Arc,linkScales:B.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],getRingIndex:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&++e;return e},update:function(t){var e,n,i,a,r=this,o=r.chart,s=o.chartArea,l=o.options,u=1,d=1,h=0,c=0,f=r.getMeta(),g=f.data,m=l.cutoutPercentage/100||0,p=l.circumference,v=r._getRingWeight(r.index);if(p<Wt){var b=l.rotation%Wt,y=(b+=b>=Nt?-Wt:b<-Nt?Wt:0)+p,x=Math.cos(b),_=Math.sin(b),w=Math.cos(y),k=Math.sin(y),M=b<=0&&y>=0||y>=Wt,S=b<=Yt&&y>=Yt||y>=Wt+Yt,D=b<=-Yt&&y>=-Yt||y>=Nt+Yt,C=b===-Nt||y>=Nt?-1:Math.min(x,x*m,w,w*m),P=D?-1:Math.min(_,_*m,k,k*m),T=M?1:Math.max(x,x*m,w,w*m),O=S?1:Math.max(_,_*m,k,k*m);u=(T-C)/2,d=(O-P)/2,h=-(T+C)/2,c=-(O+P)/2}for(i=0,a=g.length;i<a;++i)g[i]._options=r._resolveDataElementOptions(g[i],i);for(o.borderWidth=r.getMaxBorderWidth(),e=(s.right-s.left-o.borderWidth)/u,n=(s.bottom-s.top-o.borderWidth)/d,o.outerRadius=Math.max(Math.min(e,n)/2,0),o.innerRadius=Math.max(o.outerRadius*m,0),o.radiusLength=(o.outerRadius-o.innerRadius)/(r._getVisibleDatasetWeightTotal()||1),o.offsetX=h*o.outerRadius,o.offsetY=c*o.outerRadius,f.total=r.calculateTotal(),r.outerRadius=o.outerRadius-o.radiusLength*r._getRingWeightOffset(r.index),r.innerRadius=Math.max(r.outerRadius-o.radiusLength*v,0),i=0,a=g.length;i<a;++i)r.updateElement(g[i],i,t)},updateElement:function(t,e,n){var i=this,a=i.chart,r=a.chartArea,o=a.options,s=o.animation,l=(r.left+r.right)/2,u=(r.top+r.bottom)/2,d=o.rotation,h=o.rotation,c=i.getDataset(),f=n&&s.animateRotate?0:t.hidden?0:i.calculateCircumference(c.data[e])*(o.circumference/Wt),g=n&&s.animateScale?0:i.innerRadius,m=n&&s.animateScale?0:i.outerRadius,p=t._options||{};B.extend(t,{_datasetIndex:i.index,_index:e,_model:{backgroundColor:p.backgroundColor,borderColor:p.borderColor,borderWidth:p.borderWidth,borderAlign:p.borderAlign,x:l+a.offsetX,y:u+a.offsetY,startAngle:d,endAngle:h,circumference:f,outerRadius:m,innerRadius:g,label:B.valueAtIndexOrDefault(c.label,e,a.data.labels[e])}});var v=t._model;n&&s.animateRotate||(v.startAngle=0===e?o.rotation:i.getMeta().data[e-1]._model.endAngle,v.endAngle=v.startAngle+v.circumference),t.pivot()},calculateTotal:function(){var t,e=this.getDataset(),n=this.getMeta(),i=0;return B.each(n.data,(function(n,a){t=e.data[a],isNaN(t)||n.hidden||(i+=Math.abs(t))})),i},calculateCircumference:function(t){var e=this.getMeta().total;return e>0&&!isNaN(t)?Wt*(Math.abs(t)/e):0},getMaxBorderWidth:function(t){var e,n,i,a,r,o,s,l,u=0,d=this.chart;if(!t)for(e=0,n=d.data.datasets.length;e<n;++e)if(d.isDatasetVisible(e)){t=(i=d.getDatasetMeta(e)).data,e!==this.index&&(r=i.controller);break}if(!t)return 0;for(e=0,n=t.length;e<n;++e)a=t[e],r?(r._configure(),o=r._resolveDataElementOptions(a,e)):o=a._options,"inner"!==o.borderAlign&&(s=o.borderWidth,u=(l=o.hoverBorderWidth)>(u=s>u?s:u)?l:u);return u},setHoverStyle:function(t){var e=t._model,n=t._options,i=B.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=Rt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Rt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Rt(n.hoverBorderWidth,n.borderWidth)},_getRingWeightOffset:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&(e+=this._getRingWeight(n));return e},_getRingWeight:function(t){return Math.max(Rt(this.chart.data.datasets[t].weight,1),0)},_getVisibleDatasetWeightTotal:function(){return this._getRingWeightOffset(this.chart.data.datasets.length)}});Y._set("horizontalBar",{hover:{mode:"index",axis:"y"},scales:{xAxes:[{type:"linear",position:"bottom"}],yAxes:[{type:"category",position:"left",offset:!0,gridLines:{offsetGridLines:!0}}]},elements:{rectangle:{borderSkipped:"left"}},tooltips:{mode:"index",axis:"y"}}),Y._set("global",{datasets:{horizontalBar:{categoryPercentage:.8,barPercentage:.9}}});var Et=At.extend({_getValueScaleId:function(){return this.getMeta().xAxisID},_getIndexScaleId:function(){return this.getMeta().yAxisID}}),Vt=B.valueOrDefault,Ht=B.options.resolve,Bt=B.canvas._isPointInArea;function jt(t,e){var n=t&&t.options.ticks||{},i=n.reverse,a=void 0===n.min?e:0,r=void 0===n.max?e:0;return{start:i?r:a,end:i?a:r}}function Ut(t,e,n){var i=n/2,a=jt(t,i),r=jt(e,i);return{top:r.end,right:a.end,bottom:r.start,left:a.start}}function Gt(t){var e,n,i,a;return B.isObject(t)?(e=t.top,n=t.right,i=t.bottom,a=t.left):e=n=i=a=t,{top:e,right:n,bottom:i,left:a}}Y._set("line",{showLines:!0,spanGaps:!1,hover:{mode:"label"},scales:{xAxes:[{type:"category",id:"x-axis-0"}],yAxes:[{type:"linear",id:"y-axis-0"}]}});var qt=at.extend({datasetElementType:kt.Line,dataElementType:kt.Point,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth","cubicInterpolationMode","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.options,l=i._config,u=i._showLine=Vt(l.showLine,s.showLines);for(i._xScale=i.getScaleForId(a.xAxisID),i._yScale=i.getScaleForId(a.yAxisID),u&&(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=i._yScale,r._datasetIndex=i.index,r._children=o,r._model=i._resolveDatasetElementOptions(r),r.pivot()),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(u&&0!==r._model.tension&&i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i,a,r=this,o=r.getMeta(),s=t.custom||{},l=r.getDataset(),u=r.index,d=l.data[e],h=r._xScale,c=r._yScale,f=o.dataset._model,g=r._resolveDataElementOptions(t,e);i=h.getPixelForValue("object"==typeof d?d:NaN,e,u),a=n?c.getBasePixel():r.calculatePointY(d,e,u),t._xScale=h,t._yScale=c,t._options=g,t._datasetIndex=u,t._index=e,t._model={x:i,y:a,skip:s.skip||isNaN(i)||isNaN(a),radius:g.radius,pointStyle:g.pointStyle,rotation:g.rotation,backgroundColor:g.backgroundColor,borderColor:g.borderColor,borderWidth:g.borderWidth,tension:Vt(s.tension,f?f.tension:0),steppedLine:!!f&&f.steppedLine,hitRadius:g.hitRadius}},_resolveDatasetElementOptions:function(t){var e=this,n=e._config,i=t.custom||{},a=e.chart.options,r=a.elements.line,o=at.prototype._resolveDatasetElementOptions.apply(e,arguments);return o.spanGaps=Vt(n.spanGaps,a.spanGaps),o.tension=Vt(n.lineTension,r.tension),o.steppedLine=Ht([i.steppedLine,n.steppedLine,r.stepped]),o.clip=Gt(Vt(n.clip,Ut(e._xScale,e._yScale,o.borderWidth))),o},calculatePointY:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._yScale,c=0,f=0;if(h.options.stacked){for(s=+h.getRightValue(t),u=(l=d._getSortedVisibleDatasetMetas()).length,i=0;i<u&&(r=l[i]).index!==n;++i)a=d.data.datasets[r.index],"line"===r.type&&r.yAxisID===h.id&&((o=+h.getRightValue(a.data[e]))<0?f+=o||0:c+=o||0);return s<0?h.getPixelForValue(f+s):h.getPixelForValue(c+s)}return h.getPixelForValue(t)},updateBezierControlPoints:function(){var t,e,n,i,a=this.chart,r=this.getMeta(),o=r.dataset._model,s=a.chartArea,l=r.data||[];function u(t,e,n){return Math.max(Math.min(t,n),e)}if(o.spanGaps&&(l=l.filter((function(t){return!t._model.skip}))),"monotone"===o.cubicInterpolationMode)B.splineCurveMonotone(l);else for(t=0,e=l.length;t<e;++t)n=l[t]._model,i=B.splineCurve(B.previousItem(l,t)._model,n,B.nextItem(l,t)._model,o.tension),n.controlPointPreviousX=i.previous.x,n.controlPointPreviousY=i.previous.y,n.controlPointNextX=i.next.x,n.controlPointNextY=i.next.y;if(a.options.elements.line.capBezierPoints)for(t=0,e=l.length;t<e;++t)n=l[t]._model,Bt(n,s)&&(t>0&&Bt(l[t-1]._model,s)&&(n.controlPointPreviousX=u(n.controlPointPreviousX,s.left,s.right),n.controlPointPreviousY=u(n.controlPointPreviousY,s.top,s.bottom)),t<l.length-1&&Bt(l[t+1]._model,s)&&(n.controlPointNextX=u(n.controlPointNextX,s.left,s.right),n.controlPointNextY=u(n.controlPointNextY,s.top,s.bottom)))},draw:function(){var t,e=this.chart,n=this.getMeta(),i=n.data||[],a=e.chartArea,r=e.canvas,o=0,s=i.length;for(this._showLine&&(t=n.dataset._model.clip,B.canvas.clipArea(e.ctx,{left:!1===t.left?0:a.left-t.left,right:!1===t.right?r.width:a.right+t.right,top:!1===t.top?0:a.top-t.top,bottom:!1===t.bottom?r.height:a.bottom+t.bottom}),n.dataset.draw(),B.canvas.unclipArea(e.ctx));o<s;++o)i[o].draw(a)},setHoverStyle:function(t){var e=t._model,n=t._options,i=B.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Vt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Vt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Vt(n.hoverBorderWidth,n.borderWidth),e.radius=Vt(n.hoverRadius,n.radius)}}),Zt=B.options.resolve;Y._set("polarArea",{scale:{type:"radialLinear",angleLines:{display:!1},gridLines:{circular:!0},pointLabels:{display:!1},ticks:{beginAtZero:!0}},animation:{animateRotate:!0,animateScale:!0},startAngle:-.5*Math.PI,legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r].hidden=!a.data[r].hidden;o.update()}},tooltips:{callbacks:{title:function(){return""},label:function(t,e){return e.labels[t.index]+": "+t.yLabel}}}});var $t=at.extend({dataElementType:kt.Arc,linkScales:B.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i,a=this,r=a.getDataset(),o=a.getMeta(),s=a.chart.options.startAngle||0,l=a._starts=[],u=a._angles=[],d=o.data;for(a._updateRadius(),o.count=a.countVisibleElements(),e=0,n=r.data.length;e<n;e++)l[e]=s,i=a._computeAngle(e),u[e]=i,s+=i;for(e=0,n=d.length;e<n;++e)d[e]._options=a._resolveDataElementOptions(d[e],e),a.updateElement(d[e],e,t)},_updateRadius:function(){var t=this,e=t.chart,n=e.chartArea,i=e.options,a=Math.min(n.right-n.left,n.bottom-n.top);e.outerRadius=Math.max(a/2,0),e.innerRadius=Math.max(i.cutoutPercentage?e.outerRadius/100*i.cutoutPercentage:1,0),e.radiusLength=(e.outerRadius-e.innerRadius)/e.getVisibleDatasetCount(),t.outerRadius=e.outerRadius-e.radiusLength*t.index,t.innerRadius=t.outerRadius-e.radiusLength},updateElement:function(t,e,n){var i=this,a=i.chart,r=i.getDataset(),o=a.options,s=o.animation,l=a.scale,u=a.data.labels,d=l.xCenter,h=l.yCenter,c=o.startAngle,f=t.hidden?0:l.getDistanceFromCenterForValue(r.data[e]),g=i._starts[e],m=g+(t.hidden?0:i._angles[e]),p=s.animateScale?0:l.getDistanceFromCenterForValue(r.data[e]),v=t._options||{};B.extend(t,{_datasetIndex:i.index,_index:e,_scale:l,_model:{backgroundColor:v.backgroundColor,borderColor:v.borderColor,borderWidth:v.borderWidth,borderAlign:v.borderAlign,x:d,y:h,innerRadius:0,outerRadius:n?p:f,startAngle:n&&s.animateRotate?c:g,endAngle:n&&s.animateRotate?c:m,label:B.valueAtIndexOrDefault(u,e,u[e])}}),t.pivot()},countVisibleElements:function(){var t=this.getDataset(),e=this.getMeta(),n=0;return B.each(e.data,(function(e,i){isNaN(t.data[i])||e.hidden||n++})),n},setHoverStyle:function(t){var e=t._model,n=t._options,i=B.getHoverColor,a=B.valueOrDefault;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=a(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=a(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=a(n.hoverBorderWidth,n.borderWidth)},_computeAngle:function(t){var e=this,n=this.getMeta().count,i=e.getDataset(),a=e.getMeta();if(isNaN(i.data[t])||a.data[t].hidden)return 0;var r={chart:e.chart,dataIndex:t,dataset:i,datasetIndex:e.index};return Zt([e.chart.options.elements.arc.angle,2*Math.PI/n],r,t)}});Y._set("pie",B.clone(Y.doughnut)),Y._set("pie",{cutoutPercentage:0});var Xt=zt,Kt=B.valueOrDefault;Y._set("radar",{spanGaps:!1,scale:{type:"radialLinear"},elements:{line:{fill:"start",tension:0}}});var Jt=at.extend({datasetElementType:kt.Line,dataElementType:kt.Point,linkScales:B.noop,_datasetElementOptions:["backgroundColor","borderWidth","borderColor","borderCapStyle","borderDash","borderDashOffset","borderJoinStyle","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.scale,l=i._config;for(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=s,r._datasetIndex=i.index,r._children=o,r._loop=!0,r._model=i._resolveDatasetElementOptions(r),r.pivot(),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i=this,a=t.custom||{},r=i.getDataset(),o=i.chart.scale,s=o.getPointPositionForValue(e,r.data[e]),l=i._resolveDataElementOptions(t,e),u=i.getMeta().dataset._model,d=n?o.xCenter:s.x,h=n?o.yCenter:s.y;t._scale=o,t._options=l,t._datasetIndex=i.index,t._index=e,t._model={x:d,y:h,skip:a.skip||isNaN(d)||isNaN(h),radius:l.radius,pointStyle:l.pointStyle,rotation:l.rotation,backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,tension:Kt(a.tension,u?u.tension:0),hitRadius:l.hitRadius}},_resolveDatasetElementOptions:function(){var t=this,e=t._config,n=t.chart.options,i=at.prototype._resolveDatasetElementOptions.apply(t,arguments);return i.spanGaps=Kt(e.spanGaps,n.spanGaps),i.tension=Kt(e.lineTension,n.elements.line.tension),i},updateBezierControlPoints:function(){var t,e,n,i,a=this.getMeta(),r=this.chart.chartArea,o=a.data||[];function s(t,e,n){return Math.max(Math.min(t,n),e)}for(a.dataset._model.spanGaps&&(o=o.filter((function(t){return!t._model.skip}))),t=0,e=o.length;t<e;++t)n=o[t]._model,i=B.splineCurve(B.previousItem(o,t,!0)._model,n,B.nextItem(o,t,!0)._model,n.tension),n.controlPointPreviousX=s(i.previous.x,r.left,r.right),n.controlPointPreviousY=s(i.previous.y,r.top,r.bottom),n.controlPointNextX=s(i.next.x,r.left,r.right),n.controlPointNextY=s(i.next.y,r.top,r.bottom)},setHoverStyle:function(t){var e=t._model,n=t._options,i=B.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Kt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Kt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Kt(n.hoverBorderWidth,n.borderWidth),e.radius=Kt(n.hoverRadius,n.radius)}});Y._set("scatter",{hover:{mode:"single"},scales:{xAxes:[{id:"x-axis-1",type:"linear",position:"bottom"}],yAxes:[{id:"y-axis-1",type:"linear",position:"left"}]},tooltips:{callbacks:{title:function(){return""},label:function(t){return"("+t.xLabel+", "+t.yLabel+")"}}}}),Y._set("global",{datasets:{scatter:{showLine:!1}}});var Qt={bar:At,bubble:Lt,doughnut:zt,horizontalBar:Et,line:qt,polarArea:$t,pie:Xt,radar:Jt,scatter:qt};function te(t,e){return t.native?{x:t.x,y:t.y}:B.getRelativePosition(t,e)}function ee(t,e){var n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas();for(i=0,r=l.length;i<r;++i)for(a=0,o=(n=l[i].data).length;a<o;++a)(s=n[a])._view.skip||e(s)}function ne(t,e){var n=[];return ee(t,(function(t){t.inRange(e.x,e.y)&&n.push(t)})),n}function ie(t,e,n,i){var a=Number.POSITIVE_INFINITY,r=[];return ee(t,(function(t){if(!n||t.inRange(e.x,e.y)){var o=t.getCenterPoint(),s=i(e,o);s<a?(r=[t],a=s):s===a&&r.push(t)}})),r}function ae(t){var e=-1!==t.indexOf("x"),n=-1!==t.indexOf("y");return function(t,i){var a=e?Math.abs(t.x-i.x):0,r=n?Math.abs(t.y-i.y):0;return Math.sqrt(Math.pow(a,2)+Math.pow(r,2))}}function re(t,e,n){var i=te(e,t);n.axis=n.axis||"x";var a=ae(n.axis),r=n.intersect?ne(t,i):ie(t,i,!1,a),o=[];return r.length?(t._getSortedVisibleDatasetMetas().forEach((function(t){var e=t.data[r[0]._index];e&&!e._view.skip&&o.push(e)})),o):[]}var oe={modes:{single:function(t,e){var n=te(e,t),i=[];return ee(t,(function(t){if(t.inRange(n.x,n.y))return i.push(t),i})),i.slice(0,1)},label:re,index:re,dataset:function(t,e,n){var i=te(e,t);n.axis=n.axis||"xy";var a=ae(n.axis),r=n.intersect?ne(t,i):ie(t,i,!1,a);return r.length>0&&(r=t.getDatasetMeta(r[0]._datasetIndex).data),r},"x-axis":function(t,e){return re(t,e,{intersect:!1})},point:function(t,e){return ne(t,te(e,t))},nearest:function(t,e,n){var i=te(e,t);n.axis=n.axis||"xy";var a=ae(n.axis);return ie(t,i,n.intersect,a)},x:function(t,e,n){var i=te(e,t),a=[],r=!1;return ee(t,(function(t){t.inXRange(i.x)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a},y:function(t,e,n){var i=te(e,t),a=[],r=!1;return ee(t,(function(t){t.inYRange(i.y)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a}}},se=B.extend;function le(t,e){return B.where(t,(function(t){return t.pos===e}))}function ue(t,e){return t.sort((function(t,n){var i=e?n:t,a=e?t:n;return i.weight===a.weight?i.index-a.index:i.weight-a.weight}))}function de(t,e,n,i){return Math.max(t[n],e[n])+Math.max(t[i],e[i])}function he(t,e,n){var i,a,r=n.box,o=t.maxPadding;if(n.size&&(t[n.pos]-=n.size),n.size=n.horizontal?r.height:r.width,t[n.pos]+=n.size,r.getPadding){var s=r.getPadding();o.top=Math.max(o.top,s.top),o.left=Math.max(o.left,s.left),o.bottom=Math.max(o.bottom,s.bottom),o.right=Math.max(o.right,s.right)}if(i=e.outerWidth-de(o,t,"left","right"),a=e.outerHeight-de(o,t,"top","bottom"),i!==t.w||a!==t.h){t.w=i,t.h=a;var l=n.horizontal?[i,t.w]:[a,t.h];return!(l[0]===l[1]||isNaN(l[0])&&isNaN(l[1]))}}function ce(t,e){var n=e.maxPadding;function i(t){var i={left:0,top:0,right:0,bottom:0};return t.forEach((function(t){i[t]=Math.max(e[t],n[t])})),i}return i(t?["left","right"]:["top","bottom"])}function fe(t,e,n){var i,a,r,o,s,l,u=[];for(i=0,a=t.length;i<a;++i)(o=(r=t[i]).box).update(r.width||e.w,r.height||e.h,ce(r.horizontal,e)),he(e,n,r)&&(l=!0,u.length&&(s=!0)),o.fullWidth||u.push(r);return s&&fe(u,e,n)||l}function ge(t,e,n){var i,a,r,o,s=n.padding,l=e.x,u=e.y;for(i=0,a=t.length;i<a;++i)o=(r=t[i]).box,r.horizontal?(o.left=o.fullWidth?s.left:e.left,o.right=o.fullWidth?n.outerWidth-s.right:e.left+e.w,o.top=u,o.bottom=u+o.height,o.width=o.right-o.left,u=o.bottom):(o.left=l,o.right=l+o.width,o.top=e.top,o.bottom=e.top+e.h,o.height=o.bottom-o.top,l=o.right);e.x=l,e.y=u}Y._set("global",{layout:{padding:{top:0,right:0,bottom:0,left:0}}});var me,pe={defaults:{},addBox:function(t,e){t.boxes||(t.boxes=[]),e.fullWidth=e.fullWidth||!1,e.position=e.position||"top",e.weight=e.weight||0,e._layers=e._layers||function(){return[{z:0,draw:function(){e.draw.apply(e,arguments)}}]},t.boxes.push(e)},removeBox:function(t,e){var n=t.boxes?t.boxes.indexOf(e):-1;-1!==n&&t.boxes.splice(n,1)},configure:function(t,e,n){for(var i,a=["fullWidth","position","weight"],r=a.length,o=0;o<r;++o)i=a[o],n.hasOwnProperty(i)&&(e[i]=n[i])},update:function(t,e,n){if(t){var i=t.options.layout||{},a=B.options.toPadding(i.padding),r=e-a.width,o=n-a.height,s=function(t){var e=function(t){var e,n,i,a=[];for(e=0,n=(t||[]).length;e<n;++e)i=t[e],a.push({index:e,box:i,pos:i.position,horizontal:i.isHorizontal(),weight:i.weight});return a}(t),n=ue(le(e,"left"),!0),i=ue(le(e,"right")),a=ue(le(e,"top"),!0),r=ue(le(e,"bottom"));return{leftAndTop:n.concat(a),rightAndBottom:i.concat(r),chartArea:le(e,"chartArea"),vertical:n.concat(i),horizontal:a.concat(r)}}(t.boxes),l=s.vertical,u=s.horizontal,d=Object.freeze({outerWidth:e,outerHeight:n,padding:a,availableWidth:r,vBoxMaxWidth:r/2/l.length,hBoxMaxHeight:o/2}),h=se({maxPadding:se({},a),w:r,h:o,x:a.left,y:a.top},a);!function(t,e){var n,i,a;for(n=0,i=t.length;n<i;++n)(a=t[n]).width=a.horizontal?a.box.fullWidth&&e.availableWidth:e.vBoxMaxWidth,a.height=a.horizontal&&e.hBoxMaxHeight}(l.concat(u),d),fe(l,h,d),fe(u,h,d)&&fe(l,h,d),function(t){var e=t.maxPadding;function n(n){var i=Math.max(e[n]-t[n],0);return t[n]+=i,i}t.y+=n("top"),t.x+=n("left"),n("right"),n("bottom")}(h),ge(s.leftAndTop,h,d),h.x+=h.w,h.y+=h.h,ge(s.rightAndBottom,h,d),t.chartArea={left:h.left,top:h.top,right:h.left+h.w,bottom:h.top+h.h},B.each(s.chartArea,(function(e){var n=e.box;se(n,t.chartArea),n.update(h.w,h.h)}))}}},ve=(me=Object.freeze({__proto__:null,default:"@keyframes chartjs-render-animation{from{opacity:.99}to{opacity:1}}.chartjs-render-monitor{animation:chartjs-render-animation 1ms}.chartjs-size-monitor,.chartjs-size-monitor-expand,.chartjs-size-monitor-shrink{position:absolute;direction:ltr;left:0;top:0;right:0;bottom:0;overflow:hidden;pointer-events:none;visibility:hidden;z-index:-1}.chartjs-size-monitor-expand>div{position:absolute;width:1000000px;height:1000000px;left:0;top:0}.chartjs-size-monitor-shrink>div{position:absolute;width:200%;height:200%;left:0;top:0}"}))&&me.default||me,be="$chartjs",ye="chartjs-size-monitor",xe="chartjs-render-monitor",_e="chartjs-render-animation",we=["animationstart","webkitAnimationStart"],ke={touchstart:"mousedown",touchmove:"mousemove",touchend:"mouseup",pointerenter:"mouseenter",pointerdown:"mousedown",pointermove:"mousemove",pointerup:"mouseup",pointerleave:"mouseout",pointerout:"mouseout"};function Me(t,e){var n=B.getStyle(t,e),i=n&&n.match(/^(\d+)(\.\d+)?px$/);return i?Number(i[1]):void 0}var Se=!!function(){var t=!1;try{var e=Object.defineProperty({},"passive",{get:function(){t=!0}});window.addEventListener("e",null,e)}catch(t){}return t}()&&{passive:!0};function De(t,e,n){t.addEventListener(e,n,Se)}function Ce(t,e,n){t.removeEventListener(e,n,Se)}function Pe(t,e,n,i,a){return{type:t,chart:e,native:a||null,x:void 0!==n?n:null,y:void 0!==i?i:null}}function Te(t){var e=document.createElement("div");return e.className=t||"",e}function Oe(t,e,n){var i,a,r,o,s=t[be]||(t[be]={}),l=s.resizer=function(t){var e=Te(ye),n=Te(ye+"-expand"),i=Te(ye+"-shrink");n.appendChild(Te()),i.appendChild(Te()),e.appendChild(n),e.appendChild(i),e._reset=function(){n.scrollLeft=1e6,n.scrollTop=1e6,i.scrollLeft=1e6,i.scrollTop=1e6};var a=function(){e._reset(),t()};return De(n,"scroll",a.bind(n,"expand")),De(i,"scroll",a.bind(i,"shrink")),e}((i=function(){if(s.resizer){var i=n.options.maintainAspectRatio&&t.parentNode,a=i?i.clientWidth:0;e(Pe("resize",n)),i&&i.clientWidth<a&&n.canvas&&e(Pe("resize",n))}},r=!1,o=[],function(){o=Array.prototype.slice.call(arguments),a=a||this,r||(r=!0,B.requestAnimFrame.call(window,(function(){r=!1,i.apply(a,o)})))}));!function(t,e){var n=t[be]||(t[be]={}),i=n.renderProxy=function(t){t.animationName===_e&&e()};B.each(we,(function(e){De(t,e,i)})),n.reflow=!!t.offsetParent,t.classList.add(xe)}(t,(function(){if(s.resizer){var e=t.parentNode;e&&e!==l.parentNode&&e.insertBefore(l,e.firstChild),l._reset()}}))}function Ae(t){var e=t[be]||{},n=e.resizer;delete e.resizer,function(t){var e=t[be]||{},n=e.renderProxy;n&&(B.each(we,(function(e){Ce(t,e,n)})),delete e.renderProxy),t.classList.remove(xe)}(t),n&&n.parentNode&&n.parentNode.removeChild(n)}var Fe={disableCSSInjection:!1,_enabled:"undefined"!=typeof window&&"undefined"!=typeof document,_ensureLoaded:function(t){if(!this.disableCSSInjection){var e=t.getRootNode?t.getRootNode():document;!function(t,e){var n=t[be]||(t[be]={});if(!n.containsStyles){n.containsStyles=!0,e="/* Chart.js */\n"+e;var i=document.createElement("style");i.setAttribute("type","text/css"),i.appendChild(document.createTextNode(e)),t.appendChild(i)}}(e.host?e:document.head,ve)}},acquireContext:function(t,e){"string"==typeof t?t=document.getElementById(t):t.length&&(t=t[0]),t&&t.canvas&&(t=t.canvas);var n=t&&t.getContext&&t.getContext("2d");return n&&n.canvas===t?(this._ensureLoaded(t),function(t,e){var n=t.style,i=t.getAttribute("height"),a=t.getAttribute("width");if(t[be]={initial:{height:i,width:a,style:{display:n.display,height:n.height,width:n.width}}},n.display=n.display||"block",null===a||""===a){var r=Me(t,"width");void 0!==r&&(t.width=r)}if(null===i||""===i)if(""===t.style.height)t.height=t.width/(e.options.aspectRatio||2);else{var o=Me(t,"height");void 0!==r&&(t.height=o)}}(t,e),n):null},releaseContext:function(t){var e=t.canvas;if(e[be]){var n=e[be].initial;["height","width"].forEach((function(t){var i=n[t];B.isNullOrUndef(i)?e.removeAttribute(t):e.setAttribute(t,i)})),B.each(n.style||{},(function(t,n){e.style[n]=t})),e.width=e.width,delete e[be]}},addEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=n[be]||(n[be]={});De(i,e,(a.proxies||(a.proxies={}))[t.id+"_"+e]=function(e){n(function(t,e){var n=ke[t.type]||t.type,i=B.getRelativePosition(t,e);return Pe(n,e,i.x,i.y,t)}(e,t))})}else Oe(i,n,t)},removeEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=((n[be]||{}).proxies||{})[t.id+"_"+e];a&&Ce(i,e,a)}else Ae(i)}};B.addEvent=De,B.removeEvent=Ce;var Ie=Fe._enabled?Fe:{acquireContext:function(t){return t&&t.canvas&&(t=t.canvas),t&&t.getContext("2d")||null}},Le=B.extend({initialize:function(){},acquireContext:function(){},releaseContext:function(){},addEventListener:function(){},removeEventListener:function(){}},Ie);Y._set("global",{plugins:{}});var Re={_plugins:[],_cacheId:0,register:function(t){var e=this._plugins;[].concat(t).forEach((function(t){-1===e.indexOf(t)&&e.push(t)})),this._cacheId++},unregister:function(t){var e=this._plugins;[].concat(t).forEach((function(t){var n=e.indexOf(t);-1!==n&&e.splice(n,1)})),this._cacheId++},clear:function(){this._plugins=[],this._cacheId++},count:function(){return this._plugins.length},getAll:function(){return this._plugins},notify:function(t,e,n){var i,a,r,o,s,l=this.descriptors(t),u=l.length;for(i=0;i<u;++i)if("function"==typeof(s=(r=(a=l[i]).plugin)[e])&&((o=[t].concat(n||[])).push(a.options),!1===s.apply(r,o)))return!1;return!0},descriptors:function(t){var e=t.$plugins||(t.$plugins={});if(e.id===this._cacheId)return e.descriptors;var n=[],i=[],a=t&&t.config||{},r=a.options&&a.options.plugins||{};return this._plugins.concat(a.plugins||[]).forEach((function(t){if(-1===n.indexOf(t)){var e=t.id,a=r[e];!1!==a&&(!0===a&&(a=B.clone(Y.global.plugins[e])),n.push(t),i.push({plugin:t,options:a||{}}))}})),e.descriptors=i,e.id=this._cacheId,i},_invalidate:function(t){delete t.$plugins}},Ne={constructors:{},defaults:{},registerScaleType:function(t,e,n){this.constructors[t]=e,this.defaults[t]=B.clone(n)},getScaleConstructor:function(t){return this.constructors.hasOwnProperty(t)?this.constructors[t]:void 0},getScaleDefaults:function(t){return this.defaults.hasOwnProperty(t)?B.merge(Object.create(null),[Y.scale,this.defaults[t]]):{}},updateScaleDefaults:function(t,e){this.defaults.hasOwnProperty(t)&&(this.defaults[t]=B.extend(this.defaults[t],e))},addScalesToLayout:function(t){B.each(t.scales,(function(e){e.fullWidth=e.options.fullWidth,e.position=e.options.position,e.weight=e.options.weight,pe.addBox(t,e)}))}},We=B.valueOrDefault,Ye=B.rtl.getRtlAdapter;Y._set("global",{tooltips:{enabled:!0,custom:null,mode:"nearest",position:"average",intersect:!0,backgroundColor:"rgba(0,0,0,0.8)",titleFontStyle:"bold",titleSpacing:2,titleMarginBottom:6,titleFontColor:"#fff",titleAlign:"left",bodySpacing:2,bodyFontColor:"#fff",bodyAlign:"left",footerFontStyle:"bold",footerSpacing:2,footerMarginTop:6,footerFontColor:"#fff",footerAlign:"left",yPadding:6,xPadding:6,caretPadding:2,caretSize:5,cornerRadius:6,multiKeyBackground:"#fff",displayColors:!0,borderColor:"rgba(0,0,0,0)",borderWidth:0,callbacks:{beforeTitle:B.noop,title:function(t,e){var n="",i=e.labels,a=i?i.length:0;if(t.length>0){var r=t[0];r.label?n=r.label:r.xLabel?n=r.xLabel:a>0&&r.index<a&&(n=i[r.index])}return n},afterTitle:B.noop,beforeBody:B.noop,beforeLabel:B.noop,label:function(t,e){var n=e.datasets[t.datasetIndex].label||"";return n&&(n+=": "),B.isNullOrUndef(t.value)?n+=t.yLabel:n+=t.value,n},labelColor:function(t,e){var n=e.getDatasetMeta(t.datasetIndex).data[t.index]._view;return{borderColor:n.borderColor,backgroundColor:n.backgroundColor}},labelTextColor:function(){return this._options.bodyFontColor},afterLabel:B.noop,afterBody:B.noop,beforeFooter:B.noop,footer:B.noop,afterFooter:B.noop}}});var ze={average:function(t){if(!t.length)return!1;var e,n,i=0,a=0,r=0;for(e=0,n=t.length;e<n;++e){var o=t[e];if(o&&o.hasValue()){var s=o.tooltipPosition();i+=s.x,a+=s.y,++r}}return{x:i/r,y:a/r}},nearest:function(t,e){var n,i,a,r=e.x,o=e.y,s=Number.POSITIVE_INFINITY;for(n=0,i=t.length;n<i;++n){var l=t[n];if(l&&l.hasValue()){var u=l.getCenterPoint(),d=B.distanceBetweenPoints(e,u);d<s&&(s=d,a=l)}}if(a){var h=a.tooltipPosition();r=h.x,o=h.y}return{x:r,y:o}}};function Ee(t,e){return e&&(B.isArray(e)?Array.prototype.push.apply(t,e):t.push(e)),t}function Ve(t){return("string"==typeof t||t instanceof String)&&t.indexOf("\n")>-1?t.split("\n"):t}function He(t){var e=Y.global;return{xPadding:t.xPadding,yPadding:t.yPadding,xAlign:t.xAlign,yAlign:t.yAlign,rtl:t.rtl,textDirection:t.textDirection,bodyFontColor:t.bodyFontColor,_bodyFontFamily:We(t.bodyFontFamily,e.defaultFontFamily),_bodyFontStyle:We(t.bodyFontStyle,e.defaultFontStyle),_bodyAlign:t.bodyAlign,bodyFontSize:We(t.bodyFontSize,e.defaultFontSize),bodySpacing:t.bodySpacing,titleFontColor:t.titleFontColor,_titleFontFamily:We(t.titleFontFamily,e.defaultFontFamily),_titleFontStyle:We(t.titleFontStyle,e.defaultFontStyle),titleFontSize:We(t.titleFontSize,e.defaultFontSize),_titleAlign:t.titleAlign,titleSpacing:t.titleSpacing,titleMarginBottom:t.titleMarginBottom,footerFontColor:t.footerFontColor,_footerFontFamily:We(t.footerFontFamily,e.defaultFontFamily),_footerFontStyle:We(t.footerFontStyle,e.defaultFontStyle),footerFontSize:We(t.footerFontSize,e.defaultFontSize),_footerAlign:t.footerAlign,footerSpacing:t.footerSpacing,footerMarginTop:t.footerMarginTop,caretSize:t.caretSize,cornerRadius:t.cornerRadius,backgroundColor:t.backgroundColor,opacity:0,legendColorBackground:t.multiKeyBackground,displayColors:t.displayColors,borderColor:t.borderColor,borderWidth:t.borderWidth}}function Be(t,e){return"center"===e?t.x+t.width/2:"right"===e?t.x+t.width-t.xPadding:t.x+t.xPadding}function je(t){return Ee([],Ve(t))}var Ue=X.extend({initialize:function(){this._model=He(this._options),this._lastActive=[]},getTitle:function(){var t=this,e=t._options,n=e.callbacks,i=n.beforeTitle.apply(t,arguments),a=n.title.apply(t,arguments),r=n.afterTitle.apply(t,arguments),o=[];return o=Ee(o,Ve(i)),o=Ee(o,Ve(a)),o=Ee(o,Ve(r))},getBeforeBody:function(){return je(this._options.callbacks.beforeBody.apply(this,arguments))},getBody:function(t,e){var n=this,i=n._options.callbacks,a=[];return B.each(t,(function(t){var r={before:[],lines:[],after:[]};Ee(r.before,Ve(i.beforeLabel.call(n,t,e))),Ee(r.lines,i.label.call(n,t,e)),Ee(r.after,Ve(i.afterLabel.call(n,t,e))),a.push(r)})),a},getAfterBody:function(){return je(this._options.callbacks.afterBody.apply(this,arguments))},getFooter:function(){var t=this,e=t._options.callbacks,n=e.beforeFooter.apply(t,arguments),i=e.footer.apply(t,arguments),a=e.afterFooter.apply(t,arguments),r=[];return r=Ee(r,Ve(n)),r=Ee(r,Ve(i)),r=Ee(r,Ve(a))},update:function(t){var e,n,i,a,r,o,s,l,u,d,h=this,c=h._options,f=h._model,g=h._model=He(c),m=h._active,p=h._data,v={xAlign:f.xAlign,yAlign:f.yAlign},b={x:f.x,y:f.y},y={width:f.width,height:f.height},x={x:f.caretX,y:f.caretY};if(m.length){g.opacity=1;var _=[],w=[];x=ze[c.position].call(h,m,h._eventPosition);var k=[];for(e=0,n=m.length;e<n;++e)k.push((i=m[e],a=void 0,r=void 0,o=void 0,s=void 0,l=void 0,u=void 0,d=void 0,a=i._xScale,r=i._yScale||i._scale,o=i._index,s=i._datasetIndex,l=i._chart.getDatasetMeta(s).controller,u=l._getIndexScale(),d=l._getValueScale(),{xLabel:a?a.getLabelForIndex(o,s):"",yLabel:r?r.getLabelForIndex(o,s):"",label:u?""+u.getLabelForIndex(o,s):"",value:d?""+d.getLabelForIndex(o,s):"",index:o,datasetIndex:s,x:i._model.x,y:i._model.y}));c.filter&&(k=k.filter((function(t){return c.filter(t,p)}))),c.itemSort&&(k=k.sort((function(t,e){return c.itemSort(t,e,p)}))),B.each(k,(function(t){_.push(c.callbacks.labelColor.call(h,t,h._chart)),w.push(c.callbacks.labelTextColor.call(h,t,h._chart))})),g.title=h.getTitle(k,p),g.beforeBody=h.getBeforeBody(k,p),g.body=h.getBody(k,p),g.afterBody=h.getAfterBody(k,p),g.footer=h.getFooter(k,p),g.x=x.x,g.y=x.y,g.caretPadding=c.caretPadding,g.labelColors=_,g.labelTextColors=w,g.dataPoints=k,y=function(t,e){var n=t._chart.ctx,i=2*e.yPadding,a=0,r=e.body,o=r.reduce((function(t,e){return t+e.before.length+e.lines.length+e.after.length}),0);o+=e.beforeBody.length+e.afterBody.length;var s=e.title.length,l=e.footer.length,u=e.titleFontSize,d=e.bodyFontSize,h=e.footerFontSize;i+=s*u,i+=s?(s-1)*e.titleSpacing:0,i+=s?e.titleMarginBottom:0,i+=o*d,i+=o?(o-1)*e.bodySpacing:0,i+=l?e.footerMarginTop:0,i+=l*h,i+=l?(l-1)*e.footerSpacing:0;var c=0,f=function(t){a=Math.max(a,n.measureText(t).width+c)};return n.font=B.fontString(u,e._titleFontStyle,e._titleFontFamily),B.each(e.title,f),n.font=B.fontString(d,e._bodyFontStyle,e._bodyFontFamily),B.each(e.beforeBody.concat(e.afterBody),f),c=e.displayColors?d+2:0,B.each(r,(function(t){B.each(t.before,f),B.each(t.lines,f),B.each(t.after,f)})),c=0,n.font=B.fontString(h,e._footerFontStyle,e._footerFontFamily),B.each(e.footer,f),{width:a+=2*e.xPadding,height:i}}(this,g),b=function(t,e,n,i){var a=t.x,r=t.y,o=t.caretSize,s=t.caretPadding,l=t.cornerRadius,u=n.xAlign,d=n.yAlign,h=o+s,c=l+s;return"right"===u?a-=e.width:"center"===u&&((a-=e.width/2)+e.width>i.width&&(a=i.width-e.width),a<0&&(a=0)),"top"===d?r+=h:r-="bottom"===d?e.height+h:e.height/2,"center"===d?"left"===u?a+=h:"right"===u&&(a-=h):"left"===u?a-=c:"right"===u&&(a+=c),{x:a,y:r}}(g,y,v=function(t,e){var n,i,a,r,o,s=t._model,l=t._chart,u=t._chart.chartArea,d="center",h="center";s.y<e.height?h="top":s.y>l.height-e.height&&(h="bottom");var c=(u.left+u.right)/2,f=(u.top+u.bottom)/2;"center"===h?(n=function(t){return t<=c},i=function(t){return t>c}):(n=function(t){return t<=e.width/2},i=function(t){return t>=l.width-e.width/2}),a=function(t){return t+e.width+s.caretSize+s.caretPadding>l.width},r=function(t){return t-e.width-s.caretSize-s.caretPadding<0},o=function(t){return t<=f?"top":"bottom"},n(s.x)?(d="left",a(s.x)&&(d="center",h=o(s.y))):i(s.x)&&(d="right",r(s.x)&&(d="center",h=o(s.y)));var g=t._options;return{xAlign:g.xAlign?g.xAlign:d,yAlign:g.yAlign?g.yAlign:h}}(this,y),h._chart)}else g.opacity=0;return g.xAlign=v.xAlign,g.yAlign=v.yAlign,g.x=b.x,g.y=b.y,g.width=y.width,g.height=y.height,g.caretX=x.x,g.caretY=x.y,h._model=g,t&&c.custom&&c.custom.call(h,g),h},drawCaret:function(t,e){var n=this._chart.ctx,i=this._view,a=this.getCaretPosition(t,e,i);n.lineTo(a.x1,a.y1),n.lineTo(a.x2,a.y2),n.lineTo(a.x3,a.y3)},getCaretPosition:function(t,e,n){var i,a,r,o,s,l,u=n.caretSize,d=n.cornerRadius,h=n.xAlign,c=n.yAlign,f=t.x,g=t.y,m=e.width,p=e.height;if("center"===c)s=g+p/2,"left"===h?(a=(i=f)-u,r=i,o=s+u,l=s-u):(a=(i=f+m)+u,r=i,o=s-u,l=s+u);else if("left"===h?(i=(a=f+d+u)-u,r=a+u):"right"===h?(i=(a=f+m-d-u)-u,r=a+u):(i=(a=n.caretX)-u,r=a+u),"top"===c)s=(o=g)-u,l=o;else{s=(o=g+p)+u,l=o;var v=r;r=i,i=v}return{x1:i,x2:a,x3:r,y1:o,y2:s,y3:l}},drawTitle:function(t,e,n){var i,a,r,o=e.title,s=o.length;if(s){var l=Ye(e.rtl,e.x,e.width);for(t.x=Be(e,e._titleAlign),n.textAlign=l.textAlign(e._titleAlign),n.textBaseline="middle",i=e.titleFontSize,a=e.titleSpacing,n.fillStyle=e.titleFontColor,n.font=B.fontString(i,e._titleFontStyle,e._titleFontFamily),r=0;r<s;++r)n.fillText(o[r],l.x(t.x),t.y+i/2),t.y+=i+a,r+1===s&&(t.y+=e.titleMarginBottom-a)}},drawBody:function(t,e,n){var i,a,r,o,s,l,u,d,h=e.bodyFontSize,c=e.bodySpacing,f=e._bodyAlign,g=e.body,m=e.displayColors,p=0,v=m?Be(e,"left"):0,b=Ye(e.rtl,e.x,e.width),y=function(e){n.fillText(e,b.x(t.x+p),t.y+h/2),t.y+=h+c},x=b.textAlign(f);for(n.textAlign=f,n.textBaseline="middle",n.font=B.fontString(h,e._bodyFontStyle,e._bodyFontFamily),t.x=Be(e,x),n.fillStyle=e.bodyFontColor,B.each(e.beforeBody,y),p=m&&"right"!==x?"center"===f?h/2+1:h+2:0,s=0,u=g.length;s<u;++s){for(i=g[s],a=e.labelTextColors[s],r=e.labelColors[s],n.fillStyle=a,B.each(i.before,y),l=0,d=(o=i.lines).length;l<d;++l){if(m){var _=b.x(v);n.fillStyle=e.legendColorBackground,n.fillRect(b.leftForLtr(_,h),t.y,h,h),n.lineWidth=1,n.strokeStyle=r.borderColor,n.strokeRect(b.leftForLtr(_,h),t.y,h,h),n.fillStyle=r.backgroundColor,n.fillRect(b.leftForLtr(b.xPlus(_,1),h-2),t.y+1,h-2,h-2),n.fillStyle=a}y(o[l])}B.each(i.after,y)}p=0,B.each(e.afterBody,y),t.y-=c},drawFooter:function(t,e,n){var i,a,r=e.footer,o=r.length;if(o){var s=Ye(e.rtl,e.x,e.width);for(t.x=Be(e,e._footerAlign),t.y+=e.footerMarginTop,n.textAlign=s.textAlign(e._footerAlign),n.textBaseline="middle",i=e.footerFontSize,n.fillStyle=e.footerFontColor,n.font=B.fontString(i,e._footerFontStyle,e._footerFontFamily),a=0;a<o;++a)n.fillText(r[a],s.x(t.x),t.y+i/2),t.y+=i+e.footerSpacing}},drawBackground:function(t,e,n,i){n.fillStyle=e.backgroundColor,n.strokeStyle=e.borderColor,n.lineWidth=e.borderWidth;var a=e.xAlign,r=e.yAlign,o=t.x,s=t.y,l=i.width,u=i.height,d=e.cornerRadius;n.beginPath(),n.moveTo(o+d,s),"top"===r&&this.drawCaret(t,i),n.lineTo(o+l-d,s),n.quadraticCurveTo(o+l,s,o+l,s+d),"center"===r&&"right"===a&&this.drawCaret(t,i),n.lineTo(o+l,s+u-d),n.quadraticCurveTo(o+l,s+u,o+l-d,s+u),"bottom"===r&&this.drawCaret(t,i),n.lineTo(o+d,s+u),n.quadraticCurveTo(o,s+u,o,s+u-d),"center"===r&&"left"===a&&this.drawCaret(t,i),n.lineTo(o,s+d),n.quadraticCurveTo(o,s,o+d,s),n.closePath(),n.fill(),e.borderWidth>0&&n.stroke()},draw:function(){var t=this._chart.ctx,e=this._view;if(0!==e.opacity){var n={width:e.width,height:e.height},i={x:e.x,y:e.y},a=Math.abs(e.opacity<.001)?0:e.opacity,r=e.title.length||e.beforeBody.length||e.body.length||e.afterBody.length||e.footer.length;this._options.enabled&&r&&(t.save(),t.globalAlpha=a,this.drawBackground(i,e,t,n),i.y+=e.yPadding,B.rtl.overrideTextDirection(t,e.textDirection),this.drawTitle(i,e,t),this.drawBody(i,e,t),this.drawFooter(i,e,t),B.rtl.restoreTextDirection(t,e.textDirection),t.restore())}},handleEvent:function(t){var e,n=this,i=n._options;return n._lastActive=n._lastActive||[],"mouseout"===t.type?n._active=[]:(n._active=n._chart.getElementsAtEventForMode(t,i.mode,i),i.reverse&&n._active.reverse()),(e=!B.arrayEquals(n._active,n._lastActive))&&(n._lastActive=n._active,(i.enabled||i.custom)&&(n._eventPosition={x:t.x,y:t.y},n.update(!0),n.pivot())),e}}),Ge=ze,qe=Ue;qe.positioners=Ge;var Ze=B.valueOrDefault;function $e(){return B.merge(Object.create(null),[].slice.call(arguments),{merger:function(t,e,n,i){if("xAxes"===t||"yAxes"===t){var a,r,o,s=n[t].length;for(e[t]||(e[t]=[]),a=0;a<s;++a)o=n[t][a],r=Ze(o.type,"xAxes"===t?"category":"linear"),a>=e[t].length&&e[t].push({}),!e[t][a].type||o.type&&o.type!==e[t][a].type?B.merge(e[t][a],[Ne.getScaleDefaults(r),o]):B.merge(e[t][a],o)}else B._merger(t,e,n,i)}})}function Xe(){return B.merge(Object.create(null),[].slice.call(arguments),{merger:function(t,e,n,i){var a=e[t]||Object.create(null),r=n[t];"scales"===t?e[t]=$e(a,r):"scale"===t?e[t]=B.merge(a,[Ne.getScaleDefaults(r.type),r]):B._merger(t,e,n,i)}})}function Ke(t){var e=t.options;B.each(t.scales,(function(e){pe.removeBox(t,e)})),e=Xe(Y.global,Y[t.config.type],e),t.options=t.config.options=e,t.ensureScalesHaveIDs(),t.buildOrUpdateScales(),t.tooltip._options=e.tooltips,t.tooltip.initialize()}function Je(t,e,n){var i,a=function(t){return t.id===i};do{i=e+n++}while(B.findIndex(t,a)>=0);return i}function Qe(t){return"top"===t||"bottom"===t}function tn(t,e){return function(n,i){return n[t]===i[t]?n[e]-i[e]:n[t]-i[t]}}Y._set("global",{elements:{},events:["mousemove","mouseout","click","touchstart","touchmove"],hover:{onHover:null,mode:"nearest",intersect:!0,animationDuration:400},onClick:null,maintainAspectRatio:!0,responsive:!0,responsiveAnimationDuration:0});var en=function(t,e){return this.construct(t,e),this};B.extend(en.prototype,{construct:function(t,e){var n=this;e=function(t){var e=(t=t||Object.create(null)).data=t.data||{};return e.datasets=e.datasets||[],e.labels=e.labels||[],t.options=Xe(Y.global,Y[t.type],t.options||{}),t}(e);var i=Le.acquireContext(t,e),a=i&&i.canvas,r=a&&a.height,o=a&&a.width;n.id=B.uid(),n.ctx=i,n.canvas=a,n.config=e,n.width=o,n.height=r,n.aspectRatio=r?o/r:null,n.options=e.options,n._bufferedRender=!1,n._layers=[],n.chart=n,n.controller=n,en.instances[n.id]=n,Object.defineProperty(n,"data",{get:function(){return n.config.data},set:function(t){n.config.data=t}}),i&&a?(n.initialize(),n.update()):console.error("Failed to create chart: can't acquire context from the given item")},initialize:function(){var t=this;return Re.notify(t,"beforeInit"),B.retinaScale(t,t.options.devicePixelRatio),t.bindEvents(),t.options.responsive&&t.resize(!0),t.initToolTip(),Re.notify(t,"afterInit"),t},clear:function(){return B.canvas.clear(this),this},stop:function(){return Q.cancelAnimation(this),this},resize:function(t){var e=this,n=e.options,i=e.canvas,a=n.maintainAspectRatio&&e.aspectRatio||null,r=Math.max(0,Math.floor(B.getMaximumWidth(i))),o=Math.max(0,Math.floor(a?r/a:B.getMaximumHeight(i)));if((e.width!==r||e.height!==o)&&(i.width=e.width=r,i.height=e.height=o,i.style.width=r+"px",i.style.height=o+"px",B.retinaScale(e,n.devicePixelRatio),!t)){var s={width:r,height:o};Re.notify(e,"resize",[s]),n.onResize&&n.onResize(e,s),e.stop(),e.update({duration:n.responsiveAnimationDuration})}},ensureScalesHaveIDs:function(){var t=this.options,e=t.scales||{},n=t.scale;B.each(e.xAxes,(function(t,n){t.id||(t.id=Je(e.xAxes,"x-axis-",n))})),B.each(e.yAxes,(function(t,n){t.id||(t.id=Je(e.yAxes,"y-axis-",n))})),n&&(n.id=n.id||"scale")},buildOrUpdateScales:function(){var t=this,e=t.options,n=t.scales||{},i=[],a=Object.keys(n).reduce((function(t,e){return t[e]=!1,t}),{});e.scales&&(i=i.concat((e.scales.xAxes||[]).map((function(t){return{options:t,dtype:"category",dposition:"bottom"}})),(e.scales.yAxes||[]).map((function(t){return{options:t,dtype:"linear",dposition:"left"}})))),e.scale&&i.push({options:e.scale,dtype:"radialLinear",isDefault:!0,dposition:"chartArea"}),B.each(i,(function(e){var i=e.options,r=i.id,o=Ze(i.type,e.dtype);Qe(i.position)!==Qe(e.dposition)&&(i.position=e.dposition),a[r]=!0;var s=null;if(r in n&&n[r].type===o)(s=n[r]).options=i,s.ctx=t.ctx,s.chart=t;else{var l=Ne.getScaleConstructor(o);if(!l)return;s=new l({id:r,type:o,options:i,ctx:t.ctx,chart:t}),n[s.id]=s}s.mergeTicksOptions(),e.isDefault&&(t.scale=s)})),B.each(a,(function(t,e){t||delete n[e]})),t.scales=n,Ne.addScalesToLayout(this)},buildOrUpdateControllers:function(){var t,e,n=this,i=[],a=n.data.datasets;for(t=0,e=a.length;t<e;t++){var r=a[t],o=n.getDatasetMeta(t),s=r.type||n.config.type;if(o.type&&o.type!==s&&(n.destroyDatasetMeta(t),o=n.getDatasetMeta(t)),o.type=s,o.order=r.order||0,o.index=t,o.controller)o.controller.updateIndex(t),o.controller.linkScales();else{var l=Qt[o.type];if(void 0===l)throw new Error('"'+o.type+'" is not a chart type.');o.controller=new l(n,t),i.push(o.controller)}}return i},resetElements:function(){var t=this;B.each(t.data.datasets,(function(e,n){t.getDatasetMeta(n).controller.reset()}),t)},reset:function(){this.resetElements(),this.tooltip.initialize()},update:function(t){var e,n,i=this;if(t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]}),Ke(i),Re._invalidate(i),!1!==Re.notify(i,"beforeUpdate")){i.tooltip._data=i.data;var a=i.buildOrUpdateControllers();for(e=0,n=i.data.datasets.length;e<n;e++)i.getDatasetMeta(e).controller.buildOrUpdateElements();i.updateLayout(),i.options.animation&&i.options.animation.duration&&B.each(a,(function(t){t.reset()})),i.updateDatasets(),i.tooltip.initialize(),i.lastActive=[],Re.notify(i,"afterUpdate"),i._layers.sort(tn("z","_idx")),i._bufferedRender?i._bufferedRequest={duration:t.duration,easing:t.easing,lazy:t.lazy}:i.render(t)}},updateLayout:function(){var t=this;!1!==Re.notify(t,"beforeLayout")&&(pe.update(this,this.width,this.height),t._layers=[],B.each(t.boxes,(function(e){e._configure&&e._configure(),t._layers.push.apply(t._layers,e._layers())}),t),t._layers.forEach((function(t,e){t._idx=e})),Re.notify(t,"afterScaleUpdate"),Re.notify(t,"afterLayout"))},updateDatasets:function(){if(!1!==Re.notify(this,"beforeDatasetsUpdate")){for(var t=0,e=this.data.datasets.length;t<e;++t)this.updateDataset(t);Re.notify(this,"afterDatasetsUpdate")}},updateDataset:function(t){var e=this.getDatasetMeta(t),n={meta:e,index:t};!1!==Re.notify(this,"beforeDatasetUpdate",[n])&&(e.controller._update(),Re.notify(this,"afterDatasetUpdate",[n]))},render:function(t){var e=this;t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]});var n=e.options.animation,i=Ze(t.duration,n&&n.duration),a=t.lazy;if(!1!==Re.notify(e,"beforeRender")){var r=function(t){Re.notify(e,"afterRender"),B.callback(n&&n.onComplete,[t],e)};if(n&&i){var o=new J({numSteps:i/16.66,easing:t.easing||n.easing,render:function(t,e){var n=B.easing.effects[e.easing],i=e.currentStep,a=i/e.numSteps;t.draw(n(a),a,i)},onAnimationProgress:n.onProgress,onAnimationComplete:r});Q.addAnimation(e,o,i,a)}else e.draw(),r(new J({numSteps:0,chart:e}));return e}},draw:function(t){var e,n,i=this;if(i.clear(),B.isNullOrUndef(t)&&(t=1),i.transition(t),!(i.width<=0||i.height<=0)&&!1!==Re.notify(i,"beforeDraw",[t])){for(n=i._layers,e=0;e<n.length&&n[e].z<=0;++e)n[e].draw(i.chartArea);for(i.drawDatasets(t);e<n.length;++e)n[e].draw(i.chartArea);i._drawTooltip(t),Re.notify(i,"afterDraw",[t])}},transition:function(t){for(var e=0,n=(this.data.datasets||[]).length;e<n;++e)this.isDatasetVisible(e)&&this.getDatasetMeta(e).controller.transition(t);this.tooltip.transition(t)},_getSortedDatasetMetas:function(t){var e,n,i=[];for(e=0,n=(this.data.datasets||[]).length;e<n;++e)t&&!this.isDatasetVisible(e)||i.push(this.getDatasetMeta(e));return i.sort(tn("order","index")),i},_getSortedVisibleDatasetMetas:function(){return this._getSortedDatasetMetas(!0)},drawDatasets:function(t){var e,n;if(!1!==Re.notify(this,"beforeDatasetsDraw",[t])){for(n=(e=this._getSortedVisibleDatasetMetas()).length-1;n>=0;--n)this.drawDataset(e[n],t);Re.notify(this,"afterDatasetsDraw",[t])}},drawDataset:function(t,e){var n={meta:t,index:t.index,easingValue:e};!1!==Re.notify(this,"beforeDatasetDraw",[n])&&(t.controller.draw(e),Re.notify(this,"afterDatasetDraw",[n]))},_drawTooltip:function(t){var e=this.tooltip,n={tooltip:e,easingValue:t};!1!==Re.notify(this,"beforeTooltipDraw",[n])&&(e.draw(),Re.notify(this,"afterTooltipDraw",[n]))},getElementAtEvent:function(t){return oe.modes.single(this,t)},getElementsAtEvent:function(t){return oe.modes.label(this,t,{intersect:!0})},getElementsAtXAxis:function(t){return oe.modes["x-axis"](this,t,{intersect:!0})},getElementsAtEventForMode:function(t,e,n){var i=oe.modes[e];return"function"==typeof i?i(this,t,n):[]},getDatasetAtEvent:function(t){return oe.modes.dataset(this,t,{intersect:!0})},getDatasetMeta:function(t){var e=this.data.datasets[t];e._meta||(e._meta={});var n=e._meta[this.id];return n||(n=e._meta[this.id]={type:null,data:[],dataset:null,controller:null,hidden:null,xAxisID:null,yAxisID:null,order:e.order||0,index:t}),n},getVisibleDatasetCount:function(){for(var t=0,e=0,n=this.data.datasets.length;e<n;++e)this.isDatasetVisible(e)&&t++;return t},isDatasetVisible:function(t){var e=this.getDatasetMeta(t);return"boolean"==typeof e.hidden?!e.hidden:!this.data.datasets[t].hidden},generateLegend:function(){return this.options.legendCallback(this)},destroyDatasetMeta:function(t){var e=this.id,n=this.data.datasets[t],i=n._meta&&n._meta[e];i&&(i.controller.destroy(),delete n._meta[e])},destroy:function(){var t,e,n=this,i=n.canvas;for(n.stop(),t=0,e=n.data.datasets.length;t<e;++t)n.destroyDatasetMeta(t);i&&(n.unbindEvents(),B.canvas.clear(n),Le.releaseContext(n.ctx),n.canvas=null,n.ctx=null),Re.notify(n,"destroy"),delete en.instances[n.id]},toBase64Image:function(){return this.canvas.toDataURL.apply(this.canvas,arguments)},initToolTip:function(){var t=this;t.tooltip=new qe({_chart:t,_chartInstance:t,_data:t.data,_options:t.options.tooltips},t)},bindEvents:function(){var t=this,e=t._listeners={},n=function(){t.eventHandler.apply(t,arguments)};B.each(t.options.events,(function(i){Le.addEventListener(t,i,n),e[i]=n})),t.options.responsive&&(n=function(){t.resize()},Le.addEventListener(t,"resize",n),e.resize=n)},unbindEvents:function(){var t=this,e=t._listeners;e&&(delete t._listeners,B.each(e,(function(e,n){Le.removeEventListener(t,n,e)})))},updateHoverStyle:function(t,e,n){var i,a,r,o=n?"set":"remove";for(a=0,r=t.length;a<r;++a)(i=t[a])&&this.getDatasetMeta(i._datasetIndex).controller[o+"HoverStyle"](i);"dataset"===e&&this.getDatasetMeta(t[0]._datasetIndex).controller["_"+o+"DatasetHoverStyle"]()},eventHandler:function(t){var e=this,n=e.tooltip;if(!1!==Re.notify(e,"beforeEvent",[t])){e._bufferedRender=!0,e._bufferedRequest=null;var i=e.handleEvent(t);n&&(i=n._start?n.handleEvent(t):i|n.handleEvent(t)),Re.notify(e,"afterEvent",[t]);var a=e._bufferedRequest;return a?e.render(a):i&&!e.animating&&(e.stop(),e.render({duration:e.options.hover.animationDuration,lazy:!0})),e._bufferedRender=!1,e._bufferedRequest=null,e}},handleEvent:function(t){var e,n=this,i=n.options||{},a=i.hover;return n.lastActive=n.lastActive||[],"mouseout"===t.type?n.active=[]:n.active=n.getElementsAtEventForMode(t,a.mode,a),B.callback(i.onHover||i.hover.onHover,[t.native,n.active],n),"mouseup"!==t.type&&"click"!==t.type||i.onClick&&i.onClick.call(n,t.native,n.active),n.lastActive.length&&n.updateHoverStyle(n.lastActive,a.mode,!1),n.active.length&&a.mode&&n.updateHoverStyle(n.active,a.mode,!0),e=!B.arrayEquals(n.active,n.lastActive),n.lastActive=n.active,e}}),en.instances={};var nn=en;en.Controller=en,en.types={},B.configMerge=Xe,B.scaleMerge=$e;function an(){throw new Error("This method is not implemented: either no adapter can be found or an incomplete integration was provided.")}function rn(t){this.options=t||{}}B.extend(rn.prototype,{formats:an,parse:an,format:an,add:an,diff:an,startOf:an,endOf:an,_create:function(t){return t}}),rn.override=function(t){B.extend(rn.prototype,t)};var on={_date:rn},sn={formatters:{values:function(t){return B.isArray(t)?t:""+t},linear:function(t,e,n){var i=n.length>3?n[2]-n[1]:n[1]-n[0];Math.abs(i)>1&&t!==Math.floor(t)&&(i=t-Math.floor(t));var a=B.log10(Math.abs(i)),r="";if(0!==t)if(Math.max(Math.abs(n[0]),Math.abs(n[n.length-1]))<1e-4){var o=B.log10(Math.abs(t)),s=Math.floor(o)-Math.floor(a);s=Math.max(Math.min(s,20),0),r=t.toExponential(s)}else{var l=-1*Math.floor(a);l=Math.max(Math.min(l,20),0),r=t.toFixed(l)}else r="0";return r},logarithmic:function(t,e,n){var i=t/Math.pow(10,Math.floor(B.log10(t)));return 0===t?"0":1===i||2===i||5===i||0===e||e===n.length-1?t.toExponential():""}}},ln=B.isArray,un=B.isNullOrUndef,dn=B.valueOrDefault,hn=B.valueAtIndexOrDefault;function cn(t,e,n){var i,a=t.getTicks().length,r=Math.min(e,a-1),o=t.getPixelForTick(r),s=t._startPixel,l=t._endPixel;if(!(n&&(i=1===a?Math.max(o-s,l-o):0===e?(t.getPixelForTick(1)-o)/2:(o-t.getPixelForTick(r-1))/2,(o+=r<e?i:-i)<s-1e-6||o>l+1e-6)))return o}function fn(t,e,n,i){var a,r,o,s,l,u,d,h,c,f,g,m,p,v=n.length,b=[],y=[],x=[],_=0,w=0;for(a=0;a<v;++a){if(s=n[a].label,l=n[a].major?e.major:e.minor,t.font=u=l.string,d=i[u]=i[u]||{data:{},gc:[]},h=l.lineHeight,c=f=0,un(s)||ln(s)){if(ln(s))for(r=0,o=s.length;r<o;++r)g=s[r],un(g)||ln(g)||(c=B.measureText(t,d.data,d.gc,c,g),f+=h)}else c=B.measureText(t,d.data,d.gc,c,s),f=h;b.push(c),y.push(f),x.push(h/2),_=Math.max(c,_),w=Math.max(f,w)}function k(t){return{width:b[t]||0,height:y[t]||0,offset:x[t]||0}}return function(t,e){B.each(t,(function(t){var n,i=t.gc,a=i.length/2;if(a>e){for(n=0;n<a;++n)delete t.data[i[n]];i.splice(0,a)}}))}(i,v),m=b.indexOf(_),p=y.indexOf(w),{first:k(0),last:k(v-1),widest:k(m),highest:k(p)}}function gn(t){return t.drawTicks?t.tickMarkLength:0}function mn(t){var e,n;return t.display?(e=B.options._parseFont(t),n=B.options.toPadding(t.padding),e.lineHeight+n.height):0}function pn(t,e){return B.extend(B.options._parseFont({fontFamily:dn(e.fontFamily,t.fontFamily),fontSize:dn(e.fontSize,t.fontSize),fontStyle:dn(e.fontStyle,t.fontStyle),lineHeight:dn(e.lineHeight,t.lineHeight)}),{color:B.options.resolve([e.fontColor,t.fontColor,Y.global.defaultFontColor])})}function vn(t){var e=pn(t,t.minor);return{minor:e,major:t.major.enabled?pn(t,t.major):e}}function bn(t){var e,n,i,a=[];for(n=0,i=t.length;n<i;++n)void 0!==(e=t[n])._index&&a.push(e);return a}function yn(t,e,n,i){var a,r,o,s,l=dn(n,0),u=Math.min(dn(i,t.length),t.length),d=0;for(e=Math.ceil(e),i&&(e=(a=i-n)/Math.floor(a/e)),s=l;s<0;)d++,s=Math.round(l+d*e);for(r=Math.max(l,0);r<u;r++)o=t[r],r===s?(o._index=r,d++,s=Math.round(l+d*e)):delete o.label}Y._set("scale",{display:!0,position:"left",offset:!1,gridLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,drawBorder:!0,drawOnChartArea:!0,drawTicks:!0,tickMarkLength:10,zeroLineWidth:1,zeroLineColor:"rgba(0,0,0,0.25)",zeroLineBorderDash:[],zeroLineBorderDashOffset:0,offsetGridLines:!1,borderDash:[],borderDashOffset:0},scaleLabel:{display:!1,labelString:"",padding:{top:4,bottom:4}},ticks:{beginAtZero:!1,minRotation:0,maxRotation:50,mirror:!1,padding:0,reverse:!1,display:!0,autoSkip:!0,autoSkipPadding:0,labelOffset:0,callback:sn.formatters.values,minor:{},major:{}}});var xn=X.extend({zeroLineIndex:0,getPadding:function(){return{left:this.paddingLeft||0,top:this.paddingTop||0,right:this.paddingRight||0,bottom:this.paddingBottom||0}},getTicks:function(){return this._ticks},_getLabels:function(){var t=this.chart.data;return this.options.labels||(this.isHorizontal()?t.xLabels:t.yLabels)||t.labels||[]},mergeTicksOptions:function(){},beforeUpdate:function(){B.callback(this.options.beforeUpdate,[this])},update:function(t,e,n){var i,a,r,o,s,l=this,u=l.options.ticks,d=u.sampleSize;if(l.beforeUpdate(),l.maxWidth=t,l.maxHeight=e,l.margins=B.extend({left:0,right:0,top:0,bottom:0},n),l._ticks=null,l.ticks=null,l._labelSizes=null,l._maxLabelLines=0,l.longestLabelWidth=0,l.longestTextCache=l.longestTextCache||{},l._gridLineItems=null,l._labelItems=null,l.beforeSetDimensions(),l.setDimensions(),l.afterSetDimensions(),l.beforeDataLimits(),l.determineDataLimits(),l.afterDataLimits(),l.beforeBuildTicks(),o=l.buildTicks()||[],(!(o=l.afterBuildTicks(o)||o)||!o.length)&&l.ticks)for(o=[],i=0,a=l.ticks.length;i<a;++i)o.push({value:l.ticks[i],major:!1});return l._ticks=o,s=d<o.length,r=l._convertTicksToLabels(s?function(t,e){for(var n=[],i=t.length/e,a=0,r=t.length;a<r;a+=i)n.push(t[Math.floor(a)]);return n}(o,d):o),l._configure(),l.beforeCalculateTickRotation(),l.calculateTickRotation(),l.afterCalculateTickRotation(),l.beforeFit(),l.fit(),l.afterFit(),l._ticksToDraw=u.display&&(u.autoSkip||"auto"===u.source)?l._autoSkip(o):o,s&&(r=l._convertTicksToLabels(l._ticksToDraw)),l.ticks=r,l.afterUpdate(),l.minSize},_configure:function(){var t,e,n=this,i=n.options.ticks.reverse;n.isHorizontal()?(t=n.left,e=n.right):(t=n.top,e=n.bottom,i=!i),n._startPixel=t,n._endPixel=e,n._reversePixels=i,n._length=e-t},afterUpdate:function(){B.callback(this.options.afterUpdate,[this])},beforeSetDimensions:function(){B.callback(this.options.beforeSetDimensions,[this])},setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0},afterSetDimensions:function(){B.callback(this.options.afterSetDimensions,[this])},beforeDataLimits:function(){B.callback(this.options.beforeDataLimits,[this])},determineDataLimits:B.noop,afterDataLimits:function(){B.callback(this.options.afterDataLimits,[this])},beforeBuildTicks:function(){B.callback(this.options.beforeBuildTicks,[this])},buildTicks:B.noop,afterBuildTicks:function(t){var e=this;return ln(t)&&t.length?B.callback(e.options.afterBuildTicks,[e,t]):(e.ticks=B.callback(e.options.afterBuildTicks,[e,e.ticks])||e.ticks,t)},beforeTickToLabelConversion:function(){B.callback(this.options.beforeTickToLabelConversion,[this])},convertTicksToLabels:function(){var t=this.options.ticks;this.ticks=this.ticks.map(t.userCallback||t.callback,this)},afterTickToLabelConversion:function(){B.callback(this.options.afterTickToLabelConversion,[this])},beforeCalculateTickRotation:function(){B.callback(this.options.beforeCalculateTickRotation,[this])},calculateTickRotation:function(){var t,e,n,i,a,r,o,s=this,l=s.options,u=l.ticks,d=s.getTicks().length,h=u.minRotation||0,c=u.maxRotation,f=h;!s._isVisible()||!u.display||h>=c||d<=1||!s.isHorizontal()?s.labelRotation=h:(e=(t=s._getLabelSizes()).widest.width,n=t.highest.height-t.highest.offset,i=Math.min(s.maxWidth,s.chart.width-e),e+6>(a=l.offset?s.maxWidth/d:i/(d-1))&&(a=i/(d-(l.offset?.5:1)),r=s.maxHeight-gn(l.gridLines)-u.padding-mn(l.scaleLabel),o=Math.sqrt(e*e+n*n),f=B.toDegrees(Math.min(Math.asin(Math.min((t.highest.height+6)/a,1)),Math.asin(Math.min(r/o,1))-Math.asin(n/o))),f=Math.max(h,Math.min(c,f))),s.labelRotation=f)},afterCalculateTickRotation:function(){B.callback(this.options.afterCalculateTickRotation,[this])},beforeFit:function(){B.callback(this.options.beforeFit,[this])},fit:function(){var t=this,e=t.minSize={width:0,height:0},n=t.chart,i=t.options,a=i.ticks,r=i.scaleLabel,o=i.gridLines,s=t._isVisible(),l="bottom"===i.position,u=t.isHorizontal();if(u?e.width=t.maxWidth:s&&(e.width=gn(o)+mn(r)),u?s&&(e.height=gn(o)+mn(r)):e.height=t.maxHeight,a.display&&s){var d=vn(a),h=t._getLabelSizes(),c=h.first,f=h.last,g=h.widest,m=h.highest,p=.4*d.minor.lineHeight,v=a.padding;if(u){var b=0!==t.labelRotation,y=B.toRadians(t.labelRotation),x=Math.cos(y),_=Math.sin(y),w=_*g.width+x*(m.height-(b?m.offset:0))+(b?0:p);e.height=Math.min(t.maxHeight,e.height+w+v);var k,M,S=t.getPixelForTick(0)-t.left,D=t.right-t.getPixelForTick(t.getTicks().length-1);b?(k=l?x*c.width+_*c.offset:_*(c.height-c.offset),M=l?_*(f.height-f.offset):x*f.width+_*f.offset):(k=c.width/2,M=f.width/2),t.paddingLeft=Math.max((k-S)*t.width/(t.width-S),0)+3,t.paddingRight=Math.max((M-D)*t.width/(t.width-D),0)+3}else{var C=a.mirror?0:g.width+v+p;e.width=Math.min(t.maxWidth,e.width+C),t.paddingTop=c.height/2,t.paddingBottom=f.height/2}}t.handleMargins(),u?(t.width=t._length=n.width-t.margins.left-t.margins.right,t.height=e.height):(t.width=e.width,t.height=t._length=n.height-t.margins.top-t.margins.bottom)},handleMargins:function(){var t=this;t.margins&&(t.margins.left=Math.max(t.paddingLeft,t.margins.left),t.margins.top=Math.max(t.paddingTop,t.margins.top),t.margins.right=Math.max(t.paddingRight,t.margins.right),t.margins.bottom=Math.max(t.paddingBottom,t.margins.bottom))},afterFit:function(){B.callback(this.options.afterFit,[this])},isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},isFullWidth:function(){return this.options.fullWidth},getRightValue:function(t){if(un(t))return NaN;if(("number"==typeof t||t instanceof Number)&&!isFinite(t))return NaN;if(t)if(this.isHorizontal()){if(void 0!==t.x)return this.getRightValue(t.x)}else if(void 0!==t.y)return this.getRightValue(t.y);return t},_convertTicksToLabels:function(t){var e,n,i,a=this;for(a.ticks=t.map((function(t){return t.value})),a.beforeTickToLabelConversion(),e=a.convertTicksToLabels(t)||a.ticks,a.afterTickToLabelConversion(),n=0,i=t.length;n<i;++n)t[n].label=e[n];return e},_getLabelSizes:function(){var t=this,e=t._labelSizes;return e||(t._labelSizes=e=fn(t.ctx,vn(t.options.ticks),t.getTicks(),t.longestTextCache),t.longestLabelWidth=e.widest.width),e},_parseValue:function(t){var e,n,i,a;return ln(t)?(e=+this.getRightValue(t[0]),n=+this.getRightValue(t[1]),i=Math.min(e,n),a=Math.max(e,n)):(e=void 0,n=t=+this.getRightValue(t),i=t,a=t),{min:i,max:a,start:e,end:n}},_getScaleLabel:function(t){var e=this._parseValue(t);return void 0!==e.start?"["+e.start+", "+e.end+"]":+this.getRightValue(t)},getLabelForIndex:B.noop,getPixelForValue:B.noop,getValueForPixel:B.noop,getPixelForTick:function(t){var e=this.options.offset,n=this._ticks.length,i=1/Math.max(n-(e?0:1),1);return t<0||t>n-1?null:this.getPixelForDecimal(t*i+(e?i/2:0))},getPixelForDecimal:function(t){return this._reversePixels&&(t=1-t),this._startPixel+t*this._length},getDecimalForPixel:function(t){var e=(t-this._startPixel)/this._length;return this._reversePixels?1-e:e},getBasePixel:function(){return this.getPixelForValue(this.getBaseValue())},getBaseValue:function(){var t=this.min,e=this.max;return this.beginAtZero?0:t<0&&e<0?e:t>0&&e>0?t:0},_autoSkip:function(t){var e,n,i,a,r=this.options.ticks,o=this._length,s=r.maxTicksLimit||o/this._tickSize()+1,l=r.major.enabled?function(t){var e,n,i=[];for(e=0,n=t.length;e<n;e++)t[e].major&&i.push(e);return i}(t):[],u=l.length,d=l[0],h=l[u-1];if(u>s)return function(t,e,n){var i,a,r=0,o=e[0];for(n=Math.ceil(n),i=0;i<t.length;i++)a=t[i],i===o?(a._index=i,o=e[++r*n]):delete a.label}(t,l,u/s),bn(t);if(i=function(t,e,n,i){var a,r,o,s,l=function(t){var e,n,i=t.length;if(i<2)return!1;for(n=t[0],e=1;e<i;++e)if(t[e]-t[e-1]!==n)return!1;return n}(t),u=(e.length-1)/i;if(!l)return Math.max(u,1);for(o=0,s=(a=B.math._factorize(l)).length-1;o<s;o++)if((r=a[o])>u)return r;return Math.max(u,1)}(l,t,0,s),u>0){for(e=0,n=u-1;e<n;e++)yn(t,i,l[e],l[e+1]);return a=u>1?(h-d)/(u-1):null,yn(t,i,B.isNullOrUndef(a)?0:d-a,d),yn(t,i,h,B.isNullOrUndef(a)?t.length:h+a),bn(t)}return yn(t,i),bn(t)},_tickSize:function(){var t=this.options.ticks,e=B.toRadians(this.labelRotation),n=Math.abs(Math.cos(e)),i=Math.abs(Math.sin(e)),a=this._getLabelSizes(),r=t.autoSkipPadding||0,o=a?a.widest.width+r:0,s=a?a.highest.height+r:0;return this.isHorizontal()?s*n>o*i?o/n:s/i:s*i<o*n?s/n:o/i},_isVisible:function(){var t,e,n,i=this.chart,a=this.options.display;if("auto"!==a)return!!a;for(t=0,e=i.data.datasets.length;t<e;++t)if(i.isDatasetVisible(t)&&((n=i.getDatasetMeta(t)).xAxisID===this.id||n.yAxisID===this.id))return!0;return!1},_computeGridLineItems:function(t){var e,n,i,a,r,o,s,l,u,d,h,c,f,g,m,p,v,b=this,y=b.chart,x=b.options,_=x.gridLines,w=x.position,k=_.offsetGridLines,M=b.isHorizontal(),S=b._ticksToDraw,D=S.length+(k?1:0),C=gn(_),P=[],T=_.drawBorder?hn(_.lineWidth,0,0):0,O=T/2,A=B._alignPixel,F=function(t){return A(y,t,T)};for("top"===w?(e=F(b.bottom),s=b.bottom-C,u=e-O,h=F(t.top)+O,f=t.bottom):"bottom"===w?(e=F(b.top),h=t.top,f=F(t.bottom)-O,s=e+O,u=b.top+C):"left"===w?(e=F(b.right),o=b.right-C,l=e-O,d=F(t.left)+O,c=t.right):(e=F(b.left),d=t.left,c=F(t.right)-O,o=e+O,l=b.left+C),n=0;n<D;++n)i=S[n]||{},un(i.label)&&n<S.length||(n===b.zeroLineIndex&&x.offset===k?(g=_.zeroLineWidth,m=_.zeroLineColor,p=_.zeroLineBorderDash||[],v=_.zeroLineBorderDashOffset||0):(g=hn(_.lineWidth,n,1),m=hn(_.color,n,"rgba(0,0,0,0.1)"),p=_.borderDash||[],v=_.borderDashOffset||0),void 0!==(a=cn(b,i._index||n,k))&&(r=A(y,a,g),M?o=l=d=c=r:s=u=h=f=r,P.push({tx1:o,ty1:s,tx2:l,ty2:u,x1:d,y1:h,x2:c,y2:f,width:g,color:m,borderDash:p,borderDashOffset:v})));return P.ticksLength=D,P.borderValue=e,P},_computeLabelItems:function(){var t,e,n,i,a,r,o,s,l,u,d,h,c=this,f=c.options,g=f.ticks,m=f.position,p=g.mirror,v=c.isHorizontal(),b=c._ticksToDraw,y=vn(g),x=g.padding,_=gn(f.gridLines),w=-B.toRadians(c.labelRotation),k=[];for("top"===m?(r=c.bottom-_-x,o=w?"left":"center"):"bottom"===m?(r=c.top+_+x,o=w?"right":"center"):"left"===m?(a=c.right-(p?0:_)-x,o=p?"left":"right"):(a=c.left+(p?0:_)+x,o=p?"right":"left"),t=0,e=b.length;t<e;++t)i=(n=b[t]).label,un(i)||(s=c.getPixelForTick(n._index||t)+g.labelOffset,u=(l=n.major?y.major:y.minor).lineHeight,d=ln(i)?i.length:1,v?(a=s,h="top"===m?((w?1:.5)-d)*u:(w?0:.5)*u):(r=s,h=(1-d)*u/2),k.push({x:a,y:r,rotation:w,label:i,font:l,textOffset:h,textAlign:o}));return k},_drawGrid:function(t){var e=this,n=e.options.gridLines;if(n.display){var i,a,r,o,s,l=e.ctx,u=e.chart,d=B._alignPixel,h=n.drawBorder?hn(n.lineWidth,0,0):0,c=e._gridLineItems||(e._gridLineItems=e._computeGridLineItems(t));for(r=0,o=c.length;r<o;++r)i=(s=c[r]).width,a=s.color,i&&a&&(l.save(),l.lineWidth=i,l.strokeStyle=a,l.setLineDash&&(l.setLineDash(s.borderDash),l.lineDashOffset=s.borderDashOffset),l.beginPath(),n.drawTicks&&(l.moveTo(s.tx1,s.ty1),l.lineTo(s.tx2,s.ty2)),n.drawOnChartArea&&(l.moveTo(s.x1,s.y1),l.lineTo(s.x2,s.y2)),l.stroke(),l.restore());if(h){var f,g,m,p,v=h,b=hn(n.lineWidth,c.ticksLength-1,1),y=c.borderValue;e.isHorizontal()?(f=d(u,e.left,v)-v/2,g=d(u,e.right,b)+b/2,m=p=y):(m=d(u,e.top,v)-v/2,p=d(u,e.bottom,b)+b/2,f=g=y),l.lineWidth=h,l.strokeStyle=hn(n.color,0),l.beginPath(),l.moveTo(f,m),l.lineTo(g,p),l.stroke()}}},_drawLabels:function(){var t=this;if(t.options.ticks.display){var e,n,i,a,r,o,s,l,u=t.ctx,d=t._labelItems||(t._labelItems=t._computeLabelItems());for(e=0,i=d.length;e<i;++e){if(o=(r=d[e]).font,u.save(),u.translate(r.x,r.y),u.rotate(r.rotation),u.font=o.string,u.fillStyle=o.color,u.textBaseline="middle",u.textAlign=r.textAlign,s=r.label,l=r.textOffset,ln(s))for(n=0,a=s.length;n<a;++n)u.fillText(""+s[n],0,l),l+=o.lineHeight;else u.fillText(s,0,l);u.restore()}}},_drawTitle:function(){var t=this,e=t.ctx,n=t.options,i=n.scaleLabel;if(i.display){var a,r,o=dn(i.fontColor,Y.global.defaultFontColor),s=B.options._parseFont(i),l=B.options.toPadding(i.padding),u=s.lineHeight/2,d=n.position,h=0;if(t.isHorizontal())a=t.left+t.width/2,r="bottom"===d?t.bottom-u-l.bottom:t.top+u+l.top;else{var c="left"===d;a=c?t.left+u+l.top:t.right-u-l.top,r=t.top+t.height/2,h=c?-.5*Math.PI:.5*Math.PI}e.save(),e.translate(a,r),e.rotate(h),e.textAlign="center",e.textBaseline="middle",e.fillStyle=o,e.font=s.string,e.fillText(i.labelString,0,0),e.restore()}},draw:function(t){this._isVisible()&&(this._drawGrid(t),this._drawTitle(),this._drawLabels())},_layers:function(){var t=this,e=t.options,n=e.ticks&&e.ticks.z||0,i=e.gridLines&&e.gridLines.z||0;return t._isVisible()&&n!==i&&t.draw===t._draw?[{z:i,draw:function(){t._drawGrid.apply(t,arguments),t._drawTitle.apply(t,arguments)}},{z:n,draw:function(){t._drawLabels.apply(t,arguments)}}]:[{z:n,draw:function(){t.draw.apply(t,arguments)}}]},_getMatchingVisibleMetas:function(t){var e=this,n=e.isHorizontal();return e.chart._getSortedVisibleDatasetMetas().filter((function(i){return(!t||i.type===t)&&(n?i.xAxisID===e.id:i.yAxisID===e.id)}))}});xn.prototype._draw=xn.prototype.draw;var _n=xn,wn=B.isNullOrUndef,kn=_n.extend({determineDataLimits:function(){var t,e=this,n=e._getLabels(),i=e.options.ticks,a=i.min,r=i.max,o=0,s=n.length-1;void 0!==a&&(t=n.indexOf(a))>=0&&(o=t),void 0!==r&&(t=n.indexOf(r))>=0&&(s=t),e.minIndex=o,e.maxIndex=s,e.min=n[o],e.max=n[s]},buildTicks:function(){var t=this._getLabels(),e=this.minIndex,n=this.maxIndex;this.ticks=0===e&&n===t.length-1?t:t.slice(e,n+1)},getLabelForIndex:function(t,e){var n=this.chart;return n.getDatasetMeta(e).controller._getValueScaleId()===this.id?this.getRightValue(n.data.datasets[e].data[t]):this._getLabels()[t]},_configure:function(){var t=this,e=t.options.offset,n=t.ticks;_n.prototype._configure.call(t),t.isHorizontal()||(t._reversePixels=!t._reversePixels),n&&(t._startValue=t.minIndex-(e?.5:0),t._valueRange=Math.max(n.length-(e?0:1),1))},getPixelForValue:function(t,e,n){var i,a,r,o=this;return wn(e)||wn(n)||(t=o.chart.data.datasets[n].data[e]),wn(t)||(i=o.isHorizontal()?t.x:t.y),(void 0!==i||void 0!==t&&isNaN(e))&&(a=o._getLabels(),t=B.valueOrDefault(i,t),e=-1!==(r=a.indexOf(t))?r:e,isNaN(e)&&(e=t)),o.getPixelForDecimal((e-o._startValue)/o._valueRange)},getPixelForTick:function(t){var e=this.ticks;return t<0||t>e.length-1?null:this.getPixelForValue(e[t],t+this.minIndex)},getValueForPixel:function(t){var e=Math.round(this._startValue+this.getDecimalForPixel(t)*this._valueRange);return Math.min(Math.max(e,0),this.ticks.length-1)},getBasePixel:function(){return this.bottom}}),Mn={position:"bottom"};kn._defaults=Mn;var Sn=B.noop,Dn=B.isNullOrUndef;var Cn=_n.extend({getRightValue:function(t){return"string"==typeof t?+t:_n.prototype.getRightValue.call(this,t)},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;if(e.beginAtZero){var n=B.sign(t.min),i=B.sign(t.max);n<0&&i<0?t.max=0:n>0&&i>0&&(t.min=0)}var a=void 0!==e.min||void 0!==e.suggestedMin,r=void 0!==e.max||void 0!==e.suggestedMax;void 0!==e.min?t.min=e.min:void 0!==e.suggestedMin&&(null===t.min?t.min=e.suggestedMin:t.min=Math.min(t.min,e.suggestedMin)),void 0!==e.max?t.max=e.max:void 0!==e.suggestedMax&&(null===t.max?t.max=e.suggestedMax:t.max=Math.max(t.max,e.suggestedMax)),a!==r&&t.min>=t.max&&(a?t.max=t.min+1:t.min=t.max-1),t.min===t.max&&(t.max++,e.beginAtZero||t.min--)},getTickLimit:function(){var t,e=this.options.ticks,n=e.stepSize,i=e.maxTicksLimit;return n?t=Math.ceil(this.max/n)-Math.floor(this.min/n)+1:(t=this._computeTickLimit(),i=i||11),i&&(t=Math.min(i,t)),t},_computeTickLimit:function(){return Number.POSITIVE_INFINITY},handleDirectionalChanges:Sn,buildTicks:function(){var t=this,e=t.options.ticks,n=t.getTickLimit(),i={maxTicks:n=Math.max(2,n),min:e.min,max:e.max,precision:e.precision,stepSize:B.valueOrDefault(e.fixedStepSize,e.stepSize)},a=t.ticks=function(t,e){var n,i,a,r,o=[],s=t.stepSize,l=s||1,u=t.maxTicks-1,d=t.min,h=t.max,c=t.precision,f=e.min,g=e.max,m=B.niceNum((g-f)/u/l)*l;if(m<1e-14&&Dn(d)&&Dn(h))return[f,g];(r=Math.ceil(g/m)-Math.floor(f/m))>u&&(m=B.niceNum(r*m/u/l)*l),s||Dn(c)?n=Math.pow(10,B._decimalPlaces(m)):(n=Math.pow(10,c),m=Math.ceil(m*n)/n),i=Math.floor(f/m)*m,a=Math.ceil(g/m)*m,s&&(!Dn(d)&&B.almostWhole(d/m,m/1e3)&&(i=d),!Dn(h)&&B.almostWhole(h/m,m/1e3)&&(a=h)),r=(a-i)/m,r=B.almostEquals(r,Math.round(r),m/1e3)?Math.round(r):Math.ceil(r),i=Math.round(i*n)/n,a=Math.round(a*n)/n,o.push(Dn(d)?i:d);for(var p=1;p<r;++p)o.push(Math.round((i+p*m)*n)/n);return o.push(Dn(h)?a:h),o}(i,t);t.handleDirectionalChanges(),t.max=B.max(a),t.min=B.min(a),e.reverse?(a.reverse(),t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max)},convertTicksToLabels:function(){var t=this;t.ticksAsNumbers=t.ticks.slice(),t.zeroLineIndex=t.ticks.indexOf(0),_n.prototype.convertTicksToLabels.call(t)},_configure:function(){var t,e=this,n=e.getTicks(),i=e.min,a=e.max;_n.prototype._configure.call(e),e.options.offset&&n.length&&(i-=t=(a-i)/Math.max(n.length-1,1)/2,a+=t),e._startValue=i,e._endValue=a,e._valueRange=a-i}}),Pn={position:"left",ticks:{callback:sn.formatters.linear}};function Tn(t,e,n,i){var a,r,o=t.options,s=function(t,e,n){var i=[n.type,void 0===e&&void 0===n.stack?n.index:"",n.stack].join(".");return void 0===t[i]&&(t[i]={pos:[],neg:[]}),t[i]}(e,o.stacked,n),l=s.pos,u=s.neg,d=i.length;for(a=0;a<d;++a)r=t._parseValue(i[a]),isNaN(r.min)||isNaN(r.max)||n.data[a].hidden||(l[a]=l[a]||0,u[a]=u[a]||0,o.relativePoints?l[a]=100:r.min<0||r.max<0?u[a]+=r.min:l[a]+=r.max)}function On(t,e,n){var i,a,r=n.length;for(i=0;i<r;++i)a=t._parseValue(n[i]),isNaN(a.min)||isNaN(a.max)||e.data[i].hidden||(t.min=Math.min(t.min,a.min),t.max=Math.max(t.max,a.max))}var An=Cn.extend({determineDataLimits:function(){var t,e,n,i,a=this,r=a.options,o=a.chart.data.datasets,s=a._getMatchingVisibleMetas(),l=r.stacked,u={},d=s.length;if(a.min=Number.POSITIVE_INFINITY,a.max=Number.NEGATIVE_INFINITY,void 0===l)for(t=0;!l&&t<d;++t)l=void 0!==(e=s[t]).stack;for(t=0;t<d;++t)n=o[(e=s[t]).index].data,l?Tn(a,u,e,n):On(a,e,n);B.each(u,(function(t){i=t.pos.concat(t.neg),a.min=Math.min(a.min,B.min(i)),a.max=Math.max(a.max,B.max(i))})),a.min=B.isFinite(a.min)&&!isNaN(a.min)?a.min:0,a.max=B.isFinite(a.max)&&!isNaN(a.max)?a.max:1,a.handleTickRangeOptions()},_computeTickLimit:function(){var t;return this.isHorizontal()?Math.ceil(this.width/40):(t=B.options._parseFont(this.options.ticks),Math.ceil(this.height/t.lineHeight))},handleDirectionalChanges:function(){this.isHorizontal()||this.ticks.reverse()},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForValue:function(t){return this.getPixelForDecimal((+this.getRightValue(t)-this._startValue)/this._valueRange)},getValueForPixel:function(t){return this._startValue+this.getDecimalForPixel(t)*this._valueRange},getPixelForTick:function(t){var e=this.ticksAsNumbers;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])}}),Fn=Pn;An._defaults=Fn;var In=B.valueOrDefault,Ln=B.math.log10;var Rn={position:"left",ticks:{callback:sn.formatters.logarithmic}};function Nn(t,e){return B.isFinite(t)&&t>=0?t:e}var Wn=_n.extend({determineDataLimits:function(){var t,e,n,i,a,r,o=this,s=o.options,l=o.chart,u=l.data.datasets,d=o.isHorizontal();function h(t){return d?t.xAxisID===o.id:t.yAxisID===o.id}o.min=Number.POSITIVE_INFINITY,o.max=Number.NEGATIVE_INFINITY,o.minNotZero=Number.POSITIVE_INFINITY;var c=s.stacked;if(void 0===c)for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e)&&void 0!==e.stack){c=!0;break}if(s.stacked||c){var f={};for(t=0;t<u.length;t++){var g=[(e=l.getDatasetMeta(t)).type,void 0===s.stacked&&void 0===e.stack?t:"",e.stack].join(".");if(l.isDatasetVisible(t)&&h(e))for(void 0===f[g]&&(f[g]=[]),a=0,r=(i=u[t].data).length;a<r;a++){var m=f[g];n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(m[a]=m[a]||0,m[a]+=n.max)}}B.each(f,(function(t){if(t.length>0){var e=B.min(t),n=B.max(t);o.min=Math.min(o.min,e),o.max=Math.max(o.max,n)}}))}else for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e))for(a=0,r=(i=u[t].data).length;a<r;a++)n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(o.min=Math.min(n.min,o.min),o.max=Math.max(n.max,o.max),0!==n.min&&(o.minNotZero=Math.min(n.min,o.minNotZero)));o.min=B.isFinite(o.min)?o.min:null,o.max=B.isFinite(o.max)?o.max:null,o.minNotZero=B.isFinite(o.minNotZero)?o.minNotZero:null,this.handleTickRangeOptions()},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;t.min=Nn(e.min,t.min),t.max=Nn(e.max,t.max),t.min===t.max&&(0!==t.min&&null!==t.min?(t.min=Math.pow(10,Math.floor(Ln(t.min))-1),t.max=Math.pow(10,Math.floor(Ln(t.max))+1)):(t.min=1,t.max=10)),null===t.min&&(t.min=Math.pow(10,Math.floor(Ln(t.max))-1)),null===t.max&&(t.max=0!==t.min?Math.pow(10,Math.floor(Ln(t.min))+1):10),null===t.minNotZero&&(t.min>0?t.minNotZero=t.min:t.max<1?t.minNotZero=Math.pow(10,Math.floor(Ln(t.max))):t.minNotZero=1)},buildTicks:function(){var t=this,e=t.options.ticks,n=!t.isHorizontal(),i={min:Nn(e.min),max:Nn(e.max)},a=t.ticks=function(t,e){var n,i,a=[],r=In(t.min,Math.pow(10,Math.floor(Ln(e.min)))),o=Math.floor(Ln(e.max)),s=Math.ceil(e.max/Math.pow(10,o));0===r?(n=Math.floor(Ln(e.minNotZero)),i=Math.floor(e.minNotZero/Math.pow(10,n)),a.push(r),r=i*Math.pow(10,n)):(n=Math.floor(Ln(r)),i=Math.floor(r/Math.pow(10,n)));var l=n<0?Math.pow(10,Math.abs(n)):1;do{a.push(r),10===++i&&(i=1,l=++n>=0?1:l),r=Math.round(i*Math.pow(10,n)*l)/l}while(n<o||n===o&&i<s);var u=In(t.max,r);return a.push(u),a}(i,t);t.max=B.max(a),t.min=B.min(a),e.reverse?(n=!n,t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max),n&&a.reverse()},convertTicksToLabels:function(){this.tickValues=this.ticks.slice(),_n.prototype.convertTicksToLabels.call(this)},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForTick:function(t){var e=this.tickValues;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])},_getFirstTickValue:function(t){var e=Math.floor(Ln(t));return Math.floor(t/Math.pow(10,e))*Math.pow(10,e)},_configure:function(){var t=this,e=t.min,n=0;_n.prototype._configure.call(t),0===e&&(e=t._getFirstTickValue(t.minNotZero),n=In(t.options.ticks.fontSize,Y.global.defaultFontSize)/t._length),t._startValue=Ln(e),t._valueOffset=n,t._valueRange=(Ln(t.max)-Ln(e))/(1-n)},getPixelForValue:function(t){var e=this,n=0;return(t=+e.getRightValue(t))>e.min&&t>0&&(n=(Ln(t)-e._startValue)/e._valueRange+e._valueOffset),e.getPixelForDecimal(n)},getValueForPixel:function(t){var e=this,n=e.getDecimalForPixel(t);return 0===n&&0===e.min?0:Math.pow(10,e._startValue+(n-e._valueOffset)*e._valueRange)}}),Yn=Rn;Wn._defaults=Yn;var zn=B.valueOrDefault,En=B.valueAtIndexOrDefault,Vn=B.options.resolve,Hn={display:!0,animate:!0,position:"chartArea",angleLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,borderDash:[],borderDashOffset:0},gridLines:{circular:!1},ticks:{showLabelBackdrop:!0,backdropColor:"rgba(255,255,255,0.75)",backdropPaddingY:2,backdropPaddingX:2,callback:sn.formatters.linear},pointLabels:{display:!0,fontSize:10,callback:function(t){return t}}};function Bn(t){var e=t.ticks;return e.display&&t.display?zn(e.fontSize,Y.global.defaultFontSize)+2*e.backdropPaddingY:0}function jn(t,e,n,i,a){return t===i||t===a?{start:e-n/2,end:e+n/2}:t<i||t>a?{start:e-n,end:e}:{start:e,end:e+n}}function Un(t){return 0===t||180===t?"center":t<180?"left":"right"}function Gn(t,e,n,i){var a,r,o=n.y+i/2;if(B.isArray(e))for(a=0,r=e.length;a<r;++a)t.fillText(e[a],n.x,o),o+=i;else t.fillText(e,n.x,o)}function qn(t,e,n){90===t||270===t?n.y-=e.h/2:(t>270||t<90)&&(n.y-=e.h)}function Zn(t){return B.isNumber(t)?t:0}var $n=Cn.extend({setDimensions:function(){var t=this;t.width=t.maxWidth,t.height=t.maxHeight,t.paddingTop=Bn(t.options)/2,t.xCenter=Math.floor(t.width/2),t.yCenter=Math.floor((t.height-t.paddingTop)/2),t.drawingArea=Math.min(t.height-t.paddingTop,t.width)/2},determineDataLimits:function(){var t=this,e=t.chart,n=Number.POSITIVE_INFINITY,i=Number.NEGATIVE_INFINITY;B.each(e.data.datasets,(function(a,r){if(e.isDatasetVisible(r)){var o=e.getDatasetMeta(r);B.each(a.data,(function(e,a){var r=+t.getRightValue(e);isNaN(r)||o.data[a].hidden||(n=Math.min(r,n),i=Math.max(r,i))}))}})),t.min=n===Number.POSITIVE_INFINITY?0:n,t.max=i===Number.NEGATIVE_INFINITY?0:i,t.handleTickRangeOptions()},_computeTickLimit:function(){return Math.ceil(this.drawingArea/Bn(this.options))},convertTicksToLabels:function(){var t=this;Cn.prototype.convertTicksToLabels.call(t),t.pointLabels=t.chart.data.labels.map((function(){var e=B.callback(t.options.pointLabels.callback,arguments,t);return e||0===e?e:""}))},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},fit:function(){var t=this.options;t.display&&t.pointLabels.display?function(t){var e,n,i,a=B.options._parseFont(t.options.pointLabels),r={l:0,r:t.width,t:0,b:t.height-t.paddingTop},o={};t.ctx.font=a.string,t._pointLabelSizes=[];var s,l,u,d=t.chart.data.labels.length;for(e=0;e<d;e++){i=t.getPointPosition(e,t.drawingArea+5),s=t.ctx,l=a.lineHeight,u=t.pointLabels[e],n=B.isArray(u)?{w:B.longestText(s,s.font,u),h:u.length*l}:{w:s.measureText(u).width,h:l},t._pointLabelSizes[e]=n;var h=t.getIndexAngle(e),c=B.toDegrees(h)%360,f=jn(c,i.x,n.w,0,180),g=jn(c,i.y,n.h,90,270);f.start<r.l&&(r.l=f.start,o.l=h),f.end>r.r&&(r.r=f.end,o.r=h),g.start<r.t&&(r.t=g.start,o.t=h),g.end>r.b&&(r.b=g.end,o.b=h)}t.setReductions(t.drawingArea,r,o)}(this):this.setCenterPoint(0,0,0,0)},setReductions:function(t,e,n){var i=this,a=e.l/Math.sin(n.l),r=Math.max(e.r-i.width,0)/Math.sin(n.r),o=-e.t/Math.cos(n.t),s=-Math.max(e.b-(i.height-i.paddingTop),0)/Math.cos(n.b);a=Zn(a),r=Zn(r),o=Zn(o),s=Zn(s),i.drawingArea=Math.min(Math.floor(t-(a+r)/2),Math.floor(t-(o+s)/2)),i.setCenterPoint(a,r,o,s)},setCenterPoint:function(t,e,n,i){var a=this,r=a.width-e-a.drawingArea,o=t+a.drawingArea,s=n+a.drawingArea,l=a.height-a.paddingTop-i-a.drawingArea;a.xCenter=Math.floor((o+r)/2+a.left),a.yCenter=Math.floor((s+l)/2+a.top+a.paddingTop)},getIndexAngle:function(t){var e=this.chart,n=(t*(360/e.data.labels.length)+((e.options||{}).startAngle||0))%360;return(n<0?n+360:n)*Math.PI*2/360},getDistanceFromCenterForValue:function(t){var e=this;if(B.isNullOrUndef(t))return NaN;var n=e.drawingArea/(e.max-e.min);return e.options.ticks.reverse?(e.max-t)*n:(t-e.min)*n},getPointPosition:function(t,e){var n=this.getIndexAngle(t)-Math.PI/2;return{x:Math.cos(n)*e+this.xCenter,y:Math.sin(n)*e+this.yCenter}},getPointPositionForValue:function(t,e){return this.getPointPosition(t,this.getDistanceFromCenterForValue(e))},getBasePosition:function(t){var e=this.min,n=this.max;return this.getPointPositionForValue(t||0,this.beginAtZero?0:e<0&&n<0?n:e>0&&n>0?e:0)},_drawGrid:function(){var t,e,n,i=this,a=i.ctx,r=i.options,o=r.gridLines,s=r.angleLines,l=zn(s.lineWidth,o.lineWidth),u=zn(s.color,o.color);if(r.pointLabels.display&&function(t){var e=t.ctx,n=t.options,i=n.pointLabels,a=Bn(n),r=t.getDistanceFromCenterForValue(n.ticks.reverse?t.min:t.max),o=B.options._parseFont(i);e.save(),e.font=o.string,e.textBaseline="middle";for(var s=t.chart.data.labels.length-1;s>=0;s--){var l=0===s?a/2:0,u=t.getPointPosition(s,r+l+5),d=En(i.fontColor,s,Y.global.defaultFontColor);e.fillStyle=d;var h=t.getIndexAngle(s),c=B.toDegrees(h);e.textAlign=Un(c),qn(c,t._pointLabelSizes[s],u),Gn(e,t.pointLabels[s],u,o.lineHeight)}e.restore()}(i),o.display&&B.each(i.ticks,(function(t,n){0!==n&&(e=i.getDistanceFromCenterForValue(i.ticksAsNumbers[n]),function(t,e,n,i){var a,r=t.ctx,o=e.circular,s=t.chart.data.labels.length,l=En(e.color,i-1),u=En(e.lineWidth,i-1);if((o||s)&&l&&u){if(r.save(),r.strokeStyle=l,r.lineWidth=u,r.setLineDash&&(r.setLineDash(e.borderDash||[]),r.lineDashOffset=e.borderDashOffset||0),r.beginPath(),o)r.arc(t.xCenter,t.yCenter,n,0,2*Math.PI);else{a=t.getPointPosition(0,n),r.moveTo(a.x,a.y);for(var d=1;d<s;d++)a=t.getPointPosition(d,n),r.lineTo(a.x,a.y)}r.closePath(),r.stroke(),r.restore()}}(i,o,e,n))})),s.display&&l&&u){for(a.save(),a.lineWidth=l,a.strokeStyle=u,a.setLineDash&&(a.setLineDash(Vn([s.borderDash,o.borderDash,[]])),a.lineDashOffset=Vn([s.borderDashOffset,o.borderDashOffset,0])),t=i.chart.data.labels.length-1;t>=0;t--)e=i.getDistanceFromCenterForValue(r.ticks.reverse?i.min:i.max),n=i.getPointPosition(t,e),a.beginPath(),a.moveTo(i.xCenter,i.yCenter),a.lineTo(n.x,n.y),a.stroke();a.restore()}},_drawLabels:function(){var t=this,e=t.ctx,n=t.options.ticks;if(n.display){var i,a,r=t.getIndexAngle(0),o=B.options._parseFont(n),s=zn(n.fontColor,Y.global.defaultFontColor);e.save(),e.font=o.string,e.translate(t.xCenter,t.yCenter),e.rotate(r),e.textAlign="center",e.textBaseline="middle",B.each(t.ticks,(function(r,l){(0!==l||n.reverse)&&(i=t.getDistanceFromCenterForValue(t.ticksAsNumbers[l]),n.showLabelBackdrop&&(a=e.measureText(r).width,e.fillStyle=n.backdropColor,e.fillRect(-a/2-n.backdropPaddingX,-i-o.size/2-n.backdropPaddingY,a+2*n.backdropPaddingX,o.size+2*n.backdropPaddingY)),e.fillStyle=s,e.fillText(r,0,-i))})),e.restore()}},_drawTitle:B.noop}),Xn=Hn;$n._defaults=Xn;var Kn=B._deprecated,Jn=B.options.resolve,Qn=B.valueOrDefault,ti=Number.MIN_SAFE_INTEGER||-9007199254740991,ei=Number.MAX_SAFE_INTEGER||9007199254740991,ni={millisecond:{common:!0,size:1,steps:1e3},second:{common:!0,size:1e3,steps:60},minute:{common:!0,size:6e4,steps:60},hour:{common:!0,size:36e5,steps:24},day:{common:!0,size:864e5,steps:30},week:{common:!1,size:6048e5,steps:4},month:{common:!0,size:2628e6,steps:12},quarter:{common:!1,size:7884e6,steps:4},year:{common:!0,size:3154e7}},ii=Object.keys(ni);function ai(t,e){return t-e}function ri(t){return B.valueOrDefault(t.time.min,t.ticks.min)}function oi(t){return B.valueOrDefault(t.time.max,t.ticks.max)}function si(t,e,n,i){var a=function(t,e,n){for(var i,a,r,o=0,s=t.length-1;o>=0&&o<=s;){if(a=t[(i=o+s>>1)-1]||null,r=t[i],!a)return{lo:null,hi:r};if(r[e]<n)o=i+1;else{if(!(a[e]>n))return{lo:a,hi:r};s=i-1}}return{lo:r,hi:null}}(t,e,n),r=a.lo?a.hi?a.lo:t[t.length-2]:t[0],o=a.lo?a.hi?a.hi:t[t.length-1]:t[1],s=o[e]-r[e],l=s?(n-r[e])/s:0,u=(o[i]-r[i])*l;return r[i]+u}function li(t,e){var n=t._adapter,i=t.options.time,a=i.parser,r=a||i.format,o=e;return"function"==typeof a&&(o=a(o)),B.isFinite(o)||(o="string"==typeof r?n.parse(o,r):n.parse(o)),null!==o?+o:(a||"function"!=typeof r||(o=r(e),B.isFinite(o)||(o=n.parse(o))),o)}function ui(t,e){if(B.isNullOrUndef(e))return null;var n=t.options.time,i=li(t,t.getRightValue(e));return null===i?i:(n.round&&(i=+t._adapter.startOf(i,n.round)),i)}function di(t,e,n,i){var a,r,o,s=ii.length;for(a=ii.indexOf(t);a<s-1;++a)if(o=(r=ni[ii[a]]).steps?r.steps:ei,r.common&&Math.ceil((n-e)/(o*r.size))<=i)return ii[a];return ii[s-1]}function hi(t,e,n){var i,a,r=[],o={},s=e.length;for(i=0;i<s;++i)o[a=e[i]]=i,r.push({value:a,major:!1});return 0!==s&&n?function(t,e,n,i){var a,r,o=t._adapter,s=+o.startOf(e[0].value,i),l=e[e.length-1].value;for(a=s;a<=l;a=+o.add(a,1,i))(r=n[a])>=0&&(e[r].major=!0);return e}(t,r,o,n):r}var ci=_n.extend({initialize:function(){this.mergeTicksOptions(),_n.prototype.initialize.call(this)},update:function(){var t=this,e=t.options,n=e.time||(e.time={}),i=t._adapter=new on._date(e.adapters.date);return Kn("time scale",n.format,"time.format","time.parser"),Kn("time scale",n.min,"time.min","ticks.min"),Kn("time scale",n.max,"time.max","ticks.max"),B.mergeIf(n.displayFormats,i.formats()),_n.prototype.update.apply(t,arguments)},getRightValue:function(t){return t&&void 0!==t.t&&(t=t.t),_n.prototype.getRightValue.call(this,t)},determineDataLimits:function(){var t,e,n,i,a,r,o,s=this,l=s.chart,u=s._adapter,d=s.options,h=d.time.unit||"day",c=ei,f=ti,g=[],m=[],p=[],v=s._getLabels();for(t=0,n=v.length;t<n;++t)p.push(ui(s,v[t]));for(t=0,n=(l.data.datasets||[]).length;t<n;++t)if(l.isDatasetVisible(t))if(a=l.data.datasets[t].data,B.isObject(a[0]))for(m[t]=[],e=0,i=a.length;e<i;++e)r=ui(s,a[e]),g.push(r),m[t][e]=r;else m[t]=p.slice(0),o||(g=g.concat(p),o=!0);else m[t]=[];p.length&&(c=Math.min(c,p[0]),f=Math.max(f,p[p.length-1])),g.length&&(g=n>1?function(t){var e,n,i,a={},r=[];for(e=0,n=t.length;e<n;++e)a[i=t[e]]||(a[i]=!0,r.push(i));return r}(g).sort(ai):g.sort(ai),c=Math.min(c,g[0]),f=Math.max(f,g[g.length-1])),c=ui(s,ri(d))||c,f=ui(s,oi(d))||f,c=c===ei?+u.startOf(Date.now(),h):c,f=f===ti?+u.endOf(Date.now(),h)+1:f,s.min=Math.min(c,f),s.max=Math.max(c+1,f),s._table=[],s._timestamps={data:g,datasets:m,labels:p}},buildTicks:function(){var t,e,n,i=this,a=i.min,r=i.max,o=i.options,s=o.ticks,l=o.time,u=i._timestamps,d=[],h=i.getLabelCapacity(a),c=s.source,f=o.distribution;for(u="data"===c||"auto"===c&&"series"===f?u.data:"labels"===c?u.labels:function(t,e,n,i){var a,r=t._adapter,o=t.options,s=o.time,l=s.unit||di(s.minUnit,e,n,i),u=Jn([s.stepSize,s.unitStepSize,1]),d="week"===l&&s.isoWeekday,h=e,c=[];if(d&&(h=+r.startOf(h,"isoWeek",d)),h=+r.startOf(h,d?"day":l),r.diff(n,e,l)>1e5*u)throw e+" and "+n+" are too far apart with stepSize of "+u+" "+l;for(a=h;a<n;a=+r.add(a,u,l))c.push(a);return a!==n&&"ticks"!==o.bounds||c.push(a),c}(i,a,r,h),"ticks"===o.bounds&&u.length&&(a=u[0],r=u[u.length-1]),a=ui(i,ri(o))||a,r=ui(i,oi(o))||r,t=0,e=u.length;t<e;++t)(n=u[t])>=a&&n<=r&&d.push(n);return i.min=a,i.max=r,i._unit=l.unit||(s.autoSkip?di(l.minUnit,i.min,i.max,h):function(t,e,n,i,a){var r,o;for(r=ii.length-1;r>=ii.indexOf(n);r--)if(o=ii[r],ni[o].common&&t._adapter.diff(a,i,o)>=e-1)return o;return ii[n?ii.indexOf(n):0]}(i,d.length,l.minUnit,i.min,i.max)),i._majorUnit=s.major.enabled&&"year"!==i._unit?function(t){for(var e=ii.indexOf(t)+1,n=ii.length;e<n;++e)if(ni[ii[e]].common)return ii[e]}(i._unit):void 0,i._table=function(t,e,n,i){if("linear"===i||!t.length)return[{time:e,pos:0},{time:n,pos:1}];var a,r,o,s,l,u=[],d=[e];for(a=0,r=t.length;a<r;++a)(s=t[a])>e&&s<n&&d.push(s);for(d.push(n),a=0,r=d.length;a<r;++a)l=d[a+1],o=d[a-1],s=d[a],void 0!==o&&void 0!==l&&Math.round((l+o)/2)===s||u.push({time:s,pos:a/(r-1)});return u}(i._timestamps.data,a,r,f),i._offsets=function(t,e,n,i,a){var r,o,s=0,l=0;return a.offset&&e.length&&(r=si(t,"time",e[0],"pos"),s=1===e.length?1-r:(si(t,"time",e[1],"pos")-r)/2,o=si(t,"time",e[e.length-1],"pos"),l=1===e.length?o:(o-si(t,"time",e[e.length-2],"pos"))/2),{start:s,end:l,factor:1/(s+1+l)}}(i._table,d,0,0,o),s.reverse&&d.reverse(),hi(i,d,i._majorUnit)},getLabelForIndex:function(t,e){var n=this,i=n._adapter,a=n.chart.data,r=n.options.time,o=a.labels&&t<a.labels.length?a.labels[t]:"",s=a.datasets[e].data[t];return B.isObject(s)&&(o=n.getRightValue(s)),r.tooltipFormat?i.format(li(n,o),r.tooltipFormat):"string"==typeof o?o:i.format(li(n,o),r.displayFormats.datetime)},tickFormatFunction:function(t,e,n,i){var a=this._adapter,r=this.options,o=r.time.displayFormats,s=o[this._unit],l=this._majorUnit,u=o[l],d=n[e],h=r.ticks,c=l&&u&&d&&d.major,f=a.format(t,i||(c?u:s)),g=c?h.major:h.minor,m=Jn([g.callback,g.userCallback,h.callback,h.userCallback]);return m?m(f,e,n):f},convertTicksToLabels:function(t){var e,n,i=[];for(e=0,n=t.length;e<n;++e)i.push(this.tickFormatFunction(t[e].value,e,t));return i},getPixelForOffset:function(t){var e=this._offsets,n=si(this._table,"time",t,"pos");return this.getPixelForDecimal((e.start+n)*e.factor)},getPixelForValue:function(t,e,n){var i=null;if(void 0!==e&&void 0!==n&&(i=this._timestamps.datasets[n][e]),null===i&&(i=ui(this,t)),null!==i)return this.getPixelForOffset(i)},getPixelForTick:function(t){var e=this.getTicks();return t>=0&&t<e.length?this.getPixelForOffset(e[t].value):null},getValueForPixel:function(t){var e=this._offsets,n=this.getDecimalForPixel(t)/e.factor-e.end,i=si(this._table,"pos",n,"time");return this._adapter._create(i)},_getLabelSize:function(t){var e=this.options.ticks,n=this.ctx.measureText(t).width,i=B.toRadians(this.isHorizontal()?e.maxRotation:e.minRotation),a=Math.cos(i),r=Math.sin(i),o=Qn(e.fontSize,Y.global.defaultFontSize);return{w:n*a+o*r,h:n*r+o*a}},getLabelWidth:function(t){return this._getLabelSize(t).w},getLabelCapacity:function(t){var e=this,n=e.options.time,i=n.displayFormats,a=i[n.unit]||i.millisecond,r=e.tickFormatFunction(t,0,hi(e,[t],e._majorUnit),a),o=e._getLabelSize(r),s=Math.floor(e.isHorizontal()?e.width/o.w:e.height/o.h);return e.options.offset&&s--,s>0?s:1}}),fi={position:"bottom",distribution:"linear",bounds:"data",adapters:{},time:{parser:!1,unit:!1,round:!1,displayFormat:!1,isoWeekday:!1,minUnit:"millisecond",displayFormats:{}},ticks:{autoSkip:!1,source:"auto",major:{enabled:!1}}};ci._defaults=fi;var gi={category:kn,linear:An,logarithmic:Wn,radialLinear:$n,time:ci},mi=e((function(e,n){e.exports=function(){var n,i;function a(){return n.apply(null,arguments)}function r(t){return t instanceof Array||"[object Array]"===Object.prototype.toString.call(t)}function o(t){return null!=t&&"[object Object]"===Object.prototype.toString.call(t)}function s(t){return void 0===t}function l(t){return"number"==typeof t||"[object Number]"===Object.prototype.toString.call(t)}function u(t){return t instanceof Date||"[object Date]"===Object.prototype.toString.call(t)}function d(t,e){var n,i=[];for(n=0;n<t.length;++n)i.push(e(t[n],n));return i}function h(t,e){return Object.prototype.hasOwnProperty.call(t,e)}function c(t,e){for(var n in e)h(e,n)&&(t[n]=e[n]);return h(e,"toString")&&(t.toString=e.toString),h(e,"valueOf")&&(t.valueOf=e.valueOf),t}function f(t,e,n,i){return Ie(t,e,n,i,!0).utc()}function g(t){return null==t._pf&&(t._pf={empty:!1,unusedTokens:[],unusedInput:[],overflow:-2,charsLeftOver:0,nullInput:!1,invalidMonth:null,invalidFormat:!1,userInvalidated:!1,iso:!1,parsedDateParts:[],meridiem:null,rfc2822:!1,weekdayMismatch:!1}),t._pf}function m(t){if(null==t._isValid){var e=g(t),n=i.call(e.parsedDateParts,(function(t){return null!=t})),a=!isNaN(t._d.getTime())&&e.overflow<0&&!e.empty&&!e.invalidMonth&&!e.invalidWeekday&&!e.weekdayMismatch&&!e.nullInput&&!e.invalidFormat&&!e.userInvalidated&&(!e.meridiem||e.meridiem&&n);if(t._strict&&(a=a&&0===e.charsLeftOver&&0===e.unusedTokens.length&&void 0===e.bigHour),null!=Object.isFrozen&&Object.isFrozen(t))return a;t._isValid=a}return t._isValid}function p(t){var e=f(NaN);return null!=t?c(g(e),t):g(e).userInvalidated=!0,e}i=Array.prototype.some?Array.prototype.some:function(t){for(var e=Object(this),n=e.length>>>0,i=0;i<n;i++)if(i in e&&t.call(this,e[i],i,e))return!0;return!1};var v=a.momentProperties=[];function b(t,e){var n,i,a;if(s(e._isAMomentObject)||(t._isAMomentObject=e._isAMomentObject),s(e._i)||(t._i=e._i),s(e._f)||(t._f=e._f),s(e._l)||(t._l=e._l),s(e._strict)||(t._strict=e._strict),s(e._tzm)||(t._tzm=e._tzm),s(e._isUTC)||(t._isUTC=e._isUTC),s(e._offset)||(t._offset=e._offset),s(e._pf)||(t._pf=g(e)),s(e._locale)||(t._locale=e._locale),v.length>0)for(n=0;n<v.length;n++)s(a=e[i=v[n]])||(t[i]=a);return t}var y=!1;function x(t){b(this,t),this._d=new Date(null!=t._d?t._d.getTime():NaN),this.isValid()||(this._d=new Date(NaN)),!1===y&&(y=!0,a.updateOffset(this),y=!1)}function _(t){return t instanceof x||null!=t&&null!=t._isAMomentObject}function w(t){return t<0?Math.ceil(t)||0:Math.floor(t)}function k(t){var e=+t,n=0;return 0!==e&&isFinite(e)&&(n=w(e)),n}function M(t,e,n){var i,a=Math.min(t.length,e.length),r=Math.abs(t.length-e.length),o=0;for(i=0;i<a;i++)(n&&t[i]!==e[i]||!n&&k(t[i])!==k(e[i]))&&o++;return o+r}function S(t){!1===a.suppressDeprecationWarnings&&"undefined"!=typeof console&&console.warn&&console.warn("Deprecation warning: "+t)}function D(t,e){var n=!0;return c((function(){if(null!=a.deprecationHandler&&a.deprecationHandler(null,t),n){for(var i,r=[],o=0;o<arguments.length;o++){if(i="","object"==typeof arguments[o]){for(var s in i+="\n["+o+"] ",arguments[0])i+=s+": "+arguments[0][s]+", ";i=i.slice(0,-2)}else i=arguments[o];r.push(i)}S(t+"\nArguments: "+Array.prototype.slice.call(r).join("")+"\n"+(new Error).stack),n=!1}return e.apply(this,arguments)}),e)}var C,P={};function T(t,e){null!=a.deprecationHandler&&a.deprecationHandler(t,e),P[t]||(S(e),P[t]=!0)}function O(t){return t instanceof Function||"[object Function]"===Object.prototype.toString.call(t)}function A(t,e){var n,i=c({},t);for(n in e)h(e,n)&&(o(t[n])&&o(e[n])?(i[n]={},c(i[n],t[n]),c(i[n],e[n])):null!=e[n]?i[n]=e[n]:delete i[n]);for(n in t)h(t,n)&&!h(e,n)&&o(t[n])&&(i[n]=c({},i[n]));return i}function F(t){null!=t&&this.set(t)}a.suppressDeprecationWarnings=!1,a.deprecationHandler=null,C=Object.keys?Object.keys:function(t){var e,n=[];for(e in t)h(t,e)&&n.push(e);return n};var I={};function L(t,e){var n=t.toLowerCase();I[n]=I[n+"s"]=I[e]=t}function R(t){return"string"==typeof t?I[t]||I[t.toLowerCase()]:void 0}function N(t){var e,n,i={};for(n in t)h(t,n)&&(e=R(n))&&(i[e]=t[n]);return i}var W={};function Y(t,e){W[t]=e}function z(t,e,n){var i=""+Math.abs(t),a=e-i.length;return(t>=0?n?"+":"":"-")+Math.pow(10,Math.max(0,a)).toString().substr(1)+i}var E=/(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g,V=/(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g,H={},B={};function j(t,e,n,i){var a=i;"string"==typeof i&&(a=function(){return this[i]()}),t&&(B[t]=a),e&&(B[e[0]]=function(){return z(a.apply(this,arguments),e[1],e[2])}),n&&(B[n]=function(){return this.localeData().ordinal(a.apply(this,arguments),t)})}function U(t,e){return t.isValid()?(e=G(e,t.localeData()),H[e]=H[e]||function(t){var e,n,i,a=t.match(E);for(e=0,n=a.length;e<n;e++)B[a[e]]?a[e]=B[a[e]]:a[e]=(i=a[e]).match(/\[[\s\S]/)?i.replace(/^\[|\]$/g,""):i.replace(/\\/g,"");return function(e){var i,r="";for(i=0;i<n;i++)r+=O(a[i])?a[i].call(e,t):a[i];return r}}(e),H[e](t)):t.localeData().invalidDate()}function G(t,e){var n=5;function i(t){return e.longDateFormat(t)||t}for(V.lastIndex=0;n>=0&&V.test(t);)t=t.replace(V,i),V.lastIndex=0,n-=1;return t}var q=/\d/,Z=/\d\d/,$=/\d{3}/,X=/\d{4}/,K=/[+-]?\d{6}/,J=/\d\d?/,Q=/\d\d\d\d?/,tt=/\d\d\d\d\d\d?/,et=/\d{1,3}/,nt=/\d{1,4}/,it=/[+-]?\d{1,6}/,at=/\d+/,rt=/[+-]?\d+/,ot=/Z|[+-]\d\d:?\d\d/gi,st=/Z|[+-]\d\d(?::?\d\d)?/gi,lt=/[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFF07\uFF10-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i,ut={};function dt(t,e,n){ut[t]=O(e)?e:function(t,i){return t&&n?n:e}}function ht(t,e){return h(ut,t)?ut[t](e._strict,e._locale):new RegExp(ct(t.replace("\\","").replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,(function(t,e,n,i,a){return e||n||i||a}))))}function ct(t){return t.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}var ft={};function gt(t,e){var n,i=e;for("string"==typeof t&&(t=[t]),l(e)&&(i=function(t,n){n[e]=k(t)}),n=0;n<t.length;n++)ft[t[n]]=i}function mt(t,e){gt(t,(function(t,n,i,a){i._w=i._w||{},e(t,i._w,i,a)}))}function pt(t,e,n){null!=e&&h(ft,t)&&ft[t](e,n._a,n,t)}var vt=0,bt=1,yt=2,xt=3,_t=4,wt=5,kt=6,Mt=7,St=8;function Dt(t){return Ct(t)?366:365}function Ct(t){return t%4==0&&t%100!=0||t%400==0}j("Y",0,0,(function(){var t=this.year();return t<=9999?""+t:"+"+t})),j(0,["YY",2],0,(function(){return this.year()%100})),j(0,["YYYY",4],0,"year"),j(0,["YYYYY",5],0,"year"),j(0,["YYYYYY",6,!0],0,"year"),L("year","y"),Y("year",1),dt("Y",rt),dt("YY",J,Z),dt("YYYY",nt,X),dt("YYYYY",it,K),dt("YYYYYY",it,K),gt(["YYYYY","YYYYYY"],vt),gt("YYYY",(function(t,e){e[vt]=2===t.length?a.parseTwoDigitYear(t):k(t)})),gt("YY",(function(t,e){e[vt]=a.parseTwoDigitYear(t)})),gt("Y",(function(t,e){e[vt]=parseInt(t,10)})),a.parseTwoDigitYear=function(t){return k(t)+(k(t)>68?1900:2e3)};var Pt,Tt=Ot("FullYear",!0);function Ot(t,e){return function(n){return null!=n?(Ft(this,t,n),a.updateOffset(this,e),this):At(this,t)}}function At(t,e){return t.isValid()?t._d["get"+(t._isUTC?"UTC":"")+e]():NaN}function Ft(t,e,n){t.isValid()&&!isNaN(n)&&("FullYear"===e&&Ct(t.year())&&1===t.month()&&29===t.date()?t._d["set"+(t._isUTC?"UTC":"")+e](n,t.month(),It(n,t.month())):t._d["set"+(t._isUTC?"UTC":"")+e](n))}function It(t,e){if(isNaN(t)||isNaN(e))return NaN;var n=function(t,e){return(t%e+e)%e}(e,12);return t+=(e-n)/12,1===n?Ct(t)?29:28:31-n%7%2}Pt=Array.prototype.indexOf?Array.prototype.indexOf:function(t){var e;for(e=0;e<this.length;++e)if(this[e]===t)return e;return-1},j("M",["MM",2],"Mo",(function(){return this.month()+1})),j("MMM",0,0,(function(t){return this.localeData().monthsShort(this,t)})),j("MMMM",0,0,(function(t){return this.localeData().months(this,t)})),L("month","M"),Y("month",8),dt("M",J),dt("MM",J,Z),dt("MMM",(function(t,e){return e.monthsShortRegex(t)})),dt("MMMM",(function(t,e){return e.monthsRegex(t)})),gt(["M","MM"],(function(t,e){e[bt]=k(t)-1})),gt(["MMM","MMMM"],(function(t,e,n,i){var a=n._locale.monthsParse(t,i,n._strict);null!=a?e[bt]=a:g(n).invalidMonth=t}));var Lt=/D[oD]?(\[[^\[\]]*\]|\s)+MMMM?/,Rt="January_February_March_April_May_June_July_August_September_October_November_December".split("_"),Nt="Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_");function Wt(t,e,n){var i,a,r,o=t.toLocaleLowerCase();if(!this._monthsParse)for(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[],i=0;i<12;++i)r=f([2e3,i]),this._shortMonthsParse[i]=this.monthsShort(r,"").toLocaleLowerCase(),this._longMonthsParse[i]=this.months(r,"").toLocaleLowerCase();return n?"MMM"===e?-1!==(a=Pt.call(this._shortMonthsParse,o))?a:null:-1!==(a=Pt.call(this._longMonthsParse,o))?a:null:"MMM"===e?-1!==(a=Pt.call(this._shortMonthsParse,o))?a:-1!==(a=Pt.call(this._longMonthsParse,o))?a:null:-1!==(a=Pt.call(this._longMonthsParse,o))?a:-1!==(a=Pt.call(this._shortMonthsParse,o))?a:null}function Yt(t,e){var n;if(!t.isValid())return t;if("string"==typeof e)if(/^\d+$/.test(e))e=k(e);else if(!l(e=t.localeData().monthsParse(e)))return t;return n=Math.min(t.date(),It(t.year(),e)),t._d["set"+(t._isUTC?"UTC":"")+"Month"](e,n),t}function zt(t){return null!=t?(Yt(this,t),a.updateOffset(this,!0),this):At(this,"Month")}var Et=lt,Vt=lt;function Ht(){function t(t,e){return e.length-t.length}var e,n,i=[],a=[],r=[];for(e=0;e<12;e++)n=f([2e3,e]),i.push(this.monthsShort(n,"")),a.push(this.months(n,"")),r.push(this.months(n,"")),r.push(this.monthsShort(n,""));for(i.sort(t),a.sort(t),r.sort(t),e=0;e<12;e++)i[e]=ct(i[e]),a[e]=ct(a[e]);for(e=0;e<24;e++)r[e]=ct(r[e]);this._monthsRegex=new RegExp("^("+r.join("|")+")","i"),this._monthsShortRegex=this._monthsRegex,this._monthsStrictRegex=new RegExp("^("+a.join("|")+")","i"),this._monthsShortStrictRegex=new RegExp("^("+i.join("|")+")","i")}function Bt(t,e,n,i,a,r,o){var s;return t<100&&t>=0?(s=new Date(t+400,e,n,i,a,r,o),isFinite(s.getFullYear())&&s.setFullYear(t)):s=new Date(t,e,n,i,a,r,o),s}function jt(t){var e;if(t<100&&t>=0){var n=Array.prototype.slice.call(arguments);n[0]=t+400,e=new Date(Date.UTC.apply(null,n)),isFinite(e.getUTCFullYear())&&e.setUTCFullYear(t)}else e=new Date(Date.UTC.apply(null,arguments));return e}function Ut(t,e,n){var i=7+e-n;return-(7+jt(t,0,i).getUTCDay()-e)%7+i-1}function Gt(t,e,n,i,a){var r,o,s=1+7*(e-1)+(7+n-i)%7+Ut(t,i,a);return s<=0?o=Dt(r=t-1)+s:s>Dt(t)?(r=t+1,o=s-Dt(t)):(r=t,o=s),{year:r,dayOfYear:o}}function qt(t,e,n){var i,a,r=Ut(t.year(),e,n),o=Math.floor((t.dayOfYear()-r-1)/7)+1;return o<1?i=o+Zt(a=t.year()-1,e,n):o>Zt(t.year(),e,n)?(i=o-Zt(t.year(),e,n),a=t.year()+1):(a=t.year(),i=o),{week:i,year:a}}function Zt(t,e,n){var i=Ut(t,e,n),a=Ut(t+1,e,n);return(Dt(t)-i+a)/7}function $t(t,e){return t.slice(e,7).concat(t.slice(0,e))}j("w",["ww",2],"wo","week"),j("W",["WW",2],"Wo","isoWeek"),L("week","w"),L("isoWeek","W"),Y("week",5),Y("isoWeek",5),dt("w",J),dt("ww",J,Z),dt("W",J),dt("WW",J,Z),mt(["w","ww","W","WW"],(function(t,e,n,i){e[i.substr(0,1)]=k(t)})),j("d",0,"do","day"),j("dd",0,0,(function(t){return this.localeData().weekdaysMin(this,t)})),j("ddd",0,0,(function(t){return this.localeData().weekdaysShort(this,t)})),j("dddd",0,0,(function(t){return this.localeData().weekdays(this,t)})),j("e",0,0,"weekday"),j("E",0,0,"isoWeekday"),L("day","d"),L("weekday","e"),L("isoWeekday","E"),Y("day",11),Y("weekday",11),Y("isoWeekday",11),dt("d",J),dt("e",J),dt("E",J),dt("dd",(function(t,e){return e.weekdaysMinRegex(t)})),dt("ddd",(function(t,e){return e.weekdaysShortRegex(t)})),dt("dddd",(function(t,e){return e.weekdaysRegex(t)})),mt(["dd","ddd","dddd"],(function(t,e,n,i){var a=n._locale.weekdaysParse(t,i,n._strict);null!=a?e.d=a:g(n).invalidWeekday=t})),mt(["d","e","E"],(function(t,e,n,i){e[i]=k(t)}));var Xt="Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),Kt="Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),Jt="Su_Mo_Tu_We_Th_Fr_Sa".split("_");function Qt(t,e,n){var i,a,r,o=t.toLocaleLowerCase();if(!this._weekdaysParse)for(this._weekdaysParse=[],this._shortWeekdaysParse=[],this._minWeekdaysParse=[],i=0;i<7;++i)r=f([2e3,1]).day(i),this._minWeekdaysParse[i]=this.weekdaysMin(r,"").toLocaleLowerCase(),this._shortWeekdaysParse[i]=this.weekdaysShort(r,"").toLocaleLowerCase(),this._weekdaysParse[i]=this.weekdays(r,"").toLocaleLowerCase();return n?"dddd"===e?-1!==(a=Pt.call(this._weekdaysParse,o))?a:null:"ddd"===e?-1!==(a=Pt.call(this._shortWeekdaysParse,o))?a:null:-1!==(a=Pt.call(this._minWeekdaysParse,o))?a:null:"dddd"===e?-1!==(a=Pt.call(this._weekdaysParse,o))?a:-1!==(a=Pt.call(this._shortWeekdaysParse,o))?a:-1!==(a=Pt.call(this._minWeekdaysParse,o))?a:null:"ddd"===e?-1!==(a=Pt.call(this._shortWeekdaysParse,o))?a:-1!==(a=Pt.call(this._weekdaysParse,o))?a:-1!==(a=Pt.call(this._minWeekdaysParse,o))?a:null:-1!==(a=Pt.call(this._minWeekdaysParse,o))?a:-1!==(a=Pt.call(this._weekdaysParse,o))?a:-1!==(a=Pt.call(this._shortWeekdaysParse,o))?a:null}var te=lt,ee=lt,ne=lt;function ie(){function t(t,e){return e.length-t.length}var e,n,i,a,r,o=[],s=[],l=[],u=[];for(e=0;e<7;e++)n=f([2e3,1]).day(e),i=this.weekdaysMin(n,""),a=this.weekdaysShort(n,""),r=this.weekdays(n,""),o.push(i),s.push(a),l.push(r),u.push(i),u.push(a),u.push(r);for(o.sort(t),s.sort(t),l.sort(t),u.sort(t),e=0;e<7;e++)s[e]=ct(s[e]),l[e]=ct(l[e]),u[e]=ct(u[e]);this._weekdaysRegex=new RegExp("^("+u.join("|")+")","i"),this._weekdaysShortRegex=this._weekdaysRegex,this._weekdaysMinRegex=this._weekdaysRegex,this._weekdaysStrictRegex=new RegExp("^("+l.join("|")+")","i"),this._weekdaysShortStrictRegex=new RegExp("^("+s.join("|")+")","i"),this._weekdaysMinStrictRegex=new RegExp("^("+o.join("|")+")","i")}function ae(){return this.hours()%12||12}function re(t,e){j(t,0,0,(function(){return this.localeData().meridiem(this.hours(),this.minutes(),e)}))}function oe(t,e){return e._meridiemParse}j("H",["HH",2],0,"hour"),j("h",["hh",2],0,ae),j("k",["kk",2],0,(function(){return this.hours()||24})),j("hmm",0,0,(function(){return""+ae.apply(this)+z(this.minutes(),2)})),j("hmmss",0,0,(function(){return""+ae.apply(this)+z(this.minutes(),2)+z(this.seconds(),2)})),j("Hmm",0,0,(function(){return""+this.hours()+z(this.minutes(),2)})),j("Hmmss",0,0,(function(){return""+this.hours()+z(this.minutes(),2)+z(this.seconds(),2)})),re("a",!0),re("A",!1),L("hour","h"),Y("hour",13),dt("a",oe),dt("A",oe),dt("H",J),dt("h",J),dt("k",J),dt("HH",J,Z),dt("hh",J,Z),dt("kk",J,Z),dt("hmm",Q),dt("hmmss",tt),dt("Hmm",Q),dt("Hmmss",tt),gt(["H","HH"],xt),gt(["k","kk"],(function(t,e,n){var i=k(t);e[xt]=24===i?0:i})),gt(["a","A"],(function(t,e,n){n._isPm=n._locale.isPM(t),n._meridiem=t})),gt(["h","hh"],(function(t,e,n){e[xt]=k(t),g(n).bigHour=!0})),gt("hmm",(function(t,e,n){var i=t.length-2;e[xt]=k(t.substr(0,i)),e[_t]=k(t.substr(i)),g(n).bigHour=!0})),gt("hmmss",(function(t,e,n){var i=t.length-4,a=t.length-2;e[xt]=k(t.substr(0,i)),e[_t]=k(t.substr(i,2)),e[wt]=k(t.substr(a)),g(n).bigHour=!0})),gt("Hmm",(function(t,e,n){var i=t.length-2;e[xt]=k(t.substr(0,i)),e[_t]=k(t.substr(i))})),gt("Hmmss",(function(t,e,n){var i=t.length-4,a=t.length-2;e[xt]=k(t.substr(0,i)),e[_t]=k(t.substr(i,2)),e[wt]=k(t.substr(a))}));var se,le=Ot("Hours",!0),ue={calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},longDateFormat:{LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},invalidDate:"Invalid date",ordinal:"%d",dayOfMonthOrdinalParse:/\d{1,2}/,relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},months:Rt,monthsShort:Nt,week:{dow:0,doy:6},weekdays:Xt,weekdaysMin:Jt,weekdaysShort:Kt,meridiemParse:/[ap]\.?m?\.?/i},de={},he={};function ce(t){return t?t.toLowerCase().replace("_","-"):t}function fe(n){var i=null;if(!de[n]&&e&&e.exports)try{i=se._abbr,t(),ge(i)}catch(t){}return de[n]}function ge(t,e){var n;return t&&((n=s(e)?pe(t):me(t,e))?se=n:"undefined"!=typeof console&&console.warn&&console.warn("Locale "+t+" not found. Did you forget to load it?")),se._abbr}function me(t,e){if(null!==e){var n,i=ue;if(e.abbr=t,null!=de[t])T("defineLocaleOverride","use moment.updateLocale(localeName, config) to change an existing locale. moment.defineLocale(localeName, config) should only be used for creating a new locale See http://momentjs.com/guides/#/warnings/define-locale/ for more info."),i=de[t]._config;else if(null!=e.parentLocale)if(null!=de[e.parentLocale])i=de[e.parentLocale]._config;else{if(null==(n=fe(e.parentLocale)))return he[e.parentLocale]||(he[e.parentLocale]=[]),he[e.parentLocale].push({name:t,config:e}),null;i=n._config}return de[t]=new F(A(i,e)),he[t]&&he[t].forEach((function(t){me(t.name,t.config)})),ge(t),de[t]}return delete de[t],null}function pe(t){var e;if(t&&t._locale&&t._locale._abbr&&(t=t._locale._abbr),!t)return se;if(!r(t)){if(e=fe(t))return e;t=[t]}return function(t){for(var e,n,i,a,r=0;r<t.length;){for(e=(a=ce(t[r]).split("-")).length,n=(n=ce(t[r+1]))?n.split("-"):null;e>0;){if(i=fe(a.slice(0,e).join("-")))return i;if(n&&n.length>=e&&M(a,n,!0)>=e-1)break;e--}r++}return se}(t)}function ve(t){var e,n=t._a;return n&&-2===g(t).overflow&&(e=n[bt]<0||n[bt]>11?bt:n[yt]<1||n[yt]>It(n[vt],n[bt])?yt:n[xt]<0||n[xt]>24||24===n[xt]&&(0!==n[_t]||0!==n[wt]||0!==n[kt])?xt:n[_t]<0||n[_t]>59?_t:n[wt]<0||n[wt]>59?wt:n[kt]<0||n[kt]>999?kt:-1,g(t)._overflowDayOfYear&&(e<vt||e>yt)&&(e=yt),g(t)._overflowWeeks&&-1===e&&(e=Mt),g(t)._overflowWeekday&&-1===e&&(e=St),g(t).overflow=e),t}function be(t,e,n){return null!=t?t:null!=e?e:n}function ye(t){var e,n,i,r,o,s=[];if(!t._d){for(i=function(t){var e=new Date(a.now());return t._useUTC?[e.getUTCFullYear(),e.getUTCMonth(),e.getUTCDate()]:[e.getFullYear(),e.getMonth(),e.getDate()]}(t),t._w&&null==t._a[yt]&&null==t._a[bt]&&function(t){var e,n,i,a,r,o,s,l;if(null!=(e=t._w).GG||null!=e.W||null!=e.E)r=1,o=4,n=be(e.GG,t._a[vt],qt(Le(),1,4).year),i=be(e.W,1),((a=be(e.E,1))<1||a>7)&&(l=!0);else{r=t._locale._week.dow,o=t._locale._week.doy;var u=qt(Le(),r,o);n=be(e.gg,t._a[vt],u.year),i=be(e.w,u.week),null!=e.d?((a=e.d)<0||a>6)&&(l=!0):null!=e.e?(a=e.e+r,(e.e<0||e.e>6)&&(l=!0)):a=r}i<1||i>Zt(n,r,o)?g(t)._overflowWeeks=!0:null!=l?g(t)._overflowWeekday=!0:(s=Gt(n,i,a,r,o),t._a[vt]=s.year,t._dayOfYear=s.dayOfYear)}(t),null!=t._dayOfYear&&(o=be(t._a[vt],i[vt]),(t._dayOfYear>Dt(o)||0===t._dayOfYear)&&(g(t)._overflowDayOfYear=!0),n=jt(o,0,t._dayOfYear),t._a[bt]=n.getUTCMonth(),t._a[yt]=n.getUTCDate()),e=0;e<3&&null==t._a[e];++e)t._a[e]=s[e]=i[e];for(;e<7;e++)t._a[e]=s[e]=null==t._a[e]?2===e?1:0:t._a[e];24===t._a[xt]&&0===t._a[_t]&&0===t._a[wt]&&0===t._a[kt]&&(t._nextDay=!0,t._a[xt]=0),t._d=(t._useUTC?jt:Bt).apply(null,s),r=t._useUTC?t._d.getUTCDay():t._d.getDay(),null!=t._tzm&&t._d.setUTCMinutes(t._d.getUTCMinutes()-t._tzm),t._nextDay&&(t._a[xt]=24),t._w&&void 0!==t._w.d&&t._w.d!==r&&(g(t).weekdayMismatch=!0)}}var xe=/^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,_e=/^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,we=/Z|[+-]\d\d(?::?\d\d)?/,ke=[["YYYYYY-MM-DD",/[+-]\d{6}-\d\d-\d\d/],["YYYY-MM-DD",/\d{4}-\d\d-\d\d/],["GGGG-[W]WW-E",/\d{4}-W\d\d-\d/],["GGGG-[W]WW",/\d{4}-W\d\d/,!1],["YYYY-DDD",/\d{4}-\d{3}/],["YYYY-MM",/\d{4}-\d\d/,!1],["YYYYYYMMDD",/[+-]\d{10}/],["YYYYMMDD",/\d{8}/],["GGGG[W]WWE",/\d{4}W\d{3}/],["GGGG[W]WW",/\d{4}W\d{2}/,!1],["YYYYDDD",/\d{7}/]],Me=[["HH:mm:ss.SSSS",/\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss,SSSS",/\d\d:\d\d:\d\d,\d+/],["HH:mm:ss",/\d\d:\d\d:\d\d/],["HH:mm",/\d\d:\d\d/],["HHmmss.SSSS",/\d\d\d\d\d\d\.\d+/],["HHmmss,SSSS",/\d\d\d\d\d\d,\d+/],["HHmmss",/\d\d\d\d\d\d/],["HHmm",/\d\d\d\d/],["HH",/\d\d/]],Se=/^\/?Date\((\-?\d+)/i;function De(t){var e,n,i,a,r,o,s=t._i,l=xe.exec(s)||_e.exec(s);if(l){for(g(t).iso=!0,e=0,n=ke.length;e<n;e++)if(ke[e][1].exec(l[1])){a=ke[e][0],i=!1!==ke[e][2];break}if(null==a)return void(t._isValid=!1);if(l[3]){for(e=0,n=Me.length;e<n;e++)if(Me[e][1].exec(l[3])){r=(l[2]||" ")+Me[e][0];break}if(null==r)return void(t._isValid=!1)}if(!i&&null!=r)return void(t._isValid=!1);if(l[4]){if(!we.exec(l[4]))return void(t._isValid=!1);o="Z"}t._f=a+(r||"")+(o||""),Ae(t)}else t._isValid=!1}var Ce=/^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\s)?(\d{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\d{2,4})\s(\d\d):(\d\d)(?::(\d\d))?\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|([+-]\d{4}))$/;function Pe(t){var e=parseInt(t,10);return e<=49?2e3+e:e<=999?1900+e:e}var Te={UT:0,GMT:0,EDT:-240,EST:-300,CDT:-300,CST:-360,MDT:-360,MST:-420,PDT:-420,PST:-480};function Oe(t){var e,n,i,a,r,o,s,l=Ce.exec(t._i.replace(/\([^)]*\)|[\n\t]/g," ").replace(/(\s\s+)/g," ").replace(/^\s\s*/,"").replace(/\s\s*$/,""));if(l){var u=(e=l[4],n=l[3],i=l[2],a=l[5],r=l[6],o=l[7],s=[Pe(e),Nt.indexOf(n),parseInt(i,10),parseInt(a,10),parseInt(r,10)],o&&s.push(parseInt(o,10)),s);if(!function(t,e,n){return!t||Kt.indexOf(t)===new Date(e[0],e[1],e[2]).getDay()||(g(n).weekdayMismatch=!0,n._isValid=!1,!1)}(l[1],u,t))return;t._a=u,t._tzm=function(t,e,n){if(t)return Te[t];if(e)return 0;var i=parseInt(n,10),a=i%100;return(i-a)/100*60+a}(l[8],l[9],l[10]),t._d=jt.apply(null,t._a),t._d.setUTCMinutes(t._d.getUTCMinutes()-t._tzm),g(t).rfc2822=!0}else t._isValid=!1}function Ae(t){if(t._f!==a.ISO_8601)if(t._f!==a.RFC_2822){t._a=[],g(t).empty=!0;var e,n,i,r,o,s=""+t._i,l=s.length,u=0;for(i=G(t._f,t._locale).match(E)||[],e=0;e<i.length;e++)r=i[e],(n=(s.match(ht(r,t))||[])[0])&&((o=s.substr(0,s.indexOf(n))).length>0&&g(t).unusedInput.push(o),s=s.slice(s.indexOf(n)+n.length),u+=n.length),B[r]?(n?g(t).empty=!1:g(t).unusedTokens.push(r),pt(r,n,t)):t._strict&&!n&&g(t).unusedTokens.push(r);g(t).charsLeftOver=l-u,s.length>0&&g(t).unusedInput.push(s),t._a[xt]<=12&&!0===g(t).bigHour&&t._a[xt]>0&&(g(t).bigHour=void 0),g(t).parsedDateParts=t._a.slice(0),g(t).meridiem=t._meridiem,t._a[xt]=function(t,e,n){var i;return null==n?e:null!=t.meridiemHour?t.meridiemHour(e,n):null!=t.isPM?((i=t.isPM(n))&&e<12&&(e+=12),i||12!==e||(e=0),e):e}(t._locale,t._a[xt],t._meridiem),ye(t),ve(t)}else Oe(t);else De(t)}function Fe(t){var e=t._i,n=t._f;return t._locale=t._locale||pe(t._l),null===e||void 0===n&&""===e?p({nullInput:!0}):("string"==typeof e&&(t._i=e=t._locale.preparse(e)),_(e)?new x(ve(e)):(u(e)?t._d=e:r(n)?function(t){var e,n,i,a,r;if(0===t._f.length)return g(t).invalidFormat=!0,void(t._d=new Date(NaN));for(a=0;a<t._f.length;a++)r=0,e=b({},t),null!=t._useUTC&&(e._useUTC=t._useUTC),e._f=t._f[a],Ae(e),m(e)&&(r+=g(e).charsLeftOver,r+=10*g(e).unusedTokens.length,g(e).score=r,(null==i||r<i)&&(i=r,n=e));c(t,n||e)}(t):n?Ae(t):function(t){var e=t._i;s(e)?t._d=new Date(a.now()):u(e)?t._d=new Date(e.valueOf()):"string"==typeof e?function(t){var e=Se.exec(t._i);null===e?(De(t),!1===t._isValid&&(delete t._isValid,Oe(t),!1===t._isValid&&(delete t._isValid,a.createFromInputFallback(t)))):t._d=new Date(+e[1])}(t):r(e)?(t._a=d(e.slice(0),(function(t){return parseInt(t,10)})),ye(t)):o(e)?function(t){if(!t._d){var e=N(t._i);t._a=d([e.year,e.month,e.day||e.date,e.hour,e.minute,e.second,e.millisecond],(function(t){return t&&parseInt(t,10)})),ye(t)}}(t):l(e)?t._d=new Date(e):a.createFromInputFallback(t)}(t),m(t)||(t._d=null),t))}function Ie(t,e,n,i,a){var s,l={};return!0!==n&&!1!==n||(i=n,n=void 0),(o(t)&&function(t){if(Object.getOwnPropertyNames)return 0===Object.getOwnPropertyNames(t).length;var e;for(e in t)if(t.hasOwnProperty(e))return!1;return!0}(t)||r(t)&&0===t.length)&&(t=void 0),l._isAMomentObject=!0,l._useUTC=l._isUTC=a,l._l=n,l._i=t,l._f=e,l._strict=i,(s=new x(ve(Fe(l))))._nextDay&&(s.add(1,"d"),s._nextDay=void 0),s}function Le(t,e,n,i){return Ie(t,e,n,i,!1)}a.createFromInputFallback=D("value provided is not in a recognized RFC2822 or ISO format. moment construction falls back to js Date(), which is not reliable across all browsers and versions. Non RFC2822/ISO date formats are discouraged and will be removed in an upcoming major release. Please refer to http://momentjs.com/guides/#/warnings/js-date/ for more info.",(function(t){t._d=new Date(t._i+(t._useUTC?" UTC":""))})),a.ISO_8601=function(){},a.RFC_2822=function(){};var Re=D("moment().min is deprecated, use moment.max instead. http://momentjs.com/guides/#/warnings/min-max/",(function(){var t=Le.apply(null,arguments);return this.isValid()&&t.isValid()?t<this?this:t:p()})),Ne=D("moment().max is deprecated, use moment.min instead. http://momentjs.com/guides/#/warnings/min-max/",(function(){var t=Le.apply(null,arguments);return this.isValid()&&t.isValid()?t>this?this:t:p()}));function We(t,e){var n,i;if(1===e.length&&r(e[0])&&(e=e[0]),!e.length)return Le();for(n=e[0],i=1;i<e.length;++i)e[i].isValid()&&!e[i][t](n)||(n=e[i]);return n}var Ye=["year","quarter","month","week","day","hour","minute","second","millisecond"];function ze(t){var e=N(t),n=e.year||0,i=e.quarter||0,a=e.month||0,r=e.week||e.isoWeek||0,o=e.day||0,s=e.hour||0,l=e.minute||0,u=e.second||0,d=e.millisecond||0;this._isValid=function(t){for(var e in t)if(-1===Pt.call(Ye,e)||null!=t[e]&&isNaN(t[e]))return!1;for(var n=!1,i=0;i<Ye.length;++i)if(t[Ye[i]]){if(n)return!1;parseFloat(t[Ye[i]])!==k(t[Ye[i]])&&(n=!0)}return!0}(e),this._milliseconds=+d+1e3*u+6e4*l+1e3*s*60*60,this._days=+o+7*r,this._months=+a+3*i+12*n,this._data={},this._locale=pe(),this._bubble()}function Ee(t){return t instanceof ze}function Ve(t){return t<0?-1*Math.round(-1*t):Math.round(t)}function He(t,e){j(t,0,0,(function(){var t=this.utcOffset(),n="+";return t<0&&(t=-t,n="-"),n+z(~~(t/60),2)+e+z(~~t%60,2)}))}He("Z",":"),He("ZZ",""),dt("Z",st),dt("ZZ",st),gt(["Z","ZZ"],(function(t,e,n){n._useUTC=!0,n._tzm=je(st,t)}));var Be=/([\+\-]|\d\d)/gi;function je(t,e){var n=(e||"").match(t);if(null===n)return null;var i=((n[n.length-1]||[])+"").match(Be)||["-",0,0],a=60*i[1]+k(i[2]);return 0===a?0:"+"===i[0]?a:-a}function Ue(t,e){var n,i;return e._isUTC?(n=e.clone(),i=(_(t)||u(t)?t.valueOf():Le(t).valueOf())-n.valueOf(),n._d.setTime(n._d.valueOf()+i),a.updateOffset(n,!1),n):Le(t).local()}function Ge(t){return 15*-Math.round(t._d.getTimezoneOffset()/15)}function qe(){return!!this.isValid()&&this._isUTC&&0===this._offset}a.updateOffset=function(){};var Ze=/^(\-|\+)?(?:(\d*)[. ])?(\d+)\:(\d+)(?:\:(\d+)(\.\d*)?)?$/,$e=/^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/;function Xe(t,e){var n,i,a,r,o,s,u=t,d=null;return Ee(t)?u={ms:t._milliseconds,d:t._days,M:t._months}:l(t)?(u={},e?u[e]=t:u.milliseconds=t):(d=Ze.exec(t))?(n="-"===d[1]?-1:1,u={y:0,d:k(d[yt])*n,h:k(d[xt])*n,m:k(d[_t])*n,s:k(d[wt])*n,ms:k(Ve(1e3*d[kt]))*n}):(d=$e.exec(t))?(n="-"===d[1]?-1:1,u={y:Ke(d[2],n),M:Ke(d[3],n),w:Ke(d[4],n),d:Ke(d[5],n),h:Ke(d[6],n),m:Ke(d[7],n),s:Ke(d[8],n)}):null==u?u={}:"object"==typeof u&&("from"in u||"to"in u)&&(r=Le(u.from),o=Le(u.to),a=r.isValid()&&o.isValid()?(o=Ue(o,r),r.isBefore(o)?s=Je(r,o):((s=Je(o,r)).milliseconds=-s.milliseconds,s.months=-s.months),s):{milliseconds:0,months:0},(u={}).ms=a.milliseconds,u.M=a.months),i=new ze(u),Ee(t)&&h(t,"_locale")&&(i._locale=t._locale),i}function Ke(t,e){var n=t&&parseFloat(t.replace(",","."));return(isNaN(n)?0:n)*e}function Je(t,e){var n={};return n.months=e.month()-t.month()+12*(e.year()-t.year()),t.clone().add(n.months,"M").isAfter(e)&&--n.months,n.milliseconds=+e-+t.clone().add(n.months,"M"),n}function Qe(t,e){return function(n,i){var a;return null===i||isNaN(+i)||(T(e,"moment()."+e+"(period, number) is deprecated. Please use moment()."+e+"(number, period). See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info."),a=n,n=i,i=a),tn(this,Xe(n="string"==typeof n?+n:n,i),t),this}}function tn(t,e,n,i){var r=e._milliseconds,o=Ve(e._days),s=Ve(e._months);t.isValid()&&(i=null==i||i,s&&Yt(t,At(t,"Month")+s*n),o&&Ft(t,"Date",At(t,"Date")+o*n),r&&t._d.setTime(t._d.valueOf()+r*n),i&&a.updateOffset(t,o||s))}Xe.fn=ze.prototype,Xe.invalid=function(){return Xe(NaN)};var en=Qe(1,"add"),nn=Qe(-1,"subtract");function an(t,e){var n=12*(e.year()-t.year())+(e.month()-t.month()),i=t.clone().add(n,"months");return-(n+(e-i<0?(e-i)/(i-t.clone().add(n-1,"months")):(e-i)/(t.clone().add(n+1,"months")-i)))||0}function rn(t){var e;return void 0===t?this._locale._abbr:(null!=(e=pe(t))&&(this._locale=e),this)}a.defaultFormat="YYYY-MM-DDTHH:mm:ssZ",a.defaultFormatUtc="YYYY-MM-DDTHH:mm:ss[Z]";var on=D("moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.",(function(t){return void 0===t?this.localeData():this.locale(t)}));function sn(){return this._locale}var ln=1e3,un=60*ln,dn=60*un,hn=3506328*dn;function cn(t,e){return(t%e+e)%e}function fn(t,e,n){return t<100&&t>=0?new Date(t+400,e,n)-hn:new Date(t,e,n).valueOf()}function gn(t,e,n){return t<100&&t>=0?Date.UTC(t+400,e,n)-hn:Date.UTC(t,e,n)}function mn(t,e){j(0,[t,t.length],0,e)}function pn(t,e,n,i,a){var r;return null==t?qt(this,i,a).year:(e>(r=Zt(t,i,a))&&(e=r),vn.call(this,t,e,n,i,a))}function vn(t,e,n,i,a){var r=Gt(t,e,n,i,a),o=jt(r.year,0,r.dayOfYear);return this.year(o.getUTCFullYear()),this.month(o.getUTCMonth()),this.date(o.getUTCDate()),this}j(0,["gg",2],0,(function(){return this.weekYear()%100})),j(0,["GG",2],0,(function(){return this.isoWeekYear()%100})),mn("gggg","weekYear"),mn("ggggg","weekYear"),mn("GGGG","isoWeekYear"),mn("GGGGG","isoWeekYear"),L("weekYear","gg"),L("isoWeekYear","GG"),Y("weekYear",1),Y("isoWeekYear",1),dt("G",rt),dt("g",rt),dt("GG",J,Z),dt("gg",J,Z),dt("GGGG",nt,X),dt("gggg",nt,X),dt("GGGGG",it,K),dt("ggggg",it,K),mt(["gggg","ggggg","GGGG","GGGGG"],(function(t,e,n,i){e[i.substr(0,2)]=k(t)})),mt(["gg","GG"],(function(t,e,n,i){e[i]=a.parseTwoDigitYear(t)})),j("Q",0,"Qo","quarter"),L("quarter","Q"),Y("quarter",7),dt("Q",q),gt("Q",(function(t,e){e[bt]=3*(k(t)-1)})),j("D",["DD",2],"Do","date"),L("date","D"),Y("date",9),dt("D",J),dt("DD",J,Z),dt("Do",(function(t,e){return t?e._dayOfMonthOrdinalParse||e._ordinalParse:e._dayOfMonthOrdinalParseLenient})),gt(["D","DD"],yt),gt("Do",(function(t,e){e[yt]=k(t.match(J)[0])}));var bn=Ot("Date",!0);j("DDD",["DDDD",3],"DDDo","dayOfYear"),L("dayOfYear","DDD"),Y("dayOfYear",4),dt("DDD",et),dt("DDDD",$),gt(["DDD","DDDD"],(function(t,e,n){n._dayOfYear=k(t)})),j("m",["mm",2],0,"minute"),L("minute","m"),Y("minute",14),dt("m",J),dt("mm",J,Z),gt(["m","mm"],_t);var yn=Ot("Minutes",!1);j("s",["ss",2],0,"second"),L("second","s"),Y("second",15),dt("s",J),dt("ss",J,Z),gt(["s","ss"],wt);var xn,_n=Ot("Seconds",!1);for(j("S",0,0,(function(){return~~(this.millisecond()/100)})),j(0,["SS",2],0,(function(){return~~(this.millisecond()/10)})),j(0,["SSS",3],0,"millisecond"),j(0,["SSSS",4],0,(function(){return 10*this.millisecond()})),j(0,["SSSSS",5],0,(function(){return 100*this.millisecond()})),j(0,["SSSSSS",6],0,(function(){return 1e3*this.millisecond()})),j(0,["SSSSSSS",7],0,(function(){return 1e4*this.millisecond()})),j(0,["SSSSSSSS",8],0,(function(){return 1e5*this.millisecond()})),j(0,["SSSSSSSSS",9],0,(function(){return 1e6*this.millisecond()})),L("millisecond","ms"),Y("millisecond",16),dt("S",et,q),dt("SS",et,Z),dt("SSS",et,$),xn="SSSS";xn.length<=9;xn+="S")dt(xn,at);function wn(t,e){e[kt]=k(1e3*("0."+t))}for(xn="S";xn.length<=9;xn+="S")gt(xn,wn);var kn=Ot("Milliseconds",!1);j("z",0,0,"zoneAbbr"),j("zz",0,0,"zoneName");var Mn=x.prototype;function Sn(t){return t}Mn.add=en,Mn.calendar=function(t,e){var n=t||Le(),i=Ue(n,this).startOf("day"),r=a.calendarFormat(this,i)||"sameElse",o=e&&(O(e[r])?e[r].call(this,n):e[r]);return this.format(o||this.localeData().calendar(r,this,Le(n)))},Mn.clone=function(){return new x(this)},Mn.diff=function(t,e,n){var i,a,r;if(!this.isValid())return NaN;if(!(i=Ue(t,this)).isValid())return NaN;switch(a=6e4*(i.utcOffset()-this.utcOffset()),e=R(e)){case"year":r=an(this,i)/12;break;case"month":r=an(this,i);break;case"quarter":r=an(this,i)/3;break;case"second":r=(this-i)/1e3;break;case"minute":r=(this-i)/6e4;break;case"hour":r=(this-i)/36e5;break;case"day":r=(this-i-a)/864e5;break;case"week":r=(this-i-a)/6048e5;break;default:r=this-i}return n?r:w(r)},Mn.endOf=function(t){var e;if(void 0===(t=R(t))||"millisecond"===t||!this.isValid())return this;var n=this._isUTC?gn:fn;switch(t){case"year":e=n(this.year()+1,0,1)-1;break;case"quarter":e=n(this.year(),this.month()-this.month()%3+3,1)-1;break;case"month":e=n(this.year(),this.month()+1,1)-1;break;case"week":e=n(this.year(),this.month(),this.date()-this.weekday()+7)-1;break;case"isoWeek":e=n(this.year(),this.month(),this.date()-(this.isoWeekday()-1)+7)-1;break;case"day":case"date":e=n(this.year(),this.month(),this.date()+1)-1;break;case"hour":e=this._d.valueOf(),e+=dn-cn(e+(this._isUTC?0:this.utcOffset()*un),dn)-1;break;case"minute":e=this._d.valueOf(),e+=un-cn(e,un)-1;break;case"second":e=this._d.valueOf(),e+=ln-cn(e,ln)-1}return this._d.setTime(e),a.updateOffset(this,!0),this},Mn.format=function(t){t||(t=this.isUtc()?a.defaultFormatUtc:a.defaultFormat);var e=U(this,t);return this.localeData().postformat(e)},Mn.from=function(t,e){return this.isValid()&&(_(t)&&t.isValid()||Le(t).isValid())?Xe({to:this,from:t}).locale(this.locale()).humanize(!e):this.localeData().invalidDate()},Mn.fromNow=function(t){return this.from(Le(),t)},Mn.to=function(t,e){return this.isValid()&&(_(t)&&t.isValid()||Le(t).isValid())?Xe({from:this,to:t}).locale(this.locale()).humanize(!e):this.localeData().invalidDate()},Mn.toNow=function(t){return this.to(Le(),t)},Mn.get=function(t){return O(this[t=R(t)])?this[t]():this},Mn.invalidAt=function(){return g(this).overflow},Mn.isAfter=function(t,e){var n=_(t)?t:Le(t);return!(!this.isValid()||!n.isValid())&&("millisecond"===(e=R(e)||"millisecond")?this.valueOf()>n.valueOf():n.valueOf()<this.clone().startOf(e).valueOf())},Mn.isBefore=function(t,e){var n=_(t)?t:Le(t);return!(!this.isValid()||!n.isValid())&&("millisecond"===(e=R(e)||"millisecond")?this.valueOf()<n.valueOf():this.clone().endOf(e).valueOf()<n.valueOf())},Mn.isBetween=function(t,e,n,i){var a=_(t)?t:Le(t),r=_(e)?e:Le(e);return!!(this.isValid()&&a.isValid()&&r.isValid())&&("("===(i=i||"()")[0]?this.isAfter(a,n):!this.isBefore(a,n))&&(")"===i[1]?this.isBefore(r,n):!this.isAfter(r,n))},Mn.isSame=function(t,e){var n,i=_(t)?t:Le(t);return!(!this.isValid()||!i.isValid())&&("millisecond"===(e=R(e)||"millisecond")?this.valueOf()===i.valueOf():(n=i.valueOf(),this.clone().startOf(e).valueOf()<=n&&n<=this.clone().endOf(e).valueOf()))},Mn.isSameOrAfter=function(t,e){return this.isSame(t,e)||this.isAfter(t,e)},Mn.isSameOrBefore=function(t,e){return this.isSame(t,e)||this.isBefore(t,e)},Mn.isValid=function(){return m(this)},Mn.lang=on,Mn.locale=rn,Mn.localeData=sn,Mn.max=Ne,Mn.min=Re,Mn.parsingFlags=function(){return c({},g(this))},Mn.set=function(t,e){if("object"==typeof t)for(var n=function(t){var e=[];for(var n in t)e.push({unit:n,priority:W[n]});return e.sort((function(t,e){return t.priority-e.priority})),e}(t=N(t)),i=0;i<n.length;i++)this[n[i].unit](t[n[i].unit]);else if(O(this[t=R(t)]))return this[t](e);return this},Mn.startOf=function(t){var e;if(void 0===(t=R(t))||"millisecond"===t||!this.isValid())return this;var n=this._isUTC?gn:fn;switch(t){case"year":e=n(this.year(),0,1);break;case"quarter":e=n(this.year(),this.month()-this.month()%3,1);break;case"month":e=n(this.year(),this.month(),1);break;case"week":e=n(this.year(),this.month(),this.date()-this.weekday());break;case"isoWeek":e=n(this.year(),this.month(),this.date()-(this.isoWeekday()-1));break;case"day":case"date":e=n(this.year(),this.month(),this.date());break;case"hour":e=this._d.valueOf(),e-=cn(e+(this._isUTC?0:this.utcOffset()*un),dn);break;case"minute":e=this._d.valueOf(),e-=cn(e,un);break;case"second":e=this._d.valueOf(),e-=cn(e,ln)}return this._d.setTime(e),a.updateOffset(this,!0),this},Mn.subtract=nn,Mn.toArray=function(){var t=this;return[t.year(),t.month(),t.date(),t.hour(),t.minute(),t.second(),t.millisecond()]},Mn.toObject=function(){var t=this;return{years:t.year(),months:t.month(),date:t.date(),hours:t.hours(),minutes:t.minutes(),seconds:t.seconds(),milliseconds:t.milliseconds()}},Mn.toDate=function(){return new Date(this.valueOf())},Mn.toISOString=function(t){if(!this.isValid())return null;var e=!0!==t,n=e?this.clone().utc():this;return n.year()<0||n.year()>9999?U(n,e?"YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]":"YYYYYY-MM-DD[T]HH:mm:ss.SSSZ"):O(Date.prototype.toISOString)?e?this.toDate().toISOString():new Date(this.valueOf()+60*this.utcOffset()*1e3).toISOString().replace("Z",U(n,"Z")):U(n,e?"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]":"YYYY-MM-DD[T]HH:mm:ss.SSSZ")},Mn.inspect=function(){if(!this.isValid())return"moment.invalid(/* "+this._i+" */)";var t="moment",e="";this.isLocal()||(t=0===this.utcOffset()?"moment.utc":"moment.parseZone",e="Z");var n="["+t+'("]',i=0<=this.year()&&this.year()<=9999?"YYYY":"YYYYYY",a=e+'[")]';return this.format(n+i+"-MM-DD[T]HH:mm:ss.SSS"+a)},Mn.toJSON=function(){return this.isValid()?this.toISOString():null},Mn.toString=function(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},Mn.unix=function(){return Math.floor(this.valueOf()/1e3)},Mn.valueOf=function(){return this._d.valueOf()-6e4*(this._offset||0)},Mn.creationData=function(){return{input:this._i,format:this._f,locale:this._locale,isUTC:this._isUTC,strict:this._strict}},Mn.year=Tt,Mn.isLeapYear=function(){return Ct(this.year())},Mn.weekYear=function(t){return pn.call(this,t,this.week(),this.weekday(),this.localeData()._week.dow,this.localeData()._week.doy)},Mn.isoWeekYear=function(t){return pn.call(this,t,this.isoWeek(),this.isoWeekday(),1,4)},Mn.quarter=Mn.quarters=function(t){return null==t?Math.ceil((this.month()+1)/3):this.month(3*(t-1)+this.month()%3)},Mn.month=zt,Mn.daysInMonth=function(){return It(this.year(),this.month())},Mn.week=Mn.weeks=function(t){var e=this.localeData().week(this);return null==t?e:this.add(7*(t-e),"d")},Mn.isoWeek=Mn.isoWeeks=function(t){var e=qt(this,1,4).week;return null==t?e:this.add(7*(t-e),"d")},Mn.weeksInYear=function(){var t=this.localeData()._week;return Zt(this.year(),t.dow,t.doy)},Mn.isoWeeksInYear=function(){return Zt(this.year(),1,4)},Mn.date=bn,Mn.day=Mn.days=function(t){if(!this.isValid())return null!=t?this:NaN;var e=this._isUTC?this._d.getUTCDay():this._d.getDay();return null!=t?(t=function(t,e){return"string"!=typeof t?t:isNaN(t)?"number"==typeof(t=e.weekdaysParse(t))?t:null:parseInt(t,10)}(t,this.localeData()),this.add(t-e,"d")):e},Mn.weekday=function(t){if(!this.isValid())return null!=t?this:NaN;var e=(this.day()+7-this.localeData()._week.dow)%7;return null==t?e:this.add(t-e,"d")},Mn.isoWeekday=function(t){if(!this.isValid())return null!=t?this:NaN;if(null!=t){var e=function(t,e){return"string"==typeof t?e.weekdaysParse(t)%7||7:isNaN(t)?null:t}(t,this.localeData());return this.day(this.day()%7?e:e-7)}return this.day()||7},Mn.dayOfYear=function(t){var e=Math.round((this.clone().startOf("day")-this.clone().startOf("year"))/864e5)+1;return null==t?e:this.add(t-e,"d")},Mn.hour=Mn.hours=le,Mn.minute=Mn.minutes=yn,Mn.second=Mn.seconds=_n,Mn.millisecond=Mn.milliseconds=kn,Mn.utcOffset=function(t,e,n){var i,r=this._offset||0;if(!this.isValid())return null!=t?this:NaN;if(null!=t){if("string"==typeof t){if(null===(t=je(st,t)))return this}else Math.abs(t)<16&&!n&&(t*=60);return!this._isUTC&&e&&(i=Ge(this)),this._offset=t,this._isUTC=!0,null!=i&&this.add(i,"m"),r!==t&&(!e||this._changeInProgress?tn(this,Xe(t-r,"m"),1,!1):this._changeInProgress||(this._changeInProgress=!0,a.updateOffset(this,!0),this._changeInProgress=null)),this}return this._isUTC?r:Ge(this)},Mn.utc=function(t){return this.utcOffset(0,t)},Mn.local=function(t){return this._isUTC&&(this.utcOffset(0,t),this._isUTC=!1,t&&this.subtract(Ge(this),"m")),this},Mn.parseZone=function(){if(null!=this._tzm)this.utcOffset(this._tzm,!1,!0);else if("string"==typeof this._i){var t=je(ot,this._i);null!=t?this.utcOffset(t):this.utcOffset(0,!0)}return this},Mn.hasAlignedHourOffset=function(t){return!!this.isValid()&&(t=t?Le(t).utcOffset():0,(this.utcOffset()-t)%60==0)},Mn.isDST=function(){return this.utcOffset()>this.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()},Mn.isLocal=function(){return!!this.isValid()&&!this._isUTC},Mn.isUtcOffset=function(){return!!this.isValid()&&this._isUTC},Mn.isUtc=qe,Mn.isUTC=qe,Mn.zoneAbbr=function(){return this._isUTC?"UTC":""},Mn.zoneName=function(){return this._isUTC?"Coordinated Universal Time":""},Mn.dates=D("dates accessor is deprecated. Use date instead.",bn),Mn.months=D("months accessor is deprecated. Use month instead",zt),Mn.years=D("years accessor is deprecated. Use year instead",Tt),Mn.zone=D("moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/",(function(t,e){return null!=t?("string"!=typeof t&&(t=-t),this.utcOffset(t,e),this):-this.utcOffset()})),Mn.isDSTShifted=D("isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information",(function(){if(!s(this._isDSTShifted))return this._isDSTShifted;var t={};if(b(t,this),(t=Fe(t))._a){var e=t._isUTC?f(t._a):Le(t._a);this._isDSTShifted=this.isValid()&&M(t._a,e.toArray())>0}else this._isDSTShifted=!1;return this._isDSTShifted}));var Dn=F.prototype;function Cn(t,e,n,i){var a=pe(),r=f().set(i,e);return a[n](r,t)}function Pn(t,e,n){if(l(t)&&(e=t,t=void 0),t=t||"",null!=e)return Cn(t,e,n,"month");var i,a=[];for(i=0;i<12;i++)a[i]=Cn(t,i,n,"month");return a}function Tn(t,e,n,i){"boolean"==typeof t?(l(e)&&(n=e,e=void 0),e=e||""):(n=e=t,t=!1,l(e)&&(n=e,e=void 0),e=e||"");var a,r=pe(),o=t?r._week.dow:0;if(null!=n)return Cn(e,(n+o)%7,i,"day");var s=[];for(a=0;a<7;a++)s[a]=Cn(e,(a+o)%7,i,"day");return s}Dn.calendar=function(t,e,n){var i=this._calendar[t]||this._calendar.sameElse;return O(i)?i.call(e,n):i},Dn.longDateFormat=function(t){var e=this._longDateFormat[t],n=this._longDateFormat[t.toUpperCase()];return e||!n?e:(this._longDateFormat[t]=n.replace(/MMMM|MM|DD|dddd/g,(function(t){return t.slice(1)})),this._longDateFormat[t])},Dn.invalidDate=function(){return this._invalidDate},Dn.ordinal=function(t){return this._ordinal.replace("%d",t)},Dn.preparse=Sn,Dn.postformat=Sn,Dn.relativeTime=function(t,e,n,i){var a=this._relativeTime[n];return O(a)?a(t,e,n,i):a.replace(/%d/i,t)},Dn.pastFuture=function(t,e){var n=this._relativeTime[t>0?"future":"past"];return O(n)?n(e):n.replace(/%s/i,e)},Dn.set=function(t){var e,n;for(n in t)O(e=t[n])?this[n]=e:this["_"+n]=e;this._config=t,this._dayOfMonthOrdinalParseLenient=new RegExp((this._dayOfMonthOrdinalParse.source||this._ordinalParse.source)+"|"+/\d{1,2}/.source)},Dn.months=function(t,e){return t?r(this._months)?this._months[t.month()]:this._months[(this._months.isFormat||Lt).test(e)?"format":"standalone"][t.month()]:r(this._months)?this._months:this._months.standalone},Dn.monthsShort=function(t,e){return t?r(this._monthsShort)?this._monthsShort[t.month()]:this._monthsShort[Lt.test(e)?"format":"standalone"][t.month()]:r(this._monthsShort)?this._monthsShort:this._monthsShort.standalone},Dn.monthsParse=function(t,e,n){var i,a,r;if(this._monthsParseExact)return Wt.call(this,t,e,n);for(this._monthsParse||(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[]),i=0;i<12;i++){if(a=f([2e3,i]),n&&!this._longMonthsParse[i]&&(this._longMonthsParse[i]=new RegExp("^"+this.months(a,"").replace(".","")+"$","i"),this._shortMonthsParse[i]=new RegExp("^"+this.monthsShort(a,"").replace(".","")+"$","i")),n||this._monthsParse[i]||(r="^"+this.months(a,"")+"|^"+this.monthsShort(a,""),this._monthsParse[i]=new RegExp(r.replace(".",""),"i")),n&&"MMMM"===e&&this._longMonthsParse[i].test(t))return i;if(n&&"MMM"===e&&this._shortMonthsParse[i].test(t))return i;if(!n&&this._monthsParse[i].test(t))return i}},Dn.monthsRegex=function(t){return this._monthsParseExact?(h(this,"_monthsRegex")||Ht.call(this),t?this._monthsStrictRegex:this._monthsRegex):(h(this,"_monthsRegex")||(this._monthsRegex=Vt),this._monthsStrictRegex&&t?this._monthsStrictRegex:this._monthsRegex)},Dn.monthsShortRegex=function(t){return this._monthsParseExact?(h(this,"_monthsRegex")||Ht.call(this),t?this._monthsShortStrictRegex:this._monthsShortRegex):(h(this,"_monthsShortRegex")||(this._monthsShortRegex=Et),this._monthsShortStrictRegex&&t?this._monthsShortStrictRegex:this._monthsShortRegex)},Dn.week=function(t){return qt(t,this._week.dow,this._week.doy).week},Dn.firstDayOfYear=function(){return this._week.doy},Dn.firstDayOfWeek=function(){return this._week.dow},Dn.weekdays=function(t,e){var n=r(this._weekdays)?this._weekdays:this._weekdays[t&&!0!==t&&this._weekdays.isFormat.test(e)?"format":"standalone"];return!0===t?$t(n,this._week.dow):t?n[t.day()]:n},Dn.weekdaysMin=function(t){return!0===t?$t(this._weekdaysMin,this._week.dow):t?this._weekdaysMin[t.day()]:this._weekdaysMin},Dn.weekdaysShort=function(t){return!0===t?$t(this._weekdaysShort,this._week.dow):t?this._weekdaysShort[t.day()]:this._weekdaysShort},Dn.weekdaysParse=function(t,e,n){var i,a,r;if(this._weekdaysParseExact)return Qt.call(this,t,e,n);for(this._weekdaysParse||(this._weekdaysParse=[],this._minWeekdaysParse=[],this._shortWeekdaysParse=[],this._fullWeekdaysParse=[]),i=0;i<7;i++){if(a=f([2e3,1]).day(i),n&&!this._fullWeekdaysParse[i]&&(this._fullWeekdaysParse[i]=new RegExp("^"+this.weekdays(a,"").replace(".","\\.?")+"$","i"),this._shortWeekdaysParse[i]=new RegExp("^"+this.weekdaysShort(a,"").replace(".","\\.?")+"$","i"),this._minWeekdaysParse[i]=new RegExp("^"+this.weekdaysMin(a,"").replace(".","\\.?")+"$","i")),this._weekdaysParse[i]||(r="^"+this.weekdays(a,"")+"|^"+this.weekdaysShort(a,"")+"|^"+this.weekdaysMin(a,""),this._weekdaysParse[i]=new RegExp(r.replace(".",""),"i")),n&&"dddd"===e&&this._fullWeekdaysParse[i].test(t))return i;if(n&&"ddd"===e&&this._shortWeekdaysParse[i].test(t))return i;if(n&&"dd"===e&&this._minWeekdaysParse[i].test(t))return i;if(!n&&this._weekdaysParse[i].test(t))return i}},Dn.weekdaysRegex=function(t){return this._weekdaysParseExact?(h(this,"_weekdaysRegex")||ie.call(this),t?this._weekdaysStrictRegex:this._weekdaysRegex):(h(this,"_weekdaysRegex")||(this._weekdaysRegex=te),this._weekdaysStrictRegex&&t?this._weekdaysStrictRegex:this._weekdaysRegex)},Dn.weekdaysShortRegex=function(t){return this._weekdaysParseExact?(h(this,"_weekdaysRegex")||ie.call(this),t?this._weekdaysShortStrictRegex:this._weekdaysShortRegex):(h(this,"_weekdaysShortRegex")||(this._weekdaysShortRegex=ee),this._weekdaysShortStrictRegex&&t?this._weekdaysShortStrictRegex:this._weekdaysShortRegex)},Dn.weekdaysMinRegex=function(t){return this._weekdaysParseExact?(h(this,"_weekdaysRegex")||ie.call(this),t?this._weekdaysMinStrictRegex:this._weekdaysMinRegex):(h(this,"_weekdaysMinRegex")||(this._weekdaysMinRegex=ne),this._weekdaysMinStrictRegex&&t?this._weekdaysMinStrictRegex:this._weekdaysMinRegex)},Dn.isPM=function(t){return"p"===(t+"").toLowerCase().charAt(0)},Dn.meridiem=function(t,e,n){return t>11?n?"pm":"PM":n?"am":"AM"},ge("en",{dayOfMonthOrdinalParse:/\d{1,2}(th|st|nd|rd)/,ordinal:function(t){var e=t%10;return t+(1===k(t%100/10)?"th":1===e?"st":2===e?"nd":3===e?"rd":"th")}}),a.lang=D("moment.lang is deprecated. Use moment.locale instead.",ge),a.langData=D("moment.langData is deprecated. Use moment.localeData instead.",pe);var On=Math.abs;function An(t,e,n,i){var a=Xe(e,n);return t._milliseconds+=i*a._milliseconds,t._days+=i*a._days,t._months+=i*a._months,t._bubble()}function Fn(t){return t<0?Math.floor(t):Math.ceil(t)}function In(t){return 4800*t/146097}function Ln(t){return 146097*t/4800}function Rn(t){return function(){return this.as(t)}}var Nn=Rn("ms"),Wn=Rn("s"),Yn=Rn("m"),zn=Rn("h"),En=Rn("d"),Vn=Rn("w"),Hn=Rn("M"),Bn=Rn("Q"),jn=Rn("y");function Un(t){return function(){return this.isValid()?this._data[t]:NaN}}var Gn=Un("milliseconds"),qn=Un("seconds"),Zn=Un("minutes"),$n=Un("hours"),Xn=Un("days"),Kn=Un("months"),Jn=Un("years"),Qn=Math.round,ti={ss:44,s:45,m:45,h:22,d:26,M:11};function ei(t,e,n,i,a){return a.relativeTime(e||1,!!n,t,i)}var ni=Math.abs;function ii(t){return(t>0)-(t<0)||+t}function ai(){if(!this.isValid())return this.localeData().invalidDate();var t,e,n=ni(this._milliseconds)/1e3,i=ni(this._days),a=ni(this._months);t=w(n/60),e=w(t/60),n%=60,t%=60;var r=w(a/12),o=a%=12,s=i,l=e,u=t,d=n?n.toFixed(3).replace(/\.?0+$/,""):"",h=this.asSeconds();if(!h)return"P0D";var c=h<0?"-":"",f=ii(this._months)!==ii(h)?"-":"",g=ii(this._days)!==ii(h)?"-":"",m=ii(this._milliseconds)!==ii(h)?"-":"";return c+"P"+(r?f+r+"Y":"")+(o?f+o+"M":"")+(s?g+s+"D":"")+(l||u||d?"T":"")+(l?m+l+"H":"")+(u?m+u+"M":"")+(d?m+d+"S":"")}var ri=ze.prototype;return ri.isValid=function(){return this._isValid},ri.abs=function(){var t=this._data;return this._milliseconds=On(this._milliseconds),this._days=On(this._days),this._months=On(this._months),t.milliseconds=On(t.milliseconds),t.seconds=On(t.seconds),t.minutes=On(t.minutes),t.hours=On(t.hours),t.months=On(t.months),t.years=On(t.years),this},ri.add=function(t,e){return An(this,t,e,1)},ri.subtract=function(t,e){return An(this,t,e,-1)},ri.as=function(t){if(!this.isValid())return NaN;var e,n,i=this._milliseconds;if("month"===(t=R(t))||"quarter"===t||"year"===t)switch(e=this._days+i/864e5,n=this._months+In(e),t){case"month":return n;case"quarter":return n/3;case"year":return n/12}else switch(e=this._days+Math.round(Ln(this._months)),t){case"week":return e/7+i/6048e5;case"day":return e+i/864e5;case"hour":return 24*e+i/36e5;case"minute":return 1440*e+i/6e4;case"second":return 86400*e+i/1e3;case"millisecond":return Math.floor(864e5*e)+i;default:throw new Error("Unknown unit "+t)}},ri.asMilliseconds=Nn,ri.asSeconds=Wn,ri.asMinutes=Yn,ri.asHours=zn,ri.asDays=En,ri.asWeeks=Vn,ri.asMonths=Hn,ri.asQuarters=Bn,ri.asYears=jn,ri.valueOf=function(){return this.isValid()?this._milliseconds+864e5*this._days+this._months%12*2592e6+31536e6*k(this._months/12):NaN},ri._bubble=function(){var t,e,n,i,a,r=this._milliseconds,o=this._days,s=this._months,l=this._data;return r>=0&&o>=0&&s>=0||r<=0&&o<=0&&s<=0||(r+=864e5*Fn(Ln(s)+o),o=0,s=0),l.milliseconds=r%1e3,t=w(r/1e3),l.seconds=t%60,e=w(t/60),l.minutes=e%60,n=w(e/60),l.hours=n%24,o+=w(n/24),a=w(In(o)),s+=a,o-=Fn(Ln(a)),i=w(s/12),s%=12,l.days=o,l.months=s,l.years=i,this},ri.clone=function(){return Xe(this)},ri.get=function(t){return t=R(t),this.isValid()?this[t+"s"]():NaN},ri.milliseconds=Gn,ri.seconds=qn,ri.minutes=Zn,ri.hours=$n,ri.days=Xn,ri.weeks=function(){return w(this.days()/7)},ri.months=Kn,ri.years=Jn,ri.humanize=function(t){if(!this.isValid())return this.localeData().invalidDate();var e=this.localeData(),n=function(t,e,n){var i=Xe(t).abs(),a=Qn(i.as("s")),r=Qn(i.as("m")),o=Qn(i.as("h")),s=Qn(i.as("d")),l=Qn(i.as("M")),u=Qn(i.as("y")),d=a<=ti.ss&&["s",a]||a<ti.s&&["ss",a]||r<=1&&["m"]||r<ti.m&&["mm",r]||o<=1&&["h"]||o<ti.h&&["hh",o]||s<=1&&["d"]||s<ti.d&&["dd",s]||l<=1&&["M"]||l<ti.M&&["MM",l]||u<=1&&["y"]||["yy",u];return d[2]=e,d[3]=+t>0,d[4]=n,ei.apply(null,d)}(this,!t,e);return t&&(n=e.pastFuture(+this,n)),e.postformat(n)},ri.toISOString=ai,ri.toString=ai,ri.toJSON=ai,ri.locale=rn,ri.localeData=sn,ri.toIsoString=D("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",ai),ri.lang=on,j("X",0,0,"unix"),j("x",0,0,"valueOf"),dt("x",rt),dt("X",/[+-]?\d+(\.\d{1,3})?/),gt("X",(function(t,e,n){n._d=new Date(1e3*parseFloat(t,10))})),gt("x",(function(t,e,n){n._d=new Date(k(t))})),a.version="2.24.0",n=Le,a.fn=Mn,a.min=function(){return We("isBefore",[].slice.call(arguments,0))},a.max=function(){return We("isAfter",[].slice.call(arguments,0))},a.now=function(){return Date.now?Date.now():+new Date},a.utc=f,a.unix=function(t){return Le(1e3*t)},a.months=function(t,e){return Pn(t,e,"months")},a.isDate=u,a.locale=ge,a.invalid=p,a.duration=Xe,a.isMoment=_,a.weekdays=function(t,e,n){return Tn(t,e,n,"weekdays")},a.parseZone=function(){return Le.apply(null,arguments).parseZone()},a.localeData=pe,a.isDuration=Ee,a.monthsShort=function(t,e){return Pn(t,e,"monthsShort")},a.weekdaysMin=function(t,e,n){return Tn(t,e,n,"weekdaysMin")},a.defineLocale=me,a.updateLocale=function(t,e){if(null!=e){var n,i,a=ue;null!=(i=fe(t))&&(a=i._config),e=A(a,e),(n=new F(e)).parentLocale=de[t],de[t]=n,ge(t)}else null!=de[t]&&(null!=de[t].parentLocale?de[t]=de[t].parentLocale:null!=de[t]&&delete de[t]);return de[t]},a.locales=function(){return C(de)},a.weekdaysShort=function(t,e,n){return Tn(t,e,n,"weekdaysShort")},a.normalizeUnits=R,a.relativeTimeRounding=function(t){return void 0===t?Qn:"function"==typeof t&&(Qn=t,!0)},a.relativeTimeThreshold=function(t,e){return void 0!==ti[t]&&(void 0===e?ti[t]:(ti[t]=e,"s"===t&&(ti.ss=e-1),!0))},a.calendarFormat=function(t,e){var n=t.diff(e,"days",!0);return n<-6?"sameElse":n<-1?"lastWeek":n<0?"lastDay":n<1?"sameDay":n<2?"nextDay":n<7?"nextWeek":"sameElse"},a.prototype=Mn,a.HTML5_FMT={DATETIME_LOCAL:"YYYY-MM-DDTHH:mm",DATETIME_LOCAL_SECONDS:"YYYY-MM-DDTHH:mm:ss",DATETIME_LOCAL_MS:"YYYY-MM-DDTHH:mm:ss.SSS",DATE:"YYYY-MM-DD",TIME:"HH:mm",TIME_SECONDS:"HH:mm:ss",TIME_MS:"HH:mm:ss.SSS",WEEK:"GGGG-[W]WW",MONTH:"YYYY-MM"},a}()})),pi={datetime:"MMM D, YYYY, h:mm:ss a",millisecond:"h:mm:ss.SSS a",second:"h:mm:ss a",minute:"h:mm a",hour:"hA",day:"MMM D",week:"ll",month:"MMM YYYY",quarter:"[Q]Q - YYYY",year:"YYYY"};on._date.override("function"==typeof mi?{_id:"moment",formats:function(){return pi},parse:function(t,e){return"string"==typeof t&&"string"==typeof e?t=mi(t,e):t instanceof mi||(t=mi(t)),t.isValid()?t.valueOf():null},format:function(t,e){return mi(t).format(e)},add:function(t,e,n){return mi(t).add(e,n).valueOf()},diff:function(t,e,n){return mi(t).diff(mi(e),n)},startOf:function(t,e,n){return t=mi(t),"isoWeek"===e?t.isoWeekday(n).valueOf():t.startOf(e).valueOf()},endOf:function(t,e){return mi(t).endOf(e).valueOf()},_create:function(t){return mi(t)}}:{}),Y._set("global",{plugins:{filler:{propagate:!0}}});var vi={dataset:function(t){var e=t.fill,n=t.chart,i=n.getDatasetMeta(e),a=i&&n.isDatasetVisible(e)&&i.dataset._children||[],r=a.length||0;return r?function(t,e){return e<r&&a[e]._view||null}:null},boundary:function(t){var e=t.boundary,n=e?e.x:null,i=e?e.y:null;return B.isArray(e)?function(t,n){return e[n]}:function(t){return{x:null===n?t.x:n,y:null===i?t.y:i}}}};function bi(t,e,n){var i,a=t._model||{},r=a.fill;if(void 0===r&&(r=!!a.backgroundColor),!1===r||null===r)return!1;if(!0===r)return"origin";if(i=parseFloat(r,10),isFinite(i)&&Math.floor(i)===i)return"-"!==r[0]&&"+"!==r[0]||(i=e+i),!(i===e||i<0||i>=n)&&i;switch(r){case"bottom":return"start";case"top":return"end";case"zero":return"origin";case"origin":case"start":case"end":return r;default:return!1}}function yi(t){return(t.el._scale||{}).getPointPositionForValue?function(t){var e,n,i,a,r,o=t.el._scale,s=o.options,l=o.chart.data.labels.length,u=t.fill,d=[];if(!l)return null;for(e=s.ticks.reverse?o.max:o.min,n=s.ticks.reverse?o.min:o.max,i=o.getPointPositionForValue(0,e),a=0;a<l;++a)r="start"===u||"end"===u?o.getPointPositionForValue(a,"start"===u?e:n):o.getBasePosition(a),s.gridLines.circular&&(r.cx=i.x,r.cy=i.y,r.angle=o.getIndexAngle(a)-Math.PI/2),d.push(r);return d}(t):function(t){var e,n=t.el._model||{},i=t.el._scale||{},a=t.fill,r=null;if(isFinite(a))return null;if("start"===a?r=void 0===n.scaleBottom?i.bottom:n.scaleBottom:"end"===a?r=void 0===n.scaleTop?i.top:n.scaleTop:void 0!==n.scaleZero?r=n.scaleZero:i.getBasePixel&&(r=i.getBasePixel()),null!=r){if(void 0!==r.x&&void 0!==r.y)return r;if(B.isFinite(r))return{x:(e=i.isHorizontal())?r:null,y:e?null:r}}return null}(t)}function xi(t,e,n){var i,a=t[e].fill,r=[e];if(!n)return a;for(;!1!==a&&-1===r.indexOf(a);){if(!isFinite(a))return a;if(!(i=t[a]))return!1;if(i.visible)return a;r.push(a),a=i.fill}return!1}function _i(t){var e=t.fill,n="dataset";return!1===e?null:(isFinite(e)||(n="boundary"),vi[n](t))}function wi(t){return t&&!t.skip}function ki(t,e,n,i,a){var r,o,s,l;if(i&&a){for(t.moveTo(e[0].x,e[0].y),r=1;r<i;++r)B.canvas.lineTo(t,e[r-1],e[r]);if(void 0===n[0].angle)for(t.lineTo(n[a-1].x,n[a-1].y),r=a-1;r>0;--r)B.canvas.lineTo(t,n[r],n[r-1],!0);else for(o=n[0].cx,s=n[0].cy,l=Math.sqrt(Math.pow(n[0].x-o,2)+Math.pow(n[0].y-s,2)),r=a-1;r>0;--r)t.arc(o,s,l,n[r].angle,n[r-1].angle,!0)}}function Mi(t,e,n,i,a,r){var o,s,l,u,d,h,c,f,g=e.length,m=i.spanGaps,p=[],v=[],b=0,y=0;for(t.beginPath(),o=0,s=g;o<s;++o)d=n(u=e[l=o%g]._view,l,i),h=wi(u),c=wi(d),r&&void 0===f&&h&&(s=g+(f=o+1)),h&&c?(b=p.push(u),y=v.push(d)):b&&y&&(m?(h&&p.push(u),c&&v.push(d)):(ki(t,p,v,b,y),b=y=0,p=[],v=[]));ki(t,p,v,b,y),t.closePath(),t.fillStyle=a,t.fill()}var Si={id:"filler",afterDatasetsUpdate:function(t,e){var n,i,a,r,o=(t.data.datasets||[]).length,s=e.propagate,l=[];for(i=0;i<o;++i)r=null,(a=(n=t.getDatasetMeta(i)).dataset)&&a._model&&a instanceof kt.Line&&(r={visible:t.isDatasetVisible(i),fill:bi(a,i,o),chart:t,el:a}),n.$filler=r,l.push(r);for(i=0;i<o;++i)(r=l[i])&&(r.fill=xi(l,i,s),r.boundary=yi(r),r.mapper=_i(r))},beforeDatasetsDraw:function(t){var e,n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas(),u=t.ctx;for(n=l.length-1;n>=0;--n)(e=l[n].$filler)&&e.visible&&(a=(i=e.el)._view,r=i._children||[],o=e.mapper,s=a.backgroundColor||Y.global.defaultColor,o&&s&&r.length&&(B.canvas.clipArea(u,t.chartArea),Mi(u,r,o,a,s,i._loop),B.canvas.unclipArea(u)))}},Di=B.rtl.getRtlAdapter,Ci=B.noop,Pi=B.valueOrDefault;function Ti(t,e){return t.usePointStyle&&t.boxWidth>e?e:t.boxWidth}Y._set("global",{legend:{display:!0,position:"top",align:"center",fullWidth:!0,reverse:!1,weight:1e3,onClick:function(t,e){var n=e.datasetIndex,i=this.chart,a=i.getDatasetMeta(n);a.hidden=null===a.hidden?!i.data.datasets[n].hidden:null,i.update()},onHover:null,onLeave:null,labels:{boxWidth:40,padding:10,generateLabels:function(t){var e=t.data.datasets,n=t.options.legend||{},i=n.labels&&n.labels.usePointStyle;return t._getSortedDatasetMetas().map((function(n){var a=n.controller.getStyle(i?0:void 0);return{text:e[n.index].label,fillStyle:a.backgroundColor,hidden:!t.isDatasetVisible(n.index),lineCap:a.borderCapStyle,lineDash:a.borderDash,lineDashOffset:a.borderDashOffset,lineJoin:a.borderJoinStyle,lineWidth:a.borderWidth,strokeStyle:a.borderColor,pointStyle:a.pointStyle,rotation:a.rotation,datasetIndex:n.index}}),this)}}},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data.datasets;for(a.setAttribute("class",t.id+"-legend"),e=0,n=r.length;e<n;e++)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=r[e].backgroundColor,r[e].label&&i.appendChild(document.createTextNode(r[e].label));return a.outerHTML}});var Oi=X.extend({initialize:function(t){B.extend(this,t),this.legendHitBoxes=[],this._hoveredItem=null,this.doughnutMode=!1},beforeUpdate:Ci,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Ci,beforeSetDimensions:Ci,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Ci,beforeBuildLabels:Ci,buildLabels:function(){var t=this,e=t.options.labels||{},n=B.callback(e.generateLabels,[t.chart],t)||[];e.filter&&(n=n.filter((function(n){return e.filter(n,t.chart.data)}))),t.options.reverse&&n.reverse(),t.legendItems=n},afterBuildLabels:Ci,beforeFit:Ci,fit:function(){var t=this,e=t.options,n=e.labels,i=e.display,a=t.ctx,r=B.options._parseFont(n),o=r.size,s=t.legendHitBoxes=[],l=t.minSize,u=t.isHorizontal();if(u?(l.width=t.maxWidth,l.height=i?10:0):(l.width=i?10:0,l.height=t.maxHeight),i){if(a.font=r.string,u){var d=t.lineWidths=[0],h=0;a.textAlign="left",a.textBaseline="middle",B.each(t.legendItems,(function(t,e){var i=Ti(n,o)+o/2+a.measureText(t.text).width;(0===e||d[d.length-1]+i+2*n.padding>l.width)&&(h+=o+n.padding,d[d.length-(e>0?0:1)]=0),s[e]={left:0,top:0,width:i,height:o},d[d.length-1]+=i+n.padding})),l.height+=h}else{var c=n.padding,f=t.columnWidths=[],g=t.columnHeights=[],m=n.padding,p=0,v=0;B.each(t.legendItems,(function(t,e){var i=Ti(n,o)+o/2+a.measureText(t.text).width;e>0&&v+o+2*c>l.height&&(m+=p+n.padding,f.push(p),g.push(v),p=0,v=0),p=Math.max(p,i),v+=o+c,s[e]={left:0,top:0,width:i,height:o}})),m+=p,f.push(p),g.push(v),l.width+=m}t.width=l.width,t.height=l.height}else t.width=l.width=t.height=l.height=0},afterFit:Ci,isHorizontal:function(){return"top"===this.options.position||"bottom"===this.options.position},draw:function(){var t=this,e=t.options,n=e.labels,i=Y.global,a=i.defaultColor,r=i.elements.line,o=t.height,s=t.columnHeights,l=t.width,u=t.lineWidths;if(e.display){var d,h=Di(e.rtl,t.left,t.minSize.width),c=t.ctx,f=Pi(n.fontColor,i.defaultFontColor),g=B.options._parseFont(n),m=g.size;c.textAlign=h.textAlign("left"),c.textBaseline="middle",c.lineWidth=.5,c.strokeStyle=f,c.fillStyle=f,c.font=g.string;var p=Ti(n,m),v=t.legendHitBoxes,b=function(t,i){switch(e.align){case"start":return n.padding;case"end":return t-i;default:return(t-i+n.padding)/2}},y=t.isHorizontal();d=y?{x:t.left+b(l,u[0]),y:t.top+n.padding,line:0}:{x:t.left+n.padding,y:t.top+b(o,s[0]),line:0},B.rtl.overrideTextDirection(t.ctx,e.textDirection);var x=m+n.padding;B.each(t.legendItems,(function(e,i){var f=c.measureText(e.text).width,g=p+m/2+f,_=d.x,w=d.y;h.setWidth(t.minSize.width),y?i>0&&_+g+n.padding>t.left+t.minSize.width&&(w=d.y+=x,d.line++,_=d.x=t.left+b(l,u[d.line])):i>0&&w+x>t.top+t.minSize.height&&(_=d.x=_+t.columnWidths[d.line]+n.padding,d.line++,w=d.y=t.top+b(o,s[d.line]));var k=h.x(_);!function(t,e,i){if(!(isNaN(p)||p<=0)){c.save();var o=Pi(i.lineWidth,r.borderWidth);if(c.fillStyle=Pi(i.fillStyle,a),c.lineCap=Pi(i.lineCap,r.borderCapStyle),c.lineDashOffset=Pi(i.lineDashOffset,r.borderDashOffset),c.lineJoin=Pi(i.lineJoin,r.borderJoinStyle),c.lineWidth=o,c.strokeStyle=Pi(i.strokeStyle,a),c.setLineDash&&c.setLineDash(Pi(i.lineDash,r.borderDash)),n&&n.usePointStyle){var s=p*Math.SQRT2/2,l=h.xPlus(t,p/2),u=e+m/2;B.canvas.drawPoint(c,i.pointStyle,s,l,u,i.rotation)}else c.fillRect(h.leftForLtr(t,p),e,p,m),0!==o&&c.strokeRect(h.leftForLtr(t,p),e,p,m);c.restore()}}(k,w,e),v[i].left=h.leftForLtr(k,v[i].width),v[i].top=w,function(t,e,n,i){var a=m/2,r=h.xPlus(t,p+a),o=e+a;c.fillText(n.text,r,o),n.hidden&&(c.beginPath(),c.lineWidth=2,c.moveTo(r,o),c.lineTo(h.xPlus(r,i),o),c.stroke())}(k,w,e,f),y?d.x+=g+n.padding:d.y+=x})),B.rtl.restoreTextDirection(t.ctx,e.textDirection)}},_getLegendItemAt:function(t,e){var n,i,a,r=this;if(t>=r.left&&t<=r.right&&e>=r.top&&e<=r.bottom)for(a=r.legendHitBoxes,n=0;n<a.length;++n)if(t>=(i=a[n]).left&&t<=i.left+i.width&&e>=i.top&&e<=i.top+i.height)return r.legendItems[n];return null},handleEvent:function(t){var e,n=this,i=n.options,a="mouseup"===t.type?"click":t.type;if("mousemove"===a){if(!i.onHover&&!i.onLeave)return}else{if("click"!==a)return;if(!i.onClick)return}e=n._getLegendItemAt(t.x,t.y),"click"===a?e&&i.onClick&&i.onClick.call(n,t.native,e):(i.onLeave&&e!==n._hoveredItem&&(n._hoveredItem&&i.onLeave.call(n,t.native,n._hoveredItem),n._hoveredItem=e),i.onHover&&e&&i.onHover.call(n,t.native,e))}});function Ai(t,e){var n=new Oi({ctx:t.ctx,options:e,chart:t});pe.configure(t,n,e),pe.addBox(t,n),t.legend=n}var Fi={id:"legend",_element:Oi,beforeInit:function(t){var e=t.options.legend;e&&Ai(t,e)},beforeUpdate:function(t){var e=t.options.legend,n=t.legend;e?(B.mergeIf(e,Y.global.legend),n?(pe.configure(t,n,e),n.options=e):Ai(t,e)):n&&(pe.removeBox(t,n),delete t.legend)},afterEvent:function(t,e){var n=t.legend;n&&n.handleEvent(e)}},Ii=B.noop;Y._set("global",{title:{display:!1,fontStyle:"bold",fullWidth:!0,padding:10,position:"top",text:"",weight:2e3}});var Li=X.extend({initialize:function(t){B.extend(this,t),this.legendHitBoxes=[]},beforeUpdate:Ii,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Ii,beforeSetDimensions:Ii,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Ii,beforeBuildLabels:Ii,buildLabels:Ii,afterBuildLabels:Ii,beforeFit:Ii,fit:function(){var t,e=this,n=e.options,i=e.minSize={},a=e.isHorizontal();n.display?(t=(B.isArray(n.text)?n.text.length:1)*B.options._parseFont(n).lineHeight+2*n.padding,e.width=i.width=a?e.maxWidth:t,e.height=i.height=a?t:e.maxHeight):e.width=i.width=e.height=i.height=0},afterFit:Ii,isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},draw:function(){var t=this,e=t.ctx,n=t.options;if(n.display){var i,a,r,o=B.options._parseFont(n),s=o.lineHeight,l=s/2+n.padding,u=0,d=t.top,h=t.left,c=t.bottom,f=t.right;e.fillStyle=B.valueOrDefault(n.fontColor,Y.global.defaultFontColor),e.font=o.string,t.isHorizontal()?(a=h+(f-h)/2,r=d+l,i=f-h):(a="left"===n.position?h+l:f-l,r=d+(c-d)/2,i=c-d,u=Math.PI*("left"===n.position?-.5:.5)),e.save(),e.translate(a,r),e.rotate(u),e.textAlign="center",e.textBaseline="middle";var g=n.text;if(B.isArray(g))for(var m=0,p=0;p<g.length;++p)e.fillText(g[p],0,m,i),m+=s;else e.fillText(g,0,0,i);e.restore()}}});function Ri(t,e){var n=new Li({ctx:t.ctx,options:e,chart:t});pe.configure(t,n,e),pe.addBox(t,n),t.titleBlock=n}var Ni={},Wi=Si,Yi=Fi,zi={id:"title",_element:Li,beforeInit:function(t){var e=t.options.title;e&&Ri(t,e)},beforeUpdate:function(t){var e=t.options.title,n=t.titleBlock;e?(B.mergeIf(e,Y.global.title),n?(pe.configure(t,n,e),n.options=e):Ri(t,e)):n&&(pe.removeBox(t,n),delete t.titleBlock)}};for(var Ei in Ni.filler=Wi,Ni.legend=Yi,Ni.title=zi,nn.helpers=B,function(){function t(t,e,n){var i;return"string"==typeof t?(i=parseInt(t,10),-1!==t.indexOf("%")&&(i=i/100*e.parentNode[n])):i=t,i}function e(t){return null!=t&&"none"!==t}function n(n,i,a){var r=document.defaultView,o=B._getParentNode(n),s=r.getComputedStyle(n)[i],l=r.getComputedStyle(o)[i],u=e(s),d=e(l),h=Number.POSITIVE_INFINITY;return u||d?Math.min(u?t(s,n,a):h,d?t(l,o,a):h):"none"}B.where=function(t,e){if(B.isArray(t)&&Array.prototype.filter)return t.filter(e);var n=[];return B.each(t,(function(t){e(t)&&n.push(t)})),n},B.findIndex=Array.prototype.findIndex?function(t,e,n){return t.findIndex(e,n)}:function(t,e,n){n=void 0===n?t:n;for(var i=0,a=t.length;i<a;++i)if(e.call(n,t[i],i,t))return i;return-1},B.findNextWhere=function(t,e,n){B.isNullOrUndef(n)&&(n=-1);for(var i=n+1;i<t.length;i++){var a=t[i];if(e(a))return a}},B.findPreviousWhere=function(t,e,n){B.isNullOrUndef(n)&&(n=t.length);for(var i=n-1;i>=0;i--){var a=t[i];if(e(a))return a}},B.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},B.almostEquals=function(t,e,n){return Math.abs(t-e)<n},B.almostWhole=function(t,e){var n=Math.round(t);return n-e<=t&&n+e>=t},B.max=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.max(t,e)}),Number.NEGATIVE_INFINITY)},B.min=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.min(t,e)}),Number.POSITIVE_INFINITY)},B.sign=Math.sign?function(t){return Math.sign(t)}:function(t){return 0===(t=+t)||isNaN(t)?t:t>0?1:-1},B.toRadians=function(t){return t*(Math.PI/180)},B.toDegrees=function(t){return t*(180/Math.PI)},B._decimalPlaces=function(t){if(B.isFinite(t)){for(var e=1,n=0;Math.round(t*e)/e!==t;)e*=10,n++;return n}},B.getAngleFromPoint=function(t,e){var n=e.x-t.x,i=e.y-t.y,a=Math.sqrt(n*n+i*i),r=Math.atan2(i,n);return r<-.5*Math.PI&&(r+=2*Math.PI),{angle:r,distance:a}},B.distanceBetweenPoints=function(t,e){return Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2))},B.aliasPixel=function(t){return t%2==0?0:.5},B._alignPixel=function(t,e,n){var i=t.currentDevicePixelRatio,a=n/2;return Math.round((e-a)*i)/i+a},B.splineCurve=function(t,e,n,i){var a=t.skip?e:t,r=e,o=n.skip?e:n,s=Math.sqrt(Math.pow(r.x-a.x,2)+Math.pow(r.y-a.y,2)),l=Math.sqrt(Math.pow(o.x-r.x,2)+Math.pow(o.y-r.y,2)),u=s/(s+l),d=l/(s+l),h=i*(u=isNaN(u)?0:u),c=i*(d=isNaN(d)?0:d);return{previous:{x:r.x-h*(o.x-a.x),y:r.y-h*(o.y-a.y)},next:{x:r.x+c*(o.x-a.x),y:r.y+c*(o.y-a.y)}}},B.EPSILON=Number.EPSILON||1e-14,B.splineCurveMonotone=function(t){var e,n,i,a,r,o,s,l,u,d=(t||[]).map((function(t){return{model:t._model,deltaK:0,mK:0}})),h=d.length;for(e=0;e<h;++e)if(!(i=d[e]).model.skip){if(n=e>0?d[e-1]:null,(a=e<h-1?d[e+1]:null)&&!a.model.skip){var c=a.model.x-i.model.x;i.deltaK=0!==c?(a.model.y-i.model.y)/c:0}!n||n.model.skip?i.mK=i.deltaK:!a||a.model.skip?i.mK=n.deltaK:this.sign(n.deltaK)!==this.sign(i.deltaK)?i.mK=0:i.mK=(n.deltaK+i.deltaK)/2}for(e=0;e<h-1;++e)i=d[e],a=d[e+1],i.model.skip||a.model.skip||(B.almostEquals(i.deltaK,0,this.EPSILON)?i.mK=a.mK=0:(r=i.mK/i.deltaK,o=a.mK/i.deltaK,(l=Math.pow(r,2)+Math.pow(o,2))<=9||(s=3/Math.sqrt(l),i.mK=r*s*i.deltaK,a.mK=o*s*i.deltaK)));for(e=0;e<h;++e)(i=d[e]).model.skip||(n=e>0?d[e-1]:null,a=e<h-1?d[e+1]:null,n&&!n.model.skip&&(u=(i.model.x-n.model.x)/3,i.model.controlPointPreviousX=i.model.x-u,i.model.controlPointPreviousY=i.model.y-u*i.mK),a&&!a.model.skip&&(u=(a.model.x-i.model.x)/3,i.model.controlPointNextX=i.model.x+u,i.model.controlPointNextY=i.model.y+u*i.mK))},B.nextItem=function(t,e,n){return n?e>=t.length-1?t[0]:t[e+1]:e>=t.length-1?t[t.length-1]:t[e+1]},B.previousItem=function(t,e,n){return n?e<=0?t[t.length-1]:t[e-1]:e<=0?t[0]:t[e-1]},B.niceNum=function(t,e){var n=Math.floor(B.log10(t)),i=t/Math.pow(10,n);return(e?i<1.5?1:i<3?2:i<7?5:10:i<=1?1:i<=2?2:i<=5?5:10)*Math.pow(10,n)},B.requestAnimFrame="undefined"==typeof window?function(t){t()}:window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)},B.getRelativePosition=function(t,e){var n,i,a=t.originalEvent||t,r=t.target||t.srcElement,o=r.getBoundingClientRect(),s=a.touches;s&&s.length>0?(n=s[0].clientX,i=s[0].clientY):(n=a.clientX,i=a.clientY);var l=parseFloat(B.getStyle(r,"padding-left")),u=parseFloat(B.getStyle(r,"padding-top")),d=parseFloat(B.getStyle(r,"padding-right")),h=parseFloat(B.getStyle(r,"padding-bottom")),c=o.right-o.left-l-d,f=o.bottom-o.top-u-h;return{x:n=Math.round((n-o.left-l)/c*r.width/e.currentDevicePixelRatio),y:i=Math.round((i-o.top-u)/f*r.height/e.currentDevicePixelRatio)}},B.getConstraintWidth=function(t){return n(t,"max-width","clientWidth")},B.getConstraintHeight=function(t){return n(t,"max-height","clientHeight")},B._calculatePadding=function(t,e,n){return(e=B.getStyle(t,e)).indexOf("%")>-1?n*parseInt(e,10)/100:parseInt(e,10)},B._getParentNode=function(t){var e=t.parentNode;return e&&"[object ShadowRoot]"===e.toString()&&(e=e.host),e},B.getMaximumWidth=function(t){var e=B._getParentNode(t);if(!e)return t.clientWidth;var n=e.clientWidth,i=n-B._calculatePadding(e,"padding-left",n)-B._calculatePadding(e,"padding-right",n),a=B.getConstraintWidth(t);return isNaN(a)?i:Math.min(i,a)},B.getMaximumHeight=function(t){var e=B._getParentNode(t);if(!e)return t.clientHeight;var n=e.clientHeight,i=n-B._calculatePadding(e,"padding-top",n)-B._calculatePadding(e,"padding-bottom",n),a=B.getConstraintHeight(t);return isNaN(a)?i:Math.min(i,a)},B.getStyle=function(t,e){return t.currentStyle?t.currentStyle[e]:document.defaultView.getComputedStyle(t,null).getPropertyValue(e)},B.retinaScale=function(t,e){var n=t.currentDevicePixelRatio=e||"undefined"!=typeof window&&window.devicePixelRatio||1;if(1!==n){var i=t.canvas,a=t.height,r=t.width;i.height=a*n,i.width=r*n,t.ctx.scale(n,n),i.style.height||i.style.width||(i.style.height=a+"px",i.style.width=r+"px")}},B.fontString=function(t,e,n){return e+" "+t+"px "+n},B.longestText=function(t,e,n,i){var a=(i=i||{}).data=i.data||{},r=i.garbageCollect=i.garbageCollect||[];i.font!==e&&(a=i.data={},r=i.garbageCollect=[],i.font=e),t.font=e;var o,s,l,u,d,h=0,c=n.length;for(o=0;o<c;o++)if(null!=(u=n[o])&&!0!==B.isArray(u))h=B.measureText(t,a,r,h,u);else if(B.isArray(u))for(s=0,l=u.length;s<l;s++)null==(d=u[s])||B.isArray(d)||(h=B.measureText(t,a,r,h,d));var f=r.length/2;if(f>n.length){for(o=0;o<f;o++)delete a[r[o]];r.splice(0,f)}return h},B.measureText=function(t,e,n,i,a){var r=e[a];return r||(r=e[a]=t.measureText(a).width,n.push(a)),r>i&&(i=r),i},B.numberOfLabelLines=function(t){var e=1;return B.each(t,(function(t){B.isArray(t)&&t.length>e&&(e=t.length)})),e},B.color=w?function(t){return t instanceof CanvasGradient&&(t=Y.global.defaultColor),w(t)}:function(t){return console.error("Color.js not found!"),t},B.getHoverColor=function(t){return t instanceof CanvasPattern||t instanceof CanvasGradient?t:B.color(t).saturate(.5).darken(.1).rgbString()}}(),nn._adapters=on,nn.Animation=J,nn.animationService=Q,nn.controllers=Qt,nn.DatasetController=at,nn.defaults=Y,nn.Element=X,nn.elements=kt,nn.Interaction=oe,nn.layouts=pe,nn.platform=Le,nn.plugins=Re,nn.Scale=_n,nn.scaleService=Ne,nn.Ticks=sn,nn.Tooltip=qe,nn.helpers.each(gi,(function(t,e){nn.scaleService.registerScaleType(e,t,t._defaults)})),Ni)Ni.hasOwnProperty(Ei)&&nn.plugins.register(Ni[Ei]);nn.platform.initialize();var Vi=nn;return"undefined"!=typeof window&&(window.Chart=nn),nn.Chart=nn,nn.Legend=Ni.legend._element,nn.Title=Ni.title._element,nn.pluginService=nn.plugins,nn.PluginBase=nn.Element.extend({}),nn.canvasHelpers=nn.helpers.canvas,nn.layoutService=nn.layouts,nn.LinearScaleBase=Cn,nn.helpers.each(["Bar","Bubble","Doughnut","Line","PolarArea","Radar","Scatter"],(function(t){nn[t]=function(e,n){return new nn(e,nn.helpers.merge(n||{},{type:t.charAt(0).toLowerCase()+t.slice(1)}))}})),Vi}));
diff --git a/htdocs/includes/nnnick/chartjs/dist/Chart.js b/htdocs/includes/nnnick/chartjs/dist/Chart.js
index 44972b6ee7b..68a81cf3484 100644
--- a/htdocs/includes/nnnick/chartjs/dist/Chart.js
+++ b/htdocs/includes/nnnick/chartjs/dist/Chart.js
@@ -1,7 +1,7 @@
 /*!
- * Chart.js v2.9.3
+ * Chart.js v2.9.4
  * https://www.chartjs.org
- * (c) 2019 Chart.js Contributors
+ * (c) 2020 Chart.js Contributors
  * Released under the MIT License
  */
 (function (global, factory) {
@@ -2103,6 +2103,10 @@ if (typeof window !== 'undefined') {
 
 var chartjsColor = Color;
 
+function isValidKey(key) {
+	return ['__proto__', 'prototype', 'constructor'].indexOf(key) === -1;
+}
+
 /**
  * @namespace Chart.helpers
  */
@@ -2278,7 +2282,7 @@ var helpers = {
 		}
 
 		if (helpers.isObject(source)) {
-			var target = {};
+			var target = Object.create(source);
 			var keys = Object.keys(source);
 			var klen = keys.length;
 			var k = 0;
@@ -2299,6 +2303,12 @@ var helpers = {
 	 * @private
 	 */
 	_merger: function(key, target, source, options) {
+		if (!isValidKey(key)) {
+			// We want to ensure we do not copy prototypes over
+			// as this can pollute global namespaces
+			return;
+		}
+
 		var tval = target[key];
 		var sval = source[key];
 
@@ -2314,6 +2324,12 @@ var helpers = {
 	 * @private
 	 */
 	_mergerIf: function(key, target, source) {
+		if (!isValidKey(key)) {
+			// We want to ensure we do not copy prototypes over
+			// as this can pollute global namespaces
+			return;
+		}
+
 		var tval = target[key];
 		var sval = source[key];
 
@@ -3812,7 +3828,7 @@ helpers$1.extend(DatasetController.prototype, {
 	 */
 	_configure: function() {
 		var me = this;
-		me._config = helpers$1.merge({}, [
+		me._config = helpers$1.merge(Object.create(null), [
 			me.chart.options.datasets[me._type],
 			me.getDataset(),
 		], {
@@ -7082,7 +7098,8 @@ function updateDims(chartArea, params, layout) {
 		chartArea.h = newHeight;
 
 		// return true if chart area changed in layout's direction
-		return layout.horizontal ? newWidth !== chartArea.w : newHeight !== chartArea.h;
+		var sizes = layout.horizontal ? [newWidth, chartArea.w] : [newHeight, chartArea.h];
+		return sizes[0] !== sizes[1] && (!isNaN(sizes[0]) || !isNaN(sizes[1]));
 	}
 }
 
@@ -8094,7 +8111,7 @@ var core_scaleService = {
 	},
 	getScaleDefaults: function(type) {
 		// Return the scale defaults merged with the global settings so that we always use the latest ones
-		return this.defaults.hasOwnProperty(type) ? helpers$1.merge({}, [core_defaults.scale, this.defaults[type]]) : {};
+		return this.defaults.hasOwnProperty(type) ? helpers$1.merge(Object.create(null), [core_defaults.scale, this.defaults[type]]) : {};
 	},
 	updateScaleDefaults: function(type, additions) {
 		var me = this;
@@ -9169,7 +9186,7 @@ core_defaults._set('global', {
  * returns a deep copy of the result, thus doesn't alter inputs.
  */
 function mergeScaleConfig(/* config objects ... */) {
-	return helpers$1.merge({}, [].slice.call(arguments), {
+	return helpers$1.merge(Object.create(null), [].slice.call(arguments), {
 		merger: function(key, target, source, options) {
 			if (key === 'xAxes' || key === 'yAxes') {
 				var slen = source[key].length;
@@ -9209,9 +9226,9 @@ function mergeScaleConfig(/* config objects ... */) {
  * a deep copy of the result, thus doesn't alter inputs.
  */
 function mergeConfig(/* config objects ... */) {
-	return helpers$1.merge({}, [].slice.call(arguments), {
+	return helpers$1.merge(Object.create(null), [].slice.call(arguments), {
 		merger: function(key, target, source, options) {
-			var tval = target[key] || {};
+			var tval = target[key] || Object.create(null);
 			var sval = source[key];
 
 			if (key === 'scales') {
@@ -9228,7 +9245,7 @@ function mergeConfig(/* config objects ... */) {
 }
 
 function initConfig(config) {
-	config = config || {};
+	config = config || Object.create(null);
 
 	// Do NOT use mergeConfig for the data object because this method merges arrays
 	// and so would change references to labels and datasets, preventing data updates.
@@ -11209,6 +11226,8 @@ function computeLabelSizes(ctx, tickFonts, ticks, caches) {
 	var widths = [];
 	var heights = [];
 	var offsets = [];
+	var widestLabelSize = 0;
+	var highestLabelSize = 0;
 	var i, j, jlen, label, tickFont, fontString, cache, lineHeight, width, height, nestedLabel, widest, highest;
 
 	for (i = 0; i < length; ++i) {
@@ -11236,11 +11255,13 @@ function computeLabelSizes(ctx, tickFonts, ticks, caches) {
 		widths.push(width);
 		heights.push(height);
 		offsets.push(lineHeight / 2);
+		widestLabelSize = Math.max(width, widestLabelSize);
+		highestLabelSize = Math.max(height, highestLabelSize);
 	}
 	garbageCollect(caches, length);
 
-	widest = widths.indexOf(Math.max.apply(null, widths));
-	highest = heights.indexOf(Math.max.apply(null, heights));
+	widest = widths.indexOf(widestLabelSize);
+	highest = heights.indexOf(highestLabelSize);
 
 	function valueAt(idx) {
 		return {
diff --git a/htdocs/includes/nnnick/chartjs/dist/Chart.min.js b/htdocs/includes/nnnick/chartjs/dist/Chart.min.js
index 7c16b0d1287..a87f61443e1 100644
--- a/htdocs/includes/nnnick/chartjs/dist/Chart.min.js
+++ b/htdocs/includes/nnnick/chartjs/dist/Chart.min.js
@@ -1,7 +1,7 @@
 /*!
- * Chart.js v2.9.3
+ * Chart.js v2.9.4
  * https://www.chartjs.org
- * (c) 2019 Chart.js Contributors
+ * (c) 2020 Chart.js Contributors
  * Released under the MIT License
  */
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(function(){try{return require("moment")}catch(t){}}()):"function"==typeof define&&define.amd?define(["require"],(function(t){return e(function(){try{return t("moment")}catch(t){}}())})):(t=t||self).Chart=e(t.moment)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var e={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},n=function(t,e){return t(e={exports:{}},e.exports),e.exports}((function(t){var n={};for(var i in e)e.hasOwnProperty(i)&&(n[e[i]]=i);var a=t.exports={rgb:{channels:3,labels:"rgb"},hsl:{channels:3,labels:"hsl"},hsv:{channels:3,labels:"hsv"},hwb:{channels:3,labels:"hwb"},cmyk:{channels:4,labels:"cmyk"},xyz:{channels:3,labels:"xyz"},lab:{channels:3,labels:"lab"},lch:{channels:3,labels:"lch"},hex:{channels:1,labels:["hex"]},keyword:{channels:1,labels:["keyword"]},ansi16:{channels:1,labels:["ansi16"]},ansi256:{channels:1,labels:["ansi256"]},hcg:{channels:3,labels:["h","c","g"]},apple:{channels:3,labels:["r16","g16","b16"]},gray:{channels:1,labels:["gray"]}};for(var r in a)if(a.hasOwnProperty(r)){if(!("channels"in a[r]))throw new Error("missing channels property: "+r);if(!("labels"in a[r]))throw new Error("missing channel labels property: "+r);if(a[r].labels.length!==a[r].channels)throw new Error("channel and label counts mismatch: "+r);var o=a[r].channels,s=a[r].labels;delete a[r].channels,delete a[r].labels,Object.defineProperty(a[r],"channels",{value:o}),Object.defineProperty(a[r],"labels",{value:s})}a.rgb.hsl=function(t){var e,n,i=t[0]/255,a=t[1]/255,r=t[2]/255,o=Math.min(i,a,r),s=Math.max(i,a,r),l=s-o;return s===o?e=0:i===s?e=(a-r)/l:a===s?e=2+(r-i)/l:r===s&&(e=4+(i-a)/l),(e=Math.min(60*e,360))<0&&(e+=360),n=(o+s)/2,[e,100*(s===o?0:n<=.5?l/(s+o):l/(2-s-o)),100*n]},a.rgb.hsv=function(t){var e,n,i,a,r,o=t[0]/255,s=t[1]/255,l=t[2]/255,u=Math.max(o,s,l),d=u-Math.min(o,s,l),h=function(t){return(u-t)/6/d+.5};return 0===d?a=r=0:(r=d/u,e=h(o),n=h(s),i=h(l),o===u?a=i-n:s===u?a=1/3+e-i:l===u&&(a=2/3+n-e),a<0?a+=1:a>1&&(a-=1)),[360*a,100*r,100*u]},a.rgb.hwb=function(t){var e=t[0],n=t[1],i=t[2];return[a.rgb.hsl(t)[0],100*(1/255*Math.min(e,Math.min(n,i))),100*(i=1-1/255*Math.max(e,Math.max(n,i)))]},a.rgb.cmyk=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255;return[100*((1-n-(e=Math.min(1-n,1-i,1-a)))/(1-e)||0),100*((1-i-e)/(1-e)||0),100*((1-a-e)/(1-e)||0),100*e]},a.rgb.keyword=function(t){var i=n[t];if(i)return i;var a,r,o,s=1/0;for(var l in e)if(e.hasOwnProperty(l)){var u=e[l],d=(r=t,o=u,Math.pow(r[0]-o[0],2)+Math.pow(r[1]-o[1],2)+Math.pow(r[2]-o[2],2));d<s&&(s=d,a=l)}return a},a.keyword.rgb=function(t){return e[t]},a.rgb.xyz=function(t){var e=t[0]/255,n=t[1]/255,i=t[2]/255;return[100*(.4124*(e=e>.04045?Math.pow((e+.055)/1.055,2.4):e/12.92)+.3576*(n=n>.04045?Math.pow((n+.055)/1.055,2.4):n/12.92)+.1805*(i=i>.04045?Math.pow((i+.055)/1.055,2.4):i/12.92)),100*(.2126*e+.7152*n+.0722*i),100*(.0193*e+.1192*n+.9505*i)]},a.rgb.lab=function(t){var e=a.rgb.xyz(t),n=e[0],i=e[1],r=e[2];return i/=100,r/=108.883,n=(n/=95.047)>.008856?Math.pow(n,1/3):7.787*n+16/116,[116*(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116)-16,500*(n-i),200*(i-(r=r>.008856?Math.pow(r,1/3):7.787*r+16/116))]},a.hsl.rgb=function(t){var e,n,i,a,r,o=t[0]/360,s=t[1]/100,l=t[2]/100;if(0===s)return[r=255*l,r,r];e=2*l-(n=l<.5?l*(1+s):l+s-l*s),a=[0,0,0];for(var u=0;u<3;u++)(i=o+1/3*-(u-1))<0&&i++,i>1&&i--,r=6*i<1?e+6*(n-e)*i:2*i<1?n:3*i<2?e+(n-e)*(2/3-i)*6:e,a[u]=255*r;return a},a.hsl.hsv=function(t){var e=t[0],n=t[1]/100,i=t[2]/100,a=n,r=Math.max(i,.01);return n*=(i*=2)<=1?i:2-i,a*=r<=1?r:2-r,[e,100*(0===i?2*a/(r+a):2*n/(i+n)),100*((i+n)/2)]},a.hsv.rgb=function(t){var e=t[0]/60,n=t[1]/100,i=t[2]/100,a=Math.floor(e)%6,r=e-Math.floor(e),o=255*i*(1-n),s=255*i*(1-n*r),l=255*i*(1-n*(1-r));switch(i*=255,a){case 0:return[i,l,o];case 1:return[s,i,o];case 2:return[o,i,l];case 3:return[o,s,i];case 4:return[l,o,i];case 5:return[i,o,s]}},a.hsv.hsl=function(t){var e,n,i,a=t[0],r=t[1]/100,o=t[2]/100,s=Math.max(o,.01);return i=(2-r)*o,n=r*s,[a,100*(n=(n/=(e=(2-r)*s)<=1?e:2-e)||0),100*(i/=2)]},a.hwb.rgb=function(t){var e,n,i,a,r,o,s,l=t[0]/360,u=t[1]/100,d=t[2]/100,h=u+d;switch(h>1&&(u/=h,d/=h),i=6*l-(e=Math.floor(6*l)),0!=(1&e)&&(i=1-i),a=u+i*((n=1-d)-u),e){default:case 6:case 0:r=n,o=a,s=u;break;case 1:r=a,o=n,s=u;break;case 2:r=u,o=n,s=a;break;case 3:r=u,o=a,s=n;break;case 4:r=a,o=u,s=n;break;case 5:r=n,o=u,s=a}return[255*r,255*o,255*s]},a.cmyk.rgb=function(t){var e=t[0]/100,n=t[1]/100,i=t[2]/100,a=t[3]/100;return[255*(1-Math.min(1,e*(1-a)+a)),255*(1-Math.min(1,n*(1-a)+a)),255*(1-Math.min(1,i*(1-a)+a))]},a.xyz.rgb=function(t){var e,n,i,a=t[0]/100,r=t[1]/100,o=t[2]/100;return n=-.9689*a+1.8758*r+.0415*o,i=.0557*a+-.204*r+1.057*o,e=(e=3.2406*a+-1.5372*r+-.4986*o)>.0031308?1.055*Math.pow(e,1/2.4)-.055:12.92*e,n=n>.0031308?1.055*Math.pow(n,1/2.4)-.055:12.92*n,i=i>.0031308?1.055*Math.pow(i,1/2.4)-.055:12.92*i,[255*(e=Math.min(Math.max(0,e),1)),255*(n=Math.min(Math.max(0,n),1)),255*(i=Math.min(Math.max(0,i),1))]},a.xyz.lab=function(t){var e=t[0],n=t[1],i=t[2];return n/=100,i/=108.883,e=(e/=95.047)>.008856?Math.pow(e,1/3):7.787*e+16/116,[116*(n=n>.008856?Math.pow(n,1/3):7.787*n+16/116)-16,500*(e-n),200*(n-(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116))]},a.lab.xyz=function(t){var e,n,i,a=t[0];e=t[1]/500+(n=(a+16)/116),i=n-t[2]/200;var r=Math.pow(n,3),o=Math.pow(e,3),s=Math.pow(i,3);return n=r>.008856?r:(n-16/116)/7.787,e=o>.008856?o:(e-16/116)/7.787,i=s>.008856?s:(i-16/116)/7.787,[e*=95.047,n*=100,i*=108.883]},a.lab.lch=function(t){var e,n=t[0],i=t[1],a=t[2];return(e=360*Math.atan2(a,i)/2/Math.PI)<0&&(e+=360),[n,Math.sqrt(i*i+a*a),e]},a.lch.lab=function(t){var e,n=t[0],i=t[1];return e=t[2]/360*2*Math.PI,[n,i*Math.cos(e),i*Math.sin(e)]},a.rgb.ansi16=function(t){var e=t[0],n=t[1],i=t[2],r=1 in arguments?arguments[1]:a.rgb.hsv(t)[2];if(0===(r=Math.round(r/50)))return 30;var o=30+(Math.round(i/255)<<2|Math.round(n/255)<<1|Math.round(e/255));return 2===r&&(o+=60),o},a.hsv.ansi16=function(t){return a.rgb.ansi16(a.hsv.rgb(t),t[2])},a.rgb.ansi256=function(t){var e=t[0],n=t[1],i=t[2];return e===n&&n===i?e<8?16:e>248?231:Math.round((e-8)/247*24)+232:16+36*Math.round(e/255*5)+6*Math.round(n/255*5)+Math.round(i/255*5)},a.ansi16.rgb=function(t){var e=t%10;if(0===e||7===e)return t>50&&(e+=3.5),[e=e/10.5*255,e,e];var n=.5*(1+~~(t>50));return[(1&e)*n*255,(e>>1&1)*n*255,(e>>2&1)*n*255]},a.ansi256.rgb=function(t){if(t>=232){var e=10*(t-232)+8;return[e,e,e]}var n;return t-=16,[Math.floor(t/36)/5*255,Math.floor((n=t%36)/6)/5*255,n%6/5*255]},a.rgb.hex=function(t){var e=(((255&Math.round(t[0]))<<16)+((255&Math.round(t[1]))<<8)+(255&Math.round(t[2]))).toString(16).toUpperCase();return"000000".substring(e.length)+e},a.hex.rgb=function(t){var e=t.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);if(!e)return[0,0,0];var n=e[0];3===e[0].length&&(n=n.split("").map((function(t){return t+t})).join(""));var i=parseInt(n,16);return[i>>16&255,i>>8&255,255&i]},a.rgb.hcg=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255,r=Math.max(Math.max(n,i),a),o=Math.min(Math.min(n,i),a),s=r-o;return e=s<=0?0:r===n?(i-a)/s%6:r===i?2+(a-n)/s:4+(n-i)/s+4,e/=6,[360*(e%=1),100*s,100*(s<1?o/(1-s):0)]},a.hsl.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=1,a=0;return(i=n<.5?2*e*n:2*e*(1-n))<1&&(a=(n-.5*i)/(1-i)),[t[0],100*i,100*a]},a.hsv.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=e*n,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.hcg.rgb=function(t){var e=t[0]/360,n=t[1]/100,i=t[2]/100;if(0===n)return[255*i,255*i,255*i];var a,r=[0,0,0],o=e%1*6,s=o%1,l=1-s;switch(Math.floor(o)){case 0:r[0]=1,r[1]=s,r[2]=0;break;case 1:r[0]=l,r[1]=1,r[2]=0;break;case 2:r[0]=0,r[1]=1,r[2]=s;break;case 3:r[0]=0,r[1]=l,r[2]=1;break;case 4:r[0]=s,r[1]=0,r[2]=1;break;default:r[0]=1,r[1]=0,r[2]=l}return a=(1-n)*i,[255*(n*r[0]+a),255*(n*r[1]+a),255*(n*r[2]+a)]},a.hcg.hsv=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e),i=0;return n>0&&(i=e/n),[t[0],100*i,100*n]},a.hcg.hsl=function(t){var e=t[1]/100,n=t[2]/100*(1-e)+.5*e,i=0;return n>0&&n<.5?i=e/(2*n):n>=.5&&n<1&&(i=e/(2*(1-n))),[t[0],100*i,100*n]},a.hcg.hwb=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e);return[t[0],100*(n-e),100*(1-n)]},a.hwb.hcg=function(t){var e=t[1]/100,n=1-t[2]/100,i=n-e,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.apple.rgb=function(t){return[t[0]/65535*255,t[1]/65535*255,t[2]/65535*255]},a.rgb.apple=function(t){return[t[0]/255*65535,t[1]/255*65535,t[2]/255*65535]},a.gray.rgb=function(t){return[t[0]/100*255,t[0]/100*255,t[0]/100*255]},a.gray.hsl=a.gray.hsv=function(t){return[0,0,t[0]]},a.gray.hwb=function(t){return[0,100,t[0]]},a.gray.cmyk=function(t){return[0,0,0,t[0]]},a.gray.lab=function(t){return[t[0],0,0]},a.gray.hex=function(t){var e=255&Math.round(t[0]/100*255),n=((e<<16)+(e<<8)+e).toString(16).toUpperCase();return"000000".substring(n.length)+n},a.rgb.gray=function(t){return[(t[0]+t[1]+t[2])/3/255*100]}}));n.rgb,n.hsl,n.hsv,n.hwb,n.cmyk,n.xyz,n.lab,n.lch,n.hex,n.keyword,n.ansi16,n.ansi256,n.hcg,n.apple,n.gray;function i(t){var e=function(){for(var t={},e=Object.keys(n),i=e.length,a=0;a<i;a++)t[e[a]]={distance:-1,parent:null};return t}(),i=[t];for(e[t].distance=0;i.length;)for(var a=i.pop(),r=Object.keys(n[a]),o=r.length,s=0;s<o;s++){var l=r[s],u=e[l];-1===u.distance&&(u.distance=e[a].distance+1,u.parent=a,i.unshift(l))}return e}function a(t,e){return function(n){return e(t(n))}}function r(t,e){for(var i=[e[t].parent,t],r=n[e[t].parent][t],o=e[t].parent;e[o].parent;)i.unshift(e[o].parent),r=a(n[e[o].parent][o],r),o=e[o].parent;return r.conversion=i,r}var o={};Object.keys(n).forEach((function(t){o[t]={},Object.defineProperty(o[t],"channels",{value:n[t].channels}),Object.defineProperty(o[t],"labels",{value:n[t].labels});var e=function(t){for(var e=i(t),n={},a=Object.keys(e),o=a.length,s=0;s<o;s++){var l=a[s];null!==e[l].parent&&(n[l]=r(l,e))}return n}(t);Object.keys(e).forEach((function(n){var i=e[n];o[t][n]=function(t){var e=function(e){if(null==e)return e;arguments.length>1&&(e=Array.prototype.slice.call(arguments));var n=t(e);if("object"==typeof n)for(var i=n.length,a=0;a<i;a++)n[a]=Math.round(n[a]);return n};return"conversion"in t&&(e.conversion=t.conversion),e}(i),o[t][n].raw=function(t){var e=function(e){return null==e?e:(arguments.length>1&&(e=Array.prototype.slice.call(arguments)),t(e))};return"conversion"in t&&(e.conversion=t.conversion),e}(i)}))}));var s=o,l={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},u={getRgba:d,getHsla:h,getRgb:function(t){var e=d(t);return e&&e.slice(0,3)},getHsl:function(t){var e=h(t);return e&&e.slice(0,3)},getHwb:c,getAlpha:function(t){var e=d(t);if(e)return e[3];if(e=h(t))return e[3];if(e=c(t))return e[3]},hexString:function(t,e){e=void 0!==e&&3===t.length?e:t[3];return"#"+v(t[0])+v(t[1])+v(t[2])+(e>=0&&e<1?v(Math.round(255*e)):"")},rgbString:function(t,e){if(e<1||t[3]&&t[3]<1)return f(t,e);return"rgb("+t[0]+", "+t[1]+", "+t[2]+")"},rgbaString:f,percentString:function(t,e){if(e<1||t[3]&&t[3]<1)return g(t,e);var n=Math.round(t[0]/255*100),i=Math.round(t[1]/255*100),a=Math.round(t[2]/255*100);return"rgb("+n+"%, "+i+"%, "+a+"%)"},percentaString:g,hslString:function(t,e){if(e<1||t[3]&&t[3]<1)return p(t,e);return"hsl("+t[0]+", "+t[1]+"%, "+t[2]+"%)"},hslaString:p,hwbString:function(t,e){void 0===e&&(e=void 0!==t[3]?t[3]:1);return"hwb("+t[0]+", "+t[1]+"%, "+t[2]+"%"+(void 0!==e&&1!==e?", "+e:"")+")"},keyword:function(t){return b[t.slice(0,3)]}};function d(t){if(t){var e=[0,0,0],n=1,i=t.match(/^#([a-fA-F0-9]{3,4})$/i),a="";if(i){a=(i=i[1])[3];for(var r=0;r<e.length;r++)e[r]=parseInt(i[r]+i[r],16);a&&(n=Math.round(parseInt(a+a,16)/255*100)/100)}else if(i=t.match(/^#([a-fA-F0-9]{6}([a-fA-F0-9]{2})?)$/i)){a=i[2],i=i[1];for(r=0;r<e.length;r++)e[r]=parseInt(i.slice(2*r,2*r+2),16);a&&(n=Math.round(parseInt(a,16)/255*100)/100)}else if(i=t.match(/^rgba?\(\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=parseInt(i[r+1]);n=parseFloat(i[4])}else if(i=t.match(/^rgba?\(\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=Math.round(2.55*parseFloat(i[r+1]));n=parseFloat(i[4])}else if(i=t.match(/(\w+)/)){if("transparent"==i[1])return[0,0,0,0];if(!(e=l[i[1]]))return}for(r=0;r<e.length;r++)e[r]=m(e[r],0,255);return n=n||0==n?m(n,0,1):1,e[3]=n,e}}function h(t){if(t){var e=t.match(/^hsla?\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[m(parseInt(e[1]),0,360),m(parseFloat(e[2]),0,100),m(parseFloat(e[3]),0,100),m(isNaN(n)?1:n,0,1)]}}}function c(t){if(t){var e=t.match(/^hwb\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[m(parseInt(e[1]),0,360),m(parseFloat(e[2]),0,100),m(parseFloat(e[3]),0,100),m(isNaN(n)?1:n,0,1)]}}}function f(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"rgba("+t[0]+", "+t[1]+", "+t[2]+", "+e+")"}function g(t,e){return"rgba("+Math.round(t[0]/255*100)+"%, "+Math.round(t[1]/255*100)+"%, "+Math.round(t[2]/255*100)+"%, "+(e||t[3]||1)+")"}function p(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"hsla("+t[0]+", "+t[1]+"%, "+t[2]+"%, "+e+")"}function m(t,e,n){return Math.min(Math.max(e,t),n)}function v(t){var e=t.toString(16).toUpperCase();return e.length<2?"0"+e:e}var b={};for(var x in l)b[l[x]]=x;var y=function(t){return t instanceof y?t:this instanceof y?(this.valid=!1,this.values={rgb:[0,0,0],hsl:[0,0,0],hsv:[0,0,0],hwb:[0,0,0],cmyk:[0,0,0,0],alpha:1},void("string"==typeof t?(e=u.getRgba(t))?this.setValues("rgb",e):(e=u.getHsla(t))?this.setValues("hsl",e):(e=u.getHwb(t))&&this.setValues("hwb",e):"object"==typeof t&&(void 0!==(e=t).r||void 0!==e.red?this.setValues("rgb",e):void 0!==e.l||void 0!==e.lightness?this.setValues("hsl",e):void 0!==e.v||void 0!==e.value?this.setValues("hsv",e):void 0!==e.w||void 0!==e.whiteness?this.setValues("hwb",e):void 0===e.c&&void 0===e.cyan||this.setValues("cmyk",e)))):new y(t);var e};y.prototype={isValid:function(){return this.valid},rgb:function(){return this.setSpace("rgb",arguments)},hsl:function(){return this.setSpace("hsl",arguments)},hsv:function(){return this.setSpace("hsv",arguments)},hwb:function(){return this.setSpace("hwb",arguments)},cmyk:function(){return this.setSpace("cmyk",arguments)},rgbArray:function(){return this.values.rgb},hslArray:function(){return this.values.hsl},hsvArray:function(){return this.values.hsv},hwbArray:function(){var t=this.values;return 1!==t.alpha?t.hwb.concat([t.alpha]):t.hwb},cmykArray:function(){return this.values.cmyk},rgbaArray:function(){var t=this.values;return t.rgb.concat([t.alpha])},hslaArray:function(){var t=this.values;return t.hsl.concat([t.alpha])},alpha:function(t){return void 0===t?this.values.alpha:(this.setValues("alpha",t),this)},red:function(t){return this.setChannel("rgb",0,t)},green:function(t){return this.setChannel("rgb",1,t)},blue:function(t){return this.setChannel("rgb",2,t)},hue:function(t){return t&&(t=(t%=360)<0?360+t:t),this.setChannel("hsl",0,t)},saturation:function(t){return this.setChannel("hsl",1,t)},lightness:function(t){return this.setChannel("hsl",2,t)},saturationv:function(t){return this.setChannel("hsv",1,t)},whiteness:function(t){return this.setChannel("hwb",1,t)},blackness:function(t){return this.setChannel("hwb",2,t)},value:function(t){return this.setChannel("hsv",2,t)},cyan:function(t){return this.setChannel("cmyk",0,t)},magenta:function(t){return this.setChannel("cmyk",1,t)},yellow:function(t){return this.setChannel("cmyk",2,t)},black:function(t){return this.setChannel("cmyk",3,t)},hexString:function(){return u.hexString(this.values.rgb)},rgbString:function(){return u.rgbString(this.values.rgb,this.values.alpha)},rgbaString:function(){return u.rgbaString(this.values.rgb,this.values.alpha)},percentString:function(){return u.percentString(this.values.rgb,this.values.alpha)},hslString:function(){return u.hslString(this.values.hsl,this.values.alpha)},hslaString:function(){return u.hslaString(this.values.hsl,this.values.alpha)},hwbString:function(){return u.hwbString(this.values.hwb,this.values.alpha)},keyword:function(){return u.keyword(this.values.rgb,this.values.alpha)},rgbNumber:function(){var t=this.values.rgb;return t[0]<<16|t[1]<<8|t[2]},luminosity:function(){for(var t=this.values.rgb,e=[],n=0;n<t.length;n++){var i=t[n]/255;e[n]=i<=.03928?i/12.92:Math.pow((i+.055)/1.055,2.4)}return.2126*e[0]+.7152*e[1]+.0722*e[2]},contrast:function(t){var e=this.luminosity(),n=t.luminosity();return e>n?(e+.05)/(n+.05):(n+.05)/(e+.05)},level:function(t){var e=this.contrast(t);return e>=7.1?"AAA":e>=4.5?"AA":""},dark:function(){var t=this.values.rgb;return(299*t[0]+587*t[1]+114*t[2])/1e3<128},light:function(){return!this.dark()},negate:function(){for(var t=[],e=0;e<3;e++)t[e]=255-this.values.rgb[e];return this.setValues("rgb",t),this},lighten:function(t){var e=this.values.hsl;return e[2]+=e[2]*t,this.setValues("hsl",e),this},darken:function(t){var e=this.values.hsl;return e[2]-=e[2]*t,this.setValues("hsl",e),this},saturate:function(t){var e=this.values.hsl;return e[1]+=e[1]*t,this.setValues("hsl",e),this},desaturate:function(t){var e=this.values.hsl;return e[1]-=e[1]*t,this.setValues("hsl",e),this},whiten:function(t){var e=this.values.hwb;return e[1]+=e[1]*t,this.setValues("hwb",e),this},blacken:function(t){var e=this.values.hwb;return e[2]+=e[2]*t,this.setValues("hwb",e),this},greyscale:function(){var t=this.values.rgb,e=.3*t[0]+.59*t[1]+.11*t[2];return this.setValues("rgb",[e,e,e]),this},clearer:function(t){var e=this.values.alpha;return this.setValues("alpha",e-e*t),this},opaquer:function(t){var e=this.values.alpha;return this.setValues("alpha",e+e*t),this},rotate:function(t){var e=this.values.hsl,n=(e[0]+t)%360;return e[0]=n<0?360+n:n,this.setValues("hsl",e),this},mix:function(t,e){var n=t,i=void 0===e?.5:e,a=2*i-1,r=this.alpha()-n.alpha(),o=((a*r==-1?a:(a+r)/(1+a*r))+1)/2,s=1-o;return this.rgb(o*this.red()+s*n.red(),o*this.green()+s*n.green(),o*this.blue()+s*n.blue()).alpha(this.alpha()*i+n.alpha()*(1-i))},toJSON:function(){return this.rgb()},clone:function(){var t,e,n=new y,i=this.values,a=n.values;for(var r in i)i.hasOwnProperty(r)&&(t=i[r],"[object Array]"===(e={}.toString.call(t))?a[r]=t.slice(0):"[object Number]"===e?a[r]=t:console.error("unexpected color value:",t));return n}},y.prototype.spaces={rgb:["red","green","blue"],hsl:["hue","saturation","lightness"],hsv:["hue","saturation","value"],hwb:["hue","whiteness","blackness"],cmyk:["cyan","magenta","yellow","black"]},y.prototype.maxes={rgb:[255,255,255],hsl:[360,100,100],hsv:[360,100,100],hwb:[360,100,100],cmyk:[100,100,100,100]},y.prototype.getValues=function(t){for(var e=this.values,n={},i=0;i<t.length;i++)n[t.charAt(i)]=e[t][i];return 1!==e.alpha&&(n.a=e.alpha),n},y.prototype.setValues=function(t,e){var n,i,a=this.values,r=this.spaces,o=this.maxes,l=1;if(this.valid=!0,"alpha"===t)l=e;else if(e.length)a[t]=e.slice(0,t.length),l=e[t.length];else if(void 0!==e[t.charAt(0)]){for(n=0;n<t.length;n++)a[t][n]=e[t.charAt(n)];l=e.a}else if(void 0!==e[r[t][0]]){var u=r[t];for(n=0;n<t.length;n++)a[t][n]=e[u[n]];l=e.alpha}if(a.alpha=Math.max(0,Math.min(1,void 0===l?a.alpha:l)),"alpha"===t)return!1;for(n=0;n<t.length;n++)i=Math.max(0,Math.min(o[t][n],a[t][n])),a[t][n]=Math.round(i);for(var d in r)d!==t&&(a[d]=s[t][d](a[t]));return!0},y.prototype.setSpace=function(t,e){var n=e[0];return void 0===n?this.getValues(t):("number"==typeof n&&(n=Array.prototype.slice.call(e)),this.setValues(t,n),this)},y.prototype.setChannel=function(t,e,n){var i=this.values[t];return void 0===n?i[e]:n===i[e]?this:(i[e]=n,this.setValues(t,i),this)},"undefined"!=typeof window&&(window.Color=y);var _,k=y,w={noop:function(){},uid:(_=0,function(){return _++}),isNullOrUndef:function(t){return null==t},isArray:function(t){if(Array.isArray&&Array.isArray(t))return!0;var e=Object.prototype.toString.call(t);return"[object"===e.substr(0,7)&&"Array]"===e.substr(-6)},isObject:function(t){return null!==t&&"[object Object]"===Object.prototype.toString.call(t)},isFinite:function(t){return("number"==typeof t||t instanceof Number)&&isFinite(t)},valueOrDefault:function(t,e){return void 0===t?e:t},valueAtIndexOrDefault:function(t,e,n){return w.valueOrDefault(w.isArray(t)?t[e]:t,n)},callback:function(t,e,n){if(t&&"function"==typeof t.call)return t.apply(n,e)},each:function(t,e,n,i){var a,r,o;if(w.isArray(t))if(r=t.length,i)for(a=r-1;a>=0;a--)e.call(n,t[a],a);else for(a=0;a<r;a++)e.call(n,t[a],a);else if(w.isObject(t))for(r=(o=Object.keys(t)).length,a=0;a<r;a++)e.call(n,t[o[a]],o[a])},arrayEquals:function(t,e){var n,i,a,r;if(!t||!e||t.length!==e.length)return!1;for(n=0,i=t.length;n<i;++n)if(a=t[n],r=e[n],a instanceof Array&&r instanceof Array){if(!w.arrayEquals(a,r))return!1}else if(a!==r)return!1;return!0},clone:function(t){if(w.isArray(t))return t.map(w.clone);if(w.isObject(t)){for(var e={},n=Object.keys(t),i=n.length,a=0;a<i;++a)e[n[a]]=w.clone(t[n[a]]);return e}return t},_merger:function(t,e,n,i){var a=e[t],r=n[t];w.isObject(a)&&w.isObject(r)?w.merge(a,r,i):e[t]=w.clone(r)},_mergerIf:function(t,e,n){var i=e[t],a=n[t];w.isObject(i)&&w.isObject(a)?w.mergeIf(i,a):e.hasOwnProperty(t)||(e[t]=w.clone(a))},merge:function(t,e,n){var i,a,r,o,s,l=w.isArray(e)?e:[e],u=l.length;if(!w.isObject(t))return t;for(i=(n=n||{}).merger||w._merger,a=0;a<u;++a)if(e=l[a],w.isObject(e))for(s=0,o=(r=Object.keys(e)).length;s<o;++s)i(r[s],t,e,n);return t},mergeIf:function(t,e){return w.merge(t,e,{merger:w._mergerIf})},extend:Object.assign||function(t){return w.merge(t,[].slice.call(arguments,1),{merger:function(t,e,n){e[t]=n[t]}})},inherits:function(t){var e=this,n=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return e.apply(this,arguments)},i=function(){this.constructor=n};return i.prototype=e.prototype,n.prototype=new i,n.extend=w.inherits,t&&w.extend(n.prototype,t),n.__super__=e.prototype,n},_deprecated:function(t,e,n,i){void 0!==e&&console.warn(t+': "'+n+'" is deprecated. Please use "'+i+'" instead')}},M=w;w.callCallback=w.callback,w.indexOf=function(t,e,n){return Array.prototype.indexOf.call(t,e,n)},w.getValueOrDefault=w.valueOrDefault,w.getValueAtIndexOrDefault=w.valueAtIndexOrDefault;var S={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return(t-=1)*t*t+1},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-((t-=1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return t*t*t*t*t},easeOutQuint:function(t){return(t-=1)*t*t*t*t+1},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return 1-Math.cos(t*(Math.PI/2))},easeOutSine:function(t){return Math.sin(t*(Math.PI/2))},easeInOutSine:function(t){return-.5*(Math.cos(Math.PI*t)-1)},easeInExpo:function(t){return 0===t?0:Math.pow(2,10*(t-1))},easeOutExpo:function(t){return 1===t?1:1-Math.pow(2,-10*t)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(2-Math.pow(2,-10*--t))},easeInCirc:function(t){return t>=1?t:-(Math.sqrt(1-t*t)-1)},easeOutCirc:function(t){return Math.sqrt(1-(t-=1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),-i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n))},easeOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),i*Math.pow(2,-10*t)*Math.sin((t-e)*(2*Math.PI)/n)+1)},easeInOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:2==(t/=.5)?1:(n||(n=.45),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),t<1?i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*-.5:i*Math.pow(2,-10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*.5+1)},easeInBack:function(t){var e=1.70158;return t*t*((e+1)*t-e)},easeOutBack:function(t){var e=1.70158;return(t-=1)*t*((e+1)*t+e)+1},easeInOutBack:function(t){var e=1.70158;return(t/=.5)<1?t*t*((1+(e*=1.525))*t-e)*.5:.5*((t-=2)*t*((1+(e*=1.525))*t+e)+2)},easeInBounce:function(t){return 1-S.easeOutBounce(1-t)},easeOutBounce:function(t){return t<1/2.75?7.5625*t*t:t<2/2.75?7.5625*(t-=1.5/2.75)*t+.75:t<2.5/2.75?7.5625*(t-=2.25/2.75)*t+.9375:7.5625*(t-=2.625/2.75)*t+.984375},easeInOutBounce:function(t){return t<.5?.5*S.easeInBounce(2*t):.5*S.easeOutBounce(2*t-1)+.5}},C={effects:S};M.easingEffects=S;var P=Math.PI,A=P/180,D=2*P,T=P/2,I=P/4,F=2*P/3,L={clear:function(t){t.ctx.clearRect(0,0,t.width,t.height)},roundedRect:function(t,e,n,i,a,r){if(r){var o=Math.min(r,a/2,i/2),s=e+o,l=n+o,u=e+i-o,d=n+a-o;t.moveTo(e,l),s<u&&l<d?(t.arc(s,l,o,-P,-T),t.arc(u,l,o,-T,0),t.arc(u,d,o,0,T),t.arc(s,d,o,T,P)):s<u?(t.moveTo(s,n),t.arc(u,l,o,-T,T),t.arc(s,l,o,T,P+T)):l<d?(t.arc(s,l,o,-P,0),t.arc(s,d,o,0,P)):t.arc(s,l,o,-P,P),t.closePath(),t.moveTo(e,n)}else t.rect(e,n,i,a)},drawPoint:function(t,e,n,i,a,r){var o,s,l,u,d,h=(r||0)*A;if(e&&"object"==typeof e&&("[object HTMLImageElement]"===(o=e.toString())||"[object HTMLCanvasElement]"===o))return t.save(),t.translate(i,a),t.rotate(h),t.drawImage(e,-e.width/2,-e.height/2,e.width,e.height),void t.restore();if(!(isNaN(n)||n<=0)){switch(t.beginPath(),e){default:t.arc(i,a,n,0,D),t.closePath();break;case"triangle":t.moveTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=F,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=F,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),t.closePath();break;case"rectRounded":u=n-(d=.516*n),s=Math.cos(h+I)*u,l=Math.sin(h+I)*u,t.arc(i-s,a-l,d,h-P,h-T),t.arc(i+l,a-s,d,h-T,h),t.arc(i+s,a+l,d,h,h+T),t.arc(i-l,a+s,d,h+T,h+P),t.closePath();break;case"rect":if(!r){u=Math.SQRT1_2*n,t.rect(i-u,a-u,2*u,2*u);break}h+=I;case"rectRot":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+l,a-s),t.lineTo(i+s,a+l),t.lineTo(i-l,a+s),t.closePath();break;case"crossRot":h+=I;case"cross":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"star":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s),h+=I,s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"line":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l);break;case"dash":t.moveTo(i,a),t.lineTo(i+Math.cos(h)*n,a+Math.sin(h)*n)}t.fill(),t.stroke()}},_isPointInArea:function(t,e){return t.x>e.left-1e-6&&t.x<e.right+1e-6&&t.y>e.top-1e-6&&t.y<e.bottom+1e-6},clipArea:function(t,e){t.save(),t.beginPath(),t.rect(e.left,e.top,e.right-e.left,e.bottom-e.top),t.clip()},unclipArea:function(t){t.restore()},lineTo:function(t,e,n,i){var a=n.steppedLine;if(a){if("middle"===a){var r=(e.x+n.x)/2;t.lineTo(r,i?n.y:e.y),t.lineTo(r,i?e.y:n.y)}else"after"===a&&!i||"after"!==a&&i?t.lineTo(e.x,n.y):t.lineTo(n.x,e.y);t.lineTo(n.x,n.y)}else n.tension?t.bezierCurveTo(i?e.controlPointPreviousX:e.controlPointNextX,i?e.controlPointPreviousY:e.controlPointNextY,i?n.controlPointNextX:n.controlPointPreviousX,i?n.controlPointNextY:n.controlPointPreviousY,n.x,n.y):t.lineTo(n.x,n.y)}},O=L;M.clear=L.clear,M.drawRoundedRectangle=function(t){t.beginPath(),L.roundedRect.apply(L,arguments)};var R={_set:function(t,e){return M.merge(this[t]||(this[t]={}),e)}};R._set("global",{defaultColor:"rgba(0,0,0,0.1)",defaultFontColor:"#666",defaultFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",defaultFontSize:12,defaultFontStyle:"normal",defaultLineHeight:1.2,showLines:!0});var z=R,N=M.valueOrDefault;var B={toLineHeight:function(t,e){var n=(""+t).match(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/);if(!n||"normal"===n[1])return 1.2*e;switch(t=+n[2],n[3]){case"px":return t;case"%":t/=100}return e*t},toPadding:function(t){var e,n,i,a;return M.isObject(t)?(e=+t.top||0,n=+t.right||0,i=+t.bottom||0,a=+t.left||0):e=n=i=a=+t||0,{top:e,right:n,bottom:i,left:a,height:e+i,width:a+n}},_parseFont:function(t){var e=z.global,n=N(t.fontSize,e.defaultFontSize),i={family:N(t.fontFamily,e.defaultFontFamily),lineHeight:M.options.toLineHeight(N(t.lineHeight,e.defaultLineHeight),n),size:n,style:N(t.fontStyle,e.defaultFontStyle),weight:null,string:""};return i.string=function(t){return!t||M.isNullOrUndef(t.size)||M.isNullOrUndef(t.family)?null:(t.style?t.style+" ":"")+(t.weight?t.weight+" ":"")+t.size+"px "+t.family}(i),i},resolve:function(t,e,n,i){var a,r,o,s=!0;for(a=0,r=t.length;a<r;++a)if(void 0!==(o=t[a])&&(void 0!==e&&"function"==typeof o&&(o=o(e),s=!1),void 0!==n&&M.isArray(o)&&(o=o[n],s=!1),void 0!==o))return i&&!s&&(i.cacheable=!1),o}},E={_factorize:function(t){var e,n=[],i=Math.sqrt(t);for(e=1;e<i;e++)t%e==0&&(n.push(e),n.push(t/e));return i===(0|i)&&n.push(i),n.sort((function(t,e){return t-e})).pop(),n},log10:Math.log10||function(t){var e=Math.log(t)*Math.LOG10E,n=Math.round(e);return t===Math.pow(10,n)?n:e}},W=E;M.log10=E.log10;var V=M,H=C,j=O,q=B,U=W,Y={getRtlAdapter:function(t,e,n){return t?function(t,e){return{x:function(n){return t+t+e-n},setWidth:function(t){e=t},textAlign:function(t){return"center"===t?t:"right"===t?"left":"right"},xPlus:function(t,e){return t-e},leftForLtr:function(t,e){return t-e}}}(e,n):{x:function(t){return t},setWidth:function(t){},textAlign:function(t){return t},xPlus:function(t,e){return t+e},leftForLtr:function(t,e){return t}}},overrideTextDirection:function(t,e){var n,i;"ltr"!==e&&"rtl"!==e||(i=[(n=t.canvas.style).getPropertyValue("direction"),n.getPropertyPriority("direction")],n.setProperty("direction",e,"important"),t.prevTextDirection=i)},restoreTextDirection:function(t){var e=t.prevTextDirection;void 0!==e&&(delete t.prevTextDirection,t.canvas.style.setProperty("direction",e[0],e[1]))}};V.easing=H,V.canvas=j,V.options=q,V.math=U,V.rtl=Y;var G=function(t){V.extend(this,t),this.initialize.apply(this,arguments)};V.extend(G.prototype,{_type:void 0,initialize:function(){this.hidden=!1},pivot:function(){var t=this;return t._view||(t._view=V.extend({},t._model)),t._start={},t},transition:function(t){var e=this,n=e._model,i=e._start,a=e._view;return n&&1!==t?(a||(a=e._view={}),i||(i=e._start={}),function(t,e,n,i){var a,r,o,s,l,u,d,h,c,f=Object.keys(n);for(a=0,r=f.length;a<r;++a)if(u=n[o=f[a]],e.hasOwnProperty(o)||(e[o]=u),(s=e[o])!==u&&"_"!==o[0]){if(t.hasOwnProperty(o)||(t[o]=s),(d=typeof u)===typeof(l=t[o]))if("string"===d){if((h=k(l)).valid&&(c=k(u)).valid){e[o]=c.mix(h,i).rgbString();continue}}else if(V.isFinite(l)&&V.isFinite(u)){e[o]=l+(u-l)*i;continue}e[o]=u}}(i,a,n,t),e):(e._view=V.extend({},n),e._start=null,e)},tooltipPosition:function(){return{x:this._model.x,y:this._model.y}},hasValue:function(){return V.isNumber(this._model.x)&&V.isNumber(this._model.y)}}),G.extend=V.inherits;var X=G,K=X.extend({chart:null,currentStep:0,numSteps:60,easing:"",render:null,onAnimationProgress:null,onAnimationComplete:null}),Z=K;Object.defineProperty(K.prototype,"animationObject",{get:function(){return this}}),Object.defineProperty(K.prototype,"chartInstance",{get:function(){return this.chart},set:function(t){this.chart=t}}),z._set("global",{animation:{duration:1e3,easing:"easeOutQuart",onProgress:V.noop,onComplete:V.noop}});var $={animations:[],request:null,addAnimation:function(t,e,n,i){var a,r,o=this.animations;for(e.chart=t,e.startTime=Date.now(),e.duration=n,i||(t.animating=!0),a=0,r=o.length;a<r;++a)if(o[a].chart===t)return void(o[a]=e);o.push(e),1===o.length&&this.requestAnimationFrame()},cancelAnimation:function(t){var e=V.findIndex(this.animations,(function(e){return e.chart===t}));-1!==e&&(this.animations.splice(e,1),t.animating=!1)},requestAnimationFrame:function(){var t=this;null===t.request&&(t.request=V.requestAnimFrame.call(window,(function(){t.request=null,t.startDigest()})))},startDigest:function(){this.advance(),this.animations.length>0&&this.requestAnimationFrame()},advance:function(){for(var t,e,n,i,a=this.animations,r=0;r<a.length;)e=(t=a[r]).chart,n=t.numSteps,i=Math.floor((Date.now()-t.startTime)/t.duration*n)+1,t.currentStep=Math.min(i,n),V.callback(t.render,[e,t],e),V.callback(t.onAnimationProgress,[t],e),t.currentStep>=n?(V.callback(t.onAnimationComplete,[t],e),e.animating=!1,a.splice(r,1)):++r}},J=V.options.resolve,Q=["push","pop","shift","splice","unshift"];function tt(t,e){var n=t._chartjs;if(n){var i=n.listeners,a=i.indexOf(e);-1!==a&&i.splice(a,1),i.length>0||(Q.forEach((function(e){delete t[e]})),delete t._chartjs)}}var et=function(t,e){this.initialize(t,e)};V.extend(et.prototype,{datasetElementType:null,dataElementType:null,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth"],_dataElementOptions:["backgroundColor","borderColor","borderWidth","pointStyle"],initialize:function(t,e){var n=this;n.chart=t,n.index=e,n.linkScales(),n.addElements(),n._type=n.getMeta().type},updateIndex:function(t){this.index=t},linkScales:function(){var t=this.getMeta(),e=this.chart,n=e.scales,i=this.getDataset(),a=e.options.scales;null!==t.xAxisID&&t.xAxisID in n&&!i.xAxisID||(t.xAxisID=i.xAxisID||a.xAxes[0].id),null!==t.yAxisID&&t.yAxisID in n&&!i.yAxisID||(t.yAxisID=i.yAxisID||a.yAxes[0].id)},getDataset:function(){return this.chart.data.datasets[this.index]},getMeta:function(){return this.chart.getDatasetMeta(this.index)},getScaleForId:function(t){return this.chart.scales[t]},_getValueScaleId:function(){return this.getMeta().yAxisID},_getIndexScaleId:function(){return this.getMeta().xAxisID},_getValueScale:function(){return this.getScaleForId(this._getValueScaleId())},_getIndexScale:function(){return this.getScaleForId(this._getIndexScaleId())},reset:function(){this._update(!0)},destroy:function(){this._data&&tt(this._data,this)},createMetaDataset:function(){var t=this.datasetElementType;return t&&new t({_chart:this.chart,_datasetIndex:this.index})},createMetaData:function(t){var e=this.dataElementType;return e&&new e({_chart:this.chart,_datasetIndex:this.index,_index:t})},addElements:function(){var t,e,n=this.getMeta(),i=this.getDataset().data||[],a=n.data;for(t=0,e=i.length;t<e;++t)a[t]=a[t]||this.createMetaData(t);n.dataset=n.dataset||this.createMetaDataset()},addElementAndReset:function(t){var e=this.createMetaData(t);this.getMeta().data.splice(t,0,e),this.updateElement(e,t,!0)},buildOrUpdateElements:function(){var t,e,n=this,i=n.getDataset(),a=i.data||(i.data=[]);n._data!==a&&(n._data&&tt(n._data,n),a&&Object.isExtensible(a)&&(e=n,(t=a)._chartjs?t._chartjs.listeners.push(e):(Object.defineProperty(t,"_chartjs",{configurable:!0,enumerable:!1,value:{listeners:[e]}}),Q.forEach((function(e){var n="onData"+e.charAt(0).toUpperCase()+e.slice(1),i=t[e];Object.defineProperty(t,e,{configurable:!0,enumerable:!1,value:function(){var e=Array.prototype.slice.call(arguments),a=i.apply(this,e);return V.each(t._chartjs.listeners,(function(t){"function"==typeof t[n]&&t[n].apply(t,e)})),a}})})))),n._data=a),n.resyncElements()},_configure:function(){this._config=V.merge({},[this.chart.options.datasets[this._type],this.getDataset()],{merger:function(t,e,n){"_meta"!==t&&"data"!==t&&V._merger(t,e,n)}})},_update:function(t){this._configure(),this._cachedDataOpts=null,this.update(t)},update:V.noop,transition:function(t){for(var e=this.getMeta(),n=e.data||[],i=n.length,a=0;a<i;++a)n[a].transition(t);e.dataset&&e.dataset.transition(t)},draw:function(){var t=this.getMeta(),e=t.data||[],n=e.length,i=0;for(t.dataset&&t.dataset.draw();i<n;++i)e[i].draw()},getStyle:function(t){var e,n=this.getMeta(),i=n.dataset;return this._configure(),i&&void 0===t?e=this._resolveDatasetElementOptions(i||{}):(t=t||0,e=this._resolveDataElementOptions(n.data[t]||{},t)),!1!==e.fill&&null!==e.fill||(e.backgroundColor=e.borderColor),e},_resolveDatasetElementOptions:function(t,e){var n,i,a,r,o=this,s=o.chart,l=o._config,u=t.custom||{},d=s.options.elements[o.datasetElementType.prototype._type]||{},h=o._datasetElementOptions,c={},f={chart:s,dataset:o.getDataset(),datasetIndex:o.index,hover:e};for(n=0,i=h.length;n<i;++n)a=h[n],r=e?"hover"+a.charAt(0).toUpperCase()+a.slice(1):a,c[a]=J([u[r],l[r],d[r]],f);return c},_resolveDataElementOptions:function(t,e){var n=this,i=t&&t.custom,a=n._cachedDataOpts;if(a&&!i)return a;var r,o,s,l,u=n.chart,d=n._config,h=u.options.elements[n.dataElementType.prototype._type]||{},c=n._dataElementOptions,f={},g={chart:u,dataIndex:e,dataset:n.getDataset(),datasetIndex:n.index},p={cacheable:!i};if(i=i||{},V.isArray(c))for(o=0,s=c.length;o<s;++o)f[l=c[o]]=J([i[l],d[l],h[l]],g,e,p);else for(o=0,s=(r=Object.keys(c)).length;o<s;++o)f[l=r[o]]=J([i[l],d[c[l]],d[l],h[l]],g,e,p);return p.cacheable&&(n._cachedDataOpts=Object.freeze(f)),f},removeHoverStyle:function(t){V.merge(t._model,t.$previousStyle||{}),delete t.$previousStyle},setHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],n=t._index,i=t.custom||{},a=t._model,r=V.getHoverColor;t.$previousStyle={backgroundColor:a.backgroundColor,borderColor:a.borderColor,borderWidth:a.borderWidth},a.backgroundColor=J([i.hoverBackgroundColor,e.hoverBackgroundColor,r(a.backgroundColor)],void 0,n),a.borderColor=J([i.hoverBorderColor,e.hoverBorderColor,r(a.borderColor)],void 0,n),a.borderWidth=J([i.hoverBorderWidth,e.hoverBorderWidth,a.borderWidth],void 0,n)},_removeDatasetHoverStyle:function(){var t=this.getMeta().dataset;t&&this.removeHoverStyle(t)},_setDatasetHoverStyle:function(){var t,e,n,i,a,r,o=this.getMeta().dataset,s={};if(o){for(r=o._model,a=this._resolveDatasetElementOptions(o,!0),t=0,e=(i=Object.keys(a)).length;t<e;++t)s[n=i[t]]=r[n],r[n]=a[n];o.$previousStyle=s}},resyncElements:function(){var t=this.getMeta(),e=this.getDataset().data,n=t.data.length,i=e.length;i<n?t.data.splice(i,n-i):i>n&&this.insertElements(n,i-n)},insertElements:function(t,e){for(var n=0;n<e;++n)this.addElementAndReset(t+n)},onDataPush:function(){var t=arguments.length;this.insertElements(this.getDataset().data.length-t,t)},onDataPop:function(){this.getMeta().data.pop()},onDataShift:function(){this.getMeta().data.shift()},onDataSplice:function(t,e){this.getMeta().data.splice(t,e),this.insertElements(t,arguments.length-2)},onDataUnshift:function(){this.insertElements(0,arguments.length)}}),et.extend=V.inherits;var nt=et,it=2*Math.PI;function at(t,e){var n=e.startAngle,i=e.endAngle,a=e.pixelMargin,r=a/e.outerRadius,o=e.x,s=e.y;t.beginPath(),t.arc(o,s,e.outerRadius,n-r,i+r),e.innerRadius>a?(r=a/e.innerRadius,t.arc(o,s,e.innerRadius-a,i+r,n-r,!0)):t.arc(o,s,a,i+Math.PI/2,n-Math.PI/2),t.closePath(),t.clip()}function rt(t,e,n){var i="inner"===e.borderAlign;i?(t.lineWidth=2*e.borderWidth,t.lineJoin="round"):(t.lineWidth=e.borderWidth,t.lineJoin="bevel"),n.fullCircles&&function(t,e,n,i){var a,r=n.endAngle;for(i&&(n.endAngle=n.startAngle+it,at(t,n),n.endAngle=r,n.endAngle===n.startAngle&&n.fullCircles&&(n.endAngle+=it,n.fullCircles--)),t.beginPath(),t.arc(n.x,n.y,n.innerRadius,n.startAngle+it,n.startAngle,!0),a=0;a<n.fullCircles;++a)t.stroke();for(t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.startAngle+it),a=0;a<n.fullCircles;++a)t.stroke()}(t,e,n,i),i&&at(t,n),t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.endAngle),t.arc(n.x,n.y,n.innerRadius,n.endAngle,n.startAngle,!0),t.closePath(),t.stroke()}z._set("global",{elements:{arc:{backgroundColor:z.global.defaultColor,borderColor:"#fff",borderWidth:2,borderAlign:"center"}}});var ot=X.extend({_type:"arc",inLabelRange:function(t){var e=this._view;return!!e&&Math.pow(t-e.x,2)<Math.pow(e.radius+e.hoverRadius,2)},inRange:function(t,e){var n=this._view;if(n){for(var i=V.getAngleFromPoint(n,{x:t,y:e}),a=i.angle,r=i.distance,o=n.startAngle,s=n.endAngle;s<o;)s+=it;for(;a>s;)a-=it;for(;a<o;)a+=it;var l=a>=o&&a<=s,u=r>=n.innerRadius&&r<=n.outerRadius;return l&&u}return!1},getCenterPoint:function(){var t=this._view,e=(t.startAngle+t.endAngle)/2,n=(t.innerRadius+t.outerRadius)/2;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},getArea:function(){var t=this._view;return Math.PI*((t.endAngle-t.startAngle)/(2*Math.PI))*(Math.pow(t.outerRadius,2)-Math.pow(t.innerRadius,2))},tooltipPosition:function(){var t=this._view,e=t.startAngle+(t.endAngle-t.startAngle)/2,n=(t.outerRadius-t.innerRadius)/2+t.innerRadius;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},draw:function(){var t,e=this._chart.ctx,n=this._view,i="inner"===n.borderAlign?.33:0,a={x:n.x,y:n.y,innerRadius:n.innerRadius,outerRadius:Math.max(n.outerRadius-i,0),pixelMargin:i,startAngle:n.startAngle,endAngle:n.endAngle,fullCircles:Math.floor(n.circumference/it)};if(e.save(),e.fillStyle=n.backgroundColor,e.strokeStyle=n.borderColor,a.fullCircles){for(a.endAngle=a.startAngle+it,e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),t=0;t<a.fullCircles;++t)e.fill();a.endAngle=a.startAngle+n.circumference%it}e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),e.fill(),n.borderWidth&&rt(e,n,a),e.restore()}}),st=V.valueOrDefault,lt=z.global.defaultColor;z._set("global",{elements:{line:{tension:.4,backgroundColor:lt,borderWidth:3,borderColor:lt,borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",capBezierPoints:!0,fill:!0}}});var ut=X.extend({_type:"line",draw:function(){var t,e,n,i=this,a=i._view,r=i._chart.ctx,o=a.spanGaps,s=i._children.slice(),l=z.global,u=l.elements.line,d=-1,h=i._loop;if(s.length){if(i._loop){for(t=0;t<s.length;++t)if(e=V.previousItem(s,t),!s[t]._view.skip&&e._view.skip){s=s.slice(t).concat(s.slice(0,t)),h=o;break}h&&s.push(s[0])}for(r.save(),r.lineCap=a.borderCapStyle||u.borderCapStyle,r.setLineDash&&r.setLineDash(a.borderDash||u.borderDash),r.lineDashOffset=st(a.borderDashOffset,u.borderDashOffset),r.lineJoin=a.borderJoinStyle||u.borderJoinStyle,r.lineWidth=st(a.borderWidth,u.borderWidth),r.strokeStyle=a.borderColor||l.defaultColor,r.beginPath(),(n=s[0]._view).skip||(r.moveTo(n.x,n.y),d=0),t=1;t<s.length;++t)n=s[t]._view,e=-1===d?V.previousItem(s,t):s[d],n.skip||(d!==t-1&&!o||-1===d?r.moveTo(n.x,n.y):V.canvas.lineTo(r,e._view,n),d=t);h&&r.closePath(),r.stroke(),r.restore()}}}),dt=V.valueOrDefault,ht=z.global.defaultColor;function ct(t){var e=this._view;return!!e&&Math.abs(t-e.x)<e.radius+e.hitRadius}z._set("global",{elements:{point:{radius:3,pointStyle:"circle",backgroundColor:ht,borderColor:ht,borderWidth:1,hitRadius:1,hoverRadius:4,hoverBorderWidth:1}}});var ft=X.extend({_type:"point",inRange:function(t,e){var n=this._view;return!!n&&Math.pow(t-n.x,2)+Math.pow(e-n.y,2)<Math.pow(n.hitRadius+n.radius,2)},inLabelRange:ct,inXRange:ct,inYRange:function(t){var e=this._view;return!!e&&Math.abs(t-e.y)<e.radius+e.hitRadius},getCenterPoint:function(){var t=this._view;return{x:t.x,y:t.y}},getArea:function(){return Math.PI*Math.pow(this._view.radius,2)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y,padding:t.radius+t.borderWidth}},draw:function(t){var e=this._view,n=this._chart.ctx,i=e.pointStyle,a=e.rotation,r=e.radius,o=e.x,s=e.y,l=z.global,u=l.defaultColor;e.skip||(void 0===t||V.canvas._isPointInArea(e,t))&&(n.strokeStyle=e.borderColor||u,n.lineWidth=dt(e.borderWidth,l.elements.point.borderWidth),n.fillStyle=e.backgroundColor||u,V.canvas.drawPoint(n,i,r,o,s,a))}}),gt=z.global.defaultColor;function pt(t){return t&&void 0!==t.width}function mt(t){var e,n,i,a,r;return pt(t)?(r=t.width/2,e=t.x-r,n=t.x+r,i=Math.min(t.y,t.base),a=Math.max(t.y,t.base)):(r=t.height/2,e=Math.min(t.x,t.base),n=Math.max(t.x,t.base),i=t.y-r,a=t.y+r),{left:e,top:i,right:n,bottom:a}}function vt(t,e,n){return t===e?n:t===n?e:t}function bt(t,e,n){var i,a,r,o,s=t.borderWidth,l=function(t){var e=t.borderSkipped,n={};return e?(t.horizontal?t.base>t.x&&(e=vt(e,"left","right")):t.base<t.y&&(e=vt(e,"bottom","top")),n[e]=!0,n):n}(t);return V.isObject(s)?(i=+s.top||0,a=+s.right||0,r=+s.bottom||0,o=+s.left||0):i=a=r=o=+s||0,{t:l.top||i<0?0:i>n?n:i,r:l.right||a<0?0:a>e?e:a,b:l.bottom||r<0?0:r>n?n:r,l:l.left||o<0?0:o>e?e:o}}function xt(t,e,n){var i=null===e,a=null===n,r=!(!t||i&&a)&&mt(t);return r&&(i||e>=r.left&&e<=r.right)&&(a||n>=r.top&&n<=r.bottom)}z._set("global",{elements:{rectangle:{backgroundColor:gt,borderColor:gt,borderSkipped:"bottom",borderWidth:0}}});var yt=X.extend({_type:"rectangle",draw:function(){var t=this._chart.ctx,e=this._view,n=function(t){var e=mt(t),n=e.right-e.left,i=e.bottom-e.top,a=bt(t,n/2,i/2);return{outer:{x:e.left,y:e.top,w:n,h:i},inner:{x:e.left+a.l,y:e.top+a.t,w:n-a.l-a.r,h:i-a.t-a.b}}}(e),i=n.outer,a=n.inner;t.fillStyle=e.backgroundColor,t.fillRect(i.x,i.y,i.w,i.h),i.w===a.w&&i.h===a.h||(t.save(),t.beginPath(),t.rect(i.x,i.y,i.w,i.h),t.clip(),t.fillStyle=e.borderColor,t.rect(a.x,a.y,a.w,a.h),t.fill("evenodd"),t.restore())},height:function(){var t=this._view;return t.base-t.y},inRange:function(t,e){return xt(this._view,t,e)},inLabelRange:function(t,e){var n=this._view;return pt(n)?xt(n,t,null):xt(n,null,e)},inXRange:function(t){return xt(this._view,t,null)},inYRange:function(t){return xt(this._view,null,t)},getCenterPoint:function(){var t,e,n=this._view;return pt(n)?(t=n.x,e=(n.y+n.base)/2):(t=(n.x+n.base)/2,e=n.y),{x:t,y:e}},getArea:function(){var t=this._view;return pt(t)?t.width*Math.abs(t.y-t.base):t.height*Math.abs(t.x-t.base)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y}}}),_t={},kt=ot,wt=ut,Mt=ft,St=yt;_t.Arc=kt,_t.Line=wt,_t.Point=Mt,_t.Rectangle=St;var Ct=V._deprecated,Pt=V.valueOrDefault;function At(t,e,n){var i,a,r=n.barThickness,o=e.stackCount,s=e.pixels[t],l=V.isNullOrUndef(r)?function(t,e){var n,i,a,r,o=t._length;for(a=1,r=e.length;a<r;++a)o=Math.min(o,Math.abs(e[a]-e[a-1]));for(a=0,r=t.getTicks().length;a<r;++a)i=t.getPixelForTick(a),o=a>0?Math.min(o,Math.abs(i-n)):o,n=i;return o}(e.scale,e.pixels):-1;return V.isNullOrUndef(r)?(i=l*n.categoryPercentage,a=n.barPercentage):(i=r*o,a=1),{chunk:i/o,ratio:a,start:s-i/2}}z._set("bar",{hover:{mode:"label"},scales:{xAxes:[{type:"category",offset:!0,gridLines:{offsetGridLines:!0}}],yAxes:[{type:"linear"}]}}),z._set("global",{datasets:{bar:{categoryPercentage:.8,barPercentage:.9}}});var Dt=nt.extend({dataElementType:_t.Rectangle,_dataElementOptions:["backgroundColor","borderColor","borderSkipped","borderWidth","barPercentage","barThickness","categoryPercentage","maxBarThickness","minBarLength"],initialize:function(){var t,e,n=this;nt.prototype.initialize.apply(n,arguments),(t=n.getMeta()).stack=n.getDataset().stack,t.bar=!0,e=n._getIndexScale().options,Ct("bar chart",e.barPercentage,"scales.[x/y]Axes.barPercentage","dataset.barPercentage"),Ct("bar chart",e.barThickness,"scales.[x/y]Axes.barThickness","dataset.barThickness"),Ct("bar chart",e.categoryPercentage,"scales.[x/y]Axes.categoryPercentage","dataset.categoryPercentage"),Ct("bar chart",n._getValueScale().options.minBarLength,"scales.[x/y]Axes.minBarLength","dataset.minBarLength"),Ct("bar chart",e.maxBarThickness,"scales.[x/y]Axes.maxBarThickness","dataset.maxBarThickness")},update:function(t){var e,n,i=this.getMeta().data;for(this._ruler=this.getRuler(),e=0,n=i.length;e<n;++e)this.updateElement(i[e],e,t)},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=i.getDataset(),o=i._resolveDataElementOptions(t,e);t._xScale=i.getScaleForId(a.xAxisID),t._yScale=i.getScaleForId(a.yAxisID),t._datasetIndex=i.index,t._index=e,t._model={backgroundColor:o.backgroundColor,borderColor:o.borderColor,borderSkipped:o.borderSkipped,borderWidth:o.borderWidth,datasetLabel:r.label,label:i.chart.data.labels[e]},V.isArray(r.data[e])&&(t._model.borderSkipped=null),i._updateElementGeometry(t,e,n,o),t.pivot()},_updateElementGeometry:function(t,e,n,i){var a=this,r=t._model,o=a._getValueScale(),s=o.getBasePixel(),l=o.isHorizontal(),u=a._ruler||a.getRuler(),d=a.calculateBarValuePixels(a.index,e,i),h=a.calculateBarIndexPixels(a.index,e,u,i);r.horizontal=l,r.base=n?s:d.base,r.x=l?n?s:d.head:h.center,r.y=l?h.center:n?s:d.head,r.height=l?h.size:void 0,r.width=l?void 0:h.size},_getStacks:function(t){var e,n,i=this._getIndexScale(),a=i._getMatchingVisibleMetas(this._type),r=i.options.stacked,o=a.length,s=[];for(e=0;e<o&&(n=a[e],(!1===r||-1===s.indexOf(n.stack)||void 0===r&&void 0===n.stack)&&s.push(n.stack),n.index!==t);++e);return s},getStackCount:function(){return this._getStacks().length},getStackIndex:function(t,e){var n=this._getStacks(t),i=void 0!==e?n.indexOf(e):-1;return-1===i?n.length-1:i},getRuler:function(){var t,e,n=this._getIndexScale(),i=[];for(t=0,e=this.getMeta().data.length;t<e;++t)i.push(n.getPixelForValue(null,t,this.index));return{pixels:i,start:n._startPixel,end:n._endPixel,stackCount:this.getStackCount(),scale:n}},calculateBarValuePixels:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._getValueScale(),c=h.isHorizontal(),f=d.data.datasets,g=h._getMatchingVisibleMetas(this._type),p=h._parseValue(f[t].data[e]),m=n.minBarLength,v=h.options.stacked,b=this.getMeta().stack,x=void 0===p.start?0:p.max>=0&&p.min>=0?p.min:p.max,y=void 0===p.start?p.end:p.max>=0&&p.min>=0?p.max-p.min:p.min-p.max,_=g.length;if(v||void 0===v&&void 0!==b)for(i=0;i<_&&(a=g[i]).index!==t;++i)a.stack===b&&(r=void 0===(u=h._parseValue(f[a.index].data[e])).start?u.end:u.min>=0&&u.max>=0?u.max:u.min,(p.min<0&&r<0||p.max>=0&&r>0)&&(x+=r));return o=h.getPixelForValue(x),l=(s=h.getPixelForValue(x+y))-o,void 0!==m&&Math.abs(l)<m&&(l=m,s=y>=0&&!c||y<0&&c?o-m:o+m),{size:l,base:o,head:s,center:s+l/2}},calculateBarIndexPixels:function(t,e,n,i){var a="flex"===i.barThickness?function(t,e,n){var i,a=e.pixels,r=a[t],o=t>0?a[t-1]:null,s=t<a.length-1?a[t+1]:null,l=n.categoryPercentage;return null===o&&(o=r-(null===s?e.end-e.start:s-r)),null===s&&(s=r+r-o),i=r-(r-Math.min(o,s))/2*l,{chunk:Math.abs(s-o)/2*l/e.stackCount,ratio:n.barPercentage,start:i}}(e,n,i):At(e,n,i),r=this.getStackIndex(t,this.getMeta().stack),o=a.start+a.chunk*r+a.chunk/2,s=Math.min(Pt(i.maxBarThickness,1/0),a.chunk*a.ratio);return{base:o-s/2,head:o+s/2,center:o,size:s}},draw:function(){var t=this.chart,e=this._getValueScale(),n=this.getMeta().data,i=this.getDataset(),a=n.length,r=0;for(V.canvas.clipArea(t.ctx,t.chartArea);r<a;++r){var o=e._parseValue(i.data[r]);isNaN(o.min)||isNaN(o.max)||n[r].draw()}V.canvas.unclipArea(t.ctx)},_resolveDataElementOptions:function(){var t=this,e=V.extend({},nt.prototype._resolveDataElementOptions.apply(t,arguments)),n=t._getIndexScale().options,i=t._getValueScale().options;return e.barPercentage=Pt(n.barPercentage,e.barPercentage),e.barThickness=Pt(n.barThickness,e.barThickness),e.categoryPercentage=Pt(n.categoryPercentage,e.categoryPercentage),e.maxBarThickness=Pt(n.maxBarThickness,e.maxBarThickness),e.minBarLength=Pt(i.minBarLength,e.minBarLength),e}}),Tt=V.valueOrDefault,It=V.options.resolve;z._set("bubble",{hover:{mode:"single"},scales:{xAxes:[{type:"linear",position:"bottom",id:"x-axis-0"}],yAxes:[{type:"linear",position:"left",id:"y-axis-0"}]},tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.datasets[t.datasetIndex].label||"",i=e.datasets[t.datasetIndex].data[t.index];return n+": ("+t.xLabel+", "+t.yLabel+", "+i.r+")"}}}});var Ft=nt.extend({dataElementType:_t.Point,_dataElementOptions:["backgroundColor","borderColor","borderWidth","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth","hoverRadius","hitRadius","pointStyle","rotation"],update:function(t){var e=this,n=e.getMeta().data;V.each(n,(function(n,i){e.updateElement(n,i,t)}))},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=t.custom||{},o=i.getScaleForId(a.xAxisID),s=i.getScaleForId(a.yAxisID),l=i._resolveDataElementOptions(t,e),u=i.getDataset().data[e],d=i.index,h=n?o.getPixelForDecimal(.5):o.getPixelForValue("object"==typeof u?u:NaN,e,d),c=n?s.getBasePixel():s.getPixelForValue(u,e,d);t._xScale=o,t._yScale=s,t._options=l,t._datasetIndex=d,t._index=e,t._model={backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,hitRadius:l.hitRadius,pointStyle:l.pointStyle,rotation:l.rotation,radius:n?0:l.radius,skip:r.skip||isNaN(h)||isNaN(c),x:h,y:c},t.pivot()},setHoverStyle:function(t){var e=t._model,n=t._options,i=V.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Tt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Tt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Tt(n.hoverBorderWidth,n.borderWidth),e.radius=n.radius+n.hoverRadius},_resolveDataElementOptions:function(t,e){var n=this,i=n.chart,a=n.getDataset(),r=t.custom||{},o=a.data[e]||{},s=nt.prototype._resolveDataElementOptions.apply(n,arguments),l={chart:i,dataIndex:e,dataset:a,datasetIndex:n.index};return n._cachedDataOpts===s&&(s=V.extend({},s)),s.radius=It([r.radius,o.r,n._config.radius,i.options.elements.point.radius],l,e),s}}),Lt=V.valueOrDefault,Ot=Math.PI,Rt=2*Ot,zt=Ot/2;z._set("doughnut",{animation:{animateRotate:!0,animateScale:!1},hover:{mode:"single"},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r]&&(a.data[r].hidden=!a.data[r].hidden);o.update()}},cutoutPercentage:50,rotation:-zt,circumference:Rt,tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.labels[t.index],i=": "+e.datasets[t.datasetIndex].data[t.index];return V.isArray(n)?(n=n.slice())[0]+=i:n+=i,n}}}});var Nt=nt.extend({dataElementType:_t.Arc,linkScales:V.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],getRingIndex:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&++e;return e},update:function(t){var e,n,i,a,r=this,o=r.chart,s=o.chartArea,l=o.options,u=1,d=1,h=0,c=0,f=r.getMeta(),g=f.data,p=l.cutoutPercentage/100||0,m=l.circumference,v=r._getRingWeight(r.index);if(m<Rt){var b=l.rotation%Rt,x=(b+=b>=Ot?-Rt:b<-Ot?Rt:0)+m,y=Math.cos(b),_=Math.sin(b),k=Math.cos(x),w=Math.sin(x),M=b<=0&&x>=0||x>=Rt,S=b<=zt&&x>=zt||x>=Rt+zt,C=b<=-zt&&x>=-zt||x>=Ot+zt,P=b===-Ot||x>=Ot?-1:Math.min(y,y*p,k,k*p),A=C?-1:Math.min(_,_*p,w,w*p),D=M?1:Math.max(y,y*p,k,k*p),T=S?1:Math.max(_,_*p,w,w*p);u=(D-P)/2,d=(T-A)/2,h=-(D+P)/2,c=-(T+A)/2}for(i=0,a=g.length;i<a;++i)g[i]._options=r._resolveDataElementOptions(g[i],i);for(o.borderWidth=r.getMaxBorderWidth(),e=(s.right-s.left-o.borderWidth)/u,n=(s.bottom-s.top-o.borderWidth)/d,o.outerRadius=Math.max(Math.min(e,n)/2,0),o.innerRadius=Math.max(o.outerRadius*p,0),o.radiusLength=(o.outerRadius-o.innerRadius)/(r._getVisibleDatasetWeightTotal()||1),o.offsetX=h*o.outerRadius,o.offsetY=c*o.outerRadius,f.total=r.calculateTotal(),r.outerRadius=o.outerRadius-o.radiusLength*r._getRingWeightOffset(r.index),r.innerRadius=Math.max(r.outerRadius-o.radiusLength*v,0),i=0,a=g.length;i<a;++i)r.updateElement(g[i],i,t)},updateElement:function(t,e,n){var i=this,a=i.chart,r=a.chartArea,o=a.options,s=o.animation,l=(r.left+r.right)/2,u=(r.top+r.bottom)/2,d=o.rotation,h=o.rotation,c=i.getDataset(),f=n&&s.animateRotate?0:t.hidden?0:i.calculateCircumference(c.data[e])*(o.circumference/Rt),g=n&&s.animateScale?0:i.innerRadius,p=n&&s.animateScale?0:i.outerRadius,m=t._options||{};V.extend(t,{_datasetIndex:i.index,_index:e,_model:{backgroundColor:m.backgroundColor,borderColor:m.borderColor,borderWidth:m.borderWidth,borderAlign:m.borderAlign,x:l+a.offsetX,y:u+a.offsetY,startAngle:d,endAngle:h,circumference:f,outerRadius:p,innerRadius:g,label:V.valueAtIndexOrDefault(c.label,e,a.data.labels[e])}});var v=t._model;n&&s.animateRotate||(v.startAngle=0===e?o.rotation:i.getMeta().data[e-1]._model.endAngle,v.endAngle=v.startAngle+v.circumference),t.pivot()},calculateTotal:function(){var t,e=this.getDataset(),n=this.getMeta(),i=0;return V.each(n.data,(function(n,a){t=e.data[a],isNaN(t)||n.hidden||(i+=Math.abs(t))})),i},calculateCircumference:function(t){var e=this.getMeta().total;return e>0&&!isNaN(t)?Rt*(Math.abs(t)/e):0},getMaxBorderWidth:function(t){var e,n,i,a,r,o,s,l,u=0,d=this.chart;if(!t)for(e=0,n=d.data.datasets.length;e<n;++e)if(d.isDatasetVisible(e)){t=(i=d.getDatasetMeta(e)).data,e!==this.index&&(r=i.controller);break}if(!t)return 0;for(e=0,n=t.length;e<n;++e)a=t[e],r?(r._configure(),o=r._resolveDataElementOptions(a,e)):o=a._options,"inner"!==o.borderAlign&&(s=o.borderWidth,u=(l=o.hoverBorderWidth)>(u=s>u?s:u)?l:u);return u},setHoverStyle:function(t){var e=t._model,n=t._options,i=V.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=Lt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Lt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Lt(n.hoverBorderWidth,n.borderWidth)},_getRingWeightOffset:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&(e+=this._getRingWeight(n));return e},_getRingWeight:function(t){return Math.max(Lt(this.chart.data.datasets[t].weight,1),0)},_getVisibleDatasetWeightTotal:function(){return this._getRingWeightOffset(this.chart.data.datasets.length)}});z._set("horizontalBar",{hover:{mode:"index",axis:"y"},scales:{xAxes:[{type:"linear",position:"bottom"}],yAxes:[{type:"category",position:"left",offset:!0,gridLines:{offsetGridLines:!0}}]},elements:{rectangle:{borderSkipped:"left"}},tooltips:{mode:"index",axis:"y"}}),z._set("global",{datasets:{horizontalBar:{categoryPercentage:.8,barPercentage:.9}}});var Bt=Dt.extend({_getValueScaleId:function(){return this.getMeta().xAxisID},_getIndexScaleId:function(){return this.getMeta().yAxisID}}),Et=V.valueOrDefault,Wt=V.options.resolve,Vt=V.canvas._isPointInArea;function Ht(t,e){var n=t&&t.options.ticks||{},i=n.reverse,a=void 0===n.min?e:0,r=void 0===n.max?e:0;return{start:i?r:a,end:i?a:r}}function jt(t,e,n){var i=n/2,a=Ht(t,i),r=Ht(e,i);return{top:r.end,right:a.end,bottom:r.start,left:a.start}}function qt(t){var e,n,i,a;return V.isObject(t)?(e=t.top,n=t.right,i=t.bottom,a=t.left):e=n=i=a=t,{top:e,right:n,bottom:i,left:a}}z._set("line",{showLines:!0,spanGaps:!1,hover:{mode:"label"},scales:{xAxes:[{type:"category",id:"x-axis-0"}],yAxes:[{type:"linear",id:"y-axis-0"}]}});var Ut=nt.extend({datasetElementType:_t.Line,dataElementType:_t.Point,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth","cubicInterpolationMode","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.options,l=i._config,u=i._showLine=Et(l.showLine,s.showLines);for(i._xScale=i.getScaleForId(a.xAxisID),i._yScale=i.getScaleForId(a.yAxisID),u&&(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=i._yScale,r._datasetIndex=i.index,r._children=o,r._model=i._resolveDatasetElementOptions(r),r.pivot()),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(u&&0!==r._model.tension&&i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i,a,r=this,o=r.getMeta(),s=t.custom||{},l=r.getDataset(),u=r.index,d=l.data[e],h=r._xScale,c=r._yScale,f=o.dataset._model,g=r._resolveDataElementOptions(t,e);i=h.getPixelForValue("object"==typeof d?d:NaN,e,u),a=n?c.getBasePixel():r.calculatePointY(d,e,u),t._xScale=h,t._yScale=c,t._options=g,t._datasetIndex=u,t._index=e,t._model={x:i,y:a,skip:s.skip||isNaN(i)||isNaN(a),radius:g.radius,pointStyle:g.pointStyle,rotation:g.rotation,backgroundColor:g.backgroundColor,borderColor:g.borderColor,borderWidth:g.borderWidth,tension:Et(s.tension,f?f.tension:0),steppedLine:!!f&&f.steppedLine,hitRadius:g.hitRadius}},_resolveDatasetElementOptions:function(t){var e=this,n=e._config,i=t.custom||{},a=e.chart.options,r=a.elements.line,o=nt.prototype._resolveDatasetElementOptions.apply(e,arguments);return o.spanGaps=Et(n.spanGaps,a.spanGaps),o.tension=Et(n.lineTension,r.tension),o.steppedLine=Wt([i.steppedLine,n.steppedLine,r.stepped]),o.clip=qt(Et(n.clip,jt(e._xScale,e._yScale,o.borderWidth))),o},calculatePointY:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._yScale,c=0,f=0;if(h.options.stacked){for(s=+h.getRightValue(t),u=(l=d._getSortedVisibleDatasetMetas()).length,i=0;i<u&&(r=l[i]).index!==n;++i)a=d.data.datasets[r.index],"line"===r.type&&r.yAxisID===h.id&&((o=+h.getRightValue(a.data[e]))<0?f+=o||0:c+=o||0);return s<0?h.getPixelForValue(f+s):h.getPixelForValue(c+s)}return h.getPixelForValue(t)},updateBezierControlPoints:function(){var t,e,n,i,a=this.chart,r=this.getMeta(),o=r.dataset._model,s=a.chartArea,l=r.data||[];function u(t,e,n){return Math.max(Math.min(t,n),e)}if(o.spanGaps&&(l=l.filter((function(t){return!t._model.skip}))),"monotone"===o.cubicInterpolationMode)V.splineCurveMonotone(l);else for(t=0,e=l.length;t<e;++t)n=l[t]._model,i=V.splineCurve(V.previousItem(l,t)._model,n,V.nextItem(l,t)._model,o.tension),n.controlPointPreviousX=i.previous.x,n.controlPointPreviousY=i.previous.y,n.controlPointNextX=i.next.x,n.controlPointNextY=i.next.y;if(a.options.elements.line.capBezierPoints)for(t=0,e=l.length;t<e;++t)n=l[t]._model,Vt(n,s)&&(t>0&&Vt(l[t-1]._model,s)&&(n.controlPointPreviousX=u(n.controlPointPreviousX,s.left,s.right),n.controlPointPreviousY=u(n.controlPointPreviousY,s.top,s.bottom)),t<l.length-1&&Vt(l[t+1]._model,s)&&(n.controlPointNextX=u(n.controlPointNextX,s.left,s.right),n.controlPointNextY=u(n.controlPointNextY,s.top,s.bottom)))},draw:function(){var t,e=this.chart,n=this.getMeta(),i=n.data||[],a=e.chartArea,r=e.canvas,o=0,s=i.length;for(this._showLine&&(t=n.dataset._model.clip,V.canvas.clipArea(e.ctx,{left:!1===t.left?0:a.left-t.left,right:!1===t.right?r.width:a.right+t.right,top:!1===t.top?0:a.top-t.top,bottom:!1===t.bottom?r.height:a.bottom+t.bottom}),n.dataset.draw(),V.canvas.unclipArea(e.ctx));o<s;++o)i[o].draw(a)},setHoverStyle:function(t){var e=t._model,n=t._options,i=V.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Et(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Et(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Et(n.hoverBorderWidth,n.borderWidth),e.radius=Et(n.hoverRadius,n.radius)}}),Yt=V.options.resolve;z._set("polarArea",{scale:{type:"radialLinear",angleLines:{display:!1},gridLines:{circular:!0},pointLabels:{display:!1},ticks:{beginAtZero:!0}},animation:{animateRotate:!0,animateScale:!0},startAngle:-.5*Math.PI,legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r].hidden=!a.data[r].hidden;o.update()}},tooltips:{callbacks:{title:function(){return""},label:function(t,e){return e.labels[t.index]+": "+t.yLabel}}}});var Gt=nt.extend({dataElementType:_t.Arc,linkScales:V.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i,a=this,r=a.getDataset(),o=a.getMeta(),s=a.chart.options.startAngle||0,l=a._starts=[],u=a._angles=[],d=o.data;for(a._updateRadius(),o.count=a.countVisibleElements(),e=0,n=r.data.length;e<n;e++)l[e]=s,i=a._computeAngle(e),u[e]=i,s+=i;for(e=0,n=d.length;e<n;++e)d[e]._options=a._resolveDataElementOptions(d[e],e),a.updateElement(d[e],e,t)},_updateRadius:function(){var t=this,e=t.chart,n=e.chartArea,i=e.options,a=Math.min(n.right-n.left,n.bottom-n.top);e.outerRadius=Math.max(a/2,0),e.innerRadius=Math.max(i.cutoutPercentage?e.outerRadius/100*i.cutoutPercentage:1,0),e.radiusLength=(e.outerRadius-e.innerRadius)/e.getVisibleDatasetCount(),t.outerRadius=e.outerRadius-e.radiusLength*t.index,t.innerRadius=t.outerRadius-e.radiusLength},updateElement:function(t,e,n){var i=this,a=i.chart,r=i.getDataset(),o=a.options,s=o.animation,l=a.scale,u=a.data.labels,d=l.xCenter,h=l.yCenter,c=o.startAngle,f=t.hidden?0:l.getDistanceFromCenterForValue(r.data[e]),g=i._starts[e],p=g+(t.hidden?0:i._angles[e]),m=s.animateScale?0:l.getDistanceFromCenterForValue(r.data[e]),v=t._options||{};V.extend(t,{_datasetIndex:i.index,_index:e,_scale:l,_model:{backgroundColor:v.backgroundColor,borderColor:v.borderColor,borderWidth:v.borderWidth,borderAlign:v.borderAlign,x:d,y:h,innerRadius:0,outerRadius:n?m:f,startAngle:n&&s.animateRotate?c:g,endAngle:n&&s.animateRotate?c:p,label:V.valueAtIndexOrDefault(u,e,u[e])}}),t.pivot()},countVisibleElements:function(){var t=this.getDataset(),e=this.getMeta(),n=0;return V.each(e.data,(function(e,i){isNaN(t.data[i])||e.hidden||n++})),n},setHoverStyle:function(t){var e=t._model,n=t._options,i=V.getHoverColor,a=V.valueOrDefault;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=a(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=a(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=a(n.hoverBorderWidth,n.borderWidth)},_computeAngle:function(t){var e=this,n=this.getMeta().count,i=e.getDataset(),a=e.getMeta();if(isNaN(i.data[t])||a.data[t].hidden)return 0;var r={chart:e.chart,dataIndex:t,dataset:i,datasetIndex:e.index};return Yt([e.chart.options.elements.arc.angle,2*Math.PI/n],r,t)}});z._set("pie",V.clone(z.doughnut)),z._set("pie",{cutoutPercentage:0});var Xt=Nt,Kt=V.valueOrDefault;z._set("radar",{spanGaps:!1,scale:{type:"radialLinear"},elements:{line:{fill:"start",tension:0}}});var Zt=nt.extend({datasetElementType:_t.Line,dataElementType:_t.Point,linkScales:V.noop,_datasetElementOptions:["backgroundColor","borderWidth","borderColor","borderCapStyle","borderDash","borderDashOffset","borderJoinStyle","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.scale,l=i._config;for(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=s,r._datasetIndex=i.index,r._children=o,r._loop=!0,r._model=i._resolveDatasetElementOptions(r),r.pivot(),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i=this,a=t.custom||{},r=i.getDataset(),o=i.chart.scale,s=o.getPointPositionForValue(e,r.data[e]),l=i._resolveDataElementOptions(t,e),u=i.getMeta().dataset._model,d=n?o.xCenter:s.x,h=n?o.yCenter:s.y;t._scale=o,t._options=l,t._datasetIndex=i.index,t._index=e,t._model={x:d,y:h,skip:a.skip||isNaN(d)||isNaN(h),radius:l.radius,pointStyle:l.pointStyle,rotation:l.rotation,backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,tension:Kt(a.tension,u?u.tension:0),hitRadius:l.hitRadius}},_resolveDatasetElementOptions:function(){var t=this,e=t._config,n=t.chart.options,i=nt.prototype._resolveDatasetElementOptions.apply(t,arguments);return i.spanGaps=Kt(e.spanGaps,n.spanGaps),i.tension=Kt(e.lineTension,n.elements.line.tension),i},updateBezierControlPoints:function(){var t,e,n,i,a=this.getMeta(),r=this.chart.chartArea,o=a.data||[];function s(t,e,n){return Math.max(Math.min(t,n),e)}for(a.dataset._model.spanGaps&&(o=o.filter((function(t){return!t._model.skip}))),t=0,e=o.length;t<e;++t)n=o[t]._model,i=V.splineCurve(V.previousItem(o,t,!0)._model,n,V.nextItem(o,t,!0)._model,n.tension),n.controlPointPreviousX=s(i.previous.x,r.left,r.right),n.controlPointPreviousY=s(i.previous.y,r.top,r.bottom),n.controlPointNextX=s(i.next.x,r.left,r.right),n.controlPointNextY=s(i.next.y,r.top,r.bottom)},setHoverStyle:function(t){var e=t._model,n=t._options,i=V.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Kt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Kt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Kt(n.hoverBorderWidth,n.borderWidth),e.radius=Kt(n.hoverRadius,n.radius)}});z._set("scatter",{hover:{mode:"single"},scales:{xAxes:[{id:"x-axis-1",type:"linear",position:"bottom"}],yAxes:[{id:"y-axis-1",type:"linear",position:"left"}]},tooltips:{callbacks:{title:function(){return""},label:function(t){return"("+t.xLabel+", "+t.yLabel+")"}}}}),z._set("global",{datasets:{scatter:{showLine:!1}}});var $t={bar:Dt,bubble:Ft,doughnut:Nt,horizontalBar:Bt,line:Ut,polarArea:Gt,pie:Xt,radar:Zt,scatter:Ut};function Jt(t,e){return t.native?{x:t.x,y:t.y}:V.getRelativePosition(t,e)}function Qt(t,e){var n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas();for(i=0,r=l.length;i<r;++i)for(a=0,o=(n=l[i].data).length;a<o;++a)(s=n[a])._view.skip||e(s)}function te(t,e){var n=[];return Qt(t,(function(t){t.inRange(e.x,e.y)&&n.push(t)})),n}function ee(t,e,n,i){var a=Number.POSITIVE_INFINITY,r=[];return Qt(t,(function(t){if(!n||t.inRange(e.x,e.y)){var o=t.getCenterPoint(),s=i(e,o);s<a?(r=[t],a=s):s===a&&r.push(t)}})),r}function ne(t){var e=-1!==t.indexOf("x"),n=-1!==t.indexOf("y");return function(t,i){var a=e?Math.abs(t.x-i.x):0,r=n?Math.abs(t.y-i.y):0;return Math.sqrt(Math.pow(a,2)+Math.pow(r,2))}}function ie(t,e,n){var i=Jt(e,t);n.axis=n.axis||"x";var a=ne(n.axis),r=n.intersect?te(t,i):ee(t,i,!1,a),o=[];return r.length?(t._getSortedVisibleDatasetMetas().forEach((function(t){var e=t.data[r[0]._index];e&&!e._view.skip&&o.push(e)})),o):[]}var ae={modes:{single:function(t,e){var n=Jt(e,t),i=[];return Qt(t,(function(t){if(t.inRange(n.x,n.y))return i.push(t),i})),i.slice(0,1)},label:ie,index:ie,dataset:function(t,e,n){var i=Jt(e,t);n.axis=n.axis||"xy";var a=ne(n.axis),r=n.intersect?te(t,i):ee(t,i,!1,a);return r.length>0&&(r=t.getDatasetMeta(r[0]._datasetIndex).data),r},"x-axis":function(t,e){return ie(t,e,{intersect:!1})},point:function(t,e){return te(t,Jt(e,t))},nearest:function(t,e,n){var i=Jt(e,t);n.axis=n.axis||"xy";var a=ne(n.axis);return ee(t,i,n.intersect,a)},x:function(t,e,n){var i=Jt(e,t),a=[],r=!1;return Qt(t,(function(t){t.inXRange(i.x)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a},y:function(t,e,n){var i=Jt(e,t),a=[],r=!1;return Qt(t,(function(t){t.inYRange(i.y)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a}}},re=V.extend;function oe(t,e){return V.where(t,(function(t){return t.pos===e}))}function se(t,e){return t.sort((function(t,n){var i=e?n:t,a=e?t:n;return i.weight===a.weight?i.index-a.index:i.weight-a.weight}))}function le(t,e,n,i){return Math.max(t[n],e[n])+Math.max(t[i],e[i])}function ue(t,e,n){var i,a,r=n.box,o=t.maxPadding;if(n.size&&(t[n.pos]-=n.size),n.size=n.horizontal?r.height:r.width,t[n.pos]+=n.size,r.getPadding){var s=r.getPadding();o.top=Math.max(o.top,s.top),o.left=Math.max(o.left,s.left),o.bottom=Math.max(o.bottom,s.bottom),o.right=Math.max(o.right,s.right)}if(i=e.outerWidth-le(o,t,"left","right"),a=e.outerHeight-le(o,t,"top","bottom"),i!==t.w||a!==t.h)return t.w=i,t.h=a,n.horizontal?i!==t.w:a!==t.h}function de(t,e){var n=e.maxPadding;function i(t){var i={left:0,top:0,right:0,bottom:0};return t.forEach((function(t){i[t]=Math.max(e[t],n[t])})),i}return i(t?["left","right"]:["top","bottom"])}function he(t,e,n){var i,a,r,o,s,l,u=[];for(i=0,a=t.length;i<a;++i)(o=(r=t[i]).box).update(r.width||e.w,r.height||e.h,de(r.horizontal,e)),ue(e,n,r)&&(l=!0,u.length&&(s=!0)),o.fullWidth||u.push(r);return s&&he(u,e,n)||l}function ce(t,e,n){var i,a,r,o,s=n.padding,l=e.x,u=e.y;for(i=0,a=t.length;i<a;++i)o=(r=t[i]).box,r.horizontal?(o.left=o.fullWidth?s.left:e.left,o.right=o.fullWidth?n.outerWidth-s.right:e.left+e.w,o.top=u,o.bottom=u+o.height,o.width=o.right-o.left,u=o.bottom):(o.left=l,o.right=l+o.width,o.top=e.top,o.bottom=e.top+e.h,o.height=o.bottom-o.top,l=o.right);e.x=l,e.y=u}z._set("global",{layout:{padding:{top:0,right:0,bottom:0,left:0}}});var fe,ge={defaults:{},addBox:function(t,e){t.boxes||(t.boxes=[]),e.fullWidth=e.fullWidth||!1,e.position=e.position||"top",e.weight=e.weight||0,e._layers=e._layers||function(){return[{z:0,draw:function(){e.draw.apply(e,arguments)}}]},t.boxes.push(e)},removeBox:function(t,e){var n=t.boxes?t.boxes.indexOf(e):-1;-1!==n&&t.boxes.splice(n,1)},configure:function(t,e,n){for(var i,a=["fullWidth","position","weight"],r=a.length,o=0;o<r;++o)i=a[o],n.hasOwnProperty(i)&&(e[i]=n[i])},update:function(t,e,n){if(t){var i=t.options.layout||{},a=V.options.toPadding(i.padding),r=e-a.width,o=n-a.height,s=function(t){var e=function(t){var e,n,i,a=[];for(e=0,n=(t||[]).length;e<n;++e)i=t[e],a.push({index:e,box:i,pos:i.position,horizontal:i.isHorizontal(),weight:i.weight});return a}(t),n=se(oe(e,"left"),!0),i=se(oe(e,"right")),a=se(oe(e,"top"),!0),r=se(oe(e,"bottom"));return{leftAndTop:n.concat(a),rightAndBottom:i.concat(r),chartArea:oe(e,"chartArea"),vertical:n.concat(i),horizontal:a.concat(r)}}(t.boxes),l=s.vertical,u=s.horizontal,d=Object.freeze({outerWidth:e,outerHeight:n,padding:a,availableWidth:r,vBoxMaxWidth:r/2/l.length,hBoxMaxHeight:o/2}),h=re({maxPadding:re({},a),w:r,h:o,x:a.left,y:a.top},a);!function(t,e){var n,i,a;for(n=0,i=t.length;n<i;++n)(a=t[n]).width=a.horizontal?a.box.fullWidth&&e.availableWidth:e.vBoxMaxWidth,a.height=a.horizontal&&e.hBoxMaxHeight}(l.concat(u),d),he(l,h,d),he(u,h,d)&&he(l,h,d),function(t){var e=t.maxPadding;function n(n){var i=Math.max(e[n]-t[n],0);return t[n]+=i,i}t.y+=n("top"),t.x+=n("left"),n("right"),n("bottom")}(h),ce(s.leftAndTop,h,d),h.x+=h.w,h.y+=h.h,ce(s.rightAndBottom,h,d),t.chartArea={left:h.left,top:h.top,right:h.left+h.w,bottom:h.top+h.h},V.each(s.chartArea,(function(e){var n=e.box;re(n,t.chartArea),n.update(h.w,h.h)}))}}},pe=(fe=Object.freeze({__proto__:null,default:"@keyframes chartjs-render-animation{from{opacity:.99}to{opacity:1}}.chartjs-render-monitor{animation:chartjs-render-animation 1ms}.chartjs-size-monitor,.chartjs-size-monitor-expand,.chartjs-size-monitor-shrink{position:absolute;direction:ltr;left:0;top:0;right:0;bottom:0;overflow:hidden;pointer-events:none;visibility:hidden;z-index:-1}.chartjs-size-monitor-expand>div{position:absolute;width:1000000px;height:1000000px;left:0;top:0}.chartjs-size-monitor-shrink>div{position:absolute;width:200%;height:200%;left:0;top:0}"}))&&fe.default||fe,me="$chartjs",ve="chartjs-size-monitor",be="chartjs-render-monitor",xe="chartjs-render-animation",ye=["animationstart","webkitAnimationStart"],_e={touchstart:"mousedown",touchmove:"mousemove",touchend:"mouseup",pointerenter:"mouseenter",pointerdown:"mousedown",pointermove:"mousemove",pointerup:"mouseup",pointerleave:"mouseout",pointerout:"mouseout"};function ke(t,e){var n=V.getStyle(t,e),i=n&&n.match(/^(\d+)(\.\d+)?px$/);return i?Number(i[1]):void 0}var we=!!function(){var t=!1;try{var e=Object.defineProperty({},"passive",{get:function(){t=!0}});window.addEventListener("e",null,e)}catch(t){}return t}()&&{passive:!0};function Me(t,e,n){t.addEventListener(e,n,we)}function Se(t,e,n){t.removeEventListener(e,n,we)}function Ce(t,e,n,i,a){return{type:t,chart:e,native:a||null,x:void 0!==n?n:null,y:void 0!==i?i:null}}function Pe(t){var e=document.createElement("div");return e.className=t||"",e}function Ae(t,e,n){var i,a,r,o,s=t[me]||(t[me]={}),l=s.resizer=function(t){var e=Pe(ve),n=Pe(ve+"-expand"),i=Pe(ve+"-shrink");n.appendChild(Pe()),i.appendChild(Pe()),e.appendChild(n),e.appendChild(i),e._reset=function(){n.scrollLeft=1e6,n.scrollTop=1e6,i.scrollLeft=1e6,i.scrollTop=1e6};var a=function(){e._reset(),t()};return Me(n,"scroll",a.bind(n,"expand")),Me(i,"scroll",a.bind(i,"shrink")),e}((i=function(){if(s.resizer){var i=n.options.maintainAspectRatio&&t.parentNode,a=i?i.clientWidth:0;e(Ce("resize",n)),i&&i.clientWidth<a&&n.canvas&&e(Ce("resize",n))}},r=!1,o=[],function(){o=Array.prototype.slice.call(arguments),a=a||this,r||(r=!0,V.requestAnimFrame.call(window,(function(){r=!1,i.apply(a,o)})))}));!function(t,e){var n=t[me]||(t[me]={}),i=n.renderProxy=function(t){t.animationName===xe&&e()};V.each(ye,(function(e){Me(t,e,i)})),n.reflow=!!t.offsetParent,t.classList.add(be)}(t,(function(){if(s.resizer){var e=t.parentNode;e&&e!==l.parentNode&&e.insertBefore(l,e.firstChild),l._reset()}}))}function De(t){var e=t[me]||{},n=e.resizer;delete e.resizer,function(t){var e=t[me]||{},n=e.renderProxy;n&&(V.each(ye,(function(e){Se(t,e,n)})),delete e.renderProxy),t.classList.remove(be)}(t),n&&n.parentNode&&n.parentNode.removeChild(n)}var Te={disableCSSInjection:!1,_enabled:"undefined"!=typeof window&&"undefined"!=typeof document,_ensureLoaded:function(t){if(!this.disableCSSInjection){var e=t.getRootNode?t.getRootNode():document;!function(t,e){var n=t[me]||(t[me]={});if(!n.containsStyles){n.containsStyles=!0,e="/* Chart.js */\n"+e;var i=document.createElement("style");i.setAttribute("type","text/css"),i.appendChild(document.createTextNode(e)),t.appendChild(i)}}(e.host?e:document.head,pe)}},acquireContext:function(t,e){"string"==typeof t?t=document.getElementById(t):t.length&&(t=t[0]),t&&t.canvas&&(t=t.canvas);var n=t&&t.getContext&&t.getContext("2d");return n&&n.canvas===t?(this._ensureLoaded(t),function(t,e){var n=t.style,i=t.getAttribute("height"),a=t.getAttribute("width");if(t[me]={initial:{height:i,width:a,style:{display:n.display,height:n.height,width:n.width}}},n.display=n.display||"block",null===a||""===a){var r=ke(t,"width");void 0!==r&&(t.width=r)}if(null===i||""===i)if(""===t.style.height)t.height=t.width/(e.options.aspectRatio||2);else{var o=ke(t,"height");void 0!==r&&(t.height=o)}}(t,e),n):null},releaseContext:function(t){var e=t.canvas;if(e[me]){var n=e[me].initial;["height","width"].forEach((function(t){var i=n[t];V.isNullOrUndef(i)?e.removeAttribute(t):e.setAttribute(t,i)})),V.each(n.style||{},(function(t,n){e.style[n]=t})),e.width=e.width,delete e[me]}},addEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=n[me]||(n[me]={});Me(i,e,(a.proxies||(a.proxies={}))[t.id+"_"+e]=function(e){n(function(t,e){var n=_e[t.type]||t.type,i=V.getRelativePosition(t,e);return Ce(n,e,i.x,i.y,t)}(e,t))})}else Ae(i,n,t)},removeEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=((n[me]||{}).proxies||{})[t.id+"_"+e];a&&Se(i,e,a)}else De(i)}};V.addEvent=Me,V.removeEvent=Se;var Ie=Te._enabled?Te:{acquireContext:function(t){return t&&t.canvas&&(t=t.canvas),t&&t.getContext("2d")||null}},Fe=V.extend({initialize:function(){},acquireContext:function(){},releaseContext:function(){},addEventListener:function(){},removeEventListener:function(){}},Ie);z._set("global",{plugins:{}});var Le={_plugins:[],_cacheId:0,register:function(t){var e=this._plugins;[].concat(t).forEach((function(t){-1===e.indexOf(t)&&e.push(t)})),this._cacheId++},unregister:function(t){var e=this._plugins;[].concat(t).forEach((function(t){var n=e.indexOf(t);-1!==n&&e.splice(n,1)})),this._cacheId++},clear:function(){this._plugins=[],this._cacheId++},count:function(){return this._plugins.length},getAll:function(){return this._plugins},notify:function(t,e,n){var i,a,r,o,s,l=this.descriptors(t),u=l.length;for(i=0;i<u;++i)if("function"==typeof(s=(r=(a=l[i]).plugin)[e])&&((o=[t].concat(n||[])).push(a.options),!1===s.apply(r,o)))return!1;return!0},descriptors:function(t){var e=t.$plugins||(t.$plugins={});if(e.id===this._cacheId)return e.descriptors;var n=[],i=[],a=t&&t.config||{},r=a.options&&a.options.plugins||{};return this._plugins.concat(a.plugins||[]).forEach((function(t){if(-1===n.indexOf(t)){var e=t.id,a=r[e];!1!==a&&(!0===a&&(a=V.clone(z.global.plugins[e])),n.push(t),i.push({plugin:t,options:a||{}}))}})),e.descriptors=i,e.id=this._cacheId,i},_invalidate:function(t){delete t.$plugins}},Oe={constructors:{},defaults:{},registerScaleType:function(t,e,n){this.constructors[t]=e,this.defaults[t]=V.clone(n)},getScaleConstructor:function(t){return this.constructors.hasOwnProperty(t)?this.constructors[t]:void 0},getScaleDefaults:function(t){return this.defaults.hasOwnProperty(t)?V.merge({},[z.scale,this.defaults[t]]):{}},updateScaleDefaults:function(t,e){this.defaults.hasOwnProperty(t)&&(this.defaults[t]=V.extend(this.defaults[t],e))},addScalesToLayout:function(t){V.each(t.scales,(function(e){e.fullWidth=e.options.fullWidth,e.position=e.options.position,e.weight=e.options.weight,ge.addBox(t,e)}))}},Re=V.valueOrDefault,ze=V.rtl.getRtlAdapter;z._set("global",{tooltips:{enabled:!0,custom:null,mode:"nearest",position:"average",intersect:!0,backgroundColor:"rgba(0,0,0,0.8)",titleFontStyle:"bold",titleSpacing:2,titleMarginBottom:6,titleFontColor:"#fff",titleAlign:"left",bodySpacing:2,bodyFontColor:"#fff",bodyAlign:"left",footerFontStyle:"bold",footerSpacing:2,footerMarginTop:6,footerFontColor:"#fff",footerAlign:"left",yPadding:6,xPadding:6,caretPadding:2,caretSize:5,cornerRadius:6,multiKeyBackground:"#fff",displayColors:!0,borderColor:"rgba(0,0,0,0)",borderWidth:0,callbacks:{beforeTitle:V.noop,title:function(t,e){var n="",i=e.labels,a=i?i.length:0;if(t.length>0){var r=t[0];r.label?n=r.label:r.xLabel?n=r.xLabel:a>0&&r.index<a&&(n=i[r.index])}return n},afterTitle:V.noop,beforeBody:V.noop,beforeLabel:V.noop,label:function(t,e){var n=e.datasets[t.datasetIndex].label||"";return n&&(n+=": "),V.isNullOrUndef(t.value)?n+=t.yLabel:n+=t.value,n},labelColor:function(t,e){var n=e.getDatasetMeta(t.datasetIndex).data[t.index]._view;return{borderColor:n.borderColor,backgroundColor:n.backgroundColor}},labelTextColor:function(){return this._options.bodyFontColor},afterLabel:V.noop,afterBody:V.noop,beforeFooter:V.noop,footer:V.noop,afterFooter:V.noop}}});var Ne={average:function(t){if(!t.length)return!1;var e,n,i=0,a=0,r=0;for(e=0,n=t.length;e<n;++e){var o=t[e];if(o&&o.hasValue()){var s=o.tooltipPosition();i+=s.x,a+=s.y,++r}}return{x:i/r,y:a/r}},nearest:function(t,e){var n,i,a,r=e.x,o=e.y,s=Number.POSITIVE_INFINITY;for(n=0,i=t.length;n<i;++n){var l=t[n];if(l&&l.hasValue()){var u=l.getCenterPoint(),d=V.distanceBetweenPoints(e,u);d<s&&(s=d,a=l)}}if(a){var h=a.tooltipPosition();r=h.x,o=h.y}return{x:r,y:o}}};function Be(t,e){return e&&(V.isArray(e)?Array.prototype.push.apply(t,e):t.push(e)),t}function Ee(t){return("string"==typeof t||t instanceof String)&&t.indexOf("\n")>-1?t.split("\n"):t}function We(t){var e=z.global;return{xPadding:t.xPadding,yPadding:t.yPadding,xAlign:t.xAlign,yAlign:t.yAlign,rtl:t.rtl,textDirection:t.textDirection,bodyFontColor:t.bodyFontColor,_bodyFontFamily:Re(t.bodyFontFamily,e.defaultFontFamily),_bodyFontStyle:Re(t.bodyFontStyle,e.defaultFontStyle),_bodyAlign:t.bodyAlign,bodyFontSize:Re(t.bodyFontSize,e.defaultFontSize),bodySpacing:t.bodySpacing,titleFontColor:t.titleFontColor,_titleFontFamily:Re(t.titleFontFamily,e.defaultFontFamily),_titleFontStyle:Re(t.titleFontStyle,e.defaultFontStyle),titleFontSize:Re(t.titleFontSize,e.defaultFontSize),_titleAlign:t.titleAlign,titleSpacing:t.titleSpacing,titleMarginBottom:t.titleMarginBottom,footerFontColor:t.footerFontColor,_footerFontFamily:Re(t.footerFontFamily,e.defaultFontFamily),_footerFontStyle:Re(t.footerFontStyle,e.defaultFontStyle),footerFontSize:Re(t.footerFontSize,e.defaultFontSize),_footerAlign:t.footerAlign,footerSpacing:t.footerSpacing,footerMarginTop:t.footerMarginTop,caretSize:t.caretSize,cornerRadius:t.cornerRadius,backgroundColor:t.backgroundColor,opacity:0,legendColorBackground:t.multiKeyBackground,displayColors:t.displayColors,borderColor:t.borderColor,borderWidth:t.borderWidth}}function Ve(t,e){return"center"===e?t.x+t.width/2:"right"===e?t.x+t.width-t.xPadding:t.x+t.xPadding}function He(t){return Be([],Ee(t))}var je=X.extend({initialize:function(){this._model=We(this._options),this._lastActive=[]},getTitle:function(){var t=this,e=t._options,n=e.callbacks,i=n.beforeTitle.apply(t,arguments),a=n.title.apply(t,arguments),r=n.afterTitle.apply(t,arguments),o=[];return o=Be(o,Ee(i)),o=Be(o,Ee(a)),o=Be(o,Ee(r))},getBeforeBody:function(){return He(this._options.callbacks.beforeBody.apply(this,arguments))},getBody:function(t,e){var n=this,i=n._options.callbacks,a=[];return V.each(t,(function(t){var r={before:[],lines:[],after:[]};Be(r.before,Ee(i.beforeLabel.call(n,t,e))),Be(r.lines,i.label.call(n,t,e)),Be(r.after,Ee(i.afterLabel.call(n,t,e))),a.push(r)})),a},getAfterBody:function(){return He(this._options.callbacks.afterBody.apply(this,arguments))},getFooter:function(){var t=this,e=t._options.callbacks,n=e.beforeFooter.apply(t,arguments),i=e.footer.apply(t,arguments),a=e.afterFooter.apply(t,arguments),r=[];return r=Be(r,Ee(n)),r=Be(r,Ee(i)),r=Be(r,Ee(a))},update:function(t){var e,n,i,a,r,o,s,l,u,d,h=this,c=h._options,f=h._model,g=h._model=We(c),p=h._active,m=h._data,v={xAlign:f.xAlign,yAlign:f.yAlign},b={x:f.x,y:f.y},x={width:f.width,height:f.height},y={x:f.caretX,y:f.caretY};if(p.length){g.opacity=1;var _=[],k=[];y=Ne[c.position].call(h,p,h._eventPosition);var w=[];for(e=0,n=p.length;e<n;++e)w.push((i=p[e],a=void 0,r=void 0,o=void 0,s=void 0,l=void 0,u=void 0,d=void 0,a=i._xScale,r=i._yScale||i._scale,o=i._index,s=i._datasetIndex,l=i._chart.getDatasetMeta(s).controller,u=l._getIndexScale(),d=l._getValueScale(),{xLabel:a?a.getLabelForIndex(o,s):"",yLabel:r?r.getLabelForIndex(o,s):"",label:u?""+u.getLabelForIndex(o,s):"",value:d?""+d.getLabelForIndex(o,s):"",index:o,datasetIndex:s,x:i._model.x,y:i._model.y}));c.filter&&(w=w.filter((function(t){return c.filter(t,m)}))),c.itemSort&&(w=w.sort((function(t,e){return c.itemSort(t,e,m)}))),V.each(w,(function(t){_.push(c.callbacks.labelColor.call(h,t,h._chart)),k.push(c.callbacks.labelTextColor.call(h,t,h._chart))})),g.title=h.getTitle(w,m),g.beforeBody=h.getBeforeBody(w,m),g.body=h.getBody(w,m),g.afterBody=h.getAfterBody(w,m),g.footer=h.getFooter(w,m),g.x=y.x,g.y=y.y,g.caretPadding=c.caretPadding,g.labelColors=_,g.labelTextColors=k,g.dataPoints=w,x=function(t,e){var n=t._chart.ctx,i=2*e.yPadding,a=0,r=e.body,o=r.reduce((function(t,e){return t+e.before.length+e.lines.length+e.after.length}),0);o+=e.beforeBody.length+e.afterBody.length;var s=e.title.length,l=e.footer.length,u=e.titleFontSize,d=e.bodyFontSize,h=e.footerFontSize;i+=s*u,i+=s?(s-1)*e.titleSpacing:0,i+=s?e.titleMarginBottom:0,i+=o*d,i+=o?(o-1)*e.bodySpacing:0,i+=l?e.footerMarginTop:0,i+=l*h,i+=l?(l-1)*e.footerSpacing:0;var c=0,f=function(t){a=Math.max(a,n.measureText(t).width+c)};return n.font=V.fontString(u,e._titleFontStyle,e._titleFontFamily),V.each(e.title,f),n.font=V.fontString(d,e._bodyFontStyle,e._bodyFontFamily),V.each(e.beforeBody.concat(e.afterBody),f),c=e.displayColors?d+2:0,V.each(r,(function(t){V.each(t.before,f),V.each(t.lines,f),V.each(t.after,f)})),c=0,n.font=V.fontString(h,e._footerFontStyle,e._footerFontFamily),V.each(e.footer,f),{width:a+=2*e.xPadding,height:i}}(this,g),b=function(t,e,n,i){var a=t.x,r=t.y,o=t.caretSize,s=t.caretPadding,l=t.cornerRadius,u=n.xAlign,d=n.yAlign,h=o+s,c=l+s;return"right"===u?a-=e.width:"center"===u&&((a-=e.width/2)+e.width>i.width&&(a=i.width-e.width),a<0&&(a=0)),"top"===d?r+=h:r-="bottom"===d?e.height+h:e.height/2,"center"===d?"left"===u?a+=h:"right"===u&&(a-=h):"left"===u?a-=c:"right"===u&&(a+=c),{x:a,y:r}}(g,x,v=function(t,e){var n,i,a,r,o,s=t._model,l=t._chart,u=t._chart.chartArea,d="center",h="center";s.y<e.height?h="top":s.y>l.height-e.height&&(h="bottom");var c=(u.left+u.right)/2,f=(u.top+u.bottom)/2;"center"===h?(n=function(t){return t<=c},i=function(t){return t>c}):(n=function(t){return t<=e.width/2},i=function(t){return t>=l.width-e.width/2}),a=function(t){return t+e.width+s.caretSize+s.caretPadding>l.width},r=function(t){return t-e.width-s.caretSize-s.caretPadding<0},o=function(t){return t<=f?"top":"bottom"},n(s.x)?(d="left",a(s.x)&&(d="center",h=o(s.y))):i(s.x)&&(d="right",r(s.x)&&(d="center",h=o(s.y)));var g=t._options;return{xAlign:g.xAlign?g.xAlign:d,yAlign:g.yAlign?g.yAlign:h}}(this,x),h._chart)}else g.opacity=0;return g.xAlign=v.xAlign,g.yAlign=v.yAlign,g.x=b.x,g.y=b.y,g.width=x.width,g.height=x.height,g.caretX=y.x,g.caretY=y.y,h._model=g,t&&c.custom&&c.custom.call(h,g),h},drawCaret:function(t,e){var n=this._chart.ctx,i=this._view,a=this.getCaretPosition(t,e,i);n.lineTo(a.x1,a.y1),n.lineTo(a.x2,a.y2),n.lineTo(a.x3,a.y3)},getCaretPosition:function(t,e,n){var i,a,r,o,s,l,u=n.caretSize,d=n.cornerRadius,h=n.xAlign,c=n.yAlign,f=t.x,g=t.y,p=e.width,m=e.height;if("center"===c)s=g+m/2,"left"===h?(a=(i=f)-u,r=i,o=s+u,l=s-u):(a=(i=f+p)+u,r=i,o=s-u,l=s+u);else if("left"===h?(i=(a=f+d+u)-u,r=a+u):"right"===h?(i=(a=f+p-d-u)-u,r=a+u):(i=(a=n.caretX)-u,r=a+u),"top"===c)s=(o=g)-u,l=o;else{s=(o=g+m)+u,l=o;var v=r;r=i,i=v}return{x1:i,x2:a,x3:r,y1:o,y2:s,y3:l}},drawTitle:function(t,e,n){var i,a,r,o=e.title,s=o.length;if(s){var l=ze(e.rtl,e.x,e.width);for(t.x=Ve(e,e._titleAlign),n.textAlign=l.textAlign(e._titleAlign),n.textBaseline="middle",i=e.titleFontSize,a=e.titleSpacing,n.fillStyle=e.titleFontColor,n.font=V.fontString(i,e._titleFontStyle,e._titleFontFamily),r=0;r<s;++r)n.fillText(o[r],l.x(t.x),t.y+i/2),t.y+=i+a,r+1===s&&(t.y+=e.titleMarginBottom-a)}},drawBody:function(t,e,n){var i,a,r,o,s,l,u,d,h=e.bodyFontSize,c=e.bodySpacing,f=e._bodyAlign,g=e.body,p=e.displayColors,m=0,v=p?Ve(e,"left"):0,b=ze(e.rtl,e.x,e.width),x=function(e){n.fillText(e,b.x(t.x+m),t.y+h/2),t.y+=h+c},y=b.textAlign(f);for(n.textAlign=f,n.textBaseline="middle",n.font=V.fontString(h,e._bodyFontStyle,e._bodyFontFamily),t.x=Ve(e,y),n.fillStyle=e.bodyFontColor,V.each(e.beforeBody,x),m=p&&"right"!==y?"center"===f?h/2+1:h+2:0,s=0,u=g.length;s<u;++s){for(i=g[s],a=e.labelTextColors[s],r=e.labelColors[s],n.fillStyle=a,V.each(i.before,x),l=0,d=(o=i.lines).length;l<d;++l){if(p){var _=b.x(v);n.fillStyle=e.legendColorBackground,n.fillRect(b.leftForLtr(_,h),t.y,h,h),n.lineWidth=1,n.strokeStyle=r.borderColor,n.strokeRect(b.leftForLtr(_,h),t.y,h,h),n.fillStyle=r.backgroundColor,n.fillRect(b.leftForLtr(b.xPlus(_,1),h-2),t.y+1,h-2,h-2),n.fillStyle=a}x(o[l])}V.each(i.after,x)}m=0,V.each(e.afterBody,x),t.y-=c},drawFooter:function(t,e,n){var i,a,r=e.footer,o=r.length;if(o){var s=ze(e.rtl,e.x,e.width);for(t.x=Ve(e,e._footerAlign),t.y+=e.footerMarginTop,n.textAlign=s.textAlign(e._footerAlign),n.textBaseline="middle",i=e.footerFontSize,n.fillStyle=e.footerFontColor,n.font=V.fontString(i,e._footerFontStyle,e._footerFontFamily),a=0;a<o;++a)n.fillText(r[a],s.x(t.x),t.y+i/2),t.y+=i+e.footerSpacing}},drawBackground:function(t,e,n,i){n.fillStyle=e.backgroundColor,n.strokeStyle=e.borderColor,n.lineWidth=e.borderWidth;var a=e.xAlign,r=e.yAlign,o=t.x,s=t.y,l=i.width,u=i.height,d=e.cornerRadius;n.beginPath(),n.moveTo(o+d,s),"top"===r&&this.drawCaret(t,i),n.lineTo(o+l-d,s),n.quadraticCurveTo(o+l,s,o+l,s+d),"center"===r&&"right"===a&&this.drawCaret(t,i),n.lineTo(o+l,s+u-d),n.quadraticCurveTo(o+l,s+u,o+l-d,s+u),"bottom"===r&&this.drawCaret(t,i),n.lineTo(o+d,s+u),n.quadraticCurveTo(o,s+u,o,s+u-d),"center"===r&&"left"===a&&this.drawCaret(t,i),n.lineTo(o,s+d),n.quadraticCurveTo(o,s,o+d,s),n.closePath(),n.fill(),e.borderWidth>0&&n.stroke()},draw:function(){var t=this._chart.ctx,e=this._view;if(0!==e.opacity){var n={width:e.width,height:e.height},i={x:e.x,y:e.y},a=Math.abs(e.opacity<.001)?0:e.opacity,r=e.title.length||e.beforeBody.length||e.body.length||e.afterBody.length||e.footer.length;this._options.enabled&&r&&(t.save(),t.globalAlpha=a,this.drawBackground(i,e,t,n),i.y+=e.yPadding,V.rtl.overrideTextDirection(t,e.textDirection),this.drawTitle(i,e,t),this.drawBody(i,e,t),this.drawFooter(i,e,t),V.rtl.restoreTextDirection(t,e.textDirection),t.restore())}},handleEvent:function(t){var e,n=this,i=n._options;return n._lastActive=n._lastActive||[],"mouseout"===t.type?n._active=[]:(n._active=n._chart.getElementsAtEventForMode(t,i.mode,i),i.reverse&&n._active.reverse()),(e=!V.arrayEquals(n._active,n._lastActive))&&(n._lastActive=n._active,(i.enabled||i.custom)&&(n._eventPosition={x:t.x,y:t.y},n.update(!0),n.pivot())),e}}),qe=Ne,Ue=je;Ue.positioners=qe;var Ye=V.valueOrDefault;function Ge(){return V.merge({},[].slice.call(arguments),{merger:function(t,e,n,i){if("xAxes"===t||"yAxes"===t){var a,r,o,s=n[t].length;for(e[t]||(e[t]=[]),a=0;a<s;++a)o=n[t][a],r=Ye(o.type,"xAxes"===t?"category":"linear"),a>=e[t].length&&e[t].push({}),!e[t][a].type||o.type&&o.type!==e[t][a].type?V.merge(e[t][a],[Oe.getScaleDefaults(r),o]):V.merge(e[t][a],o)}else V._merger(t,e,n,i)}})}function Xe(){return V.merge({},[].slice.call(arguments),{merger:function(t,e,n,i){var a=e[t]||{},r=n[t];"scales"===t?e[t]=Ge(a,r):"scale"===t?e[t]=V.merge(a,[Oe.getScaleDefaults(r.type),r]):V._merger(t,e,n,i)}})}function Ke(t){var e=t.options;V.each(t.scales,(function(e){ge.removeBox(t,e)})),e=Xe(z.global,z[t.config.type],e),t.options=t.config.options=e,t.ensureScalesHaveIDs(),t.buildOrUpdateScales(),t.tooltip._options=e.tooltips,t.tooltip.initialize()}function Ze(t,e,n){var i,a=function(t){return t.id===i};do{i=e+n++}while(V.findIndex(t,a)>=0);return i}function $e(t){return"top"===t||"bottom"===t}function Je(t,e){return function(n,i){return n[t]===i[t]?n[e]-i[e]:n[t]-i[t]}}z._set("global",{elements:{},events:["mousemove","mouseout","click","touchstart","touchmove"],hover:{onHover:null,mode:"nearest",intersect:!0,animationDuration:400},onClick:null,maintainAspectRatio:!0,responsive:!0,responsiveAnimationDuration:0});var Qe=function(t,e){return this.construct(t,e),this};V.extend(Qe.prototype,{construct:function(t,e){var n=this;e=function(t){var e=(t=t||{}).data=t.data||{};return e.datasets=e.datasets||[],e.labels=e.labels||[],t.options=Xe(z.global,z[t.type],t.options||{}),t}(e);var i=Fe.acquireContext(t,e),a=i&&i.canvas,r=a&&a.height,o=a&&a.width;n.id=V.uid(),n.ctx=i,n.canvas=a,n.config=e,n.width=o,n.height=r,n.aspectRatio=r?o/r:null,n.options=e.options,n._bufferedRender=!1,n._layers=[],n.chart=n,n.controller=n,Qe.instances[n.id]=n,Object.defineProperty(n,"data",{get:function(){return n.config.data},set:function(t){n.config.data=t}}),i&&a?(n.initialize(),n.update()):console.error("Failed to create chart: can't acquire context from the given item")},initialize:function(){var t=this;return Le.notify(t,"beforeInit"),V.retinaScale(t,t.options.devicePixelRatio),t.bindEvents(),t.options.responsive&&t.resize(!0),t.initToolTip(),Le.notify(t,"afterInit"),t},clear:function(){return V.canvas.clear(this),this},stop:function(){return $.cancelAnimation(this),this},resize:function(t){var e=this,n=e.options,i=e.canvas,a=n.maintainAspectRatio&&e.aspectRatio||null,r=Math.max(0,Math.floor(V.getMaximumWidth(i))),o=Math.max(0,Math.floor(a?r/a:V.getMaximumHeight(i)));if((e.width!==r||e.height!==o)&&(i.width=e.width=r,i.height=e.height=o,i.style.width=r+"px",i.style.height=o+"px",V.retinaScale(e,n.devicePixelRatio),!t)){var s={width:r,height:o};Le.notify(e,"resize",[s]),n.onResize&&n.onResize(e,s),e.stop(),e.update({duration:n.responsiveAnimationDuration})}},ensureScalesHaveIDs:function(){var t=this.options,e=t.scales||{},n=t.scale;V.each(e.xAxes,(function(t,n){t.id||(t.id=Ze(e.xAxes,"x-axis-",n))})),V.each(e.yAxes,(function(t,n){t.id||(t.id=Ze(e.yAxes,"y-axis-",n))})),n&&(n.id=n.id||"scale")},buildOrUpdateScales:function(){var t=this,e=t.options,n=t.scales||{},i=[],a=Object.keys(n).reduce((function(t,e){return t[e]=!1,t}),{});e.scales&&(i=i.concat((e.scales.xAxes||[]).map((function(t){return{options:t,dtype:"category",dposition:"bottom"}})),(e.scales.yAxes||[]).map((function(t){return{options:t,dtype:"linear",dposition:"left"}})))),e.scale&&i.push({options:e.scale,dtype:"radialLinear",isDefault:!0,dposition:"chartArea"}),V.each(i,(function(e){var i=e.options,r=i.id,o=Ye(i.type,e.dtype);$e(i.position)!==$e(e.dposition)&&(i.position=e.dposition),a[r]=!0;var s=null;if(r in n&&n[r].type===o)(s=n[r]).options=i,s.ctx=t.ctx,s.chart=t;else{var l=Oe.getScaleConstructor(o);if(!l)return;s=new l({id:r,type:o,options:i,ctx:t.ctx,chart:t}),n[s.id]=s}s.mergeTicksOptions(),e.isDefault&&(t.scale=s)})),V.each(a,(function(t,e){t||delete n[e]})),t.scales=n,Oe.addScalesToLayout(this)},buildOrUpdateControllers:function(){var t,e,n=this,i=[],a=n.data.datasets;for(t=0,e=a.length;t<e;t++){var r=a[t],o=n.getDatasetMeta(t),s=r.type||n.config.type;if(o.type&&o.type!==s&&(n.destroyDatasetMeta(t),o=n.getDatasetMeta(t)),o.type=s,o.order=r.order||0,o.index=t,o.controller)o.controller.updateIndex(t),o.controller.linkScales();else{var l=$t[o.type];if(void 0===l)throw new Error('"'+o.type+'" is not a chart type.');o.controller=new l(n,t),i.push(o.controller)}}return i},resetElements:function(){var t=this;V.each(t.data.datasets,(function(e,n){t.getDatasetMeta(n).controller.reset()}),t)},reset:function(){this.resetElements(),this.tooltip.initialize()},update:function(t){var e,n,i=this;if(t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]}),Ke(i),Le._invalidate(i),!1!==Le.notify(i,"beforeUpdate")){i.tooltip._data=i.data;var a=i.buildOrUpdateControllers();for(e=0,n=i.data.datasets.length;e<n;e++)i.getDatasetMeta(e).controller.buildOrUpdateElements();i.updateLayout(),i.options.animation&&i.options.animation.duration&&V.each(a,(function(t){t.reset()})),i.updateDatasets(),i.tooltip.initialize(),i.lastActive=[],Le.notify(i,"afterUpdate"),i._layers.sort(Je("z","_idx")),i._bufferedRender?i._bufferedRequest={duration:t.duration,easing:t.easing,lazy:t.lazy}:i.render(t)}},updateLayout:function(){var t=this;!1!==Le.notify(t,"beforeLayout")&&(ge.update(this,this.width,this.height),t._layers=[],V.each(t.boxes,(function(e){e._configure&&e._configure(),t._layers.push.apply(t._layers,e._layers())}),t),t._layers.forEach((function(t,e){t._idx=e})),Le.notify(t,"afterScaleUpdate"),Le.notify(t,"afterLayout"))},updateDatasets:function(){if(!1!==Le.notify(this,"beforeDatasetsUpdate")){for(var t=0,e=this.data.datasets.length;t<e;++t)this.updateDataset(t);Le.notify(this,"afterDatasetsUpdate")}},updateDataset:function(t){var e=this.getDatasetMeta(t),n={meta:e,index:t};!1!==Le.notify(this,"beforeDatasetUpdate",[n])&&(e.controller._update(),Le.notify(this,"afterDatasetUpdate",[n]))},render:function(t){var e=this;t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]});var n=e.options.animation,i=Ye(t.duration,n&&n.duration),a=t.lazy;if(!1!==Le.notify(e,"beforeRender")){var r=function(t){Le.notify(e,"afterRender"),V.callback(n&&n.onComplete,[t],e)};if(n&&i){var o=new Z({numSteps:i/16.66,easing:t.easing||n.easing,render:function(t,e){var n=V.easing.effects[e.easing],i=e.currentStep,a=i/e.numSteps;t.draw(n(a),a,i)},onAnimationProgress:n.onProgress,onAnimationComplete:r});$.addAnimation(e,o,i,a)}else e.draw(),r(new Z({numSteps:0,chart:e}));return e}},draw:function(t){var e,n,i=this;if(i.clear(),V.isNullOrUndef(t)&&(t=1),i.transition(t),!(i.width<=0||i.height<=0)&&!1!==Le.notify(i,"beforeDraw",[t])){for(n=i._layers,e=0;e<n.length&&n[e].z<=0;++e)n[e].draw(i.chartArea);for(i.drawDatasets(t);e<n.length;++e)n[e].draw(i.chartArea);i._drawTooltip(t),Le.notify(i,"afterDraw",[t])}},transition:function(t){for(var e=0,n=(this.data.datasets||[]).length;e<n;++e)this.isDatasetVisible(e)&&this.getDatasetMeta(e).controller.transition(t);this.tooltip.transition(t)},_getSortedDatasetMetas:function(t){var e,n,i=[];for(e=0,n=(this.data.datasets||[]).length;e<n;++e)t&&!this.isDatasetVisible(e)||i.push(this.getDatasetMeta(e));return i.sort(Je("order","index")),i},_getSortedVisibleDatasetMetas:function(){return this._getSortedDatasetMetas(!0)},drawDatasets:function(t){var e,n;if(!1!==Le.notify(this,"beforeDatasetsDraw",[t])){for(n=(e=this._getSortedVisibleDatasetMetas()).length-1;n>=0;--n)this.drawDataset(e[n],t);Le.notify(this,"afterDatasetsDraw",[t])}},drawDataset:function(t,e){var n={meta:t,index:t.index,easingValue:e};!1!==Le.notify(this,"beforeDatasetDraw",[n])&&(t.controller.draw(e),Le.notify(this,"afterDatasetDraw",[n]))},_drawTooltip:function(t){var e=this.tooltip,n={tooltip:e,easingValue:t};!1!==Le.notify(this,"beforeTooltipDraw",[n])&&(e.draw(),Le.notify(this,"afterTooltipDraw",[n]))},getElementAtEvent:function(t){return ae.modes.single(this,t)},getElementsAtEvent:function(t){return ae.modes.label(this,t,{intersect:!0})},getElementsAtXAxis:function(t){return ae.modes["x-axis"](this,t,{intersect:!0})},getElementsAtEventForMode:function(t,e,n){var i=ae.modes[e];return"function"==typeof i?i(this,t,n):[]},getDatasetAtEvent:function(t){return ae.modes.dataset(this,t,{intersect:!0})},getDatasetMeta:function(t){var e=this.data.datasets[t];e._meta||(e._meta={});var n=e._meta[this.id];return n||(n=e._meta[this.id]={type:null,data:[],dataset:null,controller:null,hidden:null,xAxisID:null,yAxisID:null,order:e.order||0,index:t}),n},getVisibleDatasetCount:function(){for(var t=0,e=0,n=this.data.datasets.length;e<n;++e)this.isDatasetVisible(e)&&t++;return t},isDatasetVisible:function(t){var e=this.getDatasetMeta(t);return"boolean"==typeof e.hidden?!e.hidden:!this.data.datasets[t].hidden},generateLegend:function(){return this.options.legendCallback(this)},destroyDatasetMeta:function(t){var e=this.id,n=this.data.datasets[t],i=n._meta&&n._meta[e];i&&(i.controller.destroy(),delete n._meta[e])},destroy:function(){var t,e,n=this,i=n.canvas;for(n.stop(),t=0,e=n.data.datasets.length;t<e;++t)n.destroyDatasetMeta(t);i&&(n.unbindEvents(),V.canvas.clear(n),Fe.releaseContext(n.ctx),n.canvas=null,n.ctx=null),Le.notify(n,"destroy"),delete Qe.instances[n.id]},toBase64Image:function(){return this.canvas.toDataURL.apply(this.canvas,arguments)},initToolTip:function(){var t=this;t.tooltip=new Ue({_chart:t,_chartInstance:t,_data:t.data,_options:t.options.tooltips},t)},bindEvents:function(){var t=this,e=t._listeners={},n=function(){t.eventHandler.apply(t,arguments)};V.each(t.options.events,(function(i){Fe.addEventListener(t,i,n),e[i]=n})),t.options.responsive&&(n=function(){t.resize()},Fe.addEventListener(t,"resize",n),e.resize=n)},unbindEvents:function(){var t=this,e=t._listeners;e&&(delete t._listeners,V.each(e,(function(e,n){Fe.removeEventListener(t,n,e)})))},updateHoverStyle:function(t,e,n){var i,a,r,o=n?"set":"remove";for(a=0,r=t.length;a<r;++a)(i=t[a])&&this.getDatasetMeta(i._datasetIndex).controller[o+"HoverStyle"](i);"dataset"===e&&this.getDatasetMeta(t[0]._datasetIndex).controller["_"+o+"DatasetHoverStyle"]()},eventHandler:function(t){var e=this,n=e.tooltip;if(!1!==Le.notify(e,"beforeEvent",[t])){e._bufferedRender=!0,e._bufferedRequest=null;var i=e.handleEvent(t);n&&(i=n._start?n.handleEvent(t):i|n.handleEvent(t)),Le.notify(e,"afterEvent",[t]);var a=e._bufferedRequest;return a?e.render(a):i&&!e.animating&&(e.stop(),e.render({duration:e.options.hover.animationDuration,lazy:!0})),e._bufferedRender=!1,e._bufferedRequest=null,e}},handleEvent:function(t){var e,n=this,i=n.options||{},a=i.hover;return n.lastActive=n.lastActive||[],"mouseout"===t.type?n.active=[]:n.active=n.getElementsAtEventForMode(t,a.mode,a),V.callback(i.onHover||i.hover.onHover,[t.native,n.active],n),"mouseup"!==t.type&&"click"!==t.type||i.onClick&&i.onClick.call(n,t.native,n.active),n.lastActive.length&&n.updateHoverStyle(n.lastActive,a.mode,!1),n.active.length&&a.mode&&n.updateHoverStyle(n.active,a.mode,!0),e=!V.arrayEquals(n.active,n.lastActive),n.lastActive=n.active,e}}),Qe.instances={};var tn=Qe;Qe.Controller=Qe,Qe.types={},V.configMerge=Xe,V.scaleMerge=Ge;function en(){throw new Error("This method is not implemented: either no adapter can be found or an incomplete integration was provided.")}function nn(t){this.options=t||{}}V.extend(nn.prototype,{formats:en,parse:en,format:en,add:en,diff:en,startOf:en,endOf:en,_create:function(t){return t}}),nn.override=function(t){V.extend(nn.prototype,t)};var an={_date:nn},rn={formatters:{values:function(t){return V.isArray(t)?t:""+t},linear:function(t,e,n){var i=n.length>3?n[2]-n[1]:n[1]-n[0];Math.abs(i)>1&&t!==Math.floor(t)&&(i=t-Math.floor(t));var a=V.log10(Math.abs(i)),r="";if(0!==t)if(Math.max(Math.abs(n[0]),Math.abs(n[n.length-1]))<1e-4){var o=V.log10(Math.abs(t)),s=Math.floor(o)-Math.floor(a);s=Math.max(Math.min(s,20),0),r=t.toExponential(s)}else{var l=-1*Math.floor(a);l=Math.max(Math.min(l,20),0),r=t.toFixed(l)}else r="0";return r},logarithmic:function(t,e,n){var i=t/Math.pow(10,Math.floor(V.log10(t)));return 0===t?"0":1===i||2===i||5===i||0===e||e===n.length-1?t.toExponential():""}}},on=V.isArray,sn=V.isNullOrUndef,ln=V.valueOrDefault,un=V.valueAtIndexOrDefault;function dn(t,e,n){var i,a=t.getTicks().length,r=Math.min(e,a-1),o=t.getPixelForTick(r),s=t._startPixel,l=t._endPixel;if(!(n&&(i=1===a?Math.max(o-s,l-o):0===e?(t.getPixelForTick(1)-o)/2:(o-t.getPixelForTick(r-1))/2,(o+=r<e?i:-i)<s-1e-6||o>l+1e-6)))return o}function hn(t,e,n,i){var a,r,o,s,l,u,d,h,c,f,g,p,m,v=n.length,b=[],x=[],y=[];for(a=0;a<v;++a){if(s=n[a].label,l=n[a].major?e.major:e.minor,t.font=u=l.string,d=i[u]=i[u]||{data:{},gc:[]},h=l.lineHeight,c=f=0,sn(s)||on(s)){if(on(s))for(r=0,o=s.length;r<o;++r)g=s[r],sn(g)||on(g)||(c=V.measureText(t,d.data,d.gc,c,g),f+=h)}else c=V.measureText(t,d.data,d.gc,c,s),f=h;b.push(c),x.push(f),y.push(h/2)}function _(t){return{width:b[t]||0,height:x[t]||0,offset:y[t]||0}}return function(t,e){V.each(t,(function(t){var n,i=t.gc,a=i.length/2;if(a>e){for(n=0;n<a;++n)delete t.data[i[n]];i.splice(0,a)}}))}(i,v),p=b.indexOf(Math.max.apply(null,b)),m=x.indexOf(Math.max.apply(null,x)),{first:_(0),last:_(v-1),widest:_(p),highest:_(m)}}function cn(t){return t.drawTicks?t.tickMarkLength:0}function fn(t){var e,n;return t.display?(e=V.options._parseFont(t),n=V.options.toPadding(t.padding),e.lineHeight+n.height):0}function gn(t,e){return V.extend(V.options._parseFont({fontFamily:ln(e.fontFamily,t.fontFamily),fontSize:ln(e.fontSize,t.fontSize),fontStyle:ln(e.fontStyle,t.fontStyle),lineHeight:ln(e.lineHeight,t.lineHeight)}),{color:V.options.resolve([e.fontColor,t.fontColor,z.global.defaultFontColor])})}function pn(t){var e=gn(t,t.minor);return{minor:e,major:t.major.enabled?gn(t,t.major):e}}function mn(t){var e,n,i,a=[];for(n=0,i=t.length;n<i;++n)void 0!==(e=t[n])._index&&a.push(e);return a}function vn(t,e,n,i){var a,r,o,s,l=ln(n,0),u=Math.min(ln(i,t.length),t.length),d=0;for(e=Math.ceil(e),i&&(e=(a=i-n)/Math.floor(a/e)),s=l;s<0;)d++,s=Math.round(l+d*e);for(r=Math.max(l,0);r<u;r++)o=t[r],r===s?(o._index=r,d++,s=Math.round(l+d*e)):delete o.label}z._set("scale",{display:!0,position:"left",offset:!1,gridLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,drawBorder:!0,drawOnChartArea:!0,drawTicks:!0,tickMarkLength:10,zeroLineWidth:1,zeroLineColor:"rgba(0,0,0,0.25)",zeroLineBorderDash:[],zeroLineBorderDashOffset:0,offsetGridLines:!1,borderDash:[],borderDashOffset:0},scaleLabel:{display:!1,labelString:"",padding:{top:4,bottom:4}},ticks:{beginAtZero:!1,minRotation:0,maxRotation:50,mirror:!1,padding:0,reverse:!1,display:!0,autoSkip:!0,autoSkipPadding:0,labelOffset:0,callback:rn.formatters.values,minor:{},major:{}}});var bn=X.extend({zeroLineIndex:0,getPadding:function(){return{left:this.paddingLeft||0,top:this.paddingTop||0,right:this.paddingRight||0,bottom:this.paddingBottom||0}},getTicks:function(){return this._ticks},_getLabels:function(){var t=this.chart.data;return this.options.labels||(this.isHorizontal()?t.xLabels:t.yLabels)||t.labels||[]},mergeTicksOptions:function(){},beforeUpdate:function(){V.callback(this.options.beforeUpdate,[this])},update:function(t,e,n){var i,a,r,o,s,l=this,u=l.options.ticks,d=u.sampleSize;if(l.beforeUpdate(),l.maxWidth=t,l.maxHeight=e,l.margins=V.extend({left:0,right:0,top:0,bottom:0},n),l._ticks=null,l.ticks=null,l._labelSizes=null,l._maxLabelLines=0,l.longestLabelWidth=0,l.longestTextCache=l.longestTextCache||{},l._gridLineItems=null,l._labelItems=null,l.beforeSetDimensions(),l.setDimensions(),l.afterSetDimensions(),l.beforeDataLimits(),l.determineDataLimits(),l.afterDataLimits(),l.beforeBuildTicks(),o=l.buildTicks()||[],(!(o=l.afterBuildTicks(o)||o)||!o.length)&&l.ticks)for(o=[],i=0,a=l.ticks.length;i<a;++i)o.push({value:l.ticks[i],major:!1});return l._ticks=o,s=d<o.length,r=l._convertTicksToLabels(s?function(t,e){for(var n=[],i=t.length/e,a=0,r=t.length;a<r;a+=i)n.push(t[Math.floor(a)]);return n}(o,d):o),l._configure(),l.beforeCalculateTickRotation(),l.calculateTickRotation(),l.afterCalculateTickRotation(),l.beforeFit(),l.fit(),l.afterFit(),l._ticksToDraw=u.display&&(u.autoSkip||"auto"===u.source)?l._autoSkip(o):o,s&&(r=l._convertTicksToLabels(l._ticksToDraw)),l.ticks=r,l.afterUpdate(),l.minSize},_configure:function(){var t,e,n=this,i=n.options.ticks.reverse;n.isHorizontal()?(t=n.left,e=n.right):(t=n.top,e=n.bottom,i=!i),n._startPixel=t,n._endPixel=e,n._reversePixels=i,n._length=e-t},afterUpdate:function(){V.callback(this.options.afterUpdate,[this])},beforeSetDimensions:function(){V.callback(this.options.beforeSetDimensions,[this])},setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0},afterSetDimensions:function(){V.callback(this.options.afterSetDimensions,[this])},beforeDataLimits:function(){V.callback(this.options.beforeDataLimits,[this])},determineDataLimits:V.noop,afterDataLimits:function(){V.callback(this.options.afterDataLimits,[this])},beforeBuildTicks:function(){V.callback(this.options.beforeBuildTicks,[this])},buildTicks:V.noop,afterBuildTicks:function(t){var e=this;return on(t)&&t.length?V.callback(e.options.afterBuildTicks,[e,t]):(e.ticks=V.callback(e.options.afterBuildTicks,[e,e.ticks])||e.ticks,t)},beforeTickToLabelConversion:function(){V.callback(this.options.beforeTickToLabelConversion,[this])},convertTicksToLabels:function(){var t=this.options.ticks;this.ticks=this.ticks.map(t.userCallback||t.callback,this)},afterTickToLabelConversion:function(){V.callback(this.options.afterTickToLabelConversion,[this])},beforeCalculateTickRotation:function(){V.callback(this.options.beforeCalculateTickRotation,[this])},calculateTickRotation:function(){var t,e,n,i,a,r,o,s=this,l=s.options,u=l.ticks,d=s.getTicks().length,h=u.minRotation||0,c=u.maxRotation,f=h;!s._isVisible()||!u.display||h>=c||d<=1||!s.isHorizontal()?s.labelRotation=h:(e=(t=s._getLabelSizes()).widest.width,n=t.highest.height-t.highest.offset,i=Math.min(s.maxWidth,s.chart.width-e),e+6>(a=l.offset?s.maxWidth/d:i/(d-1))&&(a=i/(d-(l.offset?.5:1)),r=s.maxHeight-cn(l.gridLines)-u.padding-fn(l.scaleLabel),o=Math.sqrt(e*e+n*n),f=V.toDegrees(Math.min(Math.asin(Math.min((t.highest.height+6)/a,1)),Math.asin(Math.min(r/o,1))-Math.asin(n/o))),f=Math.max(h,Math.min(c,f))),s.labelRotation=f)},afterCalculateTickRotation:function(){V.callback(this.options.afterCalculateTickRotation,[this])},beforeFit:function(){V.callback(this.options.beforeFit,[this])},fit:function(){var t=this,e=t.minSize={width:0,height:0},n=t.chart,i=t.options,a=i.ticks,r=i.scaleLabel,o=i.gridLines,s=t._isVisible(),l="bottom"===i.position,u=t.isHorizontal();if(u?e.width=t.maxWidth:s&&(e.width=cn(o)+fn(r)),u?s&&(e.height=cn(o)+fn(r)):e.height=t.maxHeight,a.display&&s){var d=pn(a),h=t._getLabelSizes(),c=h.first,f=h.last,g=h.widest,p=h.highest,m=.4*d.minor.lineHeight,v=a.padding;if(u){var b=0!==t.labelRotation,x=V.toRadians(t.labelRotation),y=Math.cos(x),_=Math.sin(x),k=_*g.width+y*(p.height-(b?p.offset:0))+(b?0:m);e.height=Math.min(t.maxHeight,e.height+k+v);var w,M,S=t.getPixelForTick(0)-t.left,C=t.right-t.getPixelForTick(t.getTicks().length-1);b?(w=l?y*c.width+_*c.offset:_*(c.height-c.offset),M=l?_*(f.height-f.offset):y*f.width+_*f.offset):(w=c.width/2,M=f.width/2),t.paddingLeft=Math.max((w-S)*t.width/(t.width-S),0)+3,t.paddingRight=Math.max((M-C)*t.width/(t.width-C),0)+3}else{var P=a.mirror?0:g.width+v+m;e.width=Math.min(t.maxWidth,e.width+P),t.paddingTop=c.height/2,t.paddingBottom=f.height/2}}t.handleMargins(),u?(t.width=t._length=n.width-t.margins.left-t.margins.right,t.height=e.height):(t.width=e.width,t.height=t._length=n.height-t.margins.top-t.margins.bottom)},handleMargins:function(){var t=this;t.margins&&(t.margins.left=Math.max(t.paddingLeft,t.margins.left),t.margins.top=Math.max(t.paddingTop,t.margins.top),t.margins.right=Math.max(t.paddingRight,t.margins.right),t.margins.bottom=Math.max(t.paddingBottom,t.margins.bottom))},afterFit:function(){V.callback(this.options.afterFit,[this])},isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},isFullWidth:function(){return this.options.fullWidth},getRightValue:function(t){if(sn(t))return NaN;if(("number"==typeof t||t instanceof Number)&&!isFinite(t))return NaN;if(t)if(this.isHorizontal()){if(void 0!==t.x)return this.getRightValue(t.x)}else if(void 0!==t.y)return this.getRightValue(t.y);return t},_convertTicksToLabels:function(t){var e,n,i,a=this;for(a.ticks=t.map((function(t){return t.value})),a.beforeTickToLabelConversion(),e=a.convertTicksToLabels(t)||a.ticks,a.afterTickToLabelConversion(),n=0,i=t.length;n<i;++n)t[n].label=e[n];return e},_getLabelSizes:function(){var t=this,e=t._labelSizes;return e||(t._labelSizes=e=hn(t.ctx,pn(t.options.ticks),t.getTicks(),t.longestTextCache),t.longestLabelWidth=e.widest.width),e},_parseValue:function(t){var e,n,i,a;return on(t)?(e=+this.getRightValue(t[0]),n=+this.getRightValue(t[1]),i=Math.min(e,n),a=Math.max(e,n)):(e=void 0,n=t=+this.getRightValue(t),i=t,a=t),{min:i,max:a,start:e,end:n}},_getScaleLabel:function(t){var e=this._parseValue(t);return void 0!==e.start?"["+e.start+", "+e.end+"]":+this.getRightValue(t)},getLabelForIndex:V.noop,getPixelForValue:V.noop,getValueForPixel:V.noop,getPixelForTick:function(t){var e=this.options.offset,n=this._ticks.length,i=1/Math.max(n-(e?0:1),1);return t<0||t>n-1?null:this.getPixelForDecimal(t*i+(e?i/2:0))},getPixelForDecimal:function(t){return this._reversePixels&&(t=1-t),this._startPixel+t*this._length},getDecimalForPixel:function(t){var e=(t-this._startPixel)/this._length;return this._reversePixels?1-e:e},getBasePixel:function(){return this.getPixelForValue(this.getBaseValue())},getBaseValue:function(){var t=this.min,e=this.max;return this.beginAtZero?0:t<0&&e<0?e:t>0&&e>0?t:0},_autoSkip:function(t){var e,n,i,a,r=this.options.ticks,o=this._length,s=r.maxTicksLimit||o/this._tickSize()+1,l=r.major.enabled?function(t){var e,n,i=[];for(e=0,n=t.length;e<n;e++)t[e].major&&i.push(e);return i}(t):[],u=l.length,d=l[0],h=l[u-1];if(u>s)return function(t,e,n){var i,a,r=0,o=e[0];for(n=Math.ceil(n),i=0;i<t.length;i++)a=t[i],i===o?(a._index=i,o=e[++r*n]):delete a.label}(t,l,u/s),mn(t);if(i=function(t,e,n,i){var a,r,o,s,l=function(t){var e,n,i=t.length;if(i<2)return!1;for(n=t[0],e=1;e<i;++e)if(t[e]-t[e-1]!==n)return!1;return n}(t),u=(e.length-1)/i;if(!l)return Math.max(u,1);for(o=0,s=(a=V.math._factorize(l)).length-1;o<s;o++)if((r=a[o])>u)return r;return Math.max(u,1)}(l,t,0,s),u>0){for(e=0,n=u-1;e<n;e++)vn(t,i,l[e],l[e+1]);return a=u>1?(h-d)/(u-1):null,vn(t,i,V.isNullOrUndef(a)?0:d-a,d),vn(t,i,h,V.isNullOrUndef(a)?t.length:h+a),mn(t)}return vn(t,i),mn(t)},_tickSize:function(){var t=this.options.ticks,e=V.toRadians(this.labelRotation),n=Math.abs(Math.cos(e)),i=Math.abs(Math.sin(e)),a=this._getLabelSizes(),r=t.autoSkipPadding||0,o=a?a.widest.width+r:0,s=a?a.highest.height+r:0;return this.isHorizontal()?s*n>o*i?o/n:s/i:s*i<o*n?s/n:o/i},_isVisible:function(){var t,e,n,i=this.chart,a=this.options.display;if("auto"!==a)return!!a;for(t=0,e=i.data.datasets.length;t<e;++t)if(i.isDatasetVisible(t)&&((n=i.getDatasetMeta(t)).xAxisID===this.id||n.yAxisID===this.id))return!0;return!1},_computeGridLineItems:function(t){var e,n,i,a,r,o,s,l,u,d,h,c,f,g,p,m,v,b=this,x=b.chart,y=b.options,_=y.gridLines,k=y.position,w=_.offsetGridLines,M=b.isHorizontal(),S=b._ticksToDraw,C=S.length+(w?1:0),P=cn(_),A=[],D=_.drawBorder?un(_.lineWidth,0,0):0,T=D/2,I=V._alignPixel,F=function(t){return I(x,t,D)};for("top"===k?(e=F(b.bottom),s=b.bottom-P,u=e-T,h=F(t.top)+T,f=t.bottom):"bottom"===k?(e=F(b.top),h=t.top,f=F(t.bottom)-T,s=e+T,u=b.top+P):"left"===k?(e=F(b.right),o=b.right-P,l=e-T,d=F(t.left)+T,c=t.right):(e=F(b.left),d=t.left,c=F(t.right)-T,o=e+T,l=b.left+P),n=0;n<C;++n)i=S[n]||{},sn(i.label)&&n<S.length||(n===b.zeroLineIndex&&y.offset===w?(g=_.zeroLineWidth,p=_.zeroLineColor,m=_.zeroLineBorderDash||[],v=_.zeroLineBorderDashOffset||0):(g=un(_.lineWidth,n,1),p=un(_.color,n,"rgba(0,0,0,0.1)"),m=_.borderDash||[],v=_.borderDashOffset||0),void 0!==(a=dn(b,i._index||n,w))&&(r=I(x,a,g),M?o=l=d=c=r:s=u=h=f=r,A.push({tx1:o,ty1:s,tx2:l,ty2:u,x1:d,y1:h,x2:c,y2:f,width:g,color:p,borderDash:m,borderDashOffset:v})));return A.ticksLength=C,A.borderValue=e,A},_computeLabelItems:function(){var t,e,n,i,a,r,o,s,l,u,d,h,c=this,f=c.options,g=f.ticks,p=f.position,m=g.mirror,v=c.isHorizontal(),b=c._ticksToDraw,x=pn(g),y=g.padding,_=cn(f.gridLines),k=-V.toRadians(c.labelRotation),w=[];for("top"===p?(r=c.bottom-_-y,o=k?"left":"center"):"bottom"===p?(r=c.top+_+y,o=k?"right":"center"):"left"===p?(a=c.right-(m?0:_)-y,o=m?"left":"right"):(a=c.left+(m?0:_)+y,o=m?"right":"left"),t=0,e=b.length;t<e;++t)i=(n=b[t]).label,sn(i)||(s=c.getPixelForTick(n._index||t)+g.labelOffset,u=(l=n.major?x.major:x.minor).lineHeight,d=on(i)?i.length:1,v?(a=s,h="top"===p?((k?1:.5)-d)*u:(k?0:.5)*u):(r=s,h=(1-d)*u/2),w.push({x:a,y:r,rotation:k,label:i,font:l,textOffset:h,textAlign:o}));return w},_drawGrid:function(t){var e=this,n=e.options.gridLines;if(n.display){var i,a,r,o,s,l=e.ctx,u=e.chart,d=V._alignPixel,h=n.drawBorder?un(n.lineWidth,0,0):0,c=e._gridLineItems||(e._gridLineItems=e._computeGridLineItems(t));for(r=0,o=c.length;r<o;++r)i=(s=c[r]).width,a=s.color,i&&a&&(l.save(),l.lineWidth=i,l.strokeStyle=a,l.setLineDash&&(l.setLineDash(s.borderDash),l.lineDashOffset=s.borderDashOffset),l.beginPath(),n.drawTicks&&(l.moveTo(s.tx1,s.ty1),l.lineTo(s.tx2,s.ty2)),n.drawOnChartArea&&(l.moveTo(s.x1,s.y1),l.lineTo(s.x2,s.y2)),l.stroke(),l.restore());if(h){var f,g,p,m,v=h,b=un(n.lineWidth,c.ticksLength-1,1),x=c.borderValue;e.isHorizontal()?(f=d(u,e.left,v)-v/2,g=d(u,e.right,b)+b/2,p=m=x):(p=d(u,e.top,v)-v/2,m=d(u,e.bottom,b)+b/2,f=g=x),l.lineWidth=h,l.strokeStyle=un(n.color,0),l.beginPath(),l.moveTo(f,p),l.lineTo(g,m),l.stroke()}}},_drawLabels:function(){var t=this;if(t.options.ticks.display){var e,n,i,a,r,o,s,l,u=t.ctx,d=t._labelItems||(t._labelItems=t._computeLabelItems());for(e=0,i=d.length;e<i;++e){if(o=(r=d[e]).font,u.save(),u.translate(r.x,r.y),u.rotate(r.rotation),u.font=o.string,u.fillStyle=o.color,u.textBaseline="middle",u.textAlign=r.textAlign,s=r.label,l=r.textOffset,on(s))for(n=0,a=s.length;n<a;++n)u.fillText(""+s[n],0,l),l+=o.lineHeight;else u.fillText(s,0,l);u.restore()}}},_drawTitle:function(){var t=this,e=t.ctx,n=t.options,i=n.scaleLabel;if(i.display){var a,r,o=ln(i.fontColor,z.global.defaultFontColor),s=V.options._parseFont(i),l=V.options.toPadding(i.padding),u=s.lineHeight/2,d=n.position,h=0;if(t.isHorizontal())a=t.left+t.width/2,r="bottom"===d?t.bottom-u-l.bottom:t.top+u+l.top;else{var c="left"===d;a=c?t.left+u+l.top:t.right-u-l.top,r=t.top+t.height/2,h=c?-.5*Math.PI:.5*Math.PI}e.save(),e.translate(a,r),e.rotate(h),e.textAlign="center",e.textBaseline="middle",e.fillStyle=o,e.font=s.string,e.fillText(i.labelString,0,0),e.restore()}},draw:function(t){this._isVisible()&&(this._drawGrid(t),this._drawTitle(),this._drawLabels())},_layers:function(){var t=this,e=t.options,n=e.ticks&&e.ticks.z||0,i=e.gridLines&&e.gridLines.z||0;return t._isVisible()&&n!==i&&t.draw===t._draw?[{z:i,draw:function(){t._drawGrid.apply(t,arguments),t._drawTitle.apply(t,arguments)}},{z:n,draw:function(){t._drawLabels.apply(t,arguments)}}]:[{z:n,draw:function(){t.draw.apply(t,arguments)}}]},_getMatchingVisibleMetas:function(t){var e=this,n=e.isHorizontal();return e.chart._getSortedVisibleDatasetMetas().filter((function(i){return(!t||i.type===t)&&(n?i.xAxisID===e.id:i.yAxisID===e.id)}))}});bn.prototype._draw=bn.prototype.draw;var xn=bn,yn=V.isNullOrUndef,_n=xn.extend({determineDataLimits:function(){var t,e=this,n=e._getLabels(),i=e.options.ticks,a=i.min,r=i.max,o=0,s=n.length-1;void 0!==a&&(t=n.indexOf(a))>=0&&(o=t),void 0!==r&&(t=n.indexOf(r))>=0&&(s=t),e.minIndex=o,e.maxIndex=s,e.min=n[o],e.max=n[s]},buildTicks:function(){var t=this._getLabels(),e=this.minIndex,n=this.maxIndex;this.ticks=0===e&&n===t.length-1?t:t.slice(e,n+1)},getLabelForIndex:function(t,e){var n=this.chart;return n.getDatasetMeta(e).controller._getValueScaleId()===this.id?this.getRightValue(n.data.datasets[e].data[t]):this._getLabels()[t]},_configure:function(){var t=this,e=t.options.offset,n=t.ticks;xn.prototype._configure.call(t),t.isHorizontal()||(t._reversePixels=!t._reversePixels),n&&(t._startValue=t.minIndex-(e?.5:0),t._valueRange=Math.max(n.length-(e?0:1),1))},getPixelForValue:function(t,e,n){var i,a,r,o=this;return yn(e)||yn(n)||(t=o.chart.data.datasets[n].data[e]),yn(t)||(i=o.isHorizontal()?t.x:t.y),(void 0!==i||void 0!==t&&isNaN(e))&&(a=o._getLabels(),t=V.valueOrDefault(i,t),e=-1!==(r=a.indexOf(t))?r:e,isNaN(e)&&(e=t)),o.getPixelForDecimal((e-o._startValue)/o._valueRange)},getPixelForTick:function(t){var e=this.ticks;return t<0||t>e.length-1?null:this.getPixelForValue(e[t],t+this.minIndex)},getValueForPixel:function(t){var e=Math.round(this._startValue+this.getDecimalForPixel(t)*this._valueRange);return Math.min(Math.max(e,0),this.ticks.length-1)},getBasePixel:function(){return this.bottom}}),kn={position:"bottom"};_n._defaults=kn;var wn=V.noop,Mn=V.isNullOrUndef;var Sn=xn.extend({getRightValue:function(t){return"string"==typeof t?+t:xn.prototype.getRightValue.call(this,t)},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;if(e.beginAtZero){var n=V.sign(t.min),i=V.sign(t.max);n<0&&i<0?t.max=0:n>0&&i>0&&(t.min=0)}var a=void 0!==e.min||void 0!==e.suggestedMin,r=void 0!==e.max||void 0!==e.suggestedMax;void 0!==e.min?t.min=e.min:void 0!==e.suggestedMin&&(null===t.min?t.min=e.suggestedMin:t.min=Math.min(t.min,e.suggestedMin)),void 0!==e.max?t.max=e.max:void 0!==e.suggestedMax&&(null===t.max?t.max=e.suggestedMax:t.max=Math.max(t.max,e.suggestedMax)),a!==r&&t.min>=t.max&&(a?t.max=t.min+1:t.min=t.max-1),t.min===t.max&&(t.max++,e.beginAtZero||t.min--)},getTickLimit:function(){var t,e=this.options.ticks,n=e.stepSize,i=e.maxTicksLimit;return n?t=Math.ceil(this.max/n)-Math.floor(this.min/n)+1:(t=this._computeTickLimit(),i=i||11),i&&(t=Math.min(i,t)),t},_computeTickLimit:function(){return Number.POSITIVE_INFINITY},handleDirectionalChanges:wn,buildTicks:function(){var t=this,e=t.options.ticks,n=t.getTickLimit(),i={maxTicks:n=Math.max(2,n),min:e.min,max:e.max,precision:e.precision,stepSize:V.valueOrDefault(e.fixedStepSize,e.stepSize)},a=t.ticks=function(t,e){var n,i,a,r,o=[],s=t.stepSize,l=s||1,u=t.maxTicks-1,d=t.min,h=t.max,c=t.precision,f=e.min,g=e.max,p=V.niceNum((g-f)/u/l)*l;if(p<1e-14&&Mn(d)&&Mn(h))return[f,g];(r=Math.ceil(g/p)-Math.floor(f/p))>u&&(p=V.niceNum(r*p/u/l)*l),s||Mn(c)?n=Math.pow(10,V._decimalPlaces(p)):(n=Math.pow(10,c),p=Math.ceil(p*n)/n),i=Math.floor(f/p)*p,a=Math.ceil(g/p)*p,s&&(!Mn(d)&&V.almostWhole(d/p,p/1e3)&&(i=d),!Mn(h)&&V.almostWhole(h/p,p/1e3)&&(a=h)),r=(a-i)/p,r=V.almostEquals(r,Math.round(r),p/1e3)?Math.round(r):Math.ceil(r),i=Math.round(i*n)/n,a=Math.round(a*n)/n,o.push(Mn(d)?i:d);for(var m=1;m<r;++m)o.push(Math.round((i+m*p)*n)/n);return o.push(Mn(h)?a:h),o}(i,t);t.handleDirectionalChanges(),t.max=V.max(a),t.min=V.min(a),e.reverse?(a.reverse(),t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max)},convertTicksToLabels:function(){var t=this;t.ticksAsNumbers=t.ticks.slice(),t.zeroLineIndex=t.ticks.indexOf(0),xn.prototype.convertTicksToLabels.call(t)},_configure:function(){var t,e=this,n=e.getTicks(),i=e.min,a=e.max;xn.prototype._configure.call(e),e.options.offset&&n.length&&(i-=t=(a-i)/Math.max(n.length-1,1)/2,a+=t),e._startValue=i,e._endValue=a,e._valueRange=a-i}}),Cn={position:"left",ticks:{callback:rn.formatters.linear}};function Pn(t,e,n,i){var a,r,o=t.options,s=function(t,e,n){var i=[n.type,void 0===e&&void 0===n.stack?n.index:"",n.stack].join(".");return void 0===t[i]&&(t[i]={pos:[],neg:[]}),t[i]}(e,o.stacked,n),l=s.pos,u=s.neg,d=i.length;for(a=0;a<d;++a)r=t._parseValue(i[a]),isNaN(r.min)||isNaN(r.max)||n.data[a].hidden||(l[a]=l[a]||0,u[a]=u[a]||0,o.relativePoints?l[a]=100:r.min<0||r.max<0?u[a]+=r.min:l[a]+=r.max)}function An(t,e,n){var i,a,r=n.length;for(i=0;i<r;++i)a=t._parseValue(n[i]),isNaN(a.min)||isNaN(a.max)||e.data[i].hidden||(t.min=Math.min(t.min,a.min),t.max=Math.max(t.max,a.max))}var Dn=Sn.extend({determineDataLimits:function(){var t,e,n,i,a=this,r=a.options,o=a.chart.data.datasets,s=a._getMatchingVisibleMetas(),l=r.stacked,u={},d=s.length;if(a.min=Number.POSITIVE_INFINITY,a.max=Number.NEGATIVE_INFINITY,void 0===l)for(t=0;!l&&t<d;++t)l=void 0!==(e=s[t]).stack;for(t=0;t<d;++t)n=o[(e=s[t]).index].data,l?Pn(a,u,e,n):An(a,e,n);V.each(u,(function(t){i=t.pos.concat(t.neg),a.min=Math.min(a.min,V.min(i)),a.max=Math.max(a.max,V.max(i))})),a.min=V.isFinite(a.min)&&!isNaN(a.min)?a.min:0,a.max=V.isFinite(a.max)&&!isNaN(a.max)?a.max:1,a.handleTickRangeOptions()},_computeTickLimit:function(){var t;return this.isHorizontal()?Math.ceil(this.width/40):(t=V.options._parseFont(this.options.ticks),Math.ceil(this.height/t.lineHeight))},handleDirectionalChanges:function(){this.isHorizontal()||this.ticks.reverse()},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForValue:function(t){return this.getPixelForDecimal((+this.getRightValue(t)-this._startValue)/this._valueRange)},getValueForPixel:function(t){return this._startValue+this.getDecimalForPixel(t)*this._valueRange},getPixelForTick:function(t){var e=this.ticksAsNumbers;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])}}),Tn=Cn;Dn._defaults=Tn;var In=V.valueOrDefault,Fn=V.math.log10;var Ln={position:"left",ticks:{callback:rn.formatters.logarithmic}};function On(t,e){return V.isFinite(t)&&t>=0?t:e}var Rn=xn.extend({determineDataLimits:function(){var t,e,n,i,a,r,o=this,s=o.options,l=o.chart,u=l.data.datasets,d=o.isHorizontal();function h(t){return d?t.xAxisID===o.id:t.yAxisID===o.id}o.min=Number.POSITIVE_INFINITY,o.max=Number.NEGATIVE_INFINITY,o.minNotZero=Number.POSITIVE_INFINITY;var c=s.stacked;if(void 0===c)for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e)&&void 0!==e.stack){c=!0;break}if(s.stacked||c){var f={};for(t=0;t<u.length;t++){var g=[(e=l.getDatasetMeta(t)).type,void 0===s.stacked&&void 0===e.stack?t:"",e.stack].join(".");if(l.isDatasetVisible(t)&&h(e))for(void 0===f[g]&&(f[g]=[]),a=0,r=(i=u[t].data).length;a<r;a++){var p=f[g];n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(p[a]=p[a]||0,p[a]+=n.max)}}V.each(f,(function(t){if(t.length>0){var e=V.min(t),n=V.max(t);o.min=Math.min(o.min,e),o.max=Math.max(o.max,n)}}))}else for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e))for(a=0,r=(i=u[t].data).length;a<r;a++)n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(o.min=Math.min(n.min,o.min),o.max=Math.max(n.max,o.max),0!==n.min&&(o.minNotZero=Math.min(n.min,o.minNotZero)));o.min=V.isFinite(o.min)?o.min:null,o.max=V.isFinite(o.max)?o.max:null,o.minNotZero=V.isFinite(o.minNotZero)?o.minNotZero:null,this.handleTickRangeOptions()},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;t.min=On(e.min,t.min),t.max=On(e.max,t.max),t.min===t.max&&(0!==t.min&&null!==t.min?(t.min=Math.pow(10,Math.floor(Fn(t.min))-1),t.max=Math.pow(10,Math.floor(Fn(t.max))+1)):(t.min=1,t.max=10)),null===t.min&&(t.min=Math.pow(10,Math.floor(Fn(t.max))-1)),null===t.max&&(t.max=0!==t.min?Math.pow(10,Math.floor(Fn(t.min))+1):10),null===t.minNotZero&&(t.min>0?t.minNotZero=t.min:t.max<1?t.minNotZero=Math.pow(10,Math.floor(Fn(t.max))):t.minNotZero=1)},buildTicks:function(){var t=this,e=t.options.ticks,n=!t.isHorizontal(),i={min:On(e.min),max:On(e.max)},a=t.ticks=function(t,e){var n,i,a=[],r=In(t.min,Math.pow(10,Math.floor(Fn(e.min)))),o=Math.floor(Fn(e.max)),s=Math.ceil(e.max/Math.pow(10,o));0===r?(n=Math.floor(Fn(e.minNotZero)),i=Math.floor(e.minNotZero/Math.pow(10,n)),a.push(r),r=i*Math.pow(10,n)):(n=Math.floor(Fn(r)),i=Math.floor(r/Math.pow(10,n)));var l=n<0?Math.pow(10,Math.abs(n)):1;do{a.push(r),10===++i&&(i=1,l=++n>=0?1:l),r=Math.round(i*Math.pow(10,n)*l)/l}while(n<o||n===o&&i<s);var u=In(t.max,r);return a.push(u),a}(i,t);t.max=V.max(a),t.min=V.min(a),e.reverse?(n=!n,t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max),n&&a.reverse()},convertTicksToLabels:function(){this.tickValues=this.ticks.slice(),xn.prototype.convertTicksToLabels.call(this)},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForTick:function(t){var e=this.tickValues;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])},_getFirstTickValue:function(t){var e=Math.floor(Fn(t));return Math.floor(t/Math.pow(10,e))*Math.pow(10,e)},_configure:function(){var t=this,e=t.min,n=0;xn.prototype._configure.call(t),0===e&&(e=t._getFirstTickValue(t.minNotZero),n=In(t.options.ticks.fontSize,z.global.defaultFontSize)/t._length),t._startValue=Fn(e),t._valueOffset=n,t._valueRange=(Fn(t.max)-Fn(e))/(1-n)},getPixelForValue:function(t){var e=this,n=0;return(t=+e.getRightValue(t))>e.min&&t>0&&(n=(Fn(t)-e._startValue)/e._valueRange+e._valueOffset),e.getPixelForDecimal(n)},getValueForPixel:function(t){var e=this,n=e.getDecimalForPixel(t);return 0===n&&0===e.min?0:Math.pow(10,e._startValue+(n-e._valueOffset)*e._valueRange)}}),zn=Ln;Rn._defaults=zn;var Nn=V.valueOrDefault,Bn=V.valueAtIndexOrDefault,En=V.options.resolve,Wn={display:!0,animate:!0,position:"chartArea",angleLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,borderDash:[],borderDashOffset:0},gridLines:{circular:!1},ticks:{showLabelBackdrop:!0,backdropColor:"rgba(255,255,255,0.75)",backdropPaddingY:2,backdropPaddingX:2,callback:rn.formatters.linear},pointLabels:{display:!0,fontSize:10,callback:function(t){return t}}};function Vn(t){var e=t.ticks;return e.display&&t.display?Nn(e.fontSize,z.global.defaultFontSize)+2*e.backdropPaddingY:0}function Hn(t,e,n,i,a){return t===i||t===a?{start:e-n/2,end:e+n/2}:t<i||t>a?{start:e-n,end:e}:{start:e,end:e+n}}function jn(t){return 0===t||180===t?"center":t<180?"left":"right"}function qn(t,e,n,i){var a,r,o=n.y+i/2;if(V.isArray(e))for(a=0,r=e.length;a<r;++a)t.fillText(e[a],n.x,o),o+=i;else t.fillText(e,n.x,o)}function Un(t,e,n){90===t||270===t?n.y-=e.h/2:(t>270||t<90)&&(n.y-=e.h)}function Yn(t){return V.isNumber(t)?t:0}var Gn=Sn.extend({setDimensions:function(){var t=this;t.width=t.maxWidth,t.height=t.maxHeight,t.paddingTop=Vn(t.options)/2,t.xCenter=Math.floor(t.width/2),t.yCenter=Math.floor((t.height-t.paddingTop)/2),t.drawingArea=Math.min(t.height-t.paddingTop,t.width)/2},determineDataLimits:function(){var t=this,e=t.chart,n=Number.POSITIVE_INFINITY,i=Number.NEGATIVE_INFINITY;V.each(e.data.datasets,(function(a,r){if(e.isDatasetVisible(r)){var o=e.getDatasetMeta(r);V.each(a.data,(function(e,a){var r=+t.getRightValue(e);isNaN(r)||o.data[a].hidden||(n=Math.min(r,n),i=Math.max(r,i))}))}})),t.min=n===Number.POSITIVE_INFINITY?0:n,t.max=i===Number.NEGATIVE_INFINITY?0:i,t.handleTickRangeOptions()},_computeTickLimit:function(){return Math.ceil(this.drawingArea/Vn(this.options))},convertTicksToLabels:function(){var t=this;Sn.prototype.convertTicksToLabels.call(t),t.pointLabels=t.chart.data.labels.map((function(){var e=V.callback(t.options.pointLabels.callback,arguments,t);return e||0===e?e:""}))},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},fit:function(){var t=this.options;t.display&&t.pointLabels.display?function(t){var e,n,i,a=V.options._parseFont(t.options.pointLabels),r={l:0,r:t.width,t:0,b:t.height-t.paddingTop},o={};t.ctx.font=a.string,t._pointLabelSizes=[];var s,l,u,d=t.chart.data.labels.length;for(e=0;e<d;e++){i=t.getPointPosition(e,t.drawingArea+5),s=t.ctx,l=a.lineHeight,u=t.pointLabels[e],n=V.isArray(u)?{w:V.longestText(s,s.font,u),h:u.length*l}:{w:s.measureText(u).width,h:l},t._pointLabelSizes[e]=n;var h=t.getIndexAngle(e),c=V.toDegrees(h)%360,f=Hn(c,i.x,n.w,0,180),g=Hn(c,i.y,n.h,90,270);f.start<r.l&&(r.l=f.start,o.l=h),f.end>r.r&&(r.r=f.end,o.r=h),g.start<r.t&&(r.t=g.start,o.t=h),g.end>r.b&&(r.b=g.end,o.b=h)}t.setReductions(t.drawingArea,r,o)}(this):this.setCenterPoint(0,0,0,0)},setReductions:function(t,e,n){var i=this,a=e.l/Math.sin(n.l),r=Math.max(e.r-i.width,0)/Math.sin(n.r),o=-e.t/Math.cos(n.t),s=-Math.max(e.b-(i.height-i.paddingTop),0)/Math.cos(n.b);a=Yn(a),r=Yn(r),o=Yn(o),s=Yn(s),i.drawingArea=Math.min(Math.floor(t-(a+r)/2),Math.floor(t-(o+s)/2)),i.setCenterPoint(a,r,o,s)},setCenterPoint:function(t,e,n,i){var a=this,r=a.width-e-a.drawingArea,o=t+a.drawingArea,s=n+a.drawingArea,l=a.height-a.paddingTop-i-a.drawingArea;a.xCenter=Math.floor((o+r)/2+a.left),a.yCenter=Math.floor((s+l)/2+a.top+a.paddingTop)},getIndexAngle:function(t){var e=this.chart,n=(t*(360/e.data.labels.length)+((e.options||{}).startAngle||0))%360;return(n<0?n+360:n)*Math.PI*2/360},getDistanceFromCenterForValue:function(t){var e=this;if(V.isNullOrUndef(t))return NaN;var n=e.drawingArea/(e.max-e.min);return e.options.ticks.reverse?(e.max-t)*n:(t-e.min)*n},getPointPosition:function(t,e){var n=this.getIndexAngle(t)-Math.PI/2;return{x:Math.cos(n)*e+this.xCenter,y:Math.sin(n)*e+this.yCenter}},getPointPositionForValue:function(t,e){return this.getPointPosition(t,this.getDistanceFromCenterForValue(e))},getBasePosition:function(t){var e=this.min,n=this.max;return this.getPointPositionForValue(t||0,this.beginAtZero?0:e<0&&n<0?n:e>0&&n>0?e:0)},_drawGrid:function(){var t,e,n,i=this,a=i.ctx,r=i.options,o=r.gridLines,s=r.angleLines,l=Nn(s.lineWidth,o.lineWidth),u=Nn(s.color,o.color);if(r.pointLabels.display&&function(t){var e=t.ctx,n=t.options,i=n.pointLabels,a=Vn(n),r=t.getDistanceFromCenterForValue(n.ticks.reverse?t.min:t.max),o=V.options._parseFont(i);e.save(),e.font=o.string,e.textBaseline="middle";for(var s=t.chart.data.labels.length-1;s>=0;s--){var l=0===s?a/2:0,u=t.getPointPosition(s,r+l+5),d=Bn(i.fontColor,s,z.global.defaultFontColor);e.fillStyle=d;var h=t.getIndexAngle(s),c=V.toDegrees(h);e.textAlign=jn(c),Un(c,t._pointLabelSizes[s],u),qn(e,t.pointLabels[s],u,o.lineHeight)}e.restore()}(i),o.display&&V.each(i.ticks,(function(t,n){0!==n&&(e=i.getDistanceFromCenterForValue(i.ticksAsNumbers[n]),function(t,e,n,i){var a,r=t.ctx,o=e.circular,s=t.chart.data.labels.length,l=Bn(e.color,i-1),u=Bn(e.lineWidth,i-1);if((o||s)&&l&&u){if(r.save(),r.strokeStyle=l,r.lineWidth=u,r.setLineDash&&(r.setLineDash(e.borderDash||[]),r.lineDashOffset=e.borderDashOffset||0),r.beginPath(),o)r.arc(t.xCenter,t.yCenter,n,0,2*Math.PI);else{a=t.getPointPosition(0,n),r.moveTo(a.x,a.y);for(var d=1;d<s;d++)a=t.getPointPosition(d,n),r.lineTo(a.x,a.y)}r.closePath(),r.stroke(),r.restore()}}(i,o,e,n))})),s.display&&l&&u){for(a.save(),a.lineWidth=l,a.strokeStyle=u,a.setLineDash&&(a.setLineDash(En([s.borderDash,o.borderDash,[]])),a.lineDashOffset=En([s.borderDashOffset,o.borderDashOffset,0])),t=i.chart.data.labels.length-1;t>=0;t--)e=i.getDistanceFromCenterForValue(r.ticks.reverse?i.min:i.max),n=i.getPointPosition(t,e),a.beginPath(),a.moveTo(i.xCenter,i.yCenter),a.lineTo(n.x,n.y),a.stroke();a.restore()}},_drawLabels:function(){var t=this,e=t.ctx,n=t.options.ticks;if(n.display){var i,a,r=t.getIndexAngle(0),o=V.options._parseFont(n),s=Nn(n.fontColor,z.global.defaultFontColor);e.save(),e.font=o.string,e.translate(t.xCenter,t.yCenter),e.rotate(r),e.textAlign="center",e.textBaseline="middle",V.each(t.ticks,(function(r,l){(0!==l||n.reverse)&&(i=t.getDistanceFromCenterForValue(t.ticksAsNumbers[l]),n.showLabelBackdrop&&(a=e.measureText(r).width,e.fillStyle=n.backdropColor,e.fillRect(-a/2-n.backdropPaddingX,-i-o.size/2-n.backdropPaddingY,a+2*n.backdropPaddingX,o.size+2*n.backdropPaddingY)),e.fillStyle=s,e.fillText(r,0,-i))})),e.restore()}},_drawTitle:V.noop}),Xn=Wn;Gn._defaults=Xn;var Kn=V._deprecated,Zn=V.options.resolve,$n=V.valueOrDefault,Jn=Number.MIN_SAFE_INTEGER||-9007199254740991,Qn=Number.MAX_SAFE_INTEGER||9007199254740991,ti={millisecond:{common:!0,size:1,steps:1e3},second:{common:!0,size:1e3,steps:60},minute:{common:!0,size:6e4,steps:60},hour:{common:!0,size:36e5,steps:24},day:{common:!0,size:864e5,steps:30},week:{common:!1,size:6048e5,steps:4},month:{common:!0,size:2628e6,steps:12},quarter:{common:!1,size:7884e6,steps:4},year:{common:!0,size:3154e7}},ei=Object.keys(ti);function ni(t,e){return t-e}function ii(t){return V.valueOrDefault(t.time.min,t.ticks.min)}function ai(t){return V.valueOrDefault(t.time.max,t.ticks.max)}function ri(t,e,n,i){var a=function(t,e,n){for(var i,a,r,o=0,s=t.length-1;o>=0&&o<=s;){if(a=t[(i=o+s>>1)-1]||null,r=t[i],!a)return{lo:null,hi:r};if(r[e]<n)o=i+1;else{if(!(a[e]>n))return{lo:a,hi:r};s=i-1}}return{lo:r,hi:null}}(t,e,n),r=a.lo?a.hi?a.lo:t[t.length-2]:t[0],o=a.lo?a.hi?a.hi:t[t.length-1]:t[1],s=o[e]-r[e],l=s?(n-r[e])/s:0,u=(o[i]-r[i])*l;return r[i]+u}function oi(t,e){var n=t._adapter,i=t.options.time,a=i.parser,r=a||i.format,o=e;return"function"==typeof a&&(o=a(o)),V.isFinite(o)||(o="string"==typeof r?n.parse(o,r):n.parse(o)),null!==o?+o:(a||"function"!=typeof r||(o=r(e),V.isFinite(o)||(o=n.parse(o))),o)}function si(t,e){if(V.isNullOrUndef(e))return null;var n=t.options.time,i=oi(t,t.getRightValue(e));return null===i?i:(n.round&&(i=+t._adapter.startOf(i,n.round)),i)}function li(t,e,n,i){var a,r,o,s=ei.length;for(a=ei.indexOf(t);a<s-1;++a)if(o=(r=ti[ei[a]]).steps?r.steps:Qn,r.common&&Math.ceil((n-e)/(o*r.size))<=i)return ei[a];return ei[s-1]}function ui(t,e,n){var i,a,r=[],o={},s=e.length;for(i=0;i<s;++i)o[a=e[i]]=i,r.push({value:a,major:!1});return 0!==s&&n?function(t,e,n,i){var a,r,o=t._adapter,s=+o.startOf(e[0].value,i),l=e[e.length-1].value;for(a=s;a<=l;a=+o.add(a,1,i))(r=n[a])>=0&&(e[r].major=!0);return e}(t,r,o,n):r}var di=xn.extend({initialize:function(){this.mergeTicksOptions(),xn.prototype.initialize.call(this)},update:function(){var t=this,e=t.options,n=e.time||(e.time={}),i=t._adapter=new an._date(e.adapters.date);return Kn("time scale",n.format,"time.format","time.parser"),Kn("time scale",n.min,"time.min","ticks.min"),Kn("time scale",n.max,"time.max","ticks.max"),V.mergeIf(n.displayFormats,i.formats()),xn.prototype.update.apply(t,arguments)},getRightValue:function(t){return t&&void 0!==t.t&&(t=t.t),xn.prototype.getRightValue.call(this,t)},determineDataLimits:function(){var t,e,n,i,a,r,o,s=this,l=s.chart,u=s._adapter,d=s.options,h=d.time.unit||"day",c=Qn,f=Jn,g=[],p=[],m=[],v=s._getLabels();for(t=0,n=v.length;t<n;++t)m.push(si(s,v[t]));for(t=0,n=(l.data.datasets||[]).length;t<n;++t)if(l.isDatasetVisible(t))if(a=l.data.datasets[t].data,V.isObject(a[0]))for(p[t]=[],e=0,i=a.length;e<i;++e)r=si(s,a[e]),g.push(r),p[t][e]=r;else p[t]=m.slice(0),o||(g=g.concat(m),o=!0);else p[t]=[];m.length&&(c=Math.min(c,m[0]),f=Math.max(f,m[m.length-1])),g.length&&(g=n>1?function(t){var e,n,i,a={},r=[];for(e=0,n=t.length;e<n;++e)a[i=t[e]]||(a[i]=!0,r.push(i));return r}(g).sort(ni):g.sort(ni),c=Math.min(c,g[0]),f=Math.max(f,g[g.length-1])),c=si(s,ii(d))||c,f=si(s,ai(d))||f,c=c===Qn?+u.startOf(Date.now(),h):c,f=f===Jn?+u.endOf(Date.now(),h)+1:f,s.min=Math.min(c,f),s.max=Math.max(c+1,f),s._table=[],s._timestamps={data:g,datasets:p,labels:m}},buildTicks:function(){var t,e,n,i=this,a=i.min,r=i.max,o=i.options,s=o.ticks,l=o.time,u=i._timestamps,d=[],h=i.getLabelCapacity(a),c=s.source,f=o.distribution;for(u="data"===c||"auto"===c&&"series"===f?u.data:"labels"===c?u.labels:function(t,e,n,i){var a,r=t._adapter,o=t.options,s=o.time,l=s.unit||li(s.minUnit,e,n,i),u=Zn([s.stepSize,s.unitStepSize,1]),d="week"===l&&s.isoWeekday,h=e,c=[];if(d&&(h=+r.startOf(h,"isoWeek",d)),h=+r.startOf(h,d?"day":l),r.diff(n,e,l)>1e5*u)throw e+" and "+n+" are too far apart with stepSize of "+u+" "+l;for(a=h;a<n;a=+r.add(a,u,l))c.push(a);return a!==n&&"ticks"!==o.bounds||c.push(a),c}(i,a,r,h),"ticks"===o.bounds&&u.length&&(a=u[0],r=u[u.length-1]),a=si(i,ii(o))||a,r=si(i,ai(o))||r,t=0,e=u.length;t<e;++t)(n=u[t])>=a&&n<=r&&d.push(n);return i.min=a,i.max=r,i._unit=l.unit||(s.autoSkip?li(l.minUnit,i.min,i.max,h):function(t,e,n,i,a){var r,o;for(r=ei.length-1;r>=ei.indexOf(n);r--)if(o=ei[r],ti[o].common&&t._adapter.diff(a,i,o)>=e-1)return o;return ei[n?ei.indexOf(n):0]}(i,d.length,l.minUnit,i.min,i.max)),i._majorUnit=s.major.enabled&&"year"!==i._unit?function(t){for(var e=ei.indexOf(t)+1,n=ei.length;e<n;++e)if(ti[ei[e]].common)return ei[e]}(i._unit):void 0,i._table=function(t,e,n,i){if("linear"===i||!t.length)return[{time:e,pos:0},{time:n,pos:1}];var a,r,o,s,l,u=[],d=[e];for(a=0,r=t.length;a<r;++a)(s=t[a])>e&&s<n&&d.push(s);for(d.push(n),a=0,r=d.length;a<r;++a)l=d[a+1],o=d[a-1],s=d[a],void 0!==o&&void 0!==l&&Math.round((l+o)/2)===s||u.push({time:s,pos:a/(r-1)});return u}(i._timestamps.data,a,r,f),i._offsets=function(t,e,n,i,a){var r,o,s=0,l=0;return a.offset&&e.length&&(r=ri(t,"time",e[0],"pos"),s=1===e.length?1-r:(ri(t,"time",e[1],"pos")-r)/2,o=ri(t,"time",e[e.length-1],"pos"),l=1===e.length?o:(o-ri(t,"time",e[e.length-2],"pos"))/2),{start:s,end:l,factor:1/(s+1+l)}}(i._table,d,0,0,o),s.reverse&&d.reverse(),ui(i,d,i._majorUnit)},getLabelForIndex:function(t,e){var n=this,i=n._adapter,a=n.chart.data,r=n.options.time,o=a.labels&&t<a.labels.length?a.labels[t]:"",s=a.datasets[e].data[t];return V.isObject(s)&&(o=n.getRightValue(s)),r.tooltipFormat?i.format(oi(n,o),r.tooltipFormat):"string"==typeof o?o:i.format(oi(n,o),r.displayFormats.datetime)},tickFormatFunction:function(t,e,n,i){var a=this._adapter,r=this.options,o=r.time.displayFormats,s=o[this._unit],l=this._majorUnit,u=o[l],d=n[e],h=r.ticks,c=l&&u&&d&&d.major,f=a.format(t,i||(c?u:s)),g=c?h.major:h.minor,p=Zn([g.callback,g.userCallback,h.callback,h.userCallback]);return p?p(f,e,n):f},convertTicksToLabels:function(t){var e,n,i=[];for(e=0,n=t.length;e<n;++e)i.push(this.tickFormatFunction(t[e].value,e,t));return i},getPixelForOffset:function(t){var e=this._offsets,n=ri(this._table,"time",t,"pos");return this.getPixelForDecimal((e.start+n)*e.factor)},getPixelForValue:function(t,e,n){var i=null;if(void 0!==e&&void 0!==n&&(i=this._timestamps.datasets[n][e]),null===i&&(i=si(this,t)),null!==i)return this.getPixelForOffset(i)},getPixelForTick:function(t){var e=this.getTicks();return t>=0&&t<e.length?this.getPixelForOffset(e[t].value):null},getValueForPixel:function(t){var e=this._offsets,n=this.getDecimalForPixel(t)/e.factor-e.end,i=ri(this._table,"pos",n,"time");return this._adapter._create(i)},_getLabelSize:function(t){var e=this.options.ticks,n=this.ctx.measureText(t).width,i=V.toRadians(this.isHorizontal()?e.maxRotation:e.minRotation),a=Math.cos(i),r=Math.sin(i),o=$n(e.fontSize,z.global.defaultFontSize);return{w:n*a+o*r,h:n*r+o*a}},getLabelWidth:function(t){return this._getLabelSize(t).w},getLabelCapacity:function(t){var e=this,n=e.options.time,i=n.displayFormats,a=i[n.unit]||i.millisecond,r=e.tickFormatFunction(t,0,ui(e,[t],e._majorUnit),a),o=e._getLabelSize(r),s=Math.floor(e.isHorizontal()?e.width/o.w:e.height/o.h);return e.options.offset&&s--,s>0?s:1}}),hi={position:"bottom",distribution:"linear",bounds:"data",adapters:{},time:{parser:!1,unit:!1,round:!1,displayFormat:!1,isoWeekday:!1,minUnit:"millisecond",displayFormats:{}},ticks:{autoSkip:!1,source:"auto",major:{enabled:!1}}};di._defaults=hi;var ci={category:_n,linear:Dn,logarithmic:Rn,radialLinear:Gn,time:di},fi={datetime:"MMM D, YYYY, h:mm:ss a",millisecond:"h:mm:ss.SSS a",second:"h:mm:ss a",minute:"h:mm a",hour:"hA",day:"MMM D",week:"ll",month:"MMM YYYY",quarter:"[Q]Q - YYYY",year:"YYYY"};an._date.override("function"==typeof t?{_id:"moment",formats:function(){return fi},parse:function(e,n){return"string"==typeof e&&"string"==typeof n?e=t(e,n):e instanceof t||(e=t(e)),e.isValid()?e.valueOf():null},format:function(e,n){return t(e).format(n)},add:function(e,n,i){return t(e).add(n,i).valueOf()},diff:function(e,n,i){return t(e).diff(t(n),i)},startOf:function(e,n,i){return e=t(e),"isoWeek"===n?e.isoWeekday(i).valueOf():e.startOf(n).valueOf()},endOf:function(e,n){return t(e).endOf(n).valueOf()},_create:function(e){return t(e)}}:{}),z._set("global",{plugins:{filler:{propagate:!0}}});var gi={dataset:function(t){var e=t.fill,n=t.chart,i=n.getDatasetMeta(e),a=i&&n.isDatasetVisible(e)&&i.dataset._children||[],r=a.length||0;return r?function(t,e){return e<r&&a[e]._view||null}:null},boundary:function(t){var e=t.boundary,n=e?e.x:null,i=e?e.y:null;return V.isArray(e)?function(t,n){return e[n]}:function(t){return{x:null===n?t.x:n,y:null===i?t.y:i}}}};function pi(t,e,n){var i,a=t._model||{},r=a.fill;if(void 0===r&&(r=!!a.backgroundColor),!1===r||null===r)return!1;if(!0===r)return"origin";if(i=parseFloat(r,10),isFinite(i)&&Math.floor(i)===i)return"-"!==r[0]&&"+"!==r[0]||(i=e+i),!(i===e||i<0||i>=n)&&i;switch(r){case"bottom":return"start";case"top":return"end";case"zero":return"origin";case"origin":case"start":case"end":return r;default:return!1}}function mi(t){return(t.el._scale||{}).getPointPositionForValue?function(t){var e,n,i,a,r,o=t.el._scale,s=o.options,l=o.chart.data.labels.length,u=t.fill,d=[];if(!l)return null;for(e=s.ticks.reverse?o.max:o.min,n=s.ticks.reverse?o.min:o.max,i=o.getPointPositionForValue(0,e),a=0;a<l;++a)r="start"===u||"end"===u?o.getPointPositionForValue(a,"start"===u?e:n):o.getBasePosition(a),s.gridLines.circular&&(r.cx=i.x,r.cy=i.y,r.angle=o.getIndexAngle(a)-Math.PI/2),d.push(r);return d}(t):function(t){var e,n=t.el._model||{},i=t.el._scale||{},a=t.fill,r=null;if(isFinite(a))return null;if("start"===a?r=void 0===n.scaleBottom?i.bottom:n.scaleBottom:"end"===a?r=void 0===n.scaleTop?i.top:n.scaleTop:void 0!==n.scaleZero?r=n.scaleZero:i.getBasePixel&&(r=i.getBasePixel()),null!=r){if(void 0!==r.x&&void 0!==r.y)return r;if(V.isFinite(r))return{x:(e=i.isHorizontal())?r:null,y:e?null:r}}return null}(t)}function vi(t,e,n){var i,a=t[e].fill,r=[e];if(!n)return a;for(;!1!==a&&-1===r.indexOf(a);){if(!isFinite(a))return a;if(!(i=t[a]))return!1;if(i.visible)return a;r.push(a),a=i.fill}return!1}function bi(t){var e=t.fill,n="dataset";return!1===e?null:(isFinite(e)||(n="boundary"),gi[n](t))}function xi(t){return t&&!t.skip}function yi(t,e,n,i,a){var r,o,s,l;if(i&&a){for(t.moveTo(e[0].x,e[0].y),r=1;r<i;++r)V.canvas.lineTo(t,e[r-1],e[r]);if(void 0===n[0].angle)for(t.lineTo(n[a-1].x,n[a-1].y),r=a-1;r>0;--r)V.canvas.lineTo(t,n[r],n[r-1],!0);else for(o=n[0].cx,s=n[0].cy,l=Math.sqrt(Math.pow(n[0].x-o,2)+Math.pow(n[0].y-s,2)),r=a-1;r>0;--r)t.arc(o,s,l,n[r].angle,n[r-1].angle,!0)}}function _i(t,e,n,i,a,r){var o,s,l,u,d,h,c,f,g=e.length,p=i.spanGaps,m=[],v=[],b=0,x=0;for(t.beginPath(),o=0,s=g;o<s;++o)d=n(u=e[l=o%g]._view,l,i),h=xi(u),c=xi(d),r&&void 0===f&&h&&(s=g+(f=o+1)),h&&c?(b=m.push(u),x=v.push(d)):b&&x&&(p?(h&&m.push(u),c&&v.push(d)):(yi(t,m,v,b,x),b=x=0,m=[],v=[]));yi(t,m,v,b,x),t.closePath(),t.fillStyle=a,t.fill()}var ki={id:"filler",afterDatasetsUpdate:function(t,e){var n,i,a,r,o=(t.data.datasets||[]).length,s=e.propagate,l=[];for(i=0;i<o;++i)r=null,(a=(n=t.getDatasetMeta(i)).dataset)&&a._model&&a instanceof _t.Line&&(r={visible:t.isDatasetVisible(i),fill:pi(a,i,o),chart:t,el:a}),n.$filler=r,l.push(r);for(i=0;i<o;++i)(r=l[i])&&(r.fill=vi(l,i,s),r.boundary=mi(r),r.mapper=bi(r))},beforeDatasetsDraw:function(t){var e,n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas(),u=t.ctx;for(n=l.length-1;n>=0;--n)(e=l[n].$filler)&&e.visible&&(a=(i=e.el)._view,r=i._children||[],o=e.mapper,s=a.backgroundColor||z.global.defaultColor,o&&s&&r.length&&(V.canvas.clipArea(u,t.chartArea),_i(u,r,o,a,s,i._loop),V.canvas.unclipArea(u)))}},wi=V.rtl.getRtlAdapter,Mi=V.noop,Si=V.valueOrDefault;function Ci(t,e){return t.usePointStyle&&t.boxWidth>e?e:t.boxWidth}z._set("global",{legend:{display:!0,position:"top",align:"center",fullWidth:!0,reverse:!1,weight:1e3,onClick:function(t,e){var n=e.datasetIndex,i=this.chart,a=i.getDatasetMeta(n);a.hidden=null===a.hidden?!i.data.datasets[n].hidden:null,i.update()},onHover:null,onLeave:null,labels:{boxWidth:40,padding:10,generateLabels:function(t){var e=t.data.datasets,n=t.options.legend||{},i=n.labels&&n.labels.usePointStyle;return t._getSortedDatasetMetas().map((function(n){var a=n.controller.getStyle(i?0:void 0);return{text:e[n.index].label,fillStyle:a.backgroundColor,hidden:!t.isDatasetVisible(n.index),lineCap:a.borderCapStyle,lineDash:a.borderDash,lineDashOffset:a.borderDashOffset,lineJoin:a.borderJoinStyle,lineWidth:a.borderWidth,strokeStyle:a.borderColor,pointStyle:a.pointStyle,rotation:a.rotation,datasetIndex:n.index}}),this)}}},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data.datasets;for(a.setAttribute("class",t.id+"-legend"),e=0,n=r.length;e<n;e++)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=r[e].backgroundColor,r[e].label&&i.appendChild(document.createTextNode(r[e].label));return a.outerHTML}});var Pi=X.extend({initialize:function(t){V.extend(this,t),this.legendHitBoxes=[],this._hoveredItem=null,this.doughnutMode=!1},beforeUpdate:Mi,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Mi,beforeSetDimensions:Mi,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Mi,beforeBuildLabels:Mi,buildLabels:function(){var t=this,e=t.options.labels||{},n=V.callback(e.generateLabels,[t.chart],t)||[];e.filter&&(n=n.filter((function(n){return e.filter(n,t.chart.data)}))),t.options.reverse&&n.reverse(),t.legendItems=n},afterBuildLabels:Mi,beforeFit:Mi,fit:function(){var t=this,e=t.options,n=e.labels,i=e.display,a=t.ctx,r=V.options._parseFont(n),o=r.size,s=t.legendHitBoxes=[],l=t.minSize,u=t.isHorizontal();if(u?(l.width=t.maxWidth,l.height=i?10:0):(l.width=i?10:0,l.height=t.maxHeight),i){if(a.font=r.string,u){var d=t.lineWidths=[0],h=0;a.textAlign="left",a.textBaseline="middle",V.each(t.legendItems,(function(t,e){var i=Ci(n,o)+o/2+a.measureText(t.text).width;(0===e||d[d.length-1]+i+2*n.padding>l.width)&&(h+=o+n.padding,d[d.length-(e>0?0:1)]=0),s[e]={left:0,top:0,width:i,height:o},d[d.length-1]+=i+n.padding})),l.height+=h}else{var c=n.padding,f=t.columnWidths=[],g=t.columnHeights=[],p=n.padding,m=0,v=0;V.each(t.legendItems,(function(t,e){var i=Ci(n,o)+o/2+a.measureText(t.text).width;e>0&&v+o+2*c>l.height&&(p+=m+n.padding,f.push(m),g.push(v),m=0,v=0),m=Math.max(m,i),v+=o+c,s[e]={left:0,top:0,width:i,height:o}})),p+=m,f.push(m),g.push(v),l.width+=p}t.width=l.width,t.height=l.height}else t.width=l.width=t.height=l.height=0},afterFit:Mi,isHorizontal:function(){return"top"===this.options.position||"bottom"===this.options.position},draw:function(){var t=this,e=t.options,n=e.labels,i=z.global,a=i.defaultColor,r=i.elements.line,o=t.height,s=t.columnHeights,l=t.width,u=t.lineWidths;if(e.display){var d,h=wi(e.rtl,t.left,t.minSize.width),c=t.ctx,f=Si(n.fontColor,i.defaultFontColor),g=V.options._parseFont(n),p=g.size;c.textAlign=h.textAlign("left"),c.textBaseline="middle",c.lineWidth=.5,c.strokeStyle=f,c.fillStyle=f,c.font=g.string;var m=Ci(n,p),v=t.legendHitBoxes,b=function(t,i){switch(e.align){case"start":return n.padding;case"end":return t-i;default:return(t-i+n.padding)/2}},x=t.isHorizontal();d=x?{x:t.left+b(l,u[0]),y:t.top+n.padding,line:0}:{x:t.left+n.padding,y:t.top+b(o,s[0]),line:0},V.rtl.overrideTextDirection(t.ctx,e.textDirection);var y=p+n.padding;V.each(t.legendItems,(function(e,i){var f=c.measureText(e.text).width,g=m+p/2+f,_=d.x,k=d.y;h.setWidth(t.minSize.width),x?i>0&&_+g+n.padding>t.left+t.minSize.width&&(k=d.y+=y,d.line++,_=d.x=t.left+b(l,u[d.line])):i>0&&k+y>t.top+t.minSize.height&&(_=d.x=_+t.columnWidths[d.line]+n.padding,d.line++,k=d.y=t.top+b(o,s[d.line]));var w=h.x(_);!function(t,e,i){if(!(isNaN(m)||m<=0)){c.save();var o=Si(i.lineWidth,r.borderWidth);if(c.fillStyle=Si(i.fillStyle,a),c.lineCap=Si(i.lineCap,r.borderCapStyle),c.lineDashOffset=Si(i.lineDashOffset,r.borderDashOffset),c.lineJoin=Si(i.lineJoin,r.borderJoinStyle),c.lineWidth=o,c.strokeStyle=Si(i.strokeStyle,a),c.setLineDash&&c.setLineDash(Si(i.lineDash,r.borderDash)),n&&n.usePointStyle){var s=m*Math.SQRT2/2,l=h.xPlus(t,m/2),u=e+p/2;V.canvas.drawPoint(c,i.pointStyle,s,l,u,i.rotation)}else c.fillRect(h.leftForLtr(t,m),e,m,p),0!==o&&c.strokeRect(h.leftForLtr(t,m),e,m,p);c.restore()}}(w,k,e),v[i].left=h.leftForLtr(w,v[i].width),v[i].top=k,function(t,e,n,i){var a=p/2,r=h.xPlus(t,m+a),o=e+a;c.fillText(n.text,r,o),n.hidden&&(c.beginPath(),c.lineWidth=2,c.moveTo(r,o),c.lineTo(h.xPlus(r,i),o),c.stroke())}(w,k,e,f),x?d.x+=g+n.padding:d.y+=y})),V.rtl.restoreTextDirection(t.ctx,e.textDirection)}},_getLegendItemAt:function(t,e){var n,i,a,r=this;if(t>=r.left&&t<=r.right&&e>=r.top&&e<=r.bottom)for(a=r.legendHitBoxes,n=0;n<a.length;++n)if(t>=(i=a[n]).left&&t<=i.left+i.width&&e>=i.top&&e<=i.top+i.height)return r.legendItems[n];return null},handleEvent:function(t){var e,n=this,i=n.options,a="mouseup"===t.type?"click":t.type;if("mousemove"===a){if(!i.onHover&&!i.onLeave)return}else{if("click"!==a)return;if(!i.onClick)return}e=n._getLegendItemAt(t.x,t.y),"click"===a?e&&i.onClick&&i.onClick.call(n,t.native,e):(i.onLeave&&e!==n._hoveredItem&&(n._hoveredItem&&i.onLeave.call(n,t.native,n._hoveredItem),n._hoveredItem=e),i.onHover&&e&&i.onHover.call(n,t.native,e))}});function Ai(t,e){var n=new Pi({ctx:t.ctx,options:e,chart:t});ge.configure(t,n,e),ge.addBox(t,n),t.legend=n}var Di={id:"legend",_element:Pi,beforeInit:function(t){var e=t.options.legend;e&&Ai(t,e)},beforeUpdate:function(t){var e=t.options.legend,n=t.legend;e?(V.mergeIf(e,z.global.legend),n?(ge.configure(t,n,e),n.options=e):Ai(t,e)):n&&(ge.removeBox(t,n),delete t.legend)},afterEvent:function(t,e){var n=t.legend;n&&n.handleEvent(e)}},Ti=V.noop;z._set("global",{title:{display:!1,fontStyle:"bold",fullWidth:!0,padding:10,position:"top",text:"",weight:2e3}});var Ii=X.extend({initialize:function(t){V.extend(this,t),this.legendHitBoxes=[]},beforeUpdate:Ti,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Ti,beforeSetDimensions:Ti,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Ti,beforeBuildLabels:Ti,buildLabels:Ti,afterBuildLabels:Ti,beforeFit:Ti,fit:function(){var t,e=this,n=e.options,i=e.minSize={},a=e.isHorizontal();n.display?(t=(V.isArray(n.text)?n.text.length:1)*V.options._parseFont(n).lineHeight+2*n.padding,e.width=i.width=a?e.maxWidth:t,e.height=i.height=a?t:e.maxHeight):e.width=i.width=e.height=i.height=0},afterFit:Ti,isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},draw:function(){var t=this,e=t.ctx,n=t.options;if(n.display){var i,a,r,o=V.options._parseFont(n),s=o.lineHeight,l=s/2+n.padding,u=0,d=t.top,h=t.left,c=t.bottom,f=t.right;e.fillStyle=V.valueOrDefault(n.fontColor,z.global.defaultFontColor),e.font=o.string,t.isHorizontal()?(a=h+(f-h)/2,r=d+l,i=f-h):(a="left"===n.position?h+l:f-l,r=d+(c-d)/2,i=c-d,u=Math.PI*("left"===n.position?-.5:.5)),e.save(),e.translate(a,r),e.rotate(u),e.textAlign="center",e.textBaseline="middle";var g=n.text;if(V.isArray(g))for(var p=0,m=0;m<g.length;++m)e.fillText(g[m],0,p,i),p+=s;else e.fillText(g,0,0,i);e.restore()}}});function Fi(t,e){var n=new Ii({ctx:t.ctx,options:e,chart:t});ge.configure(t,n,e),ge.addBox(t,n),t.titleBlock=n}var Li={},Oi=ki,Ri=Di,zi={id:"title",_element:Ii,beforeInit:function(t){var e=t.options.title;e&&Fi(t,e)},beforeUpdate:function(t){var e=t.options.title,n=t.titleBlock;e?(V.mergeIf(e,z.global.title),n?(ge.configure(t,n,e),n.options=e):Fi(t,e)):n&&(ge.removeBox(t,n),delete t.titleBlock)}};for(var Ni in Li.filler=Oi,Li.legend=Ri,Li.title=zi,tn.helpers=V,function(){function t(t,e,n){var i;return"string"==typeof t?(i=parseInt(t,10),-1!==t.indexOf("%")&&(i=i/100*e.parentNode[n])):i=t,i}function e(t){return null!=t&&"none"!==t}function n(n,i,a){var r=document.defaultView,o=V._getParentNode(n),s=r.getComputedStyle(n)[i],l=r.getComputedStyle(o)[i],u=e(s),d=e(l),h=Number.POSITIVE_INFINITY;return u||d?Math.min(u?t(s,n,a):h,d?t(l,o,a):h):"none"}V.where=function(t,e){if(V.isArray(t)&&Array.prototype.filter)return t.filter(e);var n=[];return V.each(t,(function(t){e(t)&&n.push(t)})),n},V.findIndex=Array.prototype.findIndex?function(t,e,n){return t.findIndex(e,n)}:function(t,e,n){n=void 0===n?t:n;for(var i=0,a=t.length;i<a;++i)if(e.call(n,t[i],i,t))return i;return-1},V.findNextWhere=function(t,e,n){V.isNullOrUndef(n)&&(n=-1);for(var i=n+1;i<t.length;i++){var a=t[i];if(e(a))return a}},V.findPreviousWhere=function(t,e,n){V.isNullOrUndef(n)&&(n=t.length);for(var i=n-1;i>=0;i--){var a=t[i];if(e(a))return a}},V.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},V.almostEquals=function(t,e,n){return Math.abs(t-e)<n},V.almostWhole=function(t,e){var n=Math.round(t);return n-e<=t&&n+e>=t},V.max=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.max(t,e)}),Number.NEGATIVE_INFINITY)},V.min=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.min(t,e)}),Number.POSITIVE_INFINITY)},V.sign=Math.sign?function(t){return Math.sign(t)}:function(t){return 0===(t=+t)||isNaN(t)?t:t>0?1:-1},V.toRadians=function(t){return t*(Math.PI/180)},V.toDegrees=function(t){return t*(180/Math.PI)},V._decimalPlaces=function(t){if(V.isFinite(t)){for(var e=1,n=0;Math.round(t*e)/e!==t;)e*=10,n++;return n}},V.getAngleFromPoint=function(t,e){var n=e.x-t.x,i=e.y-t.y,a=Math.sqrt(n*n+i*i),r=Math.atan2(i,n);return r<-.5*Math.PI&&(r+=2*Math.PI),{angle:r,distance:a}},V.distanceBetweenPoints=function(t,e){return Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2))},V.aliasPixel=function(t){return t%2==0?0:.5},V._alignPixel=function(t,e,n){var i=t.currentDevicePixelRatio,a=n/2;return Math.round((e-a)*i)/i+a},V.splineCurve=function(t,e,n,i){var a=t.skip?e:t,r=e,o=n.skip?e:n,s=Math.sqrt(Math.pow(r.x-a.x,2)+Math.pow(r.y-a.y,2)),l=Math.sqrt(Math.pow(o.x-r.x,2)+Math.pow(o.y-r.y,2)),u=s/(s+l),d=l/(s+l),h=i*(u=isNaN(u)?0:u),c=i*(d=isNaN(d)?0:d);return{previous:{x:r.x-h*(o.x-a.x),y:r.y-h*(o.y-a.y)},next:{x:r.x+c*(o.x-a.x),y:r.y+c*(o.y-a.y)}}},V.EPSILON=Number.EPSILON||1e-14,V.splineCurveMonotone=function(t){var e,n,i,a,r,o,s,l,u,d=(t||[]).map((function(t){return{model:t._model,deltaK:0,mK:0}})),h=d.length;for(e=0;e<h;++e)if(!(i=d[e]).model.skip){if(n=e>0?d[e-1]:null,(a=e<h-1?d[e+1]:null)&&!a.model.skip){var c=a.model.x-i.model.x;i.deltaK=0!==c?(a.model.y-i.model.y)/c:0}!n||n.model.skip?i.mK=i.deltaK:!a||a.model.skip?i.mK=n.deltaK:this.sign(n.deltaK)!==this.sign(i.deltaK)?i.mK=0:i.mK=(n.deltaK+i.deltaK)/2}for(e=0;e<h-1;++e)i=d[e],a=d[e+1],i.model.skip||a.model.skip||(V.almostEquals(i.deltaK,0,this.EPSILON)?i.mK=a.mK=0:(r=i.mK/i.deltaK,o=a.mK/i.deltaK,(l=Math.pow(r,2)+Math.pow(o,2))<=9||(s=3/Math.sqrt(l),i.mK=r*s*i.deltaK,a.mK=o*s*i.deltaK)));for(e=0;e<h;++e)(i=d[e]).model.skip||(n=e>0?d[e-1]:null,a=e<h-1?d[e+1]:null,n&&!n.model.skip&&(u=(i.model.x-n.model.x)/3,i.model.controlPointPreviousX=i.model.x-u,i.model.controlPointPreviousY=i.model.y-u*i.mK),a&&!a.model.skip&&(u=(a.model.x-i.model.x)/3,i.model.controlPointNextX=i.model.x+u,i.model.controlPointNextY=i.model.y+u*i.mK))},V.nextItem=function(t,e,n){return n?e>=t.length-1?t[0]:t[e+1]:e>=t.length-1?t[t.length-1]:t[e+1]},V.previousItem=function(t,e,n){return n?e<=0?t[t.length-1]:t[e-1]:e<=0?t[0]:t[e-1]},V.niceNum=function(t,e){var n=Math.floor(V.log10(t)),i=t/Math.pow(10,n);return(e?i<1.5?1:i<3?2:i<7?5:10:i<=1?1:i<=2?2:i<=5?5:10)*Math.pow(10,n)},V.requestAnimFrame="undefined"==typeof window?function(t){t()}:window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)},V.getRelativePosition=function(t,e){var n,i,a=t.originalEvent||t,r=t.target||t.srcElement,o=r.getBoundingClientRect(),s=a.touches;s&&s.length>0?(n=s[0].clientX,i=s[0].clientY):(n=a.clientX,i=a.clientY);var l=parseFloat(V.getStyle(r,"padding-left")),u=parseFloat(V.getStyle(r,"padding-top")),d=parseFloat(V.getStyle(r,"padding-right")),h=parseFloat(V.getStyle(r,"padding-bottom")),c=o.right-o.left-l-d,f=o.bottom-o.top-u-h;return{x:n=Math.round((n-o.left-l)/c*r.width/e.currentDevicePixelRatio),y:i=Math.round((i-o.top-u)/f*r.height/e.currentDevicePixelRatio)}},V.getConstraintWidth=function(t){return n(t,"max-width","clientWidth")},V.getConstraintHeight=function(t){return n(t,"max-height","clientHeight")},V._calculatePadding=function(t,e,n){return(e=V.getStyle(t,e)).indexOf("%")>-1?n*parseInt(e,10)/100:parseInt(e,10)},V._getParentNode=function(t){var e=t.parentNode;return e&&"[object ShadowRoot]"===e.toString()&&(e=e.host),e},V.getMaximumWidth=function(t){var e=V._getParentNode(t);if(!e)return t.clientWidth;var n=e.clientWidth,i=n-V._calculatePadding(e,"padding-left",n)-V._calculatePadding(e,"padding-right",n),a=V.getConstraintWidth(t);return isNaN(a)?i:Math.min(i,a)},V.getMaximumHeight=function(t){var e=V._getParentNode(t);if(!e)return t.clientHeight;var n=e.clientHeight,i=n-V._calculatePadding(e,"padding-top",n)-V._calculatePadding(e,"padding-bottom",n),a=V.getConstraintHeight(t);return isNaN(a)?i:Math.min(i,a)},V.getStyle=function(t,e){return t.currentStyle?t.currentStyle[e]:document.defaultView.getComputedStyle(t,null).getPropertyValue(e)},V.retinaScale=function(t,e){var n=t.currentDevicePixelRatio=e||"undefined"!=typeof window&&window.devicePixelRatio||1;if(1!==n){var i=t.canvas,a=t.height,r=t.width;i.height=a*n,i.width=r*n,t.ctx.scale(n,n),i.style.height||i.style.width||(i.style.height=a+"px",i.style.width=r+"px")}},V.fontString=function(t,e,n){return e+" "+t+"px "+n},V.longestText=function(t,e,n,i){var a=(i=i||{}).data=i.data||{},r=i.garbageCollect=i.garbageCollect||[];i.font!==e&&(a=i.data={},r=i.garbageCollect=[],i.font=e),t.font=e;var o,s,l,u,d,h=0,c=n.length;for(o=0;o<c;o++)if(null!=(u=n[o])&&!0!==V.isArray(u))h=V.measureText(t,a,r,h,u);else if(V.isArray(u))for(s=0,l=u.length;s<l;s++)null==(d=u[s])||V.isArray(d)||(h=V.measureText(t,a,r,h,d));var f=r.length/2;if(f>n.length){for(o=0;o<f;o++)delete a[r[o]];r.splice(0,f)}return h},V.measureText=function(t,e,n,i,a){var r=e[a];return r||(r=e[a]=t.measureText(a).width,n.push(a)),r>i&&(i=r),i},V.numberOfLabelLines=function(t){var e=1;return V.each(t,(function(t){V.isArray(t)&&t.length>e&&(e=t.length)})),e},V.color=k?function(t){return t instanceof CanvasGradient&&(t=z.global.defaultColor),k(t)}:function(t){return console.error("Color.js not found!"),t},V.getHoverColor=function(t){return t instanceof CanvasPattern||t instanceof CanvasGradient?t:V.color(t).saturate(.5).darken(.1).rgbString()}}(),tn._adapters=an,tn.Animation=Z,tn.animationService=$,tn.controllers=$t,tn.DatasetController=nt,tn.defaults=z,tn.Element=X,tn.elements=_t,tn.Interaction=ae,tn.layouts=ge,tn.platform=Fe,tn.plugins=Le,tn.Scale=xn,tn.scaleService=Oe,tn.Ticks=rn,tn.Tooltip=Ue,tn.helpers.each(ci,(function(t,e){tn.scaleService.registerScaleType(e,t,t._defaults)})),Li)Li.hasOwnProperty(Ni)&&tn.plugins.register(Li[Ni]);tn.platform.initialize();var Bi=tn;return"undefined"!=typeof window&&(window.Chart=tn),tn.Chart=tn,tn.Legend=Li.legend._element,tn.Title=Li.title._element,tn.pluginService=tn.plugins,tn.PluginBase=tn.Element.extend({}),tn.canvasHelpers=tn.helpers.canvas,tn.layoutService=tn.layouts,tn.LinearScaleBase=Sn,tn.helpers.each(["Bar","Bubble","Doughnut","Line","PolarArea","Radar","Scatter"],(function(t){tn[t]=function(e,n){return new tn(e,tn.helpers.merge(n||{},{type:t.charAt(0).toLowerCase()+t.slice(1)}))}})),Bi}));
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(function(){try{return require("moment")}catch(t){}}()):"function"==typeof define&&define.amd?define(["require"],(function(t){return e(function(){try{return t("moment")}catch(t){}}())})):(t=t||self).Chart=e(t.moment)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var e={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},n=function(t,e){return t(e={exports:{}},e.exports),e.exports}((function(t){var n={};for(var i in e)e.hasOwnProperty(i)&&(n[e[i]]=i);var a=t.exports={rgb:{channels:3,labels:"rgb"},hsl:{channels:3,labels:"hsl"},hsv:{channels:3,labels:"hsv"},hwb:{channels:3,labels:"hwb"},cmyk:{channels:4,labels:"cmyk"},xyz:{channels:3,labels:"xyz"},lab:{channels:3,labels:"lab"},lch:{channels:3,labels:"lch"},hex:{channels:1,labels:["hex"]},keyword:{channels:1,labels:["keyword"]},ansi16:{channels:1,labels:["ansi16"]},ansi256:{channels:1,labels:["ansi256"]},hcg:{channels:3,labels:["h","c","g"]},apple:{channels:3,labels:["r16","g16","b16"]},gray:{channels:1,labels:["gray"]}};for(var r in a)if(a.hasOwnProperty(r)){if(!("channels"in a[r]))throw new Error("missing channels property: "+r);if(!("labels"in a[r]))throw new Error("missing channel labels property: "+r);if(a[r].labels.length!==a[r].channels)throw new Error("channel and label counts mismatch: "+r);var o=a[r].channels,s=a[r].labels;delete a[r].channels,delete a[r].labels,Object.defineProperty(a[r],"channels",{value:o}),Object.defineProperty(a[r],"labels",{value:s})}a.rgb.hsl=function(t){var e,n,i=t[0]/255,a=t[1]/255,r=t[2]/255,o=Math.min(i,a,r),s=Math.max(i,a,r),l=s-o;return s===o?e=0:i===s?e=(a-r)/l:a===s?e=2+(r-i)/l:r===s&&(e=4+(i-a)/l),(e=Math.min(60*e,360))<0&&(e+=360),n=(o+s)/2,[e,100*(s===o?0:n<=.5?l/(s+o):l/(2-s-o)),100*n]},a.rgb.hsv=function(t){var e,n,i,a,r,o=t[0]/255,s=t[1]/255,l=t[2]/255,u=Math.max(o,s,l),d=u-Math.min(o,s,l),h=function(t){return(u-t)/6/d+.5};return 0===d?a=r=0:(r=d/u,e=h(o),n=h(s),i=h(l),o===u?a=i-n:s===u?a=1/3+e-i:l===u&&(a=2/3+n-e),a<0?a+=1:a>1&&(a-=1)),[360*a,100*r,100*u]},a.rgb.hwb=function(t){var e=t[0],n=t[1],i=t[2];return[a.rgb.hsl(t)[0],100*(1/255*Math.min(e,Math.min(n,i))),100*(i=1-1/255*Math.max(e,Math.max(n,i)))]},a.rgb.cmyk=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255;return[100*((1-n-(e=Math.min(1-n,1-i,1-a)))/(1-e)||0),100*((1-i-e)/(1-e)||0),100*((1-a-e)/(1-e)||0),100*e]},a.rgb.keyword=function(t){var i=n[t];if(i)return i;var a,r,o,s=1/0;for(var l in e)if(e.hasOwnProperty(l)){var u=e[l],d=(r=t,o=u,Math.pow(r[0]-o[0],2)+Math.pow(r[1]-o[1],2)+Math.pow(r[2]-o[2],2));d<s&&(s=d,a=l)}return a},a.keyword.rgb=function(t){return e[t]},a.rgb.xyz=function(t){var e=t[0]/255,n=t[1]/255,i=t[2]/255;return[100*(.4124*(e=e>.04045?Math.pow((e+.055)/1.055,2.4):e/12.92)+.3576*(n=n>.04045?Math.pow((n+.055)/1.055,2.4):n/12.92)+.1805*(i=i>.04045?Math.pow((i+.055)/1.055,2.4):i/12.92)),100*(.2126*e+.7152*n+.0722*i),100*(.0193*e+.1192*n+.9505*i)]},a.rgb.lab=function(t){var e=a.rgb.xyz(t),n=e[0],i=e[1],r=e[2];return i/=100,r/=108.883,n=(n/=95.047)>.008856?Math.pow(n,1/3):7.787*n+16/116,[116*(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116)-16,500*(n-i),200*(i-(r=r>.008856?Math.pow(r,1/3):7.787*r+16/116))]},a.hsl.rgb=function(t){var e,n,i,a,r,o=t[0]/360,s=t[1]/100,l=t[2]/100;if(0===s)return[r=255*l,r,r];e=2*l-(n=l<.5?l*(1+s):l+s-l*s),a=[0,0,0];for(var u=0;u<3;u++)(i=o+1/3*-(u-1))<0&&i++,i>1&&i--,r=6*i<1?e+6*(n-e)*i:2*i<1?n:3*i<2?e+(n-e)*(2/3-i)*6:e,a[u]=255*r;return a},a.hsl.hsv=function(t){var e=t[0],n=t[1]/100,i=t[2]/100,a=n,r=Math.max(i,.01);return n*=(i*=2)<=1?i:2-i,a*=r<=1?r:2-r,[e,100*(0===i?2*a/(r+a):2*n/(i+n)),100*((i+n)/2)]},a.hsv.rgb=function(t){var e=t[0]/60,n=t[1]/100,i=t[2]/100,a=Math.floor(e)%6,r=e-Math.floor(e),o=255*i*(1-n),s=255*i*(1-n*r),l=255*i*(1-n*(1-r));switch(i*=255,a){case 0:return[i,l,o];case 1:return[s,i,o];case 2:return[o,i,l];case 3:return[o,s,i];case 4:return[l,o,i];case 5:return[i,o,s]}},a.hsv.hsl=function(t){var e,n,i,a=t[0],r=t[1]/100,o=t[2]/100,s=Math.max(o,.01);return i=(2-r)*o,n=r*s,[a,100*(n=(n/=(e=(2-r)*s)<=1?e:2-e)||0),100*(i/=2)]},a.hwb.rgb=function(t){var e,n,i,a,r,o,s,l=t[0]/360,u=t[1]/100,d=t[2]/100,h=u+d;switch(h>1&&(u/=h,d/=h),i=6*l-(e=Math.floor(6*l)),0!=(1&e)&&(i=1-i),a=u+i*((n=1-d)-u),e){default:case 6:case 0:r=n,o=a,s=u;break;case 1:r=a,o=n,s=u;break;case 2:r=u,o=n,s=a;break;case 3:r=u,o=a,s=n;break;case 4:r=a,o=u,s=n;break;case 5:r=n,o=u,s=a}return[255*r,255*o,255*s]},a.cmyk.rgb=function(t){var e=t[0]/100,n=t[1]/100,i=t[2]/100,a=t[3]/100;return[255*(1-Math.min(1,e*(1-a)+a)),255*(1-Math.min(1,n*(1-a)+a)),255*(1-Math.min(1,i*(1-a)+a))]},a.xyz.rgb=function(t){var e,n,i,a=t[0]/100,r=t[1]/100,o=t[2]/100;return n=-.9689*a+1.8758*r+.0415*o,i=.0557*a+-.204*r+1.057*o,e=(e=3.2406*a+-1.5372*r+-.4986*o)>.0031308?1.055*Math.pow(e,1/2.4)-.055:12.92*e,n=n>.0031308?1.055*Math.pow(n,1/2.4)-.055:12.92*n,i=i>.0031308?1.055*Math.pow(i,1/2.4)-.055:12.92*i,[255*(e=Math.min(Math.max(0,e),1)),255*(n=Math.min(Math.max(0,n),1)),255*(i=Math.min(Math.max(0,i),1))]},a.xyz.lab=function(t){var e=t[0],n=t[1],i=t[2];return n/=100,i/=108.883,e=(e/=95.047)>.008856?Math.pow(e,1/3):7.787*e+16/116,[116*(n=n>.008856?Math.pow(n,1/3):7.787*n+16/116)-16,500*(e-n),200*(n-(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116))]},a.lab.xyz=function(t){var e,n,i,a=t[0];e=t[1]/500+(n=(a+16)/116),i=n-t[2]/200;var r=Math.pow(n,3),o=Math.pow(e,3),s=Math.pow(i,3);return n=r>.008856?r:(n-16/116)/7.787,e=o>.008856?o:(e-16/116)/7.787,i=s>.008856?s:(i-16/116)/7.787,[e*=95.047,n*=100,i*=108.883]},a.lab.lch=function(t){var e,n=t[0],i=t[1],a=t[2];return(e=360*Math.atan2(a,i)/2/Math.PI)<0&&(e+=360),[n,Math.sqrt(i*i+a*a),e]},a.lch.lab=function(t){var e,n=t[0],i=t[1];return e=t[2]/360*2*Math.PI,[n,i*Math.cos(e),i*Math.sin(e)]},a.rgb.ansi16=function(t){var e=t[0],n=t[1],i=t[2],r=1 in arguments?arguments[1]:a.rgb.hsv(t)[2];if(0===(r=Math.round(r/50)))return 30;var o=30+(Math.round(i/255)<<2|Math.round(n/255)<<1|Math.round(e/255));return 2===r&&(o+=60),o},a.hsv.ansi16=function(t){return a.rgb.ansi16(a.hsv.rgb(t),t[2])},a.rgb.ansi256=function(t){var e=t[0],n=t[1],i=t[2];return e===n&&n===i?e<8?16:e>248?231:Math.round((e-8)/247*24)+232:16+36*Math.round(e/255*5)+6*Math.round(n/255*5)+Math.round(i/255*5)},a.ansi16.rgb=function(t){var e=t%10;if(0===e||7===e)return t>50&&(e+=3.5),[e=e/10.5*255,e,e];var n=.5*(1+~~(t>50));return[(1&e)*n*255,(e>>1&1)*n*255,(e>>2&1)*n*255]},a.ansi256.rgb=function(t){if(t>=232){var e=10*(t-232)+8;return[e,e,e]}var n;return t-=16,[Math.floor(t/36)/5*255,Math.floor((n=t%36)/6)/5*255,n%6/5*255]},a.rgb.hex=function(t){var e=(((255&Math.round(t[0]))<<16)+((255&Math.round(t[1]))<<8)+(255&Math.round(t[2]))).toString(16).toUpperCase();return"000000".substring(e.length)+e},a.hex.rgb=function(t){var e=t.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);if(!e)return[0,0,0];var n=e[0];3===e[0].length&&(n=n.split("").map((function(t){return t+t})).join(""));var i=parseInt(n,16);return[i>>16&255,i>>8&255,255&i]},a.rgb.hcg=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255,r=Math.max(Math.max(n,i),a),o=Math.min(Math.min(n,i),a),s=r-o;return e=s<=0?0:r===n?(i-a)/s%6:r===i?2+(a-n)/s:4+(n-i)/s+4,e/=6,[360*(e%=1),100*s,100*(s<1?o/(1-s):0)]},a.hsl.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=1,a=0;return(i=n<.5?2*e*n:2*e*(1-n))<1&&(a=(n-.5*i)/(1-i)),[t[0],100*i,100*a]},a.hsv.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=e*n,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.hcg.rgb=function(t){var e=t[0]/360,n=t[1]/100,i=t[2]/100;if(0===n)return[255*i,255*i,255*i];var a,r=[0,0,0],o=e%1*6,s=o%1,l=1-s;switch(Math.floor(o)){case 0:r[0]=1,r[1]=s,r[2]=0;break;case 1:r[0]=l,r[1]=1,r[2]=0;break;case 2:r[0]=0,r[1]=1,r[2]=s;break;case 3:r[0]=0,r[1]=l,r[2]=1;break;case 4:r[0]=s,r[1]=0,r[2]=1;break;default:r[0]=1,r[1]=0,r[2]=l}return a=(1-n)*i,[255*(n*r[0]+a),255*(n*r[1]+a),255*(n*r[2]+a)]},a.hcg.hsv=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e),i=0;return n>0&&(i=e/n),[t[0],100*i,100*n]},a.hcg.hsl=function(t){var e=t[1]/100,n=t[2]/100*(1-e)+.5*e,i=0;return n>0&&n<.5?i=e/(2*n):n>=.5&&n<1&&(i=e/(2*(1-n))),[t[0],100*i,100*n]},a.hcg.hwb=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e);return[t[0],100*(n-e),100*(1-n)]},a.hwb.hcg=function(t){var e=t[1]/100,n=1-t[2]/100,i=n-e,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.apple.rgb=function(t){return[t[0]/65535*255,t[1]/65535*255,t[2]/65535*255]},a.rgb.apple=function(t){return[t[0]/255*65535,t[1]/255*65535,t[2]/255*65535]},a.gray.rgb=function(t){return[t[0]/100*255,t[0]/100*255,t[0]/100*255]},a.gray.hsl=a.gray.hsv=function(t){return[0,0,t[0]]},a.gray.hwb=function(t){return[0,100,t[0]]},a.gray.cmyk=function(t){return[0,0,0,t[0]]},a.gray.lab=function(t){return[t[0],0,0]},a.gray.hex=function(t){var e=255&Math.round(t[0]/100*255),n=((e<<16)+(e<<8)+e).toString(16).toUpperCase();return"000000".substring(n.length)+n},a.rgb.gray=function(t){return[(t[0]+t[1]+t[2])/3/255*100]}}));n.rgb,n.hsl,n.hsv,n.hwb,n.cmyk,n.xyz,n.lab,n.lch,n.hex,n.keyword,n.ansi16,n.ansi256,n.hcg,n.apple,n.gray;function i(t){var e=function(){for(var t={},e=Object.keys(n),i=e.length,a=0;a<i;a++)t[e[a]]={distance:-1,parent:null};return t}(),i=[t];for(e[t].distance=0;i.length;)for(var a=i.pop(),r=Object.keys(n[a]),o=r.length,s=0;s<o;s++){var l=r[s],u=e[l];-1===u.distance&&(u.distance=e[a].distance+1,u.parent=a,i.unshift(l))}return e}function a(t,e){return function(n){return e(t(n))}}function r(t,e){for(var i=[e[t].parent,t],r=n[e[t].parent][t],o=e[t].parent;e[o].parent;)i.unshift(e[o].parent),r=a(n[e[o].parent][o],r),o=e[o].parent;return r.conversion=i,r}var o={};Object.keys(n).forEach((function(t){o[t]={},Object.defineProperty(o[t],"channels",{value:n[t].channels}),Object.defineProperty(o[t],"labels",{value:n[t].labels});var e=function(t){for(var e=i(t),n={},a=Object.keys(e),o=a.length,s=0;s<o;s++){var l=a[s];null!==e[l].parent&&(n[l]=r(l,e))}return n}(t);Object.keys(e).forEach((function(n){var i=e[n];o[t][n]=function(t){var e=function(e){if(null==e)return e;arguments.length>1&&(e=Array.prototype.slice.call(arguments));var n=t(e);if("object"==typeof n)for(var i=n.length,a=0;a<i;a++)n[a]=Math.round(n[a]);return n};return"conversion"in t&&(e.conversion=t.conversion),e}(i),o[t][n].raw=function(t){var e=function(e){return null==e?e:(arguments.length>1&&(e=Array.prototype.slice.call(arguments)),t(e))};return"conversion"in t&&(e.conversion=t.conversion),e}(i)}))}));var s=o,l={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},u={getRgba:d,getHsla:h,getRgb:function(t){var e=d(t);return e&&e.slice(0,3)},getHsl:function(t){var e=h(t);return e&&e.slice(0,3)},getHwb:c,getAlpha:function(t){var e=d(t);if(e)return e[3];if(e=h(t))return e[3];if(e=c(t))return e[3]},hexString:function(t,e){e=void 0!==e&&3===t.length?e:t[3];return"#"+v(t[0])+v(t[1])+v(t[2])+(e>=0&&e<1?v(Math.round(255*e)):"")},rgbString:function(t,e){if(e<1||t[3]&&t[3]<1)return f(t,e);return"rgb("+t[0]+", "+t[1]+", "+t[2]+")"},rgbaString:f,percentString:function(t,e){if(e<1||t[3]&&t[3]<1)return g(t,e);var n=Math.round(t[0]/255*100),i=Math.round(t[1]/255*100),a=Math.round(t[2]/255*100);return"rgb("+n+"%, "+i+"%, "+a+"%)"},percentaString:g,hslString:function(t,e){if(e<1||t[3]&&t[3]<1)return p(t,e);return"hsl("+t[0]+", "+t[1]+"%, "+t[2]+"%)"},hslaString:p,hwbString:function(t,e){void 0===e&&(e=void 0!==t[3]?t[3]:1);return"hwb("+t[0]+", "+t[1]+"%, "+t[2]+"%"+(void 0!==e&&1!==e?", "+e:"")+")"},keyword:function(t){return b[t.slice(0,3)]}};function d(t){if(t){var e=[0,0,0],n=1,i=t.match(/^#([a-fA-F0-9]{3,4})$/i),a="";if(i){a=(i=i[1])[3];for(var r=0;r<e.length;r++)e[r]=parseInt(i[r]+i[r],16);a&&(n=Math.round(parseInt(a+a,16)/255*100)/100)}else if(i=t.match(/^#([a-fA-F0-9]{6}([a-fA-F0-9]{2})?)$/i)){a=i[2],i=i[1];for(r=0;r<e.length;r++)e[r]=parseInt(i.slice(2*r,2*r+2),16);a&&(n=Math.round(parseInt(a,16)/255*100)/100)}else if(i=t.match(/^rgba?\(\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=parseInt(i[r+1]);n=parseFloat(i[4])}else if(i=t.match(/^rgba?\(\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=Math.round(2.55*parseFloat(i[r+1]));n=parseFloat(i[4])}else if(i=t.match(/(\w+)/)){if("transparent"==i[1])return[0,0,0,0];if(!(e=l[i[1]]))return}for(r=0;r<e.length;r++)e[r]=m(e[r],0,255);return n=n||0==n?m(n,0,1):1,e[3]=n,e}}function h(t){if(t){var e=t.match(/^hsla?\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[m(parseInt(e[1]),0,360),m(parseFloat(e[2]),0,100),m(parseFloat(e[3]),0,100),m(isNaN(n)?1:n,0,1)]}}}function c(t){if(t){var e=t.match(/^hwb\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[m(parseInt(e[1]),0,360),m(parseFloat(e[2]),0,100),m(parseFloat(e[3]),0,100),m(isNaN(n)?1:n,0,1)]}}}function f(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"rgba("+t[0]+", "+t[1]+", "+t[2]+", "+e+")"}function g(t,e){return"rgba("+Math.round(t[0]/255*100)+"%, "+Math.round(t[1]/255*100)+"%, "+Math.round(t[2]/255*100)+"%, "+(e||t[3]||1)+")"}function p(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"hsla("+t[0]+", "+t[1]+"%, "+t[2]+"%, "+e+")"}function m(t,e,n){return Math.min(Math.max(e,t),n)}function v(t){var e=t.toString(16).toUpperCase();return e.length<2?"0"+e:e}var b={};for(var x in l)b[l[x]]=x;var y=function(t){return t instanceof y?t:this instanceof y?(this.valid=!1,this.values={rgb:[0,0,0],hsl:[0,0,0],hsv:[0,0,0],hwb:[0,0,0],cmyk:[0,0,0,0],alpha:1},void("string"==typeof t?(e=u.getRgba(t))?this.setValues("rgb",e):(e=u.getHsla(t))?this.setValues("hsl",e):(e=u.getHwb(t))&&this.setValues("hwb",e):"object"==typeof t&&(void 0!==(e=t).r||void 0!==e.red?this.setValues("rgb",e):void 0!==e.l||void 0!==e.lightness?this.setValues("hsl",e):void 0!==e.v||void 0!==e.value?this.setValues("hsv",e):void 0!==e.w||void 0!==e.whiteness?this.setValues("hwb",e):void 0===e.c&&void 0===e.cyan||this.setValues("cmyk",e)))):new y(t);var e};y.prototype={isValid:function(){return this.valid},rgb:function(){return this.setSpace("rgb",arguments)},hsl:function(){return this.setSpace("hsl",arguments)},hsv:function(){return this.setSpace("hsv",arguments)},hwb:function(){return this.setSpace("hwb",arguments)},cmyk:function(){return this.setSpace("cmyk",arguments)},rgbArray:function(){return this.values.rgb},hslArray:function(){return this.values.hsl},hsvArray:function(){return this.values.hsv},hwbArray:function(){var t=this.values;return 1!==t.alpha?t.hwb.concat([t.alpha]):t.hwb},cmykArray:function(){return this.values.cmyk},rgbaArray:function(){var t=this.values;return t.rgb.concat([t.alpha])},hslaArray:function(){var t=this.values;return t.hsl.concat([t.alpha])},alpha:function(t){return void 0===t?this.values.alpha:(this.setValues("alpha",t),this)},red:function(t){return this.setChannel("rgb",0,t)},green:function(t){return this.setChannel("rgb",1,t)},blue:function(t){return this.setChannel("rgb",2,t)},hue:function(t){return t&&(t=(t%=360)<0?360+t:t),this.setChannel("hsl",0,t)},saturation:function(t){return this.setChannel("hsl",1,t)},lightness:function(t){return this.setChannel("hsl",2,t)},saturationv:function(t){return this.setChannel("hsv",1,t)},whiteness:function(t){return this.setChannel("hwb",1,t)},blackness:function(t){return this.setChannel("hwb",2,t)},value:function(t){return this.setChannel("hsv",2,t)},cyan:function(t){return this.setChannel("cmyk",0,t)},magenta:function(t){return this.setChannel("cmyk",1,t)},yellow:function(t){return this.setChannel("cmyk",2,t)},black:function(t){return this.setChannel("cmyk",3,t)},hexString:function(){return u.hexString(this.values.rgb)},rgbString:function(){return u.rgbString(this.values.rgb,this.values.alpha)},rgbaString:function(){return u.rgbaString(this.values.rgb,this.values.alpha)},percentString:function(){return u.percentString(this.values.rgb,this.values.alpha)},hslString:function(){return u.hslString(this.values.hsl,this.values.alpha)},hslaString:function(){return u.hslaString(this.values.hsl,this.values.alpha)},hwbString:function(){return u.hwbString(this.values.hwb,this.values.alpha)},keyword:function(){return u.keyword(this.values.rgb,this.values.alpha)},rgbNumber:function(){var t=this.values.rgb;return t[0]<<16|t[1]<<8|t[2]},luminosity:function(){for(var t=this.values.rgb,e=[],n=0;n<t.length;n++){var i=t[n]/255;e[n]=i<=.03928?i/12.92:Math.pow((i+.055)/1.055,2.4)}return.2126*e[0]+.7152*e[1]+.0722*e[2]},contrast:function(t){var e=this.luminosity(),n=t.luminosity();return e>n?(e+.05)/(n+.05):(n+.05)/(e+.05)},level:function(t){var e=this.contrast(t);return e>=7.1?"AAA":e>=4.5?"AA":""},dark:function(){var t=this.values.rgb;return(299*t[0]+587*t[1]+114*t[2])/1e3<128},light:function(){return!this.dark()},negate:function(){for(var t=[],e=0;e<3;e++)t[e]=255-this.values.rgb[e];return this.setValues("rgb",t),this},lighten:function(t){var e=this.values.hsl;return e[2]+=e[2]*t,this.setValues("hsl",e),this},darken:function(t){var e=this.values.hsl;return e[2]-=e[2]*t,this.setValues("hsl",e),this},saturate:function(t){var e=this.values.hsl;return e[1]+=e[1]*t,this.setValues("hsl",e),this},desaturate:function(t){var e=this.values.hsl;return e[1]-=e[1]*t,this.setValues("hsl",e),this},whiten:function(t){var e=this.values.hwb;return e[1]+=e[1]*t,this.setValues("hwb",e),this},blacken:function(t){var e=this.values.hwb;return e[2]+=e[2]*t,this.setValues("hwb",e),this},greyscale:function(){var t=this.values.rgb,e=.3*t[0]+.59*t[1]+.11*t[2];return this.setValues("rgb",[e,e,e]),this},clearer:function(t){var e=this.values.alpha;return this.setValues("alpha",e-e*t),this},opaquer:function(t){var e=this.values.alpha;return this.setValues("alpha",e+e*t),this},rotate:function(t){var e=this.values.hsl,n=(e[0]+t)%360;return e[0]=n<0?360+n:n,this.setValues("hsl",e),this},mix:function(t,e){var n=t,i=void 0===e?.5:e,a=2*i-1,r=this.alpha()-n.alpha(),o=((a*r==-1?a:(a+r)/(1+a*r))+1)/2,s=1-o;return this.rgb(o*this.red()+s*n.red(),o*this.green()+s*n.green(),o*this.blue()+s*n.blue()).alpha(this.alpha()*i+n.alpha()*(1-i))},toJSON:function(){return this.rgb()},clone:function(){var t,e,n=new y,i=this.values,a=n.values;for(var r in i)i.hasOwnProperty(r)&&(t=i[r],"[object Array]"===(e={}.toString.call(t))?a[r]=t.slice(0):"[object Number]"===e?a[r]=t:console.error("unexpected color value:",t));return n}},y.prototype.spaces={rgb:["red","green","blue"],hsl:["hue","saturation","lightness"],hsv:["hue","saturation","value"],hwb:["hue","whiteness","blackness"],cmyk:["cyan","magenta","yellow","black"]},y.prototype.maxes={rgb:[255,255,255],hsl:[360,100,100],hsv:[360,100,100],hwb:[360,100,100],cmyk:[100,100,100,100]},y.prototype.getValues=function(t){for(var e=this.values,n={},i=0;i<t.length;i++)n[t.charAt(i)]=e[t][i];return 1!==e.alpha&&(n.a=e.alpha),n},y.prototype.setValues=function(t,e){var n,i,a=this.values,r=this.spaces,o=this.maxes,l=1;if(this.valid=!0,"alpha"===t)l=e;else if(e.length)a[t]=e.slice(0,t.length),l=e[t.length];else if(void 0!==e[t.charAt(0)]){for(n=0;n<t.length;n++)a[t][n]=e[t.charAt(n)];l=e.a}else if(void 0!==e[r[t][0]]){var u=r[t];for(n=0;n<t.length;n++)a[t][n]=e[u[n]];l=e.alpha}if(a.alpha=Math.max(0,Math.min(1,void 0===l?a.alpha:l)),"alpha"===t)return!1;for(n=0;n<t.length;n++)i=Math.max(0,Math.min(o[t][n],a[t][n])),a[t][n]=Math.round(i);for(var d in r)d!==t&&(a[d]=s[t][d](a[t]));return!0},y.prototype.setSpace=function(t,e){var n=e[0];return void 0===n?this.getValues(t):("number"==typeof n&&(n=Array.prototype.slice.call(e)),this.setValues(t,n),this)},y.prototype.setChannel=function(t,e,n){var i=this.values[t];return void 0===n?i[e]:n===i[e]?this:(i[e]=n,this.setValues(t,i),this)},"undefined"!=typeof window&&(window.Color=y);var _=y;function k(t){return-1===["__proto__","prototype","constructor"].indexOf(t)}var w,M={noop:function(){},uid:(w=0,function(){return w++}),isNullOrUndef:function(t){return null==t},isArray:function(t){if(Array.isArray&&Array.isArray(t))return!0;var e=Object.prototype.toString.call(t);return"[object"===e.substr(0,7)&&"Array]"===e.substr(-6)},isObject:function(t){return null!==t&&"[object Object]"===Object.prototype.toString.call(t)},isFinite:function(t){return("number"==typeof t||t instanceof Number)&&isFinite(t)},valueOrDefault:function(t,e){return void 0===t?e:t},valueAtIndexOrDefault:function(t,e,n){return M.valueOrDefault(M.isArray(t)?t[e]:t,n)},callback:function(t,e,n){if(t&&"function"==typeof t.call)return t.apply(n,e)},each:function(t,e,n,i){var a,r,o;if(M.isArray(t))if(r=t.length,i)for(a=r-1;a>=0;a--)e.call(n,t[a],a);else for(a=0;a<r;a++)e.call(n,t[a],a);else if(M.isObject(t))for(r=(o=Object.keys(t)).length,a=0;a<r;a++)e.call(n,t[o[a]],o[a])},arrayEquals:function(t,e){var n,i,a,r;if(!t||!e||t.length!==e.length)return!1;for(n=0,i=t.length;n<i;++n)if(a=t[n],r=e[n],a instanceof Array&&r instanceof Array){if(!M.arrayEquals(a,r))return!1}else if(a!==r)return!1;return!0},clone:function(t){if(M.isArray(t))return t.map(M.clone);if(M.isObject(t)){for(var e=Object.create(t),n=Object.keys(t),i=n.length,a=0;a<i;++a)e[n[a]]=M.clone(t[n[a]]);return e}return t},_merger:function(t,e,n,i){if(k(t)){var a=e[t],r=n[t];M.isObject(a)&&M.isObject(r)?M.merge(a,r,i):e[t]=M.clone(r)}},_mergerIf:function(t,e,n){if(k(t)){var i=e[t],a=n[t];M.isObject(i)&&M.isObject(a)?M.mergeIf(i,a):e.hasOwnProperty(t)||(e[t]=M.clone(a))}},merge:function(t,e,n){var i,a,r,o,s,l=M.isArray(e)?e:[e],u=l.length;if(!M.isObject(t))return t;for(i=(n=n||{}).merger||M._merger,a=0;a<u;++a)if(e=l[a],M.isObject(e))for(s=0,o=(r=Object.keys(e)).length;s<o;++s)i(r[s],t,e,n);return t},mergeIf:function(t,e){return M.merge(t,e,{merger:M._mergerIf})},extend:Object.assign||function(t){return M.merge(t,[].slice.call(arguments,1),{merger:function(t,e,n){e[t]=n[t]}})},inherits:function(t){var e=this,n=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return e.apply(this,arguments)},i=function(){this.constructor=n};return i.prototype=e.prototype,n.prototype=new i,n.extend=M.inherits,t&&M.extend(n.prototype,t),n.__super__=e.prototype,n},_deprecated:function(t,e,n,i){void 0!==e&&console.warn(t+': "'+n+'" is deprecated. Please use "'+i+'" instead')}},S=M;M.callCallback=M.callback,M.indexOf=function(t,e,n){return Array.prototype.indexOf.call(t,e,n)},M.getValueOrDefault=M.valueOrDefault,M.getValueAtIndexOrDefault=M.valueAtIndexOrDefault;var C={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return(t-=1)*t*t+1},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-((t-=1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return t*t*t*t*t},easeOutQuint:function(t){return(t-=1)*t*t*t*t+1},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return 1-Math.cos(t*(Math.PI/2))},easeOutSine:function(t){return Math.sin(t*(Math.PI/2))},easeInOutSine:function(t){return-.5*(Math.cos(Math.PI*t)-1)},easeInExpo:function(t){return 0===t?0:Math.pow(2,10*(t-1))},easeOutExpo:function(t){return 1===t?1:1-Math.pow(2,-10*t)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(2-Math.pow(2,-10*--t))},easeInCirc:function(t){return t>=1?t:-(Math.sqrt(1-t*t)-1)},easeOutCirc:function(t){return Math.sqrt(1-(t-=1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),-i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n))},easeOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),i*Math.pow(2,-10*t)*Math.sin((t-e)*(2*Math.PI)/n)+1)},easeInOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:2==(t/=.5)?1:(n||(n=.45),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),t<1?i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*-.5:i*Math.pow(2,-10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*.5+1)},easeInBack:function(t){var e=1.70158;return t*t*((e+1)*t-e)},easeOutBack:function(t){var e=1.70158;return(t-=1)*t*((e+1)*t+e)+1},easeInOutBack:function(t){var e=1.70158;return(t/=.5)<1?t*t*((1+(e*=1.525))*t-e)*.5:.5*((t-=2)*t*((1+(e*=1.525))*t+e)+2)},easeInBounce:function(t){return 1-C.easeOutBounce(1-t)},easeOutBounce:function(t){return t<1/2.75?7.5625*t*t:t<2/2.75?7.5625*(t-=1.5/2.75)*t+.75:t<2.5/2.75?7.5625*(t-=2.25/2.75)*t+.9375:7.5625*(t-=2.625/2.75)*t+.984375},easeInOutBounce:function(t){return t<.5?.5*C.easeInBounce(2*t):.5*C.easeOutBounce(2*t-1)+.5}},P={effects:C};S.easingEffects=C;var A=Math.PI,D=A/180,T=2*A,I=A/2,F=A/4,O=2*A/3,L={clear:function(t){t.ctx.clearRect(0,0,t.width,t.height)},roundedRect:function(t,e,n,i,a,r){if(r){var o=Math.min(r,a/2,i/2),s=e+o,l=n+o,u=e+i-o,d=n+a-o;t.moveTo(e,l),s<u&&l<d?(t.arc(s,l,o,-A,-I),t.arc(u,l,o,-I,0),t.arc(u,d,o,0,I),t.arc(s,d,o,I,A)):s<u?(t.moveTo(s,n),t.arc(u,l,o,-I,I),t.arc(s,l,o,I,A+I)):l<d?(t.arc(s,l,o,-A,0),t.arc(s,d,o,0,A)):t.arc(s,l,o,-A,A),t.closePath(),t.moveTo(e,n)}else t.rect(e,n,i,a)},drawPoint:function(t,e,n,i,a,r){var o,s,l,u,d,h=(r||0)*D;if(e&&"object"==typeof e&&("[object HTMLImageElement]"===(o=e.toString())||"[object HTMLCanvasElement]"===o))return t.save(),t.translate(i,a),t.rotate(h),t.drawImage(e,-e.width/2,-e.height/2,e.width,e.height),void t.restore();if(!(isNaN(n)||n<=0)){switch(t.beginPath(),e){default:t.arc(i,a,n,0,T),t.closePath();break;case"triangle":t.moveTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=O,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=O,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),t.closePath();break;case"rectRounded":u=n-(d=.516*n),s=Math.cos(h+F)*u,l=Math.sin(h+F)*u,t.arc(i-s,a-l,d,h-A,h-I),t.arc(i+l,a-s,d,h-I,h),t.arc(i+s,a+l,d,h,h+I),t.arc(i-l,a+s,d,h+I,h+A),t.closePath();break;case"rect":if(!r){u=Math.SQRT1_2*n,t.rect(i-u,a-u,2*u,2*u);break}h+=F;case"rectRot":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+l,a-s),t.lineTo(i+s,a+l),t.lineTo(i-l,a+s),t.closePath();break;case"crossRot":h+=F;case"cross":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"star":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s),h+=F,s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"line":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l);break;case"dash":t.moveTo(i,a),t.lineTo(i+Math.cos(h)*n,a+Math.sin(h)*n)}t.fill(),t.stroke()}},_isPointInArea:function(t,e){return t.x>e.left-1e-6&&t.x<e.right+1e-6&&t.y>e.top-1e-6&&t.y<e.bottom+1e-6},clipArea:function(t,e){t.save(),t.beginPath(),t.rect(e.left,e.top,e.right-e.left,e.bottom-e.top),t.clip()},unclipArea:function(t){t.restore()},lineTo:function(t,e,n,i){var a=n.steppedLine;if(a){if("middle"===a){var r=(e.x+n.x)/2;t.lineTo(r,i?n.y:e.y),t.lineTo(r,i?e.y:n.y)}else"after"===a&&!i||"after"!==a&&i?t.lineTo(e.x,n.y):t.lineTo(n.x,e.y);t.lineTo(n.x,n.y)}else n.tension?t.bezierCurveTo(i?e.controlPointPreviousX:e.controlPointNextX,i?e.controlPointPreviousY:e.controlPointNextY,i?n.controlPointNextX:n.controlPointPreviousX,i?n.controlPointNextY:n.controlPointPreviousY,n.x,n.y):t.lineTo(n.x,n.y)}},R=L;S.clear=L.clear,S.drawRoundedRectangle=function(t){t.beginPath(),L.roundedRect.apply(L,arguments)};var z={_set:function(t,e){return S.merge(this[t]||(this[t]={}),e)}};z._set("global",{defaultColor:"rgba(0,0,0,0.1)",defaultFontColor:"#666",defaultFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",defaultFontSize:12,defaultFontStyle:"normal",defaultLineHeight:1.2,showLines:!0});var N=z,B=S.valueOrDefault;var E={toLineHeight:function(t,e){var n=(""+t).match(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/);if(!n||"normal"===n[1])return 1.2*e;switch(t=+n[2],n[3]){case"px":return t;case"%":t/=100}return e*t},toPadding:function(t){var e,n,i,a;return S.isObject(t)?(e=+t.top||0,n=+t.right||0,i=+t.bottom||0,a=+t.left||0):e=n=i=a=+t||0,{top:e,right:n,bottom:i,left:a,height:e+i,width:a+n}},_parseFont:function(t){var e=N.global,n=B(t.fontSize,e.defaultFontSize),i={family:B(t.fontFamily,e.defaultFontFamily),lineHeight:S.options.toLineHeight(B(t.lineHeight,e.defaultLineHeight),n),size:n,style:B(t.fontStyle,e.defaultFontStyle),weight:null,string:""};return i.string=function(t){return!t||S.isNullOrUndef(t.size)||S.isNullOrUndef(t.family)?null:(t.style?t.style+" ":"")+(t.weight?t.weight+" ":"")+t.size+"px "+t.family}(i),i},resolve:function(t,e,n,i){var a,r,o,s=!0;for(a=0,r=t.length;a<r;++a)if(void 0!==(o=t[a])&&(void 0!==e&&"function"==typeof o&&(o=o(e),s=!1),void 0!==n&&S.isArray(o)&&(o=o[n],s=!1),void 0!==o))return i&&!s&&(i.cacheable=!1),o}},W={_factorize:function(t){var e,n=[],i=Math.sqrt(t);for(e=1;e<i;e++)t%e==0&&(n.push(e),n.push(t/e));return i===(0|i)&&n.push(i),n.sort((function(t,e){return t-e})).pop(),n},log10:Math.log10||function(t){var e=Math.log(t)*Math.LOG10E,n=Math.round(e);return t===Math.pow(10,n)?n:e}},V=W;S.log10=W.log10;var H=S,j=P,q=R,U=E,Y=V,G={getRtlAdapter:function(t,e,n){return t?function(t,e){return{x:function(n){return t+t+e-n},setWidth:function(t){e=t},textAlign:function(t){return"center"===t?t:"right"===t?"left":"right"},xPlus:function(t,e){return t-e},leftForLtr:function(t,e){return t-e}}}(e,n):{x:function(t){return t},setWidth:function(t){},textAlign:function(t){return t},xPlus:function(t,e){return t+e},leftForLtr:function(t,e){return t}}},overrideTextDirection:function(t,e){var n,i;"ltr"!==e&&"rtl"!==e||(i=[(n=t.canvas.style).getPropertyValue("direction"),n.getPropertyPriority("direction")],n.setProperty("direction",e,"important"),t.prevTextDirection=i)},restoreTextDirection:function(t){var e=t.prevTextDirection;void 0!==e&&(delete t.prevTextDirection,t.canvas.style.setProperty("direction",e[0],e[1]))}};H.easing=j,H.canvas=q,H.options=U,H.math=Y,H.rtl=G;var X=function(t){H.extend(this,t),this.initialize.apply(this,arguments)};H.extend(X.prototype,{_type:void 0,initialize:function(){this.hidden=!1},pivot:function(){var t=this;return t._view||(t._view=H.extend({},t._model)),t._start={},t},transition:function(t){var e=this,n=e._model,i=e._start,a=e._view;return n&&1!==t?(a||(a=e._view={}),i||(i=e._start={}),function(t,e,n,i){var a,r,o,s,l,u,d,h,c,f=Object.keys(n);for(a=0,r=f.length;a<r;++a)if(u=n[o=f[a]],e.hasOwnProperty(o)||(e[o]=u),(s=e[o])!==u&&"_"!==o[0]){if(t.hasOwnProperty(o)||(t[o]=s),(d=typeof u)===typeof(l=t[o]))if("string"===d){if((h=_(l)).valid&&(c=_(u)).valid){e[o]=c.mix(h,i).rgbString();continue}}else if(H.isFinite(l)&&H.isFinite(u)){e[o]=l+(u-l)*i;continue}e[o]=u}}(i,a,n,t),e):(e._view=H.extend({},n),e._start=null,e)},tooltipPosition:function(){return{x:this._model.x,y:this._model.y}},hasValue:function(){return H.isNumber(this._model.x)&&H.isNumber(this._model.y)}}),X.extend=H.inherits;var K=X,Z=K.extend({chart:null,currentStep:0,numSteps:60,easing:"",render:null,onAnimationProgress:null,onAnimationComplete:null}),$=Z;Object.defineProperty(Z.prototype,"animationObject",{get:function(){return this}}),Object.defineProperty(Z.prototype,"chartInstance",{get:function(){return this.chart},set:function(t){this.chart=t}}),N._set("global",{animation:{duration:1e3,easing:"easeOutQuart",onProgress:H.noop,onComplete:H.noop}});var J={animations:[],request:null,addAnimation:function(t,e,n,i){var a,r,o=this.animations;for(e.chart=t,e.startTime=Date.now(),e.duration=n,i||(t.animating=!0),a=0,r=o.length;a<r;++a)if(o[a].chart===t)return void(o[a]=e);o.push(e),1===o.length&&this.requestAnimationFrame()},cancelAnimation:function(t){var e=H.findIndex(this.animations,(function(e){return e.chart===t}));-1!==e&&(this.animations.splice(e,1),t.animating=!1)},requestAnimationFrame:function(){var t=this;null===t.request&&(t.request=H.requestAnimFrame.call(window,(function(){t.request=null,t.startDigest()})))},startDigest:function(){this.advance(),this.animations.length>0&&this.requestAnimationFrame()},advance:function(){for(var t,e,n,i,a=this.animations,r=0;r<a.length;)e=(t=a[r]).chart,n=t.numSteps,i=Math.floor((Date.now()-t.startTime)/t.duration*n)+1,t.currentStep=Math.min(i,n),H.callback(t.render,[e,t],e),H.callback(t.onAnimationProgress,[t],e),t.currentStep>=n?(H.callback(t.onAnimationComplete,[t],e),e.animating=!1,a.splice(r,1)):++r}},Q=H.options.resolve,tt=["push","pop","shift","splice","unshift"];function et(t,e){var n=t._chartjs;if(n){var i=n.listeners,a=i.indexOf(e);-1!==a&&i.splice(a,1),i.length>0||(tt.forEach((function(e){delete t[e]})),delete t._chartjs)}}var nt=function(t,e){this.initialize(t,e)};H.extend(nt.prototype,{datasetElementType:null,dataElementType:null,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth"],_dataElementOptions:["backgroundColor","borderColor","borderWidth","pointStyle"],initialize:function(t,e){var n=this;n.chart=t,n.index=e,n.linkScales(),n.addElements(),n._type=n.getMeta().type},updateIndex:function(t){this.index=t},linkScales:function(){var t=this.getMeta(),e=this.chart,n=e.scales,i=this.getDataset(),a=e.options.scales;null!==t.xAxisID&&t.xAxisID in n&&!i.xAxisID||(t.xAxisID=i.xAxisID||a.xAxes[0].id),null!==t.yAxisID&&t.yAxisID in n&&!i.yAxisID||(t.yAxisID=i.yAxisID||a.yAxes[0].id)},getDataset:function(){return this.chart.data.datasets[this.index]},getMeta:function(){return this.chart.getDatasetMeta(this.index)},getScaleForId:function(t){return this.chart.scales[t]},_getValueScaleId:function(){return this.getMeta().yAxisID},_getIndexScaleId:function(){return this.getMeta().xAxisID},_getValueScale:function(){return this.getScaleForId(this._getValueScaleId())},_getIndexScale:function(){return this.getScaleForId(this._getIndexScaleId())},reset:function(){this._update(!0)},destroy:function(){this._data&&et(this._data,this)},createMetaDataset:function(){var t=this.datasetElementType;return t&&new t({_chart:this.chart,_datasetIndex:this.index})},createMetaData:function(t){var e=this.dataElementType;return e&&new e({_chart:this.chart,_datasetIndex:this.index,_index:t})},addElements:function(){var t,e,n=this.getMeta(),i=this.getDataset().data||[],a=n.data;for(t=0,e=i.length;t<e;++t)a[t]=a[t]||this.createMetaData(t);n.dataset=n.dataset||this.createMetaDataset()},addElementAndReset:function(t){var e=this.createMetaData(t);this.getMeta().data.splice(t,0,e),this.updateElement(e,t,!0)},buildOrUpdateElements:function(){var t,e,n=this,i=n.getDataset(),a=i.data||(i.data=[]);n._data!==a&&(n._data&&et(n._data,n),a&&Object.isExtensible(a)&&(e=n,(t=a)._chartjs?t._chartjs.listeners.push(e):(Object.defineProperty(t,"_chartjs",{configurable:!0,enumerable:!1,value:{listeners:[e]}}),tt.forEach((function(e){var n="onData"+e.charAt(0).toUpperCase()+e.slice(1),i=t[e];Object.defineProperty(t,e,{configurable:!0,enumerable:!1,value:function(){var e=Array.prototype.slice.call(arguments),a=i.apply(this,e);return H.each(t._chartjs.listeners,(function(t){"function"==typeof t[n]&&t[n].apply(t,e)})),a}})})))),n._data=a),n.resyncElements()},_configure:function(){this._config=H.merge(Object.create(null),[this.chart.options.datasets[this._type],this.getDataset()],{merger:function(t,e,n){"_meta"!==t&&"data"!==t&&H._merger(t,e,n)}})},_update:function(t){this._configure(),this._cachedDataOpts=null,this.update(t)},update:H.noop,transition:function(t){for(var e=this.getMeta(),n=e.data||[],i=n.length,a=0;a<i;++a)n[a].transition(t);e.dataset&&e.dataset.transition(t)},draw:function(){var t=this.getMeta(),e=t.data||[],n=e.length,i=0;for(t.dataset&&t.dataset.draw();i<n;++i)e[i].draw()},getStyle:function(t){var e,n=this.getMeta(),i=n.dataset;return this._configure(),i&&void 0===t?e=this._resolveDatasetElementOptions(i||{}):(t=t||0,e=this._resolveDataElementOptions(n.data[t]||{},t)),!1!==e.fill&&null!==e.fill||(e.backgroundColor=e.borderColor),e},_resolveDatasetElementOptions:function(t,e){var n,i,a,r,o=this,s=o.chart,l=o._config,u=t.custom||{},d=s.options.elements[o.datasetElementType.prototype._type]||{},h=o._datasetElementOptions,c={},f={chart:s,dataset:o.getDataset(),datasetIndex:o.index,hover:e};for(n=0,i=h.length;n<i;++n)a=h[n],r=e?"hover"+a.charAt(0).toUpperCase()+a.slice(1):a,c[a]=Q([u[r],l[r],d[r]],f);return c},_resolveDataElementOptions:function(t,e){var n=this,i=t&&t.custom,a=n._cachedDataOpts;if(a&&!i)return a;var r,o,s,l,u=n.chart,d=n._config,h=u.options.elements[n.dataElementType.prototype._type]||{},c=n._dataElementOptions,f={},g={chart:u,dataIndex:e,dataset:n.getDataset(),datasetIndex:n.index},p={cacheable:!i};if(i=i||{},H.isArray(c))for(o=0,s=c.length;o<s;++o)f[l=c[o]]=Q([i[l],d[l],h[l]],g,e,p);else for(o=0,s=(r=Object.keys(c)).length;o<s;++o)f[l=r[o]]=Q([i[l],d[c[l]],d[l],h[l]],g,e,p);return p.cacheable&&(n._cachedDataOpts=Object.freeze(f)),f},removeHoverStyle:function(t){H.merge(t._model,t.$previousStyle||{}),delete t.$previousStyle},setHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],n=t._index,i=t.custom||{},a=t._model,r=H.getHoverColor;t.$previousStyle={backgroundColor:a.backgroundColor,borderColor:a.borderColor,borderWidth:a.borderWidth},a.backgroundColor=Q([i.hoverBackgroundColor,e.hoverBackgroundColor,r(a.backgroundColor)],void 0,n),a.borderColor=Q([i.hoverBorderColor,e.hoverBorderColor,r(a.borderColor)],void 0,n),a.borderWidth=Q([i.hoverBorderWidth,e.hoverBorderWidth,a.borderWidth],void 0,n)},_removeDatasetHoverStyle:function(){var t=this.getMeta().dataset;t&&this.removeHoverStyle(t)},_setDatasetHoverStyle:function(){var t,e,n,i,a,r,o=this.getMeta().dataset,s={};if(o){for(r=o._model,a=this._resolveDatasetElementOptions(o,!0),t=0,e=(i=Object.keys(a)).length;t<e;++t)s[n=i[t]]=r[n],r[n]=a[n];o.$previousStyle=s}},resyncElements:function(){var t=this.getMeta(),e=this.getDataset().data,n=t.data.length,i=e.length;i<n?t.data.splice(i,n-i):i>n&&this.insertElements(n,i-n)},insertElements:function(t,e){for(var n=0;n<e;++n)this.addElementAndReset(t+n)},onDataPush:function(){var t=arguments.length;this.insertElements(this.getDataset().data.length-t,t)},onDataPop:function(){this.getMeta().data.pop()},onDataShift:function(){this.getMeta().data.shift()},onDataSplice:function(t,e){this.getMeta().data.splice(t,e),this.insertElements(t,arguments.length-2)},onDataUnshift:function(){this.insertElements(0,arguments.length)}}),nt.extend=H.inherits;var it=nt,at=2*Math.PI;function rt(t,e){var n=e.startAngle,i=e.endAngle,a=e.pixelMargin,r=a/e.outerRadius,o=e.x,s=e.y;t.beginPath(),t.arc(o,s,e.outerRadius,n-r,i+r),e.innerRadius>a?(r=a/e.innerRadius,t.arc(o,s,e.innerRadius-a,i+r,n-r,!0)):t.arc(o,s,a,i+Math.PI/2,n-Math.PI/2),t.closePath(),t.clip()}function ot(t,e,n){var i="inner"===e.borderAlign;i?(t.lineWidth=2*e.borderWidth,t.lineJoin="round"):(t.lineWidth=e.borderWidth,t.lineJoin="bevel"),n.fullCircles&&function(t,e,n,i){var a,r=n.endAngle;for(i&&(n.endAngle=n.startAngle+at,rt(t,n),n.endAngle=r,n.endAngle===n.startAngle&&n.fullCircles&&(n.endAngle+=at,n.fullCircles--)),t.beginPath(),t.arc(n.x,n.y,n.innerRadius,n.startAngle+at,n.startAngle,!0),a=0;a<n.fullCircles;++a)t.stroke();for(t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.startAngle+at),a=0;a<n.fullCircles;++a)t.stroke()}(t,e,n,i),i&&rt(t,n),t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.endAngle),t.arc(n.x,n.y,n.innerRadius,n.endAngle,n.startAngle,!0),t.closePath(),t.stroke()}N._set("global",{elements:{arc:{backgroundColor:N.global.defaultColor,borderColor:"#fff",borderWidth:2,borderAlign:"center"}}});var st=K.extend({_type:"arc",inLabelRange:function(t){var e=this._view;return!!e&&Math.pow(t-e.x,2)<Math.pow(e.radius+e.hoverRadius,2)},inRange:function(t,e){var n=this._view;if(n){for(var i=H.getAngleFromPoint(n,{x:t,y:e}),a=i.angle,r=i.distance,o=n.startAngle,s=n.endAngle;s<o;)s+=at;for(;a>s;)a-=at;for(;a<o;)a+=at;var l=a>=o&&a<=s,u=r>=n.innerRadius&&r<=n.outerRadius;return l&&u}return!1},getCenterPoint:function(){var t=this._view,e=(t.startAngle+t.endAngle)/2,n=(t.innerRadius+t.outerRadius)/2;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},getArea:function(){var t=this._view;return Math.PI*((t.endAngle-t.startAngle)/(2*Math.PI))*(Math.pow(t.outerRadius,2)-Math.pow(t.innerRadius,2))},tooltipPosition:function(){var t=this._view,e=t.startAngle+(t.endAngle-t.startAngle)/2,n=(t.outerRadius-t.innerRadius)/2+t.innerRadius;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},draw:function(){var t,e=this._chart.ctx,n=this._view,i="inner"===n.borderAlign?.33:0,a={x:n.x,y:n.y,innerRadius:n.innerRadius,outerRadius:Math.max(n.outerRadius-i,0),pixelMargin:i,startAngle:n.startAngle,endAngle:n.endAngle,fullCircles:Math.floor(n.circumference/at)};if(e.save(),e.fillStyle=n.backgroundColor,e.strokeStyle=n.borderColor,a.fullCircles){for(a.endAngle=a.startAngle+at,e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),t=0;t<a.fullCircles;++t)e.fill();a.endAngle=a.startAngle+n.circumference%at}e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),e.fill(),n.borderWidth&&ot(e,n,a),e.restore()}}),lt=H.valueOrDefault,ut=N.global.defaultColor;N._set("global",{elements:{line:{tension:.4,backgroundColor:ut,borderWidth:3,borderColor:ut,borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",capBezierPoints:!0,fill:!0}}});var dt=K.extend({_type:"line",draw:function(){var t,e,n,i=this,a=i._view,r=i._chart.ctx,o=a.spanGaps,s=i._children.slice(),l=N.global,u=l.elements.line,d=-1,h=i._loop;if(s.length){if(i._loop){for(t=0;t<s.length;++t)if(e=H.previousItem(s,t),!s[t]._view.skip&&e._view.skip){s=s.slice(t).concat(s.slice(0,t)),h=o;break}h&&s.push(s[0])}for(r.save(),r.lineCap=a.borderCapStyle||u.borderCapStyle,r.setLineDash&&r.setLineDash(a.borderDash||u.borderDash),r.lineDashOffset=lt(a.borderDashOffset,u.borderDashOffset),r.lineJoin=a.borderJoinStyle||u.borderJoinStyle,r.lineWidth=lt(a.borderWidth,u.borderWidth),r.strokeStyle=a.borderColor||l.defaultColor,r.beginPath(),(n=s[0]._view).skip||(r.moveTo(n.x,n.y),d=0),t=1;t<s.length;++t)n=s[t]._view,e=-1===d?H.previousItem(s,t):s[d],n.skip||(d!==t-1&&!o||-1===d?r.moveTo(n.x,n.y):H.canvas.lineTo(r,e._view,n),d=t);h&&r.closePath(),r.stroke(),r.restore()}}}),ht=H.valueOrDefault,ct=N.global.defaultColor;function ft(t){var e=this._view;return!!e&&Math.abs(t-e.x)<e.radius+e.hitRadius}N._set("global",{elements:{point:{radius:3,pointStyle:"circle",backgroundColor:ct,borderColor:ct,borderWidth:1,hitRadius:1,hoverRadius:4,hoverBorderWidth:1}}});var gt=K.extend({_type:"point",inRange:function(t,e){var n=this._view;return!!n&&Math.pow(t-n.x,2)+Math.pow(e-n.y,2)<Math.pow(n.hitRadius+n.radius,2)},inLabelRange:ft,inXRange:ft,inYRange:function(t){var e=this._view;return!!e&&Math.abs(t-e.y)<e.radius+e.hitRadius},getCenterPoint:function(){var t=this._view;return{x:t.x,y:t.y}},getArea:function(){return Math.PI*Math.pow(this._view.radius,2)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y,padding:t.radius+t.borderWidth}},draw:function(t){var e=this._view,n=this._chart.ctx,i=e.pointStyle,a=e.rotation,r=e.radius,o=e.x,s=e.y,l=N.global,u=l.defaultColor;e.skip||(void 0===t||H.canvas._isPointInArea(e,t))&&(n.strokeStyle=e.borderColor||u,n.lineWidth=ht(e.borderWidth,l.elements.point.borderWidth),n.fillStyle=e.backgroundColor||u,H.canvas.drawPoint(n,i,r,o,s,a))}}),pt=N.global.defaultColor;function mt(t){return t&&void 0!==t.width}function vt(t){var e,n,i,a,r;return mt(t)?(r=t.width/2,e=t.x-r,n=t.x+r,i=Math.min(t.y,t.base),a=Math.max(t.y,t.base)):(r=t.height/2,e=Math.min(t.x,t.base),n=Math.max(t.x,t.base),i=t.y-r,a=t.y+r),{left:e,top:i,right:n,bottom:a}}function bt(t,e,n){return t===e?n:t===n?e:t}function xt(t,e,n){var i,a,r,o,s=t.borderWidth,l=function(t){var e=t.borderSkipped,n={};return e?(t.horizontal?t.base>t.x&&(e=bt(e,"left","right")):t.base<t.y&&(e=bt(e,"bottom","top")),n[e]=!0,n):n}(t);return H.isObject(s)?(i=+s.top||0,a=+s.right||0,r=+s.bottom||0,o=+s.left||0):i=a=r=o=+s||0,{t:l.top||i<0?0:i>n?n:i,r:l.right||a<0?0:a>e?e:a,b:l.bottom||r<0?0:r>n?n:r,l:l.left||o<0?0:o>e?e:o}}function yt(t,e,n){var i=null===e,a=null===n,r=!(!t||i&&a)&&vt(t);return r&&(i||e>=r.left&&e<=r.right)&&(a||n>=r.top&&n<=r.bottom)}N._set("global",{elements:{rectangle:{backgroundColor:pt,borderColor:pt,borderSkipped:"bottom",borderWidth:0}}});var _t=K.extend({_type:"rectangle",draw:function(){var t=this._chart.ctx,e=this._view,n=function(t){var e=vt(t),n=e.right-e.left,i=e.bottom-e.top,a=xt(t,n/2,i/2);return{outer:{x:e.left,y:e.top,w:n,h:i},inner:{x:e.left+a.l,y:e.top+a.t,w:n-a.l-a.r,h:i-a.t-a.b}}}(e),i=n.outer,a=n.inner;t.fillStyle=e.backgroundColor,t.fillRect(i.x,i.y,i.w,i.h),i.w===a.w&&i.h===a.h||(t.save(),t.beginPath(),t.rect(i.x,i.y,i.w,i.h),t.clip(),t.fillStyle=e.borderColor,t.rect(a.x,a.y,a.w,a.h),t.fill("evenodd"),t.restore())},height:function(){var t=this._view;return t.base-t.y},inRange:function(t,e){return yt(this._view,t,e)},inLabelRange:function(t,e){var n=this._view;return mt(n)?yt(n,t,null):yt(n,null,e)},inXRange:function(t){return yt(this._view,t,null)},inYRange:function(t){return yt(this._view,null,t)},getCenterPoint:function(){var t,e,n=this._view;return mt(n)?(t=n.x,e=(n.y+n.base)/2):(t=(n.x+n.base)/2,e=n.y),{x:t,y:e}},getArea:function(){var t=this._view;return mt(t)?t.width*Math.abs(t.y-t.base):t.height*Math.abs(t.x-t.base)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y}}}),kt={},wt=st,Mt=dt,St=gt,Ct=_t;kt.Arc=wt,kt.Line=Mt,kt.Point=St,kt.Rectangle=Ct;var Pt=H._deprecated,At=H.valueOrDefault;function Dt(t,e,n){var i,a,r=n.barThickness,o=e.stackCount,s=e.pixels[t],l=H.isNullOrUndef(r)?function(t,e){var n,i,a,r,o=t._length;for(a=1,r=e.length;a<r;++a)o=Math.min(o,Math.abs(e[a]-e[a-1]));for(a=0,r=t.getTicks().length;a<r;++a)i=t.getPixelForTick(a),o=a>0?Math.min(o,Math.abs(i-n)):o,n=i;return o}(e.scale,e.pixels):-1;return H.isNullOrUndef(r)?(i=l*n.categoryPercentage,a=n.barPercentage):(i=r*o,a=1),{chunk:i/o,ratio:a,start:s-i/2}}N._set("bar",{hover:{mode:"label"},scales:{xAxes:[{type:"category",offset:!0,gridLines:{offsetGridLines:!0}}],yAxes:[{type:"linear"}]}}),N._set("global",{datasets:{bar:{categoryPercentage:.8,barPercentage:.9}}});var Tt=it.extend({dataElementType:kt.Rectangle,_dataElementOptions:["backgroundColor","borderColor","borderSkipped","borderWidth","barPercentage","barThickness","categoryPercentage","maxBarThickness","minBarLength"],initialize:function(){var t,e,n=this;it.prototype.initialize.apply(n,arguments),(t=n.getMeta()).stack=n.getDataset().stack,t.bar=!0,e=n._getIndexScale().options,Pt("bar chart",e.barPercentage,"scales.[x/y]Axes.barPercentage","dataset.barPercentage"),Pt("bar chart",e.barThickness,"scales.[x/y]Axes.barThickness","dataset.barThickness"),Pt("bar chart",e.categoryPercentage,"scales.[x/y]Axes.categoryPercentage","dataset.categoryPercentage"),Pt("bar chart",n._getValueScale().options.minBarLength,"scales.[x/y]Axes.minBarLength","dataset.minBarLength"),Pt("bar chart",e.maxBarThickness,"scales.[x/y]Axes.maxBarThickness","dataset.maxBarThickness")},update:function(t){var e,n,i=this.getMeta().data;for(this._ruler=this.getRuler(),e=0,n=i.length;e<n;++e)this.updateElement(i[e],e,t)},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=i.getDataset(),o=i._resolveDataElementOptions(t,e);t._xScale=i.getScaleForId(a.xAxisID),t._yScale=i.getScaleForId(a.yAxisID),t._datasetIndex=i.index,t._index=e,t._model={backgroundColor:o.backgroundColor,borderColor:o.borderColor,borderSkipped:o.borderSkipped,borderWidth:o.borderWidth,datasetLabel:r.label,label:i.chart.data.labels[e]},H.isArray(r.data[e])&&(t._model.borderSkipped=null),i._updateElementGeometry(t,e,n,o),t.pivot()},_updateElementGeometry:function(t,e,n,i){var a=this,r=t._model,o=a._getValueScale(),s=o.getBasePixel(),l=o.isHorizontal(),u=a._ruler||a.getRuler(),d=a.calculateBarValuePixels(a.index,e,i),h=a.calculateBarIndexPixels(a.index,e,u,i);r.horizontal=l,r.base=n?s:d.base,r.x=l?n?s:d.head:h.center,r.y=l?h.center:n?s:d.head,r.height=l?h.size:void 0,r.width=l?void 0:h.size},_getStacks:function(t){var e,n,i=this._getIndexScale(),a=i._getMatchingVisibleMetas(this._type),r=i.options.stacked,o=a.length,s=[];for(e=0;e<o&&(n=a[e],(!1===r||-1===s.indexOf(n.stack)||void 0===r&&void 0===n.stack)&&s.push(n.stack),n.index!==t);++e);return s},getStackCount:function(){return this._getStacks().length},getStackIndex:function(t,e){var n=this._getStacks(t),i=void 0!==e?n.indexOf(e):-1;return-1===i?n.length-1:i},getRuler:function(){var t,e,n=this._getIndexScale(),i=[];for(t=0,e=this.getMeta().data.length;t<e;++t)i.push(n.getPixelForValue(null,t,this.index));return{pixels:i,start:n._startPixel,end:n._endPixel,stackCount:this.getStackCount(),scale:n}},calculateBarValuePixels:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._getValueScale(),c=h.isHorizontal(),f=d.data.datasets,g=h._getMatchingVisibleMetas(this._type),p=h._parseValue(f[t].data[e]),m=n.minBarLength,v=h.options.stacked,b=this.getMeta().stack,x=void 0===p.start?0:p.max>=0&&p.min>=0?p.min:p.max,y=void 0===p.start?p.end:p.max>=0&&p.min>=0?p.max-p.min:p.min-p.max,_=g.length;if(v||void 0===v&&void 0!==b)for(i=0;i<_&&(a=g[i]).index!==t;++i)a.stack===b&&(r=void 0===(u=h._parseValue(f[a.index].data[e])).start?u.end:u.min>=0&&u.max>=0?u.max:u.min,(p.min<0&&r<0||p.max>=0&&r>0)&&(x+=r));return o=h.getPixelForValue(x),l=(s=h.getPixelForValue(x+y))-o,void 0!==m&&Math.abs(l)<m&&(l=m,s=y>=0&&!c||y<0&&c?o-m:o+m),{size:l,base:o,head:s,center:s+l/2}},calculateBarIndexPixels:function(t,e,n,i){var a="flex"===i.barThickness?function(t,e,n){var i,a=e.pixels,r=a[t],o=t>0?a[t-1]:null,s=t<a.length-1?a[t+1]:null,l=n.categoryPercentage;return null===o&&(o=r-(null===s?e.end-e.start:s-r)),null===s&&(s=r+r-o),i=r-(r-Math.min(o,s))/2*l,{chunk:Math.abs(s-o)/2*l/e.stackCount,ratio:n.barPercentage,start:i}}(e,n,i):Dt(e,n,i),r=this.getStackIndex(t,this.getMeta().stack),o=a.start+a.chunk*r+a.chunk/2,s=Math.min(At(i.maxBarThickness,1/0),a.chunk*a.ratio);return{base:o-s/2,head:o+s/2,center:o,size:s}},draw:function(){var t=this.chart,e=this._getValueScale(),n=this.getMeta().data,i=this.getDataset(),a=n.length,r=0;for(H.canvas.clipArea(t.ctx,t.chartArea);r<a;++r){var o=e._parseValue(i.data[r]);isNaN(o.min)||isNaN(o.max)||n[r].draw()}H.canvas.unclipArea(t.ctx)},_resolveDataElementOptions:function(){var t=this,e=H.extend({},it.prototype._resolveDataElementOptions.apply(t,arguments)),n=t._getIndexScale().options,i=t._getValueScale().options;return e.barPercentage=At(n.barPercentage,e.barPercentage),e.barThickness=At(n.barThickness,e.barThickness),e.categoryPercentage=At(n.categoryPercentage,e.categoryPercentage),e.maxBarThickness=At(n.maxBarThickness,e.maxBarThickness),e.minBarLength=At(i.minBarLength,e.minBarLength),e}}),It=H.valueOrDefault,Ft=H.options.resolve;N._set("bubble",{hover:{mode:"single"},scales:{xAxes:[{type:"linear",position:"bottom",id:"x-axis-0"}],yAxes:[{type:"linear",position:"left",id:"y-axis-0"}]},tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.datasets[t.datasetIndex].label||"",i=e.datasets[t.datasetIndex].data[t.index];return n+": ("+t.xLabel+", "+t.yLabel+", "+i.r+")"}}}});var Ot=it.extend({dataElementType:kt.Point,_dataElementOptions:["backgroundColor","borderColor","borderWidth","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth","hoverRadius","hitRadius","pointStyle","rotation"],update:function(t){var e=this,n=e.getMeta().data;H.each(n,(function(n,i){e.updateElement(n,i,t)}))},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=t.custom||{},o=i.getScaleForId(a.xAxisID),s=i.getScaleForId(a.yAxisID),l=i._resolveDataElementOptions(t,e),u=i.getDataset().data[e],d=i.index,h=n?o.getPixelForDecimal(.5):o.getPixelForValue("object"==typeof u?u:NaN,e,d),c=n?s.getBasePixel():s.getPixelForValue(u,e,d);t._xScale=o,t._yScale=s,t._options=l,t._datasetIndex=d,t._index=e,t._model={backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,hitRadius:l.hitRadius,pointStyle:l.pointStyle,rotation:l.rotation,radius:n?0:l.radius,skip:r.skip||isNaN(h)||isNaN(c),x:h,y:c},t.pivot()},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=It(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=It(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=It(n.hoverBorderWidth,n.borderWidth),e.radius=n.radius+n.hoverRadius},_resolveDataElementOptions:function(t,e){var n=this,i=n.chart,a=n.getDataset(),r=t.custom||{},o=a.data[e]||{},s=it.prototype._resolveDataElementOptions.apply(n,arguments),l={chart:i,dataIndex:e,dataset:a,datasetIndex:n.index};return n._cachedDataOpts===s&&(s=H.extend({},s)),s.radius=Ft([r.radius,o.r,n._config.radius,i.options.elements.point.radius],l,e),s}}),Lt=H.valueOrDefault,Rt=Math.PI,zt=2*Rt,Nt=Rt/2;N._set("doughnut",{animation:{animateRotate:!0,animateScale:!1},hover:{mode:"single"},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r]&&(a.data[r].hidden=!a.data[r].hidden);o.update()}},cutoutPercentage:50,rotation:-Nt,circumference:zt,tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.labels[t.index],i=": "+e.datasets[t.datasetIndex].data[t.index];return H.isArray(n)?(n=n.slice())[0]+=i:n+=i,n}}}});var Bt=it.extend({dataElementType:kt.Arc,linkScales:H.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],getRingIndex:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&++e;return e},update:function(t){var e,n,i,a,r=this,o=r.chart,s=o.chartArea,l=o.options,u=1,d=1,h=0,c=0,f=r.getMeta(),g=f.data,p=l.cutoutPercentage/100||0,m=l.circumference,v=r._getRingWeight(r.index);if(m<zt){var b=l.rotation%zt,x=(b+=b>=Rt?-zt:b<-Rt?zt:0)+m,y=Math.cos(b),_=Math.sin(b),k=Math.cos(x),w=Math.sin(x),M=b<=0&&x>=0||x>=zt,S=b<=Nt&&x>=Nt||x>=zt+Nt,C=b<=-Nt&&x>=-Nt||x>=Rt+Nt,P=b===-Rt||x>=Rt?-1:Math.min(y,y*p,k,k*p),A=C?-1:Math.min(_,_*p,w,w*p),D=M?1:Math.max(y,y*p,k,k*p),T=S?1:Math.max(_,_*p,w,w*p);u=(D-P)/2,d=(T-A)/2,h=-(D+P)/2,c=-(T+A)/2}for(i=0,a=g.length;i<a;++i)g[i]._options=r._resolveDataElementOptions(g[i],i);for(o.borderWidth=r.getMaxBorderWidth(),e=(s.right-s.left-o.borderWidth)/u,n=(s.bottom-s.top-o.borderWidth)/d,o.outerRadius=Math.max(Math.min(e,n)/2,0),o.innerRadius=Math.max(o.outerRadius*p,0),o.radiusLength=(o.outerRadius-o.innerRadius)/(r._getVisibleDatasetWeightTotal()||1),o.offsetX=h*o.outerRadius,o.offsetY=c*o.outerRadius,f.total=r.calculateTotal(),r.outerRadius=o.outerRadius-o.radiusLength*r._getRingWeightOffset(r.index),r.innerRadius=Math.max(r.outerRadius-o.radiusLength*v,0),i=0,a=g.length;i<a;++i)r.updateElement(g[i],i,t)},updateElement:function(t,e,n){var i=this,a=i.chart,r=a.chartArea,o=a.options,s=o.animation,l=(r.left+r.right)/2,u=(r.top+r.bottom)/2,d=o.rotation,h=o.rotation,c=i.getDataset(),f=n&&s.animateRotate?0:t.hidden?0:i.calculateCircumference(c.data[e])*(o.circumference/zt),g=n&&s.animateScale?0:i.innerRadius,p=n&&s.animateScale?0:i.outerRadius,m=t._options||{};H.extend(t,{_datasetIndex:i.index,_index:e,_model:{backgroundColor:m.backgroundColor,borderColor:m.borderColor,borderWidth:m.borderWidth,borderAlign:m.borderAlign,x:l+a.offsetX,y:u+a.offsetY,startAngle:d,endAngle:h,circumference:f,outerRadius:p,innerRadius:g,label:H.valueAtIndexOrDefault(c.label,e,a.data.labels[e])}});var v=t._model;n&&s.animateRotate||(v.startAngle=0===e?o.rotation:i.getMeta().data[e-1]._model.endAngle,v.endAngle=v.startAngle+v.circumference),t.pivot()},calculateTotal:function(){var t,e=this.getDataset(),n=this.getMeta(),i=0;return H.each(n.data,(function(n,a){t=e.data[a],isNaN(t)||n.hidden||(i+=Math.abs(t))})),i},calculateCircumference:function(t){var e=this.getMeta().total;return e>0&&!isNaN(t)?zt*(Math.abs(t)/e):0},getMaxBorderWidth:function(t){var e,n,i,a,r,o,s,l,u=0,d=this.chart;if(!t)for(e=0,n=d.data.datasets.length;e<n;++e)if(d.isDatasetVisible(e)){t=(i=d.getDatasetMeta(e)).data,e!==this.index&&(r=i.controller);break}if(!t)return 0;for(e=0,n=t.length;e<n;++e)a=t[e],r?(r._configure(),o=r._resolveDataElementOptions(a,e)):o=a._options,"inner"!==o.borderAlign&&(s=o.borderWidth,u=(l=o.hoverBorderWidth)>(u=s>u?s:u)?l:u);return u},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=Lt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Lt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Lt(n.hoverBorderWidth,n.borderWidth)},_getRingWeightOffset:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&(e+=this._getRingWeight(n));return e},_getRingWeight:function(t){return Math.max(Lt(this.chart.data.datasets[t].weight,1),0)},_getVisibleDatasetWeightTotal:function(){return this._getRingWeightOffset(this.chart.data.datasets.length)}});N._set("horizontalBar",{hover:{mode:"index",axis:"y"},scales:{xAxes:[{type:"linear",position:"bottom"}],yAxes:[{type:"category",position:"left",offset:!0,gridLines:{offsetGridLines:!0}}]},elements:{rectangle:{borderSkipped:"left"}},tooltips:{mode:"index",axis:"y"}}),N._set("global",{datasets:{horizontalBar:{categoryPercentage:.8,barPercentage:.9}}});var Et=Tt.extend({_getValueScaleId:function(){return this.getMeta().xAxisID},_getIndexScaleId:function(){return this.getMeta().yAxisID}}),Wt=H.valueOrDefault,Vt=H.options.resolve,Ht=H.canvas._isPointInArea;function jt(t,e){var n=t&&t.options.ticks||{},i=n.reverse,a=void 0===n.min?e:0,r=void 0===n.max?e:0;return{start:i?r:a,end:i?a:r}}function qt(t,e,n){var i=n/2,a=jt(t,i),r=jt(e,i);return{top:r.end,right:a.end,bottom:r.start,left:a.start}}function Ut(t){var e,n,i,a;return H.isObject(t)?(e=t.top,n=t.right,i=t.bottom,a=t.left):e=n=i=a=t,{top:e,right:n,bottom:i,left:a}}N._set("line",{showLines:!0,spanGaps:!1,hover:{mode:"label"},scales:{xAxes:[{type:"category",id:"x-axis-0"}],yAxes:[{type:"linear",id:"y-axis-0"}]}});var Yt=it.extend({datasetElementType:kt.Line,dataElementType:kt.Point,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth","cubicInterpolationMode","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.options,l=i._config,u=i._showLine=Wt(l.showLine,s.showLines);for(i._xScale=i.getScaleForId(a.xAxisID),i._yScale=i.getScaleForId(a.yAxisID),u&&(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=i._yScale,r._datasetIndex=i.index,r._children=o,r._model=i._resolveDatasetElementOptions(r),r.pivot()),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(u&&0!==r._model.tension&&i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i,a,r=this,o=r.getMeta(),s=t.custom||{},l=r.getDataset(),u=r.index,d=l.data[e],h=r._xScale,c=r._yScale,f=o.dataset._model,g=r._resolveDataElementOptions(t,e);i=h.getPixelForValue("object"==typeof d?d:NaN,e,u),a=n?c.getBasePixel():r.calculatePointY(d,e,u),t._xScale=h,t._yScale=c,t._options=g,t._datasetIndex=u,t._index=e,t._model={x:i,y:a,skip:s.skip||isNaN(i)||isNaN(a),radius:g.radius,pointStyle:g.pointStyle,rotation:g.rotation,backgroundColor:g.backgroundColor,borderColor:g.borderColor,borderWidth:g.borderWidth,tension:Wt(s.tension,f?f.tension:0),steppedLine:!!f&&f.steppedLine,hitRadius:g.hitRadius}},_resolveDatasetElementOptions:function(t){var e=this,n=e._config,i=t.custom||{},a=e.chart.options,r=a.elements.line,o=it.prototype._resolveDatasetElementOptions.apply(e,arguments);return o.spanGaps=Wt(n.spanGaps,a.spanGaps),o.tension=Wt(n.lineTension,r.tension),o.steppedLine=Vt([i.steppedLine,n.steppedLine,r.stepped]),o.clip=Ut(Wt(n.clip,qt(e._xScale,e._yScale,o.borderWidth))),o},calculatePointY:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._yScale,c=0,f=0;if(h.options.stacked){for(s=+h.getRightValue(t),u=(l=d._getSortedVisibleDatasetMetas()).length,i=0;i<u&&(r=l[i]).index!==n;++i)a=d.data.datasets[r.index],"line"===r.type&&r.yAxisID===h.id&&((o=+h.getRightValue(a.data[e]))<0?f+=o||0:c+=o||0);return s<0?h.getPixelForValue(f+s):h.getPixelForValue(c+s)}return h.getPixelForValue(t)},updateBezierControlPoints:function(){var t,e,n,i,a=this.chart,r=this.getMeta(),o=r.dataset._model,s=a.chartArea,l=r.data||[];function u(t,e,n){return Math.max(Math.min(t,n),e)}if(o.spanGaps&&(l=l.filter((function(t){return!t._model.skip}))),"monotone"===o.cubicInterpolationMode)H.splineCurveMonotone(l);else for(t=0,e=l.length;t<e;++t)n=l[t]._model,i=H.splineCurve(H.previousItem(l,t)._model,n,H.nextItem(l,t)._model,o.tension),n.controlPointPreviousX=i.previous.x,n.controlPointPreviousY=i.previous.y,n.controlPointNextX=i.next.x,n.controlPointNextY=i.next.y;if(a.options.elements.line.capBezierPoints)for(t=0,e=l.length;t<e;++t)n=l[t]._model,Ht(n,s)&&(t>0&&Ht(l[t-1]._model,s)&&(n.controlPointPreviousX=u(n.controlPointPreviousX,s.left,s.right),n.controlPointPreviousY=u(n.controlPointPreviousY,s.top,s.bottom)),t<l.length-1&&Ht(l[t+1]._model,s)&&(n.controlPointNextX=u(n.controlPointNextX,s.left,s.right),n.controlPointNextY=u(n.controlPointNextY,s.top,s.bottom)))},draw:function(){var t,e=this.chart,n=this.getMeta(),i=n.data||[],a=e.chartArea,r=e.canvas,o=0,s=i.length;for(this._showLine&&(t=n.dataset._model.clip,H.canvas.clipArea(e.ctx,{left:!1===t.left?0:a.left-t.left,right:!1===t.right?r.width:a.right+t.right,top:!1===t.top?0:a.top-t.top,bottom:!1===t.bottom?r.height:a.bottom+t.bottom}),n.dataset.draw(),H.canvas.unclipArea(e.ctx));o<s;++o)i[o].draw(a)},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Wt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Wt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Wt(n.hoverBorderWidth,n.borderWidth),e.radius=Wt(n.hoverRadius,n.radius)}}),Gt=H.options.resolve;N._set("polarArea",{scale:{type:"radialLinear",angleLines:{display:!1},gridLines:{circular:!0},pointLabels:{display:!1},ticks:{beginAtZero:!0}},animation:{animateRotate:!0,animateScale:!0},startAngle:-.5*Math.PI,legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r].hidden=!a.data[r].hidden;o.update()}},tooltips:{callbacks:{title:function(){return""},label:function(t,e){return e.labels[t.index]+": "+t.yLabel}}}});var Xt=it.extend({dataElementType:kt.Arc,linkScales:H.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i,a=this,r=a.getDataset(),o=a.getMeta(),s=a.chart.options.startAngle||0,l=a._starts=[],u=a._angles=[],d=o.data;for(a._updateRadius(),o.count=a.countVisibleElements(),e=0,n=r.data.length;e<n;e++)l[e]=s,i=a._computeAngle(e),u[e]=i,s+=i;for(e=0,n=d.length;e<n;++e)d[e]._options=a._resolveDataElementOptions(d[e],e),a.updateElement(d[e],e,t)},_updateRadius:function(){var t=this,e=t.chart,n=e.chartArea,i=e.options,a=Math.min(n.right-n.left,n.bottom-n.top);e.outerRadius=Math.max(a/2,0),e.innerRadius=Math.max(i.cutoutPercentage?e.outerRadius/100*i.cutoutPercentage:1,0),e.radiusLength=(e.outerRadius-e.innerRadius)/e.getVisibleDatasetCount(),t.outerRadius=e.outerRadius-e.radiusLength*t.index,t.innerRadius=t.outerRadius-e.radiusLength},updateElement:function(t,e,n){var i=this,a=i.chart,r=i.getDataset(),o=a.options,s=o.animation,l=a.scale,u=a.data.labels,d=l.xCenter,h=l.yCenter,c=o.startAngle,f=t.hidden?0:l.getDistanceFromCenterForValue(r.data[e]),g=i._starts[e],p=g+(t.hidden?0:i._angles[e]),m=s.animateScale?0:l.getDistanceFromCenterForValue(r.data[e]),v=t._options||{};H.extend(t,{_datasetIndex:i.index,_index:e,_scale:l,_model:{backgroundColor:v.backgroundColor,borderColor:v.borderColor,borderWidth:v.borderWidth,borderAlign:v.borderAlign,x:d,y:h,innerRadius:0,outerRadius:n?m:f,startAngle:n&&s.animateRotate?c:g,endAngle:n&&s.animateRotate?c:p,label:H.valueAtIndexOrDefault(u,e,u[e])}}),t.pivot()},countVisibleElements:function(){var t=this.getDataset(),e=this.getMeta(),n=0;return H.each(e.data,(function(e,i){isNaN(t.data[i])||e.hidden||n++})),n},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor,a=H.valueOrDefault;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=a(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=a(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=a(n.hoverBorderWidth,n.borderWidth)},_computeAngle:function(t){var e=this,n=this.getMeta().count,i=e.getDataset(),a=e.getMeta();if(isNaN(i.data[t])||a.data[t].hidden)return 0;var r={chart:e.chart,dataIndex:t,dataset:i,datasetIndex:e.index};return Gt([e.chart.options.elements.arc.angle,2*Math.PI/n],r,t)}});N._set("pie",H.clone(N.doughnut)),N._set("pie",{cutoutPercentage:0});var Kt=Bt,Zt=H.valueOrDefault;N._set("radar",{spanGaps:!1,scale:{type:"radialLinear"},elements:{line:{fill:"start",tension:0}}});var $t=it.extend({datasetElementType:kt.Line,dataElementType:kt.Point,linkScales:H.noop,_datasetElementOptions:["backgroundColor","borderWidth","borderColor","borderCapStyle","borderDash","borderDashOffset","borderJoinStyle","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.scale,l=i._config;for(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=s,r._datasetIndex=i.index,r._children=o,r._loop=!0,r._model=i._resolveDatasetElementOptions(r),r.pivot(),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i=this,a=t.custom||{},r=i.getDataset(),o=i.chart.scale,s=o.getPointPositionForValue(e,r.data[e]),l=i._resolveDataElementOptions(t,e),u=i.getMeta().dataset._model,d=n?o.xCenter:s.x,h=n?o.yCenter:s.y;t._scale=o,t._options=l,t._datasetIndex=i.index,t._index=e,t._model={x:d,y:h,skip:a.skip||isNaN(d)||isNaN(h),radius:l.radius,pointStyle:l.pointStyle,rotation:l.rotation,backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,tension:Zt(a.tension,u?u.tension:0),hitRadius:l.hitRadius}},_resolveDatasetElementOptions:function(){var t=this,e=t._config,n=t.chart.options,i=it.prototype._resolveDatasetElementOptions.apply(t,arguments);return i.spanGaps=Zt(e.spanGaps,n.spanGaps),i.tension=Zt(e.lineTension,n.elements.line.tension),i},updateBezierControlPoints:function(){var t,e,n,i,a=this.getMeta(),r=this.chart.chartArea,o=a.data||[];function s(t,e,n){return Math.max(Math.min(t,n),e)}for(a.dataset._model.spanGaps&&(o=o.filter((function(t){return!t._model.skip}))),t=0,e=o.length;t<e;++t)n=o[t]._model,i=H.splineCurve(H.previousItem(o,t,!0)._model,n,H.nextItem(o,t,!0)._model,n.tension),n.controlPointPreviousX=s(i.previous.x,r.left,r.right),n.controlPointPreviousY=s(i.previous.y,r.top,r.bottom),n.controlPointNextX=s(i.next.x,r.left,r.right),n.controlPointNextY=s(i.next.y,r.top,r.bottom)},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Zt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Zt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Zt(n.hoverBorderWidth,n.borderWidth),e.radius=Zt(n.hoverRadius,n.radius)}});N._set("scatter",{hover:{mode:"single"},scales:{xAxes:[{id:"x-axis-1",type:"linear",position:"bottom"}],yAxes:[{id:"y-axis-1",type:"linear",position:"left"}]},tooltips:{callbacks:{title:function(){return""},label:function(t){return"("+t.xLabel+", "+t.yLabel+")"}}}}),N._set("global",{datasets:{scatter:{showLine:!1}}});var Jt={bar:Tt,bubble:Ot,doughnut:Bt,horizontalBar:Et,line:Yt,polarArea:Xt,pie:Kt,radar:$t,scatter:Yt};function Qt(t,e){return t.native?{x:t.x,y:t.y}:H.getRelativePosition(t,e)}function te(t,e){var n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas();for(i=0,r=l.length;i<r;++i)for(a=0,o=(n=l[i].data).length;a<o;++a)(s=n[a])._view.skip||e(s)}function ee(t,e){var n=[];return te(t,(function(t){t.inRange(e.x,e.y)&&n.push(t)})),n}function ne(t,e,n,i){var a=Number.POSITIVE_INFINITY,r=[];return te(t,(function(t){if(!n||t.inRange(e.x,e.y)){var o=t.getCenterPoint(),s=i(e,o);s<a?(r=[t],a=s):s===a&&r.push(t)}})),r}function ie(t){var e=-1!==t.indexOf("x"),n=-1!==t.indexOf("y");return function(t,i){var a=e?Math.abs(t.x-i.x):0,r=n?Math.abs(t.y-i.y):0;return Math.sqrt(Math.pow(a,2)+Math.pow(r,2))}}function ae(t,e,n){var i=Qt(e,t);n.axis=n.axis||"x";var a=ie(n.axis),r=n.intersect?ee(t,i):ne(t,i,!1,a),o=[];return r.length?(t._getSortedVisibleDatasetMetas().forEach((function(t){var e=t.data[r[0]._index];e&&!e._view.skip&&o.push(e)})),o):[]}var re={modes:{single:function(t,e){var n=Qt(e,t),i=[];return te(t,(function(t){if(t.inRange(n.x,n.y))return i.push(t),i})),i.slice(0,1)},label:ae,index:ae,dataset:function(t,e,n){var i=Qt(e,t);n.axis=n.axis||"xy";var a=ie(n.axis),r=n.intersect?ee(t,i):ne(t,i,!1,a);return r.length>0&&(r=t.getDatasetMeta(r[0]._datasetIndex).data),r},"x-axis":function(t,e){return ae(t,e,{intersect:!1})},point:function(t,e){return ee(t,Qt(e,t))},nearest:function(t,e,n){var i=Qt(e,t);n.axis=n.axis||"xy";var a=ie(n.axis);return ne(t,i,n.intersect,a)},x:function(t,e,n){var i=Qt(e,t),a=[],r=!1;return te(t,(function(t){t.inXRange(i.x)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a},y:function(t,e,n){var i=Qt(e,t),a=[],r=!1;return te(t,(function(t){t.inYRange(i.y)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a}}},oe=H.extend;function se(t,e){return H.where(t,(function(t){return t.pos===e}))}function le(t,e){return t.sort((function(t,n){var i=e?n:t,a=e?t:n;return i.weight===a.weight?i.index-a.index:i.weight-a.weight}))}function ue(t,e,n,i){return Math.max(t[n],e[n])+Math.max(t[i],e[i])}function de(t,e,n){var i,a,r=n.box,o=t.maxPadding;if(n.size&&(t[n.pos]-=n.size),n.size=n.horizontal?r.height:r.width,t[n.pos]+=n.size,r.getPadding){var s=r.getPadding();o.top=Math.max(o.top,s.top),o.left=Math.max(o.left,s.left),o.bottom=Math.max(o.bottom,s.bottom),o.right=Math.max(o.right,s.right)}if(i=e.outerWidth-ue(o,t,"left","right"),a=e.outerHeight-ue(o,t,"top","bottom"),i!==t.w||a!==t.h){t.w=i,t.h=a;var l=n.horizontal?[i,t.w]:[a,t.h];return!(l[0]===l[1]||isNaN(l[0])&&isNaN(l[1]))}}function he(t,e){var n=e.maxPadding;function i(t){var i={left:0,top:0,right:0,bottom:0};return t.forEach((function(t){i[t]=Math.max(e[t],n[t])})),i}return i(t?["left","right"]:["top","bottom"])}function ce(t,e,n){var i,a,r,o,s,l,u=[];for(i=0,a=t.length;i<a;++i)(o=(r=t[i]).box).update(r.width||e.w,r.height||e.h,he(r.horizontal,e)),de(e,n,r)&&(l=!0,u.length&&(s=!0)),o.fullWidth||u.push(r);return s&&ce(u,e,n)||l}function fe(t,e,n){var i,a,r,o,s=n.padding,l=e.x,u=e.y;for(i=0,a=t.length;i<a;++i)o=(r=t[i]).box,r.horizontal?(o.left=o.fullWidth?s.left:e.left,o.right=o.fullWidth?n.outerWidth-s.right:e.left+e.w,o.top=u,o.bottom=u+o.height,o.width=o.right-o.left,u=o.bottom):(o.left=l,o.right=l+o.width,o.top=e.top,o.bottom=e.top+e.h,o.height=o.bottom-o.top,l=o.right);e.x=l,e.y=u}N._set("global",{layout:{padding:{top:0,right:0,bottom:0,left:0}}});var ge,pe={defaults:{},addBox:function(t,e){t.boxes||(t.boxes=[]),e.fullWidth=e.fullWidth||!1,e.position=e.position||"top",e.weight=e.weight||0,e._layers=e._layers||function(){return[{z:0,draw:function(){e.draw.apply(e,arguments)}}]},t.boxes.push(e)},removeBox:function(t,e){var n=t.boxes?t.boxes.indexOf(e):-1;-1!==n&&t.boxes.splice(n,1)},configure:function(t,e,n){for(var i,a=["fullWidth","position","weight"],r=a.length,o=0;o<r;++o)i=a[o],n.hasOwnProperty(i)&&(e[i]=n[i])},update:function(t,e,n){if(t){var i=t.options.layout||{},a=H.options.toPadding(i.padding),r=e-a.width,o=n-a.height,s=function(t){var e=function(t){var e,n,i,a=[];for(e=0,n=(t||[]).length;e<n;++e)i=t[e],a.push({index:e,box:i,pos:i.position,horizontal:i.isHorizontal(),weight:i.weight});return a}(t),n=le(se(e,"left"),!0),i=le(se(e,"right")),a=le(se(e,"top"),!0),r=le(se(e,"bottom"));return{leftAndTop:n.concat(a),rightAndBottom:i.concat(r),chartArea:se(e,"chartArea"),vertical:n.concat(i),horizontal:a.concat(r)}}(t.boxes),l=s.vertical,u=s.horizontal,d=Object.freeze({outerWidth:e,outerHeight:n,padding:a,availableWidth:r,vBoxMaxWidth:r/2/l.length,hBoxMaxHeight:o/2}),h=oe({maxPadding:oe({},a),w:r,h:o,x:a.left,y:a.top},a);!function(t,e){var n,i,a;for(n=0,i=t.length;n<i;++n)(a=t[n]).width=a.horizontal?a.box.fullWidth&&e.availableWidth:e.vBoxMaxWidth,a.height=a.horizontal&&e.hBoxMaxHeight}(l.concat(u),d),ce(l,h,d),ce(u,h,d)&&ce(l,h,d),function(t){var e=t.maxPadding;function n(n){var i=Math.max(e[n]-t[n],0);return t[n]+=i,i}t.y+=n("top"),t.x+=n("left"),n("right"),n("bottom")}(h),fe(s.leftAndTop,h,d),h.x+=h.w,h.y+=h.h,fe(s.rightAndBottom,h,d),t.chartArea={left:h.left,top:h.top,right:h.left+h.w,bottom:h.top+h.h},H.each(s.chartArea,(function(e){var n=e.box;oe(n,t.chartArea),n.update(h.w,h.h)}))}}},me=(ge=Object.freeze({__proto__:null,default:"@keyframes chartjs-render-animation{from{opacity:.99}to{opacity:1}}.chartjs-render-monitor{animation:chartjs-render-animation 1ms}.chartjs-size-monitor,.chartjs-size-monitor-expand,.chartjs-size-monitor-shrink{position:absolute;direction:ltr;left:0;top:0;right:0;bottom:0;overflow:hidden;pointer-events:none;visibility:hidden;z-index:-1}.chartjs-size-monitor-expand>div{position:absolute;width:1000000px;height:1000000px;left:0;top:0}.chartjs-size-monitor-shrink>div{position:absolute;width:200%;height:200%;left:0;top:0}"}))&&ge.default||ge,ve="$chartjs",be="chartjs-size-monitor",xe="chartjs-render-monitor",ye="chartjs-render-animation",_e=["animationstart","webkitAnimationStart"],ke={touchstart:"mousedown",touchmove:"mousemove",touchend:"mouseup",pointerenter:"mouseenter",pointerdown:"mousedown",pointermove:"mousemove",pointerup:"mouseup",pointerleave:"mouseout",pointerout:"mouseout"};function we(t,e){var n=H.getStyle(t,e),i=n&&n.match(/^(\d+)(\.\d+)?px$/);return i?Number(i[1]):void 0}var Me=!!function(){var t=!1;try{var e=Object.defineProperty({},"passive",{get:function(){t=!0}});window.addEventListener("e",null,e)}catch(t){}return t}()&&{passive:!0};function Se(t,e,n){t.addEventListener(e,n,Me)}function Ce(t,e,n){t.removeEventListener(e,n,Me)}function Pe(t,e,n,i,a){return{type:t,chart:e,native:a||null,x:void 0!==n?n:null,y:void 0!==i?i:null}}function Ae(t){var e=document.createElement("div");return e.className=t||"",e}function De(t,e,n){var i,a,r,o,s=t[ve]||(t[ve]={}),l=s.resizer=function(t){var e=Ae(be),n=Ae(be+"-expand"),i=Ae(be+"-shrink");n.appendChild(Ae()),i.appendChild(Ae()),e.appendChild(n),e.appendChild(i),e._reset=function(){n.scrollLeft=1e6,n.scrollTop=1e6,i.scrollLeft=1e6,i.scrollTop=1e6};var a=function(){e._reset(),t()};return Se(n,"scroll",a.bind(n,"expand")),Se(i,"scroll",a.bind(i,"shrink")),e}((i=function(){if(s.resizer){var i=n.options.maintainAspectRatio&&t.parentNode,a=i?i.clientWidth:0;e(Pe("resize",n)),i&&i.clientWidth<a&&n.canvas&&e(Pe("resize",n))}},r=!1,o=[],function(){o=Array.prototype.slice.call(arguments),a=a||this,r||(r=!0,H.requestAnimFrame.call(window,(function(){r=!1,i.apply(a,o)})))}));!function(t,e){var n=t[ve]||(t[ve]={}),i=n.renderProxy=function(t){t.animationName===ye&&e()};H.each(_e,(function(e){Se(t,e,i)})),n.reflow=!!t.offsetParent,t.classList.add(xe)}(t,(function(){if(s.resizer){var e=t.parentNode;e&&e!==l.parentNode&&e.insertBefore(l,e.firstChild),l._reset()}}))}function Te(t){var e=t[ve]||{},n=e.resizer;delete e.resizer,function(t){var e=t[ve]||{},n=e.renderProxy;n&&(H.each(_e,(function(e){Ce(t,e,n)})),delete e.renderProxy),t.classList.remove(xe)}(t),n&&n.parentNode&&n.parentNode.removeChild(n)}var Ie={disableCSSInjection:!1,_enabled:"undefined"!=typeof window&&"undefined"!=typeof document,_ensureLoaded:function(t){if(!this.disableCSSInjection){var e=t.getRootNode?t.getRootNode():document;!function(t,e){var n=t[ve]||(t[ve]={});if(!n.containsStyles){n.containsStyles=!0,e="/* Chart.js */\n"+e;var i=document.createElement("style");i.setAttribute("type","text/css"),i.appendChild(document.createTextNode(e)),t.appendChild(i)}}(e.host?e:document.head,me)}},acquireContext:function(t,e){"string"==typeof t?t=document.getElementById(t):t.length&&(t=t[0]),t&&t.canvas&&(t=t.canvas);var n=t&&t.getContext&&t.getContext("2d");return n&&n.canvas===t?(this._ensureLoaded(t),function(t,e){var n=t.style,i=t.getAttribute("height"),a=t.getAttribute("width");if(t[ve]={initial:{height:i,width:a,style:{display:n.display,height:n.height,width:n.width}}},n.display=n.display||"block",null===a||""===a){var r=we(t,"width");void 0!==r&&(t.width=r)}if(null===i||""===i)if(""===t.style.height)t.height=t.width/(e.options.aspectRatio||2);else{var o=we(t,"height");void 0!==r&&(t.height=o)}}(t,e),n):null},releaseContext:function(t){var e=t.canvas;if(e[ve]){var n=e[ve].initial;["height","width"].forEach((function(t){var i=n[t];H.isNullOrUndef(i)?e.removeAttribute(t):e.setAttribute(t,i)})),H.each(n.style||{},(function(t,n){e.style[n]=t})),e.width=e.width,delete e[ve]}},addEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=n[ve]||(n[ve]={});Se(i,e,(a.proxies||(a.proxies={}))[t.id+"_"+e]=function(e){n(function(t,e){var n=ke[t.type]||t.type,i=H.getRelativePosition(t,e);return Pe(n,e,i.x,i.y,t)}(e,t))})}else De(i,n,t)},removeEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=((n[ve]||{}).proxies||{})[t.id+"_"+e];a&&Ce(i,e,a)}else Te(i)}};H.addEvent=Se,H.removeEvent=Ce;var Fe=Ie._enabled?Ie:{acquireContext:function(t){return t&&t.canvas&&(t=t.canvas),t&&t.getContext("2d")||null}},Oe=H.extend({initialize:function(){},acquireContext:function(){},releaseContext:function(){},addEventListener:function(){},removeEventListener:function(){}},Fe);N._set("global",{plugins:{}});var Le={_plugins:[],_cacheId:0,register:function(t){var e=this._plugins;[].concat(t).forEach((function(t){-1===e.indexOf(t)&&e.push(t)})),this._cacheId++},unregister:function(t){var e=this._plugins;[].concat(t).forEach((function(t){var n=e.indexOf(t);-1!==n&&e.splice(n,1)})),this._cacheId++},clear:function(){this._plugins=[],this._cacheId++},count:function(){return this._plugins.length},getAll:function(){return this._plugins},notify:function(t,e,n){var i,a,r,o,s,l=this.descriptors(t),u=l.length;for(i=0;i<u;++i)if("function"==typeof(s=(r=(a=l[i]).plugin)[e])&&((o=[t].concat(n||[])).push(a.options),!1===s.apply(r,o)))return!1;return!0},descriptors:function(t){var e=t.$plugins||(t.$plugins={});if(e.id===this._cacheId)return e.descriptors;var n=[],i=[],a=t&&t.config||{},r=a.options&&a.options.plugins||{};return this._plugins.concat(a.plugins||[]).forEach((function(t){if(-1===n.indexOf(t)){var e=t.id,a=r[e];!1!==a&&(!0===a&&(a=H.clone(N.global.plugins[e])),n.push(t),i.push({plugin:t,options:a||{}}))}})),e.descriptors=i,e.id=this._cacheId,i},_invalidate:function(t){delete t.$plugins}},Re={constructors:{},defaults:{},registerScaleType:function(t,e,n){this.constructors[t]=e,this.defaults[t]=H.clone(n)},getScaleConstructor:function(t){return this.constructors.hasOwnProperty(t)?this.constructors[t]:void 0},getScaleDefaults:function(t){return this.defaults.hasOwnProperty(t)?H.merge(Object.create(null),[N.scale,this.defaults[t]]):{}},updateScaleDefaults:function(t,e){this.defaults.hasOwnProperty(t)&&(this.defaults[t]=H.extend(this.defaults[t],e))},addScalesToLayout:function(t){H.each(t.scales,(function(e){e.fullWidth=e.options.fullWidth,e.position=e.options.position,e.weight=e.options.weight,pe.addBox(t,e)}))}},ze=H.valueOrDefault,Ne=H.rtl.getRtlAdapter;N._set("global",{tooltips:{enabled:!0,custom:null,mode:"nearest",position:"average",intersect:!0,backgroundColor:"rgba(0,0,0,0.8)",titleFontStyle:"bold",titleSpacing:2,titleMarginBottom:6,titleFontColor:"#fff",titleAlign:"left",bodySpacing:2,bodyFontColor:"#fff",bodyAlign:"left",footerFontStyle:"bold",footerSpacing:2,footerMarginTop:6,footerFontColor:"#fff",footerAlign:"left",yPadding:6,xPadding:6,caretPadding:2,caretSize:5,cornerRadius:6,multiKeyBackground:"#fff",displayColors:!0,borderColor:"rgba(0,0,0,0)",borderWidth:0,callbacks:{beforeTitle:H.noop,title:function(t,e){var n="",i=e.labels,a=i?i.length:0;if(t.length>0){var r=t[0];r.label?n=r.label:r.xLabel?n=r.xLabel:a>0&&r.index<a&&(n=i[r.index])}return n},afterTitle:H.noop,beforeBody:H.noop,beforeLabel:H.noop,label:function(t,e){var n=e.datasets[t.datasetIndex].label||"";return n&&(n+=": "),H.isNullOrUndef(t.value)?n+=t.yLabel:n+=t.value,n},labelColor:function(t,e){var n=e.getDatasetMeta(t.datasetIndex).data[t.index]._view;return{borderColor:n.borderColor,backgroundColor:n.backgroundColor}},labelTextColor:function(){return this._options.bodyFontColor},afterLabel:H.noop,afterBody:H.noop,beforeFooter:H.noop,footer:H.noop,afterFooter:H.noop}}});var Be={average:function(t){if(!t.length)return!1;var e,n,i=0,a=0,r=0;for(e=0,n=t.length;e<n;++e){var o=t[e];if(o&&o.hasValue()){var s=o.tooltipPosition();i+=s.x,a+=s.y,++r}}return{x:i/r,y:a/r}},nearest:function(t,e){var n,i,a,r=e.x,o=e.y,s=Number.POSITIVE_INFINITY;for(n=0,i=t.length;n<i;++n){var l=t[n];if(l&&l.hasValue()){var u=l.getCenterPoint(),d=H.distanceBetweenPoints(e,u);d<s&&(s=d,a=l)}}if(a){var h=a.tooltipPosition();r=h.x,o=h.y}return{x:r,y:o}}};function Ee(t,e){return e&&(H.isArray(e)?Array.prototype.push.apply(t,e):t.push(e)),t}function We(t){return("string"==typeof t||t instanceof String)&&t.indexOf("\n")>-1?t.split("\n"):t}function Ve(t){var e=N.global;return{xPadding:t.xPadding,yPadding:t.yPadding,xAlign:t.xAlign,yAlign:t.yAlign,rtl:t.rtl,textDirection:t.textDirection,bodyFontColor:t.bodyFontColor,_bodyFontFamily:ze(t.bodyFontFamily,e.defaultFontFamily),_bodyFontStyle:ze(t.bodyFontStyle,e.defaultFontStyle),_bodyAlign:t.bodyAlign,bodyFontSize:ze(t.bodyFontSize,e.defaultFontSize),bodySpacing:t.bodySpacing,titleFontColor:t.titleFontColor,_titleFontFamily:ze(t.titleFontFamily,e.defaultFontFamily),_titleFontStyle:ze(t.titleFontStyle,e.defaultFontStyle),titleFontSize:ze(t.titleFontSize,e.defaultFontSize),_titleAlign:t.titleAlign,titleSpacing:t.titleSpacing,titleMarginBottom:t.titleMarginBottom,footerFontColor:t.footerFontColor,_footerFontFamily:ze(t.footerFontFamily,e.defaultFontFamily),_footerFontStyle:ze(t.footerFontStyle,e.defaultFontStyle),footerFontSize:ze(t.footerFontSize,e.defaultFontSize),_footerAlign:t.footerAlign,footerSpacing:t.footerSpacing,footerMarginTop:t.footerMarginTop,caretSize:t.caretSize,cornerRadius:t.cornerRadius,backgroundColor:t.backgroundColor,opacity:0,legendColorBackground:t.multiKeyBackground,displayColors:t.displayColors,borderColor:t.borderColor,borderWidth:t.borderWidth}}function He(t,e){return"center"===e?t.x+t.width/2:"right"===e?t.x+t.width-t.xPadding:t.x+t.xPadding}function je(t){return Ee([],We(t))}var qe=K.extend({initialize:function(){this._model=Ve(this._options),this._lastActive=[]},getTitle:function(){var t=this,e=t._options,n=e.callbacks,i=n.beforeTitle.apply(t,arguments),a=n.title.apply(t,arguments),r=n.afterTitle.apply(t,arguments),o=[];return o=Ee(o,We(i)),o=Ee(o,We(a)),o=Ee(o,We(r))},getBeforeBody:function(){return je(this._options.callbacks.beforeBody.apply(this,arguments))},getBody:function(t,e){var n=this,i=n._options.callbacks,a=[];return H.each(t,(function(t){var r={before:[],lines:[],after:[]};Ee(r.before,We(i.beforeLabel.call(n,t,e))),Ee(r.lines,i.label.call(n,t,e)),Ee(r.after,We(i.afterLabel.call(n,t,e))),a.push(r)})),a},getAfterBody:function(){return je(this._options.callbacks.afterBody.apply(this,arguments))},getFooter:function(){var t=this,e=t._options.callbacks,n=e.beforeFooter.apply(t,arguments),i=e.footer.apply(t,arguments),a=e.afterFooter.apply(t,arguments),r=[];return r=Ee(r,We(n)),r=Ee(r,We(i)),r=Ee(r,We(a))},update:function(t){var e,n,i,a,r,o,s,l,u,d,h=this,c=h._options,f=h._model,g=h._model=Ve(c),p=h._active,m=h._data,v={xAlign:f.xAlign,yAlign:f.yAlign},b={x:f.x,y:f.y},x={width:f.width,height:f.height},y={x:f.caretX,y:f.caretY};if(p.length){g.opacity=1;var _=[],k=[];y=Be[c.position].call(h,p,h._eventPosition);var w=[];for(e=0,n=p.length;e<n;++e)w.push((i=p[e],a=void 0,r=void 0,o=void 0,s=void 0,l=void 0,u=void 0,d=void 0,a=i._xScale,r=i._yScale||i._scale,o=i._index,s=i._datasetIndex,l=i._chart.getDatasetMeta(s).controller,u=l._getIndexScale(),d=l._getValueScale(),{xLabel:a?a.getLabelForIndex(o,s):"",yLabel:r?r.getLabelForIndex(o,s):"",label:u?""+u.getLabelForIndex(o,s):"",value:d?""+d.getLabelForIndex(o,s):"",index:o,datasetIndex:s,x:i._model.x,y:i._model.y}));c.filter&&(w=w.filter((function(t){return c.filter(t,m)}))),c.itemSort&&(w=w.sort((function(t,e){return c.itemSort(t,e,m)}))),H.each(w,(function(t){_.push(c.callbacks.labelColor.call(h,t,h._chart)),k.push(c.callbacks.labelTextColor.call(h,t,h._chart))})),g.title=h.getTitle(w,m),g.beforeBody=h.getBeforeBody(w,m),g.body=h.getBody(w,m),g.afterBody=h.getAfterBody(w,m),g.footer=h.getFooter(w,m),g.x=y.x,g.y=y.y,g.caretPadding=c.caretPadding,g.labelColors=_,g.labelTextColors=k,g.dataPoints=w,x=function(t,e){var n=t._chart.ctx,i=2*e.yPadding,a=0,r=e.body,o=r.reduce((function(t,e){return t+e.before.length+e.lines.length+e.after.length}),0);o+=e.beforeBody.length+e.afterBody.length;var s=e.title.length,l=e.footer.length,u=e.titleFontSize,d=e.bodyFontSize,h=e.footerFontSize;i+=s*u,i+=s?(s-1)*e.titleSpacing:0,i+=s?e.titleMarginBottom:0,i+=o*d,i+=o?(o-1)*e.bodySpacing:0,i+=l?e.footerMarginTop:0,i+=l*h,i+=l?(l-1)*e.footerSpacing:0;var c=0,f=function(t){a=Math.max(a,n.measureText(t).width+c)};return n.font=H.fontString(u,e._titleFontStyle,e._titleFontFamily),H.each(e.title,f),n.font=H.fontString(d,e._bodyFontStyle,e._bodyFontFamily),H.each(e.beforeBody.concat(e.afterBody),f),c=e.displayColors?d+2:0,H.each(r,(function(t){H.each(t.before,f),H.each(t.lines,f),H.each(t.after,f)})),c=0,n.font=H.fontString(h,e._footerFontStyle,e._footerFontFamily),H.each(e.footer,f),{width:a+=2*e.xPadding,height:i}}(this,g),b=function(t,e,n,i){var a=t.x,r=t.y,o=t.caretSize,s=t.caretPadding,l=t.cornerRadius,u=n.xAlign,d=n.yAlign,h=o+s,c=l+s;return"right"===u?a-=e.width:"center"===u&&((a-=e.width/2)+e.width>i.width&&(a=i.width-e.width),a<0&&(a=0)),"top"===d?r+=h:r-="bottom"===d?e.height+h:e.height/2,"center"===d?"left"===u?a+=h:"right"===u&&(a-=h):"left"===u?a-=c:"right"===u&&(a+=c),{x:a,y:r}}(g,x,v=function(t,e){var n,i,a,r,o,s=t._model,l=t._chart,u=t._chart.chartArea,d="center",h="center";s.y<e.height?h="top":s.y>l.height-e.height&&(h="bottom");var c=(u.left+u.right)/2,f=(u.top+u.bottom)/2;"center"===h?(n=function(t){return t<=c},i=function(t){return t>c}):(n=function(t){return t<=e.width/2},i=function(t){return t>=l.width-e.width/2}),a=function(t){return t+e.width+s.caretSize+s.caretPadding>l.width},r=function(t){return t-e.width-s.caretSize-s.caretPadding<0},o=function(t){return t<=f?"top":"bottom"},n(s.x)?(d="left",a(s.x)&&(d="center",h=o(s.y))):i(s.x)&&(d="right",r(s.x)&&(d="center",h=o(s.y)));var g=t._options;return{xAlign:g.xAlign?g.xAlign:d,yAlign:g.yAlign?g.yAlign:h}}(this,x),h._chart)}else g.opacity=0;return g.xAlign=v.xAlign,g.yAlign=v.yAlign,g.x=b.x,g.y=b.y,g.width=x.width,g.height=x.height,g.caretX=y.x,g.caretY=y.y,h._model=g,t&&c.custom&&c.custom.call(h,g),h},drawCaret:function(t,e){var n=this._chart.ctx,i=this._view,a=this.getCaretPosition(t,e,i);n.lineTo(a.x1,a.y1),n.lineTo(a.x2,a.y2),n.lineTo(a.x3,a.y3)},getCaretPosition:function(t,e,n){var i,a,r,o,s,l,u=n.caretSize,d=n.cornerRadius,h=n.xAlign,c=n.yAlign,f=t.x,g=t.y,p=e.width,m=e.height;if("center"===c)s=g+m/2,"left"===h?(a=(i=f)-u,r=i,o=s+u,l=s-u):(a=(i=f+p)+u,r=i,o=s-u,l=s+u);else if("left"===h?(i=(a=f+d+u)-u,r=a+u):"right"===h?(i=(a=f+p-d-u)-u,r=a+u):(i=(a=n.caretX)-u,r=a+u),"top"===c)s=(o=g)-u,l=o;else{s=(o=g+m)+u,l=o;var v=r;r=i,i=v}return{x1:i,x2:a,x3:r,y1:o,y2:s,y3:l}},drawTitle:function(t,e,n){var i,a,r,o=e.title,s=o.length;if(s){var l=Ne(e.rtl,e.x,e.width);for(t.x=He(e,e._titleAlign),n.textAlign=l.textAlign(e._titleAlign),n.textBaseline="middle",i=e.titleFontSize,a=e.titleSpacing,n.fillStyle=e.titleFontColor,n.font=H.fontString(i,e._titleFontStyle,e._titleFontFamily),r=0;r<s;++r)n.fillText(o[r],l.x(t.x),t.y+i/2),t.y+=i+a,r+1===s&&(t.y+=e.titleMarginBottom-a)}},drawBody:function(t,e,n){var i,a,r,o,s,l,u,d,h=e.bodyFontSize,c=e.bodySpacing,f=e._bodyAlign,g=e.body,p=e.displayColors,m=0,v=p?He(e,"left"):0,b=Ne(e.rtl,e.x,e.width),x=function(e){n.fillText(e,b.x(t.x+m),t.y+h/2),t.y+=h+c},y=b.textAlign(f);for(n.textAlign=f,n.textBaseline="middle",n.font=H.fontString(h,e._bodyFontStyle,e._bodyFontFamily),t.x=He(e,y),n.fillStyle=e.bodyFontColor,H.each(e.beforeBody,x),m=p&&"right"!==y?"center"===f?h/2+1:h+2:0,s=0,u=g.length;s<u;++s){for(i=g[s],a=e.labelTextColors[s],r=e.labelColors[s],n.fillStyle=a,H.each(i.before,x),l=0,d=(o=i.lines).length;l<d;++l){if(p){var _=b.x(v);n.fillStyle=e.legendColorBackground,n.fillRect(b.leftForLtr(_,h),t.y,h,h),n.lineWidth=1,n.strokeStyle=r.borderColor,n.strokeRect(b.leftForLtr(_,h),t.y,h,h),n.fillStyle=r.backgroundColor,n.fillRect(b.leftForLtr(b.xPlus(_,1),h-2),t.y+1,h-2,h-2),n.fillStyle=a}x(o[l])}H.each(i.after,x)}m=0,H.each(e.afterBody,x),t.y-=c},drawFooter:function(t,e,n){var i,a,r=e.footer,o=r.length;if(o){var s=Ne(e.rtl,e.x,e.width);for(t.x=He(e,e._footerAlign),t.y+=e.footerMarginTop,n.textAlign=s.textAlign(e._footerAlign),n.textBaseline="middle",i=e.footerFontSize,n.fillStyle=e.footerFontColor,n.font=H.fontString(i,e._footerFontStyle,e._footerFontFamily),a=0;a<o;++a)n.fillText(r[a],s.x(t.x),t.y+i/2),t.y+=i+e.footerSpacing}},drawBackground:function(t,e,n,i){n.fillStyle=e.backgroundColor,n.strokeStyle=e.borderColor,n.lineWidth=e.borderWidth;var a=e.xAlign,r=e.yAlign,o=t.x,s=t.y,l=i.width,u=i.height,d=e.cornerRadius;n.beginPath(),n.moveTo(o+d,s),"top"===r&&this.drawCaret(t,i),n.lineTo(o+l-d,s),n.quadraticCurveTo(o+l,s,o+l,s+d),"center"===r&&"right"===a&&this.drawCaret(t,i),n.lineTo(o+l,s+u-d),n.quadraticCurveTo(o+l,s+u,o+l-d,s+u),"bottom"===r&&this.drawCaret(t,i),n.lineTo(o+d,s+u),n.quadraticCurveTo(o,s+u,o,s+u-d),"center"===r&&"left"===a&&this.drawCaret(t,i),n.lineTo(o,s+d),n.quadraticCurveTo(o,s,o+d,s),n.closePath(),n.fill(),e.borderWidth>0&&n.stroke()},draw:function(){var t=this._chart.ctx,e=this._view;if(0!==e.opacity){var n={width:e.width,height:e.height},i={x:e.x,y:e.y},a=Math.abs(e.opacity<.001)?0:e.opacity,r=e.title.length||e.beforeBody.length||e.body.length||e.afterBody.length||e.footer.length;this._options.enabled&&r&&(t.save(),t.globalAlpha=a,this.drawBackground(i,e,t,n),i.y+=e.yPadding,H.rtl.overrideTextDirection(t,e.textDirection),this.drawTitle(i,e,t),this.drawBody(i,e,t),this.drawFooter(i,e,t),H.rtl.restoreTextDirection(t,e.textDirection),t.restore())}},handleEvent:function(t){var e,n=this,i=n._options;return n._lastActive=n._lastActive||[],"mouseout"===t.type?n._active=[]:(n._active=n._chart.getElementsAtEventForMode(t,i.mode,i),i.reverse&&n._active.reverse()),(e=!H.arrayEquals(n._active,n._lastActive))&&(n._lastActive=n._active,(i.enabled||i.custom)&&(n._eventPosition={x:t.x,y:t.y},n.update(!0),n.pivot())),e}}),Ue=Be,Ye=qe;Ye.positioners=Ue;var Ge=H.valueOrDefault;function Xe(){return H.merge(Object.create(null),[].slice.call(arguments),{merger:function(t,e,n,i){if("xAxes"===t||"yAxes"===t){var a,r,o,s=n[t].length;for(e[t]||(e[t]=[]),a=0;a<s;++a)o=n[t][a],r=Ge(o.type,"xAxes"===t?"category":"linear"),a>=e[t].length&&e[t].push({}),!e[t][a].type||o.type&&o.type!==e[t][a].type?H.merge(e[t][a],[Re.getScaleDefaults(r),o]):H.merge(e[t][a],o)}else H._merger(t,e,n,i)}})}function Ke(){return H.merge(Object.create(null),[].slice.call(arguments),{merger:function(t,e,n,i){var a=e[t]||Object.create(null),r=n[t];"scales"===t?e[t]=Xe(a,r):"scale"===t?e[t]=H.merge(a,[Re.getScaleDefaults(r.type),r]):H._merger(t,e,n,i)}})}function Ze(t){var e=t.options;H.each(t.scales,(function(e){pe.removeBox(t,e)})),e=Ke(N.global,N[t.config.type],e),t.options=t.config.options=e,t.ensureScalesHaveIDs(),t.buildOrUpdateScales(),t.tooltip._options=e.tooltips,t.tooltip.initialize()}function $e(t,e,n){var i,a=function(t){return t.id===i};do{i=e+n++}while(H.findIndex(t,a)>=0);return i}function Je(t){return"top"===t||"bottom"===t}function Qe(t,e){return function(n,i){return n[t]===i[t]?n[e]-i[e]:n[t]-i[t]}}N._set("global",{elements:{},events:["mousemove","mouseout","click","touchstart","touchmove"],hover:{onHover:null,mode:"nearest",intersect:!0,animationDuration:400},onClick:null,maintainAspectRatio:!0,responsive:!0,responsiveAnimationDuration:0});var tn=function(t,e){return this.construct(t,e),this};H.extend(tn.prototype,{construct:function(t,e){var n=this;e=function(t){var e=(t=t||Object.create(null)).data=t.data||{};return e.datasets=e.datasets||[],e.labels=e.labels||[],t.options=Ke(N.global,N[t.type],t.options||{}),t}(e);var i=Oe.acquireContext(t,e),a=i&&i.canvas,r=a&&a.height,o=a&&a.width;n.id=H.uid(),n.ctx=i,n.canvas=a,n.config=e,n.width=o,n.height=r,n.aspectRatio=r?o/r:null,n.options=e.options,n._bufferedRender=!1,n._layers=[],n.chart=n,n.controller=n,tn.instances[n.id]=n,Object.defineProperty(n,"data",{get:function(){return n.config.data},set:function(t){n.config.data=t}}),i&&a?(n.initialize(),n.update()):console.error("Failed to create chart: can't acquire context from the given item")},initialize:function(){var t=this;return Le.notify(t,"beforeInit"),H.retinaScale(t,t.options.devicePixelRatio),t.bindEvents(),t.options.responsive&&t.resize(!0),t.initToolTip(),Le.notify(t,"afterInit"),t},clear:function(){return H.canvas.clear(this),this},stop:function(){return J.cancelAnimation(this),this},resize:function(t){var e=this,n=e.options,i=e.canvas,a=n.maintainAspectRatio&&e.aspectRatio||null,r=Math.max(0,Math.floor(H.getMaximumWidth(i))),o=Math.max(0,Math.floor(a?r/a:H.getMaximumHeight(i)));if((e.width!==r||e.height!==o)&&(i.width=e.width=r,i.height=e.height=o,i.style.width=r+"px",i.style.height=o+"px",H.retinaScale(e,n.devicePixelRatio),!t)){var s={width:r,height:o};Le.notify(e,"resize",[s]),n.onResize&&n.onResize(e,s),e.stop(),e.update({duration:n.responsiveAnimationDuration})}},ensureScalesHaveIDs:function(){var t=this.options,e=t.scales||{},n=t.scale;H.each(e.xAxes,(function(t,n){t.id||(t.id=$e(e.xAxes,"x-axis-",n))})),H.each(e.yAxes,(function(t,n){t.id||(t.id=$e(e.yAxes,"y-axis-",n))})),n&&(n.id=n.id||"scale")},buildOrUpdateScales:function(){var t=this,e=t.options,n=t.scales||{},i=[],a=Object.keys(n).reduce((function(t,e){return t[e]=!1,t}),{});e.scales&&(i=i.concat((e.scales.xAxes||[]).map((function(t){return{options:t,dtype:"category",dposition:"bottom"}})),(e.scales.yAxes||[]).map((function(t){return{options:t,dtype:"linear",dposition:"left"}})))),e.scale&&i.push({options:e.scale,dtype:"radialLinear",isDefault:!0,dposition:"chartArea"}),H.each(i,(function(e){var i=e.options,r=i.id,o=Ge(i.type,e.dtype);Je(i.position)!==Je(e.dposition)&&(i.position=e.dposition),a[r]=!0;var s=null;if(r in n&&n[r].type===o)(s=n[r]).options=i,s.ctx=t.ctx,s.chart=t;else{var l=Re.getScaleConstructor(o);if(!l)return;s=new l({id:r,type:o,options:i,ctx:t.ctx,chart:t}),n[s.id]=s}s.mergeTicksOptions(),e.isDefault&&(t.scale=s)})),H.each(a,(function(t,e){t||delete n[e]})),t.scales=n,Re.addScalesToLayout(this)},buildOrUpdateControllers:function(){var t,e,n=this,i=[],a=n.data.datasets;for(t=0,e=a.length;t<e;t++){var r=a[t],o=n.getDatasetMeta(t),s=r.type||n.config.type;if(o.type&&o.type!==s&&(n.destroyDatasetMeta(t),o=n.getDatasetMeta(t)),o.type=s,o.order=r.order||0,o.index=t,o.controller)o.controller.updateIndex(t),o.controller.linkScales();else{var l=Jt[o.type];if(void 0===l)throw new Error('"'+o.type+'" is not a chart type.');o.controller=new l(n,t),i.push(o.controller)}}return i},resetElements:function(){var t=this;H.each(t.data.datasets,(function(e,n){t.getDatasetMeta(n).controller.reset()}),t)},reset:function(){this.resetElements(),this.tooltip.initialize()},update:function(t){var e,n,i=this;if(t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]}),Ze(i),Le._invalidate(i),!1!==Le.notify(i,"beforeUpdate")){i.tooltip._data=i.data;var a=i.buildOrUpdateControllers();for(e=0,n=i.data.datasets.length;e<n;e++)i.getDatasetMeta(e).controller.buildOrUpdateElements();i.updateLayout(),i.options.animation&&i.options.animation.duration&&H.each(a,(function(t){t.reset()})),i.updateDatasets(),i.tooltip.initialize(),i.lastActive=[],Le.notify(i,"afterUpdate"),i._layers.sort(Qe("z","_idx")),i._bufferedRender?i._bufferedRequest={duration:t.duration,easing:t.easing,lazy:t.lazy}:i.render(t)}},updateLayout:function(){var t=this;!1!==Le.notify(t,"beforeLayout")&&(pe.update(this,this.width,this.height),t._layers=[],H.each(t.boxes,(function(e){e._configure&&e._configure(),t._layers.push.apply(t._layers,e._layers())}),t),t._layers.forEach((function(t,e){t._idx=e})),Le.notify(t,"afterScaleUpdate"),Le.notify(t,"afterLayout"))},updateDatasets:function(){if(!1!==Le.notify(this,"beforeDatasetsUpdate")){for(var t=0,e=this.data.datasets.length;t<e;++t)this.updateDataset(t);Le.notify(this,"afterDatasetsUpdate")}},updateDataset:function(t){var e=this.getDatasetMeta(t),n={meta:e,index:t};!1!==Le.notify(this,"beforeDatasetUpdate",[n])&&(e.controller._update(),Le.notify(this,"afterDatasetUpdate",[n]))},render:function(t){var e=this;t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]});var n=e.options.animation,i=Ge(t.duration,n&&n.duration),a=t.lazy;if(!1!==Le.notify(e,"beforeRender")){var r=function(t){Le.notify(e,"afterRender"),H.callback(n&&n.onComplete,[t],e)};if(n&&i){var o=new $({numSteps:i/16.66,easing:t.easing||n.easing,render:function(t,e){var n=H.easing.effects[e.easing],i=e.currentStep,a=i/e.numSteps;t.draw(n(a),a,i)},onAnimationProgress:n.onProgress,onAnimationComplete:r});J.addAnimation(e,o,i,a)}else e.draw(),r(new $({numSteps:0,chart:e}));return e}},draw:function(t){var e,n,i=this;if(i.clear(),H.isNullOrUndef(t)&&(t=1),i.transition(t),!(i.width<=0||i.height<=0)&&!1!==Le.notify(i,"beforeDraw",[t])){for(n=i._layers,e=0;e<n.length&&n[e].z<=0;++e)n[e].draw(i.chartArea);for(i.drawDatasets(t);e<n.length;++e)n[e].draw(i.chartArea);i._drawTooltip(t),Le.notify(i,"afterDraw",[t])}},transition:function(t){for(var e=0,n=(this.data.datasets||[]).length;e<n;++e)this.isDatasetVisible(e)&&this.getDatasetMeta(e).controller.transition(t);this.tooltip.transition(t)},_getSortedDatasetMetas:function(t){var e,n,i=[];for(e=0,n=(this.data.datasets||[]).length;e<n;++e)t&&!this.isDatasetVisible(e)||i.push(this.getDatasetMeta(e));return i.sort(Qe("order","index")),i},_getSortedVisibleDatasetMetas:function(){return this._getSortedDatasetMetas(!0)},drawDatasets:function(t){var e,n;if(!1!==Le.notify(this,"beforeDatasetsDraw",[t])){for(n=(e=this._getSortedVisibleDatasetMetas()).length-1;n>=0;--n)this.drawDataset(e[n],t);Le.notify(this,"afterDatasetsDraw",[t])}},drawDataset:function(t,e){var n={meta:t,index:t.index,easingValue:e};!1!==Le.notify(this,"beforeDatasetDraw",[n])&&(t.controller.draw(e),Le.notify(this,"afterDatasetDraw",[n]))},_drawTooltip:function(t){var e=this.tooltip,n={tooltip:e,easingValue:t};!1!==Le.notify(this,"beforeTooltipDraw",[n])&&(e.draw(),Le.notify(this,"afterTooltipDraw",[n]))},getElementAtEvent:function(t){return re.modes.single(this,t)},getElementsAtEvent:function(t){return re.modes.label(this,t,{intersect:!0})},getElementsAtXAxis:function(t){return re.modes["x-axis"](this,t,{intersect:!0})},getElementsAtEventForMode:function(t,e,n){var i=re.modes[e];return"function"==typeof i?i(this,t,n):[]},getDatasetAtEvent:function(t){return re.modes.dataset(this,t,{intersect:!0})},getDatasetMeta:function(t){var e=this.data.datasets[t];e._meta||(e._meta={});var n=e._meta[this.id];return n||(n=e._meta[this.id]={type:null,data:[],dataset:null,controller:null,hidden:null,xAxisID:null,yAxisID:null,order:e.order||0,index:t}),n},getVisibleDatasetCount:function(){for(var t=0,e=0,n=this.data.datasets.length;e<n;++e)this.isDatasetVisible(e)&&t++;return t},isDatasetVisible:function(t){var e=this.getDatasetMeta(t);return"boolean"==typeof e.hidden?!e.hidden:!this.data.datasets[t].hidden},generateLegend:function(){return this.options.legendCallback(this)},destroyDatasetMeta:function(t){var e=this.id,n=this.data.datasets[t],i=n._meta&&n._meta[e];i&&(i.controller.destroy(),delete n._meta[e])},destroy:function(){var t,e,n=this,i=n.canvas;for(n.stop(),t=0,e=n.data.datasets.length;t<e;++t)n.destroyDatasetMeta(t);i&&(n.unbindEvents(),H.canvas.clear(n),Oe.releaseContext(n.ctx),n.canvas=null,n.ctx=null),Le.notify(n,"destroy"),delete tn.instances[n.id]},toBase64Image:function(){return this.canvas.toDataURL.apply(this.canvas,arguments)},initToolTip:function(){var t=this;t.tooltip=new Ye({_chart:t,_chartInstance:t,_data:t.data,_options:t.options.tooltips},t)},bindEvents:function(){var t=this,e=t._listeners={},n=function(){t.eventHandler.apply(t,arguments)};H.each(t.options.events,(function(i){Oe.addEventListener(t,i,n),e[i]=n})),t.options.responsive&&(n=function(){t.resize()},Oe.addEventListener(t,"resize",n),e.resize=n)},unbindEvents:function(){var t=this,e=t._listeners;e&&(delete t._listeners,H.each(e,(function(e,n){Oe.removeEventListener(t,n,e)})))},updateHoverStyle:function(t,e,n){var i,a,r,o=n?"set":"remove";for(a=0,r=t.length;a<r;++a)(i=t[a])&&this.getDatasetMeta(i._datasetIndex).controller[o+"HoverStyle"](i);"dataset"===e&&this.getDatasetMeta(t[0]._datasetIndex).controller["_"+o+"DatasetHoverStyle"]()},eventHandler:function(t){var e=this,n=e.tooltip;if(!1!==Le.notify(e,"beforeEvent",[t])){e._bufferedRender=!0,e._bufferedRequest=null;var i=e.handleEvent(t);n&&(i=n._start?n.handleEvent(t):i|n.handleEvent(t)),Le.notify(e,"afterEvent",[t]);var a=e._bufferedRequest;return a?e.render(a):i&&!e.animating&&(e.stop(),e.render({duration:e.options.hover.animationDuration,lazy:!0})),e._bufferedRender=!1,e._bufferedRequest=null,e}},handleEvent:function(t){var e,n=this,i=n.options||{},a=i.hover;return n.lastActive=n.lastActive||[],"mouseout"===t.type?n.active=[]:n.active=n.getElementsAtEventForMode(t,a.mode,a),H.callback(i.onHover||i.hover.onHover,[t.native,n.active],n),"mouseup"!==t.type&&"click"!==t.type||i.onClick&&i.onClick.call(n,t.native,n.active),n.lastActive.length&&n.updateHoverStyle(n.lastActive,a.mode,!1),n.active.length&&a.mode&&n.updateHoverStyle(n.active,a.mode,!0),e=!H.arrayEquals(n.active,n.lastActive),n.lastActive=n.active,e}}),tn.instances={};var en=tn;tn.Controller=tn,tn.types={},H.configMerge=Ke,H.scaleMerge=Xe;function nn(){throw new Error("This method is not implemented: either no adapter can be found or an incomplete integration was provided.")}function an(t){this.options=t||{}}H.extend(an.prototype,{formats:nn,parse:nn,format:nn,add:nn,diff:nn,startOf:nn,endOf:nn,_create:function(t){return t}}),an.override=function(t){H.extend(an.prototype,t)};var rn={_date:an},on={formatters:{values:function(t){return H.isArray(t)?t:""+t},linear:function(t,e,n){var i=n.length>3?n[2]-n[1]:n[1]-n[0];Math.abs(i)>1&&t!==Math.floor(t)&&(i=t-Math.floor(t));var a=H.log10(Math.abs(i)),r="";if(0!==t)if(Math.max(Math.abs(n[0]),Math.abs(n[n.length-1]))<1e-4){var o=H.log10(Math.abs(t)),s=Math.floor(o)-Math.floor(a);s=Math.max(Math.min(s,20),0),r=t.toExponential(s)}else{var l=-1*Math.floor(a);l=Math.max(Math.min(l,20),0),r=t.toFixed(l)}else r="0";return r},logarithmic:function(t,e,n){var i=t/Math.pow(10,Math.floor(H.log10(t)));return 0===t?"0":1===i||2===i||5===i||0===e||e===n.length-1?t.toExponential():""}}},sn=H.isArray,ln=H.isNullOrUndef,un=H.valueOrDefault,dn=H.valueAtIndexOrDefault;function hn(t,e,n){var i,a=t.getTicks().length,r=Math.min(e,a-1),o=t.getPixelForTick(r),s=t._startPixel,l=t._endPixel;if(!(n&&(i=1===a?Math.max(o-s,l-o):0===e?(t.getPixelForTick(1)-o)/2:(o-t.getPixelForTick(r-1))/2,(o+=r<e?i:-i)<s-1e-6||o>l+1e-6)))return o}function cn(t,e,n,i){var a,r,o,s,l,u,d,h,c,f,g,p,m,v=n.length,b=[],x=[],y=[],_=0,k=0;for(a=0;a<v;++a){if(s=n[a].label,l=n[a].major?e.major:e.minor,t.font=u=l.string,d=i[u]=i[u]||{data:{},gc:[]},h=l.lineHeight,c=f=0,ln(s)||sn(s)){if(sn(s))for(r=0,o=s.length;r<o;++r)g=s[r],ln(g)||sn(g)||(c=H.measureText(t,d.data,d.gc,c,g),f+=h)}else c=H.measureText(t,d.data,d.gc,c,s),f=h;b.push(c),x.push(f),y.push(h/2),_=Math.max(c,_),k=Math.max(f,k)}function w(t){return{width:b[t]||0,height:x[t]||0,offset:y[t]||0}}return function(t,e){H.each(t,(function(t){var n,i=t.gc,a=i.length/2;if(a>e){for(n=0;n<a;++n)delete t.data[i[n]];i.splice(0,a)}}))}(i,v),p=b.indexOf(_),m=x.indexOf(k),{first:w(0),last:w(v-1),widest:w(p),highest:w(m)}}function fn(t){return t.drawTicks?t.tickMarkLength:0}function gn(t){var e,n;return t.display?(e=H.options._parseFont(t),n=H.options.toPadding(t.padding),e.lineHeight+n.height):0}function pn(t,e){return H.extend(H.options._parseFont({fontFamily:un(e.fontFamily,t.fontFamily),fontSize:un(e.fontSize,t.fontSize),fontStyle:un(e.fontStyle,t.fontStyle),lineHeight:un(e.lineHeight,t.lineHeight)}),{color:H.options.resolve([e.fontColor,t.fontColor,N.global.defaultFontColor])})}function mn(t){var e=pn(t,t.minor);return{minor:e,major:t.major.enabled?pn(t,t.major):e}}function vn(t){var e,n,i,a=[];for(n=0,i=t.length;n<i;++n)void 0!==(e=t[n])._index&&a.push(e);return a}function bn(t,e,n,i){var a,r,o,s,l=un(n,0),u=Math.min(un(i,t.length),t.length),d=0;for(e=Math.ceil(e),i&&(e=(a=i-n)/Math.floor(a/e)),s=l;s<0;)d++,s=Math.round(l+d*e);for(r=Math.max(l,0);r<u;r++)o=t[r],r===s?(o._index=r,d++,s=Math.round(l+d*e)):delete o.label}N._set("scale",{display:!0,position:"left",offset:!1,gridLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,drawBorder:!0,drawOnChartArea:!0,drawTicks:!0,tickMarkLength:10,zeroLineWidth:1,zeroLineColor:"rgba(0,0,0,0.25)",zeroLineBorderDash:[],zeroLineBorderDashOffset:0,offsetGridLines:!1,borderDash:[],borderDashOffset:0},scaleLabel:{display:!1,labelString:"",padding:{top:4,bottom:4}},ticks:{beginAtZero:!1,minRotation:0,maxRotation:50,mirror:!1,padding:0,reverse:!1,display:!0,autoSkip:!0,autoSkipPadding:0,labelOffset:0,callback:on.formatters.values,minor:{},major:{}}});var xn=K.extend({zeroLineIndex:0,getPadding:function(){return{left:this.paddingLeft||0,top:this.paddingTop||0,right:this.paddingRight||0,bottom:this.paddingBottom||0}},getTicks:function(){return this._ticks},_getLabels:function(){var t=this.chart.data;return this.options.labels||(this.isHorizontal()?t.xLabels:t.yLabels)||t.labels||[]},mergeTicksOptions:function(){},beforeUpdate:function(){H.callback(this.options.beforeUpdate,[this])},update:function(t,e,n){var i,a,r,o,s,l=this,u=l.options.ticks,d=u.sampleSize;if(l.beforeUpdate(),l.maxWidth=t,l.maxHeight=e,l.margins=H.extend({left:0,right:0,top:0,bottom:0},n),l._ticks=null,l.ticks=null,l._labelSizes=null,l._maxLabelLines=0,l.longestLabelWidth=0,l.longestTextCache=l.longestTextCache||{},l._gridLineItems=null,l._labelItems=null,l.beforeSetDimensions(),l.setDimensions(),l.afterSetDimensions(),l.beforeDataLimits(),l.determineDataLimits(),l.afterDataLimits(),l.beforeBuildTicks(),o=l.buildTicks()||[],(!(o=l.afterBuildTicks(o)||o)||!o.length)&&l.ticks)for(o=[],i=0,a=l.ticks.length;i<a;++i)o.push({value:l.ticks[i],major:!1});return l._ticks=o,s=d<o.length,r=l._convertTicksToLabels(s?function(t,e){for(var n=[],i=t.length/e,a=0,r=t.length;a<r;a+=i)n.push(t[Math.floor(a)]);return n}(o,d):o),l._configure(),l.beforeCalculateTickRotation(),l.calculateTickRotation(),l.afterCalculateTickRotation(),l.beforeFit(),l.fit(),l.afterFit(),l._ticksToDraw=u.display&&(u.autoSkip||"auto"===u.source)?l._autoSkip(o):o,s&&(r=l._convertTicksToLabels(l._ticksToDraw)),l.ticks=r,l.afterUpdate(),l.minSize},_configure:function(){var t,e,n=this,i=n.options.ticks.reverse;n.isHorizontal()?(t=n.left,e=n.right):(t=n.top,e=n.bottom,i=!i),n._startPixel=t,n._endPixel=e,n._reversePixels=i,n._length=e-t},afterUpdate:function(){H.callback(this.options.afterUpdate,[this])},beforeSetDimensions:function(){H.callback(this.options.beforeSetDimensions,[this])},setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0},afterSetDimensions:function(){H.callback(this.options.afterSetDimensions,[this])},beforeDataLimits:function(){H.callback(this.options.beforeDataLimits,[this])},determineDataLimits:H.noop,afterDataLimits:function(){H.callback(this.options.afterDataLimits,[this])},beforeBuildTicks:function(){H.callback(this.options.beforeBuildTicks,[this])},buildTicks:H.noop,afterBuildTicks:function(t){var e=this;return sn(t)&&t.length?H.callback(e.options.afterBuildTicks,[e,t]):(e.ticks=H.callback(e.options.afterBuildTicks,[e,e.ticks])||e.ticks,t)},beforeTickToLabelConversion:function(){H.callback(this.options.beforeTickToLabelConversion,[this])},convertTicksToLabels:function(){var t=this.options.ticks;this.ticks=this.ticks.map(t.userCallback||t.callback,this)},afterTickToLabelConversion:function(){H.callback(this.options.afterTickToLabelConversion,[this])},beforeCalculateTickRotation:function(){H.callback(this.options.beforeCalculateTickRotation,[this])},calculateTickRotation:function(){var t,e,n,i,a,r,o,s=this,l=s.options,u=l.ticks,d=s.getTicks().length,h=u.minRotation||0,c=u.maxRotation,f=h;!s._isVisible()||!u.display||h>=c||d<=1||!s.isHorizontal()?s.labelRotation=h:(e=(t=s._getLabelSizes()).widest.width,n=t.highest.height-t.highest.offset,i=Math.min(s.maxWidth,s.chart.width-e),e+6>(a=l.offset?s.maxWidth/d:i/(d-1))&&(a=i/(d-(l.offset?.5:1)),r=s.maxHeight-fn(l.gridLines)-u.padding-gn(l.scaleLabel),o=Math.sqrt(e*e+n*n),f=H.toDegrees(Math.min(Math.asin(Math.min((t.highest.height+6)/a,1)),Math.asin(Math.min(r/o,1))-Math.asin(n/o))),f=Math.max(h,Math.min(c,f))),s.labelRotation=f)},afterCalculateTickRotation:function(){H.callback(this.options.afterCalculateTickRotation,[this])},beforeFit:function(){H.callback(this.options.beforeFit,[this])},fit:function(){var t=this,e=t.minSize={width:0,height:0},n=t.chart,i=t.options,a=i.ticks,r=i.scaleLabel,o=i.gridLines,s=t._isVisible(),l="bottom"===i.position,u=t.isHorizontal();if(u?e.width=t.maxWidth:s&&(e.width=fn(o)+gn(r)),u?s&&(e.height=fn(o)+gn(r)):e.height=t.maxHeight,a.display&&s){var d=mn(a),h=t._getLabelSizes(),c=h.first,f=h.last,g=h.widest,p=h.highest,m=.4*d.minor.lineHeight,v=a.padding;if(u){var b=0!==t.labelRotation,x=H.toRadians(t.labelRotation),y=Math.cos(x),_=Math.sin(x),k=_*g.width+y*(p.height-(b?p.offset:0))+(b?0:m);e.height=Math.min(t.maxHeight,e.height+k+v);var w,M,S=t.getPixelForTick(0)-t.left,C=t.right-t.getPixelForTick(t.getTicks().length-1);b?(w=l?y*c.width+_*c.offset:_*(c.height-c.offset),M=l?_*(f.height-f.offset):y*f.width+_*f.offset):(w=c.width/2,M=f.width/2),t.paddingLeft=Math.max((w-S)*t.width/(t.width-S),0)+3,t.paddingRight=Math.max((M-C)*t.width/(t.width-C),0)+3}else{var P=a.mirror?0:g.width+v+m;e.width=Math.min(t.maxWidth,e.width+P),t.paddingTop=c.height/2,t.paddingBottom=f.height/2}}t.handleMargins(),u?(t.width=t._length=n.width-t.margins.left-t.margins.right,t.height=e.height):(t.width=e.width,t.height=t._length=n.height-t.margins.top-t.margins.bottom)},handleMargins:function(){var t=this;t.margins&&(t.margins.left=Math.max(t.paddingLeft,t.margins.left),t.margins.top=Math.max(t.paddingTop,t.margins.top),t.margins.right=Math.max(t.paddingRight,t.margins.right),t.margins.bottom=Math.max(t.paddingBottom,t.margins.bottom))},afterFit:function(){H.callback(this.options.afterFit,[this])},isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},isFullWidth:function(){return this.options.fullWidth},getRightValue:function(t){if(ln(t))return NaN;if(("number"==typeof t||t instanceof Number)&&!isFinite(t))return NaN;if(t)if(this.isHorizontal()){if(void 0!==t.x)return this.getRightValue(t.x)}else if(void 0!==t.y)return this.getRightValue(t.y);return t},_convertTicksToLabels:function(t){var e,n,i,a=this;for(a.ticks=t.map((function(t){return t.value})),a.beforeTickToLabelConversion(),e=a.convertTicksToLabels(t)||a.ticks,a.afterTickToLabelConversion(),n=0,i=t.length;n<i;++n)t[n].label=e[n];return e},_getLabelSizes:function(){var t=this,e=t._labelSizes;return e||(t._labelSizes=e=cn(t.ctx,mn(t.options.ticks),t.getTicks(),t.longestTextCache),t.longestLabelWidth=e.widest.width),e},_parseValue:function(t){var e,n,i,a;return sn(t)?(e=+this.getRightValue(t[0]),n=+this.getRightValue(t[1]),i=Math.min(e,n),a=Math.max(e,n)):(e=void 0,n=t=+this.getRightValue(t),i=t,a=t),{min:i,max:a,start:e,end:n}},_getScaleLabel:function(t){var e=this._parseValue(t);return void 0!==e.start?"["+e.start+", "+e.end+"]":+this.getRightValue(t)},getLabelForIndex:H.noop,getPixelForValue:H.noop,getValueForPixel:H.noop,getPixelForTick:function(t){var e=this.options.offset,n=this._ticks.length,i=1/Math.max(n-(e?0:1),1);return t<0||t>n-1?null:this.getPixelForDecimal(t*i+(e?i/2:0))},getPixelForDecimal:function(t){return this._reversePixels&&(t=1-t),this._startPixel+t*this._length},getDecimalForPixel:function(t){var e=(t-this._startPixel)/this._length;return this._reversePixels?1-e:e},getBasePixel:function(){return this.getPixelForValue(this.getBaseValue())},getBaseValue:function(){var t=this.min,e=this.max;return this.beginAtZero?0:t<0&&e<0?e:t>0&&e>0?t:0},_autoSkip:function(t){var e,n,i,a,r=this.options.ticks,o=this._length,s=r.maxTicksLimit||o/this._tickSize()+1,l=r.major.enabled?function(t){var e,n,i=[];for(e=0,n=t.length;e<n;e++)t[e].major&&i.push(e);return i}(t):[],u=l.length,d=l[0],h=l[u-1];if(u>s)return function(t,e,n){var i,a,r=0,o=e[0];for(n=Math.ceil(n),i=0;i<t.length;i++)a=t[i],i===o?(a._index=i,o=e[++r*n]):delete a.label}(t,l,u/s),vn(t);if(i=function(t,e,n,i){var a,r,o,s,l=function(t){var e,n,i=t.length;if(i<2)return!1;for(n=t[0],e=1;e<i;++e)if(t[e]-t[e-1]!==n)return!1;return n}(t),u=(e.length-1)/i;if(!l)return Math.max(u,1);for(o=0,s=(a=H.math._factorize(l)).length-1;o<s;o++)if((r=a[o])>u)return r;return Math.max(u,1)}(l,t,0,s),u>0){for(e=0,n=u-1;e<n;e++)bn(t,i,l[e],l[e+1]);return a=u>1?(h-d)/(u-1):null,bn(t,i,H.isNullOrUndef(a)?0:d-a,d),bn(t,i,h,H.isNullOrUndef(a)?t.length:h+a),vn(t)}return bn(t,i),vn(t)},_tickSize:function(){var t=this.options.ticks,e=H.toRadians(this.labelRotation),n=Math.abs(Math.cos(e)),i=Math.abs(Math.sin(e)),a=this._getLabelSizes(),r=t.autoSkipPadding||0,o=a?a.widest.width+r:0,s=a?a.highest.height+r:0;return this.isHorizontal()?s*n>o*i?o/n:s/i:s*i<o*n?s/n:o/i},_isVisible:function(){var t,e,n,i=this.chart,a=this.options.display;if("auto"!==a)return!!a;for(t=0,e=i.data.datasets.length;t<e;++t)if(i.isDatasetVisible(t)&&((n=i.getDatasetMeta(t)).xAxisID===this.id||n.yAxisID===this.id))return!0;return!1},_computeGridLineItems:function(t){var e,n,i,a,r,o,s,l,u,d,h,c,f,g,p,m,v,b=this,x=b.chart,y=b.options,_=y.gridLines,k=y.position,w=_.offsetGridLines,M=b.isHorizontal(),S=b._ticksToDraw,C=S.length+(w?1:0),P=fn(_),A=[],D=_.drawBorder?dn(_.lineWidth,0,0):0,T=D/2,I=H._alignPixel,F=function(t){return I(x,t,D)};for("top"===k?(e=F(b.bottom),s=b.bottom-P,u=e-T,h=F(t.top)+T,f=t.bottom):"bottom"===k?(e=F(b.top),h=t.top,f=F(t.bottom)-T,s=e+T,u=b.top+P):"left"===k?(e=F(b.right),o=b.right-P,l=e-T,d=F(t.left)+T,c=t.right):(e=F(b.left),d=t.left,c=F(t.right)-T,o=e+T,l=b.left+P),n=0;n<C;++n)i=S[n]||{},ln(i.label)&&n<S.length||(n===b.zeroLineIndex&&y.offset===w?(g=_.zeroLineWidth,p=_.zeroLineColor,m=_.zeroLineBorderDash||[],v=_.zeroLineBorderDashOffset||0):(g=dn(_.lineWidth,n,1),p=dn(_.color,n,"rgba(0,0,0,0.1)"),m=_.borderDash||[],v=_.borderDashOffset||0),void 0!==(a=hn(b,i._index||n,w))&&(r=I(x,a,g),M?o=l=d=c=r:s=u=h=f=r,A.push({tx1:o,ty1:s,tx2:l,ty2:u,x1:d,y1:h,x2:c,y2:f,width:g,color:p,borderDash:m,borderDashOffset:v})));return A.ticksLength=C,A.borderValue=e,A},_computeLabelItems:function(){var t,e,n,i,a,r,o,s,l,u,d,h,c=this,f=c.options,g=f.ticks,p=f.position,m=g.mirror,v=c.isHorizontal(),b=c._ticksToDraw,x=mn(g),y=g.padding,_=fn(f.gridLines),k=-H.toRadians(c.labelRotation),w=[];for("top"===p?(r=c.bottom-_-y,o=k?"left":"center"):"bottom"===p?(r=c.top+_+y,o=k?"right":"center"):"left"===p?(a=c.right-(m?0:_)-y,o=m?"left":"right"):(a=c.left+(m?0:_)+y,o=m?"right":"left"),t=0,e=b.length;t<e;++t)i=(n=b[t]).label,ln(i)||(s=c.getPixelForTick(n._index||t)+g.labelOffset,u=(l=n.major?x.major:x.minor).lineHeight,d=sn(i)?i.length:1,v?(a=s,h="top"===p?((k?1:.5)-d)*u:(k?0:.5)*u):(r=s,h=(1-d)*u/2),w.push({x:a,y:r,rotation:k,label:i,font:l,textOffset:h,textAlign:o}));return w},_drawGrid:function(t){var e=this,n=e.options.gridLines;if(n.display){var i,a,r,o,s,l=e.ctx,u=e.chart,d=H._alignPixel,h=n.drawBorder?dn(n.lineWidth,0,0):0,c=e._gridLineItems||(e._gridLineItems=e._computeGridLineItems(t));for(r=0,o=c.length;r<o;++r)i=(s=c[r]).width,a=s.color,i&&a&&(l.save(),l.lineWidth=i,l.strokeStyle=a,l.setLineDash&&(l.setLineDash(s.borderDash),l.lineDashOffset=s.borderDashOffset),l.beginPath(),n.drawTicks&&(l.moveTo(s.tx1,s.ty1),l.lineTo(s.tx2,s.ty2)),n.drawOnChartArea&&(l.moveTo(s.x1,s.y1),l.lineTo(s.x2,s.y2)),l.stroke(),l.restore());if(h){var f,g,p,m,v=h,b=dn(n.lineWidth,c.ticksLength-1,1),x=c.borderValue;e.isHorizontal()?(f=d(u,e.left,v)-v/2,g=d(u,e.right,b)+b/2,p=m=x):(p=d(u,e.top,v)-v/2,m=d(u,e.bottom,b)+b/2,f=g=x),l.lineWidth=h,l.strokeStyle=dn(n.color,0),l.beginPath(),l.moveTo(f,p),l.lineTo(g,m),l.stroke()}}},_drawLabels:function(){var t=this;if(t.options.ticks.display){var e,n,i,a,r,o,s,l,u=t.ctx,d=t._labelItems||(t._labelItems=t._computeLabelItems());for(e=0,i=d.length;e<i;++e){if(o=(r=d[e]).font,u.save(),u.translate(r.x,r.y),u.rotate(r.rotation),u.font=o.string,u.fillStyle=o.color,u.textBaseline="middle",u.textAlign=r.textAlign,s=r.label,l=r.textOffset,sn(s))for(n=0,a=s.length;n<a;++n)u.fillText(""+s[n],0,l),l+=o.lineHeight;else u.fillText(s,0,l);u.restore()}}},_drawTitle:function(){var t=this,e=t.ctx,n=t.options,i=n.scaleLabel;if(i.display){var a,r,o=un(i.fontColor,N.global.defaultFontColor),s=H.options._parseFont(i),l=H.options.toPadding(i.padding),u=s.lineHeight/2,d=n.position,h=0;if(t.isHorizontal())a=t.left+t.width/2,r="bottom"===d?t.bottom-u-l.bottom:t.top+u+l.top;else{var c="left"===d;a=c?t.left+u+l.top:t.right-u-l.top,r=t.top+t.height/2,h=c?-.5*Math.PI:.5*Math.PI}e.save(),e.translate(a,r),e.rotate(h),e.textAlign="center",e.textBaseline="middle",e.fillStyle=o,e.font=s.string,e.fillText(i.labelString,0,0),e.restore()}},draw:function(t){this._isVisible()&&(this._drawGrid(t),this._drawTitle(),this._drawLabels())},_layers:function(){var t=this,e=t.options,n=e.ticks&&e.ticks.z||0,i=e.gridLines&&e.gridLines.z||0;return t._isVisible()&&n!==i&&t.draw===t._draw?[{z:i,draw:function(){t._drawGrid.apply(t,arguments),t._drawTitle.apply(t,arguments)}},{z:n,draw:function(){t._drawLabels.apply(t,arguments)}}]:[{z:n,draw:function(){t.draw.apply(t,arguments)}}]},_getMatchingVisibleMetas:function(t){var e=this,n=e.isHorizontal();return e.chart._getSortedVisibleDatasetMetas().filter((function(i){return(!t||i.type===t)&&(n?i.xAxisID===e.id:i.yAxisID===e.id)}))}});xn.prototype._draw=xn.prototype.draw;var yn=xn,_n=H.isNullOrUndef,kn=yn.extend({determineDataLimits:function(){var t,e=this,n=e._getLabels(),i=e.options.ticks,a=i.min,r=i.max,o=0,s=n.length-1;void 0!==a&&(t=n.indexOf(a))>=0&&(o=t),void 0!==r&&(t=n.indexOf(r))>=0&&(s=t),e.minIndex=o,e.maxIndex=s,e.min=n[o],e.max=n[s]},buildTicks:function(){var t=this._getLabels(),e=this.minIndex,n=this.maxIndex;this.ticks=0===e&&n===t.length-1?t:t.slice(e,n+1)},getLabelForIndex:function(t,e){var n=this.chart;return n.getDatasetMeta(e).controller._getValueScaleId()===this.id?this.getRightValue(n.data.datasets[e].data[t]):this._getLabels()[t]},_configure:function(){var t=this,e=t.options.offset,n=t.ticks;yn.prototype._configure.call(t),t.isHorizontal()||(t._reversePixels=!t._reversePixels),n&&(t._startValue=t.minIndex-(e?.5:0),t._valueRange=Math.max(n.length-(e?0:1),1))},getPixelForValue:function(t,e,n){var i,a,r,o=this;return _n(e)||_n(n)||(t=o.chart.data.datasets[n].data[e]),_n(t)||(i=o.isHorizontal()?t.x:t.y),(void 0!==i||void 0!==t&&isNaN(e))&&(a=o._getLabels(),t=H.valueOrDefault(i,t),e=-1!==(r=a.indexOf(t))?r:e,isNaN(e)&&(e=t)),o.getPixelForDecimal((e-o._startValue)/o._valueRange)},getPixelForTick:function(t){var e=this.ticks;return t<0||t>e.length-1?null:this.getPixelForValue(e[t],t+this.minIndex)},getValueForPixel:function(t){var e=Math.round(this._startValue+this.getDecimalForPixel(t)*this._valueRange);return Math.min(Math.max(e,0),this.ticks.length-1)},getBasePixel:function(){return this.bottom}}),wn={position:"bottom"};kn._defaults=wn;var Mn=H.noop,Sn=H.isNullOrUndef;var Cn=yn.extend({getRightValue:function(t){return"string"==typeof t?+t:yn.prototype.getRightValue.call(this,t)},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;if(e.beginAtZero){var n=H.sign(t.min),i=H.sign(t.max);n<0&&i<0?t.max=0:n>0&&i>0&&(t.min=0)}var a=void 0!==e.min||void 0!==e.suggestedMin,r=void 0!==e.max||void 0!==e.suggestedMax;void 0!==e.min?t.min=e.min:void 0!==e.suggestedMin&&(null===t.min?t.min=e.suggestedMin:t.min=Math.min(t.min,e.suggestedMin)),void 0!==e.max?t.max=e.max:void 0!==e.suggestedMax&&(null===t.max?t.max=e.suggestedMax:t.max=Math.max(t.max,e.suggestedMax)),a!==r&&t.min>=t.max&&(a?t.max=t.min+1:t.min=t.max-1),t.min===t.max&&(t.max++,e.beginAtZero||t.min--)},getTickLimit:function(){var t,e=this.options.ticks,n=e.stepSize,i=e.maxTicksLimit;return n?t=Math.ceil(this.max/n)-Math.floor(this.min/n)+1:(t=this._computeTickLimit(),i=i||11),i&&(t=Math.min(i,t)),t},_computeTickLimit:function(){return Number.POSITIVE_INFINITY},handleDirectionalChanges:Mn,buildTicks:function(){var t=this,e=t.options.ticks,n=t.getTickLimit(),i={maxTicks:n=Math.max(2,n),min:e.min,max:e.max,precision:e.precision,stepSize:H.valueOrDefault(e.fixedStepSize,e.stepSize)},a=t.ticks=function(t,e){var n,i,a,r,o=[],s=t.stepSize,l=s||1,u=t.maxTicks-1,d=t.min,h=t.max,c=t.precision,f=e.min,g=e.max,p=H.niceNum((g-f)/u/l)*l;if(p<1e-14&&Sn(d)&&Sn(h))return[f,g];(r=Math.ceil(g/p)-Math.floor(f/p))>u&&(p=H.niceNum(r*p/u/l)*l),s||Sn(c)?n=Math.pow(10,H._decimalPlaces(p)):(n=Math.pow(10,c),p=Math.ceil(p*n)/n),i=Math.floor(f/p)*p,a=Math.ceil(g/p)*p,s&&(!Sn(d)&&H.almostWhole(d/p,p/1e3)&&(i=d),!Sn(h)&&H.almostWhole(h/p,p/1e3)&&(a=h)),r=(a-i)/p,r=H.almostEquals(r,Math.round(r),p/1e3)?Math.round(r):Math.ceil(r),i=Math.round(i*n)/n,a=Math.round(a*n)/n,o.push(Sn(d)?i:d);for(var m=1;m<r;++m)o.push(Math.round((i+m*p)*n)/n);return o.push(Sn(h)?a:h),o}(i,t);t.handleDirectionalChanges(),t.max=H.max(a),t.min=H.min(a),e.reverse?(a.reverse(),t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max)},convertTicksToLabels:function(){var t=this;t.ticksAsNumbers=t.ticks.slice(),t.zeroLineIndex=t.ticks.indexOf(0),yn.prototype.convertTicksToLabels.call(t)},_configure:function(){var t,e=this,n=e.getTicks(),i=e.min,a=e.max;yn.prototype._configure.call(e),e.options.offset&&n.length&&(i-=t=(a-i)/Math.max(n.length-1,1)/2,a+=t),e._startValue=i,e._endValue=a,e._valueRange=a-i}}),Pn={position:"left",ticks:{callback:on.formatters.linear}};function An(t,e,n,i){var a,r,o=t.options,s=function(t,e,n){var i=[n.type,void 0===e&&void 0===n.stack?n.index:"",n.stack].join(".");return void 0===t[i]&&(t[i]={pos:[],neg:[]}),t[i]}(e,o.stacked,n),l=s.pos,u=s.neg,d=i.length;for(a=0;a<d;++a)r=t._parseValue(i[a]),isNaN(r.min)||isNaN(r.max)||n.data[a].hidden||(l[a]=l[a]||0,u[a]=u[a]||0,o.relativePoints?l[a]=100:r.min<0||r.max<0?u[a]+=r.min:l[a]+=r.max)}function Dn(t,e,n){var i,a,r=n.length;for(i=0;i<r;++i)a=t._parseValue(n[i]),isNaN(a.min)||isNaN(a.max)||e.data[i].hidden||(t.min=Math.min(t.min,a.min),t.max=Math.max(t.max,a.max))}var Tn=Cn.extend({determineDataLimits:function(){var t,e,n,i,a=this,r=a.options,o=a.chart.data.datasets,s=a._getMatchingVisibleMetas(),l=r.stacked,u={},d=s.length;if(a.min=Number.POSITIVE_INFINITY,a.max=Number.NEGATIVE_INFINITY,void 0===l)for(t=0;!l&&t<d;++t)l=void 0!==(e=s[t]).stack;for(t=0;t<d;++t)n=o[(e=s[t]).index].data,l?An(a,u,e,n):Dn(a,e,n);H.each(u,(function(t){i=t.pos.concat(t.neg),a.min=Math.min(a.min,H.min(i)),a.max=Math.max(a.max,H.max(i))})),a.min=H.isFinite(a.min)&&!isNaN(a.min)?a.min:0,a.max=H.isFinite(a.max)&&!isNaN(a.max)?a.max:1,a.handleTickRangeOptions()},_computeTickLimit:function(){var t;return this.isHorizontal()?Math.ceil(this.width/40):(t=H.options._parseFont(this.options.ticks),Math.ceil(this.height/t.lineHeight))},handleDirectionalChanges:function(){this.isHorizontal()||this.ticks.reverse()},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForValue:function(t){return this.getPixelForDecimal((+this.getRightValue(t)-this._startValue)/this._valueRange)},getValueForPixel:function(t){return this._startValue+this.getDecimalForPixel(t)*this._valueRange},getPixelForTick:function(t){var e=this.ticksAsNumbers;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])}}),In=Pn;Tn._defaults=In;var Fn=H.valueOrDefault,On=H.math.log10;var Ln={position:"left",ticks:{callback:on.formatters.logarithmic}};function Rn(t,e){return H.isFinite(t)&&t>=0?t:e}var zn=yn.extend({determineDataLimits:function(){var t,e,n,i,a,r,o=this,s=o.options,l=o.chart,u=l.data.datasets,d=o.isHorizontal();function h(t){return d?t.xAxisID===o.id:t.yAxisID===o.id}o.min=Number.POSITIVE_INFINITY,o.max=Number.NEGATIVE_INFINITY,o.minNotZero=Number.POSITIVE_INFINITY;var c=s.stacked;if(void 0===c)for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e)&&void 0!==e.stack){c=!0;break}if(s.stacked||c){var f={};for(t=0;t<u.length;t++){var g=[(e=l.getDatasetMeta(t)).type,void 0===s.stacked&&void 0===e.stack?t:"",e.stack].join(".");if(l.isDatasetVisible(t)&&h(e))for(void 0===f[g]&&(f[g]=[]),a=0,r=(i=u[t].data).length;a<r;a++){var p=f[g];n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(p[a]=p[a]||0,p[a]+=n.max)}}H.each(f,(function(t){if(t.length>0){var e=H.min(t),n=H.max(t);o.min=Math.min(o.min,e),o.max=Math.max(o.max,n)}}))}else for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e))for(a=0,r=(i=u[t].data).length;a<r;a++)n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(o.min=Math.min(n.min,o.min),o.max=Math.max(n.max,o.max),0!==n.min&&(o.minNotZero=Math.min(n.min,o.minNotZero)));o.min=H.isFinite(o.min)?o.min:null,o.max=H.isFinite(o.max)?o.max:null,o.minNotZero=H.isFinite(o.minNotZero)?o.minNotZero:null,this.handleTickRangeOptions()},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;t.min=Rn(e.min,t.min),t.max=Rn(e.max,t.max),t.min===t.max&&(0!==t.min&&null!==t.min?(t.min=Math.pow(10,Math.floor(On(t.min))-1),t.max=Math.pow(10,Math.floor(On(t.max))+1)):(t.min=1,t.max=10)),null===t.min&&(t.min=Math.pow(10,Math.floor(On(t.max))-1)),null===t.max&&(t.max=0!==t.min?Math.pow(10,Math.floor(On(t.min))+1):10),null===t.minNotZero&&(t.min>0?t.minNotZero=t.min:t.max<1?t.minNotZero=Math.pow(10,Math.floor(On(t.max))):t.minNotZero=1)},buildTicks:function(){var t=this,e=t.options.ticks,n=!t.isHorizontal(),i={min:Rn(e.min),max:Rn(e.max)},a=t.ticks=function(t,e){var n,i,a=[],r=Fn(t.min,Math.pow(10,Math.floor(On(e.min)))),o=Math.floor(On(e.max)),s=Math.ceil(e.max/Math.pow(10,o));0===r?(n=Math.floor(On(e.minNotZero)),i=Math.floor(e.minNotZero/Math.pow(10,n)),a.push(r),r=i*Math.pow(10,n)):(n=Math.floor(On(r)),i=Math.floor(r/Math.pow(10,n)));var l=n<0?Math.pow(10,Math.abs(n)):1;do{a.push(r),10===++i&&(i=1,l=++n>=0?1:l),r=Math.round(i*Math.pow(10,n)*l)/l}while(n<o||n===o&&i<s);var u=Fn(t.max,r);return a.push(u),a}(i,t);t.max=H.max(a),t.min=H.min(a),e.reverse?(n=!n,t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max),n&&a.reverse()},convertTicksToLabels:function(){this.tickValues=this.ticks.slice(),yn.prototype.convertTicksToLabels.call(this)},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForTick:function(t){var e=this.tickValues;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])},_getFirstTickValue:function(t){var e=Math.floor(On(t));return Math.floor(t/Math.pow(10,e))*Math.pow(10,e)},_configure:function(){var t=this,e=t.min,n=0;yn.prototype._configure.call(t),0===e&&(e=t._getFirstTickValue(t.minNotZero),n=Fn(t.options.ticks.fontSize,N.global.defaultFontSize)/t._length),t._startValue=On(e),t._valueOffset=n,t._valueRange=(On(t.max)-On(e))/(1-n)},getPixelForValue:function(t){var e=this,n=0;return(t=+e.getRightValue(t))>e.min&&t>0&&(n=(On(t)-e._startValue)/e._valueRange+e._valueOffset),e.getPixelForDecimal(n)},getValueForPixel:function(t){var e=this,n=e.getDecimalForPixel(t);return 0===n&&0===e.min?0:Math.pow(10,e._startValue+(n-e._valueOffset)*e._valueRange)}}),Nn=Ln;zn._defaults=Nn;var Bn=H.valueOrDefault,En=H.valueAtIndexOrDefault,Wn=H.options.resolve,Vn={display:!0,animate:!0,position:"chartArea",angleLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,borderDash:[],borderDashOffset:0},gridLines:{circular:!1},ticks:{showLabelBackdrop:!0,backdropColor:"rgba(255,255,255,0.75)",backdropPaddingY:2,backdropPaddingX:2,callback:on.formatters.linear},pointLabels:{display:!0,fontSize:10,callback:function(t){return t}}};function Hn(t){var e=t.ticks;return e.display&&t.display?Bn(e.fontSize,N.global.defaultFontSize)+2*e.backdropPaddingY:0}function jn(t,e,n,i,a){return t===i||t===a?{start:e-n/2,end:e+n/2}:t<i||t>a?{start:e-n,end:e}:{start:e,end:e+n}}function qn(t){return 0===t||180===t?"center":t<180?"left":"right"}function Un(t,e,n,i){var a,r,o=n.y+i/2;if(H.isArray(e))for(a=0,r=e.length;a<r;++a)t.fillText(e[a],n.x,o),o+=i;else t.fillText(e,n.x,o)}function Yn(t,e,n){90===t||270===t?n.y-=e.h/2:(t>270||t<90)&&(n.y-=e.h)}function Gn(t){return H.isNumber(t)?t:0}var Xn=Cn.extend({setDimensions:function(){var t=this;t.width=t.maxWidth,t.height=t.maxHeight,t.paddingTop=Hn(t.options)/2,t.xCenter=Math.floor(t.width/2),t.yCenter=Math.floor((t.height-t.paddingTop)/2),t.drawingArea=Math.min(t.height-t.paddingTop,t.width)/2},determineDataLimits:function(){var t=this,e=t.chart,n=Number.POSITIVE_INFINITY,i=Number.NEGATIVE_INFINITY;H.each(e.data.datasets,(function(a,r){if(e.isDatasetVisible(r)){var o=e.getDatasetMeta(r);H.each(a.data,(function(e,a){var r=+t.getRightValue(e);isNaN(r)||o.data[a].hidden||(n=Math.min(r,n),i=Math.max(r,i))}))}})),t.min=n===Number.POSITIVE_INFINITY?0:n,t.max=i===Number.NEGATIVE_INFINITY?0:i,t.handleTickRangeOptions()},_computeTickLimit:function(){return Math.ceil(this.drawingArea/Hn(this.options))},convertTicksToLabels:function(){var t=this;Cn.prototype.convertTicksToLabels.call(t),t.pointLabels=t.chart.data.labels.map((function(){var e=H.callback(t.options.pointLabels.callback,arguments,t);return e||0===e?e:""}))},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},fit:function(){var t=this.options;t.display&&t.pointLabels.display?function(t){var e,n,i,a=H.options._parseFont(t.options.pointLabels),r={l:0,r:t.width,t:0,b:t.height-t.paddingTop},o={};t.ctx.font=a.string,t._pointLabelSizes=[];var s,l,u,d=t.chart.data.labels.length;for(e=0;e<d;e++){i=t.getPointPosition(e,t.drawingArea+5),s=t.ctx,l=a.lineHeight,u=t.pointLabels[e],n=H.isArray(u)?{w:H.longestText(s,s.font,u),h:u.length*l}:{w:s.measureText(u).width,h:l},t._pointLabelSizes[e]=n;var h=t.getIndexAngle(e),c=H.toDegrees(h)%360,f=jn(c,i.x,n.w,0,180),g=jn(c,i.y,n.h,90,270);f.start<r.l&&(r.l=f.start,o.l=h),f.end>r.r&&(r.r=f.end,o.r=h),g.start<r.t&&(r.t=g.start,o.t=h),g.end>r.b&&(r.b=g.end,o.b=h)}t.setReductions(t.drawingArea,r,o)}(this):this.setCenterPoint(0,0,0,0)},setReductions:function(t,e,n){var i=this,a=e.l/Math.sin(n.l),r=Math.max(e.r-i.width,0)/Math.sin(n.r),o=-e.t/Math.cos(n.t),s=-Math.max(e.b-(i.height-i.paddingTop),0)/Math.cos(n.b);a=Gn(a),r=Gn(r),o=Gn(o),s=Gn(s),i.drawingArea=Math.min(Math.floor(t-(a+r)/2),Math.floor(t-(o+s)/2)),i.setCenterPoint(a,r,o,s)},setCenterPoint:function(t,e,n,i){var a=this,r=a.width-e-a.drawingArea,o=t+a.drawingArea,s=n+a.drawingArea,l=a.height-a.paddingTop-i-a.drawingArea;a.xCenter=Math.floor((o+r)/2+a.left),a.yCenter=Math.floor((s+l)/2+a.top+a.paddingTop)},getIndexAngle:function(t){var e=this.chart,n=(t*(360/e.data.labels.length)+((e.options||{}).startAngle||0))%360;return(n<0?n+360:n)*Math.PI*2/360},getDistanceFromCenterForValue:function(t){var e=this;if(H.isNullOrUndef(t))return NaN;var n=e.drawingArea/(e.max-e.min);return e.options.ticks.reverse?(e.max-t)*n:(t-e.min)*n},getPointPosition:function(t,e){var n=this.getIndexAngle(t)-Math.PI/2;return{x:Math.cos(n)*e+this.xCenter,y:Math.sin(n)*e+this.yCenter}},getPointPositionForValue:function(t,e){return this.getPointPosition(t,this.getDistanceFromCenterForValue(e))},getBasePosition:function(t){var e=this.min,n=this.max;return this.getPointPositionForValue(t||0,this.beginAtZero?0:e<0&&n<0?n:e>0&&n>0?e:0)},_drawGrid:function(){var t,e,n,i=this,a=i.ctx,r=i.options,o=r.gridLines,s=r.angleLines,l=Bn(s.lineWidth,o.lineWidth),u=Bn(s.color,o.color);if(r.pointLabels.display&&function(t){var e=t.ctx,n=t.options,i=n.pointLabels,a=Hn(n),r=t.getDistanceFromCenterForValue(n.ticks.reverse?t.min:t.max),o=H.options._parseFont(i);e.save(),e.font=o.string,e.textBaseline="middle";for(var s=t.chart.data.labels.length-1;s>=0;s--){var l=0===s?a/2:0,u=t.getPointPosition(s,r+l+5),d=En(i.fontColor,s,N.global.defaultFontColor);e.fillStyle=d;var h=t.getIndexAngle(s),c=H.toDegrees(h);e.textAlign=qn(c),Yn(c,t._pointLabelSizes[s],u),Un(e,t.pointLabels[s],u,o.lineHeight)}e.restore()}(i),o.display&&H.each(i.ticks,(function(t,n){0!==n&&(e=i.getDistanceFromCenterForValue(i.ticksAsNumbers[n]),function(t,e,n,i){var a,r=t.ctx,o=e.circular,s=t.chart.data.labels.length,l=En(e.color,i-1),u=En(e.lineWidth,i-1);if((o||s)&&l&&u){if(r.save(),r.strokeStyle=l,r.lineWidth=u,r.setLineDash&&(r.setLineDash(e.borderDash||[]),r.lineDashOffset=e.borderDashOffset||0),r.beginPath(),o)r.arc(t.xCenter,t.yCenter,n,0,2*Math.PI);else{a=t.getPointPosition(0,n),r.moveTo(a.x,a.y);for(var d=1;d<s;d++)a=t.getPointPosition(d,n),r.lineTo(a.x,a.y)}r.closePath(),r.stroke(),r.restore()}}(i,o,e,n))})),s.display&&l&&u){for(a.save(),a.lineWidth=l,a.strokeStyle=u,a.setLineDash&&(a.setLineDash(Wn([s.borderDash,o.borderDash,[]])),a.lineDashOffset=Wn([s.borderDashOffset,o.borderDashOffset,0])),t=i.chart.data.labels.length-1;t>=0;t--)e=i.getDistanceFromCenterForValue(r.ticks.reverse?i.min:i.max),n=i.getPointPosition(t,e),a.beginPath(),a.moveTo(i.xCenter,i.yCenter),a.lineTo(n.x,n.y),a.stroke();a.restore()}},_drawLabels:function(){var t=this,e=t.ctx,n=t.options.ticks;if(n.display){var i,a,r=t.getIndexAngle(0),o=H.options._parseFont(n),s=Bn(n.fontColor,N.global.defaultFontColor);e.save(),e.font=o.string,e.translate(t.xCenter,t.yCenter),e.rotate(r),e.textAlign="center",e.textBaseline="middle",H.each(t.ticks,(function(r,l){(0!==l||n.reverse)&&(i=t.getDistanceFromCenterForValue(t.ticksAsNumbers[l]),n.showLabelBackdrop&&(a=e.measureText(r).width,e.fillStyle=n.backdropColor,e.fillRect(-a/2-n.backdropPaddingX,-i-o.size/2-n.backdropPaddingY,a+2*n.backdropPaddingX,o.size+2*n.backdropPaddingY)),e.fillStyle=s,e.fillText(r,0,-i))})),e.restore()}},_drawTitle:H.noop}),Kn=Vn;Xn._defaults=Kn;var Zn=H._deprecated,$n=H.options.resolve,Jn=H.valueOrDefault,Qn=Number.MIN_SAFE_INTEGER||-9007199254740991,ti=Number.MAX_SAFE_INTEGER||9007199254740991,ei={millisecond:{common:!0,size:1,steps:1e3},second:{common:!0,size:1e3,steps:60},minute:{common:!0,size:6e4,steps:60},hour:{common:!0,size:36e5,steps:24},day:{common:!0,size:864e5,steps:30},week:{common:!1,size:6048e5,steps:4},month:{common:!0,size:2628e6,steps:12},quarter:{common:!1,size:7884e6,steps:4},year:{common:!0,size:3154e7}},ni=Object.keys(ei);function ii(t,e){return t-e}function ai(t){return H.valueOrDefault(t.time.min,t.ticks.min)}function ri(t){return H.valueOrDefault(t.time.max,t.ticks.max)}function oi(t,e,n,i){var a=function(t,e,n){for(var i,a,r,o=0,s=t.length-1;o>=0&&o<=s;){if(a=t[(i=o+s>>1)-1]||null,r=t[i],!a)return{lo:null,hi:r};if(r[e]<n)o=i+1;else{if(!(a[e]>n))return{lo:a,hi:r};s=i-1}}return{lo:r,hi:null}}(t,e,n),r=a.lo?a.hi?a.lo:t[t.length-2]:t[0],o=a.lo?a.hi?a.hi:t[t.length-1]:t[1],s=o[e]-r[e],l=s?(n-r[e])/s:0,u=(o[i]-r[i])*l;return r[i]+u}function si(t,e){var n=t._adapter,i=t.options.time,a=i.parser,r=a||i.format,o=e;return"function"==typeof a&&(o=a(o)),H.isFinite(o)||(o="string"==typeof r?n.parse(o,r):n.parse(o)),null!==o?+o:(a||"function"!=typeof r||(o=r(e),H.isFinite(o)||(o=n.parse(o))),o)}function li(t,e){if(H.isNullOrUndef(e))return null;var n=t.options.time,i=si(t,t.getRightValue(e));return null===i?i:(n.round&&(i=+t._adapter.startOf(i,n.round)),i)}function ui(t,e,n,i){var a,r,o,s=ni.length;for(a=ni.indexOf(t);a<s-1;++a)if(o=(r=ei[ni[a]]).steps?r.steps:ti,r.common&&Math.ceil((n-e)/(o*r.size))<=i)return ni[a];return ni[s-1]}function di(t,e,n){var i,a,r=[],o={},s=e.length;for(i=0;i<s;++i)o[a=e[i]]=i,r.push({value:a,major:!1});return 0!==s&&n?function(t,e,n,i){var a,r,o=t._adapter,s=+o.startOf(e[0].value,i),l=e[e.length-1].value;for(a=s;a<=l;a=+o.add(a,1,i))(r=n[a])>=0&&(e[r].major=!0);return e}(t,r,o,n):r}var hi=yn.extend({initialize:function(){this.mergeTicksOptions(),yn.prototype.initialize.call(this)},update:function(){var t=this,e=t.options,n=e.time||(e.time={}),i=t._adapter=new rn._date(e.adapters.date);return Zn("time scale",n.format,"time.format","time.parser"),Zn("time scale",n.min,"time.min","ticks.min"),Zn("time scale",n.max,"time.max","ticks.max"),H.mergeIf(n.displayFormats,i.formats()),yn.prototype.update.apply(t,arguments)},getRightValue:function(t){return t&&void 0!==t.t&&(t=t.t),yn.prototype.getRightValue.call(this,t)},determineDataLimits:function(){var t,e,n,i,a,r,o,s=this,l=s.chart,u=s._adapter,d=s.options,h=d.time.unit||"day",c=ti,f=Qn,g=[],p=[],m=[],v=s._getLabels();for(t=0,n=v.length;t<n;++t)m.push(li(s,v[t]));for(t=0,n=(l.data.datasets||[]).length;t<n;++t)if(l.isDatasetVisible(t))if(a=l.data.datasets[t].data,H.isObject(a[0]))for(p[t]=[],e=0,i=a.length;e<i;++e)r=li(s,a[e]),g.push(r),p[t][e]=r;else p[t]=m.slice(0),o||(g=g.concat(m),o=!0);else p[t]=[];m.length&&(c=Math.min(c,m[0]),f=Math.max(f,m[m.length-1])),g.length&&(g=n>1?function(t){var e,n,i,a={},r=[];for(e=0,n=t.length;e<n;++e)a[i=t[e]]||(a[i]=!0,r.push(i));return r}(g).sort(ii):g.sort(ii),c=Math.min(c,g[0]),f=Math.max(f,g[g.length-1])),c=li(s,ai(d))||c,f=li(s,ri(d))||f,c=c===ti?+u.startOf(Date.now(),h):c,f=f===Qn?+u.endOf(Date.now(),h)+1:f,s.min=Math.min(c,f),s.max=Math.max(c+1,f),s._table=[],s._timestamps={data:g,datasets:p,labels:m}},buildTicks:function(){var t,e,n,i=this,a=i.min,r=i.max,o=i.options,s=o.ticks,l=o.time,u=i._timestamps,d=[],h=i.getLabelCapacity(a),c=s.source,f=o.distribution;for(u="data"===c||"auto"===c&&"series"===f?u.data:"labels"===c?u.labels:function(t,e,n,i){var a,r=t._adapter,o=t.options,s=o.time,l=s.unit||ui(s.minUnit,e,n,i),u=$n([s.stepSize,s.unitStepSize,1]),d="week"===l&&s.isoWeekday,h=e,c=[];if(d&&(h=+r.startOf(h,"isoWeek",d)),h=+r.startOf(h,d?"day":l),r.diff(n,e,l)>1e5*u)throw e+" and "+n+" are too far apart with stepSize of "+u+" "+l;for(a=h;a<n;a=+r.add(a,u,l))c.push(a);return a!==n&&"ticks"!==o.bounds||c.push(a),c}(i,a,r,h),"ticks"===o.bounds&&u.length&&(a=u[0],r=u[u.length-1]),a=li(i,ai(o))||a,r=li(i,ri(o))||r,t=0,e=u.length;t<e;++t)(n=u[t])>=a&&n<=r&&d.push(n);return i.min=a,i.max=r,i._unit=l.unit||(s.autoSkip?ui(l.minUnit,i.min,i.max,h):function(t,e,n,i,a){var r,o;for(r=ni.length-1;r>=ni.indexOf(n);r--)if(o=ni[r],ei[o].common&&t._adapter.diff(a,i,o)>=e-1)return o;return ni[n?ni.indexOf(n):0]}(i,d.length,l.minUnit,i.min,i.max)),i._majorUnit=s.major.enabled&&"year"!==i._unit?function(t){for(var e=ni.indexOf(t)+1,n=ni.length;e<n;++e)if(ei[ni[e]].common)return ni[e]}(i._unit):void 0,i._table=function(t,e,n,i){if("linear"===i||!t.length)return[{time:e,pos:0},{time:n,pos:1}];var a,r,o,s,l,u=[],d=[e];for(a=0,r=t.length;a<r;++a)(s=t[a])>e&&s<n&&d.push(s);for(d.push(n),a=0,r=d.length;a<r;++a)l=d[a+1],o=d[a-1],s=d[a],void 0!==o&&void 0!==l&&Math.round((l+o)/2)===s||u.push({time:s,pos:a/(r-1)});return u}(i._timestamps.data,a,r,f),i._offsets=function(t,e,n,i,a){var r,o,s=0,l=0;return a.offset&&e.length&&(r=oi(t,"time",e[0],"pos"),s=1===e.length?1-r:(oi(t,"time",e[1],"pos")-r)/2,o=oi(t,"time",e[e.length-1],"pos"),l=1===e.length?o:(o-oi(t,"time",e[e.length-2],"pos"))/2),{start:s,end:l,factor:1/(s+1+l)}}(i._table,d,0,0,o),s.reverse&&d.reverse(),di(i,d,i._majorUnit)},getLabelForIndex:function(t,e){var n=this,i=n._adapter,a=n.chart.data,r=n.options.time,o=a.labels&&t<a.labels.length?a.labels[t]:"",s=a.datasets[e].data[t];return H.isObject(s)&&(o=n.getRightValue(s)),r.tooltipFormat?i.format(si(n,o),r.tooltipFormat):"string"==typeof o?o:i.format(si(n,o),r.displayFormats.datetime)},tickFormatFunction:function(t,e,n,i){var a=this._adapter,r=this.options,o=r.time.displayFormats,s=o[this._unit],l=this._majorUnit,u=o[l],d=n[e],h=r.ticks,c=l&&u&&d&&d.major,f=a.format(t,i||(c?u:s)),g=c?h.major:h.minor,p=$n([g.callback,g.userCallback,h.callback,h.userCallback]);return p?p(f,e,n):f},convertTicksToLabels:function(t){var e,n,i=[];for(e=0,n=t.length;e<n;++e)i.push(this.tickFormatFunction(t[e].value,e,t));return i},getPixelForOffset:function(t){var e=this._offsets,n=oi(this._table,"time",t,"pos");return this.getPixelForDecimal((e.start+n)*e.factor)},getPixelForValue:function(t,e,n){var i=null;if(void 0!==e&&void 0!==n&&(i=this._timestamps.datasets[n][e]),null===i&&(i=li(this,t)),null!==i)return this.getPixelForOffset(i)},getPixelForTick:function(t){var e=this.getTicks();return t>=0&&t<e.length?this.getPixelForOffset(e[t].value):null},getValueForPixel:function(t){var e=this._offsets,n=this.getDecimalForPixel(t)/e.factor-e.end,i=oi(this._table,"pos",n,"time");return this._adapter._create(i)},_getLabelSize:function(t){var e=this.options.ticks,n=this.ctx.measureText(t).width,i=H.toRadians(this.isHorizontal()?e.maxRotation:e.minRotation),a=Math.cos(i),r=Math.sin(i),o=Jn(e.fontSize,N.global.defaultFontSize);return{w:n*a+o*r,h:n*r+o*a}},getLabelWidth:function(t){return this._getLabelSize(t).w},getLabelCapacity:function(t){var e=this,n=e.options.time,i=n.displayFormats,a=i[n.unit]||i.millisecond,r=e.tickFormatFunction(t,0,di(e,[t],e._majorUnit),a),o=e._getLabelSize(r),s=Math.floor(e.isHorizontal()?e.width/o.w:e.height/o.h);return e.options.offset&&s--,s>0?s:1}}),ci={position:"bottom",distribution:"linear",bounds:"data",adapters:{},time:{parser:!1,unit:!1,round:!1,displayFormat:!1,isoWeekday:!1,minUnit:"millisecond",displayFormats:{}},ticks:{autoSkip:!1,source:"auto",major:{enabled:!1}}};hi._defaults=ci;var fi={category:kn,linear:Tn,logarithmic:zn,radialLinear:Xn,time:hi},gi={datetime:"MMM D, YYYY, h:mm:ss a",millisecond:"h:mm:ss.SSS a",second:"h:mm:ss a",minute:"h:mm a",hour:"hA",day:"MMM D",week:"ll",month:"MMM YYYY",quarter:"[Q]Q - YYYY",year:"YYYY"};rn._date.override("function"==typeof t?{_id:"moment",formats:function(){return gi},parse:function(e,n){return"string"==typeof e&&"string"==typeof n?e=t(e,n):e instanceof t||(e=t(e)),e.isValid()?e.valueOf():null},format:function(e,n){return t(e).format(n)},add:function(e,n,i){return t(e).add(n,i).valueOf()},diff:function(e,n,i){return t(e).diff(t(n),i)},startOf:function(e,n,i){return e=t(e),"isoWeek"===n?e.isoWeekday(i).valueOf():e.startOf(n).valueOf()},endOf:function(e,n){return t(e).endOf(n).valueOf()},_create:function(e){return t(e)}}:{}),N._set("global",{plugins:{filler:{propagate:!0}}});var pi={dataset:function(t){var e=t.fill,n=t.chart,i=n.getDatasetMeta(e),a=i&&n.isDatasetVisible(e)&&i.dataset._children||[],r=a.length||0;return r?function(t,e){return e<r&&a[e]._view||null}:null},boundary:function(t){var e=t.boundary,n=e?e.x:null,i=e?e.y:null;return H.isArray(e)?function(t,n){return e[n]}:function(t){return{x:null===n?t.x:n,y:null===i?t.y:i}}}};function mi(t,e,n){var i,a=t._model||{},r=a.fill;if(void 0===r&&(r=!!a.backgroundColor),!1===r||null===r)return!1;if(!0===r)return"origin";if(i=parseFloat(r,10),isFinite(i)&&Math.floor(i)===i)return"-"!==r[0]&&"+"!==r[0]||(i=e+i),!(i===e||i<0||i>=n)&&i;switch(r){case"bottom":return"start";case"top":return"end";case"zero":return"origin";case"origin":case"start":case"end":return r;default:return!1}}function vi(t){return(t.el._scale||{}).getPointPositionForValue?function(t){var e,n,i,a,r,o=t.el._scale,s=o.options,l=o.chart.data.labels.length,u=t.fill,d=[];if(!l)return null;for(e=s.ticks.reverse?o.max:o.min,n=s.ticks.reverse?o.min:o.max,i=o.getPointPositionForValue(0,e),a=0;a<l;++a)r="start"===u||"end"===u?o.getPointPositionForValue(a,"start"===u?e:n):o.getBasePosition(a),s.gridLines.circular&&(r.cx=i.x,r.cy=i.y,r.angle=o.getIndexAngle(a)-Math.PI/2),d.push(r);return d}(t):function(t){var e,n=t.el._model||{},i=t.el._scale||{},a=t.fill,r=null;if(isFinite(a))return null;if("start"===a?r=void 0===n.scaleBottom?i.bottom:n.scaleBottom:"end"===a?r=void 0===n.scaleTop?i.top:n.scaleTop:void 0!==n.scaleZero?r=n.scaleZero:i.getBasePixel&&(r=i.getBasePixel()),null!=r){if(void 0!==r.x&&void 0!==r.y)return r;if(H.isFinite(r))return{x:(e=i.isHorizontal())?r:null,y:e?null:r}}return null}(t)}function bi(t,e,n){var i,a=t[e].fill,r=[e];if(!n)return a;for(;!1!==a&&-1===r.indexOf(a);){if(!isFinite(a))return a;if(!(i=t[a]))return!1;if(i.visible)return a;r.push(a),a=i.fill}return!1}function xi(t){var e=t.fill,n="dataset";return!1===e?null:(isFinite(e)||(n="boundary"),pi[n](t))}function yi(t){return t&&!t.skip}function _i(t,e,n,i,a){var r,o,s,l;if(i&&a){for(t.moveTo(e[0].x,e[0].y),r=1;r<i;++r)H.canvas.lineTo(t,e[r-1],e[r]);if(void 0===n[0].angle)for(t.lineTo(n[a-1].x,n[a-1].y),r=a-1;r>0;--r)H.canvas.lineTo(t,n[r],n[r-1],!0);else for(o=n[0].cx,s=n[0].cy,l=Math.sqrt(Math.pow(n[0].x-o,2)+Math.pow(n[0].y-s,2)),r=a-1;r>0;--r)t.arc(o,s,l,n[r].angle,n[r-1].angle,!0)}}function ki(t,e,n,i,a,r){var o,s,l,u,d,h,c,f,g=e.length,p=i.spanGaps,m=[],v=[],b=0,x=0;for(t.beginPath(),o=0,s=g;o<s;++o)d=n(u=e[l=o%g]._view,l,i),h=yi(u),c=yi(d),r&&void 0===f&&h&&(s=g+(f=o+1)),h&&c?(b=m.push(u),x=v.push(d)):b&&x&&(p?(h&&m.push(u),c&&v.push(d)):(_i(t,m,v,b,x),b=x=0,m=[],v=[]));_i(t,m,v,b,x),t.closePath(),t.fillStyle=a,t.fill()}var wi={id:"filler",afterDatasetsUpdate:function(t,e){var n,i,a,r,o=(t.data.datasets||[]).length,s=e.propagate,l=[];for(i=0;i<o;++i)r=null,(a=(n=t.getDatasetMeta(i)).dataset)&&a._model&&a instanceof kt.Line&&(r={visible:t.isDatasetVisible(i),fill:mi(a,i,o),chart:t,el:a}),n.$filler=r,l.push(r);for(i=0;i<o;++i)(r=l[i])&&(r.fill=bi(l,i,s),r.boundary=vi(r),r.mapper=xi(r))},beforeDatasetsDraw:function(t){var e,n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas(),u=t.ctx;for(n=l.length-1;n>=0;--n)(e=l[n].$filler)&&e.visible&&(a=(i=e.el)._view,r=i._children||[],o=e.mapper,s=a.backgroundColor||N.global.defaultColor,o&&s&&r.length&&(H.canvas.clipArea(u,t.chartArea),ki(u,r,o,a,s,i._loop),H.canvas.unclipArea(u)))}},Mi=H.rtl.getRtlAdapter,Si=H.noop,Ci=H.valueOrDefault;function Pi(t,e){return t.usePointStyle&&t.boxWidth>e?e:t.boxWidth}N._set("global",{legend:{display:!0,position:"top",align:"center",fullWidth:!0,reverse:!1,weight:1e3,onClick:function(t,e){var n=e.datasetIndex,i=this.chart,a=i.getDatasetMeta(n);a.hidden=null===a.hidden?!i.data.datasets[n].hidden:null,i.update()},onHover:null,onLeave:null,labels:{boxWidth:40,padding:10,generateLabels:function(t){var e=t.data.datasets,n=t.options.legend||{},i=n.labels&&n.labels.usePointStyle;return t._getSortedDatasetMetas().map((function(n){var a=n.controller.getStyle(i?0:void 0);return{text:e[n.index].label,fillStyle:a.backgroundColor,hidden:!t.isDatasetVisible(n.index),lineCap:a.borderCapStyle,lineDash:a.borderDash,lineDashOffset:a.borderDashOffset,lineJoin:a.borderJoinStyle,lineWidth:a.borderWidth,strokeStyle:a.borderColor,pointStyle:a.pointStyle,rotation:a.rotation,datasetIndex:n.index}}),this)}}},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data.datasets;for(a.setAttribute("class",t.id+"-legend"),e=0,n=r.length;e<n;e++)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=r[e].backgroundColor,r[e].label&&i.appendChild(document.createTextNode(r[e].label));return a.outerHTML}});var Ai=K.extend({initialize:function(t){H.extend(this,t),this.legendHitBoxes=[],this._hoveredItem=null,this.doughnutMode=!1},beforeUpdate:Si,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Si,beforeSetDimensions:Si,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Si,beforeBuildLabels:Si,buildLabels:function(){var t=this,e=t.options.labels||{},n=H.callback(e.generateLabels,[t.chart],t)||[];e.filter&&(n=n.filter((function(n){return e.filter(n,t.chart.data)}))),t.options.reverse&&n.reverse(),t.legendItems=n},afterBuildLabels:Si,beforeFit:Si,fit:function(){var t=this,e=t.options,n=e.labels,i=e.display,a=t.ctx,r=H.options._parseFont(n),o=r.size,s=t.legendHitBoxes=[],l=t.minSize,u=t.isHorizontal();if(u?(l.width=t.maxWidth,l.height=i?10:0):(l.width=i?10:0,l.height=t.maxHeight),i){if(a.font=r.string,u){var d=t.lineWidths=[0],h=0;a.textAlign="left",a.textBaseline="middle",H.each(t.legendItems,(function(t,e){var i=Pi(n,o)+o/2+a.measureText(t.text).width;(0===e||d[d.length-1]+i+2*n.padding>l.width)&&(h+=o+n.padding,d[d.length-(e>0?0:1)]=0),s[e]={left:0,top:0,width:i,height:o},d[d.length-1]+=i+n.padding})),l.height+=h}else{var c=n.padding,f=t.columnWidths=[],g=t.columnHeights=[],p=n.padding,m=0,v=0;H.each(t.legendItems,(function(t,e){var i=Pi(n,o)+o/2+a.measureText(t.text).width;e>0&&v+o+2*c>l.height&&(p+=m+n.padding,f.push(m),g.push(v),m=0,v=0),m=Math.max(m,i),v+=o+c,s[e]={left:0,top:0,width:i,height:o}})),p+=m,f.push(m),g.push(v),l.width+=p}t.width=l.width,t.height=l.height}else t.width=l.width=t.height=l.height=0},afterFit:Si,isHorizontal:function(){return"top"===this.options.position||"bottom"===this.options.position},draw:function(){var t=this,e=t.options,n=e.labels,i=N.global,a=i.defaultColor,r=i.elements.line,o=t.height,s=t.columnHeights,l=t.width,u=t.lineWidths;if(e.display){var d,h=Mi(e.rtl,t.left,t.minSize.width),c=t.ctx,f=Ci(n.fontColor,i.defaultFontColor),g=H.options._parseFont(n),p=g.size;c.textAlign=h.textAlign("left"),c.textBaseline="middle",c.lineWidth=.5,c.strokeStyle=f,c.fillStyle=f,c.font=g.string;var m=Pi(n,p),v=t.legendHitBoxes,b=function(t,i){switch(e.align){case"start":return n.padding;case"end":return t-i;default:return(t-i+n.padding)/2}},x=t.isHorizontal();d=x?{x:t.left+b(l,u[0]),y:t.top+n.padding,line:0}:{x:t.left+n.padding,y:t.top+b(o,s[0]),line:0},H.rtl.overrideTextDirection(t.ctx,e.textDirection);var y=p+n.padding;H.each(t.legendItems,(function(e,i){var f=c.measureText(e.text).width,g=m+p/2+f,_=d.x,k=d.y;h.setWidth(t.minSize.width),x?i>0&&_+g+n.padding>t.left+t.minSize.width&&(k=d.y+=y,d.line++,_=d.x=t.left+b(l,u[d.line])):i>0&&k+y>t.top+t.minSize.height&&(_=d.x=_+t.columnWidths[d.line]+n.padding,d.line++,k=d.y=t.top+b(o,s[d.line]));var w=h.x(_);!function(t,e,i){if(!(isNaN(m)||m<=0)){c.save();var o=Ci(i.lineWidth,r.borderWidth);if(c.fillStyle=Ci(i.fillStyle,a),c.lineCap=Ci(i.lineCap,r.borderCapStyle),c.lineDashOffset=Ci(i.lineDashOffset,r.borderDashOffset),c.lineJoin=Ci(i.lineJoin,r.borderJoinStyle),c.lineWidth=o,c.strokeStyle=Ci(i.strokeStyle,a),c.setLineDash&&c.setLineDash(Ci(i.lineDash,r.borderDash)),n&&n.usePointStyle){var s=m*Math.SQRT2/2,l=h.xPlus(t,m/2),u=e+p/2;H.canvas.drawPoint(c,i.pointStyle,s,l,u,i.rotation)}else c.fillRect(h.leftForLtr(t,m),e,m,p),0!==o&&c.strokeRect(h.leftForLtr(t,m),e,m,p);c.restore()}}(w,k,e),v[i].left=h.leftForLtr(w,v[i].width),v[i].top=k,function(t,e,n,i){var a=p/2,r=h.xPlus(t,m+a),o=e+a;c.fillText(n.text,r,o),n.hidden&&(c.beginPath(),c.lineWidth=2,c.moveTo(r,o),c.lineTo(h.xPlus(r,i),o),c.stroke())}(w,k,e,f),x?d.x+=g+n.padding:d.y+=y})),H.rtl.restoreTextDirection(t.ctx,e.textDirection)}},_getLegendItemAt:function(t,e){var n,i,a,r=this;if(t>=r.left&&t<=r.right&&e>=r.top&&e<=r.bottom)for(a=r.legendHitBoxes,n=0;n<a.length;++n)if(t>=(i=a[n]).left&&t<=i.left+i.width&&e>=i.top&&e<=i.top+i.height)return r.legendItems[n];return null},handleEvent:function(t){var e,n=this,i=n.options,a="mouseup"===t.type?"click":t.type;if("mousemove"===a){if(!i.onHover&&!i.onLeave)return}else{if("click"!==a)return;if(!i.onClick)return}e=n._getLegendItemAt(t.x,t.y),"click"===a?e&&i.onClick&&i.onClick.call(n,t.native,e):(i.onLeave&&e!==n._hoveredItem&&(n._hoveredItem&&i.onLeave.call(n,t.native,n._hoveredItem),n._hoveredItem=e),i.onHover&&e&&i.onHover.call(n,t.native,e))}});function Di(t,e){var n=new Ai({ctx:t.ctx,options:e,chart:t});pe.configure(t,n,e),pe.addBox(t,n),t.legend=n}var Ti={id:"legend",_element:Ai,beforeInit:function(t){var e=t.options.legend;e&&Di(t,e)},beforeUpdate:function(t){var e=t.options.legend,n=t.legend;e?(H.mergeIf(e,N.global.legend),n?(pe.configure(t,n,e),n.options=e):Di(t,e)):n&&(pe.removeBox(t,n),delete t.legend)},afterEvent:function(t,e){var n=t.legend;n&&n.handleEvent(e)}},Ii=H.noop;N._set("global",{title:{display:!1,fontStyle:"bold",fullWidth:!0,padding:10,position:"top",text:"",weight:2e3}});var Fi=K.extend({initialize:function(t){H.extend(this,t),this.legendHitBoxes=[]},beforeUpdate:Ii,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Ii,beforeSetDimensions:Ii,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Ii,beforeBuildLabels:Ii,buildLabels:Ii,afterBuildLabels:Ii,beforeFit:Ii,fit:function(){var t,e=this,n=e.options,i=e.minSize={},a=e.isHorizontal();n.display?(t=(H.isArray(n.text)?n.text.length:1)*H.options._parseFont(n).lineHeight+2*n.padding,e.width=i.width=a?e.maxWidth:t,e.height=i.height=a?t:e.maxHeight):e.width=i.width=e.height=i.height=0},afterFit:Ii,isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},draw:function(){var t=this,e=t.ctx,n=t.options;if(n.display){var i,a,r,o=H.options._parseFont(n),s=o.lineHeight,l=s/2+n.padding,u=0,d=t.top,h=t.left,c=t.bottom,f=t.right;e.fillStyle=H.valueOrDefault(n.fontColor,N.global.defaultFontColor),e.font=o.string,t.isHorizontal()?(a=h+(f-h)/2,r=d+l,i=f-h):(a="left"===n.position?h+l:f-l,r=d+(c-d)/2,i=c-d,u=Math.PI*("left"===n.position?-.5:.5)),e.save(),e.translate(a,r),e.rotate(u),e.textAlign="center",e.textBaseline="middle";var g=n.text;if(H.isArray(g))for(var p=0,m=0;m<g.length;++m)e.fillText(g[m],0,p,i),p+=s;else e.fillText(g,0,0,i);e.restore()}}});function Oi(t,e){var n=new Fi({ctx:t.ctx,options:e,chart:t});pe.configure(t,n,e),pe.addBox(t,n),t.titleBlock=n}var Li={},Ri=wi,zi=Ti,Ni={id:"title",_element:Fi,beforeInit:function(t){var e=t.options.title;e&&Oi(t,e)},beforeUpdate:function(t){var e=t.options.title,n=t.titleBlock;e?(H.mergeIf(e,N.global.title),n?(pe.configure(t,n,e),n.options=e):Oi(t,e)):n&&(pe.removeBox(t,n),delete t.titleBlock)}};for(var Bi in Li.filler=Ri,Li.legend=zi,Li.title=Ni,en.helpers=H,function(){function t(t,e,n){var i;return"string"==typeof t?(i=parseInt(t,10),-1!==t.indexOf("%")&&(i=i/100*e.parentNode[n])):i=t,i}function e(t){return null!=t&&"none"!==t}function n(n,i,a){var r=document.defaultView,o=H._getParentNode(n),s=r.getComputedStyle(n)[i],l=r.getComputedStyle(o)[i],u=e(s),d=e(l),h=Number.POSITIVE_INFINITY;return u||d?Math.min(u?t(s,n,a):h,d?t(l,o,a):h):"none"}H.where=function(t,e){if(H.isArray(t)&&Array.prototype.filter)return t.filter(e);var n=[];return H.each(t,(function(t){e(t)&&n.push(t)})),n},H.findIndex=Array.prototype.findIndex?function(t,e,n){return t.findIndex(e,n)}:function(t,e,n){n=void 0===n?t:n;for(var i=0,a=t.length;i<a;++i)if(e.call(n,t[i],i,t))return i;return-1},H.findNextWhere=function(t,e,n){H.isNullOrUndef(n)&&(n=-1);for(var i=n+1;i<t.length;i++){var a=t[i];if(e(a))return a}},H.findPreviousWhere=function(t,e,n){H.isNullOrUndef(n)&&(n=t.length);for(var i=n-1;i>=0;i--){var a=t[i];if(e(a))return a}},H.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},H.almostEquals=function(t,e,n){return Math.abs(t-e)<n},H.almostWhole=function(t,e){var n=Math.round(t);return n-e<=t&&n+e>=t},H.max=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.max(t,e)}),Number.NEGATIVE_INFINITY)},H.min=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.min(t,e)}),Number.POSITIVE_INFINITY)},H.sign=Math.sign?function(t){return Math.sign(t)}:function(t){return 0===(t=+t)||isNaN(t)?t:t>0?1:-1},H.toRadians=function(t){return t*(Math.PI/180)},H.toDegrees=function(t){return t*(180/Math.PI)},H._decimalPlaces=function(t){if(H.isFinite(t)){for(var e=1,n=0;Math.round(t*e)/e!==t;)e*=10,n++;return n}},H.getAngleFromPoint=function(t,e){var n=e.x-t.x,i=e.y-t.y,a=Math.sqrt(n*n+i*i),r=Math.atan2(i,n);return r<-.5*Math.PI&&(r+=2*Math.PI),{angle:r,distance:a}},H.distanceBetweenPoints=function(t,e){return Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2))},H.aliasPixel=function(t){return t%2==0?0:.5},H._alignPixel=function(t,e,n){var i=t.currentDevicePixelRatio,a=n/2;return Math.round((e-a)*i)/i+a},H.splineCurve=function(t,e,n,i){var a=t.skip?e:t,r=e,o=n.skip?e:n,s=Math.sqrt(Math.pow(r.x-a.x,2)+Math.pow(r.y-a.y,2)),l=Math.sqrt(Math.pow(o.x-r.x,2)+Math.pow(o.y-r.y,2)),u=s/(s+l),d=l/(s+l),h=i*(u=isNaN(u)?0:u),c=i*(d=isNaN(d)?0:d);return{previous:{x:r.x-h*(o.x-a.x),y:r.y-h*(o.y-a.y)},next:{x:r.x+c*(o.x-a.x),y:r.y+c*(o.y-a.y)}}},H.EPSILON=Number.EPSILON||1e-14,H.splineCurveMonotone=function(t){var e,n,i,a,r,o,s,l,u,d=(t||[]).map((function(t){return{model:t._model,deltaK:0,mK:0}})),h=d.length;for(e=0;e<h;++e)if(!(i=d[e]).model.skip){if(n=e>0?d[e-1]:null,(a=e<h-1?d[e+1]:null)&&!a.model.skip){var c=a.model.x-i.model.x;i.deltaK=0!==c?(a.model.y-i.model.y)/c:0}!n||n.model.skip?i.mK=i.deltaK:!a||a.model.skip?i.mK=n.deltaK:this.sign(n.deltaK)!==this.sign(i.deltaK)?i.mK=0:i.mK=(n.deltaK+i.deltaK)/2}for(e=0;e<h-1;++e)i=d[e],a=d[e+1],i.model.skip||a.model.skip||(H.almostEquals(i.deltaK,0,this.EPSILON)?i.mK=a.mK=0:(r=i.mK/i.deltaK,o=a.mK/i.deltaK,(l=Math.pow(r,2)+Math.pow(o,2))<=9||(s=3/Math.sqrt(l),i.mK=r*s*i.deltaK,a.mK=o*s*i.deltaK)));for(e=0;e<h;++e)(i=d[e]).model.skip||(n=e>0?d[e-1]:null,a=e<h-1?d[e+1]:null,n&&!n.model.skip&&(u=(i.model.x-n.model.x)/3,i.model.controlPointPreviousX=i.model.x-u,i.model.controlPointPreviousY=i.model.y-u*i.mK),a&&!a.model.skip&&(u=(a.model.x-i.model.x)/3,i.model.controlPointNextX=i.model.x+u,i.model.controlPointNextY=i.model.y+u*i.mK))},H.nextItem=function(t,e,n){return n?e>=t.length-1?t[0]:t[e+1]:e>=t.length-1?t[t.length-1]:t[e+1]},H.previousItem=function(t,e,n){return n?e<=0?t[t.length-1]:t[e-1]:e<=0?t[0]:t[e-1]},H.niceNum=function(t,e){var n=Math.floor(H.log10(t)),i=t/Math.pow(10,n);return(e?i<1.5?1:i<3?2:i<7?5:10:i<=1?1:i<=2?2:i<=5?5:10)*Math.pow(10,n)},H.requestAnimFrame="undefined"==typeof window?function(t){t()}:window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)},H.getRelativePosition=function(t,e){var n,i,a=t.originalEvent||t,r=t.target||t.srcElement,o=r.getBoundingClientRect(),s=a.touches;s&&s.length>0?(n=s[0].clientX,i=s[0].clientY):(n=a.clientX,i=a.clientY);var l=parseFloat(H.getStyle(r,"padding-left")),u=parseFloat(H.getStyle(r,"padding-top")),d=parseFloat(H.getStyle(r,"padding-right")),h=parseFloat(H.getStyle(r,"padding-bottom")),c=o.right-o.left-l-d,f=o.bottom-o.top-u-h;return{x:n=Math.round((n-o.left-l)/c*r.width/e.currentDevicePixelRatio),y:i=Math.round((i-o.top-u)/f*r.height/e.currentDevicePixelRatio)}},H.getConstraintWidth=function(t){return n(t,"max-width","clientWidth")},H.getConstraintHeight=function(t){return n(t,"max-height","clientHeight")},H._calculatePadding=function(t,e,n){return(e=H.getStyle(t,e)).indexOf("%")>-1?n*parseInt(e,10)/100:parseInt(e,10)},H._getParentNode=function(t){var e=t.parentNode;return e&&"[object ShadowRoot]"===e.toString()&&(e=e.host),e},H.getMaximumWidth=function(t){var e=H._getParentNode(t);if(!e)return t.clientWidth;var n=e.clientWidth,i=n-H._calculatePadding(e,"padding-left",n)-H._calculatePadding(e,"padding-right",n),a=H.getConstraintWidth(t);return isNaN(a)?i:Math.min(i,a)},H.getMaximumHeight=function(t){var e=H._getParentNode(t);if(!e)return t.clientHeight;var n=e.clientHeight,i=n-H._calculatePadding(e,"padding-top",n)-H._calculatePadding(e,"padding-bottom",n),a=H.getConstraintHeight(t);return isNaN(a)?i:Math.min(i,a)},H.getStyle=function(t,e){return t.currentStyle?t.currentStyle[e]:document.defaultView.getComputedStyle(t,null).getPropertyValue(e)},H.retinaScale=function(t,e){var n=t.currentDevicePixelRatio=e||"undefined"!=typeof window&&window.devicePixelRatio||1;if(1!==n){var i=t.canvas,a=t.height,r=t.width;i.height=a*n,i.width=r*n,t.ctx.scale(n,n),i.style.height||i.style.width||(i.style.height=a+"px",i.style.width=r+"px")}},H.fontString=function(t,e,n){return e+" "+t+"px "+n},H.longestText=function(t,e,n,i){var a=(i=i||{}).data=i.data||{},r=i.garbageCollect=i.garbageCollect||[];i.font!==e&&(a=i.data={},r=i.garbageCollect=[],i.font=e),t.font=e;var o,s,l,u,d,h=0,c=n.length;for(o=0;o<c;o++)if(null!=(u=n[o])&&!0!==H.isArray(u))h=H.measureText(t,a,r,h,u);else if(H.isArray(u))for(s=0,l=u.length;s<l;s++)null==(d=u[s])||H.isArray(d)||(h=H.measureText(t,a,r,h,d));var f=r.length/2;if(f>n.length){for(o=0;o<f;o++)delete a[r[o]];r.splice(0,f)}return h},H.measureText=function(t,e,n,i,a){var r=e[a];return r||(r=e[a]=t.measureText(a).width,n.push(a)),r>i&&(i=r),i},H.numberOfLabelLines=function(t){var e=1;return H.each(t,(function(t){H.isArray(t)&&t.length>e&&(e=t.length)})),e},H.color=_?function(t){return t instanceof CanvasGradient&&(t=N.global.defaultColor),_(t)}:function(t){return console.error("Color.js not found!"),t},H.getHoverColor=function(t){return t instanceof CanvasPattern||t instanceof CanvasGradient?t:H.color(t).saturate(.5).darken(.1).rgbString()}}(),en._adapters=rn,en.Animation=$,en.animationService=J,en.controllers=Jt,en.DatasetController=it,en.defaults=N,en.Element=K,en.elements=kt,en.Interaction=re,en.layouts=pe,en.platform=Oe,en.plugins=Le,en.Scale=yn,en.scaleService=Re,en.Ticks=on,en.Tooltip=Ye,en.helpers.each(fi,(function(t,e){en.scaleService.registerScaleType(e,t,t._defaults)})),Li)Li.hasOwnProperty(Bi)&&en.plugins.register(Li[Bi]);en.platform.initialize();var Ei=en;return"undefined"!=typeof window&&(window.Chart=en),en.Chart=en,en.Legend=Li.legend._element,en.Title=Li.title._element,en.pluginService=en.plugins,en.PluginBase=en.Element.extend({}),en.canvasHelpers=en.helpers.canvas,en.layoutService=en.layouts,en.LinearScaleBase=Cn,en.helpers.each(["Bar","Bubble","Doughnut","Line","PolarArea","Radar","Scatter"],(function(t){en[t]=function(e,n){return new en(e,en.helpers.merge(n||{},{type:t.charAt(0).toLowerCase()+t.slice(1)}))}})),Ei}));
diff --git a/htdocs/includes/nnnick/chartjs/package-lock.json b/htdocs/includes/nnnick/chartjs/package-lock.json
index b6259567a6e..6b78d4b0ece 100644
--- a/htdocs/includes/nnnick/chartjs/package-lock.json
+++ b/htdocs/includes/nnnick/chartjs/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "chart.js",
-  "version": "2.9.3",
+  "version": "2.9.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/htdocs/includes/nnnick/chartjs/package.json b/htdocs/includes/nnnick/chartjs/package.json
index afb129b7dcd..678715f2e20 100644
--- a/htdocs/includes/nnnick/chartjs/package.json
+++ b/htdocs/includes/nnnick/chartjs/package.json
@@ -2,7 +2,7 @@
   "name": "chart.js",
   "homepage": "https://www.chartjs.org",
   "description": "Simple HTML5 charts using the canvas element.",
-  "version": "2.9.3",
+  "version": "2.9.4",
   "license": "MIT",
   "jsdelivr": "dist/Chart.min.js",
   "unpkg": "dist/Chart.min.js",

From cad93fd585a89b20a207d739d8b21a1029ccb19a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 22:26:08 +0100
Subject: [PATCH 256/888] Fix stock popup when line is not a predefined product
 on TakePOS

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

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index d2d5621ace6..d2fd153e5be 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -1335,7 +1335,7 @@ if ($placeid > 0)
 				if (!empty($conf->stock->enabled) && !empty($user->rights->stock->mouvement->lire))
 				{
 					$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
-					if (!empty($conf->global->$constantforkey)) {
+					if (!empty($conf->global->$constantforkey) && $line->fk_product > 0) {
 						$sql = "SELECT e.rowid, e.ref, e.lieu, e.fk_parent, e.statut, ps.reel, ps.rowid as product_stock_id, p.pmp";
 						$sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e,";
 						$sql .= " ".MAIN_DB_PREFIX."product_stock as ps";

From c85fa66f9544ee88c054f5e0819298a440ea1615 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 22:27:18 +0100
Subject: [PATCH 257/888] Update asset.class.php

---
 htdocs/asset/class/asset.class.php | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index 31397be4c02..ae866ff24ba 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -158,28 +158,6 @@ class Asset extends CommonObject
 	 */
 	public $status;
 
-	// If this object has a subtable with lines
-
-	// /**
-	//  * @var int    Name of subtable line
-	//  */
-	// public $table_element_line = 'assetdet';
-	// /**
-	//  * @var string    Fieldname with ID of parent key if this field has a parent
-	//  */
-	// public $fk_element = 'fk_asset';
-	// /**
-	//  * @var string    Name of subtable class that manage subtable lines
-	//  */
-	// public $class_element_line = 'Assetline';
-	// /**
-	//  * @var array	List of child tables. To test if we can delete object.
-	//  */
-	// protected $childtables=array();
-	// /**
-	//  * @var AssetLine[]     Array of subtable lines
-	//  */
-	// public $lines = array();
 
 	/**
 	 * Constructor

From 798e3ba1a3e617042c2ce518e9f24d57347fd656 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 22:28:17 +0100
Subject: [PATCH 258/888] Update recruitmentcandidature.class.php

---
 .../class/recruitmentcandidature.class.php    | 36 -------------------
 1 file changed, 36 deletions(-)

diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index e997bfb7a3a..5dad53212c6 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -153,42 +153,6 @@ class RecruitmentCandidature extends CommonObject
 	// END MODULEBUILDER PROPERTIES
 
 
-	// If this object has a subtable with lines
-
-	// /**
-	//  * @var string    Name of subtable line
-	//  */
-	// public $table_element_line = 'recruitment_recruitmentcandidatureline';
-
-	// /**
-	//  * @var string    Field with ID of parent key if this object has a parent
-	//  */
-	// public $fk_element = 'fk_recruitmentcandidature';
-
-	// /**
-	//  * @var string    Name of subtable class that manage subtable lines
-	//  */
-	// public $class_element_line = 'RecruitmentCandidatureline';
-
-	// /**
-	//  * @var array	List of child tables. To test if we can delete object.
-	//  */
-	// protected $childtables = array();
-
-	// /**
-	//  * @var array    List of child tables. To know object to delete on cascade.
-	//  *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
-	//  *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
-	//  */
-	// protected $childtablesoncascade = array('recruitment_recruitmentcandidaturedet');
-
-	// /**
-	//  * @var RecruitmentCandidatureLine[]     Array of subtable lines
-	//  */
-	// public $lines = array();
-
-
-
 	/**
 	 * Constructor
 	 *

From 251cd2d29a1f3830d9e91d2ff78ccc0364148900 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 22:28:42 +0100
Subject: [PATCH 259/888] Update hook.class.php

---
 htdocs/zapier/class/hook.class.php | 31 +-----------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index 53f060346b9..ad351d98509 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -251,36 +251,7 @@ class Hook extends CommonObject
 	 */
 	public $import_key;
 
-
-	// If this object has a subtable with lines
-
-	// /**
-	//  * @var string    Name of subtable line
-	//  */
-	//public $table_element_line = 'hookdet';
-
-	// /**
-	//  * @var string    Field with ID of parent key if this field has a parent
-	//  */
-	//public $fk_element = 'fk_hook';
-
-	// /**
-	//  * @var string    Name of subtable class that manage subtable lines
-	//  */
-	//public $class_element_line = 'MyObjectline';
-
-	// /**
-	//  * @var array  Array of child tables (child tables to delete before deleting a record)
-	//  */
-	//protected $childtables=array('hookdet');
-
-	// /**
-	//  * @var MyObjectLine[]     Array of subtable lines
-	//  */
-	//public $lines = array();
-
-
-
+	
 	/**
 	 * Constructor
 	 *

From 2acae7fc25811d3aa310349586d2aa6f1e11bc81 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 7 Dec 2020 21:29:09 +0000
Subject: [PATCH 260/888] Fixing style errors.

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

diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index ad351d98509..b71c5aec1d7 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -251,7 +251,7 @@ class Hook extends CommonObject
 	 */
 	public $import_key;
 
-	
+
 	/**
 	 * Constructor
 	 *

From ffa866585a19b064adf9905f4dccf57142f2ec60 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 22:29:17 +0100
Subject: [PATCH 261/888] Update emailsenderprofile.class.php

---
 .../core/class/emailsenderprofile.class.php   | 27 -------------------
 1 file changed, 27 deletions(-)

diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index 77d11f4840d..0d9ddd72e24 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -125,7 +125,6 @@ class EmailSenderProfile extends CommonObject
 	 */
 	public $date_creation;
 
-
 	public $tms;
 	public $private;
 	public $signature;
@@ -134,32 +133,6 @@ class EmailSenderProfile extends CommonObject
 	// END MODULEBUILDER PROPERTIES
 
 
-
-	// If this object has a subtable with lines
-
-	// /**
-	//  * @var string    Name of subtable line
-	//  */
-	// public $table_element_line = 'emailsenderprofiledet';
-	// /**
-	//  * @var string    Field with ID of parent key if this field has a parent
-	//  */
-	// public $fk_element = 'fk_emailsenderprofile';
-	// /**
-	//  * @var string    Name of subtable class that manage subtable lines
-	//  */
-	// public $class_element_line = 'EmailSenderProfileline';
-	// /**
-	//  * @var array	List of child tables. To test if we can delete object.
-	//  */
-	// protected $childtables=array();
-	// /**
-	//  * @var EmailSenderProfileLine[]     Array of subtable lines
-	//  */
-	// public $lines = array();
-
-
-
 	/**
 	 * Constructor
 	 *

From 80a09f87881cffdaf4ff404fdf2f3afb7f33abd7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 22:29:54 +0100
Subject: [PATCH 262/888] Update recruitmentjobposition.class.php

---
 .../class/recruitmentjobposition.class.php    | 36 +------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index 4d475b17cfe..41c1bb4aba2 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -167,41 +167,7 @@ class RecruitmentJobPosition extends CommonObject
 	public $status;
 	// END MODULEBUILDER PROPERTIES
 
-
-	// If this object has a subtable with lines
-
-	// /**
-	//  * @var string    Name of subtable line
-	//  */
-	// public $table_element_line = 'recruitment_recruitmentjobpositionline';
-
-	// /**
-	//  * @var string    Field with ID of parent key if this field has a parent
-	//  */
-	// public $fk_element = 'fk_recruitmentjobposition';
-
-	// /**
-	//  * @var string    Name of subtable class that manage subtable lines
-	//  */
-	// public $class_element_line = 'RecruitmentJobPositionline';
-
-	// /**
-	//  * @var array	List of child tables. To test if we can delete object.
-	//  */
-	// protected $childtables=array();
-
-	// /**
-	//  * @var array	List of child tables. To know object to delete on cascade.
-	//  */
-	// protected $childtablesoncascade=array('recruitment_recruitmentjobpositiondet');
-
-	// /**
-	//  * @var RecruitmentJobPositionLine[]     Array of subtable lines
-	//  */
-	// public $lines = array();
-
-
-
+	
 	/**
 	 * Constructor
 	 *

From 390eda871a08de34f6b0849b1b0221ebfdf95d8c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Dec 2020 22:30:24 +0100
Subject: [PATCH 263/888] Update societeaccount.class.php

---
 htdocs/societe/class/societeaccount.class.php | 27 -------------------
 1 file changed, 27 deletions(-)

diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index 435be20b9f1..a315044683b 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -161,33 +161,6 @@ class SocieteAccount extends CommonObject
 	// END MODULEBUILDER PROPERTIES
 
 
-
-
-	// If this object has a subtable with lines
-
-	// /**
-	//  * @var string    Name of subtable line
-	//  */
-	//public $table_element_line = 'societe_accountdet';
-	// /**
-	//  * @var string    Field with ID of parent key if this field has a parent
-	//  */
-	//public $fk_element = 'fk_societe_account';
-	// /**
-	//  * @var string    Name of subtable class that manage subtable lines
-	//  */
-	//public $class_element_line = 'societeAccountline';
-	// /**
-	//  * @var array	List of child tables. To test if we can delete object.
-	//  */
-	//protected $childtables=array();
-	// /**
-	//  * @var societeAccountLine[]     Array of subtable lines
-	//  */
-	//public $lines = array();
-
-
-
 	/**
 	 * Constructor
 	 *

From 44c5e408fa49d2f384c6ac4be3b9f9baf37c466c Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 7 Dec 2020 21:30:51 +0000
Subject: [PATCH 264/888] Fixing style errors.

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

diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index 41c1bb4aba2..2421f87ce50 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -167,7 +167,7 @@ class RecruitmentJobPosition extends CommonObject
 	public $status;
 	// END MODULEBUILDER PROPERTIES
 
-	
+
 	/**
 	 * Constructor
 	 *

From 7c77a0d84b1a5128037b6f31bd155b8be9fb3d67 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 7 Dec 2020 23:53:09 +0100
Subject: [PATCH 265/888] FIX : Export FEC - Remove line at zero

---
 .../class/accountancyexport.class.php         | 85 ++++++++++---------
 1 file changed, 45 insertions(+), 40 deletions(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 11486bf76c9..a7183c70114 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -688,65 +688,70 @@ class AccountancyExport
 		print $end_line;
 
 		foreach ($objectLines as $line) {
-			$date_creation = dol_print_date($line->date_creation, '%Y%m%d');
-			$date_document = dol_print_date($line->doc_date, '%Y%m%d');
-			$date_validation = dol_print_date($line->date_validated, '%Y%m%d');
+			if ($line->debit == 0 && $line->credit == 0) {
+                unset($array[$line]);
+            } else {
+				$date_creation = dol_print_date($line->date_creation, '%Y%m%d');
+				$date_document = dol_print_date($line->doc_date, '%Y%m%d');
+				$date_lettering = dol_print_date($line->date_lettering, '%Y%m%d');
+				$date_validation = dol_print_date($line->date_validated, '%Y%m%d');
 
-			// FEC:JournalCode
-			print $line->code_journal . $separator;
+				// FEC:JournalCode
+				print $line->code_journal . $separator;
 
-			// FEC:JournalLib
-			print $line->journal_label . $separator;
+				// FEC:JournalLib
+				print $line->journal_label . $separator;
 
-			// FEC:EcritureNum
-			print $line->piece_num . $separator;
+				// FEC:EcritureNum
+				print $line->piece_num . $separator;
 
-			// FEC:EcritureDate
-			print $date_document . $separator;
+				// FEC:EcritureDate
+				print $date_document . $separator;
 
-			// FEC:CompteNum
-			print $line->numero_compte . $separator;
+				// FEC:CompteNum
+				print $line->numero_compte . $separator;
 
-			// FEC:CompteLib
-			print dol_string_unaccent($line->label_compte) . $separator;
+				// FEC:CompteLib
+				print dol_string_unaccent($line->label_compte) . $separator;
 
-			// FEC:CompAuxNum
-			print $line->subledger_account . $separator;
+				// FEC:CompAuxNum
+				print $line->subledger_account . $separator;
 
-			// FEC:CompAuxLib
-			print dol_string_unaccent($line->subledger_label) . $separator;
+				// FEC:CompAuxLib
+				print dol_string_unaccent($line->subledger_label) . $separator;
 
-			// FEC:PieceRef
-			print $line->doc_ref . $separator;
+				// FEC:PieceRef
+				print $line->doc_ref . $separator;
 
-			// FEC:PieceDate
-			print dol_string_unaccent($date_creation) . $separator;
+				// FEC:PieceDate
+				print $date_creation . $separator;
 
-			// FEC:EcritureLib
-			print $line->label_operation . $separator;
+				// FEC:EcritureLib
+				print dol_string_unaccent($line->label_operation) . $separator;
 
-			// FEC:Debit
-			print price2fec($line->debit) . $separator;
+				// FEC:Debit
+				print price2fec($line->debit) . $separator;
 
-			// FEC:Credit
-			print price2fec($line->credit) . $separator;
+				// FEC:Credit
+				print price2fec($line->credit) . $separator;
 
-			// FEC:EcritureLet
-			print $line->lettering_code . $separator;
+				// FEC:EcritureLet
+				print $line->lettering_code . $separator;
 
-			// FEC:DateLet
-			print $line->date_lettering . $separator;
+				// FEC:DateLet
+				print $date_lettering . $separator;
 
-			// FEC:ValidDate
-			print $date_validation . $separator;
+				// FEC:ValidDate
+				print $date_validation . $separator;
 
-			// FEC:Montantdevise
-			print $line->multicurrency_amount . $separator;
+				// FEC:Montantdevise
+				print $line->multicurrency_amount . $separator;
 
-			// FEC:Idevise
-			print $line->multicurrency_code;
+				// FEC:Idevise
+				print $line->multicurrency_code;
 
-			print $end_line;
+				print $end_line;
+			}
 		}
 	}
 

From 08ccc11f9ed84fedc94982726b3d9add29fe1bb6 Mon Sep 17 00:00:00 2001
From: Stephane Lesage <stephane.lesage@ateis.com>
Date: Tue, 8 Dec 2020 00:50:27 +0100
Subject: [PATCH 266/888] Export warehouses

---
 htdocs/core/modules/modStock.class.php | 29 ++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index f4a1e374a2f..507c4042acd 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -188,6 +188,35 @@ class modStock extends DolibarrModules
 		//--------
 		$r = 0;
 
+		// Export warehouses
+		$r++;
+		$this->export_code[$r] = $this->rights_class.'_warehouses';
+		$this->export_label[$r] = "Warehouses"; // Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_icon[$r] = "warehouse";
+		$this->export_permission[$r] = array(array("stock", "lire"));
+		$this->export_fields_array[$r] = array(
+			'e.rowid'=>'IdWarehouse', 'e.ref'=>'LocationSummary', 'e.description'=>'DescWareHouse', 'e.lieu'=>'LieuWareHouse', 'e.address'=>'Address', 'e.zip'=>'Zip', 'e.town'=>'Town',
+			'd.code_departement'=>'Departement', 'c.code'=>'CountryCode',
+			'e.phone'=>'Phone', 'e.fax'=>'Fax', 'e.statut'=>'Status', 'pe.rowid'=>'ParentWarehouse', 'pe.ref'=>'LocationSummary'
+		);
+		$this->export_TypeFields_array[$r] = array(
+			'e.ref'=>'Text', 'e.description'=>'Text', 'e.lieu'=>'Text', 'e.address'=>'Text', 'e.zip'=>'Text', 'e.town'=>'Text',
+			'd.code_departement'=>'List:c_departements:code_departement:code_departement:', 'c.code'=>'List:c_country:code:code:',
+			'e.phone'=>'Text', 'e.fax'=>'Text', 'e.statut'=>'Text', 'pe.rowid'=>'List:entrepot:ref:rowid:stock', 'pe.ref'=>'Text'
+		);
+		$this->export_entities_array[$r] = array();	// We define here only fields that use another icon that the one defined into export_icon
+		$this->export_aggregate_array[$r] = array();
+		$keyforselect = 'warehouse'; $keyforelement = 'warehouse'; $keyforaliasextra = 'extra';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'entrepot as e';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON d.rowid = e.fk_departement';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON c.rowid = e.fk_pays';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot as pe ON pe.rowid = e.fk_parent';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot_extrafields as extra ON extra.fk_object = e.rowid';
+		$this->export_sql_end[$r] .= ' WHERE e.entity IN ('.getEntity('stock').')';
+
 		$r++;
 		$this->export_code[$r] = $this->rights_class;
 		$this->export_label[$r] = "WarehousesAndProducts"; // Translation key (used only if key ExportDataset_xxx_z not found)

From fc34c9766694b3a4fddfbe33da5ebaae5c1cd443 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 8 Dec 2020 08:49:06 +0100
Subject: [PATCH 267/888] FIX add autocopy to if not already exists in $to

---
 htdocs/core/class/CMailFile.class.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index faf0a294dfe..345dbba14e3 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -146,8 +146,10 @@ class CMailFile
 			}
 		}
 
-		// Add autocopy to (Note: Adding bcc for specific modules are also done from pages)
-		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) $addr_bcc .= ($addr_bcc ? ', ' : '').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
+		// Add autocopy to if not already in $to (Note: Adding bcc for specific modules are also done from pages)
+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO) && !preg_match('/'.preg_quote($conf->global->MAIN_MAIL_AUTOCOPY_TO, '/').'/i', $to)) {
+		    $addr_bcc .= ($addr_bcc ? ', ' : '').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
+		}
 
 		$this->subject = $subject;
 		$this->addr_to = $to;
@@ -275,6 +277,11 @@ class CMailFile
 			}
 		}
 
+		// Add autocopy to if not already in $to (Note: Adding bcc for specific modules are also done from pages)
+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO) && !preg_match('/'.preg_quote($conf->global->MAIN_MAIL_AUTOCOPY_TO, '/').'/i', $to)) {
+		    $addr_bcc .= ($addr_bcc ? ', ' : '').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
+		}
+
 		$this->addr_to = $to;
 		$this->addr_cc = $addr_cc;
 		$this->addr_bcc = $addr_bcc;
@@ -292,11 +299,6 @@ class CMailFile
 			$this->addr_bcc = '';
 		}
 
-		// Add autocopy to (Note: Adding bcc for specific modules are also done from pages)
-		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) {
-			$addr_bcc .= ($addr_bcc ? ', ' : '').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
-		}
-
 		$keyforsslseflsigned = 'MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED';
 		if (!empty($this->sendcontext)) {
 			$smtpContextKey = strtoupper($this->sendcontext);

From 617c9f7ea93a30714c70238958a63cb1933c6592 Mon Sep 17 00:00:00 2001
From: Florian Mortgat <florian.mortgat@atm-consulting.fr>
Date: Tue, 8 Dec 2020 09:30:31 +0100
Subject: [PATCH 268/888] FIX: enable HTML in product labels depending on conf
 MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML

---
 htdocs/product/card.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 8659e5bcc23..d6f62b34769 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -86,6 +86,9 @@ $accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
 $accountancy_code_buy_intra = GETPOST('accountancy_code_buy_intra', 'alpha');
 $accountancy_code_buy_export = GETPOST('accountancy_code_buy_export', 'alpha');
 
+// by default 'alphanohtml' (better security); hidden conf MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML allows basic html
+$label_security_check = empty($conf->global->MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML) ? 'alphanohtml' : 'restricthtml';
+
 if (!empty($user->socid)) $socid = $user->socid;
 
 $object = new Product($db);
@@ -201,7 +204,7 @@ if (empty($reshook))
     {
         $error = 0;
 
-        if (!GETPOST('label', 'restricthtml'))
+        if (!GETPOST('label', $label_security_check))
         {
             setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Label')), null, 'errors');
             $action = "create";
@@ -225,7 +228,7 @@ if (empty($reshook))
 	        $units = GETPOST('units', 'int');
 
             $object->ref                   = $ref;
-            $object->label                 = GETPOST('label', 'restricthtml');
+            $object->label                 = GETPOST('label', $label_security_check);
             $object->price_base_type       = GETPOST('price_base_type', 'aZ09');
 
             if ($object->price_base_type == 'TTC')
@@ -406,7 +409,7 @@ if (empty($reshook))
 				$object->oldcopy = clone $object;
 
                 $object->ref                    = $ref;
-                $object->label                  = GETPOST('label', 'restricthtml');
+                $object->label                  = GETPOST('label', $label_security_check);
                 $object->description            = dol_htmlcleanlastbr(GETPOST('desc', 'none'));
             	$object->url = GETPOST('url');
     			if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB))
@@ -1005,7 +1008,7 @@ else
         print '</td></tr>';
 
         // Label
-        print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="label" class="minwidth300 maxwidth400onsmartphone" maxlength="255" value="'.dol_escape_htmltag(GETPOST('label', 'restricthtml')).'"></td></tr>';
+        print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="label" class="minwidth300 maxwidth400onsmartphone" maxlength="255" value="'.dol_escape_htmltag(GETPOST('label', $label_security_check)).'"></td></tr>';
 
         // On sell
         print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="3">';

From 930062428c55fbb2d7f8711edfe63f8e3e0d5656 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 8 Dec 2020 09:44:53 +0100
Subject: [PATCH 269/888] Update README.md

text to reference to guideline contributes
---
 README.md | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 29f7da1792b..ad4971f50db 100644
--- a/README.md
+++ b/README.md
@@ -71,6 +71,7 @@ On GNU/Linux, first check if your distribution has already packaged Dolibarr.
 
 - Follow the installer instructions
 
+
 ### Saas/Cloud setup
 
 If you don't have time to install it yourself, you can try some commercial 'ready to use' Cloud offers (See https://saas.dolibarr.org). However, this third solution is not free.
@@ -86,6 +87,7 @@ Dolibarr supports upgrading usually wihtout the need for any (commercial) suppor
 - At first next access, Dolibarr will redirect you to the "install/" page to follow the upgrade process.
   If an `install.lock` file exists to lock any other upgrade process, the application will ask you to remove the file manually (you should find the `install.lock` file in the directory used to store generated and uploaded documents, in most cases, it is the directory called "*documents*").
 
+
 ## WHAT'S NEW
 
 See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) file.
@@ -164,15 +166,18 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Flexible PDF & ODT generation for invoices, proposals, orders...
 - …
 
+
 ### System Environment / Requirements
 
 - Works with PHP 5.6+ and MariaDB 5.0.3+, MySQL 5.0.3+ or PostgreSQL 8.1.4+ (See requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite))
 - Compatible with all Cloud solutions that match PHP & MySQL or PostgreSQL prerequisites.
 
+
 ### Extending
 
 Dolibarr can be extended with a lot of other external application or modules from third party developers available at the [DoliStore](https://www.dolistore.com).
 
+
 ## WHAT DOLIBARR CAN'T DO YET
 
 These are features that Dolibarr does **not** yet fully support:
@@ -182,22 +187,29 @@ These are features that Dolibarr does **not** yet fully support:
 - No native embedded Webmail, but you can send email to contacts in Dolibarr with e.g. offers, invoices, etc.
 - Dolibarr can't do coffee (yet)
 
+
 ## DOCUMENTATION
 
 Administrator, user, developer and translator's documentations are available along with other community resources in the [Wiki](https://wiki.dolibarr.org).
 
+
 ## CONTRIBUTING
 
-This project exists thanks to all the people who contribute. [[Contribute](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)]
+This project exists thanks to all the people who contribute. 
+Please read the instructions how to contribute (report a bug/error, a feature request, send code ...)  [[Contribute](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)]
+
+A view on Contributors:
 
 <a href="https://github.com/Dolibarr/dolibarr/graphs/contributors"><img src="https://opencollective.com/dolibarr/contributors.svg?width=890&button=false" /></a>
 
+
 ## CREDITS
 
 Dolibarr is the work of many contributors over the years and uses some fine PHP libraries.
 
 See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) file.
 
+
 ## NEWS AND SOCIAL NETWORKS
 
 Follow Dolibarr project on:
@@ -208,6 +220,8 @@ Follow Dolibarr project on:
 - [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
 - [GitHub](https://github.com/Dolibarr/dolibarr)
 
+
 ### Sponsors
 
 Support this project by becoming a sponsor. Your logo will show up here. 🙏 [[Become a sponsor/backer](https://opencollective.com/dolibarr#backer)]
+

From 97e23269db3898f591e7786f6dd89667d90d68fb Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 8 Dec 2020 09:56:51 +0100
Subject: [PATCH 270/888] Update CONTRIBUTING.md

---
 .github/CONTRIBUTING.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index f112ea0523b..eb52cc0981f 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -4,13 +4,14 @@ How to contribute to Dolibarr
 Bug reports and feature requests
 --------------------------------
 
-<a name="not-a-support-forum"></a>*Note*: Issues are not a support forum. If you need help using the software, please use [the forums](https://www.dolibarr.org/forum).
+<a name="not-a-support-forum"></a>*Note*: Issues are not a support forum. If you need help using the software, please use [the forums](https://www.dolibarr.org/forum). Forums exist in different languages.
 
-Issues are managed on [GitHub](https://github.com/Dolibarr/dolibarr/issues).
+Issues are managed on [GitHub](https://github.com/Dolibarr/dolibarr/issues). 
+Default language here is english. So please prepare your contributions in english.
 
 1. Please [use the search engine](https://help.github.com/articles/searching-issues) to check if nobody's already reported your problem.
 2. [Create an issue](https://help.github.com/articles/creating-an-issue). Choose an appropriate title. Prepend appropriately with Bug or Feature Request.
-4. Tell us the version you are using!
+4. Tell us the version you are using!   (look at  /htdocs/admin/system/dolibarr.php?  and check if you are using the latest version) 
 3. Write a report with as much detail as possible (Use [screenshots](https://help.github.com/articles/issue-attachments) or even screencasts and provide logging and debugging informations whenever possible).
 
 

From 7031a598bc6093571053e30d766c7d5c5acaf779 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 8 Dec 2020 11:05:09 +0100
Subject: [PATCH 271/888] Link to forum portal page

---
 .github/CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index eb52cc0981f..0bd40a053a2 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -4,7 +4,7 @@ How to contribute to Dolibarr
 Bug reports and feature requests
 --------------------------------
 
-<a name="not-a-support-forum"></a>*Note*: Issues are not a support forum. If you need help using the software, please use [the forums](https://www.dolibarr.org/forum). Forums exist in different languages.
+<a name="not-a-support-forum"></a>*Note*: Issues are not a support forum. If you need help using the software, please use [the forums](https://www.dolibarr.org/forum.php). Forums exist in different languages.
 
 Issues are managed on [GitHub](https://github.com/Dolibarr/dolibarr/issues). 
 Default language here is english. So please prepare your contributions in english.

From 657592695bbc1b3dbcb3f204432540883c2b8648 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 8 Dec 2020 11:18:08 +0100
Subject: [PATCH 272/888] Try to fix internal link

---
 .github/CONTRIBUTING.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 0bd40a053a2..b57ceda24aa 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -27,7 +27,8 @@ Default language here is english. So please prepare your contributions in englis
 4. Commit and push your changes.
 5. [Make a pull request](https://help.github.com/articles/creating-a-pull-request).
 
-### <a name="branches"></a>Branches
+<span id="branches" name="branches"></span>
+### Branches
 
 Unless you're fixing a bug, all pull requests should be made against the *develop* branch.
 

From 8491be25727e83c146b422b8a2af6b3e717d03c2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 8 Dec 2020 11:58:47 +0100
Subject: [PATCH 273/888] Fix look and feel v13

---
 htdocs/core/class/html.formother.class.php |  37 ++--
 htdocs/projet/tasks.php                    | 218 ++++++++++-----------
 2 files changed, 130 insertions(+), 125 deletions(-)

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 3b9d9db2906..2973eda7144 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -620,15 +620,17 @@ class FormOther
 						if ($i > 0) print '<option value="0" disabled>----------</option>';
 						print '<option value="'.$lines[$i]->fk_project.'_0"';
 						if ($selectedproject == $lines[$i]->fk_project) print ' selected';
-						print '>'; // Project -> Task
-						print $langs->trans("Project").' '.$lines[$i]->projectref;
-						if (empty($lines[$i]->public))
-						{
-							print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';
+
+						$labeltoshow = $langs->trans("Project").' '.$lines[$i]->projectref;
+						if (empty($lines[$i]->public)) {
+							$labeltoshow .= ' <span class="opacitymedium">('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')</span>';
 						} else {
-							print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';
+							$labeltoshow .= ' <span class="opacitymedium">('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')</span>';
 						}
-						//print '-'.$parent.'-'.$lines[$i]->fk_project.'-'.$lastprojectid;
+
+						print ' data-html="'.dol_escape_htmltag($labeltoshow).'"';
+						print '>'; // Project -> Task
+						print $labeltoshow;
 						print "</option>\n";
 
 						$lastprojectid = $lines[$i]->fk_project;
@@ -652,21 +654,26 @@ class FormOther
 					print '<option value="'.$lines[$i]->fk_project.'_'.$lines[$i]->id.'"';
 					if (($lines[$i]->id == $selectedtask) || ($lines[$i]->fk_project.'_'.$lines[$i]->id == $selectedtask)) print ' selected';
 					if ($disabled) print ' disabled';
-					print '>';
-					print $langs->trans("Project").' '.$lines[$i]->projectref;
-					print ' '.$lines[$i]->projectlabel;
+
+					$labeltoshow = $langs->trans("Project").' '.$lines[$i]->projectref;
+					$labeltoshow .= ' '.$lines[$i]->projectlabel;
 					if (empty($lines[$i]->public))
 					{
-						print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';
+						$labeltoshow .= ' <span class="opacitymedium">('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')</span>';
 					} else {
-						print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';
+						$labeltoshow .= ' <span class="opacitymedium">('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')</span>';
 					}
-					if ($lines[$i]->id) print ' > ';
+					if ($lines[$i]->id) $labeltoshow .= ' > ';
 					for ($k = 0; $k < $level; $k++)
 					{
-						print "&nbsp;&nbsp;&nbsp;";
+						$labeltoshow .= "&nbsp;&nbsp;&nbsp;";
 					}
-					print $lines[$i]->ref.' '.$lines[$i]->label."</option>\n";
+					$labeltoshow .= $lines[$i]->ref.' '.$lines[$i]->label;
+
+					print ' data-html="'.dol_escape_htmltag($labeltoshow).'"';
+					print '>';
+					print $labeltoshow;
+					print "</option>\n";
 					$inc++;
 				}
 
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 72e8f1cbdb4..b4d486e747c 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -492,121 +492,119 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 
 	print load_fiche_titre($langs->trans("NewTask"), '', 'projecttask');
 
-	if ($object->statut == Project::STATUS_CLOSED) {
+	if ($object->id > 0 && $object->statut == Project::STATUS_CLOSED) {
 		print '<div class="warning">';
 		$langs->load("errors");
 		print $langs->trans("WarningProjectClosed");
 		print '</div>';
-	} else {
-		if ($object->statut == Project::STATUS_DRAFT)
-		{
-			print '<div class="warning">';
-			$langs->load("errors");
-			print $langs->trans("WarningProjectDraft");
-			print '</div>';
-		}
-
-		print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="action" value="createtask">';
-		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-		if (!empty($object->id)) print '<input type="hidden" name="id" value="'.$object->id.'">';
-
-		print dol_get_fiche_head('');
-
-		print '<table class="border centpercent">';
-
-		$defaultref = '';
-		$obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
-		if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php"))
-		{
-			require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
-			$modTask = new $obj;
-			$defaultref = $modTask->getNextValue($object->thirdparty, null);
-		}
-
-		if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
-
-		// Ref
-		print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Ref").'</span></td><td>';
-		if (empty($duplicate_code_error))
-		{
-			print (GETPOSTISSET("ref") ?GETPOST("ref", 'alpha') : $defaultref);
-		} else {
-			print $defaultref;
-		}
-		print '<input type="hidden" name="taskref" value="'.($_POST["ref"] ? $_POST["ref"] : $defaultref).'">';
-		print '</td></tr>';
-
-		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>';
-		print '<input type="text" name="label" autofocus class="minwidth500 maxwidthonsmartphone" value="'.$label.'">';
-		print '</td></tr>';
-
-		// List of projects
-		print '<tr><td class="fieldrequired">'.$langs->trans("ChildOfProjectTask").'</td><td>';
-		print $formother->selectProjectTasks(GETPOST('task_parent'), $projectid ? $projectid : $object->id, 'task_parent', 0, 0, 1, 1, 0, '0,1', 'maxwidth500');
-		print '</td></tr>';
-
-		print '<tr><td>'.$langs->trans("AffectedTo").'</td><td>';
-		$contactsofproject = (!empty($object->id) ? $object->getListContactId('internal') : '');
-		if (is_array($contactsofproject) && count($contactsofproject))
-		{
-			print $form->select_dolusers($user->id, 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, '', 'maxwidth300');
-		} else {
-			print $langs->trans("NoUserAssignedToTheProject");
-		}
-		print '</td></tr>';
-
-		// Date start
-		print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
-		print $form->selectDate(($date_start ? $date_start : ''), 'dateo', 1, 1, 0, '', 1, 1);
-		print '</td></tr>';
-
-		// Date end
-		print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
-		print $form->selectDate(($date_end ? $date_end : -1), 'datee', -1, 1, 0, '', 1, 1);
-		print '</td></tr>';
-
-		// Planned workload
-		print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td>';
-		print $form->select_duration('planned_workload', $planned_workload ? $planned_workload : 0, 0, 'text');
-		print '</td></tr>';
-
-		// Progress
-		print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td colspan="3">';
-		print $formother->select_percent($progress, 'progress', 0, 5, 0, 100, 1);
-		print '</td></tr>';
-
-		// Description
-		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
-		print '<td>';
-		print '<textarea name="description" class="quatrevingtpercent" rows="'.ROWS_4.'">'.$description.'</textarea>';
-		print '</td></tr>';
-
-		// Other options
-		$parameters = array();
-		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $taskstatic, $action); // Note that $action and $object may have been modified by hook
-		print $hookmanager->resPrint;
-
-		if (empty($reshook) && !empty($extrafields->attributes[$taskstatic->table_element]['label']))
-		{
-			print $taskstatic->showOptionals($extrafields, 'edit'); // Do not use $object here that is object of project but use $taskstatic
-		}
-
-		print '</table>';
-
-		print dol_get_fiche_end();
-
-		print '<div class="center">';
-		print '<input type="submit" class="button" name="add" value="'.$langs->trans("Add").'">';
-		print ' &nbsp; &nbsp; ';
-		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-		print '</div>';
-
-		print '</form>';
 	}
-} elseif ($id > 0 || !empty($ref))
-{
+
+	if ($object->id > 0 && $object->statut == Project::STATUS_DRAFT) {
+		print '<div class="warning">';
+		$langs->load("errors");
+		print $langs->trans("WarningProjectDraft");
+		print '</div>';
+	}
+
+	print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="createtask">';
+	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	if (!empty($object->id)) print '<input type="hidden" name="id" value="'.$object->id.'">';
+
+	print dol_get_fiche_head('');
+
+	print '<table class="border centpercent">';
+
+	$defaultref = '';
+	$obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
+	if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php"))
+	{
+		require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
+		$modTask = new $obj;
+		$defaultref = $modTask->getNextValue($object->thirdparty, null);
+	}
+
+	if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
+
+	// Ref
+	print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Ref").'</span></td><td>';
+	if (empty($duplicate_code_error))
+	{
+		print (GETPOSTISSET("ref") ?GETPOST("ref", 'alpha') : $defaultref);
+	} else {
+		print $defaultref;
+	}
+	print '<input type="hidden" name="taskref" value="'.($_POST["ref"] ? $_POST["ref"] : $defaultref).'">';
+	print '</td></tr>';
+
+	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>';
+	print '<input type="text" name="label" autofocus class="minwidth500 maxwidthonsmartphone" value="'.$label.'">';
+	print '</td></tr>';
+
+	// List of projects
+	print '<tr><td class="fieldrequired">'.$langs->trans("ChildOfProjectTask").'</td><td>';
+	print $formother->selectProjectTasks(GETPOST('task_parent'), $projectid ? $projectid : $object->id, 'task_parent', 0, 0, 1, 1, 0, '0,1', 'maxwidth500');
+	print '</td></tr>';
+
+	print '<tr><td>'.$langs->trans("AffectedTo").'</td><td>';
+	$contactsofproject = (!empty($object->id) ? $object->getListContactId('internal') : '');
+	if (is_array($contactsofproject) && count($contactsofproject))
+	{
+		print $form->select_dolusers($user->id, 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, '', 'maxwidth300');
+	} else {
+		print $langs->trans("NoUserAssignedToTheProject");
+	}
+	print '</td></tr>';
+
+	// Date start
+	print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
+	print $form->selectDate(($date_start ? $date_start : ''), 'dateo', 1, 1, 0, '', 1, 1);
+	print '</td></tr>';
+
+	// Date end
+	print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
+	print $form->selectDate(($date_end ? $date_end : -1), 'datee', -1, 1, 0, '', 1, 1);
+	print '</td></tr>';
+
+	// Planned workload
+	print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td>';
+	print $form->select_duration('planned_workload', $planned_workload ? $planned_workload : 0, 0, 'text');
+	print '</td></tr>';
+
+	// Progress
+	print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td colspan="3">';
+	print $formother->select_percent($progress, 'progress', 0, 5, 0, 100, 1);
+	print '</td></tr>';
+
+	// Description
+	print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
+	print '<td>';
+	print '<textarea name="description" class="quatrevingtpercent" rows="'.ROWS_4.'">'.$description.'</textarea>';
+	print '</td></tr>';
+
+	// Other options
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $taskstatic, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
+	if (empty($reshook) && !empty($extrafields->attributes[$taskstatic->table_element]['label']))
+	{
+		print $taskstatic->showOptionals($extrafields, 'edit'); // Do not use $object here that is object of project but use $taskstatic
+	}
+
+	print '</table>';
+
+	print dol_get_fiche_end();
+
+	print '<div class="center">';
+	print '<input type="submit" class="button" name="add" value="'.$langs->trans("Add").'">';
+	print ' &nbsp; &nbsp; ';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
+
+	print '</form>';
+} elseif ($id > 0 || !empty($ref)) {
 	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
 	/*

From b3dd456a37eb133b86ca0bc009b7c36b06881e00 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 8 Dec 2020 12:53:13 +0100
Subject: [PATCH 274/888] fix survey module

---
 htdocs/opensurvey/wizard/create_survey.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php
index 73413f3255d..51ae2f1aa3e 100644
--- a/htdocs/opensurvey/wizard/create_survey.php
+++ b/htdocs/opensurvey/wizard/create_survey.php
@@ -39,7 +39,7 @@ $title = GETPOST('title');
 $description = GETPOST('description', 'restricthtml');
 $mailsonde = GETPOST('mailsonde');
 $creation_sondage_date = GETPOST('creation_sondage_date');
-$creation_sondage_date = GETPOST('creation_sondage_date');
+$creation_sondage_autre = GETPOST('creation_sondage_autre');
 
 // We init some session variable to avoir warning
 $session_var = array('title', 'description', 'mailsonde');
@@ -53,7 +53,7 @@ $cocheplus = '';
 $cochemail = '';
 
 // Jump to correct page
-if (GETPOST("creation_sondage_date") || GETPOST("creation_sondage_autre"))
+if (!empty($creation_sondage_date) || !empty($creation_sondage_autre))
 {
 	$_SESSION["title"] = $title;
 	$_SESSION["description"] = $description;
@@ -98,7 +98,7 @@ if (GETPOST("creation_sondage_date") || GETPOST("creation_sondage_autre"))
 	if (!$testdate) {
 		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("ExpireDate")), null, 'errors');
 	}
-
+var_dump($creation_sondage_date,$creation_sondage_autre);
 	if ($title && $testdate)
 	{
 		if (!empty($creation_sondage_date))
@@ -163,7 +163,7 @@ print dol_get_fiche_end();
 
 //focus javascript sur le premier champ
 print '<script type="text/javascript">'."\n";
-print 'document.formulaire.titre.focus();'."\n";
+print 'document.formulaire.title.focus();'."\n";
 print '</script>'."\n";
 
 print '<br>'."\n";

From eed7f57f98cb718b03db2ff92632f5d603795e88 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 8 Dec 2020 12:54:14 +0100
Subject: [PATCH 275/888] fix survey module

---
 htdocs/opensurvey/wizard/create_survey.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php
index 51ae2f1aa3e..cbeb448d2d7 100644
--- a/htdocs/opensurvey/wizard/create_survey.php
+++ b/htdocs/opensurvey/wizard/create_survey.php
@@ -98,7 +98,7 @@ if (!empty($creation_sondage_date) || !empty($creation_sondage_autre))
 	if (!$testdate) {
 		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("ExpireDate")), null, 'errors');
 	}
-var_dump($creation_sondage_date,$creation_sondage_autre);
+
 	if ($title && $testdate)
 	{
 		if (!empty($creation_sondage_date))

From 3161f3597110a383037fc3a4e0ab9f99d7531b5d Mon Sep 17 00:00:00 2001
From: Stephane Lesage <stephane.lesage@ateis.com>
Date: Tue, 8 Dec 2020 09:55:07 +0100
Subject: [PATCH 276/888] Fix boxes third-parties information

---
 htdocs/core/boxes/box_actions.php             | 14 +++++--
 htdocs/core/boxes/box_clients.php             | 23 ++++-------
 htdocs/core/boxes/box_commandes.php           | 15 ++++---
 htdocs/core/boxes/box_contacts.php            | 22 ++++++----
 ...box_customers_outstanding_bill_reached.php | 20 +++------
 htdocs/core/boxes/box_factures.php            | 12 +++++-
 htdocs/core/boxes/box_factures_fourn.php      | 41 ++++++++++---------
 htdocs/core/boxes/box_factures_fourn_imp.php  | 36 +++++++++-------
 htdocs/core/boxes/box_factures_imp.php        | 35 ++++++++++------
 htdocs/core/boxes/box_ficheinter.php          | 28 ++++++++-----
 htdocs/core/boxes/box_fournisseurs.php        | 30 +++++++-------
 htdocs/core/boxes/box_propales.php            | 11 ++++-
 htdocs/core/boxes/box_prospect.php            | 20 ++++-----
 htdocs/core/boxes/box_shipments.php           | 13 +++---
 htdocs/core/boxes/box_supplier_orders.php     | 35 ++++++++--------
 ...box_supplier_orders_awaiting_reception.php | 35 ++++++++--------
 16 files changed, 225 insertions(+), 165 deletions(-)

diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index 0f3b65b651d..a86ee5a609a 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -88,9 +88,9 @@ class box_actions extends ModeleBoxes
 			$sql = "SELECT a.id, a.label, a.datep as dp, a.percent as percentage";
 			$sql .= ", ta.code";
 			$sql .= ", ta.libelle as type_label";
-			$sql .= ", s.nom as name";
-			$sql .= ", s.rowid as socid";
-			$sql .= ", s.code_client";
+			$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_client, s.code_compta, s.client";
+			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm AS ta, ".MAIN_DB_PREFIX."actioncomm AS a";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
@@ -116,13 +116,21 @@ class box_actions extends ModeleBoxes
 					$late = '';
 					$objp = $this->db->fetch_object($result);
 					$datelimite = $this->db->jdate($objp->dp);
+
 					$actionstatic->id = $objp->id;
 					$actionstatic->label = $objp->label;
 					$actionstatic->type_label = $objp->type_label;
 					$actionstatic->code = $objp->code;
+
 					$societestatic->id = $objp->socid;
 					$societestatic->name = $objp->name;
+					//$societestatic->name_alias = $objp->name_alias;
 					$societestatic->code_client = $objp->code_client;
+					$societestatic->code_compta = $objp->code_compta;
+					$societestatic->client = $objp->client;
+					$societestatic->logo = $objp->logo;
+					$societestatic->email = $objp->email;
+					$societestatic->entity = $objp->entity;
 
 					if ($objp->percentage >= 0 && $objp->percentage < 100 && $datelimite < ($now - $delay_warning))
 						$late = img_warning($langs->trans("Late"));
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index 816facc3ee4..11e8b6a8f29 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -80,28 +80,22 @@ class box_clients extends ModeleBoxes
 		$this->max = $max;
 
 		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-		$thirdpartystatic = new Societe($this->db);
+		$thirdpartystatic = new Client($this->db);
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedCustomers", $max));
 
 		if ($user->rights->societe->lire)
 		{
-			$sql = "SELECT s.nom as name, s.rowid as socid";
-			$sql .= ", s.code_client";
-			$sql .= ", s.client";
-			$sql .= ", s.code_fournisseur";
-			$sql .= ", s.fournisseur";
-			$sql .= ", s.code_compta";
-			$sql .= ", s.code_compta_fournisseur";
-			$sql .= ", s.logo";
-			$sql .= ", s.email";
-			$sql .= ", s.datec, s.tms, s.status, s.entity";
+			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_client, s.code_compta, s.client";
+			$sql .= ", s.logo, s.email, s.entity";
+			$sql .= ", s.datec, s.tms, s.status";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			$sql .= " WHERE s.client IN (1, 3)";
 			$sql .= " AND s.entity IN (".getEntity('societe').")";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-			if ($user->socid) $sql .= " AND s.rowid = $user->socid";
+			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
 			$sql .= " ORDER BY s.tms DESC";
 			$sql .= $this->db->plimit($max, 0);
 
@@ -117,14 +111,13 @@ class box_clients extends ModeleBoxes
 					$objp = $this->db->fetch_object($result);
 					$datec = $this->db->jdate($objp->datec);
 					$datem = $this->db->jdate($objp->tms);
+
 					$thirdpartystatic->id = $objp->socid;
 					$thirdpartystatic->name = $objp->name;
+					$thirdpartystatic->name_alias = $objp->name_alias;
 					$thirdpartystatic->code_client = $objp->code_client;
-					$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
 					$thirdpartystatic->code_compta = $objp->code_compta;
-					$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
 					$thirdpartystatic->client = $objp->client;
-					$thirdpartystatic->fournisseur = $objp->fournisseur;
 					$thirdpartystatic->logo = $objp->logo;
 					$thirdpartystatic->email = $objp->email;
 					$thirdpartystatic->entity = $objp->entity;
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index c94353f1d5c..3f7875ce7d4 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -87,10 +87,9 @@ class box_commandes extends ModeleBoxes
 
 		if ($user->rights->commande->lire)
 		{
-			$sql = "SELECT s.nom as name";
-			$sql .= ", s.rowid as socid";
-			$sql .= ", s.code_client";
-			$sql .= ", s.logo, s.email";
+			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_client, s.code_compta, s.client";
+			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= ", c.ref, c.tms";
 			$sql .= ", c.rowid";
 			$sql .= ", c.date_commande";
@@ -123,17 +122,23 @@ class box_commandes extends ModeleBoxes
 					$objp = $this->db->fetch_object($result);
 					$date = $this->db->jdate($objp->date_commande);
 					$datem = $this->db->jdate($objp->tms);
+
 					$commandestatic->id = $objp->rowid;
 					$commandestatic->ref = $objp->ref;
 					$commandestatic->ref_client = $objp->ref_client;
 					$commandestatic->total_ht = $objp->total_ht;
 					$commandestatic->total_tva = $objp->total_tva;
 					$commandestatic->total_ttc = $objp->total_ttc;
+
 					$societestatic->id = $objp->socid;
 					$societestatic->name = $objp->name;
-					$societestatic->email = $objp->email;
+					//$societestatic->name_alias = $objp->name_alias;
 					$societestatic->code_client = $objp->code_client;
+					$societestatic->code_compta = $objp->code_compta;
+					$societestatic->client = $objp->client;
 					$societestatic->logo = $objp->logo;
+					$societestatic->email = $objp->email;
+					$societestatic->entity = $objp->entity;
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="nowraponall"',
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index c3756bfd86c..bbba04893d7 100644
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -86,8 +86,10 @@ class box_contacts extends ModeleBoxes
 			$sql = "SELECT sp.rowid as id, sp.lastname, sp.firstname, sp.civility as civility_id, sp.datec, sp.tms, sp.fk_soc, sp.statut as status";
 
 			$sql .= ", sp.address, sp.zip, sp.town, sp.phone, sp.phone_perso, sp.phone_mobile, sp.email as spemail";
-			$sql .= ", s.nom as socname, s.name_alias, s.email as semail";
-			$sql .= ", s.client, s.fournisseur, s.code_client, s.code_fournisseur";
+			$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_client, s.code_compta, s.client";
+			$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= ", co.label as country, co.code as country_code";
 			$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON sp.fk_pays = co.rowid";
@@ -128,14 +130,18 @@ class box_contacts extends ModeleBoxes
 					$contactstatic->country = $objp->country;
 					$contactstatic->country_code = $objp->country_code;
 
-					$societestatic->id = $objp->fk_soc;
-					$societestatic->name = $objp->socname;
-					$societestatic->email = $objp->semail;
-					$societestatic->name_alias = $objp->name_alias;
+					$societestatic->id = $objp->socid;
+					$societestatic->name = $objp->name;
+					//$societestatic->name_alias = $objp->name_alias;
 					$societestatic->code_client = $objp->code_client;
-					$societestatic->code_fournisseur = $objp->code_fournisseur;
+					$societestatic->code_compta = $objp->code_compta;
 					$societestatic->client = $objp->client;
+					$societestatic->code_fournisseur = $objp->code_fournisseur;
+					$societestatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
 					$societestatic->fournisseur = $objp->fournisseur;
+					$societestatic->logo = $objp->logo;
+					$societestatic->email = $objp->email;
+					$societestatic->entity = $objp->entity;
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
@@ -145,7 +151,7 @@ class box_contacts extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-						'text' => ($objp->fk_soc > 0 ? $societestatic->getNomUrl(1) : ''),
+						'text' => ($societestatic->id > 0 ? $societestatic->getNomUrl(1) : ''),
 						'asis' => 1,
 					);
 
diff --git a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
index f4f4d5015cc..371dab454cf 100644
--- a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
+++ b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
@@ -86,17 +86,11 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
 
 		if ($user->rights->societe->lire)
 		{
-			$sql = "SELECT s.nom as name, s.rowid as socid";
-			$sql .= ", s.code_client";
-			$sql .= ", s.client";
-			$sql .= ", s.code_fournisseur";
-			$sql .= ", s.fournisseur";
-			$sql .= ", s.code_compta";
-			$sql .= ", s.code_compta_fournisseur";
-			$sql .= ", s.logo";
-			$sql .= ", s.email";
+			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_client, s.code_compta, s.client";
+			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= ", s.outstanding_limit";
-			$sql .= ", s.datec, s.tms, s.status, s.entity";
+			$sql .= ", s.datec, s.tms, s.status";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			$sql .= " WHERE s.client IN (1, 3)";
@@ -120,17 +114,15 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
 				while ($line < $num)
 				{
 					$objp = $this->db->fetch_object($result);
-
 					$datec = $this->db->jdate($objp->datec);
 					$datem = $this->db->jdate($objp->tms);
+
 					$thirdpartystatic->id = $objp->socid;
 					$thirdpartystatic->name = $objp->name;
+					//$thirdpartystatic->name_alias = $objp->name_alias;
 					$thirdpartystatic->code_client = $objp->code_client;
-					$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
 					$thirdpartystatic->code_compta = $objp->code_compta;
-					$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
 					$thirdpartystatic->client = $objp->client;
-					$thirdpartystatic->fournisseur = $objp->fournisseur;
 					$thirdpartystatic->logo = $objp->logo;
 					$thirdpartystatic->email = $objp->email;
 					$thirdpartystatic->entity = $objp->entity;
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index 6a824849212..011342d8a30 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -94,8 +94,11 @@ class box_factures extends ModeleBoxes
 			$sql .= ", f.total_ttc";
 			$sql .= ", f.datef as df";
 			$sql .= ", f.paye, f.fk_statut, f.datec, f.tms";
-			$sql .= ", s.rowid as socid, s.nom as name, s.code_client, s.email, s.tva_intra, s.code_compta, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6";
 			$sql .= ", f.date_lim_reglement as datelimite";
+			$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_client, s.code_compta, s.client";
+			$sql .= ", s.logo, s.email, s.entity";
+			$sql .= ", s.tva_intra, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6";
 			$sql .= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			$sql .= ")";
@@ -133,9 +136,14 @@ class box_factures extends ModeleBoxes
 
 					$societestatic->id = $objp->socid;
 					$societestatic->name = $objp->name;
+					//$societestatic->name_alias = $objp->name_alias;
 					$societestatic->code_client = $objp->code_client;
-					$societestatic->tva_intra = $objp->tva_intra;
+					$societestatic->code_compta = $objp->code_compta;
+					$societestatic->client = $objp->client;
+					$societestatic->logo = $objp->logo;
 					$societestatic->email = $objp->email;
+					$societestatic->entity = $objp->entity;
+					$societestatic->tva_intra = $objp->tva_intra;
 					$societestatic->idprof1 = $objp->idprof1;
 					$societestatic->idprof2 = $objp->idprof2;
 					$societestatic->idprof3 = $objp->idprof3;
diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index 7053acb9e97..d3c1ccd9017 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -78,7 +78,7 @@ class box_factures_fourn extends ModeleBoxes
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 
 		$facturestatic = new FactureFournisseur($this->db);
-		$thirdpartytmp = new Fournisseur($this->db);
+		$thirdpartystatic = new Fournisseur($this->db);
 
 		$this->info_box_head = array(
 			'text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."SupplierBills", $max)
@@ -86,17 +86,17 @@ class box_factures_fourn extends ModeleBoxes
 
 		if ($user->rights->fournisseur->facture->lire)
 		{
-			$sql = "SELECT s.nom as name, s.rowid as socid,";
-			$sql .= " s.code_fournisseur, s.email,";
-			$sql .= " s.logo,";
-			$sql .= " f.rowid as facid, f.ref, f.ref_supplier,";
-			$sql .= " f.total_ht,";
-			$sql .= " f.total_tva,";
-			$sql .= " f.total_ttc,";
-			$sql .= " f.paye, f.fk_statut,";
-			$sql .= ' f.datef as df,';
-			$sql .= ' f.datec as datec,';
-			$sql .= ' f.date_lim_reglement as datelimite, f.tms, f.type';
+			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+			$sql .= ", s.logo, s.email, s.entity";
+			$sql .= ", f.rowid as facid, f.ref, f.ref_supplier";
+			$sql .= ", f.total_ht";
+			$sql .= ", f.total_tva";
+			$sql .= ", f.total_ttc";
+			$sql .= ", f.paye, f.fk_statut";
+			$sql .= ', f.datef as df';
+			$sql .= ', f.datec as datec';
+			$sql .= ', f.date_lim_reglement as datelimite, f.tms, f.type';
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -131,12 +131,15 @@ class box_factures_fourn extends ModeleBoxes
 					$facturestatic->statut = $objp->fk_statut;
 					$facturestatic->ref_supplier = $objp->ref_supplier;
 
-					$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;
+					$thirdpartystatic->id = $objp->socid;
+					$thirdpartystatic->name = $objp->name;
+					//$thirdpartystatic->name_alias = $objp->name_alias;
+					$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
+					$thirdpartystatic->fournisseur = $objp->fournisseur;
+					$thirdpartystatic->logo = $objp->logo;
+					$thirdpartystatic->email = $objp->email;
+					$thirdpartystatic->entity = $objp->entity;
 
 					$late = '';
 
@@ -160,7 +163,7 @@ class box_factures_fourn extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="tdoverflowmax150"',
-						'text' => $thirdpartytmp->getNomUrl(1, 'supplier'),
+						'text' => $thirdpartystatic->getNomUrl(1, 'supplier'),
 						'asis' => 1,
 					);
 
diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
index 938505caab4..b957e5bf0c1 100644
--- a/htdocs/core/boxes/box_factures_fourn_imp.php
+++ b/htdocs/core/boxes/box_factures_fourn_imp.php
@@ -76,19 +76,21 @@ class box_factures_fourn_imp extends ModeleBoxes
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 		$facturestatic = new FactureFournisseur($this->db);
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
-		$thirdpartytmp = new Fournisseur($this->db);
+		$thirdpartystatic = new Fournisseur($this->db);
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpaidSupplierBills", $max));
 
 		if ($user->rights->fournisseur->facture->lire)
 		{
-			$sql = "SELECT s.nom as name, s.rowid as socid,";
-			$sql .= " f.rowid as facid, f.ref, f.ref_supplier, f.date_lim_reglement as datelimite,";
-			$sql .= " f.datef as df,";
-			$sql .= " f.total_ht as total_ht,";
-			$sql .= " f.tva as total_tva,";
-			$sql .= " f.total_ttc,";
-			$sql .= " f.paye, f.fk_statut, f.type";
+			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+			$sql .= ", s.logo, s.email, s.entity";
+			$sql .= ", f.rowid as facid, f.ref, f.ref_supplier, f.date_lim_reglement as datelimite";
+			$sql .= ", f.datef as df";
+			$sql .= ", f.total_ht as total_ht";
+			$sql .= ", f.tva as total_tva";
+			$sql .= ", f.total_ttc";
+			$sql .= ", f.paye, f.fk_statut, f.type";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= ",".MAIN_DB_PREFIX."facture_fourn as f";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -117,6 +119,7 @@ class box_factures_fourn_imp extends ModeleBoxes
 					$datelimite = $this->db->jdate($objp->datelimite);
 					$date = $this->db->jdate($objp->df);
 					$datem = $this->db->jdate($objp->tms);
+
 					$facturestatic->id = $objp->facid;
 					$facturestatic->ref = $objp->ref;
 					$facturestatic->total_ht = $objp->total_ht;
@@ -124,11 +127,16 @@ class box_factures_fourn_imp extends ModeleBoxes
 					$facturestatic->total_ttc = $objp->total_ttc;
 					$facturestatic->date_echeance = $datelimite;
 					$facturestatic->statut = $objp->fk_statut;
-					$thirdpartytmp->id = $objp->socid;
-					$thirdpartytmp->name = $objp->name;
-					$thirdpartytmp->fournisseur = 1;
-					$thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
-					$thirdpartytmp->logo = $objp->logo;
+
+					$thirdpartystatic->id = $objp->socid;
+					$thirdpartystatic->name = $objp->name;
+					//$thirdpartystatic->name_alias = $objp->name_alias;
+					$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
+					$thirdpartystatic->fournisseur = $objp->fournisseur;
+					$thirdpartystatic->logo = $objp->logo;
+					$thirdpartystatic->email = $objp->email;
+					$thirdpartystatic->entity = $objp->entity;
 
 					$late = '';
 					if ($facturestatic->hasDelay()) {
@@ -146,7 +154,7 @@ class box_factures_fourn_imp extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-						'text' => $thirdpartytmp->getNomUrl(1, '', 40),
+						'text' => $thirdpartystatic->getNomUrl(1, '', 40),
 						'asis' => 1,
 					);
 
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index e1b6a39b529..08233ff754c 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -88,16 +88,17 @@ class box_factures_imp extends ModeleBoxes
 
 		if ($user->rights->facture->lire)
 		{
-			$sql = "SELECT s.nom as name, s.rowid as socid, s.email,";
-			$sql .= " s.code_client,";
-			$sql .= " s.logo,";
-			$sql .= " f.ref, f.date_lim_reglement as datelimite,";
-			$sql .= " f.type,";
-			$sql .= " f.datef as df,";
-			$sql .= " f.total as total_ht,";
-			$sql .= " f.tva as total_tva,";
-			$sql .= " f.total_ttc,";
-			$sql .= " f.paye, f.fk_statut, f.rowid as facid";
+			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_client, s.code_compta, s.client";
+			$sql .= ", s.logo, s.email, s.entity";
+			$sql .= ", s.tva_intra, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6";
+			$sql .= ", f.ref, f.date_lim_reglement as datelimite";
+			$sql .= ", f.type";
+			$sql .= ", f.datef as df";
+			$sql .= ", f.total as total_ht";
+			$sql .= ", f.tva as total_tva";
+			$sql .= ", f.total_ttc";
+			$sql .= ", f.paye, f.fk_statut, f.rowid as facid";
 			$sql .= ", sum(pf.amount) as am";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -139,10 +140,20 @@ class box_factures_imp extends ModeleBoxes
 
 					$societestatic->id = $objp->socid;
 					$societestatic->name = $objp->name;
-					$societestatic->client = 1;
-					$societestatic->email = $objp->email;
+					//$societestatic->name_alias = $objp->name_alias;
 					$societestatic->code_client = $objp->code_client;
+					$societestatic->code_compta = $objp->code_compta;
+					$societestatic->client = $objp->client;
 					$societestatic->logo = $objp->logo;
+					$societestatic->email = $objp->email;
+					$societestatic->entity = $objp->entity;
+					$societestatic->tva_intra = $objp->tva_intra;
+					$societestatic->idprof1 = $objp->idprof1;
+					$societestatic->idprof2 = $objp->idprof2;
+					$societestatic->idprof3 = $objp->idprof3;
+					$societestatic->idprof4 = $objp->idprof4;
+					$societestatic->idprof5 = $objp->idprof5;
+					$societestatic->idprof6 = $objp->idprof6;
 
 					$late = '';
 					if ($facturestatic->hasDelay()) {
diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index fc9fcc9fc17..6cc213f98cb 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -76,17 +76,19 @@ class box_ficheinter extends ModeleBoxes
 
 		include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 		$ficheinterstatic = new Fichinter($this->db);
-		$companystatic = new Societe($this->db);
+		$thirdpartystatic = new Societe($this->db);
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastFicheInter", $max));
 
 		if (!empty($user->rights->ficheinter->lire))
 		{
-			$sql = "SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut,";
-			$sql .= " f.datec,";
-			$sql .= " f.date_valid as datev,";
-			$sql .= " f.tms as datem,";
-			$sql .= " s.nom as name, s.rowid as socid, s.client, s.email as semail";
+			$sql = "SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut";
+			$sql .= ", f.datec";
+			$sql .= ", f.date_valid as datev";
+			$sql .= ", f.tms as datem";
+			$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_client, s.code_compta, s.client";
+			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			if (!$user->rights->societe->client->voir) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			$sql .= ", ".MAIN_DB_PREFIX."fichinter as f";
@@ -115,9 +117,15 @@ class box_ficheinter extends ModeleBoxes
 					$ficheinterstatic->id = $objp->rowid;
 					$ficheinterstatic->ref = $objp->ref;
 
-					$companystatic->id = $objp->socid;
-					$companystatic->name = $objp->name;
-					$companystatic->email = $objp->semail;
+					$thirdpartystatic->id = $objp->socid;
+					$thirdpartystatic->name = $objp->name;
+					//$thirdpartystatic->name_alias = $objp->name_alias;
+					$thirdpartystatic->code_client = $objp->code_client;
+					$thirdpartystatic->code_compta = $objp->code_compta;
+					$thirdpartystatic->client = $objp->client;
+					$thirdpartystatic->logo = $objp->logo;
+					$thirdpartystatic->email = $objp->email;
+					$thirdpartystatic->entity = $objp->entity;
 
 					$this->info_box_contents[$i][] = array(
 						'td' => 'class="nowraponall"',
@@ -127,7 +135,7 @@ class box_ficheinter extends ModeleBoxes
 
 					$this->info_box_contents[$i][] = array(
 						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-						'text' => $companystatic->getNomUrl(1),
+						'text' => $thirdpartystatic->getNomUrl(1),
 						'asis' => 1,
 					);
 
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index 4be895f769c..44e2682585e 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -76,18 +76,17 @@ class box_fournisseurs extends ModeleBoxes
 
 		$this->max = $max;
 
-		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-		$thirdpartystatic = new Societe($this->db);
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
-		$thirdpartytmp = new Fournisseur($this->db);
+		$thirdpartystatic = new Fournisseur($this->db);
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedSuppliers", $max));
 
 		if ($user->rights->societe->lire)
 		{
-			$sql = "SELECT s.nom as name, s.rowid as socid, s.datec, s.tms, s.status,";
-			$sql .= " s.code_fournisseur, s.email as semail,";
-			$sql .= " s.logo, s.code_compta_fournisseur, s.entity";
+			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+			$sql .= ", s.logo, s.email, s.entity";
+			$sql .= ", s.datec, s.tms, s.status";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			$sql .= " WHERE s.fournisseur = 1";
@@ -108,17 +107,20 @@ class box_fournisseurs extends ModeleBoxes
 					$objp = $this->db->fetch_object($result);
 					$datec = $this->db->jdate($objp->datec);
 					$datem = $this->db->jdate($objp->tms);
-					$thirdpartytmp->id = $objp->socid;
-					$thirdpartytmp->name = $objp->name;
-					$thirdpartytmp->email = $objp->semail;
-					$thirdpartytmp->code_client = $objp->code_client;
-					$thirdpartytmp->logo = $objp->logo;
-					$thirdpartytmp->code_compta_fournisseur = $objp->code_compta_fournisseur;
-					$thirdpartytmp->entity = $objp->entity;
+
+					$thirdpartystatic->id = $objp->socid;
+					$thirdpartystatic->name = $objp->name;
+					$thirdpartystatic->name_alias = $objp->name_alias;
+					$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
+					$thirdpartystatic->fournisseur = $objp->fournisseur;
+					$thirdpartystatic->logo = $objp->logo;
+					$thirdpartystatic->email = $objp->email;
+					$thirdpartystatic->entity = $objp->entity;
 
 				   	$this->info_box_contents[$line][] = array(
 						'td' => '',
-						'text' => $thirdpartytmp->getNomUrl(1, '', 40),
+						'text' => $thirdpartystatic->getNomUrl(1, '', 40),
 						'asis' => 1,
 					);
 
diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php
index bbfa2f6fb19..f98e0f1e347 100644
--- a/htdocs/core/boxes/box_propales.php
+++ b/htdocs/core/boxes/box_propales.php
@@ -85,8 +85,10 @@ class box_propales extends ModeleBoxes
 
 		if ($user->rights->propale->lire)
 		{
-			$sql = "SELECT s.nom as name, s.rowid as socid, s.code_client, s.logo, s.entity, s.email,";
-			$sql .= " p.rowid, p.ref, p.fk_statut, p.datep as dp, p.datec, p.fin_validite, p.date_cloture, p.total_ht, p.tva as total_tva, p.total as total_ttc, p.tms";
+			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_client, s.code_compta, s.client";
+			$sql .= ", s.logo, s.email, s.entity";
+			$sql .= ", p.rowid, p.ref, p.fk_statut, p.datep as dp, p.datec, p.fin_validite, p.date_cloture, p.total_ht, p.tva as total_tva, p.total as total_ttc, p.tms";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= ", ".MAIN_DB_PREFIX."propal as p";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -113,14 +115,19 @@ class box_propales extends ModeleBoxes
 					$datem = $this->db->jdate($objp->tms);
 					$dateterm = $this->db->jdate($objp->fin_validite);
 					$dateclose = $this->db->jdate($objp->date_cloture);
+
 					$propalstatic->id = $objp->rowid;
 					$propalstatic->ref = $objp->ref;
 					$propalstatic->total_ht = $objp->total_ht;
 					$propalstatic->total_tva = $objp->total_tva;
 					$propalstatic->total_ttc = $objp->total_ttc;
+
 					$societestatic->id = $objp->socid;
 					$societestatic->name = $objp->name;
+					//$societestatic->name_alias = $objp->name_alias;
 					$societestatic->code_client = $objp->code_client;
+					$societestatic->code_compta = $objp->code_compta;
+					$societestatic->client = $objp->client;
 					$societestatic->logo = $objp->logo;
 					$societestatic->email = $objp->email;
 					$societestatic->entity = $objp->entity;
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index 10a8698aaf9..2492c095ad9 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -86,13 +86,11 @@ class box_prospect extends ModeleBoxes
 
 		if ($user->rights->societe->lire)
 		{
-			$sql = "SELECT s.nom as name, s.rowid as socid";
-			$sql .= ", s.code_client";
-			$sql .= ", s.client, s.email";
-			$sql .= ", s.code_fournisseur";
-			$sql .= ", s.fournisseur";
-			$sql .= ", s.logo";
-			$sql .= ", s.fk_stcomm, s.datec, s.tms, s.status";
+			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_client, s.code_compta, s.client";
+			$sql .= ", s.logo, s.email, s.entity";
+			$sql .= ", s.fk_stcomm";
+			$sql .= ", s.datec, s.tms, s.status";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			$sql .= " WHERE s.client IN (2, 3)";
@@ -114,14 +112,16 @@ class box_prospect extends ModeleBoxes
 					$objp = $this->db->fetch_object($resql);
 					$datec = $this->db->jdate($objp->datec);
 					$datem = $this->db->jdate($objp->tms);
+
 					$thirdpartystatic->id = $objp->socid;
 					$thirdpartystatic->name = $objp->name;
-					$thirdpartystatic->email = $objp->email;
+					$thirdpartystatic->name_alias = $objp->name_alias;
 					$thirdpartystatic->code_client = $objp->code_client;
-					$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartystatic->code_compta = $objp->code_compta;
 					$thirdpartystatic->client = $objp->client;
-					$thirdpartystatic->fournisseur = $objp->fournisseur;
 					$thirdpartystatic->logo = $objp->logo;
+					$thirdpartystatic->email = $objp->email;
+					$thirdpartystatic->entity = $objp->entity;
 
 					$this->info_box_contents[$line][] = array(
 						'td' => '',
diff --git a/htdocs/core/boxes/box_shipments.php b/htdocs/core/boxes/box_shipments.php
index 1b3c865f5a1..5a1f093ce87 100644
--- a/htdocs/core/boxes/box_shipments.php
+++ b/htdocs/core/boxes/box_shipments.php
@@ -88,10 +88,9 @@ class box_shipments extends ModeleBoxes
 
 		if ($user->rights->expedition->lire)
 		{
-			$sql = "SELECT s.nom as name";
-			$sql .= ", s.rowid as socid";
-			$sql .= ", s.code_client";
-			$sql .= ", s.logo, s.email";
+			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_client, s.code_compta, s.client";
+			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= ", e.ref, e.tms";
 			$sql .= ", e.rowid";
 			$sql .= ", e.ref_customer";
@@ -128,9 +127,13 @@ class box_shipments extends ModeleBoxes
 
 					$societestatic->id = $objp->socid;
 					$societestatic->name = $objp->name;
-					$societestatic->email = $objp->email;
+					//$societestatic->name_alias = $objp->name_alias;
 					$societestatic->code_client = $objp->code_client;
+					$societestatic->code_compta = $objp->code_compta;
+					$societestatic->client = $objp->client;
 					$societestatic->logo = $objp->logo;
+					$societestatic->email = $objp->email;
+					$societestatic->entity = $objp->entity;
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="nowraponall"',
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index 6c5dd4379d3..409265b3516 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -77,20 +77,20 @@ class box_supplier_orders extends ModeleBoxes
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 		$supplierorderstatic = new CommandeFournisseur($this->db);
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
-		$thirdpartytmp = new Fournisseur($this->db);
+		$thirdpartystatic = new Fournisseur($this->db);
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLatest".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."SupplierOrders", $max));
 
 		if ($user->rights->fournisseur->commande->lire)
 		{
-			$sql = "SELECT s.nom as name, s.rowid as socid,";
-			$sql .= " s.code_client, s.code_fournisseur,";
-			$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,";
-			$sql .= " c.total_ttc,";
-			$sql .= " c.fk_statut";
+			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+			$sql .= ", s.logo, s.email, s.entity";
+			$sql .= ", c.rowid, c.ref, c.tms, c.date_commande";
+			$sql .= ", c.total_ht";
+			$sql .= ", c.tva as total_tva";
+			$sql .= ", c.total_ttc";
+			$sql .= ", c.fk_statut";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -116,12 +116,15 @@ class box_supplier_orders extends ModeleBoxes
 					$supplierorderstatic->id = $objp->rowid;
 					$supplierorderstatic->ref = $objp->ref;
 
-					$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;
+					$thirdpartystatic->id = $objp->socid;
+					$thirdpartystatic->name = $objp->name;
+					//$thirdpartystatic->name_alias = $objp->name_alias;
+					$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
+					$thirdpartystatic->fournisseur = $objp->fournisseur;
+					$thirdpartystatic->logo = $objp->logo;
+					$thirdpartystatic->email = $objp->email;
+					$thirdpartystatic->entity = $objp->entity;
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="nowraponall"',
@@ -131,7 +134,7 @@ class box_supplier_orders extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-						'text' => $thirdpartytmp->getNomUrl(1, 'supplier'),
+						'text' => $thirdpartystatic->getNomUrl(1, 'supplier'),
 						'asis' => 1,
 					);
 
diff --git a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
index 9aeba738caf..80fdbc2f4a2 100644
--- a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
+++ b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
@@ -77,20 +77,20 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 		$supplierorderstatic = new CommandeFournisseur($this->db);
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
-		$thirdpartytmp = new Fournisseur($this->db);
+		$thirdpartystatic = new Fournisseur($this->db);
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleSupplierOrdersAwaitingReception", $max));
 
 		if ($user->rights->fournisseur->commande->lire)
 		{
-			$sql = "SELECT s.nom as name, s.rowid as socid,";
-			$sql .= " s.code_client, s.code_fournisseur, s.email,";
-			$sql .= " s.logo,";
-			$sql .= " c.rowid, c.ref, c.tms, c.date_commande, c.date_livraison as delivery_date, ";
-			$sql .= " c.total_ht,";
-			$sql .= " c.tva as total_tva,";
-			$sql .= " c.total_ttc,";
-			$sql .= " c.fk_statut";
+			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+			$sql .= ", s.logo, s.email, s.entity";
+			$sql .= ", c.rowid, c.ref, c.tms, c.date_commande, c.date_livraison as delivery_date";
+			$sql .= ", c.total_ht";
+			$sql .= ", c.tva as total_tva";
+			$sql .= ", c.total_ttc";
+			$sql .= ", c.fk_statut";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -121,12 +121,15 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
 					$supplierorderstatic->id = $objp->rowid;
 					$supplierorderstatic->ref = $objp->ref;
 
-					$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;
+					$thirdpartystatic->id = $objp->socid;
+					$thirdpartystatic->name = $objp->name;
+					//$thirdpartystatic->name_alias = $objp->name_alias;
+					$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
+					$thirdpartystatic->fournisseur = $objp->fournisseur;
+					$thirdpartystatic->logo = $objp->logo;
+					$thirdpartystatic->email = $objp->email;
+					$thirdpartystatic->entity = $objp->entity;
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="nowraponall"',
@@ -136,7 +139,7 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-						'text' => $thirdpartytmp->getNomUrl(1, 'supplier'),
+						'text' => $thirdpartystatic->getNomUrl(1, 'supplier'),
 						'asis' => 1,
 					);
 

From 5d8dfadd09d96517a9aa71daa423b950bbbe21a6 Mon Sep 17 00:00:00 2001
From: Stephane Lesage <stephane.lesage@ateis.com>
Date: Tue, 8 Dec 2020 15:03:02 +0100
Subject: [PATCH 277/888] Third-party details in Lists in project index

---
 htdocs/core/lib/project.lib.php | 16 ++++++++++++---
 htdocs/projet/index.php         | 35 ++++++++++++++++++++++++++-------
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 736044fafe7..74e624ca7cb 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -2168,7 +2168,11 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 	if (empty($arrayidofprojects)) $arrayidofprojects[0] = -1;
 
 	// Get list of project with calculation on tasks
-	$sql2 = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_soc, s.nom as socname, s.email, s.client, s.fournisseur,";
+	$sql2 = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_soc,";
+	$sql2 .= " s.rowid as socid, s.nom as socname, s.name_alias,";
+	$sql2 .= " s.code_client, s.code_compta, s.client,";
+	$sql2 .= " s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur,";
+	$sql2 .= " s.logo, s.email, s.entity,";
 	$sql2 .= " p.fk_user_creat, p.public, p.fk_statut as status, p.fk_opp_status as opp_status, p.opp_percent, p.opp_amount,";
 	$sql2 .= " p.dateo, p.datee,";
 	$sql2 .= " COUNT(t.rowid) as nb, SUM(t.planned_workload) as planned_workload, SUM(t.planned_workload * t.progress / 100) as declared_progess_workload";
@@ -2237,12 +2241,18 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 				print '<td class="nowraponall tdoverflowmax100">';
 				if ($objp->fk_soc > 0)
 				{
-					$thirdpartystatic->id = $objp->fk_soc;
-					$thirdpartystatic->ref = $objp->socname;
+					$thirdpartystatic->id = $objp->socid;
 					$thirdpartystatic->name = $objp->socname;
+					//$thirdpartystatic->name_alias = $objp->name_alias;
+					//$thirdpartystatic->code_client = $objp->code_client;
+					$thirdpartystatic->code_compta = $objp->code_compta;
 					$thirdpartystatic->client = $objp->client;
+					//$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
 					$thirdpartystatic->fournisseur = $objp->fournisseur;
+					$thirdpartystatic->logo = $objp->logo;
 					$thirdpartystatic->email = $objp->email;
+					$thirdpartystatic->entity = $objp->entity;
 					print $thirdpartystatic->getNomUrl(1);
 				}
 				print '</td>';
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 71791d1a655..576bda7d09f 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -213,8 +213,12 @@ print_projecttasks_array($db, $form, $socid, $projectsListId, 0, 0, $listofoppst
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Latest modified projects
-$sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut as status, p.tms as datem,";
-$sql .= " s.rowid as socid, s.nom as name, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.canvas, s.status as thirdpartystatus";
+$sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut as status, p.tms as datem";
+$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+$sql .= ", s.code_client, s.code_compta, s.client";
+$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+$sql .= ", s.logo, s.email, s.entity";
+$sql .= ", s.canvas, s.status as thirdpartystatus";
 $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
 $sql .= " WHERE p.entity IN (".getEntity('project').")";
@@ -253,11 +257,16 @@ if ($resql)
 
 			$companystatic->id = $obj->socid;
 			$companystatic->name = $obj->name;
-			$companystatic->email = $obj->email;
+			//$companystatic->name_alias = $obj->name_alias;
+			//$companystatic->code_client = $obj->code_client;
+			$companystatic->code_compta = $obj->code_compta;
 			$companystatic->client = $obj->client;
+			//$companystatic->code_fournisseur = $obj->code_fournisseur;
+			$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
 			$companystatic->fournisseur = $obj->fournisseur;
-			$companystatic->code_client = $obj->code_client;
-			$companystatic->code_fournisseur = $obj->code_fournisseur;
+			$companystatic->logo = $obj->logo;
+			$companystatic->email = $obj->email;
+			$companystatic->entity = $obj->entity;
 			$companystatic->canvas = $obj->canvas;
 			$companystatic->status = $obj->thirdpartystatus;
 
@@ -307,7 +316,11 @@ print_liste_field_titre("NbOfProjects", $_SERVER["PHP_SELF"], "nb", "", "", '',
 print "</tr>\n";
 
 $sql = "SELECT COUNT(p.rowid) as nb, SUM(p.opp_amount)";
-$sql .= ", s.rowid as socid, s.nom as name, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.canvas, s.status";
+$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+$sql .= ", s.code_client, s.code_compta, s.client";
+$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+$sql .= ", s.logo, s.email, s.entity";
+$sql .= ", s.canvas, s.status";
 $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
 $sql .= " WHERE p.entity IN (".getEntity('project').")";
@@ -341,9 +354,17 @@ if ($resql)
 		{
 			$companystatic->id = $obj->socid;
 			$companystatic->name = $obj->name;
-			$companystatic->email = $obj->email;
+			$companystatic->name_alias = $obj->name_alias;
+			$companystatic->code_client = $obj->code_client;
+			$companystatic->code_compta = $obj->code_compta;
 			$companystatic->client = $obj->client;
+			$companystatic->code_fournisseur = $obj->code_fournisseur;
+			$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
 			$companystatic->fournisseur = $obj->fournisseur;
+			$companystatic->logo = $obj->logo;
+			$companystatic->email = $obj->email;
+			$companystatic->entity = $obj->entity;
+			$companystatic->canvas = $obj->canvas;
 			$companystatic->status = $obj->status;
 
 			print $companystatic->getNomUrl(1);

From e25862ec8d8d39a611ae8be875324c6a2b821ee5 Mon Sep 17 00:00:00 2001
From: Stephane Lesage <stephane.lesage@ateis.com>
Date: Tue, 8 Dec 2020 15:36:37 +0100
Subject: [PATCH 278/888] Third-party details in Lists in comm index

---
 htdocs/comm/index.php | 182 ++++++++++++++++++++++++++++++------------
 1 file changed, 132 insertions(+), 50 deletions(-)

diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 7524de9055f..384b88655f6 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -137,8 +137,12 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {
  * Draft customer proposals
  */
 if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
-	$sql = "SELECT p.rowid, p.ref, p.ref_client, p.total_ht, p.tva as total_tva, p.total as total_ttc, p.fk_statut as status,";
-	$sql .= " s.rowid as socid, s.nom as name, s.client, s.canvas, s.code_client, s.email, s.entity, s.code_compta";
+	$sql = "SELECT p.rowid, p.ref, p.ref_client, p.total_ht, p.tva as total_tva, p.total as total_ttc, p.fk_statut as status";
+	$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+	$sql .= ", s.code_client, s.code_compta, s.client";
+	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+	$sql .= ", s.logo, s.email, s.entity";
+	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."propal as p,";
 	$sql .= " ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -171,13 +175,17 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
 
 				$companystatic->id = $obj->socid;
 				$companystatic->name = $obj->name;
-				$companystatic->client = $obj->client;
+				$companystatic->name_alias = $obj->name_alias;
 				$companystatic->code_client = $obj->code_client;
-				$companystatic->code_fournisseur = $obj->code_fournisseur;
-				$companystatic->canvas = $obj->canvas;
-				$companystatic->entity = $obj->entity;
-				$companystatic->email = $obj->email;
 				$companystatic->code_compta = $obj->code_compta;
+				$companystatic->client = $obj->client;
+				$companystatic->code_fournisseur = $obj->code_fournisseur;
+				$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
+				$companystatic->fournisseur = $obj->fournisseur;
+				$companystatic->logo = $obj->logo;
+				$companystatic->email = $obj->email;
+				$companystatic->entity = $obj->entity;
+				$companystatic->canvas = $obj->canvas;
 
 				print '<tr class="oddeven">';
 				print '<td class="nowrap tdoverflowmax100">'.$propalstatic->getNomUrl(1).'</td>';
@@ -204,8 +212,12 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
  * Draft supplier proposals
  */
 if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire) {
-	$sql = "SELECT p.rowid, p.ref, p.total_ht, p.tva as total_tva, p.total as total_ttc, p.fk_statut as status,";
-	$sql .= " s.rowid as socid, s.nom as name, s.client, s.canvas, s.code_client, s.code_fournisseur, s.entity, s.email";
+	$sql = "SELECT p.rowid, p.ref, p.total_ht, p.tva as total_tva, p.total as total_ttc, p.fk_statut as status";
+	$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+	$sql .= ", s.code_client, s.code_compta, s.client";
+	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+	$sql .= ", s.logo, s.email, s.entity";
+	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p,";
 	$sql .= " ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -237,12 +249,17 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
 
 				$companystatic->id = $obj->socid;
 				$companystatic->name = $obj->name;
-				$companystatic->client = $obj->client;
+				$companystatic->name_alias = $obj->name_alias;
 				$companystatic->code_client = $obj->code_client;
+				$companystatic->code_compta = $obj->code_compta;
+				$companystatic->client = $obj->client;
 				$companystatic->code_fournisseur = $obj->code_fournisseur;
-				$companystatic->canvas = $obj->canvas;
-				$companystatic->entity = $obj->entity;
+				$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
+				$companystatic->fournisseur = $obj->fournisseur;
+				$companystatic->logo = $obj->logo;
 				$companystatic->email = $obj->email;
+				$companystatic->entity = $obj->entity;
+				$companystatic->canvas = $obj->canvas;
 
 				print '<tr class="oddeven">';
 				print '<td class="nowrap tdoverflowmax100">'.$supplierproposalstatic->getNomUrl(1).'</td>';
@@ -269,8 +286,12 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
  * Draft customer orders
  */
 if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
-	$sql = "SELECT c.rowid, c.ref, c.ref_client, c.total_ht, c.tva as total_tva, c.total_ttc, c.fk_statut as status,";
-	$sql .= " s.rowid as socid, s.nom as name, s.client, s.canvas, s.code_client, s.email, s.entity, s.code_compta";
+	$sql = "SELECT c.rowid, c.ref, c.ref_client, c.total_ht, c.tva as total_tva, c.total_ttc, c.fk_statut as status";
+	$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+	$sql .= ", s.code_client, s.code_compta, s.client";
+	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+	$sql .= ", s.logo, s.email, s.entity";
+	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c,";
 	$sql .= " ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -303,12 +324,17 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 
 				$companystatic->id = $obj->socid;
 				$companystatic->name = $obj->name;
-				$companystatic->client = $obj->client;
+				$companystatic->name_alias = $obj->name_alias;
 				$companystatic->code_client = $obj->code_client;
+				$companystatic->code_compta = $obj->code_compta;
+				$companystatic->client = $obj->client;
 				$companystatic->code_fournisseur = $obj->code_fournisseur;
-				$companystatic->canvas = $obj->canvas;
+				$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
+				$companystatic->fournisseur = $obj->fournisseur;
+				$companystatic->logo = $obj->logo;
 				$companystatic->email = $obj->email;
 				$companystatic->entity = $obj->entity;
+				$companystatic->canvas = $obj->canvas;
 
 				print '<tr class="oddeven">';
 				print '<td class="nowrap tdoverflowmax100">'.$orderstatic->getNomUrl(1).'</td>';
@@ -335,8 +361,12 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
  * Draft purchase orders
  */
 if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)) && $user->rights->fournisseur->commande->lire) {
-	$sql = "SELECT cf.rowid, cf.ref, cf.ref_supplier, cf.total_ttc, cf.fk_statut as status,";
-	$sql .= " s.rowid as socid, s.nom as name, s.client, s.canvas, s.code_client, s.code_fournisseur, s.entity, s.email";
+	$sql = "SELECT cf.rowid, cf.ref, cf.ref_supplier, cf.total_ttc, cf.fk_statut as status";
+	$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+	$sql .= ", s.code_client, s.code_compta, s.client";
+	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+	$sql .= ", s.logo, s.email, s.entity";
+	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf,";
 	$sql .= " ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -369,12 +399,17 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 
 				$companystatic->id = $obj->socid;
 				$companystatic->name = $obj->name;
-				$companystatic->client = $obj->client;
+				$companystatic->name_alias = $obj->name_alias;
 				$companystatic->code_client = $obj->code_client;
+				$companystatic->code_compta = $obj->code_compta;
+				$companystatic->client = $obj->client;
 				$companystatic->code_fournisseur = $obj->code_fournisseur;
-				$companystatic->canvas = $obj->canvas;
-				$companystatic->entity = $obj->entity;
+				$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
+				$companystatic->fournisseur = $obj->fournisseur;
+				$companystatic->logo = $obj->logo;
 				$companystatic->email = $obj->email;
+				$companystatic->entity = $obj->entity;
+				$companystatic->canvas = $obj->canvas;
 
 				print '<tr class="oddeven">';
 				print '<td class="nowrap tdoverflowmax100">'.$supplierorderstatic->getNomUrl(1).'</td>';
@@ -403,7 +438,12 @@ print '<div class="ficheaddleft">';
  * Last modified customers or prospects
  */
 if (!empty($conf->societe->enabled) && $user->rights->societe->lire) {
-	$sql = "SELECT s.rowid, s.nom as name, s.client, s.datec, s.tms, s.canvas, s.code_client, s.code_compta, s.entity, s.email";
+	$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+	$sql .= ", s.code_client, s.code_compta, s.client";
+	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+	$sql .= ", s.logo, s.email, s.entity";
+	$sql .= ", s.canvas";
+	$sql .= ", s.datec, s.tms";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql .= " WHERE s.entity IN (".getEntity($companystatic->element).")";
@@ -434,15 +474,19 @@ if (!empty($conf->societe->enabled) && $user->rights->societe->lire) {
 			while ($i < $num && $i < $max) {
 				$objp = $db->fetch_object($resql);
 
-				$companystatic->id = $objp->rowid;
+				$companystatic->id = $objp->socid;
 				$companystatic->name = $objp->name;
-				$companystatic->client = $objp->client;
+				$companystatic->name_alias = $objp->name_alias;
 				$companystatic->code_client = $objp->code_client;
-				$companystatic->code_fournisseur = $objp->code_fournisseur;
-				$companystatic->canvas = $objp->canvas;
 				$companystatic->code_compta = $objp->code_compta;
-				$companystatic->entity = $objp->entity;
+				$companystatic->client = $objp->client;
+				$companystatic->code_fournisseur = $objp->code_fournisseur;
+				$companystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
+				$companystatic->fournisseur = $objp->fournisseur;
+				$companystatic->logo = $objp->logo;
 				$companystatic->email = $objp->email;
+				$companystatic->entity = $objp->entity;
+				$companystatic->canvas = $objp->canvas;
 
 				print '<tr class="oddeven">';
 				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'customer').'</td>';
@@ -488,7 +532,12 @@ if (!empty($conf->societe->enabled) && $user->rights->societe->lire) {
  * Last suppliers
  */
 if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->societe->lire) {
-	$sql = "SELECT s.nom as name, s.rowid, s.datec as dc, s.canvas, s.tms as dm, s.code_fournisseur, s.entity, s.email, s.fournisseur";
+	$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+	$sql .= ", s.code_client, s.code_compta, s.client";
+	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+	$sql .= ", s.logo, s.email, s.entity";
+	$sql .= ", s.canvas";
+	$sql .= ", s.datec as dc, s.tms as dm";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql .= " WHERE s.entity IN (".getEntity($companystatic->element).")";
@@ -508,14 +557,19 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 			while ($i < $num && $i < $max) {
 				$objp = $db->fetch_object($resql);
 
-				$companystatic->id = $objp->rowid;
+				$companystatic->id = $objp->socid;
 				$companystatic->name = $objp->name;
+				$companystatic->name_alias = $objp->name_alias;
 				$companystatic->code_client = $objp->code_client;
+				$companystatic->code_compta = $objp->code_compta;
+				$companystatic->client = $objp->client;
 				$companystatic->code_fournisseur = $objp->code_fournisseur;
-				$companystatic->canvas = $objp->canvas;
-				$companystatic->entity = $objp->entity;
-				$companystatic->email = $objp->email;
+				$companystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
 				$companystatic->fournisseur = $objp->fournisseur;
+				$companystatic->logo = $objp->logo;
+				$companystatic->email = $objp->email;
+				$companystatic->entity = $objp->entity;
+				$companystatic->canvas = $objp->canvas;
 
 				print '<tr class="oddeven">';
 				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'supplier').'</td>';
@@ -577,7 +631,11 @@ if ($user->rights->agenda->myactions->read) {
 if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) { // TODO A REFAIRE DEPUIS NOUVEAU CONTRAT
 	$staticcontrat = new Contrat($db);
 
-	$sql = "SELECT s.nom as name, s.rowid, s.canvas, s.code_client, s.entity, s.email";
+	$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+	$sql .= ", s.code_client, s.code_compta, s.client";
+	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+	$sql .= ", s.logo, s.email, s.entity";
+	$sql .= ", s.canvas";
 	$sql .= ", c.statut, c.rowid as contratid, p.ref, c.fin_validite as datefin, c.date_cloture as dateclo";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= ", ".MAIN_DB_PREFIX."contrat as c";
@@ -602,13 +660,19 @@ if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) { // T
 			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 
-				$companystatic->id = $objp->rowid;
-				$companystatic->name = $objp->name;
-				$companystatic->code_client = $objp->code_client;
-				$companystatic->code_fournisseur = $objp->code_fournisseur;
-				$companystatic->canvas = $objp->canvas;
-				$companystatic->entity = $objp->entity;
-				$companystatic->email = $objp->email;
+				$companystatic->id = $obj->socid;
+				$companystatic->name = $obj->name;
+				$companystatic->name_alias = $obj->name_alias;
+				$companystatic->code_client = $obj->code_client;
+				$companystatic->code_compta = $obj->code_compta;
+				$companystatic->client = $obj->client;
+				$companystatic->code_fournisseur = $obj->code_fournisseur;
+				$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
+				$companystatic->fournisseur = $obj->fournisseur;
+				$companystatic->logo = $obj->logo;
+				$companystatic->email = $obj->email;
+				$companystatic->entity = $obj->entity;
+				$companystatic->canvas = $obj->canvas;
 
 				$staticcontrat->id = $obj->contratid;
 				$staticcontrat->ref = $obj->ref;
@@ -638,7 +702,11 @@ if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) { // T
  */
 if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
 	$sql = "SELECT p.rowid as propalid, p.entity, p.total as total_ttc, p.total_ht, p.tva as total_tva, p.ref, p.ref_client, p.fk_statut, p.datep as dp, p.fin_validite as dfv";
-	$sql .= ", s.nom as name, s.rowid, s.code_client, s.entity, s.email";
+	$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+	$sql .= ", s.code_client, s.code_compta, s.client";
+	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+	$sql .= ", s.logo, s.email, s.entity";
+	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."propal as p";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -678,14 +746,19 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
 				$propalstatic->total_tva = $obj->total_tva;
 				$propalstatic->total_ttc = $obj->total_ttc;
 
-				$companystatic->id = $obj->rowid;
+				$companystatic->id = $obj->socid;
 				$companystatic->name = $obj->name;
-				$companystatic->client = $obj->client;
+				$companystatic->name_alias = $obj->name_alias;
 				$companystatic->code_client = $obj->code_client;
+				$companystatic->code_compta = $obj->code_compta;
+				$companystatic->client = $obj->client;
 				$companystatic->code_fournisseur = $obj->code_fournisseur;
-				$companystatic->canvas = $obj->canvas;
-				$companystatic->entity = $obj->entity;
+				$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
+				$companystatic->fournisseur = $obj->fournisseur;
+				$companystatic->logo = $obj->logo;
 				$companystatic->email = $obj->email;
+				$companystatic->entity = $obj->entity;
+				$companystatic->canvas = $obj->canvas;
 
 				$filename = dol_sanitizeFileName($obj->ref);
 				$filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);
@@ -739,7 +812,11 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
  */
 if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 	$sql = "SELECT c.rowid as commandeid, c.total_ttc, c.total_ht, c.tva as total_tva, c.ref, c.ref_client, c.fk_statut, c.date_valid as dv, c.facture as billed";
-	$sql .= ", s.nom as name, s.rowid, s.code_client, s.entity, s.email";
+	$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+	$sql .= ", s.code_client, s.code_compta, s.client";
+	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+	$sql .= ", s.logo, s.email, s.entity";
+	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -779,14 +856,19 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 				$orderstatic->total_tva = $obj->total_tva;
 				$orderstatic->total_ttc = $obj->total_ttc;
 
-				$companystatic->id = $obj->rowid;
+				$companystatic->id = $obj->socid;
 				$companystatic->name = $obj->name;
-				$companystatic->client = $obj->client;
+				$companystatic->name_alias = $obj->name_alias;
 				$companystatic->code_client = $obj->code_client;
+				$companystatic->code_compta = $obj->code_compta;
+				$companystatic->client = $obj->client;
 				$companystatic->code_fournisseur = $obj->code_fournisseur;
-				$companystatic->canvas = $obj->canvas;
-				$companystatic->entity = $obj->entity;
+				$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
+				$companystatic->fournisseur = $obj->fournisseur;
+				$companystatic->logo = $obj->logo;
 				$companystatic->email = $obj->email;
+				$companystatic->entity = $obj->entity;
+				$companystatic->canvas = $obj->canvas;
 
 				$filename = dol_sanitizeFileName($obj->ref);
 				$filedir = $conf->commande->dir_output.'/'.dol_sanitizeFileName($obj->ref);

From 376e4d150af1d85f4dd39eec008e6d2bdf98da35 Mon Sep 17 00:00:00 2001
From: Stephane Lesage <stephane.lesage@ateis.com>
Date: Tue, 8 Dec 2020 15:56:42 +0100
Subject: [PATCH 279/888] Third-party details in comm action lists

---
 htdocs/core/lib/agenda.lib.php | 44 +++++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 8241b415726..16a19bace2f 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -164,9 +164,11 @@ function show_array_actions_to_do($max = 5)
 	include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 	include_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
 
-	$sql = "SELECT a.id, a.label, a.datep as dp, a.datep2 as dp2, a.fk_user_author, a.percent,";
-	$sql .= " c.code, c.libelle as type_label,";
-	$sql .= " s.nom as sname, s.rowid, s.client";
+	$sql = "SELECT a.id, a.label, a.datep as dp, a.datep2 as dp2, a.fk_user_author, a.percent";
+	$sql .= ", c.code, c.libelle as type_label";
+	$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+	$sql .= ", s.code_client, s.code_compta, s.client";
+	$sql .= ", s.logo, s.email, s.entity";
 	$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
 	$sql .= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
@@ -210,12 +212,18 @@ function show_array_actions_to_do($max = 5)
 			// print '<td>'.dol_trunc($obj->label,22).'</td>';
 
 			print '<td>';
-			if ($obj->rowid > 0)
+			if ($obj->socid > 0)
 			{
-				$customerstatic->id = $obj->rowid;
-				$customerstatic->name = $obj->sname;
+				$customerstatic->id = $obj->socid;
+				$customerstatic->name = $obj->name;
+				//$customerstatic->name_alias = $obj->name_alias;
+				$customerstatic->code_client = $obj->code_client;
+				$customerstatic->code_compta = $obj->code_compta;
 				$customerstatic->client = $obj->client;
-				print $customerstatic->getNomUrl(1, '', 16);
+				$customerstatic->logo = $obj->logo;
+				$customerstatic->email = $obj->email;
+				$customerstatic->entity = $obj->entity;
+				print $customerstatic->getNomUrl(1, '', 40);
 			}
 			print '</td>';
 
@@ -260,9 +268,11 @@ function show_array_last_actions_done($max = 5)
 
 	$now = dol_now();
 
-	$sql = "SELECT a.id, a.percent, a.datep as da, a.datep2 as da2, a.fk_user_author, a.label,";
-	$sql .= " c.code, c.libelle,";
-	$sql .= " s.rowid, s.nom as sname, s.client";
+	$sql = "SELECT a.id, a.percent, a.datep as da, a.datep2 as da2, a.fk_user_author, a.label";
+	$sql .= ", c.code, c.libelle";
+	$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+	$sql .= ", s.code_client, s.code_compta, s.client";
+	$sql .= ", s.logo, s.email, s.entity";
 	$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
 	$sql .= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action ";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
@@ -305,12 +315,18 @@ function show_array_last_actions_done($max = 5)
 			//print '<td>'.dol_trunc($obj->label,24).'</td>';
 
 			print '<td>';
-			if ($obj->rowid > 0)
+			if ($obj->socid > 0)
 			{
-				$customerstatic->id = $obj->rowid;
-				$customerstatic->name = $obj->sname;
+				$customerstatic->id = $obj->socid;
+				$customerstatic->name = $obj->name;
+				//$customerstatic->name_alias = $obj->name_alias;
+				$customerstatic->code_client = $obj->code_client;
+				$customerstatic->code_compta = $obj->code_compta;
 				$customerstatic->client = $obj->client;
-				print $customerstatic->getNomUrl(1, '', 24);
+				$customerstatic->logo = $obj->logo;
+				$customerstatic->email = $obj->email;
+				$customerstatic->entity = $obj->entity;
+				print $customerstatic->getNomUrl(1, '', 30);
 			}
 			print '</td>';
 

From 240648d540daac9c12ebe4c902c86db155477af5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 8 Dec 2020 17:09:48 +0100
Subject: [PATCH 280/888] css

---
 htdocs/comm/action/peruser.php   | 2 +-
 htdocs/core/lib/agenda.lib.php   | 5 ++---
 htdocs/theme/eldy/global.inc.php | 3 +++
 htdocs/theme/md/style.css.php    | 4 ++++
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 6161b6c820b..3ddea1c0cbf 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -673,7 +673,7 @@ while ($currentdaytoshow < $lastdaytoshow) {
 	echo '<table width="100%" class="noborder nocellnopadd cal_month">';
 
 	echo '<tr class="liste_titre">';
-	echo '<td class="nopaddingtopimp nopaddingbottomimp">';
+	echo '<td class="nopaddingtopimp nopaddingbottomimp nowraponsmartphone">';
 
 	if ($canedit && $action == 'show_peruser')
 	{
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 8241b415726..dabf8f2b853 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -87,7 +87,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 		print '<div class="divsearchfield">';
 		print img_picto('', 'user', 'class="fawidth30 inline-block"');
 		print '<span class="hideonsmartphone">'.$langs->trans("ActionsToDoBy").'</span>';
-		print $form->select_dolusers($filtert, 'search_filtert', 1, '', !$canedit, '', '', 0, 0, 0, '', 0, '', 'maxwidth500');
+		print $form->select_dolusers($filtert, 'search_filtert', 1, '', !$canedit, '', '', 0, 0, 0, '', 0, '', 'maxwidth500 widthcentpercentminusxx');
 		print '</div>';
 		print '<div class="divsearchfield">';
 		print img_picto('', 'object_group', 'class="fawidth30 inline-block"');
@@ -189,7 +189,6 @@ function show_array_actions_to_do($max = 5)
 		print '<th colspan="2" class="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&status=todo">'.$langs->trans("FullList").'</a></th>';
 		print '</tr>';
 
-		$var = true;
 		$i = 0;
 
 		$staticaction = new ActionComm($db);
@@ -284,7 +283,7 @@ function show_array_last_actions_done($max = 5)
 		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastDoneTasks", $max).'</th>';
 		print '<th colspan="2" class="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&status=done">'.$langs->trans("FullList").'</a></th>';
 		print '</tr>';
-		$var = true;
+
 		$i = 0;
 
 		$staticaction = new ActionComm($db);
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 3a849c33b3a..fcd196ff122 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -630,6 +630,9 @@ textarea.centpercent {
 .nowrap {
 	white-space: <?php print ($dol_optimize_smallscreen ? 'normal' : 'nowrap'); ?>;
 }
+.nowraponsmartphone {
+	white-space: <?php print ($dol_optimize_smallscreen ? 'nowrap' : 'normal'); ?>;
+}
 .liste_titre .nowrap {
 	white-space: nowrap;
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 8d0721e8aad..c16d0df2351 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -729,6 +729,9 @@ textarea.centpercent {
 .nowrap {
 	white-space: <?php print ($dol_optimize_smallscreen ? 'normal' : 'nowrap'); ?>;
 }
+.nowraponsmartphone {
+	white-space: <?php print ($dol_optimize_smallscreen ? 'nowrap' : 'normal'); ?>;
+}
 .liste_titre .nowrap {
 	white-space: nowrap;
 }
@@ -1279,6 +1282,7 @@ table[summary="list_of_modules"] .fa-cog {
     .minwidth500imp { min-width: 250px !important; }
 }
 
+/* Set a width. Note: add also a max-width that will be used in priority */ 
 .widthcentpercentminusx {
 	width: calc(100% - 50px) !important;
 	display: inline-block;

From 0f2a8d02620a745b3297d4587a50c68195e06997 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 8 Dec 2020 17:20:45 +0100
Subject: [PATCH 281/888] Fix timestamp field

---
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql       | 1 +
 htdocs/install/mysql/tables/llx_opensurvey_sondage.sql | 2 +-
 htdocs/opensurvey/list.php                             | 8 +++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index 9fcb3c4ef50..1d8c7a37b95 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -340,6 +340,7 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_SENTBYMAIL','Mails sent from third party card','Executed when you send email from contact adress card','contact',51);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_DELETE','Contact address deleted','Executed when a contact is deleted','contact',52);
 
+ALTER TABLE llx_opensurvey_sondage CHANGE COLUMN tms tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 ALTER TABLE llx_ecm_directories CHANGE COLUMN date_m tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 ALTER TABLE llx_ecm_files CHANGE COLUMN date_m tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql b/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
index 0521f533fdd..e1723ccaea0 100644
--- a/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
+++ b/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
@@ -29,6 +29,6 @@ CREATE TABLE llx_opensurvey_sondage (
 	mailsonde tinyint NOT NULL DEFAULT 0,
 	allow_comments tinyint NOT NULL DEFAULT 1,
 	allow_spy tinyint NOT NULL DEFAULT 1,
-	tms TIMESTAMP,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	sujet TEXT									-- Not filled if format = 'F'. Question are into table llx_opensurvey_formquestions
 ) ENGINE=innodb;
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index f4f316122fb..eaee1b696e1 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -155,7 +155,7 @@ $help_url = '';
 $title = $langs->trans('OpenSurveyArea');
 
 
-$sql = "SELECT p.id_sondage as rowid, p.fk_user_creat, p.format, p.date_fin, p.status, p.titre as title, p.nom_admin,";
+$sql = "SELECT p.id_sondage as rowid, p.fk_user_creat, p.format, p.date_fin, p.status, p.titre as title, p.nom_admin, p.tms,";
 $sql .= " u.login, u.firstname, u.lastname";
 $sql .= " FROM ".MAIN_DB_PREFIX."opensurvey_sondage as p";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user u ON u.rowid = p.fk_user_creat";
@@ -301,6 +301,7 @@ print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
 $arraystatus = array('-1'=>'&nbsp;', '0'=>$langs->trans("Draft"), '1'=>$langs->trans("Opened"), '2'=>$langs->trans("Closed"));
 print '<td class="liste_titre" align="center">'.$form->selectarray('search_status', $arraystatus, $search_status).'</td>';
 // Extra fields
@@ -327,6 +328,7 @@ print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "p.format", $param, "", ""
 print_liste_field_titre("Author", $_SERVER["PHP_SELF"], "u.".$fieldtosortuser, $param, "", "", $sortfield, $sortorder);
 print_liste_field_titre("NbOfVoters", $_SERVER["PHP_SELF"], "", $param, "", 'align="right"', $sortfield, $sortorder);
 print_liste_field_titre("ExpireDate", $_SERVER["PHP_SELF"], "p.date_fin", $param, "", 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre("DateLastModification", $_SERVER["PHP_SELF"], "p.tms", $param, "", 'align="center"', $sortfield, $sortorder);
 print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "p.status", $param, "", 'align="center"', $sortfield, $sortorder);
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -409,6 +411,10 @@ while ($i < min($num, $limit))
 	print '</td>';
 	if (!$i) $totalarray['nbfield']++;
 
+	print '<td class="center">'.dol_print_date($db->jdate($obj->tms), 'dayhour');
+	print '</td>';
+	if (!$i) $totalarray['nbfield']++;
+
 	print '<td class="center">'.$opensurvey_static->getLibStatut(5).'</td>'."\n";
 	if (!$i) $totalarray['nbfield']++;
 

From 485fe0fc62a4d452c429de2d68e4883692114013 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 8 Dec 2020 17:51:26 +0100
Subject: [PATCH 282/888] FIX Can receipt of a product that required lot after
 disabling stock and lot module

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

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 289d317abb7..3e76b2bb12a 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -240,7 +240,7 @@ if (empty($reshook))
 			$stockLocation = "ent1".$i."_0";
 	    	$qty = "qtyl".$i;
 
-			if ($objectsrc->lines[$i]->product_tobatch)      // If product need a batch number
+	    	if (!empty($conf->productbatch->enabled) && $objectsrc->lines[$i]->product_tobatch)      // If product need a batch number
 			{
 			    if (GETPOSTISSET($batch))
 			    {

From aaf1910c25c58ed1a3025cbced4a11a2df6e85ab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 8 Dec 2020 17:53:12 +0100
Subject: [PATCH 283/888] Fix stock amount can be a decimal

---
 htdocs/expedition/card.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index fd1e38e2438..5beeb013dbf 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -240,7 +240,7 @@ if (empty($reshook))
 			$stockLocation = "ent1".$i."_0";
 			$qty = "qtyl".$i;
 
-			if ($objectsrc->lines[$i]->product_tobatch)      // If product need a batch number
+			if (!empty($conf->productbatch->enabled) && $objectsrc->lines[$i]->product_tobatch)      // If product need a batch number
 			{
 				if (GETPOSTISSET($batch))
 				{
@@ -275,27 +275,26 @@ if (empty($reshook))
 						setEventMessages($langs->trans("StockIsRequiredToChooseWhichLotToUse"), null, 'errors');
 					}
 				}
-			} elseif (GETPOSTISSET($stockLocation))
-			{
+			} elseif (GETPOSTISSET($stockLocation)) {
 				//shipment line from multiple stock locations
 				$qty .= '_'.$j;
 				while (GETPOSTISSET($stockLocation))
 				{
 					// save sub line of warehouse
-					$stockLine[$i][$j]['qty'] = GETPOST($qty, 'int');
+					$stockLine[$i][$j]['qty'] = price2num(GETPOST($qty, 'alpha'), 'MS');
 					$stockLine[$i][$j]['warehouse_id'] = GETPOST($stockLocation, 'int');
 					$stockLine[$i][$j]['ix_l'] = GETPOST($idl, 'int');
 
-					$totalqty += GETPOST($qty, 'int');
+					$totalqty += price2num(GETPOST($qty, 'alpha'), 'MS');
 
 					$j++;
 					$stockLocation = "ent1".$i."_".$j;
 					$qty = "qtyl".$i.'_'.$j;
 				}
 			} else {
-				//var_dump(GETPOST($qty,'int')); var_dump($_POST); var_dump($batch);exit;
+				//var_dump(GETPOST($qty,'alpha')); var_dump($_POST); var_dump($batch);exit;
 				//shipment line for product with no batch management and no multiple stock location
-				if (GETPOST($qty, 'int') > 0) $totalqty += GETPOST($qty, 'int');
+				if (GETPOST($qty, 'int') > 0) $totalqty += price2num(GETPOST($qty, 'alpha'), 'MS');
 			}
 
 			// Extrafields

From 724d03c75487a3645920aade27ac985482cbe179 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 8 Dec 2020 19:26:24 +0100
Subject: [PATCH 284/888] NEW add hook "loginCheckSecurityAccess" (eg for
 external captcha)

---
 htdocs/main.inc.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 81f560d662c..d0c3b31672b 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -562,6 +562,13 @@ if (!defined('NOLOGIN'))
 			}
 		}
 
+		// Hooks for security access
+		$action = '';
+		$hookmanager->initHooks(array('loginsecurity'));
+		$parameters = array('dol_authmode'=>$dol_authmode);
+		$reshook = $hookmanager->executeHooks('loginCheckSecurityAccess', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
+		if ($reshook < 0) $error++;
+
 		// Verification security graphic code
 		if (GETPOST("username", "alpha", 2) && !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA) && !isset($_SESSION['dol_bypass_antispam']))
 		{

From 3836e5685affb361f420021373e1d6eefaf6a381 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 8 Dec 2020 19:30:40 +0100
Subject: [PATCH 285/888] FIX same context of others

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index d0c3b31672b..dd14455278f 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -564,7 +564,7 @@ if (!defined('NOLOGIN'))
 
 		// Hooks for security access
 		$action = '';
-		$hookmanager->initHooks(array('loginsecurity'));
+		$hookmanager->initHooks(array('login'));
 		$parameters = array('dol_authmode'=>$dol_authmode);
 		$reshook = $hookmanager->executeHooks('loginCheckSecurityAccess', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook < 0) $error++;

From bb6f23d81b4d6f26bca56425ace38324dde627bb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 8 Dec 2020 19:32:43 +0100
Subject: [PATCH 286/888] CSS

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

diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 45442e6170d..d3a2f23019f 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -360,7 +360,7 @@ if (count($typeleaves) == 0)
 		print '<td>';
 		if (!empty($user->rights->holiday->define_holiday))	// Allowed to set the balance of any user
 		{
-			print '<input type="submit" name="update_cp['.$users['rowid'].']" value="'.dol_escape_htmltag($langs->trans("Update")).'" class="button"/>';
+			print '<input type="submit" name="update_cp['.$users['rowid'].']" value="'.dol_escape_htmltag($langs->trans("Save")).'" class="button smallpaddingimp"/>';
 		}
 		print '</td>'."\n";
 		print '</tr>';

From 5b031473ffd3ae6c13f4e06a4c148ae09e1aec43 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 8 Dec 2020 20:06:33 +0100
Subject: [PATCH 287/888] Fix hide table if empty

---
 htdocs/projet/index.php | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 576bda7d09f..d0b4bb417f6 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -233,13 +233,14 @@ if ($resql)
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
-	print '<th colspan="4">'.$langs->trans("LatestModifiedProjects", $max).'</th></tr>';
+	print '<th colspan="4">'.$langs->trans("LatestModifiedProjects", $max).'</th>';
+	print '</tr>';
 
 	$num = $db->num_rows($resql);
+
 	if ($num)
 	{
 		$i = 0;
-		$var = true;
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($resql);
@@ -299,22 +300,16 @@ if ($resql)
 			print '</tr>';
 			$i++;
 		}
+	} else {
+		print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 	}
-	print "</table></div><br>";
+	print "</table></div>";
 } else dol_print_error($db);
 
 
 $companystatic = new Societe($db); // We need a clean new object for next loop because current one has some properties set.
 
 
-// Open project per thirdparty
-print '<div class="div-table-responsive-no-min">';
-print '<table class="noborder centpercent">';
-print '<tr class="liste_titre">';
-print_liste_field_titre("OpenedProjectsByThirdparties", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder);
-print_liste_field_titre("NbOfProjects", $_SERVER["PHP_SELF"], "nb", "", "", '', $sortfield, $sortorder, 'right ');
-print "</tr>\n";
-
 $sql = "SELECT COUNT(p.rowid) as nb, SUM(p.opp_amount)";
 $sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
 $sql .= ", s.code_client, s.code_compta, s.client";
@@ -338,6 +333,18 @@ if ($resql)
 	$i = 0;
 	$othernb = 0;
 
+	if ($num) {
+		print '<br>';
+
+		// Open project per thirdparty
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print_liste_field_titre("OpenedProjectsByThirdparties", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder);
+		print_liste_field_titre("NbOfProjects", $_SERVER["PHP_SELF"], "nb", "", "", '', $sortfield, $sortorder, 'right ');
+		print "</tr>\n";
+	}
+
 	while ($i < $num)
 	{
 		$obj = $db->fetch_object($resql);
@@ -391,12 +398,15 @@ if ($resql)
 		print "</tr>\n";
 	}
 
+	if ($num) {
+		print "</table>";
+		print '</div>';
+	}
+
 	$db->free($resql);
 } else {
 	dol_print_error($db);
 }
-print "</table>";
-print '</div>';
 
 if (empty($conf->global->PROJECT_HIDE_PROJECT_LIST_ON_PROJECT_AREA))
 {

From bfa813e1b0fa8a39e620470cc482dcca01cfde6a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 8 Dec 2020 20:16:41 +0100
Subject: [PATCH 288/888] Load langs

---
 htdocs/comm/action/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index a9e365534f3..510fa67dcdb 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -38,7 +38,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("users", "companies", "agenda", "commercial", "other"));
+$langs->loadLangs(array("users", "companies", "agenda", "commercial", "other", "orders", "bills"));
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');

From 769a8886b98fb4b13bd0c92995b35caa461f1e4a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 8 Dec 2020 20:32:37 +0100
Subject: [PATCH 289/888] Debug notification on events

---
 htdocs/comm/action/card.php           | 15 +++++++++------
 htdocs/core/class/html.form.class.php | 13 ++++++++-----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index f26ad2a36e2..5d284ce048a 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1251,12 +1251,12 @@ if ($action == 'create')
 
 		//Reminder Type
 		print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("ReminderType").'</td><td colspan="3">';
-		print $form->selectarray('selectremindertype', $TRemindTypes);
+		print $form->selectarray('selectremindertype', $TRemindTypes, '', 0, 0, 0, '', 0, 0, 0, '', 'mimnwidth200', 1);
 		print '</td></tr>';
 
 		//Mail Model
 		print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("EMailTemplates").'</td><td colspan="3">';
-		print $form->selectModelMail('actioncommsend', 'actioncomm_send', 1);
+		print $form->selectModelMail('actioncommsend', 'actioncomm_send', 1, 1);
 		print '</td></tr>';
 
 
@@ -1719,10 +1719,12 @@ if ($id > 0)
 				$actionCommReminder->typeremind = 'email';
 			}
 
-			print '<tr><td>'.$langs->trans("AddReminder").'</td><td colspan="3"><input type="checkbox" id="addreminder" name="addreminder" '.$checked.'></td></tr>';
+			print '<label for="addreminder">'.$langs->trans("AddReminder").'</label> <input type="checkbox" id="addreminder" name="addreminder" '.$checked.'><br>';
 
 			print '<div class="reminderparameters" '.(empty($checked) ? 'style="display: none;"' : '').'>';
 
+			print '<br>';
+
 			print '<table class="border centpercent">';
 
 			// Reminder
@@ -1731,9 +1733,8 @@ if ($id > 0)
 			print '</td></tr>';
 
 			// Reminder Type
-			$TRemindTypes = array();
 			print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("ReminderType").'</td><td colspan="3">';
-			print $form->selectarray('selectremindertype', $TRemindTypes, $actionCommReminder->typeremind);
+			print $form->selectarray('selectremindertype', $TRemindTypes, $actionCommReminder->typeremind, 0, 0, 0, '', 0, 0, 0, '', 'minwidth200', 1);
 			print '</td></tr>';
 
 			$hide = '';
@@ -1741,7 +1742,7 @@ if ($id > 0)
 
 			// Mail Model
 			print '<tr '.$hide.'><td class="titlefieldcreate nowrap">'.$langs->trans("EMailTemplates").'</td><td colspan="3">';
-			print $form->selectModelMail('actioncommsend', 'actioncomm_send', 1);
+			print $form->selectModelMail('actioncommsend', 'actioncomm_send', 1, 1);
 			print '</td></tr>';
 
 			print '</table>';
@@ -1767,6 +1768,8 @@ if ($id > 0)
 
                    })';
 			print '</script>'."\n";
+
+			print '</div>';		// End of div for reminderparameters
 		}
 
 		print dol_get_fiche_end();
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 8a125f65f86..8faad1f92e9 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8234,12 +8234,13 @@ class Form
 	/**
 	 * selectModelMail
 	 *
-	 * @param   string   $prefix     Prefix
-	 * @param   string   $modelType  Model type
-	 * @param	int		 $default	 1=Show also Default mail template
-	 * @return  string               HTML select string
+	 * @param   string   $prefix     	Prefix
+	 * @param   string   $modelType  	Model type
+	 * @param	int		 $default	 	1=Show also Default mail template
+	 * @param	int		 $addjscombo	Add js combobox
+	 * @return  string               	HTML select string
 	 */
-	public function selectModelMail($prefix, $modelType = '', $default = 0)
+	public function selectModelMail($prefix, $modelType = '', $default = 0, $addjscombo = 0)
 	{
 		global $langs, $db, $user;
 
@@ -8267,6 +8268,8 @@ class Form
 
 		$retstring .= "</select>";
 
+		if ($addjscombo) $retstring .= ajax_combobox('select_'.$prefix.'model_mail');
+
 		return $retstring;
 	}
 }

From c26efd756ff37f2b25987e90dd809b372b50343b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 8 Dec 2020 20:53:42 +0100
Subject: [PATCH 290/888] FIX #15704 #15565 #15694

---
 htdocs/core/lib/ajax.lib.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 10fa477600a..5bcf73ca896 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -68,6 +68,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
 					$("input#search_'.$htmlname.'").keydown(function(e) {
 						if (e.keyCode != 9)		/* If not "Tab" key */
 						{
+							if (e.keyCode == 13) { return false; } /* disable "ENTER" key useful for barcode readers */
 							console.log("Clear id previously selected for field '.$htmlname.'");
 							$("#'.$htmlname.'").val("");
 						}

From 70b772cf749bc01ad7e19bc1f9dc974342dec51a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 8 Dec 2020 21:56:12 +0100
Subject: [PATCH 291/888] Kit must show details on PDF.

---
 htdocs/core/lib/pdf.lib.php            | 31 ++++++++++++++++++++------
 htdocs/product/class/product.class.php | 20 +++++++++--------
 2 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 822fcdcd44b..e6637c59549 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1253,7 +1253,9 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			// If we want another language, and if label is same than default language (we did force it to a specific value), we can use translation.
 			//var_dump($outputlangs->defaultlang.' - '.$langs->defaultlang.' - '.$label.' - '.$prodser->label);exit;
 			$textwasmodified = ($label == $prodser->label);
-			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && ($textwasmodified || $translatealsoifmodified))     $label = $prodser->multilangs[$outputlangs->defaultlang]["label"];
+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && ($textwasmodified || $translatealsoifmodified)) {
+				$label = $prodser->multilangs[$outputlangs->defaultlang]["label"];
+			}
 
 			// Set desc
 			// Manage HTML entities description test because $prodser->description is store with htmlentities but $desc no
@@ -1281,6 +1283,17 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		$libelleproduitservice = '<b>'.$libelleproduitservice.'</b>';
 	}
 
+	// Add ref of subproducts
+	if (!empty($conf->global->SHOW_SUBPRODUCT_REF_IN_PDF)) {
+		$prodser->get_sousproduits_arbo();
+		if (!empty($prodser->sousprods) && is_array($prodser->sousprods) && count($prodser->sousprods)) {
+			$tmparrayofsubproducts = reset($prodser->sousprods);
+			foreach($tmparrayofsubproducts as $subprodval) {
+				$libelleproduitservice .= "\n * ".$subprodval[5].(($subprodval[5] && $subprodval[3]) ? ' - ' : '').$subprodval[3].' ('.$subprodval[1].')';
+			}
+		}
+	}
+
 	// Description long of product line
 	if (!empty($desc) && ($desc != $label))
 	{
@@ -1314,12 +1327,16 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			$discount->fetch($object->lines[$i]->fk_remise_except);
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid", $discount->ref_invoice_supplier_source);
 		} else {
-			if ($idprod)
-			{
-				if (empty($hidedesc))
-				{
-					if (!empty($conf->global->MAIN_DOCUMENTS_DESCRIPTION_FIRST))
-					{
+			if ($idprod) {
+				// Check if description must be output
+				if (!empty($object->element)) {
+					$tmpkey = 'MAIN_DOCUMENTS_HIDE_DESCRIPTION_FOR_'.strtoupper($object->element);
+					if (!empty($conf->global->$tmpkey)) {
+						$hidedesc = 1;
+					}
+				}
+				if (empty($hidedesc)) {
+					if (!empty($conf->global->MAIN_DOCUMENTS_DESCRIPTION_FIRST)) {
 						$libelleproduitservice = $desc."\n".$libelleproduitservice;
 					} else {
 						if (!empty($conf->global->HIDE_LABEL_VARIANT_PDF) && $prodser->isVariant()) {
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index e17e8bbea7b..6505741d5a2 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4358,18 +4358,19 @@ class Product extends CommonObject
 	/**
 	 *  Return childs of product $id
 	 *
-	 * @param  int $id             Id of product to search childs of
-	 * @param  int $firstlevelonly Return only direct child
-	 * @param  int $level          Level of recursing call (start to 1)
-	 * @return array                       Return array(prodid=>array(0=prodid, 1=>qty, 2=> ...)
+	 * @param  int $id             		Id of product to search childs of
+	 * @param  int $firstlevelonly 		Return only direct child
+	 * @param  int $level          		Level of recursing call (start to 1)
+	 * @return array                    Return array(prodid=>array(0=prodid, 1=>qty, 2=>product type, 3=>label, 4=>incdec, 5=>product ref)
 	 */
 	public function getChildsArbo($id, $firstlevelonly = 0, $level = 1)
 	{
 		global $alreadyfound;
 
-		$sql = "SELECT p.rowid, p.label as label, pa.qty as qty, pa.fk_product_fils as id, p.fk_product_type, pa.incdec";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
-		$sql .= ", ".MAIN_DB_PREFIX."product_association as pa";
+		$sql = "SELECT p.rowid, p.ref, p.label as label, p.fk_product_type,";
+		$sql .= " pa.qty as qty, pa.fk_product_fils as id, pa.incdec";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product as p,";
+		$sql .= " ".MAIN_DB_PREFIX."product_association as pa";
 		$sql .= " WHERE p.rowid = pa.fk_product_fils";
 		$sql .= " AND pa.fk_product_pere = ".$id;
 		$sql .= " AND pa.fk_product_fils != ".$id; // This should not happens, it is to avoid infinite loop if it happens
@@ -4397,7 +4398,8 @@ class Product extends CommonObject
 				 1=>$rec['qty'],
 				 2=>$rec['fk_product_type'],
 				 3=>$this->db->escape($rec['label']),
-				 4=>$rec['incdec']
+				 4=>$rec['incdec'],
+				 5=>$rec['ref']
 				);
 				//$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty'],2=>$rec['fk_product_type']);
 				//$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty']);
@@ -4419,7 +4421,7 @@ class Product extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *     Return tree of all subproducts for product. Tree contains id, name and quantity.
+	 *     Return tree of all subproducts for product. Tree contains array of array(0=prodid, 1=>qty, 2=>product type, 3=>label, 4=>incdec, 5=>product ref)
 	 *     Set this->sousprods
 	 *
 	 * @return void

From e987e6e09369b83ed70993c48c522c60ea34af9e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 8 Dec 2020 22:16:38 +0100
Subject: [PATCH 292/888] Context for hook showSocinfoOnPrint has been moved
 from "showsocinfoonprint" to "main"

---
 ChangeLog           | 2 +-
 htdocs/main.inc.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 782528daae8..af36d13e56a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -246,7 +246,7 @@ Following changes may create regressions for some external modules, but were nec
 * The method select_thirdparty(), deprecated since 3.8, into html.form.class.php has been removed.
 * Depreciate all methods with name ->valide(). Use instead methods ->validate().
 * Function showStripePaymentUrl, getStripePaymentUrl, showPaypalPaymentUrl and getPaypalPaymentUrl has been removed. The generic one showOnlinePaymentUrl and getOnlinePaymentUrl are always used.
-
+* Context for hook showSocinfoOnPrint has been moved from "showsocinfoonprint" to "main"
 
 ***** ChangeLog for 12.0.3 compared to 12.0.2 *****
 FIX: 10.0 - when the mime file name is different from the filesystem name, the attachment name should be the mime filename
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 81f560d662c..18c49b76881 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1591,7 +1591,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 	$searchform = '';
 	$bookmarks = '';
 
-	// Instantiate hooks of thirdparty module
+	// Instantiate hooks for external modules
 	$hookmanager->initHooks(array('toprightmenu'));
 
 	$toprightmenu = '';
@@ -2429,7 +2429,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 
 	if (empty($conf->dol_hide_leftmenu) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU')))
 	{
-		// Instantiate hooks of thirdparty module
+		// Instantiate hooks for external modules
 		$hookmanager->initHooks(array('searchform', 'leftblock'));
 
 		print "\n".'<!-- Begin side-nav id-left -->'."\n".'<div class="side-nav"><div id="id-left">'."\n";
@@ -2617,11 +2617,11 @@ function main_area($title = '')
 
 	if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED), 0, 0, 1, 'warning maintenancemode');
 
-	// Permit to add user company information on each printed document by set SHOW_SOCINFO_ON_PRINT
+	// Permit to add user company information on each printed document by setting SHOW_SOCINFO_ON_PRINT
 	if (!empty($conf->global->SHOW_SOCINFO_ON_PRINT) && GETPOST('optioncss', 'aZ09') == 'print' && empty(GETPOST('disable_show_socinfo_on_print', 'az09')))
 	{
 		global $hookmanager;
-		$hookmanager->initHooks(array('showsocinfoonprint'));
+		$hookmanager->initHooks(array('main'));
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('showSocinfoOnPrint', $parameters);
 		if (empty($reshook))

From 75b8794d72d529e219434a1554805c4715f89228 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 8 Dec 2020 22:23:24 +0100
Subject: [PATCH 293/888] Fix column must be NULL

---
 htdocs/install/mysql/migration/11.0.0-12.0.0.sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index fddfb8c8097..425e47d3251 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -341,6 +341,9 @@ ALTER TABLE llx_expedition ADD COLUMN billed smallint    DEFAULT 0;
 ALTER TABLE llx_commande_fournisseurdet ADD INDEX idx_commande_fournisseurdet_fk_commande (fk_commande);
 ALTER TABLE llx_commande_fournisseurdet ADD INDEX idx_commande_fournisseurdet_fk_product (fk_product);
 
+
+-- VMYSQL4.3 ALTER TABLE llx_c_shipment_mode MODIFY COLUMN tracking varchar(255) NULL;
+
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (9,'INPERSON', 'In person at your site', NULL, NULL, 0);
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (10,'FEDEX', 'Fedex', NULL, 'https://www.fedex.com/apps/fedextrack/index.html?tracknumbers={TRACKID}', 0);
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (11,'TNT', 'TNT', NULL, 'https://www.tnt.com/express/fr_fr/site/outils-expedition/suivi.html?searchType=con&cons=={TRACKID}', 0);

From 2429cbe7caf4bf560ffc18a1cfbabecfa2cb24f7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 8 Dec 2020 23:08:47 +0100
Subject: [PATCH 294/888] Update doc

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index af36d13e56a..87535abffce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -226,7 +226,7 @@ NEW: add hooks on newpayment page to allow external payment modules
 NEW: add hooks on stats pages
 NEW: add formConfirm hook on product page
 NEW: add two hooks printFieldListFrom and printFieldSearchParam
-
+NEW: add hook "loginCheckSecurityAccess"
 
 WARNING:
 

From 37193557dfc97b62d645fcc02b811e4dedd4e317 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 9 Dec 2020 08:36:52 +0100
Subject: [PATCH 295/888] FIX rename hook to be more explicit and $test = false

---
 htdocs/main.inc.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 2753a4e1fc8..1b6179fdc81 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -565,12 +565,15 @@ if (!defined('NOLOGIN'))
 		// Hooks for security access
 		$action = '';
 		$hookmanager->initHooks(array('login'));
-		$parameters = array('dol_authmode'=>$dol_authmode);
-		$reshook = $hookmanager->executeHooks('loginCheckSecurityAccess', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook < 0) $error++;
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('beforeLoginAuthentication', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
+		if ($reshook < 0) {
+		    $test = false;
+		    $error++;
+		}
 
 		// Verification security graphic code
-		if (GETPOST("username", "alpha", 2) && !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA) && !isset($_SESSION['dol_bypass_antispam']))
+		if ($test && GETPOST("username", "alpha", 2) && !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA) && !isset($_SESSION['dol_bypass_antispam']))
 		{
 			$sessionkey = 'dol_antispam_value';
 			$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));

From c18e8ac3173169f31c334f7e42a93d74eb333d97 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 9 Dec 2020 09:28:46 +0100
Subject: [PATCH 296/888] FIX regenerate mycompany logos thumbs if not exists

---
 htdocs/admin/company.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 51d7f84aae7..da955a67ea4 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -478,6 +478,14 @@ if (!empty($mysoc->logo_small)) {
 		print '<div class="inline-block valignmiddle">';
 		print '<img style="max-height: 80px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small).'">';
 		print '</div>';
+	} elseif (!empty($mysoc->logo)) {
+	    if (!file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) {
+	        $imgThumbMini = vignette($conf->mycompany->dir_output.'/logos/'.$mysoc->logo, $maxwidthmini, $maxheightmini, '_mini', $quality);
+	    }
+	    $imgThumbSmall = vignette($conf->mycompany->dir_output.'/logos/'.$mysoc->logo, $maxwidthmini, $maxheightmini, '_small', $quality);
+	    print '<div class="inline-block valignmiddle">';
+	    print '<img style="max-height: 80px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.basename($imgThumbSmall)).'">';
+	    print '</div>';
 	}
 	print '<div class="inline-block valignmiddle marginrightonly"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogo">'.img_delete($langs->trans("Delete"), '', 'marginleftonly').'</a></div>';
 } elseif (!empty($mysoc->logo)) {
@@ -505,6 +513,14 @@ if (!empty($mysoc->logo_squarred_small)) {
 		print '<div class="inline-block valignmiddle marginrightonly">';
 		print '<img style="max-height: 80px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_small).'">';
 		print '</div>';
+	} elseif (!empty($mysoc->logo_squarred)) {
+	    if (!file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini)) {
+	        $imgThumbMini = vignette($conf->mycompany->dir_output.'/logos/'.$mysoc->logo_squarred, $maxwidthmini, $maxheightmini, '_mini', $quality);
+	    }
+	    $imgThumbSmall = vignette($conf->mycompany->dir_output.'/logos/'.$mysoc->logo_squarred, $maxwidthmini, $maxheightmini, '_small', $quality);
+	    print '<div class="inline-block valignmiddle">';
+	    print '<img style="max-height: 80px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.basename($imgThumbSmall)).'">';
+	    print '</div>';
 	}
 	print '<div class="inline-block valignmiddle marginrightonly"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogosquarred">'.img_delete($langs->trans("Delete"), '', 'marginleftonly').'</a></div>';
 } elseif (!empty($mysoc->logo_squarred)) {

From 29b682d8109161356899b37a9752f3c7a93e0ead Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 9 Dec 2020 10:35:30 +0100
Subject: [PATCH 297/888] fix extrafield checkbox from table
 (#CroudFounding_DarkJeff_2021)

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

diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
index 2b5b38441e0..7ba4d7d64b9 100644
--- a/htdocs/core/actions_extrafields.inc.php
+++ b/htdocs/core/actions_extrafields.inc.php
@@ -159,7 +159,7 @@ if ($action == 'add')
 				$parameters = $param;
 				$parameters_array = explode("\r\n", $parameters);
 				//In sellist we have only one line and it can have come to do SQL expression
-				if ($type == 'sellist') {
+				if ($type == 'sellist' || $type == 'chkbxlst') {
 					foreach ($parameters_array as $param_ligne)
 					{
 						$params['options'] = array($parameters=>null);
@@ -338,7 +338,7 @@ if ($action == 'update')
 				$parameters = $param;
 				$parameters_array = explode("\r\n", $parameters);
 				//In sellist we have only one line and it can have come to do SQL expression
-				if ($type == 'sellist') {
+				if ($type == 'sellist' || $type == 'chkbxlst') {
 					foreach ($parameters_array as $param_ligne)
 					{
 						$params['options'] = array($parameters=>null);

From 7459607eb9beb41c0e120eff701e09f2f79a71a3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Dec 2020 12:23:37 +0100
Subject: [PATCH 298/888] Look fix

---
 htdocs/public/opensurvey/studs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index 95045d2e943..8cc9a82ad3c 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -729,7 +729,7 @@ if ($comments)
 
 // Form to add comment
 if ($object->allow_comments) {
-	print '<div class="addcomment"><span class="opacitymedium">'.$langs->trans("AddACommentForPoll")."</span><br>\n";
+	print '<br><div class="addcomment"><span class="opacitymedium">'.$langs->trans("AddACommentForPoll")."</span><br>\n";
 
 	print '<textarea name="comment" rows="'.ROWS_2.'" class="quatrevingtpercent">'.dol_escape_htmltag(GETPOST('comment', 'restricthtml'), 0, 1).'</textarea><br>'."\n";
 	print $langs->trans("Name").': ';

From 89828c18d157602761192b03584c8427a1f9091c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Dec 2020 12:32:21 +0100
Subject: [PATCH 299/888] CSS

---
 htdocs/public/opensurvey/studs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index 8cc9a82ad3c..3f19fb68b7e 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -535,7 +535,7 @@ while ($compteur < $num)
 	// Button edit at end of line
 	if ($compteur != $ligneamodifier && $mod_ok)
 	{
-		print '<td class="casevide"><input type="submit" class="button" name="modifierligne'.$compteur.'" value="'.dol_escape_htmltag($langs->trans("Edit")).'"></td>'."\n";
+		print '<td class="casevide"><input type="submit" class="button smallpaddingimp" name="modifierligne'.$compteur.'" value="'.dol_escape_htmltag($langs->trans("Edit")).'"></td>'."\n";
 	}
 
 	//demande de confirmation pour modification de ligne

From d7434ce97ab8c26925498138e150efa5b010ef93 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Dec 2020 12:42:21 +0100
Subject: [PATCH 300/888] Fix css

---
 htdocs/theme/eldy/global.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index fcd196ff122..b0ddba41b5c 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -4613,7 +4613,7 @@ table.cal_event td.cal_event_right { padding: 4px 4px !important; }
 .cal_event a:link       { color: #111111; font-weight: normal !important; }
 .cal_event a:visited    { color: #111111; font-weight: normal !important; }
 .cal_event a:active     { color: #111111; font-weight: normal !important; }
-.cal_event_notbusy a.cal_event_title:hover { color: #111111; font-weight: normal !important; color:rgba(255,255,255,.75); }
+.cal_event_notbusy a.cal_event_title:hover { color: #111111; font-weight: normal !important; }
 .cal_event_busy      { }
 .cal_peruserviewname { max-width: 140px; height: 30px !important; }
 .cal_event span.badge.badge-status { border: 1px solid #aaa; }

From 83286d99be429a53eaf116d69efc3308ca860bd1 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Wed, 9 Dec 2020 13:31:14 +0100
Subject: [PATCH 301/888] funnel horizontal bar

---
 .../core/boxes/box_funnel_of_prospection.php  |  18 +-
 htdocs/core/class/dolgraph.class.php          | 401 +++++++++---------
 2 files changed, 215 insertions(+), 204 deletions(-)

diff --git a/htdocs/core/boxes/box_funnel_of_prospection.php b/htdocs/core/boxes/box_funnel_of_prospection.php
index c4cebfcf68a..34b892d142b 100644
--- a/htdocs/core/boxes/box_funnel_of_prospection.php
+++ b/htdocs/core/boxes/box_funnel_of_prospection.php
@@ -81,6 +81,8 @@ class box_funnel_of_prospection extends ModeleBoxes
 		$sql = "SELECT cls.rowid, cls.code, cls.percent, cls.label";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "c_lead_status as cls";
 		$sql .= " WHERE active=1";
+		$sql .= " Order by cls.rowid";
+		$sql .= " AND cls.code != 'LOST'";
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -108,7 +110,6 @@ class box_funnel_of_prospection extends ModeleBoxes
 						$colorseriesstat[$objp->rowid] = $badgeStatus6;
 						break;
 					default:
-						$colorseriesstat[$objp->rowid] = $badgeStatus2;
 						break;
 				}
 				$i++;
@@ -167,14 +168,16 @@ class box_funnel_of_prospection extends ModeleBoxes
 				$stringtoprint = '';
 				$stringtoprint .= '<div class="div-table-responsive-no-min ">';
 				$listofstatus = array_keys($listofoppstatus);
+				$liststatus = array();
+				$data = array('');
 				foreach ($listofstatus as $status) {
 					$labelStatus = '';
 					if ($status != 7) {
 						$code = dol_getIdFromCode($this->db, $status, 'c_lead_status', 'rowid', 'code');
 						if ($code) $labelStatus = $langs->transnoentitiesnoconv("OppStatus" . $code);
 						if (empty($labelStatus)) $labelStatus = $listofopplabel[$status];
-
-						$dataseries[] = array($labelStatus,(isset($valsamount[$status]) ? (float) $valsamount[$status] : 0));
+						$liststatus[] = $labelStatus;
+						$data[] = (isset($valsamount[$status]) ? (float) $valsamount[$status] : 0);
 						if (!$conf->use_javascript_ajax) {
 							$stringtoprint .= '<tr class="oddeven">';
 							$stringtoprint .= '<td>' . $labelStatus . '</td>';
@@ -183,16 +186,21 @@ class box_funnel_of_prospection extends ModeleBoxes
 						}
 					}
 				}
+				$dataseries[] = $data;
 				if ($conf->use_javascript_ajax) {
 					include_once DOL_DOCUMENT_ROOT . '/core/class/dolgraph.class.php';
 					$dolgraph = new DolGraph();
+					$dolgraph->SetMinValue(0);
 					$dolgraph->SetData($dataseries);
+					$dolgraph->SetLegend($liststatus);
 					$dolgraph->SetDataColor(array_values($colorseriesstat));
-					//$dolgraph->SetLegend(array('PROSP',$dataseries['PROSP']));
 					$dolgraph->setShowLegend(2);
 					$dolgraph->setShowPercent(1);
-					$dolgraph->SetType(array('pie'));
+					$dolgraph->setTitle('FunnelOfProspection');
+					$dolgraph->SetType(array('horizontalbars'));
 					$dolgraph->SetHeight('200');
+					$dolgraph->SetWidth('600');
+					$dolgraph->mode='depth';
 					$dolgraph->draw('idgraphstatus');
 					$stringtoprint .= $dolgraph->show($totaloppnb ? 0 : 1);
 				}
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 80314bcf9ed..ccce9cb1e12 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -103,9 +103,8 @@ class DolGraph
 		$this->datacolor = array(array(120, 130, 150), array(160, 160, 180), array(190, 190, 220));
 		$this->bgcolor = array(235, 235, 224);
 
-		$color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
-		if (is_readable($color_file))
-		{
+		$color_file = DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php';
+		if (is_readable($color_file)) {
 			include_once $color_file;
 			if (isset($theme_bordercolor)) $this->bordercolor = $theme_bordercolor;
 			if (isset($theme_datacolor))   $this->datacolor   = $theme_datacolor;
@@ -261,7 +260,7 @@ class DolGraph
 	 * Set type
 	 *
 	 * @param 	array	$type		Array with type for each serie. Example: array('type1', 'type2', ...) where type can be:
-	 * 								'pie', 'piesemicircle', 'polar', 'lines', 'linesnopoint', 'bars', 'horirontalbars'...
+	 * 								'pie', 'piesemicircle', 'polar', 'lines', 'linesnopoint', 'bars', 'horizontalbars'...
 	 * @return	void
 	 */
 	public function SetType($type)
@@ -466,10 +465,8 @@ class DolGraph
 		// phpcs:enable
 		global $theme_bgcolor, $theme_bgcoloronglet;
 
-		if (!is_array($bg_color))
-		{
-			if ($bg_color == 'onglet')
-			{
+		if (!is_array($bg_color)) {
+			if ($bg_color == 'onglet') {
 				//print 'ee'.join(',',$theme_bgcoloronglet);
 				$this->bgcolor = $theme_bgcoloronglet;
 			} else {
@@ -492,10 +489,8 @@ class DolGraph
 		// phpcs:enable
 		global $theme_bgcolor, $theme_bgcoloronglet;
 
-		if (!is_array($bg_colorgrid))
-		{
-			if ($bg_colorgrid == 'onglet')
-			{
+		if (!is_array($bg_colorgrid)) {
+			if ($bg_colorgrid == 'onglet') {
 				//print 'ee'.join(',',$theme_bgcoloronglet);
 				$this->bgcolorgrid = $theme_bgcoloronglet;
 			} else {
@@ -535,10 +530,8 @@ class DolGraph
 		$nblines = count($this->data);
 		$nbvalues = (empty($this->data[0]) ? 0 : count($this->data[0]) - 1);
 
-		for ($j = 0; $j < $nblines; $j++)
-		{
-			for ($i = 0; $i < $nbvalues; $i++)
-			{
+		for ($j = 0; $j < $nblines; $j++) {
+			for ($i = 0; $i < $nbvalues; $i++) {
 				$vals[$k] = $this->data[$j][$i + 1];
 				$k++;
 			}
@@ -564,10 +557,8 @@ class DolGraph
 		$nblines = count($this->data);
 		$nbvalues = (empty($this->data[0]) ? 0 : count($this->data[0]) - 1);
 
-		for ($j = 0; $j < $nblines; $j++)
-		{
-			for ($i = 0; $i < $nbvalues; $i++)
-			{
+		for ($j = 0; $j < $nblines; $j++) {
+			for ($i = 0; $i < $nbvalues; $i++) {
 				$vals[$k] = $this->data[$j][$i + 1];
 				$k++;
 			}
@@ -589,8 +580,7 @@ class DolGraph
 		if ($max != 0) $max++;
 		$size = dol_strlen(abs(ceil($max)));
 		$factor = 1;
-		for ($i = 0; $i < ($size - 1); $i++)
-		{
+		for ($i = 0; $i < ($size - 1); $i++) {
 			$factor *= 10;
 		}
 
@@ -615,8 +605,7 @@ class DolGraph
 		if ($min != 0) $min--;
 		$size = dol_strlen(abs(floor($min)));
 		$factor = 1;
-		for ($i = 0; $i < ($size - 1); $i++)
-		{
+		for ($i = 0; $i < ($size - 1); $i++) {
 			$factor *= 10;
 		}
 
@@ -635,24 +624,21 @@ class DolGraph
 	 */
 	public function draw($file, $fileurl = '')
 	{
-		if (empty($file))
-		{
+		if (empty($file)) {
 			$this->error = "Call to draw method was made with empty value for parameter file.";
-			dol_syslog(get_class($this)."::draw ".$this->error, LOG_ERR);
+			dol_syslog(get_class($this) . "::draw " . $this->error, LOG_ERR);
 			return -2;
 		}
-		if (!is_array($this->data))
-		{
+		if (!is_array($this->data)) {
 			$this->error = "Call to draw method was made but SetData was not called or called with an empty dataset for parameters";
-			dol_syslog(get_class($this)."::draw ".$this->error, LOG_ERR);
+			dol_syslog(get_class($this) . "::draw " . $this->error, LOG_ERR);
 			return -1;
 		}
-		if (count($this->data) < 1)
-		{
+		if (count($this->data) < 1) {
 			$this->error = "Call to draw method was made but SetData was is an empty dataset";
-			dol_syslog(get_class($this)."::draw ".$this->error, LOG_WARNING);
+			dol_syslog(get_class($this) . "::draw " . $this->error, LOG_WARNING);
 		}
-		$call = "draw_".$this->_library;
+		$call = "draw_" . $this->_library;
 		call_user_func_array(array($this, $call), array($file, $fileurl));
 	}
 
@@ -678,10 +664,9 @@ class DolGraph
 		// phpcs:enable
 		global $conf, $langs;
 
-		dol_syslog(get_class($this)."::draw_jflot this->type=".join(',', $this->type)." this->MaxValue=".$this->MaxValue);
+		dol_syslog(get_class($this) . "::draw_jflot this->type=" . join(',', $this->type) . " this->MaxValue=" . $this->MaxValue);
 
-		if (empty($this->width) && empty($this->height))
-		{
+		if (empty($this->width) && empty($this->height)) {
 			print 'Error width or height not set';
 			return;
 		}
@@ -701,7 +686,7 @@ class DolGraph
 		while ($i < $nblot)	// Loop on each serie
 		{
 			$values = array(); // Array with horizontal y values (specific values of a serie) for each abscisse x
-			$serie[$i] = "var d".$i." = [];\n";
+			$serie[$i] = "var d" . $i . " = [];\n";
 
 			// Fill array $values
 			$x = 0;
@@ -712,14 +697,13 @@ class DolGraph
 				$x++;
 			}
 
-			if (isset($this->type[$firstlot]) && in_array($this->type[$firstlot], array('pie', 'piesemicircle', 'polar')))
-			{
+			if (isset($this->type[$firstlot]) && in_array($this->type[$firstlot], array('pie', 'piesemicircle', 'polar'))) {
 				foreach ($values as $x => $y) {
-					if (isset($y)) $serie[$i] .= 'd'.$i.'.push({"label":"'.dol_escape_js($legends[$x]).'", "data":'.$y.'});'."\n";
+					if (isset($y)) $serie[$i] .= 'd' . $i . '.push({"label":"' . dol_escape_js($legends[$x]) . '", "data":' . $y . '});' . "\n";
 				}
 			} else {
 				foreach ($values as $x => $y) {
-					if (isset($y)) $serie[$i] .= 'd'.$i.'.push(['.$x.', '.$y.']);'."\n";
+					if (isset($y)) $serie[$i] .= 'd' . $i . '.push([' . $x . ', ' . $y . ']);' . "\n";
 				}
 			}
 
@@ -728,43 +712,39 @@ class DolGraph
 		}
 		$tag = dol_escape_htmltag(dol_string_unaccent(dol_string_nospecial(basename($file), '_', array('-', '.'))));
 
-		$this->stringtoshow = '<!-- Build using jflot -->'."\n";
-		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>';
-			$this->stringtoshow .= '<div class="nographyettext margintoponly">'.$langs->trans("NotEnoughDataYet").'...</div>';
+		$this->stringtoshow = '<!-- Build using jflot -->' . "\n";
+		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>';
+			$this->stringtoshow .= '<div class="nographyettext margintoponly">' . $langs->trans("NotEnoughDataYet") . '...</div>';
 			return;
 		}
 
 		// Start the div that will contains all the graph
 		$dolxaxisvertical = '';
 		if (count($this->data) > 20) $dolxaxisvertical = 'dol-xaxis-vertical';
-		$this->stringtoshow .= '<div id="placeholder_'.$tag.'" style="width:'.$this->width.'px;height:'.$this->height.'px;" class="dolgraph'.(empty($dolxaxisvertical) ? '' : ' '.$dolxaxisvertical).(empty($this->cssprefix) ? '' : ' dolgraph'.$this->cssprefix).' center"></div>'."\n";
+		$this->stringtoshow .= '<div id="placeholder_' . $tag . '" style="width:' . $this->width . 'px;height:' . $this->height . 'px;" class="dolgraph' . (empty($dolxaxisvertical) ? '' : ' ' . $dolxaxisvertical) . (empty($this->cssprefix) ? '' : ' dolgraph' . $this->cssprefix) . ' center"></div>' . "\n";
 
-		$this->stringtoshow .= '<script id="'.$tag.'">'."\n";
-		$this->stringtoshow .= '$(function () {'."\n";
+		$this->stringtoshow .= '<script id="' . $tag . '">' . "\n";
+		$this->stringtoshow .= '$(function () {' . "\n";
 		$i = $firstlot;
-		if ($nblot < 0)
-		{
-			$this->stringtoshow .= '<!-- No series of data -->'."\n";
+		if ($nblot < 0) {
+			$this->stringtoshow .= '<!-- No series of data -->' . "\n";
 		} else {
-			while ($i < $nblot)
-			{
-				$this->stringtoshow .= '<!-- Serie '.$i.' -->'."\n";
-				$this->stringtoshow .= $serie[$i]."\n";
+			while ($i < $nblot) {
+				$this->stringtoshow .= '<!-- Serie ' . $i . ' -->' . "\n";
+				$this->stringtoshow .= $serie[$i] . "\n";
 				$i++;
 			}
 		}
 		$this->stringtoshow .= "\n";
 
 		// Special case for Graph of type 'pie'
-		if (isset($this->type[$firstlot]) && in_array($this->type[$firstlot], array('pie', 'piesemicircle', 'polar')))
-		{
+		if (isset($this->type[$firstlot]) && in_array($this->type[$firstlot], array('pie', 'piesemicircle', 'polar'))) {
 			$datacolor = array();
 			foreach ($this->datacolor as $val) {
-				if (is_array($val)) $datacolor[] = "#".sprintf("%02x%02x%02x", $val[0], $val[1], $val[2]); // If datacolor is array(R, G, B)
-				else $datacolor[] = "#".str_replace(array('#', '-'), '', $val); // If $val is '124' or '#124'
+				if (is_array($val)) $datacolor[] = "#" . sprintf("%02x%02x%02x", $val[0], $val[1], $val[2]); // If datacolor is array(R, G, B)
+				else $datacolor[] = "#" . str_replace(array('#', '-'), '', $val); // If $val is '124' or '#124'
 			}
 
 			$urltemp = ''; // TODO Add support for url link into labels
@@ -773,17 +753,17 @@ class DolGraph
 			$showpercent = $this->showpercent;
 
 			$this->stringtoshow .= '
-			function plotWithOptions_'.$tag.'() {
-			$.plot($("#placeholder_'.$tag.'"), d0,
+			function plotWithOptions_' . $tag . '() {
+			$.plot($("#placeholder_' . $tag . '"), d0,
 			{
 				series: {
 					pie: {
 						show: true,
 						radius: 0.8,
-						'.($this->combine ? '
+						' . ($this->combine ? '
 						combine: {
-						 	threshold: '.$this->combine.'
-						},' : '').'
+						 	threshold: ' . $this->combine . '
+						},' : '') . '
 						label: {
 							show: true,
 							radius: 0.9,
@@ -791,15 +771,15 @@ class DolGraph
 								var percent=Math.round(series.percent);
 								var number=series.data[0][1];
 								return \'';
-								$this->stringtoshow .= '<span style="font-size:8pt;text-align:center;padding:2px;color:black;">';
-								if ($urltemp) $this->stringtoshow .= '<a style="color: #FFFFFF;" border="0" href="'.$urltemp.'">';
-								$this->stringtoshow .= '\'+';
-								$this->stringtoshow .= ($showlegend ? '' : 'label+\' \'+'); // Hide label if already shown in legend
-								$this->stringtoshow .= ($showpointvalue ? 'number+' : '');
-								$this->stringtoshow .= ($showpercent ? '\'<br/>\'+percent+\'%\'+' : '');
-								$this->stringtoshow .= '\'';
-								if ($urltemp) $this->stringtoshow .= '</a>';
-								$this->stringtoshow .= '</span>\';
+			$this->stringtoshow .= '<span style="font-size:8pt;text-align:center;padding:2px;color:black;">';
+			if ($urltemp) $this->stringtoshow .= '<a style="color: #FFFFFF;" border="0" href="' . $urltemp . '">';
+			$this->stringtoshow .= '\'+';
+			$this->stringtoshow .= ($showlegend ? '' : 'label+\' \'+'); // Hide label if already shown in legend
+			$this->stringtoshow .= ($showpointvalue ? 'number+' : '');
+			$this->stringtoshow .= ($showpercent ? '\'<br/>\'+percent+\'%\'+' : '');
+			$this->stringtoshow .= '\'';
+			if ($urltemp) $this->stringtoshow .= '</a>';
+			$this->stringtoshow .= '</span>\';
 							},
 							background: {
 							opacity: 0.0,
@@ -814,21 +794,20 @@ class DolGraph
 			pan: {
 				interactive: true
 			},';
-			if (count($datacolor))
-			{
-				$this->stringtoshow .= 'colors: '.(!empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor)).',';
+			if (count($datacolor)) {
+				$this->stringtoshow .= 'colors: ' . (!empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor)) . ',';
 			}
-			$this->stringtoshow .= 'legend: {show: '.($showlegend ? 'true' : 'false').', position: \'ne\' }
+			$this->stringtoshow .= 'legend: {show: ' . ($showlegend ? 'true' : 'false') . ', position: \'ne\' }
 		});
-		}'."\n";
+		}' . "\n";
 		}
 		// Other cases, graph of type 'bars', 'lines'
 		else {
 			// Add code to support tooltips
 			// TODO: remove js css and use graph-tooltip-inner class instead by adding css in each themes
 			$this->stringtoshow .= '
-			function showTooltip_'.$tag.'(x, y, contents) {
-				$(\'<div class="graph-tooltip-inner" id="tooltip_'.$tag.'">\' + contents + \'</div>\').css({
+			function showTooltip_' . $tag . '(x, y, contents) {
+				$(\'<div class="graph-tooltip-inner" id="tooltip_' . $tag . '">\' + contents + \'</div>\').css({
 					position: \'absolute\',
 					display: \'none\',
 					top: y + 10,
@@ -844,7 +823,7 @@ class DolGraph
 			}
 
 			var previousPoint = null;
-			$("#placeholder_'.$tag.'").bind("plothover", function (event, pos, item) {
+			$("#placeholder_' . $tag . '").bind("plothover", function (event, pos, item) {
 				$("#x").text(pos.x.toFixed(2));
 				$("#y").text(pos.y.toFixed(2));
 
@@ -858,27 +837,26 @@ class DolGraph
 						var y = item.datapoint[1].toFixed(2);
 						var z = item.series.xaxis.ticks[item.dataIndex].label;
 						';
-						if ($this->showpointvalue > 0) $this->stringtoshow .= '
-							showTooltip_'.$tag.'(item.pageX, item.pageY, item.series.label + "<br>" + z + " => " + y);
+			if ($this->showpointvalue > 0) $this->stringtoshow .= '
+							showTooltip_' . $tag . '(item.pageX, item.pageY, item.series.label + "<br>" + z + " => " + y);
 						';
-						$this->stringtoshow .= '
+			$this->stringtoshow .= '
 					}
 				}
 				else {
-					$("#tooltip_'.$tag.'").remove();
+					$("#tooltip_' . $tag . '").remove();
 					previousPoint = null;
 				}
 			});
 			';
 
-			$this->stringtoshow .= 'var stack = null, steps = false;'."\n";
+			$this->stringtoshow .= 'var stack = null, steps = false;' . "\n";
 
-			$this->stringtoshow .= 'function plotWithOptions_'.$tag.'() {'."\n";
-			$this->stringtoshow .= '$.plot($("#placeholder_'.$tag.'"), [ '."\n";
+			$this->stringtoshow .= 'function plotWithOptions_' . $tag . '() {' . "\n";
+			$this->stringtoshow .= '$.plot($("#placeholder_' . $tag . '"), [ ' . "\n";
 			$i = $firstlot;
-			while ($i < $nblot)
-			{
-				if ($i > $firstlot) $this->stringtoshow .= ', '."\n";
+			while ($i < $nblot) {
+				if ($i > $firstlot) $this->stringtoshow .= ', ' . "\n";
 				$color = sprintf("%02x%02x%02x", $this->datacolor[$i][0], $this->datacolor[$i][1], $this->datacolor[$i][2]);
 				$this->stringtoshow .= '{ ';
 				if (!isset($this->type[$i]) || $this->type[$i] == 'bars') {
@@ -886,42 +864,41 @@ class DolGraph
 						if ($i == $firstlot) $align = 'right';
 						elseif ($i == $firstlot + 1) $align = 'center';
 						else $align = 'left';
-						$this->stringtoshow .= 'bars: { lineWidth: 1, show: true, align: "'.$align.'", barWidth: 0.45 }, ';
-					} else $this->stringtoshow .= 'bars: { lineWidth: 1, show: true, align: "'.($i == $firstlot ? 'center' : 'left').'", barWidth: 0.5 }, ';
+						$this->stringtoshow .= 'bars: { lineWidth: 1, show: true, align: "' . $align . '", barWidth: 0.45 }, ';
+					} else $this->stringtoshow .= 'bars: { lineWidth: 1, show: true, align: "' . ($i == $firstlot ? 'center' : 'left') . '", barWidth: 0.5 }, ';
 				}
-				if (isset($this->type[$i]) && ($this->type[$i] == 'lines' || $this->type[$i] == 'linesnopoint')) $this->stringtoshow .= 'lines: { show: true, fill: false }, points: { show: '.($this->type[$i] == 'linesnopoint' ? 'false' : 'true').' }, ';
-				$this->stringtoshow .= 'color: "#'.$color.'", label: "'.(isset($this->Legend[$i]) ? dol_escape_js($this->Legend[$i]) : '').'", data: d'.$i.' }';
+				if (isset($this->type[$i]) && ($this->type[$i] == 'lines' || $this->type[$i] == 'linesnopoint')) $this->stringtoshow .= 'lines: { show: true, fill: false }, points: { show: ' . ($this->type[$i] == 'linesnopoint' ? 'false' : 'true') . ' }, ';
+				$this->stringtoshow .= 'color: "#' . $color . '", label: "' . (isset($this->Legend[$i]) ? dol_escape_js($this->Legend[$i]) : '') . '", data: d' . $i . ' }';
 				$i++;
 			}
 			// shadowSize: 0 -> Drawing is faster without shadows
-			$this->stringtoshow .= "\n".' ], { series: { shadowSize: 0, stack: stack, lines: { fill: false, steps: steps }, bars: { barWidth: 0.6,  fillColor: { colors: [{opacity: 0.9 }, {opacity: 0.85}] }} }'."\n";
+			$this->stringtoshow .= "\n" . ' ], { series: { shadowSize: 0, stack: stack, lines: { fill: false, steps: steps }, bars: { barWidth: 0.6,  fillColor: { colors: [{opacity: 0.9 }, {opacity: 0.85}] }} }' . "\n";
 
 			// Xaxis
-			$this->stringtoshow .= ', xaxis: { ticks: ['."\n";
+			$this->stringtoshow .= ', xaxis: { ticks: [' . "\n";
 			$x = 0;
-			foreach ($this->data as $key => $valarray)
-			{
-				if ($x > 0) $this->stringtoshow .= ', '."\n";
-				$this->stringtoshow .= ' ['.$x.', "'.$valarray[0].'"]';
+			foreach ($this->data as $key => $valarray) {
+				if ($x > 0) $this->stringtoshow .= ', ' . "\n";
+				$this->stringtoshow .= ' [' . $x . ', "' . $valarray[0] . '"]';
 				$x++;
 			}
-			$this->stringtoshow .= '] }'."\n";
+			$this->stringtoshow .= '] }' . "\n";
 
 			// Yaxis
-			$this->stringtoshow .= ', yaxis: { min: '.$this->MinValue.', max: '.($this->MaxValue).' }'."\n";
+			$this->stringtoshow .= ', yaxis: { min: ' . $this->MinValue . ', max: ' . ($this->MaxValue) . ' }' . "\n";
 
 			// Background color
 			$color1 = sprintf("%02x%02x%02x", $this->bgcolorgrid[0], $this->bgcolorgrid[0], $this->bgcolorgrid[2]);
 			$color2 = sprintf("%02x%02x%02x", $this->bgcolorgrid[0], $this->bgcolorgrid[1], $this->bgcolorgrid[2]);
-			$this->stringtoshow .= ', grid: { hoverable: true, backgroundColor: { colors: ["#'.$color1.'", "#'.$color2.'"] }, borderWidth: 1, borderColor: \'#e6e6e6\', tickColor  : \'#e6e6e6\' }'."\n";
+			$this->stringtoshow .= ', grid: { hoverable: true, backgroundColor: { colors: ["#' . $color1 . '", "#' . $color2 . '"] }, borderWidth: 1, borderColor: \'#e6e6e6\', tickColor  : \'#e6e6e6\' }' . "\n";
 			//$this->stringtoshow.=', shadowSize: 20'."\n";    TODO Uncommet this
-			$this->stringtoshow .= '});'."\n";
-			$this->stringtoshow .= '}'."\n";
+			$this->stringtoshow .= '});' . "\n";
+			$this->stringtoshow .= '}' . "\n";
 		}
 
-		$this->stringtoshow .= 'plotWithOptions_'.$tag.'();'."\n";
-		$this->stringtoshow .= '});'."\n";
-		$this->stringtoshow .= '</script>'."\n";
+		$this->stringtoshow .= 'plotWithOptions_' . $tag . '();' . "\n";
+		$this->stringtoshow .= '});' . "\n";
+		$this->stringtoshow .= '</script>' . "\n";
 	}
 
 
@@ -947,10 +924,9 @@ class DolGraph
 		// phpcs:enable
 		global $conf, $langs;
 
-		dol_syslog(get_class($this)."::draw_chart this->type=".join(',', $this->type)." this->MaxValue=".$this->MaxValue);
+		dol_syslog(get_class($this) . "::draw_chart this->type=" . join(',', $this->type) . " this->MaxValue=" . $this->MaxValue);
 
-		if (empty($this->width) && empty($this->height))
-		{
+		if (empty($this->width) && empty($this->height)) {
 			print 'Error width or height not set';
 			return;
 		}
@@ -971,7 +947,8 @@ class DolGraph
 		// Works with line but not with bars
 		//if ($nblot > 2) $firstlot = ($nblot - 2);        // We limit nblot to 2 because jflot can't manage more than 2 bars on same x
 
-		$serie = array(); $arrayofgroupslegend = array();
+		$serie = array();
+		$arrayofgroupslegend = array();
 		//var_dump($this->data);
 
 		$i = $firstlot;
@@ -989,15 +966,15 @@ class DolGraph
 				$alabelexists = 1;
 				$tmpykey = explode('_', ($array_of_ykeys[$i + ($alabelexists ? 1 : 0)]), 3);
 				if (!empty($tmpykey[2]) || $tmpykey[2] == '0') {		// This is a 'Group by' array
-					$tmpvalue = (array_key_exists('y_'.$tmpykey[1].'_'.$tmpykey[2], $valarray) ? $valarray['y_'.$tmpykey[1].'_'.$tmpykey[2]] : $valarray[$i + 1]);
+					$tmpvalue = (array_key_exists('y_' . $tmpykey[1] . '_' . $tmpykey[2], $valarray) ? $valarray['y_' . $tmpykey[1] . '_' . $tmpykey[2]] : $valarray[$i + 1]);
 					$values[$x] = (is_numeric($tmpvalue) ? $tmpvalue : null);
 					$arrayofgroupslegend[$i] = array(
-						'stacknum'=> $tmpykey[1],
+						'stacknum' => $tmpykey[1],
 						'legend' => $this->Legend[$tmpykey[1]],
-						'legendwithgroup' => $this->Legend[$tmpykey[1]].' - '.$tmpykey[2]
+						'legendwithgroup' => $this->Legend[$tmpykey[1]] . ' - ' . $tmpykey[2]
 					);
 				} else {
-					$tmpvalue = (array_key_exists('y_'.$i, $valarray) ? $valarray['y_'.$i] : $valarray[$i + 1]);
+					$tmpvalue = (array_key_exists('y_' . $i, $valarray) ? $valarray['y_' . $i] : $valarray[$i + 1]);
 					//var_dump($i.'_'.$x.'_'.$tmpvalue);
 					$values[$x] = (is_numeric($tmpvalue) ? $tmpvalue : null);
 				}
@@ -1007,9 +984,9 @@ class DolGraph
 			$j = 0;
 			foreach ($values as $x => $y) {
 				if (isset($y)) {
-					$serie[$i] .= ($j > 0 ? ", " : "").$y;
+					$serie[$i] .= ($j > 0 ? ", " : "") . $y;
 				} else {
-					$serie[$i] .= ($j > 0 ? ", " : "").'null';
+					$serie[$i] .= ($j > 0 ? ", " : "") . 'null';
 				}
 				$j++;
 			}
@@ -1022,12 +999,11 @@ class DolGraph
 
 		$tag = dol_escape_htmltag(dol_string_unaccent(dol_string_nospecial(basename($file), '_', array('-', '.'))));
 
-		$this->stringtoshow = '<!-- Build using chart -->'."\n";
-		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.(strpos($this->width, '%') > 0 ? '' : 'px').'; height:'.$this->height.'px;" class="nographyet"></div>';
-			$this->stringtoshow .= '<div class="nographyettext margintoponly">'.$langs->trans("NotEnoughDataYet").'...</div>';
+		$this->stringtoshow = '<!-- Build using chart -->' . "\n";
+		if (!empty($this->title)&&$this->title!='FunnelOfProspection') $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 . (strpos($this->width, '%') > 0 ? '' : 'px') . '; height:' . $this->height . 'px;" class="nographyet"></div>';
+			$this->stringtoshow .= '<div class="nographyettext margintoponly">' . $langs->trans("NotEnoughDataYet") . '...</div>';
 			return;
 		}
 
@@ -1036,17 +1012,15 @@ class DolGraph
 		if (count($this->data) > 20) $dolxaxisvertical = 'dol-xaxis-vertical';
 		// No height for the pie grah
 		$cssfordiv = 'dolgraphchart';
-		if (isset($this->type[$firstlot])) $cssfordiv .= ' dolgraphchar'.$this->type[$firstlot];
-		$this->stringtoshow .= '<div id="placeholder_'.$tag.'" style="min-height: '.$this->height.(strpos($this->height, '%') > 0 ? '' : 'px').'; width:'.$this->width.(strpos($this->width, '%') > 0 ? '' : 'px').';" class="'.$cssfordiv.' dolgraph'.(empty($dolxaxisvertical) ? '' : ' '.$dolxaxisvertical).(empty($this->cssprefix) ? '' : ' dolgraph'.$this->cssprefix).' center"><canvas id="canvas_'.$tag.'"></canvas></div>'."\n";
+		if (isset($this->type[$firstlot])) $cssfordiv .= ' dolgraphchar' . $this->type[$firstlot];
+		$this->stringtoshow .= '<div id="placeholder_' . $tag . '" style="min-height: ' . $this->height . (strpos($this->height, '%') > 0 ? '' : 'px') . '; width:' . $this->width . (strpos($this->width, '%') > 0 ? '' : 'px') . ';" class="' . $cssfordiv . ' dolgraph' . (empty($dolxaxisvertical) ? '' : ' ' . $dolxaxisvertical) . (empty($this->cssprefix) ? '' : ' dolgraph' . $this->cssprefix) . ' center"><canvas id="canvas_' . $tag . '"></canvas></div>' . "\n";
 
-		$this->stringtoshow .= '<script id="'.$tag.'">'."\n";
+		$this->stringtoshow .= '<script id="' . $tag . '">' . "\n";
 		$i = $firstlot;
-		if ($nblot < 0)
-		{
+		if ($nblot < 0) {
 			$this->stringtoshow .= '<!-- No series of data -->';
 		} else {
-			while ($i < $nblot)
-			{
+			while ($i < $nblot) {
 				//$this->stringtoshow .= '<!-- Series '.$i.' -->'."\n";
 				//$this->stringtoshow .= $serie[$i]."\n";
 				$i++;
@@ -1055,69 +1029,69 @@ class DolGraph
 		$this->stringtoshow .= "\n";
 
 		// Special case for Graph of type 'pie', 'piesemicircle', or 'polar'
-		if (isset($this->type[$firstlot]) && (in_array($this->type[$firstlot], array('pie', 'polar', 'piesemicircle'))))
-		{
+		if (isset($this->type[$firstlot]) && (in_array($this->type[$firstlot], array('pie', 'polar', 'piesemicircle')))) {
 			$type = $this->type[$firstlot]; // pie or polar
-			$this->stringtoshow .= 'var options = {'."\n";
+			$this->stringtoshow .= 'var options = {' . "\n";
 			$legendMaxLines = 0; // Does not work
 			if (empty($showlegend)) {
 				$this->stringtoshow .= 'legend: { display: false }, ';
 			} else {
-				$this->stringtoshow .= 'legend: { position: \''.($showlegend == 2 ? 'right' : 'top').'\'';
+				$this->stringtoshow .= 'legend: { position: \'' . ($showlegend == 2 ? 'right' : 'top') . '\'';
 				if (!empty($legendMaxLines)) {
-					$this->stringtoshow .= ', maxLines: '.$legendMaxLines.'';
+					$this->stringtoshow .= ', maxLines: ' . $legendMaxLines . '';
 				}
-				$this->stringtoshow .= ' }, '."\n";
+				$this->stringtoshow .= ' }, ' . "\n";
 			}
 
 			if ($this->type[$firstlot] == 'piesemicircle') {
-				$this->stringtoshow .= 'circumference: Math.PI,'."\n";
-				$this->stringtoshow .= 'rotation: -Math.PI,'."\n";
+				$this->stringtoshow .= 'circumference: Math.PI,' . "\n";
+				$this->stringtoshow .= 'rotation: -Math.PI,' . "\n";
 			}
-			$this->stringtoshow .= 'elements: { arc: {'."\n";
+			$this->stringtoshow .= 'elements: { arc: {' . "\n";
 			// Color of earch arc
 			$this->stringtoshow .= 'backgroundColor: [';
-			$i = 0; $foundnegativecolor = 0;
+			$i = 0;
+			$foundnegativecolor = 0;
 			foreach ($legends as $val)	// Loop on each serie
 			{
-				if ($i > 0) $this->stringtoshow .= ', '."\n";
-				if (is_array($this->datacolor[$i])) $color = 'rgb('.$this->datacolor[$i][0].', '.$this->datacolor[$i][1].', '.$this->datacolor[$i][2].')'; // If datacolor is array(R, G, B)
+				if ($i > 0) $this->stringtoshow .= ', ' . "\n";
+				if (is_array($this->datacolor[$i])) $color = 'rgb(' . $this->datacolor[$i][0] . ', ' . $this->datacolor[$i][1] . ', ' . $this->datacolor[$i][2] . ')'; // If datacolor is array(R, G, B)
 				else {
 					$tmp = str_replace('#', '', $this->datacolor[$i]);
 					if (strpos($tmp, '-') !== false) {
 						$foundnegativecolor++;
 						$color = '#FFFFFF'; // If $val is '-123'
-					} else $color = "#".$tmp; // If $val is '123' or '#123'
+					} else $color = "#" . $tmp; // If $val is '123' or '#123'
 				}
-				$this->stringtoshow .= "'".$color."'";
+				$this->stringtoshow .= "'" . $color . "'";
 				$i++;
 			}
-			$this->stringtoshow .= '], '."\n";
+			$this->stringtoshow .= '], ' . "\n";
 			// Border color
 			if ($foundnegativecolor) {
 				$this->stringtoshow .= 'borderColor: [';
 				$i = 0;
 				foreach ($legends as $val)	// Loop on each serie
 				{
-					if ($i > 0) $this->stringtoshow .= ', '."\n";
+					if ($i > 0) $this->stringtoshow .= ', ' . "\n";
 					if (is_array($this->datacolor[$i])) $color = 'null'; // If datacolor is array(R, G, B)
 					else {
 						$tmp = str_replace('#', '', $this->datacolor[$i]);
-						if (strpos($tmp, '-') !== false) $color = '#'.str_replace('-', '', $tmp); // If $val is '-123'
+						if (strpos($tmp, '-') !== false) $color = '#' . str_replace('-', '', $tmp); // If $val is '-123'
 						else $color = 'null'; // If $val is '123' or '#123'
 					}
-					$this->stringtoshow .= ($color == 'null' ? "'rgba(0,0,0,0.2)'" : "'".$color."'");
+					$this->stringtoshow .= ($color == 'null' ? "'rgba(0,0,0,0.2)'" : "'" . $color . "'");
 					$i++;
 				}
 				$this->stringtoshow .= ']';
 			}
-			$this->stringtoshow .= '} } };'."\n";
+			$this->stringtoshow .= '} } };' . "\n";
 
 			$this->stringtoshow .= '
-				var ctx = document.getElementById("canvas_'.$tag.'").getContext("2d");
+				var ctx = document.getElementById("canvas_' . $tag . '").getContext("2d");
 				var chart = new Chart(ctx, {
 			    // The type of chart we want to create
-    			type: \''.(in_array($type, array('pie', 'piesemicircle')) ? 'doughnut' : 'polarArea').'\',
+    			type: \'' . (in_array($type, array('pie', 'piesemicircle')) ? 'doughnut' : 'polarArea') . '\',
 				// Configuration options go here
     			options: options,
 				data: {
@@ -1127,7 +1101,7 @@ class DolGraph
 			foreach ($legends as $val)	// Loop on each serie
 			{
 				if ($i > 0) $this->stringtoshow .= ', ';
-				$this->stringtoshow .= "'".dol_escape_js(dol_trunc($val, 32))."'";
+				$this->stringtoshow .= "'" . dol_escape_js(dol_trunc($val, 32)) . "'";
 				$i++;
 			}
 
@@ -1137,26 +1111,28 @@ class DolGraph
 			$i = 0;
 			while ($i < $nblot)	// Loop on each serie
 			{
-				$color = 'rgb('.$this->datacolor[$i][0].', '.$this->datacolor[$i][1].', '.$this->datacolor[$i][2].')';
+				$color = 'rgb(' . $this->datacolor[$i][0] . ', ' . $this->datacolor[$i][1] . ', ' . $this->datacolor[$i][2] . ')';
 				//$color = (!empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor));
 
-				if ($i > 0) $this->stringtoshow .= ', '."\n";
-				$this->stringtoshow .= '{'."\n";
+				if ($i > 0) $this->stringtoshow .= ', ' . "\n";
+				$this->stringtoshow .= '{' . "\n";
 				//$this->stringtoshow .= 'borderColor: \''.$color.'\', ';
 				//$this->stringtoshow .= 'backgroundColor: \''.$color.'\', ';
-				$this->stringtoshow .= '  data: ['.$serie[$i].']';
-				$this->stringtoshow .= '}'."\n";
+				$this->stringtoshow .= '  data: [' . $serie[$i] . ']';
+				$this->stringtoshow .= '}' . "\n";
 				$i++;
 			}
-			$this->stringtoshow .= ']'."\n";
-			$this->stringtoshow .= '}'."\n";
-			$this->stringtoshow .= '});'."\n";
+			$this->stringtoshow .= ']' . "\n";
+			$this->stringtoshow .= '}' . "\n";
+			$this->stringtoshow .= '});' . "\n";
 		}
 		// Other cases, graph of type 'bars', 'lines', 'linesnopoint'
 		else {
 			$type = 'bar';
+			$isfunnel = false;
 			if (!isset($this->type[$firstlot]) || $this->type[$firstlot] == 'bars') $type = 'bar';
 			if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'horizontalbars') $type = 'horizontalBar';
+			if ($this->title == 'FunnelOfProspection') $isfunnel = true;
 			if (isset($this->type[$firstlot]) && ($this->type[$firstlot] == 'lines' || $this->type[$firstlot] == 'linesnopoint')) $type = 'line';
 
 			$this->stringtoshow .= 'var options = { maintainAspectRatio: false, aspectRatio: 2.5, ';
@@ -1164,6 +1140,10 @@ class DolGraph
 				$this->stringtoshow .= 'legend: { display: false }, ';
 			}
 			$this->stringtoshow .= 'scales: { xAxes: [{ ';
+			if ($isfunnel) {
+				$this->stringtoshow .= ' ticks: { beginAtZero: true}, display: false,';
+
+			}
 			//$this->stringtoshow .= 'type: \'time\', ';		// Need Moment.js
 			$this->stringtoshow .= 'distribution: \'linear\'';
 			if ($type == 'bar' && count($arrayofgroupslegend) > 0) {
@@ -1175,23 +1155,24 @@ class DolGraph
 			}
 			$this->stringtoshow .= ' }';
 			$this->stringtoshow .= '};';
-
 			$this->stringtoshow .= '
-				var ctx = document.getElementById("canvas_'.$tag.'").getContext("2d");
+				var ctx = document.getElementById("canvas_' . $tag . '").getContext("2d");
 				var chart = new Chart(ctx, {
 			    // The type of chart we want to create
-    			type: \''.$type.'\',
+    			type: \'' . $type . '\',
 				// Configuration options go here
     			options: options,
 				data: {
 					labels: [';
 
 			$i = 0;
-			foreach ($legends as $val)	// Loop on each serie
-			{
-				if ($i > 0) $this->stringtoshow .= ', ';
-				$this->stringtoshow .= "'".dol_escape_js(dol_trunc($val, 32))."'";
-				$i++;
+			if (!$isfunnel);{
+				foreach ($legends as $val)	// Loop on each serie
+				{
+					if ($i > 0) $this->stringtoshow .= ', ';
+					$this->stringtoshow .= "'".dol_escape_js(dol_trunc($val, 32))."'";
+					$i++;
+				}
 			}
 
 			//var_dump($arrayofgroupslegend);
@@ -1205,6 +1186,7 @@ class DolGraph
 			$oldstacknum = -1;
 			while ($i < $nblot)	// Loop on each serie
 			{
+				$foundnegativecolor = 0;
 				$usecolorvariantforgroupby = 0;
 				// We used a 'group by' and we have too many colors so we generated color variants per
 				if (is_array($arrayofgroupslegend[$i]) && count($arrayofgroupslegend[$i]) > 0) {	// If we used a group by.
@@ -1233,7 +1215,7 @@ class DolGraph
 							$ratio = min(95, 10 + 10 * $iinstack); // step of 20
 							$brightnessratio = min(90, 5 + 5 * $iinstack); // step of 10
 						} else {				// We decrease agressiveness of reference color for color 3, 5, 7, ..
-							$ratio = max(-100, - 15 * $iinstack + 10); // step of -20
+							$ratio = max(-100, -15 * $iinstack + 10); // step of -20
 							$brightnessratio = min(90, 10 * $iinstack); // step of 20
 						}
 						//var_dump('Color '.($iinstack+1).' : '.$ratio.' '.$brightnessratio);
@@ -1242,37 +1224,59 @@ class DolGraph
 					}
 					$oldstacknum = $arrayofgroupslegend[$i]['stacknum'];
 
-					$color = 'rgb('.$newcolor[0].', '.$newcolor[1].', '.$newcolor[2].', 0.9)';
-					$bordercolor = 'rgb('.$newcolor[0].', '.$newcolor[1].', '.$newcolor[2].')';
-				} else {																			// We do not use a 'group by'
-					$color = 'rgb('.$this->datacolor[$i][0].', '.$this->datacolor[$i][1].', '.$this->datacolor[$i][2].', 0.9)';
-					$bordercolor = $color;
-					//$color = (!empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor));
+					$color = 'rgb(' . $newcolor[0] . ', ' . $newcolor[1] . ', ' . $newcolor[2] . ', 0.9)';
+					$bordercolor = 'rgb(' . $newcolor[0] . ', ' . $newcolor[1] . ', ' . $newcolor[2] . ')';
+				} else { // We do not use a 'group by'
+					if (is_array($this->datacolor[$i])) $color = 'rgb(' . $this->datacolor[$i][0] . ', ' . $this->datacolor[$i][1] . ', ' . $this->datacolor[$i][2] . ')'; // If datacolor is array(R, G, B)
+					else {
+						$tmp = str_replace('#', '', $this->datacolor[$i]);
+						if (strpos($tmp, '-') !== false) {
+							$foundnegativecolor++;
+							$color = '#FFFFFF'; // If $val is '-123'
+						} else {
+							$color = "#" . $tmp; // If $val is '123' or '#123'
+							$bordercolor = $color;
+						}
+						if ($foundnegativecolor) {
+							if (is_array($this->datacolor[$i])) $color = 'null'; // If datacolor is array(R, G, B)
+							else {
+								$tmp = str_replace('#', '', $this->datacolor[$i]);
+								if (strpos($tmp, '-') !== false) $bordercolor = '#' . str_replace('-', '', $tmp); // If $val is '-123'
+								else $bordercolor = 'null'; // If $val is '123' or '#123'
+							}
+							$bordercolor == 'null' ? "'rgba(0,0,0,0.2)'" : "'" . $bordercolor . "'";
+						}
+					}
 				}
 
 				if ($i > 0) $this->stringtoshow .= ', ';
 				$this->stringtoshow .= "\n";
 				$this->stringtoshow .= '{';
-				$this->stringtoshow .= 'dolibarrinfo: \'y_'.$i.'\', ';
-				$this->stringtoshow .= 'label: \''.dol_escape_js(dol_string_nohtmltag($textoflegend)).'\', ';
-				$this->stringtoshow .= 'pointStyle: \''.($this->type[$i] == 'linesnopoint' ? 'line' : 'circle').'\', ';
-				$this->stringtoshow .= 'fill: '.($type == 'bar' ? 'true' : 'false').', ';
-				if ($type == 'bar') { $this->stringtoshow .= 'borderWidth: \'1\', '; }
-				$this->stringtoshow .= 'borderColor: \''.$bordercolor.'\', ';
-				$this->stringtoshow .= 'backgroundColor: \''.$color.'\', ';
-				if ($arrayofgroupslegend[$i]) $this->stringtoshow .= 'stack: \''.$arrayofgroupslegend[$i]['stacknum'].'\', ';
-				$this->stringtoshow .= 'data: ['.$serie[$i].']';
-				$this->stringtoshow .= '}'."\n";
+				$this->stringtoshow .= 'dolibarrinfo: \'y_' . $i . '\', ';
+				$this->stringtoshow .= 'label: \'' . dol_escape_js(dol_string_nohtmltag($textoflegend)) . '\', ';
+				$this->stringtoshow .= 'pointStyle: \'' . ($this->type[$i] == 'linesnopoint' ? 'line' : 'circle') . '\', ';
+				$this->stringtoshow .= 'fill: ' . ($type == 'bar' ? 'true' : 'false') . ', ';
+				if ($isfunnel){
+					$this->stringtoshow .= 'borderWidth: \'2\', ';
+				}
+				else if ($type == 'bar' || $type == 'horizontalBar') {
+					$this->stringtoshow .= 'borderWidth: \'1\', ';
+				}
+				$this->stringtoshow .= 'borderColor: \'' . $bordercolor . '\', ';
+				$this->stringtoshow .= 'backgroundColor: \'' . $color . '\', ';
+				if ($arrayofgroupslegend[$i]) $this->stringtoshow .= 'stack: \'' . $arrayofgroupslegend[$i]['stacknum'] . '\', ';
+				$this->stringtoshow .= 'data: [' . $serie[$i] . ']';
+				$this->stringtoshow .= '}' . "\n";
 
 				$i++;
 				$iinstack++;
 			}
-			$this->stringtoshow .= ']'."\n";
-			$this->stringtoshow .= '}'."\n";
-			$this->stringtoshow .= '});'."\n";
+			$this->stringtoshow .= ']' . "\n";
+			$this->stringtoshow .= '}' . "\n";
+			$this->stringtoshow .= '});' . "\n";
 		}
 
-		$this->stringtoshow .= '</script>'."\n";
+		$this->stringtoshow .= '</script>' . "\n";
 	}
 
 
@@ -1301,14 +1305,13 @@ class DolGraph
 	{
 		global $langs;
 
-		if ($shownographyet)
-		{
-			$s = '<div class="nographyet" style="width:'.(preg_match('/%/', $this->width) ? $this->width : $this->width.'px').'; height:'.(preg_match('/%/', $this->height) ? $this->height : $this->height.'px').';"></div>';
+		if ($shownographyet) {
+			$s = '<div class="nographyet" style="width:' . (preg_match('/%/', $this->width) ? $this->width : $this->width . 'px') . '; height:' . (preg_match('/%/', $this->height) ? $this->height : $this->height . 'px') . ';"></div>';
 			$s .= '<div class="nographyettext margintoponly">';
 			if (is_numeric($shownographyet)) {
-				$s .= $langs->trans("NotEnoughDataYet").'...';
+				$s .= $langs->trans("NotEnoughDataYet") . '...';
 			} else {
-				$s .= $shownographyet.'...';
+				$s .= $shownographyet . '...';
 			}
 			$s .= '</div>';
 			return $s;

From 5ef73bf88274d2f9167eee4631058bf6e10c97e9 Mon Sep 17 00:00:00 2001
From: Jools <jdephix@hotmail.com>
Date: Wed, 9 Dec 2020 16:26:31 +0100
Subject: [PATCH 302/888] Change module_part to modulepart

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

diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 550d78068a4..92404b81a35 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -120,7 +120,7 @@ class Documents extends DolibarrApi
 	/**
 	 * Build a document.
 	 *
-	 * Test sample 1: { "module_part": "invoice", "original_file": "FA1701-001/FA1701-001.pdf", "doctemplate": "crabe", "langcode": "fr_FR" }.
+	 * Test sample 1: { "modulepart": "invoice", "original_file": "FA1701-001/FA1701-001.pdf", "doctemplate": "crabe", "langcode": "fr_FR" }.
 	 *
 	 * @param   string  $modulepart    Name of module or area concerned by file download ('invoice', 'order', ...).
 	 * @param   string  $original_file  Relative path with filename, relative to modulepart (for example: IN201701-999/IN201701-999.pdf).

From 51738e7e60f02d0ce5954073efa6bd0cbd8810be Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Dec 2020 17:02:26 +0100
Subject: [PATCH 303/888] Fix links into translation strings

---
 htdocs/compta/resultat/clientfourn.php    | 22 ++++++++++++-----
 htdocs/compta/resultat/index.php          | 30 ++++++++++++++---------
 htdocs/compta/stats/index.php             |  2 +-
 htdocs/compta/stats/supplier_turnover.php | 14 +++++------
 4 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 9b505a20a43..8a1655cdefb 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -144,8 +144,12 @@ if ($modecompta == "CREANCES-DETTES")
 {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByPredefinedAccountGroups");
 	$calcmode = $langs->trans("CalcModeDebt");
-	$calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=RECETTES-DEPENSES">', '</a>').')';
-	if (!empty($conf->accounting->enabled)) $calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=BOOKKEEPING">', '</a>').')';
+	$calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '{s1}', '{s2}').')';
+	$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=RECETTES-DEPENSES">', '</a>'), $calcmode);
+	if (!empty($conf->accounting->enabled)) {
+		$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '{s1}', '{s2}').')';
+		$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=BOOKKEEPING">', '</a>'), $calcmode);
+	}
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] - 1)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] + 1)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesResultDue");
@@ -157,8 +161,12 @@ if ($modecompta == "CREANCES-DETTES")
 {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByPredefinedAccountGroups");
 	$calcmode = $langs->trans("CalcModeEngagement");
-	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=CREANCES-DETTES">', '</a>').')';
-	if (!empty($conf->accounting->enabled)) $calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=BOOKKEEPING">', '</a>').')';
+	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '{s1}', '{s2}').')';
+	$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=CREANCES-DETTES">', '</a>'), $calcmode);
+	if (!empty($conf->accounting->enabled)) {
+		$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '{s1}', '{s2}').')';
+		$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=BOOKKEEPING">', '</a>'), $calcmode);
+	}
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] - 1)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] + 1)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesResultInOut");
@@ -168,8 +176,10 @@ if ($modecompta == "CREANCES-DETTES")
 {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByPredefinedAccountGroups");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
-	$calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=RECETTES-DEPENSES">', '</a>').')';
-	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=CREANCES-DETTES">', '</a>').')';
+	$calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '{s1}', '{s2}').')';
+	$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=RECETTES-DEPENSES">', '</a>'), $calcmode);
+	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '{s1}', '{s2}').')';
+	$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=CREANCES-DETTES">', '</a>'), $calcmode);
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$arraylist = array('no'=>$langs->trans("No"), 'yes'=>$langs->trans("AccountWithNonZeroValues"), 'all'=>$langs->trans("All"));
 	$period .= ' &nbsp; &nbsp; '.$langs->trans("DetailByAccount").' '.$form->selectarray('showaccountdetail', $arraylist, $showaccountdetail, 0);
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index 15ec1526260..e5d0c4f85d3 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -123,8 +123,12 @@ if ($modecompta == 'CREANCES-DETTES')
 {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByYear");
 	$calcmode = $langs->trans("CalcModeDebt");
-	$calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=RECETTES-DEPENSES">', '</a>').')';
-	if (!empty($conf->accounting->enabled)) $calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=BOOKKEEPING">', '</a>').')';
+	$calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '{s1}', '{s2}').')';
+	$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=RECETTES-DEPENSES">', '</a>'), $calcmode);
+	if (!empty($conf->accounting->enabled)) {
+		$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '{s1}', '{s2}').')';
+		$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=BOOKKEEPING">', '</a>'), $calcmode);
+	}
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesAmountWithTaxIncluded");
@@ -136,8 +140,12 @@ if ($modecompta == 'CREANCES-DETTES')
 } elseif ($modecompta == "RECETTES-DEPENSES") {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByYear");
 	$calcmode = $langs->trans("CalcModeEngagement");
-	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">', '</a>').')';
-	if (!empty($conf->accounting->enabled)) $calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=BOOKKEEPING">', '</a>').')';
+	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '{s1}', '{s2}').')';
+	$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">', '</a>'), $calcmode);
+	if (!empty($conf->accounting->enabled)) {
+		$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '{s1}', '{s2}').')';
+		$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=BOOKKEEPING">', '</a>'), $calcmode);
+	}
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesAmountWithTaxIncluded");
@@ -148,8 +156,10 @@ if ($modecompta == 'CREANCES-DETTES')
 {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByYear");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
-	$calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=RECETTES-DEPENSES">', '</a>').')';
-	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">', '</a>').')';
+	$calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '{s1}', '{s2}').')';
+	$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=RECETTES-DEPENSES">', '</a>'), $calcmode);
+	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '{s1}', '{s2}').')';
+	$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">', '</a>'), $calcmode);
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesAmountOnInOutBookkeepingRecord");
@@ -818,17 +828,15 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan
 if (!empty($conf->accounting->enabled) && ($modecompta == 'BOOKKEEPING'))
 {
 	$predefinedgroupwhere = "(";
-	//$predefinedgroupwhere.= " (pcg_type = 'EXPENSE' and pcg_subtype in ('PRODUCT','SERVICE'))";
-	$predefinedgroupwhere .= " (pcg_type = 'EXPENSE')";
+	$predefinedgroupwhere .= " (aa.pcg_type = 'EXPENSE')";
 	$predefinedgroupwhere .= " OR ";
-	//$predefinedgroupwhere.= " (pcg_type = 'INCOME' and pcg_subtype in ('PRODUCT','SERVICE'))";
-	$predefinedgroupwhere .= " (pcg_type = 'INCOME')";
+	$predefinedgroupwhere .= " (aa.pcg_type = 'INCOME')";
 	$predefinedgroupwhere .= ")";
 
 	$charofaccountstring = $conf->global->CHARTOFACCOUNTS;
 	$charofaccountstring = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'accounting_system', 'rowid', 'pcg_version');
 
-	$sql = "SELECT b.doc_ref, b.numero_compte, b.subledger_account, b.subledger_label, pcg_type, date_format(b.doc_date,'%Y-%m') as dm, sum(b.debit) as debit, sum(b.credit) as credit, sum(b.montant) as amount";
+	$sql = "SELECT b.doc_ref, b.numero_compte, b.subledger_account, b.subledger_label, aa.pcg_type, date_format(b.doc_date,'%Y-%m') as dm, sum(b.debit) as debit, sum(b.credit) as credit, sum(b.montant) as amount";
 	$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b, ".MAIN_DB_PREFIX."accounting_account as aa";
 	$sql .= " WHERE b.entity = ".$conf->entity;
 	$sql .= " AND aa.entity = ".$conf->entity;
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index 93f91b25449..0be6659f7b4 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -122,7 +122,7 @@ if ($modecompta == "CREANCES-DETTES")
 	$name = $langs->trans("Turnover");
 	$calcmode = $langs->trans("CalcModeDebt");
 	//$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
-	$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '{links1}', '{link2}').')';
+	$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '{link1}', '{link2}').')';
 	$calcmode = str_replace('{link1}', '<a class="bold" href="'.$_SERVER["PHP_SELF"].'?'.($param ? $param : 'year_start='.$year_start).'&modecompta=BOOKKEEPING">', $calcmode);
 	$calcmode = str_replace('{link2}', '</a>', $calcmode);
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
diff --git a/htdocs/compta/stats/supplier_turnover.php b/htdocs/compta/stats/supplier_turnover.php
index f98518ae7ee..eeb1c142712 100644
--- a/htdocs/compta/stats/supplier_turnover.php
+++ b/htdocs/compta/stats/supplier_turnover.php
@@ -59,7 +59,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	{
 		// We define date_start and date_end
 		$year_end = $year_start + ($nbofyear - 1);
-		$month_start = GETPOST("month") ?GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
+		$month_start = GETPOST("month") ? GETPOST("month", 'int') : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 		if (!GETPOST('month'))
 		{
 			if (!GETPOST("year") && $month_start > $month_current)
@@ -113,8 +113,9 @@ if ($modecompta == "CREANCES-DETTES")
 {
 	$name = $langs->trans("PurchaseTurnover");
 	$calcmode = $langs->trans("CalcModeDebt");
-	//$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
-	$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=BOOKKEEPING">', '</a>').')';
+	$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '{link1}', '{link2}').')';
+	$calcmode = str_replace('{link1}', '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=BOOKKEEPING">', $calcmode);
+	$calcmode = str_replace('{link2}', '</a>', $calcmode);
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesPurchaseTurnoverDue");
@@ -124,8 +125,6 @@ if ($modecompta == "CREANCES-DETTES")
 {
 	$name = $langs->trans("PurchaseTurnoverCollected");
 	$calcmode = $langs->trans("CalcModeEngagement");
-	//$calcmode.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">','</a>').')';
-	//$calcmode.='<br>('.$langs->trans("SeeReportInBookkeepingMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=BOOKKEEPINGCOLLECTED">','</a>').')';
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesPurchaseTurnoverIn");
@@ -135,8 +134,9 @@ if ($modecompta == "CREANCES-DETTES")
 {
 	$name = $langs->trans("PurchaseTurnover");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
-	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">', '</a>').')';
-	//$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
+	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '{link1}', '{link2}').')';
+	$calcmode = str_replace('{link1}', '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">', $calcmode);
+	$calcmode = str_replace('{link2}', '</a>', $calcmode);
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesPurchaseTurnoverTotalPurchaseJournal");

From f56b46bd3e7e9e4176115d88be1a94394751b680 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Dec 2020 17:14:35 +0100
Subject: [PATCH 304/888] Debug v13

---
 htdocs/asset/class/asset.class.php | 4 ++--
 htdocs/categories/edit.php         | 2 +-
 htdocs/categories/index.php        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index ae866ff24ba..f4823ae9b6f 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -84,9 +84,9 @@ class Asset extends CommonObject
 		'ref' => array('type'=>'varchar(10)', 'label'=>'Ref', 'visible'=>1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'showoncombobox'=>1),
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,),
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'notnull'=>-1, 'searchall'=>1),
+		'fk_asset_type' => array('type'=>'integer:AssetType:asset/class/asset_type.class.php', 'label'=>'AssetsType', 'visible'=>1, 'enabled'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'searchall'=>1),
 		'amount_ht' => array('type'=>'double(24,8)', 'label'=>'AmountHTShort', 'visible'=>1, 'enabled'=>1, 'position'=>40, 'notnull'=>-1, 'isameasure'=>'1', 'help'=>"Help text",),
-		'amount_vat' => array('type'=>'double(24,8)', 'label'=>'AmountVAT', 'visible'=>1, 'enabled'=>1, 'position'=>40, 'notnull'=>-1, 'isameasure'=>'1', 'help'=>"Help text",),
-		'fk_asset_type' => array('type'=>'integer:AssetType:asset/class/asset_type.class.php', 'label'=>'AssetsType', 'visible'=>1, 'enabled'=>1, 'position'=>50, 'notnull'=>1, 'index'=>1, 'searchall'=>1),
+		'amount_vat' => array('type'=>'double(24,8)', 'label'=>'AmountVAT', 'visible'=>1, 'enabled'=>1, 'position'=>41, 'notnull'=>-1, 'isameasure'=>'1', 'help'=>"Help text",),
 		'description' => array('type'=>'text', 'label'=>'Description', 'visible'=>-1, 'enabled'=>1, 'position'=>90, 'notnull'=>-1,),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'visible'=>-1, 'enabled'=>1, 'position'=>91, 'notnull'=>-1,),
 		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'visible'=>-1, 'enabled'=>1, 'position'=>92, 'notnull'=>-1,),
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index f634d62a6e4..f4b7e12cc30 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -35,7 +35,7 @@ $langs->load("categories");
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alphanohtml');
-$type = (int) GETPOST('type', 'int');
+$type = GETPOST('type', 'aZ09');		// Can be int or string
 $action = (GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'edit');
 $confirm = GETPOST('confirm');
 $cancel = GETPOST('cancel', 'alpha');
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index 4eac3ec9a08..5adc7bbb17b 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -172,7 +172,7 @@ foreach ($fulltree as $key => $val)
 		$counter = "<td class='left' width='40px;'>".(is_countable($elements) ? count($elements) : '0')."</td>";
 	}
 
-	$color = $categstatic->color ? ' style="background: #'.$categstatic->color.';"' : ' style="background: #bbb"';
+	$color = $categstatic->color ? ' style="background: #'.sprintf("%06s", $categstatic->color).';"' : ' style="background: #bbb"';
 
 	$data[] = array(
 	'rowid'=>$val['rowid'],

From 30da1ab8b2eeee3333c675b4acd26441ed25b614 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Dec 2020 17:35:02 +0100
Subject: [PATCH 305/888] Show setup of option SHOW_SUBPRODUCT_REF_IN_PDF

---
 htdocs/admin/pdf.php                         | 7 ++++++-
 htdocs/expedition/class/expedition.class.php | 1 +
 htdocs/langs/en_US/admin.lang                | 3 ++-
 htdocs/langs/en_US/sendings.lang             | 1 +
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 44f0672a832..47aabfed552 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members'));
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks'));
 
 if (!$user->admin) accessforbidden();
 
@@ -80,6 +80,7 @@ if ($action == 'update')
 	dolibarr_set_const($db, "MAIN_PDF_MAIN_HIDE_THIRD_TAX", GETPOST("MAIN_PDF_MAIN_HIDE_THIRD_TAX"), 'chaine', 0, '', $conf->entity);
 
 	dolibarr_set_const($db, "PDF_USE_ALSO_LANGUAGE_CODE", GETPOST('PDF_USE_ALSO_LANGUAGE_CODE', 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "SHOW_SUBPRODUCT_REF_IN_PDF", GETPOST('SHOW_SUBPRODUCT_REF_IN_PDF', 'alpha'), 'chaine', 0, '', $conf->entity);
 
 	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 
@@ -331,6 +332,10 @@ print $formadmin->select_language(GETPOSTISSET('PDF_USE_ALSO_LANGUAGE_CODE') ? G
 //}
 print '</td></tr>';
 
+// SHOW_SUBPRODUCT_REF_IN_PDF - Option to show the detail of product ref for kits.
+print '<tr class="oddeven"><td>'.$langs->trans("SHOW_SUBPRODUCT_REF_IN_PDF", $langs->transnoentitiesnoconv("AllowAddLimitStockByWarehouse"), $langs->transnoentitiesnoconv("Module52Name")).'</td><td>';
+print $form->selectyesno('SHOW_SUBPRODUCT_REF_IN_PDF', (!empty($conf->global->SHOW_SUBPRODUCT_REF_IN_PDF)) ? $conf->global->SHOW_SUBPRODUCT_REF_IN_PDF : 0, 1);
+print '</td></tr>';
 
 print '</table>';
 print '</div>';
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index e652dc5a3c1..023155a706f 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -1868,6 +1868,7 @@ class Expedition extends CommonObject
 		$statusType = 'status'.$status;
 		if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
 		if ($status == self::STATUS_CLOSED) $statusType = 'status6';
+		if ($status == self::STATUS_CANCELED) $statusType = 'status9';
 
 		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
 	}
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 83b5a70de44..23b3b5462c9 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2084,4 +2084,5 @@ YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
-SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
\ No newline at end of file
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF. 
\ No newline at end of file
diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index e1cb168500a..73bd9aebd42 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Other shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Shipments to validate
 StatusSendingCanceled=Canceled
+StatusSendingCanceledShort=Canceled
 StatusSendingDraft=Draft
 StatusSendingValidated=Validated (products to ship or already shipped)
 StatusSendingProcessed=Processed

From 075cacb8cfc851794678d00ea1c7badb2e17c1e1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Dec 2020 17:35:02 +0100
Subject: [PATCH 306/888] Show setup of option SHOW_SUBPRODUCT_REF_IN_PDF

---
 ChangeLog                                    | 1 +
 htdocs/admin/pdf.php                         | 7 ++++++-
 htdocs/expedition/class/expedition.class.php | 1 +
 htdocs/langs/en_US/admin.lang                | 3 ++-
 htdocs/langs/en_US/sendings.lang             | 1 +
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 87535abffce..20b3a514342 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -176,6 +176,7 @@ NEW: Weighing Scale compatibility with TakePOS connector
 NEW: when creating a user from a member linked to a thirdparty, you can choose to create it as external or internal user
 NEW: add clone button on miscellaneous payment
 NEW: #15065 Add option to put the product label in bold in the PDF templates if configured
+NEW: Add option "If the feature to manage kits of module Stock is used, show details of subproducts of a kit on PDF."
 
 
 For developers:
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 44f0672a832..16a1c42ddaa 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members'));
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks'));
 
 if (!$user->admin) accessforbidden();
 
@@ -80,6 +80,7 @@ if ($action == 'update')
 	dolibarr_set_const($db, "MAIN_PDF_MAIN_HIDE_THIRD_TAX", GETPOST("MAIN_PDF_MAIN_HIDE_THIRD_TAX"), 'chaine', 0, '', $conf->entity);
 
 	dolibarr_set_const($db, "PDF_USE_ALSO_LANGUAGE_CODE", GETPOST('PDF_USE_ALSO_LANGUAGE_CODE', 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "SHOW_SUBPRODUCT_REF_IN_PDF", GETPOST('SHOW_SUBPRODUCT_REF_IN_PDF', 'alpha'), 'chaine', 0, '', $conf->entity);
 
 	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 
@@ -331,6 +332,10 @@ print $formadmin->select_language(GETPOSTISSET('PDF_USE_ALSO_LANGUAGE_CODE') ? G
 //}
 print '</td></tr>';
 
+// SHOW_SUBPRODUCT_REF_IN_PDF - Option to show the detail of product ref for kits.
+print '<tr class="oddeven"><td>'.$langs->trans("SHOW_SUBPRODUCT_REF_IN_PDF", $langs->transnoentitiesnoconv("AssociatedProductsAbility"), $langs->transnoentitiesnoconv("Products")).'</td><td>';
+print $form->selectyesno('SHOW_SUBPRODUCT_REF_IN_PDF', (!empty($conf->global->SHOW_SUBPRODUCT_REF_IN_PDF)) ? $conf->global->SHOW_SUBPRODUCT_REF_IN_PDF : 0, 1);
+print '</td></tr>';
 
 print '</table>';
 print '</div>';
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index e652dc5a3c1..023155a706f 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -1868,6 +1868,7 @@ class Expedition extends CommonObject
 		$statusType = 'status'.$status;
 		if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
 		if ($status == self::STATUS_CLOSED) $statusType = 'status6';
+		if ($status == self::STATUS_CANCELED) $statusType = 'status9';
 
 		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
 	}
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 83b5a70de44..23b3b5462c9 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2084,4 +2084,5 @@ YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
-SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
\ No newline at end of file
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF. 
\ No newline at end of file
diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index e1cb168500a..73bd9aebd42 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Other shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Shipments to validate
 StatusSendingCanceled=Canceled
+StatusSendingCanceledShort=Canceled
 StatusSendingDraft=Draft
 StatusSendingValidated=Validated (products to ship or already shipped)
 StatusSendingProcessed=Processed

From a256bfeb468a9d1bb183ea8fd3e25caacaf604e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 9 Dec 2020 17:50:21 +0100
Subject: [PATCH 307/888] fix warnings

---
 .../core/boxes/box_funnel_of_prospection.php  | 36 +++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/boxes/box_funnel_of_prospection.php b/htdocs/core/boxes/box_funnel_of_prospection.php
index c4cebfcf68a..c0218be92e2 100644
--- a/htdocs/core/boxes/box_funnel_of_prospection.php
+++ b/htdocs/core/boxes/box_funnel_of_prospection.php
@@ -73,7 +73,23 @@ class box_funnel_of_prospection extends ModeleBoxes
 	public function loadBox($max = 5)
 	{
 		global $conf;
-		include DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php';
+
+		// default values
+		$badgeStatus0 = '#cbd3d3'; // draft
+		$badgeStatus1 = '#bc9526'; // validated
+		$badgeStatus1b = '#bc9526'; // validated
+		$badgeStatus2 = '#9c9c26'; // approved
+		$badgeStatus3 = '#bca52b';
+		$badgeStatus4 = '#25a580'; // Color ok
+		$badgeStatus4b = '#25a580'; // Color ok
+		$badgeStatus5 = '#cad2d2';
+		$badgeStatus6 = '#cad2d2';
+		$badgeStatus7 = '#baa32b';
+		$badgeStatus8 = '#993013';
+		$badgeStatus9 = '#e7f0f0';
+		if (file_exists(DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php')) {
+			include DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php';
+		}
 		$listofoppstatus = array();
 		$listofopplabel = array();
 		$listofoppcode = array();
@@ -113,7 +129,9 @@ class box_funnel_of_prospection extends ModeleBoxes
 				}
 				$i++;
 			}
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 
 		global $conf, $user, $langs;
 
@@ -134,7 +152,7 @@ class box_funnel_of_prospection extends ModeleBoxes
 			$sql .= " GROUP BY p.fk_opp_status, cls.code";
 			$resql = $this->db->query($sql);
 
-			$form = new Form($ths->db);
+			$form = new Form($this->db);
 			if ($resql) {
 				$num = $this->db->num_rows($resql);
 				$i = 0;
@@ -153,7 +171,9 @@ class box_funnel_of_prospection extends ModeleBoxes
 						$valsnb[$obj->opp_status] = $obj->nb;
 						$valsamount[$obj->opp_status] = $obj->opp_amount;
 						$totalnb += $obj->nb;
-						if ($obj->opp_status) $totaloppnb += $obj->nb;
+						if ($obj->opp_status) {
+							$totaloppnb += $obj->nb;
+						}
 						if (!in_array($obj->code, array('WON', 'LOST'))) {
 							$totalamount += $obj->opp_amount;
 							$ponderated_opp_amount += $obj->ponderated_opp_amount;
@@ -171,8 +191,12 @@ class box_funnel_of_prospection extends ModeleBoxes
 					$labelStatus = '';
 					if ($status != 7) {
 						$code = dol_getIdFromCode($this->db, $status, 'c_lead_status', 'rowid', 'code');
-						if ($code) $labelStatus = $langs->transnoentitiesnoconv("OppStatus" . $code);
-						if (empty($labelStatus)) $labelStatus = $listofopplabel[$status];
+						if ($code) {
+							$labelStatus = $langs->transnoentitiesnoconv("OppStatus" . $code);
+						}
+						if (empty($labelStatus)) {
+							$labelStatus = $listofopplabel[$status];
+						}
 
 						$dataseries[] = array($labelStatus,(isset($valsamount[$status]) ? (float) $valsamount[$status] : 0));
 						if (!$conf->use_javascript_ajax) {

From a0d9d98402ca0295a255a68a27808c807648027b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Dec 2020 18:03:02 +0100
Subject: [PATCH 308/888] Fix phpcs

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

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index e6637c59549..6e4cc60ce53 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1288,7 +1288,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		$prodser->get_sousproduits_arbo();
 		if (!empty($prodser->sousprods) && is_array($prodser->sousprods) && count($prodser->sousprods)) {
 			$tmparrayofsubproducts = reset($prodser->sousprods);
-			foreach($tmparrayofsubproducts as $subprodval) {
+			foreach ($tmparrayofsubproducts as $subprodval) {
 				$libelleproduitservice .= "\n * ".$subprodval[5].(($subprodval[5] && $subprodval[3]) ? ' - ' : '').$subprodval[3].' ('.$subprodval[1].')';
 			}
 		}

From 10a0c98f942ff6818081a14c53be9f0a8e79ce49 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Dec 2020 19:26:41 +0100
Subject: [PATCH 309/888] Debug v13

---
 htdocs/contrat/list.php                       | 22 +++++++++----------
 htdocs/core/lib/functions.lib.php             |  6 ++++-
 htdocs/core/tpl/extrafields_view.tpl.php      |  9 ++++++--
 .../template/class/myobject.class.php         |  2 +-
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 18b47b7102a..bd5b39f717b 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -114,17 +114,17 @@ $fieldstosearchall = array(
 if (empty($user->socid)) $fieldstosearchall["c.note_private"] = "NotePrivate";
 
 $arrayfields = array(
-	'c.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-	'c.ref_customer'=>array('label'=>$langs->trans("RefCustomer"), 'checked'=>1),
-	'c.ref_supplier'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1),
-	's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
-	's.email'=>array('label'=>$langs->trans("ThirdPartyEmail"), 'checked'=>0),
-	's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>0),
-	's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>0),
-	'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0),
-	'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0),
-	'sale_representative'=>array('label'=>$langs->trans("SaleRepresentativesOfThirdParty"), 'checked'=>1),
-	'c.date_contrat'=>array('label'=>$langs->trans("DateContract"), 'checked'=>1),
+	'c.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1, 'position'=>10),
+	'c.ref_customer'=>array('label'=>$langs->trans("RefCustomer"), 'checked'=>1, 'position'=>12),
+	'c.ref_supplier'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1, 'position'=>14),
+	's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'position'=>30),
+	's.email'=>array('label'=>$langs->trans("ThirdPartyEmail"), 'checked'=>0, 'position'=>30),
+	's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>0, 'position'=>31),
+	's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>0, 'position'=>32),
+	'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0, 'position'=>33),
+	'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0, 'position'=>34),
+	'sale_representative'=>array('label'=>$langs->trans("SaleRepresentativesOfThirdParty"), 'checked'=>1, 'position'=>80),
+	'c.date_contrat'=>array('label'=>$langs->trans("DateContract"), 'checked'=>1, 'position'=>45),
 	'c.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
 	'c.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
 	'lower_planned_end_date'=>array('label'=>$langs->trans("LowerDateEndPlannedShort"), 'checked'=>1, 'position'=>900, 'help'=>$langs->trans("LowerDateEndPlannedShort")),
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ab3a6dc45a8..41d0ed9362e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4282,7 +4282,11 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 		$out .= '>';
 	}
 
-	if ($tooltip) $out .= $form->textwithpicto($langs->trans($name), $langs->trans($tooltip));
+	if ($tooltip) {
+		// You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
+		$tmptooltip = explode(':', $tooltip);
+		$out .= $form->textwithpicto($langs->trans($name), $langs->trans($tmptooltip[0]), 1, 'help', '', 0, 3, (empty($tmptooltip[1]) ? '' : 'extra_'.str_replace('.', '_', $field).'_'.$tmptooltip[1]));
+	}
 	else $out .= $langs->trans($name);
 
 	if (empty($thead) && $field && empty($disablesortlink))    // If this is a sort field
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index bc02e490c34..9db0ae13824 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -128,8 +128,13 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 			print '<td class="';
 			if ((!empty($action) && ($action == 'create' || $action == 'edit')) && !empty($extrafields->attributes[$object->table_element]['required'][$tmpkeyextra])) print ' fieldrequired';
 			print '">';
-			if (!empty($extrafields->attributes[$object->table_element]['help'][$tmpkeyextra])) print $form->textwithpicto($langs->trans($tmplabelextra), $langs->trans($extrafields->attributes[$object->table_element]['help'][$tmpkeyextra]));
-			else print $langs->trans($tmplabelextra);
+			if (!empty($extrafields->attributes[$object->table_element]['help'][$tmpkeyextra])) {
+				// You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
+				$tmptooltip = explode(':', $extrafields->attributes[$object->table_element]['help'][$tmpkeyextra]);
+				print $form->textwithpicto($langs->trans($tmplabelextra), $langs->trans($tmptooltip[0]), 1, 'help', '', 0, 3, (empty($tmptooltip[1]) ? '' : 'extra_'.$tmpkeyextra.'_'.$tmptooltip[1]));
+			} else {
+				print $langs->trans($tmplabelextra);
+			}
 			print '</td>';
 
 			//TODO Improve element and rights detection
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index c0798fd52b8..76aeabf2c2b 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -85,7 +85,7 @@ class MyObject extends CommonObject
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
-	 *  'help' is a string visible as a tooltip on field
+	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
 	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")

From b3ca58d2d0ae2f5fb38b7328664e7869a8b1ac3d Mon Sep 17 00:00:00 2001
From: zuiko <zuiko@free.fr>
Date: Wed, 9 Dec 2020 21:16:25 +0100
Subject: [PATCH 310/888] Update html.form.class.php

Complete the Fix to #15565 Enhanced behaviour to select product on customer/supplier order to be able to use barcode reader efficiently.
Answer to Eldy, https://github.com/Dolibarr/dolibarr/pull/15704#discussion_r538763166
In fact the change alone to htdocs/core/lib/ajax.lib.php  is not, for me, sufficient to fix the issue.
if $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, the combo remains even if the product is alone.
So I recommend that the code is $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 1, (wihout combo) for product selection only for customer order filling because for this usage the the probability is higher to use a barcode scanner.
It is less relevant for filling supplier orders (which are not usually entered by barcode scanner), because the combo gives verification information which then disappears. (This is especially true for the purchase price, which is not pre-filled in the box for the moment I tested(?).
---
 htdocs/core/class/html.form.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 8faad1f92e9..8c4d24c64cf 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1995,7 +1995,7 @@ class Form
 			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {
 				$urloption .= '&socid='.$socid;
 			}
-			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
+			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 1, $ajaxoptions);
 
 			if (!empty($conf->variants->enabled)) {
 				$out .= '

From dac0267a38a3d80f19f6dbe988429e5f3c59f9c2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Dec 2020 21:51:01 +0100
Subject: [PATCH 311/888] Fix debug various payment module. Fix debug report
 income/expense (for situation that should not happen but if it happen, result
 is consistent with other screens).

---
 htdocs/compta/bank/various_payment/card.php | 105 ++++++++++----------
 htdocs/compta/resultat/index.php            |  16 ++-
 htdocs/core/menus/standard/eldy.lib.php     |   4 +-
 htdocs/langs/en_US/accountancy.lang         |   3 +-
 4 files changed, 69 insertions(+), 59 deletions(-)

diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 1212f9c9e16..d7ca7823b25 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -122,7 +122,7 @@ if (empty($reshook))
 		$object->accountancy_code = GETPOST("accountancy_code") > 0 ? GETPOST("accountancy_code", "alpha") : "";
 		$object->subledger_account = $subledger_account;
 
-		$object->sens = GETPOST('sens');
+		$object->sens = GETPOST('sens', 'int');
 		$object->fk_project = GETPOST('fk_project', 'int');
 
 		if (empty($datep) || empty($datev))
@@ -131,12 +131,6 @@ if (empty($reshook))
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 			$error++;
 		}
-		if (empty($object->type_payment) || $object->type_payment < 0)
-		{
-			$langs->load('errors');
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PaymentMode")), null, 'errors');
-			$error++;
-		}
 		if (empty($object->amount))
 		{
 			$langs->load('errors');
@@ -149,13 +143,24 @@ if (empty($reshook))
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount")), null, 'errors');
 			$error++;
 		}
-		// TODO Remove this and allow instead to edit a various payment to enter accounting code
+		if (empty($object->type_payment) || $object->type_payment < 0)
+		{
+			$langs->load('errors');
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PaymentMode")), null, 'errors');
+			$error++;
+		}
 		if (!empty($conf->accounting->enabled) && !$object->accountancy_code)
 		{
 			$langs->load('errors');
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountAccounting")), null, 'errors');
 			$error++;
 		}
+		if ($object->sens < 0)
+		{
+			$langs->load('errors');
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Sens")), null, 'errors');
+			$error++;
+		}
 
 		if (!$error)
 		{
@@ -358,13 +363,6 @@ if ($action == 'create')
 	print '<input name="label" id="label" class="minwidth300 maxwidth150onsmartphone" value="'.($label ? $label : $langs->trans("VariousPayment")).'">';
 	print '</td></tr>';
 
-	// Sens
-	print '<tr><td>';
-	print $form->editfieldkey('Sens', 'sens', '', $object, 0, 'string', '', 1).'</td><td>';
-	$sensarray = array('0' => $langs->trans("Debit"), '1' => $langs->trans("Credit"));
-	print $form->selectarray('sens', $sensarray, $sens);
-	print '</td></tr>';
-
 	// Amount
 	print '<tr><td>';
 	print $form->editfieldkey('Amount', 'amount', '', $object, 0, 'string', '', 1).'</td><td>';
@@ -396,6 +394,44 @@ if ($action == 'create')
 		print '<td><input name="num_payment" class="maxwidth150onsmartphone" id="num_payment" type="text" value="'.GETPOST("num_payment").'"></td></tr>'."\n";
 	}
 
+	// Accountancy account
+	if (!empty($conf->accounting->enabled)) {
+		// TODO Remove the fieldrequired and allow instead to edit a various payment to enter accounting code
+		print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("AccountAccounting").'</td>';
+		print '<td>';
+		print $formaccounting->select_account($accountancy_code, 'accountancy_code', 1, null, 1, 1);
+		print '</td></tr>';
+	} else  { // For external software
+		print '<tr><td class="titlefieldcreate">'.$langs->trans("AccountAccounting").'</td>';
+		print '<td><input class="minwidth100 maxwidthonsmartphone" name="accountancy_code" value="'.$accountancy_code.'">';
+		print '</td></tr>';
+	}
+
+	// Subledger account
+	if (!empty($conf->accounting->enabled)) {
+		print '<tr><td>'.$langs->trans("SubledgerAccount").'aaaa</td>';
+		print '<td>';
+		if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
+		{
+			print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1, '');
+		} else {
+			print '<input type="text" class="maxwidth200 maxwidthonsmartphone" name="subledger_account" value="'.$subledger_account.'">';
+		}
+		print '</td></tr>';
+	} else { // For external software
+		print '<tr><td>'.$langs->trans("SubledgerAccount").'</td>';
+		print '<td><input class="minwidth100 maxwidthonsmartphone" name="subledger_account" value="'.$subledger_account.'">';
+		print '</td></tr>';
+	}
+
+	// Sens
+	print '<tr><td>';
+	$labelsens = $form->textwithpicto('Sens', $langs->trans("AccountingDirectionHelp"));
+	print $form->editfieldkey($labelsens, 'sens', '', $object, 0, 'string', '', 1).'</td><td>';
+	$sensarray = array('0' => $langs->trans("Debit"), '1' => $langs->trans("Credit"));
+	print $form->selectarray('sens', $sensarray, $sens, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100', 1);
+	print '</td></tr>';
+
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
@@ -417,44 +453,9 @@ if ($action == 'create')
 	print $hookmanager->resPrint;
 
 	// Category
-	if (is_array($options) && count($options) && $conf->categorie->enabled)
-	{
+	if (is_array($options) && count($options) && $conf->categorie->enabled) {
 		print '<tr><td>'.$langs->trans("RubriquesTransactions").'</td><td>';
-		print Form::selectarray('category_transaction', $options, GETPOST('category_transaction'), 1);
-		print '</td></tr>';
-	}
-
-	// Accountancy account
-	if (!empty($conf->accounting->enabled))
-	{
-		// TODO Remove the fieldrequired and allow instead to edit a various payment to enter accounting code
-		print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("AccountAccounting").'</td>';
-		print '<td>';
-		print $formaccounting->select_account($accountancy_code, 'accountancy_code', 1, null, 1, 1);
-		print '</td></tr>';
-	} else // For external software
-	{
-		print '<tr><td class="titlefieldcreate">'.$langs->trans("AccountAccounting").'</td>';
-		print '<td><input class="minwidth100 maxwidthonsmartphone" name="accountancy_code" value="'.$accountancy_code.'">';
-		print '</td></tr>';
-	}
-
-	// Subledger account
-	if (!empty($conf->accounting->enabled))
-	{
-		print '<tr><td>'.$langs->trans("SubledgerAccount").'aaaa</td>';
-		print '<td>';
-		if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
-		{
-			print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1, '');
-		} else {
-			print '<input type="text" class="maxwidth200 maxwidthonsmartphone" name="subledger_account" value="'.$subledger_account.'">';
-		}
-		print '</td></tr>';
-	} else // For external software
-	{
-		print '<tr><td>'.$langs->trans("SubledgerAccount").'</td>';
-		print '<td><input class="minwidth100 maxwidthonsmartphone" name="subledger_account" value="'.$subledger_account.'">';
+		print img_picto('', 'category').Form::selectarray('category_transaction', $options, GETPOST('category_transaction'), 1, 0, 0, '', 0, 0, 0, '', 'minwidth300', 1);
 		print '</td></tr>';
 	}
 
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index e5d0c4f85d3..ec2a8bb2623 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -863,10 +863,18 @@ if (!empty($conf->accounting->enabled) && ($modecompta == 'BOOKKEEPING'))
 			{
 				$obj = $db->fetch_object($result);
 
-				if (!isset($encaiss[$obj->dm])) $encaiss[$obj->dm] = 0;
-				if (!isset($decaiss[$obj->dm])) $decaiss[$obj->dm] = 0;
-				$encaiss[$obj->dm] += $obj->credit;
-				$decaiss[$obj->dm] += $obj->debit;
+				if ($obj->pcg_type == 'INCOME') {
+					if (!isset($encaiss[$obj->dm])) $encaiss[$obj->dm] = 0;	// To avoid warning of var not defined
+					$encaiss[$obj->dm] += $obj->credit;
+					$encaiss[$obj->dm] -= $obj->credit;
+				}
+				if ($obj->pcg_type == 'INCOME') {
+					if (!isset($decaiss[$obj->dm])) $decaiss[$obj->dm] = 0;	// To avoid warning of var not defined
+					$decaiss[$obj->dm] += $obj->debit;
+					$decaiss[$obj->dm] -= $obj->credit;
+				}
+
+				// ???
 				if (!isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm] = 0;
 				if (!isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm] = 0;
 				$encaiss_ttc[$obj->dm] += 0;
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 4e339c4880e..85b63a6f4e3 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1245,14 +1245,14 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 				// Journals
 				if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
-					$newmenu->add('', $langs->trans("RegistrationInAccounting"), 1, $user->rights->accounting->comptarapport->lire);
+					$newmenu->add('', $langs->trans("RegistrationInAccounting"), 1, $user->rights->accounting->comptarapport->lire, '', '', '');
 
 					// Multi journal
 					$sql = "SELECT rowid, code, label, nature";
 					$sql .= " FROM ".MAIN_DB_PREFIX."accounting_journal";
 					$sql .= " WHERE entity = ".$conf->entity;
 					$sql .= " AND active = 1";
-					$sql .= " ORDER BY label DESC";
+					$sql .= " ORDER BY nature ASC, label DESC";
 
 					$resql = $db->query($sql);
 					if ($resql) {
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 3211a0b62df..41a4cfa59d5 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -198,7 +198,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal

From 3fcfcb3e88a31a6359278dbea36b0ba81afa5709 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 9 Dec 2020 23:38:24 +0100
Subject: [PATCH 312/888] Fix field declaration

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

diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index ef2ad8c1ed6..e7a8a31af4e 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -119,7 +119,7 @@ $arrayfields = array(
     'u.accountancy_code'=>array('label'=>"AccountancyCode", 'checked'=>0, 'position'=>30),
     'u.email'=>array('label'=>"EMail", 'checked'=>1, 'position'=>35),
     'u.api_key'=>array('label'=>"ApiKey", 'checked'=>0, 'position'=>40, "enabled"=>($conf->api->enabled && $user->admin)),
-    'u.fk_soc'=>array('label'=>"Company", 'checked'=>1, 'position'=>45),
+    'u.fk_soc'=>array('label'=>"Company", 'checked'=>($contextpage == 'employeelist' ? 0 : 1), 'position'=>45),
     'u.salary'=>array('label'=>"Salary", 'checked'=>1, 'position'=>80, 'enabled'=>($conf->salaries->enabled && !empty($user->rights->salaries->readall))),
     'u.datelastlogin'=>array('label'=>"LastConnexion", 'checked'=>1, 'position'=>100),
 	'u.datepreviouslogin'=>array('label'=>"PreviousConnexion", 'checked'=>0, 'position'=>110),

From 2c9eb5417aaba38d5feb6f8221cc85a40146d194 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 10 Dec 2020 00:20:22 +0100
Subject: [PATCH 313/888] Look and feel v13

---
 htdocs/user/card.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 4a22b211c5f..be03f9ce0b0 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -956,7 +956,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	// Hierarchy
 	print '<tr><td class="titlefieldcreate">'.$langs->trans("HierarchicalResponsible").'</td>';
 	print '<td>';
-	print $form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $conf->entity, 0, 0, '', 0, '', 'maxwidth300');
+	print img_picto('', 'user').$form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $conf->entity, 0, 0, '', 0, '', 'maxwidth300');
 	print '</td>';
 	print "</tr>\n";
 
@@ -968,7 +968,7 @@ if ($action == 'create' || $action == 'adduserldap')
 		print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
 		print '</td>';
 		print '<td>';
-		print $form->select_dolusers($object->fk_user_expense_validator, 'fk_user_expense_validator', 1, array($object->id), 0, '', 0, $conf->entity, 0, 0, '', 0, '', 'maxwidth300');
+		print img_picto('', 'user').$form->select_dolusers($object->fk_user_expense_validator, 'fk_user_expense_validator', 1, array($object->id), 0, '', 0, $conf->entity, 0, 0, '', 0, '', 'maxwidth300');
 		print '</td>';
 		print "</tr>\n";
 	}
@@ -981,7 +981,7 @@ if ($action == 'create' || $action == 'adduserldap')
 		print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
 		print '</td>';
 		print '<td>';
-		print $form->select_dolusers($object->fk_user_holiday_validator, 'fk_user_holiday_validator', 1, array($object->id), 0, '', 0, $conf->entity, 0, 0, '', 0, '', 'maxwidth300');
+		print img_picto('', 'user').$form->select_dolusers($object->fk_user_holiday_validator, 'fk_user_holiday_validator', 1, array($object->id), 0, '', 0, $conf->entity, 0, 0, '', 0, '', 'maxwidth300');
 		print '</td>';
 		print "</tr>\n";
 	}

From eedaca14761dba8c13976bd2a31293ff9bee719a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 10 Dec 2020 00:43:51 +0100
Subject: [PATCH 314/888] Fix bad encoding of link

---
 htdocs/societe/list.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 48a01a94390..71f0f08cc9d 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -615,13 +615,12 @@ if ($contextpage == 'poslist' && $type == 't' && (!empty($conf->global->PRODUIT_
 
 // Show the new button only when this page is not opend from the Extended POS (pop-up window)
 // but allow it too, when a user has the rights to create a new customer
-if ($contextpage != 'poslist')
-{
+if ($contextpage != 'poslist') {
 	$url = DOL_URL_ROOT.'/societe/card.php?action=create'.$typefilter;
 	if (!empty($socid)) $url .= '&socid='.$socid;
 	$newcardbutton = dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', $url, '', $user->rights->societe->creer);
 } elseif ($user->rights->societe->creer) {
-	$url = DOL_URL_ROOT.'/societe/card.php?action=create&type=t&contextpage=poslist&optioncss=print&backtopage='.$_SERVER["PHP_SELF"].'?type=t&contextpage=poslist&nomassaction=1&optioncss=print&place='.urlencode($place);
+	$url = DOL_URL_ROOT.'/societe/card.php?action=create&type=t&contextpage=poslist&optioncss=print&backtopage='.urlencode($_SERVER["PHP_SELF"].'?type=t&contextpage=poslist&nomassaction=1&optioncss=print&place='.$place);
 	$label = 'MenuNewCustomer';
 	$newcardbutton .= dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', $url);
 }

From f161b47cba0eae757700aa88c8c59b938e46432e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 10 Dec 2020 01:45:08 +0100
Subject: [PATCH 315/888] Debug v13

---
 ChangeLog                          | 6 +++---
 htdocs/theme/eldy/info-box.inc.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 20b3a514342..fbb36f221c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,7 +56,6 @@ NEW: add option TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT
 NEW: add option to define a default warehouse at user level
 NEW: add option to include products without alert in replenish
 NEW: add order by lastname and firstname by default in get sales representatives
-NEW: add param to not show links when output tags
 NEW: add PDF document templates for warehouses (list of stock)
 NEW: add a prospect status for the contact with managment of custom icon
 NEW: add public note on products ; this also partially fix the #14342
@@ -79,7 +78,7 @@ NEW: appearance tab in TakePOS with more visual parameters
 NEW: better currency rate editor
 NEW: can build vendor invoice from vendor orders
 NEW: can change a product in lines of a recurring invoice or contract
-NEW: can change size of logo on PDF documents
+NEW: can set the size of the logo on PDF documents
 NEW: can change VAT rate of all lines of a draft object in one step
 NEW: can define date range of validity of a login during creation
 NEW: can disable, from edit page, the whole web site
@@ -188,7 +187,7 @@ NEW: show line number on intervention card (via MAIN_VIEW_LINE_NUMBER)
 NEW: Add some fields to link website page to an other object
 NEW: fill ECM src object fields in dol_add_file_process
 NEW: conf to allow to show the full tree in warehouse popup
-NEW: can use THEME_DARKMODEENABLED=2 for a preview of theme in dark mode
+NEW: can use parameter ?THEME_DARKMODEENABLED=2 for a preview of theme in dark mode
 NEW: can force the antivirus from conf file or autoprepend ini setup
 NEW: can add event to log into blockedlog module with a constant
 NEW: add property cssview when declaring fields of an object
@@ -212,6 +211,7 @@ NEW: add a message in error_log after detection of SQL or script injection
 NEW: add validation of MX domain for emails
 NEW: calculate the virtual stock in transverse mode ( not on getEntity('commande'), ... but on getEntity('stock') )
 NEW: Graphics can be horizontal bars
+NEW: add param to not show links when output tags
 
 APIs
 NEW: API get contacts list of a given order
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 1bb6ae7c67e..2da8de5cff3 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -25,7 +25,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 .info-box.info-box-sm {
     min-height: 80px;
     margin-bottom: 10px;
-    background: #fff;
+    /* background: #fff; */
 }
 .opened-dash-board-wrap .info-box.info-box-sm {
     border-radius: 0 0 0 20px;

From ecd642e46529d3225ffa7db723bedd716ba083d6 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Thu, 10 Dec 2020 10:58:07 +0100
Subject: [PATCH 316/888] Close #15383 : New format for funnel of prospection

---
 htdocs/core/class/dolgraph.class.php | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index ccce9cb1e12..832047b3c65 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -1154,6 +1154,18 @@ class DolGraph
 				$this->stringtoshow .= ', yAxes: [{ stacked: true }]';
 			}
 			$this->stringtoshow .= ' }';
+			if ($isfunnel) {
+				$this->stringtoshow .= ', tooltips: {mode: \'nearest\',
+					callbacks: {
+						title: function(tooltipItem, data) {
+							return data.datasets[tooltipItem[0].datasetIndex].label;
+						},
+						label: function(tooltipItem, data) {
+							return data.datasets[tooltipItem.datasetIndex].data[0][1];
+						}
+					}
+				},';
+			}
 			$this->stringtoshow .= '};';
 			$this->stringtoshow .= '
 				var ctx = document.getElementById("canvas_' . $tag . '").getContext("2d");
@@ -1265,7 +1277,14 @@ class DolGraph
 				$this->stringtoshow .= 'borderColor: \'' . $bordercolor . '\', ';
 				$this->stringtoshow .= 'backgroundColor: \'' . $color . '\', ';
 				if ($arrayofgroupslegend[$i]) $this->stringtoshow .= 'stack: \'' . $arrayofgroupslegend[$i]['stacknum'] . '\', ';
-				$this->stringtoshow .= 'data: [' . $serie[$i] . ']';
+				$this->stringtoshow .='data: [';
+				if($isfunnel){
+					$this->stringtoshow .= '['.-$serie[$i].','.$serie[$i].']';
+
+				}else{
+					$this->stringtoshow .= $serie[$i];
+				}
+				$this->stringtoshow .=']';
 				$this->stringtoshow .= '}' . "\n";
 
 				$i++;

From 38e03778dcb1498225e207a2fc054b97b0767c7a Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 10 Dec 2020 10:07:09 +0000
Subject: [PATCH 317/888] Fixing style errors.

---
 htdocs/core/class/dolgraph.class.php | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 832047b3c65..3c34668ecd2 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -1142,7 +1142,6 @@ class DolGraph
 			$this->stringtoshow .= 'scales: { xAxes: [{ ';
 			if ($isfunnel) {
 				$this->stringtoshow .= ' ticks: { beginAtZero: true}, display: false,';
-
 			}
 			//$this->stringtoshow .= 'type: \'time\', ';		// Need Moment.js
 			$this->stringtoshow .= 'distribution: \'linear\'';
@@ -1179,12 +1178,12 @@ class DolGraph
 
 			$i = 0;
 			if (!$isfunnel);{
-				foreach ($legends as $val)	// Loop on each serie
+			foreach ($legends as $val)	// Loop on each serie
 				{
-					if ($i > 0) $this->stringtoshow .= ', ';
-					$this->stringtoshow .= "'".dol_escape_js(dol_trunc($val, 32))."'";
-					$i++;
-				}
+				if ($i > 0) $this->stringtoshow .= ', ';
+				$this->stringtoshow .= "'".dol_escape_js(dol_trunc($val, 32))."'";
+				$i++;
+			}
 			}
 
 			//var_dump($arrayofgroupslegend);
@@ -1271,17 +1270,16 @@ class DolGraph
 				if ($isfunnel){
 					$this->stringtoshow .= 'borderWidth: \'2\', ';
 				}
-				else if ($type == 'bar' || $type == 'horizontalBar') {
+				elseif ($type == 'bar' || $type == 'horizontalBar') {
 					$this->stringtoshow .= 'borderWidth: \'1\', ';
 				}
 				$this->stringtoshow .= 'borderColor: \'' . $bordercolor . '\', ';
 				$this->stringtoshow .= 'backgroundColor: \'' . $color . '\', ';
 				if ($arrayofgroupslegend[$i]) $this->stringtoshow .= 'stack: \'' . $arrayofgroupslegend[$i]['stacknum'] . '\', ';
 				$this->stringtoshow .='data: [';
-				if($isfunnel){
+				if ($isfunnel){
 					$this->stringtoshow .= '['.-$serie[$i].','.$serie[$i].']';
-
-				}else{
+				}else {
 					$this->stringtoshow .= $serie[$i];
 				}
 				$this->stringtoshow .=']';

From 492715811c454f816f81913683933e7ba0e0f97e Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 10 Dec 2020 10:10:12 +0000
Subject: [PATCH 318/888] Fixing style errors.

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

diff --git a/htdocs/core/boxes/box_funnel_of_prospection.php b/htdocs/core/boxes/box_funnel_of_prospection.php
index fd91b8c317f..6fd2795ccdb 100644
--- a/htdocs/core/boxes/box_funnel_of_prospection.php
+++ b/htdocs/core/boxes/box_funnel_of_prospection.php
@@ -135,7 +135,7 @@ class box_funnel_of_prospection extends ModeleBoxes
 		}
 
 		global $conf, $user, $langs;
-data
+		data
 		$this->max = $max;
 
 		$this->info_box_head = array(

From a57b01e9bafa7fb467727a4bced9f587630f9de8 Mon Sep 17 00:00:00 2001
From: Hystepik <45882981+Hystepik@users.noreply.github.com>
Date: Thu, 10 Dec 2020 11:12:33 +0100
Subject: [PATCH 319/888] Update box_funnel_of_prospection.php

---
 htdocs/core/boxes/box_funnel_of_prospection.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/core/boxes/box_funnel_of_prospection.php b/htdocs/core/boxes/box_funnel_of_prospection.php
index 6fd2795ccdb..5669fab7fe5 100644
--- a/htdocs/core/boxes/box_funnel_of_prospection.php
+++ b/htdocs/core/boxes/box_funnel_of_prospection.php
@@ -135,7 +135,6 @@ class box_funnel_of_prospection extends ModeleBoxes
 		}
 
 		global $conf, $user, $langs;
-		data
 		$this->max = $max;
 
 		$this->info_box_head = array(

From 155fa43dc6c67296938eff61db598bcac259ac5b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Dec 2020 12:01:22 +0100
Subject: [PATCH 320/888] Fix substitution var __AMOUNT_TEXT__

---
 htdocs/core/lib/functions.lib.php          |  9 ++++++++-
 htdocs/core/lib/functionsnumtoword.lib.php | 10 +++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 41d0ed9362e..5fa6a8b5eeb 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6504,10 +6504,14 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 	}
 	if (empty($exclude) || !in_array('objectamount', $exclude))
 	{
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functionsnumtoword.lib.php';
+
 		$substitutionarray['__DATE_YMD__']        = is_object($object) ? (isset($object->date) ? dol_print_date($object->date, 'day', 0, $outputlangs) : null) : '';
 		$substitutionarray['__DATE_DUE_YMD__']    = is_object($object) ? (isset($object->date_lim_reglement) ? dol_print_date($object->date_lim_reglement, 'day', 0, $outputlangs) : null) : '';
 
 		$substitutionarray['__AMOUNT__']          = is_object($object) ? $object->total_ttc : '';
+		$substitutionarray['__AMOUNT_TEXT__']     = is_object($object) ? dol_convertToWord($object->total_ttc, $outputlangs, '', true) : '';
+		$substitutionarray['__AMOUNT_TEXTCURRENCY__'] = is_object($object) ? dol_convertToWord($object->total_ttc, $outputlangs, $conf->currency, true) : '';
 		$substitutionarray['__AMOUNT_EXCL_TAX__'] = is_object($object) ? $object->total_ht : '';
 		$substitutionarray['__AMOUNT_VAT__']      = is_object($object) ? (isset($object->total_vat) ? $object->total_vat : $object->total_tva) : '';
 		if ($onlykey != 2 || $mysoc->useLocalTax(1)) $substitutionarray['__AMOUNT_TAX2__']     = is_object($object) ? $object->total_localtax1 : '';
@@ -6519,7 +6523,10 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 		if ($onlykey != 2 || $mysoc->useLocalTax(1)) $substitutionarray['__AMOUNT_TAX2_FORMATED__']     = is_object($object) ? ($object->total_localtax1 ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';
 		if ($onlykey != 2 || $mysoc->useLocalTax(2)) $substitutionarray['__AMOUNT_TAX3_FORMATED__']     = is_object($object) ? ($object->total_localtax2 ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';
 
-		// TODO Add keys for foreign multicurrency
+		$substitutionarray['__AMOUNT_MULTICURRENCY__']          = is_object($object) ? $object->multicurrency_total_ttc : '';
+		$substitutionarray['__AMOUNT_MULTICURRENCY_TEXT__']     = is_object($object) ? dol_convertToWord($object->multicurrency_total_ttc, $outputlangs, '', true) : '';
+		$substitutionarray['__AMOUNT_MULTICURRENCY_TEXTCURRENCY__'] = is_object($object) ? dol_convertToWord($object->multicurrency_total_ttc, $outputlangs, $object->multicurrency_code, true) : '';
+		// TODO Add other keys for foreign multicurrency
 
 		// For backward compatibility
 		if ($onlykey != 2)
diff --git a/htdocs/core/lib/functionsnumtoword.lib.php b/htdocs/core/lib/functionsnumtoword.lib.php
index ae9401b7954..02a2de8058c 100644
--- a/htdocs/core/lib/functionsnumtoword.lib.php
+++ b/htdocs/core/lib/functionsnumtoword.lib.php
@@ -29,11 +29,11 @@
  *
  * @param	float       $num			Number to convert (must be a numeric value, like reported by price2num())
  * @param	Translate   $langs			Language
- * @param	boolean     $currency		0=number to translate | 1=currency to translate
- * @param	boolean     $centimes		0=no cents/centimes | 1=there is cents/centimes to translate
+ * @param	string      $currency		''=number to translate | 'XX'=currency code to use into text
+ * @param	boolean     $centimes		false=no cents/centimes | true=there is cents/centimes
  * @return 	string|false			    Text of the number
  */
-function dol_convertToWord($num, $langs, $currency = false, $centimes = false)
+function dol_convertToWord($num, $langs, $currency = '', $centimes = false)
 {
 	global $conf;
 
@@ -48,9 +48,9 @@ function dol_convertToWord($num, $langs, $currency = false, $centimes = false)
 
 	if (!empty($conf->global->MAIN_MODULE_NUMBERWORDS)) {
 		if ($currency) {
-			$type = 1;
+			$type = '1';
 		} else {
-			$type = 0;
+			$type = '0';
 		}
 
 		$concatWords = $langs->getLabelFromNumber($num, $type);

From 2c37fe13d6e17f787d2691816362df7bd90e920b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Dec 2020 12:09:43 +0100
Subject: [PATCH 321/888] Fix substitution var keys

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5fa6a8b5eeb..e22f68d15de 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6514,6 +6514,8 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 		$substitutionarray['__AMOUNT_TEXTCURRENCY__'] = is_object($object) ? dol_convertToWord($object->total_ttc, $outputlangs, $conf->currency, true) : '';
 		$substitutionarray['__AMOUNT_EXCL_TAX__'] = is_object($object) ? $object->total_ht : '';
 		$substitutionarray['__AMOUNT_VAT__']      = is_object($object) ? (isset($object->total_vat) ? $object->total_vat : $object->total_tva) : '';
+		$substitutionarray['__AMOUNT_VAT_TEXT__']      = is_object($object) ? (isset($object->total_vat) ? dol_convertToWord($object->total_vat, $outputlangs, '', true) : dol_convertToWord($object->total_tva, $outputlangs, '', true)) : '';
+		$substitutionarray['__AMOUNT_VAT_TEXTCURRENCY__']      = is_object($object) ? (isset($object->total_vat) ? dol_convertToWord($object->total_vat, $outputlangs, $conf->currency, true) : dol_convertToWord($object->total_tva, $outputlangs, $conf->currency, true)) : '';
 		if ($onlykey != 2 || $mysoc->useLocalTax(1)) $substitutionarray['__AMOUNT_TAX2__']     = is_object($object) ? $object->total_localtax1 : '';
 		if ($onlykey != 2 || $mysoc->useLocalTax(2)) $substitutionarray['__AMOUNT_TAX3__']     = is_object($object) ? $object->total_localtax2 : '';
 

From be163c684f40f14d2ef738e2d1a91dbdd9a4f62b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Dec 2020 12:54:13 +0100
Subject: [PATCH 322/888] Fix phpcs

---
 htdocs/compta/bank/various_payment/card.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index d7ca7823b25..191efdc30dc 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -401,7 +401,7 @@ if ($action == 'create')
 		print '<td>';
 		print $formaccounting->select_account($accountancy_code, 'accountancy_code', 1, null, 1, 1);
 		print '</td></tr>';
-	} else  { // For external software
+	} else { // For external software
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("AccountAccounting").'</td>';
 		print '<td><input class="minwidth100 maxwidthonsmartphone" name="accountancy_code" value="'.$accountancy_code.'">';
 		print '</td></tr>';
@@ -411,8 +411,7 @@ if ($action == 'create')
 	if (!empty($conf->accounting->enabled)) {
 		print '<tr><td>'.$langs->trans("SubledgerAccount").'aaaa</td>';
 		print '<td>';
-		if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
-		{
+		if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
 			print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1, '');
 		} else {
 			print '<input type="text" class="maxwidth200 maxwidthonsmartphone" name="subledger_account" value="'.$subledger_account.'">';

From d040f53dc281d4257763d65315fb5de711499cf5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Dec 2020 13:02:51 +0100
Subject: [PATCH 323/888] Update web templates

---
 .../websites/website_template-corporate.zip   | Bin 2303286 -> 2151148 bytes
 .../websites/website_template-stellar.zip     | Bin 116672 -> 117019 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/htdocs/install/doctemplates/websites/website_template-corporate.zip b/htdocs/install/doctemplates/websites/website_template-corporate.zip
index 9186b95fdb684c5901f0376c18780fdfba7fa4d9..88de0dc565faed16e8115fcc2e5f40964b9f4ccf 100644
GIT binary patch
delta 229995
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%0A1_$il{O*?}J`Q?4B!8a^Y8{0I*E
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
T7#J(azjjEEf~bxfa`yiL?#74{

delta 384934
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
D&p4({

diff --git a/htdocs/install/doctemplates/websites/website_template-stellar.zip b/htdocs/install/doctemplates/websites/website_template-stellar.zip
index 399a32e579dafcd12f6b50e671e7071a75a91395..7607cb9bd8a8f8eced0b8a38296dfbbc9eb8520b 100644
GIT binary patch
delta 17440
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

delta 17135
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
N2}T_@?)^YR7y!v&0x|#q


From 7360fcd03eff59eaa8bb4541ef23f5acf39237c0 Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Thu, 10 Dec 2020 13:11:55 +0100
Subject: [PATCH 324/888] FIX: Bad rigths to send contract

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

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index dbdba874dda..368e09d8ccd 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2010-2017  Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2013       Christophe Battarel     <christophe.battarel@altairis.fr>
  * Copyright (C) 2013-2014  Florian Henry		  	<florian.henry@open-concept.pro>
- * Copyright (C) 2014-2018	Ferran Marcet		  	<fmarcet@2byte.es>
+ * Copyright (C) 2014-2020	Ferran Marcet		  	<fmarcet@2byte.es>
  * Copyright (C) 2014-2016  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
@@ -2108,7 +2108,7 @@ else
 				// Send
 				if (empty($user->socid)) {
 					if ($object->statut == 1) {
-						if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send)) {
+						if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->contrat->creer)) {
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
 						} else
 							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';

From 4f6923442a14da233b0554437d3add737cb155e0 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Thu, 10 Dec 2020 13:19:10 +0100
Subject: [PATCH 325/888] fix merge and sql synthax

---
 htdocs/core/boxes/box_funnel_of_prospection.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/boxes/box_funnel_of_prospection.php b/htdocs/core/boxes/box_funnel_of_prospection.php
index 5669fab7fe5..50b61f8de0e 100644
--- a/htdocs/core/boxes/box_funnel_of_prospection.php
+++ b/htdocs/core/boxes/box_funnel_of_prospection.php
@@ -97,8 +97,8 @@ class box_funnel_of_prospection extends ModeleBoxes
 		$sql = "SELECT cls.rowid, cls.code, cls.percent, cls.label";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "c_lead_status as cls";
 		$sql .= " WHERE active=1";
-		$sql .= " Order by cls.rowid";
-		$sql .= " AND cls.code != 'LOST'";
+		$sql .= " AND cls.code <> 'LOST'";
+		$sql .= $this->db->order('cls.rowid','ASC');
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -201,7 +201,7 @@ class box_funnel_of_prospection extends ModeleBoxes
 						}
 
 						$data[] = (isset($valsamount[$status]) ? (float) $valsamount[$status] : 0);
-
+						$liststatus[] = $labelStatus;
 						if (!$conf->use_javascript_ajax) {
 							$stringtoprint .= '<tr class="oddeven">';
 							$stringtoprint .= '<td>' . $labelStatus . '</td>';

From 0a2f6561377697b1ecf1a0f5f54589de5e9e1aa1 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 10 Dec 2020 12:19:43 +0000
Subject: [PATCH 326/888] Fixing style errors.

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

diff --git a/htdocs/core/boxes/box_funnel_of_prospection.php b/htdocs/core/boxes/box_funnel_of_prospection.php
index 50b61f8de0e..44b2bd9a90d 100644
--- a/htdocs/core/boxes/box_funnel_of_prospection.php
+++ b/htdocs/core/boxes/box_funnel_of_prospection.php
@@ -98,7 +98,7 @@ class box_funnel_of_prospection extends ModeleBoxes
 		$sql .= " FROM " . MAIN_DB_PREFIX . "c_lead_status as cls";
 		$sql .= " WHERE active=1";
 		$sql .= " AND cls.code <> 'LOST'";
-		$sql .= $this->db->order('cls.rowid','ASC');
+		$sql .= $this->db->order('cls.rowid', 'ASC');
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);

From 59938147b683f68a89d496c66ea920f6143345e2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Dec 2020 13:38:12 +0100
Subject: [PATCH 327/888] Prepare v13

---
 ....0.0.sql => mysqldump_dolibarr_13.0.0.sql} | 2599 +++++++++++++++--
 .../websites/website_template-corporate.zip   |  Bin 2151148 -> 2150595 bytes
 2 files changed, 2384 insertions(+), 215 deletions(-)
 rename dev/initdemo/{mysqldump_dolibarr_12.0.0.sql => mysqldump_dolibarr_13.0.0.sql} (82%)

diff --git a/dev/initdemo/mysqldump_dolibarr_12.0.0.sql b/dev/initdemo/mysqldump_dolibarr_13.0.0.sql
similarity index 82%
rename from dev/initdemo/mysqldump_dolibarr_12.0.0.sql
rename to dev/initdemo/mysqldump_dolibarr_13.0.0.sql
index a05c05c066e..53dbb39f977 100644
--- a/dev/initdemo/mysqldump_dolibarr_12.0.0.sql
+++ b/dev/initdemo/mysqldump_dolibarr_13.0.0.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.17  Distrib 10.3.22-MariaDB, for debian-linux-gnu (x86_64)
+-- MySQL dump 10.17  Distrib 10.3.25-MariaDB, for debian-linux-gnu (x86_64)
 --
--- Host: localhost    Database: dolibarr_12
+-- Host: localhost    Database: dolibarr_dev
 -- ------------------------------------------------------
--- Server version	10.3.22-MariaDB-1ubuntu1
+-- Server version	10.3.25-MariaDB-0ubuntu0.20.04.1
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -313,6 +313,7 @@ CREATE TABLE `llx_actioncomm` (
   `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `calling_duration` int(11) DEFAULT NULL,
   `visibility` varchar(12) COLLATE utf8_unicode_ci DEFAULT 'default',
+  `reply_to` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `idx_actioncomm_fk_soc` (`fk_soc`),
   KEY `idx_actioncomm_fk_contact` (`fk_contact`),
@@ -333,7 +334,7 @@ CREATE TABLE `llx_actioncomm` (
 
 LOCK TABLES `llx_actioncomm` WRITE;
 /*!40000 ALTER TABLE `llx_actioncomm` DISABLE KEYS */;
-INSERT INTO `llx_actioncomm` VALUES (1,NULL,1,'2012-07-08 14:21:44','2012-07-08 14:21:44',50,NULL,'Company AAA and Co added into Dolibarr','2012-07-08 14:21:44','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company AAA and Co added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(2,NULL,1,'2012-07-08 14:23:48','2012-07-08 14:23:48',50,NULL,'Company Belin SARL added into Dolibarr','2012-07-08 14:23:48','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Belin SARL added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(3,NULL,1,'2012-07-08 22:42:12','2012-07-08 22:42:12',50,NULL,'Company Spanish Comp added into Dolibarr','2012-07-08 22:42:12','2016-12-21 12:50:33',1,NULL,NULL,3,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Spanish Comp added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(4,NULL,1,'2012-07-08 22:48:18','2012-07-08 22:48:18',50,NULL,'Company Prospector Vaalen added into Dolibarr','2012-07-08 22:48:18','2016-12-21 12:50:33',1,NULL,NULL,4,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Prospector Vaalen added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(5,NULL,1,'2012-07-08 23:22:57','2012-07-08 23:22:57',50,NULL,'Company NoCountry Co added into Dolibarr','2012-07-08 23:22:57','2016-12-21 12:50:33',1,NULL,NULL,5,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company NoCountry Co added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(6,NULL,1,'2012-07-09 00:15:09','2012-07-09 00:15:09',50,NULL,'Company Swiss customer added into Dolibarr','2012-07-09 00:15:09','2016-12-21 12:50:33',1,NULL,NULL,6,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Swiss customer added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(7,NULL,1,'2012-07-09 01:24:26','2012-07-09 01:24:26',50,NULL,'Company Generic customer added into Dolibarr','2012-07-09 01:24:26','2016-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Generic customer added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(8,NULL,1,'2012-07-10 14:54:27','2012-07-10 14:54:27',50,NULL,'Société Client salon ajoutée dans Dolibarr','2012-07-10 14:54:27','2016-12-21 12:50:33',1,NULL,NULL,8,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Client salon ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(9,NULL,1,'2012-07-10 14:54:44','2012-07-10 14:54:44',50,NULL,'Société Client salon invidivdu ajoutée dans Doliba','2012-07-10 14:54:44','2016-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Client salon invidivdu ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(10,NULL,1,'2012-07-10 14:56:10','2012-07-10 14:56:10',50,NULL,'Facture FA1007-0001 validée dans Dolibarr','2012-07-10 14:56:10','2016-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Facture FA1007-0001 validée dans Dolibarr\nAuteur: admin',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(11,NULL,1,'2012-07-10 14:58:53','2012-07-10 14:58:53',50,NULL,'Facture FA1007-0001 validée dans Dolibarr','2012-07-10 14:58:53','2016-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Facture FA1007-0001 validée dans Dolibarr\nAuteur: admin',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(12,NULL,1,'2012-07-10 15:00:55','2012-07-10 15:00:55',50,NULL,'Facture FA1007-0001 passée à payée dans Dolibarr','2012-07-10 15:00:55','2016-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Facture FA1007-0001 passée à payée dans Dolibarr\nAuteur: admin',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(13,NULL,1,'2012-07-10 15:13:08','2012-07-10 15:13:08',50,NULL,'Société Smith Vick ajoutée dans Dolibarr','2012-07-10 15:13:08','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Smith Vick ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(14,NULL,1,'2012-07-10 15:21:00','2012-07-10 16:21:00',5,NULL,'RDV avec mon chef','2012-07-10 15:21:48','2012-07-10 13:21:48',1,NULL,NULL,NULL,NULL,0,1,NULL,NULL,0,0,0,'',3600,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(15,NULL,1,'2012-07-10 18:18:16','2012-07-10 18:18:16',50,NULL,'Contrat CONTRAT1 validé dans Dolibarr','2012-07-10 18:18:16','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Contrat CONTRAT1 validé dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(16,NULL,1,'2012-07-10 18:35:57','2012-07-10 18:35:57',50,NULL,'Société Mon client ajoutée dans Dolibarr','2012-07-10 18:35:57','2016-12-21 12:50:33',1,NULL,NULL,11,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Mon client ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(17,NULL,1,'2012-07-11 16:18:08','2012-07-11 16:18:08',50,NULL,'Société Dupont Alain ajoutée dans Dolibarr','2012-07-11 16:18:08','2016-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Dupont Alain ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(18,NULL,1,'2012-07-11 17:11:00','2012-07-11 17:17:00',5,NULL,'Rendez-vous','2012-07-11 17:11:22','2012-07-11 15:11:22',1,NULL,NULL,NULL,NULL,0,1,NULL,NULL,0,0,0,'gfgdfgdf',360,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(19,NULL,1,'2012-07-11 17:13:20','2012-07-11 17:13:20',50,NULL,'Société Vendeur de chips ajoutée dans Dolibarr','2012-07-11 17:13:20','2016-12-21 12:50:33',1,NULL,NULL,13,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Vendeur de chips ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(20,NULL,1,'2012-07-11 17:15:42','2012-07-11 17:15:42',50,NULL,'Commande CF1007-0001 validée','2012-07-11 17:15:42','2016-12-21 12:50:33',1,NULL,NULL,13,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Commande CF1007-0001 validée\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(21,NULL,1,'2012-07-11 18:47:33','2012-07-11 18:47:33',50,NULL,'Commande CF1007-0002 validée','2012-07-11 18:47:33','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Commande CF1007-0002 validée\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(22,NULL,1,'2012-07-18 11:36:18','2012-07-18 11:36:18',50,NULL,'Proposition PR1007-0003 validée','2012-07-18 11:36:18','2016-12-21 12:50:33',1,NULL,NULL,4,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Proposition PR1007-0003 validée\nAuteur: admin',3,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(23,NULL,1,'2013-07-18 20:49:58','2013-07-18 20:49:58',50,NULL,'Invoice FA1007-0002 validated in Dolibarr','2013-07-18 20:49:58','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1007-0002 validated in Dolibarr\nAuthor: admin',2,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(24,NULL,1,'2013-07-28 01:37:00',NULL,1,NULL,'Phone call','2013-07-28 01:37:48','2013-07-27 23:37:48',1,NULL,NULL,NULL,2,0,1,NULL,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(25,NULL,1,'2013-08-01 02:31:24','2013-08-01 02:31:24',50,NULL,'Company mmm added into Dolibarr','2013-08-01 02:31:24','2016-12-21 12:50:33',1,NULL,NULL,15,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company mmm added into Dolibarr\nAuthor: admin',15,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(26,NULL,1,'2013-08-01 02:31:43','2013-08-01 02:31:43',50,NULL,'Company ppp added into Dolibarr','2013-08-01 02:31:43','2016-12-21 12:50:33',1,NULL,NULL,16,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company ppp added into Dolibarr\nAuthor: admin',16,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(27,NULL,1,'2013-08-01 02:41:26','2013-08-01 02:41:26',50,NULL,'Company aaa added into Dolibarr','2013-08-01 02:41:26','2016-12-21 12:50:33',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company aaa added into Dolibarr\nAuthor: admin',17,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(28,NULL,1,'2013-08-01 03:34:11','2013-08-01 03:34:11',50,NULL,'Invoice FA1108-0003 validated in Dolibarr','2013-08-01 03:34:11','2016-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0003 validated in Dolibarr\nAuthor: admin',5,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(29,NULL,1,'2013-08-01 03:34:11','2013-08-01 03:34:11',50,NULL,'Invoice FA1108-0003 validated in Dolibarr','2013-08-01 03:34:11','2016-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0003 changed to paid in Dolibarr\nAuthor: admin',5,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(30,NULL,1,'2013-08-06 20:33:54','2013-08-06 20:33:54',50,NULL,'Invoice FA1108-0004 validated in Dolibarr','2013-08-06 20:33:54','2016-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0004 validated in Dolibarr\nAuthor: admin',6,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(31,NULL,1,'2013-08-06 20:33:54','2013-08-06 20:33:54',50,NULL,'Invoice FA1108-0004 validated in Dolibarr','2013-08-06 20:33:54','2016-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0004 changed to paid in Dolibarr\nAuthor: admin',6,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(38,NULL,1,'2013-08-08 02:41:55','2013-08-08 02:41:55',50,NULL,'Invoice FA1108-0005 validated in Dolibarr','2013-08-08 02:41:55','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0005 validated in Dolibarr\nAuthor: admin',8,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(40,NULL,1,'2013-08-08 02:53:40','2013-08-08 02:53:40',50,NULL,'Invoice FA1108-0005 changed to paid in Dolibarr','2013-08-08 02:53:40','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0005 changed to paid in Dolibarr\nAuthor: admin',8,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(41,NULL,1,'2013-08-08 02:54:05','2013-08-08 02:54:05',50,NULL,'Invoice FA1007-0002 changed to paid in Dolibarr','2013-08-08 02:54:05','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1007-0002 changed to paid in Dolibarr\nAuthor: admin',2,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(42,NULL,1,'2013-08-08 02:55:04','2013-08-08 02:55:04',50,NULL,'Invoice FA1107-0006 validated in Dolibarr','2013-08-08 02:55:04','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1107-0006 validated in Dolibarr\nAuthor: admin',3,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(43,NULL,1,'2013-08-08 02:55:26','2013-08-08 02:55:26',50,NULL,'Invoice FA1108-0007 validated in Dolibarr','2013-08-08 02:55:26','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0007 validated in Dolibarr\nAuthor: admin',9,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(44,NULL,1,'2013-08-08 02:55:58','2013-08-08 02:55:58',50,NULL,'Invoice FA1107-0006 changed to paid in Dolibarr','2013-08-08 02:55:58','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1107-0006 changed to paid in Dolibarr\nAuthor: admin',3,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(45,NULL,1,'2013-08-08 03:04:22','2013-08-08 03:04:22',50,NULL,'Order CO1108-0001 validated','2013-08-08 03:04:22','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Order CO1108-0001 validated\nAuthor: admin',5,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(46,NULL,1,'2013-08-08 13:59:09','2013-08-08 13:59:09',50,NULL,'Order CO1107-0002 validated','2013-08-08 13:59:10','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Order CO1107-0002 validated\nAuthor: admin',1,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(47,NULL,1,'2013-08-08 14:24:18','2013-08-08 14:24:18',50,NULL,'Proposal PR1007-0001 validated','2013-08-08 14:24:18','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposal PR1007-0001 validated\nAuthor: admin',1,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(48,NULL,1,'2013-08-08 14:24:24','2013-08-08 14:24:24',50,NULL,'Proposal PR1108-0004 validated','2013-08-08 14:24:24','2016-12-21 12:50:33',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposal PR1108-0004 validated\nAuthor: admin',4,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(49,NULL,1,'2013-08-08 15:04:37','2013-08-08 15:04:37',50,NULL,'Order CF1108-0003 validated','2013-08-08 15:04:37','2016-12-21 12:50:33',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Order CF1108-0003 validated\nAuthor: admin',6,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(50,NULL,1,'2014-12-08 17:56:47','2014-12-08 17:56:47',40,NULL,'Facture AV1212-0001 validée dans Dolibarr','2014-12-08 17:56:47','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture AV1212-0001 validée dans Dolibarr\nAuteur: admin',10,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(51,NULL,1,'2014-12-08 17:57:11','2014-12-08 17:57:11',40,NULL,'Facture AV1212-0001 validée dans Dolibarr','2014-12-08 17:57:11','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture AV1212-0001 validée dans Dolibarr\nAuteur: admin',10,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(52,NULL,1,'2014-12-08 17:58:27','2014-12-08 17:58:27',40,NULL,'Facture FA1212-0008 validée dans Dolibarr','2014-12-08 17:58:27','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1212-0008 validée dans Dolibarr\nAuteur: admin',11,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(53,NULL,1,'2014-12-08 18:20:49','2014-12-08 18:20:49',40,NULL,'Facture AV1212-0002 validée dans Dolibarr','2014-12-08 18:20:49','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture AV1212-0002 validée dans Dolibarr\nAuteur: admin',12,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(54,NULL,1,'2014-12-09 18:35:07','2014-12-09 18:35:07',40,NULL,'Facture AV1212-0002 passée à payée dans Dolibarr','2014-12-09 18:35:07','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture AV1212-0002 passée à payée dans Dolibarr\nAuteur: admin',12,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(55,NULL,1,'2014-12-09 20:14:42','2014-12-09 20:14:42',40,NULL,'Société doe john ajoutée dans Dolibarr','2014-12-09 20:14:42','2016-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Société doe john ajoutée dans Dolibarr\nAuteur: admin',18,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(56,NULL,1,'2014-12-12 18:54:19','2014-12-12 18:54:19',40,NULL,'Facture FA1212-0009 validée dans Dolibarr','2014-12-12 18:54:19','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1212-0009 validée dans Dolibarr\nAuteur: admin',55,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(121,NULL,1,'2014-12-06 10:00:00',NULL,50,NULL,'aaab','2014-12-21 17:48:08','2014-12-21 16:54:07',3,1,NULL,NULL,NULL,0,3,NULL,NULL,1,0,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(122,NULL,1,'2014-12-21 18:09:52','2014-12-21 18:09:52',40,NULL,'Facture client FA1007-0001 envoyée par EMail','2014-12-21 18:09:52','2016-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Mail envoyé par Firstname SuperAdminName <bidon@example.com> à laurent@mycompany.fr.\nSujet du mail: Envoi facture FA1007-0001\nCorps du mail:\nVeuillez trouver ci-joint la facture FA1007-0001\r\n\r\nVous pouvez cliquer sur le lien sécurisé ci-dessous pour effectuer votre paiement via Paypal\r\n\r\nhttp://localhost/dolibarrnew/public/paypal/newpayment.php?source=invoice&ref=FA1007-0001&securekey=50c82fab36bb3b6aa83e2a50691803b2\r\n\r\nCordialement',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(123,NULL,1,'2015-01-06 13:13:57','2015-01-06 13:13:57',40,NULL,'Facture 16 validée dans Dolibarr','2015-01-06 13:13:57','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture 16 validée dans Dolibarr\nAuteur: admin',16,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(124,NULL,1,'2015-01-12 12:23:05','2015-01-12 12:23:05',40,NULL,'Patient aaa ajouté','2015-01-12 12:23:05','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Patient aaa ajouté\nAuteur: admin',19,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(125,NULL,1,'2015-01-12 12:52:20','2015-01-12 12:52:20',40,NULL,'Patient pppoo ajouté','2015-01-12 12:52:20','2016-12-21 12:50:33',1,NULL,NULL,20,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Patient pppoo ajouté\nAuteur: admin',20,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(127,NULL,1,'2015-01-19 18:22:48','2015-01-19 18:22:48',40,NULL,'Facture FS1301-0001 validée dans Dolibarr','2015-01-19 18:22:48','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FS1301-0001 validée dans Dolibarr\nAuteur: admin',148,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(128,NULL,1,'2015-01-19 18:31:10','2015-01-19 18:31:10',40,NULL,'Facture FA6801-0010 validée dans Dolibarr','2015-01-19 18:31:10','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA6801-0010 validée dans Dolibarr\nAuteur: admin',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(129,NULL,1,'2015-01-19 18:31:10','2015-01-19 18:31:10',40,NULL,'Facture FA6801-0010 passée à payée dans Dolibarr','2015-01-19 18:31:10','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA6801-0010 passée à payée dans Dolibarr\nAuteur: admin',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(130,NULL,1,'2015-01-19 18:31:58','2015-01-19 18:31:58',40,NULL,'Facture FS1301-0002 validée dans Dolibarr','2015-01-19 18:31:58','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FS1301-0002 validée dans Dolibarr\nAuteur: admin',151,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(131,NULL,1,'2015-01-19 18:31:58','2015-01-19 18:31:58',40,NULL,'Facture FS1301-0002 passée à payée dans Dolibarr','2015-01-19 18:31:58','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FS1301-0002 passée à payée dans Dolibarr\nAuteur: admin',151,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(132,NULL,1,'2015-01-23 15:07:54','2015-01-23 15:07:54',50,NULL,'Consultation 24 saisie (aaa)','2015-01-23 15:07:54','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Consultation 24 saisie (aaa)\nAuteur: admin',24,'cabinetmed_cons',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(133,NULL,1,'2015-01-23 16:56:58','2015-01-23 16:56:58',40,NULL,'Patient pa ajouté','2015-01-23 16:56:58','2016-12-21 12:50:33',1,NULL,NULL,21,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Patient pa ajouté\nAuteur: admin',21,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(134,NULL,1,'2015-01-23 17:34:00',NULL,50,NULL,'bbcv','2015-01-23 17:35:21','2015-01-23 16:35:21',1,NULL,1,2,NULL,0,1,NULL,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(135,NULL,1,'2015-02-12 15:54:00','2015-02-12 15:54:00',40,NULL,'Facture FA1212-0011 validée dans Dolibarr','2015-02-12 15:54:37','2016-12-21 12:50:33',1,1,NULL,7,NULL,0,1,NULL,1,0,0,50,NULL,NULL,NULL,'Facture FA1212-0011 valid&eacute;e dans Dolibarr<br />\r\nAuteur: admin',13,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(136,NULL,1,'2015-02-12 17:06:51','2015-02-12 17:06:51',40,NULL,'Commande CO1107-0003 validée','2015-02-12 17:06:51','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Commande CO1107-0003 validée\nAuteur: admin',2,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(137,NULL,1,'2015-02-17 16:22:10','2015-02-17 16:22:10',40,NULL,'Proposition PR1302-0009 validée','2015-02-17 16:22:10','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposition PR1302-0009 validée\nAuteur: admin',9,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(138,NULL,1,'2015-02-17 16:27:00','2015-02-17 16:27:00',40,NULL,'Facture FA1302-0012 validée dans Dolibarr','2015-02-17 16:27:00','2016-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1302-0012 validée dans Dolibarr\nAuteur: admin',152,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(139,NULL,1,'2015-02-17 16:27:29','2015-02-17 16:27:29',40,NULL,'Proposition PR1302-0010 validée','2015-02-17 16:27:29','2016-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposition PR1302-0010 validée\nAuteur: admin',11,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(140,NULL,1,'2015-02-17 18:27:56','2015-02-17 18:27:56',40,NULL,'Commande CO1107-0004 validée','2015-02-17 18:27:56','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Commande CO1107-0004 validée\nAuteur: admin',3,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(141,NULL,1,'2015-02-17 18:38:14','2015-02-17 18:38:14',40,NULL,'Commande CO1302-0005 validée','2015-02-17 18:38:14','2016-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Commande CO1302-0005 validée\nAuteur: admin',7,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(142,NULL,1,'2015-02-26 22:57:50','2015-02-26 22:57:50',40,NULL,'Company pppp added into Dolibarr','2015-02-26 22:57:50','2016-12-21 12:50:33',1,NULL,NULL,22,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company pppp added into Dolibarr\nAuthor: admin',22,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(143,NULL,1,'2015-02-26 22:58:13','2015-02-26 22:58:13',40,NULL,'Company ttttt added into Dolibarr','2015-02-26 22:58:13','2016-12-21 12:50:33',1,NULL,NULL,23,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company ttttt added into Dolibarr\nAuthor: admin',23,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(144,NULL,1,'2015-02-27 10:00:00','2015-02-27 19:20:00',5,NULL,'Rendez-vous','2015-02-27 19:20:53','2015-02-27 18:20:53',1,NULL,NULL,NULL,NULL,0,1,NULL,1,0,0,-1,'',33600,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(145,NULL,1,'2015-02-27 19:28:00',NULL,2,NULL,'fdsfsd','2015-02-27 19:28:48','2015-02-27 18:29:53',1,1,NULL,NULL,NULL,0,1,NULL,1,0,0,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(146,NULL,1,'2015-03-06 10:05:07','2015-03-06 10:05:07',40,NULL,'Contrat (PROV3) validé dans Dolibarr','2015-03-06 10:05:07','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Contrat (PROV3) validé dans Dolibarr\nAuteur: admin',3,'contract',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(147,NULL,1,'2015-03-06 16:43:37','2015-03-06 16:43:37',40,NULL,'Facture FA1307-0013 validée dans Dolibarr','2015-03-06 16:43:37','2016-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1307-0013 validée dans Dolibarr\nAuteur: admin',158,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(148,NULL,1,'2015-03-06 16:44:12','2015-03-06 16:44:12',40,NULL,'Facture FA1407-0014 validée dans Dolibarr','2015-03-06 16:44:12','2016-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1407-0014 validée dans Dolibarr\nAuteur: admin',159,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(149,NULL,1,'2015-03-06 16:47:48','2015-03-06 16:47:48',40,NULL,'Facture FA1507-0015 validée dans Dolibarr','2015-03-06 16:47:48','2016-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1507-0015 validée dans Dolibarr\nAuteur: admin',160,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(150,NULL,1,'2015-03-06 16:48:16','2015-03-06 16:48:16',40,NULL,'Facture FA1607-0016 validée dans Dolibarr','2015-03-06 16:48:16','2016-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1607-0016 validée dans Dolibarr\nAuteur: admin',161,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(151,NULL,1,'2015-03-06 17:13:59','2015-03-06 17:13:59',40,NULL,'Société smith smith ajoutée dans Dolibarr','2015-03-06 17:13:59','2016-12-21 12:50:33',1,NULL,NULL,24,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Société smith smith ajoutée dans Dolibarr\nAuteur: admin',24,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(152,NULL,1,'2015-03-08 10:02:22','2015-03-08 10:02:22',40,NULL,'Proposition (PROV12) validée dans Dolibarr','2015-03-08 10:02:22','2016-12-21 12:50:33',1,NULL,NULL,23,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposition (PROV12) validée dans Dolibarr\nAuteur: admin',12,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(203,NULL,1,'2015-03-09 19:39:27','2015-03-09 19:39:27',40,'AC_ORDER_SUPPLIER_VALIDATE','Commande CF1303-0004 validée','2015-03-09 19:39:27','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Commande CF1303-0004 validée\nAuteur: admin',13,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(204,NULL,1,'2015-03-10 15:47:37','2015-03-10 15:47:37',40,'AC_COMPANY_CREATE','Patient créé','2015-03-10 15:47:37','2016-12-21 12:50:33',1,NULL,NULL,25,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Patient créé\nAuteur: admin',25,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(205,NULL,1,'2015-03-10 15:57:32','2015-03-10 15:57:32',40,'AC_COMPANY_CREATE','Tiers créé','2015-03-10 15:57:32','2016-12-21 12:50:33',1,NULL,NULL,26,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Tiers créé\nAuteur: admin',26,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(206,NULL,1,'2015-03-10 15:58:28','2015-03-10 15:58:28',40,'AC_BILL_VALIDATE','Facture FA1303-0017 validée','2015-03-10 15:58:28','2016-12-21 12:50:33',1,NULL,NULL,26,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1303-0017 validée\nAuteur: admin',208,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(207,NULL,1,'2015-03-19 09:38:10','2015-03-19 09:38:10',40,'AC_BILL_VALIDATE','Facture FA1303-0018 validée','2015-03-19 09:38:10','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1303-0018 validée\nAuteur: admin',209,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(208,NULL,1,'2015-03-20 14:30:11','2015-03-20 14:30:11',40,'AC_BILL_VALIDATE','Facture FA1107-0019 validée','2015-03-20 14:30:11','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1107-0019 validée\nAuteur: admin',210,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(209,NULL,1,'2015-03-22 09:40:25','2015-03-22 09:40:25',40,'AC_BILL_VALIDATE','Facture FA1303-0020 validée','2015-03-22 09:40:25','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1303-0020 validée\nAuteur: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(210,NULL,1,'2015-03-23 17:16:25','2015-03-23 17:16:25',40,'AC_BILL_VALIDATE','Facture FA1303-0020 validée','2015-03-23 17:16:25','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1303-0020 validée\nAuteur: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(211,NULL,1,'2015-03-23 18:08:27','2015-03-23 18:08:27',40,'AC_BILL_VALIDATE','Facture FA1307-0013 validée','2015-03-23 18:08:27','2016-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1307-0013 validée\nAuteur: admin',158,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(212,NULL,1,'2015-03-24 15:54:00','2015-03-24 15:54:00',40,'AC_BILL_VALIDATE','Facture FA1212-0021 validée','2015-03-24 15:54:00','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1212-0021 validée\nAuteur: admin',32,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(213,NULL,1,'2015-11-07 01:02:39','2015-11-07 01:02:39',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:02:39','2016-12-21 12:50:33',1,NULL,NULL,27,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',27,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(214,NULL,1,'2015-11-07 01:05:22','2015-11-07 01:05:22',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:05:22','2016-12-21 12:50:33',1,NULL,NULL,28,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',28,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(215,NULL,1,'2015-11-07 01:07:07','2015-11-07 01:07:07',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:07:07','2016-12-21 12:50:33',1,NULL,NULL,29,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',29,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(216,NULL,1,'2015-11-07 01:07:58','2015-11-07 01:07:58',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:07:58','2016-12-21 12:50:33',1,NULL,NULL,30,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',30,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(217,NULL,1,'2015-11-07 01:10:09','2015-11-07 01:10:09',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:10:09','2016-12-21 12:50:33',1,NULL,NULL,31,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',31,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(218,NULL,1,'2015-11-07 01:15:57','2015-11-07 01:15:57',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:15:57','2016-12-21 12:50:33',1,NULL,NULL,32,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',32,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(219,NULL,1,'2015-11-07 01:16:51','2015-11-07 01:16:51',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:16:51','2016-12-21 12:50:33',1,NULL,NULL,33,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',33,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(220,NULL,1,'2016-03-02 17:24:04','2016-03-02 17:24:04',40,'AC_BILL_VALIDATE','Invoice FA1302-0022 validated','2016-03-02 17:24:04','2016-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1302-0022 validated\nAuthor: admin',157,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(221,NULL,1,'2016-03-02 17:24:28','2016-03-02 17:24:28',40,'AC_BILL_VALIDATE','Invoice FA1303-0020 validated','2016-03-02 17:24:28','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1303-0020 validated\nAuthor: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(222,NULL,1,'2016-03-05 10:00:00','2016-03-05 10:00:00',5,NULL,'RDV John','2016-03-02 19:54:48','2016-03-02 18:55:29',1,1,NULL,NULL,NULL,0,1,0,NULL,0,0,-1,NULL,NULL,NULL,'gfdgdfgdf',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(223,NULL,1,'2016-03-13 10:00:00','2016-03-17 00:00:00',50,NULL,'Congress','2016-03-02 19:55:11','2016-03-02 18:55:11',1,NULL,NULL,NULL,NULL,0,1,0,NULL,0,0,-1,'',309600,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(224,NULL,1,'2016-03-14 10:00:00',NULL,1,NULL,'Call john','2016-03-02 19:55:56','2016-03-02 18:55:56',1,NULL,NULL,NULL,NULL,0,1,0,NULL,0,0,0,'',NULL,NULL,'tttt',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(225,NULL,1,'2016-03-02 20:11:31','2016-03-02 20:11:31',40,'AC_BILL_UNVALIDATE','Invoice FA1303-0020 go back to draft status','2016-03-02 20:11:31','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1303-0020 go back to draft status\nAuthor: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(226,NULL,1,'2016-03-02 20:13:39','2016-03-02 20:13:39',40,'AC_BILL_VALIDATE','Invoice FA1303-0020 validated','2016-03-02 20:13:39','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1303-0020 validated\nAuthor: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(227,NULL,1,'2016-03-03 19:20:10','2016-03-03 19:20:10',40,'AC_BILL_VALIDATE','Invoice FA1212-0023 validated','2016-03-03 19:20:10','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1212-0023 validated\nAuthor: admin',33,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(228,NULL,1,'2016-03-03 19:20:25','2016-03-03 19:20:25',40,'AC_BILL_CANCEL','Invoice FA1212-0023 canceled in Dolibarr','2016-03-03 19:20:25','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1212-0023 canceled in Dolibarr\nAuthor: admin',33,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(229,NULL,1,'2016-03-03 19:20:56','2016-03-03 19:20:56',40,'AC_BILL_VALIDATE','Invoice AV1403-0003 validated','2016-03-03 19:20:56','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice AV1403-0003 validated\nAuthor: admin',212,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(230,NULL,1,'2016-03-03 19:21:29','2016-03-03 19:21:29',40,'AC_BILL_UNVALIDATE','Invoice AV1403-0003 go back to draft status','2016-03-03 19:21:29','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice AV1403-0003 go back to draft status\nAuthor: admin',212,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(231,NULL,1,'2016-03-03 19:22:16','2016-03-03 19:22:16',40,'AC_BILL_VALIDATE','Invoice AV1303-0003 validated','2016-03-03 19:22:16','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice AV1303-0003 validated\nAuthor: admin',213,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(232,NULL,1,'2018-01-22 18:54:39','2018-01-22 18:54:39',40,'AC_OTH_AUTO','Invoice 16 validated','2018-01-22 18:54:39','2018-01-22 17:54:39',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Invoice 16 validated\nAuthor: admin',16,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(233,NULL,1,'2018-01-22 18:54:46','2018-01-22 18:54:46',40,'AC_OTH_AUTO','Invoice 16 validated','2018-01-22 18:54:46','2018-01-22 17:54:46',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Invoice 16 validated\nAuthor: admin',16,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(234,NULL,1,'2018-07-05 10:00:00','2018-07-05 11:19:00',5,'AC_RDV','Meeting with my boss','2018-07-31 18:19:48','2018-07-31 14:19:48',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,0,-1,'',4740,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(235,NULL,1,'2018-07-13 00:00:00','2018-07-14 23:59:59',50,'AC_OTH','Trip at Las Vegas','2018-07-31 18:20:36','2018-07-31 14:20:36',12,NULL,4,NULL,2,0,12,1,NULL,0,1,-1,'',172799,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(236,NULL,1,'2018-07-29 10:00:00',NULL,4,'AC_EMAIL','Remind to send an email','2018-07-31 18:21:04','2018-07-31 14:21:04',12,NULL,NULL,NULL,NULL,0,4,0,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(237,NULL,1,'2018-07-01 10:00:00',NULL,1,'AC_TEL','Phone call with Mr Vaalen','2018-07-31 18:22:04','2018-07-31 14:22:04',12,NULL,6,4,NULL,0,13,0,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(238,NULL,1,'2018-08-02 10:00:00','2018-08-02 12:00:00',5,'AC_RDV','Meeting on radium','2018-08-01 01:15:50','2018-07-31 21:15:50',12,NULL,8,10,10,0,12,1,NULL,0,0,-1,'',7200,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(239,NULL,1,'2017-01-29 21:49:33','2017-01-29 21:49:33',40,'AC_OTH_AUTO','Proposal PR1302-0007 validated','2017-01-29 21:49:33','2017-01-29 17:49:33',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1302-0007 validated\nAuthor: admin',7,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(240,NULL,1,'2017-01-31 20:52:00',NULL,1,'AC_TEL','Call the boss','2017-01-31 20:52:10','2017-01-31 16:52:25',12,12,6,NULL,NULL,0,12,1,NULL,0,0,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(242,NULL,1,'2017-02-01 18:52:04','2017-02-01 18:52:04',40,'AC_OTH_AUTO','Order CF1007-0001 validated','2017-02-01 18:52:04','2017-02-01 14:52:04',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CF1007-0001 validated\nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(243,NULL,1,'2017-02-01 18:52:04','2017-02-01 18:52:04',40,'AC_OTH_AUTO','Order CF1007-0001 approved','2017-02-01 18:52:04','2017-02-01 14:52:04',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CF1007-0001 approved\nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(245,NULL,1,'2017-02-01 18:52:32','2017-02-01 18:52:32',40,'AC_OTH_AUTO','Supplier order CF1007-0001 submited','2017-02-01 18:52:32','2017-02-01 14:52:32',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Supplier order CF1007-0001 submited\nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(249,NULL,1,'2017-02-01 18:54:01','2017-02-01 18:54:01',40,'AC_OTH_AUTO','Supplier order CF1007-0001 received','2017-02-01 18:54:01','2017-02-01 14:54:01',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Supplier order CF1007-0001 received \nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(250,NULL,1,'2017-02-01 18:54:42','2017-02-01 18:54:42',40,'AC_OTH_AUTO','Email sent by MyBigCompany To mycustomer@example.com','2017-02-01 18:54:42','2017-02-01 14:54:42',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Sender: MyBigCompany &lt;myemail@mybigcompany.com&gt;<br>\nReceiver(s): mycustomer@example.com<br>\nEMail topic: Submission of order CF1007-0001<br>\nEmail body:<br>\nYou will find here our order CF1007-0001<br />\r\n<br />\r\nSincerely<br>\n<br>\nAttached files and documents: CF1007-0001.pdf',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(251,NULL,1,'2017-02-01 19:02:21','2017-02-01 19:02:21',40,'AC_OTH_AUTO','Invoice SI1702-0001 validated','2017-02-01 19:02:21','2017-02-01 15:02:21',12,NULL,5,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Invoice SI1702-0001 validated\nAuthor: admin',20,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(252,NULL,1,'2017-02-12 23:17:04','2017-02-12 23:17:04',40,'AC_OTH_AUTO','Patient créé','2017-02-12 23:17:04','2017-02-12 19:17:04',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Patient créé\nAuthor: admin',26,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(253,NULL,1,'2017-02-12 23:18:33','2017-02-12 23:18:33',40,'AC_OTH_AUTO','Consultation 2 recorded (aaa)','2017-02-12 23:18:33','2017-02-12 19:18:33',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Consultation 2 recorded (aaa)\nAuthor: admin',2,'cabinetmed_cons',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(254,NULL,1,'2017-02-15 23:28:41','2017-02-15 23:28:41',40,'AC_OTH_AUTO','Order CO7001-0005 validated','2017-02-15 23:28:41','2017-02-15 22:28:41',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0005 validated\nAuthor: admin',7,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(255,NULL,1,'2017-02-15 23:28:56','2017-02-15 23:28:56',40,'AC_OTH_AUTO','Order CO7001-0006 validated','2017-02-15 23:28:56','2017-02-15 22:28:56',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0006 validated\nAuthor: admin',8,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(256,NULL,1,'2017-02-15 23:34:33','2017-02-15 23:34:33',40,'AC_OTH_AUTO','Order CO7001-0007 validated','2017-02-15 23:34:33','2017-02-15 22:34:33',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0007 validated\nAuthor: admin',9,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(257,NULL,1,'2017-02-15 23:35:03','2017-02-15 23:35:03',40,'AC_OTH_AUTO','Order CO7001-0008 validated','2017-02-15 23:35:03','2017-02-15 22:35:03',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0008 validated\nAuthor: admin',10,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(263,NULL,1,'2017-02-15 23:50:34','2017-02-15 23:50:34',40,'AC_OTH_AUTO','Order CO7001-0005 validated','2017-02-15 23:50:34','2017-02-15 22:50:34',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0005 validated\nAuthor: admin',17,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(264,NULL,1,'2017-02-15 23:51:23','2017-02-15 23:51:23',40,'AC_OTH_AUTO','Order CO7001-0006 validated','2017-02-15 23:51:23','2017-02-15 22:51:23',12,NULL,NULL,7,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0006 validated\nAuthor: admin',18,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(265,NULL,1,'2017-02-15 23:54:51','2017-02-15 23:54:51',40,'AC_OTH_AUTO','Order CO7001-0007 validated','2017-02-15 23:54:51','2017-02-15 22:54:51',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0007 validated\nAuthor: admin',19,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(266,NULL,1,'2017-02-15 23:55:52','2017-02-15 23:55:52',40,'AC_OTH_AUTO','Order CO7001-0007 validated','2017-02-15 23:55:52','2017-02-15 22:55:52',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0007 validated\nAuthor: admin',20,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(267,NULL,1,'2017-02-16 00:03:44','2017-02-16 00:03:44',40,'AC_OTH_AUTO','Order CO7001-0008 validated','2017-02-16 00:03:44','2017-02-15 23:03:44',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0008 validated\nAuthor: admin',29,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(268,NULL,1,'2017-02-16 00:05:01','2017-02-16 00:05:01',40,'AC_OTH_AUTO','Order CO7001-0009 validated','2017-02-16 00:05:01','2017-02-15 23:05:01',12,NULL,NULL,11,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0009 validated\nAuthor: admin',34,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(269,NULL,1,'2017-02-16 00:05:01','2017-02-16 00:05:01',40,'AC_OTH_AUTO','Order CO7001-0010 validated','2017-02-16 00:05:01','2017-02-15 23:05:01',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0010 validated\nAuthor: admin',38,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(270,NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0011 validated','2017-02-16 00:05:11','2017-02-15 23:05:11',12,NULL,NULL,11,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0011 validated\nAuthor: admin',40,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(271,NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0012 validated','2017-02-16 00:05:11','2017-02-15 23:05:11',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0012 validated\nAuthor: admin',43,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(272,NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0013 validated','2017-02-16 00:05:11','2017-02-15 23:05:11',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0013 validated\nAuthor: admin',47,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(273,NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0014 validated','2017-02-16 00:05:11','2017-02-15 23:05:11',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0014 validated\nAuthor: admin',48,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(274,NULL,1,'2017-02-16 00:05:26','2017-02-16 00:05:26',40,'AC_OTH_AUTO','Order CO7001-0015 validated','2017-02-16 00:05:26','2017-02-15 23:05:26',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0015 validated\nAuthor: admin',50,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(275,NULL,1,'2017-02-16 00:05:26','2017-02-16 00:05:26',40,'AC_OTH_AUTO','Order CO7001-0016 validated','2017-02-16 00:05:26','2017-02-15 23:05:26',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0016 validated\nAuthor: admin',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(277,NULL,1,'2017-02-16 00:05:35','2017-02-16 00:05:35',40,'AC_OTH_AUTO','Order CO7001-0018 validated','2017-02-16 00:05:35','2017-02-15 23:05:35',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0018 validated\nAuthor: admin',62,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(278,NULL,1,'2017-02-16 00:05:35','2017-02-16 00:05:35',40,'AC_OTH_AUTO','Order CO7001-0019 validated','2017-02-16 00:05:35','2017-02-15 23:05:35',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0019 validated\nAuthor: admin',68,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(279,NULL,1,'2017-02-16 00:05:36','2017-02-16 00:05:36',40,'AC_OTH_AUTO','Order CO7001-0020 validated','2017-02-16 00:05:36','2017-02-15 23:05:36',12,NULL,NULL,6,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0020 validated\nAuthor: admin',72,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(281,NULL,1,'2017-02-16 00:05:37','2017-02-16 00:05:37',40,'AC_OTH_AUTO','Order CO7001-0022 validated','2017-02-16 00:05:37','2017-02-15 23:05:37',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0022 validated\nAuthor: admin',78,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(282,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0023 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,11,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0023 validated\nAuthor: admin',81,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(283,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0024 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0024 validated\nAuthor: admin',83,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(284,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0025 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,2,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0025 validated\nAuthor: admin',84,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(285,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0026 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0026 validated\nAuthor: admin',85,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(286,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0027 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0027 validated\nAuthor: admin',88,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(287,NULL,1,'2017-02-16 03:05:56','2017-02-16 03:05:56',40,'AC_OTH_AUTO','Commande CO7001-0016 classée Livrée','2017-02-16 03:05:56','2017-02-15 23:05:56',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0016 classée Livrée\nAuteur: admin',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(288,NULL,1,'2017-02-16 03:06:01','2017-02-16 03:06:01',40,'AC_OTH_AUTO','Commande CO7001-0016 classée Facturée','2017-02-16 03:06:01','2017-02-15 23:06:01',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0016 classée Facturée\nAuteur: admin',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(294,NULL,1,'2017-02-16 03:53:04','2017-02-16 03:53:04',40,'AC_OTH_AUTO','Commande CO7001-0021 validée','2017-02-16 03:53:04','2017-02-15 23:53:04',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0021 validée\nAuteur: admin',75,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(295,NULL,1,'2017-02-16 03:58:08','2017-02-16 03:58:08',40,'AC_OTH_AUTO','Expédition SH1702-0002 validée','2017-02-16 03:58:08','2017-02-15 23:58:08',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Expédition SH1702-0002 validée\nAuteur: admin',3,'shipping',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(296,NULL,1,'2017-02-16 04:12:29','2017-02-16 04:12:29',40,'AC_OTH_AUTO','Commande CO7001-0021 validée','2017-02-16 04:12:29','2017-02-16 00:12:29',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0021 validée\nAuteur: admin',75,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(297,NULL,1,'2017-02-16 04:14:20','2017-02-16 04:14:20',40,'AC_OTH_AUTO','Commande CO7001-0021 validée','2017-02-16 04:14:20','2017-02-16 00:14:20',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0021 validée\nAuteur: admin',75,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(298,NULL,1,'2017-02-16 01:44:58','2017-02-16 01:44:58',40,'AC_OTH_AUTO','Proposal PR1702-0009 validated','2017-02-16 01:44:58','2017-02-16 00:44:58',1,NULL,NULL,1,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0009 validated\nAuthor: aeinstein',11,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(299,NULL,1,'2017-02-16 01:45:44','2017-02-16 01:45:44',40,'AC_OTH_AUTO','Proposal PR1702-0010 validated','2017-02-16 01:45:44','2017-02-16 00:45:44',2,NULL,NULL,7,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0010 validated\nAuthor: demo',12,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(300,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0011 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,26,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0011 validated\nAuthor: aeinstein',13,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(301,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0012 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,3,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0012 validated\nAuthor: demo',14,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(302,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0013 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,26,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0013 validated\nAuthor: demo',15,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(303,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0014 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0014 validated\nAuthor: demo',16,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(304,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0015 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,1,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0015 validated\nAuthor: aeinstein',17,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(305,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0016 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,26,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0016 validated\nAuthor: demo',18,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(306,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0017 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,12,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0017 validated\nAuthor: demo',19,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(307,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0018 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,26,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0018 validated\nAuthor: aeinstein',20,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(308,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0019 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,1,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0019 validated\nAuthor: aeinstein',21,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(309,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0020 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,26,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0020 validated\nAuthor: aeinstein',22,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(310,NULL,1,'2017-02-16 01:46:17','2017-02-16 01:46:17',40,'AC_OTH_AUTO','Proposal PR1702-0021 validated','2017-02-16 01:46:17','2017-02-16 00:46:17',2,NULL,NULL,12,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0021 validated\nAuthor: demo',23,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(311,NULL,1,'2017-02-16 01:46:17','2017-02-16 01:46:17',40,'AC_OTH_AUTO','Proposal PR1702-0022 validated','2017-02-16 01:46:17','2017-02-16 00:46:17',2,NULL,NULL,7,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0022 validated\nAuthor: demo',24,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(312,NULL,1,'2017-02-16 01:46:17','2017-02-16 01:46:17',40,'AC_OTH_AUTO','Proposal PR1702-0023 validated','2017-02-16 01:46:17','2017-02-16 00:46:17',1,NULL,NULL,3,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0023 validated\nAuthor: aeinstein',25,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(313,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0024 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0024 validated\nAuthor: demo',26,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(314,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0025 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',1,NULL,NULL,6,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0025 validated\nAuthor: aeinstein',27,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(315,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0026 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,19,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0026 validated\nAuthor: demo',28,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(316,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0027 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0027 validated\nAuthor: demo',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(317,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0028 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0028 validated\nAuthor: demo',30,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(318,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0029 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',1,NULL,NULL,11,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0029 validated\nAuthor: aeinstein',31,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(319,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0030 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,19,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0030 validated\nAuthor: demo',32,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(320,NULL,1,'2017-02-16 04:46:31','2017-02-16 04:46:31',40,'AC_OTH_AUTO','Proposition PR1702-0026 signée','2017-02-16 04:46:31','2017-02-16 00:46:31',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0026 signée\nAuteur: admin',28,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(321,NULL,1,'2017-02-16 04:46:37','2017-02-16 04:46:37',40,'AC_OTH_AUTO','Proposition PR1702-0027 signée','2017-02-16 04:46:37','2017-02-16 00:46:37',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0027 signée\nAuteur: admin',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(322,NULL,1,'2017-02-16 04:46:42','2017-02-16 04:46:42',40,'AC_OTH_AUTO','Proposition PR1702-0028 refusée','2017-02-16 04:46:42','2017-02-16 00:46:42',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0028 refusée\nAuteur: admin',30,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(323,NULL,1,'2017-02-16 04:47:09','2017-02-16 04:47:09',40,'AC_OTH_AUTO','Proposition PR1702-0019 validée','2017-02-16 04:47:09','2017-02-16 00:47:09',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0019 validée\nAuteur: admin',21,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(324,NULL,1,'2017-02-16 04:47:25','2017-02-16 04:47:25',40,'AC_OTH_AUTO','Proposition PR1702-0023 signée','2017-02-16 04:47:25','2017-02-16 00:47:25',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0023 signée\nAuteur: admin',25,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(325,NULL,1,'2017-02-16 04:47:29','2017-02-16 04:47:29',40,'AC_OTH_AUTO','Proposition PR1702-0023 classée payée','2017-02-16 04:47:29','2017-02-16 00:47:29',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0023 classée payée\nAuteur: admin',25,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(326,NULL,1,'2017-02-17 16:07:18','2017-02-17 16:07:18',40,'AC_OTH_AUTO','Proposition PR1702-0021 validée','2017-02-17 16:07:18','2017-02-17 12:07:18',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0021 validée\nAuteur: admin',23,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(327,NULL,1,'2017-05-12 13:53:44','2017-05-12 13:53:44',40,'AC_OTH_AUTO','Email sent by MyBigCompany To Einstein','2017-05-12 13:53:44','2017-05-12 09:53:44',12,NULL,NULL,11,12,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Sender: MyBigCompany &lt;myemail@mybigcompany.com&gt;<br>\nReceiver(s): Einstein &lt;genius@example.com&gt;<br>\nBcc: Einstein &lt;genius@example.com&gt;<br>\nEMail topic: Test<br>\nEmail body:<br>\nTest\nAuthor: admin',11,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(328,NULL,1,'2017-08-29 22:39:09','2017-08-29 22:39:09',40,'AC_OTH_AUTO','Invoice FA1601-0024 validated','2017-08-29 22:39:09','2017-08-29 18:39:09',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Invoice FA1601-0024 validated\nAuthor: admin',149,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(329,NULL,1,'2019-09-26 13:38:11','2019-09-26 13:38:11',40,'AC_MEMBER_MODIFY','Member Pierre Curie modified','2019-09-26 13:38:11','2019-09-26 11:38:11',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Pierre Curie modified\nMember: Pierre Curie\nType: Standard members',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(330,NULL,1,'2019-09-26 13:49:21','2019-09-26 13:49:21',40,'AC_MEMBER_MODIFY','Member Pierre Curie modified','2019-09-26 13:49:21','2019-09-26 11:49:21',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Pierre Curie modified\nMember: Pierre Curie\nType: Standard members',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(331,NULL,1,'2019-09-26 17:33:37','2019-09-26 17:33:37',40,'AC_BILL_VALIDATE','Invoice FA1909-0025 validated','2019-09-26 17:33:37','2019-09-26 15:33:37',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1909-0025 validated',218,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(333,NULL,1,'2019-09-27 16:54:30','2019-09-27 16:54:30',40,'AC_PROPAL_VALIDATE','Proposal PR1909-0031 validated','2019-09-27 16:54:30','2019-09-27 14:54:30',12,NULL,4,7,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0031 validated',10,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(335,NULL,1,'2019-09-27 17:08:59','2019-09-27 17:08:59',40,'AC_PROPAL_VALIDATE','Proposal PR1909-0032 validated','2019-09-27 17:08:59','2019-09-27 15:08:59',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0032 validated',33,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(337,NULL,1,'2019-09-27 17:13:13','2019-09-27 17:13:13',40,'AC_PROPAL_VALIDATE','Proposal PR1909-0033 validated','2019-09-27 17:13:13','2019-09-27 15:13:13',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0033 validated',34,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(338,NULL,1,'2019-09-27 17:53:31','2019-09-27 17:53:31',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 17:53:31','2019-09-27 15:53:31',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(339,NULL,1,'2019-09-27 18:15:00','2019-09-27 18:15:00',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 18:15:00','2019-09-27 16:15:00',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(340,NULL,1,'2019-09-27 18:40:32','2019-09-27 18:40:32',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 18:40:32','2019-09-27 16:40:32',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(341,NULL,1,'2019-09-27 19:16:07','2019-09-27 19:16:07',40,'AC_PRODUCT_CREATE','Product ppp created','2019-09-27 19:16:07','2019-09-27 17:16:07',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ppp created',14,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(342,NULL,1,'2019-09-27 19:18:01','2019-09-27 19:18:01',40,'AC_PRODUCT_MODIFY','Product ppp modified','2019-09-27 19:18:01','2019-09-27 17:18:01',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ppp modified',14,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(343,NULL,1,'2019-09-27 19:31:45','2019-09-27 19:31:45',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 19:31:45','2019-09-27 17:31:45',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(344,NULL,1,'2019-09-27 19:32:12','2019-09-27 19:32:12',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 19:32:12','2019-09-27 17:32:12',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(345,NULL,1,'2019-09-27 19:38:30','2019-09-27 19:38:30',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 19:38:30','2019-09-27 17:38:30',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(346,NULL,1,'2019-09-27 19:38:37','2019-09-27 19:38:37',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 19:38:37','2019-09-27 17:38:37',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(347,NULL,1,'2019-09-30 15:49:52',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #15ff11cay39skiaa] New message','2019-09-30 15:49:52','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'dfsdfds',2,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(348,NULL,1,'2019-10-01 13:48:36','2019-10-01 13:48:36',40,'AC_PROJECT_MODIFY','Project PJ1607-0001 modified','2019-10-01 13:48:36','2019-10-01 11:48:36',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1607-0001 modified\nTask: PJ1607-0001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(349,NULL,1,'2019-10-04 10:10:25','2019-10-04 10:10:25',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI1601-0002 validated','2019-10-04 10:10:25','2019-10-04 08:10:25',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 validated',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(350,NULL,1,'2019-10-04 10:10:47','2019-10-04 10:10:47',40,'AC_BILL_SUPPLIER_PAYED','Invoice SI1601-0002 changed to paid','2019-10-04 10:10:47','2019-10-04 08:10:47',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 changed to paid',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(351,NULL,1,'2019-10-04 10:26:49','2019-10-04 10:26:49',40,'AC_BILL_UNVALIDATE','Invoice FA6801-0010 go back to draft status','2019-10-04 10:26:49','2019-10-04 08:26:49',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA6801-0010 go back to draft status',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(352,NULL,1,'2019-10-04 10:27:00','2019-10-04 10:27:00',40,'AC_BILL_VALIDATE','Invoice FA6801-0010 validated','2019-10-04 10:27:00','2019-10-04 08:27:00',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA6801-0010 validated',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(353,NULL,1,'2019-10-04 10:28:14','2019-10-04 10:28:14',40,'AC_BILL_PAYED','Invoice FA6801-0010 changed to paid','2019-10-04 10:28:14','2019-10-04 08:28:14',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA6801-0010 changed to paid',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(354,NULL,1,'2019-10-04 10:29:22','2019-10-04 10:29:22',40,'AC_BILL_SUPPLIER_PAYED','Invoice SI1601-0002 changed to paid','2019-10-04 10:29:22','2019-10-04 08:29:22',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 changed to paid',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(355,NULL,1,'2019-10-04 10:29:41','2019-10-04 10:29:41',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI1601-0002 go back to draft status','2019-10-04 10:29:41','2019-10-04 08:29:41',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 go back to draft status',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(356,NULL,1,'2019-10-04 10:31:30','2019-10-04 10:31:30',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI1601-0002 validated','2019-10-04 10:31:30','2019-10-04 08:31:30',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 validated',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(357,NULL,1,'2019-10-04 16:56:21',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 16:56:21','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaaa',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(358,NULL,1,'2019-10-04 17:08:04',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:08:04','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'ddddd',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(359,NULL,1,'2019-10-04 17:25:05',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:25:05','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaa',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(360,NULL,1,'2019-10-04 17:26:14',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:26:14','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaa',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(361,NULL,1,'2019-10-04 17:30:10',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:30:10','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(362,NULL,1,'2019-10-04 17:51:43',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:51:43','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(363,NULL,1,'2019-10-04 17:52:02',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:52:02','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(364,NULL,1,'2019-10-04 17:52:17',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:52:17','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(365,NULL,1,'2019-10-04 17:52:39',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:52:39','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(366,NULL,1,'2019-10-04 17:52:53',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:52:53','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(367,NULL,1,'2019-10-04 17:53:13',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:53:13','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(368,NULL,1,'2019-10-04 17:53:26',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:53:26','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(369,NULL,1,'2019-10-04 17:53:48',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:53:48','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(370,NULL,1,'2019-10-04 17:54:09',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:54:09','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(371,NULL,1,'2019-10-04 17:54:28',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:54:28','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(372,NULL,1,'2019-10-04 17:55:43',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:55:43','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(373,NULL,1,'2019-10-04 17:56:01',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:56:01','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(374,NULL,1,'2019-10-04 18:00:32',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:00:32','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(375,NULL,1,'2019-10-04 18:00:58',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:00:58','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(376,NULL,1,'2019-10-04 18:11:30',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:11:30','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(377,NULL,1,'2019-10-04 18:12:02',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:12:02','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fffffff',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(378,NULL,1,'2019-10-04 18:49:30',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:49:30','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaa',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(379,NULL,1,'2019-10-04 19:00:22',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 19:00:22','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fff',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(380,NULL,1,'2019-10-04 19:24:20','2019-10-04 19:24:20',40,'AC_PROPAL_SENTBYMAIL','Email sent by Alice Adminson To NLTechno','2019-10-04 19:24:20','2019-10-04 17:24:20',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSender: Alice Adminson &lt;aadminson@example.com&gt;<br>\nReceiver(s): NLTechno &lt;notanemail@nltechno.com&gt;<br>\nEmail topic: Envoi de la proposition commerciale PR1909-0032<br>\nEmail body:<br>\nHello<br />\r\n<br />\r\nVeuillez trouver, ci-joint, la proposition commerciale PR1909-0032<br />\r\n<br />\r\n<br />\r\nSincerely<br />\r\n<br />\r\nAlice - 123<br>\n<br>\nAttached files and documents: PR1909-0032.pdf',33,'propal',NULL,'Envoi de la proposition commerciale PR1909-0032','Alice Adminson <aadminson@example.com>',NULL,'NLTechno <notanemail@nltechno.com>',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(381,NULL,1,'2019-10-04 19:30:13',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 19:30:13','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(382,NULL,1,'2019-10-04 19:32:55',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 19:32:55','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'uuuuuu\n\nAttached files and documents: Array',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(383,NULL,1,'2019-10-04 19:37:16',NULL,50,'TICKET_MSG','','2019-10-04 19:37:16','2020-06-12 17:12:24',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,100,'',NULL,NULL,'f\n\nFichiers et documents joints: dolihelp.ico',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(384,NULL,1,'2019-10-04 19:39:07',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 19:39:07','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaafff\n\nAttached files and documents: dolibarr.gif;doliadmin.ico',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(385,NULL,1,'2019-10-07 12:17:07','2019-10-07 12:17:07',40,'AC_PRODUCT_DELETE','Product PREF123456 deleted','2019-10-07 12:17:07','2019-10-07 10:17:07',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PREF123456 deleted',17,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(386,NULL,1,'2019-10-07 12:17:32','2019-10-07 12:17:32',40,'AC_PRODUCT_DELETE','Product PREF123456 deleted','2019-10-07 12:17:32','2019-10-07 10:17:32',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PREF123456 deleted',18,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(387,NULL,1,'2019-10-08 19:21:07','2019-10-08 19:21:07',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-10-08 19:21:07','2019-10-08 17:21:07',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(388,NULL,1,'2019-10-08 21:01:07','2019-10-08 21:01:07',40,'AC_MEMBER_MODIFY','Member Pierre Curie modified','2019-10-08 21:01:07','2019-10-08 19:01:07',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Pierre Curie modified\nMember: Pierre Curie\nType: Standard members',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(389,NULL,1,'2019-10-08 21:01:22','2019-10-08 21:01:22',40,'AC_MEMBER_MODIFY','Member doe john modified','2019-10-08 21:01:22','2019-10-08 19:01:22',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember doe john modified\nMember: doe john\nType: Standard members',3,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(390,NULL,1,'2019-10-08 21:01:45','2019-10-08 21:01:45',40,'AC_MEMBER_MODIFY','Member smith smith modified','2019-10-08 21:01:45','2019-10-08 19:01:45',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember smith smith modified\nMember: smith smith\nType: Standard members',4,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(391,NULL,1,'2019-10-08 21:02:18','2019-10-08 21:02:18',40,'AC_MEMBER_MODIFY','Member Vick Smith modified','2019-10-08 21:02:18','2019-10-08 19:02:18',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Vick Smith modified\nMember: Vick Smith\nType: Standard members',1,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(392,NULL,1,'2019-11-28 15:54:46','2019-11-28 15:54:46',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI1911-0005 validated','2019-11-28 15:54:47','2019-11-28 11:54:47',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1911-0005 validated',21,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(393,NULL,1,'2019-11-28 16:33:35','2019-11-28 16:33:35',40,'AC_PRODUCT_CREATE','Product FR-CAR created','2019-11-28 16:33:35','2019-11-28 12:33:35',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct FR-CAR created',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(394,NULL,1,'2019-11-28 16:34:08','2019-11-28 16:34:08',40,'AC_PRODUCT_DELETE','Product ppp deleted','2019-11-28 16:34:08','2019-11-28 12:34:08',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ppp deleted',14,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(395,NULL,1,'2019-11-28 16:34:33','2019-11-28 16:34:33',40,'AC_PRODUCT_MODIFY','Product FR-CAR modified','2019-11-28 16:34:33','2019-11-28 12:34:33',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct FR-CAR modified',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(396,NULL,1,'2019-11-28 16:34:46','2019-11-28 16:34:46',40,'AC_PRODUCT_MODIFY','Product FR-CAR modified','2019-11-28 16:34:46','2019-11-28 12:34:46',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct FR-CAR modified',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(397,NULL,1,'2019-11-28 16:36:56','2019-11-28 16:36:56',40,'AC_PRODUCT_MODIFY','Product POS-CAR modified','2019-11-28 16:36:56','2019-11-28 12:36:56',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-CAR modified',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(398,NULL,1,'2019-11-28 16:37:36','2019-11-28 16:37:36',40,'AC_PRODUCT_CREATE','Product POS-APPLE created','2019-11-28 16:37:36','2019-11-28 12:37:36',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-APPLE created',25,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(399,NULL,1,'2019-11-28 16:37:58','2019-11-28 16:37:58',40,'AC_PRODUCT_MODIFY','Product POS-APPLE modified','2019-11-28 16:37:58','2019-11-28 12:37:58',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-APPLE modified',25,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(400,NULL,1,'2019-11-28 16:38:44','2019-11-28 16:38:44',40,'AC_PRODUCT_CREATE','Product POS-KIWI created','2019-11-28 16:38:44','2019-11-28 12:38:44',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-KIWI created',26,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(401,NULL,1,'2019-11-28 16:39:21','2019-11-28 16:39:21',40,'AC_PRODUCT_CREATE','Product POS-PEACH created','2019-11-28 16:39:21','2019-11-28 12:39:21',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-PEACH created',27,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(402,NULL,1,'2019-11-28 16:39:58','2019-11-28 16:39:58',40,'AC_PRODUCT_CREATE','Product POS-ORANGE created','2019-11-28 16:39:58','2019-11-28 12:39:58',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-ORANGE created',28,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(403,NULL,1,'2019-11-28 17:00:28','2019-11-28 17:00:28',40,'AC_PRODUCT_MODIFY','Product APPLEPIE modified','2019-11-28 17:00:28','2019-11-28 13:00:28',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct APPLEPIE modified',4,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(404,NULL,1,'2019-11-28 17:00:46','2019-11-28 17:00:46',40,'AC_PRODUCT_MODIFY','Product PEARPIE modified','2019-11-28 17:00:46','2019-11-28 13:00:46',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PEARPIE modified',2,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(405,NULL,1,'2019-11-28 17:01:57','2019-11-28 17:01:57',40,'AC_PRODUCT_MODIFY','Product POS-APPLE modified','2019-11-28 17:01:57','2019-11-28 13:01:57',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-APPLE modified',25,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(406,NULL,1,'2019-11-28 17:03:14','2019-11-28 17:03:14',40,'AC_PRODUCT_CREATE','Product POS-Eggs created','2019-11-28 17:03:14','2019-11-28 13:03:14',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-Eggs created',29,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(407,NULL,1,'2019-11-28 17:04:17','2019-11-28 17:04:17',40,'AC_PRODUCT_MODIFY','Product POS-Eggs modified','2019-11-28 17:04:17','2019-11-28 13:04:17',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-Eggs modified',29,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(408,NULL,1,'2019-11-28 17:09:14','2019-11-28 17:09:14',40,'AC_PRODUCT_CREATE','Product POS-Chips created','2019-11-28 17:09:14','2019-11-28 13:09:14',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-Chips created',30,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(409,NULL,1,'2019-11-28 17:09:54','2019-11-28 17:09:54',40,'AC_PRODUCT_MODIFY','Product POS-Chips modified','2019-11-28 17:09:54','2019-11-28 13:09:54',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-Chips modified',30,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(410,NULL,1,'2019-11-28 18:46:20','2019-11-28 18:46:20',40,'AC_PRODUCT_MODIFY','Product POS-APPLE modified','2019-11-28 18:46:20','2019-11-28 14:46:20',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-APPLE modified',25,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(411,NULL,1,'2019-11-28 18:59:29','2019-11-28 18:59:29',40,'AC_PRODUCT_MODIFY','Product PEARPIE modified','2019-11-28 18:59:29','2019-11-28 14:59:29',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PEARPIE modified',2,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(412,NULL,1,'2019-11-28 19:02:01','2019-11-28 19:02:01',40,'AC_PRODUCT_MODIFY','Product POS-CARROT modified','2019-11-28 19:02:01','2019-11-28 15:02:01',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-CARROT modified',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(413,NULL,1,'2019-11-28 19:09:50','2019-11-28 19:09:50',40,'AC_PRODUCT_MODIFY','Product PEARPIE modified','2019-11-28 19:09:50','2019-11-28 15:09:50',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PEARPIE modified',2,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(414,NULL,1,'2019-11-28 19:12:50','2019-11-28 19:12:50',40,'AC_PRODUCT_MODIFY','Product PEARPIE modified','2019-11-28 19:12:50','2019-11-28 15:12:50',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PEARPIE modified',2,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(415,NULL,1,'2019-11-29 12:46:29','2019-11-29 12:46:29',40,'AC_TICKET_CREATE','Ticket TS1911-0004 created','2019-11-29 12:46:29','2019-11-29 08:46:29',12,NULL,4,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0004 created',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(416,NULL,1,'2019-11-29 12:46:34','2019-11-29 12:46:34',40,'AC_TICKET_MODIFY','Ticket TS1911-0004 read by Alice Adminson','2019-11-29 12:46:34','2019-11-29 08:46:34',12,NULL,4,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0004 read by Alice Adminson',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(417,NULL,1,'2019-11-29 12:46:47','2019-11-29 12:46:47',40,'AC_TICKET_ASSIGNED','Ticket TS1911-0004 assigned','2019-11-29 12:46:47','2019-11-29 08:46:47',12,NULL,4,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0004 assigned\nOld user: None\nNew user: Commerson Charle1',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(418,NULL,1,'2019-11-29 12:47:13',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #5gvo9bsjri55zef9] New message','2019-11-29 12:47:13','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'Where do you want to install Dolibarr ?<br />\r\nOn-Premise or on the Cloud ?',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(419,NULL,1,'2019-11-29 12:50:45','2019-11-29 12:50:45',40,'AC_TICKET_CREATE','Ticket TS1911-0005 créé','2019-11-29 12:50:45','2019-11-29 08:50:45',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nTicket TS1911-0005 créé',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(420,NULL,1,'2019-11-29 12:52:32','2019-11-29 12:52:32',40,'AC_TICKET_MODIFY','Ticket TS1911-0005 read by Alice Adminson','2019-11-29 12:52:32','2019-11-29 08:52:32',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0005 read by Alice Adminson',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(421,NULL,1,'2019-11-29 12:52:53','2019-11-29 12:52:53',40,'AC_TICKET_ASSIGNED','Ticket TS1911-0005 assigned','2019-11-29 12:52:53','2019-11-29 08:52:53',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0005 assigned\nOld user: None\nNew user: Commerson Charle1',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(422,NULL,1,'2019-11-29 12:54:04',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #d51wjy4nym7wltg7] New message','2019-11-29 12:54:04','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'Hi.<br />\r\nThanks for your interest in using Dolibarr ERP CRM.<br />\r\nI need more information to give you the correct answer :&nbsp;Where do you want to install Dolibarr. On premise or on Cloud',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(423,NULL,1,'2019-11-29 12:54:46',NULL,50,'TICKET_MSG','','2019-11-29 12:54:46','2020-06-12 17:12:24',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,100,'',NULL,NULL,'I need it On-Premise.',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(424,NULL,1,'2019-11-29 12:55:42',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #d51wjy4nym7wltg7] New message','2019-11-29 12:55:42','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'When used on-premise, you can download and install Dolibarr yourself from ou web portal: https://www.dolibarr.org<br />\r\nIt is completely free.',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(425,NULL,1,'2019-11-29 12:55:48','2019-11-29 12:55:48',40,'AC_TICKET_CLOSE','Ticket TS1911-0005 closed','2019-11-29 12:55:48','2019-11-29 08:55:48',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0005 closed',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(426,NULL,1,'2019-11-29 12:56:47','2019-11-29 12:56:47',40,'AC_BOM_UNVALIDATE','BOM unvalidated','2019-11-29 12:56:47','2019-11-29 08:56:47',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM unvalidated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(427,NULL,1,'2019-11-29 12:57:14','2019-11-29 12:57:14',40,'AC_BOM_VALIDATE','BOM validated','2019-11-29 12:57:14','2019-11-29 08:57:14',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM validated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(428,NULL,1,'2019-12-20 16:40:14','2019-12-20 16:40:14',40,'AC_MO_DELETE','MO deleted','2019-12-20 16:40:14','2019-12-20 12:40:14',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',3,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(429,NULL,1,'2019-12-20 17:00:43','2019-12-20 17:00:43',40,'AC_MO_DELETE','MO deleted','2019-12-20 17:00:43','2019-12-20 13:00:43',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',7,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(430,NULL,1,'2019-12-20 17:00:56','2019-12-20 17:00:56',40,'AC_MO_DELETE','MO deleted','2019-12-20 17:00:56','2019-12-20 13:00:56',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',6,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(431,NULL,1,'2019-12-20 20:00:03','2019-12-20 20:00:03',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:00:03','2019-12-20 16:00:03',12,NULL,6,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',1,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(432,NULL,1,'2019-12-20 20:22:11','2019-12-20 20:22:11',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:22:11','2019-12-20 16:22:11',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',10,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(433,NULL,1,'2019-12-20 20:22:11','2019-12-20 20:22:11',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:22:11','2019-12-20 16:22:11',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',12,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(434,NULL,1,'2019-12-20 20:22:20','2019-12-20 20:22:20',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:22:20','2019-12-20 16:22:20',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',9,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(435,NULL,1,'2019-12-20 20:27:07','2019-12-20 20:27:07',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:27:07','2019-12-20 16:27:07',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',13,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(436,NULL,1,'2019-12-20 20:42:42','2019-12-20 20:42:42',40,'AC_ORDER_VALIDATE','Order CO7001-0027 validated','2019-12-20 20:42:42','2019-12-20 16:42:42',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0027 validated',88,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(437,NULL,1,'2019-12-20 20:46:25','2019-12-20 20:46:25',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:46:25','2019-12-20 16:46:25',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(438,NULL,1,'2019-12-20 20:46:45','2019-12-20 20:46:45',40,'AC_ORDER_SUPPLIER_CLASSIFY_BILLED','Purchase Order CF1007-0001 set billed','2019-12-20 20:46:45','2019-12-20 16:46:45',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 set billed',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(439,NULL,1,'2019-12-20 20:47:02','2019-12-20 20:47:02',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:47:02','2019-12-20 16:47:02',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(440,NULL,1,'2019-12-20 20:47:44','2019-12-20 20:47:44',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:47:44','2019-12-20 16:47:44',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(441,NULL,1,'2019-12-20 20:47:53','2019-12-20 20:47:53',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:47:53','2019-12-20 16:47:53',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(442,NULL,1,'2019-12-20 20:48:05','2019-12-20 20:48:05',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:48:05','2019-12-20 16:48:05',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(443,NULL,1,'2019-12-20 20:48:45','2019-12-20 20:48:45',40,'AC_ORDER_CLASSIFY_BILLED','Order CO7001-0016 classified billed','2019-12-20 20:48:45','2019-12-20 16:48:45',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0016 classified billed',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(444,NULL,1,'2019-12-20 20:48:55','2019-12-20 20:48:55',40,'AC_ORDER_CLOSE','Order CO7001-0018 classified delivered','2019-12-20 20:48:55','2019-12-20 16:48:55',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0018 classified delivered',62,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(445,NULL,1,'2019-12-20 20:49:43','2019-12-20 20:49:43',40,'AC_PROPAL_CLASSIFY_BILLED','Proposal PR1702-0027 classified billed','2019-12-20 20:49:43','2019-12-20 16:49:43',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1702-0027 classified billed',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(446,NULL,1,'2019-12-20 20:49:54','2019-12-20 20:49:54',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR1702-0027 signed','2019-12-20 20:49:54','2019-12-20 16:49:54',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1702-0027 signed',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(447,NULL,1,'2019-12-20 20:50:14','2019-12-20 20:50:14',40,'AC_PROPAL_CLOSE_REFUSED','Proposal PR1702-0027 refused','2019-12-20 20:50:14','2019-12-20 16:50:14',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1702-0027 refused',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(448,NULL,1,'2019-12-20 20:50:23','2019-12-20 20:50:23',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR1702-0027 signed','2019-12-20 20:50:23','2019-12-20 16:50:23',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1702-0027 signed',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(449,NULL,1,'2019-12-21 17:18:22','2019-12-21 17:18:22',40,'AC_BOM_CLOSE','BOM disabled','2019-12-21 17:18:22','2019-12-21 13:18:22',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM disabled',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(450,NULL,1,'2019-12-21 17:18:38','2019-12-21 17:18:38',40,'AC_MEMBER_RESILIATE','Member Vick Smith terminated','2019-12-21 17:18:38','2019-12-21 13:18:38',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Vick Smith terminated\nMember: Vick Smith\nType: Standard members',1,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(451,NULL,1,'2019-12-21 19:46:33','2019-12-21 19:46:33',40,'AC_PROJECT_CREATE','Project PJ1912-0005 created','2019-12-21 19:46:33','2019-12-21 15:46:33',12,NULL,10,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 created\nProject: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(452,NULL,1,'2019-12-21 19:47:03','2019-12-21 19:47:03',40,'AC_PROJECT_MODIFY','Project PJ1912-0005 modified','2019-12-21 19:47:03','2019-12-21 15:47:03',12,NULL,10,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 modified\nTask: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(453,NULL,1,'2019-12-21 19:47:24','2019-12-21 19:47:24',40,'AC_PROJECT_MODIFY','Project PJ1912-0005 modified','2019-12-21 19:47:24','2019-12-21 15:47:24',12,NULL,10,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 modified\nTask: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(454,NULL,1,'2019-12-21 19:47:52','2019-12-21 19:47:52',40,'AC_PROJECT_MODIFY','Project PJ1912-0005 modified','2019-12-21 19:47:52','2019-12-21 15:47:52',12,NULL,10,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 modified\nTask: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(455,NULL,1,'2019-12-21 19:48:06','2019-12-21 19:48:06',40,'AC_PROJECT_MODIFY','Project PJ1912-0005 modified','2019-12-21 19:48:06','2019-12-21 15:48:06',12,NULL,10,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 modified\nTask: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(456,NULL,1,'2019-12-21 19:49:28','2019-12-21 19:49:28',40,'AC_PROJECT_CREATE','Project PJ1912-0006 created','2019-12-21 19:49:28','2019-12-21 15:49:28',12,NULL,11,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0006 created\nProject: PJ1912-0006',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(457,NULL,1,'2019-12-21 19:52:12','2019-12-21 19:52:12',40,'AC_PROJECT_CREATE','Project PJ1912-0007 created','2019-12-21 19:52:12','2019-12-21 15:52:12',12,NULL,12,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0007 created\nProject: PJ1912-0007',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(458,NULL,1,'2019-12-21 19:53:21','2019-12-21 19:53:21',40,'AC_PROJECT_CREATE','Project PJ1912-0008 created','2019-12-21 19:53:21','2019-12-21 15:53:21',12,NULL,13,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0008 created\nProject: PJ1912-0008',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(459,NULL,1,'2019-12-21 19:53:42','2019-12-21 19:53:42',40,'AC_PROJECT_MODIFY','Project PJ1912-0008 modified','2019-12-21 19:53:42','2019-12-21 15:53:42',12,NULL,13,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0008 modified\nTask: PJ1912-0008',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(460,NULL,1,'2019-12-21 19:55:23','2019-12-21 19:55:23',40,'AC_PROJECT_MODIFY','Project PJ1912-0006 modified','2019-12-21 19:55:23','2019-12-21 15:55:23',12,NULL,11,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0006 modified\nTask: PJ1912-0006',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(461,NULL,1,'2019-12-21 20:10:21','2019-12-21 20:10:21',40,'AC_PROJECT_MODIFY','Project PJ1912-0006 modified','2019-12-21 20:10:21','2019-12-21 16:10:21',12,NULL,11,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0006 modified\nTask: PJ1912-0006',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(462,NULL,1,'2019-12-11 10:00:00','2019-12-11 10:00:00',5,'AC_RDV','Meeting with all employees','2019-12-21 20:29:32','2019-12-21 16:29:32',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(463,NULL,1,'2019-12-06 00:00:00',NULL,11,'AC_INT','Intervention on customer site','2019-12-21 20:30:11','2019-12-21 16:30:11',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,1,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(464,NULL,1,'2019-12-23 14:16:59','2019-12-23 14:16:59',40,'AC_BILL_PAYED','Invoice FA1601-0024 changed to paid','2019-12-23 14:16:59','2019-12-23 10:16:59',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1601-0024 changed to paid',149,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(465,NULL,1,'2019-12-23 14:17:18','2019-12-23 14:17:18',40,'AC_BILL_PAYED','Invoice FA1601-0024 changed to paid','2019-12-23 14:17:18','2019-12-23 10:17:18',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1601-0024 changed to paid',149,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(466,NULL,1,'2019-11-23 14:25:00',NULL,50,'AC_OTH','Test','2019-12-23 17:25:14','2019-12-23 13:25:14',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,0,-1,'',NULL,NULL,'18/11 17h06 : Message laiss&eacute;. Me rappeler pour m&#39;en dire plus.&nbsp;<br />\r\n<br />\r\n20/11 10h17 &quot;A rappeler suite au msg laiss&eacute; le 14/11, dit que c&#39;est urgent&quot;<br />\r\n12h22 : message laiss&eacute;. Je lui envoie un sms<br />\r\n<br />\r\n&quot;D&eacute;claration de sinistre originale&quot; : constat de ce qui s&#39;est pass&eacute;.<br />\r\nElle envoie le ch&egrave;que de solde d&egrave;s demain.<br />\r\n<br />\r\n3/12 : Elle pr&eacute;f&egrave;re avoir plus d&#39;infos sur le sinistre pour l&#39;assurance.<br />\r\nCourrier envoy&eacute; le 4/12/19 par mail et par courrier postal<br />\r\n<br />\r\n6/12 15h02 : ont obtenu le feu vert de l&#39;assurance.<br />\r\nOn bloque 16/12 PM &agrave; partir de 14h30.&nbsp;',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(467,NULL,1,'2020-01-01 14:35:47','2020-01-01 14:35:47',40,'AC_MEMBER_VALIDATE','Adhérent aze aze validé','2020-01-01 14:35:47','2020-01-01 10:35:47',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent aze aze validé\nAdhérent: aze aze\nType: Board members',5,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(468,NULL,1,'2020-01-01 14:50:59','2020-01-01 14:50:59',40,'AC_MEMBER_VALIDATE','Adhérent azr azr validé','2020-01-01 14:50:59','2020-01-01 10:50:59',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azr azr validé\nAdhérent: azr azr\nType: Board members',6,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(469,NULL,1,'2020-01-01 15:00:16','2020-01-01 15:00:16',40,'AC_MEMBER_VALIDATE','Adhérent azt azt validé','2020-01-01 15:00:16','2020-01-01 11:00:16',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azt azt validé\nAdhérent: azt azt\nType: Board members',7,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(470,NULL,1,'2020-01-01 15:08:20','2020-01-01 15:08:20',40,'AC_MEMBER_VALIDATE','Adhérent azu azu validé','2020-01-01 15:08:20','2020-01-01 11:08:20',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azu azu validé\nAdhérent: azu azu\nType: Board members',8,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(471,NULL,1,'2020-01-01 15:27:24','2020-01-01 15:27:24',40,'AC_MEMBER_VALIDATE','Adhérent azi azi validé','2020-01-01 15:27:24','2020-01-01 11:27:24',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azi azi validé\nAdhérent: azi azi\nType: Board members',9,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(472,NULL,1,'2020-01-01 15:36:29','2020-01-01 15:36:29',40,'AC_MEMBER_VALIDATE','Adhérent azo azo validé','2020-01-01 15:36:29','2020-01-01 11:36:29',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azo azo validé\nAdhérent: azo azo\nType: Board members',10,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(473,NULL,1,'2020-01-01 15:44:25','2020-01-01 15:44:25',40,'AC_MEMBER_VALIDATE','Adhérent azp azp validé','2020-01-01 15:44:25','2020-01-01 11:44:25',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azp azp validé\nAdhérent: azp azp\nType: Board members',11,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(478,NULL,1,'2020-01-01 16:52:32','2020-01-01 16:52:32',40,'AC_MEMBER_VALIDATE','Adhérent azq azq validé','2020-01-01 16:52:32','2020-01-01 12:52:32',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azq azq validé\nAdhérent: azq azq\nType: Board members',12,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(483,NULL,1,'2020-01-01 17:49:05','2020-01-01 17:49:05',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0006 validated','2020-01-01 17:49:05','2020-01-01 13:49:05',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 validated',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(484,NULL,1,'2020-01-01 17:50:41','2020-01-01 17:50:41',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0001 validated','2020-01-01 17:50:41','2020-01-01 13:50:41',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 validated',23,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(485,NULL,1,'2020-01-01 17:50:44','2020-01-01 17:50:44',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 17:50:44','2020-01-01 13:50:44',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',23,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(486,NULL,1,'2020-01-01 17:51:22','2020-01-01 17:51:22',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI2001-0006 go back to draft status','2020-01-01 17:51:22','2020-01-01 13:51:22',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 go back to draft status',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(487,NULL,1,'2020-01-01 20:17:00','2020-01-01 20:17:00',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0006 validated','2020-01-01 20:17:00','2020-01-01 16:17:00',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 validated',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(488,NULL,1,'2020-01-01 20:17:46','2020-01-01 20:17:46',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0001 validated','2020-01-01 20:17:46','2020-01-01 16:17:46',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 validated',24,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(489,NULL,1,'2020-01-01 20:17:51','2020-01-01 20:17:51',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 20:17:51','2020-01-01 16:17:51',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',24,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(490,NULL,1,'2020-01-01 20:20:22','2020-01-01 20:20:22',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0001 validated','2020-01-01 20:20:22','2020-01-01 16:20:22',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 validated',26,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(491,NULL,1,'2020-01-01 20:20:31','2020-01-01 20:20:31',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 20:20:31','2020-01-01 16:20:31',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',26,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(492,NULL,1,'2020-01-01 20:21:35','2020-01-01 20:21:35',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI2001-0006 go back to draft status','2020-01-01 20:21:35','2020-01-01 16:21:35',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 go back to draft status',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(493,NULL,1,'2020-01-01 20:21:42','2020-01-01 20:21:42',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0006 validated','2020-01-01 20:21:42','2020-01-01 16:21:42',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 validated',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(494,NULL,1,'2020-01-01 20:21:55','2020-01-01 20:21:55',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0001 validated','2020-01-01 20:21:55','2020-01-01 16:21:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 validated',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(495,NULL,1,'2020-01-01 20:23:02','2020-01-01 20:23:02',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0007 validated','2020-01-01 20:23:02','2020-01-01 16:23:02',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0007 validated',28,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(496,NULL,1,'2020-01-01 20:23:17','2020-01-01 20:23:17',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 20:23:17','2020-01-01 16:23:17',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(497,NULL,1,'2020-01-01 20:25:36','2020-01-01 20:25:36',40,'AC_BILL_SUPPLIER_PAYED','Invoice SI2001-0007 changed to paid','2020-01-01 20:25:36','2020-01-01 16:25:36',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0007 changed to paid',28,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(498,NULL,1,'2020-01-01 20:51:37','2020-01-01 20:51:37',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0002 validated','2020-01-01 20:51:37','2020-01-01 16:51:37',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0002 validated',30,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(499,NULL,1,'2020-01-01 20:51:48','2020-01-01 20:51:48',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0002 changed to paid','2020-01-01 20:51:48','2020-01-01 16:51:48',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0002 changed to paid',30,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(500,NULL,1,'2020-01-01 21:02:39','2020-01-01 21:02:39',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 21:02:39','2020-01-01 17:02:39',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(501,NULL,1,'2020-01-01 21:03:01','2020-01-01 21:03:01',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 21:03:01','2020-01-01 17:03:01',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(502,NULL,1,'2020-01-01 21:11:10','2020-01-01 21:11:10',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 21:11:10','2020-01-01 17:11:10',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(503,NULL,1,'2020-01-01 21:20:07','2020-01-01 21:20:07',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 21:20:07','2020-01-01 17:20:07',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(504,NULL,1,'2020-01-01 21:21:28','2020-01-01 21:21:28',40,'AC_BILL_SUPPLIER_PAYED','Invoice SI2001-0007 changed to paid','2020-01-01 21:21:28','2020-01-01 17:21:28',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0007 changed to paid',28,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(505,NULL,1,'2020-01-01 22:06:30','2020-01-01 22:06:30',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 22:06:31','2020-01-01 18:06:31',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(506,NULL,1,'2020-01-01 23:54:16','2020-01-01 23:54:16',40,'AC_PRODUCT_MODIFY','Product APPLEPIE modified','2020-01-01 23:54:16','2020-01-01 19:54:16',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct APPLEPIE modified',4,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(507,NULL,1,'2020-01-02 20:49:34','2020-01-02 20:49:34',40,'AC_BILL_PAYED','Invoice FA1601-0024 changed to paid','2020-01-02 20:49:34','2020-01-02 16:49:34',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1601-0024 changed to paid',149,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(508,NULL,1,'2020-01-02 23:02:35','2020-01-02 23:02:35',40,'AC_PRODUCT_MODIFY','Product APPLEPIE modified','2020-01-02 23:02:35','2020-01-02 19:02:35',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct APPLEPIE modified',4,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(509,NULL,1,'2020-01-02 23:45:01','2020-01-02 23:45:01',40,'AC_BOM_REOPEN','BOM reopen','2020-01-02 23:45:01','2020-01-02 19:45:01',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM reopen',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(511,NULL,1,'2020-01-02 23:57:42','2020-01-02 23:57:42',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-02 23:57:42','2020-01-02 19:57:42',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(512,NULL,1,'2020-01-03 13:33:54','2020-01-03 13:33:54',40,'AC_BOM_UNVALIDATE','BOM unvalidated','2020-01-03 13:33:54','2020-01-03 09:33:54',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM unvalidated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(513,NULL,1,'2020-01-03 13:34:11','2020-01-03 13:34:11',40,'AC_BOM_VALIDATE','BOM validated','2020-01-03 13:34:11','2020-01-03 09:34:11',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM validated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(514,NULL,1,'2020-01-03 13:35:45','2020-01-03 13:35:45',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-03 13:35:45','2020-01-03 09:35:45',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',18,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(515,NULL,1,'2020-01-03 14:10:41','2020-01-03 14:10:41',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-03 14:10:41','2020-01-03 10:10:41',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',18,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(516,NULL,1,'2020-01-06 00:39:58','2020-01-06 00:39:58',40,'AC_COMPANY_CREATE','Patient créé','2020-01-06 00:39:58','2020-01-05 20:39:58',12,NULL,NULL,29,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPatient créé',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(517,NULL,1,'2020-01-06 00:49:06','2020-01-06 00:49:06',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI2001-0006 go back to draft status','2020-01-06 00:49:06','2020-01-05 20:49:06',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 go back to draft status',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(518,NULL,1,'2020-01-06 06:50:05','2020-01-06 06:50:05',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-06 06:50:05','2020-01-06 02:50:05',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(519,NULL,1,'2020-01-06 20:52:28','2020-01-06 20:52:28',40,'AC_OTH_AUTO','Consultation 2 recorded (Patient)','2020-01-06 20:52:28','2020-01-06 16:52:28',12,NULL,NULL,29,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Consultation 2 recorded (Patient)\nAuthor: admin',2,'cabinetmed_cons',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(520,NULL,1,'2020-01-07 20:25:02','2020-01-07 20:25:02',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 20:25:02','2020-01-07 16:25:02',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(521,NULL,1,'2020-01-07 21:12:37','2020-01-07 21:12:37',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:12:37','2020-01-07 17:12:37',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(522,NULL,1,'2020-01-07 21:13:00','2020-01-07 21:13:00',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:13:00','2020-01-07 17:13:00',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(523,NULL,1,'2020-01-07 21:13:49','2020-01-07 21:13:49',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:13:49','2020-01-07 17:13:49',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(524,NULL,1,'2020-01-07 21:46:58','2020-01-07 21:46:58',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:46:58','2020-01-07 17:46:58',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(525,NULL,1,'2020-01-07 21:52:34','2020-01-07 21:52:34',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:52:34','2020-01-07 17:52:34',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(526,NULL,1,'2020-01-07 21:53:44','2020-01-07 21:53:44',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:53:44','2020-01-07 17:53:44',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(527,NULL,1,'2020-01-07 21:53:58','2020-01-07 21:53:58',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:53:58','2020-01-07 17:53:58',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(528,NULL,1,'2020-01-07 21:54:12','2020-01-07 21:54:12',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:54:12','2020-01-07 17:54:12',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(529,NULL,1,'2020-01-07 22:00:55','2020-01-07 22:00:55',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 22:00:55','2020-01-07 18:00:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(530,NULL,1,'2020-01-07 22:39:52','2020-01-07 22:39:52',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 22:39:52','2020-01-07 18:39:52',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(531,NULL,1,'2020-01-07 23:09:04','2020-01-07 23:09:04',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 23:09:04','2020-01-07 19:09:04',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(532,NULL,1,'2020-01-07 23:39:09','2020-01-07 23:39:09',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR1909-0033 signed','2020-01-07 23:39:09','2020-01-07 19:39:09',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0033 signed',34,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(533,NULL,1,'2020-01-07 23:43:06','2020-01-07 23:43:06',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR1909-0033 signed','2020-01-07 23:43:06','2020-01-07 19:43:06',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0033 signed',34,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(534,NULL,1,'2020-01-07 23:50:40','2020-01-07 23:50:40',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 23:50:40','2020-01-07 19:50:40',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(535,NULL,1,'2020-01-07 23:51:27','2020-01-07 23:51:27',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 23:51:27','2020-01-07 19:51:27',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(536,NULL,1,'2020-01-08 00:25:23','2020-01-08 00:25:23',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 00:25:23','2020-01-07 20:25:23',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(537,NULL,1,'2020-01-08 00:25:43','2020-01-08 00:25:43',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 00:25:43','2020-01-07 20:25:43',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(538,NULL,1,'2020-01-08 00:29:24','2020-01-08 00:29:24',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 00:29:24','2020-01-07 20:29:24',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(539,NULL,1,'2020-01-08 00:29:43','2020-01-08 00:29:43',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 00:29:43','2020-01-07 20:29:43',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(540,NULL,1,'2020-01-08 01:09:15','2020-01-08 01:09:15',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 01:09:15','2020-01-07 21:09:15',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(541,NULL,1,'2020-01-08 01:15:02','2020-01-08 01:15:02',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 01:15:02','2020-01-07 21:15:02',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(542,NULL,1,'2020-01-08 01:17:16','2020-01-08 01:17:16',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 01:17:16','2020-01-07 21:17:16',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(543,NULL,1,'2020-01-08 05:31:44','2020-01-08 05:31:44',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 05:31:44','2020-01-08 01:31:44',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(544,NULL,1,'2020-01-08 05:39:46','2020-01-08 05:39:46',40,'AC_BOM_CLOSE','BOM disabled','2020-01-08 05:39:46','2020-01-08 01:39:46',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM disabled',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(545,NULL,1,'2020-01-08 05:39:50','2020-01-08 05:39:50',40,'AC_BOM_REOPEN','BOM reopen','2020-01-08 05:39:50','2020-01-08 01:39:50',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM reopen',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(546,NULL,1,'2020-01-08 06:06:50','2020-01-08 06:06:50',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 06:06:50','2020-01-08 02:06:50',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(547,NULL,1,'2020-01-08 19:34:53','2020-01-08 19:34:53',40,'AC_BOM_UNVALIDATE','BOM unvalidated','2020-01-08 19:34:53','2020-01-08 15:34:53',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM unvalidated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(548,NULL,1,'2020-01-08 19:40:27','2020-01-08 19:40:27',40,'AC_PRODUCT_MODIFY','Product APPLEPIE modified','2020-01-08 19:40:27','2020-01-08 15:40:27',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct APPLEPIE modified',4,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(549,NULL,1,'2020-01-08 19:40:46','2020-01-08 19:40:46',40,'AC_PRODUCT_MODIFY','Product PINKDRESS modified','2020-01-08 19:40:46','2020-01-08 15:40:46',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PINKDRESS modified',1,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(550,NULL,1,'2020-01-08 19:40:59','2020-01-08 19:40:59',40,'AC_BOM_VALIDATE','BOM validated','2020-01-08 19:40:59','2020-01-08 15:40:59',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM validated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(551,NULL,1,'2020-01-08 19:41:11','2020-01-08 19:41:11',40,'AC_BOM_UNVALIDATE','BOM unvalidated','2020-01-08 19:41:11','2020-01-08 15:41:11',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM unvalidated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(552,NULL,1,'2020-01-08 19:41:49','2020-01-08 19:41:49',40,'AC_BOM_VALIDATE','BOM validated','2020-01-08 19:41:49','2020-01-08 15:41:49',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM validated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(553,NULL,1,'2020-01-08 20:12:55','2020-01-08 20:12:55',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-08 20:12:55','2020-01-08 16:12:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',28,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(554,NULL,1,'2020-01-08 20:21:22','2020-01-08 20:21:22',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 20:21:22','2020-01-08 16:21:22',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',28,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(555,NULL,1,'2020-01-08 20:41:19','2020-01-08 20:41:19',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 20:41:19','2020-01-08 16:41:19',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',28,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(556,NULL,1,'2020-01-08 22:25:19','2020-01-08 22:25:19',40,'AC_BOM_DELETE','BOM deleted','2020-01-08 22:25:19','2020-01-08 18:25:19',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM deleted',7,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(557,NULL,1,'2020-01-13 15:11:07','2020-01-13 15:11:07',40,'AC_MO_DELETE','MO_DELETEInDolibarr','2020-01-13 15:11:07','2020-01-13 11:11:07',12,NULL,6,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO_DELETEInDolibarr',25,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(558,NULL,1,'2020-01-13 15:11:54','2020-01-13 15:11:54',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-13 15:11:54','2020-01-13 11:11:54',12,NULL,6,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',24,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(559,NULL,1,'2020-01-13 15:13:19','2020-01-13 15:13:19',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-13 15:13:19','2020-01-13 11:13:19',12,NULL,6,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',24,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(560,NULL,1,'2020-01-13 15:14:15','2020-01-13 15:14:15',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-13 15:14:15','2020-01-13 11:14:15',12,NULL,6,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',24,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(561,NULL,1,'2020-01-13 15:29:30','2020-01-13 15:29:30',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-13 15:29:30','2020-01-13 11:29:30',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(562,NULL,1,'2020-01-13 17:19:24','2020-01-13 17:19:24',40,'AC_COMPANY_CREATE','Third party Italo created','2020-01-13 17:19:24','2020-01-13 13:19:24',12,NULL,NULL,30,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nThird party Italo created',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(563,NULL,1,'2020-01-15 16:27:15','2020-01-15 16:27:15',40,'AC_PROJECT_MODIFY','Project RMLL modified','2020-01-15 16:27:15','2020-01-15 12:27:15',12,NULL,5,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject RMLL modified\nTask: RMLL',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(564,NULL,1,'2020-01-15 16:40:50','2020-01-15 16:40:50',40,'AC_PROJECT_MODIFY','Project PROJINDIAN modified','2020-01-15 16:40:50','2020-01-15 12:40:50',12,NULL,3,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PROJINDIAN modified\nTask: PROJINDIAN',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(565,NULL,1,'2020-01-16 02:22:16','2020-01-16 02:22:16',40,'AC_BILL_VALIDATE','Invoice AC2001-0001 validated','2020-01-16 02:22:16','2020-01-16 01:22:16',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0001 validated',221,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(566,NULL,1,'2020-01-16 02:22:24','2020-01-16 02:22:24',40,'AC_BILL_UNVALIDATE','Invoice AC2001-0001 go back to draft status','2020-01-16 02:22:24','2020-01-16 01:22:24',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0001 go back to draft status',221,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(567,NULL,1,'2020-01-16 02:33:27','2020-01-16 02:33:27',40,'AC_BILL_VALIDATE','Invoice AC2001-0002 validated','2020-01-16 02:33:27','2020-01-16 01:33:27',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0002 validated',224,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(568,NULL,1,'2020-01-16 02:36:48','2020-01-16 02:36:48',40,'AC_BILL_PAYED','Invoice AC2001-0002 changed to paid','2020-01-16 02:36:48','2020-01-16 01:36:48',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0002 changed to paid',224,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(569,NULL,1,'2020-01-16 02:42:12','2020-01-16 02:42:12',40,'AC_ORDER_CLASSIFY_BILLED','Order CO7001-0020 classified billed','2020-01-16 02:42:12','2020-01-16 01:42:12',12,NULL,NULL,6,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0020 classified billed',72,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(570,NULL,1,'2020-01-16 02:42:17','2020-01-16 02:42:17',40,'AC_ORDER_CLOSE','Order CO7001-0020 classified delivered','2020-01-16 02:42:17','2020-01-16 01:42:17',12,NULL,NULL,6,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0020 classified delivered',72,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(571,NULL,1,'2020-01-16 02:42:56','2020-01-16 02:42:56',40,'AC_ORDER_CLOSE','Order CO7001-0020 classified delivered','2020-01-16 02:42:56','2020-01-16 01:42:56',12,NULL,NULL,6,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0020 classified delivered',72,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(572,NULL,1,'2020-01-16 18:05:43','2020-01-16 18:05:43',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0006 validated','2020-01-16 18:05:43','2020-01-16 17:05:43',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 validated',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(573,NULL,1,'2020-01-17 14:54:18','2020-01-17 14:54:18',40,'AC_PRODUCT_MODIFY','Product PINKDRESS modified','2020-01-17 14:54:18','2020-01-17 13:54:18',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PINKDRESS modified',1,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(574,NULL,1,'2020-01-17 15:22:28','2020-01-17 15:22:28',40,'AC_PRODUCT_MODIFY','Product PINKDRESS modified','2020-01-17 15:22:28','2020-01-17 14:22:28',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PINKDRESS modified',1,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(575,NULL,1,'2020-01-19 14:22:27','2020-01-19 14:22:27',40,'AC_PROPAL_VALIDATE','Proposal PR2001-0034 validated','2020-01-19 14:22:27','2020-01-19 13:22:27',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR2001-0034 validated',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(576,NULL,1,'2020-01-19 14:22:34','2020-01-19 14:22:34',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR2001-0034 signed','2020-01-19 14:22:34','2020-01-19 13:22:34',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR2001-0034 signed',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(577,NULL,1,'2020-01-19 14:24:22','2020-01-19 14:24:22',40,'AC_PROPAL_VALIDATE','Proposal PR2001-0034 validated','2020-01-19 14:24:22','2020-01-19 13:24:22',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR2001-0034 validated',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(578,NULL,1,'2020-01-19 14:24:27','2020-01-19 14:24:27',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR2001-0034 signed','2020-01-19 14:24:27','2020-01-19 13:24:27',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR2001-0034 signed',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(579,NULL,1,'2020-01-19 14:51:43','2020-01-19 14:51:43',40,'AC_BILL_VALIDATE','Invoice AC2001-0003 validated','2020-01-19 14:51:43','2020-01-19 13:51:43',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0003 validated',227,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(580,NULL,1,'2020-01-19 14:51:48','2020-01-19 14:51:48',40,'AC_BILL_UNVALIDATE','Invoice AC2001-0003 go back to draft status','2020-01-19 14:51:48','2020-01-19 13:51:48',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0003 go back to draft status',227,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(581,NULL,1,'2020-01-19 15:01:26','2020-01-19 15:01:26',40,'AC_BILL_VALIDATE','Invoice AC2001-0004 validated','2020-01-19 15:01:26','2020-01-19 14:01:26',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 validated',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(582,NULL,1,'2020-01-19 15:04:37','2020-01-19 15:04:37',40,'AC_BILL_UNVALIDATE','Invoice AC2001-0004 go back to draft status','2020-01-19 15:04:37','2020-01-19 14:04:37',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 go back to draft status',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(583,NULL,1,'2020-01-19 15:04:53','2020-01-19 15:04:53',40,'AC_BILL_VALIDATE','Invoice AC2001-0004 validated','2020-01-19 15:04:53','2020-01-19 14:04:53',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 validated',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(584,NULL,1,'2020-01-19 15:09:14','2020-01-19 15:09:14',40,'AC_BILL_UNVALIDATE','Invoice AC2001-0004 go back to draft status','2020-01-19 15:09:14','2020-01-19 14:09:14',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 go back to draft status',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(585,NULL,1,'2020-01-19 15:13:07','2020-01-19 15:13:07',40,'AC_BILL_VALIDATE','Invoice AC2001-0004 validated','2020-01-19 15:13:07','2020-01-19 14:13:07',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 validated',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(586,NULL,1,'2020-01-20 12:20:11','2020-01-20 12:20:11',40,'AC_ORDER_SUPPLIER_CREATE','Order (PROV14) created','2020-01-20 12:20:11','2020-01-20 11:20:11',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder (PROV14) created',14,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(588,NULL,1,'2020-01-21 01:02:14','2020-01-21 01:02:14',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 2 for member Vick Smith added','2020-01-21 01:02:14','2020-01-21 00:02:14',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 2 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2013 - 07/17/2014',3,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(589,NULL,1,'2020-01-21 10:22:37','2020-01-21 10:22:37',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 3 for member Vick Smith added','2020-01-21 10:22:37','2020-01-21 09:22:37',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 3 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2017 - 07/17/2018',4,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(590,NULL,1,'2020-01-21 10:23:17','2020-01-21 10:23:17',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 4 for member Vick Smith added','2020-01-21 10:23:17','2020-01-21 09:23:17',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 4 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2017 - 07/17/2018',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(591,NULL,1,'2020-01-21 10:23:17','2020-01-21 10:23:17',40,'AC_BILL_VALIDATE','Invoice FA1707-0026 validated','2020-01-21 10:23:17','2020-01-21 09:23:17',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1707-0026 validated',229,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(592,NULL,1,'2020-01-21 10:23:17','2020-01-21 10:23:17',40,'AC_BILL_PAYED','Invoice FA1707-0026 changed to paid','2020-01-21 10:23:17','2020-01-21 09:23:17',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1707-0026 changed to paid',229,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(593,NULL,1,'2020-01-21 10:23:28','2020-01-21 10:23:28',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 5 for member Vick Smith added','2020-01-21 10:23:28','2020-01-21 09:23:28',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 5 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2018 - 07/17/2019',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(594,NULL,1,'2020-01-21 10:23:28','2020-01-21 10:23:28',40,'AC_BILL_VALIDATE','Invoice FA1807-0027 validated','2020-01-21 10:23:28','2020-01-21 09:23:28',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1807-0027 validated',230,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(595,NULL,1,'2020-01-21 10:23:28','2020-01-21 10:23:28',40,'AC_BILL_PAYED','Invoice FA1807-0027 changed to paid','2020-01-21 10:23:28','2020-01-21 09:23:28',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1807-0027 changed to paid',230,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(596,NULL,1,'2020-01-21 10:23:49','2020-01-21 10:23:49',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 6 for member Vick Smith added','2020-01-21 10:23:49','2020-01-21 09:23:49',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 6 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2019 - 07/17/2020',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(597,NULL,1,'2020-01-21 10:23:49','2020-01-21 10:23:49',40,'AC_BILL_VALIDATE','Invoice FA1907-0028 validated','2020-01-21 10:23:49','2020-01-21 09:23:49',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1907-0028 validated',231,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(598,NULL,1,'2020-01-21 10:23:49','2020-01-21 10:23:49',40,'AC_BILL_PAYED','Invoice FA1907-0028 changed to paid','2020-01-21 10:23:49','2020-01-21 09:23:49',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1907-0028 changed to paid',231,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(599,NULL,1,'2020-01-21 10:30:27','2020-01-21 10:30:27',40,'AC_MEMBER_MODIFY','Member Pierre Curie modified','2020-01-21 10:30:27','2020-01-21 09:30:27',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Pierre Curie modified\nMember: Pierre Curie\nType: Standard members',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(600,NULL,1,'2020-01-21 10:30:36','2020-01-21 10:30:36',40,'AC_MEMBER_MODIFY','Member doe john modified','2020-01-21 10:30:36','2020-01-21 09:30:36',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember doe john modified\nMember: doe john\nType: Standard members',3,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(601,NULL,1,'2020-01-21 10:30:42','2020-01-21 10:30:42',40,'AC_MEMBER_MODIFY','Member smith smith modified','2020-01-21 10:30:42','2020-01-21 09:30:42',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember smith smith modified\nMember: smith smith\nType: Standard members',4,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(602,NULL,1,'2020-01-21 10:30:57','2020-01-21 10:30:57',40,'AC_MEMBER_MODIFY','Member Vick Smith modified','2020-01-21 10:30:57','2020-01-21 09:30:57',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Vick Smith modified\nMember: Vick Smith\nType: Standard members',1,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(603,NULL,1,'2020-06-12 10:00:00','2020-06-12 11:30:00',5,'AC_RDV','Meetings','2020-06-12 19:26:44','2020-06-12 17:26:44',12,NULL,3,NULL,NULL,0,12,1,NULL,0,0,-1,'Room 24',5400,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(604,NULL,1,'2020-06-01 10:00:00','2020-06-01 10:27:00',1,'AC_TEL','Called Mr X','2020-06-12 19:28:13','2020-06-12 17:28:25',12,12,3,NULL,NULL,0,12,1,NULL,0,0,100,NULL,1620,NULL,'Customer ask another call.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default');
+INSERT INTO `llx_actioncomm` VALUES (1,NULL,1,'2012-07-08 14:21:44','2012-07-08 14:21:44',50,NULL,'Company AAA and Co added into Dolibarr','2012-07-08 14:21:44','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company AAA and Co added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(2,NULL,1,'2012-07-08 14:23:48','2012-07-08 14:23:48',50,NULL,'Company Belin SARL added into Dolibarr','2012-07-08 14:23:48','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Belin SARL added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(3,NULL,1,'2012-07-08 22:42:12','2012-07-08 22:42:12',50,NULL,'Company Spanish Comp added into Dolibarr','2012-07-08 22:42:12','2016-12-21 12:50:33',1,NULL,NULL,3,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Spanish Comp added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(4,NULL,1,'2012-07-08 22:48:18','2012-07-08 22:48:18',50,NULL,'Company Prospector Vaalen added into Dolibarr','2012-07-08 22:48:18','2016-12-21 12:50:33',1,NULL,NULL,4,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Prospector Vaalen added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(5,NULL,1,'2012-07-08 23:22:57','2012-07-08 23:22:57',50,NULL,'Company NoCountry Co added into Dolibarr','2012-07-08 23:22:57','2016-12-21 12:50:33',1,NULL,NULL,5,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company NoCountry Co added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(6,NULL,1,'2012-07-09 00:15:09','2012-07-09 00:15:09',50,NULL,'Company Swiss customer added into Dolibarr','2012-07-09 00:15:09','2016-12-21 12:50:33',1,NULL,NULL,6,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Swiss customer added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(7,NULL,1,'2012-07-09 01:24:26','2012-07-09 01:24:26',50,NULL,'Company Generic customer added into Dolibarr','2012-07-09 01:24:26','2016-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Generic customer added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(8,NULL,1,'2012-07-10 14:54:27','2012-07-10 14:54:27',50,NULL,'Société Client salon ajoutée dans Dolibarr','2012-07-10 14:54:27','2016-12-21 12:50:33',1,NULL,NULL,8,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Client salon ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(9,NULL,1,'2012-07-10 14:54:44','2012-07-10 14:54:44',50,NULL,'Société Client salon invidivdu ajoutée dans Doliba','2012-07-10 14:54:44','2016-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Client salon invidivdu ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(10,NULL,1,'2012-07-10 14:56:10','2012-07-10 14:56:10',50,NULL,'Facture FA1007-0001 validée dans Dolibarr','2012-07-10 14:56:10','2016-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Facture FA1007-0001 validée dans Dolibarr\nAuteur: admin',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(11,NULL,1,'2012-07-10 14:58:53','2012-07-10 14:58:53',50,NULL,'Facture FA1007-0001 validée dans Dolibarr','2012-07-10 14:58:53','2016-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Facture FA1007-0001 validée dans Dolibarr\nAuteur: admin',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(12,NULL,1,'2012-07-10 15:00:55','2012-07-10 15:00:55',50,NULL,'Facture FA1007-0001 passée à payée dans Dolibarr','2012-07-10 15:00:55','2016-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Facture FA1007-0001 passée à payée dans Dolibarr\nAuteur: admin',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(13,NULL,1,'2012-07-10 15:13:08','2012-07-10 15:13:08',50,NULL,'Société Smith Vick ajoutée dans Dolibarr','2012-07-10 15:13:08','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Smith Vick ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(14,NULL,1,'2012-07-10 15:21:00','2012-07-10 16:21:00',5,NULL,'RDV avec mon chef','2012-07-10 15:21:48','2012-07-10 13:21:48',1,NULL,NULL,NULL,NULL,0,1,NULL,NULL,0,0,0,'',3600,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(15,NULL,1,'2012-07-10 18:18:16','2012-07-10 18:18:16',50,NULL,'Contrat CONTRAT1 validé dans Dolibarr','2012-07-10 18:18:16','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Contrat CONTRAT1 validé dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(16,NULL,1,'2012-07-10 18:35:57','2012-07-10 18:35:57',50,NULL,'Société Mon client ajoutée dans Dolibarr','2012-07-10 18:35:57','2016-12-21 12:50:33',1,NULL,NULL,11,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Mon client ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(17,NULL,1,'2012-07-11 16:18:08','2012-07-11 16:18:08',50,NULL,'Société Dupont Alain ajoutée dans Dolibarr','2012-07-11 16:18:08','2016-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Dupont Alain ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(18,NULL,1,'2012-07-11 17:11:00','2012-07-11 17:17:00',5,NULL,'Rendez-vous','2012-07-11 17:11:22','2012-07-11 15:11:22',1,NULL,NULL,NULL,NULL,0,1,NULL,NULL,0,0,0,'gfgdfgdf',360,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(19,NULL,1,'2012-07-11 17:13:20','2012-07-11 17:13:20',50,NULL,'Société Vendeur de chips ajoutée dans Dolibarr','2012-07-11 17:13:20','2016-12-21 12:50:33',1,NULL,NULL,13,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Vendeur de chips ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(20,NULL,1,'2012-07-11 17:15:42','2012-07-11 17:15:42',50,NULL,'Commande CF1007-0001 validée','2012-07-11 17:15:42','2016-12-21 12:50:33',1,NULL,NULL,13,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Commande CF1007-0001 validée\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(21,NULL,1,'2012-07-11 18:47:33','2012-07-11 18:47:33',50,NULL,'Commande CF1007-0002 validée','2012-07-11 18:47:33','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Commande CF1007-0002 validée\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(22,NULL,1,'2012-07-18 11:36:18','2012-07-18 11:36:18',50,NULL,'Proposition PR1007-0003 validée','2012-07-18 11:36:18','2016-12-21 12:50:33',1,NULL,NULL,4,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Proposition PR1007-0003 validée\nAuteur: admin',3,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(23,NULL,1,'2013-07-18 20:49:58','2013-07-18 20:49:58',50,NULL,'Invoice FA1007-0002 validated in Dolibarr','2013-07-18 20:49:58','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1007-0002 validated in Dolibarr\nAuthor: admin',2,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(24,NULL,1,'2013-07-28 01:37:00',NULL,1,NULL,'Phone call','2013-07-28 01:37:48','2013-07-27 23:37:48',1,NULL,NULL,NULL,2,0,1,NULL,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(25,NULL,1,'2013-08-01 02:31:24','2013-08-01 02:31:24',50,NULL,'Company mmm added into Dolibarr','2013-08-01 02:31:24','2016-12-21 12:50:33',1,NULL,NULL,15,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company mmm added into Dolibarr\nAuthor: admin',15,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(26,NULL,1,'2013-08-01 02:31:43','2013-08-01 02:31:43',50,NULL,'Company ppp added into Dolibarr','2013-08-01 02:31:43','2016-12-21 12:50:33',1,NULL,NULL,16,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company ppp added into Dolibarr\nAuthor: admin',16,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(27,NULL,1,'2013-08-01 02:41:26','2013-08-01 02:41:26',50,NULL,'Company aaa added into Dolibarr','2013-08-01 02:41:26','2016-12-21 12:50:33',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company aaa added into Dolibarr\nAuthor: admin',17,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(28,NULL,1,'2013-08-01 03:34:11','2013-08-01 03:34:11',50,NULL,'Invoice FA1108-0003 validated in Dolibarr','2013-08-01 03:34:11','2016-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0003 validated in Dolibarr\nAuthor: admin',5,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(29,NULL,1,'2013-08-01 03:34:11','2013-08-01 03:34:11',50,NULL,'Invoice FA1108-0003 validated in Dolibarr','2013-08-01 03:34:11','2016-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0003 changed to paid in Dolibarr\nAuthor: admin',5,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(30,NULL,1,'2013-08-06 20:33:54','2013-08-06 20:33:54',50,NULL,'Invoice FA1108-0004 validated in Dolibarr','2013-08-06 20:33:54','2016-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0004 validated in Dolibarr\nAuthor: admin',6,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(31,NULL,1,'2013-08-06 20:33:54','2013-08-06 20:33:54',50,NULL,'Invoice FA1108-0004 validated in Dolibarr','2013-08-06 20:33:54','2016-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0004 changed to paid in Dolibarr\nAuthor: admin',6,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(38,NULL,1,'2013-08-08 02:41:55','2013-08-08 02:41:55',50,NULL,'Invoice FA1108-0005 validated in Dolibarr','2013-08-08 02:41:55','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0005 validated in Dolibarr\nAuthor: admin',8,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(40,NULL,1,'2013-08-08 02:53:40','2013-08-08 02:53:40',50,NULL,'Invoice FA1108-0005 changed to paid in Dolibarr','2013-08-08 02:53:40','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0005 changed to paid in Dolibarr\nAuthor: admin',8,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(41,NULL,1,'2013-08-08 02:54:05','2013-08-08 02:54:05',50,NULL,'Invoice FA1007-0002 changed to paid in Dolibarr','2013-08-08 02:54:05','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1007-0002 changed to paid in Dolibarr\nAuthor: admin',2,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(42,NULL,1,'2013-08-08 02:55:04','2013-08-08 02:55:04',50,NULL,'Invoice FA1107-0006 validated in Dolibarr','2013-08-08 02:55:04','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1107-0006 validated in Dolibarr\nAuthor: admin',3,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(43,NULL,1,'2013-08-08 02:55:26','2013-08-08 02:55:26',50,NULL,'Invoice FA1108-0007 validated in Dolibarr','2013-08-08 02:55:26','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0007 validated in Dolibarr\nAuthor: admin',9,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(44,NULL,1,'2013-08-08 02:55:58','2013-08-08 02:55:58',50,NULL,'Invoice FA1107-0006 changed to paid in Dolibarr','2013-08-08 02:55:58','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1107-0006 changed to paid in Dolibarr\nAuthor: admin',3,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(45,NULL,1,'2013-08-08 03:04:22','2013-08-08 03:04:22',50,NULL,'Order CO1108-0001 validated','2013-08-08 03:04:22','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Order CO1108-0001 validated\nAuthor: admin',5,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(46,NULL,1,'2013-08-08 13:59:09','2013-08-08 13:59:09',50,NULL,'Order CO1107-0002 validated','2013-08-08 13:59:10','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Order CO1107-0002 validated\nAuthor: admin',1,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(47,NULL,1,'2013-08-08 14:24:18','2013-08-08 14:24:18',50,NULL,'Proposal PR1007-0001 validated','2013-08-08 14:24:18','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposal PR1007-0001 validated\nAuthor: admin',1,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(48,NULL,1,'2013-08-08 14:24:24','2013-08-08 14:24:24',50,NULL,'Proposal PR1108-0004 validated','2013-08-08 14:24:24','2016-12-21 12:50:33',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposal PR1108-0004 validated\nAuthor: admin',4,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(49,NULL,1,'2013-08-08 15:04:37','2013-08-08 15:04:37',50,NULL,'Order CF1108-0003 validated','2013-08-08 15:04:37','2016-12-21 12:50:33',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Order CF1108-0003 validated\nAuthor: admin',6,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(50,NULL,1,'2014-12-08 17:56:47','2014-12-08 17:56:47',40,NULL,'Facture AV1212-0001 validée dans Dolibarr','2014-12-08 17:56:47','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture AV1212-0001 validée dans Dolibarr\nAuteur: admin',10,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(51,NULL,1,'2014-12-08 17:57:11','2014-12-08 17:57:11',40,NULL,'Facture AV1212-0001 validée dans Dolibarr','2014-12-08 17:57:11','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture AV1212-0001 validée dans Dolibarr\nAuteur: admin',10,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(52,NULL,1,'2014-12-08 17:58:27','2014-12-08 17:58:27',40,NULL,'Facture FA1212-0008 validée dans Dolibarr','2014-12-08 17:58:27','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1212-0008 validée dans Dolibarr\nAuteur: admin',11,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(53,NULL,1,'2014-12-08 18:20:49','2014-12-08 18:20:49',40,NULL,'Facture AV1212-0002 validée dans Dolibarr','2014-12-08 18:20:49','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture AV1212-0002 validée dans Dolibarr\nAuteur: admin',12,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(54,NULL,1,'2014-12-09 18:35:07','2014-12-09 18:35:07',40,NULL,'Facture AV1212-0002 passée à payée dans Dolibarr','2014-12-09 18:35:07','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture AV1212-0002 passée à payée dans Dolibarr\nAuteur: admin',12,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(55,NULL,1,'2014-12-09 20:14:42','2014-12-09 20:14:42',40,NULL,'Société doe john ajoutée dans Dolibarr','2014-12-09 20:14:42','2016-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Société doe john ajoutée dans Dolibarr\nAuteur: admin',18,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(56,NULL,1,'2014-12-12 18:54:19','2014-12-12 18:54:19',40,NULL,'Facture FA1212-0009 validée dans Dolibarr','2014-12-12 18:54:19','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1212-0009 validée dans Dolibarr\nAuteur: admin',55,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(121,NULL,1,'2014-12-06 10:00:00',NULL,50,NULL,'aaab','2014-12-21 17:48:08','2014-12-21 16:54:07',3,1,NULL,NULL,NULL,0,3,NULL,NULL,1,0,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(122,NULL,1,'2014-12-21 18:09:52','2014-12-21 18:09:52',40,NULL,'Facture client FA1007-0001 envoyée par EMail','2014-12-21 18:09:52','2016-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Mail envoyé par Firstname SuperAdminName <bidon@example.com> à laurent@mycompany.fr.\nSujet du mail: Envoi facture FA1007-0001\nCorps du mail:\nVeuillez trouver ci-joint la facture FA1007-0001\r\n\r\nVous pouvez cliquer sur le lien sécurisé ci-dessous pour effectuer votre paiement via Paypal\r\n\r\nhttp://localhost/dolibarrnew/public/paypal/newpayment.php?source=invoice&ref=FA1007-0001&securekey=50c82fab36bb3b6aa83e2a50691803b2\r\n\r\nCordialement',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(123,NULL,1,'2015-01-06 13:13:57','2015-01-06 13:13:57',40,NULL,'Facture 16 validée dans Dolibarr','2015-01-06 13:13:57','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture 16 validée dans Dolibarr\nAuteur: admin',16,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(124,NULL,1,'2015-01-12 12:23:05','2015-01-12 12:23:05',40,NULL,'Patient aaa ajouté','2015-01-12 12:23:05','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Patient aaa ajouté\nAuteur: admin',19,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(125,NULL,1,'2015-01-12 12:52:20','2015-01-12 12:52:20',40,NULL,'Patient pppoo ajouté','2015-01-12 12:52:20','2016-12-21 12:50:33',1,NULL,NULL,20,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Patient pppoo ajouté\nAuteur: admin',20,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(127,NULL,1,'2015-01-19 18:22:48','2015-01-19 18:22:48',40,NULL,'Facture FS1301-0001 validée dans Dolibarr','2015-01-19 18:22:48','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FS1301-0001 validée dans Dolibarr\nAuteur: admin',148,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(128,NULL,1,'2015-01-19 18:31:10','2015-01-19 18:31:10',40,NULL,'Facture FA6801-0010 validée dans Dolibarr','2015-01-19 18:31:10','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA6801-0010 validée dans Dolibarr\nAuteur: admin',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(129,NULL,1,'2015-01-19 18:31:10','2015-01-19 18:31:10',40,NULL,'Facture FA6801-0010 passée à payée dans Dolibarr','2015-01-19 18:31:10','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA6801-0010 passée à payée dans Dolibarr\nAuteur: admin',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(130,NULL,1,'2015-01-19 18:31:58','2015-01-19 18:31:58',40,NULL,'Facture FS1301-0002 validée dans Dolibarr','2015-01-19 18:31:58','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FS1301-0002 validée dans Dolibarr\nAuteur: admin',151,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(131,NULL,1,'2015-01-19 18:31:58','2015-01-19 18:31:58',40,NULL,'Facture FS1301-0002 passée à payée dans Dolibarr','2015-01-19 18:31:58','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FS1301-0002 passée à payée dans Dolibarr\nAuteur: admin',151,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(132,NULL,1,'2015-01-23 15:07:54','2015-01-23 15:07:54',50,NULL,'Consultation 24 saisie (aaa)','2015-01-23 15:07:54','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Consultation 24 saisie (aaa)\nAuteur: admin',24,'cabinetmed_cons',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(133,NULL,1,'2015-01-23 16:56:58','2015-01-23 16:56:58',40,NULL,'Patient pa ajouté','2015-01-23 16:56:58','2016-12-21 12:50:33',1,NULL,NULL,21,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Patient pa ajouté\nAuteur: admin',21,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(134,NULL,1,'2015-01-23 17:34:00',NULL,50,NULL,'bbcv','2015-01-23 17:35:21','2015-01-23 16:35:21',1,NULL,1,2,NULL,0,1,NULL,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(135,NULL,1,'2015-02-12 15:54:00','2015-02-12 15:54:00',40,NULL,'Facture FA1212-0011 validée dans Dolibarr','2015-02-12 15:54:37','2016-12-21 12:50:33',1,1,NULL,7,NULL,0,1,NULL,1,0,0,50,NULL,NULL,NULL,'Facture FA1212-0011 valid&eacute;e dans Dolibarr<br />\r\nAuteur: admin',13,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(136,NULL,1,'2015-02-12 17:06:51','2015-02-12 17:06:51',40,NULL,'Commande CO1107-0003 validée','2015-02-12 17:06:51','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Commande CO1107-0003 validée\nAuteur: admin',2,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(137,NULL,1,'2015-02-17 16:22:10','2015-02-17 16:22:10',40,NULL,'Proposition PR1302-0009 validée','2015-02-17 16:22:10','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposition PR1302-0009 validée\nAuteur: admin',9,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(138,NULL,1,'2015-02-17 16:27:00','2015-02-17 16:27:00',40,NULL,'Facture FA1302-0012 validée dans Dolibarr','2015-02-17 16:27:00','2016-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1302-0012 validée dans Dolibarr\nAuteur: admin',152,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(139,NULL,1,'2015-02-17 16:27:29','2015-02-17 16:27:29',40,NULL,'Proposition PR1302-0010 validée','2015-02-17 16:27:29','2016-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposition PR1302-0010 validée\nAuteur: admin',11,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(140,NULL,1,'2015-02-17 18:27:56','2015-02-17 18:27:56',40,NULL,'Commande CO1107-0004 validée','2015-02-17 18:27:56','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Commande CO1107-0004 validée\nAuteur: admin',3,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(141,NULL,1,'2015-02-17 18:38:14','2015-02-17 18:38:14',40,NULL,'Commande CO1302-0005 validée','2015-02-17 18:38:14','2016-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Commande CO1302-0005 validée\nAuteur: admin',7,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(142,NULL,1,'2015-02-26 22:57:50','2015-02-26 22:57:50',40,NULL,'Company pppp added into Dolibarr','2015-02-26 22:57:50','2016-12-21 12:50:33',1,NULL,NULL,22,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company pppp added into Dolibarr\nAuthor: admin',22,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(143,NULL,1,'2015-02-26 22:58:13','2015-02-26 22:58:13',40,NULL,'Company ttttt added into Dolibarr','2015-02-26 22:58:13','2016-12-21 12:50:33',1,NULL,NULL,23,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company ttttt added into Dolibarr\nAuthor: admin',23,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(144,NULL,1,'2015-02-27 10:00:00','2015-02-27 19:20:00',5,NULL,'Rendez-vous','2015-02-27 19:20:53','2015-02-27 18:20:53',1,NULL,NULL,NULL,NULL,0,1,NULL,1,0,0,-1,'',33600,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(145,NULL,1,'2015-02-27 19:28:00',NULL,2,NULL,'fdsfsd','2015-02-27 19:28:48','2015-02-27 18:29:53',1,1,NULL,NULL,NULL,0,1,NULL,1,0,0,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(146,NULL,1,'2015-03-06 10:05:07','2015-03-06 10:05:07',40,NULL,'Contrat (PROV3) validé dans Dolibarr','2015-03-06 10:05:07','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Contrat (PROV3) validé dans Dolibarr\nAuteur: admin',3,'contract',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(147,NULL,1,'2015-03-06 16:43:37','2015-03-06 16:43:37',40,NULL,'Facture FA1307-0013 validée dans Dolibarr','2015-03-06 16:43:37','2016-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1307-0013 validée dans Dolibarr\nAuteur: admin',158,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(148,NULL,1,'2015-03-06 16:44:12','2015-03-06 16:44:12',40,NULL,'Facture FA1407-0014 validée dans Dolibarr','2015-03-06 16:44:12','2016-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1407-0014 validée dans Dolibarr\nAuteur: admin',159,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(149,NULL,1,'2015-03-06 16:47:48','2015-03-06 16:47:48',40,NULL,'Facture FA1507-0015 validée dans Dolibarr','2015-03-06 16:47:48','2016-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1507-0015 validée dans Dolibarr\nAuteur: admin',160,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(150,NULL,1,'2015-03-06 16:48:16','2015-03-06 16:48:16',40,NULL,'Facture FA1607-0016 validée dans Dolibarr','2015-03-06 16:48:16','2016-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1607-0016 validée dans Dolibarr\nAuteur: admin',161,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(151,NULL,1,'2015-03-06 17:13:59','2015-03-06 17:13:59',40,NULL,'Société smith smith ajoutée dans Dolibarr','2015-03-06 17:13:59','2016-12-21 12:50:33',1,NULL,NULL,24,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Société smith smith ajoutée dans Dolibarr\nAuteur: admin',24,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(152,NULL,1,'2015-03-08 10:02:22','2015-03-08 10:02:22',40,NULL,'Proposition (PROV12) validée dans Dolibarr','2015-03-08 10:02:22','2016-12-21 12:50:33',1,NULL,NULL,23,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposition (PROV12) validée dans Dolibarr\nAuteur: admin',12,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(203,NULL,1,'2015-03-09 19:39:27','2015-03-09 19:39:27',40,'AC_ORDER_SUPPLIER_VALIDATE','Commande CF1303-0004 validée','2015-03-09 19:39:27','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Commande CF1303-0004 validée\nAuteur: admin',13,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(204,NULL,1,'2015-03-10 15:47:37','2015-03-10 15:47:37',40,'AC_COMPANY_CREATE','Patient créé','2015-03-10 15:47:37','2016-12-21 12:50:33',1,NULL,NULL,25,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Patient créé\nAuteur: admin',25,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(205,NULL,1,'2015-03-10 15:57:32','2015-03-10 15:57:32',40,'AC_COMPANY_CREATE','Tiers créé','2015-03-10 15:57:32','2016-12-21 12:50:33',1,NULL,NULL,26,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Tiers créé\nAuteur: admin',26,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(206,NULL,1,'2015-03-10 15:58:28','2015-03-10 15:58:28',40,'AC_BILL_VALIDATE','Facture FA1303-0017 validée','2015-03-10 15:58:28','2016-12-21 12:50:33',1,NULL,NULL,26,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1303-0017 validée\nAuteur: admin',208,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(207,NULL,1,'2015-03-19 09:38:10','2015-03-19 09:38:10',40,'AC_BILL_VALIDATE','Facture FA1303-0018 validée','2015-03-19 09:38:10','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1303-0018 validée\nAuteur: admin',209,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(208,NULL,1,'2015-03-20 14:30:11','2015-03-20 14:30:11',40,'AC_BILL_VALIDATE','Facture FA1107-0019 validée','2015-03-20 14:30:11','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1107-0019 validée\nAuteur: admin',210,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(209,NULL,1,'2015-03-22 09:40:25','2015-03-22 09:40:25',40,'AC_BILL_VALIDATE','Facture FA1303-0020 validée','2015-03-22 09:40:25','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1303-0020 validée\nAuteur: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(210,NULL,1,'2015-03-23 17:16:25','2015-03-23 17:16:25',40,'AC_BILL_VALIDATE','Facture FA1303-0020 validée','2015-03-23 17:16:25','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1303-0020 validée\nAuteur: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(211,NULL,1,'2015-03-23 18:08:27','2015-03-23 18:08:27',40,'AC_BILL_VALIDATE','Facture FA1307-0013 validée','2015-03-23 18:08:27','2016-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1307-0013 validée\nAuteur: admin',158,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(212,NULL,1,'2015-03-24 15:54:00','2015-03-24 15:54:00',40,'AC_BILL_VALIDATE','Facture FA1212-0021 validée','2015-03-24 15:54:00','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1212-0021 validée\nAuteur: admin',32,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(213,NULL,1,'2015-11-07 01:02:39','2015-11-07 01:02:39',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:02:39','2016-12-21 12:50:33',1,NULL,NULL,27,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',27,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(214,NULL,1,'2015-11-07 01:05:22','2015-11-07 01:05:22',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:05:22','2016-12-21 12:50:33',1,NULL,NULL,28,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',28,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(215,NULL,1,'2015-11-07 01:07:07','2015-11-07 01:07:07',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:07:07','2016-12-21 12:50:33',1,NULL,NULL,29,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',29,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(216,NULL,1,'2015-11-07 01:07:58','2015-11-07 01:07:58',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:07:58','2016-12-21 12:50:33',1,NULL,NULL,30,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',30,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(217,NULL,1,'2015-11-07 01:10:09','2015-11-07 01:10:09',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:10:09','2016-12-21 12:50:33',1,NULL,NULL,31,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',31,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(218,NULL,1,'2015-11-07 01:15:57','2015-11-07 01:15:57',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:15:57','2016-12-21 12:50:33',1,NULL,NULL,32,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',32,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(219,NULL,1,'2015-11-07 01:16:51','2015-11-07 01:16:51',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:16:51','2016-12-21 12:50:33',1,NULL,NULL,33,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',33,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(220,NULL,1,'2016-03-02 17:24:04','2016-03-02 17:24:04',40,'AC_BILL_VALIDATE','Invoice FA1302-0022 validated','2016-03-02 17:24:04','2016-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1302-0022 validated\nAuthor: admin',157,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(221,NULL,1,'2016-03-02 17:24:28','2016-03-02 17:24:28',40,'AC_BILL_VALIDATE','Invoice FA1303-0020 validated','2016-03-02 17:24:28','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1303-0020 validated\nAuthor: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(222,NULL,1,'2016-03-05 10:00:00','2016-03-05 10:00:00',5,NULL,'RDV John','2016-03-02 19:54:48','2016-03-02 18:55:29',1,1,NULL,NULL,NULL,0,1,0,NULL,0,0,-1,NULL,NULL,NULL,'gfdgdfgdf',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(223,NULL,1,'2016-03-13 10:00:00','2016-03-17 00:00:00',50,NULL,'Congress','2016-03-02 19:55:11','2016-03-02 18:55:11',1,NULL,NULL,NULL,NULL,0,1,0,NULL,0,0,-1,'',309600,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(224,NULL,1,'2016-03-14 10:00:00',NULL,1,NULL,'Call john','2016-03-02 19:55:56','2016-03-02 18:55:56',1,NULL,NULL,NULL,NULL,0,1,0,NULL,0,0,0,'',NULL,NULL,'tttt',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(225,NULL,1,'2016-03-02 20:11:31','2016-03-02 20:11:31',40,'AC_BILL_UNVALIDATE','Invoice FA1303-0020 go back to draft status','2016-03-02 20:11:31','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1303-0020 go back to draft status\nAuthor: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(226,NULL,1,'2016-03-02 20:13:39','2016-03-02 20:13:39',40,'AC_BILL_VALIDATE','Invoice FA1303-0020 validated','2016-03-02 20:13:39','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1303-0020 validated\nAuthor: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(227,NULL,1,'2016-03-03 19:20:10','2016-03-03 19:20:10',40,'AC_BILL_VALIDATE','Invoice FA1212-0023 validated','2016-03-03 19:20:10','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1212-0023 validated\nAuthor: admin',33,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(228,NULL,1,'2016-03-03 19:20:25','2016-03-03 19:20:25',40,'AC_BILL_CANCEL','Invoice FA1212-0023 canceled in Dolibarr','2016-03-03 19:20:25','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1212-0023 canceled in Dolibarr\nAuthor: admin',33,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(229,NULL,1,'2016-03-03 19:20:56','2016-03-03 19:20:56',40,'AC_BILL_VALIDATE','Invoice AV1403-0003 validated','2016-03-03 19:20:56','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice AV1403-0003 validated\nAuthor: admin',212,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(230,NULL,1,'2016-03-03 19:21:29','2016-03-03 19:21:29',40,'AC_BILL_UNVALIDATE','Invoice AV1403-0003 go back to draft status','2016-03-03 19:21:29','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice AV1403-0003 go back to draft status\nAuthor: admin',212,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(231,NULL,1,'2016-03-03 19:22:16','2016-03-03 19:22:16',40,'AC_BILL_VALIDATE','Invoice AV1303-0003 validated','2016-03-03 19:22:16','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice AV1303-0003 validated\nAuthor: admin',213,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(232,NULL,1,'2018-01-22 18:54:39','2018-01-22 18:54:39',40,'AC_OTH_AUTO','Invoice 16 validated','2018-01-22 18:54:39','2018-01-22 17:54:39',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Invoice 16 validated\nAuthor: admin',16,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(233,NULL,1,'2018-01-22 18:54:46','2018-01-22 18:54:46',40,'AC_OTH_AUTO','Invoice 16 validated','2018-01-22 18:54:46','2018-01-22 17:54:46',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Invoice 16 validated\nAuthor: admin',16,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(234,NULL,1,'2018-07-05 10:00:00','2018-07-05 11:19:00',5,'AC_RDV','Meeting with my boss','2018-07-31 18:19:48','2018-07-31 14:19:48',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,0,-1,'',4740,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(235,NULL,1,'2018-07-13 00:00:00','2018-07-14 23:59:59',50,'AC_OTH','Trip at Las Vegas','2018-07-31 18:20:36','2018-07-31 14:20:36',12,NULL,4,NULL,2,0,12,1,NULL,0,1,-1,'',172799,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(236,NULL,1,'2018-07-29 10:00:00',NULL,4,'AC_EMAIL','Remind to send an email','2018-07-31 18:21:04','2018-07-31 14:21:04',12,NULL,NULL,NULL,NULL,0,4,0,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(237,NULL,1,'2018-07-01 10:00:00',NULL,1,'AC_TEL','Phone call with Mr Vaalen','2018-07-31 18:22:04','2018-07-31 14:22:04',12,NULL,6,4,NULL,0,13,0,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(238,NULL,1,'2018-08-02 10:00:00','2018-08-02 12:00:00',5,'AC_RDV','Meeting on radium','2018-08-01 01:15:50','2018-07-31 21:15:50',12,NULL,8,10,10,0,12,1,NULL,0,0,-1,'',7200,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(239,NULL,1,'2017-01-29 21:49:33','2017-01-29 21:49:33',40,'AC_OTH_AUTO','Proposal PR1302-0007 validated','2017-01-29 21:49:33','2017-01-29 17:49:33',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1302-0007 validated\nAuthor: admin',7,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(240,NULL,1,'2017-01-31 20:52:00',NULL,1,'AC_TEL','Call the boss','2017-01-31 20:52:10','2017-01-31 16:52:25',12,12,6,NULL,NULL,0,12,1,NULL,0,0,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(242,NULL,1,'2017-02-01 18:52:04','2017-02-01 18:52:04',40,'AC_OTH_AUTO','Order CF1007-0001 validated','2017-02-01 18:52:04','2017-02-01 14:52:04',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CF1007-0001 validated\nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(243,NULL,1,'2017-02-01 18:52:04','2017-02-01 18:52:04',40,'AC_OTH_AUTO','Order CF1007-0001 approved','2017-02-01 18:52:04','2017-02-01 14:52:04',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CF1007-0001 approved\nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(245,NULL,1,'2017-02-01 18:52:32','2017-02-01 18:52:32',40,'AC_OTH_AUTO','Supplier order CF1007-0001 submited','2017-02-01 18:52:32','2017-02-01 14:52:32',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Supplier order CF1007-0001 submited\nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(249,NULL,1,'2017-02-01 18:54:01','2017-02-01 18:54:01',40,'AC_OTH_AUTO','Supplier order CF1007-0001 received','2017-02-01 18:54:01','2017-02-01 14:54:01',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Supplier order CF1007-0001 received \nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(250,NULL,1,'2017-02-01 18:54:42','2017-02-01 18:54:42',40,'AC_OTH_AUTO','Email sent by MyBigCompany To mycustomer@example.com','2017-02-01 18:54:42','2017-02-01 14:54:42',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Sender: MyBigCompany &lt;myemail@mybigcompany.com&gt;<br>\nReceiver(s): mycustomer@example.com<br>\nEMail topic: Submission of order CF1007-0001<br>\nEmail body:<br>\nYou will find here our order CF1007-0001<br />\r\n<br />\r\nSincerely<br>\n<br>\nAttached files and documents: CF1007-0001.pdf',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(251,NULL,1,'2017-02-01 19:02:21','2017-02-01 19:02:21',40,'AC_OTH_AUTO','Invoice SI1702-0001 validated','2017-02-01 19:02:21','2017-02-01 15:02:21',12,NULL,5,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Invoice SI1702-0001 validated\nAuthor: admin',20,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(252,NULL,1,'2017-02-12 23:17:04','2017-02-12 23:17:04',40,'AC_OTH_AUTO','Patient créé','2017-02-12 23:17:04','2017-02-12 19:17:04',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Patient créé\nAuthor: admin',26,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(253,NULL,1,'2017-02-12 23:18:33','2017-02-12 23:18:33',40,'AC_OTH_AUTO','Consultation 2 recorded (aaa)','2017-02-12 23:18:33','2017-02-12 19:18:33',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Consultation 2 recorded (aaa)\nAuthor: admin',2,'cabinetmed_cons',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(254,NULL,1,'2017-02-15 23:28:41','2017-02-15 23:28:41',40,'AC_OTH_AUTO','Order CO7001-0005 validated','2017-02-15 23:28:41','2017-02-15 22:28:41',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0005 validated\nAuthor: admin',7,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(255,NULL,1,'2017-02-15 23:28:56','2017-02-15 23:28:56',40,'AC_OTH_AUTO','Order CO7001-0006 validated','2017-02-15 23:28:56','2017-02-15 22:28:56',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0006 validated\nAuthor: admin',8,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(256,NULL,1,'2017-02-15 23:34:33','2017-02-15 23:34:33',40,'AC_OTH_AUTO','Order CO7001-0007 validated','2017-02-15 23:34:33','2017-02-15 22:34:33',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0007 validated\nAuthor: admin',9,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(257,NULL,1,'2017-02-15 23:35:03','2017-02-15 23:35:03',40,'AC_OTH_AUTO','Order CO7001-0008 validated','2017-02-15 23:35:03','2017-02-15 22:35:03',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0008 validated\nAuthor: admin',10,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(263,NULL,1,'2017-02-15 23:50:34','2017-02-15 23:50:34',40,'AC_OTH_AUTO','Order CO7001-0005 validated','2017-02-15 23:50:34','2017-02-15 22:50:34',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0005 validated\nAuthor: admin',17,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(264,NULL,1,'2017-02-15 23:51:23','2017-02-15 23:51:23',40,'AC_OTH_AUTO','Order CO7001-0006 validated','2017-02-15 23:51:23','2017-02-15 22:51:23',12,NULL,NULL,7,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0006 validated\nAuthor: admin',18,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(265,NULL,1,'2017-02-15 23:54:51','2017-02-15 23:54:51',40,'AC_OTH_AUTO','Order CO7001-0007 validated','2017-02-15 23:54:51','2017-02-15 22:54:51',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0007 validated\nAuthor: admin',19,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(266,NULL,1,'2017-02-15 23:55:52','2017-02-15 23:55:52',40,'AC_OTH_AUTO','Order CO7001-0007 validated','2017-02-15 23:55:52','2017-02-15 22:55:52',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0007 validated\nAuthor: admin',20,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(267,NULL,1,'2017-02-16 00:03:44','2017-02-16 00:03:44',40,'AC_OTH_AUTO','Order CO7001-0008 validated','2017-02-16 00:03:44','2017-02-15 23:03:44',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0008 validated\nAuthor: admin',29,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(268,NULL,1,'2017-02-16 00:05:01','2017-02-16 00:05:01',40,'AC_OTH_AUTO','Order CO7001-0009 validated','2017-02-16 00:05:01','2017-02-15 23:05:01',12,NULL,NULL,11,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0009 validated\nAuthor: admin',34,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(269,NULL,1,'2017-02-16 00:05:01','2017-02-16 00:05:01',40,'AC_OTH_AUTO','Order CO7001-0010 validated','2017-02-16 00:05:01','2017-02-15 23:05:01',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0010 validated\nAuthor: admin',38,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(270,NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0011 validated','2017-02-16 00:05:11','2017-02-15 23:05:11',12,NULL,NULL,11,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0011 validated\nAuthor: admin',40,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(271,NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0012 validated','2017-02-16 00:05:11','2017-02-15 23:05:11',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0012 validated\nAuthor: admin',43,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(272,NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0013 validated','2017-02-16 00:05:11','2017-02-15 23:05:11',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0013 validated\nAuthor: admin',47,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(273,NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0014 validated','2017-02-16 00:05:11','2017-02-15 23:05:11',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0014 validated\nAuthor: admin',48,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(274,NULL,1,'2017-02-16 00:05:26','2017-02-16 00:05:26',40,'AC_OTH_AUTO','Order CO7001-0015 validated','2017-02-16 00:05:26','2017-02-15 23:05:26',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0015 validated\nAuthor: admin',50,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(275,NULL,1,'2017-02-16 00:05:26','2017-02-16 00:05:26',40,'AC_OTH_AUTO','Order CO7001-0016 validated','2017-02-16 00:05:26','2017-02-15 23:05:26',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0016 validated\nAuthor: admin',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(277,NULL,1,'2017-02-16 00:05:35','2017-02-16 00:05:35',40,'AC_OTH_AUTO','Order CO7001-0018 validated','2017-02-16 00:05:35','2017-02-15 23:05:35',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0018 validated\nAuthor: admin',62,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(278,NULL,1,'2017-02-16 00:05:35','2017-02-16 00:05:35',40,'AC_OTH_AUTO','Order CO7001-0019 validated','2017-02-16 00:05:35','2017-02-15 23:05:35',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0019 validated\nAuthor: admin',68,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(279,NULL,1,'2017-02-16 00:05:36','2017-02-16 00:05:36',40,'AC_OTH_AUTO','Order CO7001-0020 validated','2017-02-16 00:05:36','2017-02-15 23:05:36',12,NULL,NULL,6,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0020 validated\nAuthor: admin',72,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(281,NULL,1,'2017-02-16 00:05:37','2017-02-16 00:05:37',40,'AC_OTH_AUTO','Order CO7001-0022 validated','2017-02-16 00:05:37','2017-02-15 23:05:37',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0022 validated\nAuthor: admin',78,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(282,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0023 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,11,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0023 validated\nAuthor: admin',81,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(283,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0024 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0024 validated\nAuthor: admin',83,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(284,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0025 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,2,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0025 validated\nAuthor: admin',84,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(285,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0026 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0026 validated\nAuthor: admin',85,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(286,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0027 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0027 validated\nAuthor: admin',88,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(287,NULL,1,'2017-02-16 03:05:56','2017-02-16 03:05:56',40,'AC_OTH_AUTO','Commande CO7001-0016 classée Livrée','2017-02-16 03:05:56','2017-02-15 23:05:56',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0016 classée Livrée\nAuteur: admin',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(288,NULL,1,'2017-02-16 03:06:01','2017-02-16 03:06:01',40,'AC_OTH_AUTO','Commande CO7001-0016 classée Facturée','2017-02-16 03:06:01','2017-02-15 23:06:01',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0016 classée Facturée\nAuteur: admin',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(294,NULL,1,'2017-02-16 03:53:04','2017-02-16 03:53:04',40,'AC_OTH_AUTO','Commande CO7001-0021 validée','2017-02-16 03:53:04','2017-02-15 23:53:04',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0021 validée\nAuteur: admin',75,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(295,NULL,1,'2017-02-16 03:58:08','2017-02-16 03:58:08',40,'AC_OTH_AUTO','Expédition SH1702-0002 validée','2017-02-16 03:58:08','2017-02-15 23:58:08',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Expédition SH1702-0002 validée\nAuteur: admin',3,'shipping',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(296,NULL,1,'2017-02-16 04:12:29','2017-02-16 04:12:29',40,'AC_OTH_AUTO','Commande CO7001-0021 validée','2017-02-16 04:12:29','2017-02-16 00:12:29',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0021 validée\nAuteur: admin',75,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(297,NULL,1,'2017-02-16 04:14:20','2017-02-16 04:14:20',40,'AC_OTH_AUTO','Commande CO7001-0021 validée','2017-02-16 04:14:20','2017-02-16 00:14:20',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0021 validée\nAuteur: admin',75,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(298,NULL,1,'2017-02-16 01:44:58','2017-02-16 01:44:58',40,'AC_OTH_AUTO','Proposal PR1702-0009 validated','2017-02-16 01:44:58','2017-02-16 00:44:58',1,NULL,NULL,1,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0009 validated\nAuthor: aeinstein',11,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(299,NULL,1,'2017-02-16 01:45:44','2017-02-16 01:45:44',40,'AC_OTH_AUTO','Proposal PR1702-0010 validated','2017-02-16 01:45:44','2017-02-16 00:45:44',2,NULL,NULL,7,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0010 validated\nAuthor: demo',12,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(300,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0011 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,26,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0011 validated\nAuthor: aeinstein',13,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(301,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0012 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,3,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0012 validated\nAuthor: demo',14,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(302,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0013 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,26,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0013 validated\nAuthor: demo',15,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(303,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0014 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0014 validated\nAuthor: demo',16,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(304,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0015 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,1,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0015 validated\nAuthor: aeinstein',17,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(305,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0016 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,26,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0016 validated\nAuthor: demo',18,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(306,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0017 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,12,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0017 validated\nAuthor: demo',19,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(307,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0018 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,26,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0018 validated\nAuthor: aeinstein',20,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(308,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0019 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,1,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0019 validated\nAuthor: aeinstein',21,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(309,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0020 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,26,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0020 validated\nAuthor: aeinstein',22,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(310,NULL,1,'2017-02-16 01:46:17','2017-02-16 01:46:17',40,'AC_OTH_AUTO','Proposal PR1702-0021 validated','2017-02-16 01:46:17','2017-02-16 00:46:17',2,NULL,NULL,12,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0021 validated\nAuthor: demo',23,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(311,NULL,1,'2017-02-16 01:46:17','2017-02-16 01:46:17',40,'AC_OTH_AUTO','Proposal PR1702-0022 validated','2017-02-16 01:46:17','2017-02-16 00:46:17',2,NULL,NULL,7,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0022 validated\nAuthor: demo',24,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(312,NULL,1,'2017-02-16 01:46:17','2017-02-16 01:46:17',40,'AC_OTH_AUTO','Proposal PR1702-0023 validated','2017-02-16 01:46:17','2017-02-16 00:46:17',1,NULL,NULL,3,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0023 validated\nAuthor: aeinstein',25,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(313,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0024 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0024 validated\nAuthor: demo',26,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(314,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0025 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',1,NULL,NULL,6,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0025 validated\nAuthor: aeinstein',27,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(315,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0026 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,19,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0026 validated\nAuthor: demo',28,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(316,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0027 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0027 validated\nAuthor: demo',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(317,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0028 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0028 validated\nAuthor: demo',30,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(318,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0029 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',1,NULL,NULL,11,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0029 validated\nAuthor: aeinstein',31,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(319,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0030 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,19,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0030 validated\nAuthor: demo',32,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(320,NULL,1,'2017-02-16 04:46:31','2017-02-16 04:46:31',40,'AC_OTH_AUTO','Proposition PR1702-0026 signée','2017-02-16 04:46:31','2017-02-16 00:46:31',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0026 signée\nAuteur: admin',28,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(321,NULL,1,'2017-02-16 04:46:37','2017-02-16 04:46:37',40,'AC_OTH_AUTO','Proposition PR1702-0027 signée','2017-02-16 04:46:37','2017-02-16 00:46:37',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0027 signée\nAuteur: admin',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(322,NULL,1,'2017-02-16 04:46:42','2017-02-16 04:46:42',40,'AC_OTH_AUTO','Proposition PR1702-0028 refusée','2017-02-16 04:46:42','2017-02-16 00:46:42',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0028 refusée\nAuteur: admin',30,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(323,NULL,1,'2017-02-16 04:47:09','2017-02-16 04:47:09',40,'AC_OTH_AUTO','Proposition PR1702-0019 validée','2017-02-16 04:47:09','2017-02-16 00:47:09',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0019 validée\nAuteur: admin',21,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(324,NULL,1,'2017-02-16 04:47:25','2017-02-16 04:47:25',40,'AC_OTH_AUTO','Proposition PR1702-0023 signée','2017-02-16 04:47:25','2017-02-16 00:47:25',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0023 signée\nAuteur: admin',25,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(325,NULL,1,'2017-02-16 04:47:29','2017-02-16 04:47:29',40,'AC_OTH_AUTO','Proposition PR1702-0023 classée payée','2017-02-16 04:47:29','2017-02-16 00:47:29',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0023 classée payée\nAuteur: admin',25,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(326,NULL,1,'2017-02-17 16:07:18','2017-02-17 16:07:18',40,'AC_OTH_AUTO','Proposition PR1702-0021 validée','2017-02-17 16:07:18','2017-02-17 12:07:18',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0021 validée\nAuteur: admin',23,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(327,NULL,1,'2017-05-12 13:53:44','2017-05-12 13:53:44',40,'AC_OTH_AUTO','Email sent by MyBigCompany To Einstein','2017-05-12 13:53:44','2017-05-12 09:53:44',12,NULL,NULL,11,12,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Sender: MyBigCompany &lt;myemail@mybigcompany.com&gt;<br>\nReceiver(s): Einstein &lt;genius@example.com&gt;<br>\nBcc: Einstein &lt;genius@example.com&gt;<br>\nEMail topic: Test<br>\nEmail body:<br>\nTest\nAuthor: admin',11,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(328,NULL,1,'2017-08-29 22:39:09','2017-08-29 22:39:09',40,'AC_OTH_AUTO','Invoice FA1601-0024 validated','2017-08-29 22:39:09','2017-08-29 18:39:09',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Invoice FA1601-0024 validated\nAuthor: admin',149,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(329,NULL,1,'2019-09-26 13:38:11','2019-09-26 13:38:11',40,'AC_MEMBER_MODIFY','Member Pierre Curie modified','2019-09-26 13:38:11','2019-09-26 11:38:11',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Pierre Curie modified\nMember: Pierre Curie\nType: Standard members',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(330,NULL,1,'2019-09-26 13:49:21','2019-09-26 13:49:21',40,'AC_MEMBER_MODIFY','Member Pierre Curie modified','2019-09-26 13:49:21','2019-09-26 11:49:21',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Pierre Curie modified\nMember: Pierre Curie\nType: Standard members',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(331,NULL,1,'2019-09-26 17:33:37','2019-09-26 17:33:37',40,'AC_BILL_VALIDATE','Invoice FA1909-0025 validated','2019-09-26 17:33:37','2019-09-26 15:33:37',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1909-0025 validated',218,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(333,NULL,1,'2019-09-27 16:54:30','2019-09-27 16:54:30',40,'AC_PROPAL_VALIDATE','Proposal PR1909-0031 validated','2019-09-27 16:54:30','2019-09-27 14:54:30',12,NULL,4,7,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0031 validated',10,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(335,NULL,1,'2019-09-27 17:08:59','2019-09-27 17:08:59',40,'AC_PROPAL_VALIDATE','Proposal PR1909-0032 validated','2019-09-27 17:08:59','2019-09-27 15:08:59',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0032 validated',33,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(337,NULL,1,'2019-09-27 17:13:13','2019-09-27 17:13:13',40,'AC_PROPAL_VALIDATE','Proposal PR1909-0033 validated','2019-09-27 17:13:13','2019-09-27 15:13:13',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0033 validated',34,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(338,NULL,1,'2019-09-27 17:53:31','2019-09-27 17:53:31',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 17:53:31','2019-09-27 15:53:31',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(339,NULL,1,'2019-09-27 18:15:00','2019-09-27 18:15:00',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 18:15:00','2019-09-27 16:15:00',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(340,NULL,1,'2019-09-27 18:40:32','2019-09-27 18:40:32',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 18:40:32','2019-09-27 16:40:32',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(341,NULL,1,'2019-09-27 19:16:07','2019-09-27 19:16:07',40,'AC_PRODUCT_CREATE','Product ppp created','2019-09-27 19:16:07','2019-09-27 17:16:07',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ppp created',14,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(342,NULL,1,'2019-09-27 19:18:01','2019-09-27 19:18:01',40,'AC_PRODUCT_MODIFY','Product ppp modified','2019-09-27 19:18:01','2019-09-27 17:18:01',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ppp modified',14,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(343,NULL,1,'2019-09-27 19:31:45','2019-09-27 19:31:45',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 19:31:45','2019-09-27 17:31:45',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(344,NULL,1,'2019-09-27 19:32:12','2019-09-27 19:32:12',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 19:32:12','2019-09-27 17:32:12',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(345,NULL,1,'2019-09-27 19:38:30','2019-09-27 19:38:30',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 19:38:30','2019-09-27 17:38:30',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(346,NULL,1,'2019-09-27 19:38:37','2019-09-27 19:38:37',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 19:38:37','2019-09-27 17:38:37',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(347,NULL,1,'2019-09-30 15:49:52',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #15ff11cay39skiaa] New message','2019-09-30 15:49:52','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'dfsdfds',2,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(348,NULL,1,'2019-10-01 13:48:36','2019-10-01 13:48:36',40,'AC_PROJECT_MODIFY','Project PJ1607-0001 modified','2019-10-01 13:48:36','2019-10-01 11:48:36',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1607-0001 modified\nTask: PJ1607-0001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(349,NULL,1,'2019-10-04 10:10:25','2019-10-04 10:10:25',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI1601-0002 validated','2019-10-04 10:10:25','2019-10-04 08:10:25',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 validated',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(350,NULL,1,'2019-10-04 10:10:47','2019-10-04 10:10:47',40,'AC_BILL_SUPPLIER_PAYED','Invoice SI1601-0002 changed to paid','2019-10-04 10:10:47','2019-10-04 08:10:47',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 changed to paid',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(351,NULL,1,'2019-10-04 10:26:49','2019-10-04 10:26:49',40,'AC_BILL_UNVALIDATE','Invoice FA6801-0010 go back to draft status','2019-10-04 10:26:49','2019-10-04 08:26:49',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA6801-0010 go back to draft status',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(352,NULL,1,'2019-10-04 10:27:00','2019-10-04 10:27:00',40,'AC_BILL_VALIDATE','Invoice FA6801-0010 validated','2019-10-04 10:27:00','2019-10-04 08:27:00',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA6801-0010 validated',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(353,NULL,1,'2019-10-04 10:28:14','2019-10-04 10:28:14',40,'AC_BILL_PAYED','Invoice FA6801-0010 changed to paid','2019-10-04 10:28:14','2019-10-04 08:28:14',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA6801-0010 changed to paid',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(354,NULL,1,'2019-10-04 10:29:22','2019-10-04 10:29:22',40,'AC_BILL_SUPPLIER_PAYED','Invoice SI1601-0002 changed to paid','2019-10-04 10:29:22','2019-10-04 08:29:22',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 changed to paid',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(355,NULL,1,'2019-10-04 10:29:41','2019-10-04 10:29:41',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI1601-0002 go back to draft status','2019-10-04 10:29:41','2019-10-04 08:29:41',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 go back to draft status',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(356,NULL,1,'2019-10-04 10:31:30','2019-10-04 10:31:30',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI1601-0002 validated','2019-10-04 10:31:30','2019-10-04 08:31:30',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 validated',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(357,NULL,1,'2019-10-04 16:56:21',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 16:56:21','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaaa',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(358,NULL,1,'2019-10-04 17:08:04',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:08:04','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'ddddd',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(359,NULL,1,'2019-10-04 17:25:05',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:25:05','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaa',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(360,NULL,1,'2019-10-04 17:26:14',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:26:14','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaa',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(361,NULL,1,'2019-10-04 17:30:10',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:30:10','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(362,NULL,1,'2019-10-04 17:51:43',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:51:43','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(363,NULL,1,'2019-10-04 17:52:02',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:52:02','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(364,NULL,1,'2019-10-04 17:52:17',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:52:17','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(365,NULL,1,'2019-10-04 17:52:39',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:52:39','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(366,NULL,1,'2019-10-04 17:52:53',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:52:53','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(367,NULL,1,'2019-10-04 17:53:13',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:53:13','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(368,NULL,1,'2019-10-04 17:53:26',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:53:26','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(369,NULL,1,'2019-10-04 17:53:48',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:53:48','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(370,NULL,1,'2019-10-04 17:54:09',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:54:09','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(371,NULL,1,'2019-10-04 17:54:28',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:54:28','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(372,NULL,1,'2019-10-04 17:55:43',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:55:43','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(373,NULL,1,'2019-10-04 17:56:01',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:56:01','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(374,NULL,1,'2019-10-04 18:00:32',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:00:32','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(375,NULL,1,'2019-10-04 18:00:58',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:00:58','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(376,NULL,1,'2019-10-04 18:11:30',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:11:30','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(377,NULL,1,'2019-10-04 18:12:02',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:12:02','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fffffff',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(378,NULL,1,'2019-10-04 18:49:30',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:49:30','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaa',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(379,NULL,1,'2019-10-04 19:00:22',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 19:00:22','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fff',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(380,NULL,1,'2019-10-04 19:24:20','2019-10-04 19:24:20',40,'AC_PROPAL_SENTBYMAIL','Email sent by Alice Adminson To NLTechno','2019-10-04 19:24:20','2019-10-04 17:24:20',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSender: Alice Adminson &lt;aadminson@example.com&gt;<br>\nReceiver(s): NLTechno &lt;notanemail@nltechno.com&gt;<br>\nEmail topic: Envoi de la proposition commerciale PR1909-0032<br>\nEmail body:<br>\nHello<br />\r\n<br />\r\nVeuillez trouver, ci-joint, la proposition commerciale PR1909-0032<br />\r\n<br />\r\n<br />\r\nSincerely<br />\r\n<br />\r\nAlice - 123<br>\n<br>\nAttached files and documents: PR1909-0032.pdf',33,'propal',NULL,'Envoi de la proposition commerciale PR1909-0032','Alice Adminson <aadminson@example.com>',NULL,'NLTechno <notanemail@nltechno.com>',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(381,NULL,1,'2019-10-04 19:30:13',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 19:30:13','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(382,NULL,1,'2019-10-04 19:32:55',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 19:32:55','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'uuuuuu\n\nAttached files and documents: Array',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(383,NULL,1,'2019-10-04 19:37:16',NULL,50,'TICKET_MSG','','2019-10-04 19:37:16','2020-06-12 17:12:24',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,100,'',NULL,NULL,'f\n\nFichiers et documents joints: dolihelp.ico',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(384,NULL,1,'2019-10-04 19:39:07',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 19:39:07','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaafff\n\nAttached files and documents: dolibarr.gif;doliadmin.ico',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(385,NULL,1,'2019-10-07 12:17:07','2019-10-07 12:17:07',40,'AC_PRODUCT_DELETE','Product PREF123456 deleted','2019-10-07 12:17:07','2019-10-07 10:17:07',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PREF123456 deleted',17,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(386,NULL,1,'2019-10-07 12:17:32','2019-10-07 12:17:32',40,'AC_PRODUCT_DELETE','Product PREF123456 deleted','2019-10-07 12:17:32','2019-10-07 10:17:32',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PREF123456 deleted',18,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(387,NULL,1,'2019-10-08 19:21:07','2019-10-08 19:21:07',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-10-08 19:21:07','2019-10-08 17:21:07',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(388,NULL,1,'2019-10-08 21:01:07','2019-10-08 21:01:07',40,'AC_MEMBER_MODIFY','Member Pierre Curie modified','2019-10-08 21:01:07','2019-10-08 19:01:07',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Pierre Curie modified\nMember: Pierre Curie\nType: Standard members',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(389,NULL,1,'2019-10-08 21:01:22','2019-10-08 21:01:22',40,'AC_MEMBER_MODIFY','Member doe john modified','2019-10-08 21:01:22','2019-10-08 19:01:22',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember doe john modified\nMember: doe john\nType: Standard members',3,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(390,NULL,1,'2019-10-08 21:01:45','2019-10-08 21:01:45',40,'AC_MEMBER_MODIFY','Member smith smith modified','2019-10-08 21:01:45','2019-10-08 19:01:45',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember smith smith modified\nMember: smith smith\nType: Standard members',4,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(391,NULL,1,'2019-10-08 21:02:18','2019-10-08 21:02:18',40,'AC_MEMBER_MODIFY','Member Vick Smith modified','2019-10-08 21:02:18','2019-10-08 19:02:18',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Vick Smith modified\nMember: Vick Smith\nType: Standard members',1,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(392,NULL,1,'2019-11-28 15:54:46','2019-11-28 15:54:46',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI1911-0005 validated','2019-11-28 15:54:47','2019-11-28 11:54:47',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1911-0005 validated',21,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(393,NULL,1,'2019-11-28 16:33:35','2019-11-28 16:33:35',40,'AC_PRODUCT_CREATE','Product FR-CAR created','2019-11-28 16:33:35','2019-11-28 12:33:35',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct FR-CAR created',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(394,NULL,1,'2019-11-28 16:34:08','2019-11-28 16:34:08',40,'AC_PRODUCT_DELETE','Product ppp deleted','2019-11-28 16:34:08','2019-11-28 12:34:08',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ppp deleted',14,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(395,NULL,1,'2019-11-28 16:34:33','2019-11-28 16:34:33',40,'AC_PRODUCT_MODIFY','Product FR-CAR modified','2019-11-28 16:34:33','2019-11-28 12:34:33',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct FR-CAR modified',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(396,NULL,1,'2019-11-28 16:34:46','2019-11-28 16:34:46',40,'AC_PRODUCT_MODIFY','Product FR-CAR modified','2019-11-28 16:34:46','2019-11-28 12:34:46',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct FR-CAR modified',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(397,NULL,1,'2019-11-28 16:36:56','2019-11-28 16:36:56',40,'AC_PRODUCT_MODIFY','Product POS-CAR modified','2019-11-28 16:36:56','2019-11-28 12:36:56',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-CAR modified',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(398,NULL,1,'2019-11-28 16:37:36','2019-11-28 16:37:36',40,'AC_PRODUCT_CREATE','Product POS-APPLE created','2019-11-28 16:37:36','2019-11-28 12:37:36',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-APPLE created',25,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(399,NULL,1,'2019-11-28 16:37:58','2019-11-28 16:37:58',40,'AC_PRODUCT_MODIFY','Product POS-APPLE modified','2019-11-28 16:37:58','2019-11-28 12:37:58',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-APPLE modified',25,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(400,NULL,1,'2019-11-28 16:38:44','2019-11-28 16:38:44',40,'AC_PRODUCT_CREATE','Product POS-KIWI created','2019-11-28 16:38:44','2019-11-28 12:38:44',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-KIWI created',26,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(401,NULL,1,'2019-11-28 16:39:21','2019-11-28 16:39:21',40,'AC_PRODUCT_CREATE','Product POS-PEACH created','2019-11-28 16:39:21','2019-11-28 12:39:21',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-PEACH created',27,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(402,NULL,1,'2019-11-28 16:39:58','2019-11-28 16:39:58',40,'AC_PRODUCT_CREATE','Product POS-ORANGE created','2019-11-28 16:39:58','2019-11-28 12:39:58',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-ORANGE created',28,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(403,NULL,1,'2019-11-28 17:00:28','2019-11-28 17:00:28',40,'AC_PRODUCT_MODIFY','Product APPLEPIE modified','2019-11-28 17:00:28','2019-11-28 13:00:28',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct APPLEPIE modified',4,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(404,NULL,1,'2019-11-28 17:00:46','2019-11-28 17:00:46',40,'AC_PRODUCT_MODIFY','Product PEARPIE modified','2019-11-28 17:00:46','2019-11-28 13:00:46',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PEARPIE modified',2,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(405,NULL,1,'2019-11-28 17:01:57','2019-11-28 17:01:57',40,'AC_PRODUCT_MODIFY','Product POS-APPLE modified','2019-11-28 17:01:57','2019-11-28 13:01:57',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-APPLE modified',25,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(406,NULL,1,'2019-11-28 17:03:14','2019-11-28 17:03:14',40,'AC_PRODUCT_CREATE','Product POS-Eggs created','2019-11-28 17:03:14','2019-11-28 13:03:14',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-Eggs created',29,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(407,NULL,1,'2019-11-28 17:04:17','2019-11-28 17:04:17',40,'AC_PRODUCT_MODIFY','Product POS-Eggs modified','2019-11-28 17:04:17','2019-11-28 13:04:17',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-Eggs modified',29,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(408,NULL,1,'2019-11-28 17:09:14','2019-11-28 17:09:14',40,'AC_PRODUCT_CREATE','Product POS-Chips created','2019-11-28 17:09:14','2019-11-28 13:09:14',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-Chips created',30,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(409,NULL,1,'2019-11-28 17:09:54','2019-11-28 17:09:54',40,'AC_PRODUCT_MODIFY','Product POS-Chips modified','2019-11-28 17:09:54','2019-11-28 13:09:54',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-Chips modified',30,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(410,NULL,1,'2019-11-28 18:46:20','2019-11-28 18:46:20',40,'AC_PRODUCT_MODIFY','Product POS-APPLE modified','2019-11-28 18:46:20','2019-11-28 14:46:20',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-APPLE modified',25,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(411,NULL,1,'2019-11-28 18:59:29','2019-11-28 18:59:29',40,'AC_PRODUCT_MODIFY','Product PEARPIE modified','2019-11-28 18:59:29','2019-11-28 14:59:29',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PEARPIE modified',2,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(412,NULL,1,'2019-11-28 19:02:01','2019-11-28 19:02:01',40,'AC_PRODUCT_MODIFY','Product POS-CARROT modified','2019-11-28 19:02:01','2019-11-28 15:02:01',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-CARROT modified',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(413,NULL,1,'2019-11-28 19:09:50','2019-11-28 19:09:50',40,'AC_PRODUCT_MODIFY','Product PEARPIE modified','2019-11-28 19:09:50','2019-11-28 15:09:50',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PEARPIE modified',2,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(414,NULL,1,'2019-11-28 19:12:50','2019-11-28 19:12:50',40,'AC_PRODUCT_MODIFY','Product PEARPIE modified','2019-11-28 19:12:50','2019-11-28 15:12:50',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PEARPIE modified',2,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(415,NULL,1,'2019-11-29 12:46:29','2019-11-29 12:46:29',40,'AC_TICKET_CREATE','Ticket TS1911-0004 created','2019-11-29 12:46:29','2019-11-29 08:46:29',12,NULL,4,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0004 created',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(416,NULL,1,'2019-11-29 12:46:34','2019-11-29 12:46:34',40,'AC_TICKET_MODIFY','Ticket TS1911-0004 read by Alice Adminson','2019-11-29 12:46:34','2019-11-29 08:46:34',12,NULL,4,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0004 read by Alice Adminson',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(417,NULL,1,'2019-11-29 12:46:47','2019-11-29 12:46:47',40,'AC_TICKET_ASSIGNED','Ticket TS1911-0004 assigned','2019-11-29 12:46:47','2019-11-29 08:46:47',12,NULL,4,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0004 assigned\nOld user: None\nNew user: Commerson Charle1',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(418,NULL,1,'2019-11-29 12:47:13',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #5gvo9bsjri55zef9] New message','2019-11-29 12:47:13','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'Where do you want to install Dolibarr ?<br />\r\nOn-Premise or on the Cloud ?',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(419,NULL,1,'2019-11-29 12:50:45','2019-11-29 12:50:45',40,'AC_TICKET_CREATE','Ticket TS1911-0005 créé','2019-11-29 12:50:45','2019-11-29 08:50:45',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nTicket TS1911-0005 créé',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(420,NULL,1,'2019-11-29 12:52:32','2019-11-29 12:52:32',40,'AC_TICKET_MODIFY','Ticket TS1911-0005 read by Alice Adminson','2019-11-29 12:52:32','2019-11-29 08:52:32',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0005 read by Alice Adminson',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(421,NULL,1,'2019-11-29 12:52:53','2019-11-29 12:52:53',40,'AC_TICKET_ASSIGNED','Ticket TS1911-0005 assigned','2019-11-29 12:52:53','2019-11-29 08:52:53',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0005 assigned\nOld user: None\nNew user: Commerson Charle1',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(422,NULL,1,'2019-11-29 12:54:04',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #d51wjy4nym7wltg7] New message','2019-11-29 12:54:04','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'Hi.<br />\r\nThanks for your interest in using Dolibarr ERP CRM.<br />\r\nI need more information to give you the correct answer :&nbsp;Where do you want to install Dolibarr. On premise or on Cloud',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(423,NULL,1,'2019-11-29 12:54:46',NULL,50,'TICKET_MSG','','2019-11-29 12:54:46','2020-06-12 17:12:24',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,100,'',NULL,NULL,'I need it On-Premise.',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(424,NULL,1,'2019-11-29 12:55:42',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #d51wjy4nym7wltg7] New message','2019-11-29 12:55:42','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'When used on-premise, you can download and install Dolibarr yourself from ou web portal: https://www.dolibarr.org<br />\r\nIt is completely free.',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(425,NULL,1,'2019-11-29 12:55:48','2019-11-29 12:55:48',40,'AC_TICKET_CLOSE','Ticket TS1911-0005 closed','2019-11-29 12:55:48','2019-11-29 08:55:48',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0005 closed',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(426,NULL,1,'2019-11-29 12:56:47','2019-11-29 12:56:47',40,'AC_BOM_UNVALIDATE','BOM unvalidated','2019-11-29 12:56:47','2019-11-29 08:56:47',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM unvalidated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(427,NULL,1,'2019-11-29 12:57:14','2019-11-29 12:57:14',40,'AC_BOM_VALIDATE','BOM validated','2019-11-29 12:57:14','2019-11-29 08:57:14',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM validated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(428,NULL,1,'2019-12-20 16:40:14','2019-12-20 16:40:14',40,'AC_MO_DELETE','MO deleted','2019-12-20 16:40:14','2019-12-20 12:40:14',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',3,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(429,NULL,1,'2019-12-20 17:00:43','2019-12-20 17:00:43',40,'AC_MO_DELETE','MO deleted','2019-12-20 17:00:43','2019-12-20 13:00:43',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',7,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(430,NULL,1,'2019-12-20 17:00:56','2019-12-20 17:00:56',40,'AC_MO_DELETE','MO deleted','2019-12-20 17:00:56','2019-12-20 13:00:56',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',6,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(431,NULL,1,'2019-12-20 20:00:03','2019-12-20 20:00:03',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:00:03','2019-12-20 16:00:03',12,NULL,6,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',1,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(432,NULL,1,'2019-12-20 20:22:11','2019-12-20 20:22:11',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:22:11','2019-12-20 16:22:11',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',10,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(433,NULL,1,'2019-12-20 20:22:11','2019-12-20 20:22:11',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:22:11','2019-12-20 16:22:11',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',12,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(434,NULL,1,'2019-12-20 20:22:20','2019-12-20 20:22:20',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:22:20','2019-12-20 16:22:20',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',9,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(435,NULL,1,'2019-12-20 20:27:07','2019-12-20 20:27:07',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:27:07','2019-12-20 16:27:07',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',13,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(436,NULL,1,'2019-12-20 20:42:42','2019-12-20 20:42:42',40,'AC_ORDER_VALIDATE','Order CO7001-0027 validated','2019-12-20 20:42:42','2019-12-20 16:42:42',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0027 validated',88,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(437,NULL,1,'2019-12-20 20:46:25','2019-12-20 20:46:25',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:46:25','2019-12-20 16:46:25',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(438,NULL,1,'2019-12-20 20:46:45','2019-12-20 20:46:45',40,'AC_ORDER_SUPPLIER_CLASSIFY_BILLED','Purchase Order CF1007-0001 set billed','2019-12-20 20:46:45','2019-12-20 16:46:45',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 set billed',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(439,NULL,1,'2019-12-20 20:47:02','2019-12-20 20:47:02',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:47:02','2019-12-20 16:47:02',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(440,NULL,1,'2019-12-20 20:47:44','2019-12-20 20:47:44',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:47:44','2019-12-20 16:47:44',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(441,NULL,1,'2019-12-20 20:47:53','2019-12-20 20:47:53',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:47:53','2019-12-20 16:47:53',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(442,NULL,1,'2019-12-20 20:48:05','2019-12-20 20:48:05',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:48:05','2019-12-20 16:48:05',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(443,NULL,1,'2019-12-20 20:48:45','2019-12-20 20:48:45',40,'AC_ORDER_CLASSIFY_BILLED','Order CO7001-0016 classified billed','2019-12-20 20:48:45','2019-12-20 16:48:45',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0016 classified billed',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(444,NULL,1,'2019-12-20 20:48:55','2019-12-20 20:48:55',40,'AC_ORDER_CLOSE','Order CO7001-0018 classified delivered','2019-12-20 20:48:55','2019-12-20 16:48:55',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0018 classified delivered',62,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(445,NULL,1,'2019-12-20 20:49:43','2019-12-20 20:49:43',40,'AC_PROPAL_CLASSIFY_BILLED','Proposal PR1702-0027 classified billed','2019-12-20 20:49:43','2019-12-20 16:49:43',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1702-0027 classified billed',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(446,NULL,1,'2019-12-20 20:49:54','2019-12-20 20:49:54',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR1702-0027 signed','2019-12-20 20:49:54','2019-12-20 16:49:54',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1702-0027 signed',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(447,NULL,1,'2019-12-20 20:50:14','2019-12-20 20:50:14',40,'AC_PROPAL_CLOSE_REFUSED','Proposal PR1702-0027 refused','2019-12-20 20:50:14','2019-12-20 16:50:14',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1702-0027 refused',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(448,NULL,1,'2019-12-20 20:50:23','2019-12-20 20:50:23',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR1702-0027 signed','2019-12-20 20:50:23','2019-12-20 16:50:23',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1702-0027 signed',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(449,NULL,1,'2019-12-21 17:18:22','2019-12-21 17:18:22',40,'AC_BOM_CLOSE','BOM disabled','2019-12-21 17:18:22','2019-12-21 13:18:22',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM disabled',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(450,NULL,1,'2019-12-21 17:18:38','2019-12-21 17:18:38',40,'AC_MEMBER_RESILIATE','Member Vick Smith terminated','2019-12-21 17:18:38','2019-12-21 13:18:38',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Vick Smith terminated\nMember: Vick Smith\nType: Standard members',1,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(451,NULL,1,'2019-12-21 19:46:33','2019-12-21 19:46:33',40,'AC_PROJECT_CREATE','Project PJ1912-0005 created','2019-12-21 19:46:33','2019-12-21 15:46:33',12,NULL,10,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 created\nProject: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(452,NULL,1,'2019-12-21 19:47:03','2019-12-21 19:47:03',40,'AC_PROJECT_MODIFY','Project PJ1912-0005 modified','2019-12-21 19:47:03','2019-12-21 15:47:03',12,NULL,10,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 modified\nTask: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(453,NULL,1,'2019-12-21 19:47:24','2019-12-21 19:47:24',40,'AC_PROJECT_MODIFY','Project PJ1912-0005 modified','2019-12-21 19:47:24','2019-12-21 15:47:24',12,NULL,10,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 modified\nTask: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(454,NULL,1,'2019-12-21 19:47:52','2019-12-21 19:47:52',40,'AC_PROJECT_MODIFY','Project PJ1912-0005 modified','2019-12-21 19:47:52','2019-12-21 15:47:52',12,NULL,10,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 modified\nTask: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(455,NULL,1,'2019-12-21 19:48:06','2019-12-21 19:48:06',40,'AC_PROJECT_MODIFY','Project PJ1912-0005 modified','2019-12-21 19:48:06','2019-12-21 15:48:06',12,NULL,10,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 modified\nTask: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(456,NULL,1,'2019-12-21 19:49:28','2019-12-21 19:49:28',40,'AC_PROJECT_CREATE','Project PJ1912-0006 created','2019-12-21 19:49:28','2019-12-21 15:49:28',12,NULL,11,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0006 created\nProject: PJ1912-0006',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(457,NULL,1,'2019-12-21 19:52:12','2019-12-21 19:52:12',40,'AC_PROJECT_CREATE','Project PJ1912-0007 created','2019-12-21 19:52:12','2019-12-21 15:52:12',12,NULL,12,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0007 created\nProject: PJ1912-0007',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(458,NULL,1,'2019-12-21 19:53:21','2019-12-21 19:53:21',40,'AC_PROJECT_CREATE','Project PJ1912-0008 created','2019-12-21 19:53:21','2019-12-21 15:53:21',12,NULL,13,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0008 created\nProject: PJ1912-0008',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(459,NULL,1,'2019-12-21 19:53:42','2019-12-21 19:53:42',40,'AC_PROJECT_MODIFY','Project PJ1912-0008 modified','2019-12-21 19:53:42','2019-12-21 15:53:42',12,NULL,13,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0008 modified\nTask: PJ1912-0008',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(460,NULL,1,'2019-12-21 19:55:23','2019-12-21 19:55:23',40,'AC_PROJECT_MODIFY','Project PJ1912-0006 modified','2019-12-21 19:55:23','2019-12-21 15:55:23',12,NULL,11,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0006 modified\nTask: PJ1912-0006',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(461,NULL,1,'2019-12-21 20:10:21','2019-12-21 20:10:21',40,'AC_PROJECT_MODIFY','Project PJ1912-0006 modified','2019-12-21 20:10:21','2019-12-21 16:10:21',12,NULL,11,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0006 modified\nTask: PJ1912-0006',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(462,NULL,1,'2019-12-11 10:00:00','2019-12-11 10:00:00',5,'AC_RDV','Meeting with all employees','2019-12-21 20:29:32','2019-12-21 16:29:32',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(463,NULL,1,'2019-12-06 00:00:00',NULL,11,'AC_INT','Intervention on customer site','2019-12-21 20:30:11','2019-12-21 16:30:11',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,1,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(464,NULL,1,'2019-12-23 14:16:59','2019-12-23 14:16:59',40,'AC_BILL_PAYED','Invoice FA1601-0024 changed to paid','2019-12-23 14:16:59','2019-12-23 10:16:59',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1601-0024 changed to paid',149,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(465,NULL,1,'2019-12-23 14:17:18','2019-12-23 14:17:18',40,'AC_BILL_PAYED','Invoice FA1601-0024 changed to paid','2019-12-23 14:17:18','2019-12-23 10:17:18',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1601-0024 changed to paid',149,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(466,NULL,1,'2019-11-23 14:25:00',NULL,50,'AC_OTH','Test','2019-12-23 17:25:14','2019-12-23 13:25:14',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,0,-1,'',NULL,NULL,'18/11 17h06 : Message laiss&eacute;. Me rappeler pour m&#39;en dire plus.&nbsp;<br />\r\n<br />\r\n20/11 10h17 &quot;A rappeler suite au msg laiss&eacute; le 14/11, dit que c&#39;est urgent&quot;<br />\r\n12h22 : message laiss&eacute;. Je lui envoie un sms<br />\r\n<br />\r\n&quot;D&eacute;claration de sinistre originale&quot; : constat de ce qui s&#39;est pass&eacute;.<br />\r\nElle envoie le ch&egrave;que de solde d&egrave;s demain.<br />\r\n<br />\r\n3/12 : Elle pr&eacute;f&egrave;re avoir plus d&#39;infos sur le sinistre pour l&#39;assurance.<br />\r\nCourrier envoy&eacute; le 4/12/19 par mail et par courrier postal<br />\r\n<br />\r\n6/12 15h02 : ont obtenu le feu vert de l&#39;assurance.<br />\r\nOn bloque 16/12 PM &agrave; partir de 14h30.&nbsp;',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(467,NULL,1,'2020-01-01 14:35:47','2020-01-01 14:35:47',40,'AC_MEMBER_VALIDATE','Adhérent aze aze validé','2020-01-01 14:35:47','2020-01-01 10:35:47',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent aze aze validé\nAdhérent: aze aze\nType: Board members',5,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(468,NULL,1,'2020-01-01 14:50:59','2020-01-01 14:50:59',40,'AC_MEMBER_VALIDATE','Adhérent azr azr validé','2020-01-01 14:50:59','2020-01-01 10:50:59',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azr azr validé\nAdhérent: azr azr\nType: Board members',6,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(469,NULL,1,'2020-01-01 15:00:16','2020-01-01 15:00:16',40,'AC_MEMBER_VALIDATE','Adhérent azt azt validé','2020-01-01 15:00:16','2020-01-01 11:00:16',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azt azt validé\nAdhérent: azt azt\nType: Board members',7,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(470,NULL,1,'2020-01-01 15:08:20','2020-01-01 15:08:20',40,'AC_MEMBER_VALIDATE','Adhérent azu azu validé','2020-01-01 15:08:20','2020-01-01 11:08:20',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azu azu validé\nAdhérent: azu azu\nType: Board members',8,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(471,NULL,1,'2020-01-01 15:27:24','2020-01-01 15:27:24',40,'AC_MEMBER_VALIDATE','Adhérent azi azi validé','2020-01-01 15:27:24','2020-01-01 11:27:24',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azi azi validé\nAdhérent: azi azi\nType: Board members',9,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(472,NULL,1,'2020-01-01 15:36:29','2020-01-01 15:36:29',40,'AC_MEMBER_VALIDATE','Adhérent azo azo validé','2020-01-01 15:36:29','2020-01-01 11:36:29',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azo azo validé\nAdhérent: azo azo\nType: Board members',10,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(473,NULL,1,'2020-01-01 15:44:25','2020-01-01 15:44:25',40,'AC_MEMBER_VALIDATE','Adhérent azp azp validé','2020-01-01 15:44:25','2020-01-01 11:44:25',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azp azp validé\nAdhérent: azp azp\nType: Board members',11,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(478,NULL,1,'2020-01-01 16:52:32','2020-01-01 16:52:32',40,'AC_MEMBER_VALIDATE','Adhérent azq azq validé','2020-01-01 16:52:32','2020-01-01 12:52:32',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azq azq validé\nAdhérent: azq azq\nType: Board members',12,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(483,NULL,1,'2020-01-01 17:49:05','2020-01-01 17:49:05',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0006 validated','2020-01-01 17:49:05','2020-01-01 13:49:05',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 validated',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(484,NULL,1,'2020-01-01 17:50:41','2020-01-01 17:50:41',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0001 validated','2020-01-01 17:50:41','2020-01-01 13:50:41',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 validated',23,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(485,NULL,1,'2020-01-01 17:50:44','2020-01-01 17:50:44',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 17:50:44','2020-01-01 13:50:44',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',23,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(486,NULL,1,'2020-01-01 17:51:22','2020-01-01 17:51:22',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI2001-0006 go back to draft status','2020-01-01 17:51:22','2020-01-01 13:51:22',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 go back to draft status',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(487,NULL,1,'2020-01-01 20:17:00','2020-01-01 20:17:00',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0006 validated','2020-01-01 20:17:00','2020-01-01 16:17:00',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 validated',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(488,NULL,1,'2020-01-01 20:17:46','2020-01-01 20:17:46',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0001 validated','2020-01-01 20:17:46','2020-01-01 16:17:46',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 validated',24,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(489,NULL,1,'2020-01-01 20:17:51','2020-01-01 20:17:51',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 20:17:51','2020-01-01 16:17:51',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',24,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(490,NULL,1,'2020-01-01 20:20:22','2020-01-01 20:20:22',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0001 validated','2020-01-01 20:20:22','2020-01-01 16:20:22',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 validated',26,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(491,NULL,1,'2020-01-01 20:20:31','2020-01-01 20:20:31',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 20:20:31','2020-01-01 16:20:31',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',26,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(492,NULL,1,'2020-01-01 20:21:35','2020-01-01 20:21:35',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI2001-0006 go back to draft status','2020-01-01 20:21:35','2020-01-01 16:21:35',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 go back to draft status',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(493,NULL,1,'2020-01-01 20:21:42','2020-01-01 20:21:42',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0006 validated','2020-01-01 20:21:42','2020-01-01 16:21:42',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 validated',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(494,NULL,1,'2020-01-01 20:21:55','2020-01-01 20:21:55',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0001 validated','2020-01-01 20:21:55','2020-01-01 16:21:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 validated',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(495,NULL,1,'2020-01-01 20:23:02','2020-01-01 20:23:02',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0007 validated','2020-01-01 20:23:02','2020-01-01 16:23:02',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0007 validated',28,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(496,NULL,1,'2020-01-01 20:23:17','2020-01-01 20:23:17',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 20:23:17','2020-01-01 16:23:17',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(497,NULL,1,'2020-01-01 20:25:36','2020-01-01 20:25:36',40,'AC_BILL_SUPPLIER_PAYED','Invoice SI2001-0007 changed to paid','2020-01-01 20:25:36','2020-01-01 16:25:36',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0007 changed to paid',28,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(498,NULL,1,'2020-01-01 20:51:37','2020-01-01 20:51:37',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0002 validated','2020-01-01 20:51:37','2020-01-01 16:51:37',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0002 validated',30,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(499,NULL,1,'2020-01-01 20:51:48','2020-01-01 20:51:48',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0002 changed to paid','2020-01-01 20:51:48','2020-01-01 16:51:48',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0002 changed to paid',30,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(500,NULL,1,'2020-01-01 21:02:39','2020-01-01 21:02:39',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 21:02:39','2020-01-01 17:02:39',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(501,NULL,1,'2020-01-01 21:03:01','2020-01-01 21:03:01',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 21:03:01','2020-01-01 17:03:01',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(502,NULL,1,'2020-01-01 21:11:10','2020-01-01 21:11:10',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 21:11:10','2020-01-01 17:11:10',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(503,NULL,1,'2020-01-01 21:20:07','2020-01-01 21:20:07',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 21:20:07','2020-01-01 17:20:07',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(504,NULL,1,'2020-01-01 21:21:28','2020-01-01 21:21:28',40,'AC_BILL_SUPPLIER_PAYED','Invoice SI2001-0007 changed to paid','2020-01-01 21:21:28','2020-01-01 17:21:28',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0007 changed to paid',28,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(505,NULL,1,'2020-01-01 22:06:30','2020-01-01 22:06:30',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 22:06:31','2020-01-01 18:06:31',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(506,NULL,1,'2020-01-01 23:54:16','2020-01-01 23:54:16',40,'AC_PRODUCT_MODIFY','Product APPLEPIE modified','2020-01-01 23:54:16','2020-01-01 19:54:16',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct APPLEPIE modified',4,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(507,NULL,1,'2020-01-02 20:49:34','2020-01-02 20:49:34',40,'AC_BILL_PAYED','Invoice FA1601-0024 changed to paid','2020-01-02 20:49:34','2020-01-02 16:49:34',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1601-0024 changed to paid',149,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(508,NULL,1,'2020-01-02 23:02:35','2020-01-02 23:02:35',40,'AC_PRODUCT_MODIFY','Product APPLEPIE modified','2020-01-02 23:02:35','2020-01-02 19:02:35',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct APPLEPIE modified',4,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(509,NULL,1,'2020-01-02 23:45:01','2020-01-02 23:45:01',40,'AC_BOM_REOPEN','BOM reopen','2020-01-02 23:45:01','2020-01-02 19:45:01',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM reopen',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(511,NULL,1,'2020-01-02 23:57:42','2020-01-02 23:57:42',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-02 23:57:42','2020-01-02 19:57:42',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(512,NULL,1,'2020-01-03 13:33:54','2020-01-03 13:33:54',40,'AC_BOM_UNVALIDATE','BOM unvalidated','2020-01-03 13:33:54','2020-01-03 09:33:54',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM unvalidated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(513,NULL,1,'2020-01-03 13:34:11','2020-01-03 13:34:11',40,'AC_BOM_VALIDATE','BOM validated','2020-01-03 13:34:11','2020-01-03 09:34:11',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM validated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(514,NULL,1,'2020-01-03 13:35:45','2020-01-03 13:35:45',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-03 13:35:45','2020-01-03 09:35:45',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',18,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(515,NULL,1,'2020-01-03 14:10:41','2020-01-03 14:10:41',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-03 14:10:41','2020-01-03 10:10:41',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',18,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(516,NULL,1,'2020-01-06 00:39:58','2020-01-06 00:39:58',40,'AC_COMPANY_CREATE','Patient créé','2020-01-06 00:39:58','2020-01-05 20:39:58',12,NULL,NULL,29,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPatient créé',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(517,NULL,1,'2020-01-06 00:49:06','2020-01-06 00:49:06',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI2001-0006 go back to draft status','2020-01-06 00:49:06','2020-01-05 20:49:06',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 go back to draft status',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(518,NULL,1,'2020-01-06 06:50:05','2020-01-06 06:50:05',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-06 06:50:05','2020-01-06 02:50:05',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(519,NULL,1,'2020-01-06 20:52:28','2020-01-06 20:52:28',40,'AC_OTH_AUTO','Consultation 2 recorded (Patient)','2020-01-06 20:52:28','2020-01-06 16:52:28',12,NULL,NULL,29,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Consultation 2 recorded (Patient)\nAuthor: admin',2,'cabinetmed_cons',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(520,NULL,1,'2020-01-07 20:25:02','2020-01-07 20:25:02',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 20:25:02','2020-01-07 16:25:02',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(521,NULL,1,'2020-01-07 21:12:37','2020-01-07 21:12:37',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:12:37','2020-01-07 17:12:37',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(522,NULL,1,'2020-01-07 21:13:00','2020-01-07 21:13:00',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:13:00','2020-01-07 17:13:00',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(523,NULL,1,'2020-01-07 21:13:49','2020-01-07 21:13:49',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:13:49','2020-01-07 17:13:49',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(524,NULL,1,'2020-01-07 21:46:58','2020-01-07 21:46:58',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:46:58','2020-01-07 17:46:58',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(525,NULL,1,'2020-01-07 21:52:34','2020-01-07 21:52:34',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:52:34','2020-01-07 17:52:34',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(526,NULL,1,'2020-01-07 21:53:44','2020-01-07 21:53:44',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:53:44','2020-01-07 17:53:44',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(527,NULL,1,'2020-01-07 21:53:58','2020-01-07 21:53:58',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:53:58','2020-01-07 17:53:58',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(528,NULL,1,'2020-01-07 21:54:12','2020-01-07 21:54:12',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:54:12','2020-01-07 17:54:12',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(529,NULL,1,'2020-01-07 22:00:55','2020-01-07 22:00:55',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 22:00:55','2020-01-07 18:00:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(530,NULL,1,'2020-01-07 22:39:52','2020-01-07 22:39:52',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 22:39:52','2020-01-07 18:39:52',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(531,NULL,1,'2020-01-07 23:09:04','2020-01-07 23:09:04',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 23:09:04','2020-01-07 19:09:04',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(532,NULL,1,'2020-01-07 23:39:09','2020-01-07 23:39:09',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR1909-0033 signed','2020-01-07 23:39:09','2020-01-07 19:39:09',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0033 signed',34,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(533,NULL,1,'2020-01-07 23:43:06','2020-01-07 23:43:06',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR1909-0033 signed','2020-01-07 23:43:06','2020-01-07 19:43:06',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0033 signed',34,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(534,NULL,1,'2020-01-07 23:50:40','2020-01-07 23:50:40',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 23:50:40','2020-01-07 19:50:40',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(535,NULL,1,'2020-01-07 23:51:27','2020-01-07 23:51:27',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 23:51:27','2020-01-07 19:51:27',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(536,NULL,1,'2020-01-08 00:25:23','2020-01-08 00:25:23',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 00:25:23','2020-01-07 20:25:23',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(537,NULL,1,'2020-01-08 00:25:43','2020-01-08 00:25:43',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 00:25:43','2020-01-07 20:25:43',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(538,NULL,1,'2020-01-08 00:29:24','2020-01-08 00:29:24',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 00:29:24','2020-01-07 20:29:24',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(539,NULL,1,'2020-01-08 00:29:43','2020-01-08 00:29:43',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 00:29:43','2020-01-07 20:29:43',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(540,NULL,1,'2020-01-08 01:09:15','2020-01-08 01:09:15',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 01:09:15','2020-01-07 21:09:15',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(541,NULL,1,'2020-01-08 01:15:02','2020-01-08 01:15:02',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 01:15:02','2020-01-07 21:15:02',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(542,NULL,1,'2020-01-08 01:17:16','2020-01-08 01:17:16',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 01:17:16','2020-01-07 21:17:16',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(543,NULL,1,'2020-01-08 05:31:44','2020-01-08 05:31:44',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 05:31:44','2020-01-08 01:31:44',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(544,NULL,1,'2020-01-08 05:39:46','2020-01-08 05:39:46',40,'AC_BOM_CLOSE','BOM disabled','2020-01-08 05:39:46','2020-01-08 01:39:46',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM disabled',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(545,NULL,1,'2020-01-08 05:39:50','2020-01-08 05:39:50',40,'AC_BOM_REOPEN','BOM reopen','2020-01-08 05:39:50','2020-01-08 01:39:50',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM reopen',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(546,NULL,1,'2020-01-08 06:06:50','2020-01-08 06:06:50',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 06:06:50','2020-01-08 02:06:50',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(547,NULL,1,'2020-01-08 19:34:53','2020-01-08 19:34:53',40,'AC_BOM_UNVALIDATE','BOM unvalidated','2020-01-08 19:34:53','2020-01-08 15:34:53',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM unvalidated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(548,NULL,1,'2020-01-08 19:40:27','2020-01-08 19:40:27',40,'AC_PRODUCT_MODIFY','Product APPLEPIE modified','2020-01-08 19:40:27','2020-01-08 15:40:27',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct APPLEPIE modified',4,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(549,NULL,1,'2020-01-08 19:40:46','2020-01-08 19:40:46',40,'AC_PRODUCT_MODIFY','Product PINKDRESS modified','2020-01-08 19:40:46','2020-01-08 15:40:46',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PINKDRESS modified',1,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(550,NULL,1,'2020-01-08 19:40:59','2020-01-08 19:40:59',40,'AC_BOM_VALIDATE','BOM validated','2020-01-08 19:40:59','2020-01-08 15:40:59',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM validated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(551,NULL,1,'2020-01-08 19:41:11','2020-01-08 19:41:11',40,'AC_BOM_UNVALIDATE','BOM unvalidated','2020-01-08 19:41:11','2020-01-08 15:41:11',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM unvalidated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(552,NULL,1,'2020-01-08 19:41:49','2020-01-08 19:41:49',40,'AC_BOM_VALIDATE','BOM validated','2020-01-08 19:41:49','2020-01-08 15:41:49',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM validated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(553,NULL,1,'2020-01-08 20:12:55','2020-01-08 20:12:55',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-08 20:12:55','2020-01-08 16:12:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',28,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(554,NULL,1,'2020-01-08 20:21:22','2020-01-08 20:21:22',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 20:21:22','2020-01-08 16:21:22',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',28,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(555,NULL,1,'2020-01-08 20:41:19','2020-01-08 20:41:19',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 20:41:19','2020-01-08 16:41:19',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',28,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(556,NULL,1,'2020-01-08 22:25:19','2020-01-08 22:25:19',40,'AC_BOM_DELETE','BOM deleted','2020-01-08 22:25:19','2020-01-08 18:25:19',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM deleted',7,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(557,NULL,1,'2020-01-13 15:11:07','2020-01-13 15:11:07',40,'AC_MO_DELETE','MO_DELETEInDolibarr','2020-01-13 15:11:07','2020-01-13 11:11:07',12,NULL,6,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO_DELETEInDolibarr',25,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(558,NULL,1,'2020-01-13 15:11:54','2020-01-13 15:11:54',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-13 15:11:54','2020-01-13 11:11:54',12,NULL,6,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',24,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(559,NULL,1,'2020-01-13 15:13:19','2020-01-13 15:13:19',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-13 15:13:19','2020-01-13 11:13:19',12,NULL,6,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',24,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(560,NULL,1,'2020-01-13 15:14:15','2020-01-13 15:14:15',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-13 15:14:15','2020-01-13 11:14:15',12,NULL,6,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',24,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(561,NULL,1,'2020-01-13 15:29:30','2020-01-13 15:29:30',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-13 15:29:30','2020-01-13 11:29:30',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(562,NULL,1,'2020-01-13 17:19:24','2020-01-13 17:19:24',40,'AC_COMPANY_CREATE','Third party Italo created','2020-01-13 17:19:24','2020-01-13 13:19:24',12,NULL,NULL,30,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nThird party Italo created',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(563,NULL,1,'2020-01-15 16:27:15','2020-01-15 16:27:15',40,'AC_PROJECT_MODIFY','Project RMLL modified','2020-01-15 16:27:15','2020-01-15 12:27:15',12,NULL,5,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject RMLL modified\nTask: RMLL',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(564,NULL,1,'2020-01-15 16:40:50','2020-01-15 16:40:50',40,'AC_PROJECT_MODIFY','Project PROJINDIAN modified','2020-01-15 16:40:50','2020-01-15 12:40:50',12,NULL,3,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PROJINDIAN modified\nTask: PROJINDIAN',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(565,NULL,1,'2020-01-16 02:22:16','2020-01-16 02:22:16',40,'AC_BILL_VALIDATE','Invoice AC2001-0001 validated','2020-01-16 02:22:16','2020-01-16 01:22:16',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0001 validated',221,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(566,NULL,1,'2020-01-16 02:22:24','2020-01-16 02:22:24',40,'AC_BILL_UNVALIDATE','Invoice AC2001-0001 go back to draft status','2020-01-16 02:22:24','2020-01-16 01:22:24',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0001 go back to draft status',221,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(567,NULL,1,'2020-01-16 02:33:27','2020-01-16 02:33:27',40,'AC_BILL_VALIDATE','Invoice AC2001-0002 validated','2020-01-16 02:33:27','2020-01-16 01:33:27',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0002 validated',224,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(568,NULL,1,'2020-01-16 02:36:48','2020-01-16 02:36:48',40,'AC_BILL_PAYED','Invoice AC2001-0002 changed to paid','2020-01-16 02:36:48','2020-01-16 01:36:48',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0002 changed to paid',224,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(569,NULL,1,'2020-01-16 02:42:12','2020-01-16 02:42:12',40,'AC_ORDER_CLASSIFY_BILLED','Order CO7001-0020 classified billed','2020-01-16 02:42:12','2020-01-16 01:42:12',12,NULL,NULL,6,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0020 classified billed',72,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(570,NULL,1,'2020-01-16 02:42:17','2020-01-16 02:42:17',40,'AC_ORDER_CLOSE','Order CO7001-0020 classified delivered','2020-01-16 02:42:17','2020-01-16 01:42:17',12,NULL,NULL,6,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0020 classified delivered',72,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(571,NULL,1,'2020-01-16 02:42:56','2020-01-16 02:42:56',40,'AC_ORDER_CLOSE','Order CO7001-0020 classified delivered','2020-01-16 02:42:56','2020-01-16 01:42:56',12,NULL,NULL,6,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0020 classified delivered',72,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(572,NULL,1,'2020-01-16 18:05:43','2020-01-16 18:05:43',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0006 validated','2020-01-16 18:05:43','2020-01-16 17:05:43',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 validated',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(573,NULL,1,'2020-01-17 14:54:18','2020-01-17 14:54:18',40,'AC_PRODUCT_MODIFY','Product PINKDRESS modified','2020-01-17 14:54:18','2020-01-17 13:54:18',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PINKDRESS modified',1,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(574,NULL,1,'2020-01-17 15:22:28','2020-01-17 15:22:28',40,'AC_PRODUCT_MODIFY','Product PINKDRESS modified','2020-01-17 15:22:28','2020-01-17 14:22:28',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PINKDRESS modified',1,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(575,NULL,1,'2020-01-19 14:22:27','2020-01-19 14:22:27',40,'AC_PROPAL_VALIDATE','Proposal PR2001-0034 validated','2020-01-19 14:22:27','2020-01-19 13:22:27',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR2001-0034 validated',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(576,NULL,1,'2020-01-19 14:22:34','2020-01-19 14:22:34',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR2001-0034 signed','2020-01-19 14:22:34','2020-01-19 13:22:34',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR2001-0034 signed',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(577,NULL,1,'2020-01-19 14:24:22','2020-01-19 14:24:22',40,'AC_PROPAL_VALIDATE','Proposal PR2001-0034 validated','2020-01-19 14:24:22','2020-01-19 13:24:22',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR2001-0034 validated',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(578,NULL,1,'2020-01-19 14:24:27','2020-01-19 14:24:27',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR2001-0034 signed','2020-01-19 14:24:27','2020-01-19 13:24:27',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR2001-0034 signed',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(579,NULL,1,'2020-01-19 14:51:43','2020-01-19 14:51:43',40,'AC_BILL_VALIDATE','Invoice AC2001-0003 validated','2020-01-19 14:51:43','2020-01-19 13:51:43',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0003 validated',227,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(580,NULL,1,'2020-01-19 14:51:48','2020-01-19 14:51:48',40,'AC_BILL_UNVALIDATE','Invoice AC2001-0003 go back to draft status','2020-01-19 14:51:48','2020-01-19 13:51:48',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0003 go back to draft status',227,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(581,NULL,1,'2020-01-19 15:01:26','2020-01-19 15:01:26',40,'AC_BILL_VALIDATE','Invoice AC2001-0004 validated','2020-01-19 15:01:26','2020-01-19 14:01:26',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 validated',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(582,NULL,1,'2020-01-19 15:04:37','2020-01-19 15:04:37',40,'AC_BILL_UNVALIDATE','Invoice AC2001-0004 go back to draft status','2020-01-19 15:04:37','2020-01-19 14:04:37',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 go back to draft status',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(583,NULL,1,'2020-01-19 15:04:53','2020-01-19 15:04:53',40,'AC_BILL_VALIDATE','Invoice AC2001-0004 validated','2020-01-19 15:04:53','2020-01-19 14:04:53',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 validated',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(584,NULL,1,'2020-01-19 15:09:14','2020-01-19 15:09:14',40,'AC_BILL_UNVALIDATE','Invoice AC2001-0004 go back to draft status','2020-01-19 15:09:14','2020-01-19 14:09:14',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 go back to draft status',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(585,NULL,1,'2020-01-19 15:13:07','2020-01-19 15:13:07',40,'AC_BILL_VALIDATE','Invoice AC2001-0004 validated','2020-01-19 15:13:07','2020-01-19 14:13:07',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 validated',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(586,NULL,1,'2020-01-20 12:20:11','2020-01-20 12:20:11',40,'AC_ORDER_SUPPLIER_CREATE','Order (PROV14) created','2020-01-20 12:20:11','2020-01-20 11:20:11',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder (PROV14) created',14,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(588,NULL,1,'2020-01-21 01:02:14','2020-01-21 01:02:14',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 2 for member Vick Smith added','2020-01-21 01:02:14','2020-01-21 00:02:14',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 2 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2013 - 07/17/2014',3,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(589,NULL,1,'2020-01-21 10:22:37','2020-01-21 10:22:37',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 3 for member Vick Smith added','2020-01-21 10:22:37','2020-01-21 09:22:37',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 3 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2017 - 07/17/2018',4,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(590,NULL,1,'2020-01-21 10:23:17','2020-01-21 10:23:17',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 4 for member Vick Smith added','2020-01-21 10:23:17','2020-01-21 09:23:17',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 4 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2017 - 07/17/2018',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(591,NULL,1,'2020-01-21 10:23:17','2020-01-21 10:23:17',40,'AC_BILL_VALIDATE','Invoice FA1707-0026 validated','2020-01-21 10:23:17','2020-01-21 09:23:17',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1707-0026 validated',229,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(592,NULL,1,'2020-01-21 10:23:17','2020-01-21 10:23:17',40,'AC_BILL_PAYED','Invoice FA1707-0026 changed to paid','2020-01-21 10:23:17','2020-01-21 09:23:17',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1707-0026 changed to paid',229,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(593,NULL,1,'2020-01-21 10:23:28','2020-01-21 10:23:28',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 5 for member Vick Smith added','2020-01-21 10:23:28','2020-01-21 09:23:28',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 5 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2018 - 07/17/2019',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(594,NULL,1,'2020-01-21 10:23:28','2020-01-21 10:23:28',40,'AC_BILL_VALIDATE','Invoice FA1807-0027 validated','2020-01-21 10:23:28','2020-01-21 09:23:28',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1807-0027 validated',230,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(595,NULL,1,'2020-01-21 10:23:28','2020-01-21 10:23:28',40,'AC_BILL_PAYED','Invoice FA1807-0027 changed to paid','2020-01-21 10:23:28','2020-01-21 09:23:28',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1807-0027 changed to paid',230,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(596,NULL,1,'2020-01-21 10:23:49','2020-01-21 10:23:49',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 6 for member Vick Smith added','2020-01-21 10:23:49','2020-01-21 09:23:49',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 6 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2019 - 07/17/2020',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(597,NULL,1,'2020-01-21 10:23:49','2020-01-21 10:23:49',40,'AC_BILL_VALIDATE','Invoice FA1907-0028 validated','2020-01-21 10:23:49','2020-01-21 09:23:49',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1907-0028 validated',231,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(598,NULL,1,'2020-01-21 10:23:49','2020-01-21 10:23:49',40,'AC_BILL_PAYED','Invoice FA1907-0028 changed to paid','2020-01-21 10:23:49','2020-01-21 09:23:49',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1907-0028 changed to paid',231,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(599,NULL,1,'2020-01-21 10:30:27','2020-01-21 10:30:27',40,'AC_MEMBER_MODIFY','Member Pierre Curie modified','2020-01-21 10:30:27','2020-01-21 09:30:27',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Pierre Curie modified\nMember: Pierre Curie\nType: Standard members',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(600,NULL,1,'2020-01-21 10:30:36','2020-01-21 10:30:36',40,'AC_MEMBER_MODIFY','Member doe john modified','2020-01-21 10:30:36','2020-01-21 09:30:36',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember doe john modified\nMember: doe john\nType: Standard members',3,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(601,NULL,1,'2020-01-21 10:30:42','2020-01-21 10:30:42',40,'AC_MEMBER_MODIFY','Member smith smith modified','2020-01-21 10:30:42','2020-01-21 09:30:42',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember smith smith modified\nMember: smith smith\nType: Standard members',4,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(602,NULL,1,'2020-01-21 10:30:57','2020-01-21 10:30:57',40,'AC_MEMBER_MODIFY','Member Vick Smith modified','2020-01-21 10:30:57','2020-01-21 09:30:57',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Vick Smith modified\nMember: Vick Smith\nType: Standard members',1,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(603,NULL,1,'2020-06-12 10:00:00','2020-06-12 11:30:00',5,'AC_RDV','Meetings','2020-06-12 19:26:44','2020-06-12 17:26:44',12,NULL,3,NULL,NULL,0,12,1,NULL,0,0,-1,'Room 24',5400,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(604,NULL,1,'2020-06-01 10:00:00','2020-06-01 10:27:00',1,'AC_TEL','Called Mr X','2020-06-12 19:28:13','2020-06-12 17:28:25',12,12,3,NULL,NULL,0,12,1,NULL,0,0,100,NULL,1620,NULL,'Customer ask another call.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL);
 /*!40000 ALTER TABLE `llx_actioncomm` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -378,11 +379,16 @@ CREATE TABLE `llx_actioncomm_reminder` (
   `offsetvalue` int(11) NOT NULL,
   `offsetunit` varchar(1) COLLATE utf8_unicode_ci NOT NULL,
   `status` int(11) NOT NULL DEFAULT 0,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `fk_actioncomm` int(11) NOT NULL,
+  `fk_email_template` int(11) DEFAULT NULL,
+  `lasterror` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
-  UNIQUE KEY `uk_actioncomm_reminder_unique` (`fk_user`,`typeremind`,`offsetvalue`,`offsetunit`),
+  UNIQUE KEY `uk_actioncomm_reminder_unique` (`fk_user`,`typeremind`,`offsetvalue`,`offsetunit`,`fk_actioncomm`),
   KEY `idx_actioncomm_reminder_rowid` (`rowid`),
   KEY `idx_actioncomm_reminder_dateremind` (`dateremind`),
-  KEY `idx_actioncomm_reminder_fk_user` (`fk_user`)
+  KEY `idx_actioncomm_reminder_fk_user` (`fk_user`),
+  KEY `idx_actioncomm_reminder_status` (`status`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -624,6 +630,124 @@ INSERT INTO `llx_adherent_type_lang` VALUES (1,2,'en_US','Standard members','',N
 /*!40000 ALTER TABLE `llx_adherent_type_lang` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_advanceddiscount_actions`
+--
+
+DROP TABLE IF EXISTS `llx_advanceddiscount_actions`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_advanceddiscount_actions` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_advanceddiscount` int(11) DEFAULT NULL,
+  `type_action` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `value_action` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_advanceddiscount_actions_fk_advanceddiscount` (`fk_advanceddiscount`),
+  CONSTRAINT `llx_advanceddiscount_actions_fk_advanceddiscount` FOREIGN KEY (`fk_advanceddiscount`) REFERENCES `llx_advanceddiscount_advanceddiscount` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_advanceddiscount_actions`
+--
+
+LOCK TABLES `llx_advanceddiscount_actions` WRITE;
+/*!40000 ALTER TABLE `llx_advanceddiscount_actions` DISABLE KEYS */;
+INSERT INTO `llx_advanceddiscount_actions` VALUES (3,1,'itempercentagediscount','50');
+/*!40000 ALTER TABLE `llx_advanceddiscount_actions` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_advanceddiscount_advanceddiscount`
+--
+
+DROP TABLE IF EXISTS `llx_advanceddiscount_advanceddiscount`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_advanceddiscount_advanceddiscount` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `date_start` date DEFAULT NULL,
+  `date_end` date DEFAULT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_user_creat` int(11) NOT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_advanceddiscount_advanceddiscount_rowid` (`rowid`),
+  KEY `idx_advanceddiscount_advanceddiscount_ref` (`ref`),
+  KEY `idx_advanceddiscount_advanceddiscount_entity` (`entity`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_advanceddiscount_advanceddiscount`
+--
+
+LOCK TABLES `llx_advanceddiscount_advanceddiscount` WRITE;
+/*!40000 ALTER TABLE `llx_advanceddiscount_advanceddiscount` DISABLE KEYS */;
+INSERT INTO `llx_advanceddiscount_advanceddiscount` VALUES (1,'aa',1,'aaaa',NULL,NULL,NULL,'2019-05-04 11:22:14','2019-05-04 09:22:14',12,NULL,NULL);
+/*!40000 ALTER TABLE `llx_advanceddiscount_advanceddiscount` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_advanceddiscount_advanceddiscount_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_advanceddiscount_advanceddiscount_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_advanceddiscount_advanceddiscount_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_advanceddiscount_advanceddiscount_extrafields`
+--
+
+LOCK TABLES `llx_advanceddiscount_advanceddiscount_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_advanceddiscount_advanceddiscount_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_advanceddiscount_advanceddiscount_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_advanceddiscount_rules`
+--
+
+DROP TABLE IF EXISTS `llx_advanceddiscount_rules`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_advanceddiscount_rules` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_advanceddiscount` int(11) DEFAULT NULL,
+  `type_rule` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `value_rule` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_advanceddiscount_rules_fk_advanceddiscount` (`fk_advanceddiscount`),
+  CONSTRAINT `llx_advanceddiscount_rules_fk_advanceddiscount` FOREIGN KEY (`fk_advanceddiscount`) REFERENCES `llx_advanceddiscount_advanceddiscount` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_advanceddiscount_rules`
+--
+
+LOCK TABLES `llx_advanceddiscount_rules` WRITE;
+/*!40000 ALTER TABLE `llx_advanceddiscount_rules` DISABLE KEYS */;
+INSERT INTO `llx_advanceddiscount_rules` VALUES (2,1,'totalgreaterorequal','1');
+/*!40000 ALTER TABLE `llx_advanceddiscount_rules` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_advtargetemailing`
 --
@@ -780,6 +904,232 @@ LOCK TABLES `llx_asset_type_extrafields` WRITE;
 /*!40000 ALTER TABLE `llx_asset_type_extrafields` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_assetatm`
+--
+
+DROP TABLE IF EXISTS `llx_assetatm`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_assetatm` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_soc` int(11) NOT NULL DEFAULT 0,
+  `fk_product` int(11) NOT NULL DEFAULT 0,
+  `fk_societe_localisation` int(11) NOT NULL DEFAULT 0,
+  `entity` int(11) NOT NULL DEFAULT 0,
+  `fk_asset_type` int(11) NOT NULL DEFAULT 0,
+  `valeur` double NOT NULL DEFAULT 0,
+  `contenancereel_value` double NOT NULL DEFAULT 0,
+  `contenance_value` double NOT NULL DEFAULT 0,
+  `point_chute` double NOT NULL DEFAULT 0,
+  `contenance_units` int(11) NOT NULL DEFAULT 0,
+  `contenancereel_units` int(11) NOT NULL DEFAULT 0,
+  `fk_entrepot` int(11) NOT NULL DEFAULT 0,
+  `commentaire` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `lot_number` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `gestion_stock` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `reutilisable` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `status` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `dluo` datetime DEFAULT NULL,
+  `import_key` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `serial_number` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `fk_soc` (`fk_soc`),
+  KEY `fk_product` (`fk_product`),
+  KEY `fk_societe_localisation` (`fk_societe_localisation`),
+  KEY `entity` (`entity`),
+  KEY `fk_asset_type` (`fk_asset_type`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_assetatm`
+--
+
+LOCK TABLES `llx_assetatm` WRITE;
+/*!40000 ALTER TABLE `llx_assetatm` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_assetatm` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_assetatm_field`
+--
+
+DROP TABLE IF EXISTS `llx_assetatm_field`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_assetatm_field` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `code` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `libelle` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `type` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `obligatoire` int(11) NOT NULL DEFAULT 0,
+  `ordre` int(11) NOT NULL DEFAULT 0,
+  `options` longtext CHARACTER SET latin1 DEFAULT NULL,
+  `supprimable` int(11) NOT NULL DEFAULT 0,
+  `inliste` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `inlibelle` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `fk_asset_type` int(11) NOT NULL DEFAULT 0,
+  `entity` int(11) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `ordre` (`ordre`),
+  KEY `fk_asset_type` (`fk_asset_type`),
+  KEY `entity` (`entity`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_assetatm_field`
+--
+
+LOCK TABLES `llx_assetatm_field` WRITE;
+/*!40000 ALTER TABLE `llx_assetatm_field` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_assetatm_field` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_assetatm_link`
+--
+
+DROP TABLE IF EXISTS `llx_assetatm_link`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_assetatm_link` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_asset` int(11) NOT NULL DEFAULT 0,
+  `fk_document` int(11) NOT NULL DEFAULT 0,
+  `type_document` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_assetatm_link`
+--
+
+LOCK TABLES `llx_assetatm_link` WRITE;
+/*!40000 ALTER TABLE `llx_assetatm_link` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_assetatm_link` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_assetatm_stock`
+--
+
+DROP TABLE IF EXISTS `llx_assetatm_stock`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_assetatm_stock` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_asset` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `qty` double NOT NULL DEFAULT 0,
+  `date_mvt` datetime DEFAULT NULL,
+  `type` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `lot` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `source` int(11) NOT NULL DEFAULT 0,
+  `user` int(11) NOT NULL DEFAULT 0,
+  `weight_units` int(11) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `fk_asset` (`fk_asset`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_assetatm_stock`
+--
+
+LOCK TABLES `llx_assetatm_stock` WRITE;
+/*!40000 ALTER TABLE `llx_assetatm_stock` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_assetatm_stock` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_assetatm_type`
+--
+
+DROP TABLE IF EXISTS `llx_assetatm_type`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_assetatm_type` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `libelle` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `code` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `reutilisable` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `masque` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `gestion_stock` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `measuring_units` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT 0,
+  `contenance_value` double NOT NULL DEFAULT 0,
+  `contenancereel_value` double NOT NULL DEFAULT 0,
+  `point_chute` double NOT NULL DEFAULT 0,
+  `contenance_units` int(11) NOT NULL DEFAULT 0,
+  `contenancereel_units` int(11) NOT NULL DEFAULT 0,
+  `cumulate` int(11) NOT NULL DEFAULT 0,
+  `perishable` int(11) NOT NULL DEFAULT 0,
+  `supprimable` int(11) NOT NULL DEFAULT 0,
+  `default_dluo` varchar(20) CHARACTER SET latin1 DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `entity` (`entity`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_assetatm_type`
+--
+
+LOCK TABLES `llx_assetatm_type` WRITE;
+/*!40000 ALTER TABLE `llx_assetatm_type` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_assetatm_type` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_assetatmlot`
+--
+
+DROP TABLE IF EXISTS `llx_assetatmlot`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_assetatmlot` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT 0,
+  `lot_number` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_assetatmlot`
+--
+
+LOCK TABLES `llx_assetatmlot` WRITE;
+/*!40000 ALTER TABLE `llx_assetatmlot` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_assetatmlot` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_bank`
 --
@@ -808,6 +1158,9 @@ CREATE TABLE `llx_bank` (
   `emetteur` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `author` varchar(40) COLLATE utf8_unicode_ci DEFAULT NULL,
   `numero_compte` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `origin_id` int(11) DEFAULT NULL,
+  `origin_type` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_bank_datev` (`datev`),
   KEY `idx_bank_dateo` (`dateo`),
@@ -823,7 +1176,7 @@ CREATE TABLE `llx_bank` (
 
 LOCK TABLES `llx_bank` WRITE;
 /*!40000 ALTER TABLE `llx_bank` DISABLE KEYS */;
-INSERT INTO `llx_bank` VALUES (1,'2012-07-08 23:56:14','2020-06-12 17:12:09','2019-07-08','2019-07-08',2000.00000000,'(Initial balance)',1,NULL,1,'SOLD','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL),(2,'2012-07-09 00:00:24','2020-06-12 17:12:09','2019-07-09','2019-07-09',500.00000000,'(Initial balance)',2,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(3,'2012-07-10 13:33:42','2020-06-12 17:12:09','2019-07-10','2019-07-10',0.00000000,'(Solde initial)',3,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(5,'2013-07-18 20:50:24','2020-06-12 17:12:09','2019-07-08','2019-07-08',20.00000000,'(CustomerInvoicePayment)',1,1,NULL,'CB','201107',NULL,1,NULL,0,NULL,NULL,NULL,NULL),(6,'2013-07-18 20:50:47','2020-06-12 17:12:09','2019-07-08','2019-07-08',10.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(8,'2013-08-01 03:34:11','2020-06-12 17:12:08','2019-08-15','2019-08-01',5.63000000,'(CustomerInvoicePayment)',1,1,1,'CB','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL),(12,'2013-08-05 23:11:37','2020-06-12 17:12:08','2019-08-12','2019-08-05',-10.00000000,'(SocialContributionPayment)',1,1,1,'VIR','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL),(13,'2013-08-06 20:33:54','2020-06-12 17:12:08','2019-08-06','2019-08-06',5.98000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(14,'2013-08-08 02:53:40','2020-06-12 17:12:08','2019-08-08','2019-08-08',26.10000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(15,'2013-08-08 02:55:58','2020-06-12 17:12:08','2019-08-08','2019-08-08',26.96000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201211',NULL,1,NULL,0,NULL,NULL,NULL,NULL),(16,'2014-12-09 15:28:44','2020-06-12 17:12:08','2019-12-09','2019-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(17,'2014-12-09 15:28:53','2020-06-12 17:12:08','2019-12-09','2019-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(18,'2014-12-09 17:35:55','2020-06-12 17:12:08','2019-12-09','2019-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(19,'2014-12-09 17:37:02','2020-06-12 17:12:08','2019-12-09','2019-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(20,'2014-12-09 18:35:07','2020-06-12 17:12:08','2019-12-09','2019-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(21,'2014-12-12 18:54:33','2020-06-12 17:12:08','2019-12-12','2019-12-12',1.00000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL),(22,'2015-03-06 16:48:16','2020-06-12 17:12:09','2020-03-06','2020-03-06',20.00000000,'(SubscriptionPayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(23,'2015-03-20 14:30:11','2020-06-12 17:12:09','2020-03-20','2020-03-20',10.00000000,'(SubscriptionPayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(24,'2016-03-02 19:57:58','2020-06-12 17:12:09','2019-07-09','2019-07-09',605.00000000,'(CustomerInvoicePayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'111',NULL,NULL),(26,'2016-03-02 20:01:39','2020-06-12 17:12:09','2020-03-19','2020-03-19',500.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(27,'2016-03-02 20:02:06','2020-06-12 17:12:09','2020-03-21','2020-03-21',400.00000000,'(CustomerInvoicePayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'ABC and Co',NULL,NULL),(28,'2016-03-03 19:22:32','2020-06-12 17:12:08','2019-10-03','2019-10-03',-400.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(29,'2016-03-03 19:23:16','2020-06-12 17:12:09','2020-03-10','2020-03-10',-300.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(30,'2018-01-22 18:56:34','2020-06-12 17:12:09','2020-01-22','2020-01-22',-900.00000000,'(SupplierInvoicePayment)',1,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(31,'2018-07-30 22:42:14','2020-06-12 17:12:09','2019-07-30','2019-07-30',0.00000000,'(Initial balance)',4,0,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(32,'2017-02-01 19:02:44','2020-06-12 17:12:08','2020-02-01','2020-02-01',-200.00000000,'(SupplierInvoicePayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(33,'2017-02-06 08:10:24','2020-06-12 17:12:09','2020-03-22','2020-03-22',150.00000000,'(CustomerInvoicePayment)',1,12,NULL,'CHQ',NULL,NULL,0,NULL,2,NULL,'Magic Food Store',NULL,NULL),(34,'2017-02-06 08:10:50','2020-06-12 17:12:09','2020-03-25','2020-03-25',140.00000000,'(CustomerInvoicePayment)',1,12,NULL,'PRE',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(36,'2017-02-16 02:22:09','2020-06-12 17:12:08','2020-02-16','2020-02-16',-1.00000000,'(ExpenseReportPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(37,'2017-02-21 16:07:43','2020-06-12 17:12:08','2020-02-21','2020-02-21',50.00000000,'(WithdrawalPayment)',1,12,NULL,'PRE',NULL,'T170201',0,NULL,0,NULL,NULL,NULL,NULL),(38,'2017-09-06 20:08:36','2020-06-12 17:12:08','2019-09-06','2019-09-06',10.00000000,'(DonationPayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,''),(39,'2018-03-16 13:59:31','2020-06-12 17:12:09','2020-03-16','2020-03-16',10.00000000,'(CustomerInvoicePayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Indian SAS',NULL,''),(41,'2019-10-04 10:28:14','2020-06-12 17:12:09','2020-01-19','2020-01-19',5.63000000,'(CustomerInvoicePayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,''),(42,'2019-10-08 13:18:50','2019-10-08 11:18:50','2019-10-08','2019-10-08',-1000.00000000,'Salary payment',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,''),(43,'2019-12-26 01:48:30','2019-12-25 21:48:30','2019-12-25','2019-12-25',-5.00000000,'(SocialContributionPayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,''),(44,'2019-12-26 01:48:46','2019-12-25 21:48:46','2019-12-25','2019-12-25',-5.00000000,'(SocialContributionPayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,''),(47,'2020-01-01 20:28:49','2020-01-01 16:28:49','2020-01-01','2020-01-01',304.69000000,'(SupplierInvoicePayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,''),(48,'2020-01-06 20:52:28','2020-01-06 16:52:28','2020-01-06','2020-01-06',10.00000000,'Patient payment',1,12,NULL,'CB',NULL,NULL,0,NULL,0,NULL,'Patient',NULL,''),(49,'2020-01-10 04:42:47','2020-01-10 00:42:47','2020-01-10','2020-01-10',-10.00000000,'Miscellaneous payment',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,''),(50,'2020-01-16 02:36:48','2020-01-16 01:36:48','2020-01-16','2020-01-16',20.50000000,'(CustomerInvoicePayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'Magic Food Store',NULL,''),(51,'2020-01-21 01:02:14','2020-06-12 17:12:08','2019-07-18','2019-07-18',50.00000000,'Subscription 2013',4,12,NULL,'CB',NULL,'12345',0,NULL,0,'Bank CBN',NULL,NULL,''),(52,'2020-01-21 10:22:37','2020-01-21 09:22:37','2020-01-21','2020-01-21',50.00000000,'Subscription 2017',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'smith smith',NULL,''),(53,'2020-01-21 10:23:17','2020-01-21 09:23:17','2020-01-21','2020-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Pierre Curie',NULL,''),(54,'2020-01-21 10:23:28','2020-01-21 09:23:28','2020-01-21','2020-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Pierre Curie',NULL,''),(55,'2020-01-21 10:23:49','2020-01-21 09:23:49','2020-01-21','2020-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CB',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'');
+INSERT INTO `llx_bank` VALUES (1,'2012-07-08 23:56:14','2020-12-10 12:24:23','2020-07-08','2020-07-08',2000.00000000,'(Initial balance)',1,NULL,1,'SOLD','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(2,'2012-07-09 00:00:24','2020-12-10 12:24:23','2020-07-09','2020-07-09',500.00000000,'(Initial balance)',2,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,'2012-07-10 13:33:42','2020-12-10 12:24:23','2020-07-10','2020-07-10',0.00000000,'(Solde initial)',3,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(5,'2013-07-18 20:50:24','2020-12-10 12:24:23','2020-07-08','2020-07-08',20.00000000,'(CustomerInvoicePayment)',1,1,NULL,'CB','201107',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(6,'2013-07-18 20:50:47','2020-12-10 12:24:23','2020-07-08','2020-07-08',10.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(8,'2013-08-01 03:34:11','2020-12-10 12:24:23','2020-08-15','2020-08-01',5.63000000,'(CustomerInvoicePayment)',1,1,1,'CB','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(12,'2013-08-05 23:11:37','2020-12-10 12:24:23','2020-08-12','2020-08-05',-10.00000000,'(SocialContributionPayment)',1,1,1,'VIR','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(13,'2013-08-06 20:33:54','2020-12-10 12:24:23','2020-08-06','2020-08-06',5.98000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(14,'2013-08-08 02:53:40','2020-12-10 12:24:23','2020-08-08','2020-08-08',26.10000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(15,'2013-08-08 02:55:58','2020-12-10 12:24:23','2020-08-08','2020-08-08',26.96000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201211',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(16,'2014-12-09 15:28:44','2020-12-10 12:24:23','2020-12-09','2020-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(17,'2014-12-09 15:28:53','2020-12-10 12:24:23','2020-12-09','2020-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(18,'2014-12-09 17:35:55','2020-12-10 12:24:23','2020-12-09','2020-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(19,'2014-12-09 17:37:02','2020-12-10 12:24:23','2020-12-09','2020-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(20,'2014-12-09 18:35:07','2020-12-10 12:24:23','2020-12-09','2020-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(21,'2014-12-12 18:54:33','2020-06-12 17:12:08','2019-12-12','2019-12-12',1.00000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(22,'2015-03-06 16:48:16','2020-06-12 17:12:09','2020-03-06','2020-03-06',20.00000000,'(SubscriptionPayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(23,'2015-03-20 14:30:11','2020-06-12 17:12:09','2020-03-20','2020-03-20',10.00000000,'(SubscriptionPayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(24,'2016-03-02 19:57:58','2020-12-10 12:24:23','2020-07-09','2020-07-09',605.00000000,'(CustomerInvoicePayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'111',NULL,NULL,NULL,NULL,NULL),(26,'2016-03-02 20:01:39','2020-06-12 17:12:09','2020-03-19','2020-03-19',500.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(27,'2016-03-02 20:02:06','2020-06-12 17:12:09','2020-03-21','2020-03-21',400.00000000,'(CustomerInvoicePayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'ABC and Co',NULL,NULL,NULL,NULL,NULL),(28,'2016-03-03 19:22:32','2020-12-10 12:24:23','2020-10-03','2020-10-03',-400.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(29,'2016-03-03 19:23:16','2020-06-12 17:12:09','2020-03-10','2020-03-10',-300.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(30,'2018-01-22 18:56:34','2020-06-12 17:12:09','2020-01-22','2020-01-22',-900.00000000,'(SupplierInvoicePayment)',1,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(31,'2018-07-30 22:42:14','2020-12-10 12:24:23','2020-07-30','2020-07-30',0.00000000,'(Initial balance)',4,0,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(32,'2017-02-01 19:02:44','2020-06-12 17:12:08','2020-02-01','2020-02-01',-200.00000000,'(SupplierInvoicePayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(33,'2017-02-06 08:10:24','2020-06-12 17:12:09','2020-03-22','2020-03-22',150.00000000,'(CustomerInvoicePayment)',1,12,NULL,'CHQ',NULL,NULL,0,NULL,2,NULL,'Magic Food Store',NULL,NULL,NULL,NULL,NULL),(34,'2017-02-06 08:10:50','2020-06-12 17:12:09','2020-03-25','2020-03-25',140.00000000,'(CustomerInvoicePayment)',1,12,NULL,'PRE',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(36,'2017-02-16 02:22:09','2020-06-12 17:12:08','2020-02-16','2020-02-16',-1.00000000,'(ExpenseReportPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(37,'2017-02-21 16:07:43','2020-06-12 17:12:08','2020-02-21','2020-02-21',50.00000000,'(WithdrawalPayment)',1,12,NULL,'PRE',NULL,'T170201',0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(38,'2017-09-06 20:08:36','2020-12-10 12:24:23','2020-09-06','2020-09-06',10.00000000,'(DonationPayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(39,'2018-03-16 13:59:31','2020-06-12 17:12:09','2020-03-16','2020-03-16',10.00000000,'(CustomerInvoicePayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Indian SAS',NULL,'',NULL,NULL,NULL),(41,'2019-10-04 10:28:14','2020-06-12 17:12:09','2020-01-19','2020-01-19',5.63000000,'(CustomerInvoicePayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(42,'2019-10-08 13:18:50','2020-12-10 12:24:23','2020-10-08','2020-10-08',-1000.00000000,'Salary payment',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(43,'2019-12-26 01:48:30','2019-12-25 21:48:30','2019-12-25','2019-12-25',-5.00000000,'(SocialContributionPayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(44,'2019-12-26 01:48:46','2019-12-25 21:48:46','2019-12-25','2019-12-25',-5.00000000,'(SocialContributionPayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(47,'2020-01-01 20:28:49','2020-01-01 16:28:49','2020-01-01','2020-01-01',304.69000000,'(SupplierInvoicePayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(48,'2020-01-06 20:52:28','2020-01-06 16:52:28','2020-01-06','2020-01-06',10.00000000,'Patient payment',1,12,NULL,'CB',NULL,NULL,0,NULL,0,NULL,'Patient',NULL,'',NULL,NULL,NULL),(49,'2020-01-10 04:42:47','2020-01-10 00:42:47','2020-01-10','2020-01-10',-10.00000000,'Miscellaneous payment',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(50,'2020-01-16 02:36:48','2020-01-16 01:36:48','2020-01-16','2020-01-16',20.50000000,'(CustomerInvoicePayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'Magic Food Store',NULL,'',NULL,NULL,NULL),(51,'2020-01-21 01:02:14','2020-12-10 12:24:23','2020-07-18','2020-07-18',50.00000000,'Subscription 2013',4,12,NULL,'CB',NULL,'12345',0,NULL,0,'Bank CBN',NULL,NULL,'',NULL,NULL,NULL),(52,'2020-01-21 10:22:37','2020-01-21 09:22:37','2020-01-21','2020-01-21',50.00000000,'Subscription 2017',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'smith smith',NULL,'',NULL,NULL,NULL),(53,'2020-01-21 10:23:17','2020-01-21 09:23:17','2020-01-21','2020-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Pierre Curie',NULL,'',NULL,NULL,NULL),(54,'2020-01-21 10:23:28','2020-01-21 09:23:28','2020-01-21','2020-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Pierre Curie',NULL,'',NULL,NULL,NULL),(55,'2020-01-21 10:23:49','2020-01-21 09:23:49','2020-01-21','2020-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CB',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_bank` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1024,7 +1377,7 @@ CREATE TABLE `llx_blockedlog` (
   KEY `fk_user` (`fk_user`),
   KEY `entity_action` (`entity`,`action`),
   KEY `entity_action_certified` (`entity`,`action`,`certified`)
-) ENGINE=InnoDB AUTO_INCREMENT=58 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=59 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1033,7 +1386,7 @@ CREATE TABLE `llx_blockedlog` (
 
 LOCK TABLES `llx_blockedlog` WRITE;
 /*!40000 ALTER TABLE `llx_blockedlog` DISABLE KEYS */;
-INSERT INTO `llx_blockedlog` VALUES (20,'2018-03-16 09:57:22','MODULE_RESET',0.00000000,'d6dd5fe6c2eec2de6368f3b6da30188566f0a1a7be4b1589ccd8352d2c827ad5','fbc11d0396d9b76ea48f892bd5f0fe652e5bdf7d44873acb4bf1e1b70352bd30','module',1,'systemevent','2018-03-16 13:57:22','O:8:\"stdClass\":6:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:1:\"1\";s:7:\"idprof3\";s:1:\"1\";s:7:\"idprof4\";s:1:\"1\";s:7:\"idprof5\";s:1:\"1\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:9:\"FR1234567\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";s:4:\"name\";s:12:\"MyBigCompany\";}s:2:\"id\";i:1;s:7:\"element\";s:6:\"module\";s:3:\"ref\";s:11:\"systemevent\";s:6:\"entity\";i:1;s:4:\"date\";i:1521194242;}',12,1,0,'2018-03-16 13:57:22','Alice Adminson',''),(21,'2018-03-16 09:57:24','MODULE_SET',0.00000000,'d6b66df837d8d33bd8b9744e2afa46ab8c65ae8ca462246c406de19f8254e146','0a3aae975056417705f4eb7b4a4926384075cc2b6c899603715643c8f1d6ff9b','module',1,'systemevent','2018-03-16 13:57:24','O:8:\"stdClass\":6:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:1:\"1\";s:7:\"idprof3\";s:1:\"1\";s:7:\"idprof4\";s:1:\"1\";s:7:\"idprof5\";s:1:\"1\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:9:\"FR1234567\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";s:4:\"name\";s:12:\"MyBigCompany\";}s:2:\"id\";i:1;s:7:\"element\";s:6:\"module\";s:3:\"ref\";s:11:\"systemevent\";s:6:\"entity\";i:1;s:4:\"date\";i:1521194244;}',12,1,0,'2018-03-16 13:57:24','Alice Adminson',''),(22,'2018-03-16 09:59:31','PAYMENT_CUSTOMER_CREATE',10.00000000,'9beb9e3ba04582d441b49f176f995900c16572c789bcf48a1c9f285a74be76c8','86813eb2563252c0e270baaf1fffade82475fe51af5f88d14613005fd0e07783','payment',38,'PAY1803-0004','2018-03-16 12:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:1:\"1\";s:7:\"idprof3\";s:1:\"1\";s:7:\"idprof4\";s:1:\"1\";s:7:\"idprof5\";s:1:\"1\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:9:\"FR1234567\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";s:4:\"name\";s:12:\"MyBigCompany\";}s:3:\"ref\";s:12:\"PAY1803-0004\";s:4:\"date\";i:1521187200;s:9:\"type_code\";s:3:\"CHQ\";s:11:\"payment_num\";N;s:4:\"note\";s:0:\"\";s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:2:\"10\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";s:4:\"name\";s:10:\"Indian SAS\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1453147200;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:11:\"20.00000000\";s:9:\"total_tva\";s:10:\"1.80000000\";s:9:\"total_ttc\";s:11:\"23.60000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA1601-0024\";s:11:\"note_public\";N;}}}s:6:\"amount\";i:10;}',12,1,0,'2018-03-16 13:59:31','Alice Adminson',''),(23,'2019-09-26 15:33:37','BILL_VALIDATE',43.58000000,'6a1e049c00f51afa6eaca799e6281bd8abfdaa12bdf42ee2a002b0bec588a2a5','451b12ea66d25259c9c1df9993a902affe124c9f27c97093613cf7184fe388aa','facture',218,'FA1909-0025','2019-09-26 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1569448800;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";d:42.5;s:9:\"total_tva\";d:1.08;s:9:\"total_ttc\";d:43.58;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:5:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";s:9:\"DOLICLOUD\";s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:10:\"9.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:10:\"9.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"9.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"9.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:2;O:8:\"stdClass\":17:{s:3:\"ref\";s:9:\"DOLIDROID\";s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:10:\"5.50000000\";s:23:\"multicurrency_total_tva\";s:10:\"1.08000000\";s:23:\"multicurrency_total_ttc\";s:10:\"6.58000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:6:\"19.600\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"5.50000000\";s:9:\"total_tva\";s:10:\"1.08000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"6.58000000\";s:9:\"info_bits\";s:1:\"0\";}i:3;O:8:\"stdClass\":17:{s:3:\"ref\";s:9:\"DOLICLOUD\";s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:10:\"9.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:10:\"9.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"9.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"9.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:4;O:8:\"stdClass\":17:{s:3:\"ref\";s:9:\"DOLICLOUD\";s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:10:\"9.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:10:\"9.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"9.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"9.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:5;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"10.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"10.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"10.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"10.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA1909-0025\";s:11:\"note_public\";N;}',12,1,0,'2019-09-26 17:33:37','Alice Adminson',''),(24,'2019-10-04 08:27:00','BILL_VALIDATE',5.63000000,'aa16d46e6ea7376fe0f91a4aeb7b1d534ed351fae071ded64c393e61269c4c35','316e03ffb8327d837c8601e7dbafc91509581b0be9449a89827a14e6cfa2688a','facture',150,'FA6801-0010','2018-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1516316400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";d:5;s:9:\"total_tva\";d:0.63;s:9:\"total_ttc\";d:5.63;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";s:7:\"PEARPIE\";s:18:\"multicurrency_code\";N;s:22:\"multicurrency_total_ht\";s:10:\"5.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.63000000\";s:23:\"multicurrency_total_ttc\";s:10:\"5.63000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:6:\"12.500\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"5.00000000\";s:9:\"total_tva\";s:10:\"0.63000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"5.63000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA6801-0010\";s:11:\"note_public\";N;}',12,1,0,'2019-10-04 10:27:00','Alice Adminson',''),(25,'2019-10-04 08:28:14','PAYMENT_CUSTOMER_CREATE',5.63000000,'fa5c9b4bb975af8401744390d47e62218a7ec47a2e96c60f5e58d7f6be38dc44','9bfe069dc130dd71c31f914ff0afa7835fd40932790ac88be0005638342ccb87','payment',39,'PAY1801-0005','2018-01-19 12:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY1801-0005\";s:4:\"date\";i:1516359600;s:9:\"type_code\";s:3:\"LIQ\";s:11:\"payment_num\";N;s:4:\"note\";s:0:\"\";s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:4:\"5.63\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1516316400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:10:\"5.00000000\";s:9:\"total_tva\";s:10:\"0.63000000\";s:9:\"total_ttc\";s:10:\"5.63000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA6801-0010\";s:11:\"note_public\";N;}}}s:6:\"amount\";d:5.63;}',12,1,0,'2019-10-04 10:28:14','Alice Adminson',''),(26,'2019-12-22 19:01:48','CASHCONTROL_VALIDATE',400.00000000,'bb14150a5ea65d97f9d22f6bc3d3d357ccfb2aa681f2ecbcc81a9d870260c58c','7b03131558731b2e7b4000189214b132f4323621c596d4418cfeba233a085e83','cashcontrol',1,'1','2019-12-22 23:01:02','O:8:\"stdClass\":37:{s:9:\"mycompany\";O:8:\"stdClass\":26:{s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:0;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:0;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;}s:7:\"element\";s:11:\"cashcontrol\";s:2:\"id\";i:1;s:7:\"opening\";d:-324.29;s:6:\"status\";i:1;s:10:\"year_close\";i:2019;s:11:\"month_close\";i:11;s:9:\"day_close\";N;s:9:\"posmodule\";s:7:\"takepos\";s:9:\"posnumber\";s:1:\"1\";s:4:\"cash\";d:400;s:6:\"cheque\";d:0;s:4:\"card\";d:0;s:10:\"date_valid\";i:1577041308;s:13:\"date_creation\";i:1577041262;s:17:\"date_modification\";N;s:10:\"import_key\";N;s:13:\"array_options\";a:0:{}s:6:\"canvas\";N;s:7:\"project\";N;s:10:\"fk_project\";N;s:10:\"thirdparty\";N;s:4:\"user\";N;s:3:\"ref\";s:1:\"1\";s:7:\"ref_ext\";N;s:6:\"statut\";N;s:10:\"fk_account\";N;s:11:\"note_public\";N;s:12:\"note_private\";N;s:4:\"note\";N;s:8:\"comments\";a:0:{}s:15:\"date_validation\";N;s:16:\"next_prev_filter\";N;s:6:\"entity\";i:1;s:5:\"label\";N;s:3:\"tms\";i:1577030462;s:13:\"fk_user_valid\";s:2:\"12\";}',12,1,0,'2019-12-22 23:01:48','Alice Adminson',''),(34,'2020-01-10 00:42:47','PAYMENT_VARIOUS_CREATE',10.00000000,'e20ec32652d7564cdca915e95528b68bd3b770b82defe64ead1af3f6dc6bc150','25514deeca716e41c02699d9466fc640f4b7da0a0c953637b542c555f9634f9b','payment_various',4,'4','2020-01-10 12:00:00','O:8:\"stdClass\":7:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";i:4;s:4:\"date\";i:1578643200;s:9:\"type_code\";s:3:\"VIR\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";s:0:\"\";s:6:\"amount\";i:10;}',12,1,0,'2020-01-10 04:42:47','Alice Adminson',''),(35,'2020-01-10 01:08:37','PAYMENT_VARIOUS_MODIFY',10.00000000,'94bd3491e8e553e6e633cd4a40c8c0ef3a6af0bd60df1d8e768d3c8c2a37b79b','eeadf2ffc7bd611e3b739e8825307f9e9cb2d9dddbd9e16b1f092fa5d881a5ca','payment_various',4,'4','2020-01-10 00:00:00','O:8:\"stdClass\":7:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:1:\"4\";s:4:\"date\";i:1578600000;s:9:\"type_code\";s:3:\"VIR\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";s:0:\"\";s:6:\"amount\";d:10;}',12,1,0,'2020-01-10 05:08:37','Alice Adminson',''),(36,'2020-01-10 01:08:43','PAYMENT_VARIOUS_MODIFY',10.00000000,'02ecc274221832fcbf8f525ed64f1391415a29dded01022a5a4c51cfb2c5ad49','c274f2f609af56bd40b74000eaa2f6866a734feb0fc262ce3431ac9f91a754e2','payment_various',4,'4','2020-01-10 00:00:00','O:8:\"stdClass\":7:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:1:\"4\";s:4:\"date\";i:1578600000;s:9:\"type_code\";s:0:\"\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";s:0:\"\";s:6:\"amount\";d:10;}',12,1,0,'2020-01-10 05:08:43','Alice Adminson',''),(37,'2020-01-10 01:17:51','PAYMENT_VARIOUS_MODIFY',10.00000000,'214ad5673f893c2da41a8c87ccbcae92dccf17c9d4a13b3d04a9497d21bf68b8','ffbebb278eaa1c75f0cf5afdd05c8367887615a7329f2b3ab628b8f0da10f9d8','payment_various',4,'4','2020-01-10 00:00:00','O:8:\"stdClass\":7:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:1:\"4\";s:4:\"date\";i:1578600000;s:9:\"type_code\";s:0:\"\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";s:0:\"\";s:6:\"amount\";d:10;}',12,1,0,'2020-01-10 05:17:51','Alice Adminson',''),(38,'2020-01-16 01:22:16','BILL_VALIDATE',123.00000000,'aae0a1eb8b3da6686020252194f47ce82301fb604ee213ae120a2885197735d5','b414061da9abbd2dec7153a7d53978c177c5c5f55ed8ace177a02e46e7a74312','facture',221,'AC2001-0001','2020-01-16 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:16:\"Magic Food Store\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:22:\"65 holdywood boulevard\";s:3:\"zip\";s:6:\"123456\";s:4:\"town\";s:7:\"BigTown\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";s:4:\"0101\";s:5:\"email\";s:18:\"myemail@domain.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:10:\"10/10/2010\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1301-0008\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"ES\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579129200;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:123;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:123;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:12:\"123.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:12:\"123.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:12:\"123.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:12:\"123.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0001\";s:11:\"note_public\";N;}',12,1,0,'2020-01-16 02:22:16','Alice Adminson',''),(39,'2020-01-16 01:33:27','BILL_VALIDATE',20.50000000,'777eb88a0b91c6d376881534a7c84a9b9ee5a6d7efedbae3b0c00d7e36bacba9','b78e5b5909c49c575142b429f2d09abb2d19c5545f815a1cabe0f2ed80ded6e4','facture',224,'AC2001-0002','2020-01-16 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:16:\"Magic Food Store\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:22:\"65 holdywood boulevard\";s:3:\"zip\";s:6:\"123456\";s:4:\"town\";s:7:\"BigTown\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";s:4:\"0101\";s:5:\"email\";s:18:\"myemail@domain.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:10:\"10/10/2010\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1301-0008\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"ES\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579129200;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:20.5;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:20.5;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"20.50000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"20.50000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"20.50000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"20.50000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0002\";s:11:\"note_public\";N;}',12,1,0,'2020-01-16 02:33:27','Alice Adminson',''),(40,'2020-01-16 01:36:48','PAYMENT_CUSTOMER_CREATE',20.50000000,'cb03ceef89e1630e5a3ba8b3b1ca6c77e42b97fc2884a661c04e9e5c8b3afa1e','18bed0f0566b20ffa32c49c901cfc8b46485ef2172b22c676cef07ce8bd2d90b','payment',40,'PAY2001-0006','2020-01-16 12:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY2001-0006\";s:4:\"date\";i:1579172400;s:9:\"type_code\";s:3:\"VIR\";s:11:\"payment_num\";N;s:4:\"note\";s:0:\"\";s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:4:\"20.5\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:16:\"Magic Food Store\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:22:\"65 holdywood boulevard\";s:3:\"zip\";s:6:\"123456\";s:4:\"town\";s:7:\"BigTown\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";s:4:\"0101\";s:5:\"email\";s:18:\"myemail@domain.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:10:\"10/10/2010\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1301-0008\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"ES\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1579129200;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";s:11:\"20.50000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"20.50000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"AC2001-0002\";s:11:\"note_public\";N;}}}s:6:\"amount\";d:20.5;}',12,1,0,'2020-01-16 02:36:48','Alice Adminson',''),(41,'2020-01-19 13:51:43','BILL_VALIDATE',239.20000000,'7f38eaf315003f652b72fd27e55e71010a5ed0339086aa100b9a91a6045bb06f','26d074106c5f096ea1795ce7ed399cda6c2b2d5ac78dd9c2e152a0a0aa6ef47b','facture',227,'AC2001-0003','2020-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579388400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:200;s:9:\"total_tva\";d:39.2;s:9:\"total_ttc\";d:239.2;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:12:\"200.00000000\";s:23:\"multicurrency_total_tva\";s:11:\"39.20000000\";s:23:\"multicurrency_total_ttc\";s:12:\"239.20000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:6:\"19.600\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:12:\"200.00000000\";s:9:\"total_tva\";s:11:\"39.20000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:12:\"239.20000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0003\";s:11:\"note_public\";N;}',12,1,0,'2020-01-19 14:51:43','Alice Adminson',''),(42,'2020-01-19 14:01:26','BILL_VALIDATE',50.54000000,'107572ffe2f1ccf1ee4fe7b39c5a4ed40a485c1d37c926fbff8a0e420396d641','352ac5e380c996d7bff798c1369f8a85e86cc98a2864e278cbe0cb6b309c12a5','facture',228,'AC2001-0004','2020-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579388400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:48.6;s:9:\"total_tva\";d:1.94;s:9:\"total_ttc\";d:50.54;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:2:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"2.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"52.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"2.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"52.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:2;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"-1.40000000\";s:23:\"multicurrency_total_tva\";s:11:\"-0.06000000\";s:23:\"multicurrency_total_ttc\";s:11:\"-1.46000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"-1.40000000\";s:9:\"total_tva\";s:11:\"-0.06000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"-1.46000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0004\";s:11:\"note_public\";N;}',12,1,0,'2020-01-19 15:01:26','Alice Adminson',''),(43,'2020-01-19 14:04:53','BILL_VALIDATE',50.54000000,'795f9c5b741f360e3194ac8b3bb163c244b2761125f7507935baa44b319c624a','8cbb81e210f60d71b33a7fdcae0202721c2b4a8cdd59fe77ff2a8942839159b4','facture',228,'AC2001-0004','2020-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579388400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:48.6;s:9:\"total_tva\";d:1.94;s:9:\"total_ttc\";d:50.54;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:2:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"2.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"52.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"2.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"52.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:2;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"-1.40000000\";s:23:\"multicurrency_total_tva\";s:11:\"-0.06000000\";s:23:\"multicurrency_total_ttc\";s:11:\"-1.46000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"-1.40000000\";s:9:\"total_tva\";s:11:\"-0.06000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"-1.46000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0004\";s:11:\"note_public\";N;}',12,1,0,'2020-01-19 15:04:53','Alice Adminson',''),(44,'2020-01-19 14:13:07','BILL_VALIDATE',50.54000000,'0c5b79703d1db88579a1fdb74053596defebddb7a1e6d4c5c8b065729be10201','41669e482d1e5e7a58c132c2bf85bc75372cadb4d9b97047a98cc74a9d1fd767','facture',228,'AC2001-0004','2020-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579388400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:48.6;s:9:\"total_tva\";d:1.94;s:9:\"total_ttc\";d:50.54;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:2:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"2.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"52.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"2.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"52.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:2;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"-1.40000000\";s:23:\"multicurrency_total_tva\";s:11:\"-0.06000000\";s:23:\"multicurrency_total_ttc\";s:11:\"-1.46000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"-1.40000000\";s:9:\"total_tva\";s:11:\"-0.06000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"-1.46000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0004\";s:11:\"note_public\";N;}',12,1,0,'2020-01-19 15:13:07','Alice Adminson',''),(46,'2020-01-21 00:02:14','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'aacdc952cc25b2d4f90222cea6f684320c76477e55b87687397d82e70694c517','ce99e3278ebb1f5f2540a0d7205a4b1230e2e23c4bed48b567433b34786b88e4','subscription',2,'','2013-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579564934;s:5:\"dateh\";i:1374098400;s:5:\"datef\";i:1405548000;s:11:\"fk_adherent\";s:1:\"3\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:2;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2013\";}',12,1,0,'2020-01-21 01:02:14','Alice Adminson',''),(47,'2020-01-21 09:22:37','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'43a9804c627e78b20c7842a563099892a2d464b207f96bb393886f0b0ea52b4a','c6befc858191e428330c0054328f84d09f7be0f5603fb5b15e3a59980bb8e6eb','subscription',3,'','2017-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579598557;s:5:\"dateh\";i:1500328800;s:5:\"datef\";i:1531778400;s:11:\"fk_adherent\";s:1:\"4\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:3;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2017\";}',12,1,0,'2020-01-21 10:22:37','Alice Adminson',''),(48,'2020-01-21 09:23:17','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'d44357a1d55ffedd8f24690cd3c8aa43f9bfd33aa362ad558fd486b3b7f62a50','7c32d13e68bb245ab06b8e11efa5ed9e5fdb15650265dc80d5cb00d4674c134d','subscription',4,'','2017-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579598597;s:5:\"dateh\";i:1500328800;s:5:\"datef\";i:1531778400;s:11:\"fk_adherent\";s:1:\"2\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:4;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2017\";}',12,1,0,'2020-01-21 10:23:17','Alice Adminson',''),(49,'2020-01-21 09:23:17','BILL_VALIDATE',50.00000000,'30d0b37723f3cd2fce6afefd56cbdeb90f7cdee0e898e6ebaa411d84d3123ca0','e0301b9c4da11aa095a90cd9989b9fb6d0c635263cb2a8998b4ba57b60751d11','facture',229,'FA1707-0026','2017-07-18 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1500328800;s:10:\"ref_client\";s:0:\"\";s:4:\"type\";i:0;s:8:\"total_ht\";d:50;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:50;s:12:\"revenuestamp\";N;s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"50.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA1707-0026\";s:11:\"note_public\";s:0:\"\";}',12,1,0,'2020-01-21 10:23:17','Alice Adminson',''),(50,'2020-01-21 09:23:17','PAYMENT_CUSTOMER_CREATE',50.00000000,'41e6e00dfd2b96c3d9056489f22241959407ad0282405d37ada32da919e2d744','625ed1ef1ab9edddabc0b1588542eb6eac30ac9224e75812dabcbdfa0211b918','payment',41,'PAY2001-0007','2020-01-21 00:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY2001-0007\";s:4:\"date\";i:1579561200;s:9:\"type_code\";s:3:\"CHQ\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";N;s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:2:\"50\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1500328800;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA1707-0026\";s:11:\"note_public\";N;}}}s:6:\"amount\";i:50;}',12,1,0,'2020-01-21 10:23:17','Alice Adminson',''),(51,'2020-01-21 09:23:28','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'b24dfe36f8a3e5971898dd4fcfc61d775d4f0937169f44986bc9478d189e8e60','6160f4fb0fe73ce769a03f9d5460db7051602796090b9e44b51c6eadbd63c309','subscription',5,'','2018-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579598608;s:5:\"dateh\";i:1531864800;s:5:\"datef\";i:1563314400;s:11:\"fk_adherent\";s:1:\"2\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:5;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2018\";}',12,1,0,'2020-01-21 10:23:28','Alice Adminson',''),(52,'2020-01-21 09:23:28','BILL_VALIDATE',50.00000000,'a6ba6c4518b94977daa8a65b6e9063e81b37563037455ee4608724674c53ea01','3724c09a72bbaab46bdde59c79ffd5d439ffb43f2a509c49ebe05aa9acdcda7a','facture',230,'FA1807-0027','2018-07-18 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1531864800;s:10:\"ref_client\";s:0:\"\";s:4:\"type\";i:0;s:8:\"total_ht\";d:50;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:50;s:12:\"revenuestamp\";N;s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"50.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA1807-0027\";s:11:\"note_public\";s:0:\"\";}',12,1,0,'2020-01-21 10:23:28','Alice Adminson',''),(53,'2020-01-21 09:23:28','PAYMENT_CUSTOMER_CREATE',50.00000000,'54bbe038c35a0b1f63cccfbd89ce3232fc5dff8a56e7ff33bffebb9f412827bc','444449d4566c78f70a64b92d0008e9ddc933be75326cebdf5d41c4a94acdddc4','payment',42,'PAY2001-0008','2020-01-21 00:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY2001-0008\";s:4:\"date\";i:1579561200;s:9:\"type_code\";s:3:\"CHQ\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";N;s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:2:\"50\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1531864800;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA1807-0027\";s:11:\"note_public\";N;}}}s:6:\"amount\";i:50;}',12,1,0,'2020-01-21 10:23:28','Alice Adminson',''),(54,'2020-01-21 09:23:49','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'c4b9d402ebf74ae10353550d9ef1ce08c899b6533bdc5434fa105599da3e28ce','4642f26ec597360d7616ed0d925080970614232397fc17022922eecad2e727c9','subscription',6,'','2019-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579598629;s:5:\"dateh\";i:1563400800;s:5:\"datef\";i:1594936800;s:11:\"fk_adherent\";s:1:\"2\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:6;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2019\";}',12,1,0,'2020-01-21 10:23:49','Alice Adminson',''),(55,'2020-01-21 09:23:49','BILL_VALIDATE',50.00000000,'3e7b2c3b0b26c1982a3f8205b48a68756d81cd5bb673e1d2c7c09ce12c2086b9','ca332254195c3a59ee8c2ed0c60aec16a4229e83f5138f69747e65136ad370fa','facture',231,'FA1907-0028','2019-07-18 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1563400800;s:10:\"ref_client\";s:0:\"\";s:4:\"type\";i:0;s:8:\"total_ht\";d:50;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:50;s:12:\"revenuestamp\";N;s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"50.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA1907-0028\";s:11:\"note_public\";s:0:\"\";}',12,1,0,'2020-01-21 10:23:49','Alice Adminson',''),(56,'2020-01-21 09:23:49','PAYMENT_CUSTOMER_CREATE',50.00000000,'87cab3c0d2443145bb01b7364b78917756b2bf9b7908355b1a3258c28ecf1400','966571aa0fe244a6e762172fff34c03610ba4066f6f95369f514076c97975b6b','payment',43,'PAY2001-0009','2020-01-21 00:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY2001-0009\";s:4:\"date\";i:1579561200;s:9:\"type_code\";s:2:\"CB\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";N;s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:2:\"50\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1563400800;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA1907-0028\";s:11:\"note_public\";N;}}}s:6:\"amount\";i:50;}',12,1,0,'2020-01-21 10:23:49','Alice Adminson',''),(57,'2020-01-21 09:33:28','MODULE_RESET',0.00000000,'0000000000','d8134616ec977d8204a6856269ccfc799ea7eccc80074ac62350a5cdee3b070b','module',1,'systemevent','2020-01-21 10:33:28','O:8:\"stdClass\":6:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:2:\"id\";i:1;s:7:\"element\";s:6:\"module\";s:3:\"ref\";s:11:\"systemevent\";s:6:\"entity\";i:1;s:4:\"date\";i:1579599208;}',12,1,0,'2020-01-21 10:33:28','Alice Adminson','');
+INSERT INTO `llx_blockedlog` VALUES (20,'2018-03-16 09:57:22','MODULE_RESET',0.00000000,'d6dd5fe6c2eec2de6368f3b6da30188566f0a1a7be4b1589ccd8352d2c827ad5','fbc11d0396d9b76ea48f892bd5f0fe652e5bdf7d44873acb4bf1e1b70352bd30','module',1,'systemevent','2018-03-16 13:57:22','O:8:\"stdClass\":6:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:1:\"1\";s:7:\"idprof3\";s:1:\"1\";s:7:\"idprof4\";s:1:\"1\";s:7:\"idprof5\";s:1:\"1\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:9:\"FR1234567\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";s:4:\"name\";s:12:\"MyBigCompany\";}s:2:\"id\";i:1;s:7:\"element\";s:6:\"module\";s:3:\"ref\";s:11:\"systemevent\";s:6:\"entity\";i:1;s:4:\"date\";i:1521194242;}',12,1,0,'2018-03-16 13:57:22','Alice Adminson',''),(21,'2018-03-16 09:57:24','MODULE_SET',0.00000000,'d6b66df837d8d33bd8b9744e2afa46ab8c65ae8ca462246c406de19f8254e146','0a3aae975056417705f4eb7b4a4926384075cc2b6c899603715643c8f1d6ff9b','module',1,'systemevent','2018-03-16 13:57:24','O:8:\"stdClass\":6:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:1:\"1\";s:7:\"idprof3\";s:1:\"1\";s:7:\"idprof4\";s:1:\"1\";s:7:\"idprof5\";s:1:\"1\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:9:\"FR1234567\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";s:4:\"name\";s:12:\"MyBigCompany\";}s:2:\"id\";i:1;s:7:\"element\";s:6:\"module\";s:3:\"ref\";s:11:\"systemevent\";s:6:\"entity\";i:1;s:4:\"date\";i:1521194244;}',12,1,0,'2018-03-16 13:57:24','Alice Adminson',''),(22,'2018-03-16 09:59:31','PAYMENT_CUSTOMER_CREATE',10.00000000,'9beb9e3ba04582d441b49f176f995900c16572c789bcf48a1c9f285a74be76c8','86813eb2563252c0e270baaf1fffade82475fe51af5f88d14613005fd0e07783','payment',38,'PAY1803-0004','2018-03-16 12:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:1:\"1\";s:7:\"idprof3\";s:1:\"1\";s:7:\"idprof4\";s:1:\"1\";s:7:\"idprof5\";s:1:\"1\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:9:\"FR1234567\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";s:4:\"name\";s:12:\"MyBigCompany\";}s:3:\"ref\";s:12:\"PAY1803-0004\";s:4:\"date\";i:1521187200;s:9:\"type_code\";s:3:\"CHQ\";s:11:\"payment_num\";N;s:4:\"note\";s:0:\"\";s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:2:\"10\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";s:4:\"name\";s:10:\"Indian SAS\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1453147200;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:11:\"20.00000000\";s:9:\"total_tva\";s:10:\"1.80000000\";s:9:\"total_ttc\";s:11:\"23.60000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA1601-0024\";s:11:\"note_public\";N;}}}s:6:\"amount\";i:10;}',12,1,0,'2018-03-16 13:59:31','Alice Adminson',''),(23,'2019-09-26 15:33:37','BILL_VALIDATE',43.58000000,'6a1e049c00f51afa6eaca799e6281bd8abfdaa12bdf42ee2a002b0bec588a2a5','451b12ea66d25259c9c1df9993a902affe124c9f27c97093613cf7184fe388aa','facture',218,'FA1909-0025','2019-09-26 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1569448800;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";d:42.5;s:9:\"total_tva\";d:1.08;s:9:\"total_ttc\";d:43.58;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:5:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";s:9:\"DOLICLOUD\";s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:10:\"9.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:10:\"9.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"9.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"9.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:2;O:8:\"stdClass\":17:{s:3:\"ref\";s:9:\"DOLIDROID\";s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:10:\"5.50000000\";s:23:\"multicurrency_total_tva\";s:10:\"1.08000000\";s:23:\"multicurrency_total_ttc\";s:10:\"6.58000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:6:\"19.600\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"5.50000000\";s:9:\"total_tva\";s:10:\"1.08000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"6.58000000\";s:9:\"info_bits\";s:1:\"0\";}i:3;O:8:\"stdClass\":17:{s:3:\"ref\";s:9:\"DOLICLOUD\";s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:10:\"9.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:10:\"9.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"9.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"9.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:4;O:8:\"stdClass\":17:{s:3:\"ref\";s:9:\"DOLICLOUD\";s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:10:\"9.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:10:\"9.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"9.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"9.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:5;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"10.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"10.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"10.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"10.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA1909-0025\";s:11:\"note_public\";N;}',12,1,0,'2019-09-26 17:33:37','Alice Adminson',''),(24,'2019-10-04 08:27:00','BILL_VALIDATE',5.63000000,'aa16d46e6ea7376fe0f91a4aeb7b1d534ed351fae071ded64c393e61269c4c35','316e03ffb8327d837c8601e7dbafc91509581b0be9449a89827a14e6cfa2688a','facture',150,'FA6801-0010','2018-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1516316400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";d:5;s:9:\"total_tva\";d:0.63;s:9:\"total_ttc\";d:5.63;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";s:7:\"PEARPIE\";s:18:\"multicurrency_code\";N;s:22:\"multicurrency_total_ht\";s:10:\"5.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.63000000\";s:23:\"multicurrency_total_ttc\";s:10:\"5.63000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:6:\"12.500\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"5.00000000\";s:9:\"total_tva\";s:10:\"0.63000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"5.63000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA6801-0010\";s:11:\"note_public\";N;}',12,1,0,'2019-10-04 10:27:00','Alice Adminson',''),(25,'2019-10-04 08:28:14','PAYMENT_CUSTOMER_CREATE',5.63000000,'fa5c9b4bb975af8401744390d47e62218a7ec47a2e96c60f5e58d7f6be38dc44','9bfe069dc130dd71c31f914ff0afa7835fd40932790ac88be0005638342ccb87','payment',39,'PAY1801-0005','2018-01-19 12:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY1801-0005\";s:4:\"date\";i:1516359600;s:9:\"type_code\";s:3:\"LIQ\";s:11:\"payment_num\";N;s:4:\"note\";s:0:\"\";s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:4:\"5.63\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1516316400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:10:\"5.00000000\";s:9:\"total_tva\";s:10:\"0.63000000\";s:9:\"total_ttc\";s:10:\"5.63000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA6801-0010\";s:11:\"note_public\";N;}}}s:6:\"amount\";d:5.63;}',12,1,0,'2019-10-04 10:28:14','Alice Adminson',''),(26,'2019-12-22 19:01:48','CASHCONTROL_VALIDATE',400.00000000,'bb14150a5ea65d97f9d22f6bc3d3d357ccfb2aa681f2ecbcc81a9d870260c58c','7b03131558731b2e7b4000189214b132f4323621c596d4418cfeba233a085e83','cashcontrol',1,'1','2019-12-22 23:01:02','O:8:\"stdClass\":37:{s:9:\"mycompany\";O:8:\"stdClass\":26:{s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:0;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:0;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;}s:7:\"element\";s:11:\"cashcontrol\";s:2:\"id\";i:1;s:7:\"opening\";d:-324.29;s:6:\"status\";i:1;s:10:\"year_close\";i:2019;s:11:\"month_close\";i:11;s:9:\"day_close\";N;s:9:\"posmodule\";s:7:\"takepos\";s:9:\"posnumber\";s:1:\"1\";s:4:\"cash\";d:400;s:6:\"cheque\";d:0;s:4:\"card\";d:0;s:10:\"date_valid\";i:1577041308;s:13:\"date_creation\";i:1577041262;s:17:\"date_modification\";N;s:10:\"import_key\";N;s:13:\"array_options\";a:0:{}s:6:\"canvas\";N;s:7:\"project\";N;s:10:\"fk_project\";N;s:10:\"thirdparty\";N;s:4:\"user\";N;s:3:\"ref\";s:1:\"1\";s:7:\"ref_ext\";N;s:6:\"statut\";N;s:10:\"fk_account\";N;s:11:\"note_public\";N;s:12:\"note_private\";N;s:4:\"note\";N;s:8:\"comments\";a:0:{}s:15:\"date_validation\";N;s:16:\"next_prev_filter\";N;s:6:\"entity\";i:1;s:5:\"label\";N;s:3:\"tms\";i:1577030462;s:13:\"fk_user_valid\";s:2:\"12\";}',12,1,0,'2019-12-22 23:01:48','Alice Adminson',''),(34,'2020-01-10 00:42:47','PAYMENT_VARIOUS_CREATE',10.00000000,'e20ec32652d7564cdca915e95528b68bd3b770b82defe64ead1af3f6dc6bc150','25514deeca716e41c02699d9466fc640f4b7da0a0c953637b542c555f9634f9b','payment_various',4,'4','2020-01-10 12:00:00','O:8:\"stdClass\":7:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";i:4;s:4:\"date\";i:1578643200;s:9:\"type_code\";s:3:\"VIR\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";s:0:\"\";s:6:\"amount\";i:10;}',12,1,0,'2020-01-10 04:42:47','Alice Adminson',''),(35,'2020-01-10 01:08:37','PAYMENT_VARIOUS_MODIFY',10.00000000,'94bd3491e8e553e6e633cd4a40c8c0ef3a6af0bd60df1d8e768d3c8c2a37b79b','eeadf2ffc7bd611e3b739e8825307f9e9cb2d9dddbd9e16b1f092fa5d881a5ca','payment_various',4,'4','2020-01-10 00:00:00','O:8:\"stdClass\":7:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:1:\"4\";s:4:\"date\";i:1578600000;s:9:\"type_code\";s:3:\"VIR\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";s:0:\"\";s:6:\"amount\";d:10;}',12,1,0,'2020-01-10 05:08:37','Alice Adminson',''),(36,'2020-01-10 01:08:43','PAYMENT_VARIOUS_MODIFY',10.00000000,'02ecc274221832fcbf8f525ed64f1391415a29dded01022a5a4c51cfb2c5ad49','c274f2f609af56bd40b74000eaa2f6866a734feb0fc262ce3431ac9f91a754e2','payment_various',4,'4','2020-01-10 00:00:00','O:8:\"stdClass\":7:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:1:\"4\";s:4:\"date\";i:1578600000;s:9:\"type_code\";s:0:\"\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";s:0:\"\";s:6:\"amount\";d:10;}',12,1,0,'2020-01-10 05:08:43','Alice Adminson',''),(37,'2020-01-10 01:17:51','PAYMENT_VARIOUS_MODIFY',10.00000000,'214ad5673f893c2da41a8c87ccbcae92dccf17c9d4a13b3d04a9497d21bf68b8','ffbebb278eaa1c75f0cf5afdd05c8367887615a7329f2b3ab628b8f0da10f9d8','payment_various',4,'4','2020-01-10 00:00:00','O:8:\"stdClass\":7:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:1:\"4\";s:4:\"date\";i:1578600000;s:9:\"type_code\";s:0:\"\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";s:0:\"\";s:6:\"amount\";d:10;}',12,1,0,'2020-01-10 05:17:51','Alice Adminson',''),(38,'2020-01-16 01:22:16','BILL_VALIDATE',123.00000000,'aae0a1eb8b3da6686020252194f47ce82301fb604ee213ae120a2885197735d5','b414061da9abbd2dec7153a7d53978c177c5c5f55ed8ace177a02e46e7a74312','facture',221,'AC2001-0001','2020-01-16 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:16:\"Magic Food Store\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:22:\"65 holdywood boulevard\";s:3:\"zip\";s:6:\"123456\";s:4:\"town\";s:7:\"BigTown\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";s:4:\"0101\";s:5:\"email\";s:18:\"myemail@domain.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:10:\"10/10/2010\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1301-0008\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"ES\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579129200;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:123;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:123;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:12:\"123.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:12:\"123.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:12:\"123.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:12:\"123.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0001\";s:11:\"note_public\";N;}',12,1,0,'2020-01-16 02:22:16','Alice Adminson',''),(39,'2020-01-16 01:33:27','BILL_VALIDATE',20.50000000,'777eb88a0b91c6d376881534a7c84a9b9ee5a6d7efedbae3b0c00d7e36bacba9','b78e5b5909c49c575142b429f2d09abb2d19c5545f815a1cabe0f2ed80ded6e4','facture',224,'AC2001-0002','2020-01-16 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:16:\"Magic Food Store\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:22:\"65 holdywood boulevard\";s:3:\"zip\";s:6:\"123456\";s:4:\"town\";s:7:\"BigTown\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";s:4:\"0101\";s:5:\"email\";s:18:\"myemail@domain.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:10:\"10/10/2010\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1301-0008\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"ES\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579129200;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:20.5;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:20.5;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"20.50000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"20.50000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"20.50000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"20.50000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0002\";s:11:\"note_public\";N;}',12,1,0,'2020-01-16 02:33:27','Alice Adminson',''),(40,'2020-01-16 01:36:48','PAYMENT_CUSTOMER_CREATE',20.50000000,'cb03ceef89e1630e5a3ba8b3b1ca6c77e42b97fc2884a661c04e9e5c8b3afa1e','18bed0f0566b20ffa32c49c901cfc8b46485ef2172b22c676cef07ce8bd2d90b','payment',40,'PAY2001-0006','2020-01-16 12:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY2001-0006\";s:4:\"date\";i:1579172400;s:9:\"type_code\";s:3:\"VIR\";s:11:\"payment_num\";N;s:4:\"note\";s:0:\"\";s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:4:\"20.5\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:16:\"Magic Food Store\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:22:\"65 holdywood boulevard\";s:3:\"zip\";s:6:\"123456\";s:4:\"town\";s:7:\"BigTown\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";s:4:\"0101\";s:5:\"email\";s:18:\"myemail@domain.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:10:\"10/10/2010\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1301-0008\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"ES\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1579129200;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";s:11:\"20.50000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"20.50000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"AC2001-0002\";s:11:\"note_public\";N;}}}s:6:\"amount\";d:20.5;}',12,1,0,'2020-01-16 02:36:48','Alice Adminson',''),(41,'2020-01-19 13:51:43','BILL_VALIDATE',239.20000000,'7f38eaf315003f652b72fd27e55e71010a5ed0339086aa100b9a91a6045bb06f','26d074106c5f096ea1795ce7ed399cda6c2b2d5ac78dd9c2e152a0a0aa6ef47b','facture',227,'AC2001-0003','2020-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579388400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:200;s:9:\"total_tva\";d:39.2;s:9:\"total_ttc\";d:239.2;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:12:\"200.00000000\";s:23:\"multicurrency_total_tva\";s:11:\"39.20000000\";s:23:\"multicurrency_total_ttc\";s:12:\"239.20000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:6:\"19.600\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:12:\"200.00000000\";s:9:\"total_tva\";s:11:\"39.20000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:12:\"239.20000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0003\";s:11:\"note_public\";N;}',12,1,0,'2020-01-19 14:51:43','Alice Adminson',''),(42,'2020-01-19 14:01:26','BILL_VALIDATE',50.54000000,'107572ffe2f1ccf1ee4fe7b39c5a4ed40a485c1d37c926fbff8a0e420396d641','352ac5e380c996d7bff798c1369f8a85e86cc98a2864e278cbe0cb6b309c12a5','facture',228,'AC2001-0004','2020-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579388400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:48.6;s:9:\"total_tva\";d:1.94;s:9:\"total_ttc\";d:50.54;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:2:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"2.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"52.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"2.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"52.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:2;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"-1.40000000\";s:23:\"multicurrency_total_tva\";s:11:\"-0.06000000\";s:23:\"multicurrency_total_ttc\";s:11:\"-1.46000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"-1.40000000\";s:9:\"total_tva\";s:11:\"-0.06000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"-1.46000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0004\";s:11:\"note_public\";N;}',12,1,0,'2020-01-19 15:01:26','Alice Adminson',''),(43,'2020-01-19 14:04:53','BILL_VALIDATE',50.54000000,'795f9c5b741f360e3194ac8b3bb163c244b2761125f7507935baa44b319c624a','8cbb81e210f60d71b33a7fdcae0202721c2b4a8cdd59fe77ff2a8942839159b4','facture',228,'AC2001-0004','2020-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579388400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:48.6;s:9:\"total_tva\";d:1.94;s:9:\"total_ttc\";d:50.54;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:2:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"2.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"52.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"2.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"52.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:2;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"-1.40000000\";s:23:\"multicurrency_total_tva\";s:11:\"-0.06000000\";s:23:\"multicurrency_total_ttc\";s:11:\"-1.46000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"-1.40000000\";s:9:\"total_tva\";s:11:\"-0.06000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"-1.46000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0004\";s:11:\"note_public\";N;}',12,1,0,'2020-01-19 15:04:53','Alice Adminson',''),(44,'2020-01-19 14:13:07','BILL_VALIDATE',50.54000000,'0c5b79703d1db88579a1fdb74053596defebddb7a1e6d4c5c8b065729be10201','41669e482d1e5e7a58c132c2bf85bc75372cadb4d9b97047a98cc74a9d1fd767','facture',228,'AC2001-0004','2020-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579388400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:48.6;s:9:\"total_tva\";d:1.94;s:9:\"total_ttc\";d:50.54;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:2:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"2.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"52.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"2.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"52.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:2;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"-1.40000000\";s:23:\"multicurrency_total_tva\";s:11:\"-0.06000000\";s:23:\"multicurrency_total_ttc\";s:11:\"-1.46000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"-1.40000000\";s:9:\"total_tva\";s:11:\"-0.06000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"-1.46000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0004\";s:11:\"note_public\";N;}',12,1,0,'2020-01-19 15:13:07','Alice Adminson',''),(46,'2020-01-21 00:02:14','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'aacdc952cc25b2d4f90222cea6f684320c76477e55b87687397d82e70694c517','ce99e3278ebb1f5f2540a0d7205a4b1230e2e23c4bed48b567433b34786b88e4','subscription',2,'','2013-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579564934;s:5:\"dateh\";i:1374098400;s:5:\"datef\";i:1405548000;s:11:\"fk_adherent\";s:1:\"3\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:2;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2013\";}',12,1,0,'2020-01-21 01:02:14','Alice Adminson',''),(47,'2020-01-21 09:22:37','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'43a9804c627e78b20c7842a563099892a2d464b207f96bb393886f0b0ea52b4a','c6befc858191e428330c0054328f84d09f7be0f5603fb5b15e3a59980bb8e6eb','subscription',3,'','2017-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579598557;s:5:\"dateh\";i:1500328800;s:5:\"datef\";i:1531778400;s:11:\"fk_adherent\";s:1:\"4\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:3;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2017\";}',12,1,0,'2020-01-21 10:22:37','Alice Adminson',''),(48,'2020-01-21 09:23:17','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'d44357a1d55ffedd8f24690cd3c8aa43f9bfd33aa362ad558fd486b3b7f62a50','7c32d13e68bb245ab06b8e11efa5ed9e5fdb15650265dc80d5cb00d4674c134d','subscription',4,'','2017-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579598597;s:5:\"dateh\";i:1500328800;s:5:\"datef\";i:1531778400;s:11:\"fk_adherent\";s:1:\"2\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:4;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2017\";}',12,1,0,'2020-01-21 10:23:17','Alice Adminson',''),(49,'2020-01-21 09:23:17','BILL_VALIDATE',50.00000000,'30d0b37723f3cd2fce6afefd56cbdeb90f7cdee0e898e6ebaa411d84d3123ca0','e0301b9c4da11aa095a90cd9989b9fb6d0c635263cb2a8998b4ba57b60751d11','facture',229,'FA1707-0026','2017-07-18 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1500328800;s:10:\"ref_client\";s:0:\"\";s:4:\"type\";i:0;s:8:\"total_ht\";d:50;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:50;s:12:\"revenuestamp\";N;s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"50.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA1707-0026\";s:11:\"note_public\";s:0:\"\";}',12,1,0,'2020-01-21 10:23:17','Alice Adminson',''),(50,'2020-01-21 09:23:17','PAYMENT_CUSTOMER_CREATE',50.00000000,'41e6e00dfd2b96c3d9056489f22241959407ad0282405d37ada32da919e2d744','625ed1ef1ab9edddabc0b1588542eb6eac30ac9224e75812dabcbdfa0211b918','payment',41,'PAY2001-0007','2020-01-21 00:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY2001-0007\";s:4:\"date\";i:1579561200;s:9:\"type_code\";s:3:\"CHQ\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";N;s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:2:\"50\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1500328800;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA1707-0026\";s:11:\"note_public\";N;}}}s:6:\"amount\";i:50;}',12,1,0,'2020-01-21 10:23:17','Alice Adminson',''),(51,'2020-01-21 09:23:28','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'b24dfe36f8a3e5971898dd4fcfc61d775d4f0937169f44986bc9478d189e8e60','6160f4fb0fe73ce769a03f9d5460db7051602796090b9e44b51c6eadbd63c309','subscription',5,'','2018-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579598608;s:5:\"dateh\";i:1531864800;s:5:\"datef\";i:1563314400;s:11:\"fk_adherent\";s:1:\"2\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:5;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2018\";}',12,1,0,'2020-01-21 10:23:28','Alice Adminson',''),(52,'2020-01-21 09:23:28','BILL_VALIDATE',50.00000000,'a6ba6c4518b94977daa8a65b6e9063e81b37563037455ee4608724674c53ea01','3724c09a72bbaab46bdde59c79ffd5d439ffb43f2a509c49ebe05aa9acdcda7a','facture',230,'FA1807-0027','2018-07-18 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1531864800;s:10:\"ref_client\";s:0:\"\";s:4:\"type\";i:0;s:8:\"total_ht\";d:50;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:50;s:12:\"revenuestamp\";N;s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"50.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA1807-0027\";s:11:\"note_public\";s:0:\"\";}',12,1,0,'2020-01-21 10:23:28','Alice Adminson',''),(53,'2020-01-21 09:23:28','PAYMENT_CUSTOMER_CREATE',50.00000000,'54bbe038c35a0b1f63cccfbd89ce3232fc5dff8a56e7ff33bffebb9f412827bc','444449d4566c78f70a64b92d0008e9ddc933be75326cebdf5d41c4a94acdddc4','payment',42,'PAY2001-0008','2020-01-21 00:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY2001-0008\";s:4:\"date\";i:1579561200;s:9:\"type_code\";s:3:\"CHQ\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";N;s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:2:\"50\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1531864800;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA1807-0027\";s:11:\"note_public\";N;}}}s:6:\"amount\";i:50;}',12,1,0,'2020-01-21 10:23:28','Alice Adminson',''),(54,'2020-01-21 09:23:49','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'c4b9d402ebf74ae10353550d9ef1ce08c899b6533bdc5434fa105599da3e28ce','4642f26ec597360d7616ed0d925080970614232397fc17022922eecad2e727c9','subscription',6,'','2019-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579598629;s:5:\"dateh\";i:1563400800;s:5:\"datef\";i:1594936800;s:11:\"fk_adherent\";s:1:\"2\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:6;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2019\";}',12,1,0,'2020-01-21 10:23:49','Alice Adminson',''),(55,'2020-01-21 09:23:49','BILL_VALIDATE',50.00000000,'3e7b2c3b0b26c1982a3f8205b48a68756d81cd5bb673e1d2c7c09ce12c2086b9','ca332254195c3a59ee8c2ed0c60aec16a4229e83f5138f69747e65136ad370fa','facture',231,'FA1907-0028','2019-07-18 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1563400800;s:10:\"ref_client\";s:0:\"\";s:4:\"type\";i:0;s:8:\"total_ht\";d:50;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:50;s:12:\"revenuestamp\";N;s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"50.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA1907-0028\";s:11:\"note_public\";s:0:\"\";}',12,1,0,'2020-01-21 10:23:49','Alice Adminson',''),(56,'2020-01-21 09:23:49','PAYMENT_CUSTOMER_CREATE',50.00000000,'87cab3c0d2443145bb01b7364b78917756b2bf9b7908355b1a3258c28ecf1400','966571aa0fe244a6e762172fff34c03610ba4066f6f95369f514076c97975b6b','payment',43,'PAY2001-0009','2020-01-21 00:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY2001-0009\";s:4:\"date\";i:1579561200;s:9:\"type_code\";s:2:\"CB\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";N;s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:2:\"50\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1563400800;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA1907-0028\";s:11:\"note_public\";N;}}}s:6:\"amount\";i:50;}',12,1,0,'2020-01-21 10:23:49','Alice Adminson',''),(57,'2020-01-21 09:33:28','MODULE_RESET',0.00000000,'0000000000','d8134616ec977d8204a6856269ccfc799ea7eccc80074ac62350a5cdee3b070b','module',1,'systemevent','2020-01-21 10:33:28','O:8:\"stdClass\":6:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:2:\"id\";i:1;s:7:\"element\";s:6:\"module\";s:3:\"ref\";s:11:\"systemevent\";s:6:\"entity\";i:1;s:4:\"date\";i:1579599208;}',12,1,0,'2020-01-21 10:33:28','Alice Adminson',''),(58,'2020-12-10 12:31:17','MODULE_SET',0.00000000,'1f651fa26c45e58ae8303d336a35eddef44c398d225744ad49f803355cdadb43','dce54650a53002c6dc3dbffad2600c13ce08d19b5fa23811b8d2a31d75ac6a60','module',1,'systemevent','2020-12-10 13:31:17','O:8:\"stdClass\":6:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:2:\"id\";i:1;s:7:\"element\";s:6:\"module\";s:3:\"ref\";s:11:\"systemevent\";s:6:\"entity\";s:1:\"1\";s:4:\"date\";i:1607603477;}',12,1,0,'2020-12-10 13:31:17','Alice Adminson','');
 /*!40000 ALTER TABLE `llx_blockedlog` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1089,9 +1442,10 @@ CREATE TABLE `llx_bom_bom` (
   `fk_user_valid` int(11) DEFAULT NULL,
   `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
   `status` int(11) NOT NULL,
-  `duration` double(8,4) DEFAULT NULL,
+  `duration` double(24,8) DEFAULT NULL,
   `fk_warehouse` int(11) DEFAULT NULL,
   `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `bomtype` int(11) DEFAULT 0,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_bom_bom_ref` (`ref`,`entity`),
   KEY `idx_bom_bom_rowid` (`rowid`),
@@ -1109,7 +1463,7 @@ CREATE TABLE `llx_bom_bom` (
 
 LOCK TABLES `llx_bom_bom` WRITE;
 /*!40000 ALTER TABLE `llx_bom_bom` DISABLE KEYS */;
-INSERT INTO `llx_bom_bom` VALUES (6,1,'BOM1911-0001','BOM For the Home Apple Pie',NULL,NULL,NULL,4,1.00000000,1.0000,'2019-11-28 18:17:12','2020-01-08 15:41:49','2020-01-08 19:41:49',12,12,12,NULL,1,NULL,NULL,'generic_bom_odt:/home/ldestailleur/git/dolibarr_11.0/documents/doctemplates/boms/template_bom.odt');
+INSERT INTO `llx_bom_bom` VALUES (6,1,'BOM1911-0001','BOM For the Home Apple Pie',NULL,NULL,NULL,4,1.00000000,1.0000,'2019-11-28 18:17:12','2020-01-08 15:41:49','2020-01-08 19:41:49',12,12,12,NULL,1,NULL,NULL,'generic_bom_odt:/home/ldestailleur/git/dolibarr_11.0/documents/doctemplates/boms/template_bom.odt',0);
 /*!40000 ALTER TABLE `llx_bom_bom` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1125,7 +1479,8 @@ CREATE TABLE `llx_bom_bom_extrafields` (
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_object` int(11) NOT NULL,
   `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
+  PRIMARY KEY (`rowid`),
+  KEY `idx_bom_bom_extrafields_fk_object` (`fk_object`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -1317,7 +1672,7 @@ CREATE TABLE `llx_boxes_def` (
   `note` varchar(130) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_boxes_def` (`file`,`entity`,`note`)
-) ENGINE=InnoDB AUTO_INCREMENT=446 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=448 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1326,7 +1681,7 @@ CREATE TABLE `llx_boxes_def` (
 
 LOCK TABLES `llx_boxes_def` WRITE;
 /*!40000 ALTER TABLE `llx_boxes_def` DISABLE KEYS */;
-INSERT INTO `llx_boxes_def` VALUES (323,'box_actions.php',2,'2015-03-13 15:29:19',NULL),(324,'box_clients.php',2,'2015-03-13 20:21:35',NULL),(325,'box_prospect.php',2,'2015-03-13 20:21:35',NULL),(326,'box_contacts.php',2,'2015-03-13 20:21:35',NULL),(327,'box_activity.php',2,'2015-03-13 20:21:35','(WarningUsingThisBoxSlowDown)'),(328,'box_propales.php',2,'2015-03-13 20:32:38',NULL),(329,'box_comptes.php',2,'2015-03-13 20:33:09',NULL),(330,'box_factures_imp.php',2,'2015-03-13 20:33:09',NULL),(331,'box_factures.php',2,'2015-03-13 20:33:09',NULL),(332,'box_produits.php',2,'2015-03-13 20:33:09',NULL),(333,'box_produits_alerte_stock.php',2,'2015-03-13 20:33:09',NULL),(347,'box_clients.php',1,'2017-11-15 22:05:57',NULL),(348,'box_prospect.php',1,'2017-11-15 22:05:57',NULL),(349,'box_contacts.php',1,'2017-11-15 22:05:57',NULL),(350,'box_activity.php',1,'2017-11-15 22:05:57','(WarningUsingThisBoxSlowDown)'),(374,'box_services_contracts.php',1,'2017-11-15 22:38:37',NULL),(377,'box_project.php',1,'2017-11-15 22:38:44',NULL),(378,'box_task.php',1,'2017-11-15 22:38:44',NULL),(388,'box_contracts.php',1,'2017-11-15 22:39:52',NULL),(389,'box_services_expired.php',1,'2017-11-15 22:39:52',NULL),(390,'box_ficheinter.php',1,'2017-11-15 22:39:56',NULL),(392,'box_graph_propales_permonth.php',1,'2017-11-15 22:41:47',NULL),(393,'box_propales.php',1,'2017-11-15 22:41:47',NULL),(396,'box_graph_product_distribution.php',1,'2017-11-15 22:41:47',NULL),(403,'box_goodcustomers.php',1,'2018-07-30 11:13:20','(WarningUsingThisBoxSlowDown)'),(404,'box_external_rss.php',1,'2018-07-30 11:15:25','1 (Dolibarr.org News)'),(409,'box_produits.php',1,'2018-07-30 13:38:11',NULL),(410,'box_produits_alerte_stock.php',1,'2018-07-30 13:38:11',NULL),(411,'box_commandes.php',1,'2018-07-30 13:38:11',NULL),(412,'box_graph_orders_permonth.php',1,'2018-07-30 13:38:11',NULL),(413,'box_graph_invoices_supplier_permonth.php',1,'2018-07-30 13:38:11',NULL),(414,'box_graph_orders_supplier_permonth.php',1,'2018-07-30 13:38:11',NULL),(415,'box_fournisseurs.php',1,'2018-07-30 13:38:11',NULL),(416,'box_factures_fourn_imp.php',1,'2018-07-30 13:38:11',NULL),(417,'box_factures_fourn.php',1,'2018-07-30 13:38:11',NULL),(418,'box_supplier_orders.php',1,'2018-07-30 13:38:11',NULL),(419,'box_actions.php',1,'2018-07-30 15:42:32',NULL),(424,'box_factures_imp.php',1,'2017-02-07 18:56:12',NULL),(425,'box_factures.php',1,'2017-02-07 18:56:12',NULL),(426,'box_graph_invoices_permonth.php',1,'2017-02-07 18:56:12',NULL),(427,'box_comptes.php',1,'2017-02-07 18:56:12',NULL),(429,'box_lastlogin.php',1,'2017-08-27 13:29:14',NULL),(430,'box_bookmarks.php',1,'2018-01-19 11:27:34',NULL),(431,'box_members.php',1,'2018-01-19 11:27:56',NULL),(432,'box_birthdays.php',1,'2019-06-05 08:45:40',NULL),(433,'box_last_ticket',1,'2019-06-05 09:15:29',NULL),(434,'box_last_modified_ticket',1,'2019-06-05 09:15:29',NULL),(436,'box_accountancy_last_manual_entries.php',1,'2019-11-28 11:52:58',NULL),(437,'box_accountancy_suspense_account.php',1,'2019-11-28 11:52:58',NULL),(438,'box_supplier_orders_awaiting_reception.php',1,'2019-11-28 11:52:59',NULL),(439,'box_mos.php',1,'2019-11-29 08:57:42',NULL),(445,'box_shipments.php',1,'2020-01-13 14:38:20',NULL);
+INSERT INTO `llx_boxes_def` VALUES (323,'box_actions.php',2,'2015-03-13 15:29:19',NULL),(324,'box_clients.php',2,'2015-03-13 20:21:35',NULL),(325,'box_prospect.php',2,'2015-03-13 20:21:35',NULL),(326,'box_contacts.php',2,'2015-03-13 20:21:35',NULL),(327,'box_activity.php',2,'2015-03-13 20:21:35','(WarningUsingThisBoxSlowDown)'),(328,'box_propales.php',2,'2015-03-13 20:32:38',NULL),(329,'box_comptes.php',2,'2015-03-13 20:33:09',NULL),(330,'box_factures_imp.php',2,'2015-03-13 20:33:09',NULL),(331,'box_factures.php',2,'2015-03-13 20:33:09',NULL),(332,'box_produits.php',2,'2015-03-13 20:33:09',NULL),(333,'box_produits_alerte_stock.php',2,'2015-03-13 20:33:09',NULL),(347,'box_clients.php',1,'2017-11-15 22:05:57',NULL),(348,'box_prospect.php',1,'2017-11-15 22:05:57',NULL),(349,'box_contacts.php',1,'2017-11-15 22:05:57',NULL),(350,'box_activity.php',1,'2017-11-15 22:05:57','(WarningUsingThisBoxSlowDown)'),(374,'box_services_contracts.php',1,'2017-11-15 22:38:37',NULL),(377,'box_project.php',1,'2017-11-15 22:38:44',NULL),(378,'box_task.php',1,'2017-11-15 22:38:44',NULL),(388,'box_contracts.php',1,'2017-11-15 22:39:52',NULL),(389,'box_services_expired.php',1,'2017-11-15 22:39:52',NULL),(390,'box_ficheinter.php',1,'2017-11-15 22:39:56',NULL),(392,'box_graph_propales_permonth.php',1,'2017-11-15 22:41:47',NULL),(393,'box_propales.php',1,'2017-11-15 22:41:47',NULL),(396,'box_graph_product_distribution.php',1,'2017-11-15 22:41:47',NULL),(403,'box_goodcustomers.php',1,'2018-07-30 11:13:20','(WarningUsingThisBoxSlowDown)'),(404,'box_external_rss.php',1,'2018-07-30 11:15:25','1 (Dolibarr.org News)'),(409,'box_produits.php',1,'2018-07-30 13:38:11',NULL),(410,'box_produits_alerte_stock.php',1,'2018-07-30 13:38:11',NULL),(411,'box_commandes.php',1,'2018-07-30 13:38:11',NULL),(412,'box_graph_orders_permonth.php',1,'2018-07-30 13:38:11',NULL),(413,'box_graph_invoices_supplier_permonth.php',1,'2018-07-30 13:38:11',NULL),(414,'box_graph_orders_supplier_permonth.php',1,'2018-07-30 13:38:11',NULL),(415,'box_fournisseurs.php',1,'2018-07-30 13:38:11',NULL),(416,'box_factures_fourn_imp.php',1,'2018-07-30 13:38:11',NULL),(417,'box_factures_fourn.php',1,'2018-07-30 13:38:11',NULL),(418,'box_supplier_orders.php',1,'2018-07-30 13:38:11',NULL),(419,'box_actions.php',1,'2018-07-30 15:42:32',NULL),(424,'box_factures_imp.php',1,'2017-02-07 18:56:12',NULL),(425,'box_factures.php',1,'2017-02-07 18:56:12',NULL),(426,'box_graph_invoices_permonth.php',1,'2017-02-07 18:56:12',NULL),(427,'box_comptes.php',1,'2017-02-07 18:56:12',NULL),(429,'box_lastlogin.php',1,'2017-08-27 13:29:14',NULL),(430,'box_bookmarks.php',1,'2018-01-19 11:27:34',NULL),(431,'box_members.php',1,'2018-01-19 11:27:56',NULL),(432,'box_birthdays.php',1,'2019-06-05 08:45:40',NULL),(433,'box_last_ticket',1,'2019-06-05 09:15:29',NULL),(434,'box_last_modified_ticket',1,'2019-06-05 09:15:29',NULL),(436,'box_accountancy_last_manual_entries.php',1,'2019-11-28 11:52:58',NULL),(437,'box_accountancy_suspense_account.php',1,'2019-11-28 11:52:58',NULL),(438,'box_supplier_orders_awaiting_reception.php',1,'2019-11-28 11:52:59',NULL),(439,'box_mos.php',1,'2019-11-29 08:57:42',NULL),(445,'box_shipments.php',1,'2020-01-13 14:38:20',NULL),(446,'box_funnel_of_prospection.php',1,'2020-12-10 12:24:40',NULL),(447,'box_customers_outstanding_bill_reached.php',1,'2020-12-10 12:24:40',NULL);
 /*!40000 ALTER TABLE `llx_boxes_def` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1438,7 +1793,7 @@ DROP TABLE IF EXISTS `llx_c_action_trigger`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_action_trigger` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
   `label` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
   `description` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `elementtype` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
@@ -1446,7 +1801,7 @@ CREATE TABLE `llx_c_action_trigger` (
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_action_trigger_code` (`code`),
   KEY `idx_action_trigger_rang` (`rang`)
-) ENGINE=InnoDB AUTO_INCREMENT=365 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=376 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1455,7 +1810,7 @@ CREATE TABLE `llx_c_action_trigger` (
 
 LOCK TABLES `llx_c_action_trigger` WRITE;
 /*!40000 ALTER TABLE `llx_c_action_trigger` DISABLE KEYS */;
-INSERT INTO `llx_c_action_trigger` VALUES (131,'COMPANY_SENTBYMAIL','Mails sent from third party card','Executed when you send email from third party card','societe',1),(132,'COMPANY_CREATE','Third party created','Executed when a third party is created','societe',1),(133,'PROPAL_VALIDATE','Customer proposal validated','Executed when a commercial proposal is validated','propal',2),(134,'PROPAL_SENTBYMAIL','Commercial proposal sent by mail','Executed when a commercial proposal is sent by mail','propal',3),(135,'ORDER_VALIDATE','Customer order validate','Executed when a customer order is validated','commande',4),(136,'ORDER_CLOSE','Customer order classify delivered','Executed when a customer order is set delivered','commande',5),(137,'ORDER_CLASSIFY_BILLED','Customer order classify billed','Executed when a customer order is set to billed','commande',5),(138,'ORDER_CANCEL','Customer order canceled','Executed when a customer order is canceled','commande',5),(139,'ORDER_SENTBYMAIL','Customer order sent by mail','Executed when a customer order is sent by mail ','commande',5),(140,'BILL_VALIDATE','Customer invoice validated','Executed when a customer invoice is approved','facture',6),(141,'BILL_PAYED','Customer invoice payed','Executed when a customer invoice is payed','facture',7),(142,'BILL_CANCEL','Customer invoice canceled','Executed when a customer invoice is conceled','facture',8),(143,'BILL_SENTBYMAIL','Customer invoice sent by mail','Executed when a customer invoice is sent by mail','facture',9),(144,'BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',10),(145,'ORDER_SUPPLIER_VALIDATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11),(146,'ORDER_SUPPLIER_APPROVE','Supplier order request approved','Executed when a supplier order is approved','order_supplier',12),(147,'ORDER_SUPPLIER_REFUSE','Supplier order request refused','Executed when a supplier order is refused','order_supplier',13),(148,'ORDER_SUPPLIER_SENTBYMAIL','Supplier order sent by mail','Executed when a supplier order is sent by mail','order_supplier',14),(149,'BILL_SUPPLIER_VALIDATE','Supplier invoice validated','Executed when a supplier invoice is validated','invoice_supplier',15),(150,'BILL_SUPPLIER_PAYED','Supplier invoice payed','Executed when a supplier invoice is payed','invoice_supplier',16),(151,'BILL_SUPPLIER_SENTBYMAIL','Supplier invoice sent by mail','Executed when a supplier invoice is sent by mail','invoice_supplier',17),(152,'BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',17),(153,'CONTRACT_VALIDATE','Contract validated','Executed when a contract is validated','contrat',18),(154,'SHIPPING_VALIDATE','Shipping validated','Executed when a shipping is validated','shipping',20),(155,'SHIPPING_SENTBYMAIL','Shipping sent by mail','Executed when a shipping is sent by mail','shipping',21),(156,'MEMBER_VALIDATE','Member validated','Executed when a member is validated','member',22),(158,'MEMBER_RESILIATE','Member resiliated','Executed when a member is resiliated','member',24),(159,'MEMBER_MODIFY','Member modified','Executed when a member is modified','member',24),(160,'MEMBER_DELETE','Member deleted','Executed when a member is deleted','member',25),(161,'FICHINTER_VALIDATE','Intervention validated','Executed when a intervention is validated','ficheinter',19),(162,'FICHINTER_CLASSIFY_BILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19),(163,'FICHINTER_CLASSIFY_UNBILLED','Intervention set unbilled','Executed when a intervention is set to unbilled (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19),(164,'FICHINTER_REOPEN','Intervention opened','Executed when a intervention is re-opened','ficheinter',19),(165,'FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',19),(166,'PROJECT_CREATE','Project creation','Executed when a project is created','project',140),(167,'PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',2),(168,'PROPAL_CLOSE_REFUSED','Customer proposal closed refused','Executed when a customer proposal is closed refused','propal',2),(169,'PROPAL_CLASSIFY_BILLED','Customer proposal set billed','Executed when a customer proposal is set to billed','propal',2),(170,'TASK_CREATE','Task created','Executed when a project task is created','project',35),(171,'TASK_MODIFY','Task modified','Executed when a project task is modified','project',36),(172,'TASK_DELETE','Task deleted','Executed when a project task is deleted','project',37),(173,'BILL_SUPPLIER_UNVALIDATE','Supplier invoice unvalidated','Executed when a supplier invoice status is set back to draft','invoice_supplier',15),(174,'PROJECT_MODIFY','Project modified','Executed when a project is modified','project',141),(175,'PROJECT_DELETE','Project deleted','Executed when a project is deleted','project',142),(176,'ORDER_SUPPLIER_CREATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11),(177,'ORDER_SUPPLIER_SUBMIT','Supplier order request submited','Executed when a supplier order is approved','order_supplier',12),(178,'ORDER_SUPPLIER_RECEIVE','Supplier order request received','Executed when a supplier order is received','order_supplier',12),(179,'ORDER_SUPPLIER_CLASSIFY_BILLED','Supplier order set billed','Executed when a supplier order is set as billed','order_supplier',14),(180,'PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',30),(181,'PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',30),(182,'PRODUCT_DELETE','Product or service deleted','Executed when a product or sevice is deleted','product',30),(183,'EXPENSE_REPORT_CREATE','Expense report created','Executed when an expense report is created','expense_report',201),(185,'EXPENSE_REPORT_VALIDATE','Expense report validated','Executed when an expense report is validated','expense_report',202),(186,'EXPENSE_REPORT_APPROVE','Expense report approved','Executed when an expense report is approved','expense_report',203),(187,'EXPENSE_REPORT_PAYED','Expense report billed','Executed when an expense report is set as billed','expense_report',204),(192,'HOLIDAY_CREATE','Leave request created','Executed when a leave request is created','holiday',221),(193,'HOLIDAY_VALIDATE','Leave request validated','Executed when a leave request is validated','holiday',222),(194,'HOLIDAY_APPROVE','Leave request approved','Executed when a leave request is approved','holiday',223),(210,'MEMBER_SENTBYMAIL','Mails sent from member card','Executed when you send email from member card','member',23),(211,'CONTRACT_SENTBYMAIL','Contract sent by mail','Executed when a contract is sent by mail','contrat',18),(212,'PROPOSAL_SUPPLIER_VALIDATE','Price request validated','Executed when a commercial proposal is validated','proposal_supplier',10),(213,'PROPOSAL_SUPPLIER_SENTBYMAIL','Price request sent by mail','Executed when a commercial proposal is sent by mail','proposal_supplier',10),(214,'PROPOSAL_SUPPLIER_CLOSE_SIGNED','Price request closed signed','Executed when a customer proposal is closed signed','proposal_supplier',10),(215,'PROPOSAL_SUPPLIER_CLOSE_REFUSED','Price request closed refused','Executed when a customer proposal is closed refused','proposal_supplier',10),(216,'MEMBER_SUBSCRIPTION_CREATE','Member subscribtion recorded','Executed when a member subscribtion is deleted','member',24),(217,'MEMBER_SUBSCRIPTION_MODIFY','Member subscribtion modified','Executed when a member subscribtion is modified','member',24),(218,'MEMBER_SUBSCRIPTION_DELETE','Member subscribtion deleted','Executed when a member subscribtion is deleted','member',24),(225,'COMPANY_DELETE','Third party deleted','Executed when you delete third party','societe',1),(226,'PROPAL_DELETE','Customer proposal deleted','Executed when a customer proposal is deleted','propal',2),(227,'ORDER_DELETE','Customer order deleted','Executed when a customer order is deleted','commande',5),(228,'BILL_DELETE','Customer invoice deleted','Executed when a customer invoice is deleted','facture',9),(229,'PROPOSAL_SUPPLIER_DELETE','Price request deleted','Executed when a customer proposal delete','proposal_supplier',10),(230,'ORDER_SUPPLIER_DELETE','Supplier order deleted','Executed when a supplier order is deleted','order_supplier',14),(231,'BILL_SUPPLIER_DELETE','Supplier invoice deleted','Executed when a supplier invoice is deleted','invoice_supplier',17),(232,'CONTRACT_DELETE','Contract deleted','Executed when a contract is deleted','contrat',18),(233,'FICHINTER_DELETE','Intervention is deleted','Executed when a intervention is deleted','ficheinter',35),(234,'EXPENSE_DELETE','Expense report deleted','Executed when an expense report is deleted','expensereport',204),(249,'TICKET_CREATE','Ticket created','Executed when a ticket is created','ticket',161),(250,'TICKET_MODIFY','Ticket modified','Executed when a ticket is modified','ticket',163),(251,'TICKET_ASSIGNED','Ticket assigned','Executed when a ticket is assigned to another user','ticket',164),(252,'TICKET_CLOSE','Ticket closed','Executed when a ticket is closed','ticket',165),(253,'TICKET_SENTBYMAIL','Ticket message sent by email','Executed when a message is sent from the ticket record','ticket',166),(254,'TICKET_DELETE','Ticket deleted','Executed when a ticket is deleted','ticket',167),(261,'USER_SENTBYMAIL','Email sent','Executed when an email is sent from user card','user',300),(262,'BOM_VALIDATE','BOM validated','Executed when a BOM is validated','bom',650),(263,'BOM_UNVALIDATE','BOM unvalidated','Executed when a BOM is unvalidated','bom',651),(264,'BOM_CLOSE','BOM disabled','Executed when a BOM is disabled','bom',652),(265,'BOM_REOPEN','BOM reopen','Executed when a BOM is re-open','bom',653),(266,'BOM_DELETE','BOM deleted','Executed when a BOM deleted','bom',654),(351,'MRP_MO_VALIDATE','MO validated','Executed when a MO is validated','bom',660),(352,'MRP_MO_PRODUCED','MO produced','Executed when a MO is produced','bom',661),(353,'MRP_MO_DELETE','MO deleted','Executed when a MO is deleted','bom',662),(354,'MRP_MO_CANCEL','MO canceled','Executed when a MO is canceled','bom',663);
+INSERT INTO `llx_c_action_trigger` VALUES (131,'COMPANY_SENTBYMAIL','Mails sent from third party card','Executed when you send email from third party card','societe',1),(132,'COMPANY_CREATE','Third party created','Executed when a third party is created','societe',1),(133,'PROPAL_VALIDATE','Customer proposal validated','Executed when a commercial proposal is validated','propal',2),(134,'PROPAL_SENTBYMAIL','Commercial proposal sent by mail','Executed when a commercial proposal is sent by mail','propal',3),(135,'ORDER_VALIDATE','Customer order validate','Executed when a customer order is validated','commande',4),(136,'ORDER_CLOSE','Customer order classify delivered','Executed when a customer order is set delivered','commande',5),(137,'ORDER_CLASSIFY_BILLED','Customer order classify billed','Executed when a customer order is set to billed','commande',5),(138,'ORDER_CANCEL','Customer order canceled','Executed when a customer order is canceled','commande',5),(139,'ORDER_SENTBYMAIL','Customer order sent by mail','Executed when a customer order is sent by mail ','commande',5),(140,'BILL_VALIDATE','Customer invoice validated','Executed when a customer invoice is approved','facture',6),(141,'BILL_PAYED','Customer invoice payed','Executed when a customer invoice is payed','facture',7),(142,'BILL_CANCEL','Customer invoice canceled','Executed when a customer invoice is conceled','facture',8),(143,'BILL_SENTBYMAIL','Customer invoice sent by mail','Executed when a customer invoice is sent by mail','facture',9),(144,'BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',10),(145,'ORDER_SUPPLIER_VALIDATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11),(146,'ORDER_SUPPLIER_APPROVE','Supplier order request approved','Executed when a supplier order is approved','order_supplier',12),(147,'ORDER_SUPPLIER_REFUSE','Supplier order request refused','Executed when a supplier order is refused','order_supplier',13),(148,'ORDER_SUPPLIER_SENTBYMAIL','Supplier order sent by mail','Executed when a supplier order is sent by mail','order_supplier',14),(149,'BILL_SUPPLIER_VALIDATE','Supplier invoice validated','Executed when a supplier invoice is validated','invoice_supplier',15),(150,'BILL_SUPPLIER_PAYED','Supplier invoice payed','Executed when a supplier invoice is payed','invoice_supplier',16),(151,'BILL_SUPPLIER_SENTBYMAIL','Supplier invoice sent by mail','Executed when a supplier invoice is sent by mail','invoice_supplier',17),(152,'BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',17),(153,'CONTRACT_VALIDATE','Contract validated','Executed when a contract is validated','contrat',18),(154,'SHIPPING_VALIDATE','Shipping validated','Executed when a shipping is validated','shipping',20),(155,'SHIPPING_SENTBYMAIL','Shipping sent by mail','Executed when a shipping is sent by mail','shipping',21),(156,'MEMBER_VALIDATE','Member validated','Executed when a member is validated','member',22),(158,'MEMBER_RESILIATE','Member resiliated','Executed when a member is resiliated','member',24),(159,'MEMBER_MODIFY','Member modified','Executed when a member is modified','member',24),(160,'MEMBER_DELETE','Member deleted','Executed when a member is deleted','member',25),(161,'FICHINTER_VALIDATE','Intervention validated','Executed when a intervention is validated','ficheinter',19),(162,'FICHINTER_CLASSIFY_BILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19),(163,'FICHINTER_CLASSIFY_UNBILLED','Intervention set unbilled','Executed when a intervention is set to unbilled (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19),(164,'FICHINTER_REOPEN','Intervention opened','Executed when a intervention is re-opened','ficheinter',19),(165,'FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',19),(166,'PROJECT_CREATE','Project creation','Executed when a project is created','project',140),(167,'PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',2),(168,'PROPAL_CLOSE_REFUSED','Customer proposal closed refused','Executed when a customer proposal is closed refused','propal',2),(169,'PROPAL_CLASSIFY_BILLED','Customer proposal set billed','Executed when a customer proposal is set to billed','propal',2),(170,'TASK_CREATE','Task created','Executed when a project task is created','project',35),(171,'TASK_MODIFY','Task modified','Executed when a project task is modified','project',36),(172,'TASK_DELETE','Task deleted','Executed when a project task is deleted','project',37),(173,'BILL_SUPPLIER_UNVALIDATE','Supplier invoice unvalidated','Executed when a supplier invoice status is set back to draft','invoice_supplier',15),(174,'PROJECT_MODIFY','Project modified','Executed when a project is modified','project',141),(175,'PROJECT_DELETE','Project deleted','Executed when a project is deleted','project',142),(176,'ORDER_SUPPLIER_CREATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11),(177,'ORDER_SUPPLIER_SUBMIT','Supplier order request submited','Executed when a supplier order is approved','order_supplier',12),(178,'ORDER_SUPPLIER_RECEIVE','Supplier order request received','Executed when a supplier order is received','order_supplier',12),(179,'ORDER_SUPPLIER_CLASSIFY_BILLED','Supplier order set billed','Executed when a supplier order is set as billed','order_supplier',14),(180,'PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',30),(181,'PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',30),(182,'PRODUCT_DELETE','Product or service deleted','Executed when a product or sevice is deleted','product',30),(183,'EXPENSE_REPORT_CREATE','Expense report created','Executed when an expense report is created','expense_report',201),(185,'EXPENSE_REPORT_VALIDATE','Expense report validated','Executed when an expense report is validated','expense_report',202),(186,'EXPENSE_REPORT_APPROVE','Expense report approved','Executed when an expense report is approved','expense_report',203),(187,'EXPENSE_REPORT_PAYED','Expense report billed','Executed when an expense report is set as billed','expense_report',204),(192,'HOLIDAY_CREATE','Leave request created','Executed when a leave request is created','holiday',221),(193,'HOLIDAY_VALIDATE','Leave request validated','Executed when a leave request is validated','holiday',222),(194,'HOLIDAY_APPROVE','Leave request approved','Executed when a leave request is approved','holiday',223),(210,'MEMBER_SENTBYMAIL','Mails sent from member card','Executed when you send email from member card','member',23),(211,'CONTRACT_SENTBYMAIL','Contract sent by mail','Executed when a contract is sent by mail','contrat',18),(212,'PROPOSAL_SUPPLIER_VALIDATE','Price request validated','Executed when a commercial proposal is validated','proposal_supplier',10),(213,'PROPOSAL_SUPPLIER_SENTBYMAIL','Price request sent by mail','Executed when a commercial proposal is sent by mail','proposal_supplier',10),(214,'PROPOSAL_SUPPLIER_CLOSE_SIGNED','Price request closed signed','Executed when a customer proposal is closed signed','proposal_supplier',10),(215,'PROPOSAL_SUPPLIER_CLOSE_REFUSED','Price request closed refused','Executed when a customer proposal is closed refused','proposal_supplier',10),(216,'MEMBER_SUBSCRIPTION_CREATE','Member subscribtion recorded','Executed when a member subscribtion is deleted','member',24),(217,'MEMBER_SUBSCRIPTION_MODIFY','Member subscribtion modified','Executed when a member subscribtion is modified','member',24),(218,'MEMBER_SUBSCRIPTION_DELETE','Member subscribtion deleted','Executed when a member subscribtion is deleted','member',24),(225,'COMPANY_DELETE','Third party deleted','Executed when you delete third party','societe',1),(226,'PROPAL_DELETE','Customer proposal deleted','Executed when a customer proposal is deleted','propal',2),(227,'ORDER_DELETE','Customer order deleted','Executed when a customer order is deleted','commande',5),(228,'BILL_DELETE','Customer invoice deleted','Executed when a customer invoice is deleted','facture',9),(229,'PROPOSAL_SUPPLIER_DELETE','Price request deleted','Executed when a customer proposal delete','proposal_supplier',10),(230,'ORDER_SUPPLIER_DELETE','Supplier order deleted','Executed when a supplier order is deleted','order_supplier',14),(231,'BILL_SUPPLIER_DELETE','Supplier invoice deleted','Executed when a supplier invoice is deleted','invoice_supplier',17),(232,'CONTRACT_DELETE','Contract deleted','Executed when a contract is deleted','contrat',18),(233,'FICHINTER_DELETE','Intervention is deleted','Executed when a intervention is deleted','ficheinter',35),(234,'EXPENSE_DELETE','Expense report deleted','Executed when an expense report is deleted','expensereport',204),(249,'TICKET_CREATE','Ticket created','Executed when a ticket is created','ticket',161),(250,'TICKET_MODIFY','Ticket modified','Executed when a ticket is modified','ticket',163),(251,'TICKET_ASSIGNED','Ticket assigned','Executed when a ticket is assigned to another user','ticket',164),(252,'TICKET_CLOSE','Ticket closed','Executed when a ticket is closed','ticket',165),(253,'TICKET_SENTBYMAIL','Ticket message sent by email','Executed when a message is sent from the ticket record','ticket',166),(254,'TICKET_DELETE','Ticket deleted','Executed when a ticket is deleted','ticket',167),(261,'USER_SENTBYMAIL','Email sent','Executed when an email is sent from user card','user',300),(262,'BOM_VALIDATE','BOM validated','Executed when a BOM is validated','bom',650),(263,'BOM_UNVALIDATE','BOM unvalidated','Executed when a BOM is unvalidated','bom',651),(264,'BOM_CLOSE','BOM disabled','Executed when a BOM is disabled','bom',652),(265,'BOM_REOPEN','BOM reopen','Executed when a BOM is re-open','bom',653),(266,'BOM_DELETE','BOM deleted','Executed when a BOM deleted','bom',654),(351,'MRP_MO_VALIDATE','MO validated','Executed when a MO is validated','bom',660),(352,'MRP_MO_PRODUCED','MO produced','Executed when a MO is produced','bom',661),(353,'MRP_MO_DELETE','MO deleted','Executed when a MO is deleted','bom',662),(354,'MRP_MO_CANCEL','MO canceled','Executed when a MO is canceled','bom',663),(365,'CONTACT_CREATE','Contact address created','Executed when a contact is created','contact',50),(366,'CONTACT_SENTBYMAIL','Mails sent from third party card','Executed when you send email from contact adress card','contact',51),(367,'CONTACT_DELETE','Contact address deleted','Executed when a contact is deleted','contact',52),(368,'RECRUITMENTJOBPOSITION_CREATE','Job created','Executed when a job is created','recruitment',7500),(369,'RECRUITMENTJOBPOSITION_MODIFY','Job modified','Executed when a job is modified','recruitment',7502),(370,'RECRUITMENTJOBPOSITION_SENTBYMAIL','Mails sent from job record','Executed when you send email from job record','recruitment',7504),(371,'RECRUITMENTJOBPOSITION_DELETE','Job deleted','Executed when a job is deleted','recruitment',7506),(372,'RECRUITMENTCANDIDATURE_CREATE','Candidature created','Executed when a candidature is created','recruitment',7510),(373,'RECRUITMENTCANDIDATURE_MODIFY','Candidature modified','Executed when a candidature is modified','recruitment',7512),(374,'RECRUITMENTCANDIDATURE_SENTBYMAIL','Mails sent from candidature record','Executed when you send email from candidature record','recruitment',7514),(375,'RECRUITMENTCANDIDATURE_DELETE','Candidature deleted','Executed when a candidature is deleted','recruitment',7516);
 /*!40000 ALTER TABLE `llx_c_action_trigger` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1492,6 +1847,35 @@ INSERT INTO `llx_c_actioncomm` VALUES (1,'AC_TEL','system','Phone call',NULL,1,N
 /*!40000 ALTER TABLE `llx_c_actioncomm` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_c_agefodd_session_calendrier_type`
+--
+
+DROP TABLE IF EXISTS `llx_c_agefodd_session_calendrier_type`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_agefodd_session_calendrier_type` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `label` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `entity` int(11) DEFAULT 1,
+  `active` tinyint(4) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_agefodd_session_calendrier_type` (`code`,`entity`),
+  KEY `ik_c_agefodd_session_calendrier_type` (`code`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_agefodd_session_calendrier_type`
+--
+
+LOCK TABLES `llx_c_agefodd_session_calendrier_type` WRITE;
+/*!40000 ALTER TABLE `llx_c_agefodd_session_calendrier_type` DISABLE KEYS */;
+INSERT INTO `llx_c_agefodd_session_calendrier_type` VALUES (1,'AGF_TYPE_F2F','Individuel face à face',1,1),(2,'AGF_TYPE_GRP','Groupe',1,1),(3,'AGF_TYPE_PHONE','Téléphone',1,1),(4,'AGF_TYPE_PLATF','Plateforme',1,1),(5,'AGF_TYPE_CRT','Certification',1,1);
+/*!40000 ALTER TABLE `llx_c_agefodd_session_calendrier_type` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_c_availability`
 --
@@ -1535,7 +1919,7 @@ CREATE TABLE `llx_c_barcode_type` (
   `example` varchar(16) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_barcode_type` (`code`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=39 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=47 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1817,7 +2201,7 @@ CREATE TABLE `llx_c_email_templates` (
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_email_templates` (`entity`,`label`,`lang`),
   KEY `idx_type` (`type_template`)
-) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1826,7 +2210,7 @@ CREATE TABLE `llx_c_email_templates` (
 
 LOCK TABLES `llx_c_email_templates` WRITE;
 /*!40000 ALTER TABLE `llx_c_email_templates` DISABLE KEYS */;
-INSERT INTO `llx_c_email_templates` VALUES (1,1,NULL,'propal_send','',1,NULL,NULL,'2018-01-19 11:17:48','My Private email template for proposals',1,1,'Hello __FIRSTNAME__','We wish you a happy new year<br>__USER_SIGNATURE__',NULL,'1','1'),(2,0,'adherent','member','',0,NULL,NULL,'2018-01-19 11:17:48','(SendAnEMailToMember)',1,1,'__(CardContent)__','__(Hello)__,<br><br>\n\n__(ThisIsContentOfYourCard)__<br>\n__(ID)__ : __ID__<br>\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br>\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br>\n__(Lastname)__ : __MEMBER_LASTNAME__<br>\n__(Fullname)__ : __MEMBER_FULLNAME__<br>\n__(Company)__ : __MEMBER_COMPANY__<br>\n__(Address)__ : __MEMBER_ADDRESS__<br>\n__(Zip)__ : __MEMBER_ZIP__<br>\n__(Town)__ : __MEMBER_TOWN__<br>\n__(Country)__ : __MEMBER_COUNTRY__<br>\n__(Email)__ : __MEMBER_EMAIL__<br>\n__(Birthday)__ : __MEMBER_BIRTH__<br>\n__(Photo)__ : __MEMBER_PHOTO__<br>\n__(Login)__ : __MEMBER_LOGIN__<br>\n__(Password)__ : __MEMBER_PASSWORD__<br>\n__(Phone)__ : __MEMBER_PHONE__<br>\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br>\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','1'),(3,0,'banque','thirdparty','',0,NULL,NULL,'2018-01-19 11:17:48','(YourSEPAMandate)',1,0,'__(YourSEPAMandate)__','__(Hello)__,<br><br>\n\n__(FindYourSEPAMandate)__ :<br>\n__MYCOMPANY_NAME__<br>\n__MYCOMPANY_FULLADDRESS__<br><br>\n__(Sincerely)__<br>\n__USER_SIGNATURE__',NULL,'1','1'),(6,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnAutoSubscription)',10,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipRequestWasReceived)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourMembershipRequestWasReceived)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(7,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnMemberValidation)',20,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipWasValidated)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourMembershipWasValidated)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(8,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnNewSubscription)',30,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourSubscriptionWasRecorded)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourSubscriptionWasRecorded)__<br>\n\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','1'),(9,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingReminderForExpiredSubscription)',40,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(SubscriptionReminderEmail)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfSubscriptionReminderEmail)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(10,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnCancelation)',50,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipWasCanceled)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(YourMembershipWasCanceled)__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(11,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingAnEMailToMember)',60,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(CardContent)__','__(Hello)__,<br><br>\n\n__(ThisIsContentOfYourCard)__<br>\n__(ID)__ : __ID__<br>\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br>\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br>\n__(Lastname)__ : __MEMBER_LASTNAME__<br>\n__(Fullname)__ : __MEMBER_FULLNAME__<br>\n__(Company)__ : __MEMBER_COMPANY__<br>\n__(Address)__ : __MEMBER_ADDRESS__<br>\n__(Zip)__ : __MEMBER_ZIP__<br>\n__(Town)__ : __MEMBER_TOWN__<br>\n__(Country)__ : __MEMBER_COUNTRY__<br>\n__(Email)__ : __MEMBER_EMAIL__<br>\n__(Birthday)__ : __MEMBER_BIRTH__<br>\n__(Photo)__ : __MEMBER_PHOTO__<br>\n__(Login)__ : __MEMBER_LOGIN__<br>\n__(Password)__ : __MEMBER_PASSWORD__<br>\n__(Phone)__ : __MEMBER_PHONE__<br>\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br>\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0');
+INSERT INTO `llx_c_email_templates` VALUES (1,1,NULL,'propal_send','',1,NULL,NULL,'2018-01-19 11:17:48','My Private email template for proposals',1,1,'Hello __FIRSTNAME__','We wish you a happy new year<br>__USER_SIGNATURE__',NULL,'1','1'),(2,0,'adherent','member','',0,NULL,NULL,'2018-01-19 11:17:48','(SendAnEMailToMember)',1,1,'__(CardContent)__','__(Hello)__,<br><br>\n\n__(ThisIsContentOfYourCard)__<br>\n__(ID)__ : __ID__<br>\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br>\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br>\n__(Lastname)__ : __MEMBER_LASTNAME__<br>\n__(Fullname)__ : __MEMBER_FULLNAME__<br>\n__(Company)__ : __MEMBER_COMPANY__<br>\n__(Address)__ : __MEMBER_ADDRESS__<br>\n__(Zip)__ : __MEMBER_ZIP__<br>\n__(Town)__ : __MEMBER_TOWN__<br>\n__(Country)__ : __MEMBER_COUNTRY__<br>\n__(Email)__ : __MEMBER_EMAIL__<br>\n__(Birthday)__ : __MEMBER_BIRTH__<br>\n__(Photo)__ : __MEMBER_PHOTO__<br>\n__(Login)__ : __MEMBER_LOGIN__<br>\n__(Password)__ : __MEMBER_PASSWORD__<br>\n__(Phone)__ : __MEMBER_PHONE__<br>\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br>\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','1'),(3,0,'banque','thirdparty','',0,NULL,NULL,'2018-01-19 11:17:48','(YourSEPAMandate)',1,0,'__(YourSEPAMandate)__','__(Hello)__,<br><br>\n\n__(FindYourSEPAMandate)__ :<br>\n__MYCOMPANY_NAME__<br>\n__MYCOMPANY_FULLADDRESS__<br><br>\n__(Sincerely)__<br>\n__USER_SIGNATURE__',NULL,'1','1'),(6,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnAutoSubscription)',10,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipRequestWasReceived)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourMembershipRequestWasReceived)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(7,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnMemberValidation)',20,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipWasValidated)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourMembershipWasValidated)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(8,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnNewSubscription)',30,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourSubscriptionWasRecorded)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourSubscriptionWasRecorded)__<br>\n\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','1'),(9,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingReminderForExpiredSubscription)',40,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(SubscriptionReminderEmail)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfSubscriptionReminderEmail)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(10,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnCancelation)',50,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipWasCanceled)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(YourMembershipWasCanceled)__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(11,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingAnEMailToMember)',60,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(CardContent)__','__(Hello)__,<br><br>\n\n__(ThisIsContentOfYourCard)__<br>\n__(ID)__ : __ID__<br>\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br>\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br>\n__(Lastname)__ : __MEMBER_LASTNAME__<br>\n__(Fullname)__ : __MEMBER_FULLNAME__<br>\n__(Company)__ : __MEMBER_COMPANY__<br>\n__(Address)__ : __MEMBER_ADDRESS__<br>\n__(Zip)__ : __MEMBER_ZIP__<br>\n__(Town)__ : __MEMBER_TOWN__<br>\n__(Country)__ : __MEMBER_COUNTRY__<br>\n__(Email)__ : __MEMBER_EMAIL__<br>\n__(Birthday)__ : __MEMBER_BIRTH__<br>\n__(Photo)__ : __MEMBER_PHOTO__<br>\n__(Login)__ : __MEMBER_LOGIN__<br>\n__(Password)__ : __MEMBER_PASSWORD__<br>\n__(Phone)__ : __MEMBER_PHONE__<br>\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br>\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(12,0,'recruitment','recruitmentcandidature_send','',0,NULL,NULL,'2020-12-10 12:24:39','(AnswerCandidature)',100,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourCandidature)__','__(Hello)__ __CANDIDATE_FULLNAME__,<br><br>\n\n__(YourCandidatureAnswer)__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'$conf->recruitment->enabled','0');
 /*!40000 ALTER TABLE `llx_c_email_templates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2121,6 +2505,7 @@ CREATE TABLE `llx_c_incoterms` (
   `code` varchar(3) COLLATE utf8_unicode_ci NOT NULL,
   `libelle` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
+  `label` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_incoterms` (`code`)
 ) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -2132,7 +2517,7 @@ CREATE TABLE `llx_c_incoterms` (
 
 LOCK TABLES `llx_c_incoterms` WRITE;
 /*!40000 ALTER TABLE `llx_c_incoterms` DISABLE KEYS */;
-INSERT INTO `llx_c_incoterms` VALUES (1,'EXW','Ex Works, au départ non chargé, non dédouané sortie d\'usine (uniquement adapté aux flux domestiques, nationaux)',1),(2,'FCA','Free Carrier, marchandises dédouanées et chargées dans le pays de départ, chez le vendeur ou chez le commissionnaire de transport de l\'acheteur',1),(3,'FAS','Free Alongside Ship, sur le quai du port de départ',1),(4,'FOB','Free On Board, chargé sur le bateau, les frais de chargement dans celui-ci étant fonction du liner term indiqué par la compagnie maritime (à la charge du vendeur)',1),(5,'CFR','Cost and Freight, chargé dans le bateau, livraison au port de départ, frais payés jusqu\'au port d\'arrivée, sans assurance pour le transport, non déchargé du navire à destination (les frais de déchargement sont inclus ou non au port d\'arrivée)',1),(6,'CIF','Cost, Insurance and Freight, chargé sur le bateau, frais jusqu\'au port d\'arrivée, avec l\'assurance marchandise transportée souscrite par le vendeur pour le compte de l\'acheteur',1),(7,'CPT','Carriage Paid To, livraison au premier transporteur, frais jusqu\'au déchargement du mode de transport, sans assurance pour le transport',1),(8,'CIP','Carriage and Insurance Paid to, idem CPT, avec assurance marchandise transportée souscrite par le vendeur pour le compte de l\'acheteur',1),(9,'DAT','Delivered At Terminal, marchandises (déchargées) livrées sur quai, dans un terminal maritime, fluvial, aérien, routier ou ferroviaire désigné (dédouanement import, et post-acheminement payés par l\'acheteur)',1),(10,'DAP','Delivered At Place, marchandises (non déchargées) mises à disposition de l\'acheteur dans le pays d\'importation au lieu précisé dans le contrat (déchargement, dédouanement import payé par l\'acheteur)',1),(11,'DDP','Delivered Duty Paid, marchandises (non déchargées) livrées à destination finale, dédouanement import et taxes à la charge du vendeur ; l\'acheteur prend en charge uniquement le déchargement (si exclusion des taxes type TVA, le préciser clairement)',1);
+INSERT INTO `llx_c_incoterms` VALUES (1,'EXW','Ex Works, au départ non chargé, non dédouané sortie d\'usine (uniquement adapté aux flux domestiques, nationaux)',1,NULL),(2,'FCA','Free Carrier, marchandises dédouanées et chargées dans le pays de départ, chez le vendeur ou chez le commissionnaire de transport de l\'acheteur',1,NULL),(3,'FAS','Free Alongside Ship, sur le quai du port de départ',1,NULL),(4,'FOB','Free On Board, chargé sur le bateau, les frais de chargement dans celui-ci étant fonction du liner term indiqué par la compagnie maritime (à la charge du vendeur)',1,NULL),(5,'CFR','Cost and Freight, chargé dans le bateau, livraison au port de départ, frais payés jusqu\'au port d\'arrivée, sans assurance pour le transport, non déchargé du navire à destination (les frais de déchargement sont inclus ou non au port d\'arrivée)',1,NULL),(6,'CIF','Cost, Insurance and Freight, chargé sur le bateau, frais jusqu\'au port d\'arrivée, avec l\'assurance marchandise transportée souscrite par le vendeur pour le compte de l\'acheteur',1,NULL),(7,'CPT','Carriage Paid To, livraison au premier transporteur, frais jusqu\'au déchargement du mode de transport, sans assurance pour le transport',1,NULL),(8,'CIP','Carriage and Insurance Paid to, idem CPT, avec assurance marchandise transportée souscrite par le vendeur pour le compte de l\'acheteur',1,NULL),(9,'DAT','Delivered At Terminal, marchandises (déchargées) livrées sur quai, dans un terminal maritime, fluvial, aérien, routier ou ferroviaire désigné (dédouanement import, et post-acheminement payés par l\'acheteur)',1,NULL),(10,'DAP','Delivered At Place, marchandises (non déchargées) mises à disposition de l\'acheteur dans le pays d\'importation au lieu précisé dans le contrat (déchargement, dédouanement import payé par l\'acheteur)',1,NULL),(11,'DDP','Delivered Duty Paid, marchandises (non déchargées) livrées à destination finale, dédouanement import et taxes à la charge du vendeur ; l\'acheteur prend en charge uniquement le déchargement (si exclusion des taxes type TVA, le préciser clairement)',1,NULL);
 /*!40000 ALTER TABLE `llx_c_incoterms` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2509,6 +2894,33 @@ LOCK TABLES `llx_c_price_global_variable_updater` WRITE;
 /*!40000 ALTER TABLE `llx_c_price_global_variable_updater` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_c_product_nature`
+--
+
+DROP TABLE IF EXISTS `llx_c_product_nature`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_product_nature` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` tinyint(4) NOT NULL,
+  `label` varchar(100) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_product_nature` (`code`,`active`)
+) ENGINE=InnoDB AUTO_INCREMENT=77 DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_product_nature`
+--
+
+LOCK TABLES `llx_c_product_nature` WRITE;
+/*!40000 ALTER TABLE `llx_c_product_nature` DISABLE KEYS */;
+INSERT INTO `llx_c_product_nature` VALUES (1,0,'RowMaterial',1),(2,1,'Finished',1);
+/*!40000 ALTER TABLE `llx_c_product_nature` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_c_propalst`
 --
@@ -2536,6 +2948,33 @@ INSERT INTO `llx_c_propalst` VALUES (0,'PR_DRAFT','Brouillon',1),(1,'PR_OPEN','O
 /*!40000 ALTER TABLE `llx_c_propalst` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_c_prospectcontactlevel`
+--
+
+DROP TABLE IF EXISTS `llx_c_prospectcontactlevel`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_prospectcontactlevel` (
+  `code` varchar(12) CHARACTER SET utf8mb4 NOT NULL,
+  `label` varchar(30) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `sortorder` smallint(6) DEFAULT NULL,
+  `active` smallint(6) NOT NULL DEFAULT 1,
+  `module` varchar(32) CHARACTER SET utf8mb4 DEFAULT NULL,
+  PRIMARY KEY (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_prospectcontactlevel`
+--
+
+LOCK TABLES `llx_c_prospectcontactlevel` WRITE;
+/*!40000 ALTER TABLE `llx_c_prospectcontactlevel` DISABLE KEYS */;
+INSERT INTO `llx_c_prospectcontactlevel` VALUES ('PL_HIGH','High',4,1,NULL),('PL_LOW','Low',2,1,NULL),('PL_MEDIUM','Medium',3,1,NULL),('PL_NONE','None',1,1,NULL);
+/*!40000 ALTER TABLE `llx_c_prospectcontactlevel` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_c_prospectlevel`
 --
@@ -2563,6 +3002,31 @@ INSERT INTO `llx_c_prospectlevel` VALUES ('PL_HIGH','High',4,1,NULL),('PL_LOW','
 /*!40000 ALTER TABLE `llx_c_prospectlevel` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_c_recruitment_origin`
+--
+
+DROP TABLE IF EXISTS `llx_c_recruitment_origin`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_recruitment_origin` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(32) CHARACTER SET utf8mb4 NOT NULL,
+  `label` varchar(64) CHARACTER SET utf8mb4 NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_recruitment_origin`
+--
+
+LOCK TABLES `llx_c_recruitment_origin` WRITE;
+/*!40000 ALTER TABLE `llx_c_recruitment_origin` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_c_recruitment_origin` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_c_regions`
 --
@@ -2741,6 +3205,34 @@ INSERT INTO `llx_c_stcomm` VALUES (-1,'ST_NO','Do not contact',1,NULL),(0,'ST_NE
 /*!40000 ALTER TABLE `llx_c_stcomm` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_c_stcommcontact`
+--
+
+DROP TABLE IF EXISTS `llx_c_stcommcontact`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_stcommcontact` (
+  `id` int(11) NOT NULL,
+  `code` varchar(12) CHARACTER SET utf8mb4 NOT NULL,
+  `libelle` varchar(30) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `picto` varchar(128) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_c_stcommcontact` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_stcommcontact`
+--
+
+LOCK TABLES `llx_c_stcommcontact` WRITE;
+/*!40000 ALTER TABLE `llx_c_stcommcontact` DISABLE KEYS */;
+INSERT INTO `llx_c_stcommcontact` VALUES (-1,'ST_NO','Do not contact',NULL,1),(0,'ST_NEVER','Never contacted',NULL,1),(1,'ST_TODO','To contact',NULL,1),(2,'ST_PEND','Contact in progress',NULL,1),(3,'ST_DONE','Contacted',NULL,1);
+/*!40000 ALTER TABLE `llx_c_stcommcontact` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_c_subtotal_free_text`
 --
@@ -2783,6 +3275,8 @@ CREATE TABLE `llx_c_ticket_category` (
   `active` int(11) DEFAULT 1,
   `use_default` int(11) DEFAULT 1,
   `description` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_parent` int(11) NOT NULL DEFAULT 0,
+  `force_severity` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_code` (`code`,`entity`)
 ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -2794,7 +3288,7 @@ CREATE TABLE `llx_c_ticket_category` (
 
 LOCK TABLES `llx_c_ticket_category` WRITE;
 /*!40000 ALTER TABLE `llx_c_ticket_category` DISABLE KEYS */;
-INSERT INTO `llx_c_ticket_category` VALUES (1,1,'OTHER','10','Other',1,1,NULL);
+INSERT INTO `llx_c_ticket_category` VALUES (1,1,'OTHER','10','Other',1,1,NULL,0,NULL);
 /*!40000 ALTER TABLE `llx_c_ticket_category` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2842,7 +3336,7 @@ CREATE TABLE `llx_c_ticket_severity` (
   `code` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
   `pos` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
   `label` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
-  `color` varchar(10) COLLATE utf8_unicode_ci NOT NULL,
+  `color` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
   `active` int(11) DEFAULT 1,
   `use_default` int(11) DEFAULT 1,
   `description` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -2892,6 +3386,33 @@ INSERT INTO `llx_c_ticket_type` VALUES (1,1,'COM','10','Commercial question',1,1
 /*!40000 ALTER TABLE `llx_c_ticket_type` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_c_transport_mode`
+--
+
+DROP TABLE IF EXISTS `llx_c_transport_mode`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_transport_mode` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `code` varchar(3) NOT NULL,
+  `label` varchar(255) NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=313 DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_transport_mode`
+--
+
+LOCK TABLES `llx_c_transport_mode` WRITE;
+/*!40000 ALTER TABLE `llx_c_transport_mode` DISABLE KEYS */;
+INSERT INTO `llx_c_transport_mode` VALUES (1,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(2,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(3,1,'ROU','Transport par route',1),(4,1,'AIR','Transport par air',1),(5,1,'POS','Envois postaux',1),(6,1,'OLE','Installations de transport fixe (oléoduc)',1),(7,1,'NAV','Transport par navigation intérieure',1),(8,1,'PRO','Propulsion propre',1),(9,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(10,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(11,1,'ROU','Transport par route',1),(12,1,'AIR','Transport par air',1),(13,1,'POS','Envois postaux',1),(14,1,'OLE','Installations de transport fixe (oléoduc)',1),(15,1,'NAV','Transport par navigation intérieure',1),(16,1,'PRO','Propulsion propre',1),(17,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(18,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(19,1,'ROU','Transport par route',1),(20,1,'AIR','Transport par air',1),(21,1,'POS','Envois postaux',1),(22,1,'OLE','Installations de transport fixe (oléoduc)',1),(23,1,'NAV','Transport par navigation intérieure',1),(24,1,'PRO','Propulsion propre',1),(25,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(26,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(27,1,'ROU','Transport par route',1),(28,1,'AIR','Transport par air',1),(29,1,'POS','Envois postaux',1),(30,1,'OLE','Installations de transport fixe (oléoduc)',1),(31,1,'NAV','Transport par navigation intérieure',1),(32,1,'PRO','Propulsion propre',1),(33,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(34,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(35,1,'ROU','Transport par route',1),(36,1,'AIR','Transport par air',1),(37,1,'POS','Envois postaux',1),(38,1,'OLE','Installations de transport fixe (oléoduc)',1),(39,1,'NAV','Transport par navigation intérieure',1),(40,1,'PRO','Propulsion propre',1),(41,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(42,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(43,1,'ROU','Transport par route',1),(44,1,'AIR','Transport par air',1),(45,1,'POS','Envois postaux',1),(46,1,'OLE','Installations de transport fixe (oléoduc)',1),(47,1,'NAV','Transport par navigation intérieure',1),(48,1,'PRO','Propulsion propre',1),(49,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(50,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(51,1,'ROU','Transport par route',1),(52,1,'AIR','Transport par air',1),(53,1,'POS','Envois postaux',1),(54,1,'OLE','Installations de transport fixe (oléoduc)',1),(55,1,'NAV','Transport par navigation intérieure',1),(56,1,'PRO','Propulsion propre',1),(57,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(58,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(59,1,'ROU','Transport par route',1),(60,1,'AIR','Transport par air',1),(61,1,'POS','Envois postaux',1),(62,1,'OLE','Installations de transport fixe (oléoduc)',1),(63,1,'NAV','Transport par navigation intérieure',1),(64,1,'PRO','Propulsion propre',1),(65,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(66,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(67,1,'ROU','Transport par route',1),(68,1,'AIR','Transport par air',1),(69,1,'POS','Envois postaux',1),(70,1,'OLE','Installations de transport fixe (oléoduc)',1),(71,1,'NAV','Transport par navigation intérieure',1),(72,1,'PRO','Propulsion propre',1),(73,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(74,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(75,1,'ROU','Transport par route',1),(76,1,'AIR','Transport par air',1),(77,1,'POS','Envois postaux',1),(78,1,'OLE','Installations de transport fixe (oléoduc)',1),(79,1,'NAV','Transport par navigation intérieure',1),(80,1,'PRO','Propulsion propre',1),(81,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(82,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(83,1,'ROU','Transport par route',1),(84,1,'AIR','Transport par air',1),(85,1,'POS','Envois postaux',1),(86,1,'OLE','Installations de transport fixe (oléoduc)',1),(87,1,'NAV','Transport par navigation intérieure',1),(88,1,'PRO','Propulsion propre',1),(89,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(90,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(91,1,'ROU','Transport par route',1),(92,1,'AIR','Transport par air',1),(93,1,'POS','Envois postaux',1),(94,1,'OLE','Installations de transport fixe (oléoduc)',1),(95,1,'NAV','Transport par navigation intérieure',1),(96,1,'PRO','Propulsion propre',1),(97,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(98,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(99,1,'ROU','Transport par route',1),(100,1,'AIR','Transport par air',1),(101,1,'POS','Envois postaux',1),(102,1,'OLE','Installations de transport fixe (oléoduc)',1),(103,1,'NAV','Transport par navigation intérieure',1),(104,1,'PRO','Propulsion propre',1),(105,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(106,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(107,1,'ROU','Transport par route',1),(108,1,'AIR','Transport par air',1),(109,1,'POS','Envois postaux',1),(110,1,'OLE','Installations de transport fixe (oléoduc)',1),(111,1,'NAV','Transport par navigation intérieure',1),(112,1,'PRO','Propulsion propre',1),(113,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(114,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(115,1,'ROU','Transport par route',1),(116,1,'AIR','Transport par air',1),(117,1,'POS','Envois postaux',1),(118,1,'OLE','Installations de transport fixe (oléoduc)',1),(119,1,'NAV','Transport par navigation intérieure',1),(120,1,'PRO','Propulsion propre',1),(121,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(122,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(123,1,'ROU','Transport par route',1),(124,1,'AIR','Transport par air',1),(125,1,'POS','Envois postaux',1),(126,1,'OLE','Installations de transport fixe (oléoduc)',1),(127,1,'NAV','Transport par navigation intérieure',1),(128,1,'PRO','Propulsion propre',1),(129,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(130,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(131,1,'ROU','Transport par route',1),(132,1,'AIR','Transport par air',1),(133,1,'POS','Envois postaux',1),(134,1,'OLE','Installations de transport fixe (oléoduc)',1),(135,1,'NAV','Transport par navigation intérieure',1),(136,1,'PRO','Propulsion propre',1),(137,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(138,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(139,1,'ROU','Transport par route',1),(140,1,'AIR','Transport par air',1),(141,1,'POS','Envois postaux',1),(142,1,'OLE','Installations de transport fixe (oléoduc)',1),(143,1,'NAV','Transport par navigation intérieure',1),(144,1,'PRO','Propulsion propre',1),(145,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(146,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(147,1,'ROU','Transport par route',1),(148,1,'AIR','Transport par air',1),(149,1,'POS','Envois postaux',1),(150,1,'OLE','Installations de transport fixe (oléoduc)',1),(151,1,'NAV','Transport par navigation intérieure',1),(152,1,'PRO','Propulsion propre',1),(153,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(154,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(155,1,'ROU','Transport par route',1),(156,1,'AIR','Transport par air',1),(157,1,'POS','Envois postaux',1),(158,1,'OLE','Installations de transport fixe (oléoduc)',1),(159,1,'NAV','Transport par navigation intérieure',1),(160,1,'PRO','Propulsion propre',1),(161,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(162,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(163,1,'ROU','Transport par route',1),(164,1,'AIR','Transport par air',1),(165,1,'POS','Envois postaux',1),(166,1,'OLE','Installations de transport fixe (oléoduc)',1),(167,1,'NAV','Transport par navigation intérieure',1),(168,1,'PRO','Propulsion propre',1),(169,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(170,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(171,1,'ROU','Transport par route',1),(172,1,'AIR','Transport par air',1),(173,1,'POS','Envois postaux',1),(174,1,'OLE','Installations de transport fixe (oléoduc)',1),(175,1,'NAV','Transport par navigation intérieure',1),(176,1,'PRO','Propulsion propre',1),(177,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(178,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(179,1,'ROU','Transport par route',1),(180,1,'AIR','Transport par air',1),(181,1,'POS','Envois postaux',1),(182,1,'OLE','Installations de transport fixe (oléoduc)',1),(183,1,'NAV','Transport par navigation intérieure',1),(184,1,'PRO','Propulsion propre',1),(185,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(186,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(187,1,'ROU','Transport par route',1),(188,1,'AIR','Transport par air',1),(189,1,'POS','Envois postaux',1),(190,1,'OLE','Installations de transport fixe (oléoduc)',1),(191,1,'NAV','Transport par navigation intérieure',1),(192,1,'PRO','Propulsion propre',1),(193,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(194,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(195,1,'ROU','Transport par route',1),(196,1,'AIR','Transport par air',1),(197,1,'POS','Envois postaux',1),(198,1,'OLE','Installations de transport fixe (oléoduc)',1),(199,1,'NAV','Transport par navigation intérieure',1),(200,1,'PRO','Propulsion propre',1),(201,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(202,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(203,1,'ROU','Transport par route',1),(204,1,'AIR','Transport par air',1),(205,1,'POS','Envois postaux',1),(206,1,'OLE','Installations de transport fixe (oléoduc)',1),(207,1,'NAV','Transport par navigation intérieure',1),(208,1,'PRO','Propulsion propre',1),(209,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(210,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(211,1,'ROU','Transport par route',1),(212,1,'AIR','Transport par air',1),(213,1,'POS','Envois postaux',1),(214,1,'OLE','Installations de transport fixe (oléoduc)',1),(215,1,'NAV','Transport par navigation intérieure',1),(216,1,'PRO','Propulsion propre',1),(217,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(218,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(219,1,'ROU','Transport par route',1),(220,1,'AIR','Transport par air',1),(221,1,'POS','Envois postaux',1),(222,1,'OLE','Installations de transport fixe (oléoduc)',1),(223,1,'NAV','Transport par navigation intérieure',1),(224,1,'PRO','Propulsion propre',1),(225,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(226,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(227,1,'ROU','Transport par route',1),(228,1,'AIR','Transport par air',1),(229,1,'POS','Envois postaux',1),(230,1,'OLE','Installations de transport fixe (oléoduc)',1),(231,1,'NAV','Transport par navigation intérieure',1),(232,1,'PRO','Propulsion propre',1),(233,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(234,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(235,1,'ROU','Transport par route',1),(236,1,'AIR','Transport par air',1),(237,1,'POS','Envois postaux',1),(238,1,'OLE','Installations de transport fixe (oléoduc)',1),(239,1,'NAV','Transport par navigation intérieure',1),(240,1,'PRO','Propulsion propre',1),(241,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(242,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(243,1,'ROU','Transport par route',1),(244,1,'AIR','Transport par air',1),(245,1,'POS','Envois postaux',1),(246,1,'OLE','Installations de transport fixe (oléoduc)',1),(247,1,'NAV','Transport par navigation intérieure',1),(248,1,'PRO','Propulsion propre',1),(249,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(250,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(251,1,'ROU','Transport par route',1),(252,1,'AIR','Transport par air',1),(253,1,'POS','Envois postaux',1),(254,1,'OLE','Installations de transport fixe (oléoduc)',1),(255,1,'NAV','Transport par navigation intérieure',1),(256,1,'PRO','Propulsion propre',1),(257,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(258,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(259,1,'ROU','Transport par route',1),(260,1,'AIR','Transport par air',1),(261,1,'POS','Envois postaux',1),(262,1,'OLE','Installations de transport fixe (oléoduc)',1),(263,1,'NAV','Transport par navigation intérieure',1),(264,1,'PRO','Propulsion propre',1),(265,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(266,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(267,1,'ROU','Transport par route',1),(268,1,'AIR','Transport par air',1),(269,1,'POS','Envois postaux',1),(270,1,'OLE','Installations de transport fixe (oléoduc)',1),(271,1,'NAV','Transport par navigation intérieure',1),(272,1,'PRO','Propulsion propre',1),(273,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(274,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(275,1,'ROU','Transport par route',1),(276,1,'AIR','Transport par air',1),(277,1,'POS','Envois postaux',1),(278,1,'OLE','Installations de transport fixe (oléoduc)',1),(279,1,'NAV','Transport par navigation intérieure',1),(280,1,'PRO','Propulsion propre',1),(281,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(282,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(283,1,'ROU','Transport par route',1),(284,1,'AIR','Transport par air',1),(285,1,'POS','Envois postaux',1),(286,1,'OLE','Installations de transport fixe (oléoduc)',1),(287,1,'NAV','Transport par navigation intérieure',1),(288,1,'PRO','Propulsion propre',1),(289,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(290,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(291,1,'ROU','Transport par route',1),(292,1,'AIR','Transport par air',1),(293,1,'POS','Envois postaux',1),(294,1,'OLE','Installations de transport fixe (oléoduc)',1),(295,1,'NAV','Transport par navigation intérieure',1),(296,1,'PRO','Propulsion propre',1),(297,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(298,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(299,1,'ROU','Transport par route',1),(300,1,'AIR','Transport par air',1),(301,1,'POS','Envois postaux',1),(302,1,'OLE','Installations de transport fixe (oléoduc)',1),(303,1,'NAV','Transport par navigation intérieure',1),(304,1,'PRO','Propulsion propre',1),(305,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(306,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(307,1,'ROU','Transport par route',1),(308,1,'AIR','Transport par air',1),(309,1,'POS','Envois postaux',1),(310,1,'OLE','Installations de transport fixe (oléoduc)',1),(311,1,'NAV','Transport par navigation intérieure',1),(312,1,'PRO','Propulsion propre',1);
+/*!40000 ALTER TABLE `llx_c_transport_mode` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_c_tva`
 --
@@ -3076,6 +3597,64 @@ INSERT INTO `llx_c_typent` VALUES (0,'TE_UNKNOWN','-',NULL,1,NULL,0),(1,'TE_STAR
 /*!40000 ALTER TABLE `llx_c_typent` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_c_ultimatepdf_line`
+--
+
+DROP TABLE IF EXISTS `llx_c_ultimatepdf_line`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_ultimatepdf_line` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `code` varchar(30) NOT NULL,
+  `label` varchar(255) NOT NULL,
+  `description` varchar(128) NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_ultimatepdf_line` (`code`,`entity`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_ultimatepdf_line`
+--
+
+LOCK TABLES `llx_c_ultimatepdf_line` WRITE;
+/*!40000 ALTER TABLE `llx_c_ultimatepdf_line` DISABLE KEYS */;
+INSERT INTO `llx_c_ultimatepdf_line` VALUES (1,1,'TEXTE1','Garantie 2 ans pièces et main d\'œuvre, retour en atelier (Hors filtre et pièce d\'usure)','texte de garantie',1);
+/*!40000 ALTER TABLE `llx_c_ultimatepdf_line` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_ultimatepdf_title`
+--
+
+DROP TABLE IF EXISTS `llx_c_ultimatepdf_title`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_ultimatepdf_title` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `code` varchar(30) NOT NULL,
+  `label` varchar(128) NOT NULL,
+  `description` varchar(255) NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_ultimatepdf_title` (`code`,`entity`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_ultimatepdf_title`
+--
+
+LOCK TABLES `llx_c_ultimatepdf_title` WRITE;
+/*!40000 ALTER TABLE `llx_c_ultimatepdf_title` DISABLE KEYS */;
+INSERT INTO `llx_c_ultimatepdf_title` VALUES (1,1,'TITLE1','Facture Proforma','Facture proforma',1);
+/*!40000 ALTER TABLE `llx_c_ultimatepdf_title` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_c_units`
 --
@@ -4116,7 +4695,7 @@ CREATE TABLE `llx_commande` (
   `fk_currency` varchar(3) COLLATE utf8_unicode_ci DEFAULT NULL,
   `fk_cond_reglement` int(11) DEFAULT NULL,
   `fk_mode_reglement` int(11) DEFAULT NULL,
-  `date_livraison` date DEFAULT NULL,
+  `date_livraison` datetime DEFAULT NULL,
   `fk_shipping_method` int(11) DEFAULT NULL,
   `fk_warehouse` int(11) DEFAULT NULL,
   `fk_availability` int(11) DEFAULT NULL,
@@ -4158,7 +4737,7 @@ CREATE TABLE `llx_commande` (
 
 LOCK TABLES `llx_commande` WRITE;
 /*!40000 ALTER TABLE `llx_commande` DISABLE KEYS */;
-INSERT INTO `llx_commande` VALUES (1,'2020-06-12 17:12:08',1,NULL,'CO1107-0002',1,NULL,NULL,'','2013-07-20 15:23:12','2019-08-08 13:59:09',NULL,'2019-07-20',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,1,1,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(2,'2020-06-12 17:12:08',1,NULL,'CO1107-0003',1,NULL,NULL,'','2013-07-20 23:20:12','2020-02-12 17:06:51',NULL,'2019-07-21',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(3,'2020-06-12 17:12:08',1,NULL,'CO1107-0004',1,NULL,NULL,'','2013-07-20 23:22:53','2020-02-17 18:27:56',NULL,'2019-07-21',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,30.00000000,30.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(5,'2020-06-12 17:12:08',1,NULL,'CO1108-0001',1,NULL,NULL,'','2013-08-08 03:04:11','2019-08-08 03:04:21',NULL,'2019-08-08',1,NULL,1,NULL,NULL,2,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(6,'2020-06-12 17:12:08',19,NULL,'(PROV6)',1,NULL,NULL,'','2015-02-17 16:22:14',NULL,NULL,'2020-02-17',1,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'','','einstein',0,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,'commande/(PROV6)/(PROV6).pdf',NULL,NULL),(17,'2020-06-12 17:12:08',4,NULL,'CO7001-0005',1,NULL,NULL,NULL,'2017-02-15 23:50:34','2019-02-15 23:50:34',NULL,'2020-05-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,509.00000000,509.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,509.00000000,0.00000000,509.00000000,NULL,NULL,NULL),(18,'2020-06-12 17:12:08',7,4,'CO7001-0006',1,NULL,NULL,NULL,'2017-02-15 23:51:23','2020-02-15 23:51:23',NULL,'2020-02-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,900.00000000,900.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,900.00000000,0.00000000,900.00000000,NULL,NULL,NULL),(20,'2020-06-12 17:12:08',4,NULL,'CO7001-0007',1,NULL,NULL,NULL,'2017-02-15 23:55:52','2019-02-15 23:55:52',NULL,'2020-04-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,330.00000000,330.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,330.00000000,0.00000000,330.00000000,NULL,NULL,NULL),(29,'2020-06-12 17:12:08',4,NULL,'CO7001-0008',1,NULL,NULL,NULL,'2017-02-16 00:03:44','2020-02-16 00:03:44',NULL,'2020-02-12',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,457.00000000,457.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,457.00000000,0.00000000,457.00000000,NULL,NULL,NULL),(34,'2020-06-12 17:12:08',11,NULL,'CO7001-0009',1,NULL,NULL,NULL,'2017-02-16 00:05:01','2020-02-16 00:05:01',NULL,'2020-01-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,124.00000000,124.00000000,'','','',0,NULL,NULL,2,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,124.00000000,0.00000000,124.00000000,NULL,NULL,NULL),(38,'2020-06-12 17:12:08',3,NULL,'CO7001-0010',1,NULL,NULL,NULL,'2017-02-16 00:05:01','2020-02-16 00:05:01',NULL,'2020-02-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,200.00000000,200.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,200.00000000,0.00000000,200.00000000,NULL,NULL,NULL),(40,'2020-06-12 17:12:08',11,NULL,'CO7001-0011',1,NULL,NULL,NULL,'2017-02-16 00:05:10','2020-02-16 00:05:11',NULL,'2020-01-23',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,1210.00000000,1210.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1210.00000000,0.00000000,1210.00000000,NULL,NULL,NULL),(43,'2020-06-12 17:12:08',10,NULL,'CO7001-0012',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2020-02-16 00:05:11',NULL,'2020-02-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,478.00000000,478.00000000,'','','',0,NULL,NULL,2,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,478.00000000,0.00000000,478.00000000,NULL,NULL,NULL),(47,'2020-06-12 17:12:08',1,NULL,'CO7001-0013',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2019-02-16 00:05:11',NULL,'2019-11-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,55.00000000,55.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,55.00000000,0.00000000,55.00000000,NULL,NULL,NULL),(48,'2020-06-12 17:12:08',4,NULL,'CO7001-0014',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2019-02-16 00:05:11',NULL,'2019-07-30',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,540.00000000,540.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,540.00000000,0.00000000,540.00000000,NULL,NULL,NULL),(50,'2020-06-12 17:12:08',1,NULL,'CO7001-0015',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2020-02-16 00:05:26',NULL,'2019-12-12',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,118.00000000,118.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,118.00000000,0.00000000,118.00000000,NULL,NULL,NULL),(54,'2020-06-12 17:12:08',12,NULL,'CO7001-0016',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2019-02-16 00:05:26','2019-02-16 03:05:56','2020-06-03',12,NULL,12,12,1,3,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,220.00000000,220.00000000,'','','',1,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,220.00000000,0.00000000,220.00000000,NULL,NULL,NULL),(58,'2020-06-12 17:12:08',1,NULL,'CO7001-0017',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2019-02-16 00:05:26',NULL,'2019-07-23',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,436.00000000,436.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,436.00000000,0.00000000,436.00000000,NULL,NULL,NULL),(62,'2020-06-12 17:12:08',19,NULL,'CO7001-0018',1,NULL,NULL,NULL,'2017-02-16 00:05:35','2019-02-16 00:05:35','2020-12-20 20:48:55','2020-02-23',12,NULL,12,12,1,3,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,410.00000000,410.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,410.00000000,0.00000000,410.00000000,NULL,NULL,NULL),(68,'2020-06-12 17:12:08',3,NULL,'CO7001-0019',1,NULL,NULL,NULL,'2017-02-16 00:05:35','2019-02-16 00:05:35',NULL,'2020-05-19',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,45.00000000,45.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,45.00000000,0.00000000,45.00000000,NULL,NULL,NULL),(72,'2020-06-12 17:12:08',6,NULL,'CO7001-0020',1,NULL,NULL,NULL,'2017-02-16 00:05:36','2019-02-16 00:05:36','2021-01-16 02:42:56','2019-11-13',12,NULL,12,12,1,3,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,610.00000000,610.00000000,'','','',1,NULL,NULL,NULL,NULL,NULL,2,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,610.00000000,0.00000000,610.00000000,NULL,NULL,NULL),(75,'2020-06-12 17:12:08',4,NULL,'CO7001-0021',1,NULL,NULL,NULL,'2017-02-16 00:05:37','2019-02-16 04:14:20',NULL,'2020-02-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,25.00000000,49.88000000,0.00000000,1200.00000000,1274.88000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1200.00000000,25.00000000,1274.88000000,NULL,NULL,NULL),(78,'2020-06-12 17:12:08',12,NULL,'CO7001-0022',1,NULL,NULL,NULL,'2017-02-16 00:05:37','2019-02-16 00:05:37',NULL,'2019-10-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,928.00000000,928.00000000,'','','',0,NULL,NULL,2,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,928.00000000,0.00000000,928.00000000,NULL,NULL,NULL),(81,'2020-06-12 17:12:08',11,NULL,'CO7001-0023',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2019-02-16 00:05:38',NULL,'2019-07-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,725.00000000,725.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,725.00000000,0.00000000,725.00000000,NULL,NULL,NULL),(83,'2020-06-12 17:12:08',26,NULL,'CO7001-0024',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2019-02-16 00:05:38',NULL,'2020-04-03',12,NULL,12,NULL,1,-1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,105.00000000,105.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,105.00000000,0.00000000,105.00000000,NULL,NULL,NULL),(84,'2020-06-12 17:12:08',2,NULL,'CO7001-0025',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2019-02-16 00:05:38',NULL,'2019-06-19',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,510.00000000,510.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,510.00000000,0.00000000,510.00000000,NULL,NULL,NULL),(85,'2020-06-12 17:12:08',1,NULL,'CO7001-0026',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2019-02-16 00:05:38',NULL,'2020-01-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,47.00000000,47.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,47.00000000,0.00000000,47.00000000,NULL,NULL,NULL),(88,'2020-01-15 18:41:17',10,NULL,'CO7001-0027',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2019-12-20 20:42:42',NULL,'2019-12-23',12,12,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,'This is a private note','This is a public note','',0,NULL,NULL,1,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,'commande/CO7001-0027/CO7001-0027.pdf',NULL,NULL),(90,'2020-06-12 17:12:08',19,NULL,'(PROV90)',1,NULL,NULL,NULL,'2017-02-16 04:46:31',NULL,NULL,'2020-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,440.00000000,440.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,440.00000000,0.00000000,440.00000000,NULL,NULL,NULL),(91,'2020-06-12 17:12:08',1,NULL,'(PROV91)',1,NULL,NULL,NULL,'2017-02-16 04:46:37',NULL,NULL,'2020-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,1000.00000000,1000.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,NULL,NULL,NULL),(92,'2020-06-12 17:12:08',3,NULL,'(PROV92)',1,NULL,NULL,NULL,'2017-02-16 04:47:25',NULL,NULL,'2020-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,1018.00000000,1018.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1018.00000000,0.00000000,1018.00000000,NULL,NULL,NULL),(93,'2019-09-27 17:33:29',10,NULL,'(PROV93)',1,NULL,NULL,NULL,'2019-09-27 19:32:53',NULL,NULL,'2019-09-27',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,'commande/(PROV93)/(PROV93).pdf',NULL,NULL),(94,'2019-12-20 16:49:54',1,NULL,'(PROV94)',1,NULL,NULL,NULL,'2019-12-20 20:49:54',NULL,NULL,'2019-12-20',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,1000.00000000,1000.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,NULL,NULL,NULL),(95,'2019-12-20 16:50:23',1,NULL,'(PROV95)',1,NULL,NULL,NULL,'2019-12-20 20:50:23',NULL,NULL,'2019-12-20',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,1000.00000000,1000.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,NULL,NULL,NULL),(96,'2020-01-07 19:39:09',10,6,'(PROV96)',1,NULL,NULL,NULL,'2020-01-07 23:39:09',NULL,NULL,'2020-01-07',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'aaa','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,NULL,NULL,NULL),(97,'2020-01-07 19:43:06',10,6,'(PROV97)',1,NULL,NULL,NULL,'2020-01-07 23:43:06',NULL,NULL,'2020-01-07',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'aaa','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,NULL,NULL,NULL),(98,'2020-01-19 13:22:34',1,NULL,'(PROV98)',1,NULL,NULL,NULL,'2020-01-19 14:22:34',NULL,NULL,'2020-01-19',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.45000000,0.45000000,3.00000000,3.90000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,3.00000000,0.00000000,3.90000000,NULL,NULL,NULL),(99,'2020-01-19 13:24:27',1,NULL,'(PROV99)',1,NULL,NULL,NULL,'2020-01-19 14:24:27',NULL,NULL,'2020-01-19',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.24000000,0.00000000,0.00000000,4.00000000,4.24000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,4.00000000,0.24000000,4.24000000,NULL,NULL,NULL);
+INSERT INTO `llx_commande` VALUES (1,'2020-12-10 12:24:22',1,NULL,'CO1107-0002',1,NULL,NULL,'','2013-07-20 15:23:12','2020-08-08 13:59:09',NULL,'2020-07-20',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,1,1,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(2,'2020-12-10 12:24:22',1,NULL,'CO1107-0003',1,NULL,NULL,'','2013-07-20 23:20:12','2020-02-12 17:06:51',NULL,'2020-07-21',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(3,'2020-12-10 12:24:22',1,NULL,'CO1107-0004',1,NULL,NULL,'','2013-07-20 23:22:53','2020-02-17 18:27:56',NULL,'2020-07-21',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,30.00000000,30.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(5,'2020-12-10 12:24:22',1,NULL,'CO1108-0001',1,NULL,NULL,'','2013-08-08 03:04:11','2020-08-08 03:04:21',NULL,'2020-08-08',1,NULL,1,NULL,NULL,2,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(6,'2020-06-12 17:12:08',19,NULL,'(PROV6)',1,NULL,NULL,'','2015-02-17 16:22:14',NULL,NULL,'2020-02-17',1,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'','','einstein',0,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,'commande/(PROV6)/(PROV6).pdf',NULL,NULL),(17,'2020-06-12 17:12:08',4,NULL,'CO7001-0005',1,NULL,NULL,NULL,'2017-02-15 23:50:34','2019-02-15 23:50:34',NULL,'2020-05-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,509.00000000,509.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,509.00000000,0.00000000,509.00000000,NULL,NULL,NULL),(18,'2020-06-12 17:12:08',7,4,'CO7001-0006',1,NULL,NULL,NULL,'2017-02-15 23:51:23','2020-02-15 23:51:23',NULL,'2020-02-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,900.00000000,900.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,900.00000000,0.00000000,900.00000000,NULL,NULL,NULL),(20,'2020-06-12 17:12:08',4,NULL,'CO7001-0007',1,NULL,NULL,NULL,'2017-02-15 23:55:52','2019-02-15 23:55:52',NULL,'2020-04-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,330.00000000,330.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,330.00000000,0.00000000,330.00000000,NULL,NULL,NULL),(29,'2020-06-12 17:12:08',4,NULL,'CO7001-0008',1,NULL,NULL,NULL,'2017-02-16 00:03:44','2020-02-16 00:03:44',NULL,'2020-02-12',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,457.00000000,457.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,457.00000000,0.00000000,457.00000000,NULL,NULL,NULL),(34,'2020-06-12 17:12:08',11,NULL,'CO7001-0009',1,NULL,NULL,NULL,'2017-02-16 00:05:01','2020-02-16 00:05:01',NULL,'2020-01-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,124.00000000,124.00000000,'','','',0,NULL,NULL,2,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,124.00000000,0.00000000,124.00000000,NULL,NULL,NULL),(38,'2020-06-12 17:12:08',3,NULL,'CO7001-0010',1,NULL,NULL,NULL,'2017-02-16 00:05:01','2020-02-16 00:05:01',NULL,'2020-02-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,200.00000000,200.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,200.00000000,0.00000000,200.00000000,NULL,NULL,NULL),(40,'2020-06-12 17:12:08',11,NULL,'CO7001-0011',1,NULL,NULL,NULL,'2017-02-16 00:05:10','2020-02-16 00:05:11',NULL,'2020-01-23',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,1210.00000000,1210.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1210.00000000,0.00000000,1210.00000000,NULL,NULL,NULL),(43,'2020-06-12 17:12:08',10,NULL,'CO7001-0012',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2020-02-16 00:05:11',NULL,'2020-02-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,478.00000000,478.00000000,'','','',0,NULL,NULL,2,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,478.00000000,0.00000000,478.00000000,NULL,NULL,NULL),(47,'2020-12-10 12:24:22',1,NULL,'CO7001-0013',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2020-02-16 00:05:11',NULL,'2020-11-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,55.00000000,55.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,55.00000000,0.00000000,55.00000000,NULL,NULL,NULL),(48,'2020-12-10 12:24:22',4,NULL,'CO7001-0014',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2020-02-16 00:05:11',NULL,'2020-07-30',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,540.00000000,540.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,540.00000000,0.00000000,540.00000000,NULL,NULL,NULL),(50,'2020-06-12 17:12:08',1,NULL,'CO7001-0015',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2020-02-16 00:05:26',NULL,'2019-12-12',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,118.00000000,118.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,118.00000000,0.00000000,118.00000000,NULL,NULL,NULL),(54,'2020-06-12 17:12:08',12,NULL,'CO7001-0016',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2019-02-16 00:05:26','2019-02-16 03:05:56','2020-06-03',12,NULL,12,12,1,3,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,220.00000000,220.00000000,'','','',1,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,220.00000000,0.00000000,220.00000000,NULL,NULL,NULL),(58,'2020-12-10 12:24:22',1,NULL,'CO7001-0017',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2020-02-16 00:05:26',NULL,'2020-07-23',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,436.00000000,436.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,436.00000000,0.00000000,436.00000000,NULL,NULL,NULL),(62,'2020-06-12 17:12:08',19,NULL,'CO7001-0018',1,NULL,NULL,NULL,'2017-02-16 00:05:35','2019-02-16 00:05:35','2020-12-20 20:48:55','2020-02-23',12,NULL,12,12,1,3,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,410.00000000,410.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,410.00000000,0.00000000,410.00000000,NULL,NULL,NULL),(68,'2020-06-12 17:12:08',3,NULL,'CO7001-0019',1,NULL,NULL,NULL,'2017-02-16 00:05:35','2019-02-16 00:05:35',NULL,'2020-05-19',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,45.00000000,45.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,45.00000000,0.00000000,45.00000000,NULL,NULL,NULL),(72,'2020-12-10 12:24:22',6,NULL,'CO7001-0020',1,NULL,NULL,NULL,'2017-02-16 00:05:36','2020-02-16 00:05:36','2021-01-16 02:42:56','2020-11-13',12,NULL,12,12,1,3,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,610.00000000,610.00000000,'','','',1,NULL,NULL,NULL,NULL,NULL,2,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,610.00000000,0.00000000,610.00000000,NULL,NULL,NULL),(75,'2020-06-12 17:12:08',4,NULL,'CO7001-0021',1,NULL,NULL,NULL,'2017-02-16 00:05:37','2019-02-16 04:14:20',NULL,'2020-02-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,25.00000000,49.88000000,0.00000000,1200.00000000,1274.88000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1200.00000000,25.00000000,1274.88000000,NULL,NULL,NULL),(78,'2020-12-10 12:24:22',12,NULL,'CO7001-0022',1,NULL,NULL,NULL,'2017-02-16 00:05:37','2020-02-16 00:05:37',NULL,'2020-10-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,928.00000000,928.00000000,'','','',0,NULL,NULL,2,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,928.00000000,0.00000000,928.00000000,NULL,NULL,NULL),(81,'2020-12-10 12:24:22',11,NULL,'CO7001-0023',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2020-02-16 00:05:38',NULL,'2020-07-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,725.00000000,725.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,725.00000000,0.00000000,725.00000000,NULL,NULL,NULL),(83,'2020-06-12 17:12:08',26,NULL,'CO7001-0024',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2019-02-16 00:05:38',NULL,'2020-04-03',12,NULL,12,NULL,1,-1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,105.00000000,105.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,105.00000000,0.00000000,105.00000000,NULL,NULL,NULL),(84,'2020-12-10 12:24:22',2,NULL,'CO7001-0025',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2020-02-16 00:05:38',NULL,'2020-06-19',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,510.00000000,510.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,510.00000000,0.00000000,510.00000000,NULL,NULL,NULL),(85,'2020-06-12 17:12:08',1,NULL,'CO7001-0026',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2019-02-16 00:05:38',NULL,'2020-01-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,47.00000000,47.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,47.00000000,0.00000000,47.00000000,NULL,NULL,NULL),(88,'2020-01-15 18:41:17',10,NULL,'CO7001-0027',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2019-12-20 20:42:42',NULL,'2019-12-23',12,12,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,'This is a private note','This is a public note','',0,NULL,NULL,1,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,'commande/CO7001-0027/CO7001-0027.pdf',NULL,NULL),(90,'2020-06-12 17:12:08',19,NULL,'(PROV90)',1,NULL,NULL,NULL,'2017-02-16 04:46:31',NULL,NULL,'2020-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,440.00000000,440.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,440.00000000,0.00000000,440.00000000,NULL,NULL,NULL),(91,'2020-06-12 17:12:08',1,NULL,'(PROV91)',1,NULL,NULL,NULL,'2017-02-16 04:46:37',NULL,NULL,'2020-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,1000.00000000,1000.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,NULL,NULL,NULL),(92,'2020-06-12 17:12:08',3,NULL,'(PROV92)',1,NULL,NULL,NULL,'2017-02-16 04:47:25',NULL,NULL,'2020-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,1018.00000000,1018.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1018.00000000,0.00000000,1018.00000000,NULL,NULL,NULL),(93,'2020-12-10 12:24:22',10,NULL,'(PROV93)',1,NULL,NULL,NULL,'2019-09-27 19:32:53',NULL,NULL,'2020-09-27',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,'commande/(PROV93)/(PROV93).pdf',NULL,NULL),(94,'2019-12-20 16:49:54',1,NULL,'(PROV94)',1,NULL,NULL,NULL,'2019-12-20 20:49:54',NULL,NULL,'2019-12-20',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,1000.00000000,1000.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,NULL,NULL,NULL),(95,'2019-12-20 16:50:23',1,NULL,'(PROV95)',1,NULL,NULL,NULL,'2019-12-20 20:50:23',NULL,NULL,'2019-12-20',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,1000.00000000,1000.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,NULL,NULL,NULL),(96,'2020-01-07 19:39:09',10,6,'(PROV96)',1,NULL,NULL,NULL,'2020-01-07 23:39:09',NULL,NULL,'2020-01-07',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'aaa','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,NULL,NULL,NULL),(97,'2020-01-07 19:43:06',10,6,'(PROV97)',1,NULL,NULL,NULL,'2020-01-07 23:43:06',NULL,NULL,'2020-01-07',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'aaa','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,NULL,NULL,NULL),(98,'2020-01-19 13:22:34',1,NULL,'(PROV98)',1,NULL,NULL,NULL,'2020-01-19 14:22:34',NULL,NULL,'2020-01-19',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.45000000,0.45000000,3.00000000,3.90000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,3.00000000,0.00000000,3.90000000,NULL,NULL,NULL),(99,'2020-01-19 13:24:27',1,NULL,'(PROV99)',1,NULL,NULL,NULL,'2020-01-19 14:24:27',NULL,NULL,'2020-01-19',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.24000000,0.00000000,0.00000000,4.00000000,4.24000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,4.00000000,0.24000000,4.24000000,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_commande` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4259,7 +4838,7 @@ CREATE TABLE `llx_commande_fournisseur` (
 
 LOCK TABLES `llx_commande_fournisseur` WRITE;
 /*!40000 ALTER TABLE `llx_commande_fournisseur` DISABLE KEYS */;
-INSERT INTO `llx_commande_fournisseur` VALUES (1,'2020-06-12 17:12:08',13,'CF1007-0001',1,NULL,NULL,NULL,'2020-07-11 17:13:40','2020-02-01 18:51:42','2020-02-01 18:52:04',NULL,'2020-02-01',1,NULL,12,12,NULL,0,5,0,0.00000000,0,0,39.20000000,0.00000000,0.00000000,200.00000000,239.20000000,NULL,NULL,'muscadet',2,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(2,'2020-06-12 17:12:09',1,'CF1007-0002',1,NULL,NULL,NULL,'2019-07-11 18:46:28','2019-07-11 18:47:33',NULL,NULL,'2019-07-11',1,NULL,1,NULL,NULL,0,3,0,0.00000000,0,0,0.00000000,0.00000000,0.00000000,200.00000000,200.00000000,NULL,NULL,'muscadet',4,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(3,'2020-01-20 11:22:53',17,'(PROV3)',1,NULL,NULL,NULL,'2013-08-04 23:00:52',NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,0,0,0,0.00000000,0,0,0.00000000,0.00000000,0.00000000,1079.17000000,1079.17000000,NULL,NULL,'muscadet',0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'USD',1.20000000,1295.00000000,0.00000000,1295.00000000,NULL),(4,'2020-01-20 11:19:49',17,'(PROV4)',1,NULL,NULL,NULL,'2013-08-04 23:19:32',NULL,NULL,NULL,NULL,1,12,NULL,NULL,NULL,0,0,0,0.00000000,0,0,11.88000000,0.00000000,0.00000000,174.17000000,186.05000000,'Private note','Public note','muscadet',0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'EUR',1.00000000,174.17000000,11.88000000,186.05000000,NULL),(13,'2020-06-12 17:12:09',1,'CF1303-0004',1,NULL,NULL,NULL,'2020-03-09 19:39:18','2020-03-09 19:39:27','2020-03-09 19:39:32',NULL,'2020-03-09',1,NULL,1,1,NULL,0,2,0,0.00000000,0,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,NULL,NULL,'muscadet',1,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(14,'2020-01-20 11:20:11',1,'(PROV14)',1,NULL,'',NULL,'2020-01-20 12:20:11',NULL,NULL,NULL,NULL,12,NULL,NULL,NULL,NULL,0,0,0,NULL,0,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'','','muscadet',0,1,NULL,NULL,NULL,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,NULL);
+INSERT INTO `llx_commande_fournisseur` VALUES (1,'2020-06-12 17:12:08',13,'CF1007-0001',1,NULL,NULL,NULL,'2020-07-11 17:13:40','2020-02-01 18:51:42','2020-02-01 18:52:04',NULL,'2020-02-01',1,NULL,12,12,NULL,0,5,0,0.00000000,0,0,39.20000000,0.00000000,0.00000000,200.00000000,239.20000000,NULL,NULL,'muscadet',2,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(2,'2020-12-10 12:24:23',1,'CF1007-0002',1,NULL,NULL,NULL,'2020-07-11 18:46:28','2020-07-11 18:47:33',NULL,NULL,'2020-07-11',1,NULL,1,NULL,NULL,0,3,0,0.00000000,0,0,0.00000000,0.00000000,0.00000000,200.00000000,200.00000000,NULL,NULL,'muscadet',4,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(3,'2020-01-20 11:22:53',17,'(PROV3)',1,NULL,NULL,NULL,'2013-08-04 23:00:52',NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,0,0,0,0.00000000,0,0,0.00000000,0.00000000,0.00000000,1079.17000000,1079.17000000,NULL,NULL,'muscadet',0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'USD',1.20000000,1295.00000000,0.00000000,1295.00000000,NULL),(4,'2020-01-20 11:19:49',17,'(PROV4)',1,NULL,NULL,NULL,'2013-08-04 23:19:32',NULL,NULL,NULL,NULL,1,12,NULL,NULL,NULL,0,0,0,0.00000000,0,0,11.88000000,0.00000000,0.00000000,174.17000000,186.05000000,'Private note','Public note','muscadet',0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'EUR',1.00000000,174.17000000,11.88000000,186.05000000,NULL),(13,'2020-06-12 17:12:09',1,'CF1303-0004',1,NULL,NULL,NULL,'2020-03-09 19:39:18','2020-03-09 19:39:27','2020-03-09 19:39:32',NULL,'2020-03-09',1,NULL,1,1,NULL,0,2,0,0.00000000,0,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,NULL,NULL,'muscadet',1,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(14,'2020-01-20 11:20:11',1,'(PROV14)',1,NULL,'',NULL,'2020-01-20 12:20:11',NULL,NULL,NULL,NULL,12,NULL,NULL,NULL,NULL,0,0,0,NULL,0,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'','','muscadet',0,1,NULL,NULL,NULL,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,NULL);
 /*!40000 ALTER TABLE `llx_commande_fournisseur` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4428,6 +5007,8 @@ CREATE TABLE `llx_commande_fournisseurdet` (
   `multicurrency_total_ttc` double(24,8) DEFAULT 0.00000000,
   PRIMARY KEY (`rowid`),
   KEY `fk_commande_fournisseurdet_fk_unit` (`fk_unit`),
+  KEY `idx_commande_fournisseurdet_fk_commande` (`fk_commande`),
+  KEY `idx_commande_fournisseurdet_fk_product` (`fk_product`),
   CONSTRAINT `fk_commande_fournisseurdet_fk_unit` FOREIGN KEY (`fk_unit`) REFERENCES `llx_c_units` (`rowid`)
 ) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -4442,6 +5023,52 @@ INSERT INTO `llx_commande_fournisseurdet` VALUES (1,1,NULL,NULL,'','','Chips',19
 /*!40000 ALTER TABLE `llx_commande_fournisseurdet` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_commande_fournisseurdet_asset`
+--
+
+DROP TABLE IF EXISTS `llx_commande_fournisseurdet_asset`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_commande_fournisseurdet_asset` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_commandedet` int(11) NOT NULL DEFAULT 0,
+  `fk_product` int(11) NOT NULL DEFAULT 0,
+  `fk_warehouse` int(11) NOT NULL DEFAULT 0,
+  `rang` int(11) NOT NULL DEFAULT 0,
+  `lot_number` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `carton` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `numerosuivi` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `imei` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `firmware` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `serial_number` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `weight` double NOT NULL DEFAULT 0,
+  `weight_reel` double NOT NULL DEFAULT 0,
+  `tare` double NOT NULL DEFAULT 0,
+  `dluo` datetime DEFAULT NULL,
+  `weight_unit` int(11) NOT NULL DEFAULT 0,
+  `weight_reel_unit` int(11) NOT NULL DEFAULT 0,
+  `tare_unit` int(11) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `fk_commandedet` (`fk_commandedet`),
+  KEY `fk_product` (`fk_product`),
+  KEY `fk_warehouse` (`fk_warehouse`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_commande_fournisseurdet_asset`
+--
+
+LOCK TABLES `llx_commande_fournisseurdet_asset` WRITE;
+/*!40000 ALTER TABLE `llx_commande_fournisseurdet_asset` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_commande_fournisseurdet_asset` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_commande_fournisseurdet_extrafields`
 --
@@ -4481,6 +5108,7 @@ CREATE TABLE `llx_commandedet` (
   `fk_parent_line` int(11) DEFAULT NULL,
   `fk_product` int(11) DEFAULT NULL,
   `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
   `tva_tx` double(6,3) DEFAULT NULL,
   `vat_src_code` varchar(10) COLLATE utf8_unicode_ci DEFAULT '',
@@ -4533,7 +5161,7 @@ CREATE TABLE `llx_commandedet` (
 
 LOCK TABLES `llx_commandedet` WRITE;
 /*!40000 ALTER TABLE `llx_commandedet` DISABLE KEYS */;
-INSERT INTO `llx_commandedet` VALUES (1,1,NULL,NULL,NULL,'Product 1',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(2,1,NULL,2,NULL,'',0.000,'',0.000,'',0.000,'',1,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(3,1,NULL,5,NULL,'cccc',0.000,'',0.000,'',0.000,'',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(4,2,NULL,NULL,NULL,'hgf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(10,5,NULL,NULL,NULL,'gfdgdf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(14,3,NULL,NULL,NULL,'gdfgdf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,1,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(15,3,NULL,NULL,NULL,'fghfgh',0.000,'',0.000,'',0.000,'',1,0,0,NULL,20,20.00000000,20.00000000,0.00000000,0.00000000,0.00000000,20.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(16,17,NULL,2,NULL,'',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(17,17,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(18,17,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9,9.00000000,9.00000000,0.00000000,0.00000000,0.00000000,9.00000000,1,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',9.00000000,9.00000000,0.00000000,9.00000000),(19,18,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(20,18,NULL,3,NULL,'',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(21,18,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(24,20,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,5,5.00000000,20.00000000,0.00000000,0.00000000,0.00000000,20.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',5.00000000,20.00000000,0.00000000,20.00000000),(25,20,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,100,100.00000000,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,300.00000000,0.00000000,300.00000000),(26,20,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5,5.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(55,29,NULL,2,NULL,'',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(56,29,NULL,3,NULL,'',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(57,29,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(58,29,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,9,9.00000000,27.00000000,0.00000000,0.00000000,0.00000000,27.00000000,1,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',9.00000000,27.00000000,0.00000000,27.00000000),(59,29,NULL,5,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,10,10.00000000,30.00000000,0.00000000,0.00000000,0.00000000,30.00000000,0,NULL,NULL,0,NULL,0.00000000,0,5,NULL,NULL,NULL,0,'EUR',10.00000000,30.00000000,0.00000000,30.00000000),(75,34,NULL,3,NULL,'',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(76,34,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,5,5.00000000,15.00000000,0.00000000,0.00000000,0.00000000,15.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',5.00000000,15.00000000,0.00000000,15.00000000),(77,34,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100,100.00000000,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,100.00000000,0.00000000,100.00000000),(78,34,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9,9.00000000,9.00000000,0.00000000,0.00000000,0.00000000,9.00000000,1,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',9.00000000,9.00000000,0.00000000,9.00000000),(94,38,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(95,38,NULL,2,NULL,'',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(99,40,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(100,40,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(101,40,NULL,3,NULL,'',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(102,40,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5,5.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(103,40,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,5,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(112,43,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,9,9.00000000,18.00000000,0.00000000,0.00000000,0.00000000,18.00000000,1,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',9.00000000,18.00000000,0.00000000,18.00000000),(113,43,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,9,9.00000000,45.00000000,0.00000000,0.00000000,0.00000000,45.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',9.00000000,45.00000000,0.00000000,45.00000000),(114,43,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(115,43,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,5,5.00000000,15.00000000,0.00000000,0.00000000,0.00000000,15.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',5.00000000,15.00000000,0.00000000,15.00000000),(116,43,NULL,2,NULL,'',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,5,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(125,47,NULL,2,NULL,'',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(126,47,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,5,5.00000000,15.00000000,0.00000000,0.00000000,0.00000000,15.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',5.00000000,15.00000000,0.00000000,15.00000000),(127,47,NULL,3,NULL,'',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(128,47,NULL,5,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,10,10.00000000,40.00000000,0.00000000,0.00000000,0.00000000,40.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',10.00000000,40.00000000,0.00000000,40.00000000),(129,48,NULL,5,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,10,10.00000000,40.00000000,0.00000000,0.00000000,0.00000000,40.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',10.00000000,40.00000000,0.00000000,40.00000000),(130,48,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(134,50,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100,100.00000000,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,100.00000000,0.00000000,100.00000000),(135,50,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,9,9.00000000,18.00000000,0.00000000,0.00000000,0.00000000,18.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',9.00000000,18.00000000,0.00000000,18.00000000),(145,54,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(146,54,NULL,5,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,10,10.00000000,20.00000000,0.00000000,0.00000000,0.00000000,20.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',10.00000000,20.00000000,0.00000000,20.00000000),(158,58,NULL,2,NULL,'',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(159,58,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(160,58,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,9,9.00000000,36.00000000,0.00000000,0.00000000,0.00000000,36.00000000,1,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',9.00000000,36.00000000,0.00000000,36.00000000),(174,62,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5,5.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(175,62,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(176,62,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(198,68,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,9,9.00000000,45.00000000,0.00000000,0.00000000,0.00000000,45.00000000,1,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',9.00000000,45.00000000,0.00000000,45.00000000),(199,68,NULL,2,NULL,'',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(209,72,NULL,3,NULL,'',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(210,72,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(211,72,NULL,5,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',10.00000000,10.00000000,0.00000000,10.00000000),(212,72,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(213,72,NULL,3,NULL,'',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,5,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(227,75,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(235,78,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(236,78,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,9,9.00000000,18.00000000,0.00000000,0.00000000,0.00000000,18.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',9.00000000,18.00000000,0.00000000,18.00000000),(237,78,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5,5.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(238,78,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(246,81,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(247,81,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,100,100.00000000,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,300.00000000,0.00000000,300.00000000),(248,81,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,5,5.00000000,25.00000000,0.00000000,0.00000000,0.00000000,25.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',5.00000000,25.00000000,0.00000000,25.00000000),(253,83,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,5,5.00000000,5.00000000,0.00000000,0.00000000,0.00000000,5.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',5.00000000,5.00000000,0.00000000,5.00000000),(254,83,NULL,3,NULL,'',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(255,83,NULL,5,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,10,10.00000000,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',10.00000000,50.00000000,0.00000000,50.00000000),(256,83,NULL,5,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,10,10.00000000,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',10.00000000,50.00000000,0.00000000,50.00000000),(257,84,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(258,84,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5,5.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(259,84,NULL,3,NULL,'',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(260,85,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,9,9.00000000,27.00000000,0.00000000,0.00000000,0.00000000,27.00000000,1,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',9.00000000,27.00000000,0.00000000,27.00000000),(261,85,NULL,3,NULL,'',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(262,85,NULL,5,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,10,10.00000000,20.00000000,0.00000000,0.00000000,0.00000000,20.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',10.00000000,20.00000000,0.00000000,20.00000000),(271,88,NULL,5,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,10,10.00000000,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',10.00000000,50.00000000,0.00000000,50.00000000),(272,88,NULL,3,NULL,'',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(276,75,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100,100.00000000,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,90.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,100.00000000,0.00000000,100.00000000),(278,75,NULL,13,NULL,'A powerfull computer XP4523&nbsp;<br />\r\n(Code douane: USXP765 - Pays d&#39;origine: Etats-Unis)',5.000,'',9.975,'1',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,25.00000000,49.88000000,0.00000000,574.88000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,25.00000000,574.88000000),(279,75,NULL,13,NULL,'A powerfull computer XP4523&nbsp;<br>\n(Code douane: USXP765 - Pays d\'origine: Etats-Unis)',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(280,90,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5,5.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(281,90,NULL,5,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,10,10.00000000,30.00000000,0.00000000,0.00000000,0.00000000,30.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',10.00000000,30.00000000,0.00000000,30.00000000),(282,90,NULL,2,NULL,'',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(283,90,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(284,91,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,100,100.00000000,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,300.00000000,0.00000000,300.00000000),(285,91,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(286,91,NULL,13,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(287,92,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(288,92,NULL,13,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,100,100.00000000,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,300.00000000,0.00000000,300.00000000),(289,92,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(290,92,NULL,13,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100,100.00000000,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',100.00000000,100.00000000,0.00000000,100.00000000),(291,92,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,9,9.00000000,18.00000000,0.00000000,0.00000000,0.00000000,18.00000000,0,NULL,NULL,0,NULL,0.00000000,0,5,NULL,NULL,NULL,0,'EUR',9.00000000,18.00000000,0.00000000,18.00000000),(292,6,NULL,11,NULL,'A nice rollup',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,'',0.00000000,0.00000000,0.00000000,0.00000000),(295,93,NULL,11,NULL,'A nice rollup',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,1,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(296,94,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,100,100.00000000,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,'EUR',100.00000000,300.00000000,0.00000000,300.00000000),(297,94,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,NULL,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(298,94,NULL,13,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,NULL,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(299,95,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,100,100.00000000,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,'EUR',100.00000000,300.00000000,0.00000000,300.00000000),(300,95,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,NULL,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(301,95,NULL,13,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,NULL,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(302,96,NULL,NULL,NULL,'fd',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,'EUR',10.00000000,10.00000000,0.00000000,10.00000000),(303,97,NULL,NULL,NULL,'fd',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,'EUR',10.00000000,10.00000000,0.00000000,10.00000000),(304,98,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'CGST+SGST',9.000,'1',9.000,'1',1,0,0,NULL,5,5.00000000,5.00000000,0.00000000,0.45000000,0.45000000,5.90000000,0,NULL,NULL,0,NULL,10.00000000,0,1,NULL,NULL,NULL,NULL,'EUR',5.00000000,5.00000000,0.00000000,5.90000000),(305,98,NULL,NULL,NULL,'aaa',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,-2,-2.00000000,-2.00000000,0.00000000,0.00000000,0.00000000,-2.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,NULL,'EUR',-2.00000000,-2.00000000,0.00000000,-2.00000000),(306,99,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',4.000,'',0.000,'0',0.000,'0',1,0,0,NULL,6,6.00000000,6.00000000,0.24000000,0.00000000,0.00000000,6.24000000,0,NULL,NULL,0,NULL,10.00000000,0,1,NULL,NULL,NULL,NULL,'EUR',6.00000000,6.00000000,0.24000000,6.24000000),(307,99,NULL,NULL,NULL,'aaa',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,-2,-2.00000000,-2.00000000,0.00000000,0.00000000,0.00000000,-2.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,NULL,'EUR',-2.00000000,-2.00000000,0.00000000,-2.00000000);
+INSERT INTO `llx_commandedet` VALUES (1,1,NULL,NULL,NULL,NULL,'Product 1',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(2,1,NULL,2,NULL,NULL,'',0.000,'',0.000,'',0.000,'',1,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(3,1,NULL,5,NULL,NULL,'cccc',0.000,'',0.000,'',0.000,'',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(4,2,NULL,NULL,NULL,NULL,'hgf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(10,5,NULL,NULL,NULL,NULL,'gfdgdf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(14,3,NULL,NULL,NULL,NULL,'gdfgdf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,1,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(15,3,NULL,NULL,NULL,NULL,'fghfgh',0.000,'',0.000,'',0.000,'',1,0,0,NULL,20,20.00000000,20.00000000,0.00000000,0.00000000,0.00000000,20.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(16,17,NULL,2,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(17,17,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(18,17,NULL,12,NULL,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9,9.00000000,9.00000000,0.00000000,0.00000000,0.00000000,9.00000000,1,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',9.00000000,9.00000000,0.00000000,9.00000000),(19,18,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(20,18,NULL,3,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(21,18,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(24,20,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,5,5.00000000,20.00000000,0.00000000,0.00000000,0.00000000,20.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',5.00000000,20.00000000,0.00000000,20.00000000),(25,20,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,100,100.00000000,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,300.00000000,0.00000000,300.00000000),(26,20,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5,5.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(55,29,NULL,2,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(56,29,NULL,3,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(57,29,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(58,29,NULL,12,NULL,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,9,9.00000000,27.00000000,0.00000000,0.00000000,0.00000000,27.00000000,1,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',9.00000000,27.00000000,0.00000000,27.00000000),(59,29,NULL,5,NULL,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,10,10.00000000,30.00000000,0.00000000,0.00000000,0.00000000,30.00000000,0,NULL,NULL,0,NULL,0.00000000,0,5,NULL,NULL,NULL,0,'EUR',10.00000000,30.00000000,0.00000000,30.00000000),(75,34,NULL,3,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(76,34,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,5,5.00000000,15.00000000,0.00000000,0.00000000,0.00000000,15.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',5.00000000,15.00000000,0.00000000,15.00000000),(77,34,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100,100.00000000,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,100.00000000,0.00000000,100.00000000),(78,34,NULL,12,NULL,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9,9.00000000,9.00000000,0.00000000,0.00000000,0.00000000,9.00000000,1,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',9.00000000,9.00000000,0.00000000,9.00000000),(94,38,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(95,38,NULL,2,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(99,40,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(100,40,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(101,40,NULL,3,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(102,40,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5,5.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(103,40,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,5,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(112,43,NULL,12,NULL,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,9,9.00000000,18.00000000,0.00000000,0.00000000,0.00000000,18.00000000,1,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',9.00000000,18.00000000,0.00000000,18.00000000),(113,43,NULL,12,NULL,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,9,9.00000000,45.00000000,0.00000000,0.00000000,0.00000000,45.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',9.00000000,45.00000000,0.00000000,45.00000000),(114,43,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(115,43,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,5,5.00000000,15.00000000,0.00000000,0.00000000,0.00000000,15.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',5.00000000,15.00000000,0.00000000,15.00000000),(116,43,NULL,2,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,5,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(125,47,NULL,2,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(126,47,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,5,5.00000000,15.00000000,0.00000000,0.00000000,0.00000000,15.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',5.00000000,15.00000000,0.00000000,15.00000000),(127,47,NULL,3,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(128,47,NULL,5,NULL,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,10,10.00000000,40.00000000,0.00000000,0.00000000,0.00000000,40.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',10.00000000,40.00000000,0.00000000,40.00000000),(129,48,NULL,5,NULL,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,10,10.00000000,40.00000000,0.00000000,0.00000000,0.00000000,40.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',10.00000000,40.00000000,0.00000000,40.00000000),(130,48,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(134,50,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100,100.00000000,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,100.00000000,0.00000000,100.00000000),(135,50,NULL,12,NULL,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,9,9.00000000,18.00000000,0.00000000,0.00000000,0.00000000,18.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',9.00000000,18.00000000,0.00000000,18.00000000),(145,54,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(146,54,NULL,5,NULL,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,10,10.00000000,20.00000000,0.00000000,0.00000000,0.00000000,20.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',10.00000000,20.00000000,0.00000000,20.00000000),(158,58,NULL,2,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(159,58,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(160,58,NULL,12,NULL,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,9,9.00000000,36.00000000,0.00000000,0.00000000,0.00000000,36.00000000,1,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',9.00000000,36.00000000,0.00000000,36.00000000),(174,62,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5,5.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(175,62,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(176,62,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(198,68,NULL,12,NULL,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,9,9.00000000,45.00000000,0.00000000,0.00000000,0.00000000,45.00000000,1,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',9.00000000,45.00000000,0.00000000,45.00000000),(199,68,NULL,2,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(209,72,NULL,3,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(210,72,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(211,72,NULL,5,NULL,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',10.00000000,10.00000000,0.00000000,10.00000000),(212,72,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(213,72,NULL,3,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,5,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(227,75,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(235,78,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(236,78,NULL,12,NULL,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,9,9.00000000,18.00000000,0.00000000,0.00000000,0.00000000,18.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',9.00000000,18.00000000,0.00000000,18.00000000),(237,78,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5,5.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(238,78,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(246,81,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(247,81,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,100,100.00000000,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,300.00000000,0.00000000,300.00000000),(248,81,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,5,5.00000000,25.00000000,0.00000000,0.00000000,0.00000000,25.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',5.00000000,25.00000000,0.00000000,25.00000000),(253,83,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,5,5.00000000,5.00000000,0.00000000,0.00000000,0.00000000,5.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',5.00000000,5.00000000,0.00000000,5.00000000),(254,83,NULL,3,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(255,83,NULL,5,NULL,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,10,10.00000000,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',10.00000000,50.00000000,0.00000000,50.00000000),(256,83,NULL,5,NULL,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,10,10.00000000,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',10.00000000,50.00000000,0.00000000,50.00000000),(257,84,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(258,84,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5,5.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(259,84,NULL,3,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(260,85,NULL,12,NULL,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,9,9.00000000,27.00000000,0.00000000,0.00000000,0.00000000,27.00000000,1,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',9.00000000,27.00000000,0.00000000,27.00000000),(261,85,NULL,3,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(262,85,NULL,5,NULL,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,10,10.00000000,20.00000000,0.00000000,0.00000000,0.00000000,20.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',10.00000000,20.00000000,0.00000000,20.00000000),(271,88,NULL,5,NULL,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,10,10.00000000,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',10.00000000,50.00000000,0.00000000,50.00000000),(272,88,NULL,3,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(276,75,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100,100.00000000,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,90.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,100.00000000,0.00000000,100.00000000),(278,75,NULL,13,NULL,NULL,'A powerfull computer XP4523&nbsp;<br />\r\n(Code douane: USXP765 - Pays d&#39;origine: Etats-Unis)',5.000,'',9.975,'1',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,25.00000000,49.88000000,0.00000000,574.88000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,25.00000000,574.88000000),(279,75,NULL,13,NULL,NULL,'A powerfull computer XP4523&nbsp;<br>\n(Code douane: USXP765 - Pays d\'origine: Etats-Unis)',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(280,90,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5,5.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(281,90,NULL,5,NULL,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,10,10.00000000,30.00000000,0.00000000,0.00000000,0.00000000,30.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',10.00000000,30.00000000,0.00000000,30.00000000),(282,90,NULL,2,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(283,90,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(284,91,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,100,100.00000000,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,300.00000000,0.00000000,300.00000000),(285,91,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(286,91,NULL,13,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(287,92,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(288,92,NULL,13,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,100,100.00000000,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,300.00000000,0.00000000,300.00000000),(289,92,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(290,92,NULL,13,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100,100.00000000,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',100.00000000,100.00000000,0.00000000,100.00000000),(291,92,NULL,12,NULL,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,9,9.00000000,18.00000000,0.00000000,0.00000000,0.00000000,18.00000000,0,NULL,NULL,0,NULL,0.00000000,0,5,NULL,NULL,NULL,0,'EUR',9.00000000,18.00000000,0.00000000,18.00000000),(292,6,NULL,11,NULL,NULL,'A nice rollup',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,'',0.00000000,0.00000000,0.00000000,0.00000000),(295,93,NULL,11,NULL,NULL,'A nice rollup',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,1,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(296,94,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,100,100.00000000,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,'EUR',100.00000000,300.00000000,0.00000000,300.00000000),(297,94,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,NULL,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(298,94,NULL,13,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,NULL,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(299,95,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,100,100.00000000,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,'EUR',100.00000000,300.00000000,0.00000000,300.00000000),(300,95,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,NULL,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(301,95,NULL,13,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,NULL,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(302,96,NULL,NULL,NULL,NULL,'fd',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,'EUR',10.00000000,10.00000000,0.00000000,10.00000000),(303,97,NULL,NULL,NULL,NULL,'fd',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,'EUR',10.00000000,10.00000000,0.00000000,10.00000000),(304,98,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'CGST+SGST',9.000,'1',9.000,'1',1,0,0,NULL,5,5.00000000,5.00000000,0.00000000,0.45000000,0.45000000,5.90000000,0,NULL,NULL,0,NULL,10.00000000,0,1,NULL,NULL,NULL,NULL,'EUR',5.00000000,5.00000000,0.00000000,5.90000000),(305,98,NULL,NULL,NULL,NULL,'aaa',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,-2,-2.00000000,-2.00000000,0.00000000,0.00000000,0.00000000,-2.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,NULL,'EUR',-2.00000000,-2.00000000,0.00000000,-2.00000000),(306,99,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',4.000,'',0.000,'0',0.000,'0',1,0,0,NULL,6,6.00000000,6.00000000,0.24000000,0.00000000,0.00000000,6.24000000,0,NULL,NULL,0,NULL,10.00000000,0,1,NULL,NULL,NULL,NULL,'EUR',6.00000000,6.00000000,0.24000000,6.24000000),(307,99,NULL,NULL,NULL,NULL,'aaa',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,-2,-2.00000000,-2.00000000,0.00000000,0.00000000,0.00000000,-2.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,NULL,'EUR',-2.00000000,-2.00000000,0.00000000,-2.00000000);
 /*!40000 ALTER TABLE `llx_commandedet` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4643,7 +5271,7 @@ CREATE TABLE `llx_const` (
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_const` (`name`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=8577 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=8646 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4652,7 +5280,7 @@ CREATE TABLE `llx_const` (
 
 LOCK TABLES `llx_const` WRITE;
 /*!40000 ALTER TABLE `llx_const` DISABLE KEYS */;
-INSERT INTO `llx_const` VALUES (8,'MAIN_UPLOAD_DOC',0,'2048','chaine',0,'Max size for file upload (0 means no upload allowed)','2012-07-08 11:17:57'),(9,'MAIN_SEARCHFORM_SOCIETE',0,'1','yesno',0,'Show form for quick company search','2012-07-08 11:17:57'),(10,'MAIN_SEARCHFORM_CONTACT',0,'1','yesno',0,'Show form for quick contact search','2012-07-08 11:17:57'),(11,'MAIN_SEARCHFORM_PRODUITSERVICE',0,'1','yesno',0,'Show form for quick product search','2012-07-08 11:17:58'),(12,'MAIN_SEARCHFORM_ADHERENT',0,'1','yesno',0,'Show form for quick member search','2012-07-08 11:17:58'),(16,'MAIN_SIZE_LISTE_LIMIT',0,'25','chaine',0,'Longueur maximum des listes','2012-07-08 11:17:58'),(29,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',1,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2012-07-08 11:17:58'),(33,'SOCIETE_NOLIST_COURRIER',0,'1','yesno',0,'Liste les fichiers du repertoire courrier','2012-07-08 11:17:58'),(36,'ADHERENT_MAIL_REQUIRED',1,'1','yesno',0,'EMail required to create a new member','2012-07-08 11:17:58'),(37,'ADHERENT_MAIL_FROM',1,'adherents@domain.com','chaine',0,'Sender EMail for automatic emails','2012-07-08 11:17:58'),(38,'ADHERENT_MAIL_RESIL',1,'Your subscription has been resiliated.\r\nWe hope to see you soon again','html',0,'Mail resiliation','2018-11-23 11:56:07'),(39,'ADHERENT_MAIL_VALID',1,'Your subscription has been validated.\r\nThis is a remind of your personal information :\r\n\r\n%INFOS%\r\n\r\n','html',0,'Mail de validation','2018-11-23 11:56:07'),(40,'ADHERENT_MAIL_COTIS',1,'Hello %PRENOM%,\r\nThanks for your subscription.\r\nThis email confirms that your subscription has been received and processed.\r\n\r\n','html',0,'Mail de validation de cotisation','2018-11-23 11:56:07'),(41,'ADHERENT_MAIL_VALID_SUBJECT',1,'Your subscription has been validated','chaine',0,'Sujet du mail de validation','2012-07-08 11:17:59'),(42,'ADHERENT_MAIL_RESIL_SUBJECT',1,'Resiliating your subscription','chaine',0,'Sujet du mail de resiliation','2012-07-08 11:17:59'),(43,'ADHERENT_MAIL_COTIS_SUBJECT',1,'Receipt of your subscription','chaine',0,'Sujet du mail de validation de cotisation','2012-07-08 11:17:59'),(44,'MAILING_EMAIL_FROM',1,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2012-07-08 11:17:59'),(45,'ADHERENT_USE_MAILMAN',1,'0','yesno',0,'Utilisation de Mailman','2012-07-08 11:17:59'),(46,'ADHERENT_MAILMAN_UNSUB_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&user=%EMAIL%','chaine',0,'Url de desinscription aux listes mailman','2012-07-08 11:17:59'),(47,'ADHERENT_MAILMAN_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&send_welcome_msg_to_this_batch=1&subscribees=%EMAIL%','chaine',0,'Url pour les inscriptions mailman','2012-07-08 11:17:59'),(48,'ADHERENT_MAILMAN_LISTS',1,'test-test,test-test2','chaine',0,'Listes auxquelles inscrire les nouveaux adherents','2012-07-08 11:17:59'),(49,'ADHERENT_MAILMAN_ADMINPW',1,'','chaine',0,'Mot de passe Admin des liste mailman','2012-07-08 11:17:59'),(50,'ADHERENT_MAILMAN_SERVER',1,'lists.domain.com','chaine',0,'Serveur hebergeant les interfaces d Admin des listes mailman','2012-07-08 11:17:59'),(51,'ADHERENT_MAILMAN_LISTS_COTISANT',1,'','chaine',0,'Liste(s) auxquelles les nouveaux cotisants sont inscris automatiquement','2012-07-08 11:17:59'),(52,'ADHERENT_USE_SPIP',1,'0','yesno',0,'Utilisation de SPIP ?','2012-07-08 11:17:59'),(53,'ADHERENT_USE_SPIP_AUTO',1,'0','yesno',0,'Utilisation de SPIP automatiquement','2012-07-08 11:17:59'),(54,'ADHERENT_SPIP_USER',1,'user','chaine',0,'user spip','2012-07-08 11:17:59'),(55,'ADHERENT_SPIP_PASS',1,'pass','chaine',0,'Pass de connection','2012-07-08 11:17:59'),(56,'ADHERENT_SPIP_SERVEUR',1,'localhost','chaine',0,'serveur spip','2012-07-08 11:17:59'),(57,'ADHERENT_SPIP_DB',1,'spip','chaine',0,'db spip','2012-07-08 11:17:59'),(58,'ADHERENT_CARD_HEADER_TEXT',1,'%ANNEE%','chaine',0,'Texte imprime sur le haut de la carte adherent','2012-07-08 11:17:59'),(59,'ADHERENT_CARD_FOOTER_TEXT',1,'Association AZERTY','chaine',0,'Texte imprime sur le bas de la carte adherent','2012-07-08 11:17:59'),(61,'FCKEDITOR_ENABLE_USER',1,'1','yesno',0,'Activation fckeditor sur notes utilisateurs','2012-07-08 11:17:59'),(62,'FCKEDITOR_ENABLE_SOCIETE',1,'1','yesno',0,'Activation fckeditor sur notes societe','2012-07-08 11:17:59'),(63,'FCKEDITOR_ENABLE_PRODUCTDESC',1,'1','yesno',0,'Activation fckeditor sur notes produits','2012-07-08 11:17:59'),(64,'FCKEDITOR_ENABLE_MEMBER',1,'1','yesno',0,'Activation fckeditor sur notes adherent','2012-07-08 11:17:59'),(65,'FCKEDITOR_ENABLE_MAILING',1,'1','yesno',0,'Activation fckeditor sur emailing','2012-07-08 11:17:59'),(67,'DON_ADDON_MODEL',1,'html_cerfafr','chaine',0,'','2012-07-08 11:18:00'),(68,'PROPALE_ADDON',1,'mod_propale_marbre','chaine',0,'','2012-07-08 11:18:00'),(69,'PROPALE_ADDON_PDF',1,'azur','chaine',0,'','2012-07-08 11:18:00'),(70,'COMMANDE_ADDON',1,'mod_commande_marbre','chaine',0,'','2012-07-08 11:18:00'),(71,'COMMANDE_ADDON_PDF',1,'einstein','chaine',0,'','2012-07-08 11:18:00'),(72,'COMMANDE_SUPPLIER_ADDON',1,'mod_commande_fournisseur_muguet','chaine',0,'','2012-07-08 11:18:00'),(73,'COMMANDE_SUPPLIER_ADDON_PDF',1,'muscadet','chaine',0,'','2012-07-08 11:18:00'),(74,'EXPEDITION_ADDON',1,'enlevement','chaine',0,'','2012-07-08 11:18:00'),(76,'FICHEINTER_ADDON',1,'pacific','chaine',0,'','2012-07-08 11:18:00'),(77,'FICHEINTER_ADDON_PDF',1,'soleil','chaine',0,'','2012-07-08 11:18:00'),(79,'FACTURE_ADDON_PDF',1,'crabe','chaine',0,'','2012-07-08 11:18:00'),(80,'PROPALE_VALIDITY_DURATION',1,'15','chaine',0,'Durée de validitée des propales','2012-07-08 11:18:00'),(230,'COMPANY_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2012-07-08 11:26:20'),(238,'LIVRAISON_ADDON_PDF',1,'typhon','chaine',0,'Nom du gestionnaire de generation des commandes en PDF','2012-07-08 11:26:27'),(239,'LIVRAISON_ADDON_NUMBER',1,'mod_livraison_jade','chaine',0,'Nom du gestionnaire de numerotation des bons de livraison','2015-03-20 13:17:36'),(245,'FACTURE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2012-07-08 11:28:53'),(249,'DON_FORM',1,'html_cerfafr','chaine',0,'Nom du gestionnaire de formulaire de dons','2017-09-06 16:12:22'),(254,'ADHERENT_BANK_ACCOUNT',1,'','chaine',0,'ID du Compte banquaire utilise','2012-07-08 11:29:05'),(255,'ADHERENT_BANK_CATEGORIE',1,'','chaine',0,'ID de la categorie banquaire des cotisations','2012-07-08 11:29:05'),(256,'ADHERENT_ETIQUETTE_TYPE',1,'L7163','chaine',0,'Type d etiquette (pour impression de planche d etiquette)','2012-07-08 11:29:05'),(269,'PROJECT_ADDON_PDF',1,'baleine','chaine',0,'Nom du gestionnaire de generation des projets en PDF','2012-07-08 11:29:33'),(270,'PROJECT_ADDON',1,'mod_project_simple','chaine',0,'Nom du gestionnaire de numerotation des projets','2012-07-08 11:29:33'),(369,'EXPEDITION_ADDON_PDF',1,'merou','chaine',0,'','2012-07-08 22:58:07'),(377,'FACTURE_ADDON',1,'mod_facture_terre','chaine',0,'','2012-07-08 23:08:12'),(380,'ADHERENT_CARD_TEXT',1,'%TYPE% n° %ID%\r\n%PRENOM% %NOM%\r\n<%EMAIL%>\r\n%ADRESSE%\r\n%CP% %VILLE%\r\n%PAYS%','',0,'Texte imprime sur la carte adherent','2012-07-08 23:14:46'),(381,'ADHERENT_CARD_TEXT_RIGHT',1,'aaa','',0,'','2012-07-08 23:14:55'),(386,'STOCK_CALCULATE_ON_SHIPMENT',1,'1','chaine',0,'','2012-07-08 23:23:21'),(387,'STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER',1,'1','chaine',0,'','2012-07-08 23:23:26'),(392,'MAIN_AGENDA_XCAL_EXPORTKEY',1,'dolibarr','chaine',0,'','2012-07-08 23:27:50'),(393,'MAIN_AGENDA_EXPORT_PAST_DELAY',1,'100','chaine',0,'','2012-07-08 23:27:50'),(610,'CASHDESK_ID_THIRDPARTY',1,'7','chaine',0,'','2012-07-11 17:08:18'),(611,'CASHDESK_ID_BANKACCOUNT_CASH',1,'3','chaine',0,'','2012-07-11 17:08:18'),(612,'CASHDESK_ID_BANKACCOUNT_CHEQUE',1,'1','chaine',0,'','2012-07-11 17:08:18'),(613,'CASHDESK_ID_BANKACCOUNT_CB',1,'1','chaine',0,'','2012-07-11 17:08:18'),(614,'CASHDESK_ID_WAREHOUSE',1,'2','chaine',0,'','2012-07-11 17:08:18'),(660,'LDAP_USER_DN',1,'ou=users,dc=my-domain,dc=com','chaine',0,NULL,'2012-07-18 10:25:27'),(661,'LDAP_GROUP_DN',1,'ou=groups,dc=my-domain,dc=com','chaine',0,NULL,'2012-07-18 10:25:27'),(662,'LDAP_FILTER_CONNECTION',1,'&(objectClass=user)(objectCategory=person)','chaine',0,NULL,'2012-07-18 10:25:27'),(663,'LDAP_FIELD_LOGIN',1,'uid','chaine',0,NULL,'2012-07-18 10:25:27'),(664,'LDAP_FIELD_FULLNAME',1,'cn','chaine',0,NULL,'2012-07-18 10:25:27'),(665,'LDAP_FIELD_NAME',1,'sn','chaine',0,NULL,'2012-07-18 10:25:27'),(666,'LDAP_FIELD_FIRSTNAME',1,'givenname','chaine',0,NULL,'2012-07-18 10:25:27'),(667,'LDAP_FIELD_MAIL',1,'mail','chaine',0,NULL,'2012-07-18 10:25:27'),(668,'LDAP_FIELD_PHONE',1,'telephonenumber','chaine',0,NULL,'2012-07-18 10:25:27'),(669,'LDAP_FIELD_FAX',1,'facsimiletelephonenumber','chaine',0,NULL,'2012-07-18 10:25:27'),(670,'LDAP_FIELD_MOBILE',1,'mobile','chaine',0,NULL,'2012-07-18 10:25:27'),(671,'LDAP_SERVER_TYPE',1,'openldap','chaine',0,'','2012-07-18 10:25:46'),(672,'LDAP_SERVER_PROTOCOLVERSION',1,'3','chaine',0,'','2012-07-18 10:25:47'),(673,'LDAP_SERVER_HOST',1,'localhost','chaine',0,'','2012-07-18 10:25:47'),(674,'LDAP_SERVER_PORT',1,'389','chaine',0,'','2012-07-18 10:25:47'),(675,'LDAP_SERVER_USE_TLS',1,'0','chaine',0,'','2012-07-18 10:25:47'),(676,'LDAP_SYNCHRO_ACTIVE',1,'dolibarr2ldap','chaine',0,'','2012-07-18 10:25:47'),(677,'LDAP_CONTACT_ACTIVE',1,'1','chaine',0,'','2012-07-18 10:25:47'),(678,'LDAP_MEMBER_ACTIVE',1,'1','chaine',0,'','2012-07-18 10:25:47'),(974,'MAIN_MODULE_WORKFLOW_TRIGGERS',1,'1','chaine',0,NULL,'2013-07-18 18:02:20'),(975,'WORKFLOW_PROPAL_AUTOCREATE_ORDER',1,'1','chaine',0,'','2013-07-18 18:02:24'),(980,'PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR',1,'1234567','chaine',0,'','2013-07-18 18:05:50'),(983,'FACTURE_RIB_NUMBER',1,'1','chaine',0,'','2013-07-18 18:35:14'),(984,'FACTURE_CHQ_NUMBER',1,'1','chaine',0,'','2013-07-18 18:35:14'),(1016,'GOOGLE_DUPLICATE_INTO_GCAL',1,'1','chaine',0,'','2013-07-18 21:40:20'),(1152,'SOCIETE_CODECLIENT_ADDON',1,'mod_codeclient_monkey','chaine',0,'','2013-07-29 20:50:02'),(1240,'MAIN_LOGEVENTS_USER_LOGIN',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1241,'MAIN_LOGEVENTS_USER_LOGIN_FAILED',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1242,'MAIN_LOGEVENTS_USER_LOGOUT',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1243,'MAIN_LOGEVENTS_USER_CREATE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1244,'MAIN_LOGEVENTS_USER_MODIFY',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1245,'MAIN_LOGEVENTS_USER_NEW_PASSWORD',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1246,'MAIN_LOGEVENTS_USER_ENABLEDISABLE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1247,'MAIN_LOGEVENTS_USER_DELETE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1248,'MAIN_LOGEVENTS_GROUP_CREATE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1249,'MAIN_LOGEVENTS_GROUP_MODIFY',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1250,'MAIN_LOGEVENTS_GROUP_DELETE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1251,'MAIN_BOXES_MAXLINES',1,'5','',0,'','2013-07-29 21:05:42'),(1482,'EXPEDITION_ADDON_NUMBER',1,'mod_expedition_safor','chaine',0,'Nom du gestionnaire de numerotation des expeditions','2013-08-05 17:53:11'),(1490,'CONTRACT_ADDON',1,'mod_contract_serpis','chaine',0,'Nom du gestionnaire de numerotation des contrats','2013-08-05 18:11:58'),(1677,'COMMANDE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/orders','chaine',0,NULL,'2014-12-08 13:11:02'),(1724,'PROPALE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2014-12-08 13:17:14'),(1730,'OPENSTREETMAP_ENABLE_MAPS',1,'1','chaine',0,'','2014-12-08 13:22:47'),(1731,'OPENSTREETMAP_ENABLE_MAPS_CONTACTS',1,'1','chaine',0,'','2014-12-08 13:22:47'),(1732,'OPENSTREETMAP_ENABLE_MAPS_MEMBERS',1,'1','chaine',0,'','2014-12-08 13:22:47'),(1733,'OPENSTREETMAP_MAPS_ZOOM_LEVEL',1,'15','chaine',0,'','2014-12-08 13:22:47'),(1742,'MAIN_MAIL_EMAIL_FROM',2,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2014-12-08 14:08:14'),(1743,'MAIN_MENU_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2015-02-11 19:43:54'),(1744,'MAIN_MENUFRONT_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2015-02-11 19:43:54'),(1745,'MAIN_MENU_SMARTPHONE',2,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2014-12-08 14:08:14'),(1746,'MAIN_MENUFRONT_SMARTPHONE',2,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2014-12-08 14:08:14'),(1747,'MAIN_THEME',2,'eldy','chaine',0,'Default theme','2014-12-08 14:08:14'),(1748,'MAIN_DELAY_ACTIONS_TODO',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2014-12-08 14:08:14'),(1749,'MAIN_DELAY_ORDERS_TO_PROCESS',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2014-12-08 14:08:14'),(1750,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2014-12-08 14:08:14'),(1751,'MAIN_DELAY_PROPALS_TO_CLOSE',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2014-12-08 14:08:14'),(1752,'MAIN_DELAY_PROPALS_TO_BILL',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2014-12-08 14:08:14'),(1753,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2014-12-08 14:08:14'),(1754,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2014-12-08 14:08:14'),(1755,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2014-12-08 14:08:14'),(1756,'MAIN_DELAY_RUNNING_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2014-12-08 14:08:14'),(1757,'MAIN_DELAY_MEMBERS',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2014-12-08 14:08:14'),(1758,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',2,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2014-12-08 14:08:14'),(1759,'MAILING_EMAIL_FROM',2,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2014-12-08 14:08:14'),(1760,'MAIN_INFO_SOCIETE_COUNTRY',3,'1:FR:France','chaine',0,'','2015-02-26 21:56:28'),(1761,'MAIN_INFO_SOCIETE_NOM',3,'bbb','chaine',0,'','2014-12-08 14:08:20'),(1762,'MAIN_INFO_SOCIETE_STATE',3,'0','chaine',0,'','2015-02-27 14:20:27'),(1763,'MAIN_MONNAIE',3,'EUR','chaine',0,'','2014-12-08 14:08:20'),(1764,'MAIN_LANG_DEFAULT',3,'auto','chaine',0,'','2014-12-08 14:08:20'),(1765,'MAIN_MAIL_EMAIL_FROM',3,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2014-12-08 14:08:20'),(1766,'MAIN_MENU_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2015-02-11 19:43:54'),(1767,'MAIN_MENUFRONT_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2015-02-11 19:43:54'),(1768,'MAIN_MENU_SMARTPHONE',3,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2014-12-08 14:08:20'),(1769,'MAIN_MENUFRONT_SMARTPHONE',3,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2014-12-08 14:08:20'),(1770,'MAIN_THEME',3,'eldy','chaine',0,'Default theme','2014-12-08 14:08:20'),(1771,'MAIN_DELAY_ACTIONS_TODO',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2014-12-08 14:08:20'),(1772,'MAIN_DELAY_ORDERS_TO_PROCESS',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2014-12-08 14:08:20'),(1773,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2014-12-08 14:08:20'),(1774,'MAIN_DELAY_PROPALS_TO_CLOSE',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2014-12-08 14:08:20'),(1775,'MAIN_DELAY_PROPALS_TO_BILL',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2014-12-08 14:08:20'),(1776,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2014-12-08 14:08:20'),(1777,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2014-12-08 14:08:20'),(1778,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2014-12-08 14:08:20'),(1779,'MAIN_DELAY_RUNNING_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2014-12-08 14:08:20'),(1780,'MAIN_DELAY_MEMBERS',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2014-12-08 14:08:20'),(1781,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',3,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2014-12-08 14:08:20'),(1782,'MAILING_EMAIL_FROM',3,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2014-12-08 14:08:20'),(1803,'SYSLOG_FILE',1,'DOL_DATA_ROOT/dolibarr.log','chaine',0,'','2014-12-08 14:15:08'),(1804,'SYSLOG_HANDLERS',1,'[\"mod_syslog_file\"]','chaine',0,'','2014-12-08 14:15:08'),(1805,'MAIN_MODULE_SKINCOLOREDITOR',3,'1',NULL,0,NULL,'2014-12-08 14:35:40'),(1922,'PAYPAL_API_SANDBOX',1,'1','chaine',0,'','2014-12-12 12:11:05'),(1923,'PAYPAL_API_USER',1,'seller_1355312017_biz_api1.mydomain.com','chaine',0,'','2014-12-12 12:11:05'),(1924,'PAYPAL_API_PASSWORD',1,'1355312040','chaine',0,'','2014-12-12 12:11:05'),(1925,'PAYPAL_API_SIGNATURE',1,'ABCDEFWBzvfn0q5iNmbuiDv1y.3EAXIMWyl4C5KvDReR9HDwwAd6dQ4Q','chaine',0,'','2014-12-12 12:11:05'),(1926,'PAYPAL_API_INTEGRAL_OR_PAYPALONLY',1,'integral','chaine',0,'','2014-12-12 12:11:05'),(1927,'PAYPAL_SECURITY_TOKEN',1,'50c82fab36bb3b6aa83e2a50691803b2','chaine',0,'','2014-12-12 12:11:05'),(1928,'PAYPAL_SECURITY_TOKEN_UNIQUE',1,'0','chaine',0,'','2014-12-12 12:11:05'),(1929,'PAYPAL_ADD_PAYMENT_URL',1,'1','chaine',0,'','2014-12-12 12:11:05'),(1980,'MAIN_PDF_FORMAT',1,'EUA4','chaine',0,'','2014-12-12 19:58:05'),(1981,'MAIN_PROFID1_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1982,'MAIN_PROFID2_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1983,'MAIN_PROFID3_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1984,'MAIN_PROFID4_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1985,'MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT',1,'0','chaine',0,'','2014-12-12 19:58:05'),(2835,'MAIN_USE_CONNECT_TIMEOUT',1,'10','chaine',0,'','2015-01-16 19:28:50'),(2836,'MAIN_USE_RESPONSE_TIMEOUT',1,'30','chaine',0,'','2015-01-16 19:28:50'),(2837,'MAIN_PROXY_USE',1,'0','chaine',0,'','2015-01-16 19:28:50'),(2838,'MAIN_PROXY_HOST',1,'localhost','chaine',0,'','2015-01-16 19:28:50'),(2839,'MAIN_PROXY_PORT',1,'8080','chaine',0,'','2015-01-16 19:28:50'),(2840,'MAIN_PROXY_USER',1,'aaa','chaine',0,'','2015-01-16 19:28:50'),(2841,'MAIN_PROXY_PASS',1,'bbb','chaine',0,'','2015-01-16 19:28:50'),(2848,'OVHSMS_NICK',1,'BN196-OVH','chaine',0,'','2015-01-16 19:32:36'),(2849,'OVHSMS_PASS',1,'bigone-10','chaine',0,'','2015-01-16 19:32:36'),(2850,'OVHSMS_SOAPURL',1,'https://www.ovh.com/soapi/soapi-re-1.55.wsdl','chaine',0,'','2015-01-16 19:32:36'),(2854,'THEME_ELDY_RGB',1,'bfbf00','chaine',0,'','2015-01-18 10:02:53'),(2855,'THEME_ELDY_ENABLE_PERSONALIZED',1,'0','chaine',0,'','2015-01-18 10:02:55'),(2858,'MAIN_SESSION_TIMEOUT',1,'2000','chaine',0,'','2015-01-19 17:01:53'),(2867,'FACSIM_ADDON',1,'mod_facsim_alcoy','chaine',0,'','2015-01-19 17:16:25'),(2868,'POS_SERVICES',1,'0','chaine',0,'','2015-01-19 17:16:51'),(2869,'POS_USE_TICKETS',1,'1','chaine',0,'','2015-01-19 17:16:51'),(2870,'POS_MAX_TTC',1,'100','chaine',0,'','2015-01-19 17:16:51'),(3190,'MAIN_MODULE_HOLIDAY',2,'1',NULL,0,NULL,'2015-02-01 08:52:34'),(3195,'INVOICE_SUPPLIER_ADDON_PDF',1,'canelle','chaine',0,'','2015-02-10 19:50:27'),(3199,'MAIN_FORCE_RELOAD_PAGE',1,'1','chaine',0,NULL,'2015-02-12 16:22:55'),(3223,'OVH_THIRDPARTY_IMPORT',1,'2','chaine',0,'','2015-02-13 16:20:18'),(3409,'AGENDA_USE_EVENT_TYPE',1,'1','chaine',0,'','2015-02-27 18:12:24'),(3886,'MAIN_REMOVE_INSTALL_WARNING',1,'1','chaine',1,'','2015-03-02 18:32:50'),(4013,'MAIN_DELAY_ACTIONS_TODO',1,'7','chaine',0,'','2015-03-06 08:59:12'),(4014,'MAIN_DELAY_PROPALS_TO_CLOSE',1,'31','chaine',0,'','2015-03-06 08:59:12'),(4015,'MAIN_DELAY_PROPALS_TO_BILL',1,'7','chaine',0,'','2015-03-06 08:59:12'),(4016,'MAIN_DELAY_ORDERS_TO_PROCESS',1,'2','chaine',0,'','2015-03-06 08:59:12'),(4017,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',1,'31','chaine',0,'','2015-03-06 08:59:12'),(4018,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',1,'7','chaine',0,'','2015-03-06 08:59:12'),(4019,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',1,'2','chaine',0,'','2015-03-06 08:59:12'),(4020,'MAIN_DELAY_RUNNING_SERVICES',1,'-15','chaine',0,'','2015-03-06 08:59:12'),(4021,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',1,'62','chaine',0,'','2015-03-06 08:59:13'),(4022,'MAIN_DELAY_MEMBERS',1,'31','chaine',0,'','2015-03-06 08:59:13'),(4023,'MAIN_DISABLE_METEO',1,'0','chaine',0,'','2015-03-06 08:59:13'),(4044,'ADHERENT_VAT_FOR_SUBSCRIPTIONS',1,'0','',0,'','2015-03-06 16:06:38'),(4047,'ADHERENT_BANK_USE',1,'bankviainvoice','',0,'','2015-03-06 16:12:30'),(4049,'PHPSANE_SCANIMAGE',1,'/usr/bin/scanimage','chaine',0,'','2015-03-06 21:54:13'),(4050,'PHPSANE_PNMTOJPEG',1,'/usr/bin/pnmtojpeg','chaine',0,'','2015-03-06 21:54:13'),(4051,'PHPSANE_PNMTOTIFF',1,'/usr/bin/pnmtotiff','chaine',0,'','2015-03-06 21:54:13'),(4052,'PHPSANE_OCR',1,'/usr/bin/gocr','chaine',0,'','2015-03-06 21:54:13'),(4548,'ECM_AUTO_TREE_ENABLED',1,'1','chaine',0,'','2015-03-10 15:57:21'),(4579,'MAIN_MODULE_AGENDA',2,'1',NULL,0,NULL,'2015-03-13 15:29:19'),(4580,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4581,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4582,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4583,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4584,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4585,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4586,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4587,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4588,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4589,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4590,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4591,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4592,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4593,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4594,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4688,'GOOGLE_ENABLE_AGENDA',2,'1','chaine',0,'','2015-03-13 15:36:29'),(4689,'GOOGLE_AGENDA_NAME1',2,'eldy','chaine',0,'','2015-03-13 15:36:29'),(4690,'GOOGLE_AGENDA_SRC1',2,'eldy10@mail.com','chaine',0,'','2015-03-13 15:36:29'),(4691,'GOOGLE_AGENDA_COLOR1',2,'BE6D00','chaine',0,'','2015-03-13 15:36:29'),(4692,'GOOGLE_AGENDA_COLOR2',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4693,'GOOGLE_AGENDA_COLOR3',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4694,'GOOGLE_AGENDA_COLOR4',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4695,'GOOGLE_AGENDA_COLOR5',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4696,'GOOGLE_AGENDA_TIMEZONE',2,'Europe/Paris','chaine',0,'','2015-03-13 15:36:29'),(4697,'GOOGLE_AGENDA_NB',2,'5','chaine',0,'','2015-03-13 15:36:29'),(4725,'SOCIETE_CODECLIENT_ADDON',2,'mod_codeclient_leopard','chaine',0,'Module to control third parties codes','2015-03-13 20:21:35'),(4726,'SOCIETE_CODECOMPTA_ADDON',2,'mod_codecompta_panicum','chaine',0,'Module to control third parties codes','2015-03-13 20:21:35'),(4727,'SOCIETE_FISCAL_MONTH_START',2,'','chaine',0,'Mettre le numero du mois du debut d\\\'annee fiscale, ex: 9 pour septembre','2015-03-13 20:21:35'),(4728,'MAIN_SEARCHFORM_SOCIETE',2,'1','yesno',0,'Show form for quick company search','2015-03-13 20:21:35'),(4729,'MAIN_SEARCHFORM_CONTACT',2,'1','yesno',0,'Show form for quick contact search','2015-03-13 20:21:35'),(4730,'COMPANY_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2015-03-13 20:21:35'),(4743,'MAIN_MODULE_CLICKTODIAL',2,'1',NULL,0,NULL,'2015-03-13 20:30:28'),(4744,'MAIN_MODULE_NOTIFICATION',2,'1',NULL,0,NULL,'2015-03-13 20:30:34'),(4745,'MAIN_MODULE_WEBSERVICES',2,'1',NULL,0,NULL,'2015-03-13 20:30:41'),(4746,'MAIN_MODULE_PROPALE',2,'1',NULL,0,NULL,'2015-03-13 20:32:38'),(4747,'PROPALE_ADDON_PDF',2,'azur','chaine',0,'Nom du gestionnaire de generation des propales en PDF','2015-03-13 20:32:38'),(4748,'PROPALE_ADDON',2,'mod_propale_marbre','chaine',0,'Nom du gestionnaire de numerotation des propales','2015-03-13 20:32:38'),(4749,'PROPALE_VALIDITY_DURATION',2,'15','chaine',0,'Duration of validity of business proposals','2015-03-13 20:32:38'),(4750,'PROPALE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2015-03-13 20:32:38'),(4752,'MAIN_MODULE_TAX',2,'1',NULL,0,NULL,'2015-03-13 20:32:47'),(4753,'MAIN_MODULE_DON',2,'1',NULL,0,NULL,'2015-03-13 20:32:54'),(4754,'DON_ADDON_MODEL',2,'html_cerfafr','chaine',0,'Nom du gestionnaire de generation de recu de dons','2015-03-13 20:32:54'),(4755,'POS_USE_TICKETS',2,'1','chaine',0,'','2015-03-13 20:33:09'),(4756,'POS_MAX_TTC',2,'100','chaine',0,'','2015-03-13 20:33:09'),(4757,'MAIN_MODULE_POS',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4758,'TICKET_ADDON',2,'mod_ticket_avenc','chaine',0,'Nom du gestionnaire de numerotation des tickets','2015-03-13 20:33:09'),(4759,'MAIN_MODULE_BANQUE',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4760,'MAIN_MODULE_FACTURE',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4761,'FACTURE_ADDON_PDF',2,'crabe','chaine',0,'Name of PDF model of invoice','2015-03-13 20:33:09'),(4762,'FACTURE_ADDON',2,'mod_facture_terre','chaine',0,'Name of numbering numerotation rules of invoice','2015-03-13 20:33:09'),(4763,'FACTURE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2015-03-13 20:33:09'),(4764,'MAIN_MODULE_SOCIETE',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4765,'MAIN_MODULE_PRODUCT',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4766,'PRODUCT_CODEPRODUCT_ADDON',2,'mod_codeproduct_leopard','chaine',0,'Module to control product codes','2015-03-13 20:33:09'),(4767,'MAIN_SEARCHFORM_PRODUITSERVICE',2,'1','yesno',0,'Show form for quick product search','2015-03-13 20:33:09'),(4772,'FACSIM_ADDON',2,'mod_facsim_alcoy','chaine',0,'','2015-03-13 20:33:32'),(4773,'MAIN_MODULE_MAILING',2,'1',NULL,0,NULL,'2015-03-13 20:33:37'),(4774,'MAIN_MODULE_OPENSURVEY',2,'1',NULL,0,NULL,'2015-03-13 20:33:42'),(4782,'AGENDA_USE_EVENT_TYPE',2,'1','chaine',0,'','2015-03-13 20:53:36'),(4884,'AGENDA_DISABLE_EXT',2,'1','chaine',0,'','2015-03-13 22:03:40'),(4928,'COMMANDE_SUPPLIER_ADDON_NUMBER',1,'mod_commande_fournisseur_muguet','chaine',0,'Nom du gestionnaire de numerotation des commandes fournisseur','2015-03-22 09:24:29'),(4929,'INVOICE_SUPPLIER_ADDON_NUMBER',1,'mod_facture_fournisseur_cactus','chaine',0,'Nom du gestionnaire de numerotation des factures fournisseur','2015-03-22 09:24:29'),(5001,'MAIN_CRON_KEY',0,'bc54582fe30d5d4a830c6f582ec28810','chaine',0,'','2015-03-23 17:54:53'),(5009,'CRON_KEY',0,'2c2e755c20be2014098f629865598006','chaine',0,'','2015-03-23 18:06:24'),(5139,'SOCIETE_ADD_REF_IN_LIST',1,'','yesno',0,'Display customer ref into select list','2015-09-08 23:06:08'),(5150,'PROJECT_TASK_ADDON_PDF',1,'','chaine',0,'Name of PDF/ODT tasks manager class','2015-09-08 23:06:14'),(5151,'PROJECT_TASK_ADDON',1,'mod_task_simple','chaine',0,'Name of Numbering Rule task manager class','2015-09-08 23:06:14'),(5152,'PROJECT_TASK_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/tasks','chaine',0,'','2015-09-08 23:06:14'),(5239,'BOOKMARKS_SHOW_IN_MENU',1,'10','chaine',0,'','2016-03-02 15:42:26'),(5271,'DONATION_ART200',1,'','yesno',0,'Option Française - Eligibilité Art200 du CGI','2016-12-21 12:51:28'),(5272,'DONATION_ART238',1,'','yesno',0,'Option Française - Eligibilité Art238 bis du CGI','2016-12-21 12:51:28'),(5274,'DONATION_MESSAGE',1,'Thank you','chaine',0,'Message affiché sur le récépissé de versements ou dons','2016-12-21 12:51:28'),(5349,'MAIN_SEARCHFORM_CONTACT',1,'1','chaine',0,'','2017-10-03 10:11:33'),(5351,'MAIN_SEARCHFORM_PRODUITSERVICE',1,'1','chaine',0,'','2017-10-03 10:11:33'),(5352,'MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER',1,'0','chaine',0,'','2017-10-03 10:11:33'),(5353,'MAIN_SEARCHFORM_ADHERENT',1,'1','chaine',0,'','2017-10-03 10:11:33'),(5354,'MAIN_SEARCHFORM_PROJECT',1,'0','chaine',0,'','2017-10-03 10:11:33'),(5394,'FCKEDITOR_ENABLE_DETAILS',1,'1','yesno',0,'WYSIWIG for products details lines for all entities','2017-11-04 15:27:44'),(5395,'FCKEDITOR_ENABLE_USERSIGN',1,'1','yesno',0,'WYSIWIG for user signature','2017-11-04 15:27:44'),(5396,'FCKEDITOR_ENABLE_MAIL',1,'1','yesno',0,'WYSIWIG for products details lines for all entities','2017-11-04 15:27:44'),(5398,'CATEGORIE_RECURSIV_ADD',1,'','yesno',0,'Affect parent categories','2017-11-04 15:27:46'),(5404,'MAIN_MODULE_CATEGORIE',1,'1',NULL,0,NULL,'2017-11-04 15:41:43'),(5415,'EXPEDITION_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/shipment','chaine',0,NULL,'2017-11-15 22:38:28'),(5416,'LIVRAISON_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/delivery','chaine',0,NULL,'2017-11-15 22:38:28'),(5426,'MAIN_MODULE_PROJET',1,'1',NULL,0,NULL,'2017-11-15 22:38:44'),(5427,'PROJECT_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/projects','chaine',0,NULL,'2017-11-15 22:38:44'),(5428,'PROJECT_USE_OPPORTUNIES',1,'1','chaine',0,NULL,'2017-11-15 22:38:44'),(5430,'MAIN_MODULE_EXPORT',1,'1',NULL,0,NULL,'2017-11-15 22:38:56'),(5431,'MAIN_MODULE_IMPORT',1,'1',NULL,0,NULL,'2017-11-15 22:38:58'),(5432,'MAIN_MODULE_MAILING',1,'1',NULL,0,NULL,'2017-11-15 22:39:00'),(5434,'EXPENSEREPORT_ADDON_PDF',1,'standard','chaine',0,'Name of manager to build PDF expense reports documents','2017-11-15 22:39:05'),(5437,'SALARIES_ACCOUNTING_ACCOUNT_CHARGE',1,'641','chaine',0,NULL,'2017-11-15 22:39:08'),(5441,'ADHERENT_ETIQUETTE_TEXT',1,'%FULLNAME%\n%ADDRESS%\n%ZIP% %TOWN%\n%COUNTRY%','text',0,'Text to print on member address sheets','2018-11-23 11:56:07'),(5443,'MAIN_MODULE_PRELEVEMENT',1,'1',NULL,0,NULL,'2017-11-15 22:39:33'),(5453,'MAIN_MODULE_CONTRAT',1,'1',NULL,0,NULL,'2017-11-15 22:39:52'),(5455,'MAIN_MODULE_FICHEINTER',1,'1',NULL,0,NULL,'2017-11-15 22:39:56'),(5459,'MAIN_MODULE_PAYPAL',1,'1',NULL,0,NULL,'2017-11-15 22:41:02'),(5463,'MAIN_MODULE_PROPALE',1,'1',NULL,0,NULL,'2017-11-15 22:41:47'),(5483,'GENBARCODE_BARCODETYPE_THIRDPARTY',1,'6','chaine',0,'','2018-01-16 15:49:43'),(5484,'PRODUIT_DEFAULT_BARCODE_TYPE',1,'2','chaine',0,'','2018-01-16 15:49:46'),(5586,'MAIN_DELAY_EXPENSEREPORTS_TO_PAY',1,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur les notes de frais impayées','2018-01-22 17:28:18'),(5587,'MAIN_FIX_FOR_BUGGED_MTA',1,'1','chaine',1,'Set constant to fix email ending from PHP with some linux ike system','2018-01-22 17:28:18'),(5590,'MAIN_VERSION_LAST_INSTALL',0,'3.8.3','chaine',0,'Dolibarr version when install','2018-01-22 17:28:42'),(5604,'MAIN_INFO_SOCIETE_LOGO',1,'mybigcompany.png','chaine',0,'','2018-01-22 17:33:49'),(5605,'MAIN_INFO_SOCIETE_LOGO_SMALL',1,'mybigcompany_small.png','chaine',0,'','2018-01-22 17:33:49'),(5606,'MAIN_INFO_SOCIETE_LOGO_MINI',1,'mybigcompany_mini.png','chaine',0,'','2018-01-22 17:33:49'),(5614,'MAIN_SIZE_SHORTLISTE_LIMIT',1,'4','chaine',0,'Longueur maximum des listes courtes (fiche client)','2018-03-13 10:54:46'),(5627,'SUPPLIER_PROPOSAL_ADDON_PDF',1,'aurore','chaine',0,'Name of submodule to generate PDF for supplier quotation request','2018-07-30 11:13:20'),(5628,'SUPPLIER_PROPOSAL_ADDON',1,'mod_supplier_proposal_marbre','chaine',0,'Name of submodule to number supplier quotation request','2018-07-30 11:13:20'),(5629,'SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/supplier_proposal','chaine',0,NULL,'2018-07-30 11:13:20'),(5633,'MAIN_MODULE_API',1,'1',NULL,0,NULL,'2018-07-30 11:13:54'),(5634,'MAIN_MODULE_WEBSERVICES',1,'1',NULL,0,NULL,'2018-07-30 11:13:56'),(5635,'WEBSERVICES_KEY',1,'dolibarrkey','chaine',0,'','2018-07-30 11:14:04'),(5638,'MAIN_MODULE_EXTERNALRSS',1,'1',NULL,0,NULL,'2018-07-30 11:15:04'),(5642,'SOCIETE_CODECOMPTA_ADDON',1,'mod_codecompta_aquarium','chaine',0,'','2018-07-30 11:16:42'),(5707,'CASHDESK_NO_DECREASE_STOCK',1,'1','chaine',0,'','2018-07-30 13:38:11'),(5708,'MAIN_MODULE_PRODUCTBATCH',1,'1',NULL,0,NULL,'2018-07-30 13:38:11'),(5710,'MAIN_MODULE_STOCK',1,'1',NULL,0,NULL,'2018-07-30 13:38:11'),(5711,'MAIN_MODULE_PRODUCT',1,'1',NULL,0,NULL,'2018-07-30 13:38:11'),(5808,'MARGIN_TYPE',1,'costprice','chaine',0,'','2018-07-30 16:32:18'),(5809,'DISPLAY_MARGIN_RATES',1,'1','chaine',0,'','2018-07-30 16:32:20'),(5833,'ACCOUNTING_EXPORT_SEPARATORCSV',1,',','string',0,NULL,'2017-01-29 15:11:56'),(5840,'CHARTOFACCOUNTS',1,'2','chaine',0,NULL,'2017-01-29 15:11:56'),(5841,'ACCOUNTING_EXPORT_MODELCSV',1,'1','chaine',0,NULL,'2017-01-29 15:11:56'),(5842,'ACCOUNTING_LENGTH_GACCOUNT',1,'','chaine',0,NULL,'2017-01-29 15:11:56'),(5843,'ACCOUNTING_LENGTH_AACCOUNT',1,'','chaine',0,NULL,'2017-01-29 15:11:56'),(5844,'ACCOUNTING_LIST_SORT_VENTILATION_TODO',1,'1','yesno',0,NULL,'2017-01-29 15:11:56'),(5845,'ACCOUNTING_LIST_SORT_VENTILATION_DONE',1,'1','yesno',0,NULL,'2017-01-29 15:11:56'),(5846,'ACCOUNTING_EXPORT_DATE',1,'%d%m%Y','chaine',0,NULL,'2017-01-29 15:11:56'),(5848,'ACCOUNTING_EXPORT_FORMAT',1,'csv','chaine',0,NULL,'2017-01-29 15:11:56'),(5853,'MAIN_MODULE_WORKFLOW',1,'1',NULL,0,NULL,'2017-01-29 15:12:12'),(5854,'MAIN_MODULE_NOTIFICATION',1,'1',NULL,0,NULL,'2017-01-29 15:12:35'),(5855,'MAIN_MODULE_OAUTH',1,'1',NULL,0,NULL,'2017-01-29 15:12:41'),(5883,'MAILING_LIMIT_SENDBYWEB',0,'15','chaine',1,'Number of targets to defined packet size when sending mass email','2017-01-29 17:36:33'),(5884,'MAIN_MAIL_DEBUG',1,'0','chaine',1,'','2017-01-29 18:53:02'),(5885,'MAIN_SOAP_DEBUG',1,'0','chaine',1,'','2017-01-29 18:53:02'),(5925,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5931,'DATABASE_PWD_ENCRYPTED',1,'1','chaine',0,'','2017-02-01 15:06:04'),(5932,'MAIN_DISABLE_ALL_MAILS',1,'0','chaine',0,'','2017-02-01 15:09:09'),(5933,'MAIN_MAIL_SENDMODE',1,'mail','chaine',0,'','2017-02-01 15:09:09'),(5934,'MAIN_MAIL_SMTP_PORT',1,'465','chaine',0,'','2017-02-01 15:09:09'),(5935,'MAIN_MAIL_SMTP_SERVER',1,'smtp.mail.com','chaine',0,'','2017-02-01 15:09:09'),(5936,'MAIN_MAIL_SMTPS_ID',1,'eldy10@mail.com','chaine',0,'','2017-02-01 15:09:09'),(5937,'MAIN_MAIL_SMTPS_PW',1,'bidonge','chaine',0,'','2017-02-01 15:09:09'),(5938,'MAIN_MAIL_EMAIL_FROM',1,'robot@example.com','chaine',0,'','2017-02-01 15:09:09'),(5939,'MAIN_MAIL_DEFAULT_FROMTYPE',1,'user','chaine',0,'','2017-02-01 15:09:09'),(5940,'PRELEVEMENT_ID_BANKACCOUNT',1,'1','chaine',0,'','2017-02-06 04:04:47'),(5941,'PRELEVEMENT_ICS',1,'ICS123456','chaine',0,'','2017-02-06 04:04:47'),(5942,'PRELEVEMENT_USER',1,'1','chaine',0,'','2017-02-06 04:04:47'),(5943,'BANKADDON_PDF',1,'sepamandate','chaine',0,'','2017-02-06 04:13:52'),(5947,'CHEQUERECEIPTS_THYME_MASK',1,'CHK{yy}{mm}-{0000@1}','chaine',0,'','2017-02-06 04:16:27'),(5948,'MAIN_MODULE_LOAN',1,'1',NULL,0,NULL,'2017-02-06 19:19:05'),(5954,'MAIN_SUBMODULE_EXPEDITION',1,'1','chaine',0,'','2017-02-06 23:57:37'),(5963,'MAIN_MODULE_BANQUE',1,'1',NULL,0,NULL,'2017-02-07 18:56:12'),(5964,'MAIN_MODULE_TAX',1,'1',NULL,0,NULL,'2017-02-07 18:56:12'),(6019,'MAIN_INFO_SOCIETE_COUNTRY',2,'1:FR:France','chaine',0,'','2017-02-15 17:18:22'),(6020,'MAIN_INFO_SOCIETE_NOM',2,'MySecondCompany','chaine',0,'','2017-02-15 17:18:22'),(6021,'MAIN_INFO_SOCIETE_STATE',2,'0','chaine',0,'','2017-02-15 17:18:22'),(6022,'MAIN_MONNAIE',2,'EUR','chaine',0,'','2017-02-15 17:18:22'),(6023,'MAIN_LANG_DEFAULT',2,'auto','chaine',0,'','2017-02-15 17:18:22'),(6032,'MAIN_MODULE_MULTICURRENCY',1,'1',NULL,0,NULL,'2017-02-15 17:29:59'),(6048,'SYSLOG_FACILITY',0,'LOG_USER','chaine',0,'','2017-02-15 22:37:01'),(6049,'SYSLOG_FIREPHP_INCLUDEPATH',0,'/home/ldestailleur/git/dolibarr_5.0/htdocs/includes/firephp/firephp-core/lib/','chaine',0,'','2017-02-15 22:37:01'),(6050,'SYSLOG_FILE',0,'DOL_DATA_ROOT/dolibarr.log','chaine',0,'','2017-02-15 22:37:01'),(6051,'SYSLOG_CHROMEPHP_INCLUDEPATH',0,'/home/ldestailleur/git/dolibarr_5.0/htdocs/includes/ccampbell/chromephp/','chaine',0,'','2017-02-15 22:37:01'),(6052,'SYSLOG_HANDLERS',0,'[\"mod_syslog_file\"]','chaine',0,'','2017-02-15 22:37:01'),(6054,'SYSLOG_LEVEL',0,'7','chaine',0,'','2017-02-15 22:37:21'),(6092,'MAIN_SIZE_SHORTLIST_LIMIT',0,'3','chaine',0,'Max length for small lists (tabs)','2017-05-12 09:02:38'),(6099,'MAIN_MODULE_SKYPE',1,'1',NULL,0,NULL,'2017-05-12 09:03:51'),(6100,'MAIN_MODULE_GRAVATAR',1,'1',NULL,0,NULL,'2017-05-12 09:03:54'),(6102,'PRODUCT_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/products','chaine',0,'','2017-08-27 13:29:07'),(6103,'CONTRACT_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/contracts','chaine',0,'','2017-08-27 13:29:07'),(6104,'USERGROUP_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/usergroups','chaine',0,'','2017-08-27 13:29:07'),(6105,'USER_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/users','chaine',0,'','2017-08-27 13:29:07'),(6106,'MAIN_ENABLE_OVERWRITE_TRANSLATION',1,'1','chaine',0,'Enable overwrote of translation','2017-08-27 13:29:07'),(6377,'COMMANDE_SAPHIR_MASK',1,'{yy}{mm}{000}{ttt}','chaine',0,'','2017-09-06 07:56:25'),(6518,'GOOGLE_DUPLICATE_INTO_THIRDPARTIES',1,'1','chaine',0,'','2017-09-06 19:43:57'),(6519,'GOOGLE_DUPLICATE_INTO_CONTACTS',1,'0','chaine',0,'','2017-09-06 19:43:57'),(6520,'GOOGLE_TAG_PREFIX',1,'Dolibarr (Thirdparties)','chaine',0,'','2017-09-06 19:43:57'),(6521,'GOOGLE_TAG_PREFIX_CONTACTS',1,'Dolibarr (Contacts/Addresses)','chaine',0,'','2017-09-06 19:43:57'),(6522,'GOOGLE_ENABLE_AGENDA',1,'1','chaine',0,'','2017-09-06 19:44:12'),(6523,'GOOGLE_AGENDA_COLOR1',1,'1B887A','chaine',0,'','2017-09-06 19:44:12'),(6524,'GOOGLE_AGENDA_COLOR2',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6525,'GOOGLE_AGENDA_COLOR3',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6526,'GOOGLE_AGENDA_COLOR4',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6527,'GOOGLE_AGENDA_COLOR5',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6528,'GOOGLE_AGENDA_TIMEZONE',1,'Europe/Paris','chaine',0,'','2017-09-06 19:44:12'),(6529,'GOOGLE_AGENDA_NB',1,'5','chaine',0,'','2017-09-06 19:44:12'),(6543,'MAIN_SMS_DEBUG',0,'1','chaine',1,'This is to enable OVH SMS debug','2017-09-06 19:44:34'),(6562,'BLOCKEDLOG_ENTITY_FINGERPRINT',1,'b63e359ffca54d5c2bab869916eaf23d4a736703028ccbf77ce1167c5f830e7b','chaine',0,'Numeric Unique Fingerprint','2018-01-19 11:27:15'),(6564,'BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY',1,'FR','chaine',0,'This is list of country code where the module may be mandatory','2018-01-19 11:27:15'),(6565,'MAIN_MODULE_BOOKMARK',1,'1',NULL,0,'{\"authorid\":\"12\",\"ip\":\"82.240.38.230\"}','2018-01-19 11:27:34'),(6566,'MAIN_MODULE_ADHERENT',1,'1',NULL,0,'{\"authorid\":\"12\",\"ip\":\"82.240.38.230\"}','2018-01-19 11:27:56'),(6567,'ADHERENT_ADDON_PDF',1,'standard','chaine',0,'Name of PDF model of member','2018-01-19 11:27:56'),(6569,'MAIN_MODULE_STRIPE',1,'1',NULL,0,'{\"authorid\":\"12\",\"ip\":\"82.240.38.230\"}','2018-01-19 11:28:17'),(6632,'MAIN_MODULE_TICKET',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-06-05 09:15:29'),(6635,'MAIN_MODULE_TICKET_TRIGGERS',1,'1','chaine',0,NULL,'2019-06-05 09:15:29'),(6636,'MAIN_MODULE_TICKET_MODELS',1,'1','chaine',0,NULL,'2019-06-05 09:15:29'),(6647,'MAIN_MODULE_SOCIALNETWORKS',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-06-05 09:16:49'),(6795,'TICKET_ADDON',1,'mod_ticket_simple','chaine',0,'','2019-09-26 12:07:59'),(6796,'PRODUCT_CODEPRODUCT_ADDON',1,'mod_codeproduct_elephant','chaine',0,'','2019-09-26 12:59:00'),(6800,'CASHDESK_ID_THIRDPARTY1',1,'7','chaine',0,'','2019-09-26 15:30:09'),(6801,'CASHDESK_ID_BANKACCOUNT_CASH1',1,'3','chaine',0,'','2019-09-26 15:30:09'),(6802,'CASHDESK_ID_BANKACCOUNT_CHEQUE1',1,'4','chaine',0,'','2019-09-26 15:30:09'),(6803,'CASHDESK_ID_BANKACCOUNT_CB1',1,'4','chaine',0,'','2019-09-26 15:30:09'),(6804,'CASHDESK_ID_BANKACCOUNT_PRE1',1,'4','chaine',0,'','2019-09-26 15:30:09'),(6805,'CASHDESK_ID_BANKACCOUNT_VIR1',1,'1','chaine',0,'','2019-09-26 15:30:09'),(6806,'CASHDESK_NO_DECREASE_STOCK1',1,'1','chaine',0,'','2019-09-26 15:30:09'),(6811,'FORCEPROJECT_ON_PROPOSAL',1,'1','chaine',0,'','2019-09-27 14:52:57'),(6813,'PROJECT_USE_OPPORTUNITIES',1,'1','chaine',0,'','2019-10-01 11:48:09'),(6814,'PACKTHEMEACTIVATEDTHEME',0,'modOwnTheme','chaine',0,'','2019-10-02 11:41:58'),(6815,'OWNTHEME_COL1',0,'#6a89cc','chaine',0,'','2019-10-02 11:41:58'),(6816,'OWNTHEME_COL2',0,'#60a3bc','chaine',0,'','2019-10-02 11:41:58'),(6817,'DOL_VERSION',0,'10.0.2','chaine',0,'Dolibarr version','2019-10-02 11:41:58'),(6823,'OWNTHEME_COL_BODY_BCKGRD',0,'#E9E9E9','chaine',0,'','2019-10-02 11:41:58'),(6824,'OWNTHEME_COL_LOGO_BCKGRD',0,'#474c80','chaine',0,'','2019-10-02 11:41:58'),(6825,'OWNTHEME_COL_TXT_MENU',0,'#b8c6e5','chaine',0,'','2019-10-02 11:41:58'),(6826,'OWNTHEME_COL_HEADER_BCKGRD',0,'#474c80','chaine',0,'','2019-10-02 11:41:58'),(6827,'OWNTHEME_CUSTOM_CSS',0,'0','yesno',0,'','2019-10-02 11:41:58'),(6828,'OWNTHEME_CUSTOM_JS',0,'0','yesno',0,'','2019-10-02 11:41:58'),(6829,'OWNTHEME_FIXED_MENU',0,'0','yesno',0,'','2019-10-02 11:41:58'),(6830,'OWNTHEME_D_HEADER_FONT_SIZE',0,'1.7rem','chaine',0,'','2019-10-02 11:41:58'),(6831,'OWNTHEME_S_HEADER_FONT_SIZE',0,'1.6rem','chaine',0,'','2019-10-02 11:41:58'),(6832,'OWNTHEME_D_VMENU_FONT_SIZE',0,'1.2rem','chaine',0,'','2019-10-02 11:41:58'),(6833,'OWNTHEME_S_VMENU_FONT_SIZE',0,'1.2rem','chaine',0,'','2019-10-02 11:41:58'),(6844,'MAIN_THEME',0,'eldy','chaine',0,'','2019-10-02 11:46:02'),(6845,'MAIN_MENU_STANDARD',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6846,'MAIN_MENUFRONT_STANDARD',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6847,'MAIN_MENU_SMARTPHONE',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6848,'MAIN_MENUFRONT_SMARTPHONE',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6849,'MAIN_UPLOAD_DOC',1,'20000','chaine',0,'','2019-10-02 11:46:54'),(6850,'MAIN_UMASK',1,'0664','chaine',0,'','2019-10-02 11:46:54'),(6851,'BECREATIVE_COL1',1,'#1e88e5','chaine',0,'','2019-10-02 11:47:10'),(6852,'BECREATIVE_COL2',1,'#1e88e5','chaine',0,'','2019-10-02 11:47:10'),(6853,'DOL_VERSION',1,'10.0.2','chaine',0,'Dolibarr version','2019-10-02 11:47:10'),(6859,'BECREATIVE_COL_BODY_BCKGRD',1,'#e6eaef','chaine',0,'','2019-10-02 11:47:10'),(6860,'BECREATIVE_COL_LOGO_BCKGRD',1,'#1e88e5','chaine',0,'','2019-10-02 11:47:10'),(6861,'BECREATIVE_COL_TXT_MENU',1,'#b8c6e5','chaine',0,'','2019-10-02 11:47:10'),(6862,'BECREATIVE_COL_HEADER_BCKGRD',1,'#26a69a','chaine',0,'','2019-10-02 11:47:10'),(6863,'BECREATIVE_CUSTOM_CSS',1,'0','yesno',0,'','2019-10-02 11:47:10'),(6864,'BECREATIVE_CUSTOM_JS',1,'0','yesno',0,'','2019-10-02 11:47:10'),(6865,'BECREATIVE_FIXED_MENU',1,'0','yesno',0,'','2019-10-02 11:47:10'),(6866,'BECREATIVE_D_HEADER_FONT_SIZE',1,'1.7rem','chaine',0,'','2019-10-02 11:47:10'),(6867,'BECREATIVE_S_HEADER_FONT_SIZE',1,'1.6rem','chaine',0,'','2019-10-02 11:47:10'),(6868,'BECREATIVE_D_VMENU_FONT_SIZE',1,'1.2rem','chaine',0,'','2019-10-02 11:47:10'),(6869,'BECREATIVE_S_VMENU_FONT_SIZE',1,'1.2rem','chaine',0,'','2019-10-02 11:47:10'),(6881,'MAIN_MENU_STANDARD',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6882,'MAIN_MENUFRONT_STANDARD',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6883,'MAIN_MENU_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6884,'MAIN_MENUFRONT_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6885,'ACCOUNTING_ACCOUNT_CUSTOMER',1,'411','chaine',0,'','2019-10-04 08:15:44'),(6886,'ACCOUNTING_ACCOUNT_SUPPLIER',1,'401','chaine',0,'','2019-10-04 08:15:44'),(6887,'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',1,'421','chaine',0,'','2019-10-04 08:15:44'),(6888,'ACCOUNTING_PRODUCT_BUY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6889,'ACCOUNTING_PRODUCT_SOLD_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6890,'ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6891,'ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6892,'ACCOUNTING_SERVICE_BUY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6893,'ACCOUNTING_SERVICE_SOLD_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6894,'ACCOUNTING_VAT_BUY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6895,'ACCOUNTING_VAT_SOLD_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6896,'ACCOUNTING_VAT_PAY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6897,'ACCOUNTING_ACCOUNT_SUSPENSE',1,'471','chaine',0,'','2019-10-04 08:15:44'),(6898,'ACCOUNTING_ACCOUNT_TRANSFER_CASH',1,'58','chaine',0,'','2019-10-04 08:15:44'),(6899,'DONATION_ACCOUNTINGACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6900,'ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6901,'LOAN_ACCOUNTING_ACCOUNT_CAPITAL',1,'164','chaine',0,'','2019-10-04 08:15:44'),(6902,'LOAN_ACCOUNTING_ACCOUNT_INTEREST',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6903,'LOAN_ACCOUNTING_ACCOUNT_INSURANCE',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6912,'TICKET_ENABLE_PUBLIC_INTERFACE',1,'1','chaine',0,'','2019-10-04 11:44:33'),(6934,'TICKET_NOTIFICATION_EMAIL_FROM',1,'fff','chaine',0,'','2019-10-04 12:03:51'),(6935,'TICKET_NOTIFICATION_EMAIL_TO',1,'ff','chaine',0,'','2019-10-04 12:03:51'),(6936,'TICKET_MESSAGE_MAIL_INTRO',1,'Hello,<br />\r\nA new response was sent on a ticket that you contact. Here is the message:<img alt=\"\" src=\"/dolibarr_10.0/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/background_rough-horn.jpg\" style=\"height:1080px; width:1920px\" />','chaine',0,'','2019-10-04 12:03:51'),(6937,'TICKET_MESSAGE_MAIL_SIGNATURE',1,'<p>Sincerely,</p>\r\n\r\n<p>--<img alt=\"\" src=\"/dolibarr_10.0/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/background_rough-horn.jpg\" style=\"height:1080px; width:1920px\" /></p>\r\n','chaine',0,'','2019-10-04 12:03:51'),(7027,'USER_PASSWORD_GENERATED',1,'Perso','chaine',0,'','2019-10-07 10:52:46'),(7028,'USER_PASSWORD_PATTERN',1,'8;1;0;1;0;1','chaine',0,'','2019-10-07 10:57:03'),(7032,'MAIN_MODULE_BOM',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-10-08 18:49:41'),(7034,'BOM_ADDON',1,'mod_bom_standard','chaine',0,'Name of numbering rules of BOM','2019-10-08 18:49:41'),(7035,'BOM_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/boms','chaine',0,NULL,'2019-10-08 18:49:41'),(7036,'MAIN_MODULE_GEOIPMAXMIND',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-10-08 18:51:54'),(7037,'MAIN_MODULE_DAV',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-10-08 18:54:07'),(7122,'BOM_ADDON_PDF',1,'generic_bom_odt','chaine',0,'','2019-11-28 14:00:58'),(7195,'MAIN_AGENDA_ACTIONAUTO_MO_VALIDATE',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7196,'MAIN_AGENDA_ACTIONAUTO_MO_PRODUCED',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7197,'MAIN_AGENDA_ACTIONAUTO_MO_DELETE',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7198,'MAIN_AGENDA_ACTIONAUTO_MO_CANCEL',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7201,'TICKET_PUBLIC_INTERFACE_TOPIC',1,'MyBigCompany public interface for Ticket','chaine',0,'','2019-11-29 08:49:36'),(7202,'TICKET_PUBLIC_TEXT_HOME',1,'You can create a support ticket or view existing from its identifier tracking ticket.','chaine',0,'','2019-11-29 08:49:36'),(7203,'TICKET_PUBLIC_TEXT_HELP_MESSAGE',1,'Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.','chaine',0,'','2019-11-29 08:49:36'),(7204,'TICKET_MESSAGE_MAIL_NEW',1,'TicketMessageMailNewText','chaine',0,'','2019-11-29 08:49:36'),(7209,'MAIN_MODULE_MRP',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-11-29 08:57:42'),(7210,'MAIN_MODULE_MRP_TRIGGERS',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7211,'MAIN_MODULE_MRP_LOGIN',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7212,'MAIN_MODULE_MRP_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7213,'MAIN_MODULE_MRP_MENUS',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7214,'MAIN_MODULE_MRP_TPL',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7215,'MAIN_MODULE_MRP_BARCODE',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7216,'MAIN_MODULE_MRP_MODELS',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7217,'MAIN_MODULE_MRP_THEME',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7218,'MAIN_MODULE_MRP_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7220,'MRP_MO_ADDON',1,'mod_mo_standard','chaine',0,'Name of numbering rules of MO','2019-11-29 08:57:42'),(7221,'MRP_MO_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/mrps','chaine',0,NULL,'2019-11-29 08:57:42'),(7222,'MRP_MO_ADDON_PDF',1,'generic_mo_odt','chaine',0,'','2019-11-29 08:57:47'),(7254,'MAIN_INFO_OPENINGHOURS_MONDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7255,'MAIN_INFO_OPENINGHOURS_TUESDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7256,'MAIN_INFO_OPENINGHOURS_WEDNESDAY',1,'8-13','chaine',0,'','2019-12-19 11:14:21'),(7257,'MAIN_INFO_OPENINGHOURS_THURSDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7258,'MAIN_INFO_OPENINGHOURS_FRIDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7264,'MAIN_INFO_ACCOUNTANT_NAME',1,'Bob Bookkeeper','chaine',0,'','2019-12-19 11:14:54'),(7265,'MAIN_INFO_ACCOUNTANT_TOWN',1,'Berlin','chaine',0,'','2019-12-19 11:14:54'),(7266,'MAIN_INFO_ACCOUNTANT_STATE',1,'0','chaine',0,'','2019-12-19 11:14:54'),(7267,'MAIN_INFO_ACCOUNTANT_COUNTRY',1,'5','chaine',0,'','2019-12-19 11:14:54'),(7268,'MAIN_INFO_ACCOUNTANT_MAIL',1,'mybookkeeper@example.com','chaine',0,'','2019-12-19 11:14:54'),(7313,'MODULEBUILDER_ASCIIDOCTOR',1,'asciidoctor','chaine',0,'','2019-12-20 10:57:21'),(7314,'MODULEBUILDER_ASCIIDOCTORPDF',1,'asciidoctor-pdf','chaine',0,'','2019-12-20 10:57:21'),(7337,'EXTERNAL_RSS_TITLE_1',1,'Dolibarr.org News','chaine',0,'','2019-12-20 12:10:38'),(7338,'EXTERNAL_RSS_URLRSS_1',1,'https://www.dolibarr.org/rss','chaine',0,'','2019-12-20 12:10:38'),(7339,'EXPENSEREPORT_ADDON',1,'mod_expensereport_jade','chaine',0,'','2019-12-20 16:33:46'),(7378,'COMPANY_USE_SEARCH_TO_SELECT',1,'0','chaine',0,'','2019-12-21 15:54:22'),(7420,'CASHDESK_SERVICES',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7421,'TAKEPOS_ROOT_CATEGORY_ID',1,'31','chaine',0,'','2019-12-23 12:15:06'),(7422,'TAKEPOSCONNECTOR',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7423,'TAKEPOS_BAR_RESTAURANT',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7424,'TAKEPOS_TICKET_VAT_GROUPPED',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7425,'TAKEPOS_AUTO_PRINT_TICKETS',1,'0','int',0,'','2019-12-23 12:15:06'),(7426,'TAKEPOS_NUMPAD',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7427,'TAKEPOS_NUM_TERMINALS',1,'1','chaine',0,'','2019-12-23 12:15:06'),(7428,'TAKEPOS_DIRECT_PAYMENT',1,'0','int',0,'','2019-12-23 12:15:06'),(7429,'TAKEPOS_CUSTOM_RECEIPT',1,'0','int',0,'','2019-12-23 12:15:06'),(7430,'TAKEPOS_EMAIL_TEMPLATE_INVOICE',1,'-1','chaine',0,'','2019-12-23 12:15:06'),(7452,'MEMBER_ENABLE_PUBLIC',1,'1','chaine',0,'','2020-01-01 10:31:46'),(7453,'MEMBER_NEWFORM_AMOUNT',1,'20','chaine',0,'','2020-01-01 10:31:46'),(7454,'MEMBER_NEWFORM_EDITAMOUNT',1,'0','chaine',0,'','2020-01-01 10:31:46'),(7455,'MEMBER_NEWFORM_PAYONLINE',1,'all','chaine',0,'','2020-01-01 10:31:46'),(7456,'MEMBER_NEWFORM_FORCETYPE',1,'1','chaine',0,'','2020-01-01 10:31:46'),(7470,'STRIPE_TEST_PUBLISHABLE_KEY',1,'pk_test_123456789','chaine',0,'','2020-01-01 11:43:44'),(7471,'STRIPE_TEST_SECRET_KEY',1,'sk_test_123456','chaine',0,'','2020-01-01 11:43:44'),(7472,'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS',1,'4','chaine',0,'','2020-01-01 11:43:44'),(7473,'STRIPE_USER_ACCOUNT_FOR_ACTIONS',1,'1','chaine',0,'','2020-01-01 11:43:44'),(7489,'CAPTURESERVER_SECURITY_KEY',1,'securitykey123','chaine',0,'','2020-01-01 12:00:49'),(7720,'SUPPLIER_INVOICE_ALLOW_REUSE_OF_CREDIT_WHEN_PARTIALLY_REFUNDED',1,'1','chaine',1,'','2020-01-01 17:19:12'),(8063,'MAIN_AGENDA_ACTIONAUTO_COMPANY_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8064,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8065,'MAIN_AGENDA_ACTIONAUTO_COMPANY_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8066,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLOSE_REFUSED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8067,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLASSIFY_BILLED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8068,'MAIN_AGENDA_ACTIONAUTO_PROPAL_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8069,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLOSE_SIGNED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8070,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8071,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8072,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8073,'MAIN_AGENDA_ACTIONAUTO_ORDER_CANCEL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8074,'MAIN_AGENDA_ACTIONAUTO_ORDER_CLOSE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8075,'MAIN_AGENDA_ACTIONAUTO_ORDER_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8076,'MAIN_AGENDA_ACTIONAUTO_ORDER_CLASSIFY_BILLED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8077,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8078,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8079,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8080,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8081,'MAIN_AGENDA_ACTIONAUTO_BILL_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8082,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8083,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8084,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8085,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8086,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_CLOSE_SIGNED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8087,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_CLOSE_REFUSED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8088,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8089,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8090,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8091,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_RECEIVE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8092,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_SUBMIT',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8093,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_APPROVE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8094,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_REFUSE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8095,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_CLASSIFY_BILLED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8096,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8097,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8098,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8099,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_UNVALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8100,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_PAYED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8101,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8102,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8103,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_CANCELED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8104,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8105,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8106,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8107,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8108,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_REOPEN',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8109,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8110,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8111,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8112,'MAIN_AGENDA_ACTIONAUTO_MEMBER_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8113,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8114,'MAIN_AGENDA_ACTIONAUTO_MEMBER_MODIFY',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8115,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8116,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_MODIFY',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8117,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8118,'MAIN_AGENDA_ACTIONAUTO_MEMBER_RESILIATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8119,'MAIN_AGENDA_ACTIONAUTO_MEMBER_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8120,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8121,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8122,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_MODIFY',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8123,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8124,'MAIN_AGENDA_ACTIONAUTO_TASK_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8125,'MAIN_AGENDA_ACTIONAUTO_TASK_MODIFY',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8126,'MAIN_AGENDA_ACTIONAUTO_TASK_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8127,'MAIN_AGENDA_ACTIONAUTO_PROJECT_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8128,'MAIN_AGENDA_ACTIONAUTO_PROJECT_MODIFY',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8129,'MAIN_AGENDA_ACTIONAUTO_PROJECT_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8130,'MAIN_AGENDA_ACTIONAUTO_TICKET_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8131,'MAIN_AGENDA_ACTIONAUTO_TICKET_MODIFY',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8132,'MAIN_AGENDA_ACTIONAUTO_TICKET_ASSIGNED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8133,'MAIN_AGENDA_ACTIONAUTO_TICKET_CLOSE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8134,'MAIN_AGENDA_ACTIONAUTO_TICKET_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8135,'MAIN_AGENDA_ACTIONAUTO_TICKET_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8136,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8137,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8138,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8139,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_APPROVE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8140,'MAIN_AGENDA_ACTIONAUTO_USER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8141,'MAIN_AGENDA_ACTIONAUTO_BOM_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8142,'MAIN_AGENDA_ACTIONAUTO_BOM_UNVALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8143,'MAIN_AGENDA_ACTIONAUTO_BOM_CLOSE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8144,'MAIN_AGENDA_ACTIONAUTO_BOM_REOPEN',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8145,'MAIN_AGENDA_ACTIONAUTO_BOM_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8146,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8147,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_PRODUCED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8148,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8149,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_CANCEL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8169,'CABINETMED_DELAY_TO_LOCK_RECORD',1,'0','chaine',1,'Number of days before locking edit of consultation','2020-01-05 20:37:19'),(8190,'ACCOUNTING_PRODUCT_MODE',1,'ACCOUNTANCY_SELL_EXPORT','chaine',0,'','2020-01-06 01:23:30'),(8191,'MAIN_ENABLE_DEFAULT_VALUES',1,'1','chaine',0,'','2020-01-06 16:09:52'),(8210,'CABINETMED_RHEUMATOLOGY_ON',1,'0','texte',0,'','2020-01-06 16:51:43'),(8213,'MAIN_SEARCHFORM_SOCIETE',1,'1','texte',0,'','2020-01-06 16:51:43'),(8214,'CABINETMED_BANK_PATIENT_REQUIRED',1,'0','texte',0,'','2020-01-06 16:51:43'),(8215,'DIAGNOSTIC_IS_NOT_MANDATORY',1,'1','texte',0,'','2020-01-06 16:51:43'),(8216,'USER_ADDON_PDF_ODT',1,'generic_user_odt','chaine',0,'','2020-01-07 13:45:19'),(8217,'USERGROUP_ADDON_PDF_ODT',1,'generic_usergroup_odt','chaine',0,'','2020-01-07 13:45:23'),(8230,'MAIN_MODULE_EMAILCOLLECTOR',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-12 20:13:55'),(8232,'MAIN_MODULE_SUPPLIERPROPOSAL',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-13 14:37:09'),(8233,'MAIN_MODULE_EXPEDITION',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-13 14:38:20'),(8252,'SYSTEMTOOLS_MYSQLDUMP',1,'/usr/bin/mysqldump','chaine',0,'','2020-01-15 15:42:41'),(8256,'WEBSITE_EDITINLINE',1,'0','chaine',0,'','2020-01-17 11:07:44'),(8258,'WEBSITE_SUBCONTAINERSINLINE',1,'1','chaine',0,'','2020-01-17 12:52:48'),(8259,'ACCOUNTING_REEXPORT',1,'1','yesno',0,'','2020-01-17 13:42:56'),(8291,'PRODUIT_MULTIPRICES_LIMIT',1,'5','chaine',0,'','2020-01-17 14:21:46'),(8293,'PRODUIT_CUSTOMER_PRICES_BY_QTY',1,'0','chaine',0,'','2020-01-17 14:21:46'),(8303,'PRODUCT_PRICE_UNIQ',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8304,'PRODUIT_MULTIPRICES',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8305,'PRODUIT_CUSTOMER_PRICES',1,'1','chaine',0,'','2020-01-17 14:25:30'),(8306,'PRODUIT_SOUSPRODUITS',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8307,'PRODUIT_DESC_IN_FORM',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8308,'PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8309,'PRODUIT_USE_SEARCH_TO_SELECT',1,'1','chaine',0,'','2020-01-17 14:25:30'),(8310,'PRODUIT_FOURN_TEXTS',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8313,'MAIN_MODULE_FCKEDITOR',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-18 17:13:27'),(8314,'FCKEDITOR_ENABLE_TICKET',1,'1','chaine',0,'','2020-01-18 19:39:54'),(8321,'FCKEDITOR_SKIN',1,'moono-lisa','chaine',0,'','2020-01-18 19:41:15'),(8322,'FCKEDITOR_TEST',1,'Test &lt; aaa<br />\r\n<br />\r\n<img alt=\"\" src=\"/dolibarr_11.0/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/background_coder.jpg\" style=\"height:1280px; width:1920px\" />','chaine',0,'','2020-01-18 19:41:15'),(8373,'MAIN_FEATURES_LEVEL',0,'0','chaine',1,'Level of features to show (0=stable only, 1=stable+experimental, 2=stable+experimental+development','2020-01-20 17:42:42'),(8484,'MAIN_LANG_DEFAULT',1,'auto','chaine',0,'','2020-01-21 09:40:00'),(8485,'MAIN_IHM_PARAMS_REV',1,'11','chaine',0,'','2020-01-21 09:40:00'),(8486,'MAIN_MULTILANGS',1,'1','chaine',0,'','2020-01-21 09:40:00'),(8487,'MAIN_THEME',1,'eldy','chaine',0,'','2020-01-21 09:40:00'),(8488,'THEME_ELDY_USE_HOVER',1,'237,244,251','chaine',0,'','2020-01-21 09:40:00'),(8489,'MAIN_SIZE_LISTE_LIMIT',1,'25','chaine',0,'','2020-01-21 09:40:00'),(8490,'MAIN_SIZE_SHORTLIST_LIMIT',1,'3','chaine',0,'','2020-01-21 09:40:00'),(8491,'MAIN_DISABLE_JAVASCRIPT',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8492,'MAIN_BUTTON_HIDE_UNAUTHORIZED',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8493,'MAIN_START_WEEK',1,'1','chaine',0,'','2020-01-21 09:40:00'),(8494,'MAIN_DEFAULT_WORKING_DAYS',1,'1-5','chaine',0,'','2020-01-21 09:40:00'),(8495,'MAIN_DEFAULT_WORKING_HOURS',1,'9-18','chaine',0,'','2020-01-21 09:40:00'),(8496,'MAIN_SHOW_LOGO',1,'1','chaine',0,'','2020-01-21 09:40:00'),(8497,'MAIN_FIRSTNAME_NAME_POSITION',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8498,'MAIN_HELPCENTER_DISABLELINK',0,'0','chaine',0,'','2020-01-21 09:40:00'),(8499,'MAIN_HOME',1,'<span style=\"font-size:12px\">__(NoteSomeFeaturesAreDisabled)__<br />\r\n__(SomeTranslationAreUncomplete)__</span>','chaine',0,'','2020-01-21 09:40:00'),(8501,'MAIN_BUGTRACK_ENABLELINK',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8508,'MAIN_MODULE_ACCOUNTING',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:28'),(8509,'MAIN_MODULE_AGENDA',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:28'),(8510,'MAIN_MODULE_BARCODE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:28'),(8511,'MAIN_MODULE_CRON',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:28'),(8512,'MAIN_MODULE_COMMANDE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:28'),(8513,'MAIN_MODULE_DON',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:29'),(8514,'MAIN_MODULE_ECM',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:29'),(8515,'MAIN_MODULE_EXPENSEREPORT',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:29'),(8516,'MAIN_MODULE_FACTURE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:29'),(8517,'MAIN_MODULE_FOURNISSEUR',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:29'),(8518,'MAIN_MODULE_HOLIDAY',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:29'),(8519,'MAIN_MODULE_OPENSURVEY',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:29'),(8520,'MAIN_MODULE_PRINTING',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:29'),(8521,'MAIN_MODULE_RESOURCE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:29'),(8522,'MAIN_MODULE_SALARIES',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:29'),(8523,'MAIN_MODULE_SOCIETE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:30'),(8524,'MAIN_MODULE_SERVICE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:30'),(8525,'TAKEPOS_PRINT_METHOD',1,'browser','chaine',0,'','2020-06-12 17:12:30'),(8526,'MAIN_MODULE_TAKEPOS',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:30'),(8527,'MAIN_MODULE_TAKEPOS_TRIGGERS',1,'0','chaine',0,NULL,'2020-06-12 17:12:30'),(8528,'MAIN_MODULE_TAKEPOS_LOGIN',1,'0','chaine',0,NULL,'2020-06-12 17:12:30'),(8529,'MAIN_MODULE_TAKEPOS_SUBSTITUTIONS',1,'1','chaine',0,NULL,'2020-06-12 17:12:30'),(8530,'MAIN_MODULE_TAKEPOS_MENUS',1,'0','chaine',0,NULL,'2020-06-12 17:12:30'),(8531,'MAIN_MODULE_TAKEPOS_THEME',1,'0','chaine',0,NULL,'2020-06-12 17:12:30'),(8532,'MAIN_MODULE_TAKEPOS_TPL',1,'0','chaine',0,NULL,'2020-06-12 17:12:30'),(8533,'MAIN_MODULE_TAKEPOS_BARCODE',1,'0','chaine',0,NULL,'2020-06-12 17:12:30'),(8534,'MAIN_MODULE_TAKEPOS_MODELS',1,'0','chaine',0,NULL,'2020-06-12 17:12:30'),(8535,'MAIN_MODULE_USER',0,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:30'),(8536,'MAIN_MODULE_VARIANTS',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:30'),(8537,'MAIN_MODULE_WEBSITE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:30'),(8538,'MAIN_VERSION_LAST_UPGRADE',0,'12.0.0','chaine',0,'Dolibarr version for last upgrade','2020-06-12 17:12:32'),(8540,'MAIN_FIRST_PING_OK_DATE',1,'20200612171237','chaine',0,'','2020-06-12 17:12:37'),(8541,'MAIN_FIRST_PING_OK_ID',1,'7d3fa4278b44d85aa629096595435c63','chaine',0,'','2020-06-12 17:12:37'),(8542,'MAIN_INFO_SOCIETE_COUNTRY',1,'117:IN:India','chaine',0,'','2020-06-12 17:24:42'),(8543,'MAIN_INFO_SOCIETE_NOM',1,'MyBigCompany','chaine',0,'','2020-06-12 17:24:42'),(8544,'MAIN_INFO_SOCIETE_ADDRESS',1,'21 Jump street.','chaine',0,'','2020-06-12 17:24:42'),(8545,'MAIN_INFO_SOCIETE_TOWN',1,'MyTown','chaine',0,'','2020-06-12 17:24:42'),(8546,'MAIN_INFO_SOCIETE_ZIP',1,'75500','chaine',0,'','2020-06-12 17:24:42'),(8547,'MAIN_MONNAIE',1,'EUR','chaine',0,'','2020-06-12 17:24:42'),(8548,'MAIN_INFO_SOCIETE_TEL',1,'09123123','chaine',0,'','2020-06-12 17:24:42'),(8549,'MAIN_INFO_SOCIETE_FAX',1,'09123124','chaine',0,'','2020-06-12 17:24:42'),(8550,'MAIN_INFO_SOCIETE_MAIL',1,'myemail@mybigcompany.com','chaine',0,'','2020-06-12 17:24:42'),(8551,'MAIN_INFO_SOCIETE_WEB',1,'https://www.dolibarr.org','chaine',0,'','2020-06-12 17:24:42'),(8552,'MAIN_INFO_SOCIETE_NOTE',1,'This is note about my company','chaine',0,'','2020-06-12 17:24:42'),(8553,'MAIN_INFO_SOCIETE_GENCOD',1,'1234567890','chaine',0,'','2020-06-12 17:24:42'),(8554,'MAIN_INFO_SOCIETE_FACEBOOK_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8555,'MAIN_INFO_SOCIETE_TWITTER_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8556,'MAIN_INFO_SOCIETE_LINKEDIN_URL',1,'https://www.linkedin.com/company/9400559/admin/','chaine',0,'','2020-06-12 17:24:42'),(8557,'MAIN_INFO_SOCIETE_INSTAGRAM_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8558,'MAIN_INFO_SOCIETE_YOUTUBE_URL',1,'DolibarrERPCRM','chaine',0,'','2020-06-12 17:24:42'),(8559,'MAIN_INFO_SOCIETE_GITHUB_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8560,'MAIN_INFO_SOCIETE_MANAGERS',1,'Zack Zeceo','chaine',0,'','2020-06-12 17:24:42'),(8561,'MAIN_INFO_GDPR',1,'Zack Zeceo','chaine',0,'','2020-06-12 17:24:42'),(8562,'MAIN_INFO_CAPITAL',1,'10000','chaine',0,'','2020-06-12 17:24:42'),(8563,'MAIN_INFO_SOCIETE_FORME_JURIDIQUE',1,'0','chaine',0,'','2020-06-12 17:24:42'),(8564,'MAIN_INFO_SIREN',1,'123456','chaine',0,'','2020-06-12 17:24:42'),(8565,'MAIN_INFO_SIRET',1,'ABC-DEF','chaine',0,'','2020-06-12 17:24:42'),(8566,'MAIN_INFO_APE',1,'15E-45-8D','chaine',0,'','2020-06-12 17:24:42'),(8567,'MAIN_INFO_TVAINTRA',1,'FR12345678','chaine',0,'','2020-06-12 17:24:42'),(8568,'MAIN_INFO_SOCIETE_OBJECT',1,'A company demo to show how Dolibarr ERP CRM is wonderfull','chaine',0,'','2020-06-12 17:24:42'),(8569,'SOCIETE_FISCAL_MONTH_START',1,'4','chaine',0,'','2020-06-12 17:24:42'),(8570,'FACTURE_TVAOPTION',1,'1','chaine',0,'','2020-06-12 17:24:42'),(8571,'FACTURE_LOCAL_TAX1_OPTION',1,'localtax1on','chaine',0,'','2020-06-12 17:24:42'),(8572,'FACTURE_LOCAL_TAX2_OPTION',1,'localtax2on','chaine',0,'','2020-06-12 17:24:42'),(8573,'MAIN_INFO_VALUE_LOCALTAX1',1,'0','chaine',0,'','2020-06-12 17:24:42'),(8574,'MAIN_INFO_LOCALTAX_CALC1',1,'0','chaine',0,'','2020-06-12 17:24:42'),(8575,'MAIN_INFO_VALUE_LOCALTAX2',1,'0','chaine',0,'','2020-06-12 17:24:42'),(8576,'MAIN_INFO_LOCALTAX_CALC2',1,'0','chaine',0,'','2020-06-12 17:24:42');
+INSERT INTO `llx_const` VALUES (8,'MAIN_UPLOAD_DOC',0,'2048','chaine',0,'Max size for file upload (0 means no upload allowed)','2012-07-08 11:17:57'),(9,'MAIN_SEARCHFORM_SOCIETE',0,'1','yesno',0,'Show form for quick company search','2012-07-08 11:17:57'),(10,'MAIN_SEARCHFORM_CONTACT',0,'1','yesno',0,'Show form for quick contact search','2012-07-08 11:17:57'),(11,'MAIN_SEARCHFORM_PRODUITSERVICE',0,'1','yesno',0,'Show form for quick product search','2012-07-08 11:17:58'),(12,'MAIN_SEARCHFORM_ADHERENT',0,'1','yesno',0,'Show form for quick member search','2012-07-08 11:17:58'),(16,'MAIN_SIZE_LISTE_LIMIT',0,'25','chaine',0,'Longueur maximum des listes','2012-07-08 11:17:58'),(29,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',1,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2012-07-08 11:17:58'),(33,'SOCIETE_NOLIST_COURRIER',0,'1','yesno',0,'Liste les fichiers du repertoire courrier','2012-07-08 11:17:58'),(36,'ADHERENT_MAIL_REQUIRED',1,'1','yesno',0,'EMail required to create a new member','2012-07-08 11:17:58'),(37,'ADHERENT_MAIL_FROM',1,'adherents@domain.com','chaine',0,'Sender EMail for automatic emails','2012-07-08 11:17:58'),(38,'ADHERENT_MAIL_RESIL',1,'Your subscription has been resiliated.\r\nWe hope to see you soon again','html',0,'Mail resiliation','2018-11-23 11:56:07'),(39,'ADHERENT_MAIL_VALID',1,'Your subscription has been validated.\r\nThis is a remind of your personal information :\r\n\r\n%INFOS%\r\n\r\n','html',0,'Mail de validation','2018-11-23 11:56:07'),(40,'ADHERENT_MAIL_COTIS',1,'Hello %PRENOM%,\r\nThanks for your subscription.\r\nThis email confirms that your subscription has been received and processed.\r\n\r\n','html',0,'Mail de validation de cotisation','2018-11-23 11:56:07'),(41,'ADHERENT_MAIL_VALID_SUBJECT',1,'Your subscription has been validated','chaine',0,'Sujet du mail de validation','2012-07-08 11:17:59'),(42,'ADHERENT_MAIL_RESIL_SUBJECT',1,'Resiliating your subscription','chaine',0,'Sujet du mail de resiliation','2012-07-08 11:17:59'),(43,'ADHERENT_MAIL_COTIS_SUBJECT',1,'Receipt of your subscription','chaine',0,'Sujet du mail de validation de cotisation','2012-07-08 11:17:59'),(44,'MAILING_EMAIL_FROM',1,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2012-07-08 11:17:59'),(45,'ADHERENT_USE_MAILMAN',1,'0','yesno',0,'Utilisation de Mailman','2012-07-08 11:17:59'),(46,'ADHERENT_MAILMAN_UNSUB_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&user=%EMAIL%','chaine',0,'Url de desinscription aux listes mailman','2012-07-08 11:17:59'),(47,'ADHERENT_MAILMAN_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&send_welcome_msg_to_this_batch=1&subscribees=%EMAIL%','chaine',0,'Url pour les inscriptions mailman','2012-07-08 11:17:59'),(48,'ADHERENT_MAILMAN_LISTS',1,'test-test,test-test2','chaine',0,'Listes auxquelles inscrire les nouveaux adherents','2012-07-08 11:17:59'),(49,'ADHERENT_MAILMAN_ADMINPW',1,'','chaine',0,'Mot de passe Admin des liste mailman','2012-07-08 11:17:59'),(50,'ADHERENT_MAILMAN_SERVER',1,'lists.domain.com','chaine',0,'Serveur hebergeant les interfaces d Admin des listes mailman','2012-07-08 11:17:59'),(51,'ADHERENT_MAILMAN_LISTS_COTISANT',1,'','chaine',0,'Liste(s) auxquelles les nouveaux cotisants sont inscris automatiquement','2012-07-08 11:17:59'),(52,'ADHERENT_USE_SPIP',1,'0','yesno',0,'Utilisation de SPIP ?','2012-07-08 11:17:59'),(53,'ADHERENT_USE_SPIP_AUTO',1,'0','yesno',0,'Utilisation de SPIP automatiquement','2012-07-08 11:17:59'),(54,'ADHERENT_SPIP_USER',1,'user','chaine',0,'user spip','2012-07-08 11:17:59'),(55,'ADHERENT_SPIP_PASS',1,'pass','chaine',0,'Pass de connection','2012-07-08 11:17:59'),(56,'ADHERENT_SPIP_SERVEUR',1,'localhost','chaine',0,'serveur spip','2012-07-08 11:17:59'),(57,'ADHERENT_SPIP_DB',1,'spip','chaine',0,'db spip','2012-07-08 11:17:59'),(58,'ADHERENT_CARD_HEADER_TEXT',1,'%ANNEE%','chaine',0,'Texte imprime sur le haut de la carte adherent','2012-07-08 11:17:59'),(59,'ADHERENT_CARD_FOOTER_TEXT',1,'Association AZERTY','chaine',0,'Texte imprime sur le bas de la carte adherent','2012-07-08 11:17:59'),(61,'FCKEDITOR_ENABLE_USER',1,'1','yesno',0,'Activation fckeditor sur notes utilisateurs','2012-07-08 11:17:59'),(62,'FCKEDITOR_ENABLE_SOCIETE',1,'1','yesno',0,'Activation fckeditor sur notes societe','2012-07-08 11:17:59'),(63,'FCKEDITOR_ENABLE_PRODUCTDESC',1,'1','yesno',0,'Activation fckeditor sur notes produits','2012-07-08 11:17:59'),(64,'FCKEDITOR_ENABLE_MEMBER',1,'1','yesno',0,'Activation fckeditor sur notes adherent','2012-07-08 11:17:59'),(65,'FCKEDITOR_ENABLE_MAILING',1,'1','yesno',0,'Activation fckeditor sur emailing','2012-07-08 11:17:59'),(67,'DON_ADDON_MODEL',1,'html_cerfafr','chaine',0,'','2012-07-08 11:18:00'),(68,'PROPALE_ADDON',1,'mod_propale_marbre','chaine',0,'','2012-07-08 11:18:00'),(69,'PROPALE_ADDON_PDF',1,'azur','chaine',0,'','2012-07-08 11:18:00'),(70,'COMMANDE_ADDON',1,'mod_commande_marbre','chaine',0,'','2012-07-08 11:18:00'),(71,'COMMANDE_ADDON_PDF',1,'einstein','chaine',0,'','2012-07-08 11:18:00'),(72,'COMMANDE_SUPPLIER_ADDON',1,'mod_commande_fournisseur_muguet','chaine',0,'','2012-07-08 11:18:00'),(73,'COMMANDE_SUPPLIER_ADDON_PDF',1,'muscadet','chaine',0,'','2012-07-08 11:18:00'),(74,'EXPEDITION_ADDON',1,'enlevement','chaine',0,'','2012-07-08 11:18:00'),(76,'FICHEINTER_ADDON',1,'pacific','chaine',0,'','2012-07-08 11:18:00'),(77,'FICHEINTER_ADDON_PDF',1,'soleil','chaine',0,'','2012-07-08 11:18:00'),(79,'FACTURE_ADDON_PDF',1,'crabe','chaine',0,'','2012-07-08 11:18:00'),(80,'PROPALE_VALIDITY_DURATION',1,'15','chaine',0,'Durée de validitée des propales','2012-07-08 11:18:00'),(230,'COMPANY_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2012-07-08 11:26:20'),(238,'LIVRAISON_ADDON_PDF',1,'typhon','chaine',0,'Nom du gestionnaire de generation des commandes en PDF','2012-07-08 11:26:27'),(239,'DELIVERY_ADDON_NUMBER',1,'mod_delivery_jade','chaine',0,'Nom du gestionnaire de numerotation des bons de livraison','2020-12-10 12:24:40'),(245,'FACTURE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2012-07-08 11:28:53'),(249,'DON_FORM',1,'html_cerfafr','chaine',0,'Nom du gestionnaire de formulaire de dons','2017-09-06 16:12:22'),(254,'ADHERENT_BANK_ACCOUNT',1,'','chaine',0,'ID du Compte banquaire utilise','2012-07-08 11:29:05'),(255,'ADHERENT_BANK_CATEGORIE',1,'','chaine',0,'ID de la categorie banquaire des cotisations','2012-07-08 11:29:05'),(256,'ADHERENT_ETIQUETTE_TYPE',1,'L7163','chaine',0,'Type d etiquette (pour impression de planche d etiquette)','2012-07-08 11:29:05'),(269,'PROJECT_ADDON_PDF',1,'baleine','chaine',0,'Nom du gestionnaire de generation des projets en PDF','2012-07-08 11:29:33'),(270,'PROJECT_ADDON',1,'mod_project_simple','chaine',0,'Nom du gestionnaire de numerotation des projets','2012-07-08 11:29:33'),(369,'EXPEDITION_ADDON_PDF',1,'merou','chaine',0,'','2012-07-08 22:58:07'),(377,'FACTURE_ADDON',1,'mod_facture_terre','chaine',0,'','2012-07-08 23:08:12'),(380,'ADHERENT_CARD_TEXT',1,'%TYPE% n° %ID%\r\n%PRENOM% %NOM%\r\n<%EMAIL%>\r\n%ADRESSE%\r\n%CP% %VILLE%\r\n%PAYS%','',0,'Texte imprime sur la carte adherent','2012-07-08 23:14:46'),(381,'ADHERENT_CARD_TEXT_RIGHT',1,'aaa','',0,'','2012-07-08 23:14:55'),(386,'STOCK_CALCULATE_ON_SHIPMENT',1,'1','chaine',0,'','2012-07-08 23:23:21'),(387,'STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER',1,'1','chaine',0,'','2012-07-08 23:23:26'),(392,'MAIN_AGENDA_XCAL_EXPORTKEY',1,'dolibarr','chaine',0,'','2012-07-08 23:27:50'),(393,'MAIN_AGENDA_EXPORT_PAST_DELAY',1,'100','chaine',0,'','2012-07-08 23:27:50'),(610,'CASHDESK_ID_THIRDPARTY',1,'7','chaine',0,'','2012-07-11 17:08:18'),(611,'CASHDESK_ID_BANKACCOUNT_CASH',1,'3','chaine',0,'','2012-07-11 17:08:18'),(612,'CASHDESK_ID_BANKACCOUNT_CHEQUE',1,'1','chaine',0,'','2012-07-11 17:08:18'),(613,'CASHDESK_ID_BANKACCOUNT_CB',1,'1','chaine',0,'','2012-07-11 17:08:18'),(614,'CASHDESK_ID_WAREHOUSE',1,'2','chaine',0,'','2012-07-11 17:08:18'),(660,'LDAP_USER_DN',1,'ou=users,dc=my-domain,dc=com','chaine',0,NULL,'2012-07-18 10:25:27'),(661,'LDAP_GROUP_DN',1,'ou=groups,dc=my-domain,dc=com','chaine',0,NULL,'2012-07-18 10:25:27'),(662,'LDAP_FILTER_CONNECTION',1,'&(objectClass=user)(objectCategory=person)','chaine',0,NULL,'2012-07-18 10:25:27'),(663,'LDAP_FIELD_LOGIN',1,'uid','chaine',0,NULL,'2012-07-18 10:25:27'),(664,'LDAP_FIELD_FULLNAME',1,'cn','chaine',0,NULL,'2012-07-18 10:25:27'),(665,'LDAP_FIELD_NAME',1,'sn','chaine',0,NULL,'2012-07-18 10:25:27'),(666,'LDAP_FIELD_FIRSTNAME',1,'givenname','chaine',0,NULL,'2012-07-18 10:25:27'),(667,'LDAP_FIELD_MAIL',1,'mail','chaine',0,NULL,'2012-07-18 10:25:27'),(668,'LDAP_FIELD_PHONE',1,'telephonenumber','chaine',0,NULL,'2012-07-18 10:25:27'),(669,'LDAP_FIELD_FAX',1,'facsimiletelephonenumber','chaine',0,NULL,'2012-07-18 10:25:27'),(670,'LDAP_FIELD_MOBILE',1,'mobile','chaine',0,NULL,'2012-07-18 10:25:27'),(671,'LDAP_SERVER_TYPE',1,'openldap','chaine',0,'','2012-07-18 10:25:46'),(672,'LDAP_SERVER_PROTOCOLVERSION',1,'3','chaine',0,'','2012-07-18 10:25:47'),(673,'LDAP_SERVER_HOST',1,'localhost','chaine',0,'','2012-07-18 10:25:47'),(674,'LDAP_SERVER_PORT',1,'389','chaine',0,'','2012-07-18 10:25:47'),(675,'LDAP_SERVER_USE_TLS',1,'0','chaine',0,'','2012-07-18 10:25:47'),(676,'LDAP_SYNCHRO_ACTIVE',1,'dolibarr2ldap','chaine',0,'','2012-07-18 10:25:47'),(677,'LDAP_CONTACT_ACTIVE',1,'1','chaine',0,'','2012-07-18 10:25:47'),(678,'LDAP_MEMBER_ACTIVE',1,'1','chaine',0,'','2012-07-18 10:25:47'),(974,'MAIN_MODULE_WORKFLOW_TRIGGERS',1,'1','chaine',0,NULL,'2013-07-18 18:02:20'),(975,'WORKFLOW_PROPAL_AUTOCREATE_ORDER',1,'1','chaine',0,'','2013-07-18 18:02:24'),(980,'PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR',1,'1234567','chaine',0,'','2013-07-18 18:05:50'),(983,'FACTURE_RIB_NUMBER',1,'1','chaine',0,'','2013-07-18 18:35:14'),(984,'FACTURE_CHQ_NUMBER',1,'1','chaine',0,'','2013-07-18 18:35:14'),(1016,'GOOGLE_DUPLICATE_INTO_GCAL',1,'1','chaine',0,'','2013-07-18 21:40:20'),(1152,'SOCIETE_CODECLIENT_ADDON',1,'mod_codeclient_monkey','chaine',0,'','2013-07-29 20:50:02'),(1240,'MAIN_LOGEVENTS_USER_LOGIN',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1241,'MAIN_LOGEVENTS_USER_LOGIN_FAILED',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1242,'MAIN_LOGEVENTS_USER_LOGOUT',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1243,'MAIN_LOGEVENTS_USER_CREATE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1244,'MAIN_LOGEVENTS_USER_MODIFY',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1245,'MAIN_LOGEVENTS_USER_NEW_PASSWORD',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1246,'MAIN_LOGEVENTS_USER_ENABLEDISABLE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1247,'MAIN_LOGEVENTS_USER_DELETE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1248,'MAIN_LOGEVENTS_GROUP_CREATE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1249,'MAIN_LOGEVENTS_GROUP_MODIFY',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1250,'MAIN_LOGEVENTS_GROUP_DELETE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1251,'MAIN_BOXES_MAXLINES',1,'5','',0,'','2013-07-29 21:05:42'),(1482,'EXPEDITION_ADDON_NUMBER',1,'mod_expedition_safor','chaine',0,'Nom du gestionnaire de numerotation des expeditions','2013-08-05 17:53:11'),(1490,'CONTRACT_ADDON',1,'mod_contract_serpis','chaine',0,'Nom du gestionnaire de numerotation des contrats','2013-08-05 18:11:58'),(1677,'COMMANDE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/orders','chaine',0,NULL,'2014-12-08 13:11:02'),(1724,'PROPALE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2014-12-08 13:17:14'),(1730,'OPENSTREETMAP_ENABLE_MAPS',1,'1','chaine',0,'','2014-12-08 13:22:47'),(1731,'OPENSTREETMAP_ENABLE_MAPS_CONTACTS',1,'1','chaine',0,'','2014-12-08 13:22:47'),(1732,'OPENSTREETMAP_ENABLE_MAPS_MEMBERS',1,'1','chaine',0,'','2014-12-08 13:22:47'),(1733,'OPENSTREETMAP_MAPS_ZOOM_LEVEL',1,'15','chaine',0,'','2014-12-08 13:22:47'),(1742,'MAIN_MAIL_EMAIL_FROM',2,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2014-12-08 14:08:14'),(1743,'MAIN_MENU_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2015-02-11 19:43:54'),(1744,'MAIN_MENUFRONT_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2015-02-11 19:43:54'),(1745,'MAIN_MENU_SMARTPHONE',2,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2014-12-08 14:08:14'),(1746,'MAIN_MENUFRONT_SMARTPHONE',2,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2014-12-08 14:08:14'),(1747,'MAIN_THEME',2,'eldy','chaine',0,'Default theme','2014-12-08 14:08:14'),(1748,'MAIN_DELAY_ACTIONS_TODO',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2014-12-08 14:08:14'),(1749,'MAIN_DELAY_ORDERS_TO_PROCESS',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2014-12-08 14:08:14'),(1750,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2014-12-08 14:08:14'),(1751,'MAIN_DELAY_PROPALS_TO_CLOSE',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2014-12-08 14:08:14'),(1752,'MAIN_DELAY_PROPALS_TO_BILL',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2014-12-08 14:08:14'),(1753,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2014-12-08 14:08:14'),(1754,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2014-12-08 14:08:14'),(1755,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2014-12-08 14:08:14'),(1756,'MAIN_DELAY_RUNNING_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2014-12-08 14:08:14'),(1757,'MAIN_DELAY_MEMBERS',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2014-12-08 14:08:14'),(1758,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',2,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2014-12-08 14:08:14'),(1759,'MAILING_EMAIL_FROM',2,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2014-12-08 14:08:14'),(1760,'MAIN_INFO_SOCIETE_COUNTRY',3,'1:FR:France','chaine',0,'','2015-02-26 21:56:28'),(1761,'MAIN_INFO_SOCIETE_NOM',3,'bbb','chaine',0,'','2014-12-08 14:08:20'),(1762,'MAIN_INFO_SOCIETE_STATE',3,'0','chaine',0,'','2015-02-27 14:20:27'),(1763,'MAIN_MONNAIE',3,'EUR','chaine',0,'','2014-12-08 14:08:20'),(1764,'MAIN_LANG_DEFAULT',3,'auto','chaine',0,'','2014-12-08 14:08:20'),(1765,'MAIN_MAIL_EMAIL_FROM',3,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2014-12-08 14:08:20'),(1766,'MAIN_MENU_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2015-02-11 19:43:54'),(1767,'MAIN_MENUFRONT_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2015-02-11 19:43:54'),(1768,'MAIN_MENU_SMARTPHONE',3,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2014-12-08 14:08:20'),(1769,'MAIN_MENUFRONT_SMARTPHONE',3,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2014-12-08 14:08:20'),(1770,'MAIN_THEME',3,'eldy','chaine',0,'Default theme','2014-12-08 14:08:20'),(1771,'MAIN_DELAY_ACTIONS_TODO',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2014-12-08 14:08:20'),(1772,'MAIN_DELAY_ORDERS_TO_PROCESS',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2014-12-08 14:08:20'),(1773,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2014-12-08 14:08:20'),(1774,'MAIN_DELAY_PROPALS_TO_CLOSE',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2014-12-08 14:08:20'),(1775,'MAIN_DELAY_PROPALS_TO_BILL',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2014-12-08 14:08:20'),(1776,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2014-12-08 14:08:20'),(1777,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2014-12-08 14:08:20'),(1778,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2014-12-08 14:08:20'),(1779,'MAIN_DELAY_RUNNING_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2014-12-08 14:08:20'),(1780,'MAIN_DELAY_MEMBERS',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2014-12-08 14:08:20'),(1781,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',3,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2014-12-08 14:08:20'),(1782,'MAILING_EMAIL_FROM',3,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2014-12-08 14:08:20'),(1803,'SYSLOG_FILE',1,'DOL_DATA_ROOT/dolibarr.log','chaine',0,'','2014-12-08 14:15:08'),(1804,'SYSLOG_HANDLERS',1,'[\"mod_syslog_file\"]','chaine',0,'','2014-12-08 14:15:08'),(1805,'MAIN_MODULE_SKINCOLOREDITOR',3,'1',NULL,0,NULL,'2014-12-08 14:35:40'),(1922,'PAYPAL_API_SANDBOX',1,'1','chaine',0,'','2014-12-12 12:11:05'),(1923,'PAYPAL_API_USER',1,'seller_1355312017_biz_api1.mydomain.com','chaine',0,'','2014-12-12 12:11:05'),(1924,'PAYPAL_API_PASSWORD',1,'1355312040','chaine',0,'','2014-12-12 12:11:05'),(1925,'PAYPAL_API_SIGNATURE',1,'ABCDEFWBzvfn0q5iNmbuiDv1y.3EAXIMWyl4C5KvDReR9HDwwAd6dQ4Q','chaine',0,'','2014-12-12 12:11:05'),(1926,'PAYPAL_API_INTEGRAL_OR_PAYPALONLY',1,'integral','chaine',0,'','2014-12-12 12:11:05'),(1927,'PAYPAL_SECURITY_TOKEN',1,'50c82fab36bb3b6aa83e2a50691803b2','chaine',0,'','2014-12-12 12:11:05'),(1928,'PAYPAL_SECURITY_TOKEN_UNIQUE',1,'0','chaine',0,'','2014-12-12 12:11:05'),(1929,'PAYPAL_ADD_PAYMENT_URL',1,'1','chaine',0,'','2014-12-12 12:11:05'),(1980,'MAIN_PDF_FORMAT',1,'EUA4','chaine',0,'','2014-12-12 19:58:05'),(1981,'MAIN_PROFID1_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1982,'MAIN_PROFID2_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1983,'MAIN_PROFID3_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1984,'MAIN_PROFID4_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1985,'MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT',1,'0','chaine',0,'','2014-12-12 19:58:05'),(2835,'MAIN_USE_CONNECT_TIMEOUT',1,'10','chaine',0,'','2015-01-16 19:28:50'),(2836,'MAIN_USE_RESPONSE_TIMEOUT',1,'30','chaine',0,'','2015-01-16 19:28:50'),(2837,'MAIN_PROXY_USE',1,'0','chaine',0,'','2015-01-16 19:28:50'),(2838,'MAIN_PROXY_HOST',1,'localhost','chaine',0,'','2015-01-16 19:28:50'),(2839,'MAIN_PROXY_PORT',1,'8080','chaine',0,'','2015-01-16 19:28:50'),(2840,'MAIN_PROXY_USER',1,'aaa','chaine',0,'','2015-01-16 19:28:50'),(2841,'MAIN_PROXY_PASS',1,'bbb','chaine',0,'','2015-01-16 19:28:50'),(2848,'OVHSMS_NICK',1,'BN196-OVH','chaine',0,'','2015-01-16 19:32:36'),(2849,'OVHSMS_PASS',1,'bigone-10','chaine',0,'','2015-01-16 19:32:36'),(2850,'OVHSMS_SOAPURL',1,'https://www.ovh.com/soapi/soapi-re-1.55.wsdl','chaine',0,'','2015-01-16 19:32:36'),(2854,'THEME_ELDY_RGB',1,'bfbf00','chaine',0,'','2015-01-18 10:02:53'),(2855,'THEME_ELDY_ENABLE_PERSONALIZED',1,'0','chaine',0,'','2015-01-18 10:02:55'),(2858,'MAIN_SESSION_TIMEOUT',1,'2000','chaine',0,'','2015-01-19 17:01:53'),(2867,'FACSIM_ADDON',1,'mod_facsim_alcoy','chaine',0,'','2015-01-19 17:16:25'),(2868,'POS_SERVICES',1,'0','chaine',0,'','2015-01-19 17:16:51'),(2869,'POS_USE_TICKETS',1,'1','chaine',0,'','2015-01-19 17:16:51'),(2870,'POS_MAX_TTC',1,'100','chaine',0,'','2015-01-19 17:16:51'),(3190,'MAIN_MODULE_HOLIDAY',2,'1',NULL,0,NULL,'2015-02-01 08:52:34'),(3195,'INVOICE_SUPPLIER_ADDON_PDF',1,'canelle','chaine',0,'','2015-02-10 19:50:27'),(3199,'MAIN_FORCE_RELOAD_PAGE',1,'1','chaine',0,NULL,'2015-02-12 16:22:55'),(3223,'OVH_THIRDPARTY_IMPORT',1,'2','chaine',0,'','2015-02-13 16:20:18'),(3409,'AGENDA_USE_EVENT_TYPE',1,'1','chaine',0,'','2015-02-27 18:12:24'),(3886,'MAIN_REMOVE_INSTALL_WARNING',1,'1','chaine',1,'','2015-03-02 18:32:50'),(4013,'MAIN_DELAY_ACTIONS_TODO',1,'7','chaine',0,'','2015-03-06 08:59:12'),(4014,'MAIN_DELAY_PROPALS_TO_CLOSE',1,'31','chaine',0,'','2015-03-06 08:59:12'),(4015,'MAIN_DELAY_PROPALS_TO_BILL',1,'7','chaine',0,'','2015-03-06 08:59:12'),(4016,'MAIN_DELAY_ORDERS_TO_PROCESS',1,'2','chaine',0,'','2015-03-06 08:59:12'),(4017,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',1,'31','chaine',0,'','2015-03-06 08:59:12'),(4018,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',1,'7','chaine',0,'','2015-03-06 08:59:12'),(4019,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',1,'2','chaine',0,'','2015-03-06 08:59:12'),(4020,'MAIN_DELAY_RUNNING_SERVICES',1,'-15','chaine',0,'','2015-03-06 08:59:12'),(4021,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',1,'62','chaine',0,'','2015-03-06 08:59:13'),(4022,'MAIN_DELAY_MEMBERS',1,'31','chaine',0,'','2015-03-06 08:59:13'),(4023,'MAIN_DISABLE_METEO',1,'0','chaine',0,'','2015-03-06 08:59:13'),(4044,'ADHERENT_VAT_FOR_SUBSCRIPTIONS',1,'0','',0,'','2015-03-06 16:06:38'),(4047,'ADHERENT_BANK_USE',1,'bankviainvoice','',0,'','2015-03-06 16:12:30'),(4049,'PHPSANE_SCANIMAGE',1,'/usr/bin/scanimage','chaine',0,'','2015-03-06 21:54:13'),(4050,'PHPSANE_PNMTOJPEG',1,'/usr/bin/pnmtojpeg','chaine',0,'','2015-03-06 21:54:13'),(4051,'PHPSANE_PNMTOTIFF',1,'/usr/bin/pnmtotiff','chaine',0,'','2015-03-06 21:54:13'),(4052,'PHPSANE_OCR',1,'/usr/bin/gocr','chaine',0,'','2015-03-06 21:54:13'),(4548,'ECM_AUTO_TREE_ENABLED',1,'1','chaine',0,'','2015-03-10 15:57:21'),(4579,'MAIN_MODULE_AGENDA',2,'1',NULL,0,NULL,'2015-03-13 15:29:19'),(4580,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4581,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4582,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4583,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4584,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4585,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4586,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4587,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4588,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4589,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4590,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4591,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4592,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4593,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4594,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4688,'GOOGLE_ENABLE_AGENDA',2,'1','chaine',0,'','2015-03-13 15:36:29'),(4689,'GOOGLE_AGENDA_NAME1',2,'eldy','chaine',0,'','2015-03-13 15:36:29'),(4690,'GOOGLE_AGENDA_SRC1',2,'eldy10@mail.com','chaine',0,'','2015-03-13 15:36:29'),(4691,'GOOGLE_AGENDA_COLOR1',2,'BE6D00','chaine',0,'','2015-03-13 15:36:29'),(4692,'GOOGLE_AGENDA_COLOR2',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4693,'GOOGLE_AGENDA_COLOR3',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4694,'GOOGLE_AGENDA_COLOR4',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4695,'GOOGLE_AGENDA_COLOR5',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4696,'GOOGLE_AGENDA_TIMEZONE',2,'Europe/Paris','chaine',0,'','2015-03-13 15:36:29'),(4697,'GOOGLE_AGENDA_NB',2,'5','chaine',0,'','2015-03-13 15:36:29'),(4725,'SOCIETE_CODECLIENT_ADDON',2,'mod_codeclient_leopard','chaine',0,'Module to control third parties codes','2015-03-13 20:21:35'),(4726,'SOCIETE_CODECOMPTA_ADDON',2,'mod_codecompta_panicum','chaine',0,'Module to control third parties codes','2015-03-13 20:21:35'),(4727,'SOCIETE_FISCAL_MONTH_START',2,'','chaine',0,'Mettre le numero du mois du debut d\\\'annee fiscale, ex: 9 pour septembre','2015-03-13 20:21:35'),(4728,'MAIN_SEARCHFORM_SOCIETE',2,'1','yesno',0,'Show form for quick company search','2015-03-13 20:21:35'),(4729,'MAIN_SEARCHFORM_CONTACT',2,'1','yesno',0,'Show form for quick contact search','2015-03-13 20:21:35'),(4730,'COMPANY_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2015-03-13 20:21:35'),(4743,'MAIN_MODULE_CLICKTODIAL',2,'1',NULL,0,NULL,'2015-03-13 20:30:28'),(4744,'MAIN_MODULE_NOTIFICATION',2,'1',NULL,0,NULL,'2015-03-13 20:30:34'),(4745,'MAIN_MODULE_WEBSERVICES',2,'1',NULL,0,NULL,'2015-03-13 20:30:41'),(4746,'MAIN_MODULE_PROPALE',2,'1',NULL,0,NULL,'2015-03-13 20:32:38'),(4747,'PROPALE_ADDON_PDF',2,'azur','chaine',0,'Nom du gestionnaire de generation des propales en PDF','2015-03-13 20:32:38'),(4748,'PROPALE_ADDON',2,'mod_propale_marbre','chaine',0,'Nom du gestionnaire de numerotation des propales','2015-03-13 20:32:38'),(4749,'PROPALE_VALIDITY_DURATION',2,'15','chaine',0,'Duration of validity of business proposals','2015-03-13 20:32:38'),(4750,'PROPALE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2015-03-13 20:32:38'),(4752,'MAIN_MODULE_TAX',2,'1',NULL,0,NULL,'2015-03-13 20:32:47'),(4753,'MAIN_MODULE_DON',2,'1',NULL,0,NULL,'2015-03-13 20:32:54'),(4754,'DON_ADDON_MODEL',2,'html_cerfafr','chaine',0,'Nom du gestionnaire de generation de recu de dons','2015-03-13 20:32:54'),(4755,'POS_USE_TICKETS',2,'1','chaine',0,'','2015-03-13 20:33:09'),(4756,'POS_MAX_TTC',2,'100','chaine',0,'','2015-03-13 20:33:09'),(4757,'MAIN_MODULE_POS',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4758,'TICKET_ADDON',2,'mod_ticket_avenc','chaine',0,'Nom du gestionnaire de numerotation des tickets','2015-03-13 20:33:09'),(4759,'MAIN_MODULE_BANQUE',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4760,'MAIN_MODULE_FACTURE',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4761,'FACTURE_ADDON_PDF',2,'crabe','chaine',0,'Name of PDF model of invoice','2015-03-13 20:33:09'),(4762,'FACTURE_ADDON',2,'mod_facture_terre','chaine',0,'Name of numbering numerotation rules of invoice','2015-03-13 20:33:09'),(4763,'FACTURE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2015-03-13 20:33:09'),(4764,'MAIN_MODULE_SOCIETE',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4765,'MAIN_MODULE_PRODUCT',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4766,'PRODUCT_CODEPRODUCT_ADDON',2,'mod_codeproduct_leopard','chaine',0,'Module to control product codes','2015-03-13 20:33:09'),(4767,'MAIN_SEARCHFORM_PRODUITSERVICE',2,'1','yesno',0,'Show form for quick product search','2015-03-13 20:33:09'),(4772,'FACSIM_ADDON',2,'mod_facsim_alcoy','chaine',0,'','2015-03-13 20:33:32'),(4773,'MAIN_MODULE_MAILING',2,'1',NULL,0,NULL,'2015-03-13 20:33:37'),(4774,'MAIN_MODULE_OPENSURVEY',2,'1',NULL,0,NULL,'2015-03-13 20:33:42'),(4782,'AGENDA_USE_EVENT_TYPE',2,'1','chaine',0,'','2015-03-13 20:53:36'),(4884,'AGENDA_DISABLE_EXT',2,'1','chaine',0,'','2015-03-13 22:03:40'),(4928,'COMMANDE_SUPPLIER_ADDON_NUMBER',1,'mod_commande_fournisseur_muguet','chaine',0,'Nom du gestionnaire de numerotation des commandes fournisseur','2015-03-22 09:24:29'),(4929,'INVOICE_SUPPLIER_ADDON_NUMBER',1,'mod_facture_fournisseur_cactus','chaine',0,'Nom du gestionnaire de numerotation des factures fournisseur','2015-03-22 09:24:29'),(5001,'MAIN_CRON_KEY',0,'bc54582fe30d5d4a830c6f582ec28810','chaine',0,'','2015-03-23 17:54:53'),(5009,'CRON_KEY',0,'2c2e755c20be2014098f629865598006','chaine',0,'','2015-03-23 18:06:24'),(5139,'SOCIETE_ADD_REF_IN_LIST',1,'','yesno',0,'Display customer ref into select list','2015-09-08 23:06:08'),(5150,'PROJECT_TASK_ADDON_PDF',1,'','chaine',0,'Name of PDF/ODT tasks manager class','2015-09-08 23:06:14'),(5151,'PROJECT_TASK_ADDON',1,'mod_task_simple','chaine',0,'Name of Numbering Rule task manager class','2015-09-08 23:06:14'),(5152,'PROJECT_TASK_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/tasks','chaine',0,'','2015-09-08 23:06:14'),(5239,'BOOKMARKS_SHOW_IN_MENU',1,'10','chaine',0,'','2016-03-02 15:42:26'),(5271,'DONATION_ART200',1,'','yesno',0,'Option Française - Eligibilité Art200 du CGI','2016-12-21 12:51:28'),(5272,'DONATION_ART238',1,'','yesno',0,'Option Française - Eligibilité Art238 bis du CGI','2016-12-21 12:51:28'),(5274,'DONATION_MESSAGE',1,'Thank you','chaine',0,'Message affiché sur le récépissé de versements ou dons','2016-12-21 12:51:28'),(5349,'MAIN_SEARCHFORM_CONTACT',1,'1','chaine',0,'','2017-10-03 10:11:33'),(5351,'MAIN_SEARCHFORM_PRODUITSERVICE',1,'1','chaine',0,'','2017-10-03 10:11:33'),(5352,'MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER',1,'0','chaine',0,'','2017-10-03 10:11:33'),(5353,'MAIN_SEARCHFORM_ADHERENT',1,'1','chaine',0,'','2017-10-03 10:11:33'),(5354,'MAIN_SEARCHFORM_PROJECT',1,'0','chaine',0,'','2017-10-03 10:11:33'),(5394,'FCKEDITOR_ENABLE_DETAILS',1,'1','yesno',0,'WYSIWIG for products details lines for all entities','2017-11-04 15:27:44'),(5395,'FCKEDITOR_ENABLE_USERSIGN',1,'1','yesno',0,'WYSIWIG for user signature','2017-11-04 15:27:44'),(5396,'FCKEDITOR_ENABLE_MAIL',1,'1','yesno',0,'WYSIWIG for products details lines for all entities','2017-11-04 15:27:44'),(5398,'CATEGORIE_RECURSIV_ADD',1,'','yesno',0,'Affect parent categories','2017-11-04 15:27:46'),(5404,'MAIN_MODULE_CATEGORIE',1,'1',NULL,0,NULL,'2017-11-04 15:41:43'),(5415,'EXPEDITION_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/shipment','chaine',0,NULL,'2017-11-15 22:38:28'),(5416,'LIVRAISON_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/delivery','chaine',0,NULL,'2017-11-15 22:38:28'),(5426,'MAIN_MODULE_PROJET',1,'1',NULL,0,NULL,'2017-11-15 22:38:44'),(5427,'PROJECT_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/projects','chaine',0,NULL,'2017-11-15 22:38:44'),(5428,'PROJECT_USE_OPPORTUNIES',1,'1','chaine',0,NULL,'2017-11-15 22:38:44'),(5430,'MAIN_MODULE_EXPORT',1,'1',NULL,0,NULL,'2017-11-15 22:38:56'),(5431,'MAIN_MODULE_IMPORT',1,'1',NULL,0,NULL,'2017-11-15 22:38:58'),(5432,'MAIN_MODULE_MAILING',1,'1',NULL,0,NULL,'2017-11-15 22:39:00'),(5434,'EXPENSEREPORT_ADDON_PDF',1,'standard','chaine',0,'Name of manager to build PDF expense reports documents','2017-11-15 22:39:05'),(5437,'SALARIES_ACCOUNTING_ACCOUNT_CHARGE',1,'641','chaine',0,NULL,'2017-11-15 22:39:08'),(5441,'ADHERENT_ETIQUETTE_TEXT',1,'%FULLNAME%\n%ADDRESS%\n%ZIP% %TOWN%\n%COUNTRY%','text',0,'Text to print on member address sheets','2018-11-23 11:56:07'),(5443,'MAIN_MODULE_PRELEVEMENT',1,'1',NULL,0,NULL,'2017-11-15 22:39:33'),(5453,'MAIN_MODULE_CONTRAT',1,'1',NULL,0,NULL,'2017-11-15 22:39:52'),(5455,'MAIN_MODULE_FICHEINTER',1,'1',NULL,0,NULL,'2017-11-15 22:39:56'),(5459,'MAIN_MODULE_PAYPAL',1,'1',NULL,0,NULL,'2017-11-15 22:41:02'),(5463,'MAIN_MODULE_PROPALE',1,'1',NULL,0,NULL,'2017-11-15 22:41:47'),(5483,'GENBARCODE_BARCODETYPE_THIRDPARTY',1,'6','chaine',0,'','2018-01-16 15:49:43'),(5484,'PRODUIT_DEFAULT_BARCODE_TYPE',1,'2','chaine',0,'','2018-01-16 15:49:46'),(5586,'MAIN_DELAY_EXPENSEREPORTS_TO_PAY',1,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur les notes de frais impayées','2018-01-22 17:28:18'),(5587,'MAIN_FIX_FOR_BUGGED_MTA',1,'1','chaine',1,'Set constant to fix email ending from PHP with some linux ike system','2018-01-22 17:28:18'),(5590,'MAIN_VERSION_LAST_INSTALL',0,'3.8.3','chaine',0,'Dolibarr version when install','2018-01-22 17:28:42'),(5604,'MAIN_INFO_SOCIETE_LOGO',1,'mybigcompany.png','chaine',0,'','2018-01-22 17:33:49'),(5605,'MAIN_INFO_SOCIETE_LOGO_SMALL',1,'mybigcompany_small.png','chaine',0,'','2018-01-22 17:33:49'),(5606,'MAIN_INFO_SOCIETE_LOGO_MINI',1,'mybigcompany_mini.png','chaine',0,'','2018-01-22 17:33:49'),(5614,'MAIN_SIZE_SHORTLISTE_LIMIT',1,'4','chaine',0,'Longueur maximum des listes courtes (fiche client)','2018-03-13 10:54:46'),(5627,'SUPPLIER_PROPOSAL_ADDON_PDF',1,'aurore','chaine',0,'Name of submodule to generate PDF for supplier quotation request','2018-07-30 11:13:20'),(5628,'SUPPLIER_PROPOSAL_ADDON',1,'mod_supplier_proposal_marbre','chaine',0,'Name of submodule to number supplier quotation request','2018-07-30 11:13:20'),(5629,'SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/supplier_proposal','chaine',0,NULL,'2018-07-30 11:13:20'),(5633,'MAIN_MODULE_API',1,'1',NULL,0,NULL,'2018-07-30 11:13:54'),(5634,'MAIN_MODULE_WEBSERVICES',1,'1',NULL,0,NULL,'2018-07-30 11:13:56'),(5635,'WEBSERVICES_KEY',1,'dolibarrkey','chaine',0,'','2018-07-30 11:14:04'),(5638,'MAIN_MODULE_EXTERNALRSS',1,'1',NULL,0,NULL,'2018-07-30 11:15:04'),(5642,'SOCIETE_CODECOMPTA_ADDON',1,'mod_codecompta_aquarium','chaine',0,'','2018-07-30 11:16:42'),(5707,'CASHDESK_NO_DECREASE_STOCK',1,'1','chaine',0,'','2018-07-30 13:38:11'),(5708,'MAIN_MODULE_PRODUCTBATCH',1,'1',NULL,0,NULL,'2018-07-30 13:38:11'),(5710,'MAIN_MODULE_STOCK',1,'1',NULL,0,NULL,'2018-07-30 13:38:11'),(5711,'MAIN_MODULE_PRODUCT',1,'1',NULL,0,NULL,'2018-07-30 13:38:11'),(5808,'MARGIN_TYPE',1,'costprice','chaine',0,'','2018-07-30 16:32:18'),(5809,'DISPLAY_MARGIN_RATES',1,'1','chaine',0,'','2018-07-30 16:32:20'),(5833,'ACCOUNTING_EXPORT_SEPARATORCSV',1,',','string',0,NULL,'2017-01-29 15:11:56'),(5840,'CHARTOFACCOUNTS',1,'2','chaine',0,NULL,'2017-01-29 15:11:56'),(5841,'ACCOUNTING_EXPORT_MODELCSV',1,'1','chaine',0,NULL,'2017-01-29 15:11:56'),(5842,'ACCOUNTING_LENGTH_GACCOUNT',1,'','chaine',0,NULL,'2017-01-29 15:11:56'),(5843,'ACCOUNTING_LENGTH_AACCOUNT',1,'','chaine',0,NULL,'2017-01-29 15:11:56'),(5844,'ACCOUNTING_LIST_SORT_VENTILATION_TODO',1,'1','yesno',0,NULL,'2017-01-29 15:11:56'),(5845,'ACCOUNTING_LIST_SORT_VENTILATION_DONE',1,'1','yesno',0,NULL,'2017-01-29 15:11:56'),(5846,'ACCOUNTING_EXPORT_DATE',1,'%d%m%Y','chaine',0,NULL,'2017-01-29 15:11:56'),(5848,'ACCOUNTING_EXPORT_FORMAT',1,'csv','chaine',0,NULL,'2017-01-29 15:11:56'),(5853,'MAIN_MODULE_WORKFLOW',1,'1',NULL,0,NULL,'2017-01-29 15:12:12'),(5854,'MAIN_MODULE_NOTIFICATION',1,'1',NULL,0,NULL,'2017-01-29 15:12:35'),(5855,'MAIN_MODULE_OAUTH',1,'1',NULL,0,NULL,'2017-01-29 15:12:41'),(5883,'MAILING_LIMIT_SENDBYWEB',0,'15','chaine',1,'Number of targets to defined packet size when sending mass email','2017-01-29 17:36:33'),(5884,'MAIN_MAIL_DEBUG',1,'0','chaine',1,'','2017-01-29 18:53:02'),(5885,'MAIN_SOAP_DEBUG',1,'0','chaine',1,'','2017-01-29 18:53:02'),(5925,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5931,'DATABASE_PWD_ENCRYPTED',1,'1','chaine',0,'','2017-02-01 15:06:04'),(5932,'MAIN_DISABLE_ALL_MAILS',1,'0','chaine',0,'','2017-02-01 15:09:09'),(5933,'MAIN_MAIL_SENDMODE',1,'mail','chaine',0,'','2017-02-01 15:09:09'),(5934,'MAIN_MAIL_SMTP_PORT',1,'465','chaine',0,'','2017-02-01 15:09:09'),(5935,'MAIN_MAIL_SMTP_SERVER',1,'smtp.mail.com','chaine',0,'','2017-02-01 15:09:09'),(5936,'MAIN_MAIL_SMTPS_ID',1,'eldy10@mail.com','chaine',0,'','2017-02-01 15:09:09'),(5937,'MAIN_MAIL_SMTPS_PW',1,'bidonge','chaine',0,'','2017-02-01 15:09:09'),(5938,'MAIN_MAIL_EMAIL_FROM',1,'robot@example.com','chaine',0,'','2017-02-01 15:09:09'),(5939,'MAIN_MAIL_DEFAULT_FROMTYPE',1,'user','chaine',0,'','2017-02-01 15:09:09'),(5940,'PRELEVEMENT_ID_BANKACCOUNT',1,'1','chaine',0,'','2017-02-06 04:04:47'),(5941,'PRELEVEMENT_ICS',1,'ICS123456','chaine',0,'','2017-02-06 04:04:47'),(5942,'PRELEVEMENT_USER',1,'1','chaine',0,'','2017-02-06 04:04:47'),(5943,'BANKADDON_PDF',1,'sepamandate','chaine',0,'','2017-02-06 04:13:52'),(5947,'CHEQUERECEIPTS_THYME_MASK',1,'CHK{yy}{mm}-{0000@1}','chaine',0,'','2017-02-06 04:16:27'),(5948,'MAIN_MODULE_LOAN',1,'1',NULL,0,NULL,'2017-02-06 19:19:05'),(5954,'MAIN_SUBMODULE_EXPEDITION',1,'1','chaine',0,'','2017-02-06 23:57:37'),(5963,'MAIN_MODULE_BANQUE',1,'1',NULL,0,NULL,'2017-02-07 18:56:12'),(5964,'MAIN_MODULE_TAX',1,'1',NULL,0,NULL,'2017-02-07 18:56:12'),(6019,'MAIN_INFO_SOCIETE_COUNTRY',2,'1:FR:France','chaine',0,'','2017-02-15 17:18:22'),(6020,'MAIN_INFO_SOCIETE_NOM',2,'MySecondCompany','chaine',0,'','2017-02-15 17:18:22'),(6021,'MAIN_INFO_SOCIETE_STATE',2,'0','chaine',0,'','2017-02-15 17:18:22'),(6022,'MAIN_MONNAIE',2,'EUR','chaine',0,'','2017-02-15 17:18:22'),(6023,'MAIN_LANG_DEFAULT',2,'auto','chaine',0,'','2017-02-15 17:18:22'),(6032,'MAIN_MODULE_MULTICURRENCY',1,'1',NULL,0,NULL,'2017-02-15 17:29:59'),(6048,'SYSLOG_FACILITY',0,'LOG_USER','chaine',0,'','2017-02-15 22:37:01'),(6049,'SYSLOG_FIREPHP_INCLUDEPATH',0,'/home/ldestailleur/git/dolibarr_5.0/htdocs/includes/firephp/firephp-core/lib/','chaine',0,'','2017-02-15 22:37:01'),(6050,'SYSLOG_FILE',0,'DOL_DATA_ROOT/dolibarr.log','chaine',0,'','2017-02-15 22:37:01'),(6051,'SYSLOG_CHROMEPHP_INCLUDEPATH',0,'/home/ldestailleur/git/dolibarr_5.0/htdocs/includes/ccampbell/chromephp/','chaine',0,'','2017-02-15 22:37:01'),(6052,'SYSLOG_HANDLERS',0,'[\"mod_syslog_file\"]','chaine',0,'','2017-02-15 22:37:01'),(6054,'SYSLOG_LEVEL',0,'7','chaine',0,'','2017-02-15 22:37:21'),(6092,'MAIN_SIZE_SHORTLIST_LIMIT',0,'3','chaine',0,'Max length for small lists (tabs)','2017-05-12 09:02:38'),(6099,'MAIN_MODULE_SKYPE',1,'1',NULL,0,NULL,'2017-05-12 09:03:51'),(6100,'MAIN_MODULE_GRAVATAR',1,'1',NULL,0,NULL,'2017-05-12 09:03:54'),(6102,'PRODUCT_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/products','chaine',0,'','2017-08-27 13:29:07'),(6103,'CONTRACT_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/contracts','chaine',0,'','2017-08-27 13:29:07'),(6104,'USERGROUP_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/usergroups','chaine',0,'','2017-08-27 13:29:07'),(6105,'USER_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/users','chaine',0,'','2017-08-27 13:29:07'),(6106,'MAIN_ENABLE_OVERWRITE_TRANSLATION',1,'1','chaine',0,'Enable overwrote of translation','2017-08-27 13:29:07'),(6377,'COMMANDE_SAPHIR_MASK',1,'{yy}{mm}{000}{ttt}','chaine',0,'','2017-09-06 07:56:25'),(6518,'GOOGLE_DUPLICATE_INTO_THIRDPARTIES',1,'1','chaine',0,'','2017-09-06 19:43:57'),(6519,'GOOGLE_DUPLICATE_INTO_CONTACTS',1,'0','chaine',0,'','2017-09-06 19:43:57'),(6520,'GOOGLE_TAG_PREFIX',1,'Dolibarr (Thirdparties)','chaine',0,'','2017-09-06 19:43:57'),(6521,'GOOGLE_TAG_PREFIX_CONTACTS',1,'Dolibarr (Contacts/Addresses)','chaine',0,'','2017-09-06 19:43:57'),(6522,'GOOGLE_ENABLE_AGENDA',1,'1','chaine',0,'','2017-09-06 19:44:12'),(6523,'GOOGLE_AGENDA_COLOR1',1,'1B887A','chaine',0,'','2017-09-06 19:44:12'),(6524,'GOOGLE_AGENDA_COLOR2',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6525,'GOOGLE_AGENDA_COLOR3',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6526,'GOOGLE_AGENDA_COLOR4',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6527,'GOOGLE_AGENDA_COLOR5',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6528,'GOOGLE_AGENDA_TIMEZONE',1,'Europe/Paris','chaine',0,'','2017-09-06 19:44:12'),(6529,'GOOGLE_AGENDA_NB',1,'5','chaine',0,'','2017-09-06 19:44:12'),(6543,'MAIN_SMS_DEBUG',0,'1','chaine',1,'This is to enable OVH SMS debug','2017-09-06 19:44:34'),(6562,'BLOCKEDLOG_ENTITY_FINGERPRINT',1,'b63e359ffca54d5c2bab869916eaf23d4a736703028ccbf77ce1167c5f830e7b','chaine',0,'Numeric Unique Fingerprint','2018-01-19 11:27:15'),(6564,'BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY',1,'FR','chaine',0,'This is list of country code where the module may be mandatory','2018-01-19 11:27:15'),(6565,'MAIN_MODULE_BOOKMARK',1,'1',NULL,0,'{\"authorid\":\"12\",\"ip\":\"82.240.38.230\"}','2018-01-19 11:27:34'),(6566,'MAIN_MODULE_ADHERENT',1,'1',NULL,0,'{\"authorid\":\"12\",\"ip\":\"82.240.38.230\"}','2018-01-19 11:27:56'),(6567,'ADHERENT_ADDON_PDF',1,'standard','chaine',0,'Name of PDF model of member','2018-01-19 11:27:56'),(6569,'MAIN_MODULE_STRIPE',1,'1',NULL,0,'{\"authorid\":\"12\",\"ip\":\"82.240.38.230\"}','2018-01-19 11:28:17'),(6632,'MAIN_MODULE_TICKET',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-06-05 09:15:29'),(6635,'MAIN_MODULE_TICKET_TRIGGERS',1,'1','chaine',0,NULL,'2019-06-05 09:15:29'),(6636,'MAIN_MODULE_TICKET_MODELS',1,'1','chaine',0,NULL,'2019-06-05 09:15:29'),(6647,'MAIN_MODULE_SOCIALNETWORKS',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-06-05 09:16:49'),(6795,'TICKET_ADDON',1,'mod_ticket_simple','chaine',0,'','2019-09-26 12:07:59'),(6796,'PRODUCT_CODEPRODUCT_ADDON',1,'mod_codeproduct_elephant','chaine',0,'','2019-09-26 12:59:00'),(6800,'CASHDESK_ID_THIRDPARTY1',1,'7','chaine',0,'','2019-09-26 15:30:09'),(6801,'CASHDESK_ID_BANKACCOUNT_CASH1',1,'3','chaine',0,'','2019-09-26 15:30:09'),(6802,'CASHDESK_ID_BANKACCOUNT_CHEQUE1',1,'4','chaine',0,'','2019-09-26 15:30:09'),(6803,'CASHDESK_ID_BANKACCOUNT_CB1',1,'4','chaine',0,'','2019-09-26 15:30:09'),(6804,'CASHDESK_ID_BANKACCOUNT_PRE1',1,'4','chaine',0,'','2019-09-26 15:30:09'),(6805,'CASHDESK_ID_BANKACCOUNT_VIR1',1,'1','chaine',0,'','2019-09-26 15:30:09'),(6806,'CASHDESK_NO_DECREASE_STOCK1',1,'1','chaine',0,'','2019-09-26 15:30:09'),(6811,'FORCEPROJECT_ON_PROPOSAL',1,'1','chaine',0,'','2019-09-27 14:52:57'),(6813,'PROJECT_USE_OPPORTUNITIES',1,'1','chaine',0,'','2019-10-01 11:48:09'),(6814,'PACKTHEMEACTIVATEDTHEME',0,'modOwnTheme','chaine',0,'','2019-10-02 11:41:58'),(6815,'OWNTHEME_COL1',0,'#6a89cc','chaine',0,'','2019-10-02 11:41:58'),(6816,'OWNTHEME_COL2',0,'#60a3bc','chaine',0,'','2019-10-02 11:41:58'),(6817,'DOL_VERSION',0,'10.0.2','chaine',0,'Dolibarr version','2019-10-02 11:41:58'),(6823,'OWNTHEME_COL_BODY_BCKGRD',0,'#E9E9E9','chaine',0,'','2019-10-02 11:41:58'),(6824,'OWNTHEME_COL_LOGO_BCKGRD',0,'#474c80','chaine',0,'','2019-10-02 11:41:58'),(6825,'OWNTHEME_COL_TXT_MENU',0,'#b8c6e5','chaine',0,'','2019-10-02 11:41:58'),(6826,'OWNTHEME_COL_HEADER_BCKGRD',0,'#474c80','chaine',0,'','2019-10-02 11:41:58'),(6827,'OWNTHEME_CUSTOM_CSS',0,'0','yesno',0,'','2019-10-02 11:41:58'),(6828,'OWNTHEME_CUSTOM_JS',0,'0','yesno',0,'','2019-10-02 11:41:58'),(6829,'OWNTHEME_FIXED_MENU',0,'0','yesno',0,'','2019-10-02 11:41:58'),(6830,'OWNTHEME_D_HEADER_FONT_SIZE',0,'1.7rem','chaine',0,'','2019-10-02 11:41:58'),(6831,'OWNTHEME_S_HEADER_FONT_SIZE',0,'1.6rem','chaine',0,'','2019-10-02 11:41:58'),(6832,'OWNTHEME_D_VMENU_FONT_SIZE',0,'1.2rem','chaine',0,'','2019-10-02 11:41:58'),(6833,'OWNTHEME_S_VMENU_FONT_SIZE',0,'1.2rem','chaine',0,'','2019-10-02 11:41:58'),(6844,'MAIN_THEME',0,'eldy','chaine',0,'','2019-10-02 11:46:02'),(6845,'MAIN_MENU_STANDARD',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6846,'MAIN_MENUFRONT_STANDARD',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6847,'MAIN_MENU_SMARTPHONE',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6848,'MAIN_MENUFRONT_SMARTPHONE',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6851,'BECREATIVE_COL1',1,'#1e88e5','chaine',0,'','2019-10-02 11:47:10'),(6852,'BECREATIVE_COL2',1,'#1e88e5','chaine',0,'','2019-10-02 11:47:10'),(6853,'DOL_VERSION',1,'10.0.2','chaine',0,'Dolibarr version','2019-10-02 11:47:10'),(6859,'BECREATIVE_COL_BODY_BCKGRD',1,'#e6eaef','chaine',0,'','2019-10-02 11:47:10'),(6860,'BECREATIVE_COL_LOGO_BCKGRD',1,'#1e88e5','chaine',0,'','2019-10-02 11:47:10'),(6861,'BECREATIVE_COL_TXT_MENU',1,'#b8c6e5','chaine',0,'','2019-10-02 11:47:10'),(6862,'BECREATIVE_COL_HEADER_BCKGRD',1,'#26a69a','chaine',0,'','2019-10-02 11:47:10'),(6863,'BECREATIVE_CUSTOM_CSS',1,'0','yesno',0,'','2019-10-02 11:47:10'),(6864,'BECREATIVE_CUSTOM_JS',1,'0','yesno',0,'','2019-10-02 11:47:10'),(6865,'BECREATIVE_FIXED_MENU',1,'0','yesno',0,'','2019-10-02 11:47:10'),(6866,'BECREATIVE_D_HEADER_FONT_SIZE',1,'1.7rem','chaine',0,'','2019-10-02 11:47:10'),(6867,'BECREATIVE_S_HEADER_FONT_SIZE',1,'1.6rem','chaine',0,'','2019-10-02 11:47:10'),(6868,'BECREATIVE_D_VMENU_FONT_SIZE',1,'1.2rem','chaine',0,'','2019-10-02 11:47:10'),(6869,'BECREATIVE_S_VMENU_FONT_SIZE',1,'1.2rem','chaine',0,'','2019-10-02 11:47:10'),(6881,'MAIN_MENU_STANDARD',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6882,'MAIN_MENUFRONT_STANDARD',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6883,'MAIN_MENU_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6884,'MAIN_MENUFRONT_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6885,'ACCOUNTING_ACCOUNT_CUSTOMER',1,'411','chaine',0,'','2019-10-04 08:15:44'),(6886,'ACCOUNTING_ACCOUNT_SUPPLIER',1,'401','chaine',0,'','2019-10-04 08:15:44'),(6887,'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',1,'421','chaine',0,'','2019-10-04 08:15:44'),(6888,'ACCOUNTING_PRODUCT_BUY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6889,'ACCOUNTING_PRODUCT_SOLD_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6890,'ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6891,'ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6892,'ACCOUNTING_SERVICE_BUY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6893,'ACCOUNTING_SERVICE_SOLD_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6894,'ACCOUNTING_VAT_BUY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6895,'ACCOUNTING_VAT_SOLD_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6896,'ACCOUNTING_VAT_PAY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6897,'ACCOUNTING_ACCOUNT_SUSPENSE',1,'471','chaine',0,'','2019-10-04 08:15:44'),(6898,'ACCOUNTING_ACCOUNT_TRANSFER_CASH',1,'58','chaine',0,'','2019-10-04 08:15:44'),(6899,'DONATION_ACCOUNTINGACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6900,'ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6901,'LOAN_ACCOUNTING_ACCOUNT_CAPITAL',1,'164','chaine',0,'','2019-10-04 08:15:44'),(6902,'LOAN_ACCOUNTING_ACCOUNT_INTEREST',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6903,'LOAN_ACCOUNTING_ACCOUNT_INSURANCE',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6912,'TICKET_ENABLE_PUBLIC_INTERFACE',1,'1','chaine',0,'','2019-10-04 11:44:33'),(6934,'TICKET_NOTIFICATION_EMAIL_FROM',1,'fff','chaine',0,'','2019-10-04 12:03:51'),(6935,'TICKET_NOTIFICATION_EMAIL_TO',1,'ff','chaine',0,'','2019-10-04 12:03:51'),(6936,'TICKET_MESSAGE_MAIL_INTRO',1,'Hello,<br />\r\nA new response was sent on a ticket that you contact. Here is the message:<img alt=\"\" src=\"/dolibarr_10.0/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/background_rough-horn.jpg\" style=\"height:1080px; width:1920px\" />','chaine',0,'','2019-10-04 12:03:51'),(6937,'TICKET_MESSAGE_MAIL_SIGNATURE',1,'<p>Sincerely,</p>\r\n\r\n<p>--<img alt=\"\" src=\"/dolibarr_10.0/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/background_rough-horn.jpg\" style=\"height:1080px; width:1920px\" /></p>\r\n','chaine',0,'','2019-10-04 12:03:51'),(7027,'USER_PASSWORD_GENERATED',1,'Perso','chaine',0,'','2019-10-07 10:52:46'),(7028,'USER_PASSWORD_PATTERN',1,'8;1;0;1;0;1','chaine',0,'','2019-10-07 10:57:03'),(7032,'MAIN_MODULE_BOM',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-10-08 18:49:41'),(7034,'BOM_ADDON',1,'mod_bom_standard','chaine',0,'Name of numbering rules of BOM','2019-10-08 18:49:41'),(7035,'BOM_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/boms','chaine',0,NULL,'2019-10-08 18:49:41'),(7036,'MAIN_MODULE_GEOIPMAXMIND',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-10-08 18:51:54'),(7037,'MAIN_MODULE_DAV',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-10-08 18:54:07'),(7122,'BOM_ADDON_PDF',1,'generic_bom_odt','chaine',0,'','2019-11-28 14:00:58'),(7195,'MAIN_AGENDA_ACTIONAUTO_MO_VALIDATE',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7196,'MAIN_AGENDA_ACTIONAUTO_MO_PRODUCED',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7197,'MAIN_AGENDA_ACTIONAUTO_MO_DELETE',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7198,'MAIN_AGENDA_ACTIONAUTO_MO_CANCEL',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7201,'TICKET_PUBLIC_INTERFACE_TOPIC',1,'MyBigCompany public interface for Ticket','chaine',0,'','2019-11-29 08:49:36'),(7202,'TICKET_PUBLIC_TEXT_HOME',1,'You can create a support ticket or view existing from its identifier tracking ticket.','chaine',0,'','2019-11-29 08:49:36'),(7203,'TICKET_PUBLIC_TEXT_HELP_MESSAGE',1,'Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.','chaine',0,'','2019-11-29 08:49:36'),(7204,'TICKET_MESSAGE_MAIL_NEW',1,'TicketMessageMailNewText','chaine',0,'','2019-11-29 08:49:36'),(7209,'MAIN_MODULE_MRP',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-11-29 08:57:42'),(7210,'MAIN_MODULE_MRP_TRIGGERS',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7211,'MAIN_MODULE_MRP_LOGIN',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7212,'MAIN_MODULE_MRP_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7213,'MAIN_MODULE_MRP_MENUS',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7214,'MAIN_MODULE_MRP_TPL',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7215,'MAIN_MODULE_MRP_BARCODE',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7216,'MAIN_MODULE_MRP_MODELS',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7217,'MAIN_MODULE_MRP_THEME',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7218,'MAIN_MODULE_MRP_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7220,'MRP_MO_ADDON',1,'mod_mo_standard','chaine',0,'Name of numbering rules of MO','2019-11-29 08:57:42'),(7221,'MRP_MO_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/mrps','chaine',0,NULL,'2019-11-29 08:57:42'),(7222,'MRP_MO_ADDON_PDF',1,'generic_mo_odt','chaine',0,'','2019-11-29 08:57:47'),(7254,'MAIN_INFO_OPENINGHOURS_MONDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7255,'MAIN_INFO_OPENINGHOURS_TUESDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7256,'MAIN_INFO_OPENINGHOURS_WEDNESDAY',1,'8-13','chaine',0,'','2019-12-19 11:14:21'),(7257,'MAIN_INFO_OPENINGHOURS_THURSDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7258,'MAIN_INFO_OPENINGHOURS_FRIDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7264,'MAIN_INFO_ACCOUNTANT_NAME',1,'Bob Bookkeeper','chaine',0,'','2019-12-19 11:14:54'),(7265,'MAIN_INFO_ACCOUNTANT_TOWN',1,'Berlin','chaine',0,'','2019-12-19 11:14:54'),(7266,'MAIN_INFO_ACCOUNTANT_STATE',1,'0','chaine',0,'','2019-12-19 11:14:54'),(7267,'MAIN_INFO_ACCOUNTANT_COUNTRY',1,'5','chaine',0,'','2019-12-19 11:14:54'),(7268,'MAIN_INFO_ACCOUNTANT_MAIL',1,'mybookkeeper@example.com','chaine',0,'','2019-12-19 11:14:54'),(7313,'MODULEBUILDER_ASCIIDOCTOR',1,'asciidoctor','chaine',0,'','2019-12-20 10:57:21'),(7314,'MODULEBUILDER_ASCIIDOCTORPDF',1,'asciidoctor-pdf','chaine',0,'','2019-12-20 10:57:21'),(7337,'EXTERNAL_RSS_TITLE_1',1,'Dolibarr.org News','chaine',0,'','2019-12-20 12:10:38'),(7338,'EXTERNAL_RSS_URLRSS_1',1,'https://www.dolibarr.org/rss','chaine',0,'','2019-12-20 12:10:38'),(7339,'EXPENSEREPORT_ADDON',1,'mod_expensereport_jade','chaine',0,'','2019-12-20 16:33:46'),(7378,'COMPANY_USE_SEARCH_TO_SELECT',1,'0','chaine',0,'','2019-12-21 15:54:22'),(7420,'CASHDESK_SERVICES',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7421,'TAKEPOS_ROOT_CATEGORY_ID',1,'31','chaine',0,'','2019-12-23 12:15:06'),(7422,'TAKEPOSCONNECTOR',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7423,'TAKEPOS_BAR_RESTAURANT',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7424,'TAKEPOS_TICKET_VAT_GROUPPED',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7425,'TAKEPOS_AUTO_PRINT_TICKETS',1,'0','int',0,'','2019-12-23 12:15:06'),(7426,'TAKEPOS_NUMPAD',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7427,'TAKEPOS_NUM_TERMINALS',1,'1','chaine',0,'','2019-12-23 12:15:06'),(7428,'TAKEPOS_DIRECT_PAYMENT',1,'0','int',0,'','2019-12-23 12:15:06'),(7429,'TAKEPOS_CUSTOM_RECEIPT',1,'0','int',0,'','2019-12-23 12:15:06'),(7430,'TAKEPOS_EMAIL_TEMPLATE_INVOICE',1,'-1','chaine',0,'','2019-12-23 12:15:06'),(7452,'MEMBER_ENABLE_PUBLIC',1,'1','chaine',0,'','2020-01-01 10:31:46'),(7453,'MEMBER_NEWFORM_AMOUNT',1,'20','chaine',0,'','2020-01-01 10:31:46'),(7454,'MEMBER_NEWFORM_EDITAMOUNT',1,'0','chaine',0,'','2020-01-01 10:31:46'),(7455,'MEMBER_NEWFORM_PAYONLINE',1,'all','chaine',0,'','2020-01-01 10:31:46'),(7456,'MEMBER_NEWFORM_FORCETYPE',1,'1','chaine',0,'','2020-01-01 10:31:46'),(7470,'STRIPE_TEST_PUBLISHABLE_KEY',1,'pk_test_123456789','chaine',0,'','2020-01-01 11:43:44'),(7471,'STRIPE_TEST_SECRET_KEY',1,'sk_test_123456','chaine',0,'','2020-01-01 11:43:44'),(7472,'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS',1,'4','chaine',0,'','2020-01-01 11:43:44'),(7473,'STRIPE_USER_ACCOUNT_FOR_ACTIONS',1,'1','chaine',0,'','2020-01-01 11:43:44'),(7489,'CAPTURESERVER_SECURITY_KEY',1,'securitykey123','chaine',0,'','2020-01-01 12:00:49'),(7720,'SUPPLIER_INVOICE_ALLOW_REUSE_OF_CREDIT_WHEN_PARTIALLY_REFUNDED',1,'1','chaine',1,'','2020-01-01 17:19:12'),(8063,'MAIN_AGENDA_ACTIONAUTO_COMPANY_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8064,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8065,'MAIN_AGENDA_ACTIONAUTO_COMPANY_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8066,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLOSE_REFUSED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8067,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLASSIFY_BILLED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8068,'MAIN_AGENDA_ACTIONAUTO_PROPAL_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8069,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLOSE_SIGNED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8070,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8071,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8072,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8073,'MAIN_AGENDA_ACTIONAUTO_ORDER_CANCEL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8074,'MAIN_AGENDA_ACTIONAUTO_ORDER_CLOSE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8075,'MAIN_AGENDA_ACTIONAUTO_ORDER_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8076,'MAIN_AGENDA_ACTIONAUTO_ORDER_CLASSIFY_BILLED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8077,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8078,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8079,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8080,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8081,'MAIN_AGENDA_ACTIONAUTO_BILL_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8082,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8083,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8084,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8085,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8086,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_CLOSE_SIGNED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8087,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_CLOSE_REFUSED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8088,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8089,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8090,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8091,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_RECEIVE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8092,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_SUBMIT',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8093,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_APPROVE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8094,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_REFUSE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8095,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_CLASSIFY_BILLED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8096,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8097,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8098,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8099,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_UNVALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8100,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_PAYED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8101,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8102,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8103,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_CANCELED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8104,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8105,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8106,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8107,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8108,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_REOPEN',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8109,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8110,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8111,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8112,'MAIN_AGENDA_ACTIONAUTO_MEMBER_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8113,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8114,'MAIN_AGENDA_ACTIONAUTO_MEMBER_MODIFY',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8115,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8116,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_MODIFY',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8117,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8118,'MAIN_AGENDA_ACTIONAUTO_MEMBER_RESILIATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8119,'MAIN_AGENDA_ACTIONAUTO_MEMBER_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8120,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8121,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8122,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_MODIFY',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8123,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8124,'MAIN_AGENDA_ACTIONAUTO_TASK_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8125,'MAIN_AGENDA_ACTIONAUTO_TASK_MODIFY',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8126,'MAIN_AGENDA_ACTIONAUTO_TASK_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8127,'MAIN_AGENDA_ACTIONAUTO_PROJECT_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8128,'MAIN_AGENDA_ACTIONAUTO_PROJECT_MODIFY',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8129,'MAIN_AGENDA_ACTIONAUTO_PROJECT_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8130,'MAIN_AGENDA_ACTIONAUTO_TICKET_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8131,'MAIN_AGENDA_ACTIONAUTO_TICKET_MODIFY',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8132,'MAIN_AGENDA_ACTIONAUTO_TICKET_ASSIGNED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8133,'MAIN_AGENDA_ACTIONAUTO_TICKET_CLOSE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8134,'MAIN_AGENDA_ACTIONAUTO_TICKET_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8135,'MAIN_AGENDA_ACTIONAUTO_TICKET_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8136,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8137,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8138,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8139,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_APPROVE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8140,'MAIN_AGENDA_ACTIONAUTO_USER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8141,'MAIN_AGENDA_ACTIONAUTO_BOM_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8142,'MAIN_AGENDA_ACTIONAUTO_BOM_UNVALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8143,'MAIN_AGENDA_ACTIONAUTO_BOM_CLOSE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8144,'MAIN_AGENDA_ACTIONAUTO_BOM_REOPEN',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8145,'MAIN_AGENDA_ACTIONAUTO_BOM_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8146,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8147,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_PRODUCED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8148,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8149,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_CANCEL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8169,'CABINETMED_DELAY_TO_LOCK_RECORD',1,'0','chaine',1,'Number of days before locking edit of consultation','2020-01-05 20:37:19'),(8190,'ACCOUNTING_PRODUCT_MODE',1,'ACCOUNTANCY_SELL_EXPORT','chaine',0,'','2020-01-06 01:23:30'),(8191,'MAIN_ENABLE_DEFAULT_VALUES',1,'1','chaine',0,'','2020-01-06 16:09:52'),(8210,'CABINETMED_RHEUMATOLOGY_ON',1,'0','texte',0,'','2020-01-06 16:51:43'),(8213,'MAIN_SEARCHFORM_SOCIETE',1,'1','texte',0,'','2020-01-06 16:51:43'),(8214,'CABINETMED_BANK_PATIENT_REQUIRED',1,'0','texte',0,'','2020-01-06 16:51:43'),(8215,'DIAGNOSTIC_IS_NOT_MANDATORY',1,'1','texte',0,'','2020-01-06 16:51:43'),(8216,'USER_ADDON_PDF_ODT',1,'generic_user_odt','chaine',0,'','2020-01-07 13:45:19'),(8217,'USERGROUP_ADDON_PDF_ODT',1,'generic_usergroup_odt','chaine',0,'','2020-01-07 13:45:23'),(8230,'MAIN_MODULE_EMAILCOLLECTOR',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-12 20:13:55'),(8232,'MAIN_MODULE_SUPPLIERPROPOSAL',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-13 14:37:09'),(8233,'MAIN_MODULE_EXPEDITION',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-13 14:38:20'),(8252,'SYSTEMTOOLS_MYSQLDUMP',1,'/usr/bin/mysqldump','chaine',0,'','2020-01-15 15:42:41'),(8259,'ACCOUNTING_REEXPORT',1,'1','yesno',0,'','2020-01-17 13:42:56'),(8291,'PRODUIT_MULTIPRICES_LIMIT',1,'5','chaine',0,'','2020-01-17 14:21:46'),(8293,'PRODUIT_CUSTOMER_PRICES_BY_QTY',1,'0','chaine',0,'','2020-01-17 14:21:46'),(8303,'PRODUCT_PRICE_UNIQ',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8304,'PRODUIT_MULTIPRICES',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8305,'PRODUIT_CUSTOMER_PRICES',1,'1','chaine',0,'','2020-01-17 14:25:30'),(8306,'PRODUIT_SOUSPRODUITS',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8307,'PRODUIT_DESC_IN_FORM',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8308,'PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8309,'PRODUIT_USE_SEARCH_TO_SELECT',1,'1','chaine',0,'','2020-01-17 14:25:30'),(8310,'PRODUIT_FOURN_TEXTS',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8313,'MAIN_MODULE_FCKEDITOR',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-18 17:13:27'),(8314,'FCKEDITOR_ENABLE_TICKET',1,'1','chaine',0,'','2020-01-18 19:39:54'),(8321,'FCKEDITOR_SKIN',1,'moono-lisa','chaine',0,'','2020-01-18 19:41:15'),(8322,'FCKEDITOR_TEST',1,'Test &lt; aaa<br />\r\n<br />\r\n<img alt=\"\" src=\"/dolibarr_11.0/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/background_coder.jpg\" style=\"height:1280px; width:1920px\" />','chaine',0,'','2020-01-18 19:41:15'),(8484,'MAIN_LANG_DEFAULT',1,'auto','chaine',0,'','2020-01-21 09:40:00'),(8485,'MAIN_IHM_PARAMS_REV',1,'11','chaine',0,'','2020-01-21 09:40:00'),(8486,'MAIN_MULTILANGS',1,'1','chaine',0,'','2020-01-21 09:40:00'),(8487,'MAIN_THEME',1,'eldy','chaine',0,'','2020-01-21 09:40:00'),(8488,'THEME_ELDY_USE_HOVER',1,'237,244,251','chaine',0,'','2020-01-21 09:40:00'),(8489,'MAIN_SIZE_LISTE_LIMIT',1,'25','chaine',0,'','2020-01-21 09:40:00'),(8490,'MAIN_SIZE_SHORTLIST_LIMIT',1,'3','chaine',0,'','2020-01-21 09:40:00'),(8491,'MAIN_DISABLE_JAVASCRIPT',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8492,'MAIN_BUTTON_HIDE_UNAUTHORIZED',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8493,'MAIN_START_WEEK',1,'1','chaine',0,'','2020-01-21 09:40:00'),(8494,'MAIN_DEFAULT_WORKING_DAYS',1,'1-5','chaine',0,'','2020-01-21 09:40:00'),(8495,'MAIN_DEFAULT_WORKING_HOURS',1,'9-18','chaine',0,'','2020-01-21 09:40:00'),(8496,'MAIN_SHOW_LOGO',1,'1','chaine',0,'','2020-01-21 09:40:00'),(8497,'MAIN_FIRSTNAME_NAME_POSITION',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8498,'MAIN_HELPCENTER_DISABLELINK',0,'0','chaine',0,'','2020-01-21 09:40:00'),(8499,'MAIN_HOME',1,'<span style=\"font-size:12px\">__(NoteSomeFeaturesAreDisabled)__<br />\r\n__(SomeTranslationAreUncomplete)__</span>','chaine',0,'','2020-01-21 09:40:00'),(8501,'MAIN_BUGTRACK_ENABLELINK',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8542,'MAIN_INFO_SOCIETE_COUNTRY',1,'117:IN:India','chaine',0,'','2020-06-12 17:24:42'),(8543,'MAIN_INFO_SOCIETE_NOM',1,'MyBigCompany','chaine',0,'','2020-06-12 17:24:42'),(8544,'MAIN_INFO_SOCIETE_ADDRESS',1,'21 Jump street.','chaine',0,'','2020-06-12 17:24:42'),(8545,'MAIN_INFO_SOCIETE_TOWN',1,'MyTown','chaine',0,'','2020-06-12 17:24:42'),(8546,'MAIN_INFO_SOCIETE_ZIP',1,'75500','chaine',0,'','2020-06-12 17:24:42'),(8547,'MAIN_MONNAIE',1,'EUR','chaine',0,'','2020-06-12 17:24:42'),(8548,'MAIN_INFO_SOCIETE_TEL',1,'09123123','chaine',0,'','2020-06-12 17:24:42'),(8549,'MAIN_INFO_SOCIETE_FAX',1,'09123124','chaine',0,'','2020-06-12 17:24:42'),(8550,'MAIN_INFO_SOCIETE_MAIL',1,'myemail@mybigcompany.com','chaine',0,'','2020-06-12 17:24:42'),(8551,'MAIN_INFO_SOCIETE_WEB',1,'https://www.dolibarr.org','chaine',0,'','2020-06-12 17:24:42'),(8552,'MAIN_INFO_SOCIETE_NOTE',1,'This is note about my company','chaine',0,'','2020-06-12 17:24:42'),(8553,'MAIN_INFO_SOCIETE_GENCOD',1,'1234567890','chaine',0,'','2020-06-12 17:24:42'),(8554,'MAIN_INFO_SOCIETE_FACEBOOK_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8555,'MAIN_INFO_SOCIETE_TWITTER_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8556,'MAIN_INFO_SOCIETE_LINKEDIN_URL',1,'https://www.linkedin.com/company/9400559/admin/','chaine',0,'','2020-06-12 17:24:42'),(8557,'MAIN_INFO_SOCIETE_INSTAGRAM_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8558,'MAIN_INFO_SOCIETE_YOUTUBE_URL',1,'DolibarrERPCRM','chaine',0,'','2020-06-12 17:24:42'),(8559,'MAIN_INFO_SOCIETE_GITHUB_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8560,'MAIN_INFO_SOCIETE_MANAGERS',1,'Zack Zeceo','chaine',0,'','2020-06-12 17:24:42'),(8561,'MAIN_INFO_GDPR',1,'Zack Zeceo','chaine',0,'','2020-06-12 17:24:42'),(8562,'MAIN_INFO_CAPITAL',1,'10000','chaine',0,'','2020-06-12 17:24:42'),(8563,'MAIN_INFO_SOCIETE_FORME_JURIDIQUE',1,'0','chaine',0,'','2020-06-12 17:24:42'),(8564,'MAIN_INFO_SIREN',1,'123456','chaine',0,'','2020-06-12 17:24:42'),(8565,'MAIN_INFO_SIRET',1,'ABC-DEF','chaine',0,'','2020-06-12 17:24:42'),(8566,'MAIN_INFO_APE',1,'15E-45-8D','chaine',0,'','2020-06-12 17:24:42'),(8567,'MAIN_INFO_TVAINTRA',1,'FR12345678','chaine',0,'','2020-06-12 17:24:42'),(8568,'MAIN_INFO_SOCIETE_OBJECT',1,'A company demo to show how Dolibarr ERP CRM is wonderfull','chaine',0,'','2020-06-12 17:24:42'),(8569,'SOCIETE_FISCAL_MONTH_START',1,'4','chaine',0,'','2020-06-12 17:24:42'),(8570,'FACTURE_TVAOPTION',1,'1','chaine',0,'','2020-06-12 17:24:42'),(8571,'FACTURE_LOCAL_TAX1_OPTION',1,'localtax1on','chaine',0,'','2020-06-12 17:24:42'),(8572,'FACTURE_LOCAL_TAX2_OPTION',1,'localtax2on','chaine',0,'','2020-06-12 17:24:42'),(8573,'MAIN_INFO_VALUE_LOCALTAX1',1,'0','chaine',0,'','2020-06-12 17:24:42'),(8574,'MAIN_INFO_LOCALTAX_CALC1',1,'0','chaine',0,'','2020-06-12 17:24:42'),(8575,'MAIN_INFO_VALUE_LOCALTAX2',1,'0','chaine',0,'','2020-06-12 17:24:42'),(8576,'MAIN_INFO_LOCALTAX_CALC2',1,'0','chaine',0,'','2020-06-12 17:24:42'),(8577,'PRODUCT_PRICE_BASE_TYPE',0,'HT','string',0,NULL,'2020-12-10 12:24:38'),(8578,'MAIN_MODULE_ACCOUNTING',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:49'),(8579,'MAIN_MODULE_AGENDA',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:49'),(8580,'MAIN_MODULE_BARCODE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:50'),(8581,'MAIN_MODULE_CRON',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:50'),(8582,'MAIN_MODULE_COMMANDE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:50'),(8583,'MAIN_MODULE_DON',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:50'),(8584,'MAIN_MODULE_ECM',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:50'),(8585,'MAIN_MODULE_EXPENSEREPORT',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:50'),(8586,'MAIN_MODULE_FACTURE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:51'),(8587,'MAIN_MODULE_FOURNISSEUR',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:51'),(8588,'MAIN_MODULE_HOLIDAY',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:51'),(8589,'MAIN_MODULE_OPENSURVEY',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:51'),(8590,'MAIN_MODULE_PRINTING',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:51'),(8591,'MAIN_MODULE_RESOURCE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:51'),(8592,'MAIN_MODULE_SALARIES',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:51'),(8593,'MAIN_MODULE_SOCIETE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:51'),(8594,'MAIN_MODULE_SERVICE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:52'),(8595,'TAKEPOS_PRINT_METHOD',1,'browser','chaine',0,'','2020-12-10 12:24:52'),(8596,'MAIN_MODULE_TAKEPOS',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:52'),(8597,'MAIN_MODULE_TAKEPOS_TRIGGERS',1,'0','chaine',0,NULL,'2020-12-10 12:24:52'),(8598,'MAIN_MODULE_TAKEPOS_LOGIN',1,'0','chaine',0,NULL,'2020-12-10 12:24:52'),(8599,'MAIN_MODULE_TAKEPOS_SUBSTITUTIONS',1,'1','chaine',0,NULL,'2020-12-10 12:24:52'),(8600,'MAIN_MODULE_TAKEPOS_MENUS',1,'0','chaine',0,NULL,'2020-12-10 12:24:52'),(8601,'MAIN_MODULE_TAKEPOS_THEME',1,'0','chaine',0,NULL,'2020-12-10 12:24:52'),(8602,'MAIN_MODULE_TAKEPOS_TPL',1,'0','chaine',0,NULL,'2020-12-10 12:24:52'),(8603,'MAIN_MODULE_TAKEPOS_BARCODE',1,'0','chaine',0,NULL,'2020-12-10 12:24:52'),(8604,'MAIN_MODULE_TAKEPOS_MODELS',1,'0','chaine',0,NULL,'2020-12-10 12:24:52'),(8605,'MAIN_MODULE_USER',0,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:52'),(8606,'MAIN_MODULE_VARIANTS',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:52'),(8607,'MAIN_MODULE_WEBSITE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:52'),(8608,'MAIN_VERSION_LAST_UPGRADE',0,'13.0.0-beta','chaine',0,'Dolibarr version for last upgrade','2020-12-10 12:24:54'),(8610,'MAIN_FIRST_PING_OK_DATE',1,'20201210122456','chaine',0,'','2020-12-10 12:24:56'),(8611,'MAIN_FIRST_PING_OK_ID',1,'c62ba8fb0a32591892333c3d72593685','chaine',0,'','2020-12-10 12:24:56'),(8612,'MAIN_UPLOAD_DOC',1,'50000','chaine',0,'','2020-12-10 12:26:31'),(8613,'MAIN_UMASK',1,'0664','chaine',0,'','2020-12-10 12:26:31'),(8614,'MAIN_ANTIVIRUS_PARAM',1,'--fdpass','chaine',0,'','2020-12-10 12:26:31'),(8619,'WEBSITE_EDITINLINE',1,'0','chaine',0,'','2020-12-10 12:27:05'),(8620,'WEBSITE_SUBCONTAINERSINLINE',1,'1','chaine',0,'','2020-12-10 12:27:17'),(8622,'MAIN_FEATURES_LEVEL',0,'1','chaine',1,'Level of features to show (0=stable only, 1=stable+experimental, 2=stable+experimental+development','2020-12-10 12:29:16'),(8623,'MAIN_MODULE_RECRUITMENT',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-12-10 12:29:43'),(8624,'MAIN_MODULE_RECRUITMENT_TRIGGERS',1,'0','chaine',0,NULL,'2020-12-10 12:29:43'),(8625,'MAIN_MODULE_RECRUITMENT_LOGIN',1,'0','chaine',0,NULL,'2020-12-10 12:29:43'),(8626,'MAIN_MODULE_RECRUITMENT_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2020-12-10 12:29:43'),(8627,'MAIN_MODULE_RECRUITMENT_MENUS',1,'0','chaine',0,NULL,'2020-12-10 12:29:43'),(8628,'MAIN_MODULE_RECRUITMENT_TPL',1,'0','chaine',0,NULL,'2020-12-10 12:29:43'),(8629,'MAIN_MODULE_RECRUITMENT_BARCODE',1,'0','chaine',0,NULL,'2020-12-10 12:29:43'),(8630,'MAIN_MODULE_RECRUITMENT_MODELS',1,'1','chaine',0,NULL,'2020-12-10 12:29:43'),(8631,'MAIN_MODULE_RECRUITMENT_THEME',1,'0','chaine',0,NULL,'2020-12-10 12:29:43'),(8632,'MAIN_MODULE_RECRUITMENT_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2020-12-10 12:29:43'),(8633,'MAIN_MODULE_RECEPTION',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-12-10 12:30:13'),(8634,'RECEPTION_ADDON_PDF',1,'squille','chaine',0,'Nom du gestionnaire de generation des bons receptions en PDF','2020-12-10 12:30:13'),(8635,'RECEPTION_ADDON_NUMBER',1,'mod_reception_beryl','chaine',0,'Name for numbering manager for receptions','2020-12-10 12:30:13'),(8636,'RECEPTION_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/receptions','chaine',0,NULL,'2020-12-10 12:30:13'),(8637,'MAIN_SUBMODULE_RECEPTION',1,'1','chaine',0,'Enable receptions','2020-12-10 12:30:13'),(8638,'MAIN_MODULE_PAYMENTBYBANKTRANSFER',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-12-10 12:30:17'),(8639,'MAIN_MODULE_MARGIN',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-12-10 12:30:20'),(8640,'MAIN_MODULE_MARGIN_TABS_0',1,'product:+margin:Margins:margins:$user->rights->margins->liretous:/margin/tabs/productMargins.php?id=__ID__','chaine',0,NULL,'2020-12-10 12:30:20'),(8641,'MAIN_MODULE_MARGIN_TABS_1',1,'thirdparty:+margin:Margins:margins:empty($user->socid) && $user->rights->margins->liretous && ($object->client > 0):/margin/tabs/thirdpartyMargins.php?socid=__ID__','chaine',0,NULL,'2020-12-10 12:30:20'),(8643,'MAIN_MODULE_BLOCKEDLOG',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-12-10 12:31:17'),(8644,'MAIN_MODULE_INCOTERM',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-12-10 12:31:36'),(8645,'INCOTERM_ACTIVATE',1,'','chaine',0,'Description de INCOTERM_ACTIVATE','2020-12-10 12:31:36');
 /*!40000 ALTER TABLE `llx_const` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4924,6 +5552,34 @@ INSERT INTO `llx_cronjob` VALUES (1,'2015-03-23 18:18:39','2015-03-23 19:18:39',
 /*!40000 ALTER TABLE `llx_cronjob` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_cv_recrutement`
+--
+
+DROP TABLE IF EXISTS `llx_cv_recrutement`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_cv_recrutement` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `nom` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `fichier` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `poste` int(11) DEFAULT NULL,
+  `candidature` int(11) DEFAULT NULL,
+  `type` varchar(20) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `date` date DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_cv_recrutement`
+--
+
+LOCK TABLES `llx_cv_recrutement` WRITE;
+/*!40000 ALTER TABLE `llx_cv_recrutement` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_cv_recrutement` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_default_values`
 --
@@ -4954,6 +5610,168 @@ INSERT INTO `llx_default_values` VALUES (1,1,'createform',0,'compta/facture/card
 /*!40000 ALTER TABLE `llx_default_values` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_delivery`
+--
+
+DROP TABLE IF EXISTS `llx_delivery`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_delivery` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `ref` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `ref_customer` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_soc` int(11) NOT NULL,
+  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_int` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `date_creation` datetime DEFAULT NULL,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `date_valid` datetime DEFAULT NULL,
+  `fk_user_valid` int(11) DEFAULT NULL,
+  `date_delivery` datetime DEFAULT NULL,
+  `fk_address` int(11) DEFAULT NULL,
+  `fk_statut` smallint(6) DEFAULT 0,
+  `total_ht` double(24,8) DEFAULT 0.00000000,
+  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_incoterms` int(11) DEFAULT NULL,
+  `location_incoterms` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `last_main_doc` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_delivery_uk_ref` (`ref`,`entity`),
+  KEY `idx_delivery_fk_soc` (`fk_soc`),
+  KEY `idx_delivery_fk_user_author` (`fk_user_author`),
+  KEY `idx_delivery_fk_user_valid` (`fk_user_valid`),
+  CONSTRAINT `fk_delivery_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
+  CONSTRAINT `fk_delivery_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`),
+  CONSTRAINT `fk_delivery_fk_user_valid` FOREIGN KEY (`fk_user_valid`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_delivery`
+--
+
+LOCK TABLES `llx_delivery` WRITE;
+/*!40000 ALTER TABLE `llx_delivery` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_delivery` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_delivery_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_delivery_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_delivery_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_delivery_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_delivery_extrafields`
+--
+
+LOCK TABLES `llx_delivery_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_delivery_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_delivery_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_deliverydet`
+--
+
+DROP TABLE IF EXISTS `llx_deliverydet`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_deliverydet` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_delivery` int(11) DEFAULT NULL,
+  `fk_origin_line` int(11) DEFAULT NULL,
+  `fk_product` int(11) DEFAULT NULL,
+  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `qty` double DEFAULT NULL,
+  `subprice` double(24,8) DEFAULT 0.00000000,
+  `total_ht` double(24,8) DEFAULT 0.00000000,
+  `rang` int(11) DEFAULT 0,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_deliverydet_fk_expedition` (`fk_delivery`),
+  KEY `idx_deliverydet_fk_delivery` (`fk_delivery`),
+  CONSTRAINT `fk_deliverydet_fk_delivery` FOREIGN KEY (`fk_delivery`) REFERENCES `llx_delivery` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_deliverydet`
+--
+
+LOCK TABLES `llx_deliverydet` WRITE;
+/*!40000 ALTER TABLE `llx_deliverydet` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_deliverydet` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_deliverydet_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_deliverydet_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_deliverydet_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_deliverydet_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_deliverydet_extrafields`
+--
+
+LOCK TABLES `llx_deliverydet_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_deliverydet_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_deliverydet_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_departements`
+--
+
+DROP TABLE IF EXISTS `llx_departements`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_departements` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `label` varchar(355) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `gestionnaire` int(11) NOT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `gestionnaire` (`gestionnaire`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_departements`
+--
+
+LOCK TABLES `llx_departements` WRITE;
+/*!40000 ALTER TABLE `llx_departements` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_departements` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_deplacement`
 --
@@ -4993,6 +5811,70 @@ INSERT INTO `llx_deplacement` VALUES (1,NULL,1,'2012-07-09 01:58:04','2012-07-08
 /*!40000 ALTER TABLE `llx_deplacement` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_dispatch`
+--
+
+DROP TABLE IF EXISTS `llx_dispatch`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_dispatch` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_object` int(11) NOT NULL DEFAULT 0,
+  `type_object` varchar(30) CHARACTER SET latin1 DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `fk_object` (`fk_object`),
+  KEY `type_object` (`type_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_dispatch`
+--
+
+LOCK TABLES `llx_dispatch` WRITE;
+/*!40000 ALTER TABLE `llx_dispatch` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_dispatch` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_dispatch_asset`
+--
+
+DROP TABLE IF EXISTS `llx_dispatch_asset`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_dispatch_asset` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_object` int(11) NOT NULL DEFAULT 0,
+  `fk_dispatch` int(11) NOT NULL DEFAULT 0,
+  `fk_asset` int(11) NOT NULL DEFAULT 0,
+  `type_object` varchar(30) CHARACTER SET latin1 DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `fk_object` (`fk_object`),
+  KEY `fk_dispatch` (`fk_dispatch`),
+  KEY `fk_asset` (`fk_asset`),
+  KEY `type_object` (`type_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_dispatch_asset`
+--
+
+LOCK TABLES `llx_dispatch_asset` WRITE;
+/*!40000 ALTER TABLE `llx_dispatch_asset` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_dispatch_asset` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_document_model`
 --
@@ -5009,7 +5891,7 @@ CREATE TABLE `llx_document_model` (
   `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_document_model` (`nom`,`type`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=386 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=394 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5018,7 +5900,7 @@ CREATE TABLE `llx_document_model` (
 
 LOCK TABLES `llx_document_model` WRITE;
 /*!40000 ALTER TABLE `llx_document_model` DISABLE KEYS */;
-INSERT INTO `llx_document_model` VALUES (9,'merou',1,'shipping',NULL,NULL),(181,'generic_invoice_odt',1,'invoice','ODT templates','FACTURE_ADDON_PDF_ODT_PATH'),(193,'canelle2',1,'invoice_supplier','canelle2',NULL),(195,'canelle',1,'invoice_supplier','canelle',NULL),(198,'azur',2,'propal',NULL,NULL),(199,'html_cerfafr',2,'donation',NULL,NULL),(200,'crabe',2,'invoice',NULL,NULL),(201,'generic_odt',1,'company','ODT templates','COMPANY_ADDON_PDF_ODT_PATH'),(250,'baleine',1,'project',NULL,NULL),(255,'soleil',1,'ficheinter',NULL,NULL),(256,'azur',1,'propal',NULL,NULL),(273,'beluga',1,'project','beluga',NULL),(281,'sepamandate',1,'bankaccount','sepamandate',NULL),(299,'standard',1,'member',NULL,NULL),(319,'generic_bom_odt',1,'bom','ODT templates','BOM_ADDON_PDF_ODT_PATH'),(320,'generic_mo_odt',1,'mrp','ODT templates','MRP_MO_ADDON_PDF_ODT_PATH'),(366,'generic_user_odt',1,'user',NULL,NULL),(367,'generic_usergroup_odt',1,'group',NULL,NULL),(370,'aurore',1,'supplier_proposal',NULL,NULL),(371,'rouget',1,'shipping',NULL,NULL),(372,'typhon',1,'delivery',NULL,NULL),(381,'einstein',1,'order',NULL,NULL),(382,'html_cerfafr',1,'donation',NULL,NULL),(383,'standard',1,'expensereport',NULL,NULL),(384,'crabe',1,'invoice',NULL,NULL),(385,'muscadet',1,'order_supplier',NULL,NULL);
+INSERT INTO `llx_document_model` VALUES (9,'merou',1,'shipping',NULL,NULL),(181,'generic_invoice_odt',1,'invoice','ODT templates','FACTURE_ADDON_PDF_ODT_PATH'),(193,'canelle2',1,'invoice_supplier','canelle2',NULL),(195,'canelle',1,'invoice_supplier','canelle',NULL),(198,'azur',2,'propal',NULL,NULL),(199,'html_cerfafr',2,'donation',NULL,NULL),(200,'crabe',2,'invoice',NULL,NULL),(201,'generic_odt',1,'company','ODT templates','COMPANY_ADDON_PDF_ODT_PATH'),(250,'baleine',1,'project',NULL,NULL),(255,'soleil',1,'ficheinter',NULL,NULL),(256,'azur',1,'propal',NULL,NULL),(273,'beluga',1,'project','beluga',NULL),(281,'sepamandate',1,'bankaccount','sepamandate',NULL),(299,'standard',1,'member',NULL,NULL),(319,'generic_bom_odt',1,'bom','ODT templates','BOM_ADDON_PDF_ODT_PATH'),(320,'generic_mo_odt',1,'mrp','ODT templates','MRP_MO_ADDON_PDF_ODT_PATH'),(366,'generic_user_odt',1,'user',NULL,NULL),(367,'generic_usergroup_odt',1,'group',NULL,NULL),(370,'aurore',1,'supplier_proposal',NULL,NULL),(371,'rouget',1,'shipping',NULL,NULL),(372,'typhon',1,'delivery',NULL,NULL),(386,'einstein',1,'order',NULL,NULL),(387,'html_cerfafr',1,'donation',NULL,NULL),(388,'standard',1,'expensereport',NULL,NULL),(389,'crabe',1,'invoice',NULL,NULL),(390,'muscadet',1,'order_supplier',NULL,NULL),(391,'standard_recruitmentjobposition',1,'recruitmentjobposition',NULL,NULL),(392,'generic_recruitmentjobposition_odt',1,'recruitmentjobposition',NULL,NULL),(393,'squille',1,'reception',NULL,NULL);
 /*!40000 ALTER TABLE `llx_document_model` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -5120,7 +6002,7 @@ CREATE TABLE `llx_ecm_directories` (
   `fullpath` varchar(750) COLLATE utf8_unicode_ci DEFAULT NULL,
   `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `date_c` datetime DEFAULT NULL,
-  `date_m` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_user_c` int(11) DEFAULT NULL,
   `fk_user_m` int(11) DEFAULT NULL,
   `acl` text COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -5143,6 +6025,32 @@ INSERT INTO `llx_ecm_directories` VALUES (8,'Administrative documents',1,0,'Dire
 /*!40000 ALTER TABLE `llx_ecm_directories` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_ecm_directories_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_ecm_directories_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_ecm_directories_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_ecm_directories_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_ecm_directories_extrafields`
+--
+
+LOCK TABLES `llx_ecm_directories_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_ecm_directories_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_ecm_directories_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_ecm_files`
 --
@@ -5165,7 +6073,7 @@ CREATE TABLE `llx_ecm_files` (
   `gen_or_uploaded` varchar(12) COLLATE utf8_unicode_ci DEFAULT NULL,
   `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `date_c` datetime DEFAULT NULL,
-  `date_m` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_user_c` int(11) DEFAULT NULL,
   `fk_user_m` int(11) DEFAULT NULL,
   `acl` text COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -5189,6 +6097,32 @@ INSERT INTO `llx_ecm_files` VALUES (1,NULL,'6ff09d1c53ef83fe622b02a320bcfa52',NU
 /*!40000 ALTER TABLE `llx_ecm_files` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_ecm_files_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_ecm_files_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_ecm_files_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_ecm_files_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_ecm_files_extrafields`
+--
+
+LOCK TABLES `llx_ecm_files_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_ecm_files_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_ecm_files_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_ecommerce_category`
 --
@@ -5395,7 +6329,7 @@ CREATE TABLE `llx_emailcollector_emailcollector` (
 
 LOCK TABLES `llx_emailcollector_emailcollector` WRITE;
 /*!40000 ALTER TABLE `llx_emailcollector_emailcollector` DISABLE KEYS */;
-INSERT INTO `llx_emailcollector_emailcollector` VALUES (3,1,'Collect_Ticket_Requets','Example to collect ticket requests','This collector will scan your mailbox to find emails that match some rules and create automatically a ticket (Module Ticket must be enabled) with the email informations. You can use this collector if you provide some support by email, so your ticket request will be automatically generated. If the collector Collect_Responses is also enabled, when you send an email from the ticket, you may also see answers of your customers or partners directly on the ticket view.',NULL,NULL,NULL,'INBOX',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2020-01-13 00:13:55','2020-01-12 20:13:55',12,NULL,NULL,0,NULL,0,NULL,NULL,100,'UTF-8'),(4,1,'Collect_Responses','Example to collect any email responses','This collector will scan your mailbox to find all emails that are an answer of an email sent from your application. An event with the email response will be recorded at the good place (Module Agenda must be enabled). For example, if your send a commercial proposal, order or invoice by email and your customer answers your email, the system will automatically find the answer and add it into your ERP.',NULL,NULL,NULL,'INBOX',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2020-01-13 00:13:55','2020-01-12 20:13:55',12,NULL,NULL,0,NULL,0,NULL,NULL,100,'UTF-8'),(5,1,'Collect_Leads','Example to collect leads','This collector will scan your mailbox to find emails that match some rules and create automatically a lead (Module Project must be enabled) with the email informations. You can use this collector if you want to follow your lead using the module Project (1 lead = 1 project), so your leads will be automatically generated. If the collector Collect_Responses is also enabled, when you send an email from your leads, proposals or any other object, you may also see answers of your customers or partners directly on the application.<br>Note: With this initial example, the title of the lead is generated including the email. If the thirdparty can\'t be found in database (new customer), the lead will be attached to the thirdparty with ID 1.',NULL,NULL,NULL,'INBOX',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2020-01-13 00:13:55','2020-01-12 20:13:55',12,NULL,NULL,0,NULL,0,NULL,NULL,100,'UTF-8');
+INSERT INTO `llx_emailcollector_emailcollector` VALUES (3,1,'Collect_Ticket_Requests','Example to collect ticket requests','This collector will scan your mailbox to find emails that match some rules and create automatically a ticket (Module Ticket must be enabled) with the email informations. You can use this collector if you provide some support by email, so your ticket request will be automatically generated. If the collector Collect_Responses is also enabled, when you send an email from the ticket, you may also see answers of your customers or partners directly on the ticket view.',NULL,NULL,NULL,'INBOX',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2020-01-13 00:13:55','2020-12-10 12:24:38',12,NULL,NULL,0,NULL,0,NULL,NULL,100,'UTF-8'),(4,1,'Collect_Responses_In','Example to collect any email responses','This collector will scan your mailbox to find all emails that are an answer of an email sent from your application. An event with the email response will be recorded at the good place (Module Agenda must be enabled). For example, if your send a commercial proposal, order or invoice by email and your customer answers your email, the system will automatically find the answer and add it into your ERP.',NULL,NULL,NULL,'INBOX',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2020-01-13 00:13:55','2020-12-10 12:24:38',12,NULL,NULL,0,NULL,0,NULL,NULL,100,'UTF-8'),(5,1,'Collect_Leads','Example to collect leads','This collector will scan your mailbox to find emails that match some rules and create automatically a lead (Module Project must be enabled) with the email informations. You can use this collector if you want to follow your lead using the module Project (1 lead = 1 project), so your leads will be automatically generated. If the collector Collect_Responses is also enabled, when you send an email from your leads, proposals or any other object, you may also see answers of your customers or partners directly on the application.<br>Note: With this initial example, the title of the lead is generated including the email. If the thirdparty can\'t be found in database (new customer), the lead will be attached to the thirdparty with ID 1.',NULL,NULL,NULL,'INBOX',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2020-01-13 00:13:55','2020-01-12 20:13:55',12,NULL,NULL,0,NULL,0,NULL,NULL,100,'UTF-8');
 /*!40000 ALTER TABLE `llx_emailcollector_emailcollector` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -5628,6 +6562,8 @@ CREATE TABLE `llx_establishment` (
   `datec` datetime NOT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `status` tinyint(4) DEFAULT 1,
+  `ref` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
+  `label` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -5641,6 +6577,55 @@ LOCK TABLES `llx_establishment` WRITE;
 /*!40000 ALTER TABLE `llx_establishment` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_etapescandidature`
+--
+
+DROP TABLE IF EXISTS `llx_etapescandidature`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_etapescandidature` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `label` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `color` varchar(10) CHARACTER SET utf8mb4 DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_etapescandidature`
+--
+
+LOCK TABLES `llx_etapescandidature` WRITE;
+/*!40000 ALTER TABLE `llx_etapescandidature` DISABLE KEYS */;
+INSERT INTO `llx_etapescandidature` VALUES (1,'Qualification_initiale','#DBE270'),(2,'Premier_entretien','#F59A9A'),(3,'Second_entretien','#62B0F7'),(4,'Proposition_contrat','#FFB164'),(5,'Contrat_signe','#59D859');
+/*!40000 ALTER TABLE `llx_etapescandidature` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_etiquettes`
+--
+
+DROP TABLE IF EXISTS `llx_etiquettes`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_etiquettes` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `label` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `color` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_etiquettes`
+--
+
+LOCK TABLES `llx_etiquettes` WRITE;
+/*!40000 ALTER TABLE `llx_etiquettes` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_etiquettes` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_event_element`
 --
@@ -5666,6 +6651,140 @@ LOCK TABLES `llx_event_element` WRITE;
 /*!40000 ALTER TABLE `llx_event_element` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_eventorganizer_attendee`
+--
+
+DROP TABLE IF EXISTS `llx_eventorganizer_attendee`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_eventorganizer_attendee` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(128) CHARACTER SET utf8mb4 NOT NULL DEFAULT '(PROV)',
+  `label` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `amount` double(24,8) DEFAULT NULL,
+  `qty` double DEFAULT NULL,
+  `fk_soc` int(11) DEFAULT NULL,
+  `description` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `note_public` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `note_private` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_user_creat` int(11) NOT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `status` int(11) NOT NULL,
+  `fk_eventorganizer` int(11) NOT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_eventorganizer_attendee_rowid` (`rowid`),
+  KEY `idx_eventorganizer_attendee_ref` (`ref`),
+  KEY `idx_eventorganizer_attendee_fk_soc` (`fk_soc`),
+  KEY `idx_eventorganizer_attendee_status` (`status`),
+  KEY `idx_eventorganizer_attendee_fk_eventorganizer` (`fk_eventorganizer`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_eventorganizer_attendee`
+--
+
+LOCK TABLES `llx_eventorganizer_attendee` WRITE;
+/*!40000 ALTER TABLE `llx_eventorganizer_attendee` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_eventorganizer_attendee` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_eventorganizer_attendee_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_eventorganizer_attendee_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_eventorganizer_attendee_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_eventorganizer_attendee_extrafields`
+--
+
+LOCK TABLES `llx_eventorganizer_attendee_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_eventorganizer_attendee_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_eventorganizer_attendee_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_eventorganizer_organizedevent`
+--
+
+DROP TABLE IF EXISTS `llx_eventorganizer_organizedevent`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_eventorganizer_organizedevent` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(128) CHARACTER SET utf8mb4 NOT NULL DEFAULT '(PROV)',
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `label` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `amount` double(24,8) DEFAULT NULL,
+  `qty` double DEFAULT NULL,
+  `fk_soc` int(11) DEFAULT NULL,
+  `description` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `note_public` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `note_private` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_user_creat` int(11) NOT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `status` int(11) NOT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_eventorganizer_organizedevent_rowid` (`rowid`),
+  KEY `idx_eventorganizer_organizedevent_ref` (`ref`),
+  KEY `idx_eventorganizer_organizedevent_entity` (`entity`),
+  KEY `idx_eventorganizer_organizedevent_fk_soc` (`fk_soc`),
+  KEY `idx_eventorganizer_organizedevent_status` (`status`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_eventorganizer_organizedevent`
+--
+
+LOCK TABLES `llx_eventorganizer_organizedevent` WRITE;
+/*!40000 ALTER TABLE `llx_eventorganizer_organizedevent` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_eventorganizer_organizedevent` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_eventorganizer_organizedevent_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_eventorganizer_organizedevent_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_eventorganizer_organizedevent_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_eventorganizer_organizedevent_extrafields`
+--
+
+LOCK TABLES `llx_eventorganizer_organizedevent_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_eventorganizer_organizedevent_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_eventorganizer_organizedevent_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_events`
 --
@@ -5887,6 +7006,46 @@ INSERT INTO `llx_expeditiondet` VALUES (1,1,10,3,1,0),(2,2,226,19,2,0);
 /*!40000 ALTER TABLE `llx_expeditiondet` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_expeditiondet_asset`
+--
+
+DROP TABLE IF EXISTS `llx_expeditiondet_asset`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_expeditiondet_asset` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_expeditiondet` int(11) NOT NULL DEFAULT 0,
+  `fk_asset` int(11) NOT NULL DEFAULT 0,
+  `rang` int(11) NOT NULL DEFAULT 0,
+  `lot_number` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `carton` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `numerosuivi` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `weight` double NOT NULL DEFAULT 0,
+  `weight_reel` double NOT NULL DEFAULT 0,
+  `tare` double NOT NULL DEFAULT 0,
+  `weight_unit` int(11) NOT NULL DEFAULT 0,
+  `weight_reel_unit` int(11) NOT NULL DEFAULT 0,
+  `tare_unit` int(11) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `fk_expeditiondet` (`fk_expeditiondet`),
+  KEY `fk_asset` (`fk_asset`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_expeditiondet_asset`
+--
+
+LOCK TABLES `llx_expeditiondet_asset` WRITE;
+/*!40000 ALTER TABLE `llx_expeditiondet_asset` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_expeditiondet_asset` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_expeditiondet_batch`
 --
@@ -5994,6 +7153,7 @@ CREATE TABLE `llx_expensereport` (
   `multicurrency_total_ttc` double(24,8) DEFAULT 0.00000000,
   `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
   `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_user_creat` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `idx_expensereport_uk_ref` (`ref`,`entity`),
   KEY `idx_expensereport_date_debut` (`date_debut`),
@@ -6012,7 +7172,7 @@ CREATE TABLE `llx_expensereport` (
 
 LOCK TABLES `llx_expensereport` WRITE;
 /*!40000 ALTER TABLE `llx_expensereport` DISABLE KEYS */;
-INSERT INTO `llx_expensereport` VALUES (1,'ADMIN-ER00002-150101',1,2,NULL,8.33000000,1.67000000,0.00000000,0.00000000,10.00000000,'2020-01-01','2020-01-03','2020-01-22 19:03:37','2020-01-22 19:06:50','2020-02-16 02:12:40',NULL,NULL,'2020-06-12 17:12:08',12,NULL,12,12,12,NULL,NULL,5,NULL,0,'Holidays',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL),(2,'ER1912-0001',1,NULL,NULL,141.67000000,28.33000000,0.00000000,0.00000000,170.00000000,'2020-02-01','2020-02-28','2020-01-22 19:04:44','2021-12-20 20:34:13','2021-12-20 20:34:19',NULL,'2021-12-21 00:34:26','2020-06-12 17:12:08',12,12,12,12,12,NULL,12,4,NULL,0,'Work on projet X','','','aaaa',NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL),(3,'(PROV3)',1,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'2020-02-02','2020-02-02','2020-02-02 03:57:03','2020-02-02 00:00:00',NULL,NULL,NULL,'2020-06-12 17:12:08',19,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL);
+INSERT INTO `llx_expensereport` VALUES (1,'ADMIN-ER00002-150101',1,2,NULL,8.33000000,1.67000000,0.00000000,0.00000000,10.00000000,'2020-01-01','2020-01-03','2020-01-22 19:03:37','2020-01-22 19:06:50','2020-02-16 02:12:40',NULL,NULL,'2020-06-12 17:12:08',12,NULL,12,12,12,NULL,NULL,5,NULL,0,'Holidays',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(2,'ER1912-0001',1,NULL,NULL,141.67000000,28.33000000,0.00000000,0.00000000,170.00000000,'2020-02-01','2020-02-28','2020-01-22 19:04:44','2021-12-20 20:34:13','2021-12-20 20:34:19',NULL,'2021-12-21 00:34:26','2020-06-12 17:12:08',12,12,12,12,12,NULL,12,4,NULL,0,'Work on projet X','','','aaaa',NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(3,'(PROV3)',1,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'2020-02-02','2020-02-02','2020-02-02 03:57:03','2020-02-02 00:00:00',NULL,NULL,NULL,'2020-06-12 17:12:08',19,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_expensereport` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -6330,6 +7490,7 @@ CREATE TABLE `llx_facture` (
   `retained_warranty_fk_cond_reglement` int(11) DEFAULT NULL,
   `fk_incoterms` int(11) DEFAULT NULL,
   `location_incoterms` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_transport_mode` int(11) DEFAULT NULL,
   `date_pointoftax` date DEFAULT NULL,
   `fk_multicurrency` int(11) DEFAULT NULL,
   `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -6365,7 +7526,7 @@ CREATE TABLE `llx_facture` (
 
 LOCK TABLES `llx_facture` WRITE;
 /*!40000 ALTER TABLE `llx_facture` DISABLE KEYS */;
-INSERT INTO `llx_facture` VALUES (2,'FA1007-0002',1,NULL,NULL,0,NULL,NULL,2,'2012-07-10 18:20:13','2019-07-10',NULL,NULL,'2020-06-12 17:12:08',1,10.00000000,NULL,NULL,0,NULL,NULL,0.10000000,0.00000000,0.00000000,0.00000000,46.00000000,46.10000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2019-07-10',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(3,'FA1107-0006',1,NULL,NULL,0,NULL,NULL,10,'2013-07-18 20:33:35','2019-07-18',NULL,NULL,'2020-06-12 17:12:09',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,15.00000000,15.00000000,2,1,NULL,1,NULL,NULL,1,NULL,NULL,1,0,'2019-07-18',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(5,'FA1108-0003',1,NULL,NULL,0,NULL,NULL,7,'2013-08-01 03:34:11','2019-08-01',NULL,NULL,'2020-06-12 17:12:08',1,0.00000000,NULL,NULL,0,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,6,'2019-08-01',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(6,'FA1108-0004',1,NULL,NULL,0,NULL,NULL,7,'2013-08-06 20:33:53','2019-08-06',NULL,NULL,'2020-06-12 17:12:08',1,0.00000000,NULL,NULL,0,NULL,NULL,0.98000000,0.00000000,0.00000000,0.00000000,5.00000000,5.98000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,4,'2019-08-06','Cash\nReceived : 6 EUR\nRendu : 0.02 EUR\n\n--------------------------------------',NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(8,'FA1108-0005',1,NULL,NULL,3,NULL,NULL,2,'2013-08-08 02:41:44','2019-08-08',NULL,NULL,'2020-06-12 17:12:08',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2019-08-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(9,'FA1108-0007',1,NULL,NULL,3,NULL,NULL,10,'2013-08-08 02:55:14','2019-08-08',NULL,NULL,'2020-06-12 17:12:08',0,0.00000000,NULL,NULL,0,NULL,NULL,1.96000000,0.00000000,0.00000000,0.00000000,10.00000000,11.96000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2019-08-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(10,'AV1212-0001',1,NULL,NULL,2,NULL,NULL,10,'2014-12-08 17:45:20','2019-12-08','2019-12-08',NULL,'2020-06-12 17:12:08',0,0.00000000,NULL,NULL,0,NULL,NULL,-0.63000000,0.00000000,0.00000000,0.00000000,-11.00000000,-11.63000000,1,1,NULL,1,NULL,3,NULL,NULL,NULL,0,0,'2019-12-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(12,'AV1212-0002',1,NULL,NULL,2,NULL,NULL,10,'2014-12-08 18:20:14','2019-12-08','2019-12-08',NULL,'2020-06-12 17:12:08',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,-5.00000000,-5.00000000,2,1,NULL,1,NULL,3,NULL,NULL,NULL,0,0,'2019-12-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(13,'FA1212-0011',1,NULL,NULL,0,NULL,NULL,7,'2014-12-09 20:04:19','2019-12-09','2020-02-12',NULL,'2020-06-12 17:12:08',0,0.00000000,NULL,NULL,0,NULL,NULL,2.74000000,0.00000000,0.00000000,0.00000000,14.00000000,16.74000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2019-12-09',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(32,'FA1212-0021',1,NULL,NULL,0,NULL,NULL,1,'2014-12-11 09:34:23','2019-12-11','2020-03-24',NULL,'2020-06-12 17:12:08',0,0.00000000,NULL,NULL,0,NULL,NULL,90.00000000,0.00000000,0.00000000,0.60000000,520.00000000,610.60000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2019-12-11','This is a comment (private)','This is a comment (public)','crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(33,'FA1212-0023',1,NULL,NULL,0,NULL,NULL,1,'2014-12-11 09:34:23','2019-12-11','2020-03-03',NULL,'2020-06-12 17:12:08',0,0.00000000,NULL,NULL,0,'abandon',NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,3,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2019-12-11','This is a comment (private)','This is a comment (public)','crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(55,'FA1212-0009',1,NULL,NULL,0,NULL,NULL,1,'2014-12-11 09:35:51','2019-12-11','2019-12-12',NULL,'2020-06-12 17:12:08',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2019-12-11','This is a comment (private)','This is a comment (public)','generic_invoice_odt:/home/ldestailleur/git/dolibarr_3.8/documents/doctemplates/invoices/template_invoice.odt',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(148,'FS1301-0001',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:22:48','2020-01-19','2020-01-19',NULL,'2020-06-12 17:12:09',0,0.00000000,NULL,NULL,0,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,1,'2020-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,'facture/FS1301-0001/FS1301-0001.pdf',NULL,NULL),(149,'FA1601-0024',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:30:05','2020-01-19','2019-08-29','2020-01-02 20:49:34','2020-06-12 17:12:09',0,0.00000000,NULL,NULL,0,'other','test',1.80000000,0.90000000,0.90000000,0.00000000,20.00000000,23.60000000,2,1,NULL,12,12,NULL,NULL,NULL,NULL,0,0,'2020-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,20.00000000,1.80000000,23.60000000,NULL,'facture/FA1601-0024/FA1601-0024.pdf',NULL,NULL),(150,'FA6801-0010',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:31:10','2020-01-19','2020-10-04',NULL,'2020-06-12 17:12:09',0,0.00000000,NULL,NULL,0,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,1,1,NULL,12,NULL,NULL,NULL,NULL,NULL,0,1,'2020-01-19',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,5.00000000,0.63000000,5.63000000,NULL,'facture/FA6801-0010/FA6801-0010.pdf',NULL,NULL),(151,'FS1301-0002',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:31:58','2020-01-19','2020-01-19',NULL,'2020-06-12 17:12:09',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,1,'2020-01-19',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(160,'FA1507-0015',1,NULL,NULL,0,NULL,NULL,12,'2015-03-06 16:47:48','2019-07-18','2018-03-06',NULL,'2020-06-12 17:12:09',0,0.00000000,NULL,NULL,0,NULL,NULL,1.11000000,0.00000000,0.00000000,0.00000000,8.89000000,10.00000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2019-07-18',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(210,'FA1107-0019',1,NULL,NULL,0,NULL,NULL,10,'2015-03-20 14:30:11','2019-07-10','2020-03-20',NULL,'2020-06-12 17:12:09',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2019-07-10',NULL,NULL,'generic_invoice_odt:/home/ldestailleur/git/dolibarr_3.8/documents/doctemplates/invoices/template_invoice.odt',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(211,'FA1303-0020',1,NULL,NULL,0,NULL,NULL,19,'2015-03-22 09:40:10','2020-03-22','2019-03-02',NULL,'2020-06-12 17:12:09',0,0.00000000,NULL,NULL,0,NULL,NULL,17.64000000,0.00000000,0.00000000,0.40000000,340.00000000,358.04000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,3,'2020-03-22',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(213,'AV1303-0003',1,NULL,NULL,2,NULL,NULL,1,'2016-03-03 19:22:03','2020-03-03','2019-03-03',NULL,'2020-06-12 17:12:09',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,-1000.00000000,-1000.00000000,1,1,NULL,1,NULL,32,NULL,NULL,NULL,0,0,'2020-03-03',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(216,'(PROV216)',1,NULL,NULL,0,NULL,NULL,26,'2017-02-12 23:21:27','2020-02-12',NULL,NULL,'2020-06-12 17:12:08',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2020-02-12',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,0,'',NULL,0,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(217,'(PROV217)',1,NULL,NULL,0,NULL,NULL,1,'2017-08-31 13:26:17','2019-08-31',NULL,NULL,'2020-06-12 17:12:08',0,0.00000000,NULL,NULL,0,NULL,NULL,1.13000000,0.00000000,0.00000000,0.00000000,21.00000000,22.13000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2019-08-31',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,21.00000000,1.13000000,22.13000000,NULL,'facture/(PROV217)/(PROV217).pdf',NULL,NULL),(218,'FA1909-0025',1,NULL,NULL,0,NULL,NULL,12,'2019-09-26 17:30:14','2019-09-26','2019-09-26',NULL,'2019-09-26 15:33:37',0,0.00000000,NULL,NULL,0,NULL,NULL,1.08000000,0.00000000,0.00000000,0.00000000,42.50000000,43.58000000,1,12,NULL,12,NULL,NULL,NULL,NULL,NULL,0,0,'2019-09-26',NULL,NULL,'',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,0,'',NULL,0,'EUR',1.00000000,42.50000000,1.08000000,43.58000000,NULL,NULL,'takepos','1'),(219,'(PROV-POS1-0)',1,NULL,NULL,0,NULL,NULL,1,'2019-11-28 19:04:03','2019-11-28',NULL,NULL,'2020-01-21 09:21:32',0,0.00000000,NULL,NULL,0,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,5.00000000,6.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,'2019-11-28',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,0,'EUR',1.00000000,5.00000000,1.00000000,6.00000000,NULL,NULL,'takepos','1'),(220,'(PROV220)',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:03:17','2020-01-16',NULL,NULL,'2020-01-16 01:03:17',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,100.00000000,100.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2020-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,1,'EUR',1.00000000,100.00000000,0.00000000,100.00000000,NULL,NULL,NULL,NULL),(221,'AC2001-0001',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:21:05','2020-01-16','2020-01-16',NULL,'2020-01-16 01:22:24',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,123.00000000,123.00000000,0,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2020-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,1,'EUR',1.00000000,123.00000000,0.00000000,123.00000000,NULL,'facture/AC2001-0001/AC2001-0001.pdf',NULL,NULL),(222,'(PROV222)',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:21:28','2020-01-16',NULL,NULL,'2020-01-16 01:21:28',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,100.00000000,100.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2020-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,1,'EUR',1.00000000,100.00000000,0.00000000,100.00000000,NULL,NULL,NULL,NULL),(223,'(PROV223)',1,NULL,NULL,0,NULL,NULL,19,'2020-01-16 02:32:04','2020-01-16',NULL,NULL,'2020-01-16 01:32:04',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,410.00000000,410.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,0,'2020-02-15',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,1,'EUR',1.00000000,410.00000000,0.00000000,410.00000000,NULL,NULL,NULL,NULL),(224,'AC2001-0002',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:33:19','2020-01-16','2020-01-16','2020-01-16 02:36:48','2020-01-16 01:36:48',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,20.50000000,20.50000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2020-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,1,'EUR',1.00000000,20.50000000,0.00000000,20.50000000,NULL,'facture/AC2001-0002/AC2001-0002.pdf',NULL,NULL),(225,'(PROV225)',1,NULL,NULL,0,NULL,NULL,19,'2020-01-16 02:37:48','2020-01-16',NULL,NULL,'2020-01-16 01:37:55',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,389.50000000,389.50000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,0,'2020-02-15',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,1,'EUR',1.00000000,389.50000000,0.00000000,389.50000000,NULL,'facture/(PROV225)/(PROV225).pdf',NULL,NULL),(226,'(PROV226)',1,NULL,NULL,3,NULL,NULL,11,'2020-01-19 14:20:54','2020-01-19',NULL,NULL,'2020-01-19 13:21:21',0,0.00000000,NULL,NULL,0,NULL,NULL,12.50000000,0.00000000,0.00000000,0.00000000,120.00000000,132.50000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2020-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,1,'EUR',1.00000000,120.00000000,12.50000000,132.50000000,NULL,'facture/(PROV226)/(PROV226).pdf',NULL,NULL),(227,'AC2001-0003',1,NULL,NULL,3,NULL,NULL,1,'2020-01-19 14:22:54','2020-01-19','2020-01-19',NULL,'2020-01-19 13:51:48',0,0.00000000,NULL,NULL,0,NULL,NULL,39.20000000,0.00000000,0.00000000,0.00000000,200.00000000,239.20000000,0,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2020-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,1,'EUR',1.00000000,200.00000000,39.20000000,239.20000000,NULL,'facture/AC2001-0003/AC2001-0003.pdf',NULL,NULL),(228,'AC2001-0004',1,NULL,NULL,3,NULL,NULL,1,'2020-01-19 14:24:49','2020-01-19','2020-01-19',NULL,'2020-01-19 14:13:07',0,0.00000000,NULL,NULL,0,NULL,NULL,1.94000000,0.00000000,0.00000000,0.00000000,48.60000000,50.54000000,1,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2020-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,1,'EUR',1.00000000,48.60000000,1.94000000,50.54000000,NULL,'facture/AC2001-0004/AC2001-0004.pdf',NULL,NULL),(229,'FA1707-0026',1,NULL,NULL,0,NULL,NULL,12,'2020-01-21 10:23:17','2019-07-18','2022-01-21','2020-01-21 10:23:17','2020-06-12 17:12:08',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2019-07-18',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,NULL,'facture/FA1707-0026/FA1707-0026.pdf',NULL,NULL),(230,'FA1807-0027',1,NULL,NULL,0,NULL,NULL,12,'2020-01-21 10:23:28','2019-07-18','2021-01-21','2020-01-21 10:23:28','2020-06-12 17:12:09',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2019-07-18',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,NULL,'facture/FA1807-0027/FA1807-0027.pdf',NULL,NULL),(231,'FA1907-0028',1,NULL,NULL,0,NULL,NULL,12,'2020-01-21 10:23:49','2019-07-18','2020-01-21','2020-01-21 10:23:49','2020-01-21 09:23:49',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2019-07-18',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,NULL,'facture/FA1907-0028/FA1907-0028.pdf',NULL,NULL);
+INSERT INTO `llx_facture` VALUES (2,'FA1007-0002',1,NULL,NULL,0,NULL,NULL,2,'2012-07-10 18:20:13','2020-07-10',NULL,NULL,'2020-12-10 12:24:22',1,10.00000000,NULL,NULL,0,NULL,NULL,0.10000000,0.00000000,0.00000000,0.00000000,46.00000000,46.10000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-07-10',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(3,'FA1107-0006',1,NULL,NULL,0,NULL,NULL,10,'2013-07-18 20:33:35','2020-07-18',NULL,NULL,'2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,15.00000000,15.00000000,2,1,NULL,1,NULL,NULL,1,NULL,NULL,1,0,'2020-07-18',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(5,'FA1108-0003',1,NULL,NULL,0,NULL,NULL,7,'2013-08-01 03:34:11','2020-08-01',NULL,NULL,'2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,6,'2020-08-01',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(6,'FA1108-0004',1,NULL,NULL,0,NULL,NULL,7,'2013-08-06 20:33:53','2020-08-06',NULL,NULL,'2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.98000000,0.00000000,0.00000000,0.00000000,5.00000000,5.98000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,4,'2020-08-06','Cash\nReceived : 6 EUR\nRendu : 0.02 EUR\n\n--------------------------------------',NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(8,'FA1108-0005',1,NULL,NULL,3,NULL,NULL,2,'2013-08-08 02:41:44','2020-08-08',NULL,NULL,'2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-08-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(9,'FA1108-0007',1,NULL,NULL,3,NULL,NULL,10,'2013-08-08 02:55:14','2020-08-08',NULL,NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,1.96000000,0.00000000,0.00000000,0.00000000,10.00000000,11.96000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-08-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(10,'AV1212-0001',1,NULL,NULL,2,NULL,NULL,10,'2014-12-08 17:45:20','2020-12-08','2020-12-08',NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,-0.63000000,0.00000000,0.00000000,0.00000000,-11.00000000,-11.63000000,1,1,NULL,1,NULL,3,NULL,NULL,NULL,0,0,'2020-12-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(12,'AV1212-0002',1,NULL,NULL,2,NULL,NULL,10,'2014-12-08 18:20:14','2020-12-08','2020-12-08',NULL,'2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,-5.00000000,-5.00000000,2,1,NULL,1,NULL,3,NULL,NULL,NULL,0,0,'2020-12-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(13,'FA1212-0011',1,NULL,NULL,0,NULL,NULL,7,'2014-12-09 20:04:19','2020-12-09','2020-02-12',NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,2.74000000,0.00000000,0.00000000,0.00000000,14.00000000,16.74000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-12-09',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(32,'FA1212-0021',1,NULL,NULL,0,NULL,NULL,1,'2014-12-11 09:34:23','2019-12-11','2020-03-24',NULL,'2020-06-12 17:12:08',0,0.00000000,NULL,NULL,0,NULL,NULL,90.00000000,0.00000000,0.00000000,0.60000000,520.00000000,610.60000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2019-12-11','This is a comment (private)','This is a comment (public)','crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(33,'FA1212-0023',1,NULL,NULL,0,NULL,NULL,1,'2014-12-11 09:34:23','2019-12-11','2020-03-03',NULL,'2020-06-12 17:12:08',0,0.00000000,NULL,NULL,0,'abandon',NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,3,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2019-12-11','This is a comment (private)','This is a comment (public)','crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(55,'FA1212-0009',1,NULL,NULL,0,NULL,NULL,1,'2014-12-11 09:35:51','2019-12-11','2019-12-12',NULL,'2020-06-12 17:12:08',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2019-12-11','This is a comment (private)','This is a comment (public)','generic_invoice_odt:/home/ldestailleur/git/dolibarr_3.8/documents/doctemplates/invoices/template_invoice.odt',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(148,'FS1301-0001',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:22:48','2020-01-19','2020-01-19',NULL,'2020-06-12 17:12:09',0,0.00000000,NULL,NULL,0,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,1,'2020-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,'facture/FS1301-0001/FS1301-0001.pdf',NULL,NULL),(149,'FA1601-0024',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:30:05','2020-01-19','2019-08-29','2020-01-02 20:49:34','2020-06-12 17:12:09',0,0.00000000,NULL,NULL,0,'other','test',1.80000000,0.90000000,0.90000000,0.00000000,20.00000000,23.60000000,2,1,NULL,12,12,NULL,NULL,NULL,NULL,0,0,'2020-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,20.00000000,1.80000000,23.60000000,NULL,'facture/FA1601-0024/FA1601-0024.pdf',NULL,NULL),(150,'FA6801-0010',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:31:10','2020-01-19','2020-10-04',NULL,'2020-06-12 17:12:09',0,0.00000000,NULL,NULL,0,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,1,1,NULL,12,NULL,NULL,NULL,NULL,NULL,0,1,'2020-01-19',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,5.00000000,0.63000000,5.63000000,NULL,'facture/FA6801-0010/FA6801-0010.pdf',NULL,NULL),(151,'FS1301-0002',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:31:58','2020-01-19','2020-01-19',NULL,'2020-06-12 17:12:09',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,1,'2020-01-19',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(160,'FA1507-0015',1,NULL,NULL,0,NULL,NULL,12,'2015-03-06 16:47:48','2020-07-18','2019-03-06',NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,1.11000000,0.00000000,0.00000000,0.00000000,8.89000000,10.00000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-07-18',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(210,'FA1107-0019',1,NULL,NULL,0,NULL,NULL,10,'2015-03-20 14:30:11','2020-07-10','2020-03-20',NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-07-10',NULL,NULL,'generic_invoice_odt:/home/ldestailleur/git/dolibarr_3.8/documents/doctemplates/invoices/template_invoice.odt',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(211,'FA1303-0020',1,NULL,NULL,0,NULL,NULL,19,'2015-03-22 09:40:10','2020-03-22','2019-03-02',NULL,'2020-06-12 17:12:09',0,0.00000000,NULL,NULL,0,NULL,NULL,17.64000000,0.00000000,0.00000000,0.40000000,340.00000000,358.04000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,3,'2020-03-22',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(213,'AV1303-0003',1,NULL,NULL,2,NULL,NULL,1,'2016-03-03 19:22:03','2020-03-03','2019-03-03',NULL,'2020-06-12 17:12:09',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,-1000.00000000,-1000.00000000,1,1,NULL,1,NULL,32,NULL,NULL,NULL,0,0,'2020-03-03',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(216,'(PROV216)',1,NULL,NULL,0,NULL,NULL,26,'2017-02-12 23:21:27','2020-02-12',NULL,NULL,'2020-06-12 17:12:08',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2020-02-12',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,0,'',NULL,NULL,0,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(217,'(PROV217)',1,NULL,NULL,0,NULL,NULL,1,'2017-08-31 13:26:17','2020-08-31',NULL,NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,1.13000000,0.00000000,0.00000000,0.00000000,21.00000000,22.13000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2020-08-31',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,0,'',NULL,NULL,1,'EUR',1.00000000,21.00000000,1.13000000,22.13000000,NULL,'facture/(PROV217)/(PROV217).pdf',NULL,NULL),(218,'FA1909-0025',1,NULL,NULL,0,NULL,NULL,12,'2019-09-26 17:30:14','2020-09-26','2020-09-26',NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,1.08000000,0.00000000,0.00000000,0.00000000,42.50000000,43.58000000,1,12,NULL,12,NULL,NULL,NULL,NULL,NULL,0,0,'2020-09-26',NULL,NULL,'',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,0,'',NULL,NULL,0,'EUR',1.00000000,42.50000000,1.08000000,43.58000000,NULL,NULL,'takepos','1'),(219,'(PROV-POS1-0)',1,NULL,NULL,0,NULL,NULL,1,'2019-11-28 19:04:03','2020-11-28',NULL,NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,5.00000000,6.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,'2020-11-28',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'EUR',1.00000000,5.00000000,1.00000000,6.00000000,NULL,NULL,'takepos','1'),(220,'(PROV220)',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:03:17','2020-01-16',NULL,NULL,'2020-01-16 01:03:17',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,100.00000000,100.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2020-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,100.00000000,0.00000000,100.00000000,NULL,NULL,NULL,NULL),(221,'AC2001-0001',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:21:05','2020-01-16','2020-01-16',NULL,'2020-01-16 01:22:24',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,123.00000000,123.00000000,0,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2020-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,123.00000000,0.00000000,123.00000000,NULL,'facture/AC2001-0001/AC2001-0001.pdf',NULL,NULL),(222,'(PROV222)',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:21:28','2020-01-16',NULL,NULL,'2020-01-16 01:21:28',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,100.00000000,100.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2020-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,100.00000000,0.00000000,100.00000000,NULL,NULL,NULL,NULL),(223,'(PROV223)',1,NULL,NULL,0,NULL,NULL,19,'2020-01-16 02:32:04','2020-01-16',NULL,NULL,'2020-01-16 01:32:04',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,410.00000000,410.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,0,'2020-02-15',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,410.00000000,0.00000000,410.00000000,NULL,NULL,NULL,NULL),(224,'AC2001-0002',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:33:19','2020-01-16','2020-01-16','2020-01-16 02:36:48','2020-01-16 01:36:48',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,20.50000000,20.50000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2020-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,20.50000000,0.00000000,20.50000000,NULL,'facture/AC2001-0002/AC2001-0002.pdf',NULL,NULL),(225,'(PROV225)',1,NULL,NULL,0,NULL,NULL,19,'2020-01-16 02:37:48','2020-01-16',NULL,NULL,'2020-01-16 01:37:55',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,389.50000000,389.50000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,0,'2020-02-15',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,389.50000000,0.00000000,389.50000000,NULL,'facture/(PROV225)/(PROV225).pdf',NULL,NULL),(226,'(PROV226)',1,NULL,NULL,3,NULL,NULL,11,'2020-01-19 14:20:54','2020-01-19',NULL,NULL,'2020-01-19 13:21:21',0,0.00000000,NULL,NULL,0,NULL,NULL,12.50000000,0.00000000,0.00000000,0.00000000,120.00000000,132.50000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2020-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,120.00000000,12.50000000,132.50000000,NULL,'facture/(PROV226)/(PROV226).pdf',NULL,NULL),(227,'AC2001-0003',1,NULL,NULL,3,NULL,NULL,1,'2020-01-19 14:22:54','2020-01-19','2020-01-19',NULL,'2020-01-19 13:51:48',0,0.00000000,NULL,NULL,0,NULL,NULL,39.20000000,0.00000000,0.00000000,0.00000000,200.00000000,239.20000000,0,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2020-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,200.00000000,39.20000000,239.20000000,NULL,'facture/AC2001-0003/AC2001-0003.pdf',NULL,NULL),(228,'AC2001-0004',1,NULL,NULL,3,NULL,NULL,1,'2020-01-19 14:24:49','2020-01-19','2020-01-19',NULL,'2020-01-19 14:13:07',0,0.00000000,NULL,NULL,0,NULL,NULL,1.94000000,0.00000000,0.00000000,0.00000000,48.60000000,50.54000000,1,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2020-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,48.60000000,1.94000000,50.54000000,NULL,'facture/AC2001-0004/AC2001-0004.pdf',NULL,NULL),(229,'FA1707-0026',1,NULL,NULL,0,NULL,NULL,12,'2020-01-21 10:23:17','2020-07-18','2022-01-21','2020-01-21 10:23:17','2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2020-07-18',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,NULL,'facture/FA1707-0026/FA1707-0026.pdf',NULL,NULL),(230,'FA1807-0027',1,NULL,NULL,0,NULL,NULL,12,'2020-01-21 10:23:28','2020-07-18','2021-01-21','2020-01-21 10:23:28','2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2020-07-18',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,NULL,'facture/FA1807-0027/FA1807-0027.pdf',NULL,NULL),(231,'FA1907-0028',1,NULL,NULL,0,NULL,NULL,12,'2020-01-21 10:23:49','2020-07-18','2020-01-21','2020-01-21 10:23:49','2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2020-07-18',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,NULL,'facture/FA1907-0028/FA1907-0028.pdf',NULL,NULL);
 /*!40000 ALTER TABLE `llx_facture` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -6442,6 +7603,7 @@ CREATE TABLE `llx_facture_fourn` (
   `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `fk_incoterms` int(11) DEFAULT NULL,
   `location_incoterms` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_transport_mode` int(11) DEFAULT NULL,
   `fk_multicurrency` int(11) DEFAULT NULL,
   `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `multicurrency_tx` double(24,8) DEFAULT 1.00000000,
@@ -6472,7 +7634,7 @@ CREATE TABLE `llx_facture_fourn` (
 
 LOCK TABLES `llx_facture_fourn` WRITE;
 /*!40000 ALTER TABLE `llx_facture_fourn` DISABLE KEYS */;
-INSERT INTO `llx_facture_fourn` VALUES (16,'SI1601-0001','FR70813',1,NULL,0,1,'2014-12-19 15:24:11','2003-04-11','2017-02-06 04:08:22','OVH FR70813',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,829.00000000,162.48000000,991.48000000,1,1,NULL,12,NULL,NULL,NULL,1,NULL,'2003-04-11','','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(17,'SI1601-0002','FR81385',1,NULL,0,1,'2015-02-13 17:19:35','2003-06-04','2019-10-04 08:31:30','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,1,1,NULL,12,NULL,NULL,NULL,1,NULL,'2003-06-04','','','canelle',NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,'2019-10-04'),(18,'SI1601-0003','FR81385',1,NULL,0,2,'2015-02-13 17:20:25','2003-06-04','2017-02-06 04:08:35','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,0,1,NULL,NULL,NULL,NULL,NULL,1,NULL,'2003-06-04','','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(19,'SI1601-0004','FR813852',1,NULL,0,2,'2015-03-16 17:59:02','2015-03-16','2017-02-06 04:08:38','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,0,1,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,'','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(20,'SI1702-0001','INV-AE56ER08',1,NULL,0,13,'2017-02-01 19:00:31','2017-02-01','2017-02-01 15:05:28','',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,200.00000000,39.20000000,239.20000000,1,12,NULL,12,NULL,5,NULL,1,0,'2017-02-01','The customer has called us the 24th april. He agree us to not pay the remain of invoice due to default.<br />\r\nLet\'s see with our book keeper, if we must cancel invoice or ask the supplier a credit note...',NULL,'canelle',NULL,NULL,0,'',0,'EUR',1.00000000,200.00000000,39.20000000,239.20000000,NULL,NULL,NULL),(21,'SI1911-0005','NL-123',1,NULL,0,10,'2019-11-28 15:54:30','2019-11-28','2019-11-28 11:54:46','',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,450.00000000,0.00000000,450.00000000,1,12,NULL,12,NULL,NULL,NULL,1,NULL,'2019-11-28','','',NULL,NULL,NULL,0,'',1,'EUR',1.00000000,450.00000000,0.00000000,450.00000000,NULL,NULL,'2019-11-28'),(22,'SI2001-0006','INV20200101',1,NULL,0,17,'2020-01-01 17:48:01','2020-01-01','2020-01-16 17:05:43','',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,357.00000000,43.75000000,400.75000000,1,12,NULL,12,NULL,NULL,1,1,2,'2020-01-01','','',NULL,NULL,NULL,0,'',1,'EUR',1.00000000,357.00000000,43.75000000,400.75000000,NULL,NULL,'2020-01-16'),(27,'SA2001-0001','CN01',1,NULL,2,17,'2020-01-01 20:21:51','2020-01-01','2020-01-15 18:20:50','',1,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,-350.00000000,-43.75000000,-393.75000000,2,12,12,12,22,NULL,NULL,1,NULL,NULL,'','ddd',NULL,NULL,NULL,0,'',1,'EUR',1.00000000,350.00000000,43.75000000,393.75000000,NULL,NULL,'2020-01-01'),(28,'SI2001-0007','INV02',1,NULL,0,17,'2020-01-01 20:22:48','2020-01-01','2020-01-01 18:06:02','',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,79.17000000,9.89000000,89.06000000,1,12,NULL,12,NULL,NULL,NULL,1,NULL,'2020-01-01','','',NULL,NULL,NULL,0,'',1,'EUR',1.00000000,79.17000000,9.89000000,89.06000000,NULL,NULL,'2020-01-01'),(30,'SA2001-0002','555',1,NULL,2,1,'2020-01-01 20:51:32','2020-01-01','2020-01-01 17:15:57','',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,-26.00000000,-5.10000000,-31.10000000,1,12,NULL,12,17,NULL,NULL,1,NULL,NULL,'','',NULL,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,'2020-01-01');
+INSERT INTO `llx_facture_fourn` VALUES (16,'SI1601-0001','FR70813',1,NULL,0,1,'2014-12-19 15:24:11','2003-04-11','2017-02-06 04:08:22','OVH FR70813',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,829.00000000,162.48000000,991.48000000,1,1,NULL,12,NULL,NULL,NULL,1,NULL,'2003-04-11','','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(17,'SI1601-0002','FR81385',1,NULL,0,1,'2015-02-13 17:19:35','2003-06-04','2019-10-04 08:31:30','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,1,1,NULL,12,NULL,NULL,NULL,1,NULL,'2003-06-04','','','canelle',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,'2019-10-04'),(18,'SI1601-0003','FR81385',1,NULL,0,2,'2015-02-13 17:20:25','2003-06-04','2017-02-06 04:08:35','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,0,1,NULL,NULL,NULL,NULL,NULL,1,NULL,'2003-06-04','','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(19,'SI1601-0004','FR813852',1,NULL,0,2,'2015-03-16 17:59:02','2015-03-16','2017-02-06 04:08:38','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,0,1,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,'','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(20,'SI1702-0001','INV-AE56ER08',1,NULL,0,13,'2017-02-01 19:00:31','2017-02-01','2017-02-01 15:05:28','',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,200.00000000,39.20000000,239.20000000,1,12,NULL,12,NULL,5,NULL,1,0,'2017-02-01','The customer has called us the 24th april. He agree us to not pay the remain of invoice due to default.<br />\r\nLet\'s see with our book keeper, if we must cancel invoice or ask the supplier a credit note...',NULL,'canelle',NULL,NULL,0,'',NULL,0,'EUR',1.00000000,200.00000000,39.20000000,239.20000000,NULL,NULL,NULL),(21,'SI1911-0005','NL-123',1,NULL,0,10,'2019-11-28 15:54:30','2019-11-28','2019-11-28 11:54:46','',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,450.00000000,0.00000000,450.00000000,1,12,NULL,12,NULL,NULL,NULL,1,NULL,'2019-11-28','','',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,450.00000000,0.00000000,450.00000000,NULL,NULL,'2019-11-28'),(22,'SI2001-0006','INV20200101',1,NULL,0,17,'2020-01-01 17:48:01','2020-01-01','2020-01-16 17:05:43','',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,357.00000000,43.75000000,400.75000000,1,12,NULL,12,NULL,NULL,1,1,2,'2020-01-01','','',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,357.00000000,43.75000000,400.75000000,NULL,NULL,'2020-01-16'),(27,'SA2001-0001','CN01',1,NULL,2,17,'2020-01-01 20:21:51','2020-01-01','2020-01-15 18:20:50','',1,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,-350.00000000,-43.75000000,-393.75000000,2,12,12,12,22,NULL,NULL,1,NULL,NULL,'','ddd',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,350.00000000,43.75000000,393.75000000,NULL,NULL,'2020-01-01'),(28,'SI2001-0007','INV02',1,NULL,0,17,'2020-01-01 20:22:48','2020-01-01','2020-01-01 18:06:02','',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,79.17000000,9.89000000,89.06000000,1,12,NULL,12,NULL,NULL,NULL,1,NULL,'2020-01-01','','',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,79.17000000,9.89000000,89.06000000,NULL,NULL,'2020-01-01'),(30,'SA2001-0002','555',1,NULL,2,1,'2020-01-01 20:51:32','2020-01-01','2020-01-01 17:15:57','',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,-26.00000000,-5.10000000,-31.10000000,1,12,NULL,12,17,NULL,NULL,1,NULL,NULL,'','',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,'2020-01-01');
 /*!40000 ALTER TABLE `llx_facture_fourn` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -6745,6 +7907,7 @@ CREATE TABLE `llx_facturedet` (
   `multicurrency_total_ht` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_tva` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_ttc` double(24,8) DEFAULT 0.00000000,
+  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_fk_remise_except` (`fk_remise_except`,`fk_facture`),
   KEY `idx_facturedet_fk_facture` (`fk_facture`),
@@ -6762,7 +7925,7 @@ CREATE TABLE `llx_facturedet` (
 
 LOCK TABLES `llx_facturedet` WRITE;
 /*!40000 ALTER TABLE `llx_facturedet` DISABLE KEYS */;
-INSERT INTO `llx_facturedet` VALUES (3,2,NULL,3,NULL,'Service S1',0.000,'',0.000,'',0.000,'',1,10,4,NULL,40.00000000,36.00000000,36.00000000,0.00000000,0.00000000,0.00000000,36.00000000,1,'2012-07-10 00:00:00',NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(4,2,NULL,NULL,NULL,'Abonnement annuel assurance',1.000,'',0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,0.10000000,0.00000000,0.00000000,10.10000000,0,'2012-07-10 00:00:00','2013-07-10 00:00:00',0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(11,3,NULL,4,NULL,'afsdfsdfsdfsdf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,5.00000000,0.00000000,0.00000000,0.00000000,5.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(12,3,NULL,NULL,NULL,'dfdfd',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(13,5,NULL,4,NULL,'Decapsuleur',12.500,'',0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(14,6,NULL,4,NULL,'Decapsuleur',19.600,'',0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,5.00000000,0.98000000,0.00000000,0.00000000,5.98000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(21,8,NULL,NULL,NULL,'dddd',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(22,9,NULL,NULL,NULL,'ggg',19.600,'',0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(23,10,NULL,4,NULL,'',12.500,'',0.000,'',0.000,'',1,0,0,NULL,-5.00000000,NULL,-5.00000000,-0.63000000,0.00000000,0.00000000,-5.63000000,0,NULL,NULL,0,NULL,12.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(24,10,NULL,1,NULL,'A beatifull pink dress\r\nlkm',0.000,'',0.000,'',0.000,'',1,0,0,NULL,-6.00000000,NULL,-6.00000000,0.00000000,0.00000000,0.00000000,-6.00000000,0,NULL,NULL,0,0,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(26,12,NULL,1,NULL,'A beatifull pink dress\r\nhfghf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,-5.00000000,NULL,-5.00000000,0.00000000,0.00000000,0.00000000,-5.00000000,0,NULL,NULL,0,0,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(27,13,NULL,NULL,NULL,'gdfgdf',19.600,'',0.000,'',0.000,'',1.4,0,0,NULL,10.00000000,NULL,14.00000000,2.74000000,0.00000000,0.00000000,16.74000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(137,33,NULL,NULL,NULL,'Desc',10.000,'',0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(138,33,NULL,NULL,NULL,'Desc',10.000,'',0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(256,55,NULL,NULL,NULL,'Desc',10.000,'',0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(257,55,NULL,NULL,NULL,'Desc',10.000,'',0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(753,13,NULL,2,NULL,'(Pays d\'origine: Albanie)',0.000,'',0.000,'',0.000,'',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,0,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(754,148,NULL,11,NULL,'hfghf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(755,148,NULL,4,NULL,'Decapsuleur',12.500,'',0.000,'',0.000,'',1,0,0,NULL,5.00000000,NULL,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(757,150,NULL,2,NULL,'Product P1',12.500,'',0.000,'0',0.000,'0',1,0,0,NULL,5.00000000,NULL,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,NULL,NULL,NULL,5.00000000,5.00000000,0.63000000,5.63000000),(758,151,NULL,2,NULL,'Product P1',12.500,'',0.000,'',0.000,'',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(768,32,NULL,NULL,NULL,'mlml',18.000,'',0.000,'',0.000,'',1,0,0,NULL,100.00000000,NULL,100.00000000,18.00000000,0.00000000,0.00000000,118.00000000,0,NULL,NULL,0,NULL,46.00000000,0,0,3,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(769,32,NULL,NULL,NULL,'mlkml',18.000,'',0.000,'',0.000,'',1,0,0,NULL,400.00000000,NULL,400.00000000,72.00000000,0.00000000,0.00000000,472.00000000,0,NULL,NULL,0,NULL,300.00000000,0,0,4,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(772,160,NULL,NULL,NULL,'Adhésion/cotisation 2015',12.500,'',0.000,'',0.000,'',1,0,0,NULL,8.88889000,NULL,8.89000000,1.11000000,0.00000000,0.00000000,10.00000000,1,'2017-07-18 00:00:00','2018-07-17 00:00:00',0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(776,32,NULL,NULL,NULL,'fsdfsdfds',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,5,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(777,32,NULL,NULL,NULL,'fsdfsdfds',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,6,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(779,32,NULL,NULL,NULL,'fsdfds',0.000,'',0.000,'0',0.000,'0',0,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,9,NULL,NULL,0,0,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(780,32,NULL,NULL,NULL,'ffsdf',0.000,'',0.000,'0',0.000,'0',0,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,9,NULL,NULL,0,NULL,0.00000000,0,1790,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(1022,210,NULL,NULL,NULL,'Adhésion/cotisation 2011',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,1,'2013-07-10 00:00:00','2014-07-09 00:00:00',0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(1023,211,NULL,NULL,NULL,'Samsung Android x4',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,250.00000000,NULL,250.00000000,0.00000000,0.00000000,0.00000000,250.00000000,0,NULL,NULL,0,NULL,200.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(1024,211,NULL,1,NULL,'A beatifull pink dress\r\nSize XXL',19.600,'',0.000,'0',0.000,'0',1,10,0,NULL,100.00000000,NULL,90.00000000,17.64000000,0.00000000,0.00000000,107.64000000,0,NULL,NULL,0,NULL,90.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(1026,213,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',10,0,0,NULL,-100.00000000,NULL,-1000.00000000,0.00000000,0.00000000,0.00000000,-1000.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(1028,149,NULL,NULL,NULL,'opoo',0.000,'CGST+SGST',9.000,'1',9.000,'1',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.90000000,0.90000000,11.80000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,0,'',10.00000000,10.00000000,0.00000000,11.80000000),(1029,149,NULL,NULL,NULL,'gdgd',18.000,'IGST',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,1.80000000,0.00000000,0.00000000,11.80000000,0,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,12,12,0,'',10.00000000,10.00000000,1.80000000,11.80000000),(1030,217,NULL,NULL,NULL,'gfdgdf',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,12.00000000,NULL,12.00000000,0.00000000,0.00000000,0.00000000,12.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',12.00000000,12.00000000,0.00000000,12.00000000),(1035,218,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9.00000000,NULL,9.00000000,0.00000000,0.00000000,0.00000000,9.00000000,1,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',9.00000000,9.00000000,0.00000000,9.00000000),(1036,218,NULL,5,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',19.600,'',0.000,'0',0.000,'0',1,45,0,NULL,10.00000000,NULL,5.50000000,1.08000000,0.00000000,0.00000000,6.58000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',10.00000000,5.50000000,1.08000000,6.58000000),(1037,218,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9.00000000,NULL,9.00000000,0.00000000,0.00000000,0.00000000,9.00000000,1,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',9.00000000,9.00000000,0.00000000,9.00000000),(1039,218,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9.00000000,NULL,9.00000000,0.00000000,0.00000000,0.00000000,9.00000000,1,NULL,NULL,0,NULL,0.00000000,0,0,4,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',9.00000000,9.00000000,0.00000000,9.00000000),(1040,218,NULL,NULL,NULL,'aaa',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,5,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',10.00000000,10.00000000,0.00000000,10.00000000),(1055,220,NULL,NULL,NULL,'(DEPOSIT) (100.00 €) - CO7001-0018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100.00000000,NULL,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,100.00000000,0.00000000,100.00000000),(1056,221,NULL,NULL,NULL,'(DEPOSIT) (30%) - CO7001-0018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,123.00000000,NULL,123.00000000,0.00000000,0.00000000,0.00000000,123.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',123.00000000,123.00000000,0.00000000,123.00000000),(1057,222,NULL,NULL,NULL,'(DEPOSIT) (100.00 €) - CO7001-0018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100.00000000,NULL,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,100.00000000,0.00000000,100.00000000),(1058,223,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(1059,223,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100.00000000,NULL,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(1060,223,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100.00000000,NULL,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(1061,224,NULL,NULL,NULL,'(DEPOSIT) (5%) - CO7001-0018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,20.50000000,NULL,20.50000000,0.00000000,0.00000000,0.00000000,20.50000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',20.50000000,20.50000000,0.00000000,20.50000000),(1062,225,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(1063,225,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100.00000000,NULL,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(1064,225,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100.00000000,NULL,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(1065,225,NULL,NULL,NULL,'(DEPOSIT)',0.000,'',0.000,'0',0.000,'0',1,0,0,15,-20.50000000,NULL,-20.50000000,0.00000000,0.00000000,0.00000000,-20.50000000,0,NULL,NULL,2,NULL,0.00000000,0,0,-1,NULL,NULL,100,NULL,NULL,12,12,0,'',-20.50000000,-20.50000000,0.00000000,-20.50000000),(1066,226,NULL,NULL,NULL,'aaa',12.500,'',0.000,'0',0.000,'0',1,0,0,NULL,100.00000000,NULL,100.00000000,12.50000000,0.00000000,0.00000000,112.50000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,100.00000000,12.50000000,112.50000000),(1067,226,NULL,NULL,NULL,'bbb',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,20.00000000,NULL,20.00000000,0.00000000,0.00000000,0.00000000,20.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',20.00000000,20.00000000,0.00000000,20.00000000),(1069,228,NULL,NULL,NULL,'(DEPOSIT) (70%) - PR2001-0034',4.000,'',0.000,'0',0.000,'0',1,0,0,NULL,50.00000000,NULL,50.00000000,2.00000000,0.00000000,0.00000000,52.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',50.00000000,50.00000000,2.00000000,52.00000000),(1070,228,NULL,NULL,NULL,'(DEPOSIT) (70%) - PR2001-0034',4.000,'',0.000,'0',0.000,'0',1,0,0,NULL,-1.40000000,NULL,-1.40000000,-0.06000000,0.00000000,0.00000000,-1.46000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',-1.40000000,-1.40000000,-0.06000000,-1.46000000),(1071,227,NULL,NULL,NULL,'gdfgd',19.600,'',0.000,'0',0.000,'0',1,0,0,NULL,200.00000000,NULL,200.00000000,39.20000000,0.00000000,0.00000000,239.20000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',200.00000000,200.00000000,39.20000000,239.20000000),(1072,217,NULL,1,NULL,'A beatifull pink dress',12.500,'',0.000,'0',0.000,'0',1,0,0,NULL,9.00000000,NULL,9.00000000,1.13000000,0.00000000,0.00000000,10.13000000,0,NULL,NULL,0,NULL,79.16667000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',9.00000000,9.00000000,1.13000000,10.13000000),(1074,219,NULL,30,NULL,'',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,4.16667000,NULL,4.17000000,0.83000000,0.00000000,0.00000000,5.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,5,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',4.16667000,4.17000000,0.83000000,5.00000000),(1089,219,NULL,24,NULL,'',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0.83333000,NULL,0.83000000,0.17000000,0.00000000,0.00000000,1.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,20,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',0.83333000,0.83000000,0.17000000,1.00000000),(1090,229,NULL,NULL,NULL,'Subscription 2017',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,50.00000000,NULL,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,1,'2017-07-18 00:00:00',NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',50.00000000,50.00000000,0.00000000,50.00000000),(1091,230,NULL,NULL,NULL,'Subscription 2018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,50.00000000,NULL,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,1,'2018-07-18 00:00:00',NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',50.00000000,50.00000000,0.00000000,50.00000000),(1092,231,NULL,NULL,NULL,'Subscription 2019',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,50.00000000,NULL,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,1,'2019-07-18 00:00:00',NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',50.00000000,50.00000000,0.00000000,50.00000000);
+INSERT INTO `llx_facturedet` VALUES (3,2,NULL,3,NULL,'Service S1',0.000,'',0.000,'',0.000,'',1,10,4,NULL,40.00000000,36.00000000,36.00000000,0.00000000,0.00000000,0.00000000,36.00000000,1,'2012-07-10 00:00:00',NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(4,2,NULL,NULL,NULL,'Abonnement annuel assurance',1.000,'',0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,0.10000000,0.00000000,0.00000000,10.10000000,0,'2012-07-10 00:00:00','2013-07-10 00:00:00',0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(11,3,NULL,4,NULL,'afsdfsdfsdfsdf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,5.00000000,0.00000000,0.00000000,0.00000000,5.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(12,3,NULL,NULL,NULL,'dfdfd',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(13,5,NULL,4,NULL,'Decapsuleur',12.500,'',0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(14,6,NULL,4,NULL,'Decapsuleur',19.600,'',0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,5.00000000,0.98000000,0.00000000,0.00000000,5.98000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(21,8,NULL,NULL,NULL,'dddd',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(22,9,NULL,NULL,NULL,'ggg',19.600,'',0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(23,10,NULL,4,NULL,'',12.500,'',0.000,'',0.000,'',1,0,0,NULL,-5.00000000,NULL,-5.00000000,-0.63000000,0.00000000,0.00000000,-5.63000000,0,NULL,NULL,0,NULL,12.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(24,10,NULL,1,NULL,'A beatifull pink dress\r\nlkm',0.000,'',0.000,'',0.000,'',1,0,0,NULL,-6.00000000,NULL,-6.00000000,0.00000000,0.00000000,0.00000000,-6.00000000,0,NULL,NULL,0,0,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(26,12,NULL,1,NULL,'A beatifull pink dress\r\nhfghf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,-5.00000000,NULL,-5.00000000,0.00000000,0.00000000,0.00000000,-5.00000000,0,NULL,NULL,0,0,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(27,13,NULL,NULL,NULL,'gdfgdf',19.600,'',0.000,'',0.000,'',1.4,0,0,NULL,10.00000000,NULL,14.00000000,2.74000000,0.00000000,0.00000000,16.74000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(137,33,NULL,NULL,NULL,'Desc',10.000,'',0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(138,33,NULL,NULL,NULL,'Desc',10.000,'',0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(256,55,NULL,NULL,NULL,'Desc',10.000,'',0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(257,55,NULL,NULL,NULL,'Desc',10.000,'',0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(753,13,NULL,2,NULL,'(Pays d\'origine: Albanie)',0.000,'',0.000,'',0.000,'',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,0,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(754,148,NULL,11,NULL,'hfghf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(755,148,NULL,4,NULL,'Decapsuleur',12.500,'',0.000,'',0.000,'',1,0,0,NULL,5.00000000,NULL,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(757,150,NULL,2,NULL,'Product P1',12.500,'',0.000,'0',0.000,'0',1,0,0,NULL,5.00000000,NULL,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,NULL,NULL,NULL,5.00000000,5.00000000,0.63000000,5.63000000,NULL),(758,151,NULL,2,NULL,'Product P1',12.500,'',0.000,'',0.000,'',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(768,32,NULL,NULL,NULL,'mlml',18.000,'',0.000,'',0.000,'',1,0,0,NULL,100.00000000,NULL,100.00000000,18.00000000,0.00000000,0.00000000,118.00000000,0,NULL,NULL,0,NULL,46.00000000,0,0,3,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(769,32,NULL,NULL,NULL,'mlkml',18.000,'',0.000,'',0.000,'',1,0,0,NULL,400.00000000,NULL,400.00000000,72.00000000,0.00000000,0.00000000,472.00000000,0,NULL,NULL,0,NULL,300.00000000,0,0,4,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(772,160,NULL,NULL,NULL,'Adhésion/cotisation 2015',12.500,'',0.000,'',0.000,'',1,0,0,NULL,8.88889000,NULL,8.89000000,1.11000000,0.00000000,0.00000000,10.00000000,1,'2017-07-18 00:00:00','2018-07-17 00:00:00',0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(776,32,NULL,NULL,NULL,'fsdfsdfds',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,5,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(777,32,NULL,NULL,NULL,'fsdfsdfds',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,6,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(779,32,NULL,NULL,NULL,'fsdfds',0.000,'',0.000,'0',0.000,'0',0,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,9,NULL,NULL,0,0,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(780,32,NULL,NULL,NULL,'ffsdf',0.000,'',0.000,'0',0.000,'0',0,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,9,NULL,NULL,0,NULL,0.00000000,0,1790,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(1022,210,NULL,NULL,NULL,'Adhésion/cotisation 2011',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,1,'2013-07-10 00:00:00','2014-07-09 00:00:00',0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(1023,211,NULL,NULL,NULL,'Samsung Android x4',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,250.00000000,NULL,250.00000000,0.00000000,0.00000000,0.00000000,250.00000000,0,NULL,NULL,0,NULL,200.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(1024,211,NULL,1,NULL,'A beatifull pink dress\r\nSize XXL',19.600,'',0.000,'0',0.000,'0',1,10,0,NULL,100.00000000,NULL,90.00000000,17.64000000,0.00000000,0.00000000,107.64000000,0,NULL,NULL,0,NULL,90.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(1026,213,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',10,0,0,NULL,-100.00000000,NULL,-1000.00000000,0.00000000,0.00000000,0.00000000,-1000.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(1028,149,NULL,NULL,NULL,'opoo',0.000,'CGST+SGST',9.000,'1',9.000,'1',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.90000000,0.90000000,11.80000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,0,'',10.00000000,10.00000000,0.00000000,11.80000000,NULL),(1029,149,NULL,NULL,NULL,'gdgd',18.000,'IGST',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,1.80000000,0.00000000,0.00000000,11.80000000,0,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,12,12,0,'',10.00000000,10.00000000,1.80000000,11.80000000,NULL),(1030,217,NULL,NULL,NULL,'gfdgdf',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,12.00000000,NULL,12.00000000,0.00000000,0.00000000,0.00000000,12.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',12.00000000,12.00000000,0.00000000,12.00000000,NULL),(1035,218,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9.00000000,NULL,9.00000000,0.00000000,0.00000000,0.00000000,9.00000000,1,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',9.00000000,9.00000000,0.00000000,9.00000000,NULL),(1036,218,NULL,5,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',19.600,'',0.000,'0',0.000,'0',1,45,0,NULL,10.00000000,NULL,5.50000000,1.08000000,0.00000000,0.00000000,6.58000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',10.00000000,5.50000000,1.08000000,6.58000000,NULL),(1037,218,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9.00000000,NULL,9.00000000,0.00000000,0.00000000,0.00000000,9.00000000,1,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',9.00000000,9.00000000,0.00000000,9.00000000,NULL),(1039,218,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9.00000000,NULL,9.00000000,0.00000000,0.00000000,0.00000000,9.00000000,1,NULL,NULL,0,NULL,0.00000000,0,0,4,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',9.00000000,9.00000000,0.00000000,9.00000000,NULL),(1040,218,NULL,NULL,NULL,'aaa',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,5,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',10.00000000,10.00000000,0.00000000,10.00000000,NULL),(1055,220,NULL,NULL,NULL,'(DEPOSIT) (100.00 €) - CO7001-0018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100.00000000,NULL,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,100.00000000,0.00000000,100.00000000,NULL),(1056,221,NULL,NULL,NULL,'(DEPOSIT) (30%) - CO7001-0018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,123.00000000,NULL,123.00000000,0.00000000,0.00000000,0.00000000,123.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',123.00000000,123.00000000,0.00000000,123.00000000,NULL),(1057,222,NULL,NULL,NULL,'(DEPOSIT) (100.00 €) - CO7001-0018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100.00000000,NULL,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,100.00000000,0.00000000,100.00000000,NULL),(1058,223,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',5.00000000,10.00000000,0.00000000,10.00000000,NULL),(1059,223,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100.00000000,NULL,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,200.00000000,0.00000000,200.00000000,NULL),(1060,223,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100.00000000,NULL,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,200.00000000,0.00000000,200.00000000,NULL),(1061,224,NULL,NULL,NULL,'(DEPOSIT) (5%) - CO7001-0018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,20.50000000,NULL,20.50000000,0.00000000,0.00000000,0.00000000,20.50000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',20.50000000,20.50000000,0.00000000,20.50000000,NULL),(1062,225,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',5.00000000,10.00000000,0.00000000,10.00000000,NULL),(1063,225,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100.00000000,NULL,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,200.00000000,0.00000000,200.00000000,NULL),(1064,225,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100.00000000,NULL,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,200.00000000,0.00000000,200.00000000,NULL),(1065,225,NULL,NULL,NULL,'(DEPOSIT)',0.000,'',0.000,'0',0.000,'0',1,0,0,15,-20.50000000,NULL,-20.50000000,0.00000000,0.00000000,0.00000000,-20.50000000,0,NULL,NULL,2,NULL,0.00000000,0,0,-1,NULL,NULL,100,NULL,NULL,12,12,0,'',-20.50000000,-20.50000000,0.00000000,-20.50000000,NULL),(1066,226,NULL,NULL,NULL,'aaa',12.500,'',0.000,'0',0.000,'0',1,0,0,NULL,100.00000000,NULL,100.00000000,12.50000000,0.00000000,0.00000000,112.50000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,100.00000000,12.50000000,112.50000000,NULL),(1067,226,NULL,NULL,NULL,'bbb',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,20.00000000,NULL,20.00000000,0.00000000,0.00000000,0.00000000,20.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',20.00000000,20.00000000,0.00000000,20.00000000,NULL),(1069,228,NULL,NULL,NULL,'(DEPOSIT) (70%) - PR2001-0034',4.000,'',0.000,'0',0.000,'0',1,0,0,NULL,50.00000000,NULL,50.00000000,2.00000000,0.00000000,0.00000000,52.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',50.00000000,50.00000000,2.00000000,52.00000000,NULL),(1070,228,NULL,NULL,NULL,'(DEPOSIT) (70%) - PR2001-0034',4.000,'',0.000,'0',0.000,'0',1,0,0,NULL,-1.40000000,NULL,-1.40000000,-0.06000000,0.00000000,0.00000000,-1.46000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',-1.40000000,-1.40000000,-0.06000000,-1.46000000,NULL),(1071,227,NULL,NULL,NULL,'gdfgd',19.600,'',0.000,'0',0.000,'0',1,0,0,NULL,200.00000000,NULL,200.00000000,39.20000000,0.00000000,0.00000000,239.20000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',200.00000000,200.00000000,39.20000000,239.20000000,NULL),(1072,217,NULL,1,NULL,'A beatifull pink dress',12.500,'',0.000,'0',0.000,'0',1,0,0,NULL,9.00000000,NULL,9.00000000,1.13000000,0.00000000,0.00000000,10.13000000,0,NULL,NULL,0,NULL,79.16667000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',9.00000000,9.00000000,1.13000000,10.13000000,NULL),(1074,219,NULL,30,NULL,'',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,4.16667000,NULL,4.17000000,0.83000000,0.00000000,0.00000000,5.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,5,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',4.16667000,4.17000000,0.83000000,5.00000000,NULL),(1089,219,NULL,24,NULL,'',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0.83333000,NULL,0.83000000,0.17000000,0.00000000,0.00000000,1.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,20,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',0.83333000,0.83000000,0.17000000,1.00000000,NULL),(1090,229,NULL,NULL,NULL,'Subscription 2017',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,50.00000000,NULL,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,1,'2017-07-18 00:00:00',NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',50.00000000,50.00000000,0.00000000,50.00000000,NULL),(1091,230,NULL,NULL,NULL,'Subscription 2018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,50.00000000,NULL,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,1,'2018-07-18 00:00:00',NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',50.00000000,50.00000000,0.00000000,50.00000000,NULL),(1092,231,NULL,NULL,NULL,'Subscription 2019',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,50.00000000,NULL,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,1,'2019-07-18 00:00:00',NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',50.00000000,50.00000000,0.00000000,50.00000000,NULL);
 /*!40000 ALTER TABLE `llx_facturedet` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -6883,6 +8046,60 @@ LOCK TABLES `llx_facturedet_rec_extrafields` WRITE;
 /*!40000 ALTER TABLE `llx_facturedet_rec_extrafields` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_facturx_myobject`
+--
+
+DROP TABLE IF EXISTS `llx_facturx_myobject`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_facturx_myobject` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `qty` int(11) DEFAULT NULL,
+  `status` int(11) DEFAULT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_facturx_myobject`
+--
+
+LOCK TABLES `llx_facturx_myobject` WRITE;
+/*!40000 ALTER TABLE `llx_facturx_myobject` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_facturx_myobject` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_facturx_myobject_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_facturx_myobject_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_facturx_myobject_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_facturx_myobject_extrafields`
+--
+
+LOCK TABLES `llx_facturx_myobject_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_facturx_myobject_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_facturx_myobject_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_fichinter`
 --
@@ -7201,7 +8418,7 @@ CREATE TABLE `llx_holiday_config` (
 
 LOCK TABLES `llx_holiday_config` WRITE;
 /*!40000 ALTER TABLE `llx_holiday_config` DISABLE KEYS */;
-INSERT INTO `llx_holiday_config` VALUES (1,'userGroup','1'),(2,'lastUpdate','20200108222504'),(3,'nbUser',''),(4,'delayForRequest','31'),(5,'AlertValidatorDelay','0'),(6,'AlertValidatorSolde','0'),(7,'nbHolidayDeducted','1'),(8,'nbHolidayEveryMonth','2.08334');
+INSERT INTO `llx_holiday_config` VALUES (1,'userGroup','1'),(2,'lastUpdate','20201210132924'),(3,'nbUser',''),(4,'delayForRequest','31'),(5,'AlertValidatorDelay','0'),(6,'AlertValidatorSolde','0'),(7,'nbHolidayDeducted','1'),(8,'nbHolidayEveryMonth','2.08334');
 /*!40000 ALTER TABLE `llx_holiday_config` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -7314,6 +8531,37 @@ INSERT INTO `llx_import_model` VALUES (1,12,'Import profile 1','user_1','1=u.log
 /*!40000 ALTER TABLE `llx_import_model` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_intracommreport`
+--
+
+DROP TABLE IF EXISTS `llx_intracommreport`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_intracommreport` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(30) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `type_declaration` varchar(32) DEFAULT NULL,
+  `period` varchar(32) DEFAULT NULL,
+  `mode` varchar(32) DEFAULT NULL,
+  `content_xml` text DEFAULT NULL,
+  `type_export` varchar(10) DEFAULT NULL,
+  `datec` datetime DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_intracommreport`
+--
+
+LOCK TABLES `llx_intracommreport` WRITE;
+/*!40000 ALTER TABLE `llx_intracommreport` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_intracommreport` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_inventory`
 --
@@ -7405,6 +8653,7 @@ CREATE TABLE `llx_inventorydet` (
   `qty_stock` double DEFAULT NULL,
   `qty_regulated` double DEFAULT NULL,
   PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_inventorydet` (`fk_inventory`,`fk_warehouse`,`fk_product`,`batch`),
   KEY `idx_inventorydet_tms` (`tms`),
   KEY `idx_inventorydet_datec` (`datec`),
   KEY `idx_inventorydet_fk_inventory` (`fk_inventory`)
@@ -7521,142 +8770,6 @@ INSERT INTO `llx_links` VALUES (1,1,'2018-01-16 16:45:35','http://www.dolicloud.
 /*!40000 ALTER TABLE `llx_links` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_delivery`
---
-
-DROP TABLE IF EXISTS `llx_delivery`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_delivery` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `ref` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
-  `entity` int(11) NOT NULL DEFAULT 1,
-  `ref_customer` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fk_soc` int(11) NOT NULL,
-  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_int` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `date_creation` datetime DEFAULT NULL,
-  `fk_user_author` int(11) DEFAULT NULL,
-  `date_valid` datetime DEFAULT NULL,
-  `fk_user_valid` int(11) DEFAULT NULL,
-  `date_delivery` datetime DEFAULT NULL,
-  `fk_address` int(11) DEFAULT NULL,
-  `fk_statut` smallint(6) DEFAULT 0,
-  `total_ht` double(24,8) DEFAULT 0.00000000,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fk_incoterms` int(11) DEFAULT NULL,
-  `location_incoterms` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `last_main_doc` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`rowid`),
-  UNIQUE KEY `idx_delivery_uk_ref` (`ref`,`entity`),
-  KEY `idx_delivery_fk_soc` (`fk_soc`),
-  KEY `idx_delivery_fk_user_author` (`fk_user_author`),
-  KEY `idx_delivery_fk_user_valid` (`fk_user_valid`),
-  CONSTRAINT `fk_delivery_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
-  CONSTRAINT `fk_delivery_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`),
-  CONSTRAINT `fk_delivery_fk_user_valid` FOREIGN KEY (`fk_user_valid`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_delivery`
---
-
-LOCK TABLES `llx_delivery` WRITE;
-/*!40000 ALTER TABLE `llx_delivery` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_delivery` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_delivery_extrafields`
---
-
-DROP TABLE IF EXISTS `llx_delivery_extrafields`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_delivery_extrafields` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `fk_object` int(11) NOT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`rowid`),
-  KEY `idx_delivery_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_delivery_extrafields`
---
-
-LOCK TABLES `llx_delivery_extrafields` WRITE;
-/*!40000 ALTER TABLE `llx_delivery_extrafields` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_delivery_extrafields` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_deliverydet`
---
-
-DROP TABLE IF EXISTS `llx_deliverydet`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_deliverydet` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `fk_delivery` int(11) DEFAULT NULL,
-  `fk_origin_line` int(11) DEFAULT NULL,
-  `fk_product` int(11) DEFAULT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `qty` double DEFAULT NULL,
-  `subprice` double(24,8) DEFAULT 0.00000000,
-  `total_ht` double(24,8) DEFAULT 0.00000000,
-  `rang` int(11) DEFAULT 0,
-  PRIMARY KEY (`rowid`),
-  KEY `idx_deliverydet_fk_expedition` (`fk_delivery`),
-  CONSTRAINT `fk_deliverydet_fk_delivery` FOREIGN KEY (`fk_delivery`) REFERENCES `llx_delivery` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_deliverydet`
---
-
-LOCK TABLES `llx_deliverydet` WRITE;
-/*!40000 ALTER TABLE `llx_deliverydet` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_deliverydet` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_deliverydet_extrafields`
---
-
-DROP TABLE IF EXISTS `llx_deliverydet_extrafields`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_deliverydet_extrafields` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `fk_object` int(11) NOT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`rowid`),
-  KEY `idx_deliverydet_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_deliverydet_extrafields`
---
-
-LOCK TABLES `llx_deliverydet_extrafields` WRITE;
-/*!40000 ALTER TABLE `llx_deliverydet_extrafields` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_deliverydet_extrafields` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_loan`
 --
@@ -7726,6 +8839,7 @@ CREATE TABLE `llx_loan_schedule` (
   `fk_bank` int(11) NOT NULL,
   `fk_user_creat` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
+  `fk_payment_loan` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -7914,13 +9028,13 @@ CREATE TABLE `llx_menu` (
   `level` smallint(6) DEFAULT NULL,
   `leftmenu` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
   `perms` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `enabled` varchar(255) COLLATE utf8_unicode_ci DEFAULT '1',
+  `enabled` text COLLATE utf8_unicode_ci DEFAULT NULL,
   `usertype` int(11) NOT NULL DEFAULT 0,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `idx_menu_uk_menu` (`menu_handler`,`fk_menu`,`position`,`url`,`entity`),
   KEY `idx_menu_menuhandler_type` (`menu_handler`,`type`)
-) ENGINE=InnoDB AUTO_INCREMENT=167003 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=167038 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7929,7 +9043,7 @@ CREATE TABLE `llx_menu` (
 
 LOCK TABLES `llx_menu` WRITE;
 /*!40000 ALTER TABLE `llx_menu` DISABLE KEYS */;
-INSERT INTO `llx_menu` VALUES (103094,'all',2,'agenda','top','agenda',0,NULL,NULL,100,'/comm/action/index.php','','Agenda','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103095,'all',2,'agenda','left','agenda',103094,NULL,NULL,100,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Actions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103096,'all',2,'agenda','left','agenda',103095,NULL,NULL,101,'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create','','NewAction','commercial',NULL,NULL,'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103097,'all',2,'agenda','left','agenda',103095,NULL,NULL,102,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Calendar','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103098,'all',2,'agenda','left','agenda',103097,NULL,NULL,103,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103099,'all',2,'agenda','left','agenda',103097,NULL,NULL,104,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103100,'all',2,'agenda','left','agenda',103097,NULL,NULL,105,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103101,'all',2,'agenda','left','agenda',103097,NULL,NULL,106,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103102,'all',2,'agenda','left','agenda',103095,NULL,NULL,112,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda','','List','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103103,'all',2,'agenda','left','agenda',103102,NULL,NULL,113,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103104,'all',2,'agenda','left','agenda',103102,NULL,NULL,114,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103105,'all',2,'agenda','left','agenda',103102,NULL,NULL,115,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103106,'all',2,'agenda','left','agenda',103102,NULL,NULL,116,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103107,'all',2,'agenda','left','agenda',103095,NULL,NULL,120,'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Reportings','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103134,'all',2,'opensurvey','top','opensurvey',0,NULL,NULL,200,'/opensurvey/index.php','','Surveys','opensurvey',NULL,NULL,'$user->rights->opensurvey->survey->read','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(103135,'all',2,'opensurvey','left','opensurvey',-1,NULL,'opensurvey',200,'/opensurvey/index.php?mainmenu=opensurvey&leftmenu=opensurvey','','Survey','opensurvey@opensurvey',NULL,'opensurvey','','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(103136,'all',2,'opensurvey','left','opensurvey',-1,'opensurvey','opensurvey',210,'/opensurvey/public/index.php','_blank','NewSurvey','opensurvey@opensurvey',NULL,'opensurvey_new','','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(103137,'all',2,'opensurvey','left','opensurvey',-1,'opensurvey','opensurvey',220,'/opensurvey/list.php','','List','opensurvey@opensurvey',NULL,'opensurvey_list','','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(145127,'all',1,'printing','left','home',-1,'admintools','home',300,'/printing/index.php?mainmenu=home&leftmenu=admintools','','MenuDirectPrinting','printing',NULL,NULL,'$user->rights->printing->read','$conf->printing->enabled && $leftmenu==\'admintools\'',0,'2017-01-29 15:12:44'),(161088,'auguria',1,'','top','home',0,NULL,NULL,10,'/index.php?mainmenu=home&amp;leftmenu=','','Home','',-1,'','','1',2,'2017-08-30 15:14:30'),(161089,'auguria',1,'societe|fournisseur','top','companies',0,NULL,NULL,20,'/societe/index.php?mainmenu=companies&amp;leftmenu=','','ThirdParties','companies',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)',2,'2017-08-30 15:14:30'),(161090,'auguria',1,'product|service','top','products',0,NULL,NULL,30,'/product/index.php?mainmenu=products&amp;leftmenu=','','Products/Services','products',-1,'','$user->rights->produit->lire||$user->rights->service->lire','$conf->product->enabled || $conf->service->enabled',0,'2017-08-30 15:14:30'),(161092,'auguria',1,'propal|commande|fournisseur|contrat|ficheinter','top','commercial',0,NULL,NULL,40,'/comm/index.php?mainmenu=commercial&amp;leftmenu=','','Commercial','commercial',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','$conf->propal->enabled || $conf->commande->enabled || $conf->supplier_order->enabled || $conf->contrat->enabled || $conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(161093,'auguria',1,'comptabilite|accounting|facture|don|tax|salaries|loan','top','accountancy',0,NULL,NULL,50,'/compta/index.php?mainmenu=accountancy&amp;leftmenu=','','MenuFinancial','compta',-1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->facture->lire|| $user->rights->don->lire || $user->rights->tax->charges->lire || $user->rights->salaries->read || $user->rights->loan->read','$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->don->enabled  || $conf->tax->enabled || $conf->salaries->enabled || $conf->supplier_invoice->enabled || $conf->loan->enabled',2,'2017-08-30 15:14:30'),(161094,'auguria',1,'projet','top','project',0,NULL,NULL,70,'/projet/index.php?mainmenu=project&amp;leftmenu=','','Projects','projects',-1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(161095,'auguria',1,'mailing|export|import|opensurvey|resource','top','tools',0,NULL,NULL,90,'/core/tools.php?mainmenu=tools&amp;leftmenu=','','Tools','other',-1,'','$user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run || $user->rights->opensurvey->read || $user->rights->resource->read','$conf->mailing->enabled || $conf->export->enabled || $conf->import->enabled || $conf->opensurvey->enabled || $conf->resource->enabled',2,'2017-08-30 15:14:30'),(161101,'auguria',1,'banque|prelevement','top','bank',0,NULL,NULL,60,'/compta/bank/index.php?mainmenu=bank&amp;leftmenu=bank','','MenuBankCash','banks',-1,'','$user->rights->banque->lire || $user->rights->prelevement->bons->lire','$conf->banque->enabled || $conf->prelevement->enabled',0,'2017-08-30 15:14:30'),(161102,'auguria',1,'hrm|holiday|deplacement|expensereport','top','hrm',0,NULL,NULL,80,'/hrm/index.php?mainmenu=hrm&amp;leftmenu=','','HRM','holiday',-1,'','$user->rights->hrm->employee->read || $user->rights->holiday->write || $user->rights->deplacement->lire || $user->rights->expensereport->lire','$conf->hrm->enabled || $conf->holiday->enabled || $conf->deplacement->enabled || $conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(161177,'auguria',1,'','left','home',161088,NULL,NULL,0,'/index.php','','MyDashboard','',0,'','','1',2,'2017-08-30 15:14:30'),(161187,'auguria',1,'','left','home',161088,NULL,NULL,1,'/admin/index.php?leftmenu=setup','','Setup','admin',0,'setup','','$user->admin',2,'2017-08-30 15:14:30'),(161188,'auguria',1,'','left','home',161187,NULL,NULL,1,'/admin/company.php?leftmenu=setup','','MenuCompanySetup','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161189,'auguria',1,'','left','home',161187,NULL,NULL,4,'/admin/ihm.php?leftmenu=setup','','GUISetup','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161190,'auguria',1,'','left','home',161187,NULL,NULL,2,'/admin/modules.php?leftmenu=setup','','Modules','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161191,'auguria',1,'','left','home',161187,NULL,NULL,6,'/admin/boxes.php?leftmenu=setup','','Boxes','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161192,'auguria',1,'','left','home',161187,NULL,NULL,3,'/admin/menus.php?leftmenu=setup','','Menus','admin',1,'','','$leftmenu==\'setup\'',2,'2017-09-06 08:29:47'),(161193,'auguria',1,'','left','home',161187,NULL,NULL,7,'/admin/delais.php?leftmenu=setup','','Alerts','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161194,'auguria',1,'','left','home',161187,NULL,NULL,10,'/admin/pdf.php?leftmenu=setup','','PDF','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161195,'auguria',1,'','left','home',161187,NULL,NULL,8,'/admin/security_other.php?leftmenu=setup','','Security','admin',1,'','','$leftmenu==\'setup\'',2,'2017-09-06 08:29:36'),(161196,'auguria',1,'','left','home',161187,NULL,NULL,11,'/admin/mails.php?leftmenu=setup','','Emails','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161197,'auguria',1,'','left','home',161187,NULL,NULL,9,'/admin/limits.php?leftmenu=setup','','MenuLimits','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161198,'auguria',1,'','left','home',161187,NULL,NULL,13,'/admin/dict.php?leftmenu=setup','','Dictionary','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161199,'auguria',1,'','left','home',161187,NULL,NULL,14,'/admin/const.php?leftmenu=setup','','OtherSetup','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161200,'auguria',1,'','left','home',161187,NULL,NULL,12,'/admin/sms.php?leftmenu=setup','','SMS','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161201,'auguria',1,'','left','home',161187,NULL,NULL,4,'/admin/translation.php?leftmenu=setup','','Translation','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161288,'auguria',1,'','left','home',161387,NULL,NULL,0,'/admin/system/dolibarr.php?leftmenu=admintools','','InfoDolibarr','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161289,'auguria',1,'','left','home',161288,NULL,NULL,2,'/admin/system/modules.php?leftmenu=admintools','','Modules','admin',2,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161290,'auguria',1,'','left','home',161288,NULL,NULL,3,'/admin/triggers.php?leftmenu=admintools','','Triggers','admin',2,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161291,'auguria',1,'','left','home',161288,NULL,NULL,4,'/admin/system/filecheck.php?leftmenu=admintools','','FileCheck','admin',2,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161292,'auguria',1,'','left','home',161387,NULL,NULL,1,'/admin/system/browser.php?leftmenu=admintools','','InfoBrowser','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161293,'auguria',1,'','left','home',161387,NULL,NULL,2,'/admin/system/os.php?leftmenu=admintools','','InfoOS','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161294,'auguria',1,'','left','home',161387,NULL,NULL,3,'/admin/system/web.php?leftmenu=admintools','','InfoWebServer','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161295,'auguria',1,'','left','home',161387,NULL,NULL,4,'/admin/system/phpinfo.php?leftmenu=admintools','','InfoPHP','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161297,'auguria',1,'','left','home',161387,NULL,NULL,5,'/admin/system/database.php?leftmenu=admintools','','InfoDatabase','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161387,'auguria',1,'','left','home',161088,NULL,NULL,2,'/admin/tools/index.php?leftmenu=admintools','','AdminTools','admin',0,'admintools','','$user->admin',2,'2017-08-30 15:14:30'),(161388,'auguria',1,'','left','home',161387,NULL,NULL,6,'/admin/tools/dolibarr_export.php?leftmenu=admintools','','Backup','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161389,'auguria',1,'','left','home',161387,NULL,NULL,7,'/admin/tools/dolibarr_import.php?leftmenu=admintools','','Restore','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161392,'auguria',1,'','left','home',161387,NULL,NULL,8,'/admin/tools/update.php?leftmenu=admintools','','MenuUpgrade','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161393,'auguria',1,'','left','home',161387,NULL,NULL,9,'/admin/tools/eaccelerator.php?leftmenu=admintools','','EAccelerator','admin',1,'','','$leftmenu==\"admintools\" && function_exists(\"eaccelerator_info\")',2,'2017-08-30 15:14:30'),(161394,'auguria',1,'','left','home',161387,NULL,NULL,10,'/admin/tools/listevents.php?leftmenu=admintools','','Audit','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161395,'auguria',1,'','left','home',161387,NULL,NULL,11,'/admin/tools/listsessions.php?leftmenu=admintools','','Sessions','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161396,'auguria',1,'','left','home',161387,NULL,NULL,12,'/admin/tools/purge.php?leftmenu=admintools','','Purge','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161398,'auguria',1,'','left','home',161387,NULL,NULL,14,'/admin/system/about.php?leftmenu=admintools','','ExternalResources','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161407,'auguria',1,'','left','home',161387,NULL,NULL,15,'/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=admintools','','ProductVatMassChange','products',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161487,'auguria',1,'','left','home',161088,NULL,NULL,4,'/user/home.php?leftmenu=users','','MenuUsersAndGroups','users',0,'users','','1',2,'2017-08-30 15:14:30'),(161488,'auguria',1,'','left','home',161487,NULL,NULL,0,'/user/index.php?leftmenu=users','','Users','users',1,'','$user->rights->user->user->lire || $user->admin','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161489,'auguria',1,'','left','home',161488,NULL,NULL,0,'/user/card.php?leftmenu=users&amp;action=create','','NewUser','users',2,'','($user->rights->user->user->creer || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161490,'auguria',1,'','left','home',161487,NULL,NULL,1,'/user/group/index.php?leftmenu=users','','Groups','users',1,'','(($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161491,'auguria',1,'','left','home',161490,NULL,NULL,0,'/user/group/card.php?leftmenu=users&amp;action=create','','NewGroup','users',2,'','(($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161587,'auguria',1,'','left','companies',161089,NULL,NULL,0,'/societe/index.php?leftmenu=thirdparties','','ThirdParty','companies',0,'thirdparties','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161588,'auguria',1,'','left','companies',161587,NULL,NULL,0,'/societe/card.php?action=create','','MenuNewThirdParty','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161589,'auguria',1,'','left','companies',161587,NULL,NULL,0,'/societe/list.php?action=create','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161590,'auguria',1,'','left','companies',161587,NULL,NULL,5,'/societe/list.php?type=f&leftmenu=suppliers','','ListSuppliersShort','suppliers',1,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2017-08-30 15:14:30'),(161591,'auguria',1,'','left','companies',161590,NULL,NULL,0,'/societe/card.php?leftmenu=supplier&amp;action=create&amp;type=f','','NewSupplier','suppliers',2,'','$user->rights->societe->creer','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2017-08-30 15:14:30'),(161593,'auguria',1,'','left','companies',161587,NULL,NULL,3,'/societe/list.php?type=p&leftmenu=prospects','','ListProspectsShort','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161594,'auguria',1,'','left','companies',161593,NULL,NULL,0,'/societe/card.php?leftmenu=prospects&amp;action=create&amp;type=p','','MenuNewProspect','companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161596,'auguria',1,'','left','companies',161587,NULL,NULL,4,'/societe/list.php?type=c&leftmenu=customers','','ListCustomersShort','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161597,'auguria',1,'','left','companies',161596,NULL,NULL,0,'/societe/card.php?leftmenu=customers&amp;action=create&amp;type=c','','MenuNewCustomer','companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161687,'auguria',1,'','left','companies',161089,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','ContactsAddresses','companies',0,'contacts','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161688,'auguria',1,'','left','companies',161687,NULL,NULL,0,'/contact/card.php?leftmenu=contacts&amp;action=create','','NewContactAddress','companies',1,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161689,'auguria',1,'','left','companies',161687,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161691,'auguria',1,'','left','companies',161689,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&amp;type=p','','ThirdPartyProspects','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161692,'auguria',1,'','left','companies',161689,NULL,NULL,2,'/contact/list.php?leftmenu=contacts&amp;type=c','','ThirdPartyCustomers','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161693,'auguria',1,'','left','companies',161689,NULL,NULL,3,'/contact/list.php?leftmenu=contacts&amp;type=f','','ThirdPartySuppliers','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2017-08-30 15:14:30'),(161694,'auguria',1,'','left','companies',161689,NULL,NULL,4,'/contact/list.php?leftmenu=contacts&amp;type=o','','Others','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161737,'auguria',1,'','left','companies',161089,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=1','','SuppliersCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161738,'auguria',1,'','left','companies',161737,NULL,NULL,0,'/categories/card.php?action=create&amp;type=1','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161747,'auguria',1,'','left','companies',161089,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=2','','CustomersProspectsCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161748,'auguria',1,'','left','companies',161747,NULL,NULL,0,'/categories/card.php?action=create&amp;type=2','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161757,'auguria',1,'','left','companies',161089,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=4','','ContactCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161758,'auguria',1,'','left','companies',161757,NULL,NULL,0,'/categories/card.php?action=create&amp;type=4','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(162187,'auguria',1,'','left','commercial',161092,NULL,NULL,4,'/comm/propal/index.php?leftmenu=propals','','Prop','propal',0,'propals','$user->rights->propale->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162188,'auguria',1,'','left','commercial',162187,NULL,NULL,0,'/comm/propal/card.php?action=create&amp;leftmenu=propals','','NewPropal','propal',1,'','$user->rights->propale->creer','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162189,'auguria',1,'','left','commercial',162187,NULL,NULL,1,'/comm/propal/list.php?leftmenu=propals','','List','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162190,'auguria',1,'','left','commercial',162189,NULL,NULL,2,'/comm/propal/list.php?leftmenu=propals&amp;search_status=0','','PropalsDraft','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162191,'auguria',1,'','left','commercial',162189,NULL,NULL,3,'/comm/propal/list.php?leftmenu=propals&amp;search_status=1','','PropalsOpened','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162192,'auguria',1,'','left','commercial',162189,NULL,NULL,4,'/comm/propal/list.php?leftmenu=propals&amp;search_status=2','','PropalStatusSigned','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162193,'auguria',1,'','left','commercial',162189,NULL,NULL,5,'/comm/propal/list.php?leftmenu=propals&amp;search_status=3','','PropalStatusNotSigned','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162194,'auguria',1,'','left','commercial',162189,NULL,NULL,6,'/comm/propal/list.php?leftmenu=propals&amp;search_status=4','','PropalStatusBilled','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162197,'auguria',1,'','left','commercial',162187,NULL,NULL,4,'/comm/propal/stats/index.php?leftmenu=propals','','Statistics','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162287,'auguria',1,'','left','commercial',161092,NULL,NULL,5,'/commande/index.php?leftmenu=orders','','CustomersOrders','orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162288,'auguria',1,'','left','commercial',162287,NULL,NULL,0,'/commande/card.php?action=create&amp;leftmenu=orders','','NewOrder','orders',1,'','$user->rights->commande->creer','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162289,'auguria',1,'','left','commercial',162287,NULL,NULL,1,'/commande/list.php?leftmenu=orders','','List','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162290,'auguria',1,'','left','commercial',162289,NULL,NULL,2,'/commande/list.php?leftmenu=orders&amp;search_status=0','','StatusOrderDraftShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162291,'auguria',1,'','left','commercial',162289,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;search_status=1','','StatusOrderValidated','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162292,'auguria',1,'','left','commercial',162289,NULL,NULL,4,'/commande/list.php?leftmenu=orders&amp;search_status=2','','StatusOrderOnProcessShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162293,'auguria',1,'','left','commercial',162289,NULL,NULL,5,'/commande/list.php?leftmenu=orders&amp;search_status=3','','StatusOrderToBill','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162294,'auguria',1,'','left','commercial',162289,NULL,NULL,6,'/commande/list.php?leftmenu=orders&amp;search_status=4','','StatusOrderProcessed','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162295,'auguria',1,'','left','commercial',162289,NULL,NULL,7,'/commande/list.php?leftmenu=orders&amp;search_status=-1','','StatusOrderCanceledShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162296,'auguria',1,'','left','commercial',162287,NULL,NULL,4,'/commande/stats/index.php?leftmenu=orders','','Statistics','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162387,'auguria',1,'','left','commercial',161090,NULL,NULL,6,'/expedition/index.php?leftmenu=sendings','','Shipments','sendings',0,'sendings','$user->rights->expedition->lire','$conf->expedition->enabled',2,'2017-08-30 15:14:30'),(162388,'auguria',1,'','left','commercial',162387,NULL,NULL,0,'/expedition/card.php?action=create2&leftmenu=sendings','','NewSending','sendings',1,'','$user->rights->expedition->creer','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2017-08-30 15:14:30'),(162389,'auguria',1,'','left','commercial',162387,NULL,NULL,1,'/expedition/list.php?leftmenu=sendings','','List','sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2017-08-30 15:14:30'),(162390,'auguria',1,'','left','commercial',162387,NULL,NULL,2,'/expedition/stats/index.php?leftmenu=sendings','','Statistics','sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2017-08-30 15:14:30'),(162487,'auguria',1,'','left','commercial',161092,NULL,NULL,7,'/contrat/index.php?leftmenu=contracts','','Contracts','contracts',0,'contracts','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162488,'auguria',1,'','left','commercial',162487,NULL,NULL,0,'/contrat/card.php?&action=create&amp;leftmenu=contracts','','NewContract','contracts',1,'','$user->rights->contrat->creer','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162489,'auguria',1,'','left','commercial',162487,NULL,NULL,1,'/contrat/list.php?leftmenu=contracts','','List','contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162490,'auguria',1,'','left','commercial',162487,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts','','MenuServices','contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162491,'auguria',1,'','left','commercial',162490,NULL,NULL,0,'/contrat/services.php?leftmenu=contracts&amp;mode=0','','MenuInactiveServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162492,'auguria',1,'','left','commercial',162490,NULL,NULL,1,'/contrat/services.php?leftmenu=contracts&amp;mode=4','','MenuRunningServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162493,'auguria',1,'','left','commercial',162490,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts&amp;mode=4&amp;filter=expired','','MenuExpiredServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162494,'auguria',1,'','left','commercial',162490,NULL,NULL,3,'/contrat/services.php?leftmenu=contracts&amp;mode=5','','MenuClosedServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162587,'auguria',1,'','left','commercial',161092,NULL,NULL,8,'/fichinter/list.php?leftmenu=ficheinter','','Interventions','interventions',0,'ficheinter','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162588,'auguria',1,'','left','commercial',162587,NULL,NULL,0,'/fichinter/card.php?action=create&amp;leftmenu=ficheinter','','NewIntervention','interventions',1,'','$user->rights->ficheinter->creer','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162589,'auguria',1,'','left','commercial',162587,NULL,NULL,1,'/fichinter/list.php?leftmenu=ficheinter','','List','interventions',1,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162590,'auguria',1,'','left','commercial',162587,NULL,NULL,2,'/fichinter/stats/index.php?leftmenu=ficheinter','','Statistics','interventions',1,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162687,'auguria',1,'','left','accountancy',161093,NULL,NULL,3,'/fourn/facture/list.php?leftmenu=suppliers_bills','','BillsSuppliers','bills',0,'supplier_bills','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162688,'auguria',1,'','left','accountancy',162687,NULL,NULL,0,'/fourn/facture/card.php?action=create&amp;leftmenu=suppliers_bills','','NewBill','bills',1,'','$user->rights->fournisseur->facture->creer','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162689,'auguria',1,'','left','accountancy',162687,NULL,NULL,1,'/fourn/facture/list.php?leftmenu=suppliers_bills','','List','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162690,'auguria',1,'','left','accountancy',162687,NULL,NULL,2,'/fourn/facture/paiement.php?leftmenu=suppliers_bills','','Payments','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162691,'auguria',1,'','left','accountancy',162687,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills&mode=supplier','','Statistics','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162692,'auguria',1,'','left','accountancy',162690,NULL,NULL,1,'/fourn/facture/rapport.php?leftmenu=suppliers_bills','','Reporting','bills',2,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162787,'auguria',1,'','left','accountancy',161093,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills','','BillsCustomers','bills',0,'customer_bills','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162788,'auguria',1,'','left','accountancy',162787,NULL,NULL,3,'/compta/facture/card.php?action=create&amp;leftmenu=customers_bills','','NewBill','bills',1,'','$user->rights->facture->creer','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162789,'auguria',1,'','left','accountancy',162787,NULL,NULL,5,'/compta/facture/fiche-rec.php?leftmenu=customers_bills','','ListOfTemplates','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162791,'auguria',1,'','left','accountancy',162787,NULL,NULL,6,'/compta/paiement/list.php?leftmenu=customers_bills','','Payments','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162792,'auguria',1,'','left','accountancy',162787,NULL,NULL,4,'/compta/facture/list.php?leftmenu=customers_bills','','List','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162797,'auguria',1,'','left','accountancy',162791,NULL,NULL,1,'/compta/paiement/rapport.php?leftmenu=customers_bills','','Reportings','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162798,'auguria',1,'','left','accountancy',161101,NULL,NULL,9,'/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank','','MenuChequeDeposits','bills',0,'checks','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2017-08-30 15:14:30'),(162799,'auguria',1,'','left','accountancy',162798,NULL,NULL,0,'/compta/paiement/cheque/card.php?leftmenu=checks&amp;action=new','','NewCheckDeposit','compta',1,'','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2017-08-30 15:14:30'),(162800,'auguria',1,'','left','accountancy',162798,NULL,NULL,1,'/compta/paiement/cheque/list.php?leftmenu=checks','','List','bills',1,'','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2017-08-30 15:14:30'),(162801,'auguria',1,'','left','accountancy',162787,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills','','Statistics','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162807,'auguria',1,'','left','accountancy',162792,NULL,NULL,1,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=0','','BillShortStatusDraft','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162808,'auguria',1,'','left','accountancy',162792,NULL,NULL,2,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=1','','BillShortStatusNotPaid','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162809,'auguria',1,'','left','accountancy',162792,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=2','','BillShortStatusPaid','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162810,'auguria',1,'','left','accountancy',162792,NULL,NULL,4,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=3','','BillShortStatusCanceled','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162987,'auguria',1,'','left','accountancy',161093,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;search_status=3','','MenuOrdersToBill','orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',0,'2017-08-30 15:14:30'),(163087,'auguria',1,'','left','accountancy',161093,NULL,NULL,4,'/don/index.php?leftmenu=donations&amp;mainmenu=accountancy','','Donations','donations',0,'donations','$user->rights->don->lire','$conf->don->enabled',2,'2017-08-30 15:14:30'),(163088,'auguria',1,'','left','accountancy',163087,NULL,NULL,0,'/don/card.php?leftmenu=donations&amp;mainmenu=accountancy&amp;action=create','','NewDonation','donations',1,'','$user->rights->don->creer','$conf->don->enabled && $leftmenu==\"donations\"',2,'2017-08-30 15:14:30'),(163089,'auguria',1,'','left','accountancy',163087,NULL,NULL,1,'/don/list.php?leftmenu=donations&amp;mainmenu=accountancy','','List','donations',1,'','$user->rights->don->lire','$conf->don->enabled && $leftmenu==\"donations\"',2,'2017-08-30 15:14:30'),(163187,'auguria',1,'','left','accountancy',161102,NULL,NULL,5,'/compta/deplacement/index.php?leftmenu=tripsandexpenses','','TripsAndExpenses','trips',0,'tripsandexpenses','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163188,'auguria',1,'','left','accountancy',163187,NULL,NULL,1,'/compta/deplacement/card.php?action=create&amp;leftmenu=tripsandexpenses','','New','trips',1,'','$user->rights->deplacement->creer','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163189,'auguria',1,'','left','accountancy',163187,NULL,NULL,2,'/compta/deplacement/list.php?leftmenu=tripsandexpenses','','List','trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163190,'auguria',1,'','left','accountancy',163187,NULL,NULL,2,'/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses','','Statistics','trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163287,'auguria',1,'','left','accountancy',161093,NULL,NULL,6,'/compta/charges/index.php?leftmenu=tax&amp;mainmenu=accountancy','','MenuSpecialExpenses','compta',0,'tax','(! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (! empty($conf->salaries->enabled) && $user->rights->salaries->read)','$conf->tax->enabled || $conf->salaries->enabled',0,'2017-08-30 15:14:30'),(163297,'auguria',1,'','left','accountancy',163287,NULL,NULL,1,'/compta/salaries/index.php?leftmenu=tax_salary&amp;mainmenu=accountancy','','Salaries','salaries',1,'tax_sal','$user->rights->salaries->payment->read','$conf->salaries->enabled',0,'2017-08-30 15:14:30'),(163298,'auguria',1,'','left','accountancy',163297,NULL,NULL,2,'/compta/salaries/card.php?leftmenu=tax_salary&amp;action=create','','NewPayment','companies',2,'','$user->rights->salaries->payment->write','$conf->salaries->enabled && $leftmenu==\"tax_salary\"',0,'2017-08-30 15:14:30'),(163299,'auguria',1,'','left','accountancy',163297,NULL,NULL,3,'/compta/salaries/index.php?leftmenu=tax_salary','','Payments','companies',2,'','$user->rights->salaries->payment->read','$conf->salaries->enabled && $leftmenu==\"tax_salary\"',0,'2017-08-30 15:14:30'),(163307,'auguria',1,'','left','accountancy',163287,NULL,NULL,1,'/loan/index.php?leftmenu=tax_loan&amp;mainmenu=accountancy','','Loans','loan',1,'tax_loan','$user->rights->loan->read','$conf->loan->enabled',0,'2017-08-30 15:14:30'),(163308,'auguria',1,'','left','accountancy',163307,NULL,NULL,2,'/loan/card.php?leftmenu=tax_loan&amp;action=create','','NewLoan','loan',2,'','$user->rights->loan->write','$conf->loan->enabled && $leftmenu==\"tax_loan\"',0,'2017-08-30 15:14:30'),(163310,'auguria',1,'','left','accountancy',163307,NULL,NULL,4,'/loan/calc.php?leftmenu=tax_loan','','Calculator','companies',2,'','$user->rights->loan->calc','$conf->loan->enabled && $leftmenu==\"tax_loan\" && ! empty($conf->global->LOAN_SHOW_CALCULATOR)',0,'2017-08-30 15:14:30'),(163337,'auguria',1,'','left','accountancy',163287,NULL,NULL,1,'/compta/sociales/index.php?leftmenu=tax_social','','SocialContributions','',1,'tax_social','$user->rights->tax->charges->lire','$conf->tax->enabled',0,'2017-08-30 15:14:30'),(163338,'auguria',1,'','left','accountancy',163337,NULL,NULL,2,'/compta/sociales/card.php?leftmenu=tax_social&amp;action=create','','MenuNewSocialContribution','',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2017-08-30 15:14:30'),(163339,'auguria',1,'','left','accountancy',163337,NULL,NULL,3,'/compta/sociales/payments.php?leftmenu=tax_social&amp;mainmenu=accountancy&amp;mode=sconly','','Payments','',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2017-08-30 15:14:30'),(163387,'auguria',1,'','left','accountancy',163287,NULL,NULL,7,'/compta/tva/index.php?leftmenu=tax_vat&amp;mainmenu=accountancy','','VAT','companies',1,'tax_vat','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS)',0,'2017-08-30 15:14:30'),(163388,'auguria',1,'','left','accountancy',163387,NULL,NULL,0,'/compta/tva/card.php?leftmenu=tax_vat&amp;action=create','','New','companies',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163389,'auguria',1,'','left','accountancy',163387,NULL,NULL,1,'/compta/tva/reglement.php?leftmenu=tax_vat','','List','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163390,'auguria',1,'','left','accountancy',163387,NULL,NULL,2,'/compta/tva/clients.php?leftmenu=tax_vat','','ReportByCustomers','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163391,'auguria',1,'','left','accountancy',163387,NULL,NULL,3,'/compta/tva/quadri_detail.php?leftmenu=tax_vat','','ReportByQuarter','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163487,'auguria',1,'','left','accountancy',161093,NULL,NULL,7,'/accountancy/index.php?leftmenu=accountancy','','MenuAccountancy','accountancy',0,'accounting','! empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163488,'auguria',1,'','left','accountancy',163487,NULL,NULL,2,'/accountancy/customer/index.php?leftmenu=dispatch_customer','','CustomersVentilation','accountancy',1,'dispatch_customer','$user->rights->accounting->bind->write','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163489,'auguria',1,'','left','accountancy',163488,NULL,NULL,3,'/accountancy/customer/list.php','','ToDispatch','accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $leftmenu==\"dispatch_customer\"',0,'2017-08-30 15:14:30'),(163490,'auguria',1,'','left','accountancy',163488,NULL,NULL,4,'/accountancy/customer/lines.php','','Dispatched','accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $leftmenu==\"dispatch_customer\"',0,'2017-08-30 15:14:30'),(163497,'auguria',1,'','left','accountancy',163487,NULL,NULL,5,'/accountancy/supplier/index.php?leftmenu=dispatch_supplier','','SuppliersVentilation','accountancy',1,'ventil_supplier','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->fournisseur->enabled',0,'2017-08-30 15:14:30'),(163498,'auguria',1,'','left','accountancy',163497,NULL,NULL,6,'/accountancy/supplier/list.php','','ToDispatch','accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu==\"dispatch_supplier\"',0,'2017-08-30 15:14:30'),(163499,'auguria',1,'','left','accountancy',163497,NULL,NULL,7,'/accountancy/supplier/lines.php','','Dispatched','accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu==\"dispatch_supplier\"',0,'2017-08-30 15:14:30'),(163507,'auguria',1,'','left','accountancy',163487,NULL,NULL,5,'/accountancy/expensereport/index.php?leftmenu=dispatch_expensereport','','ExpenseReportsVentilation','accountancy',1,'ventil_expensereport','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(163508,'auguria',1,'','left','accountancy',163507,NULL,NULL,6,'/accountancy/expensereport/list.php','','ToDispatch','accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu==\"dispatch_expensereport\"',0,'2017-08-30 15:14:30'),(163509,'auguria',1,'','left','accountancy',163507,NULL,NULL,7,'/accountancy/expensereport/lines.php','','Dispatched','accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu==\"dispatch_expensereport\"',0,'2017-08-30 15:14:30'),(163517,'auguria',1,'','left','accountancy',163487,NULL,NULL,15,'/accountancy/bookkeeping/list.php','','Bookkeeping','accountancy',1,'bookkeeping','$user->rights->accounting->mouvements->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163522,'auguria',1,'','left','accountancy',163487,NULL,NULL,16,'/accountancy/bookkeeping/balance.php','','AccountBalance','accountancy',1,'balance','$user->rights->accounting->mouvements->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163527,'auguria',1,'','left','accountancy',163487,NULL,NULL,17,'/accountancy/report/result.php?mainmenu=accountancy&leftmenu=accountancy','','Reportings','main',1,'report','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163528,'auguria',1,'','left','accountancy',163527,NULL,NULL,19,'/compta/resultat/index.php?mainmenu=accountancy&leftmenu=accountancy','','ReportInOut','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163529,'auguria',1,'','left','accountancy',163528,NULL,NULL,18,'/accountancy/report/result.php?mainmenu=accountancy&leftmenu=accountancy','','ByAccounts','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163530,'auguria',1,'','left','accountancy',163528,NULL,NULL,20,'/compta/resultat/clientfourn.php?mainmenu=accountancy&leftmenu=accountancy','','ByCompanies','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163531,'auguria',1,'','left','accountancy',163527,NULL,NULL,21,'/compta/stats/index.php?mainmenu=accountancy&leftmenu=accountancy','','ReportTurnover','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163532,'auguria',1,'','left','accountancy',163531,NULL,NULL,22,'/compta/stats/casoc.php?mainmenu=accountancy&leftmenu=accountancy','','ByCompanies','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163533,'auguria',1,'','left','accountancy',163531,NULL,NULL,23,'/compta/stats/cabyuser.php?mainmenu=accountancy&leftmenu=accountancy','','ByUsers','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163534,'auguria',1,'','left','accountancy',163531,NULL,NULL,24,'/compta/stats/cabyprodserv.php?mainmenu=accountancy&leftmenu=accountancy','','ByProductsAndServices','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163537,'auguria',1,'','left','accountancy',163538,NULL,NULL,80,'/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin','','FiscalPeriod','admin',1,'accountancy_admin_period','','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\" && $conf->global->MAIN_FEATURES_LEVEL > 0',2,'2017-08-30 15:14:30'),(163538,'auguria',1,'','left','accountancy',163487,NULL,NULL,1,'/accountancy/index.php?mainmenu=accountancy&leftmenu=accountancy_admin','','Setup','accountancy',1,'accountancy_admin','$user->rights->accounting->chartofaccount','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163541,'auguria',1,'','left','accountancy',163538,NULL,NULL,10,'/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin','','AccountingJournals','accountancy',2,'accountancy_admin_journal','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163542,'auguria',1,'','left','accountancy',163538,NULL,NULL,20,'/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin','','Pcg_version','accountancy',2,'accountancy_admin_chartmodel','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163543,'auguria',1,'','left','accountancy',163538,NULL,NULL,30,'/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin','','Chartofaccounts','accountancy',2,'accountancy_admin_chart','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163544,'auguria',1,'','left','accountancy',163538,NULL,NULL,40,'/accountancy/admin/categories_list.php?id=32&mainmenu=accountancy&leftmenu=accountancy_admin','','AccountingCategory','accountancy',2,'accountancy_admin_chart_group','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163545,'auguria',1,'','left','accountancy',163538,NULL,NULL,50,'/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin','','MenuDefaultAccounts','accountancy',2,'accountancy_admin_default','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163546,'auguria',1,'','left','accountancy',163538,NULL,NULL,60,'/admin/dict.php?id=10&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin','','MenuVatAccounts','accountancy',2,'accountancy_admin_vat','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163547,'auguria',1,'','left','accountancy',163538,NULL,NULL,70,'/admin/dict.php?id=7&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin','','MenuTaxAccounts','accountancy',2,'accountancy_admin_tax','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163548,'auguria',1,'','left','accountancy',163538,NULL,NULL,80,'/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin','','MenuExpenseReportAccounts','accountancy',2,'accountancy_admin_expensereport','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163549,'auguria',1,'','left','accountancy',163538,NULL,NULL,90,'/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin','','MenuProductsAccounts','accountancy',2,'accountancy_admin_product','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163587,'auguria',1,'','left','accountancy',161101,NULL,NULL,9,'/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank','','StandingOrders','withdrawals',0,'withdraw','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled',2,'2017-08-30 15:14:30'),(163589,'auguria',1,'','left','accountancy',163587,NULL,NULL,0,'/compta/prelevement/create.php?leftmenu=withdraw','','NewStandingOrder','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163590,'auguria',1,'','left','accountancy',163587,NULL,NULL,2,'/compta/prelevement/bons.php?leftmenu=withdraw','','WithdrawalsReceipts','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163591,'auguria',1,'','left','accountancy',163587,NULL,NULL,3,'/compta/prelevement/list.php?leftmenu=withdraw','','WithdrawalsLines','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163593,'auguria',1,'','left','accountancy',163587,NULL,NULL,5,'/compta/prelevement/rejets.php?leftmenu=withdraw','','Rejects','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163594,'auguria',1,'','left','accountancy',163587,NULL,NULL,6,'/compta/prelevement/stats.php?leftmenu=withdraw','','Statistics','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163687,'auguria',1,'','left','accountancy',161101,NULL,NULL,1,'/compta/bank/index.php?leftmenu=bank&amp;mainmenu=bank','','MenuBankCash','banks',0,'bank','$user->rights->banque->lire','$conf->banque->enabled',0,'2017-08-30 15:14:30'),(163688,'auguria',1,'','left','accountancy',163687,NULL,NULL,0,'/compta/bank/card.php?action=create&amp;leftmenu=bank','','MenuNewFinancialAccount','banks',1,'','$user->rights->banque->configurer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163690,'auguria',1,'','left','accountancy',163687,NULL,NULL,2,'/compta/bank/bankentries.php?leftmenu=bank','','ListTransactions','banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163691,'auguria',1,'','left','accountancy',163687,NULL,NULL,3,'/compta/bank/budget.php?leftmenu=bank','','ListTransactionsByCategory','banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163693,'auguria',1,'','left','accountancy',163687,NULL,NULL,5,'/compta/bank/transfer.php?leftmenu=bank','','BankTransfers','banks',1,'','$user->rights->banque->transfer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163737,'auguria',1,'','left','accountancy',161101,NULL,NULL,4,'/categories/index.php?leftmenu=bank&amp;type=5','','Categories','categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(163738,'auguria',1,'','left','accountancy',163737,NULL,NULL,0,'/categories/card.php?leftmenu=bank&amp;action=create&amp;type=5','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(163787,'auguria',1,'','left','accountancy',161093,NULL,NULL,11,'/compta/resultat/index.php?leftmenu=ca&amp;mainmenu=accountancy','','Reportings','main',0,'ca','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled',0,'2017-08-30 15:14:30'),(163792,'auguria',1,'','left','accountancy',163487,NULL,NULL,1,'','','Journalization','main',1,'','$user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163793,'auguria',1,'','left','accountancy',163792,NULL,NULL,4,'/accountancy/journal/sellsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=1','','SellsJournal','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163794,'auguria',1,'','left','accountancy',163792,NULL,NULL,1,'/accountancy/journal/bankjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=3','','BankJournal','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163795,'auguria',1,'','left','accountancy',163792,NULL,NULL,2,'/accountancy/journal/expensereportsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=6','','ExpenseReportJournal','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163796,'auguria',1,'','left','accountancy',163792,NULL,NULL,3,'/accountancy/journal/purchasesjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=2','','PurchasesJournal','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163798,'auguria',1,'','left','accountancy',163787,NULL,NULL,0,'/compta/resultat/index.php?leftmenu=ca','','ReportInOut','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163799,'auguria',1,'','left','accountancy',163788,NULL,NULL,0,'/compta/resultat/clientfourn.php?leftmenu=ca','','ByCompanies','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163800,'auguria',1,'','left','accountancy',163787,NULL,NULL,1,'/compta/stats/index.php?leftmenu=ca','','ReportTurnover','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163801,'auguria',1,'','left','accountancy',163790,NULL,NULL,0,'/compta/stats/casoc.php?leftmenu=ca','','ByCompanies','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163802,'auguria',1,'','left','accountancy',163790,NULL,NULL,1,'/compta/stats/cabyuser.php?leftmenu=ca','','ByUsers','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163803,'auguria',1,'','left','accountancy',163790,NULL,NULL,1,'/compta/stats/cabyprodserv.php?leftmenu=ca','','ByProductsAndServices','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163887,'auguria',1,'','left','products',161090,NULL,NULL,0,'/product/index.php?leftmenu=product&amp;type=0','','Products','products',0,'product','$user->rights->produit->lire','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163888,'auguria',1,'','left','products',163887,NULL,NULL,0,'/product/card.php?leftmenu=product&amp;action=create&amp;type=0','','NewProduct','products',1,'','$user->rights->produit->creer','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163889,'auguria',1,'','left','products',163887,NULL,NULL,1,'/product/list.php?leftmenu=product&amp;type=0','','List','products',1,'','$user->rights->produit->lire','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163890,'auguria',1,'','left','products',163887,NULL,NULL,4,'/product/reassort.php?type=0','','Stocks','products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163891,'auguria',1,'','left','products',163887,NULL,NULL,7,'/product/stats/card.php?id=all&amp;leftmenu=stats&amp;type=0','','Statistics','main',1,'','$user->rights->produit->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(163892,'auguria',1,'','left','products',163887,NULL,NULL,5,'/product/reassortlot.php?type=0','','StocksByLotSerial','products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->productbatch->enabled',2,'2017-08-30 15:14:30'),(163893,'auguria',1,'','left','products',163887,NULL,NULL,6,'/product/stock/productlot_list.php','','LotSerial','products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->productbatch->enabled',2,'2017-08-30 15:14:30'),(163987,'auguria',1,'','left','products',161090,NULL,NULL,1,'/product/index.php?leftmenu=service&amp;type=1','','Services','products',0,'service','$user->rights->service->lire','$conf->service->enabled',2,'2017-08-30 15:14:30'),(163988,'auguria',1,'','left','products',163987,NULL,NULL,0,'/product/card.php?leftmenu=service&amp;action=create&amp;type=1','','NewService','products',1,'','$user->rights->service->creer','$conf->service->enabled',2,'2017-08-30 15:14:30'),(163989,'auguria',1,'','left','products',163987,NULL,NULL,1,'/product/list.php?leftmenu=service&amp;type=1','','List','products',1,'','$user->rights->service->lire','$conf->service->enabled',2,'2017-08-30 15:14:30'),(163990,'auguria',1,'','left','products',163987,NULL,NULL,5,'/product/stats/card.php?id=all&amp;leftmenu=stats&amp;type=1','','Statistics','main',1,'','$user->rights->service->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(164187,'auguria',1,'','left','products',161090,NULL,NULL,3,'/product/stock/index.php?leftmenu=stock','','Stock','stocks',0,'stock','$user->rights->stock->lire','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164188,'auguria',1,'','left','products',164187,NULL,NULL,0,'/product/stock/card.php?action=create','','MenuNewWarehouse','stocks',1,'','$user->rights->stock->creer','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164189,'auguria',1,'','left','products',164187,NULL,NULL,1,'/product/stock/list.php','','List','stocks',1,'','$user->rights->stock->lire','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164191,'auguria',1,'','left','products',164187,NULL,NULL,3,'/product/stock/mouvement.php','','Movements','stocks',1,'','$user->rights->stock->mouvement->lire','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164192,'auguria',1,'','left','products',164187,NULL,NULL,4,'/product/stock/replenish.php','','Replenishments','stocks',1,'','$user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire','$conf->stock->enabled && $conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(164193,'auguria',1,'','left','products',164187,NULL,NULL,5,'/product/stock/massstockmove.php','','MassStockTransferShort','stocks',1,'','$user->rights->stock->mouvement->creer','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164287,'auguria',1,'','left','products',161090,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=0','','Categories','categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164288,'auguria',1,'','left','products',164287,NULL,NULL,0,'/categories/card.php?action=create&amp;type=0','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164487,'auguria',1,'','left','project',161094,NULL,NULL,3,'/projet/activity/perweek.php?leftmenu=projects','','NewTimeSpent','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164687,'auguria',1,'','left','project',161094,NULL,NULL,0,'/projet/index.php?leftmenu=projects','','Projects','projects',0,'projects','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164688,'auguria',1,'','left','project',164687,NULL,NULL,1,'/projet/card.php?leftmenu=projects&amp;action=create','','NewProject','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164689,'auguria',1,'','left','project',164687,NULL,NULL,2,'/projet/list.php?leftmenu=projects','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164690,'auguria',1,'','left','project',164687,NULL,NULL,3,'/projet/stats/index.php?leftmenu=projects','','Statistics','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164787,'auguria',1,'','left','project',161094,NULL,NULL,0,'/projet/activity/index.php?leftmenu=projects','','Activities','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164788,'auguria',1,'','left','project',164787,NULL,NULL,1,'/projet/tasks.php?leftmenu=projects&amp;action=create','','NewTask','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164789,'auguria',1,'','left','project',164787,NULL,NULL,2,'/projet/tasks/list.php?leftmenu=projects','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164791,'auguria',1,'','left','project',164787,NULL,NULL,4,'/projet/tasks/stats/index.php?leftmenu=projects','','Statistics','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164891,'auguria',1,'','left','project',161094,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=6','','Categories','categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164892,'auguria',1,'','left','project',164891,NULL,NULL,0,'/categories/card.php?action=create&amp;type=6','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164987,'auguria',1,'','left','tools',161095,NULL,NULL,0,'/comm/mailing/index.php?leftmenu=mailing','','EMailings','mails',0,'mailing','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2017-08-30 15:14:30'),(164988,'auguria',1,'','left','tools',164987,NULL,NULL,0,'/comm/mailing/card.php?leftmenu=mailing&amp;action=create','','NewMailing','mails',1,'','$user->rights->mailing->creer','$conf->mailing->enabled',0,'2017-08-30 15:14:30'),(164989,'auguria',1,'','left','tools',164987,NULL,NULL,1,'/comm/mailing/list.php?leftmenu=mailing','','List','mails',1,'','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2017-08-30 15:14:30'),(165187,'auguria',1,'','left','tools',161095,NULL,NULL,2,'/exports/index.php?leftmenu=export','','FormatedExport','exports',0,'export','$user->rights->export->lire','$conf->export->enabled',2,'2017-08-30 15:14:30'),(165188,'auguria',1,'','left','tools',165187,NULL,NULL,0,'/exports/export.php?leftmenu=export','','NewExport','exports',1,'','$user->rights->export->creer','$conf->export->enabled',2,'2017-08-30 15:14:30'),(165217,'auguria',1,'','left','tools',161095,NULL,NULL,2,'/imports/index.php?leftmenu=import','','FormatedImport','exports',0,'import','$user->rights->import->run','$conf->import->enabled',2,'2017-08-30 15:14:30'),(165218,'auguria',1,'','left','tools',165217,NULL,NULL,0,'/imports/import.php?leftmenu=import','','NewImport','exports',1,'','$user->rights->import->run','$conf->import->enabled',2,'2017-08-30 15:14:30'),(165287,'auguria',1,'','left','members',161100,NULL,NULL,0,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Members','members',0,'members','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165288,'auguria',1,'','left','members',165287,NULL,NULL,0,'/adherents/card.php?leftmenu=members&amp;action=create','','NewMember','members',1,'','$user->rights->adherent->creer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165289,'auguria',1,'','left','members',165287,NULL,NULL,1,'/adherents/list.php','','List','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165290,'auguria',1,'','left','members',165289,NULL,NULL,2,'/adherents/list.php?leftmenu=members&amp;statut=-1','','MenuMembersToValidate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165291,'auguria',1,'','left','members',165289,NULL,NULL,3,'/adherents/list.php?leftmenu=members&amp;statut=1','','MenuMembersValidated','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165292,'auguria',1,'','left','members',165289,NULL,NULL,4,'/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=outofdate','','MenuMembersNotUpToDate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165293,'auguria',1,'','left','members',165289,NULL,NULL,5,'/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=uptodate','','MenuMembersUpToDate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165294,'auguria',1,'','left','members',165289,NULL,NULL,6,'/adherents/list.php?leftmenu=members&amp;statut=0','','MenuMembersResiliated','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165295,'auguria',1,'','left','members',165287,NULL,NULL,7,'/adherents/stats/geo.php?leftmenu=members&amp;mode=memberbycountry','','MenuMembersStats','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165387,'auguria',1,'','left','members',161100,NULL,NULL,1,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Subscriptions','compta',0,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165388,'auguria',1,'','left','members',165387,NULL,NULL,0,'/adherents/list.php?statut=-1&amp;leftmenu=accountancy&amp;mainmenu=members','','NewSubscription','compta',1,'','$user->rights->adherent->cotisation->creer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165389,'auguria',1,'','left','members',165387,NULL,NULL,1,'/adherents/subscription/list.php?leftmenu=members','','List','compta',1,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165390,'auguria',1,'','left','members',165387,NULL,NULL,7,'/adherents/stats/index.php?leftmenu=members','','MenuMembersStats','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165589,'auguria',1,'','left','members',165287,NULL,NULL,9,'/adherents/htpasswd.php?leftmenu=export','','Filehtpasswd','members',1,'','$user->rights->adherent->export','! empty($conf->global->MEMBER_LINK_TO_HTPASSWDFILE) && $conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165590,'auguria',1,'','left','members',165287,NULL,NULL,10,'/adherents/cartes/carte.php?leftmenu=export','','MembersCards','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165687,'auguria',1,'','left','hrm',161102,NULL,NULL,1,'/user/index.php?leftmenu=hrm&mode=employee','','Employees','hrm',0,'hrm','$user->rights->hrm->employee->read','$conf->hrm->enabled',0,'2017-08-30 15:14:30'),(165688,'auguria',1,'','left','hrm',165687,NULL,NULL,1,'/user/card.php?action=create&employee=1','','NewEmployee','hrm',1,'','$user->rights->hrm->employee->write','$conf->hrm->enabled',0,'2017-08-30 15:14:30'),(165689,'auguria',1,'','left','hrm',165687,NULL,NULL,2,'/user/index.php?$leftmenu=hrm&mode=employee&contextpage=employeelist','','List','hrm',1,'','$user->rights->hrm->employee->read','$conf->hrm->enabled',0,'2017-08-30 15:14:30'),(165787,'auguria',1,'','left','members',161100,NULL,NULL,5,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members','','MembersTypes','members',0,'setup','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165788,'auguria',1,'','left','members',165787,NULL,NULL,0,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members&amp;action=create','','New','members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165789,'auguria',1,'','left','members',165787,NULL,NULL,1,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members','','List','members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(166087,'auguria',1,'','left','hrm',161102,NULL,NULL,1,'/holiday/list.php?&leftmenu=hrm','','CPTitreMenu','holiday',0,'hrm','$user->rights->holiday->read','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166088,'auguria',1,'','left','hrm',166087,NULL,NULL,1,'/holiday/card.php?&action=request','','MenuAddCP','holiday',1,'','$user->rights->holiday->write','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166089,'auguria',1,'','left','hrm',166087,NULL,NULL,1,'/holiday/list.php?&leftmenu=hrm','','List','holiday',1,'','$user->rights->holiday->read','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166090,'auguria',1,'','left','hrm',166089,NULL,NULL,1,'/holiday/list.php?select_statut=2&leftmenu=hrm','','ListToApprove','trips',2,'','$user->rights->holiday->read','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166091,'auguria',1,'','left','hrm',166087,NULL,NULL,2,'/holiday/define_holiday.php?&action=request','','MenuConfCP','holiday',1,'','$user->rights->holiday->define_holiday','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166092,'auguria',1,'','left','hrm',166087,NULL,NULL,3,'/holiday/view_log.php?&action=request','','MenuLogCP','holiday',1,'','$user->rights->holiday->define_holiday','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166187,'auguria',1,'','left','commercial',161092,NULL,NULL,6,'/fourn/commande/index.php?leftmenu=orders_suppliers','','SuppliersOrders','orders',0,'orders_suppliers','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166188,'auguria',1,'','left','commercial',166187,NULL,NULL,0,'/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers','','NewOrder','orders',1,'','$user->rights->fournisseur->commande->creer','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166189,'auguria',1,'','left','commercial',166187,NULL,NULL,1,'/fourn/commande/list.php?leftmenu=orders_suppliers&amp;search_status=0','','List','orders',1,'','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166195,'auguria',1,'','left','commercial',166187,NULL,NULL,7,'/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier','','Statistics','orders',1,'','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166287,'auguria',1,'','left','members',161100,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=3','','MembersCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->adherent->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(166288,'auguria',1,'','left','members',166287,NULL,NULL,0,'/categories/card.php?action=create&amp;type=3','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->adherent->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(166387,'auguria',1,'','left','hrm',161102,NULL,NULL,5,'/expensereport/index.php?leftmenu=expensereport','','TripsAndExpenses','trips',0,'expensereport','$user->rights->expensereport->lire','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166388,'auguria',1,'','left','hrm',166387,NULL,NULL,1,'/expensereport/card.php?action=create&amp;leftmenu=expensereport','','New','trips',1,'','$user->rights->expensereport->creer','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166389,'auguria',1,'','left','hrm',166387,NULL,NULL,2,'/expensereport/list.php?leftmenu=expensereport','','List','trips',1,'','$user->rights->expensereport->lire','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166390,'auguria',1,'','left','hrm',166389,NULL,NULL,2,'/expensereport/list.php?search_status=2&amp;leftmenu=expensereport','','ListToApprove','trips',2,'','$user->rights->expensereport->approve','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166391,'auguria',1,'','left','hrm',166387,NULL,NULL,2,'/expensereport/stats/index.php?leftmenu=expensereport','','Statistics','trips',1,'','$user->rights->expensereport->lire','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166467,'all',1,'variants','left','products',-1,'product','products',100,'/variants/list.php','','VariantAttributes','products',NULL,'product','1','$conf->product->enabled',0,'2018-01-19 11:28:04'),(166541,'all',1,'ticket','top','ticket',0,NULL,NULL,88,'/ticket/index.php','','Ticket','ticket',NULL,'1','$user->rights->ticket->read','$conf->ticket->enabled',2,'2019-06-05 09:15:29'),(166542,'all',1,'ticket','left','ticket',-1,NULL,'ticket',101,'/ticket/index.php','','Ticket','ticket',NULL,'ticket','$user->rights->ticket->read','$conf->ticket->enabled',2,'2019-06-05 09:15:29'),(166543,'all',1,'ticket','left','ticket',-1,'ticket','ticket',102,'/ticket/card.php?action=create','','NewTicket','ticket',NULL,NULL,'$user->rights->ticket->write','$conf->ticket->enabled',2,'2019-06-05 09:15:29'),(166544,'all',1,'ticket','left','ticket',-1,'ticket','ticket',103,'/ticket/list.php?search_fk_status=non_closed','','List','ticket',NULL,'ticketlist','$user->rights->ticket->read','$conf->ticket->enabled',2,'2019-06-05 09:15:29'),(166545,'all',1,'ticket','left','ticket',-1,'ticket','ticket',105,'/ticket/list.php?mode=mine&search_fk_status=non_closed','','MenuTicketMyAssign','ticket',NULL,'ticketmy','$user->rights->ticket->read','$conf->ticket->enabled',0,'2019-06-05 09:15:29'),(166546,'all',1,'ticket','left','ticket',-1,'ticket','ticket',107,'/ticket/stats/index.php','','Statistics','ticket',NULL,NULL,'$user->rights->ticket->read','$conf->ticket->enabled',0,'2019-06-05 09:15:29'),(166923,'all',1,'resource','left','tools',-1,NULL,'tools',100,'/resource/list.php','','MenuResourceIndex','resource',NULL,'resource','$user->rights->resource->read','1',0,'2020-01-20 11:46:00'),(166924,'all',1,'resource','left','tools',-1,'resource','tools',101,'/resource/card.php?action=create','','MenuResourceAdd','resource',NULL,'resource_add','$user->rights->resource->write','1',0,'2020-01-20 11:46:00'),(166925,'all',1,'resource','left','tools',-1,'resource','tools',102,'/resource/list.php','','List','resource',NULL,'resource_list','$user->rights->resource->read','1',0,'2020-01-20 11:46:00'),(166976,'all',1,'agenda','top','agenda',0,NULL,NULL,86,'/comm/action/index.php','','TMenuAgenda','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-06-12 17:12:28'),(166977,'all',1,'agenda','left','agenda',166976,NULL,NULL,100,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Actions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-06-12 17:12:28'),(166978,'all',1,'agenda','left','agenda',166977,NULL,NULL,101,'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create','','NewAction','commercial',NULL,NULL,'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)','$conf->agenda->enabled',2,'2020-06-12 17:12:28'),(166979,'all',1,'agenda','left','agenda',166977,NULL,NULL,140,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda','','Calendar','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-06-12 17:12:28'),(166980,'all',1,'agenda','left','agenda',166979,NULL,NULL,141,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-06-12 17:12:28'),(166981,'all',1,'agenda','left','agenda',166979,NULL,NULL,142,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-06-12 17:12:28'),(166982,'all',1,'agenda','left','agenda',166979,NULL,NULL,143,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2020-06-12 17:12:28'),(166983,'all',1,'agenda','left','agenda',166979,NULL,NULL,144,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2020-06-12 17:12:28'),(166984,'all',1,'agenda','left','agenda',166977,NULL,NULL,110,'/comm/action/list.php?mainmenu=agenda&amp;leftmenu=agenda','','List','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-06-12 17:12:28'),(166985,'all',1,'agenda','left','agenda',166984,NULL,NULL,111,'/comm/action/list.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-06-12 17:12:28'),(166986,'all',1,'agenda','left','agenda',166984,NULL,NULL,112,'/comm/action/list.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-06-12 17:12:28'),(166987,'all',1,'agenda','left','agenda',166984,NULL,NULL,113,'/comm/action/list.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2020-06-12 17:12:28'),(166988,'all',1,'agenda','left','agenda',166984,NULL,NULL,114,'/comm/action/list.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2020-06-12 17:12:28'),(166989,'all',1,'agenda','left','agenda',166977,NULL,NULL,160,'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Reportings','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->agenda->enabled',2,'2020-06-12 17:12:28'),(166990,'all',1,'agenda','left','agenda',166977,NULL,NULL,170,'/categories/index.php?mainmenu=agenda&amp;leftmenu=agenda&type=10','','Categories','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->categorie->enabled&&$conf->categorie->enabled',2,'2020-06-12 17:12:28'),(166991,'all',1,'barcode','left','tools',-1,NULL,'tools',200,'/barcode/printsheet.php?mainmenu=tools&leftmenu=barcodeprint','','BarCodePrintsheet','products',NULL,'barcodeprint','($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->lire_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)','$conf->barcode->enabled',2,'2020-06-12 17:12:28'),(166992,'all',1,'barcode','left','home',-1,'admintools','home',300,'/barcode/codeinit.php?mainmenu=home&leftmenu=admintools','','MassBarcodeInit','products',NULL,NULL,'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->creer_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)','$conf->barcode->enabled && preg_match(\'/^(admintools|all)/\',$leftmenu)',0,'2020-06-12 17:12:28'),(166993,'all',1,'cron','left','home',-1,'admintools','home',200,'/cron/list.php?leftmenu=admintools','','CronList','cron',NULL,NULL,'$user->rights->cron->read','$conf->cron->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)',2,'2020-06-12 17:12:28'),(166994,'all',1,'ecm','top','ecm',0,NULL,NULL,82,'/ecm/index.php','','MenuECM','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload || $user->rights->ecm->setup','$conf->ecm->enabled',2,'2020-06-12 17:12:29'),(166995,'all',1,'ecm','left','ecm',-1,NULL,'ecm',101,'/ecm/index.php?mainmenu=ecm&leftmenu=ecm','','ECMArea','ecm',NULL,'ecm','$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2020-06-12 17:12:29'),(166996,'all',1,'ecm','left','ecm',-1,'ecm','ecm',102,'/ecm/index.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsManual','ecm',NULL,'ecm_manual','$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2020-06-12 17:12:29'),(166997,'all',1,'ecm','left','ecm',-1,'ecm','ecm',103,'/ecm/index_auto.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsAuto','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload','($user->rights->ecm->read || $user->rights->ecm->upload) && ! empty($conf->global->ECM_AUTO_TREE_ENABLED)',2,'2020-06-12 17:12:29'),(166998,'all',1,'opensurvey','left','tools',-1,NULL,'tools',200,'/opensurvey/index.php?mainmenu=tools&leftmenu=opensurvey','','Survey','opensurvey',NULL,'opensurvey','$user->rights->opensurvey->read','$conf->opensurvey->enabled',0,'2020-06-12 17:12:29'),(166999,'all',1,'opensurvey','left','tools',-1,'opensurvey','tools',210,'/opensurvey/wizard/index.php','','NewSurvey','opensurvey',NULL,'opensurvey_new','$user->rights->opensurvey->write','$conf->opensurvey->enabled',0,'2020-06-12 17:12:29'),(167000,'all',1,'opensurvey','left','tools',-1,'opensurvey','tools',220,'/opensurvey/list.php','','List','opensurvey',NULL,'opensurvey_list','$user->rights->opensurvey->read','$conf->opensurvey->enabled',0,'2020-06-12 17:12:29'),(167001,'all',1,'takepos','top','takepos',0,NULL,NULL,1001,'/takepos/index.php','takepos','PointOfSaleShort','cashdesk',NULL,NULL,'$user->rights->takepos->run','$conf->takepos->enabled',2,'2020-06-12 17:12:30'),(167002,'all',1,'website','top','website',0,NULL,NULL,100,'/website/index.php','','WebSites','website',NULL,NULL,'$user->rights->website->read','$conf->website->enabled',2,'2020-06-12 17:12:30');
+INSERT INTO `llx_menu` VALUES (103094,'all',2,'agenda','top','agenda',0,NULL,NULL,100,'/comm/action/index.php','','Agenda','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103095,'all',2,'agenda','left','agenda',103094,NULL,NULL,100,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Actions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103096,'all',2,'agenda','left','agenda',103095,NULL,NULL,101,'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create','','NewAction','commercial',NULL,NULL,'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103097,'all',2,'agenda','left','agenda',103095,NULL,NULL,102,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Calendar','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103098,'all',2,'agenda','left','agenda',103097,NULL,NULL,103,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103099,'all',2,'agenda','left','agenda',103097,NULL,NULL,104,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103100,'all',2,'agenda','left','agenda',103097,NULL,NULL,105,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103101,'all',2,'agenda','left','agenda',103097,NULL,NULL,106,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103102,'all',2,'agenda','left','agenda',103095,NULL,NULL,112,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda','','List','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103103,'all',2,'agenda','left','agenda',103102,NULL,NULL,113,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103104,'all',2,'agenda','left','agenda',103102,NULL,NULL,114,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103105,'all',2,'agenda','left','agenda',103102,NULL,NULL,115,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103106,'all',2,'agenda','left','agenda',103102,NULL,NULL,116,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103107,'all',2,'agenda','left','agenda',103095,NULL,NULL,120,'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Reportings','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103134,'all',2,'opensurvey','top','opensurvey',0,NULL,NULL,200,'/opensurvey/index.php','','Surveys','opensurvey',NULL,NULL,'$user->rights->opensurvey->survey->read','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(103135,'all',2,'opensurvey','left','opensurvey',-1,NULL,'opensurvey',200,'/opensurvey/index.php?mainmenu=opensurvey&leftmenu=opensurvey','','Survey','opensurvey@opensurvey',NULL,'opensurvey','','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(103136,'all',2,'opensurvey','left','opensurvey',-1,'opensurvey','opensurvey',210,'/opensurvey/public/index.php','_blank','NewSurvey','opensurvey@opensurvey',NULL,'opensurvey_new','','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(103137,'all',2,'opensurvey','left','opensurvey',-1,'opensurvey','opensurvey',220,'/opensurvey/list.php','','List','opensurvey@opensurvey',NULL,'opensurvey_list','','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(145127,'all',1,'printing','left','home',-1,'admintools','home',300,'/printing/index.php?mainmenu=home&leftmenu=admintools','','MenuDirectPrinting','printing',NULL,NULL,'$user->rights->printing->read','$conf->printing->enabled && $leftmenu==\'admintools\'',0,'2017-01-29 15:12:44'),(161088,'auguria',1,'','top','home',0,NULL,NULL,10,'/index.php?mainmenu=home&amp;leftmenu=','','Home','',-1,'','','1',2,'2017-08-30 15:14:30'),(161089,'auguria',1,'societe|fournisseur','top','companies',0,NULL,NULL,20,'/societe/index.php?mainmenu=companies&amp;leftmenu=','','ThirdParties','companies',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)',2,'2017-08-30 15:14:30'),(161090,'auguria',1,'product|service','top','products',0,NULL,NULL,30,'/product/index.php?mainmenu=products&amp;leftmenu=','','Products/Services','products',-1,'','$user->rights->produit->lire||$user->rights->service->lire','$conf->product->enabled || $conf->service->enabled',0,'2017-08-30 15:14:30'),(161092,'auguria',1,'propal|commande|fournisseur|contrat|ficheinter','top','commercial',0,NULL,NULL,40,'/comm/index.php?mainmenu=commercial&amp;leftmenu=','','Commercial','commercial',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','$conf->propal->enabled || $conf->commande->enabled || $conf->supplier_order->enabled || $conf->contrat->enabled || $conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(161093,'auguria',1,'comptabilite|accounting|facture|don|tax|salaries|loan','top','accountancy',0,NULL,NULL,50,'/compta/index.php?mainmenu=accountancy&amp;leftmenu=','','MenuFinancial','compta',-1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->facture->lire|| $user->rights->don->lire || $user->rights->tax->charges->lire || $user->rights->salaries->read || $user->rights->loan->read','$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->don->enabled  || $conf->tax->enabled || $conf->salaries->enabled || $conf->supplier_invoice->enabled || $conf->loan->enabled',2,'2017-08-30 15:14:30'),(161094,'auguria',1,'projet','top','project',0,NULL,NULL,70,'/projet/index.php?mainmenu=project&amp;leftmenu=','','Projects','projects',-1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(161095,'auguria',1,'mailing|export|import|opensurvey|resource','top','tools',0,NULL,NULL,90,'/core/tools.php?mainmenu=tools&amp;leftmenu=','','Tools','other',-1,'','$user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run || $user->rights->opensurvey->read || $user->rights->resource->read','$conf->mailing->enabled || $conf->export->enabled || $conf->import->enabled || $conf->opensurvey->enabled || $conf->resource->enabled',2,'2017-08-30 15:14:30'),(161101,'auguria',1,'banque|prelevement','top','bank',0,NULL,NULL,60,'/compta/bank/index.php?mainmenu=bank&amp;leftmenu=bank','','MenuBankCash','banks',-1,'','$user->rights->banque->lire || $user->rights->prelevement->bons->lire','$conf->banque->enabled || $conf->prelevement->enabled',0,'2017-08-30 15:14:30'),(161102,'auguria',1,'hrm|holiday|deplacement|expensereport','top','hrm',0,NULL,NULL,80,'/hrm/index.php?mainmenu=hrm&amp;leftmenu=','','HRM','holiday',-1,'','$user->rights->hrm->employee->read || $user->rights->holiday->write || $user->rights->deplacement->lire || $user->rights->expensereport->lire','$conf->hrm->enabled || $conf->holiday->enabled || $conf->deplacement->enabled || $conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(161177,'auguria',1,'','left','home',161088,NULL,NULL,0,'/index.php','','MyDashboard','',0,'','','1',2,'2017-08-30 15:14:30'),(161187,'auguria',1,'','left','home',161088,NULL,NULL,1,'/admin/index.php?leftmenu=setup','','Setup','admin',0,'setup','','$user->admin',2,'2017-08-30 15:14:30'),(161188,'auguria',1,'','left','home',161187,NULL,NULL,1,'/admin/company.php?leftmenu=setup','','MenuCompanySetup','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161189,'auguria',1,'','left','home',161187,NULL,NULL,4,'/admin/ihm.php?leftmenu=setup','','GUISetup','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161190,'auguria',1,'','left','home',161187,NULL,NULL,2,'/admin/modules.php?leftmenu=setup','','Modules','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161191,'auguria',1,'','left','home',161187,NULL,NULL,6,'/admin/boxes.php?leftmenu=setup','','Boxes','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161192,'auguria',1,'','left','home',161187,NULL,NULL,3,'/admin/menus.php?leftmenu=setup','','Menus','admin',1,'','','$leftmenu==\'setup\'',2,'2017-09-06 08:29:47'),(161193,'auguria',1,'','left','home',161187,NULL,NULL,7,'/admin/delais.php?leftmenu=setup','','Alerts','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161194,'auguria',1,'','left','home',161187,NULL,NULL,10,'/admin/pdf.php?leftmenu=setup','','PDF','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161195,'auguria',1,'','left','home',161187,NULL,NULL,8,'/admin/security_other.php?leftmenu=setup','','Security','admin',1,'','','$leftmenu==\'setup\'',2,'2017-09-06 08:29:36'),(161196,'auguria',1,'','left','home',161187,NULL,NULL,11,'/admin/mails.php?leftmenu=setup','','Emails','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161197,'auguria',1,'','left','home',161187,NULL,NULL,9,'/admin/limits.php?leftmenu=setup','','MenuLimits','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161198,'auguria',1,'','left','home',161187,NULL,NULL,13,'/admin/dict.php?leftmenu=setup','','Dictionary','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161199,'auguria',1,'','left','home',161187,NULL,NULL,14,'/admin/const.php?leftmenu=setup','','OtherSetup','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161200,'auguria',1,'','left','home',161187,NULL,NULL,12,'/admin/sms.php?leftmenu=setup','','SMS','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161201,'auguria',1,'','left','home',161187,NULL,NULL,4,'/admin/translation.php?leftmenu=setup','','Translation','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161288,'auguria',1,'','left','home',161387,NULL,NULL,0,'/admin/system/dolibarr.php?leftmenu=admintools','','InfoDolibarr','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161289,'auguria',1,'','left','home',161288,NULL,NULL,2,'/admin/system/modules.php?leftmenu=admintools','','Modules','admin',2,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161290,'auguria',1,'','left','home',161288,NULL,NULL,3,'/admin/triggers.php?leftmenu=admintools','','Triggers','admin',2,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161291,'auguria',1,'','left','home',161288,NULL,NULL,4,'/admin/system/filecheck.php?leftmenu=admintools','','FileCheck','admin',2,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161292,'auguria',1,'','left','home',161387,NULL,NULL,1,'/admin/system/browser.php?leftmenu=admintools','','InfoBrowser','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161293,'auguria',1,'','left','home',161387,NULL,NULL,2,'/admin/system/os.php?leftmenu=admintools','','InfoOS','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161294,'auguria',1,'','left','home',161387,NULL,NULL,3,'/admin/system/web.php?leftmenu=admintools','','InfoWebServer','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161295,'auguria',1,'','left','home',161387,NULL,NULL,4,'/admin/system/phpinfo.php?leftmenu=admintools','','InfoPHP','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161297,'auguria',1,'','left','home',161387,NULL,NULL,5,'/admin/system/database.php?leftmenu=admintools','','InfoDatabase','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161387,'auguria',1,'','left','home',161088,NULL,NULL,2,'/admin/tools/index.php?leftmenu=admintools','','AdminTools','admin',0,'admintools','','$user->admin',2,'2017-08-30 15:14:30'),(161388,'auguria',1,'','left','home',161387,NULL,NULL,6,'/admin/tools/dolibarr_export.php?leftmenu=admintools','','Backup','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161389,'auguria',1,'','left','home',161387,NULL,NULL,7,'/admin/tools/dolibarr_import.php?leftmenu=admintools','','Restore','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161392,'auguria',1,'','left','home',161387,NULL,NULL,8,'/admin/tools/update.php?leftmenu=admintools','','MenuUpgrade','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161393,'auguria',1,'','left','home',161387,NULL,NULL,9,'/admin/tools/eaccelerator.php?leftmenu=admintools','','EAccelerator','admin',1,'','','$leftmenu==\"admintools\" && function_exists(\"eaccelerator_info\")',2,'2017-08-30 15:14:30'),(161394,'auguria',1,'','left','home',161387,NULL,NULL,10,'/admin/tools/listevents.php?leftmenu=admintools','','Audit','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161395,'auguria',1,'','left','home',161387,NULL,NULL,11,'/admin/tools/listsessions.php?leftmenu=admintools','','Sessions','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161396,'auguria',1,'','left','home',161387,NULL,NULL,12,'/admin/tools/purge.php?leftmenu=admintools','','Purge','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161398,'auguria',1,'','left','home',161387,NULL,NULL,14,'/admin/system/about.php?leftmenu=admintools','','ExternalResources','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161407,'auguria',1,'','left','home',161387,NULL,NULL,15,'/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=admintools','','ProductVatMassChange','products',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161487,'auguria',1,'','left','home',161088,NULL,NULL,4,'/user/home.php?leftmenu=users','','MenuUsersAndGroups','users',0,'users','','1',2,'2017-08-30 15:14:30'),(161488,'auguria',1,'','left','home',161487,NULL,NULL,0,'/user/index.php?leftmenu=users','','Users','users',1,'','$user->rights->user->user->lire || $user->admin','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161489,'auguria',1,'','left','home',161488,NULL,NULL,0,'/user/card.php?leftmenu=users&amp;action=create','','NewUser','users',2,'','($user->rights->user->user->creer || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161490,'auguria',1,'','left','home',161487,NULL,NULL,1,'/user/group/index.php?leftmenu=users','','Groups','users',1,'','(($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161491,'auguria',1,'','left','home',161490,NULL,NULL,0,'/user/group/card.php?leftmenu=users&amp;action=create','','NewGroup','users',2,'','(($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161587,'auguria',1,'','left','companies',161089,NULL,NULL,0,'/societe/index.php?leftmenu=thirdparties','','ThirdParty','companies',0,'thirdparties','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161588,'auguria',1,'','left','companies',161587,NULL,NULL,0,'/societe/card.php?action=create','','MenuNewThirdParty','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161589,'auguria',1,'','left','companies',161587,NULL,NULL,0,'/societe/list.php?action=create','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161590,'auguria',1,'','left','companies',161587,NULL,NULL,5,'/societe/list.php?type=f&leftmenu=suppliers','','ListSuppliersShort','suppliers',1,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2017-08-30 15:14:30'),(161591,'auguria',1,'','left','companies',161590,NULL,NULL,0,'/societe/card.php?leftmenu=supplier&amp;action=create&amp;type=f','','NewSupplier','suppliers',2,'','$user->rights->societe->creer','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2017-08-30 15:14:30'),(161593,'auguria',1,'','left','companies',161587,NULL,NULL,3,'/societe/list.php?type=p&leftmenu=prospects','','ListProspectsShort','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161594,'auguria',1,'','left','companies',161593,NULL,NULL,0,'/societe/card.php?leftmenu=prospects&amp;action=create&amp;type=p','','MenuNewProspect','companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161596,'auguria',1,'','left','companies',161587,NULL,NULL,4,'/societe/list.php?type=c&leftmenu=customers','','ListCustomersShort','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161597,'auguria',1,'','left','companies',161596,NULL,NULL,0,'/societe/card.php?leftmenu=customers&amp;action=create&amp;type=c','','MenuNewCustomer','companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161687,'auguria',1,'','left','companies',161089,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','ContactsAddresses','companies',0,'contacts','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161688,'auguria',1,'','left','companies',161687,NULL,NULL,0,'/contact/card.php?leftmenu=contacts&amp;action=create','','NewContactAddress','companies',1,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161689,'auguria',1,'','left','companies',161687,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161691,'auguria',1,'','left','companies',161689,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&amp;type=p','','ThirdPartyProspects','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161692,'auguria',1,'','left','companies',161689,NULL,NULL,2,'/contact/list.php?leftmenu=contacts&amp;type=c','','ThirdPartyCustomers','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161693,'auguria',1,'','left','companies',161689,NULL,NULL,3,'/contact/list.php?leftmenu=contacts&amp;type=f','','ThirdPartySuppliers','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2017-08-30 15:14:30'),(161694,'auguria',1,'','left','companies',161689,NULL,NULL,4,'/contact/list.php?leftmenu=contacts&amp;type=o','','Others','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161737,'auguria',1,'','left','companies',161089,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=1','','SuppliersCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161738,'auguria',1,'','left','companies',161737,NULL,NULL,0,'/categories/card.php?action=create&amp;type=1','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161747,'auguria',1,'','left','companies',161089,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=2','','CustomersProspectsCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161748,'auguria',1,'','left','companies',161747,NULL,NULL,0,'/categories/card.php?action=create&amp;type=2','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161757,'auguria',1,'','left','companies',161089,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=4','','ContactCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161758,'auguria',1,'','left','companies',161757,NULL,NULL,0,'/categories/card.php?action=create&amp;type=4','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(162187,'auguria',1,'','left','commercial',161092,NULL,NULL,4,'/comm/propal/index.php?leftmenu=propals','','Prop','propal',0,'propals','$user->rights->propale->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162188,'auguria',1,'','left','commercial',162187,NULL,NULL,0,'/comm/propal/card.php?action=create&amp;leftmenu=propals','','NewPropal','propal',1,'','$user->rights->propale->creer','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162189,'auguria',1,'','left','commercial',162187,NULL,NULL,1,'/comm/propal/list.php?leftmenu=propals','','List','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162190,'auguria',1,'','left','commercial',162189,NULL,NULL,2,'/comm/propal/list.php?leftmenu=propals&amp;search_status=0','','PropalsDraft','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162191,'auguria',1,'','left','commercial',162189,NULL,NULL,3,'/comm/propal/list.php?leftmenu=propals&amp;search_status=1','','PropalsOpened','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162192,'auguria',1,'','left','commercial',162189,NULL,NULL,4,'/comm/propal/list.php?leftmenu=propals&amp;search_status=2','','PropalStatusSigned','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162193,'auguria',1,'','left','commercial',162189,NULL,NULL,5,'/comm/propal/list.php?leftmenu=propals&amp;search_status=3','','PropalStatusNotSigned','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162194,'auguria',1,'','left','commercial',162189,NULL,NULL,6,'/comm/propal/list.php?leftmenu=propals&amp;search_status=4','','PropalStatusBilled','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162197,'auguria',1,'','left','commercial',162187,NULL,NULL,4,'/comm/propal/stats/index.php?leftmenu=propals','','Statistics','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162287,'auguria',1,'','left','commercial',161092,NULL,NULL,5,'/commande/index.php?leftmenu=orders','','CustomersOrders','orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162288,'auguria',1,'','left','commercial',162287,NULL,NULL,0,'/commande/card.php?action=create&amp;leftmenu=orders','','NewOrder','orders',1,'','$user->rights->commande->creer','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162289,'auguria',1,'','left','commercial',162287,NULL,NULL,1,'/commande/list.php?leftmenu=orders','','List','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162290,'auguria',1,'','left','commercial',162289,NULL,NULL,2,'/commande/list.php?leftmenu=orders&amp;search_status=0','','StatusOrderDraftShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162291,'auguria',1,'','left','commercial',162289,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;search_status=1','','StatusOrderValidated','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162292,'auguria',1,'','left','commercial',162289,NULL,NULL,4,'/commande/list.php?leftmenu=orders&amp;search_status=2','','StatusOrderOnProcessShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162293,'auguria',1,'','left','commercial',162289,NULL,NULL,5,'/commande/list.php?leftmenu=orders&amp;search_status=3','','StatusOrderToBill','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162294,'auguria',1,'','left','commercial',162289,NULL,NULL,6,'/commande/list.php?leftmenu=orders&amp;search_status=4','','StatusOrderProcessed','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162295,'auguria',1,'','left','commercial',162289,NULL,NULL,7,'/commande/list.php?leftmenu=orders&amp;search_status=-1','','StatusOrderCanceledShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162296,'auguria',1,'','left','commercial',162287,NULL,NULL,4,'/commande/stats/index.php?leftmenu=orders','','Statistics','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162387,'auguria',1,'','left','commercial',161090,NULL,NULL,6,'/expedition/index.php?leftmenu=sendings','','Shipments','sendings',0,'sendings','$user->rights->expedition->lire','$conf->expedition->enabled',2,'2017-08-30 15:14:30'),(162388,'auguria',1,'','left','commercial',162387,NULL,NULL,0,'/expedition/card.php?action=create2&leftmenu=sendings','','NewSending','sendings',1,'','$user->rights->expedition->creer','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2017-08-30 15:14:30'),(162389,'auguria',1,'','left','commercial',162387,NULL,NULL,1,'/expedition/list.php?leftmenu=sendings','','List','sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2017-08-30 15:14:30'),(162390,'auguria',1,'','left','commercial',162387,NULL,NULL,2,'/expedition/stats/index.php?leftmenu=sendings','','Statistics','sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2017-08-30 15:14:30'),(162487,'auguria',1,'','left','commercial',161092,NULL,NULL,7,'/contrat/index.php?leftmenu=contracts','','Contracts','contracts',0,'contracts','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162488,'auguria',1,'','left','commercial',162487,NULL,NULL,0,'/contrat/card.php?&action=create&amp;leftmenu=contracts','','NewContract','contracts',1,'','$user->rights->contrat->creer','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162489,'auguria',1,'','left','commercial',162487,NULL,NULL,1,'/contrat/list.php?leftmenu=contracts','','List','contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162490,'auguria',1,'','left','commercial',162487,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts','','MenuServices','contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162491,'auguria',1,'','left','commercial',162490,NULL,NULL,0,'/contrat/services.php?leftmenu=contracts&amp;mode=0','','MenuInactiveServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162492,'auguria',1,'','left','commercial',162490,NULL,NULL,1,'/contrat/services.php?leftmenu=contracts&amp;mode=4','','MenuRunningServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162493,'auguria',1,'','left','commercial',162490,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts&amp;mode=4&amp;filter=expired','','MenuExpiredServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162494,'auguria',1,'','left','commercial',162490,NULL,NULL,3,'/contrat/services.php?leftmenu=contracts&amp;mode=5','','MenuClosedServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162587,'auguria',1,'','left','commercial',161092,NULL,NULL,8,'/fichinter/list.php?leftmenu=ficheinter','','Interventions','interventions',0,'ficheinter','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162588,'auguria',1,'','left','commercial',162587,NULL,NULL,0,'/fichinter/card.php?action=create&amp;leftmenu=ficheinter','','NewIntervention','interventions',1,'','$user->rights->ficheinter->creer','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162589,'auguria',1,'','left','commercial',162587,NULL,NULL,1,'/fichinter/list.php?leftmenu=ficheinter','','List','interventions',1,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162590,'auguria',1,'','left','commercial',162587,NULL,NULL,2,'/fichinter/stats/index.php?leftmenu=ficheinter','','Statistics','interventions',1,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162687,'auguria',1,'','left','accountancy',161093,NULL,NULL,3,'/fourn/facture/list.php?leftmenu=suppliers_bills','','BillsSuppliers','bills',0,'supplier_bills','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162688,'auguria',1,'','left','accountancy',162687,NULL,NULL,0,'/fourn/facture/card.php?action=create&amp;leftmenu=suppliers_bills','','NewBill','bills',1,'','$user->rights->fournisseur->facture->creer','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162689,'auguria',1,'','left','accountancy',162687,NULL,NULL,1,'/fourn/facture/list.php?leftmenu=suppliers_bills','','List','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162690,'auguria',1,'','left','accountancy',162687,NULL,NULL,2,'/fourn/facture/paiement.php?leftmenu=suppliers_bills','','Payments','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162691,'auguria',1,'','left','accountancy',162687,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills&mode=supplier','','Statistics','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162692,'auguria',1,'','left','accountancy',162690,NULL,NULL,1,'/fourn/facture/rapport.php?leftmenu=suppliers_bills','','Reporting','bills',2,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162787,'auguria',1,'','left','accountancy',161093,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills','','BillsCustomers','bills',0,'customer_bills','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162788,'auguria',1,'','left','accountancy',162787,NULL,NULL,3,'/compta/facture/card.php?action=create&amp;leftmenu=customers_bills','','NewBill','bills',1,'','$user->rights->facture->creer','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162789,'auguria',1,'','left','accountancy',162787,NULL,NULL,5,'/compta/facture/fiche-rec.php?leftmenu=customers_bills','','ListOfTemplates','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162791,'auguria',1,'','left','accountancy',162787,NULL,NULL,6,'/compta/paiement/list.php?leftmenu=customers_bills','','Payments','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162792,'auguria',1,'','left','accountancy',162787,NULL,NULL,4,'/compta/facture/list.php?leftmenu=customers_bills','','List','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162797,'auguria',1,'','left','accountancy',162791,NULL,NULL,1,'/compta/paiement/rapport.php?leftmenu=customers_bills','','Reportings','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162798,'auguria',1,'','left','accountancy',161101,NULL,NULL,9,'/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank','','MenuChequeDeposits','bills',0,'checks','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2017-08-30 15:14:30'),(162799,'auguria',1,'','left','accountancy',162798,NULL,NULL,0,'/compta/paiement/cheque/card.php?leftmenu=checks&amp;action=new','','NewCheckDeposit','compta',1,'','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2017-08-30 15:14:30'),(162800,'auguria',1,'','left','accountancy',162798,NULL,NULL,1,'/compta/paiement/cheque/list.php?leftmenu=checks','','List','bills',1,'','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2017-08-30 15:14:30'),(162801,'auguria',1,'','left','accountancy',162787,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills','','Statistics','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162807,'auguria',1,'','left','accountancy',162792,NULL,NULL,1,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=0','','BillShortStatusDraft','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162808,'auguria',1,'','left','accountancy',162792,NULL,NULL,2,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=1','','BillShortStatusNotPaid','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162809,'auguria',1,'','left','accountancy',162792,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=2','','BillShortStatusPaid','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162810,'auguria',1,'','left','accountancy',162792,NULL,NULL,4,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=3','','BillShortStatusCanceled','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162987,'auguria',1,'','left','accountancy',161093,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;search_status=3','','MenuOrdersToBill','orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',0,'2017-08-30 15:14:30'),(163087,'auguria',1,'','left','accountancy',161093,NULL,NULL,4,'/don/index.php?leftmenu=donations&amp;mainmenu=accountancy','','Donations','donations',0,'donations','$user->rights->don->lire','$conf->don->enabled',2,'2017-08-30 15:14:30'),(163088,'auguria',1,'','left','accountancy',163087,NULL,NULL,0,'/don/card.php?leftmenu=donations&amp;mainmenu=accountancy&amp;action=create','','NewDonation','donations',1,'','$user->rights->don->creer','$conf->don->enabled && $leftmenu==\"donations\"',2,'2017-08-30 15:14:30'),(163089,'auguria',1,'','left','accountancy',163087,NULL,NULL,1,'/don/list.php?leftmenu=donations&amp;mainmenu=accountancy','','List','donations',1,'','$user->rights->don->lire','$conf->don->enabled && $leftmenu==\"donations\"',2,'2017-08-30 15:14:30'),(163187,'auguria',1,'','left','accountancy',161102,NULL,NULL,5,'/compta/deplacement/index.php?leftmenu=tripsandexpenses','','TripsAndExpenses','trips',0,'tripsandexpenses','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163188,'auguria',1,'','left','accountancy',163187,NULL,NULL,1,'/compta/deplacement/card.php?action=create&amp;leftmenu=tripsandexpenses','','New','trips',1,'','$user->rights->deplacement->creer','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163189,'auguria',1,'','left','accountancy',163187,NULL,NULL,2,'/compta/deplacement/list.php?leftmenu=tripsandexpenses','','List','trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163190,'auguria',1,'','left','accountancy',163187,NULL,NULL,2,'/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses','','Statistics','trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163287,'auguria',1,'','left','accountancy',161093,NULL,NULL,6,'/compta/charges/index.php?leftmenu=tax&amp;mainmenu=accountancy','','MenuSpecialExpenses','compta',0,'tax','(! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (! empty($conf->salaries->enabled) && $user->rights->salaries->read)','$conf->tax->enabled || $conf->salaries->enabled',0,'2017-08-30 15:14:30'),(163297,'auguria',1,'','left','accountancy',163287,NULL,NULL,1,'/compta/salaries/index.php?leftmenu=tax_salary&amp;mainmenu=accountancy','','Salaries','salaries',1,'tax_sal','$user->rights->salaries->payment->read','$conf->salaries->enabled',0,'2017-08-30 15:14:30'),(163298,'auguria',1,'','left','accountancy',163297,NULL,NULL,2,'/compta/salaries/card.php?leftmenu=tax_salary&amp;action=create','','NewPayment','companies',2,'','$user->rights->salaries->payment->write','$conf->salaries->enabled && $leftmenu==\"tax_salary\"',0,'2017-08-30 15:14:30'),(163299,'auguria',1,'','left','accountancy',163297,NULL,NULL,3,'/compta/salaries/index.php?leftmenu=tax_salary','','Payments','companies',2,'','$user->rights->salaries->payment->read','$conf->salaries->enabled && $leftmenu==\"tax_salary\"',0,'2017-08-30 15:14:30'),(163307,'auguria',1,'','left','accountancy',163287,NULL,NULL,1,'/loan/index.php?leftmenu=tax_loan&amp;mainmenu=accountancy','','Loans','loan',1,'tax_loan','$user->rights->loan->read','$conf->loan->enabled',0,'2017-08-30 15:14:30'),(163308,'auguria',1,'','left','accountancy',163307,NULL,NULL,2,'/loan/card.php?leftmenu=tax_loan&amp;action=create','','NewLoan','loan',2,'','$user->rights->loan->write','$conf->loan->enabled && $leftmenu==\"tax_loan\"',0,'2017-08-30 15:14:30'),(163310,'auguria',1,'','left','accountancy',163307,NULL,NULL,4,'/loan/calc.php?leftmenu=tax_loan','','Calculator','companies',2,'','$user->rights->loan->calc','$conf->loan->enabled && $leftmenu==\"tax_loan\" && ! empty($conf->global->LOAN_SHOW_CALCULATOR)',0,'2017-08-30 15:14:30'),(163337,'auguria',1,'','left','accountancy',163287,NULL,NULL,1,'/compta/sociales/index.php?leftmenu=tax_social','','SocialContributions','',1,'tax_social','$user->rights->tax->charges->lire','$conf->tax->enabled',0,'2017-08-30 15:14:30'),(163338,'auguria',1,'','left','accountancy',163337,NULL,NULL,2,'/compta/sociales/card.php?leftmenu=tax_social&amp;action=create','','MenuNewSocialContribution','',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2017-08-30 15:14:30'),(163339,'auguria',1,'','left','accountancy',163337,NULL,NULL,3,'/compta/sociales/payments.php?leftmenu=tax_social&amp;mainmenu=accountancy&amp;mode=sconly','','Payments','',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2017-08-30 15:14:30'),(163387,'auguria',1,'','left','accountancy',163287,NULL,NULL,7,'/compta/tva/index.php?leftmenu=tax_vat&amp;mainmenu=accountancy','','VAT','companies',1,'tax_vat','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS)',0,'2017-08-30 15:14:30'),(163388,'auguria',1,'','left','accountancy',163387,NULL,NULL,0,'/compta/tva/card.php?leftmenu=tax_vat&amp;action=create','','New','companies',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163389,'auguria',1,'','left','accountancy',163387,NULL,NULL,1,'/compta/tva/reglement.php?leftmenu=tax_vat','','List','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163390,'auguria',1,'','left','accountancy',163387,NULL,NULL,2,'/compta/tva/clients.php?leftmenu=tax_vat','','ReportByCustomers','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163391,'auguria',1,'','left','accountancy',163387,NULL,NULL,3,'/compta/tva/quadri_detail.php?leftmenu=tax_vat','','ReportByQuarter','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163487,'auguria',1,'','left','accountancy',161093,NULL,NULL,7,'/accountancy/index.php?leftmenu=accountancy','','MenuAccountancy','accountancy',0,'accounting','! empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163488,'auguria',1,'','left','accountancy',163487,NULL,NULL,2,'/accountancy/customer/index.php?leftmenu=dispatch_customer','','CustomersVentilation','accountancy',1,'dispatch_customer','$user->rights->accounting->bind->write','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163489,'auguria',1,'','left','accountancy',163488,NULL,NULL,3,'/accountancy/customer/list.php','','ToDispatch','accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $leftmenu==\"dispatch_customer\"',0,'2017-08-30 15:14:30'),(163490,'auguria',1,'','left','accountancy',163488,NULL,NULL,4,'/accountancy/customer/lines.php','','Dispatched','accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $leftmenu==\"dispatch_customer\"',0,'2017-08-30 15:14:30'),(163497,'auguria',1,'','left','accountancy',163487,NULL,NULL,5,'/accountancy/supplier/index.php?leftmenu=dispatch_supplier','','SuppliersVentilation','accountancy',1,'ventil_supplier','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->fournisseur->enabled',0,'2017-08-30 15:14:30'),(163498,'auguria',1,'','left','accountancy',163497,NULL,NULL,6,'/accountancy/supplier/list.php','','ToDispatch','accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu==\"dispatch_supplier\"',0,'2017-08-30 15:14:30'),(163499,'auguria',1,'','left','accountancy',163497,NULL,NULL,7,'/accountancy/supplier/lines.php','','Dispatched','accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu==\"dispatch_supplier\"',0,'2017-08-30 15:14:30'),(163507,'auguria',1,'','left','accountancy',163487,NULL,NULL,5,'/accountancy/expensereport/index.php?leftmenu=dispatch_expensereport','','ExpenseReportsVentilation','accountancy',1,'ventil_expensereport','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(163508,'auguria',1,'','left','accountancy',163507,NULL,NULL,6,'/accountancy/expensereport/list.php','','ToDispatch','accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu==\"dispatch_expensereport\"',0,'2017-08-30 15:14:30'),(163509,'auguria',1,'','left','accountancy',163507,NULL,NULL,7,'/accountancy/expensereport/lines.php','','Dispatched','accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu==\"dispatch_expensereport\"',0,'2017-08-30 15:14:30'),(163517,'auguria',1,'','left','accountancy',163487,NULL,NULL,15,'/accountancy/bookkeeping/list.php','','Bookkeeping','accountancy',1,'bookkeeping','$user->rights->accounting->mouvements->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163522,'auguria',1,'','left','accountancy',163487,NULL,NULL,16,'/accountancy/bookkeeping/balance.php','','AccountBalance','accountancy',1,'balance','$user->rights->accounting->mouvements->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163527,'auguria',1,'','left','accountancy',163487,NULL,NULL,17,'/accountancy/report/result.php?mainmenu=accountancy&leftmenu=accountancy','','Reportings','main',1,'report','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163528,'auguria',1,'','left','accountancy',163527,NULL,NULL,19,'/compta/resultat/index.php?mainmenu=accountancy&leftmenu=accountancy','','ReportInOut','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163529,'auguria',1,'','left','accountancy',163528,NULL,NULL,18,'/accountancy/report/result.php?mainmenu=accountancy&leftmenu=accountancy','','ByAccounts','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163530,'auguria',1,'','left','accountancy',163528,NULL,NULL,20,'/compta/resultat/clientfourn.php?mainmenu=accountancy&leftmenu=accountancy','','ByCompanies','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163531,'auguria',1,'','left','accountancy',163527,NULL,NULL,21,'/compta/stats/index.php?mainmenu=accountancy&leftmenu=accountancy','','ReportTurnover','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163532,'auguria',1,'','left','accountancy',163531,NULL,NULL,22,'/compta/stats/casoc.php?mainmenu=accountancy&leftmenu=accountancy','','ByCompanies','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163533,'auguria',1,'','left','accountancy',163531,NULL,NULL,23,'/compta/stats/cabyuser.php?mainmenu=accountancy&leftmenu=accountancy','','ByUsers','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163534,'auguria',1,'','left','accountancy',163531,NULL,NULL,24,'/compta/stats/cabyprodserv.php?mainmenu=accountancy&leftmenu=accountancy','','ByProductsAndServices','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163537,'auguria',1,'','left','accountancy',163538,NULL,NULL,80,'/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin','','FiscalPeriod','admin',1,'accountancy_admin_period','','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\" && $conf->global->MAIN_FEATURES_LEVEL > 0',2,'2017-08-30 15:14:30'),(163538,'auguria',1,'','left','accountancy',163487,NULL,NULL,1,'/accountancy/index.php?mainmenu=accountancy&leftmenu=accountancy_admin','','Setup','accountancy',1,'accountancy_admin','$user->rights->accounting->chartofaccount','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163541,'auguria',1,'','left','accountancy',163538,NULL,NULL,10,'/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin','','AccountingJournals','accountancy',2,'accountancy_admin_journal','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163542,'auguria',1,'','left','accountancy',163538,NULL,NULL,20,'/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin','','Pcg_version','accountancy',2,'accountancy_admin_chartmodel','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163543,'auguria',1,'','left','accountancy',163538,NULL,NULL,30,'/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin','','Chartofaccounts','accountancy',2,'accountancy_admin_chart','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163544,'auguria',1,'','left','accountancy',163538,NULL,NULL,40,'/accountancy/admin/categories_list.php?id=32&mainmenu=accountancy&leftmenu=accountancy_admin','','AccountingCategory','accountancy',2,'accountancy_admin_chart_group','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163545,'auguria',1,'','left','accountancy',163538,NULL,NULL,50,'/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin','','MenuDefaultAccounts','accountancy',2,'accountancy_admin_default','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163546,'auguria',1,'','left','accountancy',163538,NULL,NULL,60,'/admin/dict.php?id=10&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin','','MenuVatAccounts','accountancy',2,'accountancy_admin_vat','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163547,'auguria',1,'','left','accountancy',163538,NULL,NULL,70,'/admin/dict.php?id=7&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin','','MenuTaxAccounts','accountancy',2,'accountancy_admin_tax','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163548,'auguria',1,'','left','accountancy',163538,NULL,NULL,80,'/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin','','MenuExpenseReportAccounts','accountancy',2,'accountancy_admin_expensereport','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163549,'auguria',1,'','left','accountancy',163538,NULL,NULL,90,'/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin','','MenuProductsAccounts','accountancy',2,'accountancy_admin_product','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163587,'auguria',1,'','left','accountancy',161101,NULL,NULL,9,'/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank','','StandingOrders','withdrawals',0,'withdraw','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled',2,'2017-08-30 15:14:30'),(163589,'auguria',1,'','left','accountancy',163587,NULL,NULL,0,'/compta/prelevement/create.php?leftmenu=withdraw','','NewStandingOrder','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163590,'auguria',1,'','left','accountancy',163587,NULL,NULL,2,'/compta/prelevement/bons.php?leftmenu=withdraw','','WithdrawalsReceipts','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163591,'auguria',1,'','left','accountancy',163587,NULL,NULL,3,'/compta/prelevement/list.php?leftmenu=withdraw','','WithdrawalsLines','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163593,'auguria',1,'','left','accountancy',163587,NULL,NULL,5,'/compta/prelevement/rejets.php?leftmenu=withdraw','','Rejects','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163594,'auguria',1,'','left','accountancy',163587,NULL,NULL,6,'/compta/prelevement/stats.php?leftmenu=withdraw','','Statistics','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163687,'auguria',1,'','left','accountancy',161101,NULL,NULL,1,'/compta/bank/index.php?leftmenu=bank&amp;mainmenu=bank','','MenuBankCash','banks',0,'bank','$user->rights->banque->lire','$conf->banque->enabled',0,'2017-08-30 15:14:30'),(163688,'auguria',1,'','left','accountancy',163687,NULL,NULL,0,'/compta/bank/card.php?action=create&amp;leftmenu=bank','','MenuNewFinancialAccount','banks',1,'','$user->rights->banque->configurer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163690,'auguria',1,'','left','accountancy',163687,NULL,NULL,2,'/compta/bank/bankentries.php?leftmenu=bank','','ListTransactions','banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163691,'auguria',1,'','left','accountancy',163687,NULL,NULL,3,'/compta/bank/budget.php?leftmenu=bank','','ListTransactionsByCategory','banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163693,'auguria',1,'','left','accountancy',163687,NULL,NULL,5,'/compta/bank/transfer.php?leftmenu=bank','','BankTransfers','banks',1,'','$user->rights->banque->transfer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163737,'auguria',1,'','left','accountancy',161101,NULL,NULL,4,'/categories/index.php?leftmenu=bank&amp;type=5','','Categories','categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(163738,'auguria',1,'','left','accountancy',163737,NULL,NULL,0,'/categories/card.php?leftmenu=bank&amp;action=create&amp;type=5','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(163787,'auguria',1,'','left','accountancy',161093,NULL,NULL,11,'/compta/resultat/index.php?leftmenu=ca&amp;mainmenu=accountancy','','Reportings','main',0,'ca','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled',0,'2017-08-30 15:14:30'),(163792,'auguria',1,'','left','accountancy',163487,NULL,NULL,1,'','','Journalization','main',1,'','$user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163793,'auguria',1,'','left','accountancy',163792,NULL,NULL,4,'/accountancy/journal/sellsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=1','','SellsJournal','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163794,'auguria',1,'','left','accountancy',163792,NULL,NULL,1,'/accountancy/journal/bankjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=3','','BankJournal','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163795,'auguria',1,'','left','accountancy',163792,NULL,NULL,2,'/accountancy/journal/expensereportsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=6','','ExpenseReportJournal','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163796,'auguria',1,'','left','accountancy',163792,NULL,NULL,3,'/accountancy/journal/purchasesjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=2','','PurchasesJournal','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163798,'auguria',1,'','left','accountancy',163787,NULL,NULL,0,'/compta/resultat/index.php?leftmenu=ca','','ReportInOut','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163799,'auguria',1,'','left','accountancy',163788,NULL,NULL,0,'/compta/resultat/clientfourn.php?leftmenu=ca','','ByCompanies','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163800,'auguria',1,'','left','accountancy',163787,NULL,NULL,1,'/compta/stats/index.php?leftmenu=ca','','ReportTurnover','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163801,'auguria',1,'','left','accountancy',163790,NULL,NULL,0,'/compta/stats/casoc.php?leftmenu=ca','','ByCompanies','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163802,'auguria',1,'','left','accountancy',163790,NULL,NULL,1,'/compta/stats/cabyuser.php?leftmenu=ca','','ByUsers','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163803,'auguria',1,'','left','accountancy',163790,NULL,NULL,1,'/compta/stats/cabyprodserv.php?leftmenu=ca','','ByProductsAndServices','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163887,'auguria',1,'','left','products',161090,NULL,NULL,0,'/product/index.php?leftmenu=product&amp;type=0','','Products','products',0,'product','$user->rights->produit->lire','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163888,'auguria',1,'','left','products',163887,NULL,NULL,0,'/product/card.php?leftmenu=product&amp;action=create&amp;type=0','','NewProduct','products',1,'','$user->rights->produit->creer','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163889,'auguria',1,'','left','products',163887,NULL,NULL,1,'/product/list.php?leftmenu=product&amp;type=0','','List','products',1,'','$user->rights->produit->lire','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163890,'auguria',1,'','left','products',163887,NULL,NULL,4,'/product/reassort.php?type=0','','Stocks','products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163891,'auguria',1,'','left','products',163887,NULL,NULL,7,'/product/stats/card.php?id=all&amp;leftmenu=stats&amp;type=0','','Statistics','main',1,'','$user->rights->produit->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(163892,'auguria',1,'','left','products',163887,NULL,NULL,5,'/product/reassortlot.php?type=0','','StocksByLotSerial','products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->productbatch->enabled',2,'2017-08-30 15:14:30'),(163893,'auguria',1,'','left','products',163887,NULL,NULL,6,'/product/stock/productlot_list.php','','LotSerial','products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->productbatch->enabled',2,'2017-08-30 15:14:30'),(163987,'auguria',1,'','left','products',161090,NULL,NULL,1,'/product/index.php?leftmenu=service&amp;type=1','','Services','products',0,'service','$user->rights->service->lire','$conf->service->enabled',2,'2017-08-30 15:14:30'),(163988,'auguria',1,'','left','products',163987,NULL,NULL,0,'/product/card.php?leftmenu=service&amp;action=create&amp;type=1','','NewService','products',1,'','$user->rights->service->creer','$conf->service->enabled',2,'2017-08-30 15:14:30'),(163989,'auguria',1,'','left','products',163987,NULL,NULL,1,'/product/list.php?leftmenu=service&amp;type=1','','List','products',1,'','$user->rights->service->lire','$conf->service->enabled',2,'2017-08-30 15:14:30'),(163990,'auguria',1,'','left','products',163987,NULL,NULL,5,'/product/stats/card.php?id=all&amp;leftmenu=stats&amp;type=1','','Statistics','main',1,'','$user->rights->service->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(164187,'auguria',1,'','left','products',161090,NULL,NULL,3,'/product/stock/index.php?leftmenu=stock','','Stock','stocks',0,'stock','$user->rights->stock->lire','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164188,'auguria',1,'','left','products',164187,NULL,NULL,0,'/product/stock/card.php?action=create','','MenuNewWarehouse','stocks',1,'','$user->rights->stock->creer','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164189,'auguria',1,'','left','products',164187,NULL,NULL,1,'/product/stock/list.php','','List','stocks',1,'','$user->rights->stock->lire','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164191,'auguria',1,'','left','products',164187,NULL,NULL,3,'/product/stock/mouvement.php','','Movements','stocks',1,'','$user->rights->stock->mouvement->lire','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164192,'auguria',1,'','left','products',164187,NULL,NULL,4,'/product/stock/replenish.php','','Replenishments','stocks',1,'','$user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire','$conf->stock->enabled && $conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(164193,'auguria',1,'','left','products',164187,NULL,NULL,5,'/product/stock/massstockmove.php','','MassStockTransferShort','stocks',1,'','$user->rights->stock->mouvement->creer','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164287,'auguria',1,'','left','products',161090,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=0','','Categories','categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164288,'auguria',1,'','left','products',164287,NULL,NULL,0,'/categories/card.php?action=create&amp;type=0','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164487,'auguria',1,'','left','project',161094,NULL,NULL,3,'/projet/activity/perweek.php?leftmenu=projects','','NewTimeSpent','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164687,'auguria',1,'','left','project',161094,NULL,NULL,0,'/projet/index.php?leftmenu=projects','','Projects','projects',0,'projects','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164688,'auguria',1,'','left','project',164687,NULL,NULL,1,'/projet/card.php?leftmenu=projects&amp;action=create','','NewProject','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164689,'auguria',1,'','left','project',164687,NULL,NULL,2,'/projet/list.php?leftmenu=projects','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164690,'auguria',1,'','left','project',164687,NULL,NULL,3,'/projet/stats/index.php?leftmenu=projects','','Statistics','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164787,'auguria',1,'','left','project',161094,NULL,NULL,0,'/projet/activity/index.php?leftmenu=projects','','Activities','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164788,'auguria',1,'','left','project',164787,NULL,NULL,1,'/projet/tasks.php?leftmenu=projects&amp;action=create','','NewTask','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164789,'auguria',1,'','left','project',164787,NULL,NULL,2,'/projet/tasks/list.php?leftmenu=projects','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164791,'auguria',1,'','left','project',164787,NULL,NULL,4,'/projet/tasks/stats/index.php?leftmenu=projects','','Statistics','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164891,'auguria',1,'','left','project',161094,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=6','','Categories','categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164892,'auguria',1,'','left','project',164891,NULL,NULL,0,'/categories/card.php?action=create&amp;type=6','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164987,'auguria',1,'','left','tools',161095,NULL,NULL,0,'/comm/mailing/index.php?leftmenu=mailing','','EMailings','mails',0,'mailing','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2017-08-30 15:14:30'),(164988,'auguria',1,'','left','tools',164987,NULL,NULL,0,'/comm/mailing/card.php?leftmenu=mailing&amp;action=create','','NewMailing','mails',1,'','$user->rights->mailing->creer','$conf->mailing->enabled',0,'2017-08-30 15:14:30'),(164989,'auguria',1,'','left','tools',164987,NULL,NULL,1,'/comm/mailing/list.php?leftmenu=mailing','','List','mails',1,'','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2017-08-30 15:14:30'),(165187,'auguria',1,'','left','tools',161095,NULL,NULL,2,'/exports/index.php?leftmenu=export','','FormatedExport','exports',0,'export','$user->rights->export->lire','$conf->export->enabled',2,'2017-08-30 15:14:30'),(165188,'auguria',1,'','left','tools',165187,NULL,NULL,0,'/exports/export.php?leftmenu=export','','NewExport','exports',1,'','$user->rights->export->creer','$conf->export->enabled',2,'2017-08-30 15:14:30'),(165217,'auguria',1,'','left','tools',161095,NULL,NULL,2,'/imports/index.php?leftmenu=import','','FormatedImport','exports',0,'import','$user->rights->import->run','$conf->import->enabled',2,'2017-08-30 15:14:30'),(165218,'auguria',1,'','left','tools',165217,NULL,NULL,0,'/imports/import.php?leftmenu=import','','NewImport','exports',1,'','$user->rights->import->run','$conf->import->enabled',2,'2017-08-30 15:14:30'),(165287,'auguria',1,'','left','members',161100,NULL,NULL,0,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Members','members',0,'members','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165288,'auguria',1,'','left','members',165287,NULL,NULL,0,'/adherents/card.php?leftmenu=members&amp;action=create','','NewMember','members',1,'','$user->rights->adherent->creer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165289,'auguria',1,'','left','members',165287,NULL,NULL,1,'/adherents/list.php','','List','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165290,'auguria',1,'','left','members',165289,NULL,NULL,2,'/adherents/list.php?leftmenu=members&amp;statut=-1','','MenuMembersToValidate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165291,'auguria',1,'','left','members',165289,NULL,NULL,3,'/adherents/list.php?leftmenu=members&amp;statut=1','','MenuMembersValidated','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165292,'auguria',1,'','left','members',165289,NULL,NULL,4,'/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=outofdate','','MenuMembersNotUpToDate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165293,'auguria',1,'','left','members',165289,NULL,NULL,5,'/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=uptodate','','MenuMembersUpToDate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165294,'auguria',1,'','left','members',165289,NULL,NULL,6,'/adherents/list.php?leftmenu=members&amp;statut=0','','MenuMembersResiliated','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165295,'auguria',1,'','left','members',165287,NULL,NULL,7,'/adherents/stats/geo.php?leftmenu=members&amp;mode=memberbycountry','','MenuMembersStats','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165387,'auguria',1,'','left','members',161100,NULL,NULL,1,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Subscriptions','compta',0,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165388,'auguria',1,'','left','members',165387,NULL,NULL,0,'/adherents/list.php?statut=-1&amp;leftmenu=accountancy&amp;mainmenu=members','','NewSubscription','compta',1,'','$user->rights->adherent->cotisation->creer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165389,'auguria',1,'','left','members',165387,NULL,NULL,1,'/adherents/subscription/list.php?leftmenu=members','','List','compta',1,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165390,'auguria',1,'','left','members',165387,NULL,NULL,7,'/adherents/stats/index.php?leftmenu=members','','MenuMembersStats','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165589,'auguria',1,'','left','members',165287,NULL,NULL,9,'/adherents/htpasswd.php?leftmenu=export','','Filehtpasswd','members',1,'','$user->rights->adherent->export','! empty($conf->global->MEMBER_LINK_TO_HTPASSWDFILE) && $conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165590,'auguria',1,'','left','members',165287,NULL,NULL,10,'/adherents/cartes/carte.php?leftmenu=export','','MembersCards','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165687,'auguria',1,'','left','hrm',161102,NULL,NULL,1,'/user/index.php?leftmenu=hrm&mode=employee','','Employees','hrm',0,'hrm','$user->rights->hrm->employee->read','$conf->hrm->enabled',0,'2017-08-30 15:14:30'),(165688,'auguria',1,'','left','hrm',165687,NULL,NULL,1,'/user/card.php?action=create&employee=1','','NewEmployee','hrm',1,'','$user->rights->hrm->employee->write','$conf->hrm->enabled',0,'2017-08-30 15:14:30'),(165689,'auguria',1,'','left','hrm',165687,NULL,NULL,2,'/user/index.php?$leftmenu=hrm&mode=employee&contextpage=employeelist','','List','hrm',1,'','$user->rights->hrm->employee->read','$conf->hrm->enabled',0,'2017-08-30 15:14:30'),(165787,'auguria',1,'','left','members',161100,NULL,NULL,5,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members','','MembersTypes','members',0,'setup','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165788,'auguria',1,'','left','members',165787,NULL,NULL,0,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members&amp;action=create','','New','members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165789,'auguria',1,'','left','members',165787,NULL,NULL,1,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members','','List','members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(166087,'auguria',1,'','left','hrm',161102,NULL,NULL,1,'/holiday/list.php?&leftmenu=hrm','','CPTitreMenu','holiday',0,'hrm','$user->rights->holiday->read','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166088,'auguria',1,'','left','hrm',166087,NULL,NULL,1,'/holiday/card.php?&action=request','','MenuAddCP','holiday',1,'','$user->rights->holiday->write','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166089,'auguria',1,'','left','hrm',166087,NULL,NULL,1,'/holiday/list.php?&leftmenu=hrm','','List','holiday',1,'','$user->rights->holiday->read','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166090,'auguria',1,'','left','hrm',166089,NULL,NULL,1,'/holiday/list.php?select_statut=2&leftmenu=hrm','','ListToApprove','trips',2,'','$user->rights->holiday->read','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166091,'auguria',1,'','left','hrm',166087,NULL,NULL,2,'/holiday/define_holiday.php?&action=request','','MenuConfCP','holiday',1,'','$user->rights->holiday->define_holiday','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166092,'auguria',1,'','left','hrm',166087,NULL,NULL,3,'/holiday/view_log.php?&action=request','','MenuLogCP','holiday',1,'','$user->rights->holiday->define_holiday','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166187,'auguria',1,'','left','commercial',161092,NULL,NULL,6,'/fourn/commande/index.php?leftmenu=orders_suppliers','','SuppliersOrders','orders',0,'orders_suppliers','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166188,'auguria',1,'','left','commercial',166187,NULL,NULL,0,'/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers','','NewOrder','orders',1,'','$user->rights->fournisseur->commande->creer','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166189,'auguria',1,'','left','commercial',166187,NULL,NULL,1,'/fourn/commande/list.php?leftmenu=orders_suppliers&amp;search_status=0','','List','orders',1,'','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166195,'auguria',1,'','left','commercial',166187,NULL,NULL,7,'/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier','','Statistics','orders',1,'','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166287,'auguria',1,'','left','members',161100,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=3','','MembersCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->adherent->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(166288,'auguria',1,'','left','members',166287,NULL,NULL,0,'/categories/card.php?action=create&amp;type=3','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->adherent->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(166387,'auguria',1,'','left','hrm',161102,NULL,NULL,5,'/expensereport/index.php?leftmenu=expensereport','','TripsAndExpenses','trips',0,'expensereport','$user->rights->expensereport->lire','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166388,'auguria',1,'','left','hrm',166387,NULL,NULL,1,'/expensereport/card.php?action=create&amp;leftmenu=expensereport','','New','trips',1,'','$user->rights->expensereport->creer','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166389,'auguria',1,'','left','hrm',166387,NULL,NULL,2,'/expensereport/list.php?leftmenu=expensereport','','List','trips',1,'','$user->rights->expensereport->lire','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166390,'auguria',1,'','left','hrm',166389,NULL,NULL,2,'/expensereport/list.php?search_status=2&amp;leftmenu=expensereport','','ListToApprove','trips',2,'','$user->rights->expensereport->approve','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166391,'auguria',1,'','left','hrm',166387,NULL,NULL,2,'/expensereport/stats/index.php?leftmenu=expensereport','','Statistics','trips',1,'','$user->rights->expensereport->lire','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166467,'all',1,'variants','left','products',-1,'product','products',100,'/variants/list.php','','VariantAttributes','products',NULL,'product','1','$conf->product->enabled',0,'2018-01-19 11:28:04'),(166541,'all',1,'ticket','top','ticket',0,NULL,NULL,88,'/ticket/index.php','','Ticket','ticket',NULL,'1','$user->rights->ticket->read','$conf->ticket->enabled',2,'2019-06-05 09:15:29'),(166542,'all',1,'ticket','left','ticket',-1,NULL,'ticket',101,'/ticket/index.php','','Ticket','ticket',NULL,'ticket','$user->rights->ticket->read','$conf->ticket->enabled',2,'2019-06-05 09:15:29'),(166543,'all',1,'ticket','left','ticket',-1,'ticket','ticket',102,'/ticket/card.php?action=create','','NewTicket','ticket',NULL,NULL,'$user->rights->ticket->write','$conf->ticket->enabled',2,'2019-06-05 09:15:29'),(166544,'all',1,'ticket','left','ticket',-1,'ticket','ticket',103,'/ticket/list.php?search_fk_status=non_closed','','List','ticket',NULL,'ticketlist','$user->rights->ticket->read','$conf->ticket->enabled',2,'2019-06-05 09:15:29'),(166545,'all',1,'ticket','left','ticket',-1,'ticket','ticket',105,'/ticket/list.php?mode=mine&search_fk_status=non_closed','','MenuTicketMyAssign','ticket',NULL,'ticketmy','$user->rights->ticket->read','$conf->ticket->enabled',0,'2019-06-05 09:15:29'),(166546,'all',1,'ticket','left','ticket',-1,'ticket','ticket',107,'/ticket/stats/index.php','','Statistics','ticket',NULL,NULL,'$user->rights->ticket->read','$conf->ticket->enabled',0,'2019-06-05 09:15:29'),(166923,'all',1,'resource','left','tools',-1,NULL,'tools',100,'/resource/list.php','','MenuResourceIndex','resource',NULL,'resource','$user->rights->resource->read','1',0,'2020-01-20 11:46:00'),(166924,'all',1,'resource','left','tools',-1,'resource','tools',101,'/resource/card.php?action=create','','MenuResourceAdd','resource',NULL,'resource_add','$user->rights->resource->write','1',0,'2020-01-20 11:46:00'),(166925,'all',1,'resource','left','tools',-1,'resource','tools',102,'/resource/list.php','','List','resource',NULL,'resource_list','$user->rights->resource->read','1',0,'2020-01-20 11:46:00'),(167003,'all',1,'agenda','top','agenda',0,NULL,NULL,86,'/comm/action/index.php','','TMenuAgenda','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-12-10 12:24:50'),(167004,'all',1,'agenda','left','agenda',167003,NULL,NULL,100,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Actions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-12-10 12:24:50'),(167005,'all',1,'agenda','left','agenda',167004,NULL,NULL,101,'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create','','NewAction','commercial',NULL,NULL,'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)','$conf->agenda->enabled',2,'2020-12-10 12:24:50'),(167006,'all',1,'agenda','left','agenda',167004,NULL,NULL,140,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda','','Calendar','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-12-10 12:24:50'),(167007,'all',1,'agenda','left','agenda',167006,NULL,NULL,141,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-12-10 12:24:50'),(167008,'all',1,'agenda','left','agenda',167006,NULL,NULL,142,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-12-10 12:24:50'),(167009,'all',1,'agenda','left','agenda',167006,NULL,NULL,143,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2020-12-10 12:24:50'),(167010,'all',1,'agenda','left','agenda',167006,NULL,NULL,144,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2020-12-10 12:24:50'),(167011,'all',1,'agenda','left','agenda',167004,NULL,NULL,110,'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda','','List','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-12-10 12:24:50'),(167012,'all',1,'agenda','left','agenda',167011,NULL,NULL,111,'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-12-10 12:24:50'),(167013,'all',1,'agenda','left','agenda',167011,NULL,NULL,112,'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-12-10 12:24:50'),(167014,'all',1,'agenda','left','agenda',167011,NULL,NULL,113,'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2020-12-10 12:24:50'),(167015,'all',1,'agenda','left','agenda',167011,NULL,NULL,114,'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2020-12-10 12:24:50'),(167016,'all',1,'agenda','left','agenda',167004,NULL,NULL,160,'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Reportings','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->agenda->enabled',2,'2020-12-10 12:24:50'),(167017,'all',1,'agenda','left','agenda',167004,NULL,NULL,170,'/categories/index.php?mainmenu=agenda&amp;leftmenu=agenda&type=10','','Categories','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->categorie->enabled&&$conf->categorie->enabled',2,'2020-12-10 12:24:50'),(167018,'all',1,'barcode','left','tools',-1,NULL,'tools',200,'/barcode/printsheet.php?mainmenu=tools&leftmenu=barcodeprint','','BarCodePrintsheet','products',NULL,'barcodeprint','($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->lire_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)','$conf->barcode->enabled',2,'2020-12-10 12:24:50'),(167019,'all',1,'barcode','left','home',-1,'admintools','home',300,'/barcode/codeinit.php?mainmenu=home&leftmenu=admintools','','MassBarcodeInit','products',NULL,NULL,'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->creer_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)','$conf->barcode->enabled && preg_match(\'/^(admintools|all)/\',$leftmenu)',0,'2020-12-10 12:24:50'),(167020,'all',1,'cron','left','home',-1,'admintools','home',200,'/cron/list.php?leftmenu=admintools','','CronList','cron',NULL,NULL,'$user->rights->cron->read','$conf->cron->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)',2,'2020-12-10 12:24:50'),(167021,'all',1,'ecm','top','ecm',0,NULL,NULL,82,'/ecm/index.php','','MenuECM','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload || $user->rights->ecm->setup','$conf->ecm->enabled',2,'2020-12-10 12:24:50'),(167022,'all',1,'ecm','left','ecm',-1,NULL,'ecm',101,'/ecm/index.php?mainmenu=ecm&leftmenu=ecm','','ECMArea','ecm',NULL,'ecm','$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2020-12-10 12:24:50'),(167023,'all',1,'ecm','left','ecm',-1,'ecm','ecm',102,'/ecm/index.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsManual','ecm',NULL,'ecm_manual','$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2020-12-10 12:24:50'),(167024,'all',1,'ecm','left','ecm',-1,'ecm','ecm',103,'/ecm/index_auto.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsAuto','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload','($user->rights->ecm->read || $user->rights->ecm->upload) && ! empty($conf->global->ECM_AUTO_TREE_ENABLED)',2,'2020-12-10 12:24:50'),(167025,'all',1,'opensurvey','left','tools',-1,NULL,'tools',200,'/opensurvey/index.php?mainmenu=tools&leftmenu=opensurvey','','Survey','opensurvey',NULL,'opensurvey','$user->rights->opensurvey->read','$conf->opensurvey->enabled',0,'2020-12-10 12:24:51'),(167026,'all',1,'opensurvey','left','tools',-1,'opensurvey','tools',210,'/opensurvey/wizard/index.php','','NewSurvey','opensurvey',NULL,'opensurvey_new','$user->rights->opensurvey->write','$conf->opensurvey->enabled',0,'2020-12-10 12:24:51'),(167027,'all',1,'opensurvey','left','tools',-1,'opensurvey','tools',220,'/opensurvey/list.php','','List','opensurvey',NULL,'opensurvey_list','$user->rights->opensurvey->read','$conf->opensurvey->enabled',0,'2020-12-10 12:24:51'),(167028,'all',1,'takepos','top','takepos',0,NULL,NULL,1001,'/takepos/index.php','takepos','PointOfSaleShort','cashdesk',NULL,NULL,'$user->rights->takepos->run','$conf->takepos->enabled',2,'2020-12-10 12:24:52'),(167029,'all',1,'website','top','website',0,NULL,NULL,100,'/website/index.php','','WebSites','website',NULL,NULL,'$user->rights->website->read','$conf->website->enabled',2,'2020-12-10 12:24:52'),(167030,'all',1,'recruitment','left','hrm',-1,NULL,'hrm',1001,'/recruitment/recruitmentindex.php','','Recruitment','recruitment',NULL,'recruitmentjobposition','$user->rights->recruitment->recruitmentjobposition->read','$conf->recruitment->enabled',2,'2020-12-10 12:29:43'),(167031,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1002,'/recruitment/recruitmentjobposition_card.php?action=create','','NewPositionToBeFilled','recruitment',NULL,'recruitment_recruitmentjobposition_new','$user->rights->recruitment->recruitmentjobposition->write','$conf->recruitment->enabled',2,'2020-12-10 12:29:43'),(167032,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1003,'/recruitment/recruitmentjobposition_list.php','','ListOfPositionsToBeFilled','recruitment',NULL,'recruitment_recruitmentjobposition_list','$user->rights->recruitment->recruitmentjobposition->read','$conf->recruitment->enabled',2,'2020-12-10 12:29:43'),(167033,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1004,'/recruitment/recruitmentcandidature_card.php?action=create','','NewCandidature','recruitment',NULL,'recruitment_recruitmentcandidature_new','$user->rights->recruitment->recruitmentjobposition->write','$conf->recruitment->enabled',2,'2020-12-10 12:29:43'),(167034,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1005,'/recruitment/recruitmentcandidature_list.php','','ListOfCandidatures','recruitment',NULL,'recruitment_recruitmentcandidature_list','$user->rights->recruitment->recruitmentjobposition->read','$conf->recruitment->enabled',2,'2020-12-10 12:29:43'),(167035,'all',1,'margins','left','billing',-1,NULL,'billing',100,'/margin/index.php','','Margins','margins',NULL,'margins','$user->rights->margins->liretous','$conf->margin->enabled',2,'2020-12-10 12:30:20'),(167037,'all',1,'blockedlog','left','tools',-1,NULL,'tools',200,'/blockedlog/admin/blockedlog_list.php?mainmenu=tools&leftmenu=blockedlogbrowser','','BrowseBlockedLog','blockedlog',NULL,'blockedlogbrowser','$user->rights->blockedlog->read','$conf->blockedlog->enabled',2,'2020-12-10 12:31:17');
 /*!40000 ALTER TABLE `llx_menu` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -8314,7 +9428,7 @@ CREATE TABLE `llx_mrp_mo_extrafields` (
   `fk_object` int(11) NOT NULL,
   `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
-  KEY `idx_fk_object` (`fk_object`)
+  KEY `idx_mrp_mo_fk_object` (`fk_object`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -8586,6 +9700,43 @@ LOCK TABLES `llx_nomenclature_coef_object` WRITE;
 /*!40000 ALTER TABLE `llx_nomenclature_coef_object` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_nomenclature_feedback`
+--
+
+DROP TABLE IF EXISTS `llx_nomenclature_feedback`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_nomenclature_feedback` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_origin` int(11) NOT NULL DEFAULT 0,
+  `fk_nomenclature` int(11) NOT NULL DEFAULT 0,
+  `fk_product` int(11) NOT NULL DEFAULT 0,
+  `fk_warehouse` int(11) NOT NULL DEFAULT 0,
+  `origin` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `stockAllowed` double NOT NULL DEFAULT 0,
+  `qtyUsed` double NOT NULL DEFAULT 0,
+  `note` longtext CHARACTER SET latin1 DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `fk_origin` (`fk_origin`),
+  KEY `fk_nomenclature` (`fk_nomenclature`),
+  KEY `fk_product` (`fk_product`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_nomenclature_feedback`
+--
+
+LOCK TABLES `llx_nomenclature_feedback` WRITE;
+/*!40000 ALTER TABLE `llx_nomenclature_feedback` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_nomenclature_feedback` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_nomenclature_workstation`
 --
@@ -8978,7 +10129,7 @@ CREATE TABLE `llx_opensurvey_sondage` (
   `status` int(11) DEFAULT 1,
   `format` varchar(2) COLLATE utf8_unicode_ci NOT NULL,
   `mailsonde` tinyint(4) NOT NULL DEFAULT 0,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp(),
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `entity` int(11) NOT NULL DEFAULT 1,
   `allow_comments` tinyint(4) NOT NULL DEFAULT 1,
   `allow_spy` tinyint(4) NOT NULL DEFAULT 1,
@@ -9053,6 +10204,29 @@ INSERT INTO `llx_opensurvey_user_studs` VALUES (1,'gfdgdf','om4e7azfiurnjtqe','0
 /*!40000 ALTER TABLE `llx_opensurvey_user_studs` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_origines`
+--
+
+DROP TABLE IF EXISTS `llx_origines`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_origines` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `source` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_origines`
+--
+
+LOCK TABLES `llx_origines` WRITE;
+/*!40000 ALTER TABLE `llx_origines` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_origines` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_overwrite_trans`
 --
@@ -9115,6 +10289,7 @@ DROP TABLE IF EXISTS `llx_paiement`;
 CREATE TABLE `llx_paiement` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `ref` varchar(30) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
+  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `datec` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
@@ -9128,6 +10303,7 @@ CREATE TABLE `llx_paiement` (
   `fk_user_modif` int(11) DEFAULT NULL,
   `statut` smallint(6) NOT NULL DEFAULT 0,
   `fk_export_compta` int(11) NOT NULL DEFAULT 0,
+  `pos_change` double(24,8) DEFAULT 0.00000000,
   `multicurrency_amount` double(24,8) DEFAULT 0.00000000,
   `ext_payment_id` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
   `ext_payment_site` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -9141,7 +10317,7 @@ CREATE TABLE `llx_paiement` (
 
 LOCK TABLES `llx_paiement` WRITE;
 /*!40000 ALTER TABLE `llx_paiement` DISABLE KEYS */;
-INSERT INTO `llx_paiement` VALUES (3,'',1,'2013-07-18 20:50:47','2020-06-12 17:12:09','2019-07-08 12:00:00',10.00000000,4,'','',6,1,NULL,0,0,0.00000000,NULL,NULL),(5,'',1,'2013-08-01 03:34:11','2020-06-12 17:12:08','2019-08-01 03:34:11',5.63000000,6,'','Payment Invoice FA1108-0003',8,1,NULL,0,0,0.00000000,NULL,NULL),(6,'',1,'2013-08-06 20:33:54','2020-06-12 17:12:08','2019-08-06 20:33:53',5.98000000,4,'','Payment Invoice FA1108-0004',13,1,NULL,0,0,0.00000000,NULL,NULL),(8,'',1,'2013-08-08 02:53:40','2020-06-12 17:12:08','2019-08-08 12:00:00',26.10000000,4,'','',14,1,NULL,0,0,0.00000000,NULL,NULL),(9,'',1,'2013-08-08 02:55:58','2020-06-12 17:12:08','2019-08-08 12:00:00',26.96000000,1,'','',15,1,NULL,0,0,0.00000000,NULL,NULL),(17,'',1,'2014-12-09 15:28:44','2020-06-12 17:12:08','2019-12-09 12:00:00',2.00000000,4,'','',16,1,NULL,0,0,0.00000000,NULL,NULL),(18,'',1,'2014-12-09 15:28:53','2020-06-12 17:12:08','2019-12-09 12:00:00',-2.00000000,4,'','',17,1,NULL,0,0,0.00000000,NULL,NULL),(19,'',1,'2014-12-09 17:35:55','2020-06-12 17:12:08','2019-12-09 12:00:00',-2.00000000,4,'','',18,1,NULL,0,0,0.00000000,NULL,NULL),(20,'',1,'2014-12-09 17:37:02','2020-06-12 17:12:08','2019-12-09 12:00:00',2.00000000,4,'','',19,1,NULL,0,0,0.00000000,NULL,NULL),(21,'',1,'2014-12-09 18:35:07','2020-06-12 17:12:08','2019-12-09 12:00:00',-2.00000000,4,'','',20,1,NULL,0,0,0.00000000,NULL,NULL),(23,'',1,'2014-12-12 18:54:33','2020-06-12 17:12:08','2019-12-12 12:00:00',1.00000000,1,'','',21,1,NULL,0,0,0.00000000,NULL,NULL),(24,'',1,'2015-03-06 16:48:16','2020-06-12 17:12:09','2020-03-06 00:00:00',20.00000000,4,'','Adhésion/cotisation 2016',22,1,NULL,0,0,0.00000000,NULL,NULL),(25,'',1,'2015-03-20 14:30:11','2020-06-12 17:12:09','2020-03-20 00:00:00',10.00000000,2,'','Adhésion/cotisation 2011',23,1,NULL,0,0,0.00000000,NULL,NULL),(26,'',1,'2016-03-02 19:57:58','2020-06-12 17:12:09','2019-07-09 12:00:00',605.00000000,2,'','',24,1,NULL,0,0,0.00000000,NULL,NULL),(29,'',1,'2016-03-02 20:01:39','2020-06-12 17:12:09','2020-03-19 12:00:00',500.00000000,4,'','',26,1,NULL,0,0,0.00000000,NULL,NULL),(30,'',1,'2016-03-02 20:02:06','2020-06-12 17:12:09','2020-03-21 12:00:00',400.00000000,2,'','',27,1,NULL,0,0,0.00000000,NULL,NULL),(32,'',1,'2016-03-03 19:22:32','2020-06-12 17:12:08','2019-10-03 12:00:00',-400.00000000,4,'','',28,1,NULL,0,0,0.00000000,NULL,NULL),(33,'',1,'2016-03-03 19:23:16','2020-06-12 17:12:09','2020-03-10 12:00:00',-300.00000000,4,'','',29,1,NULL,0,0,0.00000000,NULL,NULL),(34,'PAY1603-0001',1,'2017-02-06 08:10:24','2020-06-12 17:12:09','2020-03-22 12:00:00',150.00000000,7,'','',33,12,NULL,0,0,150.00000000,NULL,NULL),(35,'PAY1603-0002',1,'2017-02-06 08:10:50','2020-06-12 17:12:09','2020-03-25 12:00:00',140.00000000,3,'','',34,12,NULL,0,0,140.00000000,NULL,NULL),(36,'PAY1702-0003',1,'2017-02-21 16:07:43','2020-06-12 17:12:08','2020-02-21 12:00:00',50.00000000,3,'T170201','',37,12,NULL,0,0,50.00000000,NULL,NULL),(38,'PAY1803-0004',1,'2018-03-16 13:59:31','2020-06-12 17:12:09','2020-03-16 12:00:00',10.00000000,7,'','',39,12,NULL,0,0,10.00000000,NULL,NULL),(39,'PAY1801-0005',1,'2019-10-04 10:28:14','2020-06-12 17:12:09','2020-01-19 12:00:00',5.63000000,4,'','',41,12,NULL,0,0,5.63000000,NULL,NULL),(40,'PAY2001-0006',1,'2020-01-16 02:36:48','2020-01-16 01:36:48','2020-01-16 12:00:00',20.50000000,2,'','',50,12,NULL,0,0,20.50000000,NULL,NULL),(41,'PAY2001-0007',1,'2020-01-21 10:23:17','2020-01-21 09:23:17','2020-01-21 00:00:00',50.00000000,7,'','Subscription 2017',53,12,NULL,0,0,50.00000000,NULL,NULL),(42,'PAY2001-0008',1,'2020-01-21 10:23:28','2020-01-21 09:23:28','2020-01-21 00:00:00',50.00000000,7,'','Subscription 2018',54,12,NULL,0,0,50.00000000,NULL,NULL),(43,'PAY2001-0009',1,'2020-01-21 10:23:49','2020-01-21 09:23:49','2020-01-21 00:00:00',50.00000000,6,'','Subscription 2019',55,12,NULL,0,0,50.00000000,NULL,NULL);
+INSERT INTO `llx_paiement` VALUES (3,'',NULL,1,'2013-07-18 20:50:47','2020-12-10 12:24:22','2020-07-08 12:00:00',10.00000000,4,'','',6,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(5,'',NULL,1,'2013-08-01 03:34:11','2020-12-10 12:24:22','2020-08-01 03:34:11',5.63000000,6,'','Payment Invoice FA1108-0003',8,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(6,'',NULL,1,'2013-08-06 20:33:54','2020-12-10 12:24:22','2020-08-06 20:33:53',5.98000000,4,'','Payment Invoice FA1108-0004',13,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(8,'',NULL,1,'2013-08-08 02:53:40','2020-12-10 12:24:22','2020-08-08 12:00:00',26.10000000,4,'','',14,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(9,'',NULL,1,'2013-08-08 02:55:58','2020-12-10 12:24:23','2020-08-08 12:00:00',26.96000000,1,'','',15,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(17,'',NULL,1,'2014-12-09 15:28:44','2020-12-10 12:24:23','2020-12-09 12:00:00',2.00000000,4,'','',16,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(18,'',NULL,1,'2014-12-09 15:28:53','2020-12-10 12:24:23','2020-12-09 12:00:00',-2.00000000,4,'','',17,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(19,'',NULL,1,'2014-12-09 17:35:55','2020-12-10 12:24:23','2020-12-09 12:00:00',-2.00000000,4,'','',18,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(20,'',NULL,1,'2014-12-09 17:37:02','2020-12-10 12:24:23','2020-12-09 12:00:00',2.00000000,4,'','',19,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(21,'',NULL,1,'2014-12-09 18:35:07','2020-12-10 12:24:23','2020-12-09 12:00:00',-2.00000000,4,'','',20,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(23,'',NULL,1,'2014-12-12 18:54:33','2020-06-12 17:12:08','2019-12-12 12:00:00',1.00000000,1,'','',21,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(24,'',NULL,1,'2015-03-06 16:48:16','2020-06-12 17:12:09','2020-03-06 00:00:00',20.00000000,4,'','Adhésion/cotisation 2016',22,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(25,'',NULL,1,'2015-03-20 14:30:11','2020-06-12 17:12:09','2020-03-20 00:00:00',10.00000000,2,'','Adhésion/cotisation 2011',23,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(26,'',NULL,1,'2016-03-02 19:57:58','2020-12-10 12:24:23','2020-07-09 12:00:00',605.00000000,2,'','',24,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(29,'',NULL,1,'2016-03-02 20:01:39','2020-06-12 17:12:09','2020-03-19 12:00:00',500.00000000,4,'','',26,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(30,'',NULL,1,'2016-03-02 20:02:06','2020-06-12 17:12:09','2020-03-21 12:00:00',400.00000000,2,'','',27,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(32,'',NULL,1,'2016-03-03 19:22:32','2020-12-10 12:24:23','2020-10-03 12:00:00',-400.00000000,4,'','',28,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(33,'',NULL,1,'2016-03-03 19:23:16','2020-06-12 17:12:09','2020-03-10 12:00:00',-300.00000000,4,'','',29,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(34,'PAY1603-0001',NULL,1,'2017-02-06 08:10:24','2020-06-12 17:12:09','2020-03-22 12:00:00',150.00000000,7,'','',33,12,NULL,0,0,0.00000000,150.00000000,NULL,NULL),(35,'PAY1603-0002',NULL,1,'2017-02-06 08:10:50','2020-06-12 17:12:09','2020-03-25 12:00:00',140.00000000,3,'','',34,12,NULL,0,0,0.00000000,140.00000000,NULL,NULL),(36,'PAY1702-0003',NULL,1,'2017-02-21 16:07:43','2020-06-12 17:12:08','2020-02-21 12:00:00',50.00000000,3,'T170201','',37,12,NULL,0,0,0.00000000,50.00000000,NULL,NULL),(38,'PAY1803-0004',NULL,1,'2018-03-16 13:59:31','2020-06-12 17:12:09','2020-03-16 12:00:00',10.00000000,7,'','',39,12,NULL,0,0,0.00000000,10.00000000,NULL,NULL),(39,'PAY1801-0005',NULL,1,'2019-10-04 10:28:14','2020-06-12 17:12:09','2020-01-19 12:00:00',5.63000000,4,'','',41,12,NULL,0,0,0.00000000,5.63000000,NULL,NULL),(40,'PAY2001-0006',NULL,1,'2020-01-16 02:36:48','2020-01-16 01:36:48','2020-01-16 12:00:00',20.50000000,2,'','',50,12,NULL,0,0,0.00000000,20.50000000,NULL,NULL),(41,'PAY2001-0007',NULL,1,'2020-01-21 10:23:17','2020-01-21 09:23:17','2020-01-21 00:00:00',50.00000000,7,'','Subscription 2017',53,12,NULL,0,0,0.00000000,50.00000000,NULL,NULL),(42,'PAY2001-0008',NULL,1,'2020-01-21 10:23:28','2020-01-21 09:23:28','2020-01-21 00:00:00',50.00000000,7,'','Subscription 2018',54,12,NULL,0,0,0.00000000,50.00000000,NULL,NULL),(43,'PAY2001-0009',NULL,1,'2020-01-21 10:23:49','2020-01-21 09:23:49','2020-01-21 00:00:00',50.00000000,6,'','Subscription 2019',55,12,NULL,0,0,0.00000000,50.00000000,NULL,NULL);
 /*!40000 ALTER TABLE `llx_paiement` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -9575,6 +10751,39 @@ INSERT INTO `llx_pos_cash_fence` VALUES (1,1,'1',NULL,-324.29000000,400.00000000
 /*!40000 ALTER TABLE `llx_pos_cash_fence` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_postes`
+--
+
+DROP TABLE IF EXISTS `llx_postes`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_postes` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `label` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `status` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `lieu` int(11) DEFAULT NULL,
+  `email` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `date` date DEFAULT NULL,
+  `departement` int(11) DEFAULT NULL,
+  `responsable_recrutement` int(11) DEFAULT NULL,
+  `nb_nouveauemploye` int(11) DEFAULT NULL,
+  `description` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `responsable_RH` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_postes`
+--
+
+LOCK TABLES `llx_postes` WRITE;
+/*!40000 ALTER TABLE `llx_postes` DISABLE KEYS */;
+INSERT INTO `llx_postes` VALUES (1,'aaa','Recrutementencours',-1,'aaa','2020-05-29',0,0,1,'',0);
+/*!40000 ALTER TABLE `llx_postes` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_prelevement_bons`
 --
@@ -9665,7 +10874,9 @@ CREATE TABLE `llx_prelevement_facture_demande` (
   `ext_payment_id` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
   `ext_payment_site` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
   `fk_facture_fourn` int(11) DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
+  PRIMARY KEY (`rowid`),
+  KEY `idx_prelevement_facture_demande_fk_facture` (`fk_facture`),
+  KEY `idx_prelevement_facture_demande_fk_facture_fourn` (`fk_facture_fourn`)
 ) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -9744,6 +10955,60 @@ LOCK TABLES `llx_prelevement_rejet` WRITE;
 /*!40000 ALTER TABLE `llx_prelevement_rejet` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_prestashopget_myobject`
+--
+
+DROP TABLE IF EXISTS `llx_prestashopget_myobject`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_prestashopget_myobject` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `qty` int(11) DEFAULT NULL,
+  `status` int(11) DEFAULT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_prestashopget_myobject`
+--
+
+LOCK TABLES `llx_prestashopget_myobject` WRITE;
+/*!40000 ALTER TABLE `llx_prestashopget_myobject` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_prestashopget_myobject` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_prestashopget_myobject_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_prestashopget_myobject_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_prestashopget_myobject_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_prestashopget_myobject_extrafields`
+--
+
+LOCK TABLES `llx_prestashopget_myobject_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_prestashopget_myobject_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_prestashopget_myobject_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_printer_receipt`
 --
@@ -9867,7 +11132,7 @@ CREATE TABLE `llx_product` (
   `tobatch` tinyint(4) NOT NULL DEFAULT 0,
   `fk_product_type` int(11) DEFAULT 0,
   `duration` varchar(6) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `seuil_stock_alerte` int(11) DEFAULT NULL,
+  `seuil_stock_alerte` float DEFAULT NULL,
   `url` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `barcode` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `fk_barcode_type` int(11) DEFAULT NULL,
@@ -9894,7 +11159,7 @@ CREATE TABLE `llx_product` (
   `finished` tinyint(4) DEFAULT NULL,
   `hidden` tinyint(4) DEFAULT 0,
   `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `desiredstock` int(11) DEFAULT 0,
+  `desiredstock` float DEFAULT NULL,
   `fk_price_expression` int(11) DEFAULT NULL,
   `fk_unit` int(11) DEFAULT NULL,
   `cost_price` double(24,8) DEFAULT NULL,
@@ -9910,6 +11175,7 @@ CREATE TABLE `llx_product` (
   `fk_project` int(11) DEFAULT NULL,
   `net_measure` float DEFAULT NULL,
   `net_measure_units` tinyint(4) DEFAULT NULL,
+  `fk_state` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_product_ref` (`ref`,`entity`),
   UNIQUE KEY `uk_product_barcode` (`barcode`,`fk_barcode_type`,`entity`),
@@ -9923,8 +11189,10 @@ CREATE TABLE `llx_product` (
   KEY `idx_product_seuil_stock_alerte` (`seuil_stock_alerte`),
   KEY `fk_product_default_warehouse` (`fk_default_warehouse`),
   KEY `idx_product_fk_project` (`fk_project`),
+  KEY `fk_product_finished` (`finished`),
   CONSTRAINT `fk_product_barcode_type` FOREIGN KEY (`fk_barcode_type`) REFERENCES `llx_c_barcode_type` (`rowid`),
   CONSTRAINT `fk_product_default_warehouse` FOREIGN KEY (`fk_default_warehouse`) REFERENCES `llx_entrepot` (`rowid`),
+  CONSTRAINT `fk_product_finished` FOREIGN KEY (`finished`) REFERENCES `llx_c_product_nature` (`code`),
   CONSTRAINT `fk_product_fk_country` FOREIGN KEY (`fk_country`) REFERENCES `llx_c_country` (`rowid`),
   CONSTRAINT `fk_product_fk_unit` FOREIGN KEY (`fk_unit`) REFERENCES `llx_c_units` (`rowid`)
 ) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -9936,7 +11204,7 @@ CREATE TABLE `llx_product` (
 
 LOCK TABLES `llx_product` WRITE;
 /*!40000 ALTER TABLE `llx_product` DISABLE KEYS */;
-INSERT INTO `llx_product` VALUES (1,'2012-07-08 14:33:17','2020-01-18 19:17:03',0,0,'PINKDRESS',1,NULL,'Pink dress','A beatifull pink dress','','',NULL,9.00000000,10.12500000,0.00000000,0.00000000,'HT',12.500,0,0.000,'0',0.000,'0',1,12,1,1,0,1,0,'',NULL,NULL,'123456789066',2,'','','','',NULL,NULL,NULL,670,-3,NULL,0,NULL,0,NULL,0,2.8,0.00000000,NULL,NULL,NULL,1,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(2,'2012-07-09 00:30:01','2019-11-28 15:09:50',0,0,'PEARPIE',1,NULL,'Pear Pie','','','',NULL,10.00000000,12.00000000,8.33333000,10.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',1,12,1,1,0,0,0,'',NULL,NULL,'123456789077',2,'','','','',NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,NULL,0,998,0.00000000,NULL,NULL,NULL,1,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,'2012-07-09 00:30:25','2018-01-16 16:40:03',0,0,'CAKECONTRIB',1,NULL,'Cake making contribution','','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,'0',0.000,'0',1,NULL,1,1,0,0,1,'1m',NULL,NULL,'123456789088',2,'701CAKEM',NULL,NULL,'601CAKEM',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(4,'2012-07-10 14:44:06','2020-01-08 16:41:18',0,0,'APPLEPIE',1,NULL,'Apple Pie','Nice Bio Apple Pie.<br />\r\n&nbsp;','','',NULL,9.00000000,9.00000000,6.00000000,6.00000000,'HT',0.000,0,9.000,'1',9.000,'1',1,12,1,1,0,1,0,'',NULL,NULL,'123456789034',2,'701','','','601',NULL,NULL,NULL,500,-3,NULL,0,NULL,0,NULL,0,1020.2,10.00000000,NULL,NULL,NULL,1,0,NULL,NULL,NULL,NULL,NULL,'CGST+SGST',0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(5,'2013-07-20 23:11:38','2018-01-16 16:18:24',0,0,'DOLIDROID',1,NULL,'DoliDroid, Android app for Dolibarr','<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>','','',NULL,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,'0',0.000,'0',1,NULL,1,1,0,0,0,'',NULL,'https://play.google.com/store/apps/details?id=com.nltechno.dolidroidpro','123456789023',2,'701',NULL,NULL,'601',NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(10,'2011-12-31 00:00:00','2017-02-16 00:12:09',0,0,'COMP-XP4523',1,NULL,'Computer XP4523','A powerfull computer XP4523&nbsp;','This product is imported.<br />\r\nWarning: Delay to get it are not reliable.','USXP765',11,100.00000000,110.00000000,0.00000000,0.00000000,'HT',10.000,0,0.000,'0',0.000,'0',NULL,12,1,1,0,1,0,'',150,NULL,'123456789055',2,'701OLDC',NULL,NULL,'601OLDC',NULL,NULL,NULL,1.7,0,NULL,0,NULL,0,NULL,0,110,0.00000000,NULL,NULL,NULL,NULL,0,'20110729232310',200,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(11,'2015-01-13 20:24:42','2019-10-08 17:21:07',0,0,'ROLLUPABC',1,NULL,'Rollup Dolibarr','A nice rollup','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',0.000,0,0.000,'0',0.000,'0',1,12,1,1,0,0,0,'',NULL,NULL,'123456789044',2,'','','','',NULL,NULL,NULL,95,-3,NULL,0,2.34,-4,NULL,0,-1,0.00000000,NULL,NULL,'',1,0,NULL,NULL,NULL,NULL,12.00000000,NULL,0,NULL,'',NULL,8,NULL,8,NULL,NULL,NULL,NULL),(12,'2018-07-30 17:31:29','2018-07-30 13:35:02',0,0,'DOLICLOUD',1,NULL,'SaaS service of Dolibarr ERP CRM','Cloud hosting of Dolibarr ERP and CRM software','','',NULL,9.00000000,9.00000000,9.00000000,9.00000000,'HT',0.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,1,'',NULL,'http://www.dolicloud.com','123456789013',2,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,'',0,0,NULL,NULL,NULL,NULL,8.50000000,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(13,'2017-02-16 03:49:00','2017-02-15 23:49:27',0,0,'COMP-XP4548',1,NULL,'Computer XP4523','A powerfull computer XP4523&nbsp;','This product is imported.<br />\r\nWarning: Delay to get it are not reliable.','USXP765',11,100.00000000,110.00000000,0.00000000,0.00000000,'HT',10.000,0,0.000,'0',0.000,'0',12,12,1,1,0,1,0,'',150,NULL,NULL,2,'',NULL,NULL,'',NULL,NULL,NULL,1.7,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,200,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(23,'2019-10-07 00:00:00','2019-11-28 13:51:35',0,0,'PREF123456',1,NULL,'Product name in default language','Product description in default language','a private note (free text)','customs code',1,100.00000000,110.00000000,100.00000000,110.00000000,'HT',10.000,0,0.000,'0',0.000,'0',12,NULL,0,1,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-3,1,-1,4,-4,5,-3,NULL,0.00000000,NULL,NULL,NULL,0,0,'20191007122224',NULL,NULL,NULL,NULL,NULL,0,'a public note (free text)','',2,-1,3,-1,NULL,NULL,NULL,NULL),(24,'2019-11-28 16:33:35','2019-11-28 15:02:01',0,0,'POS-CARROT',1,NULL,'Carrot','','','',NULL,0.83333000,1.00000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(25,'2019-11-28 16:37:36','2020-01-13 11:13:19',0,0,'POS-APPLE',1,NULL,'Apple','','','',NULL,1.25000000,1.50000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,15.599999999999994,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(26,'2019-11-28 16:38:44','2019-11-28 12:38:44',0,0,'POS-KIWI',1,NULL,'Kiwi','','','',NULL,1.08333000,1.30000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(27,'2019-11-28 16:39:21','2019-11-28 14:57:44',0,0,'POS-PEACH',1,NULL,'Peach','','','',NULL,1.08333000,1.30000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,'',0,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(28,'2019-11-28 16:39:58','2019-11-28 12:39:58',0,0,'POS-ORANGE',1,NULL,'Orange','','','',NULL,2.00000000,2.40000000,0.00000000,0.00000000,'HT',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(29,'2019-11-28 17:03:14','2019-11-28 13:03:14',0,0,'POS-Eggs',1,NULL,'Eggs','','','',NULL,1.66667000,2.00000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(30,'2019-11-28 17:09:14','2019-11-28 13:09:14',0,0,'POS-Chips',1,NULL,'Chips','','','',NULL,0.41667000,0.50000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,30,-3,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+INSERT INTO `llx_product` VALUES (1,'2012-07-08 14:33:17','2020-01-18 19:17:03',0,0,'PINKDRESS',1,NULL,'Pink dress','A beatifull pink dress','','',NULL,9.00000000,10.12500000,0.00000000,0.00000000,'HT',12.500,0,0.000,'0',0.000,'0',1,12,1,1,0,1,0,'',NULL,NULL,'123456789066',2,'','','','',NULL,NULL,NULL,670,-3,NULL,0,NULL,0,NULL,0,2.8,0.00000000,NULL,NULL,NULL,1,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(2,'2012-07-09 00:30:01','2019-11-28 15:09:50',0,0,'PEARPIE',1,NULL,'Pear Pie','','','',NULL,10.00000000,12.00000000,8.33333000,10.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',1,12,1,1,0,0,0,'',NULL,NULL,'123456789077',2,'','','','',NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,NULL,0,998,0.00000000,NULL,NULL,NULL,1,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,'2012-07-09 00:30:25','2018-01-16 16:40:03',0,0,'CAKECONTRIB',1,NULL,'Cake making contribution','','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,'0',0.000,'0',1,NULL,1,1,0,0,1,'1m',NULL,NULL,'123456789088',2,'701CAKEM',NULL,NULL,'601CAKEM',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(4,'2012-07-10 14:44:06','2020-01-08 16:41:18',0,0,'APPLEPIE',1,NULL,'Apple Pie','Nice Bio Apple Pie.<br />\r\n&nbsp;','','',NULL,9.00000000,9.00000000,6.00000000,6.00000000,'HT',0.000,0,9.000,'1',9.000,'1',1,12,1,1,0,1,0,'',NULL,NULL,'123456789034',2,'701','','','601',NULL,NULL,NULL,500,-3,NULL,0,NULL,0,NULL,0,1020.2,10.00000000,NULL,NULL,NULL,1,0,NULL,NULL,NULL,NULL,NULL,'CGST+SGST',0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(5,'2013-07-20 23:11:38','2018-01-16 16:18:24',0,0,'DOLIDROID',1,NULL,'DoliDroid, Android app for Dolibarr','<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>','','',NULL,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,'0',0.000,'0',1,NULL,1,1,0,0,0,'',NULL,'https://play.google.com/store/apps/details?id=com.nltechno.dolidroidpro','123456789023',2,'701',NULL,NULL,'601',NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(10,'2011-12-31 00:00:00','2017-02-16 00:12:09',0,0,'COMP-XP4523',1,NULL,'Computer XP4523','A powerfull computer XP4523&nbsp;','This product is imported.<br />\r\nWarning: Delay to get it are not reliable.','USXP765',11,100.00000000,110.00000000,0.00000000,0.00000000,'HT',10.000,0,0.000,'0',0.000,'0',NULL,12,1,1,0,1,0,'',150,NULL,'123456789055',2,'701OLDC',NULL,NULL,'601OLDC',NULL,NULL,NULL,1.7,0,NULL,0,NULL,0,NULL,0,110,0.00000000,NULL,NULL,NULL,NULL,0,'20110729232310',200,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(11,'2015-01-13 20:24:42','2019-10-08 17:21:07',0,0,'ROLLUPABC',1,NULL,'Rollup Dolibarr','A nice rollup','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',0.000,0,0.000,'0',0.000,'0',1,12,1,1,0,0,0,'',NULL,NULL,'123456789044',2,'','','','',NULL,NULL,NULL,95,-3,NULL,0,2.34,-4,NULL,0,-1,0.00000000,NULL,NULL,'',1,0,NULL,NULL,NULL,NULL,12.00000000,NULL,0,NULL,'',NULL,8,NULL,8,NULL,NULL,NULL,NULL,NULL),(12,'2018-07-30 17:31:29','2018-07-30 13:35:02',0,0,'DOLICLOUD',1,NULL,'SaaS service of Dolibarr ERP CRM','Cloud hosting of Dolibarr ERP and CRM software','','',NULL,9.00000000,9.00000000,9.00000000,9.00000000,'HT',0.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,1,'',NULL,'http://www.dolicloud.com','123456789013',2,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,'',0,0,NULL,NULL,NULL,NULL,8.50000000,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(13,'2017-02-16 03:49:00','2017-02-15 23:49:27',0,0,'COMP-XP4548',1,NULL,'Computer XP4523','A powerfull computer XP4523&nbsp;','This product is imported.<br />\r\nWarning: Delay to get it are not reliable.','USXP765',11,100.00000000,110.00000000,0.00000000,0.00000000,'HT',10.000,0,0.000,'0',0.000,'0',12,12,1,1,0,1,0,'',150,NULL,NULL,2,'',NULL,NULL,'',NULL,NULL,NULL,1.7,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,200,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(23,'2019-10-07 00:00:00','2019-11-28 13:51:35',0,0,'PREF123456',1,NULL,'Product name in default language','Product description in default language','a private note (free text)','customs code',1,100.00000000,110.00000000,100.00000000,110.00000000,'HT',10.000,0,0.000,'0',0.000,'0',12,NULL,0,1,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-3,1,-1,4,-4,5,-3,NULL,0.00000000,NULL,NULL,NULL,0,0,'20191007122224',NULL,NULL,NULL,NULL,NULL,0,'a public note (free text)','',2,-1,3,-1,NULL,NULL,NULL,NULL,NULL),(24,'2019-11-28 16:33:35','2019-11-28 15:02:01',0,0,'POS-CARROT',1,NULL,'Carrot','','','',NULL,0.83333000,1.00000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(25,'2019-11-28 16:37:36','2020-01-13 11:13:19',0,0,'POS-APPLE',1,NULL,'Apple','','','',NULL,1.25000000,1.50000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,15.599999999999994,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(26,'2019-11-28 16:38:44','2019-11-28 12:38:44',0,0,'POS-KIWI',1,NULL,'Kiwi','','','',NULL,1.08333000,1.30000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(27,'2019-11-28 16:39:21','2019-11-28 14:57:44',0,0,'POS-PEACH',1,NULL,'Peach','','','',NULL,1.08333000,1.30000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,'',0,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(28,'2019-11-28 16:39:58','2019-11-28 12:39:58',0,0,'POS-ORANGE',1,NULL,'Orange','','','',NULL,2.00000000,2.40000000,0.00000000,0.00000000,'HT',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(29,'2019-11-28 17:03:14','2019-11-28 13:03:14',0,0,'POS-Eggs',1,NULL,'Eggs','','','',NULL,1.66667000,2.00000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(30,'2019-11-28 17:09:14','2019-11-28 13:09:14',0,0,'POS-Chips',1,NULL,'Chips','','','',NULL,0.41667000,0.50000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,30,-3,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_product` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -9980,6 +11248,7 @@ DROP TABLE IF EXISTS `llx_product_attribute`;
 CREATE TABLE `llx_product_attribute` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `ref` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `label` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   `rang` int(11) NOT NULL DEFAULT 0,
   `entity` int(11) NOT NULL DEFAULT 1,
@@ -9995,7 +11264,7 @@ CREATE TABLE `llx_product_attribute` (
 
 LOCK TABLES `llx_product_attribute` WRITE;
 /*!40000 ALTER TABLE `llx_product_attribute` DISABLE KEYS */;
-INSERT INTO `llx_product_attribute` VALUES (1,'COL','Color',1,1),(2,'SIZE','Size',0,1);
+INSERT INTO `llx_product_attribute` VALUES (1,'COL',NULL,'Color',1,1),(2,'SIZE',NULL,'Size',0,1);
 /*!40000 ALTER TABLE `llx_product_attribute` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -10013,6 +11282,7 @@ CREATE TABLE `llx_product_attribute_combination` (
   `variation_price` float NOT NULL,
   `variation_price_percentage` int(11) DEFAULT NULL,
   `variation_weight` float NOT NULL,
+  `variation_ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`),
   KEY `idx_product_att_com_product_parent` (`fk_product_parent`),
@@ -10054,6 +11324,81 @@ LOCK TABLES `llx_product_attribute_combination2val` WRITE;
 /*!40000 ALTER TABLE `llx_product_attribute_combination2val` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_product_attribute_combination_price_level`
+--
+
+DROP TABLE IF EXISTS `llx_product_attribute_combination_price_level`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_product_attribute_combination_price_level` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_product_attribute_combination` int(11) NOT NULL DEFAULT 1,
+  `fk_price_level` int(11) NOT NULL DEFAULT 1,
+  `variation_price` double(24,8) NOT NULL,
+  `variation_price_percentage` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `fk_product_attribute_combination` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_2` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_3` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_4` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_5` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_6` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_7` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_8` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_9` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_10` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_11` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_12` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_13` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_14` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_15` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_16` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_17` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_18` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_19` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_20` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_21` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_22` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_23` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_24` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_25` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_26` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_27` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_28` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_29` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_30` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_31` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_32` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_33` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_34` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_35` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_36` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_37` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_38` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_39` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_40` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_41` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_42` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_43` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_44` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_45` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_46` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_47` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_48` (`fk_product_attribute_combination`,`fk_price_level`)
+) ENGINE=InnoDB AUTO_INCREMENT=59 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_product_attribute_combination_price_level`
+--
+
+LOCK TABLES `llx_product_attribute_combination_price_level` WRITE;
+/*!40000 ALTER TABLE `llx_product_attribute_combination_price_level` DISABLE KEYS */;
+INSERT INTO `llx_product_attribute_combination_price_level` VALUES (16,0,1,0.00000000,0),(17,0,2,0.00000000,0),(18,0,3,0.00000000,0),(19,0,4,0.00000000,0),(20,0,5,0.00000000,0),(44,101,1,0.00000000,0),(45,101,2,0.00000000,0),(46,101,3,0.00000000,0),(47,101,4,0.00000000,0),(48,101,5,0.00000000,0),(49,102,1,0.00000000,0),(50,102,2,0.00000000,0),(51,102,3,0.00000000,0),(52,102,4,0.00000000,0),(53,102,5,0.00000000,0),(54,103,1,0.00000000,0),(55,103,2,0.00000000,0),(56,103,3,0.00000000,0),(57,103,4,0.00000000,0),(58,103,5,0.00000000,0);
+/*!40000 ALTER TABLE `llx_product_attribute_combination_price_level` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_product_attribute_value`
 --
@@ -10306,6 +11651,7 @@ CREATE TABLE `llx_product_fournisseur_price` (
   `localtax2_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
   `barcode` varchar(180) COLLATE utf8_unicode_ci DEFAULT NULL,
   `fk_barcode_type` int(11) DEFAULT NULL,
+  `packaging` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_product_fournisseur_price_ref` (`ref_fourn`,`fk_soc`,`quantity`,`entity`),
   UNIQUE KEY `uk_product_barcode` (`barcode`,`fk_barcode_type`,`entity`),
@@ -10326,7 +11672,7 @@ CREATE TABLE `llx_product_fournisseur_price` (
 
 LOCK TABLES `llx_product_fournisseur_price` WRITE;
 /*!40000 ALTER TABLE `llx_product_fournisseur_price` DISABLE KEYS */;
-INSERT INTO `llx_product_fournisseur_price` VALUES (1,'2012-07-11 18:45:42','2014-12-08 13:11:08',4,1,'ABCD',NULL,NULL,10.00000000,1,0,0,10.00000000,0.00000000,0.000,NULL,0,1,NULL,1,NULL,NULL,NULL,NULL,1.00000000,NULL,NULL,NULL,NULL,0.000,'0',0.000,'0',NULL,NULL),(2,'2018-07-30 17:34:38','2018-07-30 13:34:38',12,10,'BASIC',NULL,0,9.00000000,1,0,0,9.00000000,0.00000000,0.000,NULL,0,12,NULL,1,NULL,NULL,NULL,'FAVORITE',1.00000000,NULL,NULL,NULL,NULL,0.000,'0',0.000,'0',NULL,NULL),(3,'2017-02-02 05:17:08','2017-02-02 01:17:08',1,10,'aaa',NULL,0,100.00000000,1,10,0,100.00000000,0.00000000,12.500,NULL,0,12,NULL,1,NULL,NULL,NULL,NULL,1.00000000,NULL,NULL,NULL,NULL,0.000,'0',0.000,'0',NULL,NULL),(4,'2019-10-08 19:21:34','2019-10-08 17:21:34',11,10,'ggg','',0,0.00000000,10,0,0,0.00000000,0.00000000,0.000,NULL,0,12,NULL,1,NULL,NULL,NULL,NULL,1.00000000,0.00000000,1,'EUR',0.00000000,0.000,'0',0.000,'0',NULL,2),(5,'2020-01-01 18:04:14','2020-01-01 16:11:36',1,17,'BK01','',0,79.16667000,1,0,0,79.16667000,0.00000000,12.500,NULL,0,12,NULL,1,NULL,NULL,NULL,NULL,1.20000000,95.00000000,2,'USD',95.00000000,0.000,'0',0.000,'0',NULL,2),(6,'2020-01-01 18:36:40','2020-01-01 14:36:40',2,17,'BKPEARPIE','',0,7.00000000,1,0,0,7.00000000,0.00000000,20.000,NULL,0,12,NULL,1,NULL,NULL,NULL,NULL,1.00000000,7.00000000,1,'EUR',7.00000000,0.000,'0',0.000,'0',NULL,2),(7,'2020-01-20 12:22:00','2020-01-20 11:22:00',1,17,'bbb','',0,1000.00000000,10,0,0,100.00000000,0.00000000,12.500,NULL,0,12,NULL,1,NULL,NULL,NULL,NULL,1.00000000,100.00000000,1,'EUR',1000.00000000,0.000,'0',0.000,'0',NULL,2);
+INSERT INTO `llx_product_fournisseur_price` VALUES (1,'2012-07-11 18:45:42','2014-12-08 13:11:08',4,1,'ABCD',NULL,NULL,10.00000000,1,0,0,10.00000000,0.00000000,0.000,NULL,0,1,NULL,1,NULL,NULL,NULL,NULL,1.00000000,NULL,NULL,NULL,NULL,0.000,'0',0.000,'0',NULL,NULL,NULL),(2,'2018-07-30 17:34:38','2018-07-30 13:34:38',12,10,'BASIC',NULL,0,9.00000000,1,0,0,9.00000000,0.00000000,0.000,NULL,0,12,NULL,1,NULL,NULL,NULL,'FAVORITE',1.00000000,NULL,NULL,NULL,NULL,0.000,'0',0.000,'0',NULL,NULL,NULL),(3,'2017-02-02 05:17:08','2017-02-02 01:17:08',1,10,'aaa',NULL,0,100.00000000,1,10,0,100.00000000,0.00000000,12.500,NULL,0,12,NULL,1,NULL,NULL,NULL,NULL,1.00000000,NULL,NULL,NULL,NULL,0.000,'0',0.000,'0',NULL,NULL,NULL),(4,'2019-10-08 19:21:34','2019-10-08 17:21:34',11,10,'ggg','',0,0.00000000,10,0,0,0.00000000,0.00000000,0.000,NULL,0,12,NULL,1,NULL,NULL,NULL,NULL,1.00000000,0.00000000,1,'EUR',0.00000000,0.000,'0',0.000,'0',NULL,2,NULL),(5,'2020-01-01 18:04:14','2020-01-01 16:11:36',1,17,'BK01','',0,79.16667000,1,0,0,79.16667000,0.00000000,12.500,NULL,0,12,NULL,1,NULL,NULL,NULL,NULL,1.20000000,95.00000000,2,'USD',95.00000000,0.000,'0',0.000,'0',NULL,2,NULL),(6,'2020-01-01 18:36:40','2020-01-01 14:36:40',2,17,'BKPEARPIE','',0,7.00000000,1,0,0,7.00000000,0.00000000,20.000,NULL,0,12,NULL,1,NULL,NULL,NULL,NULL,1.00000000,7.00000000,1,'EUR',7.00000000,0.000,'0',0.000,'0',NULL,2,NULL),(7,'2020-01-20 12:22:00','2020-01-20 11:22:00',1,17,'bbb','',0,1000.00000000,10,0,0,100.00000000,0.00000000,12.500,NULL,0,12,NULL,1,NULL,NULL,NULL,NULL,1.00000000,100.00000000,1,'EUR',1000.00000000,0.000,'0',0.000,'0',NULL,2,NULL);
 /*!40000 ALTER TABLE `llx_product_fournisseur_price` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -10673,8 +12019,8 @@ CREATE TABLE `llx_product_warehouse_properties` (
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_product` int(11) NOT NULL,
   `fk_entrepot` int(11) NOT NULL,
-  `seuil_stock_alerte` int(11) DEFAULT 0,
-  `desiredstock` int(11) DEFAULT 0,
+  `seuil_stock_alerte` float DEFAULT NULL,
+  `desiredstock` float DEFAULT NULL,
   `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -10725,6 +12071,7 @@ CREATE TABLE `llx_projet` (
   `usage_opportunity` int(11) DEFAULT 0,
   `usage_task` int(11) DEFAULT 1,
   `usage_organize_event` int(11) DEFAULT 0,
+  `email_msgid` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_projet_ref` (`ref`,`entity`),
   KEY `idx_projet_fk_soc` (`fk_soc`),
@@ -10738,7 +12085,7 @@ CREATE TABLE `llx_projet` (
 
 LOCK TABLES `llx_projet` WRITE;
 /*!40000 ALTER TABLE `llx_projet` DISABLE KEYS */;
-INSERT INTO `llx_projet` VALUES (1,11,'2012-07-09 00:00:00','2017-10-05 20:51:28','2012-07-09',NULL,'PROJ1',1,'Project One','',1,0,1,NULL,NULL,NULL,'gdfgdfg','baleine',NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0),(2,13,'2012-07-09 00:00:00','2017-10-05 20:51:51','2012-07-09',NULL,'PROJ2',1,'Project Two','',1,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0),(3,1,'2012-07-09 00:00:00','2020-01-15 12:40:50','2012-07-09',NULL,'PROJINDIAN',1,'Project for Indian company move','',1,0,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,1,0,1,0),(4,NULL,'2012-07-09 00:00:00','2012-07-08 22:50:49','2012-07-09',NULL,'PROJSHARED',1,'The Global project','',1,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0),(5,NULL,'2012-07-11 00:00:00','2020-01-15 12:27:15','2012-07-11','2013-07-14','RMLL',1,'Project management RMLL','',1,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,1,0,1,0),(6,10,'2018-07-30 00:00:00','2019-11-28 11:52:54','2018-07-30',NULL,'PJ1607-0001',1,'PROJALICE1','The Alice project number 1',12,0,1,2,20.00,NULL,NULL,NULL,5000.00000000,NULL,NULL,8000.00000000,NULL,12,1,1,1,0),(7,10,'2018-07-30 00:00:00','2019-11-28 11:52:54','2018-07-30',NULL,'PJ1607-0002',1,'PROJALICE2','The Alice project number 2',12,0,1,6,100.00,NULL,NULL,NULL,NULL,'2017-02-01 16:24:31',12,7000.00000000,NULL,NULL,0,1,1,0),(8,10,'2018-07-30 00:00:00','2019-11-28 11:52:54','2018-07-30',NULL,'PJ1607-0003',1,'PROJALICE2','The Alice project number 3',12,0,1,6,100.00,NULL,NULL,NULL,NULL,NULL,NULL,3550.00000000,NULL,NULL,0,1,1,0),(9,4,'2018-07-31 00:00:00','2019-12-20 16:33:15','2018-07-31',NULL,'PJ1607-0004',1,'Project Top X','',12,0,2,2,27.00,NULL,NULL,NULL,NULL,'2019-12-20 20:33:15',12,4000.00000000,NULL,NULL,0,1,1,0),(10,1,'2019-12-21 19:46:33','2019-12-21 15:48:06','2019-12-21',NULL,'PJ1912-0005',1,'Contact for a new shop in Delhi','',12,0,1,1,20.00,NULL,NULL,NULL,NULL,NULL,NULL,18000.00000000,NULL,12,0,1,1,0),(11,10,'2019-12-21 19:49:28','2019-12-21 16:10:21','2019-12-02','2019-12-13','PJ1912-0006',1,'Request for new development of logo','Request to redesign a new logo',12,0,1,4,60.00,NULL,NULL,NULL,NULL,NULL,NULL,6500.00000000,NULL,12,1,1,1,0),(12,4,'2019-12-21 19:52:12','2019-12-21 15:52:12','2019-12-21',NULL,'PJ1912-0007',1,'Adding new tool for Customer Relationship Management','',12,1,0,1,0.00,NULL,NULL,NULL,NULL,NULL,NULL,16000.00000000,NULL,NULL,1,1,1,0),(13,26,'2019-12-21 19:53:21','2019-12-21 15:53:59','2019-12-21',NULL,'PJ1912-0008',1,'Cooking 100 apple pie for chrsitmas','',12,0,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,1,0,1,0);
+INSERT INTO `llx_projet` VALUES (1,11,'2012-07-09 00:00:00','2017-10-05 20:51:28','2012-07-09',NULL,'PROJ1',1,'Project One','',1,0,1,NULL,NULL,NULL,'gdfgdfg','baleine',NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,NULL),(2,13,'2012-07-09 00:00:00','2017-10-05 20:51:51','2012-07-09',NULL,'PROJ2',1,'Project Two','',1,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,NULL),(3,1,'2012-07-09 00:00:00','2020-01-15 12:40:50','2012-07-09',NULL,'PROJINDIAN',1,'Project for Indian company move','',1,0,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,1,0,1,0,NULL),(4,NULL,'2012-07-09 00:00:00','2012-07-08 22:50:49','2012-07-09',NULL,'PROJSHARED',1,'The Global project','',1,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,NULL),(5,NULL,'2012-07-11 00:00:00','2020-01-15 12:27:15','2012-07-11','2013-07-14','RMLL',1,'Project management RMLL','',1,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,1,0,1,0,NULL),(6,10,'2018-07-30 00:00:00','2019-11-28 11:52:54','2018-07-30',NULL,'PJ1607-0001',1,'PROJALICE1','The Alice project number 1',12,0,1,2,20.00,NULL,NULL,NULL,5000.00000000,NULL,NULL,8000.00000000,NULL,12,1,1,1,0,NULL),(7,10,'2018-07-30 00:00:00','2019-11-28 11:52:54','2018-07-30',NULL,'PJ1607-0002',1,'PROJALICE2','The Alice project number 2',12,0,1,6,100.00,NULL,NULL,NULL,NULL,'2017-02-01 16:24:31',12,7000.00000000,NULL,NULL,0,1,1,0,NULL),(8,10,'2018-07-30 00:00:00','2019-11-28 11:52:54','2018-07-30',NULL,'PJ1607-0003',1,'PROJALICE2','The Alice project number 3',12,0,1,6,100.00,NULL,NULL,NULL,NULL,NULL,NULL,3550.00000000,NULL,NULL,0,1,1,0,NULL),(9,4,'2018-07-31 00:00:00','2019-12-20 16:33:15','2018-07-31',NULL,'PJ1607-0004',1,'Project Top X','',12,0,2,2,27.00,NULL,NULL,NULL,NULL,'2019-12-20 20:33:15',12,4000.00000000,NULL,NULL,0,1,1,0,NULL),(10,1,'2019-12-21 19:46:33','2019-12-21 15:48:06','2019-12-21',NULL,'PJ1912-0005',1,'Contact for a new shop in Delhi','',12,0,1,1,20.00,NULL,NULL,NULL,NULL,NULL,NULL,18000.00000000,NULL,12,0,1,1,0,NULL),(11,10,'2019-12-21 19:49:28','2019-12-21 16:10:21','2019-12-02','2019-12-13','PJ1912-0006',1,'Request for new development of logo','Request to redesign a new logo',12,0,1,4,60.00,NULL,NULL,NULL,NULL,NULL,NULL,6500.00000000,NULL,12,1,1,1,0,NULL),(12,4,'2019-12-21 19:52:12','2019-12-21 15:52:12','2019-12-21',NULL,'PJ1912-0007',1,'Adding new tool for Customer Relationship Management','',12,1,0,1,0.00,NULL,NULL,NULL,NULL,NULL,NULL,16000.00000000,NULL,NULL,1,1,1,0,NULL),(13,26,'2019-12-21 19:53:21','2019-12-21 15:53:59','2019-12-21',NULL,'PJ1912-0008',1,'Cooking 100 apple pie for chrsitmas','',12,0,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,1,0,1,0,NULL);
 /*!40000 ALTER TABLE `llx_projet` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -10869,7 +12216,7 @@ CREATE TABLE `llx_projet_task_time` (
   `invoice_id` int(11) DEFAULT NULL,
   `invoice_line_id` int(11) DEFAULT NULL,
   `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `datec` date DEFAULT NULL,
+  `datec` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`rowid`),
   KEY `idx_projet_task_time_task` (`fk_task`),
@@ -10884,7 +12231,7 @@ CREATE TABLE `llx_projet_task_time` (
 
 LOCK TABLES `llx_projet_task_time` WRITE;
 /*!40000 ALTER TABLE `llx_projet_task_time` DISABLE KEYS */;
-INSERT INTO `llx_projet_task_time` VALUES (2,4,'2016-12-21','2016-12-21 12:00:00',0,3600,1,NULL,'',NULL,NULL,NULL,NULL,'0000-00-00 00:00:00'),(3,4,'2016-12-18','2016-12-18 12:00:00',0,3600,1,NULL,NULL,NULL,NULL,NULL,NULL,'0000-00-00 00:00:00'),(4,3,'2016-12-21','2016-12-21 12:00:00',0,3600,1,NULL,NULL,NULL,NULL,NULL,NULL,'0000-00-00 00:00:00'),(5,3,'2016-12-21','2016-12-21 12:00:00',0,1800,1,NULL,NULL,NULL,NULL,NULL,NULL,'0000-00-00 00:00:00'),(6,3,'2016-12-21','2016-12-21 12:00:00',0,3600,1,NULL,NULL,NULL,NULL,NULL,NULL,'0000-00-00 00:00:00'),(7,6,'2018-07-25','2018-07-25 00:00:00',0,18000,12,NULL,NULL,NULL,NULL,NULL,NULL,'0000-00-00 00:00:00'),(8,6,'2018-07-26','2018-07-26 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(9,6,'2018-07-27','2018-07-27 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(10,6,'2018-07-29','2018-07-29 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(11,6,'2018-07-31','2018-07-31 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(12,7,'2018-07-25','2018-07-25 00:00:00',0,10800,12,NULL,NULL,NULL,NULL,NULL,NULL,'0000-00-00 00:00:00'),(13,7,'2018-07-26','2018-07-26 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(14,7,'2018-07-27','2018-07-27 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(15,7,'2017-01-30','2017-01-30 10:00:00',1,660,12,NULL,'',NULL,NULL,NULL,NULL,'0000-00-00 00:00:00'),(16,4,'2020-06-13','2020-06-13 00:00:00',0,3600,12,NULL,'',NULL,NULL,NULL,NULL,'2020-06-12 17:13:30');
+INSERT INTO `llx_projet_task_time` VALUES (2,4,'2016-12-21','2016-12-21 12:00:00',0,3600,1,NULL,'',NULL,NULL,NULL,NULL,'2020-12-10 12:24:40'),(3,4,'2016-12-18','2016-12-18 12:00:00',0,3600,1,NULL,NULL,NULL,NULL,NULL,NULL,'2020-12-10 12:24:40'),(4,3,'2016-12-21','2016-12-21 12:00:00',0,3600,1,NULL,NULL,NULL,NULL,NULL,NULL,'2020-12-10 12:24:40'),(5,3,'2016-12-21','2016-12-21 12:00:00',0,1800,1,NULL,NULL,NULL,NULL,NULL,NULL,'2020-12-10 12:24:40'),(6,3,'2016-12-21','2016-12-21 12:00:00',0,3600,1,NULL,NULL,NULL,NULL,NULL,NULL,'2020-12-10 12:24:40'),(7,6,'2018-07-25','2018-07-25 00:00:00',0,18000,12,NULL,NULL,NULL,NULL,NULL,NULL,'2020-12-10 12:24:40'),(8,6,'2018-07-26','2018-07-26 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(9,6,'2018-07-27','2018-07-27 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(10,6,'2018-07-29','2018-07-29 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(11,6,'2018-07-31','2018-07-31 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(12,7,'2018-07-25','2018-07-25 00:00:00',0,10800,12,NULL,NULL,NULL,NULL,NULL,NULL,'2020-12-10 12:24:40'),(13,7,'2018-07-26','2018-07-26 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(14,7,'2018-07-27','2018-07-27 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(15,7,'2017-01-30','2017-01-30 10:00:00',1,660,12,NULL,'',NULL,NULL,NULL,NULL,'2020-12-10 12:24:40'),(16,4,'2020-06-13','2020-06-13 00:00:00',0,3600,12,NULL,'',NULL,NULL,NULL,NULL,'2020-06-12 17:13:30');
 /*!40000 ALTER TABLE `llx_projet_task_time` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -11029,7 +12376,7 @@ CREATE TABLE `llx_propal` (
 
 LOCK TABLES `llx_propal` WRITE;
 /*!40000 ALTER TABLE `llx_propal` DISABLE KEYS */;
-INSERT INTO `llx_propal` VALUES (1,2,NULL,'2020-06-12 17:12:08','PR1007-0001',1,NULL,NULL,'','2012-07-09 01:33:49','2019-07-09','2019-07-24 12:00:00','2019-08-08 14:24:18',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,30.00000000,3.84000000,0.00000000,0.00000000,33.84000000,NULL,NULL,1,0,'','','azur',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(2,1,NULL,'2020-06-12 17:12:08','PR1007-0002',1,NULL,NULL,'','2012-07-10 02:11:44','2019-07-10','2019-07-25 12:00:00','2019-07-10 02:12:55','2019-07-20 15:23:12',1,NULL,1,1,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,1,'','','azur',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(3,4,NULL,'2020-06-12 17:12:08','PR1007-0003',1,NULL,NULL,'','2012-07-18 11:35:11','2019-07-18','2019-08-02 12:00:00','2019-07-18 11:36:18','2019-07-20 15:21:15',1,NULL,1,1,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(5,19,NULL,'2020-06-12 17:12:08','PR1302-0005',1,NULL,NULL,'','2015-02-17 15:39:56','2020-02-17','2020-03-04 12:00:00','2019-11-15 23:27:10',NULL,1,NULL,12,NULL,1,0,NULL,NULL,0,10.00000000,2.00000000,0.00000000,0.00000000,12.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(6,19,NULL,'2020-06-12 17:12:08','PR1302-0006',1,NULL,NULL,'','2015-02-17 15:40:12','2020-02-17','2020-03-04 12:00:00',NULL,NULL,1,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(7,19,NULL,'2020-06-12 17:12:08','PR1302-0007',1,NULL,NULL,'','2015-02-17 15:41:15','2020-02-17','2020-03-04 12:00:00','2019-01-29 21:49:33',NULL,1,NULL,12,NULL,1,0,NULL,NULL,0,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,400.00000000,0.00000000,400.00000000,NULL),(8,19,NULL,'2020-06-12 17:12:08','PR1302-0008',1,NULL,NULL,'','2015-02-17 15:43:39','2020-02-17','2020-03-04 12:00:00',NULL,NULL,1,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(10,7,4,'2020-06-12 17:12:08','PR1909-0031',1,NULL,NULL,'','2017-11-15 23:37:08','2019-11-15','2020-11-30 12:00:00','2021-09-27 16:54:30',NULL,12,NULL,12,NULL,1,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,3,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',NULL,NULL,1.00000000,10.00000000,0.00000000,10.00000000,'propale/PR1909-0031/PR1909-0031.pdf'),(11,1,NULL,'2020-06-12 17:12:08','PR1702-0009',1,NULL,NULL,'','2017-02-16 01:44:58','2020-05-13','2020-05-28 12:00:00','2020-02-16 01:44:58',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,60.00000000,0.00000000,0.00000000,0.00000000,60.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,60.00000000,0.00000000,60.00000000,NULL),(12,7,NULL,'2020-06-12 17:12:08','PR1702-0010',1,NULL,NULL,'','2017-02-16 01:45:44','2019-06-24','2019-07-09 12:00:00','2020-02-16 01:45:44',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,832.00000000,0.00000000,0.00000000,0.00000000,832.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,832.00000000,0.00000000,832.00000000,NULL),(13,26,NULL,'2020-06-12 17:12:08','PR1702-0011',1,NULL,NULL,'','2017-02-16 01:46:15','2020-04-03','2020-04-18 12:00:00','2020-02-16 01:46:15',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,242.00000000,0.00000000,0.00000000,0.00000000,242.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,242.00000000,0.00000000,242.00000000,NULL),(14,3,NULL,'2020-06-12 17:12:08','PR1702-0012',1,NULL,NULL,'','2017-02-16 01:46:15','2019-06-19','2019-07-04 12:00:00','2019-02-16 01:46:15',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,245.00000000,0.00000000,0.00000000,0.00000000,245.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,245.00000000,0.00000000,245.00000000,NULL),(15,26,NULL,'2020-06-12 17:12:08','PR1702-0013',1,NULL,NULL,'','2017-02-16 01:46:15','2020-05-01','2020-05-16 12:00:00','2019-02-16 01:46:15',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,940.00000000,0.00000000,0.00000000,0.00000000,940.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,940.00000000,0.00000000,940.00000000,NULL),(16,1,NULL,'2020-06-12 17:12:08','PR1702-0014',1,NULL,NULL,'','2017-02-16 01:46:15','2020-05-13','2020-05-28 12:00:00','2020-02-16 01:46:15',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,125.00000000,0.00000000,0.00000000,0.00000000,125.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,125.00000000,0.00000000,125.00000000,NULL),(17,1,NULL,'2020-06-12 17:12:08','PR1702-0015',1,NULL,NULL,'','2017-02-16 01:46:15','2019-07-23','2019-08-07 12:00:00','2019-02-16 01:46:15',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,163.00000000,0.00000000,0.00000000,0.00000000,163.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,163.00000000,0.00000000,163.00000000,NULL),(18,26,NULL,'2020-06-12 17:12:08','PR1702-0016',1,NULL,NULL,'','2017-02-16 01:46:15','2020-02-13','2020-02-28 12:00:00','2020-02-16 01:46:15',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,900.00000000,0.00000000,0.00000000,0.00000000,900.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,900.00000000,0.00000000,900.00000000,NULL),(19,12,NULL,'2020-06-12 17:12:08','PR1702-0017',1,NULL,NULL,'','2017-02-16 01:46:15','2020-03-30','2020-04-14 12:00:00','2020-02-16 01:46:15',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,200.00000000,0.00000000,200.00000000,NULL),(20,26,NULL,'2020-06-12 17:12:08','PR1702-0018',1,NULL,NULL,'','2017-02-16 01:46:15','2019-11-13','2019-11-28 12:00:00','2019-02-16 01:46:15',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,830.00000000,0.00000000,0.00000000,0.00000000,830.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,830.00000000,0.00000000,830.00000000,NULL),(21,1,NULL,'2020-06-12 17:12:08','PR1702-0019',1,NULL,NULL,'','2017-02-16 01:46:15','2019-09-23','2020-10-08 12:00:00','2020-02-16 04:47:09',NULL,1,NULL,12,NULL,1,0,NULL,NULL,0,89.00000000,0.00000000,0.00000000,0.00000000,89.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,89.00000000,0.00000000,89.00000000,NULL),(22,26,NULL,'2020-06-12 17:12:08','PR1702-0020',1,NULL,NULL,'','2017-02-16 01:46:15','2019-11-13','2019-11-28 12:00:00','2019-02-16 01:46:15',NULL,1,NULL,1,NULL,0,0,NULL,NULL,0,70.00000000,0.00000000,0.00000000,0.00000000,70.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,70.00000000,0.00000000,70.00000000,'propale/PR1702-0020/PR1702-0020.pdf'),(23,12,NULL,'2020-06-12 17:12:08','PR1702-0021',1,NULL,NULL,'','2017-02-16 01:46:17','2020-04-03','2020-04-18 12:00:00','2019-02-17 16:07:18',NULL,2,NULL,12,NULL,1,0,NULL,NULL,0,715.00000000,0.00000000,0.00000000,0.00000000,715.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,715.00000000,0.00000000,715.00000000,NULL),(24,7,NULL,'2020-06-12 17:12:08','PR1702-0022',1,NULL,NULL,'','2017-02-16 01:46:17','2019-11-13','2019-11-28 12:00:00','2019-02-16 01:46:17',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,250.00000000,0.00000000,0.00000000,0.00000000,250.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,250.00000000,0.00000000,250.00000000,NULL),(25,3,NULL,'2020-06-12 17:12:08','PR1702-0023',1,NULL,NULL,'','2017-02-16 01:46:17','2019-07-09','2019-07-24 12:00:00','2019-02-16 01:46:17','2019-02-16 04:47:29',1,NULL,1,12,4,0,NULL,NULL,0,1018.00000000,0.00000000,0.00000000,0.00000000,1018.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,1018.00000000,0.00000000,1018.00000000,NULL),(26,1,NULL,'2020-06-12 17:12:08','PR1702-0024',1,NULL,NULL,'','2017-02-16 01:46:17','2020-04-03','2020-04-18 12:00:00','2019-02-16 01:46:18',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,710.00000000,0.00000000,0.00000000,0.00000000,710.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,710.00000000,0.00000000,710.00000000,NULL),(27,6,NULL,'2020-06-12 17:12:08','PR1702-0025',1,NULL,NULL,'','2017-02-16 01:46:18','2019-11-12','2019-11-27 12:00:00','2019-02-16 01:46:18',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,300.00000000,0.00000000,300.00000000,NULL),(28,19,NULL,'2020-06-12 17:12:08','PR1702-0026',1,NULL,NULL,'','2017-02-16 01:46:18','2019-07-30','2019-08-14 12:00:00','2020-02-16 01:46:18','2020-02-16 04:46:31',2,NULL,2,12,2,0,NULL,NULL,0,440.00000000,0.00000000,0.00000000,0.00000000,440.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,440.00000000,0.00000000,440.00000000,NULL),(29,1,NULL,'2020-06-12 17:12:08','PR1702-0027',1,NULL,NULL,'','2017-02-16 01:46:18','2019-07-23','2019-08-07 12:00:00','2020-02-16 01:46:18','2021-12-20 20:50:23',2,NULL,2,12,2,0,NULL,NULL,0,1000.00000000,0.00000000,0.00000000,0.00000000,1000.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,'propale/PR1702-0027/PR1702-0027.pdf'),(30,1,NULL,'2020-06-12 17:12:08','PR1702-0028',1,NULL,NULL,'','2017-02-16 01:46:18','2020-05-01','2020-05-16 12:00:00','2019-02-16 01:46:18','2019-02-16 04:46:42',2,NULL,2,12,3,0,NULL,NULL,0,1200.00000000,0.00000000,0.00000000,0.00000000,1200.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,1200.00000000,0.00000000,1200.00000000,NULL),(31,11,NULL,'2020-06-12 17:12:08','PR1702-0029',1,NULL,NULL,'','2017-02-16 01:46:18','2019-06-24','2019-07-09 12:00:00','2019-02-16 01:46:18',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,720.00000000,0.00000000,0.00000000,0.00000000,720.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,720.00000000,0.00000000,720.00000000,NULL),(32,19,NULL,'2020-06-12 17:12:08','PR1702-0030',1,NULL,NULL,'','2017-02-16 01:46:18','2019-11-12','2019-11-27 12:00:00','2019-02-16 01:46:18',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,608.00000000,0.00000000,0.00000000,0.00000000,608.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,608.00000000,0.00000000,608.00000000,NULL),(33,10,6,'2020-01-15 18:37:15','PR1909-0032',1,NULL,NULL,'','2019-09-27 17:07:40','2019-09-27','2019-10-12 12:00:00','2019-09-27 17:08:59',NULL,12,12,12,NULL,1,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,'This is a private note','This is a public note','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,'propale/PR1909-0032/PR1909-0032.pdf'),(34,10,6,'2020-01-18 17:13:33','PR1909-0033',1,NULL,NULL,'','2019-09-27 17:11:21','2019-09-27','2019-10-12 12:00:00','2019-09-27 17:13:13','2020-01-07 23:43:06',12,12,12,12,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,NULL,NULL,NULL,'a &amp; a<br />\r\nb &lt; r','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,'propale/PR1909-0033/PR1909-0033.pdf'),(35,10,NULL,'2020-01-01 19:54:50','(PROV35)',1,NULL,NULL,'','2019-09-27 17:53:44','2019-09-27','2019-10-12 12:00:00',NULL,NULL,12,NULL,NULL,NULL,0,0,NULL,NULL,0,5.00000000,0.00000000,0.00000000,0.00000000,5.00000000,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,5.00000000,0.00000000,5.00000000,'propale/(PROV35)/(PROV35).pdf'),(36,1,NULL,'2020-01-19 13:24:27','PR2001-0034',1,NULL,NULL,'','2020-01-01 23:55:35','2020-01-01','2020-01-16 12:00:00','2020-01-19 14:24:22','2020-01-19 14:24:27',12,NULL,12,12,2,0,NULL,NULL,0,4.00000000,0.24000000,0.00000000,0.00000000,4.24000000,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,4.00000000,0.24000000,4.24000000,'propale/PR2001-0034/PR2001-0034.pdf'),(37,10,NULL,'2020-01-05 20:46:07','(PROV37)',1,NULL,NULL,'','2020-01-06 00:44:16','2020-01-05','2020-01-20 12:00:00',NULL,NULL,12,NULL,NULL,NULL,0,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,'propale/(PROV37)/(PROV37).pdf'),(38,30,NULL,'2020-01-13 13:25:28','(PROV38)',1,NULL,NULL,'','2020-01-13 17:25:28','2020-01-13','2020-01-28 12:00:00',NULL,NULL,12,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,'propale/(PROV38)/(PROV38).pdf');
+INSERT INTO `llx_propal` VALUES (1,2,NULL,'2020-12-10 12:24:22','PR1007-0001',1,NULL,NULL,'','2012-07-09 01:33:49','2020-07-09','2020-07-24 12:00:00','2020-08-08 14:24:18',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,30.00000000,3.84000000,0.00000000,0.00000000,33.84000000,NULL,NULL,1,0,'','','azur',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(2,1,NULL,'2020-12-10 12:24:22','PR1007-0002',1,NULL,NULL,'','2012-07-10 02:11:44','2020-07-10','2020-07-25 12:00:00','2020-07-10 02:12:55','2020-07-20 15:23:12',1,NULL,1,1,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,1,'','','azur',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(3,4,NULL,'2020-12-10 12:24:22','PR1007-0003',1,NULL,NULL,'','2012-07-18 11:35:11','2020-07-18','2020-08-02 12:00:00','2020-07-18 11:36:18','2020-07-20 15:21:15',1,NULL,1,1,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(5,19,NULL,'2020-06-12 17:12:08','PR1302-0005',1,NULL,NULL,'','2015-02-17 15:39:56','2020-02-17','2020-03-04 12:00:00','2019-11-15 23:27:10',NULL,1,NULL,12,NULL,1,0,NULL,NULL,0,10.00000000,2.00000000,0.00000000,0.00000000,12.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(6,19,NULL,'2020-06-12 17:12:08','PR1302-0006',1,NULL,NULL,'','2015-02-17 15:40:12','2020-02-17','2020-03-04 12:00:00',NULL,NULL,1,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(7,19,NULL,'2020-06-12 17:12:08','PR1302-0007',1,NULL,NULL,'','2015-02-17 15:41:15','2020-02-17','2020-03-04 12:00:00','2019-01-29 21:49:33',NULL,1,NULL,12,NULL,1,0,NULL,NULL,0,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,400.00000000,0.00000000,400.00000000,NULL),(8,19,NULL,'2020-06-12 17:12:08','PR1302-0008',1,NULL,NULL,'','2015-02-17 15:43:39','2020-02-17','2020-03-04 12:00:00',NULL,NULL,1,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(10,7,4,'2020-12-10 12:24:22','PR1909-0031',1,NULL,NULL,'','2017-11-15 23:37:08','2020-11-15','2020-11-30 12:00:00','2021-09-27 16:54:30',NULL,12,NULL,12,NULL,1,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,3,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',NULL,NULL,1.00000000,10.00000000,0.00000000,10.00000000,'propale/PR1909-0031/PR1909-0031.pdf'),(11,1,NULL,'2020-06-12 17:12:08','PR1702-0009',1,NULL,NULL,'','2017-02-16 01:44:58','2020-05-13','2020-05-28 12:00:00','2020-02-16 01:44:58',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,60.00000000,0.00000000,0.00000000,0.00000000,60.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,60.00000000,0.00000000,60.00000000,NULL),(12,7,NULL,'2020-12-10 12:24:22','PR1702-0010',1,NULL,NULL,'','2017-02-16 01:45:44','2020-06-24','2020-07-09 12:00:00','2020-02-16 01:45:44',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,832.00000000,0.00000000,0.00000000,0.00000000,832.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,832.00000000,0.00000000,832.00000000,NULL),(13,26,NULL,'2020-06-12 17:12:08','PR1702-0011',1,NULL,NULL,'','2017-02-16 01:46:15','2020-04-03','2020-04-18 12:00:00','2020-02-16 01:46:15',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,242.00000000,0.00000000,0.00000000,0.00000000,242.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,242.00000000,0.00000000,242.00000000,NULL),(14,3,NULL,'2020-12-10 12:24:22','PR1702-0012',1,NULL,NULL,'','2017-02-16 01:46:15','2020-06-19','2020-07-04 12:00:00','2020-02-16 01:46:15',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,245.00000000,0.00000000,0.00000000,0.00000000,245.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,245.00000000,0.00000000,245.00000000,NULL),(15,26,NULL,'2020-06-12 17:12:08','PR1702-0013',1,NULL,NULL,'','2017-02-16 01:46:15','2020-05-01','2020-05-16 12:00:00','2019-02-16 01:46:15',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,940.00000000,0.00000000,0.00000000,0.00000000,940.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,940.00000000,0.00000000,940.00000000,NULL),(16,1,NULL,'2020-06-12 17:12:08','PR1702-0014',1,NULL,NULL,'','2017-02-16 01:46:15','2020-05-13','2020-05-28 12:00:00','2020-02-16 01:46:15',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,125.00000000,0.00000000,0.00000000,0.00000000,125.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,125.00000000,0.00000000,125.00000000,NULL),(17,1,NULL,'2020-12-10 12:24:22','PR1702-0015',1,NULL,NULL,'','2017-02-16 01:46:15','2020-07-23','2020-08-07 12:00:00','2020-02-16 01:46:15',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,163.00000000,0.00000000,0.00000000,0.00000000,163.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,163.00000000,0.00000000,163.00000000,NULL),(18,26,NULL,'2020-06-12 17:12:08','PR1702-0016',1,NULL,NULL,'','2017-02-16 01:46:15','2020-02-13','2020-02-28 12:00:00','2020-02-16 01:46:15',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,900.00000000,0.00000000,0.00000000,0.00000000,900.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,900.00000000,0.00000000,900.00000000,NULL),(19,12,NULL,'2020-06-12 17:12:08','PR1702-0017',1,NULL,NULL,'','2017-02-16 01:46:15','2020-03-30','2020-04-14 12:00:00','2020-02-16 01:46:15',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,200.00000000,0.00000000,200.00000000,NULL),(20,26,NULL,'2020-12-10 12:24:22','PR1702-0018',1,NULL,NULL,'','2017-02-16 01:46:15','2020-11-13','2020-11-28 12:00:00','2020-02-16 01:46:15',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,830.00000000,0.00000000,0.00000000,0.00000000,830.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,830.00000000,0.00000000,830.00000000,NULL),(21,1,NULL,'2020-12-10 12:24:22','PR1702-0019',1,NULL,NULL,'','2017-02-16 01:46:15','2020-09-23','2020-10-08 12:00:00','2020-02-16 04:47:09',NULL,1,NULL,12,NULL,1,0,NULL,NULL,0,89.00000000,0.00000000,0.00000000,0.00000000,89.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,89.00000000,0.00000000,89.00000000,NULL),(22,26,NULL,'2020-12-10 12:24:22','PR1702-0020',1,NULL,NULL,'','2017-02-16 01:46:15','2020-11-13','2020-11-28 12:00:00','2020-02-16 01:46:15',NULL,1,NULL,1,NULL,0,0,NULL,NULL,0,70.00000000,0.00000000,0.00000000,0.00000000,70.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,70.00000000,0.00000000,70.00000000,'propale/PR1702-0020/PR1702-0020.pdf'),(23,12,NULL,'2020-06-12 17:12:08','PR1702-0021',1,NULL,NULL,'','2017-02-16 01:46:17','2020-04-03','2020-04-18 12:00:00','2019-02-17 16:07:18',NULL,2,NULL,12,NULL,1,0,NULL,NULL,0,715.00000000,0.00000000,0.00000000,0.00000000,715.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,715.00000000,0.00000000,715.00000000,NULL),(24,7,NULL,'2020-12-10 12:24:22','PR1702-0022',1,NULL,NULL,'','2017-02-16 01:46:17','2020-11-13','2020-11-28 12:00:00','2020-02-16 01:46:17',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,250.00000000,0.00000000,0.00000000,0.00000000,250.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,250.00000000,0.00000000,250.00000000,NULL),(25,3,NULL,'2020-12-10 12:24:22','PR1702-0023',1,NULL,NULL,'','2017-02-16 01:46:17','2020-07-09','2020-07-24 12:00:00','2020-02-16 01:46:17','2020-02-16 04:47:29',1,NULL,1,12,4,0,NULL,NULL,0,1018.00000000,0.00000000,0.00000000,0.00000000,1018.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,1018.00000000,0.00000000,1018.00000000,NULL),(26,1,NULL,'2020-06-12 17:12:08','PR1702-0024',1,NULL,NULL,'','2017-02-16 01:46:17','2020-04-03','2020-04-18 12:00:00','2019-02-16 01:46:18',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,710.00000000,0.00000000,0.00000000,0.00000000,710.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,710.00000000,0.00000000,710.00000000,NULL),(27,6,NULL,'2020-12-10 12:24:22','PR1702-0025',1,NULL,NULL,'','2017-02-16 01:46:18','2020-11-12','2020-11-27 12:00:00','2020-02-16 01:46:18',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,300.00000000,0.00000000,300.00000000,NULL),(28,19,NULL,'2020-12-10 12:24:22','PR1702-0026',1,NULL,NULL,'','2017-02-16 01:46:18','2020-07-30','2020-08-14 12:00:00','2020-02-16 01:46:18','2020-02-16 04:46:31',2,NULL,2,12,2,0,NULL,NULL,0,440.00000000,0.00000000,0.00000000,0.00000000,440.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,440.00000000,0.00000000,440.00000000,NULL),(29,1,NULL,'2020-12-10 12:24:22','PR1702-0027',1,NULL,NULL,'','2017-02-16 01:46:18','2020-07-23','2020-08-07 12:00:00','2020-02-16 01:46:18','2021-12-20 20:50:23',2,NULL,2,12,2,0,NULL,NULL,0,1000.00000000,0.00000000,0.00000000,0.00000000,1000.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,'propale/PR1702-0027/PR1702-0027.pdf'),(30,1,NULL,'2020-06-12 17:12:08','PR1702-0028',1,NULL,NULL,'','2017-02-16 01:46:18','2020-05-01','2020-05-16 12:00:00','2019-02-16 01:46:18','2019-02-16 04:46:42',2,NULL,2,12,3,0,NULL,NULL,0,1200.00000000,0.00000000,0.00000000,0.00000000,1200.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,1200.00000000,0.00000000,1200.00000000,NULL),(31,11,NULL,'2020-12-10 12:24:22','PR1702-0029',1,NULL,NULL,'','2017-02-16 01:46:18','2020-06-24','2020-07-09 12:00:00','2020-02-16 01:46:18',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,720.00000000,0.00000000,0.00000000,0.00000000,720.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,720.00000000,0.00000000,720.00000000,NULL),(32,19,NULL,'2020-12-10 12:24:22','PR1702-0030',1,NULL,NULL,'','2017-02-16 01:46:18','2020-11-12','2020-11-27 12:00:00','2020-02-16 01:46:18',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,608.00000000,0.00000000,0.00000000,0.00000000,608.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,608.00000000,0.00000000,608.00000000,NULL),(33,10,6,'2020-12-10 12:24:22','PR1909-0032',1,NULL,NULL,'','2019-09-27 17:07:40','2020-09-27','2020-10-12 12:00:00','2020-09-27 17:08:59',NULL,12,12,12,NULL,1,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,'This is a private note','This is a public note','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,'propale/PR1909-0032/PR1909-0032.pdf'),(34,10,6,'2020-12-10 12:24:22','PR1909-0033',1,NULL,NULL,'','2019-09-27 17:11:21','2020-09-27','2020-10-12 12:00:00','2020-09-27 17:13:13','2020-01-07 23:43:06',12,12,12,12,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,NULL,NULL,NULL,'a &amp; a<br />\r\nb &lt; r','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,'propale/PR1909-0033/PR1909-0033.pdf'),(35,10,NULL,'2020-12-10 12:24:22','(PROV35)',1,NULL,NULL,'','2019-09-27 17:53:44','2020-09-27','2020-10-12 12:00:00',NULL,NULL,12,NULL,NULL,NULL,0,0,NULL,NULL,0,5.00000000,0.00000000,0.00000000,0.00000000,5.00000000,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,5.00000000,0.00000000,5.00000000,'propale/(PROV35)/(PROV35).pdf'),(36,1,NULL,'2020-01-19 13:24:27','PR2001-0034',1,NULL,NULL,'','2020-01-01 23:55:35','2020-01-01','2020-01-16 12:00:00','2020-01-19 14:24:22','2020-01-19 14:24:27',12,NULL,12,12,2,0,NULL,NULL,0,4.00000000,0.24000000,0.00000000,0.00000000,4.24000000,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,4.00000000,0.24000000,4.24000000,'propale/PR2001-0034/PR2001-0034.pdf'),(37,10,NULL,'2020-01-05 20:46:07','(PROV37)',1,NULL,NULL,'','2020-01-06 00:44:16','2020-01-05','2020-01-20 12:00:00',NULL,NULL,12,NULL,NULL,NULL,0,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,'propale/(PROV37)/(PROV37).pdf'),(38,30,NULL,'2020-01-13 13:25:28','(PROV38)',1,NULL,NULL,'','2020-01-13 17:25:28','2020-01-13','2020-01-28 12:00:00',NULL,NULL,12,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,'propale/(PROV38)/(PROV38).pdf');
 /*!40000 ALTER TABLE `llx_propal` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -11180,6 +12527,247 @@ LOCK TABLES `llx_propaldet_extrafields` WRITE;
 /*!40000 ALTER TABLE `llx_propaldet_extrafields` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_rec_dossier`
+--
+
+DROP TABLE IF EXISTS `llx_rec_dossier`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_rec_dossier` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT 0,
+  `fk_soc` int(11) NOT NULL DEFAULT 0,
+  `fk_user` int(11) NOT NULL DEFAULT 0,
+  `fk_procedure` int(11) NOT NULL DEFAULT 0,
+  `fk_etape` int(11) NOT NULL DEFAULT 0,
+  `ref` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `statut` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `commentaire` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `date_last_etape` datetime DEFAULT NULL,
+  `date_start` datetime DEFAULT NULL,
+  `date_end` datetime DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_rec_dossier`
+--
+
+LOCK TABLES `llx_rec_dossier` WRITE;
+/*!40000 ALTER TABLE `llx_rec_dossier` DISABLE KEYS */;
+INSERT INTO `llx_rec_dossier` VALUES (1,'2019-10-08 17:06:17','2019-10-08 17:15:15',1,404,12,1,1,'REC1910-0001','OPEN','','2019-10-08 17:13:53','2019-10-08 17:06:17',NULL),(2,'2019-10-08 17:06:17','2019-10-08 17:13:44',1,1,12,1,1,'REC1910-0002','OPEN','','2019-10-08 17:13:44','2019-10-08 17:06:17',NULL);
+/*!40000 ALTER TABLE `llx_rec_dossier` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_rec_dossier_facture`
+--
+
+DROP TABLE IF EXISTS `llx_rec_dossier_facture`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_rec_dossier_facture` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_dossier` int(11) NOT NULL DEFAULT 0,
+  `fk_facture` int(11) NOT NULL DEFAULT 0,
+  `paye` int(11) NOT NULL DEFAULT 0,
+  `filepath` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `fk_dossier` (`fk_dossier`),
+  KEY `fk_facture` (`fk_facture`),
+  KEY `paye` (`paye`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_rec_dossier_facture`
+--
+
+LOCK TABLES `llx_rec_dossier_facture` WRITE;
+/*!40000 ALTER TABLE `llx_rec_dossier_facture` DISABLE KEYS */;
+INSERT INTO `llx_rec_dossier_facture` VALUES (1,'2019-10-08 17:06:17','2019-10-08 17:15:15',1,780,0,'/home/ldestailleur/git/dolibarr/documents/facture/FA1504-0251/FA1504-0251.pdf'),(2,'2019-10-08 17:06:17','2019-10-08 17:13:44',2,55,0,'/home/ldestailleur/git/dolibarr/documents/facture/FA1212-0009/FA1212-0009.pdf'),(3,'2019-10-08 17:06:39','2019-10-08 17:13:44',2,149,0,'/home/ldestailleur/git/dolibarr/documents/facture/FA1601-0024/FA1601-0024.pdf');
+/*!40000 ALTER TABLE `llx_rec_dossier_facture` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_rec_etape`
+--
+
+DROP TABLE IF EXISTS `llx_rec_etape`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_rec_etape` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_procedure` int(11) NOT NULL DEFAULT 0,
+  `rang` int(11) NOT NULL DEFAULT 0,
+  `delais` int(11) NOT NULL DEFAULT 0,
+  `ref` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `name` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `fk_action` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `titre_mail` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `bcc_mail` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `tpl_doc` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `description` longtext CHARACTER SET latin1 DEFAULT NULL,
+  `body_mail` longtext CHARACTER SET latin1 DEFAULT NULL,
+  `fk_service` int(11) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `fk_procedure` (`fk_procedure`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_rec_etape`
+--
+
+LOCK TABLES `llx_rec_etape` WRITE;
+/*!40000 ALTER TABLE `llx_rec_etape` DISABLE KEYS */;
+INSERT INTO `llx_rec_etape` VALUES (1,'2019-10-08 17:00:47','2019-10-08 17:11:23',1,1,0,'','etape 1 a','mail','aaa','','','aaa','aaaaa',0),(2,'2019-10-08 17:01:50','2019-10-08 17:10:56',1,2,2,'','Etape 2','doc','','','2-tpl_lettre (1).odt','','',0);
+/*!40000 ALTER TABLE `llx_rec_etape` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_rec_etape_document`
+--
+
+DROP TABLE IF EXISTS `llx_rec_etape_document`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_rec_etape_document` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_etape` int(11) NOT NULL DEFAULT 0,
+  `fk_document` int(11) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `fk_etape` (`fk_etape`),
+  KEY `fk_document` (`fk_document`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_rec_etape_document`
+--
+
+LOCK TABLES `llx_rec_etape_document` WRITE;
+/*!40000 ALTER TABLE `llx_rec_etape_document` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_rec_etape_document` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_rec_etape_history`
+--
+
+DROP TABLE IF EXISTS `llx_rec_etape_history`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_rec_etape_history` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_dossier` int(11) NOT NULL DEFAULT 0,
+  `fk_etape` int(11) NOT NULL DEFAULT 0,
+  `fk_commaction` int(11) NOT NULL DEFAULT 0,
+  `date_etape` datetime DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `fk_dossier` (`fk_dossier`),
+  KEY `fk_etape` (`fk_etape`),
+  KEY `fk_commaction` (`fk_commaction`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_rec_etape_history`
+--
+
+LOCK TABLES `llx_rec_etape_history` WRITE;
+/*!40000 ALTER TABLE `llx_rec_etape_history` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_rec_etape_history` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_rec_prerelance`
+--
+
+DROP TABLE IF EXISTS `llx_rec_prerelance`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_rec_prerelance` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_model` int(11) NOT NULL DEFAULT 0,
+  `nb_day` int(11) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `fk_model` (`fk_model`),
+  KEY `nb_day` (`nb_day`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_rec_prerelance`
+--
+
+LOCK TABLES `llx_rec_prerelance` WRITE;
+/*!40000 ALTER TABLE `llx_rec_prerelance` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_rec_prerelance` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_rec_procedure`
+--
+
+DROP TABLE IF EXISTS `llx_rec_procedure`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_rec_procedure` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT 0,
+  `active` int(11) NOT NULL DEFAULT 0,
+  `name` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `description` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `is_default` int(11) NOT NULL DEFAULT 0,
+  `allow_free_events` int(11) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `entity` (`entity`),
+  KEY `active` (`active`),
+  KEY `is_default` (`is_default`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_rec_procedure`
+--
+
+LOCK TABLES `llx_rec_procedure` WRITE;
+/*!40000 ALTER TABLE `llx_rec_procedure` DISABLE KEYS */;
+INSERT INTO `llx_rec_procedure` VALUES (1,'2019-10-08 17:00:22','2019-10-08 17:01:26',1,0,'Recouvrement standar','aaa',1,0);
+/*!40000 ALTER TABLE `llx_rec_procedure` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_reception`
 --
@@ -11269,6 +12857,321 @@ LOCK TABLES `llx_reception_extrafields` WRITE;
 /*!40000 ALTER TABLE `llx_reception_extrafields` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_recruitment_recruitmentcandidature`
+--
+
+DROP TABLE IF EXISTS `llx_recruitment_recruitmentcandidature`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_recruitment_recruitmentcandidature` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_recruitmentjobposition` int(11) DEFAULT NULL,
+  `ref` varchar(128) CHARACTER SET utf8mb4 NOT NULL DEFAULT '(PROV)',
+  `description` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `note_public` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `note_private` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_user_creat` int(11) NOT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `model_pdf` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `status` smallint(6) NOT NULL,
+  `firstname` varchar(128) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `lastname` varchar(128) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `email` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `phone` varchar(64) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `remuneration_requested` int(11) DEFAULT NULL,
+  `remuneration_proposed` int(11) DEFAULT NULL,
+  `fk_recruitment_origin` int(11) DEFAULT NULL,
+  `email_msgid` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `date_birth` date DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_recruitmentcandidature_email_msgid` (`email_msgid`),
+  KEY `idx_recruitment_recruitmentcandidature_rowid` (`rowid`),
+  KEY `idx_recruitment_recruitmentcandidature_ref` (`ref`),
+  KEY `llx_recruitment_recruitmentcandidature_fk_user_creat` (`fk_user_creat`),
+  KEY `idx_recruitment_recruitmentcandidature_status` (`status`),
+  CONSTRAINT `llx_recruitment_recruitmentcandidature_fk_user_creat` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=118 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_recruitment_recruitmentcandidature`
+--
+
+LOCK TABLES `llx_recruitment_recruitmentcandidature` WRITE;
+/*!40000 ALTER TABLE `llx_recruitment_recruitmentcandidature` DISABLE KEYS */;
+INSERT INTO `llx_recruitment_recruitmentcandidature` VALUES (65,NULL,'(PROV65)','Monsieur,<br />\r\n<br />\r\n&Eacute;tant actuellement &agrave; la recherche d&#39;une alternance pour mon master 1<br />\r\nd&rsquo;&eacute;tude et d&eacute;veloppement option cybers&eacute;curit&eacute; &agrave; EPSI Bordeaux, je me<br />\r\npermets de vous proposer ma candidature pour le poste d&#39;alternant<br />\r\nAdmin sys .<br />\r\n<br />\r\nEn effet, mon profil a sembl&eacute; correspondre &agrave; la description recherch&eacute;e<br />\r\nsur l&rsquo;offre d&rsquo;emploi qui m&#39;a &eacute;t&eacute; transmise par mon &eacute;cole EPSI<br />\r\nBordeaux.<br />\r\n<br />\r\nMa formation en licence Informatique m&#39;a permis d&#39;acqu&eacute;rir de<br />\r\nnombreuses comp&eacute;tences telles que l&#39;apprentissage du langage Java avec<br />\r\nle logiciel eclipse, j&#39;ai d&eacute;j&agrave; fait plusieurs cours sur openclassroom<br />\r\npour apprendre le langage C# et Javascript. J&#39;ai &eacute;galement &eacute;t&eacute; form&eacute; &agrave;<br />\r\nl&#39;utilisation du gestionnaire de version Git mais aussi au langage C<br />\r\nde mani&egrave;re approfondie. Dans le cadre de ma formation en licence<br />\r\ninformatique un projet de programmation web en Symfony4 pour le CHU de<br />\r\nBordeaux m&#39;a &eacute;t&eacute; propos&eacute; comme projet d&lsquo;&eacute;tude.<br />\r\n<br />\r\nInt&eacute;grer votre projet, repr&eacute;sente pour moi un r&eacute;el enjeu d&rsquo;avenir<br />\r\nprofessionnel qui me permettrai de me faire de nouvelles exp&eacute;riences<br />\r\ntout en approfondissant mes connaissances et mes comp&eacute;tences et vous<br />\r\npermettrez d&rsquo;avancer dans vos projets.<br />\r\n<br />\r\nRestant &agrave; votre disposition pour toute information compl&eacute;mentaire, je<br />\r\nsuis disponible pour vous rencontrer lors d&#39;un entretien &agrave; votre<br />\r\nconvenance.<br />\r\n<br />\r\nVeuillez agr&eacute;er, Monsieur, l&#39;expression de mes sinc&egrave;res salutations.<br />\r\n<br />\r\nM.Marcouiller Lucas<br />\r\n&Eacute;tudiant &agrave; EPSI Bordeaux',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Candidature Alternance NLTechno - DoliCloud<br>\n&Eacute;metteur (From) : Lucas Marcouiller &lt;lucas.marcouiller@gmail.com&gt;<br>\nDestinataire(s) (To) : job@nltechno.com<br>\n-----<br>\nMonsieur,<br>\r\n<br>\r\nÉtant actuellement à la recherche d\'une alternance pour mon master 1<br>\r\nd’étude et développement option cybersécurité à EPSI Bordeaux, je me<br>\r\npermets de vous proposer ma candidature pour le poste d\'alternant<br>\r\nAdmin sys .<br>\r\n<br>\r\nEn effet, mon profil a semblé correspondre à la description recherchée<br>\r\nsur l’offre d’emploi qui m\'a été transmise par mon école EPSI<br>\r\nBordeaux.<br>\r\n<br>\r\nMa formation en licence Informatique m\'a permis d\'acquérir de<br>\r\nnombreuses compétences telles que l\'apprentissage du langage Java avec<br>\r\nle logiciel eclipse, j\'ai déjà fait plusieurs cours sur openclassroom<br>\r\npour apprendre le langage C# et Javascript. J\'ai également été formé à<br>\r\nl\'utilisation du gestionnaire de version Git mais aussi au langage C<br>\r\nde manière approfondie. Dans le cadre de ma formation en licence<br>\r\ninformatique un projet de programmation web en Symfony4 pour le CHU de<br>\r\nBordeaux m\'a été proposé comme projet d‘étude.<br>\r\n<br>\r\nIntégrer votre projet, représente pour moi un réel enjeu d’avenir<br>\r\nprofessionnel qui me permettrai de me faire de nouvelles expériences<br>\r\ntout en approfondissant mes connaissances et mes compétences et vous<br>\r\npermettrez d’avancer dans vos projets.<br>\r\n<br>\r\nRestant à votre disposition pour toute information complémentaire, je<br>\r\nsuis disponible pour vous rencontrer lors d\'un entretien à votre<br>\r\nconvenance.<br>\r\n<br>\r\nVeuillez agréer, Monsieur, l\'expression de mes sincères salutations.<br>\r\n<br>\r\nM.Marcouiller Lucas<br>\r\nÉtudiant à EPSI Bordeaux<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp915538jal; Thu, 20 Aug 2020 06:26:57 -0700 (PDT)<br>\r\nX-Received: by 2002:a2e:7c18:: with SMTP id x24mr1566845ljc.402.1597930017289; Thu, 20 Aug 2020 06:26:57 -0700 (PDT)<br>\r\nARC-Seal: i=1; a=rsa-sha256; t=1597930017; cv=none; d=google.com; s=arc-20160816; b=GajE/OiyTVF9aiGpVzVNnZwBBcNUjnI5l+VT1OEAaZZpsZM4rGeJ/Nj52uI8bAVyU4 s3XOu41PuFxe8/yE5HZK9lR27bhJSDlDBub4gu2caTHbSMC/kTbrV5BoNHfMRIyOmIHy J4ZmR/aoQ9pPykwut0ZYlR+DrbrKYcf0t0WhnShFRd43AAff/sso6s1yabhxZTozOyPZ W78/hOXWHdHbHvLAS0Ljk86DJ8piPbMfhtojKlDhbmYmER+TzEnJq0MOgrcY/NLwEMLi JFrk8JJGRF8sb07DNdeoVaPmI18rgtmojvxoqD9a7lvPY+JOPEJtfuzSyZzqoZ3u8LC8 IXdA==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:subject:message-id:date:from:mime-version:dkim-signature; bh=eZNdGy5LWRm0pgGTN6R6KfCchcRZbNqz5x8kmHM2XPs=; b=UR0Z2ilK+JR3MDi5gievqGR/Db+uxH7CZBsAVLMhHXFN+NrHADh7vEmSrTSEvpFyYa PQ7kq93zI1vdAwWJXt5kiH9DnMNhjOlKWPHBAgSx/EZUZzbMhvZS5f7tKQcb4k/If9uu uYD8R4SefcJi+n9zpCPArzeafsFAlrhFosCub4sW7jzMVnUh4qGNhI4HHeCeNM8o8Lea pbW3p+LPevQJVA/8wPUFcEK/TLq2NjCd5u+UgAG5d4JXbnoY62lEjF6pfEtEb3k3bpos Cbkc3ve8wJaJXAYmRHhhpHoZgpzFR6AvYYAHox6RHhr36zofAaI0CpzAZEBM1kY1GChH DTPg==<br>\r\nARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=h7SfnCr7; spf=pass (google.com: domain of lucas.marcouiller@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=lucas.marcouiller@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nReturn-Path: &lt;lucas.marcouiller@gmail.com&gt;<br>\r\nReceived: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id b83sor528973lfd.11.2020.08.20.06.26.57 for &lt;job@nltechno.com&gt; (Google Transport Security); Thu, 20 Aug 2020 06:26:57 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of lucas.marcouiller@gmail.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=h7SfnCr7; spf=pass (google.com: domain of lucas.marcouiller@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=lucas.marcouiller@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=eZNdGy5LWRm0pgGTN6R6KfCchcRZbNqz5x8kmHM2XPs=; b=h7SfnCr79yqwwwXJC6I4brVvb0ocu7KAAqAFKRgQKiHVLmn6l9RwzNXjLMDydSAed7 mwym4M3HCVeWsxbwsiXAGX2RSsoy8DspzI9d4R4bTGr7DmSglUPLKoQtJcVQI5Qwrd2M MqXeTTN47tqrdPAf/g0jjMDOxYFpJnQTNL9HN60LZt3xr/SRrk9fakU09KPYUCd7VxjR MX1lRgGSpvTvNmPnD6OjnYP6N0vKDPNvvXCcIN/wqnUlNbOhR2r9ItRsUKqpJkPVjmds xpo6fZ+Vghd16f6hbz24xOkQmodPvM8wVYBdRJ1MNHa5ykZnqkS/MjCU0PrkTqZWTzOC pDTw==<br>\r\nX-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=eZNdGy5LWRm0pgGTN6R6KfCchcRZbNqz5x8kmHM2XPs=; b=njHPVLe9Gvlwy/QgIu99P7u9/hVUvTjuXP5y2lQjaECAupxW38RZmTMrznxe47yBmY 1p0XNaHrARpRlxMeY2hjYI2PA9mUzTml9C0BzN8uGLuEXXZaZVyuaZk5ZG9oiSgvfh1W NTva/yzJnPdgYmBAUujSN4qMp5CJCJExSjKM42fs7/llGSXErLQgjZmeY3iunRnn2I9U Oop671+xIw9rDimHQkesf6LMVFJUxDlJIzqnlw6xqKoqMvtBxovcJZ0gjorQPlwBdUfr UtrmZPioOsttGAoTQMS/l8THo7ecIpYguvd9b/gSvFUE5u4BUk8GNqMKrqW85CmfWJJm a/3w==<br>\r\nX-Gm-Message-State: AOAM5320ychykfQesu/H9cFmHUGzQi/rbU1oBgMJWOdwFAa3nRw6CwHV e1lkvdRx3rXdQ8HVCsVM5dDAcSOEQfO8SfbOQMCh9SyY0guutg==<br>\r\nX-Google-Smtp-Source: ABdhPJz8zWhnFUtv6BYWcQ+pFbsiisLzp15O5XLrK+hHhGQiQqWotrE3/TMkxtX937PVn7V1/+0bHqq0Kx+5gm06HFY=<br>\r\nX-Received: by 2002:ac2:5f64:: with SMTP id c4mr1680096lfc.170.1597930016248; Thu, 20 Aug 2020 06:26:56 -0700 (PDT)<br>\r\nMIME-Version: 1.0<br>\r\nFrom: Lucas Marcouiller &lt;lucas.marcouiller@gmail.com&gt;<br>\r\nDate: Thu, 20 Aug 2020 15:28:59 +0200<br>\r\nMessage-ID: &lt;CACMPic8P1eM9RxSkJjcktGT=OfKdJNiEaz+isi7V4ox+nPesJA@mail.gmail.com&gt;<br>\r\nSubject: Candidature Alternance NLTechno - DoliCloud<br>\r\nTo: job@nltechno.com<br>\r\nContent-Type: multipart/mixed; boundary=&quot;000000000000fec41c05ad4f12cc&quot; ','2020-08-20 15:26:57','2020-08-23 14:03:28',12,12,NULL,NULL,0,'bb','aa','lucas.marcouiller@gmail.com','',NULL,NULL,NULL,'CACMPic8P1eM9RxSkJjcktGT=OfKdJNiEaz+isi7V4ox+nPesJA@mail.gmail.com',1,NULL),(66,NULL,'(PROV66)','Bonjour,\r\n\r\nJe me présente, Je m’appelle Dylan De muynck, j’ai 22 ans.\r\n\r\nJe suis en seconde année à l’EPSI (Ecole d’ingénieur Informatique) et pour accompagner ma 3e année, je dois effectuer une alternance qui me permettra d’acquérir de l’expérience.\r\n\r\n\r\n\r\nDurant mes deux années de formation, j’ai pu assimiler plusieurs compétences en :\r\n\r\n         Langages informatiques :\r\n\r\n        Linux, SQL, HTML5/CSS3, PHP, Javascript (Bases), C++, C#, Java Android.\r\n\r\nLogiciels :\r\n\r\nSQl Server/MySQL, Visual Studio, Oracle VM VirtualBox, Dbeaver, Modelio, Androi Studio.\r\n\r\n\r\n\r\nSystèmes :\r\n\r\nLinux.\r\n\r\n\r\nModélisation de bases de données :\r\n\r\nMerise, UML\r\n\r\n\r\n\r\nJe vous contacte pour votre offre d’alternance qui m’intéresse car c’est le domaine que je cherche et mon objectif de demain pour mon futur emploi.\r\n\r\n\r\n\r\nPour me Contacter :\r\n\r\n\r\n\r\n  *   Mon numéro de portable : 06 42 85 48 96\r\n\r\n\r\n\r\n  *   Mon Email : Dylan.demuynck1@epsi.fr<mailto:Dylan.demuynck1@epsi.fr>\r\n\r\n\r\n\r\n\r\n\r\nMerci d’avoir pris votre temps pour me lire, en espérant avoir des nouvelles bientôt\r\n\r\n\r\n\r\nCordialement,\r\n\r\nDylan',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Offre d\'alternance (Dylan, De muynck / EPSI)<br>\n&Eacute;metteur (From) : DE MUYNCK Dylan 1 &lt;dylan.demuynck1@epsi.fr&gt;<br>\nDestinataire(s) (To) : &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\n-----<br>\nBonjour,<br>\r\n<br>\r\nJe me présente, Je m’appelle Dylan De muynck, j’ai 22 ans.<br>\r\n<br>\r\nJe suis en seconde année à l’EPSI (Ecole d’ingénieur Informatique) et pour accompagner ma 3e année, je dois effectuer une alternance qui me permettra d’acquérir de l’expérience.<br>\r\n<br>\r\n<br>\r\n<br>\r\nDurant mes deux années de formation, j’ai pu assimiler plusieurs compétences en :<br>\r\n<br>\r\n         Langages informatiques :<br>\r\n<br>\r\n        Linux, SQL, HTML5/CSS3, PHP, Javascript (Bases), C++, C#, Java Android.<br>\r\n<br>\r\nLogiciels :<br>\r\n<br>\r\nSQl Server/MySQL, Visual Studio, Oracle VM VirtualBox, Dbeaver, Modelio, Androi Studio.<br>\r\n<br>\r\n<br>\r\n<br>\r\nSystèmes :<br>\r\n<br>\r\nLinux.<br>\r\n<br>\r\n<br>\r\nModélisation de bases de données :<br>\r\n<br>\r\nMerise, UML<br>\r\n<br>\r\n<br>\r\n<br>\r\nJe vous contacte pour votre offre d’alternance qui m’intéresse car c’est le domaine que je cherche et mon objectif de demain pour mon futur emploi.<br>\r\n<br>\r\n<br>\r\n<br>\r\nPour me Contacter :<br>\r\n<br>\r\n<br>\r\n<br>\r\n  *   Mon numéro de portable : 06 42 85 48 96<br>\r\n<br>\r\n<br>\r\n<br>\r\n  *   Mon Email : Dylan.demuynck1@epsi.fr&lt;mailto:Dylan.demuynck1@epsi.fr&gt;<br>\r\n<br>\r\n<br>\r\n<br>\r\n<br>\r\n<br>\r\nMerci d’avoir pris votre temps pour me lire, en espérant avoir des nouvelles bientôt<br>\r\n<br>\r\n<br>\r\n<br>\r\nCordialement,<br>\r\n<br>\r\nDylan<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp1050492jal; Thu, 20 Aug 2020 09:30:31 -0700 (PDT)<br>\r\nX-Google-Smtp-Source: ABdhPJwU1A2n02tY8mqxp+x3aIiX/wu25xVHA7Fpg3jIT4YCK7Nu5PJqE75JFn+yrwG6fUYahiPr<br>\r\nX-Received: by 2002:aa7:d983:: with SMTP id u3mr3818423eds.366.1597941031266; Thu, 20 Aug 2020 09:30:31 -0700 (PDT)<br>\r\nARC-Seal: i=2; a=rsa-sha256; t=1597941031; cv=pass; d=google.com; s=arc-20160816; b=cWcaQ5ucKAtt4yQ4d5id0PHjRNXMgT+QKzQqV/pEhDuPQHU6hI5hHiVehk2NV9ECaL 7lNC2a1+46fp6Cvb0gUyh8jyaJrhX3Uls+A95eW+d34N0tR+EuOoQ8f9F1AWcfbS6UYw 5Izb2XsT8eZAFlHrKE24lAgZ1I/nE7f022wbfo0JY43OIK9JxoE12hJDH1CHQW2nTqW+ XHiTsjMac9yCKQ6ITb8TjbVeEL5fv9BxC4vcU3qdpwkVCz3gOkZqCuisL6CALGfbsOD0 MwT06nJnVcwhAFwtjCfmF5wQOk9DzxRlbIcUZJDWWz762dT6Dm3Zw2CuFQjvPFulpu+b h/cw==<br>\r\nARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-language:accept-language:message-id:date :thread-index:thread-topic:subject:to:from:dkim-signature; bh=DmaFJFQjl9EzmCpfL28MYGT/HKXRSq1Zl2da7ToOpMc=; b=GzMgfDLLEc5vjMKO9DhykwDq6ROPTYM77bfCUf+eTNF1ATXYxCImJE0hQJ6t4gigVB XmxY50Y+e4ilnplR9QZDl42k439cQEV8yLAtZxOg/QVmKtQSmw4PnqSVkNMJKvssrJk8 ZHi4xb1W6RkHpxCm0yhtUxIcySNgEgEsEqBWqseAfKRs6tfGGV88AKAHObGsJgWgqBSK 8DxnhnNy5AMNaGvK9YI1H4frWxMyvotxaiNqgacmsyLbSCIziMgr5/rzp8XfPXbKtiE0 vZw+EIOnuealf5Plc6BeC4kRUHqpAAxGzdus/fq5lva/Lqv/arwT1KGsjNpnFdK/7ZkG JgBA==<br>\r\nARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=mDcUpO86; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of dylan.demuynck1@epsi.fr designates 40.107.14.50 as permitted sender) smtp.mailfrom=dylan.demuynck1@epsi.fr<br>\r\nReturn-Path: &lt;dylan.demuynck1@epsi.fr&gt;<br>\r\nReceived: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140050.outbound.protection.outlook.com. [40.107.14.50]) by mx.google.com with ESMTPS id p3si1741974edq.281.2020.08.20.09.30.30 for &lt;job@nltechno.com&gt; (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Aug 2020 09:30:31 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of dylan.demuynck1@epsi.fr designates 40.107.14.50 as permitted sender) client-ip=40.107.14.50;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=mDcUpO86; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of dylan.demuynck1@epsi.fr designates 40.107.14.50 as permitted sender) smtp.mailfrom=dylan.demuynck1@epsi.fr<br>\r\nARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FviD0a2PuMCkNfCFDQChvRVTfilmuq+cw0E4EGdMb731TY229NYpUPBOQE5YfQDbPnydL6dd3/we+3WFCEQxFrJhEEUUt0JB+pFpo2Zwt9SBY14rW8/cn5RoA1ouXOhXm/JFlzvw6a/Q2BsCILEPqrgP0jO7fVS8ZVhKEi7FnoBFqcnk37/kSKi3w/5ZzKHU8AxYFwrEpG/JCx6XZYaMSf3vrk6b6ebTcnZ968ZGKonL5xJ4+uITkpHw9Op1Uai85e7f6CJUUr48UHpTWXKBILiAinVzMgVVPDDqoda1c6Ywo42GsAwRxRKNrzv9wtjU1p+tWVAu1FhQB6KWwHmUtw==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DmaFJFQjl9EzmCpfL28MYGT/HKXRSq1Zl2da7ToOpMc=; b=JBdMWX4RWk+yK7cAnom3FX1ctg7ZsOofVRN8O2nWM7v4Z2EOf3WCA3anVAZa76MqbPdz1WfNSc4EqeJQMyTSVXV5/9juWb0yfncJfK4kQw16+BlfoUiQhz3YUJlAXl/DI8Lz0GC/tFaCCHKMUnJVUX1qJCSk9bjXb5hl/am1DwV9RxuhPMDOF2XP9kIL1e6bIW6/KtBhxgyQQgyUjnIrUTGr04snI6u5x5r/B0nV6/hIL6p+yu7obpMm5bmoZ/5d40Oc+WulhZVP+1Ppd14B27QdD2Y8NnMrmOkRPB+CIY+981qO4C6gjoR+RyCdtMGk/Bqv9Pp0IBt0XDx5Y3BBTQ==<br>\r\nARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epsi.fr; dmarc=pass action=none header.from=epsi.fr; dkim=pass header.d=epsi.fr; arc=none<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ifagparis.onmicrosoft.com; s=selector2-ifagparis-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DmaFJFQjl9EzmCpfL28MYGT/HKXRSq1Zl2da7ToOpMc=; b=mDcUpO86RIMTarIbaBN4K4JCgRjA2AOWmt35AnPSgUbs9suk05hPcaDkIZ5o5NjIzZt/rgtqVn7w8/60GhlCm2PJJFDktQdQz9t4z4waBPS3XIQm7VxllAq0ml5kPPzZJOFA9hf2shfYM8vvttkm5Xtjerp22Z633F1iMMq3BFI=<br>\r\nReceived: from AM6PR0402MB3381.eurprd04.prod.outlook.com (2603:10a6:209:9::18) by AM5PR04MB3298.eurprd04.prod.outlook.com (2603:10a6:206:f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3283.23; Thu, 20 Aug 2020 16:30:29 +0000<br>\r\nReceived: from AM6PR0402MB3381.eurprd04.prod.outlook.com ([fe80::68af:facc:a8e:2096]) by AM6PR0402MB3381.eurprd04.prod.outlook.com ([fe80::68af:facc:a8e:2096%3]) with mapi id 15.20.3283.028; Thu, 20 Aug 2020 16:30:29 +0000<br>\r\nFrom: DE MUYNCK Dylan 1 &lt;dylan.demuynck1@epsi.fr&gt;<br>\r\nTo: &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\r\nSubject: Offre d\'alternance (Dylan, De muynck / EPSI)<br>\r\nThread-Topic: Offre d\'alternance (Dylan, De muynck / EPSI)<br>\r\nThread-Index: AQHWdw83Va7zuqgzY0SRcaW8NWmoyw==<br>\r\nDate: Thu, 20 Aug 2020 16:30:29 +0000<br>\r\nMessage-ID: &lt;59f8dccc-bc3a-462a-b9e3-a76846af580e@email.android.com&gt;<br>\r\nAccept-Language: fr-FR, en-US<br>\r\nContent-Language: fr-FR<br>\r\nX-MS-Has-Attach: <br>\r\nX-MS-TNEF-Correlator: <br>\r\nauthentication-results: nltechno.com; dkim=none (message not signed) header.d=none;nltechno.com; dmarc=none action=none header.from=epsi.fr;<br>\r\nx-originating-ip: [92.184.105.30]<br>\r\nx-ms-publictraffictype: Email<br>\r\nx-ms-office365-filtering-correlation-id: f05955a6-7f3b-4839-afb4-08d8452659fe<br>\r\nx-ms-traffictypediagnostic: AM5PR04MB3298:<br>\r\nx-microsoft-antispam-prvs: &lt;AM5PR04MB329839F4EC8C4EE0193ED653A85A0@AM5PR04MB3298.eurprd04.prod.outlook.com&gt;<br>\r\nx-ms-oob-tlc-oobclassifiers: OLM:1227;<br>\r\nx-ms-exchange-senderadcheck: 1<br>\r\nx-microsoft-antispam: BCL:0;<br>\r\nx-microsoft-antispam-message-info: E5AMusqV7uTKonn0gwA5oCka/m+T3UIfvKArSjiJHmv/qLWyuImc+wLAzo0CQcAWgCDEwF9Q1crFYzIo/ILVMWSmhG1iO1aUg26KXMxEwj0ifQ+qZRzoUtIxdPKXQGDBg/HusX+V3/VJaZ9u85RmgYczkVw/2OTsdF72lJVNm6WdzzUpjjm8sxt44/9P7Wq64OXFhC852fdiVQb0DPCwiRvy0PsB5Lpn8mClTVMMlbYqm6UjgH69BdFn07BzsbMv4RpBut0Kp5h18msSfT/KLJ3ttyRsu0oECtK8OQiOwq8moPq1Nah+ZMEqrIkIKVwevXA01jRlIJHlGPo/CDhlLA==<br>\r\nx-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:fr;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR0402MB3381.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(39850400004)(346002)(376002)(366004)(136003)(396003)(86362001)(31686004)(66476007)(316002)(6486002)(786003)(186003)(26005)(31696002)(6512007)(9686003)(4744005)(64756008)(478600001)(6916009)(8676002)(66556008)(66446008)(8936002)(76116006)(5660300002)(66946007)(91956017)(71200400001)(2906002)(6506007);DIR:OUT;SFP:1101;<br>\r\nx-ms-exchange-antispam-messagedata: n1ckktM67L9SAGovlnqIuOz7fK0DMIbnepRLtO2aIq5dPDKQUbHzwfXIXhPns5zm88uPlqnYxfBOxfISS5QR8qs2JpngF3FJpt+tdQotFTmLXu+6MOr4Vl3tbWUhvuzsKS3NaPVeLdsnNGemUOh3B4kYrSXKDszxJwuqLpXoh6n++1HCMHSWa8g2HwVMQLOR3Kk0O8lai8CQsP/BnaK5aJsQW+dGaExtYUwTf+HF4OpJ0fh3VeyJawyKEbmqFfexeuiY8m9r1N+TvEOyvLV/R+ZeBvXzUN3tYA0oOnEo5bsiM10pCCs2XrqvYhLzrlGl6s4PgKWlDnEALkFJeFW2tUKoQTD6dgkxeEqcsXlAtUgjPVqYbRQIFTf5mlqcey7Ny8pNw66lhx8NHkDKLDw37z3F2dmXM3pSvVHWYdKI+ivigyspytQRQsc7xBtG/tPpBjYkxwDliHPHkI/Vx72uy1AiVS1MbQl/aNoRg8anWckKfo6/Ci4fXuO3usRszv6UFqsybkd/wgDKYFPPL//gGR0s9Y8RU7sLHMMQNA44LbT8+bMOlqF8u2ms9b5aEpeAL0XUfmn86au9c+HS+w6slacoYhbgsMb5ymKByTGVwFYSoHbzqgxGCATGskeMKwcmKd7IXXfY+NKeJ31cBKUUyw==<br>\r\nx-ms-exchange-transport-forked: True<br>\r\nContent-Type: multipart/alternative; boundary=&quot;_000_59f8dcccbc3a462ab9e3a76846af580eemailandroidcom_&quot;<br>\r\nMIME-Version: 1.0<br>\r\nX-OriginatorOrg: epsi.fr<br>\r\nX-MS-Exchange-CrossTenant-AuthAs: Internal<br>\r\nX-MS-Exchange-CrossTenant-AuthSource: AM6PR0402MB3381.eurprd04.prod.outlook.com<br>\r\nX-MS-Exchange-CrossTenant-Network-Message-Id: f05955a6-7f3b-4839-afb4-08d8452659fe<br>\r\nX-MS-Exchange-CrossTenant-originalarrivaltime: 20 Aug 2020 16:30:29.3292 (UTC)<br>\r\nX-MS-Exchange-CrossTenant-fromentityheader: Hosted<br>\r\nX-MS-Exchange-CrossTenant-id: b6e77e52-65f6-4dec-b7d9-8e45f36a536f<br>\r\nX-MS-Exchange-CrossTenant-mailboxtype: HOSTED<br>\r\nX-MS-Exchange-CrossTenant-userprincipalname: sU7Aq8B0tDkw0T+b8BAUgD/vCt5suJ3J6/FyIgub2h1uT2XCmpUXbORxH0dyHre0Ov7BROmbt/0BlmY4oT/GpA==<br>\r\nX-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB3298 ','2020-08-20 18:30:31','2020-08-23 14:03:29',12,NULL,NULL,NULL,0,NULL,'DE MUYNCK Dylan 1','dylan.demuynck1@epsi.fr',NULL,NULL,NULL,NULL,'59f8dccc-bc3a-462a-b9e3-a76846af580e@email.android.com',1,NULL),(67,NULL,'JOC2008-0002','Monsieur DESTAILLEUR,<br />\r\nJe me permets de vous &eacute;crire car je suis &agrave; la recherche d&#39;un poste d&#39;Administrateur Syst&egrave;me et R&eacute;seaux en alternance (contrat d&#39;apprentissage), en 3&egrave;me ann&eacute;e de formation Bachelor informatique, &agrave; l&#39;EPSI de Bordeaux, &agrave; partir du 30 octobre 2020 jusqu&#39;au 30 septembre 2021, et souhaite postuler ma candidature au sein de votre &eacute;tablissement, si cela est possible.<br />\r\nVous trouverez ci-joint mon CV, ainsi que ma lettre de motivation.<br />\r\nMerci de votre compr&eacute;hension.<br />\r\nDans l&#39;attente de votre r&eacute;ponse, je vous prie d&#39;agr&eacute;er, Monsieur, l&#39;expression de mes salutations distingu&eacute;es.<br />\r\n<br />\r\n<br />\r\n--<br />\r\nMikajy RANDRIANARIMANANA',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Candidature pour un poste en alternance (contrat d\'apprentissage) : Administrateur Syst&egrave;me et R&eacute;seaux<br>\n&Eacute;metteur (From) : Mikajy RANDRIANARIMANANA &lt;mikajy.randria@orange.fr&gt;<br>\nDestinataire(s) (To) : &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\n-----<br>\nMonsieur DESTAILLEUR,<br>\r\nJe me permets de vous écrire car je suis à la recherche d\'un poste d\'Administrateur Système et Réseaux en alternance (contrat d\'apprentissage), en 3ème année de formation Bachelor informatique, à l\'EPSI de Bordeaux, à partir du 30 octobre 2020 jusqu\'au 30 septembre 2021, et souhaite postuler ma candidature au sein de votre établissement, si cela est possible.<br>\r\nVous trouverez ci-joint mon CV, ainsi que ma lettre de motivation.<br>\r\nMerci de votre compréhension.<br>\r\nDans l\'attente de votre réponse, je vous prie d\'agréer, Monsieur, l\'expression de mes salutations distinguées.<br>\r\n<br>\r\n<br>\r\n--<br>\r\nMikajy RANDRIANARIMANANA<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp1074536jal; Thu, 20 Aug 2020 10:06:32 -0700 (PDT)<br>\r\nX-Google-Smtp-Source: ABdhPJyxvEbOTgkMG54G7D3rOuSyzhOEQ1h81u12Hjt8XLdXGxJH0dbnFHtSP9yGDLRc26CryoMs<br>\r\nX-Received: by 2002:adf:c446:: with SMTP id a6mr3922031wrg.376.1597943191019; Thu, 20 Aug 2020 10:06:31 -0700 (PDT)<br>\r\nARC-Seal: i=1; a=rsa-sha256; t=1597943191; cv=none; d=google.com; s=arc-20160816; b=mq4EHFz41cLOOBLkZDS8G7yIlHCzxJVtDOVfTmEe5ej3DDwfsT9R5aBl9ClazAay8b Ah48/QrWYPwyViJdu/AhZlf65j+THZCji3B9aF5d5yoBOpNyBUYrh6wrcPosUQ3+m7No hHiaqFaG1mHmcBkPhvzqdKqj8osYLR9/WA5560XAY1o2E+wpF0li+CL89LbdCD54O9qO 5PksoFo+NMRH5TfmBwlTDql/riGGQ1uDtDYYzG/71lqSZtEz0h5XyKBXSJIsfr5yyp3o xUiMnIvHs2EEH8ERVR+ukZdYS0NsVzBUBpVD+baCa1m9uzg0BZNLdAr104ss8640bZ5t e7tw==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=importance:date:subject:from:to:mime-version:message-id; bh=WDgHxQRbdi7/KI5lqa7Sagbv1M4rPQ4k+ink568t+aY=; b=WzlRjkti+igePOqJPSL/MHelkSItTQg3PugsWOWU6CRyB1ttLNp3UJMdBgPFsMj1WY 1noSHk//FLZ0zazcU3vQnd0VzVVIeSpHGBUh/+PwtMeYTESy4/OkrYxK9RxxN7NtWABY dcNg4JlGZKx4qn6ZyysAEN/9PiAM63N0U8wf90pluJhxr8PfU3rtN2VXwf+KWTWRNufD z79V+eH6HJilTH50eLj2SJUd3zfuDFNSxtH2q8PwpYqlNo1ta7O5QqGAJ3GKtkeWoEin HsL70ZbWFursScsB8qxPTtV1jQtHDtwJeurMkOiz9skVOFMQa9C6tZR9ghLTrOxy5eqp fIww==<br>\r\nARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of mikajy.randria@orange.fr designates 80.12.242.126 as permitted sender) smtp.mailfrom=mikajy.randria@orange.fr<br>\r\nReturn-Path: &lt;mikajy.randria@orange.fr&gt;<br>\r\nReceived: from smtp.smtpout.orange.fr (smtp04.smtpout.orange.fr. [80.12.242.126]) by mx.google.com with ESMTPS id b4si2317763wrq.33.2020.08.20.10.06.30 for &lt;job@nltechno.com&gt; (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 20 Aug 2020 10:06:30 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: best guess record for domain of mikajy.randria@orange.fr designates 80.12.242.126 as permitted sender) client-ip=80.12.242.126;<br>\r\nAuthentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of mikajy.randria@orange.fr designates 80.12.242.126 as permitted sender) smtp.mailfrom=mikajy.randria@orange.fr<br>\r\nReceived: from [IPv6:::ffff:192.168.1.43] ([90.78.4.197]) by mwinf5d27 with ME id Ht6U2300D4F2kvu03t6VCq; Thu, 20 Aug 2020 19:06:30 +0200<br>\r\nX-ME-Helo: [IPv6:::ffff:192.168.1.43]<br>\r\nX-ME-Auth: bWlrYWp5LnJhbmRyaWFAb3JhbmdlLmZy<br>\r\nX-ME-Date: Thu, 20 Aug 2020 19:06:30 +0200<br>\r\nX-ME-IP: 90.78.4.197<br>\r\nMessage-ID: &lt;6363e3fb7296eabee82534cf16d9ca60@mwinf5d27.me-wanadoo.net&gt;<br>\r\nMIME-Version: 1.0<br>\r\nTo: &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\r\nFrom: Mikajy RANDRIANARIMANANA &lt;mikajy.randria@orange.fr&gt;<br>\r\nSubject: =?utf-8?Q?Candidature_pour_un_poste_en_alternance_(contrat_d\'apprentissag?= =?utf-8?Q?e)_:_Administrateur_Syst=C3=A8me_et_R=C3=A9seaux?=<br>\r\nDate: Thu, 20 Aug 2020 19:06:28 +0200<br>\r\nImportance: normal<br>\r\nX-Priority: 3<br>\r\nContent-Type: multipart/mixed; boundary=&quot;_51F87825-C9DD-455E-A63B-1FC1A457AAD8_&quot; ','2020-08-20 19:06:30','2020-08-24 08:15:37',12,12,NULL,NULL,8,'','Mikajy RANDRIANARIMANANA','mikajy.randria@orange.fr','',NULL,NULL,NULL,'6363e3fb7296eabee82534cf16d9ca60@mwinf5d27.me-wanadoo.net',1,'2020-09-08'),(68,2,'JOC2008-0001','Bonjour<br />\r\nAvant tout j&#39;esp&egrave;re que vous vous portez bien ainsi que votre famille durant ce chapitre difficile de l&#39;humanit&eacute; moderne.<br />\r\n<br />\r\nJe suis &eacute;tudiant en 4ᵉ ann&eacute;e cycle ing&eacute;nierie &agrave; l&#39;EPSI, je suis &agrave; la recherche d&#39;une alternance pour l&#39;ann&eacute;e universitaire 2020/2021 je me permets de m&#39;adresser &agrave; vous concernant votre offre de d&eacute;veloppeur mobile, en effet, apr&egrave;s consultation de la fiche repr&eacute;sentative de l&#39;offre  Je trouve que mes comp&eacute;tences sont parfaitement adapt&eacute;es aux missions cit&eacute;es dans l&#39;offre.<br />\r\n<br />\r\nJe suis &agrave; votre disposition pour tout entretien, je serai ravi de partager avec vous mes motivations &agrave; faire partie de votre, et de vous divulguer plus les d&eacute;tails techniques de mes r&eacute;alisations lors de mes exp&eacute;riences professionnelles.<br />\r\nVeuillez trouver ci-joint ma lettre de motivation ainsi que mon CV.',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Candidature pour une alternance<br>\n&Eacute;metteur (From) : CHOUIKH Iheb &lt;iheb.chouikh@epsi.fr&gt;<br>\nDestinataire(s) (To) : &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\n-----<br>\nBonjour<br>\r\nAvant tout j\'espère que vous vous portez bien ainsi que votre famille durant ce chapitre difficile de l\'humanité moderne.<br>\r\n<br>\r\nJe suis étudiant en 4ᵉ année cycle ingénierie à l\'EPSI, je suis à la recherche d\'une alternance pour l\'année universitaire 2020/2021 je me permets de m\'adresser à vous concernant votre offre de développeur mobile, en effet, après consultation de la fiche représentative de l\'offre  Je trouve que mes compétences sont parfaitement  adaptées aux missions citées dans l\'offre.<br>\r\n<br>\r\n Je suis à votre disposition pour tout entretien, je serai ravi de partager avec vous mes motivations à faire partie de votre, et de vous divulguer plus les détails techniques de mes réalisations lors de mes expériences professionnelles.<br>\r\nVeuillez trouver ci-joint ma lettre de motivation ainsi que mon CV.<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp130308jal; Thu, 20 Aug 2020 23:05:24 -0700 (PDT)<br>\r\nX-Google-Smtp-Source: ABdhPJxP2AnzXysCPZWHm9jgXJN5bp6a66QrLeGJaj1+uBZHtOYj6PLJIQok9QG2AYpooglTF6iU<br>\r\nX-Received: by 2002:a17:906:f1da:: with SMTP id gx26mr1377919ejb.129.1597989923906; Thu, 20 Aug 2020 23:05:23 -0700 (PDT)<br>\r\nARC-Seal: i=2; a=rsa-sha256; t=1597989923; cv=pass; d=google.com; s=arc-20160816; b=YLL5lZcr4hGmigoR/6KZZqZpQJhISVSS4XxqrJI0pGWRK9xYbDLioqtR4M9nHzSwSb AjvDrwuUa2AA03r8NrqybjDsQatjRl+/Nnne6NI+N0sXIQ+ocu+XwmX0z6+gBJ9LkI1+ ISXxCUrEHtIIg8gH9xrbm0tUjg7/tuKACRNlZ/JNRfSW0J3+tBZDjjoqoM3TbgWBI7b/ Ttr9w5ECKgShaB6O7lloDfBzuLq/gSZrsNeEQWpEeXP1bWkH9O7yJejbvN+mbi0bgxtM zQfgSaGIsRMRA2y8u5U5I4SOaSNxQntm0IsUKaEuC1z39R8lij6tM2SoFG/lei4kDniF zrOA==<br>\r\nARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-language:accept-language:message-id:date :thread-index:thread-topic:subject:to:from:dkim-signature; bh=RA24/E2lkk5MW15DfK3+CC3IIbmOgURRJ3PrxpX0JjM=; b=wjddQnj6lNvrPS6cp3L9ZOqgghZzfI3r3gi+/ugb4mfllCT4YNmoWmSnUKukKtB1XE tOjxZgC9xVMTXts8sZz1eNJvkyyvGnCfjh2Qbiqa/DBh/ssWdfvc80Sf6YQQJAZ8rdmj B44y1OLIJAxO0K1XmY+LdvJkP8nHrLHV9nxkt1rJ/RCxiIm95jTbkEBcS1NHDsR5HzE+ P6D31Pg4h4awhvxLY6x9W6Nr7XvSfpUwKSaiR3r+/6LBU4ou7qECFLtAMmkEtBH/bDCF 28yc75PwF7n+Q6O8IFO3FKnc5Z/kVWiaVDas2xpuh44PzA9BZPuZCUu+STja5U1/JE5D cuJw==<br>\r\nARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=hoftoMBh; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of iheb.chouikh@epsi.fr designates 40.107.21.51 as permitted sender) smtp.mailfrom=iheb.chouikh@epsi.fr<br>\r\nReturn-Path: &lt;iheb.chouikh@epsi.fr&gt;<br>\r\nReceived: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2051.outbound.protection.outlook.com. [40.107.21.51]) by mx.google.com with ESMTPS id i6si536854ejc.494.2020.08.20.23.05.23 for &lt;job@nltechno.com&gt; (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Aug 2020 23:05:23 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of iheb.chouikh@epsi.fr designates 40.107.21.51 as permitted sender) client-ip=40.107.21.51;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=hoftoMBh; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of iheb.chouikh@epsi.fr designates 40.107.21.51 as permitted sender) smtp.mailfrom=iheb.chouikh@epsi.fr<br>\r\nARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QJ7X74HO6eyTApSbaGEWj26lf5E0VkOrc77H4kkUt8EkVCD8GzScmGsntB2JYpkr4xCSwejtKiyQSM2PLSmTZgr6W9naT38/JWADaFfCv6aFbSXYfB2dz1si9yncCIufDD7TK/+D8c9lBbhdLR6U54jk4D8wrhoXMyGGKvZeK0T8hmTvxFkwdQlLOaJlyZshL5bDl/BoLs77tVthelrHO9VKgwbz4Sm9JyXop6afEUPRehLIprjn8tp03mnTVp8SsqCv1aOou+SfAmVIfgJR/lrFxhpvFd0k2z/JHrbrwdOWQ15IwGeFnJOydl6uugzv4DGTt+J7j8Ck8PTbgAWdpg==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RA24/E2lkk5MW15DfK3+CC3IIbmOgURRJ3PrxpX0JjM=; b=UB2iXYafT4OulUUn+/WRlQWGcucdcTKvmxI/7HNhZw/yVUk+9RNfhrt+aq8UkxfhHB/SDQ2DOj99e+gTF9ckoN12dj6Q1MLByf9uYclXVdrBKP9t5Znty/PlthiyQKxBgS8YII0gKGYdevKFp7saD/ijG28EUXfAvN2cq7PJcXaUaYb0/3k/YaLot3zyrD7S5MokIWpDkitNm4adfOV/CPcWhtCDO/lW/aF+5qzX+zidGTZNVadecY8KocCe02TErVokQbp7HKRsjxUMzYe2+v9XW6SPoRH6NgWfZ/CuHIjHajkkJCCEukUq6VW4nnFCTkRlYHRtDeGiJkVqWZ4KhQ==<br>\r\nARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epsi.fr; dmarc=pass action=none header.from=epsi.fr; dkim=pass header.d=epsi.fr; arc=none<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ifagparis.onmicrosoft.com; s=selector2-ifagparis-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RA24/E2lkk5MW15DfK3+CC3IIbmOgURRJ3PrxpX0JjM=; b=hoftoMBhynFS2Gd98TTvS8y9A6MFVDadQao4pBGE2koKntP/KQ+tGcNBqy0Y8FCAiVZ4Z8hKgpLY6oPfsiZSlsRy7yLg+V+wmY7U4HulguYCbmPGyVbY4eYCBy/8fyFohxtMlwXdUI5ghd1CxS39pTR/T6Rh2aqd2f4jjknDbOU=<br>\r\nReceived: from DB8PR04MB6793.eurprd04.prod.outlook.com (2603:10a6:10:11a::22) by DB3PR0402MB3850.eurprd04.prod.outlook.com (2603:10a6:8:3::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.24; Fri, 21 Aug 2020 06:05:21 +0000<br>\r\nReceived: from DB8PR04MB6793.eurprd04.prod.outlook.com ([fe80::9078:5cde:597f:3403]) by DB8PR04MB6793.eurprd04.prod.outlook.com ([fe80::9078:5cde:597f:3403%5]) with mapi id 15.20.3305.026; Fri, 21 Aug 2020 06:05:21 +0000<br>\r\nFrom: CHOUIKH Iheb &lt;iheb.chouikh@epsi.fr&gt;<br>\r\nTo: &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\r\nSubject: Candidature pour une alternance<br>\r\nThread-Topic: Candidature pour une alternance<br>\r\nThread-Index: AQHWd4BB3gTL/7l6O0u6SQtmuC4jWA==<br>\r\nDate: Fri, 21 Aug 2020 06:05:21 +0000<br>\r\nMessage-ID: &lt;DB8PR04MB6793E05025783F1646880F7A9C5B0@DB8PR04MB6793.eurprd04.prod.outlook.com&gt;<br>\r\nAccept-Language: fr-FR, en-US<br>\r\nContent-Language: fr-FR<br>\r\nX-MS-Has-Attach: yes<br>\r\nX-MS-TNEF-Correlator: <br>\r\nauthentication-results: nltechno.com; dkim=none (message not signed) header.d=none;nltechno.com; dmarc=none action=none header.from=epsi.fr;<br>\r\nx-originating-ip: [46.193.65.142]<br>\r\nx-ms-publictraffictype: Email<br>\r\nx-ms-office365-filtering-correlation-id: e74daf17-e937-483c-b16a-08d84598300f<br>\r\nx-ms-traffictypediagnostic: DB3PR0402MB3850:<br>\r\nx-microsoft-antispam-prvs: &lt;DB3PR0402MB38508E0F70508009101F51199C5B0@DB3PR0402MB3850.eurprd04.prod.outlook.com&gt;<br>\r\nx-ms-oob-tlc-oobclassifiers: OLM:389;<br>\r\nx-ms-exchange-senderadcheck: 1<br>\r\nx-microsoft-antispam: BCL:0;<br>\r\nx-microsoft-antispam-message-info: Qcnt9Suecge4RNKwguIUAtw0dr/1+pJmFKgPW9WX4yi5fbwjvjneTjw6Uk+UiyxSDhHioNnhfebfZpsnOeH+wV3BhChpHnTQjg6oVxPfm1iAj0eXG3nPfs+p3InQQKNXsDKf+yfkgxMbmDCwP89VZ+SZXpJNI+ZZkIpAyAp0lAKbYXTKGo37OHcHOi+tVvUfhJjfbG6WvKDe46uLml5O7Mpat9+s276nDMXx5lszpN7kbxyUC39WPdifhSj+N6VDi1Ciq+U8UiJ307m+tU1hy3N6K9wnqXSmQuG+cpZRvFbDsnhDeIexnHhwTj4B26W1j7qU4XlXRUlJ3Cha91mIYTmvzZNxMFldiyVldShJ8RZ23FFbz/NSkVNYIzxyKLMxhwZxjVOfnYGf2qJV73B07EEmWSFwWQjbdXABJaIT1YUGske51z5/YInJUCXJtVTxbU2BRvXJO1YLGx94CDA5jg==<br>\r\nx-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:fr;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB8PR04MB6793.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(376002)(396003)(346002)(366004)(136003)(39850400004)(186003)(786003)(2906002)(316002)(6916009)(6506007)(8676002)(4743002)(9686003)(55016002)(99936003)(7696005)(3480700007)(8936002)(5660300002)(478600001)(26005)(33656002)(71200400001)(91956017)(66446008)(64756008)(66576008)(66556008)(19627405001)(66476007)(76116006)(86362001)(4744005)(66946007)(52536014)(6430600002);DIR:OUT;SFP:1101;<br>\r\nx-ms-exchange-antispam-messagedata: e94oxUq7D2A7faTaLazyPTcBF8ctbyPjQEKvFBoNo9tb+vgDa3PZQzA87a4TEsvEG6FYWoZUo79+WwZ86f4yOYpdz6Eiqu87tIBCvH5q0pgnMcSloRMJ9xKzngN1Gq1DgUpz/zyuPE1kFt9xZpxLHOrCxpfKfXl+uqWlcBqR9e03m+BC+10Ravv4HVGhNWkiD6dNo6W80plzE2baZw4158FZ3EcitWlCuAihWnbSNkEszrOuLxNNJoAxUEE5Wqq+hhyCCXTMf+Mx6uZ7iIj86RLZEJFJkJkzDyv34I2LRQAEZn4uJi2nwmurMXwlFXc6oHISbscMWJ6fPFN2hE5mQNirOgpC3DcsSfdqHDZ1r6j6tOXjeZgy54U5tCcusmQf0d1ZjomdESgIRJEqJa24IDc4XAsHwKdUlQwFRQ+mGu4y4Uvq/p9WadRsuz8+jQw276aepaIEVmZ6FayguVKWI+xaNrooSLflN0+PPgSAY7EGCeTA9SXfs6Tu05fUmksM6Qlv3AClWp4QQcmyNZ0RRhr/6bmSA80ANoZ5vwfOvYGAq9VNedZGPc+0kBst/QEPN1jENbJu5I/tmaPrEvE3peRy1DuCo4PbDL2FbPaCQz0DHWDE1v5K4mZYoMlBSqHJeZYN8ey3/s22Xv0e36b9NA==<br>\r\nx-ms-exchange-transport-forked: True<br>\r\nContent-Type: multipart/mixed; boundary=&quot;_005_DB8PR04MB6793E05025783F1646880F7A9C5B0DB8PR04MB6793eurp_&quot;<br>\r\nMIME-Version: 1.0<br>\r\nX-OriginatorOrg: epsi.fr<br>\r\nX-MS-Exchange-CrossTenant-AuthAs: Internal<br>\r\nX-MS-Exchange-CrossTenant-AuthSource: DB8PR04MB6793.eurprd04.prod.outlook.com<br>\r\nX-MS-Exchange-CrossTenant-Network-Message-Id: e74daf17-e937-483c-b16a-08d84598300f<br>\r\nX-MS-Exchange-CrossTenant-originalarrivaltime: 21 Aug 2020 06:05:21.5590 (UTC)<br>\r\nX-MS-Exchange-CrossTenant-fromentityheader: Hosted<br>\r\nX-MS-Exchange-CrossTenant-id: b6e77e52-65f6-4dec-b7d9-8e45f36a536f<br>\r\nX-MS-Exchange-CrossTenant-mailboxtype: HOSTED<br>\r\nX-MS-Exchange-CrossTenant-userprincipalname: SnmE68HeGc4ArbAPc1fd0gxiZ2zam5Ygqrq3jniTKPu81sAaTPzmfWgnP79z08xpcutZjlLSYfu/hpKKCKnM2A==<br>\r\nX-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0402MB3850 ','2020-08-21 08:05:23','2020-11-04 12:02:05',12,12,NULL,NULL,5,'pre','CHOUIKH Iheb','iheb.chouikh@epsi.fr','tel',456,123,NULL,'DB8PR04MB6793E05025783F1646880F7A9C5B0@DB8PR04MB6793.eurprd04.prod.outlook.com',1,'2020-11-04'),(69,NULL,'(PROV69)','Bonjour monsieur DESTAILLEUR,\r\n\r\n\r\n\r\nVotre mission sur l\'amélioration du projet Open Source sellyoursaas.org ayant retenu mon attention, je me permets de vous contacter au sujet de ma recherche d’alternance.\r\n\r\nActuellement en 2ème année d\'informatique à l’école EPSI Bordeaux, je recherche activement une alternance en administration système et réseau à partir de septembre 2020 pour débuter ma 3ème année d’informatique.\r\n\r\nJ\'aimerais beaucoup participer à la progression de NLTechno - DoliCloud afin d’être utile pour cette entreprise.\r\n\r\nJe me permets de vous joindre mon CV à cet email.\r\n\r\nJe me tiens à votre disposition pour vous rencontrer et venir vous exposer mes motivations.\r\n\r\n\r\n\r\nBien Cordialement,\r\n\r\n\r\n\r\nBENOIT Damien - 2ème année d’informatique à l’EPSI',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : BENOIT Damien &ndash; Candidature pour de l&rsquo;alternance en administration syst&egrave;me et r&eacute;seau &agrave; partir de septembre 2020<br>\n&Eacute;metteur (From) : BENOIT Damien &lt;damien.benoit@epsi.fr&gt;<br>\nDestinataire(s) (To) : &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\n-----<br>\nBonjour monsieur DESTAILLEUR,<br>\r\n<br>\r\n<br>\r\n<br>\r\nVotre mission sur l\'amélioration du projet Open Source sellyoursaas.org ayant retenu mon attention, je me permets de vous contacter au sujet de ma recherche d’alternance.<br>\r\n<br>\r\nActuellement en 2ème année d\'informatique à l’école EPSI Bordeaux, je recherche activement une alternance en administration système et réseau à partir de septembre 2020 pour débuter ma 3ème année d’informatique.<br>\r\n<br>\r\nJ\'aimerais beaucoup participer à la progression de NLTechno - DoliCloud afin d’être utile pour cette entreprise.<br>\r\n<br>\r\nJe me permets de vous joindre mon CV à cet email.<br>\r\n<br>\r\nJe me tiens à votre disposition pour vous rencontrer et venir vous exposer mes motivations.<br>\r\n<br>\r\n<br>\r\n<br>\r\nBien Cordialement,<br>\r\n<br>\r\n<br>\r\n<br>\r\nBENOIT Damien - 2ème année d’informatique à l’EPSI<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp415821jal; Fri, 21 Aug 2020 06:54:18 -0700 (PDT)<br>\r\nX-Google-Smtp-Source: ABdhPJwNUMfzLqF2HV+5g4A254GQNrWSYgQ5MlJ701OY7zy6bUsKqAyRKaIu7DsIPnvAaE8rEj8B<br>\r\nX-Received: by 2002:a50:e087:: with SMTP id f7mr3053952edl.174.1598018056692; Fri, 21 Aug 2020 06:54:16 -0700 (PDT)<br>\r\nARC-Seal: i=2; a=rsa-sha256; t=1598018056; cv=pass; d=google.com; s=arc-20160816; b=OT98mNI5yD2nBwEXxhcwTI6ucP74DHaiXUojV+fsblL99Xlj631wvNRzv0TlDGTU0E F2odQKv6yfzFfQSTud4eJl9Jdg1D8HA+H15RYYJq+XxiCK4hbbg199gS4E4MqT/RuMh9 aQFv18gnQFACpmWDf/fkFd8iLygx3oAI7EBBathS3YFUYsE4MgEzZ3j8wwqPoHs4IJAx vrenudfoo1dCGh873gfj77phNeeE1Rx3PtyIuu6h9XuLliyN2eQ0bc335fjYCU0ZS7B3 r9E5X2Bl4JSt6rdsmcItCqC3d+4HOXPKAPKxpFqNOrRgS5h5UHMTku5bHpc0N5fkXtSA JtgA==<br>\r\nARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-language:accept-language:message-id:date :thread-index:thread-topic:subject:to:from:dkim-signature; bh=CzX/9ftE1Hnsaclh79rJdyJIES0g6H9l55WAnJutN2k=; b=EdHME2nUqG2LTcXRcS6DKJG6jIwIhL/dkAajrq5ztyAnaqGKTNYYShQYTBVjb8jkKp Q+NACFBx+f0l+Wud9sAWUvFGvzhGeX7e7LIqB+DbqlobejpPWVA6mCBRXiZg5OPyql63 dorrXCn9SIH6sRNjVAZJ/cANp59VF776SU7XBT1qMawlT8yeoHuMwjxEGUr+fT2W22di hQEI7y+ELFqWUWyzgAmCozFSzh6zqp4H/k0SkzNsnqAo9nwPvzX5NnMOnGmTLofaDzWc vH3dAy0bFjiqTXK6FHznbxWYG7m4GcFDPXGpQdYcWsuKOKd3TqEPmf7EZVLhIODBVjmr ZqvA==<br>\r\nARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=&quot;I4X/HA+P&quot;; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of damien.benoit@epsi.fr designates 40.107.22.49 as permitted sender) smtp.mailfrom=damien.benoit@epsi.fr<br>\r\nReturn-Path: &lt;damien.benoit@epsi.fr&gt;<br>\r\nReceived: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2049.outbound.protection.outlook.com. [40.107.22.49]) by mx.google.com with ESMTPS id w12si1407712edl.141.2020.08.21.06.54.16 for &lt;job@nltechno.com&gt; (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Aug 2020 06:54:16 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of damien.benoit@epsi.fr designates 40.107.22.49 as permitted sender) client-ip=40.107.22.49;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=&quot;I4X/HA+P&quot;; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of damien.benoit@epsi.fr designates 40.107.22.49 as permitted sender) smtp.mailfrom=damien.benoit@epsi.fr<br>\r\nARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VnniU0v2of3cIuylxsHTWNFTLqahQ37qkOIa0jOb6J+TOyyqnXEfZ+MJ1jI63eSqMHy9x1ORRhmyYyfKuMFxSgtGf9ENl+o5UAPdEH8Qw4UG3pApwPzPk1mxTn1jnTEQ64kuPFubmbLek46lSmIINjKYf36SXYWLfsM+UgFsV1NjhkII0BO+gP1cMIDaKzidgBKxL0253Y4hcRT+y1E0mwR7e4lBrLLr78GTej5JAU+CXdnCMArprt3RZN2MWihBULvQlfH++3T+UFcUiIaLJ5SeR1xySl8lZw88vMBCOgKZNXCDcYNIMSmd+DhZ/bj9tFYutSjODuQG1/1fVDgDsA==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CzX/9ftE1Hnsaclh79rJdyJIES0g6H9l55WAnJutN2k=; b=cjv1pF+QVfGVGctFyKQN7pNfhGk/at0Hw5phiNNVQUolL/7YXwytmyrmv+YDONjxyx75huJ0J8DsEbmPm618aK9Ml/V159RLV7VQw9S/JD5K943R3ZyeA7zQ+a46Fi6RA24AENa5+Qj7JNPnTDFV2DGVii+LHGR4m0PzI/hZB8zht1vPnjw0vQTWj+ao7ue15SrBZ/Nnie2xHPlks661iyxcQXTDjKwyZmbZGrNArTyXHlJLo4JLO+6ORCZOc5yquBPWr56w1UYouvrHibbweWe5qnl61cqS9sMEzoOUTD0r//NKCZLPD/gnz/fWew+F4mYtZ5UgmcVCwR4ShiUAJQ==<br>\r\nARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epsi.fr; dmarc=pass action=none header.from=epsi.fr; dkim=pass header.d=epsi.fr; arc=none<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ifagparis.onmicrosoft.com; s=selector2-ifagparis-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CzX/9ftE1Hnsaclh79rJdyJIES0g6H9l55WAnJutN2k=; b=I4X/HA+PxZX1x/8LmayLu235XxmfJ9QByJv7pbe14hOMZJnooHkyDFvo3vaLDdiTzWWCBohlTKJ/X7mPsiPnufLeMpXZDAsQxQocTVQSX1kT1zZcht9e9fFHh8EDx3p5hbPAaA9jbokOpqrVDz9nZVX+yDMQTyh8jEiVrpfUGwc=<br>\r\nReceived: from AM0PR04MB6834.eurprd04.prod.outlook.com (2603:10a6:208:17e::13) by AM0PR0402MB3332.eurprd04.prod.outlook.com (2603:10a6:208:22::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.24; Fri, 21 Aug 2020 13:54:04 +0000<br>\r\nReceived: from AM0PR04MB6834.eurprd04.prod.outlook.com ([fe80::f9ad:b5fd:a7ee:ebc2]) by AM0PR04MB6834.eurprd04.prod.outlook.com ([fe80::f9ad:b5fd:a7ee:ebc2%4]) with mapi id 15.20.3283.028; Fri, 21 Aug 2020 13:54:04 +0000<br>\r\nFrom: BENOIT Damien &lt;damien.benoit@epsi.fr&gt;<br>\r\nTo: &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\r\nSubject: =?Windows-1252?Q?BENOIT_Damien_=96_Candidature_pour_de_l=92alternance_en_?= =?Windows-1252?Q?administration_syst=E8me_et_r=E9seau_=E0_partir_de_septe?= =?Windows-1252?Q?mbre_2020?=<br>\r\nThread-Topic: =?Windows-1252?Q?BENOIT_Damien_=96_Candidature_pour_de_l=92alternance_en_?= =?Windows-1252?Q?administration_syst=E8me_et_r=E9seau_=E0_partir_de_septe?= =?Windows-1252?Q?mbre_2020?=<br>\r\nThread-Index: AQHWd8F/5mgKBmrxU0CeTMkdIv1fIg==<br>\r\nDate: Fri, 21 Aug 2020 13:54:04 +0000<br>\r\nMessage-ID: &lt;AM0PR04MB683482180EF217DB2427AC99F05B0@AM0PR04MB6834.eurprd04.prod.outlook.com&gt;<br>\r\nAccept-Language: fr-FR, en-US<br>\r\nContent-Language: fr-FR<br>\r\nX-MS-Has-Attach: yes<br>\r\nX-MS-TNEF-Correlator: <br>\r\nauthentication-results: nltechno.com; dkim=none (message not signed) header.d=none;nltechno.com; dmarc=none action=none header.from=epsi.fr;<br>\r\nx-originating-ip: [2a01:e0a:52e:1570:197f:2595:af84:b5b2]<br>\r\nx-ms-publictraffictype: Email<br>\r\nx-ms-office365-filtering-correlation-id: 04a1e782-77b5-4a17-55a4-08d845d9aaaa<br>\r\nx-ms-traffictypediagnostic: AM0PR0402MB3332:<br>\r\nx-microsoft-antispam-prvs: &lt;AM0PR0402MB333200EC6808A6AEBE44CD0BF05B0@AM0PR0402MB3332.eurprd04.prod.outlook.com&gt;<br>\r\nx-ms-oob-tlc-oobclassifiers: OLM:86;<br>\r\nx-ms-exchange-senderadcheck: 1<br>\r\nx-microsoft-antispam: BCL:0;<br>\r\nx-microsoft-antispam-message-info: Mciv+DNsieWtRmCq1o4BDrQoXJ+UcLwvpMBAzgseAfHYPh0L6vROSJZjJv+Ti33Won7l37zJJaZnGSf/twsLKxXfh9JDYtcKHbhcpOJcu81vqYDr0HhKQVBjPvxKa8WMfRP/L43eEt/Ci6M/s2xolIffvATiTvcl4xTVdi3yXYFkVKVZb80ggMtBII+5C8Ben/fiacqbzf+GcY2XNv6TQqWT39MHA24+q8BciY5st6UoayVHxCnEOt97F9dOa0hUdO45dNBCaIPevZ6wivNK5mpvN/yqiIk8ngkOsc6mmYCfZyiWNu2DDK+sLSDHk+mNYBjImDEopgG7uIW7G7OpBw==<br>\r\nx-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:fr;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB6834.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(376002)(346002)(366004)(39850400004)(136003)(396003)(66476007)(66946007)(33656002)(83380400001)(91956017)(71200400001)(99936003)(224303003)(76116006)(19627405001)(2906002)(478600001)(316002)(786003)(52536014)(66616009)(86362001)(66446008)(8936002)(64756008)(6506007)(66556008)(6916009)(9686003)(186003)(5660300002)(7696005)(4744005)(55016002);DIR:OUT;SFP:1101;<br>\r\nx-ms-exchange-antispam-messagedata: uj+uwURwQuIypfvETCqlUN0NhGNx4ORj/b1bQQXr0I9xvo3IsdBJV1HWI2deGC7SCf5XXvVFXKyip+VBLW1nTMysh+LNu+ZYezCaPT1ndNuQuTzLCcavPaCNLUV9PLTJjrbOroT1fThdHlYC3CXB5Txcp974xXcxP479lHPXZFFMEP7S5L4b97LGYtzZbxEx5NPkJuOPr/J/pPSZFidObtc5dvmWEYxSLXyr4MRjfZ7sZDUBbsAQl+8ygMcA07BsJ3HfT8Hsv760RCRCe7uB2bqcWVv96dIGwcLBGbILzw7vJqVMqg18ACCUnJA2MYcqJ/SYWCceUaRBKxpSin2Fe28umYC+FMRQDWoEQ+xW3xQY4A2fjWD2gNzWv3Dm3Mspp5BRqMG7fi/0RyIjg/PMPiEYl/gOf0czzrKOEOgkgsIZEo1beEhx+P/dW2Wt13g4V9qq1lnXpU4Jv7LTed6WxAGh9x7/OGA6GmN5Onwm9IK2LpE7Xu8sj0OCs1mycaPHyX+RDCVXpIlB7u06CFWRqD4uyn1WqgzzEZ5/+0yw93Wzw/kF3AxahTw552yh0+UIARfmo+TYt74EhbWdR+5QkTtMSbKnN2aejsEpDzNeflmGnjucsMoQ21+dXg0L3ySCU5zgRJC45e/ntqFjh7wWw3RZ4BwfRAT18W0Xbi2i9EQzNOica8ZQNx/uA7FSWuoYW72Wd1tL0eJjd/ykNCMm4w==<br>\r\nx-ms-exchange-transport-forked: True<br>\r\nContent-Type: multipart/mixed; boundary=&quot;_004_AM0PR04MB683482180EF217DB2427AC99F05B0AM0PR04MB6834eurp_&quot;<br>\r\nMIME-Version: 1.0<br>\r\nX-OriginatorOrg: epsi.fr<br>\r\nX-MS-Exchange-CrossTenant-AuthAs: Internal<br>\r\nX-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6834.eurprd04.prod.outlook.com<br>\r\nX-MS-Exchange-CrossTenant-Network-Message-Id: 04a1e782-77b5-4a17-55a4-08d845d9aaaa<br>\r\nX-MS-Exchange-CrossTenant-originalarrivaltime: 21 Aug 2020 13:54:04.4104 (UTC)<br>\r\nX-MS-Exchange-CrossTenant-fromentityheader: Hosted<br>\r\nX-MS-Exchange-CrossTenant-id: b6e77e52-65f6-4dec-b7d9-8e45f36a536f<br>\r\nX-MS-Exchange-CrossTenant-mailboxtype: HOSTED<br>\r\nX-MS-Exchange-CrossTenant-userprincipalname: lJ93XTQQJnpcED1j/7ctz0oEvD/7q2cseGjqmGDMdQLtjf8dSJJwrl6PivcUNok4LHulBQq0UkZ0tLJu+dtD+w==<br>\r\nX-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0402MB3332 ','2020-08-21 15:54:16','2020-08-23 14:03:32',12,NULL,NULL,NULL,0,NULL,'BENOIT Damien','damien.benoit@epsi.fr',NULL,NULL,NULL,NULL,'AM0PR04MB683482180EF217DB2427AC99F05B0@AM0PR04MB6834.eurprd04.prod.outlook.com',1,NULL),(70,NULL,'(PROV70)','Bonjour,\r\n\r\nJ\'ai reçu une offre d\'alternance pour l\'amélioration des projets open source nécessitant les compétences d\'administrateur système et de développeur PHP.\r\nJe pense correspondre à ces critères-là.\r\n\r\nJe vous joins mon CV ainsi que ma lettre de motivation.\r\nEn attente de votre réponse.\r\nCordialement, Benoist Sylvain\r\n\r\n\r\n____________________________________________________\r\n\r\n\r\nSylvain BENOIST\r\n\r\nEtudiant en Ingénierie Informatique B2 à l\'EPSI Bordeaux\r\n\r\n114 Rue Lucien Faure, 33000 Bordeaux\r\n\r\nsylvain.benoist@epsi.fr\r\n\r\n+33 (0)6.34.50.08.86',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Candidature alternance logiciel Open Source<br>\n&Eacute;metteur (From) : BENOIST Sylvain &lt;sylvain.benoist@epsi.fr&gt;<br>\nDestinataire(s) (To) : &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\n-----<br>\nBonjour,<br>\r\n<br>\r\nJ\'ai reçu une offre d\'alternance pour l\'amélioration des projets open source nécessitant les compétences d\'administrateur système et de développeur PHP.<br>\r\nJe pense correspondre à ces critères-là.<br>\r\n<br>\r\nJe vous joins mon CV ainsi que ma lettre de motivation.<br>\r\nEn attente de votre réponse.<br>\r\nCordialement, Benoist Sylvain<br>\r\n<br>\r\n<br>\r\n____________________________________________________<br>\r\n<br>\r\n<br>\r\nSylvain BENOIST<br>\r\n<br>\r\nEtudiant en Ingénierie Informatique B2 à l\'EPSI Bordeaux<br>\r\n<br>\r\n114 Rue Lucien Faure, 33000 Bordeaux<br>\r\n<br>\r\nsylvain.benoist@epsi.fr<br>\r\n<br>\r\n+33 (0)6.34.50.08.86<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp445349jal; Fri, 21 Aug 2020 07:31:04 -0700 (PDT)<br>\r\nX-Google-Smtp-Source: ABdhPJyJOTDSzKgEPxPQ61qrv4xEHnssoIHqapylWS9ldM4pQ62rlUsothTvjI/R0Vtpb5tBFgyP<br>\r\nX-Received: by 2002:a5d:4910:: with SMTP id x16mr2905233wrq.131.1598020263819; Fri, 21 Aug 2020 07:31:03 -0700 (PDT)<br>\r\nARC-Seal: i=2; a=rsa-sha256; t=1598020263; cv=pass; d=google.com; s=arc-20160816; b=NVVqGREnzBw1VkICkFXNnQJfyzkP6XS1f5bP1wRfweQDh08ELSHm1ya15MMPzEErN2 hbu0eOZQxL10p0IGgq1QZTGg6InhNL0hlYSwFpTMO/l+17NIlYyddz0+mJQSc8OYJEAg cxh3C8qlN/A9HtoxKBtlwChWWhP1PrjWNdBW5jv8fOefGb1dIEJuv5Hd2mr4i/yxlbO5 x8g3w7acHcvp57Oe5Mp4euoEcyUrQ0oTAWKAO+ZBj3Wf4vM1+i0rsACPtU+9gWCQHZnh 4e52Sq59GukWJXiX2TV9yxJYfHDezM+Ni7QosuP8Yus5ylqi5vDVbtOAl6GcJ1/Z8ANF BknQ==<br>\r\nARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-language:accept-language:message-id:date :thread-index:thread-topic:subject:to:from:dkim-signature; bh=Z6FhglKlbNS7hYHV+AiMg1sqp6TYWc2h2ClK+f7dh4o=; b=Jw8e6HYb8J/vClKDYbpVYzSuIiJo5Cn53cb3K0AltGjcd4SOB6a3Y9jenu1vHsUlRA k9CnPBlRa/wz6Wul9nenV9ENwqlTwFKnccxTC+4ClCHjUSd/3zuYF7Y4hOmio+aOf+8v tnU+/0s1LeuyXm7qSHyrCJkMVMYlIMV/RcIbjpt0RdZJz063/5wbaFAJU5BrUr8HuOzO tkLkm5r2zXe7qbNlDFq2/h2Ms35Lx6sKm/aRFj8/jXVEV6F23KrALl2ao6FTLruac/pC s8yX1WbTGFYvC52+Gm1egglWVdezVdj3SH9XWF0yqIRTfSiCqpVYao8gtO+H4m0/Mx6L pTNQ==<br>\r\nARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=Sdyaq4Mx; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of sylvain.benoist@epsi.fr designates 40.107.20.68 as permitted sender) smtp.mailfrom=sylvain.benoist@epsi.fr<br>\r\nReturn-Path: &lt;sylvain.benoist@epsi.fr&gt;<br>\r\nReceived: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2068.outbound.protection.outlook.com. [40.107.20.68]) by mx.google.com with ESMTPS id 13si1918880wmo.178.2020.08.21.07.31.03 for &lt;job@nltechno.com&gt; (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Aug 2020 07:31:03 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of sylvain.benoist@epsi.fr designates 40.107.20.68 as permitted sender) client-ip=40.107.20.68;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=Sdyaq4Mx; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of sylvain.benoist@epsi.fr designates 40.107.20.68 as permitted sender) smtp.mailfrom=sylvain.benoist@epsi.fr<br>\r\nARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ITQUdqwlpPESEaONJ1JvoPg3oVTyreFwTi79kCjVQuiyxQYA+JaS+VVn1W6asHnnSoSykPd3wcQ6tqRqQc0BQHI3o8gBFgFrav0FP6t2ibnaFX5DPGJA2No3OstPDR11PHxfVl7xvrQSi3TsntPsBY7MZOPOcGQtLyjW4BPPQDlxY5JnJeCE1epJfnsHG+8ucsKu0ccsrobguAvSb/AvbU/qP/IcJB4DuHwsDkvElJIfagdt9mGWnmJOudnl9FlujleE4QpJV5rQ64J9Z1E4O69OyXY+BNetBIa1OOS8gRBdO5LScTz2wMjiIiKrJg92dQRdO0ozuNX9Le7+JUFAhQ==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Z6FhglKlbNS7hYHV+AiMg1sqp6TYWc2h2ClK+f7dh4o=; b=FzY+KVT53dV0IuD25/bxZO5nTMq+N4EoOcUK/66tozg67ghqrbe1sY61lNR5ByOWeBQtqwKbH0bduW91r8MITHD07RLh6HYfE2RuVqZGBFrszQZWuVZJCBJj84+JblsutmgKYgpRkaZ2wVF5hklnP7RUDax3Crb4T2IjaRJwSO1kMLvvT+qH06sHQ8kH09qovfWVB+iAV/u+PG5YRdAZrjav7EAGTrwOcu3vWrQh6ULllpMSlqtDwI/zUKG2RyyccY1YcwThAyNnlqhQXGm72Qq+r4fbcI8FQoPvG5Nke22eDnwM+BUR3aRgWIX/v4nyOJUrNkxxcSzJGvjfaP14Jw==<br>\r\nARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epsi.fr; dmarc=pass action=none header.from=epsi.fr; dkim=pass header.d=epsi.fr; arc=none<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ifagparis.onmicrosoft.com; s=selector2-ifagparis-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Z6FhglKlbNS7hYHV+AiMg1sqp6TYWc2h2ClK+f7dh4o=; b=Sdyaq4Mxuj+akkIjv+LsTuzCXGu5Fxaf0W1Oex6SRNlrd+hfVFwbStFfFiL0CKrt/N+If8oDx26tlx7h5Bf7DhEVaYRroDsj5OnrHEqPXuaKhgHeGXGbbPgsnMXXMOh0F/ljFg+Eudi5bU0csFQVafKaqW4sHGX9xTAd+iHyEyg=<br>\r\nReceived: from AM6PR04MB5190.eurprd04.prod.outlook.com (2603:10a6:20b:d::25) by AM6PR04MB4664.eurprd04.prod.outlook.com (2603:10a6:20b:25::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.25; Fri, 21 Aug 2020 14:31:01 +0000<br>\r\nReceived: from AM6PR04MB5190.eurprd04.prod.outlook.com ([fe80::6967:5154:6fbe:97b2]) by AM6PR04MB5190.eurprd04.prod.outlook.com ([fe80::6967:5154:6fbe:97b2%5]) with mapi id 15.20.3305.024; Fri, 21 Aug 2020 14:31:01 +0000<br>\r\nFrom: BENOIST Sylvain &lt;sylvain.benoist@epsi.fr&gt;<br>\r\nTo: &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\r\nSubject: Candidature alternance logiciel Open Source<br>\r\nThread-Topic: Candidature alternance logiciel Open Source<br>\r\nThread-Index: AQHWd8cJqkHnhFUA/EOhz+7NH3NjOg==<br>\r\nDate: Fri, 21 Aug 2020 14:31:01 +0000<br>\r\nMessage-ID: &lt;AM6PR04MB5190F6DD4134E0F9ADAD2CD6FF5B0@AM6PR04MB5190.eurprd04.prod.outlook.com&gt;<br>\r\nAccept-Language: fr-FR, en-US<br>\r\nContent-Language: fr-FR<br>\r\nX-MS-Has-Attach: yes<br>\r\nX-MS-TNEF-Correlator: <br>\r\nauthentication-results: nltechno.com; dkim=none (message not signed) header.d=none;nltechno.com; dmarc=none action=none header.from=epsi.fr;<br>\r\nx-originating-ip: [193.250.78.149]<br>\r\nx-ms-publictraffictype: Email<br>\r\nx-ms-office365-filtering-correlation-id: a9ca76a6-bbcf-4fe0-ed2e-08d845ded41f<br>\r\nx-ms-traffictypediagnostic: AM6PR04MB4664:<br>\r\nx-microsoft-antispam-prvs: &lt;AM6PR04MB4664C17047CF59D8EEA980BAFF5B0@AM6PR04MB4664.eurprd04.prod.outlook.com&gt;<br>\r\nx-ms-oob-tlc-oobclassifiers: OLM:989;<br>\r\nx-ms-exchange-senderadcheck: 1<br>\r\nx-microsoft-antispam: BCL:0;<br>\r\nx-microsoft-antispam-message-info: TEqFZXMlg0QIA1GezbcWxqSlqzCB3rIdRk8A9MzNeGm6N693eFcehflrq/xA0jYi4eTpNcral1Ia9Wb3mKi93G638En+aQG4JZbPdFRjVnFyJgsFc58TvtNm68kewGRDyccWoWeo4HEpHw2ERyHrGTN8jxkoF1GAGVUBMHDqOP/XBsskzM4vSENLKndNMiRaxL0fQniH9C5J7PIUKhBQ5x0tbdgtjesGPg/4mvw8f4G9/DLfM01bKU47ekBi//xkFwfW5rSGqfSIorE16MZ/kQW/yO2ieM0B2az1FSbKw9Ex2/7GnOvqnfUaSXXP8jlB<br>\r\nx-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:fr;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB5190.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(136003)(376002)(39850400004)(366004)(346002)(396003)(66556008)(4744005)(478600001)(8936002)(55016002)(66576008)(6916009)(9686003)(2906002)(186003)(76116006)(64756008)(66476007)(33656002)(19627405001)(52536014)(91956017)(5660300002)(8676002)(66446008)(66946007)(86362001)(71200400001)(316002)(99936003)(786003)(7696005)(26005)(83380400001)(6506007);DIR:OUT;SFP:1101;<br>\r\nx-ms-exchange-antispam-messagedata: GitTgsWkD/wIskt7S8LZlmQL3XhmMm2RkFYh16U/KpcX6IBHqNcwe6mBxSHyQW1/IyZwtQNhMAVoKD5y3ZBSkZpJnkQsnnt+yKqy94bVjYcBotH44npGbQxcOa0rHcgYlKrgHJbWojRhZvzjKLErx6fRYAt729QKEJX5CK8I8Ct2ODE2BenkHqSsKDbe+hmFoO1yXeTI7xlp6nUsviFm9NKkcBmc1vEp+0uuQMFlQg2VU2YikD1YQSxcq7tt1i4WNGL11bRrabzSkSxnVGoVei6bQf5bu8Wn2VbaBLMOPK6X/mewaigXxivafpHNMMbXkuSTwFziBJt7hUaof1dqsZCvsLb5npKEgBjucULLy4RCQu8a1XSi+qWwevPaBNGrCpCYyjZ/u6BgiYta5G9Ndx0huoB3DL/BXAXDjE2Y0goGGN1PhyhiEvUjIK6Huv7kCPe3/tP5Xl6gYqMZe9b84kZAwSQiaBQbF/4/sCfyom1xeTc2Z48+P/AL08Rj7z5Q9O4EQoQFCm2cEbhZH3j6PWM6WpGdqipDpHPCIa9yl9xbNc0PXjOYdpgNXzkllTWRWeJk0IUnw83ngeKly2nsv6UuVB/S5wwlydXa7EmKuJ8JGhCTxDK131fU8OPcymJGarAH9XXN8EtCNwAOKg92fw==<br>\r\nx-ms-exchange-transport-forked: True<br>\r\nContent-Type: multipart/mixed; boundary=&quot;_005_AM6PR04MB5190F6DD4134E0F9ADAD2CD6FF5B0AM6PR04MB5190eurp_&quot;<br>\r\nMIME-Version: 1.0<br>\r\nX-OriginatorOrg: epsi.fr<br>\r\nX-MS-Exchange-CrossTenant-AuthAs: Internal<br>\r\nX-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB5190.eurprd04.prod.outlook.com<br>\r\nX-MS-Exchange-CrossTenant-Network-Message-Id: a9ca76a6-bbcf-4fe0-ed2e-08d845ded41f<br>\r\nX-MS-Exchange-CrossTenant-originalarrivaltime: 21 Aug 2020 14:31:01.4864 (UTC)<br>\r\nX-MS-Exchange-CrossTenant-fromentityheader: Hosted<br>\r\nX-MS-Exchange-CrossTenant-id: b6e77e52-65f6-4dec-b7d9-8e45f36a536f<br>\r\nX-MS-Exchange-CrossTenant-mailboxtype: HOSTED<br>\r\nX-MS-Exchange-CrossTenant-userprincipalname: 2sKkmSMUyJ7Vb/zpQVDdT0C3tjmbbvYNNVXUdIyJsvMJgQ0eTkzFeXsUexIdbgkKXE8sE855DoH46w2U0ADeDA==<br>\r\nX-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4664 ','2020-08-21 16:31:03','2020-08-23 14:03:33',12,NULL,NULL,NULL,0,NULL,'BENOIST Sylvain','sylvain.benoist@epsi.fr',NULL,NULL,NULL,NULL,'AM6PR04MB5190F6DD4134E0F9ADAD2CD6FF5B0@AM6PR04MB5190.eurprd04.prod.outlook.com',1,NULL),(71,NULL,'(PROV71)','Bonjour Monsieur Destailleur,\r\n\r\nJe vous contacte concernant l’offre d’alternance en développement que vous avez émise.\r\nActuellement à l\'aube de ma 3e année de Bachelor informatique à l\'EPSI Bordeaux, je suis à la recherche d\'une alternance qui débuterait en septembre.\r\nCette alternance se ferait au rythme de deux semaines en entreprise et deux semaines à l\'école, les cours ne reprenant néanmoins pas avant novembre.\r\n\r\nAu cours de mes études, j\'ai été amené à réaliser deux stages en milieu professionnel de sept semaines chacun.\r\nJ\'y ai perfectionné mes compétences dans le développement web avec notamment les langages PHP, le stack web HTML/CSS/JS ainsi que le framework Symfony4.\r\nDéveloppeur plutôt orienté web, j’ai tout de même pu découvrir la programmation Android pendant mes cours.\r\nAppréciant linux et ses possibilités, je possède et administre moi-même un serveur lan sous Ubuntu Focal ainsi qu\'un autre dédié au web (Nginx,Php,MariaDB) sous Debian Buster.\r\nDe ce fait, je suis sûr de pouvoir répondre à votre besoin de double compétences dans les domaines de l\'administration système et du développement Web.\r\n\r\nAu cours de mon alternance, je souhaiterai améliorer mes compétences à travailler en équipe, notamment avec des outils comme Git mais aussi avec un planning.\r\nEfficace, je suis sûr de pouvoir être un atout pour votre entreprise et l’équipe que j’intégrerai.\r\n\r\nPour plus de détails sur mes connaissances et mes capacités, je vous ajoute mon CV en pièce jointe de ce message.\r\nN\'hésitez pas à me contacter, pour plus d\'information ou mieux, pour un entretien.\r\nDans l\'attente de votre réponse,\r\n\r\nTHEBAULT Yoann\r\nEtudiant EPSI Bordeaux\r\n0608838403\r\nyoann.thebault@epsi.fr',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Proposition d\'alternance en d&eacute;veloppement (AdminSys / PHP) - Yoann THEBAULT<br>\n&Eacute;metteur (From) : THEBAULT Yoann &lt;yoann.thebault@epsi.fr&gt;<br>\nDestinataire(s) (To) : &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\n-----<br>\nBonjour Monsieur Destailleur,<br>\r\n<br>\r\nJe vous contacte concernant l’offre d’alternance en développement que vous avez émise.<br>\r\nActuellement à l\'aube de ma 3e année de Bachelor informatique à l\'EPSI Bordeaux, je suis à la recherche d\'une alternance qui débuterait en septembre.<br>\r\nCette alternance se ferait au rythme de deux semaines en entreprise et deux semaines à l\'école, les cours ne reprenant néanmoins pas avant novembre.<br>\r\n<br>\r\nAu cours de mes études, j\'ai été amené à réaliser deux stages en milieu professionnel de sept semaines chacun.<br>\r\nJ\'y ai perfectionné mes compétences dans le développement web avec notamment les langages PHP, le stack web HTML/CSS/JS ainsi que le framework Symfony4.<br>\r\nDéveloppeur plutôt orienté web, j’ai tout de même pu découvrir la programmation Android pendant mes cours.<br>\r\nAppréciant linux et ses possibilités, je possède et administre moi-même un serveur lan sous Ubuntu Focal ainsi qu\'un autre dédié au web (Nginx,Php,MariaDB) sous Debian Buster.<br>\r\nDe ce fait, je suis sûr de pouvoir répondre à votre besoin de double compétences dans les domaines de l\'administration système et du développement Web.<br>\r\n<br>\r\nAu cours de mon alternance, je souhaiterai améliorer mes compétences à travailler en équipe, notamment avec des outils comme Git mais aussi avec un planning.<br>\r\nEfficace, je suis sûr de pouvoir être un atout pour votre entreprise et l’équipe que j’intégrerai.<br>\r\n<br>\r\nPour plus de détails sur mes connaissances et mes capacités, je vous ajoute mon CV en pièce jointe de ce message.<br>\r\nN\'hésitez pas à me contacter, pour plus d\'information ou mieux, pour un entretien.<br>\r\nDans l\'attente de votre réponse,<br>\r\n<br>\r\nTHEBAULT Yoann<br>\r\nEtudiant EPSI Bordeaux<br>\r\n0608838403<br>\r\nyoann.thebault@epsi.fr<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp544834jal; Fri, 21 Aug 2020 09:48:29 -0700 (PDT)<br>\r\nX-Google-Smtp-Source: ABdhPJzWNLJBSfWeCYH4ki5MaiI5cX02ZWZfkz71Y6d7AkmkLQjkJ9beX95Tm1GsZOqD7s2nvohh<br>\r\nX-Received: by 2002:adf:e94c:: with SMTP id m12mr3497713wrn.109.1598028509396; Fri, 21 Aug 2020 09:48:29 -0700 (PDT)<br>\r\nARC-Seal: i=2; a=rsa-sha256; t=1598028509; cv=pass; d=google.com; s=arc-20160816; b=Z1g8zL/ns+mvZDceeQTmHOlGeufA6KnGI+VoOT7/zxZ3AU40q1dwugk5BXblfysR2h yss/XvAG47b4TfNQ4aNAFtLa2jrN+LPncz2mzamijCg0QtPs1KMX0wzMlwo9Q4i9X5ub Q4dxXePA8Y9OM2GF3rgzD1BJM3ScXGNs7PAC7FFvnLvj4Z1AgiZrF6jcHe/ohJfzplSg OE1nxGyS7jGlFwWm6chyGbxvKLWN2csrewKomgTD26tu1qHW3MWtt+1+N6K/PQFFpub7 FgY+RXu1C1InjY6Farn8j8rHIFn2n6dtFdy+xTqL3XJsSMFETSXkRD7cFcLBKf3ziSjm ghOg==<br>\r\nARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-language:accept-language:message-id:date :thread-index:thread-topic:subject:to:from:dkim-signature; bh=7DwQngvBkkMTM/RTnyqdpiVNQxlJ147oCVjnw/dQIa8=; b=eF5TzmdAqemTI5i8bii3mL6Ur8zKnIePNRZSHP5FRr4AJuTbMgxtaMR6224GSKhYN8 Fmaa6WeQ3im5PVokk679Po0ur4CDNunK+9tsCb7NEze0iYQnTG4ioWI5Zq1FSov/Ghuq LgRct/jHZ6ekPsIxSGDRXqNBoYdVumi8tdG2Ppeu0zTvlekDTIMde1Iu3r9OmubXZQ1m 2XcA3nvbZF4lH+PCzeRH+ZuVpRZuzeAuFLv4RzL+FYZXZryjqWS1N2eaU6tNoJjMFwF6 MC/7PuKGoM+bSAFBv88eRdqVKSLcTN1ZWbp1xZ10LkFkH98xyKhMAF76Y1dtkiEqQXkl LBqw==<br>\r\nARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=VQkvsElq; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of yoann.thebault@epsi.fr designates 40.107.7.89 as permitted sender) smtp.mailfrom=yoann.thebault@epsi.fr<br>\r\nReturn-Path: &lt;yoann.thebault@epsi.fr&gt;<br>\r\nReceived: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70089.outbound.protection.outlook.com. [40.107.7.89]) by mx.google.com with ESMTPS id 15si2231412wmi.128.2020.08.21.09.48.28 for &lt;job@nltechno.com&gt; (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Aug 2020 09:48:29 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of yoann.thebault@epsi.fr designates 40.107.7.89 as permitted sender) client-ip=40.107.7.89;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=VQkvsElq; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of yoann.thebault@epsi.fr designates 40.107.7.89 as permitted sender) smtp.mailfrom=yoann.thebault@epsi.fr<br>\r\nARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ATNiZlO17KgbduSAX21a5yINY5j/msoryQY7wecwUZ55b/iWjW+llPSL0O/4PnlkWLIJe6Wn92bqKeD/KRkRo7tg4/yMHRatcQF09U21bxuS/gQL8dm6/r4w5gf0X0E5M7OHHfXQKyDN/SaUG4khIxTy/9KraVe1u/dS4nFbjalqE1mcA/dyuFbzec4DeSLdG0mdkOUJVaiIPSM0WjdpEL/89uRZ3Xc33s7bEyFDuR6pbfU1osKt3DyQQ9eLIeSzHGWTYqAG0Z+lBNlt6QYYBMfRJOvNT0O+Wrc3RYqk1ZNShQF25twjJx7TMmFA1ef/sQpt/QqYte+k7OZ8x4DPOA==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7DwQngvBkkMTM/RTnyqdpiVNQxlJ147oCVjnw/dQIa8=; b=Fx7UhvRq6JgtZIaRZpz23860XPSAU0YH1Ymx/CuYBoCjE5KYCNp+IosZzZ9GxatEVh0GMOlKNmlbp3kynNTKz1R/MjMbHumZ2MOPnswvTJfLjta9x2rww/4SPQoEglD5Xf0W0BYazHuhGeapKTBL84RzhYPh0XffCDnm4oRMNnS6SPDKVbjGU5OzoFlVjhi+c+8/CajQNwDxhpIY4HDhK+tx7C+4cpTg51Z7xryOmmCCv+UGC5K6dgPV6Vhwz2pakldFpuFR6ciw7cZ4dS1ZaMsOSPf1OIJicLCxrYsCe5t67RFy0fdzcHx8tLvanHnox+7fRxQfXaY9lP3ZfGD7CA==<br>\r\nARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epsi.fr; dmarc=pass action=none header.from=epsi.fr; dkim=pass header.d=epsi.fr; arc=none<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ifagparis.onmicrosoft.com; s=selector2-ifagparis-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7DwQngvBkkMTM/RTnyqdpiVNQxlJ147oCVjnw/dQIa8=; b=VQkvsElqOWe+ppmP9hBeGUdfq7qE1TZoeLQnUg1x+U4B7QLQGBPr94mVpnigdnRdyiUGJbilu+68ES1ooU9HqiRx3/Vnxe9PjCvT3gS/bV7o/mPflO80aFp7QFMVCC1QoaPXFbdFdaWLaXdPuWH5EWFnl2k/271HATgcypNQPTc=<br>\r\nReceived: from AM6PR04MB4615.eurprd04.prod.outlook.com (2603:10a6:20b:24::12) by AM6PR04MB4373.eurprd04.prod.outlook.com (2603:10a6:20b:19::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3283.22; Fri, 21 Aug 2020 16:48:27 +0000<br>\r\nReceived: from AM6PR04MB4615.eurprd04.prod.outlook.com ([fe80::b161:bfaf:90dc:3639]) by AM6PR04MB4615.eurprd04.prod.outlook.com ([fe80::b161:bfaf:90dc:3639%7]) with mapi id 15.20.3305.024; Fri, 21 Aug 2020 16:48:27 +0000<br>\r\nFrom: THEBAULT Yoann &lt;yoann.thebault@epsi.fr&gt;<br>\r\nTo: &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\r\nSubject: =?Windows-1252?Q?Proposition_d\'alternance_en_d=E9veloppement_(AdminSys_/_?= =?Windows-1252?Q?PHP)_-_Yoann_THEBAULT?=<br>\r\nThread-Topic: =?Windows-1252?Q?Proposition_d\'alternance_en_d=E9veloppement_(AdminSys_/_?= =?Windows-1252?Q?PHP)_-_Yoann_THEBAULT?=<br>\r\nThread-Index: AQHWd9XdzNSJfWKZoUGZdtwUE8z6Tw==<br>\r\nDate: Fri, 21 Aug 2020 16:48:27 +0000<br>\r\nMessage-ID: &lt;AM6PR04MB4615D92F49560FAE0A1BE738815B0@AM6PR04MB4615.eurprd04.prod.outlook.com&gt;<br>\r\nAccept-Language: fr-FR, en-US<br>\r\nContent-Language: fr-FR<br>\r\nX-MS-Has-Attach: yes<br>\r\nX-MS-TNEF-Correlator: <br>\r\nauthentication-results: nltechno.com; dkim=none (message not signed) header.d=none;nltechno.com; dmarc=none action=none header.from=epsi.fr;<br>\r\nx-originating-ip: [2a01:cb19:74c:8b00:adb2:ed83:3f8c:6f17]<br>\r\nx-ms-publictraffictype: Email<br>\r\nx-ms-office365-filtering-correlation-id: 21831f7f-7e93-40e4-f519-08d845f206fa<br>\r\nx-ms-traffictypediagnostic: AM6PR04MB4373:<br>\r\nx-microsoft-antispam-prvs: &lt;AM6PR04MB437321229E1CEE13212D3935815B0@AM6PR04MB4373.eurprd04.prod.outlook.com&gt;<br>\r\nx-ms-oob-tlc-oobclassifiers: OLM:431;<br>\r\nx-ms-exchange-senderadcheck: 1<br>\r\nx-microsoft-antispam: BCL:0;<br>\r\nx-microsoft-antispam-message-info: MOlmJctSBEjQrBhQBCpLVy8cX8SJjCOhkaCTpBLVBVB6qQ3UFmTLPyEew/LtTLBzubJwzE0VwUTOYyII70ta3gmeMemEuC4NZmUmmFicWxv31pXToZBKdlgqyFthyIZA2oV0abPdiWQ5De4O85c4U7/NFT2thUKF32hqR4xzj4eOL9IRH03ZAmnD9HCjJ/IfGyqPe1u8p7yt8ZagG+c885ZOCUResqdmSoXsS2iZQepx44u4R9Ap2Y/LspusnFI/TgKjHFmsYQUTXWnMCv+02wVEdbQBbwu21JQab1QopL7yD2nNxCetPsDdt/eSokctwLfRHOjq83H9RGCwCpPgIw==<br>\r\nx-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:fr;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB4615.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(396003)(366004)(39850400004)(376002)(136003)(346002)(6506007)(83380400001)(55016002)(786003)(186003)(316002)(99936003)(8936002)(6916009)(2906002)(91956017)(66446008)(64756008)(224303003)(66556008)(66946007)(52536014)(86362001)(71200400001)(5660300002)(7696005)(66476007)(478600001)(33656002)(9686003)(76116006)(19627405001)(66616009);DIR:OUT;SFP:1101;<br>\r\nx-ms-exchange-antispam-messagedata: oH38DwQBBUwO81MAtni5ncmj8Mz3ScxsI5AL1W8ygbeuQzYUL3gnCJLakGDMgiwlPo3hyC0YlduPazQ4E2254YO7mObph7utnXDrhiyFpHTCFBMSgtg6rk8aq2cVWcOzxRmd9P2ehirI9gxP61if5A3tW4U3B5iwqqdJJ6SP/MQvmdk+LXKK+/MxP9C9s5eDsJ5XG4GVWwUT2rl2lLcx5Hl6+2ULuB3ddsuVf0eZQ8p1T/qZSxrcgPCZ5K4BAKrGyTWgHCQG1XRvsvS7puFw9jgwsEkETP7SsP9nVIqhtaHp+3LdOONmFZJumPuU3GgW7bJUZCfAmzpho78r1rnG9FwH68AFSIPeqO6+O+ZbK4UmS9s1/9Y7hdZCR4a5miuYs4exGJzk4tuzn1wGs/O8Y5df91pmsgh8OwwnBsQFOECcfMIBGejTe9YhPXQAZG1jrmZxEOV8XZPIgl8hInjg6eNxqKRLGzZTIld4ZjufO81/QVFg/JX/XKRRPwcdJpVByfecte6k1u2VXyqAmaRQkICpeGTTqPxv+LSXLXlb5G8w8P7KebrVyUOOV71SS/KJsX6BGG18H+YGcOp2iyJ9+TGoB/v+tncP+9GDD5L9Z8KBjAXTPlbLQMgKv3htJiG3T6iEg2IEm1L7YS5TzCfsGOB3MDixxRalUZ2ifVuK+He+jI5SeirkfGWrqb1E9TBWutdb+L21FkU2NArFnshXmA==<br>\r\nx-ms-exchange-transport-forked: True<br>\r\nContent-Type: multipart/mixed; boundary=&quot;_004_AM6PR04MB4615D92F49560FAE0A1BE738815B0AM6PR04MB4615eurp_&quot;<br>\r\nMIME-Version: 1.0<br>\r\nX-OriginatorOrg: epsi.fr<br>\r\nX-MS-Exchange-CrossTenant-AuthAs: Internal<br>\r\nX-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4615.eurprd04.prod.outlook.com<br>\r\nX-MS-Exchange-CrossTenant-Network-Message-Id: 21831f7f-7e93-40e4-f519-08d845f206fa<br>\r\nX-MS-Exchange-CrossTenant-originalarrivaltime: 21 Aug 2020 16:48:27.3717 (UTC)<br>\r\nX-MS-Exchange-CrossTenant-fromentityheader: Hosted<br>\r\nX-MS-Exchange-CrossTenant-id: b6e77e52-65f6-4dec-b7d9-8e45f36a536f<br>\r\nX-MS-Exchange-CrossTenant-mailboxtype: HOSTED<br>\r\nX-MS-Exchange-CrossTenant-userprincipalname: ysYLeB+bsUcAiQl/kr2vyZttcC4ybnBxZTdaQ2cCDAdV9m4NUtGjCf6tXmbscVDyVX4qf+16sGhWzy5ey0/n/w==<br>\r\nX-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4373 ','2020-08-21 18:48:29','2020-08-23 14:03:34',12,NULL,NULL,NULL,0,NULL,'THEBAULT Yoann','yoann.thebault@epsi.fr',NULL,NULL,NULL,NULL,'AM6PR04MB4615D92F49560FAE0A1BE738815B0@AM6PR04MB4615.eurprd04.prod.outlook.com',1,NULL),(72,NULL,'JOC2008-0003','Monsieur,<br />\r\n<br />\r\n&Eacute;tudiant en troisi&egrave;me ann&eacute;e de bachelor informatique &agrave; l&#39;EPSI, je vous adresse ma candidature pour le contrat d&#39;alternance &eacute;diteur logiciel SaaS.<br />\r\nVous trouverez ci-joints mon CV ainsi qu&#39;une lettre de motivation plus d&eacute;taill&eacute;e.<br />\r\n<br />\r\nDans l&#39;espoir d&#39;une r&eacute;ponse favorable, je vous prie d&#39;agr&eacute;er, Monsieur, mes salutations distingu&eacute;es.<br />\r\n<br />\r\nBLANCHET Ayoub<br />\r\n<br />\r\n<br />\r\n[cid:image001.png@01D67881.98144D70]<br />\r\n<br />\r\n[cid:image002.png@01D67881.98144D70]<br />\r\nAyoub Blanchet<br />\r\nEPSI /B3<br />\r\n07 82 15 83 74<br />\r\nayoub.blanchet@epsi.fr<br />\r\n<br />\r\n<br />\r\n[cid:image003.png@01D67881.98144D70]<br />\r\n[cid:image004.png@01D67881.98144D70]<br />\r\n[cid:image005.png@01D67881.98144D70]',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail :  CANDIDATURE Alternance &eacute;diteur logiciel SaaS<br>\n&Eacute;metteur (From) : BLANCHET Ayoub &lt;ayoub.blanchet@epsi.fr&gt;<br>\nDestinataire(s) (To) : &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\n-----<br>\nMonsieur,<br>\r\n<br>\r\nÉtudiant en troisième année de bachelor informatique à l\'EPSI, je vous adresse ma candidature pour le contrat d\'alternance éditeur logiciel SaaS.<br>\r\nVous trouverez ci-joints mon CV ainsi qu\'une lettre de motivation plus détaillée.<br>\r\n<br>\r\nDans l\'espoir d\'une réponse favorable, je vous prie d\'agréer, Monsieur, mes salutations distinguées.<br>\r\n<br>\r\nBLANCHET Ayoub<br>\r\n<br>\r\n<br>\r\n[cid:image001.png@01D67881.98144D70]&lt;http://www.epsi.fr/&gt;<br>\r\n<br>\r\n[cid:image002.png@01D67881.98144D70]<br>\r\nAyoub Blanchet<br>\r\nEPSI /B3<br>\r\n07 82 15 83 74<br>\r\nayoub.blanchet@epsi.fr&lt;mailto:ayoub.blanchet@epsi.fr&gt;<br>\r\n<br>\r\n<br>\r\n[cid:image003.png@01D67881.98144D70]&lt;https://fr-fr.facebook.com/pages/EPSI-Bordeaux/396294960413198&gt;<br>\r\n[cid:image004.png@01D67881.98144D70]&lt;https://twitter.com/EPSI_Bordeaux&gt;<br>\r\n[cid:image005.png@01D67881.98144D70]&lt;https://www.youtube.com/user/ecoleepsi&gt;<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp1087267jal; Sat, 22 Aug 2020 03:42:50 -0700 (PDT)<br>\r\nX-Google-Smtp-Source: ABdhPJxMKpkfK1Y2uariV1GUyRxlG1Ufq2sxKbRi4L112sgcPsJuUvHfJFJARXolKHOZK5TiIZ5G<br>\r\nX-Received: by 2002:a17:906:7d6:: with SMTP id m22mr6534609ejc.229.1598092969796; Sat, 22 Aug 2020 03:42:49 -0700 (PDT)<br>\r\nARC-Seal: i=2; a=rsa-sha256; t=1598092969; cv=pass; d=google.com; s=arc-20160816; b=fFmR+YNR6w98rKzy5l7JTH+Qnhhxkzslv4NBmLSzYV2U5+oO9deTS3SL/0hO+UOQ7w i29/1Dp3rI0+vIIhahCb/XsZNQam5R4/c2TX4Hu/TPdPAwqGS8j33mk1jgjF0TWiDNZG hzcSUzmZSh7/MD/qcRbCKgV0dexTLHz+iYC9oRLxe0f8w2i5fBi9Tw3IJlNGaSwVUSj7 FCeN+kGh3eeAHy2gFgm7iKUqvV23U5h9NY3C9kzGgUQcM9Vrd1HhRBeRmFvC2kXFtwud QDRHzW9SACjlhOlXq4YZaFOi4Tw5izy+pN725mC5V5BARc0ha0N+BnmQAVrsw7IB9jBQ /k+g==<br>\r\nARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-language:accept-language:message-id:date :thread-index:thread-topic:subject:to:from:dkim-signature; bh=cmnMU9VNAFsuUi1k68C6I6u1D4BTkZQy3PYrNs96djE=; b=NmC49IdCmLeC3MkSdVckcto4KnXG8U92cLGoJ0hnsuz+uO/ZycIXrQO5sexTtqRS9j McPVGQJ6pDgNuRxpat3qy2ITO7gmSntOKkgi+vuVKjD1gvWdl/BKgVulJyi9+5AWyQHq /x7qQjueLTdQw2k5EGvh07jFoB/ah/bAcBlu0glpZFi/l0J0LPjH3XJeTnKuVVWVqlhE ocHeqPNH0z7vBafJmaYpfRBV6LTdUP5gY7RybXGfxv3CnCZwR0w/+YhVkhCO4fxC4m3q jz/Dm3PW/g2tVIw5Uske3oUPUBfOLEswz4bwJgT5fHOOsWTAjEnovSu5dhgHp8jANq1x 9+ag==<br>\r\nARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=sBQHJOzL; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of ayoub.blanchet@epsi.fr designates 40.107.22.42 as permitted sender) smtp.mailfrom=ayoub.blanchet@epsi.fr<br>\r\nReturn-Path: &lt;ayoub.blanchet@epsi.fr&gt;<br>\r\nReceived: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2042.outbound.protection.outlook.com. [40.107.22.42]) by mx.google.com with ESMTPS id e4si2894132ejr.98.2020.08.22.03.42.49 for &lt;job@nltechno.com&gt; (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Aug 2020 03:42:49 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of ayoub.blanchet@epsi.fr designates 40.107.22.42 as permitted sender) client-ip=40.107.22.42;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=sBQHJOzL; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of ayoub.blanchet@epsi.fr designates 40.107.22.42 as permitted sender) smtp.mailfrom=ayoub.blanchet@epsi.fr<br>\r\nARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M655FzRU6Qg8C9xXffoKHghi19kuT3nWpmx233zjVWFlU4Wlc10GrAPFTinaKn7UocbeQUrk61AreLwVKGmycqhLnKuyOhvL2Y/8g1SKMKm7TGTuoTqYHONFQfWYnFWEzdguGXVXOF1Euz3TBW78eGE5nLPqTlE08S3btbIS603OyYhGT4D2/DVwXG/balbnctAt4gq+TzB3mPrZeg3O7QvK/GcO7lUyjBdtyhTb7aDNa5B+cgyt5Snepsw31q74XdK/lX/tJ55qU1Z+V5nKRwyt4gag+2d4+S1fAu32G6aW8KwWmzyF7lmaGmU7sH7jCNW0HO0FFMrgrsQFsMsfKw==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cmnMU9VNAFsuUi1k68C6I6u1D4BTkZQy3PYrNs96djE=; b=nQIyVQfSkx19EETNttooiBlY6aX0M1elCTa+jJrzy4cR3GQ1bs+bw5WVMK7RSuZyMHmZr0Xn+18PohfpjIUZ+Er9GjOFqUiKkMGN/OmaOH3srbQZ1/SE71si26kEZ/uUj5MBRZNy0ncaEPACCt1hddImfiXHx4s8e0NApkJy7IEWVtoMRC+8Hi2xPS3gQfQFEAhCxa+CtP9M3qRvDIanLs1N5NxadzBDFkKEg/QU/JHgabaeR06rEczIFgh3zPgy76eqbnRdOXVvRmJpE5r+DK0ParoSONdMOfksK7SA4uk6Dv8f+p195/0oKlspDo4aGRtNGU2AIT15c0Uq322phw==<br>\r\nARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epsi.fr; dmarc=pass action=none header.from=epsi.fr; dkim=pass header.d=epsi.fr; arc=none<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ifagparis.onmicrosoft.com; s=selector2-ifagparis-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cmnMU9VNAFsuUi1k68C6I6u1D4BTkZQy3PYrNs96djE=; b=sBQHJOzLJTR/wUCYhCXPmYLG555c+I+zFb2avzDFz6vJeTJHJXTRJ8GJw9tvIT6CK4mC9Qsp6fYpCgq2kZzhXnQ4H9j6DufodqM2Vvzpr0b2GCTxqNbeGuCPDKc/HIVjWBQhOb+4aqrpD3SfBC4ix3jzrPkjRUt+kbxKHLZ5htI=<br>\r\nReceived: from DB7PR04MB5452.eurprd04.prod.outlook.com (2603:10a6:10:84::21) by DB3PR0402MB3675.eurprd04.prod.outlook.com (2603:10a6:8:b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.25; Sat, 22 Aug 2020 10:42:47 +0000<br>\r\nReceived: from DB7PR04MB5452.eurprd04.prod.outlook.com ([fe80::68d6:8bce:f15e:183b]) by DB7PR04MB5452.eurprd04.prod.outlook.com ([fe80::68d6:8bce:f15e:183b%6]) with mapi id 15.20.3305.024; Sat, 22 Aug 2020 10:42:47 +0000<br>\r\nFrom: BLANCHET Ayoub &lt;ayoub.blanchet@epsi.fr&gt;<br>\r\nTo: &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\r\nSubject: =?iso-8859-1?Q?_CANDIDATURE_Alternance_=E9diteur_logiciel_SaaS?=<br>\r\nThread-Topic: =?iso-8859-1?Q?_CANDIDATURE_Alternance_=E9diteur_logiciel_SaaS?=<br>\r\nThread-Index: AdZ4cHw+shbBlTd5QPeOPVRKlrfx1A==<br>\r\nDate: Sat, 22 Aug 2020 10:42:47 +0000<br>\r\nMessage-ID: &lt;DB7PR04MB5452C9B5137F07CDD68815E09A580@DB7PR04MB5452.eurprd04.prod.outlook.com&gt;<br>\r\nAccept-Language: fr-FR, en-US<br>\r\nContent-Language: fr-FR<br>\r\nX-MS-Has-Attach: yes<br>\r\nX-MS-TNEF-Correlator: <br>\r\nauthentication-results: nltechno.com; dkim=none (message not signed) header.d=none;nltechno.com; dmarc=none action=none header.from=epsi.fr;<br>\r\nx-originating-ip: [2001:861:310a:8af0:514a:5731:803a:9a09]<br>\r\nx-ms-publictraffictype: Email<br>\r\nx-ms-office365-filtering-correlation-id: fc202f91-9915-4918-36a6-08d846881c65<br>\r\nx-ms-traffictypediagnostic: DB3PR0402MB3675:<br>\r\nx-microsoft-antispam-prvs: &lt;DB3PR0402MB3675A56082E1102B7B0040139A580@DB3PR0402MB3675.eurprd04.prod.outlook.com&gt;<br>\r\nx-ms-oob-tlc-oobclassifiers: OLM:152;<br>\r\nx-ms-exchange-senderadcheck: 1<br>\r\nx-microsoft-antispam: BCL:0;<br>\r\nx-microsoft-antispam-message-info: GMlh+iLAVhsQMP45sJi9qKcu2S8oyShIvQ+lTfkn3lnRqqd7BEtQ3x8ftLHXUmD8KjCyvRA+tOQBA3+IPHaB7Jj2vA9bI45KxARtSitBM7M1UEYnU+5UGovVWLZQ2kUA1hDVjBTFl1Y7ItiTT8imWSfHv+JJQTmiPcrk6sn0gT6NbpS0x+1O+yelyhN7DXisuoJB2H/1Vl1gBc7IwPh9w5psla/w6Y+O6cQcTBkHk5O6+zgCBcIUGmlbAGK9mMR/00duxsG5q8XIJDAoT35wzCSgD0UneRnHxRDpcx3KYFWn1xpdYlDtGCl23pjX0bmQuEKACsfLKzQaJitzUS1VvtHO2ty1T6QhiYOaWzsbvlCKdGH6ifn9EfKxuuyRaUQfanrc/LaO5HmOq/yQG56g/g==<br>\r\nx-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:fr;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB7PR04MB5452.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(39840400004)(346002)(376002)(366004)(396003)(136003)(786003)(99936003)(4744005)(71200400001)(6916009)(5660300002)(8936002)(7696005)(478600001)(66946007)(66476007)(66446008)(9686003)(66556008)(316002)(66576008)(55016002)(6506007)(2906002)(166002)(186003)(76116006)(33656002)(52536014)(224303003)(64756008)(86362001);DIR:OUT;SFP:1101;<br>\r\nx-ms-exchange-antispam-messagedata: vnSOPPhCJEHnJWBOI1MwxmEwyxXA5ssLewasQfbjKd4DsizfFPH1318Bxp1rq7y4Rx7YiwaQRqSoAegr7qOQjiSHvvYxfy+3JSBDvR72aoYtf7fZy0Y15U68OUZc+iKy4ihS+9D70FzuHMF7Kho3SqePPYm3hwqUKRq0awITgv/ONyu+AWVTEQCgAPO9j7VPplJN58WUmc2FodHUQp8kMkTstDtkg78bMKA1EHm/4IHHwnhEai9/YgeeP+Rfa8kQB1qQBC24A9E+CoSBMhi7Q3pcr5uOEguHMsZM4yRGgM3TifVuFOB6oiaUGF9xC89nMxG96tdjbj+XCZ27bot/CG38dq964XDmLtfrRB5DRZ0yyr3HjQWqHyUFr3F77EI3RSlnKkdB7+BkI65hNIURkLFHVKOfXAiX/XvOM9U5xLKb55ltTwCgN3nUHBLsVY+SnXiK2VcC4rRH1GcytuLFT9D1UyG/OlZySywLHC6WxMgjniacqdmchWecpokMwX60F9/7d9w1kLQaQmmbzY5YGzSga8xR+yvGIXNogTk7hRh0VppcS0H9ALYZb86jp9zfQ5+UgD10+KVVHAS0nAzs7QTnBq1p0b/H5SDs+DwY9akhwh5P/JR0uuLt/FRgUAhTBPE85mTZvkMl+JFMpqmMZU4P3nfO5cRBdeMKy9lKFSVt+4K/A/M7lct+jeYsKUmMXHiUB8Oft31rT/coFMPkbg==<br>\r\nx-ms-exchange-transport-forked: True<br>\r\nContent-Type: multipart/mixed; boundary=&quot;_011_DB7PR04MB5452C9B5137F07CDD68815E09A580DB7PR04MB5452eurp_&quot;<br>\r\nMIME-Version: 1.0<br>\r\nX-OriginatorOrg: epsi.fr<br>\r\nX-MS-Exchange-CrossTenant-AuthAs: Internal<br>\r\nX-MS-Exchange-CrossTenant-AuthSource: DB7PR04MB5452.eurprd04.prod.outlook.com<br>\r\nX-MS-Exchange-CrossTenant-Network-Message-Id: fc202f91-9915-4918-36a6-08d846881c65<br>\r\nX-MS-Exchange-CrossTenant-originalarrivaltime: 22 Aug 2020 10:42:47.7317 (UTC)<br>\r\nX-MS-Exchange-CrossTenant-fromentityheader: Hosted<br>\r\nX-MS-Exchange-CrossTenant-id: b6e77e52-65f6-4dec-b7d9-8e45f36a536f<br>\r\nX-MS-Exchange-CrossTenant-mailboxtype: HOSTED<br>\r\nX-MS-Exchange-CrossTenant-userprincipalname: KYboRYOf/zm/QYoNPpbygrYouTzj/DI+rcp+lKjfeS04l7DKPIVUCfc47YyhxIh4abCDZBJzPbaItucbMx11Ww==<br>\r\nX-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0402MB3675 ','2020-08-22 12:42:49','2020-08-25 09:51:51',12,12,NULL,NULL,1,'','BLANCHET Ayoub','ayoub.blanchet@epsi.fr','',NULL,NULL,NULL,'DB7PR04MB5452C9B5137F07CDD68815E09A580@DB7PR04MB5452.eurprd04.prod.outlook.com',1,NULL),(94,2,'(PROV94)','Bonjour,\r\n\r\n\r\n\r\nPréparant un Titre d\'architecte logiciel développeur d\'applications, je viens vers vous par la présente dans le cadre de ma recherche d\'alternance en développement web 3 jours entreprise/ 2 jours école pour une durée de 1 à 2 ans.\r\n\r\n\r\n\r\nTitulaire d\'une licence professionnelle en télécommunication et en informatique spécialité réseau télécoms, et d\'un Titre de Responsable Projet Web & Mobile (en cours d\'obtention), je me permets de vous envoyer ma candidature pour le poste d\'alternant développeur web.\r\n\r\n\r\n\r\nMon parcours, complété par ma passion pour internet et l\'informatique, m\'a permis d\'acquérir les connaissances techniques et pratiques indispensables à l\'exercice de ce métier.\r\n\r\nje désire acquérir de nouvelles compétences en développement web au sein de votre entreprise.\r\n\r\n\r\n\r\nMa forte motivation, ma capacité d\'adaptation et mon potentiel sont d\'autres atouts qui seront bénéfiques au développement de votre entreprise. Je suis quelqu\'un d’autonome, persévérant et j\'aime travailler en équipe. Et mon grand intérêt dans le développement web est une grande source de motivation !\r\n\r\n\r\n\r\nJe reste à votre entière disposition pour vous détailler plus en avant mes motivations.\r\n\r\nDans l\'attente d\'une réponse de votre part, je vous prie de croire, Madame, Monsieur, en ma\r\n\r\nconsidération distinguée.\r\n\r\n\r\nKarim Badji\r\n\r\nEtudiant EPITECH Bordeaux\r\n\r\nkarim.badji@epitech.eu\r\n\r\n07 66 63 42 23',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Candidature Alternant d&eacute;veloppeur web<br>\n&Eacute;metteur (From) : Karim Badji &lt;karim.badji@epitech.eu&gt;<br>\nDestinataire(s) (To) : &quot;job+2@nltechno.com&quot; &lt;job+2@nltechno.com&gt;<br>\n-----<br>\nBonjour,<br>\r\n<br>\r\n<br>\r\n<br>\r\nPréparant un Titre d\'architecte logiciel développeur d\'applications, je viens vers vous par la présente dans le cadre de ma recherche d\'alternance en développement web 3 jours entreprise/ 2 jours école pour une durée de 1 à 2 ans.<br>\r\n<br>\r\n<br>\r\n<br>\r\nTitulaire d\'une licence professionnelle en télécommunication et en informatique spécialité réseau télécoms, et d\'un Titre de Responsable Projet Web &amp; Mobile (en cours d\'obtention), je me permets de vous envoyer ma candidature pour le poste d\'alternant développeur web.<br>\r\n<br>\r\n<br>\r\n<br>\r\nMon parcours, complété par ma passion pour internet et l\'informatique, m\'a permis d\'acquérir les connaissances techniques et pratiques indispensables à l\'exercice de ce métier.<br>\r\n<br>\r\nje désire acquérir de nouvelles compétences en développement web au sein de votre entreprise.<br>\r\n<br>\r\n<br>\r\n<br>\r\nMa forte motivation, ma capacité d\'adaptation et mon potentiel sont d\'autres atouts qui seront bénéfiques au développement de votre entreprise. Je suis quelqu\'un d’autonome, persévérant et j\'aime travailler en équipe. Et mon grand intérêt dans le développement web est une grande source de motivation !<br>\r\n<br>\r\n<br>\r\n<br>\r\nJe reste à votre entière disposition pour vous détailler plus en avant mes motivations.<br>\r\n<br>\r\nDans l\'attente d\'une réponse de votre part, je vous prie de croire, Madame, Monsieur, en ma<br>\r\n<br>\r\nconsidération distinguée.<br>\r\n<br>\r\n<br>\r\nKarim Badji<br>\r\n<br>\r\nEtudiant EPITECH Bordeaux<br>\r\n<br>\r\nkarim.badji@epitech.eu<br>\r\n<br>\r\n07 66 63 42 23<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job+2@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp2444972jal; Mon, 24 Aug 2020 05:34:07 -0700 (PDT)<br>\r\nX-Google-Smtp-Source: ABdhPJzE405lKynt7t5gfwgdPFeJdefBHcNy1NLpIK/9mzPTQMXF5Sv/Dp2ffWw4wXcZ9qI2BEds<br>\r\nX-Received: by 2002:adf:fe50:: with SMTP id m16mr5930358wrs.27.1598272447247; Mon, 24 Aug 2020 05:34:07 -0700 (PDT)<br>\r\nARC-Seal: i=2; a=rsa-sha256; t=1598272447; cv=pass; d=google.com; s=arc-20160816; b=h3qQh7sY6za/7pdO6M0ES5OZVOeLvoGlcdHFlxAZ7RzaCKNhk4R0A8Kcdhf3pfTs5v YVRBJTrRN9e+UJ+e3DcHYXMDiWg7Gz/YThY3SQjTnZvP6gfyEp/fqV8buAhJY5Qt+Q9q adEsbfbFznu3whNjTWXtX7ISwYYhT5so0J6Mo/BBWrAuyOowm0muzyVnainXMhql1CVC odpSrwztEQ8LBAghsdQAL2yZgOakvL6Yoc+d+vJOhLdM8tBOnQXThH9S+hvhtPITRJ7M rxYfL/Pen6OEsakVEbTI/wtAOPVaRGJT3yoqadpgIfDDg8LyxTH6iZXNIT/CyQzJq4fQ 92ZA==<br>\r\nARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-language:accept-language:in-reply-to :references:message-id:date:thread-index:thread-topic:subject:to :from:dkim-signature; bh=lzm4CR5VpYkOobNeuSOfZiV+2HtwEbytXvf9pEk5Z0Y=; b=LCLe5TjJCaX9WBQWNdjPbKJ0hI4SSd9nikfS7lywEAszJZOH3/rSd6NyknAyKY747A CCr8hfB2qJjBMEQ30abRVVKBLsLYdvqKOXTS/V4tApNO2g38oXQwcDQJDHNS7O4ISLjW csZcDGDL/VnHQCGnmYckz/OJP/BDZfFS1owutrsE2XWMHapUuFAspabiwGeMpoAxnuxT 6XtD4uzq83aw43Mw3ReRpDfkjD/W54MioQWg2803XnrqPPEA0zA/XwW6dgCaCdor85ZU Ddf9hUdHIamk3I1osBCC7N5sGVPyy0mUonFfYmgrsOzu6oZfypcPPihzOnBjcvkX0O74 o+vA==<br>\r\nARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@epitechfr.onmicrosoft.com header.s=selector2-epitechfr-onmicrosoft-com header.b=W54U5MsG; arc=pass (i=1 spf=pass spfdomain=epitech.eu dkim=pass dkdomain=epitech.eu dmarc=pass fromdomain=epitech.eu); spf=pass (google.com: domain of karim.badji@epitech.eu designates 40.107.0.104 as permitted sender) smtp.mailfrom=karim.badji@epitech.eu<br>\r\nReturn-Path: &lt;karim.badji@epitech.eu&gt;<br>\r\nReceived: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00104.outbound.protection.outlook.com. [40.107.0.104]) by mx.google.com with ESMTPS id j204si10346674wmj.209.2020.08.24.05.34.06 for &lt;job+2@nltechno.com&gt; (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Aug 2020 05:34:07 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of karim.badji@epitech.eu designates 40.107.0.104 as permitted sender) client-ip=40.107.0.104;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@epitechfr.onmicrosoft.com header.s=selector2-epitechfr-onmicrosoft-com header.b=W54U5MsG; arc=pass (i=1 spf=pass spfdomain=epitech.eu dkim=pass dkdomain=epitech.eu dmarc=pass fromdomain=epitech.eu); spf=pass (google.com: domain of karim.badji@epitech.eu designates 40.107.0.104 as permitted sender) smtp.mailfrom=karim.badji@epitech.eu<br>\r\nARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hqdRGxz5GUUvLDVSz40QxfBFs7jwfemQj+4u2GAq/DSmTJi0kFEmKNHDvtXdKpcNF8Kk0VYoPFP/qg3niY7CAkRI3AzjDVN2kQ86gFkJldefT6mHUz2sodOBb7GTpzm+WQQJaz1OwIb0SvfJ9+56eXWlohulQ/pKzQRMSPEPDx0i759UqsVR/c9gfgbtu7xQvPJfUxcgPEALBqh0IsK7dLGaOgDdCZuL8QjxVjp3xzPXCS4YNlAJ9Q3FWdEu+l6L1ts4ZS/cI0lGK/ODJzMpSkErxrteKVJvp67+3fz8HJMuMtPVNB2l/w6Y4jF2dqOXEQiSF7/as2W1762uLJl3Rw==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lzm4CR5VpYkOobNeuSOfZiV+2HtwEbytXvf9pEk5Z0Y=; b=ipcKOD0xgtskjcCS+TAEfO8u8y/ISRRDzi876yGtZJ4tJUcejE/K6AJ8+WeJHG9ZlNzcO/T/G03OdC6Wcz3Y4sZHII7jaJh2SXphtDFqPWXpHnBXzr3g2bUwbbQCzui2O0PI1ggIbcq9vy2ZJOKVkeEcZmpYAkvFlrHMpeDiqOX6qnQ/plueaXU5ZzuQOX2FDSmLri2oEMUhLsBahQnxBXQ1+XL2x8/ypQ95SI+Kk41R+22HGnPaT0IZ9Ug5MjdWj7U3YMKsvMtCrwPiVKbxdXgQenxqBNs/LCkYnto6GVsYy/ntx25/21ZmDc8wZQutm2pxsjDldwRtC2YwueOZ7g==<br>\r\nARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epitech.eu; dmarc=pass action=none header.from=epitech.eu; dkim=pass header.d=epitech.eu; arc=none<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=epitechfr.onmicrosoft.com; s=selector2-epitechfr-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lzm4CR5VpYkOobNeuSOfZiV+2HtwEbytXvf9pEk5Z0Y=; b=W54U5MsGnB4bONV0gkMzBWYmTs0vuedgoEwRlWU0e6wCqp4DCjdtYuCcbolqBVWmrN0ikcQyPvxuWmhlTKwBL1RLCOaA8vzlAa4MkGmYG+s7mvD6JL7U71NYQwW+nFXuw/PTPyj1L8RjDpGZ/KVJ28s8UqArvWZjViiD56VKsPY=<br>\r\nReceived: from VE1PR02MB5711.eurprd02.prod.outlook.com (2603:10a6:803:115::29) by VE1PR02MB5406.eurprd02.prod.outlook.com (2603:10a6:803:110::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.25; Mon, 24 Aug 2020 12:34:03 +0000<br>\r\nReceived: from VE1PR02MB5711.eurprd02.prod.outlook.com ([fe80::a471:e63b:4681:361c]) by VE1PR02MB5711.eurprd02.prod.outlook.com ([fe80::a471:e63b:4681:361c%3]) with mapi id 15.20.3305.026; Mon, 24 Aug 2020 12:34:03 +0000<br>\r\nFrom: Karim Badji &lt;karim.badji@epitech.eu&gt;<br>\r\nTo: &quot;job+2@nltechno.com&quot; &lt;job+2@nltechno.com&gt;<br>\r\nSubject: =?Windows-1252?Q?Candidature_Alternant_d=E9veloppeur_web?=<br>\r\nThread-Topic: =?Windows-1252?Q?Candidature_Alternant_d=E9veloppeur_web?=<br>\r\nThread-Index: AQHWehJUoAV/VWj6r0qS8OSYflfTTalHMWY4<br>\r\nDate: Mon, 24 Aug 2020 12:34:03 +0000<br>\r\nMessage-ID: &lt;VE1PR02MB571178D32658BC852DD4B4B894560@VE1PR02MB5711.eurprd02.prod.outlook.com&gt;<br>\r\nReferences: &lt;VE1PR02MB5711CCC6AEC2C003D0F3A30B94560@VE1PR02MB5711.eurprd02.prod.outlook.com&gt;<br>\r\nIn-Reply-To: &lt;VE1PR02MB5711CCC6AEC2C003D0F3A30B94560@VE1PR02MB5711.eurprd02.prod.outlook.com&gt;<br>\r\nAccept-Language: fr-FR, en-US<br>\r\nContent-Language: fr-FR<br>\r\nX-MS-Has-Attach: yes<br>\r\nX-MS-TNEF-Correlator: <br>\r\nauthentication-results: nltechno.com; dkim=none (message not signed) header.d=none;nltechno.com; dmarc=none action=none header.from=epitech.eu;<br>\r\nx-originating-ip: [2a01:cb19:3c8:a300:5a35:9591:b420:594f]<br>\r\nx-ms-publictraffictype: Email<br>\r\nx-ms-office365-filtering-correlation-id: 4fd08f28-8913-432a-cc88-08d84829fc2b<br>\r\nx-ms-traffictypediagnostic: VE1PR02MB5406:<br>\r\nx-microsoft-antispam-prvs: &lt;VE1PR02MB5406514BF91EDB588F42742594560@VE1PR02MB5406.eurprd02.prod.outlook.com&gt;<br>\r\nx-ms-oob-tlc-oobclassifiers: OLM:2;<br>\r\nx-ms-exchange-senderadcheck: 1<br>\r\nx-microsoft-antispam: BCL:0;<br>\r\nx-microsoft-antispam-message-info: yfrhq/4r/ycbN1XlE8s7FwHW/pd03ZiYZl05EMBT6B7/bLtLceWfgW/E2XAhDFR8Lt7rQI8z94Wet8rNsHUClKpgUCOaNwnI+XejW7r9eRscQOETZWatFsfjAhb5+AqIAxHMG6QoNUUWcjMFupx5nYa1dzTKrmr2ku5Sm/RgK6CuGVsOoUXY1nNvexELZsPn4c8tOgH8Y07N3NqsQyrdzcg+gtwa0lzFrIOVqwY8NOr96oqjSXXSLeyx7aUcHOmalGo93Xvc04V39cOXxwAyLH69iiMvSF/Yb+uoi6tWUt7zry0Mip1uQwzq5S7S033vgpY6IM4ZkRXX8rIOEJYs2g==<br>\r\nx-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:fr;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR02MB5711.eurprd02.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(136003)(366004)(396003)(39850400004)(346002)(376002)(8936002)(5660300002)(6506007)(186003)(52536014)(9686003)(55016002)(2906002)(44832011)(33656002)(76116006)(64756008)(66446008)(7696005)(66616009)(66946007)(66556008)(66476007)(91956017)(66574015)(19627405001)(478600001)(224303003)(316002)(786003)(2940100002)(86362001)(71200400001)(99936003);DIR:OUT;SFP:1102;<br>\r\nx-ms-exchange-antispam-messagedata: 0Aal3puoHF/ZWErHGxSyYT6on7DR71zLQYa8X2Co0TkJ8cYeUfWuSGm39YuDFDJ8o498byDKHrPR0Rc6erxhx3ARAYeSxwOObx49+xQi7+tQVlmohzS5zCvOE4K8hSWsUf5U2hzUZlyEihCZGFszNgjjShdki+WUkcaNaDefLYwulX6Uo1iMyoLugKcc4VDjFhZ5Q49uWKR62iZ2gjE1YUphJetMlyU5SGCtwFhHu+xcoJ5fI79UC6s5OMUMWuG63Ko0v0BBdZPLbwdooGHbAjyWlA953uB5rSzYbSNOZlnHAGo4UziKI6sTKoKqPayFfml6hWgRNQhBus0s6NSDENq0fQpNOj2Wox9EbYRvUKxsaqTPMQC7XCXCKuYyswV0XW+j+WZVOx/m+nD9Dt/qgOnu9D79MbFQFa67xjosYSrJ51d9giJtk27M5EZc5a8M7fIuicRz/iNaBM8KF7dAIMkTekTbd4PCfGJ4XJ8dEG7TNsn/hApd9bbQXORE3XUoveZcissnGgJjX1GsbdeqCifIjore6MrvX8zx2DHfeR5qltoTOmaECMHSmbqDAD21LWImRkUk/lyBHxIavLNUFRJE7iqveLI+Ng7QNokdkpiRtTMQmLwsOHi5aq60lnSjA9eQosWXU2vnH3N7G/vdubfL1ufmklJ6E52+pirCRCU5BsPFt9yjsFdYCwIubPLsl3OROcF3BkQR4V2A6OC5Qw==<br>\r\nx-ms-exchange-transport-forked: True<br>\r\nContent-Type: multipart/mixed; boundary=&quot;_004_VE1PR02MB571178D32658BC852DD4B4B894560VE1PR02MB5711eurp_&quot;<br>\r\nMIME-Version: 1.0<br>\r\nX-OriginatorOrg: epitech.eu<br>\r\nX-MS-Exchange-CrossTenant-AuthAs: Internal<br>\r\nX-MS-Exchange-CrossTenant-AuthSource: VE1PR02MB5711.eurprd02.prod.outlook.com<br>\r\nX-MS-Exchange-CrossTenant-Network-Message-Id: 4fd08f28-8913-432a-cc88-08d84829fc2b<br>\r\nX-MS-Exchange-CrossTenant-originalarrivaltime: 24 Aug 2020 12:34:03.3253 (UTC)<br>\r\nX-MS-Exchange-CrossTenant-fromentityheader: Hosted<br>\r\nX-MS-Exchange-CrossTenant-id: 901cb4ca-b862-4029-9306-e5cd0f6d9f86<br>\r\nX-MS-Exchange-CrossTenant-mailboxtype: HOSTED<br>\r\nX-MS-Exchange-CrossTenant-userprincipalname: a7hOGAZXKm2rNCYEwL7fvNcr5mTTrzkB08MTqOcTrdsVLgujoHuvMJoZWT8ci3soKlUjhACS5XCCUj76gdclLQ==<br>\r\nX-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR02MB5406 ','2020-08-24 14:34:07','2020-08-24 18:38:56',12,NULL,NULL,NULL,0,NULL,'Karim Badji','karim.badji@epitech.eu',NULL,NULL,NULL,NULL,'VE1PR02MB571178D32658BC852DD4B4B894560@VE1PR02MB5711.eurprd02.prod.outlook.com',1,NULL),(95,NULL,'JOC2008-0004','Bonjour monsieur,<br />\r\n<br />\r\nJe me pr&eacute;sente NDONG NZE MICHONET Marc T&eacute;rence.<br />\r\nSuite &agrave; une annonce qui a attir&eacute; mon attention, stipulant que vous recherchez un d&eacute;veloppeur PHP en alternance.<br />\r\nJe me suis permis de contacter, nous avons pu &eacute;changer rapidement au t&eacute;l&eacute;phone et vous m&#39;avez fait comprendre qu&#39;un autre poste en tant que administrateur syst&egrave;me et d&eacute;veloppeur PHP est aussi &agrave; pourvoir.<br />\r\nEtant en derni&egrave;re ann&eacute;e les missions propos&eacute;s couvrent l&#39;ensemble des comp&eacute;tences &agrave; avoir pour la validation de cette ann&eacute;e, ainsi que la polyvalence des taches de travaille touchant &agrave; du front-end, du back-end, de l&#39;infrastructure IT et au d&eacute;ploiement m&#39;int&eacute;resse.<br />\r\n<br />\r\nJe me permets de vous adresser ce mail pour les postes &agrave; pourvoir.<br />\r\n<br />\r\nCi-joint :<br />\r\n<br />\r\n- CV<br />\r\n- Lettre de motivation<br />\r\n<br />\r\nVous souhaitant bonne r&eacute;ception.<br />\r\n<br />\r\nCordialement.<br />\r\n<br />\r\nNDONG NZE MICHONET Marc T&eacute;rence.',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Poste &agrave; pourvoir <br>\n&Eacute;metteur (From) : NDONG NZE MICHONET Marc T&eacute;rence &lt;m.ndongnzemichonet@epsi.fr&gt;<br>\nDestinataire(s) (To) : &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\n-----<br>\nBonjour monsieur,<br>\r\n<br>\r\nJe me présente NDONG NZE MICHONET Marc Térence.<br>\r\nSuite à une annonce qui a attiré mon attention, stipulant que vous recherchez un développeur PHP en alternance.<br>\r\nJe me suis permis de contacter, nous avons pu échanger rapidement au téléphone et vous m\'avez fait comprendre qu\'un autre poste en tant que administrateur système et développeur PHP est aussi à pourvoir.<br>\r\nEtant en dernière année les missions proposés couvrent l\'ensemble des compétences à avoir pour la validation de cette année, ainsi que la polyvalence des taches de travaille touchant à du front-end, du back-end, de l\'infrastructure IT et au déploiement m\'intéresse.<br>\r\n<br>\r\nJe me permets de vous adresser ce mail pour les postes à pourvoir.<br>\r\n<br>\r\nCi-joint :<br>\r\n<br>\r\n- CV<br>\r\n- Lettre de motivation<br>\r\n<br>\r\nVous souhaitant bonne réception.<br>\r\n<br>\r\nCordialement.<br>\r\n<br>\r\nNDONG NZE MICHONET Marc Térence.<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp2468967jal; Mon, 24 Aug 2020 06:11:35 -0700 (PDT)<br>\r\nX-Google-Smtp-Source: ABdhPJy+y9DYPuVOOo4tvngUrmBKC1sOo0EQq3nugAqyVrn8f9BCa6wE7CuVNAyOSgeRYkbSLmgE<br>\r\nX-Received: by 2002:a05:6402:156:: with SMTP id s22mr5162829edu.372.1598274694655; Mon, 24 Aug 2020 06:11:34 -0700 (PDT)<br>\r\nARC-Seal: i=2; a=rsa-sha256; t=1598274694; cv=pass; d=google.com; s=arc-20160816; b=E8SSMEdPidkVLL/qfixAL5Dg8pvbNSyfUi3dKo58uQ+XNiMeeCNGc2+cU8VFOj+bfp fMxSbbzjeDYK12/J3Q8MPn8EFxbkBx6hA2lPmoQPpZGlyZxwczdV5HbKL2ndawJXNk7S 9dL6QMUGWJ75aw8Utpyzbohl4359Nxfs6JKIYVch6CN0ZqyQAlzWBim4n61i54BDUC0B qmxiu3KSZHAzUJfBh7trpE0pk1NqneS4t9HTEQvehVRWsP+OtXy+lJUVC1TKtE2rIjCX 8ihSVi71LT0nZCb6zCwQeL5X9rkM1EViagx6hgH4csiD7u0w5ax/ZzZ//RxqNtrOd4YP U2Kg==<br>\r\nARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-language:accept-language:message-id:date :thread-index:thread-topic:subject:to:from:dkim-signature; bh=zD7C3LOHA5LXp+E+tH4Jb5Kgvyf/byKqD3qch3BDkwA=; b=fVZCLJ4HNcQqA5UVTsalIcoJ5+1zcYvIEm6RaqkY4f28ag5M06UmqrVWGUddaFkXIn R34xcXzaZmAdr+GH5OogDAxPYbCzY4xd0XWpX7PB/kjY5aCjt6MDFKAClQybG7hk8Mex u94KVUt44BlPXvv3V5VwwYRqRa4pf0oBfZDl1cr0rOualVaOLK3dvfJHjnc98AccXhes 1lBHeeaGQo4YMdzOM9GWwg29MOw9I1crAaNh66nPszaN6mwjdbU7pds5WsOWC/7wO381 TafhmmnOolsu2DSWbRlh+K7I0V4WsZThfTRoZ0d1ikJ2/0DPNt9xe2TtOqHnmqE4eymV fotg==<br>\r\nARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=ZiIJFO14; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of m.ndongnzemichonet@epsi.fr designates 40.107.22.41 as permitted sender) smtp.mailfrom=m.ndongnzemichonet@epsi.fr<br>\r\nReturn-Path: &lt;m.ndongnzemichonet@epsi.fr&gt;<br>\r\nReceived: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2041.outbound.protection.outlook.com. [40.107.22.41]) by mx.google.com with ESMTPS id dn4si1175379ejc.98.2020.08.24.06.11.34 for &lt;job@nltechno.com&gt; (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Aug 2020 06:11:34 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of m.ndongnzemichonet@epsi.fr designates 40.107.22.41 as permitted sender) client-ip=40.107.22.41;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=ZiIJFO14; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of m.ndongnzemichonet@epsi.fr designates 40.107.22.41 as permitted sender) smtp.mailfrom=m.ndongnzemichonet@epsi.fr<br>\r\nARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SDS3+YQCGi5O14jCZXXOlx7a+1w0/XEnWSptZEj9nFhDiZrbFTwZc9LnzvTECbxZPx7YNJHsWpHu85PmVQpoP+zbJDRH471A52Q3MxXodUeuNhi2rltMBC79aqFaoYhLUy4tD8EH4j8HLVJa/Dnu/xV0JxheXVWrVQsCtjxOI4hPADgl9rnCizP1muW5x7A32c3e/6j6Xmy7+W+365vcvy7fRM3Qx9h0YMC1hgKOZ3UQosN5WFYwNgchg5rsLlTwlaHy5eMg1uvRHCzUloxhGOXO0aI5PHU5ahZfaz7r9rHk3dPAfYeh7Krh+TocQ246/NSt74LlnaGBITLJAAlKNA==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zD7C3LOHA5LXp+E+tH4Jb5Kgvyf/byKqD3qch3BDkwA=; b=IJhxuowTGiLyj7xINn57WE6MUY7I2VlUVl9dQo9v9nhro4N2gCUzq/n4kqMzirbNxAIEp4mKLcmCqmWn8LB6ZXIc0+OOyjYjnkZqR04ZJJG1OveLcspzwycLRF7EE/fyEcE8Jm2CaJjwHb+zxdx/iiN2tpR/7IkrXWw5wMDbRDTfz0wA3JdIAsHsAUtGM0770l1dTs+zMBe1pyUzdE/Uyz+WSQorUNzpuPzcBEaYKo5n2jKsWHlKaDY9X31Ww1kgjsaCA/3zGyojl4J9i6agdflN6Y0mX2ZW2x6BYqKm/kRR8lIdGZ04286fxug52MR00W4ht8p4r9OYJwftyAB+5w==<br>\r\nARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epsi.fr; dmarc=pass action=none header.from=epsi.fr; dkim=pass header.d=epsi.fr; arc=none<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ifagparis.onmicrosoft.com; s=selector2-ifagparis-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zD7C3LOHA5LXp+E+tH4Jb5Kgvyf/byKqD3qch3BDkwA=; b=ZiIJFO14LuMW+mAdtpElD46iNKdHTzDbheoTC9Finy1SfnpgxfLAN3e2G0lWZkmlghLuYiwdkO52q8MaFcuc//BxksIk6KgP3xd+Db/yWv/7eFyam+T59hy/UmayisEFHAF2HWfip/dBANKZiZol4/Qw3Cb2Np6ZIGQTxx5K34w=<br>\r\nReceived: from AM0PR04MB6241.eurprd04.prod.outlook.com (2603:10a6:208:139::12) by AM0PR04MB6708.eurprd04.prod.outlook.com (2603:10a6:208:178::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.24; Mon, 24 Aug 2020 13:11:32 +0000<br>\r\nReceived: from AM0PR04MB6241.eurprd04.prod.outlook.com ([fe80::85dc:144b:69d2:107f]) by AM0PR04MB6241.eurprd04.prod.outlook.com ([fe80::85dc:144b:69d2:107f%5]) with mapi id 15.20.3305.026; Mon, 24 Aug 2020 13:11:32 +0000<br>\r\nFrom: =?iso-8859-1?Q?NDONG_NZE_MICHONET_Marc_T=E9rence?= &lt;m.ndongnzemichonet@epsi.fr&gt;<br>\r\nTo: &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\r\nSubject: =?iso-8859-1?Q?Poste_=E0_pourvoir_?=<br>\r\nThread-Topic: =?iso-8859-1?Q?Poste_=E0_pourvoir_?=<br>\r\nThread-Index: AQHWehQ2IPjiSeMpVUCtwpI5x1AOJQ==<br>\r\nDate: Mon, 24 Aug 2020 13:11:32 +0000<br>\r\nMessage-ID: &lt;AM0PR04MB6241FBF386642A12D1BD07278E560@AM0PR04MB6241.eurprd04.prod.outlook.com&gt;<br>\r\nAccept-Language: fr-FR, en-US<br>\r\nContent-Language: fr-FR<br>\r\nX-MS-Has-Attach: yes<br>\r\nX-MS-TNEF-Correlator: <br>\r\nauthentication-results: nltechno.com; dkim=none (message not signed) header.d=none;nltechno.com; dmarc=none action=none header.from=epsi.fr;<br>\r\nx-originating-ip: [86.213.13.253]<br>\r\nx-ms-publictraffictype: Email<br>\r\nx-ms-office365-filtering-correlation-id: 584322a5-4015-4fe4-5850-08d8482f38c2<br>\r\nx-ms-traffictypediagnostic: AM0PR04MB6708:<br>\r\nx-microsoft-antispam-prvs: &lt;AM0PR04MB6708F61EAD4728494FA51DA68E560@AM0PR04MB6708.eurprd04.prod.outlook.com&gt;<br>\r\nx-ms-oob-tlc-oobclassifiers: OLM:2;<br>\r\nx-ms-exchange-senderadcheck: 1<br>\r\nx-microsoft-antispam: BCL:0;<br>\r\nx-microsoft-antispam-message-info: N80VLtfYKMrEsi+KgPBwu2VvVRvqQG5xzZgCc5nrHm/+it78pOOE8XzAtmIu2ZqNm/EgZ8XzujkzVuQCFn8Cfb7tNr77qKarH1i1QogePWuTYnTiPggFcB7sh3lsOABgy7e8S4YbNdmbbDstBnxnDRgHOuQ0u4Ak7/St95Ck0EYfj9ArjpyIAEsYbSHBOLAOE3SOdkU5iPuXsDiUcjKMEjqd4XHZ1ug4CFfzmDKbEJ8C64u3iHuR5RkDfACZBKh7jI1bqV2t2SHpqLKjZS/pNaCK38gDQY0yXVPYmbQeOe/dgKYR+8AB0mV8E1svW8d6<br>\r\nx-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:fr;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB6241.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(346002)(136003)(376002)(39850400004)(366004)(396003)(8936002)(4744005)(52536014)(7696005)(5660300002)(478600001)(786003)(316002)(19627405001)(224303003)(2906002)(186003)(6506007)(26005)(86362001)(99936003)(66576008)(55016002)(6916009)(71200400001)(33656002)(64756008)(66446008)(66556008)(66476007)(91956017)(4743002)(66946007)(76116006)(9686003)(83380400001);DIR:OUT;SFP:1101;<br>\r\nx-ms-exchange-antispam-messagedata: r4YDNyhgFdlnbTuKjUUthsUWNa9289yaXf0tS7nAiDBA2YQX95hqLZvlkvcmEuhp9q01sFACBgpAD9VwK4xZQAEzcKoAewwnfjEjh7Kf5T1eJMNHk8e+mhNzD3JKbY09/U2RIIk0BUbfxrkT4Mfj/hDRRQ8Fazetfx6z+tYc2pSU/OsRPTLnfd7w4DU5DUmSZIxGht8kXRDPNeHwAjOK8j3DKZEZYrkFnM82keaKQHhnycyhzFobfF5Vnq5iZYlg1ciJipYOD6Bdg52ZkqyDDxnEC0nRXViM16K30j8/uWibMstMd5BKjUMaVVhjnrRi6FVNEnx5F4iicRWCFoY8PCNwBFiFuNbG6yhD+HUnKB3pd3C2KsDIqRSdjn3VJlYDVK7aTkH21saF3SrOq2sLvINDEsnjRVuT1KN/GawduPgsj8ipl05Tpw2YgWmtPi4IqBX54mCYcu3XgSkj0L/NDy4IuJR7T61CCvA3o5DtQW0wr7OCDcG3NcPfHHz6Ma1hRraaJKc7G29F5/0kH4WkyV3KrOxgZx38x0eOy7ocyuN5a/KZnLHmd3wyYXxMmnH87+8EhA9dqKLhgPyMQ63kZghUEDMGgKeBzHtx/OofQOwLcL3jCXabU2iwylGI0zFTFVkJxdaaUlNGs42rIpOYRg==<br>\r\nx-ms-exchange-transport-forked: True<br>\r\nContent-Type: multipart/mixed; boundary=&quot;_005_AM0PR04MB6241FBF386642A12D1BD07278E560AM0PR04MB6241eurp_&quot;<br>\r\nMIME-Version: 1.0<br>\r\nX-OriginatorOrg: epsi.fr<br>\r\nX-MS-Exchange-CrossTenant-AuthAs: Internal<br>\r\nX-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6241.eurprd04.prod.outlook.com<br>\r\nX-MS-Exchange-CrossTenant-Network-Message-Id: 584322a5-4015-4fe4-5850-08d8482f38c2<br>\r\nX-MS-Exchange-CrossTenant-originalarrivaltime: 24 Aug 2020 13:11:32.5019 (UTC)<br>\r\nX-MS-Exchange-CrossTenant-fromentityheader: Hosted<br>\r\nX-MS-Exchange-CrossTenant-id: b6e77e52-65f6-4dec-b7d9-8e45f36a536f<br>\r\nX-MS-Exchange-CrossTenant-mailboxtype: HOSTED<br>\r\nX-MS-Exchange-CrossTenant-userprincipalname: sPRW6+EQtYyMiMlb6k1Hw01owv9KGZEAQW5Yj1Xq3lS0wtdxXHQithrIdPiG9kshDUhQZeU4h3EMnIT2GwhMhhGPCpMzpy3oxteK2cTacUM=<br>\r\nX-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6708 ','2020-08-24 15:11:34','2020-08-25 09:53:32',12,12,NULL,NULL,0,'','NDONG NZE MICHONET Marc Térence','m.ndongnzemichonet@epsi.fr','',NULL,NULL,NULL,'AM0PR04MB6241FBF386642A12D1BD07278E560@AM0PR04MB6241.eurprd04.prod.outlook.com',1,NULL),(96,NULL,'(PROV96)','RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : RE&nbsp;: Offre d\'alternance (Dylan, De muynck / EPSI)<br>\n&Eacute;metteur (From) : <br>\nDestinataire(s) (To) : NLTechno Job department &lt;job@nltechno.com&gt;<br>\n-----<br>\nBonjour,<br>\r\nJe vous envoie ci-joint le CV et la lettre de motivation.<br>\r\n<br>\r\nCordialement,<br>\r\nDylan<br>\r\n<br>\r\nProvenance : Courrier&lt;https://go.microsoft.com/fwlink/?LinkId=550986&gt; pour Windows 10<br>\r\n<br>\r\nDe : NLTechno Job department&lt;mailto:job@nltechno.com&gt;<br>\r\nEnvoyé le :jeudi 27 août 2020 02:17<br>\r\nÀ : DE MUYNCK Dylan 1&lt;mailto:dylan.demuynck1@epsi.fr&gt;<br>\r\nObjet :Re: Offre d\'alternance (Dylan, De muynck / EPSI)<br>\r\n<br>\r\nBonjour Dylan.<br>\r\n<br>\r\nPouvez-vous me transmettre par email un CV et une lettre de motivation ?<br>\r\n<br>\r\n<br>\r\nLaurent Destailleur.<br>\r\nNLTechno - DoliCloud<br>\r\n<br>\r\n<br>\r\nOn Thu, Aug 20, 2020 at 6:30 PM DE MUYNCK Dylan 1 &lt;dylan.demuynck1@epsi.fr&lt;mailto:dylan.demuynck1@epsi.fr&gt;&gt; wrote:<br>\r\n<br>\r\nBonjour,<br>\r\n<br>\r\nJe me présente, Je m’appelle Dylan De muynck, j’ai 22 ans.<br>\r\n<br>\r\nJe suis en seconde année à l’EPSI (Ecole d’ingénieur Informatique) et pour accompagner ma 3e année, je dois effectuer une alternance qui me permettra d’acquérir de l’expérience.<br>\r\n<br>\r\n<br>\r\n<br>\r\nDurant mes deux années de formation, j’ai pu assimiler plusieurs compétences en :<br>\r\n<br>\r\n         Langages informatiques :<br>\r\n<br>\r\n        Linux, SQL, HTML5/CSS3, PHP, Javascript (Bases), C++, C#, Java Android.<br>\r\n<br>\r\nLogiciels :<br>\r\n<br>\r\nSQl Server/MySQL, Visual Studio, Oracle VM VirtualBox, Dbeaver, Modelio, Androi Studio.<br>\r\n<br>\r\n<br>\r\n<br>\r\nSystèmes :<br>\r\n<br>\r\nLinux.<br>\r\n<br>\r\n<br>\r\n<br>\r\nModélisation de bases de données :<br>\r\n<br>\r\nMerise, UML<br>\r\n<br>\r\n<br>\r\n<br>\r\nJe vous contacte pour votre offre d’alternance qui m’intéresse car c’est le domaine que je cherche et mon objectif de demain pour mon futur emploi.<br>\r\n<br>\r\n<br>\r\n<br>\r\nPour me Contacter :<br>\r\n<br>\r\n<br>\r\n·        Mon numéro de portable : 06 42 85 48 96<br>\r\n<br>\r\n<br>\r\n·        Mon Email : Dylan.demuynck1@epsi.fr&lt;mailto:Dylan.demuynck1@epsi.fr&gt;<br>\r\n<br>\r\n<br>\r\n<br>\r\n<br>\r\n<br>\r\nMerci d’avoir pris votre temps pour me lire, en espérant avoir des nouvelles bientôt<br>\r\n<br>\r\n<br>\r\n<br>\r\nCordialement,<br>\r\n<br>\r\nDylan<br>\n<br>\n',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : RE&nbsp;: Offre d\'alternance (Dylan, De muynck / EPSI)<br>\n&Eacute;metteur (From) : <br>\nDestinataire(s) (To) : NLTechno Job department &lt;job@nltechno.com&gt;<br>\n-----<br>\nBonjour,<br>\r\nJe vous envoie ci-joint le CV et la lettre de motivation.<br>\r\n<br>\r\nCordialement,<br>\r\nDylan<br>\r\n<br>\r\nProvenance : Courrier&lt;https://go.microsoft.com/fwlink/?LinkId=550986&gt; pour Windows 10<br>\r\n<br>\r\nDe : NLTechno Job department&lt;mailto:job@nltechno.com&gt;<br>\r\nEnvoyé le :jeudi 27 août 2020 02:17<br>\r\nÀ : DE MUYNCK Dylan 1&lt;mailto:dylan.demuynck1@epsi.fr&gt;<br>\r\nObjet :Re: Offre d\'alternance (Dylan, De muynck / EPSI)<br>\r\n<br>\r\nBonjour Dylan.<br>\r\n<br>\r\nPouvez-vous me transmettre par email un CV et une lettre de motivation ?<br>\r\n<br>\r\n<br>\r\nLaurent Destailleur.<br>\r\nNLTechno - DoliCloud<br>\r\n<br>\r\n<br>\r\nOn Thu, Aug 20, 2020 at 6:30 PM DE MUYNCK Dylan 1 &lt;dylan.demuynck1@epsi.fr&lt;mailto:dylan.demuynck1@epsi.fr&gt;&gt; wrote:<br>\r\n<br>\r\nBonjour,<br>\r\n<br>\r\nJe me présente, Je m’appelle Dylan De muynck, j’ai 22 ans.<br>\r\n<br>\r\nJe suis en seconde année à l’EPSI (Ecole d’ingénieur Informatique) et pour accompagner ma 3e année, je dois effectuer une alternance qui me permettra d’acquérir de l’expérience.<br>\r\n<br>\r\n<br>\r\n<br>\r\nDurant mes deux années de formation, j’ai pu assimiler plusieurs compétences en :<br>\r\n<br>\r\n         Langages informatiques :<br>\r\n<br>\r\n        Linux, SQL, HTML5/CSS3, PHP, Javascript (Bases), C++, C#, Java Android.<br>\r\n<br>\r\nLogiciels :<br>\r\n<br>\r\nSQl Server/MySQL, Visual Studio, Oracle VM VirtualBox, Dbeaver, Modelio, Androi Studio.<br>\r\n<br>\r\n<br>\r\n<br>\r\nSystèmes :<br>\r\n<br>\r\nLinux.<br>\r\n<br>\r\n<br>\r\n<br>\r\nModélisation de bases de données :<br>\r\n<br>\r\nMerise, UML<br>\r\n<br>\r\n<br>\r\n<br>\r\nJe vous contacte pour votre offre d’alternance qui m’intéresse car c’est le domaine que je cherche et mon objectif de demain pour mon futur emploi.<br>\r\n<br>\r\n<br>\r\n<br>\r\nPour me Contacter :<br>\r\n<br>\r\n<br>\r\n·        Mon numéro de portable : 06 42 85 48 96<br>\r\n<br>\r\n<br>\r\n·        Mon Email : Dylan.demuynck1@epsi.fr&lt;mailto:Dylan.demuynck1@epsi.fr&gt;<br>\r\n<br>\r\n<br>\r\n<br>\r\n<br>\r\n<br>\r\nMerci d’avoir pris votre temps pour me lire, en espérant avoir des nouvelles bientôt<br>\r\n<br>\r\n<br>\r\n<br>\r\nCordialement,<br>\r\n<br>\r\nDylan<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp397252jal; Thu, 27 Aug 2020 02:01:40 -0700 (PDT)<br>\r\nX-Google-Smtp-Source: ABdhPJyJb5945YJzfVgRcfbDwNFVJBybWev8meoy+cpZ0+9/RX3ZkfXhUU9os7Jf4B1l00yzZVCE<br>\r\nX-Received: by 2002:a25:d78c:: with SMTP id o134mr25902267ybg.167.1598518900085; Thu, 27 Aug 2020 02:01:40 -0700 (PDT)<br>\r\nARC-Seal: i=2; a=rsa-sha256; t=1598518900; cv=pass; d=google.com; s=arc-20160816; b=JUzsj8VnQEJPB3dyRNrgZHTVy+MXQVe4jxMNqc8BISpir9ZQFV/6DvM8vaBxVIa1w4 FFqzjJmD5nXhPNGL5Co6U4W0KzwiHUAASGmvNkUT/4BJCU6gL0OnR6jbrttAkUTyaGJ8 WCK0nRKPNJ/cNv4sLIu2OfZNCXOKh6qxFynLUTzMZo5BKpWwgZaX1suNGoNIvnIcJzAz sPfS4dwlbwwecb6qkiIXczrS6H7HzaiLlot6ThSqRojVCkyeO51oySPJb8ix9I3uE2bY Q7XXppbWq/o3DqUHrH2KSvD0jLnCJavnXnFsColpAi+jQbFXgh5NjWPDVtv8RXyWCfHu Nkow==<br>\r\nARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-language:accept-language:in-reply-to :references:message-id:date:thread-index:thread-topic:subject:to :from:dkim-signature; bh=cHRgKKJ9te9qCIi5ZNiwZgjfvcXzyKXcZ9AEE3BgVQE=; b=ce9ednCs2jZ2JEUVz8y5GCsOAG/8urbek6VcZAiEZpxeh48/ftb9zIYwRlMmAvVmAt O62RB1Z+Rwt7THio5tr9KbwFdZNzn2j9FbJtl0cQm3sGggd1asA0DOyMg3iMqqcFYxN7 G09x3w/3W+b4KlVC/qIHYQKBGhU+nUaqxXx5A6PTWpoNRenuKCeB65UFkQ8vyagSSe1Y iF6USXB7HllWWaiDyb3HRi5aISBGygsCeyjBq8uMOS2fPOsuK/Hcjw0xdt8lta0mqppW D7nst93t2i2MKW1AnnXls95PYvp/8NN5pefFqsBb8GX9CIDIDsP+7e4w0ACL18BfsXCC iiew==<br>\r\nARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=Orz23JlX; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of dylan.demuynck1@epsi.fr designates 40.107.0.77 as permitted sender) smtp.mailfrom=dylan.demuynck1@epsi.fr<br>\r\nReturn-Path: &lt;dylan.demuynck1@epsi.fr&gt;<br>\r\nReceived: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00077.outbound.protection.outlook.com. [40.107.0.77]) by mx.google.com with ESMTPS id h36si1958638ybj.61.2020.08.27.02.01.39 for &lt;job@nltechno.com&gt; (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Aug 2020 02:01:39 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of dylan.demuynck1@epsi.fr designates 40.107.0.77 as permitted sender) client-ip=40.107.0.77;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=Orz23JlX; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of dylan.demuynck1@epsi.fr designates 40.107.0.77 as permitted sender) smtp.mailfrom=dylan.demuynck1@epsi.fr<br>\r\nARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Meg4IsLUDRCnUWtEVvPwNo70hjynZixRTSSwDU+m8/xB3eDse/K/n4byxo6QyFG0ZNNCL/uoahipzUi+L4omeW/D2P7qPmcturPaewIuTBh/OiuSHHEPCq52jHPcZkNon1W5So8TSlxAkDh0JF+KUnLpgXIv3808uuhL7ehs1IrkcMzhXhuS7JXPEXxFxne46RxdB6bxlpmKWxM0B8gCJbDqgTqZ07Vh6JIzO/4kALDdPE9tiec0c+TjDnSShhZoNJSKY1h6z0OBtk8rLundUWBnw00WaQQ8DzQE5AhILk6KXWqeO32J3tjGBrxTDFhQdcql5xzCRmcJtVdTGBbz4A==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cHRgKKJ9te9qCIi5ZNiwZgjfvcXzyKXcZ9AEE3BgVQE=; b=h1boSQGBKKfCwhy4JwuJbnATBZT7K0f/UaEvbzQe1iAM36SnSPKD1lJe3Nsu0VWm0VYX2TgLMtMlJE7RNidh/A/5EQt/8HAkEH85XuCRCOiB2bkwke5AkZiivt7fTjKB/0nj9ZbvpsDGKhwg3BUikEOBTmBiN3U2S6xz0hZjsuOUB3isQiLadqHGUh2qK9zWcvNaeCKpOAR0MC+SHhxEktlgcqRg4pm36zfPGUM9g5tgetlnJxPnd8O8hCkVNVpI9czmEah6w6n0yW3zVdA68xrIrjqHX7usaQswlkxIltC9hAmycLvoNrVY7w5bkB3GKTz0u73v6ghpuTLQqJZa0w==<br>\r\nARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epsi.fr; dmarc=pass action=none header.from=epsi.fr; dkim=pass header.d=epsi.fr; arc=none<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ifagparis.onmicrosoft.com; s=selector2-ifagparis-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cHRgKKJ9te9qCIi5ZNiwZgjfvcXzyKXcZ9AEE3BgVQE=; b=Orz23JlXEbRDxELGSRDtQWSGp4xpCzfpwx/8USrHdNIFVCF9kU2fNC63IJa6N8Sli+FWPM/g5+cCTZH9EUNO0TvT6PaEDsYeqj8hg2A2PKEJ0lZj6p71t4JwbSS8mVBQ1gHuU0KgrW/WX5vmXTerZ/eaP5wEQ2kwdeBHe6DSZ2Y=<br>\r\nReceived: from AM6PR0402MB3381.eurprd04.prod.outlook.com (2603:10a6:209:9::18) by AM6PR04MB5895.eurprd04.prod.outlook.com (2603:10a6:20b:b0::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3326.19; Thu, 27 Aug 2020 09:01:36 +0000<br>\r\nReceived: from AM6PR0402MB3381.eurprd04.prod.outlook.com ([fe80::c078:abac:2736:3234]) by AM6PR0402MB3381.eurprd04.prod.outlook.com ([fe80::c078:abac:2736:3234%6]) with mapi id 15.20.3326.019; Thu, 27 Aug 2020 09:01:36 +0000<br>\r\nFrom: DE MUYNCK Dylan 1 &lt;dylan.demuynck1@epsi.fr&gt;<br>\r\nTo: NLTechno Job department &lt;job@nltechno.com&gt;<br>\r\nSubject: =?Windows-1252?Q?RE=A0:_Offre_d\'alternance_(Dylan,_De_muynck_/_EPSI)?=<br>\r\nThread-Topic: =?Windows-1252?Q?RE=A0:_Offre_d\'alternance_(Dylan,_De_muynck_/_EPSI)?=<br>\r\nThread-Index: AQHWdw83Va7zuqgzY0SRcaW8NWmoy6lLIKqAgACRoRM=<br>\r\nDate: Thu, 27 Aug 2020 09:01:36 +0000<br>\r\nMessage-ID: &lt;AM6PR0402MB33819AEEEBCB05DF0350CAEAA8550@AM6PR0402MB3381.eurprd04.prod.outlook.com&gt;<br>\r\nReferences: &lt;59f8dccc-bc3a-462a-b9e3-a76846af580e@email.android.com&gt;,&lt;CAL3akH0HVQ0JUk87uY_8Sh_V8MQaV7fXGxUv2-DGY5kL6T9woA@mail.gmail.com&gt;<br>\r\nIn-Reply-To: &lt;CAL3akH0HVQ0JUk87uY_8Sh_V8MQaV7fXGxUv2-DGY5kL6T9woA@mail.gmail.com&gt;<br>\r\nAccept-Language: fr-FR, en-US<br>\r\nContent-Language: fr-FR<br>\r\nX-MS-Has-Attach: yes<br>\r\nX-MS-TNEF-Correlator: <br>\r\nauthentication-results: nltechno.com; dkim=none (message not signed) header.d=none;nltechno.com; dmarc=none action=none header.from=epsi.fr;<br>\r\nx-originating-ip: [77.144.8.217]<br>\r\nx-ms-publictraffictype: Email<br>\r\nx-ms-office365-filtering-correlation-id: 708adcab-bbe4-4e1a-ef9e-08d84a67cdd5<br>\r\nx-ms-traffictypediagnostic: AM6PR04MB5895:<br>\r\nx-microsoft-antispam-prvs: &lt;AM6PR04MB5895DF40D27A92DBBAFEAFB3A8550@AM6PR04MB5895.eurprd04.prod.outlook.com&gt;<br>\r\nx-ms-oob-tlc-oobclassifiers: OLM:1013;<br>\r\nx-ms-exchange-senderadcheck: 1<br>\r\nx-microsoft-antispam: BCL:0;<br>\r\nx-microsoft-antispam-message-info: UpbQ1HENTTRHVkga7TGtQ1mlSx/0hmhnti7UV/3QSGMvl8biV7Y+PjYeVNg2Z1n5FxggwH//1Pr9zkbe323oFizewOTBVDKyjo62vAssd82dZYXjDzIJEa1SWl9P/+fbYG+1owgckH05HxfzlE5cBRH/XH5hHHagkr6yNM0wqYxoeOq5IABrrYD1aIeUd+E+thA1vol/WCogVoI5y4xYYk2eTvDTVSHrl2LfAOeopokX1Up1RHBgq3a19OxekJaOl5tB0/Es5q0uf8pINjf7t5VHsfoIQHnzf5heWQ7+LHq577D+7k7eVaSQFNDvXZzty2YNdWs9r2ew6mwwMY6YxCDwSvhVy1Ajq4VPGdkKBFJokJOrGeTfns+7No36rrgzgLKNH7R/p4ZCsH3WoS/ssg==<br>\r\nx-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:fr;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR0402MB3381.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(396003)(136003)(39850400004)(376002)(346002)(366004)(7696005)(166002)(55016002)(52536014)(5660300002)(316002)(66946007)(64756008)(66446008)(66556008)(66476007)(66576008)(53546011)(76116006)(9686003)(26005)(6506007)(786003)(2906002)(99936003)(478600001)(86362001)(186003)(71200400001)(6916009)(33656002)(8936002);DIR:OUT;SFP:1101;<br>\r\nx-ms-exchange-antispam-messagedata: vSL48hGXqa7cFFyye8ZlSPR7xWWOie3jiDNCyQkdz5zf/vdnRZOX6r7yRAMyRD5qIvOs7O522nEDeGf3mIQg6ToZVh24Erd8P1fKj0w6hDyXw8X0974XMFGYGlaBqu6dppWdh9+tdLW5ru3cOLUvYLjwrogVH+JsvVrjWQrCUMAzqg6rrFRg53PU3OD/kh9lb2OL/ifHVha4O0hgcH8AgnNDEwAfUUhD/SEKchiL+GW1B09FPbckgMoGEGNZpKgOyBzT3l/T9n1BUi5ss6KbnjaIK2hp1HEznVOk4T9JFVzv+mJ3VzdZ4F8SK44fjklWoFaT/gW1tmkIlBjLWOBEMDrGgPlHILR6TjGEi6RRJp8U1JVhIdmE9VHoiiSQH0XpVMmmVxDYuUP4zNHkovBwoi8bHCuNPDjnRmz0UkWhH4/Cd6tMerVpCzenGIfcbicZGf50u53wKhjnhpYxmMAjRBYJuLReK/lAQ6MxKCYzqnhOIm6YCUevEbCoNwpf3Pjk/nobW9+x+cA32EL0Tus7dEljrICOx658PlGjFQ/uW0q/EHMdLAIiAb3g6xd2XouTFGkCEwepEdKWqEhx1wQIM0IyXy8bT5XI/8WVCi2lnJNKreptgcJSNCfWe0MgaJdNrfzhdYatbDaOlGkdwcUqYg==<br>\r\nx-ms-exchange-transport-forked: True<br>\r\nContent-Type: multipart/mixed; boundary=&quot;_005_AM6PR0402MB33819AEEEBCB05DF0350CAEAA8550AM6PR0402MB3381_&quot;<br>\r\nMIME-Version: 1.0<br>\r\nX-OriginatorOrg: epsi.fr<br>\r\nX-MS-Exchange-CrossTenant-AuthAs: Internal<br>\r\nX-MS-Exchange-CrossTenant-AuthSource: AM6PR0402MB3381.eurprd04.prod.outlook.com<br>\r\nX-MS-Exchange-CrossTenant-Network-Message-Id: 708adcab-bbe4-4e1a-ef9e-08d84a67cdd5<br>\r\nX-MS-Exchange-CrossTenant-originalarrivaltime: 27 Aug 2020 09:01:36.6812 (UTC)<br>\r\nX-MS-Exchange-CrossTenant-fromentityheader: Hosted<br>\r\nX-MS-Exchange-CrossTenant-id: b6e77e52-65f6-4dec-b7d9-8e45f36a536f<br>\r\nX-MS-Exchange-CrossTenant-mailboxtype: HOSTED<br>\r\nX-MS-Exchange-CrossTenant-userprincipalname: LSZ/ajvheOrBLhOD0Gmqt6Sn83JTSfKaYMb50mVpCOlLqTr5BF3SbFtZCpdP5t1Dnoa+cJmOM3fsJwOpPjRFxw==<br>\r\nX-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB5895 ','2020-08-27 11:01:39','2020-08-27 15:55:55',12,NULL,NULL,NULL,0,NULL,NULL,'',NULL,NULL,NULL,NULL,'AM6PR0402MB33819AEEEBCB05DF0350CAEAA8550@AM6PR0402MB3381.eurprd04.prod.outlook.com',1,NULL),(98,NULL,'(PROV98)','Bonjour, Monsieur Destailleur.\r\n\r\nJe m\'appelle Félix Abriac, je suis étudiant à l\'IUT Informatique de\r\nBordeaux et je suis en recherche d\'alternance pour ma future Licence\r\nProfessionnelle (DAGPI), en développement et gestion de projets.\r\n\r\nJe cherche à signer un contrat d\'alternance pour l\'année qui arrive (de\r\nSeptembre à Septembre) et je suis très grandement intéressé par votre offre.\r\n\r\nJe sais développer en PHP et j\'utilise GIT très régulièrement. Pour ce qui\r\nest du Java, c\'est mon langage de prédilection, et j\'ai déjà développé pour\r\nAndroid. J\'ai l\'habitude de rédiger des messages en anglais, c\'est un\r\nlangage que je parle couramment et que je comprends assez bien.\r\n\r\nAussi, j\'habite sur Pessac, donc il sera d\'autant plus simple de se\r\nrencontrer physiquement de manière régulière.\r\n\r\nJe vous mets mon CV et le calendrier prévisionnel de l\'année en pièce\r\njointe, ainsi qu\'une brochure de la formation.\r\n\r\nEn vous souhaitant une agréable journée !\r\nCordialement,\r\nFélix Abriac',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : <br>\n&Eacute;metteur (From) : F&eacute;lix Abriac<br>\nDestinataire(s) (To) : job+2@nltechno.com<br>\n-----<br>\nBonjour, Monsieur Destailleur.<br>\r\n<br>\r\nJe m\'appelle Félix Abriac, je suis étudiant à l\'IUT Informatique de<br>\r\nBordeaux et je suis en recherche d\'alternance pour ma future Licence<br>\r\nProfessionnelle (DAGPI), en développement et gestion de projets.<br>\r\n<br>\r\nJe cherche à signer un contrat d\'alternance pour l\'année qui arrive (de<br>\r\nSeptembre à Septembre) et je suis très grandement intéressé par votre offre.<br>\r\n<br>\r\nJe sais développer en PHP et j\'utilise GIT très régulièrement. Pour ce qui<br>\r\nest du Java, c\'est mon langage de prédilection, et j\'ai déjà développé pour<br>\r\nAndroid. J\'ai l\'habitude de rédiger des messages en anglais, c\'est un<br>\r\nlangage que je parle couramment et que je comprends assez bien.<br>\r\n<br>\r\nAussi, j\'habite sur Pessac, donc il sera d\'autant plus simple de se<br>\r\nrencontrer physiquement de manière régulière.<br>\r\n<br>\r\nJe vous mets mon CV et le calendrier prévisionnel de l\'année en pièce<br>\r\njointe, ainsi qu\'une brochure de la formation.<br>\r\n<br>\r\nEn vous souhaitant une agréable journée !<br>\r\nCordialement,<br>\r\nFélix Abriac<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job+2@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp481988jal; Thu, 27 Aug 2020 04:22:51 -0700 (PDT)<br>\r\nX-Received: by 2002:a50:fd84:: with SMTP id o4mr19184015edt.76.1598527370717; Thu, 27 Aug 2020 04:22:50 -0700 (PDT)<br>\r\nARC-Seal: i=1; a=rsa-sha256; t=1598527370; cv=none; d=google.com; s=arc-20160816; b=IzISF3kLrCxtL/pxrfjr4MEoGUyA2Ecw+EBlOLZSUsbD4DmqnrpzFB+x2ypQk4eqVZ ZZeGN6nxikjrwk00PAeGt1jl7aAu1mMhyLheEPEZG3C6AJWJgeHmWC8Fp0nlwr3CF2dw W+bdtlqqlaqpfTtODz4nTqyv/aw9JutG8IrLLPWrqVp5pq3dMGd6Ojw3EalM8nB0p6Je 4O7+ach2moWlA0WQR+jpc6b+DkN/n2PJO3kCP9TveK+9Hav/Ot+bf2B8LzmHGIO5N47q B9igP+l6P0uPWfuj3FftZexTVWBE89WUCZB05Ipww/t2Hh5hf8k0W7VmZ/sdg8TN+0s8 4rYQ==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:subject:message-id:date:from:mime-version:dkim-signature; bh=E7L7oq8Pj6VvkGtPtsb/MBCGFqnzyqHlBaaQeI+kx3w=; b=tnK9yo7F6GT0nb6dQXrNrLZ52aPf9dXJUkEAj1iarCK2UBljCpMyh3EOa53hlXO3cb dLldPRa8nnl0COBFaChLrU140Y9m37SPFcbYzT/MjfL6LEGQWwaCiSPAOGcUwTKZIW21 bu7oXDQUtcruD98IPo7+5VNj/+e3msU41x12lvU8J5EdBhALQTal1vePPAaBc/rWCht2 v84JsiKbJtQ7WS4eOJE11wRWOJJGlxwB0aE9C/5eehk1Ty9RMEbHkm4YNlFzppv8AyIN SNfoXogRZiuRay+pvtZmGvH9YXUBBEv5yuv3821NQWLCFM79z0vgdMrZApiQCbYJJRAR BUYA==<br>\r\nARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=&quot;p8U/slbr&quot;; spf=pass (google.com: domain of felixabriac@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=felixabriac@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nReturn-Path: &lt;felixabriac@gmail.com&gt;<br>\r\nReceived: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id j15sor1249037ejn.8.2020.08.27.04.22.50 for &lt;job+2@nltechno.com&gt; (Google Transport Security); Thu, 27 Aug 2020 04:22:50 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of felixabriac@gmail.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=&quot;p8U/slbr&quot;; spf=pass (google.com: domain of felixabriac@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=felixabriac@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=E7L7oq8Pj6VvkGtPtsb/MBCGFqnzyqHlBaaQeI+kx3w=; b=p8U/slbr251+PfOSCtytM7kP3bR+C2Fd8ROxpDOIun37dIGY4zhiR6O8D+Kw07RSCr r5vU/4UB9/07M6zDdWAVjFnLpjzZsNJVCP6WI60fue4zNj6MFR6Xtw198ae+v2qfCiqW rQfCiUz+Qe0Q07TvcTZ04qD3nw9Zuww/6AhR11OFLhFCt7pEDPwVBMzP2Z3BM7rWAFCs Q3QMgyKGfEshgKoCM08pS72n2ADyXL6RWwPsv8X5Ak9pSSH3xVpb9cRLRbIq9JY31vdZ bQXyNCTU8Uuup+AkUy66OcuAPPzD7dvF+on19AkOjiznsBA3NtXKC2f6UDmvfmzyRiWB +mPQ==<br>\r\nX-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=E7L7oq8Pj6VvkGtPtsb/MBCGFqnzyqHlBaaQeI+kx3w=; b=XYrigLiHOMUyiS2N3FlGZQZwhE/9JAWtnOZD49K5AIw3YlTP0lhClmwzVnpDs87nSg wkWGGHOP6akdmat6pFCGQpbB7l2/llinQY2jC9NMM0C6bCdN7A728gItzLVnMIq90qrO pSiFICqgj4cXHWzTfbJuyvLlb5ZkZiTBUv4TjgwlVLv4/LWKECXPBeFovHH2WYsgyc25 XJ1TPTVy/DrrHfTqdYchNkAY3GZ6ZSkzsATDpV770dIry3a2279ae6ILhdPQqQuSjZ6C h8GKUD9Y8oalxGuIqgr3mePRbgICjUOQP7RFMaAuoCezvKMmx5CAOT1vka6hdLT1IXIK mBCg==<br>\r\nX-Gm-Message-State: AOAM531+TK7RSI5NCirLcxnr4bXnMHLnKdHLzc9ceoQTyeD/yKKkNPWq xyCpXFl5ZTDVcVVUo1x7AbA+Fqk6Wu9xZJdnpg2O/gLnXBWmNSpw<br>\r\nX-Google-Smtp-Source: ABdhPJyPhtPwYyY03JxcH+YCXvSx75IsxI4J5ecNp2D5pRiFbQhgqylFFPmOODnwWQu5DC1GkoKHri68YrYaJ27u+0s=<br>\r\nX-Received: by 2002:a17:906:2e05:: with SMTP id n5mr19396687eji.397.1598527369407; Thu, 27 Aug 2020 04:22:49 -0700 (PDT)<br>\r\nMIME-Version: 1.0<br>\r\nFrom: =?UTF-8?Q?F=C3=A9lix_Abriac?= &lt;felixabriac@gmail.com&gt;<br>\r\nDate: Thu, 27 Aug 2020 13:22:35 +0200<br>\r\nMessage-ID: &lt;CACRMZshmufhN=CF7EvS-M1v2obx3kfUVAorgM0+X2+x5a17J5g@mail.gmail.com&gt;<br>\r\nSubject: Candidature pour votre offre d\'alternance<br>\r\nTo: job+2@nltechno.com<br>\r\nContent-Type: multipart/mixed; boundary=&quot;00000000000005f10705adda2862&quot; ','2020-08-27 13:22:50','2020-08-27 17:14:17',12,NULL,NULL,NULL,0,NULL,'Félix Abriac','Félix Abriac',NULL,NULL,NULL,NULL,'CACRMZshmufhN=CF7EvS-M1v2obx3kfUVAorgM0+X2+x5a17J5g@mail.gmail.com',1,NULL),(109,2,'(PROV109)','Bonjour,\r\n\r\nActuellement en Licence Professionnel Développement d\'applications et\r\ngestion de projet informatique à l\'IUT de Bordeaux je suis à la recherche\r\nd\'une entreprise.\r\nCeux-ci m\'ont joint votre proposition de contrat Pro Alternance Développeur\r\nPHP auquel je souhaite intégrer.\r\nPour cela je vous joint les documents nécessaire (lettre de motivation, CV).\r\n\r\nCordialement,\r\nMme MOUAZZAZ Zineb',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Candidature Alternance D&eacute;veloppeur PHP<br>\n&Eacute;metteur (From) : Zineb Mouazzaz &lt;mouazzazz@gmail.com&gt;<br>\nDestinataire(s) (To) : job+2@nltechno.com<br>\n-----<br>\nBonjour,<br>\r\n<br>\r\nActuellement en Licence Professionnel Développement d\'applications et<br>\r\ngestion de projet informatique à l\'IUT de Bordeaux je suis à la recherche<br>\r\nd\'une entreprise.<br>\r\nCeux-ci m\'ont joint votre proposition de contrat Pro Alternance Développeur<br>\r\nPHP auquel je souhaite intégrer.<br>\r\nPour cela je vous joint les documents nécessaire (lettre de motivation, CV).<br>\r\n<br>\r\nCordialement,<br>\r\nMme MOUAZZAZ Zineb<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job+2@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp482001jal; Thu, 27 Aug 2020 04:22:52 -0700 (PDT)<br>\r\nX-Received: by 2002:a9d:6643:: with SMTP id q3mr2005738otm.27.1598527371785; Thu, 27 Aug 2020 04:22:51 -0700 (PDT)<br>\r\nARC-Seal: i=1; a=rsa-sha256; t=1598527371; cv=none; d=google.com; s=arc-20160816; b=st9XBtR5Q0i9V2VM2VG+xeO4bvp/2MyxQISqJBFIY5ikjAifsFuybd83SAFSK19Alz G8QwZk8cm8Wd7z54AdykgJ9OPIWhaMGqpbnHV4TCBQP+H5iXdgz2VLEkFgLcFDTF0vUZ bzEyvQ2JZRT9r3wqLL+9cj7BkIjOlrb3AsB01adRLKUygCvg2bZhWJf3CZ6B78VFPjw7 xs0Z2ddKXoRC1m45BJ/fRCM3IGGa0Gv5LNdqZsY3FbkGADgeXJbIoUG0wzrzXOP88HZ+ 4Mo4TluDjQF0N4JttHQUUtITg+leSt4ACcqHFHTMIMO5imMFPwUWLChl1x6HeNUd9DLD Y4Wg==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:subject:message-id:date:from:mime-version:dkim-signature; bh=4Qrqv8dMPjnPFbkZ/HI9cx3WwVjtKLrbqUwAmBitK8Y=; b=sQWc2J8hg6dhMd5I6IAk3NqzF48kMhYelrSVLaQ0H2jXRoJIeguzwM70uUF1Uh8DNO g+Jtr3YGmeMyZjxZ5Ke4vaoDnVE6H2VboPT6KNXYvuBpOAn34UZTZB2aXCwkncqVa5WQ vEO3mqrkR6CXY8RNOxoeRUU+Ucen0UlLIIKBxzZIJOuq6EZd1g7SVdhXiZeNHwZrPoi4 TYb7MaqwnCQ1XfMvOh38aJKBw2Wjuum51Dsc+AUR9u6pOCJ75U5daHw+YDK7cbLMYuQ2 EsQptfs9ei3IhYa/sTHUBRT41jB/e03xPNzpAOBtN/lBUSYkoc/tOkMioUAwTminOJNA jX6g==<br>\r\nARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=iXwCriTy; spf=pass (google.com: domain of mouazzazz@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=mouazzazz@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nReturn-Path: &lt;mouazzazz@gmail.com&gt;<br>\r\nReceived: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id f10sor802448oot.13.2020.08.27.04.22.51 for &lt;job+2@nltechno.com&gt; (Google Transport Security); Thu, 27 Aug 2020 04:22:51 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of mouazzazz@gmail.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=iXwCriTy; spf=pass (google.com: domain of mouazzazz@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=mouazzazz@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=4Qrqv8dMPjnPFbkZ/HI9cx3WwVjtKLrbqUwAmBitK8Y=; b=iXwCriTyWO2rUA6OIc5EYIvk/BM1qbuEHPyaBnYemVrZMHptdakyN6E99y60EeFZjG mWfrUDFQkonnW2/taQaHdgU6kGwdCzwZxPatVUN5jb9FIBtWPaj2HO32G+LLNtHVTVfE 181xF156xS9pa93KpRRsk6MrRi+yjabEHx425A1/ZkcFjqrBWjNjrMat2dYz4Vyg9a85 XIiFPsu06wvVlHsqVeLF6+/ZwagSgoOj82dqmJpTnMdl9U7FOn9bmebhXml0qmTcik4k Eq0LDAkD+7V45MdA6v63OLjHxjjhPON6KaIcJWBK0UvEV5+wWdFGUYaRjWJyIAhViVLa 675g==<br>\r\nX-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=4Qrqv8dMPjnPFbkZ/HI9cx3WwVjtKLrbqUwAmBitK8Y=; b=blz5HvJrXaaptmz5mupjVD1Nax4rvSq6IKbnqKQWc/VPSqZM/REv2M8OvmrXWMy5VA NOrNsm8S7HrpRmyud1u39zJT4Nzn51Z6K99NsvQdBHXY1T6ytEmUAnaMStvzIiRa0wfj XIXEJEOLWOk0/g38JhMaLmDDoRCAhqIbTuvdj5Y33ZovSsXZzdNjhdnqZCS2oKgCU0fk IxemccLqqE9Yp9AznrRumiMtaJjBqfiNuGXp2ysz8FMVI+sM2NR5I4MdtKX467qDN57y bE2dwf2ENr8eliwhiPnPmURwP1h4D7ZESz1wKFs6f70EaneHNYsCt1oBbVB58owmU+vq V9+w==<br>\r\nX-Gm-Message-State: AOAM532jSqXROkZR7ICrr1R54NQjz1LeTsMjxoLDqz2/Hca0kyc4DQ4N SzSzRFqijzN0vt0rin1m0SfTFZI9LD7qNBE21j8gcVrD<br>\r\nX-Google-Smtp-Source: ABdhPJxWTZewiSKgOEGpSOQfWQhCWKD0CA0Wx2HAlDvgMi5qpHqi1HP27Mqr9YjrjNebyM3yemMwIaFg6kjDZAaUbDU=<br>\r\nX-Received: by 2002:a4a:dc03:: with SMTP id p3mr13781369oov.63.1598527370959; Thu, 27 Aug 2020 04:22:50 -0700 (PDT)<br>\r\nMIME-Version: 1.0<br>\r\nFrom: Zineb Mouazzaz &lt;mouazzazz@gmail.com&gt;<br>\r\nDate: Thu, 27 Aug 2020 13:22:39 +0200<br>\r\nMessage-ID: &lt;CAOmKmgXdDWTvYCd88oJ5o0HoO9-Nsmx9hMutY0nKJRoATRR9gA@mail.gmail.com&gt;<br>\r\nSubject: =?UTF-8?Q?Candidature_Alternance_D=C3=A9veloppeur_PHP?=<br>\r\nTo: job+2@nltechno.com<br>\r\nContent-Type: multipart/mixed; boundary=&quot;0000000000001c444c05adda2851&quot; ','2020-08-27 13:22:51','2020-08-27 17:40:57',12,NULL,NULL,NULL,0,NULL,'Zineb Mouazzaz','mouazzazz@gmail.com',NULL,NULL,NULL,NULL,'CAOmKmgXdDWTvYCd88oJ5o0HoO9-Nsmx9hMutY0nKJRoATRR9gA@mail.gmail.com',1,NULL),(110,2,'(PROV110)','Bonjour,\r\n\r\nJe suis actuellement à la recherche d\'une alternance pour une licence professionnel DAGPI, étant tombé sur votre offre qui m\'intéresse particulièrement aux vues de la mission et des compétences recherchées je me permets de candidater et de vous transmettre mon CV.\r\n\r\nJe reste disponible pour toute information complémentaire et dans l\'attente d\'une réponse.\r\n\r\nCordialement,\r\n\r\nMarcoux Matthias',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Recherche alternance<br>\n&Eacute;metteur (From) : matthias milliez &lt;matthias.milliez@outlook.fr&gt;<br>\nDestinataire(s) (To) : &quot;job+2@nltechno.com&quot; &lt;job+2@nltechno.com&gt;<br>\n-----<br>\nBonjour,<br>\r\n<br>\r\nJe suis actuellement à la recherche d\'une alternance pour une licence professionnel DAGPI, étant tombé sur votre offre qui m\'intéresse particulièrement aux vues de la mission et des compétences recherchées je me permets de candidater et de vous transmettre mon CV.<br>\r\n<br>\r\nJe reste disponible pour toute information complémentaire et dans l\'attente d\'une réponse.<br>\r\n<br>\r\nCordialement,<br>\r\n<br>\r\nMarcoux Matthias<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job+2@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp501992jal; Thu, 27 Aug 2020 04:54:01 -0700 (PDT)<br>\r\nX-Google-Smtp-Source: ABdhPJxyfy2fMvKckhxbcsplQd8h0zZiI8L8oiIUsVnQE8R9FIWEbFEk5egOIkBifvSac3XRfs2n<br>\r\nX-Received: by 2002:a0c:e90e:: with SMTP id a14mr18592752qvo.224.1598529240906; Thu, 27 Aug 2020 04:54:00 -0700 (PDT)<br>\r\nARC-Seal: i=2; a=rsa-sha256; t=1598529240; cv=pass; d=google.com; s=arc-20160816; b=Ar1u5IlLC+Q0nd+1m6L21A/Wh7sZ8p4YR0zUXQ01tn+SLfSxwboP8OKBYlRacyQboJ 7Dl2O4OpWuiwNgVdkaezzmZ5lC58C2cB+rha90Yxy9NcdSGLkcE/TBRMToo6CSS1OIRP FRKnQol9yaHYICpiKyy8hobQh7WU/+sUQVX1te4V4yb0UVfJ0nSmcarA7hcdzl9G3AZf e0VKYd3Y3v3nXO1JTsS9rjkz/jHHVyNqShweFhnIzXivb6cvYfJ2WPH0m1zp5wRwXqHt gRCNHN6adDhEXVdmN1zH/K1GyaYPNMNNuCwGex26TSz7FAnaemy3roqIV3sArZgsQ95K zP1A==<br>\r\nARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-language:accept-language:message-id:date :thread-index:thread-topic:subject:to:from; bh=vERzEEr9RzzfWfYJAjDxhyKFKRRgamq06mXXnWTUPD4=; b=gd3OfsBgVmnrLvn+xIkMoPITH0u+cYyUr6Or2o5CdV1FBMbb/vGlW/SkB8+Mso3xVm N8Yv7x94M98ySzXCDoMAOPU9wtNCNE4e9fkh2WRfUINARSzdMbO5Nq9JBezhrkAkKTNs UaUt2ENqTfki6hGbZoLeZq9rCHg6oIqwH6oE4d5Fmenn41CWdUAbzeStgIda56ffEiF7 hSVYziuZtkZ3g+Q09O9S229Oy7cg4TMBnv9S/eRn0jwkT7B12szYrrLDZ9gzPIYGbEky 9CzUq8qSoWA3Fs7YL2QO2mTu2lG5+BIIeMKk8pE91QbJkoSn4eb33dTYNTddKQfJzY6l Ic1g==<br>\r\nARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of matthias.milliez@outlook.fr designates 40.92.17.23 as permitted sender) smtp.mailfrom=matthias.milliez@outlook.fr; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=outlook.fr<br>\r\nReturn-Path: &lt;matthias.milliez@outlook.fr&gt;<br>\r\nReceived: from EUR06-VI1-obe.outbound.protection.outlook.com (mail-vi1eur06olkn2023.outbound.protection.outlook.com. [40.92.17.23]) by mx.google.com with ESMTPS id e7si292748qtd.175.2020.08.27.04.54.00 for &lt;job+2@nltechno.com&gt; (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Aug 2020 04:54:00 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of matthias.milliez@outlook.fr designates 40.92.17.23 as permitted sender) client-ip=40.92.17.23;<br>\r\nAuthentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of matthias.milliez@outlook.fr designates 40.92.17.23 as permitted sender) smtp.mailfrom=matthias.milliez@outlook.fr; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=outlook.fr<br>\r\nARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YzsZ2VjcExabObiV+6MAPPx2wwO6FPHv5eAvReiCjWmi1wsUddoA3R9bN9J7FkBKQb+oYiGFM8J/u2a5PadT/ocxAPo/SBtFQIiE0gL/nG7ZIdAfvuxSkXMBjJ6kDvhUk4LWc9rurWlATUOsK1+Vi9k6RmDUJWMlg3D3DDOB/5ctuvdeYOD/vYoAXHLHDqQ8KlVuDZqek3ppNSAQnk6wP0IIx53ly/sO6MQSNsMRdoz1QAjGg4e2YzBjxi3ELvNZoWmXBiZK2RtDL62galoKr6EvG+X0l5WcDF7RLlrdg2mRqAsJYTHl25FwXRns2CPLDUCDrHugicF+9hAwoK4RvA==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vERzEEr9RzzfWfYJAjDxhyKFKRRgamq06mXXnWTUPD4=; b=VEgLgQAV7JuxxZFMkejICu0sqHCIgY/bzSBszlIvvOISb0dR6NBbggmx/1CCeJep/LLuocuHZXNgO5sbHvY8VCou29I4h1mjwITLAr9lZG/GUY51Ck+Mr0+EqtzTxMuMChreq6Aw3heCNSUUUSN6EFl7eaul8U70esz0tYSp11zjadar5gLCilCFkksNpY6cN5jEQNfCjA4qs62breLUBAwwnRqPa023ViQ1J6F9iPh4rhugahSxrCBpJugeeCPRV0YdkbIfbfjEjTruRGHYfxiwVfUbqnOet/P8EUXnUMDZJbGWGGCXgMx+o2yW/e7IB8sCJTj2P/kgb27+yAgjPQ==<br>\r\nARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none<br>\r\nReceived: from VI1EUR06FT063.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc37::4a) by VI1EUR06HT100.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc37::457) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.24; Thu, 27 Aug 2020 11:53:53 +0000<br>\r\nReceived: from DB7PR10MB2523.EURPRD10.PROD.OUTLOOK.COM (2a01:111:e400:fc37::42) by VI1EUR06FT063.mail.protection.outlook.com (2a01:111:e400:fc37::260) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3326.19 via Frontend Transport; Thu, 27 Aug 2020 11:53:53 +0000<br>\r\nReceived: from DB7PR10MB2523.EURPRD10.PROD.OUTLOOK.COM ([fe80::55db:b467:76ac:e1f2]) by DB7PR10MB2523.EURPRD10.PROD.OUTLOOK.COM ([fe80::55db:b467:76ac:e1f2%3]) with mapi id 15.20.3305.032; Thu, 27 Aug 2020 11:53:53 +0000<br>\r\nFrom: matthias milliez &lt;matthias.milliez@outlook.fr&gt;<br>\r\nTo: &quot;job+2@nltechno.com&quot; &lt;job+2@nltechno.com&gt;<br>\r\nSubject: Recherche alternance<br>\r\nThread-Topic: Recherche alternance<br>\r\nThread-Index: AQHWfGeLnNq5ZoBx10iXLGeDtvgJ6Q==<br>\r\nDate: Thu, 27 Aug 2020 11:53:53 +0000<br>\r\nMessage-ID: &lt;DB7PR10MB2523FA056F084A184F25EAF2EA550@DB7PR10MB2523.EURPRD10.PROD.OUTLOOK.COM&gt;<br>\r\nAccept-Language: fr-FR, en-US<br>\r\nContent-Language: fr-FR<br>\r\nX-MS-Has-Attach: yes<br>\r\nX-MS-TNEF-Correlator: <br>\r\nx-incomingtopheadermarker: OriginalChecksum:BB9190F385F8C8065749FBF8CFCABC9EF79445A9FBC3C29F47D93455D32EDB7A;UpperCasedChecksum:958151801AEB1F44AD9C9362A70E2752B373DC3B2A6CD27FAA41411DF3273823;SizeAsReceived:6770;Count:41<br>\r\nx-tmn: [LgiL9/tInlZL6O8Q79u8F39uLwZQJMvD0OkXcEN0jNSJH6FW579O1BiHTQdxRpDy]<br>\r\nx-ms-publictraffictype: Email<br>\r\nx-incomingheadercount: 41<br>\r\nx-eopattributedmessage: 0<br>\r\nx-ms-office365-filtering-correlation-id: c90732ee-7fdf-41af-cf6c-08d84a7fdef0<br>\r\nx-ms-traffictypediagnostic: VI1EUR06HT100:<br>\r\nx-microsoft-antispam: BCL:0;<br>\r\nx-microsoft-antispam-message-info: G0QvaDzwTK+0FS8K0KnDfBjVqpVJyhCtPyttMDuFJiVPtUw5tBXnpZQwYX6UAQMZOQ5DOrt7LNT5RYQX/j7DQVsNjuRfLmW0IvVNXh8pDoSLbBY+Kg9w2AVONE0nsrB3Smoz1snjRcBPjqfP6/wo8CQCw/b8NmQFIBp1QfReF24lMZI+I7FJCR5SacjnEWsH4VYqa8nwi4ALfMAcKMSqfg==<br>\r\nx-ms-exchange-antispam-messagedata: c/EUang/UQHiNRGatUe8pQmq8nKiXbyKopDYjH0wcYL8iDtWOt/2PVM/9ev4s8jFxIaoD0xG+powMrGC8qmJISX+Ftm6iCyVcMn74Kn7jtwMaOFsm9BxmU1emY772grAqzl2qLK6Z1OSQZqvpukiO3Q6M0aKovIhCYv8tvQCMbHNIqtl2XvIrn4an62/vG9HBFx/GRwvwwZK1Njo37UOaw==<br>\r\nx-ms-exchange-transport-forked: True<br>\r\nContent-Type: multipart/mixed; boundary=&quot;_004_DB7PR10MB2523FA056F084A184F25EAF2EA550DB7PR10MB2523EURP_&quot;<br>\r\nMIME-Version: 1.0<br>\r\nX-OriginatorOrg: outlook.com<br>\r\nX-MS-Exchange-CrossTenant-AuthAs: Anonymous<br>\r\nX-MS-Exchange-CrossTenant-AuthSource: VI1EUR06FT063.eop-eur06.prod.protection.outlook.com<br>\r\nX-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000<br>\r\nX-MS-Exchange-CrossTenant-Network-Message-Id: c90732ee-7fdf-41af-cf6c-08d84a7fdef0<br>\r\nX-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000<br>\r\nX-MS-Exchange-CrossTenant-originalarrivaltime: 27 Aug 2020 11:53:53.3531 (UTC)<br>\r\nX-MS-Exchange-CrossTenant-fromentityheader: Internet<br>\r\nX-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa<br>\r\nX-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1EUR06HT100 ','2020-08-27 13:54:00','2020-08-27 17:40:58',12,NULL,NULL,NULL,0,NULL,'matthias milliez','matthias.milliez@outlook.fr',NULL,NULL,NULL,NULL,'DB7PR10MB2523FA056F084A184F25EAF2EA550@DB7PR10MB2523.EURPRD10.PROD.OUTLOOK.COM',1,NULL),(111,2,'(PROV111)','Bonjour,\r\nEn juin dernier, j\'ai terminé un BTS SNIR et je souhaite continuer mes\r\nétudes dans la licence pro DAWIN (dans laquelle j\'ai reçu un avis\r\nfavorable). Dans le cadre de cette formation, je suis à la recherche d\'un\r\ncontrat de formation en alternance.\r\nC\'est pourquoi je vous sollicite de la part de m.Bourqui, responsable de la\r\nformation, afin de pouvoir bénéficier de ce contrat au sein de votre\r\nentreprise.\r\n\r\nJe vous remercie vivement de l\'attention que vous porterez à ma\r\ncandidature.\r\nJe suis disponible pour vous rencontrer dés que vous le souhaiterez.\r\n\r\nBien cordialement,\r\nMathias CATHELINEAU\r\n\r\n06.88.18.85.62\r\nmat.cathelineau@gmail.com',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Contrat d\'alternance licence pro DAWIN<br>\n&Eacute;metteur (From) : Mathias Cathelineau &lt;mat.cathelineau@gmail.com&gt;<br>\nDestinataire(s) (To) : job+2@nltechno.com<br>\n-----<br>\nBonjour,<br>\r\nEn juin dernier, j\'ai terminé un BTS SNIR et je souhaite continuer mes<br>\r\nétudes dans la licence pro DAWIN (dans laquelle j\'ai reçu un avis<br>\r\nfavorable). Dans le cadre de cette formation, je suis à la recherche d\'un<br>\r\ncontrat de formation en alternance.<br>\r\nC\'est pourquoi je vous sollicite de la part de m.Bourqui, responsable de la<br>\r\nformation, afin de pouvoir bénéficier de ce contrat au sein de votre<br>\r\nentreprise.<br>\r\n<br>\r\nJe vous remercie vivement de l\'attention que vous porterez à ma<br>\r\ncandidature.<br>\r\nJe suis disponible pour vous rencontrer dés que vous le souhaiterez.<br>\r\n<br>\r\nBien cordialement,<br>\r\nMathias CATHELINEAU<br>\r\n<br>\r\n06.88.18.85.62<br>\r\nmat.cathelineau@gmail.com<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job+2@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp520322jal; Thu, 27 Aug 2020 05:17:40 -0700 (PDT)<br>\r\nX-Received: by 2002:adf:f045:: with SMTP id t5mr21139987wro.288.1598530660390; Thu, 27 Aug 2020 05:17:40 -0700 (PDT)<br>\r\nARC-Seal: i=1; a=rsa-sha256; t=1598530660; cv=none; d=google.com; s=arc-20160816; b=CCUZYFS5D2eBHUcd40e/7nVk8PoUyIPiH5rGYJBUcb47S7aCntKE8RRRFLj8j2RXfb U50w5Zf+EyBBOf4a3/1Koo2yrScDw1q6KAS8BoYrzcOJcU6tqJ6MhMK03BHnTj/iq3Hr 0rU0YgnCtH5RveJdfVzx10EqMSSFvib+8bBTY8YI82blrJqz83r655bvWphIFJoXZxry iUG7DpfNXHwRmnTWtb08HQnkXORJgJ5RzgQ1XhFPUQf9kEyra++OUediCr/mL5C9XsTP hzzEKMM0n2Sf0KCjUwTiPiJOiwOC/Oc3ZGXO4tffjUmiwMKS6ASDJQUetMtVB3oOeMTC BEkA==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:subject:message-id:date:from:mime-version:dkim-signature; bh=0Cy1ecKuNipzzA492uHP+Ml4VYszKpsaORcHqXajV9U=; b=BxtE5iVPwILurGGfufwMnX3Ca/ZUtNvZkPTEswHz508gW2UBb6xW/6ggSk4VfBGbgG atQHaWeZCa8WM2D5N7QHh4/a3JD9PQjg7ZjIESpHyGKCCKTW0US/cEWlmyLcGKbNAeEF 0eXpG2MBbuOfeWwTtbQC9xxxLG8dE/QGYirkBgqJ4/x28kVBZljecWQbmUgZgQ//gF9v qPYidhGQ2VyV75kcfSo+HdIXwH34PEyiRvv0SiFKW+gxuD7RB87lP+e05VNIK+porGcD ZcjAB3mxpVpjNyDuvFTLM9VIw2jLNSCO+IFPXksCOrBfMQqPxM87Gm0r2IVoaTDxmyEX o/oA==<br>\r\nARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=IWiYSFTj; spf=pass (google.com: domain of mat.cathelineau@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=mat.cathelineau@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nReturn-Path: &lt;mat.cathelineau@gmail.com&gt;<br>\r\nReceived: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id q10sor1069887wrc.23.2020.08.27.05.17.40 for &lt;job+2@nltechno.com&gt; (Google Transport Security); Thu, 27 Aug 2020 05:17:40 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of mat.cathelineau@gmail.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=IWiYSFTj; spf=pass (google.com: domain of mat.cathelineau@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=mat.cathelineau@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=0Cy1ecKuNipzzA492uHP+Ml4VYszKpsaORcHqXajV9U=; b=IWiYSFTjo/PQgXpqUUQApPkqczG/eA1+gaRBDP8/CLe1cO1iIWOF2Cq6xqd9CQXJJl NlZCjbFemjHjFtsazGNm6dwacRTf/wb1ZgX8DhIAFGQytJ8qlUF8FrXSmN9NpvbYSeYr rMZTu3cbT3Z+CWpWMfHqJD1dmwYtwCBdW2jlAr8xs1HATGHq/zQdk3DQOcgS7ZqUsbSh +92bnKHvzRR6cMQr9bScWJXl1EtjNxV+p8Tlik8lbN1lky0V0q7t7hh4i+V3BeHRHFWM n06JSQdbvwewR96oJh9/f9+Bw2Abb4HG681wR8UZ6pRRe7MdfFdWojWIhpHqZGkkLd2M E2+g==<br>\r\nX-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=0Cy1ecKuNipzzA492uHP+Ml4VYszKpsaORcHqXajV9U=; b=efwamsMaL1X0fmGlU49kIdHm/IH3wPOdmyU56e16Cm2P8+YNxUgutZLhsMG7J/eVJM krFoR2rnccnBpM3Pwpzc86bIglmJkfCBbhKqCftHMyTeQYZVAtLP6P6ncqipDEcbjlvn yeKITgirIWUeMZ4F3BN6f+lsBzHnaugNPq8ji/adGhVlvUkmAo3dcRIveKZK2b0OzPKb eiqkRvNypJw/zQNWc6txBDqWKBiNsWX3PCVuuM85d2X+1q9TGwsEMMQyXk8TiDuM9JiL qxoFC5wXQOhFgcrzsa1NUjnO9E4pVTBDBC7rdPPni36viJTQ0TXzr9I4FdQMepMsK76q 0OCA==<br>\r\nX-Gm-Message-State: AOAM530CvMDAlarEMFPWS6V4DCtxmwXKQ19OSY8Ny5rP/onQMuB7dFij cZM95Y5bc2aNMHNCYAMpN2T5+ABEikgcdmEUHZStx0b/B+E=<br>\r\nX-Google-Smtp-Source: ABdhPJwKd0giqnf90zhFR4Cm6qTLCRDgaXfIKbBMnI2OS7+iGrCK1ONy9bIZHFAng73n1cyydT5Jpb2QAjwpyV4qdr0=<br>\r\nX-Received: by 2002:adf:edc3:: with SMTP id v3mr19942990wro.193.1598530659736; Thu, 27 Aug 2020 05:17:39 -0700 (PDT)<br>\r\nMIME-Version: 1.0<br>\r\nFrom: Mathias Cathelineau &lt;mat.cathelineau@gmail.com&gt;<br>\r\nDate: Thu, 27 Aug 2020 14:17:28 +0200<br>\r\nMessage-ID: &lt;CAN35kyOiyz05Rx9BEBTJiKCYDLOtr8UZYdjom=HLixXNc97EKA@mail.gmail.com&gt;<br>\r\nSubject: Contrat d\'alternance licence pro DAWIN<br>\r\nTo: job+2@nltechno.com<br>\r\nContent-Type: multipart/mixed; boundary=&quot;00000000000022f9d905addaec03&quot; ','2020-08-27 14:17:40','2020-08-27 17:40:59',12,NULL,NULL,NULL,0,NULL,'Mathias Cathelineau','mat.cathelineau@gmail.com',NULL,NULL,NULL,NULL,'CAN35kyOiyz05Rx9BEBTJiKCYDLOtr8UZYdjom=HLixXNc97EKA@mail.gmail.com',1,NULL),(112,2,'JOC2008-0005','Bonjour Monsieur Destailleur,<br />\r\n<br />\r\nJe me permet de vous contacter suite &agrave; l&#39;offre relay&eacute;e par l&#39;IUT de<br />\r\nBordeaux concernant le poste d&#39;alternant &quot;D&eacute;veloppeur PHP&quot; au sein de votre<br />\r\nentreprise.<br />\r\n<br />\r\nCette offre a retenu mon attention suite aux diff&eacute;rentes exp&eacute;riences que<br />\r\nj&#39;ai pu avoir durant ma formation de technicien sup&eacute;rieur. Diff&eacute;rents<br />\r\nprojets en PHP (cr&eacute;ations de diff&eacute;rents sites types) ou encore en Android<br />\r\n(cr&eacute;ation d&#39;une application en JavaScript). Ce poste serait en parfaite<br />\r\nad&eacute;quation avec la formation en licence professionnelle DAGPI et mes<br />\r\nattentes pour l&#39;ann&eacute;e 2020/2021.<br />\r\n<br />\r\nVoici ci-joint mon curriculum vitae et mon profil Gitlab :<br />\r\nhttps://gitlab.com/simon.chaval<br />\r\n<br />\r\nJe reste &agrave; votre disposition pour toutes informations compl&eacute;mentaires.<br />\r\n<br />\r\nCordialement,<br />\r\n<br />\r\nCHAVAL Simon<br />\r\nT&eacute;l : 06.04.46.44.82',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Candidature alternance<br>\n&Eacute;metteur (From) : Simon Chaval &lt;simon.chavalpro@gmail.com&gt;<br>\nDestinataire(s) (To) : job+2@nltechno.com<br>\n-----<br>\nBonjour Monsieur Destailleur,<br>\r\n<br>\r\nJe me permet de vous contacter suite à l\'offre relayée par l\'IUT de<br>\r\nBordeaux concernant le poste d\'alternant &quot;Développeur PHP&quot; au sein de votre<br>\r\nentreprise.<br>\r\n<br>\r\nCette offre a retenu mon attention suite aux différentes expériences que<br>\r\nj\'ai pu avoir durant ma formation de technicien supérieur. Différents<br>\r\nprojets en PHP (créations de différents sites types) ou encore en Android<br>\r\n(création d\'une application en JavaScript). Ce poste serait en parfaite<br>\r\nadéquation avec la formation en licence professionnelle DAGPI et mes<br>\r\nattentes pour l\'année 2020/2021.<br>\r\n<br>\r\nVoici ci-joint mon curriculum vitae et mon profil Gitlab :<br>\r\nhttps://gitlab.com/simon.chaval<br>\r\n<br>\r\nJe reste à votre disposition pour toutes informations complémentaires.<br>\r\n<br>\r\nCordialement,<br>\r\n<br>\r\nCHAVAL Simon<br>\r\nTél : 06.04.46.44.82<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job+2@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp567218jal; Thu, 27 Aug 2020 06:22:43 -0700 (PDT)<br>\r\nX-Received: by 2002:a17:906:14ce:: with SMTP id y14mr21987293ejc.314.1598534563421; Thu, 27 Aug 2020 06:22:43 -0700 (PDT)<br>\r\nARC-Seal: i=1; a=rsa-sha256; t=1598534563; cv=none; d=google.com; s=arc-20160816; b=NcEsjOE9T5QcjWovzpjVA341TOhAcBze58OhYHt6uqoM49Ah8HVEVaX8/NfR3+WvaH b0Qh9zdfFOSO3gh3ZfPbIP8lbboJNgDI1Ywupfpj5wap3LghPAHTbfkzs3YmIsByLd9k fOQ9E1dZqOt4yG6XYq8vMbdUkWiq/h9KycR5LMfqkg2b1Wksiz7X7lfhffwZMTMPiGDU meLddcj2tHMpHUSjWp1Izaa0TPvCXA+6rOoN7wdtbVVwaR3amRupEueqKdcRb2HOULBB 5AKbZPVBoiezL9DOCVMnN1Y/JWtqNQPzD92bUoicm+EKtCryXG6A9vt5DxEWzzfVPRYM 8/aA==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:subject:message-id:date:from:mime-version:dkim-signature; bh=lbjwR/V72pUhdgWfeF1sHQCmKh6xsyFaNAKB6gXhLt4=; b=Qr3XVS0Jqo6KG7nXWtepOs8lgHpr4cxQvGf2enfU90wsR00/T+v7Vo3Tyj1KurdEx/ 1UzYCj0ROf3AdoWGr/yT16T3WqKRpLoutoaOFFpmP03cg3DCkaLeuMgHoeN9F6DaAyPd SlIHtXJ1EZEQwF+MNmZn11tsYv959LUZJ5DlOdUykifTs2cst9MaLY3npP55ZjNQOET/ 0Xmg2UttluVWj3cxHVQqjG1kxJ5BzvfVFD4Jv4KhWpXv2TyqHCJgu8xF3yVn9qKV8O9N +NjjsJwlwwNEURMuBg9804ql0Zl4qszufRVCB5zIW2PZ4IZopH7rZX+/3wmnpGc7CjXr Jjbg==<br>\r\nARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=bZOO3wrI; spf=pass (google.com: domain of simon.chavalpro@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=simon.chavalpro@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nReturn-Path: &lt;simon.chavalpro@gmail.com&gt;<br>\r\nReceived: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id l14sor1507900ejq.4.2020.08.27.06.22.43 for &lt;job+2@nltechno.com&gt; (Google Transport Security); Thu, 27 Aug 2020 06:22:43 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of simon.chavalpro@gmail.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=bZOO3wrI; spf=pass (google.com: domain of simon.chavalpro@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=simon.chavalpro@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=lbjwR/V72pUhdgWfeF1sHQCmKh6xsyFaNAKB6gXhLt4=; b=bZOO3wrIRfjoKP1Lkkn79xQ/9Fueds3rWL8pS65KfEf1Boi8yDjnBf16UmoBv7Kjhg hC2swZAyQnXdxpBNuH2FxdjYdYz8AkcGAZA2KYSN78/jKD/h2wbTAyxs0ymIr1p1Mq4F Y1HSt7iG9+9mzsitvcV39aBWDf+GvfXnL/k4lr7UjTsPUKoaAGU8mnHJ168F9Emj15NI 0Epen4/QpLLzqjLa7RKUmd/NHOcYDH9AmFjUVG99gM/KHn/akOEGsoaEt8k8XIfgrHFB VoBvjz0U7SCGGRfNghAqRBxI3Q1MK8ZzHORXnc4L8C5mnZzJA5X0AMI6HRTIQIAo1qto NZRQ==<br>\r\nX-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=lbjwR/V72pUhdgWfeF1sHQCmKh6xsyFaNAKB6gXhLt4=; b=CnZhtnYrXzS5pToSjiA0zF7ARSzvIB04s59YyoyGnHNwPut6O2OHyhcPaadQK9NBzx GdLXq3pNmimwKDH47hfH5+P+d2f0e8uc7x13MAuCmAimv+C3FYSqPjvsi5ZwcnDencqp nIWNE36fwbXJwEyXbi7rrHQ4d6b19kWfrDqSXltDSE579VdWYNvHf5409Xlq0O7+/OtO Ni31HQCtfnSwxOwVLhI7Qu90PdByV2j2nIFYjdPCasP0fcDijK+R0Pyh+9YxshIlWL4a AG5Zt/ur+Nh4dNAQZrTreeOq4qk0Hkbw8NkwcqPxUCmf8s0B7tzkC3sC0T7wuhNVhlOn DgFQ==<br>\r\nX-Gm-Message-State: AOAM533DCe+o7jGC0a17xx9VTpDlRbANyf4yHIjIZ+nDdPmr0ozjOiPP LidUT/32DX7JBOihs8Zko+g6zZcrnbEeujKkJfmAfvom6eg=<br>\r\nX-Google-Smtp-Source: ABdhPJxjFaoCelUvYZIsfsIahzwjSqY9aUhFSza0JoMtEil7IV6GFEhnLjBtzO4mY1MJuKCpUxB9OYZSY9fFi1t6Kw0=<br>\r\nX-Received: by 2002:aa7:d596:: with SMTP id r22mr20209057edq.204.1598534562319; Thu, 27 Aug 2020 06:22:42 -0700 (PDT)<br>\r\nMIME-Version: 1.0<br>\r\nFrom: Simon Chaval &lt;simon.chavalpro@gmail.com&gt;<br>\r\nDate: Thu, 27 Aug 2020 15:22:29 +0200<br>\r\nMessage-ID: &lt;CAC5uxV1z5GCsb81DAVV9yT4zB4yKRPZp54MDBX7ioAu-gV1-Ow@mail.gmail.com&gt;<br>\r\nSubject: Candidature alternance<br>\r\nTo: job+2@nltechno.com<br>\r\nContent-Type: multipart/mixed; boundary=&quot;000000000000bfe56c05addbd441&quot; ','2020-08-27 15:22:43','2020-11-04 11:28:30',12,12,NULL,NULL,5,'','Simon Chaval','simon.chavalpro@gmail.com','',NULL,NULL,NULL,'CAC5uxV1z5GCsb81DAVV9yT4zB4yKRPZp54MDBX7ioAu-gV1-Ow@mail.gmail.com',1,NULL),(113,2,'(PROV113)','Bonjour, je suis en licence professionnelle DAWIN à l\'IUT de Gradignan et vous joins mon CV et ma lettre de motivation afin de candidater à votre offre d\'alternance.\r\nCordialement,\r\n\r\nYann Pinout',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Candidature alternance<br>\n&Eacute;metteur (From) : Yann Pinout &lt;yann.pinout@hotmail.fr&gt;<br>\nDestinataire(s) (To) : &quot;job+2@nltechno.com&quot; &lt;job+2@nltechno.com&gt;<br>\n-----<br>\nBonjour, je suis en licence professionnelle DAWIN à l\'IUT de Gradignan et vous joins mon CV et ma lettre de motivation afin de candidater à votre offre d\'alternance.<br>\r\nCordialement,<br>\r\n<br>\r\nYann Pinout<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job+2@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp570237jal; Thu, 27 Aug 2020 06:26:49 -0700 (PDT)<br>\r\nX-Google-Smtp-Source: ABdhPJxqM78sFtXLPTRUo47FDgLLr4+PVsEEULXINQpiVTA+FEXfRtfDJ5UXA+K/wJHNHE/uR+xg<br>\r\nX-Received: by 2002:a50:d4d7:: with SMTP id e23mr1650774edj.289.1598534808778; Thu, 27 Aug 2020 06:26:48 -0700 (PDT)<br>\r\nARC-Seal: i=2; a=rsa-sha256; t=1598534808; cv=pass; d=google.com; s=arc-20160816; b=T2YdeQcz/wAevoSz1tYvk1Ub+eHtf+4/7XV+OAZIGi/WXl4pEHjBvcLOqryyDQpg8c sDHvdlQeXxcRuvekM8MviMiIu+tsPfHsh4LiyaDq26jRjXs+NtQSpYNPFpYp2pLsJxTr ZlLerw8LQRxAzR0MZFIgHa3c7VI0nlzER8m+3qlZ+NdYfSYhN21CI6AmOM0i/C7EGjz0 AzGawmkc9HeTL9Sbs47LL9yyWbIuV+PNpRRpNWgKw8SdnFjCx8mQLnWpqxY4szImiTOO 5ed/3F04EDquMX6FYH6GY0xPB+GNR5Vvcfd5m9aE8KNNpVEzsLs8jPj4w7aB6xzcDVM5 vyWw==<br>\r\nARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-language:accept-language:message-id:date :thread-index:thread-topic:subject:to:from; bh=a/cGgPPIjBoP8cKGbl6Abw5b/p/NWPp8iodhhPKPs4k=; b=g7fxJOnHz0HrRYqjI9zoSNTKkfmZUOTVZTKDpKO5ICCQiqldAp2Z//ia8fyKwJuqJ5 kFZggKR6dTG6bzvNMXrguvp3G3fIHYsHfnC5noa+M6pGy6bdt1Ve9x3z4Ar/ykW1dUKi 65K8MFf+ssdVqJeMgJi604Cyqrz/dvbHxzH8YEx+Dfnd9tBTBtFak5bZM8iu8l0rCUqC juCS1Uc/QKYJI4ZasKUoopdljf3OKlvrjHq/5PL94bVA33bQEipMGAEiEZWlUpwdDO8s CRTz4ZG3DJ9+XggrGSM9Mjhv4rRjDI3FB45/y9tvXyiDPFcZMKhUB8tnqzyyIbg+/aY7 nNQw==<br>\r\nARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of yann.pinout@hotmail.fr designates 40.92.17.79 as permitted sender) smtp.mailfrom=yann.pinout@hotmail.fr; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=hotmail.fr<br>\r\nReturn-Path: &lt;yann.pinout@hotmail.fr&gt;<br>\r\nReceived: from EUR06-VI1-obe.outbound.protection.outlook.com (mail-vi1eur06olkn2079.outbound.protection.outlook.com. [40.92.17.79]) by mx.google.com with ESMTPS id t4si1424499ejt.506.2020.08.27.06.26.48 for &lt;job+2@nltechno.com&gt; (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Aug 2020 06:26:48 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of yann.pinout@hotmail.fr designates 40.92.17.79 as permitted sender) client-ip=40.92.17.79;<br>\r\nAuthentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of yann.pinout@hotmail.fr designates 40.92.17.79 as permitted sender) smtp.mailfrom=yann.pinout@hotmail.fr; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=hotmail.fr<br>\r\nARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BI2kr+chMyFAuIhFFXaOUmZkiZJ5+kYHV+HtajG0MCo7KhTDii2mmeWB16gxJH/Ckc8N33mktu48NSzcDD3WxH78UO4gMxhNPGSCUZQJrg5ORZuLBjlpho1kATyu1Op3Dy9wvjgDbOc4UKSVAqIHkAxYsDxz8jg0Y5IiPyn/bOnX6fEWANk7ZCCbvcyHPrShjAkMWliN7htwZqn27NjftWo5nEzTCj7RG9WvNnAqJ7gPV609eiZYtQmO63p0pzx8hEXeXGYLhuHRorC2wO+oFCpD01cxOj7ztopKFcN4LHu6qaGSKP3YDyUbZPiKlL4Y58fSf750R7QhGMcu702cYQ==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=a/cGgPPIjBoP8cKGbl6Abw5b/p/NWPp8iodhhPKPs4k=; b=MZvxfVlxv2jt7q+XBesfIbq5twChDKa+x2LYtYaNMg1kA0b5m+GfFuT/icjCDYerlzV1I89ofUq5YL0QTHmIoIPEvKx0EPgle9rVscxUCCN0HuOcukeNiDm/UiVW2YsvS7ADSNxoFL0gefHNzei0nZny8RM9ZJYAz110zPyEm1gPkLwrculWYNBh4smuVue2Z2QBI+5Tkius+mo5lUXqrkVTEAUp7InPHoa/e8M5rT9N4/Is/GcIbFawlTYUf88l5QnjSdFmMFeADDEMq/rmhSme4yaXz9AM/i8TssBPtOQyM+mAGyw72XZoK0Yz4FvQBTp3q/XCUqE2/Tfo2GKgJg==<br>\r\nARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none<br>\r\nReceived: from DB8EUR06FT068.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::4f) by DB8EUR06HT014.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::283) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3326.21; Thu, 27 Aug 2020 13:26:47 +0000<br>\r\nReceived: from VI1P191MB0526.EURP191.PROD.OUTLOOK.COM (2a01:111:e400:fc35::53) by DB8EUR06FT068.mail.protection.outlook.com (2a01:111:e400:fc35::378) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3326.19 via Frontend Transport; Thu, 27 Aug 2020 13:26:47 +0000<br>\r\nReceived: from VI1P191MB0526.EURP191.PROD.OUTLOOK.COM ([fe80::d50a:e327:65b5:254d]) by VI1P191MB0526.EURP191.PROD.OUTLOOK.COM ([fe80::d50a:e327:65b5:254d%6]) with mapi id 15.20.3305.032; Thu, 27 Aug 2020 13:26:46 +0000<br>\r\nFrom: Yann Pinout &lt;yann.pinout@hotmail.fr&gt;<br>\r\nTo: &quot;job+2@nltechno.com&quot; &lt;job+2@nltechno.com&gt;<br>\r\nSubject: Candidature alternance<br>\r\nThread-Topic: Candidature alternance<br>\r\nThread-Index: AQHWfHWZqgJ3GwNTPEm4szn8kLbLcg==<br>\r\nDate: Thu, 27 Aug 2020 13:26:46 +0000<br>\r\nMessage-ID: &lt;VI1P191MB05265C2E52666974C20741CE95550@VI1P191MB0526.EURP191.PROD.OUTLOOK.COM&gt;<br>\r\nAccept-Language: fr-FR, en-US<br>\r\nContent-Language: fr-FR<br>\r\nX-MS-Has-Attach: yes<br>\r\nX-MS-TNEF-Correlator: <br>\r\nx-incomingtopheadermarker: OriginalChecksum:E2A057DA755BFF1143316C81E401C6AC30981EDBD197D96507670D304CD1B10D;UpperCasedChecksum:DECF60FFEA4FB84FB505C5ED1A91ABF8C6EC59778EB67D2ABBEC57AB31B6222A;SizeAsReceived:6596;Count:41<br>\r\nx-tmn: [DuuRjaGJNS0aHT0AQB2cpU5gvl+qQtxo]<br>\r\nx-ms-publictraffictype: Email<br>\r\nx-incomingheadercount: 41<br>\r\nx-eopattributedmessage: 0<br>\r\nx-ms-office365-filtering-correlation-id: cbd3a477-d705-4c5d-ea30-08d84a8cd906<br>\r\nx-ms-traffictypediagnostic: DB8EUR06HT014:<br>\r\nx-microsoft-antispam: BCL:0;<br>\r\nx-microsoft-antispam-message-info: Mg40/7NGdNbrVoPstEvZ22wnRDy0simrNhnEpGVQ705RfQqhFb+KqPCY4ZLytLgMhXyBiFbYomXmv62dJ1K8KvjKI9gV7hzi4P1dtTiNBF0m/PRLwydw8zmr3XRJHB/fnSDA46vDLJMpHAHhH8kY/Q9/QwUddGUn76sE8+OnGvQY98PFkAiSkwMBWJjpJNz0d3vKUSynaVf3071GgeCfCw==<br>\r\nx-ms-exchange-antispam-messagedata: IChaingrzWDR/1pt7BYFStJ3tujWzlU0bTjU9H0iG3tNbX+C9Q3u5jKSPP++62uhW1hvcHHdh/Olo4foMECP/JtSdzPuCBBENiuLG3m0F52aBvc4rM+uLGROb46J1uz/JfPHRINloRjqjR9epTh/RA==<br>\r\nx-ms-exchange-transport-forked: True<br>\r\nContent-Type: multipart/mixed; boundary=&quot;_005_VI1P191MB05265C2E52666974C20741CE95550VI1P191MB0526EURP_&quot;<br>\r\nMIME-Version: 1.0<br>\r\nX-OriginatorOrg: outlook.com<br>\r\nX-MS-Exchange-CrossTenant-AuthAs: Anonymous<br>\r\nX-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT068.eop-eur06.prod.protection.outlook.com<br>\r\nX-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000<br>\r\nX-MS-Exchange-CrossTenant-Network-Message-Id: cbd3a477-d705-4c5d-ea30-08d84a8cd906<br>\r\nX-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000<br>\r\nX-MS-Exchange-CrossTenant-originalarrivaltime: 27 Aug 2020 13:26:46.8801 (UTC)<br>\r\nX-MS-Exchange-CrossTenant-fromentityheader: Internet<br>\r\nX-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa<br>\r\nX-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8EUR06HT014 ','2020-08-27 15:26:48','2020-08-27 17:41:02',12,NULL,NULL,NULL,0,NULL,'Yann Pinout','yann.pinout@hotmail.fr',NULL,NULL,NULL,NULL,'VI1P191MB05265C2E52666974C20741CE95550@VI1P191MB0526.EURP191.PROD.OUTLOOK.COM',1,NULL),(114,2,'(PROV114)','Bonjour,\r\n\r\nVous trouverez ci-joint mon CV ainsi que ma lettre de motivation pour le\r\nposte de développeur PHP en contrat d\'apprentissage.\r\n\r\n\r\nJe me tiens à votre disposition pour toute information complémentaire,\r\n\r\nBien cordialement\r\n\r\nKiady Ravleoson\r\n(07 67 01 49 29)',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : ALTERNANCE - Candidature au poste de d&eacute;veloppeur PHP<br>\n&Eacute;metteur (From) : Kiady Ravel &lt;ravelosonk@gmail.com&gt;<br>\nDestinataire(s) (To) : job+2@nltechno.com<br>\n-----<br>\nBonjour,<br>\r\n<br>\r\nVous trouverez ci-joint mon CV ainsi que ma lettre de motivation pour le<br>\r\nposte de développeur PHP en contrat d\'apprentissage.<br>\r\n<br>\r\n<br>\r\nJe me tiens à votre disposition pour toute information complémentaire,<br>\r\n<br>\r\nBien cordialement<br>\r\n<br>\r\nKiady Ravleoson<br>\r\n(07 67 01 49 29)<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job+2@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp610700jal; Thu, 27 Aug 2020 07:19:11 -0700 (PDT)<br>\r\nX-Received: by 2002:a25:d56:: with SMTP id 83mr32640739ybn.33.1598537951183; Thu, 27 Aug 2020 07:19:11 -0700 (PDT)<br>\r\nARC-Seal: i=1; a=rsa-sha256; t=1598537951; cv=none; d=google.com; s=arc-20160816; b=ZwzKaw4MnVkAHwL8ubnIUw/GlIaORtRfE26EPpibjBKpSVyTJHZGTp7vwpoVprMkuj mwWKSJxIKxS1EjFwPXEcIH9YTOmoA6gaXOIbLPnmYReBebR5T3cbmnARAPRL5ggsLuVs XwYSZKQkLMFu7K8CGp3PtKvXB+V/qG1O+2AvXfg17RVsWJJYJ9YlD+gbyrLqvex/nbgw jZBp42X4JF/dMl6bbZsXA805+5Cv6P1zf6VOW3nk/kRRpPLt5DC2GBqU5hSKJ+EO+Yr9 VsRoiE0LtX0gnjKvl57GvjYvy0X1KIm52TlTvV8upS6++6wv6030REb2fS1nr09HnvTP bCiQ==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:subject:message-id:date:from:mime-version:dkim-signature; bh=3Ta+nXkwmF2kTLKH98FJqECXngz2TB6Xjb0yGrWVCYY=; b=KD6g9cDJGZERmxRbQLnXPah8NUuY0EhiJRnCY6LLvoDp1lVCznIwMAD91LT3HFB2pO 5Oe/bHNa+nxgOxvdzJLGW4Gtia5U6o5JARydHHeQSbuNktIngkYgc0TtHrETi1de+aMx mmsSpwtfQ7Lhk7LGqo/t5NXDfXYsIbwBRaJ+mkFAcJwzD6hiMdlMZYM1FNDaQsWsvaAt FfAORX8tK/cJcXTSNZGowjFLVf8oHXN4ARjr3wB++yfyis9c+EqVFZUBKX59YGn+j+T1 CY3QgqgHcnqD/mfSV3rAEl7sZfVyQuteN8euiL6chAeuqoPGVhQ4c8nLOyC3NRIltB5G 2Slw==<br>\r\nARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=M2Z8YJch; spf=pass (google.com: domain of ravelosonk@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=ravelosonk@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nReturn-Path: &lt;ravelosonk@gmail.com&gt;<br>\r\nReceived: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 8sor661456ybc.168.2020.08.27.07.19.11 for &lt;job+2@nltechno.com&gt; (Google Transport Security); Thu, 27 Aug 2020 07:19:11 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of ravelosonk@gmail.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=M2Z8YJch; spf=pass (google.com: domain of ravelosonk@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=ravelosonk@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=3Ta+nXkwmF2kTLKH98FJqECXngz2TB6Xjb0yGrWVCYY=; b=M2Z8YJchWaWTp5XXbO4jl/ei9U5ZPAjvjqDbJQv7ON5Gf18/phfyOW1SQueYdP3Kxz c+xu83jOHDGUxUFPn3dIfQHX8IpxQLLCzBDzs8ZszxROL8ThAU1lVgDgQgtGZQgzl9U4 DhumEjewQowu78hsQ6eQJAQEZmqNbhaOFImsx896YpmCu1N0QHv9zRVL3oCok5koOUjY 0Sz/GiiILkCNjXYShRCw/HNm58Ly6Utma3+fa4FuTIAEcX3zDiXPjQRsLVCHkdF4EVvR t+eGhhOSVHiveuj81TkcRJfiFkAw3B9hXY5drFkaJOp7eoDRmq3EPALqfAWLh1J6Ji/K h80Q==<br>\r\nX-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=3Ta+nXkwmF2kTLKH98FJqECXngz2TB6Xjb0yGrWVCYY=; b=nJC2ShN9VLqMtBPRbRlm3husvf2imeNU7laFgfZg5WYs0Y3vSo/WkL9mcaBwuUhdi8 BbQV/qR7UhtDvueB923cT9FelurvoHCvKn0UY4uvJT3s+SSyjsPFW19aPOpCqW31xdql /cnHlAlAY2eQVDX5eG+WjMwS1zEEkZMlg6UGqI1lp8IW2CpJPxqPdDAzenMWy+DiuUgp jps3cfFtsHnLevpmkU2zOJiQAxTZVxQpYBnGuzqK0dIvzJf9jnsiJPZinZa5quJCm+ej otIyCyAKknWxKrNA2aPl8TCWd4yu+3HtZ/KbPtkupwNWQ0EPjNa0s5aK6BXvbhwr1brJ Kz/g==<br>\r\nX-Gm-Message-State: AOAM5327U2hn1h5xTANlL9o+rnQG5038apwVX7eLCZIP8V7bx+v/oUDA 4ARa1VgCwDGX24I64SupGhCyQfQV2Va2Jf/+BlYX4GAoQXY=<br>\r\nX-Google-Smtp-Source: ABdhPJw5jKFu3PxDsQEH6awgM/aQh9R/2DXNotdMWuEYKuj1ji2PpE8mRWgKOMjidI4oU8Q1umWcmAWg4iUUtmRiXlg=<br>\r\nX-Received: by 2002:a25:7401:: with SMTP id p1mr27127920ybc.10.1598537950315; Thu, 27 Aug 2020 07:19:10 -0700 (PDT)<br>\r\nMIME-Version: 1.0<br>\r\nFrom: Kiady Ravel &lt;ravelosonk@gmail.com&gt;<br>\r\nDate: Thu, 27 Aug 2020 16:18:57 +0200<br>\r\nMessage-ID: &lt;CABrVn-wV=Q49kV_ZyMCv4taWjee-cL=FhPQ=1-AZAhou-Ww5Dg@mail.gmail.com&gt;<br>\r\nSubject: =?UTF-8?Q?ALTERNANCE_=2D_Candidature_au_poste_de_d=C3=A9veloppeur_PH?= =?UTF-8?Q?P?=<br>\r\nTo: job+2@nltechno.com<br>\r\nContent-Type: multipart/mixed; boundary=&quot;000000000000b0724f05addc9e89&quot; ','2020-08-27 16:19:11','2020-08-27 17:41:03',12,NULL,NULL,NULL,0,NULL,'Kiady Ravel','ravelosonk@gmail.com',NULL,NULL,NULL,NULL,'CABrVn-wV=Q49kV_ZyMCv4taWjee-cL=FhPQ=1-AZAhou-Ww5Dg@mail.gmail.com',1,NULL),(115,2,'(PROV115)','Bonjour,\r\n\r\nJe viens de la part de Romain Bourqui, je suis actuellement accepté en\r\nlicence pro à DAWIN sous réserve d\'un contrat d\'alternance. C\'est pourquoi\r\nje vous envoie ce mail pour vous exprimer ma demande d\'alternance au sein\r\nde votre entreprise. Étant un élève motivé et sérieux, j\'aimerais passer\r\nmon année au sein de votre entreprise qui permettrai d\'approfondir mes\r\nconnaissances et compétences professionnelles.\r\n\r\n\r\nMerci d\'avoir pris le temps de lire mon mail et d\'avoir pris connaissance\r\nde ma lettre de motivation et de mon Curriculum Vitae joint ci-dessous.\r\nJe vous souhaite une agréable journée.\r\nCordialement,\r\nSEGUINEAUD-GANCINHO Bryan',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : candidature en alternance<br>\n&Eacute;metteur (From) : Bryan gancinho &lt;gancinhoseguineaudbryan@gmail.com&gt;<br>\nDestinataire(s) (To) : job+2@nltechno.com<br>\n-----<br>\nBonjour,<br>\r\n<br>\r\nJe viens de la part de Romain Bourqui, je suis actuellement accepté en<br>\r\nlicence pro à DAWIN sous réserve d\'un contrat d\'alternance. C\'est pourquoi<br>\r\nje vous envoie ce mail pour vous exprimer ma demande d\'alternance au sein<br>\r\nde votre entreprise. Étant un élève motivé et sérieux, j\'aimerais passer<br>\r\nmon année au sein de votre entreprise qui permettrai d\'approfondir mes<br>\r\nconnaissances et compétences professionnelles.<br>\r\n<br>\r\n<br>\r\nMerci d\'avoir pris le temps de lire mon mail et d\'avoir pris connaissance<br>\r\nde ma lettre de motivation et de mon Curriculum Vitae joint ci-dessous.<br>\r\nJe vous souhaite une agréable journée.<br>\r\nCordialement,<br>\r\nSEGUINEAUD-GANCINHO Bryan<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job+2@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp631024jal; Thu, 27 Aug 2020 07:47:33 -0700 (PDT)<br>\r\nX-Received: by 2002:a7b:c015:: with SMTP id c21mr12179401wmb.87.1598539652642; Thu, 27 Aug 2020 07:47:32 -0700 (PDT)<br>\r\nARC-Seal: i=1; a=rsa-sha256; t=1598539652; cv=none; d=google.com; s=arc-20160816; b=qMxoQicSftnyF5MzWw3yB4QTp/2TCdBuB2TaBc1yAJSmyWnzpBkprqYVHPmeQyk2jI ni6NJyieY5ZcOYePb2Awe3hrXUWkWXTt1DZzPM6rlAdsDd2FBwS8EcKhbocsxs2B3THo iAZvHJBXu/orjDMnQIOfcMATSigu/dk/EeWrpa/BcazGFpUdgDnkXaKAgJYLye5C2BgN dIwdft7K9JKDI2IUKoivmO9m3aM4qlsWd4aFXrWSLCu0zZdSBAiwjtimHJsyW5DEVnIc JxnndKdHO9aShCvSf+rolYhgRFPWwwYG0MUwpNJyDDDmsMOlRWuXzaz1rjt36KnsfBXV iCrg==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:subject:message-id:date:from:mime-version:dkim-signature; bh=I/CDu6k60y7EveaJ7MzaN8Qpwprn3nIb6gm0Snox93A=; b=zdXsxLcOyAgv5VKDsB+dCAnyPgtt1GJ2gDoosEb+/ap8CpdrSjT0aEmjE1VmzmQd/O qBYQ1JNDpPAY3cGH292pTQKs5L/EWXZrxEofjJBOqYJMWTDM3H7lMqZ1yPLYUJd6kPsG 71/uRcDm6f5robVTO8Qa0XOv4dxnhgC2sj7XDlkC6TRCkRDy4H61mJ1A539XKuLM1uL2 MU42Wwq3VTnyFKJ9pORzgZJuiuQXdFlJNMqKvIi7ui1v3+63CgXyKGPkAmLtYrZlmtfW bCNixWcwMS+IInHW9uLC/Bh1pYNW1nceZIWsByH/4tgjmso2hGUya3LksSgwpUUFVuhb 55xw==<br>\r\nARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=&quot;AiSeix/h&quot;; spf=pass (google.com: domain of gancinhoseguineaudbryan@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=gancinhoseguineaudbryan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nReturn-Path: &lt;gancinhoseguineaudbryan@gmail.com&gt;<br>\r\nReceived: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id g70sor1526146wmg.20.2020.08.27.07.47.32 for &lt;job+2@nltechno.com&gt; (Google Transport Security); Thu, 27 Aug 2020 07:47:32 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of gancinhoseguineaudbryan@gmail.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=&quot;AiSeix/h&quot;; spf=pass (google.com: domain of gancinhoseguineaudbryan@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=gancinhoseguineaudbryan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=I/CDu6k60y7EveaJ7MzaN8Qpwprn3nIb6gm0Snox93A=; b=AiSeix/hbW5hK/iyoNdPtz5VOrcgW+T2YiL0+aCogxihJ+UbhYG4ennc3M6kzIkUOw m2vJ5XQL+wY1J3JF9JF1bFXQcPZ+YO1wou043AIDAk0QGpOpkG3lByER8H9IZl5pop8O 3hQjjwJxz0pwlF3Wqqc6aKOelNcNSEgAVGdEWaXwriZZRu+PApcTXGVryonuCIKjnY2o whtFbhUw0U/APkrLjAzbJVQHjVi3m3EYMNTjYhyboXT35TMVRVzQdSqKtPa8dDdRNo/f 3lssrqrjDm+jurRwwQu4psAwfM1a+EhkiVfoJBjfAnUKN6Mvd/UhAZ6lWbSLDiCO0ZNs 3qiQ==<br>\r\nX-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=I/CDu6k60y7EveaJ7MzaN8Qpwprn3nIb6gm0Snox93A=; b=fDjtov1On7DQg0gpYbcOmg8iGI4k0t5ZVThODsIjYaQGn4QN35/7P48e2qZxNpzpHP JRy5U2Vz6zjDe7wr4oedF9Z9VXRqowRWfSOg1KnStV2RBzs22Q+0c71laAZ1eoT//T7v 03/IpTyFE8TnuA/hrkoNbP5nCjzuVqgGwg7ypJRNlh/Z6eTpwHXKRarj+p5HW3NtuUa/ 5t2ZhFuKITASWvgAjdakrJF6wrRXS9vS3wG5I3UhekEdtYx3tLe4wr14XppsvqIkvjCW 7dUytmjufKvATfDItK2AYjA2YFnERtCw0POnlEqKXKZkUbaafdJwySraBshO7jtjlOb5 8OYg==<br>\r\nX-Gm-Message-State: AOAM531p5pKdXTCe5DMRyLe9U4RlNReieKCeNbxGtq7KBDrEPDdWGoOW VPOOPxgRVJ7Hg9hDYyxqg9F88x8lFlwdtrvhfxlLQhNBDcM=<br>\r\nX-Google-Smtp-Source: ABdhPJym2Ff06FxbQ/Ax5s33B4OAI06UcqGsUZgvxSpGVisXUhVvznPK/jOaYG+XUnLc7XOH6jayBWm5xGhRo/i/yFY=<br>\r\nX-Received: by 2002:a7b:c255:: with SMTP id b21mr11869674wmj.41.1598539651594; Thu, 27 Aug 2020 07:47:31 -0700 (PDT)<br>\r\nMIME-Version: 1.0<br>\r\nFrom: Bryan gancinho &lt;gancinhoseguineaudbryan@gmail.com&gt;<br>\r\nDate: Thu, 27 Aug 2020 16:47:19 +0200<br>\r\nMessage-ID: &lt;CABLkQPN-opuG+cxjBcB2jY7BDDuC7v8pWj3_ZkFhkhiRe8apsw@mail.gmail.com&gt;<br>\r\nSubject: candidature en alternance<br>\r\nTo: job+2@nltechno.com<br>\r\nContent-Type: multipart/mixed; boundary=&quot;00000000000017e56205addd040f&quot; ','2020-08-27 16:47:32','2020-08-27 17:41:05',12,NULL,NULL,NULL,0,NULL,'Bryan gancinho','gancinhoseguineaudbryan@gmail.com',NULL,NULL,NULL,NULL,'CABLkQPN-opuG+cxjBcB2jY7BDDuC7v8pWj3_ZkFhkhiRe8apsw@mail.gmail.com',1,NULL),(116,2,'(PROV116)','Bonjour M.Destailleur;\r\nAprès avoir reçu par un mail du responsable de la licence DAWIN, une offre\r\nd\'alternance concernant votre entreprise, je me permet de vous adresser,\r\npar ce mail, ma candidature à cette offre d\'alternance développeur web.\r\nEn effet, à partir de Septembre 2020, je souhaite intégrer la Licence\r\nProfessionnelle (en alternance) DAWIN de l\'IUT de Bordeaux.\r\nJe vous transmet donc en pièce jointe mon CV ainsi que ma lettre\r\nde motivation.\r\n\r\nCordialement\r\nLAVEAU Kevin',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Alternance D&eacute;veloppeur PHP LAVEAU Kevin<br>\n&Eacute;metteur (From) : Kevin LAVEAU &lt;kevinlaveau7@gmail.com&gt;<br>\nDestinataire(s) (To) : job+2@nltechno.com<br>\n-----<br>\nBonjour M.Destailleur;<br>\r\nAprès avoir reçu par un mail du responsable de la licence DAWIN, une offre<br>\r\nd\'alternance concernant votre entreprise, je me permet de vous adresser,<br>\r\npar ce mail, ma candidature à cette offre d\'alternance développeur web.<br>\r\nEn effet, à partir de Septembre 2020, je souhaite intégrer la Licence<br>\r\nProfessionnelle (en alternance) DAWIN de l\'IUT de Bordeaux.<br>\r\nJe vous transmet donc en pièce jointe mon CV ainsi que ma lettre<br>\r\nde motivation.<br>\r\n<br>\r\nCordialement<br>\r\nLAVEAU Kevin<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job+2@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp636007jal; Thu, 27 Aug 2020 07:55:10 -0700 (PDT)<br>\r\nX-Received: by 2002:a17:906:c7cd:: with SMTP id dc13mr20977219ejb.446.1598540110546; Thu, 27 Aug 2020 07:55:10 -0700 (PDT)<br>\r\nARC-Seal: i=1; a=rsa-sha256; t=1598540110; cv=none; d=google.com; s=arc-20160816; b=xBKHL5RUO+LL+YUTo/q2v35yBLkyrZ3aN4V0OeZ1+as/Ndp12w/r8hmIsQ3RRAJBRn luPCD0D2XUTxM8G7o17WtXITzbd1u6eLqf6unqd50L62gtHbNQsXnG+gFSqHqgDafwRk +JthoU4wGE6dVb1xfm81/f/b5vHcJHUiCDGp1nnOsgW67s8/1t1MQZQqQr/c7HGBK2xO n9boAzj6oX75+MGMM/aHjw2DqufwSZ85WUFreSfn4b9TawpIwPmOhcO3xLFQ9olyVJRs r/GjEDIIJUvW7hXIS1SjTWJWCiwBDDUTKAuzTaW6oIl6WcvmkZ5fCBgdASFzZs2/f9M2 fWXQ==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:subject:message-id:date:from:mime-version:dkim-signature; bh=Fi9XE+VZ9w2StOAIZNaBrAYz+o4ULZvNJ6gYoS1aGPI=; b=LpcVH6a9YM9zM0scyiXzcvxIFWYGRcG7nTkqdflSpuYvfi25o6ADmPh3XDQEXlKazn Unyu+CmpE8BLmfdw2Kam1QGp/Bul1urfG00jSWP+CeQ1d9kynRVXTINZBpDWWY0WXf0/ XTvbyG9R8Uebn+szg0caqdi3JtZ6Jn+/E8jNNlxSqoC6KEIdd57qVO8eZGU4JZ5wrQ4e 2+KXO11AQaLyxFYO3pXsBIUEd3lnDpONKBJ+QjFMqB0TQ0GASozIOnw63ps7JrzLwIr6 IvuTtU1nPJNhZWYGoae/dZnnSs040BSrZ2B+w9INMT4Xgxb1bPyJ4Gle0doCgbp4JrF/ iw8w==<br>\r\nARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=qa6yRd6D; spf=pass (google.com: domain of kevinlaveau7@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=kevinlaveau7@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nReturn-Path: &lt;kevinlaveau7@gmail.com&gt;<br>\r\nReceived: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id h4sor1324507edq.11.2020.08.27.07.55.10 for &lt;job+2@nltechno.com&gt; (Google Transport Security); Thu, 27 Aug 2020 07:55:10 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of kevinlaveau7@gmail.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=qa6yRd6D; spf=pass (google.com: domain of kevinlaveau7@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=kevinlaveau7@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=Fi9XE+VZ9w2StOAIZNaBrAYz+o4ULZvNJ6gYoS1aGPI=; b=qa6yRd6DuNfaiRQsw2Tnz4T6DpSEbEGYzy4pu86wjTfcUtbM2vARcgsIydE0y7BEB3 Wi5bomaH7+Yq8N804CfvC70UIm7vayuuViCkyuWBhkLEkd7qRGsdoSxr+JLsqmQl7Phs yw+0gRAVokpooSA4IiH83j/qDGwEx3rgFx1i+OpSmmb8nqlqzxAnOMEJY6iTXFAh3f2T m9AhNUtAIVZJnH9xwETM3cvtSMfz7+Ft+zegY0ENWjcIESEarFvTHzJWQgm//vHcSLuX FreFYv3K8ir1cpPefYeqo7ttK8roR/LpzXrP0C81LcJnxD9riWKAtJWRzhzZrfIsczW6 5mBw==<br>\r\nX-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=Fi9XE+VZ9w2StOAIZNaBrAYz+o4ULZvNJ6gYoS1aGPI=; b=bF7+sfiU3fpM/JZ9ka5bZ4ReQbg09+nEH8qcHpXUSRc059NOmwW040u1Dn6Nu88L53 4D7htPaggO/MdYEp9T6xn8Et7QMSSvvX9aY3qgxgnxKKVCUWOwW/9x27TQa5L7dkpH2k gNCZk/r79qfbrgm3+dbpmNKDGXIQPxSgGP+Q++tt81rIs6ySTGOyl0s0gpzJyzyBI3h1 ojpAEhlvfedN4/EaVc/Ts+fTCNsBFUzh9ZkjC/1icraeoLF27Yil4k73FCGNRTMPZXDl 9uVZnrW2VCQckK6wow8UCgoncK6uPQeypPvMMHdjzWAUcsiVL34yDCjGWKs2i1HJqluN Z4Gg==<br>\r\nX-Gm-Message-State: AOAM533ZFZMPr5+lVl8fU0njyAMtKAasYW5UQPJs+j8Lv3YQrhxtc97E DPa8VOxuOOxitMfGULaNhAZRIgItRIlvEUsruvubOcomPfA0WQ==<br>\r\nX-Google-Smtp-Source: ABdhPJyDOf5at1wKDEqXo/jsxH3qZP1fEuuH3B7G56S1jLv5m+HeKqN+8kr+MM6/dzBOX32qKAvCQ2XZfXFbDfa5psQ=<br>\r\nX-Received: by 2002:a50:b022:: with SMTP id i31mr10072863edd.17.1598540109459; Thu, 27 Aug 2020 07:55:09 -0700 (PDT)<br>\r\nMIME-Version: 1.0<br>\r\nFrom: Kevin LAVEAU &lt;kevinlaveau7@gmail.com&gt;<br>\r\nDate: Thu, 27 Aug 2020 16:55:00 +0200<br>\r\nMessage-ID: &lt;CAPwqOJ1CHZc4EJqypfYnkdfS8Q94Nqi18H7-0yJB28HERhcQYw@mail.gmail.com&gt;<br>\r\nSubject: =?UTF-8?Q?Alternance_D=C3=A9veloppeur_PHP_LAVEAU_Kevin?=<br>\r\nTo: job+2@nltechno.com<br>\r\nContent-Type: multipart/mixed; boundary=&quot;00000000000062757305addd1ff2&quot; ','2020-08-27 16:55:10','2020-08-27 17:41:10',12,NULL,NULL,NULL,0,NULL,'Kevin LAVEAU','kevinlaveau7@gmail.com',NULL,NULL,NULL,NULL,'CAPwqOJ1CHZc4EJqypfYnkdfS8Q94Nqi18H7-0yJB28HERhcQYw@mail.gmail.com',1,NULL),(117,2,'(PROV117)','Bonjour, Je candidate pour vos offres d\'alternances dans le cadre d\'une licence professionnelle en alternance DAWIN (fca-agen-gradignan@iut.u-bordeaux.fr).Veuillez trouver ci-joint mon CV et ma lettre de motivartion.Cordialement.',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Candidature en alternance<br>\n&Eacute;metteur (From) : &quot;jin.eric@yahoo.com&quot; &lt;jin.eric@yahoo.com&gt;<br>\nDestinataire(s) (To) : &quot;job+2@nltechno.com&quot; &lt;job+2@nltechno.com&gt;<br>\n-----<br>\nBonjour, Je candidate pour vos offres d\'alternances dans le cadre d\'une licence professionnelle en alternance DAWIN (fca-agen-gradignan@iut.u-bordeaux.fr).Veuillez trouver ci-joint mon CV et ma lettre de motivartion.Cordialement.<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job+2@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp648782jal; Thu, 27 Aug 2020 08:11:12 -0700 (PDT)<br>\r\nX-Google-Smtp-Source: ABdhPJyLFA/2MwX3iljH81gYzkqT3qy7VScedLIVRO4MMKmS5AZZhS7XVgwDq2an5/HzXsfLb22v<br>\r\nX-Received: by 2002:aed:26a1:: with SMTP id q30mr11682472qtd.25.1598541071486; Thu, 27 Aug 2020 08:11:11 -0700 (PDT)<br>\r\nARC-Seal: i=1; a=rsa-sha256; t=1598541071; cv=none; d=google.com; s=arc-20160816; b=IshkT26Ufas69FDt73sTXcSzo3gHbpOSvf+vsv6R0sewS5wg8wFBm32gQI2+PViYoP 0nQLTflG5npaHmXb9yagCqzkjvu68rEi+TAYNQ41w6oqVVNUsK8iQL/jOHo6PvyveHNz oPkOb2kYmlmkR3MtMcXEIEGTm3jxSGwj3eBqzrSEoTv+WO3N3TQa8xAtjyvNklbiPO51 Og87lRs23cd2VTSvPL0wx/hwRyow3rFSps2ThPe5gPX0DiUYGBbfbTPRicm8o4aM7ovK lajwGWAUoLfFLt2nY9s+GnPal2O9UpFG4ibImU0uWzzv2qp3Osk2NfT9H5S7nDupOUHV j0Vg==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:mime-version:subject:message-id:to:reply-to:from:date :dkim-signature; bh=w1y09eWWu03qRFSuxaxVcBTZGQXNPt3yMZ4O2EFfVBc=; b=x40Dou9oL6/WiklLTqC1t6gT786d9nY0j4GOQPADHh6dqUJ/vTi7elbnLPfNr3L+v3 CLsqQmhSAduJnXS6xi4sQsuijqMbxv8Bns84NUZ2frCWUTjZsFtbSrJV7nHxDqPwNvE2 l/THdWhXu9QmM6/EVnmCw81r7CmRSqimvIBnQJFEHkSq+SIoNN5JG43pPKxC+cEHyvsh NxTTbSiUX5Y4GohxdnF1zQFBLtJlv9EZPIDuJHPkzrWSnGh+AB9wc7dWmaG387CUy2p7 HlJqyFAr/L4p36ArQt66HCNOiGNQNmRmlazrgJwTOKc/q2f+juuW47+MHB5BUnWVDZ/j PnTA==<br>\r\nARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@yahoo.com header.s=s2048 header.b=&quot;D/+08XUN&quot;; spf=pass (google.com: domain of jin.eric@yahoo.com designates 74.6.132.123 as permitted sender) smtp.mailfrom=jin.eric@yahoo.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=yahoo.com<br>\r\nReturn-Path: &lt;jin.eric@yahoo.com&gt;<br>\r\nReceived: from sonic314-13.consmr.mail.bf2.yahoo.com (sonic314-13.consmr.mail.bf2.yahoo.com. [74.6.132.123]) by mx.google.com with ESMTPS id x4si1438763qkf.72.2020.08.27.08.11.11 for &lt;job+2@nltechno.com&gt; (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Aug 2020 08:11:11 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of jin.eric@yahoo.com designates 74.6.132.123 as permitted sender) client-ip=74.6.132.123;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@yahoo.com header.s=s2048 header.b=&quot;D/+08XUN&quot;; spf=pass (google.com: domain of jin.eric@yahoo.com designates 74.6.132.123 as permitted sender) smtp.mailfrom=jin.eric@yahoo.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=yahoo.com<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1598541071; bh=w1y09eWWu03qRFSuxaxVcBTZGQXNPt3yMZ4O2EFfVBc=; h=Date:From:Reply-To:To:Subject:References:From:Subject; b=D/+08XUNoekk67Io7AqUyWTJOuz431sr0ms+Cf98ev9BMHwb1F0WW4JgulcbPV3wqaoE5FrumhwuPLIsSRmVvHH8Wh5pliu2OTVBwrunIYM1q8KFVk+jW6DjLCz6EfcyXkwQU/e2WA5ivD+RcBXUByrfqfifAIIUQuSpb2hxLvID5jIR1hvuWBtVg8kgBpx0Y/6D0d0sR+R7dLpzObu9nbhRF487l5jP6ohcIR+ks3Gta6HEZB2pbidrCzWgLmjetbTMO40y9LjNCBMEm8bHKyJ46Y5fWJVxWsm8OmLdytnXMG6g7jrGBHoOlXZh+CQFalQQlc2JMsA+qjUO7BJ/rA==<br>\r\nX-YMail-OSG: ue6lYwkVM1lviuq4QILkqlp_QCRF9lDPlD5InpTwgP2BmZQUJu1qIWbmb85Bl1v fGn2wxQjThn3DHpHwgfhR03nTmAGk03j2jymF4y_NLP9lDtpy8_0pc2iikUX84XEdLw_9MzET_3I PFZK6zT5AXoHySY9adKep_ojPN.dg1ct1LbK0V2wuApgat2UOLoLR9qzX9O8HPGi_VQ8.xHkDUlt LVzthAzmCwRPW8Xy4AAPx8soXBmCQcnQoOLNG6tqTPohIwqsslbr1g.5ZunzsIZ.JUsJwbAGHQXi AnmKaEIBEPwM9vFdJF7KRrOGx7ATJ9BwF.vMY7ltOXpYFdt7YOWO7pM4IvlGeO0Q0UIUavYWhq2W oBG9HB1vI4jpwwZo8fl0f18vbNwK881HP716M9YSq91MCSjMQgij6WIU2QPwqgyTk2qw2_YHRttQ otbqQnGjLiK6.ycFGN9KYtH8VOm28Czim6mE7.WoVyaXON5i.IdNPRyJt1s6Eh.qCVHGHivGa5XQ oZHNUT5PwdpHDymaj6spizS8ZAQNdJdn05WiZ4a4JpLElAxqYUsmNMCWAGp6XQidC0rq8bkyMYz6 pQFC5OnoFb1cV93I09KJZmo_5sjhkas_Cnq3aB6rE_SJ8fZt8EJOxWdwsbUX2Z8emZnCsO.p0SZv cH86uVvkcmK_ODCDTG6v1bs3dxyRkDdGzlLe8uKEdMw6bRRttwaLhzCqrQXpR5DNSLOL3K1BqkkS 1pBDk4dAYes0udKtN1Libs7LIHuMj3sb230ngXeUPUhaLWnRFR_X0LlCUG9LITsom1avU4zQFCwl ZUMQidVycXmXmWDtFziTBOWeO_86XoZhM42G4U.uqcnSNPuCsL.2kG5ihcEncoutj3jE7aG8GtA7 9AVdIdgNOhF16tOZX2uELlVdxSFH0qcrvzhrppgtDe1IeFI1oaJMB1u9imVbWOhhRB0i.lf.0eH4 mFYCn.9Up2.5jnIu5jsFZCmapywTjtw8oKYxYcNcXBSCV78971NIhDfvLXjdtaEutkSVjSRBlQwV h4nOoSO.KBH5bWzNVEqq5.._z3vgKNNvcZGfzoDlFxz4aEGVrGmb5F2YH3plU2xtvkUxgVN4rroU JBf2WfX1B9xcCH6glCYQo0ZEmwk7GKFJ1Em1Fn_K28vmo_QQ1fBEbwuGR9EXFCDqGHG3Tp..Rcft _3g2gr.VywbY3QT3IOpYqr4Xpwbicp3njrx.MJxVn2K.fosJwxus.cKjtgWD9aAKuv_Thy.S9rn. LRCz9wsgZkAWnSB2cTImZQmmoaF1z5Kxq8H4_VEw4u8c34GaW9trHfn15F50lR2yVloVsAJemTMa 1DBUppiZi.ICgzFUtq2GWwpdHP_ABFiMsK.gN6L9xhGfaTNS6ejrZZ.z5OQIDspqFdRbHDP8IerE WAUQW6PPOW_yQHvHRQOp.mGV4HQR_I3GPACB6NVMTxuO5VaCfDKCGulpvs4FbkeLj3h0Yf0ZdOpx ekNnmFTJe1d.dxYjYDugeYkfII5Jce6fht8Srb2cHATb_cWYW3vyZ3UVNXjvWNoyqFz2S5ecCipV ojoDZiBKrm5__hXbvgfKFJDmt09Z5R9s-<br>\r\nReceived: from sonic.gate.mail.ne1.yahoo.com by sonic314.consmr.mail.bf2.yahoo.com with HTTP; Thu, 27 Aug 2020 15:11:11 +0000<br>\r\nReceived: by smtp406.mail.ir2.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 1f3cd8c72f2a3b257cf22434abc681fc; Thu, 27 Aug 2020 15:11:04 +0000 (UTC)<br>\r\nX-YMail-OSG: qGTTPlkVM1lZU2Uk2UwC95cgQILo5d7Lod5o57WnrIxSzNo426qHaswkkGk66Eo yDGppWQo9Xp5rOCezmVwgZDZjhC0HL7lDzRq4kq5hW_FkWuhbn4FFqkY1oS9huwd4MyO85jzHmQq jBWceTjqigMriq7EFDzfBSbnS65tP_A434DVmee2H14RqMOJG7rvCaPQ82o5Jp9a2YYeWb.ulXdy WxWkEVnUhU4xLLL50VJ9r1EvShaK6smW.5s2LU0zY0s3v0lUHJe8cD.29iCoC7rVrX2C7Ws2d.NA P7zJ.oaj045Z5fjqSTPYfvpuU9._RYv9bispIDdyrhYCtm8r.5UFleOCZWQ30T8q5Fp_U8IT2CqN 81CHdVHNaWbORUzQe.djyJnEOJxOr__yeFbbY5rJGD6rxoYV09.H4aqrFl.fOhKtsFsPquKs6bFD ocbfWFX2M9DEcQZzIzV3b2DKsFNwN9OTkfeWSVTI7BqNxxr4G6arDKW87m.feriqb2DgoA9hcM5_ Ll5XtactOQAXGa312Yk35_e4uPdbBgHTpogC9VLO3agpMRMtClXMaPrwXBhdRT5pkxhqUFW3sE7_ nxR2Rgy7.mR90EtMSEXeRmqgqYbPWNLcg3zrA79AKGVhxFXiOiajXMKNiYLU81eh5ETI4QV9ngdF DT2MqgwQhj1VMiTOzU3qUH4ywbT8kvJFiCFw69ttyvesGH_9hFiQ8kdKhRB1wDaSo8De3ogXTVy4 2cqYLzU.AW.Le1G5WKwLUYanLfp_7h7.1WBosC9qYZA48f.J2aQCJz9dPokmYN6b3Ctxz7c3igPM L8vec8waEefiZpytXF9NpWuHRMwb3eFNQaametpBJjsBrRYvM494.vXHO8MVrKcup8Ud1aX7ETB4 .is3SXYiOoCjtzOqoapi_tzrKhMHLw6J_Cb40NR6XId_jPCAd6vfy_hhGzNAHqErm1s2WNVwJ6NS i7poTfG1htzJdIx2O_o1f27ok9aWu8YHaHdaMAwdPqnNkUwOJnqUjMAGpMGLmJkKW1ztzGocJNpW A4NI8Zer7tKDzezI6naU8Ix_668VVWCld.1Sv_91aPyJ6eFr6O4GQcg.tAo83_u4DfgQrwAHPhqE QFfV3i_hADtTpX9XnXi4jpBVxy9LglF9UvctVWC5vrp2r1P8IIniKB1aFggy_OirFUzc8cRM2xZp zwD2jXRnK3Yw1IVOPgZr79SdLB_5sFBjQ_KqwWmWiGgz8.DRrKJ1.6wKCDvbQzaY.gFpZkrxuc6V 8yIZs4LA1CMC0S9ZTP89LQg6dk_pcPyM4m71QxV.6aVItr1MMRNUYRKFIHJc2_Z9KdGNzs4id7ZJ 6SlX6SRTW9XToibVeW3bNAIzzS.cmKQD.CdUxxpJcLpd6jEbi6ojaufqik.BGVAOCySeoYYyzY7c vLF6o.ymJLTsPSdlZHNRdeYZ5BU2xtHLiOpxynANNLqZTLubf47I1pR6keabXVAh34vKObSrcsq4 c4sG._JRG8B4AlA--<br>\r\nReceived: from sonic.gate.mail.ne1.yahoo.com by sonic303.consmr.mail.ir2.yahoo.com with HTTP; Thu, 27 Aug 2020 15:11:04 +0000<br>\r\nDate: Thu, 27 Aug 2020 15:10:33 +0000 (UTC)<br>\r\nFrom: &quot;jin.eric@yahoo.com&quot; &lt;jin.eric@yahoo.com&gt;<br>\r\nReply-To: &quot;jin.eric@yahoo.com&quot; &lt;jin.eric@yahoo.com&gt;<br>\r\nTo: &quot;job+2@nltechno.com&quot; &lt;job+2@nltechno.com&gt;<br>\r\nMessage-ID: &lt;2058424704.10527227.1598541033397@mail.yahoo.com&gt;<br>\r\nSubject: Candidature en alternance<br>\r\nMIME-Version: 1.0<br>\r\nContent-Type: multipart/mixed; boundary=&quot;----=_Part_10527226_1469689446.1598541033397&quot;<br>\r\nReferences: &lt;2058424704.10527227.1598541033397.ref@mail.yahoo.com&gt;<br>\r\nX-Mailer: WebService/1.1.16455 YMailNorrin Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.135 Safari/537.36<br>\r\nContent-Length: 89671 ','2020-08-27 17:11:11','2020-08-27 17:41:11',12,NULL,NULL,NULL,0,NULL,'\"jin.eric@yahoo.com\"','jin.eric@yahoo.com',NULL,NULL,NULL,NULL,'2058424704.10527227.1598541033397@mail.yahoo.com',1,NULL);
+/*!40000 ALTER TABLE `llx_recruitment_recruitmentcandidature` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_recruitment_recruitmentcandidature_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_recruitment_recruitmentcandidature_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_recruitment_recruitmentcandidature_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `aa` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_fk_object` (`fk_object`),
+  KEY `idx_recruitmentcandidature_fk_object` (`fk_object`)
+) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_recruitment_recruitmentcandidature_extrafields`
+--
+
+LOCK TABLES `llx_recruitment_recruitmentcandidature_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_recruitment_recruitmentcandidature_extrafields` DISABLE KEYS */;
+INSERT INTO `llx_recruitment_recruitmentcandidature_extrafields` VALUES (16,'2020-08-25 10:40:58',95,NULL,NULL),(17,'2020-08-25 10:52:58',72,NULL,NULL),(18,'2020-09-06 09:44:55',65,NULL,'fdsfsd'),(19,'2020-09-15 22:45:41',67,NULL,NULL),(20,'2020-11-04 10:14:10',112,NULL,NULL),(21,'2020-11-04 12:02:32',68,NULL,'aaaa');
+/*!40000 ALTER TABLE `llx_recruitment_recruitmentcandidature_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_recruitment_recruitmentjobposition`
+--
+
+DROP TABLE IF EXISTS `llx_recruitment_recruitmentjobposition`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_recruitment_recruitmentjobposition` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(128) CHARACTER SET utf8mb4 NOT NULL DEFAULT '(PROV)',
+  `label` varchar(255) CHARACTER SET utf8mb4 NOT NULL,
+  `qty` int(11) NOT NULL DEFAULT 1,
+  `fk_soc` int(11) DEFAULT NULL,
+  `fk_project` int(11) DEFAULT NULL,
+  `fk_user_recruiter` int(11) DEFAULT NULL,
+  `fk_user_supervisor` int(11) DEFAULT NULL,
+  `fk_establishment` int(11) DEFAULT NULL,
+  `date_planned` date DEFAULT NULL,
+  `description` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `note_public` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `note_private` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_user_creat` int(11) NOT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `model_pdf` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `status` smallint(6) NOT NULL,
+  `last_main_doc` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `email_recruiter` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `remuneration` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `remuneration_suggested` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_recruitment_recruitmentjobposition_rowid` (`rowid`),
+  KEY `idx_recruitment_recruitmentjobposition_ref` (`ref`),
+  KEY `idx_recruitment_recruitmentjobposition_fk_soc` (`fk_soc`),
+  KEY `idx_recruitment_recruitmentjobposition_fk_project` (`fk_project`),
+  KEY `llx_recruitment_recruitmentjobposition_fk_user_recruiter` (`fk_user_recruiter`),
+  KEY `llx_recruitment_recruitmentjobposition_fk_user_supervisor` (`fk_user_supervisor`),
+  KEY `llx_recruitment_recruitmentjobposition_fk_establishment` (`fk_establishment`),
+  KEY `llx_recruitment_recruitmentjobposition_fk_user_creat` (`fk_user_creat`),
+  KEY `idx_recruitment_recruitmentjobposition_status` (`status`),
+  CONSTRAINT `llx_recruitment_recruitmentjobposition_fk_establishment` FOREIGN KEY (`fk_establishment`) REFERENCES `llx_establishment` (`rowid`),
+  CONSTRAINT `llx_recruitment_recruitmentjobposition_fk_user_creat` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`),
+  CONSTRAINT `llx_recruitment_recruitmentjobposition_fk_user_recruiter` FOREIGN KEY (`fk_user_recruiter`) REFERENCES `llx_user` (`rowid`),
+  CONSTRAINT `llx_recruitment_recruitmentjobposition_fk_user_supervisor` FOREIGN KEY (`fk_user_supervisor`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_recruitment_recruitmentjobposition`
+--
+
+LOCK TABLES `llx_recruitment_recruitmentjobposition` WRITE;
+/*!40000 ALTER TABLE `llx_recruitment_recruitmentjobposition` DISABLE KEYS */;
+INSERT INTO `llx_recruitment_recruitmentjobposition` VALUES (2,'JOB2008-0001','Web designer',1,NULL,NULL,12,NULL,9,NULL,'Knowing HTML + CSS',NULL,'','2020-08-06 13:25:00','2020-09-02 17:17:47',12,12,NULL,'standard_recruitmentjobposition',3,'recruitment/recruitmentjobposition/JOB2008-0001/JOB2008-0001.pdf','',1,NULL,'To negociate'),(3,'JOB2009-0002','PHP Developer Senior',1,NULL,NULL,12,NULL,NULL,NULL,'5 years of experience required<br />\r\n<br />\r\nLocation: Berlin<br />\r\n&nbsp;',NULL,'','2020-09-02 17:23:00','2020-11-03 13:55:00',12,12,NULL,NULL,1,'recruitment/recruitmentjobposition/JOB2009-0002/JOB2009-0002.pdf','',1,NULL,'40000 - 50000'),(4,'JOB2009-0003','PHP Developer Junior',1,NULL,NULL,12,NULL,NULL,NULL,'Location: Madrid<br />\r\nWe are looking for a curious developer to work in our Web division.',NULL,NULL,'2020-11-11 17:24:00','2020-11-03 13:58:06',12,12,NULL,NULL,1,'recruitment/recruitmentjobposition/JOB2009-0003/JOB2009-0003.pdf','4444',1,NULL,'');
+/*!40000 ALTER TABLE `llx_recruitment_recruitmentjobposition` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_recruitment_recruitmentjobposition_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_recruitment_recruitmentjobposition_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_recruitment_recruitmentjobposition_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `bbb` double(24,8) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_fk_object` (`fk_object`),
+  KEY `idx_recruitmentjobposition_fk_object` (`fk_object`)
+) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_recruitment_recruitmentjobposition_extrafields`
+--
+
+LOCK TABLES `llx_recruitment_recruitmentjobposition_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_recruitment_recruitmentjobposition_extrafields` DISABLE KEYS */;
+INSERT INTO `llx_recruitment_recruitmentjobposition_extrafields` VALUES (6,'2020-09-06 18:39:58',2,NULL,NULL),(7,'2020-11-03 13:54:53',3,NULL,5.00000000),(18,'2020-11-09 08:51:51',4,NULL,NULL);
+/*!40000 ALTER TABLE `llx_recruitment_recruitmentjobposition_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_referenceletters`
+--
+
+DROP TABLE IF EXISTS `llx_referenceletters`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_referenceletters` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `title` varchar(100) CHARACTER SET utf8mb4 NOT NULL,
+  `element_type` varchar(50) CHARACTER SET utf8mb4 NOT NULL,
+  `use_custom_header` int(11) NOT NULL DEFAULT 0,
+  `header` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `use_custom_footer` int(11) NOT NULL DEFAULT 0,
+  `footer` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `use_landscape_format` int(11) NOT NULL DEFAULT 0,
+  `status` int(11) NOT NULL DEFAULT 1,
+  `default_doc` int(11) NOT NULL DEFAULT 0,
+  `import_key` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `fk_user_author` int(11) NOT NULL,
+  `datec` datetime NOT NULL,
+  `fk_user_mod` int(11) NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_referenceletters`
+--
+
+LOCK TABLES `llx_referenceletters` WRITE;
+/*!40000 ALTER TABLE `llx_referenceletters` DISABLE KEYS */;
+INSERT INTO `llx_referenceletters` VALUES (1,1,'Exemple de modèle de PROPOSITION','propal',1,'&nbsp;<br />\n<br />\n&nbsp;\n<table cellpadding=\"1\" cellspacing=\"1\">\n	<tbody>\n		<tr>\n			<td>MON LOGO ENTREPRISE</td>\n			<td style=\"text-align:right\"><strong>Proposition commerciale<br />\n			R&eacute;f. :&nbsp;{object_ref}</strong><br />\n			Date :&nbsp;{object_date}<br />\n			Date de fin de validit&eacute; :&nbsp;{object_date_end}<br />\n			Code client :&nbsp;{cust_company_customercode}<br />\n			{objets_lies}</td>\n		</tr>\n	</tbody>\n</table>',1,'<div style=\"text-align:center\"><br />\n<span style=\"font-size:8px\">{mycompany_juridicalstatus} - SIRET :&nbsp;{mycompany_idprof2}<br />\nNAF-APE :&nbsp;{mycompany_idprof3} - Num VA :&nbsp;{mycompany_vatnumber}</span><br />\n&nbsp;</div>\n',0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(2,1,'Exemple de modèle de FACTURE','invoice',1,'&nbsp;<br />\n<br />\n&nbsp;\n<table cellpadding=\"1\" cellspacing=\"1\">\n	<tbody>\n		<tr>\n			<td>MON LOGO ENTREPRISE</td>\n			<td style=\"text-align:right\"><strong>Facture<br />\n			R&eacute;f. :&nbsp;{object_ref}</strong><br />\n			Date facturation :&nbsp;{object_date}<br />\n			Date &eacute;ch&eacute;ance :&nbsp;{object_date_limit}<br />\n			Code client :&nbsp;{cust_company_customercode}<br />\n			{objets_lies}</td>\n		</tr>\n	</tbody>\n</table>',1,'<div style=\"text-align:center\"><br />\n<span style=\"font-size:8px\">{mycompany_juridicalstatus} - SIRET :&nbsp;{mycompany_idprof2}<br />\nNAF-APE :&nbsp;{mycompany_idprof3} - Num VA :&nbsp;{mycompany_vatnumber}</span><br />\n&nbsp;</div>',0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(3,1,'Exemple de modèle de COMMANDE','order',1,'&nbsp;<br />\n<br />\n&nbsp;\n<table cellpadding=\"1\" cellspacing=\"1\">\n	<tbody>\n		<tr>\n			<td>MON LOGO ENTREPRISE</td>\n			<td style=\"text-align:right\"><strong>Commande<br />\n			R&eacute;f. :&nbsp;{object_ref}</strong><br />\n			Date de commande :&nbsp;{object_date}<br />\n			{objets_lies}</td>\n		</tr>\n	</tbody>\n</table>',1,'<div style=\"text-align:center\"><br />\n<span style=\"font-size:8px\">{mycompany_juridicalstatus} - SIRET :&nbsp;{mycompany_idprof2}<br />\nNAF-APE :&nbsp;{mycompany_idprof3} - Num VA :&nbsp;{mycompany_vatnumber}</span><br />\n&nbsp;</div>',0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(4,1,'Exemple de modèle de CONTRAT','contract',1,'&nbsp;<br />\n<br />\n&nbsp;\n<table cellpadding=\"1\" cellspacing=\"1\">\n	<tbody>\n		<tr>\n			<td>MON LOGO ENTREPRISE</td>\n			<td style=\"text-align:right\"><strong>Fiche contrat<br />\n			R&eacute;f. :&nbsp;{object_ref}</strong><br />\n			Date :&nbsp;{object_date_creation}<br />\n			Code client :&nbsp;{cust_company_customercode}</td>\n		</tr>\n	</tbody>\n</table>',1,'<div style=\"text-align:center\"><br />\n<span style=\"font-size:8px\">{mycompany_juridicalstatus} - SIRET :&nbsp;{mycompany_idprof2}<br />\nNAF-APE :&nbsp;{mycompany_idprof3} - Num VA :&nbsp;{mycompany_vatnumber}</span><br />\n&nbsp;</div>',0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(5,1,'Exemple de modèle de DEMANDE DE PRIX','supplier_proposal',1,'&nbsp;<br />\n<br />\n&nbsp;\n<table cellpadding=\"1\" cellspacing=\"1\">\n	<tbody>\n		<tr>\n			<td>MON LOGO ENTREPRISE</td>\n			<td style=\"text-align:right\"><strong>Demande de prix<br />\n			R&eacute;f. :&nbsp;{object_ref}</strong><br />\n			Code fournisseur : :&nbsp;{cust_company_suppliercode}<br />\n			{objets_lies}</td>\n		</tr>\n	</tbody>\n</table>',1,'<div style=\"text-align:center\"><br />\n<span style=\"font-size:8px\">{mycompany_juridicalstatus} - SIRET :&nbsp;{mycompany_idprof2}<br />\nNAF-APE :&nbsp;{mycompany_idprof3} - Num VA :&nbsp;{mycompany_vatnumber}</span><br />\n&nbsp;</div>',0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(6,1,'Exemple de modèle de COMMANDE FOURNISSEUR','order_supplier',1,'&nbsp;<br />\n<br />\n&nbsp;\n<table cellpadding=\"1\" cellspacing=\"1\">\n	<tbody>\n		<tr>\n			<td>MON LOGO ENTREPRISE</td>\n			<td style=\"text-align:right\"><strong>Commande fournisseur {object_ref}<br />\n			R&eacute;f. :&nbsp;{objvar_object_ref_supplier}</strong><br />\n			Date pr&egrave;vue de livraison :&nbsp;{object_date_delivery_planed}<br />\n			Code fournisseur : :&nbsp;{cust_company_suppliercode}<br />\n			{objets_lies}</td>\n		</tr>\n	</tbody>\n</table>',1,'<div style=\"text-align:center\"><br />\n<span style=\"font-size:8px\">{mycompany_juridicalstatus} - SIRET :&nbsp;{mycompany_idprof2}<br />\nNAF-APE :&nbsp;{mycompany_idprof3} - Num VA :&nbsp;{mycompany_vatnumber}</span><br />\n&nbsp;</div>\n',0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56');
+/*!40000 ALTER TABLE `llx_referenceletters` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_referenceletters_chapters`
+--
+
+DROP TABLE IF EXISTS `llx_referenceletters_chapters`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_referenceletters_chapters` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `fk_referenceletters` int(11) NOT NULL,
+  `lang` varchar(5) CHARACTER SET utf8mb4 NOT NULL DEFAULT '',
+  `sort_order` int(11) NOT NULL DEFAULT 1,
+  `title` varchar(100) CHARACTER SET utf8mb4 NOT NULL,
+  `content_text` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `options_text` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `readonly` int(11) NOT NULL DEFAULT 0,
+  `same_page` int(11) NOT NULL DEFAULT 0,
+  `status` int(11) NOT NULL DEFAULT 1,
+  `import_key` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `fk_user_author` int(11) NOT NULL,
+  `datec` datetime NOT NULL,
+  `fk_user_mod` int(11) NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  PRIMARY KEY (`rowid`),
+  KEY `idx_referenceletters_chapters_fk_referenceletters` (`fk_referenceletters`),
+  CONSTRAINT `ibfk_referenceletters_chapters_fk_referenceletters` FOREIGN KEY (`fk_referenceletters`) REFERENCES `llx_referenceletters` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_referenceletters_chapters`
+--
+
+LOCK TABLES `llx_referenceletters_chapters` WRITE;
+/*!40000 ALTER TABLE `llx_referenceletters_chapters` DISABLE KEYS */;
+INSERT INTO `llx_referenceletters_chapters` VALUES (1,1,1,'fr_FR',1,'Header','<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:550px\">\n	<tbody>\n		<tr>\n			<td style=\"width:50%\">Emetteur :<br />\n			&nbsp;\n			<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:242px\">\n				<tbody>\n					<tr>\n						<td style=\"background-color:#e6e6e6; height:121px\"><br />\n						<strong>{mycompany_name}</strong><br />\n						{object_contactsale}<br />\n						{mycompany_address}<br />\n						{mycompany_zip}&nbsp;{mycompany_town}<br />\n						<br />\n						T&eacute;l. : {mycompany_phone} - Fax :&nbsp;{mycompany_fax}<br />\n						Email : {mycompany_email}<br />\n						Web :&nbsp;{mycompany_web}</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n			<td style=\"width:50%\">Adress&eacute; &agrave; :<br />\n			&nbsp;\n			<table border=\"1\" style=\"width:245px\">\n				<tbody>\n					<tr>\n						<td style=\"height:121px\"><br />\n						<strong>{cust_company_name}</strong><br />\n						{cust_contactclient}<br />\n						{cust_contactclientfact}<br />\n						{cust_company_address}<br />\n						{cust_company_zip}&nbsp;{cust_company_town}</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n		</tr>\n	</tbody>\n</table>',NULL,0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(2,1,1,'fr_FR',2,'Lines','&nbsp;<br />&nbsp;<br /><div style=\"text-align:right\">Montants exprim&eacute;s en Euros</div>\n\n<table border=\"1\" style=\"cellpadding:1; cellspacing:1; width:530px\">\n	<tbody>\n		<tr>\n			<td style=\"width:50%\"><strong>D&eacute;signation</strong></td>\n			<td style=\"width:10%\"><strong>TVA</strong></td>\n			<td style=\"width:10%\"><strong>P.U. HT</strong></td>\n			<td style=\"width:10%\"><strong>Qt&eacute;</strong></td>\n			<td style=\"width:10%\"><strong>R&eacute;duc.</strong></td>\n			<td style=\"width:10%\"><strong>Total HT</strong>[!-- BEGIN lines --]</td>\n		</tr>\n		<tr>\n			<td>{line_fulldesc}</td>\n			<td style=\"text-align:right\">{line_vatrate}</td>\n			<td style=\"text-align:right\">{line_up_locale}</td>\n			<td style=\"text-align:right\">{line_qty}</td>\n			<td style=\"text-align:right\">{line_discount_percent}</td>\n			<td style=\"text-align:right\">{line_price_ht_locale}[!-- END lines --]</td>\n		</tr>\n	</tbody></table>',NULL,0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(3,1,1,'fr_FR',3,'Footer','&nbsp;<br />\n&nbsp;<br />\n\n<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:500px\">\n	<tbody>\n		<tr>\n			<td rowspan=\"3\" style=\"width:60%\"><strong>Conditions de r&egrave;glement</strong> : {objvar_object_cond_reglement_doc}<br />\n			<strong>Mode de r&egrave;glement</strong> : {objvar_object_mode_reglement}</td>\n			<td style=\"width:20%\">Total HT</td>\n			<td style=\"text-align:right; width:20%\">{objvar_object_total_ht}</td>\n		</tr>\n		<tr>\n			<td style=\"background-color:#f5f5f5; width:20%\">{tva_detail_titres}</td>\n			<td style=\"background-color:#f5f5f5; text-align:right; width:20%\">{tva_detail_montants}</td>\n		</tr>\n		<tr>\n			<td style=\"background-color:#e6e6e6; width:20%\">Total TTC</td>\n			<td style=\"background-color:#e6e6e6; text-align:right; width:20%\">{objvar_object_total_ttc}</td>\n		</tr>\n	</tbody>\n</table>\n&nbsp;<br />\n&nbsp;<br />\n&nbsp;\n<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:500px\">\n	<tbody>\n		<tr>\n			<td style=\"width:55%\">&nbsp;</td>\n			<td style=\"width:45%\"><br />\n			Cachet, Date, Signature et mention &quot;Bon pour accord&quot;<br />\n			&nbsp;\n			<table border=\"1\" cellpadding=\"1\" cellspacing=\"1\" style=\"width:200px\">\n				<tbody>\n					<tr>\n						<td style=\"height:70px; width:220px\">&nbsp;</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n		</tr>\n	</tbody>\n</table>',NULL,0,1,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(4,1,2,'fr_FR',1,'Header','<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:550px\">\n	<tbody>\n		<tr>\n			<td style=\"width:50%\">Emetteur :<br />\n			&nbsp;\n			<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:242px\">\n				<tbody>\n					<tr>\n						<td style=\"background-color:#e6e6e6; height:121px\"><br />\n						<strong>{mycompany_name}</strong><br />\n						{object_contactsale}<br />\n						{mycompany_address}<br />\n						{mycompany_zip}&nbsp;{mycompany_town}<br />\n						<br />\n						T&eacute;l. : {mycompany_phone} - Fax :&nbsp;{mycompany_fax}<br />\n						Email : {mycompany_email}<br />\n						Web :&nbsp;{mycompany_web}</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n			<td style=\"width:50%\">Adress&eacute; &agrave; :<br />\n			&nbsp;\n			<table border=\"1\" style=\"width:245px\">\n				<tbody>\n					<tr>\n						<td style=\"height:121px\"><br />\n						<strong>{cust_company_name}</strong><br />\n						{cust_contactclient}<br />\n						{cust_contactclientfact}<br />\n						{cust_company_address}<br />\n						{cust_company_zip}&nbsp;{cust_company_town}</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n		</tr>\n	</tbody>\n</table>\n&nbsp;<br />\n&nbsp;<br />',NULL,0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(5,1,2,'fr_FR',2,'Lines','<div style=\"text-align:right\">Montants exprim&eacute;s en Euros</div>\n\n<table border=\"1\" style=\"cellpadding:1; cellspacing:1; width:530px\">\n	<tbody>\n		<tr>\n			<td style=\"width:50%\">D&eacute;signation</td>\n			<td style=\"width:10%\">TVA</td>\n			<td style=\"width:10%\">P.U. HT</td>\n			<td style=\"width:10%\">Qt&eacute;</td>\n			<td style=\"width:10%\">R&eacute;duc.</td>\n			<td style=\"width:10%\">Total HT[!-- BEGIN lines --]</td>\n		</tr>\n		<tr>\n			<td>{line_fulldesc}</td>\n			<td style=\"text-align:right\">{line_vatrate}</td>\n			<td style=\"text-align:right\">{line_up_locale}</td>\n			<td style=\"text-align:right\">{line_qty}</td>\n			<td style=\"text-align:right\">{line_discount_percent}</td>\n			<td style=\"text-align:right\">{line_price_ht_locale}[!-- END lines --]</td>\n		</tr>\n	</tbody>\n</table>\n&nbsp;<br />\n&nbsp;<br />',NULL,0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(6,1,2,'fr_FR',3,'Footer','&nbsp;\n<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:500px\">\n	<tbody>\n		<tr>\n			<td rowspan=\"6\" style=\"width:60%\"><strong>Conditions de r&egrave;glement</strong> : {objvar_object_cond_reglement_doc}<br />\n			<strong>Mode de r&egrave;glement</strong> : {objvar_object_mode_reglement}</td>\n			<td style=\"width:20%\">Total HT</td>\n			<td style=\"text-align:right; width:20%\">{objvar_object_total_ht}</td>\n		</tr>\n		<tr>\n			<td style=\"background-color:#f5f5f5; width:20%\">{tva_detail_titres}</td>\n			<td style=\"background-color:#f5f5f5; text-align:right; width:20%\">{tva_detail_montants}</td>\n		</tr>\n		<tr>\n			<td style=\"background-color:#e6e6e6; width:20%\">Total TTC</td>\n			<td style=\"background-color:#e6e6e6; text-align:right; width:20%\">{objvar_object_total_ttc}</td>\n		</tr>\n		<tr>\n			<td style=\"width:20%\">Pay&eacute;</td>\n			<td style=\"text-align:right; width:20%\">{deja_paye}</td>\n		</tr>\n		<tr>\n			<td style=\"width:20%\">Avoirs</td>\n			<td style=\"text-align:right; width:20%\">{somme_avoirs}</td>\n		</tr>\n		<tr>\n			<td style=\"background-color:#e6e6e6; width:20%\">Reste &agrave; payer</td>\n			<td style=\"background-color:#e6e6e6; text-align:right; width:20%\">{reste_a_payer}</td>\n		</tr>\n	</tbody>\n</table>\n&nbsp;<br />\n&nbsp;<br />\n<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:500px\">\n	<tbody>\n		<tr>\n			<td style=\"width:55%\">&nbsp;</td>\n			<td style=\"width:45%\">&nbsp;\n			<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:200px\">\n				<tbody>\n					<tr>\n						<td style=\"height:70px; width:220px\">{liste_paiements}</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n		</tr>\n	</tbody>\n</table>',NULL,0,1,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(7,1,3,'fr_FR',1,'Contenu','<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:550px\">\n	<tbody>\n		<tr>\n			<td style=\"width:50%\">Emetteur :<br />\n			&nbsp;\n			<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:242px\">\n				<tbody>\n					<tr>\n						<td style=\"background-color:#e6e6e6; height:121px\"><br />\n						<strong>{mycompany_name}</strong><br />\n						{object_contactsale}<br />\n						{mycompany_address}<br />\n						{mycompany_zip}&nbsp;{mycompany_town}<br />\n						<br />\n						T&eacute;l. : {mycompany_phone} - Fax :&nbsp;{mycompany_fax}<br />\n						Email : {mycompany_email}<br />\n						Web :&nbsp;{mycompany_web}</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n			<td style=\"width:50%\">Adress&eacute; &agrave; :<br />\n			&nbsp;\n			<table border=\"1\" style=\"width:245px\">\n				<tbody>\n					<tr>\n						<td style=\"height:121px\"><br />\n						<strong>{cust_company_name}</strong><br />\n						{cust_contactclient}<br />\n						{cust_contactclientfact}<br />\n						{cust_company_address}<br />\n						{cust_company_zip}&nbsp;{cust_company_town}</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n		</tr>\n	</tbody>\n</table>\n&nbsp;<br />\n&nbsp;<br />',NULL,0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(8,1,3,'fr_FR',2,'Lines','<div style=\"text-align:right\">Montants exprim&eacute;s en Euros</div>\n\n<table border=\"1\" style=\"cellpadding:1; cellspacing:1; width:530px\">\n	<tbody>\n		<tr>\n			<td style=\"width:50%\">D&eacute;signation</td>\n			<td style=\"width:10%\">TVA</td>\n			<td style=\"width:10%\">P.U. HT</td>\n			<td style=\"width:10%\">Qt&eacute;</td>\n			<td style=\"width:10%\">R&eacute;duc.</td>\n			<td style=\"width:10%\">Total HT[!-- BEGIN lines --]</td>\n		</tr>\n		<tr>\n			<td>{line_fulldesc}</td>\n			<td style=\"text-align:right\">{line_vatrate}</td>\n			<td style=\"text-align:right\">{line_up_locale}</td>\n			<td style=\"text-align:right\">{line_qty}</td>\n			<td style=\"text-align:right\">{line_discount_percent}</td>\n			<td style=\"text-align:right\">{line_price_ht_locale}[!-- END lines --]</td>\n		</tr>\n	</tbody>\n</table>\n&nbsp;<br />\n&nbsp;<br />',NULL,0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(9,1,3,'fr_FR',3,'Footer','&nbsp;\n\n&nbsp;\n<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:500px\">\n	<tbody>\n		<tr>\n			<td rowspan=\"3\" style=\"width:60%\"><strong>Conditions de r&egrave;glement</strong> : {objvar_object_cond_reglement_doc}<br />\n			<strong>Mode de r&egrave;glement</strong> : {objvar_object_mode_reglement}</td>\n			<td style=\"width:20%\">Total HT</td>\n			<td style=\"text-align:right; width:20%\">{objvar_object_total_ht}</td>\n		</tr>\n		<tr>\n			<td style=\"background-color:#f5f5f5; width:20%\">{tva_detail_titres}</td>\n			<td style=\"background-color:#f5f5f5; text-align:right; width:20%\">{tva_detail_montants}</td>\n		</tr>\n		<tr>\n			<td style=\"background-color:#e6e6e6; width:20%\">Total TTC</td>\n			<td style=\"background-color:#e6e6e6; text-align:right; width:20%\">{objvar_object_total_ttc}</td>\n		</tr>\n	</tbody>\n</table>',NULL,0,1,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(10,1,4,'fr_FR',1,'Contenu','<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:550px\">\n	<tbody>\n		<tr>\n			<td style=\"width:50%\">Emetteur :<br />\n			&nbsp;\n			<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:242px\">\n				<tbody>\n					<tr>\n						<td style=\"background-color:#e6e6e6; height:121px\"><br />\n						<strong>{mycompany_name}</strong><br />\n						{object_contactsale}<br />\n						{mycompany_address}<br />\n						{mycompany_zip}&nbsp;{mycompany_town}<br />\n						<br />\n						T&eacute;l. : {mycompany_phone} - Fax :&nbsp;{mycompany_fax}<br />\n						Email : {mycompany_email}<br />\n						Web :&nbsp;{mycompany_web}</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n			<td style=\"width:50%\">Adress&eacute; &agrave; :<br />\n			&nbsp;\n			<table border=\"1\" style=\"width:245px\">\n				<tbody>\n					<tr>\n						<td style=\"height:121px\"><br />\n						<strong>{cust_company_name}</strong><br />\n						{cust_contactclient}<br />\n						{cust_contactclientfact}<br />\n						{cust_company_address}<br />\n						{cust_company_zip}&nbsp;{cust_company_town}</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n		</tr>\n	</tbody>\n</table>\n&nbsp;<br />\n&nbsp;<br />',NULL,0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(11,1,4,'fr_FR',2,'Lines','<table border=\"1\" style=\"width:530px\">\n	<tbody>\n		<tr>\n			<td>[!-- BEGIN lines --]{line_product_ref} -&nbsp;{line_product_label}<br />\n			Quantit&eacute; :&nbsp;<strong>{line_qty}</strong> - Prix unitaire :&nbsp;<strong>{line_price_ht_locale}</strong><br />\n			Date d&eacute;but pr&eacute;vue : <strong>{date_ouverture_prevue}</strong> - Date pr&eacute;vue fin de service : <strong>{date_fin_validite}</strong><br />\n			Date d&eacute;but : <strong>{date_ouverture}</strong><br />\n			{line_desc}<br />\n			<br />\n			[!-- END lines --]</td>\n		</tr>\n	</tbody>\n</table>\n&nbsp;<br />\n&nbsp;<br />\n<br />\n<br />\n<br />',NULL,0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(12,1,4,'fr_FR',3,'Footer','<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:530px\">\n	<tbody>\n		<tr>\n			<td style=\"width:55%\"><br />\n			Pour&nbsp;{mycompany_name}, nom et signature :<br />\n			&nbsp;\n			<table border=\"1\" cellpadding=\"1\" cellspacing=\"1\" style=\"width:242px\">\n				<tbody>\n					<tr>\n						<td style=\"height:70px; width:220px\">&nbsp;</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n			<td style=\"width:45%\"><br />\n			Pour&nbsp;{cust_company_name}, nom et signature :<br />\n			&nbsp;\n			<table border=\"1\" cellpadding=\"1\" cellspacing=\"1\" style=\"width:242px\">\n				<tbody>\n					<tr>\n						<td style=\"height:70px; width:220px\">&nbsp;</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n		</tr>\n	</tbody>\n</table>',NULL,0,1,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(13,1,5,'fr_FR',1,'Contenu','<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:550px\">\n	<tbody>\n		<tr>\n			<td style=\"width:50%\">Emetteur :<br />\n			&nbsp;\n			<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:242px\">\n				<tbody>\n					<tr>\n						<td style=\"background-color:#e6e6e6; height:121px\"><br />\n						<strong>{mycompany_name}</strong><br />\n						{object_contactsale}<br />\n						{mycompany_address}<br />\n						{mycompany_zip}&nbsp;{mycompany_town}<br />\n						<br />\n						T&eacute;l. : {mycompany_phone} - Fax :&nbsp;{mycompany_fax}<br />\n						Email : {mycompany_email}<br />\n						Web :&nbsp;{mycompany_web}</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n			<td style=\"width:50%\">Adress&eacute; &agrave; :<br />\n			&nbsp;\n			<table border=\"1\" style=\"width:245px\">\n				<tbody>\n					<tr>\n						<td style=\"height:121px\"><br />\n						<strong>{cust_company_name}</strong><br />\n						{cust_contactclient}<br />\n						{cust_contactclientfact}<br />\n						{cust_company_address}<br />\n						{cust_company_zip}&nbsp;{cust_company_town}</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n		</tr>\n	</tbody>\n</table>\n&nbsp;<br />\n&nbsp;<br />',NULL,0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(14,1,5,'fr_FR',2,'Lines','<div style=\"text-align:right\">Montants exprim&eacute;s en Euros</div>\n\n<table border=\"1\" style=\"cellpadding:1; cellspacing:1; width:530px\">\n	<tbody>\n		<tr>\n			<td style=\"width:50%\">D&eacute;signation</td>\n			<td style=\"width:10%\">TVA</td>\n			<td style=\"width:10%\">P.U. HT</td>\n			<td style=\"width:10%\">Qt&eacute;</td>\n			<td style=\"width:10%\">Total HT[!-- BEGIN lines --]</td>\n		</tr>\n		<tr>\n			<td>{line_fulldesc}</td>\n			<td style=\"text-align:right\"></td>\n			<td style=\"text-align:right\"></td>\n			<td style=\"text-align:right\">{line_qty}</td>\n			<td style=\"text-align:right\">[!-- END lines --]</td>\n		</tr>\n	</tbody>\n</table>\n&nbsp;<br />\n&nbsp;<br />',NULL,0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(15,1,5,'fr_FR',3,'Footer','<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:500px\">\n	<tbody>\n		<tr>\n			<td rowspan=\"3\" style=\"width:60%\"><strong>Date pr&egrave;vue de livraison</strong> : {object_date_livraison}<br />\n			<strong>Mode de r&egrave;glement</strong> : {objvar_object_mode_reglement}</td>\n		</tr>\n	</tbody>\n</table>',NULL,0,1,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(16,1,6,'fr_FR',1,'Contenu','<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:550px\">\n	<tbody>\n		<tr>\n			<td style=\"width:50%\">Emetteur :<br />\n			&nbsp;\n			<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:242px\">\n				<tbody>\n					<tr>\n						<td style=\"background-color:#e6e6e6; height:121px\"><br />\n						<strong>{mycompany_name}</strong><br />\n						{object_contactsale}<br />\n						{mycompany_address}<br />\n						{mycompany_zip}&nbsp;{mycompany_town}<br />\n						<br />\n						T&eacute;l. : {mycompany_phone} - Fax :&nbsp;{mycompany_fax}<br />\n						Email : {mycompany_email}<br />\n						Web :&nbsp;{mycompany_web}</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n			<td style=\"width:50%\">Adress&eacute; &agrave; :<br />\n			&nbsp;\n			<table border=\"1\" style=\"width:245px\">\n				<tbody>\n					<tr>\n						<td style=\"height:121px\"><br />\n						<strong>{cust_company_name}</strong><br />\n						{cust_contactclient}<br />\n						{cust_contactclientfact}<br />\n						{cust_company_address}<br />\n						{cust_company_zip}&nbsp;{cust_company_town}</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n		</tr>\n	</tbody>\n</table>\n&nbsp;<br />\n&nbsp;<br />',NULL,0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(17,1,6,'fr_FR',2,'Lines','<div style=\"text-align:right\">Montants exprim&eacute;s en Euros</div>\n\n<table border=\"1\" style=\"cellpadding:1; cellspacing:1; width:530px\">\n	<tbody>\n		<tr>\n			<td style=\"width:50%\">D&eacute;signation</td>\n			<td style=\"width:10%\">TVA</td>\n			<td style=\"width:10%\">P.U. HT</td>\n			<td style=\"width:10%\">Qt&eacute;</td>\n			<td style=\"width:10%\">R&eacute;duc.</td>\n			<td style=\"width:10%\">Total HT[!-- BEGIN lines --]</td>\n		</tr>\n		<tr>\n			<td>{line_fulldesc}</td>\n			<td style=\"text-align:right\">{line_vatrate}</td>\n			<td style=\"text-align:right\">{line_up_locale}</td>\n			<td style=\"text-align:right\">{line_qty}</td>\n			<td style=\"text-align:right\">{line_discount_percent}</td>\n			<td style=\"text-align:right\">{line_price_ht_locale}[!-- END lines --]</td>\n		</tr>\n	</tbody>\n</table>\n&nbsp;<br />\n&nbsp;<br />',NULL,0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(18,1,6,'fr_FR',3,'Footer','&nbsp;\n<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:500px\">\n	<tbody>\n		<tr>\n			<td rowspan=\"3\" style=\"width:60%\"><strong>Conditions de r&egrave;glement</strong> : {object_payment_term}<br />\n			<strong>Mode de r&egrave;glement</strong> : {object_payment_mode}</td>\n			<td style=\"width:20%\">Total HT</td>\n			<td style=\"text-align:right; width:20%\">{objvar_object_total_ht}</td>\n		</tr>\n		<tr>\n			<td style=\"background-color:#f5f5f5; width:20%\">{tva_detail_titres}</td>\n			<td style=\"background-color:#f5f5f5; text-align:right; width:20%\">{tva_detail_montants}</td>\n		</tr>\n		<tr>\n			<td style=\"background-color:#e6e6e6; width:20%\">Total TTC</td>\n			<td style=\"background-color:#e6e6e6; text-align:right; width:20%\">{objvar_object_total_ttc}</td>\n		</tr>\n	</tbody>\n</table>',NULL,0,1,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56');
+/*!40000 ALTER TABLE `llx_referenceletters_chapters` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_referenceletters_elements`
+--
+
+DROP TABLE IF EXISTS `llx_referenceletters_elements`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_referenceletters_elements` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `ref_int` varchar(20) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `title` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `outputref` int(11) NOT NULL DEFAULT 1,
+  `fk_referenceletters` int(11) NOT NULL,
+  `element_type` varchar(50) CHARACTER SET utf8mb4 NOT NULL,
+  `fk_element` int(11) NOT NULL,
+  `content_letter` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `import_key` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `fk_user_author` int(11) NOT NULL,
+  `datec` datetime NOT NULL,
+  `fk_user_mod` int(11) NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `use_custom_header` int(11) NOT NULL DEFAULT 0,
+  `header` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `use_custom_footer` int(11) NOT NULL DEFAULT 0,
+  `footer` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `use_landscape_format` int(11) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_referenceletters_elements_fk_referenceletters` (`fk_referenceletters`),
+  CONSTRAINT `ibfk_referenceletters_elements_fk_referenceletters` FOREIGN KEY (`fk_referenceletters`) REFERENCES `llx_referenceletters` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_referenceletters_elements`
+--
+
+LOCK TABLES `llx_referenceletters_elements` WRITE;
+/*!40000 ALTER TABLE `llx_referenceletters_elements` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_referenceletters_elements` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_referenceletters_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_referenceletters_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_referenceletters_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idxreferenceletters_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_referenceletters_extrafields`
+--
+
+LOCK TABLES `llx_referenceletters_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_referenceletters_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_referenceletters_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_resource`
 --
@@ -11367,10 +13270,83 @@ CREATE TABLE `llx_rights_def` (
 
 LOCK TABLES `llx_rights_def` WRITE;
 /*!40000 ALTER TABLE `llx_rights_def` DISABLE KEYS */;
-INSERT INTO `llx_rights_def` VALUES (11,'Read invoices','facture',1,'lire',NULL,'a',0,0,0),(11,'Lire les factures','facture',2,'lire',NULL,'a',1,10,0),(12,'Create and update invoices','facture',1,'creer',NULL,'a',0,0,0),(12,'Creer/modifier les factures','facture',2,'creer',NULL,'a',0,10,0),(13,'Devalidate invoices','facture',1,'invoice_advance','unvalidate','a',0,0,0),(13,'Dévalider les factures','facture',2,'invoice_advance','unvalidate','a',0,10,0),(14,'Validate invoices','facture',1,'invoice_advance','validate','a',0,0,0),(14,'Valider les factures','facture',2,'valider',NULL,'a',0,10,0),(15,'Send invoices by email','facture',1,'invoice_advance','send','a',0,0,0),(15,'Envoyer les factures par mail','facture',2,'invoice_advance','send','a',0,10,0),(16,'Issue payments on invoices','facture',1,'paiement',NULL,'a',0,0,0),(16,'Emettre des paiements sur les factures','facture',2,'paiement',NULL,'a',0,10,0),(19,'Delete invoices','facture',1,'supprimer',NULL,'a',0,0,0),(19,'Supprimer les factures','facture',2,'supprimer',NULL,'a',0,10,0),(21,'Lire les propositions commerciales','propale',1,'lire',NULL,'r',1,22,0),(21,'Lire les propositions commerciales','propale',2,'lire',NULL,'r',1,22,0),(22,'Creer/modifier les propositions commerciales','propale',1,'creer',NULL,'w',0,22,0),(22,'Creer/modifier les propositions commerciales','propale',2,'creer',NULL,'w',0,22,0),(24,'Valider les propositions commerciales','propale',1,'propal_advance','validate','d',0,22,0),(24,'Valider les propositions commerciales','propale',2,'valider',NULL,'d',0,22,0),(25,'Envoyer les propositions commerciales aux clients','propale',1,'propal_advance','send','d',0,22,0),(25,'Envoyer les propositions commerciales aux clients','propale',2,'propal_advance','send','d',0,22,0),(26,'Cloturer les propositions commerciales','propale',1,'propal_advance','close','d',0,22,0),(26,'Cloturer les propositions commerciales','propale',2,'propal_advance','close','d',0,22,0),(27,'Supprimer les propositions commerciales','propale',1,'supprimer',NULL,'d',0,22,0),(27,'Supprimer les propositions commerciales','propale',2,'supprimer',NULL,'d',0,22,0),(28,'Exporter les propositions commerciales et attributs','propale',1,'export',NULL,'r',0,22,0),(28,'Exporter les propositions commerciales et attributs','propale',2,'export',NULL,'r',0,22,0),(31,'Lire les produits','produit',1,'lire',NULL,'r',1,25,0),(31,'Lire les produits','produit',2,'lire',NULL,'r',1,25,0),(32,'Creer/modifier les produits','produit',1,'creer',NULL,'w',0,25,0),(32,'Creer/modifier les produits','produit',2,'creer',NULL,'w',0,25,0),(34,'Supprimer les produits','produit',1,'supprimer',NULL,'d',0,25,0),(34,'Supprimer les produits','produit',2,'supprimer',NULL,'d',0,25,0),(38,'Exporter les produits','produit',1,'export',NULL,'r',0,25,0),(38,'Exporter les produits','produit',2,'export',NULL,'r',0,25,0),(39,'Ignore minimum price','produit',1,'ignore_price_min_advance',NULL,'r',0,25,0),(41,'Read projects and tasks (shared projects or projects I am contact for). Can also enter time consumed on assigned tasks (timesheet)','projet',1,'lire',NULL,'r',1,14,0),(42,'Create/modify projects and tasks (shared projects or projects I am contact for)','projet',1,'creer',NULL,'w',0,14,0),(44,'Delete project and tasks (shared projects or projects I am contact for)','projet',1,'supprimer',NULL,'d',0,14,0),(45,'Export projects','projet',1,'export',NULL,'d',0,14,0),(61,'Lire les fiches d\'intervention','ficheinter',1,'lire',NULL,'r',1,41,0),(62,'Creer/modifier les fiches d\'intervention','ficheinter',1,'creer',NULL,'w',0,41,0),(64,'Supprimer les fiches d\'intervention','ficheinter',1,'supprimer',NULL,'d',0,41,0),(67,'Exporter les fiches interventions','ficheinter',1,'export',NULL,'r',0,41,0),(68,'Envoyer les fiches d\'intervention par courriel','ficheinter',1,'ficheinter_advance','send','r',0,41,0),(69,'Valider les fiches d\'intervention ','ficheinter',1,'ficheinter_advance','validate','a',0,41,0),(70,'Dévalider les fiches d\'intervention','ficheinter',1,'ficheinter_advance','unvalidate','a',0,41,0),(71,'Read members\' card','adherent',1,'lire',NULL,'r',0,55,0),(72,'Create/modify members (need also user module permissions if member linked to a user)','adherent',1,'creer',NULL,'w',0,55,0),(74,'Remove members','adherent',1,'supprimer',NULL,'d',0,55,0),(75,'Setup types of membership','adherent',1,'configurer',NULL,'w',0,55,0),(76,'Export members','adherent',1,'export',NULL,'r',0,55,0),(78,'Read subscriptions','adherent',1,'cotisation','lire','r',0,55,0),(79,'Create/modify/remove subscriptions','adherent',1,'cotisation','creer','w',0,55,0),(81,'Read sales orders','commande',1,'lire',NULL,'r',0,0,0),(82,'Creeat/modify sales orders','commande',1,'creer',NULL,'w',0,0,0),(84,'Validate sales orders','commande',1,'order_advance','validate','d',0,0,0),(86,'Send sale orders by email','commande',1,'order_advance','send','d',0,0,0),(87,'Close sale orders','commande',1,'order_advance','close','d',0,0,0),(88,'Cancel sale orders','commande',1,'order_advance','annuler','d',0,0,0),(89,'Delete sales orders','commande',1,'supprimer',NULL,'d',0,0,0),(91,'Lire les charges','tax',1,'charges','lire','r',0,50,0),(91,'Lire les charges','tax',2,'charges','lire','r',1,50,0),(92,'Creer/modifier les charges','tax',1,'charges','creer','w',0,50,0),(92,'Creer/modifier les charges','tax',2,'charges','creer','w',0,50,0),(93,'Supprimer les charges','tax',1,'charges','supprimer','d',0,50,0),(93,'Supprimer les charges','tax',2,'charges','supprimer','d',0,50,0),(94,'Exporter les charges','tax',1,'charges','export','r',0,50,0),(94,'Exporter les charges','tax',2,'charges','export','r',0,50,0),(101,'Lire les expeditions','expedition',1,'lire',NULL,'r',0,0,0),(102,'Creer modifier les expeditions','expedition',1,'creer',NULL,'w',0,0,0),(104,'Valider les expeditions','expedition',1,'shipping_advance','validate','d',0,0,0),(105,'Envoyer les expeditions aux clients','expedition',1,'shipping_advance','send','d',0,0,0),(106,'Exporter les expeditions','expedition',1,'shipment','export','r',0,0,0),(109,'Supprimer les expeditions','expedition',1,'supprimer',NULL,'d',0,0,0),(111,'Lire les comptes bancaires','banque',1,'lire',NULL,'r',0,51,0),(111,'Lire les comptes bancaires','banque',2,'lire',NULL,'r',1,51,0),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',1,'modifier',NULL,'w',0,51,0),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',2,'modifier',NULL,'w',0,51,0),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',1,'configurer',NULL,'a',0,51,0),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',2,'configurer',NULL,'a',0,51,0),(114,'Rapprocher les ecritures bancaires','banque',1,'consolidate',NULL,'w',0,51,0),(114,'Rapprocher les ecritures bancaires','banque',2,'consolidate',NULL,'w',0,51,0),(115,'Exporter transactions et releves','banque',1,'export',NULL,'r',0,51,0),(115,'Exporter transactions et releves','banque',2,'export',NULL,'r',0,51,0),(116,'Virements entre comptes','banque',1,'transfer',NULL,'w',0,51,0),(116,'Virements entre comptes','banque',2,'transfer',NULL,'w',0,51,0),(117,'Gerer les envois de cheques','banque',1,'cheque',NULL,'w',0,51,0),(117,'Gerer les envois de cheques','banque',2,'cheque',NULL,'w',0,51,0),(121,'Read third parties','societe',1,'lire',NULL,'r',0,0,0),(121,'Lire les societes','societe',2,'lire',NULL,'r',1,9,0),(122,'Create and update third parties','societe',1,'creer',NULL,'w',0,0,0),(122,'Creer modifier les societes','societe',2,'creer',NULL,'w',0,9,0),(125,'Delete third parties','societe',1,'supprimer',NULL,'d',0,0,0),(125,'Supprimer les societes','societe',2,'supprimer',NULL,'d',0,9,0),(126,'Export third parties','societe',1,'export',NULL,'r',0,0,0),(126,'Exporter les societes','societe',2,'export',NULL,'r',0,9,0),(141,'Read all projects and tasks (also private projects I am not contact for)','projet',1,'all','lire','r',0,14,0),(142,'Create/modify all projects and tasks (also private projects I am not contact for)','projet',1,'all','creer','w',0,14,0),(144,'Delete all projects and tasks (also private projects I am not contact for)','projet',1,'all','supprimer','d',0,14,0),(151,'Read withdrawals','prelevement',1,'bons','lire','r',1,52,0),(152,'Create/modify a withdrawals','prelevement',1,'bons','creer','w',0,52,0),(153,'Send withdrawals to bank','prelevement',1,'bons','send','a',0,52,0),(154,'credit/refuse withdrawals','prelevement',1,'bons','credit','a',0,52,0),(161,'Lire les contrats','contrat',1,'lire',NULL,'r',1,35,0),(162,'Creer / modifier les contrats','contrat',1,'creer',NULL,'w',0,35,0),(163,'Activer un service d\'un contrat','contrat',1,'activer',NULL,'w',0,35,0),(164,'Desactiver un service d\'un contrat','contrat',1,'desactiver',NULL,'w',0,35,0),(165,'Supprimer un contrat','contrat',1,'supprimer',NULL,'d',0,35,0),(167,'Export contracts','contrat',1,'export',NULL,'r',0,35,0),(221,'Consulter les mailings','mailing',1,'lire',NULL,'r',1,11,0),(221,'Consulter les mailings','mailing',2,'lire',NULL,'r',1,11,0),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',1,'creer',NULL,'w',0,11,0),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',2,'creer',NULL,'w',0,11,0),(223,'Valider les mailings (permet leur envoi)','mailing',1,'valider',NULL,'w',0,11,0),(223,'Valider les mailings (permet leur envoi)','mailing',2,'valider',NULL,'w',0,11,0),(229,'Supprimer les mailings','mailing',1,'supprimer',NULL,'d',0,11,0),(229,'Supprimer les mailings','mailing',2,'supprimer',NULL,'d',0,11,0),(237,'View recipients and info','mailing',1,'mailing_advance','recipient','r',0,11,0),(237,'View recipients and info','mailing',2,'mailing_advance','recipient','r',0,11,0),(238,'Manually send mailings','mailing',1,'mailing_advance','send','w',0,11,0),(238,'Manually send mailings','mailing',2,'mailing_advance','send','w',0,11,0),(239,'Delete mailings after validation and/or sent','mailing',1,'mailing_advance','delete','d',0,11,0),(239,'Delete mailings after validation and/or sent','mailing',2,'mailing_advance','delete','d',0,11,0),(241,'Lire les categories','categorie',1,'lire',NULL,'r',1,20,0),(242,'Creer/modifier les categories','categorie',1,'creer',NULL,'w',0,20,0),(243,'Supprimer les categories','categorie',1,'supprimer',NULL,'d',0,20,0),(251,'Consulter les autres utilisateurs','user',1,'user','lire','r',0,0,0),(252,'Consulter les permissions des autres utilisateurs','user',1,'user_advance','readperms','r',0,0,0),(253,'Creer/modifier utilisateurs internes et externes','user',1,'user','creer','w',0,0,0),(254,'Creer/modifier utilisateurs externes seulement','user',1,'user_advance','write','w',0,0,0),(255,'Modifier le mot de passe des autres utilisateurs','user',1,'user','password','w',0,0,0),(256,'Supprimer ou desactiver les autres utilisateurs','user',1,'user','supprimer','d',0,0,0),(262,'Read all third parties by internal users (otherwise only if commercial contact). Not effective for external users (limited to themselves).','societe',1,'client','voir','r',0,0,0),(262,'Consulter tous les tiers par utilisateurs internes (sinon uniquement si contact commercial). Non effectif pour utilisateurs externes (tjs limités à eux-meme).','societe',2,'client','voir','r',1,9,0),(281,'Read contacts','societe',1,'contact','lire','r',0,0,0),(281,'Lire les contacts','societe',2,'contact','lire','r',1,9,0),(282,'Create and update contact','societe',1,'contact','creer','w',0,0,0),(282,'Creer modifier les contacts','societe',2,'contact','creer','w',0,9,0),(283,'Delete contacts','societe',1,'contact','supprimer','d',0,0,0),(283,'Supprimer les contacts','societe',2,'contact','supprimer','d',0,9,0),(286,'Export contacts','societe',1,'contact','export','d',0,0,0),(286,'Exporter les contacts','societe',2,'contact','export','d',0,9,0),(300,'Read barcodes','barcode',1,'lire_advance',NULL,'r',1,0,0),(301,'Create/modify barcodes','barcode',1,'creer_advance',NULL,'w',0,0,0),(331,'Lire les bookmarks','bookmark',1,'lire',NULL,'r',0,50,0),(332,'Creer/modifier les bookmarks','bookmark',1,'creer',NULL,'r',0,50,0),(333,'Supprimer les bookmarks','bookmark',1,'supprimer',NULL,'r',0,50,0),(341,'Consulter ses propres permissions','user',1,'self_advance','readperms','r',0,0,0),(342,'Creer/modifier ses propres infos utilisateur','user',1,'self','creer','w',0,0,0),(343,'Modifier son propre mot de passe','user',1,'self','password','w',0,0,0),(344,'Modifier ses propres permissions','user',1,'self_advance','writeperms','w',0,0,0),(351,'Consulter les groupes','user',1,'group_advance','read','r',0,0,0),(352,'Consulter les permissions des groupes','user',1,'group_advance','readperms','r',0,0,0),(353,'Creer/modifier les groupes et leurs permissions','user',1,'group_advance','write','w',0,0,0),(354,'Supprimer ou desactiver les groupes','user',1,'group_advance','delete','d',0,0,0),(358,'Exporter les utilisateurs','user',1,'user','export','r',0,0,0),(511,'Read payments of employee salaries','salaries',1,'read',NULL,'r',0,0,0),(512,'Create/modify payments of empoyee salaries','salaries',1,'write',NULL,'w',0,0,0),(514,'Delete payments of employee salary','salaries',1,'delete',NULL,'d',0,0,0),(517,'Export payments of employee salaries','salaries',1,'export',NULL,'r',0,0,0),(520,'Read loans','loan',1,'read',NULL,'r',0,50,0),(522,'Create/modify loans','loan',1,'write',NULL,'w',0,50,0),(524,'Delete loans','loan',1,'delete',NULL,'d',0,50,0),(525,'Access loan calculator','loan',1,'calc',NULL,'r',0,50,0),(527,'Export loans','loan',1,'export',NULL,'r',0,50,0),(531,'Read services','service',1,'lire',NULL,'r',0,0,0),(532,'Create/modify services','service',1,'creer',NULL,'w',0,0,0),(534,'Delete les services','service',1,'supprimer',NULL,'d',0,0,0),(538,'Export services','service',1,'export',NULL,'r',0,0,0),(650,'Read bom of Bom','bom',1,'read',NULL,'w',0,60,0),(651,'Create/Update bom of Bom','bom',1,'write',NULL,'w',0,60,0),(652,'Delete bom of Bom','bom',1,'delete',NULL,'w',0,60,0),(660,'Read objects of Mrp','mrp',1,'read',NULL,'w',0,62,0),(661,'Create/Update objects of Mrp','mrp',1,'write',NULL,'w',0,62,0),(662,'Delete objects of Mrp','mrp',1,'delete',NULL,'w',0,62,0),(701,'Lire les dons','don',1,'lire',NULL,'r',1,50,0),(701,'Lire les dons','don',2,'lire',NULL,'r',1,50,0),(702,'Creer/modifier les dons','don',1,'creer',NULL,'w',0,50,0),(702,'Creer/modifier les dons','don',2,'creer',NULL,'w',0,50,0),(703,'Supprimer les dons','don',1,'supprimer',NULL,'d',0,50,0),(703,'Supprimer les dons','don',2,'supprimer',NULL,'d',0,50,0),(771,'Read expense reports (yours and your subordinates)','expensereport',1,'lire',NULL,'r',0,0,0),(772,'Create/modify expense reports','expensereport',1,'creer',NULL,'w',0,0,0),(773,'Delete expense reports','expensereport',1,'supprimer',NULL,'d',0,0,0),(775,'Approve expense reports','expensereport',1,'approve',NULL,'w',0,0,0),(776,'Pay expense reports','expensereport',1,'to_paid',NULL,'w',0,0,0),(777,'Read expense reports of everybody','expensereport',1,'readall',NULL,'r',0,0,0),(778,'Create expense reports for everybody','expensereport',1,'writeall_advance',NULL,'w',0,0,0),(779,'Export expense reports','expensereport',1,'export',NULL,'r',0,0,0),(1001,'Lire les stocks','stock',1,'lire',NULL,'r',1,40,0),(1002,'Creer/Modifier les stocks','stock',1,'creer',NULL,'w',0,40,0),(1003,'Supprimer les stocks','stock',1,'supprimer',NULL,'d',0,40,0),(1004,'Lire mouvements de stocks','stock',1,'mouvement','lire','r',1,40,0),(1005,'Creer/modifier mouvements de stocks','stock',1,'mouvement','creer','w',0,40,0),(1101,'Read delivery receipts','expedition',1,'livraison','lire','r',0,0,0),(1102,'Create/modify delivery receipts','expedition',1,'livraison','creer','w',0,0,0),(1104,'Validate delivery receipts','expedition',1,'livraison_advance','validate','d',0,0,0),(1109,'Delete delivery receipts','expedition',1,'livraison','supprimer','d',0,0,0),(1121,'Read supplier proposals','supplier_proposal',1,'lire',NULL,'w',0,0,0),(1122,'Create/modify supplier proposals','supplier_proposal',1,'creer',NULL,'w',0,0,0),(1123,'Validate supplier proposals','supplier_proposal',1,'validate_advance',NULL,'w',0,0,0),(1124,'Envoyer les demandes fournisseurs','supplier_proposal',1,'send_advance',NULL,'w',0,0,0),(1125,'Delete supplier proposals','supplier_proposal',1,'supprimer',NULL,'w',0,0,0),(1126,'Close supplier price requests','supplier_proposal',1,'cloturer',NULL,'w',0,0,0),(1181,'Consulter les fournisseurs','fournisseur',1,'lire',NULL,'r',0,0,0),(1182,'Consulter les commandes fournisseur','fournisseur',1,'commande','lire','r',0,0,0),(1183,'Creer une commande fournisseur','fournisseur',1,'commande','creer','w',0,0,0),(1184,'Valider une commande fournisseur','fournisseur',1,'supplier_order_advance','validate','w',0,0,0),(1185,'Approuver une commande fournisseur','fournisseur',1,'commande','approuver','w',0,0,0),(1186,'Commander une commande fournisseur','fournisseur',1,'commande','commander','w',0,0,0),(1187,'Receptionner une commande fournisseur','fournisseur',1,'commande','receptionner','d',0,0,0),(1188,'Supprimer une commande fournisseur','fournisseur',1,'commande','supprimer','d',0,0,0),(1189,'Check/Uncheck a supplier order reception','fournisseur',1,'commande_advance','check','w',0,0,0),(1191,'Exporter les commande fournisseurs, attributs','fournisseur',1,'commande','export','r',0,0,0),(1201,'Lire les exports','export',1,'lire',NULL,'r',1,72,0),(1202,'Creer/modifier un export','export',1,'creer',NULL,'w',0,72,0),(1231,'Consulter les factures fournisseur','fournisseur',1,'facture','lire','r',0,0,0),(1232,'Creer une facture fournisseur','fournisseur',1,'facture','creer','w',0,0,0),(1233,'Valider une facture fournisseur','fournisseur',1,'supplier_invoice_advance','validate','w',0,0,0),(1234,'Supprimer une facture fournisseur','fournisseur',1,'facture','supprimer','d',0,0,0),(1235,'Envoyer les factures par mail','fournisseur',1,'supplier_invoice_advance','send','a',0,0,0),(1236,'Exporter les factures fournisseurs, attributs et reglements','fournisseur',1,'facture','export','r',0,0,0),(1251,'Run mass imports of external data (data load)','import',1,'run',NULL,'r',0,70,0),(1321,'Export customer invoices, attributes and payments','facture',1,'facture','export','r',0,0,0),(1321,'Exporter les factures clients, attributs et reglements','facture',2,'facture','export','r',0,10,0),(1322,'Re-open a fully paid invoice','facture',1,'invoice_advance','reopen','r',0,0,0),(1421,'Export sales orders and attributes','commande',1,'commande','export','r',0,0,0),(2401,'Read actions/tasks linked to his account','agenda',1,'myactions','read','r',0,0,0),(2401,'Read actions/tasks linked to his account','agenda',2,'myactions','read','r',1,15,0),(2402,'Create/modify actions/tasks linked to his account','agenda',1,'myactions','create','w',0,0,0),(2402,'Create/modify actions/tasks linked to his account','agenda',2,'myactions','create','w',0,15,0),(2403,'Delete actions/tasks linked to his account','agenda',1,'myactions','delete','w',0,0,0),(2403,'Delete actions/tasks linked to his account','agenda',2,'myactions','delete','w',0,15,0),(2411,'Read actions/tasks of others','agenda',1,'allactions','read','r',0,0,0),(2411,'Read actions/tasks of others','agenda',2,'allactions','read','r',0,15,0),(2412,'Create/modify actions/tasks of others','agenda',1,'allactions','create','w',0,0,0),(2412,'Create/modify actions/tasks of others','agenda',2,'allactions','create','w',0,15,0),(2413,'Delete actions/tasks of others','agenda',1,'allactions','delete','w',0,0,0),(2413,'Delete actions/tasks of others','agenda',2,'allactions','delete','w',0,15,0),(2414,'Export actions/tasks of others','agenda',1,'export',NULL,'w',0,0,0),(2501,'Consulter/Télécharger les documents','ecm',1,'read',NULL,'r',0,0,0),(2503,'Soumettre ou supprimer des documents','ecm',1,'upload',NULL,'w',0,0,0),(2515,'Administrer les rubriques de documents','ecm',1,'setup',NULL,'w',0,0,0),(10001,'Read website content','website',1,'read',NULL,'w',0,0,0),(10002,'Create/modify website content (html and javascript content)','website',1,'write',NULL,'w',0,0,0),(10003,'Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.','website',1,'writephp',NULL,'w',0,0,0),(10005,'Delete website content','website',1,'delete',NULL,'w',0,0,0),(20001,'Read your own leave requests','holiday',1,'read',NULL,'w',0,0,0),(20001,'Créer / Modifier / Lire ses demandes de congés payés','holiday',2,'write',NULL,'w',1,42,0),(20002,'Create/modify your own leave requests','holiday',1,'write',NULL,'w',0,0,0),(20002,'Lire / Modifier toutes les demandes de congés payés','holiday',2,'lire_tous',NULL,'w',0,42,0),(20003,'Delete leave requests','holiday',1,'delete',NULL,'w',0,0,0),(20003,'Supprimer des demandes de congés payés','holiday',2,'delete',NULL,'w',0,42,0),(20004,'Read leave requests for everybody','holiday',1,'read_all',NULL,'w',0,0,0),(20004,'Définir les congés payés des utilisateurs','holiday',2,'define_holiday',NULL,'w',0,42,0),(20005,'Create/modify leave requests for everybody','holiday',1,'write_all',NULL,'w',0,0,0),(20005,'Voir les logs de modification des congés payés','holiday',2,'view_log',NULL,'w',0,42,0),(20006,'Setup leave requests of users (setup and update balance)','holiday',1,'define_holiday',NULL,'w',0,0,0),(20006,'Accéder au rapport mensuel des congés payés','holiday',2,'month_report',NULL,'w',0,42,0),(20007,'Approve leave requests','holiday',1,'approve',NULL,'w',0,0,0),(23001,'Read cron jobs','cron',1,'read',NULL,'w',0,0,0),(23002,'Create cron Jobs','cron',1,'create',NULL,'w',0,0,0),(23003,'Delete cron Jobs','cron',1,'delete',NULL,'w',0,0,0),(23004,'Execute cron Jobs','cron',1,'execute',NULL,'w',0,0,0),(50151,'Use Point Of Sale','takepos',1,'run',NULL,'a',0,0,0),(50401,'Bind products and invoices with accounting accounts','accounting',1,'bind','write','r',0,61,0),(50411,'Read operations in General Ledger','accounting',1,'mouvements','lire','r',0,61,0),(50412,'Write/Edit operations in General Ledger','accounting',1,'mouvements','creer','w',0,61,0),(50414,'Delete operations in Ledger','accounting',1,'mouvements','supprimer','d',0,61,0),(50415,'Delete all operations by year and journal in Ledger','accounting',1,'mouvements','supprimer_tous','d',0,61,0),(50418,'Export operations of the Ledger','accounting',1,'mouvements','export','r',0,61,0),(50420,'Report and export reports (turnover, balance, journals, general ledger)','accounting',1,'comptarapport','lire','r',0,61,0),(50430,'Define and close a fiscal year','accounting',1,'fiscalyear','write','r',0,61,0),(50440,'Manage chart of accounts, setup of accountancy','accounting',1,'chartofaccount',NULL,'r',0,61,0),(55001,'Read surveys','opensurvey',1,'read',NULL,'r',0,0,0),(55002,'Create/modify surveys','opensurvey',1,'write',NULL,'w',0,0,0),(56001,'Read ticket','ticket',1,'read',NULL,'r',0,60,0),(56002,'Create les tickets','ticket',1,'write',NULL,'w',0,60,0),(56003,'Delete les tickets','ticket',1,'delete',NULL,'d',0,60,0),(56004,'Manage tickets','ticket',1,'manage',NULL,'w',0,60,0),(56005,'See all tickets, even if not assigned to (not effective for external users, always restricted to the thirdpardy they depends on)','ticket',1,'view','all','r',0,60,0),(59001,'Visualiser les marges','margins',1,'liretous',NULL,'r',0,55,0),(59002,'Définir les marges','margins',1,'creer',NULL,'w',0,55,0),(59003,'Read every user margin','margins',1,'read','all','r',0,55,0),(63001,'Read resources','resource',1,'read',NULL,'w',0,0,0),(63002,'Create/Modify resources','resource',1,'write',NULL,'w',0,0,0),(63003,'Delete resources','resource',1,'delete',NULL,'w',0,0,0),(63004,'Link resources to agenda events','resource',1,'link',NULL,'w',0,0,0),(64001,'DirectPrint','printing',1,'read',NULL,'r',0,52,0),(101250,'Read surveys','opensurvey',2,'survey','read','r',0,40,0),(101251,'Create/modify surveys','opensurvey',2,'survey','write','w',0,40,0);
+INSERT INTO `llx_rights_def` VALUES (11,'Read invoices','facture',1,'lire',NULL,'a',0,0,0),(11,'Lire les factures','facture',2,'lire',NULL,'a',1,10,0),(12,'Create and update invoices','facture',1,'creer',NULL,'a',0,0,0),(12,'Creer/modifier les factures','facture',2,'creer',NULL,'a',0,10,0),(13,'Devalidate invoices','facture',1,'invoice_advance','unvalidate','a',0,0,0),(13,'Dévalider les factures','facture',2,'invoice_advance','unvalidate','a',0,10,0),(14,'Validate invoices','facture',1,'invoice_advance','validate','a',0,0,0),(14,'Valider les factures','facture',2,'valider',NULL,'a',0,10,0),(15,'Send invoices by email','facture',1,'invoice_advance','send','a',0,0,0),(15,'Envoyer les factures par mail','facture',2,'invoice_advance','send','a',0,10,0),(16,'Issue payments on invoices','facture',1,'paiement',NULL,'a',0,0,0),(16,'Emettre des paiements sur les factures','facture',2,'paiement',NULL,'a',0,10,0),(19,'Delete invoices','facture',1,'supprimer',NULL,'a',0,0,0),(19,'Supprimer les factures','facture',2,'supprimer',NULL,'a',0,10,0),(21,'Lire les propositions commerciales','propale',1,'lire',NULL,'r',1,22,0),(21,'Lire les propositions commerciales','propale',2,'lire',NULL,'r',1,22,0),(22,'Creer/modifier les propositions commerciales','propale',1,'creer',NULL,'w',0,22,0),(22,'Creer/modifier les propositions commerciales','propale',2,'creer',NULL,'w',0,22,0),(24,'Valider les propositions commerciales','propale',1,'propal_advance','validate','d',0,22,0),(24,'Valider les propositions commerciales','propale',2,'valider',NULL,'d',0,22,0),(25,'Envoyer les propositions commerciales aux clients','propale',1,'propal_advance','send','d',0,22,0),(25,'Envoyer les propositions commerciales aux clients','propale',2,'propal_advance','send','d',0,22,0),(26,'Cloturer les propositions commerciales','propale',1,'propal_advance','close','d',0,22,0),(26,'Cloturer les propositions commerciales','propale',2,'propal_advance','close','d',0,22,0),(27,'Supprimer les propositions commerciales','propale',1,'supprimer',NULL,'d',0,22,0),(27,'Supprimer les propositions commerciales','propale',2,'supprimer',NULL,'d',0,22,0),(28,'Exporter les propositions commerciales et attributs','propale',1,'export',NULL,'r',0,22,0),(28,'Exporter les propositions commerciales et attributs','propale',2,'export',NULL,'r',0,22,0),(31,'Lire les produits','produit',1,'lire',NULL,'r',1,25,0),(31,'Lire les produits','produit',2,'lire',NULL,'r',1,25,0),(32,'Creer/modifier les produits','produit',1,'creer',NULL,'w',0,25,0),(32,'Creer/modifier les produits','produit',2,'creer',NULL,'w',0,25,0),(34,'Supprimer les produits','produit',1,'supprimer',NULL,'d',0,25,0),(34,'Supprimer les produits','produit',2,'supprimer',NULL,'d',0,25,0),(38,'Exporter les produits','produit',1,'export',NULL,'r',0,25,0),(38,'Exporter les produits','produit',2,'export',NULL,'r',0,25,0),(39,'Ignore minimum price','produit',1,'ignore_price_min_advance',NULL,'r',0,25,0),(41,'Read projects and tasks (shared projects or projects I am contact for). Can also enter time consumed on assigned tasks (timesheet)','projet',1,'lire',NULL,'r',1,14,0),(42,'Create/modify projects and tasks (shared projects or projects I am contact for)','projet',1,'creer',NULL,'w',0,14,0),(44,'Delete project and tasks (shared projects or projects I am contact for)','projet',1,'supprimer',NULL,'d',0,14,0),(45,'Export projects','projet',1,'export',NULL,'d',0,14,0),(61,'Lire les fiches d\'intervention','ficheinter',1,'lire',NULL,'r',1,41,0),(62,'Creer/modifier les fiches d\'intervention','ficheinter',1,'creer',NULL,'w',0,41,0),(64,'Supprimer les fiches d\'intervention','ficheinter',1,'supprimer',NULL,'d',0,41,0),(67,'Exporter les fiches interventions','ficheinter',1,'export',NULL,'r',0,41,0),(68,'Envoyer les fiches d\'intervention par courriel','ficheinter',1,'ficheinter_advance','send','r',0,41,0),(69,'Valider les fiches d\'intervention ','ficheinter',1,'ficheinter_advance','validate','a',0,41,0),(70,'Dévalider les fiches d\'intervention','ficheinter',1,'ficheinter_advance','unvalidate','a',0,41,0),(71,'Read members\' card','adherent',1,'lire',NULL,'r',0,55,0),(72,'Create/modify members (need also user module permissions if member linked to a user)','adherent',1,'creer',NULL,'w',0,55,0),(74,'Remove members','adherent',1,'supprimer',NULL,'d',0,55,0),(75,'Setup types of membership','adherent',1,'configurer',NULL,'w',0,55,0),(76,'Export members','adherent',1,'export',NULL,'r',0,55,0),(78,'Read subscriptions','adherent',1,'cotisation','lire','r',0,55,0),(79,'Create/modify/remove subscriptions','adherent',1,'cotisation','creer','w',0,55,0),(81,'Read sales orders','commande',1,'lire',NULL,'r',0,0,0),(82,'Creeat/modify sales orders','commande',1,'creer',NULL,'w',0,0,0),(84,'Validate sales orders','commande',1,'order_advance','validate','d',0,0,0),(86,'Send sale orders by email','commande',1,'order_advance','send','d',0,0,0),(87,'Close sale orders','commande',1,'order_advance','close','d',0,0,0),(88,'Cancel sale orders','commande',1,'order_advance','annuler','d',0,0,0),(89,'Delete sales orders','commande',1,'supprimer',NULL,'d',0,0,0),(91,'Lire les charges','tax',1,'charges','lire','r',0,50,0),(91,'Lire les charges','tax',2,'charges','lire','r',1,50,0),(92,'Creer/modifier les charges','tax',1,'charges','creer','w',0,50,0),(92,'Creer/modifier les charges','tax',2,'charges','creer','w',0,50,0),(93,'Supprimer les charges','tax',1,'charges','supprimer','d',0,50,0),(93,'Supprimer les charges','tax',2,'charges','supprimer','d',0,50,0),(94,'Exporter les charges','tax',1,'charges','export','r',0,50,0),(94,'Exporter les charges','tax',2,'charges','export','r',0,50,0),(101,'Lire les expeditions','expedition',1,'lire',NULL,'r',0,0,0),(102,'Creer modifier les expeditions','expedition',1,'creer',NULL,'w',0,0,0),(104,'Valider les expeditions','expedition',1,'shipping_advance','validate','d',0,0,0),(105,'Envoyer les expeditions aux clients','expedition',1,'shipping_advance','send','d',0,0,0),(106,'Exporter les expeditions','expedition',1,'shipment','export','r',0,0,0),(109,'Supprimer les expeditions','expedition',1,'supprimer',NULL,'d',0,0,0),(111,'Lire les comptes bancaires','banque',1,'lire',NULL,'r',0,51,0),(111,'Lire les comptes bancaires','banque',2,'lire',NULL,'r',1,51,0),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',1,'modifier',NULL,'w',0,51,0),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',2,'modifier',NULL,'w',0,51,0),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',1,'configurer',NULL,'a',0,51,0),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',2,'configurer',NULL,'a',0,51,0),(114,'Rapprocher les ecritures bancaires','banque',1,'consolidate',NULL,'w',0,51,0),(114,'Rapprocher les ecritures bancaires','banque',2,'consolidate',NULL,'w',0,51,0),(115,'Exporter transactions et releves','banque',1,'export',NULL,'r',0,51,0),(115,'Exporter transactions et releves','banque',2,'export',NULL,'r',0,51,0),(116,'Virements entre comptes','banque',1,'transfer',NULL,'w',0,51,0),(116,'Virements entre comptes','banque',2,'transfer',NULL,'w',0,51,0),(117,'Gerer les envois de cheques','banque',1,'cheque',NULL,'w',0,51,0),(117,'Gerer les envois de cheques','banque',2,'cheque',NULL,'w',0,51,0),(121,'Read third parties','societe',1,'lire',NULL,'r',0,0,0),(121,'Lire les societes','societe',2,'lire',NULL,'r',1,9,0),(122,'Create and update third parties','societe',1,'creer',NULL,'w',0,0,0),(122,'Creer modifier les societes','societe',2,'creer',NULL,'w',0,9,0),(125,'Delete third parties','societe',1,'supprimer',NULL,'d',0,0,0),(125,'Supprimer les societes','societe',2,'supprimer',NULL,'d',0,9,0),(126,'Export third parties','societe',1,'export',NULL,'r',0,0,0),(126,'Exporter les societes','societe',2,'export',NULL,'r',0,9,0),(141,'Read all projects and tasks (also private projects I am not contact for)','projet',1,'all','lire','r',0,14,0),(142,'Create/modify all projects and tasks (also private projects I am not contact for)','projet',1,'all','creer','w',0,14,0),(144,'Delete all projects and tasks (also private projects I am not contact for)','projet',1,'all','supprimer','d',0,14,0),(151,'Read withdrawals','prelevement',1,'bons','lire','r',1,52,0),(152,'Create/modify a withdrawals','prelevement',1,'bons','creer','w',0,52,0),(153,'Send withdrawals to bank','prelevement',1,'bons','send','a',0,52,0),(154,'credit/refuse withdrawals','prelevement',1,'bons','credit','a',0,52,0),(161,'Lire les contrats','contrat',1,'lire',NULL,'r',1,35,0),(162,'Creer / modifier les contrats','contrat',1,'creer',NULL,'w',0,35,0),(163,'Activer un service d\'un contrat','contrat',1,'activer',NULL,'w',0,35,0),(164,'Desactiver un service d\'un contrat','contrat',1,'desactiver',NULL,'w',0,35,0),(165,'Supprimer un contrat','contrat',1,'supprimer',NULL,'d',0,35,0),(167,'Export contracts','contrat',1,'export',NULL,'r',0,35,0),(221,'Consulter les mailings','mailing',1,'lire',NULL,'r',1,11,0),(221,'Consulter les mailings','mailing',2,'lire',NULL,'r',1,11,0),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',1,'creer',NULL,'w',0,11,0),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',2,'creer',NULL,'w',0,11,0),(223,'Valider les mailings (permet leur envoi)','mailing',1,'valider',NULL,'w',0,11,0),(223,'Valider les mailings (permet leur envoi)','mailing',2,'valider',NULL,'w',0,11,0),(229,'Supprimer les mailings','mailing',1,'supprimer',NULL,'d',0,11,0),(229,'Supprimer les mailings','mailing',2,'supprimer',NULL,'d',0,11,0),(237,'View recipients and info','mailing',1,'mailing_advance','recipient','r',0,11,0),(237,'View recipients and info','mailing',2,'mailing_advance','recipient','r',0,11,0),(238,'Manually send mailings','mailing',1,'mailing_advance','send','w',0,11,0),(238,'Manually send mailings','mailing',2,'mailing_advance','send','w',0,11,0),(239,'Delete mailings after validation and/or sent','mailing',1,'mailing_advance','delete','d',0,11,0),(239,'Delete mailings after validation and/or sent','mailing',2,'mailing_advance','delete','d',0,11,0),(241,'Lire les categories','categorie',1,'lire',NULL,'r',1,20,0),(242,'Creer/modifier les categories','categorie',1,'creer',NULL,'w',0,20,0),(243,'Supprimer les categories','categorie',1,'supprimer',NULL,'d',0,20,0),(251,'Consulter les autres utilisateurs','user',1,'user','lire','r',0,0,0),(252,'Consulter les permissions des autres utilisateurs','user',1,'user_advance','readperms','r',0,0,0),(253,'Creer/modifier utilisateurs internes et externes','user',1,'user','creer','w',0,0,0),(254,'Creer/modifier utilisateurs externes seulement','user',1,'user_advance','write','w',0,0,0),(255,'Modifier le mot de passe des autres utilisateurs','user',1,'user','password','w',0,0,0),(256,'Supprimer ou desactiver les autres utilisateurs','user',1,'user','supprimer','d',0,0,0),(262,'Read all third parties by internal users (otherwise only if commercial contact). Not effective for external users (limited to themselves).','societe',1,'client','voir','r',0,0,0),(262,'Consulter tous les tiers par utilisateurs internes (sinon uniquement si contact commercial). Non effectif pour utilisateurs externes (tjs limités à eux-meme).','societe',2,'client','voir','r',1,9,0),(281,'Read contacts','societe',1,'contact','lire','r',0,0,0),(281,'Lire les contacts','societe',2,'contact','lire','r',1,9,0),(282,'Create and update contact','societe',1,'contact','creer','w',0,0,0),(282,'Creer modifier les contacts','societe',2,'contact','creer','w',0,9,0),(283,'Delete contacts','societe',1,'contact','supprimer','d',0,0,0),(283,'Supprimer les contacts','societe',2,'contact','supprimer','d',0,9,0),(286,'Export contacts','societe',1,'contact','export','d',0,0,0),(286,'Exporter les contacts','societe',2,'contact','export','d',0,9,0),(300,'Read barcodes','barcode',1,'lire_advance',NULL,'r',1,0,0),(301,'Create/modify barcodes','barcode',1,'creer_advance',NULL,'w',0,0,0),(331,'Lire les bookmarks','bookmark',1,'lire',NULL,'r',0,50,0),(332,'Creer/modifier les bookmarks','bookmark',1,'creer',NULL,'r',0,50,0),(333,'Supprimer les bookmarks','bookmark',1,'supprimer',NULL,'r',0,50,0),(341,'Consulter ses propres permissions','user',1,'self_advance','readperms','r',0,0,0),(342,'Creer/modifier ses propres infos utilisateur','user',1,'self','creer','w',0,0,0),(343,'Modifier son propre mot de passe','user',1,'self','password','w',0,0,0),(344,'Modifier ses propres permissions','user',1,'self_advance','writeperms','w',0,0,0),(351,'Consulter les groupes','user',1,'group_advance','read','r',0,0,0),(352,'Consulter les permissions des groupes','user',1,'group_advance','readperms','r',0,0,0),(353,'Creer/modifier les groupes et leurs permissions','user',1,'group_advance','write','w',0,0,0),(354,'Supprimer ou desactiver les groupes','user',1,'group_advance','delete','d',0,0,0),(358,'Exporter les utilisateurs','user',1,'user','export','r',0,0,0),(511,'Read payments of employee salaries (yours and your subordinates)','salaries',1,'read',NULL,'r',0,0,0),(512,'Create/modify payments of empoyee salaries','salaries',1,'write',NULL,'w',0,0,0),(514,'Delete payments of employee salary','salaries',1,'delete',NULL,'d',0,0,0),(517,'Read payments of salariests of every employee','salaries',1,'readall',NULL,'r',0,0,0),(519,'Export payments of employee salaries','salaries',1,'export',NULL,'r',0,0,0),(520,'Read loans','loan',1,'read',NULL,'r',0,50,0),(522,'Create/modify loans','loan',1,'write',NULL,'w',0,50,0),(524,'Delete loans','loan',1,'delete',NULL,'d',0,50,0),(525,'Access loan calculator','loan',1,'calc',NULL,'r',0,50,0),(527,'Export loans','loan',1,'export',NULL,'r',0,50,0),(531,'Read services','service',1,'lire',NULL,'r',0,0,0),(532,'Create/modify services','service',1,'creer',NULL,'w',0,0,0),(534,'Delete les services','service',1,'supprimer',NULL,'d',0,0,0),(538,'Export services','service',1,'export',NULL,'r',0,0,0),(561,'Read bank transfer payment orders','paymentbybanktransfer',1,'read',NULL,'r',0,0,0),(562,'Create/modify a bank transfer payment order','paymentbybanktransfer',1,'create',NULL,'w',0,0,0),(563,'Send/Transmit bank transfer payment order','paymentbybanktransfer',1,'send',NULL,'a',0,0,0),(564,'Record Debits/Rejects of bank transfer payment order','paymentbybanktransfer',1,'debit',NULL,'a',0,0,0),(650,'Read bom of Bom','bom',1,'read',NULL,'w',0,60,0),(651,'Create/Update bom of Bom','bom',1,'write',NULL,'w',0,60,0),(652,'Delete bom of Bom','bom',1,'delete',NULL,'w',0,60,0),(660,'Read objects of Mrp','mrp',1,'read',NULL,'w',0,62,0),(661,'Create/Update objects of Mrp','mrp',1,'write',NULL,'w',0,62,0),(662,'Delete objects of Mrp','mrp',1,'delete',NULL,'w',0,62,0),(701,'Lire les dons','don',1,'lire',NULL,'r',1,50,0),(701,'Lire les dons','don',2,'lire',NULL,'r',1,50,0),(702,'Creer/modifier les dons','don',1,'creer',NULL,'w',0,50,0),(702,'Creer/modifier les dons','don',2,'creer',NULL,'w',0,50,0),(703,'Supprimer les dons','don',1,'supprimer',NULL,'d',0,50,0),(703,'Supprimer les dons','don',2,'supprimer',NULL,'d',0,50,0),(750,'Read job positions to fill and candidatures','recruitment',1,'recruitmentjobposition','read','w',0,0,0),(751,'Create/Update job positions to fill and candidatures','recruitment',1,'recruitmentjobposition','write','w',0,0,0),(752,'Delete Job positions to fill and candidatures','recruitment',1,'recruitmentjobposition','delete','w',0,0,0),(771,'Read expense reports (yours and your subordinates)','expensereport',1,'lire',NULL,'r',0,0,0),(772,'Create/modify expense reports','expensereport',1,'creer',NULL,'w',0,0,0),(773,'Delete expense reports','expensereport',1,'supprimer',NULL,'d',0,0,0),(775,'Approve expense reports','expensereport',1,'approve',NULL,'w',0,0,0),(776,'Pay expense reports','expensereport',1,'to_paid',NULL,'w',0,0,0),(777,'Read expense reports of everybody','expensereport',1,'readall',NULL,'r',0,0,0),(778,'Create expense reports for everybody','expensereport',1,'writeall_advance',NULL,'w',0,0,0),(779,'Export expense reports','expensereport',1,'export',NULL,'r',0,0,0),(1001,'Lire les stocks','stock',1,'lire',NULL,'r',1,40,0),(1002,'Creer/Modifier les stocks','stock',1,'creer',NULL,'w',0,40,0),(1003,'Supprimer les stocks','stock',1,'supprimer',NULL,'d',0,40,0),(1004,'Lire mouvements de stocks','stock',1,'mouvement','lire','r',1,40,0),(1005,'Creer/modifier mouvements de stocks','stock',1,'mouvement','creer','w',0,40,0),(1101,'Read delivery receipts','expedition',1,'delivery','lire','r',0,0,0),(1102,'Create/modify delivery receipts','expedition',1,'delivery','creer','w',0,0,0),(1104,'Validate delivery receipts','expedition',1,'delivery_advance','validate','d',0,0,0),(1109,'Delete delivery receipts','expedition',1,'delivery','supprimer','d',0,0,0),(1121,'Read supplier proposals','supplier_proposal',1,'lire',NULL,'w',0,0,0),(1122,'Create/modify supplier proposals','supplier_proposal',1,'creer',NULL,'w',0,0,0),(1123,'Validate supplier proposals','supplier_proposal',1,'validate_advance',NULL,'w',0,0,0),(1124,'Envoyer les demandes fournisseurs','supplier_proposal',1,'send_advance',NULL,'w',0,0,0),(1125,'Delete supplier proposals','supplier_proposal',1,'supprimer',NULL,'w',0,0,0),(1126,'Close supplier price requests','supplier_proposal',1,'cloturer',NULL,'w',0,0,0),(1181,'Consulter les fournisseurs','fournisseur',1,'lire',NULL,'r',0,0,0),(1182,'Consulter les commandes fournisseur','fournisseur',1,'commande','lire','r',0,0,0),(1183,'Creer une commande fournisseur','fournisseur',1,'commande','creer','w',0,0,0),(1184,'Valider une commande fournisseur','fournisseur',1,'supplier_order_advance','validate','w',0,0,0),(1185,'Approuver une commande fournisseur','fournisseur',1,'commande','approuver','w',0,0,0),(1186,'Commander une commande fournisseur','fournisseur',1,'commande','commander','w',0,0,0),(1187,'Receptionner une commande fournisseur','fournisseur',1,'commande','receptionner','d',0,0,0),(1188,'Supprimer une commande fournisseur','fournisseur',1,'commande','supprimer','d',0,0,0),(1189,'Check/Uncheck a supplier order reception','fournisseur',1,'commande_advance','check','w',0,0,0),(1191,'Exporter les commande fournisseurs, attributs','fournisseur',1,'commande','export','r',0,0,0),(1201,'Lire les exports','export',1,'lire',NULL,'r',1,72,0),(1202,'Creer/modifier un export','export',1,'creer',NULL,'w',0,72,0),(1231,'Consulter les factures fournisseur','fournisseur',1,'facture','lire','r',0,0,0),(1232,'Creer une facture fournisseur','fournisseur',1,'facture','creer','w',0,0,0),(1233,'Valider une facture fournisseur','fournisseur',1,'supplier_invoice_advance','validate','w',0,0,0),(1234,'Supprimer une facture fournisseur','fournisseur',1,'facture','supprimer','d',0,0,0),(1235,'Envoyer les factures par mail','fournisseur',1,'supplier_invoice_advance','send','a',0,0,0),(1236,'Exporter les factures fournisseurs, attributs et reglements','fournisseur',1,'facture','export','r',0,0,0),(1251,'Run mass imports of external data (data load)','import',1,'run',NULL,'r',0,70,0),(1321,'Export customer invoices, attributes and payments','facture',1,'facture','export','r',0,0,0),(1321,'Exporter les factures clients, attributs et reglements','facture',2,'facture','export','r',0,10,0),(1322,'Re-open a fully paid invoice','facture',1,'invoice_advance','reopen','r',0,0,0),(1421,'Export sales orders and attributes','commande',1,'commande','export','r',0,0,0),(2401,'Read actions/tasks linked to his account','agenda',1,'myactions','read','r',0,0,0),(2401,'Read actions/tasks linked to his account','agenda',2,'myactions','read','r',1,15,0),(2402,'Create/modify actions/tasks linked to his account','agenda',1,'myactions','create','w',0,0,0),(2402,'Create/modify actions/tasks linked to his account','agenda',2,'myactions','create','w',0,15,0),(2403,'Delete actions/tasks linked to his account','agenda',1,'myactions','delete','w',0,0,0),(2403,'Delete actions/tasks linked to his account','agenda',2,'myactions','delete','w',0,15,0),(2411,'Read actions/tasks of others','agenda',1,'allactions','read','r',0,0,0),(2411,'Read actions/tasks of others','agenda',2,'allactions','read','r',0,15,0),(2412,'Create/modify actions/tasks of others','agenda',1,'allactions','create','w',0,0,0),(2412,'Create/modify actions/tasks of others','agenda',2,'allactions','create','w',0,15,0),(2413,'Delete actions/tasks of others','agenda',1,'allactions','delete','w',0,0,0),(2413,'Delete actions/tasks of others','agenda',2,'allactions','delete','w',0,15,0),(2414,'Export actions/tasks of others','agenda',1,'export',NULL,'w',0,0,0),(2501,'Read or download documents','ecm',1,'read',NULL,'r',0,0,0),(2503,'Upload a document','ecm',1,'upload',NULL,'w',0,0,0),(2515,'Administer directories of documents','ecm',1,'setup',NULL,'w',0,0,0),(3200,'Read archived events and fingerprints','blockedlog',1,'read',NULL,'w',0,0,0),(10001,'Read website content','website',1,'read',NULL,'w',0,0,0),(10002,'Create/modify website content (html and javascript content)','website',1,'write',NULL,'w',0,0,0),(10003,'Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.','website',1,'writephp',NULL,'w',0,0,0),(10005,'Delete website content','website',1,'delete',NULL,'w',0,0,0),(20001,'Read leave requests (yours and your subordinates)','holiday',1,'read',NULL,'w',0,0,0),(20001,'Créer / Modifier / Lire ses demandes de congés payés','holiday',2,'write',NULL,'w',1,42,0),(20002,'Create/modify leave requests','holiday',1,'write',NULL,'w',0,0,0),(20003,'Delete leave requests','holiday',1,'delete',NULL,'w',0,0,0),(20003,'Supprimer des demandes de congés payés','holiday',2,'delete',NULL,'w',0,42,0),(20004,'Read leave requests for everybody','holiday',1,'readall',NULL,'w',0,0,0),(20004,'Définir les congés payés des utilisateurs','holiday',2,'define_holiday',NULL,'w',0,42,0),(20005,'Create/modify leave requests for everybody','holiday',1,'writeall_advance',NULL,'w',0,0,0),(20005,'Voir les logs de modification des congés payés','holiday',2,'view_log',NULL,'w',0,42,0),(20006,'Setup leave requests of users (setup and update balance)','holiday',1,'define_holiday',NULL,'w',0,0,0),(20006,'Accéder au rapport mensuel des congés payés','holiday',2,'month_report',NULL,'w',0,42,0),(20007,'Approve leave requests','holiday',1,'approve',NULL,'w',0,0,0),(23001,'Read cron jobs','cron',1,'read',NULL,'w',0,0,0),(23002,'Create cron Jobs','cron',1,'create',NULL,'w',0,0,0),(23003,'Delete cron Jobs','cron',1,'delete',NULL,'w',0,0,0),(23004,'Execute cron Jobs','cron',1,'execute',NULL,'w',0,0,0),(50151,'Use Point Of Sale','takepos',1,'run',NULL,'a',0,0,0),(50401,'Bind products and invoices with accounting accounts','accounting',1,'bind','write','r',0,61,0),(50411,'Read operations in General Ledger','accounting',1,'mouvements','lire','r',0,61,0),(50412,'Write/Edit operations in General Ledger','accounting',1,'mouvements','creer','w',0,61,0),(50414,'Delete operations in Ledger','accounting',1,'mouvements','supprimer','d',0,61,0),(50415,'Delete all operations by year and journal in Ledger','accounting',1,'mouvements','supprimer_tous','d',0,61,0),(50418,'Export operations of the Ledger','accounting',1,'mouvements','export','r',0,61,0),(50420,'Report and export reports (turnover, balance, journals, general ledger)','accounting',1,'comptarapport','lire','r',0,61,0),(50430,'Define and close a fiscal year','accounting',1,'fiscalyear','write','r',0,61,0),(50440,'Manage chart of accounts, setup of accountancy','accounting',1,'chartofaccount',NULL,'r',0,61,0),(55001,'Read surveys','opensurvey',1,'read',NULL,'r',0,0,0),(55002,'Create/modify surveys','opensurvey',1,'write',NULL,'w',0,0,0),(56001,'Read ticket','ticket',1,'read',NULL,'r',0,60,0),(56002,'Create les tickets','ticket',1,'write',NULL,'w',0,60,0),(56003,'Delete les tickets','ticket',1,'delete',NULL,'d',0,60,0),(56004,'Manage tickets','ticket',1,'manage',NULL,'w',0,60,0),(56005,'See all tickets, even if not assigned to (not effective for external users, always restricted to the thirdpardy they depends on)','ticket',1,'view','all','r',0,60,0),(59001,'Visualiser les marges','margins',1,'liretous',NULL,'r',0,55,0),(59002,'Définir les marges','margins',1,'creer',NULL,'w',0,55,0),(59003,'Read every user margin','margins',1,'read','all','r',0,55,0),(63001,'Read resources','resource',1,'read',NULL,'w',0,0,0),(63002,'Create/Modify resources','resource',1,'write',NULL,'w',0,0,0),(63003,'Delete resources','resource',1,'delete',NULL,'w',0,0,0),(63004,'Link resources to agenda events','resource',1,'link',NULL,'w',0,0,0),(64001,'DirectPrint','printing',1,'read',NULL,'r',0,52,0),(101250,'Read surveys','opensurvey',2,'survey','read','r',0,40,0),(101251,'Create/modify surveys','opensurvey',2,'survey','write','w',0,40,0),(941601,'Lire les receptions','reception',1,'lire',NULL,'r',0,0,0),(941602,'Creer modifier les receptions','reception',1,'creer',NULL,'w',0,0,0),(941603,'Valider les receptions','reception',1,'reception_advance','validate','d',0,0,0),(941604,'Envoyer les receptions aux clients','reception',1,'reception_advance','send','d',0,0,0),(941605,'Exporter les receptions','reception',1,'reception','export','r',0,0,0),(941606,'Supprimer les receptions','reception',1,'supprimer',NULL,'d',0,0,0);
 /*!40000 ALTER TABLE `llx_rights_def` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_routing`
+--
+
+DROP TABLE IF EXISTS `llx_routing`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_routing` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `trigger_code` varchar(50) CHARACTER SET latin1 DEFAULT NULL,
+  `trigger_code_reverse` varchar(50) CHARACTER SET latin1 DEFAULT NULL,
+  `fk_warehouse_from` int(11) NOT NULL DEFAULT 0,
+  `fk_warehouse_to` int(11) NOT NULL DEFAULT 0,
+  `check_old` int(11) NOT NULL DEFAULT 0,
+  `message_condition` longtext CHARACTER SET latin1 DEFAULT NULL,
+  `message_code` longtext CHARACTER SET latin1 DEFAULT NULL,
+  `qty_field` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `fk_product_field` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `lines_field` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `product_type_field` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `trigger_code` (`trigger_code`),
+  KEY `trigger_code_reverse` (`trigger_code_reverse`),
+  KEY `fk_warehouse_from` (`fk_warehouse_from`),
+  KEY `fk_warehouse_to` (`fk_warehouse_to`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_routing`
+--
+
+LOCK TABLES `llx_routing` WRITE;
+/*!40000 ALTER TABLE `llx_routing` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_routing` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_routing_stock`
+--
+
+DROP TABLE IF EXISTS `llx_routing_stock`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_routing_stock` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_warehouse_from` int(11) NOT NULL DEFAULT 0,
+  `fk_warehouse_to` int(11) NOT NULL DEFAULT 0,
+  `fk_soc` int(11) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `fk_warehouse_from` (`fk_warehouse_from`),
+  KEY `fk_warehouse_to` (`fk_warehouse_to`),
+  KEY `fk_soc` (`fk_soc`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_routing_stock`
+--
+
+LOCK TABLES `llx_routing_stock` WRITE;
+/*!40000 ALTER TABLE `llx_routing_stock` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_routing_stock` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_sellyoursaas_cancellation_extrafields`
 --
@@ -11396,6 +13372,33 @@ LOCK TABLES `llx_sellyoursaas_cancellation_extrafields` WRITE;
 /*!40000 ALTER TABLE `llx_sellyoursaas_cancellation_extrafields` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_session`
+--
+
+DROP TABLE IF EXISTS `llx_session`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_session` (
+  `session_id` varchar(50) NOT NULL,
+  `session_variable` text DEFAULT NULL,
+  `last_accessed` datetime NOT NULL,
+  `fk_user` int(11) NOT NULL,
+  `remote_ip` varchar(64) DEFAULT NULL,
+  `user_agent` varchar(128) DEFAULT NULL,
+  PRIMARY KEY (`session_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_session`
+--
+
+LOCK TABLES `llx_session` WRITE;
+/*!40000 ALTER TABLE `llx_session` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_session` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_societe`
 --
@@ -11463,11 +13466,13 @@ CREATE TABLE `llx_societe` (
   `remise_supplier` double DEFAULT 0,
   `mode_reglement` tinyint(4) DEFAULT NULL,
   `cond_reglement` tinyint(4) DEFAULT NULL,
+  `transport_mode` tinyint(4) DEFAULT NULL,
   `mode_reglement_supplier` int(11) DEFAULT NULL,
   `outstanding_limit` double(24,8) DEFAULT NULL,
   `order_min_amount` double(24,8) DEFAULT NULL,
   `supplier_order_min_amount` double(24,8) DEFAULT NULL,
   `cond_reglement_supplier` int(11) DEFAULT NULL,
+  `transport_mode_supplier` tinyint(4) DEFAULT NULL,
   `fk_shipping_method` int(11) DEFAULT NULL,
   `tva_assuj` tinyint(4) DEFAULT 1,
   `localtax1_assuj` tinyint(4) DEFAULT 0,
@@ -11512,7 +13517,7 @@ CREATE TABLE `llx_societe` (
 
 LOCK TABLES `llx_societe` WRITE;
 /*!40000 ALTER TABLE `llx_societe` DISABLE KEYS */;
-INSERT INTO `llx_societe` VALUES (1,0,NULL,'2018-01-16 15:21:09','2012-07-08 14:21:44','Indian SAS',1,NULL,NULL,'CU1212-0007','SU1212-0005','7050','6050','1 alalah road',NULL,'Delhi',0,117,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,'0','','','','','',5000.00000000,1,NULL,NULL,NULL,1,1,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,'en_IN',NULL,NULL,1,'indiancompany.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(2,0,NULL,'2018-07-30 11:45:49','2012-07-08 14:23:48','Teclib',1,NULL,NULL,'CU1108-0001','SU1108-0001','411CU11080001','401SU11080001','',NULL,'Paris',0,1,NULL,NULL,'www.teclib.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,3,57,'0','123456789','','ACE14','','',400000.00000000,0,NULL,NULL,NULL,3,1,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,NULL,0.000,NULL,NULL,'fr_FR',NULL,NULL,1,'teclibcompany.png','','',0,NULL,NULL,'',0,NULL,NULL,0,'',NULL,0,NULL),(3,0,NULL,'2017-02-16 00:47:25','2012-07-08 22:42:12','Spanish Comp',1,NULL,NULL,'SPANISHCOMP','SU1601-0009',NULL,NULL,'1 via mallere',NULL,'Madrid',123,4,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,4,408,'0','','','','','',10000.00000000,0,NULL,NULL,NULL,1,1,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,'es_AR',NULL,NULL,1,'spanishcompany.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(4,0,NULL,'2018-01-22 17:24:53','2012-07-08 22:48:18','Prospector Vaalen',1,NULL,NULL,'CU1303-0014',NULL,NULL,NULL,'',NULL,'Bruxelles',103,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,4,201,'0','12345678','','','','',0.00000000,0,NULL,NULL,NULL,3,0,NULL,'PL_LOW',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'valeencompany.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(5,0,NULL,'2017-02-21 11:01:17','2012-07-08 23:22:57','NoCountry GmBh',1,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,0,0,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'nocountrycomp.png','','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(6,0,NULL,'2018-01-16 15:35:56','2012-07-09 00:15:09','Swiss Touch',1,NULL,NULL,'CU1601-0018','SU1601-0010',NULL,NULL,'',NULL,'Genevia',0,6,NULL,NULL,NULL,'swisstouch@example.ch',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,2,601,'0','','','','','',56000.00000000,0,NULL,NULL,NULL,3,1,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'swisstouch.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(7,0,NULL,'2018-01-16 15:38:32','2012-07-09 01:24:26','Generic customer',1,NULL,NULL,'CU1302-0011',NULL,NULL,NULL,'',NULL,NULL,0,7,NULL,NULL,NULL,'ttt@ttt.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,8,NULL,'0','','','','','',0.00000000,0,'Generic customer to use for Point Of Sale module.<br />',NULL,NULL,1,0,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'genericcustomer.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(10,0,NULL,'2020-01-13 12:57:02','2012-07-10 15:13:08','NLTechno',1,NULL,NULL,'CU1212-0005','SU1601-0011','411CU12120005','401SU16010011','',NULL,NULL,0,102,NULL,NULL,NULL,'vsmith@email.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,4,54,'0','493861496','49386149600039','6209Z','22-01-2007','FR123456789',10000.00000000,0,NULL,'aa < aa<br />\r\nd<strong>dd</strong>d',NULL,1,1,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,'123456789012',NULL,'fr_FR',NULL,NULL,1,'logo_nltechno_94x100.png','','',0,NULL,NULL,'The OpenSource company',0,NULL,'generic_odt:/home/ldestailleur/git/dolibarr_11.0/documents/doctemplates/thirdparties/template_thirdparty.ods',0,'',NULL,0,NULL),(11,0,NULL,'2019-11-28 11:52:58','2012-07-10 18:35:57','Company Corp 1',1,NULL,NULL,'CU1510-0017',NULL,'7051',NULL,'21 Green Hill street','75500','Los Angeles',0,11,'444123456',NULL,'companycorp1.com','companycorp1@example.com','{\"skype\":\"corp1\"}',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,1,NULL,'0','AB1234567','','','','USABS123',10000.00000000,0,NULL,NULL,NULL,3,0,NULL,'PL_LOW',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,NULL,0.000,NULL,NULL,'en_US',NULL,NULL,1,'comapnycorp1company.png','','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(12,0,NULL,'2019-09-26 11:38:11','2012-07-11 16:18:08','Dupont Alain',1,NULL,NULL,'CU1601-0019',NULL,'411CU16010019',NULL,'',NULL,NULL,0,0,NULL,NULL,NULL,'pcurie@example.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,1,0,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'pierrecurie.jpg','','',0,NULL,NULL,'',0,NULL,NULL,0,'',NULL,0,NULL),(13,0,NULL,'2019-10-08 09:57:51','2012-07-11 17:13:20','Company Corp 2',1,NULL,NULL,'CU1910-00021','SU1510-0008','411CU191000021','401SU15100008','',NULL,NULL,0,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,3,1,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'companycorp2company.png','','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(17,0,NULL,'2019-11-28 15:02:49','2013-08-01 02:41:26','Book Keeping Company',1,NULL,NULL,'CU1108-0004','SU1108-0004',NULL,'401SU11080004','The French Company',NULL,'Paris',0,1,NULL,NULL,NULL,NULL,'[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,0,1,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'bookkeepercompany.png','','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(19,0,NULL,'2019-09-26 12:03:13','2015-01-12 12:23:05','Magic Food Store',1,NULL,NULL,'CU1301-0008',NULL,NULL,NULL,'65 holdywood boulevard','123456','BigTown',0,4,NULL,'0101',NULL,'myemail@domain.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','10/10/2010','','',0.00000000,0,NULL,NULL,NULL,1,0,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0.000,NULL,0.000,NULL,NULL,'en_US',NULL,NULL,1,'magicfoodstore.png','','',0,NULL,NULL,'',0,NULL,'sepamandate',NULL,NULL,NULL,0,NULL),(25,0,NULL,'2018-01-22 17:21:17','2015-03-10 15:47:37','Print Company',1,NULL,NULL,'CU1303-0016','SU1303-0007',NULL,NULL,'21 Gutenberg street','45600','Berlin',0,5,NULL,NULL,NULL,'printcompany@example.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,0,1,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,'de_DE',NULL,NULL,1,'printcompany.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(26,0,NULL,'2019-09-26 12:06:05','2017-02-12 23:17:04','Calculation Power',1,NULL,NULL,'CU1702-0020',NULL,'411CU17020020',NULL,'',NULL,'Calgary',0,14,NULL,NULL,NULL,'calculationpower@example.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,'','','','','',NULL,0,NULL,NULL,NULL,3,0,NULL,'',0,0,0,12,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0.000,0,0.000,NULL,NULL,'en_US',NULL,NULL,1,'bookkeepercompany.png','','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(29,0,NULL,'2020-01-13 12:56:22','2020-01-06 00:39:58','Patient',1,NULL,NULL,'CU2001-00022',NULL,'411CU200100022',NULL,'',NULL,NULL,0,117,'01','02',NULL,NULL,'null',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,'','','','','',NULL,0,'aa < ddd',NULL,NULL,3,0,NULL,'',0,0,0,12,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.000,NULL,0.000,NULL,NULL,NULL,'patient@cabinetmed',NULL,1,NULL,'','',0,NULL,NULL,'',0,NULL,NULL,0,'',NULL,0,NULL),(30,0,NULL,'2020-01-17 14:21:26','2020-01-13 17:19:24','Italo',1,NULL,NULL,'CU2001-00023',NULL,'411CU200100023',NULL,'12 Alagio','123','Milano',777,3,NULL,NULL,NULL,NULL,'[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,'','','','','',NULL,0,NULL,NULL,NULL,3,0,NULL,'',0,0,0,12,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,0,0.000,NULL,4,NULL,NULL,NULL,1,NULL,'','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL);
+INSERT INTO `llx_societe` VALUES (1,0,NULL,'2018-01-16 15:21:09','2012-07-08 14:21:44','Indian SAS',1,NULL,NULL,'CU1212-0007','SU1212-0005','7050','6050','1 alalah road',NULL,'Delhi',0,117,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,'0','','','','','',5000.00000000,1,NULL,NULL,NULL,1,1,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,'en_IN',NULL,NULL,1,'indiancompany.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(2,0,NULL,'2018-07-30 11:45:49','2012-07-08 14:23:48','Teclib',1,NULL,NULL,'CU1108-0001','SU1108-0001','411CU11080001','401SU11080001','',NULL,'Paris',0,1,NULL,NULL,'www.teclib.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,3,57,'0','123456789','','ACE14','','',400000.00000000,0,NULL,NULL,NULL,3,1,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,NULL,0.000,NULL,NULL,'fr_FR',NULL,NULL,1,'teclibcompany.png','','',0,NULL,NULL,'',0,NULL,NULL,0,'',NULL,0,NULL),(3,0,NULL,'2017-02-16 00:47:25','2012-07-08 22:42:12','Spanish Comp',1,NULL,NULL,'SPANISHCOMP','SU1601-0009',NULL,NULL,'1 via mallere',NULL,'Madrid',123,4,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,4,408,'0','','','','','',10000.00000000,0,NULL,NULL,NULL,1,1,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,'es_AR',NULL,NULL,1,'spanishcompany.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(4,0,NULL,'2018-01-22 17:24:53','2012-07-08 22:48:18','Prospector Vaalen',1,NULL,NULL,'CU1303-0014',NULL,NULL,NULL,'',NULL,'Bruxelles',103,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,4,201,'0','12345678','','','','',0.00000000,0,NULL,NULL,NULL,3,0,NULL,'PL_LOW',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'valeencompany.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(5,0,NULL,'2017-02-21 11:01:17','2012-07-08 23:22:57','NoCountry GmBh',1,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,0,0,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'nocountrycomp.png','','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(6,0,NULL,'2018-01-16 15:35:56','2012-07-09 00:15:09','Swiss Touch',1,NULL,NULL,'CU1601-0018','SU1601-0010',NULL,NULL,'',NULL,'Genevia',0,6,NULL,NULL,NULL,'swisstouch@example.ch',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,2,601,'0','','','','','',56000.00000000,0,NULL,NULL,NULL,3,1,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'swisstouch.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(7,0,NULL,'2018-01-16 15:38:32','2012-07-09 01:24:26','Generic customer',1,NULL,NULL,'CU1302-0011',NULL,NULL,NULL,'',NULL,NULL,0,7,NULL,NULL,NULL,'ttt@ttt.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,8,NULL,'0','','','','','',0.00000000,0,'Generic customer to use for Point Of Sale module.<br />',NULL,NULL,1,0,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'genericcustomer.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(10,0,NULL,'2020-01-13 12:57:02','2012-07-10 15:13:08','NLTechno',1,NULL,NULL,'CU1212-0005','SU1601-0011','411CU12120005','401SU16010011','',NULL,NULL,0,102,NULL,NULL,NULL,'vsmith@email.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,4,54,'0','493861496','49386149600039','6209Z','22-01-2007','FR123456789',10000.00000000,0,NULL,'aa < aa<br />\r\nd<strong>dd</strong>d',NULL,1,1,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,'123456789012',NULL,'fr_FR',NULL,NULL,1,'logo_nltechno_94x100.png','','',0,NULL,NULL,'The OpenSource company',0,NULL,'generic_odt:/home/ldestailleur/git/dolibarr_11.0/documents/doctemplates/thirdparties/template_thirdparty.ods',0,'',NULL,0,NULL),(11,0,NULL,'2019-11-28 11:52:58','2012-07-10 18:35:57','Company Corp 1',1,NULL,NULL,'CU1510-0017',NULL,'7051',NULL,'21 Green Hill street','75500','Los Angeles',0,11,'444123456',NULL,'companycorp1.com','companycorp1@example.com','{\"skype\":\"corp1\"}',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,1,NULL,'0','AB1234567','','','','USABS123',10000.00000000,0,NULL,NULL,NULL,3,0,NULL,'PL_LOW',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,NULL,0.000,NULL,NULL,'en_US',NULL,NULL,1,'comapnycorp1company.png','','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(12,0,NULL,'2019-09-26 11:38:11','2012-07-11 16:18:08','Dupont Alain',1,NULL,NULL,'CU1601-0019',NULL,'411CU16010019',NULL,'',NULL,NULL,0,0,NULL,NULL,NULL,'pcurie@example.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,1,0,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'pierrecurie.jpg','','',0,NULL,NULL,'',0,NULL,NULL,0,'',NULL,0,NULL),(13,0,NULL,'2019-10-08 09:57:51','2012-07-11 17:13:20','Company Corp 2',1,NULL,NULL,'CU1910-00021','SU1510-0008','411CU191000021','401SU15100008','',NULL,NULL,0,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,3,1,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'companycorp2company.png','','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(17,0,NULL,'2019-11-28 15:02:49','2013-08-01 02:41:26','Book Keeping Company',1,NULL,NULL,'CU1108-0004','SU1108-0004',NULL,'401SU11080004','The French Company',NULL,'Paris',0,1,NULL,NULL,NULL,NULL,'[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,0,1,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'bookkeepercompany.png','','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(19,0,NULL,'2019-09-26 12:03:13','2015-01-12 12:23:05','Magic Food Store',1,NULL,NULL,'CU1301-0008',NULL,NULL,NULL,'65 holdywood boulevard','123456','BigTown',0,4,NULL,'0101',NULL,'myemail@domain.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','10/10/2010','','',0.00000000,0,NULL,NULL,NULL,1,0,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0.000,NULL,0.000,NULL,NULL,'en_US',NULL,NULL,1,'magicfoodstore.png','','',0,NULL,NULL,'',0,NULL,'sepamandate',NULL,NULL,NULL,0,NULL),(25,0,NULL,'2018-01-22 17:21:17','2015-03-10 15:47:37','Print Company',1,NULL,NULL,'CU1303-0016','SU1303-0007',NULL,NULL,'21 Gutenberg street','45600','Berlin',0,5,NULL,NULL,NULL,'printcompany@example.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,0,1,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,'de_DE',NULL,NULL,1,'printcompany.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(26,0,NULL,'2019-09-26 12:06:05','2017-02-12 23:17:04','Calculation Power',1,NULL,NULL,'CU1702-0020',NULL,'411CU17020020',NULL,'',NULL,'Calgary',0,14,NULL,NULL,NULL,'calculationpower@example.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,'','','','','',NULL,0,NULL,NULL,NULL,3,0,NULL,'',0,0,0,12,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0.000,0,0.000,NULL,NULL,'en_US',NULL,NULL,1,'bookkeepercompany.png','','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(29,0,NULL,'2020-01-13 12:56:22','2020-01-06 00:39:58','Patient',1,NULL,NULL,'CU2001-00022',NULL,'411CU200100022',NULL,'',NULL,NULL,0,117,'01','02',NULL,NULL,'null',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,'','','','','',NULL,0,'aa < ddd',NULL,NULL,3,0,NULL,'',0,0,0,12,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.000,NULL,0.000,NULL,NULL,NULL,'patient@cabinetmed',NULL,1,NULL,'','',0,NULL,NULL,'',0,NULL,NULL,0,'',NULL,0,NULL),(30,0,NULL,'2020-01-17 14:21:26','2020-01-13 17:19:24','Italo',1,NULL,NULL,'CU2001-00023',NULL,'411CU200100023',NULL,'12 Alagio','123','Milano',777,3,NULL,NULL,NULL,NULL,'[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,'','','','','',NULL,0,NULL,NULL,NULL,3,0,NULL,'',0,0,0,12,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,0,0.000,NULL,4,NULL,NULL,NULL,1,NULL,'','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL);
 /*!40000 ALTER TABLE `llx_societe` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -11976,6 +13981,8 @@ CREATE TABLE `llx_socpeople` (
   `twitter` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `photo` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `priv` smallint(6) NOT NULL DEFAULT 0,
+  `fk_prospectcontactlevel` varchar(12) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_stcommcontact` int(11) NOT NULL DEFAULT 0,
   `no_email` smallint(6) NOT NULL DEFAULT 0,
   `fk_user_creat` int(11) DEFAULT 0,
   `fk_user_modif` int(11) DEFAULT NULL,
@@ -11999,7 +14006,7 @@ CREATE TABLE `llx_socpeople` (
 
 LOCK TABLES `llx_socpeople` WRITE;
 /*!40000 ALTER TABLE `llx_socpeople` DISABLE KEYS */;
-INSERT INTO `llx_socpeople` VALUES (1,'2012-07-08 14:26:14','2019-11-28 11:52:58',1,1,NULL,'MR','Indra','Mahala','','','',297,117,'2012-07-08','Project leader','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,12,'Met during a congress at Dubai','',NULL,NULL,NULL,1),(2,'2012-07-08 22:44:50','2019-11-28 11:52:58',NULL,1,NULL,'MR','Freeman','Public','','','',200,11,NULL,'','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,1,'A friend that is a free contact not linked to any company',NULL,NULL,NULL,NULL,1),(3,'2012-07-08 22:59:02','2019-11-28 11:52:58',NULL,1,NULL,'MR','Mywife','Nicy','','','',NULL,11,'1980-10-03','','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,1,12,'This is a private contact','',NULL,NULL,NULL,1),(4,'2012-07-09 00:16:58','2019-11-28 11:52:58',6,1,NULL,'MR','Rotchield','Evan','','','',NULL,6,NULL,'Bank director','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,1,'The bank director',NULL,NULL,NULL,NULL,1),(6,'2013-08-01 02:41:26','2019-11-28 11:52:58',17,1,NULL,'','Bookkeeper','Bob','','','',NULL,NULL,NULL,'book keeper','','','','','bbookkeeper@example.com','{\"skype\":\"skypebbookkeeper\"}',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',0,0,1,12,'','',NULL,NULL,NULL,1),(7,'2018-07-30 16:11:06','2019-11-28 11:52:58',NULL,1,'','MR','Dad','','','','',NULL,14,'1967-09-04','','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',1,0,12,12,'','',NULL,NULL,NULL,1),(8,'2018-07-30 16:13:03','2019-11-28 11:52:58',NULL,1,'','MLE','Mom','','','','',NULL,14,NULL,'','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',1,0,12,12,'','',NULL,NULL,NULL,1),(9,'2018-07-30 16:14:41','2019-11-28 11:52:58',NULL,1,'','MR','Francky','','','89455','Virigia',NULL,205,'1980-07-09','Baker','555-98989898','','','','francky@example.com','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',0,0,12,12,'','',NULL,NULL,NULL,1),(10,'2018-07-30 16:26:22','2019-11-28 11:52:58',10,1,'','','Destailleur','Laurent','','','',NULL,NULL,'1972-10-10','Dolibarr project leader','','','','','ldestailleur@example.com','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'ldestailleur_200x200.jpg',0,0,NULL,12,'','',NULL,NULL,NULL,1),(11,'2017-05-12 13:16:36','2019-11-28 11:52:58',11,1,'','MR','Smith','Laurent','45 Big road','897','Seattle',NULL,11,NULL,'Director','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'ldestailleur_200x200.png',0,0,12,12,'','',NULL,NULL,NULL,1),(12,'2017-05-12 13:19:31','2019-11-28 11:52:58',11,1,'','MR','Einstein','','','','',NULL,11,NULL,'Genius','333444555','','','','genius@example.com','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'Einstein.jpg',0,0,12,12,'','',NULL,NULL,NULL,1);
+INSERT INTO `llx_socpeople` VALUES (1,'2012-07-08 14:26:14','2019-11-28 11:52:58',1,1,NULL,'MR','Indra','Mahala','','','',297,117,'2012-07-08','Project leader','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,1,12,'Met during a congress at Dubai','',NULL,NULL,NULL,1),(2,'2012-07-08 22:44:50','2019-11-28 11:52:58',NULL,1,NULL,'MR','Freeman','Public','','','',200,11,NULL,'','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,1,1,'A friend that is a free contact not linked to any company',NULL,NULL,NULL,NULL,1),(3,'2012-07-08 22:59:02','2019-11-28 11:52:58',NULL,1,NULL,'MR','Mywife','Nicy','','','',NULL,11,'1980-10-03','','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0,0,1,12,'This is a private contact','',NULL,NULL,NULL,1),(4,'2012-07-09 00:16:58','2019-11-28 11:52:58',6,1,NULL,'MR','Rotchield','Evan','','','',NULL,6,NULL,'Bank director','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,1,1,'The bank director',NULL,NULL,NULL,NULL,1),(6,'2013-08-01 02:41:26','2019-11-28 11:52:58',17,1,NULL,'','Bookkeeper','Bob','','','',NULL,NULL,NULL,'book keeper','','','','','bbookkeeper@example.com','{\"skype\":\"skypebbookkeeper\"}',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',0,NULL,0,0,1,12,'','',NULL,NULL,NULL,1),(7,'2018-07-30 16:11:06','2019-11-28 11:52:58',NULL,1,'','MR','Dad','','','','',NULL,14,'1967-09-04','','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',1,NULL,0,0,12,12,'','',NULL,NULL,NULL,1),(8,'2018-07-30 16:13:03','2019-11-28 11:52:58',NULL,1,'','MLE','Mom','','','','',NULL,14,NULL,'','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',1,NULL,0,0,12,12,'','',NULL,NULL,NULL,1),(9,'2018-07-30 16:14:41','2019-11-28 11:52:58',NULL,1,'','MR','Francky','','','89455','Virigia',NULL,205,'1980-07-09','Baker','555-98989898','','','','francky@example.com','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',0,NULL,0,0,12,12,'','',NULL,NULL,NULL,1),(10,'2018-07-30 16:26:22','2019-11-28 11:52:58',10,1,'','','Destailleur','Laurent','','','',NULL,NULL,'1972-10-10','Dolibarr project leader','','','','','ldestailleur@example.com','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'ldestailleur_200x200.jpg',0,NULL,0,0,NULL,12,'','',NULL,NULL,NULL,1),(11,'2017-05-12 13:16:36','2019-11-28 11:52:58',11,1,'','MR','Smith','Laurent','45 Big road','897','Seattle',NULL,11,NULL,'Director','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'ldestailleur_200x200.png',0,NULL,0,0,12,12,'','',NULL,NULL,NULL,1),(12,'2017-05-12 13:19:31','2019-11-28 11:52:58',11,1,'','MR','Einstein','','','','',NULL,11,NULL,'Genius','333444555','','','','genius@example.com','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'Einstein.jpg',0,NULL,0,0,12,12,'','',NULL,NULL,NULL,1);
 /*!40000 ALTER TABLE `llx_socpeople` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -12226,7 +14233,7 @@ CREATE TABLE `llx_subscription` (
   `datec` datetime DEFAULT NULL,
   `fk_adherent` int(11) DEFAULT NULL,
   `dateadh` datetime DEFAULT NULL,
-  `datef` date DEFAULT NULL,
+  `datef` datetime DEFAULT NULL,
   `subscription` double(24,8) DEFAULT NULL,
   `fk_bank` int(11) DEFAULT NULL,
   `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -12244,7 +14251,7 @@ CREATE TABLE `llx_subscription` (
 
 LOCK TABLES `llx_subscription` WRITE;
 /*!40000 ALTER TABLE `llx_subscription` DISABLE KEYS */;
-INSERT INTO `llx_subscription` VALUES (2,'2020-01-21 00:02:14','2020-01-21 01:02:14',3,'2013-07-18 00:00:00','2014-07-17',50.00000000,51,'Subscription 2013',2,NULL,NULL),(3,'2020-01-21 09:22:37','2020-01-21 10:22:37',4,'2017-07-18 00:00:00','2018-07-17',50.00000000,52,'Subscription 2017',2,NULL,NULL),(4,'2020-01-21 09:23:17','2020-01-21 10:23:17',2,'2017-07-18 00:00:00','2018-07-17',50.00000000,53,'Subscription 2017',2,NULL,NULL),(5,'2020-01-21 09:23:28','2020-01-21 10:23:28',2,'2018-07-18 00:00:00','2019-07-17',50.00000000,54,'Subscription 2018',2,NULL,NULL),(6,'2020-01-21 09:23:49','2020-01-21 10:23:49',2,'2019-07-18 00:00:00','2020-07-17',50.00000000,55,'Subscription 2019',2,NULL,NULL);
+INSERT INTO `llx_subscription` VALUES (2,'2020-01-21 00:02:14','2020-01-21 01:02:14',3,'2013-07-18 00:00:00','2014-07-17 00:00:00',50.00000000,51,'Subscription 2013',2,NULL,NULL),(3,'2020-01-21 09:22:37','2020-01-21 10:22:37',4,'2017-07-18 00:00:00','2018-07-17 00:00:00',50.00000000,52,'Subscription 2017',2,NULL,NULL),(4,'2020-01-21 09:23:17','2020-01-21 10:23:17',2,'2017-07-18 00:00:00','2018-07-17 00:00:00',50.00000000,53,'Subscription 2017',2,NULL,NULL),(5,'2020-01-21 09:23:28','2020-01-21 10:23:28',2,'2018-07-18 00:00:00','2019-07-17 00:00:00',50.00000000,54,'Subscription 2018',2,NULL,NULL),(6,'2020-01-21 09:23:49','2020-01-21 10:23:49',2,'2019-07-18 00:00:00','2020-07-17 00:00:00',50.00000000,55,'Subscription 2019',2,NULL,NULL);
 /*!40000 ALTER TABLE `llx_subscription` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -12456,6 +14463,104 @@ LOCK TABLES `llx_takepos_floor_tables` WRITE;
 /*!40000 ALTER TABLE `llx_takepos_floor_tables` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_test`
+--
+
+DROP TABLE IF EXISTS `llx_test`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_test` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `datec` datetime DEFAULT NULL,
+  `label` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_test`
+--
+
+LOCK TABLES `llx_test` WRITE;
+/*!40000 ALTER TABLE `llx_test` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_test` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_test_test`
+--
+
+DROP TABLE IF EXISTS `llx_test_test`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_test_test` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(128) CHARACTER SET utf8mb4 NOT NULL DEFAULT '(PROV)',
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `label` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `amount` double DEFAULT NULL,
+  `qty` double DEFAULT NULL,
+  `fk_soc` int(11) DEFAULT NULL,
+  `fk_project` int(11) DEFAULT NULL,
+  `description` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `note_public` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `note_private` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_user_creat` int(11) NOT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `model_pdf` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `status` smallint(6) NOT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_test_test_rowid` (`rowid`),
+  KEY `idx_test_test_ref` (`ref`),
+  KEY `idx_test_test_entity` (`entity`),
+  KEY `idx_test_test_fk_soc` (`fk_soc`),
+  KEY `idx_test_test_fk_project` (`fk_project`),
+  KEY `llx_test_test_fk_user_creat` (`fk_user_creat`),
+  KEY `idx_test_test_status` (`status`),
+  CONSTRAINT `llx_test_test_fk_user_creat` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_test_test`
+--
+
+LOCK TABLES `llx_test_test` WRITE;
+/*!40000 ALTER TABLE `llx_test_test` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_test_test` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_test_test_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_test_test_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_test_test_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_fk_object` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_test_test_extrafields`
+--
+
+LOCK TABLES `llx_test_test_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_test_test_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_test_test_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_ticket`
 --
@@ -12488,6 +14593,7 @@ CREATE TABLE `llx_ticket` (
   `notify_tiers_at_create` tinyint(4) DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `email_msgid` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_ticket_track_id` (`track_id`),
   UNIQUE KEY `uk_ticket_ref` (`ref`,`entity`),
@@ -12505,7 +14611,7 @@ CREATE TABLE `llx_ticket` (
 
 LOCK TABLES `llx_ticket` WRITE;
 /*!40000 ALTER TABLE `llx_ticket` DISABLE KEYS */;
-INSERT INTO `llx_ticket` VALUES (2,1,'TS1909-0001','15ff11cay39skiaa',NULL,6,NULL,12,12,'Increase memory on server','Pleae increase the memory of server to 164GB',3,NULL,'0',NULL,'REQUEST','OTHER','NORMAL','2019-09-26 14:08:46',NULL,NULL,0,'2019-09-26 12:12:21',NULL),(3,1,'TS1909-0002','r5ya6gdi9f39dcjt',1,NULL,NULL,12,14,'Problem with customer','Please recontact customer.<br />\r\nNeed someone speaking chinese...',0,NULL,'100',NULL,'ISSUE','OTHER','NORMAL','2019-09-26 14:10:31',NULL,'2019-10-04 13:05:55',0,'2019-11-29 08:45:30',NULL),(4,1,'TS1910-0003','fdv9wrzcte7b3c8b',NULL,NULL,NULL,12,NULL,'test','test',2,NULL,'0',NULL,'COM','OTHER','NORMAL','2019-10-04 12:58:04',NULL,NULL,0,'2019-10-04 10:58:07',NULL),(6,1,'TS1911-0004','5gvo9bsjri55zef9',NULL,4,NULL,12,16,'What is the price for Dolibarr ERP CRM ?','I need to use it for 10 users.',3,NULL,'0',NULL,'COM','OTHER','NORMAL','2019-11-29 12:46:29','2019-11-29 12:46:34',NULL,0,'2019-11-29 08:48:00',NULL),(7,1,'TS1911-0005','d51wjy4nym7wltg7',NULL,NULL,'customer@customercompany.com',NULL,16,'What is the price for Dolibarr ERP CRM ?','I need it for 10 people...',8,NULL,'100',NULL,'COM','OTHER','NORMAL','2019-11-29 12:50:45','2019-11-29 12:52:32','2019-11-29 12:55:48',1,'2019-11-29 08:55:48',NULL);
+INSERT INTO `llx_ticket` VALUES (2,1,'TS1909-0001','15ff11cay39skiaa',NULL,6,NULL,12,12,'Increase memory on server','Pleae increase the memory of server to 164GB',3,NULL,'0',NULL,'REQUEST','OTHER','NORMAL','2019-09-26 14:08:46',NULL,NULL,0,'2019-09-26 12:12:21',NULL,NULL),(3,1,'TS1909-0002','r5ya6gdi9f39dcjt',1,NULL,NULL,12,14,'Problem with customer','Please recontact customer.<br />\r\nNeed someone speaking chinese...',0,NULL,'100',NULL,'ISSUE','OTHER','NORMAL','2019-09-26 14:10:31',NULL,'2019-10-04 13:05:55',0,'2019-11-29 08:45:30',NULL,NULL),(4,1,'TS1910-0003','fdv9wrzcte7b3c8b',NULL,NULL,NULL,12,NULL,'test','test',2,NULL,'0',NULL,'COM','OTHER','NORMAL','2019-10-04 12:58:04',NULL,NULL,0,'2019-10-04 10:58:07',NULL,NULL),(6,1,'TS1911-0004','5gvo9bsjri55zef9',NULL,4,NULL,12,16,'What is the price for Dolibarr ERP CRM ?','I need to use it for 10 users.',3,NULL,'0',NULL,'COM','OTHER','NORMAL','2019-11-29 12:46:29','2019-11-29 12:46:34',NULL,0,'2019-11-29 08:48:00',NULL,NULL),(7,1,'TS1911-0005','d51wjy4nym7wltg7',NULL,NULL,'customer@customercompany.com',NULL,16,'What is the price for Dolibarr ERP CRM ?','I need it for 10 people...',8,NULL,'100',NULL,'COM','OTHER','NORMAL','2019-11-29 12:50:45','2019-11-29 12:52:32','2019-11-29 12:55:48',1,'2019-11-29 08:55:48',NULL,NULL);
 /*!40000 ALTER TABLE `llx_ticket` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -12572,6 +14678,39 @@ LOCK TABLES `llx_tva` WRITE;
 /*!40000 ALTER TABLE `llx_tva` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_ultimatepdf_documentmergedpdf`
+--
+
+DROP TABLE IF EXISTS `llx_ultimatepdf_documentmergedpdf`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_ultimatepdf_documentmergedpdf` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) DEFAULT NULL,
+  `fk_element` int(11) DEFAULT NULL,
+  `file_name` varchar(255) DEFAULT NULL,
+  `element_name` varchar(255) NOT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp(),
+  `fk_user_creat` int(11) NOT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_ultimatepdf_documentmergedpdf_rowid` (`rowid`),
+  KEY `llx_ultimatepdf_documentmergedpdf_fk_user_creat` (`fk_user_creat`),
+  CONSTRAINT `llx_ultimatepdf_documentmergedpdf_fk_user_creat` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_ultimatepdf_documentmergedpdf`
+--
+
+LOCK TABLES `llx_ultimatepdf_documentmergedpdf` WRITE;
+/*!40000 ALTER TABLE `llx_ultimatepdf_documentmergedpdf` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_ultimatepdf_documentmergedpdf` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_user`
 --
@@ -12599,7 +14738,6 @@ CREATE TABLE `llx_user` (
   `lastname` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
   `firstname` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
   `job` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `skype` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `office_phone` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
   `office_fax` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
   `user_mobile` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -12652,17 +14790,15 @@ CREATE TABLE `llx_user` (
   `default_range` int(11) DEFAULT NULL,
   `default_c_exp_tax_cat` int(11) DEFAULT NULL,
   `dateemploymentend` date DEFAULT NULL,
-  `twitter` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `facebook` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `instagram` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `snapchat` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `googleplus` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `youtube` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `whatsapp` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `linkedin` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `fk_warehouse` int(11) DEFAULT NULL,
   `iplastlogin` varchar(250) COLLATE utf8_unicode_ci DEFAULT NULL,
   `ippreviouslogin` varchar(250) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `datelastpassvalidation` datetime DEFAULT NULL,
+  `datestartvalidity` datetime DEFAULT NULL,
+  `dateendvalidity` datetime DEFAULT NULL,
+  `idpers1` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `idpers2` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `idpers3` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_user_login` (`login`,`entity`),
   UNIQUE KEY `uk_user_fk_socpeople` (`fk_socpeople`),
@@ -12679,7 +14815,7 @@ CREATE TABLE `llx_user` (
 
 LOCK TABLES `llx_user` WRITE;
 /*!40000 ALTER TABLE `llx_user` DISABLE KEYS */;
-INSERT INTO `llx_user` VALUES (1,'2012-07-08 13:20:11','2019-11-28 11:52:58',NULL,NULL,'aeinstein',0,NULL,NULL,NULL,1,0,NULL,'11c9c772d6471aa24c27274bdd8a223b',NULL,NULL,'Einstein','Albert','',NULL,'123456789','','','','aeinstein@example.com','','[]','',0,'',1,1,NULL,NULL,NULL,'','2017-10-05 08:32:44','2017-10-03 11:43:50',NULL,'',1,'alberteinstein.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'aaaaff','',NULL,0,0,NULL,NULL,NULL,44.00000000,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(2,'2012-07-08 13:54:48','2019-11-28 11:52:58',NULL,NULL,'demo',1,NULL,NULL,NULL,1,0,NULL,'fe01ce2a7fbac8fafaed7c982a04e229',NULL,NULL,'Doe','David','Trainee',NULL,'09123123','','','','daviddoe@example.com','','[]','',0,'',1,1,NULL,NULL,NULL,'','2018-07-30 23:10:54','2018-07-30 23:04:17',NULL,'',1,'person9.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,35.00000000,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(3,'2012-07-11 16:18:59','2020-01-21 09:30:27',NULL,NULL,'pcurie',1,NULL,NULL,NULL,1,0,NULL,'ab335b4eb4c3c99334f656e5db9584c9',NULL,NULL,'Curie','Pierre','',NULL,'','','','','pcurie@example.com','','[]','',0,'',1,1,NULL,NULL,2,'','2014-12-21 17:38:55',NULL,NULL,'',1,'pierrecurie.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(4,'2015-01-23 17:52:27','2019-11-28 11:52:58',NULL,NULL,'bbookkeeper',1,NULL,NULL,NULL,1,0,NULL,'a7d30b58d647fcf59b7163f9592b1dbb',NULL,NULL,'Bookkeeper','Bob','Bookkeeper',NULL,'','','','','bbookkeeper@example.com','','{\"skype\":\"skypebbookkeeper\"}','',0,'',1,1,17,6,NULL,'','2015-02-25 10:18:41','2015-01-23 17:53:20',NULL,'',1,'person8.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,16.00000000,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(10,'2017-10-03 11:47:41','2019-11-28 11:52:58',NULL,NULL,'mcurie',1,NULL,NULL,NULL,1,0,NULL,'52cda011808bb282d1d3625ab607a145',NULL,'t3mnkbhs','Curie','Marie','',NULL,'','','','','mcurie@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'mariecurie.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'ffaaff','',NULL,0,0,NULL,NULL,NULL,44.00000000,'woman',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(11,'2017-10-05 09:07:52','2019-11-28 11:52:58',NULL,NULL,'zzeceo',1,NULL,NULL,NULL,1,0,NULL,'92af989c4c3a5140fb5d73eb77a52454',NULL,'cq78nf9m','Zeceo','Zack','President - CEO',NULL,'','','','','zzeceo@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'','2017-10-05 22:48:08','2017-10-05 21:18:46',NULL,'',1,'person4.jpeg',NULL,NULL,NULL,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,NULL,NULL,'2019-06-10 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(12,'2017-10-05 09:09:46','2020-01-07 13:47:17',NULL,NULL,'admin',0,NULL,NULL,NULL,1,0,NULL,'f6fdffe48c908deb0f4c3bd36c032e72',NULL,'nd6hgbcr','Adminson','Alice','Admin Technical',NULL,'','','','','aadminson@example.com','','[]','Alice - 123',1,NULL,1,1,NULL,NULL,NULL,'','2020-01-21 10:38:41','2020-01-21 10:35:27',NULL,'',1,'person6.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,2700.00000000,NULL,NULL,39.00000000,'woman',NULL,NULL,NULL,'generic_user_odt','1985-09-15',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(13,'2017-10-05 21:29:35','2019-11-28 11:52:58',NULL,NULL,'ccommercy',1,NULL,NULL,NULL,1,0,NULL,'179858e041af35e8f4c81d68c55fe9da',NULL,'y451ksdv','Commercy','Coraly','Commercial leader',NULL,'','','','','ccommercy@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'person7.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,1890.00000000,NULL,NULL,25.00000000,'woman',NULL,'2018-09-11 00:00:00',NULL,NULL,'1998-12-08',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(14,'2017-10-05 21:33:33','2019-11-28 11:52:58',NULL,NULL,'sscientol',1,NULL,NULL,NULL,1,0,NULL,'39bee07ac42f31c98e79cdcd5e5fe4c5',NULL,'s2hp8bxd','Scientol','Sam','Scientist leader',NULL,'','','','','sscientol@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'person3.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,3500.00000000,NULL,NULL,39.00000000,NULL,NULL,'2018-07-03 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(16,'2017-10-05 22:47:52','2019-11-28 11:52:58',NULL,NULL,'ccommerson',1,NULL,NULL,NULL,1,0,NULL,'d68005ccf362b82d084551b6291792a3',NULL,'cx9y1dk0','Charle1','Commerson','Sale representative',NULL,'','','','','ccommerson@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'','2017-10-05 23:46:24','2017-10-05 23:37:31',NULL,'',1,'person1.jpeg',NULL,NULL,13,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,2900.00000000,NULL,NULL,39.00000000,NULL,NULL,'2019-09-01 00:00:00',NULL,NULL,'1976-02-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(17,'2017-10-05 22:48:39','2019-11-28 11:52:58',NULL,NULL,'aleerfok',1,NULL,NULL,NULL,1,0,NULL,'a964065211872fb76f876c6c3e952ea3',NULL,'gw8cb7xj','Leerfok','Amanda','Sale representative',NULL,'','','','','aleerfok@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'','2017-10-05 23:16:06',NULL,NULL,'',0,'person5.jpeg',NULL,NULL,13,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,'woman',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(18,'2018-01-22 17:27:02','2019-11-28 11:52:58',NULL,NULL,'ldestailleur',1,NULL,NULL,NULL,1,0,NULL,'1bb7805145a7a5066df9e6d585b8b645',NULL,'87g06wbx','Destailleur','Laurent','Project leader of Dolibarr ERP CRM',NULL,'','','','','ldestailleur@example.com','','[]','<div><strong>Laurent DESTAILLEUR</strong></div>\r\n\r\n<div>\r\n<div><span style=\"color:#606163; font-family:arial; font-size:medium\"><strong>Project Director</strong></span><br />\r\n<span style=\"color:#336699\"><span style=\"color:#993399; font-family:tahoma,new york,times,serif\"><span style=\"color:#336699\">ldestailleur@example.com</span></span></span></div>\r\n\r\n<div>&nbsp;</div>\r\n\r\n<div>\r\n<div><span style=\"color:#993399; font-family:arial,helvetica,sans-serif; font-size:small\"><span style=\"color:#336699\"><a href=\"http://www.facebook.com/teclib\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">Facebook</a></span>&nbsp;|&nbsp;<span style=\"color:#336699\"><a href=\"http://twitter.com/teclib\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">Twitter</a></span>&nbsp;|&nbsp;<span style=\"color:#336699\"><span style=\"color:#993399\"><a href=\"http://www.teclib.com/\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">www.teclib.com</a></span></span></span></div>\r\n</div>\r\n</div>',0,NULL,1,1,10,10,NULL,'More information on http://www.mydomain.com','2019-10-04 10:06:40','2017-09-06 11:55:30',NULL,'',1,'ldestailleur_200x200.jpg',NULL,NULL,NULL,NULL,NULL,NULL,'','','',NULL,NULL,'007f7f','',NULL,0,0,NULL,NULL,NULL,NULL,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(19,'2017-02-02 03:55:44','2020-01-16 15:44:42',NULL,NULL,'aboston',1,NULL,NULL,NULL,1,0,NULL,'a7a77a5aff2d5fc2f75f2f61507c88d4',NULL,NULL,'Boston','Alex','',NULL,'','','','','aboston@example.com','','[]','<strong>Alex Boston</strong><br />\r\nAdmin support service - 555 01 02 03 04',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',0,'person2.jpeg',NULL,NULL,12,NULL,NULL,25.00000000,'','','',NULL,NULL,'ff00ff','',NULL,0,0,2700.00000000,NULL,NULL,32.00000000,NULL,NULL,'2016-11-04 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL);
+INSERT INTO `llx_user` VALUES (1,'2012-07-08 13:20:11','2019-11-28 11:52:58',NULL,NULL,'aeinstein',0,NULL,NULL,NULL,1,0,NULL,'11c9c772d6471aa24c27274bdd8a223b',NULL,NULL,'Einstein','Albert','','123456789','','','','aeinstein@example.com','','[]','',0,'',1,1,NULL,NULL,NULL,'','2017-10-05 08:32:44','2017-10-03 11:43:50',NULL,'',1,'alberteinstein.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'aaaaff','',NULL,0,0,NULL,NULL,NULL,44.00000000,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(2,'2012-07-08 13:54:48','2019-11-28 11:52:58',NULL,NULL,'demo',1,NULL,NULL,NULL,1,0,NULL,'fe01ce2a7fbac8fafaed7c982a04e229',NULL,NULL,'Doe','David','Trainee','09123123','','','','daviddoe@example.com','','[]','',0,'',1,1,NULL,NULL,NULL,'','2018-07-30 23:10:54','2018-07-30 23:04:17',NULL,'',1,'person9.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,35.00000000,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,'2012-07-11 16:18:59','2020-01-21 09:30:27',NULL,NULL,'pcurie',1,NULL,NULL,NULL,1,0,NULL,'ab335b4eb4c3c99334f656e5db9584c9',NULL,NULL,'Curie','Pierre','','','','','','pcurie@example.com','','[]','',0,'',1,1,NULL,NULL,2,'','2014-12-21 17:38:55',NULL,NULL,'',1,'pierrecurie.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(4,'2015-01-23 17:52:27','2019-11-28 11:52:58',NULL,NULL,'bbookkeeper',1,NULL,NULL,NULL,1,0,NULL,'a7d30b58d647fcf59b7163f9592b1dbb',NULL,NULL,'Bookkeeper','Bob','Bookkeeper','','','','','bbookkeeper@example.com','','{\"skype\":\"skypebbookkeeper\"}','',0,'',1,1,17,6,NULL,'','2015-02-25 10:18:41','2015-01-23 17:53:20',NULL,'',1,'person8.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,16.00000000,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(10,'2017-10-03 11:47:41','2019-11-28 11:52:58',NULL,NULL,'mcurie',1,NULL,NULL,NULL,1,0,NULL,'52cda011808bb282d1d3625ab607a145',NULL,'t3mnkbhs','Curie','Marie','','','','','','mcurie@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'mariecurie.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'ffaaff','',NULL,0,0,NULL,NULL,NULL,44.00000000,'woman',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(11,'2017-10-05 09:07:52','2019-11-28 11:52:58',NULL,NULL,'zzeceo',1,NULL,NULL,NULL,1,0,NULL,'92af989c4c3a5140fb5d73eb77a52454',NULL,'cq78nf9m','Zeceo','Zack','President - CEO','','','','','zzeceo@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'','2017-10-05 22:48:08','2017-10-05 21:18:46',NULL,'',1,'person4.jpeg',NULL,NULL,NULL,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,NULL,NULL,'2019-06-10 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(12,'2017-10-05 09:09:46','2020-01-07 13:47:17',NULL,NULL,'admin',0,NULL,NULL,NULL,1,0,NULL,'f6fdffe48c908deb0f4c3bd36c032e72',NULL,'nd6hgbcr','Adminson','Alice','Admin Technical','','','','','aadminson@example.com','','[]','Alice - 123',1,NULL,1,1,NULL,NULL,NULL,'','2020-01-21 10:38:41','2020-01-21 10:35:27',NULL,'',1,'person6.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,2700.00000000,NULL,NULL,39.00000000,'woman',NULL,NULL,NULL,'generic_user_odt','1985-09-15',NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(13,'2017-10-05 21:29:35','2019-11-28 11:52:58',NULL,NULL,'ccommercy',1,NULL,NULL,NULL,1,0,NULL,'179858e041af35e8f4c81d68c55fe9da',NULL,'y451ksdv','Commercy','Coraly','Commercial leader','','','','','ccommercy@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'person7.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,1890.00000000,NULL,NULL,25.00000000,'woman',NULL,'2018-09-11 00:00:00',NULL,NULL,'1998-12-08',NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(14,'2017-10-05 21:33:33','2019-11-28 11:52:58',NULL,NULL,'sscientol',1,NULL,NULL,NULL,1,0,NULL,'39bee07ac42f31c98e79cdcd5e5fe4c5',NULL,'s2hp8bxd','Scientol','Sam','Scientist leader','','','','','sscientol@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'person3.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,3500.00000000,NULL,NULL,39.00000000,NULL,NULL,'2018-07-03 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(16,'2017-10-05 22:47:52','2019-11-28 11:52:58',NULL,NULL,'ccommerson',1,NULL,NULL,NULL,1,0,NULL,'d68005ccf362b82d084551b6291792a3',NULL,'cx9y1dk0','Charle1','Commerson','Sale representative','','','','','ccommerson@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'','2017-10-05 23:46:24','2017-10-05 23:37:31',NULL,'',1,'person1.jpeg',NULL,NULL,13,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,2900.00000000,NULL,NULL,39.00000000,NULL,NULL,'2019-09-01 00:00:00',NULL,NULL,'1976-02-05',NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(17,'2017-10-05 22:48:39','2019-11-28 11:52:58',NULL,NULL,'aleerfok',1,NULL,NULL,NULL,1,0,NULL,'a964065211872fb76f876c6c3e952ea3',NULL,'gw8cb7xj','Leerfok','Amanda','Sale representative','','','','','aleerfok@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'','2017-10-05 23:16:06',NULL,NULL,'',0,'person5.jpeg',NULL,NULL,13,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,'woman',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(18,'2018-01-22 17:27:02','2019-11-28 11:52:58',NULL,NULL,'ldestailleur',1,NULL,NULL,NULL,1,0,NULL,'1bb7805145a7a5066df9e6d585b8b645',NULL,'87g06wbx','Destailleur','Laurent','Project leader of Dolibarr ERP CRM','','','','','ldestailleur@example.com','','[]','<div><strong>Laurent DESTAILLEUR</strong></div>\r\n\r\n<div>\r\n<div><span style=\"color:#606163; font-family:arial; font-size:medium\"><strong>Project Director</strong></span><br />\r\n<span style=\"color:#336699\"><span style=\"color:#993399; font-family:tahoma,new york,times,serif\"><span style=\"color:#336699\">ldestailleur@example.com</span></span></span></div>\r\n\r\n<div>&nbsp;</div>\r\n\r\n<div>\r\n<div><span style=\"color:#993399; font-family:arial,helvetica,sans-serif; font-size:small\"><span style=\"color:#336699\"><a href=\"http://www.facebook.com/teclib\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">Facebook</a></span>&nbsp;|&nbsp;<span style=\"color:#336699\"><a href=\"http://twitter.com/teclib\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">Twitter</a></span>&nbsp;|&nbsp;<span style=\"color:#336699\"><span style=\"color:#993399\"><a href=\"http://www.teclib.com/\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">www.teclib.com</a></span></span></span></div>\r\n</div>\r\n</div>',0,NULL,1,1,10,10,NULL,'More information on http://www.mydomain.com','2019-10-04 10:06:40','2017-09-06 11:55:30',NULL,'',1,'ldestailleur_200x200.jpg',NULL,NULL,NULL,NULL,NULL,NULL,'','','',NULL,NULL,'007f7f','',NULL,0,0,NULL,NULL,NULL,NULL,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(19,'2017-02-02 03:55:44','2020-01-16 15:44:42',NULL,NULL,'aboston',1,NULL,NULL,NULL,1,0,NULL,'a7a77a5aff2d5fc2f75f2f61507c88d4',NULL,NULL,'Boston','Alex','','','','','','aboston@example.com','','[]','<strong>Alex Boston</strong><br />\r\nAdmin support service - 555 01 02 03 04',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',0,'person2.jpeg',NULL,NULL,12,NULL,NULL,25.00000000,'','','',NULL,NULL,'ff00ff','',NULL,0,0,2700.00000000,NULL,NULL,32.00000000,NULL,NULL,'2016-11-04 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_user` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -12880,7 +15016,7 @@ CREATE TABLE `llx_user_rights` (
   UNIQUE KEY `uk_user_rights` (`entity`,`fk_user`,`fk_id`),
   KEY `fk_user_rights_fk_user_user` (`fk_user`),
   CONSTRAINT `fk_user_rights_fk_user_user` FOREIGN KEY (`fk_user`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=19847 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=20083 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12889,10 +15025,38 @@ CREATE TABLE `llx_user_rights` (
 
 LOCK TABLES `llx_user_rights` WRITE;
 /*!40000 ALTER TABLE `llx_user_rights` DISABLE KEYS */;
-INSERT INTO `llx_user_rights` VALUES (12402,1,1,11),(12380,1,1,12),(12385,1,1,13),(12389,1,1,14),(12393,1,1,15),(12398,1,1,16),(12404,1,1,19),(9726,1,1,21),(9700,1,1,22),(9706,1,1,24),(9711,1,1,25),(9716,1,1,26),(9722,1,1,27),(9728,1,1,28),(9978,1,1,31),(9968,1,1,32),(9974,1,1,34),(1910,1,1,36),(9980,1,1,38),(11573,1,1,41),(11574,1,1,42),(11575,1,1,44),(11576,1,1,45),(7184,1,1,61),(7181,1,1,62),(7183,1,1,64),(7185,1,1,67),(7186,1,1,68),(1678,1,1,71),(1673,1,1,72),(1675,1,1,74),(1679,1,1,75),(1677,1,1,76),(1681,1,1,78),(1682,1,1,79),(12322,1,1,81),(12309,1,1,82),(12312,1,1,84),(12314,1,1,86),(12317,1,1,87),(12320,1,1,88),(12323,1,1,89),(11580,1,1,91),(11581,1,1,92),(11582,1,1,93),(11583,1,1,94),(10097,1,1,95),(10099,1,1,96),(10103,1,1,97),(10104,1,1,98),(7139,1,1,101),(7134,1,1,102),(7136,1,1,104),(7137,1,1,105),(7138,1,1,106),(7140,1,1,109),(10229,1,1,111),(10201,1,1,112),(10207,1,1,113),(10213,1,1,114),(10219,1,1,115),(10225,1,1,116),(10231,1,1,117),(12518,1,1,121),(12508,1,1,122),(12514,1,1,125),(12520,1,1,126),(11577,1,1,141),(11578,1,1,142),(11579,1,1,144),(2307,1,1,151),(2304,1,1,152),(2306,1,1,153),(2308,1,1,154),(10092,1,1,161),(10093,1,1,162),(10094,1,1,163),(10095,1,1,164),(10096,1,1,165),(1585,1,1,170),(12342,1,1,171),(12331,1,1,172),(12335,1,1,173),(12339,1,1,174),(12343,1,1,178),(10000,1,1,221),(9990,1,1,222),(9996,1,1,223),(10002,1,1,229),(10007,1,1,237),(10011,1,1,238),(10015,1,1,239),(1686,1,1,241),(1685,1,1,242),(1687,1,1,243),(12604,1,1,251),(12566,1,1,252),(12569,1,1,253),(12572,1,1,254),(12575,1,1,255),(12579,1,1,256),(1617,1,1,258),(12525,1,1,262),(12544,1,1,281),(12534,1,1,282),(12540,1,1,283),(12546,1,1,286),(12288,1,1,300),(12290,1,1,301),(11591,1,1,302),(1763,1,1,331),(1762,1,1,332),(1764,1,1,333),(12582,1,1,341),(12584,1,1,342),(12586,1,1,343),(12588,1,1,344),(12600,1,1,351),(12593,1,1,352),(12597,1,1,353),(12601,1,1,354),(12605,1,1,358),(12560,1,1,531),(12553,1,1,532),(12557,1,1,534),(1625,1,1,536),(12561,1,1,538),(12358,1,1,700),(12348,1,1,701),(12354,1,1,702),(12360,1,1,703),(1755,1,1,1001),(1754,1,1,1002),(1756,1,1,1003),(1758,1,1,1004),(1759,1,1,1005),(7146,1,1,1101),(7143,1,1,1102),(7145,1,1,1104),(7147,1,1,1109),(12412,1,1,1181),(12458,1,1,1182),(12417,1,1,1183),(12420,1,1,1184),(12423,1,1,1185),(12427,1,1,1186),(12431,1,1,1187),(12437,1,1,1188),(12434,1,1,1189),(1578,1,1,1201),(1579,1,1,1202),(12454,1,1,1231),(12443,1,1,1232),(12446,1,1,1233),(12449,1,1,1234),(12452,1,1,1235),(12455,1,1,1236),(12459,1,1,1237),(1736,1,1,1251),(12409,1,1,1321),(12326,1,1,1421),(8190,1,1,1791),(8187,1,1,1792),(8191,1,1,1793),(12264,1,1,2401),(12260,1,1,2402),(12266,1,1,2403),(12280,1,1,2411),(12276,1,1,2412),(12282,1,1,2413),(12286,1,1,2414),(1618,1,1,2500),(12370,1,1,2501),(12367,1,1,2503),(12371,1,1,2515),(9610,1,1,5001),(9611,1,1,5002),(12490,1,1,20001),(12468,1,1,20002),(12474,1,1,20003),(12480,1,1,20004),(12486,1,1,20005),(12492,1,1,20006),(12302,1,1,23001),(12295,1,1,23002),(12299,1,1,23003),(12303,1,1,23004),(7701,1,1,50101),(4984,1,1,50401),(4983,1,1,50402),(4985,1,1,50403),(4987,1,1,50411),(4988,1,1,50412),(4989,1,1,50415),(12498,1,1,55001),(12499,1,1,55002),(3564,1,1,100700),(3565,1,1,100701),(9596,1,1,101051),(9598,1,1,101052),(9600,1,1,101053),(9604,1,1,101060),(9605,1,1,101061),(7177,1,1,101201),(7178,1,1,101202),(10353,1,1,101250),(10355,1,1,101251),(8980,1,1,101261),(8981,1,1,101262),(7616,1,1,101331),(10030,1,1,101701),(10031,1,1,101702),(3582,1,1,102000),(3583,1,1,102001),(9819,1,1,400051),(9823,1,1,400052),(9827,1,1,400053),(9831,1,1,400055),(132,1,2,11),(133,1,2,12),(134,1,2,13),(135,1,2,14),(136,1,2,16),(137,1,2,19),(138,1,2,21),(139,1,2,22),(140,1,2,24),(141,1,2,25),(142,1,2,26),(143,1,2,27),(10359,1,2,31),(145,1,2,32),(10361,1,2,34),(146,1,2,36),(147,1,2,41),(148,1,2,42),(149,1,2,44),(150,1,2,61),(151,1,2,62),(152,1,2,64),(153,1,2,71),(154,1,2,72),(155,1,2,74),(156,1,2,75),(157,1,2,78),(158,1,2,79),(159,1,2,81),(160,1,2,82),(161,1,2,84),(162,1,2,86),(163,1,2,87),(164,1,2,88),(165,1,2,89),(166,1,2,91),(167,1,2,92),(168,1,2,93),(2475,1,2,95),(2476,1,2,96),(2477,1,2,97),(2478,1,2,98),(169,1,2,101),(170,1,2,102),(171,1,2,104),(172,1,2,109),(173,1,2,111),(174,1,2,112),(175,1,2,113),(176,1,2,114),(177,1,2,116),(178,1,2,117),(179,1,2,121),(180,1,2,122),(181,1,2,125),(182,1,2,141),(183,1,2,142),(184,1,2,144),(2479,1,2,151),(2480,1,2,152),(2481,1,2,153),(2482,1,2,154),(185,1,2,161),(186,1,2,162),(187,1,2,163),(188,1,2,164),(189,1,2,165),(190,1,2,170),(2471,1,2,171),(192,1,2,172),(2472,1,2,173),(193,1,2,221),(194,1,2,222),(195,1,2,229),(196,1,2,241),(197,1,2,242),(198,1,2,243),(199,1,2,251),(201,1,2,262),(202,1,2,281),(203,1,2,282),(204,1,2,283),(205,1,2,331),(15072,1,2,510),(2483,1,2,531),(207,1,2,532),(2484,1,2,534),(208,1,2,536),(2473,1,2,700),(210,1,2,701),(211,1,2,702),(2474,1,2,703),(15064,1,2,771),(15057,1,2,772),(15059,1,2,773),(15061,1,2,774),(15063,1,2,775),(15065,1,2,776),(212,1,2,1001),(213,1,2,1002),(214,1,2,1003),(215,1,2,1004),(216,1,2,1005),(217,1,2,1101),(218,1,2,1102),(219,1,2,1104),(220,1,2,1109),(15073,1,2,1121),(15074,1,2,1122),(15075,1,2,1123),(15076,1,2,1124),(15077,1,2,1125),(15078,1,2,1126),(221,1,2,1181),(222,1,2,1182),(223,1,2,1183),(224,1,2,1184),(225,1,2,1185),(226,1,2,1186),(227,1,2,1187),(228,1,2,1188),(229,1,2,1201),(230,1,2,1202),(231,1,2,1231),(232,1,2,1232),(233,1,2,1233),(234,1,2,1234),(235,1,2,1421),(236,1,2,2401),(237,1,2,2402),(238,1,2,2403),(239,1,2,2411),(240,1,2,2412),(241,1,2,2413),(242,1,2,2500),(2470,1,2,2501),(243,1,2,2515),(10363,1,2,20001),(10364,1,2,20002),(10365,1,2,20003),(10366,1,2,20004),(10367,1,2,20005),(10368,1,2,20006),(15054,1,2,23001),(10362,1,2,50101),(15067,1,2,55001),(15066,1,2,59001),(15068,1,2,63001),(15069,1,2,63002),(15070,1,2,63003),(15071,1,2,63004),(10372,1,2,101250),(1807,1,3,11),(1808,1,3,31),(1809,1,3,36),(1810,1,3,41),(1811,1,3,61),(1812,1,3,71),(1813,1,3,72),(1814,1,3,74),(1815,1,3,75),(1816,1,3,78),(1817,1,3,79),(1818,1,3,91),(1819,1,3,95),(1820,1,3,97),(1821,1,3,111),(1822,1,3,121),(1823,1,3,122),(1824,1,3,125),(1825,1,3,161),(1826,1,3,170),(1827,1,3,171),(1828,1,3,172),(1829,1,3,221),(1830,1,3,222),(1831,1,3,229),(1832,1,3,241),(1833,1,3,242),(1834,1,3,243),(1835,1,3,251),(1836,1,3,255),(1837,1,3,256),(1838,1,3,262),(1839,1,3,281),(1840,1,3,282),(1841,1,3,283),(1842,1,3,331),(1843,1,3,531),(1844,1,3,536),(1845,1,3,700),(1846,1,3,1001),(1847,1,3,1002),(1848,1,3,1003),(1849,1,3,1004),(1850,1,3,1005),(1851,1,3,1181),(1852,1,3,1182),(1853,1,3,1201),(1854,1,3,1202),(1855,1,3,1231),(1856,1,3,2401),(1857,1,3,2402),(1858,1,3,2403),(1859,1,3,2411),(1860,1,3,2412),(1861,1,3,2413),(1862,1,3,2500),(1863,1,3,2515),(8026,1,4,11),(8027,1,4,21),(8028,1,4,31),(8029,1,4,41),(8030,1,4,61),(8031,1,4,71),(8032,1,4,72),(8033,1,4,74),(8034,1,4,75),(8035,1,4,78),(8036,1,4,79),(8037,1,4,81),(8038,1,4,91),(8039,1,4,95),(8040,1,4,97),(8041,1,4,101),(8042,1,4,111),(8043,1,4,121),(8044,1,4,151),(8045,1,4,161),(8046,1,4,171),(8047,1,4,221),(8048,1,4,222),(8049,1,4,229),(8050,1,4,241),(8051,1,4,242),(8052,1,4,243),(8146,1,4,251),(8147,1,4,253),(8053,1,4,262),(8054,1,4,281),(8055,1,4,331),(8056,1,4,341),(8057,1,4,342),(8058,1,4,343),(8059,1,4,344),(8060,1,4,531),(8061,1,4,700),(8062,1,4,1001),(8063,1,4,1002),(8064,1,4,1003),(8065,1,4,1004),(8066,1,4,1005),(8067,1,4,1101),(8068,1,4,1181),(8069,1,4,1182),(8070,1,4,1201),(8071,1,4,1202),(8072,1,4,1231),(8073,1,4,2401),(8074,1,4,2501),(8075,1,4,2503),(8076,1,4,2515),(8077,1,4,20001),(8078,1,4,50101),(8079,1,4,101201),(8080,1,4,101261),(8081,1,4,102000),(8082,1,4,400051),(8083,1,4,400052),(8084,1,4,400053),(8085,1,4,400055),(12608,1,10,11),(12609,1,10,21),(12610,1,10,31),(12611,1,10,41),(12612,1,10,61),(12613,1,10,71),(12614,1,10,72),(12615,1,10,74),(12616,1,10,75),(12617,1,10,78),(12618,1,10,79),(12619,1,10,81),(12620,1,10,91),(12621,1,10,95),(12622,1,10,97),(12623,1,10,101),(12624,1,10,111),(12625,1,10,121),(12626,1,10,151),(12627,1,10,161),(12628,1,10,171),(12629,1,10,221),(12630,1,10,222),(12631,1,10,229),(12632,1,10,241),(12633,1,10,242),(12634,1,10,243),(12635,1,10,262),(12636,1,10,281),(12637,1,10,300),(12638,1,10,331),(12639,1,10,341),(12640,1,10,342),(12641,1,10,343),(12642,1,10,344),(12643,1,10,531),(12644,1,10,700),(12645,1,10,1001),(12646,1,10,1002),(12647,1,10,1003),(12648,1,10,1004),(12649,1,10,1005),(12650,1,10,1101),(12651,1,10,1181),(12652,1,10,1182),(12653,1,10,1201),(12654,1,10,1202),(12655,1,10,1231),(12656,1,10,2401),(12657,1,10,2501),(12658,1,10,2503),(12659,1,10,2515),(12660,1,10,20001),(12661,1,10,20002),(12662,1,10,23001),(12663,1,10,50101),(12664,1,11,11),(12665,1,11,21),(12666,1,11,31),(12667,1,11,41),(12668,1,11,61),(12669,1,11,71),(12670,1,11,72),(12671,1,11,74),(12672,1,11,75),(12673,1,11,78),(12674,1,11,79),(12675,1,11,81),(12676,1,11,91),(12677,1,11,95),(12678,1,11,97),(12679,1,11,101),(12680,1,11,111),(12681,1,11,121),(12682,1,11,151),(12683,1,11,161),(12684,1,11,171),(12685,1,11,221),(12686,1,11,222),(12687,1,11,229),(12688,1,11,241),(12689,1,11,242),(12690,1,11,243),(12691,1,11,262),(12692,1,11,281),(12693,1,11,300),(12694,1,11,331),(12695,1,11,341),(12696,1,11,342),(12697,1,11,343),(12698,1,11,344),(12699,1,11,531),(12700,1,11,700),(12701,1,11,1001),(12702,1,11,1002),(12703,1,11,1003),(12704,1,11,1004),(12705,1,11,1005),(12706,1,11,1101),(12707,1,11,1181),(12708,1,11,1182),(12709,1,11,1201),(12710,1,11,1202),(12711,1,11,1231),(12712,1,11,2401),(12713,1,11,2501),(12714,1,11,2503),(12715,1,11,2515),(12716,1,11,20001),(12717,1,11,20002),(12718,1,11,23001),(12719,1,11,50101),(19727,1,12,11),(19719,1,12,12),(19720,1,12,13),(19721,1,12,14),(19722,1,12,15),(19725,1,12,16),(19728,1,12,19),(14146,1,12,21),(14135,1,12,22),(14137,1,12,24),(14139,1,12,25),(14142,1,12,26),(14145,1,12,27),(14148,1,12,28),(14930,1,12,31),(14926,1,12,32),(14929,1,12,34),(14932,1,12,38),(13816,1,12,41),(13813,1,12,42),(13815,1,12,44),(13817,1,12,45),(14094,1,12,61),(14091,1,12,62),(14093,1,12,64),(14095,1,12,67),(14096,1,12,68),(16203,1,12,71),(16198,1,12,72),(16200,1,12,74),(16204,1,12,75),(16202,1,12,76),(16206,1,12,78),(16207,1,12,79),(19684,1,12,81),(19679,1,12,82),(19680,1,12,84),(19681,1,12,86),(19682,1,12,87),(19683,1,12,88),(19685,1,12,89),(15401,1,12,91),(15397,1,12,92),(15400,1,12,93),(15403,1,12,94),(13990,1,12,95),(12734,1,12,97),(19241,1,12,101),(19237,1,12,102),(19238,1,12,104),(19239,1,12,105),(19240,1,12,106),(19242,1,12,109),(15390,1,12,111),(15377,1,12,112),(15380,1,12,113),(15383,1,12,114),(15386,1,12,115),(15389,1,12,116),(15392,1,12,117),(19796,1,12,121),(19791,1,12,122),(19794,1,12,125),(19797,1,12,126),(13821,1,12,141),(13820,1,12,142),(13822,1,12,144),(13912,1,12,151),(13909,1,12,152),(13911,1,12,153),(13913,1,12,154),(14063,1,12,161),(14056,1,12,162),(14058,1,12,163),(14060,1,12,164),(14062,1,12,165),(14064,1,12,167),(13350,1,12,171),(13345,1,12,172),(13347,1,12,173),(13349,1,12,174),(13351,1,12,178),(13838,1,12,221),(13834,1,12,222),(13837,1,12,223),(13840,1,12,229),(13842,1,12,237),(13844,1,12,238),(13846,1,12,239),(13516,1,12,241),(13515,1,12,242),(13517,1,12,243),(19838,1,12,251),(19819,1,12,252),(19821,1,12,253),(19822,1,12,254),(19824,1,12,255),(19826,1,12,256),(19798,1,12,262),(19808,1,12,281),(19803,1,12,282),(19806,1,12,283),(19809,1,12,286),(19668,1,12,300),(19669,1,12,301),(16194,1,12,331),(16193,1,12,332),(16195,1,12,333),(19827,1,12,341),(19828,1,12,342),(19829,1,12,343),(19830,1,12,344),(19836,1,12,351),(19833,1,12,352),(19835,1,12,353),(19837,1,12,354),(19839,1,12,358),(19249,1,12,430),(16384,1,12,501),(16378,1,12,502),(13865,1,12,510),(19785,1,12,511),(19782,1,12,512),(19784,1,12,514),(19786,1,12,517),(15291,1,12,520),(15286,1,12,522),(15288,1,12,524),(15290,1,12,525),(15292,1,12,527),(19815,1,12,531),(19812,1,12,532),(19814,1,12,534),(19816,1,12,538),(16932,1,12,650),(16931,1,12,651),(16933,1,12,652),(17124,1,12,660),(17123,1,12,661),(17125,1,12,662),(13358,1,12,700),(19693,1,12,701),(19691,1,12,702),(19694,1,12,703),(19713,1,12,771),(19702,1,12,772),(19704,1,12,773),(15085,1,12,774),(19706,1,12,775),(19708,1,12,776),(19710,1,12,777),(19712,1,12,778),(19714,1,12,779),(14917,1,12,1001),(14916,1,12,1002),(14918,1,12,1003),(14920,1,12,1004),(14921,1,12,1005),(19247,1,12,1101),(19245,1,12,1102),(19246,1,12,1104),(19248,1,12,1109),(19233,1,12,1121),(19226,1,12,1122),(19228,1,12,1123),(19230,1,12,1124),(19232,1,12,1125),(19234,1,12,1126),(19731,1,12,1181),(19745,1,12,1182),(19734,1,12,1183),(19735,1,12,1184),(19737,1,12,1185),(19739,1,12,1186),(19741,1,12,1187),(19744,1,12,1188),(19742,1,12,1189),(19746,1,12,1191),(13827,1,12,1201),(13828,1,12,1202),(19754,1,12,1231),(19749,1,12,1232),(19750,1,12,1233),(19752,1,12,1234),(19753,1,12,1235),(19755,1,12,1236),(16302,1,12,1237),(13829,1,12,1251),(19729,1,12,1321),(19730,1,12,1322),(19686,1,12,1421),(19657,1,12,2401),(19655,1,12,2402),(19658,1,12,2403),(19665,1,12,2411),(19663,1,12,2412),(19666,1,12,2413),(19667,1,12,2414),(19698,1,12,2501),(19697,1,12,2503),(19699,1,12,2515),(16386,1,12,3200),(15435,1,12,5001),(15436,1,12,5002),(19845,1,12,10001),(19842,1,12,10002),(19844,1,12,10003),(19846,1,12,10005),(19767,1,12,20001),(19758,1,12,20002),(19760,1,12,20003),(19764,1,12,20004),(19766,1,12,20005),(19768,1,12,20006),(19762,1,12,20007),(19675,1,12,23001),(19672,1,12,23002),(19674,1,12,23003),(19676,1,12,23004),(19019,1,12,50101),(19817,1,12,50151),(19639,1,12,50401),(19647,1,12,50411),(19642,1,12,50412),(19644,1,12,50414),(19646,1,12,50415),(19648,1,12,50418),(19649,1,12,50420),(19650,1,12,50430),(19638,1,12,50440),(19770,1,12,55001),(19771,1,12,55002),(16740,1,12,56001),(16737,1,12,56002),(16739,1,12,56003),(16741,1,12,56004),(16742,1,12,56005),(17135,1,12,59001),(17136,1,12,59002),(17137,1,12,59003),(19778,1,12,63001),(19775,1,12,63002),(19777,1,12,63003),(19779,1,12,63004),(19772,1,12,64001),(17328,1,12,101130),(17327,1,12,101131),(17329,1,12,101132),(16009,1,12,101331),(16010,1,12,101332),(16011,1,12,101333),(19208,1,12,101701),(19209,1,12,101702),(12776,1,13,11),(12777,1,13,21),(12778,1,13,31),(12779,1,13,41),(12780,1,13,61),(12781,1,13,71),(12782,1,13,72),(12783,1,13,74),(12784,1,13,75),(12785,1,13,78),(12786,1,13,79),(12787,1,13,81),(12788,1,13,91),(12789,1,13,95),(12790,1,13,97),(12791,1,13,101),(12792,1,13,111),(12793,1,13,121),(12794,1,13,151),(12795,1,13,161),(12796,1,13,171),(12797,1,13,221),(12798,1,13,222),(12799,1,13,229),(12800,1,13,241),(12801,1,13,242),(12802,1,13,243),(12803,1,13,262),(12804,1,13,281),(12805,1,13,300),(12806,1,13,331),(12807,1,13,341),(12808,1,13,342),(12809,1,13,343),(12810,1,13,344),(12811,1,13,531),(12812,1,13,700),(12813,1,13,1001),(12814,1,13,1002),(12815,1,13,1003),(12816,1,13,1004),(12817,1,13,1005),(12818,1,13,1101),(12819,1,13,1181),(12820,1,13,1182),(12821,1,13,1201),(12822,1,13,1202),(12823,1,13,1231),(12824,1,13,2401),(12825,1,13,2501),(12826,1,13,2503),(12827,1,13,2515),(12828,1,13,20001),(12829,1,13,20002),(12830,1,13,23001),(12831,1,13,50101),(12832,1,14,11),(12833,1,14,21),(12834,1,14,31),(12835,1,14,41),(12836,1,14,61),(12837,1,14,71),(12838,1,14,72),(12839,1,14,74),(12840,1,14,75),(12841,1,14,78),(12842,1,14,79),(12843,1,14,81),(12844,1,14,91),(12845,1,14,95),(12846,1,14,97),(12847,1,14,101),(12848,1,14,111),(12849,1,14,121),(12850,1,14,151),(12851,1,14,161),(12852,1,14,171),(12853,1,14,221),(12854,1,14,222),(12855,1,14,229),(12856,1,14,241),(12857,1,14,242),(12858,1,14,243),(12859,1,14,262),(12860,1,14,281),(12861,1,14,300),(12862,1,14,331),(12863,1,14,341),(12864,1,14,342),(12865,1,14,343),(12866,1,14,344),(12867,1,14,531),(12868,1,14,700),(12869,1,14,1001),(12870,1,14,1002),(12871,1,14,1003),(12872,1,14,1004),(12873,1,14,1005),(12874,1,14,1101),(12875,1,14,1181),(12876,1,14,1182),(12877,1,14,1201),(12878,1,14,1202),(12879,1,14,1231),(12880,1,14,2401),(12881,1,14,2501),(12882,1,14,2503),(12883,1,14,2515),(12884,1,14,20001),(12885,1,14,20002),(12886,1,14,23001),(12887,1,14,50101),(12944,1,16,11),(12945,1,16,21),(12946,1,16,31),(13056,1,16,41),(13057,1,16,42),(13058,1,16,44),(13059,1,16,45),(12948,1,16,61),(12949,1,16,71),(12950,1,16,72),(12951,1,16,74),(12952,1,16,75),(12953,1,16,78),(12954,1,16,79),(12955,1,16,81),(12956,1,16,91),(12957,1,16,95),(12958,1,16,97),(12959,1,16,101),(12960,1,16,111),(12961,1,16,121),(13060,1,16,141),(13061,1,16,142),(13062,1,16,144),(12962,1,16,151),(12963,1,16,161),(12964,1,16,171),(12965,1,16,221),(12966,1,16,222),(12967,1,16,229),(12968,1,16,241),(12969,1,16,242),(12970,1,16,243),(13128,1,16,251),(13064,1,16,262),(12972,1,16,281),(12973,1,16,300),(12974,1,16,331),(12975,1,16,341),(12976,1,16,342),(12977,1,16,343),(12978,1,16,344),(12979,1,16,531),(12980,1,16,700),(12981,1,16,1001),(12982,1,16,1002),(12983,1,16,1003),(12984,1,16,1004),(12985,1,16,1005),(12986,1,16,1101),(12987,1,16,1181),(12988,1,16,1182),(12989,1,16,1201),(12990,1,16,1202),(12991,1,16,1231),(12992,1,16,2401),(12993,1,16,2501),(12994,1,16,2503),(12995,1,16,2515),(12996,1,16,20001),(12997,1,16,20002),(12998,1,16,23001),(12999,1,16,50101),(13000,1,17,11),(13001,1,17,21),(13002,1,17,31),(13065,1,17,41),(13066,1,17,42),(13067,1,17,44),(13068,1,17,45),(13004,1,17,61),(13005,1,17,71),(13006,1,17,72),(13007,1,17,74),(13008,1,17,75),(13009,1,17,78),(13010,1,17,79),(13011,1,17,81),(13012,1,17,91),(13013,1,17,95),(13014,1,17,97),(13015,1,17,101),(13016,1,17,111),(13017,1,17,121),(13069,1,17,141),(13070,1,17,142),(13071,1,17,144),(13018,1,17,151),(13019,1,17,161),(13020,1,17,171),(13021,1,17,221),(13022,1,17,222),(13023,1,17,229),(13024,1,17,241),(13025,1,17,242),(13026,1,17,243),(13028,1,17,281),(13029,1,17,300),(13030,1,17,331),(13031,1,17,341),(13032,1,17,342),(13033,1,17,343),(13034,1,17,344),(13035,1,17,531),(13036,1,17,700),(13037,1,17,1001),(13038,1,17,1002),(13039,1,17,1003),(13040,1,17,1004),(13041,1,17,1005),(13042,1,17,1101),(13043,1,17,1181),(13044,1,17,1182),(13045,1,17,1201),(13046,1,17,1202),(13047,1,17,1231),(13048,1,17,2401),(13049,1,17,2501),(13050,1,17,2503),(13051,1,17,2515),(13052,1,17,20001),(13053,1,17,20002),(13054,1,17,23001),(13055,1,17,50101),(14504,1,18,11),(14505,1,18,21),(14506,1,18,31),(14507,1,18,41),(14508,1,18,61),(14509,1,18,71),(14510,1,18,78),(14511,1,18,81),(14512,1,18,91),(14513,1,18,95),(14514,1,18,101),(14515,1,18,111),(14516,1,18,121),(14517,1,18,151),(14518,1,18,161),(14519,1,18,221),(14520,1,18,241),(14521,1,18,262),(14522,1,18,281),(14523,1,18,300),(14524,1,18,331),(14525,1,18,332),(14526,1,18,333),(14527,1,18,341),(14528,1,18,342),(14529,1,18,343),(14530,1,18,344),(14531,1,18,531),(14532,1,18,701),(14533,1,18,771),(14534,1,18,774),(14535,1,18,1001),(14536,1,18,1004),(14537,1,18,1101),(14538,1,18,1181),(14539,1,18,1182),(14540,1,18,1201),(14541,1,18,1231),(14542,1,18,2401),(14543,1,18,2501),(14544,1,18,2503),(14545,1,18,2515),(14546,1,18,20001),(14547,1,18,20002),(14548,1,18,50101),(14549,1,18,59001),(15242,1,19,21),(15243,1,19,31),(15244,1,19,41),(15245,1,19,61),(15246,1,19,71),(15247,1,19,78),(15248,1,19,81),(15249,1,19,101),(15250,1,19,121),(15251,1,19,151),(15252,1,19,161),(15253,1,19,221),(15254,1,19,241),(15255,1,19,262),(15256,1,19,281),(15257,1,19,300),(15258,1,19,331),(15259,1,19,332),(15260,1,19,341),(15261,1,19,342),(15262,1,19,343),(15263,1,19,344),(15264,1,19,531),(15265,1,19,701),(15266,1,19,771),(15267,1,19,774),(15268,1,19,777),(15269,1,19,1001),(15270,1,19,1004),(15271,1,19,1101),(15272,1,19,1121),(15273,1,19,1181),(15274,1,19,1182),(15275,1,19,1201),(15276,1,19,1231),(15277,1,19,2401),(15278,1,19,2501),(15279,1,19,20001),(15280,1,19,20002),(15281,1,19,50101),(15282,1,19,59001),(15283,1,19,63001);
+INSERT INTO `llx_user_rights` VALUES (12402,1,1,11),(12380,1,1,12),(12385,1,1,13),(12389,1,1,14),(12393,1,1,15),(12398,1,1,16),(12404,1,1,19),(9726,1,1,21),(9700,1,1,22),(9706,1,1,24),(9711,1,1,25),(9716,1,1,26),(9722,1,1,27),(9728,1,1,28),(9978,1,1,31),(9968,1,1,32),(9974,1,1,34),(1910,1,1,36),(9980,1,1,38),(11573,1,1,41),(11574,1,1,42),(11575,1,1,44),(11576,1,1,45),(7184,1,1,61),(7181,1,1,62),(7183,1,1,64),(7185,1,1,67),(7186,1,1,68),(1678,1,1,71),(1673,1,1,72),(1675,1,1,74),(1679,1,1,75),(1677,1,1,76),(1681,1,1,78),(1682,1,1,79),(12322,1,1,81),(12309,1,1,82),(12312,1,1,84),(12314,1,1,86),(12317,1,1,87),(12320,1,1,88),(12323,1,1,89),(11580,1,1,91),(11581,1,1,92),(11582,1,1,93),(11583,1,1,94),(10097,1,1,95),(10099,1,1,96),(10103,1,1,97),(10104,1,1,98),(7139,1,1,101),(7134,1,1,102),(7136,1,1,104),(7137,1,1,105),(7138,1,1,106),(7140,1,1,109),(10229,1,1,111),(10201,1,1,112),(10207,1,1,113),(10213,1,1,114),(10219,1,1,115),(10225,1,1,116),(10231,1,1,117),(12518,1,1,121),(12508,1,1,122),(12514,1,1,125),(12520,1,1,126),(11577,1,1,141),(11578,1,1,142),(11579,1,1,144),(2307,1,1,151),(2304,1,1,152),(2306,1,1,153),(2308,1,1,154),(10092,1,1,161),(10093,1,1,162),(10094,1,1,163),(10095,1,1,164),(10096,1,1,165),(1585,1,1,170),(12342,1,1,171),(12331,1,1,172),(12335,1,1,173),(12339,1,1,174),(12343,1,1,178),(10000,1,1,221),(9990,1,1,222),(9996,1,1,223),(10002,1,1,229),(10007,1,1,237),(10011,1,1,238),(10015,1,1,239),(1686,1,1,241),(1685,1,1,242),(1687,1,1,243),(12604,1,1,251),(12566,1,1,252),(12569,1,1,253),(12572,1,1,254),(12575,1,1,255),(12579,1,1,256),(1617,1,1,258),(12525,1,1,262),(12544,1,1,281),(12534,1,1,282),(12540,1,1,283),(12546,1,1,286),(12288,1,1,300),(12290,1,1,301),(11591,1,1,302),(1763,1,1,331),(1762,1,1,332),(1764,1,1,333),(12582,1,1,341),(12584,1,1,342),(12586,1,1,343),(12588,1,1,344),(12600,1,1,351),(12593,1,1,352),(12597,1,1,353),(12601,1,1,354),(12605,1,1,358),(12560,1,1,531),(12553,1,1,532),(12557,1,1,534),(1625,1,1,536),(12561,1,1,538),(12358,1,1,700),(12348,1,1,701),(12354,1,1,702),(12360,1,1,703),(1755,1,1,1001),(1754,1,1,1002),(1756,1,1,1003),(1758,1,1,1004),(1759,1,1,1005),(7146,1,1,1101),(7143,1,1,1102),(7145,1,1,1104),(7147,1,1,1109),(12412,1,1,1181),(12458,1,1,1182),(12417,1,1,1183),(12420,1,1,1184),(12423,1,1,1185),(12427,1,1,1186),(12431,1,1,1187),(12437,1,1,1188),(12434,1,1,1189),(1578,1,1,1201),(1579,1,1,1202),(12454,1,1,1231),(12443,1,1,1232),(12446,1,1,1233),(12449,1,1,1234),(12452,1,1,1235),(12455,1,1,1236),(12459,1,1,1237),(1736,1,1,1251),(12409,1,1,1321),(12326,1,1,1421),(8190,1,1,1791),(8187,1,1,1792),(8191,1,1,1793),(12264,1,1,2401),(12260,1,1,2402),(12266,1,1,2403),(12280,1,1,2411),(12276,1,1,2412),(12282,1,1,2413),(12286,1,1,2414),(1618,1,1,2500),(12370,1,1,2501),(12367,1,1,2503),(12371,1,1,2515),(9610,1,1,5001),(9611,1,1,5002),(12490,1,1,20001),(12474,1,1,20003),(12480,1,1,20004),(12486,1,1,20005),(12492,1,1,20006),(12302,1,1,23001),(12295,1,1,23002),(12299,1,1,23003),(12303,1,1,23004),(7701,1,1,50101),(4984,1,1,50401),(4983,1,1,50402),(4985,1,1,50403),(4987,1,1,50411),(4988,1,1,50412),(4989,1,1,50415),(12498,1,1,55001),(12499,1,1,55002),(3564,1,1,100700),(3565,1,1,100701),(9596,1,1,101051),(9598,1,1,101052),(9600,1,1,101053),(9604,1,1,101060),(9605,1,1,101061),(7177,1,1,101201),(7178,1,1,101202),(10353,1,1,101250),(10355,1,1,101251),(8980,1,1,101261),(8981,1,1,101262),(7616,1,1,101331),(10030,1,1,101701),(10031,1,1,101702),(3582,1,1,102000),(3583,1,1,102001),(9819,1,1,400051),(9823,1,1,400052),(9827,1,1,400053),(9831,1,1,400055),(132,1,2,11),(133,1,2,12),(134,1,2,13),(135,1,2,14),(136,1,2,16),(137,1,2,19),(138,1,2,21),(139,1,2,22),(140,1,2,24),(141,1,2,25),(142,1,2,26),(143,1,2,27),(10359,1,2,31),(145,1,2,32),(10361,1,2,34),(146,1,2,36),(147,1,2,41),(148,1,2,42),(149,1,2,44),(150,1,2,61),(151,1,2,62),(152,1,2,64),(153,1,2,71),(154,1,2,72),(155,1,2,74),(156,1,2,75),(157,1,2,78),(158,1,2,79),(159,1,2,81),(160,1,2,82),(161,1,2,84),(162,1,2,86),(163,1,2,87),(164,1,2,88),(165,1,2,89),(166,1,2,91),(167,1,2,92),(168,1,2,93),(2475,1,2,95),(2476,1,2,96),(2477,1,2,97),(2478,1,2,98),(169,1,2,101),(170,1,2,102),(171,1,2,104),(172,1,2,109),(173,1,2,111),(174,1,2,112),(175,1,2,113),(176,1,2,114),(177,1,2,116),(178,1,2,117),(179,1,2,121),(180,1,2,122),(181,1,2,125),(182,1,2,141),(183,1,2,142),(184,1,2,144),(2479,1,2,151),(2480,1,2,152),(2481,1,2,153),(2482,1,2,154),(185,1,2,161),(186,1,2,162),(187,1,2,163),(188,1,2,164),(189,1,2,165),(190,1,2,170),(2471,1,2,171),(192,1,2,172),(2472,1,2,173),(193,1,2,221),(194,1,2,222),(195,1,2,229),(196,1,2,241),(197,1,2,242),(198,1,2,243),(199,1,2,251),(201,1,2,262),(202,1,2,281),(203,1,2,282),(204,1,2,283),(205,1,2,331),(15072,1,2,510),(2483,1,2,531),(207,1,2,532),(2484,1,2,534),(208,1,2,536),(2473,1,2,700),(210,1,2,701),(211,1,2,702),(2474,1,2,703),(15064,1,2,771),(15057,1,2,772),(15059,1,2,773),(15061,1,2,774),(15063,1,2,775),(15065,1,2,776),(212,1,2,1001),(213,1,2,1002),(214,1,2,1003),(215,1,2,1004),(216,1,2,1005),(217,1,2,1101),(218,1,2,1102),(219,1,2,1104),(220,1,2,1109),(15073,1,2,1121),(15074,1,2,1122),(15075,1,2,1123),(15076,1,2,1124),(15077,1,2,1125),(15078,1,2,1126),(221,1,2,1181),(222,1,2,1182),(223,1,2,1183),(224,1,2,1184),(225,1,2,1185),(226,1,2,1186),(227,1,2,1187),(228,1,2,1188),(229,1,2,1201),(230,1,2,1202),(231,1,2,1231),(232,1,2,1232),(233,1,2,1233),(234,1,2,1234),(235,1,2,1421),(236,1,2,2401),(237,1,2,2402),(238,1,2,2403),(239,1,2,2411),(240,1,2,2412),(241,1,2,2413),(242,1,2,2500),(2470,1,2,2501),(243,1,2,2515),(10363,1,2,20001),(10365,1,2,20003),(10366,1,2,20004),(10367,1,2,20005),(10368,1,2,20006),(15054,1,2,23001),(10362,1,2,50101),(15067,1,2,55001),(15066,1,2,59001),(15068,1,2,63001),(15069,1,2,63002),(15070,1,2,63003),(15071,1,2,63004),(10372,1,2,101250),(1807,1,3,11),(1808,1,3,31),(1809,1,3,36),(1810,1,3,41),(1811,1,3,61),(1812,1,3,71),(1813,1,3,72),(1814,1,3,74),(1815,1,3,75),(1816,1,3,78),(1817,1,3,79),(1818,1,3,91),(1819,1,3,95),(1820,1,3,97),(1821,1,3,111),(1822,1,3,121),(1823,1,3,122),(1824,1,3,125),(1825,1,3,161),(1826,1,3,170),(1827,1,3,171),(1828,1,3,172),(1829,1,3,221),(1830,1,3,222),(1831,1,3,229),(1832,1,3,241),(1833,1,3,242),(1834,1,3,243),(1835,1,3,251),(1836,1,3,255),(1837,1,3,256),(1838,1,3,262),(1839,1,3,281),(1840,1,3,282),(1841,1,3,283),(1842,1,3,331),(1843,1,3,531),(1844,1,3,536),(1845,1,3,700),(1846,1,3,1001),(1847,1,3,1002),(1848,1,3,1003),(1849,1,3,1004),(1850,1,3,1005),(1851,1,3,1181),(1852,1,3,1182),(1853,1,3,1201),(1854,1,3,1202),(1855,1,3,1231),(1856,1,3,2401),(1857,1,3,2402),(1858,1,3,2403),(1859,1,3,2411),(1860,1,3,2412),(1861,1,3,2413),(1862,1,3,2500),(1863,1,3,2515),(8026,1,4,11),(8027,1,4,21),(8028,1,4,31),(8029,1,4,41),(8030,1,4,61),(8031,1,4,71),(8032,1,4,72),(8033,1,4,74),(8034,1,4,75),(8035,1,4,78),(8036,1,4,79),(8037,1,4,81),(8038,1,4,91),(8039,1,4,95),(8040,1,4,97),(8041,1,4,101),(8042,1,4,111),(8043,1,4,121),(8044,1,4,151),(8045,1,4,161),(8046,1,4,171),(8047,1,4,221),(8048,1,4,222),(8049,1,4,229),(8050,1,4,241),(8051,1,4,242),(8052,1,4,243),(8146,1,4,251),(8147,1,4,253),(8053,1,4,262),(8054,1,4,281),(8055,1,4,331),(8056,1,4,341),(8057,1,4,342),(8058,1,4,343),(8059,1,4,344),(8060,1,4,531),(8061,1,4,700),(8062,1,4,1001),(8063,1,4,1002),(8064,1,4,1003),(8065,1,4,1004),(8066,1,4,1005),(8067,1,4,1101),(8068,1,4,1181),(8069,1,4,1182),(8070,1,4,1201),(8071,1,4,1202),(8072,1,4,1231),(8073,1,4,2401),(8074,1,4,2501),(8075,1,4,2503),(8076,1,4,2515),(8077,1,4,20001),(8078,1,4,50101),(8079,1,4,101201),(8080,1,4,101261),(8081,1,4,102000),(8082,1,4,400051),(8083,1,4,400052),(8084,1,4,400053),(8085,1,4,400055),(12608,1,10,11),(12609,1,10,21),(12610,1,10,31),(12611,1,10,41),(12612,1,10,61),(12613,1,10,71),(12614,1,10,72),(12615,1,10,74),(12616,1,10,75),(12617,1,10,78),(12618,1,10,79),(12619,1,10,81),(12620,1,10,91),(12621,1,10,95),(12622,1,10,97),(12623,1,10,101),(12624,1,10,111),(12625,1,10,121),(12626,1,10,151),(12627,1,10,161),(12628,1,10,171),(12629,1,10,221),(12630,1,10,222),(12631,1,10,229),(12632,1,10,241),(12633,1,10,242),(12634,1,10,243),(12635,1,10,262),(12636,1,10,281),(12637,1,10,300),(12638,1,10,331),(12639,1,10,341),(12640,1,10,342),(12641,1,10,343),(12642,1,10,344),(12643,1,10,531),(12644,1,10,700),(12645,1,10,1001),(12646,1,10,1002),(12647,1,10,1003),(12648,1,10,1004),(12649,1,10,1005),(12650,1,10,1101),(12651,1,10,1181),(12652,1,10,1182),(12653,1,10,1201),(12654,1,10,1202),(12655,1,10,1231),(12656,1,10,2401),(12657,1,10,2501),(12658,1,10,2503),(12659,1,10,2515),(12660,1,10,20001),(12662,1,10,23001),(12663,1,10,50101),(12664,1,11,11),(12665,1,11,21),(12666,1,11,31),(12667,1,11,41),(12668,1,11,61),(12669,1,11,71),(12670,1,11,72),(12671,1,11,74),(12672,1,11,75),(12673,1,11,78),(12674,1,11,79),(12675,1,11,81),(12676,1,11,91),(12677,1,11,95),(12678,1,11,97),(12679,1,11,101),(12680,1,11,111),(12681,1,11,121),(12682,1,11,151),(12683,1,11,161),(12684,1,11,171),(12685,1,11,221),(12686,1,11,222),(12687,1,11,229),(12688,1,11,241),(12689,1,11,242),(12690,1,11,243),(12691,1,11,262),(12692,1,11,281),(12693,1,11,300),(12694,1,11,331),(12695,1,11,341),(12696,1,11,342),(12697,1,11,343),(12698,1,11,344),(12699,1,11,531),(12700,1,11,700),(12701,1,11,1001),(12702,1,11,1002),(12703,1,11,1003),(12704,1,11,1004),(12705,1,11,1005),(12706,1,11,1101),(12707,1,11,1181),(12708,1,11,1182),(12709,1,11,1201),(12710,1,11,1202),(12711,1,11,1231),(12712,1,11,2401),(12713,1,11,2501),(12714,1,11,2503),(12715,1,11,2515),(12716,1,11,20001),(12718,1,11,23001),(12719,1,11,50101),(19936,1,12,11),(19928,1,12,12),(19929,1,12,13),(19930,1,12,14),(19931,1,12,15),(19934,1,12,16),(19937,1,12,19),(14146,1,12,21),(14135,1,12,22),(14137,1,12,24),(14139,1,12,25),(14142,1,12,26),(14145,1,12,27),(14148,1,12,28),(14930,1,12,31),(14926,1,12,32),(14929,1,12,34),(14932,1,12,38),(13816,1,12,41),(13813,1,12,42),(13815,1,12,44),(13817,1,12,45),(14094,1,12,61),(14091,1,12,62),(14093,1,12,64),(14095,1,12,67),(14096,1,12,68),(16203,1,12,71),(16198,1,12,72),(16200,1,12,74),(16204,1,12,75),(16202,1,12,76),(16206,1,12,78),(16207,1,12,79),(19893,1,12,81),(19888,1,12,82),(19889,1,12,84),(19890,1,12,86),(19891,1,12,87),(19892,1,12,88),(19894,1,12,89),(15401,1,12,91),(15397,1,12,92),(15400,1,12,93),(15403,1,12,94),(13990,1,12,95),(12734,1,12,97),(19241,1,12,101),(19237,1,12,102),(19238,1,12,104),(19239,1,12,105),(19240,1,12,106),(19242,1,12,109),(15390,1,12,111),(15377,1,12,112),(15380,1,12,113),(15383,1,12,114),(15386,1,12,115),(15389,1,12,116),(15392,1,12,117),(20007,1,12,121),(20002,1,12,122),(20005,1,12,125),(20008,1,12,126),(13821,1,12,141),(13820,1,12,142),(13822,1,12,144),(13912,1,12,151),(13909,1,12,152),(13911,1,12,153),(13913,1,12,154),(14063,1,12,161),(14056,1,12,162),(14058,1,12,163),(14060,1,12,164),(14062,1,12,165),(14064,1,12,167),(13350,1,12,171),(13345,1,12,172),(13347,1,12,173),(13349,1,12,174),(13351,1,12,178),(13838,1,12,221),(13834,1,12,222),(13837,1,12,223),(13840,1,12,229),(13842,1,12,237),(13844,1,12,238),(13846,1,12,239),(13516,1,12,241),(13515,1,12,242),(13517,1,12,243),(20049,1,12,251),(20030,1,12,252),(20032,1,12,253),(20033,1,12,254),(20035,1,12,255),(20037,1,12,256),(20009,1,12,262),(20019,1,12,281),(20014,1,12,282),(20017,1,12,283),(20020,1,12,286),(19877,1,12,300),(19878,1,12,301),(16194,1,12,331),(16193,1,12,332),(16195,1,12,333),(20038,1,12,341),(20039,1,12,342),(20040,1,12,343),(20041,1,12,344),(20047,1,12,351),(20044,1,12,352),(20046,1,12,353),(20048,1,12,354),(20050,1,12,358),(19249,1,12,430),(16384,1,12,501),(16378,1,12,502),(13865,1,12,510),(19996,1,12,511),(19991,1,12,512),(19993,1,12,514),(19995,1,12,517),(19997,1,12,519),(15291,1,12,520),(15286,1,12,522),(15288,1,12,524),(15290,1,12,525),(15292,1,12,527),(20026,1,12,531),(20023,1,12,532),(20025,1,12,534),(20027,1,12,538),(20076,1,12,561),(20073,1,12,562),(20075,1,12,563),(20077,1,12,564),(16932,1,12,650),(16931,1,12,651),(16933,1,12,652),(17124,1,12,660),(17123,1,12,661),(17125,1,12,662),(13358,1,12,700),(19902,1,12,701),(19900,1,12,702),(19903,1,12,703),(20061,1,12,750),(20060,1,12,751),(20062,1,12,752),(19922,1,12,771),(19911,1,12,772),(19913,1,12,773),(15085,1,12,774),(19915,1,12,775),(19917,1,12,776),(19919,1,12,777),(19921,1,12,778),(19923,1,12,779),(14917,1,12,1001),(14916,1,12,1002),(14918,1,12,1003),(14920,1,12,1004),(14921,1,12,1005),(19247,1,12,1101),(19245,1,12,1102),(19246,1,12,1104),(19248,1,12,1109),(19233,1,12,1121),(19226,1,12,1122),(19228,1,12,1123),(19230,1,12,1124),(19232,1,12,1125),(19234,1,12,1126),(19940,1,12,1181),(19954,1,12,1182),(19943,1,12,1183),(19944,1,12,1184),(19946,1,12,1185),(19948,1,12,1186),(19950,1,12,1187),(19953,1,12,1188),(19951,1,12,1189),(19955,1,12,1191),(13827,1,12,1201),(13828,1,12,1202),(19963,1,12,1231),(19958,1,12,1232),(19959,1,12,1233),(19961,1,12,1234),(19962,1,12,1235),(19964,1,12,1236),(16302,1,12,1237),(13829,1,12,1251),(19938,1,12,1321),(19939,1,12,1322),(19895,1,12,1421),(19866,1,12,2401),(19864,1,12,2402),(19867,1,12,2403),(19874,1,12,2411),(19872,1,12,2412),(19875,1,12,2413),(19876,1,12,2414),(19907,1,12,2501),(19906,1,12,2503),(19908,1,12,2515),(20082,1,12,3200),(20081,1,12,3301),(15435,1,12,5001),(15436,1,12,5002),(20056,1,12,10001),(20053,1,12,10002),(20055,1,12,10003),(20057,1,12,10005),(19976,1,12,20001),(19967,1,12,20002),(19969,1,12,20003),(19973,1,12,20004),(19975,1,12,20005),(19977,1,12,20006),(19971,1,12,20007),(19884,1,12,23001),(19881,1,12,23002),(19883,1,12,23003),(19885,1,12,23004),(19019,1,12,50101),(20028,1,12,50151),(19848,1,12,50401),(19856,1,12,50411),(19851,1,12,50412),(19853,1,12,50414),(19855,1,12,50415),(19857,1,12,50418),(19858,1,12,50420),(19859,1,12,50430),(19847,1,12,50440),(19979,1,12,55001),(19980,1,12,55002),(16740,1,12,56001),(16737,1,12,56002),(16739,1,12,56003),(16741,1,12,56004),(16742,1,12,56005),(20078,1,12,59001),(20079,1,12,59002),(20080,1,12,59003),(19987,1,12,63001),(19984,1,12,63002),(19986,1,12,63003),(19988,1,12,63004),(19981,1,12,64001),(17328,1,12,101130),(17327,1,12,101131),(17329,1,12,101132),(16009,1,12,101331),(16010,1,12,101332),(16011,1,12,101333),(19208,1,12,101701),(19209,1,12,101702),(20069,1,12,941601),(20065,1,12,941602),(20066,1,12,941603),(20067,1,12,941604),(20068,1,12,941605),(20070,1,12,941606),(12776,1,13,11),(12777,1,13,21),(12778,1,13,31),(12779,1,13,41),(12780,1,13,61),(12781,1,13,71),(12782,1,13,72),(12783,1,13,74),(12784,1,13,75),(12785,1,13,78),(12786,1,13,79),(12787,1,13,81),(12788,1,13,91),(12789,1,13,95),(12790,1,13,97),(12791,1,13,101),(12792,1,13,111),(12793,1,13,121),(12794,1,13,151),(12795,1,13,161),(12796,1,13,171),(12797,1,13,221),(12798,1,13,222),(12799,1,13,229),(12800,1,13,241),(12801,1,13,242),(12802,1,13,243),(12803,1,13,262),(12804,1,13,281),(12805,1,13,300),(12806,1,13,331),(12807,1,13,341),(12808,1,13,342),(12809,1,13,343),(12810,1,13,344),(12811,1,13,531),(12812,1,13,700),(12813,1,13,1001),(12814,1,13,1002),(12815,1,13,1003),(12816,1,13,1004),(12817,1,13,1005),(12818,1,13,1101),(12819,1,13,1181),(12820,1,13,1182),(12821,1,13,1201),(12822,1,13,1202),(12823,1,13,1231),(12824,1,13,2401),(12825,1,13,2501),(12826,1,13,2503),(12827,1,13,2515),(12828,1,13,20001),(12830,1,13,23001),(12831,1,13,50101),(12832,1,14,11),(12833,1,14,21),(12834,1,14,31),(12835,1,14,41),(12836,1,14,61),(12837,1,14,71),(12838,1,14,72),(12839,1,14,74),(12840,1,14,75),(12841,1,14,78),(12842,1,14,79),(12843,1,14,81),(12844,1,14,91),(12845,1,14,95),(12846,1,14,97),(12847,1,14,101),(12848,1,14,111),(12849,1,14,121),(12850,1,14,151),(12851,1,14,161),(12852,1,14,171),(12853,1,14,221),(12854,1,14,222),(12855,1,14,229),(12856,1,14,241),(12857,1,14,242),(12858,1,14,243),(12859,1,14,262),(12860,1,14,281),(12861,1,14,300),(12862,1,14,331),(12863,1,14,341),(12864,1,14,342),(12865,1,14,343),(12866,1,14,344),(12867,1,14,531),(12868,1,14,700),(12869,1,14,1001),(12870,1,14,1002),(12871,1,14,1003),(12872,1,14,1004),(12873,1,14,1005),(12874,1,14,1101),(12875,1,14,1181),(12876,1,14,1182),(12877,1,14,1201),(12878,1,14,1202),(12879,1,14,1231),(12880,1,14,2401),(12881,1,14,2501),(12882,1,14,2503),(12883,1,14,2515),(12884,1,14,20001),(12886,1,14,23001),(12887,1,14,50101),(12944,1,16,11),(12945,1,16,21),(12946,1,16,31),(13056,1,16,41),(13057,1,16,42),(13058,1,16,44),(13059,1,16,45),(12948,1,16,61),(12949,1,16,71),(12950,1,16,72),(12951,1,16,74),(12952,1,16,75),(12953,1,16,78),(12954,1,16,79),(12955,1,16,81),(12956,1,16,91),(12957,1,16,95),(12958,1,16,97),(12959,1,16,101),(12960,1,16,111),(12961,1,16,121),(13060,1,16,141),(13061,1,16,142),(13062,1,16,144),(12962,1,16,151),(12963,1,16,161),(12964,1,16,171),(12965,1,16,221),(12966,1,16,222),(12967,1,16,229),(12968,1,16,241),(12969,1,16,242),(12970,1,16,243),(13128,1,16,251),(13064,1,16,262),(12972,1,16,281),(12973,1,16,300),(12974,1,16,331),(12975,1,16,341),(12976,1,16,342),(12977,1,16,343),(12978,1,16,344),(12979,1,16,531),(12980,1,16,700),(12981,1,16,1001),(12982,1,16,1002),(12983,1,16,1003),(12984,1,16,1004),(12985,1,16,1005),(12986,1,16,1101),(12987,1,16,1181),(12988,1,16,1182),(12989,1,16,1201),(12990,1,16,1202),(12991,1,16,1231),(12992,1,16,2401),(12993,1,16,2501),(12994,1,16,2503),(12995,1,16,2515),(12996,1,16,20001),(12998,1,16,23001),(12999,1,16,50101),(13000,1,17,11),(13001,1,17,21),(13002,1,17,31),(13065,1,17,41),(13066,1,17,42),(13067,1,17,44),(13068,1,17,45),(13004,1,17,61),(13005,1,17,71),(13006,1,17,72),(13007,1,17,74),(13008,1,17,75),(13009,1,17,78),(13010,1,17,79),(13011,1,17,81),(13012,1,17,91),(13013,1,17,95),(13014,1,17,97),(13015,1,17,101),(13016,1,17,111),(13017,1,17,121),(13069,1,17,141),(13070,1,17,142),(13071,1,17,144),(13018,1,17,151),(13019,1,17,161),(13020,1,17,171),(13021,1,17,221),(13022,1,17,222),(13023,1,17,229),(13024,1,17,241),(13025,1,17,242),(13026,1,17,243),(13028,1,17,281),(13029,1,17,300),(13030,1,17,331),(13031,1,17,341),(13032,1,17,342),(13033,1,17,343),(13034,1,17,344),(13035,1,17,531),(13036,1,17,700),(13037,1,17,1001),(13038,1,17,1002),(13039,1,17,1003),(13040,1,17,1004),(13041,1,17,1005),(13042,1,17,1101),(13043,1,17,1181),(13044,1,17,1182),(13045,1,17,1201),(13046,1,17,1202),(13047,1,17,1231),(13048,1,17,2401),(13049,1,17,2501),(13050,1,17,2503),(13051,1,17,2515),(13052,1,17,20001),(13054,1,17,23001),(13055,1,17,50101),(14504,1,18,11),(14505,1,18,21),(14506,1,18,31),(14507,1,18,41),(14508,1,18,61),(14509,1,18,71),(14510,1,18,78),(14511,1,18,81),(14512,1,18,91),(14513,1,18,95),(14514,1,18,101),(14515,1,18,111),(14516,1,18,121),(14517,1,18,151),(14518,1,18,161),(14519,1,18,221),(14520,1,18,241),(14521,1,18,262),(14522,1,18,281),(14523,1,18,300),(14524,1,18,331),(14525,1,18,332),(14526,1,18,333),(14527,1,18,341),(14528,1,18,342),(14529,1,18,343),(14530,1,18,344),(14531,1,18,531),(14532,1,18,701),(14533,1,18,771),(14534,1,18,774),(14535,1,18,1001),(14536,1,18,1004),(14537,1,18,1101),(14538,1,18,1181),(14539,1,18,1182),(14540,1,18,1201),(14541,1,18,1231),(14542,1,18,2401),(14543,1,18,2501),(14544,1,18,2503),(14545,1,18,2515),(14546,1,18,20001),(14548,1,18,50101),(14549,1,18,59001),(15242,1,19,21),(15243,1,19,31),(15244,1,19,41),(15245,1,19,61),(15246,1,19,71),(15247,1,19,78),(15248,1,19,81),(15249,1,19,101),(15250,1,19,121),(15251,1,19,151),(15252,1,19,161),(15253,1,19,221),(15254,1,19,241),(15255,1,19,262),(15256,1,19,281),(15257,1,19,300),(15258,1,19,331),(15259,1,19,332),(15260,1,19,341),(15261,1,19,342),(15262,1,19,343),(15263,1,19,344),(15264,1,19,531),(15265,1,19,701),(15266,1,19,771),(15267,1,19,774),(15268,1,19,777),(15269,1,19,1001),(15270,1,19,1004),(15271,1,19,1101),(15272,1,19,1121),(15273,1,19,1181),(15274,1,19,1182),(15275,1,19,1201),(15276,1,19,1231),(15277,1,19,2401),(15278,1,19,2501),(15279,1,19,20001),(15281,1,19,50101),(15282,1,19,59001),(15283,1,19,63001);
 /*!40000 ALTER TABLE `llx_user_rights` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_user_twofactorauth_webauthn`
+--
+
+DROP TABLE IF EXISTS `llx_user_twofactorauth_webauthn`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_user_twofactorauth_webauthn` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_user` int(11) NOT NULL,
+  `label` varchar(64) CHARACTER SET utf8mb4 NOT NULL,
+  `webauthnkey` text CHARACTER SET utf8mb4 NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_tfa_label_fk_user` (`fk_user`,`label`),
+  CONSTRAINT `fk_tfa_fk_user` FOREIGN KEY (`fk_user`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_user_twofactorauth_webauthn`
+--
+
+LOCK TABLES `llx_user_twofactorauth_webauthn` WRITE;
+/*!40000 ALTER TABLE `llx_user_twofactorauth_webauthn` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_user_twofactorauth_webauthn` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_usergroup`
 --
@@ -13212,9 +15376,10 @@ CREATE TABLE `llx_website` (
   `use_manifest` int(11) DEFAULT NULL,
   `lang` varchar(8) COLLATE utf8_unicode_ci DEFAULT NULL,
   `otherlang` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `position` int(11) DEFAULT 0,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_website_ref` (`ref`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -13223,7 +15388,7 @@ CREATE TABLE `llx_website` (
 
 LOCK TABLES `llx_website` WRITE;
 /*!40000 ALTER TABLE `llx_website` DISABLE KEYS */;
-INSERT INTO `llx_website` VALUES (2,1,'mywebsite','My web site',1,4,'','2019-10-08 20:55:48',NULL,'2019-11-28 12:02:46',12,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,1,'mypersonalsite','My personal web site',1,11,NULL,'2019-10-08 20:57:59',NULL,'2020-01-09 15:59:24',12,12,NULL,NULL,NULL,0,NULL,NULL);
+INSERT INTO `llx_website` VALUES (2,1,'mywebsite','My web site',1,4,'','2019-10-08 20:55:48',NULL,'2019-11-28 12:02:46',12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(3,1,'mypersonalsite','My personal web site',1,11,NULL,'2019-10-08 20:57:59',NULL,'2020-01-09 15:59:24',12,12,NULL,NULL,NULL,0,NULL,NULL,0),(4,1,'template-stellar','',1,23,'','2020-12-10 13:25:34',NULL,'2020-12-10 12:27:17',12,NULL,NULL,NULL,NULL,NULL,'en','',0),(5,1,'template-corporate','',1,11,'','2020-12-10 13:25:55',NULL,'2020-12-10 12:26:50',12,NULL,NULL,NULL,NULL,NULL,'en','',0);
 /*!40000 ALTER TABLE `llx_website` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -13283,10 +15448,13 @@ CREATE TABLE `llx_website_page` (
   `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
   `image` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `author_alias` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `allowed_in_frames` int(11) DEFAULT 0,
+  `object_type` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_object` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_website_page_url` (`fk_website`,`pageurl`),
   CONSTRAINT `fk_website_page_website` FOREIGN KEY (`fk_website`) REFERENCES `llx_website` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=26 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -13295,6 +15463,7 @@ CREATE TABLE `llx_website_page` (
 
 LOCK TABLES `llx_website_page` WRITE;
 /*!40000 ALTER TABLE `llx_website_page` DISABLE KEYS */;
+INSERT INTO `llx_website_page` VALUES (1,5,'blog','','Blog','Blog','blog','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">The latest news...</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionnews\" contenteditable=\"true\" class=\"section-50 section-md-50 section-md-bottom-50\">\n            <div><br><div class=\"text-align: center\">\n            <!--<h2>The latest news...</h2><br><br><br> -->\n            <?php \n            $weblangs->load(\"main\");\n            $fuser = new User($db);\n            $arrayofblogs = $websitepage->fetchAll($website->id, \'DESC\', \'date_creation\', 5, 0, array(\'type_container\'=>\'blogpost\', \'status\'=>1, \'lang\'=>\'null,\'.$websitepage->lang));\n            foreach($arrayofblogs as $blog)\n            {\n                print \'<div class=\"row justify-content-sm-center row-40\">\';\n                print \'<div class=\"container blog-box d-xl-inline-block margin-lr-30\" style=\"padding: 20px; box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;\">\';\n                            print \'<a class=\"centpercent\" href=\"\'.$blog->pageurl.\'.php\">\';\n                            print \'<div class=\"post-boxed-img-wrap\"><img src=\"\'.($blog->image ? \'viewimage.php?modulepart=medias&file=\'.str_replace(\'template-corporate\', $website->ref, $blog->image) : \'medias/image/\'.$website->ref.\'/calendar.svg\"\').\'\" alt=\"\" width=\"120\"></div>\';\n                            print \'<div class=\"post-boxed-caption\">\';\n                            print \'<div class=\"post-boxed-title font-weight-bold\">\'.$blog->title.\'</div>\';\n                            print \'<ul class=\"list-inline list-inline-dashed text-uppercase\">\';\n                            print \'<li>\'.dol_print_date($blog->date_creation, \'daytext\', \'tzserver\', $weblangs).\'</li>\';\n                            $fuser->fetch($blog->fk_user_creat);\n                            print \'<li><span>by<span> <span class=\"text-primary\">\'.$fuser->firstname.\'</span></span></li>\';\n                            print \'</ul>\';\n                            print \'<span class=\"nohover\">\'.$blog->description.\'</span>\';\n                            print \'</div>\';\n                            //includeContainer($blog->pageurl);\n                            print \'</a>\';\n                print \'</div>\';\n                print \'</div>\';\n            }\n            ?>\n            </div></div>\n        </section>\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(2,5,'blog-our-company-is-now-on-dolibarr','','Our company is now on Dolibarr ERP CRM','Our company has moved on Dolibarr ERP CRM. This is an important step in improving all of our services.','','<?php includeContainer(\'header\'); ?>\n\n      <?php print getStructuredData(\'blogpost\', $websitepage); ?>\n      \n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\" style=\"font-size: 2em\"><?php echo $websitepage->title; ?></span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n        <div class=\"container\" contenteditable=\"true\">\n            <br><br><br>\n            Like several thousands of companies, our company (<?php echo $mysoc->name ?>) has moved all its information system to <a href=\"https://www.dolibarr.org\">Dolibarr ERP CRM</a>. More than 20 applications have been replaced by only one, easier to use and fully integrated.\n            This is an important step in improving all of our services.\n            \n            <br><br><br>\n            \n            <figure>\n            <img src=\"/viewimage.php?modulepart=medias&file=image/template-corporate/background_dolibarr.jpg\">\n            <br><br>\n            <figcaption style=\"opacity: 0.5; text-align: center;\">Screenshot of our new Open Source solution</figcaption>\n            </figure>\n            \n            \n            \n            <br><br><br><br><br><br>\n        </div>\n\n\n<?php includeContainer(\'footer\'); ?>\n\n\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'blogpost','en',NULL,'','',NULL,'image/template-corporate/background_dolibarr.jpg','',0,NULL,NULL),(3,5,'blog-our-new-web-site-has-been-launched','','Our new web site has been launched','Our new website, based on Dolibarr CMS, has been launched. Modern and directly integrated with the internal management tools of the company, many new online services for our customers will be able to see the day...','','<?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\" style=\"font-size: 2em\"><?php echo $websitepage->title; ?></span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n        <div class=\"container\">\n            <br><br><br><br><br><br>\n\n\n            Our new website, based on Dolibarr CMS, has been launched. <br>\n            Now it is modern and directly integrated with the internal management tools of the company. Many new online services will be available for our customers...\n\n            \n                        <br><br><br>\n            \n            <figure>\n            <img src=\"/viewimage.php?modulepart=medias&file=image/template-corporate/background_rough-horn.jpg\">\n            <br><br>\n            <figcaption style=\"opacity: 0.5; text-align: center;\">Theme of our new web site</figcaption>\n            </figure>\n            \n\n            <br><br><br><br><br><br>\n        </div>\n\n\n<?php includeContainer(\'footer\'); ?>\n\n\n\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'blogpost','en',NULL,'','',NULL,'image/template-corporate/background_rough-horn.jpg','',0,NULL,NULL),(4,5,'careers','','Careers','Our job opportunities','career','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Job opportunities</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div style=\"margin: 50px\"><div class=\"text-align: center\">\n            <br>\n\n            <h2 style=\"margin-left: 10px; margin-right: 10px\">We are currently recruiting the following profiles...</h2><br><br> \n            \n            <section id=\"sectionnews\" contenteditable=\"false\" class=\"section-50 section-md-50 section-md-bottom-50\">\n            <?php\n            include_once DOL_DOCUMENT_ROOT.\'/recruitment/class/recruitmentjobposition.class.php\';\n            $jobposition = new RecruitmentJobPosition($db);\n            $fuser = new User($db);\n            $arrayofrecord = $jobposition->fetchAll(\'DESC\', \'date_creation\', 5, 0, array(\'status\'=>\'1,3,9\'));\n            $weblangs->load(\"main\");\n            foreach($arrayofrecord as $jobrecord)\n            {\n                print \'<div class=\"row justify-content-sm-center row-40\">\';\n                print \'<div class=\"container blog-box d-xl-inline-block\" style=\"box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;\">\';\n                            //print \'<a href=\"/public/recruitment/view.php?id=\'.$jobrecord->id.\'.php\">\';\n                            //print \'<div class=\"post-boxed-img-wrap\"><img src=\"\'.($blog->image ? \'viewimage.php?modulepart=medias&file=\'.$blog->image : \'medias/image/\'.$website->ref.\'/calendar.svg\"\').\'\" alt=\"\" width=\"120\"></div>\';\n                            print \'<div class=\"post-boxed-caption\">\';\n                            print \'<div class=\"post-boxed-title font-weight-bold\">\'.$jobrecord->label.\'</div>\';\n                            print \'<ul class=\"list-inline list-inline-dashed\">\';\n                            print \'<li><span class=\"text-primary\">\'.dol_print_date($jobrecord->date_creation, \'daytext\', \'tzserver\', $weblangs).\'</span></li>\';\n                            //$fuser->fetch($jobrecord->fk_user_recruitment);\n                            //print \'<li><span>par<span> <span class=\"text-primary\">\'.$fuser->firstname.\'</span></span></li>\';\n                            //print \'<li><span>Contact:<span> <span class=\"text-primary\">Laurent Destailleur - job@nltechno.com</span></span></li>\';\n                            print \'</ul>\';\n                            print \'</div>\';\n\n                            print \'<div class=\"left\" style=\"line-height: 1.5em; margin-top: 30px; margin-left: 20px; margin-right: 20px\">\';\n                            //includeContainer($blog->pageurl);\n                            \n                            if ($jobrecord->status == RecruitmentJobPosition::STATUS_RECRUITED) {\n                                $langs->load(\'recruitment\');\n                            	print info_admin($langs->trans(\"JobClosedTextCandidateFound\"), 0, 0, 0, \'warning\');\n                            	print \'<br>\';\n                            }\n                            if ($jobrecord->status == RecruitmentJobPosition::STATUS_CANCELED) {\n                                $langs->load(\'recruitment\');\n	                            print info_admin($langs->trans(\"JobClosedTextCanceled\"), 0, 0, 0, \'warning\');\n	                            print \'<br>\';\n                            }\n\n\n                            print \'<span class=\"nohover\">\'.$jobrecord->description.\'</span>\';\n                            \n                            print \'<br><br><span>Contact:<span> <span class=\"text-primary\">Laurent Destailleur - \'.$jobrecord->email_recruiter.\'</span></span>\';\n                            \n                            print \'</div>\';\n                            //print \'</a>\';\n                print \'</div>\';\n                print \'</div>\';\n            }\n            ?>\n            </section>\n            </div></div>\n        </section>\n\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(5,5,'carriere','','Carrière','Nos opportunités professionnelles','career','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Offres d\'emploi</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div style=\"margin: 50px\"><div class=\"text-align: center\">\n<br>\n<br>\n<br>\nNous n\'avons pas d\'offres d\'emploi ouvertes en ce moment...<br>\n<br>\n<br>\n<br>\n<br>\n            </div></div>\n        </section>\n\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','fr',NULL,'','',NULL,'','',0,NULL,NULL),(6,5,'clients-testimonials','','Clients Testimonials','Client Testimonials','testimonials, use cases, success story','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Testimonials</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n      <div class=\"center\">\n      <br><br>\n      <h1 class=\"text-center\">What they say <span class=\"text-thin\">about us</span></h1>\n      <br><br><br><br>\n      Send us your testimonial (by email to <a href=\"mailto:<?php echo $mysoc->email; ?>\"><?php echo $mysoc->email; ?></a>)\n      <br><br><br><br>\n      <br><br>\n      </div>\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(7,5,'contact','','Contact','Privacy Policies','Contact','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Contact</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div style=\"margin: 50px; text-align: center\">\n<h2>Contact us:</h2> <br> <br> \n<span class=\"fa fa-envelope-o\"></span> <?php echo $mysoc->email ?><br>\n<span class=\"fa fa-address-card-o\"></span> <?php echo $mysoc->getFullAddress() ?><br>\n            </div>\n        </section>\n\n\n        <!-- Google MAPS -->\n        <center><div class=\"mapouter\"><div class=\"gmap_canvas\"><iframe width=\"600\" height=\"500\" id=\"gmap_canvas\" src=\"https://maps.google.com/maps?q=<?php echo urlencode($mysoc->getFullAddress()); ?>&t=&z=13&ie=UTF8&iwloc=&output=embed\" frameborder=\"0\" scrolling=\"no\" marginheight=\"0\" marginwidth=\"0\"></iframe>\n        </div>\n        <style>.mapouter{text-align:right;height:500px;width:600px;}.gmap_canvas {overflow:hidden;background:none!important;height:500px;width:600px;}</style>\n        </div></center>\n\n    <br><br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(8,5,'faq','','FAQ','Frequently Asked Questions','faq','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">FAQs</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div class=\"container\">\n<div class=\"text-align: center\"><br><br><h2>Frequently Asked Questions</h2></div>\n<br>\n<br>\n<br>\n<h4>How can I contact you ?</h4><br>\nYou can contact us by using <a href=\"contact.php\">this page</a>.\n<br>\n<br>\n<br>\n<h4>What is your privacy policy ?</h4><br>\nYou may find information about our privacy policy on <a href=\"privacy-policies.php\">this page</a>.\n\n\n<br><br><br><br>\n\n            </div>\n        </section>\n\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(9,5,'footer','','Footer','Footer','','<!-- At least 2 div required to avoid ckeditor to insert a p -->\n<div class=\"dolcontenteditable\" contenteditable=\"true\">      \n\n    <footer class=\"page-foot bg-cape-cod context-dark\">\n        <section id=\"sectionfooter\" contenteditable=\"true\" class=\"section-40\">\n          <div class=\"container\">\n            <div class=\"row justify-content-sm-center\">\n              <div class=\"col-sm-9 col-md-12 col-xl-12\">\n                <div class=\"row row-50\">\n                  \n                  <div class=\"col-md-6 col-lg-4 col-xl-4\">\n                    <h4 class=\"text-small-16 text-uppercase footer-title\">Product and Services</h4>\n                    <div class=\"row\" style=\"padding-right: 20px\">\n                      <div class=\"col-6\">\n                        <ul class=\"list-marked-variant-2\">\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"product-p.php\">Product P</a></li>\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"service-s.php\">Service S</a></li>\n                        </ul>\n                      </div>\n                      <div class=\"col-6\">\n                        <ul class=\"list-marked-variant-2\">\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"pricing.php\">Prices</a></li>\n                        </ul>\n                      </div>\n                    </div>\n                  </div>\n\n                  <div class=\"col-md-6 col-lg-4 col-xl-4\">\n                    <h4 class=\"text-small-16 text-uppercase footer-title\">Quick links</h4>\n                    <div class=\"row\" style=\"padding-right: 20px\">\n                      <div class=\"col-6\">\n                        <ul class=\"list-marked-variant-2\">\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"home.php\">Home</a></li>\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"blog.php\">Blog</a></li>\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"search.php\">Search</a></li>\n                        </ul>\n                      </div>\n                      <div class=\"col-6\">\n                        <ul class=\"list-marked-variant-2\">\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"contact.php\">Contacts</a></li>\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"privacy-policies.php\">Privacy policies</a></li>\n                        </ul>\n                        <?php // echo $website->componentSelectLang(\'auto\', $weblangs, \'margin-top-10\'); ?>\n                      </div>\n                    </div>\n                  </div>\n                  \n                  <div class=\"col-md-6 col-lg-4 col-xl-4\">\n                    <h4 class=\"text-small-16 text-uppercase footer-title\">Contact us</h4>\n                    <address class=\"contact-info text-left\">\n                      <div class=\"unit unit-horizontal unit-spacing-md align-items-center\">\n                        <div class=\"unit-left\"><span class=\"icon text-white fa fa-phone\"></span></div>\n                        <div class=\"unit-body\"><a class=\"link-white\" href=\"callto:<?php echo $mysoc->phone; ?>\"><?php echo $mysoc->phone; ?></a></div>\n                      </div>\n                      <div class=\"unit unit-horizontal unit-spacing-md align-items-center\">\n                        <div class=\"unit-left\"><span class=\"icon text-white fa fa-envelope-o\"></span></div>\n                        <div class=\"unit-body\"><a class=\"link-white\" href=\"mailto:<?php echo $mysoc->email; ?>\"><?php echo $mysoc->email; ?></a></div>\n                      </div>\n                      <div class=\"unit unit-horizontal unit-spacing-md\">\n                        <div class=\"unit-left\"><span class=\"icon text-white fa fa-address-card-o\"></span></div>\n                        <div class=\"unit-body\"><span class=\"link-white\"><?php echo $mysoc->getFullAddress(1, \'<br>\', 1); ?></span></div>\n                      </div>\n                    </address>\n                    <div class=\"group-sm group-middle\">\n                      <p class=\"font-italic text-white\">Follow Us:</p>\n                      <ul class=\"list-inline\">\n                          <?php foreach($mysoc->socialnetworks as $key => $value) {\n                            print \'<li><a class=\"icon icon-xxs-smallest\" href=\"\'.(preg_match(\'/^http/\', $value) ? $value : \'https://www.\'.$key.\'.com/\'.$value).\'\"><span class=\"fab fa-\'.$key.\'\" style=\"margin-left: 5px; font-size: 1.6em\"></span></a></li>\';\n                          } ?>\n                      </ul>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n          </div>\n        </section>\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div class=\"center\">\n            Website generated and powered by <a href=\"https://www.dolibarr.org\" target=\"CRM and ERP for freelances, association and companies\">Dolibarr ERP & CRM</a>\n            </div>\n        </section>\n        \n      </footer>\n      \n      <!--<a href=\"#\" id=\"ui-to-top\" class=\"ui-to-top\"><span class=\"fa fa-angle-up\" style=\"color: #fff; font-size: 1.9em;\"></span></a>-->\n\n</div>\n\n\n<script src=\"/document.php?modulepart=medias&file=js/template-corporate/script.js\"></script>\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'other','en',NULL,'','',NULL,'','',0,NULL,NULL),(10,5,'header','','Header and Top Menu','Header with menu','','<!-- JQuery + Other js libs -->\n<script src=\"/document.php?modulepart=medias&file=js/template-corporate/extlib.min.js\"></script>\n\n\n<div class=\"dolcontenteditable dolsticky\" contenteditable=\"true\"><div class=\"div-page-head\">\n      <header class=\"page-head\">\n        <div class=\"rd-navbar-wrap\" style=\"height: 106px;\">\n          <nav class=\"rd-navbar rd-navbar-corporate-dark rd-navbar-original rd-navbar-static\" \n                data-layout=\"rd-navbar-fixed\" data-sm-layout=\"rd-navbar-fixed\" data-md-device-layout=\"rd-navbar-fixed\" \n                data-md-layout=\"rd-navbar-static\" data-lg-layout=\"rd-navbar-static\" data-xl-layout=\"rd-navbar-static\" data-xxl-layout=\"rd-navbar-static\"\n                data-lg-device-layout=\"rd-navbar-static\" data-xl-device-layout=\"rd-navbar-static\" data-xxl-device-layout=\"rd-navbar-static\"\n                data-stick-up-clone=\"false\" data-md-stick-up-offset=\"53px\" data-lg-stick-up-offset=\"53px\" data-md-stick-up=\"true\" data-lg-stick-up=\"true\">\n            <div class=\"rd-navbar-inner\">\n              \n              <div class=\"rd-navbar-group rd-navbar-search-wrap toggle-original-elements\">\n                <div class=\"rd-navbar-panel\">\n                  <button class=\"rd-navbar-toggle\" data-custom-toggle=\".rd-navbar-nav-wrap\" data-custom-toggle-disable-on-blur=\"true\"><span></span></button><a class=\"rd-navbar-brand brand\" href=\"home.php\">\n                      <img src=\"/viewimage.php?modulepart=mycompany&file=logos/<?php echo getImageFileNameForSize($mysoc->logo_squarred ? $mysoc->logo_squarred : $mysoc->logo, \'_small\') ?>\" alt=\"\" height=\"34\"></a>\n                </div>\n                <div class=\"rd-navbar-nav-wrap\">\n                  <div class=\"rd-navbar-nav-inner\">\n                    <div class=\"rd-navbar-search toggle-original-elements\">\n                      <form class=\"rd-search\" action=\"search.php\" method=\"POST\" data-search-live=\"rd-search-results-live\">\n                        <input type=\"hidden\" name=\"token\" value=\"<?php echo newToken(); ?>\" />\n                        <div class=\"form-wrap\">\n                          <input class=\"form-input\" id=\"rd-search-form-input\" type=\"text\" name=\"s\" autocomplete=\"off\" placeholder=\"Search...\">\n                          <div class=\"rd-search-results-live cleared\" id=\"rd-search-results-live\"></div>\n                        </div>\n                        <button class=\"rd-search-submit buttonwithnoborder\" type=\"submit\"><span class=\"icon icon-xs icon-dusty-gray fa fa-search\"></span></button>\n                      </form>\n                      <button class=\"buttonwithnoborder\" data-rd-navbar-toggle=\".rd-navbar-search, .rd-navbar-search-wrap\">\n                          <span class=\"icon icon-xs icon-dusty-gray fa fa-search\"></span>\n                      </button>\n                    </div>\n                    \n                    <!-- Tree with menu -->\n                    <ul class=\"rd-navbar-nav\">\n                      <li class=\"active\"><a href=\"/\">Home</a></li>\n                      <li class=\"rd-navbar--has-megamenu rd-navbar-submenu\"><a href=\"#\">Products | Services</a>\n                        <ul class=\"rd-navbar-megamenu rd-navbar-open-right\">\n                          <li>\n                            <h4 class=\"rd-megamenu-header\">Products and Services</h4>\n                            <ul class=\"rd-navbar-list\">\n                              <li><a href=\"product-p.php\">Product P</a></li>\n                              <li><a href=\"service-s.php\">Service S</a></li>\n                            </ul>\n                          </li>\n                          <li>\n                            <h4 class=\"rd-megamenu-header\">Pricing</h4>\n                            <ul class=\"rd-navbar-list\">\n                              <li><a href=\"pricing.php\">Pricing</a></li>\n                            </ul>\n                          </li>\n                        </ul>\n                      </li>\n                      <li><a href=\"blog.php\">Blog</a></li>\n                      <li class=\"rd-navbar--has-megamenu rd-navbar-submenu\"><a href=\"#\">Our company</a>\n                        <ul class=\"rd-navbar-megamenu rd-navbar-open-right\">\n                          <li>\n                            <h4 class=\"rd-megamenu-header\">Our business</h4>\n                            <ul class=\"rd-navbar-list\">\n                              <li><a href=\"clients-testimonials.php\">Clients testimonials</a></li>\n                              <li><a href=\"partners.php\">Partners</a></li>\n                            </ul>\n                          </li>\n                          <li>\n                            <h4 class=\"rd-megamenu-header\">Human Resources</h4>\n                            <ul class=\"rd-navbar-list\">\n                              <li><a href=\"our-team.php\">Our team</a></li>\n                              <li><a href=\"careers.php\">Careers</a></li>\n                            </ul>\n                          </li>\n                          <li>\n                            <h4 class=\"rd-megamenu-header\">Other</h4>\n                            <ul class=\"rd-navbar-list\">\n                              <li><a href=\"faq.php\">FAQ</a></li>\n                              <li><a href=\"search.php\">Search</a></li>\n                              <li><a href=\"contact.php\">Contact us</a></li>\n                              <li><a href=\"privacy-policies.php\">Privacy policies</a></li>\n                            </ul>\n                          </li>\n                        </ul>\n                      </li>\n                      <li><a href=\"contact.php\">Contacts</a></li>\n                    </ul>\n                    \n                  </div>\n                </div>\n              </div>\n            </div>\n          </nav>\n        </div>\n      </header>\n</div></div>\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'other','en',NULL,'','',NULL,'','',0,NULL,NULL),(11,5,'home','','Home','Welcome','','<div class=\"page\">\n        \n    <?php includeContainer(\'header\'); ?>\n        \n        \n      <!-- top images -->\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"swiper-container swiper-slider swiper-variant-1 bg-black swiper-container-horizontal\" data-loop=\"false\" data-autoplay=\"5500\" data-swipe=\"true\" data-simulate-touch=\"true\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" data-slide-bg=\"medias/image/template-corporate/background_rough-horn.jpg\" style=\"background-image: url(\'medias/image/template-corporate/background_rough-horn.jpg\'); background-size: cover; width: 1905px;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\"><span class=\"text-thin\">Boost your business</span>\n                      </div>\n                      <div data-caption-animate=\"fadeInUp\" data-caption-delay=\"450s\" class=\"fadeInUp animated\">\n                        <p class=\"text-big-19 text-white d-none d-md-inline-block\">We provide powerful solutions for all businesses</p>\n                      </div>\n                      <div class=\"button-block fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"550s\"><a class=\"btn btn-primary maincolorbisbackground\" href=\"contact.php\">Contact us</a></div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n            <div class=\"swiper-slide swiper-slide-next\" data-slide-bg=\"medias/image/template-corporate/background_sunset.jpg\" style=\"background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover; width: 1905px;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10 col-xl-12\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern not-animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">&nbsp;Best prices on the market&nbsp;\n                      </div>\n                      <div data-caption-animate=\"fadeInUp\" data-caption-delay=\"450s\" class=\"not-animated\">\n                        <p class=\"text-big-19 text-white d-none d-md-inline-block\">Our optimized processes allows us to provide you very competitive prices</p>\n                      </div>\n                      <div class=\"button-block not-animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"550s\"><a class=\"btn btn-primary\" href=\"contact.php\">Contact us</a></div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n          </div>\n          <div class=\"swiper-scrollbar d-xl-none\"><div class=\"swiper-scrollbar-drag\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms; width: 0px;\"></div></div>\n          <div class=\"swiper-nav-wrap d-none d-xl-block\">\n            <div class=\"swiper-button-prev swiper-button-disabled\"><span class=\"icon text-white fa fa-chevron-right fa-2x\"></span></div>\n            <div class=\"swiper-button-next\"><span class=\"icon text-white fa fa-chevron-right fa-2x\"></span></div>\n          </div>\n        </div>\n      </section>\n\n<!--<script>\nCKEDITOR.disableAutoInline = true;\nCKEDITOR.inline( \'sectionimage\' , { toolbar: [\'Bold\',\'Italic\'] } );\n</script>\n-->\n\n      <!--Products box-->\n      <section id=\"sectioniconbox\" contenteditable=\"true\">\n        <div class=\"row no-gutters justify-content-sm-center justify-content-md-start row-40 row-sm-0\">\n          <div class=\"col-sm-10 col-md-6 height-fill\">\n            <div class=\"icon-box icon-box-top-line icon-box-hover\">\n              <div class=\"box-top\">\n                <div class=\"box-icon\"><img width=\"50px\" src=\"medias/image/template-corporate/briefcase.svg\"></div>\n                <div class=\"box-header\">\n                  <h3><a href=\"our-team.php\">A competent team</a></h3>\n                </div>\n              </div>\n              <div class=\"box-body\">\n                <p class=\"text-black\">Our sales representative are also technicians.</p>\n              </div>\n            </div>\n          </div>\n          <div class=\"col-sm-10 col-md-6 height-fill\">\n            <div class=\"icon-box icon-box-top-line icon-box-hover\">\n              <div class=\"box-top\">\n                <div class=\"box-icon\"><img width=\"50px\" src=\"medias/image/template-corporate/package.svg\"></div>\n                <div class=\"box-header\">\n                  <h3><a href=\"pricing.php\">The best prices of market</a></h3>\n                </div>\n              </div>\n              <div class=\"box-body\">\n                <p class=\"text-black\">Take a look at our offers...</p>\n              </div>\n            </div>\n          </div>\n          <div class=\"col-sm-10 col-md-6 height-fill\">\n            <div class=\"icon-box icon-box-hover\">\n              <div class=\"box-top\">\n                <div class=\"box-icon\"><img width=\"50px\" src=\"medias/image/template-corporate/light-bulb.svg\"></div>\n                <div class=\"box-header\">\n                  <h3><a href=\"clients-testimonials.php\">A high level of satisfaction</a></h3>\n                </div>\n              </div>\n              <div class=\"box-body\">\n                <p class=\"text-black\">Our customer-supplier relationship is very appreciated by our customers</p>\n              </div>\n            </div>\n          </div>\n          <div class=\"col-sm-10 col-md-6 height-fill\">\n            <div class=\"icon-box icon-box-hover\">\n              <div class=\"box-top\">\n                <div class=\"box-icon\"><img width=\"50px\" src=\"medias/image/template-corporate/organization.svg\"></div>\n                <div class=\"box-header\">\n                  <h3><a href=\"/contact.php\">After Sale service</a></h3>\n                </div>\n              </div>\n              <div class=\"box-body\">\n                <p class=\"text-black\">We continue to follow and assist you after the sale. Contact us at any time.</p>\n              </div>\n            </div>\n          </div>\n        </div>\n      </section>\n\n\n      <!-- Looking for our sevices -->\n      <section id=\"sectionfirstclass\" contenteditable=\"true\" class=\"section-with-counters bg-accent text-center\">\n        <div class=\"container bg-cape-cod context-dark section-60 section-lg-90\">\n          <h2 class=\"text-rolling-stone font-weight-bold text-uppercase\">Looking for</h2>\n          <h1 class=\"section-title\"><span class=\"text-thin\">a high quality</span> service?</h1>\n          <p class=\"text-black\">With a lot of experience, hiring us is a security for your business!</p>\n          <div class=\"row list-md-dashed row-40\">\n            <div class=\"col-md-4\">\n              <div class=\"h1 small counter-bold counter maincolorbis\">11</div>\n              <div class=\"counter-title text-black font-weight-bold text-uppercase\">Years of Experience</div>\n            </div>\n            <div class=\"col-md-4\">\n              <div class=\"h1 small counter-bold counter maincolorbis\">\n                  <?php $sql = \"SELECT COUNT(*) as nb FROM \".MAIN_DB_PREFIX.\"user where statut = 1\"; $resql = $db->query($sql); $obj = $db->fetch_object($resql); print $obj->nb; ?>\n              </div>\n              <div class=\"counter-title text-black font-weight-bold text-uppercase\">Experts</div>\n            </div>\n            <div class=\"col-md-4\">\n              <div class=\"h1 small counter-bold counter maincolorbis\">\n                  <?php $sql = \"SELECT COUNT(*) as nb FROM \".MAIN_DB_PREFIX.\"societe where client in (1,3)\"; $resql = $db->query($sql); $obj = $db->fetch_object($resql); print $obj->nb; ?>\n              </div>\n              <div class=\"counter-title text-black font-weight-bold text-uppercase\">Trusted Clients</div>\n            </div>\n          </div>\n          <div class=\"button-block inset-sm-left-60 inset-sm-right-60\">\n            <div class=\"d-md-flex justify-content-md-center align-items-md-center\"><a class=\"btn btn-rect btn-primary d-block d-md-inline-block\" href=\"contact.php\">Contact us</a>\n            <span class=\"font-italic text-black inset-md-left-20 inset-md-right-20 d-block d-md-inline-block text-big-18\">&nbsp; or &nbsp;</span>\n            <a class=\"btn btn-rect btn-white-outline d-block d-md-inline-block maincolorbisbackground\" href=\"pricing.php\" style=\"min-width:236px;\">See our pricing</a></div>\n          </div>\n        </div>\n      </section>\n\n      \n      \n      <!-- Our plans -->\n      <section id=\"sectionplans\" contenteditable=\"true\" class=\"section-67 section-md-top-75 section-md-bottom-75\">\n        <div class=\"container\">\n            <div id=\"carousel-plans-month\" class=\"\" data-interval=\"0\" style=\"margin-top:50px\">\n                    <!-- begin .carousel-inner -->\n                    <div class=\"pricing-plan-slider\" role=\"listbox\">\n                        <!-- begin .item -->\n                        <div class=\"item active\">\n                            <!-- begin .container -->\n                            <div class=\"container\">\n                                <h1 class=\"text-center\">our <span class=\"text-thin\">plans</span></h1>\n\n                                <!-- begin .row -->\n                                <div class=\"plan-list flex-box row spacer-bottom-sm flexwrap_inherit\">\n                                    <!-- begin .plan-item -->\n                                    <div class=\"col-lg-15 col-md-4 col-sm-6 col-xs-12 box\">\n                                            <div class=\"plan-tile\"> \n                                                <div class=\"plan-box-header\"></div>\n                                                <div class=\"plan-title\">FREE</div>\n                                                <div class=\"plan-tag\">The best choice for personal use</div>\n                                                <div class=\"plan-feat\"><span class=\"summaryplan\">The service 1 for free</div>\n                                                <div class=\"plan-pricer\">\n                                                    <span class=\"plan-price\" id=\"monthly_plan_37\"><span><sup></sup>0<sup>€</sup></span>/ month</span>\n                                                </div>\n                                                <div class=\"plan-features\">\n                                                    <span class=\"plan-features-title\">Available features are :</span>                                                                                                        </span>\n                                                    <ul class=\"list-unstyled\">\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i>\n                                                            Service 1                                                            \n                                                        </li>\n                                                    </ul>\n                                                </div>\n                                                <div class=\"plan-btn plan-picker\">\n                                                    <a href=\"plan-a.php\" class=\"btn btn-rect btn-primary d-block d-md-inline-block\" id=\"plana\">Subcribe</a>\n                                                </div>\n                                            </div>  \n                                    </div>\n                                    <!-- end .plan-item -->\n                                    \n                                    <!-- begin .plan-item -->\n                                    <div class=\"col-lg-15 col-md-4 col-sm-6 col-xs-12 box \">                      \n                                            <div class=\"plan-tile\"> \n                                                <div class=\"plan-box-header\"></div>\n                                                <div class=\"plan-title\">STARTER</div>\n                                                <div class=\"plan-tag\">For small companiess</div>\n                                                <div class=\"plan-feat\">The service 1 and product 1 at low price</div>\n                                                <div class=\"plan-pricer\">\n                                                    <span class=\"plan-price\" id=\"starter\"><span><sup></sup>29<sup>€</sup></span>/ month</span>\n                                                </div>\n                                                <div class=\"plan-features\">\n                                                    <span class=\"plan-features-title\">Available features are :</span>                                                                                                        </span>\n                                                    <ul class=\"list-unstyled\">\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i>\n                                                            Service 1\n                                                        </li>\n                                                        <li>\n                                                        	<i class=\"fa fa-check\"></i>\n                                                        	Product 1\n                                                        </li>\n                                                    </ul>\n                                                </div>\n                                                <div class=\"plan-btn plan-picker\">\n                                                    <a href=\"plan-b.php\" class=\"btn btn-rect btn-primary d-block d-md-inline-block\" id=\"planb\">Subscribe</a>\n                                                </div>\n                                            </div>  \n                                    </div>\n                                    <!-- end .plan-item -->\n                                    \n                                    <!-- Most popular plan box -->\n                                    <div class=\"col-lg-15 col-md-4 col-sm-6 col-xs-12 box most-popular-plan-box2 most-popular-plan-box \">                  \n                                        <div class=\"plan-tile\">\n                                            <div class=\"plan-box-header\" id=\"default\"></div> \n                                                <div class=\"plan-title\">PREMIUM</div>\n                                                <div class=\"plan-tag\">For large companies</div>\n                                                <div class=\"plan-feat\">The full option package for a one shot price\n                                                </div>\n                                                <div class=\"plan-pricer\">\n                                                    <span class=\"plan-price planPremiumPrice\" id=\"premium\"><span><sup></sup>2499<sup>€</sup></span></span>\n                                                </div>\n                                                <div class=\"plan-features\">\n                                                    <span class=\"plan-features-title\">Available features are :</span>\n                                                    <ul class=\"list-unstyled\">\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i> \n                                                            Service 1                                                        </li>\n                                                        <li id=\"higherFeature\" class=\"hide\">\n                                                            <i class=\"fa fa-check\"></i> \n                                                            Service 2                                                        </li>\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i> \n                                                            Product 1                                                        </li>\n                                                    </ul>\n                                                </div>\n                                                <div class=\"plan-btn plan-picker\">\n                                                    <a href=\"planc.php\" class=\"btn btn-rect btn-primary d-block d-md-inline-block maincolorbisbackground\" id=\"planc\">Buy</a>\n                                                </div>\n                                            </div>  \n                                    </div>\n                                    <!-- Ends // Most Popular Plan Box --> \n                                </div>\n                                <!-- end .row -->\n                            </div>\n                            <!-- end .container -->\n                        </div>\n                        <!-- end .item -->\n                    </div>\n                    <!-- end .row -->\n                <!-- end .carousel -->          \n            </div>\n        </div>\n      </section>\n      \n      \n      <!-- Our team -->\n      <section id=\"sectionteam\" contenteditable=\"true\" class=\"section-66 section-md-top-100 section-md-bottom-75\">\n        <div class=\"container\">\n          <h1 class=\"text-center\">our <span class=\"text-thin\">team</span></h1>\n          <div class=\"row justify-content-sm-center\">\n            <div class=\"col-md-8 col-xl-12\">\n              <div class=\"owl-carousel owl-carousel-center owl-nav-modern owl-style-minimal owl-style-minimal-inverse text-center\" data-items=\"1\" data-md-items=\"2\" data-xl-items=\"3\" data-stage-padding=\"15\" data-loop=\"false\" data-margin=\"15\" data-mouse-drag=\"false\" data-nav=\"true\" data-dots=\"true\">\n                <div class=\"owl-item text-center\">\n                  <div class=\"thumbnail-variant-5\">\n                    <div class=\"thumbnail-variant-5-img-wrap\"><img class=\"img-circle\" src=\"medias/image/template-corporate/alberteinstein.jpg\" width=\"129\" height=\"129\" alt=\"\"></div>\n                    <h2>Albert Einstein</h2>\n                    <div>CEO</div>\n                    <div class=\"divider-fullwidth bg-porcelain\"></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-phone\"></span><a class=\"link-black\" href=\"callto:#\">+555 123 456</a></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-envelope-o\"></span><a class=\"link-black\" href=\"mailto:#\">email@example.com</a></div>\n                  </div>\n                </div>\n                <div class=\"owl-item text-center\">\n                  <div class=\"thumbnail-variant-5\">\n                    <div class=\"thumbnail-variant-5-img-wrap\"><img class=\"img-circle\" src=\"medias/image/template-corporate/pierrecurie.jpg\" width=\"129\" height=\"129\" alt=\"\"></div>\n                    <h2>Pierre Curie</h2>\n                    <div>CTO</div>\n                    <div class=\"divider-fullwidth bg-porcelain\"></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-phone\"></span><a class=\"link-black\" href=\"callto:#\">+555 123 456</a></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-envelope-o\"></span><a class=\"link-black\" href=\"mailto:#\">email@example.com</a></div>\n                  </div>\n                </div>\n                <div class=\"owl-item text-center\">\n                  <div class=\"thumbnail-variant-5\">\n                    <div class=\"thumbnail-variant-5-img-wrap\"><img class=\"img-circle\" src=\"medias/image/template-corporate/mariecurie.jpg\" width=\"129\" height=\"129\" alt=\"\"></div>\n                    <h2>Marie Curie</h2>\n                    <div>Bookkeeper</div>\n                    <div class=\"divider-fullwidth bg-porcelain\"></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-phone\"></span><a class=\"link-black\" href=\"callto:#\">+555 123 456</a></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-envelope-o\"></span><a class=\"link-black\" href=\"mailto:#\">email@example.com</a></div>\n                  </div>\n                </div>\n                <div class=\"owl-item text-center\">\n                  <div class=\"thumbnail-variant-5\">\n                    <div class=\"thumbnail-variant-5-img-wrap\"><img class=\"img-circle\" src=\"medias/image/template-corporate/daviddoe.png\" width=\"129\" height=\"129\" alt=\"\"></div>\n                    <h2>John Doe</h2>\n                    <div>Project leader</div>\n                    <div class=\"divider-fullwidth bg-porcelain\"></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-phone\"></span><a class=\"link-black\" href=\"callto:#\">+555 123 456</a></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-envelope-o\"></span><a class=\"link-black\" href=\"mailto:#\">email@example.com</a></div>\n                  </div>\n                </div>\n              </div>\n            </div>\n          </div>\n        </div>\n      </section>\n\n\n      <!-- Contact form -->\n      <section id=\"sectionformcontact\" contenteditable=\"true\" class=\"section-67 section-md-top-50 section-md-bottom-50 section-md-bottom-100 section-with-counters\">\n        <div class=\"container\">\n          <div class=\"row justify-content-sm-center\">\n            <div class=\"col-md-10 col-lg-10 col-xl-12\">\n              <div class=\"panel bg-accent bg-default-outline-btn text-center\" style=\"padding: 50px 15px;\">\n                <h1>Request <span class=\"text-thin\">a callback</span></h1>\n                <form class=\"formcontact\" method=\"POST\" action=\"request-callback.php\">\n                  <div class=\"inline-block valignmiddle\">\n                    <input class=\"form-input\" placeholder=\"Name\" id=\"index-request-name\" type=\"text\" name=\"name\" required>\n                  </div>\n                  <div class=\"inline-block valignmiddle\">\n                    <input class=\"form-input\" placeholder=\"Phone Number\" id=\"index-request-phone\" type=\"text\" name=\"phone\" required>\n                  </div>\n                  <div class=\"inline-block valignmiddle\">\n                    <input class=\"form-input\" placeholder=\"Email\" id=\"index-request-email\" type=\"text\" name=\"email\" required>\n                  </div>\n                  <div class=\"inline-block valignmiddle\">\n                    <button class=\"btn btn-rect btn-primary d-block d-md-inline-block maincolorbisbackground\" type=\"submit\">Submit</button>\n                  </div>\n                </form>\n              </div>\n            </div>\n          </div>\n        </div>\n      </section>\n      \n      \n      <!-- Testimonies -->\n      <section id=\"sectiontestimonies\" contenteditable=\"true\" class=\"maincolorbackground context-dark\">\n        <div class=\"container\">\n          <div class=\"row justify-content-sm-center justify-content-lg-start\">\n            <div class=\"col-sm-10 col-lg-12 text-left section-60 section-md-60\">\n              <div>\n                <h1 class=\"text-center text-lg-left\">successful <span class=\"text-thin\">cases</span></h1>\n                <div class=\"carousel-testimonials-home\">\n                  <div class=\"inset-xl-right-50\">\n                    <div class=\"slick-slider slick-slider slick-carousel-round-image slick-images\" id=\"child-carousel\" data-for=\".carousel-parent\" data-arrows=\"false\" data-loop=\"false\"\n                       data-dots=\"false\" data-swipe=\"true\" data-items=\"1\" data-sm-items=\"3\" data-md-items=\"3\" data-lg-items=\"3\" data-xl-items=\"4\" data-slide-to-scroll=\"1\" data-center-mode=\"false\" data-center-padding=\"0\">\n                      <div class=\"itemphotouser\">\n                        <div class=\"imp-wrap\"><img class=\"photouser\" src=\"medias/image/template-corporate/alberteinstein.jpg\" alt=\"\" width=\"99\" height=\"99\"/>\n                        </div>\n                      </div>\n                      <div class=\"itemphotouser\">\n                        <div class=\"imp-wrap\"><img class=\"photouser\" src=\"medias/image/template-corporate/pierrecurie.jpg\" alt=\"\" width=\"99\" height=\"99\"/>\n                        </div>\n                      </div>\n                      <div class=\"itemphotouser\">\n                        <div class=\"imp-wrap\"><img class=\"photouser\" src=\"medias/image/template-corporate/mariecurie.jpg\" alt=\"\" width=\"99\" height=\"99\"/>\n                        </div>\n                      </div>\n                      <div class=\"itemphotouser\">\n                        <div class=\"imp-wrap\"><img class=\"photouser\" src=\"medias/image/template-corporate/daviddoe.png\" alt=\"\" width=\"99\" height=\"99\"/>\n                        </div>\n                      </div>\n                    </div>\n                  </div>\n                  <div class=\"slick-slider carousel-parent slick-dots-variant-1\" data-arrows=\"false\" data-loop=\"false\" data-dots=\"true\"\n                  data-swipe=\"true\" data-child=\"#child-carousel\" data-for=\"#child-carousel\" data-items=\"1\" data-sm-items=\"1\" data-md-items=\"1\" data-lg-items=\"1\" data-xl-items=\"1\" data-slide-to-scroll=\"1\" data-center-mode=\"false\">\n                    <div class=\"inset-left-10 inset-right-10 inset-\">\n                      <div class=\"inset-xl-right-85\">\n                        <blockquote class=\"quote-left\">\n                          <div class=\"row align-items-sm-end row-20\">\n                            <div class=\"col-sm-6\">\n                              <div class=\"quote-name\">\n                                <cite>Albert Einstein</cite>\n                              </div>\n                              <div class=\"text-dusty-gray\">Scientist, www.emc2.org</div>\n                            </div>\n                            <div class=\"col-sm-6 text-center\">\n                              <div class=\"quote-desc row d-flex\">\n                                <div class=\"col-sm-6\">\n                                  <div class=\"quote-desc-text maincolorbis\">-20%</div>\n                                  <div class=\"text-medium text-dusty-gray text-uppercase\">Expenses</div>\n                                </div>\n                              </div>\n                            </div>\n                          </div>\n                          <div class=\"divider-fullwidth\"></div>\n                          <div>\n                            <span class=\"fa fa-quote-left\"><!-- Keep this comment --></span>\n                            <q>They did everything, with almost no time or effort for me. The best part was that I could trust their team to represent our company professionally with our clients.</q>\n                            <span class=\"fa fa-quote-right\"><!-- Keep this comment --></span>\n                          </div>\n                        </blockquote>\n                      </div>\n                    </div>\n                    <div class=\"inset-left-10 inset-right-10 inset-\">\n                      <div class=\"inset-xl-right-85\">\n                        <blockquote class=\"quote-left\">\n                          <div class=\"row row-20\">\n                            <div class=\"col-sm-6\">\n                              <div class=\"quote-name\">\n                                <cite>Pierre Curie</cite>\n                              </div>\n                              <div class=\"text-dusty-gray\">CEO “Cyclonic”</div>\n                            </div>\n                            <div class=\"col-sm-6 text-center\">\n                              <div class=\"quote-desc row d-flex\">\n                                <div class=\"col-sm-6\">\n                                  <div class=\"quote-desc-text maincolorbis\">-30%</div>\n                                  <div class=\"text-medium text-dusty-gray text-uppercase\">Expenses</div>\n                                </div>\n                              </div>\n                            </div>\n                          </div>\n                          <div class=\"divider-fullwidth\"></div>\n                          <div>\n                            <span class=\"fa fa-quote-left\"><!-- Keep this comment --></span>\n                            <q>Their course gave me the confidence to implement new techniques in my work. I learn “how” to write – “what” and “why” also became much clearer.</q>\n                            <span class=\"fa fa-quote-right\"><!-- Keep this comment --></span>\n                          </div>\n                        </blockquote>\n                      </div>\n                    </div>\n                    <div class=\"inset-left-10 inset-right-10 inset-\">\n                      <div class=\"inset-xl-right-85\">\n                        <blockquote class=\"quote-left\">\n                          <div class=\"row row-20\">\n                            <div class=\"col-sm-6\">\n                              <div class=\"quote-name\">\n                                <cite>Marie Curie</cite>\n                              </div>\n                              <div class=\"text-dusty-gray\">CTO \"Cyclonic\"</div>\n                            </div>\n                            <div class=\"col-sm-6 text-center\">\n                              <div class=\"quote-desc row d-flex\">\n                                <div class=\"col-sm-6\">\n                                  <div class=\"quote-desc-text maincolorbis\">+22%</div>\n                                  <div class=\"text-medium text-dusty-gray text-uppercase\">Turnover</div>\n                                </div>\n                              </div>\n                            </div>\n                          </div>\n                          <div class=\"divider-fullwidth\"></div>\n                          <div>\n                            <span class=\"fa fa-quote-left\"><!-- Keep this comment --></span>\n                            <q>We were skeptical to work with a consultant to optimize our sales emails, but they were highly recommended by many other startups we knew. They helped us to reach our objective of 20% turnover increase, in 4 monthes.</q>\n                            <span class=\"fa fa-quote-right\"><!-- Keep this comment --></span>\n                          </div>\n                        </blockquote>\n                      </div>\n                    </div>\n                    <div class=\"inset-left-10 inset-right-10 inset-\">\n                      <div class=\"inset-xl-right-85\">\n                        <blockquote class=\"quote-left\">\n                          <div class=\"row row-20\">\n                            <div class=\"col-sm-6\">\n                              <div class=\"quote-name\">\n                                <cite>John Doe</cite>\n                              </div>\n                              <div class=\"text-dusty-gray\">Sale representative</div>\n                            </div>\n                            <div class=\"col-sm-6 text-center\">\n                              <div class=\"quote-desc row d-flex\">\n                                <div class=\"col-sm-6\">\n                                  <div class=\"quote-desc-text maincolorbis\">+40%</div>\n                                  <div class=\"text-medium text-dusty-gray text-uppercase\">Quotes</div>\n                                </div>\n                              </div>\n                            </div>\n                          </div>\n                          <div class=\"divider-fullwidth\"></div>\n                          <div>\n                            <span class=\"fa fa-quote-left\"><!-- Keep this comment --></span>\n                            <q>Their work on our website and Internet marketing has made a significant different to our business. We’ve seen a +40% increase in quote requests from our website.</q>\n                            <span class=\"fa fa-quote-right\"><!-- Keep this comment --></span>\n                          </div>\n                        </blockquote>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n          </div>\n        </div>\n      </section>\n      \n\n      <!-- News -->\n      <section id=\"sectionnews\" contenteditable=\"true\" class=\"section-50 section-md-90 section-md-bottom-100\">\n        <div class=\"container text-center\">\n          <h1>Latest <span class=\"text-thin\">News</span></h1>\n          <div class=\"row justify-content-sm-center row-40\">\n            <?php \n            $MAXNEWS = 3;\n            $arrayofblogs = $websitepage->fetchAll($website->id, \'DESC\', \'date_creation\', $MAXNEWS, 0, array(\'type_container\'=>\'blogpost\', \'status\'=>1, \'lang\'=>\'null,\'.$websitepage->lang));\n            foreach($arrayofblogs as $blog)\n            {\n                ?>\n                <div class=\"col-sm-8 col-md-7 col-lg-4\">\n                  <div class=\"post-boxed d-xl-inline-block\">\n                    <a href=\"<?php echo $blog->pageurl ?>.php\">\n                    <div class=\"post-boxed-img-wrap\"><img src=\"<?php echo ($blog->image ? \'viewimage.php?modulepart=medias&file=\'.str_replace(\'template-corporate\', $website->ref, $blog->image) : \'medias/image/\'.$website->ref.\'/calendar.svg\"\'); ?>\" alt=\"\" height=\"80\"></div>\n                    <div class=\"post-boxed-caption\">\n                      <div class=\"post-boxed-title font-weight-bold\"><?php echo $blog->title ?></div>\n                      <ul class=\"list-inline list-inline-dashed text-uppercase\">\n                        <li><?php $weblangs->load(\"main\"); echo dol_print_date($blog->date_creation, \'daytext\', \'tzuser\', $weblangs); ?></li>\n                        <li><span>by<span> <span class=\"text-primary\"><?php echo $blog->author_alias ?></span></span></li>\n                      </ul>\n                    </div>\n                    </a>\n                  </div>\n                </div>\n                <?php \n            }\n            ?>\n \n          </div>\n        </div>\n      </section>\n\n\n    <?php includeContainer(\'footer\'); ?>\n\n\n</div>\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(12,5,'our-team','','Our team','Our team','team','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Our team</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionteam\" contenteditable=\"true\" class=\"section-50 section-md-50 section-md-bottom-50\">\n            <div class=\"container\"><div class=\"text-align: center\"><br>\n            <h2>The crew...</h2><br> <br><br> \n            <?php \n            include_once DOL_DOCUMENT_ROOT.\'/core/class/html.form.class.php\';\n            $websitepage = new WebsitePage($db);\n            $fuser = new User($db);\n            $arrayofusers = array();\n            $MAXNB=10;\n            $sql=\'SELECT rowid FROM \'.MAIN_DB_PREFIX.\'user WHERE statut = 1 and fk_soc IS NULL ORDER BY fk_user DESC LIMIT \'.$MAXNB;\n            $resql = $db->query($sql);\n            if (! $resql) dol_print_error($db);\n            while ($obj = $db->fetch_object($resql))\n            {\n                $arrayofusers[]=$obj->rowid;\n            }\n           \n            print \'<div class=\"row justify-content-sm-center row-40\">\';\n            foreach($arrayofusers as $id)\n            {\n                $fuser->fetch($id);\n\n                print \'<div class=\"col-sm-8 col-md-7 col-lg-4\">\';\n                print \'<div class=\"container blog-box d-xl-inline-block\" style=\"padding: 20px; box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;\">\';\n                print \'<div class=\"post-boxed-img-wrap\" style=\"height: 164px\">\';\n                if ($fuser->photo) print Form::showphoto(\'userphoto\', $fuser, 100, 0, 0, \'photowithmargin\', \'\', 0);\n                //print \'<img class=\"img-circle\" src=\"/viewimage.php?modulepart=userphoto&amp;file=\'.$fuser->photo.\'\" width=\"129\" height=\"129\" alt=\"\">\';\n                else print \'<img class=\"img-circle\" src=\"/viewimage.php?modulepart=medias&amp;file=image/template-corporate/daviddoe.png\" width=\"129\" height=\"129\" alt=\"\">\';\n                print \'</div>\';\n                print \'<div class=\"post-boxed-caption\">\';\n                print \'<div class=\"post-boxed-title font-weight-bold\">\'.$fuser->firstname.\'</div>\';\n                print \'<ul class=\"list-inline list-inline-dashed text-uppercase\">\';\n                //print \'<li>September 24, 2018</li>\';\n                if ($fuser->job) print \'<li><span class=\"text-primary\">\'.$fuser->job.\'</span></li>\';\n                else print \'<li></li>\';\n                print \'</ul>\';\n                print \'</div>\';\n                print \'</div>\';\n                print \'</div>\';\n            }\n            print \'</div>\';\n\n            ?>\n            </div></div>\n        </section>\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(13,5,'partners','','Partners','Partners','partners','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Partners</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div style=\"margin: 50px\"><div class=\"text-align: center\">\n<br><h2>Our partners...</h2>\n<br>\n<br>\n<br>\n<div class=\"row justify-content-sm-center row-40\">\n    <div class=\"col-sm-8 col-md-2 col-lg-2\">\n        <div>\n            <img src=\"/viewimage.php?modulepart=medias&file=image/template-corporate/dolibarr_256x256.png\" height=\"64px\"><br>\n            <div class=\"floatatbottom\"><a href=\"https://www.dolibarr.org\" target=\"_new\">Dolibarr ERP CRM</a></div>\n        </div>\n    </div>\n    <div class=\"col-sm-4 col-md-2 col-lg-2\">\n         <div>\n        <img src=\"/viewimage.php?modulepart=medias&file=image/template-corporate/php.png\" height=\"64px\"><br>\n        <div class=\"floatatbottom\"><a href=\"http://www.php.net\" target=\"_new\">PHP</a></div>\n        </div>\n    </div>\n    <div class=\"col-sm-4 col-md-2 col-lg-2\">\n         <div>\n        <img src=\"/viewimage.php?modulepart=medias&file=image/template-corporate/apache.png\" height=\"64px\"><br>\n        <div class=\"floatatbottom\"><a href=\"https://www.apache.org\" target=\"_new\">Apache</a></div>\n        </div>\n    </div>\n    <div class=\"col-sm-4 col-md-2 col-lg-2\">\n         <div>\n        <img src=\"/viewimage.php?modulepart=medias&file=image/template-corporate/mariadb.png\" height=\"64px\"><br>\n        <div class=\"floatatbottom\"><a href=\"https://www.mariadb.org\" target=\"_new\">MariaDB</a></div>\n        </div>\n    </div>\n</div>\n<br>\n<br>\n<br>\n<br>\n            </div></div>\n        </section>\n\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(14,5,'pricing','','Pricing','All the prices of our offers','pricing','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Our plans</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n\n\n      <!-- Our plans -->\n      <section id=\"sectionplans\" contenteditable=\"true\" class=\"section-67 section-md-top-50 section-md-bottom-75\">\n        <div class=\"container\">\n            <div id=\"carousel-plans-month\" class=\"\" data-interval=\"0\" style=\"margin-top:50px\">\n                    <!-- begin .carousel-inner -->\n                    <div class=\"pricing-plan-slider\" role=\"listbox\">\n                        <!-- begin .item -->\n                        <div class=\"item active\">\n                            <!-- begin .container -->\n                            <div class=\"container\">\n\n                                <!-- begin .row -->\n                                <div class=\"plan-list flex-box row spacer-bottom-sm flexwrap_inherit\">\n                                    <!-- begin .plan-item -->\n                                    <div class=\"col-lg-15 col-md-4 col-sm-6 col-xs-12 box\">\n                                            <div class=\"plan-tile\"> \n                                                <div class=\"plan-box-header\"></div>\n                                                <div class=\"plan-title\">FREE</div>\n                                                <div class=\"plan-tag\">The best choice for personal use</div>\n                                                <div class=\"plan-feat\"><span class=\"summaryplan\">The service 1 for free</div>\n                                                <div class=\"plan-pricer\">\n                                                    <span class=\"plan-price\" id=\"monthly_plan_37\"><span><sup></sup>0<sup>€</sup></span>/ month</span>\n                                                </div>\n                                                <div class=\"plan-features\">\n                                                    <span class=\"plan-features-title\">Available features are :</span>                                                                                                        </span>\n                                                    <ul class=\"list-unstyled\">\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i>\n                                                            Service 1                                                            \n                                                        </li>\n                                                    </ul>\n                                                </div>\n                                                <div class=\"plan-btn plan-picker\">\n                                                    <a href=\"plan-a.php\" class=\"btn btn-rect btn-primary d-block d-md-inline-block\" id=\"plana\">Subcribe</a>\n                                                </div>\n                                            </div>  \n                                    </div>\n                                    <!-- end .plan-item -->\n                                    \n                                    <!-- begin .plan-item -->\n                                    <div class=\"col-lg-15 col-md-4 col-sm-6 col-xs-12 box \">                      \n                                            <div class=\"plan-tile\"> \n                                                <div class=\"plan-box-header\"></div>\n                                                <div class=\"plan-title\">STARTER</div>\n                                                <div class=\"plan-tag\">For small companiess</div>\n                                                <div class=\"plan-feat\">The service 1 and product 1 at low price</div>\n                                                <div class=\"plan-pricer\">\n                                                    <span class=\"plan-price\" id=\"starter\"><span><sup></sup>29<sup>€</sup></span>/ month</span>\n                                                </div>\n                                                <div class=\"plan-features\">\n                                                    <span class=\"plan-features-title\">Available features are :</span>                                                                                                        </span>\n                                                    <ul class=\"list-unstyled\">\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i>\n                                                            Service 1\n                                                        </li>\n                                                        <li>\n                                                        	<i class=\"fa fa-check\"></i>\n                                                        	Product 1\n                                                        </li>\n                                                    </ul>\n                                                </div>\n                                                <div class=\"plan-btn plan-picker\">\n                                                    <a href=\"plan-b.php\" class=\"btn btn-rect btn-primary d-block d-md-inline-block\" id=\"planb\">Subscribe</a>\n                                                </div>\n                                            </div>  \n                                    </div>\n                                    <!-- end .plan-item -->\n                                    \n                                    <!-- Most popular plan box -->\n                                    <div class=\"col-lg-15 col-md-4 col-sm-6 col-xs-12 box most-popular-plan-box2 most-popular-plan-box \">                  \n                                        <div class=\"plan-tile\">\n                                            <div class=\"plan-box-header\" id=\"default\"></div> \n                                                <div class=\"plan-title\">PREMIUM</div>\n                                                <div class=\"plan-tag\">For large companies</div>\n                                                <div class=\"plan-feat\">The full option package for a one shot price\n                                                </div>\n                                                <div class=\"plan-pricer\">\n                                                    <span class=\"plan-price planPremiumPrice\" id=\"premium\"><span><sup></sup>2499<sup>€</sup></span></span>\n                                                </div>\n                                                <div class=\"plan-features\">\n                                                    <span class=\"plan-features-title\">Available features are :</span>\n                                                    <ul class=\"list-unstyled\">\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i> \n                                                            Service 1                                                        </li>\n                                                        <li id=\"higherFeature\" class=\"hide\">\n                                                            <i class=\"fa fa-check\"></i> \n                                                            Service 2                                                        </li>\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i> \n                                                            Product 1                                                        </li>\n                                                    </ul>\n                                                </div>\n                                                <div class=\"plan-btn plan-picker\">\n                                                    <a href=\"planc.php\" class=\"btn btn-rect btn-primary d-block d-md-inline-block maincolorbisbackground\" id=\"planc\">Buy</a>\n                                                </div>\n                                            </div>  \n                                    </div>\n                                    <!-- Ends // Most Popular Plan Box --> \n                                </div>\n                                <!-- end .row -->\n                            </div>\n                            <!-- end .container -->\n                        </div>\n                        <!-- end .item -->\n                    </div>\n                    <!-- end .row -->\n                <!-- end .carousel -->          \n            </div>\n        </div>\n      </section>\n      \n      \n        \n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(15,5,'privacy-policies','','Privacy Policies','Privacy Policies','Privacy policies, GDPR','<div class=\"page\">\n          \n    \n        <?php includeContainer(\'header\'); ?>\n\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Privacy Policy</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n<br><br><br>\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\" style=\"margin-top: 50px\">\n            <div class=\"container\">\n<p style = \"text-align: justify;\"> <h2> Information collected and used </h2> <br> </p>\n<p style = \"text-align: justify;\"> * Your customer information (email, phone, business name, first and last name of contact, address, postal code, country and VAT number) are stored when you become a customer. This information allows us to bill you. </ P>\n<p style = \"text-align: justify;\"> * If you paid using our online service, we also store the last 4 digits of your card. The full details of your credit card is stored by our payment provider Stripe (the world leader in online payment).</p>\n<p style = \"text-align: justify;\"> * You have the option to request the deletion of your data and the above information at any time (except data required y fiscal tracking rules, like your invoices). </p>\n<p style = \"text-align: justify;\"> * The Privacy Policies and GDPR referral contact for our services is: <?php echo $conf->global->MAIN_INFO_GDPR; ?> </p>\n<p style = \"text-align: justify;\"> <br> </p>\n<p style = \"text-align: justify;\"> <h2> Data Storage and Backups </h2> <br> </p>\n<p style = \"text-align: justify;\"> * The storage of collected data (see \'Information collected and used\') is done in a database. </p>\n<p style = \"text-align: justify;\"> * We made one backup every week. Only 4 weeks are kept. <br> </p>\n<p style = \"text-align: justify;\"> <br> </p>\n<p style = \"text-align: justify;\"> <h2> Subcontractor </h2> <br> </p>\n<p style = \"text-align: justify;\"> * Our services relies on the following subcontractors and service: <br>\n** The host of computer servers, which is ABC company. These servers are hosted in US. No customer information is communicated to this subcontractor who only provides the hardware and network layer, the installation and operation being carried out by us directly. <br>\n** The online payment service <a href=\"https://www.stripe.com\">Stripe</a>, which is used, to ensure regular payment of subscription or your invoices paid online. </p>\n<p style = \"text-align: justify;\"> <br> </p>\n<p style = \"text-align: justify;\"> <h2> Software Protection </h2> <br> </p>\n<p style = \"text-align: justify;\"> * Our services runs on Linux Ubuntu systems and software. They benefit from regular security updates when the operating system editor (Ubuntu Canonical) publishes them. <br> </p>\n<p style = \"text-align: justify;\"> * Our services are accessible in HTTPS (HTTP encrypted) only, encrypted with SHA256 certificates.<br> </p>\n<p style = \"text-align: justify;\"> * Our technical platform are protected by various solutions. <br> </p>\n<p style = \"text-align: justify;\"> <br> </p>\n<p style = \"text-align: justify;\"> <h2> Data theft </h2> <br> </p>\n<p style = \"text-align: justify;\"> * In case of suspicion of a theft of the data we have collected (see first point \'Information collected and used\'), customers will be informed by email, at email corresponding to their customer account <br> </p>\n<p style=\"text-align: justify;\"> </p>\n            </div>\n        </section>\n\n\n      <?php includeContainer(\'footer\'); ?>\n      \n      \n</div>\n    \n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(16,5,'product-p','','Product P','Product P','','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Product P</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div style=\"margin: 50px\"><div class=\"text-align: center\">\n<br>\n<br>\n<br>\nThis is a description page of our product P...<br>\n<br>\n<br>\n<br>\n<br>\n            </div></div>\n        </section>\n\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(17,5,'search','','Search Page','Search Page','','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Search</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n<br><br><br>\n\n<center>\n     \n    <div style=\"width: 60%\">\n    <form class=\"rd-search\" action=\"search.php\" method=\"POST\">\n        <input type=\"hidden\" name=\"token\" value=\"<?php echo newToken(); ?>\" />\n        <div class=\"form-wrap\">\n                  <input class=\"form-input\" id=\"rd-search-form-input\" type=\"text\" name=\"s\" autocomplete=\"off\" placeholder=\"Search...\" value=\"<?php echo dol_escape_htmltag(GETPOST(\'s\', \'alphanohtml\')); ?>\">\n                  <div class=\"rd-search-results-live cleared\" id=\"rd-search-results-live\"></div>\n        </div>\n        <button class=\"rd-search-submit buttonwithnoborder\" type=\"submit\"><span class=\"icon icon-xs icon-dusty-gray fa fa-search\"></span></button>\n    </form>\n    </div>\n    <br>\n                      \n     <?php\n     $weblangs->load(\"main\");\n     \n     if (function_exists(\'getPagesFromSearchCriterias\'))\n     {\n         if (GETPOSTISSET(\'s\'))\n         {\n             $listofpages = getPagesFromSearchCriterias(\'page\', \'meta\', GETPOST(\'s\', \'alphanohtml\'));\n             if ($listofpages[\'code\'] == \'OK\')\n             {\n                 foreach($listofpages[\'list\'] as $websitepagefound)\n                 {\n                    print \'<div class=\"rowsearchresult\"><a href=\"\'.$websitepagefound->ref.\'.php\">\'.$websitepagefound->title.\'</a> - \'.$websitepagefound->description.\'</div>\';\n                 }\n             }\n             else\n             {\n                 // If error, show message\n                 print $listofpages[\'message\'];\n             }\n         }\n     }\n     else\n     {\n         print $weblangs->trans(\"FeatureNotYetAvailable\");\n     }\n     ?>\n                      \n<br><br><br><br><br><br>\n</center>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(18,5,'service-s','','Service S','Service S','','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Service S</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div style=\"margin: 50px\"><div class=\"text-align: center\">\n<br>\n<br>\n<br>\nThis is a description page of our service S...<br>\n<br>\n<br>\n<br>\n<br>\n            </div></div>\n        </section>\n\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(19,5,'test','','test','Page test','test','Test\n<!-- Test \n<?php var_dump($langs->defaultlang); ?>\n<?php var_dump($weblangs->defaultlang); ?>\n-->',1,'2020-10-07 13:13:26',NULL,'2020-10-07 11:13:26',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(20,4,'credits','','Credits','Credits and legal notices','','	\n		<!-- Wrapper -->\n			<div id=\"wrapper\">\n\n				<!-- Header -->\n					<header id=\"header\">\n						<h1>Mentions légales</h1>\n						<p>Curriculum Vitae</p>\n					</header>\n\n                <!-- Menu -->\n                <?php includeContainer(\'menu\'); ?>\n\n				<!-- Main -->\n					<div id=\"main\">\n\n						<!-- Content -->\n							<section id=\"content\" class=\"main\">\n\n								<div class=\"chapo\"><p>\n								    \nThis site is edited by <?php echo $mysoc->name; ?>\n\n								    \n								</div>\n\n							</section>\n\n					</div>\n\n				<!-- Footer -->\n				<?php includeContainer(\'footer\'); ?>\n\n			</div>\n\n',1,'2019-08-15 16:39:56',NULL,'2020-02-21 09:27:17',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(21,4,'footer','','Footer','','','				<!-- Footer -->\n                    <footer id=\"footer\">\n						<section contenteditable=\"true\">\n							<h2>Aliquam sed mauris</h2>\n							<p>Sed lorem ipsum dolor sit amet et nullam consequat feugiat consequat magna adipiscing tempus etiam dolore veroeros. eget dapibus mauris. Cras aliquet, nisl ut viverra sollicitudin, ligula erat egestas velit, vitae tincidunt odio.</p>\n							<ul class=\"actions\">\n								<li><a href=\"generic.php\" class=\"buttonwebsite\">Learn More</a></li>\n							</ul>\n						</section>\n						<section contenteditable=\"true\">\n							<h2>Etiam feugiat</h2>\n							<dl class=\"alt\">\n								<dt>Address</dt>\n								<dd><?php echo $mysoc->getFullAddress(1, \'<br>\'); ?></dd>\n								<dt>Phone</dt>\n								<dd><?php echo $mysoc->phone; ?></dd>\n								<dt>Email</dt>\n								<dd><a href=\"mailto:<?php echo $mysoc->email; ?>\"><?php echo $mysoc->email; ?></a></dd>\n							</dl>\n							<ul class=\"icons\">\n	                          <ul class=\"list-inline\">\n                              <?php foreach($mysoc->socialnetworks as $key => $value) {\n                                print \'<li><a target=\"_blank\" class=\"icon alt fab fa-\'.$key.\'\" href=\"\'.(preg_match(\'/^http/\', $value) ? $value : \'https://www.\'.$key.\'.com/\'.$value).\'\"><span class=\"label\">\'.ucfirst($key).\'</span></a></li>\';\n                              } ?>\n                            </ul>\n						</section>\n						<div class=\"copyright\">&copy; Untitled. Design: <a href=\"https://html5up.net\">HTML5 UP</a> adapted for <a href=\"https://www.dolibarr.org\">Dolibarr</a> by <a href=\"https://www.nltechno.com\">NLTechno</a>.</div>\n					</footer>\n\n\n<script>\n// When the user scrolls down 20px from the top of the document, show the button\nwindow.onscroll = function() {scrollFunction()};\n\nfunction scrollFunction() {\n  console.log(\"Execute code for scroll Top button\");\n  if (document.body.scrollTop > 20 || document.documentElement.scrollTop > 20) {\n    document.getElementById(\"myBtnToTop\").style.display = \"block\";\n  } else {\n    document.getElementById(\"myBtnToTop\").style.display = \"none\";\n  }\n}\n\n// When the user clicks on the button, scroll to the top of the document\nfunction topFunction() {\n  document.body.scrollTop = 0; // For Safari\n  document.documentElement.scrollTop = 0; // For Chrome, Firefox, IE and Opera\n}\n</script>\n\n<button onclick=\"topFunction()\" id=\"myBtnToTop\" title=\"Go to top\">Top</button>\n',1,'2019-08-15 16:42:44',NULL,'2020-06-19 08:18:14',NULL,NULL,'page','fr',NULL,'','',NULL,'','',0,NULL,NULL),(22,4,'generic','','Generic page','Generic page or my personal Blog','My generic page','	\n<!-- Wrapper -->\n<div id=\"wrapper\">\n\n	<!-- Header -->\n		<header id=\"header\">\n			<h1>Another page</h1>\n			<p>Ipsum dolor sit amet nullam</p>\n		</header>\n\n    <!-- Menu -->\n    <?php includeContainer(\'menu\'); ?>\n\n	<!-- Main -->\n	<div id=\"main\">\n\n		<!-- Content -->\n		<section id=\"content\" class=\"main\" contenteditable=\"true\">\n			<span class=\"image main\"><img src=\"medias/image/template-stellar/pic01.jpg\" alt=\"\" /></span>\n			<h2>Magna feugiat lorem</h2>\n			<p>Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet. Pellentesque leo mauris, consectetur id ipsum sit amet, fergiat. Pellentesque in mi eu massa lacinia malesuada et a elit. Donec urna ex, lacinia in purus ac, pretium pulvinar mauris. Curabitur sapien risus, commodo eget turpis at, elementum convallis fames ac ante ipsum primis in faucibus.</p>\n			<p>Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet.</p>\n			<h2>Tempus veroeros</h2>\n			<p>Cep risus aliquam gravida cep ut lacus amet. Adipiscing faucibus nunc placerat. Tempus adipiscing turpis non blandit accumsan eget lacinia nunc integer interdum amet aliquam ut orci non col ut ut praesent.</p>\n		</section>\n\n        <!-- Blog list -->\n        <section id=\"sectionnews\" contenteditable=\"true\" class=\"main section-50 section-md-50 section-md-bottom-50\">\n			<h2>Latest Blog posts</h2>\n            <div class=\"center\">\n            <?php \n            $keyword = \'\';\n            $weblangs->loadLangs(array(\"main\",\"website\"));\n            $fuser = new User($db);\n            $arrayofblogs = $websitepage->fetchAll($website->id, \'DESC\', \'date_creation\', 5, 0, array(\'type_container\'=>\'blogpost\', \'status\'=>1, \'lang\'=>\'null,\'.$websitepage->lang));  // , \'keywords\'=>$keyword\n            if (is_numeric($arrayofblogs) && $arrayofblogs < 0)\n            {\n                print \'<div class=\"error\">\'.$weblangs->trans($websitepage->error).\'</div>\';\n            }\n            elseif (is_array($arrayofblogs) && ! empty($arrayofblogs))\n            {\n                foreach($arrayofblogs as $blog)\n                {\n                    print \'<div class=\"row justify-content-sm-center row-40\">\';\n                    print \'<div class=\"container blog-box centpercent\" style=\"padding: 20px; transition: .3s all ease;\">\';\n                                print \'<a href=\"\'.$blog->pageurl.\'.php\">\';\n                                print \'<div class=\"post-boxed-img-wrap\"><img src=\"\'.($blog->image ? \'viewimage.php?modulepart=medias&file=\'.$blog->image : \'medias/image/\'.$website->ref.\'/calendar.svg\"\').\'\" alt=\"\" width=\"120\"></div>\';\n                                print \'<div class=\"post-boxed-caption\">\';\n                                print \'<div class=\"post-boxed-title font-weight-bold\">\'.$blog->title.\'</div>\';\n                                print \'<ul class=\"list-inline list-inline-dashed text-uppercase\">\';\n                                print \'<li>\'.dol_print_date($blog->date_creation, \'daytext\', \'tzserver\', $weblangs).\'</li>\';\n                                $fuser->fetch($blog->fk_user_creat);\n                                print \'<li><span>by<span> <span class=\"text-primary\">\'.($fuser->firstname?$fuser->firstname:$fuser->login).\'</span></span></li>\';\n                                print \'</ul>\';\n                                print \'</div>\';\n                                //includeContainer($blog->pageurl);\n                                print \'<span class=\"nohover\">\'.$blog->description.\'</span>\';\n                                print \'</a>\';\n                    print \'</div>\';\n                    print \'</div>\';\n                }\n            }\n            else\n            {\n                    print \'<div class=\"row justify-content-sm-center row-40\">\';\n                    print \'<div class=\"container blog-box centpercent\" style=\"padding: 20px; transition: .3s all ease;\">\';\n                    //print $weblangs->trans(\"NoArticlesFoundForTheKeyword\", $keyword);\n                    print $weblangs->trans(\"NoArticlesFound\");\n                    print \'</div>\';\n                    print \'</div>\';\n                \n            }\n            ?>\n            </div>\n        </section>\n\n	</div>\n\n\n\n	<!-- Footer -->\n	<?php includeContainer(\'footer\'); ?>\n	\n	\n</div>\n\n',1,'2019-08-15 00:03:43',NULL,'2020-05-14 16:48:34',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(23,4,'home','','My personal blog','Home page or my personal Blog','My personal blog','<!-- Wrapper -->\n<div id=\"wrapper\">\n\n	<!-- Header -->\n		<header id=\"header\">\n			<section id=\"sectionheader\" contenteditable=\"true\">\n			<h1>David Doe</h1>\n			<p>Welcome on my website<br />\n			</p>\n			</section>\n		</header>\n\n	<!-- Nav -->\n    <?php includeContainer(\'menu\'); ?>\n\n	<!-- Main -->\n		<div id=\"main\">\n\n			<!-- Introduction -->\n				<section id=\"sectionintro\" class=\"main\" contenteditable=\"true\">\n					<div class=\"spotlight\">\n						<div class=\"content\">\n							<header class=\"major\">\n								<h2>Ipsum sed adipiscing</h2>\n							</header>\n							<p>Sed lorem ipsum dolor sit amet nullam consequat feugiat consequat magna\n							adipiscing magna etiam amet veroeros. Lorem ipsum dolor tempus sit cursus.\n							Tempus nisl et nullam lorem ipsum dolor sit amet aliquam.</p>\n							<ul class=\"actions\">\n								<li><a href=\"generic.php\" class=\"buttonwebsite\">Learn More</a></li>\n							</ul>\n						</div>\n						<span class=\"image\"><img class=\"logowebsite\" src=\"medias/image/template-stellar/daviddoe.png\" alt=\"\" /></span>\n					</div>\n				</section>\n\n			<!-- First Section -->\n				<section id=\"sectionfirst\" id=\"first\" class=\"main special\" contenteditable=\"true\">\n					<header class=\"major\">\n						<h2>Magna veroeros</h2>\n					</header>\n					<ul class=\"features\">\n						<li>\n							<span class=\"icon solid major style1 fa-code\"><!-- keep this comment --></span>\n							<h3>Ipsum consequat</h3>\n							<p>Sed lorem amet ipsum dolor et amet nullam consequat a feugiat consequat tempus veroeros sed consequat.</p>\n						</li>\n						<li>\n							<span class=\"icon major style3 fa-copy\"><!-- keep this comment  --></span>\n							<h3>Amed sed feugiat</h3>\n							<p>Sed lorem amet ipsum dolor et amet nullam consequat a feugiat consequat tempus veroeros sed consequat.</p>\n						</li>\n						<li>\n							<span class=\"icon major style5 fa-at\"><!-- keep this comment  --></span>\n							<h3>Dolor nullam</h3>\n							<p>Sed lorem amet ipsum dolor et amet nullam consequat a feugiat consequat tempus veroeros sed consequat.</p>\n						</li>\n					</ul>\n					<footer class=\"major\">\n						<ul class=\"actions special\">\n							<li><a href=\"generic.php\" class=\"buttonwebsite\">Learn More</a></li>\n						</ul>\n					</footer>\n				</section>\n\n			<!-- Second Section -->\n				<section id=\"sectionsecond\" class=\"main special\" contenteditable=\"true\">\n					<header class=\"major\">\n						<h2>Ipsum consequat</h2>\n						<p>Donec imperdiet consequat consequat. Suspendisse feugiat congue<br />\n						posuere. Nulla massa urna, fermentum eget quam aliquet.</p>\n					</header>\n					<ul class=\"statistics\">\n						<li class=\"style1\">\n							<span class=\"icon solid fa-code-branch\"><!-- keep this comment  --></span>\n							<strong>5,120</strong> Etiam\n						</li>\n						<li class=\"style2\">\n							<span class=\"icon fa-folder-open\"><!-- keep this comment  --></span>\n							<strong>8,192</strong> Magna\n						</li>\n						<li class=\"style3\">\n							<span class=\"icon solid fa-signal\"><!-- keep this comment  --></span>\n							<strong>2,048</strong> Tempus\n						</li>\n						<li class=\"style4\">\n							<span class=\"icon solid fa-laptop\"><!-- keep this comment  --></span>\n							<strong>4,096</strong> Aliquam\n						</li>\n						<li class=\"style5\">\n							<span class=\"icon fa-gem\"><!-- keep this comment  --></span>\n							<strong>1,024</strong> Nullam\n						</li>\n					</ul>\n					<p class=\"content\">Nam elementum nisl et mi a commodo porttitor. Morbi sit amet nisl eu arcu faucibus hendrerit vel a risus. Nam a orci mi, elementum ac arcu sit amet, fermentum pellentesque et purus. Integer maximus varius lorem, sed convallis diam accumsan sed. Etiam porttitor placerat sapien, sed eleifend a enim pulvinar faucibus semper quis ut arcu. Ut non nisl a mollis est efficitur vestibulum. Integer eget purus nec nulla mattis et accumsan ut magna libero. Morbi auctor iaculis porttitor. Sed ut magna ac risus et hendrerit scelerisque. Praesent eleifend lacus in lectus aliquam porta. Cras eu ornare dui curabitur lacinia.</p>\n					<footer class=\"major\">\n						<ul class=\"actions special\">\n							<li><a href=\"generic.php\" class=\"buttonwebsite\">Learn More</a></li>\n						</ul>\n					</footer>\n				</section>\n\n			<!-- Get Started -->\n				<section id=\"sectioncta\" class=\"main special\" contenteditable=\"true\">\n					<header class=\"major\">\n						<h2>Congue imperdiet</h2>\n						<p>Donec imperdiet consequat consequat. Suspendisse feugiat congue<br />\n						posuere. Nulla massa urna, fermentum eget quam aliquet.</p>\n					</header>\n					<footer class=\"major\">\n						<ul class=\"actions special\">\n							<li><a href=\"generic.php\" class=\"buttonwebsite primary\">Get Started</a></li>\n							<li><a href=\"generic.php\" class=\"buttonwebsite\">Learn More</a></li>\n						</ul>\n					</footer>\n				</section>\n\n		</div>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n\n',1,'2019-08-15 00:03:43',NULL,'2020-11-26 10:30:41',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(24,4,'menu','','Menu','Menu common to all pages','','<nav id=\"nav\">\n	<ul>\n		<li><a href=\"home.php\">Introduction</a></li>\n		<li><a href=\"home.php#sectionfirst\">Section on home page</a></li>\n		<li><a href=\"home.php#sectionsecond\">Another section on home page</a></li>\n		<li><a href=\"generic.php\">Another page</a></li>\n	</ul>\n</nav>\n',1,'2019-08-15 00:03:43',NULL,'2020-02-21 09:27:17',NULL,NULL,'menu','fr',NULL,'','',NULL,'','',0,NULL,NULL),(25,4,'this-is-a-blog-post','','This is a Blog post','This is a full meta description of the article','blog','<!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable=\"true\" if you want to use the inline editor for the content  -->\n<section id=\"mysection1\" contenteditable=\"true\" style=\"background: #fff; color: #000;\">\n    This is a blog post article...\n</section>\n',1,'2019-08-17 17:18:45',NULL,'2020-05-14 16:54:52',NULL,NULL,'blogpost','',NULL,'','',NULL,'','webmaster',0,NULL,NULL);
 /*!40000 ALTER TABLE `llx_website_page` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -13668,4 +15837,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-06-12 19:29:55
+-- Dump completed on 2020-12-10 13:37:32
diff --git a/htdocs/install/doctemplates/websites/website_template-corporate.zip b/htdocs/install/doctemplates/websites/website_template-corporate.zip
index 88de0dc565faed16e8115fcc2e5f40964b9f4ccf..473d7377fc2ba876562a4c90f831c8ff5ca1cb6b 100644
GIT binary patch
delta 61192
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%0A6>Lk$ClMi#q!slY4&9G+Lo3W4$9XawT<=>
zf!y<)eW&3>AdG-MSF=ksKa+*pEBns=p-9`y+2JY=cN99nSkrfhzzwUb-R0J)0&_&&
zmTjPZ29Lfy#%)7JkaqDw!Lm7T6nDPdJd@`%9QQ5Y_mH^XowO+yzO|4JA_Lp=w-r@%
zV;mZ6OieiRVPUy)ktats+^VN*ykxf&{5GrZcI$iT5}r86xO~g;!&d9oL)A3Dh=<}A
z)91eP1jK7V=O0MiutDX6*>qanyOxYDTN7iI=iUb|Ioi{Q`<oHLgu@wV?x-0%r33x;
zXe~S;dYODprt}qeHkShujo>l3xn>#nKDyVLjw`cs=Xt>YvXV0f8Z6wtq(e}I|B4?t
z7y$q8zFn5aKY6I`KX|C@KX@n{dY~=0B%1sE45e6nHBqxrZc)RKC@On=#2&)?CGROk
zoDCJW88NeGXG-X!w1PrJA;?xJ((O-7tgHLErM?UV28<<-&^3cG^h0_PD)?zE4MVO>
zke~j6T6rz<6PmT`)gBQ8B;0550ZebLPkcxNW4)tYA*rL>!!hsYUVeVhp4U5fr>9<i
z_iJzCg#8LX`V3>9pLY-Axk9d{w-+)}wt0v!@z54w0WCGt)tEo+`y=NVonIAD-FD7R
zuB3N=rl9Z=VFLE9k%tY?Y>!uPRB($%Zb!*3R}%V=_WI!R{EJYvI)hbfvG;_g(e)_#
zdiY)+O#K|u^!4;NJ(`JN!u`fm{Ps9w7o-1tQm&2j8=_1oT2eN#X2O44c-vhU#gI1(
zw9IcnS5B@0hjX4l{zmU>S*?<pRfO+cwGEYYm^R8SvjCW{nTDE!XAh({RL(=JRIXXi
zsY=eY&})Ud@HG%4T`C-2SOfcR;pSg-E%ZA4v9Bam1^%WUIo9x{4$?H9O5X4dhmvWA
zvteZLKX}Jv2up6DEMI9-2}M2f3Ae1`gHE><zqZmEB_@t+j-FQJ>27_)sUX~?;=~s!
zLnft#(gu{XL@3foW0JIZ|DpxB&g0*lW-CU~#&^!>?tAAm%2YE;jD3@mxX@L^WTx49
z%Hq5cznHD%rIfTfd(D^{j>JP$7`=BOl5^(aP@CL~IecWdUtpExZ#lU5Gy21D*r}Ve
zR<%e`Qhw&#a{QL}cPf;+x0Mj7BZj7*%#~fzs2t!1_n_JQJx&MhNr~djdMQ|pu*ft@
z(Q+2-PjyXSBc_AiuE%W69fw#Fv4B>olzw5N5@7Zhg4G)~1sG44oiOHiCd)Mwy6}Z1
z{-E6@hA<wFToX}o`xX8Q7?-+J?S`_SXl^dP?awzjvM~8UN$5Dw+yz|j=s$Q?e+&C;
zOVa^LP9aM;OI(R+S24GB^p7}1ITzHeA17z?p+@m0J~f6+7-_xTnYiarlgq*`$}`}L
z{pPHrt|XlMD4m%@4loH-nwgQ(!eos4Q&sGi{%FElRq`RyH&{GTbE*`p#zIZ45<3>O
zzpdM`XRO9P`_frGg|UIWuo2cUx{F&*TVMjDMyeT2kiNF}GY2b}STJ-9trq!M$5#WG
zk5^dOVJKvb!P6C%d_vcMDB|hox^Tv0+#yg>ZH!tJY1go<m72C`!=y#$X&3KLyVtSO
zmKrvHesgvmMiAg+7&~gj9-vl9$UYBTR2!!m--w<#E`EFpBN6JBzr)^)8C`}*rf&!6
z$fS?g>2Mpv7s(RvlKo^l&>;Ug_u41uY8j+-Tb%Ssj#<u9a=pEQX}xzDBQW$y=^EE6
z(H8mUd1g0w+TBh!gB8B2Nwf`gmag+(i?6qAa$Pelspnt`Ep-20WQW-?GGd^9vdT}$
zPqvU!vD+gh8=x^UYZ8nj6+~H(MneN=N7>28)t#j-cvV5jD|8bs>lp39=#}+SR@O#l
zozfm@Mc}U09?rVOR%u44L|Ksgw9JJ~{t>xObv(_r*H&PTh!~HA>@L~$-M<PhvAl)C
z)p!<Z(}l+Tux5jDq>H$5eG9Evh^iHGsCgc7lz?9#%R!pA8NI0ZQDl$NDrf}I;pTRx
zXH1v?Vk2fb{_*!<Td`y?>Uv%_m&STHlf;7gLcYnSLUjKR?WR@rls-?^iw%bl&g@0=
z!+Eazoe{VmOkNJI1r>*xG48`;)VFlz^LgMW`Cl!eSYNNzYNb%Q1sbm%TvSiGC}oqj
zmASP8Z+<8S8NI|+<}X^Owg)8rwt2}P@d^2#wC*@2BbeYz9~43QdX`f_zfSG|{>9{~
zz8>N|4)_nBXAHhQ2dQ79@-^5@Y*LZcQ|COoYa(lF0ycqp%d(Y=&3saJ=?ITo5@T+g
zff#GBjY*a_C{l4q2RmAE=*SRP15YCrcuzMcGQbUdDs60^{vnHg_Cvk_d2D_CjbKA}
z5F=QEN!W&Cwg||a9aTW#@_B!=1$qckjX>;x!%V%KJqe{_jAP0By`PWg>+@;oZAZuJ
z^~UsGha1*rPv|@D-b6*H&g^mj&nnJKSi5*^xP;zsq*{l?fsA6b#%GOzZb+NK7~3`H
zuaO-Uj7U3E&-bnGyf~~+Ocq^APZBifAuO@TJk}QGxzVr~n4<u>lJi$Yo9Fhg>j{)v
zOZMivc&go_WI6RqgpJ)R@SBq0d}^b6kcIIh*ex8*`3C(HYmqfedl{iu7Y`48_Rw*v
z*o8)@^PabsddA&<n(K6)NvZNUbkpSBXGm*?Ia3}~cg`BwWo46v$8T3g2i6<FoRU9q
z43+u1zGLijK?eXJB4J>bn1m+B3MUI7_6!v*n?rDL5taIr#942oSxvXRqq&%i4Hln|
z;;_cn4eV02(2s@Q*>2#wQ+vHwH3L+!k=dx5PsOw2(Jb%Mi$;xoPWn`f%Q7!Zf52s8
zDW|aqwuQ;DL|ki$j;@O!i84fO)6Aiipz`0mZc@Uledq$pJ$$#as&pwA(LcDod6Ah<
zCByr_rCmbTbMe>mV+T&|C@Z@<6m9Rmbhkua4zS<<8uve99#rLtlfpu;=u6uTAwCR<
zSSLR=p*^B8;VTiJviQlQT#UOvPb11g=h1zv6&!pken{g=VWG+qmyRgtPp(j)jF*--
z8<btVk9-A?iU<-fKdv?EzVZc7J>eWm+DSEGzOeKb824O0t_+sD+wh+x5T{Nb`RQ6e
zDNnU`z*KEzYrddd<K8$H0Z0F!Dh;TdHO^xzCmKbpB6kVqQS;6aDz_@+G7)%A=^&v7
z&&6S}fqg1Xth;4F+P`kvw{iZmub$gvfzt3yOlAfIh~x+9u5Se%h#Ew(sXwjKE6>C1
zT77v%652XX4XZ0k2S3EagV^H<XJQDK5i9T_C(9ikJ+J55zXI<5>L|7^qdA@wxxKoY
zB?GyrHio`ltsn5oyo!CQW0Q+A;*jlN`jo2?!agXg$1!Aex1qNYy`3Q)VADS%L-v!g
zX<YzY4E#oRN|$f;Bv8C1^=N@rY2r*$rg!_KmI#6A<W<)acm{fH^NI;W<y63Pk_1O7
zX>7PJs|W{83QcH`Y?{G}zkDjux{D;x%a-48zduSTl=)OZT=;N2DLs3o*jz?gi?SmE
z7(kn?Qc^D85mB_^TG!J14$oc(b{*|pq7R6SdeC`@a9wX^T8O8O+s^yI8QyJk^pfj*
z7M>RKkC?(>JpQrlWD+M<#NjSxYv@@WE>Mr=Fp;S2iSPab`Pb_<)W_{I=stFcq9_BC
zYG(S*!1%JO1E@L!TJwWRK2Bh7HWXrro|)<@Pay*#%&?#&Ek8qaQkO+OSJkp4O9{Zx
zikL~w<Z@J3&4Sy(W@Ld;IVr4n$Ts*kVq|vP6;d*k1A#SWuDX^@^pGXinGU-Kl|iZG
zyy$($!Jd>kK*rpZ%Am;_@4A>dDF8grQcfN^JN|Y?n^jlv0a_u)>;7>&xY(?d+)PWF
zZmxP75s_fJFqp1fq<`=e4p%SH))-)JI*DL^(`$7-YK`8qIg)xaGztVBz$g?U{H6E=
zHybqRm_J!Po1b!ABOP>QyG0boP}GD*bv<72$MPQX4${ewmT+pe+B7xqsb&j7b8WwD
zSy)wkMRG?DZH{pjX`+JvhOqMK!=DE?od+DdVY!(UJGCR{#lmb)w1M*7-Uo0dxGfuT
zVKgZ3sCSETRE$(~W$@5Cl6B#tL2k@RU`%zo=g8FT;J)z6Xp*YgJs<XhUbd>YNY4?~
zZ^tpg<*R;n2rXptVX*ElN1%sQ5~50X$+fMwuObFwY`TqI$Or>nDO$lCgEx7&mW!3s
z7YrIA{IfDk+|=i4?J0K;CHSkxU|)0#V+(N7YYzqGwj|Yq5*Mh&ve(SpML(32-fb--
zW?d>Rk@(zWkNd9wm@jPo`yZvH?*|b&DB3>)HhTs_?EhLG#RLIK=^7=*0=UNf$I_^>
z_W!?2qtbWG{~wn|JA&#c>i)43n=&m#MEIX8u*#A7(cdt=qN5k;Mykxo(_6JrJ~ye2
zNS3EqZV7pH3XNI*7#@HZ9KpfSxX*-jC<YMXp!1oMpW+zPTiXB$IPRUgR#UvIu5e0p
z)MxOd=oz(B`!kq*!)(U_8KAb}C7me&mORQ<<l<SlfZpHJQbYrMfQ-MTPt}}^QRD4j
zon7pZI({|9+rOXJK2?^-H`=E3SJd3D!uQ&)^4NZeH>74z{l~Ye6(&jq{hxz_2YY`J
z<X}KRKEBRL{x_TO|7><NX#(xmMln9RydoNeYvVCVP0cg%Ybl^(&TUl5n+<t8s8@xt
z<H;<I;s>&Dv<)MDQv_skDz|XrISyoSp{x8w_a`%7-5CZ>fJS;VCc^geet_(p+2@Yi
z&B*AeN~arb^{>=YTBIx@R^;CEkP-7LRa0T!B&-I)T41o|SdsLBh3I37S>({#^J~J8
zQO}6WmP){ZF6BVq$i!Eb_~R{SC>B-<71oza2QPj%fOPj1p0M}4fFmDuoYQrwkKSK}
zrq#+mMZIWx5pv@kcPfeq4M^xq)u*=#0TAdC>P=49V1D&D%0mI59R(R5y|-|lb;_c2
zkNJ|>&K$hu7Sn>`g3;}`zKKkqxp|9vv-Pf0<D2yJSPCbNkaTh`U%vk#<XealwJMaP
zm2Q$WnO#GLG{zkHx{LTDGgJRN!=FFZ{e9$%;_}KEa=1Og9(Epn1OQtZ_mapM%te^J
zkb-x@Mjmed!_rw`;HJxYeWG$)jhS!SqbKP2?g&lFc%XBEov7~LHhHzm!YujI`%Sh4
zdBsl5VQEfaiXF~d*%m`h79E)Sz1d={>xIb$m<C3@!qi&j<-R$m;mT`^tQ8@fWgFA5
znQsBvxlO3@LHHYAF`!6ZrOVUdO?*r)FB*t!qq@7;Ai7zq3H4zrORFIt&Q@CoLhL?}
z^}&I+?NcB(o3z%RZ=uUvoD)0ENJzc?e)~-e*ar;}-dLv;til68T#-JU{Z=9udW;=P
zW(a@&fqoIhD>OI~ijUC2nP$V0!DJ~Pv|1^Sq-N>%$fc$>3)ty=Ef+YW12?zLnC}y^
zJRn7D)0PJQj#R}?;>DF!N&1-(cT%}^@nC7Y@3ffH2)9F3;T%HEN)+_obMWr_vN3S;
zN}TISSYk>#=IoRn!@w90_YD$Me*L<oTDnM2#*->fAJ*79?Hwq-qE*!swUo|-VM~Pi
zItXIx08_uZ4j5^Ca@GjvaWRpD&&wH%F2yoP<pdh=lwn<5d%555@H^&9iO3YNa`8;K
zY#RCiE%dcVr^k7C?{EMfuA1iFJ#u$aKh87*UH??1dymHYCUP%GeyC%<BIV!oLP5!O
zAQ$m;KP2B3Clu#1UF&ev`d7<Rmmgy`M0<?8DDVE31)%rp@siC_=g_9zKj(2nI~4b?
zR<T=UYbE5CvQk^zCb9A<ael|i=|kQ4xVQV<>!Ac`s*;cd_lGhG30&>&8+|QU!q3sh
zasKck$S_Z;`^6EsjEhnP&!pmZ;HI{!T+(64S^k@H8Cz*P1-n3KQaA36@MKbb->pop
zS>l5^7ytlBhwws5o4yhyK6ppm!^NXA_YM%Ao45gF9tvh{%aQLdWQYw;qB|E1zb{yw
zKO7$*2A!*r?*fyA80En(qxfm%c<@cGf@{%w*c?-FH5Wjl;Y{%q5_s!_zdN&qT&dI<
zg}Og!-6PdT-bb@NvIDdqi7{Q1x)f^VP+R)^0Q>6?QU#oMWsUORD{^g}IjqTUvG0AQ
zEPqq<T`*j$w8Of&XXmaK-(GK3;#_^ynWzq?j_1mS*jXZPV0)2Jk+Cr^$7aSu9Y8K;
z9TCBy!Yll$R|t2=ca@!?pME*-^L`DN6=Mfp5~no3s06cUguO{^P$_=ExbrpL4-OYh
z0AlGkbymHC>s=$993v)$UTfUl-{O4qt)fet32w>;?L=HYT@pyrnCOzA<*~f)V5M$?
zD}ntE+Vk*CYm0qYW!fZ;cvmEl7VUnXzh);fdd=BIXoC-_>q!;9$?^E__=L#~8DFc}
z01A7KXBDF<6A2gMeue)mb&>r#`Qaq11hCAjZt_d+^(l^W)#o^K^ozTj?LaU!mL-*f
zmk-o6W|OOn`!ybWQGDalgRifIC@91FWpjAVAQ=pqeRnQ*k%|*tN+h>yf;+LQI!lfT
z2o;69ZF82Ol}lp@dUp9pdYDep*CavrRyv?F3O&Z(15u3+DH&%@#}d`j14`O`2Uu5p
z3WjUbn6KQ7^D3tXEhIM5=g9`F$P{JS4tU&@d`o7-EReY|BPoXu8~9aZkIuOw6Z#iy
z2?I0Kl0CQrcu{eq-WOtqF7RbCVRANMtWpW^#?}yGue{No{<;HJZR%3^OnPXDmQJiG
z84#=PqxT1UYeiM4$jz>sqn7`|0%Q-h2@NfsnFf-897`@VRhpK*i4QEfp$mX_ot?ZE
zG-@Q8yNCUhHs*WcqjfA}+FX#+^{42N*vLbHPU-8TT|i+#f+j*dDv5kPS!;l7*o)h)
zQ1e#DeAyQ;3)KTd;WMj)vEMGMuiZ*sJi}gNy0u(Uha*bKONxj3$w1Yb0RYd3amu--
z<Rby#ddPeD4YfiKqOyi}a+Cj^quWpDL_DEapxa08(fkQk?Vov-*6rO~z&H_h4MKba
z@*=m%4>bDbjxJ76f^yW=)56kkt05mf9%42<0esgCwTuSS8lk3>cEJEh<B~(0{qmSn
z;_`9cZ;3PQZr5BPys<Mz1cc%D-(9m5s=RyfLlbp}B(_DoJH!;a>ngO|1<6hg6<JOE
zzE|IY&9Tu$*NKw}b#jSD)s$j=c%?le&EYrzF?S&WUZa_2X8FgPqX(VNI(CWl$tz+T
zrKs;Dvo-^@flTQUhlfjDXWBoBM6efrlv*FSkRtNf8Dqz;$fvEL0><&$XjL3FEO%V6
z0p9#nsXb~Dr`3uTclWiQP@<<rx10Q&*mS3V_W{3TWS64GA88qX%#D1@Y9ZGFrPT@?
z7OxCd4Hi6b3cuKA^scI4B1jVF7OfNn1<}~b1}^T9O$t8pt>JCd#<`F?O)1Jqs3t0v
zJNQ3pj%TNBKUUrl1EQ`?Fos!%-#RKPZe?(9kiZBs%0b#C2nY8%AXlkdiYMGd8GpXV
z8Cmvj9{D5m2;o6kp4*ajZ#YDFc17^`xXSdPh+A&2pEmA?t$unN-V#6%>bKjAOyk@B
zvd0nlZsTvJ9SibZh41C$*N}|~zv%is!j{TuS?$aR+Ft;W5wN$$1F89S(y_@{?7YwH
zW6)(Mr+2`hklrPm>D1>rzMQoa43ke^!06!&rr`6P5pWjC8QC!*>fPh9J168zWg$Q?
zFR_+`sPbXZpTms!G!Q;9`=B%PaO9DK@hvF^lkNm_N^KCa4_5}2^9Vb^;Ll}iz?(Jz
zpPP<gb>z3y2>JXYk?U~d>uDd>&i~F|DP~l<{SSmrQ4;+}=>FgHR?1p5|Ci;hf>YA#
z|2fSMF`^&;YZ^`3|I4Nke)&B4ClQbpC&K&BX=Y&~I7l^***Vll2wSq_EOyPr-n<LK
zf(<w)CcV#W;$ps{V@XI+*^FP&F(I;xujrV`KcZu$=23N(bye=m^Aq=0KQEg4%`@$^
zgzU-dIxP%g?T7D3nkkUlv3+Dnr_$bvP9)3XuwAX*Kt%+oeBl9~w&Df59h;qB(J}qS
z@UP_9b60wR$f5nGf+3yz5r?;_#!4Sm%u#>n>>Ku!kzMw`6M+aNWzO9Ff3zT&MgMpF
z&-^b@@SOkLX^ktshf2YJ=TQ8nibhL5Q_5z78!)2e)|s&^u;#o{@g-!53Zo8__aWz+
zPR*;zZP2aPRJ3~sdY5~~1EB=N6HAdMoZ{s&)9WOWE!c3QKYAsMKTX$TrMl$xn?788
zg#Y+)dEa^T^2F1*4TVf0Cei1UR5Y*E#7?iBNAvf06pr_6B2;J%r#@(=K-(Ax%2Kkg
z0nRx`>~+o`Hp%F})>}!qjr^K!_QZhqCu@5ep+`qpRkr}^EDerP_pP`a{Hmpql#<`Z
zfp0g*86(VUzBxnX3h9GrmWAbKl!!so<w;(q34C^VzW^1w_*q0bdd&)mTTQfp(0+!M
zP47Foet|+hLt7NjC{^bfeblmew|*mWfLfDsg{48kG@eO{DzR;WI!u`=ecAPB1?WAk
zcdVZnZ1y)Xi{DJANK(Y5({B>N<+;q~OC=INx~;Qxo2L~N7_F1qsZiCCJWA|N)C0}o
zoZITP+L#&g=aM5R%iHT7ztvi0bq?!OFd`A2KdNE>{w3a3JU|MK2BP((qzier4S+_e
ze{c8nYb0V33tuV;Hz_|UEC&j>*Y9^L*F_%daS|wqMu?584Wx1pcC!-<*{Ko$*YH4@
znI!oG1AG=-Q2(MxA4=bhnsa6p(gg^@7uWxE<_HtZcY=gk*LW|Uu5KIAeXp1D7{n;?
zr{jl}T`sld7GvsN1CM)p_9`i#1tgA|3ckpi-lW~364Ei`>n=XhUyVCGY7U~7i^fm9
zY76Gfk&{GIHC3%9ul1d&k=LzPEkOqgO|@`ak)GJf8XNRn?56JdAvzTpvH(e91{m?O
zE`(^ccneW3S;`C)<G6O>NR!@wNobH83eAmm^AzUP+Rc@j!!+d-hW%bb26z-5zDew#
z#r<Rl_yXJaxo!gH%|%6&1Mu~9krN>XT}ei;yHy8%jR_d<;mRscC7|~8G>&p0d`tr2
z;?d;16$?au1L+%tnCI46=sz+g`tPvg!l9EsL~F{VeubQv5u7c_^+Qw=F>G~Fa2aU|
zw}*f8pE0D)$KOWDV=kMr1GK8vmxo^L9OU6N%X1h3<-afCN{;jy<$iS;f_e_wPE`af
zXPhRLaS+d$z+?$}XtYzrJ^<C(40bq|zgj~ksj^6Lt}CmugZdRn&~CYzT1dnte&O%?
z&GkWNAf>YADr3%u`HIV~3&h}3pWOoK>54^A>pt%SiyAHGQLcC)0ZDPHbj2h|2pd<z
z;p>5R38;z!5Hrfg);*GkJCchQYvx&&Y^AmSjcCNv6qbZle8Wz?#>uVvAy{=VEZZMX
z=joK00oyje<)_af&?SFpA&<sg<y?Pv2vfjt1t-}po-6V<;Rr6CN&JPF@#oK<#bmkp
zU-U5?!J(EQ8%MNpUVwL+I~hDCNelQMh|m<EAyCNfL@46GlDvZy#y#9mbXno;R2@E_
z_Z562x5u%t09ev1a8)bQEZnA1+R^AHR|R&W3(N1sZxtth`ilWBPouOFm|ad+E9W92
z#2=9VtHcZ1Voj!3@oMd=Wl5r5yeVh*>rnL`esxH_%q)4SIzSyN3O_ZF=6M=q7Hx@s
zg-l!IJbpN`D(lHC9<hOD$7|jqZ47LPlx&k`Ok*-F4D^{MDZ)L}u6WQi_1;<QWGo$w
z^KL^ta9d@@8Bd2*8e_uJ4)@M+A2@>UISI~-RtwXIDfvr-uNN*z1zMG@kthgGM(|Jn
zvOtVq6wHti3_#>BO8`Zbb%LWuY82X*Z*k~YG6W2xF)jwOvM*wxFGY~53AHkENErl+
zG|V{2%^w?00&R|#g^JuK7ju~y(F2zT^95-3;b3uBuDfx#_=46;angRGV{Sr!w;+@t
z<t=WH>E3V1OI(LW%mz}N2w~_#5gt;t!>F~kfhcO&GXM(xEb25&$)o^vysn1gi;b1P
z1hNvYrD46F44Padav|hFe?j5t;t^B!NYYn`y`DVAmq8^Cg9~Rgy_ibWSbt1CDW>bj
zYbG})=0@d?T#{0n;`$GDo1t(+y(C3Qyt|;aMxVc8B*rOTY?$u5D@hD{*Yxg6T=s&C
zz`&C&Km&AQDK%u%rgP-!F>yT^QLoV(e}O;<8z>M37nDE}jSDgVCdQbl8#SRkh6j7&
z6)hn)+vW+#GdgK@lk$B0&?6@Q6e`?t5e|2_LPdett`I~Tm>K8}37H-{dVx8wnwp#%
zTuDwgh1xNli8*fK=ovYK8P)05EkvTP8HDMe90HK%$hiDJyuD>moQs$Bi@UqKyE_DT
z3vR)KyL$(B2u^T!cXxMp3r=u?>)SbJ=AAkJJ5zP5=HB_%pQw78s$Toqd#&Hne}x4P
z^X91=7R!_S`DyvI-Wr1y_VNys%4XYQ8K*M$03)GNoj$*DnI}%!BbaT-Q%nh~qw{Sd
z`_pse519&WS%QGyE)~#%mS`^F_e0uIEG6->Tc{P^6>i|8y!|Wc<lZ$rDZ#qyw0WVh
zqrH>56AVU&w(_qb0^EuKj4Izow88x9iYZ{u(jo1rm0{R6r>?~_F=3mbUChHXD!Yoh
zzMaiGhd_|D04ICo{jIbU(mbj_1dU>mYx9EXn)MAP<N#iQh;yf0BMNVjP!2a&<S3PA
z3)qRp*QO1yud%HtG%Tpd-exobXMwfHsiWD!LvnrE*qn9>`VScZZ8rNlS$5dZc80gv
zISZU~m>me3tay0WUKX6tF3`Pd<ffz_V>eEC>=~A{`Kv)O1FbOm?-Yo_KPeGR!yyJr
zmaI7ZKfq~06snP<#zgKHWfM0tB_5Z1O<9%kg*M?Mb3yy^vwqgd)ok*4I#*dMv?@(m
zrQE`4ML>w^p_ah_+P3r7AyGBTeJ`T!R%<@zTwfN59O?6n!t=m@z=FYZNWnbAQV3JE
zJS%g;u5iMCFQ$-&T`km!^mUpNB{lP*Xt?eP3^1c;0m-%HSUqC>Ifrw>0YwYlH=*bl
zsW-}o{_YPem#R!5cqQz&G|-97Re`M+-_L}{j-68wW(r#c`0#ZK@t$rN9Li73^|sJp
zg^l(B({BBtN1?VC-Niw-f`{9#LGy0GLBTS#k|w?_KhD!laDyezOamu49h$*>XZ0(u
zF^);8U`{;sYjKPKm}(E9!=n3Lnjl_DW|o}bw3fggWr)+dTSppLVNa$+({F`J<ppR7
z$vW9A+i0RdK-P<KU&OgR_A}z9kOl8b_p!MvXcj+9e+_ui+rUJm^LKKLt5r8tCzHBX
zGg!|<7k19P-(ql6fp|Jf)FuZhAl;w88B93{f3D=mgfnmhPYo!zU!m$zL{T-QLvh5A
ziKkMIzS!%-cxXnC;yO`*=xL_O@u7PmA&8D;krLMS1l+q+iGvxBq7)}Ga^pCyr}QyY
zI?q@z5R~9zC^)iF&Fm7rxl5wkA~Z@iw7;pHt)=Tx!QAB?nLLq#m@l?kblMVriO-)W
zR$?mu=m6af7AL$pe7z-fw7Nu!Ra&byXq=wXwU7DGaaP%(WjkiC+31~CEd_%?G>;X4
zYS$0+2AsKX1R~QO_tI(9fM$yy6`zTv&{l7UKp38u(Sq|%WPwf`5s7E^#h=QjRhG}Y
z7|=cqx+Y=}K@-p1C$YA{#7Z~TKAG+jxArrk*AxnS5a9CPOf9Jzi6-v#f#Iowp3-4_
z<U<H1LC`uEBxOCFL!A}bXbeoHeDk@GV1ka60>r3}Qz`cbs0ANTZRha_c6WHhG=@3p
zhgvu}3mzq2LeATiNY5L2TW1&^gV3^HlkPoTAFb|x0#z`|8q*LtYS5ql)k>zmc9iwy
z=ykBA;~`C9Bt(GCyTh$HTVOt+3_Hp)VepVCGedugf{k{N*p@h#7<9<4VT5eXGnq3a
z3*h^yPW2lLkHqzxqEI3Ew_!19JyWzKM{cr%&pE}W{^heyy|$`vs90`azmd}$%;%ig
zM2E{K5Y6DStSt_GM0xsA$cKt3s^BjUkaNrqiKo%TZ!eoX%k7yp5Ahi48opUL?Cc+9
ze9hF`<Y6#h;?XXjvU!M`U}9bDh`Z*k&H{|K9Wrw%CgS7ALh9o1dM7`Xc)N0ZiW%D7
zwQ`CUowxh!OqE{158ob|Gq9jf699@KP)WtvKc);Ayo=<D6;5yjmVQ#r&Z{$?t!syw
zMON|uaDPkG3Vr#Z9g<{cl0IQxR~VMdqw~10AuJ1eu({KE8qh4N_(E(yrCZtPUjXRb
zP|I7!-YK(40aNS5Kt&YxOv0U^S6}+-;&dWiL`tXeYI9X{fo5sJ&<3lkd+wFx@}pN5
zjxqKYCnF!SK6#+GCi>)@dV8I!Z<}KXlKHW{FdOhO{lQ-Cmbe_w#0yZGBgj}<VWibc
zvL;u6Vli3iw;lsu$e?)1(<F3b#|Au+zv(7Twb|gADlEJ^<5?c?*;n_8eg`!G+J$?D
z)5p#N=oLxNmM>u*j5#1Kuk2mx7BmaT{R9z(Hfco5S7D$ozEm=qOIi!UMBte`A?d?L
zP(w)c)+zGq_wn0|VQa%xud9w?Xvd@5fg0#yGTdm^(h6zT2lKEO?4;OF>H+kKvJ9H0
zmaS$wK<7!*Z(v0ZojZTKXG+S?s`Wzpuh>BKa!WWQ3FE_LcVFkZM;!ZQa_BS}2xu`P
zYm8HjOmA5|K_rJV`KI)3Z$PVe@s5kn1+q3lnN-wsnN;LQvpyL{Gk)pi7Z^d0<UuU?
z(Yh!(|CVM-3cN(}ZBD?gF#(jA8n=@#vT@zkH*LBzMvHK#&A+5U(baD+8Di)Ndb(|S
zxxenUH{v@8Zxi9;JDfIex6$H+iCz{^yRB#O;z~GNemjG2Z@x&7seNI2zCGrZ(;At-
zvax|2qAHw#^LftOKzdz6?5XZ0)AhxJ{@C;+JDI}zacH}d)F01Xgba{^>zIC9A6qGf
zyGVCfr#HDjk=I7t>4IUev(Owm>&=-&(7BAcKbtsspP0DI2-G~eiez!njbmn|`Q9Wp
zT|wv-;&x1L63SHNHcB^qf6E5nCI><Yu4lLE4LZWw(pvQ10Uivmn<}<yCq6?#^p@T{
zYq4bZU37G`lf*;RyceK>GEsM{_}x5#Uj$EA*L@qVZmbB*`JSe^m;~C+*x<NsIA895
zTQJ)hi!b{N0+{<k;Zur@Iabk6BN^{oT!Tj6{SX4BGst;blK3iZGHuq1@KyLg{Ejrm
z{;s@7HrjPANR%d8rMkU4xc;Sqg$Le{MXR$3gau=+#r?XV6%>H)MnfuUnkvlZE<B|i
zSW_apTx{*l=E6a++9yPQ)RoHoZyfyf_b(I72RAjv(-mv;;Hx3{(sv%aMl_X$Qz$bz
z{b++cE3H?<10*%nsCetl1m4npT{9r$?vsMi8{0xW3nVh*eHj}qUu<@JKcBh~b-XT#
z#F%%ZW50<;lU)E5Ld`rFa(I%HAp%9p^cI30S6Q`v$ACcRv{3m`Ja*cP^xqS19dlsf
z^&$f6X3~Me;hUd$paC1JtEAEA)cYq>^%B&r%K;RD*H~ext-y}TUg?@tHlJ5)H!*)H
z9GZLwrnY9@FYlBw>8bS;v)-?(I#828LZo6)cJff2pI89KOX2(dVNW#VP&8A^Jce7O
zErmnl^rTf)IFZ^nEH+DF`~5XfH2p)xJyBhTjXZ5HIZyS+Qu~cs9L7^<{^r`!Im^^U
zl9PCGuLx3;zL`#wG0TR+*%DH^q>+MY_0NtmnQX*e9ITfY*i$20Q`-jFfp)Ql%n`a8
zscr?RJSTuX_RcHQ6qNb|VK0?BhP0BqY<E~9Zqn$v5qmGby`2nSX~(^%GxA0rV7<NL
z5Jd=Np|+t*8r||Tsj4rikAs_+;|U7-5J-t-nJfFwVapQO=$F)&jwSOE(eD}TnpO{<
z7{zq4N#&{p86$UE1`s5ZX;ZL>=Xe=NN#|xQ5_|w(0@T%7&^(1UMCyxeV;jH3rHtGt
z3hJE7I@crP@+bsG%jCDK)~52{x!MYm37=HE?{8Pv_@+}TTm2nfmihAhq*)+sGu<z)
zs+*NA5GqeZNkK9+KYn#i<Yh7-1m_I#VxL5^HcA%I4Y0Nl$9=k^JpPet0PoVvBM$p3
zz?K})b?sxR-2xe9%ti?5(cPgbM_tVLnpM@u`@J;uGd3&EIYW5tQRIP-QMSDb7a#-K
zG$EKUn}LV7>WYQ&Sj0Ki&0M2pPn4qLo400u&-Oesxr<Yr`Z+av=7uy%^)xsjadis5
zKgWV^FCm3h;ah;V+7(2q2-Z>3Z`HYa4QnR=`qWe2{Ph5J(U`v+71hvi!jU$d%P;XU
z556}`Qk_aPE~32_uzo_XwC=F9H<mPi111<w4R|<l(v!o=Xsody$M6@9kh<sFCdVW;
z&0i8z2?0mX5%l(Q!&q-F4XJ5$uR5@-yy$n0bGbZ?SGA=My4$WXCE4G{Gz#(!3AbMW
zH3cPEIuH!KCL!OKtnyD@jhdcmJ~&icl&Yh+ih{gNWLvm3P%a|X%RdkE%}J0)x)^c%
zK6d3*S5`ZnHlM6Iaa!AY`wll)xBEP(L+{+AF282^6h<a&u+jd_F{#PCyxNjym1{rP
z+xsRMp=*s=&)7a38b^^i``3bmD^tBUppeC+^c-k(3bkX-6}!R~K)~!TT%+)SM}zOQ
z?Etm>LC7FyN}IdaXSu2kf}n6sM?;9%8<e0O(oybmcsBNB06->y>ag&MvD4kMj9*#5
z*saZLgR^ipm8|tP=JY_z1aY&2r@v!$mlBC7*_$hvAh<@*tB;eJwISsRd&n3JFcr1H
zEt}g0V&MEku>XbFL6^_taDy5lP%BSrA@FCONgt%g)i-fbX!HSPp$d35gK59`?~5Zm
zL=2LCM9Q!{$`UcGGnkSNePIeX1>e`t6=kEyLDR2Ny^7yZklEaNW%h91NO98E?%dH&
zOPdTnYRKXmq`UBwu+A0BV<n#X016?@GMc_k5v45>KldyO^OtC!-kLvn@w`AKEkA&t
ze3hk}Riu@OFy=B43<5-VOYl@Sj92rQ5nQ5?Tu+TUw21qy^QeBdSd@rJ*%*?K?!EFr
z@gs<YhV7R@mC+b-ggbQH4T6N=B@<A1m<(KYzhP4$3!516Wfd=1i@k*aW>5Ghz_msD
z7EZ;SL6PK$IA#N>bn<54(n@L`j>u{A##MJstwubRMVmj10yeg~0F*92s8FHI0Lr5C
zycgQAo#v)FfrJLNT8^<$I*#8IYpYP{$bUdZ7#};bwjGQI2`#&49S>@?%J7xm`-eag
z5g|YzQyW21ZtG#9<e^glNHj%nBXscOMii@r>n)kBrJotXNUK}f7>pL!k>X)zBHhcv
zm_Vg6X~x++8W~L!5bW!yloVbu?ssGakE_4JRpxXLtzQYvZ4hm(DtBleiv(`U1`58x
z*e!IE!67TE$;8C&idzO#l2y{xjnB=_@=8j^q}DBS|D;6rrTaMv7}iasxRmICmqoU^
z<<-w0s7N0F@}vy(m;=A62hJf16VyaeKRio9H9pCWRRy^@J*;f8{c<&lYzyRa8JaUw
zL8Cwk{`j6}Ej~0)N2Onpxcq9^TN7+@Q@cZx&1#eD&Ebe`r?vCA+zH3)IB+tt+l23T
z1$XZO9HR-lm`$+&ORxZC7k_{kn!Rex8POiCl5=IB5sF&9>BF~|^n#l<S4TB}1LC!n
zA=03Rz@UmOg}O!=j(sc0hk-^ZigFHQIxS6x0#TS}Hze3nL=RYtg?<Fok*Z1A$}o7p
zjTIW>ZOpZ%3M^gFyq~N>wiq|>Y=c9p%OZ(%bw}Db1()>z1*3U)OL?rpB_j_~7XLem
zqCs!B@nJ(Oj~*A|-_LyweS$sr#WEm|Qyanj<<Fz!C|;_fRUu`SeP{h%GIYxsh_~<>
zcWfAbcr1EMmT8#?+pfG(rLqcT1&B)s7au`HS!>JRDp+=LEEcIom+M8`WUh(M9Su&;
z8f6Lfa2&V+7J1BzeW&#XL{axrrs-r^_Kdy-q*8IK4`$PhW_BPyI_|+yQhzZe{66q$
z<i|Z2a)22XG;c;$Sfi;=67FH-l9nf6LX(Wn@l(I-arqX8r(ghK>&q^SA8J1Y8k}1Z
zdXHi~#9HPzM9A2r#HqJQ{2M&j!luFF6k*anoMxg5V8E11rl4*>VT%Wnay)i}nslfx
z$PYKFhp2@Yu$N4oT?Bbq9n6iv)4UuaiHx^nSOZZy9mD3RQ|SVE{5lYYGGgW5!@RZY
z2GZ?|2_`6i?UmVK^>*?Yl=0?pe_RV^^8GPy{(^O}X-q-`6pf;H$9j*#Dd@6?^>Xq`
zKtVl&xr`2LlL9HgjY}pU)EHN|Sy7+dP<;Ob^q+TzpEt8Ip+K16XbPtkF+E^bD8<$|
zvR&d=8r?V*X%IuRA7RJ>QcU~j+BbLoH6$F2aQmrE{_gh3?W~6EHJWh;x~WLmB5c(t
zd9fBsIeo}E7^F&f;A?GSaBW&wVTJ!Mho8worEQcv$cs230+xH0L^vLS9Rmdwj@pNV
z$ASQC(4zh$b?h9!b%#s!^>~0%zUBkRseBG|gHT#&Ooh&z@K{GlfqV!HJc7k)$lZ=*
z&A}#oQ#!>XI$yk#T2ydif5~!Zkl9K+(ZI4M8T0VqNqbov+G2FcE(A36$|usBJSI=F
zUiYbc*TJ6!_0FOhW^#*=O}1wp%oIessCxS=w9$-<{7o_aTv>_w`9^?<+o@@$Z~^SQ
z&=&V|OH_dT)zvq_{h}|6K>#J3NrLq#eSzPjBBuITUkoB-7|ZJ_=6TZjm9$OFR;%h0
zr`KUV=>5>%C$`|50bOq9Q&58n&)svKLtE0*I|?yIw>a0Eld>OW?bOJ~^D|uONpJa>
z2|m9~m16RV|NgH4ecyk$J}Jl2#43N;z?@zv>8XGr-?jgS7Qy}RXP`_VEMkuf?OpE!
zPGhCqlq5a_%L2JJlSHAT^3pAV<bLbtj4n)rxbB8@o~(-7#^C!yIw_^@&3ID_34UDv
z&k2Xe33zuG)gsEjsMskd;GTfzyV3`<eyj-V`@W_<NcD;w-rsr0e$NCFZ=^rvc56Ep
zbgPXRP9hjRhn{_%r17L?*H7AIFc7_4E_LHUS`EXG{8AMzh_@90UA}%<3RxeVo^CJu
z?Uy5#F{5uT?=S?uH?0qo>G8ifj0zP;QwQ?s8iw`9<tZkd#U27W!Ycqh+Z(H!zi%yx
z1UI^}TZoP7mAZ)UyW-9sBIK~b$;<|<W!gz)$EEAyKcBaX7zUjuzwAe}2%kdRDJGe*
z?MM)Od)P3#g!j4<u@Ge+wWy=~kpnB|MX2tOdi;KU(f=~qFW}|plL2jq13%gq#oV`M
z4;p3t17K@kZ*L!|B`yn4E$w`-f!0tUy13RDopiNN{3Sq+%cx-ziiw2QqxEP}#qK6(
zqBcb98BmTNoV<X4Ag_v6tVUNftXP=xzMUD8VfE$N;=t={AaAB(rfVyCg7nVj%;LUG
zOpSj7ww6tLMOwronvfPtw0ucXpW^H;fI%WTd=m8~tzLn)z|I!1awT587gXsv;ltia
z(y@~^KcUGA$)FDfUQ7=~0wn!do(igb6__=)XgvwzHlj=JSkS`&I1Wc($^)T+kstaX
za3zWRH=%|o2(OTJ-p97Cm?7zt!1PXx@QC`yN`%)PT>f`z#?h2d+GgmtINudIo|lu1
zKP$p_naYZ##;E{qMA6+7uXlr`lcO`u7D-D@$7|8Kf_4(nAoGxe+x>rU_u<AfLpg3g
z3;n=y)S!&Qk<t0yz8Ym{N798%;Qb_P&t9Z5bdSeC8<r$`&D~gQV*M#nRYYgh3I>lb
z0HneZdi~5%N&7ms3H5#{ES{C-O?-I)ZO8CXYdL=g4apSn#s~O_F+^aMNmkk4ITpZ{
zkh_|im5x}U*VOT(O0_>~=K7vV6(UA$kqLE-!>!@<O$?e1r<(Jln=C}C*~tY8LP1Q+
zl+2Hn`XsuKPkZOE*`o)qje#_han-0vL&+&ltp`ZK-f5cBf*FYtz~$#Dc>>A6RWB1G
zzr$g?PJ#sxMXd)_<D2P$s>Jpvott=P@C)+=-;fF}6ZM{_ljAGys51=haA+);WTm%M
zm_VEtMk0_>&@YJm%5HkbYHiQq>M)(#me%P@A%T0tDHQd<XUNymDJlH^gvr{EAn+)*
zizqAYHc4EwTH)9*tweXlhEO#^qS+sFk+7yd^iv<Oj-K5ovutB7HugxjsJZ_FN`oH{
z8Ev3}24}g8Z>|?7YnGKB$Xo)4NV}kXGpj~ihD4!{6Z~QuR|Y42-dpSx{BAc21p1(0
zM{*{FCTBNq#+EANhT^yB?jBYtUAgiWu6$QYn)7MBOBXG?IW$u|7g|Vs^4vAhM<e)3
z|KS91Fw=C;Zv9Y*_|DZ2_Zd}84svN<`I2J84#7=ifiVZ6_leXhH3$N1CKHQTRunZ0
zL^hN{ZGMQ=Pl1RZaj(~_kFAZ6AN*iJoe*e`iLB=eHN3^;&d}wncZl~1@DTnb->Ze6
zmg<Ie)Aj_-?){b1#Qx|KZ@K7~K^!qOpu8Gj9^~I7CNf8XE*kA256aVA2oGmLN5Uu|
zICXg5awMUB(pFI*Ad};4#Rq;Jkia=fm)aPi(#z$n_xrhtD!6za2G87S&=N#<&{ki}
zQT}F)aLB&;EYiS)TuoTV5;VAU0*6eJAqB}_IYyg~4McZ73qr)<7tM^E_{_pgyo44&
znB$9QxBTHT`Ly~BaXSaSst$}^(ECQlgHpevdAn)ZSi=qbh+++#c#zkFk1bKfz>y>P
zyhI^q!2`KOna;i*dV9xDKE|NvmLc<G(0!8(ju+3ULa_J8>M=j`u%*iGco%q9xbF5F
zHRu(Z20E+9U=Q9&5A)LAo7zaX?@g3|Nu=5gli{jYYadmQnc(X_|D~=$yXVL<mQ*`0
z1ouG>u8d!d3ohRM?r3OnL5WBYrrds8y8djxA~UDV(4E^6*Fno!>A@L|!(Fv{>CfoL
z1h9Xg(5~e6J(ORaSg{gX$<5o_Aw12#Ne`Lq3cb&tyRUvC=Er=Uw#Xoo?uC^G<d(hY
z4@NA0N_G@wc;$F=Y@X2K(Ha4xvDh4G>y0D(z|#O*zE7cEp6n-gkRt62Nja5CUh)RV
zMK!v(TG?RktX9x2TFK@^(~qC0G*W@{6j6hN<TRJ{ryQ<WV*e7mJaIAnQ(N_y(c3Ei
zB3n^%2QutDrRS8cM~!BDFZk;xVDDTN?Q~7>x`Yhl&7sXqW2AiXPE=pfj!)yF9$fB2
zr5WML)u0eoFiBhbu<%2-j*GtNV^0Dh8BLikdhl0pX#_m_iSVK*VWRiu&i7$iv8o4$
zQ%Fa7O@Ig!fY0mv1NonmkWjb{#b5AY;538@^pmGhDiCA;3xilw`+u21EdT!jgShly
zx9xA251b+~@xS<DR{pm=OMw5O-G4>>5rPjGTMhvd5C1D;JkS4~i2ieI`42wJEfO@?
zmJ;wMxBQ(-BE#<gnOh!=GhoAD2TSMMdf9X?mY@17w;Vg4ZN7YU_j`FOos$V;`SDx2
zVej9$WoGkcqZMLsg8*P|nfp&}8I#E~;!Wr*0T^56Xip3I*<!x0FDAcFU^4v9m94*}
zHz}004cMA0ZthmJKNsrog&*cEN~v$h-#zaC)TwC?SCoJQpD7FyN8^0HqZ${1L%80o
zw4<O!|GJrFurbxO6})_8P;{S7an{%Fc$qZNEz87;;Tg2!(vay7q#bIJ{GlBt)t$Q%
zOB$kAUjBQmIsa^RZ_7QQ*ZQwmGoZu&Pp)|@h8B*hqoeil{;QWS_SV+MhUee8W^BI%
z?%1j5DdGg%gDhXv$UnK}dE$qW@{_y5Qo4-Hd#dm$6>04*IED#EF%t6=Dd)`H6M_SB
zYTe)A2IyW1|B+{A-bB`rQ*2<;+uJkwlV?t~20mf~AjcDqAzEpTTXI;JvJvS@m$9f7
zOfDjLri^^_H%_*qA?=)61@a0pZxuYLtCZoSNhSnq8qCJ8pAa5XoaUwFWRjUYw@^z}
zcve@9-yN4P{7dQ32}5k-k$6nh;`W0N$v#NmF%N;4_qu*x+LCv9S)8s1sI8taIBvtH
zI?+A=K&QU9WB*Us)?dWWGaE4o?;abo0ygpby_>?d5@p^xbO`LpzbWYyKmtW?^a2HC
zJl{dk=6kH{8Ko(hz{l-jw>r^UPx$kJNW)J~)(G3>`rhYlEaUkNQK)nZIz59vNM>~3
zPSJ+z{R+8h%OI{-MHOzy3ZtIuhgNg$iSxyU0p{}2qj``;Pia}?wR{^U`mb}Yc~!VH
zxN)=I_ajzdkQ%|ReAm`}Syj{S230*d(3A{?BQ&$xR5vlZwt0xO1JqRwPINfg+nLKK
zO**&F$;;s($58BzZqo#eX<s^OUjgb-$Yo9_ftG2>HPRBd$`W(wkCUk^ecAHg6i$s1
z0Fj6`-v1F?c3vLUf=LSp2A7>J9!q#tix!X&)9SAW)Hz-Bz8d2H9!}oYLo0>8wVczF
zauJ!FvT&CkuF9`@QD4BMzNU*p;G>sHW1o(y!=f7c+9a)jJvz7Y?QouRoAgq@gp*mh
z%^H|pf}9VtGi^ZYD|h3v(gsu|i<*&_#L!Y+`<@}drMaGCKk02c?q%brBwFxA8GbLl
zjycZ<#+FMPHlb5K7sR&Q0b|Ruw=i3XBP%#q3|?9?Yk9T0lqL{=Qp@>zf2WqaxU1S4
zoGdQpMgdsx>Oba9A1)%3M%|^dcL51)(gJxK53gUhH^Ua$T>u7#niN*nzCrdWsu7$U
zDYCy0hHM`a$JWLO61JKX+qBP+LJbv9#t4!0zpo{g|LRth*VG)IbCD3gRNYsQJXKV2
zCBKRM)||sAevR&+Jcp3GlzFfXXILayO3N7b!_3xrBZNSUac|2vigq1h>6^p6_DPxH
zQ>5L?{sa6Ej}ySJ;K=-a@&UoQDRN%j{DhpB2}g)dInt7l^Eq$WAzP9AmRR9Z5$U1*
z2=rY)vTrj`E7i1ePZ4&_h#cA@7t3GzFlUGZr|?AtbqCSJX+;{<uLbOt9-mHGw4rI&
z$Kz4U#Xp?cmb5LXP4W}`Ciew7>$8$2+PmC77-zIam^XNDy;?;Hxk@!|lP#sCok?Wl
z4i0~)yy^;0+spoyO{O+f_dbRQAx7Gg|7SKi<xG({<F6oDm!3hyU)57Usr(ZpL!9_K
zNcN8kDrmO|u1Le{EiNvNaR&Y>py$$5d}|wDf&rr4`-eADy;h+ZFnx6nZnDD;Px~+v
zmJUo`;rvNo;o+z*Aik$D`lWl-ZzXkoevI1Vq(2U)NQP#V|2djUI#9L$nK<xLx<D}Q
zQ?np#BU=7c^tOrWL~+5#o_+dg!6TFApY&Deow*q>ew9^y2#j9|J|5O2wL7MC)|H<f
zV;0N(^lkN_o3ygL_~#7ZbF$#~mxUDgU~Iq#`#eFy{;vr+u%`cAD=EMi;eTc&B|<w>
z6a*?})PJLxT>qtF{sDcsMPdfp0x16`efaPFn_^D>A$`>SP5St!Vn#9Ds3UbD6Ayh-
zvfH_s|8g`5brfOkGhoYN4#%FHhaR$=V2R@v+Jn7gn08t@&vIxJ4xeS%3?EuRg78W4
zPq=)A)v214$|<DQ1kg!ru<e)S(*np)yd0i47*=hE|MUt{%saH4u*&EN^n_29bMwxZ
z<2ZK)fRKGQUF$6tKxO4?vd`{KuTgny_XTifZcO&2k29P64gRS44FrEcrr<;{h&t%3
zF$r7Z%1*>t4&QgEtX{OigV%)rCqD4~nbA@D=uY%Z4_Y{YVM~-uE6UM)8Uqqte_P-8
zjjiiP@cjDv5A&C}@5j_W7t5Z%kM&Mpg;pgmR<T);lgw23H;qC&@V52R%lZaA%^T({
z!C=Re{eypeh1q9#v#3HB=uRMGB13d1?<RARq_u*YjgScjg3>x20CjjbvZouILRH}O
zXg`MJ+r82O`H*+2hL%2aU95Z?w52ZJwk=pEF||}Cf;AXrvIZYrpy1;ujGYI%4qHZp
z7a08!WAEs~94E<L#zWb6aF;VEt0Hh*jkiy=U#v=cxkZO;+og)e<Qs6@WcYUf4Gw(P
z{+RMN1^A&c=b4>0_hafW3h)YHf+Z*5>Msf~XXqaa@R^t|Kg;8uqnz`H@1R~EP%}l!
zy!B}iRFkhE|7fP(4G;q?>v0eB2Lo*PZx~>d4rofYd3VXyb8Ud>5=vK6=lz<iQM`l<
zDtTgB!?*GmZx&Thy%e6TJNixq<w}%nMl}j%m9diUl1xOp4*;tUtVMJwsdhsThry;Z
zg+{RVSfs(4q8cYSB{|!3&r$`Mvf)>)Bj9&QaQw{ia)XQDrQ9bPk%*RAL}pF9MfnH!
zu`5eo9CUqfRu@pSn6up6p}`@}om$%9eP}Uzw%d5{QEu#^mXwbpKhF^a!~hSo#ZQe?
z4+o*XTYyynbg@lR?Twb}8$G2<_rhUK6eqt>nlM>V-SE^*<R0c9%BQM$bCgUEp>tQ~
z>>WZiu^Mo{9>z-(<|t(z(&f=xxk<K*@ws6JZ!+dH@rG*}na*hQsbqUvC33Q`GSzz;
zw@G6SK`mrAJz;r%h}wF@%xy|1&oie=x{&85q3AaO>OcQQ0VWjol&1;5{6hh*u<jZ;
zx{1O6*l5WSpEm;OR6~5Q$!@4ZQ!KRo)DlJZWp64J^X5PndB-+33ejjPZ@9345wHC#
z8<g_MK&|Q+q^h6H4d=P{UYQ(yD9}UmYF?|1iL2mtNotVh(|k+&&RzP40-Srq{Bj`)
zs7T8V1$!a;ta^&>^OB)rvy-cw#@u9AU#zyKc9?jZTR5O#(!34rESqfC{SdIwrKb&~
z0K2$)GRSL+-wH`=6*OE>sB@Eb!+1EaiDG;Lg{GWDvD%cm=Y%#}OGujwNVQy|7^)og
zUt}TL7*4IRHM~n))IXs!U;SG%0YK3NYG%Sd`T+Rc7Em*D|I$pbPI#bZPX5tM1rekc
zCE-#@>9PHIpk`74HIt`;R_-z0&K;2>ZTx=OX7G<@F5!!C>JEa5lakt(?RswcU;SQo
ztcy```%X!&5%GRxT2VJ6Ka@Nb<H`2>VME?W2X_)}{o_bjx|p}qZC>sW%~gw9Z??UN
zlvE**MkM)%x$Ld|qFOhji@wEhSeC!KT|WD9_b0DUZ`l9T6aa-+{-4(`{FF1xf34^V
zX#DT;$u<A)^T}Nrk5TiC^vBT@$=E=JoJ<uOXxbOS4z!mk;7#b}Af)9)%U6v4WH@qE
z5c^ZGd(uM9XE_~P^6Ta}-w!Q?-sGclS{~DPq<3DMgNqHb>N7h2$AN3TM`fmN*?$cv
zr?5H`AN{qM9$|dq^aC!Yuh9QXder}oClumX+wZkp1AA>IV0&eu$VR8`Bgp(9RtJ{l
zYSS6wZC-L2A$0N>?MkF%_+l<=K04VG_obWakM6-J$U^%)9kXx^5-nkkV2I5Covp#s
z-98tYfQlzQ`2OriGdA<IBZfVFj4#_8Ql9}3#-K#gvh~+^1M!ScqS9NJ{Y(~U5}&qx
zG9+e8q#pc&AbNR~1Rlow&z>*#CPT+xUP4#jw#^^xh_^Ze`*G?|(}(#7j{EI9i4|qd
z=7LhFf?)>+>9~miv|r;KrV%$)dBW)eK3s^a02lT`pCp@8vdu2Kuj`P_^S6*AKFldG
zVj~0&cN$B+eB+{1>DZs}utU)@Uf&bS2#l=p+cA^JuL6r32GyA+yz7dCw1)?mr<;mL
z90{NlIC0g=Wt+X*Tuf1_Umrexzqnv^=x<RLNHiu|a)WpHGB0pp=X|N2Y)oX?pLqS8
z4<M4|Z0{`6434z4&q$LGFnw~`z1koJfr}(2kJ_I{uG5O?x7x%v-(U$-E#lxtH~)(D
zZjb?$fv5URvGsc(JaXe|<Izmj3HsOO0PE{u(13jdrONELnp{yoPDeFX<|w;O49`9T
zMWfHs+7%Bo*^mY)!EBZA)^VvW@mJ=k&VX$@MUnkJ7%E>vc9%XQ7Kb*|ndaqS*)^Y|
zl6NA0>u9XGP%&xP<yy2tREc-*61gnrLHS&ruw_UgK2^Ao%Rmv9tD~Tcxad1ioT}wh
zl2X<HQO1{-v(tHJIKH?B8f1Ds{9Oz`1()afq{GicPPIF0hRPzP;&wfRa&e#hcL7ej
z9K}cl5zJJID<A>YZ6l-0VJ*O7#<5IPpZfQ^{L6j?qH*=UUKKV-JwXAGuV7cc10IFd
zlafxEPVZy6V34&-;_rD_ZYrbGdkx<-tnf&sphr%v%=>|fkI;fgUEQ!>jl$(PKm5K<
zSAgXhYgC@_RDkd|_<6qGqS6?*1OS5R*czOZF+C%%mS!L#9wTQYy}4YNiJ8l5T+_l3
zGjj?N`)IZ3et|L)PH5&GzJA2xoOh08A?>pxf{>H=)ur7I8D-)f-%J-6p0^74KS4Dy
z>DGr<NNa=*p!;`y!8Or0B*K7&!eX)#xK$W!xai5zPoU^R6z#|eJAz8ufdTvieP6(;
zN^BM7HrJv{Jko$`@hz_z6xW+Hfs>&Z>%_uEwFV0+`06Z!RG={c{wtg71*^q7XE|?w
z%z$2F7kdQyEw#khMpucdj$t`c^y`sf3flRD&@~k0Ve=vKn9VfA=n*x211r;%(f5<j
zp${S#I&eOV_e16-C+yo}-<<%p@{_z7h~HOX4jKG(=or$%?V}x$=qUxc#dKK+b(Ae?
zIuc5RG;k&wTi^_;CA^YMxRAS&<?7rcv#`3!T3b90tu$|%zdo2~P)=>aZ_+#dUV^@A
zOD)stUrypOuDwoQE2uyGinO_PK=H<K9V(WSr1#w4i{IS#aQ0HI>SO_E*Nf8}SP{zQ
zz)j`}uEx*T!*O=55GeUHgrJ!!G~;T2!%WHI1f+&SqnT-$;B-SN0jbtU0zczzsiuVa
z=Z7)aiFU2Pc@0iUU|5op7yzp8D3~7o6!wIjjt(e3AT8j(Y(B5h$+LzSup$Mq(mrTl
z*k@LV-U0B0>j%uwFRlRESAr-WBr`>Ot!Wp6ED6Tpy`D4aG@3E<^?}vj4CSid8*%HL
zm#LbN!c_S0tk$wsxKE5Euv!BZzCc_0C+QgxM`i55Gj%4Ic0~q;r`bk89%w|DoD*$k
zGqr@z%hBpi`b#VJc4i6c8GW4QRbSH#RV7D-e9LCB&J3VDX;lOG<=fh{C6vm^kBQ>9
zMc9^TTLvLHij|>=cE#T;AhwCl7y+bgCekwoOP4XTEqQX)y8~a=vp#VlPS*Yay;}G{
z=L_KH3t7@Ir%RJ_DZrL~1v;4s_>pvnYU0i086_^{4!VhLemjoFi|@<Hj&KoUGj}O!
zt5i()5+^gOp&0^rO0cbX&9|~=_a`q&aI#$KhIk<^XX#YHhV|I_Xg)~4tZ1OCWwT-W
zrAZ<f3|ny)4)@-mw5S`nP@K4(ODd7<Ih1k9>C)GB_I+LSY4z81t_y~SW=VPWZm(rD
zT+~S9nUpVsyPHBvvQtL3iXY^;Jzu8B+i1Fo;>#3GkIe+^^I={t5;O84YVvUJ!>aoG
z>GN^?=Cv@jDJ3i!LNxc_%2AAC8zin9Z+d?trE^p4{VtNCza9|l@PlObkd{$&=UoY`
z+O%KBm|FLRt6>S){TQg^2Ddd^ChdRo^A=58So}xPb*SP}t+s`jJWYA30qdku?C0)U
zg*e~2s1aX4wqp|GX~uGmj(`M2Wy@V`vX2e?sgJ5}uOD9_m?JBw%^5z2Pw-qw2p8J&
z*1Dgc!DEPfOZ;$N)7P=cM85iDxrU*oN`c`qhal|WpZeKb3iMKIe5TvuqxLd4oxklf
zHwSZ}zE&%Ep39$gRqbtO%VJ3w=@-YRQTSQz{Fn;^1hea~bGm(io7bViyRyb6Z-~2A
z&Jm%Bq7)U<Bxf8n3?Dy9CAC~=6zSo{R%Hd440o&IT)ZJ4cmH!R3Dt{DR0dw0!T*rP
zfCI|E^ez9#X<761PY=O|-Up^;ZkR0z0C-#W?P($~jb1miAQ~}wsX+u|%(QI+2Jafa
zG#`I-kyBFEnYa&vQIN(y>~6kYl>BsLWhO!R*?j#{58v|au;|s)7k&u!X^$_BB|6|>
zC46tb{*>ne>6=n+pr_GNW?HQwd&Uhy`<E3e31C6Y*&a^}G$Z{3h6)+HJpXw+ApQE}
zV7Pu;v8vjBXc-Vyz5a!V=i4R$@UN`P?H>0%EG3vjvj4__XAgxzYegvvG>DWhTCog0
z7xTbMf%~x9?&uV1Z;NJDoEkm{NUww*1umfn8(`@fF-Qc=SX%Hy*{W642%GVplQ@iB
z#J10ba?Q4h@SCsYz_mz&Md*72W}c16JxCF2<Voe0zsn>WudT62q=YLm1G_6@neFyY
z$H&)m2&q(zQm<vS1{rf)3x6-0TDL+Q>{Bd-(9WMA>Fh5)?k<>N#z<BE+}Ou8m7gF(
z4mO7cz8bP`nDThh2OEXsh8#3;PRz1MAIe*D#5J?1ene{~91US~-8tX_JYiw;Sh}>a
zk3||I1p*BeEEJF~k`nnyDjHYjA_OR@=Z-@tuxb4SgGwjZTD=Ck_FL!**nl+zN|OSz
zj-%+en};YZJ0bNG%dq);0&reiMR;_VNotn!c9{NBSYL$w{Fx;(Y4mZJBm!S#uPNo0
z94Ohd92Q~+%xIKZ$<@UG$BC)b^0Yi&sJ8)GpK8wt@m)8O`xmV+3oxZf7Asy>l72PV
z$BoQ~94=E<_jeAOB5DH~W^j(=uV}5rqyt4AjdBDhS{@PL>PO0z1XJlVB=xn>1C(^&
zbiZkM@?X7UZGrf;<az&kaiEH~i6i4tknCGe$FDgD^~vTTy0xwcOes&J5;G(gkj$=?
zeX7ccmi=J;A!l)04yt|Ivt*?1N1>tbo`T)Yok_zEtwU*gi>_N2FO2QHjEC4CUsHJ6
zfBqy@!y*c)O6eTooFzA_>_coJ7jaF$Ea^^=rDUfh%izr!CB|&A5ps+rRCwRRBxq&a
zQ3u?sA`pE&m?g9UOfCe;P$f)XP*oaf-NDnpPU+W_>B$?_g}lU9PKYthL$Vr;l{SqV
z%2RMkWl3gzQS(tt$DQ{Igj!tl+NH+akQO=^Pg^HKErq;Qg>3DJ6{C(uS+q=Xw{YLg
zB&5E!l4lUj#9vH1($J1ZJ!MHZZ3<cFTl@B_*s@DxOJIf`pr3Q28G(6AY=iq8z9@U;
zHfXcRmRqcH;Oj6RCHhEqehX*ibw_-&n(26&oy|lu@uw$dIS_H3zw$In)i@nLn`|V-
z<FcRN$;R&aszYiBip6O3=trJW+A|Z5uU1LL{1h#gd}s^?9^T86x@=e;lzjP>2*VP*
z2&2%W+Jp_D1OJ)hL-H3|t9ax2li&7RP?E2UuAwSLsdHzbeS+#JrjL$Af3bBpkrrPy
zd%c|3y2{~EDZmB7Eot&Ke~YM8fj8x2abu}Lm&rz*;<kd!-YLyHqAvZr0Yp1&G<n;n
zUMNgg6uM1zM@^9W0~v`EkuijF@IB4_k#gMTDb)$U3g3;_ns@41o1t;_JgH|VHPTDW
zJ;52pC5c@eSJS>txB}P(_%PC$VqpQo(r-KBuu~Ts$4d~E;Mj~(T<VTamn(--6Wnan
zgD%sM-$$+%M!7EwMA@;1Jf9bd(`Yd+y!)fre&uT!Q^DUBrqgf{&JcWk(itBhHk$H~
z6deBrSS<`GEETP!U8Z|OR%hq9#L{+Ck#%WnT*^K)(mb}E2QVK*@jX9{E=HdoJ%oOh
zmz?aI)+WVfQdamCHR9L@F{#P7qbgC2Nt12ARjwa9)O9Ks_b_K?la`Kl;8A5D;*t~i
z!<jax_Vj+(AWaGUmk|xx%hwua0y_?Z)Z-mpfXnUfHxn24my1bIgV}{hq>&F}BeDr<
zEZ?bRw0sEq8_LhO!Uy-9j0MnNdlxPqtVCU#vlLW3Hw7W>%h!{)XiCT*IzPLPl@Y2b
zycC|UDms58>3+cA83kN6Ei0a!Z)E@GkYM#V9`YrH6gp`26=uI?kM6%YX*@q?sc`zD
zprv0{`228G-y*Ir7>TdhjL&}|b?-02ocKK1@bua0CP3)ncrSzvM-!*`6_Ekf@|6OY
z&FCTM{L{G9K%tz$a0F4n5z(j6tLIts*?&k<GoB0a`2$#xO*5<wNi!niA7&Ysjr;ZA
zq5ervl7A_<{qNtN|No+U0sbd+uZYimih@!9zBdQHH~(kFb@}S-!sKA#0K~EVV~egC
zkvB=E)zJ(@n6Zt=0IVs}cyQw$9wbrWdoT14v-%k{PQFJuYrXW~JWhy?33BXGCFVdw
zK`P;fLk(fL26mf8ZWnD;xC1FMLVF&Qa9(8L2O{vQ9&BbXwe+3~!#n(FmP-56wo0;<
z10~LT4>-SRPd*;k&DdzW#uwr9>n@DmerW%-BjDvR^+N`90ha`J8(;q{3A_eRR6Gor
zvSsUa()j;5S)AHRP+S6+0}#MF`hRt!W&8Jy^IzKmt{dk!`XV5^%wM{$etl~xmf^;s
zO=usI+S2<N6O3^d3teU*-i5%R_Tvo@0^APxxiqhnIF0~4Yi2x3$U^&$z?E}xe)jOP
z!^?G(YfS+#737;&{xeZJEiREy#6bw?>u5)|fkIMnZgip>$e1{ZqHNd<QJ7(YVH!%w
zCpm8B*nB`C<;jmT`Lq!|WzRHROr0>gX>l`dVch(45`QI{m5+FPn?w@--3H+6{v91t
zibInXfpkAop7)kg$wM4?rA7WpLWA>ex1Fgl)cnwUH@Z0T4j%r6=T~zV`t5uGEZ!AE
z!OlX9FG#64iG^aglg%{y#L}?sv43<;lX<Z?9i2dOFp<vmMYE7KyuLFe1!|%=y);j_
z#e$Vy@EF7qw>h$A{^^UMlQY2ia@B7H@(!KrPOjavg~`*8&{pDs4n7-71vNLrtvgsH
zx@!8ayf1Wbi9`dqbRInvi!@7y%Bgu&VojRaOAiK-km0+E^tJx3B0&-r{#^~RGB~aE
zvJ#GfKB--2;3yaKMt)Yl)hbC9er$6_<yPY9dFnk)2585Kh`g`Nr33&w<+bxowZ#pP
zjD`||n44#^alahumEiTpOVANX-u?();7k`Y#8r)=s6v3{GhRN`Qs6q?mSZAY{hnH&
zyNqkS@STp|mQ+$LB;X+8`pkOfh$BCMhRJH=h=A}L4CrRF{_tswYV?JL?s(QEbBY`@
z9jgG-;khm9*nAd}Fcx5u$2}I#6#bG9s~p&xfE^D-JGv4j8;lCoYWM@p`+Ln9EQCUc
zhO3nb!?BIU6K0QhqQHDi@sIVayX}cz{pNc%z>3?bdKPVQ3<T=IpJx|HE;=B~5>cA(
zDwSw-Cb9<hG{X8cg=QbQ7;ai4O8u!~j7oRclJE^LN&2Ct!EJ!{f=Bl+VY{Qk5h%>Q
z6w?JDImVKed;SI>Tpqq1-E9zrLTWwoR~U$yMFQol`uIA5V9$L8@iF0h2`>p`A(eDK
zzT@SVfewV6knT#%jPm*w9Z$O2x6S%r<)F_wFb&hLu0}29@E*Tr%?x1c^v=0jLd;`U
z_%?MAsSq)ugi8VtGTT{(5=~T0XJ_Uj(U3FQNmaNEm8%*lm<(W+#gW*;R-A*YrcoBa
zUTG`!Xk0?N6l>gIhM5v;)+H?i!&~A*__(484$=zKv@t1ljM)?#(8Ghfz{j$m?>HTP
z3o~ge2Df8S41eUj%^-4WA~@_#rZJB0M@2S3oBhZ^+?E6=QV*MI`sPd=Mp-^>SopgQ
zNg(r;o^fAndA7^rblLdsp)K70sQMa4n?76yEk)Q-fvk!qGzqCOJHk11+$%~ElbOdD
zc8fTosdd>{!jw!P-_deoFbdW>!qVs+`=qztKBQFlLE8TPlWHyPli%v*cMM#Ygd7<(
z4f{^;>Tp`XBN`F5O6}@cC0vqxdCICpr>E*}QQZ1@fIg*j^ZKgTVgdVQcT}Tl`hlpo
zMA#dKY=Uto`ePgESg<4aAY0J0$%e8&EyNf148eWj2Jbvo9TZdvy8aeQ4-54${3BF_
z5i1MV0(JTmHtJRVQeO=3SkimKbKVu$Ezk`R&L$dw4Qd8XYc&pkKyyi1yNUa`4rJMj
z7<3t>kePF6tbg^lo^F`xv~F8LHklOy@P?a`UNxJm@YtA36S&+Qx#{05nMAl0GsI@I
z;@rHIpmgXP*j^&!38ODrQ><C5DPN2-bvtE-vH0@k9vi=HkPYyL6`dmn;5NbJiTm~(
zFcDM$KuiY_i^SFHUAf|_6#d$T2;KPc4WDRn*WB~RXIBLcJL+JVsJJy(><luassn$|
z@3^tG;d~sfO2!y`ilHKxHy3Bb*jgAA4mZ5VkS6MTM5-cYV*Y97B$U>30^ry{$&9_2
z+HvyX?2>8<Ccqbki7+Plv@j|7-jD-EO%P-QC{d1Lg>=HN*@lyE$51AHWNJ5rlD<vt
zEsn*!#8o#UAOZO@L(AKUFAlJS)adW%{$O2r-7qmJKlIH$Z6A_ZT=KQGTVVd#)t|HC
zKzz$6+qYub#S`bylgC_UR3nGZla{l+Cb~viqS#5Z;!RV3-Cbt-YA4sxNiYVolsQQN
zFnNb0d!TgG4zVS5RcNoTisKC@OP+L%<KT?%ZegQBHMs9NKV)u`7i(5!8t{?LAO`RR
z{i@z`jm1;%fZoz=P>u%~eBJ)giF0O3!b<!#C%_#&sDXL;{>TJa9i6#-ENuOqO25T)
z*)sDcr8MMY*%JdxSHJMPDwjw6oUbGd@YFcD8ehsoX*|U?P<LHDztuJWK+mbXBa6uB
zJtAHbT9P-p1fFriAa8BZ5Xl=;(ceg6FP-)<i4B8O;Yum69$>uEAAU%kffYqKhA5MG
zG3|yENTuce@xw+!>XvS0Yl((znjwORZRBv9!iKV#HUhA&zVtS~UBnT{6v9mf@Gp$R
z_$d<<wWP#iB1$J{>1B{?7pJC4!SkHx2-Vn#k4o^A2mJLc-l+CVs@daD%U>+U8I`(3
zVij$_gcb_uMgfcUS*ucL8V27)<s9Q7$_uRi^-LDGw7{YC!erT!Y}Ns7|5g^cpDpm*
zoB`O<hNhbs`WgDgcTJ=Del6z*z;|`%^-h{=Pp>n^lrz~Yf4Iv;(8Bn)%H-4}Go^Z(
z$=m+Cp`yC-5?%OPFx2M^QI;T?q6e+`al1pa+#5&@Eeb)1afIH~m6)b3?3YjfoEr3n
z>rV=Rcj|Bdbs@zcV;8{Y&y19*scjD|v-Lv)3<kl-!m-G#j*1x)hM3StM+_+16pPGa
z4MY%xTPNt5xzlPh-fZ)a_ZL;=m4L{MueKhg<63%XP(VU}cBH=wbOuZl3+YyC@TdY?
zY^$W$i&)HY+l)MTJ7N2`KpqM7Cg3{VbcX^M9i~*z?hMm80C4>e^RWpm1X_|8lmp^Z
ztZtdr%?abDvGeXn+}zCx=?2u?ipYM?u=mdLOvUcY1G9nMmDtsP8@qrE^v{QDgTrK)
ztZj-r1ij@o8jtPH-j3{VKG^!1fHWRJd<`@;_-XLKB_;4oEg<T^zc%&fOwI7!a{2mA
zc6HtrfUMX{sx$4*R>UEjeH5p(>I}7noX|`EcVR^c(AZ^S-T&uIt#9D-#?jgaZ(mh?
z=|deBG(d7tpEH`SbR>BM_}kc3|Hs(1j<2=9xc_TT4RdN}iDgzBj&>ZI9N&2zWkmaV
zPOq595AgmKXF<w3HP;M<Ql4%BK;FLKd|9~}k6sBs?a@rI8aKjuxHf+ZW^0ip*)$|Y
zh~pec4Rm$E=rBTQkn2YL_}kS*9Baq~balC{q!4HZe{UnN*{xNSWM%RU(!X<n5I9P!
zUr<FQM<9Cf^;Sg`@uoE0XyiBFcCSz$J-$*7aq}?#+t_vKlm_@UOZ%n2)vE`mE3pJ2
zcI|Ub4*})8sM`QD<j-$1u*21FUE2?4A)B0@n#CeDI+d?2Kd*xIZrw7i?35IUZ(8zO
zONAHjipbYP?uH8cSWI}c6Y>|#m8G++9YScQiG_{%>ehAf(ZYYn5jH@4=!b9gOw+jg
zyu@x0^~AzCF$)5ai~bPFMGIx%TUt6H*$H}nhwW*1&z)kZ2Rz#3Qa#0~NWN+Bot6A$
z^)lB%9LYn33P%KysX%hi#_o2>EU|`>l{CH0V$@d1=_#uj>d&FFIeB(?I3Z7^5`}f9
zWgBx&4)4f+q@4}<tGu>Vo%@f|E7PV~fnddt8i1FV4pr9pa%eFRvlsp6Y+a+8l!=32
zrqjoOIV*-4&WVs_X%w`b4uZdr)@E+)5ny9N#D<zO5X4Gtvpkv#ix(|Gw0bymg~|nV
zdO`i=^kR>esbe*0$_SCCfInWOXo)!pP@b~zlwK}<bN5p3_{-)ckF3GOVV;Ex_-YHl
zF<)iie2gos1)VIn?h@PTP^Q<<xz+g7P5~95Z`z<@ttkxjc~u>XniVS(s>*JkuAF0Y
z+^iwrw6^UHePU*!9dzLd_A7$IZ+g(tq%F>KBNmX1W4ay<g?J*H1(qXHn}Da*9vhKb
zMi1#HMXAz!{l$lS5Kx*!2AKxH>T+Dn&lKBBQS7bPDjCaw>Hrup$anESV|+v|NEnAZ
zt^e-t@<uH$K56PHl3rNyLf)n-#-MLuwtSvi)^D#;ThcJgzHKU87&pFr#F?P|;xYUN
zu9EJg{-zn;>+H&aNJsW8BC%!KaQD~Ay5zvDA&SP&3OA8M5T<SZ6<`fI(UTx-DK^1j
zjlRceT3>H9RQUqzryyGO{hFRxW#NX&@afo5n2A`rFSi^V`%gWhZo&WQ?W?1zike43
zK&25uq~u6TcXuh>B_IvbB_JYPQbIx{E)9~RgoJdLG?#7xK>=w=5#)F7#ZMHz_11gq
zt@S(nF?Vxj_RQ?P&p!L?nLPs!KW?w^ZNf4_I9!m(uXB{8N|JnP#N_!;M<Q3_59$iB
z-_f{Do+r&IjBG5JJ$*bkI3+~P%TBVse)qe@kuQw6h%8$Zb?EK;8xWeLmqUqimAj<E
zB+vG$G%TiKLl-e`7F($DKzEA=(6xsNC@$NsZg3tl8<PZwD9Dy9L7DDLijTi8WF92e
z8x-g=O(?Rk*DSd@rVvfCcXe<&O1URS+rUY~Gr1%$hl$5wWu~YYEmAR8ax#qtQjIMj
z5PsZXn^-jNPzp@O)Ixql-m^qI9!)bG!5lL7=aLqEkBx41N#;)Rl+g92x?#c9sv+rI
z1F9#eZs2-ucCFXp`}wp(o!Kfzu_#DLe&F}vfBQE4leaKga|XWc>|O9H^c|iChmmZ@
zUNNLC)}PBw4_B6qZ+#EG?VMuDgP;3ykx!=oq&Ab9&MnEfIYr9raJ`zMMsT<9tvQ<P
zB?_6;wo%9JA8ms7=cleVc}``zSf~`^H#3n&<miqp`|5}Vn@cA;%IA%dvq<?S<J1HU
zF#Y7KBQw|Sb8&O<)zhKG^=B>5m|Ji@nu9zQs3li~kShA))OcPg<dkXNvNa(lKlob9
z|Mn&`zgB4gf%At~1fNYc=_8C^pc?RXk~E6?O+H^fu!uECH4OKw&vQZ*-L2szIeCB{
z9{-A8q9ViX^0P<TMG`W`cppEE4KCs&Nf;F=kwtgoebZ?dDjUXp^2uGh(MGxfBRtFj
zlBN<ywZEr7ZdN?E@VRSv=}D|2U6d{vb>%=Dfk{fK>+`kB;UkAKz3N4sAtBBduE69J
z%M20&-0A$L@rD)FT&6Um?<~8jhdA#WC$69~IEp=dlgedTXh_N44pkt{95U>uJZzn5
zl22!Fo)gaWE}(v$8O%d?2&>BynWLiVg&1zgX7>A-z59H~u=^o_kwY+6!ujcHlLTSl
zeF_)_Y5`-G)kh;{K4$d@T*{AcyqEo6_@OdVMsZFC&}|jfvzmH(=5z6SULzH7)YhJ#
zxksj0AT2G?LH;eA9Qkn!BnY3ID$9LL(%d1%3Y$*!<Hs#0F83W6;Y1Q`$CKI!k1j}X
zOx+4u8_ZkSHHz*a;(N!>XZpBRq)lsKGX61*d1h)%w$W~-X#*1YsK*lRo-m!vUwiLx
z<-?y3DVK>I4bv|R^oCq1I?37b+^k(ME>}f0jVEG^P+@%O_k2>%@h4JxJ4ebcwjBnS
ze2XP6Ho;;W-;WZWvC<HV?JU1!wBZuSEicE~(Xu3Nn*lH8P(yeBhwE5jz4?QMtG?Vm
zig`*lFlCb2z>&rAVVa6cacs<dIlZM~4d=TDxiFm0P1Tzm#=;GYCEFH{kJqMXy=$Vv
zTc_K(z7+``y4i$`Y@fs|kxzAs;}lqxHPop5@JbFDRh~eb3lptEog9(I*~S)v?Aor}
zl55qD4bUI^Y9Gq3?M8}`a<~rrZtHTRJ5CsDqU1UC+Z>D8p4E)4H6@tVp6_y4VJCx-
zb7Hp?%Fkw_cYafPIUT!beVxCqe~4grs+%5+v9YN;k<TnH7A38|zwx5jtu$=<J&r_2
zNsSoobais`Okx-<<6A8PfkBpoT|&i2a|_3fTEG4|MGE!z1*{RfbzVp)hKLO==<aLa
z_PN6oqv-#u4x!ySkpF*&(4TTsk&d8^?EQbYk)3U1!4DhAV1c>1F|_Czh=Zx=ntg6V
zyzf-COmlF_&Sg#p+2Qr#+Zj+zTe;I!e}bKeq&y(|fsI*4si-9M>hAaUpql<kN@mbV
z7PK76>%O^_6InZIlVoGRiOxIEKS-|=0e5rhPJbhcT8D(Y-DF!6TVy1!zlrtJYm6>D
zW9hgj$O=4qskKf>Ep;RA@p?|s^6oJtD3Rh*j|J}FIO|~iWDu{zEZ@hS!>?N@e21Iv
z8;PT6oK}8;vc_0NOo3aQ@-I73g?S(K&AMtZ9`$%tBuqbj8n*svT4`Dow2?hG-XINx
z#OfPUONY(6me!(y$yGrcnGo+)2J^`^5q&@TQt#QX3ZxpyL{4J;E<v@0Jbvzw0i-U1
zVl$L@Gj!V8<c#+CrNdv}2G@4h*%PK`L@(Rlln*p+TQt62?gQpggLafT_m#DKWMZqg
zt>Ai^4ezW^d}63c-jT`e;B1f6i6AG4pm|ZW^U*PCZlO+tptr`z1V!Kfh0Tjg1vK$3
z(SFOTRQf&kca3|dNxwY2*>Xpn1ky8hr>E)UlT}A9d!PfkPI$5ohJO?2`jUpyGdjk8
z&>Aq3KBom{Rcq3E-cwVQv7k>f{c?e_k=6433tigLE31qVD-sNY*L1d9GUrjXg=Fdv
z`A}FY=9so!yXh7C{C!K_Ju8MVYYqtS&%R;6Cw~T&-V{^x6VR$*(+|DgsRqfu4P{h_
zSjL=X&l+3`LZ7YNO-7fj3`6s<x+7Omp`+$(0T2PQMKb38ul-R>V-e=HkI`!(i!+z~
zjb{6pt1UNl44=(Csl|EqjOvB;xagzz<F%#l8=@k<K2IpWbQ=?o+4~?$%`}>`k?0L}
zj4(lHl=?dT{AY9m3)7rwR|ue4aZ}J({;G)09b0alFZQ!XEJ?SY<}=L3Y&3@lmvD%`
z;UY%Y#>F)%!T@b+DZ4f$9V$7&eRM;az{tc~$mC7Ig0+u)F)-x5+sR8lJ%_a8vUzU%
zafG7o;cvE)OGB4oeYUOEm-w|Rxrqb0jg?20Bg-ioMz|Ps=;J4kIv{sUQwSYU>}0Qb
z&rLimyaaWR+^{xsy03tqoHmc$Z&x%jfl~eGs;Y;}cZeptP(=(1g>7$XfCue-PG{67
zdfSFBjQVmMo_Kj_ju{~$Sr?%gWi|Zkv`Nm@IBoj)YTIV3W75rcE92So-5<j8@@Yik
z-|yrG9A)!(6?ic`GQ@z?E4o;cE=}YxcDl(3D|*<k1x*$nt&8s#e$C(Z4EfslhJz=o
zX(565Yvo>pgtcj+YEJbCgEe+OWq1+V%g!8&9+%J4H<ET!dN>nbyp_s{q3aJQyx%9d
zFpXXN6^#LsuOkj={8~z(mmff=X|D4@VJT4K2aQHo*!uir3n@VWWOR+SxMpI0L`3w?
za_>VYbbozZ_g;}FRlR)Xvir@J3(FYgJelp#+{%FG$mBc${LfQkL)!vc3jLhWvpR)%
zb9C6qwK8EaF;m4XdCh>-QjFAAN&}2<N{x#qR;&dX%G>q#3=|sj_LxQOswqlHzU`yA
zNq^?Cir8FpX0YZ=g~;0-n9P^gYAvqyfQK7I?`&_kh>BjR?u`BQV>V!@K;QLbW$4De
z4@`DiEnIABwe+3Nsd6}kuW_@E!Vff5JkuYl;|RP^u_$-iB>g^SMZCXvy?e}J6>Dej
z8PPzM4%*2j7r$o7qkL;uHSULc^r&$fd33cH9r@RN1wOc%%+o`DTy=^p-Ii?|X{`<n
zR?pokbTtU+9nL(iFWK@HRi(LY&f3+GSv;gbJrQx0yUc0Ga<~*0ar*%;?1xO(Sn3##
zGV;2+1%aTYqvZ9F_xDsZd6%$zs4DFqQH?wrRNwaJ<WJ%sr}oiHaPLqcab~$Jh8Mk6
zF_6E!L`XxPp4O%aaU~mN77OkE)x;^5U5Uno&ZVhBLi?VcbAr01)qI%4FS+3;(!=_0
zUsr)K)TR*{aO}z3zHQElHMU&VlxK~Un|NP*@K;4!3GZ;m3QbyBIA7yLNB}=uUT%9C
zmU*LzJx{<?qkA(6icT98^$YhN9<4}AXn}Oj4wp40jU)Cx1kGR=#jC$drYo;h?(W<+
z^3N=1CR)~`C7I(TY_6D5!SP}uwS>i3yDPYYI0~ys64w<bzquR2Xjzx+<XG9iEvl+#
zB-}EK4Int;lcZhcoo*`RHkyWJ(}!D1_ci1`%iyfwd)$1C^6xgv9-TvoK4@GrMuL7x
z2YeClWwCnqPp9wYtv3J|w)`IxQ&865CZ_)d3zOLY$;9-3V__;E$_1_=BQ$HUmU2AR
zEcZPCX8-wHvjtto2`0Z*&&e?z=91M4ne>pTYaS2>f+D=tb@O%pZj%@sFzojS+%Vrh
zFzmM^l|2~t+Xx=^`=OD7D(`_!*@4}+o+sLeGIN{}qj_m`uXJvevIWwaKEtbib=M24
zj_T!})UT<%%ptij0bcJ&_S9FZzas1HXrn$?>(_!|zi*9<M}l#`J?awtCBN>^CN^uW
zw;Akp78GY_C$R+XfBBxv^)9ROT=ya48|(h(7%ByL1jTj$?63<~L7hAQo0>_2s-4p;
zHU9rmvvQweARZZlf{Fo-O?Z%tP*n%>sPUPrNJtFK|NT>t>py0~wfh^+lNHxa$b?&O
z(Yd^`lu&hhCEr&Z?PQX*s6=LCmU9eq;{(t`g2nyN#Ja2(>vlX2HN0N2h^eKUb-0;j
zbxcWfmNk6&)ocQB-=Yf47}ZVkU2IHjq)--Z*n}F-FGpVvwR$3LS?fce@G79}>B+*Q
zg`b`VMy3z@sRv86TH{`#lXEKV?-|7mZ6CYmY+R|EvAbDG0Z2H@WoT{Bx6Upc9WN)&
z_b-{S9c~*9P5Dzm0(Qy#qXxTN7RLM`+$lmm!4Xsm%Qv4u@Ir-#nV&>CUF+8xv=Q;o
z@qWEo*z>$RV{k6(WbVKgb|i>V?Fh3IdbvZvA2mc|b?>$2;2ueIY+WWXP1Ue%d4BPa
zHDSI0+JU`^o&b79^TaG;(u~nn9&hezM*tTd%bgI51~kxesKXH$wWZuU<1Iw`v|{J(
z;v#e{n+QV|BHVkaFiem1V^(iahn6#@q0}s+Vy69?E9uhkY;%aN=HqDxvQ~k)23dh+
zelAxm<m6V?9<H3@*Jiin>Fz#o8t0RHLyOlY#qicsso>)}MN%l4O>$*h^GeF~P>n&2
z>L;<PS32LNWGsj8g>|g!%f3dbk$WzipF$-Kl)jZM=7Oa2_8Bqp5e@3Cj)p05f}8k8
zos{JJluvpjzD+#0Y*5Q4o-4pW|2pSgJ<s&6aVG_XczDf18r5F66ghVbn|D)MBk+}Z
zLP%+wS2zDsoL|2ZVK95J{^!v+Iam4CfNTwXW;4ackcK=!t?AdcTh6o-O7kZU#xxvZ
z2Z7|Wj8~8h<^{8jGQBU;lIk%`Z>>H-RM{qJjW9~z8kVOrexsu{H+{<$o4h453={gy
zRC`I*qc3+|08d_Eo&SOKLx>tB_xQtT-pSq>wH(a)39O?=*Eue1k6Wtm!E-F-L_|hU
z&?;D*nRXb3=QUcRS(pei-QGm2o>V<5(>_pc))C8xc)0ebqtM>z(w8bSsamNyP@fJl
zAr|kz3-<;S{sOZttEGo`ABgMp?{<9|_hjRirU}cs#|D$797y==k%rxo!>eF5T-@sQ
z)I*=3Onta?vDBtSyec<K!gCUfeDz^oX-$6UdcI~Q_mwCv!rQZyHN~7(WFF?*Y)u>8
zs9i%@kZY)%af`NAxA3ohX_umU)?t83g*SFbcgUqXZJ~K#K`NJqB-(U7L~oeB^X_WZ
zXP)vGLr6!_;w)dcZ>T5FdQ<B4nBepX3tD!C)Pz3E*3T#X5=SGWt4ZBvjPDpF$-&E$
zb~My8+TO)G6m70ir7p{HbUEso{liiduSqi=Ygx$KHVN7wqaZTL10icyj#Zyw(Vg*6
zrfs6Uo$TFwd;v=7Rq|z{_qCJennqal{Wxp0T_{XCX^TVx{BcNDB*dEDg|sAdJKM40
z+=kW+E3n;=@`zoqYC&q#Br3nX+Q#?&hDlwg`s)6g@_0*2b+&R5B)v*SU%m3%4~rSl
zm<TQjG>vqr^G2Rv&v4`rsDtM0o;J?%iCPV{{BD6|P5CKBN_PlFcd+u*aqs0^bN=dI
zgJTP&<X>qSC0cZr6#Wv@T86RvS(&Pl_GyzuW3gk##MxYx2P28`qEh0baipZ87})G(
z*ZB$OJCB2%Iac_|zwGomZ8yfq6Y>;=Ws*Xs_h1{?FUKC)G>3m!;BFxt7@!f*)1ZsB
zH+@i>z2CiPnkeUCs;H}%qG&GMSLHW)yiBMesc*^5v2UKE)cB!E+S#yn3Wmp%mHvfY
zDG+r<Ty_0^xnsOKd0#C(QDnSr4Q&OX+t-)`JbvTct))$xk#E`h+`j1a&Jv#XAz4ch
zW#)T~l)Lu#cXU?tRDH(^GTHX{*L8fy%-n~0XrC1Ke}1dkrO%VygI}JlEq$mY_^#~R
zic1dcEk78OjkDCc`&mCKPFvC^qxC5tRsUfklR#*0CcfwBDuIZ+DMNf69mdKO80<X!
z@ar3bo>iJ??Dar$Bg>->9Q){M2$DN1<iy|a^)*&LuLC9;8^YJD_C<xHDrH5cUfC{}
z*Y;<^FZ(CwQeV|!*&+tS9)~GQUP?vX+`3FkB!Utg?bv`Z9aF?EQfI=Y;F4PYL8!5f
zowFQMlz`{Pd~@Bd3Da_K-egXaqUTcW#5X0@A^tM+iCZ0(b+3Q+8OEr$oOoCu@k4%X
zjBP<qj#EDuPt6Lwf93Ar?tW0(Y~DemDTt|<^<Hjl-lnNyd@!vFMM{m2iLNfZKc8%x
zqgRV(ahO1{{?Rq*1UuFV4ht<B%SlW<v^-}k1-zh2V})kMLAzVI`z8<kA`fgSZa7R<
zka_T*JkcarA_#43XnMEy6YI_ly^ba%^Rc$7@Z)r}BNv)<VZnwQW(jn_x01;Em*d2`
zo!3MNqSJ+mHCvVq7sTmxeU77#4AV7&h1jl(NY+aea)p;Q63j5zB3nul9j#@=Kku6F
z|6)|CF1C&H+F$PK;#Xm!y{9rU6U@Q7&lpfk*rO;ri`cg0Q0@}gAvcxdK3HY+fK(T}
zOZzgrxbfzTptY{%kDiR!LLZ^L9n*l+ry*~Ih_#rP1#eCw-^6sg+;$1GZOEN#&j`g*
z!m3>=)<vyG{X^PvmqanDT~(H1xrF$Yl@6P&N&itx6njsyy?5d~iI1<5M<uOb)UP2C
zfYF#7x%dQ+AD6ix1#Kn6(0nF^y-6X9SMdUmi7#>BKZsAg-Xl+UiBkFz5vGArMd3(m
z9qLlaFlRKEu?L5KT0>r1o}@3U_k&0j$Oh8pzE67@B-~Ua63oW+P|CtZ&>||X)4i3X
zmv=KxI(5?2f%ss+S8!~ir0|M)z8@=L9Dn-sM9GFv*`?Assx2n!fUK+W0a$U6`(&9q
z4O6h?`VPx_bRWTcROU)*_sIm9oR(m-FkUpA+L=`pMV8GSNpF~!&p=>P&@tc@*%??R
z`1+SY5Z8LLanG0U!9LhqM<qSuVKg25<>X{&#SXvLMKZZ>NU-8q4R^<3y5QtFD5We1
zXa_CFMzX9>``-#~NL5*b-WAs1!u)U>J?C3c(yJl;yM8BGd<JeQD@>!zREJn(o(${6
ztMwJGPxc@x^2nD6kl-sNBzQP5no@uhbc=)DF9rDFFs2lcg2TyDKn)IAKLAQ_2>EbY
z9{d1kz{_{a03A5=F9S5;aH8z=K1(^E1us7<KgF9W2h`zZ_6k4+fnNdW!r`Zi)B9YN
zfC0Q5RSC$$;cO+K2ZzE{r!b)kxDPMy{f27Qr+o9OPw%7GoR&>%0Bty4O%0$Aha|P9
zWtZAhzOBC@Q5|3czwcRh%CEidRKJ_`fGYg|Hub0Vwbq~NMb>bNXVm~G!|zx9hM0|~
zbb7zxyT(&}keg2V8#bNFSJQObE_lrV51js9GawF!&zpgJa5&t2S`SSNAcy$sP`a9+
zy~vM*bQ}7#1>k_Ayl(->kV~LFEda@F_}cblOBNgPT>_pY2UB?dbxr-e1zo>NaZ}{1
zlTVk!LoYi9r@-Z~1j(sC{uxc%(XGFI1s#no&AFgr?EnFS70E5!ABgxaAS<dfBJkH3
z8U>V;l7brgsSUsa;9~iHRNMd0*9F|?|Lp3z48`~e&~n1DIMXii-vlL@B|lx5pJA0>
zp*SxII~zh24mhDQsoAs>Xu_`skDC8m{bjrhgxqIz8{b`z(ZFq1yWe5%&KTwsUZ7)#
zinarU2!7(wK-@#nkmN~rp5HR*1v>sSeu>Q`58XgHk$<}yobe;3zCg!=pks&Y_fK;6
zGa~R;>zxa92r&_@P8h)!@(Dyr1bYbV+`q1yY|uyT06hZhTzcNWuvplkHSGX30_#t@
zTd*#|zi^O{2smOp04l_g5K3s()&~)IFCig;P4m}vz(E0Rl%OC7eJ}nq#hi}5^9g6q
zXd<{SsK$QUcL;(0q(lSx{X5d}MWEpw01X1`PpUBxi|4Fv@YfF!s7g0*1A1SYf)a|+
z`Fo)LN#+IO<Nt$yA`0c{1OP<;pU;wYhBzyBQD~@BA3%tZ=1<g1uzd*5h`?V&x=^=H
zfD-;lCv*a2mtgmy6<`_hSey^Wct%LAcaa+}V%Q+qoewQ_M(Aq-mF)W6X@BB0fhvPh
zHU7G+O(~#wN)$xUlr8`ZA<FqENN30@W*0@_Lx=*`DX$CEsnH7B*#%G{L^~JC<E$Pe
zLu)8j_wPY>E-uDjSodt;y(fkc>U^MyGc;M-i$a|~RtO>f9FYb!hx<jJUA0coAKk!h
z1lDHt%FA-_7CDIZZ>Oa>L;ZUIO2i|2{$TQ1T_G+Pgg}f4#7H`S80w5n*z*F}Y1bm2
zG&KCF!HRt(B$(w@ggN_+uGyCY%J_(a1UlOTV8Ppdy$5XjVh<=*@9$Rq<J*2gZJQvd
zO7CyA&pVBuaZn6~PJmd5wm<K3eTKyu0$iA~InJiS^IlhHgt{*;5S|Vs1jF-o{4+XE
z=mk3V)43Pk3dg-*D<CC8N&9|}z&|!auoeD&XV@k}ePIACqJPdC;?CG<CtYB7svewM
zE)0AvA4A(<znlEeMkvVa-^nU01FGH+(7=hF^n)V0WkTcn0Xjq{|Jh^&ss5dFL$Uy9
z;d^lQ5*_$Gah==0JChU1DI01t05HQjBn$v#C}ueT^kp$XZg74oKEE$^R>zgx3%auZ
Z*(FnvhrdF>l!4&ii(BAxQVf8l{{f_zre^>E

delta 61845
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
M2br8GN&v9-Ujn~<IRF3v


From bcf4f65cc979fe29f6d27c6a2dfe5c8a0797e601 Mon Sep 17 00:00:00 2001
From: Stephane Lesage <stephane.lesage@ateis.com>
Date: Thu, 3 Dec 2020 19:45:36 +0100
Subject: [PATCH 328/888] Fix & sync import/export entity icons/labels
 translation

---
 htdocs/core/modules/modSociete.class.php |   4 +-
 htdocs/core/modules/modStock.class.php   | 123 ++++++++++++--------
 htdocs/exports/export.php                |  46 ++++----
 htdocs/imports/import.php                | 139 +++++++++++++++++------
 htdocs/langs/en_US/exports.lang          |   1 +
 htdocs/langs/fr_FR/exports.lang          |   1 +
 6 files changed, 203 insertions(+), 111 deletions(-)

diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index a88ddc355a4..b0346054323 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -478,7 +478,7 @@ class modSociete extends DolibarrModules
 				'classfile' => '/core/class/cstate.class.php',
 				'class' => 'Cstate',
 				'method' => 'fetch',
-				'dict' => 'DictionaryState'
+				'dict' => 'DictionaryStateCode'
 			),
 			's.fk_pays' => array(
 				'rule' => 'fetchidfromcodeid',
@@ -630,7 +630,7 @@ class modSociete extends DolibarrModules
 				'classfile' => '/core/class/cstate.class.php',
 				'class' => 'Cstate',
 				'method' => 'fetch',
-				'dict' => 'DictionaryState'
+				'dict' => 'DictionaryStateCode'
 			),
 			's.fk_pays' => array(
 				'rule' => 'fetchidfromcodeid',
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index 4dd1a740278..81cebc83ff5 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -188,28 +188,31 @@ class modStock extends DolibarrModules
 		//--------
 		$r = 0;
 
+		// Export stock (without batch number)
 		$r++;
 		$this->export_code[$r] = $this->rights_class;
-		$this->export_label[$r] = "WarehousesAndProducts"; // Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_label[$r] = "Stocks"; // Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_icon[$r] = "warehouse";
 		$this->export_permission[$r] = array(array("stock", "lire"));
 		$this->export_fields_array[$r] = array(
-			'e.rowid'=>'IdWarehouse', 'e.ref'=>'LocationSummary', 'e.description'=>'DescWareHouse', 'e.lieu'=>'LieuWareHouse', 'e.address'=>'Address',
-			'e.zip'=>'Zip', 'e.town'=>'Town', 'p.rowid'=>"ProductId", 'p.ref'=>"Ref", 'p.fk_product_type'=>"Type", 'p.label'=>"Label", 'p.description'=>"Description",
-			'p.note'=>"Note", 'p.price'=>"Price", 'p.tva_tx'=>'VAT', 'p.tosell'=>"OnSell", 'p.tobuy'=>'OnBuy', 'p.duration'=>"Duration", 'p.datec'=>'DateCreation',
-			'p.tms'=>'DateModification', 'p.pmp'=>'PMPValue', 'p.cost_price'=>'CostPrice'
+			'e.rowid'=>'IdWarehouse', 'e.ref'=>'LocationSummary', 'e.description'=>'DescWareHouse', 'e.lieu'=>'LieuWareHouse', 'e.address'=>'Address', 'e.zip'=>'Zip', 'e.town'=>'Town',
+			'p.rowid'=>"ProductId", 'p.ref'=>"Ref", 'p.fk_product_type'=>"Type", 'p.label'=>"Label", 'p.description'=>"Description", 'p.note'=>"Note",
+			'p.price'=>"Price", 'p.tva_tx'=>'VAT', 'p.tosell'=>"OnSell", 'p.tobuy'=>'OnBuy', 'p.duration'=>"Duration",
+			'p.datec'=>'DateCreation', 'p.tms'=>'DateModification', 'p.pmp'=>'PMPValue', 'p.cost_price'=>'CostPrice',
 		);
 		$this->export_TypeFields_array[$r] = array(
-			'e.rowid'=>'List:entrepot:ref::stock', 'e.ref'=>'Text', 'e.lieu'=>'Text', 'e.address'=>'Text', 'e.zip'=>'Text', 'e.town'=>'Text', 'p.rowid'=>"List:product:label::product",
-			'p.ref'=>"Text", 'p.fk_product_type'=>"Text", 'p.label'=>"Text", 'p.description'=>"Text", 'p.note'=>"Text", 'p.price'=>"Numeric", 'p.tva_tx'=>'Numeric',
-			'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean", 'p.duration'=>"Duree", 'p.datec'=>'Date', 'p.tms'=>'Date', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric',
+			'e.rowid'=>'List:entrepot:ref::stock', 'e.ref'=>'Text', 'e.lieu'=>'Text', 'e.address'=>'Text', 'e.zip'=>'Text', 'e.town'=>'Text',
+			'p.rowid'=>"List:product:label::product", 'p.ref'=>"Text", 'p.fk_product_type'=>"Text", 'p.label'=>"Text", 'p.description'=>"Text", 'p.note'=>"Text",
+			'p.price'=>"Numeric", 'p.tva_tx'=>'Numeric', 'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean", 'p.duration'=>"Duree",
+			'p.datec'=>'Date', 'p.tms'=>'Date', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric',
 			'ps.reel'=>'Numeric'
 		);
 		$this->export_entities_array[$r] = array(
-			'e.rowid'=>'warehouse', 'e.ref'=>'warehouse', 'e.description'=>'warehouse', 'e.lieu'=>'warehouse', 'e.address'=>'warehouse', 'e.zip'=>'warehouse',
-			'e.town'=>'warehouse', 'p.rowid'=>"product", 'p.ref'=>"product", 'p.fk_product_type'=>"product", 'p.label'=>"product", 'p.description'=>"product",
-			'p.note'=>"product", 'p.price'=>"product", 'p.tva_tx'=>'product', 'p.tosell'=>"product", 'p.tobuy'=>"product", 'p.duration'=>"product",
-			'p.datec'=>'product', 'p.tms'=>'product', 'p.pmp'=>'product', 'p.cost_price'=>'product', 'ps.reel'=>'stock'
-		);
+			'p.rowid'=>"product", 'p.ref'=>"product", 'p.fk_product_type'=>"product", 'p.label'=>"product", 'p.description'=>"product", 'p.note'=>"product",
+			'p.price'=>"product", 'p.tva_tx'=>'product', 'p.tosell'=>"product", 'p.tobuy'=>"product", 'p.duration'=>"product",
+			'p.datec'=>'product', 'p.tms'=>'product', 'p.pmp'=>'product', 'p.cost_price'=>'product',
+			'ps.reel'=>'stock'
+		);	// We define here only fields that use another icon that the one defined into export_icon
 		$this->export_aggregate_array[$r] = array('ps.reel'=>'SUM'); // TODO Not used yet
 		$this->export_dependencies_array[$r] = array('stock'=>array('p.rowid', 'e.rowid')); // We must keep this until the aggregate_array is used. To have a unique key, if we ask a field of a child, to avoid the DISTINCT to discard them.
 		$keyforselect = 'product'; $keyforelement = 'product'; $keyforaliasextra = 'extra';
@@ -220,73 +223,78 @@ class modStock extends DolibarrModules
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON extra.fk_object = p.rowid, '.MAIN_DB_PREFIX.'product_stock as ps, '.MAIN_DB_PREFIX.'entrepot as e';
 		$this->export_sql_end[$r] .= ' WHERE p.rowid = ps.fk_product AND ps.fk_entrepot = e.rowid';
 		$this->export_sql_end[$r] .= ' AND e.entity IN ('.getEntity('stock').')';
+
+		// Export stock including batch number
 		if ($conf->productbatch->enabled)
 		{
-			// Export of stock including lot number
 			$langs->load("productbatch");
 
 			// This request is same than previous but without field ps.stock (real stock in warehouse) and with link to subtable productbatch
 			$r++;
 
 			$this->export_code[$r] = $this->rights_class.'_lot';
-			$this->export_label[$r] = "WarehousesAndProductsBatchDetail"; // Translation key (used only if key ExportDataset_xxx_z not found)
+			$this->export_label[$r] = "StocksWithBatch"; // Translation key (used only if key ExportDataset_xxx_z not found)
+			$this->export_icon[$r] = "warehouse";
 			$this->export_permission[$r] = array(array("stock", "lire"));
 			$this->export_fields_array[$r] = array(
-				'e.rowid'=>'IdWarehouse', 'e.ref'=>'LocationSummary', 'e.description'=>'DescWareHouse', 'e.lieu'=>'LieuWareHouse', 'e.address'=>'Address',
-				'e.zip'=>'Zip', 'e.town'=>'Town', 'p.rowid'=>"ProductId", 'p.ref'=>"Ref", 'p.fk_product_type'=>"Type", 'p.label'=>"Label", 'p.description'=>"Description",
-				'p.note'=>"Note", 'p.price'=>"Price", 'p.tva_tx'=>'VAT', 'p.tosell'=>"OnSell", 'p.tobuy'=>'OnBuy', 'p.duration'=>"Duration", 'p.datec'=>'DateCreation',
-				'p.tms'=>'DateModification', 'pb.rowid'=>'Id', 'pb.batch'=>'Batch', 'pb.qty'=>'Qty', 'pl.eatby'=>'EatByDate', 'pl.sellby'=>'SellByDate'
+				'e.rowid'=>'IdWarehouse', 'e.ref'=>'LocationSummary', 'e.description'=>'DescWareHouse', 'e.lieu'=>'LieuWareHouse', 'e.address'=>'Address', 'e.zip'=>'Zip', 'e.town'=>'Town',
+				'p.rowid'=>"ProductId", 'p.ref'=>"Ref", 'p.fk_product_type'=>"Type", 'p.label'=>"Label", 'p.description'=>"Description", 'p.note'=>"Note",
+				'p.price'=>"Price", 'p.tva_tx'=>'VAT', 'p.tosell'=>"OnSell", 'p.tobuy'=>'OnBuy', 'p.duration'=>"Duration",
+				'p.datec'=>'DateCreation', 'p.tms'=>'DateModification', 'p.pmp'=>'PMPValue', 'p.cost_price'=>'CostPrice',
+				'pb.rowid'=>'Id', 'pb.batch'=>'Batch', 'pb.qty'=>'Qty',
+				'pl.eatby'=>'EatByDate', 'pl.sellby'=>'SellByDate'
 			);
 			$this->export_TypeFields_array[$r] = array(
 				'e.rowid'=>'List:entrepot:ref::stock', 'e.ref'=>'Text', 'e.lieu'=>'Text', 'e.description'=>'Text', 'e.address'=>'Text', 'e.zip'=>'Text', 'e.town'=>'Text',
 				'p.rowid'=>"List:product:label::product", 'p.ref'=>"Text", 'p.fk_product_type'=>"Text", 'p.label'=>"Text", 'p.description'=>"Text", 'p.note'=>"Text",
-				'p.price'=>"Numeric", 'p.tva_tx'=>'Numeric', 'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean", 'p.duration'=>"Duree", 'p.datec'=>'Date', 'p.tms'=>'Date',
-				'pb.batch'=>'Text', 'pb.qty'=>'Numeric', 'pl.eatby'=>'Date', 'pl.sellby'=>'Date'
+				'p.price'=>"Numeric", 'p.tva_tx'=>'Numeric', 'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean", 'p.duration'=>"Duree",
+				'p.datec'=>'DateCreation', 'p.tms'=>'DateModification', 'p.pmp'=>'PMPValue', 'p.cost_price'=>'CostPrice',
+				'pb.batch'=>'Text', 'pb.qty'=>'Numeric',
+				'pl.eatby'=>'Date', 'pl.sellby'=>'Date'
 			);
 			$this->export_entities_array[$r] = array(
-				'e.rowid'=>'warehouse', 'e.ref'=>'warehouse', 'e.description'=>'warehouse', 'e.lieu'=>'warehouse', 'e.address'=>'warehouse', 'e.zip'=>'warehouse',
-				'e.town'=>'warehouse', 'p.rowid'=>"product", 'p.ref'=>"product", 'p.fk_product_type'=>"product", 'p.label'=>"product", 'p.description'=>"product",
-				'p.note'=>"product", 'p.price'=>"product", 'p.tva_tx'=>'product', 'p.tosell'=>"product", 'p.tobuy'=>"product", 'p.duration'=>"product",
-				'p.datec'=>'product', 'p.tms'=>'product', 'pb.rowid'=>'stockbatch', 'pb.batch'=>'stockbatch', 'pb.qty'=>'stockbatch', 'pl.eatby'=>'batch',
-				'pl.sellby'=>'batch'
-			);
+				'p.rowid'=>"product", 'p.ref'=>"product", 'p.fk_product_type'=>"product", 'p.label'=>"product", 'p.description'=>"product", 'p.note'=>"product",
+				'p.price'=>"product", 'p.tva_tx'=>'product', 'p.tosell'=>"product", 'p.tobuy'=>"product", 'p.duration'=>"product",
+				'p.datec'=>'product', 'p.tms'=>'product', 'p.pmp'=>'product', 'p.cost_price'=>'product',
+				'pb.rowid'=>'batch', 'pb.batch'=>'batch', 'pb.qty'=>'batch',
+				'pl.eatby'=>'batch', 'pl.sellby'=>'batch'
+			);	// We define here only fields that use another icon that the one defined into export_icon
 			$this->export_aggregate_array[$r] = array('ps.reel'=>'SUM'); // TODO Not used yet
 			$this->export_dependencies_array[$r] = array('stockbatch'=>array('pb.rowid'), 'batch'=>array('pb.rowid')); // We must keep this until the aggregate_array is used. To add unique key if we ask a field of a child to avoid the DISTINCT to discard them.
 			$keyforselect = 'product_lot'; $keyforelement = 'batch'; $keyforaliasextra = 'extra';
 			include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+
 			$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 			$this->export_sql_end[$r]  = ' FROM ('.MAIN_DB_PREFIX.'product as p, '.MAIN_DB_PREFIX.'product_stock as ps, '.MAIN_DB_PREFIX.'product_batch as pb)';
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_lot as pl ON pl.fk_product = p.rowid AND pl.batch = pb.batch';
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_lot_extrafields as extra ON extra.fk_object = pl.rowid,';
 			$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'entrepot as e';
 			$this->export_sql_end[$r] .= ' WHERE p.rowid = ps.fk_product AND ps.fk_entrepot = e.rowid AND ps.rowid = pb.fk_product_stock';
-			$this->export_sql_end[$r] .= ' AND e.entity IN ('.getEntity('stock').')';
-		}
+			$this->export_sql_end[$r] .= ' AND e.entity IN ('.getEntity('stock').')';		}
 
-		// Export of stock movement
+		// Export of stock movements
 		$r++;
 		$this->export_code[$r] = $this->rights_class.'_movement';
 		$this->export_label[$r] = "StockMovements"; // Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_icon[$r] = "movement";
 		$this->export_permission[$r] = array(array("stock", "lire"));
 		$this->export_fields_array[$r] = array(
-			'e.rowid'=>'IdWarehouse', 'e.ref'=>'LocationSummary', 'e.description'=>'DescWareHouse', 'e.lieu'=>'LieuWareHouse', 'e.address'=>'Address', 'e.zip'=>'Zip',
-			'e.town'=>'Town', 'p.rowid'=>"ProductId", 'p.ref'=>"Ref", 'p.fk_product_type'=>"Type", 'p.label'=>"Label", 'p.description'=>"Description", 'p.note'=>"Note",
-			'p.price'=>"Price", 'p.tva_tx'=>'VAT', 'p.tosell'=>"OnSell", 'p.tobuy'=>'OnBuy', 'p.duration'=>"Duration", 'p.datec'=>'DateCreation',
-			'p.tms'=>'DateModification', 'sm.rowid'=>'MovementId', 'sm.value'=>'Qty', 'sm.datem'=>'DateMovement', 'sm.label'=>'MovementLabel',
-			'sm.inventorycode'=>'InventoryCode'
+			'sm.rowid'=>'MovementId', 'sm.value'=>'Qty', 'sm.datem'=>'DateMovement', 'sm.label'=>'MovementLabel', 'sm.inventorycode'=>'InventoryCode',
+			'e.rowid'=>'IdWarehouse', 'e.ref'=>'LocationSummary', 'e.description'=>'DescWareHouse', 'e.lieu'=>'LieuWareHouse', 'e.address'=>'Address', 'e.zip'=>'Zip', 'e.town'=>'Town',
+			'p.rowid'=>"ProductId", 'p.ref'=>"Ref", 'p.fk_product_type'=>"Type", 'p.label'=>"Label", 'p.description'=>"Description", 'p.note'=>"Note",
+			'p.price'=>"Price", 'p.tva_tx'=>'VAT', 'p.tosell'=>"OnSell", 'p.tobuy'=>'OnBuy', 'p.duration'=>"Duration", 'p.datec'=>'DateCreation', 'p.tms'=>'DateModification'
 		);
 		$this->export_TypeFields_array[$r] = array(
+			'sm.rowid'=>'Numeric', 'sm.value'=>'Numeric', 'sm.datem'=>'Date', 'sm.batch'=>'Text', 'sm.label'=>'Text', 'sm.inventorycode'=>'Text',
 			'e.rowid'=>'List:entrepot:ref::stock', 'e.ref'=>'Text', 'e.description'=>'Text', 'e.lieu'=>'Text', 'e.address'=>'Text', 'e.zip'=>'Text', 'e.town'=>'Text',
 			'p.rowid'=>"List:product:label::product", 'p.ref'=>"Text", 'p.fk_product_type'=>"Text", 'p.label'=>"Text", 'p.description'=>"Text", 'p.note'=>"Text",
-			'p.price'=>"Numeric", 'p.tva_tx'=>'Numeric', 'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean", 'p.duration'=>"Duree", 'p.datec'=>'Date', 'p.tms'=>'Date',
-			'sm.rowid'=>'Numeric', 'sm.value'=>'Numeric', 'sm.datem'=>'Date', 'sm.batch'=>'Text', 'sm.label'=>'Text', 'sm.inventorycode'=>'Text'
+			'p.price'=>"Numeric", 'p.tva_tx'=>'Numeric', 'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean", 'p.duration'=>"Duree", 'p.datec'=>'Date', 'p.tms'=>'Date'
 		);
 		$this->export_entities_array[$r] = array(
-			'e.rowid'=>'warehouse', 'e.ref'=>'warehouse', 'e.description'=>'warehouse', 'e.lieu'=>'warehouse', 'e.address'=>'warehouse', 'e.zip'=>'warehouse',
-			'e.town'=>'warehouse', 'p.rowid'=>"product", 'p.ref'=>"product", 'p.fk_product_type'=>"product", 'p.label'=>"product", 'p.description'=>"product",
-			'p.note'=>"product", 'p.price'=>"product", 'p.tva_tx'=>'product', 'p.tosell'=>"product", 'p.tobuy'=>"product", 'p.duration'=>"product", 'p.datec'=>'product',
-			'p.tms'=>'product', 'sm.rowid'=>'movement', 'sm.value'=>'movement', 'sm.datem'=>'movement', 'sm.label'=>'movement', 'sm.inventorycode'=>'movement'
-		);
+			'e.rowid'=>'warehouse', 'e.ref'=>'warehouse', 'e.description'=>'warehouse', 'e.lieu'=>'warehouse', 'e.address'=>'warehouse', 'e.zip'=>'warehouse', 'e.town'=>'warehouse',
+			'p.rowid'=>"product", 'p.ref'=>"product", 'p.fk_product_type'=>"product", 'p.label'=>"product", 'p.description'=>"product", 'p.note'=>"product",
+			'p.price'=>"product", 'p.tva_tx'=>'product', 'p.tosell'=>"product", 'p.tobuy'=>"product", 'p.duration'=>"product", 'p.datec'=>'product', 'p.tms'=>'product'
+		);	// We define here only fields that use another icon that the one defined into export_icon
 		if ($conf->productbatch->enabled)
 		{
 			$this->export_fields_array[$r]['sm.batch'] = 'Batch';
@@ -295,6 +303,7 @@ class modStock extends DolibarrModules
 		}
 		$this->export_aggregate_array[$r] = array('sm.value'=>'SUM'); // TODO Not used yet
 		$this->export_dependencies_array[$r] = array('movement'=>array('sm.rowid')); // We must keep this until the aggregate_array is used. To add unique key if we ask a field of a child to avoid the DISTINCT to discard them.
+
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p, '.MAIN_DB_PREFIX.'stock_mouvement as sm, '.MAIN_DB_PREFIX.'entrepot as e';
 		$this->export_sql_end[$r] .= ' WHERE p.rowid = sm.fk_product AND sm.fk_entrepot = e.rowid';
@@ -309,34 +318,48 @@ class modStock extends DolibarrModules
 		$r++;
 		$this->import_code[$r] = $this->rights_class.'_'.$r;
 		$this->import_label[$r] = "Warehouses"; // Translation key
-		$this->import_icon[$r] = $this->picto;
+		$this->import_icon[$r] = "warehouse";
 		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
 		$this->import_tables_array[$r] = array('e'=>MAIN_DB_PREFIX.'entrepot');
 		$this->import_tables_creator_array[$r] = array('e'=>'fk_user_author');
 		$this->import_fields_array[$r] = array('e.ref'=>"LocationSummary*",
-				'e.description'=>"DescWareHouse", 'e.lieu'=>"LieuWareHouse",
-				'e.address'=>"Address", 'e.zip'=>'Zip', 'e.fk_pays'=>'CountryCode',
+				'e.description'=>"DescWareHouse",
+				'e.lieu'=>"LieuWareHouse",
+				'e.address'=>"Address",
+				'e.zip'=>'Zip',
+				'e.fk_departement'=>'StateCode',
+				'e.fk_pays'=>'CountryCode',
+				'e.phone'=>'Phone',
+				'e.fax'=>'Fax',
 				'e.statut'=>'Status',
                 'e.fk_parent'=>'ParentWarehouse'
 		);
 
 		$this->import_convertvalue_array[$r] = array(
+				'e.fk_departement'=>array('rule'=>'fetchidfromcodeid', 'classfile'=>'/core/class/cstate.class.php', 'class'=>'Cstate', 'method'=>'fetch', 'dict'=>'DictionaryStateCode'),
 				'e.fk_pays'=>array('rule'=>'fetchidfromcodeid', 'classfile'=>'/core/class/ccountry.class.php', 'class'=>'Ccountry', 'method'=>'fetch', 'dict'=>'DictionaryCountry'),
                 'e.fk_parent'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/stock/class/entrepot.class.php', 'class'=>'Entrepot', 'method'=>'fetch', 'element'=>'ref')
 		);
 		$this->import_regex_array[$r] = array('e.statut'=>'^[0|1]');
 		$this->import_examplevalues_array[$r] = array('e.ref'=>"ALM001",
-				'e.description'=>"Central Warehouse", 'e.lieu'=>"Central",
-				'e.address'=>"Route 66", 'e.zip'=>'28080', 'e.fk_pays'=>'US',
+				'e.description'=>"Central Warehouse",
+				'e.lieu'=>"Central",
+				'e.address'=>"Route 66",
+				'e.zip'=>'28080',
+				'e.fk_departement'=>'matches field "code_departement" in table "'.MAIN_DB_PREFIX.'c_departements"',
+				'e.fk_pays'=>'US/FR/DE etc. matches field "code" in table "'.MAIN_DB_PREFIX.'c_country"',
+				'e.phone'=>'(+33)(0)123456789',
+				'e.fax'=>'(+33)(0)123456790',
 				'e.statut'=>'1',
-                'e.fk_parent'=>''
+                'e.fk_parent'=>'id or ref in this table'
         );
+        $this->import_updatekeys_array[$r] = array('p.ref'=>'Ref');
 
 		// Import stocks
 		$r++;
 		$this->import_code[$r] = $this->rights_class.'_'.$r;
 		$this->import_label[$r] = "Stocks"; // Translation key
-		$this->import_icon[$r] = $this->picto;
+		$this->import_icon[$r] = "stock";
 		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
 		$this->import_tables_array[$r] = array('ps'=>MAIN_DB_PREFIX.'product_stock');
 		$this->import_fields_array[$r] = array('ps.fk_product'=>"Product*", 'ps.fk_entrepot'=>"Warehouse*", 'ps.reel'=>"Stock*");
@@ -346,7 +369,7 @@ class modStock extends DolibarrModules
 			'ps.fk_entrepot'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/stock/class/entrepot.class.php', 'class'=>'Entrepot', 'method'=>'fetch', 'element'=>'ref')
 		  );
 		$this->import_examplevalues_array[$r] = array(
-		    'ps.fk_product'=>"PREF123456", 'ps.fk_entrepot'=>"ALM001", 'ps.reel'=>"10"
+		    'ps.fk_product'=>"id or ref", 'ps.fk_entrepot'=>"id or ref", 'ps.reel'=>"10"
 		);
 		$this->import_updatekeys_array[$r] = array('ps.fk_product'=>'Product', 'ps.fk_entrepot'=>"Warehouse");
 		$this->import_run_sql_after_array[$r] = array(    // Because we may change data that are denormalized, we must update dernormalized data after.
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 6543747d1f7..541c43f1149 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -39,6 +39,7 @@ $langs->loadlangs(array('admin', 'exports', 'other', 'users', 'companies', 'proj
 //if (! $user->admin)
 //  accessforbidden();
 
+// Map icons, array duplicated in import.php, was not synchronized, TODO put it somewhere only once
 $entitytoicon = array(
 	'invoice'      => 'bill',
     'invoice_line' => 'bill',
@@ -54,13 +55,13 @@ $entitytoicon = array(
     'payment'      => 'payment',
 	'tax'          => 'generic',
     'tax_type'     => 'generic',
-    'stock'        => 'generic',
     'other'        => 'generic',
 	'account'      => 'account',
 	'product'      => 'product',
     'virtualproduct'=>'product',
 	'subproduct'   => 'product',
 	'product_supplier_ref'      => 'product',
+    'stock'        => 'stock',
 	'warehouse'    => 'stock',
 	'batch'        => 'stock',
 	'stockbatch'   => 'stock',
@@ -78,7 +79,7 @@ $entitytoicon = array(
     'bomline'      => 'bom'
 );
 
-// Translation code
+// Translation code, array duplicated in import.php, was not synchronized, TODO put it somewhere only once
 $entitytolang = array(
 	'user'         => 'User',
 	'company'      => 'Company',
@@ -459,15 +460,14 @@ if ($step == 1 || !$datatoexport)
     	$sortedarrayofmodules = dol_sort_array($objexport->array_export_module, 'module_position', 'asc', 0, 0, 1);
     	foreach ($sortedarrayofmodules as $key => $value)
         {
+			//var_dump($objexport->array_import_code[$key]);
             print '<tr class="oddeven"><td nospan="nospan">';
-	        //print img_object($objexport->array_export_module[$key]->getName(),$export->array_export_module[$key]->picto).' ';
-            print $objexport->array_export_module[$key]->getName();
+			print $objexport->array_export_module[$key]->getName();
             print '</td><td>';
-			$icon = preg_replace('/:.*$/', '', $objexport->array_export_icon[$key]);
-			$label = $objexport->array_export_label[$key];
-            //print $value.'-'.$icon.'-'.$label."<br>";
-			print img_object($objexport->array_export_module[$key]->getName(), $icon).' ';
-            print $label;
+			$entity = preg_replace('/:.*$/', '', $objexport->array_export_icon[$key]);
+			$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+ 			print img_object($objexport->array_export_module[$key]->getName(), $entityicon).' ';
+            print $objexport->array_export_label[$key];
             print '</td><td class="right">';
             if ($objexport->array_export_perms[$key])
             {
@@ -522,11 +522,10 @@ if ($step == 2 && $datatoexport)
     // Lot de donnees a exporter
     print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
     print '<td>';
-	$icon = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
-    $label = $objexport->array_export_label[0];
-    //print $value.'-'.$icon.'-'.$label."<br>";
-    print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
-    print $label;
+	$entity = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
+	$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+    print img_object($objexport->array_export_module[0]->getName(), $entityicon).' ';
+    print $objexport->array_export_label[0];
     print '</td></tr>';
 
     print '</table>';
@@ -728,11 +727,10 @@ if ($step == 3 && $datatoexport)
 	// Lot de donnees a exporter
 	print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
 	print '<td>';
-	$icon = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
-	$label = $objexport->array_export_label[0];
-	//print $value.'-'.$icon.'-'.$label."<br>";
-	print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
-	print $label;
+	$entity = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
+	$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+	print img_object($objexport->array_export_module[0]->getName(), $entityicon).' ';
+	print $objexport->array_export_label[0];
 	print '</td></tr>';
 
 	// Nbre champs exportes
@@ -920,8 +918,9 @@ if ($step == 4 && $datatoexport)
     // Lot de donnees a exporter
     print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
     print '<td>';
-	$icon = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
-    print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
+	$entity = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
+	$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+    print img_object($objexport->array_export_module[0]->getName(), $entityicon).' ';
     print $objexport->array_export_label[0];
     print '</td></tr>';
 
@@ -1190,8 +1189,9 @@ if ($step == 5 && $datatoexport)
     // Dataset to export
     print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
     print '<td>';
-	$icon = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
-    print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
+	$entity = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
+	$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+    print img_object($objexport->array_export_module[0]->getName(), $entityicon).' ';
     print $objexport->array_export_label[0];
     print '</td></tr>';
 
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 0819ce0ac30..c6e2e282778 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -38,31 +38,93 @@ $langs->loadLangs(array('exports', 'compta', 'errors'));
 // Security check
 $result = restrictedArea($user, 'import');
 
+// Map icons, array duplicated in export.php, was not synchronized, TODO put it somewhere only once
 $entitytoicon = array(
-	'invoice'=>'bill', 'invoice_line'=>'bill',
-	'order'=>'order', 'order_line'=>'order',
-	'intervention'=>'intervention', 'inter_line'=>'intervention',
-	'member'=>'user', 'member_type'=>'group', 'subscription'=>'payment',
-	'tax'=>'bill', 'tax_type'=>'generic',
-	'account'=>'account',
-	'payment'=>'payment',
-	'product'=>'product', 'stock'=>'generic', 'warehouse'=>'stock',
-	'category'=>'generic',
-	'other'=>'generic'
+	'invoice'      => 'bill',
+    'invoice_line' => 'bill',
+	'order'        => 'order',
+    'order_line'   => 'order',
+	'propal'       => 'propal',
+    'propal_line'  => 'propal',
+	'intervention' => 'intervention',
+    'inter_line'   => 'intervention',
+	'member'       => 'user',
+    'member_type'  => 'group',
+    'subscription' => 'payment',
+    'payment'      => 'payment',
+	'tax'          => 'bill',
+    'tax_type'     => 'generic',
+    'other'        => 'generic',
+	'account'      => 'account',
+	'product'      => 'product',
+    'virtualproduct'=>'product',
+	'subproduct'   => 'product',
+	'product_supplier_ref'      => 'product',
+    'stock'        => 'stock',
+	'warehouse'    => 'stock',
+	'batch'        => 'stock',
+	'stockbatch'   => 'stock',
+	'category'     => 'category',
+	'shipment'     => 'sending',
+    'shipment_line'=> 'sending',
+    'reception'=> 'sending',
+    'reception_line'=> 'sending',
+	'expensereport'=> 'trip',
+    'expensereport_line'=> 'trip',
+	'holiday'      => 'holiday',
+    'contract_line' => 'contract',
+    'translation'  => 'generic',
+    'bomm'         => 'bom',
+    'bomline'      => 'bom'
 );
-$entitytolang = array(		// Translation code
-	'user'=>'User',
-	'company'=>'Company', 'contact'=>'Contact',
-	'invoice'=>'Bill', 'invoice_line'=>'InvoiceLine',
-	'order'=>'Order', 'order_line'=>'OrderLine',
-	'intervention'=>'Intervention', 'inter_line'=>'InterLine',
-	'member'=>'Member', 'member_type'=>'MemberType', 'subscription'=>'Subscription',
-	'tax'=>'SocialContribution', 'tax_type'=>'DictionarySocialContributions',
-	'account'=>'BankTransactions',
-	'payment'=>'Payment',
-	'product'=>'Product', 'stock'=>'Stock', 'warehouse'=>'Warehouse',
-	'category'=>'Category',
-	'other'=>'Other'
+
+// Translation code, array duplicated in export.php, was not synchronized, TODO put it somewhere only once
+$entitytolang = array(
+	'user'         => 'User',
+	'company'      => 'Company',
+    'contact'      => 'Contact',
+	'invoice'      => 'Bill',
+    'invoice_line' => 'InvoiceLine',
+	'order'        => 'Order',
+    'order_line'   => 'OrderLine',
+    'propal'       => 'Proposal',
+    'propal_line'  => 'ProposalLine',
+	'intervention' => 'Intervention',
+    'inter_line'   => 'InterLine',
+	'member'       => 'Member',
+    'member_type'  => 'MemberType',
+    'subscription' => 'Subscription',
+	'tax'          => 'SocialContribution',
+    'tax_type'     => 'DictionarySocialContributions',
+	'account'      => 'BankTransactions',
+	'payment'      => 'Payment',
+	'product'      => 'Product',
+	'virtualproduct'  => 'AssociatedProducts',
+	'subproduct'      => 'SubProduct',
+	'product_supplier_ref'      => 'SupplierPrices',
+	'service'      => 'Service',
+    'stock'        => 'Stock',
+	'movement'	   => 'StockMovement',
+	'batch'        => 'Batch',
+	'stockbatch'   => 'StockDetailPerBatch',
+	'warehouse'    => 'Warehouse',
+	'category'     => 'Category',
+	'other'        => 'Other',
+    'trip'         => 'TripsAndExpenses',
+    'shipment'     => 'Shipments',
+    'shipment_line'=> 'ShipmentLine',
+    'project'      => 'Projects',
+    'projecttask'  => 'Tasks',
+    'task_time'    => 'TaskTimeSpent',
+	'action'       => 'Event',
+	'expensereport'=> 'ExpenseReport',
+	'expensereport_line'=> 'ExpenseReportLine',
+	'holiday'      => 'TitreRequestCP',
+	'contract'     => 'Contract',
+    'contract_line'=> 'ContractLine',
+    'translation'  => 'Translation',
+    'bom'          => 'BOM',
+    'bomline'      => 'BOMLine'
 );
 
 $datatoimport		= GETPOST('datatoimport');
@@ -365,7 +427,9 @@ if ($step == 1 || !$datatoimport)
 			if (in_array($objimport->array_import_code[$key], array('produit_supplierprices', 'produit_multiprice', 'produit_languages'))) $titleofmodule = $langs->trans("ProductOrService");
 			print $titleofmodule;
 			print '</td><td>';
-			print img_object($objimport->array_import_module[$key]->getName(), $objimport->array_import_icon[$key]).' ';
+			$entity = preg_replace('/:.*$/', '', $objimport->array_import_icon[$key]);
+			$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+			print img_object($objimport->array_import_module[$key]->getName(), $entityicon).' ';
 			print $objimport->array_import_label[$key];
             print '</td><td style="text-align: right">';
 			if ($objimport->array_import_perms[$key])
@@ -422,17 +486,17 @@ if ($step == 2 && $datatoimport)
 	// Lot de donnees a importer
 	print '<tr><td>'.$langs->trans("DatasetToImport").'</td>';
 	print '<td>';
-	print img_object($objimport->array_import_module[0]->getName(), $objimport->array_import_icon[0]).' ';
+	$entity = preg_replace('/:.*$/', '', $objimport->array_import_icon[0]);
+	$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+	print img_object($objimport->array_import_module[0]->getName(), $entityicon).' ';
 	print $objimport->array_import_label[0];
 	print '</td></tr>';
 
 	print '</table>';
-
 	print '</div>';
 
 	dol_fiche_end();
 
-
 	print '<form name="userfile" action="'.$_SERVER["PHP_SELF"].'" enctype="multipart/form-data" METHOD="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="max_file_size" value="'.$conf->maxfilesize.'">';
@@ -512,17 +576,17 @@ if ($step == 3 && $datatoimport)
 	// Lot de donnees a importer
 	print '<tr><td>'.$langs->trans("DatasetToImport").'</td>';
 	print '<td>';
-	print img_object($objimport->array_import_module[0]->getName(), $objimport->array_import_icon[0]).' ';
+	$entity = preg_replace('/:.*$/', '', $objimport->array_import_icon[0]);
+	$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+	print img_object($objimport->array_import_module[0]->getName(), $entityicon).' ';
 	print $objimport->array_import_label[0];
 	print '</td></tr>';
 
 	print '</table>';
 	print '</div>';
 
-
 	print load_fiche_titre($langs->trans("InformationOnSourceFile"), '', '');
 
-
 	print '<div class="underbanner clearboth"></div>';
 	print '<div class="fichecenter">';
 	print '<table width="100%" class="border tableforfield">';
@@ -797,14 +861,15 @@ if ($step == 4 && $datatoimport)
 	// Lot de donnees a importer
 	print '<tr><td>'.$langs->trans("DatasetToImport").'</td>';
 	print '<td>';
-	print img_object($objimport->array_import_module[0]->getName(), $objimport->array_import_icon[0]).' ';
+	$entity = preg_replace('/:.*$/', '', $objimport->array_import_icon[0]);
+	$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+	print img_object($objimport->array_import_module[0]->getName(), $entityicon).' ';
 	print $objimport->array_import_label[0];
 	print '</td></tr>';
 
 	print '</table>';
 	print '</div>';
 
-
 	print load_fiche_titre($langs->trans("InformationOnSourceFile"), '', '');
 
 	print '<div class="underbanner clearboth"></div>';
@@ -1273,14 +1338,15 @@ if ($step == 5 && $datatoimport)
 	// Lot de donnees a importer
 	print '<tr><td>'.$langs->trans("DatasetToImport").'</td>';
 	print '<td>';
-	print img_object($objimport->array_import_module[0]->getName(), $objimport->array_import_icon[0]).' ';
+	$entity = preg_replace('/:.*$/', '', $objimport->array_import_icon[0]);
+	$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+	print img_object($objimport->array_import_module[0]->getName(), $entityicon).' ';
 	print $objimport->array_import_label[0];
 	print '</td></tr>';
 
 	print '</table>';
 	print '</div>';
 
-
 	print load_fiche_titre($langs->trans("InformationOnSourceFile"), '', '');
 
 	print '<div class="underbanner clearboth"></div>';
@@ -1716,14 +1782,15 @@ if ($step == 6 && $datatoimport)
 	// Lot de donnees a importer
 	print '<tr><td>'.$langs->trans("DatasetToImport").'</td>';
 	print '<td>';
-	print img_object($objimport->array_import_module[0]->getName(), $objimport->array_import_icon[0]).' ';
+	$entity = preg_replace('/:.*$/', '', $objimport->array_import_icon[0]);
+	$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+	print img_object($objimport->array_import_module[0]->getName(), $entityicon).' ';
 	print $objimport->array_import_label[0];
 	print '</td></tr>';
 
 	print '</table>';
 	print '</div>';
 
-
 	print load_fiche_titre($langs->trans("InformationOnSourceFile"), '', '');
 
 	print '<div class="underbanner clearboth"></div>';
diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang
index 3549e3f8b23..a0eb7161ef2 100644
--- a/htdocs/langs/en_US/exports.lang
+++ b/htdocs/langs/en_US/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/fr_FR/exports.lang b/htdocs/langs/fr_FR/exports.lang
index 3055d51e2ad..3de20e83d20 100644
--- a/htdocs/langs/fr_FR/exports.lang
+++ b/htdocs/langs/fr_FR/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Clé à utiliser pour mettre à jour les données
 NbInsert=Nombre de lignes insérées: %s
 NbUpdate=Nombre de lignes mises à jour: %s
 MultipleRecordFoundWithTheseFilters=Plusieurs enregistrements ont été trouvés avec ces filtres: %s
+StocksWithBatch=Stocks et emplacements (entrepôts) des produits avec numéros de lots/séries
\ No newline at end of file

From 2a2b372ba9cefc09fcd21a29ea4784fc16c60b28 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 10 Dec 2020 15:08:36 +0100
Subject: [PATCH 329/888] fix: manage price min for PRICE PER CUSTOMER

---
 htdocs/comm/propal/card.php | 1 +
 htdocs/commande/card.php    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index db64dd65fe9..12146179db0 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -911,6 +911,7 @@ if (empty($reshook))
 						if (count($prodcustprice->lines) > 0) {
 							$pu_ht = price($prodcustprice->lines[0]->price);
 							$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
+							$price_min =  price($prodcustprice->lines[0]->price_min);
 							$price_base_type = $prodcustprice->lines[0]->price_base_type;
 							$tva_tx = ($prodcustprice->lines[0]->default_vat_code ? $prodcustprice->lines[0]->tva_tx.' ('.$prodcustprice->lines[0]->default_vat_code.' )' : $prodcustprice->lines[0]->tva_tx);
 							if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) $tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 80ff2180801..e72ddbf8818 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -749,6 +749,7 @@ if (empty($reshook))
 						{
 							$pu_ht = price($prodcustprice->lines[0]->price);
 							$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
+							$price_min =  price($prodcustprice->lines[0]->price_min);
 							$price_base_type = $prodcustprice->lines[0]->price_base_type;
 							$tva_tx = $prodcustprice->lines[0]->tva_tx;
 							if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) $tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';

From 6e465afb0375fa222113e6eda5b997970ec62cea Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Dec 2020 15:47:34 +0100
Subject: [PATCH 330/888] Remove data

---
 dev/initdemo/mysqldump_dolibarr_13.0.0.sql | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/initdemo/mysqldump_dolibarr_13.0.0.sql b/dev/initdemo/mysqldump_dolibarr_13.0.0.sql
index 53dbb39f977..69c6eeb73c3 100644
--- a/dev/initdemo/mysqldump_dolibarr_13.0.0.sql
+++ b/dev/initdemo/mysqldump_dolibarr_13.0.0.sql
@@ -12904,7 +12904,6 @@ CREATE TABLE `llx_recruitment_recruitmentcandidature` (
 
 LOCK TABLES `llx_recruitment_recruitmentcandidature` WRITE;
 /*!40000 ALTER TABLE `llx_recruitment_recruitmentcandidature` DISABLE KEYS */;
-INSERT INTO `llx_recruitment_recruitmentcandidature` VALUES (65,NULL,'(PROV65)','Monsieur,<br />\r\n<br />\r\n&Eacute;tant actuellement &agrave; la recherche d&#39;une alternance pour mon master 1<br />\r\nd&rsquo;&eacute;tude et d&eacute;veloppement option cybers&eacute;curit&eacute; &agrave; EPSI Bordeaux, je me<br />\r\npermets de vous proposer ma candidature pour le poste d&#39;alternant<br />\r\nAdmin sys .<br />\r\n<br />\r\nEn effet, mon profil a sembl&eacute; correspondre &agrave; la description recherch&eacute;e<br />\r\nsur l&rsquo;offre d&rsquo;emploi qui m&#39;a &eacute;t&eacute; transmise par mon &eacute;cole EPSI<br />\r\nBordeaux.<br />\r\n<br />\r\nMa formation en licence Informatique m&#39;a permis d&#39;acqu&eacute;rir de<br />\r\nnombreuses comp&eacute;tences telles que l&#39;apprentissage du langage Java avec<br />\r\nle logiciel eclipse, j&#39;ai d&eacute;j&agrave; fait plusieurs cours sur openclassroom<br />\r\npour apprendre le langage C# et Javascript. J&#39;ai &eacute;galement &eacute;t&eacute; form&eacute; &agrave;<br />\r\nl&#39;utilisation du gestionnaire de version Git mais aussi au langage C<br />\r\nde mani&egrave;re approfondie. Dans le cadre de ma formation en licence<br />\r\ninformatique un projet de programmation web en Symfony4 pour le CHU de<br />\r\nBordeaux m&#39;a &eacute;t&eacute; propos&eacute; comme projet d&lsquo;&eacute;tude.<br />\r\n<br />\r\nInt&eacute;grer votre projet, repr&eacute;sente pour moi un r&eacute;el enjeu d&rsquo;avenir<br />\r\nprofessionnel qui me permettrai de me faire de nouvelles exp&eacute;riences<br />\r\ntout en approfondissant mes connaissances et mes comp&eacute;tences et vous<br />\r\npermettrez d&rsquo;avancer dans vos projets.<br />\r\n<br />\r\nRestant &agrave; votre disposition pour toute information compl&eacute;mentaire, je<br />\r\nsuis disponible pour vous rencontrer lors d&#39;un entretien &agrave; votre<br />\r\nconvenance.<br />\r\n<br />\r\nVeuillez agr&eacute;er, Monsieur, l&#39;expression de mes sinc&egrave;res salutations.<br />\r\n<br />\r\nM.Marcouiller Lucas<br />\r\n&Eacute;tudiant &agrave; EPSI Bordeaux',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Candidature Alternance NLTechno - DoliCloud<br>\n&Eacute;metteur (From) : Lucas Marcouiller &lt;lucas.marcouiller@gmail.com&gt;<br>\nDestinataire(s) (To) : job@nltechno.com<br>\n-----<br>\nMonsieur,<br>\r\n<br>\r\nÉtant actuellement à la recherche d\'une alternance pour mon master 1<br>\r\nd’étude et développement option cybersécurité à EPSI Bordeaux, je me<br>\r\npermets de vous proposer ma candidature pour le poste d\'alternant<br>\r\nAdmin sys .<br>\r\n<br>\r\nEn effet, mon profil a semblé correspondre à la description recherchée<br>\r\nsur l’offre d’emploi qui m\'a été transmise par mon école EPSI<br>\r\nBordeaux.<br>\r\n<br>\r\nMa formation en licence Informatique m\'a permis d\'acquérir de<br>\r\nnombreuses compétences telles que l\'apprentissage du langage Java avec<br>\r\nle logiciel eclipse, j\'ai déjà fait plusieurs cours sur openclassroom<br>\r\npour apprendre le langage C# et Javascript. J\'ai également été formé à<br>\r\nl\'utilisation du gestionnaire de version Git mais aussi au langage C<br>\r\nde manière approfondie. Dans le cadre de ma formation en licence<br>\r\ninformatique un projet de programmation web en Symfony4 pour le CHU de<br>\r\nBordeaux m\'a été proposé comme projet d‘étude.<br>\r\n<br>\r\nIntégrer votre projet, représente pour moi un réel enjeu d’avenir<br>\r\nprofessionnel qui me permettrai de me faire de nouvelles expériences<br>\r\ntout en approfondissant mes connaissances et mes compétences et vous<br>\r\npermettrez d’avancer dans vos projets.<br>\r\n<br>\r\nRestant à votre disposition pour toute information complémentaire, je<br>\r\nsuis disponible pour vous rencontrer lors d\'un entretien à votre<br>\r\nconvenance.<br>\r\n<br>\r\nVeuillez agréer, Monsieur, l\'expression de mes sincères salutations.<br>\r\n<br>\r\nM.Marcouiller Lucas<br>\r\nÉtudiant à EPSI Bordeaux<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp915538jal; Thu, 20 Aug 2020 06:26:57 -0700 (PDT)<br>\r\nX-Received: by 2002:a2e:7c18:: with SMTP id x24mr1566845ljc.402.1597930017289; Thu, 20 Aug 2020 06:26:57 -0700 (PDT)<br>\r\nARC-Seal: i=1; a=rsa-sha256; t=1597930017; cv=none; d=google.com; s=arc-20160816; b=GajE/OiyTVF9aiGpVzVNnZwBBcNUjnI5l+VT1OEAaZZpsZM4rGeJ/Nj52uI8bAVyU4 s3XOu41PuFxe8/yE5HZK9lR27bhJSDlDBub4gu2caTHbSMC/kTbrV5BoNHfMRIyOmIHy J4ZmR/aoQ9pPykwut0ZYlR+DrbrKYcf0t0WhnShFRd43AAff/sso6s1yabhxZTozOyPZ W78/hOXWHdHbHvLAS0Ljk86DJ8piPbMfhtojKlDhbmYmER+TzEnJq0MOgrcY/NLwEMLi JFrk8JJGRF8sb07DNdeoVaPmI18rgtmojvxoqD9a7lvPY+JOPEJtfuzSyZzqoZ3u8LC8 IXdA==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:subject:message-id:date:from:mime-version:dkim-signature; bh=eZNdGy5LWRm0pgGTN6R6KfCchcRZbNqz5x8kmHM2XPs=; b=UR0Z2ilK+JR3MDi5gievqGR/Db+uxH7CZBsAVLMhHXFN+NrHADh7vEmSrTSEvpFyYa PQ7kq93zI1vdAwWJXt5kiH9DnMNhjOlKWPHBAgSx/EZUZzbMhvZS5f7tKQcb4k/If9uu uYD8R4SefcJi+n9zpCPArzeafsFAlrhFosCub4sW7jzMVnUh4qGNhI4HHeCeNM8o8Lea pbW3p+LPevQJVA/8wPUFcEK/TLq2NjCd5u+UgAG5d4JXbnoY62lEjF6pfEtEb3k3bpos Cbkc3ve8wJaJXAYmRHhhpHoZgpzFR6AvYYAHox6RHhr36zofAaI0CpzAZEBM1kY1GChH DTPg==<br>\r\nARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=h7SfnCr7; spf=pass (google.com: domain of lucas.marcouiller@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=lucas.marcouiller@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nReturn-Path: &lt;lucas.marcouiller@gmail.com&gt;<br>\r\nReceived: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id b83sor528973lfd.11.2020.08.20.06.26.57 for &lt;job@nltechno.com&gt; (Google Transport Security); Thu, 20 Aug 2020 06:26:57 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of lucas.marcouiller@gmail.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=h7SfnCr7; spf=pass (google.com: domain of lucas.marcouiller@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=lucas.marcouiller@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=eZNdGy5LWRm0pgGTN6R6KfCchcRZbNqz5x8kmHM2XPs=; b=h7SfnCr79yqwwwXJC6I4brVvb0ocu7KAAqAFKRgQKiHVLmn6l9RwzNXjLMDydSAed7 mwym4M3HCVeWsxbwsiXAGX2RSsoy8DspzI9d4R4bTGr7DmSglUPLKoQtJcVQI5Qwrd2M MqXeTTN47tqrdPAf/g0jjMDOxYFpJnQTNL9HN60LZt3xr/SRrk9fakU09KPYUCd7VxjR MX1lRgGSpvTvNmPnD6OjnYP6N0vKDPNvvXCcIN/wqnUlNbOhR2r9ItRsUKqpJkPVjmds xpo6fZ+Vghd16f6hbz24xOkQmodPvM8wVYBdRJ1MNHa5ykZnqkS/MjCU0PrkTqZWTzOC pDTw==<br>\r\nX-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=eZNdGy5LWRm0pgGTN6R6KfCchcRZbNqz5x8kmHM2XPs=; b=njHPVLe9Gvlwy/QgIu99P7u9/hVUvTjuXP5y2lQjaECAupxW38RZmTMrznxe47yBmY 1p0XNaHrARpRlxMeY2hjYI2PA9mUzTml9C0BzN8uGLuEXXZaZVyuaZk5ZG9oiSgvfh1W NTva/yzJnPdgYmBAUujSN4qMp5CJCJExSjKM42fs7/llGSXErLQgjZmeY3iunRnn2I9U Oop671+xIw9rDimHQkesf6LMVFJUxDlJIzqnlw6xqKoqMvtBxovcJZ0gjorQPlwBdUfr UtrmZPioOsttGAoTQMS/l8THo7ecIpYguvd9b/gSvFUE5u4BUk8GNqMKrqW85CmfWJJm a/3w==<br>\r\nX-Gm-Message-State: AOAM5320ychykfQesu/H9cFmHUGzQi/rbU1oBgMJWOdwFAa3nRw6CwHV e1lkvdRx3rXdQ8HVCsVM5dDAcSOEQfO8SfbOQMCh9SyY0guutg==<br>\r\nX-Google-Smtp-Source: ABdhPJz8zWhnFUtv6BYWcQ+pFbsiisLzp15O5XLrK+hHhGQiQqWotrE3/TMkxtX937PVn7V1/+0bHqq0Kx+5gm06HFY=<br>\r\nX-Received: by 2002:ac2:5f64:: with SMTP id c4mr1680096lfc.170.1597930016248; Thu, 20 Aug 2020 06:26:56 -0700 (PDT)<br>\r\nMIME-Version: 1.0<br>\r\nFrom: Lucas Marcouiller &lt;lucas.marcouiller@gmail.com&gt;<br>\r\nDate: Thu, 20 Aug 2020 15:28:59 +0200<br>\r\nMessage-ID: &lt;CACMPic8P1eM9RxSkJjcktGT=OfKdJNiEaz+isi7V4ox+nPesJA@mail.gmail.com&gt;<br>\r\nSubject: Candidature Alternance NLTechno - DoliCloud<br>\r\nTo: job@nltechno.com<br>\r\nContent-Type: multipart/mixed; boundary=&quot;000000000000fec41c05ad4f12cc&quot; ','2020-08-20 15:26:57','2020-08-23 14:03:28',12,12,NULL,NULL,0,'bb','aa','lucas.marcouiller@gmail.com','',NULL,NULL,NULL,'CACMPic8P1eM9RxSkJjcktGT=OfKdJNiEaz+isi7V4ox+nPesJA@mail.gmail.com',1,NULL),(66,NULL,'(PROV66)','Bonjour,\r\n\r\nJe me présente, Je m’appelle Dylan De muynck, j’ai 22 ans.\r\n\r\nJe suis en seconde année à l’EPSI (Ecole d’ingénieur Informatique) et pour accompagner ma 3e année, je dois effectuer une alternance qui me permettra d’acquérir de l’expérience.\r\n\r\n\r\n\r\nDurant mes deux années de formation, j’ai pu assimiler plusieurs compétences en :\r\n\r\n         Langages informatiques :\r\n\r\n        Linux, SQL, HTML5/CSS3, PHP, Javascript (Bases), C++, C#, Java Android.\r\n\r\nLogiciels :\r\n\r\nSQl Server/MySQL, Visual Studio, Oracle VM VirtualBox, Dbeaver, Modelio, Androi Studio.\r\n\r\n\r\n\r\nSystèmes :\r\n\r\nLinux.\r\n\r\n\r\nModélisation de bases de données :\r\n\r\nMerise, UML\r\n\r\n\r\n\r\nJe vous contacte pour votre offre d’alternance qui m’intéresse car c’est le domaine que je cherche et mon objectif de demain pour mon futur emploi.\r\n\r\n\r\n\r\nPour me Contacter :\r\n\r\n\r\n\r\n  *   Mon numéro de portable : 06 42 85 48 96\r\n\r\n\r\n\r\n  *   Mon Email : Dylan.demuynck1@epsi.fr<mailto:Dylan.demuynck1@epsi.fr>\r\n\r\n\r\n\r\n\r\n\r\nMerci d’avoir pris votre temps pour me lire, en espérant avoir des nouvelles bientôt\r\n\r\n\r\n\r\nCordialement,\r\n\r\nDylan',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Offre d\'alternance (Dylan, De muynck / EPSI)<br>\n&Eacute;metteur (From) : DE MUYNCK Dylan 1 &lt;dylan.demuynck1@epsi.fr&gt;<br>\nDestinataire(s) (To) : &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\n-----<br>\nBonjour,<br>\r\n<br>\r\nJe me présente, Je m’appelle Dylan De muynck, j’ai 22 ans.<br>\r\n<br>\r\nJe suis en seconde année à l’EPSI (Ecole d’ingénieur Informatique) et pour accompagner ma 3e année, je dois effectuer une alternance qui me permettra d’acquérir de l’expérience.<br>\r\n<br>\r\n<br>\r\n<br>\r\nDurant mes deux années de formation, j’ai pu assimiler plusieurs compétences en :<br>\r\n<br>\r\n         Langages informatiques :<br>\r\n<br>\r\n        Linux, SQL, HTML5/CSS3, PHP, Javascript (Bases), C++, C#, Java Android.<br>\r\n<br>\r\nLogiciels :<br>\r\n<br>\r\nSQl Server/MySQL, Visual Studio, Oracle VM VirtualBox, Dbeaver, Modelio, Androi Studio.<br>\r\n<br>\r\n<br>\r\n<br>\r\nSystèmes :<br>\r\n<br>\r\nLinux.<br>\r\n<br>\r\n<br>\r\nModélisation de bases de données :<br>\r\n<br>\r\nMerise, UML<br>\r\n<br>\r\n<br>\r\n<br>\r\nJe vous contacte pour votre offre d’alternance qui m’intéresse car c’est le domaine que je cherche et mon objectif de demain pour mon futur emploi.<br>\r\n<br>\r\n<br>\r\n<br>\r\nPour me Contacter :<br>\r\n<br>\r\n<br>\r\n<br>\r\n  *   Mon numéro de portable : 06 42 85 48 96<br>\r\n<br>\r\n<br>\r\n<br>\r\n  *   Mon Email : Dylan.demuynck1@epsi.fr&lt;mailto:Dylan.demuynck1@epsi.fr&gt;<br>\r\n<br>\r\n<br>\r\n<br>\r\n<br>\r\n<br>\r\nMerci d’avoir pris votre temps pour me lire, en espérant avoir des nouvelles bientôt<br>\r\n<br>\r\n<br>\r\n<br>\r\nCordialement,<br>\r\n<br>\r\nDylan<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp1050492jal; Thu, 20 Aug 2020 09:30:31 -0700 (PDT)<br>\r\nX-Google-Smtp-Source: ABdhPJwU1A2n02tY8mqxp+x3aIiX/wu25xVHA7Fpg3jIT4YCK7Nu5PJqE75JFn+yrwG6fUYahiPr<br>\r\nX-Received: by 2002:aa7:d983:: with SMTP id u3mr3818423eds.366.1597941031266; Thu, 20 Aug 2020 09:30:31 -0700 (PDT)<br>\r\nARC-Seal: i=2; a=rsa-sha256; t=1597941031; cv=pass; d=google.com; s=arc-20160816; b=cWcaQ5ucKAtt4yQ4d5id0PHjRNXMgT+QKzQqV/pEhDuPQHU6hI5hHiVehk2NV9ECaL 7lNC2a1+46fp6Cvb0gUyh8jyaJrhX3Uls+A95eW+d34N0tR+EuOoQ8f9F1AWcfbS6UYw 5Izb2XsT8eZAFlHrKE24lAgZ1I/nE7f022wbfo0JY43OIK9JxoE12hJDH1CHQW2nTqW+ XHiTsjMac9yCKQ6ITb8TjbVeEL5fv9BxC4vcU3qdpwkVCz3gOkZqCuisL6CALGfbsOD0 MwT06nJnVcwhAFwtjCfmF5wQOk9DzxRlbIcUZJDWWz762dT6Dm3Zw2CuFQjvPFulpu+b h/cw==<br>\r\nARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-language:accept-language:message-id:date :thread-index:thread-topic:subject:to:from:dkim-signature; bh=DmaFJFQjl9EzmCpfL28MYGT/HKXRSq1Zl2da7ToOpMc=; b=GzMgfDLLEc5vjMKO9DhykwDq6ROPTYM77bfCUf+eTNF1ATXYxCImJE0hQJ6t4gigVB XmxY50Y+e4ilnplR9QZDl42k439cQEV8yLAtZxOg/QVmKtQSmw4PnqSVkNMJKvssrJk8 ZHi4xb1W6RkHpxCm0yhtUxIcySNgEgEsEqBWqseAfKRs6tfGGV88AKAHObGsJgWgqBSK 8DxnhnNy5AMNaGvK9YI1H4frWxMyvotxaiNqgacmsyLbSCIziMgr5/rzp8XfPXbKtiE0 vZw+EIOnuealf5Plc6BeC4kRUHqpAAxGzdus/fq5lva/Lqv/arwT1KGsjNpnFdK/7ZkG JgBA==<br>\r\nARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=mDcUpO86; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of dylan.demuynck1@epsi.fr designates 40.107.14.50 as permitted sender) smtp.mailfrom=dylan.demuynck1@epsi.fr<br>\r\nReturn-Path: &lt;dylan.demuynck1@epsi.fr&gt;<br>\r\nReceived: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140050.outbound.protection.outlook.com. [40.107.14.50]) by mx.google.com with ESMTPS id p3si1741974edq.281.2020.08.20.09.30.30 for &lt;job@nltechno.com&gt; (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Aug 2020 09:30:31 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of dylan.demuynck1@epsi.fr designates 40.107.14.50 as permitted sender) client-ip=40.107.14.50;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=mDcUpO86; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of dylan.demuynck1@epsi.fr designates 40.107.14.50 as permitted sender) smtp.mailfrom=dylan.demuynck1@epsi.fr<br>\r\nARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FviD0a2PuMCkNfCFDQChvRVTfilmuq+cw0E4EGdMb731TY229NYpUPBOQE5YfQDbPnydL6dd3/we+3WFCEQxFrJhEEUUt0JB+pFpo2Zwt9SBY14rW8/cn5RoA1ouXOhXm/JFlzvw6a/Q2BsCILEPqrgP0jO7fVS8ZVhKEi7FnoBFqcnk37/kSKi3w/5ZzKHU8AxYFwrEpG/JCx6XZYaMSf3vrk6b6ebTcnZ968ZGKonL5xJ4+uITkpHw9Op1Uai85e7f6CJUUr48UHpTWXKBILiAinVzMgVVPDDqoda1c6Ywo42GsAwRxRKNrzv9wtjU1p+tWVAu1FhQB6KWwHmUtw==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DmaFJFQjl9EzmCpfL28MYGT/HKXRSq1Zl2da7ToOpMc=; b=JBdMWX4RWk+yK7cAnom3FX1ctg7ZsOofVRN8O2nWM7v4Z2EOf3WCA3anVAZa76MqbPdz1WfNSc4EqeJQMyTSVXV5/9juWb0yfncJfK4kQw16+BlfoUiQhz3YUJlAXl/DI8Lz0GC/tFaCCHKMUnJVUX1qJCSk9bjXb5hl/am1DwV9RxuhPMDOF2XP9kIL1e6bIW6/KtBhxgyQQgyUjnIrUTGr04snI6u5x5r/B0nV6/hIL6p+yu7obpMm5bmoZ/5d40Oc+WulhZVP+1Ppd14B27QdD2Y8NnMrmOkRPB+CIY+981qO4C6gjoR+RyCdtMGk/Bqv9Pp0IBt0XDx5Y3BBTQ==<br>\r\nARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epsi.fr; dmarc=pass action=none header.from=epsi.fr; dkim=pass header.d=epsi.fr; arc=none<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ifagparis.onmicrosoft.com; s=selector2-ifagparis-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DmaFJFQjl9EzmCpfL28MYGT/HKXRSq1Zl2da7ToOpMc=; b=mDcUpO86RIMTarIbaBN4K4JCgRjA2AOWmt35AnPSgUbs9suk05hPcaDkIZ5o5NjIzZt/rgtqVn7w8/60GhlCm2PJJFDktQdQz9t4z4waBPS3XIQm7VxllAq0ml5kPPzZJOFA9hf2shfYM8vvttkm5Xtjerp22Z633F1iMMq3BFI=<br>\r\nReceived: from AM6PR0402MB3381.eurprd04.prod.outlook.com (2603:10a6:209:9::18) by AM5PR04MB3298.eurprd04.prod.outlook.com (2603:10a6:206:f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3283.23; Thu, 20 Aug 2020 16:30:29 +0000<br>\r\nReceived: from AM6PR0402MB3381.eurprd04.prod.outlook.com ([fe80::68af:facc:a8e:2096]) by AM6PR0402MB3381.eurprd04.prod.outlook.com ([fe80::68af:facc:a8e:2096%3]) with mapi id 15.20.3283.028; Thu, 20 Aug 2020 16:30:29 +0000<br>\r\nFrom: DE MUYNCK Dylan 1 &lt;dylan.demuynck1@epsi.fr&gt;<br>\r\nTo: &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\r\nSubject: Offre d\'alternance (Dylan, De muynck / EPSI)<br>\r\nThread-Topic: Offre d\'alternance (Dylan, De muynck / EPSI)<br>\r\nThread-Index: AQHWdw83Va7zuqgzY0SRcaW8NWmoyw==<br>\r\nDate: Thu, 20 Aug 2020 16:30:29 +0000<br>\r\nMessage-ID: &lt;59f8dccc-bc3a-462a-b9e3-a76846af580e@email.android.com&gt;<br>\r\nAccept-Language: fr-FR, en-US<br>\r\nContent-Language: fr-FR<br>\r\nX-MS-Has-Attach: <br>\r\nX-MS-TNEF-Correlator: <br>\r\nauthentication-results: nltechno.com; dkim=none (message not signed) header.d=none;nltechno.com; dmarc=none action=none header.from=epsi.fr;<br>\r\nx-originating-ip: [92.184.105.30]<br>\r\nx-ms-publictraffictype: Email<br>\r\nx-ms-office365-filtering-correlation-id: f05955a6-7f3b-4839-afb4-08d8452659fe<br>\r\nx-ms-traffictypediagnostic: AM5PR04MB3298:<br>\r\nx-microsoft-antispam-prvs: &lt;AM5PR04MB329839F4EC8C4EE0193ED653A85A0@AM5PR04MB3298.eurprd04.prod.outlook.com&gt;<br>\r\nx-ms-oob-tlc-oobclassifiers: OLM:1227;<br>\r\nx-ms-exchange-senderadcheck: 1<br>\r\nx-microsoft-antispam: BCL:0;<br>\r\nx-microsoft-antispam-message-info: E5AMusqV7uTKonn0gwA5oCka/m+T3UIfvKArSjiJHmv/qLWyuImc+wLAzo0CQcAWgCDEwF9Q1crFYzIo/ILVMWSmhG1iO1aUg26KXMxEwj0ifQ+qZRzoUtIxdPKXQGDBg/HusX+V3/VJaZ9u85RmgYczkVw/2OTsdF72lJVNm6WdzzUpjjm8sxt44/9P7Wq64OXFhC852fdiVQb0DPCwiRvy0PsB5Lpn8mClTVMMlbYqm6UjgH69BdFn07BzsbMv4RpBut0Kp5h18msSfT/KLJ3ttyRsu0oECtK8OQiOwq8moPq1Nah+ZMEqrIkIKVwevXA01jRlIJHlGPo/CDhlLA==<br>\r\nx-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:fr;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR0402MB3381.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(39850400004)(346002)(376002)(366004)(136003)(396003)(86362001)(31686004)(66476007)(316002)(6486002)(786003)(186003)(26005)(31696002)(6512007)(9686003)(4744005)(64756008)(478600001)(6916009)(8676002)(66556008)(66446008)(8936002)(76116006)(5660300002)(66946007)(91956017)(71200400001)(2906002)(6506007);DIR:OUT;SFP:1101;<br>\r\nx-ms-exchange-antispam-messagedata: n1ckktM67L9SAGovlnqIuOz7fK0DMIbnepRLtO2aIq5dPDKQUbHzwfXIXhPns5zm88uPlqnYxfBOxfISS5QR8qs2JpngF3FJpt+tdQotFTmLXu+6MOr4Vl3tbWUhvuzsKS3NaPVeLdsnNGemUOh3B4kYrSXKDszxJwuqLpXoh6n++1HCMHSWa8g2HwVMQLOR3Kk0O8lai8CQsP/BnaK5aJsQW+dGaExtYUwTf+HF4OpJ0fh3VeyJawyKEbmqFfexeuiY8m9r1N+TvEOyvLV/R+ZeBvXzUN3tYA0oOnEo5bsiM10pCCs2XrqvYhLzrlGl6s4PgKWlDnEALkFJeFW2tUKoQTD6dgkxeEqcsXlAtUgjPVqYbRQIFTf5mlqcey7Ny8pNw66lhx8NHkDKLDw37z3F2dmXM3pSvVHWYdKI+ivigyspytQRQsc7xBtG/tPpBjYkxwDliHPHkI/Vx72uy1AiVS1MbQl/aNoRg8anWckKfo6/Ci4fXuO3usRszv6UFqsybkd/wgDKYFPPL//gGR0s9Y8RU7sLHMMQNA44LbT8+bMOlqF8u2ms9b5aEpeAL0XUfmn86au9c+HS+w6slacoYhbgsMb5ymKByTGVwFYSoHbzqgxGCATGskeMKwcmKd7IXXfY+NKeJ31cBKUUyw==<br>\r\nx-ms-exchange-transport-forked: True<br>\r\nContent-Type: multipart/alternative; boundary=&quot;_000_59f8dcccbc3a462ab9e3a76846af580eemailandroidcom_&quot;<br>\r\nMIME-Version: 1.0<br>\r\nX-OriginatorOrg: epsi.fr<br>\r\nX-MS-Exchange-CrossTenant-AuthAs: Internal<br>\r\nX-MS-Exchange-CrossTenant-AuthSource: AM6PR0402MB3381.eurprd04.prod.outlook.com<br>\r\nX-MS-Exchange-CrossTenant-Network-Message-Id: f05955a6-7f3b-4839-afb4-08d8452659fe<br>\r\nX-MS-Exchange-CrossTenant-originalarrivaltime: 20 Aug 2020 16:30:29.3292 (UTC)<br>\r\nX-MS-Exchange-CrossTenant-fromentityheader: Hosted<br>\r\nX-MS-Exchange-CrossTenant-id: b6e77e52-65f6-4dec-b7d9-8e45f36a536f<br>\r\nX-MS-Exchange-CrossTenant-mailboxtype: HOSTED<br>\r\nX-MS-Exchange-CrossTenant-userprincipalname: sU7Aq8B0tDkw0T+b8BAUgD/vCt5suJ3J6/FyIgub2h1uT2XCmpUXbORxH0dyHre0Ov7BROmbt/0BlmY4oT/GpA==<br>\r\nX-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB3298 ','2020-08-20 18:30:31','2020-08-23 14:03:29',12,NULL,NULL,NULL,0,NULL,'DE MUYNCK Dylan 1','dylan.demuynck1@epsi.fr',NULL,NULL,NULL,NULL,'59f8dccc-bc3a-462a-b9e3-a76846af580e@email.android.com',1,NULL),(67,NULL,'JOC2008-0002','Monsieur DESTAILLEUR,<br />\r\nJe me permets de vous &eacute;crire car je suis &agrave; la recherche d&#39;un poste d&#39;Administrateur Syst&egrave;me et R&eacute;seaux en alternance (contrat d&#39;apprentissage), en 3&egrave;me ann&eacute;e de formation Bachelor informatique, &agrave; l&#39;EPSI de Bordeaux, &agrave; partir du 30 octobre 2020 jusqu&#39;au 30 septembre 2021, et souhaite postuler ma candidature au sein de votre &eacute;tablissement, si cela est possible.<br />\r\nVous trouverez ci-joint mon CV, ainsi que ma lettre de motivation.<br />\r\nMerci de votre compr&eacute;hension.<br />\r\nDans l&#39;attente de votre r&eacute;ponse, je vous prie d&#39;agr&eacute;er, Monsieur, l&#39;expression de mes salutations distingu&eacute;es.<br />\r\n<br />\r\n<br />\r\n--<br />\r\nMikajy RANDRIANARIMANANA',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Candidature pour un poste en alternance (contrat d\'apprentissage) : Administrateur Syst&egrave;me et R&eacute;seaux<br>\n&Eacute;metteur (From) : Mikajy RANDRIANARIMANANA &lt;mikajy.randria@orange.fr&gt;<br>\nDestinataire(s) (To) : &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\n-----<br>\nMonsieur DESTAILLEUR,<br>\r\nJe me permets de vous écrire car je suis à la recherche d\'un poste d\'Administrateur Système et Réseaux en alternance (contrat d\'apprentissage), en 3ème année de formation Bachelor informatique, à l\'EPSI de Bordeaux, à partir du 30 octobre 2020 jusqu\'au 30 septembre 2021, et souhaite postuler ma candidature au sein de votre établissement, si cela est possible.<br>\r\nVous trouverez ci-joint mon CV, ainsi que ma lettre de motivation.<br>\r\nMerci de votre compréhension.<br>\r\nDans l\'attente de votre réponse, je vous prie d\'agréer, Monsieur, l\'expression de mes salutations distinguées.<br>\r\n<br>\r\n<br>\r\n--<br>\r\nMikajy RANDRIANARIMANANA<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp1074536jal; Thu, 20 Aug 2020 10:06:32 -0700 (PDT)<br>\r\nX-Google-Smtp-Source: ABdhPJyxvEbOTgkMG54G7D3rOuSyzhOEQ1h81u12Hjt8XLdXGxJH0dbnFHtSP9yGDLRc26CryoMs<br>\r\nX-Received: by 2002:adf:c446:: with SMTP id a6mr3922031wrg.376.1597943191019; Thu, 20 Aug 2020 10:06:31 -0700 (PDT)<br>\r\nARC-Seal: i=1; a=rsa-sha256; t=1597943191; cv=none; d=google.com; s=arc-20160816; b=mq4EHFz41cLOOBLkZDS8G7yIlHCzxJVtDOVfTmEe5ej3DDwfsT9R5aBl9ClazAay8b Ah48/QrWYPwyViJdu/AhZlf65j+THZCji3B9aF5d5yoBOpNyBUYrh6wrcPosUQ3+m7No hHiaqFaG1mHmcBkPhvzqdKqj8osYLR9/WA5560XAY1o2E+wpF0li+CL89LbdCD54O9qO 5PksoFo+NMRH5TfmBwlTDql/riGGQ1uDtDYYzG/71lqSZtEz0h5XyKBXSJIsfr5yyp3o xUiMnIvHs2EEH8ERVR+ukZdYS0NsVzBUBpVD+baCa1m9uzg0BZNLdAr104ss8640bZ5t e7tw==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=importance:date:subject:from:to:mime-version:message-id; bh=WDgHxQRbdi7/KI5lqa7Sagbv1M4rPQ4k+ink568t+aY=; b=WzlRjkti+igePOqJPSL/MHelkSItTQg3PugsWOWU6CRyB1ttLNp3UJMdBgPFsMj1WY 1noSHk//FLZ0zazcU3vQnd0VzVVIeSpHGBUh/+PwtMeYTESy4/OkrYxK9RxxN7NtWABY dcNg4JlGZKx4qn6ZyysAEN/9PiAM63N0U8wf90pluJhxr8PfU3rtN2VXwf+KWTWRNufD z79V+eH6HJilTH50eLj2SJUd3zfuDFNSxtH2q8PwpYqlNo1ta7O5QqGAJ3GKtkeWoEin HsL70ZbWFursScsB8qxPTtV1jQtHDtwJeurMkOiz9skVOFMQa9C6tZR9ghLTrOxy5eqp fIww==<br>\r\nARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of mikajy.randria@orange.fr designates 80.12.242.126 as permitted sender) smtp.mailfrom=mikajy.randria@orange.fr<br>\r\nReturn-Path: &lt;mikajy.randria@orange.fr&gt;<br>\r\nReceived: from smtp.smtpout.orange.fr (smtp04.smtpout.orange.fr. [80.12.242.126]) by mx.google.com with ESMTPS id b4si2317763wrq.33.2020.08.20.10.06.30 for &lt;job@nltechno.com&gt; (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 20 Aug 2020 10:06:30 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: best guess record for domain of mikajy.randria@orange.fr designates 80.12.242.126 as permitted sender) client-ip=80.12.242.126;<br>\r\nAuthentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of mikajy.randria@orange.fr designates 80.12.242.126 as permitted sender) smtp.mailfrom=mikajy.randria@orange.fr<br>\r\nReceived: from [IPv6:::ffff:192.168.1.43] ([90.78.4.197]) by mwinf5d27 with ME id Ht6U2300D4F2kvu03t6VCq; Thu, 20 Aug 2020 19:06:30 +0200<br>\r\nX-ME-Helo: [IPv6:::ffff:192.168.1.43]<br>\r\nX-ME-Auth: bWlrYWp5LnJhbmRyaWFAb3JhbmdlLmZy<br>\r\nX-ME-Date: Thu, 20 Aug 2020 19:06:30 +0200<br>\r\nX-ME-IP: 90.78.4.197<br>\r\nMessage-ID: &lt;6363e3fb7296eabee82534cf16d9ca60@mwinf5d27.me-wanadoo.net&gt;<br>\r\nMIME-Version: 1.0<br>\r\nTo: &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\r\nFrom: Mikajy RANDRIANARIMANANA &lt;mikajy.randria@orange.fr&gt;<br>\r\nSubject: =?utf-8?Q?Candidature_pour_un_poste_en_alternance_(contrat_d\'apprentissag?= =?utf-8?Q?e)_:_Administrateur_Syst=C3=A8me_et_R=C3=A9seaux?=<br>\r\nDate: Thu, 20 Aug 2020 19:06:28 +0200<br>\r\nImportance: normal<br>\r\nX-Priority: 3<br>\r\nContent-Type: multipart/mixed; boundary=&quot;_51F87825-C9DD-455E-A63B-1FC1A457AAD8_&quot; ','2020-08-20 19:06:30','2020-08-24 08:15:37',12,12,NULL,NULL,8,'','Mikajy RANDRIANARIMANANA','mikajy.randria@orange.fr','',NULL,NULL,NULL,'6363e3fb7296eabee82534cf16d9ca60@mwinf5d27.me-wanadoo.net',1,'2020-09-08'),(68,2,'JOC2008-0001','Bonjour<br />\r\nAvant tout j&#39;esp&egrave;re que vous vous portez bien ainsi que votre famille durant ce chapitre difficile de l&#39;humanit&eacute; moderne.<br />\r\n<br />\r\nJe suis &eacute;tudiant en 4ᵉ ann&eacute;e cycle ing&eacute;nierie &agrave; l&#39;EPSI, je suis &agrave; la recherche d&#39;une alternance pour l&#39;ann&eacute;e universitaire 2020/2021 je me permets de m&#39;adresser &agrave; vous concernant votre offre de d&eacute;veloppeur mobile, en effet, apr&egrave;s consultation de la fiche repr&eacute;sentative de l&#39;offre  Je trouve que mes comp&eacute;tences sont parfaitement adapt&eacute;es aux missions cit&eacute;es dans l&#39;offre.<br />\r\n<br />\r\nJe suis &agrave; votre disposition pour tout entretien, je serai ravi de partager avec vous mes motivations &agrave; faire partie de votre, et de vous divulguer plus les d&eacute;tails techniques de mes r&eacute;alisations lors de mes exp&eacute;riences professionnelles.<br />\r\nVeuillez trouver ci-joint ma lettre de motivation ainsi que mon CV.',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Candidature pour une alternance<br>\n&Eacute;metteur (From) : CHOUIKH Iheb &lt;iheb.chouikh@epsi.fr&gt;<br>\nDestinataire(s) (To) : &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\n-----<br>\nBonjour<br>\r\nAvant tout j\'espère que vous vous portez bien ainsi que votre famille durant ce chapitre difficile de l\'humanité moderne.<br>\r\n<br>\r\nJe suis étudiant en 4ᵉ année cycle ingénierie à l\'EPSI, je suis à la recherche d\'une alternance pour l\'année universitaire 2020/2021 je me permets de m\'adresser à vous concernant votre offre de développeur mobile, en effet, après consultation de la fiche représentative de l\'offre  Je trouve que mes compétences sont parfaitement  adaptées aux missions citées dans l\'offre.<br>\r\n<br>\r\n Je suis à votre disposition pour tout entretien, je serai ravi de partager avec vous mes motivations à faire partie de votre, et de vous divulguer plus les détails techniques de mes réalisations lors de mes expériences professionnelles.<br>\r\nVeuillez trouver ci-joint ma lettre de motivation ainsi que mon CV.<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp130308jal; Thu, 20 Aug 2020 23:05:24 -0700 (PDT)<br>\r\nX-Google-Smtp-Source: ABdhPJxP2AnzXysCPZWHm9jgXJN5bp6a66QrLeGJaj1+uBZHtOYj6PLJIQok9QG2AYpooglTF6iU<br>\r\nX-Received: by 2002:a17:906:f1da:: with SMTP id gx26mr1377919ejb.129.1597989923906; Thu, 20 Aug 2020 23:05:23 -0700 (PDT)<br>\r\nARC-Seal: i=2; a=rsa-sha256; t=1597989923; cv=pass; d=google.com; s=arc-20160816; b=YLL5lZcr4hGmigoR/6KZZqZpQJhISVSS4XxqrJI0pGWRK9xYbDLioqtR4M9nHzSwSb AjvDrwuUa2AA03r8NrqybjDsQatjRl+/Nnne6NI+N0sXIQ+ocu+XwmX0z6+gBJ9LkI1+ ISXxCUrEHtIIg8gH9xrbm0tUjg7/tuKACRNlZ/JNRfSW0J3+tBZDjjoqoM3TbgWBI7b/ Ttr9w5ECKgShaB6O7lloDfBzuLq/gSZrsNeEQWpEeXP1bWkH9O7yJejbvN+mbi0bgxtM zQfgSaGIsRMRA2y8u5U5I4SOaSNxQntm0IsUKaEuC1z39R8lij6tM2SoFG/lei4kDniF zrOA==<br>\r\nARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-language:accept-language:message-id:date :thread-index:thread-topic:subject:to:from:dkim-signature; bh=RA24/E2lkk5MW15DfK3+CC3IIbmOgURRJ3PrxpX0JjM=; b=wjddQnj6lNvrPS6cp3L9ZOqgghZzfI3r3gi+/ugb4mfllCT4YNmoWmSnUKukKtB1XE tOjxZgC9xVMTXts8sZz1eNJvkyyvGnCfjh2Qbiqa/DBh/ssWdfvc80Sf6YQQJAZ8rdmj B44y1OLIJAxO0K1XmY+LdvJkP8nHrLHV9nxkt1rJ/RCxiIm95jTbkEBcS1NHDsR5HzE+ P6D31Pg4h4awhvxLY6x9W6Nr7XvSfpUwKSaiR3r+/6LBU4ou7qECFLtAMmkEtBH/bDCF 28yc75PwF7n+Q6O8IFO3FKnc5Z/kVWiaVDas2xpuh44PzA9BZPuZCUu+STja5U1/JE5D cuJw==<br>\r\nARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=hoftoMBh; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of iheb.chouikh@epsi.fr designates 40.107.21.51 as permitted sender) smtp.mailfrom=iheb.chouikh@epsi.fr<br>\r\nReturn-Path: &lt;iheb.chouikh@epsi.fr&gt;<br>\r\nReceived: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2051.outbound.protection.outlook.com. [40.107.21.51]) by mx.google.com with ESMTPS id i6si536854ejc.494.2020.08.20.23.05.23 for &lt;job@nltechno.com&gt; (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Aug 2020 23:05:23 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of iheb.chouikh@epsi.fr designates 40.107.21.51 as permitted sender) client-ip=40.107.21.51;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=hoftoMBh; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of iheb.chouikh@epsi.fr designates 40.107.21.51 as permitted sender) smtp.mailfrom=iheb.chouikh@epsi.fr<br>\r\nARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QJ7X74HO6eyTApSbaGEWj26lf5E0VkOrc77H4kkUt8EkVCD8GzScmGsntB2JYpkr4xCSwejtKiyQSM2PLSmTZgr6W9naT38/JWADaFfCv6aFbSXYfB2dz1si9yncCIufDD7TK/+D8c9lBbhdLR6U54jk4D8wrhoXMyGGKvZeK0T8hmTvxFkwdQlLOaJlyZshL5bDl/BoLs77tVthelrHO9VKgwbz4Sm9JyXop6afEUPRehLIprjn8tp03mnTVp8SsqCv1aOou+SfAmVIfgJR/lrFxhpvFd0k2z/JHrbrwdOWQ15IwGeFnJOydl6uugzv4DGTt+J7j8Ck8PTbgAWdpg==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RA24/E2lkk5MW15DfK3+CC3IIbmOgURRJ3PrxpX0JjM=; b=UB2iXYafT4OulUUn+/WRlQWGcucdcTKvmxI/7HNhZw/yVUk+9RNfhrt+aq8UkxfhHB/SDQ2DOj99e+gTF9ckoN12dj6Q1MLByf9uYclXVdrBKP9t5Znty/PlthiyQKxBgS8YII0gKGYdevKFp7saD/ijG28EUXfAvN2cq7PJcXaUaYb0/3k/YaLot3zyrD7S5MokIWpDkitNm4adfOV/CPcWhtCDO/lW/aF+5qzX+zidGTZNVadecY8KocCe02TErVokQbp7HKRsjxUMzYe2+v9XW6SPoRH6NgWfZ/CuHIjHajkkJCCEukUq6VW4nnFCTkRlYHRtDeGiJkVqWZ4KhQ==<br>\r\nARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epsi.fr; dmarc=pass action=none header.from=epsi.fr; dkim=pass header.d=epsi.fr; arc=none<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ifagparis.onmicrosoft.com; s=selector2-ifagparis-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RA24/E2lkk5MW15DfK3+CC3IIbmOgURRJ3PrxpX0JjM=; b=hoftoMBhynFS2Gd98TTvS8y9A6MFVDadQao4pBGE2koKntP/KQ+tGcNBqy0Y8FCAiVZ4Z8hKgpLY6oPfsiZSlsRy7yLg+V+wmY7U4HulguYCbmPGyVbY4eYCBy/8fyFohxtMlwXdUI5ghd1CxS39pTR/T6Rh2aqd2f4jjknDbOU=<br>\r\nReceived: from DB8PR04MB6793.eurprd04.prod.outlook.com (2603:10a6:10:11a::22) by DB3PR0402MB3850.eurprd04.prod.outlook.com (2603:10a6:8:3::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.24; Fri, 21 Aug 2020 06:05:21 +0000<br>\r\nReceived: from DB8PR04MB6793.eurprd04.prod.outlook.com ([fe80::9078:5cde:597f:3403]) by DB8PR04MB6793.eurprd04.prod.outlook.com ([fe80::9078:5cde:597f:3403%5]) with mapi id 15.20.3305.026; Fri, 21 Aug 2020 06:05:21 +0000<br>\r\nFrom: CHOUIKH Iheb &lt;iheb.chouikh@epsi.fr&gt;<br>\r\nTo: &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\r\nSubject: Candidature pour une alternance<br>\r\nThread-Topic: Candidature pour une alternance<br>\r\nThread-Index: AQHWd4BB3gTL/7l6O0u6SQtmuC4jWA==<br>\r\nDate: Fri, 21 Aug 2020 06:05:21 +0000<br>\r\nMessage-ID: &lt;DB8PR04MB6793E05025783F1646880F7A9C5B0@DB8PR04MB6793.eurprd04.prod.outlook.com&gt;<br>\r\nAccept-Language: fr-FR, en-US<br>\r\nContent-Language: fr-FR<br>\r\nX-MS-Has-Attach: yes<br>\r\nX-MS-TNEF-Correlator: <br>\r\nauthentication-results: nltechno.com; dkim=none (message not signed) header.d=none;nltechno.com; dmarc=none action=none header.from=epsi.fr;<br>\r\nx-originating-ip: [46.193.65.142]<br>\r\nx-ms-publictraffictype: Email<br>\r\nx-ms-office365-filtering-correlation-id: e74daf17-e937-483c-b16a-08d84598300f<br>\r\nx-ms-traffictypediagnostic: DB3PR0402MB3850:<br>\r\nx-microsoft-antispam-prvs: &lt;DB3PR0402MB38508E0F70508009101F51199C5B0@DB3PR0402MB3850.eurprd04.prod.outlook.com&gt;<br>\r\nx-ms-oob-tlc-oobclassifiers: OLM:389;<br>\r\nx-ms-exchange-senderadcheck: 1<br>\r\nx-microsoft-antispam: BCL:0;<br>\r\nx-microsoft-antispam-message-info: Qcnt9Suecge4RNKwguIUAtw0dr/1+pJmFKgPW9WX4yi5fbwjvjneTjw6Uk+UiyxSDhHioNnhfebfZpsnOeH+wV3BhChpHnTQjg6oVxPfm1iAj0eXG3nPfs+p3InQQKNXsDKf+yfkgxMbmDCwP89VZ+SZXpJNI+ZZkIpAyAp0lAKbYXTKGo37OHcHOi+tVvUfhJjfbG6WvKDe46uLml5O7Mpat9+s276nDMXx5lszpN7kbxyUC39WPdifhSj+N6VDi1Ciq+U8UiJ307m+tU1hy3N6K9wnqXSmQuG+cpZRvFbDsnhDeIexnHhwTj4B26W1j7qU4XlXRUlJ3Cha91mIYTmvzZNxMFldiyVldShJ8RZ23FFbz/NSkVNYIzxyKLMxhwZxjVOfnYGf2qJV73B07EEmWSFwWQjbdXABJaIT1YUGske51z5/YInJUCXJtVTxbU2BRvXJO1YLGx94CDA5jg==<br>\r\nx-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:fr;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB8PR04MB6793.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(376002)(396003)(346002)(366004)(136003)(39850400004)(186003)(786003)(2906002)(316002)(6916009)(6506007)(8676002)(4743002)(9686003)(55016002)(99936003)(7696005)(3480700007)(8936002)(5660300002)(478600001)(26005)(33656002)(71200400001)(91956017)(66446008)(64756008)(66576008)(66556008)(19627405001)(66476007)(76116006)(86362001)(4744005)(66946007)(52536014)(6430600002);DIR:OUT;SFP:1101;<br>\r\nx-ms-exchange-antispam-messagedata: e94oxUq7D2A7faTaLazyPTcBF8ctbyPjQEKvFBoNo9tb+vgDa3PZQzA87a4TEsvEG6FYWoZUo79+WwZ86f4yOYpdz6Eiqu87tIBCvH5q0pgnMcSloRMJ9xKzngN1Gq1DgUpz/zyuPE1kFt9xZpxLHOrCxpfKfXl+uqWlcBqR9e03m+BC+10Ravv4HVGhNWkiD6dNo6W80plzE2baZw4158FZ3EcitWlCuAihWnbSNkEszrOuLxNNJoAxUEE5Wqq+hhyCCXTMf+Mx6uZ7iIj86RLZEJFJkJkzDyv34I2LRQAEZn4uJi2nwmurMXwlFXc6oHISbscMWJ6fPFN2hE5mQNirOgpC3DcsSfdqHDZ1r6j6tOXjeZgy54U5tCcusmQf0d1ZjomdESgIRJEqJa24IDc4XAsHwKdUlQwFRQ+mGu4y4Uvq/p9WadRsuz8+jQw276aepaIEVmZ6FayguVKWI+xaNrooSLflN0+PPgSAY7EGCeTA9SXfs6Tu05fUmksM6Qlv3AClWp4QQcmyNZ0RRhr/6bmSA80ANoZ5vwfOvYGAq9VNedZGPc+0kBst/QEPN1jENbJu5I/tmaPrEvE3peRy1DuCo4PbDL2FbPaCQz0DHWDE1v5K4mZYoMlBSqHJeZYN8ey3/s22Xv0e36b9NA==<br>\r\nx-ms-exchange-transport-forked: True<br>\r\nContent-Type: multipart/mixed; boundary=&quot;_005_DB8PR04MB6793E05025783F1646880F7A9C5B0DB8PR04MB6793eurp_&quot;<br>\r\nMIME-Version: 1.0<br>\r\nX-OriginatorOrg: epsi.fr<br>\r\nX-MS-Exchange-CrossTenant-AuthAs: Internal<br>\r\nX-MS-Exchange-CrossTenant-AuthSource: DB8PR04MB6793.eurprd04.prod.outlook.com<br>\r\nX-MS-Exchange-CrossTenant-Network-Message-Id: e74daf17-e937-483c-b16a-08d84598300f<br>\r\nX-MS-Exchange-CrossTenant-originalarrivaltime: 21 Aug 2020 06:05:21.5590 (UTC)<br>\r\nX-MS-Exchange-CrossTenant-fromentityheader: Hosted<br>\r\nX-MS-Exchange-CrossTenant-id: b6e77e52-65f6-4dec-b7d9-8e45f36a536f<br>\r\nX-MS-Exchange-CrossTenant-mailboxtype: HOSTED<br>\r\nX-MS-Exchange-CrossTenant-userprincipalname: SnmE68HeGc4ArbAPc1fd0gxiZ2zam5Ygqrq3jniTKPu81sAaTPzmfWgnP79z08xpcutZjlLSYfu/hpKKCKnM2A==<br>\r\nX-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0402MB3850 ','2020-08-21 08:05:23','2020-11-04 12:02:05',12,12,NULL,NULL,5,'pre','CHOUIKH Iheb','iheb.chouikh@epsi.fr','tel',456,123,NULL,'DB8PR04MB6793E05025783F1646880F7A9C5B0@DB8PR04MB6793.eurprd04.prod.outlook.com',1,'2020-11-04'),(69,NULL,'(PROV69)','Bonjour monsieur DESTAILLEUR,\r\n\r\n\r\n\r\nVotre mission sur l\'amélioration du projet Open Source sellyoursaas.org ayant retenu mon attention, je me permets de vous contacter au sujet de ma recherche d’alternance.\r\n\r\nActuellement en 2ème année d\'informatique à l’école EPSI Bordeaux, je recherche activement une alternance en administration système et réseau à partir de septembre 2020 pour débuter ma 3ème année d’informatique.\r\n\r\nJ\'aimerais beaucoup participer à la progression de NLTechno - DoliCloud afin d’être utile pour cette entreprise.\r\n\r\nJe me permets de vous joindre mon CV à cet email.\r\n\r\nJe me tiens à votre disposition pour vous rencontrer et venir vous exposer mes motivations.\r\n\r\n\r\n\r\nBien Cordialement,\r\n\r\n\r\n\r\nBENOIT Damien - 2ème année d’informatique à l’EPSI',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : BENOIT Damien &ndash; Candidature pour de l&rsquo;alternance en administration syst&egrave;me et r&eacute;seau &agrave; partir de septembre 2020<br>\n&Eacute;metteur (From) : BENOIT Damien &lt;damien.benoit@epsi.fr&gt;<br>\nDestinataire(s) (To) : &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\n-----<br>\nBonjour monsieur DESTAILLEUR,<br>\r\n<br>\r\n<br>\r\n<br>\r\nVotre mission sur l\'amélioration du projet Open Source sellyoursaas.org ayant retenu mon attention, je me permets de vous contacter au sujet de ma recherche d’alternance.<br>\r\n<br>\r\nActuellement en 2ème année d\'informatique à l’école EPSI Bordeaux, je recherche activement une alternance en administration système et réseau à partir de septembre 2020 pour débuter ma 3ème année d’informatique.<br>\r\n<br>\r\nJ\'aimerais beaucoup participer à la progression de NLTechno - DoliCloud afin d’être utile pour cette entreprise.<br>\r\n<br>\r\nJe me permets de vous joindre mon CV à cet email.<br>\r\n<br>\r\nJe me tiens à votre disposition pour vous rencontrer et venir vous exposer mes motivations.<br>\r\n<br>\r\n<br>\r\n<br>\r\nBien Cordialement,<br>\r\n<br>\r\n<br>\r\n<br>\r\nBENOIT Damien - 2ème année d’informatique à l’EPSI<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp415821jal; Fri, 21 Aug 2020 06:54:18 -0700 (PDT)<br>\r\nX-Google-Smtp-Source: ABdhPJwNUMfzLqF2HV+5g4A254GQNrWSYgQ5MlJ701OY7zy6bUsKqAyRKaIu7DsIPnvAaE8rEj8B<br>\r\nX-Received: by 2002:a50:e087:: with SMTP id f7mr3053952edl.174.1598018056692; Fri, 21 Aug 2020 06:54:16 -0700 (PDT)<br>\r\nARC-Seal: i=2; a=rsa-sha256; t=1598018056; cv=pass; d=google.com; s=arc-20160816; b=OT98mNI5yD2nBwEXxhcwTI6ucP74DHaiXUojV+fsblL99Xlj631wvNRzv0TlDGTU0E F2odQKv6yfzFfQSTud4eJl9Jdg1D8HA+H15RYYJq+XxiCK4hbbg199gS4E4MqT/RuMh9 aQFv18gnQFACpmWDf/fkFd8iLygx3oAI7EBBathS3YFUYsE4MgEzZ3j8wwqPoHs4IJAx vrenudfoo1dCGh873gfj77phNeeE1Rx3PtyIuu6h9XuLliyN2eQ0bc335fjYCU0ZS7B3 r9E5X2Bl4JSt6rdsmcItCqC3d+4HOXPKAPKxpFqNOrRgS5h5UHMTku5bHpc0N5fkXtSA JtgA==<br>\r\nARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-language:accept-language:message-id:date :thread-index:thread-topic:subject:to:from:dkim-signature; bh=CzX/9ftE1Hnsaclh79rJdyJIES0g6H9l55WAnJutN2k=; b=EdHME2nUqG2LTcXRcS6DKJG6jIwIhL/dkAajrq5ztyAnaqGKTNYYShQYTBVjb8jkKp Q+NACFBx+f0l+Wud9sAWUvFGvzhGeX7e7LIqB+DbqlobejpPWVA6mCBRXiZg5OPyql63 dorrXCn9SIH6sRNjVAZJ/cANp59VF776SU7XBT1qMawlT8yeoHuMwjxEGUr+fT2W22di hQEI7y+ELFqWUWyzgAmCozFSzh6zqp4H/k0SkzNsnqAo9nwPvzX5NnMOnGmTLofaDzWc vH3dAy0bFjiqTXK6FHznbxWYG7m4GcFDPXGpQdYcWsuKOKd3TqEPmf7EZVLhIODBVjmr ZqvA==<br>\r\nARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=&quot;I4X/HA+P&quot;; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of damien.benoit@epsi.fr designates 40.107.22.49 as permitted sender) smtp.mailfrom=damien.benoit@epsi.fr<br>\r\nReturn-Path: &lt;damien.benoit@epsi.fr&gt;<br>\r\nReceived: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2049.outbound.protection.outlook.com. [40.107.22.49]) by mx.google.com with ESMTPS id w12si1407712edl.141.2020.08.21.06.54.16 for &lt;job@nltechno.com&gt; (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Aug 2020 06:54:16 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of damien.benoit@epsi.fr designates 40.107.22.49 as permitted sender) client-ip=40.107.22.49;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=&quot;I4X/HA+P&quot;; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of damien.benoit@epsi.fr designates 40.107.22.49 as permitted sender) smtp.mailfrom=damien.benoit@epsi.fr<br>\r\nARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VnniU0v2of3cIuylxsHTWNFTLqahQ37qkOIa0jOb6J+TOyyqnXEfZ+MJ1jI63eSqMHy9x1ORRhmyYyfKuMFxSgtGf9ENl+o5UAPdEH8Qw4UG3pApwPzPk1mxTn1jnTEQ64kuPFubmbLek46lSmIINjKYf36SXYWLfsM+UgFsV1NjhkII0BO+gP1cMIDaKzidgBKxL0253Y4hcRT+y1E0mwR7e4lBrLLr78GTej5JAU+CXdnCMArprt3RZN2MWihBULvQlfH++3T+UFcUiIaLJ5SeR1xySl8lZw88vMBCOgKZNXCDcYNIMSmd+DhZ/bj9tFYutSjODuQG1/1fVDgDsA==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CzX/9ftE1Hnsaclh79rJdyJIES0g6H9l55WAnJutN2k=; b=cjv1pF+QVfGVGctFyKQN7pNfhGk/at0Hw5phiNNVQUolL/7YXwytmyrmv+YDONjxyx75huJ0J8DsEbmPm618aK9Ml/V159RLV7VQw9S/JD5K943R3ZyeA7zQ+a46Fi6RA24AENa5+Qj7JNPnTDFV2DGVii+LHGR4m0PzI/hZB8zht1vPnjw0vQTWj+ao7ue15SrBZ/Nnie2xHPlks661iyxcQXTDjKwyZmbZGrNArTyXHlJLo4JLO+6ORCZOc5yquBPWr56w1UYouvrHibbweWe5qnl61cqS9sMEzoOUTD0r//NKCZLPD/gnz/fWew+F4mYtZ5UgmcVCwR4ShiUAJQ==<br>\r\nARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epsi.fr; dmarc=pass action=none header.from=epsi.fr; dkim=pass header.d=epsi.fr; arc=none<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ifagparis.onmicrosoft.com; s=selector2-ifagparis-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CzX/9ftE1Hnsaclh79rJdyJIES0g6H9l55WAnJutN2k=; b=I4X/HA+PxZX1x/8LmayLu235XxmfJ9QByJv7pbe14hOMZJnooHkyDFvo3vaLDdiTzWWCBohlTKJ/X7mPsiPnufLeMpXZDAsQxQocTVQSX1kT1zZcht9e9fFHh8EDx3p5hbPAaA9jbokOpqrVDz9nZVX+yDMQTyh8jEiVrpfUGwc=<br>\r\nReceived: from AM0PR04MB6834.eurprd04.prod.outlook.com (2603:10a6:208:17e::13) by AM0PR0402MB3332.eurprd04.prod.outlook.com (2603:10a6:208:22::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.24; Fri, 21 Aug 2020 13:54:04 +0000<br>\r\nReceived: from AM0PR04MB6834.eurprd04.prod.outlook.com ([fe80::f9ad:b5fd:a7ee:ebc2]) by AM0PR04MB6834.eurprd04.prod.outlook.com ([fe80::f9ad:b5fd:a7ee:ebc2%4]) with mapi id 15.20.3283.028; Fri, 21 Aug 2020 13:54:04 +0000<br>\r\nFrom: BENOIT Damien &lt;damien.benoit@epsi.fr&gt;<br>\r\nTo: &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\r\nSubject: =?Windows-1252?Q?BENOIT_Damien_=96_Candidature_pour_de_l=92alternance_en_?= =?Windows-1252?Q?administration_syst=E8me_et_r=E9seau_=E0_partir_de_septe?= =?Windows-1252?Q?mbre_2020?=<br>\r\nThread-Topic: =?Windows-1252?Q?BENOIT_Damien_=96_Candidature_pour_de_l=92alternance_en_?= =?Windows-1252?Q?administration_syst=E8me_et_r=E9seau_=E0_partir_de_septe?= =?Windows-1252?Q?mbre_2020?=<br>\r\nThread-Index: AQHWd8F/5mgKBmrxU0CeTMkdIv1fIg==<br>\r\nDate: Fri, 21 Aug 2020 13:54:04 +0000<br>\r\nMessage-ID: &lt;AM0PR04MB683482180EF217DB2427AC99F05B0@AM0PR04MB6834.eurprd04.prod.outlook.com&gt;<br>\r\nAccept-Language: fr-FR, en-US<br>\r\nContent-Language: fr-FR<br>\r\nX-MS-Has-Attach: yes<br>\r\nX-MS-TNEF-Correlator: <br>\r\nauthentication-results: nltechno.com; dkim=none (message not signed) header.d=none;nltechno.com; dmarc=none action=none header.from=epsi.fr;<br>\r\nx-originating-ip: [2a01:e0a:52e:1570:197f:2595:af84:b5b2]<br>\r\nx-ms-publictraffictype: Email<br>\r\nx-ms-office365-filtering-correlation-id: 04a1e782-77b5-4a17-55a4-08d845d9aaaa<br>\r\nx-ms-traffictypediagnostic: AM0PR0402MB3332:<br>\r\nx-microsoft-antispam-prvs: &lt;AM0PR0402MB333200EC6808A6AEBE44CD0BF05B0@AM0PR0402MB3332.eurprd04.prod.outlook.com&gt;<br>\r\nx-ms-oob-tlc-oobclassifiers: OLM:86;<br>\r\nx-ms-exchange-senderadcheck: 1<br>\r\nx-microsoft-antispam: BCL:0;<br>\r\nx-microsoft-antispam-message-info: Mciv+DNsieWtRmCq1o4BDrQoXJ+UcLwvpMBAzgseAfHYPh0L6vROSJZjJv+Ti33Won7l37zJJaZnGSf/twsLKxXfh9JDYtcKHbhcpOJcu81vqYDr0HhKQVBjPvxKa8WMfRP/L43eEt/Ci6M/s2xolIffvATiTvcl4xTVdi3yXYFkVKVZb80ggMtBII+5C8Ben/fiacqbzf+GcY2XNv6TQqWT39MHA24+q8BciY5st6UoayVHxCnEOt97F9dOa0hUdO45dNBCaIPevZ6wivNK5mpvN/yqiIk8ngkOsc6mmYCfZyiWNu2DDK+sLSDHk+mNYBjImDEopgG7uIW7G7OpBw==<br>\r\nx-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:fr;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB6834.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(376002)(346002)(366004)(39850400004)(136003)(396003)(66476007)(66946007)(33656002)(83380400001)(91956017)(71200400001)(99936003)(224303003)(76116006)(19627405001)(2906002)(478600001)(316002)(786003)(52536014)(66616009)(86362001)(66446008)(8936002)(64756008)(6506007)(66556008)(6916009)(9686003)(186003)(5660300002)(7696005)(4744005)(55016002);DIR:OUT;SFP:1101;<br>\r\nx-ms-exchange-antispam-messagedata: uj+uwURwQuIypfvETCqlUN0NhGNx4ORj/b1bQQXr0I9xvo3IsdBJV1HWI2deGC7SCf5XXvVFXKyip+VBLW1nTMysh+LNu+ZYezCaPT1ndNuQuTzLCcavPaCNLUV9PLTJjrbOroT1fThdHlYC3CXB5Txcp974xXcxP479lHPXZFFMEP7S5L4b97LGYtzZbxEx5NPkJuOPr/J/pPSZFidObtc5dvmWEYxSLXyr4MRjfZ7sZDUBbsAQl+8ygMcA07BsJ3HfT8Hsv760RCRCe7uB2bqcWVv96dIGwcLBGbILzw7vJqVMqg18ACCUnJA2MYcqJ/SYWCceUaRBKxpSin2Fe28umYC+FMRQDWoEQ+xW3xQY4A2fjWD2gNzWv3Dm3Mspp5BRqMG7fi/0RyIjg/PMPiEYl/gOf0czzrKOEOgkgsIZEo1beEhx+P/dW2Wt13g4V9qq1lnXpU4Jv7LTed6WxAGh9x7/OGA6GmN5Onwm9IK2LpE7Xu8sj0OCs1mycaPHyX+RDCVXpIlB7u06CFWRqD4uyn1WqgzzEZ5/+0yw93Wzw/kF3AxahTw552yh0+UIARfmo+TYt74EhbWdR+5QkTtMSbKnN2aejsEpDzNeflmGnjucsMoQ21+dXg0L3ySCU5zgRJC45e/ntqFjh7wWw3RZ4BwfRAT18W0Xbi2i9EQzNOica8ZQNx/uA7FSWuoYW72Wd1tL0eJjd/ykNCMm4w==<br>\r\nx-ms-exchange-transport-forked: True<br>\r\nContent-Type: multipart/mixed; boundary=&quot;_004_AM0PR04MB683482180EF217DB2427AC99F05B0AM0PR04MB6834eurp_&quot;<br>\r\nMIME-Version: 1.0<br>\r\nX-OriginatorOrg: epsi.fr<br>\r\nX-MS-Exchange-CrossTenant-AuthAs: Internal<br>\r\nX-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6834.eurprd04.prod.outlook.com<br>\r\nX-MS-Exchange-CrossTenant-Network-Message-Id: 04a1e782-77b5-4a17-55a4-08d845d9aaaa<br>\r\nX-MS-Exchange-CrossTenant-originalarrivaltime: 21 Aug 2020 13:54:04.4104 (UTC)<br>\r\nX-MS-Exchange-CrossTenant-fromentityheader: Hosted<br>\r\nX-MS-Exchange-CrossTenant-id: b6e77e52-65f6-4dec-b7d9-8e45f36a536f<br>\r\nX-MS-Exchange-CrossTenant-mailboxtype: HOSTED<br>\r\nX-MS-Exchange-CrossTenant-userprincipalname: lJ93XTQQJnpcED1j/7ctz0oEvD/7q2cseGjqmGDMdQLtjf8dSJJwrl6PivcUNok4LHulBQq0UkZ0tLJu+dtD+w==<br>\r\nX-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0402MB3332 ','2020-08-21 15:54:16','2020-08-23 14:03:32',12,NULL,NULL,NULL,0,NULL,'BENOIT Damien','damien.benoit@epsi.fr',NULL,NULL,NULL,NULL,'AM0PR04MB683482180EF217DB2427AC99F05B0@AM0PR04MB6834.eurprd04.prod.outlook.com',1,NULL),(70,NULL,'(PROV70)','Bonjour,\r\n\r\nJ\'ai reçu une offre d\'alternance pour l\'amélioration des projets open source nécessitant les compétences d\'administrateur système et de développeur PHP.\r\nJe pense correspondre à ces critères-là.\r\n\r\nJe vous joins mon CV ainsi que ma lettre de motivation.\r\nEn attente de votre réponse.\r\nCordialement, Benoist Sylvain\r\n\r\n\r\n____________________________________________________\r\n\r\n\r\nSylvain BENOIST\r\n\r\nEtudiant en Ingénierie Informatique B2 à l\'EPSI Bordeaux\r\n\r\n114 Rue Lucien Faure, 33000 Bordeaux\r\n\r\nsylvain.benoist@epsi.fr\r\n\r\n+33 (0)6.34.50.08.86',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Candidature alternance logiciel Open Source<br>\n&Eacute;metteur (From) : BENOIST Sylvain &lt;sylvain.benoist@epsi.fr&gt;<br>\nDestinataire(s) (To) : &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\n-----<br>\nBonjour,<br>\r\n<br>\r\nJ\'ai reçu une offre d\'alternance pour l\'amélioration des projets open source nécessitant les compétences d\'administrateur système et de développeur PHP.<br>\r\nJe pense correspondre à ces critères-là.<br>\r\n<br>\r\nJe vous joins mon CV ainsi que ma lettre de motivation.<br>\r\nEn attente de votre réponse.<br>\r\nCordialement, Benoist Sylvain<br>\r\n<br>\r\n<br>\r\n____________________________________________________<br>\r\n<br>\r\n<br>\r\nSylvain BENOIST<br>\r\n<br>\r\nEtudiant en Ingénierie Informatique B2 à l\'EPSI Bordeaux<br>\r\n<br>\r\n114 Rue Lucien Faure, 33000 Bordeaux<br>\r\n<br>\r\nsylvain.benoist@epsi.fr<br>\r\n<br>\r\n+33 (0)6.34.50.08.86<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp445349jal; Fri, 21 Aug 2020 07:31:04 -0700 (PDT)<br>\r\nX-Google-Smtp-Source: ABdhPJyJOTDSzKgEPxPQ61qrv4xEHnssoIHqapylWS9ldM4pQ62rlUsothTvjI/R0Vtpb5tBFgyP<br>\r\nX-Received: by 2002:a5d:4910:: with SMTP id x16mr2905233wrq.131.1598020263819; Fri, 21 Aug 2020 07:31:03 -0700 (PDT)<br>\r\nARC-Seal: i=2; a=rsa-sha256; t=1598020263; cv=pass; d=google.com; s=arc-20160816; b=NVVqGREnzBw1VkICkFXNnQJfyzkP6XS1f5bP1wRfweQDh08ELSHm1ya15MMPzEErN2 hbu0eOZQxL10p0IGgq1QZTGg6InhNL0hlYSwFpTMO/l+17NIlYyddz0+mJQSc8OYJEAg cxh3C8qlN/A9HtoxKBtlwChWWhP1PrjWNdBW5jv8fOefGb1dIEJuv5Hd2mr4i/yxlbO5 x8g3w7acHcvp57Oe5Mp4euoEcyUrQ0oTAWKAO+ZBj3Wf4vM1+i0rsACPtU+9gWCQHZnh 4e52Sq59GukWJXiX2TV9yxJYfHDezM+Ni7QosuP8Yus5ylqi5vDVbtOAl6GcJ1/Z8ANF BknQ==<br>\r\nARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-language:accept-language:message-id:date :thread-index:thread-topic:subject:to:from:dkim-signature; bh=Z6FhglKlbNS7hYHV+AiMg1sqp6TYWc2h2ClK+f7dh4o=; b=Jw8e6HYb8J/vClKDYbpVYzSuIiJo5Cn53cb3K0AltGjcd4SOB6a3Y9jenu1vHsUlRA k9CnPBlRa/wz6Wul9nenV9ENwqlTwFKnccxTC+4ClCHjUSd/3zuYF7Y4hOmio+aOf+8v tnU+/0s1LeuyXm7qSHyrCJkMVMYlIMV/RcIbjpt0RdZJz063/5wbaFAJU5BrUr8HuOzO tkLkm5r2zXe7qbNlDFq2/h2Ms35Lx6sKm/aRFj8/jXVEV6F23KrALl2ao6FTLruac/pC s8yX1WbTGFYvC52+Gm1egglWVdezVdj3SH9XWF0yqIRTfSiCqpVYao8gtO+H4m0/Mx6L pTNQ==<br>\r\nARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=Sdyaq4Mx; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of sylvain.benoist@epsi.fr designates 40.107.20.68 as permitted sender) smtp.mailfrom=sylvain.benoist@epsi.fr<br>\r\nReturn-Path: &lt;sylvain.benoist@epsi.fr&gt;<br>\r\nReceived: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2068.outbound.protection.outlook.com. [40.107.20.68]) by mx.google.com with ESMTPS id 13si1918880wmo.178.2020.08.21.07.31.03 for &lt;job@nltechno.com&gt; (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Aug 2020 07:31:03 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of sylvain.benoist@epsi.fr designates 40.107.20.68 as permitted sender) client-ip=40.107.20.68;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=Sdyaq4Mx; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of sylvain.benoist@epsi.fr designates 40.107.20.68 as permitted sender) smtp.mailfrom=sylvain.benoist@epsi.fr<br>\r\nARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ITQUdqwlpPESEaONJ1JvoPg3oVTyreFwTi79kCjVQuiyxQYA+JaS+VVn1W6asHnnSoSykPd3wcQ6tqRqQc0BQHI3o8gBFgFrav0FP6t2ibnaFX5DPGJA2No3OstPDR11PHxfVl7xvrQSi3TsntPsBY7MZOPOcGQtLyjW4BPPQDlxY5JnJeCE1epJfnsHG+8ucsKu0ccsrobguAvSb/AvbU/qP/IcJB4DuHwsDkvElJIfagdt9mGWnmJOudnl9FlujleE4QpJV5rQ64J9Z1E4O69OyXY+BNetBIa1OOS8gRBdO5LScTz2wMjiIiKrJg92dQRdO0ozuNX9Le7+JUFAhQ==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Z6FhglKlbNS7hYHV+AiMg1sqp6TYWc2h2ClK+f7dh4o=; b=FzY+KVT53dV0IuD25/bxZO5nTMq+N4EoOcUK/66tozg67ghqrbe1sY61lNR5ByOWeBQtqwKbH0bduW91r8MITHD07RLh6HYfE2RuVqZGBFrszQZWuVZJCBJj84+JblsutmgKYgpRkaZ2wVF5hklnP7RUDax3Crb4T2IjaRJwSO1kMLvvT+qH06sHQ8kH09qovfWVB+iAV/u+PG5YRdAZrjav7EAGTrwOcu3vWrQh6ULllpMSlqtDwI/zUKG2RyyccY1YcwThAyNnlqhQXGm72Qq+r4fbcI8FQoPvG5Nke22eDnwM+BUR3aRgWIX/v4nyOJUrNkxxcSzJGvjfaP14Jw==<br>\r\nARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epsi.fr; dmarc=pass action=none header.from=epsi.fr; dkim=pass header.d=epsi.fr; arc=none<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ifagparis.onmicrosoft.com; s=selector2-ifagparis-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Z6FhglKlbNS7hYHV+AiMg1sqp6TYWc2h2ClK+f7dh4o=; b=Sdyaq4Mxuj+akkIjv+LsTuzCXGu5Fxaf0W1Oex6SRNlrd+hfVFwbStFfFiL0CKrt/N+If8oDx26tlx7h5Bf7DhEVaYRroDsj5OnrHEqPXuaKhgHeGXGbbPgsnMXXMOh0F/ljFg+Eudi5bU0csFQVafKaqW4sHGX9xTAd+iHyEyg=<br>\r\nReceived: from AM6PR04MB5190.eurprd04.prod.outlook.com (2603:10a6:20b:d::25) by AM6PR04MB4664.eurprd04.prod.outlook.com (2603:10a6:20b:25::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.25; Fri, 21 Aug 2020 14:31:01 +0000<br>\r\nReceived: from AM6PR04MB5190.eurprd04.prod.outlook.com ([fe80::6967:5154:6fbe:97b2]) by AM6PR04MB5190.eurprd04.prod.outlook.com ([fe80::6967:5154:6fbe:97b2%5]) with mapi id 15.20.3305.024; Fri, 21 Aug 2020 14:31:01 +0000<br>\r\nFrom: BENOIST Sylvain &lt;sylvain.benoist@epsi.fr&gt;<br>\r\nTo: &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\r\nSubject: Candidature alternance logiciel Open Source<br>\r\nThread-Topic: Candidature alternance logiciel Open Source<br>\r\nThread-Index: AQHWd8cJqkHnhFUA/EOhz+7NH3NjOg==<br>\r\nDate: Fri, 21 Aug 2020 14:31:01 +0000<br>\r\nMessage-ID: &lt;AM6PR04MB5190F6DD4134E0F9ADAD2CD6FF5B0@AM6PR04MB5190.eurprd04.prod.outlook.com&gt;<br>\r\nAccept-Language: fr-FR, en-US<br>\r\nContent-Language: fr-FR<br>\r\nX-MS-Has-Attach: yes<br>\r\nX-MS-TNEF-Correlator: <br>\r\nauthentication-results: nltechno.com; dkim=none (message not signed) header.d=none;nltechno.com; dmarc=none action=none header.from=epsi.fr;<br>\r\nx-originating-ip: [193.250.78.149]<br>\r\nx-ms-publictraffictype: Email<br>\r\nx-ms-office365-filtering-correlation-id: a9ca76a6-bbcf-4fe0-ed2e-08d845ded41f<br>\r\nx-ms-traffictypediagnostic: AM6PR04MB4664:<br>\r\nx-microsoft-antispam-prvs: &lt;AM6PR04MB4664C17047CF59D8EEA980BAFF5B0@AM6PR04MB4664.eurprd04.prod.outlook.com&gt;<br>\r\nx-ms-oob-tlc-oobclassifiers: OLM:989;<br>\r\nx-ms-exchange-senderadcheck: 1<br>\r\nx-microsoft-antispam: BCL:0;<br>\r\nx-microsoft-antispam-message-info: TEqFZXMlg0QIA1GezbcWxqSlqzCB3rIdRk8A9MzNeGm6N693eFcehflrq/xA0jYi4eTpNcral1Ia9Wb3mKi93G638En+aQG4JZbPdFRjVnFyJgsFc58TvtNm68kewGRDyccWoWeo4HEpHw2ERyHrGTN8jxkoF1GAGVUBMHDqOP/XBsskzM4vSENLKndNMiRaxL0fQniH9C5J7PIUKhBQ5x0tbdgtjesGPg/4mvw8f4G9/DLfM01bKU47ekBi//xkFwfW5rSGqfSIorE16MZ/kQW/yO2ieM0B2az1FSbKw9Ex2/7GnOvqnfUaSXXP8jlB<br>\r\nx-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:fr;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB5190.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(136003)(376002)(39850400004)(366004)(346002)(396003)(66556008)(4744005)(478600001)(8936002)(55016002)(66576008)(6916009)(9686003)(2906002)(186003)(76116006)(64756008)(66476007)(33656002)(19627405001)(52536014)(91956017)(5660300002)(8676002)(66446008)(66946007)(86362001)(71200400001)(316002)(99936003)(786003)(7696005)(26005)(83380400001)(6506007);DIR:OUT;SFP:1101;<br>\r\nx-ms-exchange-antispam-messagedata: GitTgsWkD/wIskt7S8LZlmQL3XhmMm2RkFYh16U/KpcX6IBHqNcwe6mBxSHyQW1/IyZwtQNhMAVoKD5y3ZBSkZpJnkQsnnt+yKqy94bVjYcBotH44npGbQxcOa0rHcgYlKrgHJbWojRhZvzjKLErx6fRYAt729QKEJX5CK8I8Ct2ODE2BenkHqSsKDbe+hmFoO1yXeTI7xlp6nUsviFm9NKkcBmc1vEp+0uuQMFlQg2VU2YikD1YQSxcq7tt1i4WNGL11bRrabzSkSxnVGoVei6bQf5bu8Wn2VbaBLMOPK6X/mewaigXxivafpHNMMbXkuSTwFziBJt7hUaof1dqsZCvsLb5npKEgBjucULLy4RCQu8a1XSi+qWwevPaBNGrCpCYyjZ/u6BgiYta5G9Ndx0huoB3DL/BXAXDjE2Y0goGGN1PhyhiEvUjIK6Huv7kCPe3/tP5Xl6gYqMZe9b84kZAwSQiaBQbF/4/sCfyom1xeTc2Z48+P/AL08Rj7z5Q9O4EQoQFCm2cEbhZH3j6PWM6WpGdqipDpHPCIa9yl9xbNc0PXjOYdpgNXzkllTWRWeJk0IUnw83ngeKly2nsv6UuVB/S5wwlydXa7EmKuJ8JGhCTxDK131fU8OPcymJGarAH9XXN8EtCNwAOKg92fw==<br>\r\nx-ms-exchange-transport-forked: True<br>\r\nContent-Type: multipart/mixed; boundary=&quot;_005_AM6PR04MB5190F6DD4134E0F9ADAD2CD6FF5B0AM6PR04MB5190eurp_&quot;<br>\r\nMIME-Version: 1.0<br>\r\nX-OriginatorOrg: epsi.fr<br>\r\nX-MS-Exchange-CrossTenant-AuthAs: Internal<br>\r\nX-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB5190.eurprd04.prod.outlook.com<br>\r\nX-MS-Exchange-CrossTenant-Network-Message-Id: a9ca76a6-bbcf-4fe0-ed2e-08d845ded41f<br>\r\nX-MS-Exchange-CrossTenant-originalarrivaltime: 21 Aug 2020 14:31:01.4864 (UTC)<br>\r\nX-MS-Exchange-CrossTenant-fromentityheader: Hosted<br>\r\nX-MS-Exchange-CrossTenant-id: b6e77e52-65f6-4dec-b7d9-8e45f36a536f<br>\r\nX-MS-Exchange-CrossTenant-mailboxtype: HOSTED<br>\r\nX-MS-Exchange-CrossTenant-userprincipalname: 2sKkmSMUyJ7Vb/zpQVDdT0C3tjmbbvYNNVXUdIyJsvMJgQ0eTkzFeXsUexIdbgkKXE8sE855DoH46w2U0ADeDA==<br>\r\nX-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4664 ','2020-08-21 16:31:03','2020-08-23 14:03:33',12,NULL,NULL,NULL,0,NULL,'BENOIST Sylvain','sylvain.benoist@epsi.fr',NULL,NULL,NULL,NULL,'AM6PR04MB5190F6DD4134E0F9ADAD2CD6FF5B0@AM6PR04MB5190.eurprd04.prod.outlook.com',1,NULL),(71,NULL,'(PROV71)','Bonjour Monsieur Destailleur,\r\n\r\nJe vous contacte concernant l’offre d’alternance en développement que vous avez émise.\r\nActuellement à l\'aube de ma 3e année de Bachelor informatique à l\'EPSI Bordeaux, je suis à la recherche d\'une alternance qui débuterait en septembre.\r\nCette alternance se ferait au rythme de deux semaines en entreprise et deux semaines à l\'école, les cours ne reprenant néanmoins pas avant novembre.\r\n\r\nAu cours de mes études, j\'ai été amené à réaliser deux stages en milieu professionnel de sept semaines chacun.\r\nJ\'y ai perfectionné mes compétences dans le développement web avec notamment les langages PHP, le stack web HTML/CSS/JS ainsi que le framework Symfony4.\r\nDéveloppeur plutôt orienté web, j’ai tout de même pu découvrir la programmation Android pendant mes cours.\r\nAppréciant linux et ses possibilités, je possède et administre moi-même un serveur lan sous Ubuntu Focal ainsi qu\'un autre dédié au web (Nginx,Php,MariaDB) sous Debian Buster.\r\nDe ce fait, je suis sûr de pouvoir répondre à votre besoin de double compétences dans les domaines de l\'administration système et du développement Web.\r\n\r\nAu cours de mon alternance, je souhaiterai améliorer mes compétences à travailler en équipe, notamment avec des outils comme Git mais aussi avec un planning.\r\nEfficace, je suis sûr de pouvoir être un atout pour votre entreprise et l’équipe que j’intégrerai.\r\n\r\nPour plus de détails sur mes connaissances et mes capacités, je vous ajoute mon CV en pièce jointe de ce message.\r\nN\'hésitez pas à me contacter, pour plus d\'information ou mieux, pour un entretien.\r\nDans l\'attente de votre réponse,\r\n\r\nTHEBAULT Yoann\r\nEtudiant EPSI Bordeaux\r\n0608838403\r\nyoann.thebault@epsi.fr',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Proposition d\'alternance en d&eacute;veloppement (AdminSys / PHP) - Yoann THEBAULT<br>\n&Eacute;metteur (From) : THEBAULT Yoann &lt;yoann.thebault@epsi.fr&gt;<br>\nDestinataire(s) (To) : &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\n-----<br>\nBonjour Monsieur Destailleur,<br>\r\n<br>\r\nJe vous contacte concernant l’offre d’alternance en développement que vous avez émise.<br>\r\nActuellement à l\'aube de ma 3e année de Bachelor informatique à l\'EPSI Bordeaux, je suis à la recherche d\'une alternance qui débuterait en septembre.<br>\r\nCette alternance se ferait au rythme de deux semaines en entreprise et deux semaines à l\'école, les cours ne reprenant néanmoins pas avant novembre.<br>\r\n<br>\r\nAu cours de mes études, j\'ai été amené à réaliser deux stages en milieu professionnel de sept semaines chacun.<br>\r\nJ\'y ai perfectionné mes compétences dans le développement web avec notamment les langages PHP, le stack web HTML/CSS/JS ainsi que le framework Symfony4.<br>\r\nDéveloppeur plutôt orienté web, j’ai tout de même pu découvrir la programmation Android pendant mes cours.<br>\r\nAppréciant linux et ses possibilités, je possède et administre moi-même un serveur lan sous Ubuntu Focal ainsi qu\'un autre dédié au web (Nginx,Php,MariaDB) sous Debian Buster.<br>\r\nDe ce fait, je suis sûr de pouvoir répondre à votre besoin de double compétences dans les domaines de l\'administration système et du développement Web.<br>\r\n<br>\r\nAu cours de mon alternance, je souhaiterai améliorer mes compétences à travailler en équipe, notamment avec des outils comme Git mais aussi avec un planning.<br>\r\nEfficace, je suis sûr de pouvoir être un atout pour votre entreprise et l’équipe que j’intégrerai.<br>\r\n<br>\r\nPour plus de détails sur mes connaissances et mes capacités, je vous ajoute mon CV en pièce jointe de ce message.<br>\r\nN\'hésitez pas à me contacter, pour plus d\'information ou mieux, pour un entretien.<br>\r\nDans l\'attente de votre réponse,<br>\r\n<br>\r\nTHEBAULT Yoann<br>\r\nEtudiant EPSI Bordeaux<br>\r\n0608838403<br>\r\nyoann.thebault@epsi.fr<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp544834jal; Fri, 21 Aug 2020 09:48:29 -0700 (PDT)<br>\r\nX-Google-Smtp-Source: ABdhPJzWNLJBSfWeCYH4ki5MaiI5cX02ZWZfkz71Y6d7AkmkLQjkJ9beX95Tm1GsZOqD7s2nvohh<br>\r\nX-Received: by 2002:adf:e94c:: with SMTP id m12mr3497713wrn.109.1598028509396; Fri, 21 Aug 2020 09:48:29 -0700 (PDT)<br>\r\nARC-Seal: i=2; a=rsa-sha256; t=1598028509; cv=pass; d=google.com; s=arc-20160816; b=Z1g8zL/ns+mvZDceeQTmHOlGeufA6KnGI+VoOT7/zxZ3AU40q1dwugk5BXblfysR2h yss/XvAG47b4TfNQ4aNAFtLa2jrN+LPncz2mzamijCg0QtPs1KMX0wzMlwo9Q4i9X5ub Q4dxXePA8Y9OM2GF3rgzD1BJM3ScXGNs7PAC7FFvnLvj4Z1AgiZrF6jcHe/ohJfzplSg OE1nxGyS7jGlFwWm6chyGbxvKLWN2csrewKomgTD26tu1qHW3MWtt+1+N6K/PQFFpub7 FgY+RXu1C1InjY6Farn8j8rHIFn2n6dtFdy+xTqL3XJsSMFETSXkRD7cFcLBKf3ziSjm ghOg==<br>\r\nARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-language:accept-language:message-id:date :thread-index:thread-topic:subject:to:from:dkim-signature; bh=7DwQngvBkkMTM/RTnyqdpiVNQxlJ147oCVjnw/dQIa8=; b=eF5TzmdAqemTI5i8bii3mL6Ur8zKnIePNRZSHP5FRr4AJuTbMgxtaMR6224GSKhYN8 Fmaa6WeQ3im5PVokk679Po0ur4CDNunK+9tsCb7NEze0iYQnTG4ioWI5Zq1FSov/Ghuq LgRct/jHZ6ekPsIxSGDRXqNBoYdVumi8tdG2Ppeu0zTvlekDTIMde1Iu3r9OmubXZQ1m 2XcA3nvbZF4lH+PCzeRH+ZuVpRZuzeAuFLv4RzL+FYZXZryjqWS1N2eaU6tNoJjMFwF6 MC/7PuKGoM+bSAFBv88eRdqVKSLcTN1ZWbp1xZ10LkFkH98xyKhMAF76Y1dtkiEqQXkl LBqw==<br>\r\nARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=VQkvsElq; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of yoann.thebault@epsi.fr designates 40.107.7.89 as permitted sender) smtp.mailfrom=yoann.thebault@epsi.fr<br>\r\nReturn-Path: &lt;yoann.thebault@epsi.fr&gt;<br>\r\nReceived: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70089.outbound.protection.outlook.com. [40.107.7.89]) by mx.google.com with ESMTPS id 15si2231412wmi.128.2020.08.21.09.48.28 for &lt;job@nltechno.com&gt; (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Aug 2020 09:48:29 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of yoann.thebault@epsi.fr designates 40.107.7.89 as permitted sender) client-ip=40.107.7.89;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=VQkvsElq; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of yoann.thebault@epsi.fr designates 40.107.7.89 as permitted sender) smtp.mailfrom=yoann.thebault@epsi.fr<br>\r\nARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ATNiZlO17KgbduSAX21a5yINY5j/msoryQY7wecwUZ55b/iWjW+llPSL0O/4PnlkWLIJe6Wn92bqKeD/KRkRo7tg4/yMHRatcQF09U21bxuS/gQL8dm6/r4w5gf0X0E5M7OHHfXQKyDN/SaUG4khIxTy/9KraVe1u/dS4nFbjalqE1mcA/dyuFbzec4DeSLdG0mdkOUJVaiIPSM0WjdpEL/89uRZ3Xc33s7bEyFDuR6pbfU1osKt3DyQQ9eLIeSzHGWTYqAG0Z+lBNlt6QYYBMfRJOvNT0O+Wrc3RYqk1ZNShQF25twjJx7TMmFA1ef/sQpt/QqYte+k7OZ8x4DPOA==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7DwQngvBkkMTM/RTnyqdpiVNQxlJ147oCVjnw/dQIa8=; b=Fx7UhvRq6JgtZIaRZpz23860XPSAU0YH1Ymx/CuYBoCjE5KYCNp+IosZzZ9GxatEVh0GMOlKNmlbp3kynNTKz1R/MjMbHumZ2MOPnswvTJfLjta9x2rww/4SPQoEglD5Xf0W0BYazHuhGeapKTBL84RzhYPh0XffCDnm4oRMNnS6SPDKVbjGU5OzoFlVjhi+c+8/CajQNwDxhpIY4HDhK+tx7C+4cpTg51Z7xryOmmCCv+UGC5K6dgPV6Vhwz2pakldFpuFR6ciw7cZ4dS1ZaMsOSPf1OIJicLCxrYsCe5t67RFy0fdzcHx8tLvanHnox+7fRxQfXaY9lP3ZfGD7CA==<br>\r\nARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epsi.fr; dmarc=pass action=none header.from=epsi.fr; dkim=pass header.d=epsi.fr; arc=none<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ifagparis.onmicrosoft.com; s=selector2-ifagparis-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7DwQngvBkkMTM/RTnyqdpiVNQxlJ147oCVjnw/dQIa8=; b=VQkvsElqOWe+ppmP9hBeGUdfq7qE1TZoeLQnUg1x+U4B7QLQGBPr94mVpnigdnRdyiUGJbilu+68ES1ooU9HqiRx3/Vnxe9PjCvT3gS/bV7o/mPflO80aFp7QFMVCC1QoaPXFbdFdaWLaXdPuWH5EWFnl2k/271HATgcypNQPTc=<br>\r\nReceived: from AM6PR04MB4615.eurprd04.prod.outlook.com (2603:10a6:20b:24::12) by AM6PR04MB4373.eurprd04.prod.outlook.com (2603:10a6:20b:19::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3283.22; Fri, 21 Aug 2020 16:48:27 +0000<br>\r\nReceived: from AM6PR04MB4615.eurprd04.prod.outlook.com ([fe80::b161:bfaf:90dc:3639]) by AM6PR04MB4615.eurprd04.prod.outlook.com ([fe80::b161:bfaf:90dc:3639%7]) with mapi id 15.20.3305.024; Fri, 21 Aug 2020 16:48:27 +0000<br>\r\nFrom: THEBAULT Yoann &lt;yoann.thebault@epsi.fr&gt;<br>\r\nTo: &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\r\nSubject: =?Windows-1252?Q?Proposition_d\'alternance_en_d=E9veloppement_(AdminSys_/_?= =?Windows-1252?Q?PHP)_-_Yoann_THEBAULT?=<br>\r\nThread-Topic: =?Windows-1252?Q?Proposition_d\'alternance_en_d=E9veloppement_(AdminSys_/_?= =?Windows-1252?Q?PHP)_-_Yoann_THEBAULT?=<br>\r\nThread-Index: AQHWd9XdzNSJfWKZoUGZdtwUE8z6Tw==<br>\r\nDate: Fri, 21 Aug 2020 16:48:27 +0000<br>\r\nMessage-ID: &lt;AM6PR04MB4615D92F49560FAE0A1BE738815B0@AM6PR04MB4615.eurprd04.prod.outlook.com&gt;<br>\r\nAccept-Language: fr-FR, en-US<br>\r\nContent-Language: fr-FR<br>\r\nX-MS-Has-Attach: yes<br>\r\nX-MS-TNEF-Correlator: <br>\r\nauthentication-results: nltechno.com; dkim=none (message not signed) header.d=none;nltechno.com; dmarc=none action=none header.from=epsi.fr;<br>\r\nx-originating-ip: [2a01:cb19:74c:8b00:adb2:ed83:3f8c:6f17]<br>\r\nx-ms-publictraffictype: Email<br>\r\nx-ms-office365-filtering-correlation-id: 21831f7f-7e93-40e4-f519-08d845f206fa<br>\r\nx-ms-traffictypediagnostic: AM6PR04MB4373:<br>\r\nx-microsoft-antispam-prvs: &lt;AM6PR04MB437321229E1CEE13212D3935815B0@AM6PR04MB4373.eurprd04.prod.outlook.com&gt;<br>\r\nx-ms-oob-tlc-oobclassifiers: OLM:431;<br>\r\nx-ms-exchange-senderadcheck: 1<br>\r\nx-microsoft-antispam: BCL:0;<br>\r\nx-microsoft-antispam-message-info: MOlmJctSBEjQrBhQBCpLVy8cX8SJjCOhkaCTpBLVBVB6qQ3UFmTLPyEew/LtTLBzubJwzE0VwUTOYyII70ta3gmeMemEuC4NZmUmmFicWxv31pXToZBKdlgqyFthyIZA2oV0abPdiWQ5De4O85c4U7/NFT2thUKF32hqR4xzj4eOL9IRH03ZAmnD9HCjJ/IfGyqPe1u8p7yt8ZagG+c885ZOCUResqdmSoXsS2iZQepx44u4R9Ap2Y/LspusnFI/TgKjHFmsYQUTXWnMCv+02wVEdbQBbwu21JQab1QopL7yD2nNxCetPsDdt/eSokctwLfRHOjq83H9RGCwCpPgIw==<br>\r\nx-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:fr;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB4615.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(396003)(366004)(39850400004)(376002)(136003)(346002)(6506007)(83380400001)(55016002)(786003)(186003)(316002)(99936003)(8936002)(6916009)(2906002)(91956017)(66446008)(64756008)(224303003)(66556008)(66946007)(52536014)(86362001)(71200400001)(5660300002)(7696005)(66476007)(478600001)(33656002)(9686003)(76116006)(19627405001)(66616009);DIR:OUT;SFP:1101;<br>\r\nx-ms-exchange-antispam-messagedata: oH38DwQBBUwO81MAtni5ncmj8Mz3ScxsI5AL1W8ygbeuQzYUL3gnCJLakGDMgiwlPo3hyC0YlduPazQ4E2254YO7mObph7utnXDrhiyFpHTCFBMSgtg6rk8aq2cVWcOzxRmd9P2ehirI9gxP61if5A3tW4U3B5iwqqdJJ6SP/MQvmdk+LXKK+/MxP9C9s5eDsJ5XG4GVWwUT2rl2lLcx5Hl6+2ULuB3ddsuVf0eZQ8p1T/qZSxrcgPCZ5K4BAKrGyTWgHCQG1XRvsvS7puFw9jgwsEkETP7SsP9nVIqhtaHp+3LdOONmFZJumPuU3GgW7bJUZCfAmzpho78r1rnG9FwH68AFSIPeqO6+O+ZbK4UmS9s1/9Y7hdZCR4a5miuYs4exGJzk4tuzn1wGs/O8Y5df91pmsgh8OwwnBsQFOECcfMIBGejTe9YhPXQAZG1jrmZxEOV8XZPIgl8hInjg6eNxqKRLGzZTIld4ZjufO81/QVFg/JX/XKRRPwcdJpVByfecte6k1u2VXyqAmaRQkICpeGTTqPxv+LSXLXlb5G8w8P7KebrVyUOOV71SS/KJsX6BGG18H+YGcOp2iyJ9+TGoB/v+tncP+9GDD5L9Z8KBjAXTPlbLQMgKv3htJiG3T6iEg2IEm1L7YS5TzCfsGOB3MDixxRalUZ2ifVuK+He+jI5SeirkfGWrqb1E9TBWutdb+L21FkU2NArFnshXmA==<br>\r\nx-ms-exchange-transport-forked: True<br>\r\nContent-Type: multipart/mixed; boundary=&quot;_004_AM6PR04MB4615D92F49560FAE0A1BE738815B0AM6PR04MB4615eurp_&quot;<br>\r\nMIME-Version: 1.0<br>\r\nX-OriginatorOrg: epsi.fr<br>\r\nX-MS-Exchange-CrossTenant-AuthAs: Internal<br>\r\nX-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4615.eurprd04.prod.outlook.com<br>\r\nX-MS-Exchange-CrossTenant-Network-Message-Id: 21831f7f-7e93-40e4-f519-08d845f206fa<br>\r\nX-MS-Exchange-CrossTenant-originalarrivaltime: 21 Aug 2020 16:48:27.3717 (UTC)<br>\r\nX-MS-Exchange-CrossTenant-fromentityheader: Hosted<br>\r\nX-MS-Exchange-CrossTenant-id: b6e77e52-65f6-4dec-b7d9-8e45f36a536f<br>\r\nX-MS-Exchange-CrossTenant-mailboxtype: HOSTED<br>\r\nX-MS-Exchange-CrossTenant-userprincipalname: ysYLeB+bsUcAiQl/kr2vyZttcC4ybnBxZTdaQ2cCDAdV9m4NUtGjCf6tXmbscVDyVX4qf+16sGhWzy5ey0/n/w==<br>\r\nX-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4373 ','2020-08-21 18:48:29','2020-08-23 14:03:34',12,NULL,NULL,NULL,0,NULL,'THEBAULT Yoann','yoann.thebault@epsi.fr',NULL,NULL,NULL,NULL,'AM6PR04MB4615D92F49560FAE0A1BE738815B0@AM6PR04MB4615.eurprd04.prod.outlook.com',1,NULL),(72,NULL,'JOC2008-0003','Monsieur,<br />\r\n<br />\r\n&Eacute;tudiant en troisi&egrave;me ann&eacute;e de bachelor informatique &agrave; l&#39;EPSI, je vous adresse ma candidature pour le contrat d&#39;alternance &eacute;diteur logiciel SaaS.<br />\r\nVous trouverez ci-joints mon CV ainsi qu&#39;une lettre de motivation plus d&eacute;taill&eacute;e.<br />\r\n<br />\r\nDans l&#39;espoir d&#39;une r&eacute;ponse favorable, je vous prie d&#39;agr&eacute;er, Monsieur, mes salutations distingu&eacute;es.<br />\r\n<br />\r\nBLANCHET Ayoub<br />\r\n<br />\r\n<br />\r\n[cid:image001.png@01D67881.98144D70]<br />\r\n<br />\r\n[cid:image002.png@01D67881.98144D70]<br />\r\nAyoub Blanchet<br />\r\nEPSI /B3<br />\r\n07 82 15 83 74<br />\r\nayoub.blanchet@epsi.fr<br />\r\n<br />\r\n<br />\r\n[cid:image003.png@01D67881.98144D70]<br />\r\n[cid:image004.png@01D67881.98144D70]<br />\r\n[cid:image005.png@01D67881.98144D70]',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail :  CANDIDATURE Alternance &eacute;diteur logiciel SaaS<br>\n&Eacute;metteur (From) : BLANCHET Ayoub &lt;ayoub.blanchet@epsi.fr&gt;<br>\nDestinataire(s) (To) : &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\n-----<br>\nMonsieur,<br>\r\n<br>\r\nÉtudiant en troisième année de bachelor informatique à l\'EPSI, je vous adresse ma candidature pour le contrat d\'alternance éditeur logiciel SaaS.<br>\r\nVous trouverez ci-joints mon CV ainsi qu\'une lettre de motivation plus détaillée.<br>\r\n<br>\r\nDans l\'espoir d\'une réponse favorable, je vous prie d\'agréer, Monsieur, mes salutations distinguées.<br>\r\n<br>\r\nBLANCHET Ayoub<br>\r\n<br>\r\n<br>\r\n[cid:image001.png@01D67881.98144D70]&lt;http://www.epsi.fr/&gt;<br>\r\n<br>\r\n[cid:image002.png@01D67881.98144D70]<br>\r\nAyoub Blanchet<br>\r\nEPSI /B3<br>\r\n07 82 15 83 74<br>\r\nayoub.blanchet@epsi.fr&lt;mailto:ayoub.blanchet@epsi.fr&gt;<br>\r\n<br>\r\n<br>\r\n[cid:image003.png@01D67881.98144D70]&lt;https://fr-fr.facebook.com/pages/EPSI-Bordeaux/396294960413198&gt;<br>\r\n[cid:image004.png@01D67881.98144D70]&lt;https://twitter.com/EPSI_Bordeaux&gt;<br>\r\n[cid:image005.png@01D67881.98144D70]&lt;https://www.youtube.com/user/ecoleepsi&gt;<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp1087267jal; Sat, 22 Aug 2020 03:42:50 -0700 (PDT)<br>\r\nX-Google-Smtp-Source: ABdhPJxMKpkfK1Y2uariV1GUyRxlG1Ufq2sxKbRi4L112sgcPsJuUvHfJFJARXolKHOZK5TiIZ5G<br>\r\nX-Received: by 2002:a17:906:7d6:: with SMTP id m22mr6534609ejc.229.1598092969796; Sat, 22 Aug 2020 03:42:49 -0700 (PDT)<br>\r\nARC-Seal: i=2; a=rsa-sha256; t=1598092969; cv=pass; d=google.com; s=arc-20160816; b=fFmR+YNR6w98rKzy5l7JTH+Qnhhxkzslv4NBmLSzYV2U5+oO9deTS3SL/0hO+UOQ7w i29/1Dp3rI0+vIIhahCb/XsZNQam5R4/c2TX4Hu/TPdPAwqGS8j33mk1jgjF0TWiDNZG hzcSUzmZSh7/MD/qcRbCKgV0dexTLHz+iYC9oRLxe0f8w2i5fBi9Tw3IJlNGaSwVUSj7 FCeN+kGh3eeAHy2gFgm7iKUqvV23U5h9NY3C9kzGgUQcM9Vrd1HhRBeRmFvC2kXFtwud QDRHzW9SACjlhOlXq4YZaFOi4Tw5izy+pN725mC5V5BARc0ha0N+BnmQAVrsw7IB9jBQ /k+g==<br>\r\nARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-language:accept-language:message-id:date :thread-index:thread-topic:subject:to:from:dkim-signature; bh=cmnMU9VNAFsuUi1k68C6I6u1D4BTkZQy3PYrNs96djE=; b=NmC49IdCmLeC3MkSdVckcto4KnXG8U92cLGoJ0hnsuz+uO/ZycIXrQO5sexTtqRS9j McPVGQJ6pDgNuRxpat3qy2ITO7gmSntOKkgi+vuVKjD1gvWdl/BKgVulJyi9+5AWyQHq /x7qQjueLTdQw2k5EGvh07jFoB/ah/bAcBlu0glpZFi/l0J0LPjH3XJeTnKuVVWVqlhE ocHeqPNH0z7vBafJmaYpfRBV6LTdUP5gY7RybXGfxv3CnCZwR0w/+YhVkhCO4fxC4m3q jz/Dm3PW/g2tVIw5Uske3oUPUBfOLEswz4bwJgT5fHOOsWTAjEnovSu5dhgHp8jANq1x 9+ag==<br>\r\nARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=sBQHJOzL; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of ayoub.blanchet@epsi.fr designates 40.107.22.42 as permitted sender) smtp.mailfrom=ayoub.blanchet@epsi.fr<br>\r\nReturn-Path: &lt;ayoub.blanchet@epsi.fr&gt;<br>\r\nReceived: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2042.outbound.protection.outlook.com. [40.107.22.42]) by mx.google.com with ESMTPS id e4si2894132ejr.98.2020.08.22.03.42.49 for &lt;job@nltechno.com&gt; (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Aug 2020 03:42:49 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of ayoub.blanchet@epsi.fr designates 40.107.22.42 as permitted sender) client-ip=40.107.22.42;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=sBQHJOzL; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of ayoub.blanchet@epsi.fr designates 40.107.22.42 as permitted sender) smtp.mailfrom=ayoub.blanchet@epsi.fr<br>\r\nARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M655FzRU6Qg8C9xXffoKHghi19kuT3nWpmx233zjVWFlU4Wlc10GrAPFTinaKn7UocbeQUrk61AreLwVKGmycqhLnKuyOhvL2Y/8g1SKMKm7TGTuoTqYHONFQfWYnFWEzdguGXVXOF1Euz3TBW78eGE5nLPqTlE08S3btbIS603OyYhGT4D2/DVwXG/balbnctAt4gq+TzB3mPrZeg3O7QvK/GcO7lUyjBdtyhTb7aDNa5B+cgyt5Snepsw31q74XdK/lX/tJ55qU1Z+V5nKRwyt4gag+2d4+S1fAu32G6aW8KwWmzyF7lmaGmU7sH7jCNW0HO0FFMrgrsQFsMsfKw==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cmnMU9VNAFsuUi1k68C6I6u1D4BTkZQy3PYrNs96djE=; b=nQIyVQfSkx19EETNttooiBlY6aX0M1elCTa+jJrzy4cR3GQ1bs+bw5WVMK7RSuZyMHmZr0Xn+18PohfpjIUZ+Er9GjOFqUiKkMGN/OmaOH3srbQZ1/SE71si26kEZ/uUj5MBRZNy0ncaEPACCt1hddImfiXHx4s8e0NApkJy7IEWVtoMRC+8Hi2xPS3gQfQFEAhCxa+CtP9M3qRvDIanLs1N5NxadzBDFkKEg/QU/JHgabaeR06rEczIFgh3zPgy76eqbnRdOXVvRmJpE5r+DK0ParoSONdMOfksK7SA4uk6Dv8f+p195/0oKlspDo4aGRtNGU2AIT15c0Uq322phw==<br>\r\nARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epsi.fr; dmarc=pass action=none header.from=epsi.fr; dkim=pass header.d=epsi.fr; arc=none<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ifagparis.onmicrosoft.com; s=selector2-ifagparis-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cmnMU9VNAFsuUi1k68C6I6u1D4BTkZQy3PYrNs96djE=; b=sBQHJOzLJTR/wUCYhCXPmYLG555c+I+zFb2avzDFz6vJeTJHJXTRJ8GJw9tvIT6CK4mC9Qsp6fYpCgq2kZzhXnQ4H9j6DufodqM2Vvzpr0b2GCTxqNbeGuCPDKc/HIVjWBQhOb+4aqrpD3SfBC4ix3jzrPkjRUt+kbxKHLZ5htI=<br>\r\nReceived: from DB7PR04MB5452.eurprd04.prod.outlook.com (2603:10a6:10:84::21) by DB3PR0402MB3675.eurprd04.prod.outlook.com (2603:10a6:8:b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.25; Sat, 22 Aug 2020 10:42:47 +0000<br>\r\nReceived: from DB7PR04MB5452.eurprd04.prod.outlook.com ([fe80::68d6:8bce:f15e:183b]) by DB7PR04MB5452.eurprd04.prod.outlook.com ([fe80::68d6:8bce:f15e:183b%6]) with mapi id 15.20.3305.024; Sat, 22 Aug 2020 10:42:47 +0000<br>\r\nFrom: BLANCHET Ayoub &lt;ayoub.blanchet@epsi.fr&gt;<br>\r\nTo: &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\r\nSubject: =?iso-8859-1?Q?_CANDIDATURE_Alternance_=E9diteur_logiciel_SaaS?=<br>\r\nThread-Topic: =?iso-8859-1?Q?_CANDIDATURE_Alternance_=E9diteur_logiciel_SaaS?=<br>\r\nThread-Index: AdZ4cHw+shbBlTd5QPeOPVRKlrfx1A==<br>\r\nDate: Sat, 22 Aug 2020 10:42:47 +0000<br>\r\nMessage-ID: &lt;DB7PR04MB5452C9B5137F07CDD68815E09A580@DB7PR04MB5452.eurprd04.prod.outlook.com&gt;<br>\r\nAccept-Language: fr-FR, en-US<br>\r\nContent-Language: fr-FR<br>\r\nX-MS-Has-Attach: yes<br>\r\nX-MS-TNEF-Correlator: <br>\r\nauthentication-results: nltechno.com; dkim=none (message not signed) header.d=none;nltechno.com; dmarc=none action=none header.from=epsi.fr;<br>\r\nx-originating-ip: [2001:861:310a:8af0:514a:5731:803a:9a09]<br>\r\nx-ms-publictraffictype: Email<br>\r\nx-ms-office365-filtering-correlation-id: fc202f91-9915-4918-36a6-08d846881c65<br>\r\nx-ms-traffictypediagnostic: DB3PR0402MB3675:<br>\r\nx-microsoft-antispam-prvs: &lt;DB3PR0402MB3675A56082E1102B7B0040139A580@DB3PR0402MB3675.eurprd04.prod.outlook.com&gt;<br>\r\nx-ms-oob-tlc-oobclassifiers: OLM:152;<br>\r\nx-ms-exchange-senderadcheck: 1<br>\r\nx-microsoft-antispam: BCL:0;<br>\r\nx-microsoft-antispam-message-info: GMlh+iLAVhsQMP45sJi9qKcu2S8oyShIvQ+lTfkn3lnRqqd7BEtQ3x8ftLHXUmD8KjCyvRA+tOQBA3+IPHaB7Jj2vA9bI45KxARtSitBM7M1UEYnU+5UGovVWLZQ2kUA1hDVjBTFl1Y7ItiTT8imWSfHv+JJQTmiPcrk6sn0gT6NbpS0x+1O+yelyhN7DXisuoJB2H/1Vl1gBc7IwPh9w5psla/w6Y+O6cQcTBkHk5O6+zgCBcIUGmlbAGK9mMR/00duxsG5q8XIJDAoT35wzCSgD0UneRnHxRDpcx3KYFWn1xpdYlDtGCl23pjX0bmQuEKACsfLKzQaJitzUS1VvtHO2ty1T6QhiYOaWzsbvlCKdGH6ifn9EfKxuuyRaUQfanrc/LaO5HmOq/yQG56g/g==<br>\r\nx-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:fr;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB7PR04MB5452.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(39840400004)(346002)(376002)(366004)(396003)(136003)(786003)(99936003)(4744005)(71200400001)(6916009)(5660300002)(8936002)(7696005)(478600001)(66946007)(66476007)(66446008)(9686003)(66556008)(316002)(66576008)(55016002)(6506007)(2906002)(166002)(186003)(76116006)(33656002)(52536014)(224303003)(64756008)(86362001);DIR:OUT;SFP:1101;<br>\r\nx-ms-exchange-antispam-messagedata: vnSOPPhCJEHnJWBOI1MwxmEwyxXA5ssLewasQfbjKd4DsizfFPH1318Bxp1rq7y4Rx7YiwaQRqSoAegr7qOQjiSHvvYxfy+3JSBDvR72aoYtf7fZy0Y15U68OUZc+iKy4ihS+9D70FzuHMF7Kho3SqePPYm3hwqUKRq0awITgv/ONyu+AWVTEQCgAPO9j7VPplJN58WUmc2FodHUQp8kMkTstDtkg78bMKA1EHm/4IHHwnhEai9/YgeeP+Rfa8kQB1qQBC24A9E+CoSBMhi7Q3pcr5uOEguHMsZM4yRGgM3TifVuFOB6oiaUGF9xC89nMxG96tdjbj+XCZ27bot/CG38dq964XDmLtfrRB5DRZ0yyr3HjQWqHyUFr3F77EI3RSlnKkdB7+BkI65hNIURkLFHVKOfXAiX/XvOM9U5xLKb55ltTwCgN3nUHBLsVY+SnXiK2VcC4rRH1GcytuLFT9D1UyG/OlZySywLHC6WxMgjniacqdmchWecpokMwX60F9/7d9w1kLQaQmmbzY5YGzSga8xR+yvGIXNogTk7hRh0VppcS0H9ALYZb86jp9zfQ5+UgD10+KVVHAS0nAzs7QTnBq1p0b/H5SDs+DwY9akhwh5P/JR0uuLt/FRgUAhTBPE85mTZvkMl+JFMpqmMZU4P3nfO5cRBdeMKy9lKFSVt+4K/A/M7lct+jeYsKUmMXHiUB8Oft31rT/coFMPkbg==<br>\r\nx-ms-exchange-transport-forked: True<br>\r\nContent-Type: multipart/mixed; boundary=&quot;_011_DB7PR04MB5452C9B5137F07CDD68815E09A580DB7PR04MB5452eurp_&quot;<br>\r\nMIME-Version: 1.0<br>\r\nX-OriginatorOrg: epsi.fr<br>\r\nX-MS-Exchange-CrossTenant-AuthAs: Internal<br>\r\nX-MS-Exchange-CrossTenant-AuthSource: DB7PR04MB5452.eurprd04.prod.outlook.com<br>\r\nX-MS-Exchange-CrossTenant-Network-Message-Id: fc202f91-9915-4918-36a6-08d846881c65<br>\r\nX-MS-Exchange-CrossTenant-originalarrivaltime: 22 Aug 2020 10:42:47.7317 (UTC)<br>\r\nX-MS-Exchange-CrossTenant-fromentityheader: Hosted<br>\r\nX-MS-Exchange-CrossTenant-id: b6e77e52-65f6-4dec-b7d9-8e45f36a536f<br>\r\nX-MS-Exchange-CrossTenant-mailboxtype: HOSTED<br>\r\nX-MS-Exchange-CrossTenant-userprincipalname: KYboRYOf/zm/QYoNPpbygrYouTzj/DI+rcp+lKjfeS04l7DKPIVUCfc47YyhxIh4abCDZBJzPbaItucbMx11Ww==<br>\r\nX-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0402MB3675 ','2020-08-22 12:42:49','2020-08-25 09:51:51',12,12,NULL,NULL,1,'','BLANCHET Ayoub','ayoub.blanchet@epsi.fr','',NULL,NULL,NULL,'DB7PR04MB5452C9B5137F07CDD68815E09A580@DB7PR04MB5452.eurprd04.prod.outlook.com',1,NULL),(94,2,'(PROV94)','Bonjour,\r\n\r\n\r\n\r\nPréparant un Titre d\'architecte logiciel développeur d\'applications, je viens vers vous par la présente dans le cadre de ma recherche d\'alternance en développement web 3 jours entreprise/ 2 jours école pour une durée de 1 à 2 ans.\r\n\r\n\r\n\r\nTitulaire d\'une licence professionnelle en télécommunication et en informatique spécialité réseau télécoms, et d\'un Titre de Responsable Projet Web & Mobile (en cours d\'obtention), je me permets de vous envoyer ma candidature pour le poste d\'alternant développeur web.\r\n\r\n\r\n\r\nMon parcours, complété par ma passion pour internet et l\'informatique, m\'a permis d\'acquérir les connaissances techniques et pratiques indispensables à l\'exercice de ce métier.\r\n\r\nje désire acquérir de nouvelles compétences en développement web au sein de votre entreprise.\r\n\r\n\r\n\r\nMa forte motivation, ma capacité d\'adaptation et mon potentiel sont d\'autres atouts qui seront bénéfiques au développement de votre entreprise. Je suis quelqu\'un d’autonome, persévérant et j\'aime travailler en équipe. Et mon grand intérêt dans le développement web est une grande source de motivation !\r\n\r\n\r\n\r\nJe reste à votre entière disposition pour vous détailler plus en avant mes motivations.\r\n\r\nDans l\'attente d\'une réponse de votre part, je vous prie de croire, Madame, Monsieur, en ma\r\n\r\nconsidération distinguée.\r\n\r\n\r\nKarim Badji\r\n\r\nEtudiant EPITECH Bordeaux\r\n\r\nkarim.badji@epitech.eu\r\n\r\n07 66 63 42 23',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Candidature Alternant d&eacute;veloppeur web<br>\n&Eacute;metteur (From) : Karim Badji &lt;karim.badji@epitech.eu&gt;<br>\nDestinataire(s) (To) : &quot;job+2@nltechno.com&quot; &lt;job+2@nltechno.com&gt;<br>\n-----<br>\nBonjour,<br>\r\n<br>\r\n<br>\r\n<br>\r\nPréparant un Titre d\'architecte logiciel développeur d\'applications, je viens vers vous par la présente dans le cadre de ma recherche d\'alternance en développement web 3 jours entreprise/ 2 jours école pour une durée de 1 à 2 ans.<br>\r\n<br>\r\n<br>\r\n<br>\r\nTitulaire d\'une licence professionnelle en télécommunication et en informatique spécialité réseau télécoms, et d\'un Titre de Responsable Projet Web &amp; Mobile (en cours d\'obtention), je me permets de vous envoyer ma candidature pour le poste d\'alternant développeur web.<br>\r\n<br>\r\n<br>\r\n<br>\r\nMon parcours, complété par ma passion pour internet et l\'informatique, m\'a permis d\'acquérir les connaissances techniques et pratiques indispensables à l\'exercice de ce métier.<br>\r\n<br>\r\nje désire acquérir de nouvelles compétences en développement web au sein de votre entreprise.<br>\r\n<br>\r\n<br>\r\n<br>\r\nMa forte motivation, ma capacité d\'adaptation et mon potentiel sont d\'autres atouts qui seront bénéfiques au développement de votre entreprise. Je suis quelqu\'un d’autonome, persévérant et j\'aime travailler en équipe. Et mon grand intérêt dans le développement web est une grande source de motivation !<br>\r\n<br>\r\n<br>\r\n<br>\r\nJe reste à votre entière disposition pour vous détailler plus en avant mes motivations.<br>\r\n<br>\r\nDans l\'attente d\'une réponse de votre part, je vous prie de croire, Madame, Monsieur, en ma<br>\r\n<br>\r\nconsidération distinguée.<br>\r\n<br>\r\n<br>\r\nKarim Badji<br>\r\n<br>\r\nEtudiant EPITECH Bordeaux<br>\r\n<br>\r\nkarim.badji@epitech.eu<br>\r\n<br>\r\n07 66 63 42 23<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job+2@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp2444972jal; Mon, 24 Aug 2020 05:34:07 -0700 (PDT)<br>\r\nX-Google-Smtp-Source: ABdhPJzE405lKynt7t5gfwgdPFeJdefBHcNy1NLpIK/9mzPTQMXF5Sv/Dp2ffWw4wXcZ9qI2BEds<br>\r\nX-Received: by 2002:adf:fe50:: with SMTP id m16mr5930358wrs.27.1598272447247; Mon, 24 Aug 2020 05:34:07 -0700 (PDT)<br>\r\nARC-Seal: i=2; a=rsa-sha256; t=1598272447; cv=pass; d=google.com; s=arc-20160816; b=h3qQh7sY6za/7pdO6M0ES5OZVOeLvoGlcdHFlxAZ7RzaCKNhk4R0A8Kcdhf3pfTs5v YVRBJTrRN9e+UJ+e3DcHYXMDiWg7Gz/YThY3SQjTnZvP6gfyEp/fqV8buAhJY5Qt+Q9q adEsbfbFznu3whNjTWXtX7ISwYYhT5so0J6Mo/BBWrAuyOowm0muzyVnainXMhql1CVC odpSrwztEQ8LBAghsdQAL2yZgOakvL6Yoc+d+vJOhLdM8tBOnQXThH9S+hvhtPITRJ7M rxYfL/Pen6OEsakVEbTI/wtAOPVaRGJT3yoqadpgIfDDg8LyxTH6iZXNIT/CyQzJq4fQ 92ZA==<br>\r\nARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-language:accept-language:in-reply-to :references:message-id:date:thread-index:thread-topic:subject:to :from:dkim-signature; bh=lzm4CR5VpYkOobNeuSOfZiV+2HtwEbytXvf9pEk5Z0Y=; b=LCLe5TjJCaX9WBQWNdjPbKJ0hI4SSd9nikfS7lywEAszJZOH3/rSd6NyknAyKY747A CCr8hfB2qJjBMEQ30abRVVKBLsLYdvqKOXTS/V4tApNO2g38oXQwcDQJDHNS7O4ISLjW csZcDGDL/VnHQCGnmYckz/OJP/BDZfFS1owutrsE2XWMHapUuFAspabiwGeMpoAxnuxT 6XtD4uzq83aw43Mw3ReRpDfkjD/W54MioQWg2803XnrqPPEA0zA/XwW6dgCaCdor85ZU Ddf9hUdHIamk3I1osBCC7N5sGVPyy0mUonFfYmgrsOzu6oZfypcPPihzOnBjcvkX0O74 o+vA==<br>\r\nARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@epitechfr.onmicrosoft.com header.s=selector2-epitechfr-onmicrosoft-com header.b=W54U5MsG; arc=pass (i=1 spf=pass spfdomain=epitech.eu dkim=pass dkdomain=epitech.eu dmarc=pass fromdomain=epitech.eu); spf=pass (google.com: domain of karim.badji@epitech.eu designates 40.107.0.104 as permitted sender) smtp.mailfrom=karim.badji@epitech.eu<br>\r\nReturn-Path: &lt;karim.badji@epitech.eu&gt;<br>\r\nReceived: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00104.outbound.protection.outlook.com. [40.107.0.104]) by mx.google.com with ESMTPS id j204si10346674wmj.209.2020.08.24.05.34.06 for &lt;job+2@nltechno.com&gt; (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Aug 2020 05:34:07 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of karim.badji@epitech.eu designates 40.107.0.104 as permitted sender) client-ip=40.107.0.104;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@epitechfr.onmicrosoft.com header.s=selector2-epitechfr-onmicrosoft-com header.b=W54U5MsG; arc=pass (i=1 spf=pass spfdomain=epitech.eu dkim=pass dkdomain=epitech.eu dmarc=pass fromdomain=epitech.eu); spf=pass (google.com: domain of karim.badji@epitech.eu designates 40.107.0.104 as permitted sender) smtp.mailfrom=karim.badji@epitech.eu<br>\r\nARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hqdRGxz5GUUvLDVSz40QxfBFs7jwfemQj+4u2GAq/DSmTJi0kFEmKNHDvtXdKpcNF8Kk0VYoPFP/qg3niY7CAkRI3AzjDVN2kQ86gFkJldefT6mHUz2sodOBb7GTpzm+WQQJaz1OwIb0SvfJ9+56eXWlohulQ/pKzQRMSPEPDx0i759UqsVR/c9gfgbtu7xQvPJfUxcgPEALBqh0IsK7dLGaOgDdCZuL8QjxVjp3xzPXCS4YNlAJ9Q3FWdEu+l6L1ts4ZS/cI0lGK/ODJzMpSkErxrteKVJvp67+3fz8HJMuMtPVNB2l/w6Y4jF2dqOXEQiSF7/as2W1762uLJl3Rw==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lzm4CR5VpYkOobNeuSOfZiV+2HtwEbytXvf9pEk5Z0Y=; b=ipcKOD0xgtskjcCS+TAEfO8u8y/ISRRDzi876yGtZJ4tJUcejE/K6AJ8+WeJHG9ZlNzcO/T/G03OdC6Wcz3Y4sZHII7jaJh2SXphtDFqPWXpHnBXzr3g2bUwbbQCzui2O0PI1ggIbcq9vy2ZJOKVkeEcZmpYAkvFlrHMpeDiqOX6qnQ/plueaXU5ZzuQOX2FDSmLri2oEMUhLsBahQnxBXQ1+XL2x8/ypQ95SI+Kk41R+22HGnPaT0IZ9Ug5MjdWj7U3YMKsvMtCrwPiVKbxdXgQenxqBNs/LCkYnto6GVsYy/ntx25/21ZmDc8wZQutm2pxsjDldwRtC2YwueOZ7g==<br>\r\nARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epitech.eu; dmarc=pass action=none header.from=epitech.eu; dkim=pass header.d=epitech.eu; arc=none<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=epitechfr.onmicrosoft.com; s=selector2-epitechfr-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lzm4CR5VpYkOobNeuSOfZiV+2HtwEbytXvf9pEk5Z0Y=; b=W54U5MsGnB4bONV0gkMzBWYmTs0vuedgoEwRlWU0e6wCqp4DCjdtYuCcbolqBVWmrN0ikcQyPvxuWmhlTKwBL1RLCOaA8vzlAa4MkGmYG+s7mvD6JL7U71NYQwW+nFXuw/PTPyj1L8RjDpGZ/KVJ28s8UqArvWZjViiD56VKsPY=<br>\r\nReceived: from VE1PR02MB5711.eurprd02.prod.outlook.com (2603:10a6:803:115::29) by VE1PR02MB5406.eurprd02.prod.outlook.com (2603:10a6:803:110::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.25; Mon, 24 Aug 2020 12:34:03 +0000<br>\r\nReceived: from VE1PR02MB5711.eurprd02.prod.outlook.com ([fe80::a471:e63b:4681:361c]) by VE1PR02MB5711.eurprd02.prod.outlook.com ([fe80::a471:e63b:4681:361c%3]) with mapi id 15.20.3305.026; Mon, 24 Aug 2020 12:34:03 +0000<br>\r\nFrom: Karim Badji &lt;karim.badji@epitech.eu&gt;<br>\r\nTo: &quot;job+2@nltechno.com&quot; &lt;job+2@nltechno.com&gt;<br>\r\nSubject: =?Windows-1252?Q?Candidature_Alternant_d=E9veloppeur_web?=<br>\r\nThread-Topic: =?Windows-1252?Q?Candidature_Alternant_d=E9veloppeur_web?=<br>\r\nThread-Index: AQHWehJUoAV/VWj6r0qS8OSYflfTTalHMWY4<br>\r\nDate: Mon, 24 Aug 2020 12:34:03 +0000<br>\r\nMessage-ID: &lt;VE1PR02MB571178D32658BC852DD4B4B894560@VE1PR02MB5711.eurprd02.prod.outlook.com&gt;<br>\r\nReferences: &lt;VE1PR02MB5711CCC6AEC2C003D0F3A30B94560@VE1PR02MB5711.eurprd02.prod.outlook.com&gt;<br>\r\nIn-Reply-To: &lt;VE1PR02MB5711CCC6AEC2C003D0F3A30B94560@VE1PR02MB5711.eurprd02.prod.outlook.com&gt;<br>\r\nAccept-Language: fr-FR, en-US<br>\r\nContent-Language: fr-FR<br>\r\nX-MS-Has-Attach: yes<br>\r\nX-MS-TNEF-Correlator: <br>\r\nauthentication-results: nltechno.com; dkim=none (message not signed) header.d=none;nltechno.com; dmarc=none action=none header.from=epitech.eu;<br>\r\nx-originating-ip: [2a01:cb19:3c8:a300:5a35:9591:b420:594f]<br>\r\nx-ms-publictraffictype: Email<br>\r\nx-ms-office365-filtering-correlation-id: 4fd08f28-8913-432a-cc88-08d84829fc2b<br>\r\nx-ms-traffictypediagnostic: VE1PR02MB5406:<br>\r\nx-microsoft-antispam-prvs: &lt;VE1PR02MB5406514BF91EDB588F42742594560@VE1PR02MB5406.eurprd02.prod.outlook.com&gt;<br>\r\nx-ms-oob-tlc-oobclassifiers: OLM:2;<br>\r\nx-ms-exchange-senderadcheck: 1<br>\r\nx-microsoft-antispam: BCL:0;<br>\r\nx-microsoft-antispam-message-info: yfrhq/4r/ycbN1XlE8s7FwHW/pd03ZiYZl05EMBT6B7/bLtLceWfgW/E2XAhDFR8Lt7rQI8z94Wet8rNsHUClKpgUCOaNwnI+XejW7r9eRscQOETZWatFsfjAhb5+AqIAxHMG6QoNUUWcjMFupx5nYa1dzTKrmr2ku5Sm/RgK6CuGVsOoUXY1nNvexELZsPn4c8tOgH8Y07N3NqsQyrdzcg+gtwa0lzFrIOVqwY8NOr96oqjSXXSLeyx7aUcHOmalGo93Xvc04V39cOXxwAyLH69iiMvSF/Yb+uoi6tWUt7zry0Mip1uQwzq5S7S033vgpY6IM4ZkRXX8rIOEJYs2g==<br>\r\nx-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:fr;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR02MB5711.eurprd02.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(136003)(366004)(396003)(39850400004)(346002)(376002)(8936002)(5660300002)(6506007)(186003)(52536014)(9686003)(55016002)(2906002)(44832011)(33656002)(76116006)(64756008)(66446008)(7696005)(66616009)(66946007)(66556008)(66476007)(91956017)(66574015)(19627405001)(478600001)(224303003)(316002)(786003)(2940100002)(86362001)(71200400001)(99936003);DIR:OUT;SFP:1102;<br>\r\nx-ms-exchange-antispam-messagedata: 0Aal3puoHF/ZWErHGxSyYT6on7DR71zLQYa8X2Co0TkJ8cYeUfWuSGm39YuDFDJ8o498byDKHrPR0Rc6erxhx3ARAYeSxwOObx49+xQi7+tQVlmohzS5zCvOE4K8hSWsUf5U2hzUZlyEihCZGFszNgjjShdki+WUkcaNaDefLYwulX6Uo1iMyoLugKcc4VDjFhZ5Q49uWKR62iZ2gjE1YUphJetMlyU5SGCtwFhHu+xcoJ5fI79UC6s5OMUMWuG63Ko0v0BBdZPLbwdooGHbAjyWlA953uB5rSzYbSNOZlnHAGo4UziKI6sTKoKqPayFfml6hWgRNQhBus0s6NSDENq0fQpNOj2Wox9EbYRvUKxsaqTPMQC7XCXCKuYyswV0XW+j+WZVOx/m+nD9Dt/qgOnu9D79MbFQFa67xjosYSrJ51d9giJtk27M5EZc5a8M7fIuicRz/iNaBM8KF7dAIMkTekTbd4PCfGJ4XJ8dEG7TNsn/hApd9bbQXORE3XUoveZcissnGgJjX1GsbdeqCifIjore6MrvX8zx2DHfeR5qltoTOmaECMHSmbqDAD21LWImRkUk/lyBHxIavLNUFRJE7iqveLI+Ng7QNokdkpiRtTMQmLwsOHi5aq60lnSjA9eQosWXU2vnH3N7G/vdubfL1ufmklJ6E52+pirCRCU5BsPFt9yjsFdYCwIubPLsl3OROcF3BkQR4V2A6OC5Qw==<br>\r\nx-ms-exchange-transport-forked: True<br>\r\nContent-Type: multipart/mixed; boundary=&quot;_004_VE1PR02MB571178D32658BC852DD4B4B894560VE1PR02MB5711eurp_&quot;<br>\r\nMIME-Version: 1.0<br>\r\nX-OriginatorOrg: epitech.eu<br>\r\nX-MS-Exchange-CrossTenant-AuthAs: Internal<br>\r\nX-MS-Exchange-CrossTenant-AuthSource: VE1PR02MB5711.eurprd02.prod.outlook.com<br>\r\nX-MS-Exchange-CrossTenant-Network-Message-Id: 4fd08f28-8913-432a-cc88-08d84829fc2b<br>\r\nX-MS-Exchange-CrossTenant-originalarrivaltime: 24 Aug 2020 12:34:03.3253 (UTC)<br>\r\nX-MS-Exchange-CrossTenant-fromentityheader: Hosted<br>\r\nX-MS-Exchange-CrossTenant-id: 901cb4ca-b862-4029-9306-e5cd0f6d9f86<br>\r\nX-MS-Exchange-CrossTenant-mailboxtype: HOSTED<br>\r\nX-MS-Exchange-CrossTenant-userprincipalname: a7hOGAZXKm2rNCYEwL7fvNcr5mTTrzkB08MTqOcTrdsVLgujoHuvMJoZWT8ci3soKlUjhACS5XCCUj76gdclLQ==<br>\r\nX-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR02MB5406 ','2020-08-24 14:34:07','2020-08-24 18:38:56',12,NULL,NULL,NULL,0,NULL,'Karim Badji','karim.badji@epitech.eu',NULL,NULL,NULL,NULL,'VE1PR02MB571178D32658BC852DD4B4B894560@VE1PR02MB5711.eurprd02.prod.outlook.com',1,NULL),(95,NULL,'JOC2008-0004','Bonjour monsieur,<br />\r\n<br />\r\nJe me pr&eacute;sente NDONG NZE MICHONET Marc T&eacute;rence.<br />\r\nSuite &agrave; une annonce qui a attir&eacute; mon attention, stipulant que vous recherchez un d&eacute;veloppeur PHP en alternance.<br />\r\nJe me suis permis de contacter, nous avons pu &eacute;changer rapidement au t&eacute;l&eacute;phone et vous m&#39;avez fait comprendre qu&#39;un autre poste en tant que administrateur syst&egrave;me et d&eacute;veloppeur PHP est aussi &agrave; pourvoir.<br />\r\nEtant en derni&egrave;re ann&eacute;e les missions propos&eacute;s couvrent l&#39;ensemble des comp&eacute;tences &agrave; avoir pour la validation de cette ann&eacute;e, ainsi que la polyvalence des taches de travaille touchant &agrave; du front-end, du back-end, de l&#39;infrastructure IT et au d&eacute;ploiement m&#39;int&eacute;resse.<br />\r\n<br />\r\nJe me permets de vous adresser ce mail pour les postes &agrave; pourvoir.<br />\r\n<br />\r\nCi-joint :<br />\r\n<br />\r\n- CV<br />\r\n- Lettre de motivation<br />\r\n<br />\r\nVous souhaitant bonne r&eacute;ception.<br />\r\n<br />\r\nCordialement.<br />\r\n<br />\r\nNDONG NZE MICHONET Marc T&eacute;rence.',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Poste &agrave; pourvoir <br>\n&Eacute;metteur (From) : NDONG NZE MICHONET Marc T&eacute;rence &lt;m.ndongnzemichonet@epsi.fr&gt;<br>\nDestinataire(s) (To) : &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\n-----<br>\nBonjour monsieur,<br>\r\n<br>\r\nJe me présente NDONG NZE MICHONET Marc Térence.<br>\r\nSuite à une annonce qui a attiré mon attention, stipulant que vous recherchez un développeur PHP en alternance.<br>\r\nJe me suis permis de contacter, nous avons pu échanger rapidement au téléphone et vous m\'avez fait comprendre qu\'un autre poste en tant que administrateur système et développeur PHP est aussi à pourvoir.<br>\r\nEtant en dernière année les missions proposés couvrent l\'ensemble des compétences à avoir pour la validation de cette année, ainsi que la polyvalence des taches de travaille touchant à du front-end, du back-end, de l\'infrastructure IT et au déploiement m\'intéresse.<br>\r\n<br>\r\nJe me permets de vous adresser ce mail pour les postes à pourvoir.<br>\r\n<br>\r\nCi-joint :<br>\r\n<br>\r\n- CV<br>\r\n- Lettre de motivation<br>\r\n<br>\r\nVous souhaitant bonne réception.<br>\r\n<br>\r\nCordialement.<br>\r\n<br>\r\nNDONG NZE MICHONET Marc Térence.<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp2468967jal; Mon, 24 Aug 2020 06:11:35 -0700 (PDT)<br>\r\nX-Google-Smtp-Source: ABdhPJy+y9DYPuVOOo4tvngUrmBKC1sOo0EQq3nugAqyVrn8f9BCa6wE7CuVNAyOSgeRYkbSLmgE<br>\r\nX-Received: by 2002:a05:6402:156:: with SMTP id s22mr5162829edu.372.1598274694655; Mon, 24 Aug 2020 06:11:34 -0700 (PDT)<br>\r\nARC-Seal: i=2; a=rsa-sha256; t=1598274694; cv=pass; d=google.com; s=arc-20160816; b=E8SSMEdPidkVLL/qfixAL5Dg8pvbNSyfUi3dKo58uQ+XNiMeeCNGc2+cU8VFOj+bfp fMxSbbzjeDYK12/J3Q8MPn8EFxbkBx6hA2lPmoQPpZGlyZxwczdV5HbKL2ndawJXNk7S 9dL6QMUGWJ75aw8Utpyzbohl4359Nxfs6JKIYVch6CN0ZqyQAlzWBim4n61i54BDUC0B qmxiu3KSZHAzUJfBh7trpE0pk1NqneS4t9HTEQvehVRWsP+OtXy+lJUVC1TKtE2rIjCX 8ihSVi71LT0nZCb6zCwQeL5X9rkM1EViagx6hgH4csiD7u0w5ax/ZzZ//RxqNtrOd4YP U2Kg==<br>\r\nARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-language:accept-language:message-id:date :thread-index:thread-topic:subject:to:from:dkim-signature; bh=zD7C3LOHA5LXp+E+tH4Jb5Kgvyf/byKqD3qch3BDkwA=; b=fVZCLJ4HNcQqA5UVTsalIcoJ5+1zcYvIEm6RaqkY4f28ag5M06UmqrVWGUddaFkXIn R34xcXzaZmAdr+GH5OogDAxPYbCzY4xd0XWpX7PB/kjY5aCjt6MDFKAClQybG7hk8Mex u94KVUt44BlPXvv3V5VwwYRqRa4pf0oBfZDl1cr0rOualVaOLK3dvfJHjnc98AccXhes 1lBHeeaGQo4YMdzOM9GWwg29MOw9I1crAaNh66nPszaN6mwjdbU7pds5WsOWC/7wO381 TafhmmnOolsu2DSWbRlh+K7I0V4WsZThfTRoZ0d1ikJ2/0DPNt9xe2TtOqHnmqE4eymV fotg==<br>\r\nARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=ZiIJFO14; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of m.ndongnzemichonet@epsi.fr designates 40.107.22.41 as permitted sender) smtp.mailfrom=m.ndongnzemichonet@epsi.fr<br>\r\nReturn-Path: &lt;m.ndongnzemichonet@epsi.fr&gt;<br>\r\nReceived: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2041.outbound.protection.outlook.com. [40.107.22.41]) by mx.google.com with ESMTPS id dn4si1175379ejc.98.2020.08.24.06.11.34 for &lt;job@nltechno.com&gt; (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Aug 2020 06:11:34 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of m.ndongnzemichonet@epsi.fr designates 40.107.22.41 as permitted sender) client-ip=40.107.22.41;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=ZiIJFO14; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of m.ndongnzemichonet@epsi.fr designates 40.107.22.41 as permitted sender) smtp.mailfrom=m.ndongnzemichonet@epsi.fr<br>\r\nARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SDS3+YQCGi5O14jCZXXOlx7a+1w0/XEnWSptZEj9nFhDiZrbFTwZc9LnzvTECbxZPx7YNJHsWpHu85PmVQpoP+zbJDRH471A52Q3MxXodUeuNhi2rltMBC79aqFaoYhLUy4tD8EH4j8HLVJa/Dnu/xV0JxheXVWrVQsCtjxOI4hPADgl9rnCizP1muW5x7A32c3e/6j6Xmy7+W+365vcvy7fRM3Qx9h0YMC1hgKOZ3UQosN5WFYwNgchg5rsLlTwlaHy5eMg1uvRHCzUloxhGOXO0aI5PHU5ahZfaz7r9rHk3dPAfYeh7Krh+TocQ246/NSt74LlnaGBITLJAAlKNA==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zD7C3LOHA5LXp+E+tH4Jb5Kgvyf/byKqD3qch3BDkwA=; b=IJhxuowTGiLyj7xINn57WE6MUY7I2VlUVl9dQo9v9nhro4N2gCUzq/n4kqMzirbNxAIEp4mKLcmCqmWn8LB6ZXIc0+OOyjYjnkZqR04ZJJG1OveLcspzwycLRF7EE/fyEcE8Jm2CaJjwHb+zxdx/iiN2tpR/7IkrXWw5wMDbRDTfz0wA3JdIAsHsAUtGM0770l1dTs+zMBe1pyUzdE/Uyz+WSQorUNzpuPzcBEaYKo5n2jKsWHlKaDY9X31Ww1kgjsaCA/3zGyojl4J9i6agdflN6Y0mX2ZW2x6BYqKm/kRR8lIdGZ04286fxug52MR00W4ht8p4r9OYJwftyAB+5w==<br>\r\nARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epsi.fr; dmarc=pass action=none header.from=epsi.fr; dkim=pass header.d=epsi.fr; arc=none<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ifagparis.onmicrosoft.com; s=selector2-ifagparis-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zD7C3LOHA5LXp+E+tH4Jb5Kgvyf/byKqD3qch3BDkwA=; b=ZiIJFO14LuMW+mAdtpElD46iNKdHTzDbheoTC9Finy1SfnpgxfLAN3e2G0lWZkmlghLuYiwdkO52q8MaFcuc//BxksIk6KgP3xd+Db/yWv/7eFyam+T59hy/UmayisEFHAF2HWfip/dBANKZiZol4/Qw3Cb2Np6ZIGQTxx5K34w=<br>\r\nReceived: from AM0PR04MB6241.eurprd04.prod.outlook.com (2603:10a6:208:139::12) by AM0PR04MB6708.eurprd04.prod.outlook.com (2603:10a6:208:178::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.24; Mon, 24 Aug 2020 13:11:32 +0000<br>\r\nReceived: from AM0PR04MB6241.eurprd04.prod.outlook.com ([fe80::85dc:144b:69d2:107f]) by AM0PR04MB6241.eurprd04.prod.outlook.com ([fe80::85dc:144b:69d2:107f%5]) with mapi id 15.20.3305.026; Mon, 24 Aug 2020 13:11:32 +0000<br>\r\nFrom: =?iso-8859-1?Q?NDONG_NZE_MICHONET_Marc_T=E9rence?= &lt;m.ndongnzemichonet@epsi.fr&gt;<br>\r\nTo: &quot;job@nltechno.com&quot; &lt;job@nltechno.com&gt;<br>\r\nSubject: =?iso-8859-1?Q?Poste_=E0_pourvoir_?=<br>\r\nThread-Topic: =?iso-8859-1?Q?Poste_=E0_pourvoir_?=<br>\r\nThread-Index: AQHWehQ2IPjiSeMpVUCtwpI5x1AOJQ==<br>\r\nDate: Mon, 24 Aug 2020 13:11:32 +0000<br>\r\nMessage-ID: &lt;AM0PR04MB6241FBF386642A12D1BD07278E560@AM0PR04MB6241.eurprd04.prod.outlook.com&gt;<br>\r\nAccept-Language: fr-FR, en-US<br>\r\nContent-Language: fr-FR<br>\r\nX-MS-Has-Attach: yes<br>\r\nX-MS-TNEF-Correlator: <br>\r\nauthentication-results: nltechno.com; dkim=none (message not signed) header.d=none;nltechno.com; dmarc=none action=none header.from=epsi.fr;<br>\r\nx-originating-ip: [86.213.13.253]<br>\r\nx-ms-publictraffictype: Email<br>\r\nx-ms-office365-filtering-correlation-id: 584322a5-4015-4fe4-5850-08d8482f38c2<br>\r\nx-ms-traffictypediagnostic: AM0PR04MB6708:<br>\r\nx-microsoft-antispam-prvs: &lt;AM0PR04MB6708F61EAD4728494FA51DA68E560@AM0PR04MB6708.eurprd04.prod.outlook.com&gt;<br>\r\nx-ms-oob-tlc-oobclassifiers: OLM:2;<br>\r\nx-ms-exchange-senderadcheck: 1<br>\r\nx-microsoft-antispam: BCL:0;<br>\r\nx-microsoft-antispam-message-info: N80VLtfYKMrEsi+KgPBwu2VvVRvqQG5xzZgCc5nrHm/+it78pOOE8XzAtmIu2ZqNm/EgZ8XzujkzVuQCFn8Cfb7tNr77qKarH1i1QogePWuTYnTiPggFcB7sh3lsOABgy7e8S4YbNdmbbDstBnxnDRgHOuQ0u4Ak7/St95Ck0EYfj9ArjpyIAEsYbSHBOLAOE3SOdkU5iPuXsDiUcjKMEjqd4XHZ1ug4CFfzmDKbEJ8C64u3iHuR5RkDfACZBKh7jI1bqV2t2SHpqLKjZS/pNaCK38gDQY0yXVPYmbQeOe/dgKYR+8AB0mV8E1svW8d6<br>\r\nx-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:fr;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB6241.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(346002)(136003)(376002)(39850400004)(366004)(396003)(8936002)(4744005)(52536014)(7696005)(5660300002)(478600001)(786003)(316002)(19627405001)(224303003)(2906002)(186003)(6506007)(26005)(86362001)(99936003)(66576008)(55016002)(6916009)(71200400001)(33656002)(64756008)(66446008)(66556008)(66476007)(91956017)(4743002)(66946007)(76116006)(9686003)(83380400001);DIR:OUT;SFP:1101;<br>\r\nx-ms-exchange-antispam-messagedata: r4YDNyhgFdlnbTuKjUUthsUWNa9289yaXf0tS7nAiDBA2YQX95hqLZvlkvcmEuhp9q01sFACBgpAD9VwK4xZQAEzcKoAewwnfjEjh7Kf5T1eJMNHk8e+mhNzD3JKbY09/U2RIIk0BUbfxrkT4Mfj/hDRRQ8Fazetfx6z+tYc2pSU/OsRPTLnfd7w4DU5DUmSZIxGht8kXRDPNeHwAjOK8j3DKZEZYrkFnM82keaKQHhnycyhzFobfF5Vnq5iZYlg1ciJipYOD6Bdg52ZkqyDDxnEC0nRXViM16K30j8/uWibMstMd5BKjUMaVVhjnrRi6FVNEnx5F4iicRWCFoY8PCNwBFiFuNbG6yhD+HUnKB3pd3C2KsDIqRSdjn3VJlYDVK7aTkH21saF3SrOq2sLvINDEsnjRVuT1KN/GawduPgsj8ipl05Tpw2YgWmtPi4IqBX54mCYcu3XgSkj0L/NDy4IuJR7T61CCvA3o5DtQW0wr7OCDcG3NcPfHHz6Ma1hRraaJKc7G29F5/0kH4WkyV3KrOxgZx38x0eOy7ocyuN5a/KZnLHmd3wyYXxMmnH87+8EhA9dqKLhgPyMQ63kZghUEDMGgKeBzHtx/OofQOwLcL3jCXabU2iwylGI0zFTFVkJxdaaUlNGs42rIpOYRg==<br>\r\nx-ms-exchange-transport-forked: True<br>\r\nContent-Type: multipart/mixed; boundary=&quot;_005_AM0PR04MB6241FBF386642A12D1BD07278E560AM0PR04MB6241eurp_&quot;<br>\r\nMIME-Version: 1.0<br>\r\nX-OriginatorOrg: epsi.fr<br>\r\nX-MS-Exchange-CrossTenant-AuthAs: Internal<br>\r\nX-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6241.eurprd04.prod.outlook.com<br>\r\nX-MS-Exchange-CrossTenant-Network-Message-Id: 584322a5-4015-4fe4-5850-08d8482f38c2<br>\r\nX-MS-Exchange-CrossTenant-originalarrivaltime: 24 Aug 2020 13:11:32.5019 (UTC)<br>\r\nX-MS-Exchange-CrossTenant-fromentityheader: Hosted<br>\r\nX-MS-Exchange-CrossTenant-id: b6e77e52-65f6-4dec-b7d9-8e45f36a536f<br>\r\nX-MS-Exchange-CrossTenant-mailboxtype: HOSTED<br>\r\nX-MS-Exchange-CrossTenant-userprincipalname: sPRW6+EQtYyMiMlb6k1Hw01owv9KGZEAQW5Yj1Xq3lS0wtdxXHQithrIdPiG9kshDUhQZeU4h3EMnIT2GwhMhhGPCpMzpy3oxteK2cTacUM=<br>\r\nX-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6708 ','2020-08-24 15:11:34','2020-08-25 09:53:32',12,12,NULL,NULL,0,'','NDONG NZE MICHONET Marc Térence','m.ndongnzemichonet@epsi.fr','',NULL,NULL,NULL,'AM0PR04MB6241FBF386642A12D1BD07278E560@AM0PR04MB6241.eurprd04.prod.outlook.com',1,NULL),(96,NULL,'(PROV96)','RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : RE&nbsp;: Offre d\'alternance (Dylan, De muynck / EPSI)<br>\n&Eacute;metteur (From) : <br>\nDestinataire(s) (To) : NLTechno Job department &lt;job@nltechno.com&gt;<br>\n-----<br>\nBonjour,<br>\r\nJe vous envoie ci-joint le CV et la lettre de motivation.<br>\r\n<br>\r\nCordialement,<br>\r\nDylan<br>\r\n<br>\r\nProvenance : Courrier&lt;https://go.microsoft.com/fwlink/?LinkId=550986&gt; pour Windows 10<br>\r\n<br>\r\nDe : NLTechno Job department&lt;mailto:job@nltechno.com&gt;<br>\r\nEnvoyé le :jeudi 27 août 2020 02:17<br>\r\nÀ : DE MUYNCK Dylan 1&lt;mailto:dylan.demuynck1@epsi.fr&gt;<br>\r\nObjet :Re: Offre d\'alternance (Dylan, De muynck / EPSI)<br>\r\n<br>\r\nBonjour Dylan.<br>\r\n<br>\r\nPouvez-vous me transmettre par email un CV et une lettre de motivation ?<br>\r\n<br>\r\n<br>\r\nLaurent Destailleur.<br>\r\nNLTechno - DoliCloud<br>\r\n<br>\r\n<br>\r\nOn Thu, Aug 20, 2020 at 6:30 PM DE MUYNCK Dylan 1 &lt;dylan.demuynck1@epsi.fr&lt;mailto:dylan.demuynck1@epsi.fr&gt;&gt; wrote:<br>\r\n<br>\r\nBonjour,<br>\r\n<br>\r\nJe me présente, Je m’appelle Dylan De muynck, j’ai 22 ans.<br>\r\n<br>\r\nJe suis en seconde année à l’EPSI (Ecole d’ingénieur Informatique) et pour accompagner ma 3e année, je dois effectuer une alternance qui me permettra d’acquérir de l’expérience.<br>\r\n<br>\r\n<br>\r\n<br>\r\nDurant mes deux années de formation, j’ai pu assimiler plusieurs compétences en :<br>\r\n<br>\r\n         Langages informatiques :<br>\r\n<br>\r\n        Linux, SQL, HTML5/CSS3, PHP, Javascript (Bases), C++, C#, Java Android.<br>\r\n<br>\r\nLogiciels :<br>\r\n<br>\r\nSQl Server/MySQL, Visual Studio, Oracle VM VirtualBox, Dbeaver, Modelio, Androi Studio.<br>\r\n<br>\r\n<br>\r\n<br>\r\nSystèmes :<br>\r\n<br>\r\nLinux.<br>\r\n<br>\r\n<br>\r\n<br>\r\nModélisation de bases de données :<br>\r\n<br>\r\nMerise, UML<br>\r\n<br>\r\n<br>\r\n<br>\r\nJe vous contacte pour votre offre d’alternance qui m’intéresse car c’est le domaine que je cherche et mon objectif de demain pour mon futur emploi.<br>\r\n<br>\r\n<br>\r\n<br>\r\nPour me Contacter :<br>\r\n<br>\r\n<br>\r\n·        Mon numéro de portable : 06 42 85 48 96<br>\r\n<br>\r\n<br>\r\n·        Mon Email : Dylan.demuynck1@epsi.fr&lt;mailto:Dylan.demuynck1@epsi.fr&gt;<br>\r\n<br>\r\n<br>\r\n<br>\r\n<br>\r\n<br>\r\nMerci d’avoir pris votre temps pour me lire, en espérant avoir des nouvelles bientôt<br>\r\n<br>\r\n<br>\r\n<br>\r\nCordialement,<br>\r\n<br>\r\nDylan<br>\n<br>\n',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : RE&nbsp;: Offre d\'alternance (Dylan, De muynck / EPSI)<br>\n&Eacute;metteur (From) : <br>\nDestinataire(s) (To) : NLTechno Job department &lt;job@nltechno.com&gt;<br>\n-----<br>\nBonjour,<br>\r\nJe vous envoie ci-joint le CV et la lettre de motivation.<br>\r\n<br>\r\nCordialement,<br>\r\nDylan<br>\r\n<br>\r\nProvenance : Courrier&lt;https://go.microsoft.com/fwlink/?LinkId=550986&gt; pour Windows 10<br>\r\n<br>\r\nDe : NLTechno Job department&lt;mailto:job@nltechno.com&gt;<br>\r\nEnvoyé le :jeudi 27 août 2020 02:17<br>\r\nÀ : DE MUYNCK Dylan 1&lt;mailto:dylan.demuynck1@epsi.fr&gt;<br>\r\nObjet :Re: Offre d\'alternance (Dylan, De muynck / EPSI)<br>\r\n<br>\r\nBonjour Dylan.<br>\r\n<br>\r\nPouvez-vous me transmettre par email un CV et une lettre de motivation ?<br>\r\n<br>\r\n<br>\r\nLaurent Destailleur.<br>\r\nNLTechno - DoliCloud<br>\r\n<br>\r\n<br>\r\nOn Thu, Aug 20, 2020 at 6:30 PM DE MUYNCK Dylan 1 &lt;dylan.demuynck1@epsi.fr&lt;mailto:dylan.demuynck1@epsi.fr&gt;&gt; wrote:<br>\r\n<br>\r\nBonjour,<br>\r\n<br>\r\nJe me présente, Je m’appelle Dylan De muynck, j’ai 22 ans.<br>\r\n<br>\r\nJe suis en seconde année à l’EPSI (Ecole d’ingénieur Informatique) et pour accompagner ma 3e année, je dois effectuer une alternance qui me permettra d’acquérir de l’expérience.<br>\r\n<br>\r\n<br>\r\n<br>\r\nDurant mes deux années de formation, j’ai pu assimiler plusieurs compétences en :<br>\r\n<br>\r\n         Langages informatiques :<br>\r\n<br>\r\n        Linux, SQL, HTML5/CSS3, PHP, Javascript (Bases), C++, C#, Java Android.<br>\r\n<br>\r\nLogiciels :<br>\r\n<br>\r\nSQl Server/MySQL, Visual Studio, Oracle VM VirtualBox, Dbeaver, Modelio, Androi Studio.<br>\r\n<br>\r\n<br>\r\n<br>\r\nSystèmes :<br>\r\n<br>\r\nLinux.<br>\r\n<br>\r\n<br>\r\n<br>\r\nModélisation de bases de données :<br>\r\n<br>\r\nMerise, UML<br>\r\n<br>\r\n<br>\r\n<br>\r\nJe vous contacte pour votre offre d’alternance qui m’intéresse car c’est le domaine que je cherche et mon objectif de demain pour mon futur emploi.<br>\r\n<br>\r\n<br>\r\n<br>\r\nPour me Contacter :<br>\r\n<br>\r\n<br>\r\n·        Mon numéro de portable : 06 42 85 48 96<br>\r\n<br>\r\n<br>\r\n·        Mon Email : Dylan.demuynck1@epsi.fr&lt;mailto:Dylan.demuynck1@epsi.fr&gt;<br>\r\n<br>\r\n<br>\r\n<br>\r\n<br>\r\n<br>\r\nMerci d’avoir pris votre temps pour me lire, en espérant avoir des nouvelles bientôt<br>\r\n<br>\r\n<br>\r\n<br>\r\nCordialement,<br>\r\n<br>\r\nDylan<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp397252jal; Thu, 27 Aug 2020 02:01:40 -0700 (PDT)<br>\r\nX-Google-Smtp-Source: ABdhPJyJb5945YJzfVgRcfbDwNFVJBybWev8meoy+cpZ0+9/RX3ZkfXhUU9os7Jf4B1l00yzZVCE<br>\r\nX-Received: by 2002:a25:d78c:: with SMTP id o134mr25902267ybg.167.1598518900085; Thu, 27 Aug 2020 02:01:40 -0700 (PDT)<br>\r\nARC-Seal: i=2; a=rsa-sha256; t=1598518900; cv=pass; d=google.com; s=arc-20160816; b=JUzsj8VnQEJPB3dyRNrgZHTVy+MXQVe4jxMNqc8BISpir9ZQFV/6DvM8vaBxVIa1w4 FFqzjJmD5nXhPNGL5Co6U4W0KzwiHUAASGmvNkUT/4BJCU6gL0OnR6jbrttAkUTyaGJ8 WCK0nRKPNJ/cNv4sLIu2OfZNCXOKh6qxFynLUTzMZo5BKpWwgZaX1suNGoNIvnIcJzAz sPfS4dwlbwwecb6qkiIXczrS6H7HzaiLlot6ThSqRojVCkyeO51oySPJb8ix9I3uE2bY Q7XXppbWq/o3DqUHrH2KSvD0jLnCJavnXnFsColpAi+jQbFXgh5NjWPDVtv8RXyWCfHu Nkow==<br>\r\nARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-language:accept-language:in-reply-to :references:message-id:date:thread-index:thread-topic:subject:to :from:dkim-signature; bh=cHRgKKJ9te9qCIi5ZNiwZgjfvcXzyKXcZ9AEE3BgVQE=; b=ce9ednCs2jZ2JEUVz8y5GCsOAG/8urbek6VcZAiEZpxeh48/ftb9zIYwRlMmAvVmAt O62RB1Z+Rwt7THio5tr9KbwFdZNzn2j9FbJtl0cQm3sGggd1asA0DOyMg3iMqqcFYxN7 G09x3w/3W+b4KlVC/qIHYQKBGhU+nUaqxXx5A6PTWpoNRenuKCeB65UFkQ8vyagSSe1Y iF6USXB7HllWWaiDyb3HRi5aISBGygsCeyjBq8uMOS2fPOsuK/Hcjw0xdt8lta0mqppW D7nst93t2i2MKW1AnnXls95PYvp/8NN5pefFqsBb8GX9CIDIDsP+7e4w0ACL18BfsXCC iiew==<br>\r\nARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=Orz23JlX; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of dylan.demuynck1@epsi.fr designates 40.107.0.77 as permitted sender) smtp.mailfrom=dylan.demuynck1@epsi.fr<br>\r\nReturn-Path: &lt;dylan.demuynck1@epsi.fr&gt;<br>\r\nReceived: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00077.outbound.protection.outlook.com. [40.107.0.77]) by mx.google.com with ESMTPS id h36si1958638ybj.61.2020.08.27.02.01.39 for &lt;job@nltechno.com&gt; (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Aug 2020 02:01:39 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of dylan.demuynck1@epsi.fr designates 40.107.0.77 as permitted sender) client-ip=40.107.0.77;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@ifagparis.onmicrosoft.com header.s=selector2-ifagparis-onmicrosoft-com header.b=Orz23JlX; arc=pass (i=1 spf=pass spfdomain=epsi.fr dkim=pass dkdomain=epsi.fr dmarc=pass fromdomain=epsi.fr); spf=pass (google.com: domain of dylan.demuynck1@epsi.fr designates 40.107.0.77 as permitted sender) smtp.mailfrom=dylan.demuynck1@epsi.fr<br>\r\nARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Meg4IsLUDRCnUWtEVvPwNo70hjynZixRTSSwDU+m8/xB3eDse/K/n4byxo6QyFG0ZNNCL/uoahipzUi+L4omeW/D2P7qPmcturPaewIuTBh/OiuSHHEPCq52jHPcZkNon1W5So8TSlxAkDh0JF+KUnLpgXIv3808uuhL7ehs1IrkcMzhXhuS7JXPEXxFxne46RxdB6bxlpmKWxM0B8gCJbDqgTqZ07Vh6JIzO/4kALDdPE9tiec0c+TjDnSShhZoNJSKY1h6z0OBtk8rLundUWBnw00WaQQ8DzQE5AhILk6KXWqeO32J3tjGBrxTDFhQdcql5xzCRmcJtVdTGBbz4A==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cHRgKKJ9te9qCIi5ZNiwZgjfvcXzyKXcZ9AEE3BgVQE=; b=h1boSQGBKKfCwhy4JwuJbnATBZT7K0f/UaEvbzQe1iAM36SnSPKD1lJe3Nsu0VWm0VYX2TgLMtMlJE7RNidh/A/5EQt/8HAkEH85XuCRCOiB2bkwke5AkZiivt7fTjKB/0nj9ZbvpsDGKhwg3BUikEOBTmBiN3U2S6xz0hZjsuOUB3isQiLadqHGUh2qK9zWcvNaeCKpOAR0MC+SHhxEktlgcqRg4pm36zfPGUM9g5tgetlnJxPnd8O8hCkVNVpI9czmEah6w6n0yW3zVdA68xrIrjqHX7usaQswlkxIltC9hAmycLvoNrVY7w5bkB3GKTz0u73v6ghpuTLQqJZa0w==<br>\r\nARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epsi.fr; dmarc=pass action=none header.from=epsi.fr; dkim=pass header.d=epsi.fr; arc=none<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ifagparis.onmicrosoft.com; s=selector2-ifagparis-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cHRgKKJ9te9qCIi5ZNiwZgjfvcXzyKXcZ9AEE3BgVQE=; b=Orz23JlXEbRDxELGSRDtQWSGp4xpCzfpwx/8USrHdNIFVCF9kU2fNC63IJa6N8Sli+FWPM/g5+cCTZH9EUNO0TvT6PaEDsYeqj8hg2A2PKEJ0lZj6p71t4JwbSS8mVBQ1gHuU0KgrW/WX5vmXTerZ/eaP5wEQ2kwdeBHe6DSZ2Y=<br>\r\nReceived: from AM6PR0402MB3381.eurprd04.prod.outlook.com (2603:10a6:209:9::18) by AM6PR04MB5895.eurprd04.prod.outlook.com (2603:10a6:20b:b0::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3326.19; Thu, 27 Aug 2020 09:01:36 +0000<br>\r\nReceived: from AM6PR0402MB3381.eurprd04.prod.outlook.com ([fe80::c078:abac:2736:3234]) by AM6PR0402MB3381.eurprd04.prod.outlook.com ([fe80::c078:abac:2736:3234%6]) with mapi id 15.20.3326.019; Thu, 27 Aug 2020 09:01:36 +0000<br>\r\nFrom: DE MUYNCK Dylan 1 &lt;dylan.demuynck1@epsi.fr&gt;<br>\r\nTo: NLTechno Job department &lt;job@nltechno.com&gt;<br>\r\nSubject: =?Windows-1252?Q?RE=A0:_Offre_d\'alternance_(Dylan,_De_muynck_/_EPSI)?=<br>\r\nThread-Topic: =?Windows-1252?Q?RE=A0:_Offre_d\'alternance_(Dylan,_De_muynck_/_EPSI)?=<br>\r\nThread-Index: AQHWdw83Va7zuqgzY0SRcaW8NWmoy6lLIKqAgACRoRM=<br>\r\nDate: Thu, 27 Aug 2020 09:01:36 +0000<br>\r\nMessage-ID: &lt;AM6PR0402MB33819AEEEBCB05DF0350CAEAA8550@AM6PR0402MB3381.eurprd04.prod.outlook.com&gt;<br>\r\nReferences: &lt;59f8dccc-bc3a-462a-b9e3-a76846af580e@email.android.com&gt;,&lt;CAL3akH0HVQ0JUk87uY_8Sh_V8MQaV7fXGxUv2-DGY5kL6T9woA@mail.gmail.com&gt;<br>\r\nIn-Reply-To: &lt;CAL3akH0HVQ0JUk87uY_8Sh_V8MQaV7fXGxUv2-DGY5kL6T9woA@mail.gmail.com&gt;<br>\r\nAccept-Language: fr-FR, en-US<br>\r\nContent-Language: fr-FR<br>\r\nX-MS-Has-Attach: yes<br>\r\nX-MS-TNEF-Correlator: <br>\r\nauthentication-results: nltechno.com; dkim=none (message not signed) header.d=none;nltechno.com; dmarc=none action=none header.from=epsi.fr;<br>\r\nx-originating-ip: [77.144.8.217]<br>\r\nx-ms-publictraffictype: Email<br>\r\nx-ms-office365-filtering-correlation-id: 708adcab-bbe4-4e1a-ef9e-08d84a67cdd5<br>\r\nx-ms-traffictypediagnostic: AM6PR04MB5895:<br>\r\nx-microsoft-antispam-prvs: &lt;AM6PR04MB5895DF40D27A92DBBAFEAFB3A8550@AM6PR04MB5895.eurprd04.prod.outlook.com&gt;<br>\r\nx-ms-oob-tlc-oobclassifiers: OLM:1013;<br>\r\nx-ms-exchange-senderadcheck: 1<br>\r\nx-microsoft-antispam: BCL:0;<br>\r\nx-microsoft-antispam-message-info: UpbQ1HENTTRHVkga7TGtQ1mlSx/0hmhnti7UV/3QSGMvl8biV7Y+PjYeVNg2Z1n5FxggwH//1Pr9zkbe323oFizewOTBVDKyjo62vAssd82dZYXjDzIJEa1SWl9P/+fbYG+1owgckH05HxfzlE5cBRH/XH5hHHagkr6yNM0wqYxoeOq5IABrrYD1aIeUd+E+thA1vol/WCogVoI5y4xYYk2eTvDTVSHrl2LfAOeopokX1Up1RHBgq3a19OxekJaOl5tB0/Es5q0uf8pINjf7t5VHsfoIQHnzf5heWQ7+LHq577D+7k7eVaSQFNDvXZzty2YNdWs9r2ew6mwwMY6YxCDwSvhVy1Ajq4VPGdkKBFJokJOrGeTfns+7No36rrgzgLKNH7R/p4ZCsH3WoS/ssg==<br>\r\nx-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:fr;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR0402MB3381.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(396003)(136003)(39850400004)(376002)(346002)(366004)(7696005)(166002)(55016002)(52536014)(5660300002)(316002)(66946007)(64756008)(66446008)(66556008)(66476007)(66576008)(53546011)(76116006)(9686003)(26005)(6506007)(786003)(2906002)(99936003)(478600001)(86362001)(186003)(71200400001)(6916009)(33656002)(8936002);DIR:OUT;SFP:1101;<br>\r\nx-ms-exchange-antispam-messagedata: vSL48hGXqa7cFFyye8ZlSPR7xWWOie3jiDNCyQkdz5zf/vdnRZOX6r7yRAMyRD5qIvOs7O522nEDeGf3mIQg6ToZVh24Erd8P1fKj0w6hDyXw8X0974XMFGYGlaBqu6dppWdh9+tdLW5ru3cOLUvYLjwrogVH+JsvVrjWQrCUMAzqg6rrFRg53PU3OD/kh9lb2OL/ifHVha4O0hgcH8AgnNDEwAfUUhD/SEKchiL+GW1B09FPbckgMoGEGNZpKgOyBzT3l/T9n1BUi5ss6KbnjaIK2hp1HEznVOk4T9JFVzv+mJ3VzdZ4F8SK44fjklWoFaT/gW1tmkIlBjLWOBEMDrGgPlHILR6TjGEi6RRJp8U1JVhIdmE9VHoiiSQH0XpVMmmVxDYuUP4zNHkovBwoi8bHCuNPDjnRmz0UkWhH4/Cd6tMerVpCzenGIfcbicZGf50u53wKhjnhpYxmMAjRBYJuLReK/lAQ6MxKCYzqnhOIm6YCUevEbCoNwpf3Pjk/nobW9+x+cA32EL0Tus7dEljrICOx658PlGjFQ/uW0q/EHMdLAIiAb3g6xd2XouTFGkCEwepEdKWqEhx1wQIM0IyXy8bT5XI/8WVCi2lnJNKreptgcJSNCfWe0MgaJdNrfzhdYatbDaOlGkdwcUqYg==<br>\r\nx-ms-exchange-transport-forked: True<br>\r\nContent-Type: multipart/mixed; boundary=&quot;_005_AM6PR0402MB33819AEEEBCB05DF0350CAEAA8550AM6PR0402MB3381_&quot;<br>\r\nMIME-Version: 1.0<br>\r\nX-OriginatorOrg: epsi.fr<br>\r\nX-MS-Exchange-CrossTenant-AuthAs: Internal<br>\r\nX-MS-Exchange-CrossTenant-AuthSource: AM6PR0402MB3381.eurprd04.prod.outlook.com<br>\r\nX-MS-Exchange-CrossTenant-Network-Message-Id: 708adcab-bbe4-4e1a-ef9e-08d84a67cdd5<br>\r\nX-MS-Exchange-CrossTenant-originalarrivaltime: 27 Aug 2020 09:01:36.6812 (UTC)<br>\r\nX-MS-Exchange-CrossTenant-fromentityheader: Hosted<br>\r\nX-MS-Exchange-CrossTenant-id: b6e77e52-65f6-4dec-b7d9-8e45f36a536f<br>\r\nX-MS-Exchange-CrossTenant-mailboxtype: HOSTED<br>\r\nX-MS-Exchange-CrossTenant-userprincipalname: LSZ/ajvheOrBLhOD0Gmqt6Sn83JTSfKaYMb50mVpCOlLqTr5BF3SbFtZCpdP5t1Dnoa+cJmOM3fsJwOpPjRFxw==<br>\r\nX-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB5895 ','2020-08-27 11:01:39','2020-08-27 15:55:55',12,NULL,NULL,NULL,0,NULL,NULL,'',NULL,NULL,NULL,NULL,'AM6PR0402MB33819AEEEBCB05DF0350CAEAA8550@AM6PR0402MB3381.eurprd04.prod.outlook.com',1,NULL),(98,NULL,'(PROV98)','Bonjour, Monsieur Destailleur.\r\n\r\nJe m\'appelle Félix Abriac, je suis étudiant à l\'IUT Informatique de\r\nBordeaux et je suis en recherche d\'alternance pour ma future Licence\r\nProfessionnelle (DAGPI), en développement et gestion de projets.\r\n\r\nJe cherche à signer un contrat d\'alternance pour l\'année qui arrive (de\r\nSeptembre à Septembre) et je suis très grandement intéressé par votre offre.\r\n\r\nJe sais développer en PHP et j\'utilise GIT très régulièrement. Pour ce qui\r\nest du Java, c\'est mon langage de prédilection, et j\'ai déjà développé pour\r\nAndroid. J\'ai l\'habitude de rédiger des messages en anglais, c\'est un\r\nlangage que je parle couramment et que je comprends assez bien.\r\n\r\nAussi, j\'habite sur Pessac, donc il sera d\'autant plus simple de se\r\nrencontrer physiquement de manière régulière.\r\n\r\nJe vous mets mon CV et le calendrier prévisionnel de l\'année en pièce\r\njointe, ainsi qu\'une brochure de la formation.\r\n\r\nEn vous souhaitant une agréable journée !\r\nCordialement,\r\nFélix Abriac',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : <br>\n&Eacute;metteur (From) : F&eacute;lix Abriac<br>\nDestinataire(s) (To) : job+2@nltechno.com<br>\n-----<br>\nBonjour, Monsieur Destailleur.<br>\r\n<br>\r\nJe m\'appelle Félix Abriac, je suis étudiant à l\'IUT Informatique de<br>\r\nBordeaux et je suis en recherche d\'alternance pour ma future Licence<br>\r\nProfessionnelle (DAGPI), en développement et gestion de projets.<br>\r\n<br>\r\nJe cherche à signer un contrat d\'alternance pour l\'année qui arrive (de<br>\r\nSeptembre à Septembre) et je suis très grandement intéressé par votre offre.<br>\r\n<br>\r\nJe sais développer en PHP et j\'utilise GIT très régulièrement. Pour ce qui<br>\r\nest du Java, c\'est mon langage de prédilection, et j\'ai déjà développé pour<br>\r\nAndroid. J\'ai l\'habitude de rédiger des messages en anglais, c\'est un<br>\r\nlangage que je parle couramment et que je comprends assez bien.<br>\r\n<br>\r\nAussi, j\'habite sur Pessac, donc il sera d\'autant plus simple de se<br>\r\nrencontrer physiquement de manière régulière.<br>\r\n<br>\r\nJe vous mets mon CV et le calendrier prévisionnel de l\'année en pièce<br>\r\njointe, ainsi qu\'une brochure de la formation.<br>\r\n<br>\r\nEn vous souhaitant une agréable journée !<br>\r\nCordialement,<br>\r\nFélix Abriac<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job+2@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp481988jal; Thu, 27 Aug 2020 04:22:51 -0700 (PDT)<br>\r\nX-Received: by 2002:a50:fd84:: with SMTP id o4mr19184015edt.76.1598527370717; Thu, 27 Aug 2020 04:22:50 -0700 (PDT)<br>\r\nARC-Seal: i=1; a=rsa-sha256; t=1598527370; cv=none; d=google.com; s=arc-20160816; b=IzISF3kLrCxtL/pxrfjr4MEoGUyA2Ecw+EBlOLZSUsbD4DmqnrpzFB+x2ypQk4eqVZ ZZeGN6nxikjrwk00PAeGt1jl7aAu1mMhyLheEPEZG3C6AJWJgeHmWC8Fp0nlwr3CF2dw W+bdtlqqlaqpfTtODz4nTqyv/aw9JutG8IrLLPWrqVp5pq3dMGd6Ojw3EalM8nB0p6Je 4O7+ach2moWlA0WQR+jpc6b+DkN/n2PJO3kCP9TveK+9Hav/Ot+bf2B8LzmHGIO5N47q B9igP+l6P0uPWfuj3FftZexTVWBE89WUCZB05Ipww/t2Hh5hf8k0W7VmZ/sdg8TN+0s8 4rYQ==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:subject:message-id:date:from:mime-version:dkim-signature; bh=E7L7oq8Pj6VvkGtPtsb/MBCGFqnzyqHlBaaQeI+kx3w=; b=tnK9yo7F6GT0nb6dQXrNrLZ52aPf9dXJUkEAj1iarCK2UBljCpMyh3EOa53hlXO3cb dLldPRa8nnl0COBFaChLrU140Y9m37SPFcbYzT/MjfL6LEGQWwaCiSPAOGcUwTKZIW21 bu7oXDQUtcruD98IPo7+5VNj/+e3msU41x12lvU8J5EdBhALQTal1vePPAaBc/rWCht2 v84JsiKbJtQ7WS4eOJE11wRWOJJGlxwB0aE9C/5eehk1Ty9RMEbHkm4YNlFzppv8AyIN SNfoXogRZiuRay+pvtZmGvH9YXUBBEv5yuv3821NQWLCFM79z0vgdMrZApiQCbYJJRAR BUYA==<br>\r\nARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=&quot;p8U/slbr&quot;; spf=pass (google.com: domain of felixabriac@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=felixabriac@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nReturn-Path: &lt;felixabriac@gmail.com&gt;<br>\r\nReceived: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id j15sor1249037ejn.8.2020.08.27.04.22.50 for &lt;job+2@nltechno.com&gt; (Google Transport Security); Thu, 27 Aug 2020 04:22:50 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of felixabriac@gmail.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=&quot;p8U/slbr&quot;; spf=pass (google.com: domain of felixabriac@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=felixabriac@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=E7L7oq8Pj6VvkGtPtsb/MBCGFqnzyqHlBaaQeI+kx3w=; b=p8U/slbr251+PfOSCtytM7kP3bR+C2Fd8ROxpDOIun37dIGY4zhiR6O8D+Kw07RSCr r5vU/4UB9/07M6zDdWAVjFnLpjzZsNJVCP6WI60fue4zNj6MFR6Xtw198ae+v2qfCiqW rQfCiUz+Qe0Q07TvcTZ04qD3nw9Zuww/6AhR11OFLhFCt7pEDPwVBMzP2Z3BM7rWAFCs Q3QMgyKGfEshgKoCM08pS72n2ADyXL6RWwPsv8X5Ak9pSSH3xVpb9cRLRbIq9JY31vdZ bQXyNCTU8Uuup+AkUy66OcuAPPzD7dvF+on19AkOjiznsBA3NtXKC2f6UDmvfmzyRiWB +mPQ==<br>\r\nX-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=E7L7oq8Pj6VvkGtPtsb/MBCGFqnzyqHlBaaQeI+kx3w=; b=XYrigLiHOMUyiS2N3FlGZQZwhE/9JAWtnOZD49K5AIw3YlTP0lhClmwzVnpDs87nSg wkWGGHOP6akdmat6pFCGQpbB7l2/llinQY2jC9NMM0C6bCdN7A728gItzLVnMIq90qrO pSiFICqgj4cXHWzTfbJuyvLlb5ZkZiTBUv4TjgwlVLv4/LWKECXPBeFovHH2WYsgyc25 XJ1TPTVy/DrrHfTqdYchNkAY3GZ6ZSkzsATDpV770dIry3a2279ae6ILhdPQqQuSjZ6C h8GKUD9Y8oalxGuIqgr3mePRbgICjUOQP7RFMaAuoCezvKMmx5CAOT1vka6hdLT1IXIK mBCg==<br>\r\nX-Gm-Message-State: AOAM531+TK7RSI5NCirLcxnr4bXnMHLnKdHLzc9ceoQTyeD/yKKkNPWq xyCpXFl5ZTDVcVVUo1x7AbA+Fqk6Wu9xZJdnpg2O/gLnXBWmNSpw<br>\r\nX-Google-Smtp-Source: ABdhPJyPhtPwYyY03JxcH+YCXvSx75IsxI4J5ecNp2D5pRiFbQhgqylFFPmOODnwWQu5DC1GkoKHri68YrYaJ27u+0s=<br>\r\nX-Received: by 2002:a17:906:2e05:: with SMTP id n5mr19396687eji.397.1598527369407; Thu, 27 Aug 2020 04:22:49 -0700 (PDT)<br>\r\nMIME-Version: 1.0<br>\r\nFrom: =?UTF-8?Q?F=C3=A9lix_Abriac?= &lt;felixabriac@gmail.com&gt;<br>\r\nDate: Thu, 27 Aug 2020 13:22:35 +0200<br>\r\nMessage-ID: &lt;CACRMZshmufhN=CF7EvS-M1v2obx3kfUVAorgM0+X2+x5a17J5g@mail.gmail.com&gt;<br>\r\nSubject: Candidature pour votre offre d\'alternance<br>\r\nTo: job+2@nltechno.com<br>\r\nContent-Type: multipart/mixed; boundary=&quot;00000000000005f10705adda2862&quot; ','2020-08-27 13:22:50','2020-08-27 17:14:17',12,NULL,NULL,NULL,0,NULL,'Félix Abriac','Félix Abriac',NULL,NULL,NULL,NULL,'CACRMZshmufhN=CF7EvS-M1v2obx3kfUVAorgM0+X2+x5a17J5g@mail.gmail.com',1,NULL),(109,2,'(PROV109)','Bonjour,\r\n\r\nActuellement en Licence Professionnel Développement d\'applications et\r\ngestion de projet informatique à l\'IUT de Bordeaux je suis à la recherche\r\nd\'une entreprise.\r\nCeux-ci m\'ont joint votre proposition de contrat Pro Alternance Développeur\r\nPHP auquel je souhaite intégrer.\r\nPour cela je vous joint les documents nécessaire (lettre de motivation, CV).\r\n\r\nCordialement,\r\nMme MOUAZZAZ Zineb',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Candidature Alternance D&eacute;veloppeur PHP<br>\n&Eacute;metteur (From) : Zineb Mouazzaz &lt;mouazzazz@gmail.com&gt;<br>\nDestinataire(s) (To) : job+2@nltechno.com<br>\n-----<br>\nBonjour,<br>\r\n<br>\r\nActuellement en Licence Professionnel Développement d\'applications et<br>\r\ngestion de projet informatique à l\'IUT de Bordeaux je suis à la recherche<br>\r\nd\'une entreprise.<br>\r\nCeux-ci m\'ont joint votre proposition de contrat Pro Alternance Développeur<br>\r\nPHP auquel je souhaite intégrer.<br>\r\nPour cela je vous joint les documents nécessaire (lettre de motivation, CV).<br>\r\n<br>\r\nCordialement,<br>\r\nMme MOUAZZAZ Zineb<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job+2@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp482001jal; Thu, 27 Aug 2020 04:22:52 -0700 (PDT)<br>\r\nX-Received: by 2002:a9d:6643:: with SMTP id q3mr2005738otm.27.1598527371785; Thu, 27 Aug 2020 04:22:51 -0700 (PDT)<br>\r\nARC-Seal: i=1; a=rsa-sha256; t=1598527371; cv=none; d=google.com; s=arc-20160816; b=st9XBtR5Q0i9V2VM2VG+xeO4bvp/2MyxQISqJBFIY5ikjAifsFuybd83SAFSK19Alz G8QwZk8cm8Wd7z54AdykgJ9OPIWhaMGqpbnHV4TCBQP+H5iXdgz2VLEkFgLcFDTF0vUZ bzEyvQ2JZRT9r3wqLL+9cj7BkIjOlrb3AsB01adRLKUygCvg2bZhWJf3CZ6B78VFPjw7 xs0Z2ddKXoRC1m45BJ/fRCM3IGGa0Gv5LNdqZsY3FbkGADgeXJbIoUG0wzrzXOP88HZ+ 4Mo4TluDjQF0N4JttHQUUtITg+leSt4ACcqHFHTMIMO5imMFPwUWLChl1x6HeNUd9DLD Y4Wg==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:subject:message-id:date:from:mime-version:dkim-signature; bh=4Qrqv8dMPjnPFbkZ/HI9cx3WwVjtKLrbqUwAmBitK8Y=; b=sQWc2J8hg6dhMd5I6IAk3NqzF48kMhYelrSVLaQ0H2jXRoJIeguzwM70uUF1Uh8DNO g+Jtr3YGmeMyZjxZ5Ke4vaoDnVE6H2VboPT6KNXYvuBpOAn34UZTZB2aXCwkncqVa5WQ vEO3mqrkR6CXY8RNOxoeRUU+Ucen0UlLIIKBxzZIJOuq6EZd1g7SVdhXiZeNHwZrPoi4 TYb7MaqwnCQ1XfMvOh38aJKBw2Wjuum51Dsc+AUR9u6pOCJ75U5daHw+YDK7cbLMYuQ2 EsQptfs9ei3IhYa/sTHUBRT41jB/e03xPNzpAOBtN/lBUSYkoc/tOkMioUAwTminOJNA jX6g==<br>\r\nARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=iXwCriTy; spf=pass (google.com: domain of mouazzazz@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=mouazzazz@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nReturn-Path: &lt;mouazzazz@gmail.com&gt;<br>\r\nReceived: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id f10sor802448oot.13.2020.08.27.04.22.51 for &lt;job+2@nltechno.com&gt; (Google Transport Security); Thu, 27 Aug 2020 04:22:51 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of mouazzazz@gmail.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=iXwCriTy; spf=pass (google.com: domain of mouazzazz@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=mouazzazz@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=4Qrqv8dMPjnPFbkZ/HI9cx3WwVjtKLrbqUwAmBitK8Y=; b=iXwCriTyWO2rUA6OIc5EYIvk/BM1qbuEHPyaBnYemVrZMHptdakyN6E99y60EeFZjG mWfrUDFQkonnW2/taQaHdgU6kGwdCzwZxPatVUN5jb9FIBtWPaj2HO32G+LLNtHVTVfE 181xF156xS9pa93KpRRsk6MrRi+yjabEHx425A1/ZkcFjqrBWjNjrMat2dYz4Vyg9a85 XIiFPsu06wvVlHsqVeLF6+/ZwagSgoOj82dqmJpTnMdl9U7FOn9bmebhXml0qmTcik4k Eq0LDAkD+7V45MdA6v63OLjHxjjhPON6KaIcJWBK0UvEV5+wWdFGUYaRjWJyIAhViVLa 675g==<br>\r\nX-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=4Qrqv8dMPjnPFbkZ/HI9cx3WwVjtKLrbqUwAmBitK8Y=; b=blz5HvJrXaaptmz5mupjVD1Nax4rvSq6IKbnqKQWc/VPSqZM/REv2M8OvmrXWMy5VA NOrNsm8S7HrpRmyud1u39zJT4Nzn51Z6K99NsvQdBHXY1T6ytEmUAnaMStvzIiRa0wfj XIXEJEOLWOk0/g38JhMaLmDDoRCAhqIbTuvdj5Y33ZovSsXZzdNjhdnqZCS2oKgCU0fk IxemccLqqE9Yp9AznrRumiMtaJjBqfiNuGXp2ysz8FMVI+sM2NR5I4MdtKX467qDN57y bE2dwf2ENr8eliwhiPnPmURwP1h4D7ZESz1wKFs6f70EaneHNYsCt1oBbVB58owmU+vq V9+w==<br>\r\nX-Gm-Message-State: AOAM532jSqXROkZR7ICrr1R54NQjz1LeTsMjxoLDqz2/Hca0kyc4DQ4N SzSzRFqijzN0vt0rin1m0SfTFZI9LD7qNBE21j8gcVrD<br>\r\nX-Google-Smtp-Source: ABdhPJxWTZewiSKgOEGpSOQfWQhCWKD0CA0Wx2HAlDvgMi5qpHqi1HP27Mqr9YjrjNebyM3yemMwIaFg6kjDZAaUbDU=<br>\r\nX-Received: by 2002:a4a:dc03:: with SMTP id p3mr13781369oov.63.1598527370959; Thu, 27 Aug 2020 04:22:50 -0700 (PDT)<br>\r\nMIME-Version: 1.0<br>\r\nFrom: Zineb Mouazzaz &lt;mouazzazz@gmail.com&gt;<br>\r\nDate: Thu, 27 Aug 2020 13:22:39 +0200<br>\r\nMessage-ID: &lt;CAOmKmgXdDWTvYCd88oJ5o0HoO9-Nsmx9hMutY0nKJRoATRR9gA@mail.gmail.com&gt;<br>\r\nSubject: =?UTF-8?Q?Candidature_Alternance_D=C3=A9veloppeur_PHP?=<br>\r\nTo: job+2@nltechno.com<br>\r\nContent-Type: multipart/mixed; boundary=&quot;0000000000001c444c05adda2851&quot; ','2020-08-27 13:22:51','2020-08-27 17:40:57',12,NULL,NULL,NULL,0,NULL,'Zineb Mouazzaz','mouazzazz@gmail.com',NULL,NULL,NULL,NULL,'CAOmKmgXdDWTvYCd88oJ5o0HoO9-Nsmx9hMutY0nKJRoATRR9gA@mail.gmail.com',1,NULL),(110,2,'(PROV110)','Bonjour,\r\n\r\nJe suis actuellement à la recherche d\'une alternance pour une licence professionnel DAGPI, étant tombé sur votre offre qui m\'intéresse particulièrement aux vues de la mission et des compétences recherchées je me permets de candidater et de vous transmettre mon CV.\r\n\r\nJe reste disponible pour toute information complémentaire et dans l\'attente d\'une réponse.\r\n\r\nCordialement,\r\n\r\nMarcoux Matthias',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Recherche alternance<br>\n&Eacute;metteur (From) : matthias milliez &lt;matthias.milliez@outlook.fr&gt;<br>\nDestinataire(s) (To) : &quot;job+2@nltechno.com&quot; &lt;job+2@nltechno.com&gt;<br>\n-----<br>\nBonjour,<br>\r\n<br>\r\nJe suis actuellement à la recherche d\'une alternance pour une licence professionnel DAGPI, étant tombé sur votre offre qui m\'intéresse particulièrement aux vues de la mission et des compétences recherchées je me permets de candidater et de vous transmettre mon CV.<br>\r\n<br>\r\nJe reste disponible pour toute information complémentaire et dans l\'attente d\'une réponse.<br>\r\n<br>\r\nCordialement,<br>\r\n<br>\r\nMarcoux Matthias<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job+2@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp501992jal; Thu, 27 Aug 2020 04:54:01 -0700 (PDT)<br>\r\nX-Google-Smtp-Source: ABdhPJxyfy2fMvKckhxbcsplQd8h0zZiI8L8oiIUsVnQE8R9FIWEbFEk5egOIkBifvSac3XRfs2n<br>\r\nX-Received: by 2002:a0c:e90e:: with SMTP id a14mr18592752qvo.224.1598529240906; Thu, 27 Aug 2020 04:54:00 -0700 (PDT)<br>\r\nARC-Seal: i=2; a=rsa-sha256; t=1598529240; cv=pass; d=google.com; s=arc-20160816; b=Ar1u5IlLC+Q0nd+1m6L21A/Wh7sZ8p4YR0zUXQ01tn+SLfSxwboP8OKBYlRacyQboJ 7Dl2O4OpWuiwNgVdkaezzmZ5lC58C2cB+rha90Yxy9NcdSGLkcE/TBRMToo6CSS1OIRP FRKnQol9yaHYICpiKyy8hobQh7WU/+sUQVX1te4V4yb0UVfJ0nSmcarA7hcdzl9G3AZf e0VKYd3Y3v3nXO1JTsS9rjkz/jHHVyNqShweFhnIzXivb6cvYfJ2WPH0m1zp5wRwXqHt gRCNHN6adDhEXVdmN1zH/K1GyaYPNMNNuCwGex26TSz7FAnaemy3roqIV3sArZgsQ95K zP1A==<br>\r\nARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-language:accept-language:message-id:date :thread-index:thread-topic:subject:to:from; bh=vERzEEr9RzzfWfYJAjDxhyKFKRRgamq06mXXnWTUPD4=; b=gd3OfsBgVmnrLvn+xIkMoPITH0u+cYyUr6Or2o5CdV1FBMbb/vGlW/SkB8+Mso3xVm N8Yv7x94M98ySzXCDoMAOPU9wtNCNE4e9fkh2WRfUINARSzdMbO5Nq9JBezhrkAkKTNs UaUt2ENqTfki6hGbZoLeZq9rCHg6oIqwH6oE4d5Fmenn41CWdUAbzeStgIda56ffEiF7 hSVYziuZtkZ3g+Q09O9S229Oy7cg4TMBnv9S/eRn0jwkT7B12szYrrLDZ9gzPIYGbEky 9CzUq8qSoWA3Fs7YL2QO2mTu2lG5+BIIeMKk8pE91QbJkoSn4eb33dTYNTddKQfJzY6l Ic1g==<br>\r\nARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of matthias.milliez@outlook.fr designates 40.92.17.23 as permitted sender) smtp.mailfrom=matthias.milliez@outlook.fr; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=outlook.fr<br>\r\nReturn-Path: &lt;matthias.milliez@outlook.fr&gt;<br>\r\nReceived: from EUR06-VI1-obe.outbound.protection.outlook.com (mail-vi1eur06olkn2023.outbound.protection.outlook.com. [40.92.17.23]) by mx.google.com with ESMTPS id e7si292748qtd.175.2020.08.27.04.54.00 for &lt;job+2@nltechno.com&gt; (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Aug 2020 04:54:00 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of matthias.milliez@outlook.fr designates 40.92.17.23 as permitted sender) client-ip=40.92.17.23;<br>\r\nAuthentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of matthias.milliez@outlook.fr designates 40.92.17.23 as permitted sender) smtp.mailfrom=matthias.milliez@outlook.fr; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=outlook.fr<br>\r\nARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YzsZ2VjcExabObiV+6MAPPx2wwO6FPHv5eAvReiCjWmi1wsUddoA3R9bN9J7FkBKQb+oYiGFM8J/u2a5PadT/ocxAPo/SBtFQIiE0gL/nG7ZIdAfvuxSkXMBjJ6kDvhUk4LWc9rurWlATUOsK1+Vi9k6RmDUJWMlg3D3DDOB/5ctuvdeYOD/vYoAXHLHDqQ8KlVuDZqek3ppNSAQnk6wP0IIx53ly/sO6MQSNsMRdoz1QAjGg4e2YzBjxi3ELvNZoWmXBiZK2RtDL62galoKr6EvG+X0l5WcDF7RLlrdg2mRqAsJYTHl25FwXRns2CPLDUCDrHugicF+9hAwoK4RvA==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vERzEEr9RzzfWfYJAjDxhyKFKRRgamq06mXXnWTUPD4=; b=VEgLgQAV7JuxxZFMkejICu0sqHCIgY/bzSBszlIvvOISb0dR6NBbggmx/1CCeJep/LLuocuHZXNgO5sbHvY8VCou29I4h1mjwITLAr9lZG/GUY51Ck+Mr0+EqtzTxMuMChreq6Aw3heCNSUUUSN6EFl7eaul8U70esz0tYSp11zjadar5gLCilCFkksNpY6cN5jEQNfCjA4qs62breLUBAwwnRqPa023ViQ1J6F9iPh4rhugahSxrCBpJugeeCPRV0YdkbIfbfjEjTruRGHYfxiwVfUbqnOet/P8EUXnUMDZJbGWGGCXgMx+o2yW/e7IB8sCJTj2P/kgb27+yAgjPQ==<br>\r\nARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none<br>\r\nReceived: from VI1EUR06FT063.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc37::4a) by VI1EUR06HT100.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc37::457) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.24; Thu, 27 Aug 2020 11:53:53 +0000<br>\r\nReceived: from DB7PR10MB2523.EURPRD10.PROD.OUTLOOK.COM (2a01:111:e400:fc37::42) by VI1EUR06FT063.mail.protection.outlook.com (2a01:111:e400:fc37::260) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3326.19 via Frontend Transport; Thu, 27 Aug 2020 11:53:53 +0000<br>\r\nReceived: from DB7PR10MB2523.EURPRD10.PROD.OUTLOOK.COM ([fe80::55db:b467:76ac:e1f2]) by DB7PR10MB2523.EURPRD10.PROD.OUTLOOK.COM ([fe80::55db:b467:76ac:e1f2%3]) with mapi id 15.20.3305.032; Thu, 27 Aug 2020 11:53:53 +0000<br>\r\nFrom: matthias milliez &lt;matthias.milliez@outlook.fr&gt;<br>\r\nTo: &quot;job+2@nltechno.com&quot; &lt;job+2@nltechno.com&gt;<br>\r\nSubject: Recherche alternance<br>\r\nThread-Topic: Recherche alternance<br>\r\nThread-Index: AQHWfGeLnNq5ZoBx10iXLGeDtvgJ6Q==<br>\r\nDate: Thu, 27 Aug 2020 11:53:53 +0000<br>\r\nMessage-ID: &lt;DB7PR10MB2523FA056F084A184F25EAF2EA550@DB7PR10MB2523.EURPRD10.PROD.OUTLOOK.COM&gt;<br>\r\nAccept-Language: fr-FR, en-US<br>\r\nContent-Language: fr-FR<br>\r\nX-MS-Has-Attach: yes<br>\r\nX-MS-TNEF-Correlator: <br>\r\nx-incomingtopheadermarker: OriginalChecksum:BB9190F385F8C8065749FBF8CFCABC9EF79445A9FBC3C29F47D93455D32EDB7A;UpperCasedChecksum:958151801AEB1F44AD9C9362A70E2752B373DC3B2A6CD27FAA41411DF3273823;SizeAsReceived:6770;Count:41<br>\r\nx-tmn: [LgiL9/tInlZL6O8Q79u8F39uLwZQJMvD0OkXcEN0jNSJH6FW579O1BiHTQdxRpDy]<br>\r\nx-ms-publictraffictype: Email<br>\r\nx-incomingheadercount: 41<br>\r\nx-eopattributedmessage: 0<br>\r\nx-ms-office365-filtering-correlation-id: c90732ee-7fdf-41af-cf6c-08d84a7fdef0<br>\r\nx-ms-traffictypediagnostic: VI1EUR06HT100:<br>\r\nx-microsoft-antispam: BCL:0;<br>\r\nx-microsoft-antispam-message-info: G0QvaDzwTK+0FS8K0KnDfBjVqpVJyhCtPyttMDuFJiVPtUw5tBXnpZQwYX6UAQMZOQ5DOrt7LNT5RYQX/j7DQVsNjuRfLmW0IvVNXh8pDoSLbBY+Kg9w2AVONE0nsrB3Smoz1snjRcBPjqfP6/wo8CQCw/b8NmQFIBp1QfReF24lMZI+I7FJCR5SacjnEWsH4VYqa8nwi4ALfMAcKMSqfg==<br>\r\nx-ms-exchange-antispam-messagedata: c/EUang/UQHiNRGatUe8pQmq8nKiXbyKopDYjH0wcYL8iDtWOt/2PVM/9ev4s8jFxIaoD0xG+powMrGC8qmJISX+Ftm6iCyVcMn74Kn7jtwMaOFsm9BxmU1emY772grAqzl2qLK6Z1OSQZqvpukiO3Q6M0aKovIhCYv8tvQCMbHNIqtl2XvIrn4an62/vG9HBFx/GRwvwwZK1Njo37UOaw==<br>\r\nx-ms-exchange-transport-forked: True<br>\r\nContent-Type: multipart/mixed; boundary=&quot;_004_DB7PR10MB2523FA056F084A184F25EAF2EA550DB7PR10MB2523EURP_&quot;<br>\r\nMIME-Version: 1.0<br>\r\nX-OriginatorOrg: outlook.com<br>\r\nX-MS-Exchange-CrossTenant-AuthAs: Anonymous<br>\r\nX-MS-Exchange-CrossTenant-AuthSource: VI1EUR06FT063.eop-eur06.prod.protection.outlook.com<br>\r\nX-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000<br>\r\nX-MS-Exchange-CrossTenant-Network-Message-Id: c90732ee-7fdf-41af-cf6c-08d84a7fdef0<br>\r\nX-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000<br>\r\nX-MS-Exchange-CrossTenant-originalarrivaltime: 27 Aug 2020 11:53:53.3531 (UTC)<br>\r\nX-MS-Exchange-CrossTenant-fromentityheader: Internet<br>\r\nX-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa<br>\r\nX-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1EUR06HT100 ','2020-08-27 13:54:00','2020-08-27 17:40:58',12,NULL,NULL,NULL,0,NULL,'matthias milliez','matthias.milliez@outlook.fr',NULL,NULL,NULL,NULL,'DB7PR10MB2523FA056F084A184F25EAF2EA550@DB7PR10MB2523.EURPRD10.PROD.OUTLOOK.COM',1,NULL),(111,2,'(PROV111)','Bonjour,\r\nEn juin dernier, j\'ai terminé un BTS SNIR et je souhaite continuer mes\r\nétudes dans la licence pro DAWIN (dans laquelle j\'ai reçu un avis\r\nfavorable). Dans le cadre de cette formation, je suis à la recherche d\'un\r\ncontrat de formation en alternance.\r\nC\'est pourquoi je vous sollicite de la part de m.Bourqui, responsable de la\r\nformation, afin de pouvoir bénéficier de ce contrat au sein de votre\r\nentreprise.\r\n\r\nJe vous remercie vivement de l\'attention que vous porterez à ma\r\ncandidature.\r\nJe suis disponible pour vous rencontrer dés que vous le souhaiterez.\r\n\r\nBien cordialement,\r\nMathias CATHELINEAU\r\n\r\n06.88.18.85.62\r\nmat.cathelineau@gmail.com',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Contrat d\'alternance licence pro DAWIN<br>\n&Eacute;metteur (From) : Mathias Cathelineau &lt;mat.cathelineau@gmail.com&gt;<br>\nDestinataire(s) (To) : job+2@nltechno.com<br>\n-----<br>\nBonjour,<br>\r\nEn juin dernier, j\'ai terminé un BTS SNIR et je souhaite continuer mes<br>\r\nétudes dans la licence pro DAWIN (dans laquelle j\'ai reçu un avis<br>\r\nfavorable). Dans le cadre de cette formation, je suis à la recherche d\'un<br>\r\ncontrat de formation en alternance.<br>\r\nC\'est pourquoi je vous sollicite de la part de m.Bourqui, responsable de la<br>\r\nformation, afin de pouvoir bénéficier de ce contrat au sein de votre<br>\r\nentreprise.<br>\r\n<br>\r\nJe vous remercie vivement de l\'attention que vous porterez à ma<br>\r\ncandidature.<br>\r\nJe suis disponible pour vous rencontrer dés que vous le souhaiterez.<br>\r\n<br>\r\nBien cordialement,<br>\r\nMathias CATHELINEAU<br>\r\n<br>\r\n06.88.18.85.62<br>\r\nmat.cathelineau@gmail.com<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job+2@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp520322jal; Thu, 27 Aug 2020 05:17:40 -0700 (PDT)<br>\r\nX-Received: by 2002:adf:f045:: with SMTP id t5mr21139987wro.288.1598530660390; Thu, 27 Aug 2020 05:17:40 -0700 (PDT)<br>\r\nARC-Seal: i=1; a=rsa-sha256; t=1598530660; cv=none; d=google.com; s=arc-20160816; b=CCUZYFS5D2eBHUcd40e/7nVk8PoUyIPiH5rGYJBUcb47S7aCntKE8RRRFLj8j2RXfb U50w5Zf+EyBBOf4a3/1Koo2yrScDw1q6KAS8BoYrzcOJcU6tqJ6MhMK03BHnTj/iq3Hr 0rU0YgnCtH5RveJdfVzx10EqMSSFvib+8bBTY8YI82blrJqz83r655bvWphIFJoXZxry iUG7DpfNXHwRmnTWtb08HQnkXORJgJ5RzgQ1XhFPUQf9kEyra++OUediCr/mL5C9XsTP hzzEKMM0n2Sf0KCjUwTiPiJOiwOC/Oc3ZGXO4tffjUmiwMKS6ASDJQUetMtVB3oOeMTC BEkA==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:subject:message-id:date:from:mime-version:dkim-signature; bh=0Cy1ecKuNipzzA492uHP+Ml4VYszKpsaORcHqXajV9U=; b=BxtE5iVPwILurGGfufwMnX3Ca/ZUtNvZkPTEswHz508gW2UBb6xW/6ggSk4VfBGbgG atQHaWeZCa8WM2D5N7QHh4/a3JD9PQjg7ZjIESpHyGKCCKTW0US/cEWlmyLcGKbNAeEF 0eXpG2MBbuOfeWwTtbQC9xxxLG8dE/QGYirkBgqJ4/x28kVBZljecWQbmUgZgQ//gF9v qPYidhGQ2VyV75kcfSo+HdIXwH34PEyiRvv0SiFKW+gxuD7RB87lP+e05VNIK+porGcD ZcjAB3mxpVpjNyDuvFTLM9VIw2jLNSCO+IFPXksCOrBfMQqPxM87Gm0r2IVoaTDxmyEX o/oA==<br>\r\nARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=IWiYSFTj; spf=pass (google.com: domain of mat.cathelineau@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=mat.cathelineau@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nReturn-Path: &lt;mat.cathelineau@gmail.com&gt;<br>\r\nReceived: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id q10sor1069887wrc.23.2020.08.27.05.17.40 for &lt;job+2@nltechno.com&gt; (Google Transport Security); Thu, 27 Aug 2020 05:17:40 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of mat.cathelineau@gmail.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=IWiYSFTj; spf=pass (google.com: domain of mat.cathelineau@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=mat.cathelineau@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=0Cy1ecKuNipzzA492uHP+Ml4VYszKpsaORcHqXajV9U=; b=IWiYSFTjo/PQgXpqUUQApPkqczG/eA1+gaRBDP8/CLe1cO1iIWOF2Cq6xqd9CQXJJl NlZCjbFemjHjFtsazGNm6dwacRTf/wb1ZgX8DhIAFGQytJ8qlUF8FrXSmN9NpvbYSeYr rMZTu3cbT3Z+CWpWMfHqJD1dmwYtwCBdW2jlAr8xs1HATGHq/zQdk3DQOcgS7ZqUsbSh +92bnKHvzRR6cMQr9bScWJXl1EtjNxV+p8Tlik8lbN1lky0V0q7t7hh4i+V3BeHRHFWM n06JSQdbvwewR96oJh9/f9+Bw2Abb4HG681wR8UZ6pRRe7MdfFdWojWIhpHqZGkkLd2M E2+g==<br>\r\nX-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=0Cy1ecKuNipzzA492uHP+Ml4VYszKpsaORcHqXajV9U=; b=efwamsMaL1X0fmGlU49kIdHm/IH3wPOdmyU56e16Cm2P8+YNxUgutZLhsMG7J/eVJM krFoR2rnccnBpM3Pwpzc86bIglmJkfCBbhKqCftHMyTeQYZVAtLP6P6ncqipDEcbjlvn yeKITgirIWUeMZ4F3BN6f+lsBzHnaugNPq8ji/adGhVlvUkmAo3dcRIveKZK2b0OzPKb eiqkRvNypJw/zQNWc6txBDqWKBiNsWX3PCVuuM85d2X+1q9TGwsEMMQyXk8TiDuM9JiL qxoFC5wXQOhFgcrzsa1NUjnO9E4pVTBDBC7rdPPni36viJTQ0TXzr9I4FdQMepMsK76q 0OCA==<br>\r\nX-Gm-Message-State: AOAM530CvMDAlarEMFPWS6V4DCtxmwXKQ19OSY8Ny5rP/onQMuB7dFij cZM95Y5bc2aNMHNCYAMpN2T5+ABEikgcdmEUHZStx0b/B+E=<br>\r\nX-Google-Smtp-Source: ABdhPJwKd0giqnf90zhFR4Cm6qTLCRDgaXfIKbBMnI2OS7+iGrCK1ONy9bIZHFAng73n1cyydT5Jpb2QAjwpyV4qdr0=<br>\r\nX-Received: by 2002:adf:edc3:: with SMTP id v3mr19942990wro.193.1598530659736; Thu, 27 Aug 2020 05:17:39 -0700 (PDT)<br>\r\nMIME-Version: 1.0<br>\r\nFrom: Mathias Cathelineau &lt;mat.cathelineau@gmail.com&gt;<br>\r\nDate: Thu, 27 Aug 2020 14:17:28 +0200<br>\r\nMessage-ID: &lt;CAN35kyOiyz05Rx9BEBTJiKCYDLOtr8UZYdjom=HLixXNc97EKA@mail.gmail.com&gt;<br>\r\nSubject: Contrat d\'alternance licence pro DAWIN<br>\r\nTo: job+2@nltechno.com<br>\r\nContent-Type: multipart/mixed; boundary=&quot;00000000000022f9d905addaec03&quot; ','2020-08-27 14:17:40','2020-08-27 17:40:59',12,NULL,NULL,NULL,0,NULL,'Mathias Cathelineau','mat.cathelineau@gmail.com',NULL,NULL,NULL,NULL,'CAN35kyOiyz05Rx9BEBTJiKCYDLOtr8UZYdjom=HLixXNc97EKA@mail.gmail.com',1,NULL),(112,2,'JOC2008-0005','Bonjour Monsieur Destailleur,<br />\r\n<br />\r\nJe me permet de vous contacter suite &agrave; l&#39;offre relay&eacute;e par l&#39;IUT de<br />\r\nBordeaux concernant le poste d&#39;alternant &quot;D&eacute;veloppeur PHP&quot; au sein de votre<br />\r\nentreprise.<br />\r\n<br />\r\nCette offre a retenu mon attention suite aux diff&eacute;rentes exp&eacute;riences que<br />\r\nj&#39;ai pu avoir durant ma formation de technicien sup&eacute;rieur. Diff&eacute;rents<br />\r\nprojets en PHP (cr&eacute;ations de diff&eacute;rents sites types) ou encore en Android<br />\r\n(cr&eacute;ation d&#39;une application en JavaScript). Ce poste serait en parfaite<br />\r\nad&eacute;quation avec la formation en licence professionnelle DAGPI et mes<br />\r\nattentes pour l&#39;ann&eacute;e 2020/2021.<br />\r\n<br />\r\nVoici ci-joint mon curriculum vitae et mon profil Gitlab :<br />\r\nhttps://gitlab.com/simon.chaval<br />\r\n<br />\r\nJe reste &agrave; votre disposition pour toutes informations compl&eacute;mentaires.<br />\r\n<br />\r\nCordialement,<br />\r\n<br />\r\nCHAVAL Simon<br />\r\nT&eacute;l : 06.04.46.44.82',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Candidature alternance<br>\n&Eacute;metteur (From) : Simon Chaval &lt;simon.chavalpro@gmail.com&gt;<br>\nDestinataire(s) (To) : job+2@nltechno.com<br>\n-----<br>\nBonjour Monsieur Destailleur,<br>\r\n<br>\r\nJe me permet de vous contacter suite à l\'offre relayée par l\'IUT de<br>\r\nBordeaux concernant le poste d\'alternant &quot;Développeur PHP&quot; au sein de votre<br>\r\nentreprise.<br>\r\n<br>\r\nCette offre a retenu mon attention suite aux différentes expériences que<br>\r\nj\'ai pu avoir durant ma formation de technicien supérieur. Différents<br>\r\nprojets en PHP (créations de différents sites types) ou encore en Android<br>\r\n(création d\'une application en JavaScript). Ce poste serait en parfaite<br>\r\nadéquation avec la formation en licence professionnelle DAGPI et mes<br>\r\nattentes pour l\'année 2020/2021.<br>\r\n<br>\r\nVoici ci-joint mon curriculum vitae et mon profil Gitlab :<br>\r\nhttps://gitlab.com/simon.chaval<br>\r\n<br>\r\nJe reste à votre disposition pour toutes informations complémentaires.<br>\r\n<br>\r\nCordialement,<br>\r\n<br>\r\nCHAVAL Simon<br>\r\nTél : 06.04.46.44.82<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job+2@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp567218jal; Thu, 27 Aug 2020 06:22:43 -0700 (PDT)<br>\r\nX-Received: by 2002:a17:906:14ce:: with SMTP id y14mr21987293ejc.314.1598534563421; Thu, 27 Aug 2020 06:22:43 -0700 (PDT)<br>\r\nARC-Seal: i=1; a=rsa-sha256; t=1598534563; cv=none; d=google.com; s=arc-20160816; b=NcEsjOE9T5QcjWovzpjVA341TOhAcBze58OhYHt6uqoM49Ah8HVEVaX8/NfR3+WvaH b0Qh9zdfFOSO3gh3ZfPbIP8lbboJNgDI1Ywupfpj5wap3LghPAHTbfkzs3YmIsByLd9k fOQ9E1dZqOt4yG6XYq8vMbdUkWiq/h9KycR5LMfqkg2b1Wksiz7X7lfhffwZMTMPiGDU meLddcj2tHMpHUSjWp1Izaa0TPvCXA+6rOoN7wdtbVVwaR3amRupEueqKdcRb2HOULBB 5AKbZPVBoiezL9DOCVMnN1Y/JWtqNQPzD92bUoicm+EKtCryXG6A9vt5DxEWzzfVPRYM 8/aA==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:subject:message-id:date:from:mime-version:dkim-signature; bh=lbjwR/V72pUhdgWfeF1sHQCmKh6xsyFaNAKB6gXhLt4=; b=Qr3XVS0Jqo6KG7nXWtepOs8lgHpr4cxQvGf2enfU90wsR00/T+v7Vo3Tyj1KurdEx/ 1UzYCj0ROf3AdoWGr/yT16T3WqKRpLoutoaOFFpmP03cg3DCkaLeuMgHoeN9F6DaAyPd SlIHtXJ1EZEQwF+MNmZn11tsYv959LUZJ5DlOdUykifTs2cst9MaLY3npP55ZjNQOET/ 0Xmg2UttluVWj3cxHVQqjG1kxJ5BzvfVFD4Jv4KhWpXv2TyqHCJgu8xF3yVn9qKV8O9N +NjjsJwlwwNEURMuBg9804ql0Zl4qszufRVCB5zIW2PZ4IZopH7rZX+/3wmnpGc7CjXr Jjbg==<br>\r\nARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=bZOO3wrI; spf=pass (google.com: domain of simon.chavalpro@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=simon.chavalpro@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nReturn-Path: &lt;simon.chavalpro@gmail.com&gt;<br>\r\nReceived: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id l14sor1507900ejq.4.2020.08.27.06.22.43 for &lt;job+2@nltechno.com&gt; (Google Transport Security); Thu, 27 Aug 2020 06:22:43 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of simon.chavalpro@gmail.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=bZOO3wrI; spf=pass (google.com: domain of simon.chavalpro@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=simon.chavalpro@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=lbjwR/V72pUhdgWfeF1sHQCmKh6xsyFaNAKB6gXhLt4=; b=bZOO3wrIRfjoKP1Lkkn79xQ/9Fueds3rWL8pS65KfEf1Boi8yDjnBf16UmoBv7Kjhg hC2swZAyQnXdxpBNuH2FxdjYdYz8AkcGAZA2KYSN78/jKD/h2wbTAyxs0ymIr1p1Mq4F Y1HSt7iG9+9mzsitvcV39aBWDf+GvfXnL/k4lr7UjTsPUKoaAGU8mnHJ168F9Emj15NI 0Epen4/QpLLzqjLa7RKUmd/NHOcYDH9AmFjUVG99gM/KHn/akOEGsoaEt8k8XIfgrHFB VoBvjz0U7SCGGRfNghAqRBxI3Q1MK8ZzHORXnc4L8C5mnZzJA5X0AMI6HRTIQIAo1qto NZRQ==<br>\r\nX-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=lbjwR/V72pUhdgWfeF1sHQCmKh6xsyFaNAKB6gXhLt4=; b=CnZhtnYrXzS5pToSjiA0zF7ARSzvIB04s59YyoyGnHNwPut6O2OHyhcPaadQK9NBzx GdLXq3pNmimwKDH47hfH5+P+d2f0e8uc7x13MAuCmAimv+C3FYSqPjvsi5ZwcnDencqp nIWNE36fwbXJwEyXbi7rrHQ4d6b19kWfrDqSXltDSE579VdWYNvHf5409Xlq0O7+/OtO Ni31HQCtfnSwxOwVLhI7Qu90PdByV2j2nIFYjdPCasP0fcDijK+R0Pyh+9YxshIlWL4a AG5Zt/ur+Nh4dNAQZrTreeOq4qk0Hkbw8NkwcqPxUCmf8s0B7tzkC3sC0T7wuhNVhlOn DgFQ==<br>\r\nX-Gm-Message-State: AOAM533DCe+o7jGC0a17xx9VTpDlRbANyf4yHIjIZ+nDdPmr0ozjOiPP LidUT/32DX7JBOihs8Zko+g6zZcrnbEeujKkJfmAfvom6eg=<br>\r\nX-Google-Smtp-Source: ABdhPJxjFaoCelUvYZIsfsIahzwjSqY9aUhFSza0JoMtEil7IV6GFEhnLjBtzO4mY1MJuKCpUxB9OYZSY9fFi1t6Kw0=<br>\r\nX-Received: by 2002:aa7:d596:: with SMTP id r22mr20209057edq.204.1598534562319; Thu, 27 Aug 2020 06:22:42 -0700 (PDT)<br>\r\nMIME-Version: 1.0<br>\r\nFrom: Simon Chaval &lt;simon.chavalpro@gmail.com&gt;<br>\r\nDate: Thu, 27 Aug 2020 15:22:29 +0200<br>\r\nMessage-ID: &lt;CAC5uxV1z5GCsb81DAVV9yT4zB4yKRPZp54MDBX7ioAu-gV1-Ow@mail.gmail.com&gt;<br>\r\nSubject: Candidature alternance<br>\r\nTo: job+2@nltechno.com<br>\r\nContent-Type: multipart/mixed; boundary=&quot;000000000000bfe56c05addbd441&quot; ','2020-08-27 15:22:43','2020-11-04 11:28:30',12,12,NULL,NULL,5,'','Simon Chaval','simon.chavalpro@gmail.com','',NULL,NULL,NULL,'CAC5uxV1z5GCsb81DAVV9yT4zB4yKRPZp54MDBX7ioAu-gV1-Ow@mail.gmail.com',1,NULL),(113,2,'(PROV113)','Bonjour, je suis en licence professionnelle DAWIN à l\'IUT de Gradignan et vous joins mon CV et ma lettre de motivation afin de candidater à votre offre d\'alternance.\r\nCordialement,\r\n\r\nYann Pinout',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Candidature alternance<br>\n&Eacute;metteur (From) : Yann Pinout &lt;yann.pinout@hotmail.fr&gt;<br>\nDestinataire(s) (To) : &quot;job+2@nltechno.com&quot; &lt;job+2@nltechno.com&gt;<br>\n-----<br>\nBonjour, je suis en licence professionnelle DAWIN à l\'IUT de Gradignan et vous joins mon CV et ma lettre de motivation afin de candidater à votre offre d\'alternance.<br>\r\nCordialement,<br>\r\n<br>\r\nYann Pinout<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job+2@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp570237jal; Thu, 27 Aug 2020 06:26:49 -0700 (PDT)<br>\r\nX-Google-Smtp-Source: ABdhPJxqM78sFtXLPTRUo47FDgLLr4+PVsEEULXINQpiVTA+FEXfRtfDJ5UXA+K/wJHNHE/uR+xg<br>\r\nX-Received: by 2002:a50:d4d7:: with SMTP id e23mr1650774edj.289.1598534808778; Thu, 27 Aug 2020 06:26:48 -0700 (PDT)<br>\r\nARC-Seal: i=2; a=rsa-sha256; t=1598534808; cv=pass; d=google.com; s=arc-20160816; b=T2YdeQcz/wAevoSz1tYvk1Ub+eHtf+4/7XV+OAZIGi/WXl4pEHjBvcLOqryyDQpg8c sDHvdlQeXxcRuvekM8MviMiIu+tsPfHsh4LiyaDq26jRjXs+NtQSpYNPFpYp2pLsJxTr ZlLerw8LQRxAzR0MZFIgHa3c7VI0nlzER8m+3qlZ+NdYfSYhN21CI6AmOM0i/C7EGjz0 AzGawmkc9HeTL9Sbs47LL9yyWbIuV+PNpRRpNWgKw8SdnFjCx8mQLnWpqxY4szImiTOO 5ed/3F04EDquMX6FYH6GY0xPB+GNR5Vvcfd5m9aE8KNNpVEzsLs8jPj4w7aB6xzcDVM5 vyWw==<br>\r\nARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-language:accept-language:message-id:date :thread-index:thread-topic:subject:to:from; bh=a/cGgPPIjBoP8cKGbl6Abw5b/p/NWPp8iodhhPKPs4k=; b=g7fxJOnHz0HrRYqjI9zoSNTKkfmZUOTVZTKDpKO5ICCQiqldAp2Z//ia8fyKwJuqJ5 kFZggKR6dTG6bzvNMXrguvp3G3fIHYsHfnC5noa+M6pGy6bdt1Ve9x3z4Ar/ykW1dUKi 65K8MFf+ssdVqJeMgJi604Cyqrz/dvbHxzH8YEx+Dfnd9tBTBtFak5bZM8iu8l0rCUqC juCS1Uc/QKYJI4ZasKUoopdljf3OKlvrjHq/5PL94bVA33bQEipMGAEiEZWlUpwdDO8s CRTz4ZG3DJ9+XggrGSM9Mjhv4rRjDI3FB45/y9tvXyiDPFcZMKhUB8tnqzyyIbg+/aY7 nNQw==<br>\r\nARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of yann.pinout@hotmail.fr designates 40.92.17.79 as permitted sender) smtp.mailfrom=yann.pinout@hotmail.fr; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=hotmail.fr<br>\r\nReturn-Path: &lt;yann.pinout@hotmail.fr&gt;<br>\r\nReceived: from EUR06-VI1-obe.outbound.protection.outlook.com (mail-vi1eur06olkn2079.outbound.protection.outlook.com. [40.92.17.79]) by mx.google.com with ESMTPS id t4si1424499ejt.506.2020.08.27.06.26.48 for &lt;job+2@nltechno.com&gt; (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Aug 2020 06:26:48 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of yann.pinout@hotmail.fr designates 40.92.17.79 as permitted sender) client-ip=40.92.17.79;<br>\r\nAuthentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of yann.pinout@hotmail.fr designates 40.92.17.79 as permitted sender) smtp.mailfrom=yann.pinout@hotmail.fr; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=hotmail.fr<br>\r\nARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BI2kr+chMyFAuIhFFXaOUmZkiZJ5+kYHV+HtajG0MCo7KhTDii2mmeWB16gxJH/Ckc8N33mktu48NSzcDD3WxH78UO4gMxhNPGSCUZQJrg5ORZuLBjlpho1kATyu1Op3Dy9wvjgDbOc4UKSVAqIHkAxYsDxz8jg0Y5IiPyn/bOnX6fEWANk7ZCCbvcyHPrShjAkMWliN7htwZqn27NjftWo5nEzTCj7RG9WvNnAqJ7gPV609eiZYtQmO63p0pzx8hEXeXGYLhuHRorC2wO+oFCpD01cxOj7ztopKFcN4LHu6qaGSKP3YDyUbZPiKlL4Y58fSf750R7QhGMcu702cYQ==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=a/cGgPPIjBoP8cKGbl6Abw5b/p/NWPp8iodhhPKPs4k=; b=MZvxfVlxv2jt7q+XBesfIbq5twChDKa+x2LYtYaNMg1kA0b5m+GfFuT/icjCDYerlzV1I89ofUq5YL0QTHmIoIPEvKx0EPgle9rVscxUCCN0HuOcukeNiDm/UiVW2YsvS7ADSNxoFL0gefHNzei0nZny8RM9ZJYAz110zPyEm1gPkLwrculWYNBh4smuVue2Z2QBI+5Tkius+mo5lUXqrkVTEAUp7InPHoa/e8M5rT9N4/Is/GcIbFawlTYUf88l5QnjSdFmMFeADDEMq/rmhSme4yaXz9AM/i8TssBPtOQyM+mAGyw72XZoK0Yz4FvQBTp3q/XCUqE2/Tfo2GKgJg==<br>\r\nARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none<br>\r\nReceived: from DB8EUR06FT068.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::4f) by DB8EUR06HT014.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::283) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3326.21; Thu, 27 Aug 2020 13:26:47 +0000<br>\r\nReceived: from VI1P191MB0526.EURP191.PROD.OUTLOOK.COM (2a01:111:e400:fc35::53) by DB8EUR06FT068.mail.protection.outlook.com (2a01:111:e400:fc35::378) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3326.19 via Frontend Transport; Thu, 27 Aug 2020 13:26:47 +0000<br>\r\nReceived: from VI1P191MB0526.EURP191.PROD.OUTLOOK.COM ([fe80::d50a:e327:65b5:254d]) by VI1P191MB0526.EURP191.PROD.OUTLOOK.COM ([fe80::d50a:e327:65b5:254d%6]) with mapi id 15.20.3305.032; Thu, 27 Aug 2020 13:26:46 +0000<br>\r\nFrom: Yann Pinout &lt;yann.pinout@hotmail.fr&gt;<br>\r\nTo: &quot;job+2@nltechno.com&quot; &lt;job+2@nltechno.com&gt;<br>\r\nSubject: Candidature alternance<br>\r\nThread-Topic: Candidature alternance<br>\r\nThread-Index: AQHWfHWZqgJ3GwNTPEm4szn8kLbLcg==<br>\r\nDate: Thu, 27 Aug 2020 13:26:46 +0000<br>\r\nMessage-ID: &lt;VI1P191MB05265C2E52666974C20741CE95550@VI1P191MB0526.EURP191.PROD.OUTLOOK.COM&gt;<br>\r\nAccept-Language: fr-FR, en-US<br>\r\nContent-Language: fr-FR<br>\r\nX-MS-Has-Attach: yes<br>\r\nX-MS-TNEF-Correlator: <br>\r\nx-incomingtopheadermarker: OriginalChecksum:E2A057DA755BFF1143316C81E401C6AC30981EDBD197D96507670D304CD1B10D;UpperCasedChecksum:DECF60FFEA4FB84FB505C5ED1A91ABF8C6EC59778EB67D2ABBEC57AB31B6222A;SizeAsReceived:6596;Count:41<br>\r\nx-tmn: [DuuRjaGJNS0aHT0AQB2cpU5gvl+qQtxo]<br>\r\nx-ms-publictraffictype: Email<br>\r\nx-incomingheadercount: 41<br>\r\nx-eopattributedmessage: 0<br>\r\nx-ms-office365-filtering-correlation-id: cbd3a477-d705-4c5d-ea30-08d84a8cd906<br>\r\nx-ms-traffictypediagnostic: DB8EUR06HT014:<br>\r\nx-microsoft-antispam: BCL:0;<br>\r\nx-microsoft-antispam-message-info: Mg40/7NGdNbrVoPstEvZ22wnRDy0simrNhnEpGVQ705RfQqhFb+KqPCY4ZLytLgMhXyBiFbYomXmv62dJ1K8KvjKI9gV7hzi4P1dtTiNBF0m/PRLwydw8zmr3XRJHB/fnSDA46vDLJMpHAHhH8kY/Q9/QwUddGUn76sE8+OnGvQY98PFkAiSkwMBWJjpJNz0d3vKUSynaVf3071GgeCfCw==<br>\r\nx-ms-exchange-antispam-messagedata: IChaingrzWDR/1pt7BYFStJ3tujWzlU0bTjU9H0iG3tNbX+C9Q3u5jKSPP++62uhW1hvcHHdh/Olo4foMECP/JtSdzPuCBBENiuLG3m0F52aBvc4rM+uLGROb46J1uz/JfPHRINloRjqjR9epTh/RA==<br>\r\nx-ms-exchange-transport-forked: True<br>\r\nContent-Type: multipart/mixed; boundary=&quot;_005_VI1P191MB05265C2E52666974C20741CE95550VI1P191MB0526EURP_&quot;<br>\r\nMIME-Version: 1.0<br>\r\nX-OriginatorOrg: outlook.com<br>\r\nX-MS-Exchange-CrossTenant-AuthAs: Anonymous<br>\r\nX-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT068.eop-eur06.prod.protection.outlook.com<br>\r\nX-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000<br>\r\nX-MS-Exchange-CrossTenant-Network-Message-Id: cbd3a477-d705-4c5d-ea30-08d84a8cd906<br>\r\nX-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000<br>\r\nX-MS-Exchange-CrossTenant-originalarrivaltime: 27 Aug 2020 13:26:46.8801 (UTC)<br>\r\nX-MS-Exchange-CrossTenant-fromentityheader: Internet<br>\r\nX-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa<br>\r\nX-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8EUR06HT014 ','2020-08-27 15:26:48','2020-08-27 17:41:02',12,NULL,NULL,NULL,0,NULL,'Yann Pinout','yann.pinout@hotmail.fr',NULL,NULL,NULL,NULL,'VI1P191MB05265C2E52666974C20741CE95550@VI1P191MB0526.EURP191.PROD.OUTLOOK.COM',1,NULL),(114,2,'(PROV114)','Bonjour,\r\n\r\nVous trouverez ci-joint mon CV ainsi que ma lettre de motivation pour le\r\nposte de développeur PHP en contrat d\'apprentissage.\r\n\r\n\r\nJe me tiens à votre disposition pour toute information complémentaire,\r\n\r\nBien cordialement\r\n\r\nKiady Ravleoson\r\n(07 67 01 49 29)',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : ALTERNANCE - Candidature au poste de d&eacute;veloppeur PHP<br>\n&Eacute;metteur (From) : Kiady Ravel &lt;ravelosonk@gmail.com&gt;<br>\nDestinataire(s) (To) : job+2@nltechno.com<br>\n-----<br>\nBonjour,<br>\r\n<br>\r\nVous trouverez ci-joint mon CV ainsi que ma lettre de motivation pour le<br>\r\nposte de développeur PHP en contrat d\'apprentissage.<br>\r\n<br>\r\n<br>\r\nJe me tiens à votre disposition pour toute information complémentaire,<br>\r\n<br>\r\nBien cordialement<br>\r\n<br>\r\nKiady Ravleoson<br>\r\n(07 67 01 49 29)<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job+2@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp610700jal; Thu, 27 Aug 2020 07:19:11 -0700 (PDT)<br>\r\nX-Received: by 2002:a25:d56:: with SMTP id 83mr32640739ybn.33.1598537951183; Thu, 27 Aug 2020 07:19:11 -0700 (PDT)<br>\r\nARC-Seal: i=1; a=rsa-sha256; t=1598537951; cv=none; d=google.com; s=arc-20160816; b=ZwzKaw4MnVkAHwL8ubnIUw/GlIaORtRfE26EPpibjBKpSVyTJHZGTp7vwpoVprMkuj mwWKSJxIKxS1EjFwPXEcIH9YTOmoA6gaXOIbLPnmYReBebR5T3cbmnARAPRL5ggsLuVs XwYSZKQkLMFu7K8CGp3PtKvXB+V/qG1O+2AvXfg17RVsWJJYJ9YlD+gbyrLqvex/nbgw jZBp42X4JF/dMl6bbZsXA805+5Cv6P1zf6VOW3nk/kRRpPLt5DC2GBqU5hSKJ+EO+Yr9 VsRoiE0LtX0gnjKvl57GvjYvy0X1KIm52TlTvV8upS6++6wv6030REb2fS1nr09HnvTP bCiQ==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:subject:message-id:date:from:mime-version:dkim-signature; bh=3Ta+nXkwmF2kTLKH98FJqECXngz2TB6Xjb0yGrWVCYY=; b=KD6g9cDJGZERmxRbQLnXPah8NUuY0EhiJRnCY6LLvoDp1lVCznIwMAD91LT3HFB2pO 5Oe/bHNa+nxgOxvdzJLGW4Gtia5U6o5JARydHHeQSbuNktIngkYgc0TtHrETi1de+aMx mmsSpwtfQ7Lhk7LGqo/t5NXDfXYsIbwBRaJ+mkFAcJwzD6hiMdlMZYM1FNDaQsWsvaAt FfAORX8tK/cJcXTSNZGowjFLVf8oHXN4ARjr3wB++yfyis9c+EqVFZUBKX59YGn+j+T1 CY3QgqgHcnqD/mfSV3rAEl7sZfVyQuteN8euiL6chAeuqoPGVhQ4c8nLOyC3NRIltB5G 2Slw==<br>\r\nARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=M2Z8YJch; spf=pass (google.com: domain of ravelosonk@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=ravelosonk@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nReturn-Path: &lt;ravelosonk@gmail.com&gt;<br>\r\nReceived: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 8sor661456ybc.168.2020.08.27.07.19.11 for &lt;job+2@nltechno.com&gt; (Google Transport Security); Thu, 27 Aug 2020 07:19:11 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of ravelosonk@gmail.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=M2Z8YJch; spf=pass (google.com: domain of ravelosonk@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=ravelosonk@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=3Ta+nXkwmF2kTLKH98FJqECXngz2TB6Xjb0yGrWVCYY=; b=M2Z8YJchWaWTp5XXbO4jl/ei9U5ZPAjvjqDbJQv7ON5Gf18/phfyOW1SQueYdP3Kxz c+xu83jOHDGUxUFPn3dIfQHX8IpxQLLCzBDzs8ZszxROL8ThAU1lVgDgQgtGZQgzl9U4 DhumEjewQowu78hsQ6eQJAQEZmqNbhaOFImsx896YpmCu1N0QHv9zRVL3oCok5koOUjY 0Sz/GiiILkCNjXYShRCw/HNm58Ly6Utma3+fa4FuTIAEcX3zDiXPjQRsLVCHkdF4EVvR t+eGhhOSVHiveuj81TkcRJfiFkAw3B9hXY5drFkaJOp7eoDRmq3EPALqfAWLh1J6Ji/K h80Q==<br>\r\nX-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=3Ta+nXkwmF2kTLKH98FJqECXngz2TB6Xjb0yGrWVCYY=; b=nJC2ShN9VLqMtBPRbRlm3husvf2imeNU7laFgfZg5WYs0Y3vSo/WkL9mcaBwuUhdi8 BbQV/qR7UhtDvueB923cT9FelurvoHCvKn0UY4uvJT3s+SSyjsPFW19aPOpCqW31xdql /cnHlAlAY2eQVDX5eG+WjMwS1zEEkZMlg6UGqI1lp8IW2CpJPxqPdDAzenMWy+DiuUgp jps3cfFtsHnLevpmkU2zOJiQAxTZVxQpYBnGuzqK0dIvzJf9jnsiJPZinZa5quJCm+ej otIyCyAKknWxKrNA2aPl8TCWd4yu+3HtZ/KbPtkupwNWQ0EPjNa0s5aK6BXvbhwr1brJ Kz/g==<br>\r\nX-Gm-Message-State: AOAM5327U2hn1h5xTANlL9o+rnQG5038apwVX7eLCZIP8V7bx+v/oUDA 4ARa1VgCwDGX24I64SupGhCyQfQV2Va2Jf/+BlYX4GAoQXY=<br>\r\nX-Google-Smtp-Source: ABdhPJw5jKFu3PxDsQEH6awgM/aQh9R/2DXNotdMWuEYKuj1ji2PpE8mRWgKOMjidI4oU8Q1umWcmAWg4iUUtmRiXlg=<br>\r\nX-Received: by 2002:a25:7401:: with SMTP id p1mr27127920ybc.10.1598537950315; Thu, 27 Aug 2020 07:19:10 -0700 (PDT)<br>\r\nMIME-Version: 1.0<br>\r\nFrom: Kiady Ravel &lt;ravelosonk@gmail.com&gt;<br>\r\nDate: Thu, 27 Aug 2020 16:18:57 +0200<br>\r\nMessage-ID: &lt;CABrVn-wV=Q49kV_ZyMCv4taWjee-cL=FhPQ=1-AZAhou-Ww5Dg@mail.gmail.com&gt;<br>\r\nSubject: =?UTF-8?Q?ALTERNANCE_=2D_Candidature_au_poste_de_d=C3=A9veloppeur_PH?= =?UTF-8?Q?P?=<br>\r\nTo: job+2@nltechno.com<br>\r\nContent-Type: multipart/mixed; boundary=&quot;000000000000b0724f05addc9e89&quot; ','2020-08-27 16:19:11','2020-08-27 17:41:03',12,NULL,NULL,NULL,0,NULL,'Kiady Ravel','ravelosonk@gmail.com',NULL,NULL,NULL,NULL,'CABrVn-wV=Q49kV_ZyMCv4taWjee-cL=FhPQ=1-AZAhou-Ww5Dg@mail.gmail.com',1,NULL),(115,2,'(PROV115)','Bonjour,\r\n\r\nJe viens de la part de Romain Bourqui, je suis actuellement accepté en\r\nlicence pro à DAWIN sous réserve d\'un contrat d\'alternance. C\'est pourquoi\r\nje vous envoie ce mail pour vous exprimer ma demande d\'alternance au sein\r\nde votre entreprise. Étant un élève motivé et sérieux, j\'aimerais passer\r\nmon année au sein de votre entreprise qui permettrai d\'approfondir mes\r\nconnaissances et compétences professionnelles.\r\n\r\n\r\nMerci d\'avoir pris le temps de lire mon mail et d\'avoir pris connaissance\r\nde ma lettre de motivation et de mon Curriculum Vitae joint ci-dessous.\r\nJe vous souhaite une agréable journée.\r\nCordialement,\r\nSEGUINEAUD-GANCINHO Bryan',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : candidature en alternance<br>\n&Eacute;metteur (From) : Bryan gancinho &lt;gancinhoseguineaudbryan@gmail.com&gt;<br>\nDestinataire(s) (To) : job+2@nltechno.com<br>\n-----<br>\nBonjour,<br>\r\n<br>\r\nJe viens de la part de Romain Bourqui, je suis actuellement accepté en<br>\r\nlicence pro à DAWIN sous réserve d\'un contrat d\'alternance. C\'est pourquoi<br>\r\nje vous envoie ce mail pour vous exprimer ma demande d\'alternance au sein<br>\r\nde votre entreprise. Étant un élève motivé et sérieux, j\'aimerais passer<br>\r\nmon année au sein de votre entreprise qui permettrai d\'approfondir mes<br>\r\nconnaissances et compétences professionnelles.<br>\r\n<br>\r\n<br>\r\nMerci d\'avoir pris le temps de lire mon mail et d\'avoir pris connaissance<br>\r\nde ma lettre de motivation et de mon Curriculum Vitae joint ci-dessous.<br>\r\nJe vous souhaite une agréable journée.<br>\r\nCordialement,<br>\r\nSEGUINEAUD-GANCINHO Bryan<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job+2@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp631024jal; Thu, 27 Aug 2020 07:47:33 -0700 (PDT)<br>\r\nX-Received: by 2002:a7b:c015:: with SMTP id c21mr12179401wmb.87.1598539652642; Thu, 27 Aug 2020 07:47:32 -0700 (PDT)<br>\r\nARC-Seal: i=1; a=rsa-sha256; t=1598539652; cv=none; d=google.com; s=arc-20160816; b=qMxoQicSftnyF5MzWw3yB4QTp/2TCdBuB2TaBc1yAJSmyWnzpBkprqYVHPmeQyk2jI ni6NJyieY5ZcOYePb2Awe3hrXUWkWXTt1DZzPM6rlAdsDd2FBwS8EcKhbocsxs2B3THo iAZvHJBXu/orjDMnQIOfcMATSigu/dk/EeWrpa/BcazGFpUdgDnkXaKAgJYLye5C2BgN dIwdft7K9JKDI2IUKoivmO9m3aM4qlsWd4aFXrWSLCu0zZdSBAiwjtimHJsyW5DEVnIc JxnndKdHO9aShCvSf+rolYhgRFPWwwYG0MUwpNJyDDDmsMOlRWuXzaz1rjt36KnsfBXV iCrg==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:subject:message-id:date:from:mime-version:dkim-signature; bh=I/CDu6k60y7EveaJ7MzaN8Qpwprn3nIb6gm0Snox93A=; b=zdXsxLcOyAgv5VKDsB+dCAnyPgtt1GJ2gDoosEb+/ap8CpdrSjT0aEmjE1VmzmQd/O qBYQ1JNDpPAY3cGH292pTQKs5L/EWXZrxEofjJBOqYJMWTDM3H7lMqZ1yPLYUJd6kPsG 71/uRcDm6f5robVTO8Qa0XOv4dxnhgC2sj7XDlkC6TRCkRDy4H61mJ1A539XKuLM1uL2 MU42Wwq3VTnyFKJ9pORzgZJuiuQXdFlJNMqKvIi7ui1v3+63CgXyKGPkAmLtYrZlmtfW bCNixWcwMS+IInHW9uLC/Bh1pYNW1nceZIWsByH/4tgjmso2hGUya3LksSgwpUUFVuhb 55xw==<br>\r\nARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=&quot;AiSeix/h&quot;; spf=pass (google.com: domain of gancinhoseguineaudbryan@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=gancinhoseguineaudbryan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nReturn-Path: &lt;gancinhoseguineaudbryan@gmail.com&gt;<br>\r\nReceived: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id g70sor1526146wmg.20.2020.08.27.07.47.32 for &lt;job+2@nltechno.com&gt; (Google Transport Security); Thu, 27 Aug 2020 07:47:32 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of gancinhoseguineaudbryan@gmail.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=&quot;AiSeix/h&quot;; spf=pass (google.com: domain of gancinhoseguineaudbryan@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=gancinhoseguineaudbryan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=I/CDu6k60y7EveaJ7MzaN8Qpwprn3nIb6gm0Snox93A=; b=AiSeix/hbW5hK/iyoNdPtz5VOrcgW+T2YiL0+aCogxihJ+UbhYG4ennc3M6kzIkUOw m2vJ5XQL+wY1J3JF9JF1bFXQcPZ+YO1wou043AIDAk0QGpOpkG3lByER8H9IZl5pop8O 3hQjjwJxz0pwlF3Wqqc6aKOelNcNSEgAVGdEWaXwriZZRu+PApcTXGVryonuCIKjnY2o whtFbhUw0U/APkrLjAzbJVQHjVi3m3EYMNTjYhyboXT35TMVRVzQdSqKtPa8dDdRNo/f 3lssrqrjDm+jurRwwQu4psAwfM1a+EhkiVfoJBjfAnUKN6Mvd/UhAZ6lWbSLDiCO0ZNs 3qiQ==<br>\r\nX-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=I/CDu6k60y7EveaJ7MzaN8Qpwprn3nIb6gm0Snox93A=; b=fDjtov1On7DQg0gpYbcOmg8iGI4k0t5ZVThODsIjYaQGn4QN35/7P48e2qZxNpzpHP JRy5U2Vz6zjDe7wr4oedF9Z9VXRqowRWfSOg1KnStV2RBzs22Q+0c71laAZ1eoT//T7v 03/IpTyFE8TnuA/hrkoNbP5nCjzuVqgGwg7ypJRNlh/Z6eTpwHXKRarj+p5HW3NtuUa/ 5t2ZhFuKITASWvgAjdakrJF6wrRXS9vS3wG5I3UhekEdtYx3tLe4wr14XppsvqIkvjCW 7dUytmjufKvATfDItK2AYjA2YFnERtCw0POnlEqKXKZkUbaafdJwySraBshO7jtjlOb5 8OYg==<br>\r\nX-Gm-Message-State: AOAM531p5pKdXTCe5DMRyLe9U4RlNReieKCeNbxGtq7KBDrEPDdWGoOW VPOOPxgRVJ7Hg9hDYyxqg9F88x8lFlwdtrvhfxlLQhNBDcM=<br>\r\nX-Google-Smtp-Source: ABdhPJym2Ff06FxbQ/Ax5s33B4OAI06UcqGsUZgvxSpGVisXUhVvznPK/jOaYG+XUnLc7XOH6jayBWm5xGhRo/i/yFY=<br>\r\nX-Received: by 2002:a7b:c255:: with SMTP id b21mr11869674wmj.41.1598539651594; Thu, 27 Aug 2020 07:47:31 -0700 (PDT)<br>\r\nMIME-Version: 1.0<br>\r\nFrom: Bryan gancinho &lt;gancinhoseguineaudbryan@gmail.com&gt;<br>\r\nDate: Thu, 27 Aug 2020 16:47:19 +0200<br>\r\nMessage-ID: &lt;CABLkQPN-opuG+cxjBcB2jY7BDDuC7v8pWj3_ZkFhkhiRe8apsw@mail.gmail.com&gt;<br>\r\nSubject: candidature en alternance<br>\r\nTo: job+2@nltechno.com<br>\r\nContent-Type: multipart/mixed; boundary=&quot;00000000000017e56205addd040f&quot; ','2020-08-27 16:47:32','2020-08-27 17:41:05',12,NULL,NULL,NULL,0,NULL,'Bryan gancinho','gancinhoseguineaudbryan@gmail.com',NULL,NULL,NULL,NULL,'CABLkQPN-opuG+cxjBcB2jY7BDDuC7v8pWj3_ZkFhkhiRe8apsw@mail.gmail.com',1,NULL),(116,2,'(PROV116)','Bonjour M.Destailleur;\r\nAprès avoir reçu par un mail du responsable de la licence DAWIN, une offre\r\nd\'alternance concernant votre entreprise, je me permet de vous adresser,\r\npar ce mail, ma candidature à cette offre d\'alternance développeur web.\r\nEn effet, à partir de Septembre 2020, je souhaite intégrer la Licence\r\nProfessionnelle (en alternance) DAWIN de l\'IUT de Bordeaux.\r\nJe vous transmet donc en pièce jointe mon CV ainsi que ma lettre\r\nde motivation.\r\n\r\nCordialement\r\nLAVEAU Kevin',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Alternance D&eacute;veloppeur PHP LAVEAU Kevin<br>\n&Eacute;metteur (From) : Kevin LAVEAU &lt;kevinlaveau7@gmail.com&gt;<br>\nDestinataire(s) (To) : job+2@nltechno.com<br>\n-----<br>\nBonjour M.Destailleur;<br>\r\nAprès avoir reçu par un mail du responsable de la licence DAWIN, une offre<br>\r\nd\'alternance concernant votre entreprise, je me permet de vous adresser,<br>\r\npar ce mail, ma candidature à cette offre d\'alternance développeur web.<br>\r\nEn effet, à partir de Septembre 2020, je souhaite intégrer la Licence<br>\r\nProfessionnelle (en alternance) DAWIN de l\'IUT de Bordeaux.<br>\r\nJe vous transmet donc en pièce jointe mon CV ainsi que ma lettre<br>\r\nde motivation.<br>\r\n<br>\r\nCordialement<br>\r\nLAVEAU Kevin<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job+2@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp636007jal; Thu, 27 Aug 2020 07:55:10 -0700 (PDT)<br>\r\nX-Received: by 2002:a17:906:c7cd:: with SMTP id dc13mr20977219ejb.446.1598540110546; Thu, 27 Aug 2020 07:55:10 -0700 (PDT)<br>\r\nARC-Seal: i=1; a=rsa-sha256; t=1598540110; cv=none; d=google.com; s=arc-20160816; b=xBKHL5RUO+LL+YUTo/q2v35yBLkyrZ3aN4V0OeZ1+as/Ndp12w/r8hmIsQ3RRAJBRn luPCD0D2XUTxM8G7o17WtXITzbd1u6eLqf6unqd50L62gtHbNQsXnG+gFSqHqgDafwRk +JthoU4wGE6dVb1xfm81/f/b5vHcJHUiCDGp1nnOsgW67s8/1t1MQZQqQr/c7HGBK2xO n9boAzj6oX75+MGMM/aHjw2DqufwSZ85WUFreSfn4b9TawpIwPmOhcO3xLFQ9olyVJRs r/GjEDIIJUvW7hXIS1SjTWJWCiwBDDUTKAuzTaW6oIl6WcvmkZ5fCBgdASFzZs2/f9M2 fWXQ==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:subject:message-id:date:from:mime-version:dkim-signature; bh=Fi9XE+VZ9w2StOAIZNaBrAYz+o4ULZvNJ6gYoS1aGPI=; b=LpcVH6a9YM9zM0scyiXzcvxIFWYGRcG7nTkqdflSpuYvfi25o6ADmPh3XDQEXlKazn Unyu+CmpE8BLmfdw2Kam1QGp/Bul1urfG00jSWP+CeQ1d9kynRVXTINZBpDWWY0WXf0/ XTvbyG9R8Uebn+szg0caqdi3JtZ6Jn+/E8jNNlxSqoC6KEIdd57qVO8eZGU4JZ5wrQ4e 2+KXO11AQaLyxFYO3pXsBIUEd3lnDpONKBJ+QjFMqB0TQ0GASozIOnw63ps7JrzLwIr6 IvuTtU1nPJNhZWYGoae/dZnnSs040BSrZ2B+w9INMT4Xgxb1bPyJ4Gle0doCgbp4JrF/ iw8w==<br>\r\nARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=qa6yRd6D; spf=pass (google.com: domain of kevinlaveau7@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=kevinlaveau7@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nReturn-Path: &lt;kevinlaveau7@gmail.com&gt;<br>\r\nReceived: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id h4sor1324507edq.11.2020.08.27.07.55.10 for &lt;job+2@nltechno.com&gt; (Google Transport Security); Thu, 27 Aug 2020 07:55:10 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of kevinlaveau7@gmail.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=qa6yRd6D; spf=pass (google.com: domain of kevinlaveau7@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=kevinlaveau7@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=Fi9XE+VZ9w2StOAIZNaBrAYz+o4ULZvNJ6gYoS1aGPI=; b=qa6yRd6DuNfaiRQsw2Tnz4T6DpSEbEGYzy4pu86wjTfcUtbM2vARcgsIydE0y7BEB3 Wi5bomaH7+Yq8N804CfvC70UIm7vayuuViCkyuWBhkLEkd7qRGsdoSxr+JLsqmQl7Phs yw+0gRAVokpooSA4IiH83j/qDGwEx3rgFx1i+OpSmmb8nqlqzxAnOMEJY6iTXFAh3f2T m9AhNUtAIVZJnH9xwETM3cvtSMfz7+Ft+zegY0ENWjcIESEarFvTHzJWQgm//vHcSLuX FreFYv3K8ir1cpPefYeqo7ttK8roR/LpzXrP0C81LcJnxD9riWKAtJWRzhzZrfIsczW6 5mBw==<br>\r\nX-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=Fi9XE+VZ9w2StOAIZNaBrAYz+o4ULZvNJ6gYoS1aGPI=; b=bF7+sfiU3fpM/JZ9ka5bZ4ReQbg09+nEH8qcHpXUSRc059NOmwW040u1Dn6Nu88L53 4D7htPaggO/MdYEp9T6xn8Et7QMSSvvX9aY3qgxgnxKKVCUWOwW/9x27TQa5L7dkpH2k gNCZk/r79qfbrgm3+dbpmNKDGXIQPxSgGP+Q++tt81rIs6ySTGOyl0s0gpzJyzyBI3h1 ojpAEhlvfedN4/EaVc/Ts+fTCNsBFUzh9ZkjC/1icraeoLF27Yil4k73FCGNRTMPZXDl 9uVZnrW2VCQckK6wow8UCgoncK6uPQeypPvMMHdjzWAUcsiVL34yDCjGWKs2i1HJqluN Z4Gg==<br>\r\nX-Gm-Message-State: AOAM533ZFZMPr5+lVl8fU0njyAMtKAasYW5UQPJs+j8Lv3YQrhxtc97E DPa8VOxuOOxitMfGULaNhAZRIgItRIlvEUsruvubOcomPfA0WQ==<br>\r\nX-Google-Smtp-Source: ABdhPJyDOf5at1wKDEqXo/jsxH3qZP1fEuuH3B7G56S1jLv5m+HeKqN+8kr+MM6/dzBOX32qKAvCQ2XZfXFbDfa5psQ=<br>\r\nX-Received: by 2002:a50:b022:: with SMTP id i31mr10072863edd.17.1598540109459; Thu, 27 Aug 2020 07:55:09 -0700 (PDT)<br>\r\nMIME-Version: 1.0<br>\r\nFrom: Kevin LAVEAU &lt;kevinlaveau7@gmail.com&gt;<br>\r\nDate: Thu, 27 Aug 2020 16:55:00 +0200<br>\r\nMessage-ID: &lt;CAPwqOJ1CHZc4EJqypfYnkdfS8Q94Nqi18H7-0yJB28HERhcQYw@mail.gmail.com&gt;<br>\r\nSubject: =?UTF-8?Q?Alternance_D=C3=A9veloppeur_PHP_LAVEAU_Kevin?=<br>\r\nTo: job+2@nltechno.com<br>\r\nContent-Type: multipart/mixed; boundary=&quot;00000000000062757305addd1ff2&quot; ','2020-08-27 16:55:10','2020-08-27 17:41:10',12,NULL,NULL,NULL,0,NULL,'Kevin LAVEAU','kevinlaveau7@gmail.com',NULL,NULL,NULL,NULL,'CAPwqOJ1CHZc4EJqypfYnkdfS8Q94Nqi18H7-0yJB28HERhcQYw@mail.gmail.com',1,NULL),(117,2,'(PROV117)','Bonjour, Je candidate pour vos offres d\'alternances dans le cadre d\'une licence professionnelle en alternance DAWIN (fca-agen-gradignan@iut.u-bordeaux.fr).Veuillez trouver ci-joint mon CV et ma lettre de motivartion.Cordialement.',NULL,'RecordCreatedByEmailCollector<br>\n-----<br>\nSujet du mail : Candidature en alternance<br>\n&Eacute;metteur (From) : &quot;jin.eric@yahoo.com&quot; &lt;jin.eric@yahoo.com&gt;<br>\nDestinataire(s) (To) : &quot;job+2@nltechno.com&quot; &lt;job+2@nltechno.com&gt;<br>\n-----<br>\nBonjour, Je candidate pour vos offres d\'alternances dans le cadre d\'une licence professionnelle en alternance DAWIN (fca-agen-gradignan@iut.u-bordeaux.fr).Veuillez trouver ci-joint mon CV et ma lettre de motivartion.Cordialement.<br>\n<br>\n<br>\n----- Header<br>\nDelivered-To: job+2@nltechno.com<br>\r\nReceived: by 2002:a05:6638:f91:0:0:0:0 with SMTP id h17csp648782jal; Thu, 27 Aug 2020 08:11:12 -0700 (PDT)<br>\r\nX-Google-Smtp-Source: ABdhPJyLFA/2MwX3iljH81gYzkqT3qy7VScedLIVRO4MMKmS5AZZhS7XVgwDq2an5/HzXsfLb22v<br>\r\nX-Received: by 2002:aed:26a1:: with SMTP id q30mr11682472qtd.25.1598541071486; Thu, 27 Aug 2020 08:11:11 -0700 (PDT)<br>\r\nARC-Seal: i=1; a=rsa-sha256; t=1598541071; cv=none; d=google.com; s=arc-20160816; b=IshkT26Ufas69FDt73sTXcSzo3gHbpOSvf+vsv6R0sewS5wg8wFBm32gQI2+PViYoP 0nQLTflG5npaHmXb9yagCqzkjvu68rEi+TAYNQ41w6oqVVNUsK8iQL/jOHo6PvyveHNz oPkOb2kYmlmkR3MtMcXEIEGTm3jxSGwj3eBqzrSEoTv+WO3N3TQa8xAtjyvNklbiPO51 Og87lRs23cd2VTSvPL0wx/hwRyow3rFSps2ThPe5gPX0DiUYGBbfbTPRicm8o4aM7ovK lajwGWAUoLfFLt2nY9s+GnPal2O9UpFG4ibImU0uWzzv2qp3Osk2NfT9H5S7nDupOUHV j0Vg==<br>\r\nARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:mime-version:subject:message-id:to:reply-to:from:date :dkim-signature; bh=w1y09eWWu03qRFSuxaxVcBTZGQXNPt3yMZ4O2EFfVBc=; b=x40Dou9oL6/WiklLTqC1t6gT786d9nY0j4GOQPADHh6dqUJ/vTi7elbnLPfNr3L+v3 CLsqQmhSAduJnXS6xi4sQsuijqMbxv8Bns84NUZ2frCWUTjZsFtbSrJV7nHxDqPwNvE2 l/THdWhXu9QmM6/EVnmCw81r7CmRSqimvIBnQJFEHkSq+SIoNN5JG43pPKxC+cEHyvsh NxTTbSiUX5Y4GohxdnF1zQFBLtJlv9EZPIDuJHPkzrWSnGh+AB9wc7dWmaG387CUy2p7 HlJqyFAr/L4p36ArQt66HCNOiGNQNmRmlazrgJwTOKc/q2f+juuW47+MHB5BUnWVDZ/j PnTA==<br>\r\nARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@yahoo.com header.s=s2048 header.b=&quot;D/+08XUN&quot;; spf=pass (google.com: domain of jin.eric@yahoo.com designates 74.6.132.123 as permitted sender) smtp.mailfrom=jin.eric@yahoo.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=yahoo.com<br>\r\nReturn-Path: &lt;jin.eric@yahoo.com&gt;<br>\r\nReceived: from sonic314-13.consmr.mail.bf2.yahoo.com (sonic314-13.consmr.mail.bf2.yahoo.com. [74.6.132.123]) by mx.google.com with ESMTPS id x4si1438763qkf.72.2020.08.27.08.11.11 for &lt;job+2@nltechno.com&gt; (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Aug 2020 08:11:11 -0700 (PDT)<br>\r\nReceived-SPF: pass (google.com: domain of jin.eric@yahoo.com designates 74.6.132.123 as permitted sender) client-ip=74.6.132.123;<br>\r\nAuthentication-Results: mx.google.com; dkim=pass header.i=@yahoo.com header.s=s2048 header.b=&quot;D/+08XUN&quot;; spf=pass (google.com: domain of jin.eric@yahoo.com designates 74.6.132.123 as permitted sender) smtp.mailfrom=jin.eric@yahoo.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=yahoo.com<br>\r\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1598541071; bh=w1y09eWWu03qRFSuxaxVcBTZGQXNPt3yMZ4O2EFfVBc=; h=Date:From:Reply-To:To:Subject:References:From:Subject; b=D/+08XUNoekk67Io7AqUyWTJOuz431sr0ms+Cf98ev9BMHwb1F0WW4JgulcbPV3wqaoE5FrumhwuPLIsSRmVvHH8Wh5pliu2OTVBwrunIYM1q8KFVk+jW6DjLCz6EfcyXkwQU/e2WA5ivD+RcBXUByrfqfifAIIUQuSpb2hxLvID5jIR1hvuWBtVg8kgBpx0Y/6D0d0sR+R7dLpzObu9nbhRF487l5jP6ohcIR+ks3Gta6HEZB2pbidrCzWgLmjetbTMO40y9LjNCBMEm8bHKyJ46Y5fWJVxWsm8OmLdytnXMG6g7jrGBHoOlXZh+CQFalQQlc2JMsA+qjUO7BJ/rA==<br>\r\nX-YMail-OSG: ue6lYwkVM1lviuq4QILkqlp_QCRF9lDPlD5InpTwgP2BmZQUJu1qIWbmb85Bl1v fGn2wxQjThn3DHpHwgfhR03nTmAGk03j2jymF4y_NLP9lDtpy8_0pc2iikUX84XEdLw_9MzET_3I PFZK6zT5AXoHySY9adKep_ojPN.dg1ct1LbK0V2wuApgat2UOLoLR9qzX9O8HPGi_VQ8.xHkDUlt LVzthAzmCwRPW8Xy4AAPx8soXBmCQcnQoOLNG6tqTPohIwqsslbr1g.5ZunzsIZ.JUsJwbAGHQXi AnmKaEIBEPwM9vFdJF7KRrOGx7ATJ9BwF.vMY7ltOXpYFdt7YOWO7pM4IvlGeO0Q0UIUavYWhq2W oBG9HB1vI4jpwwZo8fl0f18vbNwK881HP716M9YSq91MCSjMQgij6WIU2QPwqgyTk2qw2_YHRttQ otbqQnGjLiK6.ycFGN9KYtH8VOm28Czim6mE7.WoVyaXON5i.IdNPRyJt1s6Eh.qCVHGHivGa5XQ oZHNUT5PwdpHDymaj6spizS8ZAQNdJdn05WiZ4a4JpLElAxqYUsmNMCWAGp6XQidC0rq8bkyMYz6 pQFC5OnoFb1cV93I09KJZmo_5sjhkas_Cnq3aB6rE_SJ8fZt8EJOxWdwsbUX2Z8emZnCsO.p0SZv cH86uVvkcmK_ODCDTG6v1bs3dxyRkDdGzlLe8uKEdMw6bRRttwaLhzCqrQXpR5DNSLOL3K1BqkkS 1pBDk4dAYes0udKtN1Libs7LIHuMj3sb230ngXeUPUhaLWnRFR_X0LlCUG9LITsom1avU4zQFCwl ZUMQidVycXmXmWDtFziTBOWeO_86XoZhM42G4U.uqcnSNPuCsL.2kG5ihcEncoutj3jE7aG8GtA7 9AVdIdgNOhF16tOZX2uELlVdxSFH0qcrvzhrppgtDe1IeFI1oaJMB1u9imVbWOhhRB0i.lf.0eH4 mFYCn.9Up2.5jnIu5jsFZCmapywTjtw8oKYxYcNcXBSCV78971NIhDfvLXjdtaEutkSVjSRBlQwV h4nOoSO.KBH5bWzNVEqq5.._z3vgKNNvcZGfzoDlFxz4aEGVrGmb5F2YH3plU2xtvkUxgVN4rroU JBf2WfX1B9xcCH6glCYQo0ZEmwk7GKFJ1Em1Fn_K28vmo_QQ1fBEbwuGR9EXFCDqGHG3Tp..Rcft _3g2gr.VywbY3QT3IOpYqr4Xpwbicp3njrx.MJxVn2K.fosJwxus.cKjtgWD9aAKuv_Thy.S9rn. LRCz9wsgZkAWnSB2cTImZQmmoaF1z5Kxq8H4_VEw4u8c34GaW9trHfn15F50lR2yVloVsAJemTMa 1DBUppiZi.ICgzFUtq2GWwpdHP_ABFiMsK.gN6L9xhGfaTNS6ejrZZ.z5OQIDspqFdRbHDP8IerE WAUQW6PPOW_yQHvHRQOp.mGV4HQR_I3GPACB6NVMTxuO5VaCfDKCGulpvs4FbkeLj3h0Yf0ZdOpx ekNnmFTJe1d.dxYjYDugeYkfII5Jce6fht8Srb2cHATb_cWYW3vyZ3UVNXjvWNoyqFz2S5ecCipV ojoDZiBKrm5__hXbvgfKFJDmt09Z5R9s-<br>\r\nReceived: from sonic.gate.mail.ne1.yahoo.com by sonic314.consmr.mail.bf2.yahoo.com with HTTP; Thu, 27 Aug 2020 15:11:11 +0000<br>\r\nReceived: by smtp406.mail.ir2.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 1f3cd8c72f2a3b257cf22434abc681fc; Thu, 27 Aug 2020 15:11:04 +0000 (UTC)<br>\r\nX-YMail-OSG: qGTTPlkVM1lZU2Uk2UwC95cgQILo5d7Lod5o57WnrIxSzNo426qHaswkkGk66Eo yDGppWQo9Xp5rOCezmVwgZDZjhC0HL7lDzRq4kq5hW_FkWuhbn4FFqkY1oS9huwd4MyO85jzHmQq jBWceTjqigMriq7EFDzfBSbnS65tP_A434DVmee2H14RqMOJG7rvCaPQ82o5Jp9a2YYeWb.ulXdy WxWkEVnUhU4xLLL50VJ9r1EvShaK6smW.5s2LU0zY0s3v0lUHJe8cD.29iCoC7rVrX2C7Ws2d.NA P7zJ.oaj045Z5fjqSTPYfvpuU9._RYv9bispIDdyrhYCtm8r.5UFleOCZWQ30T8q5Fp_U8IT2CqN 81CHdVHNaWbORUzQe.djyJnEOJxOr__yeFbbY5rJGD6rxoYV09.H4aqrFl.fOhKtsFsPquKs6bFD ocbfWFX2M9DEcQZzIzV3b2DKsFNwN9OTkfeWSVTI7BqNxxr4G6arDKW87m.feriqb2DgoA9hcM5_ Ll5XtactOQAXGa312Yk35_e4uPdbBgHTpogC9VLO3agpMRMtClXMaPrwXBhdRT5pkxhqUFW3sE7_ nxR2Rgy7.mR90EtMSEXeRmqgqYbPWNLcg3zrA79AKGVhxFXiOiajXMKNiYLU81eh5ETI4QV9ngdF DT2MqgwQhj1VMiTOzU3qUH4ywbT8kvJFiCFw69ttyvesGH_9hFiQ8kdKhRB1wDaSo8De3ogXTVy4 2cqYLzU.AW.Le1G5WKwLUYanLfp_7h7.1WBosC9qYZA48f.J2aQCJz9dPokmYN6b3Ctxz7c3igPM L8vec8waEefiZpytXF9NpWuHRMwb3eFNQaametpBJjsBrRYvM494.vXHO8MVrKcup8Ud1aX7ETB4 .is3SXYiOoCjtzOqoapi_tzrKhMHLw6J_Cb40NR6XId_jPCAd6vfy_hhGzNAHqErm1s2WNVwJ6NS i7poTfG1htzJdIx2O_o1f27ok9aWu8YHaHdaMAwdPqnNkUwOJnqUjMAGpMGLmJkKW1ztzGocJNpW A4NI8Zer7tKDzezI6naU8Ix_668VVWCld.1Sv_91aPyJ6eFr6O4GQcg.tAo83_u4DfgQrwAHPhqE QFfV3i_hADtTpX9XnXi4jpBVxy9LglF9UvctVWC5vrp2r1P8IIniKB1aFggy_OirFUzc8cRM2xZp zwD2jXRnK3Yw1IVOPgZr79SdLB_5sFBjQ_KqwWmWiGgz8.DRrKJ1.6wKCDvbQzaY.gFpZkrxuc6V 8yIZs4LA1CMC0S9ZTP89LQg6dk_pcPyM4m71QxV.6aVItr1MMRNUYRKFIHJc2_Z9KdGNzs4id7ZJ 6SlX6SRTW9XToibVeW3bNAIzzS.cmKQD.CdUxxpJcLpd6jEbi6ojaufqik.BGVAOCySeoYYyzY7c vLF6o.ymJLTsPSdlZHNRdeYZ5BU2xtHLiOpxynANNLqZTLubf47I1pR6keabXVAh34vKObSrcsq4 c4sG._JRG8B4AlA--<br>\r\nReceived: from sonic.gate.mail.ne1.yahoo.com by sonic303.consmr.mail.ir2.yahoo.com with HTTP; Thu, 27 Aug 2020 15:11:04 +0000<br>\r\nDate: Thu, 27 Aug 2020 15:10:33 +0000 (UTC)<br>\r\nFrom: &quot;jin.eric@yahoo.com&quot; &lt;jin.eric@yahoo.com&gt;<br>\r\nReply-To: &quot;jin.eric@yahoo.com&quot; &lt;jin.eric@yahoo.com&gt;<br>\r\nTo: &quot;job+2@nltechno.com&quot; &lt;job+2@nltechno.com&gt;<br>\r\nMessage-ID: &lt;2058424704.10527227.1598541033397@mail.yahoo.com&gt;<br>\r\nSubject: Candidature en alternance<br>\r\nMIME-Version: 1.0<br>\r\nContent-Type: multipart/mixed; boundary=&quot;----=_Part_10527226_1469689446.1598541033397&quot;<br>\r\nReferences: &lt;2058424704.10527227.1598541033397.ref@mail.yahoo.com&gt;<br>\r\nX-Mailer: WebService/1.1.16455 YMailNorrin Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.135 Safari/537.36<br>\r\nContent-Length: 89671 ','2020-08-27 17:11:11','2020-08-27 17:41:11',12,NULL,NULL,NULL,0,NULL,'\"jin.eric@yahoo.com\"','jin.eric@yahoo.com',NULL,NULL,NULL,NULL,'2058424704.10527227.1598541033397@mail.yahoo.com',1,NULL);
 /*!40000 ALTER TABLE `llx_recruitment_recruitmentcandidature` ENABLE KEYS */;
 UNLOCK TABLES;
 

From 716bb433e8e576edd730f379176b7342eab7a1e5 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Thu, 10 Dec 2020 15:50:18 +0100
Subject: [PATCH 331/888] ajout pictogramme graph dans info box head

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

diff --git a/htdocs/core/boxes/box_funnel_of_prospection.php b/htdocs/core/boxes/box_funnel_of_prospection.php
index 44b2bd9a90d..e75e8959a03 100644
--- a/htdocs/core/boxes/box_funnel_of_prospection.php
+++ b/htdocs/core/boxes/box_funnel_of_prospection.php
@@ -139,7 +139,7 @@ class box_funnel_of_prospection extends ModeleBoxes
 
 		$this->info_box_head = array(
 			'text' => $langs->trans("Statistics") . ' - ' . $langs->trans("OpportunitiesStatusForOpenedProjects"),
-			$max
+			'graph' => '1'
 		);
 
 		if ($user->rights->projet->lire || !empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
@@ -224,7 +224,7 @@ class box_funnel_of_prospection extends ModeleBoxes
 					$dolgraph->SetType(array('horizontalbars'));
 					$dolgraph->SetHeight('200');
 					$dolgraph->SetWidth('600');
-					$dolgraph->mode='depth';
+					$dolgraph->mode = 'depth';
 					$dolgraph->draw('idgraphstatus');
 					$stringtoprint .= $dolgraph->show($totaloppnb ? 0 : 1);
 				}

From c850f4c91823ffe35a9ef15645a69438637a2c80 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Dec 2020 16:01:06 +0100
Subject: [PATCH 332/888] Fix fatal error

---
 htdocs/admin/emailcollector_card.php | 6 ++++--
 htdocs/langs/en_US/errors.lang       | 2 ++
 htdocs/langs/en_US/ticket.lang       | 1 -
 htdocs/public/recruitment/index.php  | 3 ++-
 htdocs/public/recruitment/view.php   | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index 9e8b957d541..adfaaf4f816 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -412,13 +412,15 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		$morehtml .= $form->textwithpicto('', 'connect string '.$connectstringserver);
 	} else {
-		$morehtml .= 'IMAP functions not available on your PHP';
+		$morehtml .= 'IMAP functions not available on your PHP. ';
 	}
 
 	if (!$connection)
 	{
 		$morehtml .= 'Failed to open IMAP connection '.$connectstringsource;
-		$morehtml .= '<br>'.imap_last_error();
+		if (function_exists('imap_last_error')) {
+			$morehtml .= '<br>'.imap_last_error();
+		}
 		//var_dump(imap_errors())
 	} else {
 		$morehtml .= imap_num_msg($connection);
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 056c9240bd0..501a3005860 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -251,6 +251,8 @@ ErrorLoginDateValidity=Error, this login is outside the validity date range
 ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
 ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
 ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index cf370fbdca0..68a8f708741 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -231,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/public/recruitment/index.php b/htdocs/public/recruitment/index.php
index 504ecadfc71..204d3bf3140 100644
--- a/htdocs/public/recruitment/index.php
+++ b/htdocs/public/recruitment/index.php
@@ -71,7 +71,8 @@ $user_assign = new User($db);
 $user_create = new User($db);
 
 if (!$conf->global->RECRUITMENT_ENABLE_PUBLIC_INTERFACE) {
-	print '<div class="error">'.$langs->trans('PublicInterfaceForbidden').'</div>';
+	$langs->load("errors");
+	print '<div class="error">'.$langs->trans('ErrorPublicInterfaceNotEnabled').'</div>';
 	$db->close();
 	exit();
 }
diff --git a/htdocs/public/recruitment/view.php b/htdocs/public/recruitment/view.php
index d8b2a4280cf..b8858b921e9 100644
--- a/htdocs/public/recruitment/view.php
+++ b/htdocs/public/recruitment/view.php
@@ -156,7 +156,8 @@ $conf->dol_hide_topmenu = 1;
 $conf->dol_hide_leftmenu = 1;
 
 if (!$conf->global->RECRUITMENT_ENABLE_PUBLIC_INTERFACE) {
-	print '<div class="error">'.$langs->trans('PublicInterfaceForbidden').'</div>';
+	$langs->load("errors");
+	print '<div class="error">'.$langs->trans('ErrorPublicInterfaceNotEnabled').'</div>';
 	$db->close();
 	exit();
 }

From c2124479c7797aa1737aebde989eb6e8817509ad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Dec 2020 16:05:43 +0100
Subject: [PATCH 333/888] Fix missing test on IMAP

---
 htdocs/admin/system/phpinfo.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index 03f5c60f607..cf38687f66f 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -191,6 +191,16 @@ if (empty($_SERVER["SERVER_ADMIN"]) || $_SERVER["SERVER_ADMIN"] != 'doliwamp@loc
 	print "</tr>";
 }
 
+$functions = ["imap_open"];
+$name      = "IMAP";
+
+print "<tr>";
+print "<td>".$name."</td>";
+print getTableColumn($name, $loadedExtensions);
+print getTableColumnFunction($functions);
+print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
+print "</tr>";
+
 $functions = array();
 $name      = "xDebug";
 
@@ -346,7 +356,7 @@ function getResultColumn($name, array $activated, array $loaded, array $function
 	}
 
 	$html = "<td>";
-	$html .= $result ? $langs->trans("PHPSupport", $name) : $langs->trans("ErrorPHPDoesNotSupport".$name);
+	$html .= $result ? $langs->trans("PHPSupport", $name) : $langs->trans("ErrorPHPDoesNotSupport", $name);
 	$html .= "</td>";
 
 	return $html;

From 693a7590ef28e4b1711887de43a1739f1f08272b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Dec 2020 17:09:25 +0100
Subject: [PATCH 334/888] Fix boxes

---
 htdocs/core/boxes/box_birthdays.php | 5 ++++-
 htdocs/langs/en_US/boxes.lang       | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/boxes/box_birthdays.php b/htdocs/core/boxes/box_birthdays.php
index dcb3fefe13a..9a2ccd33cf7 100644
--- a/htdocs/core/boxes/box_birthdays.php
+++ b/htdocs/core/boxes/box_birthdays.php
@@ -86,7 +86,7 @@ class box_birthdays extends ModeleBoxes
 		{
 			$tmparray = dol_getdate(dol_now(), true);
 
-			$sql = "SELECT u.rowid, u.firstname, u.lastname, u.birth";
+			$sql = "SELECT u.rowid, u.firstname, u.lastname, u.birth, u.email, u.statut as status";
 			$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 			$sql .= " WHERE u.entity IN (".getEntity('user').")";
 			$sql .= " AND u.statut = 1";
@@ -104,10 +104,13 @@ class box_birthdays extends ModeleBoxes
 				while ($line < $num)
 				{
 					$objp = $this->db->fetch_object($result);
+
 					$userstatic->id = $objp->rowid;
 					$userstatic->firstname = $objp->firstname;
 					$userstatic->lastname = $objp->lastname;
 					$userstatic->email = $objp->email;
+					$userstatic->statut = $objp->status;
+
 					$dateb = $this->db->jdate($objp->birth);
 					$age = date('Y', dol_now()) - date('Y', $dateb);
 
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index 236d97da521..1e91080962e 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -104,6 +104,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Accountancy
 ValidatedProjects=Validated projects

From d9682df682254fa2096774b4ac00d535533d6e45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 10 Dec 2020 17:37:44 +0100
Subject: [PATCH 335/888] hide also topmenu if disabled

---
 htdocs/core/js/lib_foot.js.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/core/js/lib_foot.js.php b/htdocs/core/js/lib_foot.js.php
index d04379210a6..8419f76bfc1 100644
--- a/htdocs/core/js/lib_foot.js.php
+++ b/htdocs/core/js/lib_foot.js.php
@@ -196,3 +196,7 @@ print '
 					}
 				});
 			});'."\n";
+// hide topmenus disabled
+if (!empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) && (!$user->admin)) {
+    print '$("li:has(.tmenudisabled)").hide();';
+}

From df4d2e1b24993ab40dc46169825ac633147c9a25 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Dec 2020 18:13:30 +0100
Subject: [PATCH 336/888] Fix path of user photo

---
 htdocs/core/class/html.form.class.php | 36 ++++++++++++---------------
 htdocs/core/lib/functions.lib.php     | 15 ++++++-----
 2 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 8faad1f92e9..b647a7e6685 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7560,41 +7560,37 @@ class Form
 		if ($modulepart == 'societe')
 		{
 			$dir = $conf->societe->multidir_output[$entity];
-			if (!empty($object->logo))
-			{
-				if ((string) $imagesize == 'mini') $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.getImageFileNameForSize($object->logo, '_mini'); // getImageFileNameForSize include the thumbs
-				elseif ((string) $imagesize == 'small') $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.getImageFileNameForSize($object->logo, '_small');
-				else $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.$object->logo;
-				$originalfile = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.$object->logo;
+			if (!empty($object->logo)) {
+				if ((string) $imagesize == 'mini') $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'logos/'.getImageFileNameForSize($object->logo, '_mini'); // getImageFileNameForSize include the thumbs
+				elseif ((string) $imagesize == 'small') $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'logos/'.getImageFileNameForSize($object->logo, '_small');
+				else $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'logos/'.$object->logo;
+				$originalfile = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'logos/'.$object->logo;
 			}
 			$email = $object->email;
-		} elseif ($modulepart == 'contact')
-		{
+		} elseif ($modulepart == 'contact')	{
 			$dir = $conf->societe->multidir_output[$entity].'/contact';
 			if (!empty($object->photo))
 			{
-				if ((string) $imagesize == 'mini') $file = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.getImageFileNameForSize($object->photo, '_mini');
-				elseif ((string) $imagesize == 'small') $file = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.getImageFileNameForSize($object->photo, '_small');
-				else $file = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.$object->photo;
-				$originalfile = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.$object->photo;
+				if ((string) $imagesize == 'mini') $file = get_exdir(0, 0, 0, 0, $object, 'contact').'photos/'.getImageFileNameForSize($object->photo, '_mini');
+				elseif ((string) $imagesize == 'small') $file = get_exdir(0, 0, 0, 0, $object, 'contact').'photos/'.getImageFileNameForSize($object->photo, '_small');
+				else $file = get_exdir(0, 0, 0, 0, $object, 'contact').'photos/'.$object->photo;
+				$originalfile = get_exdir(0, 0, 0, 0, $object, 'contact').'photos/'.$object->photo;
 			}
 			$email = $object->email;
 			$capture = 'user';
-		} elseif ($modulepart == 'userphoto')
-		{
+		} elseif ($modulepart == 'userphoto') {
 			$dir = $conf->user->dir_output;
 			if (!empty($object->photo))
 			{
-				if ((string) $imagesize == 'mini') $file = get_exdir(0, 0, 0, 0, $object, 'user').$object->id.'/'.getImageFileNameForSize($object->photo, '_mini');
-				elseif ((string) $imagesize == 'small') $file = get_exdir(0, 0, 0, 0, $object, 'user').$object->id.'/'.getImageFileNameForSize($object->photo, '_small');
-				else $file = get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/'.$object->photo;
-				$originalfile = get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/'.$object->photo;
+				if ((string) $imagesize == 'mini') $file = get_exdir(0, 0, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_mini');
+				elseif ((string) $imagesize == 'small') $file = get_exdir(0, 0, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_small');
+				else $file = get_exdir(0, 0, 0, 0, $object, 'user').$object->photo;
+				$originalfile = get_exdir(0, 0, 0, 0, $object, 'user').$object->photo;
 			}
 			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile = $object->id.".jpg"; // For backward compatibility
 			$email = $object->email;
 			$capture = 'user';
-		} elseif ($modulepart == 'memberphoto')
-		{
+		} elseif ($modulepart == 'memberphoto')	{
 			$dir = $conf->adherent->dir_output;
 			if (!empty($object->photo))
 			{
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e22f68d15de..ea62a4d6f6f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1697,7 +1697,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 							$phototoshow .= '</div>';
 						}
 					}
-				} elseif (!$phototoshow) {
+				} elseif (!$phototoshow) { // example if modulepart = 'photo'
 					$phototoshow .= $form->showphoto($modulepart, $object, 0, 0, 0, 'photoref', 'small', 1, 0, $maxvisiblephotos);
 				}
 
@@ -5555,10 +5555,10 @@ function yn($yesno, $case = 1, $color = 0)
 
 /**
  *	Return a path to have a the directory according to object where files are stored.
- *  New usage:       $conf->module->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, '')
- *         or:       $conf->module->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, '')     if multidir_output not defined.
- *  Example our with new usage:       $object is invoice -> 'INYYMM-ABCD'
- *  Example our with old usage:       '015' with level 3->"0/1/5/", '015' with level 1->"5/", 'ABC-1' with level 3 ->"0/0/1/"
+ *  New usage:       $conf->module->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, '').'/'
+ *         or:       $conf->module->dir_output.'/'.get_exdir(0, 0, 0, 0, $object, '')     if multidir_output not defined.
+ *  Example out with new usage:       $object is invoice -> 'INYYMM-ABCD'
+ *  Example out with old usage:       '015' with level 3->"0/1/5/", '015' with level 1->"5/", 'ABC-1' with level 3 ->"0/0/1/"
  *
  *	@param	string|int	$num            Id of object (deprecated, $object will be used in future)
  *	@param  int			$level		    Level of subdirs to return (1, 2 or 3 levels). (deprecated, global option will be used in future)
@@ -5576,10 +5576,9 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart = '
 
 	$path = '';
 
-	$arrayforoldpath = array('cheque', 'user', 'category', 'holiday', 'supplier_invoice', 'invoice_supplier', 'mailing', 'supplier_payment');
+	$arrayforoldpath = array('cheque', 'category', 'holiday', 'supplier_invoice', 'invoice_supplier', 'mailing', 'supplier_payment');
 	if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $arrayforoldpath[] = 'product';
-	if (!empty($level) && in_array($modulepart, $arrayforoldpath))
-	{
+	if (!empty($level) && in_array($modulepart, $arrayforoldpath)) {
 		// This part should be removed once all code is using "get_exdir" to forge path, with all parameters provided.
 		if (empty($alpha)) $num = preg_replace('/([^0-9])/i', '', $num);
 		else $num = preg_replace('/^.*\-/i', '', $num);

From 6b1ce7c050b6a27a1e1dc69da1a1dbea6d7b547a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Dec 2020 18:58:11 +0100
Subject: [PATCH 337/888] Fix management of photo of users

---
 htdocs/user/card.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index be03f9ce0b0..a35ffbad1b5 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -511,15 +511,15 @@ if (empty($reshook)) {
 				}
 
 				if (!$error && !count($object->errors)) {
-					if (GETPOST('deletephoto') && $object->photo) {
-						$fileimg = $conf->user->dir_output.'/'.get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/logos/'.$object->photo;
-						$dirthumbs = $conf->user->dir_output.'/'.get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/logos/thumbs';
+					if (GETPOST('deletephoto') && $object->oldcopy->photo) {
+						$fileimg = $conf->user->dir_output.'/'.get_exdir(0, 0, 0, 0, $object, 'user').$object->oldcopy->photo;
+						$dirthumbs = $conf->user->dir_output.'/'.get_exdir(0, 0, 0, 0, $object, 'user').'/thumbs';
 						dol_delete_file($fileimg);
 						dol_delete_dir_recursive($dirthumbs);
 					}
 
 					if (isset($_FILES['photo']['tmp_name']) && trim($_FILES['photo']['tmp_name'])) {
-						$dir = $conf->user->dir_output.'/'.get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id;
+						$dir = $conf->user->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, 'user');
 
 						dol_mkdir($dir);
 

From 1f28590e5e8a201a74949a35c1d388a85b69db82 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 10 Dec 2020 19:05:54 +0100
Subject: [PATCH 338/888] Fix style

---
 htdocs/core/class/commonobject.class.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 6ecdfb93bb5..ef1bd4eb7b7 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -817,10 +817,12 @@ abstract class CommonObject
 
 			if (is_array($this->socialnetworks) && count($this->socialnetworks) > 0) {
 				foreach ($this->socialnetworks as $key => $value) {
-					$outsocialnetwork .= dol_print_socialnetworks($value, $this->id, $object->id, $key);
+					if ($value) {
+						$outsocialnetwork .= dol_print_socialnetworks($value, $this->id, $object->id, $key);
+					}
 					$outdone++;
 				}
-			} else {
+			} else {	// Old code
 				if ($this->skype) $outsocialnetwork .= dol_print_socialnetworks($this->skype, $this->id, $object->id, 'skype');
 				$outdone++;
 				if ($this->jabberid) $outsocialnetwork .= dol_print_socialnetworks($this->jabberid, $this->id, $object->id, 'jabber');

From cfa194436fb9e20278a2bf7e865842c3d6daf061 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Dec 2020 00:55:21 +0100
Subject: [PATCH 339/888] Debug v13

---
 htdocs/adherents/card.php           |  2 +-
 htdocs/fourn/card.php               |  2 ++
 htdocs/langs/en_US/recruitment.lang |  1 +
 htdocs/projet/card.php              |  2 +-
 htdocs/societe/card.php             | 43 +++++++++++++----------------
 5 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 4a26b8ddb5e..418c5cc5674 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -960,7 +960,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 			print '<tr><td>'.$form->editfieldkey("Categories", 'memcats', '', $object, 0).'</td><td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, 'parent', null, null, 1);
-			print $form->multiselectarray('memcats', $cate_arbo, GETPOST('memcats', 'array'), null, null, null, null, '100%');
+			print img_picto('', 'category').$form->multiselectarray('memcats', $cate_arbo, GETPOST('memcats', 'array'), null, null, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 			print "</td></tr>";
 		}
 
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 728710b97ba..f6162f1d9f8 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -540,6 +540,8 @@ if ($object->id > 0)
 
 	if ($user->rights->supplier_proposal->lire)
 	{
+		$langs->loadLangs(array("supplier_proposal"));
+
 		$sql = "SELECT p.rowid, p.ref, p.date_valid as dc, p.fk_statut, p.total_ht, p.tva as total_tva, p.total as total_ttc";
 		$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p ";
 		$sql .= " WHERE p.fk_soc =".$object->id;
diff --git a/htdocs/langs/en_US/recruitment.lang b/htdocs/langs/en_US/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/en_US/recruitment.lang
+++ b/htdocs/langs/en_US/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index d0c507617e6..51718c55b66 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -587,7 +587,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 		print '</td><td class="maxwidthonsmartphone">';
 		$filteronlist = '';
 		if (!empty($conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST)) $filteronlist = $conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST;
-	   	$text = img_picto('', 'company').$form->select_company(GETPOST('socid', 'int'), 'socid', $filteronlist, 'SelectThirdParty', 1, 0, array(), 0, 'minwidth300 widthcentpercentminusx');
+	   	$text = img_picto('', 'company').$form->select_company(GETPOST('socid', 'int'), 'socid', $filteronlist, 'SelectThirdParty', 1, 0, array(), 0, 'minwidth300 widthcentpercentminusxx');
 		if (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) && empty($conf->dol_use_jmobile))
 		{
 			$texthelp = $langs->trans("IfNeedToUseOtherObjectKeepEmpty");
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 7d7dcbe86c3..ab2cddb940d 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1252,7 +1252,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '<td>'.$form->editfieldkey('Vendor', 'fournisseur', '', $object, 0, 'string', '', 1).'</td><td>';
 			$default = -1;
 			if (!empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)) $default = 1;
-			print $form->selectyesno("fournisseur", (GETPOST('fournisseur', 'int') != '' ? GETPOST('fournisseur', 'int') : (GETPOST("type", 'alpha') == '' ? $default : $object->fournisseur)), 1, 0, (GETPOST("type", 'alpha') == '' ? 1 : 0));
+			print $form->selectyesno("fournisseur", (GETPOST('fournisseur', 'int') != '' ? GETPOST('fournisseur', 'int') : (GETPOST("type", 'alpha') == '' ? $default : $object->fournisseur)), 1, 0, (GETPOST("type", 'alpha') == '' ? 1 : 0), 1);
 			print '</td>';
 
 
@@ -1280,7 +1280,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		// Status
 		print '<tr><td>'.$form->editfieldkey('Status', 'status', '', $object, 0).'</td><td colspan="3">';
-		print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), 1);
+		print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), 1, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100', 1);
 		print '</td></tr>';
 
 		// Barcode
@@ -1364,11 +1364,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		// Prof ids
 		$i = 1; $j = 0; $NBCOLS = ($conf->browser->layout == 'phone' ? 1 : 2);
-		while ($i <= 6)
-		{
+		while ($i <= 6) {
 			$idprof = $langs->transcountry('ProfId'.$i, $object->country_code);
-			if ($idprof != '-')
-			{
+			if ($idprof != '-')	{
 				$key = 'idprof'.$i;
 
 				if (($j % $NBCOLS) == 0) print '<tr>';
@@ -1395,12 +1393,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '<td class="nowrap">';
 		$s = '<input type="text" class="flat maxwidthonsmartphone" name="tva_intra" id="intra_vat" maxlength="20" value="'.$object->tva_intra.'">';
 
-		if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object))
-		{
+		if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object)) {
 			$s .= ' ';
 
-			if (!empty($conf->use_javascript_ajax))
-			{
+			if (!empty($conf->use_javascript_ajax))	{
 				$widthpopup = 600;
 				if (!empty($conf->dol_use_jmobile)) $widthpopup = 350;
 				$heightpopup = 400;
@@ -1447,12 +1443,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		// Type - Workforce/Staff
 		print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'."\n";
 		$sortparam = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
-		print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam);
+		print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam, '', 1);
 		if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		print '</td>';
 		if ($conf->browser->layout == 'phone') print '</tr><tr>';
 		print '<td>'.$form->editfieldkey('Workforce', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>';
-		print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id);
+		print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id, 0, 0, 0, '', 0, 0, 0, '', '', 1);
 		if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		print '</td></tr>';
 
@@ -1499,7 +1495,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			//if ($object->prospect || $object->client || (! $object->fournisseur && ! empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER))) {
 			print '<tr class="visibleifcustomer"><td class="toptd">'.$form->editfieldkey('CustomersProspectsCategoriesShort', 'custcats', '', $object, 0).'</td><td colspan="3">';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, 'parent', null, null, 1);
-			print $form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), null, null, null, null, "90%");
+			print img_picto('', 'category').$form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), null, null, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 			print "</td></tr>";
 			//}
 
@@ -1507,7 +1503,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			//if ($object->fournisseur) {
 			print '<tr class="visibleifsupplier"><td class="toptd">'.$form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0).'</td><td colspan="3">';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, 'parent', null, null, 1);
-			print $form->multiselectarray('suppcats', $cate_arbo, GETPOST('suppcats', 'array'), null, null, null, null, "90%");
+			print img_picto('', 'category').$form->multiselectarray('suppcats', $cate_arbo, GETPOST('suppcats', 'array'), null, null, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 			print "</td></tr>";
 			//}
 		}
@@ -1533,7 +1529,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		$userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, 'AND u.statut = 1', 0, '', '', 0, 1);
 		// Note: If user has no right to "see all thirdparties", we force selection of sale representative to him, so after creation he can see the record.
 		$selected = (count(GETPOST('commercial', 'array')) > 0 ? GETPOST('commercial', 'array') : (GETPOST('commercial', 'int') > 0 ? array(GETPOST('commercial', 'int')) : (empty($user->rights->societe->client->voir) ? array($user->id) : array())));
-		print $form->multiselectarray('commercial', $userlist, $selected, null, null, null, null, "90%");
+		print img_picto('', 'user').$form->multiselectarray('commercial', $userlist, $selected, null, null, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 		print '</td></tr>';
 
 		// Ajout du logo
@@ -1561,8 +1557,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '</div>'."\n";
 
 		print '</form>'."\n";
-	} elseif ($action == 'edit')
-	{
+	} elseif ($action == 'edit') {
 		//print load_fiche_titre($langs->trans("EditCompany"));
 
 		if ($socid)
@@ -1851,7 +1846,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				print '<tr>';
 				print '<td>'.$form->editfieldkey('Supplier', 'fournisseur', '', $object, 0, 'string', '', 1).'</td>';
 				print '<td class="maxwidthonsmartphone">';
-				print $form->selectyesno("fournisseur", $object->fournisseur, 1);
+				print $form->selectyesno("fournisseur", $object->fournisseur, 1, false, 0, 1);
 				print '</td>';
 				if ($conf->browser->layout == 'phone') print '</tr><tr>';
 				print '<td>';
@@ -1892,7 +1887,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 			// Status
 			print '<tr><td>'.$form->editfieldkey('Status', 'status', '', $object, 0).'</td><td colspan="3">';
-			print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $object->status);
+			print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $object->status, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100', 1);
 			print '</td></tr>';
 
 			// Address
@@ -2069,12 +2064,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 			// Type - Workforce/Staff
 			print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
-			print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
+			print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			print '</td>';
 			if ($conf->browser->layout == 'phone') print '</tr><tr>';
 			print '<td>'.$form->editfieldkey('Workforce', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
-			print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id);
+			print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id, 0, 0, 0, '', 0, 0, 0, '', '', 1);
 			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			print '</td></tr>';
 
@@ -2121,7 +2116,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				foreach ($cats as $cat) {
 					$arrayselected[] = $cat->id;
 				}
-				print $form->multiselectarray('custcats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%');
+				print img_picto('', 'category').$form->multiselectarray('custcats', $cate_arbo, $arrayselected, 0, 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 				print "</td></tr>";
 
 				// Supplier
@@ -2134,7 +2129,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				foreach ($cats as $cat) {
 					$arrayselected[] = $cat->id;
 				}
-				print $form->multiselectarray('suppcats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%');
+				print img_picto('', 'category').$form->multiselectarray('suppcats', $cate_arbo, $arrayselected, 0, 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 				print "</td></tr>";
 			}
 
@@ -2185,7 +2180,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			$userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, 'AND u.statut = 1', 0, '', '', 0, 1);
 			$arrayselected = GETPOST('commercial', 'array');
 			if (empty($arrayselected)) $arrayselected = $object->getSalesRepresentatives($user, 1);
-			print $form->multiselectarray('commercial', $userlist, $arrayselected, null, null, null, null, "90%");
+			print img_picto('', 'user').$form->multiselectarray('commercial', $userlist, $arrayselected, 0, 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0, '', '', '', 1);
 			print '</td></tr>';
 
 			print '</table>';

From 206caec290a6b257f3ce726c03b376edb722396f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Dec 2020 01:20:40 +0100
Subject: [PATCH 340/888] Debug v13

---
 htdocs/core/class/html.formprojet.class.php |  6 +++++-
 htdocs/mrp/class/mo.class.php               |  2 +-
 htdocs/projet/card.php                      | 20 +++++++++-----------
 htdocs/projet/index.php                     |  2 +-
 htdocs/projet/tasks.php                     |  8 +++++---
 5 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 1e5558546da..9ebc3a4c307 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -608,9 +608,10 @@ class FormProjets
 	 *    @param   int         $showpercent        Show default probability for status
 	 *    @param   string      $morecss            Add more css
 	 * 	  @param   int	       $noadmininfo        0=Add admin info, 1=Disable admin info
+	 *    @param   int		   $addcombojs         1=Add a js combo
 	 *    @return  int|string                      The HTML select list of element or '' if nothing or -1 if KO
 	 */
-	public function selectOpportunityStatus($htmlname, $preselected = '-1', $showempty = 1, $useshortlabel = 0, $showallnone = 0, $showpercent = 0, $morecss = '', $noadmininfo = 0)
+	public function selectOpportunityStatus($htmlname, $preselected = '-1', $showempty = 1, $useshortlabel = 0, $showallnone = 0, $showpercent = 0, $morecss = '', $noadmininfo = 0, $addcombojs = 0)
 	{
 		global $conf, $langs, $user;
 
@@ -656,7 +657,10 @@ class FormProjets
 					$i++;
 				}
 				$sellist .= '</select>';
+
 				if ($user->admin && !$noadmininfo) $sellist .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+
+				if ($addcombojs) $sellist .= ajax_combobox($htmlname);
 			}
 			/*else
 			{
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index b4e6b776cdd..274782a14ea 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -97,7 +97,7 @@ class Mo extends CommonObject
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'position'=>5, 'notnull'=>1, 'default'=>'1', 'index'=>1),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>4, 'position'=>10, 'notnull'=>1, 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'showoncombobox'=>'1', 'noteditable'=>1),
 		'fk_bom' => array('type'=>'integer:Bom:bom/class/bom.class.php:0:t.status=1', 'filter'=>'active=1', 'label'=>'BOM', 'enabled'=>1, 'visible'=>1, 'position'=>33, 'notnull'=>-1, 'index'=>1, 'comment'=>"Original BOM", 'css'=>'maxwidth300'),
-		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:0', 'label'=>'Product', 'enabled'=>1, 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'comment'=>"Product to produce", 'css'=>'maxwidth300'),
+		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:0', 'label'=>'Product', 'enabled'=>1, 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'comment'=>"Product to produce", 'css'=>'maxwidth300', 'picto'=>'product'),
 		'qty' => array('type'=>'real', 'label'=>'QtyToProduce', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'notnull'=>1, 'comment'=>"Qty to produce", 'css'=>'width75', 'default'=>1, 'isameasure'=>1),
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>42, 'notnull'=>-1, 'searchall'=>1, 'showoncombobox'=>'1',),
 		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1', 'label'=>'ThirdParty', 'picto'=>'company', 'enabled'=>1, 'visible'=>-1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'css'=>'maxwidth400'),
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 51718c55b66..653083bed04 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -465,8 +465,7 @@ llxHeader("", $title, $help_url);
 
 $titleboth = $langs->trans("LeadsOrProjects");
 $titlenew = $langs->trans("NewLeadOrProject"); // Leads and opportunities by default
-if ($conf->global->PROJECT_USE_OPPORTUNITIES == 0)
-{
+if ($conf->global->PROJECT_USE_OPPORTUNITIES == 0) {
 	$titleboth = $langs->trans("Projects");
 	$titlenew = $langs->trans("NewProject");
 }
@@ -536,11 +535,10 @@ if ($action == 'create' && $user->rights->projet->creer)
 	print $langs->trans("Usage");
 	print '</td>';
 	print '<td>';
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-	{
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 		print '<input type="checkbox" id="usage_opportunity" name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ' checked="checked"').'"> ';
 		$htmltext = $langs->trans("ProjectFollowOpportunity");
-		print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
+		print '<label for="usage_opportunity">'.$form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext).'</label>';
 		print '<script>';
 		print '$( document ).ready(function() {
 				jQuery("#usage_opportunity").change(function() {
@@ -560,14 +558,14 @@ if ($action == 'create' && $user->rights->projet->creer)
 	{
 		print '<input type="checkbox" id="usage_task" name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ' checked="checked"').'"> ';
 		$htmltext = $langs->trans("ProjectFollowTasks");
-		print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
+		print '<label for="usage_task">'.$form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext).'</label>';
 		print '<br>';
 	}
 	if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT))
 	{
 		print '<input type="checkbox" id="usage_bill_time" name="usage_bill_time"'.(GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '').'"> ';
 		$htmltext = $langs->trans("ProjectBillTimeDescription");
-		print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
+		print '<label for="usage_bill_time">'.$form->textwithpicto($langs->trans("BillTime"), $htmltext).'</label>';
 		print '<br>';
 	}
 	/*
@@ -611,7 +609,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 	$array = array();
 	if (empty($conf->global->PROJECT_DISABLE_PRIVATE_PROJECT)) $array[0] = $langs->trans("PrivateProject");
 	if (empty($conf->global->PROJECT_DISABLE_PUBLIC_PROJECT)) $array[1] = $langs->trans("SharedProject");
-	print $form->selectarray('public', $array, GETPOST('public') ?GETPOST('public') : $object->public);
+	print $form->selectarray('public', $array, GETPOST('public') ?GETPOST('public') : $object->public, 0, 0, 0, '', 0, 0, 0, '', '', 1);
 	print '</td></tr>';
 
 	// Date start
@@ -629,7 +627,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 		// Opportunity status
 		print '<tr class="classuseopportunity"><td>'.$langs->trans("OpportunityStatus").'</td>';
 		print '<td class="maxwidthonsmartphone">';
-		print $formproject->selectOpportunityStatus('opp_status', GETPOST('opp_status') ?GETPOST('opp_status') : $object->opp_status);
+		print $formproject->selectOpportunityStatus('opp_status', GETPOST('opp_status') ?GETPOST('opp_status') : $object->opp_status, 1, 0, 0, 0, '', 0, 1);
 		print '</tr>';
 
 		// Opportunity probability
@@ -882,7 +880,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 		$array = array();
 		if (empty($conf->global->PROJECT_DISABLE_PRIVATE_PROJECT)) $array[0] = $langs->trans("PrivateProject");
 		if (empty($conf->global->PROJECT_DISABLE_PUBLIC_PROJECT)) $array[1] = $langs->trans("SharedProject");
-		print $form->selectarray('public', $array, $object->public);
+		print $form->selectarray('public', $array, $object->public, 0, 0, 0, '', 0, 0, 0, '', '', 1);
 		print '</td></tr>';
 
 		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
@@ -891,7 +889,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 			// Opportunity status
 			print '<tr class="classuseopportunity'.$classfortr.'"><td>'.$langs->trans("OpportunityStatus").'</td>';
 			print '<td>';
-			print $formproject->selectOpportunityStatus('opp_status', $object->opp_status, 1, 0, 0, 0, 'inline-block valignmiddle');
+			print $formproject->selectOpportunityStatus('opp_status', $object->opp_status, 1, 0, 0, 0, 'inline-block valignmiddle', 0, 1);
 			print '<div id="divtocloseproject" class="inline-block valign" style="display: none;"> &nbsp; &nbsp; ';
 			print '<input type="checkbox" id="inputcloseproject" name="closeproject" /> ';
 			print $langs->trans("AlsoCloseAProject");
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index d0b4bb417f6..6c376fc35f3 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -106,7 +106,7 @@ $morehtml .= '<SELECT name="search_project_user">';
 $morehtml .= '<option name="all" value="0"'.($mine ? '' : ' selected').'>'.$titleall.'</option>';
 $morehtml .= '<option name="mine" value="'.$user->id.'"'.(($search_project_user == $user->id) ? ' selected' : '').'>'.$langs->trans("ProjectsImContactFor").'</option>';
 $morehtml .= '</SELECT>';
-$morehtml .= '<input type="submit" class="button" name="refresh" value="'.$langs->trans("Refresh").'">';
+$morehtml .= '<input type="submit" class="button smallpaddingimp" name="refresh" value="'.$langs->trans("Refresh").'">';
 $morehtml .= '</form>';
 
 if ($mine) $tooltiphelp = $langs->trans("MyProjectsDesc");
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index b4d486e747c..ba1840c4101 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -329,6 +329,7 @@ $userstatic = new User($db);
 $title = $langs->trans("Project").' - '.$langs->trans("Tasks").' - '.$object->ref.' '.$object->name;
 if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->ref.' '.$object->name.' - '.$langs->trans("Tasks");
 $help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
+
 llxHeader("", $title, $help_url);
 
 
@@ -531,11 +532,11 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Ref").'</span></td><td>';
 	if (empty($duplicate_code_error))
 	{
-		print (GETPOSTISSET("ref") ?GETPOST("ref", 'alpha') : $defaultref);
+		print (GETPOSTISSET("ref") ? GETPOST("ref", 'alpha') : $defaultref);
 	} else {
 		print $defaultref;
 	}
-	print '<input type="hidden" name="taskref" value="'.($_POST["ref"] ? $_POST["ref"] : $defaultref).'">';
+	print '<input type="hidden" name="taskref" value="'.(GETPOSTISSET("ref") ? GETPOST("ref", 'alpha') : $defaultref).'">';
 	print '</td></tr>';
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>';
@@ -544,7 +545,8 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 
 	// List of projects
 	print '<tr><td class="fieldrequired">'.$langs->trans("ChildOfProjectTask").'</td><td>';
-	print $formother->selectProjectTasks(GETPOST('task_parent'), $projectid ? $projectid : $object->id, 'task_parent', 0, 0, 1, 1, 0, '0,1', 'maxwidth500');
+	print img_picto('', 'project');
+	$formother->selectProjectTasks(GETPOST('task_parent'), $projectid ? $projectid : $object->id, 'task_parent', 0, 0, 1, 1, 0, '0,1', 'maxwidth500');
 	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans("AffectedTo").'</td><td>';

From 2f8ee92c51239a0bef03182776ccee4fa11fd080 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Dec 2020 02:02:41 +0100
Subject: [PATCH 341/888] Fix CSS

---
 htdocs/core/class/html.formwebsite.class.php | 11 ++++-
 htdocs/theme/eldy/global.inc.php             |  8 ++--
 htdocs/theme/eldy/info-box.inc.php           |  2 +-
 htdocs/website/index.php                     | 48 +++++++++++---------
 4 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/htdocs/core/class/html.formwebsite.class.php b/htdocs/core/class/html.formwebsite.class.php
index 763a7bbe64f..0f3e9a357b8 100644
--- a/htdocs/core/class/html.formwebsite.class.php
+++ b/htdocs/core/class/html.formwebsite.class.php
@@ -34,6 +34,11 @@ class FormWebsite
 	 */
 	public $error;
 
+	/**
+	 * var int		A number of lines
+	 */
+	public $num;
+
 
 	/**
 	 *	Constructor
@@ -220,11 +225,11 @@ class FormWebsite
 	 *  @param	string		$action			Action on page that use this select list
 	 *  @param	string		$morecss		More CSS
 	 *  @param	array		$excludeids		Exclude some ID in list
-	 * 	@return	string						HTML select component with list of type of containers
+	 * 	@return	string						HTML select component with list of block containers
 	 */
 	public function selectContainer($website, $htmlname = 'pageid', $pageid = 0, $showempty = 0, $action = '', $morecss = 'minwidth200', $excludeids = null)
 	{
-		global $langs;
+		$this->num = 0;
 
 		$atleastonepage = (is_array($website->lines) && count($website->lines) > 0);
 
@@ -273,6 +278,8 @@ class FormWebsite
 				$out .= '>';
 				$out .= $valueforoption;
 				$out .= '</option>';
+
+				++$this->num;
 			}
 		}
 		$out .= '</select>';
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index b0ddba41b5c..4ff10708001 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -97,10 +97,7 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
 body {
 <?php if (GETPOST('optioncss', 'aZ09') == 'print') {  ?>
 	background-color: #FFFFFF;
-<?php } else { ?>
-	background: var(--colorbackbody);
 <?php } ?>
-	color: var(--colortext);
 	font-size: <?php print is_numeric($fontsize) ? $fontsize.'px' : $fontsize; ?>;
 	line-height: 1.4;
 	font-family: <?php print $fontlist ?>;
@@ -5398,6 +5395,9 @@ input.select2-input {
 {
     background-color: var(--colorbackvmenu1);
 }
+.select2-container--default .select2-selection--single {
+    background-color: var(--colorbackbody);
+}
 #blockvmenusearch .select2-container--default .select2-selection--single .select2-selection__placeholder {
     color: var(--colortextbackvmenu);
 }
@@ -5506,6 +5506,8 @@ input.select2-input {
 	/*background-color: var(--colorbackvmenu1);
 	border: 1px solid var(--colorbackvmenu1); */
 	box-shadow: 1px 2px 10px var(--colorbackvmenu1);
+	background-color: var(--colorbackbody);
+	color: var(--colortext);
 }
 .select2-dropdown-open {
 	background-color: var(--colorbackvmenu1);
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 1bb6ae7c67e..d582260ca63 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -25,7 +25,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 .info-box.info-box-sm {
     min-height: 80px;
     margin-bottom: 10px;
-    background: #fff;
+	/* background: #fff; */
 }
 .opened-dash-board-wrap .info-box.info-box-sm {
     border-radius: 0 0 0 20px;
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index b6f274c375d..99d00c019ad 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2518,27 +2518,33 @@ if (!GETPOST('hide_websitemenu'))
 
 		if ($action != 'addcontainer')
 		{
-			print '<span class="websiteselection">';
-			print $formwebsite->selectContainer($website, 'pageid', $pageid, 0, $action, 'maxwidth200onsmartphone');
-			print '</span>';
-
-			$urltocreatenewpage = $_SERVER["PHP_SEFL"].'?action=createcontainer&website='.$website->ref;
-
 			$out = '';
-			if (!empty($conf->use_javascript_ajax)) {
-				$out .= '<script language="javascript">';
-				$out .= 'jQuery(document).ready(function () {';
-				$out .= '	jQuery("#pageid").change(function () {';
-				$out .= '   	console.log("We select "+jQuery("#pageid option:selected").val());';
-				$out .= '   	if (jQuery("#pgeid option:selected").val() == \'-2\') {';
-				$out .= '  			window.location.href = "'.$urltocreatenewpage.'";';
-				$out .= '		} else {';
-				$out .= '  			window.location.href = "'.$_SERVER["PHP_SEFL"].'?website='.$website->ref.'&pageid="+jQuery("#pageid option:selected").val();';
-				$out .= '       }';
-				$out .= '   });';
-				$out .= '});';
-				$out .= '</script>';
+
+			$s = $formwebsite->selectContainer($website, 'pageid', $pageid, 0, $action, 'maxwidth200onsmartphone');
+
+			if ($formwebsite->num > 0) {
+				$out .= '<span class="websiteselection">';
+				$out .= $s;
+				$out .= '</span>';
+
+				$urltocreatenewpage = $_SERVER["PHP_SEFL"].'?action=createcontainer&website='.$website->ref;
+
+				if (!empty($conf->use_javascript_ajax)) {
+					$out .= '<script language="javascript">';
+					$out .= 'jQuery(document).ready(function () {';
+					$out .= '	jQuery("#pageid").change(function () {';
+					$out .= '   	console.log("We select "+jQuery("#pageid option:selected").val());';
+					$out .= '   	if (jQuery("#pgeid option:selected").val() == \'-2\') {';
+					$out .= '  			window.location.href = "'.$urltocreatenewpage.'";';
+					$out .= '		} else {';
+					$out .= '  			window.location.href = "'.$_SERVER["PHP_SEFL"].'?website='.$website->ref.'&pageid="+jQuery("#pageid option:selected").val();';
+					$out .= '       }';
+					$out .= '   });';
+					$out .= '});';
+					$out .= '</script>';
+				}
 			}
+
 			print $out;
 		}
 		else {
@@ -2579,9 +2585,9 @@ if (!GETPOST('hide_websitemenu'))
 		}
 
 		if ($pagepreviousid) print '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?website='.urlencode($object->ref).'&pageid='.$pagepreviousid.'&action='.$action.'">'.img_previous($langs->trans("PreviousContainer")).'</a>';
-		else print '<span class="valignmiddle opacitymedium">'.img_previous($langs->trans("PreviousContainer")).'</span>';
+		else print '<span class="valignmiddle opacitymedium">'.img_previous($langs->trans("Previous")).'</span>';
 		if ($pagenextid) print '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?website='.urlencode($object->ref).'&pageid='.$pagenextid.'&action='.$action.'">'.img_next($langs->trans("NextContainer")).'</a>';
-		else print '<span class="valignmiddle opacitymedium">'.img_next($langs->trans("NextContainer")).'</span>';
+		else print '<span class="valignmiddle opacitymedium">'.img_next($langs->trans("Next")).'</span>';
 
 		$websitepage = new WebSitePage($db);
 		if ($pageid > 0 && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone'))

From 4ec598d5710df7d6689ceadd4b591a302fad6874 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Dec 2020 02:12:39 +0100
Subject: [PATCH 342/888] Debug v11

---
 htdocs/core/boxes/box_accountancy_last_manual_entries.php | 8 ++++----
 htdocs/core/boxes/box_contacts.php                        | 4 ++--
 .../core/boxes/box_customers_outstanding_bill_reached.php | 8 ++++----
 htdocs/core/boxes/box_graph_invoices_permonth.php         | 4 ++--
 htdocs/core/boxes/box_mos.php                             | 8 ++++----
 htdocs/core/boxes/box_supplier_orders.php                 | 4 ++--
 .../modulebuilder/template/core/boxes/mymodulewidget1.php | 2 +-
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/htdocs/core/boxes/box_accountancy_last_manual_entries.php b/htdocs/core/boxes/box_accountancy_last_manual_entries.php
index cbd6a16b62e..e9b2fe0cd2d 100644
--- a/htdocs/core/boxes/box_accountancy_last_manual_entries.php
+++ b/htdocs/core/boxes/box_accountancy_last_manual_entries.php
@@ -141,8 +141,8 @@ class box_accountancy_last_manual_entries extends ModeleBoxes
 				}
 
 				if ($num == 0) $this->info_box_contents[$line][0] = array(
-					'td' => 'class="center opacitymedium"',
-					'text'=>$langs->trans("NoRecordedManualEntries")
+					'td' => 'class="center"',
+					'text'=> '<span class="opacitymedium">'.$langs->trans("NoRecordedManualEntries").'</span>'
 				);
 
 				$this->db->free($result);
@@ -155,8 +155,8 @@ class box_accountancy_last_manual_entries extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index bbba04893d7..16041a63607 100644
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -186,8 +186,8 @@ class box_contacts extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
index 371dab454cf..c71bce53602 100644
--- a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
+++ b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
@@ -150,8 +150,8 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
 				}
 
 				if ($num == 0 || $nboutstandingbillreachedcustomers == 0) $this->info_box_contents[$line][0] = array(
-					'td' => 'class="center opacitymedium"',
-					'text'=>$langs->trans("NoRecordedCustomers")
+					'td' => 'class="center"',
+					'text'=> '<span class="opacitymedium">'.$langs->trans("NoRecordedCustomers").'</span>'
 				);
 
 				$this->db->free($result);
@@ -164,8 +164,8 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index d1fb6dd4114..983bb75cbc3 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -269,8 +269,8 @@ class box_graph_invoices_permonth extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_mos.php b/htdocs/core/boxes/box_mos.php
index dde8294f80b..acbb1e5cd3b 100644
--- a/htdocs/core/boxes/box_mos.php
+++ b/htdocs/core/boxes/box_mos.php
@@ -150,8 +150,8 @@ class box_mos extends ModeleBoxes
 				}
 
 				if ($num == 0) $this->info_box_contents[$line][0] = array(
-					'td' => 'class="center opacitymedium"',
-					'text'=>$langs->trans("NoRecordedOrders")
+					'td' => 'class="center"',
+					'text'=> '<span class="opacitymedium">'.$langs->trans("NoRecordedOrders").'</span>'
 				);
 
 				$this->db->free($result);
@@ -164,8 +164,8 @@ class box_mos extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index 409265b3516..151c1df6bcb 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -172,8 +172,8 @@ class box_supplier_orders extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php b/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
index 482455e103d..e356792ed42 100644
--- a/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
+++ b/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
@@ -25,9 +25,9 @@
  * Put detailed description here.
  */
 
-/** Includes */
 include_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
 
+
 /**
  * Class to manage the box
  *

From 697ca3e4f53726b29800b8d343c26cd5c497c5bc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Dec 2020 02:23:43 +0100
Subject: [PATCH 343/888] Fix selection of duration type

---
 htdocs/comm/action/card.php           |  6 ++++--
 htdocs/core/class/html.form.class.php | 20 +++++++++++++++-----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 5d284ce048a..124b8dcf1dd 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1246,7 +1246,8 @@ if ($action == 'create')
 
 		//Reminder
 		print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("ReminderTime").'</td><td colspan="3">';
-		print '<input class="width50" type="number" name="offsetvalue" value="'.(GETPOSTISSET('offsetvalue') ? GETPOST('offsetvalue', 'int') : '15').'"> '.$form->selectTypeDuration('offsetunit', 'i');
+		print '<input class="width50" type="number" name="offsetvalue" value="'.(GETPOSTISSET('offsetvalue') ? GETPOST('offsetvalue', 'int') : '15').'"> ';
+		print $form->selectTypeDuration('offsetunit', 'i', array('y', 'm'));
 		print '</td></tr>';
 
 		//Reminder Type
@@ -1729,7 +1730,8 @@ if ($id > 0)
 
 			// Reminder
 			print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("ReminderTime").'</td><td colspan="3">';
-			print '<input type="number" name="offsetvalue" class="width50" value="'.$actionCommReminder->offsetvalue.'"> '.$form->selectTypeDuration('offsetunit', $actionCommReminder->offsetunit);
+			print '<input type="number" name="offsetvalue" class="width50" value="'.$actionCommReminder->offsetvalue.'"> ';
+			print $form->selectTypeDuration('offsetunit', $actionCommReminder->offsetunit, array('y', 'm'));
 			print '</td></tr>';
 
 			// Reminder Type
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b647a7e6685..24b3a5c2bbf 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1914,7 +1914,7 @@ class Form
 			$out .= '});';
 			$out .= '})</script>';
 			$out .= $this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter);
-			$out .= ' <input type="submit" disabled class="button valignmiddle" id="'.$action.'assignedtouser" name="'.$action.'assignedtouser" value="'.dol_escape_htmltag($langs->trans("Add")).'">';
+			$out .= ' <input type="submit" disabled class="button valignmiddle smallpaddingimp" id="'.$action.'assignedtouser" name="'.$action.'assignedtouser" value="'.dol_escape_htmltag($langs->trans("Add")).'">';
 			$out .= '<br>';
 		}
 
@@ -5928,16 +5928,24 @@ class Form
 	/**
 	 * selectTypeDuration
 	 *
-	 * @param   string   $prefix     Prefix
-	 * @param   string   $selected   Selected type
-	 * @return  string               HTML select string
+	 * @param   string   	$prefix     	Prefix
+	 * @param   string   	$selected   	Selected duration type
+	 * @param	array|null	$ecludetypes	Array of duration types to exclude. Example array('y', 'm')
+	 * @return  string      	         	HTML select string
 	 */
-	public function selectTypeDuration($prefix, $selected = 'i')
+	public function selectTypeDuration($prefix, $selected = 'i', $excludtypes = null)
 	{
 		global $langs;
 
 		$TDurationTypes = array('y'=>$langs->trans('Years'), 'm'=>$langs->trans('Month'), 'w'=>$langs->trans('Weeks'), 'd'=>$langs->trans('Days'), 'h'=>$langs->trans('Hours'), 'i'=>$langs->trans('Minutes'));
 
+		// Removed undesired duration types
+		if (is_array($excludtypes)) {
+			foreach($excludtypes as $value) {
+				unset($TDurationTypes[$value]);
+			}
+		}
+
 		$retstring = '<select class="flat" id="select_'.$prefix.'type_duration" name="'.$prefix.'type_duration">';
 		foreach ($TDurationTypes as $key=>$typeduration) {
 			$retstring .= '<option value="'.$key.'"';
@@ -5948,6 +5956,8 @@ class Form
 		}
 		$retstring .= "</select>";
 
+		$retstring .= ajax_combobox('select_'.$prefix.'type_duration');
+
 		return $retstring;
 	}
 

From 7ac3bb1b67e90f240585c1cabd2f4dc9bdfb0a07 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Dec 2020 02:40:48 +0100
Subject: [PATCH 344/888] Debug v13

---
 htdocs/product/stock/stockatdate.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index 431bec3fd89..f48ac986d20 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -52,6 +52,7 @@ $hookmanager->initHooks(array('stockreplenishlist'));
 $action = GETPOST('action', 'aZ09');
 $type = GETPOST('type', 'int');
 $mode = GETPOST('mode', 'alpha');
+
 $date = '';
 $dateendofday = '';
 if (GETPOSTISSET('dateday') && GETPOSTISSET('datemonth') && GETPOSTISSET('dateyear')) {
@@ -59,6 +60,9 @@ if (GETPOSTISSET('dateday') && GETPOSTISSET('datemonth') && GETPOSTISSET('dateye
 	$dateendofday = dol_mktime(23, 59, 59, GETPOST('datemonth', 'int'), GETPOST('dateday', 'int'), GETPOST('dateyear', 'int'));
 }
 
+$search_ref = GETPOST('search_ref', 'alphanohtml');
+$search_nom = GETPOST('search_nom', 'alphanohtml');
+
 $now = dol_now();
 
 $productid = GETPOST('productid', 'int');
@@ -104,6 +108,8 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$date = '';
 	$productid = 0;
 	$fk_warehouse = 0;
+	$search_ref = '';
+	$search_nom = '';
 }
 
 $warehouseStatus = array();
@@ -386,8 +392,8 @@ print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 // Fields title search
 print '<tr class="liste_titre_filter">';
-print '<td class="liste_titre"><input class="flat" type="text" name="search_ref" size="8" value="'.dol_escape_htmltag($sref).'"></td>';
-print '<td class="liste_titre"><input class="flat" type="text" name="search_nom" size="8" value="'.dol_escape_htmltag($snom).'"></td>';
+print '<td class="liste_titre"><input class="flat" type="text" name="search_ref" size="8" value="'.dol_escape_htmltag($search_ref).'"></td>';
+print '<td class="liste_titre"><input class="flat" type="text" name="search_nom" size="8" value="'.dol_escape_htmltag($search_nom).'"></td>';
 print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
@@ -549,6 +555,12 @@ $parameters = array('sql'=>$sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
+if (empty($date) || ! $dateIsValid) {
+	$colspan = 6;
+	if ($mode == 'future') $colspan++;
+	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("EmptySearchString").'</span></td></tr>';
+}
+
 print '</table>';
 print '</div>';
 

From dca48e4fb67654ac7923963360ccf47c92c71ef8 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 11 Dec 2020 10:21:10 +0100
Subject: [PATCH 345/888] NEW : add ECM files table info into API document
 entry GET

---
 htdocs/api/class/api_documents.class.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 92404b81a35..da9545aa248 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -497,6 +497,17 @@ class Documents extends DolibarrApi
 		$filearray = dol_dir_list($upload_dir, $type, $recursive, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 		if (empty($filearray)) {
 			throw new RestException(404, 'Search for modulepart '.$modulepart.' with Id '.$object->id.(!empty($object->ref) ? ' or Ref '.$object->ref : '').' does not return any document.');
+		} else {
+			if (($object->id) > 0 && !empty($modulepart)) {
+				require_once DOL_DOCUMENT_ROOT . '/ecm/class/ecmfiles.class.php';
+				$ecmfile = new EcmFiles($this->db);
+				$result = $ecmfile->fetchAll('', '', 0, 0, array('t.src_object_type' => $modulepart, 't.src_object_id' => $object->id));
+				if ($result < 0) {
+					throw new RestException(503, 'Error when retrieve ecm list : ' . $this->db->lasterror());
+				} elseif (is_array($ecmfile->lines) && count($ecmfile->lines) > 0) {
+					$filearray['ecmfiles_infos'] = $ecmfile->lines;
+				}
+			}
 		}
 
 		return $filearray;

From 4d0ce326c4217f808ee184e89ed2df9dd512a8ef Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 11 Dec 2020 13:31:50 +0100
Subject: [PATCH 346/888] NEW add doAction hook in passwordforgotten page

---
 htdocs/user/passwordforgotten.php | 170 ++++++++++++++++--------------
 1 file changed, 89 insertions(+), 81 deletions(-)

diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index b29bb0e6d70..15df6371891 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -64,91 +64,99 @@ if (GETPOST('dol_use_jmobile', 'alpha') || !empty($_SESSION['dol_use_jmobile']))
  * Actions
  */
 
-// Validate new password
-if ($action == 'validatenewpassword' && $username && $passwordhash)
-{
-	$edituser = new User($db);
-	$result = $edituser->fetch('', $_GET["username"]);
-	if ($result < 0)
-	{
-		$message = '<div class="error">'.dol_escape_htmltag($langs->trans("ErrorLoginDoesNotExists", $username)).'</div>';
-	} else {
-		if (dol_verifyHash($edituser->pass_temp, $passwordhash))
-		{
-			// Clear session
-			unset($_SESSION['dol_login']);
-			$_SESSION['dol_loginmesg'] = $langs->trans('NewPasswordValidated'); // Save message for the session page
-
-			$newpassword = $edituser->setPassword($user, $edituser->pass_temp, 0);
-			dol_syslog("passwordforgotten.php new password for user->id=".$edituser->id." validated in database");
-			header("Location: ".DOL_URL_ROOT.'/');
-			exit;
-		} else {
-			$langs->load("errors");
-			$message = '<div class="error">'.$langs->trans("ErrorFailedToValidatePasswordReset").'</div>';
-		}
-	}
+$parameters = array('username' => $username);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+    $message = $hookmanager->error;
 }
-// Action modif mot de passe
-if ($action == 'buildnewpassword' && $username)
-{
-	$sessionkey = 'dol_antispam_value';
-	$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
 
-	// Verify code
-	if (!$ok)
-	{
-		$message = '<div class="error">'.$langs->trans("ErrorBadValueForCode").'</div>';
-	} else {
-		$isanemail = preg_match('/@/', $username);
+if (empty($reshook)) {
+    // Validate new password
+    if ($action == 'validatenewpassword' && $username && $passwordhash)
+    {
+        $edituser = new User($db);
+        $result = $edituser->fetch('', $_GET["username"]);
+        if ($result < 0)
+        {
+            $message = '<div class="error">'.dol_escape_htmltag($langs->trans("ErrorLoginDoesNotExists", $username)).'</div>';
+        } else {
+            if (dol_verifyHash($edituser->pass_temp, $passwordhash))
+            {
+                // Clear session
+                unset($_SESSION['dol_login']);
+                $_SESSION['dol_loginmesg'] = $langs->trans('NewPasswordValidated'); // Save message for the session page
 
-		$edituser = new User($db);
-		$result = $edituser->fetch('', $username, '', 1);
-		if ($result == 0 && $isanemail)
-		{
-			$result = $edituser->fetch('', '', '', 1, -1, $username);
-		}
+                $newpassword = $edituser->setPassword($user, $edituser->pass_temp, 0);
+                dol_syslog("passwordforgotten.php new password for user->id=".$edituser->id." validated in database");
+                header("Location: ".DOL_URL_ROOT.'/');
+                exit;
+            } else {
+                $langs->load("errors");
+                $message = '<div class="error">'.$langs->trans("ErrorFailedToValidatePasswordReset").'</div>';
+            }
+        }
+    }
+    // Action modif mot de passe
+    if ($action == 'buildnewpassword' && $username)
+    {
+        $sessionkey = 'dol_antispam_value';
+        $ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
 
-		if ($result <= 0 && $edituser->error == 'USERNOTFOUND')
-		{
-			$message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">';
-			if (!$isanemail) {
-				$message .= $langs->trans("IfLoginExistPasswordRequestSent");
-			} else {
-				$message .= $langs->trans("IfEmailExistPasswordRequestSent");
-			}
-			$message .= '</div>';
-			$username = '';
-		} else {
-			if (!$edituser->email)
-			{
-				$message = '<div class="error">'.$langs->trans("ErrorLoginHasNoEmail").'</div>';
-			} else {
-				$newpassword = $edituser->setPassword($user, '', 1);
-				if ($newpassword < 0)
-				{
-					// Failed
-					$message = '<div class="error">'.$langs->trans("ErrorFailedToChangePassword").'</div>';
-				} else {
-					// Success
-					if ($edituser->send_password($user, $newpassword, 1) > 0)
-					{
-						$message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">';
-						if (!$isanemail) {
-							$message .= $langs->trans("IfLoginExistPasswordRequestSent");
-						} else {
-							$message .= $langs->trans("IfEmailExistPasswordRequestSent");
-						}
-						//$message .= $langs->trans("PasswordChangeRequestSent", $edituser->login, dolObfuscateEmail($edituser->email));
-						$message .= '</div>';
-						$username = '';
-					} else {
-						$message .= '<div class="error">'.$edituser->error.'</div>';
-					}
-				}
-			}
-		}
-	}
+        // Verify code
+        if (!$ok)
+        {
+            $message = '<div class="error">'.$langs->trans("ErrorBadValueForCode").'</div>';
+        } else {
+            $isanemail = preg_match('/@/', $username);
+
+            $edituser = new User($db);
+            $result = $edituser->fetch('', $username, '', 1);
+            if ($result == 0 && $isanemail)
+            {
+                $result = $edituser->fetch('', '', '', 1, -1, $username);
+            }
+
+            if ($result <= 0 && $edituser->error == 'USERNOTFOUND')
+            {
+                $message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">';
+                if (!$isanemail) {
+                    $message .= $langs->trans("IfLoginExistPasswordRequestSent");
+                } else {
+                    $message .= $langs->trans("IfEmailExistPasswordRequestSent");
+                }
+                $message .= '</div>';
+                $username = '';
+            } else {
+                if (!$edituser->email)
+                {
+                    $message = '<div class="error">'.$langs->trans("ErrorLoginHasNoEmail").'</div>';
+                } else {
+                    $newpassword = $edituser->setPassword($user, '', 1);
+                    if ($newpassword < 0)
+                    {
+                        // Failed
+                        $message = '<div class="error">'.$langs->trans("ErrorFailedToChangePassword").'</div>';
+                    } else {
+                        // Success
+                        if ($edituser->send_password($user, $newpassword, 1) > 0)
+                        {
+                            $message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">';
+                            if (!$isanemail) {
+                                $message .= $langs->trans("IfLoginExistPasswordRequestSent");
+                            } else {
+                                $message .= $langs->trans("IfEmailExistPasswordRequestSent");
+                            }
+                            //$message .= $langs->trans("PasswordChangeRequestSent", $edituser->login, dolObfuscateEmail($edituser->email));
+                            $message .= '</div>';
+                            $username = '';
+                        } else {
+                            $message .= '<div class="error">'.$edituser->error.'</div>';
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
 
 

From eb2d7fa657968379d2f3daae0787aa89dc823170 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Fri, 11 Dec 2020 13:43:03 +0100
Subject: [PATCH 347/888] fix phpcs

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 24b3a5c2bbf..8a928aeeb34 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5930,24 +5930,24 @@ class Form
 	 *
 	 * @param   string   	$prefix     	Prefix
 	 * @param   string   	$selected   	Selected duration type
-	 * @param	array|null	$ecludetypes	Array of duration types to exclude. Example array('y', 'm')
+	 * @param	array|null	$excludetypes	Array of duration types to exclude. Example array('y', 'm')
 	 * @return  string      	         	HTML select string
 	 */
-	public function selectTypeDuration($prefix, $selected = 'i', $excludtypes = null)
+	public function selectTypeDuration($prefix, $selected = 'i', $excludetypes = null)
 	{
 		global $langs;
 
 		$TDurationTypes = array('y'=>$langs->trans('Years'), 'm'=>$langs->trans('Month'), 'w'=>$langs->trans('Weeks'), 'd'=>$langs->trans('Days'), 'h'=>$langs->trans('Hours'), 'i'=>$langs->trans('Minutes'));
 
 		// Removed undesired duration types
-		if (is_array($excludtypes)) {
-			foreach($excludtypes as $value) {
+		if (is_array($excludetypes)) {
+			foreach($excludetypes as $value) {
 				unset($TDurationTypes[$value]);
 			}
 		}
 
 		$retstring = '<select class="flat" id="select_'.$prefix.'type_duration" name="'.$prefix.'type_duration">';
-		foreach ($TDurationTypes as $key=>$typeduration) {
+		foreach ($TDurationTypes as $key => $typeduration) {
 			$retstring .= '<option value="'.$key.'"';
 			if ($key == $selected) {
 				$retstring .= " selected";

From 54d51ec557a1f98d631bb26b8590e2b5f65d0ff5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Fri, 11 Dec 2020 13:46:47 +0100
Subject: [PATCH 348/888] Update html.form.class.php

---
 htdocs/core/class/html.form.class.php | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 8a928aeeb34..e1e1fc45228 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5930,20 +5930,25 @@ class Form
 	 *
 	 * @param   string   	$prefix     	Prefix
 	 * @param   string   	$selected   	Selected duration type
-	 * @param	array|null	$excludetypes	Array of duration types to exclude. Example array('y', 'm')
+	 * @param	array		$excludetypes	Array of duration types to exclude. Example array('y', 'm')
 	 * @return  string      	         	HTML select string
 	 */
-	public function selectTypeDuration($prefix, $selected = 'i', $excludetypes = null)
+	public function selectTypeDuration($prefix, $selected = 'i', $excludetypes = array())
 	{
 		global $langs;
 
-		$TDurationTypes = array('y'=>$langs->trans('Years'), 'm'=>$langs->trans('Month'), 'w'=>$langs->trans('Weeks'), 'd'=>$langs->trans('Days'), 'h'=>$langs->trans('Hours'), 'i'=>$langs->trans('Minutes'));
+		$TDurationTypes = array(
+			'y'=>$langs->trans('Years'),
+			'm'=>$langs->trans('Month'),
+			'w'=>$langs->trans('Weeks'),
+			'd'=>$langs->trans('Days'),
+			'h'=>$langs->trans('Hours'),
+			'i'=>$langs->trans('Minutes')
+		);
 
 		// Removed undesired duration types
-		if (is_array($excludetypes)) {
-			foreach($excludetypes as $value) {
-				unset($TDurationTypes[$value]);
-			}
+		foreach ($excludetypes as $value) {
+			unset($TDurationTypes[$value]);
 		}
 
 		$retstring = '<select class="flat" id="select_'.$prefix.'type_duration" name="'.$prefix.'type_duration">';

From 2adbd29b498e6a7d83180df7a2d1c6048c848d05 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Dec 2020 14:22:36 +0100
Subject: [PATCH 349/888] Debug generation of doc from modulebuilder

---
 htdocs/admin/supplier_invoice.php             |  3 +-
 htdocs/core/actions_addupdatedelete.inc.php   |  8 +-
 htdocs/core/class/commonobject.class.php      |  5 ++
 htdocs/langs/en_US/admin.lang                 |  2 +-
 htdocs/modulebuilder/template/admin/setup.php | 87 ++++++++++---------
 .../template/class/myobject.class.php         |  4 +-
 htdocs/recruitment/admin/setup.php            | 85 +++++++++---------
 .../recruitment/admin/setup_candidatures.php  | 60 +++++++------
 .../class/recruitmentcandidature.class.php    |  2 +-
 .../class/recruitmentjobposition.class.php    |  5 +-
 ...ric_recruitmentjobposition_odt.modules.php |  2 +-
 11 files changed, 146 insertions(+), 117 deletions(-)

diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 8df357df07e..86faa655687 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -146,8 +146,7 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-} elseif ($action == 'unsetdoc')
-{
+} elseif ($action == 'unsetdoc') {
 	dolibarr_del_const($db, "INVOICE_SUPPLIER_ADDON_PDF", $conf->entity);
 }
 
diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index 80f16cb037d..5a93a6ded0b 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -315,11 +315,15 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $permissiontoadd)
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
-				$model = $object->model_pdf;
 
 				$ret = $object->fetch($id); // Reload to get new records
 
-				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				$model = $object->model_pdf;
+
+				$retgen = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				if ($retgen < 0) {
+					setEventMessages($object->error, $object->errors, 'warnings');
+				}
 			}
 		}
 	} else {
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index ef1bd4eb7b7..dec15e4db83 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4557,6 +4557,11 @@ abstract class CommonObject
 		{
 			dol_syslog("commonGenerateDocument modele=".$modele." outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));
 
+			if (empty($modele)) {
+				$this->error = 'BadValueForParameterModele';
+				return -1;
+			}
+
 			// Increase limit for PDF build
 			$err = error_reporting();
 			error_reporting(0);
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 23b3b5462c9..b0a302fb80e 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -375,7 +375,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=List of OpenDocument templates directories
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Position of Name/Lastname
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 420eb13940d..c7cc61171a7 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -54,6 +54,9 @@ $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 $value = GETPOST('value', 'alpha');
+$label = GETPOST('label', 'alpha');
+$scandir = GETPOST('scan_dir', 'alpha');
+$type = 'myobject';
 
 $arrayofparameters = array(
 	'MYMODULE_MYPARAM1'=>array('css'=>'minwidth200', 'enabled'=>1),
@@ -130,47 +133,52 @@ if ($action == 'updateMask')
 	}
 }
 
-// Activate a model
-elseif ($action == 'set')
-{
-	$ret = addDocumentModel($value, $type, $label, $scandir);
-} elseif ($action == 'del')
-{
+elseif ($action == 'setmod') {
+	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
 	$tmpobjectkey = GETPOST('object');
-
-	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
-		$constforval = strtoupper($tmpobjectkey).'_ADDON_PDF';
-		if ($conf->global->$constforval == "$value") dolibarr_del_const($db, $constforval, $conf->entity);
+	if (!empty($tmpobjectkey)) {
+		$constforval = 'MYMODULE_'.strtoupper($tmpobjectkey)."_ADDON";
+		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
 	}
 }
 
-// Set default model
-elseif ($action == 'setdoc')
-{
-	$tmpobjectkey = GETPOST('object');
-	$constforval = strtoupper($tmpobjectkey).'_ADDON_PDF';
-	if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity))
-	{
-		// The constant that was read before the new set
-		// We therefore requires a variable to have a coherent view
-		$conf->global->$constforval = $value;
-	}
-
-	// On active le modele
+// Activate a model
+elseif ($action == 'set') {
+	$ret = addDocumentModel($value, $type, $label, $scandir);
+} elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
-		$ret = addDocumentModel($value, $type, $label, $scandir);
+	if ($ret > 0) {
+		$tmpobjectkey = GETPOST('object');
+		if (!empty($tmpobjectkey)) {
+			$constforval = 'MYMODULE_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
+			if ($conf->global->$constforval == "$value") dolibarr_del_const($db, $constforval, $conf->entity);
+		}
 	}
-} elseif ($action == 'setmod')
-{
-	// TODO Check if numbering module chosen can be activated
-	// by calling method canBeActivated
+}
+
+// Set or unset default model
+elseif ($action == 'setdoc') {
 	$tmpobjectkey = GETPOST('object');
-	$constforval = 'MYMODULE_'.strtoupper($tmpobjectkey)."_ADDON";
-	dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
+	if (!empty($tmpobjectkey)) {
+		$constforval = 'MYMODULE_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
+		if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
+			// The constant that was read before the new set
+			// We therefore requires a variable to have a coherent view
+			$conf->global->$constforval = $value;
+		}
+
+		// We disable/enable the document template (into llx_document_model table)
+		$ret = delDocumentModel($value, $type);
+		if ($ret > 0) {
+			$ret = addDocumentModel($value, $type, $label, $scandir);
+		}
+	}
+} elseif ($action == 'unsetdoc') {
+	$tmpobjectkey = GETPOST('object');
+	if (!empty($tmpobjectkey)) {
+		$constforval = 'MYMODULE_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
+		dolibarr_del_const($db, $constforval, $conf->entity);
+	}
 }
 
 
@@ -459,18 +467,19 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 											print '</td>';
 										} else {
 											print '<td class="center">'."\n";
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.urlencode($module->scandir).'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 											print "</td>";
 										}
 
 										// Default
 										print '<td class="center">';
 										$constforvar = 'MYMODULE_'.strtoupper($myTmpObjectKey).'_ADDON';
-										if ($conf->global->$constforvar == $name)
-										{
-											print img_picto($langs->trans("Default"), 'on');
+										if ($conf->global->$constforvar == $name) {
+											//print img_picto($langs->trans("Default"), 'on');
+											// Even if choice is the default value, we allow to disable it. Replace this with previous line if you need to disable unset
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&amp;token='.newToken().'&amp;object='.urlencode(strtolower($myTmpObjectKey)).'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type='.urlencode($type).'" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 										} else {
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;object='.urlencode(strtolower($myTmpObjectKey)).'&amp;value='.$name.'&amp;scan_dir='.urlencode($module->scandir).'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 										}
 										print '</td>';
 
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 76aeabf2c2b..a8bed45c46a 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -1028,7 +1028,7 @@ class MyObject extends CommonObject
 		if (!dol_strlen($modele)) {
 			$modele = 'standard_myobject';
 
-			if ($this->model_pdf) {
+			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
 			} elseif (!empty($conf->global->MYOBJECT_ADDON_PDF)) {
 				$modele = $conf->global->MYOBJECT_ADDON_PDF;
@@ -1037,7 +1037,7 @@ class MyObject extends CommonObject
 
 		$modelpath = "core/modules/mymodule/doc/";
 
-		if ($includedocgeneration) {
+		if ($includedocgeneration && !empty($modele)) {
 			$result = $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 		}
 
diff --git a/htdocs/recruitment/admin/setup.php b/htdocs/recruitment/admin/setup.php
index fdd4d83e223..342d32840c5 100644
--- a/htdocs/recruitment/admin/setup.php
+++ b/htdocs/recruitment/admin/setup.php
@@ -54,6 +54,9 @@ $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 $value = GETPOST('value', 'alpha');
+$label = GETPOST('label', 'alpha');
+$scandir = GETPOST('scan_dir', 'alpha');
+$type = 'recruitmentjobposition';
 
 $arrayofparameters = array(
 //	'RECRUITMENT_MYPARAM1'=>array('css'=>'minwidth200', 'enabled'=>1),
@@ -131,47 +134,52 @@ if ($action == 'updateMask')
 }
 
 // Activate a model
-elseif ($action == 'set')
-{
+elseif ($action == 'set') {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-} elseif ($action == 'del')
-{
-	$tmpobjectkey = GETPOST('object');
-
+} elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
-		$constforval = strtoupper($tmpobjectkey).'_ADDON_PDF';
-		if ($conf->global->$constforval == "$value") dolibarr_del_const($db, $constforval, $conf->entity);
+	if ($ret > 0) {
+		$tmpobjectkey = GETPOST('object');
+		if (!empty($tmpobjectkey)) {
+			$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
+			if ($conf->global->$constforval == "$value") dolibarr_del_const($db, $constforval, $conf->entity);
+		}
+	}
+}
+
+elseif ($action == 'setmod') {
+	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
+	$tmpobjectkey = GETPOST('object');
+	if (!empty($tmpobjectkey)) {
+		$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey)."_ADDON";
+
+		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
 	}
 }
 
 // Set default model
-elseif ($action == 'setdoc')
-{
+elseif ($action == 'setdoc') {
 	$tmpobjectkey = GETPOST('object');
-	$constforval = strtoupper($tmpobjectkey).'_ADDON_PDF';
-	if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity))
-	{
-		// The constant that was read before the new set
-		// We therefore requires a variable to have a coherent view
-		$conf->global->$constforval = $value;
-	}
+	if (!empty($tmpobjectkey)) {
+		$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
+		if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
+			// The constant that was read before the new set
+			// We therefore requires a variable to have a coherent view
+			$conf->global->$constforval = $value;
+		}
 
-	// On active le modele
-	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
-		$ret = addDocumentModel($value, $type, $label, $scandir);
+		// We disable/enable the document template (into llx_document_model table)
+		$ret = delDocumentModel($value, $type);
+		if ($ret > 0) {
+			$ret = addDocumentModel($value, $type, $label, $scandir);
+		}
 	}
-} elseif ($action == 'setmod')
-{
-	// TODO Check if numbering module chosen can be activated
-	// by calling method canBeActivated
+} elseif ($action == 'unsetdoc') {
 	$tmpobjectkey = GETPOST('object');
-	$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey)."_ADDON";
-
-	dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
+	if (!empty($tmpobjectkey)) {
+		$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
+		dolibarr_del_const($db, $constforval, $conf->entity);
+	}
 }
 
 
@@ -288,7 +296,6 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 						if (strpos($file, 'mod_'.strtolower($myTmpObjectKey).'_') === 0 && substr($file, dol_strlen($file) - 3, 3) == 'php')
 						{
 							$file = substr($file, 0, dol_strlen($file) - 4);
-
 							require_once $dir.'/'.$file.'.php';
 
 							$module = new $file($db);
@@ -377,8 +384,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 		$sql .= " WHERE type = '".$db->escape($type)."'";
 		$sql .= " AND entity = ".$conf->entity;
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$i = 0;
 			$num_rows = $db->num_rows($resql);
 			while ($i < $num_rows)
@@ -464,12 +470,13 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 
 										// Default
 										print '<td class="center">';
-										$constforvar = 'RECRUITMENT_'.strtoupper($myTmpObjectKey).'_ADDON';
-										if ($conf->global->$constforvar == $name)
-										{
-											print img_picto($langs->trans("Default"), 'on');
+										$constforvar = 'RECRUITMENT_'.strtoupper($myTmpObjectKey).'_ADDON_PDF';
+										if ($conf->global->$constforvar == $name) {
+											//print img_picto($langs->trans("Default"), 'on');
+											// Even if choice is the default value, we allow to disable it. Replace this with previous line if you need to disable unset
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&amp;token='.newToken().'&amp;object='.urlencode(strtolower($myTmpObjectKey)).'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type='.urlencode($type).'" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 										} else {
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;object='.urlencode(strtolower($myTmpObjectKey)).'&amp;value='.$name.'&amp;scan_dir='.urlencode($module->scandir).'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 										}
 										print '</td>';
 
diff --git a/htdocs/recruitment/admin/setup_candidatures.php b/htdocs/recruitment/admin/setup_candidatures.php
index ef4454974e7..818e1479f0a 100644
--- a/htdocs/recruitment/admin/setup_candidatures.php
+++ b/htdocs/recruitment/admin/setup_candidatures.php
@@ -54,6 +54,9 @@ $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 $value = GETPOST('value', 'alpha');
+$label = GETPOST('label', 'alpha');
+$scandir = GETPOST('scan_dir', 'alpha');
+$type = 'recruitmentcandidature';
 
 $arrayofparameters = array(
 //	'RECRUITMENT_MYPARAM1'=>array('css'=>'minwidth200', 'enabled'=>1),
@@ -131,47 +134,49 @@ if ($action == 'updateMask')
 }
 
 // Activate a model
-elseif ($action == 'set')
-{
+elseif ($action == 'set') {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-} elseif ($action == 'del')
-{
+} elseif ($action == 'del') {
 	$tmpobjectkey = GETPOST('object');
 
 	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
-		$constforval = strtoupper($tmpobjectkey).'_ADDON_PDF';
+	if ($ret > 0) {
+		$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		if ($conf->global->$constforval == "$value") dolibarr_del_const($db, $constforval, $conf->entity);
 	}
 }
 
-// Set default model
-elseif ($action == 'setdoc')
-{
+elseif ($action == 'setmod') {
+	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
 	$tmpobjectkey = GETPOST('object');
-	$constforval = strtoupper($tmpobjectkey).'_ADDON_PDF';
-	if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity))
-	{
+	if (!empty($tmpobjectkey)) {
+		$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey)."_ADDON";
+
+		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
+	}
+}
+
+// Set default model
+elseif ($action == 'setdoc') {
+	$tmpobjectkey = GETPOST('object');
+	$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
+	if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
 		// The constant that was read before the new set
 		// We therefore requires a variable to have a coherent view
 		$conf->global->$constforval = $value;
 	}
 
-	// On active le modele
+	// We disable/enable the document template (into llx_document_model table)
 	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
+	if ($ret > 0) {
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-} elseif ($action == 'setmod')
-{
-	// TODO Check if numbering module chosen can be activated
-	// by calling method canBeActivated
+} elseif ($action == 'unsetdoc') {
 	$tmpobjectkey = GETPOST('object');
-	$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey)."_ADDON";
-
-	dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
+	if (!empty($tmpobjectkey)) {
+		$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
+		dolibarr_del_const($db, $constforval, $conf->entity);
+	}
 }
 
 
@@ -465,11 +470,12 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										// Default
 										print '<td class="center">';
 										$constforvar = 'RECRUITMENT_'.strtoupper($myTmpObjectKey).'_ADDON';
-										if ($conf->global->$constforvar == $name)
-										{
-											print img_picto($langs->trans("Default"), 'on');
+										if ($conf->global->$constforvar == $name) {
+											//print img_picto($langs->trans("Default"), 'on');
+											// Even if choice is the default value, we allow to disable it. Replace this with previous line if you need to disable unset
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&amp;token='.newToken().'&amp;object='.urlencode(strtolower($myTmpObjectKey)).'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type='.urlencode($type).'" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 										} else {
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;object='.urlencode(strtolower($myTmpObjectKey)).'&amp;value='.$name.'&amp;scan_dir='.urlencode($module->scandir).'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 										}
 										print '</td>';
 
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index 5dad53212c6..3049f83a053 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -982,7 +982,7 @@ class RecruitmentCandidature extends CommonObject
 
 		$modelpath = "core/modules/recruitment/doc/";
 
-		if ($includedocgeneration) {
+		if ($includedocgeneration && !empty($modele)) {
 			$result = $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 		}
 
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index 2421f87ce50..c202a523e58 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -1059,8 +1059,7 @@ class RecruitmentJobPosition extends CommonObject
 		$langs->load("recruitment");
 
 		if (!dol_strlen($modele)) {
-			if (!empty($conf->global->RECRUITMENTJOBPOSITION_ADDON_PDF))
-			{
+			if (!empty($conf->global->RECRUITMENTJOBPOSITION_ADDON_PDF)) {
 				$modele = $conf->global->RECRUITMENTJOBPOSITION_ADDON_PDF;
 			} else {
 				$modele = ''; // No default value. For job position, we allow to disable all PDF generation
@@ -1069,7 +1068,7 @@ class RecruitmentJobPosition extends CommonObject
 
 		$modelpath = "core/modules/recruitment/doc/";
 
-		if ($includedocgeneration) {
+		if ($includedocgeneration && !empty($modele)) {
 			$result = $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 		}
 
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
index be36b96682c..59ea51466b6 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
@@ -181,7 +181,7 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
-		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '<span class="opacitymedium">'.$langs->trans("ExampleOfDirectoriesForModelGen").'</span>';
 		$texte .= '</td>';
 		$texte .= '</tr>';
 

From f4b299e530f37d2368b26642a303338c333e63d9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Dec 2020 14:35:13 +0100
Subject: [PATCH 350/888] Fix generation of PDF

---
 .../doc/pdf_standard_recruitmentjobposition.modules.php       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
index cad6888f7c5..5f257f594cf 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
@@ -825,7 +825,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		// Show Draft Watermark
-		if ($object->statut == Facture::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK)))
+		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK)))
 		{
 			  pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FACTURE_DRAFT_WATERMARK);
 		}
@@ -885,7 +885,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
 		$textref = $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref);
-		if ($object->statut == Facture::STATUS_DRAFT)
+		if ($object->statut == $object::STATUS_DRAFT)
 		{
 			$pdf->SetTextColor(128, 0, 0);
 			$textref .= ' - '.$outputlangs->transnoentities("NotValidated");

From 4fcd3fe49332baab0e424225ad10b76b47ebcbac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Dec 2020 15:11:51 +0100
Subject: [PATCH 351/888] =?UTF-8?q?Fix=20disallow=20--=20string=20into=20f?=
 =?UTF-8?q?ilename=20for=20security=20purpose.=20Vulnerability=20reported?=
 =?UTF-8?q?=20by=20Y=C4=B1lmaz=20De=C4=9Firmenci?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/admin/tools/export_files.php |  2 +-
 htdocs/core/lib/functions.lib.php   |  5 +++--
 test/phpunit/SecurityTest.php       | 25 ++++++++++++++++++++++++-
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php
index de10759c92d..587750d129e 100644
--- a/htdocs/admin/tools/export_files.php
+++ b/htdocs/admin/tools/export_files.php
@@ -34,7 +34,7 @@ $action = GETPOST('action', 'alpha');
 $what = GETPOST('what', 'alpha');
 $export_type = GETPOST('export_type', 'alpha');
 $file = trim(GETPOST('zipfilename_template', 'alpha'));
-$compression = GETPOST('compression');
+$compression = GETPOST('compression', 'aZ09');
 
 $file = dol_sanitizeFileName($file);
 $file = preg_replace('/(\.zip|\.tar|\.tgz|\.gz|\.tar\.gz|\.bz2)$/i', '', $file);
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5094fad392a..37791d1e72d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -866,8 +866,9 @@ function dol_sanitizeFileName($str, $newstr = '_', $unaccent = 1)
 	// List of special chars for filenames in windows are defined on page https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file
 	// Char '>' '<' '|' '$' and ';' are special chars for shells.
 	// Char '/' and '\' are file delimiters.
-	$filesystem_forbidden_chars = array('<', '>', '/', '\\', '?', '*', '|', '"', ':', '°', '$', ';');
-	return dol_string_nospecial($unaccent ?dol_string_unaccent($str) : $str, $newstr, $filesystem_forbidden_chars);
+	// -- car can be used into filename to inject special paramaters like --use-compress-program to make command with file as parameter making remote execution of command
+	$filesystem_forbidden_chars = array('<', '>', '/', '\\', '?', '*', '|', '"', ':', '°', '$', ';', '--');
+	return dol_string_nospecial($unaccent ? dol_string_unaccent($str) : $str, $newstr, $filesystem_forbidden_chars);
 }
 
 /**
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 5a248006498..6d2a3cf3cd8 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -244,7 +244,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 
         $login=checkLoginPassEntity('admin', 'admin', 1, array('dolibarr'));            // Should works because admin/admin exists
         print __METHOD__." login=".$login."\n";
-        $this->assertEquals($login, 'admin');
+        $this->assertEquals($login, 'admin', 'The test to check if pass of user "admin" is "admin" has failed');
 
         $login=checkLoginPassEntity('admin', 'admin', 1, array('http','dolibarr'));    // Should work because of second authetntication method
         print __METHOD__." login=".$login."\n";
@@ -326,4 +326,27 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$result=restrictedArea($user, 'societe');
 		$this->assertEquals(1, $result);
     }
+
+    /**
+     * testDolSanitizeFileName
+     *
+     * @return void
+     */
+    public function testDolSanitizeFileName()
+    {
+    	global $conf,$user,$langs,$db;
+    	$conf=$this->savconf;
+    	$user=$this->savuser;
+    	$langs=$this->savlangs;
+    	$db=$this->savdb;
+
+    	//$dummyuser=new User($db);
+    	//$result=restrictedArea($dummyuser,'societe');
+
+    	$result=dol_sanitizeFileName('bad file | evilaction');
+    	$this->assertEquals('bad file _ evilaction', $result);
+
+    	$result=dol_sanitizeFileName('bad file --evilparam');
+    	$this->assertEquals('bad file _evilparam', $result);
+    }
 }

From a5cf177025d12c7419665a0730f315e74555fe49 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 11 Dec 2020 15:22:29 +0100
Subject: [PATCH 352/888] Close #15729 : first push

---
 htdocs/core/boxes/box_scheduled_jobs.php      | 187 ++++++++++++++++++
 htdocs/core/modules/modCron.class.php         |   4 +-
 .../install/mysql/migration/12.0.0-13.0.0.sql |   4 +-
 htdocs/langs/en_US/boxes.lang                 |   1 +
 htdocs/langs/en_US/cron.lang                  |   6 +-
 5 files changed, 199 insertions(+), 3 deletions(-)
 create mode 100644 htdocs/core/boxes/box_scheduled_jobs.php

diff --git a/htdocs/core/boxes/box_scheduled_jobs.php b/htdocs/core/boxes/box_scheduled_jobs.php
new file mode 100644
index 00000000000..21c0019d525
--- /dev/null
+++ b/htdocs/core/boxes/box_scheduled_jobs.php
@@ -0,0 +1,187 @@
+<?php
+/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2011 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2017 	   Nicolas Zabouri      <info@inovea-conseil.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/core/boxes/box_scheduled_jobs.php
+ *		\ingroup    task
+ *      \brief      Widget of scheduled jobs
+ */
+
+include_once DOL_DOCUMENT_ROOT . '/core/boxes/modules_boxes.php';
+
+
+/**
+ * Class to manage the box to show last contracted products/services lines
+ */
+class box_scheduled_jobs extends ModeleBoxes
+{
+	public $boxcode = "scheduledjobs";
+	public $boximg = "object_cron";
+	public $boxlabel = "BoxScheduledJobs";
+	public $depends = array("cron");
+
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
+
+	public $param;
+
+	public $info_box_head = array();
+	public $info_box_contents = array();
+
+
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $user;
+
+		$this->db = $db;
+
+		$this->hidden = !($user->rights->service->lire && $user->rights->contrat->lire);
+	}
+
+	/**
+	 *  Load data into info_box_contents array to show array later.
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $user, $langs, $conf;
+		$this->max = $max;
+		$langs->load("cron");
+		$this->info_box_head = array('text' => $langs->trans("BoxScheduledJobs", $max));
+
+		if ($user->rights->cron->read) {
+			include_once DOL_DOCUMENT_ROOT . '/cron/class/cronjob.class.php';
+			$cronstatic = new Cronjob($this->db);
+			$nomUrlArray;
+
+			$result = 0;
+			$sql = "SELECT t.rowid, t.datelastrun, t.datenextrun";
+			$sql .= ", t.label, t.status, t.lastresult";
+			$sql .= " FROM " . MAIN_DB_PREFIX . "cronjob as t";
+			$sql .= $this->db->order("t.datelastrun", "DESC");
+
+			$result = $this->db->query($sql);
+			$line = 0;
+			$nbjobsinerror = 0;
+			if ($result) {
+				$num = $this->db->num_rows($result);
+				$i = 1;
+				$objp = $this->db->fetch_object($result);
+				$cronstatic->id = $objp->rowid;
+				$cronstatic->ref = $objp->rowid;
+				$cronstatic->status = $objp->status;
+				$cronstatic->datenextrun = $objp->datenextrun;
+				$cronstatic->datelastrun = $objp->datelastrun;
+				while ($i < $num) {
+					if ($line == 0) {
+						$resultarray[$line] = array(
+							$langs->trans("LastExecutedScheduledJob"),
+							$cronstatic->getNomUrl(1),
+							$this->db->jdate($cronstatic->datelastrun),
+							$cronstatic->status
+						);
+						$line++;
+					} else {
+						$objp = $this->db->fetch_object($result);
+						if ($objp->datenextrun < $cronstatic->datenextrun) {
+							$cronstatic->id = $objp->rowid;
+							$cronstatic->ref = $objp->rowid;
+							$cronstatic->status = $objp->status;
+							$cronstatic->datenextrun = $objp->datenextrun;
+						}
+					}
+					if ($obj->lastresult < 0) {
+						$nbjobsinerror++;
+					}
+					$i++;
+				}
+				$resultarray[$line] = array(
+					$langs->trans("NextScheduledJobExecute"),
+					$cronstatic->getNomUrl(1),
+					$this->db->jdate($cronstatic->datenextrun),
+					$cronstatic->status
+				);
+				$line = 0;
+				while ($line < 2) {
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="left"',
+						'text' => $resultarray[$line][0]
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="left"',
+						'textnoformat' => $resultarray[$line][1]
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'textnoformat' => dol_print_date($resultarray[$line][2],"dayhoursec")
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" ',
+						'textnoformat' => empty($resultarray[$line][3]) ? $langs->trans("Disabled") : $langs->trans("Scheduled")
+					);
+					$line++;
+				}
+				$this->info_box_contents[$line][] = array(
+					'td' => 'class="left" colspan="2"',
+					'text' => $langs->trans("NumberScheduledJobError")
+				);
+				$this->info_box_contents[$line][] = array(
+					'td' => 'class="right"colspan="2"',
+					'text' => $nbjobsinerror . ""
+				);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength' => 500,
+					'text' => ($this->db->error() . ' sql=' . $sql)
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
+
+	/**
+	 *	Method to show box
+	 *
+	 *	@param	array	$head       Array with properties of box title
+	 *	@param  array	$contents   Array with properties of box lines
+	 *  @param	int		$nooutput	No print, only return string
+	 *	@return	string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
+}
diff --git a/htdocs/core/modules/modCron.class.php b/htdocs/core/modules/modCron.class.php
index b8b281b79d1..deb140f76e4 100644
--- a/htdocs/core/modules/modCron.class.php
+++ b/htdocs/core/modules/modCron.class.php
@@ -91,7 +91,9 @@ class modCron extends DolibarrModules
 
 		// Boxes
 		//------
-		$this->boxes = array();
+		$this->boxes = array(
+			0 => array('file' => 'box_scheduled_jobs.php', 'enabledbydefaulton' => 'Home')
+		);
 
 		// Cronjobs
 		$this->cronjobs = array(
diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index 1d8c7a37b95..3c7c6d2f8d3 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -551,4 +551,6 @@ INSERT INTO llx_boxes_def(file,entity) VALUES ('box_funnel_of_prospection.php',1
 
 INSERT INTO llx_boxes_def(file, entity) VALUES ('box_customers_outstanding_bill_reached.php', 1);
 
-ALTER TABLE llx_product_fournisseur_price ADD COLUMN packaging varchar(64);
\ No newline at end of file
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN packaging varchar(64);
+
+INSERT INTO llx_boxes_def(file, entity) VALUES ('box_scheduled_jobs.php',1);
\ No newline at end of file
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index 1e91080962e..470a8f5274e 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -51,6 +51,7 @@ BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
 BoxTitleFunnelOfProspection=Amount of prospection by status
+BoxScheduledJobs=Schedules jobs
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=No bookmarks defined.
diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang
index 9bf918a73a3..2ebdda1e685 100644
--- a/htdocs/langs/en_US/cron.lang
+++ b/htdocs/langs/en_US/cron.lang
@@ -84,4 +84,8 @@ MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
 DATAPOLICYJob=Data cleaner and anonymizer
-JobXMustBeEnabled=Job %s must be enabled
\ No newline at end of file
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error

From 54228ad256322209677f8e3602c6b34f96aa3831 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 11 Dec 2020 15:49:47 +0100
Subject: [PATCH 353/888] Close #15729 : fix bug with nb jobs

---
 htdocs/core/boxes/box_scheduled_jobs.php | 32 ++++++++++--------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/htdocs/core/boxes/box_scheduled_jobs.php b/htdocs/core/boxes/box_scheduled_jobs.php
index 21c0019d525..ccb438c30f2 100644
--- a/htdocs/core/boxes/box_scheduled_jobs.php
+++ b/htdocs/core/boxes/box_scheduled_jobs.php
@@ -92,14 +92,16 @@ class box_scheduled_jobs extends ModeleBoxes
 			$nbjobsinerror = 0;
 			if ($result) {
 				$num = $this->db->num_rows($result);
-				$i = 1;
-				$objp = $this->db->fetch_object($result);
-				$cronstatic->id = $objp->rowid;
-				$cronstatic->ref = $objp->rowid;
-				$cronstatic->status = $objp->status;
-				$cronstatic->datenextrun = $objp->datenextrun;
-				$cronstatic->datelastrun = $objp->datelastrun;
+				$i = 0;
 				while ($i < $num) {
+					$objp = $this->db->fetch_object($result);
+					if ($line == 0 || $objp->datenextrun < $cronstatic->datenextrun) {
+						$cronstatic->id = $objp->rowid;
+						$cronstatic->ref = $objp->rowid;
+						$cronstatic->status = $objp->status;
+						$cronstatic->datenextrun = $objp->datenextrun;
+						$cronstatic->datelastrun = $objp->datelastrun;
+					}
 					if ($line == 0) {
 						$resultarray[$line] = array(
 							$langs->trans("LastExecutedScheduledJob"),
@@ -108,16 +110,8 @@ class box_scheduled_jobs extends ModeleBoxes
 							$cronstatic->status
 						);
 						$line++;
-					} else {
-						$objp = $this->db->fetch_object($result);
-						if ($objp->datenextrun < $cronstatic->datenextrun) {
-							$cronstatic->id = $objp->rowid;
-							$cronstatic->ref = $objp->rowid;
-							$cronstatic->status = $objp->status;
-							$cronstatic->datenextrun = $objp->datenextrun;
-						}
-					}
-					if ($obj->lastresult < 0) {
+					} 
+					if (!empty($objp->lastresult)){
 						$nbjobsinerror++;
 					}
 					$i++;
@@ -141,7 +135,7 @@ class box_scheduled_jobs extends ModeleBoxes
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'textnoformat' => dol_print_date($resultarray[$line][2],"dayhoursec")
+						'textnoformat' => dol_print_date($resultarray[$line][2], "dayhoursec")
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right" ',
@@ -155,7 +149,7 @@ class box_scheduled_jobs extends ModeleBoxes
 				);
 				$this->info_box_contents[$line][] = array(
 					'td' => 'class="right"colspan="2"',
-					'text' => $nbjobsinerror . ""
+					'text' => $nbjobsinerror
 				);
 			} else {
 				$this->info_box_contents[0][0] = array(

From dea75e6158cf95dd7b2c8a2f893dac7d118a812b Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 11 Dec 2020 15:55:17 +0100
Subject: [PATCH 354/888] Close #15729  : fix error on box name and format

---
 htdocs/core/boxes/box_scheduled_jobs.php | 4 ++--
 htdocs/langs/en_US/boxes.lang            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/boxes/box_scheduled_jobs.php b/htdocs/core/boxes/box_scheduled_jobs.php
index ccb438c30f2..1739c6ab8e9 100644
--- a/htdocs/core/boxes/box_scheduled_jobs.php
+++ b/htdocs/core/boxes/box_scheduled_jobs.php
@@ -110,8 +110,8 @@ class box_scheduled_jobs extends ModeleBoxes
 							$cronstatic->status
 						);
 						$line++;
-					} 
-					if (!empty($objp->lastresult)){
+					}
+					if (!empty($objp->lastresult)) {
 						$nbjobsinerror++;
 					}
 					$i++;
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index 470a8f5274e..b5216e09df5 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -51,7 +51,7 @@ BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
 BoxTitleFunnelOfProspection=Amount of prospection by status
-BoxScheduledJobs=Schedules jobs
+BoxScheduledJobs=Scheduled jobs
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=No bookmarks defined.

From 8a0c06516336fbe5c45e80e233a437d5f23369f6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Dec 2020 16:30:45 +0100
Subject: [PATCH 355/888] Debug v13

---
 htdocs/core/class/html.form.class.php  | 4 ++--
 htdocs/core/lib/ajax.lib.php           | 2 +-
 htdocs/product/class/product.class.php | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index e1e1fc45228..b487d3f3043 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6197,6 +6197,7 @@ class Form
 			$tmpfieldstoshow = '';
 			foreach ($objecttmp->fields as $key => $val)
 			{
+				if (!dol_eval($val['enabled'], 1, 1)) continue;
 				if ($val['showoncombobox']) $tmpfieldstoshow .= ($tmpfieldstoshow ? ',' : '').'t.'.$key;
 			}
 			if ($tmpfieldstoshow) $fieldstoshow = $tmpfieldstoshow;
@@ -6294,8 +6295,7 @@ class Form
 					}
 					if (empty($outputmode))
 					{
-						if ($preselectedvalue > 0 && $preselectedvalue == $obj->rowid)
-						{
+						if ($preselectedvalue > 0 && $preselectedvalue == $obj->rowid) {
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';
 						} else {
 							$out .= '<option value="'.$obj->rowid.'">'.$label.'</option>';
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 5bcf73ca896..d1c1540cb8a 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -34,7 +34,7 @@
  * @param string	$url 				Ajax Url to call for request: /path/page.php. Must return a json array ('key'=>id, 'value'=>String shown into input field once selected, 'label'=>String shown into combo list)
  * @param string	$urloption			More parameters on URL request
  * @param int		$minLength			Minimum number of chars to trigger that Ajax search
- * @param int		$autoselect			Automatic selection if just one value
+ * @param int		$autoselect			Automatic selection if just one value (trigger("change") on field is done is search return only 1 result)
  * @param array		$ajaxoptions		Multiple options array
  *                                      - Ex: array('update'=>array('field1','field2'...)) will reset field1 and field2 once select done
  *                                      - Ex: array('disabled'=> )
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 6505741d5a2..bcf32cdce26 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -413,6 +413,7 @@ class Product extends CommonObject
 	public $fields = array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
 		'ref'           =>array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
+		'barcode'       =>array('type'=>'varchar(255)', 'label'=>'Barcode', 'enabled'=>'!empty($conf->barcode->enabled)', 'visible'=>-1, 'showoncombobox'=>1),
 		'entity'        =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>20),
 		'label'         =>array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1),
 		'note_public'   =>array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61),

From 4fa1248d15d12818b414ffc0cdb3ccd4c2c01390 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Dec 2020 16:53:03 +0100
Subject: [PATCH 356/888] Fix avoid duplicate rows after double migration

---
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index 1d8c7a37b95..6c3c6e04acb 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -546,9 +546,9 @@ CREATE TABLE llx_session(
 )ENGINE=innodb;
 
 
-
-INSERT INTO llx_boxes_def(file,entity) VALUES ('box_funnel_of_prospection.php',1);
-
-INSERT INTO llx_boxes_def(file, entity) VALUES ('box_customers_outstanding_bill_reached.php', 1);
+-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT  'box_funnel_of_prospection.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_funnel_of_prospection.php' AND entity = 1);
+-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT  'box_customers_outstanding_bill_reached.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_customers_outstanding_bill_reached.php' AND entity = 1);
+--INSERT INTO llx_boxes_def(file, entity) VALUES ('box_funnel_of_prospection.php',1);
+--INSERT INTO llx_boxes_def(file, entity) VALUES ('box_customers_outstanding_bill_reached.php', 1);
 
 ALTER TABLE llx_product_fournisseur_price ADD COLUMN packaging varchar(64);
\ No newline at end of file

From 18efbebd02b2411579a74c3b7cecad264b4961d7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Dec 2020 17:11:50 +0100
Subject: [PATCH 357/888] css

---
 htdocs/core/class/html.form.class.php      |  2 +-
 htdocs/core/class/html.formother.class.php | 11 ++++++-----
 htdocs/core/customreports.php              |  2 +-
 htdocs/langs/en_US/boxes.lang              |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 7851b40543a..fdcdc89e53e 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6772,7 +6772,7 @@ class Form
 					{
 						$out .= ' selected';
 					}
-					$out .= ' data-html="'.$newval.'"';
+					$out .= ' data-html="'.dol_escape_htmltag($newval).'"';
 					$out .= '>';
 					$out .= dol_htmlentitiesbr($newval);
 					$out .= '</option>'."\n";
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 2973eda7144..c71029769f2 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -1371,9 +1371,10 @@ class FormOther
 	 * @param 	mixed	$object				Object analyzed
 	 * @param	array	$search_groupby		Array of preselected fields
 	 * @param	array	$arrayofgroupby		Array of groupby to fill
+	 * @param	string	$morecss			More CSS
 	 * @return string						HTML string component
 	 */
-	public function selectGroupByField($object, $search_groupby, &$arrayofgroupby)
+	public function selectGroupByField($object, $search_groupby, &$arrayofgroupby, $morecss = 'minwidth200 maxwidth250')
 	{
 		global $langs, $extrafields, $form;
 
@@ -1395,9 +1396,9 @@ class FormOther
 				if (preg_match('/^pass/', $key)) continue;
 				if (in_array($val['type'], array('html', 'text'))) continue;
 				if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
-					$arrayofgroupby['t.'.$key.'-year'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.')', 'position' => $val['position'].'-y');
-					$arrayofgroupby['t.'.$key.'-month'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.')', 'position' => $val['position'].'-m');
-					$arrayofgroupby['t.'.$key.'-day'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.'-'.$DD.')', 'position' => $val['position'].'-d');
+					$arrayofgroupby['t.'.$key.'-year'] = array('label' => $langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.')</span>', 'position' => $val['position'].'-y');
+					$arrayofgroupby['t.'.$key.'-month'] = array('label' => $langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.')</span>', 'position' => $val['position'].'-m');
+					$arrayofgroupby['t.'.$key.'-day'] = array('label' => $langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.'-'.$DD.')</span>', 'position' => $val['position'].'-d');
 				} else {
 					$arrayofgroupby['t.'.$key] = array('label' => $langs->trans($val['label']), 'position' => (int) $val['position']);
 				}
@@ -1417,7 +1418,7 @@ class FormOther
 		foreach ($arrayofgroupby as $key => $val) {
 			$arrayofgroupbylabel[$key] = $val['label'];
 		}
-		$result = $form->selectarray('search_groupby', $arrayofgroupbylabel, $search_groupby, 1, 0, 0, '', 0, 0, 0, '', 'minwidth250', 1);
+		$result = $form->selectarray('search_groupby', $arrayofgroupbylabel, $search_groupby, 1, 0, 0, '', 0, 0, 0, '', $morecss, 1);
 
 		return $result;
 	}
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 0a7f4ce9826..901a0aa0f59 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -377,7 +377,7 @@ if ($object->isextrafieldmanaged) {
 	}
 }
 print '<div class="inline-block"><span class="fas fa-chart-line paddingright" title="'.$langs->trans("Measures").'"></span>'.$langs->trans("Measures").'</div> ';
-print $form->multiselectarray('search_measures', $arrayofmesures, $search_measures, 0, 0, 'minwidth500', 1);
+print $form->multiselectarray('search_measures', $arrayofmesures, $search_measures, 0, 0, 'minwidth400', 1);
 print '</div>';
 
 
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index 1e91080962e..11a22879367 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -50,7 +50,7 @@ BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
-BoxTitleFunnelOfProspection=Amount of prospection by status
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=No bookmarks defined.

From 8882759e7af40641826cbc893c37f18dcf10c79e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 11 Dec 2020 17:55:08 +0100
Subject: [PATCH 358/888] hide topmenu option in config/display

---
 htdocs/admin/ihm.php           | 14 ++++++++++++--
 htdocs/core/js/lib_foot.js.php |  4 ----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index ad2cd408471..417fccafdb6 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -156,7 +156,8 @@ if ($action == 'update')
 	dolibarr_set_const($db, "MAIN_SIZE_SHORTLIST_LIMIT", GETPOST("main_size_shortliste_limit", 'int'), 'chaine', 0, '', $conf->entity);
 
 	//dolibarr_set_const($db, "MAIN_DISABLE_JAVASCRIPT", GETPOST("MAIN_DISABLE_JAVASCRIPT", 'aZ09'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_BUTTON_HIDE_UNAUTHORIZED", GETPOST("MAIN_BUTTON_HIDE_UNAUTHORIZED", 'aZ09'), 'chaine', 0, '', $conf->entity);
+	//dolibarr_set_const($db, "MAIN_BUTTON_HIDE_UNAUTHORIZED", GETPOST("MAIN_BUTTON_HIDE_UNAUTHORIZED", 'aZ09'), 'chaine', 0, '', $conf->entity);
+	//dolibarr_set_const($db, "MAIN_MENU_HIDE_UNAUTHORIZED", GETPOST("MAIN_MENU_HIDE_UNAUTHORIZED", 'aZ09'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_START_WEEK", GETPOST("MAIN_START_WEEK", 'int'), 'chaine', 0, '', $conf->entity);
 
 	dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_DAYS", GETPOST("MAIN_DEFAULT_WORKING_DAYS", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
@@ -327,9 +328,18 @@ print '</td>';
 print '<td width="20">&nbsp;</td>';
 print '</tr>';
 
+// Hide unauthorized menus
+print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("HideUnauthorizedMenu").'</td><td>';
+//print $form->selectyesno('MAIN_MENU_HIDE_UNAUTHORIZED', isset($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) ? $conf->global->MAIN_MENU_HIDE_UNAUTHORIZED : 0, 1);
+print ajax_constantonoff("MAIN_MENU_HIDE_UNAUTHORIZED", array(), $conf->entity, 0, 0, 1, 0);
+print '</td>';
+print '<td width="20">&nbsp;</td>';
+print '</tr>';
+
 // Hide unauthorized button
 print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("ButtonHideUnauthorized").'</td><td>';
-print $form->selectyesno('MAIN_BUTTON_HIDE_UNAUTHORIZED', isset($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) ? $conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED : 0, 1);
+//print $form->selectyesno('MAIN_BUTTON_HIDE_UNAUTHORIZED', isset($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) ? $conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED : 0, 1);
+print ajax_constantonoff("MAIN_BUTTON_HIDE_UNAUTHORIZED", array(), $conf->entity, 0, 0, 1, 0);
 print '</td>';
 print '<td width="20">&nbsp;</td>';
 print '</tr>';
diff --git a/htdocs/core/js/lib_foot.js.php b/htdocs/core/js/lib_foot.js.php
index 8419f76bfc1..d04379210a6 100644
--- a/htdocs/core/js/lib_foot.js.php
+++ b/htdocs/core/js/lib_foot.js.php
@@ -196,7 +196,3 @@ print '
 					}
 				});
 			});'."\n";
-// hide topmenus disabled
-if (!empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) && (!$user->admin)) {
-    print '$("li:has(.tmenudisabled)").hide();';
-}

From e9288ce0dacf013f4a03a92ad42f7d5bca85cdb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 11 Dec 2020 17:58:43 +0100
Subject: [PATCH 359/888] fix translation

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

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 417fccafdb6..ba223efb103 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -364,7 +364,7 @@ print '</tr>';
 
 // Hide wiki link on login page
 $pictohelp = '<span class="fa fa-question-circle"></span>';
-print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableLinkToHelp", $pictohelp).'</td><td>';
+print '<tr class="oddeven"><td class="titlefield">'.str_replace('{picto}', $pictohelp, $langs->trans("DisableLinkToHelp", '{picto}')).'</td><td>';
 print ajax_constantonoff("MAIN_HELP_DISABLELINK", array(), $conf->entity, 0, 0, 1, 0);
 //print $form->selectyesno('MAIN_HELP_DISABLELINK', isset($conf->global->MAIN_HELP_DISABLELINK) ? $conf->global->MAIN_HELP_DISABLELINK : 0, 1);
 print '</td>';

From 9100e1410e72da2f15aaf051e4207b6dfcedcaf0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Dec 2020 17:57:57 +0100
Subject: [PATCH 360/888] Fix translation, add comments and clean code, fix
 also a small regression on colors for graph with lines

---
 .../core/boxes/box_funnel_of_prospection.php  |  6 +-
 htdocs/core/class/dolgraph.class.php          | 76 +++++++++++--------
 2 files changed, 46 insertions(+), 36 deletions(-)

diff --git a/htdocs/core/boxes/box_funnel_of_prospection.php b/htdocs/core/boxes/box_funnel_of_prospection.php
index e75e8959a03..a50426e1b29 100644
--- a/htdocs/core/boxes/box_funnel_of_prospection.php
+++ b/htdocs/core/boxes/box_funnel_of_prospection.php
@@ -138,7 +138,7 @@ class box_funnel_of_prospection extends ModeleBoxes
 		$this->max = $max;
 
 		$this->info_box_head = array(
-			'text' => $langs->trans("Statistics") . ' - ' . $langs->trans("OpportunitiesStatusForOpenedProjects"),
+			'text' => $langs->trans("Statistics") . ' - ' . $langs->trans("BoxTitleFunnelOfProspection"),
 			'graph' => '1'
 		);
 
@@ -220,12 +220,12 @@ class box_funnel_of_prospection extends ModeleBoxes
 					$dolgraph->SetDataColor(array_values($colorseriesstat));
 					$dolgraph->setShowLegend(2);
 					$dolgraph->setShowPercent(1);
-					$dolgraph->setTitle('FunnelOfProspection');
+					$dolgraph->setTitle('');
 					$dolgraph->SetType(array('horizontalbars'));
 					$dolgraph->SetHeight('200');
 					$dolgraph->SetWidth('600');
 					$dolgraph->mode = 'depth';
-					$dolgraph->draw('idgraphstatus');
+					$dolgraph->draw('idgraphleadfunnel');
 					$stringtoprint .= $dolgraph->show($totaloppnb ? 0 : 1);
 				}
 				$stringtoprint .= '</div>';
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 3c34668ecd2..bd350e40991 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -1000,7 +1000,7 @@ class DolGraph
 		$tag = dol_escape_htmltag(dol_string_unaccent(dol_string_nospecial(basename($file), '_', array('-', '.'))));
 
 		$this->stringtoshow = '<!-- Build using chart -->' . "\n";
-		if (!empty($this->title)&&$this->title!='FunnelOfProspection') $this->stringtoshow .= '<div class="center 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 . (strpos($this->width, '%') > 0 ? '' : 'px') . '; height:' . $this->height . 'px;" class="nographyet"></div>';
 			$this->stringtoshow .= '<div class="nographyettext margintoponly">' . $langs->trans("NotEnoughDataYet") . '...</div>';
@@ -1129,10 +1129,12 @@ class DolGraph
 		// Other cases, graph of type 'bars', 'lines', 'linesnopoint'
 		else {
 			$type = 'bar';
+
 			$isfunnel = false;
+			if ($file == 'idgraphleadfunnel') $isfunnel = true;
+
 			if (!isset($this->type[$firstlot]) || $this->type[$firstlot] == 'bars') $type = 'bar';
 			if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'horizontalbars') $type = 'horizontalBar';
-			if ($this->title == 'FunnelOfProspection') $isfunnel = true;
 			if (isset($this->type[$firstlot]) && ($this->type[$firstlot] == 'lines' || $this->type[$firstlot] == 'linesnopoint')) $type = 'line';
 
 			$this->stringtoshow .= 'var options = { maintainAspectRatio: false, aspectRatio: 2.5, ';
@@ -1140,8 +1142,8 @@ class DolGraph
 				$this->stringtoshow .= 'legend: { display: false }, ';
 			}
 			$this->stringtoshow .= 'scales: { xAxes: [{ ';
-			if ($isfunnel) {
-				$this->stringtoshow .= ' ticks: { beginAtZero: true}, display: false,';
+			if ($isfunnel) {	// FIXME Remove isfunnel by introducing a method hideXValues() on dolgraph
+				$this->stringtoshow .= ' ticks: { display: false }, display: true,';
 			}
 			//$this->stringtoshow .= 'type: \'time\', ';		// Need Moment.js
 			$this->stringtoshow .= 'distribution: \'linear\'';
@@ -1153,8 +1155,9 @@ class DolGraph
 				$this->stringtoshow .= ', yAxes: [{ stacked: true }]';
 			}
 			$this->stringtoshow .= ' }';
+			// Add a callback to change label to show only positive value
 			if ($isfunnel) {
-				$this->stringtoshow .= ', tooltips: {mode: \'nearest\',
+				$this->stringtoshow .= ', tooltips: { mode: \'nearest\',
 					callbacks: {
 						title: function(tooltipItem, data) {
 							return data.datasets[tooltipItem[0].datasetIndex].label;
@@ -1177,13 +1180,13 @@ class DolGraph
 					labels: [';
 
 			$i = 0;
-			if (!$isfunnel);{
-			foreach ($legends as $val)	// Loop on each serie
-				{
-				if ($i > 0) $this->stringtoshow .= ', ';
-				$this->stringtoshow .= "'".dol_escape_js(dol_trunc($val, 32))."'";
-				$i++;
-			}
+			if (!$isfunnel) {
+				foreach ($legends as $val)	// Loop on each serie
+					{
+					if ($i > 0) $this->stringtoshow .= ', ';
+					$this->stringtoshow .= "'".dol_escape_js(dol_trunc($val, 32))."'";
+					$i++;
+				}
 			}
 
 			//var_dump($arrayofgroupslegend);
@@ -1238,25 +1241,33 @@ class DolGraph
 					$color = 'rgb(' . $newcolor[0] . ', ' . $newcolor[1] . ', ' . $newcolor[2] . ', 0.9)';
 					$bordercolor = 'rgb(' . $newcolor[0] . ', ' . $newcolor[1] . ', ' . $newcolor[2] . ')';
 				} else { // We do not use a 'group by'
-					if (is_array($this->datacolor[$i])) $color = 'rgb(' . $this->datacolor[$i][0] . ', ' . $this->datacolor[$i][1] . ', ' . $this->datacolor[$i][2] . ')'; // If datacolor is array(R, G, B)
-					else {
-						$tmp = str_replace('#', '', $this->datacolor[$i]);
-						if (strpos($tmp, '-') !== false) {
-							$foundnegativecolor++;
-							$color = '#FFFFFF'; // If $val is '-123'
+					if ($isfunnel) {
+						if (is_array($this->datacolor[$i])) {
+							$color = 'rgb(' . $this->datacolor[$i][0] . ', ' . $this->datacolor[$i][1] . ', ' . $this->datacolor[$i][2] . ', 0.9)'; // If datacolor is array(R, G, B)
 						} else {
-							$color = "#" . $tmp; // If $val is '123' or '#123'
-							$bordercolor = $color;
-						}
-						if ($foundnegativecolor) {
-							if (is_array($this->datacolor[$i])) $color = 'null'; // If datacolor is array(R, G, B)
-							else {
-								$tmp = str_replace('#', '', $this->datacolor[$i]);
-								if (strpos($tmp, '-') !== false) $bordercolor = '#' . str_replace('-', '', $tmp); // If $val is '-123'
-								else $bordercolor = 'null'; // If $val is '123' or '#123'
+							// TODO FIXME This logic must be in the caller that set $this->datacolor
+							$tmp = str_replace('#', '', $this->datacolor[$i]);
+							if (strpos($tmp, '-') !== false) {
+								$foundnegativecolor++;
+								$color = '#FFFFFF'; // If $val is '-123'
+							} else {
+								$color = "#" . $tmp; // If $val is '123' or '#123'
+								$bordercolor = $color;
+							}
+							if ($foundnegativecolor) {
+								if (is_array($this->datacolor[$i])) $color = 'null'; // If datacolor is array(R, G, B)
+								else {
+									$tmp = str_replace('#', '', $this->datacolor[$i]);
+									if (strpos($tmp, '-') !== false) $bordercolor = '#' . str_replace('-', '', $tmp); // If $val is '-123'
+									else $bordercolor = 'null'; // If $val is '123' or '#123'
+								}
+								$bordercolor == 'null' ? "'rgba(0,0,0,0.2)'" : "'" . $bordercolor . "'";
 							}
-							$bordercolor == 'null' ? "'rgba(0,0,0,0.2)'" : "'" . $bordercolor . "'";
 						}
+					} else {
+						$color = 'rgb('.$this->datacolor[$i][0].', '.$this->datacolor[$i][1].', '.$this->datacolor[$i][2].', 0.9)';
+						$bordercolor = $color;
+						//$color = (!empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor));
 					}
 				}
 
@@ -1267,19 +1278,18 @@ class DolGraph
 				$this->stringtoshow .= 'label: \'' . dol_escape_js(dol_string_nohtmltag($textoflegend)) . '\', ';
 				$this->stringtoshow .= 'pointStyle: \'' . ($this->type[$i] == 'linesnopoint' ? 'line' : 'circle') . '\', ';
 				$this->stringtoshow .= 'fill: ' . ($type == 'bar' ? 'true' : 'false') . ', ';
-				if ($isfunnel){
+				if ($isfunnel) {
 					$this->stringtoshow .= 'borderWidth: \'2\', ';
-				}
-				elseif ($type == 'bar' || $type == 'horizontalBar') {
+				} elseif ($type == 'bar' || $type == 'horizontalBar') {
 					$this->stringtoshow .= 'borderWidth: \'1\', ';
 				}
 				$this->stringtoshow .= 'borderColor: \'' . $bordercolor . '\', ';
 				$this->stringtoshow .= 'backgroundColor: \'' . $color . '\', ';
 				if ($arrayofgroupslegend[$i]) $this->stringtoshow .= 'stack: \'' . $arrayofgroupslegend[$i]['stacknum'] . '\', ';
 				$this->stringtoshow .='data: [';
-				if ($isfunnel){
+				if ($isfunnel) {
 					$this->stringtoshow .= '['.-$serie[$i].','.$serie[$i].']';
-				}else {
+				} else {
 					$this->stringtoshow .= $serie[$i];
 				}
 				$this->stringtoshow .=']';

From 0b3a5dc7968c9abfab97e9394ab96958ddc71634 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 11 Dec 2020 18:09:37 +0100
Subject: [PATCH 361/888] fix style

---
 htdocs/admin/ihm.php               | 4 ++++
 htdocs/core/lib/usergroups.lib.php | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index ba223efb103..3652c04518d 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -242,6 +242,7 @@ print '<input type="hidden" name="action" value="update">';
 clearstatcache();
 
 print '<br>';
+print '<div class="div-table-responsive-no-min">';
 print '<table summary="edit" class="noborder centpercent editmode tableforfield">';
 print '<tr class="liste_titre"><th>'.img_picto('', 'language').' '.$langs->trans("Language").'</th><th></th>';
 print '</tr>';
@@ -260,12 +261,14 @@ print '</td>';
 print '</tr>';
 
 print '</table><br>'."\n";
+print '</div>';
 
 // Themes and themes options
 showSkins(null, 1);
 print '<br>';
 
 // Other
+print '<div class="div-table-responsive-no-min">';
 print '<table summary="otherparameters" class="noborder centpercent editmode">';
 print '<tr class="liste_titre"><th>'.$langs->trans("Miscellaneous").'</th><th></th>';
 print '<th width="20">&nbsp;</tg>';
@@ -391,6 +394,7 @@ $doleditor->Create();
 print '</td></tr>'."\n";
 
 print '</table>'."\n";
+print '</div>';
 
 print '<br>';
 
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 9277ebbd81b..913112e04e6 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -315,6 +315,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	if ($foruserprofile) $colspan = 4;
 
 	$thumbsbyrow = 6;
+	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent'.($edit ? ' editmode' : '').' tableforfield">';
 
 	// Title
@@ -911,4 +912,5 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	} else {
 	}
 	print '</table>';
+	print '</div>';
 }

From 5ac677e2ab9d13e28286cb8ef0ac03166186594a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 11 Dec 2020 19:02:13 +0100
Subject: [PATCH 362/888] fix mos api update

---
 htdocs/mrp/class/api_mos.class.php | 68 +++++++++++++++++-------------
 1 file changed, 39 insertions(+), 29 deletions(-)

diff --git a/htdocs/mrp/class/api_mos.class.php b/htdocs/mrp/class/api_mos.class.php
index 1d37e73adad..281ec0fb731 100644
--- a/htdocs/mrp/class/api_mos.class.php
+++ b/htdocs/mrp/class/api_mos.class.php
@@ -107,32 +107,43 @@ class Mos extends DolibarrApi
 
 		// If the internal user must only see his customers, force searching by him
 		$search_sale = 0;
-		if ($restrictonsocid && !DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
+		if ($restrictonsocid && !DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) {
+			$search_sale = DolibarrApiAccess::$user->id;
+		}
 
 		$sql = "SELECT t.rowid";
-		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+			$sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX.$tmpobject->table_element." as t";
 
-		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		}
 		$sql .= " WHERE 1 = 1";
 
 		// Example of use $mode
 		//if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
 		//if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
 
-		if ($tmpobject->ismultientitymanaged) $sql .= ' AND t.entity IN ('.getEntity($tmpobject->element).')';
-		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-		if ($restrictonsocid && $socid) $sql .= " AND t.fk_soc = ".$socid;
-		if ($restrictonsocid && $search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		if ($tmpobject->ismultientitymanaged) {
+			$sql .= ' AND t.entity IN ('.getEntity($tmpobject->element).')';
+		}
+		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+			$sql .= " AND t.fk_soc = sc.fk_soc";
+		}
+		if ($restrictonsocid && $socid) {
+			$sql .= " AND t.fk_soc = ".$socid;
+		}
+		if ($restrictonsocid && $search_sale > 0) {
+			$sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		}
 		// Insert sale filter
-		if ($restrictonsocid && $search_sale > 0)
-		{
+		if ($restrictonsocid && $search_sale > 0) {
 			$sql .= " AND sc.fk_user = ".$search_sale;
 		}
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -141,8 +152,7 @@ class Mos extends DolibarrApi
 
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
-			if ($page < 0)
-			{
+			if ($page < 0) {
 				$page = 0;
 			}
 			$offset = $limit * $page;
@@ -151,12 +161,10 @@ class Mos extends DolibarrApi
 		}
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
 				$tmp_object = new Mo($this->db);
 				if ($tmp_object->fetch($obj->rowid)) {
@@ -164,8 +172,7 @@ class Mos extends DolibarrApi
 				}
 				$i++;
 			}
-		}
-		else {
+		} else {
 			throw new RestException(503, 'Error when retrieve MO list');
 		}
 		if (!count($obj_ret)) {
@@ -221,11 +228,13 @@ class Mos extends DolibarrApi
 		}
 
 		foreach ($request_data as $field => $value) {
-			if ($field == 'id') continue;
+			if ($field == 'id') {
+				continue;
+			}
 			$this->mo->$field = $value;
 		}
 
-		if ($this->mo->update($id, DolibarrApiAccess::$user) > 0) {
+		if ($this->mo->update(DolibarrApiAccess::$user) > 0) {
 			return $this->get($id);
 		} else {
 			throw new RestException(500, $this->mo->error);
@@ -252,8 +261,7 @@ class Mos extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		if (!$this->mo->delete(DolibarrApiAccess::$user))
-		{
+		if (!$this->mo->delete(DolibarrApiAccess::$user)) {
 			throw new RestException(500, 'Error when deleting MO : '.$this->mo->error);
 		}
 
@@ -317,8 +325,7 @@ class Mos extends DolibarrApi
 		// If object has lines, remove $db property
 		if (isset($object->lines) && is_array($object->lines) && count($object->lines) > 0) {
 			$nboflines = count($object->lines);
-			for ($i = 0; $i < $nboflines; $i++)
-			{
+			for ($i = 0; $i < $nboflines; $i++) {
 				$this->_cleanObjectDatas($object->lines[$i]);
 
 				unset($object->lines[$i]->lines);
@@ -341,9 +348,12 @@ class Mos extends DolibarrApi
 	{
 		$myobject = array();
 		foreach ($this->mo->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]))
+			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");
+			}
 				$myobject[$field] = $data[$field];
 		}
 		return $myobject;

From 9b2c9899065a55ba0f1521179f7a06b381388387 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 11 Dec 2020 20:57:02 +0100
Subject: [PATCH 363/888] thirdparty need to be object

---
 .../doc/pdf_aurore.modules.php                | 488 +++++++++---------
 1 file changed, 239 insertions(+), 249 deletions(-)

diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index 8c82198999a..a76d014c861 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -152,15 +152,16 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 		// Get source company
 		$this->emetteur = $mysoc;
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		if (empty($this->emetteur->country_code)) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		}
 
 		// Define position of columns
 		$this->posxdesc = $this->marge_gauche + 1;
 		$this->posxdiscount = 162;
 		$this->postotalht = 174;
 
-		if (!empty($conf->global->PRODUCT_USE_UNITS))
-		{
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			$this->posxtva = 101;
 			$this->posxup = 118;
 			$this->posxqty = 135;
@@ -172,10 +173,11 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			$this->posxunit = 162;
 		}
 
-		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) $this->posxup = $this->posxtva;
+		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
+			$this->posxup = $this->posxtva;
+		}
 		$this->posxpicture = $this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$this->posxpicture -= 20;
 			$this->posxtva -= 20;
 			$this->posxup -= 20;
@@ -209,9 +211,13 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblines;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "supplier_proposal"));
@@ -220,17 +226,16 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 		// Loop on each lines to detect if there is at least one image to show
 		$realpatharray = array();
-		if (!empty($conf->global->MAIN_GENERATE_SUPPLIER_PROPOSAL_WITH_PICTURE))
-		{
-			for ($i = 0; $i < $nblines; $i++)
-			{
-				if (empty($object->lines[$i]->fk_product)) continue;
+		if (!empty($conf->global->MAIN_GENERATE_SUPPLIER_PROPOSAL_WITH_PICTURE)) {
+			for ($i = 0; $i < $nblines; $i++) {
+				if (empty($object->lines[$i]->fk_product)) {
+					continue;
+				}
 
 				$objphoto = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
 
-				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-				{
+				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
 					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				} else {
@@ -239,28 +244,29 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				}
 
 				$realpath = '';
-				foreach ($objphoto->liste_photos($dir, 1) as $key => $obj)
-				{
+				foreach ($objphoto->liste_photos($dir, 1) as $key => $obj) {
 					$filename = $obj['photo'];
 					//if ($obj['photo_vignette']) $filename='thumbs/'.$obj['photo_vignette'];
 					$realpath = $dir.$filename;
 					break;
 				}
 
-				if ($realpath) $realpatharray[$i] = $realpath;
+				if ($realpath) {
+					$realpatharray[$i] = $realpath;
+				}
 			}
 		}
-		if (count($realpatharray) == 0) $this->posxpicture = $this->posxtva;
+		if (count($realpatharray) == 0) {
+			$this->posxpicture = $this->posxtva;
+		}
 
-		if ($conf->supplier_proposal->dir_output)
-		{
+		if ($conf->supplier_proposal->dir_output) {
 			$object->fetch_thirdparty();
 
 			// $deja_regle = 0;
 
 			// Definition of $dir and $file
-			if ($object->specimen)
-			{
+			if ($object->specimen) {
 				$dir = $conf->supplier_proposal->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
@@ -269,20 +275,16 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				$file = $dir."/".$objectref.".pdf";
 			}
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -297,18 +299,18 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				$heightforinfotot = 50; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+					$heightforfooter += 6;
+				}
 				$pdf->SetAutoPageBreak(1, 0);
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-				{
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
@@ -322,20 +324,19 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("CommercialAsk")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Positionne $this->atleastonediscount si on a au moins une remise
-				for ($i = 0; $i < $nblines; $i++)
-				{
-					if ($object->lines[$i]->remise_percent)
-					{
+				for ($i = 0; $i < $nblines; $i++) {
+					if ($object->lines[$i]->remise_percent) {
 						$this->atleastonediscount++;
 					}
 				}
-				if (empty($this->atleastonediscount))
-				{
+				if (empty($this->atleastonediscount)) {
 					$delta = ($this->postotalht - $this->posxdiscount);
 					$this->posxpicture += $delta;
 					$this->posxtva += $delta;
@@ -348,7 +349,9 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -360,19 +363,18 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 				// Affiche notes
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
-				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
-				{
+				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE)) {
 					// Get first sale rep
-					if (is_object($object->thirdparty))
-					{
+					if (is_object($object->thirdparty)) {
 						$salereparray = $object->thirdparty->getSalesRepresentatives($user);
 						$salerepobj = new User($this->db);
 						$salerepobj->fetch($salereparray[0]['id']);
-						if (!empty($salerepobj->signature)) $notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
+						if (!empty($salerepobj->signature)) {
+							$notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
+						}
 					}
 				}
-				if ($notetoshow)
-				{
+				if ($notetoshow) {
 					$tab_top -= 2;
 
 					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
@@ -397,15 +399,16 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				$nexY = $tab_top + 7;
 
 				// Loop on each lines
-				for ($i = 0; $i < $nblines; $i++)
-				{
+				for ($i = 0; $i < $nblines; $i++) {
 					$curY = $nexY;
 					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
 					$pdf->SetTextColor(0, 0, 0);
 
 					// Define size of image if we need it
 					$imglinesize = array();
-					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					if (!empty($realpatharray[$i])) {
+						$imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					}
 
 					$pdf->setTopMargin($tab_top_newpage);
 					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
@@ -416,23 +419,27 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					$posYAfterDescription = 0;
 
 					// We start with Photo of product line
-					if (!empty($imglinesize['width']) && !empty($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// If photo too high, we moved completely on new page
-					{
+					if (!empty($imglinesize['width']) && !empty($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// If photo too high, we moved completely on new page
 						$pdf->AddPage('', '', true);
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 						$pdf->setPage($pageposbefore + 1);
 
 						$curY = $tab_top_newpage;
 
 						// Allows data in the first page if description is long enough to break in multiples pages
-						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 							$showpricebeforepagebreak = 1;
-						else $showpricebeforepagebreak = 0;
+						} else {
+							$showpricebeforepagebreak = 0;
+						}
 					}
 
-					if (!empty($imglinesize['width']) && !empty($imglinesize['height']))
-					{
+					if (!empty($imglinesize['width']) && !empty($imglinesize['height'])) {
 						$curX = $this->posxpicture - 1;
 						$pdf->Image($realpatharray[$i], $curX + (($this->posxtva - $this->posxpicture - $imglinesize['width']) / 2), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
 						// $pdf->Image does not increase value return by getY, so we save it manually
@@ -443,8 +450,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					$curX = $this->posxdesc - 1;
 
 					$pdf->startTransaction();
-					if ($posYAfterImage > 0)
-					{
+					if ($posYAfterImage > 0) {
 						$descWidth = $this->posxpicture - $curX;
 					} else {
 						$descWidth = $this->posxtva - $curX;
@@ -452,8 +458,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $descWidth, 3, $curX, $curY, $hideref, $hidedesc, 1);
 
 					$pageposafter = $pdf->getPage();
-					if ($pageposafter > $pageposbefore)	// There is a pagebreak
-					{
+					if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
@@ -463,21 +468,25 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						$pageposafter = $pdf->getPage();
 						$posyafter = $pdf->GetY();
 						//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
-						{
-							if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-							{
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
+							if ($i == ($nblines - 1)) {	// No more lines, and no space left to show total, so we create a new page
 								$pdf->AddPage('', '', true);
-								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+								if (!empty($tplidx)) {
+									$pdf->useTemplate($tplidx);
+								}
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+									$this->_pagehead($pdf, $object, 0, $outputlangs);
+								}
 								$pdf->setPage($pageposafter + 1);
 							}
 						} else {
 							// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
-							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 								$showpricebeforepagebreak = 1;
-							else $showpricebeforepagebreak = 0;
+							} else {
+								$showpricebeforepagebreak = 0;
+							}
 						}
 					} else // No pagebreak
 					{
@@ -513,7 +522,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					$pdf->SetXY($this->posxup, $curY);
 					if ($up_excl_tax > 0)
 						$pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, $up_excl_tax, 0, 'R', 0);
-                    */
+					*/
 
 					// Quantity
 					$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
@@ -521,8 +530,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					$pdf->MultiCell($this->posxunit - $this->posxqty - 0.8, 4, $qty, 0, 'R'); // Enough for 6 chars
 
 					// Unit
-					if (!empty($conf->global->PRODUCT_USE_UNITS))
-					{
+					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
 						$pdf->SetXY($this->posxunit, $curY);
 						$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
@@ -542,11 +550,14 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					$pdf->SetXY($this->postotalht, $curY);
 					if ($total_excl_tax > 0)
 						$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
-                    */
+					*/
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
-					else $tvaligne = $object->lines[$i]->total_tva;
+					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+						$tvaligne = $object->lines[$i]->multicurrency_total_tva;
+					} else {
+						$tvaligne = $object->lines[$i]->total_tva;
+					}
 
 					$localtax1ligne = $object->lines[$i]->total_localtax1;
 					$localtax2ligne = $object->lines[$i]->total_localtax2;
@@ -555,36 +566,48 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					$localtax1_type = $object->lines[$i]->localtax1_type;
 					$localtax2_type = $object->lines[$i]->localtax2_type;
 
-					if ($object->remise_percent) $tvaligne -= ($tvaligne * $object->remise_percent) / 100;
-					if ($object->remise_percent) $localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
-					if ($object->remise_percent) $localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
+					if ($object->remise_percent) {
+						$tvaligne -= ($tvaligne * $object->remise_percent) / 100;
+					}
+					if ($object->remise_percent) {
+						$localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
+					}
+					if ($object->remise_percent) {
+						$localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
+					}
 
 					$vatrate = (string) $object->lines[$i]->tva_tx;
 
 					// Retrieve type from database for backward compatibility with old records
 					if ((!isset($localtax1_type) || $localtax1_type == '' || !isset($localtax2_type) || $localtax2_type == '') // if tax type not defined
-					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
-					{
+					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) { // and there is local tax
 						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
 						$localtax1_type = $localtaxtmp_array[0];
 						$localtax2_type = $localtaxtmp_array[2];
 					}
 
 					// retrieve global local tax
-					if ($localtax1_type && $localtax1ligne != 0)
+					if ($localtax1_type && $localtax1ligne != 0) {
 						$this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
-					if ($localtax2_type && $localtax2ligne != 0)
+					}
+					if ($localtax2_type && $localtax2ligne != 0) {
 						$this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
+					}
 
-					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate .= '*';
-					if (!isset($this->tva[$vatrate]))				$this->tva[$vatrate] = 0;
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
+						$vatrate .= '*';
+					}
+					if (!isset($this->tva[$vatrate])) {
+						$this->tva[$vatrate] = 0;
+					}
 					$this->tva[$vatrate] += $tvaligne;
 
-					if ($posYAfterImage > $posYAfterDescription) $nexY = $posYAfterImage;
+					if ($posYAfterImage > $posYAfterDescription) {
+						$nexY = $posYAfterImage;
+					}
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
-					{
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
 						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
@@ -595,11 +618,9 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					$nexY += 2; // Add space between lines
 
 					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
+					while ($pagenb < $pageposafter) {
 						$pdf->setPage($pagenb);
-						if ($pagenb == 1)
-						{
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
@@ -608,12 +629,12 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
-					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
-					{
-						if ($pagenb == 1)
-						{
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
@@ -621,15 +642,18 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
 				// Show square
-				if ($pagenb == 1)
-				{
+				if ($pagenb == 1) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				} else {
@@ -653,7 +677,9 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -664,14 +690,14 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				if (!empty($conf->global->MAIN_UMASK))
-				@chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (!empty($conf->global->MAIN_UMASK)) {
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -724,8 +750,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$posxval = 52;
 
 		// Show shipping date
-		if (!empty($object->delivery_date))
-		{
+		if (!empty($object->delivery_date)) {
 			$outputlangs->load("sendings");
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
@@ -768,8 +793,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		}*/
 
 		// Show payments conditions
-		if (empty($conf->global->SUPPLIER_PROPOSAL_PDF_HIDE_PAYMENTTERMCOND) && ($object->cond_reglement_code || $object->cond_reglement))
-		{
+		if (empty($conf->global->SUPPLIER_PROPOSAL_PDF_HIDE_PAYMENTTERMCOND) && ($object->cond_reglement_code || $object->cond_reglement)) {
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("PaymentConditions").':';
@@ -784,13 +808,11 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			$posy = $pdf->GetY() + 3;
 		}
 
-		if (!empty($conf->global->SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE))
-		{
+		if (!empty($conf->global->SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE)) {
 			// Show payment mode
 			if ($object->mode_reglement_code
 			&& $object->mode_reglement_code != 'CHQ'
-			&& $object->mode_reglement_code != 'VIR')
-			{
+			&& $object->mode_reglement_code != 'VIR') {
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->SetXY($this->marge_gauche, $posy - 2);
 				$titre = $outputlangs->transnoentities("PaymentMode").':';
@@ -804,15 +826,12 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			}
 
 			// Show payment mode CHQ
-			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
-			{
+			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ') {
 				// Si mode reglement non force ou si force a CHQ
-				if (!empty($conf->global->FACTURE_CHQ_NUMBER))
-				{
+				if (!empty($conf->global->FACTURE_CHQ_NUMBER)) {
 					$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
 
-					if ($conf->global->FACTURE_CHQ_NUMBER > 0)
-					{
+					if ($conf->global->FACTURE_CHQ_NUMBER > 0) {
 						$account = new Account($this->db);
 						$account->fetch($conf->global->FACTURE_CHQ_NUMBER);
 
@@ -821,23 +840,20 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->proprio), 0, 'L', 0);
 						$posy = $pdf->GetY() + 1;
 
-						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-						{
+						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
 							$posy = $pdf->GetY() + 2;
 						}
 					}
-					if ($conf->global->FACTURE_CHQ_NUMBER == -1)
-					{
+					if ($conf->global->FACTURE_CHQ_NUMBER == -1) {
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
 						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
 						$posy = $pdf->GetY() + 1;
 
-						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-						{
+						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
@@ -848,10 +864,8 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			}
 
 			// If payment mode not forced or forced to VIR, show payment with BAN
-			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
-			{
-				if (!empty($object->fk_bank) || !empty($conf->global->FACTURE_RIB_NUMBER))
-				{
+			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR') {
+				if (!empty($object->fk_bank) || !empty($conf->global->FACTURE_RIB_NUMBER)) {
 					$bankid = (empty($object->fk_bank) ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_bank);
 					$account = new Account($this->db);
 					$account->fetch($bankid);
@@ -893,8 +907,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 		// Tableau total
 		$col1x = 120; $col2x = 170;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$col2x -= 20;
 		}
 		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
@@ -914,32 +927,28 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$pdf->SetFillColor(248, 248, 248);
 
 		$this->atleastoneratenotnull = 0;
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-		{
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
 			$tvaisnull = ((!empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
-			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
-			{
+			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull) {
 				// Nothing to do
 			} else {
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
-				foreach ($this->localtax1 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('1', '3', '5'))) continue;
+				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
-							//$this->atleastoneratenotnull++;
+					foreach ($localtax_rate as $tvakey => $tvaval) {
+						if ($tvakey != 0) {    // On affiche pas taux 0
+						//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -952,19 +961,18 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						}
 					}
 				}
-		  		//}
+				//}
 				//Local tax 2 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
-				foreach ($this->localtax2 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('1', '3', '5'))) continue;
+				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
-							//$this->atleastoneratenotnull++;
+					foreach ($localtax_rate as $tvakey => $tvaval) {
+						if ($tvakey != 0) {    // On affiche pas taux 0
+						//$this->atleastoneratenotnull++;
 
 
 
@@ -972,8 +980,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -988,18 +995,15 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				}
 				//}
 				// VAT
-				foreach ($this->tva as $tvakey => $tvaval)
-				{
-					if ($tvakey > 0)    // On affiche pas taux 0
-					{
+				foreach ($this->tva as $tvakey => $tvaval) {
+					if ($tvakey > 0) {    // On affiche pas taux 0
 						$this->atleastoneratenotnull++;
 
 						$index++;
 						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 						$tvacompl = '';
-						if (preg_match('/\*/', $tvakey))
-						{
+						if (preg_match('/\*/', $tvakey)) {
 							$tvakey = str_replace('*', '', $tvakey);
 							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 						}
@@ -1015,22 +1019,20 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				//Local tax 1 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
-				foreach ($this->localtax1 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
+				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
-							//$this->atleastoneratenotnull++;
+					foreach ($localtax_rate as $tvakey => $tvaval) {
+						if ($tvakey != 0) {    // On affiche pas taux 0
+						//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -1043,27 +1045,25 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						}
 					}
 				}
-		  		//}
+				//}
 				//Local tax 2 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
-				foreach ($this->localtax2 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
+				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
+					foreach ($localtax_rate as $tvakey => $tvaval) {
 						// retrieve global local tax
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
-							//$this->atleastoneratenotnull++;
+						if ($tvakey != 0) {    // On affiche pas taux 0
+						//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -1094,7 +1094,9 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$pdf->SetTextColor(0, 0, 0);
 
 		$resteapayer = $object->total_ttc - $deja_regle;
-		if (!empty($object->paye)) $resteapayer = 0;
+		if (!empty($object->paye)) {
+			$resteapayer = 0;
+		}
 
 		if ($deja_regle > 0) {
 			$index++;
@@ -1158,7 +1160,9 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -1167,14 +1171,15 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$pdf->SetTextColor(0, 0, 0);
 		$pdf->SetFont('', '', $default_font_size - 2);
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) {
+				$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			}
 		}
 
 		$pdf->SetDrawColor(128, 128, 128);
@@ -1183,35 +1188,30 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		// Output Rect
 		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5); // line takes a position y in 2nd parameter and 4th parameter
 
 			$pdf->SetXY($this->posxdesc - 1, $tab_top + 1);
 			$pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
 		}
 
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-		{
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
 			$pdf->line($this->posxtva, $tab_top, $this->posxtva, $tab_top + $tab_height);
 			//$pdf->line($this->posxtva-2, $tab_top, $this->posxtva-2, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
+			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxtva - 5, $tab_top + 1);
 				$pdf->MultiCell($this->posxup - $this->posxtva + 3, 2, $outputlangs->transnoentities("VAT"), '', 'C');
 			}
 		}
 
 		$pdf->line($this->posxup - 3, $tab_top, $this->posxup - 3, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxup - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxqty - $this->posxup - 1, 2, $outputlangs->transnoentities("PriceUHT"), '', 'C');
 		}
 
 		$pdf->line($this->posxqty - 1, $tab_top, $this->posxqty - 1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxqty - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
 		}
@@ -1225,20 +1225,16 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		}
 
 		$pdf->line($this->posxdiscount - 1, $tab_top, $this->posxdiscount - 1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
-			if ($this->atleastonediscount)
-			{
+		if (empty($hidetop)) {
+			if ($this->atleastonediscount) {
 				$pdf->SetXY($this->posxdiscount - 1, $tab_top + 1);
 				$pdf->MultiCell($this->postotalht - $this->posxdiscount + 1, 2, $outputlangs->transnoentities("ReductionShort"), '', 'C');
 			}
 		}
-		if ($this->atleastonediscount)
-		{
+		if ($this->atleastonediscount) {
 			$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
 		}
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->postotalht - 1, $tab_top + 1);
 			$pdf->MultiCell(30, 2, $outputlangs->transnoentities("TotalHT"), '', 'C');
 		}
@@ -1266,8 +1262,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		//  Show Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->SUPPLIER_PROPOSAL_DRAFT_WATERMARK)))
-		{
+		if ($object->statut == 0 && (!empty($conf->global->SUPPLIER_PROPOSAL_DRAFT_WATERMARK))) {
 			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->SUPPLIER_PROPOSAL_DRAFT_WATERMARK);
 		}
 
@@ -1281,10 +1276,8 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 		// Logo
 		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
-		if ($this->emetteur->logo)
-		{
-			if (is_readable($logo))
-			{
+		if ($this->emetteur->logo) {
+			if (is_readable($logo)) {
 				$height = pdf_getHeightForLogo($logo);
 				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			} else {
@@ -1314,8 +1307,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$posy += 1;
 		$pdf->SetFont('', '', $default_font_size - 2);
 
-		if ($object->ref_client)
-		{
+		if ($object->ref_client) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1326,10 +1318,9 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$pdf->SetXY($posx,$posy);
 		$pdf->SetTextColor(0,0,60);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("SupplierProposalDate")." : " . dol_print_date($object->delivery_date, "day", false, $outputlangs, true), '', 'R');
-        */
+		*/
 
-		if ($object->thirdparty->code_fournisseur)
-		{
+		if ($object->thirdparty->code_fournisseur) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1337,11 +1328,9 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		}
 
 		// Get contact
-		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
-		{
+		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP)) {
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$usertmp = new User($this->db);
 				$usertmp->fetch($arrayidcontact[0]);
 				$posy += 4;
@@ -1357,30 +1346,29 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		// Show list of linked objects
 		$current_y = $pdf->getY();
 		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
-		if ($current_y < $pdf->getY())
-		{
+		if ($current_y < $pdf->getY()) {
 			$top_shift = $pdf->getY() - $current_y;
 		}
 
-		if ($showaddress)
-		{
+		if ($showaddress) {
 			// Sender properties
 			$carac_emetteur = '';
-		 	// Add internal contact of proposal if defined
+			// Add internal contact of proposal if defined
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-		 	if (count($arrayidcontact) > 0)
-		 	{
-		 		$object->fetch_user($arrayidcontact[0]);
-		 		$labelbeforecontactname = ($outputlangs->transnoentities("FromContactName") != 'FromContactName' ? $outputlangs->transnoentities("FromContactName") : $outputlangs->transnoentities("Name"));
-		 		$carac_emetteur .= ($carac_emetteur ? "\n" : '').$labelbeforecontactname.": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
-		 	}
+			if (count($arrayidcontact) > 0) {
+				$object->fetch_user($arrayidcontact[0]);
+				$labelbeforecontactname = ($outputlangs->transnoentities("FromContactName") != 'FromContactName' ? $outputlangs->transnoentities("FromContactName") : $outputlangs->transnoentities("Name"));
+				$carac_emetteur .= ($carac_emetteur ? "\n" : '').$labelbeforecontactname.": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
+			}
 
-		 	$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
+			$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
 
 			// Show sender
 			$posy = 42 + $top_shift;
-		 	$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
+			$posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->page_largeur - $this->marge_droite - 80;
+			}
 			$hautcadre = 40;
 
 			// Show sender frame
@@ -1408,22 +1396,20 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			// If CUSTOMER contact defined, we use it
 			$usecontact = false;
 			$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$usecontact = true;
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
 			// Recipient name
-			if (!empty($usecontact))
-			{
+			if (!empty($usecontact)) {
 				if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
-					$socname = $object->contact->socname;
+					$socname = $object->contact;
 				} else {
-					$socname = $object->thirdparty->name;
+					$socname = $object->thirdparty;
 				}
 			} else {
-				$socname = $object->thirdparty->name;
+				$socname = $object->thirdparty;
 			}
 
 			$carac_client_name = pdfBuildThirdpartyName($socname, $outputlangs);
@@ -1432,10 +1418,14 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 			// Show recipient
 			$widthrecbox = 100;
-			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			if ($this->page_largeur < 210) {
+				$widthrecbox = 84; // To work with US executive format
+			}
 			$posy = 42 + $top_shift;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0, 0, 0);

From 87038f953a86f2dce96d6b456cca84575cefe318 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 11 Dec 2020 19:58:05 +0000
Subject: [PATCH 364/888] Fixing style errors.

---
 .../modules/supplier_proposal/doc/pdf_aurore.modules.php  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index a76d014c861..27cfd949ca6 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -942,7 +942,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 					foreach ($localtax_rate as $tvakey => $tvaval) {
 						if ($tvakey != 0) {    // On affiche pas taux 0
-						//$this->atleastoneratenotnull++;
+							//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
@@ -972,7 +972,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 					foreach ($localtax_rate as $tvakey => $tvaval) {
 						if ($tvakey != 0) {    // On affiche pas taux 0
-						//$this->atleastoneratenotnull++;
+							//$this->atleastoneratenotnull++;
 
 
 
@@ -1026,7 +1026,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 					foreach ($localtax_rate as $tvakey => $tvaval) {
 						if ($tvakey != 0) {    // On affiche pas taux 0
-						//$this->atleastoneratenotnull++;
+							//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
@@ -1057,7 +1057,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					foreach ($localtax_rate as $tvakey => $tvaval) {
 						// retrieve global local tax
 						if ($tvakey != 0) {    // On affiche pas taux 0
-						//$this->atleastoneratenotnull++;
+							//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);

From 870f2073adee7e7a1903da1ffb7374419561a3c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Fri, 11 Dec 2020 22:13:30 +0100
Subject: [PATCH 365/888] fix warning

---
 htdocs/compta/bank/various_payment/card.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 191efdc30dc..db539e060d2 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2017-2019  Alexandre Spangaro      <aspangaro@open-dsi.fr>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric 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
@@ -30,8 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
-if (!empty($conf->projet->enabled))
-{
+if (!empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -122,8 +121,8 @@ if (empty($reshook))
 		$object->accountancy_code = GETPOST("accountancy_code") > 0 ? GETPOST("accountancy_code", "alpha") : "";
 		$object->subledger_account = $subledger_account;
 
-		$object->sens = GETPOST('sens', 'int');
-		$object->fk_project = GETPOST('fk_project', 'int');
+		$object->sens = GETPOSTINT('sens');
+		$object->fk_project = GETPOSTINT('fk_project');
 
 		if (empty($datep) || empty($datev))
 		{

From 479d709a962f6f2cd06cd35af02b54e390b3008b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 12 Dec 2020 09:39:54 +0100
Subject: [PATCH 366/888] fix warning

---
 htdocs/core/modules/commande/doc/pdf_proforma.modules.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
index fa555db2ced..954252f8013 100644
--- a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
@@ -66,14 +66,15 @@ class pdf_proforma extends pdf_eratosthene
 	 *  @param  Commande	$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @param  Translate	$outputlangsbis	Object lang for output bis
 	 *  @param	string		$titlekey		Translation key to show as title of document
 	 *  @return	int                         Return topshift value
 	 */
-	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey = "InvoiceProForma")
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $outputlangsbis = null, $titlekey = "InvoiceProForma")
 	{
 		// phpcs:enable
 		global $conf, $langs, $hookmanager;
 
-		return parent::_pagehead($pdf, $object, $showaddress, $outputlangs, $titlekey);
+		return parent::_pagehead($pdf, $object, $showaddress, $outputlangs, $outputlangsbis, $titlekey);
 	}
 }

From bfa8383bed4df1aa67c187a3aeeb3f3a97fdfbd2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 12 Dec 2020 12:30:13 +0100
Subject: [PATCH 367/888] Fix migration script

---
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index e082eb48b27..76fb29197b2 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -548,9 +548,6 @@ CREATE TABLE llx_session(
 
 -- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT  'box_funnel_of_prospection.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_funnel_of_prospection.php' AND entity = 1);
 -- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT  'box_customers_outstanding_bill_reached.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_customers_outstanding_bill_reached.php' AND entity = 1);
---INSERT INTO llx_boxes_def(file, entity) VALUES ('box_funnel_of_prospection.php',1);
---INSERT INTO llx_boxes_def(file, entity) VALUES ('box_customers_outstanding_bill_reached.php', 1);
+-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT  'box_scheduled_jobs.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_scheduled_jobs.php' AND entity = 1);
 
 ALTER TABLE llx_product_fournisseur_price ADD COLUMN packaging varchar(64);
-
-INSERT INTO llx_boxes_def(file, entity) VALUES ('box_scheduled_jobs.php',1);
\ No newline at end of file

From 0968c68cf91a3cf937ad43a54ea6533b6b49660a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 12 Dec 2020 12:45:43 +0100
Subject: [PATCH 368/888] Enhance widget

---
 htdocs/core/boxes/box_scheduled_jobs.php         | 16 ++++++++++------
 htdocs/core/lib/functions.lib.php                |  2 +-
 htdocs/cron/class/cronjob.class.php              |  9 ++++++---
 .../template/class/myobject.class.php            |  6 +++---
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/boxes/box_scheduled_jobs.php b/htdocs/core/boxes/box_scheduled_jobs.php
index 1739c6ab8e9..afe71f09043 100644
--- a/htdocs/core/boxes/box_scheduled_jobs.php
+++ b/htdocs/core/boxes/box_scheduled_jobs.php
@@ -79,12 +79,13 @@ class box_scheduled_jobs extends ModeleBoxes
 		if ($user->rights->cron->read) {
 			include_once DOL_DOCUMENT_ROOT . '/cron/class/cronjob.class.php';
 			$cronstatic = new Cronjob($this->db);
-			$nomUrlArray;
+			$resultarray = array();
 
 			$result = 0;
-			$sql = "SELECT t.rowid, t.datelastrun, t.datenextrun";
-			$sql .= ", t.label, t.status, t.lastresult";
+			$sql = "SELECT t.rowid, t.datelastrun, t.datenextrun,";
+			$sql .= " t.label, t.status, t.lastresult";
 			$sql .= " FROM " . MAIN_DB_PREFIX . "cronjob as t";
+			$sql .= " WHERE status <> ".$cronstatic::STATUS_DISABLED;
 			$sql .= $this->db->order("t.datelastrun", "DESC");
 
 			$result = $this->db->query($sql);
@@ -98,6 +99,7 @@ class box_scheduled_jobs extends ModeleBoxes
 					if ($line == 0 || $objp->datenextrun < $cronstatic->datenextrun) {
 						$cronstatic->id = $objp->rowid;
 						$cronstatic->ref = $objp->rowid;
+						$cronstatic->label = $langs->trans($objp->label);
 						$cronstatic->status = $objp->status;
 						$cronstatic->datenextrun = $objp->datenextrun;
 						$cronstatic->datelastrun = $objp->datelastrun;
@@ -107,7 +109,8 @@ class box_scheduled_jobs extends ModeleBoxes
 							$langs->trans("LastExecutedScheduledJob"),
 							$cronstatic->getNomUrl(1),
 							$this->db->jdate($cronstatic->datelastrun),
-							$cronstatic->status
+							$cronstatic->status,
+							$cronstatic->getLibStatut(2)
 						);
 						$line++;
 					}
@@ -120,7 +123,8 @@ class box_scheduled_jobs extends ModeleBoxes
 					$langs->trans("NextScheduledJobExecute"),
 					$cronstatic->getNomUrl(1),
 					$this->db->jdate($cronstatic->datenextrun),
-					$cronstatic->status
+					$cronstatic->status,
+					$cronstatic->getLibStatut(2)
 				);
 				$line = 0;
 				while ($line < 2) {
@@ -139,7 +143,7 @@ class box_scheduled_jobs extends ModeleBoxes
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right" ',
-						'textnoformat' => empty($resultarray[$line][3]) ? $langs->trans("Disabled") : $langs->trans("Scheduled")
+						'textnoformat' => $resultarray[$line][4]
 					);
 					$line++;
 				}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e5816a7ea71..8b9edcd89ba 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3206,7 +3206,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		if (empty($srconly) && in_array($pictowithouttext, array(
 				'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
 				'accountancy', 'account', 'accountline', 'action', 'add', 'address', 'bank_account', 'barcode', 'bank', 'bill', 'billa', 'billr', 'billd', 'bookmark', 'bom', 'building',
-				'cash-register', 'category', 'check', 'clock', 'close_title', 'company', 'contact', 'contract', 'cubes',
+				'cash-register', 'category', 'check', 'clock', 'close_title', 'company', 'contact', 'contract', 'cron', 'cubes',
 				'delete', 'dolly', 'dollyrevert', 'donation', 'edit', 'ellipsis-h', 'email', 'eraser', 'external-link-alt', 'external-link-square-alt',
 				'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'globe', 'globe-americas', 'grip', 'grip_title', 'group',
 				'help', 'holiday',
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index e58abf24223..9d084ec4f24 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -820,9 +820,12 @@ class Cronjob extends CommonObject
 
 		$result = '';
 
-		$label = '<u>'.$langs->trans("CronJob").'</u>';
-		$label .= '<br>';
-		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label = img_picto('', 'object_'.$this->picto).' <u>'.$langs->trans("CronTask").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
+		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label .= '<br><b>'.$langs->trans('Title').':</b> '.$this->label;
 
 		$url = DOL_URL_ROOT.'/cron/card.php?id='.$this->id;
 
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index a8bed45c46a..a15f0f67fe9 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -744,11 +744,11 @@ class MyObject extends CommonObject
 		$result = '';
 
 		$label = img_picto('', $this->picto).' <u>'.$langs->trans("MyObject").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
-		if (isset($this->status)) {
-			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
-		}
 
 		$url = dol_buildpath('/mymodule/myobject_card.php', 1).'?id='.$this->id;
 

From a3d302d91ce52c513e07a2c58e7ede694457b2a3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 12 Dec 2020 13:58:21 +0100
Subject: [PATCH 369/888] Debug v13

---
 ...box_customers_outstanding_bill_reached.php |  2 +-
 htdocs/core/boxes/box_scheduled_jobs.php      | 79 +++++++++++--------
 htdocs/cron/list.php                          |  9 ++-
 htdocs/theme/eldy/global.inc.php              |  2 +-
 htdocs/theme/md/style.css.php                 |  2 +-
 5 files changed, 55 insertions(+), 39 deletions(-)

diff --git a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
index c71bce53602..407e4459834 100644
--- a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
+++ b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
@@ -151,7 +151,7 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
 
 				if ($num == 0 || $nboutstandingbillreachedcustomers == 0) $this->info_box_contents[$line][0] = array(
 					'td' => 'class="center"',
-					'text'=> '<span class="opacitymedium">'.$langs->trans("NoRecordedCustomers").'</span>'
+					'text'=> '<span class="opacitymedium">'.$langs->trans("None").'</span>'
 				);
 
 				$this->db->free($result);
diff --git a/htdocs/core/boxes/box_scheduled_jobs.php b/htdocs/core/boxes/box_scheduled_jobs.php
index afe71f09043..17c62ab7c7d 100644
--- a/htdocs/core/boxes/box_scheduled_jobs.php
+++ b/htdocs/core/boxes/box_scheduled_jobs.php
@@ -72,7 +72,7 @@ class box_scheduled_jobs extends ModeleBoxes
 	public function loadBox($max = 5)
 	{
 		global $user, $langs, $conf;
-		$this->max = $max;
+
 		$langs->load("cron");
 		$this->info_box_head = array('text' => $langs->trans("BoxScheduledJobs", $max));
 
@@ -83,9 +83,10 @@ class box_scheduled_jobs extends ModeleBoxes
 
 			$result = 0;
 			$sql = "SELECT t.rowid, t.datelastrun, t.datenextrun,";
-			$sql .= " t.label, t.status, t.lastresult";
+			$sql .= " t.label, t.status, t.test, t.lastresult";
 			$sql .= " FROM " . MAIN_DB_PREFIX . "cronjob as t";
 			$sql .= " WHERE status <> ".$cronstatic::STATUS_DISABLED;
+			$sql .= " AND entity IN (0, ".$conf->entity.")";
 			$sql .= $this->db->order("t.datelastrun", "DESC");
 
 			$result = $this->db->query($sql);
@@ -93,41 +94,53 @@ class box_scheduled_jobs extends ModeleBoxes
 			$nbjobsinerror = 0;
 			if ($result) {
 				$num = $this->db->num_rows($result);
+
 				$i = 0;
 				while ($i < $num) {
 					$objp = $this->db->fetch_object($result);
-					if ($line == 0 || $objp->datenextrun < $cronstatic->datenextrun) {
-						$cronstatic->id = $objp->rowid;
-						$cronstatic->ref = $objp->rowid;
-						$cronstatic->label = $langs->trans($objp->label);
-						$cronstatic->status = $objp->status;
-						$cronstatic->datenextrun = $objp->datenextrun;
-						$cronstatic->datelastrun = $objp->datelastrun;
-					}
-					if ($line == 0) {
-						$resultarray[$line] = array(
-							$langs->trans("LastExecutedScheduledJob"),
-							$cronstatic->getNomUrl(1),
-							$this->db->jdate($cronstatic->datelastrun),
-							$cronstatic->status,
-							$cronstatic->getLibStatut(2)
-						);
-						$line++;
-					}
-					if (!empty($objp->lastresult)) {
-						$nbjobsinerror++;
+
+					if (dol_eval($objp->test, 1, 1)) {
+
+						$nextrun = $this->db->jdate($objp->datenextrun);
+						if (empty($nextrun)) $nextrun = $this->db->jdate($objp->datestart);
+
+						if ($line == 0 || ($nextrun < $cronstatic->datenextrun && (empty($objp->nbrun) || empty($objp->maxrun) || $objp->nbrun < $obj->maxrun))) {
+							$cronstatic->id = $objp->rowid;
+							$cronstatic->ref = $objp->rowid;
+							$cronstatic->label = $langs->trans($objp->label);
+							$cronstatic->status = $objp->status;
+							$cronstatic->datenextrun = $this->db->jdate($objp->datenextrun);
+							$cronstatic->datelastrun = $this->db->jdate($objp->datelastrun);
+						}
+						if ($line == 0) {
+							$resultarray[$line] = array(
+								$langs->trans("LastExecutedScheduledJob"),
+								$cronstatic->getNomUrl(1),
+								$cronstatic->datelastrun,
+								$cronstatic->status,
+								$cronstatic->getLibStatut(2)
+							);
+							$line++;
+						}
+
+						if (!empty($objp->lastresult)) {
+							$nbjobsinerror++;
+						}
 					}
 					$i++;
 				}
-				$resultarray[$line] = array(
-					$langs->trans("NextScheduledJobExecute"),
-					$cronstatic->getNomUrl(1),
-					$this->db->jdate($cronstatic->datenextrun),
-					$cronstatic->status,
-					$cronstatic->getLibStatut(2)
-				);
-				$line = 0;
-				while ($line < 2) {
+
+				if ($line) {
+					$resultarray[$line] = array(
+						$langs->trans("NextScheduledJobExecute"),
+						$cronstatic->getNomUrl(1),
+						$cronstatic->datenextrun,
+						$cronstatic->status,
+						$cronstatic->getLibStatut(2)
+					);
+				}
+
+				foreach($resultarray as $line => $value) {
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="left"',
 						'text' => $resultarray[$line][0]
@@ -153,13 +166,13 @@ class box_scheduled_jobs extends ModeleBoxes
 				);
 				$this->info_box_contents[$line][] = array(
 					'td' => 'class="right"colspan="2"',
-					'text' => $nbjobsinerror
+					'textnoformat' => $nbjobsinerror ? '<span class="error"><a href="'.DOL_URL_ROOT.'/cron/list.php?search_lastresult='.urlencode('<>0').'">'.$nbjobsinerror.'</a></span>'.img_error() : '0'
 				);
 			} else {
 				$this->info_box_contents[0][0] = array(
 					'td' => '',
 					'maxlength' => 500,
-					'text' => ($this->db->error() . ' sql=' . $sql)
+					'text' => ($this->db->lasterror() . ' sql=' . $sql)
 				);
 			}
 		} else {
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index d3f84de6bd2..587bd1b28d1 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -60,7 +60,7 @@ $mode = GETPOST('mode', 'aZ09');
 $search_status = (GETPOSTISSET('search_status') ?GETPOST('search_status', 'int') : GETPOST('status', 'int'));
 $search_label = GETPOST("search_label", 'alpha');
 $search_module_name = GETPOST("search_module_name", 'alpha');
-
+$search_lastresult = GETPOST("search_lastresult", "alpha");
 $securitykey = GETPOST('securitykey', 'alpha');
 
 $diroutputmassaction = $conf->cronjob->dir_output.'/temp/massgeneration/'.$user->id;
@@ -99,6 +99,7 @@ if (empty($reshook))
 	{
 		$search_label = '';
 		$search_status = -1;
+		$search_lastresult = '';
 		$toselect = '';
 		$search_array_options = array();
 	}
@@ -248,6 +249,7 @@ $sql .= " t.test";
 $sql .= " FROM ".MAIN_DB_PREFIX."cronjob as t";
 $sql .= " WHERE entity IN (0,".$conf->entity.")";
 if ($search_status >= 0 && $search_status < 2 && $search_status != '') $sql .= " AND t.status = ".(empty($search_status) ? '0' : '1');
+if ($search_lastresult != '') $sql .= natural_search("t.lastresult", $search_lastresult, 1);
 //Manage filter
 if (is_array($filter) && count($filter) > 0) {
 	foreach ($filter as $key => $value) {
@@ -298,6 +300,7 @@ if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($l
 if ($search_status)   $param .= '&search_status='.urlencode($search_status);
 if ($search_label)	  $param .= '&search_label='.urlencode($search_label);
 if ($search_module_name) $param .= '&search_module_name='.urlencode($search_module_name);
+if ($search_lastresult) $param .= '&search_lastresult='.urlencode($search_lastresult);
 if ($mode) $param .= '&mode='.urlencode($mode);
 if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
@@ -384,7 +387,7 @@ print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre">&nbsp;</td>';
-print '<td class="liste_titre">&nbsp;</td>';
+print '<td class="liste_titre center"><input type="text" class="width50" name="search_lastresult" value="'.$search_lastresult.'"></td>';
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre" align="center">';
@@ -589,7 +592,7 @@ if ($num > 0)
 		$i++;
 	}
 } else {
-	print '<tr><td colspan="9" class="opacitymedium">'.$langs->trans('CronNoJobs').'</td></tr>';
+	print '<tr><td colspan="15" class="opacitymedium">'.$langs->trans('CronNoJobs').'</td></tr>';
 }
 
 print '</table>';
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 4ff10708001..a0203c24cf1 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1882,7 +1882,7 @@ span.widthpictotitle.pictotitle {
 	vertical-align: middle;
 	margin-top: -3px
 }
-.pictowarning, .pictopreview {
+.pictowarning, .pictoerror, .pictopreview {
     padding-<?php echo $left; ?>: 3px;
 }
 .pictowarning {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index c16d0df2351..4f85b78a872 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1816,7 +1816,7 @@ div.nopadding {
 	vertical-align: middle;
 	margin-top: -3px
 }
-.pictowarning, .pictopreview {
+.pictowarning, .pictoerror, .pictopreview {
     padding-<?php echo $left; ?>: 3px;
 }
 .pictowarning {

From 7fdae69546ee20175379eb71ac964dc31011b3e7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 12 Dec 2020 14:11:50 +0100
Subject: [PATCH 370/888] Fix warning

---
 htdocs/core/lib/functionsnumtoword.lib.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functionsnumtoword.lib.php b/htdocs/core/lib/functionsnumtoword.lib.php
index 02a2de8058c..930c6d06a9e 100644
--- a/htdocs/core/lib/functionsnumtoword.lib.php
+++ b/htdocs/core/lib/functionsnumtoword.lib.php
@@ -139,8 +139,7 @@ function dol_convertToWord($num, $langs, $currency = '', $centimes = false)
 		}
 
 		// If we need to write cents call again this function for cents
-		$decimalpart = $TNum[1];
-		$decimalpart = preg_replace('/0+$/', '', $decimalpart);
+		$decimalpart = empty($TNum[1]) ? '' : preg_replace('/0+$/', '', $TNum[1]);
 
 		if ($decimalpart) {
 			if (!empty($currency)) $concatWords .= ' '.$langs->transnoentities('and');

From 4013eaa2398910d75aa8d5988b03d55c67e3e467 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 12 Dec 2020 15:28:52 +0100
Subject: [PATCH 371/888] Update security file

---
 SECURITY.md | 36 ++++++++++++------------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index 77307516f73..8ef569d6da0 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -6,8 +6,8 @@ This file contains some policies about the security reports on Dolibarr ERP CRM
 
 | Version   | Supported          |
 | --------- | ------------------ |
-| <= 9.0.*  | :x:                |
-| >= 10.0.* | :white_check_mark: |
+| <= 12.*   | :x:                |
+| >= 13.*   | :white_check_mark: |
 
 
 ## Reporting a Vulnerability
@@ -23,11 +23,11 @@ If you believe you've found a security bug in our service, we are happy to work
 
 Any type of denial of service attacks is strictly forbidden, as well as any interference with network equipment and Dolibarr infrastructure.
 
-We recommand to install Dolibarr ERP CRM on you own server (as most Open Source software, download and use is free: https://www.dolibarr.org/download) to get access on every side of application.
+We recommand to install Dolibarr ERP CRM on your own server (as most Open Source software, download and use is free: https://www.dolibarr.org/download) to get access on every side of application.
 
 ### User Agent
 
-If you try to find bug on Dolibarr, we recommend to append to your user-agent header the following value: '-BugHunting-dolibarr'.
+If you try to find bug on Dolibarr, we recommend to append to your user-agent header the following value: '-securitytest-for-dolibarr'.
 
 ### Account access
 
@@ -36,44 +36,32 @@ You can install the web application yourself on your own platform/server so you
 
 ## Eligibility and Responsible Disclosure
 
-We are happy to thank everyone who submits valid reports which help us improve the security of Dolibarr however, only those that meet the following eligibility requirements may receive a monetary reward:
+We are happy to thank everyone who submits valid reports which help us improve the security of Dolibarr however, only those that meet the following eligibility requirements will be "validated reports" (if not, we may close the report without any answer):
 
-You must be the first reporter of a vulnerability.
-
-The vulnerability must be a qualifying vulnerability (see below)
-
-Any vulnerability found must be reported no later than 24 hours after discovery
+You must be the first reporter of the vulnerability (duplicate reports are closed).
 
 You must send a clear textual description of the report along with steps to reproduce the issue, include attachments such as screenshots or proof of concept code as necessary.
 
 You must avoid tests that could cause degradation or interruption of our service (refrain from using automated tools, and limit yourself about requests per second), that's why we recommand to install softwate on your own platform.
 
-You must not leak, manipulate, or destroy any user data.
-
-You must not be a former or current employee of Dolibarr or one of its contractor.
-
-Reports about vulnerabilities are examined by our security analysts.
-
-Our analysis is always based on worst case exploitation of the vulnerability, as is the reward we pay.
-
-No vulnerability disclosure, including partial is allowed for the moment.
+You must not leak, manipulate, or destroy any user data of third parties to find your vulnerability.
 
 
 ## Scope for qualified vulnerabilities
 
-ONLY vulnerabilities discovered, when the following setup on test platform is used, are accepted:
+ONLY vulnerabilities discovered, when the following setup on test platform is used, are "validated":
 
 * $dolibarr_main_prod must be set to 1 into conf.php
 * $dolibarr_nocsrfcheck must be kept to the value 0 into conf.php (this is the default value)
 * $dolibarr_main_force_https must be set to something else than 0.
-* The constant MAIN_SECURITY_CSRF_WITH_TOKEN must be set to 1 into backoffice menu Home - Setup - Other (this protection should be enabled soon by default)
+* The constant MAIN_SECURITY_CSRF_WITH_TOKEN must be set to 1 into backoffice menu Home - Setup - Other (this protection should be set to 1 soon by default)
 * The module DebugBar must NOT be enabled (by default, this module is not enabled. This is a developer tool)
 * The module ModuleBuilder must NOT be enabled (by default, this module is not enabled. This is a developer tool)
-* ONLY security reports on modules provided by default and with the "stable" status are allowed (troubles into "experimental", "developement" or external modules are not accepted).
+* ONLY security reports on modules provided by default and with the "stable" status are allowed (troubles into "experimental", "developement" or external modules are not valid vulnerabilities).
 * The root of web server must link to htdocs and the documents directory must be outside of the web server root (this is the default when using the default installer but may differs with external installer).
 * The web server setup must be done so only the documents directory is in write mode. The root directory called htdocs must be readonly.
-* CSRF attacks are accepted for all when using a POST URL, but are accepted only for creating or updating data resctricted to the admin user when using GET URL.
-* Ability for a high level user to edit web site pages in the CMS by including javascript is an expected feature.
+* CSRF attacks are accepted for all when using a POST URL, but when using GET URL, they are validated only for creating or updating data resctricted to the admin user.
+* Ability for a high level user to edit web site pages into the CMS by including HTML or Javascript is an expected feature. Vulnerabilities into the website module are validated only if HTML or Javascript injection can be done by a non allowed user.
 
 Scope is the web application (back office) and the APIs.
 

From 5f476e7e7eb9b3c59c2c1ce05faeba38c94ef367 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 12 Dec 2020 15:37:15 +0100
Subject: [PATCH 372/888] Compatibility of nusoap with PHP8

---
 composer.lock                                 | 495 ++++++++++++------
 dev/dolibarr_changes.txt                      |   1 +
 .../includes/nusoap/lib/class.nusoap_base.php |   2 +-
 .../includes/nusoap/lib/class.soap_fault.php  |   4 +-
 .../includes/nusoap/lib/class.soap_parser.php |   8 +-
 .../includes/nusoap/lib/class.soap_server.php |  16 +-
 .../nusoap/lib/class.soap_transport_http.php  | 102 ++--
 htdocs/includes/nusoap/lib/class.soap_val.php |   4 +-
 .../includes/nusoap/lib/class.soapclient.php  |  24 +-
 htdocs/includes/nusoap/lib/class.wsdl.php     | 294 +++++------
 .../includes/nusoap/lib/class.wsdlcache.php   |   6 +-
 .../includes/nusoap/lib/class.xmlschema.php   |  44 +-
 htdocs/includes/nusoap/lib/nusoap.php         |  34 +-
 htdocs/main.inc.php                           |   2 +-
 test/phpunit/WebservicesOrdersTest.php        |   2 +-
 test/phpunit/WebservicesOtherTest.php         |   4 +-
 test/phpunit/WebservicesProductsTest.php      |   6 +-
 test/phpunit/WebservicesUserTest.php          |  12 +-
 18 files changed, 625 insertions(+), 435 deletions(-)

diff --git a/composer.lock b/composer.lock
index e0462435f5e..0ca4d725ba6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -6,53 +6,6 @@
     ],
     "content-hash": "1dbd2d05cc0836acfca5988f29005cf2",
     "packages": [
-        {
-            "name": "Psr/log",
-            "version": "1.1.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/log.git",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Log\\": "Psr/Log/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for logging libraries",
-            "homepage": "https://github.com/php-fig/log",
-            "keywords": [
-                "log",
-                "psr",
-                "psr-3"
-            ],
-            "time": "2020-03-23T09:12:05+00:00"
-        },
         {
             "name": "ckeditor/ckeditor",
             "version": "4.12.1",
@@ -92,6 +45,12 @@
                 "text",
                 "wysiwyg"
             ],
+            "support": {
+                "forum": "http://ckeditor.com/forums",
+                "issues": "http://dev.ckeditor.com",
+                "source": "http://github.com/ckeditor/ckeditor-dev",
+                "wiki": "http://docs.ckeditor.com"
+            },
             "time": "2019-06-28T10:41:23+00:00"
         },
         {
@@ -153,6 +112,10 @@
                 "debug",
                 "debugbar"
             ],
+            "support": {
+                "issues": "https://github.com/maximebf/php-debugbar/issues",
+                "source": "https://github.com/maximebf/php-debugbar/tree/v1.15.1"
+            },
             "time": "2019-09-24T14:55:42+00:00"
         },
         {
@@ -208,6 +171,10 @@
                 "print",
                 "receipt"
             ],
+            "support": {
+                "issues": "https://github.com/mike42/escpos-php/issues",
+                "source": "https://github.com/mike42/escpos-php/tree/v2.2"
+            },
             "time": "2019-10-05T05:59:00+00:00"
         },
         {
@@ -260,6 +227,10 @@
                 "mobile detector",
                 "php mobile detect"
             ],
+            "support": {
+                "issues": "https://github.com/serbanghita/Mobile-Detect/issues",
+                "source": "https://github.com/serbanghita/Mobile-Detect/tree/2.8.34"
+            },
             "time": "2019-09-18T18:44:20+00:00"
         },
         {
@@ -362,9 +333,63 @@
                 "xls",
                 "xlsx"
             ],
+            "support": {
+                "issues": "https://github.com/PHPOffice/PHPExcel/issues",
+                "source": "https://github.com/PHPOffice/PHPExcel/tree/master"
+            },
             "abandoned": "phpoffice/phpspreadsheet",
             "time": "2015-05-01T07:00:55+00:00"
         },
+        {
+            "name": "psr/log",
+            "version": "1.1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
+                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Log\\": "Psr/Log/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/log/tree/1.1.3"
+            },
+            "time": "2020-03-23T09:12:05+00:00"
+        },
         {
             "name": "restler/framework",
             "version": "3.0.0-RC6",
@@ -424,6 +449,9 @@
                 "rest",
                 "server"
             ],
+            "support": {
+                "source": "https://github.com/Luracast/Restler-Framework/tree/3.0.0-RC6"
+            },
             "time": "2020-02-13T16:05:12+00:00"
         },
         {
@@ -480,24 +508,28 @@
                 "payment processing",
                 "stripe"
             ],
+            "support": {
+                "issues": "https://github.com/stripe/stripe-php/issues",
+                "source": "https://github.com/stripe/stripe-php/tree/master"
+            },
             "time": "2019-08-29T16:56:12+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.18.1",
+            "version": "v1.20.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a"
+                "reference": "39d483bdf39be819deabf04ec872eb0b2410b531"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a6977d63bf9a0ad4c65cd352709e230876f9904a",
-                "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/39d483bdf39be819deabf04ec872eb0b2410b531",
+                "reference": "39d483bdf39be819deabf04ec872eb0b2410b531",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "suggest": {
                 "ext-mbstring": "For best performance"
@@ -505,7 +537,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
+                    "dev-main": "1.20-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -543,6 +575,9 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.20.0"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -557,7 +592,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "time": "2020-10-23T14:02:19+00:00"
         },
         {
             "name": "symfony/var-dumper",
@@ -620,6 +655,9 @@
                 "debug",
                 "dump"
             ],
+            "support": {
+                "source": "https://github.com/symfony/var-dumper/tree/master"
+            },
             "time": "2015-11-18T13:48:51+00:00"
         },
         {
@@ -682,40 +720,40 @@
                 "pdf417",
                 "qrcode"
             ],
+            "support": {
+                "source": "https://github.com/tecnickcom/TCPDF/tree/6.3.2"
+            },
             "time": "2019-09-20T09:35:01+00:00"
         }
     ],
     "packages-dev": [
         {
             "name": "doctrine/instantiator",
-            "version": "1.0.5",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b",
+                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3,<8.0-DEV"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "athletic/athletic": "~0.1.8",
+                "doctrine/coding-standard": "^8.0",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~2.0"
+                "phpbench/phpbench": "^0.13 || 1.0.0-alpha2",
+                "phpstan/phpstan": "^0.12",
+                "phpstan/phpstan-phpunit": "^0.12",
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
@@ -729,38 +767,59 @@
                 {
                     "name": "Marco Pivetta",
                     "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
+                    "homepage": "https://ocramius.github.io/"
                 }
             ],
             "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
+            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
             "keywords": [
                 "constructor",
                 "instantiate"
             ],
-            "time": "2015-06-14T21:17:01+00:00"
+            "support": {
+                "issues": "https://github.com/doctrine/instantiator/issues",
+                "source": "https://github.com/doctrine/instantiator/tree/1.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-11-10T18:47:58+00:00"
         },
         {
             "name": "php-parallel-lint/php-console-color",
-            "version": "v0.2",
+            "version": "v0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-parallel-lint/PHP-Console-Color.git",
-                "reference": "d5deaecff52a0d61ccb613bb3804088da0307191"
+                "reference": "b6af326b2088f1ad3b264696c9fd590ec395b49e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-parallel-lint/PHP-Console-Color/zipball/d5deaecff52a0d61ccb613bb3804088da0307191",
-                "reference": "d5deaecff52a0d61ccb613bb3804088da0307191",
+                "url": "https://api.github.com/repos/php-parallel-lint/PHP-Console-Color/zipball/b6af326b2088f1ad3b264696c9fd590ec395b49e",
+                "reference": "b6af326b2088f1ad3b264696c9fd590ec395b49e",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.4.0"
             },
+            "replace": {
+                "jakub-onderka/php-console-color": "*"
+            },
             "require-dev": {
-                "jakub-onderka/php-code-style": "1.0",
-                "jakub-onderka/php-parallel-lint": "1.0",
-                "jakub-onderka/php-var-dump-check": "0.*",
+                "php-parallel-lint/php-code-style": "1.0",
+                "php-parallel-lint/php-parallel-lint": "1.0",
+                "php-parallel-lint/php-var-dump-check": "0.*",
                 "phpunit/phpunit": "~4.3",
                 "squizlabs/php_codesniffer": "1.*"
             },
@@ -780,7 +839,11 @@
                     "email": "jakub.onderka@gmail.com"
                 }
             ],
-            "time": "2018-09-29T17:23:10+00:00"
+            "support": {
+                "issues": "https://github.com/php-parallel-lint/PHP-Console-Color/issues",
+                "source": "https://github.com/php-parallel-lint/PHP-Console-Color/tree/master"
+            },
+            "time": "2020-05-14T05:47:14+00:00"
         },
         {
             "name": "php-parallel-lint/php-console-highlighter",
@@ -829,6 +892,10 @@
                 }
             ],
             "description": "Highlight PHP code in terminal",
+            "support": {
+                "issues": "https://github.com/php-parallel-lint/PHP-Console-Highlighter/issues",
+                "source": "https://github.com/php-parallel-lint/PHP-Console-Highlighter/tree/master"
+            },
             "time": "2020-05-13T07:37:49+00:00"
         },
         {
@@ -876,39 +943,37 @@
             ],
             "description": "This tool check syntax of PHP files about 20x faster than serial check.",
             "homepage": "https://github.com/JakubOnderka/PHP-Parallel-Lint",
+            "support": {
+                "source": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/tree/v0.9.2"
+            },
             "time": "2015-12-15T10:42:16+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
-            "version": "1.0.1",
+            "version": "2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
+                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-2.x": "2.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src"
-                    ]
+                    "phpDocumentor\\Reflection\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -930,44 +995,45 @@
                 "reflection",
                 "static analysis"
             ],
-            "time": "2017-09-11T18:02:19+00:00"
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
+            },
+            "time": "2020-06-27T09:03:43+00:00"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "4.3.2",
+            "version": "5.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e"
+                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/b83ff7cfcfee7827e1e78b637a5904fe6a96698e",
-                "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556",
+                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0",
-                "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0",
-                "phpdocumentor/type-resolver": "~0.4 || ^1.0.0",
-                "webmozart/assert": "^1.0"
+                "ext-filter": "*",
+                "php": "^7.2 || ^8.0",
+                "phpdocumentor/reflection-common": "^2.2",
+                "phpdocumentor/type-resolver": "^1.3",
+                "webmozart/assert": "^1.9.1"
             },
             "require-dev": {
-                "doctrine/instantiator": "^1.0.5",
-                "mockery/mockery": "^1.0",
-                "phpunit/phpunit": "^6.4"
+                "mockery/mockery": "~1.3.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.x-dev"
+                    "dev-master": "5.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
+                    "phpDocumentor\\Reflection\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -978,37 +1044,44 @@
                 {
                     "name": "Mike van Riel",
                     "email": "me@mikevanriel.com"
+                },
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "account@ijaap.nl"
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2019-09-12T14:27:41+00:00"
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master"
+            },
+            "time": "2020-09-03T19:13:55+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "0.5.1",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "cf842904952e64e703800d094cdf34e715a8a3ae"
+                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/cf842904952e64e703800d094cdf34e715a8a3ae",
-                "reference": "cf842904952e64e703800d094cdf34e715a8a3ae",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
+                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0",
-                "phpdocumentor/reflection-common": "^1.0"
+                "php": "^7.2 || ^8.0",
+                "phpdocumentor/reflection-common": "^2.0"
             },
             "require-dev": {
-                "mockery/mockery": "^1.0",
-                "phpunit/phpunit": "^6.4"
+                "ext-tokenizer": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-1.x": "1.x-dev"
                 }
             },
             "autoload": {
@@ -1026,37 +1099,42 @@
                     "email": "me@mikevanriel.com"
                 }
             ],
-            "time": "2017-12-30T13:23:38+00:00"
+            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
+            "support": {
+                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.4.0"
+            },
+            "time": "2020-09-17T18:55:26+00:00"
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.9.0",
+            "version": "v1.10.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203"
+                "reference": "451c3cd1418cf640de218914901e51b064abb093"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/f6811d96d97bdf400077a0cc100ae56aa32b9203",
-                "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093",
+                "reference": "451c3cd1418cf640de218914901e51b064abb093",
                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.0.2",
                 "php": "^5.3|^7.0",
                 "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
-                "sebastian/comparator": "^1.1|^2.0|^3.0",
-                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
+                "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0",
+                "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0"
             },
             "require-dev": {
-                "phpspec/phpspec": "^2.5|^3.2",
+                "phpspec/phpspec": "^2.5 || ^3.2",
                 "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.8.x-dev"
+                    "dev-master": "1.10.x-dev"
                 }
             },
             "autoload": {
@@ -1089,7 +1167,11 @@
                 "spy",
                 "stub"
             ],
-            "time": "2019-10-03T11:07:50+00:00"
+            "support": {
+                "issues": "https://github.com/phpspec/prophecy/issues",
+                "source": "https://github.com/phpspec/prophecy/tree/v1.10.3"
+            },
+            "time": "2020-03-05T15:02:03+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -1151,6 +1233,11 @@
                 "testing",
                 "xunit"
             ],
+            "support": {
+                "irc": "irc://irc.freenode.net/phpunit",
+                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/2.2"
+            },
             "time": "2015-10-06T15:47:00+00:00"
         },
         {
@@ -1198,6 +1285,11 @@
                 "filesystem",
                 "iterator"
             ],
+            "support": {
+                "irc": "irc://irc.freenode.net/phpunit",
+                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/1.4.5"
+            },
             "time": "2017-11-27T13:52:08+00:00"
         },
         {
@@ -1239,6 +1331,10 @@
             "keywords": [
                 "template"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1"
+            },
             "time": "2015-06-21T13:50:34+00:00"
         },
         {
@@ -1288,6 +1384,10 @@
             "keywords": [
                 "timer"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/master"
+            },
             "time": "2017-02-26T11:10:40+00:00"
         },
         {
@@ -1337,6 +1437,10 @@
             "keywords": [
                 "tokenizer"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-token-stream/issues",
+                "source": "https://github.com/sebastianbergmann/php-token-stream/tree/1.4"
+            },
             "abandoned": true,
             "time": "2017-12-04T08:55:13+00:00"
         },
@@ -1410,6 +1514,10 @@
                 "testing",
                 "xunit"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/4.8.36"
+            },
             "time": "2017-06-21T08:07:12+00:00"
         },
         {
@@ -1466,6 +1574,11 @@
                 "mock",
                 "xunit"
             ],
+            "support": {
+                "irc": "irc://irc.freenode.net/phpunit",
+                "issues": "https://github.com/sebastianbergmann/phpunit-mock-objects/issues",
+                "source": "https://github.com/sebastianbergmann/phpunit-mock-objects/tree/2.3"
+            },
             "abandoned": true,
             "time": "2015-10-02T06:51:40+00:00"
         },
@@ -1531,6 +1644,11 @@
                 "testing",
                 "xunit"
             ],
+            "support": {
+                "irc": "irc://irc.freenode.net/phpunit",
+                "issues": "https://github.com/sebastianbergmann/phpunit-selenium/issues",
+                "source": "https://github.com/giorgiosironi/phpunit-selenium/tree/2.x"
+            },
             "time": "2017-01-23T22:15:32+00:00"
         },
         {
@@ -1595,6 +1713,10 @@
                 "compare",
                 "equality"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/comparator/issues",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/1.2"
+            },
             "time": "2017-01-29T09:50:25+00:00"
         },
         {
@@ -1647,6 +1769,10 @@
             "keywords": [
                 "diff"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/diff/issues",
+                "source": "https://github.com/sebastianbergmann/diff/tree/1.4"
+            },
             "time": "2017-05-22T07:24:03+00:00"
         },
         {
@@ -1697,6 +1823,10 @@
                 "environment",
                 "hhvm"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/environment/issues",
+                "source": "https://github.com/sebastianbergmann/environment/tree/1.3"
+            },
             "time": "2016-08-18T05:49:44+00:00"
         },
         {
@@ -1764,6 +1894,10 @@
                 "export",
                 "exporter"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/exporter/issues",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/master"
+            },
             "time": "2016-06-17T09:04:28+00:00"
         },
         {
@@ -1815,6 +1949,10 @@
             "keywords": [
                 "global state"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/global-state/issues",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/1.1.1"
+            },
             "time": "2015-10-12T03:26:01+00:00"
         },
         {
@@ -1868,6 +2006,10 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/master"
+            },
             "time": "2016-10-03T07:41:43+00:00"
         },
         {
@@ -1903,6 +2045,10 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/version/issues",
+                "source": "https://github.com/sebastianbergmann/version/tree/1.0.6"
+            },
             "time": "2015-06-21T13:59:46+00:00"
         },
         {
@@ -1981,24 +2127,29 @@
                 "phpcs",
                 "standards"
             ],
+            "support": {
+                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
+                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
+                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
+            },
             "time": "2018-11-07T22:31:41+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.12.0",
+            "version": "v1.20.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "550ebaac289296ce228a706d0867afc34687e3f4"
+                "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4",
-                "reference": "550ebaac289296ce228a706d0867afc34687e3f4",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f4ba089a5b6366e453971d3aad5fe8e897b37f41",
+                "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "suggest": {
                 "ext-ctype": "For best performance"
@@ -2006,7 +2157,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.12-dev"
+                    "dev-main": "1.20-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -2039,20 +2194,37 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2019-08-06T08:03:45+00:00"
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.20.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-10-23T14:02:19+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v3.4.32",
+            "version": "v3.4.47",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "768f817446da74a776a31eea335540f9dcb53942"
+                "reference": "88289caa3c166321883f67fe5130188ebbb47094"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/768f817446da74a776a31eea335540f9dcb53942",
-                "reference": "768f817446da74a776a31eea335540f9dcb53942",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/88289caa3c166321883f67fe5130188ebbb47094",
+                "reference": "88289caa3c166321883f67fe5130188ebbb47094",
                 "shasum": ""
             },
             "require": {
@@ -2069,11 +2241,6 @@
                 "symfony/console": "For validating YAML files using the lint command"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.4-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Yaml\\": ""
@@ -2098,35 +2265,51 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2019-09-10T10:38:46+00:00"
+            "support": {
+                "source": "https://github.com/symfony/yaml/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-10-24T10:57:07+00:00"
         },
         {
             "name": "webmozart/assert",
-            "version": "1.5.0",
+            "version": "1.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozart/assert.git",
-                "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4"
+                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/88e6d84706d09a236046d686bbea96f07b3a34f4",
-                "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
+                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0",
+                "php": "^5.3.3 || ^7.0 || ^8.0",
                 "symfony/polyfill-ctype": "^1.8"
             },
+            "conflict": {
+                "phpstan/phpstan": "<0.12.20",
+                "vimeo/psalm": "<3.9.1"
+            },
             "require-dev": {
                 "phpunit/phpunit": "^4.8.36 || ^7.5.13"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Webmozart\\Assert\\": "src/"
@@ -2148,7 +2331,11 @@
                 "check",
                 "validate"
             ],
-            "time": "2019-08-24T08:43:50+00:00"
+            "support": {
+                "issues": "https://github.com/webmozart/assert/issues",
+                "source": "https://github.com/webmozart/assert/tree/master"
+            },
+            "time": "2020-07-08T17:02:28+00:00"
         }
     ],
     "aliases": [],
diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
index 5f09d9536be..e8db54a004f 100644
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -48,6 +48,7 @@ By
 * In file nusoap.php, to avoid a warning,
 Replace call to serialize_val with no bugged value
 
+* In all files, replace constructor names into __construct. Replace also parent::constructor_name with parent::__construct
 
 
 
diff --git a/htdocs/includes/nusoap/lib/class.nusoap_base.php b/htdocs/includes/nusoap/lib/class.nusoap_base.php
index 8c1afbdc8dd..4a33d7e491b 100644
--- a/htdocs/includes/nusoap/lib/class.nusoap_base.php
+++ b/htdocs/includes/nusoap/lib/class.nusoap_base.php
@@ -219,7 +219,7 @@ class nusoap_base {
 	*
 	* @access	public
 	*/
-	function nusoap_base() {
+	function __construct() {
 		$this->debugLevel = $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];
 	}
 
diff --git a/htdocs/includes/nusoap/lib/class.soap_fault.php b/htdocs/includes/nusoap/lib/class.soap_fault.php
index 86274203783..9dca5160c9b 100644
--- a/htdocs/includes/nusoap/lib/class.soap_fault.php
+++ b/htdocs/includes/nusoap/lib/class.soap_fault.php
@@ -44,8 +44,8 @@ class nusoap_fault extends nusoap_base {
     * @param string $faultstring human readable error message
     * @param mixed $faultdetail detail, typically a string or array of string
 	*/
-	function nusoap_fault($faultcode,$faultactor='',$faultstring='',$faultdetail=''){
-		parent::nusoap_base();
+	function __construct($faultcode,$faultactor='',$faultstring='',$faultdetail=''){
+		parent::__construct();
 		$this->faultcode = $faultcode;
 		$this->faultactor = $faultactor;
 		$this->faultstring = $faultstring;
diff --git a/htdocs/includes/nusoap/lib/class.soap_parser.php b/htdocs/includes/nusoap/lib/class.soap_parser.php
index 6bfa341b67f..db0342af83c 100644
--- a/htdocs/includes/nusoap/lib/class.soap_parser.php
+++ b/htdocs/includes/nusoap/lib/class.soap_parser.php
@@ -56,8 +56,8 @@ class nusoap_parser extends nusoap_base {
 	* @param    string $decode_utf8 whether to decode UTF-8 to ISO-8859-1
 	* @access   public
 	*/
-	function nusoap_parser($xml,$encoding='UTF-8',$method='',$decode_utf8=true){
-		parent::nusoap_base();
+	function __construct($xml,$encoding='UTF-8',$method='',$decode_utf8=true){
+		parent::__construct();
 		$this->xml = $xml;
 		$this->xml_encoding = $encoding;
 		$this->method = $method;
@@ -316,7 +316,7 @@ class nusoap_parser extends nusoap_base {
 			// get unqualified name
 			$name = substr(strstr($name,':'),1);
 		}
-		
+
 		// build to native type
 		if(isset($this->body_position) && $pos > $this->body_position){
 			// deal w/ multirefs
@@ -378,7 +378,7 @@ class nusoap_parser extends nusoap_base {
 				*/
 			}
 		}
-		
+
         // for doclit
         if($this->status == 'header'){
         	if ($this->root_header != $pos) {
diff --git a/htdocs/includes/nusoap/lib/class.soap_server.php b/htdocs/includes/nusoap/lib/class.soap_server.php
index 34c2269ffe9..8145219acdb 100644
--- a/htdocs/includes/nusoap/lib/class.soap_server.php
+++ b/htdocs/includes/nusoap/lib/class.soap_server.php
@@ -169,8 +169,8 @@ class nusoap_server extends nusoap_base {
     * @param mixed $wsdl file path or URL (string), or wsdl instance (object)
 	* @access   public
 	*/
-	function nusoap_server($wsdl=false){
-		parent::nusoap_base();
+	function __construct($wsdl=false){
+		parent::__construct();
 		// turn on debugging?
 		global $debug;
 		global $HTTP_SERVER_VARS;
@@ -776,7 +776,7 @@ class nusoap_server extends nusoap_base {
 		//begin code to compress payload - by John
 		// NOTE: there is no way to know whether the Web server will also compress
 		// this data.
-		if (strlen($payload) > 1024 && isset($this->headers) && isset($this->headers['accept-encoding'])) {	
+		if (strlen($payload) > 1024 && isset($this->headers) && isset($this->headers['accept-encoding'])) {
 			if (strstr($this->headers['accept-encoding'], 'gzip')) {
 				if (function_exists('gzencode')) {
 					if (isset($this->debug_flag) && $this->debug_flag) {
@@ -903,7 +903,7 @@ class nusoap_server extends nusoap_base {
 	function getHTTPBody($soapmsg) {
 		return $soapmsg;
 	}
-	
+
 	/**
 	* gets the HTTP content type for the current response.
 	*
@@ -915,7 +915,7 @@ class nusoap_server extends nusoap_base {
 	function getHTTPContentType() {
 		return 'text/xml';
 	}
-	
+
 	/**
 	* gets the HTTP content type charset for the current response.
 	* returns false for non-text content types.
@@ -1074,7 +1074,7 @@ class nusoap_server extends nusoap_base {
         if(false == $namespace) {
             $namespace = "http://$SERVER_NAME/soap/$serviceName";
         }
-        
+
         if(false == $endpoint) {
         	if ($HTTPS == '1' || $HTTPS == 'on') {
         		$SCHEME = 'https';
@@ -1083,11 +1083,11 @@ class nusoap_server extends nusoap_base {
         	}
             $endpoint = "$SCHEME://$SERVER_NAME$SERVER_PORT$SCRIPT_NAME";
         }
-        
+
         if(false == $schemaTargetNamespace) {
             $schemaTargetNamespace = $namespace;
         }
-        
+
 		$this->wsdl = new wsdl;
 		$this->wsdl->serviceName = $serviceName;
         $this->wsdl->endpoint = $endpoint;
diff --git a/htdocs/includes/nusoap/lib/class.soap_transport_http.php b/htdocs/includes/nusoap/lib/class.soap_transport_http.php
index 8141d4f655e..4ff49345083 100644
--- a/htdocs/includes/nusoap/lib/class.soap_transport_http.php
+++ b/htdocs/includes/nusoap/lib/class.soap_transport_http.php
@@ -56,8 +56,8 @@ class soap_transport_http extends nusoap_base {
 	* @param boolean $use_curl Whether to try to force cURL use
 	* @access public
 	*/
-	function soap_transport_http($url, $curl_options = NULL, $use_curl = false){
-		parent::nusoap_base();
+	function __construct($url, $curl_options = NULL, $use_curl = false){
+		parent::__construct();
 		$this->debug("ctor url=$url use_curl=$use_curl curl_options:");
 		$this->appendDebug($this->varDump($curl_options));
 		$this->setURL($url);
@@ -121,12 +121,12 @@ class soap_transport_http extends nusoap_base {
 			$this->debug("parsed URL $k = $v");
 			$this->$k = $v;
 		}
-		
+
 		// add any GET params to path
 		if(isset($u['query']) && $u['query'] != ''){
             $this->path .= '?' . $u['query'];
 		}
-		
+
 		// set default port
 		if(!isset($u['port'])){
 			if($u['scheme'] == 'https'){
@@ -135,10 +135,10 @@ class soap_transport_http extends nusoap_base {
 				$this->port = 80;
 			}
 		}
-		
+
 		$this->uri = $this->path;
 		$this->digest_uri = $this->uri;
-		
+
 		// build headers
 		if (!isset($u['port'])) {
 			$this->setHeader('Host', $this->host);
@@ -218,7 +218,7 @@ class soap_transport_http extends nusoap_base {
 		} else {
 			$this->fp = @fsockopen( $host, $this->port, $this->errno, $this->error_str);
 		}
-		
+
 		// test pointer
 		if(!$this->fp) {
 			$msg = 'Couldn\'t open socket connection to server ' . $this->url;
@@ -231,7 +231,7 @@ class soap_transport_http extends nusoap_base {
 			$this->setError($msg);
 			return false;
 		}
-		
+
 		// set response timeout
 		$this->debug('set response timeout to ' . $response_timeout);
 		socket_set_timeout( $this->fp, $response_timeout);
@@ -320,10 +320,10 @@ class soap_transport_http extends nusoap_base {
 			// recent versions of cURL turn on peer/host checking by default,
 			// while PHP binaries are not compiled with a default location for the
 			// CA cert bundle, so disable peer/host checking.
-			//$this->setCurlOption(CURLOPT_CAINFO, 'f:\php-4.3.2-win32\extensions\curl-ca-bundle.crt');		
+			//$this->setCurlOption(CURLOPT_CAINFO, 'f:\php-4.3.2-win32\extensions\curl-ca-bundle.crt');
 			$this->setCurlOption(CURLOPT_SSL_VERIFYPEER, 0);
 			$this->setCurlOption(CURLOPT_SSL_VERIFYHOST, 0);
-	
+
 			// support client certificates (thanks Tobias Boes, Doug Anarino, Eryan Ariobowo)
 			if ($this->authtype == 'certificate') {
 				$this->debug('set cURL certificate options');
@@ -410,7 +410,7 @@ class soap_transport_http extends nusoap_base {
 	* @access   public
 	*/
 	function send($data, $timeout=0, $response_timeout=30, $cookies=NULL) {
-		
+
 		$this->debug('entered send() with data of length: '.strlen($data));
 
 		$this->tryagain = true;
@@ -422,18 +422,18 @@ class soap_transport_http extends nusoap_base {
 				if (!$this->connect($timeout, $response_timeout)){
 					return false;
 				}
-				
+
 				// send request
 				if (!$this->sendRequest($data, $cookies)){
 					return false;
 				}
-				
+
 				// get response
 				$respdata = $this->getResponse();
 			} else {
 				$this->setError("Too many tries to get an OK response ($this->response_status_line)");
 			}
-		}		
+		}
 		$this->debug('end of send()');
 		return $respdata;
 	}
@@ -453,7 +453,7 @@ class soap_transport_http extends nusoap_base {
 	function sendHTTPS($data, $timeout=0, $response_timeout=30, $cookies) {
 		return $this->send($data, $timeout, $response_timeout, $cookies);
 	}
-	
+
 	/**
 	* if authenticating, set user credentials here
 	*
@@ -475,21 +475,21 @@ class soap_transport_http extends nusoap_base {
 		} elseif ($authtype == 'digest') {
 			if (isset($digestRequest['nonce'])) {
 				$digestRequest['nc'] = isset($digestRequest['nc']) ? $digestRequest['nc']++ : 1;
-				
+
 				// calculate the Digest hashes (calculate code based on digest implementation found at: http://www.rassoc.com/gregr/weblog/stories/2002/07/09/webServicesSecurityHttpDigestAuthenticationWithoutActiveDirectory.html)
-	
+
 				// A1 = unq(username-value) ":" unq(realm-value) ":" passwd
 				$A1 = $username. ':' . (isset($digestRequest['realm']) ? $digestRequest['realm'] : '') . ':' . $password;
-	
+
 				// H(A1) = MD5(A1)
 				$HA1 = md5($A1);
-	
+
 				// A2 = Method ":" digest-uri-value
 				$A2 = $this->request_method . ':' . $this->digest_uri;
-	
+
 				// H(A2)
 				$HA2 =  md5($A2);
-	
+
 				// KD(secret, data) = H(concat(secret, ":", data))
 				// if qop == auth:
 				// request-digest  = <"> < KD ( H(A1),     unq(nonce-value)
@@ -500,7 +500,7 @@ class soap_transport_http extends nusoap_base {
 				//                            ) <">
 				// if qop is missing,
 				// request-digest  = <"> < KD ( H(A1), unq(nonce-value) ":" H(A2) ) > <">
-	
+
 				$unhashedDigest = '';
 				$nonce = isset($digestRequest['nonce']) ? $digestRequest['nonce'] : '';
 				$cnonce = $nonce;
@@ -509,10 +509,10 @@ class soap_transport_http extends nusoap_base {
 				} else {
 					$unhashedDigest = $HA1 . ':' . $nonce . ':' . $HA2;
 				}
-	
+
 				$hashedDigest = md5($unhashedDigest);
-	
-				$opaque = '';	
+
+				$opaque = '';
 				if (isset($digestRequest['opaque'])) {
 					$opaque = ', opaque="' . $digestRequest['opaque'] . '"';
 				}
@@ -531,7 +531,7 @@ class soap_transport_http extends nusoap_base {
 		$this->authtype = $authtype;
 		$this->digestRequest = $digestRequest;
 	}
-	
+
 	/**
 	* set the soapaction value
 	*
@@ -541,7 +541,7 @@ class soap_transport_http extends nusoap_base {
 	function setSOAPAction($soapaction) {
 		$this->setHeader('SOAPAction', '"' . $soapaction . '"');
 	}
-	
+
 	/**
 	* use http encoding
 	*
@@ -561,7 +561,7 @@ class soap_transport_http extends nusoap_base {
 			$this->encoding = $enc;
 		}
 	}
-	
+
 	/**
 	* set proxy info here
 	*
@@ -590,7 +590,7 @@ class soap_transport_http extends nusoap_base {
 			unsetHeader('Proxy-Authorization');
 		}
 	}
-	
+
 
 	/**
 	 * Test if the given string starts with a header that is to be skipped.
@@ -631,7 +631,7 @@ class soap_transport_http extends nusoap_base {
 		// length := 0
 		$length = 0;
 		$new = '';
-		
+
 		// read chunk-size, chunk-extension (if any) and CRLF
 		// get the position of the linebreak
 		$chunkend = strpos($buffer, $lb);
@@ -646,7 +646,7 @@ class soap_transport_http extends nusoap_base {
 		while ($chunk_size > 0) {
 			$this->debug("chunkstart: $chunkstart chunk_size: $chunk_size");
 			$chunkend = strpos( $buffer, $lb, $chunkstart + $chunk_size);
-		  	
+
 			// Just in case we got a broken connection
 		  	if ($chunkend == FALSE) {
 		  	    $chunk = substr($buffer,$chunkstart);
@@ -655,7 +655,7 @@ class soap_transport_http extends nusoap_base {
 		  	    $length += strlen($chunk);
 		  	    break;
 			}
-			
+
 		  	// read chunk-data and CRLF
 		  	$chunk = substr($buffer,$chunkstart,$chunkend-$chunkstart);
 		  	// append chunk-data to entity-body
@@ -664,7 +664,7 @@ class soap_transport_http extends nusoap_base {
 		  	$length += strlen($chunk);
 		  	// read chunk-size and CRLF
 		  	$chunkstart = $chunkend + strlen($lb);
-			
+
 		  	$chunkend = strpos($buffer, $lb, $chunkstart) + strlen($lb);
 			if ($chunkend == FALSE) {
 				break; //Just in case we got a broken connection
@@ -675,7 +675,7 @@ class soap_transport_http extends nusoap_base {
 		}
 		return $new;
 	}
-	
+
 	/**
 	 * Writes the payload, including HTTP headers, to $this->outgoing_payload.
 	 *
@@ -720,7 +720,7 @@ class soap_transport_http extends nusoap_base {
 
 		// header/body separator
 		$this->outgoing_payload .= "\r\n";
-		
+
 		// add data
 		$this->outgoing_payload .= $data;
 	}
@@ -792,7 +792,7 @@ class soap_transport_http extends nusoap_base {
 	*/
 	function getResponse(){
 		$this->incoming_payload = '';
-	    
+
 	  if ($this->io_method() == 'socket') {
 	    // loop until headers have been retrieved
 	    $data = '';
@@ -863,7 +863,7 @@ class soap_transport_http extends nusoap_base {
 				$this->incoming_headers[$header_name] .= $lb . ' ' . $header_line;
 			}
 		}
-		
+
 		// loop until msg has been received
 		if (isset($this->incoming_headers['transfer-encoding']) && strtolower($this->incoming_headers['transfer-encoding']) == 'chunked') {
 			$content_length =  2147483647;	// ignore any content-length header
@@ -929,22 +929,22 @@ class soap_transport_http extends nusoap_base {
 		$this->debug('read body of length ' . strlen($data));
 		$this->incoming_payload .= $data;
 		$this->debug('received a total of '.strlen($this->incoming_payload).' bytes of data from server');
-		
+
 		// close filepointer
 		if(
-			(isset($this->incoming_headers['connection']) && strtolower($this->incoming_headers['connection']) == 'close') || 
+			(isset($this->incoming_headers['connection']) && strtolower($this->incoming_headers['connection']) == 'close') ||
 			(! $this->persistentConnection) || feof($this->fp)){
 			fclose($this->fp);
 			$this->fp = false;
 			$this->debug('closed socket');
 		}
-		
+
 		// connection was closed unexpectedly
 		if($this->incoming_payload == ''){
 			$this->setError('no response from server');
 			return false;
 		}
-		
+
 		// decode transfer-encoding
 //		if(isset($this->incoming_headers['transfer-encoding']) && strtolower($this->incoming_headers['transfer-encoding']) == 'chunked'){
 //			if(!$data = $this->decodeChunked($data, $lb)){
@@ -955,7 +955,7 @@ class soap_transport_http extends nusoap_base {
 			// set decoded payload
 //			$this->incoming_payload = $header_data.$lb.$lb.$data;
 //		}
-	
+
 	  } else if ($this->io_method() == 'curl') {
 		// send and receive
 		$this->debug('send and receive with cURL');
@@ -981,7 +981,7 @@ class soap_transport_http extends nusoap_base {
 		// close curl
 		$this->debug('No cURL error, closing cURL');
 		curl_close($this->ch);
-		
+
 		// try removing skippable headers
 		$savedata = $data;
 		while ($this->isSkippableCurlHeader($data)) {
@@ -1004,7 +1004,7 @@ class soap_transport_http extends nusoap_base {
 				}
 			}
 		}
-		
+
 		// separate content from HTTP headers
 		if ($pos = strpos($data,"\r\n\r\n")) {
 			$lb = "\r\n";
@@ -1064,7 +1064,7 @@ class soap_transport_http extends nusoap_base {
  				$this->debug('Server wants digest authentication');
  				// remove "Digest " from our elements
  				$digestString = str_replace('Digest ', '', $this->incoming_headers['www-authenticate']);
- 				
+
  				// parse elements into array
  				$digestElements = explode(',', $digestString);
  				foreach ($digestElements as $val) {
@@ -1083,7 +1083,7 @@ class soap_transport_http extends nusoap_base {
 			$this->setError('HTTP authentication failed');
 			return false;
  		}
-		
+
 		if (
 			($http_status >= 300 && $http_status <= 307) ||
 			($http_status >= 400 && $http_status <= 417) ||
@@ -1151,13 +1151,13 @@ class soap_transport_http extends nusoap_base {
 		} else {
 			$this->debug('No Content-Encoding header');
 		}
-		
+
 		if(strlen($data) == 0){
 			$this->debug('no data after headers!');
 			$this->setError('no data present after HTTP headers');
 			return false;
 		}
-		
+
 		return $data;
 	}
 
@@ -1229,7 +1229,7 @@ class soap_transport_http extends nusoap_base {
 		} else {
 			$path = '/';
 		}
-						
+
 		$cookie_param = ';secure;';
 		if (strpos($cookie_str, $cookie_param) !== FALSE) {
 			$secure = true;
@@ -1248,12 +1248,12 @@ class soap_transport_http extends nusoap_base {
 							'path' => $path,
 							'expires' => $expires,
 							'secure' => $secure
-							);		
+							);
 			return $cookie;
 		}
 		return false;
 	}
-  
+
 	/**
 	 * sort out cookies for the current request
 	 *
diff --git a/htdocs/includes/nusoap/lib/class.soap_val.php b/htdocs/includes/nusoap/lib/class.soap_val.php
index cc2e515e4e1..003375fda84 100644
--- a/htdocs/includes/nusoap/lib/class.soap_val.php
+++ b/htdocs/includes/nusoap/lib/class.soap_val.php
@@ -68,8 +68,8 @@ class soapval extends nusoap_base {
 	* @param	mixed $attributes associative array of attributes to add to element serialization
 	* @access   public
 	*/
-  	function soapval($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) {
-		parent::nusoap_base();
+	function __construct($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) {
+		parent::__construct();
 		$this->name = $name;
 		$this->type = $type;
 		$this->value = $value;
diff --git a/htdocs/includes/nusoap/lib/class.soapclient.php b/htdocs/includes/nusoap/lib/class.soapclient.php
index 9d9533b22b3..de0ca3c9882 100644
--- a/htdocs/includes/nusoap/lib/class.soapclient.php
+++ b/htdocs/includes/nusoap/lib/class.soapclient.php
@@ -94,8 +94,8 @@ class nusoap_client extends nusoap_base  {
 	* @param	string $portName optional portName in WSDL document
 	* @access   public
 	*/
-	function nusoap_client($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = ''){
-		parent::nusoap_base();
+	function __construct($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = ''){
+		parent::__construct();
 		$this->endpoint = $endpoint;
 		$this->proxyhost = $proxyhost;
 		$this->proxyport = $proxyport;
@@ -163,7 +163,7 @@ class nusoap_client extends nusoap_base  {
 		$this->faultstring = '';
 		$this->faultcode = '';
 		$this->opData = array();
-		
+
 		$this->debug("call: operation=$operation, namespace=$namespace, soapAction=$soapAction, rpcParams=$rpcParams, style=$style, use=$use, endpointType=$this->endpointType");
 		$this->appendDebug('params=' . $this->varDump($params));
 		$this->appendDebug('headers=' . $this->varDump($headers));
@@ -234,7 +234,7 @@ class nusoap_client extends nusoap_base  {
 			// no WSDL
 			//$this->namespaces['ns1'] = $namespace;
 			$nsPrefix = 'ns' . rand(1000, 9999);
-			// serialize 
+			// serialize
 			$payload = '';
 			if (is_string($params)) {
 				$this->debug("serializing param string for operation $operation");
@@ -294,7 +294,7 @@ class nusoap_client extends nusoap_base  {
 			$this->return = $return;
 			$this->debug('sent message successfully and got a(n) '.gettype($return));
            	$this->appendDebug('return=' . $this->varDump($return));
-			
+
 			// fault?
 			if(is_array($return) && isset($return['faultcode'])){
 				$this->debug('got fault');
@@ -463,7 +463,7 @@ class nusoap_client extends nusoap_base  {
 						$this->persistentConnection = $http;
 					}
 				}
-				
+
 				if($err = $http->getError()){
 					$this->setError('HTTP Error: '.$err);
 					return false;
@@ -627,7 +627,7 @@ class nusoap_client extends nusoap_base  {
 		$this->authtype = $authtype;
 		$this->certRequest = $certRequest;
 	}
-	
+
 	/**
 	* use HTTP encoding
 	*
@@ -638,7 +638,7 @@ class nusoap_client extends nusoap_base  {
 		$this->debug("setHTTPEncoding(\"$enc\")");
 		$this->http_encoding = $enc;
 	}
-	
+
 	/**
 	* Set whether to try to use cURL connections if possible
 	*
@@ -659,7 +659,7 @@ class nusoap_client extends nusoap_base  {
 		$this->debug("useHTTPPersistentConnection");
 		$this->persistentConnection = true;
 	}
-	
+
 	/**
 	* gets the default RPC parameter setting.
 	* If true, default is that call params are like RPC even for document style.
@@ -689,7 +689,7 @@ class nusoap_client extends nusoap_base  {
 	function setDefaultRpcParams($rpcParams) {
 		$this->defaultRpcParams = $rpcParams;
 	}
-	
+
 	/**
 	* dynamically creates an instance of a proxy class,
 	* allowing user to directly call methods from wsdl
@@ -819,7 +819,7 @@ class nusoap_client extends nusoap_base  {
 	function getHTTPBody($soapmsg) {
 		return $soapmsg;
 	}
-	
+
 	/**
 	* gets the HTTP content type for the current request.
 	*
@@ -831,7 +831,7 @@ class nusoap_client extends nusoap_base  {
 	function getHTTPContentType() {
 		return 'text/xml';
 	}
-	
+
 	/**
 	* gets the HTTP content type charset for the current request.
 	* returns false for non-text content types.
diff --git a/htdocs/includes/nusoap/lib/class.wsdl.php b/htdocs/includes/nusoap/lib/class.wsdl.php
index 5c701700bff..691426a2a0f 100644
--- a/htdocs/includes/nusoap/lib/class.wsdl.php
+++ b/htdocs/includes/nusoap/lib/class.wsdl.php
@@ -6,14 +6,14 @@
 /**
 * parses a WSDL file, allows access to it's data, other utility methods.
 * also builds WSDL structures programmatically.
-* 
+*
 * @author   Dietrich Ayala <dietrich@ganx4.com>
 * @author   Scott Nichol <snichol@users.sourceforge.net>
-* @access public 
+* @access public
 */
 class wsdl extends nusoap_base {
 	// URL or filename of the root of this WSDL
-    var $wsdl; 
+    var $wsdl;
     // define internal arrays of bindings, ports, operations, messages, etc.
     var $schemas = array();
     var $currentSchema;
@@ -31,9 +31,9 @@ class wsdl extends nusoap_base {
     var $opData = array();
     var $status = '';
     var $documentation = false;
-    var $endpoint = ''; 
+    var $endpoint = '';
     // array of wsdl docs to import
-    var $import = array(); 
+    var $import = array();
     // parser vars
     var $parser;
     var $position = 0;
@@ -56,7 +56,7 @@ class wsdl extends nusoap_base {
 
     /**
      * constructor
-     * 
+     *
      * @param string $wsdl WSDL document URL
 	 * @param string $proxyhost
 	 * @param string $proxyport
@@ -66,10 +66,10 @@ class wsdl extends nusoap_base {
 	 * @param integer $response_timeout set the response timeout
 	 * @param array $curl_options user-specified cURL options
 	 * @param boolean $use_curl try to use cURL
-     * @access public 
+     * @access public
      */
-    function wsdl($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){
-		parent::nusoap_base();
+	function __construct($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){
+		parent::__construct();
 		$this->debug("ctor wsdl=$wsdl timeout=$timeout response_timeout=$response_timeout");
         $this->proxyhost = $proxyhost;
         $this->proxyport = $proxyport;
@@ -126,7 +126,7 @@ class wsdl extends nusoap_base {
 								}
 							}
 						}
-		            } 
+		            }
     			}
     		}
     		// WSDL imports
@@ -152,18 +152,18 @@ class wsdl extends nusoap_base {
 						}
 					}
 				}
-            } 
+            }
 		}
         // add new data to operation data
         foreach($this->bindings as $binding => $bindingData) {
             if (isset($bindingData['operations']) && is_array($bindingData['operations'])) {
                 foreach($bindingData['operations'] as $operation => $data) {
                     $this->debug('post-parse data gathering for ' . $operation);
-                    $this->bindings[$binding]['operations'][$operation]['input'] = 
-						isset($this->bindings[$binding]['operations'][$operation]['input']) ? 
+                    $this->bindings[$binding]['operations'][$operation]['input'] =
+						isset($this->bindings[$binding]['operations'][$operation]['input']) ?
 						array_merge($this->bindings[$binding]['operations'][$operation]['input'], $this->portTypes[ $bindingData['portType'] ][$operation]['input']) :
 						$this->portTypes[ $bindingData['portType'] ][$operation]['input'];
-                    $this->bindings[$binding]['operations'][$operation]['output'] = 
+                    $this->bindings[$binding]['operations'][$operation]['output'] =
 						isset($this->bindings[$binding]['operations'][$operation]['output']) ?
 						array_merge($this->bindings[$binding]['operations'][$operation]['output'], $this->portTypes[ $bindingData['portType'] ][$operation]['output']) :
 						$this->portTypes[ $bindingData['portType'] ][$operation]['output'];
@@ -180,16 +180,16 @@ class wsdl extends nusoap_base {
                     $this->bindings[$binding]['operations'][$operation]['transport'] = isset($bindingData['transport']) ? $bindingData['transport'] : '';
                     $this->bindings[$binding]['operations'][$operation]['documentation'] = isset($this->portTypes[ $bindingData['portType'] ][$operation]['documentation']) ? $this->portTypes[ $bindingData['portType'] ][$operation]['documentation'] : '';
                     $this->bindings[$binding]['operations'][$operation]['endpoint'] = isset($bindingData['endpoint']) ? $bindingData['endpoint'] : '';
-                } 
-            } 
+                }
+            }
         }
 	}
 
     /**
      * parses the wsdl document
-     * 
+     *
      * @param string $wsdl path or URL
-     * @access private 
+     * @access private
      */
     function parseWSDL($wsdl = '') {
 		$this->debug("parse WSDL at path=$wsdl");
@@ -199,7 +199,7 @@ class wsdl extends nusoap_base {
             $this->setError('no wsdl passed to parseWSDL()!!');
             return false;
         }
-        
+
         // parse $wsdl for url format
         $wsdl_props = parse_url($wsdl);
 
@@ -242,24 +242,24 @@ class wsdl extends nusoap_base {
                 $wsdl_string = '';
                 while ($data = fread($fp, 32768)) {
                     $wsdl_string .= $data;
-                } 
+                }
                 fclose($fp);
             } else {
             	$errstr = "Bad path to WSDL file $path";
             	$this->debug($errstr);
                 $this->setError($errstr);
                 return false;
-            } 
+            }
         }
         $this->debug('Parse WSDL');
         // end new code added
         // Create an XML parser.
-        $this->parser = xml_parser_create(); 
+        $this->parser = xml_parser_create();
         // Set the options for parsing the XML data.
         // xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
-        xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0); 
+        xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);
         // Set the object for the parser.
-        xml_set_object($this->parser, $this); 
+        xml_set_object($this->parser, $this);
         // Set the element handlers for the parser.
         xml_set_element_handler($this->parser, 'start_element', 'end_element');
         xml_set_character_data_handler($this->parser, 'character_data');
@@ -276,7 +276,7 @@ class wsdl extends nusoap_base {
 			$this->debug("XML payload:\n" . $wsdl_string);
             $this->setError($errstr);
             return false;
-        } 
+        }
 		// free the parser
         xml_parser_free($this->parser);
         $this->debug('Parsing WSDL done');
@@ -285,15 +285,15 @@ class wsdl extends nusoap_base {
 			return false;
 		}
         return true;
-    } 
+    }
 
     /**
      * start-element handler
-     * 
+     *
      * @param string $parser XML parser object
      * @param string $name element name
      * @param string $attrs associative array of attributes
-     * @access private 
+     * @access private
      */
     function start_element($parser, $name, $attrs)
     {
@@ -312,10 +312,10 @@ class wsdl extends nusoap_base {
         } else {
             // position in the total number of elements, starting from 0
             $pos = $this->position++;
-            $depth = $this->depth++; 
+            $depth = $this->depth++;
             // set self as current value for this depth
             $this->depth_array[$depth] = $pos;
-            $this->message[$pos] = array('cdata' => ''); 
+            $this->message[$pos] = array('cdata' => '');
             // process attributes
             if (count($attrs) > 0) {
 				// register namespace declarations
@@ -325,11 +325,11 @@ class wsdl extends nusoap_base {
                             $this->namespaces[$ns_prefix] = $v;
                         } else {
                             $this->namespaces['ns' . (count($this->namespaces) + 1)] = $v;
-                        } 
+                        }
                         if ($v == 'http://www.w3.org/2001/XMLSchema' || $v == 'http://www.w3.org/1999/XMLSchema' || $v == 'http://www.w3.org/2000/10/XMLSchema') {
                             $this->XMLSchemaVersion = $v;
                             $this->namespaces['xsi'] = $v . '-instance';
-                        } 
+                        }
                     }
                 }
                 // expand each attribute prefix to its namespace
@@ -337,22 +337,22 @@ class wsdl extends nusoap_base {
                     $k = strpos($k, ':') ? $this->expandQname($k) : $k;
                     if ($k != 'location' && $k != 'soapAction' && $k != 'namespace') {
                         $v = strpos($v, ':') ? $this->expandQname($v) : $v;
-                    } 
+                    }
                     $eAttrs[$k] = $v;
-                } 
+                }
                 $attrs = $eAttrs;
             } else {
                 $attrs = array();
-            } 
+            }
             // get element prefix, namespace and name
             if (preg_match('/:/', $name)) {
                 // get ns prefix
-                $prefix = substr($name, 0, strpos($name, ':')); 
+                $prefix = substr($name, 0, strpos($name, ':'));
                 // get ns
-                $namespace = isset($this->namespaces[$prefix]) ? $this->namespaces[$prefix] : ''; 
+                $namespace = isset($this->namespaces[$prefix]) ? $this->namespaces[$prefix] : '';
                 // get unqualified name
                 $name = substr(strstr($name, ':'), 1);
-            } 
+            }
 			// process attributes, expanding any prefixes to namespaces
             // find status, register data
             switch ($this->status) {
@@ -361,12 +361,12 @@ class wsdl extends nusoap_base {
 			            if (isset($attrs['type'])) {
 		                    $this->debug("msg " . $this->currentMessage . ": found part (with type) $attrs[name]: " . implode(',', $attrs));
 		                    $this->messages[$this->currentMessage][$attrs['name']] = $attrs['type'];
-            			} 
+            			}
 			            if (isset($attrs['element'])) {
 		                    $this->debug("msg " . $this->currentMessage . ": found part (with element) $attrs[name]: " . implode(',', $attrs));
 			                $this->messages[$this->currentMessage][$attrs['name']] = $attrs['element'] . '^';
-			            } 
-        			} 
+			            }
+        			}
         			break;
 			    case 'portType':
 			        switch ($name) {
@@ -375,25 +375,25 @@ class wsdl extends nusoap_base {
 			                $this->debug("portType $this->currentPortType operation: $this->currentPortOperation");
 			                if (isset($attrs['parameterOrder'])) {
 			                	$this->portTypes[$this->currentPortType][$attrs['name']]['parameterOrder'] = $attrs['parameterOrder'];
-			        		} 
+			        		}
 			        		break;
 					    case 'documentation':
 					        $this->documentation = true;
-					        break; 
+					        break;
 					    // merge input/output data
 					    default:
 					        $m = isset($attrs['message']) ? $this->getLocalPart($attrs['message']) : '';
 					        $this->portTypes[$this->currentPortType][$this->currentPortOperation][$name]['message'] = $m;
 					        break;
-					} 
+					}
 			    	break;
 				case 'binding':
 				    switch ($name) {
-				        case 'binding': 
+				        case 'binding':
 				            // get ns prefix
 				            if (isset($attrs['style'])) {
 				            $this->bindings[$this->currentBinding]['prefix'] = $prefix;
-					    	} 
+					    	}
 					    	$this->bindings[$this->currentBinding] = array_merge($this->bindings[$this->currentBinding], $attrs);
 					    	break;
 						case 'header':
@@ -402,17 +402,17 @@ class wsdl extends nusoap_base {
 						case 'operation':
 						    if (isset($attrs['soapAction'])) {
 						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['soapAction'] = $attrs['soapAction'];
-						    } 
+						    }
 						    if (isset($attrs['style'])) {
 						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['style'] = $attrs['style'];
-						    } 
+						    }
 						    if (isset($attrs['name'])) {
 						        $this->currentOperation = $attrs['name'];
 						        $this->debug("current binding operation: $this->currentOperation");
 						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['name'] = $attrs['name'];
 						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['binding'] = $this->currentBinding;
 						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['endpoint'] = isset($this->bindings[$this->currentBinding]['endpoint']) ? $this->bindings[$this->currentBinding]['endpoint'] : '';
-						    } 
+						    }
 						    break;
 						case 'input':
 						    $this->opStatus = 'input';
@@ -425,9 +425,9 @@ class wsdl extends nusoap_base {
 						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus] = array_merge($this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus], $attrs);
 						    } else {
 						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus] = $attrs;
-						    } 
+						    }
 						    break;
-					} 
+					}
 					break;
 				case 'service':
 					switch ($name) {
@@ -435,7 +435,7 @@ class wsdl extends nusoap_base {
 					        $this->currentPort = $attrs['name'];
 					        $this->debug('current port: ' . $this->currentPort);
 					        $this->ports[$this->currentPort]['binding'] = $this->getLocalPart($attrs['binding']);
-					
+
 					        break;
 					    case 'address':
 					        $this->ports[$this->currentPort]['location'] = $attrs['location'];
@@ -443,9 +443,9 @@ class wsdl extends nusoap_base {
 					        $this->bindings[ $this->ports[$this->currentPort]['binding'] ]['bindingType'] = $namespace;
 					        $this->bindings[ $this->ports[$this->currentPort]['binding'] ]['endpoint'] = $attrs['location'];
 					        break;
-					} 
+					}
 					break;
-			} 
+			}
 		// set status
 		switch ($name) {
 			case 'import':
@@ -481,11 +481,11 @@ class wsdl extends nusoap_base {
 			    		$this->currentBinding = $this->getLocalPart($attrs['name']);
 					} else {
 			    		$this->currentBinding = $attrs['name'];
-					} 
+					}
 					$this->status = 'binding';
 					$this->bindings[$this->currentBinding]['portType'] = $this->getLocalPart($attrs['type']);
 					$this->debug("current binding: $this->currentBinding of portType: " . $attrs['type']);
-				} 
+				}
 				break;
 			case 'service':
 				$this->serviceName = $attrs['name'];
@@ -495,20 +495,20 @@ class wsdl extends nusoap_base {
 			case 'definitions':
 				foreach ($attrs as $name => $value) {
 					$this->wsdl_info[$name] = $value;
-				} 
+				}
 				break;
-			} 
-		} 
-	} 
+			}
+		}
+	}
 
 	/**
 	* end-element handler
-	* 
+	*
 	* @param string $parser XML parser object
 	* @param string $name element name
-	* @access private 
+	* @access private
 	*/
-	function end_element($parser, $name){ 
+	function end_element($parser, $name){
 		// unset schema status
 		if (/*preg_match('/types$/', $name) ||*/ preg_match('/schema$/', $name)) {
 			$this->status = "";
@@ -516,38 +516,38 @@ class wsdl extends nusoap_base {
             $this->currentSchema->clearDebug();
 			$this->schemas[$this->currentSchema->schemaTargetNamespace][] = $this->currentSchema;
         	$this->debug('Parsing WSDL schema done');
-		} 
+		}
 		if ($this->status == 'schema') {
 			$this->currentSchema->schemaEndElement($parser, $name);
 		} else {
 			// bring depth down a notch
 			$this->depth--;
-		} 
+		}
 		// end documentation
 		if ($this->documentation) {
 			//TODO: track the node to which documentation should be assigned; it can be a part, message, etc.
 			//$this->portTypes[$this->currentPortType][$this->currentPortOperation]['documentation'] = $this->documentation;
 			$this->documentation = false;
-		} 
-	} 
+		}
+	}
 
 	/**
 	 * element content handler
-	 * 
+	 *
 	 * @param string $parser XML parser object
 	 * @param string $data element content
-	 * @access private 
+	 * @access private
 	 */
 	function character_data($parser, $data)
 	{
 		$pos = isset($this->depth_array[$this->depth]) ? $this->depth_array[$this->depth] : 0;
 		if (isset($this->message[$pos]['cdata'])) {
 			$this->message[$pos]['cdata'] .= $data;
-		} 
+		}
 		if ($this->documentation) {
 			$this->documentation .= $data;
-		} 
-	} 
+		}
+	}
 
 	/**
 	* if authenticating, set user credentials here
@@ -566,21 +566,21 @@ class wsdl extends nusoap_base {
 		$this->authtype = $authtype;
 		$this->certRequest = $certRequest;
 	}
-	
+
 	function getBindingData($binding)
 	{
 		if (is_array($this->bindings[$binding])) {
 			return $this->bindings[$binding];
-		} 
+		}
 	}
-	
+
 	/**
 	 * returns an assoc array of operation names => operation data
-	 * 
+	 *
 	 * @param string $portName WSDL port name
 	 * @param string $bindingType eg: soap, smtp, dime (only soap and soap12 are currently supported)
-	 * @return array 
-	 * @access public 
+	 * @return array
+	 * @access public
 	 */
 	function getOperations($portName = '', $bindingType = 'soap') {
 		$ops = array();
@@ -612,15 +612,15 @@ class wsdl extends nusoap_base {
 			$this->debug("getOperations found no operations for port '$portName' bindingType $bindingType");
 		}
 		return $ops;
-	} 
-	
+	}
+
 	/**
 	 * returns an associative array of data necessary for calling an operation
-	 * 
+	 *
 	 * @param string $operation name of operation
 	 * @param string $bindingType type of binding eg: soap, soap12
-	 * @return array 
-	 * @access public 
+	 * @return array
+	 * @access public
 	 */
 	function getOperationData($operation, $bindingType = 'soap')
 	{
@@ -640,19 +640,19 @@ class wsdl extends nusoap_base {
 					if ($operation == $bOperation) {
 						$opData = $this->bindings[ $portData['binding'] ]['operations'][$operation];
 					    return $opData;
-					} 
-				} 
+					}
+				}
 			}
-		} 
+		}
 	}
-	
+
 	/**
 	 * returns an associative array of data necessary for calling an operation
-	 * 
+	 *
 	 * @param string $soapAction soapAction for operation
 	 * @param string $bindingType type of binding eg: soap, soap12
-	 * @return array 
-	 * @access public 
+	 * @return array
+	 * @access public
 	 */
 	function getOperationDataForSoapAction($soapAction, $bindingType = 'soap') {
 		if ($bindingType == 'soap') {
@@ -668,12 +668,12 @@ class wsdl extends nusoap_base {
 				foreach ($this->bindings[ $portData['binding'] ]['operations'] as $bOperation => $opData) {
 					if ($opData['soapAction'] == $soapAction) {
 					    return $opData;
-					} 
-				} 
+					}
+				}
 			}
-		} 
+		}
 	}
-	
+
 	/**
     * returns an array of information about a given type
     * returns false if no type exists by the given name
@@ -884,7 +884,7 @@ class wsdl extends nusoap_base {
 	*
 	* @param mixed $debug whether to put debug=1 in endpoint URL
 	* @return string serialization of WSDL
-	* @access public 
+	* @access public
 	*/
 	function serialize($debug = 0)
 	{
@@ -892,15 +892,15 @@ class wsdl extends nusoap_base {
 		$xml .= "\n<definitions";
 		foreach($this->namespaces as $k => $v) {
 			$xml .= " xmlns:$k=\"$v\"";
-		} 
+		}
 		// 10.9.02 - add poulter fix for wsdl and tns declarations
 		if (isset($this->namespaces['wsdl'])) {
 			$xml .= " xmlns=\"" . $this->namespaces['wsdl'] . "\"";
-		} 
+		}
 		if (isset($this->namespaces['tns'])) {
 			$xml .= " targetNamespace=\"" . $this->namespaces['tns'] . "\"";
-		} 
-		$xml .= '>'; 
+		}
+		$xml .= '>';
 		// imports
 		if (sizeof($this->import) > 0) {
 			foreach($this->import as $ns => $list) {
@@ -911,8 +911,8 @@ class wsdl extends nusoap_base {
 						$xml .= '<import namespace="' . $ns . '" />';
 					}
 				}
-			} 
-		} 
+			}
+		}
 		// types
 		if (count($this->schemas)>=1) {
 			$xml .= "\n<types>\n";
@@ -922,7 +922,7 @@ class wsdl extends nusoap_base {
 				}
 			}
 			$xml .= '</types>';
-		} 
+		}
 		// messages
 		if (count($this->messages) >= 1) {
 			foreach($this->messages as $msgName => $msgParts) {
@@ -939,11 +939,11 @@ class wsdl extends nusoap_base {
 						    foreach($this->typemap as $ns => $types) {
 						        if (isset($types[$partType])) {
 						            $typePrefix = $this->getPrefixFromNamespace($ns);
-						        } 
-						    } 
+						        }
+						    }
 						    if (!isset($typePrefix)) {
 						        die("$partType has no namespace!");
-						    } 
+						    }
 						}
 						$ns = $this->getNamespaceFromPrefix($typePrefix);
 						$localPart = $this->getLocalPart($partType);
@@ -960,8 +960,8 @@ class wsdl extends nusoap_base {
 					}
 				}
 				$xml .= '</message>';
-			} 
-		} 
+			}
+		}
 		// bindings & porttypes
 		if (count($this->bindings) >= 1) {
 			$binding_xml = '';
@@ -989,7 +989,7 @@ class wsdl extends nusoap_base {
 					$portType_xml .= "\n" . '  <operation name="' . $opParts['name'] . '"';
 					if (isset($opParts['parameterOrder'])) {
 					    $portType_xml .= ' parameterOrder="' . $opParts['parameterOrder'] . '"';
-					} 
+					}
 					$portType_xml .= '>';
 					if(isset($opParts['documentation']) && $opParts['documentation'] != '') {
 						$portType_xml .= "\n" . '    <documentation>' . htmlspecialchars($opParts['documentation']) . '</documentation>';
@@ -997,12 +997,12 @@ class wsdl extends nusoap_base {
 					$portType_xml .= "\n" . '    <input message="tns:' . $opParts['input']['message'] . '"/>';
 					$portType_xml .= "\n" . '    <output message="tns:' . $opParts['output']['message'] . '"/>';
 					$portType_xml .= "\n" . '  </operation>';
-				} 
+				}
 				$portType_xml .= "\n" . '</portType>';
 				$binding_xml .= "\n" . '</binding>';
-			} 
+			}
 			$xml .= $portType_xml . $binding_xml;
-		} 
+		}
 		// services
 		$xml .= "\n<service name=\"" . $this->serviceName . '">';
 		if (count($this->ports) >= 1) {
@@ -1010,11 +1010,11 @@ class wsdl extends nusoap_base {
 				$xml .= "\n" . '  <port name="' . $pName . '" binding="tns:' . $attrs['binding'] . '">';
 				$xml .= "\n" . '    <soap:address location="' . $attrs['location'] . ($debug ? '?debug=1' : '') . '"/>';
 				$xml .= "\n" . '  </port>';
-			} 
-		} 
+			}
+		}
 		$xml .= "\n" . '</service>';
 		return $xml . "\n</definitions>";
-	} 
+	}
 
 	/**
 	 * determine whether a set of parameters are unwrapped
@@ -1059,7 +1059,7 @@ class wsdl extends nusoap_base {
 		$phpType = $typeDef['phpType'];
 		$arrayType = (isset($typeDef['arrayType']) ? $typeDef['arrayType'] : '');
 		$this->debug("in parametersMatchWrapped: uqType: $uqType, ns: $ns, phptype: $phpType, arrayType: $arrayType");
-		
+
 		// we expect a complexType or element of complexType
 		if ($phpType != 'struct') {
 			$this->debug("in parametersMatchWrapped: not a struct");
@@ -1100,7 +1100,7 @@ class wsdl extends nusoap_base {
 	 * TODO
 	 * - multi-ref serialization
 	 * - validate PHP values against type definitions, return errors if invalid
-	 * 
+	 *
 	 * @param string $operation operation name
 	 * @param string $direction (input|output)
 	 * @param mixed $parameters parameter value(s)
@@ -1111,12 +1111,12 @@ class wsdl extends nusoap_base {
 	function serializeRPCParameters($operation, $direction, $parameters, $bindingType = 'soap') {
 		$this->debug("in serializeRPCParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion, bindingType=$bindingType");
 		$this->appendDebug('parameters=' . $this->varDump($parameters));
-		
+
 		if ($direction != 'input' && $direction != 'output') {
 			$this->debug('The value of the \$direction argument needs to be either "input" or "output"');
 			$this->setError('The value of the \$direction argument needs to be either "input" or "output"');
 			return false;
-		} 
+		}
 		if (!$opData = $this->getOperationData($operation, $bindingType)) {
 			$this->debug('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType);
 			$this->setError('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType);
@@ -1167,7 +1167,7 @@ class wsdl extends nusoap_base {
 					$this->debug("serializing part $name of type $type");
 					// Track encoding style
 					if (isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {
-						$encodingStyle = $opData[$direction]['encodingStyle'];			
+						$encodingStyle = $opData[$direction]['encodingStyle'];
 						$enc_style = $encodingStyle;
 					} else {
 						$enc_style = false;
@@ -1193,15 +1193,15 @@ class wsdl extends nusoap_base {
 		}
 		$this->debug("serializeRPCParameters returning: $xml");
 		return $xml;
-	} 
-	
+	}
+
 	/**
 	 * serialize a PHP value according to a WSDL message definition
-	 * 
+	 *
 	 * TODO
 	 * - multi-ref serialization
 	 * - validate PHP values against type definitions, return errors if invalid
-	 * 
+	 *
 	 * @param string $operation operation name
 	 * @param string $direction (input|output)
 	 * @param mixed $parameters parameter value(s)
@@ -1211,14 +1211,14 @@ class wsdl extends nusoap_base {
 	 */
 	function serializeParameters($operation, $direction, $parameters)
 	{
-		$this->debug("in serializeParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion"); 
+		$this->debug("in serializeParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion");
 		$this->appendDebug('parameters=' . $this->varDump($parameters));
-		
+
 		if ($direction != 'input' && $direction != 'output') {
 			$this->debug('The value of the \$direction argument needs to be either "input" or "output"');
 			$this->setError('The value of the \$direction argument needs to be either "input" or "output"');
 			return false;
-		} 
+		}
 		if (!$opData = $this->getOperationData($operation)) {
 			$this->debug('Unable to retrieve WSDL data for operation: ' . $operation);
 			$this->setError('Unable to retrieve WSDL data for operation: ' . $operation);
@@ -1226,18 +1226,18 @@ class wsdl extends nusoap_base {
 		}
 		$this->debug('opData:');
 		$this->appendDebug($this->varDump($opData));
-		
+
 		// Get encoding style for output and set to current
 		$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
 		if(($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {
 			$encodingStyle = $opData['output']['encodingStyle'];
 			$enc_style = $encodingStyle;
 		}
-		
+
 		// set input params
 		$xml = '';
 		if (isset($opData[$direction]['parts']) && sizeof($opData[$direction]['parts']) > 0) {
-			
+
 			$use = $opData[$direction]['use'];
 			$this->debug("use=$use");
 			$this->debug('got ' . count($opData[$direction]['parts']) . ' part(s)');
@@ -1248,7 +1248,7 @@ class wsdl extends nusoap_base {
 					$this->debug('serializing part "'.$name.'" of type "'.$type.'"');
 					// Track encoding style
 					if(isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {
-						$encodingStyle = $opData[$direction]['encodingStyle'];			
+						$encodingStyle = $opData[$direction]['encodingStyle'];
 						$enc_style = $encodingStyle;
 					} else {
 						$enc_style = false;
@@ -1274,11 +1274,11 @@ class wsdl extends nusoap_base {
 		}
 		$this->debug("serializeParameters returning: $xml");
 		return $xml;
-	} 
-	
+	}
+
 	/**
 	 * serializes a PHP value according a given type definition
-	 * 
+	 *
 	 * @param string $name name of value (part or element)
 	 * @param string $type XML schema type of value (type or element)
 	 * @param mixed $value a native PHP value (parameter value)
@@ -1364,7 +1364,7 @@ class wsdl extends nusoap_base {
 					} else {
 						$value = 'true';
 					}
-				} 
+				}
 				if ($uqType == 'string' && gettype($value) == 'string') {
 					$value = $this->expandEntities($value);
 				}
@@ -1445,7 +1445,7 @@ class wsdl extends nusoap_base {
 			return false;
 		}
 		$phpType = $typeDef['phpType'];
-		$this->debug("in serializeType: uqType: $uqType, ns: $ns, phptype: $phpType, arrayType: " . (isset($typeDef['arrayType']) ? $typeDef['arrayType'] : '') ); 
+		$this->debug("in serializeType: uqType: $uqType, ns: $ns, phptype: $phpType, arrayType: " . (isset($typeDef['arrayType']) ? $typeDef['arrayType'] : '') );
 		// if php type == struct, map value to the <all> element names
 		if ($phpType == 'struct') {
 			if (isset($typeDef['typeClass']) && $typeDef['typeClass'] == 'element') {
@@ -1537,11 +1537,11 @@ class wsdl extends nusoap_base {
 				foreach($value as $v) {
 					$cols = ',' . sizeof($v);
 					$nv = array_merge($nv, $v);
-				} 
+				}
 				$value = $nv;
 			} else {
 				$cols = '';
-			} 
+			}
 			if (is_array($value) && sizeof($value) >= 1) {
 				$rows = sizeof($value);
 				$contents = '';
@@ -1552,7 +1552,7 @@ class wsdl extends nusoap_base {
 					    $contents .= $this->serializeType('item', $typeDef['arrayType'], $v, $use);
 					} else {
 					    $contents .= $this->serialize_val($v, 'item', $typeDef['arrayType'], null, $this->XMLSchemaVersion, false, $use);
-					} 
+					}
 				}
 			} else {
 				$rows = 0;
@@ -1596,7 +1596,7 @@ class wsdl extends nusoap_base {
 		$this->debug("in serializeType: returning: $xml");
 		return $xml;
 	}
-	
+
 	/**
 	 * serializes the attributes for a complexType
 	 *
@@ -1651,7 +1651,7 @@ class wsdl extends nusoap_base {
 				if ($xname) {
 					$xml .=  " $aName=\"" . $this->expandEntities($xvalue[$xname]) . "\"";
 				}
-			} 
+			}
 		} else {
 			$this->debug("no attributes to serialize for XML Schema type $ns:$uqType");
 		}
@@ -1709,7 +1709,7 @@ class wsdl extends nusoap_base {
 				}
 				// if user took advantage of a minOccurs=0, then only serialize named parameters
 				if (isset($optionals)
-				    && (!isset($xvalue[$eName])) 
+				    && (!isset($xvalue[$eName]))
 					&& ( (!isset($attrs['nillable'])) || $attrs['nillable'] != 'true')
 					){
 					if (isset($attrs['minOccurs']) && $attrs['minOccurs'] <> '0') {
@@ -1757,7 +1757,7 @@ class wsdl extends nusoap_base {
 						}
 					}
 				}
-			} 
+			}
 		} else {
 			$this->debug("no elements to serialize for XML Schema type $ns:$uqType");
 		}
@@ -1793,7 +1793,7 @@ class wsdl extends nusoap_base {
 	    	}
 	    	$elements = $eElements;
 		}
-		
+
 		if (count($attrs) > 0) {
 	    	foreach($attrs as $n => $a){
 	            // expand each attribute
@@ -1846,7 +1846,7 @@ class wsdl extends nusoap_base {
 
 	/**
 	* register an operation with the server
-	* 
+	*
 	* @param string $name operation (method) name
 	* @param array $in assoc array of input values: key = param name, value = param type
 	* @param array $out assoc array of output values: key = param name, value = param type
@@ -1856,7 +1856,7 @@ class wsdl extends nusoap_base {
 	* @param string $use (encoded|literal) optional The use for the parameters (cannot mix right now)
 	* @param string $documentation optional The description to include in the WSDL
 	* @param string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)
-	* @access public 
+	* @access public
 	*/
 	function addOperation($name, $in = false, $out = false, $namespace = false, $soapaction = false, $style = 'rpc', $use = 'encoded', $documentation = '', $encodingStyle = ''){
 		if ($use == 'encoded' && $encodingStyle == '') {
@@ -1903,7 +1903,7 @@ class wsdl extends nusoap_base {
 			'parts' => $out),
 		'namespace' => $namespace,
 		'transport' => 'http://schemas.xmlsoap.org/soap/http',
-		'documentation' => $documentation); 
+		'documentation' => $documentation);
 		// add portTypes
 		// add messages
 		if($in)
@@ -1931,7 +1931,7 @@ class wsdl extends nusoap_base {
             $this->messages[$name.'Response']= '0';
         }
 		return true;
-	} 
+	}
 }
 
 ?>
\ No newline at end of file
diff --git a/htdocs/includes/nusoap/lib/class.wsdlcache.php b/htdocs/includes/nusoap/lib/class.wsdlcache.php
index 0d3e1796953..8468850eb90 100644
--- a/htdocs/includes/nusoap/lib/class.wsdlcache.php
+++ b/htdocs/includes/nusoap/lib/class.wsdlcache.php
@@ -9,10 +9,10 @@ nusoap-general@lists.sourceforge.net
 
 /**
 * caches instances of the wsdl class
-* 
+*
 * @author   Scott Nichol <snichol@users.sourceforge.net>
 * @author	Ingo Fischer <ingo@apollon.de>
-* @access public 
+* @access public
 */
 class nusoap_wsdlcache {
 	/**
@@ -43,7 +43,7 @@ class nusoap_wsdlcache {
 	* @param integer $cache_lifetime lifetime for caching-files in seconds or 0 for unlimited
 	* @access public
 	*/
-	function nusoap_wsdlcache($cache_dir='.', $cache_lifetime=0) {
+	function __construct($cache_dir='.', $cache_lifetime=0) {
 		$this->fplock = array();
 		$this->cache_dir = $cache_dir != '' ? $cache_dir : '.';
 		$this->cache_lifetime = $cache_lifetime;
diff --git a/htdocs/includes/nusoap/lib/class.xmlschema.php b/htdocs/includes/nusoap/lib/class.xmlschema.php
index 87858fadb43..3934453f8d2 100644
--- a/htdocs/includes/nusoap/lib/class.xmlschema.php
+++ b/htdocs/includes/nusoap/lib/class.xmlschema.php
@@ -12,7 +12,7 @@
 * @access   public
 */
 class nusoap_xmlschema extends nusoap_base  {
-	
+
 	// files
 	var $schema = '';
 	var $xml = '';
@@ -41,7 +41,7 @@ class nusoap_xmlschema extends nusoap_base  {
 	var $depth_array = array();
 	var $message = array();
 	var $defaultNamespace = array();
-    
+
 	/**
 	* constructor
 	*
@@ -50,8 +50,8 @@ class nusoap_xmlschema extends nusoap_base  {
 	* @param	string $namespaces namespaces defined in enclosing XML
 	* @access   public
 	*/
-	function nusoap_xmlschema($schema='',$xml='',$namespaces=array()){
-		parent::nusoap_base();
+	function __construct($schema='',$xml='',$namespaces=array()){
+		parent::__construct();
 		$this->debug('nusoap_xmlschema class instantiated, inside constructor');
 		// files
 		$this->schema = $schema;
@@ -141,7 +141,7 @@ class nusoap_xmlschema extends nusoap_base  {
 				$this->debug("XML payload:\n" . $xml);
 				$this->setError($errstr);
 	    	}
-            
+
 			xml_parser_free($this->parser);
 		} else{
 			$this->debug('no xml passed to parseString()!!');
@@ -163,7 +163,7 @@ class nusoap_xmlschema extends nusoap_base  {
 		}
 		return $scope . $ename . '_ContainedType';
 	}
-	
+
 	/**
 	* start-element handler
 	*
@@ -173,13 +173,13 @@ class nusoap_xmlschema extends nusoap_base  {
 	* @access   private
 	*/
 	function schemaStartElement($parser, $name, $attrs) {
-		
+
 		// position in the total number of elements, starting from 0
 		$pos = $this->position++;
 		$depth = $this->depth++;
 		// set self as current value for this depth
 		$this->depth_array[$depth] = $pos;
-		$this->message[$pos] = array('cdata' => ''); 
+		$this->message[$pos] = array('cdata' => '');
 		if ($depth > 0) {
 			$this->defaultNamespace[$pos] = $this->defaultNamespace[$this->depth_array[$depth - 1]];
 		} else {
@@ -193,7 +193,7 @@ class nusoap_xmlschema extends nusoap_base  {
 		} else {
         	$prefix = '';
         }
-		
+
         // loop thru attributes, expanding, and registering namespace declarations
         if(count($attrs) > 0){
         	foreach($attrs as $k => $v){
@@ -269,7 +269,7 @@ class nusoap_xmlschema extends nusoap_base  {
 					$aname = $attrs['ref'];
                     $this->attributes[$attrs['ref']] = $attrs;
 				}
-                
+
 				if($this->currentComplexType){	// This should *always* be
 					$this->complexTypes[$this->currentComplexType]['attrs'][$aname] = $attrs;
 				}
@@ -562,8 +562,8 @@ class nusoap_xmlschema extends nusoap_base  {
 						$xml .= " <$schemaPrefix:import namespace=\"" . $ns . "\" />\n";
 					}
 				}
-			} 
-		} 
+			}
+		}
 		// complex types
 		foreach($this->complexTypes as $typeName => $attrs){
 			$contentStr = '';
@@ -860,12 +860,12 @@ class nusoap_xmlschema extends nusoap_base  {
 		}
 		return $buffer;
 	}
-	
+
 	/**
 	* adds a complex type to the schema
-	* 
+	*
 	* example: array
-	* 
+	*
 	* addType(
 	* 	'ArrayOfstring',
 	* 	'complexType',
@@ -875,9 +875,9 @@ class nusoap_xmlschema extends nusoap_base  {
 	* 	array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'string[]'),
 	* 	'xsd:string'
 	* );
-	* 
+	*
 	* example: PHP associative array ( SOAP Struct )
-	* 
+	*
 	* addType(
 	* 	'SOAPStruct',
 	* 	'complexType',
@@ -885,7 +885,7 @@ class nusoap_xmlschema extends nusoap_base  {
 	* 	'all',
 	* 	array('myVar'=> array('name'=>'myVar','type'=>'string')
 	* );
-	* 
+	*
 	* @param name
 	* @param typeClass (complexType|simpleType|attribute)
 	* @param phpType: currently supported are array and struct (php assoc array)
@@ -913,11 +913,11 @@ class nusoap_xmlschema extends nusoap_base  {
 	    'attrs'		=> $attrs,
 	    'arrayType'	=> $arrayType
 		);
-		
+
 		$this->xdebug("addComplexType $name:");
 		$this->appendDebug($this->varDump($this->complexTypes[$name]));
 	}
-	
+
 	/**
 	* adds a simple type to the schema
 	*
@@ -938,7 +938,7 @@ class nusoap_xmlschema extends nusoap_base  {
 	    'type'			=> $restrictionBase,
 	    'enumeration'	=> $enumeration
 		);
-		
+
 		$this->xdebug("addSimpleType $name:");
 		$this->appendDebug($this->varDump($this->simpleTypes[$name]));
 	}
@@ -956,7 +956,7 @@ class nusoap_xmlschema extends nusoap_base  {
 		}
 		$this->elements[ $attrs['name'] ] = $attrs;
 		$this->elements[ $attrs['name'] ]['typeClass'] = 'element';
-		
+
 		$this->xdebug("addElement " . $attrs['name']);
 		$this->appendDebug($this->varDump($this->elements[ $attrs['name'] ]));
 	}
diff --git a/htdocs/includes/nusoap/lib/nusoap.php b/htdocs/includes/nusoap/lib/nusoap.php
index 1846884a7d1..a1fbd00051d 100644
--- a/htdocs/includes/nusoap/lib/nusoap.php
+++ b/htdocs/includes/nusoap/lib/nusoap.php
@@ -219,7 +219,7 @@ class nusoap_base {
 	*
 	* @access	public
 	*/
-	function nusoap_base() {
+	function __construct() {
 		$this->debugLevel = $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];
 	}
 
@@ -1037,8 +1037,8 @@ class nusoap_fault extends nusoap_base {
     * @param string $faultstring human readable error message
     * @param mixed $faultdetail detail, typically a string or array of string
 	*/
-	function nusoap_fault($faultcode,$faultactor='',$faultstring='',$faultdetail=''){
-		parent::nusoap_base();
+	function __construct($faultcode,$faultactor='',$faultstring='',$faultdetail=''){
+		parent::__construct();
 		$this->faultcode = $faultcode;
 		$this->faultactor = $faultactor;
 		$this->faultstring = $faultstring;
@@ -1129,8 +1129,8 @@ class nusoap_xmlschema extends nusoap_base  {
 	* @param	string $namespaces namespaces defined in enclosing XML
 	* @access   public
 	*/
-	function nusoap_xmlschema($schema='',$xml='',$namespaces=array()){
-		parent::nusoap_base();
+	function __construct($schema='',$xml='',$namespaces=array()){
+		parent::__construct();
 		$this->debug('nusoap_xmlschema class instantiated, inside constructor');
 		// files
 		$this->schema = $schema;
@@ -2116,8 +2116,8 @@ class soapval extends nusoap_base {
 	* @param	mixed $attributes associative array of attributes to add to element serialization
 	* @access   public
 	*/
-  	function soapval($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) {
-		parent::nusoap_base();
+	function __construct($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) {
+		parent::__construct();
 		$this->name = $name;
 		$this->type = $type;
 		$this->value = $value;
@@ -2207,8 +2207,8 @@ class soap_transport_http extends nusoap_base {
 	* @param boolean $use_curl Whether to try to force cURL use
 	* @access public
 	*/
-	function soap_transport_http($url, $curl_options = NULL, $use_curl = false){
-		parent::nusoap_base();
+	function __construct($url, $curl_options = NULL, $use_curl = false){
+		parent::__construct();
 		$this->debug("ctor url=$url use_curl=$use_curl curl_options:");
 		$this->appendDebug($this->varDump($curl_options));
 		$this->setURL($url);
@@ -3623,8 +3623,8 @@ class nusoap_server extends nusoap_base {
     * @param mixed $wsdl file path or URL (string), or wsdl instance (object)
 	* @access   public
 	*/
-	function nusoap_server($wsdl=false){
-		parent::nusoap_base();
+	function __construct($wsdl=false) {
+		parent::__construct();
 		// turn on debugging?
 		global $debug;
 		global $HTTP_SERVER_VARS;
@@ -4645,8 +4645,8 @@ class wsdl extends nusoap_base {
 	 * @param boolean $use_curl try to use cURL
      * @access public
      */
-    function wsdl($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){
-		parent::nusoap_base();
+	function __construct($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){
+		parent::__construct();
 		$this->debug("ctor wsdl=$wsdl timeout=$timeout response_timeout=$response_timeout");
         $this->proxyhost = $proxyhost;
         $this->proxyport = $proxyport;
@@ -6572,8 +6572,8 @@ class nusoap_parser extends nusoap_base {
 	* @param    string $decode_utf8 whether to decode UTF-8 to ISO-8859-1
 	* @access   public
 	*/
-	function nusoap_parser($xml,$encoding='UTF-8',$method='',$decode_utf8=true){
-		parent::nusoap_base();
+	function __construct($xml,$encoding='UTF-8',$method='',$decode_utf8=true){
+		parent::__construct();
 		$this->xml = $xml;
 		$this->xml_encoding = $encoding;
 		$this->method = $method;
@@ -7249,8 +7249,8 @@ class nusoap_client extends nusoap_base  {
 	* @param	string $portName optional portName in WSDL document
 	* @access   public
 	*/
-	function nusoap_client($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = ''){
-		parent::nusoap_base();
+	function __construct($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = ''){
+		parent::__construct();
 		$this->endpoint = $endpoint;
 		$this->proxyhost = $proxyhost;
 		$this->proxyport = $proxyport;
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 1b6179fdc81..82be9955e0f 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1034,7 +1034,7 @@ if (!defined('NOLOGIN'))
 	$user->getrights();
 }
 
-dol_syslog("--- Access to ".$_SERVER["REQUEST_METHOD"].' '.$_SERVER["PHP_SELF"].' - action='.GETPOST('action', 'aZ09').', massaction='.GETPOST('massaction', 'aZ09').' NOTOKENRENEWAL='.(defined('NOTOKENRENEWAL') ?constant('NOTOKENRENEWAL') : ''));
+dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"])?'':$_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"].' - action='.GETPOST('action', 'aZ09').', massaction='.GETPOST('massaction', 'aZ09').' NOTOKENRENEWAL='.(defined('NOTOKENRENEWAL') ?constant('NOTOKENRENEWAL') : ''));
 //Another call for easy debugg
 //dol_syslog("Access to ".$_SERVER["PHP_SELF"].' GET='.join(',',array_keys($_GET)).'->'.join(',',$_GET).' POST:'.join(',',array_keys($_POST)).'->'.join(',',$_POST));
 
diff --git a/test/phpunit/WebservicesOrdersTest.php b/test/phpunit/WebservicesOrdersTest.php
index 803247e2598..fb649a52e44 100644
--- a/test/phpunit/WebservicesOrdersTest.php
+++ b/test/phpunit/WebservicesOrdersTest.php
@@ -183,7 +183,7 @@ class WebservicesOrdersTest extends PHPUnit\Framework\TestCase
             print "\n";
         }
 
-        print __METHOD__." result=".$result."\n";
+        print __METHOD__." count(result)=".count($result)."\n";
         $this->assertEquals('OK', $result['result']['result_code']);
 
         return $result;
diff --git a/test/phpunit/WebservicesOtherTest.php b/test/phpunit/WebservicesOtherTest.php
index 10c74bb1821..69449320537 100644
--- a/test/phpunit/WebservicesOtherTest.php
+++ b/test/phpunit/WebservicesOtherTest.php
@@ -188,7 +188,7 @@ class WebservicesOtherTest extends PHPUnit\Framework\TestCase
             print "\n";
         }
 
-        print __METHOD__." result=".$result."\n";
+        print __METHOD__." count(result)=".count($result)."\n";
         $this->assertEquals('OK', $result['result']['result_code']);
 
         // Test method that does not exists
@@ -212,7 +212,7 @@ class WebservicesOtherTest extends PHPUnit\Framework\TestCase
             print "\n";
         }
 
-        print __METHOD__." result=".$result."\n";
+        print __METHOD__." count(result)=".count($result)."\n";
         $this->assertEquals("SOAP-ENV:Client: Operation 'methodthatdoesnotexists' is not defined in the WSDL for this service", $soapclient->error_str);
 
         return $result;
diff --git a/test/phpunit/WebservicesProductsTest.php b/test/phpunit/WebservicesProductsTest.php
index 90911b289bc..132f3363608 100644
--- a/test/phpunit/WebservicesProductsTest.php
+++ b/test/phpunit/WebservicesProductsTest.php
@@ -202,7 +202,7 @@ class WebservicesProductsTest extends PHPUnit\Framework\TestCase
             print "\n";
         }
 
-        print __METHOD__." result=".$result."\n";
+        print __METHOD__." count(result)=".count($result)."\n";
         $this->assertEquals('OK', $result['result']['result_code']);
 
         return $result['id'];
@@ -265,7 +265,7 @@ class WebservicesProductsTest extends PHPUnit\Framework\TestCase
             print "\n";
         }
 
-        print __METHOD__." result=".$result."\n";
+        print __METHOD__." count(result)=".count($result)."\n";
         $this->assertEquals('OK', $result['result']['result_code']);
 
         return $id;
@@ -328,7 +328,7 @@ class WebservicesProductsTest extends PHPUnit\Framework\TestCase
             print "\n";
         }
 
-        print __METHOD__." result=".$result."\n";
+        print __METHOD__." count(result)=".count($result)."\n";
         $this->assertEquals('OK', $result['result']['result_code']);
 
         return 0;
diff --git a/test/phpunit/WebservicesUserTest.php b/test/phpunit/WebservicesUserTest.php
index f78386fc5bf..a683c99eac3 100644
--- a/test/phpunit/WebservicesUserTest.php
+++ b/test/phpunit/WebservicesUserTest.php
@@ -148,13 +148,15 @@ class WebservicesUserTest extends PHPUnit\Framework\TestCase
         $ns='http://www.dolibarr.org/ns/';
 
         // Set the WebService URL
-        print __METHOD__."Create nusoap_client for URL=".$WS_DOL_URL."\n";
+        print __METHOD__." Create nusoap_client for URL=".$WS_DOL_URL."\n";
         $soapclient = new nusoap_client($WS_DOL_URL);
         if ($soapclient) {
             $soapclient->soap_defencoding='UTF-8';
             $soapclient->decodeUTF8(false);
         }
 
+        //$soapclient->setDebugLevel(5);
+
         // Call the WebService method and store its result in $result.
         $authentication=array(
             'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
@@ -167,7 +169,7 @@ class WebservicesUserTest extends PHPUnit\Framework\TestCase
         // Test URL
         $result='';
         $parameters = array('authentication'=>$authentication,'id'=>0,'ref'=>'admin');
-        print __METHOD__."Call method ".$WS_METHOD."\n";
+        print __METHOD__." Call method ".$WS_METHOD."\n";
         try {
             $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
         } catch (SoapFault $exception) {
@@ -188,8 +190,8 @@ class WebservicesUserTest extends PHPUnit\Framework\TestCase
             print "\n";
         }
 
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals('OK', $result['result']['result_code'], 'Test on ref admin');
+        print __METHOD__." count(result)=".count($result)."\n";
+        $this->assertEquals('OK', empty($result['result']['result_code'])?'':$result['result']['result_code'], 'Test on ref admin');
 
         // Test URL
         $result='';
@@ -211,7 +213,7 @@ class WebservicesUserTest extends PHPUnit\Framework\TestCase
             print "\n";
         }
 
-        print __METHOD__." result=".$result."\n";
+        print __METHOD__." count(result)=".count($result)."\n";
         $this->assertEquals('NOT_FOUND', $result['result']['result_code'], 'Test on ref that does not exists');
 
         return $result;

From b452852b30baa77a285c24ff5bf2dd4943b5d20c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 12 Dec 2020 16:35:30 +0100
Subject: [PATCH 373/888] Fix phpcs

---
 htdocs/core/boxes/box_scheduled_jobs.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/core/boxes/box_scheduled_jobs.php b/htdocs/core/boxes/box_scheduled_jobs.php
index 17c62ab7c7d..d8efa1b9dbc 100644
--- a/htdocs/core/boxes/box_scheduled_jobs.php
+++ b/htdocs/core/boxes/box_scheduled_jobs.php
@@ -100,7 +100,6 @@ class box_scheduled_jobs extends ModeleBoxes
 					$objp = $this->db->fetch_object($result);
 
 					if (dol_eval($objp->test, 1, 1)) {
-
 						$nextrun = $this->db->jdate($objp->datenextrun);
 						if (empty($nextrun)) $nextrun = $this->db->jdate($objp->datestart);
 
@@ -140,7 +139,7 @@ class box_scheduled_jobs extends ModeleBoxes
 					);
 				}
 
-				foreach($resultarray as $line => $value) {
+				foreach ($resultarray as $line => $value) {
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="left"',
 						'text' => $resultarray[$line][0]

From 4664ac1a1c677025280d68b6596a62d2f5b1e29a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 12 Dec 2020 17:00:23 +0100
Subject: [PATCH 374/888] socialnetworks links

---
 htdocs/contact/list.php                  |  2 +-
 htdocs/core/class/commonobject.class.php |  3 +-
 htdocs/core/lib/functions.lib.php        | 41 +++++++++++++-----------
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 5b8c708b1b2..00c74544d17 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -967,7 +967,7 @@ while ($i < min($num, $limit))
 	if (!empty($conf->socialnetworks->enabled)) {
 		foreach ($socialnetworks as $key => $value) {
 			if ($value['active'] && !empty($arrayfields['p.'.$key]['checked'])) {
-				print '<td>'.dol_print_socialnetworks($arraysocialnetworks[$key], $obj->rowid, $obj->socid, $key).'</td>';
+				print '<td>'.dol_print_socialnetworks($arraysocialnetworks[$key], $obj->rowid, $obj->socid, $key, $socialnetworks).'</td>';
 				if (!$i) $totalarray['nbfield']++;
 			}
 		}
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index dec15e4db83..f34f39740bd 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -816,9 +816,10 @@ abstract class CommonObject
 			$outsocialnetwork = '';
 
 			if (is_array($this->socialnetworks) && count($this->socialnetworks) > 0) {
+				$socialnetworksdict = getArrayOfSocialNetworks();
 				foreach ($this->socialnetworks as $key => $value) {
 					if ($value) {
-						$outsocialnetwork .= dol_print_socialnetworks($value, $this->id, $object->id, $key);
+						$outsocialnetwork .= dol_print_socialnetworks($value, $this->id, $object->id, $key, $socialnetworksdict);
 					}
 					$outdone++;
 				}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8b9edcd89ba..8a48cdf0906 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2440,13 +2440,14 @@ function getArrayOfSocialNetworks()
 /**
  * Show social network link
  *
- * @param	string		$value			Skype to show (only skype, without 'Name of recipient' before)
- * @param	int 		$cid 			Id of contact if known
- * @param	int 		$socid 			Id of third party if known
- * @param	string 		$type			'skype','facebook',...
- * @return	string						HTML Link
+ * @param	string		$value				Skype to show (only skype, without 'Name of recipient' before)
+ * @param	int 		$cid 				Id of contact if known
+ * @param	int 		$socid 				Id of third party if known
+ * @param	string 		$type				'skype','facebook',...
+ * @param	array		$dictsocialnetworks socialnetworks availables
+ * @return	string							HTML Link
  */
-function dol_print_socialnetworks($value, $cid, $socid, $type)
+function dol_print_socialnetworks($value, $cid, $socid, $type, $dictsocialnetworks = array())
 {
 	global $conf, $user, $langs;
 
@@ -2454,13 +2455,11 @@ function dol_print_socialnetworks($value, $cid, $socid, $type)
 
 	if (empty($value)) return '&nbsp;';
 
-	if (!empty($type))
-	{
+	if (!empty($type)) {
 		$htmllink = '<div class="divsocialnetwork inline-block valignmiddle">';
 		$htmllink .= img_picto($langs->trans(strtoupper($type)), $type.'.png', '', false, 0, 0, '', 'paddingright', 0);
-		$htmllink .= $value;
-		if ($type == 'skype')
-		{
+		if ($type == 'skype') {
+			$htmllink .= $value;
 			$htmllink .= '&nbsp;';
 			$htmllink .= '<a href="skype:';
 			$htmllink .= $value;
@@ -2471,13 +2470,19 @@ function dol_print_socialnetworks($value, $cid, $socid, $type)
 			$htmllink .= '?chat" alt="'.$langs->trans("Chat").'&nbsp;'.$value.'" title="'.$langs->trans("Chat").'&nbsp;'.$value.'">';
 			$htmllink .= '<img class="paddingleft" src="'.DOL_URL_ROOT.'/theme/common/skype_chatbutton.png" border="0">';
 			$htmllink .= '</a>';
-		}
-		if (($cid || $socid) && !empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create && $type == 'skype')
-		{
-			$addlink = 'AC_SKYPE';
-			$link = '';
-			if (!empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) $link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$addlink.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';
-			$htmllink .= ($link ? ' '.$link : '');
+			if (($cid || $socid) && !empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) {
+				$addlink = 'AC_SKYPE';
+				$link = '';
+				if (!empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) $link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$addlink.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';
+				$htmllink .= ($link ? ' '.$link : '');
+			}
+		} else {
+			if (!empty($dictsocialnetworks[$type]['url'])) {
+				$link = str_replace('{socialid}', $value, $dictsocialnetworks[$type]['url']);
+				$htmllink .= '&nbsp;<a href="'.$link.'">'.$value.'</a>';
+			} else {
+				$htmllink .= $value;
+			}
 		}
 		$htmllink .= '</div>';
 	} else {

From d523ed9f85fc2f5a9d203619a018c6686b42fa29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 12 Dec 2020 17:01:25 +0100
Subject: [PATCH 375/888] socialnetworks links

---
 htdocs/core/boxes/box_scheduled_jobs.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/core/boxes/box_scheduled_jobs.php b/htdocs/core/boxes/box_scheduled_jobs.php
index 17c62ab7c7d..d8efa1b9dbc 100644
--- a/htdocs/core/boxes/box_scheduled_jobs.php
+++ b/htdocs/core/boxes/box_scheduled_jobs.php
@@ -100,7 +100,6 @@ class box_scheduled_jobs extends ModeleBoxes
 					$objp = $this->db->fetch_object($result);
 
 					if (dol_eval($objp->test, 1, 1)) {
-
 						$nextrun = $this->db->jdate($objp->datenextrun);
 						if (empty($nextrun)) $nextrun = $this->db->jdate($objp->datestart);
 
@@ -140,7 +139,7 @@ class box_scheduled_jobs extends ModeleBoxes
 					);
 				}
 
-				foreach($resultarray as $line => $value) {
+				foreach ($resultarray as $line => $value) {
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="left"',
 						'text' => $resultarray[$line][0]

From 46bf871127ffe2d06e558ff60b1bda3b3e90efa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 12 Dec 2020 17:23:42 +0100
Subject: [PATCH 376/888] target

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8a48cdf0906..a14ddbde754 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2479,7 +2479,7 @@ function dol_print_socialnetworks($value, $cid, $socid, $type, $dictsocialnetwor
 		} else {
 			if (!empty($dictsocialnetworks[$type]['url'])) {
 				$link = str_replace('{socialid}', $value, $dictsocialnetworks[$type]['url']);
-				$htmllink .= '&nbsp;<a href="'.$link.'">'.$value.'</a>';
+				$htmllink .= '&nbsp;<a href="'.$link.'" target="_blank">'.$value.'</a>';
 			} else {
 				$htmllink .= $value;
 			}

From 25923446018657c05a2f027987463550bbc603bf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 12 Dec 2020 17:27:27 +0100
Subject: [PATCH 377/888] Fix missing price2num

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

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index f59038aceae..36f9705aabc 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -670,8 +670,8 @@ if (empty($reshook))
 			$tva_tx = '';
 		}
 
-		$qty = GETPOST('qty'.$predef);
-		$remise_percent = (GETPOST('remise_percent'.$predef) != '' ? GETPOST('remise_percent'.$predef) : 0);
+		$qty = price2num(GETPOST('qty'.$predef, 'alpha'));
+		$remise_percent = (GETPOSTISSET('remise_percent'.$predef) ? price2num(GETPOST('remise_percent'.$predef, 'alpha')) : 0);
 
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);

From 643b507a96fbe766f29a05be77c1da832b64767e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 12 Dec 2020 17:31:10 +0100
Subject: [PATCH 378/888] ucfirst

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a14ddbde754..23c8d559e8a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2457,7 +2457,7 @@ function dol_print_socialnetworks($value, $cid, $socid, $type, $dictsocialnetwor
 
 	if (!empty($type)) {
 		$htmllink = '<div class="divsocialnetwork inline-block valignmiddle">';
-		$htmllink .= img_picto($langs->trans(strtoupper($type)), $type.'.png', '', false, 0, 0, '', 'paddingright', 0);
+		$htmllink .= img_picto($langs->trans(dol_ucfirst($type)), $type.'.png', '', false, 0, 0, '', 'paddingright', 0);
 		if ($type == 'skype') {
 			$htmllink .= $value;
 			$htmllink .= '&nbsp;';

From 621f246d589c0fedaa3eac3c24e19e234e7b934d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 12 Dec 2020 18:26:54 +0100
Subject: [PATCH 379/888] my company social networks in a separate tab

---
 htdocs/admin/company.php                |  26 -----
 htdocs/admin/company_socialnetworks.php | 142 ++++++++++++++++++++++++
 htdocs/core/lib/admin.lib.php           |   5 +
 3 files changed, 147 insertions(+), 26 deletions(-)
 create mode 100644 htdocs/admin/company_socialnetworks.php

diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index da955a67ea4..d5892bc35ab 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -178,13 +178,6 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 		}
 	}
 
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_FACEBOOK_URL", GETPOST("facebookurl", 'alpha'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TWITTER_URL", GETPOST("twitterurl", 'alpha'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LINKEDIN_URL", GETPOST("linkedinurl", 'alpha'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_INSTAGRAM_URL", GETPOST("instagramurl", 'alpha'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_YOUTUBE_URL", GETPOST("youtubeurl", 'alpha'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_GITHUB_URL", GETPOST("githuburl", 'alpha'), 'chaine', 0, '', $conf->entity);
-
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_MANAGERS", GETPOST("MAIN_INFO_SOCIETE_MANAGERS", 'nohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_GDPR", GETPOST("MAIN_INFO_GDPR", 'nohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_CAPITAL", GETPOST("capital", 'nohtml'), 'chaine', 0, '', $conf->entity);
@@ -546,25 +539,6 @@ print '</td></tr>';
 
 print '</table>';
 
-// Social networks
-print '<br>';
-print '<table class="noborder centpercent editmode">';
-print '<tr class="liste_titre">';
-print '<td class="titlefield">'.$langs->trans("SocialNetworksInformation").'</td><td>'.$langs->trans("Value").'</td>';
-print "</tr>\n";
-
-$listofnetworks = array('facebook'=>'facebook', 'twitter'=>'twitter', 'linkedin'=>'linkedin', 'instagram'=>'instagram', 'youtube'=>'youtube', 'github'=>'github');
-foreach ($listofnetworks as $networkkey => $networkicon) {
-	print '<tr class="oddeven"><td>';
-	print '<label for="'.$networkkey.'url">'.$langs->trans("SocialNetworks".ucfirst($networkkey)."URL").'</label></td><td>';
-	$networkconst = 'MAIN_INFO_SOCIETE_'.strtoupper($networkkey).'_URL';
-	print '<span class="fa paddingright fa-'.($networkicon ? $networkicon : 'link').'"></span>';
-	print '<input name="'.$networkkey.'url" id="'.$networkkey.'url" class="minwidth300" value="'.dol_escape_htmltag($conf->global->$networkconst).'"></td></tr>';
-	print '</td></tr>'."\n";
-}
-
-print "</table>";
-
 print '<br>';
 
 // IDs of the company (country-specific)
diff --git a/htdocs/admin/company_socialnetworks.php b/htdocs/admin/company_socialnetworks.php
new file mode 100644
index 00000000000..ec244d77ffd
--- /dev/null
+++ b/htdocs/admin/company_socialnetworks.php
@@ -0,0 +1,142 @@
+<?php
+/* Copyright (C) 2001-2007	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2019	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2017	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2010-2014	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2011-2017	Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2015		Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2017       Rui Strecht			    <rui.strecht@aliartalentos.com>
+ * Copyright (C) 2020       Frédéric 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/admin/company_socialnetworks.php
+ *	\ingroup    company
+ *	\brief      Setup page to configure company social networks
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+
+$action = GETPOST('action', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'admincompany'; // To manage different context of search
+
+// Load translation files required by the page
+$langs->loadLangs(array('admin', 'companies', 'bills'));
+
+if (!$user->admin) accessforbidden();
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('adminsocialnetworkscompany', 'globaladmin'));
+
+/*
+ * Actions
+ */
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (($action == 'update' && !GETPOST("cancel", 'alpha')) || ($action == 'updateedit')) {
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_FACEBOOK_URL", GETPOST("facebookurl", 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TWITTER_URL", GETPOST("twitterurl", 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LINKEDIN_URL", GETPOST("linkedinurl", 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_INSTAGRAM_URL", GETPOST("instagramurl", 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_YOUTUBE_URL", GETPOST("youtubeurl", 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_GITHUB_URL", GETPOST("githuburl", 'alpha'), 'chaine', 0, '', $conf->entity);
+
+	if ($action != 'updateedit' && !$error) {
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
+}
+
+
+/*
+ * View
+ */
+
+$wikihelp = 'EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones';
+llxHeader('', $langs->trans("Setup"), $wikihelp);
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$formcompany = new FormCompany($db);
+
+print load_fiche_titre($langs->trans("CompanyFoundation"), '', 'title_setup');
+
+$head = company_admin_prepare_head();
+
+print dol_get_fiche_head($head, 'socialnetworks', $langs->trans("SocialNetworksInformation"), -1, 'company');
+
+print '<span class="opacitymedium">'.$langs->trans("CompanyFundationDesc", $langs->transnoentities("Save"))."</span><br>\n";
+print "<br>\n";
+
+
+/**
+ * Edit parameters
+ */
+
+print '<form enctype="multipart/form-data" method="POST" action="'.$_SERVER["PHP_SELF"].'" name="form_index">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update">';
+
+// Social networks
+print '<br>';
+print '<table class="noborder centpercent editmode">';
+print '<tr class="liste_titre">';
+print '<td class="titlefield">'.$langs->trans("SocialNetworksInformation").'</td><td>'.$langs->trans("Value").'</td>';
+print "</tr>\n";
+
+$listofnetworks = array(
+	'facebook'=>'facebook',
+	'twitter'=>'twitter',
+	'linkedin'=>'linkedin',
+	'instagram'=>'instagram',
+	'youtube'=>'youtube',
+	'github'=>'github'
+);
+
+foreach ($listofnetworks as $networkkey => $networkicon) {
+	print '<tr class="oddeven"><td>';
+	print '<label for="'.$networkkey.'url">'.$langs->trans("SocialNetworks".ucfirst($networkkey)."URL").'</label></td><td>';
+	$networkconst = 'MAIN_INFO_SOCIETE_'.strtoupper($networkkey).'_URL';
+	print '<span class="fa paddingright fa-'.($networkicon ? $networkicon : 'link').'"></span>';
+	print '<input name="'.$networkkey.'url" id="'.$networkkey.'url" class="minwidth300" value="'.dol_escape_htmltag($conf->global->$networkconst).'"></td></tr>';
+	print '</td></tr>'."\n";
+}
+
+print "</table>";
+
+print '<br>';
+
+print '<br><div class="center">';
+print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '</form>';
+
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 704a4496d03..13f59c45ba8 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1819,6 +1819,11 @@ function company_admin_prepare_head()
 	$head[$h][2] = 'accountant';
 	$h++;
 
+	$head[$h][0] = DOL_URL_ROOT."/admin/company_socialnetworks.php";
+	$head[$h][1] = $langs->trans("SocialNetworksInformation");
+	$head[$h][2] = 'socialnetworks';
+	$h++;
+
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'mycompany_admin', 'add');
 
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'mycompany_admin', 'remove');

From b8a01b4d2d46bdcdf90c55fcb854eedeb5ed8e0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 12 Dec 2020 18:31:26 +0100
Subject: [PATCH 380/888] my company social networks in a separate tab

---
 htdocs/admin/company.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index d5892bc35ab..b82f0fcd765 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -685,7 +685,7 @@ print '<td class="right">&nbsp;</td>';
 print "</tr>\n";
 
 // Main tax
-print "<tr class=\"oddeven\"><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"use_vat\" value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION) ? "" : " checked")."> ".$langs->trans("VATIsUsed")."</label></td>";
+print '<tr class="oddeven"><td width="140"><label><input type="radio" name="optiontva" id="use_vat" value="1"'.(empty($conf->global->FACTURE_TVAOPTION) ? "" : " checked")."> ".$langs->trans("VATIsUsed")."</label></td>";
 print '<td colspan="2">';
 $tooltiphelp = '';
 if ($mysoc->country_code == 'FR') $tooltiphelp = '<i>'.$langs->trans("Example").': '.$langs->trans("VATIsUsedExampleFR")."</i>";
@@ -693,7 +693,7 @@ print "<label for=\"use_vat\">".$form->textwithpicto($langs->trans("VATIsUsedDes
 print "</td></tr>\n";
 
 
-print "<tr class=\"oddeven\"><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"no_vat\" value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION) ? " checked" : "")."> ".$langs->trans("VATIsNotUsed")."</label></td>";
+print '<tr class="oddeven"><td width="140"><label><input type="radio" name="optiontva" id="no_vat" value="0"'.(empty($conf->global->FACTURE_TVAOPTION) ? " checked" : "")."> ".$langs->trans("VATIsNotUsed")."</label></td>";
 print '<td colspan="2">';
 $tooltiphelp = '';
 if ($mysoc->country_code == 'FR') $tooltiphelp = "<i>".$langs->trans("Example").': '.$langs->trans("VATIsNotUsedExampleFR")."</i>\n";
@@ -713,7 +713,7 @@ print "</tr>\n";
 if ($mysoc->useLocalTax(1))
 {
 	// Note: When option is not set, it must not appears as set on on, because there is no default value for this option
-	print "<tr class=\"oddeven\"><td><input type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on") ? " checked" : "")."> ".$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code)."</td>";
+	print '<tr class="oddeven"><td><input type="radio" name="optionlocaltax1" id="lt1" value="localtax1on"'.(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on") ? " checked" : "")."> ".$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code)."</td>";
 	print '<td colspan="2">';
 	print '<div class="nobordernopadding">';
 	$tooltiphelp = $langs->transcountry("LocalTax1IsUsedExample", $mysoc->country_code);
@@ -732,7 +732,7 @@ if ($mysoc->useLocalTax(1))
 	print "</div>";
 	print "</td></tr>\n";
 
-	print "<tr class=\"oddeven\"><td><input type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off") ? " checked" : "")."> ".$langs->transcountry("LocalTax1IsNotUsed", $mysoc->country_code)."</td>";
+	print '<tr class="oddeven"><td><input type="radio" name="optionlocaltax1" id="nolt1" value="localtax1off"'.((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off") ? " checked" : "")."> ".$langs->transcountry("LocalTax1IsNotUsed", $mysoc->country_code)."</td>";
 	print '<td colspan="2">';
 	$tooltiphelp = $langs->transcountry("LocalTax1IsNotUsedExample", $mysoc->country_code);
 	$tooltiphelp = ($tooltiphelp != "LocalTax1IsNotUsedExample" ? "<i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsNotUsedExample", $mysoc->country_code)."</i>\n" : "");
@@ -760,7 +760,7 @@ print "</tr>\n";
 if ($mysoc->useLocalTax(2))
 {
 	// Note: When option is not set, it must not appears as set on on, because there is no default value for this option
-	print "<tr class=\"oddeven\"><td><input type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on") ? " checked" : "")."> ".$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code)."</td>";
+	print '<tr class="oddeven"><td><input type="radio" name="optionlocaltax2" id="lt2" value="localtax2on"'.(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on") ? " checked" : "")."> ".$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code)."</td>";
 	print '<td colspan="2">';
 	print '<div class="nobordernopadding">';
 	print '<label for="lt2">'.$langs->transcountry("LocalTax2IsUsedDesc", $mysoc->country_code)."</label>";
@@ -776,7 +776,7 @@ if ($mysoc->useLocalTax(2))
 	print "</div>";
 	print "</td></tr>\n";
 
-	print "<tr class=\"oddeven\"><td><input type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off") ? " checked" : "")."> ".$langs->transcountry("LocalTax2IsNotUsed", $mysoc->country_code)."</td>";
+	print '<tr class="oddeven"><td><input type="radio" name="optionlocaltax2" id="nolt2" value="localtax2off"'.((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off") ? " checked" : "")."> ".$langs->transcountry("LocalTax2IsNotUsed", $mysoc->country_code)."</td>";
 	print '<td colspan="2">';
 	print "<div>";
 	$tooltiphelp = $langs->transcountry("LocalTax2IsNotUsedExample", $mysoc->country_code);

From 818af46b86a2fd52cb68a738565b0b405d437a66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 12 Dec 2020 18:37:09 +0100
Subject: [PATCH 381/888] clean

---
 htdocs/admin/company_socialnetworks.php | 30 ++++++++-----------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/htdocs/admin/company_socialnetworks.php b/htdocs/admin/company_socialnetworks.php
index ec244d77ffd..7787a386d8c 100644
--- a/htdocs/admin/company_socialnetworks.php
+++ b/htdocs/admin/company_socialnetworks.php
@@ -30,21 +30,16 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
 $action = GETPOST('action', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'admincompany'; // To manage different context of search
 
 // Load translation files required by the page
-$langs->loadLangs(array('admin', 'companies', 'bills'));
+$langs->loadLangs(array('admin', 'companies'));
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('adminsocialnetworkscompany', 'globaladmin'));
@@ -55,20 +50,17 @@ $hookmanager->initHooks(array('adminsocialnetworkscompany', 'globaladmin'));
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (($action == 'update' && !GETPOST("cancel", 'alpha')) || ($action == 'updateedit')) {
+if (($action == 'update' && !GETPOST("cancel", 'alpha'))) {
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_FACEBOOK_URL", GETPOST("facebookurl", 'alpha'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TWITTER_URL", GETPOST("twitterurl", 'alpha'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LINKEDIN_URL", GETPOST("linkedinurl", 'alpha'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_INSTAGRAM_URL", GETPOST("instagramurl", 'alpha'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_YOUTUBE_URL", GETPOST("youtubeurl", 'alpha'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_GITHUB_URL", GETPOST("githuburl", 'alpha'), 'chaine', 0, '', $conf->entity);
-
-	if ($action != 'updateedit' && !$error) {
-		header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
-	}
 }
 
 
@@ -79,10 +71,6 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha')) || ($action == 'updatee
 $wikihelp = 'EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones';
 llxHeader('', $langs->trans("Setup"), $wikihelp);
 
-$form = new Form($db);
-$formother = new FormOther($db);
-$formcompany = new FormCompany($db);
-
 print load_fiche_titre($langs->trans("CompanyFoundation"), '', 'title_setup');
 
 $head = company_admin_prepare_head();
@@ -97,7 +85,7 @@ print "<br>\n";
  * Edit parameters
  */
 
-print '<form enctype="multipart/form-data" method="POST" action="'.$_SERVER["PHP_SELF"].'" name="form_index">';
+print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="update">';
 

From fa05982a8b9a6528827abc54fd5fe9a981b53494 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 12 Dec 2020 18:37:51 +0100
Subject: [PATCH 382/888] Fix CSS v13

---
 SECURITY.md                               |  4 ++--
 htdocs/core/tpl/login.tpl.php             | 25 +++++++++--------------
 htdocs/core/tpl/passwordforgotten.tpl.php | 23 +++++++++------------
 htdocs/theme/eldy/global.inc.php          |  1 +
 htdocs/theme/md/style.css.php             |  1 +
 htdocs/webservices/admin/index.php        |  7 +++++--
 6 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index 8ef569d6da0..bcc1bd7d9e0 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -49,7 +49,7 @@ You must not leak, manipulate, or destroy any user data of third parties to find
 
 ## Scope for qualified vulnerabilities
 
-ONLY vulnerabilities discovered, when the following setup on test platform is used, are "validated":
+ONLY vulnerabilities discovered, when the following setup on test platform is used, are "valid":
 
 * $dolibarr_main_prod must be set to 1 into conf.php
 * $dolibarr_nocsrfcheck must be kept to the value 0 into conf.php (this is the default value)
@@ -57,7 +57,7 @@ ONLY vulnerabilities discovered, when the following setup on test platform is us
 * The constant MAIN_SECURITY_CSRF_WITH_TOKEN must be set to 1 into backoffice menu Home - Setup - Other (this protection should be set to 1 soon by default)
 * The module DebugBar must NOT be enabled (by default, this module is not enabled. This is a developer tool)
 * The module ModuleBuilder must NOT be enabled (by default, this module is not enabled. This is a developer tool)
-* ONLY security reports on modules provided by default and with the "stable" status are allowed (troubles into "experimental", "developement" or external modules are not valid vulnerabilities).
+* ONLY security reports on modules provided by default and with the "stable" status are valid (troubles into "experimental", "developement" or external modules are not valid vulnerabilities).
 * The root of web server must link to htdocs and the documents directory must be outside of the web server root (this is the default when using the default installer but may differs with external installer).
 * The web server setup must be done so only the documents directory is in write mode. The root directory called htdocs must be readonly.
 * CSRF attacks are accepted for all when using a POST URL, but when using GET URL, they are validated only for creating or updating data resctricted to the admin user.
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index bf0e4f57743..2d0b9ad57c1 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -149,8 +149,7 @@ if ($disablenofollow) echo '</a>';
 <div class="tagtd nowraponall center valignmiddle tdinputlogin">
 <?php if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?><label for="username" class="hidden"><?php echo $langs->trans("Login"); ?></label><?php } ?>
 <!-- <span class="span-icon-user">-->
-<span class="fa fa-user">
-</span>
+<span class="fa fa-user"></span>
 <input type="text" id="username" placeholder="<?php echo $langs->trans("Login"); ?>" name="username" class="flat input-icon-user minwidth150" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" autofocus="autofocus" />
 </div>
 </div>
@@ -160,8 +159,7 @@ if ($disablenofollow) echo '</a>';
 <div class="tagtd nowraponall center valignmiddle tdinputlogin">
 <?php if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?><label for="password" class="hidden"><?php echo $langs->trans("Password"); ?></label><?php } ?>
 <!--<span class="span-icon-password">-->
-<span class="fa fa-key">
-</span>
+<span class="fa fa-key"></span>
 <input id="password" placeholder="<?php echo $langs->trans("Password"); ?>" name="password" class="flat input-icon-password minwidth150" type="password" value="<?php echo dol_escape_htmltag($password); ?>" tabindex="2" autocomplete="<?php echo empty($conf->global->MAIN_LOGIN_ENABLE_PASSWORD_AUTOCOMPLETE) ? 'off' : 'on'; ?>" />
 </div></div>
 
@@ -190,19 +188,16 @@ if ($captcha) {
 	?>
 	<!-- Captcha -->
 	<div class="trinputlogin">
-	<div class="tagtd nowraponall none center valignmiddle tdinputlogin">
+	<div class="tagtd none valignmiddle tdinputlogin">
 
-	<table class="login_table_securitycode centpercent">
-	<tr class="valignmiddle">
-	<td>
-	<span class="span-icon-security">
-	<input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security width100" type="text" maxlength="5" name="code" tabindex="3" />
+	<span class="fa fa-unlock"></span>
+	<span class="span-icon-security inline-block">
+	<input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security width150" type="text" maxlength="5" name="code" tabindex="3" />
+	</span>
+	<span class="nowrap inline-block">
+	<img class="inline-block valignmiddle" src="<?php echo DOL_URL_ROOT ?>/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" />
+	<a class="inline-block valignmiddle" href="<?php echo $php_self; ?>" tabindex="4" data-role="button"><?php echo $captcha_refresh; ?></a>
 	</span>
-	</td>
-	<td><img src="<?php echo DOL_URL_ROOT ?>/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" /></td>
-	<td><a href="<?php echo $php_self; ?>" tabindex="4" data-role="button"><?php echo $captcha_refresh; ?></a></td>
-	</tr>
-	</table>
 
 	</div></div>
 <?php } ?>
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index d7d7e2f7ef3..f11e01c7d13 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -107,8 +107,7 @@ if ($disablenofollow) echo '</a>';
 <div class="trinputlogin">
 <div class="tagtd nowraponall center valignmiddle tdinputlogin">
 <!-- <span class="span-icon-user">-->
-<span class="fa fa-user">
-</span>
+<span class="fa fa-user"></span>
 <input type="text" placeholder="<?php echo $langs->trans("Login"); ?>" <?php echo $disabled; ?> id="username" name="username" class="flat input-icon-user minwidth150" value="<?php echo dol_escape_htmltag($username); ?>" tabindex="1" />
 </div>
 </div>
@@ -135,22 +134,20 @@ if (!empty($morelogincontent)) {
 	$php_self = preg_replace('/[&\?]time=(\d+)/', '', $php_self); // Remove param time
 	if (preg_match('/\?/', $php_self)) $php_self .= '&time='.dol_print_date(dol_now(), 'dayhourlog');
 	else $php_self .= '?time='.dol_print_date(dol_now(), 'dayhourlog');
+	// TODO: provide accessible captcha variants
 	?>
 	<!-- Captcha -->
 	<div class="trinputlogin">
-	<div class="tdinputlogin nowraponall none center valignmiddle tdinputlogin">
+	<div class="tagtd tdinputlogin nowraponall none valignmiddle">
 
-	<table class="login_table_securitycode centpercent">
-	<tr class="valignmiddle">
-	<td>
-	<!-- <span class="span-icon-security"> -->
-	<span class="nofa">
-	<input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security width100" type="text" maxlength="5" name="code" tabindex="3" />
+	<span class="fa fa-unlock"></span>
+	<span class="nofa inline-block">
+	<input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security width150" type="text" maxlength="5" name="code" tabindex="3" />
+	</span>
+	<span class="nowrap inline-block">
+	<img class="inline-block valignmiddle" src="<?php echo DOL_URL_ROOT ?>/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" />
+	<a class="inline-block valignmiddle" href="<?php echo $php_self; ?>" tabindex="4"><?php echo $captcha_refresh; ?></a>
 	</span>
-	</td>
-	<td><img src="<?php echo DOL_URL_ROOT ?>/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" /></td>
-	<td><a href="<?php echo $php_self; ?>" tabindex="4"><?php echo $captcha_refresh; ?></a></td>
-	</tr></table>
 
 	</div></div>
 <?php } ?>
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index a0203c24cf1..1b104ce95dd 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1220,6 +1220,7 @@ table[summary="list_of_modules"] .fa-cog {
 .width50  { width: 50px; }
 .width75  { width: 75px; }
 .width100 { width: 100px; }
+.width125 { width: 125px; }
 .width150 { width: 150px; }
 .width200 { width: 200px; }
 .maxwidth25  { max-width: 25px; }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 4f85b78a872..ad0b03366db 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1213,6 +1213,7 @@ table[summary="list_of_modules"] .fa-cog {
 .width50  { width: 50px; }
 .width75  { width: 75px; }
 .width100 { width: 100px; }
+.width125 { width: 125px; }
 .width150 { width: 150px; }
 .width200 { width: 200px; }
 .maxwidth25  { max-width: 25px; }
diff --git a/htdocs/webservices/admin/index.php b/htdocs/webservices/admin/index.php
index 015551693bd..2c14d2d07f5 100644
--- a/htdocs/webservices/admin/index.php
+++ b/htdocs/webservices/admin/index.php
@@ -62,13 +62,16 @@ if ($actionsave)
 llxHeader();
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+
 print load_fiche_titre($langs->trans("WebServicesSetup"), $linkback, 'title_setup');
 
 print '<span class="opacitymedium">'.$langs->trans("WebServicesDesc")."</span><br>\n";
 print "<br>\n";
 
-print '<form name="agendasetupform" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<form name="agendasetupform" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="save">';
+
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
@@ -78,7 +81,7 @@ print "<td>".$langs->trans("Value")."</td>";
 print "<td>&nbsp;</td>";
 print "</tr>";
 
-print '<tr class="impair">';
+print '<tr class="oddeven">';
 print '<td class="fieldrequired">'.$langs->trans("KeyForWebServicesAccess").'</td>';
 print '<td><input type="text" class="flat" id="WEBSERVICES_KEY" name="WEBSERVICES_KEY" value="'.(GETPOST('WEBSERVICES_KEY') ?GETPOST('WEBSERVICES_KEY') : (!empty($conf->global->WEBSERVICES_KEY) ? $conf->global->WEBSERVICES_KEY : '')).'" size="40">';
 if (!empty($conf->use_javascript_ajax))

From a5d2e04dea46cd38b3711ea403cfd89b7cac0d8b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 12 Dec 2020 19:09:07 +0100
Subject: [PATCH 383/888] Debug v13

---
 htdocs/admin/ihm.php          | 28 ++++++++++++++--------------
 htdocs/comm/action/index.php  |  2 +-
 htdocs/langs/en_US/admin.lang |  4 ++--
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 3652c04518d..bebb9f7d0bd 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -248,14 +248,14 @@ print '<tr class="liste_titre"><th>'.img_picto('', 'language').' '.$langs->trans
 print '</tr>';
 
 // Default language
-print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DefaultLanguage").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("DefaultLanguage").'</td><td>';
 print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'MAIN_LANG_DEFAULT', 1, null, '', 0, 0, 'minwidth300', 2);
 print '<input class="button button-save" type="submit" name="submit" value="'.$langs->trans("Save").'">';
 print '</td>';
 print '</tr>';
 
 // Multilingual GUI
-print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("EnableMultilangInterface").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("EnableMultilangInterface").'</td><td>';
 print ajax_constantonoff("MAIN_MULTILANGS", array(), $conf->entity, 0, 0, 1, 0);
 print '</td>';
 print '</tr>';
@@ -303,28 +303,28 @@ print '</tr>';
  */
 
 // First day for weeks
-print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("WeekStartOnDay").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("WeekStartOnDay").'</td><td>';
 print $formother->select_dayofweek((isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : '1'), 'MAIN_START_WEEK', 0);
 print '</td>';
 print '<td width="20">&nbsp;</td>';
 print '</tr>';
 
 // DefaultWorkingDays
-print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DefaultWorkingDays").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("DefaultWorkingDays").'</td><td>';
 print '<input type="text" name="MAIN_DEFAULT_WORKING_DAYS" size="5" value="'.(isset($conf->global->MAIN_DEFAULT_WORKING_DAYS) ? $conf->global->MAIN_DEFAULT_WORKING_DAYS : '1-5').'">';
 print '</td>';
 print '<td width="20">&nbsp;</td>';
 print '</tr>';
 
 // DefaultWorkingHours
-print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DefaultWorkingHours").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("DefaultWorkingHours").'</td><td>';
 print '<input type="text" name="MAIN_DEFAULT_WORKING_HOURS" size="5" value="'.(isset($conf->global->MAIN_DEFAULT_WORKING_HOURS) ? $conf->global->MAIN_DEFAULT_WORKING_HOURS : '9-18').'">';
 print '</td>';
 print '<td width="20">&nbsp;</td>';
 print '</tr>';
 
 // Firstname/Name
-print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("FirstnameNamePosition").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("FirstnameNamePosition").'</td><td>';
 $array = array(0=>$langs->trans("Firstname").' '.$langs->trans("Lastname"), 1=>$langs->trans("Lastname").' '.$langs->trans("Firstname"));
 print $form->selectarray('MAIN_FIRSTNAME_NAME_POSITION', $array, (isset($conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? $conf->global->MAIN_FIRSTNAME_NAME_POSITION : 0));
 print '</td>';
@@ -332,7 +332,7 @@ print '<td width="20">&nbsp;</td>';
 print '</tr>';
 
 // Hide unauthorized menus
-print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("HideUnauthorizedMenu").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("HideUnauthorizedMenu").'</td><td>';
 //print $form->selectyesno('MAIN_MENU_HIDE_UNAUTHORIZED', isset($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) ? $conf->global->MAIN_MENU_HIDE_UNAUTHORIZED : 0, 1);
 print ajax_constantonoff("MAIN_MENU_HIDE_UNAUTHORIZED", array(), $conf->entity, 0, 0, 1, 0);
 print '</td>';
@@ -340,7 +340,7 @@ print '<td width="20">&nbsp;</td>';
 print '</tr>';
 
 // Hide unauthorized button
-print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("ButtonHideUnauthorized").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("ButtonHideUnauthorized").'</td><td>';
 //print $form->selectyesno('MAIN_BUTTON_HIDE_UNAUTHORIZED', isset($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) ? $conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED : 0, 1);
 print ajax_constantonoff("MAIN_BUTTON_HIDE_UNAUTHORIZED", array(), $conf->entity, 0, 0, 1, 0);
 print '</td>';
@@ -350,7 +350,7 @@ print '</tr>';
 // Hide version link
 /*
 
-print '<tr><td class="titlefield">'.$langs->trans("HideVersionLink").'</td><td>';
+print '<tr><td>'.$langs->trans("HideVersionLink").'</td><td>';
 print $form->selectyesno('MAIN_HIDE_VERSION',$conf->global->MAIN_HIDE_VERSION,1);
 print '</td>';
 print '<td width="20">&nbsp;</td>';
@@ -358,7 +358,7 @@ print '</tr>';
 */
 
 // Show bugtrack link
-print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
 print ajax_constantonoff("MAIN_BUGTRACK_ENABLELINK", array(), $conf->entity, 0, 0, 1, 0);
 //print $form->selectyesno('MAIN_BUGTRACK_ENABLELINK', $conf->global->MAIN_BUGTRACK_ENABLELINK, 1);
 print '</td>';
@@ -367,7 +367,7 @@ print '</tr>';
 
 // Hide wiki link on login page
 $pictohelp = '<span class="fa fa-question-circle"></span>';
-print '<tr class="oddeven"><td class="titlefield">'.str_replace('{picto}', $pictohelp, $langs->trans("DisableLinkToHelp", '{picto}')).'</td><td>';
+print '<tr class="oddeven"><td>'.str_replace('{picto}', $pictohelp, $langs->trans("DisableLinkToHelp", '{picto}')).'</td><td>';
 print ajax_constantonoff("MAIN_HELP_DISABLELINK", array(), $conf->entity, 0, 0, 1, 0);
 //print $form->selectyesno('MAIN_HELP_DISABLELINK', isset($conf->global->MAIN_HELP_DISABLELINK) ? $conf->global->MAIN_HELP_DISABLELINK : 0, 1);
 print '</td>';
@@ -378,7 +378,7 @@ print '</tr>';
 $substitutionarray = getCommonSubstitutionArray($langs, 0, array('object', 'objectamount'));
 complete_substitutions_array($substitutionarray, $langs);
 
-print '<tr class="oddeven"><td class="titlefield">';
+print '<tr class="oddeven"><td>';
 $texthelp = $langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
 foreach ($substitutionarray as $key => $val)
 {
@@ -401,12 +401,12 @@ print '<br>';
 // Other
 print '<div class="div-table-responsive-no-min">';
 print '<table summary="edit" class="noborder centpercent editmode">';
-print '<tr class="liste_titre"><th class="titlefield">'.$langs->trans("LoginPage").'</th><th></th>';
+print '<tr class="liste_titre"><th>'.$langs->trans("LoginPage").'</th><th></th>';
 print '<th width="20">&nbsp;</th>';
 print '</tr>';
 
 // Hide helpcenter link on login page
-print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableLinkToHelpCenter").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("DisableLinkToHelpCenter").'</td><td>';
 print ajax_constantonoff("MAIN_HELPCENTER_DISABLELINK", array(), $conf->entity, 0, 0, 0, 0);
 print '</td>';
 print '<td width="20">&nbsp;</td>';
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 83b3c0514aa..f5822669bba 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -518,7 +518,7 @@ if (!empty($conf->use_javascript_ajax))	// If javascript on
 	}
 
 	// Birthdays
-	$s .= '<div class="nowrap inline-block"><input type="checkbox" id="check_birthday" name="check_birthday" class="check_birthday"> <span class="check_birthday_text">'.$langs->trans("AgendaShowBirthdayEvents").'</span> &nbsp; </div>';
+	$s .= '<div class="nowrap inline-block"><input type="checkbox" id="check_birthday" name="check_birthday" class="check_birthday"><label for="check_birthday"> <span class="check_birthday_text">'.$langs->trans("AgendaShowBirthdayEvents").'</span></label> &nbsp; </div>';
 
 	// Calendars from hooks
 	$parameters = array(); $object = null;
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index b0a302fb80e..00b7014eb71 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -406,7 +406,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -1689,7 +1689,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu handler where to show new menu
 DetailMenuModule=Module name if menu entry come from a module

From 57b3b3db3a9f03885d55658be64ef6f19b451077 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 12 Dec 2020 19:18:45 +0100
Subject: [PATCH 384/888] Prepare 12.0.4

---
 ChangeLog | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index e7abb3f7cd6..83db59d2e64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,102 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
+
+***** ChangeLog for 12.0.4 compared to 12.0.3 *****
+FIX: make formConfirm an addreplace-type hook
+FIX: regex to remove 'action' parameter: taking feedback from PR#15213 into account
+FIX: remove 'action' parameter from redirect URL when reordering lines on a document
+FIX: error when displaying lines on order after adding a line if both MAIN_MULTILANGS and MAIN_DISABLE_PDF_AUTOUPDATE are activated
+FIX: on survey creation, entity is always set to 1 ⇒ set it to $conf->entity
+FIX: set entity to $conf->entity (instead of 1 by default) when creating a survey; otherwise the survey cannot be listed from the entity it was created on unless it is the main entity
+FIX: the stringent XSS protection provided by 'alphanohtml' causes problems with some clients who used basic tags (bold, italic, underline) in product labels. Using 'restricthtml' instead could be a good compromise.
+FIX: third party of object is not always fetched when initiating the e-mail presend action (e.g. from an order)
+FIX: when the cronjob 'params' field is empty, the cron method is called with one empty string param instead of no params at all
+FIX: XSS protection too stringent -> replace 'alphanohtml' with 'restricthtml'
+FIX: #13067 including opening balance in calculation of displayed balance
+FIX: #14326
+FIX: #14649
+FIX: #14901
+FIX: #14927 Change ContratLigne property type to product_type
+FIX: #14979
+FIX: #15074
+FIX: #15111 Fix special characters output in PDF
+FIX: #15161 MO translation conflict
+FIX: #15163
+FIX: #15199
+FIX: #15208
+FIX: #15303
+FIX: #15365 export of extrafields for user and resources
+FIX: #15374 : "New" doesn't clear total amounts
+FIX: #15501
+FIX: #15572
+FIX: #15590
+FIX: #15618
+FIX: supplier proposals as linked objects of events are not correctly fetched
+FIX: when users create an event from a supplier proposal, the "linked objects" section says "Deleted"
+FIX: Accountancy - Some ajustments on length of the account (general & auxiliary)
+FIX: admin conf selected
+FIX: also check if there is a method $object->fetch_thirdparty() before calling it
+FIX: autofocus on first setup
+FIX: Bad rigths to send contract
+FIX: Better error message with IMAP when connection fails
+FIX: Can create user but not update user with activedirectory
+FIX: Can receipt of a product that required lot after disabling stock and
+FIX: Can't create shipment for virtual product. Add
+FIX: cant empty action comm desc
+FIX: CA report by product/service : subcategory filter
+FIX: Clean orphan records in llx_ecm_files into repair script.
+FIX: default accountancy values and posted values
+FIX: Deletion of expensereport + other generated object not complete.
+FIX: disabled users must not be available in sales representative list on societe edit mode
+FIX: Dol print error : conf usage thirdparty propagate extrafields to
+FIX: Don't display inactive users in birthday box and company card
+FIX: empty value is needed on filter list
+FIX: enable HTML in product labels depending on conf MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML
+FIX: error 500 on cash closure
+FIX: excess comma
+FIX: Export FEC - Remove line at zero
+FIX: extrafield required error after submit
+FIX: filter on project list
+FIX: force payment mode to withdraw
+FIX: formating of prices with foreign languages
+FIX: handling $heightforinfotot when he's superior to a page height
+FIX: if no PDF default model in admin for expense report, do not create a PDF
+FIX: invoice payment terms edition: error management
+FIX: list of fields in list of recurring invoices was empty
+FIX: load default linked options for linked sellist extra fields
+FIX: Loan - Return on list when you cancel create form or delete a loan
+FIX: Missing lang trans
+FIX: no empty value in required extrafield
+FIX: Param joinfiles not sanitized
+FIX: Payment by BankTransfer
+FIX: pdf_getlinetotalwithtax must show total incl tax
+FIX: Problem on supplier payment card
+FIX: product auto volume calculation
+FIX: product customer prices: missing triggers in CRUD class
+FIX: Request on purchase orders in timeout even on very small databases
+FIX: set paid on total discount of a product in cash desk
+FIX: several warning with the barcode use in ODT templates
+FIX: SHIP MODE install v12 bug insert
+FIX: stripe for connect mode
+FIX: subcat filter
+FIX: supplier invoice: automatically calculate payment term when modifying payment condition
+FIX: SUPPLIER PROPOSAL v12 bug add
+FIX: table making extrafield input too small on advance target mailing
+FIX: table making extrafield too small advtagertmailing
+FIX: Unable to edit extrafields in expense report
+FIX: update margins rates on object line edit
+FIX: uses price2numjs
+FIX: various payments: bad data handling for subledger account + useless db commit/rollback
+FIX: virtual products: displayed value is by unit
+FIX: virtual products: supplier discount was not applied in component list
+FIX: warning for purchase order delivery late.
+FIX: Warning on late purchase order delivery
+FIX: WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING must not consider services while STOCK_SUPPORTS_SERVICES is empty
+FIX: wrong tab
+FIX: Yogosha report 4425 (backport)
+FIX: Yogosha report 4434 (backport)
+
 ***** ChangeLog for 12.0.3 compared to 12.0.2 *****
 FIX: 10.0 - when the mime file name is different from the filesystem name, the attachment name should be the mime filename
 FIX: 11.0 - expenses lines overlapping the total amounts frame

From 6a4990d5bdd6848589259374859a49010c4f3a8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 12 Dec 2020 19:21:40 +0100
Subject: [PATCH 385/888] clean

---
 htdocs/admin/company_socialnetworks.php | 52 ++++++++++++++-----------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/htdocs/admin/company_socialnetworks.php b/htdocs/admin/company_socialnetworks.php
index 7787a386d8c..2aeb792042c 100644
--- a/htdocs/admin/company_socialnetworks.php
+++ b/htdocs/admin/company_socialnetworks.php
@@ -40,6 +40,7 @@ $langs->loadLangs(array('admin', 'companies'));
 if (!$user->admin) {
 	accessforbidden();
 }
+$listofnetworks = getArrayOfSocialNetworks();
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('adminsocialnetworkscompany', 'globaladmin'));
@@ -53,14 +54,20 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-
 if (($action == 'update' && !GETPOST("cancel", 'alpha'))) {
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_FACEBOOK_URL", GETPOST("facebookurl", 'alpha'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TWITTER_URL", GETPOST("twitterurl", 'alpha'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LINKEDIN_URL", GETPOST("linkedinurl", 'alpha'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_INSTAGRAM_URL", GETPOST("instagramurl", 'alpha'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_YOUTUBE_URL", GETPOST("youtubeurl", 'alpha'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_GITHUB_URL", GETPOST("githuburl", 'alpha'), 'chaine', 0, '', $conf->entity);
+	foreach ($listofnetworks as $key => $value) {
+		if (!empty($value['active']) && GETPOSTISSET($key.'url')) {
+			$networkconstname = 'MAIN_INFO_SOCIETE_'.strtoupper($key).'_URL';
+			$networkconstid = 'MAIN_INFO_SOCIETE_'.strtoupper($key);
+			dolibarr_set_const($db, $networkconstname, GETPOST($key.'url', 'alpha'), 'chaine', 0, '', $conf->entity);
+			dolibarr_set_const($db, $networkconstid, GETPOST($key, 'alpha'), 'chaine', 0, '', $conf->entity);
+		}
+	}
+	// dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TWITTER_URL", GETPOST("twitterurl", 'alpha'), 'chaine', 0, '', $conf->entity);
+	// dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LINKEDIN_URL", GETPOST("linkedinurl", 'alpha'), 'chaine', 0, '', $conf->entity);
+	// dolibarr_set_const($db, "MAIN_INFO_SOCIETE_INSTAGRAM_URL", GETPOST("instagramurl", 'alpha'), 'chaine', 0, '', $conf->entity);
+	// dolibarr_set_const($db, "MAIN_INFO_SOCIETE_YOUTUBE_URL", GETPOST("youtubeurl", 'alpha'), 'chaine', 0, '', $conf->entity);
+	// dolibarr_set_const($db, "MAIN_INFO_SOCIETE_GITHUB_URL", GETPOST("githuburl", 'alpha'), 'chaine', 0, '', $conf->entity);
 }
 
 
@@ -93,25 +100,24 @@ print '<input type="hidden" name="action" value="update">';
 print '<br>';
 print '<table class="noborder centpercent editmode">';
 print '<tr class="liste_titre">';
-print '<td class="titlefield">'.$langs->trans("SocialNetworksInformation").'</td><td>'.$langs->trans("Value").'</td>';
+print '<td class="titlefield">'.$langs->trans("SocialNetworksInformation").'</td><td>'.$langs->trans("Url").'</td><td>'.$langs->trans("SocialNetworkId").'</td><td></td>';
 print "</tr>\n";
 
-$listofnetworks = array(
-	'facebook'=>'facebook',
-	'twitter'=>'twitter',
-	'linkedin'=>'linkedin',
-	'instagram'=>'instagram',
-	'youtube'=>'youtube',
-	'github'=>'github'
-);
 
-foreach ($listofnetworks as $networkkey => $networkicon) {
-	print '<tr class="oddeven"><td>';
-	print '<label for="'.$networkkey.'url">'.$langs->trans("SocialNetworks".ucfirst($networkkey)."URL").'</label></td><td>';
-	$networkconst = 'MAIN_INFO_SOCIETE_'.strtoupper($networkkey).'_URL';
-	print '<span class="fa paddingright fa-'.($networkicon ? $networkicon : 'link').'"></span>';
-	print '<input name="'.$networkkey.'url" id="'.$networkkey.'url" class="minwidth300" value="'.dol_escape_htmltag($conf->global->$networkconst).'"></td></tr>';
-	print '</td></tr>'."\n";
+foreach ($listofnetworks as $key => $value) {
+	if (!empty($value['active'])) {
+		print '<tr class="oddeven">';
+		print '<td><label for="'.$key.'url">'.$langs->trans(ucfirst($key)).'</label></td>';
+		$networkconstname = 'MAIN_INFO_SOCIETE_'.strtoupper($key).'_URL';
+		$networkconstid = 'MAIN_INFO_SOCIETE_'.strtoupper($key);
+		print '<td><span class="fa paddingright '.($value['icon'] ? $value['icon'] : 'fa-link').'"></span>';
+		print '<input name="'.$key.'url" id="'.$key.'url" class="minwidth300" value="'.dol_escape_htmltag($conf->global->$networkconstname).'">';
+		print '</td><td>';
+		print '<input name="'.$key.'" id="'.$key.'" class="minwidth300" value="'.dol_escape_htmltag($conf->global->$networkconstid).'">';
+		print '</td>';
+		print '<td>'.dol_print_socialnetworks($conf->global->$networkconstid, 0, 0, $key, $listofnetworks).'</td>';
+		print '</tr>'."\n";
+	}
 }
 
 print "</table>";

From 3521a736fc118954fcee402a64db7a9e720c1b7c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 12 Dec 2020 19:49:13 +0100
Subject: [PATCH 386/888] Fix warnings

---
 htdocs/core/class/notify.class.php            |  4 ++--
 .../expensereport/mod_expensereport_jade.php  |  2 +-
 htdocs/core/modules/modReception.class.php    |  4 ++--
 .../class/expensereport.class.php             | 22 +++++++++++++------
 test/phpunit/CategorieTest.php                |  4 ++--
 5 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 6547b98471a..7cc51bfecb9 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -343,7 +343,7 @@ class Notify
 		$sql = '';
 
 		// Check notification per third party
-		if ($object->socid > 0)
+		if (!empty($object->socid) && $object->socid > 0)
 		{
 			$sql .= "SELECT 'tocontactid' as type_target, c.email, c.rowid as cid, c.lastname, c.firstname, c.default_lang,";
 			$sql .= " a.rowid as adid, a.label, a.code, n.rowid, n.type";
@@ -576,7 +576,7 @@ class Notify
 					$i++;
 				}
 			} else {
-				dol_syslog("No notification to thirdparty sent, nothing into notification setup for the thirdparty socid = ".$object->socid);
+				dol_syslog("No notification to thirdparty sent, nothing into notification setup for the thirdparty socid = ".(empty($object->socid) ? '' : $object->socid));
 			}
 		} else {
 	   		$error++;
diff --git a/htdocs/core/modules/expensereport/mod_expensereport_jade.php b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
index 299b31ad85c..e6e60741628 100644
--- a/htdocs/core/modules/expensereport/mod_expensereport_jade.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
@@ -122,7 +122,7 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
 		global $db, $conf;
 
 		// For backward compatibility and restore old behavior to get ref of expense report
-		if ($conf->global->EXPENSEREPORT_USE_OLD_NUMBERING_RULE)
+		if (!empty($conf->global->EXPENSEREPORT_USE_OLD_NUMBERING_RULE))
 		{
 			$fuser = null;
 			if ($object->fk_user_author > 0)
diff --git a/htdocs/core/modules/modReception.class.php b/htdocs/core/modules/modReception.class.php
index 497c0b5f95e..f784d88a3da 100644
--- a/htdocs/core/modules/modReception.class.php
+++ b/htdocs/core/modules/modReception.class.php
@@ -217,7 +217,7 @@ class modReception extends DolibarrModules
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'reception as c';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'reception_extrafields as extra ON c.rowid = extra.fk_object,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'societe as s';
-		if (!$user->rights->societe->client->voir) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch as ed';
@@ -231,7 +231,7 @@ class modReception extends DolibarrModules
 		}
 		$this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = ed.fk_reception AND ed.fk_commandefourndet = cd.rowid';
 		$this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('reception').')';
-		if (!$user->rights->societe->client->voir) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
 	}
 
 
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 3ecba5d5286..55096c411fa 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -80,12 +80,16 @@ class ExpenseReport extends CommonObject
 	 */
 	public $fk_statut;
 
+	public $vat_src_code;
+
 	public $fk_c_paiement;
 	public $paid;
 
 	public $user_author_infos;
 	public $user_validator_infos;
 
+	public $rule_warning_message;
+
 	// ACTIONS
 
 	// Create
@@ -539,7 +543,7 @@ class ExpenseReport extends CommonObject
 	{
 		global $conf;
 
-		$sql = "SELECT d.rowid, d.ref, d.note_public, d.note_private,"; // DEFAULT
+		$sql = "SELECT d.rowid, d.entity, d.ref, d.note_public, d.note_private,"; // DEFAULT
 		$sql .= " d.detail_refuse, d.detail_cancel, d.fk_user_refuse, d.fk_user_cancel,"; // ACTIONS
 		$sql .= " d.date_refuse, d.date_cancel,"; // ACTIONS
 		$sql .= " d.total_ht, d.total_ttc, d.total_tva,"; // TOTAUX (int)
@@ -561,6 +565,9 @@ class ExpenseReport extends CommonObject
 			{
 				$this->id           = $obj->rowid;
 				$this->ref          = $obj->ref;
+
+				$this->entity       = $obj->entity;
+
 				$this->total_ht     = $obj->total_ht;
 				$this->total_tva    = $obj->total_tva;
 				$this->total_ttc    = $obj->total_ttc;
@@ -802,6 +809,7 @@ class ExpenseReport extends CommonObject
 		$this->id = 0;
 		$this->ref = 'SPECIMEN';
 		$this->specimen = 1;
+		$this->entity = 1;
 		$this->date_create = $now;
 		$this->date_debut = $now;
 		$this->date_fin = $now;
@@ -2637,7 +2645,7 @@ class ExpenseReportLine
 	}
 
 	/**
-	 * insert
+	 * Insert a line of expense report
 	 *
 	 * @param   int     $notrigger      1=No trigger
 	 * @param   bool    $fromaddline    false=keep default behavior, true=exclude the update_price() of parent object
@@ -2649,11 +2657,11 @@ class ExpenseReportLine
 
 		$error = 0;
 
-		dol_syslog("ExpenseReportLine::Insert rang=".$this->rang, LOG_DEBUG);
+		dol_syslog("ExpenseReportLine::Insert", LOG_DEBUG);
 
 		// Clean parameters
 		$this->comments = trim($this->comments);
-		if (!$this->value_unit_HT) $this->value_unit_HT = 0;
+		if (empty($this->value_unit)) $this->value_unit = 0;
 		$this->qty = price2num($this->qty);
 		$this->vatrate = price2num($this->vatrate);
 		if (empty($this->fk_c_exp_tax_cat)) $this->fk_c_exp_tax_cat = 0;
@@ -2665,9 +2673,9 @@ class ExpenseReportLine
 		$sql .= ' tva_tx, vat_src_code, comments, qty, value_unit, total_ht, total_tva, total_ttc, date, rule_warning_message, fk_c_exp_tax_cat, fk_ecm_files)';
 		$sql .= " VALUES (".$this->db->escape($this->fk_expensereport).",";
 		$sql .= " ".$this->db->escape($this->fk_c_type_fees).",";
-		$sql .= " ".$this->db->escape($this->fk_project > 0 ? $this->fk_project : ($this->fk_projet > 0 ? $this->fk_projet : 'null')).",";
+		$sql .= " ".$this->db->escape((!empty($this->fk_project) && $this->fk_project > 0) ? $this->fk_project : ((!empty($this->fk_projet) && $this->fk_projet > 0) ? $this->fk_projet : 'null')).",";
 		$sql .= " ".$this->db->escape($this->vatrate).",";
-		$sql .= " '".$this->db->escape($this->vat_src_code)."',";
+		$sql .= " '".$this->db->escape(empty($this->vat_src_code) ? '' : $this->vat_src_code)."',";
 		$sql .= " '".$this->db->escape($this->comments)."',";
 		$sql .= " ".$this->db->escape($this->qty).",";
 		$sql .= " ".$this->db->escape($this->value_unit).",";
@@ -2675,7 +2683,7 @@ class ExpenseReportLine
 		$sql .= " ".$this->db->escape($this->total_tva).",";
 		$sql .= " ".$this->db->escape($this->total_ttc).",";
 		$sql .= " '".$this->db->idate($this->date)."',";
-		$sql .= " '".$this->db->escape($this->rule_warning_message)."',";
+		$sql .= " ".(empty($this->rule_warning_message) ? 'null' : "'".$this->db->escape($this->rule_warning_message)."'").",";
 		$sql .= " ".$this->db->escape($this->fk_c_exp_tax_cat).",";
 		$sql .= " ".($this->fk_ecm_files > 0 ? $this->fk_ecm_files : 'null');
 		$sql .= ")";
diff --git a/test/phpunit/CategorieTest.php b/test/phpunit/CategorieTest.php
index a62d362a972..189ef10ecdc 100644
--- a/test/phpunit/CategorieTest.php
+++ b/test/phpunit/CategorieTest.php
@@ -244,7 +244,7 @@ class CategorieTest extends PHPUnit\Framework\TestCase
     /**
      * testCategorieUpdate
      *
-     * @param   Category        $localobject        Category
+     * @param   Categorie        $localobject        Category
      * @return  int
 
      * @depends testCategorieFetch
@@ -269,7 +269,7 @@ class CategorieTest extends PHPUnit\Framework\TestCase
     /**
      * testCategorieOther
      *
-     * @param   Category    $localobject    Category
+     * @param   Categorie    $localobject    Category
      * @return  int
      *
      * @depends testCategorieUpdate

From 4fc57d096ee589084eaff950f94872aa666d05c1 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Sat, 12 Dec 2020 20:37:00 +0100
Subject: [PATCH 387/888] Fix #15556

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

diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 2f58c782c24..5c36044dcd1 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -788,8 +788,8 @@ while ($i < min($num, $limit))
 						$userstatic->statut = $val['statut'];
 						$userstatic->entity = $val['entity'];
 						$userstatic->photo = $val['photo'];
-						//print $userstatic->getNomUrl(1, '', 0, 0, 12);
-						print $userstatic->getNomUrl(-2);
+						print $userstatic->getNomUrl(1, '', 0, 0, 12);
+						//print $userstatic->getNomUrl(-2);
 						$j++;
 						if ($j < $nbofsalesrepresentative) print ' ';
 					}

From 8aaa1905a05d8fd9c54cf06c2c758961802d289b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 12 Dec 2020 21:03:27 +0100
Subject: [PATCH 388/888] create url from socialid

---
 htdocs/admin/company_socialnetworks.php | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/company_socialnetworks.php b/htdocs/admin/company_socialnetworks.php
index 2aeb792042c..5cbdb948b4a 100644
--- a/htdocs/admin/company_socialnetworks.php
+++ b/htdocs/admin/company_socialnetworks.php
@@ -56,18 +56,24 @@ if ($reshook < 0) {
 }
 if (($action == 'update' && !GETPOST("cancel", 'alpha'))) {
 	foreach ($listofnetworks as $key => $value) {
-		if (!empty($value['active']) && GETPOSTISSET($key.'url')) {
+		if (!empty($value['active'])) {
 			$networkconstname = 'MAIN_INFO_SOCIETE_'.strtoupper($key).'_URL';
 			$networkconstid = 'MAIN_INFO_SOCIETE_'.strtoupper($key);
-			dolibarr_set_const($db, $networkconstname, GETPOST($key.'url', 'alpha'), 'chaine', 0, '', $conf->entity);
-			dolibarr_set_const($db, $networkconstid, GETPOST($key, 'alpha'), 'chaine', 0, '', $conf->entity);
+			if (GETPOSTISSET($key.'url') && GETPOST($key.'url', 'alpha') != '') {
+				dolibarr_set_const($db, $networkconstname, GETPOST($key.'url', 'alpha'), 'chaine', 0, '', $conf->entity);
+				dolibarr_set_const($db, $networkconstid, GETPOST($key, 'alpha'), 'chaine', 0, '', $conf->entity);
+			} elseif (GETPOSTISSET($key) && GETPOST($key, 'alpha') != '') {
+				if (!empty($listofnetworks[$key]['url'])) {
+					$url = str_replace('{socialid}', GETPOST($key, 'alpha'), $listofnetworks[$key]['url']);
+					dolibarr_set_const($db, $networkconstname, $url, 'chaine', 0, '', $conf->entity);
+				}
+				dolibarr_set_const($db, $networkconstid, GETPOST($key, 'alpha'), 'chaine', 0, '', $conf->entity);
+			} else {
+				dolibarr_del_const($db, $networkconstname, $conf->entity);
+				dolibarr_del_const($db, $networkconstid, $conf->entity);
+			}
 		}
 	}
-	// dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TWITTER_URL", GETPOST("twitterurl", 'alpha'), 'chaine', 0, '', $conf->entity);
-	// dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LINKEDIN_URL", GETPOST("linkedinurl", 'alpha'), 'chaine', 0, '', $conf->entity);
-	// dolibarr_set_const($db, "MAIN_INFO_SOCIETE_INSTAGRAM_URL", GETPOST("instagramurl", 'alpha'), 'chaine', 0, '', $conf->entity);
-	// dolibarr_set_const($db, "MAIN_INFO_SOCIETE_YOUTUBE_URL", GETPOST("youtubeurl", 'alpha'), 'chaine', 0, '', $conf->entity);
-	// dolibarr_set_const($db, "MAIN_INFO_SOCIETE_GITHUB_URL", GETPOST("githuburl", 'alpha'), 'chaine', 0, '', $conf->entity);
 }
 
 

From 1b75ac9ffe5a86b0123db660331b373ca40bf9ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 12 Dec 2020 21:17:18 +0100
Subject: [PATCH 389/888] add github

---
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index 76fb29197b2..e391787479d 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -376,7 +376,7 @@ ALTER TABLE llx_facturedet ADD COLUMN ref_ext varchar(255) AFTER multicurrency_t
 ALTER TABLE llx_c_ticket_category ADD COLUMN fk_parent integer DEFAULT 0 NOT NULL;
 ALTER TABLE llx_c_ticket_category ADD COLUMN force_severity varchar(32) NULL;
 
-ALTER TABLE llx_c_ticket_severity CHANGE color color VARCHAR(10) NULL; 
+ALTER TABLE llx_c_ticket_severity CHANGE color color VARCHAR(10) NULL;
 
 ALTER TABLE llx_expensereport ADD COLUMN fk_user_creat integer NULL;
 
@@ -421,7 +421,7 @@ ALTER TABLE llx_projet_task_time MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIM
 ALTER TABLE llx_projet_task_time MODIFY COLUMN datec datetime;
 
 
-DELETE FROM llx_user_rights WHERE fk_id IN (SELECT id FROM llx_rights_def where module = 'holiday' and perms = 'lire_tous'); 
+DELETE FROM llx_user_rights WHERE fk_id IN (SELECT id FROM llx_rights_def where module = 'holiday' and perms = 'lire_tous');
 DELETE FROM llx_rights_def where module = 'holiday' and perms = 'lire_tous';
 UPDATE llx_rights_def set perms = 'readall' WHERE perms = 'read_all' and module = 'holiday';
 
@@ -545,6 +545,7 @@ CREATE TABLE llx_session(
   user_agent varchar(128) NULL
 )ENGINE=innodb;
 
+INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'github', 'Github', 'https://github.com/{socialid}', 'fa-github', 1);
 
 -- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT  'box_funnel_of_prospection.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_funnel_of_prospection.php' AND entity = 1);
 -- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT  'box_customers_outstanding_bill_reached.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_customers_outstanding_bill_reached.php' AND entity = 1);

From 6c3a9cbc402c494f7cca9f3984f0d84dbae78ec0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 12 Dec 2020 21:27:56 +0100
Subject: [PATCH 390/888] clean

---
 htdocs/core/lib/functions.lib.php | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 23c8d559e8a..0a4e8331bb8 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1758,21 +1758,17 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 		} else {
 			$morehtmlstatus .= '<span class="statusrefbuy">'.$object->getLibStatut(6, 1).'</span>';
 		}
-	} elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan')))
-	{
+	} elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan'))) {
 		$tmptxt = $object->getLibStatut(6, $object->totalpaye);
 		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) $tmptxt = $object->getLibStatut(5, $object->totalpaye);
 		$morehtmlstatus .= $tmptxt;
-	} elseif ($object->element == 'contrat' || $object->element == 'contract')
-	{
+	} elseif ($object->element == 'contrat' || $object->element == 'contract') {
 		if ($object->statut == 0) $morehtmlstatus .= $object->getLibStatut(5);
 		else $morehtmlstatus .= $object->getLibStatut(4);
-	} elseif ($object->element == 'facturerec')
-	{
+	} elseif ($object->element == 'facturerec') {
 		if ($object->frequency == 0) $morehtmlstatus .= $object->getLibStatut(2);
 		else $morehtmlstatus .= $object->getLibStatut(5);
-	} elseif ($object->element == 'project_task')
-	{
+	} elseif ($object->element == 'project_task') {
 		$object->fk_statut = 1;
 		if ($object->progress > 0) $object->fk_statut = 2;
 		if ($object->progress >= 100) $object->fk_statut = 3;
@@ -2457,6 +2453,7 @@ function dol_print_socialnetworks($value, $cid, $socid, $type, $dictsocialnetwor
 
 	if (!empty($type)) {
 		$htmllink = '<div class="divsocialnetwork inline-block valignmiddle">';
+		// TODO use dictionary definition for picto $dictsocialnetworks[$type]['icon']
 		$htmllink .= img_picto($langs->trans(dol_ucfirst($type)), $type.'.png', '', false, 0, 0, '', 'paddingright', 0);
 		if ($type == 'skype') {
 			$htmllink .= $value;
@@ -3306,8 +3303,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				$fakey = 'fa-'.$convertarray[$pictowithouttext];
 				if (preg_match('/selected/', $pictowithouttext)) $facolor = '#888';
 				$marginleftonlyshort = 1;
-			} elseif (!empty($arrayconvpictotofa[$pictowithouttext]))
-			{
+			} elseif (!empty($arrayconvpictotofa[$pictowithouttext])) {
 				$fakey = 'fa-'.$arrayconvpictotofa[$pictowithouttext];
 			} else {
 				$fakey = 'fa-'.$pictowithouttext;

From 346fe8ae8589ff8884f6b0864b680683e9583329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 12 Dec 2020 22:35:51 +0100
Subject: [PATCH 391/888] clean

---
 htdocs/core/class/commonobject.class.php | 44 +++++++++++++-----------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index f34f39740bd..396aa595062 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -694,17 +694,14 @@ abstract class CommonObject
 		$contactid = 0;
 		$thirdpartyid = 0;
 		$elementforaltlanguage = $this->element;
-		if ($this->element == 'societe')
-		{
+		if ($this->element == 'societe') {
 			$thirdpartyid = $this->id;
 		}
-		if ($this->element == 'contact')
-		{
+		if ($this->element == 'contact') {
 			$contactid = $this->id;
 			$thirdpartyid = $object->fk_soc;
 		}
-		if ($this->element == 'user')
-		{
+		if ($this->element == 'user') {
 			$contactid = $this->contact_id;
 			$thirdpartyid = $object->fk_soc;
 		}
@@ -773,46 +770,51 @@ abstract class CommonObject
 
 		if (!empty($this->phone) || !empty($this->phone_pro) || !empty($this->phone_mobile) || !empty($this->phone_perso) || !empty($this->fax) || !empty($this->office_phone) || !empty($this->user_mobile) || !empty($this->office_fax)) $out .= ($outdone ? '<br>' : '');
 		if (!empty($this->phone) && empty($this->phone_pro)) {		// For objects that store pro phone into ->phone
-			$out .= dol_print_phone($this->phone, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;
+			$out .= dol_print_phone($this->phone, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro"));
+			$outdone++;
 		}
 		if (!empty($this->phone_pro)) {
-			$out .= dol_print_phone($this->phone_pro, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;
+			$out .= dol_print_phone($this->phone_pro, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro"));
+			$outdone++;
 		}
 		if (!empty($this->phone_mobile)) {
-			$out .= dol_print_phone($this->phone_mobile, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'mobile', $langs->trans("PhoneMobile")); $outdone++;
+			$out .= dol_print_phone($this->phone_mobile, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'mobile', $langs->trans("PhoneMobile"));
+			$outdone++;
 		}
 		if (!empty($this->phone_perso)) {
-			$out .= dol_print_phone($this->phone_perso, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePerso")); $outdone++;
+			$out .= dol_print_phone($this->phone_perso, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePerso"));
+			$outdone++;
 		}
 		if (!empty($this->office_phone)) {
-			$out .= dol_print_phone($this->office_phone, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;
+			$out .= dol_print_phone($this->office_phone, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro"));
+			$outdone++;
 		}
 		if (!empty($this->user_mobile)) {
-			$out .= dol_print_phone($this->user_mobile, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'mobile', $langs->trans("PhoneMobile")); $outdone++;
+			$out .= dol_print_phone($this->user_mobile, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'mobile', $langs->trans("PhoneMobile"));
+			$outdone++;
 		}
 		if (!empty($this->fax)) {
-			$out .= dol_print_phone($this->fax, $this->country_code, $contactid, $thirdpartyid, 'AC_FAX', '&nbsp;', 'fax', $langs->trans("Fax")); $outdone++;
+			$out .= dol_print_phone($this->fax, $this->country_code, $contactid, $thirdpartyid, 'AC_FAX', '&nbsp;', 'fax', $langs->trans("Fax"));
+			$outdone++;
 		}
 		if (!empty($this->office_fax)) {
-			$out .= dol_print_phone($this->office_fax, $this->country_code, $contactid, $thirdpartyid, 'AC_FAX', '&nbsp;', 'fax', $langs->trans("Fax")); $outdone++;
+			$out .= dol_print_phone($this->office_fax, $this->country_code, $contactid, $thirdpartyid, 'AC_FAX', '&nbsp;', 'fax', $langs->trans("Fax"));
+			$outdone++;
 		}
 
 		if ($out) $out .= '<div style="clear: both;"></div>';
 		$outdone = 0;
-		if (!empty($this->email))
-		{
+		if (!empty($this->email)) {
 			$out .= dol_print_email($this->email, $this->id, $object->id, 'AC_EMAIL', 0, 0, 1);
 			$outdone++;
 		}
-		if (!empty($this->url))
-		{
+		if (!empty($this->url)) {
 			//$out.=dol_print_url($this->url,'_goout',0,1);//steve changed to blank
 			$out .= dol_print_url($this->url, '_blank', 0, 1);
 			$outdone++;
 		}
 
-		if (!empty($conf->socialnetworks->enabled))
-		{
+		if (!empty($conf->socialnetworks->enabled)) {
 			$outsocialnetwork = '';
 
 			if (is_array($this->socialnetworks) && count($this->socialnetworks) > 0) {
@@ -823,7 +825,7 @@ abstract class CommonObject
 					}
 					$outdone++;
 				}
-			} else {	// Old code
+			} else {	// Old code to remove
 				if ($this->skype) $outsocialnetwork .= dol_print_socialnetworks($this->skype, $this->id, $object->id, 'skype');
 				$outdone++;
 				if ($this->jabberid) $outsocialnetwork .= dol_print_socialnetworks($this->jabberid, $this->id, $object->id, 'jabber');

From 4c09e14c49443db54a76744b85d501afa6c87486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sun, 13 Dec 2020 10:32:23 +0100
Subject: [PATCH 392/888] fix sql error

---
 .../mysql/tables/llx_intracommreport.sql      |   1 -
 .../class/intracommreport.class.php           |  96 +++++---
 htdocs/intracommreport/list.php               | 228 +++++++++++-------
 3 files changed, 195 insertions(+), 130 deletions(-)

diff --git a/htdocs/install/mysql/tables/llx_intracommreport.sql b/htdocs/install/mysql/tables/llx_intracommreport.sql
index 9d89320c1fa..d3d2956e4ab 100644
--- a/htdocs/install/mysql/tables/llx_intracommreport.sql
+++ b/htdocs/install/mysql/tables/llx_intracommreport.sql
@@ -20,7 +20,6 @@
 create table llx_intracommreport
 (
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
-  
   ref				varchar(30)        NOT NULL,			-- report reference number
   entity			integer  DEFAULT 1 NOT NULL,			-- multi company id
   type_declaration	varchar(32),
diff --git a/htdocs/intracommreport/class/intracommreport.class.php b/htdocs/intracommreport/class/intracommreport.class.php
index 13df902d9b8..3603aa86478 100644
--- a/htdocs/intracommreport/class/intracommreport.class.php
+++ b/htdocs/intracommreport/class/intracommreport.class.php
@@ -65,7 +65,7 @@ class IntracommReport extends CommonObject
 	 */
 	const TYPE_DES = 1;
 
-	static $type = array(
+	public static $type = array(
 		'introduction'=>'Introduction'
 		,'expedition'=>'Expédition'
 	);
@@ -117,8 +117,11 @@ class IntracommReport extends CommonObject
 		$declaration = $enveloppe->addChild('Declaration');
 		$declaration->addChild('declarationId', $id_declaration);
 		$declaration->addChild('referencePeriod', $period_reference);
-		if ($conf->global->INTRACOMMREPORT_TYPE_ACTEUR === 'PSI') $psiId = $party_id;
-		else $psiId = 'NA';
+		if ($conf->global->INTRACOMMREPORT_TYPE_ACTEUR === 'PSI') {
+			$psiId = $party_id;
+		} else {
+			$psiId = 'NA';
+		}
 		$declaration->addChild('PSIId', $psiId);
 		$function = $declaration->addChild('Function');
 		$functionCode = $function->addChild('functionCode', $mode);
@@ -133,8 +136,11 @@ class IntracommReport extends CommonObject
 
 		$this->errors = array_unique($this->errors);
 
-		if (!empty($res)) return $e->asXML();
-		else return 0;
+		if (!empty($res)) {
+			return $e->asXML();
+		} else {
+			return 0;
+		}
 	}
 
 	/**
@@ -163,18 +169,21 @@ class IntracommReport extends CommonObject
 
 		$this->errors = array_unique($this->errors);
 
-		if (!empty($res)) return $e->asXML();
-		else return 0;
+		if (!empty($res)) {
+			return $e->asXML();
+		} else {
+			return 0;
+		}
 	}
 
 	/**
 	 *  Add line from invoice
 	 *
-	 *  @param      int		$declaration		Reference declaration
-	 *  @param      string	$type				Declaration type by default - introduction or expedition (always 'expedition' for Des)
-	 *  @param      int		$period_reference	Reference period
-	 *  @param      string	$exporttype	    	deb=DEB, des=DES
-	 *  @return     int       			  		<0 if KO, >0 if OK
+	 *  @param	SimpleXMLElement	$declaration		Reference declaration
+	 *  @param	string				$type				Declaration type by default - introduction or expedition (always 'expedition' for Des)
+	 *  @param	int					$period_reference	Reference period
+	 *  @param	string				$exporttype	    	deb=DEB, des=DES
+	 *  @return	int       			  					<0 if KO, >0 if OK
 	 */
 	public function addItemsFact(&$declaration, $type, $period_reference, $exporttype = 'deb')
 	{
@@ -201,8 +210,7 @@ class IntracommReport extends CommonObject
 			}
 
 			while ($res = $this->db->fetch_object($resql)) {
-				if ($exporttype == 'des')
-				{
+				if ($exporttype == 'des') {
 					$this->addItemXMlDes($declaration, $res, $i);
 				} else {
 					if (empty($res->fk_pays)) {
@@ -211,16 +219,22 @@ class IntracommReport extends CommonObject
 					} else {
 						if ($conf->global->INTRACOMMREPORT_CATEG_FRAISDEPORT > 0 && $categ_fraisdeport->containsObject('product', $res->id_prod)) {
 							$TLinesFraisDePort[] = $res;
-						} else $this->addItemXMl($declaration, $res, $i, '');
+						} else {
+							$this->addItemXMl($declaration, $res, $i, '');
+						}
 					}
 				}
 
 				$i++;
 			}
 
-			if (!empty($TLinesFraisDePort)) $this->addItemFraisDePort($declaration, $TLinesFraisDePort, $type, $categ_fraisdeport, $i);
+			if (!empty($TLinesFraisDePort)) {
+				$this->addItemFraisDePort($declaration, $TLinesFraisDePort, $type, $categ_fraisdeport, $i);
+			}
 
-			if (count($this->errors) > 0) return 0;
+			if (count($this->errors) > 0) {
+				return 0;
+			}
 		}
 
 		return 1;
@@ -244,8 +258,7 @@ class IntracommReport extends CommonObject
 			$table_extraf = 'facture_extrafields';
 			$tabledet = 'facturedet';
 			$field_link = 'fk_facture';
-		}
-		else { // Introduction
+		} else { // Introduction
 			$sql = 'SELECT f.ref_supplier as facnumber, f.total_ht';
 			$table = 'facture_fourn';
 			$table_extraf = 'facture_fourn_extrafields';
@@ -275,21 +288,26 @@ class IntracommReport extends CommonObject
 	/**
 	 *	Add item for DEB
 	 *
-	 * 	@param      int		$declaration		Reference declaration
-	 * 	@param      int		$res				Result of request SQL
-	 *  @param      int		$i					Line Id
-	 * 	@param      string	$code_douane_spe	Specific customs authorities code
-	 *  @return     void
+	 * 	@param	SimpleXMLElement	$declaration		Reference declaration
+	 * 	@param	Resource			$res				Result of request SQL
+	 *  @param	int					$i					Line Id
+	 * 	@param	string				$code_douane_spe	Specific customs authorities code
+	 *  @return	void
 	 */
 	public function addItemXMl(&$declaration, &$res, $i, $code_douane_spe = '')
 	{
 		$item = $declaration->addChild('Item');
 		$item->addChild('ItemNumber', $i);
 		$cn8 = $item->addChild('CN8');
-		if (empty($code_douane_spe)) $code_douane = $res->customcode;
-		else $code_douane = $code_douane_spe;
+		if (empty($code_douane_spe)) {
+			$code_douane = $res->customcode;
+		} else {
+			$code_douane = $code_douane_spe;
+		}
 		$cn8->addChild('CN8Code', $code_douane);
-		if (!empty($res->tva_intra)) $item->addChild('partnerId', $res->tva_intra);
+		if (!empty($res->tva_intra)) {
+			$item->addChild('partnerId', $res->tva_intra);
+		}
 		$item->addChild('MSConsDestCode', $res->code); // code iso pays client
 		$item->addChild('netMass', $res->weight * $res->qty); // Poids du produit
 		$item->addChild('quantityInSU', $res->qty); // Quantité de produit dans la ligne
@@ -306,10 +324,10 @@ class IntracommReport extends CommonObject
 	/**
 	 *	Add item for DES
 	 *
-	 * 	@param      int		$declaration		Reference declaration
-	 * 	@param      int		$res				Result of request SQL
-	 *  @param      int		$i					Line Id
-	 *  @return     void
+	 * 	@param	SimpleXMLElement	$declaration		Reference declaration
+	 * 	@param	esurce				$res				Result of request SQL
+	 *  @param	int					$i					Line Id
+	 *  @return	void
 	 */
 	public function addItemXMlDes($declaration, &$res, $i)
 	{
@@ -322,12 +340,12 @@ class IntracommReport extends CommonObject
 	/**
 	 *	This function adds an item by retrieving the customs code of the product with the highest amount in the invoice
 	 *
-	 * 	@param      int		    $declaration		Reference declaration
-	 * 	@param      int		    $TLinesFraisDePort	Data of shipping costs line
-	 *  @param      string	    $type				Declaration type by default - introduction or expedition (always 'expedition' for Des)
-	 *  @param      Categorie	$categ_fraisdeport	category of shipping costs
-	 *  @param      int		    $i					Line Id
-	 *  @return     void
+	 * 	@param	SimpleXMLElement	$declaration		Reference declaration
+	 * 	@param	array				$TLinesFraisDePort	Data of shipping costs line
+	 *  @param	string	    		$type				Declaration type by default - introduction or expedition (always 'expedition' for Des)
+	 *  @param	Categorie			$categ_fraisdeport	category of shipping costs
+	 *  @param	int		    		$i					Line Id
+	 *  @return	void
 	 */
 	public function addItemFraisDePort(&$declaration, &$TLinesFraisDePort, $type, &$categ_fraisdeport, $i)
 	{
@@ -386,7 +404,9 @@ class IntracommReport extends CommonObject
 	public function getNextDeclarationNumber()
 	{
 		$resql = $this->db->query('SELECT MAX(numero_declaration) as max_declaration_number FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE exporttype="'.$this->exporttype.'"');
-		if ($resql) $res = $this->db->fetch_object($resql);
+		if ($resql) {
+			$res = $this->db->fetch_object($resql);
+		}
 
 		return ($res->max_declaration_number + 1);
 	}
diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php
index a8703b7407d..1530e07d84e 100644
--- a/htdocs/intracommreport/list.php
+++ b/htdocs/intracommreport/list.php
@@ -50,17 +50,31 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = (GETPOST("page", 'int') ?GETPOST("page", 'int') : 0);
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = "i.ref";
-if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) {
+	$sortfield = "i.ref";
+}
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
 
 // Initialize context for list
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'intracommreportlist';
-if ((string) $type == '1') { $contextpage = 'DESlist'; if ($search_type == '') $search_type = '1'; }
-if ((string) $type == '0') { $contextpage = 'DEBlist'; if ($search_type == '') $search_type = '0'; }
+if ((string) $type == '1') {
+	$contextpage = 'DESlist'; if ($search_type == '') {
+		$search_type = '1';
+	}
+}
+if ((string) $type == '0') {
+	$contextpage = 'DEBlist'; if ($search_type == '') {
+		$search_type = '0';
+	}
+}
 
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks
 $object = new IntracommReport($db);
@@ -74,13 +88,14 @@ $extralabels = $extrafields->fetch_name_optionals_label('intracommreport');
 $search_array_options=$extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 */
 
-if (empty($action)) $action = 'list';
+if (empty($action)) {
+	$action = 'list';
+}
 
 // Get object canvas (By default, this is not defined, so standard usage of dolibarr)
 $canvas = GETPOST("canvas");
 $objcanvas = null;
-if (!empty($canvas))
-{
+if (!empty($canvas)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
 	$objcanvas = new Canvas($db, $action);
 	$objcanvas->getCanvas('product', 'list', $canvas);
@@ -114,11 +129,11 @@ $arrayfields = array(
 // Extra fields
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']))
 {
-    foreach($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-    {
-        if (! empty($extrafields->attributes[$object->table_element]['list'][$key]))
-            $arrayfields["ef.".$key]=array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key]<0)?0:1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key])!=3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-    }
+	foreach($extrafields->attributes[$object->table_element]['label'] as $key => $val)
+	{
+		if (! empty($extrafields->attributes[$object->table_element]['list'][$key]))
+			$arrayfields["ef.".$key]=array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key]<0)?0:1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key])!=3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
+	}
 }
 */
 $object->fields = dol_sort_array($object->fields, 'position');
@@ -130,21 +145,25 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	// Selection of new fields
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 		$sall = "";
 		$search_ref = "";
 		$search_label = "";
@@ -156,8 +175,12 @@ if (empty($reshook))
 
 	// Mass actions
 	$objectclass = 'Product';
-	if ((string) $search_type == '1') { $objectlabel = 'Services'; }
-	if ((string) $search_type == '0') { $objectlabel = 'Products'; }
+	if ((string) $search_type == '1') {
+		$objectlabel = 'Services';
+	}
+	if ((string) $search_type == '0') {
+		$objectlabel = 'Products';
+	}
 
 	$permtoread = $user->rights->produit->lire;
 	$permtodelete = $user->rights->produit->supprimer;
@@ -173,11 +196,11 @@ $formother = new FormOther($db);
 
 $title = $langs->trans('IntracommReportList'.$type);
 
-$sql = 'SELECT DISTINCT i.rowid, i.type_declaration, i.type_export, i.period, i.mode, i.entity';
+$sql = 'SELECT DISTINCT i.rowid, i.type_declaration, i.type_export, i.periods, i.mode, i.entity';
 /*
 // Add fields from extrafields
 if (! empty($extrafields->attributes[$object->table_element]['label'])) {
-    foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
 }
 */
 // Add fields from hooks
@@ -191,12 +214,16 @@ $sql .= ' FROM '.MAIN_DB_PREFIX.'intracommreport as i';
 
 $sql .= ' WHERE i.entity IN ('.getEntity('intracommreport').')';
 
-if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
+if ($sall) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
+}
 // if the type is not 1, we show all products (type = 0,2,3)
-if (dol_strlen($search_type) && $search_type != '-1')
-{
-	if ($search_type == 1) $sql .= " AND i.type = 1";
-	else $sql .= " AND i.type = 0";
+if (dol_strlen($search_type) && $search_type != '-1') {
+	if ($search_type == 1) {
+		$sql .= " AND i.type = 1";
+	} else {
+		$sql .= " AND i.type = 0";
+	}
 }
 
 /*
@@ -222,7 +249,7 @@ $sql .= " GROUP BY i.rowid";
 /*
 // Add fields from extrafields
 if (! empty($extrafields->attributes[$object->table_element]['label'])) {
-    foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key : '');
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key : '');
 }
 */
 
@@ -234,12 +261,10 @@ $sql .= $hookmanager->resPrint;
 $sql .= $db->order($sortfield, $sortorder);
 
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-	{
+	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
@@ -249,8 +274,7 @@ $sql .= $db->plimit($limit + 1, $offset);
 
 $resql = $db->query($sql);
 
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 
 	$arrayofselected = is_array($toselect) ? $toselect : array();
@@ -264,11 +288,21 @@ if ($resql)
 	}
 
 	$param = '';
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	if ($sall) $param .= "&sall=".urlencode($sall);
-	if ($search_ref) $param = "&search_ref=".urlencode($search_ref);
-	if ($search_label) $param .= "&search_label=".urlencode($search_label);
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		$param .= '&contextpage='.urlencode($contextpage);
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.urlencode($limit);
+	}
+	if ($sall) {
+		$param .= "&sall=".urlencode($sall);
+	}
+	if ($search_ref) {
+		$param = "&search_ref=".urlencode($search_ref);
+	}
+	if ($search_label) {
+		$param .= "&search_label=".urlencode($search_label);
+	}
 
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -279,18 +313,23 @@ if ($resql)
 		//'builddoc'=>$langs->trans("PDFMerge"),
 		//'presend'=>$langs->trans("SendByMail"),
 	);
-	if ($user->rights->intracommreport->delete) $arrayofmassactions['predelete'] = "<span class='fa fa-trash paddingrightonly'></span>".$langs->trans("Delete");
-	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+	if ($user->rights->intracommreport->delete) {
+		$arrayofmassactions['predelete'] = "<span class='fa fa-trash paddingrightonly'></span>".$langs->trans("Delete");
+	}
+	if (in_array($massaction, array('presend', 'predelete'))) {
+		$arrayofmassactions = array();
+	}
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 	$newcardbutton = '';
-	if ($user->rights->intracommreport->write)
-	{
+	if ($user->rights->intracommreport->write) {
 		$newcardbutton .= dolGetButtonTitle($langs->trans("NewDeclaration"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/intracommreport/card.php?action=create&amp;type='.$type);
 	}
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') {
+		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	}
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
@@ -298,7 +337,9 @@ if ($resql)
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="type" value="'.$type.'">';
-	if (empty($arrayfields['i.fk_product_type']['checked'])) print '<input type="hidden" name="search_type" value="'.dol_escape_htmltag($search_type).'">';
+	if (empty($arrayfields['i.fk_product_type']['checked'])) {
+		print '<input type="hidden" name="search_type" value="'.dol_escape_htmltag($search_type).'">';
+	}
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_products.png', 0, $newcardbutton, '', $limit);
 
@@ -308,19 +349,22 @@ if ($resql)
 	$trackid = 'prod'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-	if ($sall)
-	{
-		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	if ($sall) {
+		foreach ($fieldstosearchall as $key => $val) {
+			$fieldstosearchall[$key] = $langs->trans($val);
+		}
 		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 	}
 
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
-	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
-	else $moreforfilter = $hookmanager->resPrint;
+	if (empty($reshook)) {
+		$moreforfilter .= $hookmanager->resPrint;
+	} else {
+		$moreforfilter = $hookmanager->resPrint;
+	}
 
-	if ($moreforfilter)
-	{
+	if ($moreforfilter) {
 		print '<div class="liste_titre liste_titre_bydiv centpercent">';
 		print $moreforfilter;
 		print '</div>';
@@ -328,37 +372,37 @@ if ($resql)
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
-	if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+	if ($massactionbutton) {
+		$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+	}
 
 	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	// Lines with input filters
 	print '<tr class="liste_titre_filter">';
-	if (!empty($arrayfields['i.ref']['checked']))
-	{
+	if (!empty($arrayfields['i.ref']['checked'])) {
 		print '<td class="liste_titre left">';
 		print '<input class="flat" type="text" name="search_ref" size="8" value="'.dol_escape_htmltag($search_ref).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['i.label']['checked']))
-	{
+	if (!empty($arrayfields['i.label']['checked'])) {
 		print '<td class="liste_titre left">';
 		print '<input class="flat" type="text" name="search_label" size="12" value="'.dol_escape_htmltag($search_label).'">';
 		print '</td>';
 	}
 	// Type
 	// Type (customer/prospect/supplier)
-	if (!empty($arrayfields['customerorsupplier']['checked']))
-	{
+	if (!empty($arrayfields['customerorsupplier']['checked'])) {
 		print '<td class="liste_titre maxwidthonsmartphone center">';
-		if ($type != '') print '<input type="hidden" name="type" value="'.$type.'">';
+		if ($type != '') {
+			print '<input type="hidden" name="type" value="'.$type.'">';
+		}
 		print $formcompany->selectProspectCustomerType($search_type, 'search_type', 'search_type', 'list');
 		print '</select></td>';
 	}
 
-	if (!empty($arrayfields['i.fk_product_type']['checked']))
-	{
+	if (!empty($arrayfields['i.fk_product_type']['checked'])) {
 		print '<td class="liste_titre left">';
 		$array = array('-1'=>'&nbsp;', '0'=>$langs->trans('Product'), '1'=>$langs->trans('Service'));
 		print $form->selectarray('search_type', $array, $search_type);
@@ -366,22 +410,20 @@ if ($resql)
 	}
 
 	/*
-    // Extra fields
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
-    */
+	// Extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
+	*/
 	// Fields from hook
 	$parameters = array('arrayfields'=>$arrayfields);
 	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
-	if (!empty($arrayfields['i.datec']['checked']))
-	{
+	if (!empty($arrayfields['i.datec']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Date modification
-	if (!empty($arrayfields['i.tms']['checked']))
-	{
+	if (!empty($arrayfields['i.tms']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
@@ -404,9 +446,9 @@ if ($resql)
 	}
 
 	/*
-    // Extra fields
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
-    */
+	// Extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+	*/
 	// Hook fields
 	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
@@ -426,8 +468,7 @@ if ($resql)
 
 	$i = 0;
 	$totalarray = array();
-	while ($i < min($num, $limit))
-	{
+	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($resql);
 
 		$intracommreport_static->id = $obj->rowid;
@@ -443,35 +484,41 @@ if ($resql)
 		print '<tr class="oddeven">';
 
 		// Ref
-		if (!empty($arrayfields['i.ref']['checked']))
-		{
+		if (!empty($arrayfields['i.ref']['checked'])) {
 			print '<td class="tdoverflowmax200">';
 			print $intracommreport_static->getNomUrl(1);
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Label
-		if (!empty($arrayfields['i.label']['checked']))
-		{
+		if (!empty($arrayfields['i.label']['checked'])) {
 			print '<td class="tdoverflowmax200">'.dol_trunc($obj->label, 80).'</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Type
-		if (!empty($arrayfields['i.fk_product_type']['checked']))
-		{
+		if (!empty($arrayfields['i.fk_product_type']['checked'])) {
 			print '<td>'.$obj->fk_product_type.'</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Action
 		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		{
+		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 			$selected = 0;
-			if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+			if (in_array($obj->rowid, $arrayofselected)) {
+				$selected = 1;
+			}
 			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
 		print "</tr>\n";
 		$i++;
@@ -482,8 +529,7 @@ if ($resql)
 	print "</table>";
 	print "</div>";
 	print '</form>';
-}
-else {
+} else {
 	dol_print_error($db);
 }
 

From 203fc77e9f37989e2c02f008356bf574ab866c19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sun, 13 Dec 2020 10:33:59 +0100
Subject: [PATCH 393/888] clean

---
 htdocs/intracommreport/class/intracommreport.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/intracommreport/class/intracommreport.class.php b/htdocs/intracommreport/class/intracommreport.class.php
index 3603aa86478..d1145dcf806 100644
--- a/htdocs/intracommreport/class/intracommreport.class.php
+++ b/htdocs/intracommreport/class/intracommreport.class.php
@@ -66,8 +66,8 @@ class IntracommReport extends CommonObject
 	const TYPE_DES = 1;
 
 	public static $type = array(
-		'introduction'=>'Introduction'
-		,'expedition'=>'Expédition'
+		'introduction'=>'Introduction',
+		'expedition'=>'Expédition'
 	);
 
 	/**
@@ -131,7 +131,7 @@ class IntracommReport extends CommonObject
 		/********************************************************************/
 
 		/**************Ajout des lignes de factures**************************/
-		$res = self::addItemsFact($declaration, $type, $period_reference);
+		$res = $this->addItemsFact($declaration, $type, $period_reference);
 		/********************************************************************/
 
 		$this->errors = array_unique($this->errors);

From 2a9d38575db67a054282a79cbcd4953d51387f55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sun, 13 Dec 2020 10:51:12 +0100
Subject: [PATCH 394/888] add work

---
 htdocs/intracommreport/card.php | 233 ++++++++++++++++----------------
 1 file changed, 118 insertions(+), 115 deletions(-)

diff --git a/htdocs/intracommreport/card.php b/htdocs/intracommreport/card.php
index 668eca12674..f0a4bd5f070 100644
--- a/htdocs/intracommreport/card.php
+++ b/htdocs/intracommreport/card.php
@@ -30,54 +30,57 @@ $langs->loadLangs(array("intracommreport"));
 
 $action = GETPOST('action');
 $exporttype = GETPOST('exporttype'); // DEB ou DES
-if (empty($exporttype)) $exporttype = 'deb';
+if (empty($exporttype)) {
+	$exporttype = 'deb';
+}
 
 $form = new Form($db);
 $formother = new FormOther($db);
 $year = GETPOST('year');
 $month = GETPOST('month');
-$type_declaration = GETPOST('type');
+$label = (string) GETPOST('label', 'alphanohtml');
+$type_declaration = GETPOSTINT('type');
 $backtopage = GETPOST('backtopage', 'alpha');
+$declaration = array(
+	"deb" => $langs->trans("DEB"),
+	"des" => $langs->trans("DES"),
+);
 
 /*
  * 	Actions
  */
 
-if ($user->rights->intracommreport->delete && $action == 'confirm_delete' && $confirm == 'yes')
-{
+if ($user->rights->intracommreport->delete && $action == 'confirm_delete' && $confirm == 'yes') {
 	$result = $object->delete($id, $user);
-	if ($result > 0)
-	{
-		if (!empty($backtopage))
-		{
+	if ($result > 0) {
+		if (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
-		}
-		else {
+		} else {
 			header("Location: list.php");
 			exit;
 		}
-	}
-	else {
+	} else {
 		$errmesg = $object->error;
 	}
 }
 
 if ($action == 'add' && $user->rights->intracommreport->write) {
 	$object->label = trim($label);
-	$object->type               = trim($type);
-	$object->type_declaration   = (int) $statut;
-	$object->subscription       = (int) $subscription;
+	$object->type = trim($exporttype);
+	$object->type_declaration =  $type_declaration;
+	$object->subscription = (int) $subscription;
 
 	// Fill array 'array_options' with data from add form
 	$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
-	if ($ret < 0) $error++;
+	if ($ret < 0) {
+		$error++;
+	}
 
 	if (empty($object->label)) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
-	}
-	else {
+	} else {
 		$sql = "SELECT libelle FROM ".MAIN_DB_PREFIX."adherent_type WHERE libelle='".$db->escape($object->label)."'";
 		$result = $db->query($sql);
 		if ($result) {
@@ -90,20 +93,16 @@ if ($action == 'add' && $user->rights->intracommreport->write) {
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$id = $object->create($user);
-		if ($id > 0)
-		{
+		if ($id > 0) {
 			header("Location: ".$_SERVER["PHP_SELF"]);
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'create';
 		}
-	}
-	else {
+	} else {
 		$action = 'create';
 	}
 }
@@ -113,15 +112,14 @@ if ($action == 'add' && $user->rights->intracommreport->write) {
  */
 
 // Creation mode
-if ($action == 'create')
-{
+if ($action == 'create') {
 	$title = $langs->trans("IntracommReportTitle");
 	llxHeader("", $title);
 	print load_fiche_titre($langs->trans("IntracommReportTitle"));
 
 	print '<form name="charge" method="post" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="action" value="export" />';
+	print '<input type="hidden" name="action" value="add" />';
 
 	print dol_get_fiche_head();
 
@@ -131,10 +129,8 @@ if ($action == 'create')
 	print '<tr><td class="titlefieldcreate">'.$langs->trans("Label").'</td><td><input type="text" class="minwidth200" name="label" autofocus="autofocus"></td></tr>';
 
 	// Declaration
-	$declaration["deb"] = $langs->trans("DEB");
-	$declaration["des"] = $langs->trans("DES");
 	print '<tr><td class="fieldrequired">'.$langs->trans("Declaration")."</td><td>\n";
-	print $form->selectarray("declaration", $declaration, GETPOST('declaration', 'alpha') ?GETPOST('declaration', 'alpha') : $object->declaration, 0);
+	print $form->selectarray("declaration", $declaration, GETPOST('declaration', 'alpha') ? GETPOST('declaration', 'alpha') : $object->declaration, 0);
 	print "</td>\n";
 
 	// Analysis period
@@ -179,8 +175,8 @@ if ($id > 0 && $action != 'edit') {
 	}
 
 	/*
-     * Show tabs
-     */
+	 * Show tabs
+	 */
 	$head = intracommreport_prepare_head($object);
 
 	print dol_get_fiche_head($head, 'general', $langs->trans("IntracommReport"), -1, 'user');
@@ -195,8 +191,15 @@ if ($id > 0 && $action != 'edit') {
 				'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"])
 			);
 		}
-		print $form->formconfirm("card.php?rowid=".$id, $langs->trans("DeleteReport"),
-			$langs->trans("ConfirmDeleteReport"), "confirm_delete", $formquestion, 'no', 1);
+		print $form->formconfirm(
+			"card.php?rowid=".$id,
+			$langs->trans("DeleteReport"),
+			$langs->trans("ConfirmDeleteReport"),
+			"confirm_delete",
+			$formquestion,
+			'no',
+			1
+		);
 	}
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/intracommreport/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
@@ -229,101 +232,101 @@ if ($id > 0 && $action != 'edit') {
 }
 
 	/*
-    switch($action) {
-        case 'generateXML':
-            $obj = new TDebProdouane($PDOdb);
-            $obj->load($PDOdb, GETPOST('id_declaration'));
-            $obj->generateXMLFile();
-            break;
-        case 'list':
-            _liste($exporttype);
-            break;
-        case 'export':
-            if ($exporttype == 'deb') _export_xml_deb($type_declaration, $year, str_pad($month, 2, 0, STR_PAD_LEFT));
-            else _export_xml_des($type_declaration, $year, str_pad($month, 2, 0, STR_PAD_LEFT));
-        default:
-            if ($exporttype == 'deb') _print_form_deb();
-            else _print_form_des();
-            break;
-    }
+	switch($action) {
+		case 'generateXML':
+			$obj = new TDebProdouane($PDOdb);
+			$obj->load($PDOdb, GETPOST('id_declaration'));
+			$obj->generateXMLFile();
+			break;
+		case 'list':
+			_liste($exporttype);
+			break;
+		case 'export':
+			if ($exporttype == 'deb') _export_xml_deb($type_declaration, $year, str_pad($month, 2, 0, STR_PAD_LEFT));
+			else _export_xml_des($type_declaration, $year, str_pad($month, 2, 0, STR_PAD_LEFT));
+		default:
+			if ($exporttype == 'deb') _print_form_deb();
+			else _print_form_des();
+			break;
+	}
 
-    function _print_form_des()
-    {
-        global $langs, $formother, $year, $month, $type_declaration;
+	function _print_form_des()
+	{
+		global $langs, $formother, $year, $month, $type_declaration;
 
-        $title = $langs->trans("IntracommReportDESTitle");
-        llxHeader("", $title);
-        print load_fiche_titre($langs->trans("IntracommReportDESTitle"));
+		$title = $langs->trans("IntracommReportDESTitle");
+		llxHeader("", $title);
+		print load_fiche_titre($langs->trans("IntracommReportDESTitle"));
 
-        print dol_get_fiche_head();
+		print dol_get_fiche_head();
 
-        print '<form action="'.$_SERVER['PHP_SELF'].'" name="save" method="POST">';
-        print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<input type="hidden" name="action" value="export" />';
-        print '<input type="hidden" name="exporttype" value="des" />';
-        print '<input type="hidden" name="type" value="expedition" />'; // Permet d'utiliser le bon select de la requête sql
+		print '<form action="'.$_SERVER['PHP_SELF'].'" name="save" method="POST">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="action" value="export" />';
+		print '<input type="hidden" name="exporttype" value="des" />';
+		print '<input type="hidden" name="type" value="expedition" />'; // Permet d'utiliser le bon select de la requête sql
 
-        print '<table width="100%" class="noborder">';
+		print '<table width="100%" class="noborder">';
 
-        print '<tr class="liste_titre"><td colspan="2">';
-        print 'Paramètres de l\'export';
-        print '</td></tr>';
+		print '<tr class="liste_titre"><td colspan="2">';
+		print 'Paramètres de l\'export';
+		print '</td></tr>';
 
-        print '<tr>';
-        print '<td>Période d\'analyse</td>';
-        print '<td>';
-        $TabMonth = array();
-        for($i=1;$i<=12;$i++) $TabMonth[$i] = $langs->trans('Month'.str_pad($i, 2, 0, STR_PAD_LEFT));
-        //print $ATMform->combo('','month', $TabMonth, empty($month) ? date('m') : $month);
-        print $formother->selectyear(empty($year) ? date('Y') : $year,'year',0, 20, 5);
-        print '</td>';
-        print '</tr>';
+		print '<tr>';
+		print '<td>Période d\'analyse</td>';
+		print '<td>';
+		$TabMonth = array();
+		for($i=1;$i<=12;$i++) $TabMonth[$i] = $langs->trans('Month'.str_pad($i, 2, 0, STR_PAD_LEFT));
+		//print $ATMform->combo('','month', $TabMonth, empty($month) ? date('m') : $month);
+		print $formother->selectyear(empty($year) ? date('Y') : $year,'year',0, 20, 5);
+		print '</td>';
+		print '</tr>';
 
-        print '</table>';
+		print '</table>';
 
-        print '<div class="tabsAction">';
-        print '<input class="butAction" type="submit" value="Exporter XML" />';
-        print '</div>';
+		print '<div class="tabsAction">';
+		print '<input class="butAction" type="submit" value="Exporter XML" />';
+		print '</div>';
 
-        print '</form>';
-    }
+		print '</form>';
+	}
 
-    function _export_xml_deb($type_declaration, $period_year, $period_month) {
+	function _export_xml_deb($type_declaration, $period_year, $period_month) {
 
-        global $db, $conf;
+		global $db, $conf;
 
-        $obj = new TDebProdouane($db);
-        $obj->entity = $conf->entity;
-        $obj->mode = 'O';
-        $obj->periode = $period_year.'-'.$period_month;
-        $obj->type_declaration = $type_declaration;
-        $obj->numero_declaration = $obj->getNextNumeroDeclaration();
-        $obj->content_xml = $obj->getXML('O', $type_declaration, $period_year.'-'.$period_month);
-        if(empty($obj->errors)) {
-            $obj->save($PDOdb);
-            $obj->generateXMLFile();
-        }
-        else setEventMessage($obj->errors, 'warnings');
-    }
+		$obj = new TDebProdouane($db);
+		$obj->entity = $conf->entity;
+		$obj->mode = 'O';
+		$obj->periode = $period_year.'-'.$period_month;
+		$obj->type_declaration = $type_declaration;
+		$obj->numero_declaration = $obj->getNextNumeroDeclaration();
+		$obj->content_xml = $obj->getXML('O', $type_declaration, $period_year.'-'.$period_month);
+		if(empty($obj->errors)) {
+			$obj->save($PDOdb);
+			$obj->generateXMLFile();
+		}
+		else setEventMessage($obj->errors, 'warnings');
+	}
 
-    function _export_xml_des($type_declaration, $period_year, $period_month) {
+	function _export_xml_des($type_declaration, $period_year, $period_month) {
 
-        global $PDOdb, $conf;
+		global $PDOdb, $conf;
 
-        $obj = new TDebProdouane($PDOdb);
-        $obj->entity = $conf->entity;
-        $obj->periode = $period_year.'-'.$period_month;
-        $obj->type_declaration = $type_declaration;
-        $obj->exporttype = 'des';
-        $obj->numero_declaration = $obj->getNextNumeroDeclaration();
-        $obj->content_xml = $obj->getXMLDes($period_year, $period_month, $type_declaration);
-        if(empty($obj->errors)) {
-            $obj->save($PDOdb);
-            $obj->generateXMLFile();
-        }
-        else setEventMessage($obj->errors, 'warnings');
-    }
-    */
+		$obj = new TDebProdouane($PDOdb);
+		$obj->entity = $conf->entity;
+		$obj->periode = $period_year.'-'.$period_month;
+		$obj->type_declaration = $type_declaration;
+		$obj->exporttype = 'des';
+		$obj->numero_declaration = $obj->getNextNumeroDeclaration();
+		$obj->content_xml = $obj->getXMLDes($period_year, $period_month, $type_declaration);
+		if(empty($obj->errors)) {
+			$obj->save($PDOdb);
+			$obj->generateXMLFile();
+		}
+		else setEventMessage($obj->errors, 'warnings');
+	}
+	*/
 
 // End of page
 llxFooter();

From 8a0d3e3f6f5c36a7dded2c8c07e5c532a0100c4c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 13 Dec 2020 12:38:47 +0100
Subject: [PATCH 395/888] Fix warning

---
 htdocs/blockedlog/class/blockedlog.class.php | 4 ++--
 htdocs/core/lib/functions.lib.php            | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index 633032a7ad9..3d6ae977c73 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -182,8 +182,8 @@ class BlockedLog
 		if ($conf->banque->enabled) $this->trackedevents['PAYMENT_VARIOUS_MODIFY'] = 'logPAYMENT_VARIOUS_MODIFY';
 		if ($conf->banque->enabled) $this->trackedevents['PAYMENT_VARIOUS_DELETE'] = 'logPAYMENT_VARIOUS_DELETE';
 
-		// $conf->global->BANK_ENABLE_POS_CASHCONTROL must be set to 1 by all POS modules
-		$moduleposenabled = ($conf->cashdesk->enabled || $conf->takepos->enabled || !empty($conf->global->BANK_ENABLE_POS_CASHCONTROL));
+		// $conf->global->BANK_ENABLE_POS_CASHCONTROL must be set to 1 by all external POS modules
+		$moduleposenabled = (!empty($conf->cashdesk->enabled) || !empty($conf->takepos->enabled) || !empty($conf->global->BANK_ENABLE_POS_CASHCONTROL));
 		if ($moduleposenabled) $this->trackedevents['CASHCONTROL_VALIDATE'] = 'logCASHCONTROL_VALIDATE';
 
 		if (!empty($conf->global->BLOCKEDLOG_ADD_ACTIONS_SUPPORTED)) {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 23c8d559e8a..784297b4bf9 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6530,9 +6530,9 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 		if ($onlykey != 2 || $mysoc->useLocalTax(1)) $substitutionarray['__AMOUNT_TAX2_FORMATED__']     = is_object($object) ? ($object->total_localtax1 ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';
 		if ($onlykey != 2 || $mysoc->useLocalTax(2)) $substitutionarray['__AMOUNT_TAX3_FORMATED__']     = is_object($object) ? ($object->total_localtax2 ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';
 
-		$substitutionarray['__AMOUNT_MULTICURRENCY__']          = is_object($object) ? $object->multicurrency_total_ttc : '';
-		$substitutionarray['__AMOUNT_MULTICURRENCY_TEXT__']     = is_object($object) ? dol_convertToWord($object->multicurrency_total_ttc, $outputlangs, '', true) : '';
-		$substitutionarray['__AMOUNT_MULTICURRENCY_TEXTCURRENCY__'] = is_object($object) ? dol_convertToWord($object->multicurrency_total_ttc, $outputlangs, $object->multicurrency_code, true) : '';
+		$substitutionarray['__AMOUNT_MULTICURRENCY__']          = (is_object($object) && isset($object->multicurrency_total_ttc)) ? $object->multicurrency_total_ttc : '';
+		$substitutionarray['__AMOUNT_MULTICURRENCY_TEXT__']     = (is_object($object) && isset($object->multicurrency_total_ttc)) ? dol_convertToWord($object->multicurrency_total_ttc, $outputlangs, '', true) : '';
+		$substitutionarray['__AMOUNT_MULTICURRENCY_TEXTCURRENCY__'] = (is_object($object) && isset($object->multicurrency_total_ttc)) ? dol_convertToWord($object->multicurrency_total_ttc, $outputlangs, $object->multicurrency_code, true) : '';
 		// TODO Add other keys for foreign multicurrency
 
 		// For backward compatibility

From 4aabf0f5053fdd82eb3c94e5ae232cdcd930b737 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 13 Dec 2020 12:44:51 +0100
Subject: [PATCH 396/888] We keep only english file

---
 build/makepack-dolibarr.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 17a935f6234..e347c889d17 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -476,6 +476,7 @@ if ($nboftargetok) {
 		$ret=`rm -f  $BUILDROOT/$PROJECT/build.xml`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/phpstan.neon`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/pom.xml`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/README-*.md`;
 		
 		$ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/build/Doli*-*`;

From 736875c088fe8decfaee8d021f4cf8c5cfc5d659 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 13 Dec 2020 13:02:42 +0100
Subject: [PATCH 397/888] Remove useless file

---
 INSTALL       | 6 ------
 composer.json | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 INSTALL

diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 584c3f04713..00000000000
--- a/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-INSTALL
--------
-
-English:     See README.md file.
-
-French:      Voir fichier README-FR.md.
diff --git a/composer.json b/composer.json
index a943fbe0aa3..bd81e101cfc 100644
--- a/composer.json
+++ b/composer.json
@@ -59,4 +59,4 @@
 		"ext-zip" : "ODT, Excel and file compression support",
 		"ext-xml" : "Excel support"
 	}
-}
+}
\ No newline at end of file

From 427fb16256c6be8d53b7c5e613fae01c1d53e167 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 13 Dec 2020 13:29:47 +0100
Subject: [PATCH 398/888] Fix warning

---
 htdocs/comm/propal/class/propal.class.php | 4 ++--
 htdocs/core/lib/functions.lib.php         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 5c4ed9e2edf..274c04b0698 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -654,8 +654,8 @@ class Propal extends CommonObject
 			$this->line->tva_tx = $txtva;
 			$this->line->localtax1_tx = ($total_localtax1 ? $localtaxes_type[1] : 0);
 			$this->line->localtax2_tx = ($total_localtax2 ? $localtaxes_type[3] : 0);
-			$this->line->localtax1_type = $localtaxes_type[0];
-			$this->line->localtax2_type = $localtaxes_type[2];
+			$this->line->localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
+			$this->line->localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
 			$this->line->fk_product = $fk_product;
 			$this->line->product_type = $type;
 			$this->line->fk_remise_except = $fk_remise_except;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c2a5aee862e..d5a0df38c19 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5037,8 +5037,8 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
    	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
    	$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($thirdparty_seller->country_code)."'";
    	$sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
-   	if ($vatratecode) $sql .= " AND t.code ='".$db->escape($vatratecode)."'"; // If we have the code, we use it in priority
-   	else $sql .= " AND t.recuperableonly ='".$db->escape($vatnpr)."'";
+   	if (!empty($vatratecode)) $sql .= " AND t.code ='".$db->escape($vatratecode)."'"; // If we have the code, we use it in priority
+   	else $sql .= " AND t.recuperableonly = '".$db->escape($vatnpr)."'";
    	dol_syslog("get_localtax", LOG_DEBUG);
    	$resql = $db->query($sql);
 

From 35b3d4f40a8c6b59d30274cb81b0662f68b56666 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 13 Dec 2020 14:11:04 +0100
Subject: [PATCH 399/888] FIX: Export FEC - Force Carriage Return Line Feed

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

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index a7183c70114..f0e428ea00e 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -665,7 +665,7 @@ class AccountancyExport
 	public function exportFEC($objectLines)
 	{
 		$separator = "\t";
-		$end_line = "\n";
+		$end_line = "\r\n";
 
 		print "JournalCode" . $separator;
 		print "JournalLib" . $separator;

From 3d33d3aa3a3f38bde860ef3e66d2f7d02c92e45f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 13 Dec 2020 13:34:21 +0100
Subject: [PATCH 400/888] Fix warning

---
 htdocs/blockedlog/class/blockedlog.class.php  | 16 ++-----
 htdocs/commande/class/commande.class.php      | 12 +++---
 htdocs/compta/facture/class/facture.class.php | 42 ++++++++++++-------
 htdocs/contrat/class/contrat.class.php        |  4 +-
 htdocs/core/class/commonobject.class.php      | 16 ++++---
 htdocs/expedition/class/expedition.class.php  |  7 ++--
 .../class/expensereport.class.php             |  8 ++--
 htdocs/fichinter/class/fichinter.class.php    |  8 ++--
 htdocs/projet/class/task.class.php            |  8 ++--
 test/phpunit/FactureTest.php                  |  7 ++--
 10 files changed, 76 insertions(+), 52 deletions(-)

diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index 3d6ae977c73..f6402ca3b04 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -18,16 +18,6 @@
  * See https://medium.com/@lhartikk/a-blockchain-in-200-lines-of-code-963cc1cc0e54
  */
 
-/*ini_set('unserialize_callback_func', 'mycallback');
-
-function mycallback($classname)
-{
-	//var_dump($classname);
-	include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-
-}*/
-
-
 
 /**
  *	Class to manage Blocked Log
@@ -454,7 +444,9 @@ class BlockedLog
 								'ref', 'multicurrency_code', 'multicurrency_total_ht', 'multicurrency_total_tva', 'multicurrency_total_ttc', 'qty', 'product_type', 'vat_src_code', 'tva_tx', 'info_bits', 'localtax1_tx', 'localtax2_tx', 'total_ht', 'total_tva', 'total_ttc', 'total_localtax1', 'total_localtax2'
 							))) continue; // Discard if not into a dedicated list
 
-							if (!is_object($this->object_data->invoiceline[$lineid])) $this->object_data->invoiceline[$lineid] = new stdClass();
+							if (empty($this->object_data->invoiceline[$lineid]) || !is_object($this->object_data->invoiceline[$lineid])) {		// To avoid warning
+								$this->object_data->invoiceline[$lineid] = new stdClass();
+							}
 
 							$this->object_data->invoiceline[$lineid]->{$keyline} = $valueline;
 						}
@@ -465,7 +457,7 @@ class BlockedLog
 			if (!empty($object->newref)) $this->object_data->ref = $object->newref;
 		} elseif ($this->element == 'invoice_supplier')
 		{
-			foreach ($object as $key=>$value)
+			foreach ($object as $key => $value)
 			{
 				if (in_array($key, $arrayoffieldstoexclude)) continue; // Discard some properties
 				if (!in_array($key, array(
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 0b68095c5d0..b825289b45e 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -962,8 +962,8 @@ class Commande extends CommonOrder
 		$sql .= ", ".($this->demand_reason_id > 0 ? $this->demand_reason_id : "null");
 		$sql .= ", ".($delivery_date ? "'".$this->db->idate($delivery_date)."'" : "null");
 		$sql .= ", ".($this->fk_delivery_address > 0 ? $this->fk_delivery_address : 'NULL');
-		$sql .= ", ".($this->shipping_method_id > 0 ? $this->shipping_method_id : 'NULL');
-		$sql .= ", ".($this->warehouse_id > 0 ? $this->warehouse_id : 'NULL');
+		$sql .= ", ".(!empty($this->shipping_method_id) && $this->shipping_method_id > 0 ? $this->shipping_method_id : 'NULL');
+		$sql .= ", ".(!empty($this->warehouse_id) && $this->warehouse_id > 0 ? $this->warehouse_id : 'NULL');
 		$sql .= ", ".($this->remise_absolue > 0 ? $this->db->escape($this->remise_absolue) : 'NULL');
 		$sql .= ", ".($this->remise_percent > 0 ? $this->db->escape($this->remise_percent) : 0);
 		$sql .= ", ".(int) $this->fk_incoterms;
@@ -1605,8 +1605,8 @@ class Commande extends CommonOrder
 			$this->line->tva_tx = $txtva;
 			$this->line->localtax1_tx = ($total_localtax1 ? $localtaxes_type[1] : 0);
 			$this->line->localtax2_tx = ($total_localtax2 ? $localtaxes_type[3] : 0);
-			$this->line->localtax1_type = $localtaxes_type[0];
-			$this->line->localtax2_type = $localtaxes_type[2];
+			$this->line->localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
+			$this->line->localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
 			$this->line->fk_product = $fk_product;
 			$this->line->product_type = $product_type;
 			$this->line->fk_remise_except = $fk_remise_except;
@@ -3924,7 +3924,9 @@ class Commande extends CommonOrder
 		if (!dol_strlen($modele)) {
 			$modele = 'einstein';
 
-			if (!empty($this->modelpdf)) {
+			if (!empty($this->model_pdf)) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($this->modelpdf)) {	// dperecated
 				$modele = $this->modelpdf;
 			} elseif (!empty($conf->global->COMMANDE_ADDON_PDF)) {
 				$modele = $conf->global->COMMANDE_ADDON_PDF;
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 77266718b75..2cc77efcca4 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -186,6 +186,8 @@ class Facture extends CommonInvoice
 
 	public $fac_rec;
 
+	public $date_pointoftax;
+
 	// Multicurrency
 	/**
 	 * @var int ID
@@ -645,7 +647,7 @@ class Facture extends CommonInvoice
 		$sql .= ", ".$this->cond_reglement_id;
 		$sql .= ", ".$this->mode_reglement_id;
 		$sql .= ", '".$this->db->idate($this->date_lim_reglement)."'";
-		$sql .= ", ".(isset($this->modelpdf) ? "'".$this->db->escape($this->modelpdf)."'" : "null");
+		$sql .= ", ".(isset($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : "null");
 		$sql .= ", ".($this->situation_cycle_ref ? "'".$this->db->escape($this->situation_cycle_ref)."'" : "null");
 		$sql .= ", ".($this->situation_counter ? "'".$this->db->escape($this->situation_counter)."'" : "null");
 		$sql .= ", ".($this->situation_final ? $this->situation_final : 0);
@@ -1080,6 +1082,8 @@ class Facture extends CommonInvoice
 		$facture->retained_warranty_fk_cond_reglement = $this->retained_warranty_fk_cond_reglement;
 		$facture->retained_warranty_date_limit = $this->retained_warranty_date_limit;
 
+		$facture->fk_user_author = $user->id;
+
 
 		// Loop on each line of new invoice
 		foreach ($facture->lines as $i => $tmpline)
@@ -1164,8 +1168,10 @@ class Facture extends CommonInvoice
 
 		// Clear fields
 		$object->date               = (empty($this->date) ? dol_now() : $this->date);
-		$object->user_author        = $user->id;
-		$object->user_valid         = '';
+		$object->user_author        = $user->id;	// deprecated
+		$object->user_valid         = null;			// deprecated
+		$object->fk_user_author     = $user->id;
+		$object->fk_user_valid      = null;
 		$object->fk_facture_source  = 0;
 		$object->date_creation      = '';
 		$object->date_modification = '';
@@ -1317,8 +1323,9 @@ class Facture extends CommonInvoice
 
 			// get extrafields from original line
 			$object->lines[$i]->fetch_optionals();
-			foreach ($object->lines[$i]->array_options as $options_key => $value)
+			foreach ($object->lines[$i]->array_options as $options_key => $value) {
 				$line->array_options[$options_key] = $value;
+			}
 
 			$this->lines[$i] = $line;
 		}
@@ -1348,6 +1355,8 @@ class Facture extends CommonInvoice
 		$this->origin = $object->element;
 		$this->origin_id = $object->id;
 
+		$this->fk_user_author = $user->id;
+
 		// get extrafields from original line
 		$object->fetch_optionals();
 		foreach ($object->array_options as $options_key => $value)
@@ -1362,8 +1371,7 @@ class Facture extends CommonInvoice
 
 		$ret = $this->create($user);
 
-		if ($ret > 0)
-		{
+		if ($ret > 0) {
 			// Actions hooked (by external module)
 			$hookmanager->initHooks(array('invoicedao'));
 
@@ -1600,8 +1608,10 @@ class Facture extends CommonInvoice
 				$this->note = $obj->note_private; // deprecated
 				$this->note_private = $obj->note_private;
 				$this->note_public			= $obj->note_public;
-				$this->user_author			= $obj->fk_user_author;
-				$this->user_valid = $obj->fk_user_valid;
+				$this->user_author			= $obj->fk_user_author;	// deprecated
+				$this->user_valid           = $obj->fk_user_valid;	// deprecated
+				$this->fk_user_author		= $obj->fk_user_author;
+				$this->fk_user_valid        = $obj->fk_user_valid;
 				$this->model_pdf = $obj->model_pdf;
 				$this->modelpdf = $obj->model_pdf; // deprecated
 				$this->last_main_doc = $obj->last_main_doc;
@@ -1890,7 +1900,7 @@ class Facture extends CommonInvoice
 		$sql .= " date_lim_reglement=".(strval($this->date_lim_reglement) != '' ? "'".$this->db->idate($this->date_lim_reglement)."'" : 'null').",";
 		$sql .= " note_private=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
 		$sql .= " note_public=".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null").",";
-		$sql .= " model_pdf=".(isset($this->modelpdf) ? "'".$this->db->escape($this->modelpdf)."'" : "null").",";
+		$sql .= " model_pdf=".(isset($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : "null").",";
 		$sql .= " import_key=".(isset($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null").",";
 		$sql .= " situation_cycle_ref=".(empty($this->situation_cycle_ref) ? "null" : $this->db->escape($this->situation_cycle_ref)).",";
 		$sql .= " situation_counter=".(empty($this->situation_counter) ? "null" : $this->db->escape($this->situation_counter)).",";
@@ -2113,7 +2123,7 @@ class Facture extends CommonInvoice
 
 		$rowid = $this->id;
 
-		dol_syslog(get_class($this)."::delete rowid=".$rowid.", ref=".$this->ref.", thirdparty=".$this->thirdparty->name, LOG_DEBUG);
+		dol_syslog(get_class($this)."::delete rowid=".$rowid.", ref=".$this->ref.", thirdparty=".(empty($this->thirdparty) ? '' : $this->thirdparty->name), LOG_DEBUG);
 
 		// Test to avoid invoice deletion (allowed if draft)
 		$result = $this->is_erasable();
@@ -4118,7 +4128,7 @@ class Facture extends CommonInvoice
 	 */
 	public function initAsSpecimen($option = '')
 	{
-		global $conf, $langs;
+		global $conf, $langs, $user;
 
 		$now = dol_now();
 		$arraynow = dol_getdate($now);
@@ -4167,6 +4177,8 @@ class Facture extends CommonInvoice
 		$this->note_private = 'This is a comment (private)';
 		$this->note = 'This is a comment (private)';
 
+		$this->fk_user_author = $user->id;
+
 		$this->multicurrency_tx = 1;
 		$this->multicurrency_code = $conf->currency;
 
@@ -4326,8 +4338,8 @@ class Facture extends CommonInvoice
 	/**
 	 *  Create a document onto disk according to template module.
 	 *
-	 *	@param	string		$modele			Generator to use. Caller must set it to obj->modelpdf or GETPOST('modelpdf','alpha') for example.
-	 *	@param	Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *	@param	string		$modele			Generator to use. Caller must set it to obj->model_pdf or GETPOST('model','alpha') for example.
+	 *	@param	Translate	$outputlangs	Object lang to use for translation
 	 *  @param  int			$hidedetails    Hide details of lines
 	 *  @param  int			$hidedesc       Hide description
 	 *  @param  int			$hideref        Hide ref
@@ -4345,7 +4357,9 @@ class Facture extends CommonInvoice
 			$modele = 'crabe';
 			$thisTypeConfName = 'FACTURE_ADDON_PDF_'.$this->type;
 
-			if (!empty($this->modelpdf)) {
+			if (!empty($this->model_pdf)) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($this->modelpdf)) {	// deprecated
 				$modele = $this->modelpdf;
 			} elseif (!empty($conf->global->$thisTypeConfName)) {
 				$modele = $conf->global->$thisTypeConfName;
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index a3d0b82d2b7..9bdb1d5a846 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2417,7 +2417,9 @@ class Contrat extends CommonObject
 		if (!dol_strlen($modele)) {
 			$modele = 'strato';
 
-			if (!empty($this->modelpdf)) {
+			if (!empty($this->model_pdf)) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($this->modelpdf)) {	// deprecated
 				$modele = $this->modelpdf;
 			} elseif (!empty($conf->global->CONTRACT_ADDON_PDF)) {
 				$modele = $conf->global->CONTRACT_ADDON_PDF;
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 396aa595062..b095712d972 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -195,6 +195,11 @@ abstract class CommonObject
 	 */
 	public $ref;
 
+	/**
+	 * @var string An external reference for the object
+	 */
+	public $ref_ext;
+
 	/**
 	 * @var string The object's previous reference
 	 */
@@ -205,11 +210,6 @@ abstract class CommonObject
 	 */
 	public $ref_next;
 
-	/**
-	 * @var string An external reference for the object
-	 */
-	public $ref_ext;
-
 	/**
 	 * @var int The object's status
 	 * @see setStatut()
@@ -469,6 +469,12 @@ abstract class CommonObject
 	 */
 	public $specimen = 0;
 
+	/**
+	 * @var	int	Id of contact to send object (used by the trigger of module Agenda)
+	 */
+	public $sendtoid;
+
+
 	/**
 	 * @var array	List of child tables. To test if we can delete object.
 	 */
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 023155a706f..e4722cabb4d 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -2483,15 +2483,16 @@ class Expedition extends CommonObject
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
-		global $conf, $langs;
+		global $conf;
 
-		$langs->load("sendings");
 		$outputlangs->load("products");
 
 		if (!dol_strlen($modele)) {
 			$modele = 'rouget';
 
-			if (!empty($this->modelpdf)) {
+			if (!empty($this->model_pdf)) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($this->modelpdf)) {	// deprecated
 				$modele = $this->modelpdf;
 			} elseif (!empty($conf->global->EXPEDITION_ADDON_PDF)) {
 				$modele = $conf->global->EXPEDITION_ADDON_PDF;
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 55096c411fa..7a5b430a532 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -2274,12 +2274,14 @@ class ExpenseReport extends CommonObject
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
-		global $conf, $langs;
+		global $conf;
 
-		$langs->load("trips");
+		$outputlangs->load("trips");
 
 		if (!dol_strlen($modele)) {
-			if (!empty($this->modelpdf)) {
+			if (!empty($this->model_pdf)) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($this->modelpdf)) {	// deprecated
 				$modele = $this->modelpdf;
 			} elseif (!empty($conf->global->EXPENSEREPORT_ADDON_PDF)) {
 				$modele = $conf->global->EXPENSEREPORT_ADDON_PDF;
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 7145605cb85..39ac094132a 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -696,14 +696,16 @@ class Fichinter extends CommonObject
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
-		global $conf, $langs;
+		global $conf;
 
-		$langs->load("interventions");
+		$outputlangs->load("interventions");
 
 		if (!dol_strlen($modele)) {
 			$modele = 'soleil';
 
-			if (!empty($this->modelpdf)) {
+			if (!empty($this->model_pdf)) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($this->modelpdf)) {	// deprecated
 				$modele = $this->modelpdf;
 			} elseif (!empty($conf->global->FICHEINTER_ADDON_PDF)) {
 				$modele = $conf->global->FICHEINTER_ADDON_PDF;
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index a51e68c095e..b4733de05ae 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1896,14 +1896,16 @@ class Task extends CommonObject
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-		global $conf, $langs;
+		global $conf;
 
-		$langs->load("projects");
+		$outputlangs->load("projects");
 
 		if (!dol_strlen($modele)) {
 			$modele = 'nodefault';
 
-			if (!empty($this->modelpdf)) {
+			if (!empty($this->model_pdf)) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($this->modelpdf)) {	// deprecated
 				$modele = $this->modelpdf;
 			} elseif (!empty($conf->global->PROJECT_TASK_ADDON_PDF)) {
 				$modele = $conf->global->PROJECT_TASK_ADDON_PDF;
diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php
index 26396ae2c30..64959e1cd4f 100644
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@@ -239,9 +239,10 @@ class FactureTest extends PHPUnit\Framework\TestCase
 			array(
 				'newref','oldref','id','lines','client','thirdparty','brouillon','user_author','date_creation','date_validation','datem','date_modification',
 				'ref','statut','paye','specimen','ref','actiontypecode','actionmsg2','actionmsg','mode_reglement','cond_reglement',
-				'cond_reglement_doc','situation_cycle_ref','situation_counter','situation_final','multicurrency_total_ht','multicurrency_total_tva',
-				'multicurrency_total_ttc','fk_multicurrency','multicurrency_code','multicurrency_tx',
-                'retained_warranty' ,'retained_warranty_date_limit', 'retained_warranty_fk_cond_reglement', 'specimen', 'trackid'
+				'cond_reglement_doc', 'modelpdf',
+				'multicurrency_total_ht','multicurrency_total_tva',	'multicurrency_total_ttc','fk_multicurrency','multicurrency_code','multicurrency_tx',
+				'retained_warranty' ,'retained_warranty_date_limit', 'retained_warranty_fk_cond_reglement', 'specimen', 'situation_cycle_ref', 'situation_counter', 'situation_final',
+				'trackid','user_creat','user_valid'
 			)
 		);
         $this->assertEquals($arraywithdiff, array());    // Actual, Expected

From d739fa1951a8dd8ccfcb5f5395b8096a4a23945d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 13 Dec 2020 18:32:55 +0100
Subject: [PATCH 401/888] Fix log

---
 htdocs/core/class/CMailFile.class.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 345dbba14e3..c942127aab3 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -727,7 +727,11 @@ class CMailFile
 
 					if (!empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM)) $additionnalparam .= ($additionnalparam ? ' ' : '').'-U '.$additionnalparam; // Use -U to add additionnal params
 
-					dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port').", additionnal_parameters=".$additionnalparam, LOG_DEBUG);
+					$linuxlike = 1;
+					if (preg_match('/^win/i', PHP_OS)) $linuxlike = 0;
+					if (preg_match('/^mac/i', PHP_OS)) $linuxlike = 0;
+
+					dol_syslog("CMailFile::sendfile: mail start".($linuxlike ? '' : " HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')).", additionnal_parameters=".$additionnalparam, LOG_DEBUG);
 
 					$this->message = stripslashes($this->message);
 
@@ -746,11 +750,7 @@ class CMailFile
 					{
 						$langs->load("errors");
 						$this->error = "Failed to send mail with php mail";
-						$linuxlike = 1;
-						if (preg_match('/^win/i', PHP_OS)) $linuxlike = 0;
-						if (preg_match('/^mac/i', PHP_OS)) $linuxlike = 0;
-						if (!$linuxlike)
-						{
+						if (!$linuxlike) {
 							$this->error .= " to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'); // This values are value used only for non linuxlike systems
 						}
 						$this->error .= ".<br>";

From eef218aa6baad073ae644f23f3c28b93f3936dfc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 13 Dec 2020 19:33:48 +0100
Subject: [PATCH 402/888] Fix message

---
 dev/initdemo/initdemo.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/initdemo/initdemo.sh b/dev/initdemo/initdemo.sh
index 1b32161b44b..ccd8c8d8b9a 100755
--- a/dev/initdemo/initdemo.sh
+++ b/dev/initdemo/initdemo.sh
@@ -189,8 +189,8 @@ export res=$?
 export documentdir=`cat $mydir/../../htdocs/conf/conf.php | grep '^\$dolibarr_main_data_root' | sed -e 's/$dolibarr_main_data_root=//' | sed -e 's/;//' | sed -e "s/'//g" | sed -e 's/"//g' `
 if [ "x$documentdir" != "x" ]
 then
-	$DIALOG --title "Reset document directory tpp" --clear \
-	        --inputbox "Delete and recreate document directory $documentdir/:" 16 55 n 2> $fichtemp
+	$DIALOG --title "Reset document directory" --clear \
+	        --inputbox "DELETE and recreate document directory $documentdir/:" 16 55 n 2> $fichtemp
 	
 	valret=$?
 	

From 44d3bc2e646292a09d858a7ba73d1679b82ec24b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Mon, 14 Dec 2020 08:39:08 +0100
Subject: [PATCH 403/888] add work

---
 htdocs/intracommreport/card.php               | 55 +++++++++++--------
 .../class/intracommreport.class.php           | 47 +++++++++++++---
 htdocs/intracommreport/list.php               |  4 +-
 3 files changed, 75 insertions(+), 31 deletions(-)

diff --git a/htdocs/intracommreport/card.php b/htdocs/intracommreport/card.php
index f0a4bd5f070..077f793d649 100644
--- a/htdocs/intracommreport/card.php
+++ b/htdocs/intracommreport/card.php
@@ -27,28 +27,41 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/intracommreport/class/intracommreport.class.php';
 
 $langs->loadLangs(array("intracommreport"));
-
+var_dump($_POST);
 $action = GETPOST('action');
-$exporttype = GETPOST('exporttype'); // DEB ou DES
-if (empty($exporttype)) {
-	$exporttype = 'deb';
-}
-
-$form = new Form($db);
-$formother = new FormOther($db);
-$year = GETPOST('year');
-$month = GETPOST('month');
+$exporttype = GETPOSTISSET('exporttype') ? GETPOST('exporttype', 'alphanohtml') : 'deb'; // DEB ou DES
+$year = GETPOSTINT('year');
+$month = GETPOSTINT('month');
 $label = (string) GETPOST('label', 'alphanohtml');
-$type_declaration = GETPOSTINT('type');
+$type_declaration = (string) GETPOST('type_declaration', 'alphanohtml');
 $backtopage = GETPOST('backtopage', 'alpha');
 $declaration = array(
 	"deb" => $langs->trans("DEB"),
 	"des" => $langs->trans("DES"),
 );
+$typeOfDeclaration = array(
+	"introduction" => $langs->trans("Introduction"),
+	"expedition" => $langs->trans("Expedition"),
+);
+$object = new IntracommReport($db);
+if ($id > 0) {
+	$object->fetch($id);
+}
+$form = new Form($db);
+$formother = new FormOther($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('intracommcard', 'globalcard'));
 
 /*
  * 	Actions
  */
+$parameters = array('id' => $id);
+// Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if ($user->rights->intracommreport->delete && $action == 'confirm_delete' && $confirm == 'yes') {
 	$result = $object->delete($id, $user);
@@ -72,16 +85,16 @@ if ($action == 'add' && $user->rights->intracommreport->write) {
 	$object->subscription = (int) $subscription;
 
 	// Fill array 'array_options' with data from add form
-	$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
-	if ($ret < 0) {
-		$error++;
-	}
+	// $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
+	// if ($ret < 0) {
+	// 	$error++;
+	// }
 
 	if (empty($object->label)) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
 	} else {
-		$sql = "SELECT libelle FROM ".MAIN_DB_PREFIX."adherent_type WHERE libelle='".$db->escape($object->label)."'";
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."intracommreport WHERE ref='".$db->escape($object->label)."'";
 		$result = $db->query($sql);
 		if ($result) {
 			$num = $db->num_rows($result);
@@ -96,7 +109,7 @@ if ($action == 'add' && $user->rights->intracommreport->write) {
 	if (!$error) {
 		$id = $object->create($user);
 		if ($id > 0) {
-			header("Location: ".$_SERVER["PHP_SELF"]);
+			header("Location: ".$_SERVER["PHP_SELF"].'?id='.$id);
 			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -145,10 +158,8 @@ if ($action == 'create') {
 	print '</tr>';
 
 	// Type of declaration
-	$typeOfDeclaration["introduction"] = $langs->trans("Introduction");
-	$typeOfDeclaration["expedition"] = $langs->trans("Expedition");
 	print '<tr><td class="fieldrequired">'.$langs->trans("TypeOfDeclaration")."</td><td>\n";
-	print $form->selectarray("type_declaration", $typeOfDeclaration, GETPOST('type_declaration', 'alpha') ?GETPOST('type_declaration', 'alpha') : $object->type_declaration, 0);
+	print $form->selectarray("type_declaration", $typeOfDeclaration, GETPOST('type_declaration', 'alpha') ? GETPOST('type_declaration', 'alpha') : $object->type_declaration, 0);
 	print "</td>\n";
 
 	print '</table>';
@@ -177,9 +188,9 @@ if ($id > 0 && $action != 'edit') {
 	/*
 	 * Show tabs
 	 */
-	$head = intracommreport_prepare_head($object);
+	//$head = intracommreport_prepare_head($object);
 
-	print dol_get_fiche_head($head, 'general', $langs->trans("IntracommReport"), -1, 'user');
+	print dol_get_fiche_head("", 'general', $langs->trans("IntracommReport"), -1, 'user');
 
 	// Confirm remove report
 	if ($action == 'delete') {
diff --git a/htdocs/intracommreport/class/intracommreport.class.php b/htdocs/intracommreport/class/intracommreport.class.php
index d1145dcf806..0cf5a71c27a 100644
--- a/htdocs/intracommreport/class/intracommreport.class.php
+++ b/htdocs/intracommreport/class/intracommreport.class.php
@@ -81,13 +81,46 @@ class IntracommReport extends CommonObject
 		$this->exporttype = 'deb';
 	}
 
+	/**
+	 * Fonction create
+	 * @param 	User 	$user 		User
+	 * @param 	int 	$notrigger 	notrigger
+	 * @return 	int
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		return 1;
+	}
+
+	/**
+	 * Fonction fetch
+	 * @param 	int 	$id 	object ID
+	 * @return 	int
+	 */
+	public function fetch($id)
+	{
+		return 1;
+	}
+
+	/**
+	 * Fonction delete
+	 * @param 	int 	$id 		object ID
+	 * @param 	User 	$user 		User
+	 * @param 	int 	$notrigger 	notrigger
+	 * @return 	int
+	 */
+	public function delete($id, $user, $notrigger = 0)
+	{
+		return 1;
+	}
+
 	/**
 	 * Generate XML file
 	 *
-	 * @param int		$mode 				O for create, R for regenerate (Look always 0 ment toujours 0 within the framework of XML exchanges according to documentation)
-	 * @param string	$type 				Declaration type by default - introduction or expedition (always 'expedition' for Des)
-	 * @param string	$period_reference	Period of reference
-	 * @return void
+	 * @param int			$mode 				O for create, R for regenerate (Look always 0 ment toujours 0 within the framework of XML exchanges according to documentation)
+	 * @param string		$type 				Declaration type by default - introduction or expedition (always 'expedition' for Des)
+	 * @param string		$period_reference	Period of reference
+	 * @return SimpleXMLElement|int
 	 */
 	public function getXML($mode = 'O', $type = 'introduction', $period_reference = '')
 	{
@@ -149,7 +182,7 @@ class IntracommReport extends CommonObject
 	 * @param int		$period_year		Year of declaration
 	 * @param int		$period_month		Month of declaration
 	 * @param string	$type_declaration	Declaration type by default - introduction or expedition (always 'expedition' for Des)
-	 * @return void
+	 * @return SimpleXMLElement|int
 	 */
 	public function getXMLDes($period_year, $period_month, $type_declaration = 'expedition')
 	{
@@ -246,7 +279,7 @@ class IntracommReport extends CommonObject
 	 *  @param      string	$type				Declaration type by default - introduction or expedition (always 'expedition' for Des)
 	 *  @param      int		$period_reference	Reference declaration
 	 *  @param      string	$exporttype	    	deb=DEB, des=DES
-	 *  @return     int       			  		<0 if KO, >0 if OK
+	 *  @return     string       			  		<0 if KO, >0 if OK
 	 */
 	public function getSQLFactLines($type, $period_reference, $exporttype = 'deb')
 	{
@@ -325,7 +358,7 @@ class IntracommReport extends CommonObject
 	 *	Add item for DES
 	 *
 	 * 	@param	SimpleXMLElement	$declaration		Reference declaration
-	 * 	@param	esurce				$res				Result of request SQL
+	 * 	@param	Resource				$res				Result of request SQL
 	 *  @param	int					$i					Line Id
 	 *  @return	void
 	 */
diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php
index 1530e07d84e..d3346e344f4 100644
--- a/htdocs/intracommreport/list.php
+++ b/htdocs/intracommreport/list.php
@@ -121,8 +121,8 @@ $isInEEC = isInEEC($mysoc);
 
 // Definition of fields for lists
 $arrayfields = array(
-	'i.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-	'i.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
+	'i.ref' => array('label'=>$langs->trans("Ref"), 'checked'=>1),
+	'i.label' => array('label'=>$langs->trans("Label"), 'checked'=>1),
 	'i.fk_product_type'=>array('label'=>$langs->trans("Type"), 'checked'=>0, 'enabled'=>(!empty($conf->produit->enabled) && !empty($conf->service->enabled))),
 );
 /*

From 5e4cc7fcfd6dee57b2c5e048b023c97b0fd3692b Mon Sep 17 00:00:00 2001
From: Stephane Lesage <stephane.lesage@ateis.com>
Date: Sun, 13 Dec 2020 19:50:35 +0100
Subject: [PATCH 404/888] companycard-directedit-typent

---
 htdocs/core/class/html.formcompany.class.php | 41 +++++++++++
 htdocs/societe/card.php                      | 75 ++++++++++----------
 htdocs/societe/class/societe.class.php       | 25 +++++++
 3 files changed, 104 insertions(+), 37 deletions(-)

diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 0b4c4e499e3..1cd2ed5315c 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -1008,4 +1008,45 @@ class FormCompany extends Form
 
 		return $out;
 	}
+
+	/**
+	 *  Output html select to select third-party type
+	 *
+	 *  @param	string	$page       	Page
+	 *  @param  string	$selected   	Id preselected
+	 *  @param  string	$htmlname		Name of HTML select
+	 *  @param  string	$filter         optional filters criteras
+	 *  @param  int     $nooutput       No print output. Return it only.
+	 *  @return	void|string
+	 */
+	public function formThirdpartyType($page, $selected = '', $htmlname = 'socid', $filter = '', $nooutput = 0)
+	{
+		// phpcs:enable
+		global $langs;
+
+		$out = '';
+		if ($htmlname != "none")
+		{
+			$out .= '<form method="post" action="'.$page.'">';
+			$out .= '<input type="hidden" name="action" value="set_thirdpartytype">';
+			$out .= '<input type="hidden" name="token" value="'.newToken().'">';
+			$sortparam = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
+			$out .= $this->selectarray($htmlname, $this->typent_array(0, $filter), $selected, 0, 0, 0, '', 0, 0, 0, $sortparam, '', 1);
+			$out .= '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Modify").'">';
+			$out .= '</form>';
+		} else {
+			if ($selected)
+			{
+				$arr = $this->typent_array(0);
+				$typent = $arr[$selected];
+				$out .= $typent;
+			} else {
+				$out .= "&nbsp;";
+			}
+		}
+
+		if ($nooutput) return $out;
+		else print $out;
+	}
+
 }
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index ab2cddb940d..e1b77c8dfb2 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -838,18 +838,25 @@ if (empty($reshook))
 		}
 	}
 
+	// Set third-party type
+	if ($action == 'set_thirdpartytype' && $user->rights->societe->creer)
+	{
+		$object->fetch($socid);
+		$result = $object->setThirdpartyType(GETPOST('typent_id', 'int'));
+	}
+
+	// Set incoterm
+	if ($action == 'set_incoterms' && $user->rights->societe->creer && !empty($conf->incoterm->enabled))
+	{
+		$object->fetch($socid);
+		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+	}
+
 	// Set parent company
 	if ($action == 'set_thirdparty' && $user->rights->societe->creer)
 	{
 		$object->fetch($socid);
-		$result = $object->set_parent(GETPOST('editparentcompany', 'int'));
-	}
-
-	// Set incoterm
-	if ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
-	{
-		$object->fetch($socid);
-		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+		$result = $object->set_parent(GETPOST('parent_id', 'int'));
 	}
 
 	// Set sales representatives
@@ -2455,18 +2462,24 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		} else {
 			print '&nbsp;';
 		}
-		print '</td>';
-		print '</tr>';
+		print '</td></tr>';
 
-		// Type + Workforce/Staff
-		$arr = $formcompany->typent_array(1);
-		$object->typent = $arr[$object->typent_code];
-		print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>'.$object->typent.'</td>';
+		// Third-Party Type
+		print '<tr><td>';
+		print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans('ThirdPartyType').'</td>';
+		if ($action != 'editthirdpartytype' && $user->rights->societe->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editthirdpartytype&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
+		print '</tr></table>';
+		print '</td><td>';
+		$html_name = ($action == 'editthirdpartytype') ? 'typent_id' : 'none';
+		$formcompany->formThirdpartyType($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->typent_id, $html_name, '');
+		print '</td></tr>';
+
+		// Workforce/Staff
 		print '<tr><td>'.$langs->trans("Workforce").'</td><td>'.$object->effectif.'</td></tr>';
 
 		print '</table>';
-
 		print '</div>';
+
 		print '<div class="fichehalfright"><div class="ficheaddleft">';
 
 		print '<div class="underbanner clearboth"></div>';
@@ -2518,14 +2531,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		if (!empty($conf->incoterm->enabled))
 		{
 			print '<tr><td>';
-			print '<table width="100%" class="nobordernopadding"><tr><td>';
-			print $langs->trans('IncotermLabel');
-			print '<td><td class="right">';
-			if ($user->rights->societe->creer) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$object->id.'&action=editincoterm">'.img_edit('', 1).'</a>';
-			else print '&nbsp;';
-			print '</td></tr></table>';
-			print '</td>';
-			print '<td colspan="3">';
+			print '<table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans('IncotermLabel').'</td>';
+			if ($action != 'editincoterm' && $user->rights->societe->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&action=editincoterm">'.img_edit('', 1).'</a></td>';
+			print '</tr></table>';
+			print '</td><td colspan="3">';
 			if ($action != 'editincoterm')
 			{
 				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
@@ -2553,20 +2562,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY))
 		{
 			print '<tr><td>';
-			print '<table class="nobordernopadding" width="100%"><tr><td>';
-			print $langs->trans('ParentCompany');
-			print '</td>';
-			if ($action != 'editparentcompany') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editparentcompany&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
+			print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans('ParentCompany').'</td>';
+			if ($action != 'editparentcompany' && $user->rights->societe->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editparentcompany&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
 			print '</tr></table>';
 			print '</td><td>';
-			if ($action == 'editparentcompany')
-			{
-				$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->parent, 'editparentcompany', 's.rowid <> '.$object->id, 1);
-			} else {
-				$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->parent, 'none', 's.rowid <> '.$object->id, 1);
-			}
-			print '</td>';
-			print '</tr>';
+			$html_name = ($action == 'editparentcompany') ? 'parent_id' : 'none';
+			$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->parent, $html_name, 's.rowid <> '.$object->id, 1);
+			print '</td></tr>';
 		}
 
 		// Sales representative
@@ -2587,8 +2589,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			} else {
 				print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
 			}
-			print '</td>';
-			print "</tr>\n";
+			print "</td></tr>\n";
 		}
 
 		// Webservices url/key
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index f18a6e1b9a8..f8796739701 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -4355,6 +4355,31 @@ class Societe extends CommonObject
 		return $error ? -1 : 1;
 	}
 
+	/**
+	 *    Define third-party type of current company
+	 *
+	 *    @param	int		$typent_id	third party type rowid in llx_c_typent
+	 *    @return	int     			<0 if KO, >0 if OK
+	 */
+	public function setThirdpartyType($typent_id)
+	{
+		if ($this->id)
+		{
+			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
+			$sql .= " SET fk_typent = ".($typent_id > 0 ? $typent_id : "null");
+			$sql .= " WHERE rowid = ".$this->id;
+			dol_syslog(get_class($this).'::setThirdpartyType', LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				$this->typent_id = $typent_id;
+				$this->typent_code = dol_getIdFromCode($db, $this->$typent_id, 'c_typent', 'id', 'code');
+				return 1;
+			} else {
+				return -1;
+			}
+		} else return -1;
+	}
 
 	/**
 	 * Function used to replace a thirdparty id with another one.

From d32d3060ccfc757fef8d89a5d74d94c36def8253 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 14 Dec 2020 09:15:06 +0000
Subject: [PATCH 405/888] Fixing style errors.

---
 htdocs/core/class/html.formcompany.class.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 1cd2ed5315c..26e184eb614 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -1048,5 +1048,4 @@ class FormCompany extends Form
 		if ($nooutput) return $out;
 		else print $out;
 	}
-
 }

From ae5da8d55c1e3b64730dbff046d7b6292ab59625 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Dec 2020 10:25:31 +0100
Subject: [PATCH 406/888] Fix label

---
 htdocs/recruitment/recruitmentcandidature_card.php | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
index 9d05674d656..0a0cf4c061d 100644
--- a/htdocs/recruitment/recruitmentcandidature_card.php
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -423,7 +423,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		//Form to close proposal (signed or not)
 		$formquestion = array(
-			array('type' => 'select', 'name' => 'status', 'label' => '<span class="fieldrequired">'.$langs->trans("CloseAs").'</span>', 'values' => array($object::STATUS_CONTRACT_SIGNED => $object->LibStatut($object::STATUS_CONTRACT_PROPOSED), $object::STATUS_CONTRACT_REFUSED => $object->LibStatut($object::STATUS_CONTRACT_REFUSED))),
+			array('type' => 'select', 'name' => 'status', 'label' => '<span class="fieldrequired">'.$langs->trans("CloseAs").'</span>', 'values' => array($object::STATUS_CONTRACT_SIGNED => $object->LibStatut($object::STATUS_CONTRACT_SIGNED), $object::STATUS_CONTRACT_REFUSED => $object->LibStatut($object::STATUS_CONTRACT_REFUSED))),
 			array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"), 'value' => '')				// Field to complete private note (not replace)
 		);
 
@@ -446,15 +446,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$formquestion = array(
 			array('label' => $langs->trans("LoginToCreate"), 'type' => 'text', 'name' => 'login', 'value' => $login)
 		);
-		/*
-		if (!empty($conf->societe->enabled) && $object->socid > 0) {
-			$object->fetch_thirdparty();
-			$formquestion[] = array('label' => $langs->trans("UserWillBe"), 'type' => 'radio', 'name' => 'internalorexternal', 'default'=>'external', 'values' => array('external'=>$langs->trans("External").' - '.$langs->trans("LinkedToDolibarrThirdParty").' '.$object->thirdparty->getNomUrl(1, '', 0, 1), 'internal'=>$langs->trans("Internal")));
-		}
-		$text = '';
-		if (!empty($conf->societe->enabled) && $object->socid <= 0) {
-			$text .= $langs->trans("UserWillBeInternalUser").'<br>';
-		} */
 		$text .= $langs->trans("ConfirmCreateLogin");
 		print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("CreateDolibarrLogin"), $text, "confirm_create_user", $formquestion, 'yes');
 	}

From cce0b2f31bee48e30f134fb1763da79337016893 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Dec 2020 10:44:51 +0100
Subject: [PATCH 407/888] Fix code

---
 htdocs/compta/sociales/card.php                    | 14 ++++++++++++--
 .../class/paymentsocialcontribution.class.php      |  2 +-
 htdocs/core/lib/functions.lib.php                  |  1 +
 htdocs/expensereport/class/expensereport.class.php |  2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index 0bb6c3ed09e..e9b73831979 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -27,6 +27,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/paymentsocialcontribution.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsocialcontrib.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
@@ -181,7 +182,8 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->tax->charges->cre
 
 	if (!$dateech)
 	{
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
+		setEventMessages($langs->trans("ErrorFieldReqrequire_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
+uired", $langs->transnoentities("Date")), null, 'errors');
 		$action = 'edit';
 	} elseif (!$dateperiod)
 	{
@@ -610,14 +612,22 @@ if ($id > 0)
 			print '<td class="right">'.$langs->trans("Amount").'</td>';
 			print '</tr>';
 
+			$paymentsocialcontributiontmp = new PaymentSocialContribution($db);
+
 			if ($num > 0)
 			{
 				while ($i < $num)
 				{
 					$objp = $db->fetch_object($resql);
 
+					$paymentsocialcontributiontmp->id = $objp->rowid;
+					$paymentsocialcontributiontmp->ref = $objp->rowid;
+					$paymentsocialcontributiontmp->datep = $db->jdate($objp->dp);
+
 					print '<tr class="oddeven"><td>';
-					print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"), "payment").' '.$objp->rowid.'</a></td>';
+					print $paymentsocialcontributiontmp->getNomUrl(1);
+					print '</td>';
+
 					print '<td>'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
 					$labeltype = $langs->trans("PaymentType".$objp->type_code) != ("PaymentType".$objp->type_code) ? $langs->trans("PaymentType".$objp->type_code) : $objp->paiement_type;
 					print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 6f3074262a2..79e99c87c4c 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -694,7 +694,7 @@ class PaymentSocialContribution extends CommonObject
 			}
 			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$labeltoshow;
 		}
-		if ($this->date) $label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->date, 'day');
+		if ($this->datep) $label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->datep, 'day');
 
 		if (!empty($this->id)) {
 			$link = '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 6d9a439964d..434942b0f5c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1783,6 +1783,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 	// Add if object was dispatched "into accountancy"
 	if (!empty($conf->accounting->enabled) && in_array($object->element, array('bank', 'facture', 'invoice', 'invoice_supplier', 'expensereport', 'payment_various')))
 	{
+		// Note: For 'chargesociales', 'salaries'... this is the payments that are dispatched (so element = 'bank')
 		if (method_exists($object, 'getVentilExportCompta'))
 		{
 			$accounted = $object->getVentilExportCompta();
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 7a5b430a532..8d5cbd3c2cc 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -2461,7 +2461,7 @@ class ExpenseReport extends CommonObject
 	}
 
 	/**
-	 *	Return if an expensereport was dispatched into bookkeeping
+	 *	Return if object was dispatched into bookkeeping
 	 *
 	 *	@return     int         <0 if KO, 0=no, 1=yes
 	 */

From b0e3f1678f809d1a2b0f0721e139dd6b7238bc6b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Dec 2020 10:58:09 +0100
Subject: [PATCH 408/888] Debug v13

---
 .../class/paymentsocialcontribution.class.php | 33 +++++++++++++++++++
 htdocs/core/lib/functions.lib.php             |  2 +-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 79e99c87c4c..2f4f772fca0 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -707,4 +707,37 @@ class PaymentSocialContribution extends CommonObject
 
 		return $result;
 	}
+
+
+	/**
+	 *	Return if object was dispatched into bookkeeping
+	 *
+	 *	@return     int         <0 if KO, 0=no, 1=yes
+	 */
+	public function getVentilExportCompta()
+	{
+		$alreadydispatched = 0;
+
+		$type = 'bank';
+
+		$sql = " SELECT COUNT(ab.rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='".$this->db->escape($type)."' AND ab.fk_doc = ".$this->bank_line;
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($obj)
+			{
+				$alreadydispatched = $obj->nb;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+
+		if ($alreadydispatched)
+		{
+			return 1;
+		}
+		return 0;
+	}
 }
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 434942b0f5c..e67269b71ba 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1781,7 +1781,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 	}
 
 	// Add if object was dispatched "into accountancy"
-	if (!empty($conf->accounting->enabled) && in_array($object->element, array('bank', 'facture', 'invoice', 'invoice_supplier', 'expensereport', 'payment_various')))
+	if (!empty($conf->accounting->enabled) && in_array($object->element, array('bank', 'paiementcharge', 'facture', 'invoice', 'invoice_supplier', 'expensereport', 'payment_various')))
 	{
 		// Note: For 'chargesociales', 'salaries'... this is the payments that are dispatched (so element = 'bank')
 		if (method_exists($object, 'getVentilExportCompta'))

From 07cf81be1739c4978cac171a2ed7a694f75a6be5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Dec 2020 11:28:18 +0100
Subject: [PATCH 409/888] Fix search and navigation

---
 htdocs/compta/sociales/card.php               |   2 +-
 htdocs/compta/sociales/payments.php           | 333 +++++++++++-------
 .../modulebuilder/template/myobject_list.php  |  12 +-
 3 files changed, 205 insertions(+), 142 deletions(-)

diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index e9b73831979..bf28ceb0996 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -302,7 +302,7 @@ if ($action == 'create')
 	print '<td class="titlefieldcreate fieldrequired">';
 	print $langs->trans("Label");
 	print '</td>';
-	print '<td><input type="text" size="34" name="label" class="flat" value="'.dol_escape_htmltag(GETPOST('label', 'alpha')).'" autofocus></td>';
+	print '<td><input type="text" name="label" class="flat minwidth300" value="'.dol_escape_htmltag(GETPOST('label', 'alpha')).'" autofocus></td>';
 	print '</tr>';
 	print '<tr>';
 
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index c8eea77e546..b776da07745 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -34,6 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/paymentsocialcontribution
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsocialcontrib.class.php';
 
 
 $hookmanager = new HookManager($db);
@@ -49,9 +50,7 @@ if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'tax|salaries', '', '', 'charges|');
 
 $year = GETPOST("year", 'int');
-$filtre = GETPOST("filtre", 'alpha');
-
-$search_account = GETPOST('search_account', 'int');
+$search_sc_type = GETPOST('search_sc_type', 'int');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
@@ -64,6 +63,24 @@ $pagenext = $page + 1;
 if (!$sortfield) $sortfield = "cs.date_ech";
 if (!$sortorder) $sortorder = "DESC";
 
+if (empty($conf->tax->enabled) || empty($user->rights->tax->charges->lire))
+{
+	accessforbidden();
+}
+
+
+/*
+ * Actions
+ */
+
+// Purge search criteria
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+{
+	$search_sc_type = '';
+	//$toselect = '';
+	//$search_array_options = array();
+}
+
 
 /*
  * View
@@ -74,18 +91,20 @@ $socialcontrib = new ChargeSociales($db);
 $payment_sc_static = new PaymentSocialContribution($db);
 $sal_static = new PaymentSalary($db);
 $accountstatic = new Account($db);
-
-llxHeader('', $langs->trans("SpecialExpensesArea"));
+$formsocialcontrib = new FormSocialContrib($db);
 
 $title = $langs->trans("SocialContributionsPayments");
 
-$param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
-if ($sortfield) $param .= '&sortfield='.$sortfield;
-if ($sortorder) $param .= '&sortorder='.$sortorder;
+llxHeader('', $title);
 
-$totalnboflines = 0;
+
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+if ($sortfield) $param .= '&sortfield='.urlencode($sortfield);
+if ($sortorder) $param .= '&sortorder='.urlencode($sortorder);
+if ($year) $param .= '&year='.urlencode($year);
+if ($search_sc_type) $param .= '&search_sc_type='.urlencode($search_sc_type);
 $num = 0;
 
 print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -95,135 +114,183 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
-print '<input type="hidden" name="mode" value="'.$mode.'">';
+
+$sql = "SELECT c.id, c.libelle as label,";
+$sql .= " cs.rowid, cs.libelle, cs.fk_type as type, cs.periode, cs.date_ech, cs.amount as total,";
+$sql .= " pc.rowid as pid, pc.datep, pc.amount as totalpaye, pc.num_paiement as num_payment, pc.fk_bank,";
+$sql .= " pct.code as payment_code,";
+$sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel";
+$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c,";
+$sql .= " ".MAIN_DB_PREFIX."chargesociales as cs";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiementcharge as pc ON pc.fk_charge = cs.rowid";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON pc.fk_typepaiement = pct.id";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON pc.fk_bank = b.rowid";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
+$sql .= " WHERE cs.fk_type = c.id";
+$sql .= " AND cs.entity IN (".getEntity("tax").")";
+if ($search_sc_type > 0) {
+	$sql .= " AND pc.fk_typepaiement = ".((int) $search_sc_type);
+}
+if ($year > 0) {
+	$sql .= " AND (";
+	// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
+	// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
+	$sql .= "   (cs.periode IS NOT NULL AND cs.periode between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
+	$sql .= " OR (cs.periode IS NULL AND cs.date_ech between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
+	$sql .= ")";
+}
+if (preg_match('/^cs\./', $sortfield) || preg_match('/^c\./', $sortfield) || preg_match('/^pc\./', $sortfield) || preg_match('/^pct\./', $sortfield)) {
+		$sql .= $db->order($sortfield, $sortorder);
+}
+
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+	$resql = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($resql);
+	if (($page * $limit) > $nbtotalofrecords) {	// if total of record found is smaller than page * limit, goto and load page 0
+		$page = 0;
+		$offset = 0;
+	}
+}
+// if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
+if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) {
+	$num = $nbtotalofrecords;
+} else {
+	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
+
+	$resql = $db->query($sql);
+	if (!$resql) {
+		dol_print_error($db);
+		exit;
+	}
+
+	$num = $db->num_rows($resql);
+}
+//$sql.= $db->plimit($limit+1,$offset);
+//print $sql;
 
 $nav = '';
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $nav, '', $limit, 0);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'object_payment', 0, $nav, '', $limit, 0);
 
-if ($year) $param .= '&year='.$year;
+print '<table class="noborder centpercent">';
 
-if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
+print '<tr class="liste_titre">';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre">';
+$formsocialcontrib->select_type_socialcontrib(GETPOSTISSET("search_sc_type") ? $search_sc_type : '', 'search_sc_type', 1, 0, 0, 'minwidth200 maxwidth300');
+print '</td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+if (!empty($conf->banque->enabled)) print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre center">';
+$searchpicto = $form->showFilterButtons();
+print $searchpicto;
+print '</td>';
+print "</tr>\n";
+
+print '<tr class="liste_titre">';
+print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "cs.date_ech", "", $param, 'width="140px"', $sortfield, $sortorder);
+print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "c.libelle", "", $param, '', $sortfield, $sortorder);
+print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "cs.fk_type", "", $param, '', $sortfield, $sortorder);
+print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "cs.amount", "", $param, 'class="right"', $sortfield, $sortorder);
+print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pc.rowid", "", $param, '', $sortfield, $sortorder);
+print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pc.datep", "", $param, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "pct.code", "", $param, '', $sortfield, $sortorder);
+if (!empty($conf->banque->enabled)) print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pc.amount", "", $param, 'class="right"', $sortfield, $sortorder);
+print_liste_field_titre('');
+print "</tr>\n";
+
+if (!$resql)
 {
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre">';
-	print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "cs.date_ech", "", $param, 'width="140px"', $sortfield, $sortorder);
-	print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "c.libelle", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "cs.fk_type", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "cs.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-	print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pc.rowid", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pc.datep", "", $param, 'align="center"', $sortfield, $sortorder);
-	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "pct.code", "", $param, '', $sortfield, $sortorder);
-	if (!empty($conf->banque->enabled)) print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pc.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-	print "</tr>\n";
-
-	$sql = "SELECT c.id, c.libelle as label,";
-	$sql .= " cs.rowid, cs.libelle, cs.fk_type as type, cs.periode, cs.date_ech, cs.amount as total,";
-	$sql .= " pc.rowid as pid, pc.datep, pc.amount as totalpaye, pc.num_paiement as num_payment, pc.fk_bank,";
-	$sql .= " pct.code as payment_code,";
-	$sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel";
-	$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c,";
-	$sql .= " ".MAIN_DB_PREFIX."chargesociales as cs";
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiementcharge as pc ON pc.fk_charge = cs.rowid";
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON pc.fk_typepaiement = pct.id";
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON pc.fk_bank = b.rowid";
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
-	$sql .= " WHERE cs.fk_type = c.id";
-	$sql .= " AND cs.entity IN (".getEntity("tax").")";
-	if ($year > 0)
-	{
-		$sql .= " AND (";
-		// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
-		// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
-		$sql .= "   (cs.periode IS NOT NULL AND cs.periode between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
-		$sql .= " OR (cs.periode IS NULL AND cs.date_ech between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
-		$sql .= ")";
-	}
-	if (preg_match('/^cs\./', $sortfield) || preg_match('/^c\./', $sortfield) || preg_match('/^pc\./', $sortfield) || preg_match('/^pct\./', $sortfield)) $sql .= $db->order($sortfield, $sortorder);
-	//$sql.= $db->plimit($limit+1,$offset);
-	//print $sql;
-
-	dol_syslog("compta/charges/index.php: select payment", LOG_DEBUG);
-	$resql = $db->query($sql);
-	if ($resql)
-	{
-		$num = $db->num_rows($resql);
-		$i = 0;
-		$total = 0;
-		$totalnb = 0;
-		$totalpaye = 0;
-
-		while ($i < min($num, $limit))
-		{
-			$obj = $db->fetch_object($resql);
-			print '<tr class="oddeven">';
-			// Date
-			$date = $obj->periode;
-			if (empty($date)) $date = $obj->date_ech;
-			print '<td>'.dol_print_date($date, 'day').'</td>';
-			// Label
-			print '<td>';
-			$socialcontrib->id = $obj->rowid;
-			$socialcontrib->ref = $obj->label;
-			$socialcontrib->label = $obj->label;
-			print $socialcontrib->getNomUrl(1, '20');
-			print '</td>';
-			// Type
-			print '<td><a href="../sociales/list.php?filtre=cs.fk_type:'.$obj->type.'">'.$obj->label.'</a></td>';
-			// Expected to pay
-			print '<td class="right">'.price($obj->total).'</td>';
-			// Ref payment
-			$payment_sc_static->id = $obj->pid;
-			$payment_sc_static->ref = $obj->pid;
-			print '<td>'.$payment_sc_static->getNomUrl(1)."</td>\n";
-			// Date payment
-			print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day').'</td>';
-			// Type payment
-			print '<td>';
-			if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
-			print $obj->num_payment.'</td>';
-			// Account
-			if (!empty($conf->banque->enabled))
-			{
-				print '<td>';
-				if ($obj->fk_bank > 0)
-				{
-					//$accountstatic->fetch($obj->fk_bank);
-					$accountstatic->id = $obj->bid;
-					$accountstatic->ref = $obj->bref;
-					$accountstatic->number = $obj->bnumber;
-					$accountstatic->accountancy_number = $obj->account_number;
-					$accountstatic->accountancy_journal = $obj->accountancy_journal;
-					$accountstatic->label = $obj->blabel;
-					print $accountstatic->getNomUrl(1);
-				} else print '&nbsp;';
-				print '</td>';
-			}
-			// Paid
-			print '<td class="right">';
-			if ($obj->totalpaye) print price($obj->totalpaye);
-			print '</td>';
-			print '</tr>';
-
-			$total = $total + $obj->total;
-			$totalnb = $totalnb + $obj->nb;
-			$totalpaye = $totalpaye + $obj->totalpaye;
-			$i++;
-		}
-		print '<tr class="liste_total"><td colspan="3" class="liste_total">'.$langs->trans("Total").'</td>';
-		print '<td class="liste_total right"></td>'; // A total here has no sense
-		print '<td align="center" class="liste_total">&nbsp;</td>';
-		print '<td align="center" class="liste_total">&nbsp;</td>';
-		print '<td align="center" class="liste_total">&nbsp;</td>';
-		if (!empty($conf->banque->enabled)) print '<td></td>';
-		print '<td class="liste_total right">'.price($totalpaye)."</td>";
-		print "</tr>";
-	} else {
-		dol_print_error($db);
-	}
-	print '</table>';
+	dol_print_error($db);
+	exit;
 }
 
+$i = 0;
+$total = 0;
+$totalnb = 0;
+$totalpaye = 0;
+
+while ($i < min($num, $limit)) {
+	$obj = $db->fetch_object($resql);
+	print '<tr class="oddeven">';
+	// Date
+	$date = $obj->periode;
+	if (empty($date)) $date = $obj->date_ech;
+	print '<td>'.dol_print_date($date, 'day').'</td>';
+	// Label
+	print '<td>';
+	$socialcontrib->id = $obj->rowid;
+	$socialcontrib->ref = $obj->label;
+	$socialcontrib->label = $obj->label;
+	print $socialcontrib->getNomUrl(1, '20');
+	print '</td>';
+	// Type
+	print '<td><a href="../sociales/list.php?filtre=cs.fk_type:'.$obj->type.'">'.$obj->label.'</a></td>';
+	// Expected to pay
+	print '<td class="right">'.price($obj->total).'</td>';
+	// Ref payment
+	$payment_sc_static->id = $obj->pid;
+	$payment_sc_static->ref = $obj->pid;
+	print '<td>'.$payment_sc_static->getNomUrl(1)."</td>\n";
+	// Date payment
+	print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day').'</td>';
+	// Type payment
+	print '<td>';
+	if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
+	print $obj->num_payment.'</td>';
+	// Account
+	if (!empty($conf->banque->enabled))
+	{
+		print '<td>';
+		if ($obj->fk_bank > 0)
+		{
+			//$accountstatic->fetch($obj->fk_bank);
+			$accountstatic->id = $obj->bid;
+			$accountstatic->ref = $obj->bref;
+			$accountstatic->number = $obj->bnumber;
+			$accountstatic->accountancy_number = $obj->account_number;
+			$accountstatic->accountancy_journal = $obj->accountancy_journal;
+			$accountstatic->label = $obj->blabel;
+			print $accountstatic->getNomUrl(1);
+		} else print '&nbsp;';
+		print '</td>';
+	}
+	// Paid
+	print '<td class="right">';
+	if ($obj->totalpaye) print price($obj->totalpaye);
+	print '</td>';
+
+	print '<td></td>';
+
+	print '</tr>';
+
+	$total = $total + $obj->total;
+	$totalnb = $totalnb + $obj->nb;
+	$totalpaye = $totalpaye + $obj->totalpaye;
+	$i++;
+}
+
+// Total
+print '<tr class="liste_total"><td colspan="3" class="liste_total">'.$langs->trans("Total").'</td>';
+print '<td class="liste_total right"></td>'; // A total here has no sense
+print '<td align="center" class="liste_total">&nbsp;</td>';
+print '<td align="center" class="liste_total">&nbsp;</td>';
+print '<td align="center" class="liste_total">&nbsp;</td>';
+if (!empty($conf->banque->enabled)) print '<td></td>';
+print '<td class="liste_total right">'.price($totalpaye)."</td>";
+print '<td></td>';
+print "</tr>";
+
+print '</table>';
+
+
 print '</form>';
 
 $parameters = array('user' => $user);
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index f29d968d4d0..a4cb238d83e 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -281,26 +281,22 @@ $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$resql = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($resql);
-	if (($page * $limit) > $nbtotalofrecords)	// if total of record found is smaller than page * limit, goto and load page 0
-	{
+	if (($page * $limit) > $nbtotalofrecords) {	// if total of record found is smaller than page * limit, goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
 }
 // if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
-if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
-{
+if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) {
 	$num = $nbtotalofrecords;
 } else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
-	if (!$resql)
-	{
+	if (!$resql) {
 		dol_print_error($db);
 		exit;
 	}

From e1e8d76eb9051449af1b6070ac81d7da3e9d2653 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Dec 2020 11:30:39 +0100
Subject: [PATCH 410/888] Fix bad filter

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

diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index b776da07745..217189260ba 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -129,7 +129,7 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.ro
 $sql .= " WHERE cs.fk_type = c.id";
 $sql .= " AND cs.entity IN (".getEntity("tax").")";
 if ($search_sc_type > 0) {
-	$sql .= " AND pc.fk_typepaiement = ".((int) $search_sc_type);
+	$sql .= " AND cs.fk_type = ".((int) $search_sc_type);
 }
 if ($year > 0) {
 	$sql .= " AND (";

From d4167fb06c9618d745dd4259bf92e9e279c52848 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Dec 2020 11:35:45 +0100
Subject: [PATCH 411/888] Fix link

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

diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index 217189260ba..7432702bb34 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -232,7 +232,7 @@ while ($i < min($num, $limit)) {
 	print $socialcontrib->getNomUrl(1, '20');
 	print '</td>';
 	// Type
-	print '<td><a href="../sociales/list.php?filtre=cs.fk_type:'.$obj->type.'">'.$obj->label.'</a></td>';
+	print '<td title="'.dol_escape_htmltag($obj->label).'" class="tdmaxoverflow300">'.$obj->label.'</td>';
 	// Expected to pay
 	print '<td class="right">'.price($obj->total).'</td>';
 	// Ref payment

From 43bb5554d722f69e3dc204380f076b8ce0547e3c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Dec 2020 12:19:24 +0100
Subject: [PATCH 412/888] Clean deprecated page

---
 htdocs/admin/menus.php       |   6 --
 htdocs/admin/menus/index.php |   5 --
 htdocs/admin/menus/other.php | 106 -----------------------------------
 3 files changed, 117 deletions(-)
 delete mode 100644 htdocs/admin/menus/other.php

diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index 707cc776c6d..6fce2f01294 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -141,12 +141,6 @@ $head[$h][1] = $langs->trans("MenuAdmin");
 $head[$h][2] = 'editor';
 $h++;
 
-$head[$h][0] = DOL_URL_ROOT."/admin/menus/other.php";
-$head[$h][1] = $langs->trans("Miscellaneous");
-$head[$h][2] = 'misc';
-$h++;
-
-
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="update">';
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index f55a2a74874..a1ebb21838b 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -224,11 +224,6 @@ $head[$h][1] = $langs->trans("MenuAdmin");
 $head[$h][2] = 'editor';
 $h++;
 
-$head[$h][0] = DOL_URL_ROOT."/admin/menus/other.php";
-$head[$h][1] = $langs->trans("Miscellaneous");
-$head[$h][2] = 'misc';
-$h++;
-
 print dol_get_fiche_head($head, 'editor', '', -1);
 
 print '<span class="opacitymedium">'.$langs->trans("MenusEditorDesc")."</span><br>\n";
diff --git a/htdocs/admin/menus/other.php b/htdocs/admin/menus/other.php
deleted file mode 100644
index 2450d572abd..00000000000
--- a/htdocs/admin/menus/other.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/* Copyright (C) 2010-2012 Regis Houssin  <regis.houssin@inodbox.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *	    \file       htdocs/admin/menus/other.php
- *      \ingroup    core
- *      \brief      Menus options setup
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array("user", "other", "admin"));
-
-if (!$user->admin) accessforbidden();
-
-$action = GETPOST('action', 'aZ09');
-
-
-/*
- * Actions
- */
-
-if ($action == 'activate_hidemenu')
-{
-	dolibarr_set_const($db, "MAIN_MENU_HIDE_UNAUTHORIZED", '1', 'chaine', 0, '', $conf->entity);
-	header("Location: ".$_SERVER["PHP_SELF"]);
-	exit;
-} elseif ($action == 'disable_hidemenu')
-{
-	dolibarr_del_const($db, "MAIN_MENU_HIDE_UNAUTHORIZED", $conf->entity);
-	header("Location: ".$_SERVER["PHP_SELF"]);
-	exit;
-}
-
-
-/*
- * View
- */
-
-llxHeader('', $langs->trans("Setup"));
-
-print load_fiche_titre($langs->trans("Menus"), '', 'title_setup');
-
-
-$h = 0;
-
-$head[$h][0] = DOL_URL_ROOT."/admin/menus.php";
-$head[$h][1] = $langs->trans("MenuHandlers");
-$head[$h][2] = 'handler';
-$h++;
-
-$head[$h][0] = DOL_URL_ROOT."/admin/menus/index.php";
-$head[$h][1] = $langs->trans("MenuAdmin");
-$head[$h][2] = 'editor';
-$h++;
-
-$head[$h][0] = DOL_URL_ROOT."/admin/menus/other.php";
-$head[$h][1] = $langs->trans("Miscellaneous");
-$head[$h][2] = 'misc';
-$h++;
-
-print dol_get_fiche_head($head, 'misc', '', -1);
-
-
-// Other Options
-
-print '<table class="noborder centpercent">';
-print '<tr class="liste_titre">';
-print '<td colspan="3">'.$langs->trans("Parameters").'</td>';
-print '<td class="center" width="80">'.$langs->trans("Status").'</td>';
-print '</tr>';
-
-// Hide unauthorized menu
-print '<tr class="oddeven">';
-print '<td colspan="3">'.$langs->trans("HideUnauthorizedMenu").'</td>';
-print '<td class="center">';
-if (empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))
-{
-	print '<a href="'.$_SERVER["PHP_SELF"].'?action=activate_hidemenu">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-} else {
-	print '<a href="'.$_SERVER["PHP_SELF"].'?action=disable_hidemenu">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
-}
-print "</td>";
-print '</tr>';
-
-print '</table>';
-
-// End of page
-llxFooter();
-$db->close();

From 107e58403a106d965de64f58fed4e80579355222 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Dec 2020 12:54:54 +0100
Subject: [PATCH 413/888] Fix position of captcha

---
 htdocs/core/tpl/login.tpl.php             | 35 +++++++++++----------
 htdocs/core/tpl/passwordforgotten.tpl.php | 37 ++++++++++++-----------
 2 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 2d0b9ad57c1..5adb1bfbe05 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -164,21 +164,6 @@ if ($disablenofollow) echo '</a>';
 </div></div>
 
 <?php
-if (!empty($morelogincontent)) {
-	if (is_array($morelogincontent)) {
-		foreach ($morelogincontent as $format => $option)
-		{
-			if ($format == 'table') {
-				echo '<!-- Option by hook -->';
-				echo $option;
-			}
-		}
-	} else {
-		echo '<!-- Option by hook -->';
-		echo $morelogincontent;
-	}
-}
-
 if ($captcha) {
 	// Add a variable param to force not using cache (jmobile)
 	$php_self = preg_replace('/[&\?]time=(\d+)/', '', $php_self); // Remove param time
@@ -200,7 +185,25 @@ if ($captcha) {
 	</span>
 
 	</div></div>
-<?php } ?>
+<?php
+}
+
+if (!empty($morelogincontent)) {
+	if (is_array($morelogincontent)) {
+		foreach ($morelogincontent as $format => $option)
+		{
+			if ($format == 'table') {
+				echo '<!-- Option by hook -->';
+				echo $option;
+			}
+		}
+	} else {
+		echo '<!-- Option by hook -->';
+		echo $morelogincontent;
+	}
+}
+
+?>
 
 </div>
 
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index f11e01c7d13..f64658448ae 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -113,23 +113,7 @@ if ($disablenofollow) echo '</a>';
 </div>
 
 <?php
-if (!empty($morelogincontent)) {
-	if (is_array($morelogincontent)) {
-		foreach ($morelogincontent as $format => $option)
-		{
-			if ($format == 'table') {
-				echo '<!-- Option by hook -->';
-				echo $option;
-			}
-		}
-	} else {
-		echo '<!-- Option by hook -->';
-		echo $morelogincontent;
-	}
-}
-?>
-
-<?php if ($captcha) {
+if ($captcha) {
 	// Add a variable param to force not using cache (jmobile)
 	$php_self = preg_replace('/[&\?]time=(\d+)/', '', $php_self); // Remove param time
 	if (preg_match('/\?/', $php_self)) $php_self .= '&time='.dol_print_date(dol_now(), 'dayhourlog');
@@ -150,7 +134,24 @@ if (!empty($morelogincontent)) {
 	</span>
 
 	</div></div>
-<?php } ?>
+<?php
+}
+
+if (!empty($morelogincontent)) {
+	if (is_array($morelogincontent)) {
+		foreach ($morelogincontent as $format => $option)
+		{
+			if ($format == 'table') {
+				echo '<!-- Option by hook -->';
+				echo $option;
+			}
+		}
+	} else {
+		echo '<!-- Option by hook -->';
+		echo $morelogincontent;
+	}
+}
+?>
 
 </div>
 

From e612f53494815752782977d120bfe37f0213885c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Dec 2020 13:01:25 +0100
Subject: [PATCH 414/888] Fix warning

---
 htdocs/core/lib/functions.lib.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e67269b71ba..f846ea55787 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5595,7 +5595,7 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart = '
 		// Here, $object->id, $object->ref and $modulepart are required.
 		//var_dump($modulepart);
 		if (!in_array($modulepart, array('product'))) {	// Test to remove
-			$path = dol_sanitizeFileName(empty($object->ref) ? $object->id : $object->ref);
+			$path = dol_sanitizeFileName(empty($object->ref) ? (string) $object->id : $object->ref);
 		}
 	}
 
@@ -7127,10 +7127,11 @@ function dol_sort_array(&$array, $index, $order = 'asc', $natsort = 0, $case_sen
  */
 function utf8_check($str)
 {
+	$str = (string) $str;	// Sometimes string is an int.
+
 	// We must use here a binary strlen function (so not dol_strlen)
 	$strLength = dol_strlen($str);
-	for ($i = 0; $i < $strLength; $i++)
-	{
+	for ($i = 0; $i < $strLength; $i++) {
 		if (ord($str[$i]) < 0x80) continue; // 0bbbbbbb
 		elseif ((ord($str[$i]) & 0xE0) == 0xC0) $n = 1; // 110bbbbb
 		elseif ((ord($str[$i]) & 0xF0) == 0xE0) $n = 2; // 1110bbbb

From b991badb8cdd71f691f1a85e0d3a5c96fffc5bb9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Dec 2020 13:03:43 +0100
Subject: [PATCH 415/888] Fix warning

---
 htdocs/commande/class/commande.class.php                   | 2 +-
 htdocs/compta/facture/class/facture.class.php              | 2 +-
 htdocs/fourn/class/fournisseur.commande.class.php          | 2 +-
 htdocs/fourn/class/fournisseur.facture.class.php           | 2 +-
 htdocs/supplier_proposal/class/supplier_proposal.class.php | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index b825289b45e..9ea05a13065 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1081,7 +1081,7 @@ class Commande extends CommonOrder
 					}
 
 					// Add object linked
-					if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects))
+					if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects))
 					{
 						foreach ($this->linked_objects as $origin => $tmp_origin_id)
 						{
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 2cc77efcca4..5f7bf4fcf77 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -679,7 +679,7 @@ class Facture extends CommonInvoice
 			}
 
 			// Add object linked
-			if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects))
+			if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects))
 			{
 				foreach ($this->linked_objects as $origin => $tmp_origin_id)
 				{
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index c1be4db7be3..e2c061269d5 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1380,7 +1380,7 @@ class CommandeFournisseur extends CommonOrder
 						}
 
 						// Add object linked
-						if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects))
+						if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects))
 						{
 							foreach ($this->linked_objects as $origin => $tmp_origin_id)
 							{
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 57bb5f4c822..e3b65d8a8de 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -438,7 +438,7 @@ class FactureFournisseur extends CommonInvoice
 			}
 
 			// Add object linked
-			if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects))
+			if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects))
 			{
 				foreach ($this->linked_objects as $origin => $tmp_origin_id)
 				{
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index ad4f47389d5..7a1e10eed3f 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -954,7 +954,7 @@ class SupplierProposal extends CommonObject
 				}
 
 				// Add object linked
-				if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects))
+				if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects))
 				{
 					foreach ($this->linked_objects as $origin => $tmp_origin_id)
 					{

From 8114e86cf9004d4216c7dbb98739089afa233666 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Dec 2020 13:40:30 +0100
Subject: [PATCH 416/888] Fix phpcs

---
 htdocs/core/tpl/login.tpl.php             | 2 +-
 htdocs/core/tpl/passwordforgotten.tpl.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 5adb1bfbe05..821b423aab3 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -185,7 +185,7 @@ if ($captcha) {
 	</span>
 
 	</div></div>
-<?php
+	<?php
 }
 
 if (!empty($morelogincontent)) {
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index f64658448ae..937ee63a68c 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -134,7 +134,7 @@ if ($captcha) {
 	</span>
 
 	</div></div>
-<?php
+	<?php
 }
 
 if (!empty($morelogincontent)) {

From d9886044a668739beae684fccb11aa319448edf7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Dec 2020 15:10:31 +0100
Subject: [PATCH 417/888] Trans

---
 htdocs/langs/en_US/admin.lang | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 00b7014eb71..b6784b75835 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2085,4 +2085,5 @@ ModuleActivatedMayExposeInformation=This module may expose sensitive data. If yo
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
-SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF. 
\ No newline at end of file
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
\ No newline at end of file

From 5f9b53004ba56fa7a11c76323f74f993bc810515 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Dec 2020 17:40:40 +0100
Subject: [PATCH 418/888] Fix warning

---
 htdocs/core/lib/functions.lib.php                     | 5 ++++-
 htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 37791d1e72d..023ade28052 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6626,6 +6626,7 @@ function complete_substitutions_array(&$substitutionarray, $outputlangs, $object
 		$substitfiles = dol_dir_list($dir, 'files', 0, 'functions_');
 		foreach ($substitfiles as $substitfile)
 		{
+			$reg = array();
 			if (preg_match('/functions_(.*)\.lib\.php/i', $substitfile['name'], $reg))
 			{
 				$module = $reg[1];
@@ -6635,7 +6636,9 @@ function complete_substitutions_array(&$substitutionarray, $outputlangs, $object
 				require_once $dir.$substitfile['name'];
 				// Call the user's function, and only if it is defined
 				$function_name = $module."_".$callfunc;
-				if (function_exists($function_name)) $function_name($substitutionarray, $outputlangs, $object, $parameters);
+				if (function_exists($function_name)) {
+					$function_name($substitutionarray, $outputlangs, $object, $parameters);
+				}
 			}
 		}
 	}
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 771325da38a..a5ef291da9f 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -468,6 +468,7 @@ class pdf_crabe extends ModelePDFFactures
 
 					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
 					complete_substitutions_array($substitutionarray, $outputlangs, $object);
+
 					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
 					$notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
 

From 9595504b56d9249194465e54c9b54cf4c26ed39f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Dec 2020 19:57:59 +0100
Subject: [PATCH 419/888] Fix graph

---
 htdocs/core/boxes/box_scheduled_jobs.php | 4 ++--
 htdocs/core/class/dolgraph.class.php     | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/boxes/box_scheduled_jobs.php b/htdocs/core/boxes/box_scheduled_jobs.php
index d8efa1b9dbc..94106c47134 100644
--- a/htdocs/core/boxes/box_scheduled_jobs.php
+++ b/htdocs/core/boxes/box_scheduled_jobs.php
@@ -164,8 +164,8 @@ class box_scheduled_jobs extends ModeleBoxes
 					'text' => $langs->trans("NumberScheduledJobError")
 				);
 				$this->info_box_contents[$line][] = array(
-					'td' => 'class="right"colspan="2"',
-					'textnoformat' => $nbjobsinerror ? '<span class="error"><a href="'.DOL_URL_ROOT.'/cron/list.php?search_lastresult='.urlencode('<>0').'">'.$nbjobsinerror.'</a></span>'.img_error() : '0'
+					'td' => 'class="right" colspan="2"',
+					'textnoformat' => ($nbjobsinerror ? '<span class="error"><a href="'.DOL_URL_ROOT.'/cron/list.php?search_lastresult='.urlencode('<>0').'">'.$nbjobsinerror.'</a></span>'.img_error() : '0')
 				);
 			} else {
 				$this->info_box_contents[0][0] = array(
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index bd350e40991..36638be33c1 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -1151,10 +1151,11 @@ class DolGraph
 				$this->stringtoshow .= ', stacked: true';
 			}
 			$this->stringtoshow .= ' }]';
+			$this->stringtoshow .= ', yAxes: [{ ticks: { beginAtZero: true }';
 			if ($type == 'bar' && count($arrayofgroupslegend) > 0) {
-				$this->stringtoshow .= ', yAxes: [{ stacked: true }]';
+				$this->stringtoshow .= ', stacked: true';
 			}
-			$this->stringtoshow .= ' }';
+			$this->stringtoshow .= ' }] }';
 			// Add a callback to change label to show only positive value
 			if ($isfunnel) {
 				$this->stringtoshow .= ', tooltips: { mode: \'nearest\',

From 2d343ab016090f75a6c8a272e03ac002090a3308 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Dec 2020 20:01:17 +0100
Subject: [PATCH 420/888] Fix

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

diff --git a/htdocs/core/boxes/box_scheduled_jobs.php b/htdocs/core/boxes/box_scheduled_jobs.php
index 94106c47134..81e73f4e0c1 100644
--- a/htdocs/core/boxes/box_scheduled_jobs.php
+++ b/htdocs/core/boxes/box_scheduled_jobs.php
@@ -165,7 +165,7 @@ class box_scheduled_jobs extends ModeleBoxes
 				);
 				$this->info_box_contents[$line][] = array(
 					'td' => 'class="right" colspan="2"',
-					'textnoformat' => ($nbjobsinerror ? '<span class="error"><a href="'.DOL_URL_ROOT.'/cron/list.php?search_lastresult='.urlencode('<>0').'">'.$nbjobsinerror.'</a></span>'.img_error() : '0')
+					'textnoformat' => ($nbjobsinerror ? '<span class="error"><a href="'.DOL_URL_ROOT.'/cron/list.php?search_lastresult='.urlencode('<>0').'">'.$nbjobsinerror.'</a></span>'.img_error() : '<span class="opacitymedium">'.$langs->trans("None").'<span>')
 				);
 			} else {
 				$this->info_box_contents[0][0] = array(

From 098f51413f82d4cb26a569175b95503657097a4d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Dec 2020 20:33:27 +0100
Subject: [PATCH 421/888] Fix translation

---
 htdocs/core/modules/modEmailCollector.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/modEmailCollector.class.php b/htdocs/core/modules/modEmailCollector.class.php
index 45246cadcca..f71932c93b9 100644
--- a/htdocs/core/modules/modEmailCollector.class.php
+++ b/htdocs/core/modules/modEmailCollector.class.php
@@ -313,7 +313,7 @@ class modEmailCollector extends DolibarrModules
 				$descriptionA1 = 'This collector will scan your mailbox "Sent" directory to find emails that was sent as an answer of another email directly from your email software and not from Dolibarr. If such an email is found, the event of answer is recorded into Dolibarr.';
 
 				$sqlforexampleA1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
-				$sqlforexampleA1 .= " VALUES (".$conf->entity.", 'Collect_Responses_Out', 'Example to collect answers to emails done from email software', '".$this->db->escape($descriptionA1)."', 'Sent', '".$this->db->idate(dol_now())."', ".$user->id.", 0)";
+				$sqlforexampleA1 .= " VALUES (".$conf->entity.", 'Collect_Responses_Out', 'Example to collect answers to emails done from your external email software', '".$this->db->escape($descriptionA1)."', 'Sent', '".$this->db->idate(dol_now())."', ".$user->id.", 0)";
 
 				$sqlforexampleFilterA1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
 				$sqlforexampleFilterA1 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses_Out' and entity = ".$conf->entity."), 'isanswer', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
@@ -333,10 +333,10 @@ class modEmailCollector extends DolibarrModules
 		$tmpresql = $this->db->query($tmpsql);
 		if ($tmpresql) {
 			if ($this->db->num_rows($tmpresql) == 0) {
-				$descriptionB1 = 'This collector will scan your mailbox to find all emails that are an answer of an email sent from your application. An event (Module Agenda must be enabled) with the email response will be recorded at the good place. For example, if your send a commercial proposal, order, invoice or message for a ticket by email from the application, and your customer answers your email, the system will automatically find the answer and add it into your ERP.';
+				$descriptionB1 = 'This collector will scan your mailbox to find all emails that are an answer of an email sent from your application. An event (Module Agenda must be enabled) with the email response will be recorded at the good place. For example, if your send a commercial proposal, order, invoice or message for a ticket by email from the application, and your customer answers your email, the system will automatically catch the answer and add it into your ERP.';
 
 				$sqlforexampleB1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
-				$sqlforexampleB1 .= " VALUES (".$conf->entity.", 'Collect_Responses_In', 'Example to collect any input email responses', '".$this->db->escape($descriptionB1)."', 'INBOX', '".$this->db->idate(dol_now())."', ".$user->id.", 0)";
+				$sqlforexampleB1 .= " VALUES (".$conf->entity.", 'Collect_Responses_In', 'Example to collect any received email that is a response of an email sent from Dolibarr', '".$this->db->escape($descriptionB1)."', 'INBOX', '".$this->db->idate(dol_now())."', ".$user->id.", 0)";
 				$sqlforexampleB2 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
 				$sqlforexampleB2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses_In' and entity = ".$conf->entity."), 'isanswer', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
 				$sqlforexampleB3 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectoraction (fk_emailcollector, type, date_creation, fk_user_creat, status)";

From 66e4de628c286cbb08c0022b12e6014d5292282b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Dec 2020 20:38:22 +0100
Subject: [PATCH 422/888] Fix permissions

---
 htdocs/admin/emailcollector_list.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index 3674d88a372..e85a9652075 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -131,9 +131,12 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
-$permissiontoread = $user->rights->emailcollector->read;
+/*$permissiontoread = $user->rights->emailcollector->read;
 $permissiontoadd = $user->rights->emailcollector->write;
-$permissiontodelete = $user->rights->emailcollector->delete;
+$permissiontodelete = $user->rights->emailcollector->delete;*/
+$permissiontoread = $user->admin;
+$permissiontoadd = $user->admin;
+$permissiontodelete = $user->admin;
 
 if (!$user->admin) accessforbidden();
 if (empty($conf->emailcollector->enabled)) accessforbidden('Module not enabled');
@@ -175,8 +178,6 @@ if (empty($reshook))
 	// Mass actions
 	$objectclass = 'EmailCollector';
 	$objectlabel = 'EmailCollector';
-	$permissiontoread = $user->rights->emailcollector->read;
-	$permissiontodelete = $user->rights->emailcollector->delete;
 	$uploaddir = $conf->emailcollector->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

From bc9f7c83f40d6ff1e2a16fcb1dc9bbad1eb063c2 Mon Sep 17 00:00:00 2001
From: David Bensel <40593993+davidNDU@users.noreply.github.com>
Date: Mon, 14 Dec 2020 22:40:47 +0300
Subject: [PATCH 423/888] update

---
 .github/CONTRIBUTING.md                       |    18 +-
 .github/workflows/exakat.yml                  |     4 +-
 .github/workflows/stale-issues-safe.yml       |     2 +-
 .gitignore                                    |    13 +
 .scrutinizer.yml                              |     4 +-
 .travis.yml                                   |   102 +-
 .tx/config                                    |     6 +
 COPYRIGHT                                     |     4 +-
 ChangeLog                                     |   426 +-
 INSTALL                                       |     6 -
 README-FR.md                                  |     2 +-
 README.md                                     |    38 +-
 SECURITY.md                                   |    39 +-
 build/README                                  |    26 +-
 build/debian/README.howto                     |     2 +-
 build/debian/conf.php.install                 |     4 +-
 build/debian/copyright                        |    98 +-
 build/debian/dolibarr.postinst                |     1 -
 build/debian/install.forced.php.install       |     2 +-
 build/debian/rules                            |     3 -
 build/docker/Dockerfile                       |    15 +-
 build/docker/README.md                        |     9 +-
 build/docker/docker-compose.yml               |     6 +
 build/exe/doliwamp/doliwamp.iss               |     2 +-
 build/exe/doliwamp/install.forced.php.install |     1 +
 build/generate_filelist_xml.php               |     5 +
 build/makepack-dolibarr.pl                    |    43 +-
 build/perl/virtualmin/dolibarr.pl             |    20 +-
 build/rpm/dolibarr_fedora.spec                |     4 +-
 build/rpm/dolibarr_generic.spec               |     4 +-
 build/rpm/dolibarr_mandriva.spec              |     4 +-
 build/rpm/dolibarr_opensuse.spec              |     4 +-
 build/rpm/install.forced.php.fedora           |     2 +-
 build/rpm/install.forced.php.generic          |     1 +
 build/rpm/install.forced.php.mandriva         |     2 +-
 build/rpm/install.forced.php.opensuse         |     2 +-
 composer.json                                 |     4 +-
 composer.lock                                 |   592 +-
 dev/dolibarr_changes.txt                      |     9 +-
 dev/examples/zapier/.editorconfig             |    21 +
 dev/examples/zapier/.gitignore                |     1 +
 dev/examples/zapier/README.md                 |    68 +
 dev/examples/zapier/authentication.js         |   119 +-
 dev/examples/zapier/creates/thirdparty.js     |     6 +-
 dev/examples/zapier/index.js                  |    52 +-
 dev/examples/zapier/package-lock.json         |   405 -
 dev/examples/zapier/package.json              |     8 +-
 dev/examples/zapier/searches/thirdparty.js    |    15 +-
 dev/examples/zapier/triggers/action.js        |    44 +-
 dev/examples/zapier/triggers/order.js         |    11 +-
 dev/examples/zapier/triggers/thirdparty.js    |    11 +-
 dev/examples/zapier/triggers/ticket.js        |   237 +
 dev/examples/zapier/triggers/user.js          |   177 +
 dev/initdata/purge-data.php                   |     6 +-
 dev/initdemo/initdemo.sh                      |     4 +-
 ....0.0.sql => mysqldump_dolibarr_13.0.0.sql} |  2600 +++-
 dev/initdemo/mysqldump_dolibarr_3.5.0.sql     |     4 +-
 .../Intracommreport-ManuelDebXml.pdf          |   Bin 0 -> 225572 bytes
 .../Intracommreport-ManuelDesXML.pdf          |   Bin 0 -> 187033 bytes
 dev/resources/iso-normes/company_ids.txt      |     2 +
 dev/setup/codesniffer/ruleset.xml             |     1 +
 dev/tools/dolibarr-postgres2mysql.php         |     4 +-
 dev/translation/README                        |    13 +-
 dev/translation/autotranslator.php            |     6 +-
 .../erp_comparison_translation.txt            |    25 -
 doc/images/invoice.png                        |   Bin 0 -> 64306 bytes
 doc/install/README-DE                         |    38 +-
 doc/install/README-FR                         |    13 +-
 htdocs/accountancy/admin/account.php          |   188 +-
 htdocs/accountancy/admin/accountmodel.php     |    18 +-
 htdocs/accountancy/admin/card.php             |    46 +-
 htdocs/accountancy/admin/categories.php       |     6 +-
 htdocs/accountancy/admin/categories_list.php  |  1104 +-
 htdocs/accountancy/admin/closure.php          |    48 +-
 htdocs/accountancy/admin/defaultaccounts.php  |    38 +-
 htdocs/accountancy/admin/export.php           |   136 +-
 htdocs/accountancy/admin/fiscalyear.php       |     2 +-
 htdocs/accountancy/admin/fiscalyear_card.php  |    30 +-
 htdocs/accountancy/admin/fiscalyear_info.php  |     2 +-
 htdocs/accountancy/admin/journals_list.php    |    50 +-
 htdocs/accountancy/admin/productaccount.php   |   280 +-
 htdocs/accountancy/admin/subaccount.php       |   419 +
 htdocs/accountancy/bookkeeping/balance.php    |    47 +-
 htdocs/accountancy/bookkeeping/card.php       |    44 +-
 htdocs/accountancy/bookkeeping/list.php       |   550 +-
 .../accountancy/bookkeeping/listbyaccount.php |    87 +-
 .../bookkeeping/listbysubaccount.php          |   770 ++
 .../thirdparty_lettering_customer.php         |    50 +-
 .../thirdparty_lettering_supplier.php         |    48 +-
 .../class/accountancycategory.class.php       |   128 +-
 .../class/accountancyexport.class.php         |   693 +-
 .../class/accountancysystem.class.php         |   114 +-
 .../class/accountingaccount.class.php         |   168 +-
 .../class/accountingjournal.class.php         |    50 +-
 .../accountancy/class/bookkeeping.class.php   |   342 +-
 htdocs/accountancy/closure/validate.php       |    36 +-
 htdocs/accountancy/customer/card.php          |    22 +-
 htdocs/accountancy/customer/lines.php         |     2 +-
 htdocs/accountancy/customer/list.php          |     6 -
 htdocs/accountancy/expensereport/card.php     |     8 +-
 htdocs/accountancy/expensereport/lines.php    |     6 +-
 htdocs/accountancy/expensereport/list.php     |    10 +-
 htdocs/accountancy/index.php                  |   151 +-
 htdocs/accountancy/journal/bankjournal.php    |   465 +-
 .../journal/expensereportsjournal.php         |    90 +-
 .../accountancy/journal/purchasesjournal.php  |     6 +-
 htdocs/accountancy/journal/sellsjournal.php   |     8 +-
 htdocs/accountancy/supplier/card.php          |    22 +-
 htdocs/accountancy/supplier/lines.php         |     2 +-
 htdocs/accountancy/supplier/list.php          |     6 -
 htdocs/adherents/admin/adherent.php           |   253 +-
 htdocs/adherents/admin/adherent_emails.php    |     4 +-
 .../adherents/admin/adherent_extrafields.php  |     8 +-
 .../admin/adherent_type_extrafields.php       |     4 +-
 htdocs/adherents/admin/website.php            |    36 +-
 htdocs/adherents/agenda.php                   |    60 +-
 .../actions_adherentcard_common.class.php     |   308 +-
 .../actions_adherentcard_default.class.php    |    72 +-
 .../default/tpl/adherentcard_edit.tpl.php     |     4 +-
 .../default/tpl/adherentcard_view.tpl.php     |    22 +-
 htdocs/adherents/card.php                     |    88 +-
 htdocs/adherents/cartes/carte.php             |   278 +-
 htdocs/adherents/class/adherent.class.php     |   127 +-
 .../adherents/class/adherent_type.class.php   |    46 +-
 .../adherents/class/adherentstats.class.php   |    56 +-
 htdocs/adherents/class/api_members.class.php  |   837 +-
 .../class/api_memberstypes.class.php          |   512 +-
 .../class/api_subscriptions.class.php         |   386 +-
 htdocs/adherents/class/subscription.class.php |   748 +-
 htdocs/adherents/document.php                 |    55 +-
 htdocs/adherents/index.php                    |   223 +-
 htdocs/adherents/ldap.php                     |    36 +-
 htdocs/adherents/list.php                     |    51 +-
 htdocs/adherents/note.php                     |    52 +-
 htdocs/adherents/stats/byproperties.php       |    12 +-
 htdocs/adherents/stats/geo.php                |   372 +-
 htdocs/adherents/stats/index.php              |   132 +-
 htdocs/adherents/subscription.php             |  1144 +-
 htdocs/adherents/subscription/card.php        |   273 +-
 htdocs/adherents/subscription/info.php        |     4 +-
 htdocs/adherents/subscription/list.php        |    79 +-
 .../adherents/tpl/linkedobjectblock.tpl.php   |    14 +-
 htdocs/adherents/type.php                     |    61 +-
 htdocs/adherents/type_ldap.php                |    40 +-
 htdocs/adherents/type_translation.php         |    65 +-
 htdocs/adherents/vcard.php                    |    57 +-
 htdocs/admin/accountant.php                   |     6 +-
 htdocs/admin/agenda.php                       |    26 +-
 htdocs/admin/agenda_extrafields.php           |    20 +-
 htdocs/admin/agenda_extsites.php              |    26 +-
 htdocs/admin/agenda_other.php                 |   286 +-
 htdocs/admin/agenda_reminder.php              |   171 +-
 htdocs/admin/agenda_xcal.php                  |    47 +-
 htdocs/admin/bank.php                         |     8 +-
 htdocs/admin/bank_extrafields.php             |    20 +-
 htdocs/admin/barcode.php                      |   170 +-
 htdocs/admin/bom.php                          |    10 +-
 htdocs/admin/bom_extrafields.php              |    20 +-
 htdocs/admin/boxes.php                        |   166 +-
 htdocs/admin/chequereceipts.php               |    10 +-
 htdocs/admin/clicktodial.php                  |    18 +-
 htdocs/admin/commande.php                     |    10 +-
 ...mande_fournisseur_dispatch_extrafields.php |     4 +-
 htdocs/admin/company.php                      |   121 +-
 htdocs/admin/company_socialnetworks.php       |   142 +
 htdocs/admin/compta.php                       |    90 +-
 htdocs/admin/confexped.php                    |    10 +-
 htdocs/admin/const.php                        |     2 +-
 htdocs/admin/contract.php                     |    16 +-
 htdocs/admin/dav.php                          |    18 +-
 htdocs/admin/debugbar.php                     |    10 +-
 htdocs/admin/defaultvalues.php                |   171 +-
 htdocs/admin/delais.php                       |   114 +-
 htdocs/admin/delivery.php                     |   459 +
 ...trafields.php => delivery_extrafields.php} |    12 +-
 ...fields.php => deliverydet_extrafields.php} |    28 +-
 htdocs/admin/dict.php                         |  1895 +--
 htdocs/admin/dolistore/ajax/image.php         |     2 +-
 .../class/PSWebServiceLibrary.class.php       |    54 +-
 .../admin/dolistore/class/dolistore.class.php |   190 +-
 htdocs/admin/dolistore/class/index.html       |     1 +
 htdocs/admin/dolistore/index.html             |     1 +
 htdocs/admin/ecm.php                          |     5 +
 htdocs/admin/ecm_directories_extrafields.php  |   123 +
 htdocs/admin/ecm_files_extrafields.php        |   123 +
 htdocs/admin/emailcollector_card.php          |    97 +-
 htdocs/admin/emailcollector_list.php          |    42 +-
 htdocs/admin/events.php                       |     8 +-
 htdocs/admin/expedition.php                   |    12 +-
 htdocs/admin/expedition_extrafields.php       |     4 +-
 htdocs/admin/expeditiondet_extrafields.php    |    20 +-
 htdocs/admin/expensereport.php                |   214 +-
 htdocs/admin/expensereport_extrafields.php    |     4 +-
 htdocs/admin/expensereport_ik.php             |     8 +-
 htdocs/admin/expensereport_rules.php          |     6 +-
 htdocs/admin/export.php                       |     4 +-
 htdocs/admin/external_rss.php                 |   120 +-
 htdocs/admin/facture.php                      |    12 +-
 htdocs/admin/facture_situation.php            |   125 +-
 htdocs/admin/fckeditor.php                    |   168 +-
 htdocs/admin/fichinter.php                    |   268 +-
 htdocs/admin/geoipmaxmind.php                 |     2 +-
 htdocs/admin/holiday.php                      |    15 +-
 htdocs/admin/holiday_extrafields.php          |    20 +-
 htdocs/admin/ihm.php                          |    59 +-
 htdocs/admin/import.php                       |     4 +-
 htdocs/admin/index.php                        |    36 +-
 htdocs/admin/ldap.php                         |     4 +-
 htdocs/admin/ldap_contacts.php                |     4 +-
 htdocs/admin/ldap_groups.php                  |    28 +-
 htdocs/admin/ldap_members.php                 |     4 +-
 htdocs/admin/ldap_members_types.php           |     4 +-
 htdocs/admin/ldap_users.php                   |     4 +-
 htdocs/admin/limits.php                       |   252 +-
 htdocs/admin/livraison.php                    |   460 -
 htdocs/admin/loan.php                         |    28 +-
 htdocs/admin/mailman.php                      |   164 +-
 htdocs/admin/mails.php                        |   540 +-
 htdocs/admin/mails_emailing.php               |    68 +-
 htdocs/admin/mails_senderprofile_list.php     |    16 +-
 htdocs/admin/mails_templates.php              |   457 +-
 htdocs/admin/mails_ticket.php                 |    68 +-
 htdocs/admin/menus.php                        |    12 +-
 htdocs/admin/menus/edit.php                   |   268 +-
 htdocs/admin/menus/index.php                  |    71 +-
 htdocs/admin/menus/other.php                  |   106 -
 htdocs/admin/modulehelp.php                   |   554 +-
 htdocs/admin/modules.php                      |   663 +-
 htdocs/admin/mrp.php                          |    10 +-
 htdocs/admin/mrp_extrafields.php              |    20 +-
 htdocs/admin/multicurrency.php                |    72 +-
 htdocs/admin/notification.php                 |   156 +-
 htdocs/admin/oauth.php                        |   106 +-
 htdocs/admin/oauthlogintokens.php             |   524 +-
 htdocs/admin/openinghours.php                 |    54 +-
 htdocs/admin/order_extrafields.php            |    20 +-
 htdocs/admin/orderdet_extrafields.php         |    20 +-
 htdocs/admin/payment.php                      |   204 +-
 htdocs/admin/paymentbybanktransfer.php        |     6 +-
 htdocs/admin/pdf.php                          |    55 +-
 htdocs/admin/perms.php                        |   150 +-
 htdocs/admin/prelevement.php                  |     6 +-
 htdocs/admin/propal.php                       |   242 +-
 htdocs/admin/proxy.php                        |     6 +-
 htdocs/admin/receiptprinter.php               |   596 +-
 htdocs/admin/reception_extrafields.php        |     4 +-
 htdocs/admin/reception_setup.php              |     7 +-
 htdocs/admin/resource.php                     |     4 +-
 htdocs/admin/resource_extrafields.php         |    20 +-
 htdocs/admin/security.php                     |   199 +-
 htdocs/admin/security_file.php                |    32 +-
 htdocs/admin/security_other.php               |     8 +-
 htdocs/admin/sms.php                          |   128 +-
 htdocs/admin/socialnetworks.php               |    52 +-
 htdocs/admin/spip.php                         |   104 +-
 htdocs/admin/stock.php                        |    22 +-
 htdocs/admin/supplier_invoice.php             |   418 +-
 htdocs/admin/supplier_order.php               |   449 +-
 htdocs/admin/supplier_payment.php             |   418 +-
 htdocs/admin/supplier_proposal.php            |   274 +-
 htdocs/admin/supplierinvoice_extrafields.php  |    20 +-
 .../admin/supplierinvoicedet_extrafields.php  |     4 +-
 htdocs/admin/supplierorder_extrafields.php    |     4 +-
 htdocs/admin/supplierorderdet_extrafields.php |    20 +-
 htdocs/admin/syslog.php                       |    33 +-
 htdocs/admin/system/about.php                 |    41 +-
 htdocs/admin/system/constall.php              |     2 -
 htdocs/admin/system/database-tables.php       |     2 +-
 htdocs/admin/system/database.php              |     2 +-
 htdocs/admin/system/dolibarr.php              |    98 +-
 htdocs/admin/system/filecheck.php             |   566 +-
 htdocs/admin/system/index.php                 |     8 +-
 htdocs/admin/system/modules.php               |    16 +
 htdocs/admin/system/perf.php                  |    11 +-
 htdocs/admin/system/phpinfo.php               |   142 +-
 htdocs/admin/system/security.php              |   183 +
 htdocs/admin/taxes.php                        |     2 +-
 htdocs/admin/ticket.php                       |     7 +-
 htdocs/admin/ticket_extrafields.php           |     4 +-
 htdocs/admin/ticket_public.php                |   474 +-
 htdocs/admin/tools/dolibarr_export.php        |   409 +-
 htdocs/admin/tools/dolibarr_import.php        |    92 +-
 htdocs/admin/tools/export.php                 |   116 +-
 htdocs/admin/tools/export_files.php           |    96 +-
 htdocs/admin/tools/listevents.php             |    47 +-
 htdocs/admin/tools/listsessions.php           |     6 +-
 htdocs/admin/tools/purge.php                  |    39 +-
 htdocs/admin/tools/update.php                 |     2 +-
 htdocs/admin/translation.php                  |   494 +-
 htdocs/admin/user.php                         |   215 +-
 htdocs/admin/usergroup.php                    |   212 +-
 htdocs/admin/website.php                      |   712 +-
 htdocs/admin/website_options.php              |     6 +-
 htdocs/admin/workflow.php                     |     2 +-
 htdocs/api/admin/explorer.php                 |   146 +-
 htdocs/api/admin/index.php                    |    31 +-
 htdocs/api/class/api.class.php                |   424 +-
 htdocs/api/class/api_access.class.php         |    88 +-
 htdocs/api/class/api_documents.class.php      |   167 +-
 htdocs/api/class/api_login.class.php          |    64 +-
 htdocs/api/class/api_setup.class.php          |  3623 +++---
 htdocs/api/class/api_status.class.php         |    32 +-
 htdocs/api/index.php                          |   192 +-
 htdocs/asset/admin/assets_extrafields.php     |     4 +-
 .../asset/admin/assets_type_extrafields.php   |     8 +-
 htdocs/asset/admin/setup.php                  |     6 +-
 htdocs/asset/card.php                         |    18 +-
 htdocs/asset/class/asset.class.php            |    62 +-
 htdocs/asset/class/asset_type.class.php       |    38 +-
 htdocs/asset/document.php                     |     4 +-
 htdocs/asset/info.php                         |     4 +-
 htdocs/asset/list.php                         |     4 +-
 htdocs/asset/note.php                         |     4 +-
 htdocs/asset/type.php                         |    20 +-
 htdocs/asterisk/cidlookup.php                 |     4 +-
 htdocs/asterisk/wrapper.php                   |    92 +-
 htdocs/barcode/printsheet.php                 |    56 +-
 htdocs/blockedlog/admin/blockedlog.php        |    23 +-
 htdocs/blockedlog/admin/blockedlog_list.php   |     6 +-
 htdocs/blockedlog/ajax/block-info.php         |     2 +
 htdocs/blockedlog/class/authority.class.php   |    68 +-
 htdocs/blockedlog/class/blockedlog.class.php  |    82 +-
 htdocs/bom/bom_agenda.php                     |   104 +-
 htdocs/bom/bom_card.php                       |    35 +-
 htdocs/bom/bom_document.php                   |    11 +-
 htdocs/bom/bom_list.php                       |    54 +-
 htdocs/bom/bom_note.php                       |     4 +-
 htdocs/bom/class/api_boms.class.php           |   521 +-
 htdocs/bom/class/bom.class.php                |   681 +-
 htdocs/bom/lib/bom.lib.php                    |    86 +-
 htdocs/bom/tpl/linkedobjectblock.tpl.php      |    62 +-
 htdocs/bom/tpl/objectline_create.tpl.php      |     6 +-
 htdocs/bom/tpl/objectline_edit.tpl.php        |    14 +-
 htdocs/bom/tpl/objectline_title.tpl.php       |     2 +-
 htdocs/bom/tpl/objectline_view.tpl.php        |    42 +-
 htdocs/bookmarks/bookmarks.lib.php            |   192 +-
 htdocs/bookmarks/card.php                     |    43 +-
 htdocs/bookmarks/class/bookmark.class.php     |   330 +-
 htdocs/bookmarks/list.php                     |     8 +-
 htdocs/cashdesk/admin/cashdesk.php            |    38 +-
 htdocs/cashdesk/affContenu.php                |     4 +-
 htdocs/cashdesk/class/Auth.class.php          |    62 +-
 htdocs/cashdesk/class/Facturation.class.php   |   962 +-
 htdocs/cashdesk/facturation_verif.php         |    84 +-
 htdocs/cashdesk/include/environnement.php     |     5 +-
 htdocs/cashdesk/index_verif.php               |    18 +-
 htdocs/cashdesk/tpl/facturation1.tpl.php      |     4 +-
 htdocs/cashdesk/tpl/liste_articles.tpl.php    |    26 +-
 htdocs/cashdesk/tpl/ticket.tpl.php            |    28 +-
 htdocs/cashdesk/tpl/validation1.tpl.php       |     2 +-
 htdocs/cashdesk/validation_ticket.php         |     2 +-
 htdocs/cashdesk/validation_verif.php          |    68 +-
 htdocs/categories/admin/categorie.php         |    34 +-
 .../admin/categorie_extrafields.php           |    20 +-
 htdocs/categories/card.php                    |    54 +-
 .../categories/class/api_categories.class.php |     3 +-
 htdocs/categories/class/categorie.class.php   |   397 +-
 htdocs/categories/edit.php                    |    70 +-
 htdocs/categories/index.php                   |     8 +-
 htdocs/categories/info.php                    |    10 +-
 htdocs/categories/photos.php                  |   144 +-
 htdocs/categories/traduction.php              |   148 +-
 htdocs/categories/viewcat.php                 |   325 +-
 htdocs/comm/action/card.php                   |  1074 +-
 htdocs/comm/action/class/actioncomm.class.php |    98 +-
 .../action/class/actioncommreminder.class.php |    65 +-
 .../action/class/api_agendaevents.class.php   |   626 +-
 .../comm/action/class/cactioncomm.class.php   |   371 +-
 htdocs/comm/action/class/ical.class.php       |   700 +-
 htdocs/comm/action/document.php               |     4 +-
 htdocs/comm/action/index.php                  |    62 +-
 htdocs/comm/action/info.php                   |    38 +-
 htdocs/comm/action/list.php                   |   290 +-
 htdocs/comm/action/pertype.php                |   365 +-
 htdocs/comm/action/peruser.php                |   391 +-
 htdocs/comm/action/rapport/index.php          |    22 +-
 htdocs/comm/admin/propal_extrafields.php      |    22 +-
 htdocs/comm/admin/propaldet_extrafields.php   |     4 +-
 htdocs/comm/card.php                          |   688 +-
 htdocs/comm/contact.php                       |    24 +-
 htdocs/comm/index.php                         |   293 +-
 htdocs/comm/mailing/advtargetemailing.php     |     4 +-
 htdocs/comm/mailing/card.php                  |   277 +-
 htdocs/comm/mailing/cibles.php                |   114 +-
 .../mailing/class/advtargetemailing.class.php |   282 +-
 .../html.formadvtargetemailing.class.php      |    54 +-
 htdocs/comm/mailing/class/mailing.class.php   |   290 +-
 htdocs/comm/mailing/index.php                 |   192 +-
 htdocs/comm/mailing/info.php                  |     4 +-
 htdocs/comm/mailing/list.php                  |    10 +-
 htdocs/comm/multiprix.php                     |     6 +-
 htdocs/comm/propal/card.php                   |   293 +-
 .../comm/propal/class/api_proposals.class.php |   569 +-
 htdocs/comm/propal/class/propal.class.php     |   944 +-
 .../comm/propal/class/propalestats.class.php  |   140 +-
 htdocs/comm/propal/contact.php                |    79 +-
 htdocs/comm/propal/document.php               |    68 +-
 htdocs/comm/propal/index.php                  |     2 +-
 htdocs/comm/propal/info.php                   |    68 +-
 htdocs/comm/propal/list.php                   |    13 +-
 htdocs/comm/propal/note.php                   |    62 +-
 htdocs/comm/propal/stats/index.php            |   242 +-
 .../comm/propal/tpl/linkedobjectblock.tpl.php |    66 +-
 htdocs/comm/prospect/index.php                |    20 +-
 htdocs/comm/prospect/recap-prospect.php       |    40 +-
 htdocs/comm/recap-client.php                  |    42 +-
 htdocs/comm/remise.php                        |    92 +-
 htdocs/comm/remx.php                          |   400 +-
 htdocs/commande/card.php                      |   252 +-
 htdocs/commande/class/api_orders.class.php    |    23 +-
 htdocs/commande/class/commande.class.php      |   298 +-
 htdocs/commande/class/commandestats.class.php |    94 +-
 htdocs/commande/contact.php                   |    91 +-
 htdocs/commande/document.php                  |    64 +-
 htdocs/commande/index.php                     |   198 +-
 htdocs/commande/info.php                      |    70 +-
 htdocs/commande/list.php                      |   414 +-
 htdocs/commande/note.php                      |    62 +-
 htdocs/commande/orderstoinvoice.php           |   723 --
 htdocs/commande/stats/index.php               |   196 +-
 htdocs/commande/tpl/linkedobjectblock.tpl.php |    70 +-
 htdocs/compta/accounting-files.php            |   891 +-
 .../bank/account_statement_document.php       |     4 +-
 htdocs/compta/bank/annuel.php                 |    32 +-
 htdocs/compta/bank/bankentries_list.php       |  1500 +--
 htdocs/compta/bank/card.php                   |    51 +-
 htdocs/compta/bank/categ.php                  |    23 +-
 htdocs/compta/bank/class/account.class.php    |   260 +-
 .../bank/class/api_bankaccounts.class.php     |   970 +-
 htdocs/compta/bank/class/bankcateg.class.php  |    64 +-
 .../bank/class/paymentvarious.class.php       |   147 +-
 htdocs/compta/bank/document.php               |    78 +-
 htdocs/compta/bank/graph.php                  |    16 +-
 htdocs/compta/bank/info.php                   |     2 +-
 htdocs/compta/bank/line.php                   |   802 +-
 htdocs/compta/bank/list.php                   |   403 +-
 htdocs/compta/bank/releve.php                 |    48 +-
 htdocs/compta/bank/transfer.php               |     6 +-
 htdocs/compta/bank/treso.php                  |    38 +-
 htdocs/compta/bank/various_payment/card.php   |   263 +-
 .../compta/bank/various_payment/document.php  |     4 +-
 htdocs/compta/bank/various_payment/info.php   |     2 +-
 htdocs/compta/bank/various_payment/list.php   |     6 +-
 .../compta/cashcontrol/cashcontrol_card.php   |   475 +-
 .../compta/cashcontrol/cashcontrol_list.php   |     4 +-
 .../cashcontrol/class/cashcontrol.class.php   |    57 +-
 htdocs/compta/cashcontrol/report.php          |   141 +-
 htdocs/compta/charges/index.php               |   406 +-
 htdocs/compta/deplacement/card.php            |   712 +-
 .../deplacement/class/deplacement.class.php   |   144 +-
 .../class/deplacementstats.class.php          |    52 +-
 htdocs/compta/deplacement/document.php        |    22 +-
 htdocs/compta/deplacement/index.php           |   120 +-
 htdocs/compta/deplacement/info.php            |    10 +-
 htdocs/compta/deplacement/list.php            |   148 +-
 htdocs/compta/deplacement/stats/index.php     |    60 +-
 .../admin/facture_cust_extrafields.php        |    18 +-
 .../admin/facture_rec_cust_extrafields.php    |    18 +-
 .../admin/facturedet_cust_extrafields.php     |    20 +-
 .../admin/facturedet_rec_cust_extrafields.php |    20 +-
 htdocs/compta/facture/card-rec.php            |   114 +-
 htdocs/compta/facture/card.php                |  1400 +-
 .../facture/class/api_invoices.class.php      |  2135 ++--
 .../facture/class/facture-rec.class.php       |  1214 +-
 htdocs/compta/facture/class/facture.class.php |   172 +-
 .../facture/class/facturestats.class.php      |    96 +-
 .../facture/class/paymentterm.class.php       |   174 +-
 htdocs/compta/facture/contact.php             |    79 +-
 htdocs/compta/facture/document.php            |    94 +-
 htdocs/compta/facture/index.php               |   102 +-
 htdocs/compta/facture/info.php                |     4 +-
 .../compta/facture/invoicetemplate_list.php   |   110 +-
 htdocs/compta/facture/list.php                |   207 +-
 htdocs/compta/facture/note.php                |    98 +-
 htdocs/compta/facture/prelevement.php         |   242 +-
 htdocs/compta/facture/stats/index.php         |    96 +-
 .../facture/tpl/linkedobjectblock.tpl.php     |    58 +-
 .../tpl/linkedobjectblockForRec.tpl.php       |     6 +-
 htdocs/compta/index.php                       |   312 +-
 htdocs/compta/journal/purchasesjournal.php    |     6 +-
 htdocs/compta/journal/sellsjournal.php        |    18 +-
 htdocs/compta/localtax/card.php               |   150 +-
 .../compta/localtax/class/localtax.class.php  |   632 +-
 htdocs/compta/localtax/clients.php            |    42 +-
 htdocs/compta/localtax/index.php              |   416 +-
 htdocs/compta/localtax/list.php               |    58 +-
 htdocs/compta/localtax/quadri_detail.php      |   100 +-
 htdocs/compta/paiement.php                    |   954 +-
 htdocs/compta/paiement/card.php               |    82 +-
 htdocs/compta/paiement/cheque/card.php        |   337 +-
 .../cheque/class/remisecheque.class.php       |   322 +-
 htdocs/compta/paiement/cheque/index.php       |    34 +-
 htdocs/compta/paiement/cheque/list.php        |   112 +-
 .../compta/paiement/class/paiement.class.php  |   918 +-
 htdocs/compta/paiement/info.php               |     4 +-
 htdocs/compta/paiement/list.php               |   691 +-
 htdocs/compta/paiement/rapport.php            |   126 +-
 htdocs/compta/paiement/tovalidate.php         |    86 +-
 htdocs/compta/paiement_charge.php             |   136 +-
 htdocs/compta/payment_sc/card.php             |   101 +-
 htdocs/compta/paymentbybanktransfer/index.php |   156 +-
 htdocs/compta/prelevement/card.php            |    10 +-
 .../class/bonprelevement.class.php            |    15 +-
 .../class/ligneprelevement.class.php          |    12 +-
 .../class/rejetprelevement.class.php          |    82 +-
 htdocs/compta/prelevement/create.php          |     6 +-
 htdocs/compta/prelevement/factures.php        |     4 +-
 htdocs/compta/prelevement/fiche-rejet.php     |     6 +-
 htdocs/compta/prelevement/fiche-stat.php      |     4 +-
 htdocs/compta/prelevement/index.php           |   156 +-
 htdocs/compta/prelevement/line.php            |    19 +-
 htdocs/compta/prelevement/list.php            |   196 +-
 htdocs/compta/prelevement/orders_list.php     |   176 +-
 htdocs/compta/prelevement/rejets.php          |     2 +-
 htdocs/compta/prelevement/stats.php           |     2 +-
 htdocs/compta/recap-compta.php                |    16 +-
 htdocs/compta/resultat/clientfourn.php        |  1160 +-
 htdocs/compta/resultat/index.php              |   318 +-
 htdocs/compta/resultat/result.php             |     6 +-
 htdocs/compta/sociales/card.php               |    75 +-
 .../sociales/class/cchargesociales.class.php  |   124 +-
 .../sociales/class/chargesociales.class.php   |  1040 +-
 .../class/paymentsocialcontribution.class.php |   315 +-
 htdocs/compta/sociales/document.php           |    82 +-
 htdocs/compta/sociales/info.php               |     2 +-
 htdocs/compta/sociales/list.php               |   570 +-
 htdocs/compta/sociales/payments.php           |   590 +-
 htdocs/compta/stats/cabyprodserv.php          |    61 +-
 htdocs/compta/stats/cabyuser.php              |   375 +-
 htdocs/compta/stats/casoc.php                 |   170 +-
 htdocs/compta/stats/index.php                 |    27 +-
 htdocs/compta/stats/supplier_turnover.php     |    22 +-
 .../stats/supplier_turnover_by_prodserv.php   |    30 +-
 .../stats/supplier_turnover_by_thirdparty.php |   164 +-
 htdocs/compta/tva/card.php                    |   138 +-
 htdocs/compta/tva/class/tva.class.php         |   739 +-
 htdocs/compta/tva/clients.php                 |  1050 +-
 htdocs/compta/tva/document.php                |    56 +-
 htdocs/compta/tva/index.php                   |   458 +-
 htdocs/compta/tva/info.php                    |     4 +-
 htdocs/compta/tva/list.php                    |   602 +-
 htdocs/compta/tva/quadri_detail.php           |     8 +-
 htdocs/conf/conf.php.example                  |    13 +-
 htdocs/contact/agenda.php                     |   212 +-
 .../actions_contactcard_common.class.php      |   398 +-
 .../actions_contactcard_default.class.php     |    88 +-
 .../default/tpl/contactcard_edit.tpl.php      |     4 +-
 htdocs/contact/card.php                       |   140 +-
 htdocs/contact/class/contact.class.php        |   516 +-
 htdocs/contact/consumption.php                |   200 +-
 htdocs/contact/document.php                   |    90 +-
 htdocs/contact/info.php                       |     4 +-
 htdocs/contact/ldap.php                       |     6 +-
 htdocs/contact/list.php                       |    51 +-
 htdocs/contact/note.php                       |    56 +-
 htdocs/contact/perso.php                      |   250 +-
 htdocs/contact/vcard.php                      |    10 +-
 htdocs/contrat/admin/contract_extrafields.php |     4 +-
 .../contrat/admin/contractdet_extrafields.php |     4 +-
 htdocs/contrat/agenda.php                     |     4 +-
 htdocs/contrat/card.php                       |   199 +-
 htdocs/contrat/class/api_contracts.class.php  |  1127 +-
 htdocs/contrat/class/contrat.class.php        |   700 +-
 htdocs/contrat/contact.php                    |   133 +-
 htdocs/contrat/document.php                   |    24 +-
 htdocs/contrat/index.php                      |   186 +-
 htdocs/contrat/list.php                       |    34 +-
 htdocs/contrat/note.php                       |   154 +-
 htdocs/contrat/services_list.php              |    86 +-
 htdocs/contrat/tpl/linkedobjectblock.tpl.php  |     8 +-
 htdocs/core/actions_addupdatedelete.inc.php   |    26 +-
 htdocs/core/actions_builddoc.inc.php          |   146 +-
 .../core/actions_changeselectedfields.inc.php |    16 +-
 htdocs/core/actions_comments.inc.php          |    26 +-
 htdocs/core/actions_extrafields.inc.php       |   625 +-
 htdocs/core/actions_fetchobject.inc.php       |    30 +-
 htdocs/core/actions_linkedfiles.inc.php       |   354 +-
 htdocs/core/actions_massactions.inc.php       |   244 +-
 htdocs/core/actions_printing.inc.php          |    14 +-
 htdocs/core/actions_sendmails.inc.php         |    12 +-
 htdocs/core/actions_setmoduleoptions.inc.php  |   112 +-
 htdocs/core/actions_setnotes.inc.php          |     4 +-
 htdocs/core/ajax/ajaxdirtree.php              |    18 +-
 htdocs/core/ajax/box.php                      |    12 +-
 htdocs/core/ajax/check_notifications.php      |    84 +-
 htdocs/core/ajax/constantonoff.php            |     2 +-
 htdocs/core/ajax/contacts.php                 |     2 +-
 htdocs/core/ajax/selectsearchbox.php          |    64 +-
 .../box_accountancy_last_manual_entries.php   |   176 +-
 .../box_accountancy_suspense_account.php      |    98 +-
 htdocs/core/boxes/box_actions.php             |   194 +-
 htdocs/core/boxes/box_activity.php            |   736 +-
 htdocs/core/boxes/box_birthdays.php           |    88 +-
 htdocs/core/boxes/box_birthdays_members.php   |    86 +-
 htdocs/core/boxes/box_boms.php                |   236 +-
 htdocs/core/boxes/box_bookmarks.php           |   152 +-
 htdocs/core/boxes/box_clients.php             |   113 +-
 htdocs/core/boxes/box_commandes.php           |   285 +-
 htdocs/core/boxes/box_comptes.php             |   190 +-
 htdocs/core/boxes/box_contacts.php            |    56 +-
 htdocs/core/boxes/box_contracts.php           |   256 +-
 ...box_customers_outstanding_bill_reached.php |   185 +
 htdocs/core/boxes/box_external_rss.php        |   178 +-
 htdocs/core/boxes/box_factures.php            |   210 +-
 htdocs/core/boxes/box_factures_fourn.php      |   209 +-
 htdocs/core/boxes/box_factures_fourn_imp.php  |   164 +-
 htdocs/core/boxes/box_factures_imp.php        |   157 +-
 htdocs/core/boxes/box_ficheinter.php          |    96 +-
 htdocs/core/boxes/box_fournisseurs.php        |   202 +-
 .../core/boxes/box_funnel_of_prospection.php  |   300 +
 htdocs/core/boxes/box_goodcustomers.php       |    68 +-
 .../boxes/box_graph_invoices_permonth.php     |    34 +-
 .../box_graph_invoices_supplier_permonth.php  |    48 +-
 .../core/boxes/box_graph_orders_permonth.php  |    56 +-
 .../box_graph_orders_supplier_permonth.php    |    52 +-
 .../boxes/box_graph_product_distribution.php  |    46 +-
 .../boxes/box_graph_propales_permonth.php     |    48 +-
 .../core/boxes/box_last_modified_ticket.php   |   292 +-
 htdocs/core/boxes/box_last_ticket.php         |   294 +-
 htdocs/core/boxes/box_lastlogin.php           |   128 +-
 htdocs/core/boxes/box_members.php             |   135 +-
 htdocs/core/boxes/box_mos.php                 |   232 +-
 htdocs/core/boxes/box_produits.php            |   241 +-
 .../core/boxes/box_produits_alerte_stock.php  |   192 +-
 htdocs/core/boxes/box_project.php             |   286 +-
 htdocs/core/boxes/box_propales.php            |   257 +-
 htdocs/core/boxes/box_prospect.php            |   132 +-
 htdocs/core/boxes/box_scheduled_jobs.php      |   197 +
 htdocs/core/boxes/box_services_contracts.php  |   101 +-
 htdocs/core/boxes/box_services_expired.php    |   246 +-
 htdocs/core/boxes/box_shipments.php           |   249 +-
 htdocs/core/boxes/box_supplier_orders.php     |   265 +-
 ...box_supplier_orders_awaiting_reception.php |   272 +-
 htdocs/core/boxes/box_task.php                |   212 +-
 htdocs/core/boxes/box_validated_projects.php  |   233 +-
 htdocs/core/boxes/modules_boxes.php           |   314 +-
 htdocs/core/class/CMailFile.class.php         |    68 +-
 htdocs/core/class/CSMSFile.class.php          |   176 +-
 htdocs/core/class/antivir.class.php           |    22 +-
 htdocs/core/class/canvas.class.php            |   106 +-
 htdocs/core/class/ccountry.class.php          |   230 +-
 htdocs/core/class/comment.class.php           |   131 +-
 .../core/class/commondocgenerator.class.php   |  2026 +--
 htdocs/core/class/commonincoterm.class.php    |     2 +-
 htdocs/core/class/commoninvoice.class.php     |   334 +-
 htdocs/core/class/commonobject.class.php      |   792 +-
 htdocs/core/class/commonobjectline.class.php  |     2 +-
 htdocs/core/class/commonorder.class.php       |    45 +-
 .../class/commonstickergenerator.class.php    |   120 +-
 htdocs/core/class/conf.class.php              |   275 +-
 htdocs/core/class/cproductnature.class.php    |   340 +
 htdocs/core/class/cstate.class.php            |   210 +-
 htdocs/core/class/ctypent.class.php           |   206 +-
 htdocs/core/class/ctyperesource.class.php     |    14 +-
 htdocs/core/class/cunits.class.php            |   363 +-
 htdocs/core/class/discount.class.php          |  1146 +-
 htdocs/core/class/doleditor.class.php         |   294 +-
 htdocs/core/class/dolexception.class.php      |    12 +-
 htdocs/core/class/dolgeoip.class.php          |    93 +-
 htdocs/core/class/dolgraph.class.php          |   634 +-
 htdocs/core/class/dolreceiptprinter.class.php |  1467 +--
 .../core/class/emailsenderprofile.class.php   |    50 +-
 htdocs/core/class/evalmath.class.php          |    18 +-
 htdocs/core/class/events.class.php            |    36 +-
 htdocs/core/class/extrafields.class.php       |    20 +-
 htdocs/core/class/extralanguages.class.php    |    18 +-
 htdocs/core/class/fileupload.class.php        |    52 +-
 htdocs/core/class/fiscalyear.class.php        |    45 +-
 htdocs/core/class/genericobject.class.php     |    18 +-
 htdocs/core/class/google.class.php            |    96 +-
 htdocs/core/class/hookmanager.class.php       |   232 +-
 htdocs/core/class/html.form.class.php         |   725 +-
 .../core/class/html.formaccounting.class.php  |   342 +-
 htdocs/core/class/html.formactions.class.php  |    22 +-
 htdocs/core/class/html.formadmin.class.php    |   347 +-
 htdocs/core/class/html.formbank.class.php     |    52 +-
 htdocs/core/class/html.formbarcode.class.php  |   334 +-
 htdocs/core/class/html.formcompany.class.php  |    16 +-
 htdocs/core/class/html.formcontract.class.php |    92 +-
 htdocs/core/class/html.formcron.class.php     |   124 +-
 .../class/html.formexpensereport.class.php    |   181 +-
 htdocs/core/class/html.formfile.class.php     |    98 +-
 .../class/html.formintervention.class.php     |    32 +-
 htdocs/core/class/html.formmail.class.php     |    32 +-
 htdocs/core/class/html.formmailing.class.php  |    50 +-
 htdocs/core/class/html.formmargin.class.php   |    44 +-
 htdocs/core/class/html.formorder.class.php    |    63 +-
 htdocs/core/class/html.formother.class.php    |  2079 +--
 htdocs/core/class/html.formprojet.class.php   |    30 +-
 htdocs/core/class/html.formpropal.class.php   |   200 +-
 htdocs/core/class/html.formsms.class.php      |   502 +-
 .../class/html.formsocialcontrib.class.php    |   145 +-
 htdocs/core/class/html.formticket.class.php   |    14 +-
 htdocs/core/class/html.formwebsite.class.php  |   467 +-
 htdocs/core/class/infobox.class.php           |   434 +-
 htdocs/core/class/interfaces.class.php        |   596 +-
 htdocs/core/class/ldap.class.php              |   181 +-
 htdocs/core/class/link.class.php              |   602 +-
 htdocs/core/class/menu.class.php              |   182 +-
 htdocs/core/class/menubase.class.php          |     1 +
 htdocs/core/class/notify.class.php            |    56 +-
 htdocs/core/class/openid.class.php            |   914 +-
 htdocs/core/class/rssparser.class.php         |    50 +-
 htdocs/core/class/smtps.class.php             |  3380 ++---
 htdocs/core/class/stats.class.php             |   259 +-
 htdocs/core/class/translate.class.php         |   431 +-
 htdocs/core/class/utils.class.php             |    78 +-
 htdocs/core/class/vcard.class.php             |   521 +-
 htdocs/core/class/workboardresponse.class.php |     5 +
 htdocs/core/commonfieldsinexport.inc.php      |     6 +-
 htdocs/core/customreports.php                 |   628 +-
 htdocs/core/db/DoliDB.class.php               |    55 +-
 htdocs/core/db/mysqli.class.php               |  1622 +--
 htdocs/core/db/pgsql.class.php                |   725 +-
 htdocs/core/db/sqlite3.class.php              |  2208 ++--
 htdocs/core/extrafieldsinexport.inc.php       |    44 +-
 .../browser/default/browser.php               |     2 +-
 .../browser/default/frmactualfolder.php       |     2 +-
 .../browser/default/frmcreatefolder.php       |     2 +-
 .../browser/default/frmfolders.php            |     2 +-
 .../browser/default/frmresourceslist.php      |     4 +-
 .../browser/default/frmupload.php             |     2 +-
 .../connectors/php/commands.php               |    18 +-
 .../connectors/php/connector.php              |     6 +-
 .../core/filemanagerdol/connectors/php/io.php |    58 +-
 .../filemanagerdol/connectors/php/util.php    |     2 +-
 htdocs/core/get_info.php                      |    15 +-
 htdocs/core/get_menudiv.php                   |     4 +-
 htdocs/core/js/lib_head.js.php                |     4 +-
 htdocs/core/js/lib_notification.js.php        |    26 +-
 htdocs/core/lib/accounting.lib.php            |     4 +-
 htdocs/core/lib/admin.lib.php                 |  2162 ++--
 htdocs/core/lib/agenda.lib.php                |   276 +-
 htdocs/core/lib/ajax.lib.php                  |     3 +-
 htdocs/core/lib/bank.lib.php                  |   348 +-
 htdocs/core/lib/barcode.lib.php               |   467 +-
 htdocs/core/lib/company.lib.php               |   326 +-
 htdocs/core/lib/contact.lib.php               |    86 +-
 htdocs/core/lib/contract.lib.php              |    50 +-
 htdocs/core/lib/cron.lib.php                  |    53 +-
 htdocs/core/lib/date.lib.php                  |   606 +-
 htdocs/core/lib/doleditor.lib.php             |   116 +-
 htdocs/core/lib/donation.lib.php              |     6 +-
 htdocs/core/lib/ecm.lib.php                   |    35 +
 htdocs/core/lib/emailing.lib.php              |     8 +-
 htdocs/core/lib/expedition.lib.php            |    16 +-
 htdocs/core/lib/expensereport.lib.php         |    44 +-
 htdocs/core/lib/fichinter.lib.php             |    50 +-
 htdocs/core/lib/files.lib.php                 |    63 +-
 htdocs/core/lib/fiscalyear.lib.php            |     4 +-
 htdocs/core/lib/format_cards.lib.php          |    40 +-
 htdocs/core/lib/fourn.lib.php                 |    78 +-
 htdocs/core/lib/functions.lib.php             |   833 +-
 htdocs/core/lib/functions2.lib.php            |   153 +-
 htdocs/core/lib/functionsnumtoword.lib.php    |    13 +-
 htdocs/core/lib/geturl.lib.php                |   265 +-
 htdocs/core/lib/holiday.lib.php               |    68 +-
 htdocs/core/lib/images.lib.php                |     2 +-
 htdocs/core/lib/intracommreport.lib.php       |    83 +
 htdocs/core/lib/invoice.lib.php               |    68 +-
 htdocs/core/lib/json.lib.php                  |   189 +-
 htdocs/core/lib/loan.lib.php                  |    96 +-
 htdocs/core/lib/memory.lib.php                |    56 +-
 htdocs/core/lib/multicurrency.lib.php         |     5 +
 htdocs/core/lib/oauth.lib.php                 |   452 +-
 htdocs/core/lib/order.lib.php                 |    34 +-
 htdocs/core/lib/parsemd.lib.php               |    72 +-
 htdocs/core/lib/payments.lib.php              |   240 +-
 htdocs/core/lib/pdf.lib.php                   |   757 +-
 htdocs/core/lib/phpsessionindb.lib.php        |   165 +
 htdocs/core/lib/price.lib.php                 |   178 +-
 htdocs/core/lib/product.lib.php               |   333 +-
 htdocs/core/lib/project.lib.php               |   524 +-
 htdocs/core/lib/propal.lib.php                |    46 +-
 htdocs/core/lib/report.lib.php                |     4 +-
 htdocs/core/lib/security.lib.php              |    16 +-
 htdocs/core/lib/security2.lib.php             |   153 +-
 htdocs/core/lib/sendings.lib.php              |   100 +-
 htdocs/core/lib/signature.lib.php             |     2 +-
 htdocs/core/lib/stock.lib.php                 |    52 +-
 htdocs/core/lib/supplier_proposal.lib.php     |    40 +-
 htdocs/core/lib/tax.lib.php                   |  1432 +--
 htdocs/core/lib/ticket.lib.php                |   287 +-
 htdocs/core/lib/treeview.lib.php              |   102 +-
 htdocs/core/lib/usergroups.lib.php            |   258 +-
 htdocs/core/lib/vat.lib.php                   |    32 +-
 htdocs/core/lib/website.lib.php               |    14 +-
 htdocs/core/lib/website2.lib.php              |     2 +-
 htdocs/core/lib/ws.lib.php                    |    76 +-
 htdocs/core/login/functions_dolibarr.php      |     8 +-
 htdocs/core/login/functions_googleoauth.php   |    18 +-
 htdocs/core/login/functions_ldap.php          |     6 +-
 htdocs/core/login/functions_openid.php        |   152 +-
 htdocs/core/menus/init_menu_auguria.sql       |   109 +-
 htdocs/core/menus/standard/auguria.lib.php    |    91 +-
 htdocs/core/menus/standard/auguria_menu.php   |   416 +-
 htdocs/core/menus/standard/eldy.lib.php       |   762 +-
 htdocs/core/menus/standard/eldy_menu.php      |   488 +-
 htdocs/core/menus/standard/empty.php          |   589 +-
 htdocs/core/modules/DolibarrModules.class.php |    10 +-
 htdocs/core/modules/action/modules_action.php |    78 +-
 htdocs/core/modules/action/rapport.pdf.php    |    76 +-
 .../core/modules/bank/doc/pdf_ban.modules.php |    15 +-
 .../bank/doc/pdf_sepamandate.modules.php      |    62 +-
 htdocs/core/modules/bank/modules_bank.php     |    12 +-
 .../barcode/doc/phpbarcode.modules.php        |    14 +-
 .../barcode/doc/tcpdfbarcode.modules.php      |     6 +-
 .../barcode/mod_barcode_product_standard.php  |    34 +-
 .../modules/barcode/modules_barcode.class.php |   244 +-
 .../bom/doc/doc_generic_bom_odt.modules.php   |    65 +-
 htdocs/core/modules/bom/mod_bom_advanced.php  |    56 +-
 .../modules/cheque/doc/pdf_blochet.class.php  |     5 +-
 .../cheque/mod_chequereceipt_thyme.php        |    64 +-
 .../doc/doc_generic_order_odt.modules.php     |    80 +-
 .../commande/doc/pdf_einstein.modules.php     |   512 +-
 .../commande/doc/pdf_eratosthene.modules.php  |  1295 +-
 .../commande/doc/pdf_proforma.modules.php     |     7 +-
 .../modules/commande/mod_commande_saphir.php  |    70 +-
 .../doc/doc_generic_contract_odt.modules.php  |    53 +-
 .../contract/doc/pdf_strato.modules.php       |    19 +-
 .../modules/contract/mod_contract_magre.php   |    46 +-
 .../modules/contract/mod_contract_olive.php   |     8 +-
 .../modules/contract/mod_contract_serpis.php  |    20 +-
 .../modules/contract/modules_contract.php     |    12 +-
 .../{livraison => delivery}/doc/index.html    |     0
 .../doc/pdf_storm.modules.php                 |    85 +-
 .../doc/pdf_typhon.modules.php                |    31 +-
 .../{livraison => delivery}/index.html        |     0
 .../mod_delivery_jade.php}                    |    18 +-
 .../mod_delivery_saphir.php}                  |   110 +-
 .../modules_delivery.php}                     |     2 +-
 .../modules/dons/html_cerfafr.modules.php     |    68 +-
 .../doc/doc_generic_shipment_odt.modules.php  |    84 +-
 .../expedition/doc/pdf_espadon.modules.php    |    36 +-
 .../expedition/doc/pdf_merou.modules.php      |    19 +-
 .../expedition/doc/pdf_rouget.modules.php     |    35 +-
 .../expedition/mod_expedition_ribera.php      |    48 +-
 .../expedition/mod_expedition_safor.php       |    28 +-
 .../modules/expedition/modules_expedition.php |    24 +-
 .../doc/pdf_standard.modules.php              |    64 +-
 .../expensereport/mod_expensereport_jade.php  |     2 +-
 .../expensereport/mod_expensereport_sand.php  |    70 +-
 .../expensereport/modules_expensereport.php   |    56 +-
 .../modules/export/export_csv.modules.php     |    58 +-
 .../export/export_excel2007new.modules.php    |   488 +-
 .../modules/export/export_tsv.modules.php     |   304 +-
 htdocs/core/modules/export/modules_export.php |    70 +-
 .../doc/doc_generic_invoice_odt.modules.php   |    71 +-
 .../modules/facture/doc/pdf_crabe.modules.php |    50 +-
 .../facture/doc/pdf_sponge.modules.php        |   146 +-
 .../core/modules/facture/mod_facture_mars.php |    74 +-
 .../modules/facture/mod_facture_mercure.php   |   240 +-
 .../modules/facture/mod_facture_terre.php     |   114 +-
 .../fichinter/doc/pdf_soleil.modules.php      |   119 +-
 htdocs/core/modules/fichinter/mod_arctic.php  |    68 +-
 htdocs/core/modules/fichinter/mod_pacific.php |    26 +-
 .../holiday/mod_holiday_immaculate.php        |    44 +-
 .../modules/holiday/mod_holiday_madonna.php   |    20 +-
 .../core/modules/holiday/modules_holiday.php  |    14 +-
 .../modules/import/import_csv.modules.php     |   589 +-
 .../modules/import/import_xlsx.modules.php    |   755 +-
 htdocs/core/modules/import/modules_import.php |   140 +-
 .../mailings/advthirdparties.modules.php      |   152 +-
 .../modules/mailings/contacts1.modules.php    |   112 +-
 .../core/modules/mailings/example.modules.php |   168 +-
 .../core/modules/mailings/fraise.modules.php  |   470 +-
 .../modules/mailings/modules_mailings.php     |   354 +-
 .../core/modules/mailings/pomme.modules.php   |    76 +-
 .../modules/mailings/thirdparties.modules.php |   212 +-
 .../thirdparties_services_expired.modules.php |   354 +-
 .../modules/mailings/xinputfile.modules.php   |   124 +-
 .../modules/mailings/xinputuser.modules.php   |    40 +-
 .../doc/doc_generic_member_odt.class.php      |   419 +
 .../modules/member/doc/pdf_standard.class.php |    90 +-
 htdocs/core/modules/member/modules_cards.php  |     6 +-
 .../modules/member/modules_member.class.php   |    66 +
 htdocs/core/modules/modAccounting.class.php   |   106 +-
 htdocs/core/modules/modAdherent.class.php     |   630 +-
 htdocs/core/modules/modAgenda.class.php       |    56 +-
 htdocs/core/modules/modApi.class.php          |    44 +-
 htdocs/core/modules/modAsset.class.php        |    54 +-
 htdocs/core/modules/modBarcode.class.php      |    40 +-
 htdocs/core/modules/modBlockedLog.class.php   |   350 +-
 htdocs/core/modules/modBom.class.php          |     3 +-
 htdocs/core/modules/modBookmark.class.php     |     4 +-
 htdocs/core/modules/modCashDesk.class.php     |    39 +-
 htdocs/core/modules/modCategorie.class.php    |   184 +-
 htdocs/core/modules/modCollab.class.php       |   130 +-
 htdocs/core/modules/modCommande.class.php     |   170 +-
 htdocs/core/modules/modComptabilite.class.php |    38 +-
 htdocs/core/modules/modContrat.class.php      |    24 +-
 htdocs/core/modules/modCron.class.php         |    86 +-
 htdocs/core/modules/modDataPolicy.class.php   |   342 +-
 htdocs/core/modules/modDebugBar.class.php     |   114 +-
 htdocs/core/modules/modDeplacement.class.php  |    22 +-
 .../modules/modDocumentGeneration.class.php   |    10 +-
 htdocs/core/modules/modDon.class.php          |     2 +-
 .../core/modules/modDynamicPrices.class.php   |    80 +-
 htdocs/core/modules/modECM.class.php          |    22 +-
 .../core/modules/modEmailCollector.class.php  |    40 +-
 htdocs/core/modules/modExpedition.class.php   |    42 +-
 .../core/modules/modExpenseReport.class.php   |    38 +-
 htdocs/core/modules/modExternalRss.class.php  |    14 +-
 htdocs/core/modules/modExternalSite.class.php |    14 +-
 htdocs/core/modules/modFTP.class.php          |    26 +-
 htdocs/core/modules/modFacture.class.php      |    41 +-
 htdocs/core/modules/modFckeditor.class.php    |    12 +-
 htdocs/core/modules/modFicheinter.class.php   |   274 +-
 htdocs/core/modules/modFournisseur.class.php  |   385 +-
 htdocs/core/modules/modHRM.class.php          |     2 +-
 htdocs/core/modules/modHoliday.class.php      |    10 +-
 htdocs/core/modules/modIncoterm.class.php     |    40 +-
 .../core/modules/modIntracommreport.class.php |   129 +
 htdocs/core/modules/modLabel.class.php        |     8 +-
 htdocs/core/modules/modLoan.class.php         |     2 +-
 htdocs/core/modules/modMailing.class.php      |     4 +-
 .../core/modules/modModuleBuilder.class.php   |   128 +-
 htdocs/core/modules/modMrp.class.php          |   524 +-
 .../core/modules/modMultiCurrency.class.php   |    38 +-
 htdocs/core/modules/modNotification.class.php |     6 +-
 htdocs/core/modules/modOauth.class.php        |   162 +-
 htdocs/core/modules/modOpenSurvey.class.php   |   120 +-
 htdocs/core/modules/modPaybox.class.php       |   268 +-
 .../modPaymentByBankTransfer.class.php        |    40 +-
 htdocs/core/modules/modPaypal.class.php       |   252 +-
 htdocs/core/modules/modPrelevement.class.php  |    46 +-
 htdocs/core/modules/modPrinting.class.php     |   136 +-
 htdocs/core/modules/modProduct.class.php      |    46 +-
 htdocs/core/modules/modProductBatch.class.php |    34 +-
 htdocs/core/modules/modProjet.class.php       |   104 +-
 htdocs/core/modules/modPropale.class.php      |    56 +-
 .../core/modules/modReceiptPrinter.class.php  |   178 +-
 htdocs/core/modules/modReception.class.php    |    24 +-
 htdocs/core/modules/modRecruitment.class.php  |     2 +-
 htdocs/core/modules/modResource.class.php     |     4 +-
 htdocs/core/modules/modSalaries.class.php     |    10 +-
 htdocs/core/modules/modService.class.php      |   456 +-
 .../core/modules/modSocialNetworks.class.php  |     2 +-
 htdocs/core/modules/modSociete.class.php      |    28 +-
 htdocs/core/modules/modStock.class.php        |   202 +-
 htdocs/core/modules/modStripe.class.php       |   122 +-
 .../modules/modSupplierProposal.class.php     |    16 +-
 htdocs/core/modules/modTakePos.class.php      |    38 +-
 htdocs/core/modules/modTax.class.php          |    14 +-
 htdocs/core/modules/modTicket.class.php       |   461 +-
 htdocs/core/modules/modUser.class.php         |   121 +-
 htdocs/core/modules/modVariants.class.php     |     2 +-
 htdocs/core/modules/modWebServices.class.php  |    68 +-
 .../modules/modWebServicesClient.class.php    |    68 +-
 htdocs/core/modules/modWebsite.class.php      |   212 +-
 htdocs/core/modules/modWorkflow.class.php     |   130 +-
 htdocs/core/modules/modZapier.class.php       |   528 +-
 .../movement/doc/pdf_standard.modules.php     |     2 +-
 .../mrp/doc/doc_generic_mo_odt.modules.php    |    69 +-
 htdocs/core/modules/mrp/mod_mo_advanced.php   |    59 +-
 .../modules/oauth/github_oauthcallback.php    |    94 +-
 .../modules/oauth/google_oauthcallback.php    |    82 +-
 .../oauth/stripelive_oauthcallback.php        |    92 +-
 .../oauth/stripetest_oauthcallback.php        |     2 +-
 .../core/modules/payment/mod_payment_ant.php  |    66 +-
 .../modules/printing/modules_printing.php     |    99 +-
 .../modules/printing/printgcp.modules.php     |   890 +-
 .../modules/printing/printipp.modules.php     |   560 +-
 .../doc/pdf_standardlabel.class.php           |    28 +-
 .../printsheet/doc/pdf_tcpdflabel.class.php   |    20 +-
 .../modules/printsheet/modules_labels.php     |    12 +-
 .../doc/doc_generic_product_odt.modules.php   |    52 +-
 .../product/doc/pdf_standard.modules.php      |   442 +-
 .../product/mod_codeproduct_elephant.php      |    34 +-
 .../product/mod_codeproduct_leopard.php       |     8 +-
 .../modules/product/modules_product.class.php |    80 +-
 .../modules_product_batch.class.php           |    44 +-
 .../doc/doc_generic_project_odt.modules.php   |   140 +-
 .../project/doc/pdf_baleine.modules.php       |    80 +-
 .../project/doc/pdf_beluga.modules.php        |     8 +-
 .../project/doc/pdf_timespent.modules.php     |    67 +-
 .../modules/project/mod_project_universal.php |   100 +-
 .../core/modules/project/modules_project.php  |    87 +-
 .../task/doc/doc_generic_task_odt.modules.php |   148 +-
 .../project/task/mod_task_universal.php       |   108 +-
 .../modules/project/task/modules_task.php     |    26 +-
 .../doc/doc_generic_proposal_odt.modules.php  |    76 +-
 .../modules/propale/doc/pdf_azur.modules.php  |    45 +-
 .../modules/propale/doc/pdf_cyan.modules.php  |   284 +-
 .../modules/propale/mod_propale_saphir.php    |    56 +-
 .../core/modules/propale/modules_propale.php  |    10 +-
 .../modules/rapport/pdf_paiement.class.php    |   202 +-
 .../rapport/pdf_paiement_fourn.class.php      |     6 +-
 .../doc/doc_generic_reception_odt.modules.php |    91 +-
 .../reception/doc/pdf_squille.modules.php     |     9 +-
 .../modules/reception/mod_reception_beryl.php |    18 +-
 .../reception/mod_reception_moonstone.php     |    48 +-
 .../modules/reception/modules_reception.php   |    14 +-
 .../generate/modGeneratePassNone.class.php    |    14 +-
 .../generate/modGeneratePassPerso.class.php   |    20 +-
 .../modGeneratePassStandard.class.php         |    34 +-
 .../security/generate/modules_genpassword.php |    84 +-
 .../societe/doc/doc_generic_odt.modules.php   |   220 +-
 .../societe/mod_codeclient_elephant.php       |   113 +-
 .../societe/mod_codeclient_leopard.php        |     8 +-
 .../modules/societe/mod_codeclient_monkey.php |    32 +-
 .../societe/mod_codecompta_aquarium.php       |    38 +-
 .../societe/mod_codecompta_digitaria.php      |   326 +-
 .../societe/mod_codecompta_panicum.php        |    10 +-
 .../modules/societe/modules_societe.class.php |   138 +-
 .../doc/doc_generic_stock_odt.modules.php     |     5 +-
 .../stock/doc/pdf_standard.modules.php        |     2 +-
 htdocs/core/modules/stock/modules_stock.php   |    44 +-
 .../doc/pdf_canelle.modules.php               |    50 +-
 .../mod_facture_fournisseur_cactus.php        |   188 +-
 .../mod_facture_fournisseur_tulip.php         |   110 +-
 .../modules_facturefournisseur.php            |    44 +-
 ...doc_generic_supplier_order_odt.modules.php |    72 +-
 .../supplier_order/doc/pdf_cornas.modules.php |    26 +-
 .../doc/pdf_muscadet.modules.php              |    41 +-
 .../mod_commande_fournisseur_orchidee.php     |    86 +-
 .../modules_commandefournisseur.php           |    20 +-
 .../doc/pdf_standard.modules.php              |    14 +-
 .../mod_supplier_payment_brodator.php         |    70 +-
 ..._generic_supplier_proposal_odt.modules.php |    49 +-
 .../doc/pdf_aurore.modules.php                |   497 +-
 .../mod_supplier_proposal_saphir.php          |    54 +-
 .../modules_supplier_proposal.php             |    16 +-
 .../core/modules/syslog/mod_syslog_file.php   |    36 +-
 .../core/modules/syslog/mod_syslog_syslog.php |    10 +-
 .../takepos/mod_takepos_ref_simple.php        |   226 +-
 .../takepos/mod_takepos_ref_universal.php     |   160 +-
 .../core/modules/ticket/mod_ticket_simple.php |     6 +-
 .../modules/ticket/mod_ticket_universal.php   |   158 +-
 htdocs/core/modules/ticket/modules_ticket.php |    16 +-
 .../user/doc/doc_generic_user_odt.modules.php |    86 +-
 .../modules/user/doc}/index.html              |     0
 .../core/modules/user/modules_user.class.php  |    10 +-
 .../doc/doc_generic_usergroup_odt.modules.php |    52 +-
 .../usergroup/modules_usergroup.class.php     |    44 +-
 htdocs/core/photos_resize.php                 |   218 +-
 htdocs/core/tpl/admin_extrafields_add.tpl.php |    28 +-
 .../core/tpl/admin_extrafields_edit.tpl.php   |    57 +-
 htdocs/core/tpl/advtarget.tpl.php             |    85 +-
 htdocs/core/tpl/ajax/fileupload_main.tpl.php  |     4 +-
 .../tpl/ajax/objectlinked_lineimport.tpl.php  |     4 +-
 htdocs/core/tpl/ajaxrow.tpl.php               |    10 +-
 htdocs/core/tpl/bloc_comment.tpl.php          |    92 +-
 htdocs/core/tpl/card_presend.tpl.php          |    11 +-
 htdocs/core/tpl/commonfields_add.tpl.php      |     1 +
 htdocs/core/tpl/commonfields_edit.tpl.php     |     1 +
 htdocs/core/tpl/contacts.tpl.php              |    18 +-
 .../tpl/document_actions_post_headers.tpl.php |    52 +-
 .../tpl/extrafields_list_array_fields.tpl.php |    32 +
 .../tpl/extrafields_list_print_fields.tpl.php |    26 +-
 .../tpl/extrafields_list_search_input.tpl.php |    66 +-
 .../tpl/extrafields_list_search_param.tpl.php |    14 +-
 .../tpl/extrafields_list_search_sql.tpl.php   |     6 +-
 .../tpl/extrafields_list_search_title.tpl.php |     2 +-
 htdocs/core/tpl/extrafields_view.tpl.php      |    60 +-
 htdocs/core/tpl/filemanager.tpl.php           |    88 +-
 htdocs/core/tpl/login.tpl.php                 |    89 +-
 htdocs/core/tpl/massactions_pre.tpl.php       |     8 +-
 htdocs/core/tpl/notes.tpl.php                 |    10 +-
 htdocs/core/tpl/object_discounts.tpl.php      |     8 +-
 htdocs/core/tpl/objectline_create.tpl.php     |    29 +-
 htdocs/core/tpl/objectline_edit.tpl.php       |   116 +-
 htdocs/core/tpl/objectline_title.tpl.php      |     6 +-
 htdocs/core/tpl/objectline_view.tpl.php       |    20 +-
 htdocs/core/tpl/onlinepaymentlinks.tpl.php    |   158 +-
 htdocs/core/tpl/originproductline.tpl.php     |     2 +-
 htdocs/core/tpl/passwordforgotten.tpl.php     |    55 +-
 htdocs/core/tpl/resource_add.tpl.php          |     4 +-
 htdocs/core/tpl/resource_view.tpl.php         |     6 +-
 .../core/triggers/dolibarrtriggers.class.php  |    42 +-
 .../interface_20_all_Logevents.class.php      |   231 +-
 ...e_20_modWorkflow_WorkflowManager.class.php |   582 +-
 ...terface_50_modAgenda_ActionsAuto.class.php |   348 +-
 ..._modBlockedlog_ActionsBlockedLog.class.php |    61 +-
 ...interface_50_modLdap_Ldapsynchro.class.php |   335 +-
 ...odMailmanspip_Mailmanspipsynchro.class.php |   180 +-
 ..._50_modNotification_Notification.class.php |    43 +-
 ...terface_50_modTicket_TicketEmail.class.php |    82 +-
 .../interface_80_modStripe_Stripe.class.php   |   105 +-
 ...rface_90_modSociete_ContactRoles.class.php |    25 +-
 ...face_99_modZapier_ZapierTriggers.class.php |   854 +-
 htdocs/core/website.inc.php                   |     6 +-
 htdocs/cron/admin/cron.php                    |    22 +-
 htdocs/cron/card.php                          |   150 +-
 htdocs/cron/class/cronjob.class.php           |   628 +-
 htdocs/cron/info.php                          |     2 +-
 htdocs/cron/list.php                          |   144 +-
 htdocs/datapolicy/admin/setup.php             |   144 +-
 htdocs/datapolicy/admin/setupmail.php         |     4 +-
 .../class/actions_datapolicy.class.php        |   718 +-
 htdocs/datapolicy/class/datapolicy.class.php  |   580 +-
 .../datapolicy/class/datapolicycron.class.php |   692 +-
 htdocs/datapolicy/lib/datapolicy.lib.php      |    34 +-
 htdocs/datapolicy/public/index.php            |   126 +-
 htdocs/dav/dav.class.php                      |    34 +-
 htdocs/dav/fileserver.php                     |     4 +-
 .../DataCollector/DolConfigCollector.php      |     4 +-
 .../class/DataCollector/DolLogsCollector.php  |   132 +-
 .../DataCollector/DolMemoryCollector.php      |    30 +-
 .../class/DataCollector/DolibarrCollector.php |    17 +-
 htdocs/debugbar/class/TraceableDB.php         |    18 +-
 htdocs/{livraison => delivery}/card.php       |   185 +-
 .../class/delivery.class.php}                 |   424 +-
 .../{livraison => delivery/class}/index.html  |     0
 htdocs/delivery/index.html                    |     0
 htdocs/document.php                           |    28 +-
 htdocs/don/admin/donation.php                 |   148 +-
 htdocs/don/admin/donation_extrafields.php     |     4 +-
 htdocs/don/card.php                           |   493 +-
 htdocs/don/class/api_donations.class.php      |   504 +-
 htdocs/don/class/don.class.php                |   151 +-
 htdocs/don/class/donstats.class.php           |    92 +-
 htdocs/don/class/paymentdonation.class.php    |   262 +-
 htdocs/don/document.php                       |    88 +-
 htdocs/don/index.php                          |   182 +-
 htdocs/don/info.php                           |    66 +-
 htdocs/don/list.php                           |   170 +-
 htdocs/don/note.php                           |    66 +-
 htdocs/don/payment/card.php                   |    85 +-
 htdocs/don/payment/payment.php                |   129 +-
 htdocs/don/stats/index.php                    |    54 +-
 htdocs/don/tpl/linkedobjectblock.tpl.php      |    24 +-
 htdocs/ecm/class/ecmdirectory.class.php       |   369 +-
 htdocs/ecm/class/ecmfiles.class.php           |   149 +-
 htdocs/ecm/class/htmlecm.form.class.php       |    16 +-
 htdocs/ecm/dir_add_card.php                   |   133 +-
 htdocs/ecm/dir_card.php                       |    24 +-
 htdocs/ecm/file_card.php                      |   189 +-
 htdocs/ecm/index.php                          |   222 +-
 htdocs/ecm/index_auto.php                     |   340 +-
 htdocs/ecm/search.php                         |    27 +-
 .../class/emailcollector.class.php            |    33 +-
 .../class/emailcollectoraction.class.php      |   812 +-
 .../class/emailcollectorfilter.class.php      |   160 +-
 htdocs/expedition/card.php                    |    93 +-
 .../expedition/class/api_shipments.class.php  |   820 +-
 htdocs/expedition/class/expedition.class.php  |   445 +-
 .../class/expeditionbatch.class.php           |    24 +-
 .../class/expeditionstats.class.php           |    66 +-
 htdocs/expedition/contact.php                 |   166 +-
 htdocs/expedition/document.php                |     6 +-
 htdocs/expedition/index.php                   |    30 +-
 htdocs/expedition/list.php                    |    41 +-
 htdocs/expedition/note.php                    |   120 +-
 htdocs/expedition/shipment.php                |   532 +-
 htdocs/expedition/stats/index.php             |    62 +-
 htdocs/expedition/stats/month.php             |    16 +-
 .../expedition/tpl/linkedobjectblock.tpl.php  |    28 +-
 htdocs/expensereport/ajax/ajaxprojet.php      |    16 +-
 htdocs/expensereport/card.php                 |   110 +-
 .../class/api_expensereports.class.php        |   632 +-
 .../class/expensereport.class.php             |   245 +-
 .../class/expensereport_ik.class.php          |    42 +-
 .../class/expensereport_rule.class.php        |     2 +-
 .../class/expensereportstats.class.php        |    34 +-
 .../class/paymentexpensereport.class.php      |   320 +-
 htdocs/expensereport/document.php             |    26 +-
 htdocs/expensereport/index.php                |   168 +-
 htdocs/expensereport/info.php                 |     4 +-
 htdocs/expensereport/list.php                 |   444 +-
 htdocs/expensereport/note.php                 |     4 +-
 htdocs/expensereport/payment/card.php         |    89 +-
 htdocs/expensereport/payment/info.php         |     4 +-
 htdocs/expensereport/payment/payment.php      |   174 +-
 htdocs/expensereport/stats/index.php          |    68 +-
 .../tpl/expensereport_addfile.tpl.php         |    42 +-
 .../tpl/expensereport_linktofile.tpl.php      |   238 +-
 htdocs/exports/class/export.class.php         |   283 +-
 htdocs/exports/export.php                     |  1200 +-
 htdocs/exports/index.php                      |    10 +-
 htdocs/externalsite/admin/externalsite.php    |     2 +-
 .../fichinter/admin/fichinter_extrafields.php |     4 +-
 .../admin/fichinterdet_extrafields.php        |    18 +-
 htdocs/fichinter/card-rec.php                 |    54 +-
 htdocs/fichinter/card.php                     |   571 +-
 .../class/api_interventions.class.php         |   704 +-
 htdocs/fichinter/class/fichinter.class.php    |   224 +-
 htdocs/fichinter/class/fichinterrec.class.php |    33 +-
 .../fichinter/class/fichinterstats.class.php  |   307 +-
 htdocs/fichinter/contact.php                  |    87 +-
 htdocs/fichinter/document.php                 |    90 +-
 htdocs/fichinter/index.php                    |   180 +-
 htdocs/fichinter/info.php                     |     4 +-
 htdocs/fichinter/list.php                     |   126 +-
 htdocs/fichinter/note.php                     |    66 +-
 htdocs/fichinter/stats/index.php              |   152 +-
 .../fichinter/tpl/linkedobjectblock.tpl.php   |     6 +-
 htdocs/filefunc.inc.php                       |   130 +-
 htdocs/fourn/card.php                         |   506 +-
 .../class/api_supplier_invoices.class.php     |     4 +-
 .../fourn/class/api_supplier_orders.class.php |    12 +-
 htdocs/fourn/class/fournisseur.class.php      |    14 +-
 .../class/fournisseur.commande.class.php      |   173 +-
 .../fourn/class/fournisseur.facture.class.php |   118 +-
 .../fourn/class/fournisseur.product.class.php |  1789 +--
 htdocs/fourn/class/paiementfourn.class.php    |    35 +-
 htdocs/fourn/commande/card.php                |    73 +-
 htdocs/fourn/commande/contact.php             |    75 +-
 htdocs/fourn/commande/dispatch.php            |    86 +-
 htdocs/fourn/commande/document.php            |    62 +-
 htdocs/fourn/commande/index.php               |    16 +-
 htdocs/fourn/commande/info.php                |   122 +-
 htdocs/fourn/commande/list.php                |   111 +-
 htdocs/fourn/commande/note.php                |    90 +-
 htdocs/fourn/commande/orderstoinvoice.php     |   635 -
 .../commande/tpl/linkedobjectblock.tpl.php    |    16 +-
 htdocs/fourn/contact.php                      |    70 +-
 htdocs/fourn/facture/card.php                 |   715 +-
 htdocs/fourn/facture/contact.php              |    67 +-
 htdocs/fourn/facture/document.php             |   125 +-
 htdocs/fourn/facture/impayees.php             |    10 +-
 htdocs/fourn/facture/index.php                |    40 +-
 htdocs/fourn/facture/info.php                 |     2 +-
 htdocs/fourn/facture/list.php                 |   184 +-
 htdocs/fourn/facture/note.php                 |    96 +-
 htdocs/fourn/facture/paiement.php             |  1110 +-
 htdocs/fourn/facture/rapport.php              |   122 +-
 .../facture/tpl/linkedobjectblock.tpl.php     |    32 +-
 htdocs/fourn/paiement/card.php                |    46 +-
 htdocs/fourn/paiement/info.php                |     4 +-
 htdocs/fourn/paiement/list.php                |   446 +
 htdocs/fourn/product/list.php                 |   107 +-
 htdocs/fourn/recap-fourn.php                  |   210 +-
 htdocs/ftp/admin/ftpclient.php                |    20 +-
 htdocs/ftp/index.php                          |   172 +-
 htdocs/holiday/card.php                       |   121 +-
 htdocs/holiday/class/holiday.class.php        |   226 +-
 htdocs/holiday/common.inc.php                 |    42 -
 htdocs/holiday/define_holiday.php             |   351 +-
 htdocs/holiday/document.php                   |   210 +-
 htdocs/holiday/list.php                       |   101 +-
 htdocs/holiday/month_report.php               |   282 +-
 htdocs/holiday/view_log.php                   |   470 +-
 htdocs/hrm/admin/admin_establishment.php      |     4 +-
 htdocs/hrm/admin/admin_hrm.php                |     4 +-
 htdocs/hrm/class/establishment.class.php      |    40 +-
 htdocs/hrm/establishment/card.php             |    20 +-
 htdocs/hrm/establishment/info.php             |     4 +-
 htdocs/hrm/index.php                          |   316 +-
 htdocs/imports/class/import.class.php         |    82 +-
 htdocs/imports/emptyexample.php               |     6 +-
 htdocs/imports/import.php                     |   827 +-
 htdocs/imports/index.php                      |     2 +-
 htdocs/includes/mike42/escpos-php/.gitignore  |     4 +-
 .../includes/mike42/escpos-php/autoload.php   |    18 +-
 htdocs/includes/mike42/escpos-php/doc/FAQ.md  |   142 -
 .../includes/mike42/escpos-php/doc/Makefile   |    20 -
 .../mike42/escpos-php/doc/escpos.doxyfile     |  2352 ----
 .../PrintConnectors/CupsPrintConnector.php    |     2 +-
 .../mobiledetect/mobiledetectlib/.gitignore   |     1 +
 .../mobiledetectlib/docs/CONTRIBUTING.md      |    48 -
 .../mobiledetectlib/docs/HISTORY.md           |    11 -
 .../mobiledetectlib/docs/ISSUE_TEMPLATE.md    |    15 -
 .../mobiledetectlib/docs/KNOWN_LIMITATIONS.md |    12 -
 htdocs/includes/nnnick/chartjs/.gitignore     |     7 +-
 htdocs/includes/nnnick/chartjs/.travis.yml    |     4 +-
 .../nnnick/chartjs/dist/Chart.bundle.js       |    45 +-
 .../nnnick/chartjs/dist/Chart.bundle.min.js   |     6 +-
 htdocs/includes/nnnick/chartjs/dist/Chart.js  |    45 +-
 .../includes/nnnick/chartjs/dist/Chart.min.js |     6 +-
 .../includes/nnnick/chartjs/package-lock.json |     2 +-
 htdocs/includes/nnnick/chartjs/package.json   |     2 +-
 .../includes/nusoap/lib/class.nusoap_base.php |     2 +-
 .../includes/nusoap/lib/class.soap_fault.php  |     4 +-
 .../includes/nusoap/lib/class.soap_parser.php |     8 +-
 .../includes/nusoap/lib/class.soap_server.php |    16 +-
 .../nusoap/lib/class.soap_transport_http.php  |   102 +-
 htdocs/includes/nusoap/lib/class.soap_val.php |     4 +-
 .../includes/nusoap/lib/class.soapclient.php  |    24 +-
 htdocs/includes/nusoap/lib/class.wsdl.php     |   294 +-
 .../includes/nusoap/lib/class.wsdlcache.php   |     6 +-
 .../includes/nusoap/lib/class.xmlschema.php   |    44 +-
 htdocs/includes/nusoap/lib/nusoap.php         |    34 +-
 htdocs/includes/odtphp/odf.php                |     9 +-
 htdocs/includes/odtphp/zip/pclzip/LICENSE     |   661 +
 .../includes/odtphp/zip/pclzip/composer.json  |    20 +
 .../includes/odtphp/zip/pclzip/gnu-lgpl.txt   |    37 +-
 .../includes/odtphp/zip/pclzip/pclzip.lib.php | 10570 ++++++++--------
 htdocs/includes/odtphp/zip/pclzip/readme.txt  |    45 +-
 .../phpoffice/phpexcel/.gitattributes         |     4 -
 htdocs/includes/phpoffice/phpexcel/.gitignore |     9 -
 .../includes/phpoffice/phpexcel/.travis.yml   |    20 -
 .../phpoffice/phpexcel/Classes/PHPExcel.php   |  1139 --
 .../phpexcel/Classes/PHPExcel/Autoloader.php  |    89 -
 .../PHPExcel/CachedObjectStorage/APC.php      |   295 -
 .../CachedObjectStorage/CacheBase.php         |   376 -
 .../PHPExcel/CachedObjectStorage/DiscISAM.php |   219 -
 .../PHPExcel/CachedObjectStorage/ICache.php   |   112 -
 .../PHPExcel/CachedObjectStorage/Igbinary.php |   152 -
 .../PHPExcel/CachedObjectStorage/Memcache.php |   312 -
 .../PHPExcel/CachedObjectStorage/Memory.php   |   125 -
 .../CachedObjectStorage/MemoryGZip.php        |   137 -
 .../CachedObjectStorage/MemorySerialized.php  |   137 -
 .../PHPExcel/CachedObjectStorage/PHPTemp.php  |   206 -
 .../PHPExcel/CachedObjectStorage/SQLite.php   |   306 -
 .../PHPExcel/CachedObjectStorage/SQLite3.php  |   345 -
 .../PHPExcel/CachedObjectStorage/Wincache.php |   294 -
 .../PHPExcel/CachedObjectStorageFactory.php   |   251 -
 .../CalcEngine/CyclicReferenceStack.php       |    98 -
 .../Classes/PHPExcel/CalcEngine/Logger.php    |   153 -
 .../phpexcel/Classes/PHPExcel/Calculation.php |  3952 ------
 .../Classes/PHPExcel/Calculation/Database.php |   725 --
 .../Classes/PHPExcel/Calculation/DateTime.php |  1485 ---
 .../PHPExcel/Calculation/Engineering.php      |  2505 ----
 .../PHPExcel/Calculation/Exception.php        |    52 -
 .../PHPExcel/Calculation/ExceptionHandler.php |    49 -
 .../PHPExcel/Calculation/Financial.php        |  2292 ----
 .../PHPExcel/Calculation/FormulaParser.php    |   614 -
 .../PHPExcel/Calculation/FormulaToken.php     |   176 -
 .../Classes/PHPExcel/Calculation/Function.php |   149 -
 .../PHPExcel/Calculation/Functions.php        |   725 --
 .../Classes/PHPExcel/Calculation/Logical.php  |   288 -
 .../PHPExcel/Calculation/LookupRef.php        |   876 --
 .../Classes/PHPExcel/Calculation/MathTrig.php |  1376 --
 .../PHPExcel/Calculation/Statistical.php      |  3651 ------
 .../Classes/PHPExcel/Calculation/TextData.php |   630 -
 .../PHPExcel/Calculation/Token/Stack.php      |   115 -
 .../PHPExcel/Calculation/functionlist.txt     |   351 -
 .../phpexcel/Classes/PHPExcel/Cell.php        |  1022 --
 .../PHPExcel/Cell/AdvancedValueBinder.php     |   192 -
 .../Classes/PHPExcel/Cell/DataType.php        |   122 -
 .../Classes/PHPExcel/Cell/DataValidation.php  |   472 -
 .../PHPExcel/Cell/DefaultValueBinder.php      |   110 -
 .../Classes/PHPExcel/Cell/Hyperlink.php       |   126 -
 .../Classes/PHPExcel/Cell/IValueBinder.php    |    46 -
 .../phpexcel/Classes/PHPExcel/Chart.php       |   635 -
 .../phpexcel/Classes/PHPExcel/Chart/Axis.php  |   584 -
 .../Classes/PHPExcel/Chart/DataSeries.php     |   370 -
 .../PHPExcel/Chart/DataSeriesValues.php       |   327 -
 .../Classes/PHPExcel/Chart/Exception.php      |    52 -
 .../Classes/PHPExcel/Chart/GridLines.php      |   458 -
 .../Classes/PHPExcel/Chart/Layout.php         |   445 -
 .../Classes/PHPExcel/Chart/Legend.php         |   171 -
 .../Classes/PHPExcel/Chart/PlotArea.php       |   128 -
 .../Classes/PHPExcel/Chart/Properties.php     |   359 -
 .../Chart/Renderer/PHP Charting Libraries.txt |    17 -
 .../PHPExcel/Chart/Renderer/jpgraph.php       |   855 --
 .../phpexcel/Classes/PHPExcel/Chart/Title.php |    92 -
 .../phpexcel/Classes/PHPExcel/Comment.php     |   327 -
 .../Classes/PHPExcel/DocumentProperties.php   |   587 -
 .../Classes/PHPExcel/DocumentSecurity.php     |   218 -
 .../phpexcel/Classes/PHPExcel/Exception.php   |    52 -
 .../phpexcel/Classes/PHPExcel/HashTable.php   |   202 -
 .../phpexcel/Classes/PHPExcel/Helper/HTML.php |   762 --
 .../phpexcel/Classes/PHPExcel/IComparable.php |    43 -
 .../phpexcel/Classes/PHPExcel/IOFactory.php   |   288 -
 .../phpexcel/Classes/PHPExcel/NamedRange.php  |   246 -
 .../Classes/PHPExcel/Reader/Abstract.php      |   255 -
 .../phpexcel/Classes/PHPExcel/Reader/CSV.php  |   387 -
 .../PHPExcel/Reader/DefaultReadFilter.php     |    58 -
 .../Classes/PHPExcel/Reader/Excel2003XML.php  |   809 --
 .../Classes/PHPExcel/Reader/Excel2007.php     |  2083 ---
 .../PHPExcel/Reader/Excel2007/Chart.php       |   517 -
 .../PHPExcel/Reader/Excel2007/Theme.php       |   124 -
 .../Classes/PHPExcel/Reader/Excel5.php        |  7088 -----------
 .../Classes/PHPExcel/Reader/Excel5/Escher.php |   640 -
 .../Classes/PHPExcel/Reader/Excel5/MD5.php    |   221 -
 .../Classes/PHPExcel/Reader/Excel5/RC4.php    |    88 -
 .../Classes/PHPExcel/Reader/Exception.php     |    52 -
 .../Classes/PHPExcel/Reader/Gnumeric.php      |   873 --
 .../phpexcel/Classes/PHPExcel/Reader/HTML.php |   534 -
 .../Classes/PHPExcel/Reader/IReadFilter.php   |    47 -
 .../Classes/PHPExcel/Reader/IReader.php       |    54 -
 .../Classes/PHPExcel/Reader/OOCalc.php        |   711 --
 .../phpexcel/Classes/PHPExcel/Reader/SYLK.php |   450 -
 .../Classes/PHPExcel/ReferenceHelper.php      |   922 --
 .../phpexcel/Classes/PHPExcel/RichText.php    |   199 -
 .../PHPExcel/RichText/ITextElement.php        |    64 -
 .../Classes/PHPExcel/RichText/Run.php         |   102 -
 .../Classes/PHPExcel/RichText/TextElement.php |   108 -
 .../phpexcel/Classes/PHPExcel/Settings.php    |   391 -
 .../Classes/PHPExcel/Shared/CodePage.php      |   106 -
 .../phpexcel/Classes/PHPExcel/Shared/Date.php |   393 -
 .../Classes/PHPExcel/Shared/Drawing.php       |   272 -
 .../Classes/PHPExcel/Shared/Escher.php        |    91 -
 .../PHPExcel/Shared/Escher/DgContainer.php    |    83 -
 .../Escher/DgContainer/SpgrContainer.php      |   109 -
 .../DgContainer/SpgrContainer/SpContainer.php |   395 -
 .../PHPExcel/Shared/Escher/DggContainer.php   |   203 -
 .../Escher/DggContainer/BstoreContainer.php   |    65 -
 .../DggContainer/BstoreContainer/BSE.php      |   120 -
 .../DggContainer/BstoreContainer/BSE/Blip.php |    91 -
 .../Classes/PHPExcel/Shared/Excel5.php        |   317 -
 .../phpexcel/Classes/PHPExcel/Shared/File.php |   178 -
 .../phpexcel/Classes/PHPExcel/Shared/Font.php |   773 --
 .../PHPExcel/Shared/JAMA/CHANGELOG.TXT        |    16 -
 .../Shared/JAMA/CholeskyDecomposition.php     |   149 -
 .../Shared/JAMA/EigenvalueDecomposition.php   |   862 --
 .../PHPExcel/Shared/JAMA/LUDecomposition.php  |   258 -
 .../Classes/PHPExcel/Shared/JAMA/Matrix.php   |  1057 --
 .../PHPExcel/Shared/JAMA/QRDecomposition.php  |   234 -
 .../JAMA/SingularValueDecomposition.php       |   526 -
 .../PHPExcel/Shared/JAMA/utils/Error.php      |    82 -
 .../PHPExcel/Shared/JAMA/utils/Maths.php      |    43 -
 .../phpexcel/Classes/PHPExcel/Shared/OLE.php  |   531 -
 .../Shared/OLE/ChainedBlockStream.php         |   222 -
 .../Classes/PHPExcel/Shared/OLE/PPS.php       |   230 -
 .../Classes/PHPExcel/Shared/OLE/PPS/File.php  |    84 -
 .../Classes/PHPExcel/Shared/OLE/PPS/Root.php  |   467 -
 .../Classes/PHPExcel/Shared/OLERead.php       |   317 -
 .../PHPExcel/Shared/PCLZip/gnu-lgpl.txt       |   504 -
 .../PHPExcel/Shared/PCLZip/pclzip.lib.php     |  5691 ---------
 .../Classes/PHPExcel/Shared/PCLZip/readme.txt |   421 -
 .../PHPExcel/Shared/PasswordHasher.php        |    66 -
 .../Classes/PHPExcel/Shared/String.php        |   811 --
 .../Classes/PHPExcel/Shared/TimeZone.php      |   140 -
 .../Classes/PHPExcel/Shared/XMLWriter.php     |   127 -
 .../Classes/PHPExcel/Shared/ZipArchive.php    |   175 -
 .../PHPExcel/Shared/ZipStreamWrapper.php      |   201 -
 .../PHPExcel/Shared/trend/bestFitClass.php    |   432 -
 .../Shared/trend/exponentialBestFitClass.php  |   148 -
 .../Shared/trend/linearBestFitClass.php       |   111 -
 .../Shared/trend/logarithmicBestFitClass.php  |   120 -
 .../Shared/trend/polynomialBestFitClass.php   |   224 -
 .../Shared/trend/powerBestFitClass.php        |   142 -
 .../PHPExcel/Shared/trend/trendClass.php      |   156 -
 .../phpexcel/Classes/PHPExcel/Style.php       |   668 -
 .../Classes/PHPExcel/Style/Alignment.php      |   459 -
 .../Classes/PHPExcel/Style/Border.php         |   294 -
 .../Classes/PHPExcel/Style/Borders.php        |   424 -
 .../phpexcel/Classes/PHPExcel/Style/Color.php |   429 -
 .../Classes/PHPExcel/Style/Conditional.php    |   277 -
 .../phpexcel/Classes/PHPExcel/Style/Fill.php  |   321 -
 .../phpexcel/Classes/PHPExcel/Style/Font.php  |   532 -
 .../Classes/PHPExcel/Style/NumberFormat.php   |   717 --
 .../Classes/PHPExcel/Style/Protection.php     |   207 -
 .../Classes/PHPExcel/Style/Supervisor.php     |   132 -
 .../phpexcel/Classes/PHPExcel/Worksheet.php   |  2945 -----
 .../Classes/PHPExcel/Worksheet/AutoFilter.php |   862 --
 .../PHPExcel/Worksheet/AutoFilter/Column.php  |   394 -
 .../Worksheet/AutoFilter/Column/Rule.php      |   464 -
 .../PHPExcel/Worksheet/BaseDrawing.php        |   489 -
 .../PHPExcel/Worksheet/CellIterator.php       |    95 -
 .../Classes/PHPExcel/Worksheet/Column.php     |    92 -
 .../PHPExcel/Worksheet/ColumnCellIterator.php |   215 -
 .../PHPExcel/Worksheet/ColumnDimension.php    |   266 -
 .../PHPExcel/Worksheet/ColumnIterator.php     |   192 -
 .../Classes/PHPExcel/Worksheet/Drawing.php    |   148 -
 .../PHPExcel/Worksheet/Drawing/Shadow.php     |   288 -
 .../PHPExcel/Worksheet/HeaderFooter.php       |   465 -
 .../Worksheet/HeaderFooterDrawing.php         |   350 -
 .../PHPExcel/Worksheet/MemoryDrawing.php      |   200 -
 .../PHPExcel/Worksheet/PageMargins.php        |   220 -
 .../Classes/PHPExcel/Worksheet/PageSetup.php  |   798 --
 .../Classes/PHPExcel/Worksheet/Protection.php |   545 -
 .../Classes/PHPExcel/Worksheet/Row.php        |    92 -
 .../PHPExcel/Worksheet/RowCellIterator.php    |   224 -
 .../PHPExcel/Worksheet/RowDimension.php       |   265 -
 .../PHPExcel/Worksheet/RowIterator.php        |   183 -
 .../Classes/PHPExcel/Worksheet/SheetView.php  |   188 -
 .../Classes/PHPExcel/WorksheetIterator.php    |   118 -
 .../Classes/PHPExcel/Writer/Abstract.php      |   158 -
 .../phpexcel/Classes/PHPExcel/Writer/CSV.php  |   310 -
 .../Classes/PHPExcel/Writer/Excel2007.php     |   532 -
 .../PHPExcel/Writer/Excel2007/Chart.php       |  1606 ---
 .../PHPExcel/Writer/Excel2007/Comments.php    |   268 -
 .../Writer/Excel2007/ContentTypes.php         |   287 -
 .../PHPExcel/Writer/Excel2007/DocProps.php    |   272 -
 .../PHPExcel/Writer/Excel2007/Drawing.php     |   598 -
 .../PHPExcel/Writer/Excel2007/Rels.php        |   437 -
 .../PHPExcel/Writer/Excel2007/RelsRibbon.php  |    77 -
 .../PHPExcel/Writer/Excel2007/RelsVBA.php     |    72 -
 .../PHPExcel/Writer/Excel2007/StringTable.php |   319 -
 .../PHPExcel/Writer/Excel2007/Style.php       |   707 --
 .../PHPExcel/Writer/Excel2007/Theme.php       |   871 --
 .../PHPExcel/Writer/Excel2007/Workbook.php    |   456 -
 .../PHPExcel/Writer/Excel2007/Worksheet.php   |  1220 --
 .../PHPExcel/Writer/Excel2007/WriterPart.php  |    81 -
 .../Classes/PHPExcel/Writer/Excel5.php        |   935 --
 .../PHPExcel/Writer/Excel5/BIFFwriter.php     |   255 -
 .../Classes/PHPExcel/Writer/Excel5/Escher.php |   537 -
 .../Classes/PHPExcel/Writer/Excel5/Font.php   |   165 -
 .../Classes/PHPExcel/Writer/Excel5/Parser.php |  1583 ---
 .../PHPExcel/Writer/Excel5/Workbook.php       |  1450 ---
 .../PHPExcel/Writer/Excel5/Worksheet.php      |  3681 ------
 .../Classes/PHPExcel/Writer/Excel5/Xf.php     |   547 -
 .../Classes/PHPExcel/Writer/Exception.php     |    52 -
 .../phpexcel/Classes/PHPExcel/Writer/HTML.php |  1548 ---
 .../Classes/PHPExcel/Writer/IWriter.php       |    46 -
 .../Classes/PHPExcel/Writer/OpenDocument.php  |   200 -
 .../Writer/OpenDocument/Cell/Comment.php      |    63 -
 .../PHPExcel/Writer/OpenDocument/Content.php  |   272 -
 .../PHPExcel/Writer/OpenDocument/Meta.php     |    98 -
 .../PHPExcel/Writer/OpenDocument/MetaInf.php  |    96 -
 .../PHPExcel/Writer/OpenDocument/Mimetype.php |    50 -
 .../PHPExcel/Writer/OpenDocument/Settings.php |    85 -
 .../PHPExcel/Writer/OpenDocument/Styles.php   |   101 -
 .../Writer/OpenDocument/Thumbnails.php        |    50 -
 .../Writer/OpenDocument/WriterPart.php        |    38 -
 .../phpexcel/Classes/PHPExcel/Writer/PDF.php  |    97 -
 .../Classes/PHPExcel/Writer/PDF/Core.php      |   364 -
 .../Classes/PHPExcel/Writer/PDF/DomPDF.php    |   122 -
 .../Classes/PHPExcel/Writer/PDF/mPDF.php      |   130 -
 .../Classes/PHPExcel/Writer/PDF/tcPDF.php     |   136 -
 .../Classes/PHPExcel/locale/bg/config         |    49 -
 .../Classes/PHPExcel/locale/cs/config         |    47 -
 .../Classes/PHPExcel/locale/cs/functions      |   438 -
 .../Classes/PHPExcel/locale/da/config         |    48 -
 .../Classes/PHPExcel/locale/da/functions      |   438 -
 .../Classes/PHPExcel/locale/de/config         |    47 -
 .../Classes/PHPExcel/locale/de/functions      |   438 -
 .../Classes/PHPExcel/locale/en/uk/config      |    32 -
 .../Classes/PHPExcel/locale/es/config         |    47 -
 .../Classes/PHPExcel/locale/es/functions      |   438 -
 .../Classes/PHPExcel/locale/fi/config         |    47 -
 .../Classes/PHPExcel/locale/fi/functions      |   438 -
 .../Classes/PHPExcel/locale/fr/config         |    47 -
 .../Classes/PHPExcel/locale/fr/functions      |   438 -
 .../Classes/PHPExcel/locale/hu/config         |    47 -
 .../Classes/PHPExcel/locale/hu/functions      |   438 -
 .../Classes/PHPExcel/locale/it/config         |    47 -
 .../Classes/PHPExcel/locale/it/functions      |   438 -
 .../Classes/PHPExcel/locale/nl/config         |    47 -
 .../Classes/PHPExcel/locale/nl/functions      |   438 -
 .../Classes/PHPExcel/locale/no/config         |    47 -
 .../Classes/PHPExcel/locale/no/functions      |   438 -
 .../Classes/PHPExcel/locale/pl/config         |    47 -
 .../Classes/PHPExcel/locale/pl/functions      |   438 -
 .../Classes/PHPExcel/locale/pt/br/config      |    47 -
 .../Classes/PHPExcel/locale/pt/br/functions   |   408 -
 .../Classes/PHPExcel/locale/pt/config         |    47 -
 .../Classes/PHPExcel/locale/pt/functions      |   408 -
 .../Classes/PHPExcel/locale/ru/config         |    47 -
 .../Classes/PHPExcel/locale/ru/functions      |   438 -
 .../Classes/PHPExcel/locale/sv/config         |    47 -
 .../Classes/PHPExcel/locale/sv/functions      |   408 -
 .../Classes/PHPExcel/locale/tr/config         |    47 -
 .../Classes/PHPExcel/locale/tr/functions      |   438 -
 .../includes/phpoffice/phpexcel/changelog.txt |  1430 ---
 .../includes/phpoffice/phpexcel/composer.json |    41 -
 .../includes/phpoffice/phpexcel/install.txt   |    75 -
 htdocs/includes/phpoffice/phpexcel/license.md |   345 -
 htdocs/includes/symfony/var-dumper/.gitignore |     3 +
 .../includes/symfony/var-dumper/composer.json |    83 +-
 .../symfony/var-dumper/phpunit.xml.dist       |    29 +
 htdocs/includes/tecnickcom/tcpdf/.gitignore   |     2 +
 .../tecnickcom/tcpdf/include/tcpdf_fonts.php  |     2 +-
 htdocs/index.php                              |    44 +-
 htdocs/install/check.php                      |   304 +-
 htdocs/install/default.css                    |     4 +-
 .../websites/website_template-corporate.zip   |   Bin 2303286 -> 2150595 bytes
 .../websites/website_template-stellar.zip     |   Bin 116672 -> 117019 bytes
 htdocs/install/fileconf.php                   |   136 +-
 htdocs/install/inc.php                        |   433 +-
 .../install/mysql/data/llx_10_c_regions.sql   |     4 +
 .../mysql/data/llx_20_c_departements.sql      |    20 +
 .../install/mysql/data/llx_accounting_abc.sql |    77 +-
 .../mysql/data/llx_accounting_account_ca.sql  |   306 +-
 .../mysql/data/llx_accounting_account_fr.sql  |     4 +-
 .../install/mysql/data/llx_c_currencies.sql   |   278 +-
 .../mysql/data/llx_c_forme_juridique.sql      |     2 +
 .../mysql/data/llx_c_product_nature.sql       |    28 +
 .../mysql/data/llx_c_shipment_mode.sql        |     6 +
 .../mysql/data/llx_c_transport_mode.sql       |    31 +
 htdocs/install/mysql/data/llx_c_tva.sql       |     9 +-
 .../install/mysql/data/llx_c_type_contact.sql |     4 +-
 htdocs/install/mysql/data/llx_const.sql       |     8 +-
 .../install/mysql/migration/10.0.0-11.0.0.sql |    22 +-
 .../install/mysql/migration/11.0.0-12.0.0.sql |    25 +-
 .../install/mysql/migration/12.0.0-13.0.0.sql |   309 +-
 .../install/mysql/migration/3.0.0-3.1.0.sql   |     8 +-
 .../install/mysql/migration/3.1.0-3.2.0.sql   |     4 +-
 .../install/mysql/migration/3.2.0-3.3.0.sql   |    10 +-
 .../install/mysql/migration/3.3.0-3.4.0.sql   |    28 +-
 .../install/mysql/migration/3.4.0-3.5.0.sql   |    12 +-
 .../install/mysql/migration/3.5.0-3.6.0.sql   |    14 +-
 .../install/mysql/migration/3.6.0-3.7.0.sql   |    10 +-
 .../install/mysql/migration/3.7.0-3.8.0.sql   |    32 +-
 .../install/mysql/migration/3.8.0-3.9.0.sql   |    22 +-
 .../install/mysql/migration/3.9.0-4.0.0.sql   |     8 +-
 .../install/mysql/migration/4.0.0-5.0.0.sql   |    12 +-
 .../install/mysql/migration/5.0.0-6.0.0.sql   |    30 +-
 .../install/mysql/migration/6.0.0-7.0.0.sql   |    20 +-
 .../install/mysql/migration/7.0.0-8.0.0.sql   |    18 +-
 .../install/mysql/migration/8.0.0-9.0.0.sql   |     8 +-
 .../install/mysql/migration/9.0.0-10.0.0.sql  |    12 +-
 htdocs/install/mysql/migration/repair.sql     |    18 +-
 .../mysql/tables/llx_accounting_account.sql   |     2 +-
 .../tables/llx_accounting_bookkeeping.sql     |     2 +-
 .../tables/llx_accounting_bookkeeping_tmp.sql |     2 +-
 .../tables/llx_accounting_fiscalyear.sql      |     2 +-
 .../install/mysql/tables/llx_actioncomm.sql   |     2 +-
 .../tables/llx_actioncomm_extrafields.sql     |     2 +-
 .../mysql/tables/llx_actioncomm_reminder.sql  |     1 +
 htdocs/install/mysql/tables/llx_adherent.sql  |     2 +-
 .../mysql/tables/llx_adherent_extrafields.sql |     2 +-
 .../mysql/tables/llx_adherent_type.sql        |     2 +-
 .../tables/llx_adherent_type_extrafields.sql  |     2 +-
 .../mysql/tables/llx_advtargetemailing.sql    |     2 +-
 htdocs/install/mysql/tables/llx_asset.sql     |     2 +-
 .../mysql/tables/llx_asset_extrafields.sql    |     2 +-
 .../install/mysql/tables/llx_asset_type.sql   |     2 +-
 .../tables/llx_asset_type_extrafields.sql     |     2 +-
 htdocs/install/mysql/tables/llx_bank.sql      |     2 +-
 .../install/mysql/tables/llx_bank_account.sql |     2 +-
 .../tables/llx_bank_account_extrafields.sql   |     2 +-
 .../install/mysql/tables/llx_blockedlog.sql   |     2 +-
 .../mysql/tables/llx_blockedlog_authority.sql |     2 +-
 htdocs/install/mysql/tables/llx_bom_bom.sql   |     2 +-
 .../mysql/tables/llx_bom_bom_extrafields.sql  |     2 +-
 .../tables/llx_bom_bomline_extrafields.sql    |     2 +-
 .../mysql/tables/llx_bordereau_cheque.sql     |     2 +-
 htdocs/install/mysql/tables/llx_boxes_def.sql |     2 +-
 htdocs/install/mysql/tables/llx_budget.sql    |     2 +-
 .../install/mysql/tables/llx_budget_lines.sql |     2 +-
 .../tables/llx_c_email_senderprofile.sql      |     2 +-
 .../mysql/tables/llx_c_email_templates.sql    |     2 +-
 .../install/mysql/tables/llx_c_field_list.sql |     2 +-
 .../mysql/tables/llx_c_input_reason.sql       |     2 +
 .../mysql/tables/llx_c_product_nature.key.sql |     1 +
 .../mysql/tables/llx_c_product_nature.sql     |    24 +
 .../mysql/tables/llx_c_shipment_mode.sql      |     2 +-
 .../mysql/tables/llx_c_ticket_severity.sql    |     2 +-
 .../mysql/tables/llx_c_transport_mode.key.sql |    19 +
 .../mysql/tables/llx_c_transport_mode.sql     |    26 +
 htdocs/install/mysql/tables/llx_categorie.sql |     2 +-
 .../tables/llx_categories_extrafields.sql     |     2 +-
 .../mysql/tables/llx_chargesociales.sql       |     2 +-
 htdocs/install/mysql/tables/llx_commande.sql  |     2 +-
 .../mysql/tables/llx_commande_extrafields.sql |     2 +-
 .../mysql/tables/llx_commande_fournisseur.sql |     2 +-
 .../llx_commande_fournisseur_dispatch.sql     |     2 +-
 ...mande_fournisseur_dispatch_extrafields.sql |     2 +-
 .../llx_commande_fournisseur_extrafields.sql  |     2 +-
 .../tables/llx_commande_fournisseur_log.sql   |     2 +-
 .../llx_commande_fournisseurdet.key.sql       |     3 +
 ...lx_commande_fournisseurdet_extrafields.sql |     2 +-
 .../tables/llx_commandedet_extrafields.sql    |     2 +-
 htdocs/install/mysql/tables/llx_comment.sql   |     2 +-
 htdocs/install/mysql/tables/llx_const.sql     |     2 +-
 htdocs/install/mysql/tables/llx_contrat.sql   |     2 +-
 .../mysql/tables/llx_contrat_extrafields.sql  |     2 +-
 .../install/mysql/tables/llx_contratdet.sql   |     4 +-
 .../tables/llx_contratdet_extrafields.sql     |     2 +-
 .../mysql/tables/llx_contratdet_log.sql       |     2 +-
 htdocs/install/mysql/tables/llx_cronjob.sql   |     2 +-
 ...livraison.key.sql => llx_delivery.key.sql} |    14 +-
 .../{llx_livraison.sql => llx_delivery.sql}   |     4 +-
 ...y.sql => llx_delivery_extrafields.key.sql} |     2 +-
 ...ields.sql => llx_delivery_extrafields.sql} |     4 +-
 ...sondet.key.sql => llx_deliverydet.key.sql} |     4 +-
 ...x_livraisondet.sql => llx_deliverydet.sql} |     4 +-
 ...ql => llx_deliverydet_extrafields.key.sql} |     2 +-
 ...ds.sql => llx_deliverydet_extrafields.sql} |     4 +-
 .../install/mysql/tables/llx_deplacement.sql  |     2 +-
 htdocs/install/mysql/tables/llx_don.sql       |     2 +-
 .../mysql/tables/llx_don_extrafields.sql      |     2 +-
 .../mysql/tables/llx_ecm_directories.sql      |     2 +-
 .../llx_ecm_directories_extrafields.key.sql   |    20 +
 .../llx_ecm_directories_extrafileds.sql       |    26 +
 htdocs/install/mysql/tables/llx_ecm_files.sql |     2 +-
 .../tables/llx_ecm_files_extrafields.key.sql  |    20 +
 .../tables/llx_ecm_files_extrafields.sql      |    26 +
 .../mysql/tables/llx_element_resources.sql    |     2 +-
 .../llx_emailcollector_emailcollector.sql     |     2 +-
 ...lx_emailcollector_emailcollectoraction.sql |     2 +-
 ...lx_emailcollector_emailcollectorfilter.sql |     2 +-
 htdocs/install/mysql/tables/llx_entrepot.sql  |     2 +-
 .../mysql/tables/llx_entrepot_extrafields.sql |     2 +-
 .../mysql/tables/llx_establishment.sql        |     2 +-
 htdocs/install/mysql/tables/llx_events.sql    |     2 +-
 .../install/mysql/tables/llx_expedition.sql   |     2 +-
 .../tables/llx_expedition_extrafields.sql     |     2 +-
 .../tables/llx_expeditiondet_extrafields.sql  |     2 +-
 .../mysql/tables/llx_expensereport.sql        |     3 +-
 .../tables/llx_expensereport_extrafields.sql  |     2 +-
 .../mysql/tables/llx_expensereport_ik.sql     |     2 +-
 .../mysql/tables/llx_expensereport_rules.sql  |     2 +-
 .../install/mysql/tables/llx_extrafields.sql  |     2 +-
 htdocs/install/mysql/tables/llx_facture.sql   |     4 +-
 .../mysql/tables/llx_facture_extrafields.sql  |     2 +-
 .../mysql/tables/llx_facture_fourn.sql        |     5 +-
 .../llx_facture_fourn_det_extrafields.sql     |     2 +-
 .../tables/llx_facture_fourn_extrafields.sql  |     2 +-
 .../install/mysql/tables/llx_facture_rec.sql  |     2 +-
 .../tables/llx_facture_rec_extrafields.sql    |     2 +-
 .../install/mysql/tables/llx_facturedet.sql   |     2 +-
 .../tables/llx_facturedet_extrafields.sql     |     2 +-
 .../tables/llx_facturedet_rec_extrafields.sql |     2 +-
 htdocs/install/mysql/tables/llx_fichinter.sql |     2 +-
 .../tables/llx_fichinter_extrafields.sql      |     2 +-
 .../tables/llx_fichinterdet_extrafields.sql   |     2 +-
 htdocs/install/mysql/tables/llx_holiday.sql   |     2 +-
 .../mysql/tables/llx_holiday_extrafields.sql  |     2 +-
 .../mysql/tables/llx_intracommreport.sql      |    32 +
 htdocs/install/mysql/tables/llx_inventory.sql |     2 +-
 .../install/mysql/tables/llx_inventorydet.sql |     2 +-
 htdocs/install/mysql/tables/llx_loan.sql      |     2 +-
 .../mysql/tables/llx_loan_schedule.sql        |     2 +-
 htdocs/install/mysql/tables/llx_localtax.sql  |     2 +-
 htdocs/install/mysql/tables/llx_mailing.sql   |     2 +-
 .../mysql/tables/llx_mailing_cibles.sql       |     2 +-
 .../mysql/tables/llx_mailing_unsubscribe.sql  |     2 +-
 htdocs/install/mysql/tables/llx_menu.sql      |     4 +-
 htdocs/install/mysql/tables/llx_mrp_mo.sql    |     2 +-
 .../mysql/tables/llx_mrp_mo_extrafields.sql   |     2 +-
 .../mysql/tables/llx_mrp_production.sql       |     2 +-
 htdocs/install/mysql/tables/llx_notify.sql    |     2 +-
 .../install/mysql/tables/llx_notify_def.sql   |     2 +-
 .../mysql/tables/llx_online_signatures.sql    |     2 +-
 .../mysql/tables/llx_opensurvey_comments.sql  |     2 +-
 .../mysql/tables/llx_opensurvey_sondage.sql   |     2 +-
 .../tables/llx_opensurvey_user_studs.sql      |     2 +-
 htdocs/install/mysql/tables/llx_paiement.sql  |     2 +-
 .../mysql/tables/llx_paiementcharge.sql       |     2 +-
 .../mysql/tables/llx_paiementfourn.sql        |     2 +-
 .../mysql/tables/llx_payment_donation.sql     |     2 +-
 .../tables/llx_payment_expensereport.sql      |     2 +-
 .../install/mysql/tables/llx_payment_loan.sql |     2 +-
 .../mysql/tables/llx_payment_salary.sql       |     2 +-
 .../tables/llx_payment_salary_extrafields.sql |     2 +-
 .../mysql/tables/llx_payment_various.sql      |     2 +-
 .../mysql/tables/llx_prelevement_facture.sql  |     2 +-
 htdocs/install/mysql/tables/llx_printing.sql  |     2 +-
 .../install/mysql/tables/llx_product.key.sql  |     1 +
 htdocs/install/mysql/tables/llx_product.sql   |     4 +-
 .../mysql/tables/llx_product_batch.sql        |     2 +-
 .../tables/llx_product_customer_price.sql     |     2 +-
 .../mysql/tables/llx_product_extrafields.sql  |     2 +-
 .../tables/llx_product_fournisseur_price.sql  |     3 +-
 ..._product_fournisseur_price_extrafields.sql |     2 +-
 .../install/mysql/tables/llx_product_lot.sql  |     2 +-
 .../tables/llx_product_lot_extrafields.sql    |     2 +-
 .../mysql/tables/llx_product_price.sql        |     2 +-
 .../mysql/tables/llx_product_price_by_qty.sql |     2 +-
 .../mysql/tables/llx_product_stock.sql        |     2 +-
 .../tables/llx_product_stock_entrepot.sql     |     2 +-
 htdocs/install/mysql/tables/llx_projet.sql    |     2 +-
 .../mysql/tables/llx_projet_extrafields.sql   |     2 +-
 .../install/mysql/tables/llx_projet_task.sql  |     2 +-
 .../tables/llx_projet_task_extrafields.sql    |     2 +-
 .../mysql/tables/llx_projet_task_time.sql     |     4 +-
 htdocs/install/mysql/tables/llx_propal.sql    |     2 +-
 .../mysql/tables/llx_propal_extrafields.sql   |     2 +-
 .../tables/llx_propal_merge_pdf_product.sql   |     2 +-
 .../tables/llx_propaldet_extrafields.sql      |     2 +-
 htdocs/install/mysql/tables/llx_reception.sql |     4 +-
 .../tables/llx_reception_extrafields.sql      |     2 +-
 ...llx_recruitment_recruitmentcandidature.sql |     2 +-
 ...ent_recruitmentcandidature_extrafields.sql |     2 +-
 ...llx_recruitment_recruitmentjobposition.sql |     2 +-
 ...ent_recruitmentjobposition_extrafields.sql |     2 +-
 htdocs/install/mysql/tables/llx_resource.sql  |     2 +-
 .../mysql/tables/llx_resource_extrafields.sql |     2 +-
 htdocs/install/mysql/tables/llx_session.sql   |    28 +
 htdocs/install/mysql/tables/llx_societe.sql   |     4 +-
 .../mysql/tables/llx_societe_account.sql      |     2 +-
 .../mysql/tables/llx_societe_address.sql      |     2 +-
 .../mysql/tables/llx_societe_extrafields.sql  |     2 +-
 .../mysql/tables/llx_societe_prices.sql       |     2 +-
 .../mysql/tables/llx_societe_remise.sql       |     2 +-
 .../tables/llx_societe_remise_supplier.sql    |     2 +-
 .../install/mysql/tables/llx_societe_rib.sql  |     2 +-
 htdocs/install/mysql/tables/llx_socpeople.sql |     2 +-
 .../tables/llx_socpeople_extrafields.sql      |     2 +-
 .../mysql/tables/llx_stock_mouvement.sql      |     2 +-
 .../install/mysql/tables/llx_subscription.sql |     2 +-
 .../mysql/tables/llx_supplier_proposal.sql    |     2 +-
 .../llx_supplier_proposal_extrafields.sql     |     2 +-
 .../llx_supplier_proposaldet_extrafields.sql  |     2 +-
 htdocs/install/mysql/tables/llx_ticket.sql    |     2 +-
 .../mysql/tables/llx_ticket_extrafields.sql   |     2 +-
 htdocs/install/mysql/tables/llx_tva.sql       |     2 +-
 htdocs/install/mysql/tables/llx_user.sql      |    27 +-
 .../mysql/tables/llx_user_employment.sql      |     2 +-
 .../mysql/tables/llx_user_extrafields.sql     |     2 +-
 htdocs/install/mysql/tables/llx_user_rib.sql  |     2 +-
 htdocs/install/mysql/tables/llx_usergroup.sql |     2 +-
 .../tables/llx_usergroup_extrafields.sql      |     2 +-
 htdocs/install/mysql/tables/llx_website.sql   |     2 +-
 .../mysql/tables/llx_website_extrafields.sql  |     2 +-
 .../install/mysql/tables/llx_website_page.sql |     9 +-
 .../install/mysql/tables/llx_zapier_hook.sql  |     4 +-
 .../tables/llx_zapier_hook_extrafields.sql    |    23 -
 htdocs/install/pgsql/functions/functions.sql  |     2 +-
 htdocs/install/repair.php                     |     4 +-
 htdocs/install/step1.php                      |  1204 +-
 htdocs/install/step2.php                      |   874 +-
 htdocs/install/step4.php                      |    58 +-
 htdocs/install/upgrade.php                    |   488 +-
 htdocs/install/upgrade2.php                   |  5426 ++++----
 htdocs/intracommreport/admin/index.html       |     0
 .../intracommreport/admin/intracommreport.php |   208 +
 htdocs/intracommreport/card.php               |   333 +
 htdocs/intracommreport/class/index.html       |     0
 .../class/intracommreport.class.php           |   449 +
 htdocs/intracommreport/index.html             |     0
 htdocs/intracommreport/list.php               |   538 +
 htdocs/langs/am_ET/accountancy.lang           |    37 +-
 htdocs/langs/am_ET/admin.lang                 |   107 +-
 htdocs/langs/am_ET/banks.lang                 |     4 +
 htdocs/langs/am_ET/categories.lang            |     8 +-
 htdocs/langs/am_ET/companies.lang             |    37 +-
 htdocs/langs/am_ET/ecm.lang                   |    17 +-
 htdocs/langs/am_ET/hrm.lang                   |     1 +
 htdocs/langs/am_ET/install.lang               |     8 +-
 htdocs/langs/am_ET/intracommreport.lang       |    40 +
 htdocs/langs/am_ET/languages.lang             |     1 +
 htdocs/langs/am_ET/main.lang                  |    26 +-
 htdocs/langs/am_ET/members.lang               |    12 +-
 htdocs/langs/am_ET/mrp.lang                   |     4 +-
 htdocs/langs/am_ET/products.lang              |    16 +-
 htdocs/langs/am_ET/recruitment.lang           |    29 +-
 htdocs/langs/am_ET/stocks.lang                |    12 +-
 htdocs/langs/am_ET/suppliers.lang             |     1 +
 htdocs/langs/am_ET/website.lang               |     4 +-
 htdocs/langs/ar_EG/propal.lang                |     1 -
 htdocs/langs/ar_EG/suppliers.lang             |     1 -
 htdocs/langs/ar_SA/accountancy.lang           |    37 +-
 htdocs/langs/ar_SA/admin.lang                 |   107 +-
 htdocs/langs/ar_SA/banks.lang                 |     4 +
 htdocs/langs/ar_SA/categories.lang            |     8 +-
 htdocs/langs/ar_SA/companies.lang             |    37 +-
 htdocs/langs/ar_SA/ecm.lang                   |    17 +-
 htdocs/langs/ar_SA/hrm.lang                   |     1 +
 htdocs/langs/ar_SA/install.lang               |     8 +-
 htdocs/langs/ar_SA/intracommreport.lang       |    40 +
 htdocs/langs/ar_SA/languages.lang             |     1 +
 htdocs/langs/ar_SA/main.lang                  |    26 +-
 htdocs/langs/ar_SA/members.lang               |    12 +-
 htdocs/langs/ar_SA/mrp.lang                   |     4 +-
 htdocs/langs/ar_SA/products.lang              |    16 +-
 htdocs/langs/ar_SA/recruitment.lang           |    29 +-
 htdocs/langs/ar_SA/stocks.lang                |    12 +-
 htdocs/langs/ar_SA/suppliers.lang             |     1 +
 htdocs/langs/ar_SA/website.lang               |     4 +-
 htdocs/langs/az_AZ/accountancy.lang           |    37 +-
 htdocs/langs/az_AZ/admin.lang                 |   107 +-
 htdocs/langs/az_AZ/banks.lang                 |     4 +
 htdocs/langs/az_AZ/categories.lang            |     8 +-
 htdocs/langs/az_AZ/companies.lang             |    37 +-
 htdocs/langs/az_AZ/ecm.lang                   |    17 +-
 htdocs/langs/az_AZ/hrm.lang                   |     1 +
 htdocs/langs/az_AZ/install.lang               |     8 +-
 htdocs/langs/az_AZ/intracommreport.lang       |    40 +
 htdocs/langs/az_AZ/languages.lang             |     1 +
 htdocs/langs/az_AZ/main.lang                  |    26 +-
 htdocs/langs/az_AZ/members.lang               |    12 +-
 htdocs/langs/az_AZ/mrp.lang                   |     4 +-
 htdocs/langs/az_AZ/products.lang              |    16 +-
 htdocs/langs/az_AZ/recruitment.lang           |    29 +-
 htdocs/langs/az_AZ/stocks.lang                |    12 +-
 htdocs/langs/az_AZ/suppliers.lang             |     1 +
 htdocs/langs/az_AZ/website.lang               |     4 +-
 htdocs/langs/bg_BG/accountancy.lang           |    37 +-
 htdocs/langs/bg_BG/admin.lang                 |   107 +-
 htdocs/langs/bg_BG/banks.lang                 |     4 +
 htdocs/langs/bg_BG/categories.lang            |     8 +-
 htdocs/langs/bg_BG/companies.lang             |    37 +-
 htdocs/langs/bg_BG/ecm.lang                   |    17 +-
 htdocs/langs/bg_BG/hrm.lang                   |     1 +
 htdocs/langs/bg_BG/install.lang               |     8 +-
 htdocs/langs/bg_BG/intracommreport.lang       |    40 +
 htdocs/langs/bg_BG/languages.lang             |     1 +
 htdocs/langs/bg_BG/main.lang                  |    26 +-
 htdocs/langs/bg_BG/members.lang               |    12 +-
 htdocs/langs/bg_BG/mrp.lang                   |     4 +-
 htdocs/langs/bg_BG/products.lang              |    16 +-
 htdocs/langs/bg_BG/recruitment.lang           |    29 +-
 htdocs/langs/bg_BG/stocks.lang                |    12 +-
 htdocs/langs/bg_BG/suppliers.lang             |     1 +
 htdocs/langs/bg_BG/website.lang               |     4 +-
 htdocs/langs/bn_BD/accountancy.lang           |    37 +-
 htdocs/langs/bn_BD/admin.lang                 |   107 +-
 htdocs/langs/bn_BD/banks.lang                 |     4 +
 htdocs/langs/bn_BD/categories.lang            |     8 +-
 htdocs/langs/bn_BD/companies.lang             |    37 +-
 htdocs/langs/bn_BD/ecm.lang                   |    17 +-
 htdocs/langs/bn_BD/hrm.lang                   |     1 +
 htdocs/langs/bn_BD/install.lang               |     8 +-
 htdocs/langs/bn_BD/intracommreport.lang       |    40 +
 htdocs/langs/bn_BD/languages.lang             |     1 +
 htdocs/langs/bn_BD/main.lang                  |    26 +-
 htdocs/langs/bn_BD/members.lang               |    12 +-
 htdocs/langs/bn_BD/mrp.lang                   |     4 +-
 htdocs/langs/bn_BD/products.lang              |    16 +-
 htdocs/langs/bn_BD/recruitment.lang           |    29 +-
 htdocs/langs/bn_BD/stocks.lang                |    12 +-
 htdocs/langs/bn_BD/suppliers.lang             |     1 +
 htdocs/langs/bn_BD/website.lang               |     4 +-
 htdocs/langs/bn_IN/accountancy.lang           |    37 +-
 htdocs/langs/bn_IN/admin.lang                 |   107 +-
 htdocs/langs/bn_IN/banks.lang                 |     4 +
 htdocs/langs/bn_IN/categories.lang            |     8 +-
 htdocs/langs/bn_IN/companies.lang             |    37 +-
 htdocs/langs/bn_IN/ecm.lang                   |    17 +-
 htdocs/langs/bn_IN/hrm.lang                   |     1 +
 htdocs/langs/bn_IN/install.lang               |     8 +-
 htdocs/langs/bn_IN/intracommreport.lang       |    40 +
 htdocs/langs/bn_IN/languages.lang             |     1 +
 htdocs/langs/bn_IN/main.lang                  |    26 +-
 htdocs/langs/bn_IN/members.lang               |    12 +-
 htdocs/langs/bn_IN/mrp.lang                   |     4 +-
 htdocs/langs/bn_IN/products.lang              |    16 +-
 htdocs/langs/bn_IN/recruitment.lang           |    29 +-
 htdocs/langs/bn_IN/stocks.lang                |    12 +-
 htdocs/langs/bn_IN/suppliers.lang             |     1 +
 htdocs/langs/bn_IN/website.lang               |     4 +-
 htdocs/langs/bs_BA/accountancy.lang           |    37 +-
 htdocs/langs/bs_BA/admin.lang                 |   107 +-
 htdocs/langs/bs_BA/banks.lang                 |     4 +
 htdocs/langs/bs_BA/categories.lang            |     8 +-
 htdocs/langs/bs_BA/companies.lang             |    37 +-
 htdocs/langs/bs_BA/ecm.lang                   |    17 +-
 htdocs/langs/bs_BA/hrm.lang                   |     1 +
 htdocs/langs/bs_BA/install.lang               |     8 +-
 htdocs/langs/bs_BA/intracommreport.lang       |    40 +
 htdocs/langs/bs_BA/languages.lang             |     1 +
 htdocs/langs/bs_BA/main.lang                  |    26 +-
 htdocs/langs/bs_BA/members.lang               |    12 +-
 htdocs/langs/bs_BA/mrp.lang                   |     4 +-
 htdocs/langs/bs_BA/products.lang              |    16 +-
 htdocs/langs/bs_BA/recruitment.lang           |    29 +-
 htdocs/langs/bs_BA/stocks.lang                |    12 +-
 htdocs/langs/bs_BA/suppliers.lang             |     1 +
 htdocs/langs/bs_BA/website.lang               |     4 +-
 htdocs/langs/ca_ES/accountancy.lang           |    81 +-
 htdocs/langs/ca_ES/admin.lang                 |   345 +-
 htdocs/langs/ca_ES/agenda.lang                |    21 +-
 htdocs/langs/ca_ES/banks.lang                 |    18 +-
 htdocs/langs/ca_ES/bills.lang                 |    13 +-
 htdocs/langs/ca_ES/boxes.lang                 |     5 +-
 htdocs/langs/ca_ES/cashdesk.lang              |    17 +-
 htdocs/langs/ca_ES/categories.lang            |    10 +-
 htdocs/langs/ca_ES/companies.lang             |    69 +-
 htdocs/langs/ca_ES/compta.lang                |     5 +-
 htdocs/langs/ca_ES/cron.lang                  |     8 +-
 htdocs/langs/ca_ES/dict.lang                  |    14 +-
 htdocs/langs/ca_ES/donations.lang             |     3 +-
 htdocs/langs/ca_ES/ecm.lang                   |    17 +-
 htdocs/langs/ca_ES/errors.lang                |    26 +-
 htdocs/langs/ca_ES/exports.lang               |     8 +-
 htdocs/langs/ca_ES/holiday.lang               |     2 +-
 htdocs/langs/ca_ES/hrm.lang                   |     5 +-
 htdocs/langs/ca_ES/install.lang               |    28 +-
 htdocs/langs/ca_ES/interventions.lang         |     2 +
 htdocs/langs/ca_ES/intracommreport.lang       |    40 +
 htdocs/langs/ca_ES/languages.lang             |     5 +-
 htdocs/langs/ca_ES/loan.lang                  |     2 +-
 htdocs/langs/ca_ES/main.lang                  |    80 +-
 htdocs/langs/ca_ES/members.lang               |    12 +-
 htdocs/langs/ca_ES/modulebuilder.lang         |     4 +-
 htdocs/langs/ca_ES/mrp.lang                   |    20 +-
 htdocs/langs/ca_ES/multicurrency.lang         |    16 +
 htdocs/langs/ca_ES/opensurvey.lang            |     6 +-
 htdocs/langs/ca_ES/orders.lang                |     2 +-
 htdocs/langs/ca_ES/other.lang                 |     9 +-
 htdocs/langs/ca_ES/printing.lang              |     2 +-
 htdocs/langs/ca_ES/products.lang              |    36 +-
 htdocs/langs/ca_ES/projects.lang              |    18 +-
 htdocs/langs/ca_ES/propal.lang                |     8 +-
 htdocs/langs/ca_ES/receiptprinter.lang        |     2 +-
 htdocs/langs/ca_ES/recruitment.lang           |    45 +-
 htdocs/langs/ca_ES/sendings.lang              |     3 +-
 htdocs/langs/ca_ES/stocks.lang                |    24 +-
 htdocs/langs/ca_ES/stripe.lang                |     3 +-
 htdocs/langs/ca_ES/suppliers.lang             |     1 +
 htdocs/langs/ca_ES/ticket.lang                |    12 +-
 htdocs/langs/ca_ES/trips.lang                 |     8 +-
 htdocs/langs/ca_ES/users.lang                 |     9 +-
 htdocs/langs/ca_ES/website.lang               |    10 +-
 htdocs/langs/ca_ES/withdrawals.lang           |     8 +-
 htdocs/langs/ca_ES/workflow.lang              |    10 +-
 htdocs/langs/cs_CZ/accountancy.lang           |    37 +-
 htdocs/langs/cs_CZ/admin.lang                 |   107 +-
 htdocs/langs/cs_CZ/banks.lang                 |     4 +
 htdocs/langs/cs_CZ/categories.lang            |     8 +-
 htdocs/langs/cs_CZ/companies.lang             |    37 +-
 htdocs/langs/cs_CZ/ecm.lang                   |    45 +-
 htdocs/langs/cs_CZ/hrm.lang                   |     1 +
 htdocs/langs/cs_CZ/install.lang               |     8 +-
 htdocs/langs/cs_CZ/intracommreport.lang       |    40 +
 htdocs/langs/cs_CZ/languages.lang             |     1 +
 htdocs/langs/cs_CZ/main.lang                  |    26 +-
 htdocs/langs/cs_CZ/members.lang               |    12 +-
 htdocs/langs/cs_CZ/mrp.lang                   |     4 +-
 htdocs/langs/cs_CZ/products.lang              |    16 +-
 htdocs/langs/cs_CZ/recruitment.lang           |    29 +-
 htdocs/langs/cs_CZ/stocks.lang                |    12 +-
 htdocs/langs/cs_CZ/suppliers.lang             |     1 +
 htdocs/langs/cs_CZ/website.lang               |     4 +-
 htdocs/langs/da_DK/accountancy.lang           |    45 +-
 htdocs/langs/da_DK/admin.lang                 |   179 +-
 htdocs/langs/da_DK/banks.lang                 |     4 +
 htdocs/langs/da_DK/categories.lang            |     8 +-
 htdocs/langs/da_DK/companies.lang             |    37 +-
 htdocs/langs/da_DK/ecm.lang                   |    17 +-
 htdocs/langs/da_DK/hrm.lang                   |     1 +
 htdocs/langs/da_DK/install.lang               |     8 +-
 htdocs/langs/da_DK/intracommreport.lang       |    40 +
 htdocs/langs/da_DK/languages.lang             |     3 +-
 htdocs/langs/da_DK/main.lang                  |   106 +-
 htdocs/langs/da_DK/members.lang               |    12 +-
 htdocs/langs/da_DK/mrp.lang                   |     6 +-
 htdocs/langs/da_DK/products.lang              |    16 +-
 htdocs/langs/da_DK/recruitment.lang           |    29 +-
 htdocs/langs/da_DK/stocks.lang                |    12 +-
 htdocs/langs/da_DK/suppliers.lang             |     1 +
 htdocs/langs/da_DK/website.lang               |     4 +-
 htdocs/langs/de_AT/main.lang                  |     1 +
 htdocs/langs/de_AT/members.lang               |     1 -
 htdocs/langs/de_AT/products.lang              |     1 +
 htdocs/langs/de_CH/accountancy.lang           |    10 -
 htdocs/langs/de_CH/admin.lang                 |    11 +-
 htdocs/langs/de_CH/companies.lang             |     9 +-
 htdocs/langs/de_CH/ecm.lang                   |    10 +-
 htdocs/langs/de_CH/intracommreport.lang       |    11 +
 htdocs/langs/de_CH/main.lang                  |     2 +
 htdocs/langs/de_CH/members.lang               |     1 -
 htdocs/langs/de_CH/paybox.lang                |     1 -
 htdocs/langs/de_CH/products.lang              |     7 -
 htdocs/langs/de_CH/stocks.lang                |     3 +-
 htdocs/langs/de_CH/suppliers.lang             |     3 +-
 htdocs/langs/de_DE/accountancy.lang           |    37 +-
 htdocs/langs/de_DE/admin.lang                 |   189 +-
 htdocs/langs/de_DE/agenda.lang                |    19 +-
 htdocs/langs/de_DE/assets.lang                |     2 +-
 htdocs/langs/de_DE/banks.lang                 |     4 +
 htdocs/langs/de_DE/bills.lang                 |     5 +
 htdocs/langs/de_DE/categories.lang            |     8 +-
 htdocs/langs/de_DE/companies.lang             |    77 +-
 htdocs/langs/de_DE/ecm.lang                   |    17 +-
 htdocs/langs/de_DE/hrm.lang                   |     1 +
 htdocs/langs/de_DE/install.lang               |     8 +-
 htdocs/langs/de_DE/intracommreport.lang       |    40 +
 htdocs/langs/de_DE/languages.lang             |     3 +-
 htdocs/langs/de_DE/main.lang                  |    62 +-
 htdocs/langs/de_DE/members.lang               |    12 +-
 htdocs/langs/de_DE/mrp.lang                   |     6 +-
 htdocs/langs/de_DE/products.lang              |    22 +-
 htdocs/langs/de_DE/recruitment.lang           |    63 +-
 htdocs/langs/de_DE/stocks.lang                |    16 +-
 htdocs/langs/de_DE/suppliers.lang             |     1 +
 htdocs/langs/de_DE/website.lang               |    12 +-
 htdocs/langs/el_CY/products.lang              |     2 +
 htdocs/langs/el_GR/accountancy.lang           |    37 +-
 htdocs/langs/el_GR/admin.lang                 |   107 +-
 htdocs/langs/el_GR/banks.lang                 |     4 +
 htdocs/langs/el_GR/categories.lang            |     8 +-
 htdocs/langs/el_GR/companies.lang             |    37 +-
 htdocs/langs/el_GR/ecm.lang                   |    41 +-
 htdocs/langs/el_GR/hrm.lang                   |     1 +
 htdocs/langs/el_GR/install.lang               |     8 +-
 htdocs/langs/el_GR/intracommreport.lang       |    40 +
 htdocs/langs/el_GR/languages.lang             |     1 +
 htdocs/langs/el_GR/main.lang                  |    26 +-
 htdocs/langs/el_GR/members.lang               |    12 +-
 htdocs/langs/el_GR/mrp.lang                   |     4 +-
 htdocs/langs/el_GR/products.lang              |    16 +-
 htdocs/langs/el_GR/recruitment.lang           |    29 +-
 htdocs/langs/el_GR/stocks.lang                |    12 +-
 htdocs/langs/el_GR/suppliers.lang             |     1 +
 htdocs/langs/el_GR/website.lang               |     4 +-
 htdocs/langs/en_AU/intracommreport.lang       |     2 +
 htdocs/langs/en_AU/main.lang                  |     1 -
 htdocs/langs/en_AU/products.lang              |     2 +
 htdocs/langs/en_AU/stocks.lang                |     2 -
 htdocs/langs/en_CA/compta.lang                |     2 +
 htdocs/langs/en_CA/intracommreport.lang       |     2 +
 htdocs/langs/en_CA/main.lang                  |     1 -
 htdocs/langs/en_CA/products.lang              |     2 +
 htdocs/langs/en_CA/stocks.lang                |     2 -
 htdocs/langs/en_GB/accountancy.lang           |     6 -
 htdocs/langs/en_GB/intracommreport.lang       |     2 +
 htdocs/langs/en_GB/main.lang                  |     1 -
 htdocs/langs/en_GB/products.lang              |     1 +
 htdocs/langs/en_GB/stocks.lang                |     2 -
 htdocs/langs/en_GB/suppliers.lang             |     2 -
 htdocs/langs/en_IN/ecm.lang                   |     2 -
 htdocs/langs/en_IN/intracommreport.lang       |     2 +
 htdocs/langs/en_IN/main.lang                  |     1 -
 htdocs/langs/en_IN/products.lang              |     2 +
 htdocs/langs/en_IN/stocks.lang                |     2 -
 htdocs/langs/en_SG/compta.lang                |     2 +
 htdocs/langs/en_SG/intracommreport.lang       |     2 +
 htdocs/langs/en_SG/main.lang                  |     1 -
 htdocs/langs/en_SG/products.lang              |     2 +
 htdocs/langs/en_SG/stocks.lang                |     2 -
 htdocs/langs/en_US/accountancy.lang           |    34 +-
 htdocs/langs/en_US/admin.lang                 |    72 +-
 htdocs/langs/en_US/agenda.lang                |     3 +-
 htdocs/langs/en_US/banks.lang                 |     6 +-
 htdocs/langs/en_US/bills.lang                 |     5 +
 htdocs/langs/en_US/blockedlog.lang            |     2 +-
 htdocs/langs/en_US/boxes.lang                 |     4 +
 htdocs/langs/en_US/cashdesk.lang              |     8 +-
 htdocs/langs/en_US/categories.lang            |     2 +
 htdocs/langs/en_US/companies.lang             |    36 +-
 htdocs/langs/en_US/compta.lang                |     2 +-
 htdocs/langs/en_US/cron.lang                  |    12 +-
 htdocs/langs/en_US/deliveries.lang            |     1 +
 htdocs/langs/en_US/ecm.lang                   |    17 +-
 htdocs/langs/en_US/errors.lang                |    10 +
 htdocs/langs/en_US/exports.lang               |     1 +
 htdocs/langs/en_US/hrm.lang                   |     1 +
 htdocs/langs/en_US/install.lang               |     8 +-
 htdocs/langs/en_US/intracommreport.lang       |    40 +
 htdocs/langs/en_US/languages.lang             |     1 +
 htdocs/langs/en_US/mails.lang                 |    12 +-
 htdocs/langs/en_US/main.lang                  |    13 +
 htdocs/langs/en_US/members.lang               |     3 +-
 htdocs/langs/en_US/mrp.lang                   |     4 +-
 htdocs/langs/en_US/multicurrency.lang         |    16 +
 htdocs/langs/en_US/products.lang              |     8 +-
 htdocs/langs/en_US/recruitment.lang           |    32 +-
 htdocs/langs/en_US/sendings.lang              |     1 +
 htdocs/langs/en_US/stocks.lang                |     7 +-
 htdocs/langs/en_US/suppliers.lang             |     1 +
 htdocs/langs/en_US/ticket.lang                |     1 -
 htdocs/langs/en_US/users.lang                 |     1 +
 htdocs/langs/en_US/website.lang               |     5 +-
 htdocs/langs/es_AR/accountancy.lang           |     3 +-
 htdocs/langs/es_AR/admin.lang                 |     6 +-
 htdocs/langs/es_AR/companies.lang             |     5 +-
 htdocs/langs/es_AR/ecm.lang                   |    13 -
 htdocs/langs/es_AR/intracommreport.lang       |     3 +
 htdocs/langs/es_AR/members.lang               |     3 -
 htdocs/langs/es_AR/mrp.lang                   |     2 +-
 htdocs/langs/es_AR/paybox.lang                |     1 -
 htdocs/langs/es_AR/products.lang              |     2 +-
 htdocs/langs/es_AR/recruitment.lang           |     3 -
 htdocs/langs/es_AR/suppliers.lang             |    12 +-
 htdocs/langs/es_BO/compta.lang                |     2 +
 htdocs/langs/es_BO/intracommreport.lang       |     2 +
 htdocs/langs/es_BO/products.lang              |     2 +
 htdocs/langs/es_CL/accountancy.lang           |    10 +-
 htdocs/langs/es_CL/admin.lang                 |    22 -
 htdocs/langs/es_CL/categories.lang            |     1 -
 htdocs/langs/es_CL/companies.lang             |     1 -
 htdocs/langs/es_CL/ecm.lang                   |    13 -
 htdocs/langs/es_CL/install.lang               |     6 +-
 htdocs/langs/es_CL/intracommreport.lang       |     2 +
 htdocs/langs/es_CL/main.lang                  |     2 +
 htdocs/langs/es_CL/members.lang               |     4 -
 htdocs/langs/es_CL/mrp.lang                   |     2 +-
 htdocs/langs/es_CL/products.lang              |     7 -
 htdocs/langs/es_CL/stocks.lang                |     4 -
 htdocs/langs/es_CL/suppliers.lang             |     1 -
 htdocs/langs/es_CL/website.lang               |     1 -
 htdocs/langs/es_CO/accountancy.lang           |     8 -
 htdocs/langs/es_CO/admin.lang                 |    18 -
 htdocs/langs/es_CO/banks.lang                 |     1 +
 htdocs/langs/es_CO/categories.lang            |     1 +
 htdocs/langs/es_CO/install.lang               |     5 +-
 htdocs/langs/es_CO/intracommreport.lang       |     2 +
 htdocs/langs/es_CO/products.lang              |     6 -
 htdocs/langs/es_DO/compta.lang                |     2 +
 htdocs/langs/es_DO/intracommreport.lang       |     2 +
 htdocs/langs/es_DO/products.lang              |     2 +
 htdocs/langs/es_EC/accountancy.lang           |    10 +-
 htdocs/langs/es_EC/admin.lang                 |    20 -
 htdocs/langs/es_EC/categories.lang            |     2 -
 htdocs/langs/es_EC/companies.lang             |     3 +-
 htdocs/langs/es_EC/ecm.lang                   |    13 -
 htdocs/langs/es_EC/install.lang               |     6 +-
 htdocs/langs/es_EC/intracommreport.lang       |     3 +
 htdocs/langs/es_EC/main.lang                  |     1 +
 htdocs/langs/es_EC/members.lang               |     4 -
 htdocs/langs/es_EC/products.lang              |     6 -
 htdocs/langs/es_EC/propal.lang                |     1 -
 htdocs/langs/es_EC/recruitment.lang           |     1 +
 htdocs/langs/es_EC/stocks.lang                |     4 -
 htdocs/langs/es_EC/suppliers.lang             |     1 -
 htdocs/langs/es_EC/website.lang               |     1 -
 htdocs/langs/es_ES/accountancy.lang           |    41 +-
 htdocs/langs/es_ES/admin.lang                 |   187 +-
 htdocs/langs/es_ES/banks.lang                 |    10 +-
 htdocs/langs/es_ES/bills.lang                 |     9 +-
 htdocs/langs/es_ES/categories.lang            |     8 +-
 htdocs/langs/es_ES/companies.lang             |    37 +-
 htdocs/langs/es_ES/ecm.lang                   |    17 +-
 htdocs/langs/es_ES/hrm.lang                   |     1 +
 htdocs/langs/es_ES/install.lang               |     8 +-
 htdocs/langs/es_ES/intracommreport.lang       |    40 +
 htdocs/langs/es_ES/languages.lang             |    29 +-
 htdocs/langs/es_ES/main.lang                  |   116 +-
 htdocs/langs/es_ES/members.lang               |    12 +-
 htdocs/langs/es_ES/mrp.lang                   |     6 +-
 htdocs/langs/es_ES/multicurrency.lang         |    16 +
 htdocs/langs/es_ES/products.lang              |    30 +-
 htdocs/langs/es_ES/recruitment.lang           |    81 +-
 htdocs/langs/es_ES/stocks.lang                |    48 +-
 htdocs/langs/es_ES/suppliers.lang             |     3 +-
 htdocs/langs/es_ES/website.lang               |    16 +-
 htdocs/langs/es_GT/compta.lang                |     2 +
 htdocs/langs/es_GT/intracommreport.lang       |     2 +
 htdocs/langs/es_GT/products.lang              |     2 +
 htdocs/langs/es_HN/compta.lang                |     2 +
 htdocs/langs/es_HN/intracommreport.lang       |     2 +
 htdocs/langs/es_HN/products.lang              |     2 +
 htdocs/langs/es_MX/accountancy.lang           |     3 -
 htdocs/langs/es_MX/admin.lang                 |     3 +-
 htdocs/langs/es_MX/companies.lang             |    23 +-
 htdocs/langs/es_MX/ecm.lang                   |     9 +
 htdocs/langs/es_MX/install.lang               |     2 +-
 htdocs/langs/es_MX/intracommreport.lang       |     3 +
 htdocs/langs/es_MX/main.lang                  |     2 +
 htdocs/langs/es_MX/productbatch.lang          |    18 +-
 htdocs/langs/es_MX/products.lang              |     1 +
 htdocs/langs/es_MX/recruitment.lang           |     4 -
 htdocs/langs/es_MX/ticket.lang                |     1 -
 htdocs/langs/es_MX/website.lang               |     1 -
 htdocs/langs/es_PA/compta.lang                |     2 +
 htdocs/langs/es_PA/intracommreport.lang       |     2 +
 htdocs/langs/es_PA/products.lang              |     2 +
 htdocs/langs/es_PE/accountancy.lang           |     3 +-
 htdocs/langs/es_PE/intracommreport.lang       |     2 +
 htdocs/langs/es_PE/main.lang                  |     4 +
 htdocs/langs/es_PE/mrp.lang                   |     5 +-
 htdocs/langs/es_PE/products.lang              |     1 +
 htdocs/langs/es_PY/compta.lang                |     2 +
 htdocs/langs/es_PY/intracommreport.lang       |     2 +
 htdocs/langs/es_PY/products.lang              |     2 +
 htdocs/langs/es_US/compta.lang                |     2 +
 htdocs/langs/es_US/intracommreport.lang       |     2 +
 htdocs/langs/es_US/products.lang              |     2 +
 htdocs/langs/es_UY/compta.lang                |     2 +
 htdocs/langs/es_UY/intracommreport.lang       |     2 +
 htdocs/langs/es_UY/products.lang              |     2 +
 htdocs/langs/es_VE/intracommreport.lang       |     2 +
 htdocs/langs/es_VE/main.lang                  |     1 +
 htdocs/langs/es_VE/products.lang              |     1 +
 htdocs/langs/et_EE/accountancy.lang           |    37 +-
 htdocs/langs/et_EE/admin.lang                 |   107 +-
 htdocs/langs/et_EE/banks.lang                 |     4 +
 htdocs/langs/et_EE/categories.lang            |     8 +-
 htdocs/langs/et_EE/companies.lang             |    37 +-
 htdocs/langs/et_EE/ecm.lang                   |    17 +-
 htdocs/langs/et_EE/hrm.lang                   |     1 +
 htdocs/langs/et_EE/install.lang               |     8 +-
 htdocs/langs/et_EE/intracommreport.lang       |    40 +
 htdocs/langs/et_EE/languages.lang             |     1 +
 htdocs/langs/et_EE/main.lang                  |    26 +-
 htdocs/langs/et_EE/members.lang               |    12 +-
 htdocs/langs/et_EE/mrp.lang                   |     4 +-
 htdocs/langs/et_EE/products.lang              |    16 +-
 htdocs/langs/et_EE/recruitment.lang           |    29 +-
 htdocs/langs/et_EE/stocks.lang                |    12 +-
 htdocs/langs/et_EE/suppliers.lang             |     1 +
 htdocs/langs/et_EE/website.lang               |     4 +-
 htdocs/langs/eu_ES/accountancy.lang           |    37 +-
 htdocs/langs/eu_ES/admin.lang                 |   107 +-
 htdocs/langs/eu_ES/banks.lang                 |     4 +
 htdocs/langs/eu_ES/categories.lang            |     8 +-
 htdocs/langs/eu_ES/companies.lang             |    37 +-
 htdocs/langs/eu_ES/ecm.lang                   |    17 +-
 htdocs/langs/eu_ES/hrm.lang                   |     1 +
 htdocs/langs/eu_ES/install.lang               |     8 +-
 htdocs/langs/eu_ES/intracommreport.lang       |    40 +
 htdocs/langs/eu_ES/languages.lang             |     1 +
 htdocs/langs/eu_ES/main.lang                  |    26 +-
 htdocs/langs/eu_ES/members.lang               |    12 +-
 htdocs/langs/eu_ES/mrp.lang                   |     4 +-
 htdocs/langs/eu_ES/products.lang              |    16 +-
 htdocs/langs/eu_ES/recruitment.lang           |    29 +-
 htdocs/langs/eu_ES/stocks.lang                |    12 +-
 htdocs/langs/eu_ES/suppliers.lang             |     1 +
 htdocs/langs/eu_ES/website.lang               |     4 +-
 htdocs/langs/fa_IR/accountancy.lang           |    37 +-
 htdocs/langs/fa_IR/admin.lang                 |   107 +-
 htdocs/langs/fa_IR/banks.lang                 |     4 +
 htdocs/langs/fa_IR/categories.lang            |     8 +-
 htdocs/langs/fa_IR/companies.lang             |    37 +-
 htdocs/langs/fa_IR/ecm.lang                   |    17 +-
 htdocs/langs/fa_IR/hrm.lang                   |     1 +
 htdocs/langs/fa_IR/install.lang               |     8 +-
 htdocs/langs/fa_IR/intracommreport.lang       |    40 +
 htdocs/langs/fa_IR/languages.lang             |     1 +
 htdocs/langs/fa_IR/main.lang                  |    26 +-
 htdocs/langs/fa_IR/members.lang               |    12 +-
 htdocs/langs/fa_IR/mrp.lang                   |     4 +-
 htdocs/langs/fa_IR/products.lang              |    16 +-
 htdocs/langs/fa_IR/recruitment.lang           |    29 +-
 htdocs/langs/fa_IR/stocks.lang                |    12 +-
 htdocs/langs/fa_IR/suppliers.lang             |     1 +
 htdocs/langs/fa_IR/website.lang               |     4 +-
 htdocs/langs/fi_FI/accountancy.lang           |    37 +-
 htdocs/langs/fi_FI/admin.lang                 |   107 +-
 htdocs/langs/fi_FI/banks.lang                 |     4 +
 htdocs/langs/fi_FI/categories.lang            |     8 +-
 htdocs/langs/fi_FI/companies.lang             |    37 +-
 htdocs/langs/fi_FI/ecm.lang                   |    17 +-
 htdocs/langs/fi_FI/hrm.lang                   |     1 +
 htdocs/langs/fi_FI/install.lang               |     8 +-
 htdocs/langs/fi_FI/intracommreport.lang       |    40 +
 htdocs/langs/fi_FI/languages.lang             |     1 +
 htdocs/langs/fi_FI/main.lang                  |    26 +-
 htdocs/langs/fi_FI/members.lang               |    12 +-
 htdocs/langs/fi_FI/mrp.lang                   |     4 +-
 htdocs/langs/fi_FI/products.lang              |    16 +-
 htdocs/langs/fi_FI/recruitment.lang           |    29 +-
 htdocs/langs/fi_FI/stocks.lang                |    12 +-
 htdocs/langs/fi_FI/suppliers.lang             |     1 +
 htdocs/langs/fi_FI/website.lang               |     4 +-
 htdocs/langs/fr_BE/accountancy.lang           |     1 -
 htdocs/langs/fr_BE/intracommreport.lang       |     2 +
 htdocs/langs/fr_BE/products.lang              |     2 +
 htdocs/langs/fr_BE/stocks.lang                |     2 -
 htdocs/langs/fr_CA/accountancy.lang           |     6 -
 htdocs/langs/fr_CA/ecm.lang                   |    12 -
 htdocs/langs/fr_CA/intracommreport.lang       |     2 +
 htdocs/langs/fr_CA/members.lang               |     6 -
 htdocs/langs/fr_CA/other.lang                 |     1 -
 htdocs/langs/fr_CA/products.lang              |     4 +-
 htdocs/langs/fr_CA/propal.lang                |     1 -
 htdocs/langs/fr_CA/recruitment.lang           |     2 +
 htdocs/langs/fr_CA/stocks.lang                |     4 -
 htdocs/langs/fr_CA/suppliers.lang             |     3 -
 htdocs/langs/fr_CH/compta.lang                |     2 +
 htdocs/langs/fr_CH/intracommreport.lang       |     2 +
 htdocs/langs/fr_CH/main.lang                  |    24 +-
 htdocs/langs/fr_CH/products.lang              |     2 +
 htdocs/langs/fr_CH/stocks.lang                |     2 -
 htdocs/langs/fr_CI/compta.lang                |     2 +
 htdocs/langs/fr_CI/intracommreport.lang       |     2 +
 htdocs/langs/fr_CI/products.lang              |     2 +
 htdocs/langs/fr_CI/stocks.lang                |     2 -
 htdocs/langs/fr_CM/compta.lang                |     2 +
 htdocs/langs/fr_CM/intracommreport.lang       |     2 +
 htdocs/langs/fr_CM/products.lang              |     2 +
 htdocs/langs/fr_CM/stocks.lang                |     2 -
 htdocs/langs/fr_FR/accountancy.lang           |    37 +-
 htdocs/langs/fr_FR/admin.lang                 |   138 +-
 htdocs/langs/fr_FR/banks.lang                 |     4 +
 htdocs/langs/fr_FR/bills.lang                 |    11 +-
 htdocs/langs/fr_FR/categories.lang            |     8 +-
 htdocs/langs/fr_FR/companies.lang             |    37 +-
 htdocs/langs/fr_FR/cron.lang                  |    10 +-
 htdocs/langs/fr_FR/deliveries.lang            |     1 +
 htdocs/langs/fr_FR/ecm.lang                   |    17 +-
 htdocs/langs/fr_FR/errors.lang                |     1 +
 htdocs/langs/fr_FR/exports.lang               |     1 +
 htdocs/langs/fr_FR/hrm.lang                   |     1 +
 htdocs/langs/fr_FR/install.lang               |     8 +-
 htdocs/langs/fr_FR/intracommreport.lang       |    40 +
 htdocs/langs/fr_FR/languages.lang             |     1 +
 htdocs/langs/fr_FR/main.lang                  |    36 +-
 htdocs/langs/fr_FR/members.lang               |    14 +-
 htdocs/langs/fr_FR/mrp.lang                   |     6 +-
 htdocs/langs/fr_FR/multicurrency.lang         |    18 +
 htdocs/langs/fr_FR/products.lang              |    16 +-
 htdocs/langs/fr_FR/recruitment.lang           |    15 +-
 htdocs/langs/fr_FR/stocks.lang                |    12 +-
 htdocs/langs/fr_FR/suppliers.lang             |     1 +
 htdocs/langs/fr_FR/website.lang               |     4 +-
 htdocs/langs/fr_GA/admin.lang                 |     2 +
 htdocs/langs/fr_GA/boxes.lang                 |     4 +
 htdocs/langs/fr_GA/commercial.lang            |     5 +
 htdocs/langs/fr_GA/companies.lang             |    25 +
 htdocs/langs/fr_GA/compta.lang                |     2 +
 htdocs/langs/fr_GA/hrm.lang                   |     2 +
 htdocs/langs/fr_GA/intracommreport.lang       |     2 +
 htdocs/langs/fr_GA/products.lang              |     2 +
 htdocs/langs/fr_GA/stocks.lang                |     2 -
 htdocs/langs/gl_ES/accountancy.lang           |    37 +-
 htdocs/langs/gl_ES/admin.lang                 |   107 +-
 htdocs/langs/gl_ES/banks.lang                 |     4 +
 htdocs/langs/gl_ES/categories.lang            |     8 +-
 htdocs/langs/gl_ES/companies.lang             |    37 +-
 htdocs/langs/gl_ES/ecm.lang                   |    17 +-
 htdocs/langs/gl_ES/hrm.lang                   |     1 +
 htdocs/langs/gl_ES/install.lang               |     8 +-
 htdocs/langs/gl_ES/intracommreport.lang       |    40 +
 htdocs/langs/gl_ES/languages.lang             |     1 +
 htdocs/langs/gl_ES/main.lang                  |    26 +-
 htdocs/langs/gl_ES/members.lang               |    12 +-
 htdocs/langs/gl_ES/mrp.lang                   |     4 +-
 htdocs/langs/gl_ES/products.lang              |    16 +-
 htdocs/langs/gl_ES/recruitment.lang           |    29 +-
 htdocs/langs/gl_ES/stocks.lang                |    12 +-
 htdocs/langs/gl_ES/suppliers.lang             |     1 +
 htdocs/langs/gl_ES/website.lang               |     4 +-
 htdocs/langs/he_IL/accountancy.lang           |    37 +-
 htdocs/langs/he_IL/admin.lang                 |   107 +-
 htdocs/langs/he_IL/banks.lang                 |     4 +
 htdocs/langs/he_IL/categories.lang            |     8 +-
 htdocs/langs/he_IL/companies.lang             |    37 +-
 htdocs/langs/he_IL/ecm.lang                   |    17 +-
 htdocs/langs/he_IL/hrm.lang                   |     1 +
 htdocs/langs/he_IL/install.lang               |     8 +-
 htdocs/langs/he_IL/intracommreport.lang       |    40 +
 htdocs/langs/he_IL/languages.lang             |     1 +
 htdocs/langs/he_IL/main.lang                  |    26 +-
 htdocs/langs/he_IL/members.lang               |    12 +-
 htdocs/langs/he_IL/mrp.lang                   |     4 +-
 htdocs/langs/he_IL/products.lang              |    16 +-
 htdocs/langs/he_IL/recruitment.lang           |    29 +-
 htdocs/langs/he_IL/stocks.lang                |    12 +-
 htdocs/langs/he_IL/suppliers.lang             |     1 +
 htdocs/langs/he_IL/website.lang               |     4 +-
 htdocs/langs/hi_IN/accountancy.lang           |    37 +-
 htdocs/langs/hi_IN/admin.lang                 |   107 +-
 htdocs/langs/hi_IN/banks.lang                 |     4 +
 htdocs/langs/hi_IN/categories.lang            |     8 +-
 htdocs/langs/hi_IN/companies.lang             |    37 +-
 htdocs/langs/hi_IN/ecm.lang                   |    17 +-
 htdocs/langs/hi_IN/hrm.lang                   |     1 +
 htdocs/langs/hi_IN/install.lang               |     8 +-
 htdocs/langs/hi_IN/intracommreport.lang       |    40 +
 htdocs/langs/hi_IN/languages.lang             |     1 +
 htdocs/langs/hi_IN/main.lang                  |    26 +-
 htdocs/langs/hi_IN/members.lang               |    12 +-
 htdocs/langs/hi_IN/mrp.lang                   |     4 +-
 htdocs/langs/hi_IN/products.lang              |    16 +-
 htdocs/langs/hi_IN/recruitment.lang           |    29 +-
 htdocs/langs/hi_IN/stocks.lang                |    12 +-
 htdocs/langs/hi_IN/suppliers.lang             |     1 +
 htdocs/langs/hi_IN/website.lang               |     4 +-
 htdocs/langs/hr_HR/accountancy.lang           |    37 +-
 htdocs/langs/hr_HR/admin.lang                 |   109 +-
 htdocs/langs/hr_HR/banks.lang                 |     4 +
 htdocs/langs/hr_HR/categories.lang            |     8 +-
 htdocs/langs/hr_HR/companies.lang             |    37 +-
 htdocs/langs/hr_HR/ecm.lang                   |    17 +-
 htdocs/langs/hr_HR/hrm.lang                   |     1 +
 htdocs/langs/hr_HR/install.lang               |     8 +-
 htdocs/langs/hr_HR/intracommreport.lang       |    40 +
 htdocs/langs/hr_HR/languages.lang             |     1 +
 htdocs/langs/hr_HR/main.lang                  |    26 +-
 htdocs/langs/hr_HR/members.lang               |    12 +-
 htdocs/langs/hr_HR/mrp.lang                   |     4 +-
 htdocs/langs/hr_HR/products.lang              |    16 +-
 htdocs/langs/hr_HR/recruitment.lang           |    29 +-
 htdocs/langs/hr_HR/stocks.lang                |    12 +-
 htdocs/langs/hr_HR/suppliers.lang             |     1 +
 htdocs/langs/hr_HR/website.lang               |     4 +-
 htdocs/langs/hu_HU/accountancy.lang           |    37 +-
 htdocs/langs/hu_HU/admin.lang                 |   175 +-
 htdocs/langs/hu_HU/banks.lang                 |    10 +-
 htdocs/langs/hu_HU/categories.lang            |     8 +-
 htdocs/langs/hu_HU/companies.lang             |    37 +-
 htdocs/langs/hu_HU/ecm.lang                   |    17 +-
 htdocs/langs/hu_HU/hrm.lang                   |     1 +
 htdocs/langs/hu_HU/install.lang               |     8 +-
 htdocs/langs/hu_HU/intracommreport.lang       |    40 +
 htdocs/langs/hu_HU/languages.lang             |     1 +
 htdocs/langs/hu_HU/main.lang                  |   146 +-
 htdocs/langs/hu_HU/members.lang               |    12 +-
 htdocs/langs/hu_HU/mrp.lang                   |     8 +-
 htdocs/langs/hu_HU/products.lang              |    16 +-
 htdocs/langs/hu_HU/recruitment.lang           |    29 +-
 htdocs/langs/hu_HU/stocks.lang                |    12 +-
 htdocs/langs/hu_HU/suppliers.lang             |     1 +
 htdocs/langs/hu_HU/website.lang               |     4 +-
 htdocs/langs/id_ID/accountancy.lang           |    37 +-
 htdocs/langs/id_ID/admin.lang                 |   107 +-
 htdocs/langs/id_ID/banks.lang                 |     4 +
 htdocs/langs/id_ID/categories.lang            |     8 +-
 htdocs/langs/id_ID/companies.lang             |    37 +-
 htdocs/langs/id_ID/ecm.lang                   |    17 +-
 htdocs/langs/id_ID/hrm.lang                   |     1 +
 htdocs/langs/id_ID/install.lang               |     8 +-
 htdocs/langs/id_ID/intracommreport.lang       |    40 +
 htdocs/langs/id_ID/languages.lang             |     1 +
 htdocs/langs/id_ID/main.lang                  |    26 +-
 htdocs/langs/id_ID/members.lang               |    12 +-
 htdocs/langs/id_ID/mrp.lang                   |     4 +-
 htdocs/langs/id_ID/products.lang              |    16 +-
 htdocs/langs/id_ID/recruitment.lang           |    29 +-
 htdocs/langs/id_ID/stocks.lang                |    12 +-
 htdocs/langs/id_ID/suppliers.lang             |     1 +
 htdocs/langs/id_ID/website.lang               |     4 +-
 htdocs/langs/is_IS/accountancy.lang           |    37 +-
 htdocs/langs/is_IS/admin.lang                 |   107 +-
 htdocs/langs/is_IS/banks.lang                 |     4 +
 htdocs/langs/is_IS/categories.lang            |     8 +-
 htdocs/langs/is_IS/companies.lang             |    37 +-
 htdocs/langs/is_IS/ecm.lang                   |    17 +-
 htdocs/langs/is_IS/hrm.lang                   |     1 +
 htdocs/langs/is_IS/install.lang               |     8 +-
 htdocs/langs/is_IS/intracommreport.lang       |    40 +
 htdocs/langs/is_IS/languages.lang             |     1 +
 htdocs/langs/is_IS/main.lang                  |    26 +-
 htdocs/langs/is_IS/members.lang               |    12 +-
 htdocs/langs/is_IS/mrp.lang                   |     4 +-
 htdocs/langs/is_IS/products.lang              |    16 +-
 htdocs/langs/is_IS/recruitment.lang           |    29 +-
 htdocs/langs/is_IS/stocks.lang                |    12 +-
 htdocs/langs/is_IS/suppliers.lang             |     1 +
 htdocs/langs/is_IS/website.lang               |     4 +-
 htdocs/langs/it_CH/compta.lang                |     2 +
 htdocs/langs/it_CH/products.lang              |     2 +
 htdocs/langs/it_IT/accountancy.lang           |    37 +-
 htdocs/langs/it_IT/admin.lang                 |   111 +-
 htdocs/langs/it_IT/banks.lang                 |     4 +
 htdocs/langs/it_IT/categories.lang            |     8 +-
 htdocs/langs/it_IT/companies.lang             |    35 +-
 htdocs/langs/it_IT/ecm.lang                   |    17 +-
 htdocs/langs/it_IT/hrm.lang                   |     1 +
 htdocs/langs/it_IT/install.lang               |    10 +-
 htdocs/langs/it_IT/intracommreport.lang       |    40 +
 htdocs/langs/it_IT/languages.lang             |     1 +
 htdocs/langs/it_IT/main.lang                  |    34 +-
 htdocs/langs/it_IT/members.lang               |    12 +-
 htdocs/langs/it_IT/mrp.lang                   |     4 +-
 htdocs/langs/it_IT/products.lang              |    22 +-
 htdocs/langs/it_IT/recruitment.lang           |    29 +-
 htdocs/langs/it_IT/stocks.lang                |    14 +-
 htdocs/langs/it_IT/suppliers.lang             |     1 +
 htdocs/langs/it_IT/website.lang               |     4 +-
 htdocs/langs/it_IT/workflow.lang              |     4 +-
 htdocs/langs/ja_JP/accountancy.lang           |   653 +-
 htdocs/langs/ja_JP/admin.lang                 |  3113 ++---
 htdocs/langs/ja_JP/banks.lang                 |   300 +-
 htdocs/langs/ja_JP/bills.lang                 |   901 +-
 htdocs/langs/ja_JP/blockedlog.lang            |   106 +-
 htdocs/langs/ja_JP/bookmarks.lang             |    27 +-
 htdocs/langs/ja_JP/boxes.lang                 |   193 +-
 htdocs/langs/ja_JP/cashdesk.lang              |   195 +-
 htdocs/langs/ja_JP/categories.lang            |   160 +-
 htdocs/langs/ja_JP/companies.lang             |   587 +-
 htdocs/langs/ja_JP/compta.lang                |   491 +-
 htdocs/langs/ja_JP/contracts.lang             |   146 +-
 htdocs/langs/ja_JP/cron.lang                  |   131 +-
 htdocs/langs/ja_JP/deliveries.lang            |    46 +-
 htdocs/langs/ja_JP/donations.lang             |    40 +-
 htdocs/langs/ja_JP/ecm.lang                   |    57 +-
 htdocs/langs/ja_JP/errors.lang                |   506 +-
 htdocs/langs/ja_JP/exports.lang               |   176 +-
 htdocs/langs/ja_JP/ftp.lang                   |    24 +-
 htdocs/langs/ja_JP/holiday.lang               |   240 +-
 htdocs/langs/ja_JP/hrm.lang                   |    15 +-
 htdocs/langs/ja_JP/install.lang               |   290 +-
 htdocs/langs/ja_JP/interventions.lang         |   128 +-
 htdocs/langs/ja_JP/intracommreport.lang       |    40 +
 htdocs/langs/ja_JP/languages.lang             |    55 +-
 htdocs/langs/ja_JP/ldap.lang                  |    28 +-
 htdocs/langs/ja_JP/link.lang                  |    16 +-
 htdocs/langs/ja_JP/loan.lang                  |    62 +-
 htdocs/langs/ja_JP/mailmanspip.lang           |    52 +-
 htdocs/langs/ja_JP/mails.lang                 |   228 +-
 htdocs/langs/ja_JP/main.lang                  |  1162 +-
 htdocs/langs/ja_JP/margins.lang               |    83 +-
 htdocs/langs/ja_JP/members.lang               |   302 +-
 htdocs/langs/ja_JP/modulebuilder.lang         |   282 +-
 htdocs/langs/ja_JP/mrp.lang                   |   158 +-
 htdocs/langs/ja_JP/multicurrency.lang         |    56 +-
 htdocs/langs/ja_JP/oauth.lang                 |    40 +-
 htdocs/langs/ja_JP/opensurvey.lang            |   118 +-
 htdocs/langs/ja_JP/other.lang                 |     9 +-
 htdocs/langs/ja_JP/products.lang              |   596 +-
 htdocs/langs/ja_JP/projects.lang              |   410 +-
 htdocs/langs/ja_JP/receiptprinter.lang        |     4 +-
 htdocs/langs/ja_JP/receptions.lang            |    72 +-
 htdocs/langs/ja_JP/recruitment.lang           |    83 +-
 htdocs/langs/ja_JP/salaries.lang              |    38 +-
 htdocs/langs/ja_JP/sendings.lang              |     3 +-
 htdocs/langs/ja_JP/stocks.lang                |    12 +-
 htdocs/langs/ja_JP/suppliers.lang             |    13 +-
 htdocs/langs/ja_JP/ticket.lang                |   466 +-
 htdocs/langs/ja_JP/trips.lang                 |    10 +-
 htdocs/langs/ja_JP/users.lang                 |   171 +-
 htdocs/langs/ja_JP/website.lang               |   262 +-
 htdocs/langs/ka_GE/accountancy.lang           |    37 +-
 htdocs/langs/ka_GE/admin.lang                 |   107 +-
 htdocs/langs/ka_GE/banks.lang                 |     4 +
 htdocs/langs/ka_GE/categories.lang            |     8 +-
 htdocs/langs/ka_GE/companies.lang             |    37 +-
 htdocs/langs/ka_GE/ecm.lang                   |    17 +-
 htdocs/langs/ka_GE/hrm.lang                   |     1 +
 htdocs/langs/ka_GE/install.lang               |     8 +-
 htdocs/langs/ka_GE/intracommreport.lang       |    40 +
 htdocs/langs/ka_GE/languages.lang             |     1 +
 htdocs/langs/ka_GE/main.lang                  |    26 +-
 htdocs/langs/ka_GE/members.lang               |    12 +-
 htdocs/langs/ka_GE/mrp.lang                   |     4 +-
 htdocs/langs/ka_GE/products.lang              |    16 +-
 htdocs/langs/ka_GE/recruitment.lang           |    29 +-
 htdocs/langs/ka_GE/stocks.lang                |    12 +-
 htdocs/langs/ka_GE/suppliers.lang             |     1 +
 htdocs/langs/ka_GE/website.lang               |     4 +-
 htdocs/langs/km_KH/accountancy.lang           |    37 +-
 htdocs/langs/km_KH/admin.lang                 |   107 +-
 htdocs/langs/km_KH/banks.lang                 |     4 +
 htdocs/langs/km_KH/categories.lang            |     8 +-
 htdocs/langs/km_KH/companies.lang             |    37 +-
 htdocs/langs/km_KH/ecm.lang                   |    17 +-
 htdocs/langs/km_KH/hrm.lang                   |     1 +
 htdocs/langs/km_KH/install.lang               |     8 +-
 htdocs/langs/km_KH/intracommreport.lang       |    40 +
 htdocs/langs/km_KH/languages.lang             |     1 +
 htdocs/langs/km_KH/main.lang                  |    26 +-
 htdocs/langs/km_KH/members.lang               |    12 +-
 htdocs/langs/km_KH/mrp.lang                   |     4 +-
 htdocs/langs/km_KH/products.lang              |    16 +-
 htdocs/langs/km_KH/recruitment.lang           |    29 +-
 htdocs/langs/km_KH/stocks.lang                |    12 +-
 htdocs/langs/km_KH/suppliers.lang             |     1 +
 htdocs/langs/km_KH/website.lang               |     4 +-
 htdocs/langs/kn_IN/accountancy.lang           |    37 +-
 htdocs/langs/kn_IN/admin.lang                 |   107 +-
 htdocs/langs/kn_IN/banks.lang                 |     4 +
 htdocs/langs/kn_IN/categories.lang            |     8 +-
 htdocs/langs/kn_IN/companies.lang             |    37 +-
 htdocs/langs/kn_IN/ecm.lang                   |    17 +-
 htdocs/langs/kn_IN/hrm.lang                   |     1 +
 htdocs/langs/kn_IN/install.lang               |     8 +-
 htdocs/langs/kn_IN/intracommreport.lang       |    40 +
 htdocs/langs/kn_IN/languages.lang             |     1 +
 htdocs/langs/kn_IN/main.lang                  |    26 +-
 htdocs/langs/kn_IN/members.lang               |    12 +-
 htdocs/langs/kn_IN/mrp.lang                   |     4 +-
 htdocs/langs/kn_IN/products.lang              |    16 +-
 htdocs/langs/kn_IN/recruitment.lang           |    29 +-
 htdocs/langs/kn_IN/stocks.lang                |    12 +-
 htdocs/langs/kn_IN/suppliers.lang             |     1 +
 htdocs/langs/kn_IN/website.lang               |     4 +-
 htdocs/langs/ko_KR/accountancy.lang           |    37 +-
 htdocs/langs/ko_KR/admin.lang                 |   107 +-
 htdocs/langs/ko_KR/banks.lang                 |     4 +
 htdocs/langs/ko_KR/categories.lang            |     8 +-
 htdocs/langs/ko_KR/companies.lang             |    37 +-
 htdocs/langs/ko_KR/ecm.lang                   |    17 +-
 htdocs/langs/ko_KR/hrm.lang                   |     1 +
 htdocs/langs/ko_KR/install.lang               |     8 +-
 htdocs/langs/ko_KR/intracommreport.lang       |    40 +
 htdocs/langs/ko_KR/languages.lang             |     1 +
 htdocs/langs/ko_KR/main.lang                  |    26 +-
 htdocs/langs/ko_KR/members.lang               |    12 +-
 htdocs/langs/ko_KR/mrp.lang                   |     4 +-
 htdocs/langs/ko_KR/products.lang              |    16 +-
 htdocs/langs/ko_KR/recruitment.lang           |    29 +-
 htdocs/langs/ko_KR/stocks.lang                |    12 +-
 htdocs/langs/ko_KR/suppliers.lang             |     1 +
 htdocs/langs/ko_KR/website.lang               |     4 +-
 htdocs/langs/lo_LA/accountancy.lang           |    37 +-
 htdocs/langs/lo_LA/admin.lang                 |   107 +-
 htdocs/langs/lo_LA/banks.lang                 |     4 +
 htdocs/langs/lo_LA/categories.lang            |     8 +-
 htdocs/langs/lo_LA/companies.lang             |    37 +-
 htdocs/langs/lo_LA/ecm.lang                   |    17 +-
 htdocs/langs/lo_LA/hrm.lang                   |     1 +
 htdocs/langs/lo_LA/install.lang               |     8 +-
 htdocs/langs/lo_LA/intracommreport.lang       |    40 +
 htdocs/langs/lo_LA/languages.lang             |     1 +
 htdocs/langs/lo_LA/main.lang                  |    26 +-
 htdocs/langs/lo_LA/members.lang               |    12 +-
 htdocs/langs/lo_LA/mrp.lang                   |     4 +-
 htdocs/langs/lo_LA/products.lang              |    16 +-
 htdocs/langs/lo_LA/recruitment.lang           |    29 +-
 htdocs/langs/lo_LA/stocks.lang                |    12 +-
 htdocs/langs/lo_LA/suppliers.lang             |     1 +
 htdocs/langs/lo_LA/website.lang               |     4 +-
 htdocs/langs/lt_LT/accountancy.lang           |    37 +-
 htdocs/langs/lt_LT/admin.lang                 |   107 +-
 htdocs/langs/lt_LT/banks.lang                 |     4 +
 htdocs/langs/lt_LT/categories.lang            |     8 +-
 htdocs/langs/lt_LT/companies.lang             |    37 +-
 htdocs/langs/lt_LT/ecm.lang                   |    17 +-
 htdocs/langs/lt_LT/hrm.lang                   |     1 +
 htdocs/langs/lt_LT/install.lang               |     8 +-
 htdocs/langs/lt_LT/intracommreport.lang       |    40 +
 htdocs/langs/lt_LT/languages.lang             |     1 +
 htdocs/langs/lt_LT/main.lang                  |    26 +-
 htdocs/langs/lt_LT/members.lang               |    12 +-
 htdocs/langs/lt_LT/mrp.lang                   |     4 +-
 htdocs/langs/lt_LT/products.lang              |    16 +-
 htdocs/langs/lt_LT/recruitment.lang           |    29 +-
 htdocs/langs/lt_LT/stocks.lang                |    12 +-
 htdocs/langs/lt_LT/suppliers.lang             |     1 +
 htdocs/langs/lt_LT/website.lang               |     4 +-
 htdocs/langs/lv_LV/accountancy.lang           |    37 +-
 htdocs/langs/lv_LV/admin.lang                 |   127 +-
 htdocs/langs/lv_LV/banks.lang                 |     4 +
 htdocs/langs/lv_LV/bills.lang                 |     5 +
 htdocs/langs/lv_LV/categories.lang            |     8 +-
 htdocs/langs/lv_LV/companies.lang             |    37 +-
 htdocs/langs/lv_LV/cron.lang                  |    13 +-
 htdocs/langs/lv_LV/ecm.lang                   |    17 +-
 htdocs/langs/lv_LV/errors.lang                |    10 +-
 htdocs/langs/lv_LV/hrm.lang                   |     1 +
 htdocs/langs/lv_LV/install.lang               |     8 +-
 htdocs/langs/lv_LV/intracommreport.lang       |    40 +
 htdocs/langs/lv_LV/languages.lang             |     1 +
 htdocs/langs/lv_LV/mails.lang                 |    22 +-
 htdocs/langs/lv_LV/main.lang                  |    36 +-
 htdocs/langs/lv_LV/members.lang               |    12 +-
 htdocs/langs/lv_LV/mrp.lang                   |     6 +-
 htdocs/langs/lv_LV/multicurrency.lang         |    16 +
 htdocs/langs/lv_LV/products.lang              |    16 +-
 htdocs/langs/lv_LV/recruitment.lang           |    29 +-
 htdocs/langs/lv_LV/stocks.lang                |    14 +-
 htdocs/langs/lv_LV/suppliers.lang             |     1 +
 htdocs/langs/lv_LV/users.lang                 |     7 +-
 htdocs/langs/lv_LV/website.lang               |     4 +-
 htdocs/langs/mk_MK/accountancy.lang           |    37 +-
 htdocs/langs/mk_MK/admin.lang                 |   107 +-
 htdocs/langs/mk_MK/banks.lang                 |     4 +
 htdocs/langs/mk_MK/categories.lang            |     8 +-
 htdocs/langs/mk_MK/companies.lang             |    37 +-
 htdocs/langs/mk_MK/ecm.lang                   |    17 +-
 htdocs/langs/mk_MK/hrm.lang                   |     1 +
 htdocs/langs/mk_MK/install.lang               |     8 +-
 htdocs/langs/mk_MK/intracommreport.lang       |    40 +
 htdocs/langs/mk_MK/languages.lang             |     1 +
 htdocs/langs/mk_MK/main.lang                  |    26 +-
 htdocs/langs/mk_MK/members.lang               |    12 +-
 htdocs/langs/mk_MK/mrp.lang                   |     4 +-
 htdocs/langs/mk_MK/products.lang              |    16 +-
 htdocs/langs/mk_MK/recruitment.lang           |    29 +-
 htdocs/langs/mk_MK/stocks.lang                |    12 +-
 htdocs/langs/mk_MK/suppliers.lang             |     1 +
 htdocs/langs/mk_MK/website.lang               |     4 +-
 htdocs/langs/mn_MN/accountancy.lang           |    37 +-
 htdocs/langs/mn_MN/admin.lang                 |   107 +-
 htdocs/langs/mn_MN/banks.lang                 |     4 +
 htdocs/langs/mn_MN/categories.lang            |     8 +-
 htdocs/langs/mn_MN/companies.lang             |    37 +-
 htdocs/langs/mn_MN/ecm.lang                   |    17 +-
 htdocs/langs/mn_MN/hrm.lang                   |     1 +
 htdocs/langs/mn_MN/install.lang               |     8 +-
 htdocs/langs/mn_MN/intracommreport.lang       |    40 +
 htdocs/langs/mn_MN/languages.lang             |     1 +
 htdocs/langs/mn_MN/main.lang                  |    26 +-
 htdocs/langs/mn_MN/members.lang               |    12 +-
 htdocs/langs/mn_MN/mrp.lang                   |     4 +-
 htdocs/langs/mn_MN/products.lang              |    16 +-
 htdocs/langs/mn_MN/recruitment.lang           |    29 +-
 htdocs/langs/mn_MN/stocks.lang                |    12 +-
 htdocs/langs/mn_MN/suppliers.lang             |     1 +
 htdocs/langs/mn_MN/website.lang               |     4 +-
 htdocs/langs/nb_NO/accountancy.lang           |    37 +-
 htdocs/langs/nb_NO/admin.lang                 |   141 +-
 htdocs/langs/nb_NO/banks.lang                 |    12 +-
 htdocs/langs/nb_NO/bills.lang                 |     7 +-
 htdocs/langs/nb_NO/categories.lang            |     8 +-
 htdocs/langs/nb_NO/companies.lang             |    41 +-
 htdocs/langs/nb_NO/compta.lang                |     5 +-
 htdocs/langs/nb_NO/ecm.lang                   |    17 +-
 htdocs/langs/nb_NO/errors.lang                |    18 +-
 htdocs/langs/nb_NO/hrm.lang                   |     1 +
 htdocs/langs/nb_NO/install.lang               |    10 +-
 htdocs/langs/nb_NO/intracommreport.lang       |    40 +
 htdocs/langs/nb_NO/languages.lang             |     3 +-
 htdocs/langs/nb_NO/mails.lang                 |    28 +-
 htdocs/langs/nb_NO/main.lang                  |   110 +-
 htdocs/langs/nb_NO/members.lang               |    10 +-
 htdocs/langs/nb_NO/modulebuilder.lang         |     4 +-
 htdocs/langs/nb_NO/mrp.lang                   |     8 +-
 htdocs/langs/nb_NO/multicurrency.lang         |    22 +-
 htdocs/langs/nb_NO/other.lang                 |    13 +-
 htdocs/langs/nb_NO/products.lang              |    30 +-
 htdocs/langs/nb_NO/projects.lang              |    14 +-
 htdocs/langs/nb_NO/propal.lang                |     6 +-
 htdocs/langs/nb_NO/recruitment.lang           |    81 +-
 htdocs/langs/nb_NO/stocks.lang                |    12 +-
 htdocs/langs/nb_NO/suppliers.lang             |     3 +-
 htdocs/langs/nb_NO/ticket.lang                |     6 +-
 htdocs/langs/nb_NO/users.lang                 |     9 +-
 htdocs/langs/nb_NO/website.lang               |    14 +-
 htdocs/langs/ne_NP/accountancy.lang           |    37 +-
 htdocs/langs/ne_NP/admin.lang                 |   107 +-
 htdocs/langs/ne_NP/banks.lang                 |     4 +
 htdocs/langs/ne_NP/categories.lang            |     8 +-
 htdocs/langs/ne_NP/companies.lang             |    37 +-
 htdocs/langs/ne_NP/ecm.lang                   |    17 +-
 htdocs/langs/ne_NP/hrm.lang                   |     1 +
 htdocs/langs/ne_NP/install.lang               |     8 +-
 htdocs/langs/ne_NP/intracommreport.lang       |    40 +
 htdocs/langs/ne_NP/languages.lang             |     1 +
 htdocs/langs/ne_NP/main.lang                  |    26 +-
 htdocs/langs/ne_NP/members.lang               |    12 +-
 htdocs/langs/ne_NP/mrp.lang                   |     4 +-
 htdocs/langs/ne_NP/products.lang              |    16 +-
 htdocs/langs/ne_NP/recruitment.lang           |    29 +-
 htdocs/langs/ne_NP/stocks.lang                |    12 +-
 htdocs/langs/ne_NP/suppliers.lang             |     1 +
 htdocs/langs/ne_NP/website.lang               |     4 +-
 htdocs/langs/nl_BE/accountancy.lang           |     3 +-
 htdocs/langs/nl_BE/admin.lang                 |     2 -
 htdocs/langs/nl_BE/banks.lang                 |     1 -
 htdocs/langs/nl_BE/companies.lang             |     2 +-
 htdocs/langs/nl_BE/hrm.lang                   |     1 +
 htdocs/langs/nl_BE/intracommreport.lang       |     2 +
 htdocs/langs/nl_BE/languages.lang             |     1 +
 htdocs/langs/nl_BE/mails.lang                 |     1 -
 htdocs/langs/nl_BE/main.lang                  |     4 +-
 htdocs/langs/nl_BE/products.lang              |     2 +-
 htdocs/langs/nl_BE/propal.lang                |     1 -
 htdocs/langs/nl_BE/stocks.lang                |     1 +
 htdocs/langs/nl_BE/suppliers.lang             |     1 +
 htdocs/langs/nl_BE/ticket.lang                |     2 -
 htdocs/langs/nl_NL/accountancy.lang           |   101 +-
 htdocs/langs/nl_NL/admin.lang                 |   117 +-
 htdocs/langs/nl_NL/banks.lang                 |    12 +-
 htdocs/langs/nl_NL/bills.lang                 |     9 +-
 htdocs/langs/nl_NL/cashdesk.lang              |    11 +-
 htdocs/langs/nl_NL/categories.lang            |     8 +-
 htdocs/langs/nl_NL/companies.lang             |    63 +-
 htdocs/langs/nl_NL/ecm.lang                   |    17 +-
 htdocs/langs/nl_NL/hrm.lang                   |     1 +
 htdocs/langs/nl_NL/install.lang               |    10 +-
 htdocs/langs/nl_NL/intracommreport.lang       |    40 +
 htdocs/langs/nl_NL/languages.lang             |    19 +-
 htdocs/langs/nl_NL/mails.lang                 |   122 +-
 htdocs/langs/nl_NL/main.lang                  |    34 +-
 htdocs/langs/nl_NL/members.lang               |    12 +-
 htdocs/langs/nl_NL/mrp.lang                   |     4 +-
 htdocs/langs/nl_NL/products.lang              |    20 +-
 htdocs/langs/nl_NL/projects.lang              |    10 +-
 htdocs/langs/nl_NL/propal.lang                |     8 +-
 htdocs/langs/nl_NL/recruitment.lang           |    37 +-
 htdocs/langs/nl_NL/stocks.lang                |    24 +-
 htdocs/langs/nl_NL/suppliers.lang             |     3 +-
 htdocs/langs/nl_NL/website.lang               |     8 +-
 htdocs/langs/pl_PL/accountancy.lang           |    37 +-
 htdocs/langs/pl_PL/admin.lang                 |   113 +-
 htdocs/langs/pl_PL/banks.lang                 |     4 +
 htdocs/langs/pl_PL/categories.lang            |     8 +-
 htdocs/langs/pl_PL/companies.lang             |    43 +-
 htdocs/langs/pl_PL/ecm.lang                   |    17 +-
 htdocs/langs/pl_PL/hrm.lang                   |     1 +
 htdocs/langs/pl_PL/install.lang               |     8 +-
 htdocs/langs/pl_PL/intracommreport.lang       |    40 +
 htdocs/langs/pl_PL/languages.lang             |     1 +
 htdocs/langs/pl_PL/main.lang                  |    56 +-
 htdocs/langs/pl_PL/members.lang               |    12 +-
 htdocs/langs/pl_PL/mrp.lang                   |     4 +-
 htdocs/langs/pl_PL/products.lang              |    16 +-
 htdocs/langs/pl_PL/recruitment.lang           |    29 +-
 htdocs/langs/pl_PL/stocks.lang                |    12 +-
 htdocs/langs/pl_PL/suppliers.lang             |     1 +
 htdocs/langs/pl_PL/website.lang               |     4 +-
 htdocs/langs/pt_BR/accountancy.lang           |    10 -
 htdocs/langs/pt_BR/admin.lang                 |    91 +-
 htdocs/langs/pt_BR/banks.lang                 |     3 +
 htdocs/langs/pt_BR/categories.lang            |     8 -
 htdocs/langs/pt_BR/companies.lang             |     9 +-
 htdocs/langs/pt_BR/ecm.lang                   |    10 -
 htdocs/langs/pt_BR/hrm.lang                   |     1 +
 htdocs/langs/pt_BR/install.lang               |     4 +-
 htdocs/langs/pt_BR/main.lang                  |    25 +-
 htdocs/langs/pt_BR/members.lang               |     5 -
 htdocs/langs/pt_BR/mrp.lang                   |     2 +-
 htdocs/langs/pt_BR/other.lang                 |     1 -
 htdocs/langs/pt_BR/paybox.lang                |     1 -
 htdocs/langs/pt_BR/products.lang              |     5 -
 htdocs/langs/pt_BR/propal.lang                |     1 -
 htdocs/langs/pt_BR/recruitment.lang           |     1 +
 htdocs/langs/pt_BR/stocks.lang                |     4 -
 htdocs/langs/pt_BR/ticket.lang                |     1 -
 htdocs/langs/pt_BR/website.lang               |     2 -
 htdocs/langs/pt_PT/accountancy.lang           |    37 +-
 htdocs/langs/pt_PT/admin.lang                 |   581 +-
 htdocs/langs/pt_PT/banks.lang                 |    22 +-
 htdocs/langs/pt_PT/categories.lang            |    20 +-
 htdocs/langs/pt_PT/companies.lang             |    85 +-
 htdocs/langs/pt_PT/ecm.lang                   |    17 +-
 htdocs/langs/pt_PT/hrm.lang                   |     1 +
 htdocs/langs/pt_PT/install.lang               |     8 +-
 htdocs/langs/pt_PT/intracommreport.lang       |    40 +
 htdocs/langs/pt_PT/languages.lang             |     1 +
 htdocs/langs/pt_PT/main.lang                  |   412 +-
 htdocs/langs/pt_PT/members.lang               |    12 +-
 htdocs/langs/pt_PT/mrp.lang                   |     4 +-
 htdocs/langs/pt_PT/products.lang              |    16 +-
 htdocs/langs/pt_PT/recruitment.lang           |    29 +-
 htdocs/langs/pt_PT/stocks.lang                |    12 +-
 htdocs/langs/pt_PT/suppliers.lang             |     1 +
 htdocs/langs/pt_PT/website.lang               |     4 +-
 htdocs/langs/ro_RO/accountancy.lang           |    37 +-
 htdocs/langs/ro_RO/admin.lang                 |   127 +-
 htdocs/langs/ro_RO/banks.lang                 |     4 +
 htdocs/langs/ro_RO/bills.lang                 |     5 +
 htdocs/langs/ro_RO/categories.lang            |     4 +-
 htdocs/langs/ro_RO/companies.lang             |    37 +-
 htdocs/langs/ro_RO/ecm.lang                   |    43 +-
 htdocs/langs/ro_RO/hrm.lang                   |     1 +
 htdocs/langs/ro_RO/install.lang               |     8 +-
 htdocs/langs/ro_RO/intracommreport.lang       |    40 +
 htdocs/langs/ro_RO/languages.lang             |     1 +
 htdocs/langs/ro_RO/main.lang                  |    36 +-
 htdocs/langs/ro_RO/members.lang               |    12 +-
 htdocs/langs/ro_RO/mrp.lang                   |     6 +-
 htdocs/langs/ro_RO/multicurrency.lang         |    16 +
 htdocs/langs/ro_RO/products.lang              |    18 +-
 htdocs/langs/ro_RO/recruitment.lang           |    29 +-
 htdocs/langs/ro_RO/stocks.lang                |    14 +-
 htdocs/langs/ro_RO/suppliers.lang             |     1 +
 htdocs/langs/ro_RO/website.lang               |     4 +-
 htdocs/langs/ru_RU/accountancy.lang           |    37 +-
 htdocs/langs/ru_RU/admin.lang                 |   117 +-
 htdocs/langs/ru_RU/banks.lang                 |     4 +
 htdocs/langs/ru_RU/categories.lang            |     8 +-
 htdocs/langs/ru_RU/companies.lang             |    37 +-
 htdocs/langs/ru_RU/contracts.lang             |    50 +-
 htdocs/langs/ru_RU/ecm.lang                   |    17 +-
 htdocs/langs/ru_RU/hrm.lang                   |     1 +
 htdocs/langs/ru_RU/install.lang               |     8 +-
 htdocs/langs/ru_RU/intracommreport.lang       |    40 +
 htdocs/langs/ru_RU/languages.lang             |     1 +
 htdocs/langs/ru_RU/main.lang                  |    26 +-
 htdocs/langs/ru_RU/members.lang               |    12 +-
 htdocs/langs/ru_RU/mrp.lang                   |     4 +-
 htdocs/langs/ru_RU/products.lang              |    16 +-
 htdocs/langs/ru_RU/recruitment.lang           |    29 +-
 htdocs/langs/ru_RU/stocks.lang                |    12 +-
 htdocs/langs/ru_RU/suppliers.lang             |     1 +
 htdocs/langs/ru_RU/website.lang               |     4 +-
 htdocs/langs/ru_UA/products.lang              |     2 +
 htdocs/langs/sk_SK/accountancy.lang           |    37 +-
 htdocs/langs/sk_SK/admin.lang                 |   107 +-
 htdocs/langs/sk_SK/banks.lang                 |     4 +
 htdocs/langs/sk_SK/categories.lang            |     8 +-
 htdocs/langs/sk_SK/companies.lang             |    37 +-
 htdocs/langs/sk_SK/ecm.lang                   |    17 +-
 htdocs/langs/sk_SK/hrm.lang                   |     1 +
 htdocs/langs/sk_SK/install.lang               |     8 +-
 htdocs/langs/sk_SK/intracommreport.lang       |    40 +
 htdocs/langs/sk_SK/languages.lang             |     1 +
 htdocs/langs/sk_SK/main.lang                  |    26 +-
 htdocs/langs/sk_SK/members.lang               |    12 +-
 htdocs/langs/sk_SK/mrp.lang                   |     4 +-
 htdocs/langs/sk_SK/products.lang              |    16 +-
 htdocs/langs/sk_SK/recruitment.lang           |    29 +-
 htdocs/langs/sk_SK/stocks.lang                |    12 +-
 htdocs/langs/sk_SK/suppliers.lang             |     1 +
 htdocs/langs/sk_SK/website.lang               |     4 +-
 htdocs/langs/sl_SI/accountancy.lang           |    37 +-
 htdocs/langs/sl_SI/admin.lang                 |   107 +-
 htdocs/langs/sl_SI/banks.lang                 |     4 +
 htdocs/langs/sl_SI/categories.lang            |     8 +-
 htdocs/langs/sl_SI/companies.lang             |    37 +-
 htdocs/langs/sl_SI/ecm.lang                   |    17 +-
 htdocs/langs/sl_SI/hrm.lang                   |     1 +
 htdocs/langs/sl_SI/install.lang               |     8 +-
 htdocs/langs/sl_SI/intracommreport.lang       |    40 +
 htdocs/langs/sl_SI/languages.lang             |     1 +
 htdocs/langs/sl_SI/main.lang                  |    26 +-
 htdocs/langs/sl_SI/members.lang               |    12 +-
 htdocs/langs/sl_SI/mrp.lang                   |     4 +-
 htdocs/langs/sl_SI/products.lang              |    16 +-
 htdocs/langs/sl_SI/recruitment.lang           |    29 +-
 htdocs/langs/sl_SI/stocks.lang                |    12 +-
 htdocs/langs/sl_SI/suppliers.lang             |     1 +
 htdocs/langs/sl_SI/website.lang               |     4 +-
 htdocs/langs/sq_AL/accountancy.lang           |    37 +-
 htdocs/langs/sq_AL/admin.lang                 |   107 +-
 htdocs/langs/sq_AL/banks.lang                 |     4 +
 htdocs/langs/sq_AL/categories.lang            |     8 +-
 htdocs/langs/sq_AL/companies.lang             |    37 +-
 htdocs/langs/sq_AL/ecm.lang                   |    17 +-
 htdocs/langs/sq_AL/hrm.lang                   |     1 +
 htdocs/langs/sq_AL/install.lang               |     8 +-
 htdocs/langs/sq_AL/intracommreport.lang       |    40 +
 htdocs/langs/sq_AL/languages.lang             |     1 +
 htdocs/langs/sq_AL/main.lang                  |    26 +-
 htdocs/langs/sq_AL/members.lang               |    12 +-
 htdocs/langs/sq_AL/mrp.lang                   |     4 +-
 htdocs/langs/sq_AL/products.lang              |    16 +-
 htdocs/langs/sq_AL/recruitment.lang           |    29 +-
 htdocs/langs/sq_AL/stocks.lang                |    12 +-
 htdocs/langs/sq_AL/suppliers.lang             |     1 +
 htdocs/langs/sq_AL/website.lang               |     4 +-
 htdocs/langs/sr_RS/accountancy.lang           |    37 +-
 htdocs/langs/sr_RS/admin.lang                 |   107 +-
 htdocs/langs/sr_RS/banks.lang                 |     4 +
 htdocs/langs/sr_RS/categories.lang            |     8 +-
 htdocs/langs/sr_RS/companies.lang             |    37 +-
 htdocs/langs/sr_RS/ecm.lang                   |    17 +-
 htdocs/langs/sr_RS/hrm.lang                   |     1 +
 htdocs/langs/sr_RS/install.lang               |     8 +-
 htdocs/langs/sr_RS/intracommreport.lang       |    40 +
 htdocs/langs/sr_RS/languages.lang             |     1 +
 htdocs/langs/sr_RS/main.lang                  |    26 +-
 htdocs/langs/sr_RS/members.lang               |    12 +-
 htdocs/langs/sr_RS/mrp.lang                   |     4 +-
 htdocs/langs/sr_RS/products.lang              |    16 +-
 htdocs/langs/sr_RS/recruitment.lang           |    29 +-
 htdocs/langs/sr_RS/stocks.lang                |    12 +-
 htdocs/langs/sr_RS/suppliers.lang             |     1 +
 htdocs/langs/sr_RS/website.lang               |     4 +-
 htdocs/langs/sv_SE/accountancy.lang           |    37 +-
 htdocs/langs/sv_SE/admin.lang                 |   107 +-
 htdocs/langs/sv_SE/banks.lang                 |     4 +
 htdocs/langs/sv_SE/categories.lang            |     8 +-
 htdocs/langs/sv_SE/companies.lang             |    37 +-
 htdocs/langs/sv_SE/ecm.lang                   |    17 +-
 htdocs/langs/sv_SE/hrm.lang                   |     1 +
 htdocs/langs/sv_SE/install.lang               |     8 +-
 htdocs/langs/sv_SE/intracommreport.lang       |    40 +
 htdocs/langs/sv_SE/languages.lang             |     1 +
 htdocs/langs/sv_SE/main.lang                  |    26 +-
 htdocs/langs/sv_SE/members.lang               |    12 +-
 htdocs/langs/sv_SE/mrp.lang                   |     4 +-
 htdocs/langs/sv_SE/products.lang              |    16 +-
 htdocs/langs/sv_SE/recruitment.lang           |    29 +-
 htdocs/langs/sv_SE/stocks.lang                |    12 +-
 htdocs/langs/sv_SE/suppliers.lang             |     1 +
 htdocs/langs/sv_SE/website.lang               |     4 +-
 htdocs/langs/sw_SW/accountancy.lang           |    37 +-
 htdocs/langs/sw_SW/admin.lang                 |   107 +-
 htdocs/langs/sw_SW/banks.lang                 |     4 +
 htdocs/langs/sw_SW/categories.lang            |     8 +-
 htdocs/langs/sw_SW/companies.lang             |    37 +-
 htdocs/langs/sw_SW/ecm.lang                   |    17 +-
 htdocs/langs/sw_SW/hrm.lang                   |     1 +
 htdocs/langs/sw_SW/install.lang               |     8 +-
 htdocs/langs/sw_SW/intracommreport.lang       |    40 +
 htdocs/langs/sw_SW/languages.lang             |     1 +
 htdocs/langs/sw_SW/main.lang                  |    26 +-
 htdocs/langs/sw_SW/members.lang               |    12 +-
 htdocs/langs/sw_SW/mrp.lang                   |     4 +-
 htdocs/langs/sw_SW/products.lang              |    16 +-
 htdocs/langs/sw_SW/recruitment.lang           |    29 +-
 htdocs/langs/sw_SW/stocks.lang                |    12 +-
 htdocs/langs/sw_SW/suppliers.lang             |     1 +
 htdocs/langs/sw_SW/website.lang               |     4 +-
 htdocs/langs/th_TH/accountancy.lang           |    37 +-
 htdocs/langs/th_TH/admin.lang                 |   107 +-
 htdocs/langs/th_TH/banks.lang                 |     4 +
 htdocs/langs/th_TH/categories.lang            |     8 +-
 htdocs/langs/th_TH/companies.lang             |    37 +-
 htdocs/langs/th_TH/ecm.lang                   |    17 +-
 htdocs/langs/th_TH/hrm.lang                   |     1 +
 htdocs/langs/th_TH/install.lang               |     8 +-
 htdocs/langs/th_TH/intracommreport.lang       |    40 +
 htdocs/langs/th_TH/languages.lang             |     1 +
 htdocs/langs/th_TH/main.lang                  |    26 +-
 htdocs/langs/th_TH/members.lang               |    12 +-
 htdocs/langs/th_TH/mrp.lang                   |     4 +-
 htdocs/langs/th_TH/products.lang              |    16 +-
 htdocs/langs/th_TH/recruitment.lang           |    29 +-
 htdocs/langs/th_TH/stocks.lang                |    12 +-
 htdocs/langs/th_TH/suppliers.lang             |     1 +
 htdocs/langs/th_TH/website.lang               |     4 +-
 htdocs/langs/tr_TR/accountancy.lang           |    37 +-
 htdocs/langs/tr_TR/admin.lang                 |   107 +-
 htdocs/langs/tr_TR/banks.lang                 |     4 +
 htdocs/langs/tr_TR/categories.lang            |     8 +-
 htdocs/langs/tr_TR/companies.lang             |    53 +-
 htdocs/langs/tr_TR/ecm.lang                   |    17 +-
 htdocs/langs/tr_TR/hrm.lang                   |     1 +
 htdocs/langs/tr_TR/install.lang               |     8 +-
 htdocs/langs/tr_TR/intracommreport.lang       |    40 +
 htdocs/langs/tr_TR/languages.lang             |     1 +
 htdocs/langs/tr_TR/main.lang                  |    26 +-
 htdocs/langs/tr_TR/members.lang               |    12 +-
 htdocs/langs/tr_TR/mrp.lang                   |     4 +-
 htdocs/langs/tr_TR/products.lang              |    16 +-
 htdocs/langs/tr_TR/recruitment.lang           |    29 +-
 htdocs/langs/tr_TR/stocks.lang                |    12 +-
 htdocs/langs/tr_TR/suppliers.lang             |     3 +-
 htdocs/langs/tr_TR/website.lang               |     4 +-
 htdocs/langs/uk_UA/accountancy.lang           |    37 +-
 htdocs/langs/uk_UA/admin.lang                 |   107 +-
 htdocs/langs/uk_UA/banks.lang                 |     4 +
 htdocs/langs/uk_UA/categories.lang            |     8 +-
 htdocs/langs/uk_UA/companies.lang             |    37 +-
 htdocs/langs/uk_UA/ecm.lang                   |    17 +-
 htdocs/langs/uk_UA/hrm.lang                   |     1 +
 htdocs/langs/uk_UA/install.lang               |     8 +-
 htdocs/langs/uk_UA/intracommreport.lang       |    40 +
 htdocs/langs/uk_UA/languages.lang             |     1 +
 htdocs/langs/uk_UA/main.lang                  |    26 +-
 htdocs/langs/uk_UA/members.lang               |    12 +-
 htdocs/langs/uk_UA/mrp.lang                   |     4 +-
 htdocs/langs/uk_UA/products.lang              |    16 +-
 htdocs/langs/uk_UA/recruitment.lang           |    29 +-
 htdocs/langs/uk_UA/stocks.lang                |    12 +-
 htdocs/langs/uk_UA/suppliers.lang             |     1 +
 htdocs/langs/uk_UA/website.lang               |     4 +-
 htdocs/langs/uz_UZ/accountancy.lang           |    37 +-
 htdocs/langs/uz_UZ/admin.lang                 |   107 +-
 htdocs/langs/uz_UZ/banks.lang                 |     4 +
 htdocs/langs/uz_UZ/categories.lang            |     8 +-
 htdocs/langs/uz_UZ/companies.lang             |    37 +-
 htdocs/langs/uz_UZ/ecm.lang                   |    17 +-
 htdocs/langs/uz_UZ/hrm.lang                   |     1 +
 htdocs/langs/uz_UZ/install.lang               |     8 +-
 htdocs/langs/uz_UZ/intracommreport.lang       |    40 +
 htdocs/langs/uz_UZ/languages.lang             |     1 +
 htdocs/langs/uz_UZ/main.lang                  |    26 +-
 htdocs/langs/uz_UZ/members.lang               |    12 +-
 htdocs/langs/uz_UZ/mrp.lang                   |     4 +-
 htdocs/langs/uz_UZ/products.lang              |    16 +-
 htdocs/langs/uz_UZ/recruitment.lang           |    29 +-
 htdocs/langs/uz_UZ/stocks.lang                |    12 +-
 htdocs/langs/uz_UZ/suppliers.lang             |     1 +
 htdocs/langs/uz_UZ/website.lang               |     4 +-
 htdocs/langs/vi_VN/accountancy.lang           |    37 +-
 htdocs/langs/vi_VN/admin.lang                 |   107 +-
 htdocs/langs/vi_VN/banks.lang                 |     4 +
 htdocs/langs/vi_VN/categories.lang            |     8 +-
 htdocs/langs/vi_VN/companies.lang             |    37 +-
 htdocs/langs/vi_VN/ecm.lang                   |    17 +-
 htdocs/langs/vi_VN/hrm.lang                   |     1 +
 htdocs/langs/vi_VN/install.lang               |     8 +-
 htdocs/langs/vi_VN/intracommreport.lang       |    40 +
 htdocs/langs/vi_VN/languages.lang             |     1 +
 htdocs/langs/vi_VN/main.lang                  |    26 +-
 htdocs/langs/vi_VN/members.lang               |    12 +-
 htdocs/langs/vi_VN/mrp.lang                   |     4 +-
 htdocs/langs/vi_VN/products.lang              |    16 +-
 htdocs/langs/vi_VN/recruitment.lang           |    29 +-
 htdocs/langs/vi_VN/stocks.lang                |    12 +-
 htdocs/langs/vi_VN/suppliers.lang             |     1 +
 htdocs/langs/vi_VN/website.lang               |     4 +-
 htdocs/langs/zh_CN/accountancy.lang           |    37 +-
 htdocs/langs/zh_CN/admin.lang                 |   107 +-
 htdocs/langs/zh_CN/banks.lang                 |     4 +
 htdocs/langs/zh_CN/categories.lang            |     8 +-
 htdocs/langs/zh_CN/companies.lang             |    37 +-
 htdocs/langs/zh_CN/ecm.lang                   |    17 +-
 htdocs/langs/zh_CN/hrm.lang                   |     1 +
 htdocs/langs/zh_CN/install.lang               |     8 +-
 htdocs/langs/zh_CN/intracommreport.lang       |    40 +
 htdocs/langs/zh_CN/languages.lang             |     1 +
 htdocs/langs/zh_CN/main.lang                  |    26 +-
 htdocs/langs/zh_CN/members.lang               |    12 +-
 htdocs/langs/zh_CN/mrp.lang                   |     4 +-
 htdocs/langs/zh_CN/products.lang              |    16 +-
 htdocs/langs/zh_CN/recruitment.lang           |    29 +-
 htdocs/langs/zh_CN/stocks.lang                |    12 +-
 htdocs/langs/zh_CN/suppliers.lang             |     1 +
 htdocs/langs/zh_CN/website.lang               |     4 +-
 htdocs/langs/zh_HK/accountancy.lang           |    37 +-
 htdocs/langs/zh_HK/admin.lang                 |   107 +-
 htdocs/langs/zh_HK/banks.lang                 |     4 +
 htdocs/langs/zh_HK/categories.lang            |     8 +-
 htdocs/langs/zh_HK/companies.lang             |    37 +-
 htdocs/langs/zh_HK/ecm.lang                   |    17 +-
 htdocs/langs/zh_HK/hrm.lang                   |     1 +
 htdocs/langs/zh_HK/install.lang               |     8 +-
 htdocs/langs/zh_HK/intracommreport.lang       |    40 +
 htdocs/langs/zh_HK/languages.lang             |     1 +
 htdocs/langs/zh_HK/main.lang                  |    26 +-
 htdocs/langs/zh_HK/members.lang               |    12 +-
 htdocs/langs/zh_HK/mrp.lang                   |     4 +-
 htdocs/langs/zh_HK/products.lang              |    16 +-
 htdocs/langs/zh_HK/recruitment.lang           |    29 +-
 htdocs/langs/zh_HK/stocks.lang                |    12 +-
 htdocs/langs/zh_HK/suppliers.lang             |     1 +
 htdocs/langs/zh_HK/website.lang               |     4 +-
 htdocs/langs/zh_TW/accountancy.lang           |    41 +-
 htdocs/langs/zh_TW/admin.lang                 |   121 +-
 htdocs/langs/zh_TW/banks.lang                 |     4 +
 htdocs/langs/zh_TW/categories.lang            |     8 +-
 htdocs/langs/zh_TW/companies.lang             |    37 +-
 htdocs/langs/zh_TW/ecm.lang                   |    17 +-
 htdocs/langs/zh_TW/hrm.lang                   |     1 +
 htdocs/langs/zh_TW/install.lang               |     8 +-
 htdocs/langs/zh_TW/intracommreport.lang       |    40 +
 htdocs/langs/zh_TW/languages.lang             |     1 +
 htdocs/langs/zh_TW/main.lang                  |   114 +-
 htdocs/langs/zh_TW/members.lang               |    16 +-
 htdocs/langs/zh_TW/mrp.lang                   |     6 +-
 htdocs/langs/zh_TW/products.lang              |    18 +-
 htdocs/langs/zh_TW/recruitment.lang           |    81 +-
 htdocs/langs/zh_TW/stocks.lang                |    32 +-
 htdocs/langs/zh_TW/suppliers.lang             |     3 +-
 htdocs/langs/zh_TW/website.lang               |     4 +-
 htdocs/loan/card.php                          |    34 +-
 htdocs/loan/class/loan.class.php              |    92 +-
 htdocs/loan/class/loanschedule.class.php      |   218 +-
 htdocs/loan/class/paymentloan.class.php       |    25 +
 htdocs/loan/document.php                      |    44 +-
 htdocs/loan/info.php                          |     2 +-
 htdocs/loan/note.php                          |    14 +-
 htdocs/loan/payment/card.php                  |    77 +-
 htdocs/loan/payment/payment.php               |   226 +-
 htdocs/loan/schedule.php                      |   134 +-
 .../mailmanspip/class/mailmanspip.class.php   |   652 +-
 htdocs/main.inc.php                           |   968 +-
 htdocs/margin/admin/margin.php                |     4 +-
 htdocs/margin/agentMargins.php                |   152 +-
 htdocs/margin/checkMargins.php                |    89 +-
 htdocs/margin/customerMargins.php             |    20 +-
 htdocs/margin/productMargins.php              |    46 +-
 htdocs/margin/tabs/productMargins.php         |   224 +-
 htdocs/margin/tabs/thirdpartyMargins.php      |   304 +-
 htdocs/master.inc.php                         |    57 +-
 htdocs/modulebuilder/admin/setup.php          |     6 +-
 htdocs/modulebuilder/index.php                |    97 +-
 htdocs/modulebuilder/template/admin/about.php |     4 +-
 .../template/admin/myobject_extrafields.php   |    24 +-
 htdocs/modulebuilder/template/admin/setup.php |   103 +-
 .../template/class/api_mymodule.class.php     |     4 +-
 .../template/class/myobject.class.php         |    88 +-
 .../template/core/boxes/mymodulewidget1.php   |     2 +-
 .../core/modules/modMyModule.class.php        |    16 +-
 .../doc/doc_generic_myobject_odt.modules.php  |    14 +-
 .../doc/pdf_standard_myobject.modules.php     |  1368 +-
 ..._99_modMyModule_MyModuleTriggers.class.php |    18 +-
 .../template/myobject_agenda.php              |    53 +-
 .../modulebuilder/template/myobject_card.php  |    66 +-
 .../template/myobject_document.php            |    46 +-
 .../modulebuilder/template/myobject_list.php  |    85 +-
 .../modulebuilder/template/myobject_note.php  |    43 +-
 .../template/test/phpunit/MyObjectTest.php    |    88 +-
 htdocs/mrp/class/api_mos.class.php            |    72 +-
 htdocs/mrp/class/mo.class.php                 |   318 +-
 htdocs/mrp/index.php                          |   184 +-
 htdocs/mrp/lib/mrp_mo.lib.php                 |     2 +-
 htdocs/mrp/mo_agenda.php                      |   104 +-
 htdocs/mrp/mo_card.php                        |   503 +-
 htdocs/mrp/mo_document.php                    |    12 +-
 htdocs/mrp/mo_list.php                        |    34 +-
 htdocs/mrp/mo_movements.php                   |   159 +-
 htdocs/mrp/mo_note.php                        |     4 +-
 htdocs/mrp/mo_production.php                  |  1142 +-
 .../class/multicurrency.class.php             |    86 +-
 htdocs/multicurrency/multicurrency_rate.php   |   548 +
 htdocs/opensurvey/card.php                    |    43 +-
 .../class/opensurveysondage.class.php         |   104 +-
 htdocs/opensurvey/fonctions.php               |     7 +-
 htdocs/opensurvey/list.php                    |   116 +-
 htdocs/opensurvey/results.php                 |    20 +-
 htdocs/opensurvey/wizard/choix_autre.php      |     7 +-
 htdocs/opensurvey/wizard/choix_date.php       |    28 +-
 htdocs/opensurvey/wizard/create_survey.php    |    26 +-
 htdocs/paybox/admin/paybox.php                |    12 +-
 htdocs/paybox/lib/paybox.lib.php              |   216 +-
 htdocs/paypal/admin/paypal.php                |   116 +-
 htdocs/paypal/lib/paypal.lib.php              |   702 +-
 htdocs/printing/admin/printing.php            |   463 +-
 htdocs/product/admin/dynamic_prices.php       |   498 +-
 htdocs/product/admin/price_rules.php          |    75 +-
 htdocs/product/admin/product.php              |   380 +-
 htdocs/product/admin/product_extrafields.php  |    18 +-
 .../product/admin/product_lot_extrafields.php |    18 +-
 .../admin/product_supplier_extrafields.php    |    18 +-
 htdocs/product/admin/product_tools.php        |     2 +-
 htdocs/product/admin/stock_extrafields.php    |    22 +-
 htdocs/product/agenda.php                     |   106 +-
 htdocs/product/ajax/products.php              |    11 +-
 .../product/actions_card_product.class.php    |   112 +-
 .../canvas/product/tpl/card_create.tpl.php    |     2 +-
 .../canvas/product/tpl/card_edit.tpl.php      |     6 +-
 .../canvas/product/tpl/card_view.tpl.php      |     2 +-
 .../service/actions_card_service.class.php    |    82 +-
 .../canvas/service/tpl/card_create.tpl.php    |     2 +-
 .../canvas/service/tpl/card_edit.tpl.php      |     6 +-
 .../canvas/service/tpl/card_view.tpl.php      |     2 +-
 htdocs/product/card.php                       |   186 +-
 htdocs/product/class/api_products.class.php   |  3332 ++---
 .../product/class/html.formproduct.class.php  |   289 +-
 htdocs/product/class/product.class.php        |   406 +-
 htdocs/product/class/productbatch.class.php   |   258 +-
 .../class/productcustomerprice.class.php      |   107 +-
 .../class/propalmergepdfproduct.class.php     |   408 +-
 htdocs/product/composition/card.php           |   107 +-
 htdocs/product/document.php                   |   194 +-
 .../class/price_expression.class.php          |   574 +-
 .../class/price_global_variable.class.php     |   542 +-
 .../price_global_variable_updater.class.php   |  1208 +-
 .../class/price_parser.class.php              |   460 +-
 htdocs/product/dynamic_price/editor.php       |     6 +-
 htdocs/product/fournisseurs.php               |   596 +-
 htdocs/product/index.php                      |    86 +-
 htdocs/product/inventory/card.php             |    18 +-
 .../inventory/class/inventory.class.php       |     9 +-
 htdocs/product/inventory/inventory.php        |    16 +-
 .../product/inventory/lib/inventory.lib.php   |    81 +-
 htdocs/product/inventory/list.php             |     4 +-
 htdocs/product/list.php                       |   106 +-
 htdocs/product/note.php                       |    32 +-
 htdocs/product/popuprop.php                   |     6 +-
 htdocs/product/price.php                      |   921 +-
 htdocs/product/reassort.php                   |   124 +-
 htdocs/product/reassortlot.php                |    86 +-
 htdocs/product/stats/bom.php                  |   277 +
 htdocs/product/stats/card.php                 |   222 +-
 htdocs/product/stats/commande.php             |   115 +-
 htdocs/product/stats/commande_fournisseur.php |    28 +-
 htdocs/product/stats/contrat.php              |    52 +-
 htdocs/product/stats/facture.php              |   222 +-
 htdocs/product/stats/facture_fournisseur.php  |    34 +-
 htdocs/product/stats/mo.php                   |    44 +-
 htdocs/product/stats/propal.php               |    64 +-
 htdocs/product/stats/supplier_proposal.php    |    64 +-
 htdocs/product/stock/card.php                 |    48 +-
 .../stock/class/api_stockmovements.class.php  |   454 +-
 .../stock/class/api_warehouses.class.php      |   448 +-
 htdocs/product/stock/class/entrepot.class.php |    10 +-
 .../stock/class/mouvementstock.class.php      |   618 +-
 .../product/stock/class/productlot.class.php  |   166 +-
 .../class/productstockentrepot.class.php      |    56 +-
 htdocs/product/stock/fiche-valo.php           |     2 +-
 htdocs/product/stock/info.php                 |     2 +-
 htdocs/product/stock/list.php                 |    17 +-
 htdocs/product/stock/massstockmove.php        |    58 +-
 htdocs/product/stock/movement_card.php        |  1350 +-
 htdocs/product/stock/movement_list.php        |     4 +-
 htdocs/product/stock/product.php              |    12 +-
 htdocs/product/stock/productlot_card.php      |   146 +-
 htdocs/product/stock/productlot_document.php  |    52 +-
 htdocs/product/stock/productlot_list.php      |     2 +-
 htdocs/product/stock/replenish.php            |   611 +-
 htdocs/product/stock/replenishorders.php      |   318 +-
 htdocs/product/stock/stockatdate.php          |    50 +-
 .../product/stock/tpl/stockcorrection.tpl.php |    10 +-
 .../product/stock/tpl/stocktransfer.tpl.php   |    10 +-
 htdocs/product/stock/valo.php                 |   138 +-
 htdocs/product/traduction.php                 |    60 +-
 htdocs/projet/activity/index.php              |   206 +-
 htdocs/projet/activity/perday.php             |    79 +-
 htdocs/projet/activity/permonth.php           |    12 +-
 htdocs/projet/activity/perweek.php            |    68 +-
 htdocs/projet/admin/project.php               |    14 +-
 htdocs/projet/admin/project_extrafields.php   |     8 +-
 .../projet/admin/project_task_extrafields.php |     8 +-
 htdocs/projet/ajax/projects.php               |    39 +-
 htdocs/projet/card.php                        |    85 +-
 htdocs/projet/class/api_projects.class.php    |   835 +-
 htdocs/projet/class/api_tasks.class.php       |     4 +-
 htdocs/projet/class/project.class.php         |    77 +-
 htdocs/projet/class/projectstats.class.php    |    32 +-
 htdocs/projet/class/task.class.php            |    47 +-
 htdocs/projet/class/taskstats.class.php       |    12 +-
 htdocs/projet/comment.php                     |     4 +-
 htdocs/projet/contact.php                     |   201 +-
 htdocs/projet/document.php                    |     4 +-
 htdocs/projet/element.php                     |   533 +-
 htdocs/projet/ganttview.php                   |   250 +-
 htdocs/projet/index.php                       |   137 +-
 htdocs/projet/info.php                        |    40 +-
 htdocs/projet/list.php                        |   210 +-
 htdocs/projet/note.php                        |    10 +-
 htdocs/projet/stats/index.php                 |     2 +-
 htdocs/projet/tasks.php                       |   242 +-
 htdocs/projet/tasks/comment.php               |   250 +-
 htdocs/projet/tasks/contact.php               |   327 +-
 htdocs/projet/tasks/document.php              |   214 +-
 htdocs/projet/tasks/list.php                  |   100 +-
 htdocs/projet/tasks/note.php                  |    46 +-
 htdocs/projet/tasks/stats/index.php           |     2 +-
 htdocs/projet/tasks/task.php                  |   286 +-
 htdocs/projet/tasks/time.php                  |   223 +-
 htdocs/public/agenda/agendaexport.php         |     7 +-
 htdocs/public/cron/cron_run_jobs.php          |    85 +-
 htdocs/public/demo/index.php                  |    12 +-
 htdocs/public/donations/donateurs_code.php    |    10 +-
 htdocs/public/emailing/mailing-read.php       |     6 +-
 .../public/emailing/mailing-unsubscribe.php   |     6 +-
 htdocs/public/members/new.php                 |   721 +-
 htdocs/public/members/public_card.php         |     5 +-
 htdocs/public/members/public_list.php         |     3 +-
 htdocs/public/notice.php                      |    14 +-
 htdocs/public/onlinesign/newonlinesign.php    |    80 +-
 htdocs/public/opensurvey/studs.php            |    38 +-
 htdocs/public/payment/newpayment.php          |   683 +-
 htdocs/public/payment/paymentko.php           |    10 +-
 htdocs/public/payment/paymentok.php           |    10 +-
 htdocs/public/recruitment/index.php           |    11 +-
 htdocs/public/recruitment/view.php            |    12 +-
 htdocs/public/stripe/confirm_payment.php      |    88 +-
 htdocs/public/stripe/ipn.php                  |    88 +-
 htdocs/public/test/test_arrays.php            |     4 +-
 htdocs/public/ticket/create_ticket.php        |    36 +-
 htdocs/public/ticket/index.php                |     9 +-
 htdocs/public/ticket/list.php                 |     4 +-
 htdocs/public/ticket/view.php                 |     4 +-
 htdocs/public/website/index.php               |     2 +
 htdocs/public/website/styles.css.php          |    44 +-
 htdocs/reception/card.php                     |  1178 +-
 htdocs/reception/class/reception.class.php    |   758 +-
 .../reception/class/receptionstats.class.php  |    64 +-
 htdocs/reception/contact.php                  |   160 +-
 htdocs/reception/index.php                    |    18 +-
 htdocs/reception/list.php                     |   744 +-
 htdocs/reception/note.php                     |   122 +-
 htdocs/reception/stats/index.php              |    54 +-
 htdocs/reception/stats/month.php              |    14 +-
 .../reception/tpl/linkedobjectblock.tpl.php   |    28 +-
 .../admin/candidature_extrafields.php         |     4 +-
 .../admin/jobposition_extrafields.php         |     4 +-
 htdocs/recruitment/admin/public_interface.php |    16 +-
 htdocs/recruitment/admin/setup.php            |    99 +-
 .../recruitment/admin/setup_candidatures.php  |    72 +-
 .../class/recruitmentcandidature.class.php    |    76 +-
 .../class/recruitmentjobposition.class.php    |    91 +-
 ...ric_recruitmentjobposition_odt.modules.php |    10 +-
 ...tandard_recruitmentjobposition.modules.php |    10 +-
 ...recruitment_recruitmentjobposition.lib.php |    10 +-
 .../recruitmentcandidature_agenda.php         |     4 +-
 .../recruitmentcandidature_card.php           |   222 +-
 .../recruitmentcandidature_document.php       |     6 +-
 .../recruitmentcandidature_list.php           |     8 +-
 .../recruitmentcandidature_note.php           |     4 +-
 htdocs/recruitment/recruitmentindex.php       |    28 +-
 .../recruitmentjobposition_agenda.php         |    14 +-
 ...> recruitmentjobposition_applications.php} |   141 +-
 .../recruitmentjobposition_card.php           |    56 +-
 .../recruitmentjobposition_document.php       |    16 +-
 .../recruitmentjobposition_list.php           |    43 +-
 .../recruitmentjobposition_note.php           |    14 +-
 htdocs/resource/agenda.php                    |    70 +-
 htdocs/resource/card.php                      |    52 +-
 htdocs/resource/class/dolresource.class.php   |  1158 +-
 .../class/html.formresource.class.php         |   280 +-
 htdocs/resource/contact.php                   |     7 +-
 htdocs/resource/document.php                  |    20 +-
 htdocs/resource/element_resource.php          |   304 +-
 htdocs/resource/list.php                      |    74 +-
 htdocs/resource/note.php                      |     4 +-
 htdocs/salaries/admin/salaries.php            |    32 +-
 .../salaries/admin/salaries_extrafields.php   |     8 +-
 htdocs/salaries/card.php                      |    81 +-
 htdocs/salaries/class/paymentsalary.class.php |  1306 +-
 htdocs/salaries/class/salariesstats.class.php |   228 +-
 htdocs/salaries/document.php                  |     4 +-
 htdocs/salaries/info.php                      |     4 +-
 htdocs/salaries/list.php                      |   596 +-
 htdocs/salaries/stats/index.php               |     4 +-
 htdocs/societe/admin/contact_extrafields.php  |     4 +-
 htdocs/societe/admin/societe.php              |   260 +-
 htdocs/societe/admin/societe_extrafields.php  |     4 +-
 htdocs/societe/agenda.php                     |    94 +-
 htdocs/societe/ajaxcompanies.php              |    40 +-
 .../canvas/actions_card_common.class.php      |   570 +-
 .../company/actions_card_company.class.php    |    84 +-
 .../canvas/company/tpl/card_edit.tpl.php      |     6 +-
 .../canvas/company/tpl/card_view.tpl.php      |     4 +-
 .../actions_card_individual.class.php         |    88 +-
 .../canvas/individual/tpl/card_edit.tpl.php   |     6 +-
 .../canvas/individual/tpl/card_view.tpl.php   |     4 +-
 htdocs/societe/card.php                       |  3396 ++---
 htdocs/societe/checkvat/checkVatPopup.php     |     8 +-
 htdocs/societe/checkvat/checkVatService.xml   |     2 +-
 htdocs/societe/class/api_contacts.class.php   |   423 +-
 .../societe/class/api_thirdparties.class.php  |   403 +-
 htdocs/societe/class/client.class.php         |   114 +-
 .../class/companybankaccount.class.php        |    32 +-
 .../class/companypaymentmode.class.php        |   166 +-
 htdocs/societe/class/societe.class.php        |   648 +-
 htdocs/societe/class/societeaccount.class.php |   191 +-
 htdocs/societe/consumption.php                |   142 +-
 htdocs/societe/contact.php                    |    32 +-
 htdocs/societe/document.php                   |    12 +-
 htdocs/societe/index.php                      |    22 +-
 htdocs/societe/list.php                       |   131 +-
 htdocs/societe/note.php                       |    76 +-
 htdocs/societe/notify/card.php                |   586 +-
 htdocs/societe/paymentmodes.php               |   164 +-
 htdocs/societe/price.php                      |   395 +-
 htdocs/societe/project.php                    |    24 +-
 htdocs/societe/societecontact.php             |    49 +-
 .../tpl/linesalesrepresentative.tpl.php       |    12 +-
 htdocs/societe/website.php                    |    68 +-
 htdocs/stripe/admin/stripe.php                |   222 +-
 htdocs/stripe/charge.php                      |   355 +-
 htdocs/stripe/class/actions_stripe.class.php  |    28 +-
 htdocs/stripe/class/stripe.class.php          |    30 +-
 htdocs/stripe/config.php                      |    10 +-
 htdocs/stripe/lib/stripe.lib.php              |    93 +-
 htdocs/stripe/payout.php                      |    32 +-
 htdocs/stripe/transaction.php                 |    45 +-
 .../admin/supplier_proposal_extrafields.php   |    22 +-
 .../supplier_proposaldet_extrafields.php      |    18 +-
 htdocs/supplier_proposal/card.php             |    65 +-
 .../class/api_supplier_proposals.class.php    |   316 +-
 .../class/supplier_proposal.class.php         |   105 +-
 htdocs/supplier_proposal/contact.php          |    70 +-
 htdocs/supplier_proposal/document.php         |    62 +-
 htdocs/supplier_proposal/index.php            |   148 +-
 htdocs/supplier_proposal/info.php             |    62 +-
 htdocs/supplier_proposal/list.php             |     4 +-
 htdocs/supplier_proposal/note.php             |    64 +-
 .../tpl/linkedobjectblock.tpl.php             |    18 +-
 htdocs/support/index.php                      |     3 +
 htdocs/takepos/admin/appearance.php           |    20 +-
 htdocs/takepos/admin/bar.php                  |     8 +-
 htdocs/takepos/admin/orderprinters.php        |    42 +-
 htdocs/takepos/admin/other.php                |     6 +-
 htdocs/takepos/admin/receipt.php              |    66 +-
 htdocs/takepos/admin/setup.php                |    50 +-
 htdocs/takepos/admin/terminal.php             |   121 +-
 htdocs/takepos/ajax/ajax.php                  |   137 +-
 htdocs/takepos/css/pos.css.php                |    11 +-
 htdocs/takepos/floors.php                     |    57 +-
 htdocs/takepos/freezone.php                   |    12 +-
 htdocs/takepos/genimg/index.php               |     2 +-
 htdocs/takepos/index.php                      |   217 +-
 htdocs/takepos/invoice.php                    |   448 +-
 htdocs/takepos/pay.php                        |    44 +-
 htdocs/takepos/phone.php                      |    42 +-
 htdocs/takepos/public/auto_order.php          |     1 +
 htdocs/takepos/public/menu.php                |    33 +-
 htdocs/takepos/receipt.php                    |    83 +-
 htdocs/takepos/reduction.php                  |    34 +-
 htdocs/takepos/send.php                       |    58 +-
 htdocs/takepos/smpcb.php                      |    45 +-
 htdocs/theme/common/flags/unknown.png         |   Bin 0 -> 1595 bytes
 htdocs/theme/eldy/badges.inc.php              |     7 +
 htdocs/theme/eldy/btn.inc.php                 |     6 +-
 htdocs/theme/eldy/ckeditor/config.js          |     2 +-
 htdocs/theme/eldy/global.inc.php              |   326 +-
 .../theme/eldy/img/object_intracommreport.png |   Bin 0 -> 1384 bytes
 htdocs/theme/eldy/info-box.inc.php            |    41 +-
 htdocs/theme/eldy/main_menu_fa_icons.inc.php  |     3 +
 htdocs/theme/eldy/style.css.php               |    36 +-
 htdocs/theme/eldy/theme_vars.inc.php          |    12 +-
 htdocs/theme/eldy/timeline.inc.php            |     2 +-
 .../theme/md/img/object_intracommreport.png   |   Bin 0 -> 1384 bytes
 htdocs/theme/md/info-box.inc.php              |    22 +-
 htdocs/theme/md/main_menu_fa_icons.inc.php    |     4 +-
 htdocs/theme/md/manifest.json.php             |    24 +-
 htdocs/theme/md/style.css.php                 |   131 +-
 htdocs/ticket/agenda.php                      |    38 +-
 htdocs/ticket/card.php                        |    52 +-
 htdocs/ticket/class/actions_ticket.class.php  |     2 +-
 htdocs/ticket/class/api_tickets.class.php     |   982 +-
 htdocs/ticket/class/ticket.class.php          |    91 +-
 htdocs/ticket/class/ticketstats.class.php     |   232 +-
 htdocs/ticket/class/utils_diff.class.php      |   124 +-
 htdocs/ticket/contact.php                     |   237 +-
 htdocs/ticket/document.php                    |   170 +-
 htdocs/ticket/index.php                       |   337 +-
 htdocs/ticket/list.php                        |   288 +-
 htdocs/ticket/messaging.php                   |    30 +-
 htdocs/ticket/stats/index.php                 |   156 +-
 htdocs/ticket/tpl/linkedobjectblock.tpl.php   |    16 +-
 htdocs/user/admin/group_extrafields.php       |     4 +-
 htdocs/user/admin/user_extrafields.php        |     8 +-
 htdocs/user/agenda_extsites.php               |     6 +-
 htdocs/user/bank.php                          |   217 +-
 htdocs/user/card.php                          |   232 +-
 htdocs/user/class/api_users.class.php         |   638 +-
 htdocs/user/class/user.class.php              |  1330 +-
 htdocs/user/class/userbankaccount.class.php   |   312 +-
 htdocs/user/class/usergroup.class.php         |   203 +-
 htdocs/user/clicktodial.php                   |   205 +-
 htdocs/user/document.php                      |    30 +-
 htdocs/user/group/card.php                    |   140 +-
 htdocs/user/group/ldap.php                    |    20 +-
 htdocs/user/group/list.php                    |   170 +-
 htdocs/user/group/perms.php                   |     4 +-
 htdocs/user/hierarchy.php                     |   230 +-
 htdocs/user/home.php                          |    22 +-
 htdocs/user/info.php                          |     4 +-
 htdocs/user/ldap.php                          |     4 +-
 htdocs/user/list.php                          |   197 +-
 htdocs/user/note.php                          |    48 +-
 htdocs/user/notify/card.php                   |   542 +-
 htdocs/user/param_ihm.php                     |    12 +-
 htdocs/user/passwordforgotten.php             |   152 +-
 htdocs/user/perms.php                         |     6 +-
 htdocs/user/vcard.php                         |    14 +-
 htdocs/variants/admin/admin.php               |    52 +-
 htdocs/variants/ajax/getCombinations.php      |    14 +-
 htdocs/variants/ajax/get_attribute_values.php |    24 +-
 htdocs/variants/card.php                      |    22 +-
 .../class/ProductCombination.class.php        |    18 +-
 .../ProductCombination2ValuePair.class.php    |    18 +-
 htdocs/variants/combinations.php              |   329 +-
 htdocs/variants/create.php                    |     7 +-
 htdocs/variants/create_val.php                |    10 +-
 htdocs/variants/generator.php                 |   385 -
 htdocs/variants/list.php                      |     2 +-
 htdocs/viewimage.php                          |   116 +-
 htdocs/webservices/admin/index.php            |    35 +-
 htdocs/webservices/server_actioncomm.php      |   268 +-
 htdocs/webservices/server_category.php        |    36 +-
 htdocs/webservices/server_contact.php         |   290 +-
 htdocs/webservices/server_invoice.php         |   702 +-
 htdocs/webservices/server_order.php           |    20 +-
 htdocs/webservices/server_payment.php         |   222 +-
 .../webservices/server_productorservice.php   |  1113 +-
 htdocs/webservices/server_project.php         |   556 +-
 .../webservices/server_supplier_invoice.php   |   412 +-
 htdocs/webservices/server_thirdparty.php      |   682 +-
 htdocs/webservices/server_user.php            |   242 +-
 htdocs/website/class/website.class.php        |   219 +-
 htdocs/website/class/websitepage.class.php    |   156 +-
 htdocs/website/index.php                      |   706 +-
 htdocs/website/websiteaccount_card.php        |    78 +-
 htdocs/zapier/admin/about.php                 |     4 +-
 htdocs/zapier/admin/setup.php                 |    72 +-
 htdocs/zapier/class/api_zapier.class.php      |   555 +-
 htdocs/zapier/class/hook.class.php            |    42 +-
 htdocs/zapier/hook_agenda.php                 |    90 +-
 htdocs/zapier/hook_card.php                   |   153 +-
 htdocs/zapier/hook_document.php               |     8 +-
 htdocs/zapier/hook_list.php                   |   458 +-
 htdocs/zapier/hook_note.php                   |     4 +-
 htdocs/zapier/lib/zapier.lib.php              |    44 +-
 nightwatch.conf.js                            |    27 +
 package.json                                  |    15 +
 phpstan.neon                                  |     2 +-
 .../accountancy/export-thirdpartyaccount.php  |     4 +
 scripts/bank/export-bank-receipts.php         |    21 +-
 .../company/export-contacts-xls-example.php   |   117 -
 .../company/sync_contacts_dolibarr2ldap.php   |     3 +
 .../email_expire_services_to_customers.php    |     3 +
 ...ail_expire_services_to_representatives.php |     3 +
 scripts/cron/cron_run_jobs.php                |    56 +-
 scripts/emailings/mailing-send.php            |    35 +-
 scripts/emailings/reset-invalid-emails.php    |   176 +
 .../email_unpaid_invoices_to_customers.php    |     3 +
 ...ail_unpaid_invoices_to_representatives.php |     3 +
 scripts/invoices/rebuild_merge_pdf.php        |     3 +
 .../members/sync_members_dolibarr2ldap.php    |     5 +-
 .../members/sync_members_ldap2dolibarr.php    |     5 +-
 .../sync_members_types_dolibarr2ldap.php      |     8 +-
 .../sync_members_types_ldap2dolibarr.php      |     5 +-
 scripts/product/migrate_picture_path.php      |     3 +
 scripts/product/regenerate_thumbs.php         |     3 +
 scripts/user/migrate_picture_path.php         |     3 +
 scripts/user/sync_groups_dolibarr2ldap.php    |     3 +
 scripts/user/sync_groups_ldap2dolibarr.php    |     5 +-
 scripts/user/sync_users_dolibarr2ldap.php     |     3 +
 scripts/user/sync_users_ldap2dolibarr.php     |     3 +
 .../website/migrate-news-joomla2dolibarr.php  |     2 +
 scripts/website/regenerate-pages.php          |     2 +
 scripts/withdrawals/build_withdrawal_file.php |     5 +-
 test/README                                   |     2 +-
 test/acceptance/README.md                     |    78 +
 .../features/Api/apiAddUsers.feature          |    78 +
 .../features/Api/apiListUsers.feature         |    23 +
 .../features/WebUI/addUsers.feature           |    86 +
 .../features/WebUI/listUsers.feature          |    29 +
 test/acceptance/features/WebUI/login.feature  |    27 +
 test/acceptance/features/WebUI/logout.feature |    10 +
 test/acceptance/index.js                      |    14 +
 test/acceptance/pageObjects/addUsersPage.js   |   128 +
 test/acceptance/pageObjects/homePage.js       |    44 +
 test/acceptance/pageObjects/listUsersPage.js  |    47 +
 test/acceptance/pageObjects/loginPage.js      |    84 +
 test/acceptance/pageObjects/logoutPage.js     |    34 +
 test/acceptance/setup.js                      |    99 +
 .../stepDefinitions/addUsersContext.js        |   179 +
 .../stepDefinitions/listUsersContext.js       |    62 +
 .../stepDefinitions/loginContext.js           |    28 +
 .../stepDefinitions/logoutContext.js          |    14 +
 test/{ => other}/test_serialize.php           |     0
 test/phpunit/AdminLibTest.php                 |     8 +-
 test/phpunit/AllTests.php                     |    10 +-
 test/phpunit/BOMTest.php                      |    26 +
 test/phpunit/CategorieTest.php                |     4 +-
 test/phpunit/CodingPhpTest.php                |     8 +-
 test/phpunit/CodingSqlTest.php                |    18 +-
 test/phpunit/ContactTest.php                  |    19 -
 test/phpunit/CoreTest.php                     |   169 -
 test/phpunit/ExpenseReportTest.php            |    12 +-
 test/phpunit/ExportTest.php                   |     4 +-
 test/phpunit/FactureRecTest.php               |    12 +-
 test/phpunit/FactureTest.php                  |    19 +-
 test/phpunit/FormTest.php                     |     4 +-
 test/phpunit/Functions2LibTest.php            |     7 +
 test/phpunit/FunctionsLibTest.php             |   134 +-
 test/phpunit/HolidayTest.php                  |     4 +-
 test/phpunit/ImportTest.php                   |     2 +-
 test/phpunit/LangTest.php                     |    33 +-
 test/phpunit/PaypalTest.php                   |    10 +-
 test/phpunit/ProductTest.php                  |    50 +-
 test/phpunit/PropalTest.php                   |     6 +-
 test/phpunit/RestAPIDocumentTest.php          |     6 +-
 test/phpunit/RestAPIUserTest.php              |    12 +-
 test/phpunit/ScriptsTest.php                  |    14 +-
 test/phpunit/SecurityTest.php                 |   251 +-
 test/phpunit/SocieteTest.php                  |    19 -
 test/phpunit/StripeTest.php                   |   156 +
 test/phpunit/UserGroupTest.php                |    11 +-
 test/phpunit/UserTest.php                     |     9 +-
 test/phpunit/WebservicesOrdersTest.php        |     2 +-
 test/phpunit/WebservicesOtherTest.php         |     4 +-
 test/phpunit/WebservicesProductsTest.php      |     6 +-
 test/phpunit/WebservicesUserTest.php          |    12 +-
 test/phpunit/phpunittest.xml                  |    29 +-
 3660 files changed, 183847 insertions(+), 274871 deletions(-)
 delete mode 100644 INSTALL
 create mode 100644 dev/examples/zapier/.editorconfig
 create mode 100644 dev/examples/zapier/README.md
 delete mode 100644 dev/examples/zapier/package-lock.json
 create mode 100644 dev/examples/zapier/triggers/ticket.js
 create mode 100644 dev/examples/zapier/triggers/user.js
 rename dev/initdemo/{mysqldump_dolibarr_12.0.0.sql => mysqldump_dolibarr_13.0.0.sql} (86%)
 create mode 100644 dev/resources/iso-normes/Intracommreport-ManuelDebXml.pdf
 create mode 100644 dev/resources/iso-normes/Intracommreport-ManuelDesXML.pdf
 create mode 100644 dev/resources/iso-normes/company_ids.txt
 delete mode 100644 dev/translation/erp_comparison_translation.txt
 create mode 100644 doc/images/invoice.png
 create mode 100644 htdocs/accountancy/admin/subaccount.php
 create mode 100644 htdocs/accountancy/bookkeeping/listbysubaccount.php
 create mode 100644 htdocs/admin/company_socialnetworks.php
 create mode 100644 htdocs/admin/delivery.php
 rename htdocs/admin/{livraison_extrafields.php => delivery_extrafields.php} (91%)
 rename htdocs/admin/{livraisondet_extrafields.php => deliverydet_extrafields.php} (80%)
 create mode 100644 htdocs/admin/dolistore/class/index.html
 create mode 100644 htdocs/admin/dolistore/index.html
 create mode 100644 htdocs/admin/ecm_directories_extrafields.php
 create mode 100644 htdocs/admin/ecm_files_extrafields.php
 delete mode 100644 htdocs/admin/livraison.php
 delete mode 100644 htdocs/admin/menus/other.php
 create mode 100644 htdocs/admin/system/security.php
 delete mode 100644 htdocs/commande/orderstoinvoice.php
 create mode 100644 htdocs/core/boxes/box_customers_outstanding_bill_reached.php
 create mode 100644 htdocs/core/boxes/box_funnel_of_prospection.php
 create mode 100644 htdocs/core/boxes/box_scheduled_jobs.php
 create mode 100644 htdocs/core/class/cproductnature.class.php
 create mode 100644 htdocs/core/lib/intracommreport.lib.php
 create mode 100644 htdocs/core/lib/phpsessionindb.lib.php
 rename htdocs/core/modules/{livraison => delivery}/doc/index.html (100%)
 rename htdocs/core/modules/{livraison => delivery}/doc/pdf_storm.modules.php (92%)
 rename htdocs/core/modules/{livraison => delivery}/doc/pdf_typhon.modules.php (96%)
 rename htdocs/core/modules/{livraison => delivery}/index.html (100%)
 rename htdocs/core/modules/{livraison/mod_livraison_jade.php => delivery/mod_delivery_jade.php} (88%)
 rename htdocs/core/modules/{livraison/mod_livraison_saphir.php => delivery/mod_delivery_saphir.php} (65%)
 rename htdocs/core/modules/{livraison/modules_livraison.php => delivery/modules_delivery.php} (98%)
 create mode 100644 htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
 create mode 100644 htdocs/core/modules/member/modules_member.class.php
 create mode 100644 htdocs/core/modules/modIntracommreport.class.php
 rename htdocs/{livraison/class => core/modules/user/doc}/index.html (100%)
 create mode 100644 htdocs/core/tpl/extrafields_list_array_fields.tpl.php
 rename htdocs/{livraison => delivery}/card.php (78%)
 rename htdocs/{livraison/class/livraison.class.php => delivery/class/delivery.class.php} (73%)
 rename htdocs/{livraison => delivery/class}/index.html (100%)
 create mode 100644 htdocs/delivery/index.html
 delete mode 100644 htdocs/fourn/commande/orderstoinvoice.php
 create mode 100644 htdocs/fourn/paiement/list.php
 delete mode 100644 htdocs/holiday/common.inc.php
 delete mode 100644 htdocs/includes/mike42/escpos-php/doc/FAQ.md
 delete mode 100644 htdocs/includes/mike42/escpos-php/doc/Makefile
 delete mode 100644 htdocs/includes/mike42/escpos-php/doc/escpos.doxyfile
 create mode 100644 htdocs/includes/mobiledetect/mobiledetectlib/.gitignore
 delete mode 100644 htdocs/includes/mobiledetect/mobiledetectlib/docs/CONTRIBUTING.md
 delete mode 100644 htdocs/includes/mobiledetect/mobiledetectlib/docs/HISTORY.md
 delete mode 100644 htdocs/includes/mobiledetect/mobiledetectlib/docs/ISSUE_TEMPLATE.md
 delete mode 100644 htdocs/includes/mobiledetect/mobiledetectlib/docs/KNOWN_LIMITATIONS.md
 create mode 100644 htdocs/includes/odtphp/zip/pclzip/LICENSE
 create mode 100644 htdocs/includes/odtphp/zip/pclzip/composer.json
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/.gitattributes
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/.gitignore
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/.travis.yml
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Autoloader.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/APC.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/CacheBase.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/DiscISAM.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/ICache.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Igbinary.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memcache.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memory.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemoryGZip.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemorySerialized.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/PHPTemp.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite3.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Wincache.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorageFactory.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/CyclicReferenceStack.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/Logger.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Database.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/DateTime.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Engineering.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Exception.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/ExceptionHandler.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Financial.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaParser.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaToken.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Function.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Functions.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Logical.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/LookupRef.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/MathTrig.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Statistical.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/TextData.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Token/Stack.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/functionlist.txt
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/AdvancedValueBinder.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataType.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataValidation.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DefaultValueBinder.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/Hyperlink.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/IValueBinder.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Axis.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeries.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeriesValues.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Exception.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/GridLines.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Layout.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Legend.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/PlotArea.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Properties.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/jpgraph.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Title.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Comment.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentProperties.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentSecurity.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Exception.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/HashTable.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Helper/HTML.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/IComparable.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/IOFactory.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/NamedRange.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Abstract.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/CSV.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/DefaultReadFilter.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2003XML.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Chart.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Theme.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/Escher.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/MD5.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/RC4.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Exception.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Gnumeric.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/HTML.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReadFilter.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReader.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/OOCalc.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/SYLK.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/ReferenceHelper.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/ITextElement.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/Run.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/TextElement.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Settings.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/CodePage.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Date.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Drawing.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Excel5.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/File.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Font.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CHANGELOG.TXT
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CholeskyDecomposition.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/LUDecomposition.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/Matrix.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/QRDecomposition.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/SingularValueDecomposition.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Error.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Maths.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/ChainedBlockStream.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/File.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/Root.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLERead.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/gnu-lgpl.txt
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/pclzip.lib.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/readme.txt
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PasswordHasher.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/String.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/TimeZone.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/XMLWriter.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipArchive.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipStreamWrapper.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/bestFitClass.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/exponentialBestFitClass.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/linearBestFitClass.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/logarithmicBestFitClass.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/polynomialBestFitClass.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/powerBestFitClass.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/trendClass.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Alignment.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Border.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Borders.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Color.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Conditional.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Fill.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Font.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/NumberFormat.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Protection.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Supervisor.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column/Rule.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/BaseDrawing.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/CellIterator.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Column.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnCellIterator.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnDimension.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnIterator.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing/Shadow.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooter.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooterDrawing.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/MemoryDrawing.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageMargins.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageSetup.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Protection.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Row.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowCellIterator.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowDimension.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowIterator.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/SheetView.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/WorksheetIterator.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Abstract.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/CSV.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Chart.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Comments.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/ContentTypes.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/DocProps.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Drawing.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Rels.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsRibbon.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsVBA.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/StringTable.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Style.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Theme.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Workbook.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Worksheet.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/WriterPart.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/BIFFwriter.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Escher.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Font.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Parser.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Workbook.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Worksheet.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Xf.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Exception.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/HTML.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/IWriter.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Cell/Comment.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Content.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Meta.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/MetaInf.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Mimetype.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Settings.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Styles.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Thumbnails.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/WriterPart.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/Core.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/DomPDF.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/mPDF.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/tcPDF.php
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/bg/config
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/config
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/config
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/config
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/en/uk/config
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/config
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/config
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/config
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/config
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/config
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/config
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/config
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/config
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/config
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/functions
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/config
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/functions
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/config
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/config
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/functions
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/config
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/changelog.txt
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/composer.json
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/install.txt
 delete mode 100644 htdocs/includes/phpoffice/phpexcel/license.md
 create mode 100644 htdocs/includes/symfony/var-dumper/.gitignore
 create mode 100644 htdocs/includes/symfony/var-dumper/phpunit.xml.dist
 create mode 100644 htdocs/includes/tecnickcom/tcpdf/.gitignore
 create mode 100644 htdocs/install/mysql/data/llx_c_product_nature.sql
 create mode 100644 htdocs/install/mysql/data/llx_c_transport_mode.sql
 create mode 100644 htdocs/install/mysql/tables/llx_c_product_nature.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_c_product_nature.sql
 create mode 100644 htdocs/install/mysql/tables/llx_c_transport_mode.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_c_transport_mode.sql
 rename htdocs/install/mysql/tables/{llx_livraison.key.sql => llx_delivery.key.sql} (58%)
 rename htdocs/install/mysql/tables/{llx_livraison.sql => llx_delivery.sql} (95%)
 rename htdocs/install/mysql/tables/{llx_livraison_extrafields.key.sql => llx_delivery_extrafields.key.sql} (90%)
 rename htdocs/install/mysql/tables/{llx_livraison_extrafields.sql => llx_delivery_extrafields.sql} (89%)
 rename htdocs/install/mysql/tables/{llx_livraisondet.key.sql => llx_deliverydet.key.sql} (81%)
 rename htdocs/install/mysql/tables/{llx_livraisondet.sql => llx_deliverydet.sql} (96%)
 rename htdocs/install/mysql/tables/{llx_livraisondet_extrafields.key.sql => llx_deliverydet_extrafields.key.sql} (90%)
 rename htdocs/install/mysql/tables/{llx_livraisondet_extrafields.sql => llx_deliverydet_extrafields.sql} (89%)
 create mode 100644 htdocs/install/mysql/tables/llx_ecm_directories_extrafields.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_ecm_directories_extrafileds.sql
 create mode 100644 htdocs/install/mysql/tables/llx_ecm_files_extrafields.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_ecm_files_extrafields.sql
 create mode 100644 htdocs/install/mysql/tables/llx_intracommreport.sql
 create mode 100644 htdocs/install/mysql/tables/llx_session.sql
 delete mode 100644 htdocs/install/mysql/tables/llx_zapier_hook_extrafields.sql
 create mode 100644 htdocs/intracommreport/admin/index.html
 create mode 100644 htdocs/intracommreport/admin/intracommreport.php
 create mode 100644 htdocs/intracommreport/card.php
 create mode 100644 htdocs/intracommreport/class/index.html
 create mode 100644 htdocs/intracommreport/class/intracommreport.class.php
 create mode 100644 htdocs/intracommreport/index.html
 create mode 100644 htdocs/intracommreport/list.php
 create mode 100644 htdocs/langs/am_ET/intracommreport.lang
 create mode 100644 htdocs/langs/ar_SA/intracommreport.lang
 create mode 100644 htdocs/langs/az_AZ/intracommreport.lang
 create mode 100644 htdocs/langs/bg_BG/intracommreport.lang
 create mode 100644 htdocs/langs/bn_BD/intracommreport.lang
 create mode 100644 htdocs/langs/bn_IN/intracommreport.lang
 create mode 100644 htdocs/langs/bs_BA/intracommreport.lang
 create mode 100644 htdocs/langs/ca_ES/intracommreport.lang
 create mode 100644 htdocs/langs/cs_CZ/intracommreport.lang
 create mode 100644 htdocs/langs/da_DK/intracommreport.lang
 create mode 100644 htdocs/langs/de_CH/intracommreport.lang
 create mode 100644 htdocs/langs/de_DE/intracommreport.lang
 create mode 100644 htdocs/langs/el_CY/products.lang
 create mode 100644 htdocs/langs/el_GR/intracommreport.lang
 create mode 100644 htdocs/langs/en_AU/intracommreport.lang
 create mode 100644 htdocs/langs/en_AU/products.lang
 delete mode 100644 htdocs/langs/en_AU/stocks.lang
 create mode 100644 htdocs/langs/en_CA/compta.lang
 create mode 100644 htdocs/langs/en_CA/intracommreport.lang
 create mode 100644 htdocs/langs/en_CA/products.lang
 delete mode 100644 htdocs/langs/en_CA/stocks.lang
 create mode 100644 htdocs/langs/en_GB/intracommreport.lang
 delete mode 100644 htdocs/langs/en_GB/suppliers.lang
 delete mode 100644 htdocs/langs/en_IN/ecm.lang
 create mode 100644 htdocs/langs/en_IN/intracommreport.lang
 create mode 100644 htdocs/langs/en_IN/products.lang
 delete mode 100644 htdocs/langs/en_IN/stocks.lang
 create mode 100644 htdocs/langs/en_SG/compta.lang
 create mode 100644 htdocs/langs/en_SG/intracommreport.lang
 create mode 100644 htdocs/langs/en_SG/products.lang
 delete mode 100644 htdocs/langs/en_SG/stocks.lang
 create mode 100644 htdocs/langs/en_US/intracommreport.lang
 create mode 100644 htdocs/langs/es_AR/intracommreport.lang
 create mode 100644 htdocs/langs/es_BO/compta.lang
 create mode 100644 htdocs/langs/es_BO/intracommreport.lang
 create mode 100644 htdocs/langs/es_BO/products.lang
 create mode 100644 htdocs/langs/es_CL/intracommreport.lang
 create mode 100644 htdocs/langs/es_CO/intracommreport.lang
 create mode 100644 htdocs/langs/es_DO/compta.lang
 create mode 100644 htdocs/langs/es_DO/intracommreport.lang
 create mode 100644 htdocs/langs/es_DO/products.lang
 create mode 100644 htdocs/langs/es_EC/intracommreport.lang
 create mode 100644 htdocs/langs/es_ES/intracommreport.lang
 create mode 100644 htdocs/langs/es_GT/compta.lang
 create mode 100644 htdocs/langs/es_GT/intracommreport.lang
 create mode 100644 htdocs/langs/es_GT/products.lang
 create mode 100644 htdocs/langs/es_HN/compta.lang
 create mode 100644 htdocs/langs/es_HN/intracommreport.lang
 create mode 100644 htdocs/langs/es_HN/products.lang
 create mode 100644 htdocs/langs/es_MX/intracommreport.lang
 create mode 100644 htdocs/langs/es_PA/compta.lang
 create mode 100644 htdocs/langs/es_PA/intracommreport.lang
 create mode 100644 htdocs/langs/es_PA/products.lang
 create mode 100644 htdocs/langs/es_PE/intracommreport.lang
 create mode 100644 htdocs/langs/es_PY/compta.lang
 create mode 100644 htdocs/langs/es_PY/intracommreport.lang
 create mode 100644 htdocs/langs/es_PY/products.lang
 create mode 100644 htdocs/langs/es_US/compta.lang
 create mode 100644 htdocs/langs/es_US/intracommreport.lang
 create mode 100644 htdocs/langs/es_US/products.lang
 create mode 100644 htdocs/langs/es_UY/compta.lang
 create mode 100644 htdocs/langs/es_UY/intracommreport.lang
 create mode 100644 htdocs/langs/es_UY/products.lang
 create mode 100644 htdocs/langs/es_VE/intracommreport.lang
 create mode 100644 htdocs/langs/et_EE/intracommreport.lang
 create mode 100644 htdocs/langs/eu_ES/intracommreport.lang
 create mode 100644 htdocs/langs/fa_IR/intracommreport.lang
 create mode 100644 htdocs/langs/fi_FI/intracommreport.lang
 create mode 100644 htdocs/langs/fr_BE/intracommreport.lang
 create mode 100644 htdocs/langs/fr_BE/products.lang
 delete mode 100644 htdocs/langs/fr_BE/stocks.lang
 create mode 100644 htdocs/langs/fr_CA/intracommreport.lang
 create mode 100644 htdocs/langs/fr_CA/recruitment.lang
 create mode 100644 htdocs/langs/fr_CH/compta.lang
 create mode 100644 htdocs/langs/fr_CH/intracommreport.lang
 create mode 100644 htdocs/langs/fr_CH/products.lang
 delete mode 100644 htdocs/langs/fr_CH/stocks.lang
 create mode 100644 htdocs/langs/fr_CI/compta.lang
 create mode 100644 htdocs/langs/fr_CI/intracommreport.lang
 create mode 100644 htdocs/langs/fr_CI/products.lang
 delete mode 100644 htdocs/langs/fr_CI/stocks.lang
 create mode 100644 htdocs/langs/fr_CM/compta.lang
 create mode 100644 htdocs/langs/fr_CM/intracommreport.lang
 create mode 100644 htdocs/langs/fr_CM/products.lang
 delete mode 100644 htdocs/langs/fr_CM/stocks.lang
 create mode 100644 htdocs/langs/fr_FR/intracommreport.lang
 create mode 100644 htdocs/langs/fr_GA/boxes.lang
 create mode 100644 htdocs/langs/fr_GA/commercial.lang
 create mode 100644 htdocs/langs/fr_GA/companies.lang
 create mode 100644 htdocs/langs/fr_GA/compta.lang
 create mode 100644 htdocs/langs/fr_GA/hrm.lang
 create mode 100644 htdocs/langs/fr_GA/intracommreport.lang
 create mode 100644 htdocs/langs/fr_GA/products.lang
 delete mode 100644 htdocs/langs/fr_GA/stocks.lang
 create mode 100644 htdocs/langs/gl_ES/intracommreport.lang
 create mode 100644 htdocs/langs/he_IL/intracommreport.lang
 create mode 100644 htdocs/langs/hi_IN/intracommreport.lang
 create mode 100644 htdocs/langs/hr_HR/intracommreport.lang
 create mode 100644 htdocs/langs/hu_HU/intracommreport.lang
 create mode 100644 htdocs/langs/id_ID/intracommreport.lang
 create mode 100644 htdocs/langs/is_IS/intracommreport.lang
 create mode 100644 htdocs/langs/it_CH/compta.lang
 create mode 100644 htdocs/langs/it_CH/products.lang
 create mode 100644 htdocs/langs/it_IT/intracommreport.lang
 create mode 100644 htdocs/langs/ja_JP/intracommreport.lang
 create mode 100644 htdocs/langs/ka_GE/intracommreport.lang
 create mode 100644 htdocs/langs/km_KH/intracommreport.lang
 create mode 100644 htdocs/langs/kn_IN/intracommreport.lang
 create mode 100644 htdocs/langs/ko_KR/intracommreport.lang
 create mode 100644 htdocs/langs/lo_LA/intracommreport.lang
 create mode 100644 htdocs/langs/lt_LT/intracommreport.lang
 create mode 100644 htdocs/langs/lv_LV/intracommreport.lang
 create mode 100644 htdocs/langs/mk_MK/intracommreport.lang
 create mode 100644 htdocs/langs/mn_MN/intracommreport.lang
 create mode 100644 htdocs/langs/nb_NO/intracommreport.lang
 create mode 100644 htdocs/langs/ne_NP/intracommreport.lang
 create mode 100644 htdocs/langs/nl_BE/intracommreport.lang
 create mode 100644 htdocs/langs/nl_NL/intracommreport.lang
 create mode 100644 htdocs/langs/pl_PL/intracommreport.lang
 create mode 100644 htdocs/langs/pt_PT/intracommreport.lang
 create mode 100644 htdocs/langs/ro_RO/intracommreport.lang
 create mode 100644 htdocs/langs/ru_RU/intracommreport.lang
 create mode 100644 htdocs/langs/ru_UA/products.lang
 create mode 100644 htdocs/langs/sk_SK/intracommreport.lang
 create mode 100644 htdocs/langs/sl_SI/intracommreport.lang
 create mode 100644 htdocs/langs/sq_AL/intracommreport.lang
 create mode 100644 htdocs/langs/sr_RS/intracommreport.lang
 create mode 100644 htdocs/langs/sv_SE/intracommreport.lang
 create mode 100644 htdocs/langs/sw_SW/intracommreport.lang
 create mode 100644 htdocs/langs/th_TH/intracommreport.lang
 create mode 100644 htdocs/langs/tr_TR/intracommreport.lang
 create mode 100644 htdocs/langs/uk_UA/intracommreport.lang
 create mode 100644 htdocs/langs/uz_UZ/intracommreport.lang
 create mode 100644 htdocs/langs/vi_VN/intracommreport.lang
 create mode 100644 htdocs/langs/zh_CN/intracommreport.lang
 create mode 100644 htdocs/langs/zh_HK/intracommreport.lang
 create mode 100644 htdocs/langs/zh_TW/intracommreport.lang
 create mode 100644 htdocs/multicurrency/multicurrency_rate.php
 create mode 100644 htdocs/product/stats/bom.php
 rename htdocs/recruitment/{recruitmentjobposition_candidature.php => recruitmentjobposition_applications.php} (79%)
 create mode 100644 htdocs/theme/common/flags/unknown.png
 create mode 100644 htdocs/theme/eldy/img/object_intracommreport.png
 create mode 100644 htdocs/theme/md/img/object_intracommreport.png
 delete mode 100644 htdocs/variants/generator.php
 create mode 100644 nightwatch.conf.js
 create mode 100644 package.json
 delete mode 100755 scripts/company/export-contacts-xls-example.php
 create mode 100755 scripts/emailings/reset-invalid-emails.php
 create mode 100644 test/acceptance/README.md
 create mode 100644 test/acceptance/features/Api/apiAddUsers.feature
 create mode 100644 test/acceptance/features/Api/apiListUsers.feature
 create mode 100644 test/acceptance/features/WebUI/addUsers.feature
 create mode 100644 test/acceptance/features/WebUI/listUsers.feature
 create mode 100644 test/acceptance/features/WebUI/login.feature
 create mode 100644 test/acceptance/features/WebUI/logout.feature
 create mode 100644 test/acceptance/index.js
 create mode 100644 test/acceptance/pageObjects/addUsersPage.js
 create mode 100644 test/acceptance/pageObjects/homePage.js
 create mode 100644 test/acceptance/pageObjects/listUsersPage.js
 create mode 100644 test/acceptance/pageObjects/loginPage.js
 create mode 100644 test/acceptance/pageObjects/logoutPage.js
 create mode 100644 test/acceptance/setup.js
 create mode 100644 test/acceptance/stepDefinitions/addUsersContext.js
 create mode 100644 test/acceptance/stepDefinitions/listUsersContext.js
 create mode 100644 test/acceptance/stepDefinitions/loginContext.js
 create mode 100644 test/acceptance/stepDefinitions/logoutContext.js
 rename test/{ => other}/test_serialize.php (100%)
 create mode 100644 test/phpunit/StripeTest.php

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index fed73d7b002..b57ceda24aa 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -4,13 +4,14 @@ How to contribute to Dolibarr
 Bug reports and feature requests
 --------------------------------
 
-<a name="not-a-support-forum"></a>*Note*: Issues are not a support forum. If you need help using the software, please use [the forums](https://www.dolibarr.org/forum).
+<a name="not-a-support-forum"></a>*Note*: Issues are not a support forum. If you need help using the software, please use [the forums](https://www.dolibarr.org/forum.php). Forums exist in different languages.
 
-Issues are managed on [GitHub](https://github.com/Dolibarr/dolibarr/issues).
+Issues are managed on [GitHub](https://github.com/Dolibarr/dolibarr/issues). 
+Default language here is english. So please prepare your contributions in english.
 
 1. Please [use the search engine](https://help.github.com/articles/searching-issues) to check if nobody's already reported your problem.
 2. [Create an issue](https://help.github.com/articles/creating-an-issue). Choose an appropriate title. Prepend appropriately with Bug or Feature Request.
-4. Tell us the version you are using!
+4. Tell us the version you are using!   (look at  /htdocs/admin/system/dolibarr.php?  and check if you are using the latest version) 
 3. Write a report with as much detail as possible (Use [screenshots](https://help.github.com/articles/issue-attachments) or even screencasts and provide logging and debugging informations whenever possible).
 
 
@@ -26,7 +27,8 @@ Issues are managed on [GitHub](https://github.com/Dolibarr/dolibarr/issues).
 4. Commit and push your changes.
 5. [Make a pull request](https://help.github.com/articles/creating-a-pull-request).
 
-### <a name="branches"></a>Branches
+<span id="branches" name="branches"></span>
+### Branches
 
 Unless you're fixing a bug, all pull requests should be made against the *develop* branch.
 
@@ -56,7 +58,7 @@ You can add it to your git configuration using:
 git config --local commit.template .gitmessage
 ```
 
-where 
+where
 
 #### Keyword
 In uppercase if you want to have the log comment appears into the generated ChangeLog file.
@@ -101,7 +103,7 @@ Long description (Can span accross multiple lines).
 </pre>
 
 ### Pull Requests
-Pull Request (PR) process is the process to submit a change (enhancement, bug fix, ...) into the code of the project. There is some rules to know and 
+Pull Request (PR) process is the process to submit a change (enhancement, bug fix, ...) into the code of the project. There is some rules to know and
 a process to follow to optimize the chance to have PRs merged efficiently...
 
 * A PR must be atomic. It means it must contains the lower possible changes for 1 need (1 bug fix or 1 new feature) without breaking usability of code. If a PR can be split into several PRs, it often means your PR is not atomic.
@@ -120,7 +122,7 @@ Once a PR has been submitted, you may need to wait for its integration. It is co
 
 If the label of PR start with "Draft" or "WIP" (Work In Progress), it will not be analyzed for merging until you change the label of PR (but it can be analyzed for discussion).
 
-If your PR has errors reported by the Continuous Integration Platform, it means your PR is not valid and nothing will be done with it. It will be kept open to allow developers to fix this, or it may be closed several month later. Don't expect anything on your PR if you have such errors, you MUST first fix the Continuous Integration error to have it taken into consideration. 
+If your PR has errors reported by the Continuous Integration Platform, it means your PR is not valid and nothing will be done with it. It will be kept open to allow developers to fix this, or it may be closed several month later. Don't expect anything on your PR if you have such errors, you MUST first fix the Continuous Integration error to have it taken into consideration.
 
 If the PR is valid, and is kept open for a long time, a tag will also be added on the PR to describe the status of your PR and why the PR is kept open. By putting your mouse on the tag, you will get a full explanation of the tag/status that explain why your PR has not been integrated yet.
 In most cases, it gives you information of things you have to do to have the PR taken into consideration (for example a change is requested, a conflict is expected to be solved, some questions were asked). If you have a yellow, red flag of purple flag, don't expect to have your PR validated. You must first provide the answer the tag ask you. The majority of open PR are waiting an action of the author of the PR.
@@ -141,7 +143,7 @@ Translations done on transifex are available in the next major release.
 
 Note: Sometimes, the source text (english) is modified. In such a case, the translation is reset. Transifex assume that if the original source
 has changed, the translation is surely no more correct so must be done again. But old translation is not lost and you can use the tab "History"
-to retreive all old translation of a source text, and restore the translation in one click with no need to retranslate it if there is no need to. 
+to retrieve all old translation of a source text, and restore the translation in one click with no need to retranslate it if there is no need to.
 
 
 ### Resources
diff --git a/.github/workflows/exakat.yml b/.github/workflows/exakat.yml
index 90ba405e061..c2f8cc12765 100644
--- a/.github/workflows/exakat.yml
+++ b/.github/workflows/exakat.yml
@@ -13,5 +13,5 @@ jobs:
     - name: Exakat
       uses: docker://exakat/exakat-ga
       with:
-        ignore_rules: 'Performances/PrePostIncrement,Functions/WrongNumberOfArguments,Variables/UndefinedVariable,Classes/DontUnsetProperties,Classes/NonPpp,Classes/StaticMethodsCalledFromObject,Classes/UseClassOperator,Functions/UsesDefaultArguments,Php/NoClassInGlobal,Php/ShouldUseCoalesce,Structures/MergeIfThen,Structures/ElseIfElseif,Structures/RepeatedPrint,Structures/UselessParenthesis' 
-        ignore_dirs: '/htdocs/includes,/htdocs/build,/htdocs/dev,/htdocs/doc,/htdocs/scripts,/htdocs/test'        
\ No newline at end of file
+        ignore_rules: 'Classes/UseInstanceof,Performances/PrePostIncrement,Functions/UndefinedFunctions,Functions/WrongNumberOfArguments,Functions/WrongTypeWithCall,Variables/UndefinedVariable,Classes/DontUnsetProperties,Classes/NonPpp,Classes/StaticMethodsCalledFromObject,Classes/UseClassOperator,Functions/UsesDefaultArguments,Php/NoClassInGlobal,Php/ShouldUseCoalesce,Php/WrongTypeForNativeFunction,Structures/AddZero,Structures/DropElseAfterReturn,Structures/IfWithSameConditions,Structures/MergeIfThen,Structures/ElseIfElseif,Structures/ExitUsage,Structures/RepeatedPrint,Structures/RepeatedRegex,Structures/SameConditions,Structures/SwitchWithoutDefault,Structures/ShouldMakeTernary,Structures/UselessParenthesis,Structures/UseConstant' 
+        ignore_dirs: '/htdocs/includes,/build,/dev,/doc,/scripts,/test'        
\ No newline at end of file
diff --git a/.github/workflows/stale-issues-safe.yml b/.github/workflows/stale-issues-safe.yml
index 844b19c7a3f..1682b92a7a7 100644
--- a/.github/workflows/stale-issues-safe.yml
+++ b/.github/workflows/stale-issues-safe.yml
@@ -16,7 +16,7 @@ jobs:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-message: 'This issue is stale because it has been open 1 year with no activity. If this is a bug, please comment to confirm it is still present on latest stable version. if this is a feature request, please comment to notify the request is still relevant and not yet covered by latest stable version. This issue may be closed automatically by stale bot in 10 days (you should still be able to re-open it if required).'
         stale-label: 'Issue Stale (automatic label)'
-        exempt-labels: 'Priority High / Blocking,Priority Top Strategic,Priority Medium,Hacktoberfest,good first issue,Bug Security (CVE),Analysis of PR in progres'
+        exempt-labels: 'Priority High / Blocking,Priority Top Strategic,Priority Medium,hacktoberfest,hacktoberfest-accepted,good first issue,Bug Security (CVE),Analysis of PR in progress'
         days-before-stale: 365
         days-before-close: 10
         operations-per-run: 100
diff --git a/.gitignore b/.gitignore
index 344822f0e9e..b49fdf8dc86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,16 @@ htdocs/includes/sebastian/
 htdocs/includes/squizlabs/
 htdocs/includes/webmozart/
 htdocs/.well-known/apple-developer-merchantid-domain-association
+
+# Node Modules
+build/yarn-error.log
+build/node_modules/
+node_modules/
+
+#yarn
+yarn.lock
+
+#package-lock
+package-lock.json
+
+doc/install.lock
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 6dbf39bde26..3cffed355fa 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -17,8 +17,10 @@ filter:
         - build/*
         - dev/*
         - doc/*
-        - test/*
+        - documents/*
         - htdocs/includes/*
+        - node_modules/*
+        - test/*
     paths: 
         - htdocs/*
         - scripts/*
diff --git a/.travis.yml b/.travis.yml
index c47e1b19598..a3e35dcfdab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,6 @@
 os: linux
 dist: xenial
 #dist: bionic
-sudo: required
 
 language: php
 
@@ -32,53 +31,25 @@ addons:
     # We need pgloader for import mysql database into pgsql
     - pgloader
 
-php:
-- '5.6'
-- '7.0'
-- '7.1'
-- '7.2'
-- '7.3'
-- '7.4'
-- nightly
-
 env:
   global:
   # Set to true for very verbose output
   - DEBUG=false
-  jobs:
-  # MariaDB overrides MySQL installation so it's not possible to test both yet
-  #- DB=mariadb
-  - DB=mysql
-  - DB=postgresql
-  # See https://docs.travis-ci.com/user/languages/php/#Apache-%2B-PHP
-  #- WS=apache
-  # See https://github.com/DracoBlue/travis-ci-nginx-php-fpm-test
-  #- WS=nginx
 
 jobs:
   fast_finish: true
   allow_failures:
   - php: nightly
-  # We exclude some combinations not usefull to save Travis CPU
-  exclude:
-  - php: '7.0'
-    env: DB=mysql
-  - php: '7.1'
-    env: DB=mysql
-  - php: '7.2'
-    env: DB=mysql
-  - php: '7.3'
-    env: DB=mysql
-  - php: '7.0'
-    env: DB=postgresql
-  - php: '7.1'
-    env: DB=postgresql
-  - php: '7.2'
-    env: DB=postgresql
-  - php: '7.3'
-    env: DB=postgresql
-  - php: nightly
-    env: DB=postgresql
+  include:
+    - if: type = push
+      php: '5.6'
+      env: DB=postgresql
+    - if: type = pull_request OR type = push
+      php: '7.4'
+      env: DB=mysql
+    - if: type = push AND branch = develop
+      php: nightly 
+      env: DB=mysql
 
 notifications:
   email:
@@ -111,33 +82,48 @@ install:
   echo "Updating Composer"
   rm $TRAVIS_BUILD_DIR/composer.json
   rm $TRAVIS_BUILD_DIR/composer.lock
+  composer -V
   composer self-update
-  # To have composer making parallel downloads
-  composer global require hirak/prestissimo
   composer -n init
   composer -n config vendor-dir htdocs/includes
+  composer -n config -g vendor-dir htdocs/includes
   echo
 
 - |
   echo "Installing Composer dependencies - PHP Unit, Parallel Lint, PHP CodeSniffer - for $TRAVIS_PHP_VERSION"
-  if [ "$TRAVIS_PHP_VERSION" = '5.6' ] || [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] \
-     [ "$TRAVIS_PHP_VERSION" = '7.2' ] || [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ]; then
+  if [ "$TRAVIS_PHP_VERSION" = '5.6' ]; then
     composer -n require phpunit/phpunit ^5 \
-                        php-parallel-lint/php-parallel-lint ^0 \
+                        php-parallel-lint/php-parallel-lint ^1 \
                         php-parallel-lint/php-console-highlighter ^0 \
                         squizlabs/php_codesniffer ^3
   fi
+  if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = '7.2' ]; then
+    composer -n require phpunit/phpunit ^6 \
+                        php-parallel-lint/php-parallel-lint ^1 \
+                        php-parallel-lint/php-console-highlighter ^0 \
+                        squizlabs/php_codesniffer ^3
+  fi
+  if [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ]; then
+    composer -n require phpunit/phpunit ^7 \
+                        php-parallel-lint/php-parallel-lint ^1.2 \
+                        php-parallel-lint/php-console-highlighter ^0 \
+                        squizlabs/php_codesniffer ^3
+  fi
+  # phpunit 9 is required for php 8
   if [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
-      composer -n require --ignore-platform-reqs phpunit/phpunit ^5 \
-                                                 php-parallel-lint/php-parallel-lint ^1 \
+      composer -n require --ignore-platform-reqs phpunit/phpunit ^7 \
+                                                 php-parallel-lint/php-parallel-lint ^1.2 \
                                                  php-parallel-lint/php-console-highlighter ^0 \
                                                  squizlabs/php_codesniffer ^3
-    fi
+  fi
   echo
 
 - |
   echo "Adding path of binaries tools installed by composer to the PATH"
   export PATH="$TRAVIS_BUILD_DIR/htdocs/includes/bin:$PATH"
+  echo $PATH
+  ls $TRAVIS_BUILD_DIR/vendor
+  ls $TRAVIS_BUILD_DIR/htdocs/includes/bin
   echo
 
 
@@ -164,15 +150,20 @@ before_script:
 
   - |
     echo "Versions information"
+    echo
     # Check PHP
     echo "PHP version"
     php -i | head -
-    # Check PHP CodeSniffer installation
+    # Check Parallel-lint version
+    echo "Parallel-lint version"
+    which parallel-lint
+    parallel-lint -V
+    # Check PHP CodeSniffer version
     echo "PHPCS version"
     which phpcs
     phpcs --version | head -
     phpcs -i | head -
-    # Check PHPUnit installation
+    # Check PHPUnit version
     echo "PHPUnit version"
     which phpunit
     phpunit --version | head -
@@ -278,7 +269,7 @@ script:
   set -e
   #parallel-lint --exclude htdocs/includes --blame .
   parallel-lint --exclude dev/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
-  	--exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/phpexcel --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian \
+  	--exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian \
   	--exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/php-parallel-lint --exclude htdocs/includes/symfony \
   	--exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/maximebf \
   	--exclude htdocs/includes/phpunit/ --exclude htdocs/includes/tecnickcom/tcpdf/include/barcodes --exclude htdocs/includes/webmozart --blame .
@@ -286,12 +277,13 @@ script:
   echo
 
 - |
-  echo "Checking coding style (excluding Pull Requests builds)"
+  echo "Checking coding style (excluding Pull Requests builds to not overload travis, excluding also some jobs to avoid duplicate tests)"
   # Ensure we catch errors
   set -e
   # Exclusions are defined in the ruleset.xml file
-  #phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .
-  if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .; fi
+  if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_PHP_VERSION" = "7.4" ] && [ "$DB" = "mysql" ]; then
+    phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .;
+  fi
   set +e
   echo
 
@@ -408,7 +400,7 @@ script:
   php step5.php 12.0.0 13.0.0 > $TRAVIS_BUILD_DIR/upgrade12001300-3.log
 
   # Enable modules not enabled into original dump
-  php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKETSUP,MAIN_MODULE_ACCOUNTING > $TRAVIS_BUILD_DIR/enablemodule.log
+  php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKET,MAIN_MODULE_ACCOUNTING,MAIN_MODULE_MRP,MAIN_MODULE_RECRUITMENT > $TRAVIS_BUILD_DIR/enablemodule.log
   echo $?
   cd -
   set +e
@@ -427,7 +419,7 @@ script:
 
 after_script:
 - |
-  echo "After script - Output lines of dolibarr.log"
+  echo "After script - Output last lines of dolibarr.log"
   ls $TRAVIS_BUILD_DIR/documents
   #cat $TRAVIS_BUILD_DIR/documents/dolibarr.log
   sudo tail -n 50 $TRAVIS_BUILD_DIR/documents/dolibarr.log
diff --git a/.tx/config b/.tx/config
index 696ff858394..b98bf7828f2 100644
--- a/.tx/config
+++ b/.tx/config
@@ -164,6 +164,12 @@ source_file = htdocs/langs/en_US/hrm.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.intracommreport]
+file_filter = htdocs/langs/<lang>/intracommreport.lang
+source_file = htdocs/langs/en_US/intracommreport.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.install]
 file_filter = htdocs/langs/<lang>/install.lang
 source_file = htdocs/langs/en_US/install.lang
diff --git a/COPYRIGHT b/COPYRIGHT
index d8cefedcd65..5eab2669ce9 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -21,8 +21,8 @@ Mobiledetect           2.8.34        MIT License                 Yes
 NuSoap                 0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
 PEAR Mail_MIME         1.8.9         BSD                         Yes             NuSoap dependency
 ParseDown              1.6           MIT License                 Yes             Markdown parser
+PCLZip                 2.8.4         LGPL-3+                     Yes             Library to zip/unzip files             
 PHPDebugBar            1.15.1        MIT License	             Yes             Used only by the module "debugbar" for developers
-PHPExcel               1.8.1         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
 PHPSpreadSheet         ?             LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
 php-iban               1.4.7         LGPL-3+                     Yes             Parse and validate IBAN (and IIBAN) bank account information in PHP
 PHPoAuthLib            0.8.2         MIT License                 Yes             Library to provide oauth1 and oauth2 to different service
@@ -38,7 +38,7 @@ TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes
 
 JS libraries:
 Ace                    1.4.8         BSD                         Yes             JS library to get code syntaxique coloration in a textarea.
-ChartJS				   2.9.3         MIT License                 Yes             JS library for graph
+ChartJS				   2.9.4         MIT License                 Yes             JS library for graph
 jQuery                 3.5.1         MIT License                 Yes             JS library
 jQuery UI              1.12.1        GPL and MIT License         Yes             JS library plugin UI
 jQuery select2         4.0.13         GPL and Apache License      Yes             JS library plugin for sexier multiselect. Warning: 4.0.6+ create troubles without patching css
diff --git a/ChangeLog b/ChangeLog
index 62f28b9bd6e..82f82c0b051 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,26 +4,347 @@ English Dolibarr ChangeLog
 
 
 ***** ChangeLog for 13.0.0 compared to 12.0.0 *****
+
 For users:
+----------
 NEW: Add module "Credit transfer SEPA" to manage payment of vendors using bank credit transfer SEPA files.
 NEW: Module Reception (for a more accurate management of your receptions) moved from experimental to stable.
+NEW: Module Recruitment to manage Job position and applications.
+NEW: Several security issues after a private bug bounty campaign. 
+NEW: Accountancy - add chart of sub accounts
+NEW: Accountancy - add options to disable binding on sales, purchases & expense reports independently of the modules
+NEW: Accountancy balance - add a menu entry to show subtotal by group
+NEW: Accountancy - change menu disposition
+NEW: Accountancy - on transfers, select the periodicity by default
+NEW: Accountancy - Add export for Gestinum (v3 & v5)
+NEW: new currency rate editor
+NEW: add a widget to show the customers with outstanding limits reached
+NEW: add 2 rules for emailcollector: Message send/not sent from Dolibarr
+NEW: add a counter of number of words for pages in website module
+NEW: add alert before changing thirdparty in TakePOS
+NEW: add a page to list Stock at a given date in the past
+NEW: add a start date to begin binding in accountancy
+NEW: add a statistics page to list popularity of products on invoices
+NEW: add calendar selection for agenda view
+NEW: Support documents generation for ticket edition (PDF or ODT)
+NEW: add column payment term into list of supplier invoices
+NEW: add column quantity in product margin page
+NEW: add column vat rate in page to define accounting account on product/service
+NEW: add costprice in fields of products list
+NEW: add an import profile for CUSTOMER ORDER, PO, PROPOSAL MODULE, SUPPLIER INVOICE
+NEW: add employee link in expense report binding page
+NEW: add EORI No. as ProfID5
+NEW: add export for various payments
+NEW: add Extrafields labels and values in mail on create ticket
+NEW: add Extrafields support on ECM module
+NEW: add filter rules "is answer" and "is not answer" in email collector
+NEW: add focus when editing on product/stock/product.php Close #14548
+NEW: add free text on each terminal of cash desk
+NEW: add global search for customer payments and vendor payments
+NEW: add global search for miscellaneous payments
+NEW: add helper function for table headers with numbers
+NEW: add link to edit property from the search result of website pages
+NEW: add link to reset qty on supplier dispatch page
+NEW: add MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER const to remove header stored by email collector
+NEW: add Manufacturing Orders attached files into the automatic ECM view
+NEW: add margin info in invoice list
+NEW: add mass action to set category on a list of website pages
+NEW: add mass deletion for events
+NEW: add mass deletion for draft invoices
+NEW: add more filters on monthly statement list
+NEW: add option TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT
+NEW: add option to define a default warehouse at user level
+NEW: add option to include products without alert in replenish
+NEW: add order by lastname and firstname by default in get sales representatives
+NEW: add param to not show links when output tags
+NEW: add PDF document templates for warehouses (list of stock)
+NEW: add a prospect status for the contact with managment of custom icon
+NEW: add public note on products ; this also partially fix the #14342
+NEW: add quick dropdown menu in top right menu (experimental with MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)
+NEW: add region in export companies and contacts
+NEW: add rights on margin info on invoice list
+NEW: add search param for close date on order list
+NEW: add show preview for mail attachement on form mail
+NEW: add State/Province origin for products
+NEW: add the workflow interaction close intervention on closing ticket
+NEW: add third order printer to TakePOS
+NEW: add tracking number in list and search_all items
+NEW: add vcard for adherent and user
+NEW: add week number for month view in agenda
+NEW: Algeria data (VAT and forme_juridique)
+NEW: allow click on all header numbers on commerce area
+NEW: allow to reopen interventions (green button)
+NEW: allow zero quantity on supplier/vendor order line
+NEW: appearance tab in TakePOS with more visual parameters
+NEW: better currency rate editor
+NEW: can build vendor invoice from vendor orders
+NEW: can change a product in lines of a recurring invoice or contract
+NEW: can change size of logo on PDF documents
+NEW: can change VAT rate of all lines of a draft object in one step
+NEW: can define date range of validity of a login during creation
+NEW: can disable, from edit page, the whole web site
+NEW: can edit and set sales representatives directly on thirdparty card
+NEW: can edit the list of sending email profiles
+NEW: can enable/disable users in bulk actions
+NEW: can filter on accounting system ref in export of chart of account
+NEW: can filter on container type, language and tags in the list of web pages
+NEW: can hide eatby, sellby dates with option PRODUCT_DISABLE_SELLBY and PRODUCT_DISABLE_EATBY
+NEW: can import proposals, sales orders, supplier invoices
+NEW: can set a dedicated SMTP config for sending email from public ticket interface
+NEW: can set tags/categories to website pages
+NEW: can set type of price without tax per default for new sale price creation
+NEW: can use desired stock of a given warehouse for replenishment
+NEW: change thirdparty with barcode scan in TakePOS
+NEW: common behavior for monthly leave list view
+NEW: convert all subscription in datetime
+NEW: can create a thirdparty customer from TakePOS
+NEW: date shipment from order accepts hours
+NEW: price level compatibility for variant
+NEW: delayed payment in TakePOS
+NEW: display date range if exist in TakePOS
+NEW: display resiliate status in TakePOS for member
+NEW: display stat for BOM on "object referent"/linked Object product tab
+NEW: Email configuration - allow auto signed certificate when smtp ssl activated
+NEW: enable free emails input with select2
+NEW: Events in agenda for contact
+NEW: filter on progress column in task list
+NEW: filter product list by country and/or state/province
+NEW: format tickets sent by mail in public interface
+NEW: form to add customer/supplier into categories
+NEW: Framework is ready for CSRF token protection on explicit GET URLs
+NEW: helper functions for export with phpspreadsheet
+NEW: hide closed contract lines
+NEW: hide label in PDF for variants
+NEW: if specific help page is available, we change color of icon
+NEW: include the tag editor of page as a popup into website editor
+NEW: introduce constant FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM
+NEW: introducing new modal boxes in TakePOS
+NEW: keep TakePOS terminal when login/logout
+NEW: link on balance to the ledger
+NEW: MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER const in email collector
+NEW: manage errors on update extra fields in ticket card
+NEW: mass-actions for the event list view
+NEW: Module Intracomm report
+NEW: more filter for "View change logs"
+NEW: multicurrency total in TakePOS
+NEW: multiselect type and date to date filter
+NEW: Nature of product is now a dictionay
+NEW: new line template: hidden conf to fill service dates from the last service line
+NEW: PDF model storm for delivery
+NEW: possibilty to group payments by mode and show their subtotal
+NEW: Print payment method and change in TakePOS
+NEW: Priority and transparency from external calendar events
+NEW: Products Import/Export 'default warehouse' and 'use batch number' fields
+NEW: Purchase price table: added filterable table columns
+NEW: rate editor for multicurrency
+NEW: ref_ext field for Commande lines, order lines, Attributes and Combinations, Invoice lines, payments, order lines
+NEW: remove new lines in mail on add ticket message
+NEW: restrict thirdparty to customer in TakePOS
+NEW: Rule "email to" accept wildcard *
+NEW: Save filter of the project homepage
+NEW: select-able columns on customer and supplier invoice paymnet list
+NEW: select-able columns on miscellaneous payments + more data columns
+NEW: select-able columns on social taxes list
+NEW: send context and remove new lines on create ticket
+NEW: show available stock in TakePOS
+NEW: show category filter on lists only when user have rights to read categories
+NEW: show header number and make it clickable in warehouse area, payment area, shipment area
+NEW: show image of user in the combo select of users
+NEW: show label on batch card
+NEW: show links for select and multi-select in category extra field
+NEW: show module and permission ids on user/group rights (only admin)
+NEW: show place from events on import calender
+NEW: show references in contract form on interventions
+NEW: show tags and status in search list of website pages
+NEW: show user on external calender events (when found)
+NEW: subject title with company name instead of application title in ticket message
+NEW: Support for Samba4 AD
+NEW: TakePOS connector compatibility with RECEIPT PRINTERS module
+NEW: TakePOS Gift Receipt
+NEW: TakePOS Multicurrency compatibility
+NEW: the global header of a website can also have dynamic content
+NEW: Third-Party Import new fields: mother company,outstanding debt limit,bank account,incoterms
+NEW: Thirdparty module : box on customer/supplier tab for invoice outsantding amount late
+NEW: ticket classification on create from email collector
+NEW: Ticket message notifications when edited from public interface
+NEW: translate classification labels in ticket
+NEW: VAT rate for Angola #15606
+NEW: VAT and juridical status for Algeria
+NEW: VAT report - Invert constant to show by default zero VAT in reports
+NEW: website page fields selection
+NEW: Weighing Scale compatibility with TakePOS connector
+NEW: when creating a user from a member linked to a thirdparty, you can choose to create it as external or internal user
+NEW: add clone button on miscellaneous payment
+NEW: #15065 Add option to put the product label in bold in the PDF templates if configured
+NEW: Add option "If the feature to manage kits of module Stock is used, show details of subproducts of a kit on PDF."
 
 
+For developers:
+---------------
+NEW: add __MEMBER_TYPE__ substitution key
+NEW: add __TYPE__ substitution key
+NEW: add function dolButtonToOpenUrlInDialogPopup() to be able to open page into a popup
+NEW: show line number on intervention card (via MAIN_VIEW_LINE_NUMBER)
+NEW: Add some fields to link website page to an other object
+NEW: fill ECM src object fields in dol_add_file_process
+NEW: conf to allow to show the full tree in warehouse popup
+NEW: can use THEME_DARKMODEENABLED=2 for a preview of theme in dark mode
+NEW: can force the antivirus from conf file or autoprepend ini setup
+NEW: can add event to log into blockedlog module with a constant
+NEW: add property cssview when declaring fields of an object
+NEW: Can use dynamic code into the 'enabled' property of DAO fields
+NEW: allow to edit "demand reason" field though API
+NEW: fetch contact by email with REST API
+NEW: field ref_ext in llx_commandedet
+NEW: fields ref_ext for Attributes and Combinations
+NEW: get state by REST API
+NEW: get state dictionnary by REST API
+NEW: improve Product API for variant products
+NEW: OAuth SCOPE for Admin SDK
+NEW: retrieve discount from invoice from API
+NEW: standardizes API thirdparties by email like other object
+NEW: Thirdparty REST API: endpoint to set price level
+NEW: use new category API for project list view
+NEW: Triggers Attributes and Attributes values
+NEW: added incoterms data into the substitution array
+NEW: add send context for ticket
+NEW: add a message in error_log after detection of SQL or script injection
+NEW: add validation of MX domain for emails
+NEW: calculate the virtual stock in transverse mode ( not on getEntity('commande'), ... but on getEntity('stock') )
+NEW: Graphics can be horizontal bars
+
+APIs
+NEW: API get contacts list of a given order
+NEW: API endpoint getContacts and Clean results
+NEW: API can update a payment
+NEW: API get member by thirdparty
+NEW: API get thirdparty by barcode
+NEW: API get users by email / login
+
+HOOKs
+NEW: Hook on propal card
+NEW: add hooks on newpayment page to allow external payment modules
+NEW: add hooks on stats pages
+NEW: add formConfirm hook on product page
+NEW: add two hooks printFieldListFrom and printFieldSearchParam
+NEW: add hook "loginCheckSecurityAccess"
+
 WARNING:
 
 Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
-* Properties ->contactid has been renamed into ->contact_id
-* Property $paiementid in API 'api_supplier_invoices.php' has been renamed into into $payment_mode_id (english)
-* The deprecated subsitution key __SIGNATURE__ has been removed. Replace with __USER_SIGNATURE__ if you used the old syntax in
-  your email templates. 
-* The hidden option HOLIDAY_MORE_PUBLIC_HOLIDAYS has been removed. Use instead the dictionary table if you need to define custom
-  days of holiday.
+* The object "livraison" has been renamed into "delivery" (directory, class, keys, methods with livraison in name ...).
+* All properties ->contactid have been renamed into ->contact_id
+* All properties ->titre have been renamed into ->title
+* Property $paiementid in API 'api_supplier_invoices.php' has been renamed into into $payment_mode_id
 * Property 'num_paiement' has been renamed 'num_payment' everywhere for better code consistency.
+* The deprecated subsitution key __SIGNATURE__ has been removed. Use __USER_SIGNATURE__ if you used the old syntax in your email templates.
+* The hidden option HOLIDAY_MORE_PUBLIC_HOLIDAYS has been removed. Use instead the dictionary table if you need to define custom days of holiday.
 * If you build a class that implement CommonObject to use the incoterm properties or methods (->fk_incoterm, ->label_incoterm, ->location_incoterm),
-  you must now also include declaration of the Trait 'CommonIncoterm' in your class. All incoterm functions were moved into this Trait. 
+  you must now also include declaration of the Trait 'CommonIncoterm' in your class. All incoterm functions were moved into this Trait.
 * The GETPOST(..., 'alpha') has now the same behaviour than GETPOST(..., 'alphanohtml') so no html will be allowed. Use GETPOST(..., 'restricthtml') to accept HTML.
-* If you have links in your code with '&action=delete' as a parameter, you must also add '&token='.newToken() as another parameter to avoid CSRF protection errors.
- 
+* If you have links in your code with '&action=add', '&action=update', '&action=delete' as a parameter, you must also add '&token='.newToken() as another parameter to avoid CSRF protection errors.
+* The API addPayment for api_invoice has evolved to accept amount into a foreign currency. You must provide array(amount=>X,mutlicurrency_ammount=>Y) instead of simple amount.
+* The method select_thirdparty(), deprecated since 3.8, into html.form.class.php has been removed.
+* Depreciate all methods with name ->valide(). Use instead methods ->validate().
+* Function showStripePaymentUrl, getStripePaymentUrl, showPaypalPaymentUrl and getPaypalPaymentUrl has been removed. The generic one showOnlinePaymentUrl and getOnlinePaymentUrl are always used.
+* Context for hook showSocinfoOnPrint has been moved from "showsocinfoonprint" to "main"
+* Library htdocs/includes/phpoffice/phpexcel as been removed (replaced with htdocs/includes/phpoffice/PhpSpreadsheet)
+
+
+***** ChangeLog for 12.0.4 compared to 12.0.3 *****
+FIX: make formConfirm an addreplace-type hook
+FIX: regex to remove 'action' parameter: taking feedback from PR#15213 into account
+FIX: remove 'action' parameter from redirect URL when reordering lines on a document
+FIX: error when displaying lines on order after adding a line if both MAIN_MULTILANGS and MAIN_DISABLE_PDF_AUTOUPDATE are activated
+FIX: on survey creation, entity is always set to 1 ⇒ set it to $conf->entity
+FIX: set entity to $conf->entity (instead of 1 by default) when creating a survey; otherwise the survey cannot be listed from the entity it was created on unless it is the main entity
+FIX: the stringent XSS protection provided by 'alphanohtml' causes problems with some clients who used basic tags (bold, italic, underline) in product labels. Using 'restricthtml' instead could be a good compromise.
+FIX: third party of object is not always fetched when initiating the e-mail presend action (e.g. from an order)
+FIX: when the cronjob 'params' field is empty, the cron method is called with one empty string param instead of no params at all
+FIX: XSS protection too stringent -> replace 'alphanohtml' with 'restricthtml'
+FIX: #13067 including opening balance in calculation of displayed balance
+FIX: #14326
+FIX: #14649
+FIX: #14901
+FIX: #14927 Change ContratLigne property type to product_type
+FIX: #14979
+FIX: #15074
+FIX: #15111 Fix special characters output in PDF
+FIX: #15161 MO translation conflict
+FIX: #15163
+FIX: #15199
+FIX: #15208
+FIX: #15303
+FIX: #15365 export of extrafields for user and resources
+FIX: #15374 : "New" doesn't clear total amounts
+FIX: #15501
+FIX: #15572
+FIX: #15590
+FIX: #15618
+FIX: supplier proposals as linked objects of events are not correctly fetched
+FIX: when users create an event from a supplier proposal, the "linked objects" section says "Deleted"
+FIX: Accountancy - Some ajustments on length of the account (general & auxiliary)
+FIX: admin conf selected
+FIX: also check if there is a method $object->fetch_thirdparty() before calling it
+FIX: autofocus on first setup
+FIX: Bad rigths to send contract
+FIX: Better error message with IMAP when connection fails
+FIX: Can create user but not update user with activedirectory
+FIX: Can receipt of a product that required lot after disabling stock and
+FIX: Can't create shipment for virtual product. Add
+FIX: cant empty action comm desc
+FIX: CA report by product/service : subcategory filter
+FIX: Clean orphan records in llx_ecm_files into repair script.
+FIX: default accountancy values and posted values
+FIX: Deletion of expensereport + other generated object not complete.
+FIX: disabled users must not be available in sales representative list on societe edit mode
+FIX: Dol print error : conf usage thirdparty propagate extrafields to
+FIX: Don't display inactive users in birthday box and company card
+FIX: empty value is needed on filter list
+FIX: enable HTML in product labels depending on conf MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML
+FIX: error 500 on cash closure
+FIX: excess comma
+FIX: Export FEC - Remove line at zero
+FIX: extrafield required error after submit
+FIX: filter on project list
+FIX: force payment mode to withdraw
+FIX: formating of prices with foreign languages
+FIX: handling $heightforinfotot when he's superior to a page height
+FIX: if no PDF default model in admin for expense report, do not create a PDF
+FIX: invoice payment terms edition: error management
+FIX: list of fields in list of recurring invoices was empty
+FIX: load default linked options for linked sellist extra fields
+FIX: Loan - Return on list when you cancel create form or delete a loan
+FIX: Missing lang trans
+FIX: no empty value in required extrafield
+FIX: Param joinfiles not sanitized
+FIX: Payment by BankTransfer
+FIX: pdf_getlinetotalwithtax must show total incl tax
+FIX: Problem on supplier payment card
+FIX: product auto volume calculation
+FIX: product customer prices: missing triggers in CRUD class
+FIX: Request on purchase orders in timeout even on very small databases
+FIX: set paid on total discount of a product in cash desk
+FIX: several warning with the barcode use in ODT templates
+FIX: SHIP MODE install v12 bug insert
+FIX: stripe for connect mode
+FIX: subcat filter
+FIX: supplier invoice: automatically calculate payment term when modifying payment condition
+FIX: SUPPLIER PROPOSAL v12 bug add
+FIX: table making extrafield input too small on advance target mailing
+FIX: table making extrafield too small advtagertmailing
+FIX: Unable to edit extrafields in expense report
+FIX: update margins rates on object line edit
+FIX: uses price2numjs
+FIX: various payments: bad data handling for subledger account + useless db commit/rollback
+FIX: virtual products: displayed value is by unit
+FIX: virtual products: supplier discount was not applied in component list
+FIX: warning for purchase order delivery late.
+FIX: Warning on late purchase order delivery
+FIX: WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING must not consider services while STOCK_SUPPORTS_SERVICES is empty
+FIX: wrong tab
+FIX: Yogosha report 4425 (backport)
+FIX: Yogosha report 4434 (backport)
 
 ***** ChangeLog for 12.0.3 compared to 12.0.2 *****
 FIX: 10.0 - when the mime file name is different from the filesystem name, the attachment name should be the mime filename
@@ -51,7 +372,7 @@ FIX: Look and feel v12: First tab must be name of object
 FIX: missing entity check
 FIX: missing param for hook
 FIX: Missing transaction on PO actions
-FIX: MySql Strict mode
+FIX: MySQL Strict mode
 FIX: param entity in html form file
 FIX: Problems on FEC format
 FIX: round stock value on product list
@@ -70,6 +391,7 @@ FIX: Visualization rights correction on last modified contacts box
 FIX: Wrong redirection
 FIX: Yogosha report 4425 (backport)
 
+
 ***** ChangeLog for 12.0.2 compared to 12.0.1 *****
 FIX: computation of the bottom margin of <body> returns NaN because body is not loaded yet
 FIX: DebugBar hides content at page bottom
@@ -158,8 +480,8 @@ FIX: SQL Problem in customer invoice list
 FIX: SQL Problem in social contribution list
 FIX: SQL Problem in supplier invoice list
 FIX: SQL syntax error when editing extrafields
-FIX: Sql type
-FIX: takepos 12 hook
+FIX: SQL type
+FIX: TakePOS 12 hook
 FIX: Update form erased extrafields that were hidden
 FIX: Update of extrafields date
 FIX: Update of extrafiels on draft object
@@ -173,7 +495,7 @@ For users:
 
 NEW: Module MO (Manufacturing Order) is available as stable module.
 NEW: Receipt printer module moved from 'development' to 'experimental'
-NEW: Add option MAIN_VIEW_LINE_NUMBER_IN_LIST for some lists.
+NEW: add option MAIN_VIEW_LINE_NUMBER_IN_LIST for some lists
 NEW: add numbering module for TakePOS module
 NEW: 2 new options when creating an invoice from time spent on a project : by period or by task
 NEW: Accountancy add column thirdparty on binding page
@@ -184,19 +506,19 @@ NEW: Accountancy - Add possibility to manage a short alternative label for accou
 NEW: Accountancy - General ledger - Add an option to search not reconciled lines
 NEW: Add accountancy code of thirdparty in contact and supplier export
 NEW: support webp image format
-NEW: Add checkbox "overwrite if exists" into ECM/DMS module
+NEW: add checkbox "overwrite if exists" into ECM/DMS module
 NEW: add a link to notes in members list
 NEW: add a parameter to group same products in TakePOS
 NEW: add a parameter to sort product by label in TakePOS
-NEW: Add a profil to import contact categories
-NEW: Add company extrafields into order export
+NEW: add a profil to import contact categories
+NEW: add company extrafields into order export
 NEW: add const CASHDESK_FORCE_DECREASE_STOCK to force batch decrementation
 NEW: add const TAKEPOS_NUMPAD_USE_PAYMENT_ICON to use icons on payment buttons
 NEW: add csv separator setup in module admin
 NEW: add dedicated substitutions keys for extrafields of type date and datetime
 NEW: add default warehouse for dispatch
-NEW: Add due date in feature "Export accounting documents"
-NEW: Add duration information for fichinter
+NEW: add due date in feature "Export accounting documents"
+NEW: add duration information for fichinter
 NEW: Start support of Dark theme into ELDY theme
 NEW: Add field author public alias for blog post on website module
 NEW: Add "finished" field on product list
@@ -381,28 +703,28 @@ Following changes may create regressions for some external modules, but were nec
 * Default mode for GETPOST function is now 'alphanohtml' instead of 'none'. So check when you make POST or GET requests with
   HTML content that you make a GETPOST('myparam', 'restricthtml') or GETPOST('myparam', 'none') if you really need posted content without sanitizing
   the HTML code of content (in such a case, sanitize data later)
-* Removed hidden constant MAIN_EXTRAFIELDS_IN_ONE_TD that was useless. 
-* Reference of object including a "/" are no more allowed. It is never used by default but to support setup that introduced it, the "/" will be replaced 
-  by a "_" automatically when a reference (with a custom numbering mask that use it) is generated.  
+* Removed hidden constant MAIN_EXTRAFIELDS_IN_ONE_TD that was useless.
+* Reference of object including a "/" are no more allowed. It is never used by default but to support setup that introduced it, the "/" will be replaced
+  by a "_" automatically when a reference (with a custom numbering mask that use it) is generated.
 * Library jflot (replace with chartjs) was removed.
-* Library geoip (replaced with geoip2) was removed.  
+* Library geoip (replaced with geoip2) was removed.
 * Hidden constant COMMANDE_VALID_AFTER_CLOSE_PROPAL was renamed into ORDER_VALID_AFTER_CLOSE_PROPAL.
 * Object field ref_int is deprecated and set to 'not used', method to fetch object by only ref_int is not supported anymore.
 * UserGroup class has been refactored with new architecture. Triggers of class UserGroup are now USERGROUP_CREATE, USERGROUP_MODIFY, USERGROUP_DELETE
 * A new way to navigate between pages in list is available. To use it (not mandatory), you must:
-  - replace line $page = GETPOST('page', 'int') with $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); 
+  - replace line $page = GETPOST('page', 'int') with $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
   - remove input field in form '<input type="hidden" name="page" value="'.$page.'">';'
   - add parameter $pagenavastextinput to value 1 when calling print_barre_liste()
 
 WARNING FOR DOLIWAMP USERS ONLY:
 
 Only people that installed Dolibarr using the all-in-one auto-installer for Windows called "DoliWAMP" are concerned by the following warnings:
- 
+
 * DoliWAMP auto-installer for Windows is no more available on 32 bits systems. Use standard package if you need to use such architecture.
-* It is not possible to migrate from an installation done with the old DoliWAMP auto-installer for Windows by using this new one. 
-  You must make a backup of your database, make a fresh installation using the new installer and reload your backup. 
-  Don't forget that DoliWAMP is a good solution to make a quick test of Dolibarr on your local computer but is not recommended as a production 
-  solution on a local desktop since a local desktop computer has often no backup and security policy, or not as good as on a server (when there is one). 
+* It is not possible to migrate from an installation done with the old DoliWAMP auto-installer for Windows by using this new one.
+  You must make a backup of your database, make a fresh installation using the new installer and reload your backup.
+  Don't forget that DoliWAMP is a good solution to make a quick test of Dolibarr on your local computer but is not recommended as a production
+  solution on a local desktop since a local desktop computer has often no backup and security policy, or not as good as on a server (when there is one).
   DoliWAMP remains a solution for fast test or demo purposes. Prefer using standard packages for production.
 
 
@@ -566,7 +888,7 @@ FIX: #13118
 FIX: #13124
 FIX: #13131
 FIX: #13135
-FIX: #13146 
+FIX: #13146
 FIX: #13198
 FIX: #13175
 FIX: #13182
@@ -633,7 +955,7 @@ FIX: Confusion between 'bank reconciled' and 'accounted'. Show both data.
 FIX: Count of Stripe payment mode must take test/live into account
 FIX: Creation of Stripe card from backoffice must return a clean message
 FIX: CVE-2019–17223
-FIX: CVE-2019–17223 
+FIX: CVE-2019–17223
 FIX: CVE-2020-7994
 FIX: CVE Need permission to be able to develop modules
 FIX: #13053
@@ -833,7 +1155,7 @@ NEW: #4301
 
 For Developers or integrators:
 
-NEW: Compatible with PHP 7.4 
+NEW: Compatible with PHP 7.4
 NEW: Code for extrafields uses the new array $extrafields->attributes
 NEW: Can set a filter on object linked in modulebuilder.
 NEW: Can defined a position of numbering submodules for thirdparties
@@ -900,9 +1222,9 @@ Following changes may create regressions for some external modules, but were nec
 * Removed function dol_micro_time. Use native PHP microtime instead.
 * The trigger BON_PRELEVEMENT_CREATE has been renamed into DIRECT_DEBIT_ORDER_CREATE.
 * The constant INVOICE_SHOW_POS_IN_EXPORT has been renamed into INVOICE_SHOW_POS.
-* If your logo is no more visible on the menu bar, you must upload a new logo into 'Home-Setup-Company/Organization' to have it visible again. 
-* All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed into 'labelStatus'. 
-* All properties 'labelstatusshort' and 'labelstatut_short' were renamed into 'labelStatusShort'. 
+* If your logo is no more visible on the menu bar, you must upload a new logo into 'Home-Setup-Company/Organization' to have it visible again.
+* All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed into 'labelStatus'.
+* All properties 'labelstatusshort' and 'labelstatut_short' were renamed into 'labelStatusShort'.
 * All properties 'type_libelle' were renamed into 'type_label'.
 * Renamed property of thirdparty "statut_commercial" into "status_prospect_label"
 * The jquery plugin/dependency multiselect has been removed. It was not used by Dolibarr core.
@@ -1052,11 +1374,11 @@ FIX: wrong invoice id for fetchObjetctLinked
 
 ***** ChangeLog for 10.0.3 compared to 10.0.2 *****
 IMPORTANT : This version fixes a serious bug in saving the units of weight, size, surface and volume on product card.
-The unit were not saved correctly in database making calculation on shipments wrong. 
+The unit were not saved correctly in database making calculation on shipments wrong.
 Update to this version must be done if you use them and have installed version 10.0.0, 10.0.1 or 10.0.2 and set some products after installing or upgrading to one of this version.
 Once update is done you must then edit (manually) the product that has bad unit to set the correct unit to have features restored.
 
-FIX: #11702 
+FIX: #11702
 FIX: #11861 No consistent code to manage measuring units
 FIX: #11942
 FIX: #12026
@@ -1118,7 +1440,7 @@ FIX: wrong test
 FIX: XSS
 FIX: Payment from POS ware not recorded.
 FIX: Can validate invoice with amount including tax of zero for the case of having a final invoice with
-     VAT that includes a deposit without vat. 
+     VAT that includes a deposit without vat.
 
 ***** ChangeLog for 10.0.2 compared to 10.0.1 *****
 FIX: #10460 compatibility with MariaDB 10.4
@@ -1221,14 +1543,14 @@ FIX: Wrong variable. Must be PROJECT_HIDE_UNSELECTABLES
 
 ***** ChangeLog for 10.0.1 compared to 10.0.0 *****
 FIX: #10930
-FIX: #10984 
+FIX: #10984
 FIX: reposition on "Build backup" button
 FIX: #11400
 FIX: #11412
-FIX: #11460 
+FIX: #11460
 FIX: #11463
 FIX: #11466
-FIX: #11492 
+FIX: #11492
 FIX: #11498
 FIX: #11505
 FIX: #11506
@@ -1237,7 +1559,7 @@ FIX: #11509
 FIX: #11537
 FIX: #11543
 FIX: #11553
-FIX: #11576 
+FIX: #11576
 FIX: #11584
 FIX: #11590
 FIX: accounting mode must be taken from global conf, because there's no way to choose a mode with interface
@@ -1330,14 +1652,14 @@ FIX: wrong path sociales/index.php doesnt exist anymore
 
 ***** ChangeLog for 10.0.1 compared to 10.0.0 *****
 FIX: #10930
-FIX: #10984 
+FIX: #10984
 FIX: reposition on "Build backup" button
 FIX: #11400
 FIX: #11412
-FIX: #11460 
+FIX: #11460
 FIX: #11463
 FIX: #11466
-FIX: #11492 
+FIX: #11492
 FIX: #11498
 FIX: #11505
 FIX: #11506
@@ -1346,7 +1668,7 @@ FIX: #11509
 FIX: #11537
 FIX: #11543
 FIX: #11553
-FIX: #11576 
+FIX: #11576
 FIX: #11584
 FIX: #11590
 FIX: accounting mode must be taken from global conf, because there's no way to choose a mode with interface
@@ -1515,7 +1837,7 @@ NEW: Manage account sell_intra & sell_export in page accoutancy admin default pr
 NEW: Manage loan schedule.
 NEW: Manage status of member types.
 NEW: Mass action "create bills" for validated reception
-NEW: Measuring unit are now defined into an editable dictionary. Add product size/unit into product import. 
+NEW: Measuring unit are now defined into an editable dictionary. Add product size/unit into product import.
 NEW: Template pdf 'canelle_reception' displays linked reception lines.
 NEW: Moral/physic status can be defined at member type level
 NEW: Pagination into list of time spent.
@@ -1578,7 +1900,7 @@ NEW: Enhance management of webhooks
 NEW: Generation of doc by modulebuilder can include README and CHANGELOG
 NEW: massfilesarea feature is possible for external modules
 NEW: Show list of enabled modules in dol_print_error().
-NEW: Simplification of CSS styles of default themes. 
+NEW: Simplification of CSS styles of default themes.
 NEW: Clean code of a lot of deprecated code.
 NEW: Add hidden option to set a search entry to the top
 NEW: add hidden option DISPLAY_DISCOUNTED_SUPPLIER_PRICE
@@ -1598,8 +1920,8 @@ Following changes may create regressions for some external modules, but were nec
 * The PHP extension php-intl is not mandatory and must be installed to have new features working correctly.
 * Method GetUrlTrackingStatus were renamed into getUrlTrackingStatus for consistency with naming rules.
 * API getListOfCivility has been renamed into getListOfCivilities for consistency with naming rules.
-* Deprecated function img_phone as been removed. You can use img_picto(..., 'call|call_out') instead.; 
-* Files for variables of themes were renamed from graph-color.php into theme_vars.inc.php to match naming 
+* Deprecated function img_phone as been removed. You can use img_picto(..., 'call|call_out') instead.;
+* Files for variables of themes were renamed from graph-color.php into theme_vars.inc.php to match naming
   convention of extension .inc.php for files to be included.
 * All methods set_draft() were renamed into setDraft().
 * Signatures of methods createFromClone() has been standardized. All methods requires the object User as first parameter.
@@ -1611,7 +1933,7 @@ Following changes may create regressions for some external modules, but were nec
 * Deprecated property ->fk_departement is now ->state_id everywhere.
 * Removed the method 4 of GETPOST (to get $_COOKIE). It was not used and not recommanded to use in Dolibarr.
 * Column llx_facture.facnumber change to llx_facture.ref
-* Variable $dolibarr_main_cookie_cryptkey is no more created at install (it was not used by Dolibarr). A new variable 
+* Variable $dolibarr_main_cookie_cryptkey is no more created at install (it was not used by Dolibarr). A new variable
   called $dolibarr_main_instance_unique_id is now generated at each installation. It will be used by some future features.
 
 
@@ -3383,7 +3705,7 @@ Following changes may create regression for some external modules, but were nece
   entities and to review completely the rights of the groups and the users.
 * Use getEntity('xxx') instead getEntity('xxx', 1) and use getEntity('xxx', 0) instead getEntity('xxx')
 * Some other change were done in the way we read permission of a user when module multicompany is enabled. You can
-  retreive the old behavior by adding constant MULTICOMPANY_BACKWARD_COMPATIBILITY to 1.
+  retrieve the old behavior by adding constant MULTICOMPANY_BACKWARD_COMPATIBILITY to 1.
 * The hook formObjectOptions was not implemented correctly in previous version. Sometimes, you had to return output
 content by doing a print into function, sometimes by returning content into "resprint". This has been fixed to follow
 hook specifications so you must return output into "resprint".
@@ -6129,7 +6451,7 @@ For users:
 - Fix: [Bug #958] LocalTax2 for Spain fails on Suppliers
 - Fix: [ bug #972 ] Auto completion contact field do not take account the min caract number before search
 - Fix: [ bug #971 ] html.form.class.php select_contact with autocomplete do not exclude id from exclude array
-- Fix: Expedition creation, can retreive product from other expedition
+- Fix: Expedition creation, can retrieve product from other expedition
 
 For translators:
 - Update language files.
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 584c3f04713..00000000000
--- a/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-INSTALL
--------
-
-English:     See README.md file.
-
-French:      Voir fichier README-FR.md.
diff --git a/README-FR.md b/README-FR.md
index bccb7b0143b..77bb5a3e27a 100644
--- a/README-FR.md
+++ b/README-FR.md
@@ -6,7 +6,7 @@
 Dolibarr ERP & CRM est un logiciel moderne pour gérer votre activité (société, association, auto-entrepreneurs, artisans).
 Il est simple d'utilisation et modulaire, vous permettant de n'activez que les fonctions dont vous avez besoin (contacts, fournisseurs, factures, commandes, stocks, agenda, ...).
 
-![ScreenShot](https://www.dolibarr.org/images/dolibarr_screenshot1_1920x1080.jpg)
+![ScreenShot](https://www.dolibarr.org/medias/dolibarr_screenshot1_1920x1080.jpg)
 
 ## LICENCE
 
diff --git a/README.md b/README.md
index 648d5ef003d..ad4971f50db 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
 
 ![Downloads per day](https://img.shields.io/sourceforge/dw/dolibarr.svg)
 ![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg)
+[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%205.6-8892BF.svg?style=flat-square)](https://php.net/)
+[![GitHub release](https://img.shields.io/github/v/release/Dolibarr/dolibarr)](https://github.com/Dolibarr/dolibarr)
 
 Dolibarr ERP & CRM is a modern software package that helps manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda…).
 
@@ -11,9 +13,9 @@ You can freely use, study, modify or distribute it according to its licence.
 
 You can use it as a standalone application or as a web application to access it from the Internet or a LAN.
 
-Dolibarr has a large community ready to help you, free forums and [oficially preferred partners ready to offer commercial support should you need it](https://partners.dolibarr.org)
+Dolibarr has a large community ready to help you, free forums and [officially preferred partners ready to offer commercial support should you need it](https://partners.dolibarr.org)
 
-![ScreenShot](https://www.dolibarr.org/images/dolibarr_screenshot1_1920x1080.jpg)
+![ScreenShot](https://www.dolibarr.org/medias/dolibarr_screenshot1_1920x1080.jpg)
 
 ## LICENSE
 
@@ -43,7 +45,7 @@ On GNU/Linux, first check if your distribution has already packaged Dolibarr.
 
 #### Generic install steps:
 
-- Check that your installed PHP version is supported [see PHP support](https://wiki.dolibarr.org/index.php/Versions).
+- Check that your installed PHP version is supported [see PHP support](https://wiki.dolibarr.org/index.php/Releases).
 
 - Uncompress the downloaded .zip archive to copy the "dolibarr/htdocs" directory and all its files inside your web server root or get the files directly from GitHub (recommanded if you know git as it makes it easier if you want to upgrade later):
 
@@ -69,6 +71,7 @@ On GNU/Linux, first check if your distribution has already packaged Dolibarr.
 
 - Follow the installer instructions
 
+
 ### Saas/Cloud setup
 
 If you don't have time to install it yourself, you can try some commercial 'ready to use' Cloud offers (See https://saas.dolibarr.org). However, this third solution is not free.
@@ -84,10 +87,12 @@ Dolibarr supports upgrading usually wihtout the need for any (commercial) suppor
 - At first next access, Dolibarr will redirect you to the "install/" page to follow the upgrade process.
   If an `install.lock` file exists to lock any other upgrade process, the application will ask you to remove the file manually (you should find the `install.lock` file in the directory used to store generated and uploaded documents, in most cases, it is the directory called "*documents*").
 
+
 ## WHAT'S NEW
 
 See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) file.
 
+
 ## FEATURES
 
 ### Main application/modules (all optional)
@@ -137,15 +142,18 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 ### Other general features
 
 - Localization in most major languages
+- Multi-Language Support
 - Multi-Users and groups with finely grained rights
-- Multi-currency
-- Multi-company by adding of an external module
+- Multi-Currency
+- Multi-Company (by adding of an external module)
+
 - Very user friendly and easy to use
 - customizable Dashboard
 - Highly customizable: enable only the modules you need, add user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one)
 
-- APIs
+- APIs (REST, SOAP)
 - Code that is easy to understand, maintain and develop (PHP with no heavy framework; trigger and hook architecture)
+
 - Support a lot of country specific features:
   - Spanish Tax RE and ISPF
   - French NPR VAT rate (VAT called "Non Perçue Récupérable" for DOM-TOM)
@@ -158,15 +166,18 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Flexible PDF & ODT generation for invoices, proposals, orders...
 - …
 
+
 ### System Environment / Requirements
 
-- Works with PHP 5.5+ and MariaDB 5.0.3+, MySQL 5.0.3+ or PostgreSQL 8.1.4+ (See requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite))
-- Compatible with all Cloud solutions that match MySQL, PHP or PostgreSQL prerequisites.
+- Works with PHP 5.6+ and MariaDB 5.0.3+, MySQL 5.0.3+ or PostgreSQL 8.1.4+ (See requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite))
+- Compatible with all Cloud solutions that match PHP & MySQL or PostgreSQL prerequisites.
+
 
 ### Extending
 
 Dolibarr can be extended with a lot of other external application or modules from third party developers available at the [DoliStore](https://www.dolistore.com).
 
+
 ## WHAT DOLIBARR CAN'T DO YET
 
 These are features that Dolibarr does **not** yet fully support:
@@ -176,22 +187,29 @@ These are features that Dolibarr does **not** yet fully support:
 - No native embedded Webmail, but you can send email to contacts in Dolibarr with e.g. offers, invoices, etc.
 - Dolibarr can't do coffee (yet)
 
+
 ## DOCUMENTATION
 
 Administrator, user, developer and translator's documentations are available along with other community resources in the [Wiki](https://wiki.dolibarr.org).
 
+
 ## CONTRIBUTING
 
-This project exists thanks to all the people who contribute. [[Contribute](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)]
+This project exists thanks to all the people who contribute. 
+Please read the instructions how to contribute (report a bug/error, a feature request, send code ...)  [[Contribute](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)]
+
+A view on Contributors:
 
 <a href="https://github.com/Dolibarr/dolibarr/graphs/contributors"><img src="https://opencollective.com/dolibarr/contributors.svg?width=890&button=false" /></a>
 
+
 ## CREDITS
 
 Dolibarr is the work of many contributors over the years and uses some fine PHP libraries.
 
 See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) file.
 
+
 ## NEWS AND SOCIAL NETWORKS
 
 Follow Dolibarr project on:
@@ -202,6 +220,8 @@ Follow Dolibarr project on:
 - [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
 - [GitHub](https://github.com/Dolibarr/dolibarr)
 
+
 ### Sponsors
 
 Support this project by becoming a sponsor. Your logo will show up here. 🙏 [[Become a sponsor/backer](https://opencollective.com/dolibarr#backer)]
+
diff --git a/SECURITY.md b/SECURITY.md
index 56e1da679ed..bcc1bd7d9e0 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -6,14 +6,13 @@ This file contains some policies about the security reports on Dolibarr ERP CRM
 
 | Version   | Supported          |
 | --------- | ------------------ |
-| <= 9.0.*  | :x:                |
-| >= 10.0.* | :white_check_mark: |
+| <= 12.*   | :x:                |
+| >= 13.*   | :white_check_mark: |
 
 
 ## Reporting a Vulnerability
 
-To report a vulnerability, please send an email to security@dolibarr.org
-In most cases, after fixing the security, we make an answer by email to say the issue has been fixed.
+To report a vulnerability, please use GitHub security advisory (alternatively send an email to security@dolibarr.org)
 
 
 ## Hunting vulnerabilities on Dolibarr
@@ -24,11 +23,11 @@ If you believe you've found a security bug in our service, we are happy to work
 
 Any type of denial of service attacks is strictly forbidden, as well as any interference with network equipment and Dolibarr infrastructure.
 
-We recommand to install Dolibarr ERP CRM on you own server (as most Open Source software, download and use is free: https://www.dolibarr.org/download) to get access on every side of application.
+We recommand to install Dolibarr ERP CRM on your own server (as most Open Source software, download and use is free: https://www.dolibarr.org/download) to get access on every side of application.
 
 ### User Agent
 
-If you try to find bug on Dolibarr, we recommend to append to your user-agent header the following value: '-BugHunting-dolibarr'.
+If you try to find bug on Dolibarr, we recommend to append to your user-agent header the following value: '-securitytest-for-dolibarr'.
 
 ### Account access
 
@@ -37,44 +36,32 @@ You can install the web application yourself on your own platform/server so you
 
 ## Eligibility and Responsible Disclosure
 
-We are happy to thank everyone who submits valid reports which help us improve the security of Dolibarr however, only those that meet the following eligibility requirements may receive a monetary reward:
+We are happy to thank everyone who submits valid reports which help us improve the security of Dolibarr however, only those that meet the following eligibility requirements will be "validated reports" (if not, we may close the report without any answer):
 
-You must be the first reporter of a vulnerability.
-
-The vulnerability must be a qualifying vulnerability (see below)
-
-Any vulnerability found must be reported no later than 24 hours after discovery
+You must be the first reporter of the vulnerability (duplicate reports are closed).
 
 You must send a clear textual description of the report along with steps to reproduce the issue, include attachments such as screenshots or proof of concept code as necessary.
 
 You must avoid tests that could cause degradation or interruption of our service (refrain from using automated tools, and limit yourself about requests per second), that's why we recommand to install softwate on your own platform.
 
-You must not leak, manipulate, or destroy any user data.
-
-You must not be a former or current employee of Dolibarr or one of its contractor.
-
-Reports about vulnerabilities are examined by our security analysts.
-
-Our analysis is always based on worst case exploitation of the vulnerability, as is the reward we pay.
-
-No vulnerability disclosure, including partial is allowed for the moment.
+You must not leak, manipulate, or destroy any user data of third parties to find your vulnerability.
 
 
 ## Scope for qualified vulnerabilities
 
-ONLY vulnerabilities discovered, when the following setup on test platform is used, are accepted:
+ONLY vulnerabilities discovered, when the following setup on test platform is used, are "valid":
 
 * $dolibarr_main_prod must be set to 1 into conf.php
 * $dolibarr_nocsrfcheck must be kept to the value 0 into conf.php (this is the default value)
 * $dolibarr_main_force_https must be set to something else than 0.
-* The constant MAIN_SECURITY_CSRF_WITH_TOKEN must be set to 1 into backoffice menu Home - Setup - Other (this protection should be enabled soon by default)
+* The constant MAIN_SECURITY_CSRF_WITH_TOKEN must be set to 1 into backoffice menu Home - Setup - Other (this protection should be set to 1 soon by default)
 * The module DebugBar must NOT be enabled (by default, this module is not enabled. This is a developer tool)
 * The module ModuleBuilder must NOT be enabled (by default, this module is not enabled. This is a developer tool)
-* ONLY security reports on modules provided by default and with the "stable" status are allowed (troubles into "experimental", "developement" or external modules are not accepted).
+* ONLY security reports on modules provided by default and with the "stable" status are valid (troubles into "experimental", "developement" or external modules are not valid vulnerabilities).
 * The root of web server must link to htdocs and the documents directory must be outside of the web server root (this is the default when using the default installer but may differs with external installer).
 * The web server setup must be done so only the documents directory is in write mode. The root directory called htdocs must be readonly.
-* CSRF attacks are accepted for all when using a POST URL, but are accepted only for creating or updating data resctricted to the admin user when using GET URL.
-* Ability for a high level user to edit web site pages in the CMS by including javascript is an expected feature.
+* CSRF attacks are accepted for all when using a POST URL, but when using GET URL, they are validated only for creating or updating data resctricted to the admin user.
+* Ability for a high level user to edit web site pages into the CMS by including HTML or Javascript is an expected feature. Vulnerabilities into the website module are validated only if HTML or Javascript injection can be done by a non allowed user.
 
 Scope is the web application (back office) and the APIs.
 
diff --git a/build/README b/build/README
index f7e8ebfe60b..14f2b92ae39 100644
--- a/build/README
+++ b/build/README
@@ -1,48 +1,62 @@
 README (English)
+
+Path: /dolibarr/build/README
+
 ##################################################
 Building packages
 ##################################################
 
 All sub-directories of "build" directory contains files (setup or binary tools) required to build automatically Dolibarr packages.
-There are several tools:
 
+There are several tools:
 
 
 - To build full Dolibarr packages, launch the script
 > Launch command perl makepack-dolibarr.pl
 
-Note: Prerequisites to build tgz, debian, rpm package
+--------------------------------------------------------------------------------------------------
+
+
+Prerequisites to build tgz, debian, rpm package:
+
 > apt-get install tar dpkg dpatch p7zip-full rpm zip
 
-Note: Prerequisites to build autoexe DoliWamp package:
+
+--------------------------------------------------------------------------------------------------
+
+Prerequisites to build autoexe DoliWamp package:
 > apt-get install wine q4wine
 > Launch "wine cmd" to check a drive Z: pointing to / exists.
 > Install InnoSetup
-   For example by running isetup-5.3.9.exe (http://www.jrsoftware.org)
+   For example by running isetup-5.5.8.exe (https://www.jrsoftware.org)  https://files.jrsoftware.org/is/5/
 > Install WampServer into "C:\wamp64" to have Apache, PHP and MariaDB
-   For example by running wampserver3.2.0_x64.exe (http://www.wampserver.com). See file build/exe/doliwamp.iss to know the doliwamp version currently setup.
+   For example by running wampserver3.2.0_x64.exe (https://www.wampserver.com). 
+   See file build/exe/doliwamp.iss to know the doliwamp version currently setup.
 > Add path to ISCC into PATH windows var:
   Launch wine cmd, then regedit and add entry int HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment\PATH
 > To build manually the .exe from Windows (running from makepack-dolibarr.pl script is however recommanded), 
   open file build/exe/doliwamp.iss and click on button "Compile".
   The .exe file will be build into directory build.
 
-
+--------------------------------------------------------------------------------------------------
   
 - To build a theme package, launch the script
 > perl makepack-dolibarrtheme.pl
 
 
+--------------------------------------------------------------------------------------------------
 
 - To build a package for a module, launch the script
 > perl makepack-dolibarrmodule.pl
 
 
+--------------------------------------------------------------------------------------------------
 
 - To build developper documentation, launch the script
 > perl dolibarr-doxygen-build.pl
 
 
+--------------------------------------------------------------------------------------------------
 
 Note: 
 The build directory and all its contents is absolutely not required to make Dolibarr working. 
diff --git a/build/debian/README.howto b/build/debian/README.howto
index 52239176c60..c38a53718ae 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -306,7 +306,7 @@ If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VER
 - htdocs/includes/jquery/plugins/datatables
 - htdocs/includes/jszip
 - htdocs/includes/mike42
-- htdocs/includes/phpexcel or htdocs/includes/phpoffice
+- htdocs/includes/phpoffice
 - htdocs/includes/restler/framework/Luracast/Restler/explorer
 - htdocs/includes/swiftmailer
 - htdocs/includes/tcpdf or htdocs/includes/tecnickcom
diff --git a/build/debian/conf.php.install b/build/debian/conf.php.install
index 6741d7ea544..c373664deef 100644
--- a/build/debian/conf.php.install
+++ b/build/debian/conf.php.install
@@ -232,7 +232,7 @@ $dolibarr_main_prod='0';
 # Examples:
 # $dolibarr_mailing_limit_sendbycli='0';
 
-# dolibarr_distrib
+# dolibarr_main_distrib
 # A key to identify the distribution used for first installation
-$dolibarr_distrib = 'deb';
+$dolibarr_main_distrib = 'debian';
 
diff --git a/build/debian/copyright b/build/debian/copyright
index 7b199adf693..403763544a5 100644
--- a/build/debian/copyright
+++ b/build/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Dolibarr
 Upstream-Contact: Laurent Destailleur <eldy@users.sourceforge.net>
 Source: https://www.dolibarr.org/files/stable/standard/
@@ -37,7 +37,8 @@ Copyright: 2002-2009, Rodolphe Quiedeville   <rodolphe@quiedeville.org>
            2010, Servitux Servicios Informaticos <info@servitux.es>
            2011, Herve Prot                  <herve.prot@symeos.com>
            2011, Remy Younes                 <ryounes@gmail.com>
-           2012-2013, Christophe Battarel         <christophe.battarel@altairis.fr>
+           2012-2013, Christophe Battarel    <christophe.battarel@altairis.fr>
+	   
 License: GPL-3+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public
@@ -56,7 +57,9 @@ License: GPL-3+
  .
  On Debian systems, the full text of the GNU General Public
  License version 3 can be found in the file
- `/usr/share/common-licenses/GPL-3'.
+ '/usr/share/common-licenses/GPL-3'.
+
+------------------------------------------------------------
 
 Files: htdocs/includes/adodbtime/*
 Copyright: 2003-2005, John Lim
@@ -80,6 +83,9 @@ Comment:
  Those files are not shipped in the binary package since we use
  the library as packaged in "libphp-adodb".
 
+
+------------------------------------------------------------
+
 Files: htdocs/includes/ckeditor/*
 Copyright: 2003-2012 CKSource - Frederico Knabben
 License: GPL-2+
@@ -109,6 +115,9 @@ Comment:
  Those files are not shipped in the binary package since we use the
  library as packaged in "ckeditor".
 
+
+------------------------------------------------------------
+
 Files: htdocs/includes/fonts/*
 Copyright: 2003, Bitstream Inc
 	   unknown, Gavin Graham
@@ -158,7 +167,10 @@ License: other
 Comments:
  Those files are not shipped in the binary package as we
  configure Dolibarr to use Dejavu fonts from "fonts-dejavu-core".
-  
+
+
+------------------------------------------------------------
+
 Files: doc/images/*
 Copyright: Laurent Destailleur 
 License: CC-BY-SA-3.0
@@ -174,33 +186,15 @@ License: CC-BY-SA-3.0
  distribute the resulting work only under the same, similar or a compatible
  license.
  .
- For more information, see http://creativecommons.org/licenses/by-sa/3.0/
+ For more information, see https://creativecommons.org/licenses/by-sa/3.0/
 
-Files: htdocs/includes/fpdfi/*
-Copyright: 2004-2011 Setasign - Jan Slabon
-License: GPL-2+
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
 
-Files: htdocs/includes/geoip/*
+
+------------------------------------------------------------
+
+Files: htdocs/includes/geoip2/*
 Copyright: 2007 MaxMind LLC
-License: LGPL-2.1+
+License: CC-By-SA
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
  License as published by the Free Software Foundation; either
@@ -216,10 +210,14 @@ License: LGPL-2.1+
  .
  On Debian systems, the full text of the GNU Lesser General Public
  License version 2.1 can be found in the file
- `/usr/share/common-licenses/LGPL-2.1'.
+ '/usr/share/common-licenses/LGPL-2.1'.
+
+
+------------------------------------------------------------
 
 Files: htdocs/includes/jquery/*
 Copyright: JQuery team
+https://www.jquery.com
 License: GPL-2+ or MIT
  === GPL-2+ LICENSE NOTICE ===
  .
@@ -240,7 +238,7 @@ License: GPL-2+ or MIT
  .
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+ '/usr/share/common-licenses/GPL-2'.
  .
  === MIT LICENSE ===
  .
@@ -267,6 +265,8 @@ Comment:
  "libjs-jquery-ui". Most of the plugins are shipped though.
 
 
+------------------------------------------------------------
+
 Files: htdocs/includes/jquery/plugins/flot/*
 Copyright: Flot team
 License: Public-Domain
@@ -275,6 +275,9 @@ Comment:
  Those files are not shipped in the binary package because we configure
  Dolibarr to use the files provided by "libjs-flot".
 
+
+------------------------------------------------------------
+
 Files: htdocs/includes/jsgantt/*
 Copyright: JSGantt team
 License: GPL-2+
@@ -295,7 +298,10 @@ License: GPL-2+
  .
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+ '/usr/share/common-licenses/GPL-2'.
+
+
+------------------------------------------------------------
 
 Files: htdocs/includes/nusoap/*
 Copyright: 2002-2010 NuSphere Corporation
@@ -315,11 +321,14 @@ License: LGPL-2.1+
  .
  On Debian systems, the full text of the GNU Lesser General Public
  License version 2.1 can be found in the file
- `/usr/share/common-licenses/LGPL-2.1'.
+ '/usr/share/common-licenses/LGPL-2.1'.
 Comment:
  Those files are not shipped in the binary package since we
  configure Dolibarr to use the library provided in "libnusoap-php".
 
+
+------------------------------------------------------------
+
 Files: htdocs/includes/odtphp/*
 Copyright: 2008, Julien Pauli
            2008, Cyril PIERRE de GEYER 
@@ -342,29 +351,12 @@ License: GPL-2+
  .
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+ '/usr/share/common-licenses/GPL-2'.
 
-Files: htdocs/includes/phpexcel/*
-Copyright: 2006-2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-License: LGPL-2.1+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
- .
- On Debian systems, the full text of the GNU Lesser General Public
- License version 2.1 can be found in the file
- `/usr/share/common-licenses/LGPL-2.1'.
 
-Files: htdocs/includes/tcpdf/*
+------------------------------------------------------------
+
+Files: htdocs/includes/tecnickcom/*
 Copyright: 2002-2013 Nicola Asuni - Tecnick.com LTD
 License: LGPL-3.0+
  TCPDF is free software: you can redistribute it and/or modify it
diff --git a/build/debian/dolibarr.postinst b/build/debian/dolibarr.postinst
index 6ee2a89931f..7684d02ff3d 100644
--- a/build/debian/dolibarr.postinst
+++ b/build/debian/dolibarr.postinst
@@ -150,7 +150,6 @@ case "$1" in
 			##grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
 			#grep -q -c "dolibarr_lib_NUSOAP_PATH" $config   || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
 			#grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
-			##grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
 			##grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
 			#grep -q -c "dolibarr_js_CKEDITOR" $config       || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
 			#grep -q -c "dolibarr_js_JQUERY" $config         || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
diff --git a/build/debian/install.forced.php.install b/build/debian/install.forced.php.install
index e55ffae138e..1d10699f1d4 100644
--- a/build/debian/install.forced.php.install
+++ b/build/debian/install.forced.php.install
@@ -24,6 +24,7 @@ $force_install_databaserootpass='__SUPERUSERPASSWORD__';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
+$force_install_distrib='debian';
 
 // Value to overwrite path to use shared libraries/fonts instead of embedded one.
 // If during install, we enable/disable declaration to use non embedded libraries, we must also check they are 
@@ -34,7 +35,6 @@ $force_install_lockinstall='444';
 //$force_dolibarr_lib_GEOIP_PATH='';
 //$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
 //$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
-//$force_dolibarr_lib_PHPEXCEL_PATH='';	// Use '' or 'disabled'
 //$force_dolibarr_js_CKEDITOR='/javascript/ckeditor';	// Use '/javascript/ckeditor' or 'disabled'
 //$force_dolibarr_js_JQUERY='/javascript/jquery';
 //$force_dolibarr_js_JQUERY_UI='/javascript/jquery-ui';
diff --git a/build/debian/rules b/build/debian/rules
index 1fe2360133f..dab5d84fd11 100755
--- a/build/debian/rules
+++ b/build/debian/rules
@@ -103,8 +103,6 @@ override_dh_install:
 
 	# clean from useless files
 	rm -fr htdocs/includes/jquery/plugins/multiselect
-	rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PDF
-	rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip
 	rm -fr htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33
 	rm -fr htdocs/includes/tcpdf/fonts/freefont-20100919
 	rm -fr htdocs/includes/tcpdf/fonts/utils
@@ -113,7 +111,6 @@ override_dh_install:
 
 	# Licence files are already included into copyright file.
 	rm -f  htdocs/includes/jquery/plugins/flot/LICENSE.txt
-	rm -f  htdocs/includes/phpexcel/license.txt
 	rm -f  htdocs/includes/tcpdf/LICENSE.TXT
 
 	# Drop unwanted executable permissions
diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
index 2be287c2db9..dca74e9e720 100644
--- a/build/docker/Dockerfile
+++ b/build/docker/Dockerfile
@@ -20,6 +20,9 @@ RUN apt-get update -y \
         unzip \
         curl \
         apt-utils \
+        msmtp \
+        msmtp-mta \
+        mailutils \
     && apt-get autoremove -y \
     && rm -rf /var/lib/apt/lists/* \
     && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
@@ -44,7 +47,17 @@ RUN echo 'xdebug.remote_port=9000' >> ${PHP_INI_DIR}/php.ini
 RUN echo 'xdebug.remote_connect_back=1' >> ${PHP_INI_DIR}/php.ini
 RUN echo 'xdebug.profiler_enable=0' >> ${PHP_INI_DIR}/php.ini
 RUN echo 'xdebug.remote_log="/tmp/xdebug.log"' >> ${PHP_INI_DIR}/php.ini
-#RUN echo '172.17.0.1 docker.host' >> /etc/hosts
+#RUN echo 'localhost docker.host' >> /etc/hosts
+
+# set up sendmail config, to use maildev
+RUN echo "account default" > /etc/msmtprc
+RUN echo "auth off" >> /etc/msmtprc
+RUN echo "port 25" >> /etc/msmtprc
+RUN echo "host mail" >> /etc/msmtprc
+RUN echo "from local@localdomain.com" >> /etc/msmtprc
+RUN echo "domain localhost.localdomain" >> /etc/msmtprc
+RUN echo "sendmail_path=/usr/bin/msmtp -t" >> /usr/local/etc/php/conf.d/php-sendmail.ini
+RUN echo "localhost localhost.localdomain" >> /etc/hosts
 
 EXPOSE 80
 
diff --git a/build/docker/README.md b/build/docker/README.md
index 2fd278a531f..d469c7c7aae 100644
--- a/build/docker/README.md
+++ b/build/docker/README.md
@@ -16,7 +16,7 @@ And then, you can run :
 
         docker-compose up
 
-This will run 3 container Docker : Dolibarr, MariaDB and PhpMyAdmin.
+This will run 4 containers Docker : Dolibarr, MariaDB, PhpMyAdmin and MailDev.
 
 The URL to go to the Dolibarr is :
 
@@ -25,7 +25,10 @@ The URL to go to the Dolibarr is :
 The URL to go to PhpMyAdmin is (login/password is root/root) :
 
         http://0.0.0.0:8080
+        
+In Dolibarr configuration Email let PHP mail function, To see all mail send by Dolibarr go to maildev
 
-Setup the database connection during the installation process, please use mariad
-b (name of the database container) as database host.
+        http://0.0.0.0:8081
+
+Setup the database connection during the installation process, please use mariadb (name of the database container) as database host.
 Setup documents folder, during the installation process, to /var/documents
diff --git a/build/docker/docker-compose.yml b/build/docker/docker-compose.yml
index efdc95d2858..2167f069f25 100644
--- a/build/docker/docker-compose.yml
+++ b/build/docker/docker-compose.yml
@@ -12,8 +12,11 @@ services:
         environment:
             MYSQL_ROOT_PASSWORD: root
             MYSQL_DATABASE: dolibarr
+        ports:
+            - "3306:3306"
         networks:
             - internal-pod
+            - external-pod
 
     phpmyadmin:
         image: phpmyadmin/phpmyadmin
@@ -49,3 +52,6 @@ services:
         ports:
             - "8081:80"
             - "25:25"
+        networks:
+            - internal-pod
+            - external-pod
diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index ed8e07d7468..dbf74a96f67 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -118,7 +118,7 @@ Source: "C:\wamp64\bin\mariadb\mariadb10.4.10\*.*"; DestDir: "{app}\bin\mariadb\
 ;Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mariadb\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db"
 
 ; Dolibarr
-Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,documents\*,includes\ckeditor\_source\*,includes\savant\*,includes\phpmailer\*,jquery\plugins\template\*,nltechno*\*,sabre\sabre\*\tests,PHPExcel\Shared\PDF\*,PHPExcel\Shared\PCLZip\*,tcpdf\fonts\dejavu-fonts-ttf-2.33\*,tcpdf\fonts\freefont-20100919\*,tcpdf\fonts\utils\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\conf.php.sav,*\install.forced.php"
+Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,documents\*,includes\ckeditor\_source\*,includes\savant\*,includes\phpmailer\*,jquery\plugins\template\*,nltechno*\*,sabre\sabre\*\tests,tcpdf\fonts\dejavu-fonts-ttf-2.33\*,tcpdf\fonts\freefont-20100919\*,tcpdf\fonts\utils\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\conf.php.sav,*\install.forced.php"
 Source: "dev\*.*"; DestDir: "{app}\www\dolibarr\dev"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,dbmodel\*,fpdf\*,initdata\*,initdemo\*,iso-normes\*,licence\*,phpcheckstyle\*,phpunit\*,samples\*,test\*,uml\*,vagrant\*,xdebug\*"
 Source: "doc\*.*"; DestDir: "{app}\www\dolibarr\doc"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,wiki\*,plaquette\*,dev\*,images\dolibarr_screenshot2.png,images\dolibarr_screenshot3.png,images\dolibarr_screenshot4.png,images\dolibarr_screenshot5.png,images\dolibarr_screenshot6.png,images\dolibarr_screenshot7.png,images\dolibarr_screenshot8.png,images\dolibarr_screenshot9.png,images\dolibarr_screenshot10.png,images\dolibarr_screenshot11.png,images\dolibarr_screenshot12.png"
 Source: "scripts\*.*"; DestDir: "{app}\www\dolibarr\scripts"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,product\materiel.net.php,product\import-product.php"
diff --git a/build/exe/doliwamp/install.forced.php.install b/build/exe/doliwamp/install.forced.php.install
index c59b373a7a0..8947154a57b 100644
--- a/build/exe/doliwamp/install.forced.php.install
+++ b/build/exe/doliwamp/install.forced.php.install
@@ -22,6 +22,7 @@ $force_install_databaserootpass='WAMPMYSQLNEWPASSWORD';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='644';
+$force_install_distrib='doliwamp';
 
 $force_install_module='';
 ?>
\ No newline at end of file
diff --git a/build/generate_filelist_xml.php b/build/generate_filelist_xml.php
index 581353b758b..41c20740d78 100755
--- a/build/generate_filelist_xml.php
+++ b/build/generate_filelist_xml.php
@@ -125,6 +125,11 @@ $checksumconcat=array();
 
 $outputfile=$outputdir.'/filelist-'.$release.'.xml';
 $fp = fopen($outputfile, 'w');
+if (empty($fp)) {
+	print 'Failed to open file '.$outputfile."\n";
+	exit(-1);
+}
+
 fputs($fp, '<?xml version="1.0" encoding="UTF-8" ?>'."\n");
 fputs($fp, '<checksum_list version="'.$release.'" date="'.dol_print_date(dol_now(), 'dayhourrfc').'" generator="'.$script_file.'">'."\n");
 
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 24b32dcff91..5c5baaac3bc 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -476,6 +476,7 @@ if ($nboftargetok) {
 		$ret=`rm -f  $BUILDROOT/$PROJECT/build.xml`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/phpstan.neon`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/pom.xml`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/README-*.md`;
 		
 		$ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/build/Doli*-*`;
@@ -503,7 +504,10 @@ if ($nboftargetok) {
 		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mysql/README`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`;
 
-		$ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/install/mssql`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/install/mssql`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/install/sqlite3`;
+
+		$ret=`rm -fr $BUILDROOT/$PROJECT/node_modules`;
 
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/ansible`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/codesniffer`;
@@ -578,49 +582,54 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/workstation*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/oblyon*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/allscreen*`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/theme/common/octicons/LICENSE`;
+		
 		# Removed other test files
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/test`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/.gitignore $BUILDROOT/$PROJECT/*/.gitignore $BUILDROOT/$PROJECT/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.gitignore`;
+		
+		# Removed files installed by the awful composer   	    
    	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/geoip/sample*.*`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/bin`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/ckeditor/adapters`;		# Keep this removal in case we embed libraries
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/ckeditor/samples`;		# Keep this removal in case we embed libraries
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;					# _source must be kept into tarball for official debian, not for the rest
-   	    
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/composer`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/doctrine`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/select2/release.sh`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/doc`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/example`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/test`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/example`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/test`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mobiledetect/mobiledetectlib/.gitmodules`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mobiledetect/mobiledetectlib/docs`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/.github`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/docs`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/samples`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/scripts`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/src`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/test`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/parsedown/LICENSE.txt`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/php-iban/docs`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/.gitattributes`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Classes/license.md`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PDF`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Examples`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/unitTests`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/license.md`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/sabre/sabre/*/tests`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/stripe/tests`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/stripe/LICENSE`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-*`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-*`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/ae_fonts_*`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/examples`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/utils`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/LICENSE.TXT`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/theme/common/octicons/LICENSE`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/vendor`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/webmozart`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/autoload.php`;
 	}
 
 	# Build package for each target
diff --git a/build/perl/virtualmin/dolibarr.pl b/build/perl/virtualmin/dolibarr.pl
index 343cebc6abe..8b6a9888db0 100644
--- a/build/perl/virtualmin/dolibarr.pl
+++ b/build/perl/virtualmin/dolibarr.pl
@@ -1,7 +1,7 @@
 #----------------------------------------------------------------------------
 # \file         dolibarr.pl
 # \brief        Dolibarr script install for Virtualmin Pro
-# \author       (c)2009-2019 Regis Houssin  <regis.houssin@inodbox.com>
+# \author       (c)2009-2020 Regis Houssin  <regis.houssin@inodbox.com>
 #----------------------------------------------------------------------------
 
 
@@ -30,7 +30,7 @@ return "Regis Houssin";
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-return ( "10.0.0", "9.0.3", "8.0.5", "7.0.5", "6.0.8" );
+return ( "12.0.3", "11.0.5", "10.0.7", "9.0.4", "8.0.6", "7.0.5" );
 }
 
 sub script_dolibarr_release
@@ -77,6 +77,16 @@ if ($ver >= 3.6) {
 		push(@rv, "Dolibarr requires PHP version 5.3 or later");
 		}
 	}
+if ($ver >= 12.0) {
+	# Check for PHP 5.6+
+	local $phpv = &get_php_version($phpver || 5, $d);
+	if (!$phpv) {
+		push(@rv, "Could not work out exact PHP version");
+		}
+	elsif ($phpv < 5.6) {
+		push(@rv, "Dolibarr requires PHP version 5.6 or later");
+		}
+	}
 
 return @rv;
 }
@@ -376,7 +386,7 @@ sub script_dolibarr_realversion
 local ($d, $opts, $sinfo) = @_;
 local $lref = &read_file_lines("$opts->{'dir'}/filefunc.inc.php", 1);
 foreach my $l (@$lref) {
-		if ($l =~ /'DOL_VERSION','([0-9a-z\.\-]+)'/) {
+		if ($l =~ /'DOL_VERSION',\s?'([0-9a-z\.\-]+)'/) {
                 return $1;
                 }
         }
@@ -390,6 +400,8 @@ sub script_dolibarr_check_latest
 {
 local ($ver) = @_;
 local @vers = &osdn_package_versions("dolibarr",
+				$ver >= 12.0 ? "dolibarr\\-(12\\.0\\.[0-9\\.]+)\\.tgz" :
+				$ver >= 11.0 ? "dolibarr\\-(11\\.0\\.[0-9\\.]+)\\.tgz" :
 				$ver >= 10.0 ? "dolibarr\\-(10\\.0\\.[0-9\\.]+)\\.tgz" :
 				$ver >= 9.0 ? "dolibarr\\-(9\\.0\\.[0-9\\.]+)\\.tgz" :
 				$ver >= 8.0 ? "dolibarr\\-(8\\.0\\.[0-9\\.]+)\\.tgz" :
@@ -410,7 +422,7 @@ return $ver eq $vers[0] ? undef : $vers[0];
 
 sub script_dolibarr_site
 {
-return 'http://www.dolibarr.org/';
+return 'https://www.dolibarr.org/';
 }
 
 sub script_dolibarr_passmode
diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index 115edcef397..99061b24eab 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -181,6 +181,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/datapolicy
 %_datadir/dolibarr/htdocs/dav
 %_datadir/dolibarr/htdocs/debugbar
+%_datadir/dolibarr/htdocs/delivery
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/emailcollector
@@ -196,8 +197,8 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
+%_datadir/dolibarr/htdocs/intracommreport
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
-%_datadir/dolibarr/htdocs/livraison
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
@@ -273,7 +274,6 @@ then
   #grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
   grep -q -c "dolibarr_lib_NUSOAP_PATH" $config    || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
   grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
-  #grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
   #grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
   grep -q -c "dolibarr_js_CKEDITOR" $config        || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
   grep -q -c "dolibarr_js_JQUERY" $config          || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index 64293ff6580..f3c86419f8e 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -261,6 +261,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/datapolicy
 %_datadir/dolibarr/htdocs/dav
 %_datadir/dolibarr/htdocs/debugbar
+%_datadir/dolibarr/htdocs/delivery
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/emailcollector
@@ -276,8 +277,8 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
+%_datadir/dolibarr/htdocs/intracommreport
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
-%_datadir/dolibarr/htdocs/livraison
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
@@ -423,7 +424,6 @@ then
   #grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
   grep -q -c "dolibarr_lib_NUSOAP_PATH" $config    || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
   grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
-  #grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
   #grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
   grep -q -c "dolibarr_js_CKEDITOR" $config        || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
   grep -q -c "dolibarr_js_JQUERY" $config          || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index 28b58a4da96..3c2b8adeb5b 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -177,6 +177,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/custom
 %_datadir/dolibarr/htdocs/datapolicy
 %_datadir/dolibarr/htdocs/dav
+%_datadir/dolibarr/htdocs/delivery
 %_datadir/dolibarr/htdocs/debugbar
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
@@ -193,8 +194,8 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
+%_datadir/dolibarr/htdocs/intracommreport
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
-%_datadir/dolibarr/htdocs/livraison
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
@@ -270,7 +271,6 @@ then
   #grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
   grep -q -c "dolibarr_lib_NUSOAP_PATH" $config    || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
   grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
-  #grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
   #grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
   grep -q -c "dolibarr_js_CKEDITOR" $config        || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
   grep -q -c "dolibarr_js_JQUERY" $config          || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index 8b4ccf37808..71db3f43445 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -189,6 +189,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/datapolicy
 %_datadir/dolibarr/htdocs/dav
 %_datadir/dolibarr/htdocs/debugbar
+%_datadir/dolibarr/htdocs/delivery
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/emailcollector
@@ -204,8 +205,8 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
+%_datadir/dolibarr/htdocs/intracommreport
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
-%_datadir/dolibarr/htdocs/livraison
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
@@ -281,7 +282,6 @@ then
   #grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
   grep -q -c "dolibarr_lib_NUSOAP_PATH" $config    || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
   grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
-  #grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
   #grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
   grep -q -c "dolibarr_js_CKEDITOR" $config        || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
   grep -q -c "dolibarr_js_JQUERY" $config          || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
diff --git a/build/rpm/install.forced.php.fedora b/build/rpm/install.forced.php.fedora
index a8db3e25c9e..a8bc0d390c6 100644
--- a/build/rpm/install.forced.php.fedora
+++ b/build/rpm/install.forced.php.fedora
@@ -17,6 +17,7 @@ $force_install_databaserootpass='__SUPERUSERPASSWORD__';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
+$force_install_distrib='rpmfedora';
 
 // Value to overwrite path to use shared libraries/fonts instead of embedded one
 $force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
@@ -24,7 +25,6 @@ $force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
 //$force_dolibarr_lib_GEOIP_PATH='';
 $force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
 //$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
-$force_dolibarr_lib_PHPEXCEL_PATH='';
 $force_dolibarr_lib_TCPDF_PATH='';
 //$force_dolibarr_js_CKEDITOR='/javascript/ckeditor';
 //$force_dolibarr_js_JQUERY='/javascript/jquery';
diff --git a/build/rpm/install.forced.php.generic b/build/rpm/install.forced.php.generic
index 107ef533310..20ec33a1af0 100644
--- a/build/rpm/install.forced.php.generic
+++ b/build/rpm/install.forced.php.generic
@@ -17,6 +17,7 @@ $force_install_databaserootpass='__SUPERUSERPASSWORD__';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
+$force_install_distrib='rpmgeneric';
 
 // Value to overwrite path to use shared libraries/fonts instead of embedded one
 // We don't force any external lib with generic package
diff --git a/build/rpm/install.forced.php.mandriva b/build/rpm/install.forced.php.mandriva
index 927877b59d0..a254eebbf7b 100644
--- a/build/rpm/install.forced.php.mandriva
+++ b/build/rpm/install.forced.php.mandriva
@@ -17,6 +17,7 @@ $force_install_databaserootpass='__SUPERUSERPASSWORD__';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
+$force_install_distrib='rpmmandriva';
 
 // Value to overwrite path to use shared libraries/fonts instead of embedded one
 $force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
@@ -24,7 +25,6 @@ $force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
 //$force_dolibarr_lib_GEOIP_PATH='';
 $force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
 //$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
-$force_dolibarr_lib_PHPEXCEL_PATH='';
 $force_dolibarr_lib_TCPDF_PATH='';
 //$force_dolibarr_js_CKEDITOR='/javascript/ckeditor';
 //$force_dolibarr_js_JQUERY='/javascript/jquery';
diff --git a/build/rpm/install.forced.php.opensuse b/build/rpm/install.forced.php.opensuse
index c91836918f4..24da4417121 100644
--- a/build/rpm/install.forced.php.opensuse
+++ b/build/rpm/install.forced.php.opensuse
@@ -17,6 +17,7 @@ $force_install_databaserootpass='__SUPERUSERPASSWORD__';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
+$force_install_distrib='rpmopensuse';
 
 // Value to overwrite path to use shared libraries/fonts instead of embedded one
 //$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
@@ -24,7 +25,6 @@ $force_install_lockinstall='444';
 //$force_dolibarr_lib_GEOIP_PATH='';
 //$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
 //$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
-$force_dolibarr_lib_PHPEXCEL_PATH='';
 $force_dolibarr_lib_TCPDF_PATH='';
 //$force_dolibarr_js_CKEDITOR='/javascript/ckeditor';
 //$force_dolibarr_js_JQUERY='/javascript/jquery';
diff --git a/composer.json b/composer.json
index 9fede994525..bd81e101cfc 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
 		"nnnick/chartjs" : "^2.9",
 		"stripe/stripe-php" : "6.43.1",
 		"maximebf/debugbar" : "1.15.1",
-		"symfony/var-dumper": "3"
+		"symfony/var-dumper" : "3"
 	},
 	"require-dev" : {
 		"php-parallel-lint/php-parallel-lint" : "^0",
@@ -59,4 +59,4 @@
 		"ext-zip" : "ODT, Excel and file compression support",
 		"ext-xml" : "Excel support"
 	}
-}
+}
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index 5afe0ca34f2..c588bc7783f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -45,6 +45,12 @@
                 "text",
                 "wysiwyg"
             ],
+            "support": {
+                "forum": "http://ckeditor.com/forums",
+                "issues": "http://dev.ckeditor.com",
+                "source": "http://github.com/ckeditor/ckeditor-dev",
+                "wiki": "http://docs.ckeditor.com"
+            },
             "time": "2019-06-28T10:41:23+00:00"
         },
         {
@@ -106,6 +112,10 @@
                 "debug",
                 "debugbar"
             ],
+            "support": {
+                "issues": "https://github.com/maximebf/php-debugbar/issues",
+                "source": "https://github.com/maximebf/php-debugbar/tree/v1.15.1"
+            },
             "time": "2019-09-24T14:55:42+00:00"
         },
         {
@@ -161,6 +171,10 @@
                 "print",
                 "receipt"
             ],
+            "support": {
+                "issues": "https://github.com/mike42/escpos-php/issues",
+                "source": "https://github.com/mike42/escpos-php/tree/v2.2"
+            },
             "time": "2019-10-05T05:59:00+00:00"
         },
         {
@@ -213,20 +227,24 @@
                 "mobile detector",
                 "php mobile detect"
             ],
+            "support": {
+                "issues": "https://github.com/serbanghita/Mobile-Detect/issues",
+                "source": "https://github.com/serbanghita/Mobile-Detect/tree/2.8.34"
+            },
             "time": "2019-09-18T18:44:20+00:00"
         },
         {
             "name": "nnnick/chartjs",
-            "version": "v2.9.3",
+            "version": "v2.9.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/chartjs/Chart.js.git",
-                "reference": "06f73dc3590084b2c464bf08189c7aee2b6b92d2"
+                "reference": "9bd4cf82fda9f50a5fb50b72843e06ab88124278"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/chartjs/Chart.js/zipball/06f73dc3590084b2c464bf08189c7aee2b6b92d2",
-                "reference": "06f73dc3590084b2c464bf08189c7aee2b6b92d2",
+                "url": "https://api.github.com/repos/chartjs/Chart.js/zipball/9bd4cf82fda9f50a5fb50b72843e06ab88124278",
+                "reference": "9bd4cf82fda9f50a5fb50b72843e06ab88124278",
                 "shasum": ""
             },
             "require": {
@@ -254,65 +272,11 @@
                 "JS",
                 "chart"
             ],
-            "time": "2019-11-14T18:37:30+00:00"
-        },
-        {
-            "name": "phpoffice/phpexcel",
-            "version": "1.8.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/PHPOffice/PHPExcel.git",
-                "reference": "372c7cbb695a6f6f1e62649381aeaa37e7e70b32"
+            "support": {
+                "issues": "https://github.com/chartjs/Chart.js/issues",
+                "source": "https://github.com/chartjs/Chart.js/tree/v2.9.4"
             },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/PHPOffice/PHPExcel/zipball/372c7cbb695a6f6f1e62649381aeaa37e7e70b32",
-                "reference": "372c7cbb695a6f6f1e62649381aeaa37e7e70b32",
-                "shasum": ""
-            },
-            "require": {
-                "ext-xml": "*",
-                "ext-xmlwriter": "*",
-                "php": ">=5.2.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "PHPExcel": "Classes/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL"
-            ],
-            "authors": [
-                {
-                    "name": "Maarten Balliauw",
-                    "homepage": "http://blog.maartenballiauw.be"
-                },
-                {
-                    "name": "Mark Baker"
-                },
-                {
-                    "name": "Franck Lefevre",
-                    "homepage": "http://blog.rootslabs.net"
-                },
-                {
-                    "name": "Erik Tilt"
-                }
-            ],
-            "description": "PHPExcel - OpenXML - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine",
-            "homepage": "http://phpexcel.codeplex.com",
-            "keywords": [
-                "OpenXML",
-                "excel",
-                "php",
-                "spreadsheet",
-                "xls",
-                "xlsx"
-            ],
-            "abandoned": "phpoffice/phpspreadsheet",
-            "time": "2015-05-01T07:00:55+00:00"
+            "time": "2020-10-19T12:22:11+00:00"
         },
         {
             "name": "psr/log",
@@ -359,6 +323,9 @@
                 "psr",
                 "psr-3"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/log/tree/1.1.3"
+            },
             "time": "2020-03-23T09:12:05+00:00"
         },
         {
@@ -420,6 +387,9 @@
                 "rest",
                 "server"
             ],
+            "support": {
+                "source": "https://github.com/Luracast/Restler-Framework/tree/3.0.0-RC6"
+            },
             "time": "2020-02-13T16:05:12+00:00"
         },
         {
@@ -476,24 +446,28 @@
                 "payment processing",
                 "stripe"
             ],
+            "support": {
+                "issues": "https://github.com/stripe/stripe-php/issues",
+                "source": "https://github.com/stripe/stripe-php/tree/master"
+            },
             "time": "2019-08-29T16:56:12+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.18.1",
+            "version": "v1.20.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a"
+                "reference": "39d483bdf39be819deabf04ec872eb0b2410b531"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a6977d63bf9a0ad4c65cd352709e230876f9904a",
-                "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/39d483bdf39be819deabf04ec872eb0b2410b531",
+                "reference": "39d483bdf39be819deabf04ec872eb0b2410b531",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "suggest": {
                 "ext-mbstring": "For best performance"
@@ -501,7 +475,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
+                    "dev-main": "1.20-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -539,6 +513,9 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.20.0"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -553,7 +530,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "time": "2020-10-23T14:02:19+00:00"
         },
         {
             "name": "symfony/var-dumper",
@@ -616,6 +593,9 @@
                 "debug",
                 "dump"
             ],
+            "support": {
+                "source": "https://github.com/symfony/var-dumper/tree/master"
+            },
             "time": "2015-11-18T13:48:51+00:00"
         },
         {
@@ -678,40 +658,40 @@
                 "pdf417",
                 "qrcode"
             ],
+            "support": {
+                "source": "https://github.com/tecnickcom/TCPDF/tree/6.3.2"
+            },
             "time": "2019-09-20T09:35:01+00:00"
         }
     ],
     "packages-dev": [
         {
             "name": "doctrine/instantiator",
-            "version": "1.0.5",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b",
+                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3,<8.0-DEV"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "athletic/athletic": "~0.1.8",
+                "doctrine/coding-standard": "^8.0",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~2.0"
+                "phpbench/phpbench": "^0.13 || 1.0.0-alpha2",
+                "phpstan/phpstan": "^0.12",
+                "phpstan/phpstan-phpunit": "^0.12",
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
@@ -725,38 +705,59 @@
                 {
                     "name": "Marco Pivetta",
                     "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
+                    "homepage": "https://ocramius.github.io/"
                 }
             ],
             "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
+            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
             "keywords": [
                 "constructor",
                 "instantiate"
             ],
-            "time": "2015-06-14T21:17:01+00:00"
+            "support": {
+                "issues": "https://github.com/doctrine/instantiator/issues",
+                "source": "https://github.com/doctrine/instantiator/tree/1.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-11-10T18:47:58+00:00"
         },
         {
             "name": "php-parallel-lint/php-console-color",
-            "version": "v0.2",
+            "version": "v0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-parallel-lint/PHP-Console-Color.git",
-                "reference": "d5deaecff52a0d61ccb613bb3804088da0307191"
+                "reference": "b6af326b2088f1ad3b264696c9fd590ec395b49e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-parallel-lint/PHP-Console-Color/zipball/d5deaecff52a0d61ccb613bb3804088da0307191",
-                "reference": "d5deaecff52a0d61ccb613bb3804088da0307191",
+                "url": "https://api.github.com/repos/php-parallel-lint/PHP-Console-Color/zipball/b6af326b2088f1ad3b264696c9fd590ec395b49e",
+                "reference": "b6af326b2088f1ad3b264696c9fd590ec395b49e",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.4.0"
             },
+            "replace": {
+                "jakub-onderka/php-console-color": "*"
+            },
             "require-dev": {
-                "jakub-onderka/php-code-style": "1.0",
-                "jakub-onderka/php-parallel-lint": "1.0",
-                "jakub-onderka/php-var-dump-check": "0.*",
+                "php-parallel-lint/php-code-style": "1.0",
+                "php-parallel-lint/php-parallel-lint": "1.0",
+                "php-parallel-lint/php-var-dump-check": "0.*",
                 "phpunit/phpunit": "~4.3",
                 "squizlabs/php_codesniffer": "1.*"
             },
@@ -776,7 +777,11 @@
                     "email": "jakub.onderka@gmail.com"
                 }
             ],
-            "time": "2018-09-29T17:23:10+00:00"
+            "support": {
+                "issues": "https://github.com/php-parallel-lint/PHP-Console-Color/issues",
+                "source": "https://github.com/php-parallel-lint/PHP-Console-Color/tree/master"
+            },
+            "time": "2020-05-14T05:47:14+00:00"
         },
         {
             "name": "php-parallel-lint/php-console-highlighter",
@@ -825,6 +830,10 @@
                 }
             ],
             "description": "Highlight PHP code in terminal",
+            "support": {
+                "issues": "https://github.com/php-parallel-lint/PHP-Console-Highlighter/issues",
+                "source": "https://github.com/php-parallel-lint/PHP-Console-Highlighter/tree/master"
+            },
             "time": "2020-05-13T07:37:49+00:00"
         },
         {
@@ -872,39 +881,37 @@
             ],
             "description": "This tool check syntax of PHP files about 20x faster than serial check.",
             "homepage": "https://github.com/JakubOnderka/PHP-Parallel-Lint",
+            "support": {
+                "source": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/tree/v0.9.2"
+            },
             "time": "2015-12-15T10:42:16+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
-            "version": "1.0.1",
+            "version": "2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
+                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-2.x": "2.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src"
-                    ]
+                    "phpDocumentor\\Reflection\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -926,44 +933,45 @@
                 "reflection",
                 "static analysis"
             ],
-            "time": "2017-09-11T18:02:19+00:00"
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
+            },
+            "time": "2020-06-27T09:03:43+00:00"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "4.3.2",
+            "version": "5.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e"
+                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/b83ff7cfcfee7827e1e78b637a5904fe6a96698e",
-                "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556",
+                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0",
-                "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0",
-                "phpdocumentor/type-resolver": "~0.4 || ^1.0.0",
-                "webmozart/assert": "^1.0"
+                "ext-filter": "*",
+                "php": "^7.2 || ^8.0",
+                "phpdocumentor/reflection-common": "^2.2",
+                "phpdocumentor/type-resolver": "^1.3",
+                "webmozart/assert": "^1.9.1"
             },
             "require-dev": {
-                "doctrine/instantiator": "^1.0.5",
-                "mockery/mockery": "^1.0",
-                "phpunit/phpunit": "^6.4"
+                "mockery/mockery": "~1.3.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.x-dev"
+                    "dev-master": "5.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
+                    "phpDocumentor\\Reflection\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -974,37 +982,44 @@
                 {
                     "name": "Mike van Riel",
                     "email": "me@mikevanriel.com"
+                },
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "account@ijaap.nl"
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2019-09-12T14:27:41+00:00"
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master"
+            },
+            "time": "2020-09-03T19:13:55+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "0.5.1",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "cf842904952e64e703800d094cdf34e715a8a3ae"
+                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/cf842904952e64e703800d094cdf34e715a8a3ae",
-                "reference": "cf842904952e64e703800d094cdf34e715a8a3ae",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
+                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0",
-                "phpdocumentor/reflection-common": "^1.0"
+                "php": "^7.2 || ^8.0",
+                "phpdocumentor/reflection-common": "^2.0"
             },
             "require-dev": {
-                "mockery/mockery": "^1.0",
-                "phpunit/phpunit": "^6.4"
+                "ext-tokenizer": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-1.x": "1.x-dev"
                 }
             },
             "autoload": {
@@ -1022,37 +1037,42 @@
                     "email": "me@mikevanriel.com"
                 }
             ],
-            "time": "2017-12-30T13:23:38+00:00"
+            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
+            "support": {
+                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.4.0"
+            },
+            "time": "2020-09-17T18:55:26+00:00"
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.9.0",
+            "version": "v1.10.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203"
+                "reference": "451c3cd1418cf640de218914901e51b064abb093"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/f6811d96d97bdf400077a0cc100ae56aa32b9203",
-                "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093",
+                "reference": "451c3cd1418cf640de218914901e51b064abb093",
                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.0.2",
                 "php": "^5.3|^7.0",
                 "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
-                "sebastian/comparator": "^1.1|^2.0|^3.0",
-                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
+                "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0",
+                "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0"
             },
             "require-dev": {
-                "phpspec/phpspec": "^2.5|^3.2",
+                "phpspec/phpspec": "^2.5 || ^3.2",
                 "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.8.x-dev"
+                    "dev-master": "1.10.x-dev"
                 }
             },
             "autoload": {
@@ -1085,7 +1105,11 @@
                 "spy",
                 "stub"
             ],
-            "time": "2019-10-03T11:07:50+00:00"
+            "support": {
+                "issues": "https://github.com/phpspec/prophecy/issues",
+                "source": "https://github.com/phpspec/prophecy/tree/v1.10.3"
+            },
+            "time": "2020-03-05T15:02:03+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -1147,6 +1171,11 @@
                 "testing",
                 "xunit"
             ],
+            "support": {
+                "irc": "irc://irc.freenode.net/phpunit",
+                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/2.2"
+            },
             "time": "2015-10-06T15:47:00+00:00"
         },
         {
@@ -1194,6 +1223,11 @@
                 "filesystem",
                 "iterator"
             ],
+            "support": {
+                "irc": "irc://irc.freenode.net/phpunit",
+                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/1.4.5"
+            },
             "time": "2017-11-27T13:52:08+00:00"
         },
         {
@@ -1235,6 +1269,10 @@
             "keywords": [
                 "template"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1"
+            },
             "time": "2015-06-21T13:50:34+00:00"
         },
         {
@@ -1284,6 +1322,10 @@
             "keywords": [
                 "timer"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/master"
+            },
             "time": "2017-02-26T11:10:40+00:00"
         },
         {
@@ -1333,6 +1375,10 @@
             "keywords": [
                 "tokenizer"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-token-stream/issues",
+                "source": "https://github.com/sebastianbergmann/php-token-stream/tree/1.4"
+            },
             "abandoned": true,
             "time": "2017-12-04T08:55:13+00:00"
         },
@@ -1406,6 +1452,10 @@
                 "testing",
                 "xunit"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/4.8.36"
+            },
             "time": "2017-06-21T08:07:12+00:00"
         },
         {
@@ -1462,6 +1512,11 @@
                 "mock",
                 "xunit"
             ],
+            "support": {
+                "irc": "irc://irc.freenode.net/phpunit",
+                "issues": "https://github.com/sebastianbergmann/phpunit-mock-objects/issues",
+                "source": "https://github.com/sebastianbergmann/phpunit-mock-objects/tree/2.3"
+            },
             "abandoned": true,
             "time": "2015-10-02T06:51:40+00:00"
         },
@@ -1527,6 +1582,11 @@
                 "testing",
                 "xunit"
             ],
+            "support": {
+                "irc": "irc://irc.freenode.net/phpunit",
+                "issues": "https://github.com/sebastianbergmann/phpunit-selenium/issues",
+                "source": "https://github.com/giorgiosironi/phpunit-selenium/tree/2.x"
+            },
             "time": "2017-01-23T22:15:32+00:00"
         },
         {
@@ -1591,6 +1651,10 @@
                 "compare",
                 "equality"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/comparator/issues",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/1.2"
+            },
             "time": "2017-01-29T09:50:25+00:00"
         },
         {
@@ -1643,6 +1707,10 @@
             "keywords": [
                 "diff"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/diff/issues",
+                "source": "https://github.com/sebastianbergmann/diff/tree/1.4"
+            },
             "time": "2017-05-22T07:24:03+00:00"
         },
         {
@@ -1693,6 +1761,10 @@
                 "environment",
                 "hhvm"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/environment/issues",
+                "source": "https://github.com/sebastianbergmann/environment/tree/1.3"
+            },
             "time": "2016-08-18T05:49:44+00:00"
         },
         {
@@ -1760,6 +1832,10 @@
                 "export",
                 "exporter"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/exporter/issues",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/master"
+            },
             "time": "2016-06-17T09:04:28+00:00"
         },
         {
@@ -1811,6 +1887,10 @@
             "keywords": [
                 "global state"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/global-state/issues",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/1.1.1"
+            },
             "time": "2015-10-12T03:26:01+00:00"
         },
         {
@@ -1864,6 +1944,10 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/master"
+            },
             "time": "2016-10-03T07:41:43+00:00"
         },
         {
@@ -1899,6 +1983,10 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/version/issues",
+                "source": "https://github.com/sebastianbergmann/version/tree/1.0.6"
+            },
             "time": "2015-06-21T13:59:46+00:00"
         },
         {
@@ -1977,24 +2065,29 @@
                 "phpcs",
                 "standards"
             ],
+            "support": {
+                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
+                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
+                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
+            },
             "time": "2018-11-07T22:31:41+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.12.0",
+            "version": "v1.20.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "550ebaac289296ce228a706d0867afc34687e3f4"
+                "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4",
-                "reference": "550ebaac289296ce228a706d0867afc34687e3f4",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f4ba089a5b6366e453971d3aad5fe8e897b37f41",
+                "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "suggest": {
                 "ext-ctype": "For best performance"
@@ -2002,7 +2095,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.12-dev"
+                    "dev-main": "1.20-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -2035,65 +2132,9 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2019-08-06T08:03:45+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php72",
-            "version": "v1.18.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "639447d008615574653fb3bc60d1986d7172eaae"
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.20.0"
             },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/639447d008615574653fb3bc60d1986d7172eaae",
-                "reference": "639447d008615574653fb3bc60d1986d7172eaae",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.18-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php72\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -2108,100 +2149,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-14T12:35:20+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php80",
-            "version": "v1.18.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/d87d5766cbf48d72388a9f6b85f280c8ad51f981",
-                "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.0.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.18-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ],
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Ion Bazan",
-                    "email": "ion.bazan@gmail.com"
-                },
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "time": "2020-10-23T14:02:19+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v3.4.32",
+            "version": "v3.4.47",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "768f817446da74a776a31eea335540f9dcb53942"
+                "reference": "88289caa3c166321883f67fe5130188ebbb47094"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/768f817446da74a776a31eea335540f9dcb53942",
-                "reference": "768f817446da74a776a31eea335540f9dcb53942",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/88289caa3c166321883f67fe5130188ebbb47094",
+                "reference": "88289caa3c166321883f67fe5130188ebbb47094",
                 "shasum": ""
             },
             "require": {
@@ -2218,11 +2179,6 @@
                 "symfony/console": "For validating YAML files using the lint command"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.4-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Yaml\\": ""
@@ -2247,35 +2203,51 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2019-09-10T10:38:46+00:00"
+            "support": {
+                "source": "https://github.com/symfony/yaml/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-10-24T10:57:07+00:00"
         },
         {
             "name": "webmozart/assert",
-            "version": "1.5.0",
+            "version": "1.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozart/assert.git",
-                "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4"
+                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/88e6d84706d09a236046d686bbea96f07b3a34f4",
-                "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
+                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0",
+                "php": "^5.3.3 || ^7.0 || ^8.0",
                 "symfony/polyfill-ctype": "^1.8"
             },
+            "conflict": {
+                "phpstan/phpstan": "<0.12.20",
+                "vimeo/psalm": "<3.9.1"
+            },
             "require-dev": {
                 "phpunit/phpunit": "^4.8.36 || ^7.5.13"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Webmozart\\Assert\\": "src/"
@@ -2297,7 +2269,11 @@
                 "check",
                 "validate"
             ],
-            "time": "2019-08-24T08:43:50+00:00"
+            "support": {
+                "issues": "https://github.com/webmozart/assert/issues",
+                "source": "https://github.com/webmozart/assert/tree/master"
+            },
+            "time": "2020-07-08T17:02:28+00:00"
         }
     ],
     "aliases": [],
@@ -2312,5 +2288,5 @@
         "ext-curl": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "1.1.0"
+    "plugin-api-version": "2.0.0"
 }
diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
index 5f09d9536be..3db28d1f98e 100644
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -48,6 +48,7 @@ By
 * In file nusoap.php, to avoid a warning,
 Replace call to serialize_val with no bugged value
 
+* In all files, replace constructor names into __construct. Replace also parent::constructor_name with parent::__construct
 
 
 
@@ -217,14 +218,6 @@ JQUERYFILETREE:
 * Remove directory htdocs/includes/jquery/plugins/jqueryFileTree/connectors
 
 
-PHPEXCEL:
----------
-* Replace in htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE.php
-    continue;
-with:
-    continue 2;
-
-
 RESTLER:
 --------
 Change content of file htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
diff --git a/dev/examples/zapier/.editorconfig b/dev/examples/zapier/.editorconfig
new file mode 100644
index 00000000000..9228bbb156b
--- /dev/null
+++ b/dev/examples/zapier/.editorconfig
@@ -0,0 +1,21 @@
+# EditorConfig is awesome: https://editorconfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+end_of_line = lf
+
+[*.js]
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = false
diff --git a/dev/examples/zapier/.gitignore b/dev/examples/zapier/.gitignore
index d81e057e6d3..3e9263e351f 100644
--- a/dev/examples/zapier/.gitignore
+++ b/dev/examples/zapier/.gitignore
@@ -5,3 +5,4 @@ node_modules
 .environment
 .env
 .zapierapprc
+package-lock.json
diff --git a/dev/examples/zapier/README.md b/dev/examples/zapier/README.md
new file mode 100644
index 00000000000..453a5224993
--- /dev/null
+++ b/dev/examples/zapier/README.md
@@ -0,0 +1,68 @@
+# HOW TO BUILD
+
+
+## ENABLE MODULE ZAPIER ON DOLIBARR
+
+This should also enable the module API (required for authentication by Zapier service and to execute action in Dolibarr by Zapier).
+
+Create the Dolibarr login that will be used by Zapier to call APIs. Give the login the permissions on the action you plan to automate.
+
+
+## CREATE A ZAPIER DEVELOPPER ACCOUNT
+
+At first, you need to have a Zapier developper acoount, create it here [Zapier Platform](https://developer.zapier.com/)
+
+
+## INSTALL ZAPIER COMMAND LINE TOOLS WITH LINK TO ZAPIER ONLINE ACCOUNT
+
+### Install Node.js
+
+An easy option to get set up with Node.js is to visit [https://nodejs.org/en/download/](https://nodejs.org/en/download/) and download the official installer for your OS. If you're installing with a package manager it's even easier.
+
+After installation, confirm that Node.js is ready to use:
+  `node --version`
+
+### Install the Zapier CLI
+
+Next let's install the Zapier CLI tools. The CLI will allow you to build your app, deploy it to the Zapier platform, do local testing, manage users and testers, view remote logs, collaborate with your team, and more:
+
+  `cd dev/examples/zapier`
+
+  `npm install -g zapier-platform-cli` to install the CLI globally
+
+  `zapier --version` to return version of the CLI
+
+### Run Zapier Login
+
+Let's configure authentication between your dev environment and the Zapier platform. You'll use the email address and password you use to log in to the Zapier application.
+
+  `zapier login`
+
+This command will set up a .zapierrc file in your home directory.
+
+### Install the Project
+
+In zapier example directory, run:
+
+  `cd dev/examples/zapier`
+
+  `npm install`
+
+### Deploying your App
+
+Let's deploy it! When you're ready to try your code out on the Zapier platform use the push command. Only you will be able to see the app until you invite testers.
+
+  `zapier register`   (the first time, choose name for example "Dolibarr")
+  
+  `zapier push`
+
+After a push, the Application, with the name you defined during the register step, is available when creating a Zap.
+
+You will find original tutorial here : [https://zapier.com/developer/start/introduction](https://zapier.com/developer/start/introduction)
+
+
+### Create a Zap
+
+Create a ZAP that use the application you registered.
+For authentication, you must enter the login / pass of account used by Zapier to call APIs.
+
diff --git a/dev/examples/zapier/authentication.js b/dev/examples/zapier/authentication.js
index 1c95c76f9c2..fceedd4ab5f 100644
--- a/dev/examples/zapier/authentication.js
+++ b/dev/examples/zapier/authentication.js
@@ -1,6 +1,6 @@
 /*jshint esversion: 6 */
-const testAuth = (z , bundle) => {
-    const url = bundle.authData.url+'/api/index.php/login';
+const test = (z , bundle) => {
+    const url = bundle.authData.url+'/api/index.php/status';
     // Normally you want to make a request to an endpoint that is either specifically designed to test auth, or one that
     // every user will have access to, such as an account or profile endpoint like /me.
     // In this example, we'll hit httpbin, which validates the Authorization Header against the arguments passed in the URL path
@@ -11,67 +11,92 @@ const testAuth = (z , bundle) => {
     // This method can return any truthy value to indicate the credentials are valid.
     // Raise an error to show
     return promise.then((response) => {
-        if (response.status === 401) {
-            throw new Error('The Session Key you supplied is invalid');
+        if (response.status === 400) {
+            throw new Error('400 -The Session Key you supplied is invalid');
+        }
+        if (response.status === 403) {
+            throw new Error('403 -The Session Key you supplied is invalid');
         }
         return response;
     });
 };
 
-const getSessionKey = (z, bundle) => {
+// To include the session key header on all outbound requests, simply define a function here.
+// It runs runs before each request is sent out, allowing you to make tweaks to the request in a centralized spot
+const includeSessionKeyHeader = (request, z, bundle) => {
+    if (bundle.authData.sessionKey) {
+        request.headers = request.headers || {};
+        request.headers['DOLAPIKEY'] = bundle.authData.sessionKey;
+    }
+    return request;
+};
+
+// If we get a response and it is a 401, we can raise a special error telling Zapier to retry this after another exchange.
+const sessionRefreshIf401 = (response, z, bundle) => {
+    if (bundle.authData.sessionKey) {
+        if (response.status === 401) {
+            throw new z.errors.RefreshAuthError('Session apikey needs refreshing.');
+        }
+    }
+    return response;
+};
+
+const getSessionKey = async (z, bundle) => {
     const url = bundle.authData.url + '/api/index.php/login';
 
-    const promise = z.request({
-        method: 'POST',
+    const response = await z.request({
         url: url,
+        method: 'POST',
         body: {
             login: bundle.authData.login,
             password: bundle.authData.password,
-        }
+        },
     });
 
-    return promise.then((response) => {
-        if (response.status === 401) {
-            throw new Error('The login/password you supplied is invalid');
-        }
-        const json = JSON.parse(response.content);
-        return {
-            sessionKey: json.success.token || 'secret'
-        };
-    });
+    // if (response.status === 401) {
+    //     throw new Error('The login/password you supplied is invalid');
+    // }
+    const json = JSON.parse(response.content);
+    return {
+        sessionKey: json.success.token || '',
+    };
 };
 
 module.exports = {
-    type: 'session',
-    // Define any auth fields your app requires here. The user will be prompted to enter this info when
-    // they connect their account.
-    fields: [
-        {
-            key: 'url',
-            label: 'Url of service',
-            required: true,
-            type: 'string'
+    config: {
+        type: 'session',
+        sessionConfig: {
+            perform: getSessionKey
         },
-        {
-            key: 'login',
-            label: 'Login',
-            required: true,
-            type: 'string'
-        },
-        {
-            key: 'password',
-            label: 'Password',
-            required: true,
-            type: 'password'
-        }
-    ],
-    // The test method allows Zapier to verify that the credentials a user provides are valid. We'll execute this
-    // method whenever a user connects their account for the first time.
-    test: testAuth,
-    // The method that will exchange the fields provided by the user for session credentials.
-    sessionConfig: {
-        perform: getSessionKey
+        // Define any auth fields your app requires here. The user will be prompted to enter this info when
+        // they connect their account.
+        fields: [
+            {
+                key: 'url',
+                label: 'Url of service without trailing-slash',
+                required: true,
+                type: 'string'
+            },
+            {
+                key: 'login',
+                label: 'Login',
+                required: true,
+                type: 'string'
+            },
+            {
+                key: 'password',
+                label: 'Password',
+                required: true,
+                type: 'password'
+            }
+        ],
+        // The test method allows Zapier to verify that the credentials a user provides are valid. We'll execute this
+        // method whenever a user connects their account for the first time.
+        test,
+        // The method that will exchange the fields provided by the user for session credentials.
+        // assuming "login" is a key returned from the test
+        connectionLabel: '{{login}}'
     },
-    // assuming "login" is a key returned from the test
-    connectionLabel: '{{login}}'
+    befores: [includeSessionKeyHeader],
+    afters: [sessionRefreshIf401],
 };
diff --git a/dev/examples/zapier/creates/thirdparty.js b/dev/examples/zapier/creates/thirdparty.js
index 82cc39f8fab..3e20fd10e41 100644
--- a/dev/examples/zapier/creates/thirdparty.js
+++ b/dev/examples/zapier/creates/thirdparty.js
@@ -72,7 +72,7 @@ module.exports = {
         },
 
         outputFields: [
-            {key: 'id', label: 'ID'},
+            {key: 'id', type: "integer", label: 'ID'},
             {key: 'name', label: 'Name'},
             {key: 'name_alias', label: 'Name alias'},
             {key: 'address', label: 'Address'},
@@ -81,8 +81,8 @@ module.exports = {
             {key: 'phone', label: 'Phone'},
             {key: 'fax', label: 'Fax'},
             {key: 'email', label: 'Email'},
-            {key: 'client', label: 'Customer/Prospect 0/1/2/3'},
-            {key: 'fournisseur', label: 'Supplier 0/1'},
+            {key: 'client', type: "integer", label: 'Customer/Prospect 0/1/2/3'},
+            {key: 'fournisseur', type: "integer", label: 'Supplier 0/1'},
             {key: 'code_client', label: 'Customer code'},
             {key: 'code_fournisseur', label: 'Supplier code'}
         ]
diff --git a/dev/examples/zapier/index.js b/dev/examples/zapier/index.js
index fc452a196e6..d1897673b39 100644
--- a/dev/examples/zapier/index.js
+++ b/dev/examples/zapier/index.js
@@ -1,33 +1,39 @@
 /*jshint esversion: 6 */
-const triggerThirdparty = require('./triggers/thirdparty');
-const triggerOrder = require('./triggers/order');
 const triggerAction = require('./triggers/action');
+const triggerOrder = require('./triggers/order');
+const triggerThirdparty = require('./triggers/thirdparty');
+const triggerTicket = require('./triggers/ticket');
+const triggerUser = require('./triggers/user');
 
 const searchThirdparty = require('./searches/thirdparty');
 
 const createThirdparty = require('./creates/thirdparty');
 
-const authentication = require('./authentication');
+const {
+    config: authentication,
+    befores = [],
+    afters = [],
+} = require('./authentication');
 
 // To include the session key header on all outbound requests, simply define a function here.
 // It runs runs before each request is sent out, allowing you to make tweaks to the request in a centralized spot
-const includeSessionKeyHeader = (request, z, bundle) => {
-    if (bundle.authData.sessionKey) {
-        request.headers = request.headers || {};
-        request.headers['DOLAPIKEY'] = bundle.authData.sessionKey;
-    }
-    return request;
-};
+// const includeSessionKeyHeader = (request, z, bundle) => {
+//     if (bundle.authData.sessionKey) {
+//         request.headers = request.headers || {};
+//         request.headers['DOLAPIKEY'] = bundle.authData.sessionKey;
+//     }
+//     return request;
+// };
 
 // If we get a response and it is a 401, we can raise a special error telling Zapier to retry this after another exchange.
-const sessionRefreshIf401 = (response, z, bundle) => {
-    if (bundle.authData.sessionKey) {
-        if (response.status === 401) {
-            throw new z.errors.RefreshAuthError('Session apikey needs refreshing.');
-        }
-    }
-    return response;
-};
+// const sessionRefreshIf401 = (response, z, bundle) => {
+//     if (bundle.authData.sessionKey) {
+//         if (response.status === 401) {
+//             throw new z.errors.RefreshAuthError('Session apikey needs refreshing.');
+//         }
+//     }
+//     return response;
+// };
 
 // We can roll up all our behaviors in an App.
 const App = {
@@ -40,11 +46,11 @@ const App = {
 
     // beforeRequest & afterResponse are optional hooks into the provided HTTP client
     beforeRequest: [
-        includeSessionKeyHeader
+        ...befores
     ],
 
     afterResponse: [
-        sessionRefreshIf401
+        ...afters
     ],
 
     // If you want to define optional resources to simplify creation of triggers, searches, creates - do that here!
@@ -53,9 +59,11 @@ const App = {
 
     // If you want your trigger to show up, you better include it here!
     triggers: {
-        [triggerThirdparty.key]: triggerThirdparty,
+        [triggerAction.key]: triggerAction,
         [triggerOrder.key]: triggerOrder,
-        [triggerAction.key]: triggerAction
+        [triggerThirdparty.key]: triggerThirdparty,
+        [triggerTicket.key]: triggerTicket,
+        [triggerUser.key]: triggerUser,
     },
 
     // If you want your searches to show up, you better include it here!
diff --git a/dev/examples/zapier/package-lock.json b/dev/examples/zapier/package-lock.json
deleted file mode 100644
index 7483948d5b8..00000000000
--- a/dev/examples/zapier/package-lock.json
+++ /dev/null
@@ -1,405 +0,0 @@
-{
-  "name": "Dolibarr",
-  "version": "1.0.2",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "@types/node": {
-      "version": "8.10.20",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.20.tgz",
-      "integrity": "sha512-M7x8+5D1k/CuA6jhiwuSCmE8sbUWJF0wYsjcig9WrXvwUI5ArEoUBdOXpV4JcEMrLp02/QbDjw+kI+vQeKyQgg==",
-      "optional": true
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
-    },
-    "bluebird": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
-      "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw="
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "browser-stdout": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
-      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-      "dev": true
-    },
-    "combined-stream": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
-      "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
-    "commander": {
-      "version": "2.15.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
-      "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
-      "dev": true
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "content-disposition": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
-      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
-    },
-    "debug": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-      "dev": true,
-      "requires": {
-        "ms": "2.0.0"
-      }
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-    },
-    "diff": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
-      "dev": true
-    },
-    "dotenv": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-5.0.1.tgz",
-      "integrity": "sha512-4As8uPrjfwb7VXC+WnLCbXK7y+Ueb2B3zgNCePYfhxS1PYeaO1YTeplffTEcbfLhvFNGLAz90VvJs9yomG7bow=="
-    },
-    "encoding": {
-      "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
-      "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
-      "requires": {
-        "iconv-lite": "~0.4.13"
-      }
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
-    },
-    "form-data": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
-      "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "1.0.6",
-        "mime-types": "^2.1.12"
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "glob": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-      "dev": true,
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "growl": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
-      "dev": true
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true
-    },
-    "he": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
-      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
-      "dev": true
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
-    },
-    "is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-    },
-    "json-tryparse": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/json-tryparse/-/json-tryparse-1.0.5.tgz",
-      "integrity": "sha1-Khy6CLTjEjNo+p+2o01GQwBFeyc="
-    },
-    "jsonschema": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.1.1.tgz",
-      "integrity": "sha1-PO3o4+QR03eHLu+8n98mODy8Ptk="
-    },
-    "lodash": {
-      "version": "4.17.11",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
-    },
-    "mime-db": {
-      "version": "1.38.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz",
-      "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="
-    },
-    "mime-types": {
-      "version": "2.1.22",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz",
-      "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==",
-      "requires": {
-        "mime-db": "~1.38.0"
-      }
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-      "dev": true
-    },
-    "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "dev": true,
-      "requires": {
-        "minimist": "0.0.8"
-      }
-    },
-    "mocha": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
-      "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==",
-      "dev": true,
-      "requires": {
-        "browser-stdout": "1.3.1",
-        "commander": "2.15.1",
-        "debug": "3.1.0",
-        "diff": "3.5.0",
-        "escape-string-regexp": "1.0.5",
-        "glob": "7.1.2",
-        "growl": "1.10.5",
-        "he": "1.1.1",
-        "minimatch": "3.0.4",
-        "mkdirp": "0.5.1",
-        "supports-color": "5.4.0"
-      }
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node-fetch": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.1.tgz",
-      "integrity": "sha512-j8XsFGCLw79vWXkZtMSmmLaOk9z5SQ9bV/tkbZVCqvgwzrjAGq66igobLofHtF63NvMTp2WjytpsNTGKa+XRIQ==",
-      "requires": {
-        "encoding": "^0.1.11",
-        "is-stream": "^1.0.1"
-      }
-    },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "semver": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-      "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
-    },
-    "should": {
-      "version": "13.2.3",
-      "resolved": "https://registry.npmjs.org/should/-/should-13.2.3.tgz",
-      "integrity": "sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==",
-      "dev": true,
-      "requires": {
-        "should-equal": "^2.0.0",
-        "should-format": "^3.0.3",
-        "should-type": "^1.4.0",
-        "should-type-adaptors": "^1.0.1",
-        "should-util": "^1.0.0"
-      }
-    },
-    "should-equal": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/should-equal/-/should-equal-2.0.0.tgz",
-      "integrity": "sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==",
-      "dev": true,
-      "requires": {
-        "should-type": "^1.4.0"
-      }
-    },
-    "should-format": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz",
-      "integrity": "sha1-m/yPdPo5IFxT04w01xcwPidxJPE=",
-      "dev": true,
-      "requires": {
-        "should-type": "^1.3.0",
-        "should-type-adaptors": "^1.0.1"
-      }
-    },
-    "should-type": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/should-type/-/should-type-1.4.0.tgz",
-      "integrity": "sha1-B1bYzoRt/QmEOmlHcZ36DUz/XPM=",
-      "dev": true
-    },
-    "should-type-adaptors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz",
-      "integrity": "sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==",
-      "dev": true,
-      "requires": {
-        "should-type": "^1.3.0",
-        "should-util": "^1.0.0"
-      }
-    },
-    "should-util": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/should-util/-/should-util-1.0.0.tgz",
-      "integrity": "sha1-yYzaN0qmsZDfi6h8mInCtNtiAGM=",
-      "dev": true
-    },
-    "supports-color": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-      "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-      "dev": true,
-      "requires": {
-        "has-flag": "^3.0.0"
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    },
-    "zapier-platform-core": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/zapier-platform-core/-/zapier-platform-core-8.0.1.tgz",
-      "integrity": "sha512-vuAe7JkFQ88AeQ//NwwNEh8ZjiZr30GRWtwYo7Wo/nx1cqZwq+CRc9zJU2WRrhJfJOtOOTUF6w+pArBTtMOC5A==",
-      "requires": {
-        "@types/node": "8.10.20",
-        "bluebird": "3.5.0",
-        "content-disposition": "0.5.2",
-        "dotenv": "5.0.1",
-        "form-data": "2.3.2",
-        "lodash": "4.17.11",
-        "node-fetch": "1.7.1",
-        "oauth-sign": "0.9.0",
-        "semver": "5.6.0",
-        "zapier-platform-schema": "8.0.1"
-      }
-    },
-    "zapier-platform-schema": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/zapier-platform-schema/-/zapier-platform-schema-8.0.1.tgz",
-      "integrity": "sha512-97KJ0xVLtpU4BiXVaMTPQpiA0T6CQIEzWfzAWwJAWbu5336+6DMFUzDWN4bANBeD3CIsRHHPcZkP8n/17U05ag==",
-      "requires": {
-        "jsonschema": "1.1.1",
-        "lodash": "4.17.10"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.10",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
-          "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
-        }
-      }
-    }
-  }
-}
diff --git a/dev/examples/zapier/package.json b/dev/examples/zapier/package.json
index 8fbd203f962..4266a6f00b1 100644
--- a/dev/examples/zapier/package.json
+++ b/dev/examples/zapier/package.json
@@ -1,9 +1,9 @@
 {
-  "name": "Dolibarr",
-  "version": "1.0.0",
+  "name": "dolibarr",
+  "version": "1.13.0",
   "description": "An app for connecting Dolibarr to the Zapier platform.",
   "repository": "Dolibarr/dolibarr",
-  "homepage": "https://www.dolibarr.fr/",
+  "homepage": "https://www.dolibarr.org/",
   "author": "Frédéric France <frederic.france@netlogic.fr>",
   "license": "BSD-3-Clause",
   "main": "index.js",
@@ -15,7 +15,7 @@
     "npm": ">=5.6.0"
   },
   "dependencies": {
-    "zapier-platform-core": "8.0.1"
+    "zapier-platform-core": "10.1.2"
   },
   "devDependencies": {
     "mocha": "^5.2.0",
diff --git a/dev/examples/zapier/searches/thirdparty.js b/dev/examples/zapier/searches/thirdparty.js
index c71c2965789..8f72b9270e5 100644
--- a/dev/examples/zapier/searches/thirdparty.js
+++ b/dev/examples/zapier/searches/thirdparty.js
@@ -54,13 +54,20 @@ module.exports = {
         // outputFields: () => { return []; }
         // Alternatively, a static field definition should be provided, to specify labels for the fields
         outputFields: [
-            {key: 'id', label: 'ID'},
-            {key: 'createdAt', label: 'Created At'},
+            {
+                key: 'id',
+                type: "integer",
+                label: 'ID'
+            },
+            {key: 'createdAt', type: "integer", label: 'Created At'},
             {key: 'name', label: 'Name'},
             {key: 'firstname', label: 'Firstname'},
             {key: 'directions', label: 'Directions'},
-            {key: 'authorId', label: 'Author ID'},
-            {key: 'style', label: 'Style'}
+            {key: 'authorId', type: "integer", label: 'Author ID'},
+            {
+                key: 'style',
+                label: 'Style'
+            }
         ]
     }
 };
diff --git a/dev/examples/zapier/triggers/action.js b/dev/examples/zapier/triggers/action.js
index d387d88ec1f..0e152473869 100644
--- a/dev/examples/zapier/triggers/action.js
+++ b/dev/examples/zapier/triggers/action.js
@@ -10,14 +10,14 @@ const subscribeHook = (z, bundle) => {
         action: bundle.inputData.action
     };
 
-    const url = bundle.authData.url  + '/api/index.php/zapierapi/hook';
+    const url = bundle.authData.url + '/api/index.php/zapierapi/hook';
 
     // You can build requests and our client will helpfully inject all the variables
     // you need to complete. You can also register middleware to control this.
     const options = {
         url: url,
         method: 'POST',
-        body: JSON.stringify(data)
+        body: data,
     };
 
     // You may return a promise or a normal data structure from any perform method.
@@ -32,7 +32,7 @@ const unsubscribeHook = (z, bundle) => {
     // You can build requests and our client will helpfully inject all the variables
     // you need to complete. You can also register middleware to control this.
     const options = {
-        url: bundle.authData.url  + '/api/index.php/zapierapi/hook/' + bundle.subscribeData.id,
+        url: bundle.authData.url + '/api/index.php/zapierapi/hook/' + bundle.subscribeData.id,
         method: 'DELETE',
     };
 
@@ -74,7 +74,7 @@ const getFallbackRealAction = (z, bundle) => {
     // For the test poll, you should get some real data, to aid the setup process.
     const module = bundle.inputData.module;
     const options = {
-        url: bundle.authData.url  + '/api/index.php/agendaevents/0',
+        url: bundle.authData.url + '/api/index.php/agendaevents/0',
     };
 
     return z.request(options).then((response) => [JSON.parse(response.content)]);
@@ -100,7 +100,7 @@ module.exports = {
     noun: 'Action',
     display: {
         label: 'New Agenda',
-        description: 'Trigger when a new agenda with action is done in Dolibarr.'
+        description: 'Triggers when a new agenda with action is done in Dolibarr.'
     },
 
     // `operation` is where the business logic goes.
@@ -111,6 +111,7 @@ module.exports = {
         inputFields: [
             {
                 key: 'action',
+                required: true,
                 type: 'string',
                 helpText: 'Which action of agenda this should trigger on.',
                 choices: {
@@ -145,12 +146,33 @@ module.exports = {
         // outputFields: () => { return []; }
         // Alternatively, a static field definition should be provided, to specify labels for the fields
         outputFields: [
-            {key: 'id', label: 'ID'},
-            {key: 'createdAt', label: 'Created At'},
-            {key: 'name', label: 'Name'},
-            {key: 'usertodo__name', label: 'UserToDo Name'},
-            {key: 'authorId', label: 'Author ID'},
-            {key: 'action', label: 'Action'}
+            {
+                key: 'id',
+                type: "integer",
+                label: 'ID'
+            },
+            {
+                key: 'createdAt',
+                type: "integer",
+                label: 'Created At'
+            },
+            {
+                key: 'name',
+                label: 'Name'
+            },
+            {
+                key: 'usertodo__name',
+                label: 'UserToDo Name'
+            },
+            {
+                key: 'authorId',
+                type: "integer",
+                label: 'Author ID'
+            },
+            {
+                key: 'action',
+                label: 'Action'
+            }
         ]
     }
 };
diff --git a/dev/examples/zapier/triggers/order.js b/dev/examples/zapier/triggers/order.js
index 6262d734edc..061ce218d10 100644
--- a/dev/examples/zapier/triggers/order.js
+++ b/dev/examples/zapier/triggers/order.js
@@ -17,7 +17,7 @@ const subscribeHook = (z, bundle) => {
     const options = {
         url: url,
         method: 'POST',
-        body: JSON.stringify(data)
+        body: data,
     };
 
     // You may return a promise or a normal data structure from any perform method.
@@ -90,7 +90,7 @@ module.exports = {
     noun: 'Order',
     display: {
         label: 'New Order',
-        description: 'Trigger when a new order with action is done in Dolibarr.'
+        description: 'Triggers when a new order with action is done in Dolibarr.'
     },
 
     // `operation` is where the business logic goes.
@@ -101,6 +101,7 @@ module.exports = {
         inputFields: [
             {
                 key: 'action',
+                required: true,
                 type: 'string',
                 helpText: 'Which action of order this should trigger on.',
                 choices: {
@@ -136,11 +137,11 @@ module.exports = {
         // outputFields: () => { return []; }
         // Alternatively, a static field definition should be provided, to specify labels for the fields
         outputFields: [
-            {key: 'id', label: 'ID'},
-            {key: 'createdAt', label: 'Created At'},
+            {key: 'id', type: "integer", label: 'ID'},
+            {key: 'createdAt', type: "integer", label: 'Created At'},
             {key: 'name', label: 'Name'},
             {key: 'directions', label: 'Directions'},
-            {key: 'authorId', label: 'Author ID'},
+            {key: 'authorId', type: "integer", label: 'Author ID'},
             {key: 'module', label: 'Module'},
             {key: 'action', label: 'Action'}
         ]
diff --git a/dev/examples/zapier/triggers/thirdparty.js b/dev/examples/zapier/triggers/thirdparty.js
index 4b13e23ff1c..4656f836e74 100644
--- a/dev/examples/zapier/triggers/thirdparty.js
+++ b/dev/examples/zapier/triggers/thirdparty.js
@@ -17,7 +17,7 @@ const subscribeHook = (z, bundle) => {
     const options = {
         url: url,
         method: 'POST',
-        body: JSON.stringify(data)
+        body: data,
     };
 
     // You may return a promise or a normal data structure from any perform method.
@@ -112,7 +112,7 @@ module.exports = {
     noun: 'Thirdparty',
     display: {
         label: 'New Thirdparty',
-        description: 'Trigger when a new thirdpaty action is done in Dolibarr.'
+        description: 'Triggers when a new thirdpaty action is done in Dolibarr.'
     },
 
     // `operation` is where the business logic goes.
@@ -123,6 +123,7 @@ module.exports = {
         inputFields: [
             {
                 key: 'action',
+                required: true,
                 type: 'string',
                 helpText: 'Which action of thirdparty this should trigger on.',
                 choices: {
@@ -159,12 +160,12 @@ module.exports = {
         // outputFields: () => { return []; }
         // Alternatively, a static field definition should be provided, to specify labels for the fields
         outputFields: [
-            {key: 'id', label: 'ID'},
+            {key: 'id', type: "integer", label: 'ID'},
             {key: 'createdAt', label: 'Created At'},
             {key: 'name', label: 'Name'},
             {key: 'name_alias', label: 'Name alias'},
-            {key: 'firstname', label: 'Firstame'},
-            {key: 'authorId', label: 'Author ID'},
+            {key: 'firstname', label: 'Firstname'},
+            {key: 'authorId', type: "integer", label: 'Author ID'},
             {key: 'action', label: 'Action'},
             {key: 'client', label: 'Customer/Prospect 0/1/2/3'},
             {key: 'fournisseur', label: 'Supplier 0/1'},
diff --git a/dev/examples/zapier/triggers/ticket.js b/dev/examples/zapier/triggers/ticket.js
new file mode 100644
index 00000000000..c642099bd55
--- /dev/null
+++ b/dev/examples/zapier/triggers/ticket.js
@@ -0,0 +1,237 @@
+const subscribeHook = (z, bundle) => {
+    // `z.console.log()` is similar to `console.log()`.
+    z.console.log('suscribing hook!');
+
+    // bundle.targetUrl has the Hook URL this app should call when an action is created.
+    const data = {
+        url: bundle.targetUrl,
+        event: bundle.event,
+        module: 'ticket',
+        action: bundle.inputData.action
+    };
+
+    const url = bundle.authData.url  + '/api/index.php/zapierapi/hook';
+
+    // You can build requests and our client will helpfully inject all the variables
+    // you need to complete. You can also register middleware to control this.
+    const options = {
+        url: url,
+        method: 'POST',
+        body: data,
+    };
+
+    // You may return a promise or a normal data structure from any perform method.
+    return z.request(options).then((response) => JSON.parse(response.content));
+};
+
+const unsubscribeHook = (z, bundle) => {
+    // bundle.subscribeData contains the parsed response JSON from the subscribe
+    // request made initially.
+    z.console.log('unsuscribing hook!');
+
+    // You can build requests and our client will helpfully inject all the variables
+    // you need to complete. You can also register middleware to control this.
+    const options = {
+        url: bundle.authData.url + '/api/index.php/zapierapi/hook/' + bundle.subscribeData.id,
+        method: 'DELETE',
+    };
+
+    // You may return a promise or a normal data structure from any perform method.
+    return z.request(options).then((response) => JSON.parse(response.content));
+};
+
+const getTicket = (z, bundle) => {
+    // bundle.cleanedRequest will include the parsed JSON object (if it's not a
+    // test poll) and also a .querystring property with the URL's query string.
+    const ticket = {
+        id: bundle.cleanedRequest.id,
+        track_id: bundle.cleanedRequest.track_id,
+        subject: bundle.cleanedRequest.subject,
+        message: bundle.cleanedRequest.message,
+        lastname: bundle.cleanedRequest.lastname,
+        firstname: bundle.cleanedRequest.firstname,
+        address: bundle.cleanedRequest.address,
+        zip: bundle.cleanedRequest.zip,
+        town: bundle.cleanedRequest.town,
+        email_from: bundle.cleanedRequest.email_from,
+        login: bundle.cleanedRequest.login,
+        authorId: bundle.cleanedRequest.authorId,
+        createdAt: bundle.cleanedRequest.createdAt,
+        action: bundle.cleanedRequest.action
+    };
+
+    return [ticket];
+};
+
+const getFallbackRealTicket = (z, bundle) => {
+    // For the test poll, you should get some real data, to aid the setup process.
+    const module = bundle.inputData.module;
+    const options = {
+        url: bundle.authData.url + '/api/index.php/tickets/0',
+    };
+
+    return z.request(options).then((response) => [JSON.parse(response.content)]);
+};
+
+// const getModulesChoices = (z/*, bundle*/) => {
+//     // For the test poll, you should get some real data, to aid the setup process.
+//     const options = {
+//         url: bundle.authData.url + '/api/index.php/zapierapi/getmoduleschoices',
+//     };
+
+//     return z.request(options).then((response) => JSON.parse(response.content));
+// };
+// const getModulesChoices = () => {
+
+//     return {
+//         orders: "Order",
+//         invoices: "Invoice",
+//         thirdparties: "Thirdparty",
+//         users: "User",
+//         tickets: "Ticket",
+//         contacts: "Contacts"
+//     };
+// };
+
+// const getActionsChoices = (z, bundle) => {
+//     // For the test poll, you should get some real data, to aid the setup process.
+//     const module = bundle.inputData.module;
+//     const options = {
+//         url:  url: bundle.authData.url + '/api/index.php/zapierapi/getactionschoices/thirparty`,
+//     };
+
+//     return z.request(options).then((response) => JSON.parse(response.content));
+// };
+
+// We recommend writing your triggers separate like this and rolling them
+// into the App definition at the end.
+module.exports = {
+    key: 'ticket',
+
+    // You'll want to provide some helpful display labels and descriptions
+    // for tickets. Zapier will put them into the UX.
+    noun: 'Ticket',
+    display: {
+        label: 'New Ticket',
+        description: 'Triggers when a new ticket action is done in Dolibarr.'
+    },
+
+    // `operation` is where the business logic goes.
+    operation: {
+
+        // `inputFields` can define the fields a ticket could provide,
+        // we'll pass them in as `bundle.inputData` later.
+        inputFields: [
+            {
+                key: 'action',
+                type: 'string',
+                required: true,
+                helpText: 'Which action of ticket this should trigger on.',
+                choices: {
+                    create: "Create",
+                    modify: "Modify",
+                    validate: "Validate",
+                }
+            }
+        ],
+
+        type: 'hook',
+
+        performSubscribe: subscribeHook,
+        performUnsubscribe: unsubscribeHook,
+
+        perform: getTicket,
+        performList: getFallbackRealTicket,
+
+        // In cases where Zapier needs to show an example record to the user, but we are unable to get a live example
+        // from the API, Zapier will fallback to this hard-coded sample. It should reflect the data structure of
+        // returned records, and have obviously dummy values that we can show to any user.
+        sample: {
+            id: 1,
+            track_id: 'Xaz123er',
+            subject: 'Subject',
+            message: 'Message',
+            createdAt: 1472069465,
+            lastname: 'DOE',
+            firstname: 'John',
+            email: 'john@doe.com',
+            address: 'Park Avenue',
+            zip: '12345',
+            town: 'NEW-YORK',
+            email_from: 'doe.john@example;com',
+            authorId: 1,
+            action: 'create'
+        },
+
+        // If the resource can have fields that are custom on a per-user basis, define a function to fetch the custom
+        // field definitions. The result will be used to augment the sample.
+        // outputFields: () => { return []; }
+        // Alternatively, a static field definition should be provided, to specify labels for the fields
+        outputFields: [
+            {
+                key: 'id',
+                type: "integer",
+                label: 'ID'
+            },
+            {
+                key: 'track_id',
+                type: "string",
+                label: 'TrackID'
+            },
+            {
+                key: 'subject',
+                type: "string",
+                label: 'Subject'
+            },
+            {
+                key: 'message',
+                type: "string",
+                label: 'Message'
+            },
+            {
+                key: 'createdAt',
+                type: "integer",
+                label: 'Created At'
+            },
+            {
+                key: 'lastname',
+                label: 'Lastname'
+            },
+            {
+                key: 'firstname',
+                label: 'Firstname'
+            },
+            {
+                key: 'email',
+                label: 'Email'
+            },
+            {
+                key: 'address',
+                label: 'Address'
+            },
+            {
+                key: 'zip',
+                label: 'Zip'
+            },
+            {
+                key: 'town',
+                label: 'Town'
+            },
+            {
+                key: 'email_from',
+                type: 'string',
+                label: 'Email from'
+            },
+            {
+                key: 'authorId',
+                type: "integer",
+                label: 'Author ID'
+            },
+            {
+                key: 'action',
+                type: 'string',
+                label: 'Action'
+            }
+        ]
+    }
+};
diff --git a/dev/examples/zapier/triggers/user.js b/dev/examples/zapier/triggers/user.js
new file mode 100644
index 00000000000..92209bb8651
--- /dev/null
+++ b/dev/examples/zapier/triggers/user.js
@@ -0,0 +1,177 @@
+const subscribeHook = (z, bundle) => {
+    // `z.console.log()` is similar to `console.log()`.
+    z.console.log('suscribing hook!');
+
+    // bundle.targetUrl has the Hook URL this app should call when an action is created.
+    const data = {
+        url: bundle.targetUrl,
+        event: bundle.event,
+        module: 'user',
+        action: bundle.inputData.action
+    };
+
+    const url = bundle.authData.url  + '/api/index.php/zapierapi/hook';
+
+    // You can build requests and our client will helpfully inject all the variables
+    // you need to complete. You can also register middleware to control this.
+    const options = {
+        url: url,
+        method: 'POST',
+        body: data,
+    };
+
+    // You may return a promise or a normal data structure from any perform method.
+    return z.request(options).then((response) => JSON.parse(response.content));
+};
+
+const unsubscribeHook = (z, bundle) => {
+    // bundle.subscribeData contains the parsed response JSON from the subscribe
+    // request made initially.
+    z.console.log('unsuscribing hook!');
+
+    // You can build requests and our client will helpfully inject all the variables
+    // you need to complete. You can also register middleware to control this.
+    const options = {
+        url: bundle.authData.url + '/api/index.php/zapierapi/hook/' + bundle.subscribeData.id,
+        method: 'DELETE',
+    };
+
+    // You may return a promise or a normal data structure from any perform method.
+    return z.request(options).then((response) => JSON.parse(response.content));
+};
+
+const getUser = (z, bundle) => {
+    // bundle.cleanedRequest will include the parsed JSON object (if it's not a
+    // test poll) and also a .querystring property with the URL's query string.
+    const user = {
+        id: bundle.cleanedRequest.id,
+        lastname: bundle.cleanedRequest.lastname,
+        firstname: bundle.cleanedRequest.firstname,
+        address: bundle.cleanedRequest.address,
+        zip: bundle.cleanedRequest.zip,
+        town: bundle.cleanedRequest.town,
+        email: bundle.cleanedRequest.email,
+        login: bundle.cleanedRequest.login,
+        authorId: bundle.cleanedRequest.authorId,
+        createdAt: bundle.cleanedRequest.createdAt,
+        action: bundle.cleanedRequest.action
+    };
+
+    return [user];
+};
+
+const getFallbackRealUser = (z, bundle) => {
+    // For the test poll, you should get some real data, to aid the setup process.
+    const module = bundle.inputData.module;
+    const options = {
+        url: bundle.authData.url + '/api/index.php/users/0',
+    };
+
+    return z.request(options).then((response) => [JSON.parse(response.content)]);
+};
+
+// const getModulesChoices = (z/*, bundle*/) => {
+//     // For the test poll, you should get some real data, to aid the setup process.
+//     const options = {
+//         url: bundle.authData.url + '/api/index.php/zapierapi/getmoduleschoices',
+//     };
+
+//     return z.request(options).then((response) => JSON.parse(response.content));
+// };
+// const getModulesChoices = () => {
+
+//     return {
+//         orders: "Order",
+//         invoices: "Invoice",
+//         thirdparties: "Thirdparty",
+//         users: "User",
+//         contacts: "Contacts"
+//     };
+// };
+
+// const getActionsChoices = (z, bundle) => {
+//     // For the test poll, you should get some real data, to aid the setup process.
+//     const module = bundle.inputData.module;
+//     const options = {
+//         url:  url: bundle.authData.url + '/api/index.php/zapierapi/getactionschoices/thirparty`,
+//     };
+
+//     return z.request(options).then((response) => JSON.parse(response.content));
+// };
+
+// We recommend writing your triggers separate like this and rolling them
+// into the App definition at the end.
+module.exports = {
+    key: 'user',
+
+    // You'll want to provide some helpful display labels and descriptions
+    // for users. Zapier will put them into the UX.
+    noun: 'User',
+    display: {
+        label: 'New User',
+        description: 'Triggers when a new user action is done in Dolibarr.'
+    },
+
+    // `operation` is where the business logic goes.
+    operation: {
+
+        // `inputFields` can define the fields a user could provide,
+        // we'll pass them in as `bundle.inputData` later.
+        inputFields: [
+            {
+                key: 'action',
+                required: true,
+                type: 'string',
+                helpText: 'Which action of user this should trigger on.',
+                choices: {
+                    create: "Create",
+                    modify: "Modify",
+                    validate: "Validate",
+                }
+            }
+        ],
+
+        type: 'hook',
+
+        performSubscribe: subscribeHook,
+        performUnsubscribe: unsubscribeHook,
+
+        perform: getUser,
+        performList: getFallbackRealUser,
+
+        // In cases where Zapier needs to show an example record to the user, but we are unable to get a live example
+        // from the API, Zapier will fallback to this hard-coded sample. It should reflect the data structure of
+        // returned records, and have obviously dummy values that we can show to any user.
+        sample: {
+            id: 1,
+            createdAt: 1472069465,
+            lastname: 'DOE',
+            firstname: 'John',
+            email: 'john@doe.com',
+            address: 'Park Avenue',
+            zip: '12345',
+            town: 'NEW-YORK',
+            login: 'doe.john',
+            authorId: 1,
+            action: 'create'
+        },
+
+        // If the resource can have fields that are custom on a per-user basis, define a function to fetch the custom
+        // field definitions. The result will be used to augment the sample.
+        // outputFields: () => { return []; }
+        // Alternatively, a static field definition should be provided, to specify labels for the fields
+        outputFields: [
+            {key: 'id', type: "integer", label: 'ID'},
+            {key: 'createdAt', type: "integer", label: 'Created At'},
+            {key: 'lastname', label: 'Lastname'},
+            {key: 'firstname', label: 'Firstname'},
+            {key: 'email', label: 'Email'},
+            {key: 'address', label: 'Address'},
+            {key: 'zip', label: 'Zip'},
+            {key: 'town', label: 'Town'},
+            {key: 'login', label: 'Login'},
+            {key: 'authorId', type: "integer", label: 'Author ID'},
+            {key: 'action', label: 'Action'}
+        ]
+    }
+};
diff --git a/dev/initdata/purge-data.php b/dev/initdata/purge-data.php
index 183140af202..18256c33766 100755
--- a/dev/initdata/purge-data.php
+++ b/dev/initdata/purge-data.php
@@ -26,7 +26,7 @@
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path=__DIR__.'/';
 
 // Test si mode batch
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -120,8 +120,8 @@ $sqls=array(
         "DELETE FROM ".MAIN_DB_PREFIX."expedition where date_creation < '__DATE__'",
     ),
     'delivery'=>array(
-        "DELETE FROM ".MAIN_DB_PREFIX."livraisondet WHERE fk_livraison IN (select rowid FROM ".MAIN_DB_PREFIX."livraison where date_creation < '__DATE__')",
-        "DELETE FROM ".MAIN_DB_PREFIX."livraison where date_creation < '__DATE__'",
+        "DELETE FROM ".MAIN_DB_PREFIX."deliverydet WHERE fk_delivery IN (select rowid FROM ".MAIN_DB_PREFIX."delivery where date_creation < '__DATE__')",
+        "DELETE FROM ".MAIN_DB_PREFIX."delivery where date_creation < '__DATE__'",
     ),
     'contract'=>array(
         "DELETE FROM ".MAIN_DB_PREFIX."contratdet_extrafields WHERE fk_object IN (select rowid FROM ".MAIN_DB_PREFIX."contratdet WHERE fk_contrat IN (select rowid FROM ".MAIN_DB_PREFIX."contrat where datec < '__DATE__'))",
diff --git a/dev/initdemo/initdemo.sh b/dev/initdemo/initdemo.sh
index 1b32161b44b..ccd8c8d8b9a 100755
--- a/dev/initdemo/initdemo.sh
+++ b/dev/initdemo/initdemo.sh
@@ -189,8 +189,8 @@ export res=$?
 export documentdir=`cat $mydir/../../htdocs/conf/conf.php | grep '^\$dolibarr_main_data_root' | sed -e 's/$dolibarr_main_data_root=//' | sed -e 's/;//' | sed -e "s/'//g" | sed -e 's/"//g' `
 if [ "x$documentdir" != "x" ]
 then
-	$DIALOG --title "Reset document directory tpp" --clear \
-	        --inputbox "Delete and recreate document directory $documentdir/:" 16 55 n 2> $fichtemp
+	$DIALOG --title "Reset document directory" --clear \
+	        --inputbox "DELETE and recreate document directory $documentdir/:" 16 55 n 2> $fichtemp
 	
 	valret=$?
 	
diff --git a/dev/initdemo/mysqldump_dolibarr_12.0.0.sql b/dev/initdemo/mysqldump_dolibarr_13.0.0.sql
similarity index 86%
rename from dev/initdemo/mysqldump_dolibarr_12.0.0.sql
rename to dev/initdemo/mysqldump_dolibarr_13.0.0.sql
index 3cc1db1cf34..69c6eeb73c3 100644
--- a/dev/initdemo/mysqldump_dolibarr_12.0.0.sql
+++ b/dev/initdemo/mysqldump_dolibarr_13.0.0.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.17  Distrib 10.3.22-MariaDB, for debian-linux-gnu (x86_64)
+-- MySQL dump 10.17  Distrib 10.3.25-MariaDB, for debian-linux-gnu (x86_64)
 --
--- Host: localhost    Database: dolibarr_12
+-- Host: localhost    Database: dolibarr_dev
 -- ------------------------------------------------------
--- Server version	10.3.22-MariaDB-1ubuntu1
+-- Server version	10.3.25-MariaDB-0ubuntu0.20.04.1
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -313,6 +313,7 @@ CREATE TABLE `llx_actioncomm` (
   `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `calling_duration` int(11) DEFAULT NULL,
   `visibility` varchar(12) COLLATE utf8_unicode_ci DEFAULT 'default',
+  `reply_to` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `idx_actioncomm_fk_soc` (`fk_soc`),
   KEY `idx_actioncomm_fk_contact` (`fk_contact`),
@@ -333,7 +334,7 @@ CREATE TABLE `llx_actioncomm` (
 
 LOCK TABLES `llx_actioncomm` WRITE;
 /*!40000 ALTER TABLE `llx_actioncomm` DISABLE KEYS */;
-INSERT INTO `llx_actioncomm` VALUES (1,NULL,1,'2012-07-08 14:21:44','2012-07-08 14:21:44',50,NULL,'Company AAA and Co added into Dolibarr','2012-07-08 14:21:44','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company AAA and Co added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(2,NULL,1,'2012-07-08 14:23:48','2012-07-08 14:23:48',50,NULL,'Company Belin SARL added into Dolibarr','2012-07-08 14:23:48','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Belin SARL added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(3,NULL,1,'2012-07-08 22:42:12','2012-07-08 22:42:12',50,NULL,'Company Spanish Comp added into Dolibarr','2012-07-08 22:42:12','2016-12-21 12:50:33',1,NULL,NULL,3,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Spanish Comp added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(4,NULL,1,'2012-07-08 22:48:18','2012-07-08 22:48:18',50,NULL,'Company Prospector Vaalen added into Dolibarr','2012-07-08 22:48:18','2016-12-21 12:50:33',1,NULL,NULL,4,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Prospector Vaalen added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(5,NULL,1,'2012-07-08 23:22:57','2012-07-08 23:22:57',50,NULL,'Company NoCountry Co added into Dolibarr','2012-07-08 23:22:57','2016-12-21 12:50:33',1,NULL,NULL,5,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company NoCountry Co added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(6,NULL,1,'2012-07-09 00:15:09','2012-07-09 00:15:09',50,NULL,'Company Swiss customer added into Dolibarr','2012-07-09 00:15:09','2016-12-21 12:50:33',1,NULL,NULL,6,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Swiss customer added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(7,NULL,1,'2012-07-09 01:24:26','2012-07-09 01:24:26',50,NULL,'Company Generic customer added into Dolibarr','2012-07-09 01:24:26','2016-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Generic customer added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(8,NULL,1,'2012-07-10 14:54:27','2012-07-10 14:54:27',50,NULL,'Société Client salon ajoutée dans Dolibarr','2012-07-10 14:54:27','2016-12-21 12:50:33',1,NULL,NULL,8,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Client salon ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(9,NULL,1,'2012-07-10 14:54:44','2012-07-10 14:54:44',50,NULL,'Société Client salon invidivdu ajoutée dans Doliba','2012-07-10 14:54:44','2016-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Client salon invidivdu ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(10,NULL,1,'2012-07-10 14:56:10','2012-07-10 14:56:10',50,NULL,'Facture FA1007-0001 validée dans Dolibarr','2012-07-10 14:56:10','2016-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Facture FA1007-0001 validée dans Dolibarr\nAuteur: admin',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(11,NULL,1,'2012-07-10 14:58:53','2012-07-10 14:58:53',50,NULL,'Facture FA1007-0001 validée dans Dolibarr','2012-07-10 14:58:53','2016-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Facture FA1007-0001 validée dans Dolibarr\nAuteur: admin',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(12,NULL,1,'2012-07-10 15:00:55','2012-07-10 15:00:55',50,NULL,'Facture FA1007-0001 passée à payée dans Dolibarr','2012-07-10 15:00:55','2016-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Facture FA1007-0001 passée à payée dans Dolibarr\nAuteur: admin',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(13,NULL,1,'2012-07-10 15:13:08','2012-07-10 15:13:08',50,NULL,'Société Smith Vick ajoutée dans Dolibarr','2012-07-10 15:13:08','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Smith Vick ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(14,NULL,1,'2012-07-10 15:21:00','2012-07-10 16:21:00',5,NULL,'RDV avec mon chef','2012-07-10 15:21:48','2012-07-10 13:21:48',1,NULL,NULL,NULL,NULL,0,1,NULL,NULL,0,0,0,'',3600,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(15,NULL,1,'2012-07-10 18:18:16','2012-07-10 18:18:16',50,NULL,'Contrat CONTRAT1 validé dans Dolibarr','2012-07-10 18:18:16','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Contrat CONTRAT1 validé dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(16,NULL,1,'2012-07-10 18:35:57','2012-07-10 18:35:57',50,NULL,'Société Mon client ajoutée dans Dolibarr','2012-07-10 18:35:57','2016-12-21 12:50:33',1,NULL,NULL,11,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Mon client ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(17,NULL,1,'2012-07-11 16:18:08','2012-07-11 16:18:08',50,NULL,'Société Dupont Alain ajoutée dans Dolibarr','2012-07-11 16:18:08','2016-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Dupont Alain ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(18,NULL,1,'2012-07-11 17:11:00','2012-07-11 17:17:00',5,NULL,'Rendez-vous','2012-07-11 17:11:22','2012-07-11 15:11:22',1,NULL,NULL,NULL,NULL,0,1,NULL,NULL,0,0,0,'gfgdfgdf',360,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(19,NULL,1,'2012-07-11 17:13:20','2012-07-11 17:13:20',50,NULL,'Société Vendeur de chips ajoutée dans Dolibarr','2012-07-11 17:13:20','2016-12-21 12:50:33',1,NULL,NULL,13,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Vendeur de chips ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(20,NULL,1,'2012-07-11 17:15:42','2012-07-11 17:15:42',50,NULL,'Commande CF1007-0001 validée','2012-07-11 17:15:42','2016-12-21 12:50:33',1,NULL,NULL,13,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Commande CF1007-0001 validée\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(21,NULL,1,'2012-07-11 18:47:33','2012-07-11 18:47:33',50,NULL,'Commande CF1007-0002 validée','2012-07-11 18:47:33','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Commande CF1007-0002 validée\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(22,NULL,1,'2012-07-18 11:36:18','2012-07-18 11:36:18',50,NULL,'Proposition PR1007-0003 validée','2012-07-18 11:36:18','2016-12-21 12:50:33',1,NULL,NULL,4,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Proposition PR1007-0003 validée\nAuteur: admin',3,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(23,NULL,1,'2013-07-18 20:49:58','2013-07-18 20:49:58',50,NULL,'Invoice FA1007-0002 validated in Dolibarr','2013-07-18 20:49:58','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1007-0002 validated in Dolibarr\nAuthor: admin',2,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(24,NULL,1,'2013-07-28 01:37:00',NULL,1,NULL,'Phone call','2013-07-28 01:37:48','2013-07-27 23:37:48',1,NULL,NULL,NULL,2,0,1,NULL,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(25,NULL,1,'2013-08-01 02:31:24','2013-08-01 02:31:24',50,NULL,'Company mmm added into Dolibarr','2013-08-01 02:31:24','2016-12-21 12:50:33',1,NULL,NULL,15,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company mmm added into Dolibarr\nAuthor: admin',15,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(26,NULL,1,'2013-08-01 02:31:43','2013-08-01 02:31:43',50,NULL,'Company ppp added into Dolibarr','2013-08-01 02:31:43','2016-12-21 12:50:33',1,NULL,NULL,16,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company ppp added into Dolibarr\nAuthor: admin',16,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(27,NULL,1,'2013-08-01 02:41:26','2013-08-01 02:41:26',50,NULL,'Company aaa added into Dolibarr','2013-08-01 02:41:26','2016-12-21 12:50:33',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company aaa added into Dolibarr\nAuthor: admin',17,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(28,NULL,1,'2013-08-01 03:34:11','2013-08-01 03:34:11',50,NULL,'Invoice FA1108-0003 validated in Dolibarr','2013-08-01 03:34:11','2016-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0003 validated in Dolibarr\nAuthor: admin',5,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(29,NULL,1,'2013-08-01 03:34:11','2013-08-01 03:34:11',50,NULL,'Invoice FA1108-0003 validated in Dolibarr','2013-08-01 03:34:11','2016-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0003 changed to paid in Dolibarr\nAuthor: admin',5,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(30,NULL,1,'2013-08-06 20:33:54','2013-08-06 20:33:54',50,NULL,'Invoice FA1108-0004 validated in Dolibarr','2013-08-06 20:33:54','2016-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0004 validated in Dolibarr\nAuthor: admin',6,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(31,NULL,1,'2013-08-06 20:33:54','2013-08-06 20:33:54',50,NULL,'Invoice FA1108-0004 validated in Dolibarr','2013-08-06 20:33:54','2016-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0004 changed to paid in Dolibarr\nAuthor: admin',6,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(38,NULL,1,'2013-08-08 02:41:55','2013-08-08 02:41:55',50,NULL,'Invoice FA1108-0005 validated in Dolibarr','2013-08-08 02:41:55','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0005 validated in Dolibarr\nAuthor: admin',8,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(40,NULL,1,'2013-08-08 02:53:40','2013-08-08 02:53:40',50,NULL,'Invoice FA1108-0005 changed to paid in Dolibarr','2013-08-08 02:53:40','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0005 changed to paid in Dolibarr\nAuthor: admin',8,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(41,NULL,1,'2013-08-08 02:54:05','2013-08-08 02:54:05',50,NULL,'Invoice FA1007-0002 changed to paid in Dolibarr','2013-08-08 02:54:05','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1007-0002 changed to paid in Dolibarr\nAuthor: admin',2,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(42,NULL,1,'2013-08-08 02:55:04','2013-08-08 02:55:04',50,NULL,'Invoice FA1107-0006 validated in Dolibarr','2013-08-08 02:55:04','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1107-0006 validated in Dolibarr\nAuthor: admin',3,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(43,NULL,1,'2013-08-08 02:55:26','2013-08-08 02:55:26',50,NULL,'Invoice FA1108-0007 validated in Dolibarr','2013-08-08 02:55:26','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0007 validated in Dolibarr\nAuthor: admin',9,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(44,NULL,1,'2013-08-08 02:55:58','2013-08-08 02:55:58',50,NULL,'Invoice FA1107-0006 changed to paid in Dolibarr','2013-08-08 02:55:58','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1107-0006 changed to paid in Dolibarr\nAuthor: admin',3,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(45,NULL,1,'2013-08-08 03:04:22','2013-08-08 03:04:22',50,NULL,'Order CO1108-0001 validated','2013-08-08 03:04:22','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Order CO1108-0001 validated\nAuthor: admin',5,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(46,NULL,1,'2013-08-08 13:59:09','2013-08-08 13:59:09',50,NULL,'Order CO1107-0002 validated','2013-08-08 13:59:10','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Order CO1107-0002 validated\nAuthor: admin',1,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(47,NULL,1,'2013-08-08 14:24:18','2013-08-08 14:24:18',50,NULL,'Proposal PR1007-0001 validated','2013-08-08 14:24:18','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposal PR1007-0001 validated\nAuthor: admin',1,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(48,NULL,1,'2013-08-08 14:24:24','2013-08-08 14:24:24',50,NULL,'Proposal PR1108-0004 validated','2013-08-08 14:24:24','2016-12-21 12:50:33',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposal PR1108-0004 validated\nAuthor: admin',4,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(49,NULL,1,'2013-08-08 15:04:37','2013-08-08 15:04:37',50,NULL,'Order CF1108-0003 validated','2013-08-08 15:04:37','2016-12-21 12:50:33',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Order CF1108-0003 validated\nAuthor: admin',6,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(50,NULL,1,'2014-12-08 17:56:47','2014-12-08 17:56:47',40,NULL,'Facture AV1212-0001 validée dans Dolibarr','2014-12-08 17:56:47','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture AV1212-0001 validée dans Dolibarr\nAuteur: admin',10,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(51,NULL,1,'2014-12-08 17:57:11','2014-12-08 17:57:11',40,NULL,'Facture AV1212-0001 validée dans Dolibarr','2014-12-08 17:57:11','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture AV1212-0001 validée dans Dolibarr\nAuteur: admin',10,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(52,NULL,1,'2014-12-08 17:58:27','2014-12-08 17:58:27',40,NULL,'Facture FA1212-0008 validée dans Dolibarr','2014-12-08 17:58:27','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1212-0008 validée dans Dolibarr\nAuteur: admin',11,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(53,NULL,1,'2014-12-08 18:20:49','2014-12-08 18:20:49',40,NULL,'Facture AV1212-0002 validée dans Dolibarr','2014-12-08 18:20:49','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture AV1212-0002 validée dans Dolibarr\nAuteur: admin',12,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(54,NULL,1,'2014-12-09 18:35:07','2014-12-09 18:35:07',40,NULL,'Facture AV1212-0002 passée à payée dans Dolibarr','2014-12-09 18:35:07','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture AV1212-0002 passée à payée dans Dolibarr\nAuteur: admin',12,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(55,NULL,1,'2014-12-09 20:14:42','2014-12-09 20:14:42',40,NULL,'Société doe john ajoutée dans Dolibarr','2014-12-09 20:14:42','2016-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Société doe john ajoutée dans Dolibarr\nAuteur: admin',18,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(56,NULL,1,'2014-12-12 18:54:19','2014-12-12 18:54:19',40,NULL,'Facture FA1212-0009 validée dans Dolibarr','2014-12-12 18:54:19','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1212-0009 validée dans Dolibarr\nAuteur: admin',55,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(121,NULL,1,'2014-12-06 10:00:00',NULL,50,NULL,'aaab','2014-12-21 17:48:08','2014-12-21 16:54:07',3,1,NULL,NULL,NULL,0,3,NULL,NULL,1,0,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(122,NULL,1,'2014-12-21 18:09:52','2014-12-21 18:09:52',40,NULL,'Facture client FA1007-0001 envoyée par EMail','2014-12-21 18:09:52','2016-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Mail envoyé par Firstname SuperAdminName <bidon@example.com> à laurent@mycompany.fr.\nSujet du mail: Envoi facture FA1007-0001\nCorps du mail:\nVeuillez trouver ci-joint la facture FA1007-0001\r\n\r\nVous pouvez cliquer sur le lien sécurisé ci-dessous pour effectuer votre paiement via Paypal\r\n\r\nhttp://localhost/dolibarrnew/public/paypal/newpayment.php?source=invoice&ref=FA1007-0001&securekey=50c82fab36bb3b6aa83e2a50691803b2\r\n\r\nCordialement',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(123,NULL,1,'2015-01-06 13:13:57','2015-01-06 13:13:57',40,NULL,'Facture 16 validée dans Dolibarr','2015-01-06 13:13:57','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture 16 validée dans Dolibarr\nAuteur: admin',16,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(124,NULL,1,'2015-01-12 12:23:05','2015-01-12 12:23:05',40,NULL,'Patient aaa ajouté','2015-01-12 12:23:05','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Patient aaa ajouté\nAuteur: admin',19,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(125,NULL,1,'2015-01-12 12:52:20','2015-01-12 12:52:20',40,NULL,'Patient pppoo ajouté','2015-01-12 12:52:20','2016-12-21 12:50:33',1,NULL,NULL,20,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Patient pppoo ajouté\nAuteur: admin',20,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(127,NULL,1,'2015-01-19 18:22:48','2015-01-19 18:22:48',40,NULL,'Facture FS1301-0001 validée dans Dolibarr','2015-01-19 18:22:48','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FS1301-0001 validée dans Dolibarr\nAuteur: admin',148,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(128,NULL,1,'2015-01-19 18:31:10','2015-01-19 18:31:10',40,NULL,'Facture FA6801-0010 validée dans Dolibarr','2015-01-19 18:31:10','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA6801-0010 validée dans Dolibarr\nAuteur: admin',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(129,NULL,1,'2015-01-19 18:31:10','2015-01-19 18:31:10',40,NULL,'Facture FA6801-0010 passée à payée dans Dolibarr','2015-01-19 18:31:10','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA6801-0010 passée à payée dans Dolibarr\nAuteur: admin',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(130,NULL,1,'2015-01-19 18:31:58','2015-01-19 18:31:58',40,NULL,'Facture FS1301-0002 validée dans Dolibarr','2015-01-19 18:31:58','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FS1301-0002 validée dans Dolibarr\nAuteur: admin',151,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(131,NULL,1,'2015-01-19 18:31:58','2015-01-19 18:31:58',40,NULL,'Facture FS1301-0002 passée à payée dans Dolibarr','2015-01-19 18:31:58','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FS1301-0002 passée à payée dans Dolibarr\nAuteur: admin',151,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(132,NULL,1,'2015-01-23 15:07:54','2015-01-23 15:07:54',50,NULL,'Consultation 24 saisie (aaa)','2015-01-23 15:07:54','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Consultation 24 saisie (aaa)\nAuteur: admin',24,'cabinetmed_cons',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(133,NULL,1,'2015-01-23 16:56:58','2015-01-23 16:56:58',40,NULL,'Patient pa ajouté','2015-01-23 16:56:58','2016-12-21 12:50:33',1,NULL,NULL,21,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Patient pa ajouté\nAuteur: admin',21,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(134,NULL,1,'2015-01-23 17:34:00',NULL,50,NULL,'bbcv','2015-01-23 17:35:21','2015-01-23 16:35:21',1,NULL,1,2,NULL,0,1,NULL,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(135,NULL,1,'2015-02-12 15:54:00','2015-02-12 15:54:00',40,NULL,'Facture FA1212-0011 validée dans Dolibarr','2015-02-12 15:54:37','2016-12-21 12:50:33',1,1,NULL,7,NULL,0,1,NULL,1,0,0,50,NULL,NULL,NULL,'Facture FA1212-0011 valid&eacute;e dans Dolibarr<br />\r\nAuteur: admin',13,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(136,NULL,1,'2015-02-12 17:06:51','2015-02-12 17:06:51',40,NULL,'Commande CO1107-0003 validée','2015-02-12 17:06:51','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Commande CO1107-0003 validée\nAuteur: admin',2,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(137,NULL,1,'2015-02-17 16:22:10','2015-02-17 16:22:10',40,NULL,'Proposition PR1302-0009 validée','2015-02-17 16:22:10','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposition PR1302-0009 validée\nAuteur: admin',9,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(138,NULL,1,'2015-02-17 16:27:00','2015-02-17 16:27:00',40,NULL,'Facture FA1302-0012 validée dans Dolibarr','2015-02-17 16:27:00','2016-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1302-0012 validée dans Dolibarr\nAuteur: admin',152,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(139,NULL,1,'2015-02-17 16:27:29','2015-02-17 16:27:29',40,NULL,'Proposition PR1302-0010 validée','2015-02-17 16:27:29','2016-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposition PR1302-0010 validée\nAuteur: admin',11,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(140,NULL,1,'2015-02-17 18:27:56','2015-02-17 18:27:56',40,NULL,'Commande CO1107-0004 validée','2015-02-17 18:27:56','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Commande CO1107-0004 validée\nAuteur: admin',3,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(141,NULL,1,'2015-02-17 18:38:14','2015-02-17 18:38:14',40,NULL,'Commande CO1302-0005 validée','2015-02-17 18:38:14','2016-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Commande CO1302-0005 validée\nAuteur: admin',7,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(142,NULL,1,'2015-02-26 22:57:50','2015-02-26 22:57:50',40,NULL,'Company pppp added into Dolibarr','2015-02-26 22:57:50','2016-12-21 12:50:33',1,NULL,NULL,22,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company pppp added into Dolibarr\nAuthor: admin',22,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(143,NULL,1,'2015-02-26 22:58:13','2015-02-26 22:58:13',40,NULL,'Company ttttt added into Dolibarr','2015-02-26 22:58:13','2016-12-21 12:50:33',1,NULL,NULL,23,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company ttttt added into Dolibarr\nAuthor: admin',23,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(144,NULL,1,'2015-02-27 10:00:00','2015-02-27 19:20:00',5,NULL,'Rendez-vous','2015-02-27 19:20:53','2015-02-27 18:20:53',1,NULL,NULL,NULL,NULL,0,1,NULL,1,0,0,-1,'',33600,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(145,NULL,1,'2015-02-27 19:28:00',NULL,2,NULL,'fdsfsd','2015-02-27 19:28:48','2015-02-27 18:29:53',1,1,NULL,NULL,NULL,0,1,NULL,1,0,0,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(146,NULL,1,'2015-03-06 10:05:07','2015-03-06 10:05:07',40,NULL,'Contrat (PROV3) validé dans Dolibarr','2015-03-06 10:05:07','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Contrat (PROV3) validé dans Dolibarr\nAuteur: admin',3,'contract',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(147,NULL,1,'2015-03-06 16:43:37','2015-03-06 16:43:37',40,NULL,'Facture FA1307-0013 validée dans Dolibarr','2015-03-06 16:43:37','2016-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1307-0013 validée dans Dolibarr\nAuteur: admin',158,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(148,NULL,1,'2015-03-06 16:44:12','2015-03-06 16:44:12',40,NULL,'Facture FA1407-0014 validée dans Dolibarr','2015-03-06 16:44:12','2016-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1407-0014 validée dans Dolibarr\nAuteur: admin',159,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(149,NULL,1,'2015-03-06 16:47:48','2015-03-06 16:47:48',40,NULL,'Facture FA1507-0015 validée dans Dolibarr','2015-03-06 16:47:48','2016-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1507-0015 validée dans Dolibarr\nAuteur: admin',160,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(150,NULL,1,'2015-03-06 16:48:16','2015-03-06 16:48:16',40,NULL,'Facture FA1607-0016 validée dans Dolibarr','2015-03-06 16:48:16','2016-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1607-0016 validée dans Dolibarr\nAuteur: admin',161,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(151,NULL,1,'2015-03-06 17:13:59','2015-03-06 17:13:59',40,NULL,'Société smith smith ajoutée dans Dolibarr','2015-03-06 17:13:59','2016-12-21 12:50:33',1,NULL,NULL,24,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Société smith smith ajoutée dans Dolibarr\nAuteur: admin',24,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(152,NULL,1,'2015-03-08 10:02:22','2015-03-08 10:02:22',40,NULL,'Proposition (PROV12) validée dans Dolibarr','2015-03-08 10:02:22','2016-12-21 12:50:33',1,NULL,NULL,23,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposition (PROV12) validée dans Dolibarr\nAuteur: admin',12,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(203,NULL,1,'2015-03-09 19:39:27','2015-03-09 19:39:27',40,'AC_ORDER_SUPPLIER_VALIDATE','Commande CF1303-0004 validée','2015-03-09 19:39:27','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Commande CF1303-0004 validée\nAuteur: admin',13,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(204,NULL,1,'2015-03-10 15:47:37','2015-03-10 15:47:37',40,'AC_COMPANY_CREATE','Patient créé','2015-03-10 15:47:37','2016-12-21 12:50:33',1,NULL,NULL,25,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Patient créé\nAuteur: admin',25,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(205,NULL,1,'2015-03-10 15:57:32','2015-03-10 15:57:32',40,'AC_COMPANY_CREATE','Tiers créé','2015-03-10 15:57:32','2016-12-21 12:50:33',1,NULL,NULL,26,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Tiers créé\nAuteur: admin',26,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(206,NULL,1,'2015-03-10 15:58:28','2015-03-10 15:58:28',40,'AC_BILL_VALIDATE','Facture FA1303-0017 validée','2015-03-10 15:58:28','2016-12-21 12:50:33',1,NULL,NULL,26,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1303-0017 validée\nAuteur: admin',208,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(207,NULL,1,'2015-03-19 09:38:10','2015-03-19 09:38:10',40,'AC_BILL_VALIDATE','Facture FA1303-0018 validée','2015-03-19 09:38:10','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1303-0018 validée\nAuteur: admin',209,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(208,NULL,1,'2015-03-20 14:30:11','2015-03-20 14:30:11',40,'AC_BILL_VALIDATE','Facture FA1107-0019 validée','2015-03-20 14:30:11','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1107-0019 validée\nAuteur: admin',210,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(209,NULL,1,'2015-03-22 09:40:25','2015-03-22 09:40:25',40,'AC_BILL_VALIDATE','Facture FA1303-0020 validée','2015-03-22 09:40:25','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1303-0020 validée\nAuteur: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(210,NULL,1,'2015-03-23 17:16:25','2015-03-23 17:16:25',40,'AC_BILL_VALIDATE','Facture FA1303-0020 validée','2015-03-23 17:16:25','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1303-0020 validée\nAuteur: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(211,NULL,1,'2015-03-23 18:08:27','2015-03-23 18:08:27',40,'AC_BILL_VALIDATE','Facture FA1307-0013 validée','2015-03-23 18:08:27','2016-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1307-0013 validée\nAuteur: admin',158,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(212,NULL,1,'2015-03-24 15:54:00','2015-03-24 15:54:00',40,'AC_BILL_VALIDATE','Facture FA1212-0021 validée','2015-03-24 15:54:00','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1212-0021 validée\nAuteur: admin',32,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(213,NULL,1,'2015-11-07 01:02:39','2015-11-07 01:02:39',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:02:39','2016-12-21 12:50:33',1,NULL,NULL,27,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',27,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(214,NULL,1,'2015-11-07 01:05:22','2015-11-07 01:05:22',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:05:22','2016-12-21 12:50:33',1,NULL,NULL,28,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',28,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(215,NULL,1,'2015-11-07 01:07:07','2015-11-07 01:07:07',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:07:07','2016-12-21 12:50:33',1,NULL,NULL,29,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',29,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(216,NULL,1,'2015-11-07 01:07:58','2015-11-07 01:07:58',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:07:58','2016-12-21 12:50:33',1,NULL,NULL,30,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',30,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(217,NULL,1,'2015-11-07 01:10:09','2015-11-07 01:10:09',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:10:09','2016-12-21 12:50:33',1,NULL,NULL,31,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',31,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(218,NULL,1,'2015-11-07 01:15:57','2015-11-07 01:15:57',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:15:57','2016-12-21 12:50:33',1,NULL,NULL,32,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',32,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(219,NULL,1,'2015-11-07 01:16:51','2015-11-07 01:16:51',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:16:51','2016-12-21 12:50:33',1,NULL,NULL,33,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',33,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(220,NULL,1,'2016-03-02 17:24:04','2016-03-02 17:24:04',40,'AC_BILL_VALIDATE','Invoice FA1302-0022 validated','2016-03-02 17:24:04','2016-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1302-0022 validated\nAuthor: admin',157,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(221,NULL,1,'2016-03-02 17:24:28','2016-03-02 17:24:28',40,'AC_BILL_VALIDATE','Invoice FA1303-0020 validated','2016-03-02 17:24:28','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1303-0020 validated\nAuthor: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(222,NULL,1,'2016-03-05 10:00:00','2016-03-05 10:00:00',5,NULL,'RDV John','2016-03-02 19:54:48','2016-03-02 18:55:29',1,1,NULL,NULL,NULL,0,1,0,NULL,0,0,-1,NULL,NULL,NULL,'gfdgdfgdf',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(223,NULL,1,'2016-03-13 10:00:00','2016-03-17 00:00:00',50,NULL,'Congress','2016-03-02 19:55:11','2016-03-02 18:55:11',1,NULL,NULL,NULL,NULL,0,1,0,NULL,0,0,-1,'',309600,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(224,NULL,1,'2016-03-14 10:00:00',NULL,1,NULL,'Call john','2016-03-02 19:55:56','2016-03-02 18:55:56',1,NULL,NULL,NULL,NULL,0,1,0,NULL,0,0,0,'',NULL,NULL,'tttt',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(225,NULL,1,'2016-03-02 20:11:31','2016-03-02 20:11:31',40,'AC_BILL_UNVALIDATE','Invoice FA1303-0020 go back to draft status','2016-03-02 20:11:31','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1303-0020 go back to draft status\nAuthor: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(226,NULL,1,'2016-03-02 20:13:39','2016-03-02 20:13:39',40,'AC_BILL_VALIDATE','Invoice FA1303-0020 validated','2016-03-02 20:13:39','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1303-0020 validated\nAuthor: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(227,NULL,1,'2016-03-03 19:20:10','2016-03-03 19:20:10',40,'AC_BILL_VALIDATE','Invoice FA1212-0023 validated','2016-03-03 19:20:10','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1212-0023 validated\nAuthor: admin',33,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(228,NULL,1,'2016-03-03 19:20:25','2016-03-03 19:20:25',40,'AC_BILL_CANCEL','Invoice FA1212-0023 canceled in Dolibarr','2016-03-03 19:20:25','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1212-0023 canceled in Dolibarr\nAuthor: admin',33,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(229,NULL,1,'2016-03-03 19:20:56','2016-03-03 19:20:56',40,'AC_BILL_VALIDATE','Invoice AV1403-0003 validated','2016-03-03 19:20:56','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice AV1403-0003 validated\nAuthor: admin',212,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(230,NULL,1,'2016-03-03 19:21:29','2016-03-03 19:21:29',40,'AC_BILL_UNVALIDATE','Invoice AV1403-0003 go back to draft status','2016-03-03 19:21:29','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice AV1403-0003 go back to draft status\nAuthor: admin',212,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(231,NULL,1,'2016-03-03 19:22:16','2016-03-03 19:22:16',40,'AC_BILL_VALIDATE','Invoice AV1303-0003 validated','2016-03-03 19:22:16','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice AV1303-0003 validated\nAuthor: admin',213,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(232,NULL,1,'2018-01-22 18:54:39','2018-01-22 18:54:39',40,'AC_OTH_AUTO','Invoice 16 validated','2018-01-22 18:54:39','2018-01-22 17:54:39',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Invoice 16 validated\nAuthor: admin',16,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(233,NULL,1,'2018-01-22 18:54:46','2018-01-22 18:54:46',40,'AC_OTH_AUTO','Invoice 16 validated','2018-01-22 18:54:46','2018-01-22 17:54:46',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Invoice 16 validated\nAuthor: admin',16,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(234,NULL,1,'2018-07-05 10:00:00','2018-07-05 11:19:00',5,'AC_RDV','Meeting with my boss','2018-07-31 18:19:48','2018-07-31 14:19:48',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,0,-1,'',4740,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(235,NULL,1,'2018-07-13 00:00:00','2018-07-14 23:59:59',50,'AC_OTH','Trip at Las Vegas','2018-07-31 18:20:36','2018-07-31 14:20:36',12,NULL,4,NULL,2,0,12,1,NULL,0,1,-1,'',172799,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(236,NULL,1,'2018-07-29 10:00:00',NULL,4,'AC_EMAIL','Remind to send an email','2018-07-31 18:21:04','2018-07-31 14:21:04',12,NULL,NULL,NULL,NULL,0,4,0,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(237,NULL,1,'2018-07-01 10:00:00',NULL,1,'AC_TEL','Phone call with Mr Vaalen','2018-07-31 18:22:04','2018-07-31 14:22:04',12,NULL,6,4,NULL,0,13,0,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(238,NULL,1,'2018-08-02 10:00:00','2018-08-02 12:00:00',5,'AC_RDV','Meeting on radium','2018-08-01 01:15:50','2018-07-31 21:15:50',12,NULL,8,10,10,0,12,1,NULL,0,0,-1,'',7200,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(239,NULL,1,'2017-01-29 21:49:33','2017-01-29 21:49:33',40,'AC_OTH_AUTO','Proposal PR1302-0007 validated','2017-01-29 21:49:33','2017-01-29 17:49:33',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1302-0007 validated\nAuthor: admin',7,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(240,NULL,1,'2017-01-31 20:52:00',NULL,1,'AC_TEL','Call the boss','2017-01-31 20:52:10','2017-01-31 16:52:25',12,12,6,NULL,NULL,0,12,1,NULL,0,0,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(242,NULL,1,'2017-02-01 18:52:04','2017-02-01 18:52:04',40,'AC_OTH_AUTO','Order CF1007-0001 validated','2017-02-01 18:52:04','2017-02-01 14:52:04',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CF1007-0001 validated\nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(243,NULL,1,'2017-02-01 18:52:04','2017-02-01 18:52:04',40,'AC_OTH_AUTO','Order CF1007-0001 approved','2017-02-01 18:52:04','2017-02-01 14:52:04',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CF1007-0001 approved\nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(245,NULL,1,'2017-02-01 18:52:32','2017-02-01 18:52:32',40,'AC_OTH_AUTO','Supplier order CF1007-0001 submited','2017-02-01 18:52:32','2017-02-01 14:52:32',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Supplier order CF1007-0001 submited\nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(249,NULL,1,'2017-02-01 18:54:01','2017-02-01 18:54:01',40,'AC_OTH_AUTO','Supplier order CF1007-0001 received','2017-02-01 18:54:01','2017-02-01 14:54:01',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Supplier order CF1007-0001 received \nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(250,NULL,1,'2017-02-01 18:54:42','2017-02-01 18:54:42',40,'AC_OTH_AUTO','Email sent by MyBigCompany To mycustomer@example.com','2017-02-01 18:54:42','2017-02-01 14:54:42',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Sender: MyBigCompany &lt;myemail@mybigcompany.com&gt;<br>\nReceiver(s): mycustomer@example.com<br>\nEMail topic: Submission of order CF1007-0001<br>\nEmail body:<br>\nYou will find here our order CF1007-0001<br />\r\n<br />\r\nSincerely<br>\n<br>\nAttached files and documents: CF1007-0001.pdf',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(251,NULL,1,'2017-02-01 19:02:21','2017-02-01 19:02:21',40,'AC_OTH_AUTO','Invoice SI1702-0001 validated','2017-02-01 19:02:21','2017-02-01 15:02:21',12,NULL,5,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Invoice SI1702-0001 validated\nAuthor: admin',20,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(252,NULL,1,'2017-02-12 23:17:04','2017-02-12 23:17:04',40,'AC_OTH_AUTO','Patient créé','2017-02-12 23:17:04','2017-02-12 19:17:04',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Patient créé\nAuthor: admin',26,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(253,NULL,1,'2017-02-12 23:18:33','2017-02-12 23:18:33',40,'AC_OTH_AUTO','Consultation 2 recorded (aaa)','2017-02-12 23:18:33','2017-02-12 19:18:33',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Consultation 2 recorded (aaa)\nAuthor: admin',2,'cabinetmed_cons',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(254,NULL,1,'2017-02-15 23:28:41','2017-02-15 23:28:41',40,'AC_OTH_AUTO','Order CO7001-0005 validated','2017-02-15 23:28:41','2017-02-15 22:28:41',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0005 validated\nAuthor: admin',7,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(255,NULL,1,'2017-02-15 23:28:56','2017-02-15 23:28:56',40,'AC_OTH_AUTO','Order CO7001-0006 validated','2017-02-15 23:28:56','2017-02-15 22:28:56',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0006 validated\nAuthor: admin',8,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(256,NULL,1,'2017-02-15 23:34:33','2017-02-15 23:34:33',40,'AC_OTH_AUTO','Order CO7001-0007 validated','2017-02-15 23:34:33','2017-02-15 22:34:33',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0007 validated\nAuthor: admin',9,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(257,NULL,1,'2017-02-15 23:35:03','2017-02-15 23:35:03',40,'AC_OTH_AUTO','Order CO7001-0008 validated','2017-02-15 23:35:03','2017-02-15 22:35:03',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0008 validated\nAuthor: admin',10,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(263,NULL,1,'2017-02-15 23:50:34','2017-02-15 23:50:34',40,'AC_OTH_AUTO','Order CO7001-0005 validated','2017-02-15 23:50:34','2017-02-15 22:50:34',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0005 validated\nAuthor: admin',17,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(264,NULL,1,'2017-02-15 23:51:23','2017-02-15 23:51:23',40,'AC_OTH_AUTO','Order CO7001-0006 validated','2017-02-15 23:51:23','2017-02-15 22:51:23',12,NULL,NULL,7,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0006 validated\nAuthor: admin',18,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(265,NULL,1,'2017-02-15 23:54:51','2017-02-15 23:54:51',40,'AC_OTH_AUTO','Order CO7001-0007 validated','2017-02-15 23:54:51','2017-02-15 22:54:51',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0007 validated\nAuthor: admin',19,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(266,NULL,1,'2017-02-15 23:55:52','2017-02-15 23:55:52',40,'AC_OTH_AUTO','Order CO7001-0007 validated','2017-02-15 23:55:52','2017-02-15 22:55:52',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0007 validated\nAuthor: admin',20,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(267,NULL,1,'2017-02-16 00:03:44','2017-02-16 00:03:44',40,'AC_OTH_AUTO','Order CO7001-0008 validated','2017-02-16 00:03:44','2017-02-15 23:03:44',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0008 validated\nAuthor: admin',29,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(268,NULL,1,'2017-02-16 00:05:01','2017-02-16 00:05:01',40,'AC_OTH_AUTO','Order CO7001-0009 validated','2017-02-16 00:05:01','2017-02-15 23:05:01',12,NULL,NULL,11,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0009 validated\nAuthor: admin',34,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(269,NULL,1,'2017-02-16 00:05:01','2017-02-16 00:05:01',40,'AC_OTH_AUTO','Order CO7001-0010 validated','2017-02-16 00:05:01','2017-02-15 23:05:01',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0010 validated\nAuthor: admin',38,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(270,NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0011 validated','2017-02-16 00:05:11','2017-02-15 23:05:11',12,NULL,NULL,11,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0011 validated\nAuthor: admin',40,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(271,NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0012 validated','2017-02-16 00:05:11','2017-02-15 23:05:11',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0012 validated\nAuthor: admin',43,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(272,NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0013 validated','2017-02-16 00:05:11','2017-02-15 23:05:11',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0013 validated\nAuthor: admin',47,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(273,NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0014 validated','2017-02-16 00:05:11','2017-02-15 23:05:11',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0014 validated\nAuthor: admin',48,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(274,NULL,1,'2017-02-16 00:05:26','2017-02-16 00:05:26',40,'AC_OTH_AUTO','Order CO7001-0015 validated','2017-02-16 00:05:26','2017-02-15 23:05:26',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0015 validated\nAuthor: admin',50,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(275,NULL,1,'2017-02-16 00:05:26','2017-02-16 00:05:26',40,'AC_OTH_AUTO','Order CO7001-0016 validated','2017-02-16 00:05:26','2017-02-15 23:05:26',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0016 validated\nAuthor: admin',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(277,NULL,1,'2017-02-16 00:05:35','2017-02-16 00:05:35',40,'AC_OTH_AUTO','Order CO7001-0018 validated','2017-02-16 00:05:35','2017-02-15 23:05:35',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0018 validated\nAuthor: admin',62,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(278,NULL,1,'2017-02-16 00:05:35','2017-02-16 00:05:35',40,'AC_OTH_AUTO','Order CO7001-0019 validated','2017-02-16 00:05:35','2017-02-15 23:05:35',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0019 validated\nAuthor: admin',68,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(279,NULL,1,'2017-02-16 00:05:36','2017-02-16 00:05:36',40,'AC_OTH_AUTO','Order CO7001-0020 validated','2017-02-16 00:05:36','2017-02-15 23:05:36',12,NULL,NULL,6,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0020 validated\nAuthor: admin',72,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(281,NULL,1,'2017-02-16 00:05:37','2017-02-16 00:05:37',40,'AC_OTH_AUTO','Order CO7001-0022 validated','2017-02-16 00:05:37','2017-02-15 23:05:37',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0022 validated\nAuthor: admin',78,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(282,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0023 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,11,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0023 validated\nAuthor: admin',81,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(283,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0024 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0024 validated\nAuthor: admin',83,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(284,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0025 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,2,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0025 validated\nAuthor: admin',84,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(285,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0026 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0026 validated\nAuthor: admin',85,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(286,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0027 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0027 validated\nAuthor: admin',88,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(287,NULL,1,'2017-02-16 03:05:56','2017-02-16 03:05:56',40,'AC_OTH_AUTO','Commande CO7001-0016 classée Livrée','2017-02-16 03:05:56','2017-02-15 23:05:56',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0016 classée Livrée\nAuteur: admin',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(288,NULL,1,'2017-02-16 03:06:01','2017-02-16 03:06:01',40,'AC_OTH_AUTO','Commande CO7001-0016 classée Facturée','2017-02-16 03:06:01','2017-02-15 23:06:01',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0016 classée Facturée\nAuteur: admin',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(294,NULL,1,'2017-02-16 03:53:04','2017-02-16 03:53:04',40,'AC_OTH_AUTO','Commande CO7001-0021 validée','2017-02-16 03:53:04','2017-02-15 23:53:04',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0021 validée\nAuteur: admin',75,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(295,NULL,1,'2017-02-16 03:58:08','2017-02-16 03:58:08',40,'AC_OTH_AUTO','Expédition SH1702-0002 validée','2017-02-16 03:58:08','2017-02-15 23:58:08',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Expédition SH1702-0002 validée\nAuteur: admin',3,'shipping',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(296,NULL,1,'2017-02-16 04:12:29','2017-02-16 04:12:29',40,'AC_OTH_AUTO','Commande CO7001-0021 validée','2017-02-16 04:12:29','2017-02-16 00:12:29',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0021 validée\nAuteur: admin',75,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(297,NULL,1,'2017-02-16 04:14:20','2017-02-16 04:14:20',40,'AC_OTH_AUTO','Commande CO7001-0021 validée','2017-02-16 04:14:20','2017-02-16 00:14:20',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0021 validée\nAuteur: admin',75,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(298,NULL,1,'2017-02-16 01:44:58','2017-02-16 01:44:58',40,'AC_OTH_AUTO','Proposal PR1702-0009 validated','2017-02-16 01:44:58','2017-02-16 00:44:58',1,NULL,NULL,1,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0009 validated\nAuthor: aeinstein',11,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(299,NULL,1,'2017-02-16 01:45:44','2017-02-16 01:45:44',40,'AC_OTH_AUTO','Proposal PR1702-0010 validated','2017-02-16 01:45:44','2017-02-16 00:45:44',2,NULL,NULL,7,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0010 validated\nAuthor: demo',12,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(300,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0011 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,26,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0011 validated\nAuthor: aeinstein',13,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(301,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0012 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,3,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0012 validated\nAuthor: demo',14,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(302,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0013 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,26,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0013 validated\nAuthor: demo',15,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(303,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0014 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0014 validated\nAuthor: demo',16,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(304,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0015 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,1,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0015 validated\nAuthor: aeinstein',17,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(305,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0016 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,26,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0016 validated\nAuthor: demo',18,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(306,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0017 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,12,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0017 validated\nAuthor: demo',19,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(307,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0018 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,26,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0018 validated\nAuthor: aeinstein',20,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(308,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0019 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,1,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0019 validated\nAuthor: aeinstein',21,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(309,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0020 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,26,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0020 validated\nAuthor: aeinstein',22,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(310,NULL,1,'2017-02-16 01:46:17','2017-02-16 01:46:17',40,'AC_OTH_AUTO','Proposal PR1702-0021 validated','2017-02-16 01:46:17','2017-02-16 00:46:17',2,NULL,NULL,12,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0021 validated\nAuthor: demo',23,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(311,NULL,1,'2017-02-16 01:46:17','2017-02-16 01:46:17',40,'AC_OTH_AUTO','Proposal PR1702-0022 validated','2017-02-16 01:46:17','2017-02-16 00:46:17',2,NULL,NULL,7,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0022 validated\nAuthor: demo',24,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(312,NULL,1,'2017-02-16 01:46:17','2017-02-16 01:46:17',40,'AC_OTH_AUTO','Proposal PR1702-0023 validated','2017-02-16 01:46:17','2017-02-16 00:46:17',1,NULL,NULL,3,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0023 validated\nAuthor: aeinstein',25,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(313,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0024 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0024 validated\nAuthor: demo',26,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(314,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0025 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',1,NULL,NULL,6,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0025 validated\nAuthor: aeinstein',27,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(315,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0026 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,19,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0026 validated\nAuthor: demo',28,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(316,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0027 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0027 validated\nAuthor: demo',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(317,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0028 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0028 validated\nAuthor: demo',30,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(318,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0029 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',1,NULL,NULL,11,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0029 validated\nAuthor: aeinstein',31,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(319,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0030 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,19,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0030 validated\nAuthor: demo',32,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(320,NULL,1,'2017-02-16 04:46:31','2017-02-16 04:46:31',40,'AC_OTH_AUTO','Proposition PR1702-0026 signée','2017-02-16 04:46:31','2017-02-16 00:46:31',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0026 signée\nAuteur: admin',28,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(321,NULL,1,'2017-02-16 04:46:37','2017-02-16 04:46:37',40,'AC_OTH_AUTO','Proposition PR1702-0027 signée','2017-02-16 04:46:37','2017-02-16 00:46:37',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0027 signée\nAuteur: admin',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(322,NULL,1,'2017-02-16 04:46:42','2017-02-16 04:46:42',40,'AC_OTH_AUTO','Proposition PR1702-0028 refusée','2017-02-16 04:46:42','2017-02-16 00:46:42',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0028 refusée\nAuteur: admin',30,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(323,NULL,1,'2017-02-16 04:47:09','2017-02-16 04:47:09',40,'AC_OTH_AUTO','Proposition PR1702-0019 validée','2017-02-16 04:47:09','2017-02-16 00:47:09',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0019 validée\nAuteur: admin',21,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(324,NULL,1,'2017-02-16 04:47:25','2017-02-16 04:47:25',40,'AC_OTH_AUTO','Proposition PR1702-0023 signée','2017-02-16 04:47:25','2017-02-16 00:47:25',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0023 signée\nAuteur: admin',25,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(325,NULL,1,'2017-02-16 04:47:29','2017-02-16 04:47:29',40,'AC_OTH_AUTO','Proposition PR1702-0023 classée payée','2017-02-16 04:47:29','2017-02-16 00:47:29',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0023 classée payée\nAuteur: admin',25,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(326,NULL,1,'2017-02-17 16:07:18','2017-02-17 16:07:18',40,'AC_OTH_AUTO','Proposition PR1702-0021 validée','2017-02-17 16:07:18','2017-02-17 12:07:18',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0021 validée\nAuteur: admin',23,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(327,NULL,1,'2017-05-12 13:53:44','2017-05-12 13:53:44',40,'AC_OTH_AUTO','Email sent by MyBigCompany To Einstein','2017-05-12 13:53:44','2017-05-12 09:53:44',12,NULL,NULL,11,12,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Sender: MyBigCompany &lt;myemail@mybigcompany.com&gt;<br>\nReceiver(s): Einstein &lt;genius@example.com&gt;<br>\nBcc: Einstein &lt;genius@example.com&gt;<br>\nEMail topic: Test<br>\nEmail body:<br>\nTest\nAuthor: admin',11,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(328,NULL,1,'2017-08-29 22:39:09','2017-08-29 22:39:09',40,'AC_OTH_AUTO','Invoice FA1601-0024 validated','2017-08-29 22:39:09','2017-08-29 18:39:09',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Invoice FA1601-0024 validated\nAuthor: admin',149,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(329,NULL,1,'2019-09-26 13:38:11','2019-09-26 13:38:11',40,'AC_MEMBER_MODIFY','Member Pierre Curie modified','2019-09-26 13:38:11','2019-09-26 11:38:11',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Pierre Curie modified\nMember: Pierre Curie\nType: Standard members',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(330,NULL,1,'2019-09-26 13:49:21','2019-09-26 13:49:21',40,'AC_MEMBER_MODIFY','Member Pierre Curie modified','2019-09-26 13:49:21','2019-09-26 11:49:21',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Pierre Curie modified\nMember: Pierre Curie\nType: Standard members',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(331,NULL,1,'2019-09-26 17:33:37','2019-09-26 17:33:37',40,'AC_BILL_VALIDATE','Invoice FA1909-0025 validated','2019-09-26 17:33:37','2019-09-26 15:33:37',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1909-0025 validated',218,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(333,NULL,1,'2019-09-27 16:54:30','2019-09-27 16:54:30',40,'AC_PROPAL_VALIDATE','Proposal PR1909-0031 validated','2019-09-27 16:54:30','2019-09-27 14:54:30',12,NULL,4,7,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0031 validated',10,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(335,NULL,1,'2019-09-27 17:08:59','2019-09-27 17:08:59',40,'AC_PROPAL_VALIDATE','Proposal PR1909-0032 validated','2019-09-27 17:08:59','2019-09-27 15:08:59',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0032 validated',33,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(337,NULL,1,'2019-09-27 17:13:13','2019-09-27 17:13:13',40,'AC_PROPAL_VALIDATE','Proposal PR1909-0033 validated','2019-09-27 17:13:13','2019-09-27 15:13:13',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0033 validated',34,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(338,NULL,1,'2019-09-27 17:53:31','2019-09-27 17:53:31',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 17:53:31','2019-09-27 15:53:31',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(339,NULL,1,'2019-09-27 18:15:00','2019-09-27 18:15:00',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 18:15:00','2019-09-27 16:15:00',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(340,NULL,1,'2019-09-27 18:40:32','2019-09-27 18:40:32',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 18:40:32','2019-09-27 16:40:32',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(341,NULL,1,'2019-09-27 19:16:07','2019-09-27 19:16:07',40,'AC_PRODUCT_CREATE','Product ppp created','2019-09-27 19:16:07','2019-09-27 17:16:07',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ppp created',14,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(342,NULL,1,'2019-09-27 19:18:01','2019-09-27 19:18:01',40,'AC_PRODUCT_MODIFY','Product ppp modified','2019-09-27 19:18:01','2019-09-27 17:18:01',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ppp modified',14,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(343,NULL,1,'2019-09-27 19:31:45','2019-09-27 19:31:45',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 19:31:45','2019-09-27 17:31:45',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(344,NULL,1,'2019-09-27 19:32:12','2019-09-27 19:32:12',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 19:32:12','2019-09-27 17:32:12',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(345,NULL,1,'2019-09-27 19:38:30','2019-09-27 19:38:30',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 19:38:30','2019-09-27 17:38:30',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(346,NULL,1,'2019-09-27 19:38:37','2019-09-27 19:38:37',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 19:38:37','2019-09-27 17:38:37',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(347,NULL,1,'2019-09-30 15:49:52',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #15ff11cay39skiaa] New message','2019-09-30 15:49:52','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'dfsdfds',2,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(348,NULL,1,'2019-10-01 13:48:36','2019-10-01 13:48:36',40,'AC_PROJECT_MODIFY','Project PJ1607-0001 modified','2019-10-01 13:48:36','2019-10-01 11:48:36',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1607-0001 modified\nTask: PJ1607-0001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(349,NULL,1,'2019-10-04 10:10:25','2019-10-04 10:10:25',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI1601-0002 validated','2019-10-04 10:10:25','2019-10-04 08:10:25',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 validated',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(350,NULL,1,'2019-10-04 10:10:47','2019-10-04 10:10:47',40,'AC_BILL_SUPPLIER_PAYED','Invoice SI1601-0002 changed to paid','2019-10-04 10:10:47','2019-10-04 08:10:47',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 changed to paid',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(351,NULL,1,'2019-10-04 10:26:49','2019-10-04 10:26:49',40,'AC_BILL_UNVALIDATE','Invoice FA6801-0010 go back to draft status','2019-10-04 10:26:49','2019-10-04 08:26:49',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA6801-0010 go back to draft status',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(352,NULL,1,'2019-10-04 10:27:00','2019-10-04 10:27:00',40,'AC_BILL_VALIDATE','Invoice FA6801-0010 validated','2019-10-04 10:27:00','2019-10-04 08:27:00',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA6801-0010 validated',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(353,NULL,1,'2019-10-04 10:28:14','2019-10-04 10:28:14',40,'AC_BILL_PAYED','Invoice FA6801-0010 changed to paid','2019-10-04 10:28:14','2019-10-04 08:28:14',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA6801-0010 changed to paid',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(354,NULL,1,'2019-10-04 10:29:22','2019-10-04 10:29:22',40,'AC_BILL_SUPPLIER_PAYED','Invoice SI1601-0002 changed to paid','2019-10-04 10:29:22','2019-10-04 08:29:22',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 changed to paid',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(355,NULL,1,'2019-10-04 10:29:41','2019-10-04 10:29:41',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI1601-0002 go back to draft status','2019-10-04 10:29:41','2019-10-04 08:29:41',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 go back to draft status',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(356,NULL,1,'2019-10-04 10:31:30','2019-10-04 10:31:30',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI1601-0002 validated','2019-10-04 10:31:30','2019-10-04 08:31:30',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 validated',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(357,NULL,1,'2019-10-04 16:56:21',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 16:56:21','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaaa',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(358,NULL,1,'2019-10-04 17:08:04',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:08:04','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'ddddd',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(359,NULL,1,'2019-10-04 17:25:05',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:25:05','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaa',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(360,NULL,1,'2019-10-04 17:26:14',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:26:14','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaa',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(361,NULL,1,'2019-10-04 17:30:10',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:30:10','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(362,NULL,1,'2019-10-04 17:51:43',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:51:43','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(363,NULL,1,'2019-10-04 17:52:02',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:52:02','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(364,NULL,1,'2019-10-04 17:52:17',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:52:17','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(365,NULL,1,'2019-10-04 17:52:39',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:52:39','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(366,NULL,1,'2019-10-04 17:52:53',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:52:53','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(367,NULL,1,'2019-10-04 17:53:13',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:53:13','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(368,NULL,1,'2019-10-04 17:53:26',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:53:26','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(369,NULL,1,'2019-10-04 17:53:48',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:53:48','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(370,NULL,1,'2019-10-04 17:54:09',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:54:09','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(371,NULL,1,'2019-10-04 17:54:28',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:54:28','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(372,NULL,1,'2019-10-04 17:55:43',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:55:43','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(373,NULL,1,'2019-10-04 17:56:01',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:56:01','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(374,NULL,1,'2019-10-04 18:00:32',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:00:32','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(375,NULL,1,'2019-10-04 18:00:58',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:00:58','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(376,NULL,1,'2019-10-04 18:11:30',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:11:30','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(377,NULL,1,'2019-10-04 18:12:02',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:12:02','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fffffff',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(378,NULL,1,'2019-10-04 18:49:30',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:49:30','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaa',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(379,NULL,1,'2019-10-04 19:00:22',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 19:00:22','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fff',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(380,NULL,1,'2019-10-04 19:24:20','2019-10-04 19:24:20',40,'AC_PROPAL_SENTBYMAIL','Email sent by Alice Adminson To NLTechno','2019-10-04 19:24:20','2019-10-04 17:24:20',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSender: Alice Adminson &lt;aadminson@example.com&gt;<br>\nReceiver(s): NLTechno &lt;notanemail@nltechno.com&gt;<br>\nEmail topic: Envoi de la proposition commerciale PR1909-0032<br>\nEmail body:<br>\nHello<br />\r\n<br />\r\nVeuillez trouver, ci-joint, la proposition commerciale PR1909-0032<br />\r\n<br />\r\n<br />\r\nSincerely<br />\r\n<br />\r\nAlice - 123<br>\n<br>\nAttached files and documents: PR1909-0032.pdf',33,'propal',NULL,'Envoi de la proposition commerciale PR1909-0032','Alice Adminson <aadminson@example.com>',NULL,'NLTechno <notanemail@nltechno.com>',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(381,NULL,1,'2019-10-04 19:30:13',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 19:30:13','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(382,NULL,1,'2019-10-04 19:32:55',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 19:32:55','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'uuuuuu\n\nAttached files and documents: Array',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(383,NULL,1,'2019-10-04 19:37:16',NULL,50,'TICKET_MSG','','2019-10-04 19:37:16','2020-06-12 17:12:24',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,100,'',NULL,NULL,'f\n\nFichiers et documents joints: dolihelp.ico',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(384,NULL,1,'2019-10-04 19:39:07',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 19:39:07','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaafff\n\nAttached files and documents: dolibarr.gif;doliadmin.ico',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(385,NULL,1,'2019-10-07 12:17:07','2019-10-07 12:17:07',40,'AC_PRODUCT_DELETE','Product PREF123456 deleted','2019-10-07 12:17:07','2019-10-07 10:17:07',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PREF123456 deleted',17,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(386,NULL,1,'2019-10-07 12:17:32','2019-10-07 12:17:32',40,'AC_PRODUCT_DELETE','Product PREF123456 deleted','2019-10-07 12:17:32','2019-10-07 10:17:32',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PREF123456 deleted',18,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(387,NULL,1,'2019-10-08 19:21:07','2019-10-08 19:21:07',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-10-08 19:21:07','2019-10-08 17:21:07',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(388,NULL,1,'2019-10-08 21:01:07','2019-10-08 21:01:07',40,'AC_MEMBER_MODIFY','Member Pierre Curie modified','2019-10-08 21:01:07','2019-10-08 19:01:07',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Pierre Curie modified\nMember: Pierre Curie\nType: Standard members',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(389,NULL,1,'2019-10-08 21:01:22','2019-10-08 21:01:22',40,'AC_MEMBER_MODIFY','Member doe john modified','2019-10-08 21:01:22','2019-10-08 19:01:22',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember doe john modified\nMember: doe john\nType: Standard members',3,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(390,NULL,1,'2019-10-08 21:01:45','2019-10-08 21:01:45',40,'AC_MEMBER_MODIFY','Member smith smith modified','2019-10-08 21:01:45','2019-10-08 19:01:45',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember smith smith modified\nMember: smith smith\nType: Standard members',4,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(391,NULL,1,'2019-10-08 21:02:18','2019-10-08 21:02:18',40,'AC_MEMBER_MODIFY','Member Vick Smith modified','2019-10-08 21:02:18','2019-10-08 19:02:18',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Vick Smith modified\nMember: Vick Smith\nType: Standard members',1,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(392,NULL,1,'2019-11-28 15:54:46','2019-11-28 15:54:46',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI1911-0005 validated','2019-11-28 15:54:47','2019-11-28 11:54:47',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1911-0005 validated',21,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(393,NULL,1,'2019-11-28 16:33:35','2019-11-28 16:33:35',40,'AC_PRODUCT_CREATE','Product FR-CAR created','2019-11-28 16:33:35','2019-11-28 12:33:35',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct FR-CAR created',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(394,NULL,1,'2019-11-28 16:34:08','2019-11-28 16:34:08',40,'AC_PRODUCT_DELETE','Product ppp deleted','2019-11-28 16:34:08','2019-11-28 12:34:08',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ppp deleted',14,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(395,NULL,1,'2019-11-28 16:34:33','2019-11-28 16:34:33',40,'AC_PRODUCT_MODIFY','Product FR-CAR modified','2019-11-28 16:34:33','2019-11-28 12:34:33',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct FR-CAR modified',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(396,NULL,1,'2019-11-28 16:34:46','2019-11-28 16:34:46',40,'AC_PRODUCT_MODIFY','Product FR-CAR modified','2019-11-28 16:34:46','2019-11-28 12:34:46',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct FR-CAR modified',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(397,NULL,1,'2019-11-28 16:36:56','2019-11-28 16:36:56',40,'AC_PRODUCT_MODIFY','Product POS-CAR modified','2019-11-28 16:36:56','2019-11-28 12:36:56',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-CAR modified',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(398,NULL,1,'2019-11-28 16:37:36','2019-11-28 16:37:36',40,'AC_PRODUCT_CREATE','Product POS-APPLE created','2019-11-28 16:37:36','2019-11-28 12:37:36',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-APPLE created',25,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(399,NULL,1,'2019-11-28 16:37:58','2019-11-28 16:37:58',40,'AC_PRODUCT_MODIFY','Product POS-APPLE modified','2019-11-28 16:37:58','2019-11-28 12:37:58',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-APPLE modified',25,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(400,NULL,1,'2019-11-28 16:38:44','2019-11-28 16:38:44',40,'AC_PRODUCT_CREATE','Product POS-KIWI created','2019-11-28 16:38:44','2019-11-28 12:38:44',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-KIWI created',26,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(401,NULL,1,'2019-11-28 16:39:21','2019-11-28 16:39:21',40,'AC_PRODUCT_CREATE','Product POS-PEACH created','2019-11-28 16:39:21','2019-11-28 12:39:21',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-PEACH created',27,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(402,NULL,1,'2019-11-28 16:39:58','2019-11-28 16:39:58',40,'AC_PRODUCT_CREATE','Product POS-ORANGE created','2019-11-28 16:39:58','2019-11-28 12:39:58',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-ORANGE created',28,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(403,NULL,1,'2019-11-28 17:00:28','2019-11-28 17:00:28',40,'AC_PRODUCT_MODIFY','Product APPLEPIE modified','2019-11-28 17:00:28','2019-11-28 13:00:28',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct APPLEPIE modified',4,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(404,NULL,1,'2019-11-28 17:00:46','2019-11-28 17:00:46',40,'AC_PRODUCT_MODIFY','Product PEARPIE modified','2019-11-28 17:00:46','2019-11-28 13:00:46',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PEARPIE modified',2,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(405,NULL,1,'2019-11-28 17:01:57','2019-11-28 17:01:57',40,'AC_PRODUCT_MODIFY','Product POS-APPLE modified','2019-11-28 17:01:57','2019-11-28 13:01:57',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-APPLE modified',25,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(406,NULL,1,'2019-11-28 17:03:14','2019-11-28 17:03:14',40,'AC_PRODUCT_CREATE','Product POS-Eggs created','2019-11-28 17:03:14','2019-11-28 13:03:14',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-Eggs created',29,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(407,NULL,1,'2019-11-28 17:04:17','2019-11-28 17:04:17',40,'AC_PRODUCT_MODIFY','Product POS-Eggs modified','2019-11-28 17:04:17','2019-11-28 13:04:17',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-Eggs modified',29,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(408,NULL,1,'2019-11-28 17:09:14','2019-11-28 17:09:14',40,'AC_PRODUCT_CREATE','Product POS-Chips created','2019-11-28 17:09:14','2019-11-28 13:09:14',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-Chips created',30,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(409,NULL,1,'2019-11-28 17:09:54','2019-11-28 17:09:54',40,'AC_PRODUCT_MODIFY','Product POS-Chips modified','2019-11-28 17:09:54','2019-11-28 13:09:54',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-Chips modified',30,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(410,NULL,1,'2019-11-28 18:46:20','2019-11-28 18:46:20',40,'AC_PRODUCT_MODIFY','Product POS-APPLE modified','2019-11-28 18:46:20','2019-11-28 14:46:20',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-APPLE modified',25,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(411,NULL,1,'2019-11-28 18:59:29','2019-11-28 18:59:29',40,'AC_PRODUCT_MODIFY','Product PEARPIE modified','2019-11-28 18:59:29','2019-11-28 14:59:29',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PEARPIE modified',2,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(412,NULL,1,'2019-11-28 19:02:01','2019-11-28 19:02:01',40,'AC_PRODUCT_MODIFY','Product POS-CARROT modified','2019-11-28 19:02:01','2019-11-28 15:02:01',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-CARROT modified',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(413,NULL,1,'2019-11-28 19:09:50','2019-11-28 19:09:50',40,'AC_PRODUCT_MODIFY','Product PEARPIE modified','2019-11-28 19:09:50','2019-11-28 15:09:50',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PEARPIE modified',2,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(414,NULL,1,'2019-11-28 19:12:50','2019-11-28 19:12:50',40,'AC_PRODUCT_MODIFY','Product PEARPIE modified','2019-11-28 19:12:50','2019-11-28 15:12:50',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PEARPIE modified',2,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(415,NULL,1,'2019-11-29 12:46:29','2019-11-29 12:46:29',40,'AC_TICKET_CREATE','Ticket TS1911-0004 created','2019-11-29 12:46:29','2019-11-29 08:46:29',12,NULL,4,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0004 created',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(416,NULL,1,'2019-11-29 12:46:34','2019-11-29 12:46:34',40,'AC_TICKET_MODIFY','Ticket TS1911-0004 read by Alice Adminson','2019-11-29 12:46:34','2019-11-29 08:46:34',12,NULL,4,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0004 read by Alice Adminson',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(417,NULL,1,'2019-11-29 12:46:47','2019-11-29 12:46:47',40,'AC_TICKET_ASSIGNED','Ticket TS1911-0004 assigned','2019-11-29 12:46:47','2019-11-29 08:46:47',12,NULL,4,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0004 assigned\nOld user: None\nNew user: Commerson Charle1',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(418,NULL,1,'2019-11-29 12:47:13',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #5gvo9bsjri55zef9] New message','2019-11-29 12:47:13','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'Where do you want to install Dolibarr ?<br />\r\nOn-Premise or on the Cloud ?',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(419,NULL,1,'2019-11-29 12:50:45','2019-11-29 12:50:45',40,'AC_TICKET_CREATE','Ticket TS1911-0005 créé','2019-11-29 12:50:45','2019-11-29 08:50:45',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nTicket TS1911-0005 créé',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(420,NULL,1,'2019-11-29 12:52:32','2019-11-29 12:52:32',40,'AC_TICKET_MODIFY','Ticket TS1911-0005 read by Alice Adminson','2019-11-29 12:52:32','2019-11-29 08:52:32',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0005 read by Alice Adminson',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(421,NULL,1,'2019-11-29 12:52:53','2019-11-29 12:52:53',40,'AC_TICKET_ASSIGNED','Ticket TS1911-0005 assigned','2019-11-29 12:52:53','2019-11-29 08:52:53',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0005 assigned\nOld user: None\nNew user: Commerson Charle1',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(422,NULL,1,'2019-11-29 12:54:04',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #d51wjy4nym7wltg7] New message','2019-11-29 12:54:04','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'Hi.<br />\r\nThanks for your interest in using Dolibarr ERP CRM.<br />\r\nI need more information to give you the correct answer :&nbsp;Where do you want to install Dolibarr. On premise or on Cloud',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(423,NULL,1,'2019-11-29 12:54:46',NULL,50,'TICKET_MSG','','2019-11-29 12:54:46','2020-06-12 17:12:24',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,100,'',NULL,NULL,'I need it On-Premise.',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(424,NULL,1,'2019-11-29 12:55:42',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #d51wjy4nym7wltg7] New message','2019-11-29 12:55:42','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'When used on-premise, you can download and install Dolibarr yourself from ou web portal: https://www.dolibarr.org<br />\r\nIt is completely free.',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(425,NULL,1,'2019-11-29 12:55:48','2019-11-29 12:55:48',40,'AC_TICKET_CLOSE','Ticket TS1911-0005 closed','2019-11-29 12:55:48','2019-11-29 08:55:48',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0005 closed',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(426,NULL,1,'2019-11-29 12:56:47','2019-11-29 12:56:47',40,'AC_BOM_UNVALIDATE','BOM unvalidated','2019-11-29 12:56:47','2019-11-29 08:56:47',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM unvalidated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(427,NULL,1,'2019-11-29 12:57:14','2019-11-29 12:57:14',40,'AC_BOM_VALIDATE','BOM validated','2019-11-29 12:57:14','2019-11-29 08:57:14',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM validated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(428,NULL,1,'2019-12-20 16:40:14','2019-12-20 16:40:14',40,'AC_MO_DELETE','MO deleted','2019-12-20 16:40:14','2019-12-20 12:40:14',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',3,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(429,NULL,1,'2019-12-20 17:00:43','2019-12-20 17:00:43',40,'AC_MO_DELETE','MO deleted','2019-12-20 17:00:43','2019-12-20 13:00:43',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',7,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(430,NULL,1,'2019-12-20 17:00:56','2019-12-20 17:00:56',40,'AC_MO_DELETE','MO deleted','2019-12-20 17:00:56','2019-12-20 13:00:56',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',6,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(431,NULL,1,'2019-12-20 20:00:03','2019-12-20 20:00:03',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:00:03','2019-12-20 16:00:03',12,NULL,6,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',1,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(432,NULL,1,'2019-12-20 20:22:11','2019-12-20 20:22:11',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:22:11','2019-12-20 16:22:11',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',10,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(433,NULL,1,'2019-12-20 20:22:11','2019-12-20 20:22:11',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:22:11','2019-12-20 16:22:11',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',12,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(434,NULL,1,'2019-12-20 20:22:20','2019-12-20 20:22:20',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:22:20','2019-12-20 16:22:20',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',9,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(435,NULL,1,'2019-12-20 20:27:07','2019-12-20 20:27:07',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:27:07','2019-12-20 16:27:07',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',13,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(436,NULL,1,'2019-12-20 20:42:42','2019-12-20 20:42:42',40,'AC_ORDER_VALIDATE','Order CO7001-0027 validated','2019-12-20 20:42:42','2019-12-20 16:42:42',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0027 validated',88,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(437,NULL,1,'2019-12-20 20:46:25','2019-12-20 20:46:25',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:46:25','2019-12-20 16:46:25',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(438,NULL,1,'2019-12-20 20:46:45','2019-12-20 20:46:45',40,'AC_ORDER_SUPPLIER_CLASSIFY_BILLED','Purchase Order CF1007-0001 set billed','2019-12-20 20:46:45','2019-12-20 16:46:45',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 set billed',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(439,NULL,1,'2019-12-20 20:47:02','2019-12-20 20:47:02',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:47:02','2019-12-20 16:47:02',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(440,NULL,1,'2019-12-20 20:47:44','2019-12-20 20:47:44',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:47:44','2019-12-20 16:47:44',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(441,NULL,1,'2019-12-20 20:47:53','2019-12-20 20:47:53',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:47:53','2019-12-20 16:47:53',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(442,NULL,1,'2019-12-20 20:48:05','2019-12-20 20:48:05',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:48:05','2019-12-20 16:48:05',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(443,NULL,1,'2019-12-20 20:48:45','2019-12-20 20:48:45',40,'AC_ORDER_CLASSIFY_BILLED','Order CO7001-0016 classified billed','2019-12-20 20:48:45','2019-12-20 16:48:45',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0016 classified billed',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(444,NULL,1,'2019-12-20 20:48:55','2019-12-20 20:48:55',40,'AC_ORDER_CLOSE','Order CO7001-0018 classified delivered','2019-12-20 20:48:55','2019-12-20 16:48:55',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0018 classified delivered',62,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(445,NULL,1,'2019-12-20 20:49:43','2019-12-20 20:49:43',40,'AC_PROPAL_CLASSIFY_BILLED','Proposal PR1702-0027 classified billed','2019-12-20 20:49:43','2019-12-20 16:49:43',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1702-0027 classified billed',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(446,NULL,1,'2019-12-20 20:49:54','2019-12-20 20:49:54',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR1702-0027 signed','2019-12-20 20:49:54','2019-12-20 16:49:54',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1702-0027 signed',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(447,NULL,1,'2019-12-20 20:50:14','2019-12-20 20:50:14',40,'AC_PROPAL_CLOSE_REFUSED','Proposal PR1702-0027 refused','2019-12-20 20:50:14','2019-12-20 16:50:14',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1702-0027 refused',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(448,NULL,1,'2019-12-20 20:50:23','2019-12-20 20:50:23',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR1702-0027 signed','2019-12-20 20:50:23','2019-12-20 16:50:23',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1702-0027 signed',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(449,NULL,1,'2019-12-21 17:18:22','2019-12-21 17:18:22',40,'AC_BOM_CLOSE','BOM disabled','2019-12-21 17:18:22','2019-12-21 13:18:22',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM disabled',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(450,NULL,1,'2019-12-21 17:18:38','2019-12-21 17:18:38',40,'AC_MEMBER_RESILIATE','Member Vick Smith terminated','2019-12-21 17:18:38','2019-12-21 13:18:38',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Vick Smith terminated\nMember: Vick Smith\nType: Standard members',1,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(451,NULL,1,'2019-12-21 19:46:33','2019-12-21 19:46:33',40,'AC_PROJECT_CREATE','Project PJ1912-0005 created','2019-12-21 19:46:33','2019-12-21 15:46:33',12,NULL,10,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 created\nProject: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(452,NULL,1,'2019-12-21 19:47:03','2019-12-21 19:47:03',40,'AC_PROJECT_MODIFY','Project PJ1912-0005 modified','2019-12-21 19:47:03','2019-12-21 15:47:03',12,NULL,10,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 modified\nTask: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(453,NULL,1,'2019-12-21 19:47:24','2019-12-21 19:47:24',40,'AC_PROJECT_MODIFY','Project PJ1912-0005 modified','2019-12-21 19:47:24','2019-12-21 15:47:24',12,NULL,10,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 modified\nTask: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(454,NULL,1,'2019-12-21 19:47:52','2019-12-21 19:47:52',40,'AC_PROJECT_MODIFY','Project PJ1912-0005 modified','2019-12-21 19:47:52','2019-12-21 15:47:52',12,NULL,10,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 modified\nTask: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(455,NULL,1,'2019-12-21 19:48:06','2019-12-21 19:48:06',40,'AC_PROJECT_MODIFY','Project PJ1912-0005 modified','2019-12-21 19:48:06','2019-12-21 15:48:06',12,NULL,10,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 modified\nTask: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(456,NULL,1,'2019-12-21 19:49:28','2019-12-21 19:49:28',40,'AC_PROJECT_CREATE','Project PJ1912-0006 created','2019-12-21 19:49:28','2019-12-21 15:49:28',12,NULL,11,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0006 created\nProject: PJ1912-0006',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(457,NULL,1,'2019-12-21 19:52:12','2019-12-21 19:52:12',40,'AC_PROJECT_CREATE','Project PJ1912-0007 created','2019-12-21 19:52:12','2019-12-21 15:52:12',12,NULL,12,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0007 created\nProject: PJ1912-0007',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(458,NULL,1,'2019-12-21 19:53:21','2019-12-21 19:53:21',40,'AC_PROJECT_CREATE','Project PJ1912-0008 created','2019-12-21 19:53:21','2019-12-21 15:53:21',12,NULL,13,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0008 created\nProject: PJ1912-0008',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(459,NULL,1,'2019-12-21 19:53:42','2019-12-21 19:53:42',40,'AC_PROJECT_MODIFY','Project PJ1912-0008 modified','2019-12-21 19:53:42','2019-12-21 15:53:42',12,NULL,13,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0008 modified\nTask: PJ1912-0008',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(460,NULL,1,'2019-12-21 19:55:23','2019-12-21 19:55:23',40,'AC_PROJECT_MODIFY','Project PJ1912-0006 modified','2019-12-21 19:55:23','2019-12-21 15:55:23',12,NULL,11,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0006 modified\nTask: PJ1912-0006',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(461,NULL,1,'2019-12-21 20:10:21','2019-12-21 20:10:21',40,'AC_PROJECT_MODIFY','Project PJ1912-0006 modified','2019-12-21 20:10:21','2019-12-21 16:10:21',12,NULL,11,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0006 modified\nTask: PJ1912-0006',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(462,NULL,1,'2019-12-11 10:00:00','2019-12-11 10:00:00',5,'AC_RDV','Meeting with all employees','2019-12-21 20:29:32','2019-12-21 16:29:32',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(463,NULL,1,'2019-12-06 00:00:00',NULL,11,'AC_INT','Intervention on customer site','2019-12-21 20:30:11','2019-12-21 16:30:11',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,1,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(464,NULL,1,'2019-12-23 14:16:59','2019-12-23 14:16:59',40,'AC_BILL_PAYED','Invoice FA1601-0024 changed to paid','2019-12-23 14:16:59','2019-12-23 10:16:59',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1601-0024 changed to paid',149,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(465,NULL,1,'2019-12-23 14:17:18','2019-12-23 14:17:18',40,'AC_BILL_PAYED','Invoice FA1601-0024 changed to paid','2019-12-23 14:17:18','2019-12-23 10:17:18',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1601-0024 changed to paid',149,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(466,NULL,1,'2019-11-23 14:25:00',NULL,50,'AC_OTH','Test','2019-12-23 17:25:14','2019-12-23 13:25:14',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,0,-1,'',NULL,NULL,'18/11 17h06 : Message laiss&eacute;. Me rappeler pour m&#39;en dire plus.&nbsp;<br />\r\n<br />\r\n20/11 10h17 &quot;A rappeler suite au msg laiss&eacute; le 14/11, dit que c&#39;est urgent&quot;<br />\r\n12h22 : message laiss&eacute;. Je lui envoie un sms<br />\r\n<br />\r\n&quot;D&eacute;claration de sinistre originale&quot; : constat de ce qui s&#39;est pass&eacute;.<br />\r\nElle envoie le ch&egrave;que de solde d&egrave;s demain.<br />\r\n<br />\r\n3/12 : Elle pr&eacute;f&egrave;re avoir plus d&#39;infos sur le sinistre pour l&#39;assurance.<br />\r\nCourrier envoy&eacute; le 4/12/19 par mail et par courrier postal<br />\r\n<br />\r\n6/12 15h02 : ont obtenu le feu vert de l&#39;assurance.<br />\r\nOn bloque 16/12 PM &agrave; partir de 14h30.&nbsp;',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(467,NULL,1,'2020-01-01 14:35:47','2020-01-01 14:35:47',40,'AC_MEMBER_VALIDATE','Adhérent aze aze validé','2020-01-01 14:35:47','2020-01-01 10:35:47',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent aze aze validé\nAdhérent: aze aze\nType: Board members',5,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(468,NULL,1,'2020-01-01 14:50:59','2020-01-01 14:50:59',40,'AC_MEMBER_VALIDATE','Adhérent azr azr validé','2020-01-01 14:50:59','2020-01-01 10:50:59',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azr azr validé\nAdhérent: azr azr\nType: Board members',6,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(469,NULL,1,'2020-01-01 15:00:16','2020-01-01 15:00:16',40,'AC_MEMBER_VALIDATE','Adhérent azt azt validé','2020-01-01 15:00:16','2020-01-01 11:00:16',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azt azt validé\nAdhérent: azt azt\nType: Board members',7,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(470,NULL,1,'2020-01-01 15:08:20','2020-01-01 15:08:20',40,'AC_MEMBER_VALIDATE','Adhérent azu azu validé','2020-01-01 15:08:20','2020-01-01 11:08:20',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azu azu validé\nAdhérent: azu azu\nType: Board members',8,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(471,NULL,1,'2020-01-01 15:27:24','2020-01-01 15:27:24',40,'AC_MEMBER_VALIDATE','Adhérent azi azi validé','2020-01-01 15:27:24','2020-01-01 11:27:24',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azi azi validé\nAdhérent: azi azi\nType: Board members',9,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(472,NULL,1,'2020-01-01 15:36:29','2020-01-01 15:36:29',40,'AC_MEMBER_VALIDATE','Adhérent azo azo validé','2020-01-01 15:36:29','2020-01-01 11:36:29',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azo azo validé\nAdhérent: azo azo\nType: Board members',10,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(473,NULL,1,'2020-01-01 15:44:25','2020-01-01 15:44:25',40,'AC_MEMBER_VALIDATE','Adhérent azp azp validé','2020-01-01 15:44:25','2020-01-01 11:44:25',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azp azp validé\nAdhérent: azp azp\nType: Board members',11,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(478,NULL,1,'2020-01-01 16:52:32','2020-01-01 16:52:32',40,'AC_MEMBER_VALIDATE','Adhérent azq azq validé','2020-01-01 16:52:32','2020-01-01 12:52:32',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azq azq validé\nAdhérent: azq azq\nType: Board members',12,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(483,NULL,1,'2020-01-01 17:49:05','2020-01-01 17:49:05',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0006 validated','2020-01-01 17:49:05','2020-01-01 13:49:05',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 validated',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(484,NULL,1,'2020-01-01 17:50:41','2020-01-01 17:50:41',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0001 validated','2020-01-01 17:50:41','2020-01-01 13:50:41',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 validated',23,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(485,NULL,1,'2020-01-01 17:50:44','2020-01-01 17:50:44',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 17:50:44','2020-01-01 13:50:44',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',23,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(486,NULL,1,'2020-01-01 17:51:22','2020-01-01 17:51:22',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI2001-0006 go back to draft status','2020-01-01 17:51:22','2020-01-01 13:51:22',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 go back to draft status',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(487,NULL,1,'2020-01-01 20:17:00','2020-01-01 20:17:00',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0006 validated','2020-01-01 20:17:00','2020-01-01 16:17:00',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 validated',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(488,NULL,1,'2020-01-01 20:17:46','2020-01-01 20:17:46',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0001 validated','2020-01-01 20:17:46','2020-01-01 16:17:46',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 validated',24,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(489,NULL,1,'2020-01-01 20:17:51','2020-01-01 20:17:51',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 20:17:51','2020-01-01 16:17:51',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',24,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(490,NULL,1,'2020-01-01 20:20:22','2020-01-01 20:20:22',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0001 validated','2020-01-01 20:20:22','2020-01-01 16:20:22',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 validated',26,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(491,NULL,1,'2020-01-01 20:20:31','2020-01-01 20:20:31',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 20:20:31','2020-01-01 16:20:31',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',26,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(492,NULL,1,'2020-01-01 20:21:35','2020-01-01 20:21:35',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI2001-0006 go back to draft status','2020-01-01 20:21:35','2020-01-01 16:21:35',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 go back to draft status',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(493,NULL,1,'2020-01-01 20:21:42','2020-01-01 20:21:42',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0006 validated','2020-01-01 20:21:42','2020-01-01 16:21:42',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 validated',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(494,NULL,1,'2020-01-01 20:21:55','2020-01-01 20:21:55',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0001 validated','2020-01-01 20:21:55','2020-01-01 16:21:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 validated',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(495,NULL,1,'2020-01-01 20:23:02','2020-01-01 20:23:02',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0007 validated','2020-01-01 20:23:02','2020-01-01 16:23:02',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0007 validated',28,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(496,NULL,1,'2020-01-01 20:23:17','2020-01-01 20:23:17',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 20:23:17','2020-01-01 16:23:17',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(497,NULL,1,'2020-01-01 20:25:36','2020-01-01 20:25:36',40,'AC_BILL_SUPPLIER_PAYED','Invoice SI2001-0007 changed to paid','2020-01-01 20:25:36','2020-01-01 16:25:36',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0007 changed to paid',28,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(498,NULL,1,'2020-01-01 20:51:37','2020-01-01 20:51:37',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0002 validated','2020-01-01 20:51:37','2020-01-01 16:51:37',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0002 validated',30,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(499,NULL,1,'2020-01-01 20:51:48','2020-01-01 20:51:48',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0002 changed to paid','2020-01-01 20:51:48','2020-01-01 16:51:48',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0002 changed to paid',30,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(500,NULL,1,'2020-01-01 21:02:39','2020-01-01 21:02:39',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 21:02:39','2020-01-01 17:02:39',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(501,NULL,1,'2020-01-01 21:03:01','2020-01-01 21:03:01',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 21:03:01','2020-01-01 17:03:01',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(502,NULL,1,'2020-01-01 21:11:10','2020-01-01 21:11:10',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 21:11:10','2020-01-01 17:11:10',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(503,NULL,1,'2020-01-01 21:20:07','2020-01-01 21:20:07',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 21:20:07','2020-01-01 17:20:07',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(504,NULL,1,'2020-01-01 21:21:28','2020-01-01 21:21:28',40,'AC_BILL_SUPPLIER_PAYED','Invoice SI2001-0007 changed to paid','2020-01-01 21:21:28','2020-01-01 17:21:28',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0007 changed to paid',28,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(505,NULL,1,'2020-01-01 22:06:30','2020-01-01 22:06:30',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 22:06:31','2020-01-01 18:06:31',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(506,NULL,1,'2020-01-01 23:54:16','2020-01-01 23:54:16',40,'AC_PRODUCT_MODIFY','Product APPLEPIE modified','2020-01-01 23:54:16','2020-01-01 19:54:16',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct APPLEPIE modified',4,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(507,NULL,1,'2020-01-02 20:49:34','2020-01-02 20:49:34',40,'AC_BILL_PAYED','Invoice FA1601-0024 changed to paid','2020-01-02 20:49:34','2020-01-02 16:49:34',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1601-0024 changed to paid',149,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(508,NULL,1,'2020-01-02 23:02:35','2020-01-02 23:02:35',40,'AC_PRODUCT_MODIFY','Product APPLEPIE modified','2020-01-02 23:02:35','2020-01-02 19:02:35',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct APPLEPIE modified',4,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(509,NULL,1,'2020-01-02 23:45:01','2020-01-02 23:45:01',40,'AC_BOM_REOPEN','BOM reopen','2020-01-02 23:45:01','2020-01-02 19:45:01',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM reopen',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(511,NULL,1,'2020-01-02 23:57:42','2020-01-02 23:57:42',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-02 23:57:42','2020-01-02 19:57:42',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(512,NULL,1,'2020-01-03 13:33:54','2020-01-03 13:33:54',40,'AC_BOM_UNVALIDATE','BOM unvalidated','2020-01-03 13:33:54','2020-01-03 09:33:54',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM unvalidated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(513,NULL,1,'2020-01-03 13:34:11','2020-01-03 13:34:11',40,'AC_BOM_VALIDATE','BOM validated','2020-01-03 13:34:11','2020-01-03 09:34:11',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM validated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(514,NULL,1,'2020-01-03 13:35:45','2020-01-03 13:35:45',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-03 13:35:45','2020-01-03 09:35:45',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',18,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(515,NULL,1,'2020-01-03 14:10:41','2020-01-03 14:10:41',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-03 14:10:41','2020-01-03 10:10:41',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',18,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(516,NULL,1,'2020-01-06 00:39:58','2020-01-06 00:39:58',40,'AC_COMPANY_CREATE','Patient créé','2020-01-06 00:39:58','2020-01-05 20:39:58',12,NULL,NULL,29,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPatient créé',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(517,NULL,1,'2020-01-06 00:49:06','2020-01-06 00:49:06',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI2001-0006 go back to draft status','2020-01-06 00:49:06','2020-01-05 20:49:06',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 go back to draft status',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(518,NULL,1,'2020-01-06 06:50:05','2020-01-06 06:50:05',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-06 06:50:05','2020-01-06 02:50:05',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(519,NULL,1,'2020-01-06 20:52:28','2020-01-06 20:52:28',40,'AC_OTH_AUTO','Consultation 2 recorded (Patient)','2020-01-06 20:52:28','2020-01-06 16:52:28',12,NULL,NULL,29,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Consultation 2 recorded (Patient)\nAuthor: admin',2,'cabinetmed_cons',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(520,NULL,1,'2020-01-07 20:25:02','2020-01-07 20:25:02',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 20:25:02','2020-01-07 16:25:02',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(521,NULL,1,'2020-01-07 21:12:37','2020-01-07 21:12:37',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:12:37','2020-01-07 17:12:37',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(522,NULL,1,'2020-01-07 21:13:00','2020-01-07 21:13:00',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:13:00','2020-01-07 17:13:00',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(523,NULL,1,'2020-01-07 21:13:49','2020-01-07 21:13:49',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:13:49','2020-01-07 17:13:49',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(524,NULL,1,'2020-01-07 21:46:58','2020-01-07 21:46:58',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:46:58','2020-01-07 17:46:58',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(525,NULL,1,'2020-01-07 21:52:34','2020-01-07 21:52:34',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:52:34','2020-01-07 17:52:34',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(526,NULL,1,'2020-01-07 21:53:44','2020-01-07 21:53:44',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:53:44','2020-01-07 17:53:44',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(527,NULL,1,'2020-01-07 21:53:58','2020-01-07 21:53:58',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:53:58','2020-01-07 17:53:58',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(528,NULL,1,'2020-01-07 21:54:12','2020-01-07 21:54:12',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:54:12','2020-01-07 17:54:12',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(529,NULL,1,'2020-01-07 22:00:55','2020-01-07 22:00:55',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 22:00:55','2020-01-07 18:00:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(530,NULL,1,'2020-01-07 22:39:52','2020-01-07 22:39:52',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 22:39:52','2020-01-07 18:39:52',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(531,NULL,1,'2020-01-07 23:09:04','2020-01-07 23:09:04',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 23:09:04','2020-01-07 19:09:04',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(532,NULL,1,'2020-01-07 23:39:09','2020-01-07 23:39:09',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR1909-0033 signed','2020-01-07 23:39:09','2020-01-07 19:39:09',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0033 signed',34,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(533,NULL,1,'2020-01-07 23:43:06','2020-01-07 23:43:06',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR1909-0033 signed','2020-01-07 23:43:06','2020-01-07 19:43:06',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0033 signed',34,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(534,NULL,1,'2020-01-07 23:50:40','2020-01-07 23:50:40',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 23:50:40','2020-01-07 19:50:40',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(535,NULL,1,'2020-01-07 23:51:27','2020-01-07 23:51:27',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 23:51:27','2020-01-07 19:51:27',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(536,NULL,1,'2020-01-08 00:25:23','2020-01-08 00:25:23',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 00:25:23','2020-01-07 20:25:23',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(537,NULL,1,'2020-01-08 00:25:43','2020-01-08 00:25:43',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 00:25:43','2020-01-07 20:25:43',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(538,NULL,1,'2020-01-08 00:29:24','2020-01-08 00:29:24',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 00:29:24','2020-01-07 20:29:24',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(539,NULL,1,'2020-01-08 00:29:43','2020-01-08 00:29:43',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 00:29:43','2020-01-07 20:29:43',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(540,NULL,1,'2020-01-08 01:09:15','2020-01-08 01:09:15',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 01:09:15','2020-01-07 21:09:15',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(541,NULL,1,'2020-01-08 01:15:02','2020-01-08 01:15:02',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 01:15:02','2020-01-07 21:15:02',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(542,NULL,1,'2020-01-08 01:17:16','2020-01-08 01:17:16',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 01:17:16','2020-01-07 21:17:16',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(543,NULL,1,'2020-01-08 05:31:44','2020-01-08 05:31:44',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 05:31:44','2020-01-08 01:31:44',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(544,NULL,1,'2020-01-08 05:39:46','2020-01-08 05:39:46',40,'AC_BOM_CLOSE','BOM disabled','2020-01-08 05:39:46','2020-01-08 01:39:46',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM disabled',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(545,NULL,1,'2020-01-08 05:39:50','2020-01-08 05:39:50',40,'AC_BOM_REOPEN','BOM reopen','2020-01-08 05:39:50','2020-01-08 01:39:50',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM reopen',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(546,NULL,1,'2020-01-08 06:06:50','2020-01-08 06:06:50',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 06:06:50','2020-01-08 02:06:50',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(547,NULL,1,'2020-01-08 19:34:53','2020-01-08 19:34:53',40,'AC_BOM_UNVALIDATE','BOM unvalidated','2020-01-08 19:34:53','2020-01-08 15:34:53',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM unvalidated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(548,NULL,1,'2020-01-08 19:40:27','2020-01-08 19:40:27',40,'AC_PRODUCT_MODIFY','Product APPLEPIE modified','2020-01-08 19:40:27','2020-01-08 15:40:27',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct APPLEPIE modified',4,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(549,NULL,1,'2020-01-08 19:40:46','2020-01-08 19:40:46',40,'AC_PRODUCT_MODIFY','Product PINKDRESS modified','2020-01-08 19:40:46','2020-01-08 15:40:46',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PINKDRESS modified',1,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(550,NULL,1,'2020-01-08 19:40:59','2020-01-08 19:40:59',40,'AC_BOM_VALIDATE','BOM validated','2020-01-08 19:40:59','2020-01-08 15:40:59',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM validated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(551,NULL,1,'2020-01-08 19:41:11','2020-01-08 19:41:11',40,'AC_BOM_UNVALIDATE','BOM unvalidated','2020-01-08 19:41:11','2020-01-08 15:41:11',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM unvalidated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(552,NULL,1,'2020-01-08 19:41:49','2020-01-08 19:41:49',40,'AC_BOM_VALIDATE','BOM validated','2020-01-08 19:41:49','2020-01-08 15:41:49',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM validated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(553,NULL,1,'2020-01-08 20:12:55','2020-01-08 20:12:55',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-08 20:12:55','2020-01-08 16:12:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',28,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(554,NULL,1,'2020-01-08 20:21:22','2020-01-08 20:21:22',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 20:21:22','2020-01-08 16:21:22',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',28,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(555,NULL,1,'2020-01-08 20:41:19','2020-01-08 20:41:19',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 20:41:19','2020-01-08 16:41:19',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',28,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(556,NULL,1,'2020-01-08 22:25:19','2020-01-08 22:25:19',40,'AC_BOM_DELETE','BOM deleted','2020-01-08 22:25:19','2020-01-08 18:25:19',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM deleted',7,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(557,NULL,1,'2020-01-13 15:11:07','2020-01-13 15:11:07',40,'AC_MO_DELETE','MO_DELETEInDolibarr','2020-01-13 15:11:07','2020-01-13 11:11:07',12,NULL,6,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO_DELETEInDolibarr',25,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(558,NULL,1,'2020-01-13 15:11:54','2020-01-13 15:11:54',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-13 15:11:54','2020-01-13 11:11:54',12,NULL,6,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',24,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(559,NULL,1,'2020-01-13 15:13:19','2020-01-13 15:13:19',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-13 15:13:19','2020-01-13 11:13:19',12,NULL,6,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',24,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(560,NULL,1,'2020-01-13 15:14:15','2020-01-13 15:14:15',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-13 15:14:15','2020-01-13 11:14:15',12,NULL,6,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',24,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(561,NULL,1,'2020-01-13 15:29:30','2020-01-13 15:29:30',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-13 15:29:30','2020-01-13 11:29:30',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(562,NULL,1,'2020-01-13 17:19:24','2020-01-13 17:19:24',40,'AC_COMPANY_CREATE','Third party Italo created','2020-01-13 17:19:24','2020-01-13 13:19:24',12,NULL,NULL,30,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nThird party Italo created',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(563,NULL,1,'2020-01-15 16:27:15','2020-01-15 16:27:15',40,'AC_PROJECT_MODIFY','Project RMLL modified','2020-01-15 16:27:15','2020-01-15 12:27:15',12,NULL,5,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject RMLL modified\nTask: RMLL',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(564,NULL,1,'2020-01-15 16:40:50','2020-01-15 16:40:50',40,'AC_PROJECT_MODIFY','Project PROJINDIAN modified','2020-01-15 16:40:50','2020-01-15 12:40:50',12,NULL,3,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PROJINDIAN modified\nTask: PROJINDIAN',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(565,NULL,1,'2020-01-16 02:22:16','2020-01-16 02:22:16',40,'AC_BILL_VALIDATE','Invoice AC2001-0001 validated','2020-01-16 02:22:16','2020-01-16 01:22:16',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0001 validated',221,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(566,NULL,1,'2020-01-16 02:22:24','2020-01-16 02:22:24',40,'AC_BILL_UNVALIDATE','Invoice AC2001-0001 go back to draft status','2020-01-16 02:22:24','2020-01-16 01:22:24',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0001 go back to draft status',221,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(567,NULL,1,'2020-01-16 02:33:27','2020-01-16 02:33:27',40,'AC_BILL_VALIDATE','Invoice AC2001-0002 validated','2020-01-16 02:33:27','2020-01-16 01:33:27',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0002 validated',224,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(568,NULL,1,'2020-01-16 02:36:48','2020-01-16 02:36:48',40,'AC_BILL_PAYED','Invoice AC2001-0002 changed to paid','2020-01-16 02:36:48','2020-01-16 01:36:48',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0002 changed to paid',224,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(569,NULL,1,'2020-01-16 02:42:12','2020-01-16 02:42:12',40,'AC_ORDER_CLASSIFY_BILLED','Order CO7001-0020 classified billed','2020-01-16 02:42:12','2020-01-16 01:42:12',12,NULL,NULL,6,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0020 classified billed',72,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(570,NULL,1,'2020-01-16 02:42:17','2020-01-16 02:42:17',40,'AC_ORDER_CLOSE','Order CO7001-0020 classified delivered','2020-01-16 02:42:17','2020-01-16 01:42:17',12,NULL,NULL,6,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0020 classified delivered',72,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(571,NULL,1,'2020-01-16 02:42:56','2020-01-16 02:42:56',40,'AC_ORDER_CLOSE','Order CO7001-0020 classified delivered','2020-01-16 02:42:56','2020-01-16 01:42:56',12,NULL,NULL,6,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0020 classified delivered',72,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(572,NULL,1,'2020-01-16 18:05:43','2020-01-16 18:05:43',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0006 validated','2020-01-16 18:05:43','2020-01-16 17:05:43',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 validated',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(573,NULL,1,'2020-01-17 14:54:18','2020-01-17 14:54:18',40,'AC_PRODUCT_MODIFY','Product PINKDRESS modified','2020-01-17 14:54:18','2020-01-17 13:54:18',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PINKDRESS modified',1,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(574,NULL,1,'2020-01-17 15:22:28','2020-01-17 15:22:28',40,'AC_PRODUCT_MODIFY','Product PINKDRESS modified','2020-01-17 15:22:28','2020-01-17 14:22:28',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PINKDRESS modified',1,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(575,NULL,1,'2020-01-19 14:22:27','2020-01-19 14:22:27',40,'AC_PROPAL_VALIDATE','Proposal PR2001-0034 validated','2020-01-19 14:22:27','2020-01-19 13:22:27',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR2001-0034 validated',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(576,NULL,1,'2020-01-19 14:22:34','2020-01-19 14:22:34',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR2001-0034 signed','2020-01-19 14:22:34','2020-01-19 13:22:34',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR2001-0034 signed',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(577,NULL,1,'2020-01-19 14:24:22','2020-01-19 14:24:22',40,'AC_PROPAL_VALIDATE','Proposal PR2001-0034 validated','2020-01-19 14:24:22','2020-01-19 13:24:22',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR2001-0034 validated',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(578,NULL,1,'2020-01-19 14:24:27','2020-01-19 14:24:27',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR2001-0034 signed','2020-01-19 14:24:27','2020-01-19 13:24:27',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR2001-0034 signed',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(579,NULL,1,'2020-01-19 14:51:43','2020-01-19 14:51:43',40,'AC_BILL_VALIDATE','Invoice AC2001-0003 validated','2020-01-19 14:51:43','2020-01-19 13:51:43',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0003 validated',227,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(580,NULL,1,'2020-01-19 14:51:48','2020-01-19 14:51:48',40,'AC_BILL_UNVALIDATE','Invoice AC2001-0003 go back to draft status','2020-01-19 14:51:48','2020-01-19 13:51:48',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0003 go back to draft status',227,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(581,NULL,1,'2020-01-19 15:01:26','2020-01-19 15:01:26',40,'AC_BILL_VALIDATE','Invoice AC2001-0004 validated','2020-01-19 15:01:26','2020-01-19 14:01:26',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 validated',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(582,NULL,1,'2020-01-19 15:04:37','2020-01-19 15:04:37',40,'AC_BILL_UNVALIDATE','Invoice AC2001-0004 go back to draft status','2020-01-19 15:04:37','2020-01-19 14:04:37',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 go back to draft status',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(583,NULL,1,'2020-01-19 15:04:53','2020-01-19 15:04:53',40,'AC_BILL_VALIDATE','Invoice AC2001-0004 validated','2020-01-19 15:04:53','2020-01-19 14:04:53',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 validated',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(584,NULL,1,'2020-01-19 15:09:14','2020-01-19 15:09:14',40,'AC_BILL_UNVALIDATE','Invoice AC2001-0004 go back to draft status','2020-01-19 15:09:14','2020-01-19 14:09:14',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 go back to draft status',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(585,NULL,1,'2020-01-19 15:13:07','2020-01-19 15:13:07',40,'AC_BILL_VALIDATE','Invoice AC2001-0004 validated','2020-01-19 15:13:07','2020-01-19 14:13:07',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 validated',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(586,NULL,1,'2020-01-20 12:20:11','2020-01-20 12:20:11',40,'AC_ORDER_SUPPLIER_CREATE','Order (PROV14) created','2020-01-20 12:20:11','2020-01-20 11:20:11',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder (PROV14) created',14,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(588,NULL,1,'2020-01-21 01:02:14','2020-01-21 01:02:14',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 2 for member Vick Smith added','2020-01-21 01:02:14','2020-01-21 00:02:14',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 2 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2013 - 07/17/2014',3,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(589,NULL,1,'2020-01-21 10:22:37','2020-01-21 10:22:37',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 3 for member Vick Smith added','2020-01-21 10:22:37','2020-01-21 09:22:37',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 3 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2017 - 07/17/2018',4,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(590,NULL,1,'2020-01-21 10:23:17','2020-01-21 10:23:17',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 4 for member Vick Smith added','2020-01-21 10:23:17','2020-01-21 09:23:17',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 4 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2017 - 07/17/2018',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(591,NULL,1,'2020-01-21 10:23:17','2020-01-21 10:23:17',40,'AC_BILL_VALIDATE','Invoice FA1707-0026 validated','2020-01-21 10:23:17','2020-01-21 09:23:17',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1707-0026 validated',229,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(592,NULL,1,'2020-01-21 10:23:17','2020-01-21 10:23:17',40,'AC_BILL_PAYED','Invoice FA1707-0026 changed to paid','2020-01-21 10:23:17','2020-01-21 09:23:17',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1707-0026 changed to paid',229,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(593,NULL,1,'2020-01-21 10:23:28','2020-01-21 10:23:28',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 5 for member Vick Smith added','2020-01-21 10:23:28','2020-01-21 09:23:28',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 5 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2018 - 07/17/2019',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(594,NULL,1,'2020-01-21 10:23:28','2020-01-21 10:23:28',40,'AC_BILL_VALIDATE','Invoice FA1807-0027 validated','2020-01-21 10:23:28','2020-01-21 09:23:28',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1807-0027 validated',230,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(595,NULL,1,'2020-01-21 10:23:28','2020-01-21 10:23:28',40,'AC_BILL_PAYED','Invoice FA1807-0027 changed to paid','2020-01-21 10:23:28','2020-01-21 09:23:28',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1807-0027 changed to paid',230,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(596,NULL,1,'2020-01-21 10:23:49','2020-01-21 10:23:49',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 6 for member Vick Smith added','2020-01-21 10:23:49','2020-01-21 09:23:49',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 6 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2019 - 07/17/2020',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(597,NULL,1,'2020-01-21 10:23:49','2020-01-21 10:23:49',40,'AC_BILL_VALIDATE','Invoice FA1907-0028 validated','2020-01-21 10:23:49','2020-01-21 09:23:49',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1907-0028 validated',231,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(598,NULL,1,'2020-01-21 10:23:49','2020-01-21 10:23:49',40,'AC_BILL_PAYED','Invoice FA1907-0028 changed to paid','2020-01-21 10:23:49','2020-01-21 09:23:49',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1907-0028 changed to paid',231,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(599,NULL,1,'2020-01-21 10:30:27','2020-01-21 10:30:27',40,'AC_MEMBER_MODIFY','Member Pierre Curie modified','2020-01-21 10:30:27','2020-01-21 09:30:27',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Pierre Curie modified\nMember: Pierre Curie\nType: Standard members',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(600,NULL,1,'2020-01-21 10:30:36','2020-01-21 10:30:36',40,'AC_MEMBER_MODIFY','Member doe john modified','2020-01-21 10:30:36','2020-01-21 09:30:36',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember doe john modified\nMember: doe john\nType: Standard members',3,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(601,NULL,1,'2020-01-21 10:30:42','2020-01-21 10:30:42',40,'AC_MEMBER_MODIFY','Member smith smith modified','2020-01-21 10:30:42','2020-01-21 09:30:42',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember smith smith modified\nMember: smith smith\nType: Standard members',4,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(602,NULL,1,'2020-01-21 10:30:57','2020-01-21 10:30:57',40,'AC_MEMBER_MODIFY','Member Vick Smith modified','2020-01-21 10:30:57','2020-01-21 09:30:57',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Vick Smith modified\nMember: Vick Smith\nType: Standard members',1,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(603,NULL,1,'2020-06-12 10:00:00','2020-06-12 11:30:00',5,'AC_RDV','Meetings','2020-06-12 19:26:44','2020-06-12 17:26:44',12,NULL,3,NULL,NULL,0,12,1,NULL,0,0,-1,'Room 24',5400,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default'),(604,NULL,1,'2020-06-01 10:00:00','2020-06-01 10:27:00',1,'AC_TEL','Called Mr X','2020-06-12 19:28:13','2020-06-12 17:28:25',12,12,3,NULL,NULL,0,12,1,NULL,0,0,100,NULL,1620,NULL,'Customer ask another call.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default');
+INSERT INTO `llx_actioncomm` VALUES (1,NULL,1,'2012-07-08 14:21:44','2012-07-08 14:21:44',50,NULL,'Company AAA and Co added into Dolibarr','2012-07-08 14:21:44','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company AAA and Co added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(2,NULL,1,'2012-07-08 14:23:48','2012-07-08 14:23:48',50,NULL,'Company Belin SARL added into Dolibarr','2012-07-08 14:23:48','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Belin SARL added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(3,NULL,1,'2012-07-08 22:42:12','2012-07-08 22:42:12',50,NULL,'Company Spanish Comp added into Dolibarr','2012-07-08 22:42:12','2016-12-21 12:50:33',1,NULL,NULL,3,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Spanish Comp added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(4,NULL,1,'2012-07-08 22:48:18','2012-07-08 22:48:18',50,NULL,'Company Prospector Vaalen added into Dolibarr','2012-07-08 22:48:18','2016-12-21 12:50:33',1,NULL,NULL,4,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Prospector Vaalen added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(5,NULL,1,'2012-07-08 23:22:57','2012-07-08 23:22:57',50,NULL,'Company NoCountry Co added into Dolibarr','2012-07-08 23:22:57','2016-12-21 12:50:33',1,NULL,NULL,5,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company NoCountry Co added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(6,NULL,1,'2012-07-09 00:15:09','2012-07-09 00:15:09',50,NULL,'Company Swiss customer added into Dolibarr','2012-07-09 00:15:09','2016-12-21 12:50:33',1,NULL,NULL,6,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Swiss customer added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(7,NULL,1,'2012-07-09 01:24:26','2012-07-09 01:24:26',50,NULL,'Company Generic customer added into Dolibarr','2012-07-09 01:24:26','2016-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Generic customer added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(8,NULL,1,'2012-07-10 14:54:27','2012-07-10 14:54:27',50,NULL,'Société Client salon ajoutée dans Dolibarr','2012-07-10 14:54:27','2016-12-21 12:50:33',1,NULL,NULL,8,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Client salon ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(9,NULL,1,'2012-07-10 14:54:44','2012-07-10 14:54:44',50,NULL,'Société Client salon invidivdu ajoutée dans Doliba','2012-07-10 14:54:44','2016-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Client salon invidivdu ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(10,NULL,1,'2012-07-10 14:56:10','2012-07-10 14:56:10',50,NULL,'Facture FA1007-0001 validée dans Dolibarr','2012-07-10 14:56:10','2016-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Facture FA1007-0001 validée dans Dolibarr\nAuteur: admin',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(11,NULL,1,'2012-07-10 14:58:53','2012-07-10 14:58:53',50,NULL,'Facture FA1007-0001 validée dans Dolibarr','2012-07-10 14:58:53','2016-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Facture FA1007-0001 validée dans Dolibarr\nAuteur: admin',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(12,NULL,1,'2012-07-10 15:00:55','2012-07-10 15:00:55',50,NULL,'Facture FA1007-0001 passée à payée dans Dolibarr','2012-07-10 15:00:55','2016-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Facture FA1007-0001 passée à payée dans Dolibarr\nAuteur: admin',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(13,NULL,1,'2012-07-10 15:13:08','2012-07-10 15:13:08',50,NULL,'Société Smith Vick ajoutée dans Dolibarr','2012-07-10 15:13:08','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Smith Vick ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(14,NULL,1,'2012-07-10 15:21:00','2012-07-10 16:21:00',5,NULL,'RDV avec mon chef','2012-07-10 15:21:48','2012-07-10 13:21:48',1,NULL,NULL,NULL,NULL,0,1,NULL,NULL,0,0,0,'',3600,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(15,NULL,1,'2012-07-10 18:18:16','2012-07-10 18:18:16',50,NULL,'Contrat CONTRAT1 validé dans Dolibarr','2012-07-10 18:18:16','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Contrat CONTRAT1 validé dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(16,NULL,1,'2012-07-10 18:35:57','2012-07-10 18:35:57',50,NULL,'Société Mon client ajoutée dans Dolibarr','2012-07-10 18:35:57','2016-12-21 12:50:33',1,NULL,NULL,11,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Mon client ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(17,NULL,1,'2012-07-11 16:18:08','2012-07-11 16:18:08',50,NULL,'Société Dupont Alain ajoutée dans Dolibarr','2012-07-11 16:18:08','2016-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Dupont Alain ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(18,NULL,1,'2012-07-11 17:11:00','2012-07-11 17:17:00',5,NULL,'Rendez-vous','2012-07-11 17:11:22','2012-07-11 15:11:22',1,NULL,NULL,NULL,NULL,0,1,NULL,NULL,0,0,0,'gfgdfgdf',360,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(19,NULL,1,'2012-07-11 17:13:20','2012-07-11 17:13:20',50,NULL,'Société Vendeur de chips ajoutée dans Dolibarr','2012-07-11 17:13:20','2016-12-21 12:50:33',1,NULL,NULL,13,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Vendeur de chips ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(20,NULL,1,'2012-07-11 17:15:42','2012-07-11 17:15:42',50,NULL,'Commande CF1007-0001 validée','2012-07-11 17:15:42','2016-12-21 12:50:33',1,NULL,NULL,13,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Commande CF1007-0001 validée\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(21,NULL,1,'2012-07-11 18:47:33','2012-07-11 18:47:33',50,NULL,'Commande CF1007-0002 validée','2012-07-11 18:47:33','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Commande CF1007-0002 validée\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(22,NULL,1,'2012-07-18 11:36:18','2012-07-18 11:36:18',50,NULL,'Proposition PR1007-0003 validée','2012-07-18 11:36:18','2016-12-21 12:50:33',1,NULL,NULL,4,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Proposition PR1007-0003 validée\nAuteur: admin',3,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(23,NULL,1,'2013-07-18 20:49:58','2013-07-18 20:49:58',50,NULL,'Invoice FA1007-0002 validated in Dolibarr','2013-07-18 20:49:58','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1007-0002 validated in Dolibarr\nAuthor: admin',2,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(24,NULL,1,'2013-07-28 01:37:00',NULL,1,NULL,'Phone call','2013-07-28 01:37:48','2013-07-27 23:37:48',1,NULL,NULL,NULL,2,0,1,NULL,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(25,NULL,1,'2013-08-01 02:31:24','2013-08-01 02:31:24',50,NULL,'Company mmm added into Dolibarr','2013-08-01 02:31:24','2016-12-21 12:50:33',1,NULL,NULL,15,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company mmm added into Dolibarr\nAuthor: admin',15,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(26,NULL,1,'2013-08-01 02:31:43','2013-08-01 02:31:43',50,NULL,'Company ppp added into Dolibarr','2013-08-01 02:31:43','2016-12-21 12:50:33',1,NULL,NULL,16,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company ppp added into Dolibarr\nAuthor: admin',16,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(27,NULL,1,'2013-08-01 02:41:26','2013-08-01 02:41:26',50,NULL,'Company aaa added into Dolibarr','2013-08-01 02:41:26','2016-12-21 12:50:33',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company aaa added into Dolibarr\nAuthor: admin',17,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(28,NULL,1,'2013-08-01 03:34:11','2013-08-01 03:34:11',50,NULL,'Invoice FA1108-0003 validated in Dolibarr','2013-08-01 03:34:11','2016-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0003 validated in Dolibarr\nAuthor: admin',5,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(29,NULL,1,'2013-08-01 03:34:11','2013-08-01 03:34:11',50,NULL,'Invoice FA1108-0003 validated in Dolibarr','2013-08-01 03:34:11','2016-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0003 changed to paid in Dolibarr\nAuthor: admin',5,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(30,NULL,1,'2013-08-06 20:33:54','2013-08-06 20:33:54',50,NULL,'Invoice FA1108-0004 validated in Dolibarr','2013-08-06 20:33:54','2016-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0004 validated in Dolibarr\nAuthor: admin',6,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(31,NULL,1,'2013-08-06 20:33:54','2013-08-06 20:33:54',50,NULL,'Invoice FA1108-0004 validated in Dolibarr','2013-08-06 20:33:54','2016-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0004 changed to paid in Dolibarr\nAuthor: admin',6,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(38,NULL,1,'2013-08-08 02:41:55','2013-08-08 02:41:55',50,NULL,'Invoice FA1108-0005 validated in Dolibarr','2013-08-08 02:41:55','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0005 validated in Dolibarr\nAuthor: admin',8,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(40,NULL,1,'2013-08-08 02:53:40','2013-08-08 02:53:40',50,NULL,'Invoice FA1108-0005 changed to paid in Dolibarr','2013-08-08 02:53:40','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0005 changed to paid in Dolibarr\nAuthor: admin',8,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(41,NULL,1,'2013-08-08 02:54:05','2013-08-08 02:54:05',50,NULL,'Invoice FA1007-0002 changed to paid in Dolibarr','2013-08-08 02:54:05','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1007-0002 changed to paid in Dolibarr\nAuthor: admin',2,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(42,NULL,1,'2013-08-08 02:55:04','2013-08-08 02:55:04',50,NULL,'Invoice FA1107-0006 validated in Dolibarr','2013-08-08 02:55:04','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1107-0006 validated in Dolibarr\nAuthor: admin',3,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(43,NULL,1,'2013-08-08 02:55:26','2013-08-08 02:55:26',50,NULL,'Invoice FA1108-0007 validated in Dolibarr','2013-08-08 02:55:26','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0007 validated in Dolibarr\nAuthor: admin',9,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(44,NULL,1,'2013-08-08 02:55:58','2013-08-08 02:55:58',50,NULL,'Invoice FA1107-0006 changed to paid in Dolibarr','2013-08-08 02:55:58','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1107-0006 changed to paid in Dolibarr\nAuthor: admin',3,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(45,NULL,1,'2013-08-08 03:04:22','2013-08-08 03:04:22',50,NULL,'Order CO1108-0001 validated','2013-08-08 03:04:22','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Order CO1108-0001 validated\nAuthor: admin',5,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(46,NULL,1,'2013-08-08 13:59:09','2013-08-08 13:59:09',50,NULL,'Order CO1107-0002 validated','2013-08-08 13:59:10','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Order CO1107-0002 validated\nAuthor: admin',1,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(47,NULL,1,'2013-08-08 14:24:18','2013-08-08 14:24:18',50,NULL,'Proposal PR1007-0001 validated','2013-08-08 14:24:18','2016-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposal PR1007-0001 validated\nAuthor: admin',1,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(48,NULL,1,'2013-08-08 14:24:24','2013-08-08 14:24:24',50,NULL,'Proposal PR1108-0004 validated','2013-08-08 14:24:24','2016-12-21 12:50:33',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposal PR1108-0004 validated\nAuthor: admin',4,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(49,NULL,1,'2013-08-08 15:04:37','2013-08-08 15:04:37',50,NULL,'Order CF1108-0003 validated','2013-08-08 15:04:37','2016-12-21 12:50:33',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Order CF1108-0003 validated\nAuthor: admin',6,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(50,NULL,1,'2014-12-08 17:56:47','2014-12-08 17:56:47',40,NULL,'Facture AV1212-0001 validée dans Dolibarr','2014-12-08 17:56:47','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture AV1212-0001 validée dans Dolibarr\nAuteur: admin',10,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(51,NULL,1,'2014-12-08 17:57:11','2014-12-08 17:57:11',40,NULL,'Facture AV1212-0001 validée dans Dolibarr','2014-12-08 17:57:11','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture AV1212-0001 validée dans Dolibarr\nAuteur: admin',10,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(52,NULL,1,'2014-12-08 17:58:27','2014-12-08 17:58:27',40,NULL,'Facture FA1212-0008 validée dans Dolibarr','2014-12-08 17:58:27','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1212-0008 validée dans Dolibarr\nAuteur: admin',11,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(53,NULL,1,'2014-12-08 18:20:49','2014-12-08 18:20:49',40,NULL,'Facture AV1212-0002 validée dans Dolibarr','2014-12-08 18:20:49','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture AV1212-0002 validée dans Dolibarr\nAuteur: admin',12,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(54,NULL,1,'2014-12-09 18:35:07','2014-12-09 18:35:07',40,NULL,'Facture AV1212-0002 passée à payée dans Dolibarr','2014-12-09 18:35:07','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture AV1212-0002 passée à payée dans Dolibarr\nAuteur: admin',12,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(55,NULL,1,'2014-12-09 20:14:42','2014-12-09 20:14:42',40,NULL,'Société doe john ajoutée dans Dolibarr','2014-12-09 20:14:42','2016-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Société doe john ajoutée dans Dolibarr\nAuteur: admin',18,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(56,NULL,1,'2014-12-12 18:54:19','2014-12-12 18:54:19',40,NULL,'Facture FA1212-0009 validée dans Dolibarr','2014-12-12 18:54:19','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1212-0009 validée dans Dolibarr\nAuteur: admin',55,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(121,NULL,1,'2014-12-06 10:00:00',NULL,50,NULL,'aaab','2014-12-21 17:48:08','2014-12-21 16:54:07',3,1,NULL,NULL,NULL,0,3,NULL,NULL,1,0,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(122,NULL,1,'2014-12-21 18:09:52','2014-12-21 18:09:52',40,NULL,'Facture client FA1007-0001 envoyée par EMail','2014-12-21 18:09:52','2016-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Mail envoyé par Firstname SuperAdminName <bidon@example.com> à laurent@mycompany.fr.\nSujet du mail: Envoi facture FA1007-0001\nCorps du mail:\nVeuillez trouver ci-joint la facture FA1007-0001\r\n\r\nVous pouvez cliquer sur le lien sécurisé ci-dessous pour effectuer votre paiement via Paypal\r\n\r\nhttp://localhost/dolibarrnew/public/paypal/newpayment.php?source=invoice&ref=FA1007-0001&securekey=50c82fab36bb3b6aa83e2a50691803b2\r\n\r\nCordialement',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(123,NULL,1,'2015-01-06 13:13:57','2015-01-06 13:13:57',40,NULL,'Facture 16 validée dans Dolibarr','2015-01-06 13:13:57','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture 16 validée dans Dolibarr\nAuteur: admin',16,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(124,NULL,1,'2015-01-12 12:23:05','2015-01-12 12:23:05',40,NULL,'Patient aaa ajouté','2015-01-12 12:23:05','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Patient aaa ajouté\nAuteur: admin',19,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(125,NULL,1,'2015-01-12 12:52:20','2015-01-12 12:52:20',40,NULL,'Patient pppoo ajouté','2015-01-12 12:52:20','2016-12-21 12:50:33',1,NULL,NULL,20,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Patient pppoo ajouté\nAuteur: admin',20,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(127,NULL,1,'2015-01-19 18:22:48','2015-01-19 18:22:48',40,NULL,'Facture FS1301-0001 validée dans Dolibarr','2015-01-19 18:22:48','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FS1301-0001 validée dans Dolibarr\nAuteur: admin',148,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(128,NULL,1,'2015-01-19 18:31:10','2015-01-19 18:31:10',40,NULL,'Facture FA6801-0010 validée dans Dolibarr','2015-01-19 18:31:10','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA6801-0010 validée dans Dolibarr\nAuteur: admin',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(129,NULL,1,'2015-01-19 18:31:10','2015-01-19 18:31:10',40,NULL,'Facture FA6801-0010 passée à payée dans Dolibarr','2015-01-19 18:31:10','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA6801-0010 passée à payée dans Dolibarr\nAuteur: admin',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(130,NULL,1,'2015-01-19 18:31:58','2015-01-19 18:31:58',40,NULL,'Facture FS1301-0002 validée dans Dolibarr','2015-01-19 18:31:58','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FS1301-0002 validée dans Dolibarr\nAuteur: admin',151,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(131,NULL,1,'2015-01-19 18:31:58','2015-01-19 18:31:58',40,NULL,'Facture FS1301-0002 passée à payée dans Dolibarr','2015-01-19 18:31:58','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FS1301-0002 passée à payée dans Dolibarr\nAuteur: admin',151,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(132,NULL,1,'2015-01-23 15:07:54','2015-01-23 15:07:54',50,NULL,'Consultation 24 saisie (aaa)','2015-01-23 15:07:54','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Consultation 24 saisie (aaa)\nAuteur: admin',24,'cabinetmed_cons',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(133,NULL,1,'2015-01-23 16:56:58','2015-01-23 16:56:58',40,NULL,'Patient pa ajouté','2015-01-23 16:56:58','2016-12-21 12:50:33',1,NULL,NULL,21,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Patient pa ajouté\nAuteur: admin',21,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(134,NULL,1,'2015-01-23 17:34:00',NULL,50,NULL,'bbcv','2015-01-23 17:35:21','2015-01-23 16:35:21',1,NULL,1,2,NULL,0,1,NULL,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(135,NULL,1,'2015-02-12 15:54:00','2015-02-12 15:54:00',40,NULL,'Facture FA1212-0011 validée dans Dolibarr','2015-02-12 15:54:37','2016-12-21 12:50:33',1,1,NULL,7,NULL,0,1,NULL,1,0,0,50,NULL,NULL,NULL,'Facture FA1212-0011 valid&eacute;e dans Dolibarr<br />\r\nAuteur: admin',13,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(136,NULL,1,'2015-02-12 17:06:51','2015-02-12 17:06:51',40,NULL,'Commande CO1107-0003 validée','2015-02-12 17:06:51','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Commande CO1107-0003 validée\nAuteur: admin',2,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(137,NULL,1,'2015-02-17 16:22:10','2015-02-17 16:22:10',40,NULL,'Proposition PR1302-0009 validée','2015-02-17 16:22:10','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposition PR1302-0009 validée\nAuteur: admin',9,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(138,NULL,1,'2015-02-17 16:27:00','2015-02-17 16:27:00',40,NULL,'Facture FA1302-0012 validée dans Dolibarr','2015-02-17 16:27:00','2016-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1302-0012 validée dans Dolibarr\nAuteur: admin',152,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(139,NULL,1,'2015-02-17 16:27:29','2015-02-17 16:27:29',40,NULL,'Proposition PR1302-0010 validée','2015-02-17 16:27:29','2016-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposition PR1302-0010 validée\nAuteur: admin',11,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(140,NULL,1,'2015-02-17 18:27:56','2015-02-17 18:27:56',40,NULL,'Commande CO1107-0004 validée','2015-02-17 18:27:56','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Commande CO1107-0004 validée\nAuteur: admin',3,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(141,NULL,1,'2015-02-17 18:38:14','2015-02-17 18:38:14',40,NULL,'Commande CO1302-0005 validée','2015-02-17 18:38:14','2016-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Commande CO1302-0005 validée\nAuteur: admin',7,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(142,NULL,1,'2015-02-26 22:57:50','2015-02-26 22:57:50',40,NULL,'Company pppp added into Dolibarr','2015-02-26 22:57:50','2016-12-21 12:50:33',1,NULL,NULL,22,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company pppp added into Dolibarr\nAuthor: admin',22,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(143,NULL,1,'2015-02-26 22:58:13','2015-02-26 22:58:13',40,NULL,'Company ttttt added into Dolibarr','2015-02-26 22:58:13','2016-12-21 12:50:33',1,NULL,NULL,23,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company ttttt added into Dolibarr\nAuthor: admin',23,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(144,NULL,1,'2015-02-27 10:00:00','2015-02-27 19:20:00',5,NULL,'Rendez-vous','2015-02-27 19:20:53','2015-02-27 18:20:53',1,NULL,NULL,NULL,NULL,0,1,NULL,1,0,0,-1,'',33600,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(145,NULL,1,'2015-02-27 19:28:00',NULL,2,NULL,'fdsfsd','2015-02-27 19:28:48','2015-02-27 18:29:53',1,1,NULL,NULL,NULL,0,1,NULL,1,0,0,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(146,NULL,1,'2015-03-06 10:05:07','2015-03-06 10:05:07',40,NULL,'Contrat (PROV3) validé dans Dolibarr','2015-03-06 10:05:07','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Contrat (PROV3) validé dans Dolibarr\nAuteur: admin',3,'contract',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(147,NULL,1,'2015-03-06 16:43:37','2015-03-06 16:43:37',40,NULL,'Facture FA1307-0013 validée dans Dolibarr','2015-03-06 16:43:37','2016-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1307-0013 validée dans Dolibarr\nAuteur: admin',158,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(148,NULL,1,'2015-03-06 16:44:12','2015-03-06 16:44:12',40,NULL,'Facture FA1407-0014 validée dans Dolibarr','2015-03-06 16:44:12','2016-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1407-0014 validée dans Dolibarr\nAuteur: admin',159,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(149,NULL,1,'2015-03-06 16:47:48','2015-03-06 16:47:48',40,NULL,'Facture FA1507-0015 validée dans Dolibarr','2015-03-06 16:47:48','2016-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1507-0015 validée dans Dolibarr\nAuteur: admin',160,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(150,NULL,1,'2015-03-06 16:48:16','2015-03-06 16:48:16',40,NULL,'Facture FA1607-0016 validée dans Dolibarr','2015-03-06 16:48:16','2016-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1607-0016 validée dans Dolibarr\nAuteur: admin',161,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(151,NULL,1,'2015-03-06 17:13:59','2015-03-06 17:13:59',40,NULL,'Société smith smith ajoutée dans Dolibarr','2015-03-06 17:13:59','2016-12-21 12:50:33',1,NULL,NULL,24,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Société smith smith ajoutée dans Dolibarr\nAuteur: admin',24,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(152,NULL,1,'2015-03-08 10:02:22','2015-03-08 10:02:22',40,NULL,'Proposition (PROV12) validée dans Dolibarr','2015-03-08 10:02:22','2016-12-21 12:50:33',1,NULL,NULL,23,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposition (PROV12) validée dans Dolibarr\nAuteur: admin',12,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(203,NULL,1,'2015-03-09 19:39:27','2015-03-09 19:39:27',40,'AC_ORDER_SUPPLIER_VALIDATE','Commande CF1303-0004 validée','2015-03-09 19:39:27','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Commande CF1303-0004 validée\nAuteur: admin',13,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(204,NULL,1,'2015-03-10 15:47:37','2015-03-10 15:47:37',40,'AC_COMPANY_CREATE','Patient créé','2015-03-10 15:47:37','2016-12-21 12:50:33',1,NULL,NULL,25,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Patient créé\nAuteur: admin',25,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(205,NULL,1,'2015-03-10 15:57:32','2015-03-10 15:57:32',40,'AC_COMPANY_CREATE','Tiers créé','2015-03-10 15:57:32','2016-12-21 12:50:33',1,NULL,NULL,26,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Tiers créé\nAuteur: admin',26,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(206,NULL,1,'2015-03-10 15:58:28','2015-03-10 15:58:28',40,'AC_BILL_VALIDATE','Facture FA1303-0017 validée','2015-03-10 15:58:28','2016-12-21 12:50:33',1,NULL,NULL,26,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1303-0017 validée\nAuteur: admin',208,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(207,NULL,1,'2015-03-19 09:38:10','2015-03-19 09:38:10',40,'AC_BILL_VALIDATE','Facture FA1303-0018 validée','2015-03-19 09:38:10','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1303-0018 validée\nAuteur: admin',209,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(208,NULL,1,'2015-03-20 14:30:11','2015-03-20 14:30:11',40,'AC_BILL_VALIDATE','Facture FA1107-0019 validée','2015-03-20 14:30:11','2016-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1107-0019 validée\nAuteur: admin',210,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(209,NULL,1,'2015-03-22 09:40:25','2015-03-22 09:40:25',40,'AC_BILL_VALIDATE','Facture FA1303-0020 validée','2015-03-22 09:40:25','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1303-0020 validée\nAuteur: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(210,NULL,1,'2015-03-23 17:16:25','2015-03-23 17:16:25',40,'AC_BILL_VALIDATE','Facture FA1303-0020 validée','2015-03-23 17:16:25','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1303-0020 validée\nAuteur: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(211,NULL,1,'2015-03-23 18:08:27','2015-03-23 18:08:27',40,'AC_BILL_VALIDATE','Facture FA1307-0013 validée','2015-03-23 18:08:27','2016-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1307-0013 validée\nAuteur: admin',158,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(212,NULL,1,'2015-03-24 15:54:00','2015-03-24 15:54:00',40,'AC_BILL_VALIDATE','Facture FA1212-0021 validée','2015-03-24 15:54:00','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1212-0021 validée\nAuteur: admin',32,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(213,NULL,1,'2015-11-07 01:02:39','2015-11-07 01:02:39',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:02:39','2016-12-21 12:50:33',1,NULL,NULL,27,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',27,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(214,NULL,1,'2015-11-07 01:05:22','2015-11-07 01:05:22',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:05:22','2016-12-21 12:50:33',1,NULL,NULL,28,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',28,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(215,NULL,1,'2015-11-07 01:07:07','2015-11-07 01:07:07',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:07:07','2016-12-21 12:50:33',1,NULL,NULL,29,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',29,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(216,NULL,1,'2015-11-07 01:07:58','2015-11-07 01:07:58',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:07:58','2016-12-21 12:50:33',1,NULL,NULL,30,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',30,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(217,NULL,1,'2015-11-07 01:10:09','2015-11-07 01:10:09',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:10:09','2016-12-21 12:50:33',1,NULL,NULL,31,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',31,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(218,NULL,1,'2015-11-07 01:15:57','2015-11-07 01:15:57',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:15:57','2016-12-21 12:50:33',1,NULL,NULL,32,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',32,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(219,NULL,1,'2015-11-07 01:16:51','2015-11-07 01:16:51',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:16:51','2016-12-21 12:50:33',1,NULL,NULL,33,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',33,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(220,NULL,1,'2016-03-02 17:24:04','2016-03-02 17:24:04',40,'AC_BILL_VALIDATE','Invoice FA1302-0022 validated','2016-03-02 17:24:04','2016-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1302-0022 validated\nAuthor: admin',157,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(221,NULL,1,'2016-03-02 17:24:28','2016-03-02 17:24:28',40,'AC_BILL_VALIDATE','Invoice FA1303-0020 validated','2016-03-02 17:24:28','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1303-0020 validated\nAuthor: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(222,NULL,1,'2016-03-05 10:00:00','2016-03-05 10:00:00',5,NULL,'RDV John','2016-03-02 19:54:48','2016-03-02 18:55:29',1,1,NULL,NULL,NULL,0,1,0,NULL,0,0,-1,NULL,NULL,NULL,'gfdgdfgdf',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(223,NULL,1,'2016-03-13 10:00:00','2016-03-17 00:00:00',50,NULL,'Congress','2016-03-02 19:55:11','2016-03-02 18:55:11',1,NULL,NULL,NULL,NULL,0,1,0,NULL,0,0,-1,'',309600,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(224,NULL,1,'2016-03-14 10:00:00',NULL,1,NULL,'Call john','2016-03-02 19:55:56','2016-03-02 18:55:56',1,NULL,NULL,NULL,NULL,0,1,0,NULL,0,0,0,'',NULL,NULL,'tttt',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(225,NULL,1,'2016-03-02 20:11:31','2016-03-02 20:11:31',40,'AC_BILL_UNVALIDATE','Invoice FA1303-0020 go back to draft status','2016-03-02 20:11:31','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1303-0020 go back to draft status\nAuthor: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(226,NULL,1,'2016-03-02 20:13:39','2016-03-02 20:13:39',40,'AC_BILL_VALIDATE','Invoice FA1303-0020 validated','2016-03-02 20:13:39','2016-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1303-0020 validated\nAuthor: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(227,NULL,1,'2016-03-03 19:20:10','2016-03-03 19:20:10',40,'AC_BILL_VALIDATE','Invoice FA1212-0023 validated','2016-03-03 19:20:10','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1212-0023 validated\nAuthor: admin',33,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(228,NULL,1,'2016-03-03 19:20:25','2016-03-03 19:20:25',40,'AC_BILL_CANCEL','Invoice FA1212-0023 canceled in Dolibarr','2016-03-03 19:20:25','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1212-0023 canceled in Dolibarr\nAuthor: admin',33,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(229,NULL,1,'2016-03-03 19:20:56','2016-03-03 19:20:56',40,'AC_BILL_VALIDATE','Invoice AV1403-0003 validated','2016-03-03 19:20:56','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice AV1403-0003 validated\nAuthor: admin',212,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(230,NULL,1,'2016-03-03 19:21:29','2016-03-03 19:21:29',40,'AC_BILL_UNVALIDATE','Invoice AV1403-0003 go back to draft status','2016-03-03 19:21:29','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice AV1403-0003 go back to draft status\nAuthor: admin',212,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(231,NULL,1,'2016-03-03 19:22:16','2016-03-03 19:22:16',40,'AC_BILL_VALIDATE','Invoice AV1303-0003 validated','2016-03-03 19:22:16','2016-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice AV1303-0003 validated\nAuthor: admin',213,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(232,NULL,1,'2018-01-22 18:54:39','2018-01-22 18:54:39',40,'AC_OTH_AUTO','Invoice 16 validated','2018-01-22 18:54:39','2018-01-22 17:54:39',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Invoice 16 validated\nAuthor: admin',16,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(233,NULL,1,'2018-01-22 18:54:46','2018-01-22 18:54:46',40,'AC_OTH_AUTO','Invoice 16 validated','2018-01-22 18:54:46','2018-01-22 17:54:46',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Invoice 16 validated\nAuthor: admin',16,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(234,NULL,1,'2018-07-05 10:00:00','2018-07-05 11:19:00',5,'AC_RDV','Meeting with my boss','2018-07-31 18:19:48','2018-07-31 14:19:48',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,0,-1,'',4740,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(235,NULL,1,'2018-07-13 00:00:00','2018-07-14 23:59:59',50,'AC_OTH','Trip at Las Vegas','2018-07-31 18:20:36','2018-07-31 14:20:36',12,NULL,4,NULL,2,0,12,1,NULL,0,1,-1,'',172799,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(236,NULL,1,'2018-07-29 10:00:00',NULL,4,'AC_EMAIL','Remind to send an email','2018-07-31 18:21:04','2018-07-31 14:21:04',12,NULL,NULL,NULL,NULL,0,4,0,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(237,NULL,1,'2018-07-01 10:00:00',NULL,1,'AC_TEL','Phone call with Mr Vaalen','2018-07-31 18:22:04','2018-07-31 14:22:04',12,NULL,6,4,NULL,0,13,0,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(238,NULL,1,'2018-08-02 10:00:00','2018-08-02 12:00:00',5,'AC_RDV','Meeting on radium','2018-08-01 01:15:50','2018-07-31 21:15:50',12,NULL,8,10,10,0,12,1,NULL,0,0,-1,'',7200,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(239,NULL,1,'2017-01-29 21:49:33','2017-01-29 21:49:33',40,'AC_OTH_AUTO','Proposal PR1302-0007 validated','2017-01-29 21:49:33','2017-01-29 17:49:33',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1302-0007 validated\nAuthor: admin',7,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(240,NULL,1,'2017-01-31 20:52:00',NULL,1,'AC_TEL','Call the boss','2017-01-31 20:52:10','2017-01-31 16:52:25',12,12,6,NULL,NULL,0,12,1,NULL,0,0,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(242,NULL,1,'2017-02-01 18:52:04','2017-02-01 18:52:04',40,'AC_OTH_AUTO','Order CF1007-0001 validated','2017-02-01 18:52:04','2017-02-01 14:52:04',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CF1007-0001 validated\nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(243,NULL,1,'2017-02-01 18:52:04','2017-02-01 18:52:04',40,'AC_OTH_AUTO','Order CF1007-0001 approved','2017-02-01 18:52:04','2017-02-01 14:52:04',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CF1007-0001 approved\nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(245,NULL,1,'2017-02-01 18:52:32','2017-02-01 18:52:32',40,'AC_OTH_AUTO','Supplier order CF1007-0001 submited','2017-02-01 18:52:32','2017-02-01 14:52:32',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Supplier order CF1007-0001 submited\nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(249,NULL,1,'2017-02-01 18:54:01','2017-02-01 18:54:01',40,'AC_OTH_AUTO','Supplier order CF1007-0001 received','2017-02-01 18:54:01','2017-02-01 14:54:01',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Supplier order CF1007-0001 received \nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(250,NULL,1,'2017-02-01 18:54:42','2017-02-01 18:54:42',40,'AC_OTH_AUTO','Email sent by MyBigCompany To mycustomer@example.com','2017-02-01 18:54:42','2017-02-01 14:54:42',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Sender: MyBigCompany &lt;myemail@mybigcompany.com&gt;<br>\nReceiver(s): mycustomer@example.com<br>\nEMail topic: Submission of order CF1007-0001<br>\nEmail body:<br>\nYou will find here our order CF1007-0001<br />\r\n<br />\r\nSincerely<br>\n<br>\nAttached files and documents: CF1007-0001.pdf',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(251,NULL,1,'2017-02-01 19:02:21','2017-02-01 19:02:21',40,'AC_OTH_AUTO','Invoice SI1702-0001 validated','2017-02-01 19:02:21','2017-02-01 15:02:21',12,NULL,5,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Invoice SI1702-0001 validated\nAuthor: admin',20,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(252,NULL,1,'2017-02-12 23:17:04','2017-02-12 23:17:04',40,'AC_OTH_AUTO','Patient créé','2017-02-12 23:17:04','2017-02-12 19:17:04',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Patient créé\nAuthor: admin',26,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(253,NULL,1,'2017-02-12 23:18:33','2017-02-12 23:18:33',40,'AC_OTH_AUTO','Consultation 2 recorded (aaa)','2017-02-12 23:18:33','2017-02-12 19:18:33',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Consultation 2 recorded (aaa)\nAuthor: admin',2,'cabinetmed_cons',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(254,NULL,1,'2017-02-15 23:28:41','2017-02-15 23:28:41',40,'AC_OTH_AUTO','Order CO7001-0005 validated','2017-02-15 23:28:41','2017-02-15 22:28:41',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0005 validated\nAuthor: admin',7,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(255,NULL,1,'2017-02-15 23:28:56','2017-02-15 23:28:56',40,'AC_OTH_AUTO','Order CO7001-0006 validated','2017-02-15 23:28:56','2017-02-15 22:28:56',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0006 validated\nAuthor: admin',8,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(256,NULL,1,'2017-02-15 23:34:33','2017-02-15 23:34:33',40,'AC_OTH_AUTO','Order CO7001-0007 validated','2017-02-15 23:34:33','2017-02-15 22:34:33',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0007 validated\nAuthor: admin',9,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(257,NULL,1,'2017-02-15 23:35:03','2017-02-15 23:35:03',40,'AC_OTH_AUTO','Order CO7001-0008 validated','2017-02-15 23:35:03','2017-02-15 22:35:03',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0008 validated\nAuthor: admin',10,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(263,NULL,1,'2017-02-15 23:50:34','2017-02-15 23:50:34',40,'AC_OTH_AUTO','Order CO7001-0005 validated','2017-02-15 23:50:34','2017-02-15 22:50:34',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0005 validated\nAuthor: admin',17,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(264,NULL,1,'2017-02-15 23:51:23','2017-02-15 23:51:23',40,'AC_OTH_AUTO','Order CO7001-0006 validated','2017-02-15 23:51:23','2017-02-15 22:51:23',12,NULL,NULL,7,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0006 validated\nAuthor: admin',18,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(265,NULL,1,'2017-02-15 23:54:51','2017-02-15 23:54:51',40,'AC_OTH_AUTO','Order CO7001-0007 validated','2017-02-15 23:54:51','2017-02-15 22:54:51',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0007 validated\nAuthor: admin',19,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(266,NULL,1,'2017-02-15 23:55:52','2017-02-15 23:55:52',40,'AC_OTH_AUTO','Order CO7001-0007 validated','2017-02-15 23:55:52','2017-02-15 22:55:52',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0007 validated\nAuthor: admin',20,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(267,NULL,1,'2017-02-16 00:03:44','2017-02-16 00:03:44',40,'AC_OTH_AUTO','Order CO7001-0008 validated','2017-02-16 00:03:44','2017-02-15 23:03:44',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0008 validated\nAuthor: admin',29,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(268,NULL,1,'2017-02-16 00:05:01','2017-02-16 00:05:01',40,'AC_OTH_AUTO','Order CO7001-0009 validated','2017-02-16 00:05:01','2017-02-15 23:05:01',12,NULL,NULL,11,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0009 validated\nAuthor: admin',34,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(269,NULL,1,'2017-02-16 00:05:01','2017-02-16 00:05:01',40,'AC_OTH_AUTO','Order CO7001-0010 validated','2017-02-16 00:05:01','2017-02-15 23:05:01',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0010 validated\nAuthor: admin',38,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(270,NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0011 validated','2017-02-16 00:05:11','2017-02-15 23:05:11',12,NULL,NULL,11,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0011 validated\nAuthor: admin',40,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(271,NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0012 validated','2017-02-16 00:05:11','2017-02-15 23:05:11',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0012 validated\nAuthor: admin',43,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(272,NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0013 validated','2017-02-16 00:05:11','2017-02-15 23:05:11',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0013 validated\nAuthor: admin',47,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(273,NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0014 validated','2017-02-16 00:05:11','2017-02-15 23:05:11',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0014 validated\nAuthor: admin',48,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(274,NULL,1,'2017-02-16 00:05:26','2017-02-16 00:05:26',40,'AC_OTH_AUTO','Order CO7001-0015 validated','2017-02-16 00:05:26','2017-02-15 23:05:26',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0015 validated\nAuthor: admin',50,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(275,NULL,1,'2017-02-16 00:05:26','2017-02-16 00:05:26',40,'AC_OTH_AUTO','Order CO7001-0016 validated','2017-02-16 00:05:26','2017-02-15 23:05:26',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0016 validated\nAuthor: admin',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(277,NULL,1,'2017-02-16 00:05:35','2017-02-16 00:05:35',40,'AC_OTH_AUTO','Order CO7001-0018 validated','2017-02-16 00:05:35','2017-02-15 23:05:35',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0018 validated\nAuthor: admin',62,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(278,NULL,1,'2017-02-16 00:05:35','2017-02-16 00:05:35',40,'AC_OTH_AUTO','Order CO7001-0019 validated','2017-02-16 00:05:35','2017-02-15 23:05:35',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0019 validated\nAuthor: admin',68,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(279,NULL,1,'2017-02-16 00:05:36','2017-02-16 00:05:36',40,'AC_OTH_AUTO','Order CO7001-0020 validated','2017-02-16 00:05:36','2017-02-15 23:05:36',12,NULL,NULL,6,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0020 validated\nAuthor: admin',72,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(281,NULL,1,'2017-02-16 00:05:37','2017-02-16 00:05:37',40,'AC_OTH_AUTO','Order CO7001-0022 validated','2017-02-16 00:05:37','2017-02-15 23:05:37',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0022 validated\nAuthor: admin',78,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(282,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0023 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,11,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0023 validated\nAuthor: admin',81,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(283,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0024 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0024 validated\nAuthor: admin',83,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(284,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0025 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,2,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0025 validated\nAuthor: admin',84,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(285,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0026 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0026 validated\nAuthor: admin',85,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(286,NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0027 validated','2017-02-16 00:05:38','2017-02-15 23:05:38',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0027 validated\nAuthor: admin',88,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(287,NULL,1,'2017-02-16 03:05:56','2017-02-16 03:05:56',40,'AC_OTH_AUTO','Commande CO7001-0016 classée Livrée','2017-02-16 03:05:56','2017-02-15 23:05:56',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0016 classée Livrée\nAuteur: admin',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(288,NULL,1,'2017-02-16 03:06:01','2017-02-16 03:06:01',40,'AC_OTH_AUTO','Commande CO7001-0016 classée Facturée','2017-02-16 03:06:01','2017-02-15 23:06:01',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0016 classée Facturée\nAuteur: admin',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(294,NULL,1,'2017-02-16 03:53:04','2017-02-16 03:53:04',40,'AC_OTH_AUTO','Commande CO7001-0021 validée','2017-02-16 03:53:04','2017-02-15 23:53:04',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0021 validée\nAuteur: admin',75,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(295,NULL,1,'2017-02-16 03:58:08','2017-02-16 03:58:08',40,'AC_OTH_AUTO','Expédition SH1702-0002 validée','2017-02-16 03:58:08','2017-02-15 23:58:08',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Expédition SH1702-0002 validée\nAuteur: admin',3,'shipping',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(296,NULL,1,'2017-02-16 04:12:29','2017-02-16 04:12:29',40,'AC_OTH_AUTO','Commande CO7001-0021 validée','2017-02-16 04:12:29','2017-02-16 00:12:29',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0021 validée\nAuteur: admin',75,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(297,NULL,1,'2017-02-16 04:14:20','2017-02-16 04:14:20',40,'AC_OTH_AUTO','Commande CO7001-0021 validée','2017-02-16 04:14:20','2017-02-16 00:14:20',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0021 validée\nAuteur: admin',75,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(298,NULL,1,'2017-02-16 01:44:58','2017-02-16 01:44:58',40,'AC_OTH_AUTO','Proposal PR1702-0009 validated','2017-02-16 01:44:58','2017-02-16 00:44:58',1,NULL,NULL,1,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0009 validated\nAuthor: aeinstein',11,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(299,NULL,1,'2017-02-16 01:45:44','2017-02-16 01:45:44',40,'AC_OTH_AUTO','Proposal PR1702-0010 validated','2017-02-16 01:45:44','2017-02-16 00:45:44',2,NULL,NULL,7,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0010 validated\nAuthor: demo',12,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(300,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0011 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,26,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0011 validated\nAuthor: aeinstein',13,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(301,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0012 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,3,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0012 validated\nAuthor: demo',14,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(302,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0013 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,26,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0013 validated\nAuthor: demo',15,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(303,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0014 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0014 validated\nAuthor: demo',16,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(304,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0015 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,1,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0015 validated\nAuthor: aeinstein',17,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(305,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0016 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,26,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0016 validated\nAuthor: demo',18,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(306,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0017 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',2,NULL,NULL,12,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0017 validated\nAuthor: demo',19,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(307,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0018 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,26,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0018 validated\nAuthor: aeinstein',20,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(308,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0019 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,1,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0019 validated\nAuthor: aeinstein',21,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(309,NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0020 validated','2017-02-16 01:46:15','2017-02-16 00:46:15',1,NULL,NULL,26,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0020 validated\nAuthor: aeinstein',22,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(310,NULL,1,'2017-02-16 01:46:17','2017-02-16 01:46:17',40,'AC_OTH_AUTO','Proposal PR1702-0021 validated','2017-02-16 01:46:17','2017-02-16 00:46:17',2,NULL,NULL,12,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0021 validated\nAuthor: demo',23,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(311,NULL,1,'2017-02-16 01:46:17','2017-02-16 01:46:17',40,'AC_OTH_AUTO','Proposal PR1702-0022 validated','2017-02-16 01:46:17','2017-02-16 00:46:17',2,NULL,NULL,7,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0022 validated\nAuthor: demo',24,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(312,NULL,1,'2017-02-16 01:46:17','2017-02-16 01:46:17',40,'AC_OTH_AUTO','Proposal PR1702-0023 validated','2017-02-16 01:46:17','2017-02-16 00:46:17',1,NULL,NULL,3,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0023 validated\nAuthor: aeinstein',25,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(313,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0024 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0024 validated\nAuthor: demo',26,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(314,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0025 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',1,NULL,NULL,6,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0025 validated\nAuthor: aeinstein',27,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(315,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0026 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,19,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0026 validated\nAuthor: demo',28,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(316,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0027 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0027 validated\nAuthor: demo',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(317,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0028 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0028 validated\nAuthor: demo',30,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(318,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0029 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',1,NULL,NULL,11,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0029 validated\nAuthor: aeinstein',31,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(319,NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0030 validated','2017-02-16 01:46:18','2017-02-16 00:46:18',2,NULL,NULL,19,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0030 validated\nAuthor: demo',32,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(320,NULL,1,'2017-02-16 04:46:31','2017-02-16 04:46:31',40,'AC_OTH_AUTO','Proposition PR1702-0026 signée','2017-02-16 04:46:31','2017-02-16 00:46:31',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0026 signée\nAuteur: admin',28,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(321,NULL,1,'2017-02-16 04:46:37','2017-02-16 04:46:37',40,'AC_OTH_AUTO','Proposition PR1702-0027 signée','2017-02-16 04:46:37','2017-02-16 00:46:37',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0027 signée\nAuteur: admin',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(322,NULL,1,'2017-02-16 04:46:42','2017-02-16 04:46:42',40,'AC_OTH_AUTO','Proposition PR1702-0028 refusée','2017-02-16 04:46:42','2017-02-16 00:46:42',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0028 refusée\nAuteur: admin',30,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(323,NULL,1,'2017-02-16 04:47:09','2017-02-16 04:47:09',40,'AC_OTH_AUTO','Proposition PR1702-0019 validée','2017-02-16 04:47:09','2017-02-16 00:47:09',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0019 validée\nAuteur: admin',21,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(324,NULL,1,'2017-02-16 04:47:25','2017-02-16 04:47:25',40,'AC_OTH_AUTO','Proposition PR1702-0023 signée','2017-02-16 04:47:25','2017-02-16 00:47:25',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0023 signée\nAuteur: admin',25,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(325,NULL,1,'2017-02-16 04:47:29','2017-02-16 04:47:29',40,'AC_OTH_AUTO','Proposition PR1702-0023 classée payée','2017-02-16 04:47:29','2017-02-16 00:47:29',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0023 classée payée\nAuteur: admin',25,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(326,NULL,1,'2017-02-17 16:07:18','2017-02-17 16:07:18',40,'AC_OTH_AUTO','Proposition PR1702-0021 validée','2017-02-17 16:07:18','2017-02-17 12:07:18',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0021 validée\nAuteur: admin',23,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(327,NULL,1,'2017-05-12 13:53:44','2017-05-12 13:53:44',40,'AC_OTH_AUTO','Email sent by MyBigCompany To Einstein','2017-05-12 13:53:44','2017-05-12 09:53:44',12,NULL,NULL,11,12,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Sender: MyBigCompany &lt;myemail@mybigcompany.com&gt;<br>\nReceiver(s): Einstein &lt;genius@example.com&gt;<br>\nBcc: Einstein &lt;genius@example.com&gt;<br>\nEMail topic: Test<br>\nEmail body:<br>\nTest\nAuthor: admin',11,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(328,NULL,1,'2017-08-29 22:39:09','2017-08-29 22:39:09',40,'AC_OTH_AUTO','Invoice FA1601-0024 validated','2017-08-29 22:39:09','2017-08-29 18:39:09',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Invoice FA1601-0024 validated\nAuthor: admin',149,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(329,NULL,1,'2019-09-26 13:38:11','2019-09-26 13:38:11',40,'AC_MEMBER_MODIFY','Member Pierre Curie modified','2019-09-26 13:38:11','2019-09-26 11:38:11',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Pierre Curie modified\nMember: Pierre Curie\nType: Standard members',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(330,NULL,1,'2019-09-26 13:49:21','2019-09-26 13:49:21',40,'AC_MEMBER_MODIFY','Member Pierre Curie modified','2019-09-26 13:49:21','2019-09-26 11:49:21',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Pierre Curie modified\nMember: Pierre Curie\nType: Standard members',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(331,NULL,1,'2019-09-26 17:33:37','2019-09-26 17:33:37',40,'AC_BILL_VALIDATE','Invoice FA1909-0025 validated','2019-09-26 17:33:37','2019-09-26 15:33:37',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1909-0025 validated',218,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(333,NULL,1,'2019-09-27 16:54:30','2019-09-27 16:54:30',40,'AC_PROPAL_VALIDATE','Proposal PR1909-0031 validated','2019-09-27 16:54:30','2019-09-27 14:54:30',12,NULL,4,7,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0031 validated',10,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(335,NULL,1,'2019-09-27 17:08:59','2019-09-27 17:08:59',40,'AC_PROPAL_VALIDATE','Proposal PR1909-0032 validated','2019-09-27 17:08:59','2019-09-27 15:08:59',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0032 validated',33,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(337,NULL,1,'2019-09-27 17:13:13','2019-09-27 17:13:13',40,'AC_PROPAL_VALIDATE','Proposal PR1909-0033 validated','2019-09-27 17:13:13','2019-09-27 15:13:13',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0033 validated',34,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(338,NULL,1,'2019-09-27 17:53:31','2019-09-27 17:53:31',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 17:53:31','2019-09-27 15:53:31',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(339,NULL,1,'2019-09-27 18:15:00','2019-09-27 18:15:00',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 18:15:00','2019-09-27 16:15:00',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(340,NULL,1,'2019-09-27 18:40:32','2019-09-27 18:40:32',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 18:40:32','2019-09-27 16:40:32',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(341,NULL,1,'2019-09-27 19:16:07','2019-09-27 19:16:07',40,'AC_PRODUCT_CREATE','Product ppp created','2019-09-27 19:16:07','2019-09-27 17:16:07',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ppp created',14,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(342,NULL,1,'2019-09-27 19:18:01','2019-09-27 19:18:01',40,'AC_PRODUCT_MODIFY','Product ppp modified','2019-09-27 19:18:01','2019-09-27 17:18:01',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ppp modified',14,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(343,NULL,1,'2019-09-27 19:31:45','2019-09-27 19:31:45',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 19:31:45','2019-09-27 17:31:45',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(344,NULL,1,'2019-09-27 19:32:12','2019-09-27 19:32:12',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 19:32:12','2019-09-27 17:32:12',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(345,NULL,1,'2019-09-27 19:38:30','2019-09-27 19:38:30',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 19:38:30','2019-09-27 17:38:30',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(346,NULL,1,'2019-09-27 19:38:37','2019-09-27 19:38:37',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 19:38:37','2019-09-27 17:38:37',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(347,NULL,1,'2019-09-30 15:49:52',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #15ff11cay39skiaa] New message','2019-09-30 15:49:52','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'dfsdfds',2,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(348,NULL,1,'2019-10-01 13:48:36','2019-10-01 13:48:36',40,'AC_PROJECT_MODIFY','Project PJ1607-0001 modified','2019-10-01 13:48:36','2019-10-01 11:48:36',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1607-0001 modified\nTask: PJ1607-0001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(349,NULL,1,'2019-10-04 10:10:25','2019-10-04 10:10:25',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI1601-0002 validated','2019-10-04 10:10:25','2019-10-04 08:10:25',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 validated',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(350,NULL,1,'2019-10-04 10:10:47','2019-10-04 10:10:47',40,'AC_BILL_SUPPLIER_PAYED','Invoice SI1601-0002 changed to paid','2019-10-04 10:10:47','2019-10-04 08:10:47',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 changed to paid',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(351,NULL,1,'2019-10-04 10:26:49','2019-10-04 10:26:49',40,'AC_BILL_UNVALIDATE','Invoice FA6801-0010 go back to draft status','2019-10-04 10:26:49','2019-10-04 08:26:49',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA6801-0010 go back to draft status',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(352,NULL,1,'2019-10-04 10:27:00','2019-10-04 10:27:00',40,'AC_BILL_VALIDATE','Invoice FA6801-0010 validated','2019-10-04 10:27:00','2019-10-04 08:27:00',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA6801-0010 validated',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(353,NULL,1,'2019-10-04 10:28:14','2019-10-04 10:28:14',40,'AC_BILL_PAYED','Invoice FA6801-0010 changed to paid','2019-10-04 10:28:14','2019-10-04 08:28:14',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA6801-0010 changed to paid',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(354,NULL,1,'2019-10-04 10:29:22','2019-10-04 10:29:22',40,'AC_BILL_SUPPLIER_PAYED','Invoice SI1601-0002 changed to paid','2019-10-04 10:29:22','2019-10-04 08:29:22',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 changed to paid',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(355,NULL,1,'2019-10-04 10:29:41','2019-10-04 10:29:41',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI1601-0002 go back to draft status','2019-10-04 10:29:41','2019-10-04 08:29:41',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 go back to draft status',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(356,NULL,1,'2019-10-04 10:31:30','2019-10-04 10:31:30',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI1601-0002 validated','2019-10-04 10:31:30','2019-10-04 08:31:30',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 validated',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(357,NULL,1,'2019-10-04 16:56:21',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 16:56:21','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaaa',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(358,NULL,1,'2019-10-04 17:08:04',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:08:04','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'ddddd',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(359,NULL,1,'2019-10-04 17:25:05',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:25:05','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaa',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(360,NULL,1,'2019-10-04 17:26:14',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:26:14','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaa',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(361,NULL,1,'2019-10-04 17:30:10',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:30:10','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(362,NULL,1,'2019-10-04 17:51:43',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:51:43','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(363,NULL,1,'2019-10-04 17:52:02',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:52:02','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(364,NULL,1,'2019-10-04 17:52:17',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:52:17','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(365,NULL,1,'2019-10-04 17:52:39',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:52:39','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(366,NULL,1,'2019-10-04 17:52:53',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:52:53','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(367,NULL,1,'2019-10-04 17:53:13',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:53:13','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(368,NULL,1,'2019-10-04 17:53:26',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:53:26','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(369,NULL,1,'2019-10-04 17:53:48',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:53:48','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(370,NULL,1,'2019-10-04 17:54:09',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:54:09','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(371,NULL,1,'2019-10-04 17:54:28',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:54:28','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(372,NULL,1,'2019-10-04 17:55:43',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:55:43','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(373,NULL,1,'2019-10-04 17:56:01',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:56:01','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(374,NULL,1,'2019-10-04 18:00:32',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:00:32','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(375,NULL,1,'2019-10-04 18:00:58',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:00:58','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(376,NULL,1,'2019-10-04 18:11:30',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:11:30','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(377,NULL,1,'2019-10-04 18:12:02',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:12:02','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fffffff',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(378,NULL,1,'2019-10-04 18:49:30',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:49:30','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaa',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(379,NULL,1,'2019-10-04 19:00:22',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 19:00:22','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fff',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(380,NULL,1,'2019-10-04 19:24:20','2019-10-04 19:24:20',40,'AC_PROPAL_SENTBYMAIL','Email sent by Alice Adminson To NLTechno','2019-10-04 19:24:20','2019-10-04 17:24:20',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSender: Alice Adminson &lt;aadminson@example.com&gt;<br>\nReceiver(s): NLTechno &lt;notanemail@nltechno.com&gt;<br>\nEmail topic: Envoi de la proposition commerciale PR1909-0032<br>\nEmail body:<br>\nHello<br />\r\n<br />\r\nVeuillez trouver, ci-joint, la proposition commerciale PR1909-0032<br />\r\n<br />\r\n<br />\r\nSincerely<br />\r\n<br />\r\nAlice - 123<br>\n<br>\nAttached files and documents: PR1909-0032.pdf',33,'propal',NULL,'Envoi de la proposition commerciale PR1909-0032','Alice Adminson <aadminson@example.com>',NULL,'NLTechno <notanemail@nltechno.com>',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(381,NULL,1,'2019-10-04 19:30:13',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 19:30:13','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(382,NULL,1,'2019-10-04 19:32:55',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 19:32:55','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'uuuuuu\n\nAttached files and documents: Array',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(383,NULL,1,'2019-10-04 19:37:16',NULL,50,'TICKET_MSG','','2019-10-04 19:37:16','2020-06-12 17:12:24',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,100,'',NULL,NULL,'f\n\nFichiers et documents joints: dolihelp.ico',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(384,NULL,1,'2019-10-04 19:39:07',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 19:39:07','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaafff\n\nAttached files and documents: dolibarr.gif;doliadmin.ico',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(385,NULL,1,'2019-10-07 12:17:07','2019-10-07 12:17:07',40,'AC_PRODUCT_DELETE','Product PREF123456 deleted','2019-10-07 12:17:07','2019-10-07 10:17:07',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PREF123456 deleted',17,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(386,NULL,1,'2019-10-07 12:17:32','2019-10-07 12:17:32',40,'AC_PRODUCT_DELETE','Product PREF123456 deleted','2019-10-07 12:17:32','2019-10-07 10:17:32',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PREF123456 deleted',18,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(387,NULL,1,'2019-10-08 19:21:07','2019-10-08 19:21:07',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-10-08 19:21:07','2019-10-08 17:21:07',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(388,NULL,1,'2019-10-08 21:01:07','2019-10-08 21:01:07',40,'AC_MEMBER_MODIFY','Member Pierre Curie modified','2019-10-08 21:01:07','2019-10-08 19:01:07',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Pierre Curie modified\nMember: Pierre Curie\nType: Standard members',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(389,NULL,1,'2019-10-08 21:01:22','2019-10-08 21:01:22',40,'AC_MEMBER_MODIFY','Member doe john modified','2019-10-08 21:01:22','2019-10-08 19:01:22',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember doe john modified\nMember: doe john\nType: Standard members',3,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(390,NULL,1,'2019-10-08 21:01:45','2019-10-08 21:01:45',40,'AC_MEMBER_MODIFY','Member smith smith modified','2019-10-08 21:01:45','2019-10-08 19:01:45',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember smith smith modified\nMember: smith smith\nType: Standard members',4,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(391,NULL,1,'2019-10-08 21:02:18','2019-10-08 21:02:18',40,'AC_MEMBER_MODIFY','Member Vick Smith modified','2019-10-08 21:02:18','2019-10-08 19:02:18',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Vick Smith modified\nMember: Vick Smith\nType: Standard members',1,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(392,NULL,1,'2019-11-28 15:54:46','2019-11-28 15:54:46',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI1911-0005 validated','2019-11-28 15:54:47','2019-11-28 11:54:47',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1911-0005 validated',21,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(393,NULL,1,'2019-11-28 16:33:35','2019-11-28 16:33:35',40,'AC_PRODUCT_CREATE','Product FR-CAR created','2019-11-28 16:33:35','2019-11-28 12:33:35',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct FR-CAR created',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(394,NULL,1,'2019-11-28 16:34:08','2019-11-28 16:34:08',40,'AC_PRODUCT_DELETE','Product ppp deleted','2019-11-28 16:34:08','2019-11-28 12:34:08',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ppp deleted',14,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(395,NULL,1,'2019-11-28 16:34:33','2019-11-28 16:34:33',40,'AC_PRODUCT_MODIFY','Product FR-CAR modified','2019-11-28 16:34:33','2019-11-28 12:34:33',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct FR-CAR modified',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(396,NULL,1,'2019-11-28 16:34:46','2019-11-28 16:34:46',40,'AC_PRODUCT_MODIFY','Product FR-CAR modified','2019-11-28 16:34:46','2019-11-28 12:34:46',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct FR-CAR modified',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(397,NULL,1,'2019-11-28 16:36:56','2019-11-28 16:36:56',40,'AC_PRODUCT_MODIFY','Product POS-CAR modified','2019-11-28 16:36:56','2019-11-28 12:36:56',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-CAR modified',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(398,NULL,1,'2019-11-28 16:37:36','2019-11-28 16:37:36',40,'AC_PRODUCT_CREATE','Product POS-APPLE created','2019-11-28 16:37:36','2019-11-28 12:37:36',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-APPLE created',25,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(399,NULL,1,'2019-11-28 16:37:58','2019-11-28 16:37:58',40,'AC_PRODUCT_MODIFY','Product POS-APPLE modified','2019-11-28 16:37:58','2019-11-28 12:37:58',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-APPLE modified',25,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(400,NULL,1,'2019-11-28 16:38:44','2019-11-28 16:38:44',40,'AC_PRODUCT_CREATE','Product POS-KIWI created','2019-11-28 16:38:44','2019-11-28 12:38:44',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-KIWI created',26,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(401,NULL,1,'2019-11-28 16:39:21','2019-11-28 16:39:21',40,'AC_PRODUCT_CREATE','Product POS-PEACH created','2019-11-28 16:39:21','2019-11-28 12:39:21',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-PEACH created',27,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(402,NULL,1,'2019-11-28 16:39:58','2019-11-28 16:39:58',40,'AC_PRODUCT_CREATE','Product POS-ORANGE created','2019-11-28 16:39:58','2019-11-28 12:39:58',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-ORANGE created',28,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(403,NULL,1,'2019-11-28 17:00:28','2019-11-28 17:00:28',40,'AC_PRODUCT_MODIFY','Product APPLEPIE modified','2019-11-28 17:00:28','2019-11-28 13:00:28',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct APPLEPIE modified',4,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(404,NULL,1,'2019-11-28 17:00:46','2019-11-28 17:00:46',40,'AC_PRODUCT_MODIFY','Product PEARPIE modified','2019-11-28 17:00:46','2019-11-28 13:00:46',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PEARPIE modified',2,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(405,NULL,1,'2019-11-28 17:01:57','2019-11-28 17:01:57',40,'AC_PRODUCT_MODIFY','Product POS-APPLE modified','2019-11-28 17:01:57','2019-11-28 13:01:57',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-APPLE modified',25,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(406,NULL,1,'2019-11-28 17:03:14','2019-11-28 17:03:14',40,'AC_PRODUCT_CREATE','Product POS-Eggs created','2019-11-28 17:03:14','2019-11-28 13:03:14',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-Eggs created',29,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(407,NULL,1,'2019-11-28 17:04:17','2019-11-28 17:04:17',40,'AC_PRODUCT_MODIFY','Product POS-Eggs modified','2019-11-28 17:04:17','2019-11-28 13:04:17',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-Eggs modified',29,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(408,NULL,1,'2019-11-28 17:09:14','2019-11-28 17:09:14',40,'AC_PRODUCT_CREATE','Product POS-Chips created','2019-11-28 17:09:14','2019-11-28 13:09:14',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-Chips created',30,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(409,NULL,1,'2019-11-28 17:09:54','2019-11-28 17:09:54',40,'AC_PRODUCT_MODIFY','Product POS-Chips modified','2019-11-28 17:09:54','2019-11-28 13:09:54',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-Chips modified',30,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(410,NULL,1,'2019-11-28 18:46:20','2019-11-28 18:46:20',40,'AC_PRODUCT_MODIFY','Product POS-APPLE modified','2019-11-28 18:46:20','2019-11-28 14:46:20',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-APPLE modified',25,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(411,NULL,1,'2019-11-28 18:59:29','2019-11-28 18:59:29',40,'AC_PRODUCT_MODIFY','Product PEARPIE modified','2019-11-28 18:59:29','2019-11-28 14:59:29',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PEARPIE modified',2,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(412,NULL,1,'2019-11-28 19:02:01','2019-11-28 19:02:01',40,'AC_PRODUCT_MODIFY','Product POS-CARROT modified','2019-11-28 19:02:01','2019-11-28 15:02:01',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-CARROT modified',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(413,NULL,1,'2019-11-28 19:09:50','2019-11-28 19:09:50',40,'AC_PRODUCT_MODIFY','Product PEARPIE modified','2019-11-28 19:09:50','2019-11-28 15:09:50',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PEARPIE modified',2,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(414,NULL,1,'2019-11-28 19:12:50','2019-11-28 19:12:50',40,'AC_PRODUCT_MODIFY','Product PEARPIE modified','2019-11-28 19:12:50','2019-11-28 15:12:50',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PEARPIE modified',2,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(415,NULL,1,'2019-11-29 12:46:29','2019-11-29 12:46:29',40,'AC_TICKET_CREATE','Ticket TS1911-0004 created','2019-11-29 12:46:29','2019-11-29 08:46:29',12,NULL,4,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0004 created',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(416,NULL,1,'2019-11-29 12:46:34','2019-11-29 12:46:34',40,'AC_TICKET_MODIFY','Ticket TS1911-0004 read by Alice Adminson','2019-11-29 12:46:34','2019-11-29 08:46:34',12,NULL,4,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0004 read by Alice Adminson',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(417,NULL,1,'2019-11-29 12:46:47','2019-11-29 12:46:47',40,'AC_TICKET_ASSIGNED','Ticket TS1911-0004 assigned','2019-11-29 12:46:47','2019-11-29 08:46:47',12,NULL,4,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0004 assigned\nOld user: None\nNew user: Commerson Charle1',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(418,NULL,1,'2019-11-29 12:47:13',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #5gvo9bsjri55zef9] New message','2019-11-29 12:47:13','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'Where do you want to install Dolibarr ?<br />\r\nOn-Premise or on the Cloud ?',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(419,NULL,1,'2019-11-29 12:50:45','2019-11-29 12:50:45',40,'AC_TICKET_CREATE','Ticket TS1911-0005 créé','2019-11-29 12:50:45','2019-11-29 08:50:45',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nTicket TS1911-0005 créé',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(420,NULL,1,'2019-11-29 12:52:32','2019-11-29 12:52:32',40,'AC_TICKET_MODIFY','Ticket TS1911-0005 read by Alice Adminson','2019-11-29 12:52:32','2019-11-29 08:52:32',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0005 read by Alice Adminson',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(421,NULL,1,'2019-11-29 12:52:53','2019-11-29 12:52:53',40,'AC_TICKET_ASSIGNED','Ticket TS1911-0005 assigned','2019-11-29 12:52:53','2019-11-29 08:52:53',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0005 assigned\nOld user: None\nNew user: Commerson Charle1',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(422,NULL,1,'2019-11-29 12:54:04',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #d51wjy4nym7wltg7] New message','2019-11-29 12:54:04','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'Hi.<br />\r\nThanks for your interest in using Dolibarr ERP CRM.<br />\r\nI need more information to give you the correct answer :&nbsp;Where do you want to install Dolibarr. On premise or on Cloud',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(423,NULL,1,'2019-11-29 12:54:46',NULL,50,'TICKET_MSG','','2019-11-29 12:54:46','2020-06-12 17:12:24',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,100,'',NULL,NULL,'I need it On-Premise.',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(424,NULL,1,'2019-11-29 12:55:42',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #d51wjy4nym7wltg7] New message','2019-11-29 12:55:42','2020-06-12 17:12:24',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'When used on-premise, you can download and install Dolibarr yourself from ou web portal: https://www.dolibarr.org<br />\r\nIt is completely free.',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(425,NULL,1,'2019-11-29 12:55:48','2019-11-29 12:55:48',40,'AC_TICKET_CLOSE','Ticket TS1911-0005 closed','2019-11-29 12:55:48','2019-11-29 08:55:48',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0005 closed',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(426,NULL,1,'2019-11-29 12:56:47','2019-11-29 12:56:47',40,'AC_BOM_UNVALIDATE','BOM unvalidated','2019-11-29 12:56:47','2019-11-29 08:56:47',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM unvalidated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(427,NULL,1,'2019-11-29 12:57:14','2019-11-29 12:57:14',40,'AC_BOM_VALIDATE','BOM validated','2019-11-29 12:57:14','2019-11-29 08:57:14',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM validated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(428,NULL,1,'2019-12-20 16:40:14','2019-12-20 16:40:14',40,'AC_MO_DELETE','MO deleted','2019-12-20 16:40:14','2019-12-20 12:40:14',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',3,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(429,NULL,1,'2019-12-20 17:00:43','2019-12-20 17:00:43',40,'AC_MO_DELETE','MO deleted','2019-12-20 17:00:43','2019-12-20 13:00:43',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',7,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(430,NULL,1,'2019-12-20 17:00:56','2019-12-20 17:00:56',40,'AC_MO_DELETE','MO deleted','2019-12-20 17:00:56','2019-12-20 13:00:56',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',6,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(431,NULL,1,'2019-12-20 20:00:03','2019-12-20 20:00:03',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:00:03','2019-12-20 16:00:03',12,NULL,6,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',1,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(432,NULL,1,'2019-12-20 20:22:11','2019-12-20 20:22:11',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:22:11','2019-12-20 16:22:11',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',10,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(433,NULL,1,'2019-12-20 20:22:11','2019-12-20 20:22:11',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:22:11','2019-12-20 16:22:11',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',12,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(434,NULL,1,'2019-12-20 20:22:20','2019-12-20 20:22:20',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:22:20','2019-12-20 16:22:20',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',9,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(435,NULL,1,'2019-12-20 20:27:07','2019-12-20 20:27:07',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:27:07','2019-12-20 16:27:07',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',13,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(436,NULL,1,'2019-12-20 20:42:42','2019-12-20 20:42:42',40,'AC_ORDER_VALIDATE','Order CO7001-0027 validated','2019-12-20 20:42:42','2019-12-20 16:42:42',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0027 validated',88,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(437,NULL,1,'2019-12-20 20:46:25','2019-12-20 20:46:25',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:46:25','2019-12-20 16:46:25',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(438,NULL,1,'2019-12-20 20:46:45','2019-12-20 20:46:45',40,'AC_ORDER_SUPPLIER_CLASSIFY_BILLED','Purchase Order CF1007-0001 set billed','2019-12-20 20:46:45','2019-12-20 16:46:45',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 set billed',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(439,NULL,1,'2019-12-20 20:47:02','2019-12-20 20:47:02',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:47:02','2019-12-20 16:47:02',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(440,NULL,1,'2019-12-20 20:47:44','2019-12-20 20:47:44',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:47:44','2019-12-20 16:47:44',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(441,NULL,1,'2019-12-20 20:47:53','2019-12-20 20:47:53',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:47:53','2019-12-20 16:47:53',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(442,NULL,1,'2019-12-20 20:48:05','2019-12-20 20:48:05',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:48:05','2019-12-20 16:48:05',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(443,NULL,1,'2019-12-20 20:48:45','2019-12-20 20:48:45',40,'AC_ORDER_CLASSIFY_BILLED','Order CO7001-0016 classified billed','2019-12-20 20:48:45','2019-12-20 16:48:45',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0016 classified billed',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(444,NULL,1,'2019-12-20 20:48:55','2019-12-20 20:48:55',40,'AC_ORDER_CLOSE','Order CO7001-0018 classified delivered','2019-12-20 20:48:55','2019-12-20 16:48:55',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0018 classified delivered',62,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(445,NULL,1,'2019-12-20 20:49:43','2019-12-20 20:49:43',40,'AC_PROPAL_CLASSIFY_BILLED','Proposal PR1702-0027 classified billed','2019-12-20 20:49:43','2019-12-20 16:49:43',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1702-0027 classified billed',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(446,NULL,1,'2019-12-20 20:49:54','2019-12-20 20:49:54',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR1702-0027 signed','2019-12-20 20:49:54','2019-12-20 16:49:54',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1702-0027 signed',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(447,NULL,1,'2019-12-20 20:50:14','2019-12-20 20:50:14',40,'AC_PROPAL_CLOSE_REFUSED','Proposal PR1702-0027 refused','2019-12-20 20:50:14','2019-12-20 16:50:14',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1702-0027 refused',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(448,NULL,1,'2019-12-20 20:50:23','2019-12-20 20:50:23',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR1702-0027 signed','2019-12-20 20:50:23','2019-12-20 16:50:23',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1702-0027 signed',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(449,NULL,1,'2019-12-21 17:18:22','2019-12-21 17:18:22',40,'AC_BOM_CLOSE','BOM disabled','2019-12-21 17:18:22','2019-12-21 13:18:22',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM disabled',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(450,NULL,1,'2019-12-21 17:18:38','2019-12-21 17:18:38',40,'AC_MEMBER_RESILIATE','Member Vick Smith terminated','2019-12-21 17:18:38','2019-12-21 13:18:38',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Vick Smith terminated\nMember: Vick Smith\nType: Standard members',1,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(451,NULL,1,'2019-12-21 19:46:33','2019-12-21 19:46:33',40,'AC_PROJECT_CREATE','Project PJ1912-0005 created','2019-12-21 19:46:33','2019-12-21 15:46:33',12,NULL,10,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 created\nProject: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(452,NULL,1,'2019-12-21 19:47:03','2019-12-21 19:47:03',40,'AC_PROJECT_MODIFY','Project PJ1912-0005 modified','2019-12-21 19:47:03','2019-12-21 15:47:03',12,NULL,10,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 modified\nTask: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(453,NULL,1,'2019-12-21 19:47:24','2019-12-21 19:47:24',40,'AC_PROJECT_MODIFY','Project PJ1912-0005 modified','2019-12-21 19:47:24','2019-12-21 15:47:24',12,NULL,10,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 modified\nTask: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(454,NULL,1,'2019-12-21 19:47:52','2019-12-21 19:47:52',40,'AC_PROJECT_MODIFY','Project PJ1912-0005 modified','2019-12-21 19:47:52','2019-12-21 15:47:52',12,NULL,10,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 modified\nTask: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(455,NULL,1,'2019-12-21 19:48:06','2019-12-21 19:48:06',40,'AC_PROJECT_MODIFY','Project PJ1912-0005 modified','2019-12-21 19:48:06','2019-12-21 15:48:06',12,NULL,10,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 modified\nTask: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(456,NULL,1,'2019-12-21 19:49:28','2019-12-21 19:49:28',40,'AC_PROJECT_CREATE','Project PJ1912-0006 created','2019-12-21 19:49:28','2019-12-21 15:49:28',12,NULL,11,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0006 created\nProject: PJ1912-0006',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(457,NULL,1,'2019-12-21 19:52:12','2019-12-21 19:52:12',40,'AC_PROJECT_CREATE','Project PJ1912-0007 created','2019-12-21 19:52:12','2019-12-21 15:52:12',12,NULL,12,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0007 created\nProject: PJ1912-0007',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(458,NULL,1,'2019-12-21 19:53:21','2019-12-21 19:53:21',40,'AC_PROJECT_CREATE','Project PJ1912-0008 created','2019-12-21 19:53:21','2019-12-21 15:53:21',12,NULL,13,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0008 created\nProject: PJ1912-0008',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(459,NULL,1,'2019-12-21 19:53:42','2019-12-21 19:53:42',40,'AC_PROJECT_MODIFY','Project PJ1912-0008 modified','2019-12-21 19:53:42','2019-12-21 15:53:42',12,NULL,13,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0008 modified\nTask: PJ1912-0008',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(460,NULL,1,'2019-12-21 19:55:23','2019-12-21 19:55:23',40,'AC_PROJECT_MODIFY','Project PJ1912-0006 modified','2019-12-21 19:55:23','2019-12-21 15:55:23',12,NULL,11,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0006 modified\nTask: PJ1912-0006',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(461,NULL,1,'2019-12-21 20:10:21','2019-12-21 20:10:21',40,'AC_PROJECT_MODIFY','Project PJ1912-0006 modified','2019-12-21 20:10:21','2019-12-21 16:10:21',12,NULL,11,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0006 modified\nTask: PJ1912-0006',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(462,NULL,1,'2019-12-11 10:00:00','2019-12-11 10:00:00',5,'AC_RDV','Meeting with all employees','2019-12-21 20:29:32','2019-12-21 16:29:32',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(463,NULL,1,'2019-12-06 00:00:00',NULL,11,'AC_INT','Intervention on customer site','2019-12-21 20:30:11','2019-12-21 16:30:11',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,1,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(464,NULL,1,'2019-12-23 14:16:59','2019-12-23 14:16:59',40,'AC_BILL_PAYED','Invoice FA1601-0024 changed to paid','2019-12-23 14:16:59','2019-12-23 10:16:59',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1601-0024 changed to paid',149,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(465,NULL,1,'2019-12-23 14:17:18','2019-12-23 14:17:18',40,'AC_BILL_PAYED','Invoice FA1601-0024 changed to paid','2019-12-23 14:17:18','2019-12-23 10:17:18',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1601-0024 changed to paid',149,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(466,NULL,1,'2019-11-23 14:25:00',NULL,50,'AC_OTH','Test','2019-12-23 17:25:14','2019-12-23 13:25:14',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,0,-1,'',NULL,NULL,'18/11 17h06 : Message laiss&eacute;. Me rappeler pour m&#39;en dire plus.&nbsp;<br />\r\n<br />\r\n20/11 10h17 &quot;A rappeler suite au msg laiss&eacute; le 14/11, dit que c&#39;est urgent&quot;<br />\r\n12h22 : message laiss&eacute;. Je lui envoie un sms<br />\r\n<br />\r\n&quot;D&eacute;claration de sinistre originale&quot; : constat de ce qui s&#39;est pass&eacute;.<br />\r\nElle envoie le ch&egrave;que de solde d&egrave;s demain.<br />\r\n<br />\r\n3/12 : Elle pr&eacute;f&egrave;re avoir plus d&#39;infos sur le sinistre pour l&#39;assurance.<br />\r\nCourrier envoy&eacute; le 4/12/19 par mail et par courrier postal<br />\r\n<br />\r\n6/12 15h02 : ont obtenu le feu vert de l&#39;assurance.<br />\r\nOn bloque 16/12 PM &agrave; partir de 14h30.&nbsp;',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(467,NULL,1,'2020-01-01 14:35:47','2020-01-01 14:35:47',40,'AC_MEMBER_VALIDATE','Adhérent aze aze validé','2020-01-01 14:35:47','2020-01-01 10:35:47',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent aze aze validé\nAdhérent: aze aze\nType: Board members',5,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(468,NULL,1,'2020-01-01 14:50:59','2020-01-01 14:50:59',40,'AC_MEMBER_VALIDATE','Adhérent azr azr validé','2020-01-01 14:50:59','2020-01-01 10:50:59',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azr azr validé\nAdhérent: azr azr\nType: Board members',6,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(469,NULL,1,'2020-01-01 15:00:16','2020-01-01 15:00:16',40,'AC_MEMBER_VALIDATE','Adhérent azt azt validé','2020-01-01 15:00:16','2020-01-01 11:00:16',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azt azt validé\nAdhérent: azt azt\nType: Board members',7,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(470,NULL,1,'2020-01-01 15:08:20','2020-01-01 15:08:20',40,'AC_MEMBER_VALIDATE','Adhérent azu azu validé','2020-01-01 15:08:20','2020-01-01 11:08:20',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azu azu validé\nAdhérent: azu azu\nType: Board members',8,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(471,NULL,1,'2020-01-01 15:27:24','2020-01-01 15:27:24',40,'AC_MEMBER_VALIDATE','Adhérent azi azi validé','2020-01-01 15:27:24','2020-01-01 11:27:24',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azi azi validé\nAdhérent: azi azi\nType: Board members',9,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(472,NULL,1,'2020-01-01 15:36:29','2020-01-01 15:36:29',40,'AC_MEMBER_VALIDATE','Adhérent azo azo validé','2020-01-01 15:36:29','2020-01-01 11:36:29',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azo azo validé\nAdhérent: azo azo\nType: Board members',10,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(473,NULL,1,'2020-01-01 15:44:25','2020-01-01 15:44:25',40,'AC_MEMBER_VALIDATE','Adhérent azp azp validé','2020-01-01 15:44:25','2020-01-01 11:44:25',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azp azp validé\nAdhérent: azp azp\nType: Board members',11,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(478,NULL,1,'2020-01-01 16:52:32','2020-01-01 16:52:32',40,'AC_MEMBER_VALIDATE','Adhérent azq azq validé','2020-01-01 16:52:32','2020-01-01 12:52:32',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azq azq validé\nAdhérent: azq azq\nType: Board members',12,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(483,NULL,1,'2020-01-01 17:49:05','2020-01-01 17:49:05',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0006 validated','2020-01-01 17:49:05','2020-01-01 13:49:05',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 validated',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(484,NULL,1,'2020-01-01 17:50:41','2020-01-01 17:50:41',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0001 validated','2020-01-01 17:50:41','2020-01-01 13:50:41',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 validated',23,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(485,NULL,1,'2020-01-01 17:50:44','2020-01-01 17:50:44',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 17:50:44','2020-01-01 13:50:44',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',23,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(486,NULL,1,'2020-01-01 17:51:22','2020-01-01 17:51:22',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI2001-0006 go back to draft status','2020-01-01 17:51:22','2020-01-01 13:51:22',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 go back to draft status',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(487,NULL,1,'2020-01-01 20:17:00','2020-01-01 20:17:00',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0006 validated','2020-01-01 20:17:00','2020-01-01 16:17:00',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 validated',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(488,NULL,1,'2020-01-01 20:17:46','2020-01-01 20:17:46',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0001 validated','2020-01-01 20:17:46','2020-01-01 16:17:46',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 validated',24,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(489,NULL,1,'2020-01-01 20:17:51','2020-01-01 20:17:51',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 20:17:51','2020-01-01 16:17:51',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',24,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(490,NULL,1,'2020-01-01 20:20:22','2020-01-01 20:20:22',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0001 validated','2020-01-01 20:20:22','2020-01-01 16:20:22',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 validated',26,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(491,NULL,1,'2020-01-01 20:20:31','2020-01-01 20:20:31',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 20:20:31','2020-01-01 16:20:31',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',26,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(492,NULL,1,'2020-01-01 20:21:35','2020-01-01 20:21:35',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI2001-0006 go back to draft status','2020-01-01 20:21:35','2020-01-01 16:21:35',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 go back to draft status',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(493,NULL,1,'2020-01-01 20:21:42','2020-01-01 20:21:42',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0006 validated','2020-01-01 20:21:42','2020-01-01 16:21:42',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 validated',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(494,NULL,1,'2020-01-01 20:21:55','2020-01-01 20:21:55',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0001 validated','2020-01-01 20:21:55','2020-01-01 16:21:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 validated',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(495,NULL,1,'2020-01-01 20:23:02','2020-01-01 20:23:02',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0007 validated','2020-01-01 20:23:02','2020-01-01 16:23:02',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0007 validated',28,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(496,NULL,1,'2020-01-01 20:23:17','2020-01-01 20:23:17',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 20:23:17','2020-01-01 16:23:17',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(497,NULL,1,'2020-01-01 20:25:36','2020-01-01 20:25:36',40,'AC_BILL_SUPPLIER_PAYED','Invoice SI2001-0007 changed to paid','2020-01-01 20:25:36','2020-01-01 16:25:36',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0007 changed to paid',28,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(498,NULL,1,'2020-01-01 20:51:37','2020-01-01 20:51:37',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0002 validated','2020-01-01 20:51:37','2020-01-01 16:51:37',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0002 validated',30,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(499,NULL,1,'2020-01-01 20:51:48','2020-01-01 20:51:48',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0002 changed to paid','2020-01-01 20:51:48','2020-01-01 16:51:48',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0002 changed to paid',30,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(500,NULL,1,'2020-01-01 21:02:39','2020-01-01 21:02:39',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 21:02:39','2020-01-01 17:02:39',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(501,NULL,1,'2020-01-01 21:03:01','2020-01-01 21:03:01',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 21:03:01','2020-01-01 17:03:01',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(502,NULL,1,'2020-01-01 21:11:10','2020-01-01 21:11:10',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 21:11:10','2020-01-01 17:11:10',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(503,NULL,1,'2020-01-01 21:20:07','2020-01-01 21:20:07',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 21:20:07','2020-01-01 17:20:07',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(504,NULL,1,'2020-01-01 21:21:28','2020-01-01 21:21:28',40,'AC_BILL_SUPPLIER_PAYED','Invoice SI2001-0007 changed to paid','2020-01-01 21:21:28','2020-01-01 17:21:28',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0007 changed to paid',28,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(505,NULL,1,'2020-01-01 22:06:30','2020-01-01 22:06:30',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 22:06:31','2020-01-01 18:06:31',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(506,NULL,1,'2020-01-01 23:54:16','2020-01-01 23:54:16',40,'AC_PRODUCT_MODIFY','Product APPLEPIE modified','2020-01-01 23:54:16','2020-01-01 19:54:16',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct APPLEPIE modified',4,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(507,NULL,1,'2020-01-02 20:49:34','2020-01-02 20:49:34',40,'AC_BILL_PAYED','Invoice FA1601-0024 changed to paid','2020-01-02 20:49:34','2020-01-02 16:49:34',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1601-0024 changed to paid',149,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(508,NULL,1,'2020-01-02 23:02:35','2020-01-02 23:02:35',40,'AC_PRODUCT_MODIFY','Product APPLEPIE modified','2020-01-02 23:02:35','2020-01-02 19:02:35',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct APPLEPIE modified',4,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(509,NULL,1,'2020-01-02 23:45:01','2020-01-02 23:45:01',40,'AC_BOM_REOPEN','BOM reopen','2020-01-02 23:45:01','2020-01-02 19:45:01',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM reopen',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(511,NULL,1,'2020-01-02 23:57:42','2020-01-02 23:57:42',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-02 23:57:42','2020-01-02 19:57:42',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(512,NULL,1,'2020-01-03 13:33:54','2020-01-03 13:33:54',40,'AC_BOM_UNVALIDATE','BOM unvalidated','2020-01-03 13:33:54','2020-01-03 09:33:54',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM unvalidated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(513,NULL,1,'2020-01-03 13:34:11','2020-01-03 13:34:11',40,'AC_BOM_VALIDATE','BOM validated','2020-01-03 13:34:11','2020-01-03 09:34:11',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM validated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(514,NULL,1,'2020-01-03 13:35:45','2020-01-03 13:35:45',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-03 13:35:45','2020-01-03 09:35:45',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',18,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(515,NULL,1,'2020-01-03 14:10:41','2020-01-03 14:10:41',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-03 14:10:41','2020-01-03 10:10:41',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',18,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(516,NULL,1,'2020-01-06 00:39:58','2020-01-06 00:39:58',40,'AC_COMPANY_CREATE','Patient créé','2020-01-06 00:39:58','2020-01-05 20:39:58',12,NULL,NULL,29,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPatient créé',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(517,NULL,1,'2020-01-06 00:49:06','2020-01-06 00:49:06',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI2001-0006 go back to draft status','2020-01-06 00:49:06','2020-01-05 20:49:06',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 go back to draft status',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(518,NULL,1,'2020-01-06 06:50:05','2020-01-06 06:50:05',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-06 06:50:05','2020-01-06 02:50:05',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(519,NULL,1,'2020-01-06 20:52:28','2020-01-06 20:52:28',40,'AC_OTH_AUTO','Consultation 2 recorded (Patient)','2020-01-06 20:52:28','2020-01-06 16:52:28',12,NULL,NULL,29,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Consultation 2 recorded (Patient)\nAuthor: admin',2,'cabinetmed_cons',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(520,NULL,1,'2020-01-07 20:25:02','2020-01-07 20:25:02',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 20:25:02','2020-01-07 16:25:02',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(521,NULL,1,'2020-01-07 21:12:37','2020-01-07 21:12:37',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:12:37','2020-01-07 17:12:37',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(522,NULL,1,'2020-01-07 21:13:00','2020-01-07 21:13:00',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:13:00','2020-01-07 17:13:00',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(523,NULL,1,'2020-01-07 21:13:49','2020-01-07 21:13:49',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:13:49','2020-01-07 17:13:49',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(524,NULL,1,'2020-01-07 21:46:58','2020-01-07 21:46:58',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:46:58','2020-01-07 17:46:58',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(525,NULL,1,'2020-01-07 21:52:34','2020-01-07 21:52:34',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:52:34','2020-01-07 17:52:34',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(526,NULL,1,'2020-01-07 21:53:44','2020-01-07 21:53:44',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:53:44','2020-01-07 17:53:44',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(527,NULL,1,'2020-01-07 21:53:58','2020-01-07 21:53:58',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:53:58','2020-01-07 17:53:58',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(528,NULL,1,'2020-01-07 21:54:12','2020-01-07 21:54:12',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:54:12','2020-01-07 17:54:12',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(529,NULL,1,'2020-01-07 22:00:55','2020-01-07 22:00:55',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 22:00:55','2020-01-07 18:00:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(530,NULL,1,'2020-01-07 22:39:52','2020-01-07 22:39:52',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 22:39:52','2020-01-07 18:39:52',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(531,NULL,1,'2020-01-07 23:09:04','2020-01-07 23:09:04',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 23:09:04','2020-01-07 19:09:04',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(532,NULL,1,'2020-01-07 23:39:09','2020-01-07 23:39:09',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR1909-0033 signed','2020-01-07 23:39:09','2020-01-07 19:39:09',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0033 signed',34,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(533,NULL,1,'2020-01-07 23:43:06','2020-01-07 23:43:06',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR1909-0033 signed','2020-01-07 23:43:06','2020-01-07 19:43:06',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0033 signed',34,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(534,NULL,1,'2020-01-07 23:50:40','2020-01-07 23:50:40',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 23:50:40','2020-01-07 19:50:40',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(535,NULL,1,'2020-01-07 23:51:27','2020-01-07 23:51:27',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 23:51:27','2020-01-07 19:51:27',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(536,NULL,1,'2020-01-08 00:25:23','2020-01-08 00:25:23',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 00:25:23','2020-01-07 20:25:23',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(537,NULL,1,'2020-01-08 00:25:43','2020-01-08 00:25:43',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 00:25:43','2020-01-07 20:25:43',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(538,NULL,1,'2020-01-08 00:29:24','2020-01-08 00:29:24',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 00:29:24','2020-01-07 20:29:24',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(539,NULL,1,'2020-01-08 00:29:43','2020-01-08 00:29:43',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 00:29:43','2020-01-07 20:29:43',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(540,NULL,1,'2020-01-08 01:09:15','2020-01-08 01:09:15',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 01:09:15','2020-01-07 21:09:15',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(541,NULL,1,'2020-01-08 01:15:02','2020-01-08 01:15:02',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 01:15:02','2020-01-07 21:15:02',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(542,NULL,1,'2020-01-08 01:17:16','2020-01-08 01:17:16',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 01:17:16','2020-01-07 21:17:16',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(543,NULL,1,'2020-01-08 05:31:44','2020-01-08 05:31:44',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 05:31:44','2020-01-08 01:31:44',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(544,NULL,1,'2020-01-08 05:39:46','2020-01-08 05:39:46',40,'AC_BOM_CLOSE','BOM disabled','2020-01-08 05:39:46','2020-01-08 01:39:46',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM disabled',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(545,NULL,1,'2020-01-08 05:39:50','2020-01-08 05:39:50',40,'AC_BOM_REOPEN','BOM reopen','2020-01-08 05:39:50','2020-01-08 01:39:50',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM reopen',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(546,NULL,1,'2020-01-08 06:06:50','2020-01-08 06:06:50',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 06:06:50','2020-01-08 02:06:50',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(547,NULL,1,'2020-01-08 19:34:53','2020-01-08 19:34:53',40,'AC_BOM_UNVALIDATE','BOM unvalidated','2020-01-08 19:34:53','2020-01-08 15:34:53',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM unvalidated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(548,NULL,1,'2020-01-08 19:40:27','2020-01-08 19:40:27',40,'AC_PRODUCT_MODIFY','Product APPLEPIE modified','2020-01-08 19:40:27','2020-01-08 15:40:27',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct APPLEPIE modified',4,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(549,NULL,1,'2020-01-08 19:40:46','2020-01-08 19:40:46',40,'AC_PRODUCT_MODIFY','Product PINKDRESS modified','2020-01-08 19:40:46','2020-01-08 15:40:46',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PINKDRESS modified',1,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(550,NULL,1,'2020-01-08 19:40:59','2020-01-08 19:40:59',40,'AC_BOM_VALIDATE','BOM validated','2020-01-08 19:40:59','2020-01-08 15:40:59',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM validated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(551,NULL,1,'2020-01-08 19:41:11','2020-01-08 19:41:11',40,'AC_BOM_UNVALIDATE','BOM unvalidated','2020-01-08 19:41:11','2020-01-08 15:41:11',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM unvalidated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(552,NULL,1,'2020-01-08 19:41:49','2020-01-08 19:41:49',40,'AC_BOM_VALIDATE','BOM validated','2020-01-08 19:41:49','2020-01-08 15:41:49',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM validated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(553,NULL,1,'2020-01-08 20:12:55','2020-01-08 20:12:55',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-08 20:12:55','2020-01-08 16:12:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',28,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(554,NULL,1,'2020-01-08 20:21:22','2020-01-08 20:21:22',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 20:21:22','2020-01-08 16:21:22',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',28,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(555,NULL,1,'2020-01-08 20:41:19','2020-01-08 20:41:19',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 20:41:19','2020-01-08 16:41:19',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',28,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(556,NULL,1,'2020-01-08 22:25:19','2020-01-08 22:25:19',40,'AC_BOM_DELETE','BOM deleted','2020-01-08 22:25:19','2020-01-08 18:25:19',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM deleted',7,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(557,NULL,1,'2020-01-13 15:11:07','2020-01-13 15:11:07',40,'AC_MO_DELETE','MO_DELETEInDolibarr','2020-01-13 15:11:07','2020-01-13 11:11:07',12,NULL,6,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO_DELETEInDolibarr',25,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(558,NULL,1,'2020-01-13 15:11:54','2020-01-13 15:11:54',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-13 15:11:54','2020-01-13 11:11:54',12,NULL,6,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',24,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(559,NULL,1,'2020-01-13 15:13:19','2020-01-13 15:13:19',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-13 15:13:19','2020-01-13 11:13:19',12,NULL,6,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',24,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(560,NULL,1,'2020-01-13 15:14:15','2020-01-13 15:14:15',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-13 15:14:15','2020-01-13 11:14:15',12,NULL,6,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',24,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(561,NULL,1,'2020-01-13 15:29:30','2020-01-13 15:29:30',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-13 15:29:30','2020-01-13 11:29:30',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(562,NULL,1,'2020-01-13 17:19:24','2020-01-13 17:19:24',40,'AC_COMPANY_CREATE','Third party Italo created','2020-01-13 17:19:24','2020-01-13 13:19:24',12,NULL,NULL,30,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nThird party Italo created',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(563,NULL,1,'2020-01-15 16:27:15','2020-01-15 16:27:15',40,'AC_PROJECT_MODIFY','Project RMLL modified','2020-01-15 16:27:15','2020-01-15 12:27:15',12,NULL,5,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject RMLL modified\nTask: RMLL',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(564,NULL,1,'2020-01-15 16:40:50','2020-01-15 16:40:50',40,'AC_PROJECT_MODIFY','Project PROJINDIAN modified','2020-01-15 16:40:50','2020-01-15 12:40:50',12,NULL,3,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PROJINDIAN modified\nTask: PROJINDIAN',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(565,NULL,1,'2020-01-16 02:22:16','2020-01-16 02:22:16',40,'AC_BILL_VALIDATE','Invoice AC2001-0001 validated','2020-01-16 02:22:16','2020-01-16 01:22:16',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0001 validated',221,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(566,NULL,1,'2020-01-16 02:22:24','2020-01-16 02:22:24',40,'AC_BILL_UNVALIDATE','Invoice AC2001-0001 go back to draft status','2020-01-16 02:22:24','2020-01-16 01:22:24',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0001 go back to draft status',221,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(567,NULL,1,'2020-01-16 02:33:27','2020-01-16 02:33:27',40,'AC_BILL_VALIDATE','Invoice AC2001-0002 validated','2020-01-16 02:33:27','2020-01-16 01:33:27',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0002 validated',224,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(568,NULL,1,'2020-01-16 02:36:48','2020-01-16 02:36:48',40,'AC_BILL_PAYED','Invoice AC2001-0002 changed to paid','2020-01-16 02:36:48','2020-01-16 01:36:48',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0002 changed to paid',224,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(569,NULL,1,'2020-01-16 02:42:12','2020-01-16 02:42:12',40,'AC_ORDER_CLASSIFY_BILLED','Order CO7001-0020 classified billed','2020-01-16 02:42:12','2020-01-16 01:42:12',12,NULL,NULL,6,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0020 classified billed',72,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(570,NULL,1,'2020-01-16 02:42:17','2020-01-16 02:42:17',40,'AC_ORDER_CLOSE','Order CO7001-0020 classified delivered','2020-01-16 02:42:17','2020-01-16 01:42:17',12,NULL,NULL,6,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0020 classified delivered',72,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(571,NULL,1,'2020-01-16 02:42:56','2020-01-16 02:42:56',40,'AC_ORDER_CLOSE','Order CO7001-0020 classified delivered','2020-01-16 02:42:56','2020-01-16 01:42:56',12,NULL,NULL,6,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0020 classified delivered',72,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(572,NULL,1,'2020-01-16 18:05:43','2020-01-16 18:05:43',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0006 validated','2020-01-16 18:05:43','2020-01-16 17:05:43',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 validated',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(573,NULL,1,'2020-01-17 14:54:18','2020-01-17 14:54:18',40,'AC_PRODUCT_MODIFY','Product PINKDRESS modified','2020-01-17 14:54:18','2020-01-17 13:54:18',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PINKDRESS modified',1,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(574,NULL,1,'2020-01-17 15:22:28','2020-01-17 15:22:28',40,'AC_PRODUCT_MODIFY','Product PINKDRESS modified','2020-01-17 15:22:28','2020-01-17 14:22:28',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PINKDRESS modified',1,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(575,NULL,1,'2020-01-19 14:22:27','2020-01-19 14:22:27',40,'AC_PROPAL_VALIDATE','Proposal PR2001-0034 validated','2020-01-19 14:22:27','2020-01-19 13:22:27',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR2001-0034 validated',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(576,NULL,1,'2020-01-19 14:22:34','2020-01-19 14:22:34',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR2001-0034 signed','2020-01-19 14:22:34','2020-01-19 13:22:34',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR2001-0034 signed',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(577,NULL,1,'2020-01-19 14:24:22','2020-01-19 14:24:22',40,'AC_PROPAL_VALIDATE','Proposal PR2001-0034 validated','2020-01-19 14:24:22','2020-01-19 13:24:22',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR2001-0034 validated',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(578,NULL,1,'2020-01-19 14:24:27','2020-01-19 14:24:27',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR2001-0034 signed','2020-01-19 14:24:27','2020-01-19 13:24:27',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR2001-0034 signed',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(579,NULL,1,'2020-01-19 14:51:43','2020-01-19 14:51:43',40,'AC_BILL_VALIDATE','Invoice AC2001-0003 validated','2020-01-19 14:51:43','2020-01-19 13:51:43',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0003 validated',227,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(580,NULL,1,'2020-01-19 14:51:48','2020-01-19 14:51:48',40,'AC_BILL_UNVALIDATE','Invoice AC2001-0003 go back to draft status','2020-01-19 14:51:48','2020-01-19 13:51:48',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0003 go back to draft status',227,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(581,NULL,1,'2020-01-19 15:01:26','2020-01-19 15:01:26',40,'AC_BILL_VALIDATE','Invoice AC2001-0004 validated','2020-01-19 15:01:26','2020-01-19 14:01:26',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 validated',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(582,NULL,1,'2020-01-19 15:04:37','2020-01-19 15:04:37',40,'AC_BILL_UNVALIDATE','Invoice AC2001-0004 go back to draft status','2020-01-19 15:04:37','2020-01-19 14:04:37',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 go back to draft status',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(583,NULL,1,'2020-01-19 15:04:53','2020-01-19 15:04:53',40,'AC_BILL_VALIDATE','Invoice AC2001-0004 validated','2020-01-19 15:04:53','2020-01-19 14:04:53',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 validated',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(584,NULL,1,'2020-01-19 15:09:14','2020-01-19 15:09:14',40,'AC_BILL_UNVALIDATE','Invoice AC2001-0004 go back to draft status','2020-01-19 15:09:14','2020-01-19 14:09:14',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 go back to draft status',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(585,NULL,1,'2020-01-19 15:13:07','2020-01-19 15:13:07',40,'AC_BILL_VALIDATE','Invoice AC2001-0004 validated','2020-01-19 15:13:07','2020-01-19 14:13:07',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 validated',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(586,NULL,1,'2020-01-20 12:20:11','2020-01-20 12:20:11',40,'AC_ORDER_SUPPLIER_CREATE','Order (PROV14) created','2020-01-20 12:20:11','2020-01-20 11:20:11',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder (PROV14) created',14,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(588,NULL,1,'2020-01-21 01:02:14','2020-01-21 01:02:14',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 2 for member Vick Smith added','2020-01-21 01:02:14','2020-01-21 00:02:14',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 2 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2013 - 07/17/2014',3,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(589,NULL,1,'2020-01-21 10:22:37','2020-01-21 10:22:37',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 3 for member Vick Smith added','2020-01-21 10:22:37','2020-01-21 09:22:37',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 3 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2017 - 07/17/2018',4,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(590,NULL,1,'2020-01-21 10:23:17','2020-01-21 10:23:17',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 4 for member Vick Smith added','2020-01-21 10:23:17','2020-01-21 09:23:17',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 4 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2017 - 07/17/2018',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(591,NULL,1,'2020-01-21 10:23:17','2020-01-21 10:23:17',40,'AC_BILL_VALIDATE','Invoice FA1707-0026 validated','2020-01-21 10:23:17','2020-01-21 09:23:17',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1707-0026 validated',229,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(592,NULL,1,'2020-01-21 10:23:17','2020-01-21 10:23:17',40,'AC_BILL_PAYED','Invoice FA1707-0026 changed to paid','2020-01-21 10:23:17','2020-01-21 09:23:17',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1707-0026 changed to paid',229,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(593,NULL,1,'2020-01-21 10:23:28','2020-01-21 10:23:28',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 5 for member Vick Smith added','2020-01-21 10:23:28','2020-01-21 09:23:28',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 5 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2018 - 07/17/2019',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(594,NULL,1,'2020-01-21 10:23:28','2020-01-21 10:23:28',40,'AC_BILL_VALIDATE','Invoice FA1807-0027 validated','2020-01-21 10:23:28','2020-01-21 09:23:28',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1807-0027 validated',230,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(595,NULL,1,'2020-01-21 10:23:28','2020-01-21 10:23:28',40,'AC_BILL_PAYED','Invoice FA1807-0027 changed to paid','2020-01-21 10:23:28','2020-01-21 09:23:28',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1807-0027 changed to paid',230,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(596,NULL,1,'2020-01-21 10:23:49','2020-01-21 10:23:49',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 6 for member Vick Smith added','2020-01-21 10:23:49','2020-01-21 09:23:49',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 6 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2019 - 07/17/2020',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(597,NULL,1,'2020-01-21 10:23:49','2020-01-21 10:23:49',40,'AC_BILL_VALIDATE','Invoice FA1907-0028 validated','2020-01-21 10:23:49','2020-01-21 09:23:49',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1907-0028 validated',231,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(598,NULL,1,'2020-01-21 10:23:49','2020-01-21 10:23:49',40,'AC_BILL_PAYED','Invoice FA1907-0028 changed to paid','2020-01-21 10:23:49','2020-01-21 09:23:49',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1907-0028 changed to paid',231,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(599,NULL,1,'2020-01-21 10:30:27','2020-01-21 10:30:27',40,'AC_MEMBER_MODIFY','Member Pierre Curie modified','2020-01-21 10:30:27','2020-01-21 09:30:27',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Pierre Curie modified\nMember: Pierre Curie\nType: Standard members',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(600,NULL,1,'2020-01-21 10:30:36','2020-01-21 10:30:36',40,'AC_MEMBER_MODIFY','Member doe john modified','2020-01-21 10:30:36','2020-01-21 09:30:36',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember doe john modified\nMember: doe john\nType: Standard members',3,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(601,NULL,1,'2020-01-21 10:30:42','2020-01-21 10:30:42',40,'AC_MEMBER_MODIFY','Member smith smith modified','2020-01-21 10:30:42','2020-01-21 09:30:42',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember smith smith modified\nMember: smith smith\nType: Standard members',4,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(602,NULL,1,'2020-01-21 10:30:57','2020-01-21 10:30:57',40,'AC_MEMBER_MODIFY','Member Vick Smith modified','2020-01-21 10:30:57','2020-01-21 09:30:57',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Vick Smith modified\nMember: Vick Smith\nType: Standard members',1,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(603,NULL,1,'2020-06-12 10:00:00','2020-06-12 11:30:00',5,'AC_RDV','Meetings','2020-06-12 19:26:44','2020-06-12 17:26:44',12,NULL,3,NULL,NULL,0,12,1,NULL,0,0,-1,'Room 24',5400,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL),(604,NULL,1,'2020-06-01 10:00:00','2020-06-01 10:27:00',1,'AC_TEL','Called Mr X','2020-06-12 19:28:13','2020-06-12 17:28:25',12,12,3,NULL,NULL,0,12,1,NULL,0,0,100,NULL,1620,NULL,'Customer ask another call.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL);
 /*!40000 ALTER TABLE `llx_actioncomm` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -378,11 +379,16 @@ CREATE TABLE `llx_actioncomm_reminder` (
   `offsetvalue` int(11) NOT NULL,
   `offsetunit` varchar(1) COLLATE utf8_unicode_ci NOT NULL,
   `status` int(11) NOT NULL DEFAULT 0,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `fk_actioncomm` int(11) NOT NULL,
+  `fk_email_template` int(11) DEFAULT NULL,
+  `lasterror` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
-  UNIQUE KEY `uk_actioncomm_reminder_unique` (`fk_user`,`typeremind`,`offsetvalue`,`offsetunit`),
+  UNIQUE KEY `uk_actioncomm_reminder_unique` (`fk_user`,`typeremind`,`offsetvalue`,`offsetunit`,`fk_actioncomm`),
   KEY `idx_actioncomm_reminder_rowid` (`rowid`),
   KEY `idx_actioncomm_reminder_dateremind` (`dateremind`),
-  KEY `idx_actioncomm_reminder_fk_user` (`fk_user`)
+  KEY `idx_actioncomm_reminder_fk_user` (`fk_user`),
+  KEY `idx_actioncomm_reminder_status` (`status`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -624,6 +630,124 @@ INSERT INTO `llx_adherent_type_lang` VALUES (1,2,'en_US','Standard members','',N
 /*!40000 ALTER TABLE `llx_adherent_type_lang` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_advanceddiscount_actions`
+--
+
+DROP TABLE IF EXISTS `llx_advanceddiscount_actions`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_advanceddiscount_actions` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_advanceddiscount` int(11) DEFAULT NULL,
+  `type_action` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `value_action` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_advanceddiscount_actions_fk_advanceddiscount` (`fk_advanceddiscount`),
+  CONSTRAINT `llx_advanceddiscount_actions_fk_advanceddiscount` FOREIGN KEY (`fk_advanceddiscount`) REFERENCES `llx_advanceddiscount_advanceddiscount` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_advanceddiscount_actions`
+--
+
+LOCK TABLES `llx_advanceddiscount_actions` WRITE;
+/*!40000 ALTER TABLE `llx_advanceddiscount_actions` DISABLE KEYS */;
+INSERT INTO `llx_advanceddiscount_actions` VALUES (3,1,'itempercentagediscount','50');
+/*!40000 ALTER TABLE `llx_advanceddiscount_actions` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_advanceddiscount_advanceddiscount`
+--
+
+DROP TABLE IF EXISTS `llx_advanceddiscount_advanceddiscount`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_advanceddiscount_advanceddiscount` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `date_start` date DEFAULT NULL,
+  `date_end` date DEFAULT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_user_creat` int(11) NOT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_advanceddiscount_advanceddiscount_rowid` (`rowid`),
+  KEY `idx_advanceddiscount_advanceddiscount_ref` (`ref`),
+  KEY `idx_advanceddiscount_advanceddiscount_entity` (`entity`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_advanceddiscount_advanceddiscount`
+--
+
+LOCK TABLES `llx_advanceddiscount_advanceddiscount` WRITE;
+/*!40000 ALTER TABLE `llx_advanceddiscount_advanceddiscount` DISABLE KEYS */;
+INSERT INTO `llx_advanceddiscount_advanceddiscount` VALUES (1,'aa',1,'aaaa',NULL,NULL,NULL,'2019-05-04 11:22:14','2019-05-04 09:22:14',12,NULL,NULL);
+/*!40000 ALTER TABLE `llx_advanceddiscount_advanceddiscount` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_advanceddiscount_advanceddiscount_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_advanceddiscount_advanceddiscount_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_advanceddiscount_advanceddiscount_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_advanceddiscount_advanceddiscount_extrafields`
+--
+
+LOCK TABLES `llx_advanceddiscount_advanceddiscount_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_advanceddiscount_advanceddiscount_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_advanceddiscount_advanceddiscount_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_advanceddiscount_rules`
+--
+
+DROP TABLE IF EXISTS `llx_advanceddiscount_rules`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_advanceddiscount_rules` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_advanceddiscount` int(11) DEFAULT NULL,
+  `type_rule` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `value_rule` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_advanceddiscount_rules_fk_advanceddiscount` (`fk_advanceddiscount`),
+  CONSTRAINT `llx_advanceddiscount_rules_fk_advanceddiscount` FOREIGN KEY (`fk_advanceddiscount`) REFERENCES `llx_advanceddiscount_advanceddiscount` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_advanceddiscount_rules`
+--
+
+LOCK TABLES `llx_advanceddiscount_rules` WRITE;
+/*!40000 ALTER TABLE `llx_advanceddiscount_rules` DISABLE KEYS */;
+INSERT INTO `llx_advanceddiscount_rules` VALUES (2,1,'totalgreaterorequal','1');
+/*!40000 ALTER TABLE `llx_advanceddiscount_rules` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_advtargetemailing`
 --
@@ -780,6 +904,232 @@ LOCK TABLES `llx_asset_type_extrafields` WRITE;
 /*!40000 ALTER TABLE `llx_asset_type_extrafields` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_assetatm`
+--
+
+DROP TABLE IF EXISTS `llx_assetatm`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_assetatm` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_soc` int(11) NOT NULL DEFAULT 0,
+  `fk_product` int(11) NOT NULL DEFAULT 0,
+  `fk_societe_localisation` int(11) NOT NULL DEFAULT 0,
+  `entity` int(11) NOT NULL DEFAULT 0,
+  `fk_asset_type` int(11) NOT NULL DEFAULT 0,
+  `valeur` double NOT NULL DEFAULT 0,
+  `contenancereel_value` double NOT NULL DEFAULT 0,
+  `contenance_value` double NOT NULL DEFAULT 0,
+  `point_chute` double NOT NULL DEFAULT 0,
+  `contenance_units` int(11) NOT NULL DEFAULT 0,
+  `contenancereel_units` int(11) NOT NULL DEFAULT 0,
+  `fk_entrepot` int(11) NOT NULL DEFAULT 0,
+  `commentaire` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `lot_number` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `gestion_stock` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `reutilisable` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `status` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `dluo` datetime DEFAULT NULL,
+  `import_key` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `serial_number` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `fk_soc` (`fk_soc`),
+  KEY `fk_product` (`fk_product`),
+  KEY `fk_societe_localisation` (`fk_societe_localisation`),
+  KEY `entity` (`entity`),
+  KEY `fk_asset_type` (`fk_asset_type`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_assetatm`
+--
+
+LOCK TABLES `llx_assetatm` WRITE;
+/*!40000 ALTER TABLE `llx_assetatm` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_assetatm` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_assetatm_field`
+--
+
+DROP TABLE IF EXISTS `llx_assetatm_field`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_assetatm_field` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `code` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `libelle` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `type` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `obligatoire` int(11) NOT NULL DEFAULT 0,
+  `ordre` int(11) NOT NULL DEFAULT 0,
+  `options` longtext CHARACTER SET latin1 DEFAULT NULL,
+  `supprimable` int(11) NOT NULL DEFAULT 0,
+  `inliste` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `inlibelle` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `fk_asset_type` int(11) NOT NULL DEFAULT 0,
+  `entity` int(11) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `ordre` (`ordre`),
+  KEY `fk_asset_type` (`fk_asset_type`),
+  KEY `entity` (`entity`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_assetatm_field`
+--
+
+LOCK TABLES `llx_assetatm_field` WRITE;
+/*!40000 ALTER TABLE `llx_assetatm_field` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_assetatm_field` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_assetatm_link`
+--
+
+DROP TABLE IF EXISTS `llx_assetatm_link`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_assetatm_link` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_asset` int(11) NOT NULL DEFAULT 0,
+  `fk_document` int(11) NOT NULL DEFAULT 0,
+  `type_document` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_assetatm_link`
+--
+
+LOCK TABLES `llx_assetatm_link` WRITE;
+/*!40000 ALTER TABLE `llx_assetatm_link` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_assetatm_link` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_assetatm_stock`
+--
+
+DROP TABLE IF EXISTS `llx_assetatm_stock`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_assetatm_stock` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_asset` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `qty` double NOT NULL DEFAULT 0,
+  `date_mvt` datetime DEFAULT NULL,
+  `type` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `lot` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `source` int(11) NOT NULL DEFAULT 0,
+  `user` int(11) NOT NULL DEFAULT 0,
+  `weight_units` int(11) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `fk_asset` (`fk_asset`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_assetatm_stock`
+--
+
+LOCK TABLES `llx_assetatm_stock` WRITE;
+/*!40000 ALTER TABLE `llx_assetatm_stock` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_assetatm_stock` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_assetatm_type`
+--
+
+DROP TABLE IF EXISTS `llx_assetatm_type`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_assetatm_type` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `libelle` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `code` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `reutilisable` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `masque` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `gestion_stock` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `measuring_units` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT 0,
+  `contenance_value` double NOT NULL DEFAULT 0,
+  `contenancereel_value` double NOT NULL DEFAULT 0,
+  `point_chute` double NOT NULL DEFAULT 0,
+  `contenance_units` int(11) NOT NULL DEFAULT 0,
+  `contenancereel_units` int(11) NOT NULL DEFAULT 0,
+  `cumulate` int(11) NOT NULL DEFAULT 0,
+  `perishable` int(11) NOT NULL DEFAULT 0,
+  `supprimable` int(11) NOT NULL DEFAULT 0,
+  `default_dluo` varchar(20) CHARACTER SET latin1 DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `entity` (`entity`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_assetatm_type`
+--
+
+LOCK TABLES `llx_assetatm_type` WRITE;
+/*!40000 ALTER TABLE `llx_assetatm_type` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_assetatm_type` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_assetatmlot`
+--
+
+DROP TABLE IF EXISTS `llx_assetatmlot`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_assetatmlot` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT 0,
+  `lot_number` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_assetatmlot`
+--
+
+LOCK TABLES `llx_assetatmlot` WRITE;
+/*!40000 ALTER TABLE `llx_assetatmlot` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_assetatmlot` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_bank`
 --
@@ -808,6 +1158,9 @@ CREATE TABLE `llx_bank` (
   `emetteur` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `author` varchar(40) COLLATE utf8_unicode_ci DEFAULT NULL,
   `numero_compte` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `origin_id` int(11) DEFAULT NULL,
+  `origin_type` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_bank_datev` (`datev`),
   KEY `idx_bank_dateo` (`dateo`),
@@ -823,7 +1176,7 @@ CREATE TABLE `llx_bank` (
 
 LOCK TABLES `llx_bank` WRITE;
 /*!40000 ALTER TABLE `llx_bank` DISABLE KEYS */;
-INSERT INTO `llx_bank` VALUES (1,'2012-07-08 23:56:14','2020-06-12 17:12:09','2019-07-08','2019-07-08',2000.00000000,'(Initial balance)',1,NULL,1,'SOLD','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL),(2,'2012-07-09 00:00:24','2020-06-12 17:12:09','2019-07-09','2019-07-09',500.00000000,'(Initial balance)',2,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(3,'2012-07-10 13:33:42','2020-06-12 17:12:09','2019-07-10','2019-07-10',0.00000000,'(Solde initial)',3,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(5,'2013-07-18 20:50:24','2020-06-12 17:12:09','2019-07-08','2019-07-08',20.00000000,'(CustomerInvoicePayment)',1,1,NULL,'CB','201107',NULL,1,NULL,0,NULL,NULL,NULL,NULL),(6,'2013-07-18 20:50:47','2020-06-12 17:12:09','2019-07-08','2019-07-08',10.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(8,'2013-08-01 03:34:11','2020-06-12 17:12:08','2019-08-15','2019-08-01',5.63000000,'(CustomerInvoicePayment)',1,1,1,'CB','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL),(12,'2013-08-05 23:11:37','2020-06-12 17:12:08','2019-08-12','2019-08-05',-10.00000000,'(SocialContributionPayment)',1,1,1,'VIR','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL),(13,'2013-08-06 20:33:54','2020-06-12 17:12:08','2019-08-06','2019-08-06',5.98000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(14,'2013-08-08 02:53:40','2020-06-12 17:12:08','2019-08-08','2019-08-08',26.10000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(15,'2013-08-08 02:55:58','2020-06-12 17:12:08','2019-08-08','2019-08-08',26.96000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201211',NULL,1,NULL,0,NULL,NULL,NULL,NULL),(16,'2014-12-09 15:28:44','2020-06-12 17:12:08','2019-12-09','2019-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(17,'2014-12-09 15:28:53','2020-06-12 17:12:08','2019-12-09','2019-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(18,'2014-12-09 17:35:55','2020-06-12 17:12:08','2019-12-09','2019-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(19,'2014-12-09 17:37:02','2020-06-12 17:12:08','2019-12-09','2019-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(20,'2014-12-09 18:35:07','2020-06-12 17:12:08','2019-12-09','2019-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(21,'2014-12-12 18:54:33','2020-06-12 17:12:08','2019-12-12','2019-12-12',1.00000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL),(22,'2015-03-06 16:48:16','2020-06-12 17:12:09','2020-03-06','2020-03-06',20.00000000,'(SubscriptionPayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(23,'2015-03-20 14:30:11','2020-06-12 17:12:09','2020-03-20','2020-03-20',10.00000000,'(SubscriptionPayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(24,'2016-03-02 19:57:58','2020-06-12 17:12:09','2019-07-09','2019-07-09',605.00000000,'(CustomerInvoicePayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'111',NULL,NULL),(26,'2016-03-02 20:01:39','2020-06-12 17:12:09','2020-03-19','2020-03-19',500.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(27,'2016-03-02 20:02:06','2020-06-12 17:12:09','2020-03-21','2020-03-21',400.00000000,'(CustomerInvoicePayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'ABC and Co',NULL,NULL),(28,'2016-03-03 19:22:32','2020-06-12 17:12:08','2019-10-03','2019-10-03',-400.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(29,'2016-03-03 19:23:16','2020-06-12 17:12:09','2020-03-10','2020-03-10',-300.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(30,'2018-01-22 18:56:34','2020-06-12 17:12:09','2020-01-22','2020-01-22',-900.00000000,'(SupplierInvoicePayment)',1,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(31,'2018-07-30 22:42:14','2020-06-12 17:12:09','2019-07-30','2019-07-30',0.00000000,'(Initial balance)',4,0,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(32,'2017-02-01 19:02:44','2020-06-12 17:12:08','2020-02-01','2020-02-01',-200.00000000,'(SupplierInvoicePayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(33,'2017-02-06 08:10:24','2020-06-12 17:12:09','2020-03-22','2020-03-22',150.00000000,'(CustomerInvoicePayment)',1,12,NULL,'CHQ',NULL,NULL,0,NULL,2,NULL,'Magic Food Store',NULL,NULL),(34,'2017-02-06 08:10:50','2020-06-12 17:12:09','2020-03-25','2020-03-25',140.00000000,'(CustomerInvoicePayment)',1,12,NULL,'PRE',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(36,'2017-02-16 02:22:09','2020-06-12 17:12:08','2020-02-16','2020-02-16',-1.00000000,'(ExpenseReportPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(37,'2017-02-21 16:07:43','2020-06-12 17:12:08','2020-02-21','2020-02-21',50.00000000,'(WithdrawalPayment)',1,12,NULL,'PRE',NULL,'T170201',0,NULL,0,NULL,NULL,NULL,NULL),(38,'2017-09-06 20:08:36','2020-06-12 17:12:08','2019-09-06','2019-09-06',10.00000000,'(DonationPayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,''),(39,'2018-03-16 13:59:31','2020-06-12 17:12:09','2020-03-16','2020-03-16',10.00000000,'(CustomerInvoicePayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Indian SAS',NULL,''),(41,'2019-10-04 10:28:14','2020-06-12 17:12:09','2020-01-19','2020-01-19',5.63000000,'(CustomerInvoicePayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,''),(42,'2019-10-08 13:18:50','2019-10-08 11:18:50','2019-10-08','2019-10-08',-1000.00000000,'Salary payment',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,''),(43,'2019-12-26 01:48:30','2019-12-25 21:48:30','2019-12-25','2019-12-25',-5.00000000,'(SocialContributionPayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,''),(44,'2019-12-26 01:48:46','2019-12-25 21:48:46','2019-12-25','2019-12-25',-5.00000000,'(SocialContributionPayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,''),(47,'2020-01-01 20:28:49','2020-01-01 16:28:49','2020-01-01','2020-01-01',304.69000000,'(SupplierInvoicePayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,''),(48,'2020-01-06 20:52:28','2020-01-06 16:52:28','2020-01-06','2020-01-06',10.00000000,'Patient payment',1,12,NULL,'CB',NULL,NULL,0,NULL,0,NULL,'Patient',NULL,''),(49,'2020-01-10 04:42:47','2020-01-10 00:42:47','2020-01-10','2020-01-10',-10.00000000,'Miscellaneous payment',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,''),(50,'2020-01-16 02:36:48','2020-01-16 01:36:48','2020-01-16','2020-01-16',20.50000000,'(CustomerInvoicePayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'Magic Food Store',NULL,''),(51,'2020-01-21 01:02:14','2020-06-12 17:12:08','2019-07-18','2019-07-18',50.00000000,'Subscription 2013',4,12,NULL,'CB',NULL,'12345',0,NULL,0,'Bank CBN',NULL,NULL,''),(52,'2020-01-21 10:22:37','2020-01-21 09:22:37','2020-01-21','2020-01-21',50.00000000,'Subscription 2017',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'smith smith',NULL,''),(53,'2020-01-21 10:23:17','2020-01-21 09:23:17','2020-01-21','2020-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Pierre Curie',NULL,''),(54,'2020-01-21 10:23:28','2020-01-21 09:23:28','2020-01-21','2020-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Pierre Curie',NULL,''),(55,'2020-01-21 10:23:49','2020-01-21 09:23:49','2020-01-21','2020-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CB',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'');
+INSERT INTO `llx_bank` VALUES (1,'2012-07-08 23:56:14','2020-12-10 12:24:23','2020-07-08','2020-07-08',2000.00000000,'(Initial balance)',1,NULL,1,'SOLD','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(2,'2012-07-09 00:00:24','2020-12-10 12:24:23','2020-07-09','2020-07-09',500.00000000,'(Initial balance)',2,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,'2012-07-10 13:33:42','2020-12-10 12:24:23','2020-07-10','2020-07-10',0.00000000,'(Solde initial)',3,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(5,'2013-07-18 20:50:24','2020-12-10 12:24:23','2020-07-08','2020-07-08',20.00000000,'(CustomerInvoicePayment)',1,1,NULL,'CB','201107',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(6,'2013-07-18 20:50:47','2020-12-10 12:24:23','2020-07-08','2020-07-08',10.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(8,'2013-08-01 03:34:11','2020-12-10 12:24:23','2020-08-15','2020-08-01',5.63000000,'(CustomerInvoicePayment)',1,1,1,'CB','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(12,'2013-08-05 23:11:37','2020-12-10 12:24:23','2020-08-12','2020-08-05',-10.00000000,'(SocialContributionPayment)',1,1,1,'VIR','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(13,'2013-08-06 20:33:54','2020-12-10 12:24:23','2020-08-06','2020-08-06',5.98000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(14,'2013-08-08 02:53:40','2020-12-10 12:24:23','2020-08-08','2020-08-08',26.10000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(15,'2013-08-08 02:55:58','2020-12-10 12:24:23','2020-08-08','2020-08-08',26.96000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201211',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(16,'2014-12-09 15:28:44','2020-12-10 12:24:23','2020-12-09','2020-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(17,'2014-12-09 15:28:53','2020-12-10 12:24:23','2020-12-09','2020-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(18,'2014-12-09 17:35:55','2020-12-10 12:24:23','2020-12-09','2020-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(19,'2014-12-09 17:37:02','2020-12-10 12:24:23','2020-12-09','2020-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(20,'2014-12-09 18:35:07','2020-12-10 12:24:23','2020-12-09','2020-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(21,'2014-12-12 18:54:33','2020-06-12 17:12:08','2019-12-12','2019-12-12',1.00000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(22,'2015-03-06 16:48:16','2020-06-12 17:12:09','2020-03-06','2020-03-06',20.00000000,'(SubscriptionPayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(23,'2015-03-20 14:30:11','2020-06-12 17:12:09','2020-03-20','2020-03-20',10.00000000,'(SubscriptionPayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(24,'2016-03-02 19:57:58','2020-12-10 12:24:23','2020-07-09','2020-07-09',605.00000000,'(CustomerInvoicePayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'111',NULL,NULL,NULL,NULL,NULL),(26,'2016-03-02 20:01:39','2020-06-12 17:12:09','2020-03-19','2020-03-19',500.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(27,'2016-03-02 20:02:06','2020-06-12 17:12:09','2020-03-21','2020-03-21',400.00000000,'(CustomerInvoicePayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'ABC and Co',NULL,NULL,NULL,NULL,NULL),(28,'2016-03-03 19:22:32','2020-12-10 12:24:23','2020-10-03','2020-10-03',-400.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(29,'2016-03-03 19:23:16','2020-06-12 17:12:09','2020-03-10','2020-03-10',-300.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(30,'2018-01-22 18:56:34','2020-06-12 17:12:09','2020-01-22','2020-01-22',-900.00000000,'(SupplierInvoicePayment)',1,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(31,'2018-07-30 22:42:14','2020-12-10 12:24:23','2020-07-30','2020-07-30',0.00000000,'(Initial balance)',4,0,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(32,'2017-02-01 19:02:44','2020-06-12 17:12:08','2020-02-01','2020-02-01',-200.00000000,'(SupplierInvoicePayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(33,'2017-02-06 08:10:24','2020-06-12 17:12:09','2020-03-22','2020-03-22',150.00000000,'(CustomerInvoicePayment)',1,12,NULL,'CHQ',NULL,NULL,0,NULL,2,NULL,'Magic Food Store',NULL,NULL,NULL,NULL,NULL),(34,'2017-02-06 08:10:50','2020-06-12 17:12:09','2020-03-25','2020-03-25',140.00000000,'(CustomerInvoicePayment)',1,12,NULL,'PRE',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(36,'2017-02-16 02:22:09','2020-06-12 17:12:08','2020-02-16','2020-02-16',-1.00000000,'(ExpenseReportPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(37,'2017-02-21 16:07:43','2020-06-12 17:12:08','2020-02-21','2020-02-21',50.00000000,'(WithdrawalPayment)',1,12,NULL,'PRE',NULL,'T170201',0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(38,'2017-09-06 20:08:36','2020-12-10 12:24:23','2020-09-06','2020-09-06',10.00000000,'(DonationPayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(39,'2018-03-16 13:59:31','2020-06-12 17:12:09','2020-03-16','2020-03-16',10.00000000,'(CustomerInvoicePayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Indian SAS',NULL,'',NULL,NULL,NULL),(41,'2019-10-04 10:28:14','2020-06-12 17:12:09','2020-01-19','2020-01-19',5.63000000,'(CustomerInvoicePayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(42,'2019-10-08 13:18:50','2020-12-10 12:24:23','2020-10-08','2020-10-08',-1000.00000000,'Salary payment',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(43,'2019-12-26 01:48:30','2019-12-25 21:48:30','2019-12-25','2019-12-25',-5.00000000,'(SocialContributionPayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(44,'2019-12-26 01:48:46','2019-12-25 21:48:46','2019-12-25','2019-12-25',-5.00000000,'(SocialContributionPayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(47,'2020-01-01 20:28:49','2020-01-01 16:28:49','2020-01-01','2020-01-01',304.69000000,'(SupplierInvoicePayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(48,'2020-01-06 20:52:28','2020-01-06 16:52:28','2020-01-06','2020-01-06',10.00000000,'Patient payment',1,12,NULL,'CB',NULL,NULL,0,NULL,0,NULL,'Patient',NULL,'',NULL,NULL,NULL),(49,'2020-01-10 04:42:47','2020-01-10 00:42:47','2020-01-10','2020-01-10',-10.00000000,'Miscellaneous payment',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(50,'2020-01-16 02:36:48','2020-01-16 01:36:48','2020-01-16','2020-01-16',20.50000000,'(CustomerInvoicePayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'Magic Food Store',NULL,'',NULL,NULL,NULL),(51,'2020-01-21 01:02:14','2020-12-10 12:24:23','2020-07-18','2020-07-18',50.00000000,'Subscription 2013',4,12,NULL,'CB',NULL,'12345',0,NULL,0,'Bank CBN',NULL,NULL,'',NULL,NULL,NULL),(52,'2020-01-21 10:22:37','2020-01-21 09:22:37','2020-01-21','2020-01-21',50.00000000,'Subscription 2017',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'smith smith',NULL,'',NULL,NULL,NULL),(53,'2020-01-21 10:23:17','2020-01-21 09:23:17','2020-01-21','2020-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Pierre Curie',NULL,'',NULL,NULL,NULL),(54,'2020-01-21 10:23:28','2020-01-21 09:23:28','2020-01-21','2020-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Pierre Curie',NULL,'',NULL,NULL,NULL),(55,'2020-01-21 10:23:49','2020-01-21 09:23:49','2020-01-21','2020-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CB',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_bank` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1024,7 +1377,7 @@ CREATE TABLE `llx_blockedlog` (
   KEY `fk_user` (`fk_user`),
   KEY `entity_action` (`entity`,`action`),
   KEY `entity_action_certified` (`entity`,`action`,`certified`)
-) ENGINE=InnoDB AUTO_INCREMENT=58 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=59 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1033,7 +1386,7 @@ CREATE TABLE `llx_blockedlog` (
 
 LOCK TABLES `llx_blockedlog` WRITE;
 /*!40000 ALTER TABLE `llx_blockedlog` DISABLE KEYS */;
-INSERT INTO `llx_blockedlog` VALUES (20,'2018-03-16 09:57:22','MODULE_RESET',0.00000000,'d6dd5fe6c2eec2de6368f3b6da30188566f0a1a7be4b1589ccd8352d2c827ad5','fbc11d0396d9b76ea48f892bd5f0fe652e5bdf7d44873acb4bf1e1b70352bd30','module',1,'systemevent','2018-03-16 13:57:22','O:8:\"stdClass\":6:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:1:\"1\";s:7:\"idprof3\";s:1:\"1\";s:7:\"idprof4\";s:1:\"1\";s:7:\"idprof5\";s:1:\"1\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:9:\"FR1234567\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";s:4:\"name\";s:12:\"MyBigCompany\";}s:2:\"id\";i:1;s:7:\"element\";s:6:\"module\";s:3:\"ref\";s:11:\"systemevent\";s:6:\"entity\";i:1;s:4:\"date\";i:1521194242;}',12,1,0,'2018-03-16 13:57:22','Alice Adminson',''),(21,'2018-03-16 09:57:24','MODULE_SET',0.00000000,'d6b66df837d8d33bd8b9744e2afa46ab8c65ae8ca462246c406de19f8254e146','0a3aae975056417705f4eb7b4a4926384075cc2b6c899603715643c8f1d6ff9b','module',1,'systemevent','2018-03-16 13:57:24','O:8:\"stdClass\":6:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:1:\"1\";s:7:\"idprof3\";s:1:\"1\";s:7:\"idprof4\";s:1:\"1\";s:7:\"idprof5\";s:1:\"1\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:9:\"FR1234567\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";s:4:\"name\";s:12:\"MyBigCompany\";}s:2:\"id\";i:1;s:7:\"element\";s:6:\"module\";s:3:\"ref\";s:11:\"systemevent\";s:6:\"entity\";i:1;s:4:\"date\";i:1521194244;}',12,1,0,'2018-03-16 13:57:24','Alice Adminson',''),(22,'2018-03-16 09:59:31','PAYMENT_CUSTOMER_CREATE',10.00000000,'9beb9e3ba04582d441b49f176f995900c16572c789bcf48a1c9f285a74be76c8','86813eb2563252c0e270baaf1fffade82475fe51af5f88d14613005fd0e07783','payment',38,'PAY1803-0004','2018-03-16 12:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:1:\"1\";s:7:\"idprof3\";s:1:\"1\";s:7:\"idprof4\";s:1:\"1\";s:7:\"idprof5\";s:1:\"1\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:9:\"FR1234567\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";s:4:\"name\";s:12:\"MyBigCompany\";}s:3:\"ref\";s:12:\"PAY1803-0004\";s:4:\"date\";i:1521187200;s:9:\"type_code\";s:3:\"CHQ\";s:11:\"payment_num\";N;s:4:\"note\";s:0:\"\";s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:2:\"10\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";s:4:\"name\";s:10:\"Indian SAS\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1453147200;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:11:\"20.00000000\";s:9:\"total_tva\";s:10:\"1.80000000\";s:9:\"total_ttc\";s:11:\"23.60000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA1601-0024\";s:11:\"note_public\";N;}}}s:6:\"amount\";i:10;}',12,1,0,'2018-03-16 13:59:31','Alice Adminson',''),(23,'2019-09-26 15:33:37','BILL_VALIDATE',43.58000000,'6a1e049c00f51afa6eaca799e6281bd8abfdaa12bdf42ee2a002b0bec588a2a5','451b12ea66d25259c9c1df9993a902affe124c9f27c97093613cf7184fe388aa','facture',218,'FA1909-0025','2019-09-26 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1569448800;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";d:42.5;s:9:\"total_tva\";d:1.08;s:9:\"total_ttc\";d:43.58;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:5:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";s:9:\"DOLICLOUD\";s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:10:\"9.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:10:\"9.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"9.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"9.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:2;O:8:\"stdClass\":17:{s:3:\"ref\";s:9:\"DOLIDROID\";s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:10:\"5.50000000\";s:23:\"multicurrency_total_tva\";s:10:\"1.08000000\";s:23:\"multicurrency_total_ttc\";s:10:\"6.58000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:6:\"19.600\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"5.50000000\";s:9:\"total_tva\";s:10:\"1.08000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"6.58000000\";s:9:\"info_bits\";s:1:\"0\";}i:3;O:8:\"stdClass\":17:{s:3:\"ref\";s:9:\"DOLICLOUD\";s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:10:\"9.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:10:\"9.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"9.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"9.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:4;O:8:\"stdClass\":17:{s:3:\"ref\";s:9:\"DOLICLOUD\";s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:10:\"9.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:10:\"9.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"9.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"9.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:5;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"10.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"10.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"10.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"10.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA1909-0025\";s:11:\"note_public\";N;}',12,1,0,'2019-09-26 17:33:37','Alice Adminson',''),(24,'2019-10-04 08:27:00','BILL_VALIDATE',5.63000000,'aa16d46e6ea7376fe0f91a4aeb7b1d534ed351fae071ded64c393e61269c4c35','316e03ffb8327d837c8601e7dbafc91509581b0be9449a89827a14e6cfa2688a','facture',150,'FA6801-0010','2018-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1516316400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";d:5;s:9:\"total_tva\";d:0.63;s:9:\"total_ttc\";d:5.63;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";s:7:\"PEARPIE\";s:18:\"multicurrency_code\";N;s:22:\"multicurrency_total_ht\";s:10:\"5.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.63000000\";s:23:\"multicurrency_total_ttc\";s:10:\"5.63000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:6:\"12.500\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"5.00000000\";s:9:\"total_tva\";s:10:\"0.63000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"5.63000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA6801-0010\";s:11:\"note_public\";N;}',12,1,0,'2019-10-04 10:27:00','Alice Adminson',''),(25,'2019-10-04 08:28:14','PAYMENT_CUSTOMER_CREATE',5.63000000,'fa5c9b4bb975af8401744390d47e62218a7ec47a2e96c60f5e58d7f6be38dc44','9bfe069dc130dd71c31f914ff0afa7835fd40932790ac88be0005638342ccb87','payment',39,'PAY1801-0005','2018-01-19 12:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY1801-0005\";s:4:\"date\";i:1516359600;s:9:\"type_code\";s:3:\"LIQ\";s:11:\"payment_num\";N;s:4:\"note\";s:0:\"\";s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:4:\"5.63\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1516316400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:10:\"5.00000000\";s:9:\"total_tva\";s:10:\"0.63000000\";s:9:\"total_ttc\";s:10:\"5.63000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA6801-0010\";s:11:\"note_public\";N;}}}s:6:\"amount\";d:5.63;}',12,1,0,'2019-10-04 10:28:14','Alice Adminson',''),(26,'2019-12-22 19:01:48','CASHCONTROL_VALIDATE',400.00000000,'bb14150a5ea65d97f9d22f6bc3d3d357ccfb2aa681f2ecbcc81a9d870260c58c','7b03131558731b2e7b4000189214b132f4323621c596d4418cfeba233a085e83','cashcontrol',1,'1','2019-12-22 23:01:02','O:8:\"stdClass\":37:{s:9:\"mycompany\";O:8:\"stdClass\":26:{s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:0;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:0;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;}s:7:\"element\";s:11:\"cashcontrol\";s:2:\"id\";i:1;s:7:\"opening\";d:-324.29;s:6:\"status\";i:1;s:10:\"year_close\";i:2019;s:11:\"month_close\";i:11;s:9:\"day_close\";N;s:9:\"posmodule\";s:7:\"takepos\";s:9:\"posnumber\";s:1:\"1\";s:4:\"cash\";d:400;s:6:\"cheque\";d:0;s:4:\"card\";d:0;s:10:\"date_valid\";i:1577041308;s:13:\"date_creation\";i:1577041262;s:17:\"date_modification\";N;s:10:\"import_key\";N;s:13:\"array_options\";a:0:{}s:6:\"canvas\";N;s:7:\"project\";N;s:10:\"fk_project\";N;s:10:\"thirdparty\";N;s:4:\"user\";N;s:3:\"ref\";s:1:\"1\";s:7:\"ref_ext\";N;s:6:\"statut\";N;s:10:\"fk_account\";N;s:11:\"note_public\";N;s:12:\"note_private\";N;s:4:\"note\";N;s:8:\"comments\";a:0:{}s:15:\"date_validation\";N;s:16:\"next_prev_filter\";N;s:6:\"entity\";i:1;s:5:\"label\";N;s:3:\"tms\";i:1577030462;s:13:\"fk_user_valid\";s:2:\"12\";}',12,1,0,'2019-12-22 23:01:48','Alice Adminson',''),(34,'2020-01-10 00:42:47','PAYMENT_VARIOUS_CREATE',10.00000000,'e20ec32652d7564cdca915e95528b68bd3b770b82defe64ead1af3f6dc6bc150','25514deeca716e41c02699d9466fc640f4b7da0a0c953637b542c555f9634f9b','payment_various',4,'4','2020-01-10 12:00:00','O:8:\"stdClass\":7:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";i:4;s:4:\"date\";i:1578643200;s:9:\"type_code\";s:3:\"VIR\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";s:0:\"\";s:6:\"amount\";i:10;}',12,1,0,'2020-01-10 04:42:47','Alice Adminson',''),(35,'2020-01-10 01:08:37','PAYMENT_VARIOUS_MODIFY',10.00000000,'94bd3491e8e553e6e633cd4a40c8c0ef3a6af0bd60df1d8e768d3c8c2a37b79b','eeadf2ffc7bd611e3b739e8825307f9e9cb2d9dddbd9e16b1f092fa5d881a5ca','payment_various',4,'4','2020-01-10 00:00:00','O:8:\"stdClass\":7:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:1:\"4\";s:4:\"date\";i:1578600000;s:9:\"type_code\";s:3:\"VIR\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";s:0:\"\";s:6:\"amount\";d:10;}',12,1,0,'2020-01-10 05:08:37','Alice Adminson',''),(36,'2020-01-10 01:08:43','PAYMENT_VARIOUS_MODIFY',10.00000000,'02ecc274221832fcbf8f525ed64f1391415a29dded01022a5a4c51cfb2c5ad49','c274f2f609af56bd40b74000eaa2f6866a734feb0fc262ce3431ac9f91a754e2','payment_various',4,'4','2020-01-10 00:00:00','O:8:\"stdClass\":7:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:1:\"4\";s:4:\"date\";i:1578600000;s:9:\"type_code\";s:0:\"\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";s:0:\"\";s:6:\"amount\";d:10;}',12,1,0,'2020-01-10 05:08:43','Alice Adminson',''),(37,'2020-01-10 01:17:51','PAYMENT_VARIOUS_MODIFY',10.00000000,'214ad5673f893c2da41a8c87ccbcae92dccf17c9d4a13b3d04a9497d21bf68b8','ffbebb278eaa1c75f0cf5afdd05c8367887615a7329f2b3ab628b8f0da10f9d8','payment_various',4,'4','2020-01-10 00:00:00','O:8:\"stdClass\":7:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:1:\"4\";s:4:\"date\";i:1578600000;s:9:\"type_code\";s:0:\"\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";s:0:\"\";s:6:\"amount\";d:10;}',12,1,0,'2020-01-10 05:17:51','Alice Adminson',''),(38,'2020-01-16 01:22:16','BILL_VALIDATE',123.00000000,'aae0a1eb8b3da6686020252194f47ce82301fb604ee213ae120a2885197735d5','b414061da9abbd2dec7153a7d53978c177c5c5f55ed8ace177a02e46e7a74312','facture',221,'AC2001-0001','2020-01-16 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:16:\"Magic Food Store\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:22:\"65 holdywood boulevard\";s:3:\"zip\";s:6:\"123456\";s:4:\"town\";s:7:\"BigTown\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";s:4:\"0101\";s:5:\"email\";s:18:\"myemail@domain.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:10:\"10/10/2010\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1301-0008\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"ES\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579129200;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:123;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:123;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:12:\"123.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:12:\"123.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:12:\"123.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:12:\"123.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0001\";s:11:\"note_public\";N;}',12,1,0,'2020-01-16 02:22:16','Alice Adminson',''),(39,'2020-01-16 01:33:27','BILL_VALIDATE',20.50000000,'777eb88a0b91c6d376881534a7c84a9b9ee5a6d7efedbae3b0c00d7e36bacba9','b78e5b5909c49c575142b429f2d09abb2d19c5545f815a1cabe0f2ed80ded6e4','facture',224,'AC2001-0002','2020-01-16 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:16:\"Magic Food Store\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:22:\"65 holdywood boulevard\";s:3:\"zip\";s:6:\"123456\";s:4:\"town\";s:7:\"BigTown\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";s:4:\"0101\";s:5:\"email\";s:18:\"myemail@domain.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:10:\"10/10/2010\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1301-0008\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"ES\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579129200;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:20.5;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:20.5;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"20.50000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"20.50000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"20.50000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"20.50000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0002\";s:11:\"note_public\";N;}',12,1,0,'2020-01-16 02:33:27','Alice Adminson',''),(40,'2020-01-16 01:36:48','PAYMENT_CUSTOMER_CREATE',20.50000000,'cb03ceef89e1630e5a3ba8b3b1ca6c77e42b97fc2884a661c04e9e5c8b3afa1e','18bed0f0566b20ffa32c49c901cfc8b46485ef2172b22c676cef07ce8bd2d90b','payment',40,'PAY2001-0006','2020-01-16 12:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY2001-0006\";s:4:\"date\";i:1579172400;s:9:\"type_code\";s:3:\"VIR\";s:11:\"payment_num\";N;s:4:\"note\";s:0:\"\";s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:4:\"20.5\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:16:\"Magic Food Store\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:22:\"65 holdywood boulevard\";s:3:\"zip\";s:6:\"123456\";s:4:\"town\";s:7:\"BigTown\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";s:4:\"0101\";s:5:\"email\";s:18:\"myemail@domain.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:10:\"10/10/2010\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1301-0008\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"ES\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1579129200;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";s:11:\"20.50000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"20.50000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"AC2001-0002\";s:11:\"note_public\";N;}}}s:6:\"amount\";d:20.5;}',12,1,0,'2020-01-16 02:36:48','Alice Adminson',''),(41,'2020-01-19 13:51:43','BILL_VALIDATE',239.20000000,'7f38eaf315003f652b72fd27e55e71010a5ed0339086aa100b9a91a6045bb06f','26d074106c5f096ea1795ce7ed399cda6c2b2d5ac78dd9c2e152a0a0aa6ef47b','facture',227,'AC2001-0003','2020-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579388400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:200;s:9:\"total_tva\";d:39.2;s:9:\"total_ttc\";d:239.2;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:12:\"200.00000000\";s:23:\"multicurrency_total_tva\";s:11:\"39.20000000\";s:23:\"multicurrency_total_ttc\";s:12:\"239.20000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:6:\"19.600\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:12:\"200.00000000\";s:9:\"total_tva\";s:11:\"39.20000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:12:\"239.20000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0003\";s:11:\"note_public\";N;}',12,1,0,'2020-01-19 14:51:43','Alice Adminson',''),(42,'2020-01-19 14:01:26','BILL_VALIDATE',50.54000000,'107572ffe2f1ccf1ee4fe7b39c5a4ed40a485c1d37c926fbff8a0e420396d641','352ac5e380c996d7bff798c1369f8a85e86cc98a2864e278cbe0cb6b309c12a5','facture',228,'AC2001-0004','2020-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579388400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:48.6;s:9:\"total_tva\";d:1.94;s:9:\"total_ttc\";d:50.54;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:2:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"2.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"52.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"2.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"52.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:2;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"-1.40000000\";s:23:\"multicurrency_total_tva\";s:11:\"-0.06000000\";s:23:\"multicurrency_total_ttc\";s:11:\"-1.46000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"-1.40000000\";s:9:\"total_tva\";s:11:\"-0.06000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"-1.46000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0004\";s:11:\"note_public\";N;}',12,1,0,'2020-01-19 15:01:26','Alice Adminson',''),(43,'2020-01-19 14:04:53','BILL_VALIDATE',50.54000000,'795f9c5b741f360e3194ac8b3bb163c244b2761125f7507935baa44b319c624a','8cbb81e210f60d71b33a7fdcae0202721c2b4a8cdd59fe77ff2a8942839159b4','facture',228,'AC2001-0004','2020-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579388400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:48.6;s:9:\"total_tva\";d:1.94;s:9:\"total_ttc\";d:50.54;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:2:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"2.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"52.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"2.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"52.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:2;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"-1.40000000\";s:23:\"multicurrency_total_tva\";s:11:\"-0.06000000\";s:23:\"multicurrency_total_ttc\";s:11:\"-1.46000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"-1.40000000\";s:9:\"total_tva\";s:11:\"-0.06000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"-1.46000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0004\";s:11:\"note_public\";N;}',12,1,0,'2020-01-19 15:04:53','Alice Adminson',''),(44,'2020-01-19 14:13:07','BILL_VALIDATE',50.54000000,'0c5b79703d1db88579a1fdb74053596defebddb7a1e6d4c5c8b065729be10201','41669e482d1e5e7a58c132c2bf85bc75372cadb4d9b97047a98cc74a9d1fd767','facture',228,'AC2001-0004','2020-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579388400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:48.6;s:9:\"total_tva\";d:1.94;s:9:\"total_ttc\";d:50.54;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:2:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"2.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"52.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"2.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"52.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:2;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"-1.40000000\";s:23:\"multicurrency_total_tva\";s:11:\"-0.06000000\";s:23:\"multicurrency_total_ttc\";s:11:\"-1.46000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"-1.40000000\";s:9:\"total_tva\";s:11:\"-0.06000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"-1.46000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0004\";s:11:\"note_public\";N;}',12,1,0,'2020-01-19 15:13:07','Alice Adminson',''),(46,'2020-01-21 00:02:14','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'aacdc952cc25b2d4f90222cea6f684320c76477e55b87687397d82e70694c517','ce99e3278ebb1f5f2540a0d7205a4b1230e2e23c4bed48b567433b34786b88e4','subscription',2,'','2013-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579564934;s:5:\"dateh\";i:1374098400;s:5:\"datef\";i:1405548000;s:11:\"fk_adherent\";s:1:\"3\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:2;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2013\";}',12,1,0,'2020-01-21 01:02:14','Alice Adminson',''),(47,'2020-01-21 09:22:37','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'43a9804c627e78b20c7842a563099892a2d464b207f96bb393886f0b0ea52b4a','c6befc858191e428330c0054328f84d09f7be0f5603fb5b15e3a59980bb8e6eb','subscription',3,'','2017-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579598557;s:5:\"dateh\";i:1500328800;s:5:\"datef\";i:1531778400;s:11:\"fk_adherent\";s:1:\"4\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:3;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2017\";}',12,1,0,'2020-01-21 10:22:37','Alice Adminson',''),(48,'2020-01-21 09:23:17','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'d44357a1d55ffedd8f24690cd3c8aa43f9bfd33aa362ad558fd486b3b7f62a50','7c32d13e68bb245ab06b8e11efa5ed9e5fdb15650265dc80d5cb00d4674c134d','subscription',4,'','2017-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579598597;s:5:\"dateh\";i:1500328800;s:5:\"datef\";i:1531778400;s:11:\"fk_adherent\";s:1:\"2\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:4;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2017\";}',12,1,0,'2020-01-21 10:23:17','Alice Adminson',''),(49,'2020-01-21 09:23:17','BILL_VALIDATE',50.00000000,'30d0b37723f3cd2fce6afefd56cbdeb90f7cdee0e898e6ebaa411d84d3123ca0','e0301b9c4da11aa095a90cd9989b9fb6d0c635263cb2a8998b4ba57b60751d11','facture',229,'FA1707-0026','2017-07-18 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1500328800;s:10:\"ref_client\";s:0:\"\";s:4:\"type\";i:0;s:8:\"total_ht\";d:50;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:50;s:12:\"revenuestamp\";N;s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"50.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA1707-0026\";s:11:\"note_public\";s:0:\"\";}',12,1,0,'2020-01-21 10:23:17','Alice Adminson',''),(50,'2020-01-21 09:23:17','PAYMENT_CUSTOMER_CREATE',50.00000000,'41e6e00dfd2b96c3d9056489f22241959407ad0282405d37ada32da919e2d744','625ed1ef1ab9edddabc0b1588542eb6eac30ac9224e75812dabcbdfa0211b918','payment',41,'PAY2001-0007','2020-01-21 00:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY2001-0007\";s:4:\"date\";i:1579561200;s:9:\"type_code\";s:3:\"CHQ\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";N;s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:2:\"50\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1500328800;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA1707-0026\";s:11:\"note_public\";N;}}}s:6:\"amount\";i:50;}',12,1,0,'2020-01-21 10:23:17','Alice Adminson',''),(51,'2020-01-21 09:23:28','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'b24dfe36f8a3e5971898dd4fcfc61d775d4f0937169f44986bc9478d189e8e60','6160f4fb0fe73ce769a03f9d5460db7051602796090b9e44b51c6eadbd63c309','subscription',5,'','2018-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579598608;s:5:\"dateh\";i:1531864800;s:5:\"datef\";i:1563314400;s:11:\"fk_adherent\";s:1:\"2\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:5;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2018\";}',12,1,0,'2020-01-21 10:23:28','Alice Adminson',''),(52,'2020-01-21 09:23:28','BILL_VALIDATE',50.00000000,'a6ba6c4518b94977daa8a65b6e9063e81b37563037455ee4608724674c53ea01','3724c09a72bbaab46bdde59c79ffd5d439ffb43f2a509c49ebe05aa9acdcda7a','facture',230,'FA1807-0027','2018-07-18 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1531864800;s:10:\"ref_client\";s:0:\"\";s:4:\"type\";i:0;s:8:\"total_ht\";d:50;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:50;s:12:\"revenuestamp\";N;s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"50.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA1807-0027\";s:11:\"note_public\";s:0:\"\";}',12,1,0,'2020-01-21 10:23:28','Alice Adminson',''),(53,'2020-01-21 09:23:28','PAYMENT_CUSTOMER_CREATE',50.00000000,'54bbe038c35a0b1f63cccfbd89ce3232fc5dff8a56e7ff33bffebb9f412827bc','444449d4566c78f70a64b92d0008e9ddc933be75326cebdf5d41c4a94acdddc4','payment',42,'PAY2001-0008','2020-01-21 00:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY2001-0008\";s:4:\"date\";i:1579561200;s:9:\"type_code\";s:3:\"CHQ\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";N;s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:2:\"50\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1531864800;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA1807-0027\";s:11:\"note_public\";N;}}}s:6:\"amount\";i:50;}',12,1,0,'2020-01-21 10:23:28','Alice Adminson',''),(54,'2020-01-21 09:23:49','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'c4b9d402ebf74ae10353550d9ef1ce08c899b6533bdc5434fa105599da3e28ce','4642f26ec597360d7616ed0d925080970614232397fc17022922eecad2e727c9','subscription',6,'','2019-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579598629;s:5:\"dateh\";i:1563400800;s:5:\"datef\";i:1594936800;s:11:\"fk_adherent\";s:1:\"2\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:6;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2019\";}',12,1,0,'2020-01-21 10:23:49','Alice Adminson',''),(55,'2020-01-21 09:23:49','BILL_VALIDATE',50.00000000,'3e7b2c3b0b26c1982a3f8205b48a68756d81cd5bb673e1d2c7c09ce12c2086b9','ca332254195c3a59ee8c2ed0c60aec16a4229e83f5138f69747e65136ad370fa','facture',231,'FA1907-0028','2019-07-18 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1563400800;s:10:\"ref_client\";s:0:\"\";s:4:\"type\";i:0;s:8:\"total_ht\";d:50;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:50;s:12:\"revenuestamp\";N;s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"50.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA1907-0028\";s:11:\"note_public\";s:0:\"\";}',12,1,0,'2020-01-21 10:23:49','Alice Adminson',''),(56,'2020-01-21 09:23:49','PAYMENT_CUSTOMER_CREATE',50.00000000,'87cab3c0d2443145bb01b7364b78917756b2bf9b7908355b1a3258c28ecf1400','966571aa0fe244a6e762172fff34c03610ba4066f6f95369f514076c97975b6b','payment',43,'PAY2001-0009','2020-01-21 00:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY2001-0009\";s:4:\"date\";i:1579561200;s:9:\"type_code\";s:2:\"CB\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";N;s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:2:\"50\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1563400800;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA1907-0028\";s:11:\"note_public\";N;}}}s:6:\"amount\";i:50;}',12,1,0,'2020-01-21 10:23:49','Alice Adminson',''),(57,'2020-01-21 09:33:28','MODULE_RESET',0.00000000,'0000000000','d8134616ec977d8204a6856269ccfc799ea7eccc80074ac62350a5cdee3b070b','module',1,'systemevent','2020-01-21 10:33:28','O:8:\"stdClass\":6:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:2:\"id\";i:1;s:7:\"element\";s:6:\"module\";s:3:\"ref\";s:11:\"systemevent\";s:6:\"entity\";i:1;s:4:\"date\";i:1579599208;}',12,1,0,'2020-01-21 10:33:28','Alice Adminson','');
+INSERT INTO `llx_blockedlog` VALUES (20,'2018-03-16 09:57:22','MODULE_RESET',0.00000000,'d6dd5fe6c2eec2de6368f3b6da30188566f0a1a7be4b1589ccd8352d2c827ad5','fbc11d0396d9b76ea48f892bd5f0fe652e5bdf7d44873acb4bf1e1b70352bd30','module',1,'systemevent','2018-03-16 13:57:22','O:8:\"stdClass\":6:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:1:\"1\";s:7:\"idprof3\";s:1:\"1\";s:7:\"idprof4\";s:1:\"1\";s:7:\"idprof5\";s:1:\"1\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:9:\"FR1234567\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";s:4:\"name\";s:12:\"MyBigCompany\";}s:2:\"id\";i:1;s:7:\"element\";s:6:\"module\";s:3:\"ref\";s:11:\"systemevent\";s:6:\"entity\";i:1;s:4:\"date\";i:1521194242;}',12,1,0,'2018-03-16 13:57:22','Alice Adminson',''),(21,'2018-03-16 09:57:24','MODULE_SET',0.00000000,'d6b66df837d8d33bd8b9744e2afa46ab8c65ae8ca462246c406de19f8254e146','0a3aae975056417705f4eb7b4a4926384075cc2b6c899603715643c8f1d6ff9b','module',1,'systemevent','2018-03-16 13:57:24','O:8:\"stdClass\":6:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:1:\"1\";s:7:\"idprof3\";s:1:\"1\";s:7:\"idprof4\";s:1:\"1\";s:7:\"idprof5\";s:1:\"1\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:9:\"FR1234567\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";s:4:\"name\";s:12:\"MyBigCompany\";}s:2:\"id\";i:1;s:7:\"element\";s:6:\"module\";s:3:\"ref\";s:11:\"systemevent\";s:6:\"entity\";i:1;s:4:\"date\";i:1521194244;}',12,1,0,'2018-03-16 13:57:24','Alice Adminson',''),(22,'2018-03-16 09:59:31','PAYMENT_CUSTOMER_CREATE',10.00000000,'9beb9e3ba04582d441b49f176f995900c16572c789bcf48a1c9f285a74be76c8','86813eb2563252c0e270baaf1fffade82475fe51af5f88d14613005fd0e07783','payment',38,'PAY1803-0004','2018-03-16 12:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:1:\"1\";s:7:\"idprof3\";s:1:\"1\";s:7:\"idprof4\";s:1:\"1\";s:7:\"idprof5\";s:1:\"1\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:9:\"FR1234567\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";s:4:\"name\";s:12:\"MyBigCompany\";}s:3:\"ref\";s:12:\"PAY1803-0004\";s:4:\"date\";i:1521187200;s:9:\"type_code\";s:3:\"CHQ\";s:11:\"payment_num\";N;s:4:\"note\";s:0:\"\";s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:2:\"10\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";s:4:\"name\";s:10:\"Indian SAS\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1453147200;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:11:\"20.00000000\";s:9:\"total_tva\";s:10:\"1.80000000\";s:9:\"total_ttc\";s:11:\"23.60000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA1601-0024\";s:11:\"note_public\";N;}}}s:6:\"amount\";i:10;}',12,1,0,'2018-03-16 13:59:31','Alice Adminson',''),(23,'2019-09-26 15:33:37','BILL_VALIDATE',43.58000000,'6a1e049c00f51afa6eaca799e6281bd8abfdaa12bdf42ee2a002b0bec588a2a5','451b12ea66d25259c9c1df9993a902affe124c9f27c97093613cf7184fe388aa','facture',218,'FA1909-0025','2019-09-26 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1569448800;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";d:42.5;s:9:\"total_tva\";d:1.08;s:9:\"total_ttc\";d:43.58;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:5:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";s:9:\"DOLICLOUD\";s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:10:\"9.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:10:\"9.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"9.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"9.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:2;O:8:\"stdClass\":17:{s:3:\"ref\";s:9:\"DOLIDROID\";s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:10:\"5.50000000\";s:23:\"multicurrency_total_tva\";s:10:\"1.08000000\";s:23:\"multicurrency_total_ttc\";s:10:\"6.58000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:6:\"19.600\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"5.50000000\";s:9:\"total_tva\";s:10:\"1.08000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"6.58000000\";s:9:\"info_bits\";s:1:\"0\";}i:3;O:8:\"stdClass\":17:{s:3:\"ref\";s:9:\"DOLICLOUD\";s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:10:\"9.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:10:\"9.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"9.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"9.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:4;O:8:\"stdClass\":17:{s:3:\"ref\";s:9:\"DOLICLOUD\";s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:10:\"9.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:10:\"9.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"9.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"9.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:5;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"10.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"10.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"10.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"10.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA1909-0025\";s:11:\"note_public\";N;}',12,1,0,'2019-09-26 17:33:37','Alice Adminson',''),(24,'2019-10-04 08:27:00','BILL_VALIDATE',5.63000000,'aa16d46e6ea7376fe0f91a4aeb7b1d534ed351fae071ded64c393e61269c4c35','316e03ffb8327d837c8601e7dbafc91509581b0be9449a89827a14e6cfa2688a','facture',150,'FA6801-0010','2018-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1516316400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";d:5;s:9:\"total_tva\";d:0.63;s:9:\"total_ttc\";d:5.63;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";s:7:\"PEARPIE\";s:18:\"multicurrency_code\";N;s:22:\"multicurrency_total_ht\";s:10:\"5.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.63000000\";s:23:\"multicurrency_total_ttc\";s:10:\"5.63000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:6:\"12.500\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"5.00000000\";s:9:\"total_tva\";s:10:\"0.63000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"5.63000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA6801-0010\";s:11:\"note_public\";N;}',12,1,0,'2019-10-04 10:27:00','Alice Adminson',''),(25,'2019-10-04 08:28:14','PAYMENT_CUSTOMER_CREATE',5.63000000,'fa5c9b4bb975af8401744390d47e62218a7ec47a2e96c60f5e58d7f6be38dc44','9bfe069dc130dd71c31f914ff0afa7835fd40932790ac88be0005638342ccb87','payment',39,'PAY1801-0005','2018-01-19 12:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY1801-0005\";s:4:\"date\";i:1516359600;s:9:\"type_code\";s:3:\"LIQ\";s:11:\"payment_num\";N;s:4:\"note\";s:0:\"\";s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:4:\"5.63\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1516316400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:10:\"5.00000000\";s:9:\"total_tva\";s:10:\"0.63000000\";s:9:\"total_ttc\";s:10:\"5.63000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA6801-0010\";s:11:\"note_public\";N;}}}s:6:\"amount\";d:5.63;}',12,1,0,'2019-10-04 10:28:14','Alice Adminson',''),(26,'2019-12-22 19:01:48','CASHCONTROL_VALIDATE',400.00000000,'bb14150a5ea65d97f9d22f6bc3d3d357ccfb2aa681f2ecbcc81a9d870260c58c','7b03131558731b2e7b4000189214b132f4323621c596d4418cfeba233a085e83','cashcontrol',1,'1','2019-12-22 23:01:02','O:8:\"stdClass\":37:{s:9:\"mycompany\";O:8:\"stdClass\":26:{s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:0;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:0;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;}s:7:\"element\";s:11:\"cashcontrol\";s:2:\"id\";i:1;s:7:\"opening\";d:-324.29;s:6:\"status\";i:1;s:10:\"year_close\";i:2019;s:11:\"month_close\";i:11;s:9:\"day_close\";N;s:9:\"posmodule\";s:7:\"takepos\";s:9:\"posnumber\";s:1:\"1\";s:4:\"cash\";d:400;s:6:\"cheque\";d:0;s:4:\"card\";d:0;s:10:\"date_valid\";i:1577041308;s:13:\"date_creation\";i:1577041262;s:17:\"date_modification\";N;s:10:\"import_key\";N;s:13:\"array_options\";a:0:{}s:6:\"canvas\";N;s:7:\"project\";N;s:10:\"fk_project\";N;s:10:\"thirdparty\";N;s:4:\"user\";N;s:3:\"ref\";s:1:\"1\";s:7:\"ref_ext\";N;s:6:\"statut\";N;s:10:\"fk_account\";N;s:11:\"note_public\";N;s:12:\"note_private\";N;s:4:\"note\";N;s:8:\"comments\";a:0:{}s:15:\"date_validation\";N;s:16:\"next_prev_filter\";N;s:6:\"entity\";i:1;s:5:\"label\";N;s:3:\"tms\";i:1577030462;s:13:\"fk_user_valid\";s:2:\"12\";}',12,1,0,'2019-12-22 23:01:48','Alice Adminson',''),(34,'2020-01-10 00:42:47','PAYMENT_VARIOUS_CREATE',10.00000000,'e20ec32652d7564cdca915e95528b68bd3b770b82defe64ead1af3f6dc6bc150','25514deeca716e41c02699d9466fc640f4b7da0a0c953637b542c555f9634f9b','payment_various',4,'4','2020-01-10 12:00:00','O:8:\"stdClass\":7:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";i:4;s:4:\"date\";i:1578643200;s:9:\"type_code\";s:3:\"VIR\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";s:0:\"\";s:6:\"amount\";i:10;}',12,1,0,'2020-01-10 04:42:47','Alice Adminson',''),(35,'2020-01-10 01:08:37','PAYMENT_VARIOUS_MODIFY',10.00000000,'94bd3491e8e553e6e633cd4a40c8c0ef3a6af0bd60df1d8e768d3c8c2a37b79b','eeadf2ffc7bd611e3b739e8825307f9e9cb2d9dddbd9e16b1f092fa5d881a5ca','payment_various',4,'4','2020-01-10 00:00:00','O:8:\"stdClass\":7:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:1:\"4\";s:4:\"date\";i:1578600000;s:9:\"type_code\";s:3:\"VIR\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";s:0:\"\";s:6:\"amount\";d:10;}',12,1,0,'2020-01-10 05:08:37','Alice Adminson',''),(36,'2020-01-10 01:08:43','PAYMENT_VARIOUS_MODIFY',10.00000000,'02ecc274221832fcbf8f525ed64f1391415a29dded01022a5a4c51cfb2c5ad49','c274f2f609af56bd40b74000eaa2f6866a734feb0fc262ce3431ac9f91a754e2','payment_various',4,'4','2020-01-10 00:00:00','O:8:\"stdClass\":7:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:1:\"4\";s:4:\"date\";i:1578600000;s:9:\"type_code\";s:0:\"\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";s:0:\"\";s:6:\"amount\";d:10;}',12,1,0,'2020-01-10 05:08:43','Alice Adminson',''),(37,'2020-01-10 01:17:51','PAYMENT_VARIOUS_MODIFY',10.00000000,'214ad5673f893c2da41a8c87ccbcae92dccf17c9d4a13b3d04a9497d21bf68b8','ffbebb278eaa1c75f0cf5afdd05c8367887615a7329f2b3ab628b8f0da10f9d8','payment_various',4,'4','2020-01-10 00:00:00','O:8:\"stdClass\":7:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:1:\"4\";s:4:\"date\";i:1578600000;s:9:\"type_code\";s:0:\"\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";s:0:\"\";s:6:\"amount\";d:10;}',12,1,0,'2020-01-10 05:17:51','Alice Adminson',''),(38,'2020-01-16 01:22:16','BILL_VALIDATE',123.00000000,'aae0a1eb8b3da6686020252194f47ce82301fb604ee213ae120a2885197735d5','b414061da9abbd2dec7153a7d53978c177c5c5f55ed8ace177a02e46e7a74312','facture',221,'AC2001-0001','2020-01-16 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:16:\"Magic Food Store\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:22:\"65 holdywood boulevard\";s:3:\"zip\";s:6:\"123456\";s:4:\"town\";s:7:\"BigTown\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";s:4:\"0101\";s:5:\"email\";s:18:\"myemail@domain.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:10:\"10/10/2010\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1301-0008\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"ES\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579129200;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:123;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:123;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:12:\"123.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:12:\"123.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:12:\"123.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:12:\"123.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0001\";s:11:\"note_public\";N;}',12,1,0,'2020-01-16 02:22:16','Alice Adminson',''),(39,'2020-01-16 01:33:27','BILL_VALIDATE',20.50000000,'777eb88a0b91c6d376881534a7c84a9b9ee5a6d7efedbae3b0c00d7e36bacba9','b78e5b5909c49c575142b429f2d09abb2d19c5545f815a1cabe0f2ed80ded6e4','facture',224,'AC2001-0002','2020-01-16 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:16:\"Magic Food Store\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:22:\"65 holdywood boulevard\";s:3:\"zip\";s:6:\"123456\";s:4:\"town\";s:7:\"BigTown\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";s:4:\"0101\";s:5:\"email\";s:18:\"myemail@domain.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:10:\"10/10/2010\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1301-0008\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"ES\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579129200;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:20.5;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:20.5;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"20.50000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"20.50000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"20.50000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"20.50000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0002\";s:11:\"note_public\";N;}',12,1,0,'2020-01-16 02:33:27','Alice Adminson',''),(40,'2020-01-16 01:36:48','PAYMENT_CUSTOMER_CREATE',20.50000000,'cb03ceef89e1630e5a3ba8b3b1ca6c77e42b97fc2884a661c04e9e5c8b3afa1e','18bed0f0566b20ffa32c49c901cfc8b46485ef2172b22c676cef07ce8bd2d90b','payment',40,'PAY2001-0006','2020-01-16 12:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY2001-0006\";s:4:\"date\";i:1579172400;s:9:\"type_code\";s:3:\"VIR\";s:11:\"payment_num\";N;s:4:\"note\";s:0:\"\";s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:4:\"20.5\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:16:\"Magic Food Store\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:22:\"65 holdywood boulevard\";s:3:\"zip\";s:6:\"123456\";s:4:\"town\";s:7:\"BigTown\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";s:4:\"0101\";s:5:\"email\";s:18:\"myemail@domain.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:10:\"10/10/2010\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1301-0008\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"ES\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1579129200;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";s:11:\"20.50000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"20.50000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"AC2001-0002\";s:11:\"note_public\";N;}}}s:6:\"amount\";d:20.5;}',12,1,0,'2020-01-16 02:36:48','Alice Adminson',''),(41,'2020-01-19 13:51:43','BILL_VALIDATE',239.20000000,'7f38eaf315003f652b72fd27e55e71010a5ed0339086aa100b9a91a6045bb06f','26d074106c5f096ea1795ce7ed399cda6c2b2d5ac78dd9c2e152a0a0aa6ef47b','facture',227,'AC2001-0003','2020-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579388400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:200;s:9:\"total_tva\";d:39.2;s:9:\"total_ttc\";d:239.2;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:12:\"200.00000000\";s:23:\"multicurrency_total_tva\";s:11:\"39.20000000\";s:23:\"multicurrency_total_ttc\";s:12:\"239.20000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:6:\"19.600\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:12:\"200.00000000\";s:9:\"total_tva\";s:11:\"39.20000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:12:\"239.20000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0003\";s:11:\"note_public\";N;}',12,1,0,'2020-01-19 14:51:43','Alice Adminson',''),(42,'2020-01-19 14:01:26','BILL_VALIDATE',50.54000000,'107572ffe2f1ccf1ee4fe7b39c5a4ed40a485c1d37c926fbff8a0e420396d641','352ac5e380c996d7bff798c1369f8a85e86cc98a2864e278cbe0cb6b309c12a5','facture',228,'AC2001-0004','2020-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579388400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:48.6;s:9:\"total_tva\";d:1.94;s:9:\"total_ttc\";d:50.54;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:2:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"2.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"52.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"2.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"52.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:2;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"-1.40000000\";s:23:\"multicurrency_total_tva\";s:11:\"-0.06000000\";s:23:\"multicurrency_total_ttc\";s:11:\"-1.46000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"-1.40000000\";s:9:\"total_tva\";s:11:\"-0.06000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"-1.46000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0004\";s:11:\"note_public\";N;}',12,1,0,'2020-01-19 15:01:26','Alice Adminson',''),(43,'2020-01-19 14:04:53','BILL_VALIDATE',50.54000000,'795f9c5b741f360e3194ac8b3bb163c244b2761125f7507935baa44b319c624a','8cbb81e210f60d71b33a7fdcae0202721c2b4a8cdd59fe77ff2a8942839159b4','facture',228,'AC2001-0004','2020-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579388400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:48.6;s:9:\"total_tva\";d:1.94;s:9:\"total_ttc\";d:50.54;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:2:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"2.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"52.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"2.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"52.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:2;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"-1.40000000\";s:23:\"multicurrency_total_tva\";s:11:\"-0.06000000\";s:23:\"multicurrency_total_ttc\";s:11:\"-1.46000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"-1.40000000\";s:9:\"total_tva\";s:11:\"-0.06000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"-1.46000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0004\";s:11:\"note_public\";N;}',12,1,0,'2020-01-19 15:04:53','Alice Adminson',''),(44,'2020-01-19 14:13:07','BILL_VALIDATE',50.54000000,'0c5b79703d1db88579a1fdb74053596defebddb7a1e6d4c5c8b065729be10201','41669e482d1e5e7a58c132c2bf85bc75372cadb4d9b97047a98cc74a9d1fd767','facture',228,'AC2001-0004','2020-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579388400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:48.6;s:9:\"total_tva\";d:1.94;s:9:\"total_ttc\";d:50.54;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:2:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"2.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"52.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"2.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"52.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:2;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"-1.40000000\";s:23:\"multicurrency_total_tva\";s:11:\"-0.06000000\";s:23:\"multicurrency_total_ttc\";s:11:\"-1.46000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"-1.40000000\";s:9:\"total_tva\";s:11:\"-0.06000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"-1.46000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0004\";s:11:\"note_public\";N;}',12,1,0,'2020-01-19 15:13:07','Alice Adminson',''),(46,'2020-01-21 00:02:14','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'aacdc952cc25b2d4f90222cea6f684320c76477e55b87687397d82e70694c517','ce99e3278ebb1f5f2540a0d7205a4b1230e2e23c4bed48b567433b34786b88e4','subscription',2,'','2013-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579564934;s:5:\"dateh\";i:1374098400;s:5:\"datef\";i:1405548000;s:11:\"fk_adherent\";s:1:\"3\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:2;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2013\";}',12,1,0,'2020-01-21 01:02:14','Alice Adminson',''),(47,'2020-01-21 09:22:37','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'43a9804c627e78b20c7842a563099892a2d464b207f96bb393886f0b0ea52b4a','c6befc858191e428330c0054328f84d09f7be0f5603fb5b15e3a59980bb8e6eb','subscription',3,'','2017-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579598557;s:5:\"dateh\";i:1500328800;s:5:\"datef\";i:1531778400;s:11:\"fk_adherent\";s:1:\"4\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:3;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2017\";}',12,1,0,'2020-01-21 10:22:37','Alice Adminson',''),(48,'2020-01-21 09:23:17','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'d44357a1d55ffedd8f24690cd3c8aa43f9bfd33aa362ad558fd486b3b7f62a50','7c32d13e68bb245ab06b8e11efa5ed9e5fdb15650265dc80d5cb00d4674c134d','subscription',4,'','2017-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579598597;s:5:\"dateh\";i:1500328800;s:5:\"datef\";i:1531778400;s:11:\"fk_adherent\";s:1:\"2\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:4;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2017\";}',12,1,0,'2020-01-21 10:23:17','Alice Adminson',''),(49,'2020-01-21 09:23:17','BILL_VALIDATE',50.00000000,'30d0b37723f3cd2fce6afefd56cbdeb90f7cdee0e898e6ebaa411d84d3123ca0','e0301b9c4da11aa095a90cd9989b9fb6d0c635263cb2a8998b4ba57b60751d11','facture',229,'FA1707-0026','2017-07-18 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1500328800;s:10:\"ref_client\";s:0:\"\";s:4:\"type\";i:0;s:8:\"total_ht\";d:50;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:50;s:12:\"revenuestamp\";N;s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"50.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA1707-0026\";s:11:\"note_public\";s:0:\"\";}',12,1,0,'2020-01-21 10:23:17','Alice Adminson',''),(50,'2020-01-21 09:23:17','PAYMENT_CUSTOMER_CREATE',50.00000000,'41e6e00dfd2b96c3d9056489f22241959407ad0282405d37ada32da919e2d744','625ed1ef1ab9edddabc0b1588542eb6eac30ac9224e75812dabcbdfa0211b918','payment',41,'PAY2001-0007','2020-01-21 00:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY2001-0007\";s:4:\"date\";i:1579561200;s:9:\"type_code\";s:3:\"CHQ\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";N;s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:2:\"50\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1500328800;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA1707-0026\";s:11:\"note_public\";N;}}}s:6:\"amount\";i:50;}',12,1,0,'2020-01-21 10:23:17','Alice Adminson',''),(51,'2020-01-21 09:23:28','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'b24dfe36f8a3e5971898dd4fcfc61d775d4f0937169f44986bc9478d189e8e60','6160f4fb0fe73ce769a03f9d5460db7051602796090b9e44b51c6eadbd63c309','subscription',5,'','2018-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579598608;s:5:\"dateh\";i:1531864800;s:5:\"datef\";i:1563314400;s:11:\"fk_adherent\";s:1:\"2\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:5;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2018\";}',12,1,0,'2020-01-21 10:23:28','Alice Adminson',''),(52,'2020-01-21 09:23:28','BILL_VALIDATE',50.00000000,'a6ba6c4518b94977daa8a65b6e9063e81b37563037455ee4608724674c53ea01','3724c09a72bbaab46bdde59c79ffd5d439ffb43f2a509c49ebe05aa9acdcda7a','facture',230,'FA1807-0027','2018-07-18 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1531864800;s:10:\"ref_client\";s:0:\"\";s:4:\"type\";i:0;s:8:\"total_ht\";d:50;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:50;s:12:\"revenuestamp\";N;s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"50.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA1807-0027\";s:11:\"note_public\";s:0:\"\";}',12,1,0,'2020-01-21 10:23:28','Alice Adminson',''),(53,'2020-01-21 09:23:28','PAYMENT_CUSTOMER_CREATE',50.00000000,'54bbe038c35a0b1f63cccfbd89ce3232fc5dff8a56e7ff33bffebb9f412827bc','444449d4566c78f70a64b92d0008e9ddc933be75326cebdf5d41c4a94acdddc4','payment',42,'PAY2001-0008','2020-01-21 00:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY2001-0008\";s:4:\"date\";i:1579561200;s:9:\"type_code\";s:3:\"CHQ\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";N;s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:2:\"50\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1531864800;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA1807-0027\";s:11:\"note_public\";N;}}}s:6:\"amount\";i:50;}',12,1,0,'2020-01-21 10:23:28','Alice Adminson',''),(54,'2020-01-21 09:23:49','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'c4b9d402ebf74ae10353550d9ef1ce08c899b6533bdc5434fa105599da3e28ce','4642f26ec597360d7616ed0d925080970614232397fc17022922eecad2e727c9','subscription',6,'','2019-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579598629;s:5:\"dateh\";i:1563400800;s:5:\"datef\";i:1594936800;s:11:\"fk_adherent\";s:1:\"2\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:6;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2019\";}',12,1,0,'2020-01-21 10:23:49','Alice Adminson',''),(55,'2020-01-21 09:23:49','BILL_VALIDATE',50.00000000,'3e7b2c3b0b26c1982a3f8205b48a68756d81cd5bb673e1d2c7c09ce12c2086b9','ca332254195c3a59ee8c2ed0c60aec16a4229e83f5138f69747e65136ad370fa','facture',231,'FA1907-0028','2019-07-18 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1563400800;s:10:\"ref_client\";s:0:\"\";s:4:\"type\";i:0;s:8:\"total_ht\";d:50;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:50;s:12:\"revenuestamp\";N;s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"50.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA1907-0028\";s:11:\"note_public\";s:0:\"\";}',12,1,0,'2020-01-21 10:23:49','Alice Adminson',''),(56,'2020-01-21 09:23:49','PAYMENT_CUSTOMER_CREATE',50.00000000,'87cab3c0d2443145bb01b7364b78917756b2bf9b7908355b1a3258c28ecf1400','966571aa0fe244a6e762172fff34c03610ba4066f6f95369f514076c97975b6b','payment',43,'PAY2001-0009','2020-01-21 00:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY2001-0009\";s:4:\"date\";i:1579561200;s:9:\"type_code\";s:2:\"CB\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";N;s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:2:\"50\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1563400800;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA1907-0028\";s:11:\"note_public\";N;}}}s:6:\"amount\";i:50;}',12,1,0,'2020-01-21 10:23:49','Alice Adminson',''),(57,'2020-01-21 09:33:28','MODULE_RESET',0.00000000,'0000000000','d8134616ec977d8204a6856269ccfc799ea7eccc80074ac62350a5cdee3b070b','module',1,'systemevent','2020-01-21 10:33:28','O:8:\"stdClass\":6:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:2:\"id\";i:1;s:7:\"element\";s:6:\"module\";s:3:\"ref\";s:11:\"systemevent\";s:6:\"entity\";i:1;s:4:\"date\";i:1579599208;}',12,1,0,'2020-01-21 10:33:28','Alice Adminson',''),(58,'2020-12-10 12:31:17','MODULE_SET',0.00000000,'1f651fa26c45e58ae8303d336a35eddef44c398d225744ad49f803355cdadb43','dce54650a53002c6dc3dbffad2600c13ce08d19b5fa23811b8d2a31d75ac6a60','module',1,'systemevent','2020-12-10 13:31:17','O:8:\"stdClass\":6:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:2:\"id\";i:1;s:7:\"element\";s:6:\"module\";s:3:\"ref\";s:11:\"systemevent\";s:6:\"entity\";s:1:\"1\";s:4:\"date\";i:1607603477;}',12,1,0,'2020-12-10 13:31:17','Alice Adminson','');
 /*!40000 ALTER TABLE `llx_blockedlog` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1089,9 +1442,10 @@ CREATE TABLE `llx_bom_bom` (
   `fk_user_valid` int(11) DEFAULT NULL,
   `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
   `status` int(11) NOT NULL,
-  `duration` double(8,4) DEFAULT NULL,
+  `duration` double(24,8) DEFAULT NULL,
   `fk_warehouse` int(11) DEFAULT NULL,
   `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `bomtype` int(11) DEFAULT 0,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_bom_bom_ref` (`ref`,`entity`),
   KEY `idx_bom_bom_rowid` (`rowid`),
@@ -1109,7 +1463,7 @@ CREATE TABLE `llx_bom_bom` (
 
 LOCK TABLES `llx_bom_bom` WRITE;
 /*!40000 ALTER TABLE `llx_bom_bom` DISABLE KEYS */;
-INSERT INTO `llx_bom_bom` VALUES (6,1,'BOM1911-0001','BOM For the Home Apple Pie',NULL,NULL,NULL,4,1.00000000,1.0000,'2019-11-28 18:17:12','2020-01-08 15:41:49','2020-01-08 19:41:49',12,12,12,NULL,1,NULL,NULL,'generic_bom_odt:/home/ldestailleur/git/dolibarr_11.0/documents/doctemplates/boms/template_bom.odt');
+INSERT INTO `llx_bom_bom` VALUES (6,1,'BOM1911-0001','BOM For the Home Apple Pie',NULL,NULL,NULL,4,1.00000000,1.0000,'2019-11-28 18:17:12','2020-01-08 15:41:49','2020-01-08 19:41:49',12,12,12,NULL,1,NULL,NULL,'generic_bom_odt:/home/ldestailleur/git/dolibarr_11.0/documents/doctemplates/boms/template_bom.odt',0);
 /*!40000 ALTER TABLE `llx_bom_bom` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1125,7 +1479,8 @@ CREATE TABLE `llx_bom_bom_extrafields` (
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_object` int(11) NOT NULL,
   `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
+  PRIMARY KEY (`rowid`),
+  KEY `idx_bom_bom_extrafields_fk_object` (`fk_object`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -1317,7 +1672,7 @@ CREATE TABLE `llx_boxes_def` (
   `note` varchar(130) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_boxes_def` (`file`,`entity`,`note`)
-) ENGINE=InnoDB AUTO_INCREMENT=446 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=448 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1326,7 +1681,7 @@ CREATE TABLE `llx_boxes_def` (
 
 LOCK TABLES `llx_boxes_def` WRITE;
 /*!40000 ALTER TABLE `llx_boxes_def` DISABLE KEYS */;
-INSERT INTO `llx_boxes_def` VALUES (323,'box_actions.php',2,'2015-03-13 15:29:19',NULL),(324,'box_clients.php',2,'2015-03-13 20:21:35',NULL),(325,'box_prospect.php',2,'2015-03-13 20:21:35',NULL),(326,'box_contacts.php',2,'2015-03-13 20:21:35',NULL),(327,'box_activity.php',2,'2015-03-13 20:21:35','(WarningUsingThisBoxSlowDown)'),(328,'box_propales.php',2,'2015-03-13 20:32:38',NULL),(329,'box_comptes.php',2,'2015-03-13 20:33:09',NULL),(330,'box_factures_imp.php',2,'2015-03-13 20:33:09',NULL),(331,'box_factures.php',2,'2015-03-13 20:33:09',NULL),(332,'box_produits.php',2,'2015-03-13 20:33:09',NULL),(333,'box_produits_alerte_stock.php',2,'2015-03-13 20:33:09',NULL),(347,'box_clients.php',1,'2017-11-15 22:05:57',NULL),(348,'box_prospect.php',1,'2017-11-15 22:05:57',NULL),(349,'box_contacts.php',1,'2017-11-15 22:05:57',NULL),(350,'box_activity.php',1,'2017-11-15 22:05:57','(WarningUsingThisBoxSlowDown)'),(374,'box_services_contracts.php',1,'2017-11-15 22:38:37',NULL),(377,'box_project.php',1,'2017-11-15 22:38:44',NULL),(378,'box_task.php',1,'2017-11-15 22:38:44',NULL),(388,'box_contracts.php',1,'2017-11-15 22:39:52',NULL),(389,'box_services_expired.php',1,'2017-11-15 22:39:52',NULL),(390,'box_ficheinter.php',1,'2017-11-15 22:39:56',NULL),(392,'box_graph_propales_permonth.php',1,'2017-11-15 22:41:47',NULL),(393,'box_propales.php',1,'2017-11-15 22:41:47',NULL),(396,'box_graph_product_distribution.php',1,'2017-11-15 22:41:47',NULL),(403,'box_goodcustomers.php',1,'2018-07-30 11:13:20','(WarningUsingThisBoxSlowDown)'),(404,'box_external_rss.php',1,'2018-07-30 11:15:25','1 (Dolibarr.org News)'),(409,'box_produits.php',1,'2018-07-30 13:38:11',NULL),(410,'box_produits_alerte_stock.php',1,'2018-07-30 13:38:11',NULL),(411,'box_commandes.php',1,'2018-07-30 13:38:11',NULL),(412,'box_graph_orders_permonth.php',1,'2018-07-30 13:38:11',NULL),(413,'box_graph_invoices_supplier_permonth.php',1,'2018-07-30 13:38:11',NULL),(414,'box_graph_orders_supplier_permonth.php',1,'2018-07-30 13:38:11',NULL),(415,'box_fournisseurs.php',1,'2018-07-30 13:38:11',NULL),(416,'box_factures_fourn_imp.php',1,'2018-07-30 13:38:11',NULL),(417,'box_factures_fourn.php',1,'2018-07-30 13:38:11',NULL),(418,'box_supplier_orders.php',1,'2018-07-30 13:38:11',NULL),(419,'box_actions.php',1,'2018-07-30 15:42:32',NULL),(424,'box_factures_imp.php',1,'2017-02-07 18:56:12',NULL),(425,'box_factures.php',1,'2017-02-07 18:56:12',NULL),(426,'box_graph_invoices_permonth.php',1,'2017-02-07 18:56:12',NULL),(427,'box_comptes.php',1,'2017-02-07 18:56:12',NULL),(429,'box_lastlogin.php',1,'2017-08-27 13:29:14',NULL),(430,'box_bookmarks.php',1,'2018-01-19 11:27:34',NULL),(431,'box_members.php',1,'2018-01-19 11:27:56',NULL),(432,'box_birthdays.php',1,'2019-06-05 08:45:40',NULL),(433,'box_last_ticket',1,'2019-06-05 09:15:29',NULL),(434,'box_last_modified_ticket',1,'2019-06-05 09:15:29',NULL),(436,'box_accountancy_last_manual_entries.php',1,'2019-11-28 11:52:58',NULL),(437,'box_accountancy_suspense_account.php',1,'2019-11-28 11:52:58',NULL),(438,'box_supplier_orders_awaiting_reception.php',1,'2019-11-28 11:52:59',NULL),(439,'box_mos.php',1,'2019-11-29 08:57:42',NULL),(445,'box_shipments.php',1,'2020-01-13 14:38:20',NULL);
+INSERT INTO `llx_boxes_def` VALUES (323,'box_actions.php',2,'2015-03-13 15:29:19',NULL),(324,'box_clients.php',2,'2015-03-13 20:21:35',NULL),(325,'box_prospect.php',2,'2015-03-13 20:21:35',NULL),(326,'box_contacts.php',2,'2015-03-13 20:21:35',NULL),(327,'box_activity.php',2,'2015-03-13 20:21:35','(WarningUsingThisBoxSlowDown)'),(328,'box_propales.php',2,'2015-03-13 20:32:38',NULL),(329,'box_comptes.php',2,'2015-03-13 20:33:09',NULL),(330,'box_factures_imp.php',2,'2015-03-13 20:33:09',NULL),(331,'box_factures.php',2,'2015-03-13 20:33:09',NULL),(332,'box_produits.php',2,'2015-03-13 20:33:09',NULL),(333,'box_produits_alerte_stock.php',2,'2015-03-13 20:33:09',NULL),(347,'box_clients.php',1,'2017-11-15 22:05:57',NULL),(348,'box_prospect.php',1,'2017-11-15 22:05:57',NULL),(349,'box_contacts.php',1,'2017-11-15 22:05:57',NULL),(350,'box_activity.php',1,'2017-11-15 22:05:57','(WarningUsingThisBoxSlowDown)'),(374,'box_services_contracts.php',1,'2017-11-15 22:38:37',NULL),(377,'box_project.php',1,'2017-11-15 22:38:44',NULL),(378,'box_task.php',1,'2017-11-15 22:38:44',NULL),(388,'box_contracts.php',1,'2017-11-15 22:39:52',NULL),(389,'box_services_expired.php',1,'2017-11-15 22:39:52',NULL),(390,'box_ficheinter.php',1,'2017-11-15 22:39:56',NULL),(392,'box_graph_propales_permonth.php',1,'2017-11-15 22:41:47',NULL),(393,'box_propales.php',1,'2017-11-15 22:41:47',NULL),(396,'box_graph_product_distribution.php',1,'2017-11-15 22:41:47',NULL),(403,'box_goodcustomers.php',1,'2018-07-30 11:13:20','(WarningUsingThisBoxSlowDown)'),(404,'box_external_rss.php',1,'2018-07-30 11:15:25','1 (Dolibarr.org News)'),(409,'box_produits.php',1,'2018-07-30 13:38:11',NULL),(410,'box_produits_alerte_stock.php',1,'2018-07-30 13:38:11',NULL),(411,'box_commandes.php',1,'2018-07-30 13:38:11',NULL),(412,'box_graph_orders_permonth.php',1,'2018-07-30 13:38:11',NULL),(413,'box_graph_invoices_supplier_permonth.php',1,'2018-07-30 13:38:11',NULL),(414,'box_graph_orders_supplier_permonth.php',1,'2018-07-30 13:38:11',NULL),(415,'box_fournisseurs.php',1,'2018-07-30 13:38:11',NULL),(416,'box_factures_fourn_imp.php',1,'2018-07-30 13:38:11',NULL),(417,'box_factures_fourn.php',1,'2018-07-30 13:38:11',NULL),(418,'box_supplier_orders.php',1,'2018-07-30 13:38:11',NULL),(419,'box_actions.php',1,'2018-07-30 15:42:32',NULL),(424,'box_factures_imp.php',1,'2017-02-07 18:56:12',NULL),(425,'box_factures.php',1,'2017-02-07 18:56:12',NULL),(426,'box_graph_invoices_permonth.php',1,'2017-02-07 18:56:12',NULL),(427,'box_comptes.php',1,'2017-02-07 18:56:12',NULL),(429,'box_lastlogin.php',1,'2017-08-27 13:29:14',NULL),(430,'box_bookmarks.php',1,'2018-01-19 11:27:34',NULL),(431,'box_members.php',1,'2018-01-19 11:27:56',NULL),(432,'box_birthdays.php',1,'2019-06-05 08:45:40',NULL),(433,'box_last_ticket',1,'2019-06-05 09:15:29',NULL),(434,'box_last_modified_ticket',1,'2019-06-05 09:15:29',NULL),(436,'box_accountancy_last_manual_entries.php',1,'2019-11-28 11:52:58',NULL),(437,'box_accountancy_suspense_account.php',1,'2019-11-28 11:52:58',NULL),(438,'box_supplier_orders_awaiting_reception.php',1,'2019-11-28 11:52:59',NULL),(439,'box_mos.php',1,'2019-11-29 08:57:42',NULL),(445,'box_shipments.php',1,'2020-01-13 14:38:20',NULL),(446,'box_funnel_of_prospection.php',1,'2020-12-10 12:24:40',NULL),(447,'box_customers_outstanding_bill_reached.php',1,'2020-12-10 12:24:40',NULL);
 /*!40000 ALTER TABLE `llx_boxes_def` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1438,7 +1793,7 @@ DROP TABLE IF EXISTS `llx_c_action_trigger`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_action_trigger` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
   `label` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
   `description` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `elementtype` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
@@ -1446,7 +1801,7 @@ CREATE TABLE `llx_c_action_trigger` (
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_action_trigger_code` (`code`),
   KEY `idx_action_trigger_rang` (`rang`)
-) ENGINE=InnoDB AUTO_INCREMENT=365 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=376 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1455,7 +1810,7 @@ CREATE TABLE `llx_c_action_trigger` (
 
 LOCK TABLES `llx_c_action_trigger` WRITE;
 /*!40000 ALTER TABLE `llx_c_action_trigger` DISABLE KEYS */;
-INSERT INTO `llx_c_action_trigger` VALUES (131,'COMPANY_SENTBYMAIL','Mails sent from third party card','Executed when you send email from third party card','societe',1),(132,'COMPANY_CREATE','Third party created','Executed when a third party is created','societe',1),(133,'PROPAL_VALIDATE','Customer proposal validated','Executed when a commercial proposal is validated','propal',2),(134,'PROPAL_SENTBYMAIL','Commercial proposal sent by mail','Executed when a commercial proposal is sent by mail','propal',3),(135,'ORDER_VALIDATE','Customer order validate','Executed when a customer order is validated','commande',4),(136,'ORDER_CLOSE','Customer order classify delivered','Executed when a customer order is set delivered','commande',5),(137,'ORDER_CLASSIFY_BILLED','Customer order classify billed','Executed when a customer order is set to billed','commande',5),(138,'ORDER_CANCEL','Customer order canceled','Executed when a customer order is canceled','commande',5),(139,'ORDER_SENTBYMAIL','Customer order sent by mail','Executed when a customer order is sent by mail ','commande',5),(140,'BILL_VALIDATE','Customer invoice validated','Executed when a customer invoice is approved','facture',6),(141,'BILL_PAYED','Customer invoice payed','Executed when a customer invoice is payed','facture',7),(142,'BILL_CANCEL','Customer invoice canceled','Executed when a customer invoice is conceled','facture',8),(143,'BILL_SENTBYMAIL','Customer invoice sent by mail','Executed when a customer invoice is sent by mail','facture',9),(144,'BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',10),(145,'ORDER_SUPPLIER_VALIDATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11),(146,'ORDER_SUPPLIER_APPROVE','Supplier order request approved','Executed when a supplier order is approved','order_supplier',12),(147,'ORDER_SUPPLIER_REFUSE','Supplier order request refused','Executed when a supplier order is refused','order_supplier',13),(148,'ORDER_SUPPLIER_SENTBYMAIL','Supplier order sent by mail','Executed when a supplier order is sent by mail','order_supplier',14),(149,'BILL_SUPPLIER_VALIDATE','Supplier invoice validated','Executed when a supplier invoice is validated','invoice_supplier',15),(150,'BILL_SUPPLIER_PAYED','Supplier invoice payed','Executed when a supplier invoice is payed','invoice_supplier',16),(151,'BILL_SUPPLIER_SENTBYMAIL','Supplier invoice sent by mail','Executed when a supplier invoice is sent by mail','invoice_supplier',17),(152,'BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',17),(153,'CONTRACT_VALIDATE','Contract validated','Executed when a contract is validated','contrat',18),(154,'SHIPPING_VALIDATE','Shipping validated','Executed when a shipping is validated','shipping',20),(155,'SHIPPING_SENTBYMAIL','Shipping sent by mail','Executed when a shipping is sent by mail','shipping',21),(156,'MEMBER_VALIDATE','Member validated','Executed when a member is validated','member',22),(158,'MEMBER_RESILIATE','Member resiliated','Executed when a member is resiliated','member',24),(159,'MEMBER_MODIFY','Member modified','Executed when a member is modified','member',24),(160,'MEMBER_DELETE','Member deleted','Executed when a member is deleted','member',25),(161,'FICHINTER_VALIDATE','Intervention validated','Executed when a intervention is validated','ficheinter',19),(162,'FICHINTER_CLASSIFY_BILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19),(163,'FICHINTER_CLASSIFY_UNBILLED','Intervention set unbilled','Executed when a intervention is set to unbilled (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19),(164,'FICHINTER_REOPEN','Intervention opened','Executed when a intervention is re-opened','ficheinter',19),(165,'FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',19),(166,'PROJECT_CREATE','Project creation','Executed when a project is created','project',140),(167,'PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',2),(168,'PROPAL_CLOSE_REFUSED','Customer proposal closed refused','Executed when a customer proposal is closed refused','propal',2),(169,'PROPAL_CLASSIFY_BILLED','Customer proposal set billed','Executed when a customer proposal is set to billed','propal',2),(170,'TASK_CREATE','Task created','Executed when a project task is created','project',35),(171,'TASK_MODIFY','Task modified','Executed when a project task is modified','project',36),(172,'TASK_DELETE','Task deleted','Executed when a project task is deleted','project',37),(173,'BILL_SUPPLIER_UNVALIDATE','Supplier invoice unvalidated','Executed when a supplier invoice status is set back to draft','invoice_supplier',15),(174,'PROJECT_MODIFY','Project modified','Executed when a project is modified','project',141),(175,'PROJECT_DELETE','Project deleted','Executed when a project is deleted','project',142),(176,'ORDER_SUPPLIER_CREATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11),(177,'ORDER_SUPPLIER_SUBMIT','Supplier order request submited','Executed when a supplier order is approved','order_supplier',12),(178,'ORDER_SUPPLIER_RECEIVE','Supplier order request received','Executed when a supplier order is received','order_supplier',12),(179,'ORDER_SUPPLIER_CLASSIFY_BILLED','Supplier order set billed','Executed when a supplier order is set as billed','order_supplier',14),(180,'PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',30),(181,'PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',30),(182,'PRODUCT_DELETE','Product or service deleted','Executed when a product or sevice is deleted','product',30),(183,'EXPENSE_REPORT_CREATE','Expense report created','Executed when an expense report is created','expense_report',201),(185,'EXPENSE_REPORT_VALIDATE','Expense report validated','Executed when an expense report is validated','expense_report',202),(186,'EXPENSE_REPORT_APPROVE','Expense report approved','Executed when an expense report is approved','expense_report',203),(187,'EXPENSE_REPORT_PAYED','Expense report billed','Executed when an expense report is set as billed','expense_report',204),(192,'HOLIDAY_CREATE','Leave request created','Executed when a leave request is created','holiday',221),(193,'HOLIDAY_VALIDATE','Leave request validated','Executed when a leave request is validated','holiday',222),(194,'HOLIDAY_APPROVE','Leave request approved','Executed when a leave request is approved','holiday',223),(210,'MEMBER_SENTBYMAIL','Mails sent from member card','Executed when you send email from member card','member',23),(211,'CONTRACT_SENTBYMAIL','Contract sent by mail','Executed when a contract is sent by mail','contrat',18),(212,'PROPOSAL_SUPPLIER_VALIDATE','Price request validated','Executed when a commercial proposal is validated','proposal_supplier',10),(213,'PROPOSAL_SUPPLIER_SENTBYMAIL','Price request sent by mail','Executed when a commercial proposal is sent by mail','proposal_supplier',10),(214,'PROPOSAL_SUPPLIER_CLOSE_SIGNED','Price request closed signed','Executed when a customer proposal is closed signed','proposal_supplier',10),(215,'PROPOSAL_SUPPLIER_CLOSE_REFUSED','Price request closed refused','Executed when a customer proposal is closed refused','proposal_supplier',10),(216,'MEMBER_SUBSCRIPTION_CREATE','Member subscribtion recorded','Executed when a member subscribtion is deleted','member',24),(217,'MEMBER_SUBSCRIPTION_MODIFY','Member subscribtion modified','Executed when a member subscribtion is modified','member',24),(218,'MEMBER_SUBSCRIPTION_DELETE','Member subscribtion deleted','Executed when a member subscribtion is deleted','member',24),(225,'COMPANY_DELETE','Third party deleted','Executed when you delete third party','societe',1),(226,'PROPAL_DELETE','Customer proposal deleted','Executed when a customer proposal is deleted','propal',2),(227,'ORDER_DELETE','Customer order deleted','Executed when a customer order is deleted','commande',5),(228,'BILL_DELETE','Customer invoice deleted','Executed when a customer invoice is deleted','facture',9),(229,'PROPOSAL_SUPPLIER_DELETE','Price request deleted','Executed when a customer proposal delete','proposal_supplier',10),(230,'ORDER_SUPPLIER_DELETE','Supplier order deleted','Executed when a supplier order is deleted','order_supplier',14),(231,'BILL_SUPPLIER_DELETE','Supplier invoice deleted','Executed when a supplier invoice is deleted','invoice_supplier',17),(232,'CONTRACT_DELETE','Contract deleted','Executed when a contract is deleted','contrat',18),(233,'FICHINTER_DELETE','Intervention is deleted','Executed when a intervention is deleted','ficheinter',35),(234,'EXPENSE_DELETE','Expense report deleted','Executed when an expense report is deleted','expensereport',204),(249,'TICKET_CREATE','Ticket created','Executed when a ticket is created','ticket',161),(250,'TICKET_MODIFY','Ticket modified','Executed when a ticket is modified','ticket',163),(251,'TICKET_ASSIGNED','Ticket assigned','Executed when a ticket is assigned to another user','ticket',164),(252,'TICKET_CLOSE','Ticket closed','Executed when a ticket is closed','ticket',165),(253,'TICKET_SENTBYMAIL','Ticket message sent by email','Executed when a message is sent from the ticket record','ticket',166),(254,'TICKET_DELETE','Ticket deleted','Executed when a ticket is deleted','ticket',167),(261,'USER_SENTBYMAIL','Email sent','Executed when an email is sent from user card','user',300),(262,'BOM_VALIDATE','BOM validated','Executed when a BOM is validated','bom',650),(263,'BOM_UNVALIDATE','BOM unvalidated','Executed when a BOM is unvalidated','bom',651),(264,'BOM_CLOSE','BOM disabled','Executed when a BOM is disabled','bom',652),(265,'BOM_REOPEN','BOM reopen','Executed when a BOM is re-open','bom',653),(266,'BOM_DELETE','BOM deleted','Executed when a BOM deleted','bom',654),(351,'MRP_MO_VALIDATE','MO validated','Executed when a MO is validated','bom',660),(352,'MRP_MO_PRODUCED','MO produced','Executed when a MO is produced','bom',661),(353,'MRP_MO_DELETE','MO deleted','Executed when a MO is deleted','bom',662),(354,'MRP_MO_CANCEL','MO canceled','Executed when a MO is canceled','bom',663);
+INSERT INTO `llx_c_action_trigger` VALUES (131,'COMPANY_SENTBYMAIL','Mails sent from third party card','Executed when you send email from third party card','societe',1),(132,'COMPANY_CREATE','Third party created','Executed when a third party is created','societe',1),(133,'PROPAL_VALIDATE','Customer proposal validated','Executed when a commercial proposal is validated','propal',2),(134,'PROPAL_SENTBYMAIL','Commercial proposal sent by mail','Executed when a commercial proposal is sent by mail','propal',3),(135,'ORDER_VALIDATE','Customer order validate','Executed when a customer order is validated','commande',4),(136,'ORDER_CLOSE','Customer order classify delivered','Executed when a customer order is set delivered','commande',5),(137,'ORDER_CLASSIFY_BILLED','Customer order classify billed','Executed when a customer order is set to billed','commande',5),(138,'ORDER_CANCEL','Customer order canceled','Executed when a customer order is canceled','commande',5),(139,'ORDER_SENTBYMAIL','Customer order sent by mail','Executed when a customer order is sent by mail ','commande',5),(140,'BILL_VALIDATE','Customer invoice validated','Executed when a customer invoice is approved','facture',6),(141,'BILL_PAYED','Customer invoice payed','Executed when a customer invoice is payed','facture',7),(142,'BILL_CANCEL','Customer invoice canceled','Executed when a customer invoice is conceled','facture',8),(143,'BILL_SENTBYMAIL','Customer invoice sent by mail','Executed when a customer invoice is sent by mail','facture',9),(144,'BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',10),(145,'ORDER_SUPPLIER_VALIDATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11),(146,'ORDER_SUPPLIER_APPROVE','Supplier order request approved','Executed when a supplier order is approved','order_supplier',12),(147,'ORDER_SUPPLIER_REFUSE','Supplier order request refused','Executed when a supplier order is refused','order_supplier',13),(148,'ORDER_SUPPLIER_SENTBYMAIL','Supplier order sent by mail','Executed when a supplier order is sent by mail','order_supplier',14),(149,'BILL_SUPPLIER_VALIDATE','Supplier invoice validated','Executed when a supplier invoice is validated','invoice_supplier',15),(150,'BILL_SUPPLIER_PAYED','Supplier invoice payed','Executed when a supplier invoice is payed','invoice_supplier',16),(151,'BILL_SUPPLIER_SENTBYMAIL','Supplier invoice sent by mail','Executed when a supplier invoice is sent by mail','invoice_supplier',17),(152,'BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',17),(153,'CONTRACT_VALIDATE','Contract validated','Executed when a contract is validated','contrat',18),(154,'SHIPPING_VALIDATE','Shipping validated','Executed when a shipping is validated','shipping',20),(155,'SHIPPING_SENTBYMAIL','Shipping sent by mail','Executed when a shipping is sent by mail','shipping',21),(156,'MEMBER_VALIDATE','Member validated','Executed when a member is validated','member',22),(158,'MEMBER_RESILIATE','Member resiliated','Executed when a member is resiliated','member',24),(159,'MEMBER_MODIFY','Member modified','Executed when a member is modified','member',24),(160,'MEMBER_DELETE','Member deleted','Executed when a member is deleted','member',25),(161,'FICHINTER_VALIDATE','Intervention validated','Executed when a intervention is validated','ficheinter',19),(162,'FICHINTER_CLASSIFY_BILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19),(163,'FICHINTER_CLASSIFY_UNBILLED','Intervention set unbilled','Executed when a intervention is set to unbilled (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19),(164,'FICHINTER_REOPEN','Intervention opened','Executed when a intervention is re-opened','ficheinter',19),(165,'FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',19),(166,'PROJECT_CREATE','Project creation','Executed when a project is created','project',140),(167,'PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',2),(168,'PROPAL_CLOSE_REFUSED','Customer proposal closed refused','Executed when a customer proposal is closed refused','propal',2),(169,'PROPAL_CLASSIFY_BILLED','Customer proposal set billed','Executed when a customer proposal is set to billed','propal',2),(170,'TASK_CREATE','Task created','Executed when a project task is created','project',35),(171,'TASK_MODIFY','Task modified','Executed when a project task is modified','project',36),(172,'TASK_DELETE','Task deleted','Executed when a project task is deleted','project',37),(173,'BILL_SUPPLIER_UNVALIDATE','Supplier invoice unvalidated','Executed when a supplier invoice status is set back to draft','invoice_supplier',15),(174,'PROJECT_MODIFY','Project modified','Executed when a project is modified','project',141),(175,'PROJECT_DELETE','Project deleted','Executed when a project is deleted','project',142),(176,'ORDER_SUPPLIER_CREATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11),(177,'ORDER_SUPPLIER_SUBMIT','Supplier order request submited','Executed when a supplier order is approved','order_supplier',12),(178,'ORDER_SUPPLIER_RECEIVE','Supplier order request received','Executed when a supplier order is received','order_supplier',12),(179,'ORDER_SUPPLIER_CLASSIFY_BILLED','Supplier order set billed','Executed when a supplier order is set as billed','order_supplier',14),(180,'PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',30),(181,'PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',30),(182,'PRODUCT_DELETE','Product or service deleted','Executed when a product or sevice is deleted','product',30),(183,'EXPENSE_REPORT_CREATE','Expense report created','Executed when an expense report is created','expense_report',201),(185,'EXPENSE_REPORT_VALIDATE','Expense report validated','Executed when an expense report is validated','expense_report',202),(186,'EXPENSE_REPORT_APPROVE','Expense report approved','Executed when an expense report is approved','expense_report',203),(187,'EXPENSE_REPORT_PAYED','Expense report billed','Executed when an expense report is set as billed','expense_report',204),(192,'HOLIDAY_CREATE','Leave request created','Executed when a leave request is created','holiday',221),(193,'HOLIDAY_VALIDATE','Leave request validated','Executed when a leave request is validated','holiday',222),(194,'HOLIDAY_APPROVE','Leave request approved','Executed when a leave request is approved','holiday',223),(210,'MEMBER_SENTBYMAIL','Mails sent from member card','Executed when you send email from member card','member',23),(211,'CONTRACT_SENTBYMAIL','Contract sent by mail','Executed when a contract is sent by mail','contrat',18),(212,'PROPOSAL_SUPPLIER_VALIDATE','Price request validated','Executed when a commercial proposal is validated','proposal_supplier',10),(213,'PROPOSAL_SUPPLIER_SENTBYMAIL','Price request sent by mail','Executed when a commercial proposal is sent by mail','proposal_supplier',10),(214,'PROPOSAL_SUPPLIER_CLOSE_SIGNED','Price request closed signed','Executed when a customer proposal is closed signed','proposal_supplier',10),(215,'PROPOSAL_SUPPLIER_CLOSE_REFUSED','Price request closed refused','Executed when a customer proposal is closed refused','proposal_supplier',10),(216,'MEMBER_SUBSCRIPTION_CREATE','Member subscribtion recorded','Executed when a member subscribtion is deleted','member',24),(217,'MEMBER_SUBSCRIPTION_MODIFY','Member subscribtion modified','Executed when a member subscribtion is modified','member',24),(218,'MEMBER_SUBSCRIPTION_DELETE','Member subscribtion deleted','Executed when a member subscribtion is deleted','member',24),(225,'COMPANY_DELETE','Third party deleted','Executed when you delete third party','societe',1),(226,'PROPAL_DELETE','Customer proposal deleted','Executed when a customer proposal is deleted','propal',2),(227,'ORDER_DELETE','Customer order deleted','Executed when a customer order is deleted','commande',5),(228,'BILL_DELETE','Customer invoice deleted','Executed when a customer invoice is deleted','facture',9),(229,'PROPOSAL_SUPPLIER_DELETE','Price request deleted','Executed when a customer proposal delete','proposal_supplier',10),(230,'ORDER_SUPPLIER_DELETE','Supplier order deleted','Executed when a supplier order is deleted','order_supplier',14),(231,'BILL_SUPPLIER_DELETE','Supplier invoice deleted','Executed when a supplier invoice is deleted','invoice_supplier',17),(232,'CONTRACT_DELETE','Contract deleted','Executed when a contract is deleted','contrat',18),(233,'FICHINTER_DELETE','Intervention is deleted','Executed when a intervention is deleted','ficheinter',35),(234,'EXPENSE_DELETE','Expense report deleted','Executed when an expense report is deleted','expensereport',204),(249,'TICKET_CREATE','Ticket created','Executed when a ticket is created','ticket',161),(250,'TICKET_MODIFY','Ticket modified','Executed when a ticket is modified','ticket',163),(251,'TICKET_ASSIGNED','Ticket assigned','Executed when a ticket is assigned to another user','ticket',164),(252,'TICKET_CLOSE','Ticket closed','Executed when a ticket is closed','ticket',165),(253,'TICKET_SENTBYMAIL','Ticket message sent by email','Executed when a message is sent from the ticket record','ticket',166),(254,'TICKET_DELETE','Ticket deleted','Executed when a ticket is deleted','ticket',167),(261,'USER_SENTBYMAIL','Email sent','Executed when an email is sent from user card','user',300),(262,'BOM_VALIDATE','BOM validated','Executed when a BOM is validated','bom',650),(263,'BOM_UNVALIDATE','BOM unvalidated','Executed when a BOM is unvalidated','bom',651),(264,'BOM_CLOSE','BOM disabled','Executed when a BOM is disabled','bom',652),(265,'BOM_REOPEN','BOM reopen','Executed when a BOM is re-open','bom',653),(266,'BOM_DELETE','BOM deleted','Executed when a BOM deleted','bom',654),(351,'MRP_MO_VALIDATE','MO validated','Executed when a MO is validated','bom',660),(352,'MRP_MO_PRODUCED','MO produced','Executed when a MO is produced','bom',661),(353,'MRP_MO_DELETE','MO deleted','Executed when a MO is deleted','bom',662),(354,'MRP_MO_CANCEL','MO canceled','Executed when a MO is canceled','bom',663),(365,'CONTACT_CREATE','Contact address created','Executed when a contact is created','contact',50),(366,'CONTACT_SENTBYMAIL','Mails sent from third party card','Executed when you send email from contact adress card','contact',51),(367,'CONTACT_DELETE','Contact address deleted','Executed when a contact is deleted','contact',52),(368,'RECRUITMENTJOBPOSITION_CREATE','Job created','Executed when a job is created','recruitment',7500),(369,'RECRUITMENTJOBPOSITION_MODIFY','Job modified','Executed when a job is modified','recruitment',7502),(370,'RECRUITMENTJOBPOSITION_SENTBYMAIL','Mails sent from job record','Executed when you send email from job record','recruitment',7504),(371,'RECRUITMENTJOBPOSITION_DELETE','Job deleted','Executed when a job is deleted','recruitment',7506),(372,'RECRUITMENTCANDIDATURE_CREATE','Candidature created','Executed when a candidature is created','recruitment',7510),(373,'RECRUITMENTCANDIDATURE_MODIFY','Candidature modified','Executed when a candidature is modified','recruitment',7512),(374,'RECRUITMENTCANDIDATURE_SENTBYMAIL','Mails sent from candidature record','Executed when you send email from candidature record','recruitment',7514),(375,'RECRUITMENTCANDIDATURE_DELETE','Candidature deleted','Executed when a candidature is deleted','recruitment',7516);
 /*!40000 ALTER TABLE `llx_c_action_trigger` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1492,6 +1847,35 @@ INSERT INTO `llx_c_actioncomm` VALUES (1,'AC_TEL','system','Phone call',NULL,1,N
 /*!40000 ALTER TABLE `llx_c_actioncomm` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_c_agefodd_session_calendrier_type`
+--
+
+DROP TABLE IF EXISTS `llx_c_agefodd_session_calendrier_type`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_agefodd_session_calendrier_type` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `label` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `entity` int(11) DEFAULT 1,
+  `active` tinyint(4) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_agefodd_session_calendrier_type` (`code`,`entity`),
+  KEY `ik_c_agefodd_session_calendrier_type` (`code`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_agefodd_session_calendrier_type`
+--
+
+LOCK TABLES `llx_c_agefodd_session_calendrier_type` WRITE;
+/*!40000 ALTER TABLE `llx_c_agefodd_session_calendrier_type` DISABLE KEYS */;
+INSERT INTO `llx_c_agefodd_session_calendrier_type` VALUES (1,'AGF_TYPE_F2F','Individuel face à face',1,1),(2,'AGF_TYPE_GRP','Groupe',1,1),(3,'AGF_TYPE_PHONE','Téléphone',1,1),(4,'AGF_TYPE_PLATF','Plateforme',1,1),(5,'AGF_TYPE_CRT','Certification',1,1);
+/*!40000 ALTER TABLE `llx_c_agefodd_session_calendrier_type` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_c_availability`
 --
@@ -1535,7 +1919,7 @@ CREATE TABLE `llx_c_barcode_type` (
   `example` varchar(16) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_barcode_type` (`code`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=39 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=47 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1817,7 +2201,7 @@ CREATE TABLE `llx_c_email_templates` (
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_email_templates` (`entity`,`label`,`lang`),
   KEY `idx_type` (`type_template`)
-) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1826,7 +2210,7 @@ CREATE TABLE `llx_c_email_templates` (
 
 LOCK TABLES `llx_c_email_templates` WRITE;
 /*!40000 ALTER TABLE `llx_c_email_templates` DISABLE KEYS */;
-INSERT INTO `llx_c_email_templates` VALUES (1,1,NULL,'propal_send','',1,NULL,NULL,'2018-01-19 11:17:48','My Private email template for proposals',1,1,'Hello __FIRSTNAME__','We wish you a happy new year<br>__USER_SIGNATURE__',NULL,'1','1'),(2,0,'adherent','member','',0,NULL,NULL,'2018-01-19 11:17:48','(SendAnEMailToMember)',1,1,'__(CardContent)__','__(Hello)__,<br><br>\n\n__(ThisIsContentOfYourCard)__<br>\n__(ID)__ : __ID__<br>\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br>\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br>\n__(Lastname)__ : __MEMBER_LASTNAME__<br>\n__(Fullname)__ : __MEMBER_FULLNAME__<br>\n__(Company)__ : __MEMBER_COMPANY__<br>\n__(Address)__ : __MEMBER_ADDRESS__<br>\n__(Zip)__ : __MEMBER_ZIP__<br>\n__(Town)__ : __MEMBER_TOWN__<br>\n__(Country)__ : __MEMBER_COUNTRY__<br>\n__(Email)__ : __MEMBER_EMAIL__<br>\n__(Birthday)__ : __MEMBER_BIRTH__<br>\n__(Photo)__ : __MEMBER_PHOTO__<br>\n__(Login)__ : __MEMBER_LOGIN__<br>\n__(Password)__ : __MEMBER_PASSWORD__<br>\n__(Phone)__ : __MEMBER_PHONE__<br>\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br>\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','1'),(3,0,'banque','thirdparty','',0,NULL,NULL,'2018-01-19 11:17:48','(YourSEPAMandate)',1,0,'__(YourSEPAMandate)__','__(Hello)__,<br><br>\n\n__(FindYourSEPAMandate)__ :<br>\n__MYCOMPANY_NAME__<br>\n__MYCOMPANY_FULLADDRESS__<br><br>\n__(Sincerely)__<br>\n__USER_SIGNATURE__',NULL,'1','1'),(6,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnAutoSubscription)',10,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipRequestWasReceived)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourMembershipRequestWasReceived)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(7,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnMemberValidation)',20,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipWasValidated)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourMembershipWasValidated)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(8,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnNewSubscription)',30,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourSubscriptionWasRecorded)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourSubscriptionWasRecorded)__<br>\n\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','1'),(9,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingReminderForExpiredSubscription)',40,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(SubscriptionReminderEmail)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfSubscriptionReminderEmail)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(10,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnCancelation)',50,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipWasCanceled)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(YourMembershipWasCanceled)__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(11,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingAnEMailToMember)',60,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(CardContent)__','__(Hello)__,<br><br>\n\n__(ThisIsContentOfYourCard)__<br>\n__(ID)__ : __ID__<br>\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br>\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br>\n__(Lastname)__ : __MEMBER_LASTNAME__<br>\n__(Fullname)__ : __MEMBER_FULLNAME__<br>\n__(Company)__ : __MEMBER_COMPANY__<br>\n__(Address)__ : __MEMBER_ADDRESS__<br>\n__(Zip)__ : __MEMBER_ZIP__<br>\n__(Town)__ : __MEMBER_TOWN__<br>\n__(Country)__ : __MEMBER_COUNTRY__<br>\n__(Email)__ : __MEMBER_EMAIL__<br>\n__(Birthday)__ : __MEMBER_BIRTH__<br>\n__(Photo)__ : __MEMBER_PHOTO__<br>\n__(Login)__ : __MEMBER_LOGIN__<br>\n__(Password)__ : __MEMBER_PASSWORD__<br>\n__(Phone)__ : __MEMBER_PHONE__<br>\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br>\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0');
+INSERT INTO `llx_c_email_templates` VALUES (1,1,NULL,'propal_send','',1,NULL,NULL,'2018-01-19 11:17:48','My Private email template for proposals',1,1,'Hello __FIRSTNAME__','We wish you a happy new year<br>__USER_SIGNATURE__',NULL,'1','1'),(2,0,'adherent','member','',0,NULL,NULL,'2018-01-19 11:17:48','(SendAnEMailToMember)',1,1,'__(CardContent)__','__(Hello)__,<br><br>\n\n__(ThisIsContentOfYourCard)__<br>\n__(ID)__ : __ID__<br>\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br>\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br>\n__(Lastname)__ : __MEMBER_LASTNAME__<br>\n__(Fullname)__ : __MEMBER_FULLNAME__<br>\n__(Company)__ : __MEMBER_COMPANY__<br>\n__(Address)__ : __MEMBER_ADDRESS__<br>\n__(Zip)__ : __MEMBER_ZIP__<br>\n__(Town)__ : __MEMBER_TOWN__<br>\n__(Country)__ : __MEMBER_COUNTRY__<br>\n__(Email)__ : __MEMBER_EMAIL__<br>\n__(Birthday)__ : __MEMBER_BIRTH__<br>\n__(Photo)__ : __MEMBER_PHOTO__<br>\n__(Login)__ : __MEMBER_LOGIN__<br>\n__(Password)__ : __MEMBER_PASSWORD__<br>\n__(Phone)__ : __MEMBER_PHONE__<br>\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br>\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','1'),(3,0,'banque','thirdparty','',0,NULL,NULL,'2018-01-19 11:17:48','(YourSEPAMandate)',1,0,'__(YourSEPAMandate)__','__(Hello)__,<br><br>\n\n__(FindYourSEPAMandate)__ :<br>\n__MYCOMPANY_NAME__<br>\n__MYCOMPANY_FULLADDRESS__<br><br>\n__(Sincerely)__<br>\n__USER_SIGNATURE__',NULL,'1','1'),(6,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnAutoSubscription)',10,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipRequestWasReceived)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourMembershipRequestWasReceived)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(7,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnMemberValidation)',20,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipWasValidated)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourMembershipWasValidated)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(8,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnNewSubscription)',30,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourSubscriptionWasRecorded)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourSubscriptionWasRecorded)__<br>\n\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','1'),(9,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingReminderForExpiredSubscription)',40,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(SubscriptionReminderEmail)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfSubscriptionReminderEmail)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(10,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnCancelation)',50,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipWasCanceled)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(YourMembershipWasCanceled)__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(11,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingAnEMailToMember)',60,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(CardContent)__','__(Hello)__,<br><br>\n\n__(ThisIsContentOfYourCard)__<br>\n__(ID)__ : __ID__<br>\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br>\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br>\n__(Lastname)__ : __MEMBER_LASTNAME__<br>\n__(Fullname)__ : __MEMBER_FULLNAME__<br>\n__(Company)__ : __MEMBER_COMPANY__<br>\n__(Address)__ : __MEMBER_ADDRESS__<br>\n__(Zip)__ : __MEMBER_ZIP__<br>\n__(Town)__ : __MEMBER_TOWN__<br>\n__(Country)__ : __MEMBER_COUNTRY__<br>\n__(Email)__ : __MEMBER_EMAIL__<br>\n__(Birthday)__ : __MEMBER_BIRTH__<br>\n__(Photo)__ : __MEMBER_PHOTO__<br>\n__(Login)__ : __MEMBER_LOGIN__<br>\n__(Password)__ : __MEMBER_PASSWORD__<br>\n__(Phone)__ : __MEMBER_PHONE__<br>\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br>\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(12,0,'recruitment','recruitmentcandidature_send','',0,NULL,NULL,'2020-12-10 12:24:39','(AnswerCandidature)',100,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourCandidature)__','__(Hello)__ __CANDIDATE_FULLNAME__,<br><br>\n\n__(YourCandidatureAnswer)__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'$conf->recruitment->enabled','0');
 /*!40000 ALTER TABLE `llx_c_email_templates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2121,6 +2505,7 @@ CREATE TABLE `llx_c_incoterms` (
   `code` varchar(3) COLLATE utf8_unicode_ci NOT NULL,
   `libelle` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
+  `label` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_incoterms` (`code`)
 ) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -2132,7 +2517,7 @@ CREATE TABLE `llx_c_incoterms` (
 
 LOCK TABLES `llx_c_incoterms` WRITE;
 /*!40000 ALTER TABLE `llx_c_incoterms` DISABLE KEYS */;
-INSERT INTO `llx_c_incoterms` VALUES (1,'EXW','Ex Works, au départ non chargé, non dédouané sortie d\'usine (uniquement adapté aux flux domestiques, nationaux)',1),(2,'FCA','Free Carrier, marchandises dédouanées et chargées dans le pays de départ, chez le vendeur ou chez le commissionnaire de transport de l\'acheteur',1),(3,'FAS','Free Alongside Ship, sur le quai du port de départ',1),(4,'FOB','Free On Board, chargé sur le bateau, les frais de chargement dans celui-ci étant fonction du liner term indiqué par la compagnie maritime (à la charge du vendeur)',1),(5,'CFR','Cost and Freight, chargé dans le bateau, livraison au port de départ, frais payés jusqu\'au port d\'arrivée, sans assurance pour le transport, non déchargé du navire à destination (les frais de déchargement sont inclus ou non au port d\'arrivée)',1),(6,'CIF','Cost, Insurance and Freight, chargé sur le bateau, frais jusqu\'au port d\'arrivée, avec l\'assurance marchandise transportée souscrite par le vendeur pour le compte de l\'acheteur',1),(7,'CPT','Carriage Paid To, livraison au premier transporteur, frais jusqu\'au déchargement du mode de transport, sans assurance pour le transport',1),(8,'CIP','Carriage and Insurance Paid to, idem CPT, avec assurance marchandise transportée souscrite par le vendeur pour le compte de l\'acheteur',1),(9,'DAT','Delivered At Terminal, marchandises (déchargées) livrées sur quai, dans un terminal maritime, fluvial, aérien, routier ou ferroviaire désigné (dédouanement import, et post-acheminement payés par l\'acheteur)',1),(10,'DAP','Delivered At Place, marchandises (non déchargées) mises à disposition de l\'acheteur dans le pays d\'importation au lieu précisé dans le contrat (déchargement, dédouanement import payé par l\'acheteur)',1),(11,'DDP','Delivered Duty Paid, marchandises (non déchargées) livrées à destination finale, dédouanement import et taxes à la charge du vendeur ; l\'acheteur prend en charge uniquement le déchargement (si exclusion des taxes type TVA, le préciser clairement)',1);
+INSERT INTO `llx_c_incoterms` VALUES (1,'EXW','Ex Works, au départ non chargé, non dédouané sortie d\'usine (uniquement adapté aux flux domestiques, nationaux)',1,NULL),(2,'FCA','Free Carrier, marchandises dédouanées et chargées dans le pays de départ, chez le vendeur ou chez le commissionnaire de transport de l\'acheteur',1,NULL),(3,'FAS','Free Alongside Ship, sur le quai du port de départ',1,NULL),(4,'FOB','Free On Board, chargé sur le bateau, les frais de chargement dans celui-ci étant fonction du liner term indiqué par la compagnie maritime (à la charge du vendeur)',1,NULL),(5,'CFR','Cost and Freight, chargé dans le bateau, livraison au port de départ, frais payés jusqu\'au port d\'arrivée, sans assurance pour le transport, non déchargé du navire à destination (les frais de déchargement sont inclus ou non au port d\'arrivée)',1,NULL),(6,'CIF','Cost, Insurance and Freight, chargé sur le bateau, frais jusqu\'au port d\'arrivée, avec l\'assurance marchandise transportée souscrite par le vendeur pour le compte de l\'acheteur',1,NULL),(7,'CPT','Carriage Paid To, livraison au premier transporteur, frais jusqu\'au déchargement du mode de transport, sans assurance pour le transport',1,NULL),(8,'CIP','Carriage and Insurance Paid to, idem CPT, avec assurance marchandise transportée souscrite par le vendeur pour le compte de l\'acheteur',1,NULL),(9,'DAT','Delivered At Terminal, marchandises (déchargées) livrées sur quai, dans un terminal maritime, fluvial, aérien, routier ou ferroviaire désigné (dédouanement import, et post-acheminement payés par l\'acheteur)',1,NULL),(10,'DAP','Delivered At Place, marchandises (non déchargées) mises à disposition de l\'acheteur dans le pays d\'importation au lieu précisé dans le contrat (déchargement, dédouanement import payé par l\'acheteur)',1,NULL),(11,'DDP','Delivered Duty Paid, marchandises (non déchargées) livrées à destination finale, dédouanement import et taxes à la charge du vendeur ; l\'acheteur prend en charge uniquement le déchargement (si exclusion des taxes type TVA, le préciser clairement)',1,NULL);
 /*!40000 ALTER TABLE `llx_c_incoterms` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2509,6 +2894,33 @@ LOCK TABLES `llx_c_price_global_variable_updater` WRITE;
 /*!40000 ALTER TABLE `llx_c_price_global_variable_updater` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_c_product_nature`
+--
+
+DROP TABLE IF EXISTS `llx_c_product_nature`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_product_nature` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` tinyint(4) NOT NULL,
+  `label` varchar(100) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_product_nature` (`code`,`active`)
+) ENGINE=InnoDB AUTO_INCREMENT=77 DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_product_nature`
+--
+
+LOCK TABLES `llx_c_product_nature` WRITE;
+/*!40000 ALTER TABLE `llx_c_product_nature` DISABLE KEYS */;
+INSERT INTO `llx_c_product_nature` VALUES (1,0,'RowMaterial',1),(2,1,'Finished',1);
+/*!40000 ALTER TABLE `llx_c_product_nature` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_c_propalst`
 --
@@ -2536,6 +2948,33 @@ INSERT INTO `llx_c_propalst` VALUES (0,'PR_DRAFT','Brouillon',1),(1,'PR_OPEN','O
 /*!40000 ALTER TABLE `llx_c_propalst` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_c_prospectcontactlevel`
+--
+
+DROP TABLE IF EXISTS `llx_c_prospectcontactlevel`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_prospectcontactlevel` (
+  `code` varchar(12) CHARACTER SET utf8mb4 NOT NULL,
+  `label` varchar(30) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `sortorder` smallint(6) DEFAULT NULL,
+  `active` smallint(6) NOT NULL DEFAULT 1,
+  `module` varchar(32) CHARACTER SET utf8mb4 DEFAULT NULL,
+  PRIMARY KEY (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_prospectcontactlevel`
+--
+
+LOCK TABLES `llx_c_prospectcontactlevel` WRITE;
+/*!40000 ALTER TABLE `llx_c_prospectcontactlevel` DISABLE KEYS */;
+INSERT INTO `llx_c_prospectcontactlevel` VALUES ('PL_HIGH','High',4,1,NULL),('PL_LOW','Low',2,1,NULL),('PL_MEDIUM','Medium',3,1,NULL),('PL_NONE','None',1,1,NULL);
+/*!40000 ALTER TABLE `llx_c_prospectcontactlevel` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_c_prospectlevel`
 --
@@ -2563,6 +3002,31 @@ INSERT INTO `llx_c_prospectlevel` VALUES ('PL_HIGH','High',4,1,NULL),('PL_LOW','
 /*!40000 ALTER TABLE `llx_c_prospectlevel` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_c_recruitment_origin`
+--
+
+DROP TABLE IF EXISTS `llx_c_recruitment_origin`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_recruitment_origin` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(32) CHARACTER SET utf8mb4 NOT NULL,
+  `label` varchar(64) CHARACTER SET utf8mb4 NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_recruitment_origin`
+--
+
+LOCK TABLES `llx_c_recruitment_origin` WRITE;
+/*!40000 ALTER TABLE `llx_c_recruitment_origin` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_c_recruitment_origin` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_c_regions`
 --
@@ -2741,6 +3205,34 @@ INSERT INTO `llx_c_stcomm` VALUES (-1,'ST_NO','Do not contact',1,NULL),(0,'ST_NE
 /*!40000 ALTER TABLE `llx_c_stcomm` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_c_stcommcontact`
+--
+
+DROP TABLE IF EXISTS `llx_c_stcommcontact`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_stcommcontact` (
+  `id` int(11) NOT NULL,
+  `code` varchar(12) CHARACTER SET utf8mb4 NOT NULL,
+  `libelle` varchar(30) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `picto` varchar(128) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_c_stcommcontact` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_stcommcontact`
+--
+
+LOCK TABLES `llx_c_stcommcontact` WRITE;
+/*!40000 ALTER TABLE `llx_c_stcommcontact` DISABLE KEYS */;
+INSERT INTO `llx_c_stcommcontact` VALUES (-1,'ST_NO','Do not contact',NULL,1),(0,'ST_NEVER','Never contacted',NULL,1),(1,'ST_TODO','To contact',NULL,1),(2,'ST_PEND','Contact in progress',NULL,1),(3,'ST_DONE','Contacted',NULL,1);
+/*!40000 ALTER TABLE `llx_c_stcommcontact` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_c_subtotal_free_text`
 --
@@ -2783,6 +3275,8 @@ CREATE TABLE `llx_c_ticket_category` (
   `active` int(11) DEFAULT 1,
   `use_default` int(11) DEFAULT 1,
   `description` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_parent` int(11) NOT NULL DEFAULT 0,
+  `force_severity` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_code` (`code`,`entity`)
 ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -2794,7 +3288,7 @@ CREATE TABLE `llx_c_ticket_category` (
 
 LOCK TABLES `llx_c_ticket_category` WRITE;
 /*!40000 ALTER TABLE `llx_c_ticket_category` DISABLE KEYS */;
-INSERT INTO `llx_c_ticket_category` VALUES (1,1,'OTHER','10','Other',1,1,NULL);
+INSERT INTO `llx_c_ticket_category` VALUES (1,1,'OTHER','10','Other',1,1,NULL,0,NULL);
 /*!40000 ALTER TABLE `llx_c_ticket_category` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2842,7 +3336,7 @@ CREATE TABLE `llx_c_ticket_severity` (
   `code` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
   `pos` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
   `label` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
-  `color` varchar(10) COLLATE utf8_unicode_ci NOT NULL,
+  `color` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
   `active` int(11) DEFAULT 1,
   `use_default` int(11) DEFAULT 1,
   `description` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -2892,6 +3386,33 @@ INSERT INTO `llx_c_ticket_type` VALUES (1,1,'COM','10','Commercial question',1,1
 /*!40000 ALTER TABLE `llx_c_ticket_type` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_c_transport_mode`
+--
+
+DROP TABLE IF EXISTS `llx_c_transport_mode`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_transport_mode` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `code` varchar(3) NOT NULL,
+  `label` varchar(255) NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=313 DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_transport_mode`
+--
+
+LOCK TABLES `llx_c_transport_mode` WRITE;
+/*!40000 ALTER TABLE `llx_c_transport_mode` DISABLE KEYS */;
+INSERT INTO `llx_c_transport_mode` VALUES (1,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(2,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(3,1,'ROU','Transport par route',1),(4,1,'AIR','Transport par air',1),(5,1,'POS','Envois postaux',1),(6,1,'OLE','Installations de transport fixe (oléoduc)',1),(7,1,'NAV','Transport par navigation intérieure',1),(8,1,'PRO','Propulsion propre',1),(9,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(10,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(11,1,'ROU','Transport par route',1),(12,1,'AIR','Transport par air',1),(13,1,'POS','Envois postaux',1),(14,1,'OLE','Installations de transport fixe (oléoduc)',1),(15,1,'NAV','Transport par navigation intérieure',1),(16,1,'PRO','Propulsion propre',1),(17,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(18,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(19,1,'ROU','Transport par route',1),(20,1,'AIR','Transport par air',1),(21,1,'POS','Envois postaux',1),(22,1,'OLE','Installations de transport fixe (oléoduc)',1),(23,1,'NAV','Transport par navigation intérieure',1),(24,1,'PRO','Propulsion propre',1),(25,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(26,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(27,1,'ROU','Transport par route',1),(28,1,'AIR','Transport par air',1),(29,1,'POS','Envois postaux',1),(30,1,'OLE','Installations de transport fixe (oléoduc)',1),(31,1,'NAV','Transport par navigation intérieure',1),(32,1,'PRO','Propulsion propre',1),(33,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(34,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(35,1,'ROU','Transport par route',1),(36,1,'AIR','Transport par air',1),(37,1,'POS','Envois postaux',1),(38,1,'OLE','Installations de transport fixe (oléoduc)',1),(39,1,'NAV','Transport par navigation intérieure',1),(40,1,'PRO','Propulsion propre',1),(41,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(42,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(43,1,'ROU','Transport par route',1),(44,1,'AIR','Transport par air',1),(45,1,'POS','Envois postaux',1),(46,1,'OLE','Installations de transport fixe (oléoduc)',1),(47,1,'NAV','Transport par navigation intérieure',1),(48,1,'PRO','Propulsion propre',1),(49,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(50,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(51,1,'ROU','Transport par route',1),(52,1,'AIR','Transport par air',1),(53,1,'POS','Envois postaux',1),(54,1,'OLE','Installations de transport fixe (oléoduc)',1),(55,1,'NAV','Transport par navigation intérieure',1),(56,1,'PRO','Propulsion propre',1),(57,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(58,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(59,1,'ROU','Transport par route',1),(60,1,'AIR','Transport par air',1),(61,1,'POS','Envois postaux',1),(62,1,'OLE','Installations de transport fixe (oléoduc)',1),(63,1,'NAV','Transport par navigation intérieure',1),(64,1,'PRO','Propulsion propre',1),(65,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(66,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(67,1,'ROU','Transport par route',1),(68,1,'AIR','Transport par air',1),(69,1,'POS','Envois postaux',1),(70,1,'OLE','Installations de transport fixe (oléoduc)',1),(71,1,'NAV','Transport par navigation intérieure',1),(72,1,'PRO','Propulsion propre',1),(73,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(74,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(75,1,'ROU','Transport par route',1),(76,1,'AIR','Transport par air',1),(77,1,'POS','Envois postaux',1),(78,1,'OLE','Installations de transport fixe (oléoduc)',1),(79,1,'NAV','Transport par navigation intérieure',1),(80,1,'PRO','Propulsion propre',1),(81,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(82,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(83,1,'ROU','Transport par route',1),(84,1,'AIR','Transport par air',1),(85,1,'POS','Envois postaux',1),(86,1,'OLE','Installations de transport fixe (oléoduc)',1),(87,1,'NAV','Transport par navigation intérieure',1),(88,1,'PRO','Propulsion propre',1),(89,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(90,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(91,1,'ROU','Transport par route',1),(92,1,'AIR','Transport par air',1),(93,1,'POS','Envois postaux',1),(94,1,'OLE','Installations de transport fixe (oléoduc)',1),(95,1,'NAV','Transport par navigation intérieure',1),(96,1,'PRO','Propulsion propre',1),(97,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(98,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(99,1,'ROU','Transport par route',1),(100,1,'AIR','Transport par air',1),(101,1,'POS','Envois postaux',1),(102,1,'OLE','Installations de transport fixe (oléoduc)',1),(103,1,'NAV','Transport par navigation intérieure',1),(104,1,'PRO','Propulsion propre',1),(105,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(106,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(107,1,'ROU','Transport par route',1),(108,1,'AIR','Transport par air',1),(109,1,'POS','Envois postaux',1),(110,1,'OLE','Installations de transport fixe (oléoduc)',1),(111,1,'NAV','Transport par navigation intérieure',1),(112,1,'PRO','Propulsion propre',1),(113,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(114,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(115,1,'ROU','Transport par route',1),(116,1,'AIR','Transport par air',1),(117,1,'POS','Envois postaux',1),(118,1,'OLE','Installations de transport fixe (oléoduc)',1),(119,1,'NAV','Transport par navigation intérieure',1),(120,1,'PRO','Propulsion propre',1),(121,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(122,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(123,1,'ROU','Transport par route',1),(124,1,'AIR','Transport par air',1),(125,1,'POS','Envois postaux',1),(126,1,'OLE','Installations de transport fixe (oléoduc)',1),(127,1,'NAV','Transport par navigation intérieure',1),(128,1,'PRO','Propulsion propre',1),(129,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(130,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(131,1,'ROU','Transport par route',1),(132,1,'AIR','Transport par air',1),(133,1,'POS','Envois postaux',1),(134,1,'OLE','Installations de transport fixe (oléoduc)',1),(135,1,'NAV','Transport par navigation intérieure',1),(136,1,'PRO','Propulsion propre',1),(137,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(138,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(139,1,'ROU','Transport par route',1),(140,1,'AIR','Transport par air',1),(141,1,'POS','Envois postaux',1),(142,1,'OLE','Installations de transport fixe (oléoduc)',1),(143,1,'NAV','Transport par navigation intérieure',1),(144,1,'PRO','Propulsion propre',1),(145,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(146,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(147,1,'ROU','Transport par route',1),(148,1,'AIR','Transport par air',1),(149,1,'POS','Envois postaux',1),(150,1,'OLE','Installations de transport fixe (oléoduc)',1),(151,1,'NAV','Transport par navigation intérieure',1),(152,1,'PRO','Propulsion propre',1),(153,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(154,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(155,1,'ROU','Transport par route',1),(156,1,'AIR','Transport par air',1),(157,1,'POS','Envois postaux',1),(158,1,'OLE','Installations de transport fixe (oléoduc)',1),(159,1,'NAV','Transport par navigation intérieure',1),(160,1,'PRO','Propulsion propre',1),(161,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(162,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(163,1,'ROU','Transport par route',1),(164,1,'AIR','Transport par air',1),(165,1,'POS','Envois postaux',1),(166,1,'OLE','Installations de transport fixe (oléoduc)',1),(167,1,'NAV','Transport par navigation intérieure',1),(168,1,'PRO','Propulsion propre',1),(169,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(170,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(171,1,'ROU','Transport par route',1),(172,1,'AIR','Transport par air',1),(173,1,'POS','Envois postaux',1),(174,1,'OLE','Installations de transport fixe (oléoduc)',1),(175,1,'NAV','Transport par navigation intérieure',1),(176,1,'PRO','Propulsion propre',1),(177,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(178,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(179,1,'ROU','Transport par route',1),(180,1,'AIR','Transport par air',1),(181,1,'POS','Envois postaux',1),(182,1,'OLE','Installations de transport fixe (oléoduc)',1),(183,1,'NAV','Transport par navigation intérieure',1),(184,1,'PRO','Propulsion propre',1),(185,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(186,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(187,1,'ROU','Transport par route',1),(188,1,'AIR','Transport par air',1),(189,1,'POS','Envois postaux',1),(190,1,'OLE','Installations de transport fixe (oléoduc)',1),(191,1,'NAV','Transport par navigation intérieure',1),(192,1,'PRO','Propulsion propre',1),(193,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(194,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(195,1,'ROU','Transport par route',1),(196,1,'AIR','Transport par air',1),(197,1,'POS','Envois postaux',1),(198,1,'OLE','Installations de transport fixe (oléoduc)',1),(199,1,'NAV','Transport par navigation intérieure',1),(200,1,'PRO','Propulsion propre',1),(201,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(202,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(203,1,'ROU','Transport par route',1),(204,1,'AIR','Transport par air',1),(205,1,'POS','Envois postaux',1),(206,1,'OLE','Installations de transport fixe (oléoduc)',1),(207,1,'NAV','Transport par navigation intérieure',1),(208,1,'PRO','Propulsion propre',1),(209,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(210,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(211,1,'ROU','Transport par route',1),(212,1,'AIR','Transport par air',1),(213,1,'POS','Envois postaux',1),(214,1,'OLE','Installations de transport fixe (oléoduc)',1),(215,1,'NAV','Transport par navigation intérieure',1),(216,1,'PRO','Propulsion propre',1),(217,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(218,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(219,1,'ROU','Transport par route',1),(220,1,'AIR','Transport par air',1),(221,1,'POS','Envois postaux',1),(222,1,'OLE','Installations de transport fixe (oléoduc)',1),(223,1,'NAV','Transport par navigation intérieure',1),(224,1,'PRO','Propulsion propre',1),(225,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(226,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(227,1,'ROU','Transport par route',1),(228,1,'AIR','Transport par air',1),(229,1,'POS','Envois postaux',1),(230,1,'OLE','Installations de transport fixe (oléoduc)',1),(231,1,'NAV','Transport par navigation intérieure',1),(232,1,'PRO','Propulsion propre',1),(233,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(234,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(235,1,'ROU','Transport par route',1),(236,1,'AIR','Transport par air',1),(237,1,'POS','Envois postaux',1),(238,1,'OLE','Installations de transport fixe (oléoduc)',1),(239,1,'NAV','Transport par navigation intérieure',1),(240,1,'PRO','Propulsion propre',1),(241,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(242,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(243,1,'ROU','Transport par route',1),(244,1,'AIR','Transport par air',1),(245,1,'POS','Envois postaux',1),(246,1,'OLE','Installations de transport fixe (oléoduc)',1),(247,1,'NAV','Transport par navigation intérieure',1),(248,1,'PRO','Propulsion propre',1),(249,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(250,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(251,1,'ROU','Transport par route',1),(252,1,'AIR','Transport par air',1),(253,1,'POS','Envois postaux',1),(254,1,'OLE','Installations de transport fixe (oléoduc)',1),(255,1,'NAV','Transport par navigation intérieure',1),(256,1,'PRO','Propulsion propre',1),(257,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(258,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(259,1,'ROU','Transport par route',1),(260,1,'AIR','Transport par air',1),(261,1,'POS','Envois postaux',1),(262,1,'OLE','Installations de transport fixe (oléoduc)',1),(263,1,'NAV','Transport par navigation intérieure',1),(264,1,'PRO','Propulsion propre',1),(265,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(266,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(267,1,'ROU','Transport par route',1),(268,1,'AIR','Transport par air',1),(269,1,'POS','Envois postaux',1),(270,1,'OLE','Installations de transport fixe (oléoduc)',1),(271,1,'NAV','Transport par navigation intérieure',1),(272,1,'PRO','Propulsion propre',1),(273,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(274,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(275,1,'ROU','Transport par route',1),(276,1,'AIR','Transport par air',1),(277,1,'POS','Envois postaux',1),(278,1,'OLE','Installations de transport fixe (oléoduc)',1),(279,1,'NAV','Transport par navigation intérieure',1),(280,1,'PRO','Propulsion propre',1),(281,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(282,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(283,1,'ROU','Transport par route',1),(284,1,'AIR','Transport par air',1),(285,1,'POS','Envois postaux',1),(286,1,'OLE','Installations de transport fixe (oléoduc)',1),(287,1,'NAV','Transport par navigation intérieure',1),(288,1,'PRO','Propulsion propre',1),(289,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(290,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(291,1,'ROU','Transport par route',1),(292,1,'AIR','Transport par air',1),(293,1,'POS','Envois postaux',1),(294,1,'OLE','Installations de transport fixe (oléoduc)',1),(295,1,'NAV','Transport par navigation intérieure',1),(296,1,'PRO','Propulsion propre',1),(297,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(298,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(299,1,'ROU','Transport par route',1),(300,1,'AIR','Transport par air',1),(301,1,'POS','Envois postaux',1),(302,1,'OLE','Installations de transport fixe (oléoduc)',1),(303,1,'NAV','Transport par navigation intérieure',1),(304,1,'PRO','Propulsion propre',1),(305,1,'MAR','Transport maritime (y compris camions ou wagons sur bateau)',1),(306,1,'TRA','Transport par chemin de fer (y compris camions sur wagon)',1),(307,1,'ROU','Transport par route',1),(308,1,'AIR','Transport par air',1),(309,1,'POS','Envois postaux',1),(310,1,'OLE','Installations de transport fixe (oléoduc)',1),(311,1,'NAV','Transport par navigation intérieure',1),(312,1,'PRO','Propulsion propre',1);
+/*!40000 ALTER TABLE `llx_c_transport_mode` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_c_tva`
 --
@@ -3076,6 +3597,64 @@ INSERT INTO `llx_c_typent` VALUES (0,'TE_UNKNOWN','-',NULL,1,NULL,0),(1,'TE_STAR
 /*!40000 ALTER TABLE `llx_c_typent` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_c_ultimatepdf_line`
+--
+
+DROP TABLE IF EXISTS `llx_c_ultimatepdf_line`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_ultimatepdf_line` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `code` varchar(30) NOT NULL,
+  `label` varchar(255) NOT NULL,
+  `description` varchar(128) NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_ultimatepdf_line` (`code`,`entity`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_ultimatepdf_line`
+--
+
+LOCK TABLES `llx_c_ultimatepdf_line` WRITE;
+/*!40000 ALTER TABLE `llx_c_ultimatepdf_line` DISABLE KEYS */;
+INSERT INTO `llx_c_ultimatepdf_line` VALUES (1,1,'TEXTE1','Garantie 2 ans pièces et main d\'œuvre, retour en atelier (Hors filtre et pièce d\'usure)','texte de garantie',1);
+/*!40000 ALTER TABLE `llx_c_ultimatepdf_line` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_ultimatepdf_title`
+--
+
+DROP TABLE IF EXISTS `llx_c_ultimatepdf_title`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_ultimatepdf_title` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `code` varchar(30) NOT NULL,
+  `label` varchar(128) NOT NULL,
+  `description` varchar(255) NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_ultimatepdf_title` (`code`,`entity`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_ultimatepdf_title`
+--
+
+LOCK TABLES `llx_c_ultimatepdf_title` WRITE;
+/*!40000 ALTER TABLE `llx_c_ultimatepdf_title` DISABLE KEYS */;
+INSERT INTO `llx_c_ultimatepdf_title` VALUES (1,1,'TITLE1','Facture Proforma','Facture proforma',1);
+/*!40000 ALTER TABLE `llx_c_ultimatepdf_title` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_c_units`
 --
@@ -4116,7 +4695,7 @@ CREATE TABLE `llx_commande` (
   `fk_currency` varchar(3) COLLATE utf8_unicode_ci DEFAULT NULL,
   `fk_cond_reglement` int(11) DEFAULT NULL,
   `fk_mode_reglement` int(11) DEFAULT NULL,
-  `date_livraison` date DEFAULT NULL,
+  `date_livraison` datetime DEFAULT NULL,
   `fk_shipping_method` int(11) DEFAULT NULL,
   `fk_warehouse` int(11) DEFAULT NULL,
   `fk_availability` int(11) DEFAULT NULL,
@@ -4158,7 +4737,7 @@ CREATE TABLE `llx_commande` (
 
 LOCK TABLES `llx_commande` WRITE;
 /*!40000 ALTER TABLE `llx_commande` DISABLE KEYS */;
-INSERT INTO `llx_commande` VALUES (1,'2020-06-12 17:12:08',1,NULL,'CO1107-0002',1,NULL,NULL,'','2013-07-20 15:23:12','2019-08-08 13:59:09',NULL,'2019-07-20',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,1,1,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(2,'2020-06-12 17:12:08',1,NULL,'CO1107-0003',1,NULL,NULL,'','2013-07-20 23:20:12','2020-02-12 17:06:51',NULL,'2019-07-21',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(3,'2020-06-12 17:12:08',1,NULL,'CO1107-0004',1,NULL,NULL,'','2013-07-20 23:22:53','2020-02-17 18:27:56',NULL,'2019-07-21',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,30.00000000,30.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(5,'2020-06-12 17:12:08',1,NULL,'CO1108-0001',1,NULL,NULL,'','2013-08-08 03:04:11','2019-08-08 03:04:21',NULL,'2019-08-08',1,NULL,1,NULL,NULL,2,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(6,'2020-06-12 17:12:08',19,NULL,'(PROV6)',1,NULL,NULL,'','2015-02-17 16:22:14',NULL,NULL,'2020-02-17',1,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'','','einstein',0,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,'commande/(PROV6)/(PROV6).pdf',NULL,NULL),(17,'2020-06-12 17:12:08',4,NULL,'CO7001-0005',1,NULL,NULL,NULL,'2017-02-15 23:50:34','2019-02-15 23:50:34',NULL,'2020-05-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,509.00000000,509.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,509.00000000,0.00000000,509.00000000,NULL,NULL,NULL),(18,'2020-06-12 17:12:08',7,4,'CO7001-0006',1,NULL,NULL,NULL,'2017-02-15 23:51:23','2020-02-15 23:51:23',NULL,'2020-02-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,900.00000000,900.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,900.00000000,0.00000000,900.00000000,NULL,NULL,NULL),(20,'2020-06-12 17:12:08',4,NULL,'CO7001-0007',1,NULL,NULL,NULL,'2017-02-15 23:55:52','2019-02-15 23:55:52',NULL,'2020-04-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,330.00000000,330.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,330.00000000,0.00000000,330.00000000,NULL,NULL,NULL),(29,'2020-06-12 17:12:08',4,NULL,'CO7001-0008',1,NULL,NULL,NULL,'2017-02-16 00:03:44','2020-02-16 00:03:44',NULL,'2020-02-12',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,457.00000000,457.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,457.00000000,0.00000000,457.00000000,NULL,NULL,NULL),(34,'2020-06-12 17:12:08',11,NULL,'CO7001-0009',1,NULL,NULL,NULL,'2017-02-16 00:05:01','2020-02-16 00:05:01',NULL,'2020-01-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,124.00000000,124.00000000,'','','',0,NULL,NULL,2,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,124.00000000,0.00000000,124.00000000,NULL,NULL,NULL),(38,'2020-06-12 17:12:08',3,NULL,'CO7001-0010',1,NULL,NULL,NULL,'2017-02-16 00:05:01','2020-02-16 00:05:01',NULL,'2020-02-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,200.00000000,200.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,200.00000000,0.00000000,200.00000000,NULL,NULL,NULL),(40,'2020-06-12 17:12:08',11,NULL,'CO7001-0011',1,NULL,NULL,NULL,'2017-02-16 00:05:10','2020-02-16 00:05:11',NULL,'2020-01-23',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,1210.00000000,1210.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1210.00000000,0.00000000,1210.00000000,NULL,NULL,NULL),(43,'2020-06-12 17:12:08',10,NULL,'CO7001-0012',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2020-02-16 00:05:11',NULL,'2020-02-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,478.00000000,478.00000000,'','','',0,NULL,NULL,2,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,478.00000000,0.00000000,478.00000000,NULL,NULL,NULL),(47,'2020-06-12 17:12:08',1,NULL,'CO7001-0013',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2019-02-16 00:05:11',NULL,'2019-11-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,55.00000000,55.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,55.00000000,0.00000000,55.00000000,NULL,NULL,NULL),(48,'2020-06-12 17:12:08',4,NULL,'CO7001-0014',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2019-02-16 00:05:11',NULL,'2019-07-30',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,540.00000000,540.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,540.00000000,0.00000000,540.00000000,NULL,NULL,NULL),(50,'2020-06-12 17:12:08',1,NULL,'CO7001-0015',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2020-02-16 00:05:26',NULL,'2019-12-12',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,118.00000000,118.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,118.00000000,0.00000000,118.00000000,NULL,NULL,NULL),(54,'2020-06-12 17:12:08',12,NULL,'CO7001-0016',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2019-02-16 00:05:26','2019-02-16 03:05:56','2020-06-03',12,NULL,12,12,1,3,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,220.00000000,220.00000000,'','','',1,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,220.00000000,0.00000000,220.00000000,NULL,NULL,NULL),(58,'2020-06-12 17:12:08',1,NULL,'CO7001-0017',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2019-02-16 00:05:26',NULL,'2019-07-23',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,436.00000000,436.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,436.00000000,0.00000000,436.00000000,NULL,NULL,NULL),(62,'2020-06-12 17:12:08',19,NULL,'CO7001-0018',1,NULL,NULL,NULL,'2017-02-16 00:05:35','2019-02-16 00:05:35','2020-12-20 20:48:55','2020-02-23',12,NULL,12,12,1,3,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,410.00000000,410.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,410.00000000,0.00000000,410.00000000,NULL,NULL,NULL),(68,'2020-06-12 17:12:08',3,NULL,'CO7001-0019',1,NULL,NULL,NULL,'2017-02-16 00:05:35','2019-02-16 00:05:35',NULL,'2020-05-19',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,45.00000000,45.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,45.00000000,0.00000000,45.00000000,NULL,NULL,NULL),(72,'2020-06-12 17:12:08',6,NULL,'CO7001-0020',1,NULL,NULL,NULL,'2017-02-16 00:05:36','2019-02-16 00:05:36','2021-01-16 02:42:56','2019-11-13',12,NULL,12,12,1,3,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,610.00000000,610.00000000,'','','',1,NULL,NULL,NULL,NULL,NULL,2,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,610.00000000,0.00000000,610.00000000,NULL,NULL,NULL),(75,'2020-06-12 17:12:08',4,NULL,'CO7001-0021',1,NULL,NULL,NULL,'2017-02-16 00:05:37','2019-02-16 04:14:20',NULL,'2020-02-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,25.00000000,49.88000000,0.00000000,1200.00000000,1274.88000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1200.00000000,25.00000000,1274.88000000,NULL,NULL,NULL),(78,'2020-06-12 17:12:08',12,NULL,'CO7001-0022',1,NULL,NULL,NULL,'2017-02-16 00:05:37','2019-02-16 00:05:37',NULL,'2019-10-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,928.00000000,928.00000000,'','','',0,NULL,NULL,2,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,928.00000000,0.00000000,928.00000000,NULL,NULL,NULL),(81,'2020-06-12 17:12:08',11,NULL,'CO7001-0023',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2019-02-16 00:05:38',NULL,'2019-07-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,725.00000000,725.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,725.00000000,0.00000000,725.00000000,NULL,NULL,NULL),(83,'2020-06-12 17:12:08',26,NULL,'CO7001-0024',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2019-02-16 00:05:38',NULL,'2020-04-03',12,NULL,12,NULL,1,-1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,105.00000000,105.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,105.00000000,0.00000000,105.00000000,NULL,NULL,NULL),(84,'2020-06-12 17:12:08',2,NULL,'CO7001-0025',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2019-02-16 00:05:38',NULL,'2019-06-19',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,510.00000000,510.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,510.00000000,0.00000000,510.00000000,NULL,NULL,NULL),(85,'2020-06-12 17:12:08',1,NULL,'CO7001-0026',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2019-02-16 00:05:38',NULL,'2020-01-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,47.00000000,47.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,47.00000000,0.00000000,47.00000000,NULL,NULL,NULL),(88,'2020-01-15 18:41:17',10,NULL,'CO7001-0027',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2019-12-20 20:42:42',NULL,'2019-12-23',12,12,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,'This is a private note','This is a public note','',0,NULL,NULL,1,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,'commande/CO7001-0027/CO7001-0027.pdf',NULL,NULL),(90,'2020-06-12 17:12:08',19,NULL,'(PROV90)',1,NULL,NULL,NULL,'2017-02-16 04:46:31',NULL,NULL,'2020-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,440.00000000,440.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,440.00000000,0.00000000,440.00000000,NULL,NULL,NULL),(91,'2020-06-12 17:12:08',1,NULL,'(PROV91)',1,NULL,NULL,NULL,'2017-02-16 04:46:37',NULL,NULL,'2020-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,1000.00000000,1000.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,NULL,NULL,NULL),(92,'2020-06-12 17:12:08',3,NULL,'(PROV92)',1,NULL,NULL,NULL,'2017-02-16 04:47:25',NULL,NULL,'2020-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,1018.00000000,1018.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1018.00000000,0.00000000,1018.00000000,NULL,NULL,NULL),(93,'2019-09-27 17:33:29',10,NULL,'(PROV93)',1,NULL,NULL,NULL,'2019-09-27 19:32:53',NULL,NULL,'2019-09-27',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,'commande/(PROV93)/(PROV93).pdf',NULL,NULL),(94,'2019-12-20 16:49:54',1,NULL,'(PROV94)',1,NULL,NULL,NULL,'2019-12-20 20:49:54',NULL,NULL,'2019-12-20',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,1000.00000000,1000.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,NULL,NULL,NULL),(95,'2019-12-20 16:50:23',1,NULL,'(PROV95)',1,NULL,NULL,NULL,'2019-12-20 20:50:23',NULL,NULL,'2019-12-20',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,1000.00000000,1000.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,NULL,NULL,NULL),(96,'2020-01-07 19:39:09',10,6,'(PROV96)',1,NULL,NULL,NULL,'2020-01-07 23:39:09',NULL,NULL,'2020-01-07',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'aaa','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,NULL,NULL,NULL),(97,'2020-01-07 19:43:06',10,6,'(PROV97)',1,NULL,NULL,NULL,'2020-01-07 23:43:06',NULL,NULL,'2020-01-07',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'aaa','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,NULL,NULL,NULL),(98,'2020-01-19 13:22:34',1,NULL,'(PROV98)',1,NULL,NULL,NULL,'2020-01-19 14:22:34',NULL,NULL,'2020-01-19',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.45000000,0.45000000,3.00000000,3.90000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,3.00000000,0.00000000,3.90000000,NULL,NULL,NULL),(99,'2020-01-19 13:24:27',1,NULL,'(PROV99)',1,NULL,NULL,NULL,'2020-01-19 14:24:27',NULL,NULL,'2020-01-19',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.24000000,0.00000000,0.00000000,4.00000000,4.24000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,4.00000000,0.24000000,4.24000000,NULL,NULL,NULL);
+INSERT INTO `llx_commande` VALUES (1,'2020-12-10 12:24:22',1,NULL,'CO1107-0002',1,NULL,NULL,'','2013-07-20 15:23:12','2020-08-08 13:59:09',NULL,'2020-07-20',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,1,1,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(2,'2020-12-10 12:24:22',1,NULL,'CO1107-0003',1,NULL,NULL,'','2013-07-20 23:20:12','2020-02-12 17:06:51',NULL,'2020-07-21',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(3,'2020-12-10 12:24:22',1,NULL,'CO1107-0004',1,NULL,NULL,'','2013-07-20 23:22:53','2020-02-17 18:27:56',NULL,'2020-07-21',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,30.00000000,30.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(5,'2020-12-10 12:24:22',1,NULL,'CO1108-0001',1,NULL,NULL,'','2013-08-08 03:04:11','2020-08-08 03:04:21',NULL,'2020-08-08',1,NULL,1,NULL,NULL,2,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(6,'2020-06-12 17:12:08',19,NULL,'(PROV6)',1,NULL,NULL,'','2015-02-17 16:22:14',NULL,NULL,'2020-02-17',1,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'','','einstein',0,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,'commande/(PROV6)/(PROV6).pdf',NULL,NULL),(17,'2020-06-12 17:12:08',4,NULL,'CO7001-0005',1,NULL,NULL,NULL,'2017-02-15 23:50:34','2019-02-15 23:50:34',NULL,'2020-05-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,509.00000000,509.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,509.00000000,0.00000000,509.00000000,NULL,NULL,NULL),(18,'2020-06-12 17:12:08',7,4,'CO7001-0006',1,NULL,NULL,NULL,'2017-02-15 23:51:23','2020-02-15 23:51:23',NULL,'2020-02-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,900.00000000,900.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,900.00000000,0.00000000,900.00000000,NULL,NULL,NULL),(20,'2020-06-12 17:12:08',4,NULL,'CO7001-0007',1,NULL,NULL,NULL,'2017-02-15 23:55:52','2019-02-15 23:55:52',NULL,'2020-04-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,330.00000000,330.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,330.00000000,0.00000000,330.00000000,NULL,NULL,NULL),(29,'2020-06-12 17:12:08',4,NULL,'CO7001-0008',1,NULL,NULL,NULL,'2017-02-16 00:03:44','2020-02-16 00:03:44',NULL,'2020-02-12',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,457.00000000,457.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,457.00000000,0.00000000,457.00000000,NULL,NULL,NULL),(34,'2020-06-12 17:12:08',11,NULL,'CO7001-0009',1,NULL,NULL,NULL,'2017-02-16 00:05:01','2020-02-16 00:05:01',NULL,'2020-01-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,124.00000000,124.00000000,'','','',0,NULL,NULL,2,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,124.00000000,0.00000000,124.00000000,NULL,NULL,NULL),(38,'2020-06-12 17:12:08',3,NULL,'CO7001-0010',1,NULL,NULL,NULL,'2017-02-16 00:05:01','2020-02-16 00:05:01',NULL,'2020-02-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,200.00000000,200.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,200.00000000,0.00000000,200.00000000,NULL,NULL,NULL),(40,'2020-06-12 17:12:08',11,NULL,'CO7001-0011',1,NULL,NULL,NULL,'2017-02-16 00:05:10','2020-02-16 00:05:11',NULL,'2020-01-23',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,1210.00000000,1210.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1210.00000000,0.00000000,1210.00000000,NULL,NULL,NULL),(43,'2020-06-12 17:12:08',10,NULL,'CO7001-0012',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2020-02-16 00:05:11',NULL,'2020-02-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,478.00000000,478.00000000,'','','',0,NULL,NULL,2,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,478.00000000,0.00000000,478.00000000,NULL,NULL,NULL),(47,'2020-12-10 12:24:22',1,NULL,'CO7001-0013',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2020-02-16 00:05:11',NULL,'2020-11-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,55.00000000,55.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,55.00000000,0.00000000,55.00000000,NULL,NULL,NULL),(48,'2020-12-10 12:24:22',4,NULL,'CO7001-0014',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2020-02-16 00:05:11',NULL,'2020-07-30',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,540.00000000,540.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,540.00000000,0.00000000,540.00000000,NULL,NULL,NULL),(50,'2020-06-12 17:12:08',1,NULL,'CO7001-0015',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2020-02-16 00:05:26',NULL,'2019-12-12',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,118.00000000,118.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,118.00000000,0.00000000,118.00000000,NULL,NULL,NULL),(54,'2020-06-12 17:12:08',12,NULL,'CO7001-0016',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2019-02-16 00:05:26','2019-02-16 03:05:56','2020-06-03',12,NULL,12,12,1,3,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,220.00000000,220.00000000,'','','',1,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,220.00000000,0.00000000,220.00000000,NULL,NULL,NULL),(58,'2020-12-10 12:24:22',1,NULL,'CO7001-0017',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2020-02-16 00:05:26',NULL,'2020-07-23',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,436.00000000,436.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,436.00000000,0.00000000,436.00000000,NULL,NULL,NULL),(62,'2020-06-12 17:12:08',19,NULL,'CO7001-0018',1,NULL,NULL,NULL,'2017-02-16 00:05:35','2019-02-16 00:05:35','2020-12-20 20:48:55','2020-02-23',12,NULL,12,12,1,3,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,410.00000000,410.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,410.00000000,0.00000000,410.00000000,NULL,NULL,NULL),(68,'2020-06-12 17:12:08',3,NULL,'CO7001-0019',1,NULL,NULL,NULL,'2017-02-16 00:05:35','2019-02-16 00:05:35',NULL,'2020-05-19',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,45.00000000,45.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,45.00000000,0.00000000,45.00000000,NULL,NULL,NULL),(72,'2020-12-10 12:24:22',6,NULL,'CO7001-0020',1,NULL,NULL,NULL,'2017-02-16 00:05:36','2020-02-16 00:05:36','2021-01-16 02:42:56','2020-11-13',12,NULL,12,12,1,3,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,610.00000000,610.00000000,'','','',1,NULL,NULL,NULL,NULL,NULL,2,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,610.00000000,0.00000000,610.00000000,NULL,NULL,NULL),(75,'2020-06-12 17:12:08',4,NULL,'CO7001-0021',1,NULL,NULL,NULL,'2017-02-16 00:05:37','2019-02-16 04:14:20',NULL,'2020-02-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,25.00000000,49.88000000,0.00000000,1200.00000000,1274.88000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1200.00000000,25.00000000,1274.88000000,NULL,NULL,NULL),(78,'2020-12-10 12:24:22',12,NULL,'CO7001-0022',1,NULL,NULL,NULL,'2017-02-16 00:05:37','2020-02-16 00:05:37',NULL,'2020-10-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,928.00000000,928.00000000,'','','',0,NULL,NULL,2,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,928.00000000,0.00000000,928.00000000,NULL,NULL,NULL),(81,'2020-12-10 12:24:22',11,NULL,'CO7001-0023',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2020-02-16 00:05:38',NULL,'2020-07-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,725.00000000,725.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,725.00000000,0.00000000,725.00000000,NULL,NULL,NULL),(83,'2020-06-12 17:12:08',26,NULL,'CO7001-0024',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2019-02-16 00:05:38',NULL,'2020-04-03',12,NULL,12,NULL,1,-1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,105.00000000,105.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,105.00000000,0.00000000,105.00000000,NULL,NULL,NULL),(84,'2020-12-10 12:24:22',2,NULL,'CO7001-0025',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2020-02-16 00:05:38',NULL,'2020-06-19',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,510.00000000,510.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,510.00000000,0.00000000,510.00000000,NULL,NULL,NULL),(85,'2020-06-12 17:12:08',1,NULL,'CO7001-0026',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2019-02-16 00:05:38',NULL,'2020-01-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,47.00000000,47.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,47.00000000,0.00000000,47.00000000,NULL,NULL,NULL),(88,'2020-01-15 18:41:17',10,NULL,'CO7001-0027',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2019-12-20 20:42:42',NULL,'2019-12-23',12,12,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,'This is a private note','This is a public note','',0,NULL,NULL,1,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,'commande/CO7001-0027/CO7001-0027.pdf',NULL,NULL),(90,'2020-06-12 17:12:08',19,NULL,'(PROV90)',1,NULL,NULL,NULL,'2017-02-16 04:46:31',NULL,NULL,'2020-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,440.00000000,440.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,440.00000000,0.00000000,440.00000000,NULL,NULL,NULL),(91,'2020-06-12 17:12:08',1,NULL,'(PROV91)',1,NULL,NULL,NULL,'2017-02-16 04:46:37',NULL,NULL,'2020-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,1000.00000000,1000.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,NULL,NULL,NULL),(92,'2020-06-12 17:12:08',3,NULL,'(PROV92)',1,NULL,NULL,NULL,'2017-02-16 04:47:25',NULL,NULL,'2020-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,1018.00000000,1018.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1018.00000000,0.00000000,1018.00000000,NULL,NULL,NULL),(93,'2020-12-10 12:24:22',10,NULL,'(PROV93)',1,NULL,NULL,NULL,'2019-09-27 19:32:53',NULL,NULL,'2020-09-27',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,'commande/(PROV93)/(PROV93).pdf',NULL,NULL),(94,'2019-12-20 16:49:54',1,NULL,'(PROV94)',1,NULL,NULL,NULL,'2019-12-20 20:49:54',NULL,NULL,'2019-12-20',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,1000.00000000,1000.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,NULL,NULL,NULL),(95,'2019-12-20 16:50:23',1,NULL,'(PROV95)',1,NULL,NULL,NULL,'2019-12-20 20:50:23',NULL,NULL,'2019-12-20',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,1000.00000000,1000.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,NULL,NULL,NULL),(96,'2020-01-07 19:39:09',10,6,'(PROV96)',1,NULL,NULL,NULL,'2020-01-07 23:39:09',NULL,NULL,'2020-01-07',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'aaa','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,NULL,NULL,NULL),(97,'2020-01-07 19:43:06',10,6,'(PROV97)',1,NULL,NULL,NULL,'2020-01-07 23:43:06',NULL,NULL,'2020-01-07',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'aaa','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,NULL,NULL,NULL),(98,'2020-01-19 13:22:34',1,NULL,'(PROV98)',1,NULL,NULL,NULL,'2020-01-19 14:22:34',NULL,NULL,'2020-01-19',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.45000000,0.45000000,3.00000000,3.90000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,3.00000000,0.00000000,3.90000000,NULL,NULL,NULL),(99,'2020-01-19 13:24:27',1,NULL,'(PROV99)',1,NULL,NULL,NULL,'2020-01-19 14:24:27',NULL,NULL,'2020-01-19',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.24000000,0.00000000,0.00000000,4.00000000,4.24000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,4.00000000,0.24000000,4.24000000,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_commande` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4259,7 +4838,7 @@ CREATE TABLE `llx_commande_fournisseur` (
 
 LOCK TABLES `llx_commande_fournisseur` WRITE;
 /*!40000 ALTER TABLE `llx_commande_fournisseur` DISABLE KEYS */;
-INSERT INTO `llx_commande_fournisseur` VALUES (1,'2020-06-12 17:12:08',13,'CF1007-0001',1,NULL,NULL,NULL,'2020-07-11 17:13:40','2020-02-01 18:51:42','2020-02-01 18:52:04',NULL,'2020-02-01',1,NULL,12,12,NULL,0,5,0,0.00000000,0,0,39.20000000,0.00000000,0.00000000,200.00000000,239.20000000,NULL,NULL,'muscadet',2,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(2,'2020-06-12 17:12:09',1,'CF1007-0002',1,NULL,NULL,NULL,'2019-07-11 18:46:28','2019-07-11 18:47:33',NULL,NULL,'2019-07-11',1,NULL,1,NULL,NULL,0,3,0,0.00000000,0,0,0.00000000,0.00000000,0.00000000,200.00000000,200.00000000,NULL,NULL,'muscadet',4,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(3,'2020-01-20 11:22:53',17,'(PROV3)',1,NULL,NULL,NULL,'2013-08-04 23:00:52',NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,0,0,0,0.00000000,0,0,0.00000000,0.00000000,0.00000000,1079.17000000,1079.17000000,NULL,NULL,'muscadet',0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'USD',1.20000000,1295.00000000,0.00000000,1295.00000000,NULL),(4,'2020-01-20 11:19:49',17,'(PROV4)',1,NULL,NULL,NULL,'2013-08-04 23:19:32',NULL,NULL,NULL,NULL,1,12,NULL,NULL,NULL,0,0,0,0.00000000,0,0,11.88000000,0.00000000,0.00000000,174.17000000,186.05000000,'Private note','Public note','muscadet',0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'EUR',1.00000000,174.17000000,11.88000000,186.05000000,NULL),(13,'2020-06-12 17:12:09',1,'CF1303-0004',1,NULL,NULL,NULL,'2020-03-09 19:39:18','2020-03-09 19:39:27','2020-03-09 19:39:32',NULL,'2020-03-09',1,NULL,1,1,NULL,0,2,0,0.00000000,0,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,NULL,NULL,'muscadet',1,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(14,'2020-01-20 11:20:11',1,'(PROV14)',1,NULL,'',NULL,'2020-01-20 12:20:11',NULL,NULL,NULL,NULL,12,NULL,NULL,NULL,NULL,0,0,0,NULL,0,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'','','muscadet',0,1,NULL,NULL,NULL,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,NULL);
+INSERT INTO `llx_commande_fournisseur` VALUES (1,'2020-06-12 17:12:08',13,'CF1007-0001',1,NULL,NULL,NULL,'2020-07-11 17:13:40','2020-02-01 18:51:42','2020-02-01 18:52:04',NULL,'2020-02-01',1,NULL,12,12,NULL,0,5,0,0.00000000,0,0,39.20000000,0.00000000,0.00000000,200.00000000,239.20000000,NULL,NULL,'muscadet',2,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(2,'2020-12-10 12:24:23',1,'CF1007-0002',1,NULL,NULL,NULL,'2020-07-11 18:46:28','2020-07-11 18:47:33',NULL,NULL,'2020-07-11',1,NULL,1,NULL,NULL,0,3,0,0.00000000,0,0,0.00000000,0.00000000,0.00000000,200.00000000,200.00000000,NULL,NULL,'muscadet',4,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(3,'2020-01-20 11:22:53',17,'(PROV3)',1,NULL,NULL,NULL,'2013-08-04 23:00:52',NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,0,0,0,0.00000000,0,0,0.00000000,0.00000000,0.00000000,1079.17000000,1079.17000000,NULL,NULL,'muscadet',0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'USD',1.20000000,1295.00000000,0.00000000,1295.00000000,NULL),(4,'2020-01-20 11:19:49',17,'(PROV4)',1,NULL,NULL,NULL,'2013-08-04 23:19:32',NULL,NULL,NULL,NULL,1,12,NULL,NULL,NULL,0,0,0,0.00000000,0,0,11.88000000,0.00000000,0.00000000,174.17000000,186.05000000,'Private note','Public note','muscadet',0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'EUR',1.00000000,174.17000000,11.88000000,186.05000000,NULL),(13,'2020-06-12 17:12:09',1,'CF1303-0004',1,NULL,NULL,NULL,'2020-03-09 19:39:18','2020-03-09 19:39:27','2020-03-09 19:39:32',NULL,'2020-03-09',1,NULL,1,1,NULL,0,2,0,0.00000000,0,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,NULL,NULL,'muscadet',1,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(14,'2020-01-20 11:20:11',1,'(PROV14)',1,NULL,'',NULL,'2020-01-20 12:20:11',NULL,NULL,NULL,NULL,12,NULL,NULL,NULL,NULL,0,0,0,NULL,0,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'','','muscadet',0,1,NULL,NULL,NULL,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,NULL);
 /*!40000 ALTER TABLE `llx_commande_fournisseur` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4428,6 +5007,8 @@ CREATE TABLE `llx_commande_fournisseurdet` (
   `multicurrency_total_ttc` double(24,8) DEFAULT 0.00000000,
   PRIMARY KEY (`rowid`),
   KEY `fk_commande_fournisseurdet_fk_unit` (`fk_unit`),
+  KEY `idx_commande_fournisseurdet_fk_commande` (`fk_commande`),
+  KEY `idx_commande_fournisseurdet_fk_product` (`fk_product`),
   CONSTRAINT `fk_commande_fournisseurdet_fk_unit` FOREIGN KEY (`fk_unit`) REFERENCES `llx_c_units` (`rowid`)
 ) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -4442,6 +5023,52 @@ INSERT INTO `llx_commande_fournisseurdet` VALUES (1,1,NULL,NULL,'','','Chips',19
 /*!40000 ALTER TABLE `llx_commande_fournisseurdet` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_commande_fournisseurdet_asset`
+--
+
+DROP TABLE IF EXISTS `llx_commande_fournisseurdet_asset`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_commande_fournisseurdet_asset` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_commandedet` int(11) NOT NULL DEFAULT 0,
+  `fk_product` int(11) NOT NULL DEFAULT 0,
+  `fk_warehouse` int(11) NOT NULL DEFAULT 0,
+  `rang` int(11) NOT NULL DEFAULT 0,
+  `lot_number` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `carton` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `numerosuivi` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `imei` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `firmware` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `serial_number` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `weight` double NOT NULL DEFAULT 0,
+  `weight_reel` double NOT NULL DEFAULT 0,
+  `tare` double NOT NULL DEFAULT 0,
+  `dluo` datetime DEFAULT NULL,
+  `weight_unit` int(11) NOT NULL DEFAULT 0,
+  `weight_reel_unit` int(11) NOT NULL DEFAULT 0,
+  `tare_unit` int(11) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `fk_commandedet` (`fk_commandedet`),
+  KEY `fk_product` (`fk_product`),
+  KEY `fk_warehouse` (`fk_warehouse`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_commande_fournisseurdet_asset`
+--
+
+LOCK TABLES `llx_commande_fournisseurdet_asset` WRITE;
+/*!40000 ALTER TABLE `llx_commande_fournisseurdet_asset` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_commande_fournisseurdet_asset` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_commande_fournisseurdet_extrafields`
 --
@@ -4481,6 +5108,7 @@ CREATE TABLE `llx_commandedet` (
   `fk_parent_line` int(11) DEFAULT NULL,
   `fk_product` int(11) DEFAULT NULL,
   `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
   `tva_tx` double(6,3) DEFAULT NULL,
   `vat_src_code` varchar(10) COLLATE utf8_unicode_ci DEFAULT '',
@@ -4533,7 +5161,7 @@ CREATE TABLE `llx_commandedet` (
 
 LOCK TABLES `llx_commandedet` WRITE;
 /*!40000 ALTER TABLE `llx_commandedet` DISABLE KEYS */;
-INSERT INTO `llx_commandedet` VALUES (1,1,NULL,NULL,NULL,'Product 1',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(2,1,NULL,2,NULL,'',0.000,'',0.000,'',0.000,'',1,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(3,1,NULL,5,NULL,'cccc',0.000,'',0.000,'',0.000,'',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(4,2,NULL,NULL,NULL,'hgf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(10,5,NULL,NULL,NULL,'gfdgdf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(14,3,NULL,NULL,NULL,'gdfgdf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,1,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(15,3,NULL,NULL,NULL,'fghfgh',0.000,'',0.000,'',0.000,'',1,0,0,NULL,20,20.00000000,20.00000000,0.00000000,0.00000000,0.00000000,20.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(16,17,NULL,2,NULL,'',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(17,17,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(18,17,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9,9.00000000,9.00000000,0.00000000,0.00000000,0.00000000,9.00000000,1,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',9.00000000,9.00000000,0.00000000,9.00000000),(19,18,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(20,18,NULL,3,NULL,'',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(21,18,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(24,20,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,5,5.00000000,20.00000000,0.00000000,0.00000000,0.00000000,20.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',5.00000000,20.00000000,0.00000000,20.00000000),(25,20,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,100,100.00000000,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,300.00000000,0.00000000,300.00000000),(26,20,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5,5.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(55,29,NULL,2,NULL,'',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(56,29,NULL,3,NULL,'',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(57,29,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(58,29,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,9,9.00000000,27.00000000,0.00000000,0.00000000,0.00000000,27.00000000,1,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',9.00000000,27.00000000,0.00000000,27.00000000),(59,29,NULL,5,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,10,10.00000000,30.00000000,0.00000000,0.00000000,0.00000000,30.00000000,0,NULL,NULL,0,NULL,0.00000000,0,5,NULL,NULL,NULL,0,'EUR',10.00000000,30.00000000,0.00000000,30.00000000),(75,34,NULL,3,NULL,'',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(76,34,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,5,5.00000000,15.00000000,0.00000000,0.00000000,0.00000000,15.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',5.00000000,15.00000000,0.00000000,15.00000000),(77,34,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100,100.00000000,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,100.00000000,0.00000000,100.00000000),(78,34,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9,9.00000000,9.00000000,0.00000000,0.00000000,0.00000000,9.00000000,1,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',9.00000000,9.00000000,0.00000000,9.00000000),(94,38,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(95,38,NULL,2,NULL,'',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(99,40,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(100,40,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(101,40,NULL,3,NULL,'',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(102,40,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5,5.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(103,40,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,5,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(112,43,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,9,9.00000000,18.00000000,0.00000000,0.00000000,0.00000000,18.00000000,1,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',9.00000000,18.00000000,0.00000000,18.00000000),(113,43,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,9,9.00000000,45.00000000,0.00000000,0.00000000,0.00000000,45.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',9.00000000,45.00000000,0.00000000,45.00000000),(114,43,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(115,43,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,5,5.00000000,15.00000000,0.00000000,0.00000000,0.00000000,15.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',5.00000000,15.00000000,0.00000000,15.00000000),(116,43,NULL,2,NULL,'',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,5,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(125,47,NULL,2,NULL,'',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(126,47,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,5,5.00000000,15.00000000,0.00000000,0.00000000,0.00000000,15.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',5.00000000,15.00000000,0.00000000,15.00000000),(127,47,NULL,3,NULL,'',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(128,47,NULL,5,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,10,10.00000000,40.00000000,0.00000000,0.00000000,0.00000000,40.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',10.00000000,40.00000000,0.00000000,40.00000000),(129,48,NULL,5,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,10,10.00000000,40.00000000,0.00000000,0.00000000,0.00000000,40.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',10.00000000,40.00000000,0.00000000,40.00000000),(130,48,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(134,50,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100,100.00000000,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,100.00000000,0.00000000,100.00000000),(135,50,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,9,9.00000000,18.00000000,0.00000000,0.00000000,0.00000000,18.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',9.00000000,18.00000000,0.00000000,18.00000000),(145,54,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(146,54,NULL,5,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,10,10.00000000,20.00000000,0.00000000,0.00000000,0.00000000,20.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',10.00000000,20.00000000,0.00000000,20.00000000),(158,58,NULL,2,NULL,'',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(159,58,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(160,58,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,9,9.00000000,36.00000000,0.00000000,0.00000000,0.00000000,36.00000000,1,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',9.00000000,36.00000000,0.00000000,36.00000000),(174,62,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5,5.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(175,62,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(176,62,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(198,68,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,9,9.00000000,45.00000000,0.00000000,0.00000000,0.00000000,45.00000000,1,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',9.00000000,45.00000000,0.00000000,45.00000000),(199,68,NULL,2,NULL,'',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(209,72,NULL,3,NULL,'',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(210,72,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(211,72,NULL,5,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',10.00000000,10.00000000,0.00000000,10.00000000),(212,72,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(213,72,NULL,3,NULL,'',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,5,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(227,75,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(235,78,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(236,78,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,9,9.00000000,18.00000000,0.00000000,0.00000000,0.00000000,18.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',9.00000000,18.00000000,0.00000000,18.00000000),(237,78,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5,5.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(238,78,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(246,81,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(247,81,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,100,100.00000000,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,300.00000000,0.00000000,300.00000000),(248,81,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,5,5.00000000,25.00000000,0.00000000,0.00000000,0.00000000,25.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',5.00000000,25.00000000,0.00000000,25.00000000),(253,83,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,5,5.00000000,5.00000000,0.00000000,0.00000000,0.00000000,5.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',5.00000000,5.00000000,0.00000000,5.00000000),(254,83,NULL,3,NULL,'',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(255,83,NULL,5,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,10,10.00000000,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',10.00000000,50.00000000,0.00000000,50.00000000),(256,83,NULL,5,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,10,10.00000000,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',10.00000000,50.00000000,0.00000000,50.00000000),(257,84,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(258,84,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5,5.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(259,84,NULL,3,NULL,'',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(260,85,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,9,9.00000000,27.00000000,0.00000000,0.00000000,0.00000000,27.00000000,1,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',9.00000000,27.00000000,0.00000000,27.00000000),(261,85,NULL,3,NULL,'',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(262,85,NULL,5,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,10,10.00000000,20.00000000,0.00000000,0.00000000,0.00000000,20.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',10.00000000,20.00000000,0.00000000,20.00000000),(271,88,NULL,5,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,10,10.00000000,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',10.00000000,50.00000000,0.00000000,50.00000000),(272,88,NULL,3,NULL,'',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(276,75,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100,100.00000000,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,90.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,100.00000000,0.00000000,100.00000000),(278,75,NULL,13,NULL,'A powerfull computer XP4523&nbsp;<br />\r\n(Code douane: USXP765 - Pays d&#39;origine: Etats-Unis)',5.000,'',9.975,'1',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,25.00000000,49.88000000,0.00000000,574.88000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,25.00000000,574.88000000),(279,75,NULL,13,NULL,'A powerfull computer XP4523&nbsp;<br>\n(Code douane: USXP765 - Pays d\'origine: Etats-Unis)',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(280,90,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5,5.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(281,90,NULL,5,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,10,10.00000000,30.00000000,0.00000000,0.00000000,0.00000000,30.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',10.00000000,30.00000000,0.00000000,30.00000000),(282,90,NULL,2,NULL,'',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(283,90,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(284,91,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,100,100.00000000,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,300.00000000,0.00000000,300.00000000),(285,91,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(286,91,NULL,13,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(287,92,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(288,92,NULL,13,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,100,100.00000000,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,300.00000000,0.00000000,300.00000000),(289,92,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(290,92,NULL,13,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100,100.00000000,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',100.00000000,100.00000000,0.00000000,100.00000000),(291,92,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,9,9.00000000,18.00000000,0.00000000,0.00000000,0.00000000,18.00000000,0,NULL,NULL,0,NULL,0.00000000,0,5,NULL,NULL,NULL,0,'EUR',9.00000000,18.00000000,0.00000000,18.00000000),(292,6,NULL,11,NULL,'A nice rollup',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,'',0.00000000,0.00000000,0.00000000,0.00000000),(295,93,NULL,11,NULL,'A nice rollup',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,1,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(296,94,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,100,100.00000000,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,'EUR',100.00000000,300.00000000,0.00000000,300.00000000),(297,94,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,NULL,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(298,94,NULL,13,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,NULL,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(299,95,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,100,100.00000000,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,'EUR',100.00000000,300.00000000,0.00000000,300.00000000),(300,95,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,NULL,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(301,95,NULL,13,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,NULL,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(302,96,NULL,NULL,NULL,'fd',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,'EUR',10.00000000,10.00000000,0.00000000,10.00000000),(303,97,NULL,NULL,NULL,'fd',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,'EUR',10.00000000,10.00000000,0.00000000,10.00000000),(304,98,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'CGST+SGST',9.000,'1',9.000,'1',1,0,0,NULL,5,5.00000000,5.00000000,0.00000000,0.45000000,0.45000000,5.90000000,0,NULL,NULL,0,NULL,10.00000000,0,1,NULL,NULL,NULL,NULL,'EUR',5.00000000,5.00000000,0.00000000,5.90000000),(305,98,NULL,NULL,NULL,'aaa',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,-2,-2.00000000,-2.00000000,0.00000000,0.00000000,0.00000000,-2.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,NULL,'EUR',-2.00000000,-2.00000000,0.00000000,-2.00000000),(306,99,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',4.000,'',0.000,'0',0.000,'0',1,0,0,NULL,6,6.00000000,6.00000000,0.24000000,0.00000000,0.00000000,6.24000000,0,NULL,NULL,0,NULL,10.00000000,0,1,NULL,NULL,NULL,NULL,'EUR',6.00000000,6.00000000,0.24000000,6.24000000),(307,99,NULL,NULL,NULL,'aaa',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,-2,-2.00000000,-2.00000000,0.00000000,0.00000000,0.00000000,-2.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,NULL,'EUR',-2.00000000,-2.00000000,0.00000000,-2.00000000);
+INSERT INTO `llx_commandedet` VALUES (1,1,NULL,NULL,NULL,NULL,'Product 1',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(2,1,NULL,2,NULL,NULL,'',0.000,'',0.000,'',0.000,'',1,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(3,1,NULL,5,NULL,NULL,'cccc',0.000,'',0.000,'',0.000,'',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(4,2,NULL,NULL,NULL,NULL,'hgf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(10,5,NULL,NULL,NULL,NULL,'gfdgdf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(14,3,NULL,NULL,NULL,NULL,'gdfgdf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,1,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(15,3,NULL,NULL,NULL,NULL,'fghfgh',0.000,'',0.000,'',0.000,'',1,0,0,NULL,20,20.00000000,20.00000000,0.00000000,0.00000000,0.00000000,20.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(16,17,NULL,2,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(17,17,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(18,17,NULL,12,NULL,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9,9.00000000,9.00000000,0.00000000,0.00000000,0.00000000,9.00000000,1,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',9.00000000,9.00000000,0.00000000,9.00000000),(19,18,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(20,18,NULL,3,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(21,18,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(24,20,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,5,5.00000000,20.00000000,0.00000000,0.00000000,0.00000000,20.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',5.00000000,20.00000000,0.00000000,20.00000000),(25,20,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,100,100.00000000,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,300.00000000,0.00000000,300.00000000),(26,20,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5,5.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(55,29,NULL,2,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(56,29,NULL,3,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(57,29,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(58,29,NULL,12,NULL,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,9,9.00000000,27.00000000,0.00000000,0.00000000,0.00000000,27.00000000,1,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',9.00000000,27.00000000,0.00000000,27.00000000),(59,29,NULL,5,NULL,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,10,10.00000000,30.00000000,0.00000000,0.00000000,0.00000000,30.00000000,0,NULL,NULL,0,NULL,0.00000000,0,5,NULL,NULL,NULL,0,'EUR',10.00000000,30.00000000,0.00000000,30.00000000),(75,34,NULL,3,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(76,34,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,5,5.00000000,15.00000000,0.00000000,0.00000000,0.00000000,15.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',5.00000000,15.00000000,0.00000000,15.00000000),(77,34,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100,100.00000000,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,100.00000000,0.00000000,100.00000000),(78,34,NULL,12,NULL,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9,9.00000000,9.00000000,0.00000000,0.00000000,0.00000000,9.00000000,1,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',9.00000000,9.00000000,0.00000000,9.00000000),(94,38,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(95,38,NULL,2,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(99,40,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(100,40,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(101,40,NULL,3,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(102,40,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5,5.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(103,40,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,5,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(112,43,NULL,12,NULL,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,9,9.00000000,18.00000000,0.00000000,0.00000000,0.00000000,18.00000000,1,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',9.00000000,18.00000000,0.00000000,18.00000000),(113,43,NULL,12,NULL,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,9,9.00000000,45.00000000,0.00000000,0.00000000,0.00000000,45.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',9.00000000,45.00000000,0.00000000,45.00000000),(114,43,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(115,43,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,5,5.00000000,15.00000000,0.00000000,0.00000000,0.00000000,15.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',5.00000000,15.00000000,0.00000000,15.00000000),(116,43,NULL,2,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,5,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(125,47,NULL,2,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(126,47,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,5,5.00000000,15.00000000,0.00000000,0.00000000,0.00000000,15.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',5.00000000,15.00000000,0.00000000,15.00000000),(127,47,NULL,3,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(128,47,NULL,5,NULL,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,10,10.00000000,40.00000000,0.00000000,0.00000000,0.00000000,40.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',10.00000000,40.00000000,0.00000000,40.00000000),(129,48,NULL,5,NULL,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,10,10.00000000,40.00000000,0.00000000,0.00000000,0.00000000,40.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',10.00000000,40.00000000,0.00000000,40.00000000),(130,48,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(134,50,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100,100.00000000,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,100.00000000,0.00000000,100.00000000),(135,50,NULL,12,NULL,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,9,9.00000000,18.00000000,0.00000000,0.00000000,0.00000000,18.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',9.00000000,18.00000000,0.00000000,18.00000000),(145,54,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(146,54,NULL,5,NULL,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,10,10.00000000,20.00000000,0.00000000,0.00000000,0.00000000,20.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',10.00000000,20.00000000,0.00000000,20.00000000),(158,58,NULL,2,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(159,58,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(160,58,NULL,12,NULL,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,9,9.00000000,36.00000000,0.00000000,0.00000000,0.00000000,36.00000000,1,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',9.00000000,36.00000000,0.00000000,36.00000000),(174,62,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5,5.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(175,62,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(176,62,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(198,68,NULL,12,NULL,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,9,9.00000000,45.00000000,0.00000000,0.00000000,0.00000000,45.00000000,1,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',9.00000000,45.00000000,0.00000000,45.00000000),(199,68,NULL,2,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(209,72,NULL,3,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(210,72,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(211,72,NULL,5,NULL,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',10.00000000,10.00000000,0.00000000,10.00000000),(212,72,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(213,72,NULL,3,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,5,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(227,75,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(235,78,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(236,78,NULL,12,NULL,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,9,9.00000000,18.00000000,0.00000000,0.00000000,0.00000000,18.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',9.00000000,18.00000000,0.00000000,18.00000000),(237,78,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5,5.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(238,78,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(246,81,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(247,81,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,100,100.00000000,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,300.00000000,0.00000000,300.00000000),(248,81,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,5,5.00000000,25.00000000,0.00000000,0.00000000,0.00000000,25.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',5.00000000,25.00000000,0.00000000,25.00000000),(253,83,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,5,5.00000000,5.00000000,0.00000000,0.00000000,0.00000000,5.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',5.00000000,5.00000000,0.00000000,5.00000000),(254,83,NULL,3,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(255,83,NULL,5,NULL,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,10,10.00000000,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',10.00000000,50.00000000,0.00000000,50.00000000),(256,83,NULL,5,NULL,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,10,10.00000000,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',10.00000000,50.00000000,0.00000000,50.00000000),(257,84,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(258,84,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5,5.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(259,84,NULL,3,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(260,85,NULL,12,NULL,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,9,9.00000000,27.00000000,0.00000000,0.00000000,0.00000000,27.00000000,1,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',9.00000000,27.00000000,0.00000000,27.00000000),(261,85,NULL,3,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(262,85,NULL,5,NULL,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,10,10.00000000,20.00000000,0.00000000,0.00000000,0.00000000,20.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',10.00000000,20.00000000,0.00000000,20.00000000),(271,88,NULL,5,NULL,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,10,10.00000000,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',10.00000000,50.00000000,0.00000000,50.00000000),(272,88,NULL,3,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(276,75,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100,100.00000000,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,90.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,100.00000000,0.00000000,100.00000000),(278,75,NULL,13,NULL,NULL,'A powerfull computer XP4523&nbsp;<br />\r\n(Code douane: USXP765 - Pays d&#39;origine: Etats-Unis)',5.000,'',9.975,'1',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,25.00000000,49.88000000,0.00000000,574.88000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,25.00000000,574.88000000),(279,75,NULL,13,NULL,NULL,'A powerfull computer XP4523&nbsp;<br>\n(Code douane: USXP765 - Pays d\'origine: Etats-Unis)',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(280,90,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5,5.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(281,90,NULL,5,NULL,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,10,10.00000000,30.00000000,0.00000000,0.00000000,0.00000000,30.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',10.00000000,30.00000000,0.00000000,30.00000000),(282,90,NULL,2,NULL,NULL,'',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(283,90,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(284,91,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,100,100.00000000,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,300.00000000,0.00000000,300.00000000),(285,91,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(286,91,NULL,13,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(287,92,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',4,0,0,NULL,100,100.00000000,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,0,'EUR',100.00000000,400.00000000,0.00000000,400.00000000),(288,92,NULL,13,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,100,100.00000000,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,0,'EUR',100.00000000,300.00000000,0.00000000,300.00000000),(289,92,NULL,10,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,0,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(290,92,NULL,13,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100,100.00000000,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4,NULL,NULL,NULL,0,'EUR',100.00000000,100.00000000,0.00000000,100.00000000),(291,92,NULL,12,NULL,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,9,9.00000000,18.00000000,0.00000000,0.00000000,0.00000000,18.00000000,0,NULL,NULL,0,NULL,0.00000000,0,5,NULL,NULL,NULL,0,'EUR',9.00000000,18.00000000,0.00000000,18.00000000),(292,6,NULL,11,NULL,NULL,'A nice rollup',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,'',0.00000000,0.00000000,0.00000000,0.00000000),(295,93,NULL,11,NULL,NULL,'A nice rollup',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,1,'EUR',0.00000000,0.00000000,0.00000000,0.00000000),(296,94,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,100,100.00000000,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,'EUR',100.00000000,300.00000000,0.00000000,300.00000000),(297,94,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,NULL,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(298,94,NULL,13,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,NULL,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(299,95,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',3,0,0,NULL,100,100.00000000,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,'EUR',100.00000000,300.00000000,0.00000000,300.00000000),(300,95,NULL,1,NULL,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',5,0,0,NULL,100,100.00000000,500.00000000,0.00000000,0.00000000,0.00000000,500.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,NULL,'EUR',100.00000000,500.00000000,0.00000000,500.00000000),(301,95,NULL,13,NULL,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100,100.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL,NULL,NULL,NULL,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(302,96,NULL,NULL,NULL,NULL,'fd',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,'EUR',10.00000000,10.00000000,0.00000000,10.00000000),(303,97,NULL,NULL,NULL,NULL,'fd',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL,NULL,NULL,NULL,'EUR',10.00000000,10.00000000,0.00000000,10.00000000),(304,98,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'CGST+SGST',9.000,'1',9.000,'1',1,0,0,NULL,5,5.00000000,5.00000000,0.00000000,0.45000000,0.45000000,5.90000000,0,NULL,NULL,0,NULL,10.00000000,0,1,NULL,NULL,NULL,NULL,'EUR',5.00000000,5.00000000,0.00000000,5.90000000),(305,98,NULL,NULL,NULL,NULL,'aaa',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,-2,-2.00000000,-2.00000000,0.00000000,0.00000000,0.00000000,-2.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,NULL,'EUR',-2.00000000,-2.00000000,0.00000000,-2.00000000),(306,99,NULL,4,NULL,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',4.000,'',0.000,'0',0.000,'0',1,0,0,NULL,6,6.00000000,6.00000000,0.24000000,0.00000000,0.00000000,6.24000000,0,NULL,NULL,0,NULL,10.00000000,0,1,NULL,NULL,NULL,NULL,'EUR',6.00000000,6.00000000,0.24000000,6.24000000),(307,99,NULL,NULL,NULL,NULL,'aaa',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,-2,-2.00000000,-2.00000000,0.00000000,0.00000000,0.00000000,-2.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL,NULL,NULL,NULL,'EUR',-2.00000000,-2.00000000,0.00000000,-2.00000000);
 /*!40000 ALTER TABLE `llx_commandedet` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4643,7 +5271,7 @@ CREATE TABLE `llx_const` (
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_const` (`name`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=8577 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=8646 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4652,7 +5280,7 @@ CREATE TABLE `llx_const` (
 
 LOCK TABLES `llx_const` WRITE;
 /*!40000 ALTER TABLE `llx_const` DISABLE KEYS */;
-INSERT INTO `llx_const` VALUES (8,'MAIN_UPLOAD_DOC',0,'2048','chaine',0,'Max size for file upload (0 means no upload allowed)','2012-07-08 11:17:57'),(9,'MAIN_SEARCHFORM_SOCIETE',0,'1','yesno',0,'Show form for quick company search','2012-07-08 11:17:57'),(10,'MAIN_SEARCHFORM_CONTACT',0,'1','yesno',0,'Show form for quick contact search','2012-07-08 11:17:57'),(11,'MAIN_SEARCHFORM_PRODUITSERVICE',0,'1','yesno',0,'Show form for quick product search','2012-07-08 11:17:58'),(12,'MAIN_SEARCHFORM_ADHERENT',0,'1','yesno',0,'Show form for quick member search','2012-07-08 11:17:58'),(16,'MAIN_SIZE_LISTE_LIMIT',0,'25','chaine',0,'Longueur maximum des listes','2012-07-08 11:17:58'),(29,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',1,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2012-07-08 11:17:58'),(33,'SOCIETE_NOLIST_COURRIER',0,'1','yesno',0,'Liste les fichiers du repertoire courrier','2012-07-08 11:17:58'),(36,'ADHERENT_MAIL_REQUIRED',1,'1','yesno',0,'EMail required to create a new member','2012-07-08 11:17:58'),(37,'ADHERENT_MAIL_FROM',1,'adherents@domain.com','chaine',0,'Sender EMail for automatic emails','2012-07-08 11:17:58'),(38,'ADHERENT_MAIL_RESIL',1,'Your subscription has been resiliated.\r\nWe hope to see you soon again','html',0,'Mail resiliation','2018-11-23 11:56:07'),(39,'ADHERENT_MAIL_VALID',1,'Your subscription has been validated.\r\nThis is a remind of your personal information :\r\n\r\n%INFOS%\r\n\r\n','html',0,'Mail de validation','2018-11-23 11:56:07'),(40,'ADHERENT_MAIL_COTIS',1,'Hello %PRENOM%,\r\nThanks for your subscription.\r\nThis email confirms that your subscription has been received and processed.\r\n\r\n','html',0,'Mail de validation de cotisation','2018-11-23 11:56:07'),(41,'ADHERENT_MAIL_VALID_SUBJECT',1,'Your subscription has been validated','chaine',0,'Sujet du mail de validation','2012-07-08 11:17:59'),(42,'ADHERENT_MAIL_RESIL_SUBJECT',1,'Resiliating your subscription','chaine',0,'Sujet du mail de resiliation','2012-07-08 11:17:59'),(43,'ADHERENT_MAIL_COTIS_SUBJECT',1,'Receipt of your subscription','chaine',0,'Sujet du mail de validation de cotisation','2012-07-08 11:17:59'),(44,'MAILING_EMAIL_FROM',1,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2012-07-08 11:17:59'),(45,'ADHERENT_USE_MAILMAN',1,'0','yesno',0,'Utilisation de Mailman','2012-07-08 11:17:59'),(46,'ADHERENT_MAILMAN_UNSUB_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&user=%EMAIL%','chaine',0,'Url de desinscription aux listes mailman','2012-07-08 11:17:59'),(47,'ADHERENT_MAILMAN_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&send_welcome_msg_to_this_batch=1&subscribees=%EMAIL%','chaine',0,'Url pour les inscriptions mailman','2012-07-08 11:17:59'),(48,'ADHERENT_MAILMAN_LISTS',1,'test-test,test-test2','chaine',0,'Listes auxquelles inscrire les nouveaux adherents','2012-07-08 11:17:59'),(49,'ADHERENT_MAILMAN_ADMINPW',1,'','chaine',0,'Mot de passe Admin des liste mailman','2012-07-08 11:17:59'),(50,'ADHERENT_MAILMAN_SERVER',1,'lists.domain.com','chaine',0,'Serveur hebergeant les interfaces d Admin des listes mailman','2012-07-08 11:17:59'),(51,'ADHERENT_MAILMAN_LISTS_COTISANT',1,'','chaine',0,'Liste(s) auxquelles les nouveaux cotisants sont inscris automatiquement','2012-07-08 11:17:59'),(52,'ADHERENT_USE_SPIP',1,'0','yesno',0,'Utilisation de SPIP ?','2012-07-08 11:17:59'),(53,'ADHERENT_USE_SPIP_AUTO',1,'0','yesno',0,'Utilisation de SPIP automatiquement','2012-07-08 11:17:59'),(54,'ADHERENT_SPIP_USER',1,'user','chaine',0,'user spip','2012-07-08 11:17:59'),(55,'ADHERENT_SPIP_PASS',1,'pass','chaine',0,'Pass de connection','2012-07-08 11:17:59'),(56,'ADHERENT_SPIP_SERVEUR',1,'localhost','chaine',0,'serveur spip','2012-07-08 11:17:59'),(57,'ADHERENT_SPIP_DB',1,'spip','chaine',0,'db spip','2012-07-08 11:17:59'),(58,'ADHERENT_CARD_HEADER_TEXT',1,'%ANNEE%','chaine',0,'Texte imprime sur le haut de la carte adherent','2012-07-08 11:17:59'),(59,'ADHERENT_CARD_FOOTER_TEXT',1,'Association AZERTY','chaine',0,'Texte imprime sur le bas de la carte adherent','2012-07-08 11:17:59'),(61,'FCKEDITOR_ENABLE_USER',1,'1','yesno',0,'Activation fckeditor sur notes utilisateurs','2012-07-08 11:17:59'),(62,'FCKEDITOR_ENABLE_SOCIETE',1,'1','yesno',0,'Activation fckeditor sur notes societe','2012-07-08 11:17:59'),(63,'FCKEDITOR_ENABLE_PRODUCTDESC',1,'1','yesno',0,'Activation fckeditor sur notes produits','2012-07-08 11:17:59'),(64,'FCKEDITOR_ENABLE_MEMBER',1,'1','yesno',0,'Activation fckeditor sur notes adherent','2012-07-08 11:17:59'),(65,'FCKEDITOR_ENABLE_MAILING',1,'1','yesno',0,'Activation fckeditor sur emailing','2012-07-08 11:17:59'),(67,'DON_ADDON_MODEL',1,'html_cerfafr','chaine',0,'','2012-07-08 11:18:00'),(68,'PROPALE_ADDON',1,'mod_propale_marbre','chaine',0,'','2012-07-08 11:18:00'),(69,'PROPALE_ADDON_PDF',1,'azur','chaine',0,'','2012-07-08 11:18:00'),(70,'COMMANDE_ADDON',1,'mod_commande_marbre','chaine',0,'','2012-07-08 11:18:00'),(71,'COMMANDE_ADDON_PDF',1,'einstein','chaine',0,'','2012-07-08 11:18:00'),(72,'COMMANDE_SUPPLIER_ADDON',1,'mod_commande_fournisseur_muguet','chaine',0,'','2012-07-08 11:18:00'),(73,'COMMANDE_SUPPLIER_ADDON_PDF',1,'muscadet','chaine',0,'','2012-07-08 11:18:00'),(74,'EXPEDITION_ADDON',1,'enlevement','chaine',0,'','2012-07-08 11:18:00'),(76,'FICHEINTER_ADDON',1,'pacific','chaine',0,'','2012-07-08 11:18:00'),(77,'FICHEINTER_ADDON_PDF',1,'soleil','chaine',0,'','2012-07-08 11:18:00'),(79,'FACTURE_ADDON_PDF',1,'crabe','chaine',0,'','2012-07-08 11:18:00'),(80,'PROPALE_VALIDITY_DURATION',1,'15','chaine',0,'Durée de validitée des propales','2012-07-08 11:18:00'),(230,'COMPANY_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2012-07-08 11:26:20'),(238,'LIVRAISON_ADDON_PDF',1,'typhon','chaine',0,'Nom du gestionnaire de generation des commandes en PDF','2012-07-08 11:26:27'),(239,'LIVRAISON_ADDON_NUMBER',1,'mod_livraison_jade','chaine',0,'Nom du gestionnaire de numerotation des bons de livraison','2015-03-20 13:17:36'),(245,'FACTURE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2012-07-08 11:28:53'),(249,'DON_FORM',1,'html_cerfafr','chaine',0,'Nom du gestionnaire de formulaire de dons','2017-09-06 16:12:22'),(254,'ADHERENT_BANK_ACCOUNT',1,'','chaine',0,'ID du Compte banquaire utilise','2012-07-08 11:29:05'),(255,'ADHERENT_BANK_CATEGORIE',1,'','chaine',0,'ID de la categorie banquaire des cotisations','2012-07-08 11:29:05'),(256,'ADHERENT_ETIQUETTE_TYPE',1,'L7163','chaine',0,'Type d etiquette (pour impression de planche d etiquette)','2012-07-08 11:29:05'),(269,'PROJECT_ADDON_PDF',1,'baleine','chaine',0,'Nom du gestionnaire de generation des projets en PDF','2012-07-08 11:29:33'),(270,'PROJECT_ADDON',1,'mod_project_simple','chaine',0,'Nom du gestionnaire de numerotation des projets','2012-07-08 11:29:33'),(369,'EXPEDITION_ADDON_PDF',1,'merou','chaine',0,'','2012-07-08 22:58:07'),(377,'FACTURE_ADDON',1,'mod_facture_terre','chaine',0,'','2012-07-08 23:08:12'),(380,'ADHERENT_CARD_TEXT',1,'%TYPE% n° %ID%\r\n%PRENOM% %NOM%\r\n<%EMAIL%>\r\n%ADRESSE%\r\n%CP% %VILLE%\r\n%PAYS%','',0,'Texte imprime sur la carte adherent','2012-07-08 23:14:46'),(381,'ADHERENT_CARD_TEXT_RIGHT',1,'aaa','',0,'','2012-07-08 23:14:55'),(386,'STOCK_CALCULATE_ON_SHIPMENT',1,'1','chaine',0,'','2012-07-08 23:23:21'),(387,'STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER',1,'1','chaine',0,'','2012-07-08 23:23:26'),(392,'MAIN_AGENDA_XCAL_EXPORTKEY',1,'dolibarr','chaine',0,'','2012-07-08 23:27:50'),(393,'MAIN_AGENDA_EXPORT_PAST_DELAY',1,'100','chaine',0,'','2012-07-08 23:27:50'),(610,'CASHDESK_ID_THIRDPARTY',1,'7','chaine',0,'','2012-07-11 17:08:18'),(611,'CASHDESK_ID_BANKACCOUNT_CASH',1,'3','chaine',0,'','2012-07-11 17:08:18'),(612,'CASHDESK_ID_BANKACCOUNT_CHEQUE',1,'1','chaine',0,'','2012-07-11 17:08:18'),(613,'CASHDESK_ID_BANKACCOUNT_CB',1,'1','chaine',0,'','2012-07-11 17:08:18'),(614,'CASHDESK_ID_WAREHOUSE',1,'2','chaine',0,'','2012-07-11 17:08:18'),(660,'LDAP_USER_DN',1,'ou=users,dc=my-domain,dc=com','chaine',0,NULL,'2012-07-18 10:25:27'),(661,'LDAP_GROUP_DN',1,'ou=groups,dc=my-domain,dc=com','chaine',0,NULL,'2012-07-18 10:25:27'),(662,'LDAP_FILTER_CONNECTION',1,'&(objectClass=user)(objectCategory=person)','chaine',0,NULL,'2012-07-18 10:25:27'),(663,'LDAP_FIELD_LOGIN',1,'uid','chaine',0,NULL,'2012-07-18 10:25:27'),(664,'LDAP_FIELD_FULLNAME',1,'cn','chaine',0,NULL,'2012-07-18 10:25:27'),(665,'LDAP_FIELD_NAME',1,'sn','chaine',0,NULL,'2012-07-18 10:25:27'),(666,'LDAP_FIELD_FIRSTNAME',1,'givenname','chaine',0,NULL,'2012-07-18 10:25:27'),(667,'LDAP_FIELD_MAIL',1,'mail','chaine',0,NULL,'2012-07-18 10:25:27'),(668,'LDAP_FIELD_PHONE',1,'telephonenumber','chaine',0,NULL,'2012-07-18 10:25:27'),(669,'LDAP_FIELD_FAX',1,'facsimiletelephonenumber','chaine',0,NULL,'2012-07-18 10:25:27'),(670,'LDAP_FIELD_MOBILE',1,'mobile','chaine',0,NULL,'2012-07-18 10:25:27'),(671,'LDAP_SERVER_TYPE',1,'openldap','chaine',0,'','2012-07-18 10:25:46'),(672,'LDAP_SERVER_PROTOCOLVERSION',1,'3','chaine',0,'','2012-07-18 10:25:47'),(673,'LDAP_SERVER_HOST',1,'localhost','chaine',0,'','2012-07-18 10:25:47'),(674,'LDAP_SERVER_PORT',1,'389','chaine',0,'','2012-07-18 10:25:47'),(675,'LDAP_SERVER_USE_TLS',1,'0','chaine',0,'','2012-07-18 10:25:47'),(676,'LDAP_SYNCHRO_ACTIVE',1,'dolibarr2ldap','chaine',0,'','2012-07-18 10:25:47'),(677,'LDAP_CONTACT_ACTIVE',1,'1','chaine',0,'','2012-07-18 10:25:47'),(678,'LDAP_MEMBER_ACTIVE',1,'1','chaine',0,'','2012-07-18 10:25:47'),(974,'MAIN_MODULE_WORKFLOW_TRIGGERS',1,'1','chaine',0,NULL,'2013-07-18 18:02:20'),(975,'WORKFLOW_PROPAL_AUTOCREATE_ORDER',1,'1','chaine',0,'','2013-07-18 18:02:24'),(980,'PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR',1,'1234567','chaine',0,'','2013-07-18 18:05:50'),(983,'FACTURE_RIB_NUMBER',1,'1','chaine',0,'','2013-07-18 18:35:14'),(984,'FACTURE_CHQ_NUMBER',1,'1','chaine',0,'','2013-07-18 18:35:14'),(1016,'GOOGLE_DUPLICATE_INTO_GCAL',1,'1','chaine',0,'','2013-07-18 21:40:20'),(1152,'SOCIETE_CODECLIENT_ADDON',1,'mod_codeclient_monkey','chaine',0,'','2013-07-29 20:50:02'),(1240,'MAIN_LOGEVENTS_USER_LOGIN',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1241,'MAIN_LOGEVENTS_USER_LOGIN_FAILED',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1242,'MAIN_LOGEVENTS_USER_LOGOUT',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1243,'MAIN_LOGEVENTS_USER_CREATE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1244,'MAIN_LOGEVENTS_USER_MODIFY',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1245,'MAIN_LOGEVENTS_USER_NEW_PASSWORD',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1246,'MAIN_LOGEVENTS_USER_ENABLEDISABLE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1247,'MAIN_LOGEVENTS_USER_DELETE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1248,'MAIN_LOGEVENTS_GROUP_CREATE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1249,'MAIN_LOGEVENTS_GROUP_MODIFY',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1250,'MAIN_LOGEVENTS_GROUP_DELETE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1251,'MAIN_BOXES_MAXLINES',1,'5','',0,'','2013-07-29 21:05:42'),(1482,'EXPEDITION_ADDON_NUMBER',1,'mod_expedition_safor','chaine',0,'Nom du gestionnaire de numerotation des expeditions','2013-08-05 17:53:11'),(1490,'CONTRACT_ADDON',1,'mod_contract_serpis','chaine',0,'Nom du gestionnaire de numerotation des contrats','2013-08-05 18:11:58'),(1677,'COMMANDE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/orders','chaine',0,NULL,'2014-12-08 13:11:02'),(1724,'PROPALE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2014-12-08 13:17:14'),(1730,'OPENSTREETMAP_ENABLE_MAPS',1,'1','chaine',0,'','2014-12-08 13:22:47'),(1731,'OPENSTREETMAP_ENABLE_MAPS_CONTACTS',1,'1','chaine',0,'','2014-12-08 13:22:47'),(1732,'OPENSTREETMAP_ENABLE_MAPS_MEMBERS',1,'1','chaine',0,'','2014-12-08 13:22:47'),(1733,'OPENSTREETMAP_MAPS_ZOOM_LEVEL',1,'15','chaine',0,'','2014-12-08 13:22:47'),(1742,'MAIN_MAIL_EMAIL_FROM',2,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2014-12-08 14:08:14'),(1743,'MAIN_MENU_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2015-02-11 19:43:54'),(1744,'MAIN_MENUFRONT_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2015-02-11 19:43:54'),(1745,'MAIN_MENU_SMARTPHONE',2,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2014-12-08 14:08:14'),(1746,'MAIN_MENUFRONT_SMARTPHONE',2,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2014-12-08 14:08:14'),(1747,'MAIN_THEME',2,'eldy','chaine',0,'Default theme','2014-12-08 14:08:14'),(1748,'MAIN_DELAY_ACTIONS_TODO',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2014-12-08 14:08:14'),(1749,'MAIN_DELAY_ORDERS_TO_PROCESS',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2014-12-08 14:08:14'),(1750,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2014-12-08 14:08:14'),(1751,'MAIN_DELAY_PROPALS_TO_CLOSE',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2014-12-08 14:08:14'),(1752,'MAIN_DELAY_PROPALS_TO_BILL',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2014-12-08 14:08:14'),(1753,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2014-12-08 14:08:14'),(1754,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2014-12-08 14:08:14'),(1755,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2014-12-08 14:08:14'),(1756,'MAIN_DELAY_RUNNING_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2014-12-08 14:08:14'),(1757,'MAIN_DELAY_MEMBERS',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2014-12-08 14:08:14'),(1758,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',2,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2014-12-08 14:08:14'),(1759,'MAILING_EMAIL_FROM',2,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2014-12-08 14:08:14'),(1760,'MAIN_INFO_SOCIETE_COUNTRY',3,'1:FR:France','chaine',0,'','2015-02-26 21:56:28'),(1761,'MAIN_INFO_SOCIETE_NOM',3,'bbb','chaine',0,'','2014-12-08 14:08:20'),(1762,'MAIN_INFO_SOCIETE_STATE',3,'0','chaine',0,'','2015-02-27 14:20:27'),(1763,'MAIN_MONNAIE',3,'EUR','chaine',0,'','2014-12-08 14:08:20'),(1764,'MAIN_LANG_DEFAULT',3,'auto','chaine',0,'','2014-12-08 14:08:20'),(1765,'MAIN_MAIL_EMAIL_FROM',3,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2014-12-08 14:08:20'),(1766,'MAIN_MENU_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2015-02-11 19:43:54'),(1767,'MAIN_MENUFRONT_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2015-02-11 19:43:54'),(1768,'MAIN_MENU_SMARTPHONE',3,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2014-12-08 14:08:20'),(1769,'MAIN_MENUFRONT_SMARTPHONE',3,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2014-12-08 14:08:20'),(1770,'MAIN_THEME',3,'eldy','chaine',0,'Default theme','2014-12-08 14:08:20'),(1771,'MAIN_DELAY_ACTIONS_TODO',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2014-12-08 14:08:20'),(1772,'MAIN_DELAY_ORDERS_TO_PROCESS',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2014-12-08 14:08:20'),(1773,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2014-12-08 14:08:20'),(1774,'MAIN_DELAY_PROPALS_TO_CLOSE',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2014-12-08 14:08:20'),(1775,'MAIN_DELAY_PROPALS_TO_BILL',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2014-12-08 14:08:20'),(1776,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2014-12-08 14:08:20'),(1777,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2014-12-08 14:08:20'),(1778,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2014-12-08 14:08:20'),(1779,'MAIN_DELAY_RUNNING_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2014-12-08 14:08:20'),(1780,'MAIN_DELAY_MEMBERS',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2014-12-08 14:08:20'),(1781,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',3,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2014-12-08 14:08:20'),(1782,'MAILING_EMAIL_FROM',3,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2014-12-08 14:08:20'),(1803,'SYSLOG_FILE',1,'DOL_DATA_ROOT/dolibarr.log','chaine',0,'','2014-12-08 14:15:08'),(1804,'SYSLOG_HANDLERS',1,'[\"mod_syslog_file\"]','chaine',0,'','2014-12-08 14:15:08'),(1805,'MAIN_MODULE_SKINCOLOREDITOR',3,'1',NULL,0,NULL,'2014-12-08 14:35:40'),(1922,'PAYPAL_API_SANDBOX',1,'1','chaine',0,'','2014-12-12 12:11:05'),(1923,'PAYPAL_API_USER',1,'seller_1355312017_biz_api1.mydomain.com','chaine',0,'','2014-12-12 12:11:05'),(1924,'PAYPAL_API_PASSWORD',1,'1355312040','chaine',0,'','2014-12-12 12:11:05'),(1925,'PAYPAL_API_SIGNATURE',1,'ABCDEFWBzvfn0q5iNmbuiDv1y.3EAXIMWyl4C5KvDReR9HDwwAd6dQ4Q','chaine',0,'','2014-12-12 12:11:05'),(1926,'PAYPAL_API_INTEGRAL_OR_PAYPALONLY',1,'integral','chaine',0,'','2014-12-12 12:11:05'),(1927,'PAYPAL_SECURITY_TOKEN',1,'50c82fab36bb3b6aa83e2a50691803b2','chaine',0,'','2014-12-12 12:11:05'),(1928,'PAYPAL_SECURITY_TOKEN_UNIQUE',1,'0','chaine',0,'','2014-12-12 12:11:05'),(1929,'PAYPAL_ADD_PAYMENT_URL',1,'1','chaine',0,'','2014-12-12 12:11:05'),(1980,'MAIN_PDF_FORMAT',1,'EUA4','chaine',0,'','2014-12-12 19:58:05'),(1981,'MAIN_PROFID1_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1982,'MAIN_PROFID2_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1983,'MAIN_PROFID3_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1984,'MAIN_PROFID4_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1985,'MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT',1,'0','chaine',0,'','2014-12-12 19:58:05'),(2835,'MAIN_USE_CONNECT_TIMEOUT',1,'10','chaine',0,'','2015-01-16 19:28:50'),(2836,'MAIN_USE_RESPONSE_TIMEOUT',1,'30','chaine',0,'','2015-01-16 19:28:50'),(2837,'MAIN_PROXY_USE',1,'0','chaine',0,'','2015-01-16 19:28:50'),(2838,'MAIN_PROXY_HOST',1,'localhost','chaine',0,'','2015-01-16 19:28:50'),(2839,'MAIN_PROXY_PORT',1,'8080','chaine',0,'','2015-01-16 19:28:50'),(2840,'MAIN_PROXY_USER',1,'aaa','chaine',0,'','2015-01-16 19:28:50'),(2841,'MAIN_PROXY_PASS',1,'bbb','chaine',0,'','2015-01-16 19:28:50'),(2848,'OVHSMS_NICK',1,'BN196-OVH','chaine',0,'','2015-01-16 19:32:36'),(2849,'OVHSMS_PASS',1,'bigone-10','chaine',0,'','2015-01-16 19:32:36'),(2850,'OVHSMS_SOAPURL',1,'https://www.ovh.com/soapi/soapi-re-1.55.wsdl','chaine',0,'','2015-01-16 19:32:36'),(2854,'THEME_ELDY_RGB',1,'bfbf00','chaine',0,'','2015-01-18 10:02:53'),(2855,'THEME_ELDY_ENABLE_PERSONALIZED',1,'0','chaine',0,'','2015-01-18 10:02:55'),(2858,'MAIN_SESSION_TIMEOUT',1,'2000','chaine',0,'','2015-01-19 17:01:53'),(2867,'FACSIM_ADDON',1,'mod_facsim_alcoy','chaine',0,'','2015-01-19 17:16:25'),(2868,'POS_SERVICES',1,'0','chaine',0,'','2015-01-19 17:16:51'),(2869,'POS_USE_TICKETS',1,'1','chaine',0,'','2015-01-19 17:16:51'),(2870,'POS_MAX_TTC',1,'100','chaine',0,'','2015-01-19 17:16:51'),(3190,'MAIN_MODULE_HOLIDAY',2,'1',NULL,0,NULL,'2015-02-01 08:52:34'),(3195,'INVOICE_SUPPLIER_ADDON_PDF',1,'canelle','chaine',0,'','2015-02-10 19:50:27'),(3199,'MAIN_FORCE_RELOAD_PAGE',1,'1','chaine',0,NULL,'2015-02-12 16:22:55'),(3223,'OVH_THIRDPARTY_IMPORT',1,'2','chaine',0,'','2015-02-13 16:20:18'),(3409,'AGENDA_USE_EVENT_TYPE',1,'1','chaine',0,'','2015-02-27 18:12:24'),(3886,'MAIN_REMOVE_INSTALL_WARNING',1,'1','chaine',1,'','2015-03-02 18:32:50'),(4013,'MAIN_DELAY_ACTIONS_TODO',1,'7','chaine',0,'','2015-03-06 08:59:12'),(4014,'MAIN_DELAY_PROPALS_TO_CLOSE',1,'31','chaine',0,'','2015-03-06 08:59:12'),(4015,'MAIN_DELAY_PROPALS_TO_BILL',1,'7','chaine',0,'','2015-03-06 08:59:12'),(4016,'MAIN_DELAY_ORDERS_TO_PROCESS',1,'2','chaine',0,'','2015-03-06 08:59:12'),(4017,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',1,'31','chaine',0,'','2015-03-06 08:59:12'),(4018,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',1,'7','chaine',0,'','2015-03-06 08:59:12'),(4019,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',1,'2','chaine',0,'','2015-03-06 08:59:12'),(4020,'MAIN_DELAY_RUNNING_SERVICES',1,'-15','chaine',0,'','2015-03-06 08:59:12'),(4021,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',1,'62','chaine',0,'','2015-03-06 08:59:13'),(4022,'MAIN_DELAY_MEMBERS',1,'31','chaine',0,'','2015-03-06 08:59:13'),(4023,'MAIN_DISABLE_METEO',1,'0','chaine',0,'','2015-03-06 08:59:13'),(4044,'ADHERENT_VAT_FOR_SUBSCRIPTIONS',1,'0','',0,'','2015-03-06 16:06:38'),(4047,'ADHERENT_BANK_USE',1,'bankviainvoice','',0,'','2015-03-06 16:12:30'),(4049,'PHPSANE_SCANIMAGE',1,'/usr/bin/scanimage','chaine',0,'','2015-03-06 21:54:13'),(4050,'PHPSANE_PNMTOJPEG',1,'/usr/bin/pnmtojpeg','chaine',0,'','2015-03-06 21:54:13'),(4051,'PHPSANE_PNMTOTIFF',1,'/usr/bin/pnmtotiff','chaine',0,'','2015-03-06 21:54:13'),(4052,'PHPSANE_OCR',1,'/usr/bin/gocr','chaine',0,'','2015-03-06 21:54:13'),(4548,'ECM_AUTO_TREE_ENABLED',1,'1','chaine',0,'','2015-03-10 15:57:21'),(4579,'MAIN_MODULE_AGENDA',2,'1',NULL,0,NULL,'2015-03-13 15:29:19'),(4580,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4581,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4582,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4583,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4584,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4585,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4586,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4587,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4588,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4589,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4590,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4591,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4592,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4593,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4594,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4688,'GOOGLE_ENABLE_AGENDA',2,'1','chaine',0,'','2015-03-13 15:36:29'),(4689,'GOOGLE_AGENDA_NAME1',2,'eldy','chaine',0,'','2015-03-13 15:36:29'),(4690,'GOOGLE_AGENDA_SRC1',2,'eldy10@mail.com','chaine',0,'','2015-03-13 15:36:29'),(4691,'GOOGLE_AGENDA_COLOR1',2,'BE6D00','chaine',0,'','2015-03-13 15:36:29'),(4692,'GOOGLE_AGENDA_COLOR2',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4693,'GOOGLE_AGENDA_COLOR3',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4694,'GOOGLE_AGENDA_COLOR4',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4695,'GOOGLE_AGENDA_COLOR5',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4696,'GOOGLE_AGENDA_TIMEZONE',2,'Europe/Paris','chaine',0,'','2015-03-13 15:36:29'),(4697,'GOOGLE_AGENDA_NB',2,'5','chaine',0,'','2015-03-13 15:36:29'),(4725,'SOCIETE_CODECLIENT_ADDON',2,'mod_codeclient_leopard','chaine',0,'Module to control third parties codes','2015-03-13 20:21:35'),(4726,'SOCIETE_CODECOMPTA_ADDON',2,'mod_codecompta_panicum','chaine',0,'Module to control third parties codes','2015-03-13 20:21:35'),(4727,'SOCIETE_FISCAL_MONTH_START',2,'','chaine',0,'Mettre le numero du mois du debut d\\\'annee fiscale, ex: 9 pour septembre','2015-03-13 20:21:35'),(4728,'MAIN_SEARCHFORM_SOCIETE',2,'1','yesno',0,'Show form for quick company search','2015-03-13 20:21:35'),(4729,'MAIN_SEARCHFORM_CONTACT',2,'1','yesno',0,'Show form for quick contact search','2015-03-13 20:21:35'),(4730,'COMPANY_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2015-03-13 20:21:35'),(4743,'MAIN_MODULE_CLICKTODIAL',2,'1',NULL,0,NULL,'2015-03-13 20:30:28'),(4744,'MAIN_MODULE_NOTIFICATION',2,'1',NULL,0,NULL,'2015-03-13 20:30:34'),(4745,'MAIN_MODULE_WEBSERVICES',2,'1',NULL,0,NULL,'2015-03-13 20:30:41'),(4746,'MAIN_MODULE_PROPALE',2,'1',NULL,0,NULL,'2015-03-13 20:32:38'),(4747,'PROPALE_ADDON_PDF',2,'azur','chaine',0,'Nom du gestionnaire de generation des propales en PDF','2015-03-13 20:32:38'),(4748,'PROPALE_ADDON',2,'mod_propale_marbre','chaine',0,'Nom du gestionnaire de numerotation des propales','2015-03-13 20:32:38'),(4749,'PROPALE_VALIDITY_DURATION',2,'15','chaine',0,'Duration of validity of business proposals','2015-03-13 20:32:38'),(4750,'PROPALE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2015-03-13 20:32:38'),(4752,'MAIN_MODULE_TAX',2,'1',NULL,0,NULL,'2015-03-13 20:32:47'),(4753,'MAIN_MODULE_DON',2,'1',NULL,0,NULL,'2015-03-13 20:32:54'),(4754,'DON_ADDON_MODEL',2,'html_cerfafr','chaine',0,'Nom du gestionnaire de generation de recu de dons','2015-03-13 20:32:54'),(4755,'POS_USE_TICKETS',2,'1','chaine',0,'','2015-03-13 20:33:09'),(4756,'POS_MAX_TTC',2,'100','chaine',0,'','2015-03-13 20:33:09'),(4757,'MAIN_MODULE_POS',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4758,'TICKET_ADDON',2,'mod_ticket_avenc','chaine',0,'Nom du gestionnaire de numerotation des tickets','2015-03-13 20:33:09'),(4759,'MAIN_MODULE_BANQUE',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4760,'MAIN_MODULE_FACTURE',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4761,'FACTURE_ADDON_PDF',2,'crabe','chaine',0,'Name of PDF model of invoice','2015-03-13 20:33:09'),(4762,'FACTURE_ADDON',2,'mod_facture_terre','chaine',0,'Name of numbering numerotation rules of invoice','2015-03-13 20:33:09'),(4763,'FACTURE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2015-03-13 20:33:09'),(4764,'MAIN_MODULE_SOCIETE',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4765,'MAIN_MODULE_PRODUCT',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4766,'PRODUCT_CODEPRODUCT_ADDON',2,'mod_codeproduct_leopard','chaine',0,'Module to control product codes','2015-03-13 20:33:09'),(4767,'MAIN_SEARCHFORM_PRODUITSERVICE',2,'1','yesno',0,'Show form for quick product search','2015-03-13 20:33:09'),(4772,'FACSIM_ADDON',2,'mod_facsim_alcoy','chaine',0,'','2015-03-13 20:33:32'),(4773,'MAIN_MODULE_MAILING',2,'1',NULL,0,NULL,'2015-03-13 20:33:37'),(4774,'MAIN_MODULE_OPENSURVEY',2,'1',NULL,0,NULL,'2015-03-13 20:33:42'),(4782,'AGENDA_USE_EVENT_TYPE',2,'1','chaine',0,'','2015-03-13 20:53:36'),(4884,'AGENDA_DISABLE_EXT',2,'1','chaine',0,'','2015-03-13 22:03:40'),(4928,'COMMANDE_SUPPLIER_ADDON_NUMBER',1,'mod_commande_fournisseur_muguet','chaine',0,'Nom du gestionnaire de numerotation des commandes fournisseur','2015-03-22 09:24:29'),(4929,'INVOICE_SUPPLIER_ADDON_NUMBER',1,'mod_facture_fournisseur_cactus','chaine',0,'Nom du gestionnaire de numerotation des factures fournisseur','2015-03-22 09:24:29'),(5001,'MAIN_CRON_KEY',0,'bc54582fe30d5d4a830c6f582ec28810','chaine',0,'','2015-03-23 17:54:53'),(5009,'CRON_KEY',0,'2c2e755c20be2014098f629865598006','chaine',0,'','2015-03-23 18:06:24'),(5139,'SOCIETE_ADD_REF_IN_LIST',1,'','yesno',0,'Display customer ref into select list','2015-09-08 23:06:08'),(5150,'PROJECT_TASK_ADDON_PDF',1,'','chaine',0,'Name of PDF/ODT tasks manager class','2015-09-08 23:06:14'),(5151,'PROJECT_TASK_ADDON',1,'mod_task_simple','chaine',0,'Name of Numbering Rule task manager class','2015-09-08 23:06:14'),(5152,'PROJECT_TASK_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/tasks','chaine',0,'','2015-09-08 23:06:14'),(5239,'BOOKMARKS_SHOW_IN_MENU',1,'10','chaine',0,'','2016-03-02 15:42:26'),(5271,'DONATION_ART200',1,'','yesno',0,'Option Française - Eligibilité Art200 du CGI','2016-12-21 12:51:28'),(5272,'DONATION_ART238',1,'','yesno',0,'Option Française - Eligibilité Art238 bis du CGI','2016-12-21 12:51:28'),(5274,'DONATION_MESSAGE',1,'Thank you','chaine',0,'Message affiché sur le récépissé de versements ou dons','2016-12-21 12:51:28'),(5349,'MAIN_SEARCHFORM_CONTACT',1,'1','chaine',0,'','2017-10-03 10:11:33'),(5351,'MAIN_SEARCHFORM_PRODUITSERVICE',1,'1','chaine',0,'','2017-10-03 10:11:33'),(5352,'MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER',1,'0','chaine',0,'','2017-10-03 10:11:33'),(5353,'MAIN_SEARCHFORM_ADHERENT',1,'1','chaine',0,'','2017-10-03 10:11:33'),(5354,'MAIN_SEARCHFORM_PROJECT',1,'0','chaine',0,'','2017-10-03 10:11:33'),(5394,'FCKEDITOR_ENABLE_DETAILS',1,'1','yesno',0,'WYSIWIG for products details lines for all entities','2017-11-04 15:27:44'),(5395,'FCKEDITOR_ENABLE_USERSIGN',1,'1','yesno',0,'WYSIWIG for user signature','2017-11-04 15:27:44'),(5396,'FCKEDITOR_ENABLE_MAIL',1,'1','yesno',0,'WYSIWIG for products details lines for all entities','2017-11-04 15:27:44'),(5398,'CATEGORIE_RECURSIV_ADD',1,'','yesno',0,'Affect parent categories','2017-11-04 15:27:46'),(5404,'MAIN_MODULE_CATEGORIE',1,'1',NULL,0,NULL,'2017-11-04 15:41:43'),(5415,'EXPEDITION_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/shipment','chaine',0,NULL,'2017-11-15 22:38:28'),(5416,'LIVRAISON_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/delivery','chaine',0,NULL,'2017-11-15 22:38:28'),(5426,'MAIN_MODULE_PROJET',1,'1',NULL,0,NULL,'2017-11-15 22:38:44'),(5427,'PROJECT_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/projects','chaine',0,NULL,'2017-11-15 22:38:44'),(5428,'PROJECT_USE_OPPORTUNIES',1,'1','chaine',0,NULL,'2017-11-15 22:38:44'),(5430,'MAIN_MODULE_EXPORT',1,'1',NULL,0,NULL,'2017-11-15 22:38:56'),(5431,'MAIN_MODULE_IMPORT',1,'1',NULL,0,NULL,'2017-11-15 22:38:58'),(5432,'MAIN_MODULE_MAILING',1,'1',NULL,0,NULL,'2017-11-15 22:39:00'),(5434,'EXPENSEREPORT_ADDON_PDF',1,'standard','chaine',0,'Name of manager to build PDF expense reports documents','2017-11-15 22:39:05'),(5437,'SALARIES_ACCOUNTING_ACCOUNT_CHARGE',1,'641','chaine',0,NULL,'2017-11-15 22:39:08'),(5441,'ADHERENT_ETIQUETTE_TEXT',1,'%FULLNAME%\n%ADDRESS%\n%ZIP% %TOWN%\n%COUNTRY%','text',0,'Text to print on member address sheets','2018-11-23 11:56:07'),(5443,'MAIN_MODULE_PRELEVEMENT',1,'1',NULL,0,NULL,'2017-11-15 22:39:33'),(5453,'MAIN_MODULE_CONTRAT',1,'1',NULL,0,NULL,'2017-11-15 22:39:52'),(5455,'MAIN_MODULE_FICHEINTER',1,'1',NULL,0,NULL,'2017-11-15 22:39:56'),(5459,'MAIN_MODULE_PAYPAL',1,'1',NULL,0,NULL,'2017-11-15 22:41:02'),(5463,'MAIN_MODULE_PROPALE',1,'1',NULL,0,NULL,'2017-11-15 22:41:47'),(5483,'GENBARCODE_BARCODETYPE_THIRDPARTY',1,'6','chaine',0,'','2018-01-16 15:49:43'),(5484,'PRODUIT_DEFAULT_BARCODE_TYPE',1,'2','chaine',0,'','2018-01-16 15:49:46'),(5586,'MAIN_DELAY_EXPENSEREPORTS_TO_PAY',1,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur les notes de frais impayées','2018-01-22 17:28:18'),(5587,'MAIN_FIX_FOR_BUGGED_MTA',1,'1','chaine',1,'Set constant to fix email ending from PHP with some linux ike system','2018-01-22 17:28:18'),(5590,'MAIN_VERSION_LAST_INSTALL',0,'3.8.3','chaine',0,'Dolibarr version when install','2018-01-22 17:28:42'),(5604,'MAIN_INFO_SOCIETE_LOGO',1,'mybigcompany.png','chaine',0,'','2018-01-22 17:33:49'),(5605,'MAIN_INFO_SOCIETE_LOGO_SMALL',1,'mybigcompany_small.png','chaine',0,'','2018-01-22 17:33:49'),(5606,'MAIN_INFO_SOCIETE_LOGO_MINI',1,'mybigcompany_mini.png','chaine',0,'','2018-01-22 17:33:49'),(5614,'MAIN_SIZE_SHORTLISTE_LIMIT',1,'4','chaine',0,'Longueur maximum des listes courtes (fiche client)','2018-03-13 10:54:46'),(5627,'SUPPLIER_PROPOSAL_ADDON_PDF',1,'aurore','chaine',0,'Name of submodule to generate PDF for supplier quotation request','2018-07-30 11:13:20'),(5628,'SUPPLIER_PROPOSAL_ADDON',1,'mod_supplier_proposal_marbre','chaine',0,'Name of submodule to number supplier quotation request','2018-07-30 11:13:20'),(5629,'SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/supplier_proposal','chaine',0,NULL,'2018-07-30 11:13:20'),(5633,'MAIN_MODULE_API',1,'1',NULL,0,NULL,'2018-07-30 11:13:54'),(5634,'MAIN_MODULE_WEBSERVICES',1,'1',NULL,0,NULL,'2018-07-30 11:13:56'),(5635,'WEBSERVICES_KEY',1,'dolibarrkey','chaine',0,'','2018-07-30 11:14:04'),(5638,'MAIN_MODULE_EXTERNALRSS',1,'1',NULL,0,NULL,'2018-07-30 11:15:04'),(5642,'SOCIETE_CODECOMPTA_ADDON',1,'mod_codecompta_aquarium','chaine',0,'','2018-07-30 11:16:42'),(5707,'CASHDESK_NO_DECREASE_STOCK',1,'1','chaine',0,'','2018-07-30 13:38:11'),(5708,'MAIN_MODULE_PRODUCTBATCH',1,'1',NULL,0,NULL,'2018-07-30 13:38:11'),(5710,'MAIN_MODULE_STOCK',1,'1',NULL,0,NULL,'2018-07-30 13:38:11'),(5711,'MAIN_MODULE_PRODUCT',1,'1',NULL,0,NULL,'2018-07-30 13:38:11'),(5808,'MARGIN_TYPE',1,'costprice','chaine',0,'','2018-07-30 16:32:18'),(5809,'DISPLAY_MARGIN_RATES',1,'1','chaine',0,'','2018-07-30 16:32:20'),(5833,'ACCOUNTING_EXPORT_SEPARATORCSV',1,',','string',0,NULL,'2017-01-29 15:11:56'),(5840,'CHARTOFACCOUNTS',1,'2','chaine',0,NULL,'2017-01-29 15:11:56'),(5841,'ACCOUNTING_EXPORT_MODELCSV',1,'1','chaine',0,NULL,'2017-01-29 15:11:56'),(5842,'ACCOUNTING_LENGTH_GACCOUNT',1,'','chaine',0,NULL,'2017-01-29 15:11:56'),(5843,'ACCOUNTING_LENGTH_AACCOUNT',1,'','chaine',0,NULL,'2017-01-29 15:11:56'),(5844,'ACCOUNTING_LIST_SORT_VENTILATION_TODO',1,'1','yesno',0,NULL,'2017-01-29 15:11:56'),(5845,'ACCOUNTING_LIST_SORT_VENTILATION_DONE',1,'1','yesno',0,NULL,'2017-01-29 15:11:56'),(5846,'ACCOUNTING_EXPORT_DATE',1,'%d%m%Y','chaine',0,NULL,'2017-01-29 15:11:56'),(5848,'ACCOUNTING_EXPORT_FORMAT',1,'csv','chaine',0,NULL,'2017-01-29 15:11:56'),(5853,'MAIN_MODULE_WORKFLOW',1,'1',NULL,0,NULL,'2017-01-29 15:12:12'),(5854,'MAIN_MODULE_NOTIFICATION',1,'1',NULL,0,NULL,'2017-01-29 15:12:35'),(5855,'MAIN_MODULE_OAUTH',1,'1',NULL,0,NULL,'2017-01-29 15:12:41'),(5883,'MAILING_LIMIT_SENDBYWEB',0,'15','chaine',1,'Number of targets to defined packet size when sending mass email','2017-01-29 17:36:33'),(5884,'MAIN_MAIL_DEBUG',1,'0','chaine',1,'','2017-01-29 18:53:02'),(5885,'MAIN_SOAP_DEBUG',1,'0','chaine',1,'','2017-01-29 18:53:02'),(5925,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5931,'DATABASE_PWD_ENCRYPTED',1,'1','chaine',0,'','2017-02-01 15:06:04'),(5932,'MAIN_DISABLE_ALL_MAILS',1,'0','chaine',0,'','2017-02-01 15:09:09'),(5933,'MAIN_MAIL_SENDMODE',1,'mail','chaine',0,'','2017-02-01 15:09:09'),(5934,'MAIN_MAIL_SMTP_PORT',1,'465','chaine',0,'','2017-02-01 15:09:09'),(5935,'MAIN_MAIL_SMTP_SERVER',1,'smtp.mail.com','chaine',0,'','2017-02-01 15:09:09'),(5936,'MAIN_MAIL_SMTPS_ID',1,'eldy10@mail.com','chaine',0,'','2017-02-01 15:09:09'),(5937,'MAIN_MAIL_SMTPS_PW',1,'bidonge','chaine',0,'','2017-02-01 15:09:09'),(5938,'MAIN_MAIL_EMAIL_FROM',1,'robot@example.com','chaine',0,'','2017-02-01 15:09:09'),(5939,'MAIN_MAIL_DEFAULT_FROMTYPE',1,'user','chaine',0,'','2017-02-01 15:09:09'),(5940,'PRELEVEMENT_ID_BANKACCOUNT',1,'1','chaine',0,'','2017-02-06 04:04:47'),(5941,'PRELEVEMENT_ICS',1,'ICS123456','chaine',0,'','2017-02-06 04:04:47'),(5942,'PRELEVEMENT_USER',1,'1','chaine',0,'','2017-02-06 04:04:47'),(5943,'BANKADDON_PDF',1,'sepamandate','chaine',0,'','2017-02-06 04:13:52'),(5947,'CHEQUERECEIPTS_THYME_MASK',1,'CHK{yy}{mm}-{0000@1}','chaine',0,'','2017-02-06 04:16:27'),(5948,'MAIN_MODULE_LOAN',1,'1',NULL,0,NULL,'2017-02-06 19:19:05'),(5954,'MAIN_SUBMODULE_EXPEDITION',1,'1','chaine',0,'','2017-02-06 23:57:37'),(5963,'MAIN_MODULE_BANQUE',1,'1',NULL,0,NULL,'2017-02-07 18:56:12'),(5964,'MAIN_MODULE_TAX',1,'1',NULL,0,NULL,'2017-02-07 18:56:12'),(6019,'MAIN_INFO_SOCIETE_COUNTRY',2,'1:FR:France','chaine',0,'','2017-02-15 17:18:22'),(6020,'MAIN_INFO_SOCIETE_NOM',2,'MySecondCompany','chaine',0,'','2017-02-15 17:18:22'),(6021,'MAIN_INFO_SOCIETE_STATE',2,'0','chaine',0,'','2017-02-15 17:18:22'),(6022,'MAIN_MONNAIE',2,'EUR','chaine',0,'','2017-02-15 17:18:22'),(6023,'MAIN_LANG_DEFAULT',2,'auto','chaine',0,'','2017-02-15 17:18:22'),(6032,'MAIN_MODULE_MULTICURRENCY',1,'1',NULL,0,NULL,'2017-02-15 17:29:59'),(6048,'SYSLOG_FACILITY',0,'LOG_USER','chaine',0,'','2017-02-15 22:37:01'),(6049,'SYSLOG_FIREPHP_INCLUDEPATH',0,'/home/ldestailleur/git/dolibarr_5.0/htdocs/includes/firephp/firephp-core/lib/','chaine',0,'','2017-02-15 22:37:01'),(6050,'SYSLOG_FILE',0,'DOL_DATA_ROOT/dolibarr.log','chaine',0,'','2017-02-15 22:37:01'),(6051,'SYSLOG_CHROMEPHP_INCLUDEPATH',0,'/home/ldestailleur/git/dolibarr_5.0/htdocs/includes/ccampbell/chromephp/','chaine',0,'','2017-02-15 22:37:01'),(6052,'SYSLOG_HANDLERS',0,'[\"mod_syslog_file\"]','chaine',0,'','2017-02-15 22:37:01'),(6054,'SYSLOG_LEVEL',0,'7','chaine',0,'','2017-02-15 22:37:21'),(6092,'MAIN_SIZE_SHORTLIST_LIMIT',0,'3','chaine',0,'Max length for small lists (tabs)','2017-05-12 09:02:38'),(6099,'MAIN_MODULE_SKYPE',1,'1',NULL,0,NULL,'2017-05-12 09:03:51'),(6100,'MAIN_MODULE_GRAVATAR',1,'1',NULL,0,NULL,'2017-05-12 09:03:54'),(6102,'PRODUCT_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/products','chaine',0,'','2017-08-27 13:29:07'),(6103,'CONTRACT_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/contracts','chaine',0,'','2017-08-27 13:29:07'),(6104,'USERGROUP_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/usergroups','chaine',0,'','2017-08-27 13:29:07'),(6105,'USER_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/users','chaine',0,'','2017-08-27 13:29:07'),(6106,'MAIN_ENABLE_OVERWRITE_TRANSLATION',1,'1','chaine',0,'Enable overwrote of translation','2017-08-27 13:29:07'),(6377,'COMMANDE_SAPHIR_MASK',1,'{yy}{mm}{000}{ttt}','chaine',0,'','2017-09-06 07:56:25'),(6518,'GOOGLE_DUPLICATE_INTO_THIRDPARTIES',1,'1','chaine',0,'','2017-09-06 19:43:57'),(6519,'GOOGLE_DUPLICATE_INTO_CONTACTS',1,'0','chaine',0,'','2017-09-06 19:43:57'),(6520,'GOOGLE_TAG_PREFIX',1,'Dolibarr (Thirdparties)','chaine',0,'','2017-09-06 19:43:57'),(6521,'GOOGLE_TAG_PREFIX_CONTACTS',1,'Dolibarr (Contacts/Addresses)','chaine',0,'','2017-09-06 19:43:57'),(6522,'GOOGLE_ENABLE_AGENDA',1,'1','chaine',0,'','2017-09-06 19:44:12'),(6523,'GOOGLE_AGENDA_COLOR1',1,'1B887A','chaine',0,'','2017-09-06 19:44:12'),(6524,'GOOGLE_AGENDA_COLOR2',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6525,'GOOGLE_AGENDA_COLOR3',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6526,'GOOGLE_AGENDA_COLOR4',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6527,'GOOGLE_AGENDA_COLOR5',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6528,'GOOGLE_AGENDA_TIMEZONE',1,'Europe/Paris','chaine',0,'','2017-09-06 19:44:12'),(6529,'GOOGLE_AGENDA_NB',1,'5','chaine',0,'','2017-09-06 19:44:12'),(6543,'MAIN_SMS_DEBUG',0,'1','chaine',1,'This is to enable OVH SMS debug','2017-09-06 19:44:34'),(6562,'BLOCKEDLOG_ENTITY_FINGERPRINT',1,'b63e359ffca54d5c2bab869916eaf23d4a736703028ccbf77ce1167c5f830e7b','chaine',0,'Numeric Unique Fingerprint','2018-01-19 11:27:15'),(6564,'BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY',1,'FR','chaine',0,'This is list of country code where the module may be mandatory','2018-01-19 11:27:15'),(6565,'MAIN_MODULE_BOOKMARK',1,'1',NULL,0,'{\"authorid\":\"12\",\"ip\":\"82.240.38.230\"}','2018-01-19 11:27:34'),(6566,'MAIN_MODULE_ADHERENT',1,'1',NULL,0,'{\"authorid\":\"12\",\"ip\":\"82.240.38.230\"}','2018-01-19 11:27:56'),(6567,'ADHERENT_ADDON_PDF',1,'standard','chaine',0,'Name of PDF model of member','2018-01-19 11:27:56'),(6569,'MAIN_MODULE_STRIPE',1,'1',NULL,0,'{\"authorid\":\"12\",\"ip\":\"82.240.38.230\"}','2018-01-19 11:28:17'),(6632,'MAIN_MODULE_TICKET',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-06-05 09:15:29'),(6635,'MAIN_MODULE_TICKET_TRIGGERS',1,'1','chaine',0,NULL,'2019-06-05 09:15:29'),(6636,'MAIN_MODULE_TICKET_MODELS',1,'1','chaine',0,NULL,'2019-06-05 09:15:29'),(6647,'MAIN_MODULE_SOCIALNETWORKS',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-06-05 09:16:49'),(6795,'TICKET_ADDON',1,'mod_ticket_simple','chaine',0,'','2019-09-26 12:07:59'),(6796,'PRODUCT_CODEPRODUCT_ADDON',1,'mod_codeproduct_elephant','chaine',0,'','2019-09-26 12:59:00'),(6800,'CASHDESK_ID_THIRDPARTY1',1,'7','chaine',0,'','2019-09-26 15:30:09'),(6801,'CASHDESK_ID_BANKACCOUNT_CASH1',1,'3','chaine',0,'','2019-09-26 15:30:09'),(6802,'CASHDESK_ID_BANKACCOUNT_CHEQUE1',1,'4','chaine',0,'','2019-09-26 15:30:09'),(6803,'CASHDESK_ID_BANKACCOUNT_CB1',1,'4','chaine',0,'','2019-09-26 15:30:09'),(6804,'CASHDESK_ID_BANKACCOUNT_PRE1',1,'4','chaine',0,'','2019-09-26 15:30:09'),(6805,'CASHDESK_ID_BANKACCOUNT_VIR1',1,'1','chaine',0,'','2019-09-26 15:30:09'),(6806,'CASHDESK_NO_DECREASE_STOCK1',1,'1','chaine',0,'','2019-09-26 15:30:09'),(6811,'FORCEPROJECT_ON_PROPOSAL',1,'1','chaine',0,'','2019-09-27 14:52:57'),(6813,'PROJECT_USE_OPPORTUNITIES',1,'1','chaine',0,'','2019-10-01 11:48:09'),(6814,'PACKTHEMEACTIVATEDTHEME',0,'modOwnTheme','chaine',0,'','2019-10-02 11:41:58'),(6815,'OWNTHEME_COL1',0,'#6a89cc','chaine',0,'','2019-10-02 11:41:58'),(6816,'OWNTHEME_COL2',0,'#60a3bc','chaine',0,'','2019-10-02 11:41:58'),(6817,'DOL_VERSION',0,'10.0.2','chaine',0,'Dolibarr version','2019-10-02 11:41:58'),(6823,'OWNTHEME_COL_BODY_BCKGRD',0,'#E9E9E9','chaine',0,'','2019-10-02 11:41:58'),(6824,'OWNTHEME_COL_LOGO_BCKGRD',0,'#474c80','chaine',0,'','2019-10-02 11:41:58'),(6825,'OWNTHEME_COL_TXT_MENU',0,'#b8c6e5','chaine',0,'','2019-10-02 11:41:58'),(6826,'OWNTHEME_COL_HEADER_BCKGRD',0,'#474c80','chaine',0,'','2019-10-02 11:41:58'),(6827,'OWNTHEME_CUSTOM_CSS',0,'0','yesno',0,'','2019-10-02 11:41:58'),(6828,'OWNTHEME_CUSTOM_JS',0,'0','yesno',0,'','2019-10-02 11:41:58'),(6829,'OWNTHEME_FIXED_MENU',0,'0','yesno',0,'','2019-10-02 11:41:58'),(6830,'OWNTHEME_D_HEADER_FONT_SIZE',0,'1.7rem','chaine',0,'','2019-10-02 11:41:58'),(6831,'OWNTHEME_S_HEADER_FONT_SIZE',0,'1.6rem','chaine',0,'','2019-10-02 11:41:58'),(6832,'OWNTHEME_D_VMENU_FONT_SIZE',0,'1.2rem','chaine',0,'','2019-10-02 11:41:58'),(6833,'OWNTHEME_S_VMENU_FONT_SIZE',0,'1.2rem','chaine',0,'','2019-10-02 11:41:58'),(6844,'MAIN_THEME',0,'eldy','chaine',0,'','2019-10-02 11:46:02'),(6845,'MAIN_MENU_STANDARD',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6846,'MAIN_MENUFRONT_STANDARD',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6847,'MAIN_MENU_SMARTPHONE',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6848,'MAIN_MENUFRONT_SMARTPHONE',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6849,'MAIN_UPLOAD_DOC',1,'20000','chaine',0,'','2019-10-02 11:46:54'),(6850,'MAIN_UMASK',1,'0664','chaine',0,'','2019-10-02 11:46:54'),(6851,'BECREATIVE_COL1',1,'#1e88e5','chaine',0,'','2019-10-02 11:47:10'),(6852,'BECREATIVE_COL2',1,'#1e88e5','chaine',0,'','2019-10-02 11:47:10'),(6853,'DOL_VERSION',1,'10.0.2','chaine',0,'Dolibarr version','2019-10-02 11:47:10'),(6859,'BECREATIVE_COL_BODY_BCKGRD',1,'#e6eaef','chaine',0,'','2019-10-02 11:47:10'),(6860,'BECREATIVE_COL_LOGO_BCKGRD',1,'#1e88e5','chaine',0,'','2019-10-02 11:47:10'),(6861,'BECREATIVE_COL_TXT_MENU',1,'#b8c6e5','chaine',0,'','2019-10-02 11:47:10'),(6862,'BECREATIVE_COL_HEADER_BCKGRD',1,'#26a69a','chaine',0,'','2019-10-02 11:47:10'),(6863,'BECREATIVE_CUSTOM_CSS',1,'0','yesno',0,'','2019-10-02 11:47:10'),(6864,'BECREATIVE_CUSTOM_JS',1,'0','yesno',0,'','2019-10-02 11:47:10'),(6865,'BECREATIVE_FIXED_MENU',1,'0','yesno',0,'','2019-10-02 11:47:10'),(6866,'BECREATIVE_D_HEADER_FONT_SIZE',1,'1.7rem','chaine',0,'','2019-10-02 11:47:10'),(6867,'BECREATIVE_S_HEADER_FONT_SIZE',1,'1.6rem','chaine',0,'','2019-10-02 11:47:10'),(6868,'BECREATIVE_D_VMENU_FONT_SIZE',1,'1.2rem','chaine',0,'','2019-10-02 11:47:10'),(6869,'BECREATIVE_S_VMENU_FONT_SIZE',1,'1.2rem','chaine',0,'','2019-10-02 11:47:10'),(6881,'MAIN_MENU_STANDARD',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6882,'MAIN_MENUFRONT_STANDARD',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6883,'MAIN_MENU_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6884,'MAIN_MENUFRONT_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6885,'ACCOUNTING_ACCOUNT_CUSTOMER',1,'411','chaine',0,'','2019-10-04 08:15:44'),(6886,'ACCOUNTING_ACCOUNT_SUPPLIER',1,'401','chaine',0,'','2019-10-04 08:15:44'),(6887,'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',1,'421','chaine',0,'','2019-10-04 08:15:44'),(6888,'ACCOUNTING_PRODUCT_BUY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6889,'ACCOUNTING_PRODUCT_SOLD_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6890,'ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6891,'ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6892,'ACCOUNTING_SERVICE_BUY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6893,'ACCOUNTING_SERVICE_SOLD_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6894,'ACCOUNTING_VAT_BUY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6895,'ACCOUNTING_VAT_SOLD_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6896,'ACCOUNTING_VAT_PAY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6897,'ACCOUNTING_ACCOUNT_SUSPENSE',1,'471','chaine',0,'','2019-10-04 08:15:44'),(6898,'ACCOUNTING_ACCOUNT_TRANSFER_CASH',1,'58','chaine',0,'','2019-10-04 08:15:44'),(6899,'DONATION_ACCOUNTINGACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6900,'ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6901,'LOAN_ACCOUNTING_ACCOUNT_CAPITAL',1,'164','chaine',0,'','2019-10-04 08:15:44'),(6902,'LOAN_ACCOUNTING_ACCOUNT_INTEREST',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6903,'LOAN_ACCOUNTING_ACCOUNT_INSURANCE',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6912,'TICKET_ENABLE_PUBLIC_INTERFACE',1,'1','chaine',0,'','2019-10-04 11:44:33'),(6934,'TICKET_NOTIFICATION_EMAIL_FROM',1,'fff','chaine',0,'','2019-10-04 12:03:51'),(6935,'TICKET_NOTIFICATION_EMAIL_TO',1,'ff','chaine',0,'','2019-10-04 12:03:51'),(6936,'TICKET_MESSAGE_MAIL_INTRO',1,'Hello,<br />\r\nA new response was sent on a ticket that you contact. Here is the message:<img alt=\"\" src=\"/dolibarr_10.0/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/background_rough-horn.jpg\" style=\"height:1080px; width:1920px\" />','chaine',0,'','2019-10-04 12:03:51'),(6937,'TICKET_MESSAGE_MAIL_SIGNATURE',1,'<p>Sincerely,</p>\r\n\r\n<p>--<img alt=\"\" src=\"/dolibarr_10.0/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/background_rough-horn.jpg\" style=\"height:1080px; width:1920px\" /></p>\r\n','chaine',0,'','2019-10-04 12:03:51'),(7027,'USER_PASSWORD_GENERATED',1,'Perso','chaine',0,'','2019-10-07 10:52:46'),(7028,'USER_PASSWORD_PATTERN',1,'8;1;0;1;0;1','chaine',0,'','2019-10-07 10:57:03'),(7032,'MAIN_MODULE_BOM',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-10-08 18:49:41'),(7034,'BOM_ADDON',1,'mod_bom_standard','chaine',0,'Name of numbering rules of BOM','2019-10-08 18:49:41'),(7035,'BOM_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/boms','chaine',0,NULL,'2019-10-08 18:49:41'),(7036,'MAIN_MODULE_GEOIPMAXMIND',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-10-08 18:51:54'),(7037,'MAIN_MODULE_DAV',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-10-08 18:54:07'),(7122,'BOM_ADDON_PDF',1,'generic_bom_odt','chaine',0,'','2019-11-28 14:00:58'),(7195,'MAIN_AGENDA_ACTIONAUTO_MO_VALIDATE',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7196,'MAIN_AGENDA_ACTIONAUTO_MO_PRODUCED',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7197,'MAIN_AGENDA_ACTIONAUTO_MO_DELETE',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7198,'MAIN_AGENDA_ACTIONAUTO_MO_CANCEL',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7201,'TICKET_PUBLIC_INTERFACE_TOPIC',1,'MyBigCompany public interface for Ticket','chaine',0,'','2019-11-29 08:49:36'),(7202,'TICKET_PUBLIC_TEXT_HOME',1,'You can create a support ticket or view existing from its identifier tracking ticket.','chaine',0,'','2019-11-29 08:49:36'),(7203,'TICKET_PUBLIC_TEXT_HELP_MESSAGE',1,'Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.','chaine',0,'','2019-11-29 08:49:36'),(7204,'TICKET_MESSAGE_MAIL_NEW',1,'TicketMessageMailNewText','chaine',0,'','2019-11-29 08:49:36'),(7209,'MAIN_MODULE_MRP',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-11-29 08:57:42'),(7210,'MAIN_MODULE_MRP_TRIGGERS',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7211,'MAIN_MODULE_MRP_LOGIN',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7212,'MAIN_MODULE_MRP_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7213,'MAIN_MODULE_MRP_MENUS',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7214,'MAIN_MODULE_MRP_TPL',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7215,'MAIN_MODULE_MRP_BARCODE',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7216,'MAIN_MODULE_MRP_MODELS',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7217,'MAIN_MODULE_MRP_THEME',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7218,'MAIN_MODULE_MRP_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7220,'MRP_MO_ADDON',1,'mod_mo_standard','chaine',0,'Name of numbering rules of MO','2019-11-29 08:57:42'),(7221,'MRP_MO_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/mrps','chaine',0,NULL,'2019-11-29 08:57:42'),(7222,'MRP_MO_ADDON_PDF',1,'generic_mo_odt','chaine',0,'','2019-11-29 08:57:47'),(7254,'MAIN_INFO_OPENINGHOURS_MONDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7255,'MAIN_INFO_OPENINGHOURS_TUESDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7256,'MAIN_INFO_OPENINGHOURS_WEDNESDAY',1,'8-13','chaine',0,'','2019-12-19 11:14:21'),(7257,'MAIN_INFO_OPENINGHOURS_THURSDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7258,'MAIN_INFO_OPENINGHOURS_FRIDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7264,'MAIN_INFO_ACCOUNTANT_NAME',1,'Bob Bookkeeper','chaine',0,'','2019-12-19 11:14:54'),(7265,'MAIN_INFO_ACCOUNTANT_TOWN',1,'Berlin','chaine',0,'','2019-12-19 11:14:54'),(7266,'MAIN_INFO_ACCOUNTANT_STATE',1,'0','chaine',0,'','2019-12-19 11:14:54'),(7267,'MAIN_INFO_ACCOUNTANT_COUNTRY',1,'5','chaine',0,'','2019-12-19 11:14:54'),(7268,'MAIN_INFO_ACCOUNTANT_MAIL',1,'mybookkeeper@example.com','chaine',0,'','2019-12-19 11:14:54'),(7313,'MODULEBUILDER_ASCIIDOCTOR',1,'asciidoctor','chaine',0,'','2019-12-20 10:57:21'),(7314,'MODULEBUILDER_ASCIIDOCTORPDF',1,'asciidoctor-pdf','chaine',0,'','2019-12-20 10:57:21'),(7337,'EXTERNAL_RSS_TITLE_1',1,'Dolibarr.org News','chaine',0,'','2019-12-20 12:10:38'),(7338,'EXTERNAL_RSS_URLRSS_1',1,'https://www.dolibarr.org/rss','chaine',0,'','2019-12-20 12:10:38'),(7339,'EXPENSEREPORT_ADDON',1,'mod_expensereport_jade','chaine',0,'','2019-12-20 16:33:46'),(7378,'COMPANY_USE_SEARCH_TO_SELECT',1,'0','chaine',0,'','2019-12-21 15:54:22'),(7420,'CASHDESK_SERVICES',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7421,'TAKEPOS_ROOT_CATEGORY_ID',1,'31','chaine',0,'','2019-12-23 12:15:06'),(7422,'TAKEPOSCONNECTOR',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7423,'TAKEPOS_BAR_RESTAURANT',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7424,'TAKEPOS_TICKET_VAT_GROUPPED',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7425,'TAKEPOS_AUTO_PRINT_TICKETS',1,'0','int',0,'','2019-12-23 12:15:06'),(7426,'TAKEPOS_NUMPAD',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7427,'TAKEPOS_NUM_TERMINALS',1,'1','chaine',0,'','2019-12-23 12:15:06'),(7428,'TAKEPOS_DIRECT_PAYMENT',1,'0','int',0,'','2019-12-23 12:15:06'),(7429,'TAKEPOS_CUSTOM_RECEIPT',1,'0','int',0,'','2019-12-23 12:15:06'),(7430,'TAKEPOS_EMAIL_TEMPLATE_INVOICE',1,'-1','chaine',0,'','2019-12-23 12:15:06'),(7452,'MEMBER_ENABLE_PUBLIC',1,'1','chaine',0,'','2020-01-01 10:31:46'),(7453,'MEMBER_NEWFORM_AMOUNT',1,'20','chaine',0,'','2020-01-01 10:31:46'),(7454,'MEMBER_NEWFORM_EDITAMOUNT',1,'0','chaine',0,'','2020-01-01 10:31:46'),(7455,'MEMBER_NEWFORM_PAYONLINE',1,'all','chaine',0,'','2020-01-01 10:31:46'),(7456,'MEMBER_NEWFORM_FORCETYPE',1,'1','chaine',0,'','2020-01-01 10:31:46'),(7470,'STRIPE_TEST_PUBLISHABLE_KEY',1,'pk_test_123456789','chaine',0,'','2020-01-01 11:43:44'),(7471,'STRIPE_TEST_SECRET_KEY',1,'sk_test_123456','chaine',0,'','2020-01-01 11:43:44'),(7472,'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS',1,'4','chaine',0,'','2020-01-01 11:43:44'),(7473,'STRIPE_USER_ACCOUNT_FOR_ACTIONS',1,'1','chaine',0,'','2020-01-01 11:43:44'),(7489,'CAPTURESERVER_SECURITY_KEY',1,'securitykey123','chaine',0,'','2020-01-01 12:00:49'),(7720,'SUPPLIER_INVOICE_ALLOW_REUSE_OF_CREDIT_WHEN_PARTIALLY_REFUNDED',1,'1','chaine',1,'','2020-01-01 17:19:12'),(8063,'MAIN_AGENDA_ACTIONAUTO_COMPANY_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8064,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8065,'MAIN_AGENDA_ACTIONAUTO_COMPANY_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8066,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLOSE_REFUSED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8067,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLASSIFY_BILLED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8068,'MAIN_AGENDA_ACTIONAUTO_PROPAL_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8069,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLOSE_SIGNED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8070,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8071,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8072,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8073,'MAIN_AGENDA_ACTIONAUTO_ORDER_CANCEL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8074,'MAIN_AGENDA_ACTIONAUTO_ORDER_CLOSE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8075,'MAIN_AGENDA_ACTIONAUTO_ORDER_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8076,'MAIN_AGENDA_ACTIONAUTO_ORDER_CLASSIFY_BILLED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8077,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8078,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8079,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8080,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8081,'MAIN_AGENDA_ACTIONAUTO_BILL_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8082,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8083,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8084,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8085,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8086,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_CLOSE_SIGNED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8087,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_CLOSE_REFUSED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8088,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8089,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8090,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8091,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_RECEIVE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8092,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_SUBMIT',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8093,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_APPROVE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8094,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_REFUSE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8095,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_CLASSIFY_BILLED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8096,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8097,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8098,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8099,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_UNVALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8100,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_PAYED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8101,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8102,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8103,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_CANCELED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8104,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8105,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8106,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8107,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8108,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_REOPEN',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8109,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8110,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8111,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8112,'MAIN_AGENDA_ACTIONAUTO_MEMBER_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8113,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8114,'MAIN_AGENDA_ACTIONAUTO_MEMBER_MODIFY',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8115,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8116,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_MODIFY',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8117,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8118,'MAIN_AGENDA_ACTIONAUTO_MEMBER_RESILIATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8119,'MAIN_AGENDA_ACTIONAUTO_MEMBER_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8120,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8121,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8122,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_MODIFY',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8123,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8124,'MAIN_AGENDA_ACTIONAUTO_TASK_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8125,'MAIN_AGENDA_ACTIONAUTO_TASK_MODIFY',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8126,'MAIN_AGENDA_ACTIONAUTO_TASK_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8127,'MAIN_AGENDA_ACTIONAUTO_PROJECT_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8128,'MAIN_AGENDA_ACTIONAUTO_PROJECT_MODIFY',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8129,'MAIN_AGENDA_ACTIONAUTO_PROJECT_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8130,'MAIN_AGENDA_ACTIONAUTO_TICKET_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8131,'MAIN_AGENDA_ACTIONAUTO_TICKET_MODIFY',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8132,'MAIN_AGENDA_ACTIONAUTO_TICKET_ASSIGNED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8133,'MAIN_AGENDA_ACTIONAUTO_TICKET_CLOSE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8134,'MAIN_AGENDA_ACTIONAUTO_TICKET_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8135,'MAIN_AGENDA_ACTIONAUTO_TICKET_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8136,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8137,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8138,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8139,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_APPROVE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8140,'MAIN_AGENDA_ACTIONAUTO_USER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8141,'MAIN_AGENDA_ACTIONAUTO_BOM_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8142,'MAIN_AGENDA_ACTIONAUTO_BOM_UNVALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8143,'MAIN_AGENDA_ACTIONAUTO_BOM_CLOSE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8144,'MAIN_AGENDA_ACTIONAUTO_BOM_REOPEN',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8145,'MAIN_AGENDA_ACTIONAUTO_BOM_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8146,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8147,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_PRODUCED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8148,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8149,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_CANCEL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8169,'CABINETMED_DELAY_TO_LOCK_RECORD',1,'0','chaine',1,'Number of days before locking edit of consultation','2020-01-05 20:37:19'),(8190,'ACCOUNTING_PRODUCT_MODE',1,'ACCOUNTANCY_SELL_EXPORT','chaine',0,'','2020-01-06 01:23:30'),(8191,'MAIN_ENABLE_DEFAULT_VALUES',1,'1','chaine',0,'','2020-01-06 16:09:52'),(8210,'CABINETMED_RHEUMATOLOGY_ON',1,'0','texte',0,'','2020-01-06 16:51:43'),(8213,'MAIN_SEARCHFORM_SOCIETE',1,'1','texte',0,'','2020-01-06 16:51:43'),(8214,'CABINETMED_BANK_PATIENT_REQUIRED',1,'0','texte',0,'','2020-01-06 16:51:43'),(8215,'DIAGNOSTIC_IS_NOT_MANDATORY',1,'1','texte',0,'','2020-01-06 16:51:43'),(8216,'USER_ADDON_PDF_ODT',1,'generic_user_odt','chaine',0,'','2020-01-07 13:45:19'),(8217,'USERGROUP_ADDON_PDF_ODT',1,'generic_usergroup_odt','chaine',0,'','2020-01-07 13:45:23'),(8230,'MAIN_MODULE_EMAILCOLLECTOR',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-12 20:13:55'),(8232,'MAIN_MODULE_SUPPLIERPROPOSAL',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-13 14:37:09'),(8233,'MAIN_MODULE_EXPEDITION',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-13 14:38:20'),(8252,'SYSTEMTOOLS_MYSQLDUMP',1,'/usr/bin/mysqldump','chaine',0,'','2020-01-15 15:42:41'),(8256,'WEBSITE_EDITINLINE',1,'0','chaine',0,'','2020-01-17 11:07:44'),(8258,'WEBSITE_SUBCONTAINERSINLINE',1,'1','chaine',0,'','2020-01-17 12:52:48'),(8259,'ACCOUNTING_REEXPORT',1,'1','yesno',0,'','2020-01-17 13:42:56'),(8291,'PRODUIT_MULTIPRICES_LIMIT',1,'5','chaine',0,'','2020-01-17 14:21:46'),(8293,'PRODUIT_CUSTOMER_PRICES_BY_QTY',1,'0','chaine',0,'','2020-01-17 14:21:46'),(8303,'PRODUCT_PRICE_UNIQ',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8304,'PRODUIT_MULTIPRICES',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8305,'PRODUIT_CUSTOMER_PRICES',1,'1','chaine',0,'','2020-01-17 14:25:30'),(8306,'PRODUIT_SOUSPRODUITS',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8307,'PRODUIT_DESC_IN_FORM',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8308,'PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8309,'PRODUIT_USE_SEARCH_TO_SELECT',1,'1','chaine',0,'','2020-01-17 14:25:30'),(8310,'PRODUIT_FOURN_TEXTS',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8313,'MAIN_MODULE_FCKEDITOR',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-18 17:13:27'),(8314,'FCKEDITOR_ENABLE_TICKET',1,'1','chaine',0,'','2020-01-18 19:39:54'),(8321,'FCKEDITOR_SKIN',1,'moono-lisa','chaine',0,'','2020-01-18 19:41:15'),(8322,'FCKEDITOR_TEST',1,'Test &lt; aaa<br />\r\n<br />\r\n<img alt=\"\" src=\"/dolibarr_11.0/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/background_coder.jpg\" style=\"height:1280px; width:1920px\" />','chaine',0,'','2020-01-18 19:41:15'),(8373,'MAIN_FEATURES_LEVEL',0,'0','chaine',1,'Level of features to show (0=stable only, 1=stable+experimental, 2=stable+experimental+development','2020-01-20 17:42:42'),(8484,'MAIN_LANG_DEFAULT',1,'auto','chaine',0,'','2020-01-21 09:40:00'),(8485,'MAIN_IHM_PARAMS_REV',1,'11','chaine',0,'','2020-01-21 09:40:00'),(8486,'MAIN_MULTILANGS',1,'1','chaine',0,'','2020-01-21 09:40:00'),(8487,'MAIN_THEME',1,'eldy','chaine',0,'','2020-01-21 09:40:00'),(8488,'THEME_ELDY_USE_HOVER',1,'237,244,251','chaine',0,'','2020-01-21 09:40:00'),(8489,'MAIN_SIZE_LISTE_LIMIT',1,'25','chaine',0,'','2020-01-21 09:40:00'),(8490,'MAIN_SIZE_SHORTLIST_LIMIT',1,'3','chaine',0,'','2020-01-21 09:40:00'),(8491,'MAIN_DISABLE_JAVASCRIPT',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8492,'MAIN_BUTTON_HIDE_UNAUTHORIZED',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8493,'MAIN_START_WEEK',1,'1','chaine',0,'','2020-01-21 09:40:00'),(8494,'MAIN_DEFAULT_WORKING_DAYS',1,'1-5','chaine',0,'','2020-01-21 09:40:00'),(8495,'MAIN_DEFAULT_WORKING_HOURS',1,'9-18','chaine',0,'','2020-01-21 09:40:00'),(8496,'MAIN_SHOW_LOGO',1,'1','chaine',0,'','2020-01-21 09:40:00'),(8497,'MAIN_FIRSTNAME_NAME_POSITION',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8498,'MAIN_HELPCENTER_DISABLELINK',0,'0','chaine',0,'','2020-01-21 09:40:00'),(8499,'MAIN_HOME',1,'<span style=\"font-size:12px\">__(NoteSomeFeaturesAreDisabled)__<br />\r\n__(SomeTranslationAreUncomplete)__</span>','chaine',0,'','2020-01-21 09:40:00'),(8501,'MAIN_BUGTRACK_ENABLELINK',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8508,'MAIN_MODULE_ACCOUNTING',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:28'),(8509,'MAIN_MODULE_AGENDA',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:28'),(8510,'MAIN_MODULE_BARCODE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:28'),(8511,'MAIN_MODULE_CRON',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:28'),(8512,'MAIN_MODULE_COMMANDE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:28'),(8513,'MAIN_MODULE_DON',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:29'),(8514,'MAIN_MODULE_ECM',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:29'),(8515,'MAIN_MODULE_EXPENSEREPORT',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:29'),(8516,'MAIN_MODULE_FACTURE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:29'),(8517,'MAIN_MODULE_FOURNISSEUR',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:29'),(8518,'MAIN_MODULE_HOLIDAY',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:29'),(8519,'MAIN_MODULE_OPENSURVEY',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:29'),(8520,'MAIN_MODULE_PRINTING',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:29'),(8521,'MAIN_MODULE_RESOURCE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:29'),(8522,'MAIN_MODULE_SALARIES',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:29'),(8523,'MAIN_MODULE_SOCIETE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:30'),(8524,'MAIN_MODULE_SERVICE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:30'),(8525,'TAKEPOS_PRINT_METHOD',1,'browser','chaine',0,'','2020-06-12 17:12:30'),(8526,'MAIN_MODULE_TAKEPOS',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:30'),(8527,'MAIN_MODULE_TAKEPOS_TRIGGERS',1,'0','chaine',0,NULL,'2020-06-12 17:12:30'),(8528,'MAIN_MODULE_TAKEPOS_LOGIN',1,'0','chaine',0,NULL,'2020-06-12 17:12:30'),(8529,'MAIN_MODULE_TAKEPOS_SUBSTITUTIONS',1,'1','chaine',0,NULL,'2020-06-12 17:12:30'),(8530,'MAIN_MODULE_TAKEPOS_MENUS',1,'0','chaine',0,NULL,'2020-06-12 17:12:30'),(8531,'MAIN_MODULE_TAKEPOS_THEME',1,'0','chaine',0,NULL,'2020-06-12 17:12:30'),(8532,'MAIN_MODULE_TAKEPOS_TPL',1,'0','chaine',0,NULL,'2020-06-12 17:12:30'),(8533,'MAIN_MODULE_TAKEPOS_BARCODE',1,'0','chaine',0,NULL,'2020-06-12 17:12:30'),(8534,'MAIN_MODULE_TAKEPOS_MODELS',1,'0','chaine',0,NULL,'2020-06-12 17:12:30'),(8535,'MAIN_MODULE_USER',0,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:30'),(8536,'MAIN_MODULE_VARIANTS',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:30'),(8537,'MAIN_MODULE_WEBSITE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"::1\"}','2020-06-12 17:12:30'),(8538,'MAIN_VERSION_LAST_UPGRADE',0,'12.0.0','chaine',0,'Dolibarr version for last upgrade','2020-06-12 17:12:32'),(8540,'MAIN_FIRST_PING_OK_DATE',1,'20200612171237','chaine',0,'','2020-06-12 17:12:37'),(8541,'MAIN_FIRST_PING_OK_ID',1,'7d3fa4278b44d85aa629096595435c63','chaine',0,'','2020-06-12 17:12:37'),(8542,'MAIN_INFO_SOCIETE_COUNTRY',1,'117:IN:India','chaine',0,'','2020-06-12 17:24:42'),(8543,'MAIN_INFO_SOCIETE_NOM',1,'MyBigCompany','chaine',0,'','2020-06-12 17:24:42'),(8544,'MAIN_INFO_SOCIETE_ADDRESS',1,'21 Jump street.','chaine',0,'','2020-06-12 17:24:42'),(8545,'MAIN_INFO_SOCIETE_TOWN',1,'MyTown','chaine',0,'','2020-06-12 17:24:42'),(8546,'MAIN_INFO_SOCIETE_ZIP',1,'75500','chaine',0,'','2020-06-12 17:24:42'),(8547,'MAIN_MONNAIE',1,'EUR','chaine',0,'','2020-06-12 17:24:42'),(8548,'MAIN_INFO_SOCIETE_TEL',1,'09123123','chaine',0,'','2020-06-12 17:24:42'),(8549,'MAIN_INFO_SOCIETE_FAX',1,'09123124','chaine',0,'','2020-06-12 17:24:42'),(8550,'MAIN_INFO_SOCIETE_MAIL',1,'myemail@mybigcompany.com','chaine',0,'','2020-06-12 17:24:42'),(8551,'MAIN_INFO_SOCIETE_WEB',1,'https://www.dolibarr.org','chaine',0,'','2020-06-12 17:24:42'),(8552,'MAIN_INFO_SOCIETE_NOTE',1,'This is note about my company','chaine',0,'','2020-06-12 17:24:42'),(8553,'MAIN_INFO_SOCIETE_GENCOD',1,'1234567890','chaine',0,'','2020-06-12 17:24:42'),(8554,'MAIN_INFO_SOCIETE_FACEBOOK_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8555,'MAIN_INFO_SOCIETE_TWITTER_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8556,'MAIN_INFO_SOCIETE_LINKEDIN_URL',1,'https://www.linkedin.com/company/9400559/admin/','chaine',0,'','2020-06-12 17:24:42'),(8557,'MAIN_INFO_SOCIETE_INSTAGRAM_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8558,'MAIN_INFO_SOCIETE_YOUTUBE_URL',1,'DolibarrERPCRM','chaine',0,'','2020-06-12 17:24:42'),(8559,'MAIN_INFO_SOCIETE_GITHUB_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8560,'MAIN_INFO_SOCIETE_MANAGERS',1,'Zack Zeceo','chaine',0,'','2020-06-12 17:24:42'),(8561,'MAIN_INFO_GDPR',1,'Zack Zeceo','chaine',0,'','2020-06-12 17:24:42'),(8562,'MAIN_INFO_CAPITAL',1,'10000','chaine',0,'','2020-06-12 17:24:42'),(8563,'MAIN_INFO_SOCIETE_FORME_JURIDIQUE',1,'0','chaine',0,'','2020-06-12 17:24:42'),(8564,'MAIN_INFO_SIREN',1,'123456','chaine',0,'','2020-06-12 17:24:42'),(8565,'MAIN_INFO_SIRET',1,'ABC-DEF','chaine',0,'','2020-06-12 17:24:42'),(8566,'MAIN_INFO_APE',1,'15E-45-8D','chaine',0,'','2020-06-12 17:24:42'),(8567,'MAIN_INFO_TVAINTRA',1,'FR12345678','chaine',0,'','2020-06-12 17:24:42'),(8568,'MAIN_INFO_SOCIETE_OBJECT',1,'A company demo to show how Dolibarr ERP CRM is wonderfull','chaine',0,'','2020-06-12 17:24:42'),(8569,'SOCIETE_FISCAL_MONTH_START',1,'4','chaine',0,'','2020-06-12 17:24:42'),(8570,'FACTURE_TVAOPTION',1,'1','chaine',0,'','2020-06-12 17:24:42'),(8571,'FACTURE_LOCAL_TAX1_OPTION',1,'localtax1on','chaine',0,'','2020-06-12 17:24:42'),(8572,'FACTURE_LOCAL_TAX2_OPTION',1,'localtax2on','chaine',0,'','2020-06-12 17:24:42'),(8573,'MAIN_INFO_VALUE_LOCALTAX1',1,'0','chaine',0,'','2020-06-12 17:24:42'),(8574,'MAIN_INFO_LOCALTAX_CALC1',1,'0','chaine',0,'','2020-06-12 17:24:42'),(8575,'MAIN_INFO_VALUE_LOCALTAX2',1,'0','chaine',0,'','2020-06-12 17:24:42'),(8576,'MAIN_INFO_LOCALTAX_CALC2',1,'0','chaine',0,'','2020-06-12 17:24:42');
+INSERT INTO `llx_const` VALUES (8,'MAIN_UPLOAD_DOC',0,'2048','chaine',0,'Max size for file upload (0 means no upload allowed)','2012-07-08 11:17:57'),(9,'MAIN_SEARCHFORM_SOCIETE',0,'1','yesno',0,'Show form for quick company search','2012-07-08 11:17:57'),(10,'MAIN_SEARCHFORM_CONTACT',0,'1','yesno',0,'Show form for quick contact search','2012-07-08 11:17:57'),(11,'MAIN_SEARCHFORM_PRODUITSERVICE',0,'1','yesno',0,'Show form for quick product search','2012-07-08 11:17:58'),(12,'MAIN_SEARCHFORM_ADHERENT',0,'1','yesno',0,'Show form for quick member search','2012-07-08 11:17:58'),(16,'MAIN_SIZE_LISTE_LIMIT',0,'25','chaine',0,'Longueur maximum des listes','2012-07-08 11:17:58'),(29,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',1,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2012-07-08 11:17:58'),(33,'SOCIETE_NOLIST_COURRIER',0,'1','yesno',0,'Liste les fichiers du repertoire courrier','2012-07-08 11:17:58'),(36,'ADHERENT_MAIL_REQUIRED',1,'1','yesno',0,'EMail required to create a new member','2012-07-08 11:17:58'),(37,'ADHERENT_MAIL_FROM',1,'adherents@domain.com','chaine',0,'Sender EMail for automatic emails','2012-07-08 11:17:58'),(38,'ADHERENT_MAIL_RESIL',1,'Your subscription has been resiliated.\r\nWe hope to see you soon again','html',0,'Mail resiliation','2018-11-23 11:56:07'),(39,'ADHERENT_MAIL_VALID',1,'Your subscription has been validated.\r\nThis is a remind of your personal information :\r\n\r\n%INFOS%\r\n\r\n','html',0,'Mail de validation','2018-11-23 11:56:07'),(40,'ADHERENT_MAIL_COTIS',1,'Hello %PRENOM%,\r\nThanks for your subscription.\r\nThis email confirms that your subscription has been received and processed.\r\n\r\n','html',0,'Mail de validation de cotisation','2018-11-23 11:56:07'),(41,'ADHERENT_MAIL_VALID_SUBJECT',1,'Your subscription has been validated','chaine',0,'Sujet du mail de validation','2012-07-08 11:17:59'),(42,'ADHERENT_MAIL_RESIL_SUBJECT',1,'Resiliating your subscription','chaine',0,'Sujet du mail de resiliation','2012-07-08 11:17:59'),(43,'ADHERENT_MAIL_COTIS_SUBJECT',1,'Receipt of your subscription','chaine',0,'Sujet du mail de validation de cotisation','2012-07-08 11:17:59'),(44,'MAILING_EMAIL_FROM',1,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2012-07-08 11:17:59'),(45,'ADHERENT_USE_MAILMAN',1,'0','yesno',0,'Utilisation de Mailman','2012-07-08 11:17:59'),(46,'ADHERENT_MAILMAN_UNSUB_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&user=%EMAIL%','chaine',0,'Url de desinscription aux listes mailman','2012-07-08 11:17:59'),(47,'ADHERENT_MAILMAN_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&send_welcome_msg_to_this_batch=1&subscribees=%EMAIL%','chaine',0,'Url pour les inscriptions mailman','2012-07-08 11:17:59'),(48,'ADHERENT_MAILMAN_LISTS',1,'test-test,test-test2','chaine',0,'Listes auxquelles inscrire les nouveaux adherents','2012-07-08 11:17:59'),(49,'ADHERENT_MAILMAN_ADMINPW',1,'','chaine',0,'Mot de passe Admin des liste mailman','2012-07-08 11:17:59'),(50,'ADHERENT_MAILMAN_SERVER',1,'lists.domain.com','chaine',0,'Serveur hebergeant les interfaces d Admin des listes mailman','2012-07-08 11:17:59'),(51,'ADHERENT_MAILMAN_LISTS_COTISANT',1,'','chaine',0,'Liste(s) auxquelles les nouveaux cotisants sont inscris automatiquement','2012-07-08 11:17:59'),(52,'ADHERENT_USE_SPIP',1,'0','yesno',0,'Utilisation de SPIP ?','2012-07-08 11:17:59'),(53,'ADHERENT_USE_SPIP_AUTO',1,'0','yesno',0,'Utilisation de SPIP automatiquement','2012-07-08 11:17:59'),(54,'ADHERENT_SPIP_USER',1,'user','chaine',0,'user spip','2012-07-08 11:17:59'),(55,'ADHERENT_SPIP_PASS',1,'pass','chaine',0,'Pass de connection','2012-07-08 11:17:59'),(56,'ADHERENT_SPIP_SERVEUR',1,'localhost','chaine',0,'serveur spip','2012-07-08 11:17:59'),(57,'ADHERENT_SPIP_DB',1,'spip','chaine',0,'db spip','2012-07-08 11:17:59'),(58,'ADHERENT_CARD_HEADER_TEXT',1,'%ANNEE%','chaine',0,'Texte imprime sur le haut de la carte adherent','2012-07-08 11:17:59'),(59,'ADHERENT_CARD_FOOTER_TEXT',1,'Association AZERTY','chaine',0,'Texte imprime sur le bas de la carte adherent','2012-07-08 11:17:59'),(61,'FCKEDITOR_ENABLE_USER',1,'1','yesno',0,'Activation fckeditor sur notes utilisateurs','2012-07-08 11:17:59'),(62,'FCKEDITOR_ENABLE_SOCIETE',1,'1','yesno',0,'Activation fckeditor sur notes societe','2012-07-08 11:17:59'),(63,'FCKEDITOR_ENABLE_PRODUCTDESC',1,'1','yesno',0,'Activation fckeditor sur notes produits','2012-07-08 11:17:59'),(64,'FCKEDITOR_ENABLE_MEMBER',1,'1','yesno',0,'Activation fckeditor sur notes adherent','2012-07-08 11:17:59'),(65,'FCKEDITOR_ENABLE_MAILING',1,'1','yesno',0,'Activation fckeditor sur emailing','2012-07-08 11:17:59'),(67,'DON_ADDON_MODEL',1,'html_cerfafr','chaine',0,'','2012-07-08 11:18:00'),(68,'PROPALE_ADDON',1,'mod_propale_marbre','chaine',0,'','2012-07-08 11:18:00'),(69,'PROPALE_ADDON_PDF',1,'azur','chaine',0,'','2012-07-08 11:18:00'),(70,'COMMANDE_ADDON',1,'mod_commande_marbre','chaine',0,'','2012-07-08 11:18:00'),(71,'COMMANDE_ADDON_PDF',1,'einstein','chaine',0,'','2012-07-08 11:18:00'),(72,'COMMANDE_SUPPLIER_ADDON',1,'mod_commande_fournisseur_muguet','chaine',0,'','2012-07-08 11:18:00'),(73,'COMMANDE_SUPPLIER_ADDON_PDF',1,'muscadet','chaine',0,'','2012-07-08 11:18:00'),(74,'EXPEDITION_ADDON',1,'enlevement','chaine',0,'','2012-07-08 11:18:00'),(76,'FICHEINTER_ADDON',1,'pacific','chaine',0,'','2012-07-08 11:18:00'),(77,'FICHEINTER_ADDON_PDF',1,'soleil','chaine',0,'','2012-07-08 11:18:00'),(79,'FACTURE_ADDON_PDF',1,'crabe','chaine',0,'','2012-07-08 11:18:00'),(80,'PROPALE_VALIDITY_DURATION',1,'15','chaine',0,'Durée de validitée des propales','2012-07-08 11:18:00'),(230,'COMPANY_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2012-07-08 11:26:20'),(238,'LIVRAISON_ADDON_PDF',1,'typhon','chaine',0,'Nom du gestionnaire de generation des commandes en PDF','2012-07-08 11:26:27'),(239,'DELIVERY_ADDON_NUMBER',1,'mod_delivery_jade','chaine',0,'Nom du gestionnaire de numerotation des bons de livraison','2020-12-10 12:24:40'),(245,'FACTURE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2012-07-08 11:28:53'),(249,'DON_FORM',1,'html_cerfafr','chaine',0,'Nom du gestionnaire de formulaire de dons','2017-09-06 16:12:22'),(254,'ADHERENT_BANK_ACCOUNT',1,'','chaine',0,'ID du Compte banquaire utilise','2012-07-08 11:29:05'),(255,'ADHERENT_BANK_CATEGORIE',1,'','chaine',0,'ID de la categorie banquaire des cotisations','2012-07-08 11:29:05'),(256,'ADHERENT_ETIQUETTE_TYPE',1,'L7163','chaine',0,'Type d etiquette (pour impression de planche d etiquette)','2012-07-08 11:29:05'),(269,'PROJECT_ADDON_PDF',1,'baleine','chaine',0,'Nom du gestionnaire de generation des projets en PDF','2012-07-08 11:29:33'),(270,'PROJECT_ADDON',1,'mod_project_simple','chaine',0,'Nom du gestionnaire de numerotation des projets','2012-07-08 11:29:33'),(369,'EXPEDITION_ADDON_PDF',1,'merou','chaine',0,'','2012-07-08 22:58:07'),(377,'FACTURE_ADDON',1,'mod_facture_terre','chaine',0,'','2012-07-08 23:08:12'),(380,'ADHERENT_CARD_TEXT',1,'%TYPE% n° %ID%\r\n%PRENOM% %NOM%\r\n<%EMAIL%>\r\n%ADRESSE%\r\n%CP% %VILLE%\r\n%PAYS%','',0,'Texte imprime sur la carte adherent','2012-07-08 23:14:46'),(381,'ADHERENT_CARD_TEXT_RIGHT',1,'aaa','',0,'','2012-07-08 23:14:55'),(386,'STOCK_CALCULATE_ON_SHIPMENT',1,'1','chaine',0,'','2012-07-08 23:23:21'),(387,'STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER',1,'1','chaine',0,'','2012-07-08 23:23:26'),(392,'MAIN_AGENDA_XCAL_EXPORTKEY',1,'dolibarr','chaine',0,'','2012-07-08 23:27:50'),(393,'MAIN_AGENDA_EXPORT_PAST_DELAY',1,'100','chaine',0,'','2012-07-08 23:27:50'),(610,'CASHDESK_ID_THIRDPARTY',1,'7','chaine',0,'','2012-07-11 17:08:18'),(611,'CASHDESK_ID_BANKACCOUNT_CASH',1,'3','chaine',0,'','2012-07-11 17:08:18'),(612,'CASHDESK_ID_BANKACCOUNT_CHEQUE',1,'1','chaine',0,'','2012-07-11 17:08:18'),(613,'CASHDESK_ID_BANKACCOUNT_CB',1,'1','chaine',0,'','2012-07-11 17:08:18'),(614,'CASHDESK_ID_WAREHOUSE',1,'2','chaine',0,'','2012-07-11 17:08:18'),(660,'LDAP_USER_DN',1,'ou=users,dc=my-domain,dc=com','chaine',0,NULL,'2012-07-18 10:25:27'),(661,'LDAP_GROUP_DN',1,'ou=groups,dc=my-domain,dc=com','chaine',0,NULL,'2012-07-18 10:25:27'),(662,'LDAP_FILTER_CONNECTION',1,'&(objectClass=user)(objectCategory=person)','chaine',0,NULL,'2012-07-18 10:25:27'),(663,'LDAP_FIELD_LOGIN',1,'uid','chaine',0,NULL,'2012-07-18 10:25:27'),(664,'LDAP_FIELD_FULLNAME',1,'cn','chaine',0,NULL,'2012-07-18 10:25:27'),(665,'LDAP_FIELD_NAME',1,'sn','chaine',0,NULL,'2012-07-18 10:25:27'),(666,'LDAP_FIELD_FIRSTNAME',1,'givenname','chaine',0,NULL,'2012-07-18 10:25:27'),(667,'LDAP_FIELD_MAIL',1,'mail','chaine',0,NULL,'2012-07-18 10:25:27'),(668,'LDAP_FIELD_PHONE',1,'telephonenumber','chaine',0,NULL,'2012-07-18 10:25:27'),(669,'LDAP_FIELD_FAX',1,'facsimiletelephonenumber','chaine',0,NULL,'2012-07-18 10:25:27'),(670,'LDAP_FIELD_MOBILE',1,'mobile','chaine',0,NULL,'2012-07-18 10:25:27'),(671,'LDAP_SERVER_TYPE',1,'openldap','chaine',0,'','2012-07-18 10:25:46'),(672,'LDAP_SERVER_PROTOCOLVERSION',1,'3','chaine',0,'','2012-07-18 10:25:47'),(673,'LDAP_SERVER_HOST',1,'localhost','chaine',0,'','2012-07-18 10:25:47'),(674,'LDAP_SERVER_PORT',1,'389','chaine',0,'','2012-07-18 10:25:47'),(675,'LDAP_SERVER_USE_TLS',1,'0','chaine',0,'','2012-07-18 10:25:47'),(676,'LDAP_SYNCHRO_ACTIVE',1,'dolibarr2ldap','chaine',0,'','2012-07-18 10:25:47'),(677,'LDAP_CONTACT_ACTIVE',1,'1','chaine',0,'','2012-07-18 10:25:47'),(678,'LDAP_MEMBER_ACTIVE',1,'1','chaine',0,'','2012-07-18 10:25:47'),(974,'MAIN_MODULE_WORKFLOW_TRIGGERS',1,'1','chaine',0,NULL,'2013-07-18 18:02:20'),(975,'WORKFLOW_PROPAL_AUTOCREATE_ORDER',1,'1','chaine',0,'','2013-07-18 18:02:24'),(980,'PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR',1,'1234567','chaine',0,'','2013-07-18 18:05:50'),(983,'FACTURE_RIB_NUMBER',1,'1','chaine',0,'','2013-07-18 18:35:14'),(984,'FACTURE_CHQ_NUMBER',1,'1','chaine',0,'','2013-07-18 18:35:14'),(1016,'GOOGLE_DUPLICATE_INTO_GCAL',1,'1','chaine',0,'','2013-07-18 21:40:20'),(1152,'SOCIETE_CODECLIENT_ADDON',1,'mod_codeclient_monkey','chaine',0,'','2013-07-29 20:50:02'),(1240,'MAIN_LOGEVENTS_USER_LOGIN',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1241,'MAIN_LOGEVENTS_USER_LOGIN_FAILED',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1242,'MAIN_LOGEVENTS_USER_LOGOUT',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1243,'MAIN_LOGEVENTS_USER_CREATE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1244,'MAIN_LOGEVENTS_USER_MODIFY',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1245,'MAIN_LOGEVENTS_USER_NEW_PASSWORD',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1246,'MAIN_LOGEVENTS_USER_ENABLEDISABLE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1247,'MAIN_LOGEVENTS_USER_DELETE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1248,'MAIN_LOGEVENTS_GROUP_CREATE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1249,'MAIN_LOGEVENTS_GROUP_MODIFY',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1250,'MAIN_LOGEVENTS_GROUP_DELETE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1251,'MAIN_BOXES_MAXLINES',1,'5','',0,'','2013-07-29 21:05:42'),(1482,'EXPEDITION_ADDON_NUMBER',1,'mod_expedition_safor','chaine',0,'Nom du gestionnaire de numerotation des expeditions','2013-08-05 17:53:11'),(1490,'CONTRACT_ADDON',1,'mod_contract_serpis','chaine',0,'Nom du gestionnaire de numerotation des contrats','2013-08-05 18:11:58'),(1677,'COMMANDE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/orders','chaine',0,NULL,'2014-12-08 13:11:02'),(1724,'PROPALE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2014-12-08 13:17:14'),(1730,'OPENSTREETMAP_ENABLE_MAPS',1,'1','chaine',0,'','2014-12-08 13:22:47'),(1731,'OPENSTREETMAP_ENABLE_MAPS_CONTACTS',1,'1','chaine',0,'','2014-12-08 13:22:47'),(1732,'OPENSTREETMAP_ENABLE_MAPS_MEMBERS',1,'1','chaine',0,'','2014-12-08 13:22:47'),(1733,'OPENSTREETMAP_MAPS_ZOOM_LEVEL',1,'15','chaine',0,'','2014-12-08 13:22:47'),(1742,'MAIN_MAIL_EMAIL_FROM',2,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2014-12-08 14:08:14'),(1743,'MAIN_MENU_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2015-02-11 19:43:54'),(1744,'MAIN_MENUFRONT_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2015-02-11 19:43:54'),(1745,'MAIN_MENU_SMARTPHONE',2,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2014-12-08 14:08:14'),(1746,'MAIN_MENUFRONT_SMARTPHONE',2,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2014-12-08 14:08:14'),(1747,'MAIN_THEME',2,'eldy','chaine',0,'Default theme','2014-12-08 14:08:14'),(1748,'MAIN_DELAY_ACTIONS_TODO',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2014-12-08 14:08:14'),(1749,'MAIN_DELAY_ORDERS_TO_PROCESS',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2014-12-08 14:08:14'),(1750,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2014-12-08 14:08:14'),(1751,'MAIN_DELAY_PROPALS_TO_CLOSE',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2014-12-08 14:08:14'),(1752,'MAIN_DELAY_PROPALS_TO_BILL',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2014-12-08 14:08:14'),(1753,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2014-12-08 14:08:14'),(1754,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2014-12-08 14:08:14'),(1755,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2014-12-08 14:08:14'),(1756,'MAIN_DELAY_RUNNING_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2014-12-08 14:08:14'),(1757,'MAIN_DELAY_MEMBERS',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2014-12-08 14:08:14'),(1758,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',2,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2014-12-08 14:08:14'),(1759,'MAILING_EMAIL_FROM',2,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2014-12-08 14:08:14'),(1760,'MAIN_INFO_SOCIETE_COUNTRY',3,'1:FR:France','chaine',0,'','2015-02-26 21:56:28'),(1761,'MAIN_INFO_SOCIETE_NOM',3,'bbb','chaine',0,'','2014-12-08 14:08:20'),(1762,'MAIN_INFO_SOCIETE_STATE',3,'0','chaine',0,'','2015-02-27 14:20:27'),(1763,'MAIN_MONNAIE',3,'EUR','chaine',0,'','2014-12-08 14:08:20'),(1764,'MAIN_LANG_DEFAULT',3,'auto','chaine',0,'','2014-12-08 14:08:20'),(1765,'MAIN_MAIL_EMAIL_FROM',3,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2014-12-08 14:08:20'),(1766,'MAIN_MENU_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2015-02-11 19:43:54'),(1767,'MAIN_MENUFRONT_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2015-02-11 19:43:54'),(1768,'MAIN_MENU_SMARTPHONE',3,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2014-12-08 14:08:20'),(1769,'MAIN_MENUFRONT_SMARTPHONE',3,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2014-12-08 14:08:20'),(1770,'MAIN_THEME',3,'eldy','chaine',0,'Default theme','2014-12-08 14:08:20'),(1771,'MAIN_DELAY_ACTIONS_TODO',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2014-12-08 14:08:20'),(1772,'MAIN_DELAY_ORDERS_TO_PROCESS',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2014-12-08 14:08:20'),(1773,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2014-12-08 14:08:20'),(1774,'MAIN_DELAY_PROPALS_TO_CLOSE',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2014-12-08 14:08:20'),(1775,'MAIN_DELAY_PROPALS_TO_BILL',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2014-12-08 14:08:20'),(1776,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2014-12-08 14:08:20'),(1777,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2014-12-08 14:08:20'),(1778,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2014-12-08 14:08:20'),(1779,'MAIN_DELAY_RUNNING_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2014-12-08 14:08:20'),(1780,'MAIN_DELAY_MEMBERS',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2014-12-08 14:08:20'),(1781,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',3,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2014-12-08 14:08:20'),(1782,'MAILING_EMAIL_FROM',3,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2014-12-08 14:08:20'),(1803,'SYSLOG_FILE',1,'DOL_DATA_ROOT/dolibarr.log','chaine',0,'','2014-12-08 14:15:08'),(1804,'SYSLOG_HANDLERS',1,'[\"mod_syslog_file\"]','chaine',0,'','2014-12-08 14:15:08'),(1805,'MAIN_MODULE_SKINCOLOREDITOR',3,'1',NULL,0,NULL,'2014-12-08 14:35:40'),(1922,'PAYPAL_API_SANDBOX',1,'1','chaine',0,'','2014-12-12 12:11:05'),(1923,'PAYPAL_API_USER',1,'seller_1355312017_biz_api1.mydomain.com','chaine',0,'','2014-12-12 12:11:05'),(1924,'PAYPAL_API_PASSWORD',1,'1355312040','chaine',0,'','2014-12-12 12:11:05'),(1925,'PAYPAL_API_SIGNATURE',1,'ABCDEFWBzvfn0q5iNmbuiDv1y.3EAXIMWyl4C5KvDReR9HDwwAd6dQ4Q','chaine',0,'','2014-12-12 12:11:05'),(1926,'PAYPAL_API_INTEGRAL_OR_PAYPALONLY',1,'integral','chaine',0,'','2014-12-12 12:11:05'),(1927,'PAYPAL_SECURITY_TOKEN',1,'50c82fab36bb3b6aa83e2a50691803b2','chaine',0,'','2014-12-12 12:11:05'),(1928,'PAYPAL_SECURITY_TOKEN_UNIQUE',1,'0','chaine',0,'','2014-12-12 12:11:05'),(1929,'PAYPAL_ADD_PAYMENT_URL',1,'1','chaine',0,'','2014-12-12 12:11:05'),(1980,'MAIN_PDF_FORMAT',1,'EUA4','chaine',0,'','2014-12-12 19:58:05'),(1981,'MAIN_PROFID1_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1982,'MAIN_PROFID2_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1983,'MAIN_PROFID3_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1984,'MAIN_PROFID4_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1985,'MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT',1,'0','chaine',0,'','2014-12-12 19:58:05'),(2835,'MAIN_USE_CONNECT_TIMEOUT',1,'10','chaine',0,'','2015-01-16 19:28:50'),(2836,'MAIN_USE_RESPONSE_TIMEOUT',1,'30','chaine',0,'','2015-01-16 19:28:50'),(2837,'MAIN_PROXY_USE',1,'0','chaine',0,'','2015-01-16 19:28:50'),(2838,'MAIN_PROXY_HOST',1,'localhost','chaine',0,'','2015-01-16 19:28:50'),(2839,'MAIN_PROXY_PORT',1,'8080','chaine',0,'','2015-01-16 19:28:50'),(2840,'MAIN_PROXY_USER',1,'aaa','chaine',0,'','2015-01-16 19:28:50'),(2841,'MAIN_PROXY_PASS',1,'bbb','chaine',0,'','2015-01-16 19:28:50'),(2848,'OVHSMS_NICK',1,'BN196-OVH','chaine',0,'','2015-01-16 19:32:36'),(2849,'OVHSMS_PASS',1,'bigone-10','chaine',0,'','2015-01-16 19:32:36'),(2850,'OVHSMS_SOAPURL',1,'https://www.ovh.com/soapi/soapi-re-1.55.wsdl','chaine',0,'','2015-01-16 19:32:36'),(2854,'THEME_ELDY_RGB',1,'bfbf00','chaine',0,'','2015-01-18 10:02:53'),(2855,'THEME_ELDY_ENABLE_PERSONALIZED',1,'0','chaine',0,'','2015-01-18 10:02:55'),(2858,'MAIN_SESSION_TIMEOUT',1,'2000','chaine',0,'','2015-01-19 17:01:53'),(2867,'FACSIM_ADDON',1,'mod_facsim_alcoy','chaine',0,'','2015-01-19 17:16:25'),(2868,'POS_SERVICES',1,'0','chaine',0,'','2015-01-19 17:16:51'),(2869,'POS_USE_TICKETS',1,'1','chaine',0,'','2015-01-19 17:16:51'),(2870,'POS_MAX_TTC',1,'100','chaine',0,'','2015-01-19 17:16:51'),(3190,'MAIN_MODULE_HOLIDAY',2,'1',NULL,0,NULL,'2015-02-01 08:52:34'),(3195,'INVOICE_SUPPLIER_ADDON_PDF',1,'canelle','chaine',0,'','2015-02-10 19:50:27'),(3199,'MAIN_FORCE_RELOAD_PAGE',1,'1','chaine',0,NULL,'2015-02-12 16:22:55'),(3223,'OVH_THIRDPARTY_IMPORT',1,'2','chaine',0,'','2015-02-13 16:20:18'),(3409,'AGENDA_USE_EVENT_TYPE',1,'1','chaine',0,'','2015-02-27 18:12:24'),(3886,'MAIN_REMOVE_INSTALL_WARNING',1,'1','chaine',1,'','2015-03-02 18:32:50'),(4013,'MAIN_DELAY_ACTIONS_TODO',1,'7','chaine',0,'','2015-03-06 08:59:12'),(4014,'MAIN_DELAY_PROPALS_TO_CLOSE',1,'31','chaine',0,'','2015-03-06 08:59:12'),(4015,'MAIN_DELAY_PROPALS_TO_BILL',1,'7','chaine',0,'','2015-03-06 08:59:12'),(4016,'MAIN_DELAY_ORDERS_TO_PROCESS',1,'2','chaine',0,'','2015-03-06 08:59:12'),(4017,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',1,'31','chaine',0,'','2015-03-06 08:59:12'),(4018,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',1,'7','chaine',0,'','2015-03-06 08:59:12'),(4019,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',1,'2','chaine',0,'','2015-03-06 08:59:12'),(4020,'MAIN_DELAY_RUNNING_SERVICES',1,'-15','chaine',0,'','2015-03-06 08:59:12'),(4021,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',1,'62','chaine',0,'','2015-03-06 08:59:13'),(4022,'MAIN_DELAY_MEMBERS',1,'31','chaine',0,'','2015-03-06 08:59:13'),(4023,'MAIN_DISABLE_METEO',1,'0','chaine',0,'','2015-03-06 08:59:13'),(4044,'ADHERENT_VAT_FOR_SUBSCRIPTIONS',1,'0','',0,'','2015-03-06 16:06:38'),(4047,'ADHERENT_BANK_USE',1,'bankviainvoice','',0,'','2015-03-06 16:12:30'),(4049,'PHPSANE_SCANIMAGE',1,'/usr/bin/scanimage','chaine',0,'','2015-03-06 21:54:13'),(4050,'PHPSANE_PNMTOJPEG',1,'/usr/bin/pnmtojpeg','chaine',0,'','2015-03-06 21:54:13'),(4051,'PHPSANE_PNMTOTIFF',1,'/usr/bin/pnmtotiff','chaine',0,'','2015-03-06 21:54:13'),(4052,'PHPSANE_OCR',1,'/usr/bin/gocr','chaine',0,'','2015-03-06 21:54:13'),(4548,'ECM_AUTO_TREE_ENABLED',1,'1','chaine',0,'','2015-03-10 15:57:21'),(4579,'MAIN_MODULE_AGENDA',2,'1',NULL,0,NULL,'2015-03-13 15:29:19'),(4580,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4581,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4582,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4583,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4584,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4585,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4586,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4587,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4588,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4589,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4590,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4591,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4592,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4593,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4594,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4688,'GOOGLE_ENABLE_AGENDA',2,'1','chaine',0,'','2015-03-13 15:36:29'),(4689,'GOOGLE_AGENDA_NAME1',2,'eldy','chaine',0,'','2015-03-13 15:36:29'),(4690,'GOOGLE_AGENDA_SRC1',2,'eldy10@mail.com','chaine',0,'','2015-03-13 15:36:29'),(4691,'GOOGLE_AGENDA_COLOR1',2,'BE6D00','chaine',0,'','2015-03-13 15:36:29'),(4692,'GOOGLE_AGENDA_COLOR2',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4693,'GOOGLE_AGENDA_COLOR3',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4694,'GOOGLE_AGENDA_COLOR4',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4695,'GOOGLE_AGENDA_COLOR5',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4696,'GOOGLE_AGENDA_TIMEZONE',2,'Europe/Paris','chaine',0,'','2015-03-13 15:36:29'),(4697,'GOOGLE_AGENDA_NB',2,'5','chaine',0,'','2015-03-13 15:36:29'),(4725,'SOCIETE_CODECLIENT_ADDON',2,'mod_codeclient_leopard','chaine',0,'Module to control third parties codes','2015-03-13 20:21:35'),(4726,'SOCIETE_CODECOMPTA_ADDON',2,'mod_codecompta_panicum','chaine',0,'Module to control third parties codes','2015-03-13 20:21:35'),(4727,'SOCIETE_FISCAL_MONTH_START',2,'','chaine',0,'Mettre le numero du mois du debut d\\\'annee fiscale, ex: 9 pour septembre','2015-03-13 20:21:35'),(4728,'MAIN_SEARCHFORM_SOCIETE',2,'1','yesno',0,'Show form for quick company search','2015-03-13 20:21:35'),(4729,'MAIN_SEARCHFORM_CONTACT',2,'1','yesno',0,'Show form for quick contact search','2015-03-13 20:21:35'),(4730,'COMPANY_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2015-03-13 20:21:35'),(4743,'MAIN_MODULE_CLICKTODIAL',2,'1',NULL,0,NULL,'2015-03-13 20:30:28'),(4744,'MAIN_MODULE_NOTIFICATION',2,'1',NULL,0,NULL,'2015-03-13 20:30:34'),(4745,'MAIN_MODULE_WEBSERVICES',2,'1',NULL,0,NULL,'2015-03-13 20:30:41'),(4746,'MAIN_MODULE_PROPALE',2,'1',NULL,0,NULL,'2015-03-13 20:32:38'),(4747,'PROPALE_ADDON_PDF',2,'azur','chaine',0,'Nom du gestionnaire de generation des propales en PDF','2015-03-13 20:32:38'),(4748,'PROPALE_ADDON',2,'mod_propale_marbre','chaine',0,'Nom du gestionnaire de numerotation des propales','2015-03-13 20:32:38'),(4749,'PROPALE_VALIDITY_DURATION',2,'15','chaine',0,'Duration of validity of business proposals','2015-03-13 20:32:38'),(4750,'PROPALE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2015-03-13 20:32:38'),(4752,'MAIN_MODULE_TAX',2,'1',NULL,0,NULL,'2015-03-13 20:32:47'),(4753,'MAIN_MODULE_DON',2,'1',NULL,0,NULL,'2015-03-13 20:32:54'),(4754,'DON_ADDON_MODEL',2,'html_cerfafr','chaine',0,'Nom du gestionnaire de generation de recu de dons','2015-03-13 20:32:54'),(4755,'POS_USE_TICKETS',2,'1','chaine',0,'','2015-03-13 20:33:09'),(4756,'POS_MAX_TTC',2,'100','chaine',0,'','2015-03-13 20:33:09'),(4757,'MAIN_MODULE_POS',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4758,'TICKET_ADDON',2,'mod_ticket_avenc','chaine',0,'Nom du gestionnaire de numerotation des tickets','2015-03-13 20:33:09'),(4759,'MAIN_MODULE_BANQUE',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4760,'MAIN_MODULE_FACTURE',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4761,'FACTURE_ADDON_PDF',2,'crabe','chaine',0,'Name of PDF model of invoice','2015-03-13 20:33:09'),(4762,'FACTURE_ADDON',2,'mod_facture_terre','chaine',0,'Name of numbering numerotation rules of invoice','2015-03-13 20:33:09'),(4763,'FACTURE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2015-03-13 20:33:09'),(4764,'MAIN_MODULE_SOCIETE',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4765,'MAIN_MODULE_PRODUCT',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4766,'PRODUCT_CODEPRODUCT_ADDON',2,'mod_codeproduct_leopard','chaine',0,'Module to control product codes','2015-03-13 20:33:09'),(4767,'MAIN_SEARCHFORM_PRODUITSERVICE',2,'1','yesno',0,'Show form for quick product search','2015-03-13 20:33:09'),(4772,'FACSIM_ADDON',2,'mod_facsim_alcoy','chaine',0,'','2015-03-13 20:33:32'),(4773,'MAIN_MODULE_MAILING',2,'1',NULL,0,NULL,'2015-03-13 20:33:37'),(4774,'MAIN_MODULE_OPENSURVEY',2,'1',NULL,0,NULL,'2015-03-13 20:33:42'),(4782,'AGENDA_USE_EVENT_TYPE',2,'1','chaine',0,'','2015-03-13 20:53:36'),(4884,'AGENDA_DISABLE_EXT',2,'1','chaine',0,'','2015-03-13 22:03:40'),(4928,'COMMANDE_SUPPLIER_ADDON_NUMBER',1,'mod_commande_fournisseur_muguet','chaine',0,'Nom du gestionnaire de numerotation des commandes fournisseur','2015-03-22 09:24:29'),(4929,'INVOICE_SUPPLIER_ADDON_NUMBER',1,'mod_facture_fournisseur_cactus','chaine',0,'Nom du gestionnaire de numerotation des factures fournisseur','2015-03-22 09:24:29'),(5001,'MAIN_CRON_KEY',0,'bc54582fe30d5d4a830c6f582ec28810','chaine',0,'','2015-03-23 17:54:53'),(5009,'CRON_KEY',0,'2c2e755c20be2014098f629865598006','chaine',0,'','2015-03-23 18:06:24'),(5139,'SOCIETE_ADD_REF_IN_LIST',1,'','yesno',0,'Display customer ref into select list','2015-09-08 23:06:08'),(5150,'PROJECT_TASK_ADDON_PDF',1,'','chaine',0,'Name of PDF/ODT tasks manager class','2015-09-08 23:06:14'),(5151,'PROJECT_TASK_ADDON',1,'mod_task_simple','chaine',0,'Name of Numbering Rule task manager class','2015-09-08 23:06:14'),(5152,'PROJECT_TASK_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/tasks','chaine',0,'','2015-09-08 23:06:14'),(5239,'BOOKMARKS_SHOW_IN_MENU',1,'10','chaine',0,'','2016-03-02 15:42:26'),(5271,'DONATION_ART200',1,'','yesno',0,'Option Française - Eligibilité Art200 du CGI','2016-12-21 12:51:28'),(5272,'DONATION_ART238',1,'','yesno',0,'Option Française - Eligibilité Art238 bis du CGI','2016-12-21 12:51:28'),(5274,'DONATION_MESSAGE',1,'Thank you','chaine',0,'Message affiché sur le récépissé de versements ou dons','2016-12-21 12:51:28'),(5349,'MAIN_SEARCHFORM_CONTACT',1,'1','chaine',0,'','2017-10-03 10:11:33'),(5351,'MAIN_SEARCHFORM_PRODUITSERVICE',1,'1','chaine',0,'','2017-10-03 10:11:33'),(5352,'MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER',1,'0','chaine',0,'','2017-10-03 10:11:33'),(5353,'MAIN_SEARCHFORM_ADHERENT',1,'1','chaine',0,'','2017-10-03 10:11:33'),(5354,'MAIN_SEARCHFORM_PROJECT',1,'0','chaine',0,'','2017-10-03 10:11:33'),(5394,'FCKEDITOR_ENABLE_DETAILS',1,'1','yesno',0,'WYSIWIG for products details lines for all entities','2017-11-04 15:27:44'),(5395,'FCKEDITOR_ENABLE_USERSIGN',1,'1','yesno',0,'WYSIWIG for user signature','2017-11-04 15:27:44'),(5396,'FCKEDITOR_ENABLE_MAIL',1,'1','yesno',0,'WYSIWIG for products details lines for all entities','2017-11-04 15:27:44'),(5398,'CATEGORIE_RECURSIV_ADD',1,'','yesno',0,'Affect parent categories','2017-11-04 15:27:46'),(5404,'MAIN_MODULE_CATEGORIE',1,'1',NULL,0,NULL,'2017-11-04 15:41:43'),(5415,'EXPEDITION_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/shipment','chaine',0,NULL,'2017-11-15 22:38:28'),(5416,'LIVRAISON_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/delivery','chaine',0,NULL,'2017-11-15 22:38:28'),(5426,'MAIN_MODULE_PROJET',1,'1',NULL,0,NULL,'2017-11-15 22:38:44'),(5427,'PROJECT_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/projects','chaine',0,NULL,'2017-11-15 22:38:44'),(5428,'PROJECT_USE_OPPORTUNIES',1,'1','chaine',0,NULL,'2017-11-15 22:38:44'),(5430,'MAIN_MODULE_EXPORT',1,'1',NULL,0,NULL,'2017-11-15 22:38:56'),(5431,'MAIN_MODULE_IMPORT',1,'1',NULL,0,NULL,'2017-11-15 22:38:58'),(5432,'MAIN_MODULE_MAILING',1,'1',NULL,0,NULL,'2017-11-15 22:39:00'),(5434,'EXPENSEREPORT_ADDON_PDF',1,'standard','chaine',0,'Name of manager to build PDF expense reports documents','2017-11-15 22:39:05'),(5437,'SALARIES_ACCOUNTING_ACCOUNT_CHARGE',1,'641','chaine',0,NULL,'2017-11-15 22:39:08'),(5441,'ADHERENT_ETIQUETTE_TEXT',1,'%FULLNAME%\n%ADDRESS%\n%ZIP% %TOWN%\n%COUNTRY%','text',0,'Text to print on member address sheets','2018-11-23 11:56:07'),(5443,'MAIN_MODULE_PRELEVEMENT',1,'1',NULL,0,NULL,'2017-11-15 22:39:33'),(5453,'MAIN_MODULE_CONTRAT',1,'1',NULL,0,NULL,'2017-11-15 22:39:52'),(5455,'MAIN_MODULE_FICHEINTER',1,'1',NULL,0,NULL,'2017-11-15 22:39:56'),(5459,'MAIN_MODULE_PAYPAL',1,'1',NULL,0,NULL,'2017-11-15 22:41:02'),(5463,'MAIN_MODULE_PROPALE',1,'1',NULL,0,NULL,'2017-11-15 22:41:47'),(5483,'GENBARCODE_BARCODETYPE_THIRDPARTY',1,'6','chaine',0,'','2018-01-16 15:49:43'),(5484,'PRODUIT_DEFAULT_BARCODE_TYPE',1,'2','chaine',0,'','2018-01-16 15:49:46'),(5586,'MAIN_DELAY_EXPENSEREPORTS_TO_PAY',1,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur les notes de frais impayées','2018-01-22 17:28:18'),(5587,'MAIN_FIX_FOR_BUGGED_MTA',1,'1','chaine',1,'Set constant to fix email ending from PHP with some linux ike system','2018-01-22 17:28:18'),(5590,'MAIN_VERSION_LAST_INSTALL',0,'3.8.3','chaine',0,'Dolibarr version when install','2018-01-22 17:28:42'),(5604,'MAIN_INFO_SOCIETE_LOGO',1,'mybigcompany.png','chaine',0,'','2018-01-22 17:33:49'),(5605,'MAIN_INFO_SOCIETE_LOGO_SMALL',1,'mybigcompany_small.png','chaine',0,'','2018-01-22 17:33:49'),(5606,'MAIN_INFO_SOCIETE_LOGO_MINI',1,'mybigcompany_mini.png','chaine',0,'','2018-01-22 17:33:49'),(5614,'MAIN_SIZE_SHORTLISTE_LIMIT',1,'4','chaine',0,'Longueur maximum des listes courtes (fiche client)','2018-03-13 10:54:46'),(5627,'SUPPLIER_PROPOSAL_ADDON_PDF',1,'aurore','chaine',0,'Name of submodule to generate PDF for supplier quotation request','2018-07-30 11:13:20'),(5628,'SUPPLIER_PROPOSAL_ADDON',1,'mod_supplier_proposal_marbre','chaine',0,'Name of submodule to number supplier quotation request','2018-07-30 11:13:20'),(5629,'SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/supplier_proposal','chaine',0,NULL,'2018-07-30 11:13:20'),(5633,'MAIN_MODULE_API',1,'1',NULL,0,NULL,'2018-07-30 11:13:54'),(5634,'MAIN_MODULE_WEBSERVICES',1,'1',NULL,0,NULL,'2018-07-30 11:13:56'),(5635,'WEBSERVICES_KEY',1,'dolibarrkey','chaine',0,'','2018-07-30 11:14:04'),(5638,'MAIN_MODULE_EXTERNALRSS',1,'1',NULL,0,NULL,'2018-07-30 11:15:04'),(5642,'SOCIETE_CODECOMPTA_ADDON',1,'mod_codecompta_aquarium','chaine',0,'','2018-07-30 11:16:42'),(5707,'CASHDESK_NO_DECREASE_STOCK',1,'1','chaine',0,'','2018-07-30 13:38:11'),(5708,'MAIN_MODULE_PRODUCTBATCH',1,'1',NULL,0,NULL,'2018-07-30 13:38:11'),(5710,'MAIN_MODULE_STOCK',1,'1',NULL,0,NULL,'2018-07-30 13:38:11'),(5711,'MAIN_MODULE_PRODUCT',1,'1',NULL,0,NULL,'2018-07-30 13:38:11'),(5808,'MARGIN_TYPE',1,'costprice','chaine',0,'','2018-07-30 16:32:18'),(5809,'DISPLAY_MARGIN_RATES',1,'1','chaine',0,'','2018-07-30 16:32:20'),(5833,'ACCOUNTING_EXPORT_SEPARATORCSV',1,',','string',0,NULL,'2017-01-29 15:11:56'),(5840,'CHARTOFACCOUNTS',1,'2','chaine',0,NULL,'2017-01-29 15:11:56'),(5841,'ACCOUNTING_EXPORT_MODELCSV',1,'1','chaine',0,NULL,'2017-01-29 15:11:56'),(5842,'ACCOUNTING_LENGTH_GACCOUNT',1,'','chaine',0,NULL,'2017-01-29 15:11:56'),(5843,'ACCOUNTING_LENGTH_AACCOUNT',1,'','chaine',0,NULL,'2017-01-29 15:11:56'),(5844,'ACCOUNTING_LIST_SORT_VENTILATION_TODO',1,'1','yesno',0,NULL,'2017-01-29 15:11:56'),(5845,'ACCOUNTING_LIST_SORT_VENTILATION_DONE',1,'1','yesno',0,NULL,'2017-01-29 15:11:56'),(5846,'ACCOUNTING_EXPORT_DATE',1,'%d%m%Y','chaine',0,NULL,'2017-01-29 15:11:56'),(5848,'ACCOUNTING_EXPORT_FORMAT',1,'csv','chaine',0,NULL,'2017-01-29 15:11:56'),(5853,'MAIN_MODULE_WORKFLOW',1,'1',NULL,0,NULL,'2017-01-29 15:12:12'),(5854,'MAIN_MODULE_NOTIFICATION',1,'1',NULL,0,NULL,'2017-01-29 15:12:35'),(5855,'MAIN_MODULE_OAUTH',1,'1',NULL,0,NULL,'2017-01-29 15:12:41'),(5883,'MAILING_LIMIT_SENDBYWEB',0,'15','chaine',1,'Number of targets to defined packet size when sending mass email','2017-01-29 17:36:33'),(5884,'MAIN_MAIL_DEBUG',1,'0','chaine',1,'','2017-01-29 18:53:02'),(5885,'MAIN_SOAP_DEBUG',1,'0','chaine',1,'','2017-01-29 18:53:02'),(5925,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5931,'DATABASE_PWD_ENCRYPTED',1,'1','chaine',0,'','2017-02-01 15:06:04'),(5932,'MAIN_DISABLE_ALL_MAILS',1,'0','chaine',0,'','2017-02-01 15:09:09'),(5933,'MAIN_MAIL_SENDMODE',1,'mail','chaine',0,'','2017-02-01 15:09:09'),(5934,'MAIN_MAIL_SMTP_PORT',1,'465','chaine',0,'','2017-02-01 15:09:09'),(5935,'MAIN_MAIL_SMTP_SERVER',1,'smtp.mail.com','chaine',0,'','2017-02-01 15:09:09'),(5936,'MAIN_MAIL_SMTPS_ID',1,'eldy10@mail.com','chaine',0,'','2017-02-01 15:09:09'),(5937,'MAIN_MAIL_SMTPS_PW',1,'bidonge','chaine',0,'','2017-02-01 15:09:09'),(5938,'MAIN_MAIL_EMAIL_FROM',1,'robot@example.com','chaine',0,'','2017-02-01 15:09:09'),(5939,'MAIN_MAIL_DEFAULT_FROMTYPE',1,'user','chaine',0,'','2017-02-01 15:09:09'),(5940,'PRELEVEMENT_ID_BANKACCOUNT',1,'1','chaine',0,'','2017-02-06 04:04:47'),(5941,'PRELEVEMENT_ICS',1,'ICS123456','chaine',0,'','2017-02-06 04:04:47'),(5942,'PRELEVEMENT_USER',1,'1','chaine',0,'','2017-02-06 04:04:47'),(5943,'BANKADDON_PDF',1,'sepamandate','chaine',0,'','2017-02-06 04:13:52'),(5947,'CHEQUERECEIPTS_THYME_MASK',1,'CHK{yy}{mm}-{0000@1}','chaine',0,'','2017-02-06 04:16:27'),(5948,'MAIN_MODULE_LOAN',1,'1',NULL,0,NULL,'2017-02-06 19:19:05'),(5954,'MAIN_SUBMODULE_EXPEDITION',1,'1','chaine',0,'','2017-02-06 23:57:37'),(5963,'MAIN_MODULE_BANQUE',1,'1',NULL,0,NULL,'2017-02-07 18:56:12'),(5964,'MAIN_MODULE_TAX',1,'1',NULL,0,NULL,'2017-02-07 18:56:12'),(6019,'MAIN_INFO_SOCIETE_COUNTRY',2,'1:FR:France','chaine',0,'','2017-02-15 17:18:22'),(6020,'MAIN_INFO_SOCIETE_NOM',2,'MySecondCompany','chaine',0,'','2017-02-15 17:18:22'),(6021,'MAIN_INFO_SOCIETE_STATE',2,'0','chaine',0,'','2017-02-15 17:18:22'),(6022,'MAIN_MONNAIE',2,'EUR','chaine',0,'','2017-02-15 17:18:22'),(6023,'MAIN_LANG_DEFAULT',2,'auto','chaine',0,'','2017-02-15 17:18:22'),(6032,'MAIN_MODULE_MULTICURRENCY',1,'1',NULL,0,NULL,'2017-02-15 17:29:59'),(6048,'SYSLOG_FACILITY',0,'LOG_USER','chaine',0,'','2017-02-15 22:37:01'),(6049,'SYSLOG_FIREPHP_INCLUDEPATH',0,'/home/ldestailleur/git/dolibarr_5.0/htdocs/includes/firephp/firephp-core/lib/','chaine',0,'','2017-02-15 22:37:01'),(6050,'SYSLOG_FILE',0,'DOL_DATA_ROOT/dolibarr.log','chaine',0,'','2017-02-15 22:37:01'),(6051,'SYSLOG_CHROMEPHP_INCLUDEPATH',0,'/home/ldestailleur/git/dolibarr_5.0/htdocs/includes/ccampbell/chromephp/','chaine',0,'','2017-02-15 22:37:01'),(6052,'SYSLOG_HANDLERS',0,'[\"mod_syslog_file\"]','chaine',0,'','2017-02-15 22:37:01'),(6054,'SYSLOG_LEVEL',0,'7','chaine',0,'','2017-02-15 22:37:21'),(6092,'MAIN_SIZE_SHORTLIST_LIMIT',0,'3','chaine',0,'Max length for small lists (tabs)','2017-05-12 09:02:38'),(6099,'MAIN_MODULE_SKYPE',1,'1',NULL,0,NULL,'2017-05-12 09:03:51'),(6100,'MAIN_MODULE_GRAVATAR',1,'1',NULL,0,NULL,'2017-05-12 09:03:54'),(6102,'PRODUCT_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/products','chaine',0,'','2017-08-27 13:29:07'),(6103,'CONTRACT_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/contracts','chaine',0,'','2017-08-27 13:29:07'),(6104,'USERGROUP_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/usergroups','chaine',0,'','2017-08-27 13:29:07'),(6105,'USER_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/users','chaine',0,'','2017-08-27 13:29:07'),(6106,'MAIN_ENABLE_OVERWRITE_TRANSLATION',1,'1','chaine',0,'Enable overwrote of translation','2017-08-27 13:29:07'),(6377,'COMMANDE_SAPHIR_MASK',1,'{yy}{mm}{000}{ttt}','chaine',0,'','2017-09-06 07:56:25'),(6518,'GOOGLE_DUPLICATE_INTO_THIRDPARTIES',1,'1','chaine',0,'','2017-09-06 19:43:57'),(6519,'GOOGLE_DUPLICATE_INTO_CONTACTS',1,'0','chaine',0,'','2017-09-06 19:43:57'),(6520,'GOOGLE_TAG_PREFIX',1,'Dolibarr (Thirdparties)','chaine',0,'','2017-09-06 19:43:57'),(6521,'GOOGLE_TAG_PREFIX_CONTACTS',1,'Dolibarr (Contacts/Addresses)','chaine',0,'','2017-09-06 19:43:57'),(6522,'GOOGLE_ENABLE_AGENDA',1,'1','chaine',0,'','2017-09-06 19:44:12'),(6523,'GOOGLE_AGENDA_COLOR1',1,'1B887A','chaine',0,'','2017-09-06 19:44:12'),(6524,'GOOGLE_AGENDA_COLOR2',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6525,'GOOGLE_AGENDA_COLOR3',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6526,'GOOGLE_AGENDA_COLOR4',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6527,'GOOGLE_AGENDA_COLOR5',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6528,'GOOGLE_AGENDA_TIMEZONE',1,'Europe/Paris','chaine',0,'','2017-09-06 19:44:12'),(6529,'GOOGLE_AGENDA_NB',1,'5','chaine',0,'','2017-09-06 19:44:12'),(6543,'MAIN_SMS_DEBUG',0,'1','chaine',1,'This is to enable OVH SMS debug','2017-09-06 19:44:34'),(6562,'BLOCKEDLOG_ENTITY_FINGERPRINT',1,'b63e359ffca54d5c2bab869916eaf23d4a736703028ccbf77ce1167c5f830e7b','chaine',0,'Numeric Unique Fingerprint','2018-01-19 11:27:15'),(6564,'BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY',1,'FR','chaine',0,'This is list of country code where the module may be mandatory','2018-01-19 11:27:15'),(6565,'MAIN_MODULE_BOOKMARK',1,'1',NULL,0,'{\"authorid\":\"12\",\"ip\":\"82.240.38.230\"}','2018-01-19 11:27:34'),(6566,'MAIN_MODULE_ADHERENT',1,'1',NULL,0,'{\"authorid\":\"12\",\"ip\":\"82.240.38.230\"}','2018-01-19 11:27:56'),(6567,'ADHERENT_ADDON_PDF',1,'standard','chaine',0,'Name of PDF model of member','2018-01-19 11:27:56'),(6569,'MAIN_MODULE_STRIPE',1,'1',NULL,0,'{\"authorid\":\"12\",\"ip\":\"82.240.38.230\"}','2018-01-19 11:28:17'),(6632,'MAIN_MODULE_TICKET',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-06-05 09:15:29'),(6635,'MAIN_MODULE_TICKET_TRIGGERS',1,'1','chaine',0,NULL,'2019-06-05 09:15:29'),(6636,'MAIN_MODULE_TICKET_MODELS',1,'1','chaine',0,NULL,'2019-06-05 09:15:29'),(6647,'MAIN_MODULE_SOCIALNETWORKS',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-06-05 09:16:49'),(6795,'TICKET_ADDON',1,'mod_ticket_simple','chaine',0,'','2019-09-26 12:07:59'),(6796,'PRODUCT_CODEPRODUCT_ADDON',1,'mod_codeproduct_elephant','chaine',0,'','2019-09-26 12:59:00'),(6800,'CASHDESK_ID_THIRDPARTY1',1,'7','chaine',0,'','2019-09-26 15:30:09'),(6801,'CASHDESK_ID_BANKACCOUNT_CASH1',1,'3','chaine',0,'','2019-09-26 15:30:09'),(6802,'CASHDESK_ID_BANKACCOUNT_CHEQUE1',1,'4','chaine',0,'','2019-09-26 15:30:09'),(6803,'CASHDESK_ID_BANKACCOUNT_CB1',1,'4','chaine',0,'','2019-09-26 15:30:09'),(6804,'CASHDESK_ID_BANKACCOUNT_PRE1',1,'4','chaine',0,'','2019-09-26 15:30:09'),(6805,'CASHDESK_ID_BANKACCOUNT_VIR1',1,'1','chaine',0,'','2019-09-26 15:30:09'),(6806,'CASHDESK_NO_DECREASE_STOCK1',1,'1','chaine',0,'','2019-09-26 15:30:09'),(6811,'FORCEPROJECT_ON_PROPOSAL',1,'1','chaine',0,'','2019-09-27 14:52:57'),(6813,'PROJECT_USE_OPPORTUNITIES',1,'1','chaine',0,'','2019-10-01 11:48:09'),(6814,'PACKTHEMEACTIVATEDTHEME',0,'modOwnTheme','chaine',0,'','2019-10-02 11:41:58'),(6815,'OWNTHEME_COL1',0,'#6a89cc','chaine',0,'','2019-10-02 11:41:58'),(6816,'OWNTHEME_COL2',0,'#60a3bc','chaine',0,'','2019-10-02 11:41:58'),(6817,'DOL_VERSION',0,'10.0.2','chaine',0,'Dolibarr version','2019-10-02 11:41:58'),(6823,'OWNTHEME_COL_BODY_BCKGRD',0,'#E9E9E9','chaine',0,'','2019-10-02 11:41:58'),(6824,'OWNTHEME_COL_LOGO_BCKGRD',0,'#474c80','chaine',0,'','2019-10-02 11:41:58'),(6825,'OWNTHEME_COL_TXT_MENU',0,'#b8c6e5','chaine',0,'','2019-10-02 11:41:58'),(6826,'OWNTHEME_COL_HEADER_BCKGRD',0,'#474c80','chaine',0,'','2019-10-02 11:41:58'),(6827,'OWNTHEME_CUSTOM_CSS',0,'0','yesno',0,'','2019-10-02 11:41:58'),(6828,'OWNTHEME_CUSTOM_JS',0,'0','yesno',0,'','2019-10-02 11:41:58'),(6829,'OWNTHEME_FIXED_MENU',0,'0','yesno',0,'','2019-10-02 11:41:58'),(6830,'OWNTHEME_D_HEADER_FONT_SIZE',0,'1.7rem','chaine',0,'','2019-10-02 11:41:58'),(6831,'OWNTHEME_S_HEADER_FONT_SIZE',0,'1.6rem','chaine',0,'','2019-10-02 11:41:58'),(6832,'OWNTHEME_D_VMENU_FONT_SIZE',0,'1.2rem','chaine',0,'','2019-10-02 11:41:58'),(6833,'OWNTHEME_S_VMENU_FONT_SIZE',0,'1.2rem','chaine',0,'','2019-10-02 11:41:58'),(6844,'MAIN_THEME',0,'eldy','chaine',0,'','2019-10-02 11:46:02'),(6845,'MAIN_MENU_STANDARD',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6846,'MAIN_MENUFRONT_STANDARD',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6847,'MAIN_MENU_SMARTPHONE',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6848,'MAIN_MENUFRONT_SMARTPHONE',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6851,'BECREATIVE_COL1',1,'#1e88e5','chaine',0,'','2019-10-02 11:47:10'),(6852,'BECREATIVE_COL2',1,'#1e88e5','chaine',0,'','2019-10-02 11:47:10'),(6853,'DOL_VERSION',1,'10.0.2','chaine',0,'Dolibarr version','2019-10-02 11:47:10'),(6859,'BECREATIVE_COL_BODY_BCKGRD',1,'#e6eaef','chaine',0,'','2019-10-02 11:47:10'),(6860,'BECREATIVE_COL_LOGO_BCKGRD',1,'#1e88e5','chaine',0,'','2019-10-02 11:47:10'),(6861,'BECREATIVE_COL_TXT_MENU',1,'#b8c6e5','chaine',0,'','2019-10-02 11:47:10'),(6862,'BECREATIVE_COL_HEADER_BCKGRD',1,'#26a69a','chaine',0,'','2019-10-02 11:47:10'),(6863,'BECREATIVE_CUSTOM_CSS',1,'0','yesno',0,'','2019-10-02 11:47:10'),(6864,'BECREATIVE_CUSTOM_JS',1,'0','yesno',0,'','2019-10-02 11:47:10'),(6865,'BECREATIVE_FIXED_MENU',1,'0','yesno',0,'','2019-10-02 11:47:10'),(6866,'BECREATIVE_D_HEADER_FONT_SIZE',1,'1.7rem','chaine',0,'','2019-10-02 11:47:10'),(6867,'BECREATIVE_S_HEADER_FONT_SIZE',1,'1.6rem','chaine',0,'','2019-10-02 11:47:10'),(6868,'BECREATIVE_D_VMENU_FONT_SIZE',1,'1.2rem','chaine',0,'','2019-10-02 11:47:10'),(6869,'BECREATIVE_S_VMENU_FONT_SIZE',1,'1.2rem','chaine',0,'','2019-10-02 11:47:10'),(6881,'MAIN_MENU_STANDARD',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6882,'MAIN_MENUFRONT_STANDARD',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6883,'MAIN_MENU_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6884,'MAIN_MENUFRONT_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6885,'ACCOUNTING_ACCOUNT_CUSTOMER',1,'411','chaine',0,'','2019-10-04 08:15:44'),(6886,'ACCOUNTING_ACCOUNT_SUPPLIER',1,'401','chaine',0,'','2019-10-04 08:15:44'),(6887,'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',1,'421','chaine',0,'','2019-10-04 08:15:44'),(6888,'ACCOUNTING_PRODUCT_BUY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6889,'ACCOUNTING_PRODUCT_SOLD_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6890,'ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6891,'ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6892,'ACCOUNTING_SERVICE_BUY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6893,'ACCOUNTING_SERVICE_SOLD_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6894,'ACCOUNTING_VAT_BUY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6895,'ACCOUNTING_VAT_SOLD_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6896,'ACCOUNTING_VAT_PAY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6897,'ACCOUNTING_ACCOUNT_SUSPENSE',1,'471','chaine',0,'','2019-10-04 08:15:44'),(6898,'ACCOUNTING_ACCOUNT_TRANSFER_CASH',1,'58','chaine',0,'','2019-10-04 08:15:44'),(6899,'DONATION_ACCOUNTINGACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6900,'ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6901,'LOAN_ACCOUNTING_ACCOUNT_CAPITAL',1,'164','chaine',0,'','2019-10-04 08:15:44'),(6902,'LOAN_ACCOUNTING_ACCOUNT_INTEREST',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6903,'LOAN_ACCOUNTING_ACCOUNT_INSURANCE',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6912,'TICKET_ENABLE_PUBLIC_INTERFACE',1,'1','chaine',0,'','2019-10-04 11:44:33'),(6934,'TICKET_NOTIFICATION_EMAIL_FROM',1,'fff','chaine',0,'','2019-10-04 12:03:51'),(6935,'TICKET_NOTIFICATION_EMAIL_TO',1,'ff','chaine',0,'','2019-10-04 12:03:51'),(6936,'TICKET_MESSAGE_MAIL_INTRO',1,'Hello,<br />\r\nA new response was sent on a ticket that you contact. Here is the message:<img alt=\"\" src=\"/dolibarr_10.0/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/background_rough-horn.jpg\" style=\"height:1080px; width:1920px\" />','chaine',0,'','2019-10-04 12:03:51'),(6937,'TICKET_MESSAGE_MAIL_SIGNATURE',1,'<p>Sincerely,</p>\r\n\r\n<p>--<img alt=\"\" src=\"/dolibarr_10.0/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/background_rough-horn.jpg\" style=\"height:1080px; width:1920px\" /></p>\r\n','chaine',0,'','2019-10-04 12:03:51'),(7027,'USER_PASSWORD_GENERATED',1,'Perso','chaine',0,'','2019-10-07 10:52:46'),(7028,'USER_PASSWORD_PATTERN',1,'8;1;0;1;0;1','chaine',0,'','2019-10-07 10:57:03'),(7032,'MAIN_MODULE_BOM',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-10-08 18:49:41'),(7034,'BOM_ADDON',1,'mod_bom_standard','chaine',0,'Name of numbering rules of BOM','2019-10-08 18:49:41'),(7035,'BOM_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/boms','chaine',0,NULL,'2019-10-08 18:49:41'),(7036,'MAIN_MODULE_GEOIPMAXMIND',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-10-08 18:51:54'),(7037,'MAIN_MODULE_DAV',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-10-08 18:54:07'),(7122,'BOM_ADDON_PDF',1,'generic_bom_odt','chaine',0,'','2019-11-28 14:00:58'),(7195,'MAIN_AGENDA_ACTIONAUTO_MO_VALIDATE',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7196,'MAIN_AGENDA_ACTIONAUTO_MO_PRODUCED',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7197,'MAIN_AGENDA_ACTIONAUTO_MO_DELETE',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7198,'MAIN_AGENDA_ACTIONAUTO_MO_CANCEL',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7201,'TICKET_PUBLIC_INTERFACE_TOPIC',1,'MyBigCompany public interface for Ticket','chaine',0,'','2019-11-29 08:49:36'),(7202,'TICKET_PUBLIC_TEXT_HOME',1,'You can create a support ticket or view existing from its identifier tracking ticket.','chaine',0,'','2019-11-29 08:49:36'),(7203,'TICKET_PUBLIC_TEXT_HELP_MESSAGE',1,'Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.','chaine',0,'','2019-11-29 08:49:36'),(7204,'TICKET_MESSAGE_MAIL_NEW',1,'TicketMessageMailNewText','chaine',0,'','2019-11-29 08:49:36'),(7209,'MAIN_MODULE_MRP',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-11-29 08:57:42'),(7210,'MAIN_MODULE_MRP_TRIGGERS',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7211,'MAIN_MODULE_MRP_LOGIN',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7212,'MAIN_MODULE_MRP_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7213,'MAIN_MODULE_MRP_MENUS',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7214,'MAIN_MODULE_MRP_TPL',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7215,'MAIN_MODULE_MRP_BARCODE',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7216,'MAIN_MODULE_MRP_MODELS',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7217,'MAIN_MODULE_MRP_THEME',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7218,'MAIN_MODULE_MRP_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2019-11-29 08:57:42'),(7220,'MRP_MO_ADDON',1,'mod_mo_standard','chaine',0,'Name of numbering rules of MO','2019-11-29 08:57:42'),(7221,'MRP_MO_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/mrps','chaine',0,NULL,'2019-11-29 08:57:42'),(7222,'MRP_MO_ADDON_PDF',1,'generic_mo_odt','chaine',0,'','2019-11-29 08:57:47'),(7254,'MAIN_INFO_OPENINGHOURS_MONDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7255,'MAIN_INFO_OPENINGHOURS_TUESDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7256,'MAIN_INFO_OPENINGHOURS_WEDNESDAY',1,'8-13','chaine',0,'','2019-12-19 11:14:21'),(7257,'MAIN_INFO_OPENINGHOURS_THURSDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7258,'MAIN_INFO_OPENINGHOURS_FRIDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7264,'MAIN_INFO_ACCOUNTANT_NAME',1,'Bob Bookkeeper','chaine',0,'','2019-12-19 11:14:54'),(7265,'MAIN_INFO_ACCOUNTANT_TOWN',1,'Berlin','chaine',0,'','2019-12-19 11:14:54'),(7266,'MAIN_INFO_ACCOUNTANT_STATE',1,'0','chaine',0,'','2019-12-19 11:14:54'),(7267,'MAIN_INFO_ACCOUNTANT_COUNTRY',1,'5','chaine',0,'','2019-12-19 11:14:54'),(7268,'MAIN_INFO_ACCOUNTANT_MAIL',1,'mybookkeeper@example.com','chaine',0,'','2019-12-19 11:14:54'),(7313,'MODULEBUILDER_ASCIIDOCTOR',1,'asciidoctor','chaine',0,'','2019-12-20 10:57:21'),(7314,'MODULEBUILDER_ASCIIDOCTORPDF',1,'asciidoctor-pdf','chaine',0,'','2019-12-20 10:57:21'),(7337,'EXTERNAL_RSS_TITLE_1',1,'Dolibarr.org News','chaine',0,'','2019-12-20 12:10:38'),(7338,'EXTERNAL_RSS_URLRSS_1',1,'https://www.dolibarr.org/rss','chaine',0,'','2019-12-20 12:10:38'),(7339,'EXPENSEREPORT_ADDON',1,'mod_expensereport_jade','chaine',0,'','2019-12-20 16:33:46'),(7378,'COMPANY_USE_SEARCH_TO_SELECT',1,'0','chaine',0,'','2019-12-21 15:54:22'),(7420,'CASHDESK_SERVICES',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7421,'TAKEPOS_ROOT_CATEGORY_ID',1,'31','chaine',0,'','2019-12-23 12:15:06'),(7422,'TAKEPOSCONNECTOR',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7423,'TAKEPOS_BAR_RESTAURANT',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7424,'TAKEPOS_TICKET_VAT_GROUPPED',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7425,'TAKEPOS_AUTO_PRINT_TICKETS',1,'0','int',0,'','2019-12-23 12:15:06'),(7426,'TAKEPOS_NUMPAD',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7427,'TAKEPOS_NUM_TERMINALS',1,'1','chaine',0,'','2019-12-23 12:15:06'),(7428,'TAKEPOS_DIRECT_PAYMENT',1,'0','int',0,'','2019-12-23 12:15:06'),(7429,'TAKEPOS_CUSTOM_RECEIPT',1,'0','int',0,'','2019-12-23 12:15:06'),(7430,'TAKEPOS_EMAIL_TEMPLATE_INVOICE',1,'-1','chaine',0,'','2019-12-23 12:15:06'),(7452,'MEMBER_ENABLE_PUBLIC',1,'1','chaine',0,'','2020-01-01 10:31:46'),(7453,'MEMBER_NEWFORM_AMOUNT',1,'20','chaine',0,'','2020-01-01 10:31:46'),(7454,'MEMBER_NEWFORM_EDITAMOUNT',1,'0','chaine',0,'','2020-01-01 10:31:46'),(7455,'MEMBER_NEWFORM_PAYONLINE',1,'all','chaine',0,'','2020-01-01 10:31:46'),(7456,'MEMBER_NEWFORM_FORCETYPE',1,'1','chaine',0,'','2020-01-01 10:31:46'),(7470,'STRIPE_TEST_PUBLISHABLE_KEY',1,'pk_test_123456789','chaine',0,'','2020-01-01 11:43:44'),(7471,'STRIPE_TEST_SECRET_KEY',1,'sk_test_123456','chaine',0,'','2020-01-01 11:43:44'),(7472,'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS',1,'4','chaine',0,'','2020-01-01 11:43:44'),(7473,'STRIPE_USER_ACCOUNT_FOR_ACTIONS',1,'1','chaine',0,'','2020-01-01 11:43:44'),(7489,'CAPTURESERVER_SECURITY_KEY',1,'securitykey123','chaine',0,'','2020-01-01 12:00:49'),(7720,'SUPPLIER_INVOICE_ALLOW_REUSE_OF_CREDIT_WHEN_PARTIALLY_REFUNDED',1,'1','chaine',1,'','2020-01-01 17:19:12'),(8063,'MAIN_AGENDA_ACTIONAUTO_COMPANY_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8064,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8065,'MAIN_AGENDA_ACTIONAUTO_COMPANY_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8066,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLOSE_REFUSED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8067,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLASSIFY_BILLED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8068,'MAIN_AGENDA_ACTIONAUTO_PROPAL_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8069,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLOSE_SIGNED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8070,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8071,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8072,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8073,'MAIN_AGENDA_ACTIONAUTO_ORDER_CANCEL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8074,'MAIN_AGENDA_ACTIONAUTO_ORDER_CLOSE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8075,'MAIN_AGENDA_ACTIONAUTO_ORDER_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8076,'MAIN_AGENDA_ACTIONAUTO_ORDER_CLASSIFY_BILLED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8077,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8078,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8079,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8080,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8081,'MAIN_AGENDA_ACTIONAUTO_BILL_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8082,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8083,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8084,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8085,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8086,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_CLOSE_SIGNED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8087,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_CLOSE_REFUSED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8088,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8089,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8090,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8091,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_RECEIVE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8092,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_SUBMIT',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8093,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_APPROVE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8094,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_REFUSE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8095,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_CLASSIFY_BILLED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8096,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8097,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8098,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8099,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_UNVALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8100,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_PAYED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8101,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8102,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8103,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_CANCELED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8104,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8105,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8106,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8107,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8108,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_REOPEN',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8109,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8110,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8111,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8112,'MAIN_AGENDA_ACTIONAUTO_MEMBER_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8113,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8114,'MAIN_AGENDA_ACTIONAUTO_MEMBER_MODIFY',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8115,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8116,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_MODIFY',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8117,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8118,'MAIN_AGENDA_ACTIONAUTO_MEMBER_RESILIATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8119,'MAIN_AGENDA_ACTIONAUTO_MEMBER_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8120,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8121,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8122,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_MODIFY',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8123,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8124,'MAIN_AGENDA_ACTIONAUTO_TASK_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8125,'MAIN_AGENDA_ACTIONAUTO_TASK_MODIFY',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8126,'MAIN_AGENDA_ACTIONAUTO_TASK_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8127,'MAIN_AGENDA_ACTIONAUTO_PROJECT_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8128,'MAIN_AGENDA_ACTIONAUTO_PROJECT_MODIFY',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8129,'MAIN_AGENDA_ACTIONAUTO_PROJECT_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8130,'MAIN_AGENDA_ACTIONAUTO_TICKET_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8131,'MAIN_AGENDA_ACTIONAUTO_TICKET_MODIFY',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8132,'MAIN_AGENDA_ACTIONAUTO_TICKET_ASSIGNED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8133,'MAIN_AGENDA_ACTIONAUTO_TICKET_CLOSE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8134,'MAIN_AGENDA_ACTIONAUTO_TICKET_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8135,'MAIN_AGENDA_ACTIONAUTO_TICKET_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8136,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8137,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_CREATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8138,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8139,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_APPROVE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8140,'MAIN_AGENDA_ACTIONAUTO_USER_SENTBYMAIL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8141,'MAIN_AGENDA_ACTIONAUTO_BOM_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8142,'MAIN_AGENDA_ACTIONAUTO_BOM_UNVALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8143,'MAIN_AGENDA_ACTIONAUTO_BOM_CLOSE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8144,'MAIN_AGENDA_ACTIONAUTO_BOM_REOPEN',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8145,'MAIN_AGENDA_ACTIONAUTO_BOM_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8146,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_VALIDATE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8147,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_PRODUCED',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8148,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8149,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_CANCEL',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8169,'CABINETMED_DELAY_TO_LOCK_RECORD',1,'0','chaine',1,'Number of days before locking edit of consultation','2020-01-05 20:37:19'),(8190,'ACCOUNTING_PRODUCT_MODE',1,'ACCOUNTANCY_SELL_EXPORT','chaine',0,'','2020-01-06 01:23:30'),(8191,'MAIN_ENABLE_DEFAULT_VALUES',1,'1','chaine',0,'','2020-01-06 16:09:52'),(8210,'CABINETMED_RHEUMATOLOGY_ON',1,'0','texte',0,'','2020-01-06 16:51:43'),(8213,'MAIN_SEARCHFORM_SOCIETE',1,'1','texte',0,'','2020-01-06 16:51:43'),(8214,'CABINETMED_BANK_PATIENT_REQUIRED',1,'0','texte',0,'','2020-01-06 16:51:43'),(8215,'DIAGNOSTIC_IS_NOT_MANDATORY',1,'1','texte',0,'','2020-01-06 16:51:43'),(8216,'USER_ADDON_PDF_ODT',1,'generic_user_odt','chaine',0,'','2020-01-07 13:45:19'),(8217,'USERGROUP_ADDON_PDF_ODT',1,'generic_usergroup_odt','chaine',0,'','2020-01-07 13:45:23'),(8230,'MAIN_MODULE_EMAILCOLLECTOR',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-12 20:13:55'),(8232,'MAIN_MODULE_SUPPLIERPROPOSAL',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-13 14:37:09'),(8233,'MAIN_MODULE_EXPEDITION',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-13 14:38:20'),(8252,'SYSTEMTOOLS_MYSQLDUMP',1,'/usr/bin/mysqldump','chaine',0,'','2020-01-15 15:42:41'),(8259,'ACCOUNTING_REEXPORT',1,'1','yesno',0,'','2020-01-17 13:42:56'),(8291,'PRODUIT_MULTIPRICES_LIMIT',1,'5','chaine',0,'','2020-01-17 14:21:46'),(8293,'PRODUIT_CUSTOMER_PRICES_BY_QTY',1,'0','chaine',0,'','2020-01-17 14:21:46'),(8303,'PRODUCT_PRICE_UNIQ',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8304,'PRODUIT_MULTIPRICES',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8305,'PRODUIT_CUSTOMER_PRICES',1,'1','chaine',0,'','2020-01-17 14:25:30'),(8306,'PRODUIT_SOUSPRODUITS',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8307,'PRODUIT_DESC_IN_FORM',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8308,'PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8309,'PRODUIT_USE_SEARCH_TO_SELECT',1,'1','chaine',0,'','2020-01-17 14:25:30'),(8310,'PRODUIT_FOURN_TEXTS',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8313,'MAIN_MODULE_FCKEDITOR',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-18 17:13:27'),(8314,'FCKEDITOR_ENABLE_TICKET',1,'1','chaine',0,'','2020-01-18 19:39:54'),(8321,'FCKEDITOR_SKIN',1,'moono-lisa','chaine',0,'','2020-01-18 19:41:15'),(8322,'FCKEDITOR_TEST',1,'Test &lt; aaa<br />\r\n<br />\r\n<img alt=\"\" src=\"/dolibarr_11.0/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/background_coder.jpg\" style=\"height:1280px; width:1920px\" />','chaine',0,'','2020-01-18 19:41:15'),(8484,'MAIN_LANG_DEFAULT',1,'auto','chaine',0,'','2020-01-21 09:40:00'),(8485,'MAIN_IHM_PARAMS_REV',1,'11','chaine',0,'','2020-01-21 09:40:00'),(8486,'MAIN_MULTILANGS',1,'1','chaine',0,'','2020-01-21 09:40:00'),(8487,'MAIN_THEME',1,'eldy','chaine',0,'','2020-01-21 09:40:00'),(8488,'THEME_ELDY_USE_HOVER',1,'237,244,251','chaine',0,'','2020-01-21 09:40:00'),(8489,'MAIN_SIZE_LISTE_LIMIT',1,'25','chaine',0,'','2020-01-21 09:40:00'),(8490,'MAIN_SIZE_SHORTLIST_LIMIT',1,'3','chaine',0,'','2020-01-21 09:40:00'),(8491,'MAIN_DISABLE_JAVASCRIPT',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8492,'MAIN_BUTTON_HIDE_UNAUTHORIZED',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8493,'MAIN_START_WEEK',1,'1','chaine',0,'','2020-01-21 09:40:00'),(8494,'MAIN_DEFAULT_WORKING_DAYS',1,'1-5','chaine',0,'','2020-01-21 09:40:00'),(8495,'MAIN_DEFAULT_WORKING_HOURS',1,'9-18','chaine',0,'','2020-01-21 09:40:00'),(8496,'MAIN_SHOW_LOGO',1,'1','chaine',0,'','2020-01-21 09:40:00'),(8497,'MAIN_FIRSTNAME_NAME_POSITION',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8498,'MAIN_HELPCENTER_DISABLELINK',0,'0','chaine',0,'','2020-01-21 09:40:00'),(8499,'MAIN_HOME',1,'<span style=\"font-size:12px\">__(NoteSomeFeaturesAreDisabled)__<br />\r\n__(SomeTranslationAreUncomplete)__</span>','chaine',0,'','2020-01-21 09:40:00'),(8501,'MAIN_BUGTRACK_ENABLELINK',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8542,'MAIN_INFO_SOCIETE_COUNTRY',1,'117:IN:India','chaine',0,'','2020-06-12 17:24:42'),(8543,'MAIN_INFO_SOCIETE_NOM',1,'MyBigCompany','chaine',0,'','2020-06-12 17:24:42'),(8544,'MAIN_INFO_SOCIETE_ADDRESS',1,'21 Jump street.','chaine',0,'','2020-06-12 17:24:42'),(8545,'MAIN_INFO_SOCIETE_TOWN',1,'MyTown','chaine',0,'','2020-06-12 17:24:42'),(8546,'MAIN_INFO_SOCIETE_ZIP',1,'75500','chaine',0,'','2020-06-12 17:24:42'),(8547,'MAIN_MONNAIE',1,'EUR','chaine',0,'','2020-06-12 17:24:42'),(8548,'MAIN_INFO_SOCIETE_TEL',1,'09123123','chaine',0,'','2020-06-12 17:24:42'),(8549,'MAIN_INFO_SOCIETE_FAX',1,'09123124','chaine',0,'','2020-06-12 17:24:42'),(8550,'MAIN_INFO_SOCIETE_MAIL',1,'myemail@mybigcompany.com','chaine',0,'','2020-06-12 17:24:42'),(8551,'MAIN_INFO_SOCIETE_WEB',1,'https://www.dolibarr.org','chaine',0,'','2020-06-12 17:24:42'),(8552,'MAIN_INFO_SOCIETE_NOTE',1,'This is note about my company','chaine',0,'','2020-06-12 17:24:42'),(8553,'MAIN_INFO_SOCIETE_GENCOD',1,'1234567890','chaine',0,'','2020-06-12 17:24:42'),(8554,'MAIN_INFO_SOCIETE_FACEBOOK_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8555,'MAIN_INFO_SOCIETE_TWITTER_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8556,'MAIN_INFO_SOCIETE_LINKEDIN_URL',1,'https://www.linkedin.com/company/9400559/admin/','chaine',0,'','2020-06-12 17:24:42'),(8557,'MAIN_INFO_SOCIETE_INSTAGRAM_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8558,'MAIN_INFO_SOCIETE_YOUTUBE_URL',1,'DolibarrERPCRM','chaine',0,'','2020-06-12 17:24:42'),(8559,'MAIN_INFO_SOCIETE_GITHUB_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8560,'MAIN_INFO_SOCIETE_MANAGERS',1,'Zack Zeceo','chaine',0,'','2020-06-12 17:24:42'),(8561,'MAIN_INFO_GDPR',1,'Zack Zeceo','chaine',0,'','2020-06-12 17:24:42'),(8562,'MAIN_INFO_CAPITAL',1,'10000','chaine',0,'','2020-06-12 17:24:42'),(8563,'MAIN_INFO_SOCIETE_FORME_JURIDIQUE',1,'0','chaine',0,'','2020-06-12 17:24:42'),(8564,'MAIN_INFO_SIREN',1,'123456','chaine',0,'','2020-06-12 17:24:42'),(8565,'MAIN_INFO_SIRET',1,'ABC-DEF','chaine',0,'','2020-06-12 17:24:42'),(8566,'MAIN_INFO_APE',1,'15E-45-8D','chaine',0,'','2020-06-12 17:24:42'),(8567,'MAIN_INFO_TVAINTRA',1,'FR12345678','chaine',0,'','2020-06-12 17:24:42'),(8568,'MAIN_INFO_SOCIETE_OBJECT',1,'A company demo to show how Dolibarr ERP CRM is wonderfull','chaine',0,'','2020-06-12 17:24:42'),(8569,'SOCIETE_FISCAL_MONTH_START',1,'4','chaine',0,'','2020-06-12 17:24:42'),(8570,'FACTURE_TVAOPTION',1,'1','chaine',0,'','2020-06-12 17:24:42'),(8571,'FACTURE_LOCAL_TAX1_OPTION',1,'localtax1on','chaine',0,'','2020-06-12 17:24:42'),(8572,'FACTURE_LOCAL_TAX2_OPTION',1,'localtax2on','chaine',0,'','2020-06-12 17:24:42'),(8573,'MAIN_INFO_VALUE_LOCALTAX1',1,'0','chaine',0,'','2020-06-12 17:24:42'),(8574,'MAIN_INFO_LOCALTAX_CALC1',1,'0','chaine',0,'','2020-06-12 17:24:42'),(8575,'MAIN_INFO_VALUE_LOCALTAX2',1,'0','chaine',0,'','2020-06-12 17:24:42'),(8576,'MAIN_INFO_LOCALTAX_CALC2',1,'0','chaine',0,'','2020-06-12 17:24:42'),(8577,'PRODUCT_PRICE_BASE_TYPE',0,'HT','string',0,NULL,'2020-12-10 12:24:38'),(8578,'MAIN_MODULE_ACCOUNTING',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:49'),(8579,'MAIN_MODULE_AGENDA',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:49'),(8580,'MAIN_MODULE_BARCODE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:50'),(8581,'MAIN_MODULE_CRON',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:50'),(8582,'MAIN_MODULE_COMMANDE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:50'),(8583,'MAIN_MODULE_DON',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:50'),(8584,'MAIN_MODULE_ECM',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:50'),(8585,'MAIN_MODULE_EXPENSEREPORT',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:50'),(8586,'MAIN_MODULE_FACTURE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:51'),(8587,'MAIN_MODULE_FOURNISSEUR',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:51'),(8588,'MAIN_MODULE_HOLIDAY',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:51'),(8589,'MAIN_MODULE_OPENSURVEY',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:51'),(8590,'MAIN_MODULE_PRINTING',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:51'),(8591,'MAIN_MODULE_RESOURCE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:51'),(8592,'MAIN_MODULE_SALARIES',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:51'),(8593,'MAIN_MODULE_SOCIETE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:51'),(8594,'MAIN_MODULE_SERVICE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:52'),(8595,'TAKEPOS_PRINT_METHOD',1,'browser','chaine',0,'','2020-12-10 12:24:52'),(8596,'MAIN_MODULE_TAKEPOS',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:52'),(8597,'MAIN_MODULE_TAKEPOS_TRIGGERS',1,'0','chaine',0,NULL,'2020-12-10 12:24:52'),(8598,'MAIN_MODULE_TAKEPOS_LOGIN',1,'0','chaine',0,NULL,'2020-12-10 12:24:52'),(8599,'MAIN_MODULE_TAKEPOS_SUBSTITUTIONS',1,'1','chaine',0,NULL,'2020-12-10 12:24:52'),(8600,'MAIN_MODULE_TAKEPOS_MENUS',1,'0','chaine',0,NULL,'2020-12-10 12:24:52'),(8601,'MAIN_MODULE_TAKEPOS_THEME',1,'0','chaine',0,NULL,'2020-12-10 12:24:52'),(8602,'MAIN_MODULE_TAKEPOS_TPL',1,'0','chaine',0,NULL,'2020-12-10 12:24:52'),(8603,'MAIN_MODULE_TAKEPOS_BARCODE',1,'0','chaine',0,NULL,'2020-12-10 12:24:52'),(8604,'MAIN_MODULE_TAKEPOS_MODELS',1,'0','chaine',0,NULL,'2020-12-10 12:24:52'),(8605,'MAIN_MODULE_USER',0,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:52'),(8606,'MAIN_MODULE_VARIANTS',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:52'),(8607,'MAIN_MODULE_WEBSITE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2020-12-10 12:24:52'),(8608,'MAIN_VERSION_LAST_UPGRADE',0,'13.0.0-beta','chaine',0,'Dolibarr version for last upgrade','2020-12-10 12:24:54'),(8610,'MAIN_FIRST_PING_OK_DATE',1,'20201210122456','chaine',0,'','2020-12-10 12:24:56'),(8611,'MAIN_FIRST_PING_OK_ID',1,'c62ba8fb0a32591892333c3d72593685','chaine',0,'','2020-12-10 12:24:56'),(8612,'MAIN_UPLOAD_DOC',1,'50000','chaine',0,'','2020-12-10 12:26:31'),(8613,'MAIN_UMASK',1,'0664','chaine',0,'','2020-12-10 12:26:31'),(8614,'MAIN_ANTIVIRUS_PARAM',1,'--fdpass','chaine',0,'','2020-12-10 12:26:31'),(8619,'WEBSITE_EDITINLINE',1,'0','chaine',0,'','2020-12-10 12:27:05'),(8620,'WEBSITE_SUBCONTAINERSINLINE',1,'1','chaine',0,'','2020-12-10 12:27:17'),(8622,'MAIN_FEATURES_LEVEL',0,'1','chaine',1,'Level of features to show (0=stable only, 1=stable+experimental, 2=stable+experimental+development','2020-12-10 12:29:16'),(8623,'MAIN_MODULE_RECRUITMENT',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-12-10 12:29:43'),(8624,'MAIN_MODULE_RECRUITMENT_TRIGGERS',1,'0','chaine',0,NULL,'2020-12-10 12:29:43'),(8625,'MAIN_MODULE_RECRUITMENT_LOGIN',1,'0','chaine',0,NULL,'2020-12-10 12:29:43'),(8626,'MAIN_MODULE_RECRUITMENT_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2020-12-10 12:29:43'),(8627,'MAIN_MODULE_RECRUITMENT_MENUS',1,'0','chaine',0,NULL,'2020-12-10 12:29:43'),(8628,'MAIN_MODULE_RECRUITMENT_TPL',1,'0','chaine',0,NULL,'2020-12-10 12:29:43'),(8629,'MAIN_MODULE_RECRUITMENT_BARCODE',1,'0','chaine',0,NULL,'2020-12-10 12:29:43'),(8630,'MAIN_MODULE_RECRUITMENT_MODELS',1,'1','chaine',0,NULL,'2020-12-10 12:29:43'),(8631,'MAIN_MODULE_RECRUITMENT_THEME',1,'0','chaine',0,NULL,'2020-12-10 12:29:43'),(8632,'MAIN_MODULE_RECRUITMENT_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2020-12-10 12:29:43'),(8633,'MAIN_MODULE_RECEPTION',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-12-10 12:30:13'),(8634,'RECEPTION_ADDON_PDF',1,'squille','chaine',0,'Nom du gestionnaire de generation des bons receptions en PDF','2020-12-10 12:30:13'),(8635,'RECEPTION_ADDON_NUMBER',1,'mod_reception_beryl','chaine',0,'Name for numbering manager for receptions','2020-12-10 12:30:13'),(8636,'RECEPTION_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/receptions','chaine',0,NULL,'2020-12-10 12:30:13'),(8637,'MAIN_SUBMODULE_RECEPTION',1,'1','chaine',0,'Enable receptions','2020-12-10 12:30:13'),(8638,'MAIN_MODULE_PAYMENTBYBANKTRANSFER',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-12-10 12:30:17'),(8639,'MAIN_MODULE_MARGIN',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-12-10 12:30:20'),(8640,'MAIN_MODULE_MARGIN_TABS_0',1,'product:+margin:Margins:margins:$user->rights->margins->liretous:/margin/tabs/productMargins.php?id=__ID__','chaine',0,NULL,'2020-12-10 12:30:20'),(8641,'MAIN_MODULE_MARGIN_TABS_1',1,'thirdparty:+margin:Margins:margins:empty($user->socid) && $user->rights->margins->liretous && ($object->client > 0):/margin/tabs/thirdpartyMargins.php?socid=__ID__','chaine',0,NULL,'2020-12-10 12:30:20'),(8643,'MAIN_MODULE_BLOCKEDLOG',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-12-10 12:31:17'),(8644,'MAIN_MODULE_INCOTERM',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-12-10 12:31:36'),(8645,'INCOTERM_ACTIVATE',1,'','chaine',0,'Description de INCOTERM_ACTIVATE','2020-12-10 12:31:36');
 /*!40000 ALTER TABLE `llx_const` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4924,6 +5552,34 @@ INSERT INTO `llx_cronjob` VALUES (1,'2015-03-23 18:18:39','2015-03-23 19:18:39',
 /*!40000 ALTER TABLE `llx_cronjob` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_cv_recrutement`
+--
+
+DROP TABLE IF EXISTS `llx_cv_recrutement`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_cv_recrutement` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `nom` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `fichier` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `poste` int(11) DEFAULT NULL,
+  `candidature` int(11) DEFAULT NULL,
+  `type` varchar(20) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `date` date DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_cv_recrutement`
+--
+
+LOCK TABLES `llx_cv_recrutement` WRITE;
+/*!40000 ALTER TABLE `llx_cv_recrutement` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_cv_recrutement` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_default_values`
 --
@@ -4954,6 +5610,168 @@ INSERT INTO `llx_default_values` VALUES (1,1,'createform',0,'compta/facture/card
 /*!40000 ALTER TABLE `llx_default_values` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_delivery`
+--
+
+DROP TABLE IF EXISTS `llx_delivery`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_delivery` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `ref` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `ref_customer` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_soc` int(11) NOT NULL,
+  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_int` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `date_creation` datetime DEFAULT NULL,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `date_valid` datetime DEFAULT NULL,
+  `fk_user_valid` int(11) DEFAULT NULL,
+  `date_delivery` datetime DEFAULT NULL,
+  `fk_address` int(11) DEFAULT NULL,
+  `fk_statut` smallint(6) DEFAULT 0,
+  `total_ht` double(24,8) DEFAULT 0.00000000,
+  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_incoterms` int(11) DEFAULT NULL,
+  `location_incoterms` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `last_main_doc` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_delivery_uk_ref` (`ref`,`entity`),
+  KEY `idx_delivery_fk_soc` (`fk_soc`),
+  KEY `idx_delivery_fk_user_author` (`fk_user_author`),
+  KEY `idx_delivery_fk_user_valid` (`fk_user_valid`),
+  CONSTRAINT `fk_delivery_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
+  CONSTRAINT `fk_delivery_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`),
+  CONSTRAINT `fk_delivery_fk_user_valid` FOREIGN KEY (`fk_user_valid`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_delivery`
+--
+
+LOCK TABLES `llx_delivery` WRITE;
+/*!40000 ALTER TABLE `llx_delivery` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_delivery` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_delivery_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_delivery_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_delivery_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_delivery_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_delivery_extrafields`
+--
+
+LOCK TABLES `llx_delivery_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_delivery_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_delivery_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_deliverydet`
+--
+
+DROP TABLE IF EXISTS `llx_deliverydet`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_deliverydet` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_delivery` int(11) DEFAULT NULL,
+  `fk_origin_line` int(11) DEFAULT NULL,
+  `fk_product` int(11) DEFAULT NULL,
+  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `qty` double DEFAULT NULL,
+  `subprice` double(24,8) DEFAULT 0.00000000,
+  `total_ht` double(24,8) DEFAULT 0.00000000,
+  `rang` int(11) DEFAULT 0,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_deliverydet_fk_expedition` (`fk_delivery`),
+  KEY `idx_deliverydet_fk_delivery` (`fk_delivery`),
+  CONSTRAINT `fk_deliverydet_fk_delivery` FOREIGN KEY (`fk_delivery`) REFERENCES `llx_delivery` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_deliverydet`
+--
+
+LOCK TABLES `llx_deliverydet` WRITE;
+/*!40000 ALTER TABLE `llx_deliverydet` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_deliverydet` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_deliverydet_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_deliverydet_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_deliverydet_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_deliverydet_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_deliverydet_extrafields`
+--
+
+LOCK TABLES `llx_deliverydet_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_deliverydet_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_deliverydet_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_departements`
+--
+
+DROP TABLE IF EXISTS `llx_departements`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_departements` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `label` varchar(355) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `gestionnaire` int(11) NOT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `gestionnaire` (`gestionnaire`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_departements`
+--
+
+LOCK TABLES `llx_departements` WRITE;
+/*!40000 ALTER TABLE `llx_departements` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_departements` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_deplacement`
 --
@@ -4993,6 +5811,70 @@ INSERT INTO `llx_deplacement` VALUES (1,NULL,1,'2012-07-09 01:58:04','2012-07-08
 /*!40000 ALTER TABLE `llx_deplacement` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_dispatch`
+--
+
+DROP TABLE IF EXISTS `llx_dispatch`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_dispatch` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_object` int(11) NOT NULL DEFAULT 0,
+  `type_object` varchar(30) CHARACTER SET latin1 DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `fk_object` (`fk_object`),
+  KEY `type_object` (`type_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_dispatch`
+--
+
+LOCK TABLES `llx_dispatch` WRITE;
+/*!40000 ALTER TABLE `llx_dispatch` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_dispatch` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_dispatch_asset`
+--
+
+DROP TABLE IF EXISTS `llx_dispatch_asset`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_dispatch_asset` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_object` int(11) NOT NULL DEFAULT 0,
+  `fk_dispatch` int(11) NOT NULL DEFAULT 0,
+  `fk_asset` int(11) NOT NULL DEFAULT 0,
+  `type_object` varchar(30) CHARACTER SET latin1 DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `fk_object` (`fk_object`),
+  KEY `fk_dispatch` (`fk_dispatch`),
+  KEY `fk_asset` (`fk_asset`),
+  KEY `type_object` (`type_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_dispatch_asset`
+--
+
+LOCK TABLES `llx_dispatch_asset` WRITE;
+/*!40000 ALTER TABLE `llx_dispatch_asset` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_dispatch_asset` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_document_model`
 --
@@ -5009,7 +5891,7 @@ CREATE TABLE `llx_document_model` (
   `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_document_model` (`nom`,`type`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=386 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=394 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5018,7 +5900,7 @@ CREATE TABLE `llx_document_model` (
 
 LOCK TABLES `llx_document_model` WRITE;
 /*!40000 ALTER TABLE `llx_document_model` DISABLE KEYS */;
-INSERT INTO `llx_document_model` VALUES (9,'merou',1,'shipping',NULL,NULL),(181,'generic_invoice_odt',1,'invoice','ODT templates','FACTURE_ADDON_PDF_ODT_PATH'),(193,'canelle2',1,'invoice_supplier','canelle2',NULL),(195,'canelle',1,'invoice_supplier','canelle',NULL),(198,'azur',2,'propal',NULL,NULL),(199,'html_cerfafr',2,'donation',NULL,NULL),(200,'crabe',2,'invoice',NULL,NULL),(201,'generic_odt',1,'company','ODT templates','COMPANY_ADDON_PDF_ODT_PATH'),(250,'baleine',1,'project',NULL,NULL),(255,'soleil',1,'ficheinter',NULL,NULL),(256,'azur',1,'propal',NULL,NULL),(273,'beluga',1,'project','beluga',NULL),(281,'sepamandate',1,'bankaccount','sepamandate',NULL),(299,'standard',1,'member',NULL,NULL),(319,'generic_bom_odt',1,'bom','ODT templates','BOM_ADDON_PDF_ODT_PATH'),(320,'generic_mo_odt',1,'mrp','ODT templates','MRP_MO_ADDON_PDF_ODT_PATH'),(366,'generic_user_odt',1,'user',NULL,NULL),(367,'generic_usergroup_odt',1,'group',NULL,NULL),(370,'aurore',1,'supplier_proposal',NULL,NULL),(371,'rouget',1,'shipping',NULL,NULL),(372,'typhon',1,'delivery',NULL,NULL),(381,'einstein',1,'order',NULL,NULL),(382,'html_cerfafr',1,'donation',NULL,NULL),(383,'standard',1,'expensereport',NULL,NULL),(384,'crabe',1,'invoice',NULL,NULL),(385,'muscadet',1,'order_supplier',NULL,NULL);
+INSERT INTO `llx_document_model` VALUES (9,'merou',1,'shipping',NULL,NULL),(181,'generic_invoice_odt',1,'invoice','ODT templates','FACTURE_ADDON_PDF_ODT_PATH'),(193,'canelle2',1,'invoice_supplier','canelle2',NULL),(195,'canelle',1,'invoice_supplier','canelle',NULL),(198,'azur',2,'propal',NULL,NULL),(199,'html_cerfafr',2,'donation',NULL,NULL),(200,'crabe',2,'invoice',NULL,NULL),(201,'generic_odt',1,'company','ODT templates','COMPANY_ADDON_PDF_ODT_PATH'),(250,'baleine',1,'project',NULL,NULL),(255,'soleil',1,'ficheinter',NULL,NULL),(256,'azur',1,'propal',NULL,NULL),(273,'beluga',1,'project','beluga',NULL),(281,'sepamandate',1,'bankaccount','sepamandate',NULL),(299,'standard',1,'member',NULL,NULL),(319,'generic_bom_odt',1,'bom','ODT templates','BOM_ADDON_PDF_ODT_PATH'),(320,'generic_mo_odt',1,'mrp','ODT templates','MRP_MO_ADDON_PDF_ODT_PATH'),(366,'generic_user_odt',1,'user',NULL,NULL),(367,'generic_usergroup_odt',1,'group',NULL,NULL),(370,'aurore',1,'supplier_proposal',NULL,NULL),(371,'rouget',1,'shipping',NULL,NULL),(372,'typhon',1,'delivery',NULL,NULL),(386,'einstein',1,'order',NULL,NULL),(387,'html_cerfafr',1,'donation',NULL,NULL),(388,'standard',1,'expensereport',NULL,NULL),(389,'crabe',1,'invoice',NULL,NULL),(390,'muscadet',1,'order_supplier',NULL,NULL),(391,'standard_recruitmentjobposition',1,'recruitmentjobposition',NULL,NULL),(392,'generic_recruitmentjobposition_odt',1,'recruitmentjobposition',NULL,NULL),(393,'squille',1,'reception',NULL,NULL);
 /*!40000 ALTER TABLE `llx_document_model` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -5120,7 +6002,7 @@ CREATE TABLE `llx_ecm_directories` (
   `fullpath` varchar(750) COLLATE utf8_unicode_ci DEFAULT NULL,
   `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `date_c` datetime DEFAULT NULL,
-  `date_m` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_user_c` int(11) DEFAULT NULL,
   `fk_user_m` int(11) DEFAULT NULL,
   `acl` text COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -5143,6 +6025,32 @@ INSERT INTO `llx_ecm_directories` VALUES (8,'Administrative documents',1,0,'Dire
 /*!40000 ALTER TABLE `llx_ecm_directories` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_ecm_directories_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_ecm_directories_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_ecm_directories_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_ecm_directories_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_ecm_directories_extrafields`
+--
+
+LOCK TABLES `llx_ecm_directories_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_ecm_directories_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_ecm_directories_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_ecm_files`
 --
@@ -5165,7 +6073,7 @@ CREATE TABLE `llx_ecm_files` (
   `gen_or_uploaded` varchar(12) COLLATE utf8_unicode_ci DEFAULT NULL,
   `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `date_c` datetime DEFAULT NULL,
-  `date_m` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_user_c` int(11) DEFAULT NULL,
   `fk_user_m` int(11) DEFAULT NULL,
   `acl` text COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -5189,6 +6097,32 @@ INSERT INTO `llx_ecm_files` VALUES (1,NULL,'6ff09d1c53ef83fe622b02a320bcfa52',NU
 /*!40000 ALTER TABLE `llx_ecm_files` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_ecm_files_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_ecm_files_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_ecm_files_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_ecm_files_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_ecm_files_extrafields`
+--
+
+LOCK TABLES `llx_ecm_files_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_ecm_files_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_ecm_files_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_ecommerce_category`
 --
@@ -5395,7 +6329,7 @@ CREATE TABLE `llx_emailcollector_emailcollector` (
 
 LOCK TABLES `llx_emailcollector_emailcollector` WRITE;
 /*!40000 ALTER TABLE `llx_emailcollector_emailcollector` DISABLE KEYS */;
-INSERT INTO `llx_emailcollector_emailcollector` VALUES (3,1,'Collect_Ticket_Requets','Example to collect ticket requests','This collector will scan your mailbox to find emails that match some rules and create automatically a ticket (Module Ticket must be enabled) with the email informations. You can use this collector if you provide some support by email, so your ticket request will be automatically generated. If the collector Collect_Responses is also enabled, when you send an email from the ticket, you may also see answers of your customers or partners directly on the ticket view.',NULL,NULL,NULL,'INBOX',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2020-01-13 00:13:55','2020-01-12 20:13:55',12,NULL,NULL,0,NULL,0,NULL,NULL,100,'UTF-8'),(4,1,'Collect_Responses','Example to collect any email responses','This collector will scan your mailbox to find all emails that are an answer of an email sent from your application. An event with the email response will be recorded at the good place (Module Agenda must be enabled). For example, if your send a commercial proposal, order or invoice by email and your customer answers your email, the system will automatically find the answer and add it into your ERP.',NULL,NULL,NULL,'INBOX',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2020-01-13 00:13:55','2020-01-12 20:13:55',12,NULL,NULL,0,NULL,0,NULL,NULL,100,'UTF-8'),(5,1,'Collect_Leads','Example to collect leads','This collector will scan your mailbox to find emails that match some rules and create automatically a lead (Module Project must be enabled) with the email informations. You can use this collector if you want to follow your lead using the module Project (1 lead = 1 project), so your leads will be automatically generated. If the collector Collect_Responses is also enabled, when you send an email from your leads, proposals or any other object, you may also see answers of your customers or partners directly on the application.<br>Note: With this initial example, the title of the lead is generated including the email. If the thirdparty can\'t be found in database (new customer), the lead will be attached to the thirdparty with ID 1.',NULL,NULL,NULL,'INBOX',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2020-01-13 00:13:55','2020-01-12 20:13:55',12,NULL,NULL,0,NULL,0,NULL,NULL,100,'UTF-8');
+INSERT INTO `llx_emailcollector_emailcollector` VALUES (3,1,'Collect_Ticket_Requests','Example to collect ticket requests','This collector will scan your mailbox to find emails that match some rules and create automatically a ticket (Module Ticket must be enabled) with the email informations. You can use this collector if you provide some support by email, so your ticket request will be automatically generated. If the collector Collect_Responses is also enabled, when you send an email from the ticket, you may also see answers of your customers or partners directly on the ticket view.',NULL,NULL,NULL,'INBOX',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2020-01-13 00:13:55','2020-12-10 12:24:38',12,NULL,NULL,0,NULL,0,NULL,NULL,100,'UTF-8'),(4,1,'Collect_Responses_In','Example to collect any email responses','This collector will scan your mailbox to find all emails that are an answer of an email sent from your application. An event with the email response will be recorded at the good place (Module Agenda must be enabled). For example, if your send a commercial proposal, order or invoice by email and your customer answers your email, the system will automatically find the answer and add it into your ERP.',NULL,NULL,NULL,'INBOX',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2020-01-13 00:13:55','2020-12-10 12:24:38',12,NULL,NULL,0,NULL,0,NULL,NULL,100,'UTF-8'),(5,1,'Collect_Leads','Example to collect leads','This collector will scan your mailbox to find emails that match some rules and create automatically a lead (Module Project must be enabled) with the email informations. You can use this collector if you want to follow your lead using the module Project (1 lead = 1 project), so your leads will be automatically generated. If the collector Collect_Responses is also enabled, when you send an email from your leads, proposals or any other object, you may also see answers of your customers or partners directly on the application.<br>Note: With this initial example, the title of the lead is generated including the email. If the thirdparty can\'t be found in database (new customer), the lead will be attached to the thirdparty with ID 1.',NULL,NULL,NULL,'INBOX',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2020-01-13 00:13:55','2020-01-12 20:13:55',12,NULL,NULL,0,NULL,0,NULL,NULL,100,'UTF-8');
 /*!40000 ALTER TABLE `llx_emailcollector_emailcollector` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -5628,6 +6562,8 @@ CREATE TABLE `llx_establishment` (
   `datec` datetime NOT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `status` tinyint(4) DEFAULT 1,
+  `ref` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
+  `label` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -5641,6 +6577,55 @@ LOCK TABLES `llx_establishment` WRITE;
 /*!40000 ALTER TABLE `llx_establishment` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_etapescandidature`
+--
+
+DROP TABLE IF EXISTS `llx_etapescandidature`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_etapescandidature` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `label` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `color` varchar(10) CHARACTER SET utf8mb4 DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_etapescandidature`
+--
+
+LOCK TABLES `llx_etapescandidature` WRITE;
+/*!40000 ALTER TABLE `llx_etapescandidature` DISABLE KEYS */;
+INSERT INTO `llx_etapescandidature` VALUES (1,'Qualification_initiale','#DBE270'),(2,'Premier_entretien','#F59A9A'),(3,'Second_entretien','#62B0F7'),(4,'Proposition_contrat','#FFB164'),(5,'Contrat_signe','#59D859');
+/*!40000 ALTER TABLE `llx_etapescandidature` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_etiquettes`
+--
+
+DROP TABLE IF EXISTS `llx_etiquettes`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_etiquettes` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `label` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `color` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_etiquettes`
+--
+
+LOCK TABLES `llx_etiquettes` WRITE;
+/*!40000 ALTER TABLE `llx_etiquettes` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_etiquettes` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_event_element`
 --
@@ -5666,6 +6651,140 @@ LOCK TABLES `llx_event_element` WRITE;
 /*!40000 ALTER TABLE `llx_event_element` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_eventorganizer_attendee`
+--
+
+DROP TABLE IF EXISTS `llx_eventorganizer_attendee`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_eventorganizer_attendee` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(128) CHARACTER SET utf8mb4 NOT NULL DEFAULT '(PROV)',
+  `label` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `amount` double(24,8) DEFAULT NULL,
+  `qty` double DEFAULT NULL,
+  `fk_soc` int(11) DEFAULT NULL,
+  `description` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `note_public` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `note_private` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_user_creat` int(11) NOT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `status` int(11) NOT NULL,
+  `fk_eventorganizer` int(11) NOT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_eventorganizer_attendee_rowid` (`rowid`),
+  KEY `idx_eventorganizer_attendee_ref` (`ref`),
+  KEY `idx_eventorganizer_attendee_fk_soc` (`fk_soc`),
+  KEY `idx_eventorganizer_attendee_status` (`status`),
+  KEY `idx_eventorganizer_attendee_fk_eventorganizer` (`fk_eventorganizer`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_eventorganizer_attendee`
+--
+
+LOCK TABLES `llx_eventorganizer_attendee` WRITE;
+/*!40000 ALTER TABLE `llx_eventorganizer_attendee` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_eventorganizer_attendee` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_eventorganizer_attendee_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_eventorganizer_attendee_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_eventorganizer_attendee_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_eventorganizer_attendee_extrafields`
+--
+
+LOCK TABLES `llx_eventorganizer_attendee_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_eventorganizer_attendee_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_eventorganizer_attendee_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_eventorganizer_organizedevent`
+--
+
+DROP TABLE IF EXISTS `llx_eventorganizer_organizedevent`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_eventorganizer_organizedevent` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(128) CHARACTER SET utf8mb4 NOT NULL DEFAULT '(PROV)',
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `label` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `amount` double(24,8) DEFAULT NULL,
+  `qty` double DEFAULT NULL,
+  `fk_soc` int(11) DEFAULT NULL,
+  `description` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `note_public` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `note_private` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_user_creat` int(11) NOT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `status` int(11) NOT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_eventorganizer_organizedevent_rowid` (`rowid`),
+  KEY `idx_eventorganizer_organizedevent_ref` (`ref`),
+  KEY `idx_eventorganizer_organizedevent_entity` (`entity`),
+  KEY `idx_eventorganizer_organizedevent_fk_soc` (`fk_soc`),
+  KEY `idx_eventorganizer_organizedevent_status` (`status`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_eventorganizer_organizedevent`
+--
+
+LOCK TABLES `llx_eventorganizer_organizedevent` WRITE;
+/*!40000 ALTER TABLE `llx_eventorganizer_organizedevent` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_eventorganizer_organizedevent` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_eventorganizer_organizedevent_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_eventorganizer_organizedevent_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_eventorganizer_organizedevent_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_eventorganizer_organizedevent_extrafields`
+--
+
+LOCK TABLES `llx_eventorganizer_organizedevent_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_eventorganizer_organizedevent_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_eventorganizer_organizedevent_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_events`
 --
@@ -5887,6 +7006,46 @@ INSERT INTO `llx_expeditiondet` VALUES (1,1,10,3,1,0),(2,2,226,19,2,0);
 /*!40000 ALTER TABLE `llx_expeditiondet` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_expeditiondet_asset`
+--
+
+DROP TABLE IF EXISTS `llx_expeditiondet_asset`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_expeditiondet_asset` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_expeditiondet` int(11) NOT NULL DEFAULT 0,
+  `fk_asset` int(11) NOT NULL DEFAULT 0,
+  `rang` int(11) NOT NULL DEFAULT 0,
+  `lot_number` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `carton` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `numerosuivi` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `weight` double NOT NULL DEFAULT 0,
+  `weight_reel` double NOT NULL DEFAULT 0,
+  `tare` double NOT NULL DEFAULT 0,
+  `weight_unit` int(11) NOT NULL DEFAULT 0,
+  `weight_reel_unit` int(11) NOT NULL DEFAULT 0,
+  `tare_unit` int(11) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `fk_expeditiondet` (`fk_expeditiondet`),
+  KEY `fk_asset` (`fk_asset`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_expeditiondet_asset`
+--
+
+LOCK TABLES `llx_expeditiondet_asset` WRITE;
+/*!40000 ALTER TABLE `llx_expeditiondet_asset` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_expeditiondet_asset` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_expeditiondet_batch`
 --
@@ -5994,6 +7153,7 @@ CREATE TABLE `llx_expensereport` (
   `multicurrency_total_ttc` double(24,8) DEFAULT 0.00000000,
   `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
   `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_user_creat` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `idx_expensereport_uk_ref` (`ref`,`entity`),
   KEY `idx_expensereport_date_debut` (`date_debut`),
@@ -6012,7 +7172,7 @@ CREATE TABLE `llx_expensereport` (
 
 LOCK TABLES `llx_expensereport` WRITE;
 /*!40000 ALTER TABLE `llx_expensereport` DISABLE KEYS */;
-INSERT INTO `llx_expensereport` VALUES (1,'ADMIN-ER00002-150101',1,2,NULL,8.33000000,1.67000000,0.00000000,0.00000000,10.00000000,'2020-01-01','2020-01-03','2020-01-22 19:03:37','2020-01-22 19:06:50','2020-02-16 02:12:40',NULL,NULL,'2020-06-12 17:12:08',12,NULL,12,12,12,NULL,NULL,5,NULL,0,'Holidays',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL),(2,'ER1912-0001',1,NULL,NULL,141.67000000,28.33000000,0.00000000,0.00000000,170.00000000,'2020-02-01','2020-02-28','2020-01-22 19:04:44','2021-12-20 20:34:13','2021-12-20 20:34:19',NULL,'2021-12-21 00:34:26','2020-06-12 17:12:08',12,12,12,12,12,NULL,12,4,NULL,0,'Work on projet X','','','aaaa',NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL),(3,'(PROV3)',1,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'2020-02-02','2020-02-02','2020-02-02 03:57:03','2020-02-02 00:00:00',NULL,NULL,NULL,'2020-06-12 17:12:08',19,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL);
+INSERT INTO `llx_expensereport` VALUES (1,'ADMIN-ER00002-150101',1,2,NULL,8.33000000,1.67000000,0.00000000,0.00000000,10.00000000,'2020-01-01','2020-01-03','2020-01-22 19:03:37','2020-01-22 19:06:50','2020-02-16 02:12:40',NULL,NULL,'2020-06-12 17:12:08',12,NULL,12,12,12,NULL,NULL,5,NULL,0,'Holidays',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(2,'ER1912-0001',1,NULL,NULL,141.67000000,28.33000000,0.00000000,0.00000000,170.00000000,'2020-02-01','2020-02-28','2020-01-22 19:04:44','2021-12-20 20:34:13','2021-12-20 20:34:19',NULL,'2021-12-21 00:34:26','2020-06-12 17:12:08',12,12,12,12,12,NULL,12,4,NULL,0,'Work on projet X','','','aaaa',NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(3,'(PROV3)',1,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'2020-02-02','2020-02-02','2020-02-02 03:57:03','2020-02-02 00:00:00',NULL,NULL,NULL,'2020-06-12 17:12:08',19,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_expensereport` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -6330,6 +7490,7 @@ CREATE TABLE `llx_facture` (
   `retained_warranty_fk_cond_reglement` int(11) DEFAULT NULL,
   `fk_incoterms` int(11) DEFAULT NULL,
   `location_incoterms` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_transport_mode` int(11) DEFAULT NULL,
   `date_pointoftax` date DEFAULT NULL,
   `fk_multicurrency` int(11) DEFAULT NULL,
   `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -6365,7 +7526,7 @@ CREATE TABLE `llx_facture` (
 
 LOCK TABLES `llx_facture` WRITE;
 /*!40000 ALTER TABLE `llx_facture` DISABLE KEYS */;
-INSERT INTO `llx_facture` VALUES (2,'FA1007-0002',1,NULL,NULL,0,NULL,NULL,2,'2012-07-10 18:20:13','2019-07-10',NULL,NULL,'2020-06-12 17:12:08',1,10.00000000,NULL,NULL,0,NULL,NULL,0.10000000,0.00000000,0.00000000,0.00000000,46.00000000,46.10000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2019-07-10',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(3,'FA1107-0006',1,NULL,NULL,0,NULL,NULL,10,'2013-07-18 20:33:35','2019-07-18',NULL,NULL,'2020-06-12 17:12:09',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,15.00000000,15.00000000,2,1,NULL,1,NULL,NULL,1,NULL,NULL,1,0,'2019-07-18',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(5,'FA1108-0003',1,NULL,NULL,0,NULL,NULL,7,'2013-08-01 03:34:11','2019-08-01',NULL,NULL,'2020-06-12 17:12:08',1,0.00000000,NULL,NULL,0,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,6,'2019-08-01',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(6,'FA1108-0004',1,NULL,NULL,0,NULL,NULL,7,'2013-08-06 20:33:53','2019-08-06',NULL,NULL,'2020-06-12 17:12:08',1,0.00000000,NULL,NULL,0,NULL,NULL,0.98000000,0.00000000,0.00000000,0.00000000,5.00000000,5.98000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,4,'2019-08-06','Cash\nReceived : 6 EUR\nRendu : 0.02 EUR\n\n--------------------------------------',NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(8,'FA1108-0005',1,NULL,NULL,3,NULL,NULL,2,'2013-08-08 02:41:44','2019-08-08',NULL,NULL,'2020-06-12 17:12:08',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2019-08-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(9,'FA1108-0007',1,NULL,NULL,3,NULL,NULL,10,'2013-08-08 02:55:14','2019-08-08',NULL,NULL,'2020-06-12 17:12:08',0,0.00000000,NULL,NULL,0,NULL,NULL,1.96000000,0.00000000,0.00000000,0.00000000,10.00000000,11.96000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2019-08-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(10,'AV1212-0001',1,NULL,NULL,2,NULL,NULL,10,'2014-12-08 17:45:20','2019-12-08','2019-12-08',NULL,'2020-06-12 17:12:08',0,0.00000000,NULL,NULL,0,NULL,NULL,-0.63000000,0.00000000,0.00000000,0.00000000,-11.00000000,-11.63000000,1,1,NULL,1,NULL,3,NULL,NULL,NULL,0,0,'2019-12-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(12,'AV1212-0002',1,NULL,NULL,2,NULL,NULL,10,'2014-12-08 18:20:14','2019-12-08','2019-12-08',NULL,'2020-06-12 17:12:08',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,-5.00000000,-5.00000000,2,1,NULL,1,NULL,3,NULL,NULL,NULL,0,0,'2019-12-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(13,'FA1212-0011',1,NULL,NULL,0,NULL,NULL,7,'2014-12-09 20:04:19','2019-12-09','2020-02-12',NULL,'2020-06-12 17:12:08',0,0.00000000,NULL,NULL,0,NULL,NULL,2.74000000,0.00000000,0.00000000,0.00000000,14.00000000,16.74000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2019-12-09',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(32,'FA1212-0021',1,NULL,NULL,0,NULL,NULL,1,'2014-12-11 09:34:23','2019-12-11','2020-03-24',NULL,'2020-06-12 17:12:08',0,0.00000000,NULL,NULL,0,NULL,NULL,90.00000000,0.00000000,0.00000000,0.60000000,520.00000000,610.60000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2019-12-11','This is a comment (private)','This is a comment (public)','crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(33,'FA1212-0023',1,NULL,NULL,0,NULL,NULL,1,'2014-12-11 09:34:23','2019-12-11','2020-03-03',NULL,'2020-06-12 17:12:08',0,0.00000000,NULL,NULL,0,'abandon',NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,3,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2019-12-11','This is a comment (private)','This is a comment (public)','crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(55,'FA1212-0009',1,NULL,NULL,0,NULL,NULL,1,'2014-12-11 09:35:51','2019-12-11','2019-12-12',NULL,'2020-06-12 17:12:08',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2019-12-11','This is a comment (private)','This is a comment (public)','generic_invoice_odt:/home/ldestailleur/git/dolibarr_3.8/documents/doctemplates/invoices/template_invoice.odt',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(148,'FS1301-0001',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:22:48','2020-01-19','2020-01-19',NULL,'2020-06-12 17:12:09',0,0.00000000,NULL,NULL,0,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,1,'2020-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,'facture/FS1301-0001/FS1301-0001.pdf',NULL,NULL),(149,'FA1601-0024',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:30:05','2020-01-19','2019-08-29','2020-01-02 20:49:34','2020-06-12 17:12:09',0,0.00000000,NULL,NULL,0,'other','test',1.80000000,0.90000000,0.90000000,0.00000000,20.00000000,23.60000000,2,1,NULL,12,12,NULL,NULL,NULL,NULL,0,0,'2020-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,20.00000000,1.80000000,23.60000000,NULL,'facture/FA1601-0024/FA1601-0024.pdf',NULL,NULL),(150,'FA6801-0010',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:31:10','2020-01-19','2020-10-04',NULL,'2020-06-12 17:12:09',0,0.00000000,NULL,NULL,0,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,1,1,NULL,12,NULL,NULL,NULL,NULL,NULL,0,1,'2020-01-19',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,5.00000000,0.63000000,5.63000000,NULL,'facture/FA6801-0010/FA6801-0010.pdf',NULL,NULL),(151,'FS1301-0002',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:31:58','2020-01-19','2020-01-19',NULL,'2020-06-12 17:12:09',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,1,'2020-01-19',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(160,'FA1507-0015',1,NULL,NULL,0,NULL,NULL,12,'2015-03-06 16:47:48','2019-07-18','2018-03-06',NULL,'2020-06-12 17:12:09',0,0.00000000,NULL,NULL,0,NULL,NULL,1.11000000,0.00000000,0.00000000,0.00000000,8.89000000,10.00000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2019-07-18',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(210,'FA1107-0019',1,NULL,NULL,0,NULL,NULL,10,'2015-03-20 14:30:11','2019-07-10','2020-03-20',NULL,'2020-06-12 17:12:09',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2019-07-10',NULL,NULL,'generic_invoice_odt:/home/ldestailleur/git/dolibarr_3.8/documents/doctemplates/invoices/template_invoice.odt',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(211,'FA1303-0020',1,NULL,NULL,0,NULL,NULL,19,'2015-03-22 09:40:10','2020-03-22','2019-03-02',NULL,'2020-06-12 17:12:09',0,0.00000000,NULL,NULL,0,NULL,NULL,17.64000000,0.00000000,0.00000000,0.40000000,340.00000000,358.04000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,3,'2020-03-22',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(213,'AV1303-0003',1,NULL,NULL,2,NULL,NULL,1,'2016-03-03 19:22:03','2020-03-03','2019-03-03',NULL,'2020-06-12 17:12:09',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,-1000.00000000,-1000.00000000,1,1,NULL,1,NULL,32,NULL,NULL,NULL,0,0,'2020-03-03',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(216,'(PROV216)',1,NULL,NULL,0,NULL,NULL,26,'2017-02-12 23:21:27','2020-02-12',NULL,NULL,'2020-06-12 17:12:08',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2020-02-12',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,0,'',NULL,0,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(217,'(PROV217)',1,NULL,NULL,0,NULL,NULL,1,'2017-08-31 13:26:17','2019-08-31',NULL,NULL,'2020-06-12 17:12:08',0,0.00000000,NULL,NULL,0,NULL,NULL,1.13000000,0.00000000,0.00000000,0.00000000,21.00000000,22.13000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2019-08-31',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,21.00000000,1.13000000,22.13000000,NULL,'facture/(PROV217)/(PROV217).pdf',NULL,NULL),(218,'FA1909-0025',1,NULL,NULL,0,NULL,NULL,12,'2019-09-26 17:30:14','2019-09-26','2019-09-26',NULL,'2019-09-26 15:33:37',0,0.00000000,NULL,NULL,0,NULL,NULL,1.08000000,0.00000000,0.00000000,0.00000000,42.50000000,43.58000000,1,12,NULL,12,NULL,NULL,NULL,NULL,NULL,0,0,'2019-09-26',NULL,NULL,'',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,0,'',NULL,0,'EUR',1.00000000,42.50000000,1.08000000,43.58000000,NULL,NULL,'takepos','1'),(219,'(PROV-POS1-0)',1,NULL,NULL,0,NULL,NULL,1,'2019-11-28 19:04:03','2019-11-28',NULL,NULL,'2020-01-21 09:21:32',0,0.00000000,NULL,NULL,0,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,5.00000000,6.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,'2019-11-28',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,0,'EUR',1.00000000,5.00000000,1.00000000,6.00000000,NULL,NULL,'takepos','1'),(220,'(PROV220)',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:03:17','2020-01-16',NULL,NULL,'2020-01-16 01:03:17',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,100.00000000,100.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2020-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,1,'EUR',1.00000000,100.00000000,0.00000000,100.00000000,NULL,NULL,NULL,NULL),(221,'AC2001-0001',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:21:05','2020-01-16','2020-01-16',NULL,'2020-01-16 01:22:24',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,123.00000000,123.00000000,0,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2020-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,1,'EUR',1.00000000,123.00000000,0.00000000,123.00000000,NULL,'facture/AC2001-0001/AC2001-0001.pdf',NULL,NULL),(222,'(PROV222)',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:21:28','2020-01-16',NULL,NULL,'2020-01-16 01:21:28',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,100.00000000,100.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2020-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,1,'EUR',1.00000000,100.00000000,0.00000000,100.00000000,NULL,NULL,NULL,NULL),(223,'(PROV223)',1,NULL,NULL,0,NULL,NULL,19,'2020-01-16 02:32:04','2020-01-16',NULL,NULL,'2020-01-16 01:32:04',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,410.00000000,410.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,0,'2020-02-15',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,1,'EUR',1.00000000,410.00000000,0.00000000,410.00000000,NULL,NULL,NULL,NULL),(224,'AC2001-0002',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:33:19','2020-01-16','2020-01-16','2020-01-16 02:36:48','2020-01-16 01:36:48',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,20.50000000,20.50000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2020-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,1,'EUR',1.00000000,20.50000000,0.00000000,20.50000000,NULL,'facture/AC2001-0002/AC2001-0002.pdf',NULL,NULL),(225,'(PROV225)',1,NULL,NULL,0,NULL,NULL,19,'2020-01-16 02:37:48','2020-01-16',NULL,NULL,'2020-01-16 01:37:55',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,389.50000000,389.50000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,0,'2020-02-15',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,1,'EUR',1.00000000,389.50000000,0.00000000,389.50000000,NULL,'facture/(PROV225)/(PROV225).pdf',NULL,NULL),(226,'(PROV226)',1,NULL,NULL,3,NULL,NULL,11,'2020-01-19 14:20:54','2020-01-19',NULL,NULL,'2020-01-19 13:21:21',0,0.00000000,NULL,NULL,0,NULL,NULL,12.50000000,0.00000000,0.00000000,0.00000000,120.00000000,132.50000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2020-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,1,'EUR',1.00000000,120.00000000,12.50000000,132.50000000,NULL,'facture/(PROV226)/(PROV226).pdf',NULL,NULL),(227,'AC2001-0003',1,NULL,NULL,3,NULL,NULL,1,'2020-01-19 14:22:54','2020-01-19','2020-01-19',NULL,'2020-01-19 13:51:48',0,0.00000000,NULL,NULL,0,NULL,NULL,39.20000000,0.00000000,0.00000000,0.00000000,200.00000000,239.20000000,0,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2020-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,1,'EUR',1.00000000,200.00000000,39.20000000,239.20000000,NULL,'facture/AC2001-0003/AC2001-0003.pdf',NULL,NULL),(228,'AC2001-0004',1,NULL,NULL,3,NULL,NULL,1,'2020-01-19 14:24:49','2020-01-19','2020-01-19',NULL,'2020-01-19 14:13:07',0,0.00000000,NULL,NULL,0,NULL,NULL,1.94000000,0.00000000,0.00000000,0.00000000,48.60000000,50.54000000,1,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2020-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,1,'EUR',1.00000000,48.60000000,1.94000000,50.54000000,NULL,'facture/AC2001-0004/AC2001-0004.pdf',NULL,NULL),(229,'FA1707-0026',1,NULL,NULL,0,NULL,NULL,12,'2020-01-21 10:23:17','2019-07-18','2022-01-21','2020-01-21 10:23:17','2020-06-12 17:12:08',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2019-07-18',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,NULL,'facture/FA1707-0026/FA1707-0026.pdf',NULL,NULL),(230,'FA1807-0027',1,NULL,NULL,0,NULL,NULL,12,'2020-01-21 10:23:28','2019-07-18','2021-01-21','2020-01-21 10:23:28','2020-06-12 17:12:09',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2019-07-18',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,NULL,'facture/FA1807-0027/FA1807-0027.pdf',NULL,NULL),(231,'FA1907-0028',1,NULL,NULL,0,NULL,NULL,12,'2020-01-21 10:23:49','2019-07-18','2020-01-21','2020-01-21 10:23:49','2020-01-21 09:23:49',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2019-07-18',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,NULL,'facture/FA1907-0028/FA1907-0028.pdf',NULL,NULL);
+INSERT INTO `llx_facture` VALUES (2,'FA1007-0002',1,NULL,NULL,0,NULL,NULL,2,'2012-07-10 18:20:13','2020-07-10',NULL,NULL,'2020-12-10 12:24:22',1,10.00000000,NULL,NULL,0,NULL,NULL,0.10000000,0.00000000,0.00000000,0.00000000,46.00000000,46.10000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-07-10',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(3,'FA1107-0006',1,NULL,NULL,0,NULL,NULL,10,'2013-07-18 20:33:35','2020-07-18',NULL,NULL,'2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,15.00000000,15.00000000,2,1,NULL,1,NULL,NULL,1,NULL,NULL,1,0,'2020-07-18',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(5,'FA1108-0003',1,NULL,NULL,0,NULL,NULL,7,'2013-08-01 03:34:11','2020-08-01',NULL,NULL,'2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,6,'2020-08-01',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(6,'FA1108-0004',1,NULL,NULL,0,NULL,NULL,7,'2013-08-06 20:33:53','2020-08-06',NULL,NULL,'2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.98000000,0.00000000,0.00000000,0.00000000,5.00000000,5.98000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,4,'2020-08-06','Cash\nReceived : 6 EUR\nRendu : 0.02 EUR\n\n--------------------------------------',NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(8,'FA1108-0005',1,NULL,NULL,3,NULL,NULL,2,'2013-08-08 02:41:44','2020-08-08',NULL,NULL,'2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-08-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(9,'FA1108-0007',1,NULL,NULL,3,NULL,NULL,10,'2013-08-08 02:55:14','2020-08-08',NULL,NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,1.96000000,0.00000000,0.00000000,0.00000000,10.00000000,11.96000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-08-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(10,'AV1212-0001',1,NULL,NULL,2,NULL,NULL,10,'2014-12-08 17:45:20','2020-12-08','2020-12-08',NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,-0.63000000,0.00000000,0.00000000,0.00000000,-11.00000000,-11.63000000,1,1,NULL,1,NULL,3,NULL,NULL,NULL,0,0,'2020-12-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(12,'AV1212-0002',1,NULL,NULL,2,NULL,NULL,10,'2014-12-08 18:20:14','2020-12-08','2020-12-08',NULL,'2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,-5.00000000,-5.00000000,2,1,NULL,1,NULL,3,NULL,NULL,NULL,0,0,'2020-12-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(13,'FA1212-0011',1,NULL,NULL,0,NULL,NULL,7,'2014-12-09 20:04:19','2020-12-09','2020-02-12',NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,2.74000000,0.00000000,0.00000000,0.00000000,14.00000000,16.74000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-12-09',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(32,'FA1212-0021',1,NULL,NULL,0,NULL,NULL,1,'2014-12-11 09:34:23','2019-12-11','2020-03-24',NULL,'2020-06-12 17:12:08',0,0.00000000,NULL,NULL,0,NULL,NULL,90.00000000,0.00000000,0.00000000,0.60000000,520.00000000,610.60000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2019-12-11','This is a comment (private)','This is a comment (public)','crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(33,'FA1212-0023',1,NULL,NULL,0,NULL,NULL,1,'2014-12-11 09:34:23','2019-12-11','2020-03-03',NULL,'2020-06-12 17:12:08',0,0.00000000,NULL,NULL,0,'abandon',NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,3,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2019-12-11','This is a comment (private)','This is a comment (public)','crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(55,'FA1212-0009',1,NULL,NULL,0,NULL,NULL,1,'2014-12-11 09:35:51','2019-12-11','2019-12-12',NULL,'2020-06-12 17:12:08',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2019-12-11','This is a comment (private)','This is a comment (public)','generic_invoice_odt:/home/ldestailleur/git/dolibarr_3.8/documents/doctemplates/invoices/template_invoice.odt',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(148,'FS1301-0001',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:22:48','2020-01-19','2020-01-19',NULL,'2020-06-12 17:12:09',0,0.00000000,NULL,NULL,0,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,1,'2020-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,'facture/FS1301-0001/FS1301-0001.pdf',NULL,NULL),(149,'FA1601-0024',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:30:05','2020-01-19','2019-08-29','2020-01-02 20:49:34','2020-06-12 17:12:09',0,0.00000000,NULL,NULL,0,'other','test',1.80000000,0.90000000,0.90000000,0.00000000,20.00000000,23.60000000,2,1,NULL,12,12,NULL,NULL,NULL,NULL,0,0,'2020-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,20.00000000,1.80000000,23.60000000,NULL,'facture/FA1601-0024/FA1601-0024.pdf',NULL,NULL),(150,'FA6801-0010',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:31:10','2020-01-19','2020-10-04',NULL,'2020-06-12 17:12:09',0,0.00000000,NULL,NULL,0,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,1,1,NULL,12,NULL,NULL,NULL,NULL,NULL,0,1,'2020-01-19',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,5.00000000,0.63000000,5.63000000,NULL,'facture/FA6801-0010/FA6801-0010.pdf',NULL,NULL),(151,'FS1301-0002',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:31:58','2020-01-19','2020-01-19',NULL,'2020-06-12 17:12:09',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,1,'2020-01-19',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(160,'FA1507-0015',1,NULL,NULL,0,NULL,NULL,12,'2015-03-06 16:47:48','2020-07-18','2019-03-06',NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,1.11000000,0.00000000,0.00000000,0.00000000,8.89000000,10.00000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-07-18',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(210,'FA1107-0019',1,NULL,NULL,0,NULL,NULL,10,'2015-03-20 14:30:11','2020-07-10','2020-03-20',NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-07-10',NULL,NULL,'generic_invoice_odt:/home/ldestailleur/git/dolibarr_3.8/documents/doctemplates/invoices/template_invoice.odt',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(211,'FA1303-0020',1,NULL,NULL,0,NULL,NULL,19,'2015-03-22 09:40:10','2020-03-22','2019-03-02',NULL,'2020-06-12 17:12:09',0,0.00000000,NULL,NULL,0,NULL,NULL,17.64000000,0.00000000,0.00000000,0.40000000,340.00000000,358.04000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,3,'2020-03-22',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(213,'AV1303-0003',1,NULL,NULL,2,NULL,NULL,1,'2016-03-03 19:22:03','2020-03-03','2019-03-03',NULL,'2020-06-12 17:12:09',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,-1000.00000000,-1000.00000000,1,1,NULL,1,NULL,32,NULL,NULL,NULL,0,0,'2020-03-03',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(216,'(PROV216)',1,NULL,NULL,0,NULL,NULL,26,'2017-02-12 23:21:27','2020-02-12',NULL,NULL,'2020-06-12 17:12:08',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2020-02-12',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,0,'',NULL,NULL,0,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL),(217,'(PROV217)',1,NULL,NULL,0,NULL,NULL,1,'2017-08-31 13:26:17','2020-08-31',NULL,NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,1.13000000,0.00000000,0.00000000,0.00000000,21.00000000,22.13000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2020-08-31',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,0,'',NULL,NULL,1,'EUR',1.00000000,21.00000000,1.13000000,22.13000000,NULL,'facture/(PROV217)/(PROV217).pdf',NULL,NULL),(218,'FA1909-0025',1,NULL,NULL,0,NULL,NULL,12,'2019-09-26 17:30:14','2020-09-26','2020-09-26',NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,1.08000000,0.00000000,0.00000000,0.00000000,42.50000000,43.58000000,1,12,NULL,12,NULL,NULL,NULL,NULL,NULL,0,0,'2020-09-26',NULL,NULL,'',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,0,'',NULL,NULL,0,'EUR',1.00000000,42.50000000,1.08000000,43.58000000,NULL,NULL,'takepos','1'),(219,'(PROV-POS1-0)',1,NULL,NULL,0,NULL,NULL,1,'2019-11-28 19:04:03','2020-11-28',NULL,NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,5.00000000,6.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,'2020-11-28',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'EUR',1.00000000,5.00000000,1.00000000,6.00000000,NULL,NULL,'takepos','1'),(220,'(PROV220)',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:03:17','2020-01-16',NULL,NULL,'2020-01-16 01:03:17',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,100.00000000,100.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2020-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,100.00000000,0.00000000,100.00000000,NULL,NULL,NULL,NULL),(221,'AC2001-0001',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:21:05','2020-01-16','2020-01-16',NULL,'2020-01-16 01:22:24',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,123.00000000,123.00000000,0,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2020-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,123.00000000,0.00000000,123.00000000,NULL,'facture/AC2001-0001/AC2001-0001.pdf',NULL,NULL),(222,'(PROV222)',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:21:28','2020-01-16',NULL,NULL,'2020-01-16 01:21:28',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,100.00000000,100.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2020-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,100.00000000,0.00000000,100.00000000,NULL,NULL,NULL,NULL),(223,'(PROV223)',1,NULL,NULL,0,NULL,NULL,19,'2020-01-16 02:32:04','2020-01-16',NULL,NULL,'2020-01-16 01:32:04',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,410.00000000,410.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,0,'2020-02-15',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,410.00000000,0.00000000,410.00000000,NULL,NULL,NULL,NULL),(224,'AC2001-0002',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:33:19','2020-01-16','2020-01-16','2020-01-16 02:36:48','2020-01-16 01:36:48',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,20.50000000,20.50000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2020-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,20.50000000,0.00000000,20.50000000,NULL,'facture/AC2001-0002/AC2001-0002.pdf',NULL,NULL),(225,'(PROV225)',1,NULL,NULL,0,NULL,NULL,19,'2020-01-16 02:37:48','2020-01-16',NULL,NULL,'2020-01-16 01:37:55',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,389.50000000,389.50000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,0,'2020-02-15',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,389.50000000,0.00000000,389.50000000,NULL,'facture/(PROV225)/(PROV225).pdf',NULL,NULL),(226,'(PROV226)',1,NULL,NULL,3,NULL,NULL,11,'2020-01-19 14:20:54','2020-01-19',NULL,NULL,'2020-01-19 13:21:21',0,0.00000000,NULL,NULL,0,NULL,NULL,12.50000000,0.00000000,0.00000000,0.00000000,120.00000000,132.50000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2020-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,120.00000000,12.50000000,132.50000000,NULL,'facture/(PROV226)/(PROV226).pdf',NULL,NULL),(227,'AC2001-0003',1,NULL,NULL,3,NULL,NULL,1,'2020-01-19 14:22:54','2020-01-19','2020-01-19',NULL,'2020-01-19 13:51:48',0,0.00000000,NULL,NULL,0,NULL,NULL,39.20000000,0.00000000,0.00000000,0.00000000,200.00000000,239.20000000,0,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2020-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,200.00000000,39.20000000,239.20000000,NULL,'facture/AC2001-0003/AC2001-0003.pdf',NULL,NULL),(228,'AC2001-0004',1,NULL,NULL,3,NULL,NULL,1,'2020-01-19 14:24:49','2020-01-19','2020-01-19',NULL,'2020-01-19 14:13:07',0,0.00000000,NULL,NULL,0,NULL,NULL,1.94000000,0.00000000,0.00000000,0.00000000,48.60000000,50.54000000,1,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2020-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,48.60000000,1.94000000,50.54000000,NULL,'facture/AC2001-0004/AC2001-0004.pdf',NULL,NULL),(229,'FA1707-0026',1,NULL,NULL,0,NULL,NULL,12,'2020-01-21 10:23:17','2020-07-18','2022-01-21','2020-01-21 10:23:17','2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2020-07-18',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,NULL,'facture/FA1707-0026/FA1707-0026.pdf',NULL,NULL),(230,'FA1807-0027',1,NULL,NULL,0,NULL,NULL,12,'2020-01-21 10:23:28','2020-07-18','2021-01-21','2020-01-21 10:23:28','2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2020-07-18',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,NULL,'facture/FA1807-0027/FA1807-0027.pdf',NULL,NULL),(231,'FA1907-0028',1,NULL,NULL,0,NULL,NULL,12,'2020-01-21 10:23:49','2020-07-18','2020-01-21','2020-01-21 10:23:49','2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2020-07-18',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,NULL,'facture/FA1907-0028/FA1907-0028.pdf',NULL,NULL);
 /*!40000 ALTER TABLE `llx_facture` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -6442,6 +7603,7 @@ CREATE TABLE `llx_facture_fourn` (
   `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `fk_incoterms` int(11) DEFAULT NULL,
   `location_incoterms` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_transport_mode` int(11) DEFAULT NULL,
   `fk_multicurrency` int(11) DEFAULT NULL,
   `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `multicurrency_tx` double(24,8) DEFAULT 1.00000000,
@@ -6472,7 +7634,7 @@ CREATE TABLE `llx_facture_fourn` (
 
 LOCK TABLES `llx_facture_fourn` WRITE;
 /*!40000 ALTER TABLE `llx_facture_fourn` DISABLE KEYS */;
-INSERT INTO `llx_facture_fourn` VALUES (16,'SI1601-0001','FR70813',1,NULL,0,1,'2014-12-19 15:24:11','2003-04-11','2017-02-06 04:08:22','OVH FR70813',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,829.00000000,162.48000000,991.48000000,1,1,NULL,12,NULL,NULL,NULL,1,NULL,'2003-04-11','','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(17,'SI1601-0002','FR81385',1,NULL,0,1,'2015-02-13 17:19:35','2003-06-04','2019-10-04 08:31:30','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,1,1,NULL,12,NULL,NULL,NULL,1,NULL,'2003-06-04','','','canelle',NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,'2019-10-04'),(18,'SI1601-0003','FR81385',1,NULL,0,2,'2015-02-13 17:20:25','2003-06-04','2017-02-06 04:08:35','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,0,1,NULL,NULL,NULL,NULL,NULL,1,NULL,'2003-06-04','','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(19,'SI1601-0004','FR813852',1,NULL,0,2,'2015-03-16 17:59:02','2015-03-16','2017-02-06 04:08:38','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,0,1,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,'','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(20,'SI1702-0001','INV-AE56ER08',1,NULL,0,13,'2017-02-01 19:00:31','2017-02-01','2017-02-01 15:05:28','',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,200.00000000,39.20000000,239.20000000,1,12,NULL,12,NULL,5,NULL,1,0,'2017-02-01','The customer has called us the 24th april. He agree us to not pay the remain of invoice due to default.<br />\r\nLet\'s see with our book keeper, if we must cancel invoice or ask the supplier a credit note...',NULL,'canelle',NULL,NULL,0,'',0,'EUR',1.00000000,200.00000000,39.20000000,239.20000000,NULL,NULL,NULL),(21,'SI1911-0005','NL-123',1,NULL,0,10,'2019-11-28 15:54:30','2019-11-28','2019-11-28 11:54:46','',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,450.00000000,0.00000000,450.00000000,1,12,NULL,12,NULL,NULL,NULL,1,NULL,'2019-11-28','','',NULL,NULL,NULL,0,'',1,'EUR',1.00000000,450.00000000,0.00000000,450.00000000,NULL,NULL,'2019-11-28'),(22,'SI2001-0006','INV20200101',1,NULL,0,17,'2020-01-01 17:48:01','2020-01-01','2020-01-16 17:05:43','',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,357.00000000,43.75000000,400.75000000,1,12,NULL,12,NULL,NULL,1,1,2,'2020-01-01','','',NULL,NULL,NULL,0,'',1,'EUR',1.00000000,357.00000000,43.75000000,400.75000000,NULL,NULL,'2020-01-16'),(27,'SA2001-0001','CN01',1,NULL,2,17,'2020-01-01 20:21:51','2020-01-01','2020-01-15 18:20:50','',1,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,-350.00000000,-43.75000000,-393.75000000,2,12,12,12,22,NULL,NULL,1,NULL,NULL,'','ddd',NULL,NULL,NULL,0,'',1,'EUR',1.00000000,350.00000000,43.75000000,393.75000000,NULL,NULL,'2020-01-01'),(28,'SI2001-0007','INV02',1,NULL,0,17,'2020-01-01 20:22:48','2020-01-01','2020-01-01 18:06:02','',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,79.17000000,9.89000000,89.06000000,1,12,NULL,12,NULL,NULL,NULL,1,NULL,'2020-01-01','','',NULL,NULL,NULL,0,'',1,'EUR',1.00000000,79.17000000,9.89000000,89.06000000,NULL,NULL,'2020-01-01'),(30,'SA2001-0002','555',1,NULL,2,1,'2020-01-01 20:51:32','2020-01-01','2020-01-01 17:15:57','',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,-26.00000000,-5.10000000,-31.10000000,1,12,NULL,12,17,NULL,NULL,1,NULL,NULL,'','',NULL,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,'2020-01-01');
+INSERT INTO `llx_facture_fourn` VALUES (16,'SI1601-0001','FR70813',1,NULL,0,1,'2014-12-19 15:24:11','2003-04-11','2017-02-06 04:08:22','OVH FR70813',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,829.00000000,162.48000000,991.48000000,1,1,NULL,12,NULL,NULL,NULL,1,NULL,'2003-04-11','','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(17,'SI1601-0002','FR81385',1,NULL,0,1,'2015-02-13 17:19:35','2003-06-04','2019-10-04 08:31:30','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,1,1,NULL,12,NULL,NULL,NULL,1,NULL,'2003-06-04','','','canelle',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,'2019-10-04'),(18,'SI1601-0003','FR81385',1,NULL,0,2,'2015-02-13 17:20:25','2003-06-04','2017-02-06 04:08:35','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,0,1,NULL,NULL,NULL,NULL,NULL,1,NULL,'2003-06-04','','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(19,'SI1601-0004','FR813852',1,NULL,0,2,'2015-03-16 17:59:02','2015-03-16','2017-02-06 04:08:38','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,0,1,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,'','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(20,'SI1702-0001','INV-AE56ER08',1,NULL,0,13,'2017-02-01 19:00:31','2017-02-01','2017-02-01 15:05:28','',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,200.00000000,39.20000000,239.20000000,1,12,NULL,12,NULL,5,NULL,1,0,'2017-02-01','The customer has called us the 24th april. He agree us to not pay the remain of invoice due to default.<br />\r\nLet\'s see with our book keeper, if we must cancel invoice or ask the supplier a credit note...',NULL,'canelle',NULL,NULL,0,'',NULL,0,'EUR',1.00000000,200.00000000,39.20000000,239.20000000,NULL,NULL,NULL),(21,'SI1911-0005','NL-123',1,NULL,0,10,'2019-11-28 15:54:30','2019-11-28','2019-11-28 11:54:46','',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,450.00000000,0.00000000,450.00000000,1,12,NULL,12,NULL,NULL,NULL,1,NULL,'2019-11-28','','',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,450.00000000,0.00000000,450.00000000,NULL,NULL,'2019-11-28'),(22,'SI2001-0006','INV20200101',1,NULL,0,17,'2020-01-01 17:48:01','2020-01-01','2020-01-16 17:05:43','',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,357.00000000,43.75000000,400.75000000,1,12,NULL,12,NULL,NULL,1,1,2,'2020-01-01','','',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,357.00000000,43.75000000,400.75000000,NULL,NULL,'2020-01-16'),(27,'SA2001-0001','CN01',1,NULL,2,17,'2020-01-01 20:21:51','2020-01-01','2020-01-15 18:20:50','',1,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,-350.00000000,-43.75000000,-393.75000000,2,12,12,12,22,NULL,NULL,1,NULL,NULL,'','ddd',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,350.00000000,43.75000000,393.75000000,NULL,NULL,'2020-01-01'),(28,'SI2001-0007','INV02',1,NULL,0,17,'2020-01-01 20:22:48','2020-01-01','2020-01-01 18:06:02','',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,79.17000000,9.89000000,89.06000000,1,12,NULL,12,NULL,NULL,NULL,1,NULL,'2020-01-01','','',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,79.17000000,9.89000000,89.06000000,NULL,NULL,'2020-01-01'),(30,'SA2001-0002','555',1,NULL,2,1,'2020-01-01 20:51:32','2020-01-01','2020-01-01 17:15:57','',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,-26.00000000,-5.10000000,-31.10000000,1,12,NULL,12,17,NULL,NULL,1,NULL,NULL,'','',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,'2020-01-01');
 /*!40000 ALTER TABLE `llx_facture_fourn` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -6745,6 +7907,7 @@ CREATE TABLE `llx_facturedet` (
   `multicurrency_total_ht` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_tva` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_ttc` double(24,8) DEFAULT 0.00000000,
+  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_fk_remise_except` (`fk_remise_except`,`fk_facture`),
   KEY `idx_facturedet_fk_facture` (`fk_facture`),
@@ -6762,7 +7925,7 @@ CREATE TABLE `llx_facturedet` (
 
 LOCK TABLES `llx_facturedet` WRITE;
 /*!40000 ALTER TABLE `llx_facturedet` DISABLE KEYS */;
-INSERT INTO `llx_facturedet` VALUES (3,2,NULL,3,NULL,'Service S1',0.000,'',0.000,'',0.000,'',1,10,4,NULL,40.00000000,36.00000000,36.00000000,0.00000000,0.00000000,0.00000000,36.00000000,1,'2012-07-10 00:00:00',NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(4,2,NULL,NULL,NULL,'Abonnement annuel assurance',1.000,'',0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,0.10000000,0.00000000,0.00000000,10.10000000,0,'2012-07-10 00:00:00','2013-07-10 00:00:00',0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(11,3,NULL,4,NULL,'afsdfsdfsdfsdf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,5.00000000,0.00000000,0.00000000,0.00000000,5.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(12,3,NULL,NULL,NULL,'dfdfd',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(13,5,NULL,4,NULL,'Decapsuleur',12.500,'',0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(14,6,NULL,4,NULL,'Decapsuleur',19.600,'',0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,5.00000000,0.98000000,0.00000000,0.00000000,5.98000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(21,8,NULL,NULL,NULL,'dddd',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(22,9,NULL,NULL,NULL,'ggg',19.600,'',0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(23,10,NULL,4,NULL,'',12.500,'',0.000,'',0.000,'',1,0,0,NULL,-5.00000000,NULL,-5.00000000,-0.63000000,0.00000000,0.00000000,-5.63000000,0,NULL,NULL,0,NULL,12.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(24,10,NULL,1,NULL,'A beatifull pink dress\r\nlkm',0.000,'',0.000,'',0.000,'',1,0,0,NULL,-6.00000000,NULL,-6.00000000,0.00000000,0.00000000,0.00000000,-6.00000000,0,NULL,NULL,0,0,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(26,12,NULL,1,NULL,'A beatifull pink dress\r\nhfghf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,-5.00000000,NULL,-5.00000000,0.00000000,0.00000000,0.00000000,-5.00000000,0,NULL,NULL,0,0,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(27,13,NULL,NULL,NULL,'gdfgdf',19.600,'',0.000,'',0.000,'',1.4,0,0,NULL,10.00000000,NULL,14.00000000,2.74000000,0.00000000,0.00000000,16.74000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(137,33,NULL,NULL,NULL,'Desc',10.000,'',0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(138,33,NULL,NULL,NULL,'Desc',10.000,'',0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(256,55,NULL,NULL,NULL,'Desc',10.000,'',0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(257,55,NULL,NULL,NULL,'Desc',10.000,'',0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(753,13,NULL,2,NULL,'(Pays d\'origine: Albanie)',0.000,'',0.000,'',0.000,'',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,0,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(754,148,NULL,11,NULL,'hfghf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(755,148,NULL,4,NULL,'Decapsuleur',12.500,'',0.000,'',0.000,'',1,0,0,NULL,5.00000000,NULL,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(757,150,NULL,2,NULL,'Product P1',12.500,'',0.000,'0',0.000,'0',1,0,0,NULL,5.00000000,NULL,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,NULL,NULL,NULL,5.00000000,5.00000000,0.63000000,5.63000000),(758,151,NULL,2,NULL,'Product P1',12.500,'',0.000,'',0.000,'',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(768,32,NULL,NULL,NULL,'mlml',18.000,'',0.000,'',0.000,'',1,0,0,NULL,100.00000000,NULL,100.00000000,18.00000000,0.00000000,0.00000000,118.00000000,0,NULL,NULL,0,NULL,46.00000000,0,0,3,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(769,32,NULL,NULL,NULL,'mlkml',18.000,'',0.000,'',0.000,'',1,0,0,NULL,400.00000000,NULL,400.00000000,72.00000000,0.00000000,0.00000000,472.00000000,0,NULL,NULL,0,NULL,300.00000000,0,0,4,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(772,160,NULL,NULL,NULL,'Adhésion/cotisation 2015',12.500,'',0.000,'',0.000,'',1,0,0,NULL,8.88889000,NULL,8.89000000,1.11000000,0.00000000,0.00000000,10.00000000,1,'2017-07-18 00:00:00','2018-07-17 00:00:00',0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(776,32,NULL,NULL,NULL,'fsdfsdfds',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,5,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(777,32,NULL,NULL,NULL,'fsdfsdfds',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,6,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(779,32,NULL,NULL,NULL,'fsdfds',0.000,'',0.000,'0',0.000,'0',0,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,9,NULL,NULL,0,0,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(780,32,NULL,NULL,NULL,'ffsdf',0.000,'',0.000,'0',0.000,'0',0,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,9,NULL,NULL,0,NULL,0.00000000,0,1790,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(1022,210,NULL,NULL,NULL,'Adhésion/cotisation 2011',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,1,'2013-07-10 00:00:00','2014-07-09 00:00:00',0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(1023,211,NULL,NULL,NULL,'Samsung Android x4',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,250.00000000,NULL,250.00000000,0.00000000,0.00000000,0.00000000,250.00000000,0,NULL,NULL,0,NULL,200.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(1024,211,NULL,1,NULL,'A beatifull pink dress\r\nSize XXL',19.600,'',0.000,'0',0.000,'0',1,10,0,NULL,100.00000000,NULL,90.00000000,17.64000000,0.00000000,0.00000000,107.64000000,0,NULL,NULL,0,NULL,90.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(1026,213,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',10,0,0,NULL,-100.00000000,NULL,-1000.00000000,0.00000000,0.00000000,0.00000000,-1000.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(1028,149,NULL,NULL,NULL,'opoo',0.000,'CGST+SGST',9.000,'1',9.000,'1',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.90000000,0.90000000,11.80000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,0,'',10.00000000,10.00000000,0.00000000,11.80000000),(1029,149,NULL,NULL,NULL,'gdgd',18.000,'IGST',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,1.80000000,0.00000000,0.00000000,11.80000000,0,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,12,12,0,'',10.00000000,10.00000000,1.80000000,11.80000000),(1030,217,NULL,NULL,NULL,'gfdgdf',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,12.00000000,NULL,12.00000000,0.00000000,0.00000000,0.00000000,12.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',12.00000000,12.00000000,0.00000000,12.00000000),(1035,218,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9.00000000,NULL,9.00000000,0.00000000,0.00000000,0.00000000,9.00000000,1,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',9.00000000,9.00000000,0.00000000,9.00000000),(1036,218,NULL,5,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',19.600,'',0.000,'0',0.000,'0',1,45,0,NULL,10.00000000,NULL,5.50000000,1.08000000,0.00000000,0.00000000,6.58000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',10.00000000,5.50000000,1.08000000,6.58000000),(1037,218,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9.00000000,NULL,9.00000000,0.00000000,0.00000000,0.00000000,9.00000000,1,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',9.00000000,9.00000000,0.00000000,9.00000000),(1039,218,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9.00000000,NULL,9.00000000,0.00000000,0.00000000,0.00000000,9.00000000,1,NULL,NULL,0,NULL,0.00000000,0,0,4,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',9.00000000,9.00000000,0.00000000,9.00000000),(1040,218,NULL,NULL,NULL,'aaa',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,5,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',10.00000000,10.00000000,0.00000000,10.00000000),(1055,220,NULL,NULL,NULL,'(DEPOSIT) (100.00 €) - CO7001-0018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100.00000000,NULL,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,100.00000000,0.00000000,100.00000000),(1056,221,NULL,NULL,NULL,'(DEPOSIT) (30%) - CO7001-0018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,123.00000000,NULL,123.00000000,0.00000000,0.00000000,0.00000000,123.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',123.00000000,123.00000000,0.00000000,123.00000000),(1057,222,NULL,NULL,NULL,'(DEPOSIT) (100.00 €) - CO7001-0018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100.00000000,NULL,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,100.00000000,0.00000000,100.00000000),(1058,223,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(1059,223,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100.00000000,NULL,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(1060,223,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100.00000000,NULL,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(1061,224,NULL,NULL,NULL,'(DEPOSIT) (5%) - CO7001-0018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,20.50000000,NULL,20.50000000,0.00000000,0.00000000,0.00000000,20.50000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',20.50000000,20.50000000,0.00000000,20.50000000),(1062,225,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',5.00000000,10.00000000,0.00000000,10.00000000),(1063,225,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100.00000000,NULL,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(1064,225,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100.00000000,NULL,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,200.00000000,0.00000000,200.00000000),(1065,225,NULL,NULL,NULL,'(DEPOSIT)',0.000,'',0.000,'0',0.000,'0',1,0,0,15,-20.50000000,NULL,-20.50000000,0.00000000,0.00000000,0.00000000,-20.50000000,0,NULL,NULL,2,NULL,0.00000000,0,0,-1,NULL,NULL,100,NULL,NULL,12,12,0,'',-20.50000000,-20.50000000,0.00000000,-20.50000000),(1066,226,NULL,NULL,NULL,'aaa',12.500,'',0.000,'0',0.000,'0',1,0,0,NULL,100.00000000,NULL,100.00000000,12.50000000,0.00000000,0.00000000,112.50000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,100.00000000,12.50000000,112.50000000),(1067,226,NULL,NULL,NULL,'bbb',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,20.00000000,NULL,20.00000000,0.00000000,0.00000000,0.00000000,20.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',20.00000000,20.00000000,0.00000000,20.00000000),(1069,228,NULL,NULL,NULL,'(DEPOSIT) (70%) - PR2001-0034',4.000,'',0.000,'0',0.000,'0',1,0,0,NULL,50.00000000,NULL,50.00000000,2.00000000,0.00000000,0.00000000,52.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',50.00000000,50.00000000,2.00000000,52.00000000),(1070,228,NULL,NULL,NULL,'(DEPOSIT) (70%) - PR2001-0034',4.000,'',0.000,'0',0.000,'0',1,0,0,NULL,-1.40000000,NULL,-1.40000000,-0.06000000,0.00000000,0.00000000,-1.46000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',-1.40000000,-1.40000000,-0.06000000,-1.46000000),(1071,227,NULL,NULL,NULL,'gdfgd',19.600,'',0.000,'0',0.000,'0',1,0,0,NULL,200.00000000,NULL,200.00000000,39.20000000,0.00000000,0.00000000,239.20000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',200.00000000,200.00000000,39.20000000,239.20000000),(1072,217,NULL,1,NULL,'A beatifull pink dress',12.500,'',0.000,'0',0.000,'0',1,0,0,NULL,9.00000000,NULL,9.00000000,1.13000000,0.00000000,0.00000000,10.13000000,0,NULL,NULL,0,NULL,79.16667000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',9.00000000,9.00000000,1.13000000,10.13000000),(1074,219,NULL,30,NULL,'',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,4.16667000,NULL,4.17000000,0.83000000,0.00000000,0.00000000,5.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,5,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',4.16667000,4.17000000,0.83000000,5.00000000),(1089,219,NULL,24,NULL,'',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0.83333000,NULL,0.83000000,0.17000000,0.00000000,0.00000000,1.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,20,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',0.83333000,0.83000000,0.17000000,1.00000000),(1090,229,NULL,NULL,NULL,'Subscription 2017',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,50.00000000,NULL,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,1,'2017-07-18 00:00:00',NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',50.00000000,50.00000000,0.00000000,50.00000000),(1091,230,NULL,NULL,NULL,'Subscription 2018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,50.00000000,NULL,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,1,'2018-07-18 00:00:00',NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',50.00000000,50.00000000,0.00000000,50.00000000),(1092,231,NULL,NULL,NULL,'Subscription 2019',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,50.00000000,NULL,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,1,'2019-07-18 00:00:00',NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',50.00000000,50.00000000,0.00000000,50.00000000);
+INSERT INTO `llx_facturedet` VALUES (3,2,NULL,3,NULL,'Service S1',0.000,'',0.000,'',0.000,'',1,10,4,NULL,40.00000000,36.00000000,36.00000000,0.00000000,0.00000000,0.00000000,36.00000000,1,'2012-07-10 00:00:00',NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(4,2,NULL,NULL,NULL,'Abonnement annuel assurance',1.000,'',0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,0.10000000,0.00000000,0.00000000,10.10000000,0,'2012-07-10 00:00:00','2013-07-10 00:00:00',0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(11,3,NULL,4,NULL,'afsdfsdfsdfsdf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,5.00000000,0.00000000,0.00000000,0.00000000,5.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(12,3,NULL,NULL,NULL,'dfdfd',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(13,5,NULL,4,NULL,'Decapsuleur',12.500,'',0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(14,6,NULL,4,NULL,'Decapsuleur',19.600,'',0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,5.00000000,0.98000000,0.00000000,0.00000000,5.98000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(21,8,NULL,NULL,NULL,'dddd',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(22,9,NULL,NULL,NULL,'ggg',19.600,'',0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(23,10,NULL,4,NULL,'',12.500,'',0.000,'',0.000,'',1,0,0,NULL,-5.00000000,NULL,-5.00000000,-0.63000000,0.00000000,0.00000000,-5.63000000,0,NULL,NULL,0,NULL,12.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(24,10,NULL,1,NULL,'A beatifull pink dress\r\nlkm',0.000,'',0.000,'',0.000,'',1,0,0,NULL,-6.00000000,NULL,-6.00000000,0.00000000,0.00000000,0.00000000,-6.00000000,0,NULL,NULL,0,0,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(26,12,NULL,1,NULL,'A beatifull pink dress\r\nhfghf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,-5.00000000,NULL,-5.00000000,0.00000000,0.00000000,0.00000000,-5.00000000,0,NULL,NULL,0,0,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(27,13,NULL,NULL,NULL,'gdfgdf',19.600,'',0.000,'',0.000,'',1.4,0,0,NULL,10.00000000,NULL,14.00000000,2.74000000,0.00000000,0.00000000,16.74000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(137,33,NULL,NULL,NULL,'Desc',10.000,'',0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(138,33,NULL,NULL,NULL,'Desc',10.000,'',0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(256,55,NULL,NULL,NULL,'Desc',10.000,'',0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(257,55,NULL,NULL,NULL,'Desc',10.000,'',0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(753,13,NULL,2,NULL,'(Pays d\'origine: Albanie)',0.000,'',0.000,'',0.000,'',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,0,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(754,148,NULL,11,NULL,'hfghf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(755,148,NULL,4,NULL,'Decapsuleur',12.500,'',0.000,'',0.000,'',1,0,0,NULL,5.00000000,NULL,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(757,150,NULL,2,NULL,'Product P1',12.500,'',0.000,'0',0.000,'0',1,0,0,NULL,5.00000000,NULL,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,NULL,NULL,NULL,5.00000000,5.00000000,0.63000000,5.63000000,NULL),(758,151,NULL,2,NULL,'Product P1',12.500,'',0.000,'',0.000,'',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(768,32,NULL,NULL,NULL,'mlml',18.000,'',0.000,'',0.000,'',1,0,0,NULL,100.00000000,NULL,100.00000000,18.00000000,0.00000000,0.00000000,118.00000000,0,NULL,NULL,0,NULL,46.00000000,0,0,3,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(769,32,NULL,NULL,NULL,'mlkml',18.000,'',0.000,'',0.000,'',1,0,0,NULL,400.00000000,NULL,400.00000000,72.00000000,0.00000000,0.00000000,472.00000000,0,NULL,NULL,0,NULL,300.00000000,0,0,4,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(772,160,NULL,NULL,NULL,'Adhésion/cotisation 2015',12.500,'',0.000,'',0.000,'',1,0,0,NULL,8.88889000,NULL,8.89000000,1.11000000,0.00000000,0.00000000,10.00000000,1,'2017-07-18 00:00:00','2018-07-17 00:00:00',0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(776,32,NULL,NULL,NULL,'fsdfsdfds',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,5,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(777,32,NULL,NULL,NULL,'fsdfsdfds',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,6,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(779,32,NULL,NULL,NULL,'fsdfds',0.000,'',0.000,'0',0.000,'0',0,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,9,NULL,NULL,0,0,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(780,32,NULL,NULL,NULL,'ffsdf',0.000,'',0.000,'0',0.000,'0',0,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,9,NULL,NULL,0,NULL,0.00000000,0,1790,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(1022,210,NULL,NULL,NULL,'Adhésion/cotisation 2011',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,1,'2013-07-10 00:00:00','2014-07-09 00:00:00',0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(1023,211,NULL,NULL,NULL,'Samsung Android x4',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,250.00000000,NULL,250.00000000,0.00000000,0.00000000,0.00000000,250.00000000,0,NULL,NULL,0,NULL,200.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(1024,211,NULL,1,NULL,'A beatifull pink dress\r\nSize XXL',19.600,'',0.000,'0',0.000,'0',1,10,0,NULL,100.00000000,NULL,90.00000000,17.64000000,0.00000000,0.00000000,107.64000000,0,NULL,NULL,0,NULL,90.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(1026,213,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',10,0,0,NULL,-100.00000000,NULL,-1000.00000000,0.00000000,0.00000000,0.00000000,-1000.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(1028,149,NULL,NULL,NULL,'opoo',0.000,'CGST+SGST',9.000,'1',9.000,'1',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.90000000,0.90000000,11.80000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,0,'',10.00000000,10.00000000,0.00000000,11.80000000,NULL),(1029,149,NULL,NULL,NULL,'gdgd',18.000,'IGST',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,1.80000000,0.00000000,0.00000000,11.80000000,0,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,12,12,0,'',10.00000000,10.00000000,1.80000000,11.80000000,NULL),(1030,217,NULL,NULL,NULL,'gfdgdf',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,12.00000000,NULL,12.00000000,0.00000000,0.00000000,0.00000000,12.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',12.00000000,12.00000000,0.00000000,12.00000000,NULL),(1035,218,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9.00000000,NULL,9.00000000,0.00000000,0.00000000,0.00000000,9.00000000,1,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',9.00000000,9.00000000,0.00000000,9.00000000,NULL),(1036,218,NULL,5,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',19.600,'',0.000,'0',0.000,'0',1,45,0,NULL,10.00000000,NULL,5.50000000,1.08000000,0.00000000,0.00000000,6.58000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',10.00000000,5.50000000,1.08000000,6.58000000,NULL),(1037,218,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9.00000000,NULL,9.00000000,0.00000000,0.00000000,0.00000000,9.00000000,1,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',9.00000000,9.00000000,0.00000000,9.00000000,NULL),(1039,218,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9.00000000,NULL,9.00000000,0.00000000,0.00000000,0.00000000,9.00000000,1,NULL,NULL,0,NULL,0.00000000,0,0,4,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',9.00000000,9.00000000,0.00000000,9.00000000,NULL),(1040,218,NULL,NULL,NULL,'aaa',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,5,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',10.00000000,10.00000000,0.00000000,10.00000000,NULL),(1055,220,NULL,NULL,NULL,'(DEPOSIT) (100.00 €) - CO7001-0018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100.00000000,NULL,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,100.00000000,0.00000000,100.00000000,NULL),(1056,221,NULL,NULL,NULL,'(DEPOSIT) (30%) - CO7001-0018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,123.00000000,NULL,123.00000000,0.00000000,0.00000000,0.00000000,123.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',123.00000000,123.00000000,0.00000000,123.00000000,NULL),(1057,222,NULL,NULL,NULL,'(DEPOSIT) (100.00 €) - CO7001-0018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100.00000000,NULL,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,100.00000000,0.00000000,100.00000000,NULL),(1058,223,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',5.00000000,10.00000000,0.00000000,10.00000000,NULL),(1059,223,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100.00000000,NULL,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,200.00000000,0.00000000,200.00000000,NULL),(1060,223,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100.00000000,NULL,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,200.00000000,0.00000000,200.00000000,NULL),(1061,224,NULL,NULL,NULL,'(DEPOSIT) (5%) - CO7001-0018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,20.50000000,NULL,20.50000000,0.00000000,0.00000000,0.00000000,20.50000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',20.50000000,20.50000000,0.00000000,20.50000000,NULL),(1062,225,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',5.00000000,10.00000000,0.00000000,10.00000000,NULL),(1063,225,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100.00000000,NULL,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,200.00000000,0.00000000,200.00000000,NULL),(1064,225,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100.00000000,NULL,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,200.00000000,0.00000000,200.00000000,NULL),(1065,225,NULL,NULL,NULL,'(DEPOSIT)',0.000,'',0.000,'0',0.000,'0',1,0,0,15,-20.50000000,NULL,-20.50000000,0.00000000,0.00000000,0.00000000,-20.50000000,0,NULL,NULL,2,NULL,0.00000000,0,0,-1,NULL,NULL,100,NULL,NULL,12,12,0,'',-20.50000000,-20.50000000,0.00000000,-20.50000000,NULL),(1066,226,NULL,NULL,NULL,'aaa',12.500,'',0.000,'0',0.000,'0',1,0,0,NULL,100.00000000,NULL,100.00000000,12.50000000,0.00000000,0.00000000,112.50000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,100.00000000,12.50000000,112.50000000,NULL),(1067,226,NULL,NULL,NULL,'bbb',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,20.00000000,NULL,20.00000000,0.00000000,0.00000000,0.00000000,20.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',20.00000000,20.00000000,0.00000000,20.00000000,NULL),(1069,228,NULL,NULL,NULL,'(DEPOSIT) (70%) - PR2001-0034',4.000,'',0.000,'0',0.000,'0',1,0,0,NULL,50.00000000,NULL,50.00000000,2.00000000,0.00000000,0.00000000,52.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',50.00000000,50.00000000,2.00000000,52.00000000,NULL),(1070,228,NULL,NULL,NULL,'(DEPOSIT) (70%) - PR2001-0034',4.000,'',0.000,'0',0.000,'0',1,0,0,NULL,-1.40000000,NULL,-1.40000000,-0.06000000,0.00000000,0.00000000,-1.46000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',-1.40000000,-1.40000000,-0.06000000,-1.46000000,NULL),(1071,227,NULL,NULL,NULL,'gdfgd',19.600,'',0.000,'0',0.000,'0',1,0,0,NULL,200.00000000,NULL,200.00000000,39.20000000,0.00000000,0.00000000,239.20000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',200.00000000,200.00000000,39.20000000,239.20000000,NULL),(1072,217,NULL,1,NULL,'A beatifull pink dress',12.500,'',0.000,'0',0.000,'0',1,0,0,NULL,9.00000000,NULL,9.00000000,1.13000000,0.00000000,0.00000000,10.13000000,0,NULL,NULL,0,NULL,79.16667000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',9.00000000,9.00000000,1.13000000,10.13000000,NULL),(1074,219,NULL,30,NULL,'',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,4.16667000,NULL,4.17000000,0.83000000,0.00000000,0.00000000,5.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,5,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',4.16667000,4.17000000,0.83000000,5.00000000,NULL),(1089,219,NULL,24,NULL,'',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,0.83333000,NULL,0.83000000,0.17000000,0.00000000,0.00000000,1.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,20,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',0.83333000,0.83000000,0.17000000,1.00000000,NULL),(1090,229,NULL,NULL,NULL,'Subscription 2017',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,50.00000000,NULL,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,1,'2017-07-18 00:00:00',NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',50.00000000,50.00000000,0.00000000,50.00000000,NULL),(1091,230,NULL,NULL,NULL,'Subscription 2018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,50.00000000,NULL,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,1,'2018-07-18 00:00:00',NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',50.00000000,50.00000000,0.00000000,50.00000000,NULL),(1092,231,NULL,NULL,NULL,'Subscription 2019',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,50.00000000,NULL,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,1,'2019-07-18 00:00:00',NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',50.00000000,50.00000000,0.00000000,50.00000000,NULL);
 /*!40000 ALTER TABLE `llx_facturedet` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -6883,6 +8046,60 @@ LOCK TABLES `llx_facturedet_rec_extrafields` WRITE;
 /*!40000 ALTER TABLE `llx_facturedet_rec_extrafields` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_facturx_myobject`
+--
+
+DROP TABLE IF EXISTS `llx_facturx_myobject`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_facturx_myobject` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `qty` int(11) DEFAULT NULL,
+  `status` int(11) DEFAULT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_facturx_myobject`
+--
+
+LOCK TABLES `llx_facturx_myobject` WRITE;
+/*!40000 ALTER TABLE `llx_facturx_myobject` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_facturx_myobject` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_facturx_myobject_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_facturx_myobject_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_facturx_myobject_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_facturx_myobject_extrafields`
+--
+
+LOCK TABLES `llx_facturx_myobject_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_facturx_myobject_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_facturx_myobject_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_fichinter`
 --
@@ -7201,7 +8418,7 @@ CREATE TABLE `llx_holiday_config` (
 
 LOCK TABLES `llx_holiday_config` WRITE;
 /*!40000 ALTER TABLE `llx_holiday_config` DISABLE KEYS */;
-INSERT INTO `llx_holiday_config` VALUES (1,'userGroup','1'),(2,'lastUpdate','20200108222504'),(3,'nbUser',''),(4,'delayForRequest','31'),(5,'AlertValidatorDelay','0'),(6,'AlertValidatorSolde','0'),(7,'nbHolidayDeducted','1'),(8,'nbHolidayEveryMonth','2.08334');
+INSERT INTO `llx_holiday_config` VALUES (1,'userGroup','1'),(2,'lastUpdate','20201210132924'),(3,'nbUser',''),(4,'delayForRequest','31'),(5,'AlertValidatorDelay','0'),(6,'AlertValidatorSolde','0'),(7,'nbHolidayDeducted','1'),(8,'nbHolidayEveryMonth','2.08334');
 /*!40000 ALTER TABLE `llx_holiday_config` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -7314,6 +8531,37 @@ INSERT INTO `llx_import_model` VALUES (1,12,'Import profile 1','user_1','1=u.log
 /*!40000 ALTER TABLE `llx_import_model` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_intracommreport`
+--
+
+DROP TABLE IF EXISTS `llx_intracommreport`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_intracommreport` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(30) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `type_declaration` varchar(32) DEFAULT NULL,
+  `period` varchar(32) DEFAULT NULL,
+  `mode` varchar(32) DEFAULT NULL,
+  `content_xml` text DEFAULT NULL,
+  `type_export` varchar(10) DEFAULT NULL,
+  `datec` datetime DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_intracommreport`
+--
+
+LOCK TABLES `llx_intracommreport` WRITE;
+/*!40000 ALTER TABLE `llx_intracommreport` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_intracommreport` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_inventory`
 --
@@ -7405,6 +8653,7 @@ CREATE TABLE `llx_inventorydet` (
   `qty_stock` double DEFAULT NULL,
   `qty_regulated` double DEFAULT NULL,
   PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_inventorydet` (`fk_inventory`,`fk_warehouse`,`fk_product`,`batch`),
   KEY `idx_inventorydet_tms` (`tms`),
   KEY `idx_inventorydet_datec` (`datec`),
   KEY `idx_inventorydet_fk_inventory` (`fk_inventory`)
@@ -7521,142 +8770,6 @@ INSERT INTO `llx_links` VALUES (1,1,'2018-01-16 16:45:35','http://www.dolicloud.
 /*!40000 ALTER TABLE `llx_links` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_livraison`
---
-
-DROP TABLE IF EXISTS `llx_livraison`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_livraison` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `ref` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
-  `entity` int(11) NOT NULL DEFAULT 1,
-  `ref_customer` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fk_soc` int(11) NOT NULL,
-  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_int` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `date_creation` datetime DEFAULT NULL,
-  `fk_user_author` int(11) DEFAULT NULL,
-  `date_valid` datetime DEFAULT NULL,
-  `fk_user_valid` int(11) DEFAULT NULL,
-  `date_delivery` datetime DEFAULT NULL,
-  `fk_address` int(11) DEFAULT NULL,
-  `fk_statut` smallint(6) DEFAULT 0,
-  `total_ht` double(24,8) DEFAULT 0.00000000,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fk_incoterms` int(11) DEFAULT NULL,
-  `location_incoterms` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `last_main_doc` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`rowid`),
-  UNIQUE KEY `idx_livraison_uk_ref` (`ref`,`entity`),
-  KEY `idx_livraison_fk_soc` (`fk_soc`),
-  KEY `idx_livraison_fk_user_author` (`fk_user_author`),
-  KEY `idx_livraison_fk_user_valid` (`fk_user_valid`),
-  CONSTRAINT `fk_livraison_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
-  CONSTRAINT `fk_livraison_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`),
-  CONSTRAINT `fk_livraison_fk_user_valid` FOREIGN KEY (`fk_user_valid`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_livraison`
---
-
-LOCK TABLES `llx_livraison` WRITE;
-/*!40000 ALTER TABLE `llx_livraison` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_livraison` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_livraison_extrafields`
---
-
-DROP TABLE IF EXISTS `llx_livraison_extrafields`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_livraison_extrafields` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `fk_object` int(11) NOT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`rowid`),
-  KEY `idx_livraison_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_livraison_extrafields`
---
-
-LOCK TABLES `llx_livraison_extrafields` WRITE;
-/*!40000 ALTER TABLE `llx_livraison_extrafields` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_livraison_extrafields` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_livraisondet`
---
-
-DROP TABLE IF EXISTS `llx_livraisondet`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_livraisondet` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `fk_livraison` int(11) DEFAULT NULL,
-  `fk_origin_line` int(11) DEFAULT NULL,
-  `fk_product` int(11) DEFAULT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `qty` double DEFAULT NULL,
-  `subprice` double(24,8) DEFAULT 0.00000000,
-  `total_ht` double(24,8) DEFAULT 0.00000000,
-  `rang` int(11) DEFAULT 0,
-  PRIMARY KEY (`rowid`),
-  KEY `idx_livraisondet_fk_expedition` (`fk_livraison`),
-  CONSTRAINT `fk_livraisondet_fk_livraison` FOREIGN KEY (`fk_livraison`) REFERENCES `llx_livraison` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_livraisondet`
---
-
-LOCK TABLES `llx_livraisondet` WRITE;
-/*!40000 ALTER TABLE `llx_livraisondet` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_livraisondet` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_livraisondet_extrafields`
---
-
-DROP TABLE IF EXISTS `llx_livraisondet_extrafields`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_livraisondet_extrafields` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `fk_object` int(11) NOT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`rowid`),
-  KEY `idx_livraisondet_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_livraisondet_extrafields`
---
-
-LOCK TABLES `llx_livraisondet_extrafields` WRITE;
-/*!40000 ALTER TABLE `llx_livraisondet_extrafields` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_livraisondet_extrafields` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_loan`
 --
@@ -7726,6 +8839,7 @@ CREATE TABLE `llx_loan_schedule` (
   `fk_bank` int(11) NOT NULL,
   `fk_user_creat` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
+  `fk_payment_loan` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -7914,13 +9028,13 @@ CREATE TABLE `llx_menu` (
   `level` smallint(6) DEFAULT NULL,
   `leftmenu` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
   `perms` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `enabled` varchar(255) COLLATE utf8_unicode_ci DEFAULT '1',
+  `enabled` text COLLATE utf8_unicode_ci DEFAULT NULL,
   `usertype` int(11) NOT NULL DEFAULT 0,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `idx_menu_uk_menu` (`menu_handler`,`fk_menu`,`position`,`url`,`entity`),
   KEY `idx_menu_menuhandler_type` (`menu_handler`,`type`)
-) ENGINE=InnoDB AUTO_INCREMENT=167003 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=167038 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7929,7 +9043,7 @@ CREATE TABLE `llx_menu` (
 
 LOCK TABLES `llx_menu` WRITE;
 /*!40000 ALTER TABLE `llx_menu` DISABLE KEYS */;
-INSERT INTO `llx_menu` VALUES (103094,'all',2,'agenda','top','agenda',0,NULL,NULL,100,'/comm/action/index.php','','Agenda','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103095,'all',2,'agenda','left','agenda',103094,NULL,NULL,100,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Actions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103096,'all',2,'agenda','left','agenda',103095,NULL,NULL,101,'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create','','NewAction','commercial',NULL,NULL,'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103097,'all',2,'agenda','left','agenda',103095,NULL,NULL,102,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Calendar','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103098,'all',2,'agenda','left','agenda',103097,NULL,NULL,103,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103099,'all',2,'agenda','left','agenda',103097,NULL,NULL,104,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103100,'all',2,'agenda','left','agenda',103097,NULL,NULL,105,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103101,'all',2,'agenda','left','agenda',103097,NULL,NULL,106,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103102,'all',2,'agenda','left','agenda',103095,NULL,NULL,112,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda','','List','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103103,'all',2,'agenda','left','agenda',103102,NULL,NULL,113,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103104,'all',2,'agenda','left','agenda',103102,NULL,NULL,114,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103105,'all',2,'agenda','left','agenda',103102,NULL,NULL,115,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103106,'all',2,'agenda','left','agenda',103102,NULL,NULL,116,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103107,'all',2,'agenda','left','agenda',103095,NULL,NULL,120,'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Reportings','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103134,'all',2,'opensurvey','top','opensurvey',0,NULL,NULL,200,'/opensurvey/index.php','','Surveys','opensurvey',NULL,NULL,'$user->rights->opensurvey->survey->read','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(103135,'all',2,'opensurvey','left','opensurvey',-1,NULL,'opensurvey',200,'/opensurvey/index.php?mainmenu=opensurvey&leftmenu=opensurvey','','Survey','opensurvey@opensurvey',NULL,'opensurvey','','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(103136,'all',2,'opensurvey','left','opensurvey',-1,'opensurvey','opensurvey',210,'/opensurvey/public/index.php','_blank','NewSurvey','opensurvey@opensurvey',NULL,'opensurvey_new','','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(103137,'all',2,'opensurvey','left','opensurvey',-1,'opensurvey','opensurvey',220,'/opensurvey/list.php','','List','opensurvey@opensurvey',NULL,'opensurvey_list','','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(145127,'all',1,'printing','left','home',-1,'admintools','home',300,'/printing/index.php?mainmenu=home&leftmenu=admintools','','MenuDirectPrinting','printing',NULL,NULL,'$user->rights->printing->read','$conf->printing->enabled && $leftmenu==\'admintools\'',0,'2017-01-29 15:12:44'),(161088,'auguria',1,'','top','home',0,NULL,NULL,10,'/index.php?mainmenu=home&amp;leftmenu=','','Home','',-1,'','','1',2,'2017-08-30 15:14:30'),(161089,'auguria',1,'societe|fournisseur','top','companies',0,NULL,NULL,20,'/societe/index.php?mainmenu=companies&amp;leftmenu=','','ThirdParties','companies',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)',2,'2017-08-30 15:14:30'),(161090,'auguria',1,'product|service','top','products',0,NULL,NULL,30,'/product/index.php?mainmenu=products&amp;leftmenu=','','Products/Services','products',-1,'','$user->rights->produit->lire||$user->rights->service->lire','$conf->product->enabled || $conf->service->enabled',0,'2017-08-30 15:14:30'),(161092,'auguria',1,'propal|commande|fournisseur|contrat|ficheinter','top','commercial',0,NULL,NULL,40,'/comm/index.php?mainmenu=commercial&amp;leftmenu=','','Commercial','commercial',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','$conf->propal->enabled || $conf->commande->enabled || $conf->supplier_order->enabled || $conf->contrat->enabled || $conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(161093,'auguria',1,'comptabilite|accounting|facture|don|tax|salaries|loan','top','accountancy',0,NULL,NULL,50,'/compta/index.php?mainmenu=accountancy&amp;leftmenu=','','MenuFinancial','compta',-1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->facture->lire|| $user->rights->don->lire || $user->rights->tax->charges->lire || $user->rights->salaries->read || $user->rights->loan->read','$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->don->enabled  || $conf->tax->enabled || $conf->salaries->enabled || $conf->supplier_invoice->enabled || $conf->loan->enabled',2,'2017-08-30 15:14:30'),(161094,'auguria',1,'projet','top','project',0,NULL,NULL,70,'/projet/index.php?mainmenu=project&amp;leftmenu=','','Projects','projects',-1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(161095,'auguria',1,'mailing|export|import|opensurvey|resource','top','tools',0,NULL,NULL,90,'/core/tools.php?mainmenu=tools&amp;leftmenu=','','Tools','other',-1,'','$user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run || $user->rights->opensurvey->read || $user->rights->resource->read','$conf->mailing->enabled || $conf->export->enabled || $conf->import->enabled || $conf->opensurvey->enabled || $conf->resource->enabled',2,'2017-08-30 15:14:30'),(161101,'auguria',1,'banque|prelevement','top','bank',0,NULL,NULL,60,'/compta/bank/index.php?mainmenu=bank&amp;leftmenu=bank','','MenuBankCash','banks',-1,'','$user->rights->banque->lire || $user->rights->prelevement->bons->lire','$conf->banque->enabled || $conf->prelevement->enabled',0,'2017-08-30 15:14:30'),(161102,'auguria',1,'hrm|holiday|deplacement|expensereport','top','hrm',0,NULL,NULL,80,'/hrm/index.php?mainmenu=hrm&amp;leftmenu=','','HRM','holiday',-1,'','$user->rights->hrm->employee->read || $user->rights->holiday->write || $user->rights->deplacement->lire || $user->rights->expensereport->lire','$conf->hrm->enabled || $conf->holiday->enabled || $conf->deplacement->enabled || $conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(161177,'auguria',1,'','left','home',161088,NULL,NULL,0,'/index.php','','MyDashboard','',0,'','','1',2,'2017-08-30 15:14:30'),(161187,'auguria',1,'','left','home',161088,NULL,NULL,1,'/admin/index.php?leftmenu=setup','','Setup','admin',0,'setup','','$user->admin',2,'2017-08-30 15:14:30'),(161188,'auguria',1,'','left','home',161187,NULL,NULL,1,'/admin/company.php?leftmenu=setup','','MenuCompanySetup','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161189,'auguria',1,'','left','home',161187,NULL,NULL,4,'/admin/ihm.php?leftmenu=setup','','GUISetup','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161190,'auguria',1,'','left','home',161187,NULL,NULL,2,'/admin/modules.php?leftmenu=setup','','Modules','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161191,'auguria',1,'','left','home',161187,NULL,NULL,6,'/admin/boxes.php?leftmenu=setup','','Boxes','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161192,'auguria',1,'','left','home',161187,NULL,NULL,3,'/admin/menus.php?leftmenu=setup','','Menus','admin',1,'','','$leftmenu==\'setup\'',2,'2017-09-06 08:29:47'),(161193,'auguria',1,'','left','home',161187,NULL,NULL,7,'/admin/delais.php?leftmenu=setup','','Alerts','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161194,'auguria',1,'','left','home',161187,NULL,NULL,10,'/admin/pdf.php?leftmenu=setup','','PDF','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161195,'auguria',1,'','left','home',161187,NULL,NULL,8,'/admin/security_other.php?leftmenu=setup','','Security','admin',1,'','','$leftmenu==\'setup\'',2,'2017-09-06 08:29:36'),(161196,'auguria',1,'','left','home',161187,NULL,NULL,11,'/admin/mails.php?leftmenu=setup','','Emails','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161197,'auguria',1,'','left','home',161187,NULL,NULL,9,'/admin/limits.php?leftmenu=setup','','MenuLimits','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161198,'auguria',1,'','left','home',161187,NULL,NULL,13,'/admin/dict.php?leftmenu=setup','','Dictionary','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161199,'auguria',1,'','left','home',161187,NULL,NULL,14,'/admin/const.php?leftmenu=setup','','OtherSetup','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161200,'auguria',1,'','left','home',161187,NULL,NULL,12,'/admin/sms.php?leftmenu=setup','','SMS','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161201,'auguria',1,'','left','home',161187,NULL,NULL,4,'/admin/translation.php?leftmenu=setup','','Translation','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161288,'auguria',1,'','left','home',161387,NULL,NULL,0,'/admin/system/dolibarr.php?leftmenu=admintools','','InfoDolibarr','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161289,'auguria',1,'','left','home',161288,NULL,NULL,2,'/admin/system/modules.php?leftmenu=admintools','','Modules','admin',2,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161290,'auguria',1,'','left','home',161288,NULL,NULL,3,'/admin/triggers.php?leftmenu=admintools','','Triggers','admin',2,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161291,'auguria',1,'','left','home',161288,NULL,NULL,4,'/admin/system/filecheck.php?leftmenu=admintools','','FileCheck','admin',2,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161292,'auguria',1,'','left','home',161387,NULL,NULL,1,'/admin/system/browser.php?leftmenu=admintools','','InfoBrowser','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161293,'auguria',1,'','left','home',161387,NULL,NULL,2,'/admin/system/os.php?leftmenu=admintools','','InfoOS','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161294,'auguria',1,'','left','home',161387,NULL,NULL,3,'/admin/system/web.php?leftmenu=admintools','','InfoWebServer','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161295,'auguria',1,'','left','home',161387,NULL,NULL,4,'/admin/system/phpinfo.php?leftmenu=admintools','','InfoPHP','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161297,'auguria',1,'','left','home',161387,NULL,NULL,5,'/admin/system/database.php?leftmenu=admintools','','InfoDatabase','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161387,'auguria',1,'','left','home',161088,NULL,NULL,2,'/admin/tools/index.php?leftmenu=admintools','','AdminTools','admin',0,'admintools','','$user->admin',2,'2017-08-30 15:14:30'),(161388,'auguria',1,'','left','home',161387,NULL,NULL,6,'/admin/tools/dolibarr_export.php?leftmenu=admintools','','Backup','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161389,'auguria',1,'','left','home',161387,NULL,NULL,7,'/admin/tools/dolibarr_import.php?leftmenu=admintools','','Restore','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161392,'auguria',1,'','left','home',161387,NULL,NULL,8,'/admin/tools/update.php?leftmenu=admintools','','MenuUpgrade','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161393,'auguria',1,'','left','home',161387,NULL,NULL,9,'/admin/tools/eaccelerator.php?leftmenu=admintools','','EAccelerator','admin',1,'','','$leftmenu==\"admintools\" && function_exists(\"eaccelerator_info\")',2,'2017-08-30 15:14:30'),(161394,'auguria',1,'','left','home',161387,NULL,NULL,10,'/admin/tools/listevents.php?leftmenu=admintools','','Audit','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161395,'auguria',1,'','left','home',161387,NULL,NULL,11,'/admin/tools/listsessions.php?leftmenu=admintools','','Sessions','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161396,'auguria',1,'','left','home',161387,NULL,NULL,12,'/admin/tools/purge.php?leftmenu=admintools','','Purge','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161398,'auguria',1,'','left','home',161387,NULL,NULL,14,'/admin/system/about.php?leftmenu=admintools','','ExternalResources','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161407,'auguria',1,'','left','home',161387,NULL,NULL,15,'/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=admintools','','ProductVatMassChange','products',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161487,'auguria',1,'','left','home',161088,NULL,NULL,4,'/user/home.php?leftmenu=users','','MenuUsersAndGroups','users',0,'users','','1',2,'2017-08-30 15:14:30'),(161488,'auguria',1,'','left','home',161487,NULL,NULL,0,'/user/index.php?leftmenu=users','','Users','users',1,'','$user->rights->user->user->lire || $user->admin','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161489,'auguria',1,'','left','home',161488,NULL,NULL,0,'/user/card.php?leftmenu=users&amp;action=create','','NewUser','users',2,'','($user->rights->user->user->creer || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161490,'auguria',1,'','left','home',161487,NULL,NULL,1,'/user/group/index.php?leftmenu=users','','Groups','users',1,'','(($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161491,'auguria',1,'','left','home',161490,NULL,NULL,0,'/user/group/card.php?leftmenu=users&amp;action=create','','NewGroup','users',2,'','(($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161587,'auguria',1,'','left','companies',161089,NULL,NULL,0,'/societe/index.php?leftmenu=thirdparties','','ThirdParty','companies',0,'thirdparties','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161588,'auguria',1,'','left','companies',161587,NULL,NULL,0,'/societe/card.php?action=create','','MenuNewThirdParty','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161589,'auguria',1,'','left','companies',161587,NULL,NULL,0,'/societe/list.php?action=create','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161590,'auguria',1,'','left','companies',161587,NULL,NULL,5,'/societe/list.php?type=f&leftmenu=suppliers','','ListSuppliersShort','suppliers',1,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2017-08-30 15:14:30'),(161591,'auguria',1,'','left','companies',161590,NULL,NULL,0,'/societe/card.php?leftmenu=supplier&amp;action=create&amp;type=f','','NewSupplier','suppliers',2,'','$user->rights->societe->creer','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2017-08-30 15:14:30'),(161593,'auguria',1,'','left','companies',161587,NULL,NULL,3,'/societe/list.php?type=p&leftmenu=prospects','','ListProspectsShort','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161594,'auguria',1,'','left','companies',161593,NULL,NULL,0,'/societe/card.php?leftmenu=prospects&amp;action=create&amp;type=p','','MenuNewProspect','companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161596,'auguria',1,'','left','companies',161587,NULL,NULL,4,'/societe/list.php?type=c&leftmenu=customers','','ListCustomersShort','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161597,'auguria',1,'','left','companies',161596,NULL,NULL,0,'/societe/card.php?leftmenu=customers&amp;action=create&amp;type=c','','MenuNewCustomer','companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161687,'auguria',1,'','left','companies',161089,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','ContactsAddresses','companies',0,'contacts','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161688,'auguria',1,'','left','companies',161687,NULL,NULL,0,'/contact/card.php?leftmenu=contacts&amp;action=create','','NewContactAddress','companies',1,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161689,'auguria',1,'','left','companies',161687,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161691,'auguria',1,'','left','companies',161689,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&amp;type=p','','ThirdPartyProspects','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161692,'auguria',1,'','left','companies',161689,NULL,NULL,2,'/contact/list.php?leftmenu=contacts&amp;type=c','','ThirdPartyCustomers','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161693,'auguria',1,'','left','companies',161689,NULL,NULL,3,'/contact/list.php?leftmenu=contacts&amp;type=f','','ThirdPartySuppliers','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2017-08-30 15:14:30'),(161694,'auguria',1,'','left','companies',161689,NULL,NULL,4,'/contact/list.php?leftmenu=contacts&amp;type=o','','Others','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161737,'auguria',1,'','left','companies',161089,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=1','','SuppliersCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161738,'auguria',1,'','left','companies',161737,NULL,NULL,0,'/categories/card.php?action=create&amp;type=1','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161747,'auguria',1,'','left','companies',161089,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=2','','CustomersProspectsCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161748,'auguria',1,'','left','companies',161747,NULL,NULL,0,'/categories/card.php?action=create&amp;type=2','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161757,'auguria',1,'','left','companies',161089,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=4','','ContactCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161758,'auguria',1,'','left','companies',161757,NULL,NULL,0,'/categories/card.php?action=create&amp;type=4','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(162187,'auguria',1,'','left','commercial',161092,NULL,NULL,4,'/comm/propal/index.php?leftmenu=propals','','Prop','propal',0,'propals','$user->rights->propale->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162188,'auguria',1,'','left','commercial',162187,NULL,NULL,0,'/comm/propal/card.php?action=create&amp;leftmenu=propals','','NewPropal','propal',1,'','$user->rights->propale->creer','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162189,'auguria',1,'','left','commercial',162187,NULL,NULL,1,'/comm/propal/list.php?leftmenu=propals','','List','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162190,'auguria',1,'','left','commercial',162189,NULL,NULL,2,'/comm/propal/list.php?leftmenu=propals&amp;search_status=0','','PropalsDraft','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162191,'auguria',1,'','left','commercial',162189,NULL,NULL,3,'/comm/propal/list.php?leftmenu=propals&amp;search_status=1','','PropalsOpened','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162192,'auguria',1,'','left','commercial',162189,NULL,NULL,4,'/comm/propal/list.php?leftmenu=propals&amp;search_status=2','','PropalStatusSigned','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162193,'auguria',1,'','left','commercial',162189,NULL,NULL,5,'/comm/propal/list.php?leftmenu=propals&amp;search_status=3','','PropalStatusNotSigned','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162194,'auguria',1,'','left','commercial',162189,NULL,NULL,6,'/comm/propal/list.php?leftmenu=propals&amp;search_status=4','','PropalStatusBilled','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162197,'auguria',1,'','left','commercial',162187,NULL,NULL,4,'/comm/propal/stats/index.php?leftmenu=propals','','Statistics','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162287,'auguria',1,'','left','commercial',161092,NULL,NULL,5,'/commande/index.php?leftmenu=orders','','CustomersOrders','orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162288,'auguria',1,'','left','commercial',162287,NULL,NULL,0,'/commande/card.php?action=create&amp;leftmenu=orders','','NewOrder','orders',1,'','$user->rights->commande->creer','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162289,'auguria',1,'','left','commercial',162287,NULL,NULL,1,'/commande/list.php?leftmenu=orders','','List','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162290,'auguria',1,'','left','commercial',162289,NULL,NULL,2,'/commande/list.php?leftmenu=orders&amp;search_status=0','','StatusOrderDraftShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162291,'auguria',1,'','left','commercial',162289,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;search_status=1','','StatusOrderValidated','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162292,'auguria',1,'','left','commercial',162289,NULL,NULL,4,'/commande/list.php?leftmenu=orders&amp;search_status=2','','StatusOrderOnProcessShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162293,'auguria',1,'','left','commercial',162289,NULL,NULL,5,'/commande/list.php?leftmenu=orders&amp;search_status=3','','StatusOrderToBill','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162294,'auguria',1,'','left','commercial',162289,NULL,NULL,6,'/commande/list.php?leftmenu=orders&amp;search_status=4','','StatusOrderProcessed','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162295,'auguria',1,'','left','commercial',162289,NULL,NULL,7,'/commande/list.php?leftmenu=orders&amp;search_status=-1','','StatusOrderCanceledShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162296,'auguria',1,'','left','commercial',162287,NULL,NULL,4,'/commande/stats/index.php?leftmenu=orders','','Statistics','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162387,'auguria',1,'','left','commercial',161090,NULL,NULL,6,'/expedition/index.php?leftmenu=sendings','','Shipments','sendings',0,'sendings','$user->rights->expedition->lire','$conf->expedition->enabled',2,'2017-08-30 15:14:30'),(162388,'auguria',1,'','left','commercial',162387,NULL,NULL,0,'/expedition/card.php?action=create2&leftmenu=sendings','','NewSending','sendings',1,'','$user->rights->expedition->creer','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2017-08-30 15:14:30'),(162389,'auguria',1,'','left','commercial',162387,NULL,NULL,1,'/expedition/list.php?leftmenu=sendings','','List','sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2017-08-30 15:14:30'),(162390,'auguria',1,'','left','commercial',162387,NULL,NULL,2,'/expedition/stats/index.php?leftmenu=sendings','','Statistics','sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2017-08-30 15:14:30'),(162487,'auguria',1,'','left','commercial',161092,NULL,NULL,7,'/contrat/index.php?leftmenu=contracts','','Contracts','contracts',0,'contracts','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162488,'auguria',1,'','left','commercial',162487,NULL,NULL,0,'/contrat/card.php?&action=create&amp;leftmenu=contracts','','NewContract','contracts',1,'','$user->rights->contrat->creer','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162489,'auguria',1,'','left','commercial',162487,NULL,NULL,1,'/contrat/list.php?leftmenu=contracts','','List','contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162490,'auguria',1,'','left','commercial',162487,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts','','MenuServices','contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162491,'auguria',1,'','left','commercial',162490,NULL,NULL,0,'/contrat/services.php?leftmenu=contracts&amp;mode=0','','MenuInactiveServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162492,'auguria',1,'','left','commercial',162490,NULL,NULL,1,'/contrat/services.php?leftmenu=contracts&amp;mode=4','','MenuRunningServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162493,'auguria',1,'','left','commercial',162490,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts&amp;mode=4&amp;filter=expired','','MenuExpiredServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162494,'auguria',1,'','left','commercial',162490,NULL,NULL,3,'/contrat/services.php?leftmenu=contracts&amp;mode=5','','MenuClosedServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162587,'auguria',1,'','left','commercial',161092,NULL,NULL,8,'/fichinter/list.php?leftmenu=ficheinter','','Interventions','interventions',0,'ficheinter','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162588,'auguria',1,'','left','commercial',162587,NULL,NULL,0,'/fichinter/card.php?action=create&amp;leftmenu=ficheinter','','NewIntervention','interventions',1,'','$user->rights->ficheinter->creer','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162589,'auguria',1,'','left','commercial',162587,NULL,NULL,1,'/fichinter/list.php?leftmenu=ficheinter','','List','interventions',1,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162590,'auguria',1,'','left','commercial',162587,NULL,NULL,2,'/fichinter/stats/index.php?leftmenu=ficheinter','','Statistics','interventions',1,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162687,'auguria',1,'','left','accountancy',161093,NULL,NULL,3,'/fourn/facture/list.php?leftmenu=suppliers_bills','','BillsSuppliers','bills',0,'supplier_bills','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162688,'auguria',1,'','left','accountancy',162687,NULL,NULL,0,'/fourn/facture/card.php?action=create&amp;leftmenu=suppliers_bills','','NewBill','bills',1,'','$user->rights->fournisseur->facture->creer','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162689,'auguria',1,'','left','accountancy',162687,NULL,NULL,1,'/fourn/facture/list.php?leftmenu=suppliers_bills','','List','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162690,'auguria',1,'','left','accountancy',162687,NULL,NULL,2,'/fourn/facture/paiement.php?leftmenu=suppliers_bills','','Payments','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162691,'auguria',1,'','left','accountancy',162687,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills&mode=supplier','','Statistics','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162692,'auguria',1,'','left','accountancy',162690,NULL,NULL,1,'/fourn/facture/rapport.php?leftmenu=suppliers_bills','','Reporting','bills',2,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162787,'auguria',1,'','left','accountancy',161093,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills','','BillsCustomers','bills',0,'customer_bills','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162788,'auguria',1,'','left','accountancy',162787,NULL,NULL,3,'/compta/facture/card.php?action=create&amp;leftmenu=customers_bills','','NewBill','bills',1,'','$user->rights->facture->creer','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162789,'auguria',1,'','left','accountancy',162787,NULL,NULL,5,'/compta/facture/fiche-rec.php?leftmenu=customers_bills','','ListOfTemplates','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162791,'auguria',1,'','left','accountancy',162787,NULL,NULL,6,'/compta/paiement/list.php?leftmenu=customers_bills','','Payments','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162792,'auguria',1,'','left','accountancy',162787,NULL,NULL,4,'/compta/facture/list.php?leftmenu=customers_bills','','List','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162797,'auguria',1,'','left','accountancy',162791,NULL,NULL,1,'/compta/paiement/rapport.php?leftmenu=customers_bills','','Reportings','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162798,'auguria',1,'','left','accountancy',161101,NULL,NULL,9,'/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank','','MenuChequeDeposits','bills',0,'checks','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2017-08-30 15:14:30'),(162799,'auguria',1,'','left','accountancy',162798,NULL,NULL,0,'/compta/paiement/cheque/card.php?leftmenu=checks&amp;action=new','','NewCheckDeposit','compta',1,'','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2017-08-30 15:14:30'),(162800,'auguria',1,'','left','accountancy',162798,NULL,NULL,1,'/compta/paiement/cheque/list.php?leftmenu=checks','','List','bills',1,'','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2017-08-30 15:14:30'),(162801,'auguria',1,'','left','accountancy',162787,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills','','Statistics','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162807,'auguria',1,'','left','accountancy',162792,NULL,NULL,1,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=0','','BillShortStatusDraft','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162808,'auguria',1,'','left','accountancy',162792,NULL,NULL,2,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=1','','BillShortStatusNotPaid','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162809,'auguria',1,'','left','accountancy',162792,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=2','','BillShortStatusPaid','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162810,'auguria',1,'','left','accountancy',162792,NULL,NULL,4,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=3','','BillShortStatusCanceled','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162987,'auguria',1,'','left','accountancy',161093,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;search_status=3','','MenuOrdersToBill','orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',0,'2017-08-30 15:14:30'),(163087,'auguria',1,'','left','accountancy',161093,NULL,NULL,4,'/don/index.php?leftmenu=donations&amp;mainmenu=accountancy','','Donations','donations',0,'donations','$user->rights->don->lire','$conf->don->enabled',2,'2017-08-30 15:14:30'),(163088,'auguria',1,'','left','accountancy',163087,NULL,NULL,0,'/don/card.php?leftmenu=donations&amp;mainmenu=accountancy&amp;action=create','','NewDonation','donations',1,'','$user->rights->don->creer','$conf->don->enabled && $leftmenu==\"donations\"',2,'2017-08-30 15:14:30'),(163089,'auguria',1,'','left','accountancy',163087,NULL,NULL,1,'/don/list.php?leftmenu=donations&amp;mainmenu=accountancy','','List','donations',1,'','$user->rights->don->lire','$conf->don->enabled && $leftmenu==\"donations\"',2,'2017-08-30 15:14:30'),(163187,'auguria',1,'','left','accountancy',161102,NULL,NULL,5,'/compta/deplacement/index.php?leftmenu=tripsandexpenses','','TripsAndExpenses','trips',0,'tripsandexpenses','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163188,'auguria',1,'','left','accountancy',163187,NULL,NULL,1,'/compta/deplacement/card.php?action=create&amp;leftmenu=tripsandexpenses','','New','trips',1,'','$user->rights->deplacement->creer','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163189,'auguria',1,'','left','accountancy',163187,NULL,NULL,2,'/compta/deplacement/list.php?leftmenu=tripsandexpenses','','List','trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163190,'auguria',1,'','left','accountancy',163187,NULL,NULL,2,'/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses','','Statistics','trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163287,'auguria',1,'','left','accountancy',161093,NULL,NULL,6,'/compta/charges/index.php?leftmenu=tax&amp;mainmenu=accountancy','','MenuSpecialExpenses','compta',0,'tax','(! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (! empty($conf->salaries->enabled) && $user->rights->salaries->read)','$conf->tax->enabled || $conf->salaries->enabled',0,'2017-08-30 15:14:30'),(163297,'auguria',1,'','left','accountancy',163287,NULL,NULL,1,'/compta/salaries/index.php?leftmenu=tax_salary&amp;mainmenu=accountancy','','Salaries','salaries',1,'tax_sal','$user->rights->salaries->payment->read','$conf->salaries->enabled',0,'2017-08-30 15:14:30'),(163298,'auguria',1,'','left','accountancy',163297,NULL,NULL,2,'/compta/salaries/card.php?leftmenu=tax_salary&amp;action=create','','NewPayment','companies',2,'','$user->rights->salaries->payment->write','$conf->salaries->enabled && $leftmenu==\"tax_salary\"',0,'2017-08-30 15:14:30'),(163299,'auguria',1,'','left','accountancy',163297,NULL,NULL,3,'/compta/salaries/index.php?leftmenu=tax_salary','','Payments','companies',2,'','$user->rights->salaries->payment->read','$conf->salaries->enabled && $leftmenu==\"tax_salary\"',0,'2017-08-30 15:14:30'),(163307,'auguria',1,'','left','accountancy',163287,NULL,NULL,1,'/loan/index.php?leftmenu=tax_loan&amp;mainmenu=accountancy','','Loans','loan',1,'tax_loan','$user->rights->loan->read','$conf->loan->enabled',0,'2017-08-30 15:14:30'),(163308,'auguria',1,'','left','accountancy',163307,NULL,NULL,2,'/loan/card.php?leftmenu=tax_loan&amp;action=create','','NewLoan','loan',2,'','$user->rights->loan->write','$conf->loan->enabled && $leftmenu==\"tax_loan\"',0,'2017-08-30 15:14:30'),(163310,'auguria',1,'','left','accountancy',163307,NULL,NULL,4,'/loan/calc.php?leftmenu=tax_loan','','Calculator','companies',2,'','$user->rights->loan->calc','$conf->loan->enabled && $leftmenu==\"tax_loan\" && ! empty($conf->global->LOAN_SHOW_CALCULATOR)',0,'2017-08-30 15:14:30'),(163337,'auguria',1,'','left','accountancy',163287,NULL,NULL,1,'/compta/sociales/index.php?leftmenu=tax_social','','SocialContributions','',1,'tax_social','$user->rights->tax->charges->lire','$conf->tax->enabled',0,'2017-08-30 15:14:30'),(163338,'auguria',1,'','left','accountancy',163337,NULL,NULL,2,'/compta/sociales/card.php?leftmenu=tax_social&amp;action=create','','MenuNewSocialContribution','',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2017-08-30 15:14:30'),(163339,'auguria',1,'','left','accountancy',163337,NULL,NULL,3,'/compta/sociales/payments.php?leftmenu=tax_social&amp;mainmenu=accountancy&amp;mode=sconly','','Payments','',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2017-08-30 15:14:30'),(163387,'auguria',1,'','left','accountancy',163287,NULL,NULL,7,'/compta/tva/index.php?leftmenu=tax_vat&amp;mainmenu=accountancy','','VAT','companies',1,'tax_vat','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS)',0,'2017-08-30 15:14:30'),(163388,'auguria',1,'','left','accountancy',163387,NULL,NULL,0,'/compta/tva/card.php?leftmenu=tax_vat&amp;action=create','','New','companies',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163389,'auguria',1,'','left','accountancy',163387,NULL,NULL,1,'/compta/tva/reglement.php?leftmenu=tax_vat','','List','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163390,'auguria',1,'','left','accountancy',163387,NULL,NULL,2,'/compta/tva/clients.php?leftmenu=tax_vat','','ReportByCustomers','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163391,'auguria',1,'','left','accountancy',163387,NULL,NULL,3,'/compta/tva/quadri_detail.php?leftmenu=tax_vat','','ReportByQuarter','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163487,'auguria',1,'','left','accountancy',161093,NULL,NULL,7,'/accountancy/index.php?leftmenu=accountancy','','MenuAccountancy','accountancy',0,'accounting','! empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163488,'auguria',1,'','left','accountancy',163487,NULL,NULL,2,'/accountancy/customer/index.php?leftmenu=dispatch_customer','','CustomersVentilation','accountancy',1,'dispatch_customer','$user->rights->accounting->bind->write','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163489,'auguria',1,'','left','accountancy',163488,NULL,NULL,3,'/accountancy/customer/list.php','','ToDispatch','accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $leftmenu==\"dispatch_customer\"',0,'2017-08-30 15:14:30'),(163490,'auguria',1,'','left','accountancy',163488,NULL,NULL,4,'/accountancy/customer/lines.php','','Dispatched','accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $leftmenu==\"dispatch_customer\"',0,'2017-08-30 15:14:30'),(163497,'auguria',1,'','left','accountancy',163487,NULL,NULL,5,'/accountancy/supplier/index.php?leftmenu=dispatch_supplier','','SuppliersVentilation','accountancy',1,'ventil_supplier','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->fournisseur->enabled',0,'2017-08-30 15:14:30'),(163498,'auguria',1,'','left','accountancy',163497,NULL,NULL,6,'/accountancy/supplier/list.php','','ToDispatch','accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu==\"dispatch_supplier\"',0,'2017-08-30 15:14:30'),(163499,'auguria',1,'','left','accountancy',163497,NULL,NULL,7,'/accountancy/supplier/lines.php','','Dispatched','accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu==\"dispatch_supplier\"',0,'2017-08-30 15:14:30'),(163507,'auguria',1,'','left','accountancy',163487,NULL,NULL,5,'/accountancy/expensereport/index.php?leftmenu=dispatch_expensereport','','ExpenseReportsVentilation','accountancy',1,'ventil_expensereport','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(163508,'auguria',1,'','left','accountancy',163507,NULL,NULL,6,'/accountancy/expensereport/list.php','','ToDispatch','accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu==\"dispatch_expensereport\"',0,'2017-08-30 15:14:30'),(163509,'auguria',1,'','left','accountancy',163507,NULL,NULL,7,'/accountancy/expensereport/lines.php','','Dispatched','accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu==\"dispatch_expensereport\"',0,'2017-08-30 15:14:30'),(163517,'auguria',1,'','left','accountancy',163487,NULL,NULL,15,'/accountancy/bookkeeping/list.php','','Bookkeeping','accountancy',1,'bookkeeping','$user->rights->accounting->mouvements->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163522,'auguria',1,'','left','accountancy',163487,NULL,NULL,16,'/accountancy/bookkeeping/balance.php','','AccountBalance','accountancy',1,'balance','$user->rights->accounting->mouvements->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163527,'auguria',1,'','left','accountancy',163487,NULL,NULL,17,'/accountancy/report/result.php?mainmenu=accountancy&leftmenu=accountancy','','Reportings','main',1,'report','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163528,'auguria',1,'','left','accountancy',163527,NULL,NULL,19,'/compta/resultat/index.php?mainmenu=accountancy&leftmenu=accountancy','','ReportInOut','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163529,'auguria',1,'','left','accountancy',163528,NULL,NULL,18,'/accountancy/report/result.php?mainmenu=accountancy&leftmenu=accountancy','','ByAccounts','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163530,'auguria',1,'','left','accountancy',163528,NULL,NULL,20,'/compta/resultat/clientfourn.php?mainmenu=accountancy&leftmenu=accountancy','','ByCompanies','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163531,'auguria',1,'','left','accountancy',163527,NULL,NULL,21,'/compta/stats/index.php?mainmenu=accountancy&leftmenu=accountancy','','ReportTurnover','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163532,'auguria',1,'','left','accountancy',163531,NULL,NULL,22,'/compta/stats/casoc.php?mainmenu=accountancy&leftmenu=accountancy','','ByCompanies','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163533,'auguria',1,'','left','accountancy',163531,NULL,NULL,23,'/compta/stats/cabyuser.php?mainmenu=accountancy&leftmenu=accountancy','','ByUsers','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163534,'auguria',1,'','left','accountancy',163531,NULL,NULL,24,'/compta/stats/cabyprodserv.php?mainmenu=accountancy&leftmenu=accountancy','','ByProductsAndServices','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163537,'auguria',1,'','left','accountancy',163538,NULL,NULL,80,'/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin','','FiscalPeriod','admin',1,'accountancy_admin_period','','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\" && $conf->global->MAIN_FEATURES_LEVEL > 0',2,'2017-08-30 15:14:30'),(163538,'auguria',1,'','left','accountancy',163487,NULL,NULL,1,'/accountancy/index.php?mainmenu=accountancy&leftmenu=accountancy_admin','','Setup','accountancy',1,'accountancy_admin','$user->rights->accounting->chartofaccount','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163541,'auguria',1,'','left','accountancy',163538,NULL,NULL,10,'/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin','','AccountingJournals','accountancy',2,'accountancy_admin_journal','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163542,'auguria',1,'','left','accountancy',163538,NULL,NULL,20,'/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin','','Pcg_version','accountancy',2,'accountancy_admin_chartmodel','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163543,'auguria',1,'','left','accountancy',163538,NULL,NULL,30,'/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin','','Chartofaccounts','accountancy',2,'accountancy_admin_chart','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163544,'auguria',1,'','left','accountancy',163538,NULL,NULL,40,'/accountancy/admin/categories_list.php?id=32&mainmenu=accountancy&leftmenu=accountancy_admin','','AccountingCategory','accountancy',2,'accountancy_admin_chart_group','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163545,'auguria',1,'','left','accountancy',163538,NULL,NULL,50,'/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin','','MenuDefaultAccounts','accountancy',2,'accountancy_admin_default','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163546,'auguria',1,'','left','accountancy',163538,NULL,NULL,60,'/admin/dict.php?id=10&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin','','MenuVatAccounts','accountancy',2,'accountancy_admin_vat','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163547,'auguria',1,'','left','accountancy',163538,NULL,NULL,70,'/admin/dict.php?id=7&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin','','MenuTaxAccounts','accountancy',2,'accountancy_admin_tax','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163548,'auguria',1,'','left','accountancy',163538,NULL,NULL,80,'/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin','','MenuExpenseReportAccounts','accountancy',2,'accountancy_admin_expensereport','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163549,'auguria',1,'','left','accountancy',163538,NULL,NULL,90,'/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin','','MenuProductsAccounts','accountancy',2,'accountancy_admin_product','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163587,'auguria',1,'','left','accountancy',161101,NULL,NULL,9,'/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank','','StandingOrders','withdrawals',0,'withdraw','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled',2,'2017-08-30 15:14:30'),(163589,'auguria',1,'','left','accountancy',163587,NULL,NULL,0,'/compta/prelevement/create.php?leftmenu=withdraw','','NewStandingOrder','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163590,'auguria',1,'','left','accountancy',163587,NULL,NULL,2,'/compta/prelevement/bons.php?leftmenu=withdraw','','WithdrawalsReceipts','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163591,'auguria',1,'','left','accountancy',163587,NULL,NULL,3,'/compta/prelevement/list.php?leftmenu=withdraw','','WithdrawalsLines','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163593,'auguria',1,'','left','accountancy',163587,NULL,NULL,5,'/compta/prelevement/rejets.php?leftmenu=withdraw','','Rejects','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163594,'auguria',1,'','left','accountancy',163587,NULL,NULL,6,'/compta/prelevement/stats.php?leftmenu=withdraw','','Statistics','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163687,'auguria',1,'','left','accountancy',161101,NULL,NULL,1,'/compta/bank/index.php?leftmenu=bank&amp;mainmenu=bank','','MenuBankCash','banks',0,'bank','$user->rights->banque->lire','$conf->banque->enabled',0,'2017-08-30 15:14:30'),(163688,'auguria',1,'','left','accountancy',163687,NULL,NULL,0,'/compta/bank/card.php?action=create&amp;leftmenu=bank','','MenuNewFinancialAccount','banks',1,'','$user->rights->banque->configurer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163690,'auguria',1,'','left','accountancy',163687,NULL,NULL,2,'/compta/bank/bankentries.php?leftmenu=bank','','ListTransactions','banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163691,'auguria',1,'','left','accountancy',163687,NULL,NULL,3,'/compta/bank/budget.php?leftmenu=bank','','ListTransactionsByCategory','banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163693,'auguria',1,'','left','accountancy',163687,NULL,NULL,5,'/compta/bank/transfer.php?leftmenu=bank','','BankTransfers','banks',1,'','$user->rights->banque->transfer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163737,'auguria',1,'','left','accountancy',161101,NULL,NULL,4,'/categories/index.php?leftmenu=bank&amp;type=5','','Categories','categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(163738,'auguria',1,'','left','accountancy',163737,NULL,NULL,0,'/categories/card.php?leftmenu=bank&amp;action=create&amp;type=5','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(163787,'auguria',1,'','left','accountancy',161093,NULL,NULL,11,'/compta/resultat/index.php?leftmenu=ca&amp;mainmenu=accountancy','','Reportings','main',0,'ca','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled',0,'2017-08-30 15:14:30'),(163792,'auguria',1,'','left','accountancy',163487,NULL,NULL,1,'','','Journalization','main',1,'','$user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163793,'auguria',1,'','left','accountancy',163792,NULL,NULL,4,'/accountancy/journal/sellsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=1','','SellsJournal','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163794,'auguria',1,'','left','accountancy',163792,NULL,NULL,1,'/accountancy/journal/bankjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=3','','BankJournal','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163795,'auguria',1,'','left','accountancy',163792,NULL,NULL,2,'/accountancy/journal/expensereportsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=6','','ExpenseReportJournal','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163796,'auguria',1,'','left','accountancy',163792,NULL,NULL,3,'/accountancy/journal/purchasesjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=2','','PurchasesJournal','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163798,'auguria',1,'','left','accountancy',163787,NULL,NULL,0,'/compta/resultat/index.php?leftmenu=ca','','ReportInOut','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163799,'auguria',1,'','left','accountancy',163788,NULL,NULL,0,'/compta/resultat/clientfourn.php?leftmenu=ca','','ByCompanies','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163800,'auguria',1,'','left','accountancy',163787,NULL,NULL,1,'/compta/stats/index.php?leftmenu=ca','','ReportTurnover','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163801,'auguria',1,'','left','accountancy',163790,NULL,NULL,0,'/compta/stats/casoc.php?leftmenu=ca','','ByCompanies','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163802,'auguria',1,'','left','accountancy',163790,NULL,NULL,1,'/compta/stats/cabyuser.php?leftmenu=ca','','ByUsers','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163803,'auguria',1,'','left','accountancy',163790,NULL,NULL,1,'/compta/stats/cabyprodserv.php?leftmenu=ca','','ByProductsAndServices','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163887,'auguria',1,'','left','products',161090,NULL,NULL,0,'/product/index.php?leftmenu=product&amp;type=0','','Products','products',0,'product','$user->rights->produit->lire','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163888,'auguria',1,'','left','products',163887,NULL,NULL,0,'/product/card.php?leftmenu=product&amp;action=create&amp;type=0','','NewProduct','products',1,'','$user->rights->produit->creer','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163889,'auguria',1,'','left','products',163887,NULL,NULL,1,'/product/list.php?leftmenu=product&amp;type=0','','List','products',1,'','$user->rights->produit->lire','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163890,'auguria',1,'','left','products',163887,NULL,NULL,4,'/product/reassort.php?type=0','','Stocks','products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163891,'auguria',1,'','left','products',163887,NULL,NULL,7,'/product/stats/card.php?id=all&amp;leftmenu=stats&amp;type=0','','Statistics','main',1,'','$user->rights->produit->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(163892,'auguria',1,'','left','products',163887,NULL,NULL,5,'/product/reassortlot.php?type=0','','StocksByLotSerial','products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->productbatch->enabled',2,'2017-08-30 15:14:30'),(163893,'auguria',1,'','left','products',163887,NULL,NULL,6,'/product/stock/productlot_list.php','','LotSerial','products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->productbatch->enabled',2,'2017-08-30 15:14:30'),(163987,'auguria',1,'','left','products',161090,NULL,NULL,1,'/product/index.php?leftmenu=service&amp;type=1','','Services','products',0,'service','$user->rights->service->lire','$conf->service->enabled',2,'2017-08-30 15:14:30'),(163988,'auguria',1,'','left','products',163987,NULL,NULL,0,'/product/card.php?leftmenu=service&amp;action=create&amp;type=1','','NewService','products',1,'','$user->rights->service->creer','$conf->service->enabled',2,'2017-08-30 15:14:30'),(163989,'auguria',1,'','left','products',163987,NULL,NULL,1,'/product/list.php?leftmenu=service&amp;type=1','','List','products',1,'','$user->rights->service->lire','$conf->service->enabled',2,'2017-08-30 15:14:30'),(163990,'auguria',1,'','left','products',163987,NULL,NULL,5,'/product/stats/card.php?id=all&amp;leftmenu=stats&amp;type=1','','Statistics','main',1,'','$user->rights->service->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(164187,'auguria',1,'','left','products',161090,NULL,NULL,3,'/product/stock/index.php?leftmenu=stock','','Stock','stocks',0,'stock','$user->rights->stock->lire','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164188,'auguria',1,'','left','products',164187,NULL,NULL,0,'/product/stock/card.php?action=create','','MenuNewWarehouse','stocks',1,'','$user->rights->stock->creer','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164189,'auguria',1,'','left','products',164187,NULL,NULL,1,'/product/stock/list.php','','List','stocks',1,'','$user->rights->stock->lire','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164191,'auguria',1,'','left','products',164187,NULL,NULL,3,'/product/stock/mouvement.php','','Movements','stocks',1,'','$user->rights->stock->mouvement->lire','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164192,'auguria',1,'','left','products',164187,NULL,NULL,4,'/product/stock/replenish.php','','Replenishments','stocks',1,'','$user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire','$conf->stock->enabled && $conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(164193,'auguria',1,'','left','products',164187,NULL,NULL,5,'/product/stock/massstockmove.php','','MassStockTransferShort','stocks',1,'','$user->rights->stock->mouvement->creer','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164287,'auguria',1,'','left','products',161090,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=0','','Categories','categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164288,'auguria',1,'','left','products',164287,NULL,NULL,0,'/categories/card.php?action=create&amp;type=0','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164487,'auguria',1,'','left','project',161094,NULL,NULL,3,'/projet/activity/perweek.php?leftmenu=projects','','NewTimeSpent','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164687,'auguria',1,'','left','project',161094,NULL,NULL,0,'/projet/index.php?leftmenu=projects','','Projects','projects',0,'projects','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164688,'auguria',1,'','left','project',164687,NULL,NULL,1,'/projet/card.php?leftmenu=projects&amp;action=create','','NewProject','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164689,'auguria',1,'','left','project',164687,NULL,NULL,2,'/projet/list.php?leftmenu=projects','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164690,'auguria',1,'','left','project',164687,NULL,NULL,3,'/projet/stats/index.php?leftmenu=projects','','Statistics','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164787,'auguria',1,'','left','project',161094,NULL,NULL,0,'/projet/activity/index.php?leftmenu=projects','','Activities','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164788,'auguria',1,'','left','project',164787,NULL,NULL,1,'/projet/tasks.php?leftmenu=projects&amp;action=create','','NewTask','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164789,'auguria',1,'','left','project',164787,NULL,NULL,2,'/projet/tasks/list.php?leftmenu=projects','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164791,'auguria',1,'','left','project',164787,NULL,NULL,4,'/projet/tasks/stats/index.php?leftmenu=projects','','Statistics','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164891,'auguria',1,'','left','project',161094,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=6','','Categories','categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164892,'auguria',1,'','left','project',164891,NULL,NULL,0,'/categories/card.php?action=create&amp;type=6','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164987,'auguria',1,'','left','tools',161095,NULL,NULL,0,'/comm/mailing/index.php?leftmenu=mailing','','EMailings','mails',0,'mailing','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2017-08-30 15:14:30'),(164988,'auguria',1,'','left','tools',164987,NULL,NULL,0,'/comm/mailing/card.php?leftmenu=mailing&amp;action=create','','NewMailing','mails',1,'','$user->rights->mailing->creer','$conf->mailing->enabled',0,'2017-08-30 15:14:30'),(164989,'auguria',1,'','left','tools',164987,NULL,NULL,1,'/comm/mailing/list.php?leftmenu=mailing','','List','mails',1,'','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2017-08-30 15:14:30'),(165187,'auguria',1,'','left','tools',161095,NULL,NULL,2,'/exports/index.php?leftmenu=export','','FormatedExport','exports',0,'export','$user->rights->export->lire','$conf->export->enabled',2,'2017-08-30 15:14:30'),(165188,'auguria',1,'','left','tools',165187,NULL,NULL,0,'/exports/export.php?leftmenu=export','','NewExport','exports',1,'','$user->rights->export->creer','$conf->export->enabled',2,'2017-08-30 15:14:30'),(165217,'auguria',1,'','left','tools',161095,NULL,NULL,2,'/imports/index.php?leftmenu=import','','FormatedImport','exports',0,'import','$user->rights->import->run','$conf->import->enabled',2,'2017-08-30 15:14:30'),(165218,'auguria',1,'','left','tools',165217,NULL,NULL,0,'/imports/import.php?leftmenu=import','','NewImport','exports',1,'','$user->rights->import->run','$conf->import->enabled',2,'2017-08-30 15:14:30'),(165287,'auguria',1,'','left','members',161100,NULL,NULL,0,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Members','members',0,'members','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165288,'auguria',1,'','left','members',165287,NULL,NULL,0,'/adherents/card.php?leftmenu=members&amp;action=create','','NewMember','members',1,'','$user->rights->adherent->creer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165289,'auguria',1,'','left','members',165287,NULL,NULL,1,'/adherents/list.php','','List','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165290,'auguria',1,'','left','members',165289,NULL,NULL,2,'/adherents/list.php?leftmenu=members&amp;statut=-1','','MenuMembersToValidate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165291,'auguria',1,'','left','members',165289,NULL,NULL,3,'/adherents/list.php?leftmenu=members&amp;statut=1','','MenuMembersValidated','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165292,'auguria',1,'','left','members',165289,NULL,NULL,4,'/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=outofdate','','MenuMembersNotUpToDate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165293,'auguria',1,'','left','members',165289,NULL,NULL,5,'/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=uptodate','','MenuMembersUpToDate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165294,'auguria',1,'','left','members',165289,NULL,NULL,6,'/adherents/list.php?leftmenu=members&amp;statut=0','','MenuMembersResiliated','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165295,'auguria',1,'','left','members',165287,NULL,NULL,7,'/adherents/stats/geo.php?leftmenu=members&amp;mode=memberbycountry','','MenuMembersStats','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165387,'auguria',1,'','left','members',161100,NULL,NULL,1,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Subscriptions','compta',0,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165388,'auguria',1,'','left','members',165387,NULL,NULL,0,'/adherents/list.php?statut=-1&amp;leftmenu=accountancy&amp;mainmenu=members','','NewSubscription','compta',1,'','$user->rights->adherent->cotisation->creer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165389,'auguria',1,'','left','members',165387,NULL,NULL,1,'/adherents/subscription/list.php?leftmenu=members','','List','compta',1,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165390,'auguria',1,'','left','members',165387,NULL,NULL,7,'/adherents/stats/index.php?leftmenu=members','','MenuMembersStats','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165589,'auguria',1,'','left','members',165287,NULL,NULL,9,'/adherents/htpasswd.php?leftmenu=export','','Filehtpasswd','members',1,'','$user->rights->adherent->export','! empty($conf->global->MEMBER_LINK_TO_HTPASSWDFILE) && $conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165590,'auguria',1,'','left','members',165287,NULL,NULL,10,'/adherents/cartes/carte.php?leftmenu=export','','MembersCards','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165687,'auguria',1,'','left','hrm',161102,NULL,NULL,1,'/user/index.php?leftmenu=hrm&mode=employee','','Employees','hrm',0,'hrm','$user->rights->hrm->employee->read','$conf->hrm->enabled',0,'2017-08-30 15:14:30'),(165688,'auguria',1,'','left','hrm',165687,NULL,NULL,1,'/user/card.php?action=create&employee=1','','NewEmployee','hrm',1,'','$user->rights->hrm->employee->write','$conf->hrm->enabled',0,'2017-08-30 15:14:30'),(165689,'auguria',1,'','left','hrm',165687,NULL,NULL,2,'/user/index.php?$leftmenu=hrm&mode=employee&contextpage=employeelist','','List','hrm',1,'','$user->rights->hrm->employee->read','$conf->hrm->enabled',0,'2017-08-30 15:14:30'),(165787,'auguria',1,'','left','members',161100,NULL,NULL,5,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members','','MembersTypes','members',0,'setup','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165788,'auguria',1,'','left','members',165787,NULL,NULL,0,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members&amp;action=create','','New','members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165789,'auguria',1,'','left','members',165787,NULL,NULL,1,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members','','List','members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(166087,'auguria',1,'','left','hrm',161102,NULL,NULL,1,'/holiday/list.php?&leftmenu=hrm','','CPTitreMenu','holiday',0,'hrm','$user->rights->holiday->read','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166088,'auguria',1,'','left','hrm',166087,NULL,NULL,1,'/holiday/card.php?&action=request','','MenuAddCP','holiday',1,'','$user->rights->holiday->write','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166089,'auguria',1,'','left','hrm',166087,NULL,NULL,1,'/holiday/list.php?&leftmenu=hrm','','List','holiday',1,'','$user->rights->holiday->read','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166090,'auguria',1,'','left','hrm',166089,NULL,NULL,1,'/holiday/list.php?select_statut=2&leftmenu=hrm','','ListToApprove','trips',2,'','$user->rights->holiday->read','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166091,'auguria',1,'','left','hrm',166087,NULL,NULL,2,'/holiday/define_holiday.php?&action=request','','MenuConfCP','holiday',1,'','$user->rights->holiday->define_holiday','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166092,'auguria',1,'','left','hrm',166087,NULL,NULL,3,'/holiday/view_log.php?&action=request','','MenuLogCP','holiday',1,'','$user->rights->holiday->define_holiday','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166187,'auguria',1,'','left','commercial',161092,NULL,NULL,6,'/fourn/commande/index.php?leftmenu=orders_suppliers','','SuppliersOrders','orders',0,'orders_suppliers','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166188,'auguria',1,'','left','commercial',166187,NULL,NULL,0,'/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers','','NewOrder','orders',1,'','$user->rights->fournisseur->commande->creer','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166189,'auguria',1,'','left','commercial',166187,NULL,NULL,1,'/fourn/commande/list.php?leftmenu=orders_suppliers&amp;search_status=0','','List','orders',1,'','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166195,'auguria',1,'','left','commercial',166187,NULL,NULL,7,'/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier','','Statistics','orders',1,'','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166287,'auguria',1,'','left','members',161100,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=3','','MembersCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->adherent->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(166288,'auguria',1,'','left','members',166287,NULL,NULL,0,'/categories/card.php?action=create&amp;type=3','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->adherent->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(166387,'auguria',1,'','left','hrm',161102,NULL,NULL,5,'/expensereport/index.php?leftmenu=expensereport','','TripsAndExpenses','trips',0,'expensereport','$user->rights->expensereport->lire','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166388,'auguria',1,'','left','hrm',166387,NULL,NULL,1,'/expensereport/card.php?action=create&amp;leftmenu=expensereport','','New','trips',1,'','$user->rights->expensereport->creer','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166389,'auguria',1,'','left','hrm',166387,NULL,NULL,2,'/expensereport/list.php?leftmenu=expensereport','','List','trips',1,'','$user->rights->expensereport->lire','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166390,'auguria',1,'','left','hrm',166389,NULL,NULL,2,'/expensereport/list.php?search_status=2&amp;leftmenu=expensereport','','ListToApprove','trips',2,'','$user->rights->expensereport->approve','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166391,'auguria',1,'','left','hrm',166387,NULL,NULL,2,'/expensereport/stats/index.php?leftmenu=expensereport','','Statistics','trips',1,'','$user->rights->expensereport->lire','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166467,'all',1,'variants','left','products',-1,'product','products',100,'/variants/list.php','','VariantAttributes','products',NULL,'product','1','$conf->product->enabled',0,'2018-01-19 11:28:04'),(166541,'all',1,'ticket','top','ticket',0,NULL,NULL,88,'/ticket/index.php','','Ticket','ticket',NULL,'1','$user->rights->ticket->read','$conf->ticket->enabled',2,'2019-06-05 09:15:29'),(166542,'all',1,'ticket','left','ticket',-1,NULL,'ticket',101,'/ticket/index.php','','Ticket','ticket',NULL,'ticket','$user->rights->ticket->read','$conf->ticket->enabled',2,'2019-06-05 09:15:29'),(166543,'all',1,'ticket','left','ticket',-1,'ticket','ticket',102,'/ticket/card.php?action=create','','NewTicket','ticket',NULL,NULL,'$user->rights->ticket->write','$conf->ticket->enabled',2,'2019-06-05 09:15:29'),(166544,'all',1,'ticket','left','ticket',-1,'ticket','ticket',103,'/ticket/list.php?search_fk_status=non_closed','','List','ticket',NULL,'ticketlist','$user->rights->ticket->read','$conf->ticket->enabled',2,'2019-06-05 09:15:29'),(166545,'all',1,'ticket','left','ticket',-1,'ticket','ticket',105,'/ticket/list.php?mode=mine&search_fk_status=non_closed','','MenuTicketMyAssign','ticket',NULL,'ticketmy','$user->rights->ticket->read','$conf->ticket->enabled',0,'2019-06-05 09:15:29'),(166546,'all',1,'ticket','left','ticket',-1,'ticket','ticket',107,'/ticket/stats/index.php','','Statistics','ticket',NULL,NULL,'$user->rights->ticket->read','$conf->ticket->enabled',0,'2019-06-05 09:15:29'),(166923,'all',1,'resource','left','tools',-1,NULL,'tools',100,'/resource/list.php','','MenuResourceIndex','resource',NULL,'resource','$user->rights->resource->read','1',0,'2020-01-20 11:46:00'),(166924,'all',1,'resource','left','tools',-1,'resource','tools',101,'/resource/card.php?action=create','','MenuResourceAdd','resource',NULL,'resource_add','$user->rights->resource->write','1',0,'2020-01-20 11:46:00'),(166925,'all',1,'resource','left','tools',-1,'resource','tools',102,'/resource/list.php','','List','resource',NULL,'resource_list','$user->rights->resource->read','1',0,'2020-01-20 11:46:00'),(166976,'all',1,'agenda','top','agenda',0,NULL,NULL,86,'/comm/action/index.php','','TMenuAgenda','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-06-12 17:12:28'),(166977,'all',1,'agenda','left','agenda',166976,NULL,NULL,100,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Actions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-06-12 17:12:28'),(166978,'all',1,'agenda','left','agenda',166977,NULL,NULL,101,'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create','','NewAction','commercial',NULL,NULL,'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)','$conf->agenda->enabled',2,'2020-06-12 17:12:28'),(166979,'all',1,'agenda','left','agenda',166977,NULL,NULL,140,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda','','Calendar','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-06-12 17:12:28'),(166980,'all',1,'agenda','left','agenda',166979,NULL,NULL,141,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-06-12 17:12:28'),(166981,'all',1,'agenda','left','agenda',166979,NULL,NULL,142,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-06-12 17:12:28'),(166982,'all',1,'agenda','left','agenda',166979,NULL,NULL,143,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2020-06-12 17:12:28'),(166983,'all',1,'agenda','left','agenda',166979,NULL,NULL,144,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2020-06-12 17:12:28'),(166984,'all',1,'agenda','left','agenda',166977,NULL,NULL,110,'/comm/action/list.php?mainmenu=agenda&amp;leftmenu=agenda','','List','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-06-12 17:12:28'),(166985,'all',1,'agenda','left','agenda',166984,NULL,NULL,111,'/comm/action/list.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-06-12 17:12:28'),(166986,'all',1,'agenda','left','agenda',166984,NULL,NULL,112,'/comm/action/list.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-06-12 17:12:28'),(166987,'all',1,'agenda','left','agenda',166984,NULL,NULL,113,'/comm/action/list.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2020-06-12 17:12:28'),(166988,'all',1,'agenda','left','agenda',166984,NULL,NULL,114,'/comm/action/list.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2020-06-12 17:12:28'),(166989,'all',1,'agenda','left','agenda',166977,NULL,NULL,160,'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Reportings','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->agenda->enabled',2,'2020-06-12 17:12:28'),(166990,'all',1,'agenda','left','agenda',166977,NULL,NULL,170,'/categories/index.php?mainmenu=agenda&amp;leftmenu=agenda&type=10','','Categories','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->categorie->enabled&&$conf->categorie->enabled',2,'2020-06-12 17:12:28'),(166991,'all',1,'barcode','left','tools',-1,NULL,'tools',200,'/barcode/printsheet.php?mainmenu=tools&leftmenu=barcodeprint','','BarCodePrintsheet','products',NULL,'barcodeprint','($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->lire_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)','$conf->barcode->enabled',2,'2020-06-12 17:12:28'),(166992,'all',1,'barcode','left','home',-1,'admintools','home',300,'/barcode/codeinit.php?mainmenu=home&leftmenu=admintools','','MassBarcodeInit','products',NULL,NULL,'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->creer_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)','$conf->barcode->enabled && preg_match(\'/^(admintools|all)/\',$leftmenu)',0,'2020-06-12 17:12:28'),(166993,'all',1,'cron','left','home',-1,'admintools','home',200,'/cron/list.php?leftmenu=admintools','','CronList','cron',NULL,NULL,'$user->rights->cron->read','$conf->cron->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)',2,'2020-06-12 17:12:28'),(166994,'all',1,'ecm','top','ecm',0,NULL,NULL,82,'/ecm/index.php','','MenuECM','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload || $user->rights->ecm->setup','$conf->ecm->enabled',2,'2020-06-12 17:12:29'),(166995,'all',1,'ecm','left','ecm',-1,NULL,'ecm',101,'/ecm/index.php?mainmenu=ecm&leftmenu=ecm','','ECMArea','ecm',NULL,'ecm','$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2020-06-12 17:12:29'),(166996,'all',1,'ecm','left','ecm',-1,'ecm','ecm',102,'/ecm/index.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsManual','ecm',NULL,'ecm_manual','$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2020-06-12 17:12:29'),(166997,'all',1,'ecm','left','ecm',-1,'ecm','ecm',103,'/ecm/index_auto.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsAuto','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload','($user->rights->ecm->read || $user->rights->ecm->upload) && ! empty($conf->global->ECM_AUTO_TREE_ENABLED)',2,'2020-06-12 17:12:29'),(166998,'all',1,'opensurvey','left','tools',-1,NULL,'tools',200,'/opensurvey/index.php?mainmenu=tools&leftmenu=opensurvey','','Survey','opensurvey',NULL,'opensurvey','$user->rights->opensurvey->read','$conf->opensurvey->enabled',0,'2020-06-12 17:12:29'),(166999,'all',1,'opensurvey','left','tools',-1,'opensurvey','tools',210,'/opensurvey/wizard/index.php','','NewSurvey','opensurvey',NULL,'opensurvey_new','$user->rights->opensurvey->write','$conf->opensurvey->enabled',0,'2020-06-12 17:12:29'),(167000,'all',1,'opensurvey','left','tools',-1,'opensurvey','tools',220,'/opensurvey/list.php','','List','opensurvey',NULL,'opensurvey_list','$user->rights->opensurvey->read','$conf->opensurvey->enabled',0,'2020-06-12 17:12:29'),(167001,'all',1,'takepos','top','takepos',0,NULL,NULL,1001,'/takepos/index.php','takepos','PointOfSaleShort','cashdesk',NULL,NULL,'$user->rights->takepos->run','$conf->takepos->enabled',2,'2020-06-12 17:12:30'),(167002,'all',1,'website','top','website',0,NULL,NULL,100,'/website/index.php','','WebSites','website',NULL,NULL,'$user->rights->website->read','$conf->website->enabled',2,'2020-06-12 17:12:30');
+INSERT INTO `llx_menu` VALUES (103094,'all',2,'agenda','top','agenda',0,NULL,NULL,100,'/comm/action/index.php','','Agenda','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103095,'all',2,'agenda','left','agenda',103094,NULL,NULL,100,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Actions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103096,'all',2,'agenda','left','agenda',103095,NULL,NULL,101,'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create','','NewAction','commercial',NULL,NULL,'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103097,'all',2,'agenda','left','agenda',103095,NULL,NULL,102,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Calendar','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103098,'all',2,'agenda','left','agenda',103097,NULL,NULL,103,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103099,'all',2,'agenda','left','agenda',103097,NULL,NULL,104,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103100,'all',2,'agenda','left','agenda',103097,NULL,NULL,105,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103101,'all',2,'agenda','left','agenda',103097,NULL,NULL,106,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103102,'all',2,'agenda','left','agenda',103095,NULL,NULL,112,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda','','List','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103103,'all',2,'agenda','left','agenda',103102,NULL,NULL,113,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103104,'all',2,'agenda','left','agenda',103102,NULL,NULL,114,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103105,'all',2,'agenda','left','agenda',103102,NULL,NULL,115,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103106,'all',2,'agenda','left','agenda',103102,NULL,NULL,116,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103107,'all',2,'agenda','left','agenda',103095,NULL,NULL,120,'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Reportings','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103134,'all',2,'opensurvey','top','opensurvey',0,NULL,NULL,200,'/opensurvey/index.php','','Surveys','opensurvey',NULL,NULL,'$user->rights->opensurvey->survey->read','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(103135,'all',2,'opensurvey','left','opensurvey',-1,NULL,'opensurvey',200,'/opensurvey/index.php?mainmenu=opensurvey&leftmenu=opensurvey','','Survey','opensurvey@opensurvey',NULL,'opensurvey','','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(103136,'all',2,'opensurvey','left','opensurvey',-1,'opensurvey','opensurvey',210,'/opensurvey/public/index.php','_blank','NewSurvey','opensurvey@opensurvey',NULL,'opensurvey_new','','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(103137,'all',2,'opensurvey','left','opensurvey',-1,'opensurvey','opensurvey',220,'/opensurvey/list.php','','List','opensurvey@opensurvey',NULL,'opensurvey_list','','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(145127,'all',1,'printing','left','home',-1,'admintools','home',300,'/printing/index.php?mainmenu=home&leftmenu=admintools','','MenuDirectPrinting','printing',NULL,NULL,'$user->rights->printing->read','$conf->printing->enabled && $leftmenu==\'admintools\'',0,'2017-01-29 15:12:44'),(161088,'auguria',1,'','top','home',0,NULL,NULL,10,'/index.php?mainmenu=home&amp;leftmenu=','','Home','',-1,'','','1',2,'2017-08-30 15:14:30'),(161089,'auguria',1,'societe|fournisseur','top','companies',0,NULL,NULL,20,'/societe/index.php?mainmenu=companies&amp;leftmenu=','','ThirdParties','companies',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)',2,'2017-08-30 15:14:30'),(161090,'auguria',1,'product|service','top','products',0,NULL,NULL,30,'/product/index.php?mainmenu=products&amp;leftmenu=','','Products/Services','products',-1,'','$user->rights->produit->lire||$user->rights->service->lire','$conf->product->enabled || $conf->service->enabled',0,'2017-08-30 15:14:30'),(161092,'auguria',1,'propal|commande|fournisseur|contrat|ficheinter','top','commercial',0,NULL,NULL,40,'/comm/index.php?mainmenu=commercial&amp;leftmenu=','','Commercial','commercial',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','$conf->propal->enabled || $conf->commande->enabled || $conf->supplier_order->enabled || $conf->contrat->enabled || $conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(161093,'auguria',1,'comptabilite|accounting|facture|don|tax|salaries|loan','top','accountancy',0,NULL,NULL,50,'/compta/index.php?mainmenu=accountancy&amp;leftmenu=','','MenuFinancial','compta',-1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->facture->lire|| $user->rights->don->lire || $user->rights->tax->charges->lire || $user->rights->salaries->read || $user->rights->loan->read','$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->don->enabled  || $conf->tax->enabled || $conf->salaries->enabled || $conf->supplier_invoice->enabled || $conf->loan->enabled',2,'2017-08-30 15:14:30'),(161094,'auguria',1,'projet','top','project',0,NULL,NULL,70,'/projet/index.php?mainmenu=project&amp;leftmenu=','','Projects','projects',-1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(161095,'auguria',1,'mailing|export|import|opensurvey|resource','top','tools',0,NULL,NULL,90,'/core/tools.php?mainmenu=tools&amp;leftmenu=','','Tools','other',-1,'','$user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run || $user->rights->opensurvey->read || $user->rights->resource->read','$conf->mailing->enabled || $conf->export->enabled || $conf->import->enabled || $conf->opensurvey->enabled || $conf->resource->enabled',2,'2017-08-30 15:14:30'),(161101,'auguria',1,'banque|prelevement','top','bank',0,NULL,NULL,60,'/compta/bank/index.php?mainmenu=bank&amp;leftmenu=bank','','MenuBankCash','banks',-1,'','$user->rights->banque->lire || $user->rights->prelevement->bons->lire','$conf->banque->enabled || $conf->prelevement->enabled',0,'2017-08-30 15:14:30'),(161102,'auguria',1,'hrm|holiday|deplacement|expensereport','top','hrm',0,NULL,NULL,80,'/hrm/index.php?mainmenu=hrm&amp;leftmenu=','','HRM','holiday',-1,'','$user->rights->hrm->employee->read || $user->rights->holiday->write || $user->rights->deplacement->lire || $user->rights->expensereport->lire','$conf->hrm->enabled || $conf->holiday->enabled || $conf->deplacement->enabled || $conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(161177,'auguria',1,'','left','home',161088,NULL,NULL,0,'/index.php','','MyDashboard','',0,'','','1',2,'2017-08-30 15:14:30'),(161187,'auguria',1,'','left','home',161088,NULL,NULL,1,'/admin/index.php?leftmenu=setup','','Setup','admin',0,'setup','','$user->admin',2,'2017-08-30 15:14:30'),(161188,'auguria',1,'','left','home',161187,NULL,NULL,1,'/admin/company.php?leftmenu=setup','','MenuCompanySetup','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161189,'auguria',1,'','left','home',161187,NULL,NULL,4,'/admin/ihm.php?leftmenu=setup','','GUISetup','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161190,'auguria',1,'','left','home',161187,NULL,NULL,2,'/admin/modules.php?leftmenu=setup','','Modules','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161191,'auguria',1,'','left','home',161187,NULL,NULL,6,'/admin/boxes.php?leftmenu=setup','','Boxes','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161192,'auguria',1,'','left','home',161187,NULL,NULL,3,'/admin/menus.php?leftmenu=setup','','Menus','admin',1,'','','$leftmenu==\'setup\'',2,'2017-09-06 08:29:47'),(161193,'auguria',1,'','left','home',161187,NULL,NULL,7,'/admin/delais.php?leftmenu=setup','','Alerts','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161194,'auguria',1,'','left','home',161187,NULL,NULL,10,'/admin/pdf.php?leftmenu=setup','','PDF','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161195,'auguria',1,'','left','home',161187,NULL,NULL,8,'/admin/security_other.php?leftmenu=setup','','Security','admin',1,'','','$leftmenu==\'setup\'',2,'2017-09-06 08:29:36'),(161196,'auguria',1,'','left','home',161187,NULL,NULL,11,'/admin/mails.php?leftmenu=setup','','Emails','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161197,'auguria',1,'','left','home',161187,NULL,NULL,9,'/admin/limits.php?leftmenu=setup','','MenuLimits','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161198,'auguria',1,'','left','home',161187,NULL,NULL,13,'/admin/dict.php?leftmenu=setup','','Dictionary','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161199,'auguria',1,'','left','home',161187,NULL,NULL,14,'/admin/const.php?leftmenu=setup','','OtherSetup','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161200,'auguria',1,'','left','home',161187,NULL,NULL,12,'/admin/sms.php?leftmenu=setup','','SMS','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161201,'auguria',1,'','left','home',161187,NULL,NULL,4,'/admin/translation.php?leftmenu=setup','','Translation','admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161288,'auguria',1,'','left','home',161387,NULL,NULL,0,'/admin/system/dolibarr.php?leftmenu=admintools','','InfoDolibarr','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161289,'auguria',1,'','left','home',161288,NULL,NULL,2,'/admin/system/modules.php?leftmenu=admintools','','Modules','admin',2,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161290,'auguria',1,'','left','home',161288,NULL,NULL,3,'/admin/triggers.php?leftmenu=admintools','','Triggers','admin',2,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161291,'auguria',1,'','left','home',161288,NULL,NULL,4,'/admin/system/filecheck.php?leftmenu=admintools','','FileCheck','admin',2,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161292,'auguria',1,'','left','home',161387,NULL,NULL,1,'/admin/system/browser.php?leftmenu=admintools','','InfoBrowser','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161293,'auguria',1,'','left','home',161387,NULL,NULL,2,'/admin/system/os.php?leftmenu=admintools','','InfoOS','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161294,'auguria',1,'','left','home',161387,NULL,NULL,3,'/admin/system/web.php?leftmenu=admintools','','InfoWebServer','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161295,'auguria',1,'','left','home',161387,NULL,NULL,4,'/admin/system/phpinfo.php?leftmenu=admintools','','InfoPHP','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161297,'auguria',1,'','left','home',161387,NULL,NULL,5,'/admin/system/database.php?leftmenu=admintools','','InfoDatabase','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161387,'auguria',1,'','left','home',161088,NULL,NULL,2,'/admin/tools/index.php?leftmenu=admintools','','AdminTools','admin',0,'admintools','','$user->admin',2,'2017-08-30 15:14:30'),(161388,'auguria',1,'','left','home',161387,NULL,NULL,6,'/admin/tools/dolibarr_export.php?leftmenu=admintools','','Backup','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161389,'auguria',1,'','left','home',161387,NULL,NULL,7,'/admin/tools/dolibarr_import.php?leftmenu=admintools','','Restore','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161392,'auguria',1,'','left','home',161387,NULL,NULL,8,'/admin/tools/update.php?leftmenu=admintools','','MenuUpgrade','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161393,'auguria',1,'','left','home',161387,NULL,NULL,9,'/admin/tools/eaccelerator.php?leftmenu=admintools','','EAccelerator','admin',1,'','','$leftmenu==\"admintools\" && function_exists(\"eaccelerator_info\")',2,'2017-08-30 15:14:30'),(161394,'auguria',1,'','left','home',161387,NULL,NULL,10,'/admin/tools/listevents.php?leftmenu=admintools','','Audit','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161395,'auguria',1,'','left','home',161387,NULL,NULL,11,'/admin/tools/listsessions.php?leftmenu=admintools','','Sessions','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161396,'auguria',1,'','left','home',161387,NULL,NULL,12,'/admin/tools/purge.php?leftmenu=admintools','','Purge','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161398,'auguria',1,'','left','home',161387,NULL,NULL,14,'/admin/system/about.php?leftmenu=admintools','','ExternalResources','admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161407,'auguria',1,'','left','home',161387,NULL,NULL,15,'/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=admintools','','ProductVatMassChange','products',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161487,'auguria',1,'','left','home',161088,NULL,NULL,4,'/user/home.php?leftmenu=users','','MenuUsersAndGroups','users',0,'users','','1',2,'2017-08-30 15:14:30'),(161488,'auguria',1,'','left','home',161487,NULL,NULL,0,'/user/index.php?leftmenu=users','','Users','users',1,'','$user->rights->user->user->lire || $user->admin','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161489,'auguria',1,'','left','home',161488,NULL,NULL,0,'/user/card.php?leftmenu=users&amp;action=create','','NewUser','users',2,'','($user->rights->user->user->creer || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161490,'auguria',1,'','left','home',161487,NULL,NULL,1,'/user/group/index.php?leftmenu=users','','Groups','users',1,'','(($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161491,'auguria',1,'','left','home',161490,NULL,NULL,0,'/user/group/card.php?leftmenu=users&amp;action=create','','NewGroup','users',2,'','(($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161587,'auguria',1,'','left','companies',161089,NULL,NULL,0,'/societe/index.php?leftmenu=thirdparties','','ThirdParty','companies',0,'thirdparties','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161588,'auguria',1,'','left','companies',161587,NULL,NULL,0,'/societe/card.php?action=create','','MenuNewThirdParty','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161589,'auguria',1,'','left','companies',161587,NULL,NULL,0,'/societe/list.php?action=create','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161590,'auguria',1,'','left','companies',161587,NULL,NULL,5,'/societe/list.php?type=f&leftmenu=suppliers','','ListSuppliersShort','suppliers',1,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2017-08-30 15:14:30'),(161591,'auguria',1,'','left','companies',161590,NULL,NULL,0,'/societe/card.php?leftmenu=supplier&amp;action=create&amp;type=f','','NewSupplier','suppliers',2,'','$user->rights->societe->creer','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2017-08-30 15:14:30'),(161593,'auguria',1,'','left','companies',161587,NULL,NULL,3,'/societe/list.php?type=p&leftmenu=prospects','','ListProspectsShort','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161594,'auguria',1,'','left','companies',161593,NULL,NULL,0,'/societe/card.php?leftmenu=prospects&amp;action=create&amp;type=p','','MenuNewProspect','companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161596,'auguria',1,'','left','companies',161587,NULL,NULL,4,'/societe/list.php?type=c&leftmenu=customers','','ListCustomersShort','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161597,'auguria',1,'','left','companies',161596,NULL,NULL,0,'/societe/card.php?leftmenu=customers&amp;action=create&amp;type=c','','MenuNewCustomer','companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161687,'auguria',1,'','left','companies',161089,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','ContactsAddresses','companies',0,'contacts','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161688,'auguria',1,'','left','companies',161687,NULL,NULL,0,'/contact/card.php?leftmenu=contacts&amp;action=create','','NewContactAddress','companies',1,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161689,'auguria',1,'','left','companies',161687,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161691,'auguria',1,'','left','companies',161689,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&amp;type=p','','ThirdPartyProspects','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161692,'auguria',1,'','left','companies',161689,NULL,NULL,2,'/contact/list.php?leftmenu=contacts&amp;type=c','','ThirdPartyCustomers','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161693,'auguria',1,'','left','companies',161689,NULL,NULL,3,'/contact/list.php?leftmenu=contacts&amp;type=f','','ThirdPartySuppliers','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2017-08-30 15:14:30'),(161694,'auguria',1,'','left','companies',161689,NULL,NULL,4,'/contact/list.php?leftmenu=contacts&amp;type=o','','Others','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161737,'auguria',1,'','left','companies',161089,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=1','','SuppliersCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161738,'auguria',1,'','left','companies',161737,NULL,NULL,0,'/categories/card.php?action=create&amp;type=1','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161747,'auguria',1,'','left','companies',161089,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=2','','CustomersProspectsCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161748,'auguria',1,'','left','companies',161747,NULL,NULL,0,'/categories/card.php?action=create&amp;type=2','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161757,'auguria',1,'','left','companies',161089,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=4','','ContactCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161758,'auguria',1,'','left','companies',161757,NULL,NULL,0,'/categories/card.php?action=create&amp;type=4','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(162187,'auguria',1,'','left','commercial',161092,NULL,NULL,4,'/comm/propal/index.php?leftmenu=propals','','Prop','propal',0,'propals','$user->rights->propale->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162188,'auguria',1,'','left','commercial',162187,NULL,NULL,0,'/comm/propal/card.php?action=create&amp;leftmenu=propals','','NewPropal','propal',1,'','$user->rights->propale->creer','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162189,'auguria',1,'','left','commercial',162187,NULL,NULL,1,'/comm/propal/list.php?leftmenu=propals','','List','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162190,'auguria',1,'','left','commercial',162189,NULL,NULL,2,'/comm/propal/list.php?leftmenu=propals&amp;search_status=0','','PropalsDraft','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162191,'auguria',1,'','left','commercial',162189,NULL,NULL,3,'/comm/propal/list.php?leftmenu=propals&amp;search_status=1','','PropalsOpened','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162192,'auguria',1,'','left','commercial',162189,NULL,NULL,4,'/comm/propal/list.php?leftmenu=propals&amp;search_status=2','','PropalStatusSigned','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162193,'auguria',1,'','left','commercial',162189,NULL,NULL,5,'/comm/propal/list.php?leftmenu=propals&amp;search_status=3','','PropalStatusNotSigned','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162194,'auguria',1,'','left','commercial',162189,NULL,NULL,6,'/comm/propal/list.php?leftmenu=propals&amp;search_status=4','','PropalStatusBilled','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162197,'auguria',1,'','left','commercial',162187,NULL,NULL,4,'/comm/propal/stats/index.php?leftmenu=propals','','Statistics','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162287,'auguria',1,'','left','commercial',161092,NULL,NULL,5,'/commande/index.php?leftmenu=orders','','CustomersOrders','orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162288,'auguria',1,'','left','commercial',162287,NULL,NULL,0,'/commande/card.php?action=create&amp;leftmenu=orders','','NewOrder','orders',1,'','$user->rights->commande->creer','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162289,'auguria',1,'','left','commercial',162287,NULL,NULL,1,'/commande/list.php?leftmenu=orders','','List','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162290,'auguria',1,'','left','commercial',162289,NULL,NULL,2,'/commande/list.php?leftmenu=orders&amp;search_status=0','','StatusOrderDraftShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162291,'auguria',1,'','left','commercial',162289,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;search_status=1','','StatusOrderValidated','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162292,'auguria',1,'','left','commercial',162289,NULL,NULL,4,'/commande/list.php?leftmenu=orders&amp;search_status=2','','StatusOrderOnProcessShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162293,'auguria',1,'','left','commercial',162289,NULL,NULL,5,'/commande/list.php?leftmenu=orders&amp;search_status=3','','StatusOrderToBill','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162294,'auguria',1,'','left','commercial',162289,NULL,NULL,6,'/commande/list.php?leftmenu=orders&amp;search_status=4','','StatusOrderProcessed','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162295,'auguria',1,'','left','commercial',162289,NULL,NULL,7,'/commande/list.php?leftmenu=orders&amp;search_status=-1','','StatusOrderCanceledShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162296,'auguria',1,'','left','commercial',162287,NULL,NULL,4,'/commande/stats/index.php?leftmenu=orders','','Statistics','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162387,'auguria',1,'','left','commercial',161090,NULL,NULL,6,'/expedition/index.php?leftmenu=sendings','','Shipments','sendings',0,'sendings','$user->rights->expedition->lire','$conf->expedition->enabled',2,'2017-08-30 15:14:30'),(162388,'auguria',1,'','left','commercial',162387,NULL,NULL,0,'/expedition/card.php?action=create2&leftmenu=sendings','','NewSending','sendings',1,'','$user->rights->expedition->creer','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2017-08-30 15:14:30'),(162389,'auguria',1,'','left','commercial',162387,NULL,NULL,1,'/expedition/list.php?leftmenu=sendings','','List','sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2017-08-30 15:14:30'),(162390,'auguria',1,'','left','commercial',162387,NULL,NULL,2,'/expedition/stats/index.php?leftmenu=sendings','','Statistics','sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2017-08-30 15:14:30'),(162487,'auguria',1,'','left','commercial',161092,NULL,NULL,7,'/contrat/index.php?leftmenu=contracts','','Contracts','contracts',0,'contracts','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162488,'auguria',1,'','left','commercial',162487,NULL,NULL,0,'/contrat/card.php?&action=create&amp;leftmenu=contracts','','NewContract','contracts',1,'','$user->rights->contrat->creer','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162489,'auguria',1,'','left','commercial',162487,NULL,NULL,1,'/contrat/list.php?leftmenu=contracts','','List','contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162490,'auguria',1,'','left','commercial',162487,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts','','MenuServices','contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162491,'auguria',1,'','left','commercial',162490,NULL,NULL,0,'/contrat/services.php?leftmenu=contracts&amp;mode=0','','MenuInactiveServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162492,'auguria',1,'','left','commercial',162490,NULL,NULL,1,'/contrat/services.php?leftmenu=contracts&amp;mode=4','','MenuRunningServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162493,'auguria',1,'','left','commercial',162490,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts&amp;mode=4&amp;filter=expired','','MenuExpiredServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162494,'auguria',1,'','left','commercial',162490,NULL,NULL,3,'/contrat/services.php?leftmenu=contracts&amp;mode=5','','MenuClosedServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162587,'auguria',1,'','left','commercial',161092,NULL,NULL,8,'/fichinter/list.php?leftmenu=ficheinter','','Interventions','interventions',0,'ficheinter','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162588,'auguria',1,'','left','commercial',162587,NULL,NULL,0,'/fichinter/card.php?action=create&amp;leftmenu=ficheinter','','NewIntervention','interventions',1,'','$user->rights->ficheinter->creer','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162589,'auguria',1,'','left','commercial',162587,NULL,NULL,1,'/fichinter/list.php?leftmenu=ficheinter','','List','interventions',1,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162590,'auguria',1,'','left','commercial',162587,NULL,NULL,2,'/fichinter/stats/index.php?leftmenu=ficheinter','','Statistics','interventions',1,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162687,'auguria',1,'','left','accountancy',161093,NULL,NULL,3,'/fourn/facture/list.php?leftmenu=suppliers_bills','','BillsSuppliers','bills',0,'supplier_bills','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162688,'auguria',1,'','left','accountancy',162687,NULL,NULL,0,'/fourn/facture/card.php?action=create&amp;leftmenu=suppliers_bills','','NewBill','bills',1,'','$user->rights->fournisseur->facture->creer','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162689,'auguria',1,'','left','accountancy',162687,NULL,NULL,1,'/fourn/facture/list.php?leftmenu=suppliers_bills','','List','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162690,'auguria',1,'','left','accountancy',162687,NULL,NULL,2,'/fourn/facture/paiement.php?leftmenu=suppliers_bills','','Payments','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162691,'auguria',1,'','left','accountancy',162687,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills&mode=supplier','','Statistics','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162692,'auguria',1,'','left','accountancy',162690,NULL,NULL,1,'/fourn/facture/rapport.php?leftmenu=suppliers_bills','','Reporting','bills',2,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162787,'auguria',1,'','left','accountancy',161093,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills','','BillsCustomers','bills',0,'customer_bills','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162788,'auguria',1,'','left','accountancy',162787,NULL,NULL,3,'/compta/facture/card.php?action=create&amp;leftmenu=customers_bills','','NewBill','bills',1,'','$user->rights->facture->creer','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162789,'auguria',1,'','left','accountancy',162787,NULL,NULL,5,'/compta/facture/fiche-rec.php?leftmenu=customers_bills','','ListOfTemplates','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162791,'auguria',1,'','left','accountancy',162787,NULL,NULL,6,'/compta/paiement/list.php?leftmenu=customers_bills','','Payments','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162792,'auguria',1,'','left','accountancy',162787,NULL,NULL,4,'/compta/facture/list.php?leftmenu=customers_bills','','List','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162797,'auguria',1,'','left','accountancy',162791,NULL,NULL,1,'/compta/paiement/rapport.php?leftmenu=customers_bills','','Reportings','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162798,'auguria',1,'','left','accountancy',161101,NULL,NULL,9,'/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank','','MenuChequeDeposits','bills',0,'checks','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2017-08-30 15:14:30'),(162799,'auguria',1,'','left','accountancy',162798,NULL,NULL,0,'/compta/paiement/cheque/card.php?leftmenu=checks&amp;action=new','','NewCheckDeposit','compta',1,'','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2017-08-30 15:14:30'),(162800,'auguria',1,'','left','accountancy',162798,NULL,NULL,1,'/compta/paiement/cheque/list.php?leftmenu=checks','','List','bills',1,'','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2017-08-30 15:14:30'),(162801,'auguria',1,'','left','accountancy',162787,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills','','Statistics','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162807,'auguria',1,'','left','accountancy',162792,NULL,NULL,1,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=0','','BillShortStatusDraft','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162808,'auguria',1,'','left','accountancy',162792,NULL,NULL,2,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=1','','BillShortStatusNotPaid','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162809,'auguria',1,'','left','accountancy',162792,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=2','','BillShortStatusPaid','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162810,'auguria',1,'','left','accountancy',162792,NULL,NULL,4,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=3','','BillShortStatusCanceled','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162987,'auguria',1,'','left','accountancy',161093,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;search_status=3','','MenuOrdersToBill','orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',0,'2017-08-30 15:14:30'),(163087,'auguria',1,'','left','accountancy',161093,NULL,NULL,4,'/don/index.php?leftmenu=donations&amp;mainmenu=accountancy','','Donations','donations',0,'donations','$user->rights->don->lire','$conf->don->enabled',2,'2017-08-30 15:14:30'),(163088,'auguria',1,'','left','accountancy',163087,NULL,NULL,0,'/don/card.php?leftmenu=donations&amp;mainmenu=accountancy&amp;action=create','','NewDonation','donations',1,'','$user->rights->don->creer','$conf->don->enabled && $leftmenu==\"donations\"',2,'2017-08-30 15:14:30'),(163089,'auguria',1,'','left','accountancy',163087,NULL,NULL,1,'/don/list.php?leftmenu=donations&amp;mainmenu=accountancy','','List','donations',1,'','$user->rights->don->lire','$conf->don->enabled && $leftmenu==\"donations\"',2,'2017-08-30 15:14:30'),(163187,'auguria',1,'','left','accountancy',161102,NULL,NULL,5,'/compta/deplacement/index.php?leftmenu=tripsandexpenses','','TripsAndExpenses','trips',0,'tripsandexpenses','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163188,'auguria',1,'','left','accountancy',163187,NULL,NULL,1,'/compta/deplacement/card.php?action=create&amp;leftmenu=tripsandexpenses','','New','trips',1,'','$user->rights->deplacement->creer','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163189,'auguria',1,'','left','accountancy',163187,NULL,NULL,2,'/compta/deplacement/list.php?leftmenu=tripsandexpenses','','List','trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163190,'auguria',1,'','left','accountancy',163187,NULL,NULL,2,'/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses','','Statistics','trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163287,'auguria',1,'','left','accountancy',161093,NULL,NULL,6,'/compta/charges/index.php?leftmenu=tax&amp;mainmenu=accountancy','','MenuSpecialExpenses','compta',0,'tax','(! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (! empty($conf->salaries->enabled) && $user->rights->salaries->read)','$conf->tax->enabled || $conf->salaries->enabled',0,'2017-08-30 15:14:30'),(163297,'auguria',1,'','left','accountancy',163287,NULL,NULL,1,'/compta/salaries/index.php?leftmenu=tax_salary&amp;mainmenu=accountancy','','Salaries','salaries',1,'tax_sal','$user->rights->salaries->payment->read','$conf->salaries->enabled',0,'2017-08-30 15:14:30'),(163298,'auguria',1,'','left','accountancy',163297,NULL,NULL,2,'/compta/salaries/card.php?leftmenu=tax_salary&amp;action=create','','NewPayment','companies',2,'','$user->rights->salaries->payment->write','$conf->salaries->enabled && $leftmenu==\"tax_salary\"',0,'2017-08-30 15:14:30'),(163299,'auguria',1,'','left','accountancy',163297,NULL,NULL,3,'/compta/salaries/index.php?leftmenu=tax_salary','','Payments','companies',2,'','$user->rights->salaries->payment->read','$conf->salaries->enabled && $leftmenu==\"tax_salary\"',0,'2017-08-30 15:14:30'),(163307,'auguria',1,'','left','accountancy',163287,NULL,NULL,1,'/loan/index.php?leftmenu=tax_loan&amp;mainmenu=accountancy','','Loans','loan',1,'tax_loan','$user->rights->loan->read','$conf->loan->enabled',0,'2017-08-30 15:14:30'),(163308,'auguria',1,'','left','accountancy',163307,NULL,NULL,2,'/loan/card.php?leftmenu=tax_loan&amp;action=create','','NewLoan','loan',2,'','$user->rights->loan->write','$conf->loan->enabled && $leftmenu==\"tax_loan\"',0,'2017-08-30 15:14:30'),(163310,'auguria',1,'','left','accountancy',163307,NULL,NULL,4,'/loan/calc.php?leftmenu=tax_loan','','Calculator','companies',2,'','$user->rights->loan->calc','$conf->loan->enabled && $leftmenu==\"tax_loan\" && ! empty($conf->global->LOAN_SHOW_CALCULATOR)',0,'2017-08-30 15:14:30'),(163337,'auguria',1,'','left','accountancy',163287,NULL,NULL,1,'/compta/sociales/index.php?leftmenu=tax_social','','SocialContributions','',1,'tax_social','$user->rights->tax->charges->lire','$conf->tax->enabled',0,'2017-08-30 15:14:30'),(163338,'auguria',1,'','left','accountancy',163337,NULL,NULL,2,'/compta/sociales/card.php?leftmenu=tax_social&amp;action=create','','MenuNewSocialContribution','',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2017-08-30 15:14:30'),(163339,'auguria',1,'','left','accountancy',163337,NULL,NULL,3,'/compta/sociales/payments.php?leftmenu=tax_social&amp;mainmenu=accountancy&amp;mode=sconly','','Payments','',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2017-08-30 15:14:30'),(163387,'auguria',1,'','left','accountancy',163287,NULL,NULL,7,'/compta/tva/index.php?leftmenu=tax_vat&amp;mainmenu=accountancy','','VAT','companies',1,'tax_vat','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS)',0,'2017-08-30 15:14:30'),(163388,'auguria',1,'','left','accountancy',163387,NULL,NULL,0,'/compta/tva/card.php?leftmenu=tax_vat&amp;action=create','','New','companies',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163389,'auguria',1,'','left','accountancy',163387,NULL,NULL,1,'/compta/tva/reglement.php?leftmenu=tax_vat','','List','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163390,'auguria',1,'','left','accountancy',163387,NULL,NULL,2,'/compta/tva/clients.php?leftmenu=tax_vat','','ReportByCustomers','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163391,'auguria',1,'','left','accountancy',163387,NULL,NULL,3,'/compta/tva/quadri_detail.php?leftmenu=tax_vat','','ReportByQuarter','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163487,'auguria',1,'','left','accountancy',161093,NULL,NULL,7,'/accountancy/index.php?leftmenu=accountancy','','MenuAccountancy','accountancy',0,'accounting','! empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163488,'auguria',1,'','left','accountancy',163487,NULL,NULL,2,'/accountancy/customer/index.php?leftmenu=dispatch_customer','','CustomersVentilation','accountancy',1,'dispatch_customer','$user->rights->accounting->bind->write','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163489,'auguria',1,'','left','accountancy',163488,NULL,NULL,3,'/accountancy/customer/list.php','','ToDispatch','accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $leftmenu==\"dispatch_customer\"',0,'2017-08-30 15:14:30'),(163490,'auguria',1,'','left','accountancy',163488,NULL,NULL,4,'/accountancy/customer/lines.php','','Dispatched','accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $leftmenu==\"dispatch_customer\"',0,'2017-08-30 15:14:30'),(163497,'auguria',1,'','left','accountancy',163487,NULL,NULL,5,'/accountancy/supplier/index.php?leftmenu=dispatch_supplier','','SuppliersVentilation','accountancy',1,'ventil_supplier','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->fournisseur->enabled',0,'2017-08-30 15:14:30'),(163498,'auguria',1,'','left','accountancy',163497,NULL,NULL,6,'/accountancy/supplier/list.php','','ToDispatch','accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu==\"dispatch_supplier\"',0,'2017-08-30 15:14:30'),(163499,'auguria',1,'','left','accountancy',163497,NULL,NULL,7,'/accountancy/supplier/lines.php','','Dispatched','accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu==\"dispatch_supplier\"',0,'2017-08-30 15:14:30'),(163507,'auguria',1,'','left','accountancy',163487,NULL,NULL,5,'/accountancy/expensereport/index.php?leftmenu=dispatch_expensereport','','ExpenseReportsVentilation','accountancy',1,'ventil_expensereport','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(163508,'auguria',1,'','left','accountancy',163507,NULL,NULL,6,'/accountancy/expensereport/list.php','','ToDispatch','accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu==\"dispatch_expensereport\"',0,'2017-08-30 15:14:30'),(163509,'auguria',1,'','left','accountancy',163507,NULL,NULL,7,'/accountancy/expensereport/lines.php','','Dispatched','accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu==\"dispatch_expensereport\"',0,'2017-08-30 15:14:30'),(163517,'auguria',1,'','left','accountancy',163487,NULL,NULL,15,'/accountancy/bookkeeping/list.php','','Bookkeeping','accountancy',1,'bookkeeping','$user->rights->accounting->mouvements->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163522,'auguria',1,'','left','accountancy',163487,NULL,NULL,16,'/accountancy/bookkeeping/balance.php','','AccountBalance','accountancy',1,'balance','$user->rights->accounting->mouvements->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163527,'auguria',1,'','left','accountancy',163487,NULL,NULL,17,'/accountancy/report/result.php?mainmenu=accountancy&leftmenu=accountancy','','Reportings','main',1,'report','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163528,'auguria',1,'','left','accountancy',163527,NULL,NULL,19,'/compta/resultat/index.php?mainmenu=accountancy&leftmenu=accountancy','','ReportInOut','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163529,'auguria',1,'','left','accountancy',163528,NULL,NULL,18,'/accountancy/report/result.php?mainmenu=accountancy&leftmenu=accountancy','','ByAccounts','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163530,'auguria',1,'','left','accountancy',163528,NULL,NULL,20,'/compta/resultat/clientfourn.php?mainmenu=accountancy&leftmenu=accountancy','','ByCompanies','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163531,'auguria',1,'','left','accountancy',163527,NULL,NULL,21,'/compta/stats/index.php?mainmenu=accountancy&leftmenu=accountancy','','ReportTurnover','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163532,'auguria',1,'','left','accountancy',163531,NULL,NULL,22,'/compta/stats/casoc.php?mainmenu=accountancy&leftmenu=accountancy','','ByCompanies','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163533,'auguria',1,'','left','accountancy',163531,NULL,NULL,23,'/compta/stats/cabyuser.php?mainmenu=accountancy&leftmenu=accountancy','','ByUsers','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163534,'auguria',1,'','left','accountancy',163531,NULL,NULL,24,'/compta/stats/cabyprodserv.php?mainmenu=accountancy&leftmenu=accountancy','','ByProductsAndServices','main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163537,'auguria',1,'','left','accountancy',163538,NULL,NULL,80,'/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin','','FiscalPeriod','admin',1,'accountancy_admin_period','','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\" && $conf->global->MAIN_FEATURES_LEVEL > 0',2,'2017-08-30 15:14:30'),(163538,'auguria',1,'','left','accountancy',163487,NULL,NULL,1,'/accountancy/index.php?mainmenu=accountancy&leftmenu=accountancy_admin','','Setup','accountancy',1,'accountancy_admin','$user->rights->accounting->chartofaccount','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163541,'auguria',1,'','left','accountancy',163538,NULL,NULL,10,'/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin','','AccountingJournals','accountancy',2,'accountancy_admin_journal','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163542,'auguria',1,'','left','accountancy',163538,NULL,NULL,20,'/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin','','Pcg_version','accountancy',2,'accountancy_admin_chartmodel','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163543,'auguria',1,'','left','accountancy',163538,NULL,NULL,30,'/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin','','Chartofaccounts','accountancy',2,'accountancy_admin_chart','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163544,'auguria',1,'','left','accountancy',163538,NULL,NULL,40,'/accountancy/admin/categories_list.php?id=32&mainmenu=accountancy&leftmenu=accountancy_admin','','AccountingCategory','accountancy',2,'accountancy_admin_chart_group','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163545,'auguria',1,'','left','accountancy',163538,NULL,NULL,50,'/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin','','MenuDefaultAccounts','accountancy',2,'accountancy_admin_default','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163546,'auguria',1,'','left','accountancy',163538,NULL,NULL,60,'/admin/dict.php?id=10&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin','','MenuVatAccounts','accountancy',2,'accountancy_admin_vat','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163547,'auguria',1,'','left','accountancy',163538,NULL,NULL,70,'/admin/dict.php?id=7&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin','','MenuTaxAccounts','accountancy',2,'accountancy_admin_tax','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163548,'auguria',1,'','left','accountancy',163538,NULL,NULL,80,'/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin','','MenuExpenseReportAccounts','accountancy',2,'accountancy_admin_expensereport','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163549,'auguria',1,'','left','accountancy',163538,NULL,NULL,90,'/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin','','MenuProductsAccounts','accountancy',2,'accountancy_admin_product','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163587,'auguria',1,'','left','accountancy',161101,NULL,NULL,9,'/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank','','StandingOrders','withdrawals',0,'withdraw','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled',2,'2017-08-30 15:14:30'),(163589,'auguria',1,'','left','accountancy',163587,NULL,NULL,0,'/compta/prelevement/create.php?leftmenu=withdraw','','NewStandingOrder','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163590,'auguria',1,'','left','accountancy',163587,NULL,NULL,2,'/compta/prelevement/bons.php?leftmenu=withdraw','','WithdrawalsReceipts','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163591,'auguria',1,'','left','accountancy',163587,NULL,NULL,3,'/compta/prelevement/list.php?leftmenu=withdraw','','WithdrawalsLines','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163593,'auguria',1,'','left','accountancy',163587,NULL,NULL,5,'/compta/prelevement/rejets.php?leftmenu=withdraw','','Rejects','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163594,'auguria',1,'','left','accountancy',163587,NULL,NULL,6,'/compta/prelevement/stats.php?leftmenu=withdraw','','Statistics','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163687,'auguria',1,'','left','accountancy',161101,NULL,NULL,1,'/compta/bank/index.php?leftmenu=bank&amp;mainmenu=bank','','MenuBankCash','banks',0,'bank','$user->rights->banque->lire','$conf->banque->enabled',0,'2017-08-30 15:14:30'),(163688,'auguria',1,'','left','accountancy',163687,NULL,NULL,0,'/compta/bank/card.php?action=create&amp;leftmenu=bank','','MenuNewFinancialAccount','banks',1,'','$user->rights->banque->configurer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163690,'auguria',1,'','left','accountancy',163687,NULL,NULL,2,'/compta/bank/bankentries.php?leftmenu=bank','','ListTransactions','banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163691,'auguria',1,'','left','accountancy',163687,NULL,NULL,3,'/compta/bank/budget.php?leftmenu=bank','','ListTransactionsByCategory','banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163693,'auguria',1,'','left','accountancy',163687,NULL,NULL,5,'/compta/bank/transfer.php?leftmenu=bank','','BankTransfers','banks',1,'','$user->rights->banque->transfer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163737,'auguria',1,'','left','accountancy',161101,NULL,NULL,4,'/categories/index.php?leftmenu=bank&amp;type=5','','Categories','categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(163738,'auguria',1,'','left','accountancy',163737,NULL,NULL,0,'/categories/card.php?leftmenu=bank&amp;action=create&amp;type=5','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(163787,'auguria',1,'','left','accountancy',161093,NULL,NULL,11,'/compta/resultat/index.php?leftmenu=ca&amp;mainmenu=accountancy','','Reportings','main',0,'ca','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled',0,'2017-08-30 15:14:30'),(163792,'auguria',1,'','left','accountancy',163487,NULL,NULL,1,'','','Journalization','main',1,'','$user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163793,'auguria',1,'','left','accountancy',163792,NULL,NULL,4,'/accountancy/journal/sellsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=1','','SellsJournal','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163794,'auguria',1,'','left','accountancy',163792,NULL,NULL,1,'/accountancy/journal/bankjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=3','','BankJournal','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163795,'auguria',1,'','left','accountancy',163792,NULL,NULL,2,'/accountancy/journal/expensereportsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=6','','ExpenseReportJournal','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163796,'auguria',1,'','left','accountancy',163792,NULL,NULL,3,'/accountancy/journal/purchasesjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=2','','PurchasesJournal','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163798,'auguria',1,'','left','accountancy',163787,NULL,NULL,0,'/compta/resultat/index.php?leftmenu=ca','','ReportInOut','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163799,'auguria',1,'','left','accountancy',163788,NULL,NULL,0,'/compta/resultat/clientfourn.php?leftmenu=ca','','ByCompanies','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163800,'auguria',1,'','left','accountancy',163787,NULL,NULL,1,'/compta/stats/index.php?leftmenu=ca','','ReportTurnover','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163801,'auguria',1,'','left','accountancy',163790,NULL,NULL,0,'/compta/stats/casoc.php?leftmenu=ca','','ByCompanies','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163802,'auguria',1,'','left','accountancy',163790,NULL,NULL,1,'/compta/stats/cabyuser.php?leftmenu=ca','','ByUsers','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163803,'auguria',1,'','left','accountancy',163790,NULL,NULL,1,'/compta/stats/cabyprodserv.php?leftmenu=ca','','ByProductsAndServices','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163887,'auguria',1,'','left','products',161090,NULL,NULL,0,'/product/index.php?leftmenu=product&amp;type=0','','Products','products',0,'product','$user->rights->produit->lire','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163888,'auguria',1,'','left','products',163887,NULL,NULL,0,'/product/card.php?leftmenu=product&amp;action=create&amp;type=0','','NewProduct','products',1,'','$user->rights->produit->creer','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163889,'auguria',1,'','left','products',163887,NULL,NULL,1,'/product/list.php?leftmenu=product&amp;type=0','','List','products',1,'','$user->rights->produit->lire','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163890,'auguria',1,'','left','products',163887,NULL,NULL,4,'/product/reassort.php?type=0','','Stocks','products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163891,'auguria',1,'','left','products',163887,NULL,NULL,7,'/product/stats/card.php?id=all&amp;leftmenu=stats&amp;type=0','','Statistics','main',1,'','$user->rights->produit->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(163892,'auguria',1,'','left','products',163887,NULL,NULL,5,'/product/reassortlot.php?type=0','','StocksByLotSerial','products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->productbatch->enabled',2,'2017-08-30 15:14:30'),(163893,'auguria',1,'','left','products',163887,NULL,NULL,6,'/product/stock/productlot_list.php','','LotSerial','products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->productbatch->enabled',2,'2017-08-30 15:14:30'),(163987,'auguria',1,'','left','products',161090,NULL,NULL,1,'/product/index.php?leftmenu=service&amp;type=1','','Services','products',0,'service','$user->rights->service->lire','$conf->service->enabled',2,'2017-08-30 15:14:30'),(163988,'auguria',1,'','left','products',163987,NULL,NULL,0,'/product/card.php?leftmenu=service&amp;action=create&amp;type=1','','NewService','products',1,'','$user->rights->service->creer','$conf->service->enabled',2,'2017-08-30 15:14:30'),(163989,'auguria',1,'','left','products',163987,NULL,NULL,1,'/product/list.php?leftmenu=service&amp;type=1','','List','products',1,'','$user->rights->service->lire','$conf->service->enabled',2,'2017-08-30 15:14:30'),(163990,'auguria',1,'','left','products',163987,NULL,NULL,5,'/product/stats/card.php?id=all&amp;leftmenu=stats&amp;type=1','','Statistics','main',1,'','$user->rights->service->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(164187,'auguria',1,'','left','products',161090,NULL,NULL,3,'/product/stock/index.php?leftmenu=stock','','Stock','stocks',0,'stock','$user->rights->stock->lire','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164188,'auguria',1,'','left','products',164187,NULL,NULL,0,'/product/stock/card.php?action=create','','MenuNewWarehouse','stocks',1,'','$user->rights->stock->creer','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164189,'auguria',1,'','left','products',164187,NULL,NULL,1,'/product/stock/list.php','','List','stocks',1,'','$user->rights->stock->lire','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164191,'auguria',1,'','left','products',164187,NULL,NULL,3,'/product/stock/mouvement.php','','Movements','stocks',1,'','$user->rights->stock->mouvement->lire','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164192,'auguria',1,'','left','products',164187,NULL,NULL,4,'/product/stock/replenish.php','','Replenishments','stocks',1,'','$user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire','$conf->stock->enabled && $conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(164193,'auguria',1,'','left','products',164187,NULL,NULL,5,'/product/stock/massstockmove.php','','MassStockTransferShort','stocks',1,'','$user->rights->stock->mouvement->creer','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164287,'auguria',1,'','left','products',161090,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=0','','Categories','categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164288,'auguria',1,'','left','products',164287,NULL,NULL,0,'/categories/card.php?action=create&amp;type=0','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164487,'auguria',1,'','left','project',161094,NULL,NULL,3,'/projet/activity/perweek.php?leftmenu=projects','','NewTimeSpent','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164687,'auguria',1,'','left','project',161094,NULL,NULL,0,'/projet/index.php?leftmenu=projects','','Projects','projects',0,'projects','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164688,'auguria',1,'','left','project',164687,NULL,NULL,1,'/projet/card.php?leftmenu=projects&amp;action=create','','NewProject','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164689,'auguria',1,'','left','project',164687,NULL,NULL,2,'/projet/list.php?leftmenu=projects','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164690,'auguria',1,'','left','project',164687,NULL,NULL,3,'/projet/stats/index.php?leftmenu=projects','','Statistics','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164787,'auguria',1,'','left','project',161094,NULL,NULL,0,'/projet/activity/index.php?leftmenu=projects','','Activities','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164788,'auguria',1,'','left','project',164787,NULL,NULL,1,'/projet/tasks.php?leftmenu=projects&amp;action=create','','NewTask','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164789,'auguria',1,'','left','project',164787,NULL,NULL,2,'/projet/tasks/list.php?leftmenu=projects','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164791,'auguria',1,'','left','project',164787,NULL,NULL,4,'/projet/tasks/stats/index.php?leftmenu=projects','','Statistics','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164891,'auguria',1,'','left','project',161094,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=6','','Categories','categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164892,'auguria',1,'','left','project',164891,NULL,NULL,0,'/categories/card.php?action=create&amp;type=6','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164987,'auguria',1,'','left','tools',161095,NULL,NULL,0,'/comm/mailing/index.php?leftmenu=mailing','','EMailings','mails',0,'mailing','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2017-08-30 15:14:30'),(164988,'auguria',1,'','left','tools',164987,NULL,NULL,0,'/comm/mailing/card.php?leftmenu=mailing&amp;action=create','','NewMailing','mails',1,'','$user->rights->mailing->creer','$conf->mailing->enabled',0,'2017-08-30 15:14:30'),(164989,'auguria',1,'','left','tools',164987,NULL,NULL,1,'/comm/mailing/list.php?leftmenu=mailing','','List','mails',1,'','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2017-08-30 15:14:30'),(165187,'auguria',1,'','left','tools',161095,NULL,NULL,2,'/exports/index.php?leftmenu=export','','FormatedExport','exports',0,'export','$user->rights->export->lire','$conf->export->enabled',2,'2017-08-30 15:14:30'),(165188,'auguria',1,'','left','tools',165187,NULL,NULL,0,'/exports/export.php?leftmenu=export','','NewExport','exports',1,'','$user->rights->export->creer','$conf->export->enabled',2,'2017-08-30 15:14:30'),(165217,'auguria',1,'','left','tools',161095,NULL,NULL,2,'/imports/index.php?leftmenu=import','','FormatedImport','exports',0,'import','$user->rights->import->run','$conf->import->enabled',2,'2017-08-30 15:14:30'),(165218,'auguria',1,'','left','tools',165217,NULL,NULL,0,'/imports/import.php?leftmenu=import','','NewImport','exports',1,'','$user->rights->import->run','$conf->import->enabled',2,'2017-08-30 15:14:30'),(165287,'auguria',1,'','left','members',161100,NULL,NULL,0,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Members','members',0,'members','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165288,'auguria',1,'','left','members',165287,NULL,NULL,0,'/adherents/card.php?leftmenu=members&amp;action=create','','NewMember','members',1,'','$user->rights->adherent->creer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165289,'auguria',1,'','left','members',165287,NULL,NULL,1,'/adherents/list.php','','List','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165290,'auguria',1,'','left','members',165289,NULL,NULL,2,'/adherents/list.php?leftmenu=members&amp;statut=-1','','MenuMembersToValidate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165291,'auguria',1,'','left','members',165289,NULL,NULL,3,'/adherents/list.php?leftmenu=members&amp;statut=1','','MenuMembersValidated','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165292,'auguria',1,'','left','members',165289,NULL,NULL,4,'/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=outofdate','','MenuMembersNotUpToDate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165293,'auguria',1,'','left','members',165289,NULL,NULL,5,'/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=uptodate','','MenuMembersUpToDate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165294,'auguria',1,'','left','members',165289,NULL,NULL,6,'/adherents/list.php?leftmenu=members&amp;statut=0','','MenuMembersResiliated','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165295,'auguria',1,'','left','members',165287,NULL,NULL,7,'/adherents/stats/geo.php?leftmenu=members&amp;mode=memberbycountry','','MenuMembersStats','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165387,'auguria',1,'','left','members',161100,NULL,NULL,1,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Subscriptions','compta',0,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165388,'auguria',1,'','left','members',165387,NULL,NULL,0,'/adherents/list.php?statut=-1&amp;leftmenu=accountancy&amp;mainmenu=members','','NewSubscription','compta',1,'','$user->rights->adherent->cotisation->creer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165389,'auguria',1,'','left','members',165387,NULL,NULL,1,'/adherents/subscription/list.php?leftmenu=members','','List','compta',1,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165390,'auguria',1,'','left','members',165387,NULL,NULL,7,'/adherents/stats/index.php?leftmenu=members','','MenuMembersStats','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165589,'auguria',1,'','left','members',165287,NULL,NULL,9,'/adherents/htpasswd.php?leftmenu=export','','Filehtpasswd','members',1,'','$user->rights->adherent->export','! empty($conf->global->MEMBER_LINK_TO_HTPASSWDFILE) && $conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165590,'auguria',1,'','left','members',165287,NULL,NULL,10,'/adherents/cartes/carte.php?leftmenu=export','','MembersCards','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165687,'auguria',1,'','left','hrm',161102,NULL,NULL,1,'/user/index.php?leftmenu=hrm&mode=employee','','Employees','hrm',0,'hrm','$user->rights->hrm->employee->read','$conf->hrm->enabled',0,'2017-08-30 15:14:30'),(165688,'auguria',1,'','left','hrm',165687,NULL,NULL,1,'/user/card.php?action=create&employee=1','','NewEmployee','hrm',1,'','$user->rights->hrm->employee->write','$conf->hrm->enabled',0,'2017-08-30 15:14:30'),(165689,'auguria',1,'','left','hrm',165687,NULL,NULL,2,'/user/index.php?$leftmenu=hrm&mode=employee&contextpage=employeelist','','List','hrm',1,'','$user->rights->hrm->employee->read','$conf->hrm->enabled',0,'2017-08-30 15:14:30'),(165787,'auguria',1,'','left','members',161100,NULL,NULL,5,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members','','MembersTypes','members',0,'setup','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165788,'auguria',1,'','left','members',165787,NULL,NULL,0,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members&amp;action=create','','New','members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165789,'auguria',1,'','left','members',165787,NULL,NULL,1,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members','','List','members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(166087,'auguria',1,'','left','hrm',161102,NULL,NULL,1,'/holiday/list.php?&leftmenu=hrm','','CPTitreMenu','holiday',0,'hrm','$user->rights->holiday->read','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166088,'auguria',1,'','left','hrm',166087,NULL,NULL,1,'/holiday/card.php?&action=request','','MenuAddCP','holiday',1,'','$user->rights->holiday->write','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166089,'auguria',1,'','left','hrm',166087,NULL,NULL,1,'/holiday/list.php?&leftmenu=hrm','','List','holiday',1,'','$user->rights->holiday->read','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166090,'auguria',1,'','left','hrm',166089,NULL,NULL,1,'/holiday/list.php?select_statut=2&leftmenu=hrm','','ListToApprove','trips',2,'','$user->rights->holiday->read','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166091,'auguria',1,'','left','hrm',166087,NULL,NULL,2,'/holiday/define_holiday.php?&action=request','','MenuConfCP','holiday',1,'','$user->rights->holiday->define_holiday','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166092,'auguria',1,'','left','hrm',166087,NULL,NULL,3,'/holiday/view_log.php?&action=request','','MenuLogCP','holiday',1,'','$user->rights->holiday->define_holiday','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166187,'auguria',1,'','left','commercial',161092,NULL,NULL,6,'/fourn/commande/index.php?leftmenu=orders_suppliers','','SuppliersOrders','orders',0,'orders_suppliers','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166188,'auguria',1,'','left','commercial',166187,NULL,NULL,0,'/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers','','NewOrder','orders',1,'','$user->rights->fournisseur->commande->creer','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166189,'auguria',1,'','left','commercial',166187,NULL,NULL,1,'/fourn/commande/list.php?leftmenu=orders_suppliers&amp;search_status=0','','List','orders',1,'','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166195,'auguria',1,'','left','commercial',166187,NULL,NULL,7,'/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier','','Statistics','orders',1,'','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166287,'auguria',1,'','left','members',161100,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=3','','MembersCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->adherent->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(166288,'auguria',1,'','left','members',166287,NULL,NULL,0,'/categories/card.php?action=create&amp;type=3','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->adherent->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(166387,'auguria',1,'','left','hrm',161102,NULL,NULL,5,'/expensereport/index.php?leftmenu=expensereport','','TripsAndExpenses','trips',0,'expensereport','$user->rights->expensereport->lire','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166388,'auguria',1,'','left','hrm',166387,NULL,NULL,1,'/expensereport/card.php?action=create&amp;leftmenu=expensereport','','New','trips',1,'','$user->rights->expensereport->creer','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166389,'auguria',1,'','left','hrm',166387,NULL,NULL,2,'/expensereport/list.php?leftmenu=expensereport','','List','trips',1,'','$user->rights->expensereport->lire','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166390,'auguria',1,'','left','hrm',166389,NULL,NULL,2,'/expensereport/list.php?search_status=2&amp;leftmenu=expensereport','','ListToApprove','trips',2,'','$user->rights->expensereport->approve','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166391,'auguria',1,'','left','hrm',166387,NULL,NULL,2,'/expensereport/stats/index.php?leftmenu=expensereport','','Statistics','trips',1,'','$user->rights->expensereport->lire','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166467,'all',1,'variants','left','products',-1,'product','products',100,'/variants/list.php','','VariantAttributes','products',NULL,'product','1','$conf->product->enabled',0,'2018-01-19 11:28:04'),(166541,'all',1,'ticket','top','ticket',0,NULL,NULL,88,'/ticket/index.php','','Ticket','ticket',NULL,'1','$user->rights->ticket->read','$conf->ticket->enabled',2,'2019-06-05 09:15:29'),(166542,'all',1,'ticket','left','ticket',-1,NULL,'ticket',101,'/ticket/index.php','','Ticket','ticket',NULL,'ticket','$user->rights->ticket->read','$conf->ticket->enabled',2,'2019-06-05 09:15:29'),(166543,'all',1,'ticket','left','ticket',-1,'ticket','ticket',102,'/ticket/card.php?action=create','','NewTicket','ticket',NULL,NULL,'$user->rights->ticket->write','$conf->ticket->enabled',2,'2019-06-05 09:15:29'),(166544,'all',1,'ticket','left','ticket',-1,'ticket','ticket',103,'/ticket/list.php?search_fk_status=non_closed','','List','ticket',NULL,'ticketlist','$user->rights->ticket->read','$conf->ticket->enabled',2,'2019-06-05 09:15:29'),(166545,'all',1,'ticket','left','ticket',-1,'ticket','ticket',105,'/ticket/list.php?mode=mine&search_fk_status=non_closed','','MenuTicketMyAssign','ticket',NULL,'ticketmy','$user->rights->ticket->read','$conf->ticket->enabled',0,'2019-06-05 09:15:29'),(166546,'all',1,'ticket','left','ticket',-1,'ticket','ticket',107,'/ticket/stats/index.php','','Statistics','ticket',NULL,NULL,'$user->rights->ticket->read','$conf->ticket->enabled',0,'2019-06-05 09:15:29'),(166923,'all',1,'resource','left','tools',-1,NULL,'tools',100,'/resource/list.php','','MenuResourceIndex','resource',NULL,'resource','$user->rights->resource->read','1',0,'2020-01-20 11:46:00'),(166924,'all',1,'resource','left','tools',-1,'resource','tools',101,'/resource/card.php?action=create','','MenuResourceAdd','resource',NULL,'resource_add','$user->rights->resource->write','1',0,'2020-01-20 11:46:00'),(166925,'all',1,'resource','left','tools',-1,'resource','tools',102,'/resource/list.php','','List','resource',NULL,'resource_list','$user->rights->resource->read','1',0,'2020-01-20 11:46:00'),(167003,'all',1,'agenda','top','agenda',0,NULL,NULL,86,'/comm/action/index.php','','TMenuAgenda','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-12-10 12:24:50'),(167004,'all',1,'agenda','left','agenda',167003,NULL,NULL,100,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Actions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-12-10 12:24:50'),(167005,'all',1,'agenda','left','agenda',167004,NULL,NULL,101,'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create','','NewAction','commercial',NULL,NULL,'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)','$conf->agenda->enabled',2,'2020-12-10 12:24:50'),(167006,'all',1,'agenda','left','agenda',167004,NULL,NULL,140,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda','','Calendar','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-12-10 12:24:50'),(167007,'all',1,'agenda','left','agenda',167006,NULL,NULL,141,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-12-10 12:24:50'),(167008,'all',1,'agenda','left','agenda',167006,NULL,NULL,142,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-12-10 12:24:50'),(167009,'all',1,'agenda','left','agenda',167006,NULL,NULL,143,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2020-12-10 12:24:50'),(167010,'all',1,'agenda','left','agenda',167006,NULL,NULL,144,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2020-12-10 12:24:50'),(167011,'all',1,'agenda','left','agenda',167004,NULL,NULL,110,'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda','','List','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-12-10 12:24:50'),(167012,'all',1,'agenda','left','agenda',167011,NULL,NULL,111,'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-12-10 12:24:50'),(167013,'all',1,'agenda','left','agenda',167011,NULL,NULL,112,'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2020-12-10 12:24:50'),(167014,'all',1,'agenda','left','agenda',167011,NULL,NULL,113,'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2020-12-10 12:24:50'),(167015,'all',1,'agenda','left','agenda',167011,NULL,NULL,114,'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2020-12-10 12:24:50'),(167016,'all',1,'agenda','left','agenda',167004,NULL,NULL,160,'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Reportings','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->agenda->enabled',2,'2020-12-10 12:24:50'),(167017,'all',1,'agenda','left','agenda',167004,NULL,NULL,170,'/categories/index.php?mainmenu=agenda&amp;leftmenu=agenda&type=10','','Categories','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->categorie->enabled&&$conf->categorie->enabled',2,'2020-12-10 12:24:50'),(167018,'all',1,'barcode','left','tools',-1,NULL,'tools',200,'/barcode/printsheet.php?mainmenu=tools&leftmenu=barcodeprint','','BarCodePrintsheet','products',NULL,'barcodeprint','($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->lire_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)','$conf->barcode->enabled',2,'2020-12-10 12:24:50'),(167019,'all',1,'barcode','left','home',-1,'admintools','home',300,'/barcode/codeinit.php?mainmenu=home&leftmenu=admintools','','MassBarcodeInit','products',NULL,NULL,'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->creer_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)','$conf->barcode->enabled && preg_match(\'/^(admintools|all)/\',$leftmenu)',0,'2020-12-10 12:24:50'),(167020,'all',1,'cron','left','home',-1,'admintools','home',200,'/cron/list.php?leftmenu=admintools','','CronList','cron',NULL,NULL,'$user->rights->cron->read','$conf->cron->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)',2,'2020-12-10 12:24:50'),(167021,'all',1,'ecm','top','ecm',0,NULL,NULL,82,'/ecm/index.php','','MenuECM','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload || $user->rights->ecm->setup','$conf->ecm->enabled',2,'2020-12-10 12:24:50'),(167022,'all',1,'ecm','left','ecm',-1,NULL,'ecm',101,'/ecm/index.php?mainmenu=ecm&leftmenu=ecm','','ECMArea','ecm',NULL,'ecm','$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2020-12-10 12:24:50'),(167023,'all',1,'ecm','left','ecm',-1,'ecm','ecm',102,'/ecm/index.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsManual','ecm',NULL,'ecm_manual','$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2020-12-10 12:24:50'),(167024,'all',1,'ecm','left','ecm',-1,'ecm','ecm',103,'/ecm/index_auto.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsAuto','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload','($user->rights->ecm->read || $user->rights->ecm->upload) && ! empty($conf->global->ECM_AUTO_TREE_ENABLED)',2,'2020-12-10 12:24:50'),(167025,'all',1,'opensurvey','left','tools',-1,NULL,'tools',200,'/opensurvey/index.php?mainmenu=tools&leftmenu=opensurvey','','Survey','opensurvey',NULL,'opensurvey','$user->rights->opensurvey->read','$conf->opensurvey->enabled',0,'2020-12-10 12:24:51'),(167026,'all',1,'opensurvey','left','tools',-1,'opensurvey','tools',210,'/opensurvey/wizard/index.php','','NewSurvey','opensurvey',NULL,'opensurvey_new','$user->rights->opensurvey->write','$conf->opensurvey->enabled',0,'2020-12-10 12:24:51'),(167027,'all',1,'opensurvey','left','tools',-1,'opensurvey','tools',220,'/opensurvey/list.php','','List','opensurvey',NULL,'opensurvey_list','$user->rights->opensurvey->read','$conf->opensurvey->enabled',0,'2020-12-10 12:24:51'),(167028,'all',1,'takepos','top','takepos',0,NULL,NULL,1001,'/takepos/index.php','takepos','PointOfSaleShort','cashdesk',NULL,NULL,'$user->rights->takepos->run','$conf->takepos->enabled',2,'2020-12-10 12:24:52'),(167029,'all',1,'website','top','website',0,NULL,NULL,100,'/website/index.php','','WebSites','website',NULL,NULL,'$user->rights->website->read','$conf->website->enabled',2,'2020-12-10 12:24:52'),(167030,'all',1,'recruitment','left','hrm',-1,NULL,'hrm',1001,'/recruitment/recruitmentindex.php','','Recruitment','recruitment',NULL,'recruitmentjobposition','$user->rights->recruitment->recruitmentjobposition->read','$conf->recruitment->enabled',2,'2020-12-10 12:29:43'),(167031,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1002,'/recruitment/recruitmentjobposition_card.php?action=create','','NewPositionToBeFilled','recruitment',NULL,'recruitment_recruitmentjobposition_new','$user->rights->recruitment->recruitmentjobposition->write','$conf->recruitment->enabled',2,'2020-12-10 12:29:43'),(167032,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1003,'/recruitment/recruitmentjobposition_list.php','','ListOfPositionsToBeFilled','recruitment',NULL,'recruitment_recruitmentjobposition_list','$user->rights->recruitment->recruitmentjobposition->read','$conf->recruitment->enabled',2,'2020-12-10 12:29:43'),(167033,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1004,'/recruitment/recruitmentcandidature_card.php?action=create','','NewCandidature','recruitment',NULL,'recruitment_recruitmentcandidature_new','$user->rights->recruitment->recruitmentjobposition->write','$conf->recruitment->enabled',2,'2020-12-10 12:29:43'),(167034,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1005,'/recruitment/recruitmentcandidature_list.php','','ListOfCandidatures','recruitment',NULL,'recruitment_recruitmentcandidature_list','$user->rights->recruitment->recruitmentjobposition->read','$conf->recruitment->enabled',2,'2020-12-10 12:29:43'),(167035,'all',1,'margins','left','billing',-1,NULL,'billing',100,'/margin/index.php','','Margins','margins',NULL,'margins','$user->rights->margins->liretous','$conf->margin->enabled',2,'2020-12-10 12:30:20'),(167037,'all',1,'blockedlog','left','tools',-1,NULL,'tools',200,'/blockedlog/admin/blockedlog_list.php?mainmenu=tools&leftmenu=blockedlogbrowser','','BrowseBlockedLog','blockedlog',NULL,'blockedlogbrowser','$user->rights->blockedlog->read','$conf->blockedlog->enabled',2,'2020-12-10 12:31:17');
 /*!40000 ALTER TABLE `llx_menu` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -8314,7 +9428,7 @@ CREATE TABLE `llx_mrp_mo_extrafields` (
   `fk_object` int(11) NOT NULL,
   `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
-  KEY `idx_fk_object` (`fk_object`)
+  KEY `idx_mrp_mo_fk_object` (`fk_object`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -8586,6 +9700,43 @@ LOCK TABLES `llx_nomenclature_coef_object` WRITE;
 /*!40000 ALTER TABLE `llx_nomenclature_coef_object` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_nomenclature_feedback`
+--
+
+DROP TABLE IF EXISTS `llx_nomenclature_feedback`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_nomenclature_feedback` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_origin` int(11) NOT NULL DEFAULT 0,
+  `fk_nomenclature` int(11) NOT NULL DEFAULT 0,
+  `fk_product` int(11) NOT NULL DEFAULT 0,
+  `fk_warehouse` int(11) NOT NULL DEFAULT 0,
+  `origin` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `stockAllowed` double NOT NULL DEFAULT 0,
+  `qtyUsed` double NOT NULL DEFAULT 0,
+  `note` longtext CHARACTER SET latin1 DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `fk_origin` (`fk_origin`),
+  KEY `fk_nomenclature` (`fk_nomenclature`),
+  KEY `fk_product` (`fk_product`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_nomenclature_feedback`
+--
+
+LOCK TABLES `llx_nomenclature_feedback` WRITE;
+/*!40000 ALTER TABLE `llx_nomenclature_feedback` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_nomenclature_feedback` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_nomenclature_workstation`
 --
@@ -8978,7 +10129,7 @@ CREATE TABLE `llx_opensurvey_sondage` (
   `status` int(11) DEFAULT 1,
   `format` varchar(2) COLLATE utf8_unicode_ci NOT NULL,
   `mailsonde` tinyint(4) NOT NULL DEFAULT 0,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp(),
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `entity` int(11) NOT NULL DEFAULT 1,
   `allow_comments` tinyint(4) NOT NULL DEFAULT 1,
   `allow_spy` tinyint(4) NOT NULL DEFAULT 1,
@@ -9053,6 +10204,29 @@ INSERT INTO `llx_opensurvey_user_studs` VALUES (1,'gfdgdf','om4e7azfiurnjtqe','0
 /*!40000 ALTER TABLE `llx_opensurvey_user_studs` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_origines`
+--
+
+DROP TABLE IF EXISTS `llx_origines`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_origines` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `source` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_origines`
+--
+
+LOCK TABLES `llx_origines` WRITE;
+/*!40000 ALTER TABLE `llx_origines` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_origines` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_overwrite_trans`
 --
@@ -9115,6 +10289,7 @@ DROP TABLE IF EXISTS `llx_paiement`;
 CREATE TABLE `llx_paiement` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `ref` varchar(30) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
+  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `datec` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
@@ -9128,6 +10303,7 @@ CREATE TABLE `llx_paiement` (
   `fk_user_modif` int(11) DEFAULT NULL,
   `statut` smallint(6) NOT NULL DEFAULT 0,
   `fk_export_compta` int(11) NOT NULL DEFAULT 0,
+  `pos_change` double(24,8) DEFAULT 0.00000000,
   `multicurrency_amount` double(24,8) DEFAULT 0.00000000,
   `ext_payment_id` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
   `ext_payment_site` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -9141,7 +10317,7 @@ CREATE TABLE `llx_paiement` (
 
 LOCK TABLES `llx_paiement` WRITE;
 /*!40000 ALTER TABLE `llx_paiement` DISABLE KEYS */;
-INSERT INTO `llx_paiement` VALUES (3,'',1,'2013-07-18 20:50:47','2020-06-12 17:12:09','2019-07-08 12:00:00',10.00000000,4,'','',6,1,NULL,0,0,0.00000000,NULL,NULL),(5,'',1,'2013-08-01 03:34:11','2020-06-12 17:12:08','2019-08-01 03:34:11',5.63000000,6,'','Payment Invoice FA1108-0003',8,1,NULL,0,0,0.00000000,NULL,NULL),(6,'',1,'2013-08-06 20:33:54','2020-06-12 17:12:08','2019-08-06 20:33:53',5.98000000,4,'','Payment Invoice FA1108-0004',13,1,NULL,0,0,0.00000000,NULL,NULL),(8,'',1,'2013-08-08 02:53:40','2020-06-12 17:12:08','2019-08-08 12:00:00',26.10000000,4,'','',14,1,NULL,0,0,0.00000000,NULL,NULL),(9,'',1,'2013-08-08 02:55:58','2020-06-12 17:12:08','2019-08-08 12:00:00',26.96000000,1,'','',15,1,NULL,0,0,0.00000000,NULL,NULL),(17,'',1,'2014-12-09 15:28:44','2020-06-12 17:12:08','2019-12-09 12:00:00',2.00000000,4,'','',16,1,NULL,0,0,0.00000000,NULL,NULL),(18,'',1,'2014-12-09 15:28:53','2020-06-12 17:12:08','2019-12-09 12:00:00',-2.00000000,4,'','',17,1,NULL,0,0,0.00000000,NULL,NULL),(19,'',1,'2014-12-09 17:35:55','2020-06-12 17:12:08','2019-12-09 12:00:00',-2.00000000,4,'','',18,1,NULL,0,0,0.00000000,NULL,NULL),(20,'',1,'2014-12-09 17:37:02','2020-06-12 17:12:08','2019-12-09 12:00:00',2.00000000,4,'','',19,1,NULL,0,0,0.00000000,NULL,NULL),(21,'',1,'2014-12-09 18:35:07','2020-06-12 17:12:08','2019-12-09 12:00:00',-2.00000000,4,'','',20,1,NULL,0,0,0.00000000,NULL,NULL),(23,'',1,'2014-12-12 18:54:33','2020-06-12 17:12:08','2019-12-12 12:00:00',1.00000000,1,'','',21,1,NULL,0,0,0.00000000,NULL,NULL),(24,'',1,'2015-03-06 16:48:16','2020-06-12 17:12:09','2020-03-06 00:00:00',20.00000000,4,'','Adhésion/cotisation 2016',22,1,NULL,0,0,0.00000000,NULL,NULL),(25,'',1,'2015-03-20 14:30:11','2020-06-12 17:12:09','2020-03-20 00:00:00',10.00000000,2,'','Adhésion/cotisation 2011',23,1,NULL,0,0,0.00000000,NULL,NULL),(26,'',1,'2016-03-02 19:57:58','2020-06-12 17:12:09','2019-07-09 12:00:00',605.00000000,2,'','',24,1,NULL,0,0,0.00000000,NULL,NULL),(29,'',1,'2016-03-02 20:01:39','2020-06-12 17:12:09','2020-03-19 12:00:00',500.00000000,4,'','',26,1,NULL,0,0,0.00000000,NULL,NULL),(30,'',1,'2016-03-02 20:02:06','2020-06-12 17:12:09','2020-03-21 12:00:00',400.00000000,2,'','',27,1,NULL,0,0,0.00000000,NULL,NULL),(32,'',1,'2016-03-03 19:22:32','2020-06-12 17:12:08','2019-10-03 12:00:00',-400.00000000,4,'','',28,1,NULL,0,0,0.00000000,NULL,NULL),(33,'',1,'2016-03-03 19:23:16','2020-06-12 17:12:09','2020-03-10 12:00:00',-300.00000000,4,'','',29,1,NULL,0,0,0.00000000,NULL,NULL),(34,'PAY1603-0001',1,'2017-02-06 08:10:24','2020-06-12 17:12:09','2020-03-22 12:00:00',150.00000000,7,'','',33,12,NULL,0,0,150.00000000,NULL,NULL),(35,'PAY1603-0002',1,'2017-02-06 08:10:50','2020-06-12 17:12:09','2020-03-25 12:00:00',140.00000000,3,'','',34,12,NULL,0,0,140.00000000,NULL,NULL),(36,'PAY1702-0003',1,'2017-02-21 16:07:43','2020-06-12 17:12:08','2020-02-21 12:00:00',50.00000000,3,'T170201','',37,12,NULL,0,0,50.00000000,NULL,NULL),(38,'PAY1803-0004',1,'2018-03-16 13:59:31','2020-06-12 17:12:09','2020-03-16 12:00:00',10.00000000,7,'','',39,12,NULL,0,0,10.00000000,NULL,NULL),(39,'PAY1801-0005',1,'2019-10-04 10:28:14','2020-06-12 17:12:09','2020-01-19 12:00:00',5.63000000,4,'','',41,12,NULL,0,0,5.63000000,NULL,NULL),(40,'PAY2001-0006',1,'2020-01-16 02:36:48','2020-01-16 01:36:48','2020-01-16 12:00:00',20.50000000,2,'','',50,12,NULL,0,0,20.50000000,NULL,NULL),(41,'PAY2001-0007',1,'2020-01-21 10:23:17','2020-01-21 09:23:17','2020-01-21 00:00:00',50.00000000,7,'','Subscription 2017',53,12,NULL,0,0,50.00000000,NULL,NULL),(42,'PAY2001-0008',1,'2020-01-21 10:23:28','2020-01-21 09:23:28','2020-01-21 00:00:00',50.00000000,7,'','Subscription 2018',54,12,NULL,0,0,50.00000000,NULL,NULL),(43,'PAY2001-0009',1,'2020-01-21 10:23:49','2020-01-21 09:23:49','2020-01-21 00:00:00',50.00000000,6,'','Subscription 2019',55,12,NULL,0,0,50.00000000,NULL,NULL);
+INSERT INTO `llx_paiement` VALUES (3,'',NULL,1,'2013-07-18 20:50:47','2020-12-10 12:24:22','2020-07-08 12:00:00',10.00000000,4,'','',6,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(5,'',NULL,1,'2013-08-01 03:34:11','2020-12-10 12:24:22','2020-08-01 03:34:11',5.63000000,6,'','Payment Invoice FA1108-0003',8,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(6,'',NULL,1,'2013-08-06 20:33:54','2020-12-10 12:24:22','2020-08-06 20:33:53',5.98000000,4,'','Payment Invoice FA1108-0004',13,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(8,'',NULL,1,'2013-08-08 02:53:40','2020-12-10 12:24:22','2020-08-08 12:00:00',26.10000000,4,'','',14,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(9,'',NULL,1,'2013-08-08 02:55:58','2020-12-10 12:24:23','2020-08-08 12:00:00',26.96000000,1,'','',15,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(17,'',NULL,1,'2014-12-09 15:28:44','2020-12-10 12:24:23','2020-12-09 12:00:00',2.00000000,4,'','',16,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(18,'',NULL,1,'2014-12-09 15:28:53','2020-12-10 12:24:23','2020-12-09 12:00:00',-2.00000000,4,'','',17,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(19,'',NULL,1,'2014-12-09 17:35:55','2020-12-10 12:24:23','2020-12-09 12:00:00',-2.00000000,4,'','',18,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(20,'',NULL,1,'2014-12-09 17:37:02','2020-12-10 12:24:23','2020-12-09 12:00:00',2.00000000,4,'','',19,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(21,'',NULL,1,'2014-12-09 18:35:07','2020-12-10 12:24:23','2020-12-09 12:00:00',-2.00000000,4,'','',20,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(23,'',NULL,1,'2014-12-12 18:54:33','2020-06-12 17:12:08','2019-12-12 12:00:00',1.00000000,1,'','',21,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(24,'',NULL,1,'2015-03-06 16:48:16','2020-06-12 17:12:09','2020-03-06 00:00:00',20.00000000,4,'','Adhésion/cotisation 2016',22,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(25,'',NULL,1,'2015-03-20 14:30:11','2020-06-12 17:12:09','2020-03-20 00:00:00',10.00000000,2,'','Adhésion/cotisation 2011',23,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(26,'',NULL,1,'2016-03-02 19:57:58','2020-12-10 12:24:23','2020-07-09 12:00:00',605.00000000,2,'','',24,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(29,'',NULL,1,'2016-03-02 20:01:39','2020-06-12 17:12:09','2020-03-19 12:00:00',500.00000000,4,'','',26,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(30,'',NULL,1,'2016-03-02 20:02:06','2020-06-12 17:12:09','2020-03-21 12:00:00',400.00000000,2,'','',27,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(32,'',NULL,1,'2016-03-03 19:22:32','2020-12-10 12:24:23','2020-10-03 12:00:00',-400.00000000,4,'','',28,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(33,'',NULL,1,'2016-03-03 19:23:16','2020-06-12 17:12:09','2020-03-10 12:00:00',-300.00000000,4,'','',29,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(34,'PAY1603-0001',NULL,1,'2017-02-06 08:10:24','2020-06-12 17:12:09','2020-03-22 12:00:00',150.00000000,7,'','',33,12,NULL,0,0,0.00000000,150.00000000,NULL,NULL),(35,'PAY1603-0002',NULL,1,'2017-02-06 08:10:50','2020-06-12 17:12:09','2020-03-25 12:00:00',140.00000000,3,'','',34,12,NULL,0,0,0.00000000,140.00000000,NULL,NULL),(36,'PAY1702-0003',NULL,1,'2017-02-21 16:07:43','2020-06-12 17:12:08','2020-02-21 12:00:00',50.00000000,3,'T170201','',37,12,NULL,0,0,0.00000000,50.00000000,NULL,NULL),(38,'PAY1803-0004',NULL,1,'2018-03-16 13:59:31','2020-06-12 17:12:09','2020-03-16 12:00:00',10.00000000,7,'','',39,12,NULL,0,0,0.00000000,10.00000000,NULL,NULL),(39,'PAY1801-0005',NULL,1,'2019-10-04 10:28:14','2020-06-12 17:12:09','2020-01-19 12:00:00',5.63000000,4,'','',41,12,NULL,0,0,0.00000000,5.63000000,NULL,NULL),(40,'PAY2001-0006',NULL,1,'2020-01-16 02:36:48','2020-01-16 01:36:48','2020-01-16 12:00:00',20.50000000,2,'','',50,12,NULL,0,0,0.00000000,20.50000000,NULL,NULL),(41,'PAY2001-0007',NULL,1,'2020-01-21 10:23:17','2020-01-21 09:23:17','2020-01-21 00:00:00',50.00000000,7,'','Subscription 2017',53,12,NULL,0,0,0.00000000,50.00000000,NULL,NULL),(42,'PAY2001-0008',NULL,1,'2020-01-21 10:23:28','2020-01-21 09:23:28','2020-01-21 00:00:00',50.00000000,7,'','Subscription 2018',54,12,NULL,0,0,0.00000000,50.00000000,NULL,NULL),(43,'PAY2001-0009',NULL,1,'2020-01-21 10:23:49','2020-01-21 09:23:49','2020-01-21 00:00:00',50.00000000,6,'','Subscription 2019',55,12,NULL,0,0,0.00000000,50.00000000,NULL,NULL);
 /*!40000 ALTER TABLE `llx_paiement` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -9575,6 +10751,39 @@ INSERT INTO `llx_pos_cash_fence` VALUES (1,1,'1',NULL,-324.29000000,400.00000000
 /*!40000 ALTER TABLE `llx_pos_cash_fence` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_postes`
+--
+
+DROP TABLE IF EXISTS `llx_postes`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_postes` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `label` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `status` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `lieu` int(11) DEFAULT NULL,
+  `email` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `date` date DEFAULT NULL,
+  `departement` int(11) DEFAULT NULL,
+  `responsable_recrutement` int(11) DEFAULT NULL,
+  `nb_nouveauemploye` int(11) DEFAULT NULL,
+  `description` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `responsable_RH` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_postes`
+--
+
+LOCK TABLES `llx_postes` WRITE;
+/*!40000 ALTER TABLE `llx_postes` DISABLE KEYS */;
+INSERT INTO `llx_postes` VALUES (1,'aaa','Recrutementencours',-1,'aaa','2020-05-29',0,0,1,'',0);
+/*!40000 ALTER TABLE `llx_postes` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_prelevement_bons`
 --
@@ -9665,7 +10874,9 @@ CREATE TABLE `llx_prelevement_facture_demande` (
   `ext_payment_id` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
   `ext_payment_site` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
   `fk_facture_fourn` int(11) DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
+  PRIMARY KEY (`rowid`),
+  KEY `idx_prelevement_facture_demande_fk_facture` (`fk_facture`),
+  KEY `idx_prelevement_facture_demande_fk_facture_fourn` (`fk_facture_fourn`)
 ) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -9744,6 +10955,60 @@ LOCK TABLES `llx_prelevement_rejet` WRITE;
 /*!40000 ALTER TABLE `llx_prelevement_rejet` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_prestashopget_myobject`
+--
+
+DROP TABLE IF EXISTS `llx_prestashopget_myobject`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_prestashopget_myobject` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `qty` int(11) DEFAULT NULL,
+  `status` int(11) DEFAULT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_prestashopget_myobject`
+--
+
+LOCK TABLES `llx_prestashopget_myobject` WRITE;
+/*!40000 ALTER TABLE `llx_prestashopget_myobject` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_prestashopget_myobject` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_prestashopget_myobject_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_prestashopget_myobject_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_prestashopget_myobject_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_prestashopget_myobject_extrafields`
+--
+
+LOCK TABLES `llx_prestashopget_myobject_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_prestashopget_myobject_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_prestashopget_myobject_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_printer_receipt`
 --
@@ -9867,7 +11132,7 @@ CREATE TABLE `llx_product` (
   `tobatch` tinyint(4) NOT NULL DEFAULT 0,
   `fk_product_type` int(11) DEFAULT 0,
   `duration` varchar(6) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `seuil_stock_alerte` int(11) DEFAULT NULL,
+  `seuil_stock_alerte` float DEFAULT NULL,
   `url` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `barcode` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `fk_barcode_type` int(11) DEFAULT NULL,
@@ -9894,7 +11159,7 @@ CREATE TABLE `llx_product` (
   `finished` tinyint(4) DEFAULT NULL,
   `hidden` tinyint(4) DEFAULT 0,
   `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `desiredstock` int(11) DEFAULT 0,
+  `desiredstock` float DEFAULT NULL,
   `fk_price_expression` int(11) DEFAULT NULL,
   `fk_unit` int(11) DEFAULT NULL,
   `cost_price` double(24,8) DEFAULT NULL,
@@ -9910,6 +11175,7 @@ CREATE TABLE `llx_product` (
   `fk_project` int(11) DEFAULT NULL,
   `net_measure` float DEFAULT NULL,
   `net_measure_units` tinyint(4) DEFAULT NULL,
+  `fk_state` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_product_ref` (`ref`,`entity`),
   UNIQUE KEY `uk_product_barcode` (`barcode`,`fk_barcode_type`,`entity`),
@@ -9923,8 +11189,10 @@ CREATE TABLE `llx_product` (
   KEY `idx_product_seuil_stock_alerte` (`seuil_stock_alerte`),
   KEY `fk_product_default_warehouse` (`fk_default_warehouse`),
   KEY `idx_product_fk_project` (`fk_project`),
+  KEY `fk_product_finished` (`finished`),
   CONSTRAINT `fk_product_barcode_type` FOREIGN KEY (`fk_barcode_type`) REFERENCES `llx_c_barcode_type` (`rowid`),
   CONSTRAINT `fk_product_default_warehouse` FOREIGN KEY (`fk_default_warehouse`) REFERENCES `llx_entrepot` (`rowid`),
+  CONSTRAINT `fk_product_finished` FOREIGN KEY (`finished`) REFERENCES `llx_c_product_nature` (`code`),
   CONSTRAINT `fk_product_fk_country` FOREIGN KEY (`fk_country`) REFERENCES `llx_c_country` (`rowid`),
   CONSTRAINT `fk_product_fk_unit` FOREIGN KEY (`fk_unit`) REFERENCES `llx_c_units` (`rowid`)
 ) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -9936,7 +11204,7 @@ CREATE TABLE `llx_product` (
 
 LOCK TABLES `llx_product` WRITE;
 /*!40000 ALTER TABLE `llx_product` DISABLE KEYS */;
-INSERT INTO `llx_product` VALUES (1,'2012-07-08 14:33:17','2020-01-18 19:17:03',0,0,'PINKDRESS',1,NULL,'Pink dress','A beatifull pink dress','','',NULL,9.00000000,10.12500000,0.00000000,0.00000000,'HT',12.500,0,0.000,'0',0.000,'0',1,12,1,1,0,1,0,'',NULL,NULL,'123456789066',2,'','','','',NULL,NULL,NULL,670,-3,NULL,0,NULL,0,NULL,0,2.8,0.00000000,NULL,NULL,NULL,1,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(2,'2012-07-09 00:30:01','2019-11-28 15:09:50',0,0,'PEARPIE',1,NULL,'Pear Pie','','','',NULL,10.00000000,12.00000000,8.33333000,10.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',1,12,1,1,0,0,0,'',NULL,NULL,'123456789077',2,'','','','',NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,NULL,0,998,0.00000000,NULL,NULL,NULL,1,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,'2012-07-09 00:30:25','2018-01-16 16:40:03',0,0,'CAKECONTRIB',1,NULL,'Cake making contribution','','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,'0',0.000,'0',1,NULL,1,1,0,0,1,'1m',NULL,NULL,'123456789088',2,'701CAKEM',NULL,NULL,'601CAKEM',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(4,'2012-07-10 14:44:06','2020-01-08 16:41:18',0,0,'APPLEPIE',1,NULL,'Apple Pie','Nice Bio Apple Pie.<br />\r\n&nbsp;','','',NULL,9.00000000,9.00000000,6.00000000,6.00000000,'HT',0.000,0,9.000,'1',9.000,'1',1,12,1,1,0,1,0,'',NULL,NULL,'123456789034',2,'701','','','601',NULL,NULL,NULL,500,-3,NULL,0,NULL,0,NULL,0,1020.2,10.00000000,NULL,NULL,NULL,1,0,NULL,NULL,NULL,NULL,NULL,'CGST+SGST',0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(5,'2013-07-20 23:11:38','2018-01-16 16:18:24',0,0,'DOLIDROID',1,NULL,'DoliDroid, Android app for Dolibarr','<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>','','',NULL,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,'0',0.000,'0',1,NULL,1,1,0,0,0,'',NULL,'https://play.google.com/store/apps/details?id=com.nltechno.dolidroidpro','123456789023',2,'701',NULL,NULL,'601',NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(10,'2011-12-31 00:00:00','2017-02-16 00:12:09',0,0,'COMP-XP4523',1,NULL,'Computer XP4523','A powerfull computer XP4523&nbsp;','This product is imported.<br />\r\nWarning: Delay to get it are not reliable.','USXP765',11,100.00000000,110.00000000,0.00000000,0.00000000,'HT',10.000,0,0.000,'0',0.000,'0',NULL,12,1,1,0,1,0,'',150,NULL,'123456789055',2,'701OLDC',NULL,NULL,'601OLDC',NULL,NULL,NULL,1.7,0,NULL,0,NULL,0,NULL,0,110,0.00000000,NULL,NULL,NULL,NULL,0,'20110729232310',200,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(11,'2015-01-13 20:24:42','2019-10-08 17:21:07',0,0,'ROLLUPABC',1,NULL,'Rollup Dolibarr','A nice rollup','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',0.000,0,0.000,'0',0.000,'0',1,12,1,1,0,0,0,'',NULL,NULL,'123456789044',2,'','','','',NULL,NULL,NULL,95,-3,NULL,0,2.34,-4,NULL,0,-1,0.00000000,NULL,NULL,'',1,0,NULL,NULL,NULL,NULL,12.00000000,NULL,0,NULL,'',NULL,8,NULL,8,NULL,NULL,NULL,NULL),(12,'2018-07-30 17:31:29','2018-07-30 13:35:02',0,0,'DOLICLOUD',1,NULL,'SaaS service of Dolibarr ERP CRM','Cloud hosting of Dolibarr ERP and CRM software','','',NULL,9.00000000,9.00000000,9.00000000,9.00000000,'HT',0.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,1,'',NULL,'http://www.dolicloud.com','123456789013',2,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,'',0,0,NULL,NULL,NULL,NULL,8.50000000,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(13,'2017-02-16 03:49:00','2017-02-15 23:49:27',0,0,'COMP-XP4548',1,NULL,'Computer XP4523','A powerfull computer XP4523&nbsp;','This product is imported.<br />\r\nWarning: Delay to get it are not reliable.','USXP765',11,100.00000000,110.00000000,0.00000000,0.00000000,'HT',10.000,0,0.000,'0',0.000,'0',12,12,1,1,0,1,0,'',150,NULL,NULL,2,'',NULL,NULL,'',NULL,NULL,NULL,1.7,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,200,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(23,'2019-10-07 00:00:00','2019-11-28 13:51:35',0,0,'PREF123456',1,NULL,'Product name in default language','Product description in default language','a private note (free text)','customs code',1,100.00000000,110.00000000,100.00000000,110.00000000,'HT',10.000,0,0.000,'0',0.000,'0',12,NULL,0,1,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-3,1,-1,4,-4,5,-3,NULL,0.00000000,NULL,NULL,NULL,0,0,'20191007122224',NULL,NULL,NULL,NULL,NULL,0,'a public note (free text)','',2,-1,3,-1,NULL,NULL,NULL,NULL),(24,'2019-11-28 16:33:35','2019-11-28 15:02:01',0,0,'POS-CARROT',1,NULL,'Carrot','','','',NULL,0.83333000,1.00000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(25,'2019-11-28 16:37:36','2020-01-13 11:13:19',0,0,'POS-APPLE',1,NULL,'Apple','','','',NULL,1.25000000,1.50000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,15.599999999999994,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(26,'2019-11-28 16:38:44','2019-11-28 12:38:44',0,0,'POS-KIWI',1,NULL,'Kiwi','','','',NULL,1.08333000,1.30000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(27,'2019-11-28 16:39:21','2019-11-28 14:57:44',0,0,'POS-PEACH',1,NULL,'Peach','','','',NULL,1.08333000,1.30000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,'',0,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(28,'2019-11-28 16:39:58','2019-11-28 12:39:58',0,0,'POS-ORANGE',1,NULL,'Orange','','','',NULL,2.00000000,2.40000000,0.00000000,0.00000000,'HT',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(29,'2019-11-28 17:03:14','2019-11-28 13:03:14',0,0,'POS-Eggs',1,NULL,'Eggs','','','',NULL,1.66667000,2.00000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(30,'2019-11-28 17:09:14','2019-11-28 13:09:14',0,0,'POS-Chips',1,NULL,'Chips','','','',NULL,0.41667000,0.50000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,30,-3,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+INSERT INTO `llx_product` VALUES (1,'2012-07-08 14:33:17','2020-01-18 19:17:03',0,0,'PINKDRESS',1,NULL,'Pink dress','A beatifull pink dress','','',NULL,9.00000000,10.12500000,0.00000000,0.00000000,'HT',12.500,0,0.000,'0',0.000,'0',1,12,1,1,0,1,0,'',NULL,NULL,'123456789066',2,'','','','',NULL,NULL,NULL,670,-3,NULL,0,NULL,0,NULL,0,2.8,0.00000000,NULL,NULL,NULL,1,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(2,'2012-07-09 00:30:01','2019-11-28 15:09:50',0,0,'PEARPIE',1,NULL,'Pear Pie','','','',NULL,10.00000000,12.00000000,8.33333000,10.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',1,12,1,1,0,0,0,'',NULL,NULL,'123456789077',2,'','','','',NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,NULL,0,998,0.00000000,NULL,NULL,NULL,1,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,'2012-07-09 00:30:25','2018-01-16 16:40:03',0,0,'CAKECONTRIB',1,NULL,'Cake making contribution','','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,'0',0.000,'0',1,NULL,1,1,0,0,1,'1m',NULL,NULL,'123456789088',2,'701CAKEM',NULL,NULL,'601CAKEM',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(4,'2012-07-10 14:44:06','2020-01-08 16:41:18',0,0,'APPLEPIE',1,NULL,'Apple Pie','Nice Bio Apple Pie.<br />\r\n&nbsp;','','',NULL,9.00000000,9.00000000,6.00000000,6.00000000,'HT',0.000,0,9.000,'1',9.000,'1',1,12,1,1,0,1,0,'',NULL,NULL,'123456789034',2,'701','','','601',NULL,NULL,NULL,500,-3,NULL,0,NULL,0,NULL,0,1020.2,10.00000000,NULL,NULL,NULL,1,0,NULL,NULL,NULL,NULL,NULL,'CGST+SGST',0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(5,'2013-07-20 23:11:38','2018-01-16 16:18:24',0,0,'DOLIDROID',1,NULL,'DoliDroid, Android app for Dolibarr','<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>','','',NULL,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,'0',0.000,'0',1,NULL,1,1,0,0,0,'',NULL,'https://play.google.com/store/apps/details?id=com.nltechno.dolidroidpro','123456789023',2,'701',NULL,NULL,'601',NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(10,'2011-12-31 00:00:00','2017-02-16 00:12:09',0,0,'COMP-XP4523',1,NULL,'Computer XP4523','A powerfull computer XP4523&nbsp;','This product is imported.<br />\r\nWarning: Delay to get it are not reliable.','USXP765',11,100.00000000,110.00000000,0.00000000,0.00000000,'HT',10.000,0,0.000,'0',0.000,'0',NULL,12,1,1,0,1,0,'',150,NULL,'123456789055',2,'701OLDC',NULL,NULL,'601OLDC',NULL,NULL,NULL,1.7,0,NULL,0,NULL,0,NULL,0,110,0.00000000,NULL,NULL,NULL,NULL,0,'20110729232310',200,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(11,'2015-01-13 20:24:42','2019-10-08 17:21:07',0,0,'ROLLUPABC',1,NULL,'Rollup Dolibarr','A nice rollup','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',0.000,0,0.000,'0',0.000,'0',1,12,1,1,0,0,0,'',NULL,NULL,'123456789044',2,'','','','',NULL,NULL,NULL,95,-3,NULL,0,2.34,-4,NULL,0,-1,0.00000000,NULL,NULL,'',1,0,NULL,NULL,NULL,NULL,12.00000000,NULL,0,NULL,'',NULL,8,NULL,8,NULL,NULL,NULL,NULL,NULL),(12,'2018-07-30 17:31:29','2018-07-30 13:35:02',0,0,'DOLICLOUD',1,NULL,'SaaS service of Dolibarr ERP CRM','Cloud hosting of Dolibarr ERP and CRM software','','',NULL,9.00000000,9.00000000,9.00000000,9.00000000,'HT',0.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,1,'',NULL,'http://www.dolicloud.com','123456789013',2,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,'',0,0,NULL,NULL,NULL,NULL,8.50000000,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(13,'2017-02-16 03:49:00','2017-02-15 23:49:27',0,0,'COMP-XP4548',1,NULL,'Computer XP4523','A powerfull computer XP4523&nbsp;','This product is imported.<br />\r\nWarning: Delay to get it are not reliable.','USXP765',11,100.00000000,110.00000000,0.00000000,0.00000000,'HT',10.000,0,0.000,'0',0.000,'0',12,12,1,1,0,1,0,'',150,NULL,NULL,2,'',NULL,NULL,'',NULL,NULL,NULL,1.7,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,200,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(23,'2019-10-07 00:00:00','2019-11-28 13:51:35',0,0,'PREF123456',1,NULL,'Product name in default language','Product description in default language','a private note (free text)','customs code',1,100.00000000,110.00000000,100.00000000,110.00000000,'HT',10.000,0,0.000,'0',0.000,'0',12,NULL,0,1,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-3,1,-1,4,-4,5,-3,NULL,0.00000000,NULL,NULL,NULL,0,0,'20191007122224',NULL,NULL,NULL,NULL,NULL,0,'a public note (free text)','',2,-1,3,-1,NULL,NULL,NULL,NULL,NULL),(24,'2019-11-28 16:33:35','2019-11-28 15:02:01',0,0,'POS-CARROT',1,NULL,'Carrot','','','',NULL,0.83333000,1.00000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(25,'2019-11-28 16:37:36','2020-01-13 11:13:19',0,0,'POS-APPLE',1,NULL,'Apple','','','',NULL,1.25000000,1.50000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,15.599999999999994,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(26,'2019-11-28 16:38:44','2019-11-28 12:38:44',0,0,'POS-KIWI',1,NULL,'Kiwi','','','',NULL,1.08333000,1.30000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(27,'2019-11-28 16:39:21','2019-11-28 14:57:44',0,0,'POS-PEACH',1,NULL,'Peach','','','',NULL,1.08333000,1.30000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,'',0,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(28,'2019-11-28 16:39:58','2019-11-28 12:39:58',0,0,'POS-ORANGE',1,NULL,'Orange','','','',NULL,2.00000000,2.40000000,0.00000000,0.00000000,'HT',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(29,'2019-11-28 17:03:14','2019-11-28 13:03:14',0,0,'POS-Eggs',1,NULL,'Eggs','','','',NULL,1.66667000,2.00000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(30,'2019-11-28 17:09:14','2019-11-28 13:09:14',0,0,'POS-Chips',1,NULL,'Chips','','','',NULL,0.41667000,0.50000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,30,-3,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_product` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -9980,6 +11248,7 @@ DROP TABLE IF EXISTS `llx_product_attribute`;
 CREATE TABLE `llx_product_attribute` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `ref` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `label` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   `rang` int(11) NOT NULL DEFAULT 0,
   `entity` int(11) NOT NULL DEFAULT 1,
@@ -9995,7 +11264,7 @@ CREATE TABLE `llx_product_attribute` (
 
 LOCK TABLES `llx_product_attribute` WRITE;
 /*!40000 ALTER TABLE `llx_product_attribute` DISABLE KEYS */;
-INSERT INTO `llx_product_attribute` VALUES (1,'COL','Color',1,1),(2,'SIZE','Size',0,1);
+INSERT INTO `llx_product_attribute` VALUES (1,'COL',NULL,'Color',1,1),(2,'SIZE',NULL,'Size',0,1);
 /*!40000 ALTER TABLE `llx_product_attribute` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -10013,6 +11282,7 @@ CREATE TABLE `llx_product_attribute_combination` (
   `variation_price` float NOT NULL,
   `variation_price_percentage` int(11) DEFAULT NULL,
   `variation_weight` float NOT NULL,
+  `variation_ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`),
   KEY `idx_product_att_com_product_parent` (`fk_product_parent`),
@@ -10054,6 +11324,81 @@ LOCK TABLES `llx_product_attribute_combination2val` WRITE;
 /*!40000 ALTER TABLE `llx_product_attribute_combination2val` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_product_attribute_combination_price_level`
+--
+
+DROP TABLE IF EXISTS `llx_product_attribute_combination_price_level`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_product_attribute_combination_price_level` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_product_attribute_combination` int(11) NOT NULL DEFAULT 1,
+  `fk_price_level` int(11) NOT NULL DEFAULT 1,
+  `variation_price` double(24,8) NOT NULL,
+  `variation_price_percentage` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `fk_product_attribute_combination` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_2` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_3` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_4` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_5` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_6` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_7` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_8` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_9` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_10` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_11` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_12` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_13` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_14` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_15` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_16` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_17` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_18` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_19` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_20` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_21` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_22` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_23` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_24` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_25` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_26` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_27` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_28` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_29` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_30` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_31` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_32` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_33` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_34` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_35` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_36` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_37` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_38` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_39` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_40` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_41` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_42` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_43` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_44` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_45` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_46` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_47` (`fk_product_attribute_combination`,`fk_price_level`),
+  UNIQUE KEY `fk_product_attribute_combinati_48` (`fk_product_attribute_combination`,`fk_price_level`)
+) ENGINE=InnoDB AUTO_INCREMENT=59 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_product_attribute_combination_price_level`
+--
+
+LOCK TABLES `llx_product_attribute_combination_price_level` WRITE;
+/*!40000 ALTER TABLE `llx_product_attribute_combination_price_level` DISABLE KEYS */;
+INSERT INTO `llx_product_attribute_combination_price_level` VALUES (16,0,1,0.00000000,0),(17,0,2,0.00000000,0),(18,0,3,0.00000000,0),(19,0,4,0.00000000,0),(20,0,5,0.00000000,0),(44,101,1,0.00000000,0),(45,101,2,0.00000000,0),(46,101,3,0.00000000,0),(47,101,4,0.00000000,0),(48,101,5,0.00000000,0),(49,102,1,0.00000000,0),(50,102,2,0.00000000,0),(51,102,3,0.00000000,0),(52,102,4,0.00000000,0),(53,102,5,0.00000000,0),(54,103,1,0.00000000,0),(55,103,2,0.00000000,0),(56,103,3,0.00000000,0),(57,103,4,0.00000000,0),(58,103,5,0.00000000,0);
+/*!40000 ALTER TABLE `llx_product_attribute_combination_price_level` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_product_attribute_value`
 --
@@ -10306,6 +11651,7 @@ CREATE TABLE `llx_product_fournisseur_price` (
   `localtax2_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
   `barcode` varchar(180) COLLATE utf8_unicode_ci DEFAULT NULL,
   `fk_barcode_type` int(11) DEFAULT NULL,
+  `packaging` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_product_fournisseur_price_ref` (`ref_fourn`,`fk_soc`,`quantity`,`entity`),
   UNIQUE KEY `uk_product_barcode` (`barcode`,`fk_barcode_type`,`entity`),
@@ -10326,7 +11672,7 @@ CREATE TABLE `llx_product_fournisseur_price` (
 
 LOCK TABLES `llx_product_fournisseur_price` WRITE;
 /*!40000 ALTER TABLE `llx_product_fournisseur_price` DISABLE KEYS */;
-INSERT INTO `llx_product_fournisseur_price` VALUES (1,'2012-07-11 18:45:42','2014-12-08 13:11:08',4,1,'ABCD',NULL,NULL,10.00000000,1,0,0,10.00000000,0.00000000,0.000,NULL,0,1,NULL,1,NULL,NULL,NULL,NULL,1.00000000,NULL,NULL,NULL,NULL,0.000,'0',0.000,'0',NULL,NULL),(2,'2018-07-30 17:34:38','2018-07-30 13:34:38',12,10,'BASIC',NULL,0,9.00000000,1,0,0,9.00000000,0.00000000,0.000,NULL,0,12,NULL,1,NULL,NULL,NULL,'FAVORITE',1.00000000,NULL,NULL,NULL,NULL,0.000,'0',0.000,'0',NULL,NULL),(3,'2017-02-02 05:17:08','2017-02-02 01:17:08',1,10,'aaa',NULL,0,100.00000000,1,10,0,100.00000000,0.00000000,12.500,NULL,0,12,NULL,1,NULL,NULL,NULL,NULL,1.00000000,NULL,NULL,NULL,NULL,0.000,'0',0.000,'0',NULL,NULL),(4,'2019-10-08 19:21:34','2019-10-08 17:21:34',11,10,'ggg','',0,0.00000000,10,0,0,0.00000000,0.00000000,0.000,NULL,0,12,NULL,1,NULL,NULL,NULL,NULL,1.00000000,0.00000000,1,'EUR',0.00000000,0.000,'0',0.000,'0',NULL,2),(5,'2020-01-01 18:04:14','2020-01-01 16:11:36',1,17,'BK01','',0,79.16667000,1,0,0,79.16667000,0.00000000,12.500,NULL,0,12,NULL,1,NULL,NULL,NULL,NULL,1.20000000,95.00000000,2,'USD',95.00000000,0.000,'0',0.000,'0',NULL,2),(6,'2020-01-01 18:36:40','2020-01-01 14:36:40',2,17,'BKPEARPIE','',0,7.00000000,1,0,0,7.00000000,0.00000000,20.000,NULL,0,12,NULL,1,NULL,NULL,NULL,NULL,1.00000000,7.00000000,1,'EUR',7.00000000,0.000,'0',0.000,'0',NULL,2),(7,'2020-01-20 12:22:00','2020-01-20 11:22:00',1,17,'bbb','',0,1000.00000000,10,0,0,100.00000000,0.00000000,12.500,NULL,0,12,NULL,1,NULL,NULL,NULL,NULL,1.00000000,100.00000000,1,'EUR',1000.00000000,0.000,'0',0.000,'0',NULL,2);
+INSERT INTO `llx_product_fournisseur_price` VALUES (1,'2012-07-11 18:45:42','2014-12-08 13:11:08',4,1,'ABCD',NULL,NULL,10.00000000,1,0,0,10.00000000,0.00000000,0.000,NULL,0,1,NULL,1,NULL,NULL,NULL,NULL,1.00000000,NULL,NULL,NULL,NULL,0.000,'0',0.000,'0',NULL,NULL,NULL),(2,'2018-07-30 17:34:38','2018-07-30 13:34:38',12,10,'BASIC',NULL,0,9.00000000,1,0,0,9.00000000,0.00000000,0.000,NULL,0,12,NULL,1,NULL,NULL,NULL,'FAVORITE',1.00000000,NULL,NULL,NULL,NULL,0.000,'0',0.000,'0',NULL,NULL,NULL),(3,'2017-02-02 05:17:08','2017-02-02 01:17:08',1,10,'aaa',NULL,0,100.00000000,1,10,0,100.00000000,0.00000000,12.500,NULL,0,12,NULL,1,NULL,NULL,NULL,NULL,1.00000000,NULL,NULL,NULL,NULL,0.000,'0',0.000,'0',NULL,NULL,NULL),(4,'2019-10-08 19:21:34','2019-10-08 17:21:34',11,10,'ggg','',0,0.00000000,10,0,0,0.00000000,0.00000000,0.000,NULL,0,12,NULL,1,NULL,NULL,NULL,NULL,1.00000000,0.00000000,1,'EUR',0.00000000,0.000,'0',0.000,'0',NULL,2,NULL),(5,'2020-01-01 18:04:14','2020-01-01 16:11:36',1,17,'BK01','',0,79.16667000,1,0,0,79.16667000,0.00000000,12.500,NULL,0,12,NULL,1,NULL,NULL,NULL,NULL,1.20000000,95.00000000,2,'USD',95.00000000,0.000,'0',0.000,'0',NULL,2,NULL),(6,'2020-01-01 18:36:40','2020-01-01 14:36:40',2,17,'BKPEARPIE','',0,7.00000000,1,0,0,7.00000000,0.00000000,20.000,NULL,0,12,NULL,1,NULL,NULL,NULL,NULL,1.00000000,7.00000000,1,'EUR',7.00000000,0.000,'0',0.000,'0',NULL,2,NULL),(7,'2020-01-20 12:22:00','2020-01-20 11:22:00',1,17,'bbb','',0,1000.00000000,10,0,0,100.00000000,0.00000000,12.500,NULL,0,12,NULL,1,NULL,NULL,NULL,NULL,1.00000000,100.00000000,1,'EUR',1000.00000000,0.000,'0',0.000,'0',NULL,2,NULL);
 /*!40000 ALTER TABLE `llx_product_fournisseur_price` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -10673,8 +12019,8 @@ CREATE TABLE `llx_product_warehouse_properties` (
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_product` int(11) NOT NULL,
   `fk_entrepot` int(11) NOT NULL,
-  `seuil_stock_alerte` int(11) DEFAULT 0,
-  `desiredstock` int(11) DEFAULT 0,
+  `seuil_stock_alerte` float DEFAULT NULL,
+  `desiredstock` float DEFAULT NULL,
   `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -10725,6 +12071,7 @@ CREATE TABLE `llx_projet` (
   `usage_opportunity` int(11) DEFAULT 0,
   `usage_task` int(11) DEFAULT 1,
   `usage_organize_event` int(11) DEFAULT 0,
+  `email_msgid` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_projet_ref` (`ref`,`entity`),
   KEY `idx_projet_fk_soc` (`fk_soc`),
@@ -10738,7 +12085,7 @@ CREATE TABLE `llx_projet` (
 
 LOCK TABLES `llx_projet` WRITE;
 /*!40000 ALTER TABLE `llx_projet` DISABLE KEYS */;
-INSERT INTO `llx_projet` VALUES (1,11,'2012-07-09 00:00:00','2017-10-05 20:51:28','2012-07-09',NULL,'PROJ1',1,'Project One','',1,0,1,NULL,NULL,NULL,'gdfgdfg','baleine',NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0),(2,13,'2012-07-09 00:00:00','2017-10-05 20:51:51','2012-07-09',NULL,'PROJ2',1,'Project Two','',1,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0),(3,1,'2012-07-09 00:00:00','2020-01-15 12:40:50','2012-07-09',NULL,'PROJINDIAN',1,'Project for Indian company move','',1,0,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,1,0,1,0),(4,NULL,'2012-07-09 00:00:00','2012-07-08 22:50:49','2012-07-09',NULL,'PROJSHARED',1,'The Global project','',1,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0),(5,NULL,'2012-07-11 00:00:00','2020-01-15 12:27:15','2012-07-11','2013-07-14','RMLL',1,'Project management RMLL','',1,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,1,0,1,0),(6,10,'2018-07-30 00:00:00','2019-11-28 11:52:54','2018-07-30',NULL,'PJ1607-0001',1,'PROJALICE1','The Alice project number 1',12,0,1,2,20.00,NULL,NULL,NULL,5000.00000000,NULL,NULL,8000.00000000,NULL,12,1,1,1,0),(7,10,'2018-07-30 00:00:00','2019-11-28 11:52:54','2018-07-30',NULL,'PJ1607-0002',1,'PROJALICE2','The Alice project number 2',12,0,1,6,100.00,NULL,NULL,NULL,NULL,'2017-02-01 16:24:31',12,7000.00000000,NULL,NULL,0,1,1,0),(8,10,'2018-07-30 00:00:00','2019-11-28 11:52:54','2018-07-30',NULL,'PJ1607-0003',1,'PROJALICE2','The Alice project number 3',12,0,1,6,100.00,NULL,NULL,NULL,NULL,NULL,NULL,3550.00000000,NULL,NULL,0,1,1,0),(9,4,'2018-07-31 00:00:00','2019-12-20 16:33:15','2018-07-31',NULL,'PJ1607-0004',1,'Project Top X','',12,0,2,2,27.00,NULL,NULL,NULL,NULL,'2019-12-20 20:33:15',12,4000.00000000,NULL,NULL,0,1,1,0),(10,1,'2019-12-21 19:46:33','2019-12-21 15:48:06','2019-12-21',NULL,'PJ1912-0005',1,'Contact for a new shop in Delhi','',12,0,1,1,20.00,NULL,NULL,NULL,NULL,NULL,NULL,18000.00000000,NULL,12,0,1,1,0),(11,10,'2019-12-21 19:49:28','2019-12-21 16:10:21','2019-12-02','2019-12-13','PJ1912-0006',1,'Request for new development of logo','Request to redesign a new logo',12,0,1,4,60.00,NULL,NULL,NULL,NULL,NULL,NULL,6500.00000000,NULL,12,1,1,1,0),(12,4,'2019-12-21 19:52:12','2019-12-21 15:52:12','2019-12-21',NULL,'PJ1912-0007',1,'Adding new tool for Customer Relationship Management','',12,1,0,1,0.00,NULL,NULL,NULL,NULL,NULL,NULL,16000.00000000,NULL,NULL,1,1,1,0),(13,26,'2019-12-21 19:53:21','2019-12-21 15:53:59','2019-12-21',NULL,'PJ1912-0008',1,'Cooking 100 apple pie for chrsitmas','',12,0,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,1,0,1,0);
+INSERT INTO `llx_projet` VALUES (1,11,'2012-07-09 00:00:00','2017-10-05 20:51:28','2012-07-09',NULL,'PROJ1',1,'Project One','',1,0,1,NULL,NULL,NULL,'gdfgdfg','baleine',NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,NULL),(2,13,'2012-07-09 00:00:00','2017-10-05 20:51:51','2012-07-09',NULL,'PROJ2',1,'Project Two','',1,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,NULL),(3,1,'2012-07-09 00:00:00','2020-01-15 12:40:50','2012-07-09',NULL,'PROJINDIAN',1,'Project for Indian company move','',1,0,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,1,0,1,0,NULL),(4,NULL,'2012-07-09 00:00:00','2012-07-08 22:50:49','2012-07-09',NULL,'PROJSHARED',1,'The Global project','',1,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,NULL),(5,NULL,'2012-07-11 00:00:00','2020-01-15 12:27:15','2012-07-11','2013-07-14','RMLL',1,'Project management RMLL','',1,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,1,0,1,0,NULL),(6,10,'2018-07-30 00:00:00','2019-11-28 11:52:54','2018-07-30',NULL,'PJ1607-0001',1,'PROJALICE1','The Alice project number 1',12,0,1,2,20.00,NULL,NULL,NULL,5000.00000000,NULL,NULL,8000.00000000,NULL,12,1,1,1,0,NULL),(7,10,'2018-07-30 00:00:00','2019-11-28 11:52:54','2018-07-30',NULL,'PJ1607-0002',1,'PROJALICE2','The Alice project number 2',12,0,1,6,100.00,NULL,NULL,NULL,NULL,'2017-02-01 16:24:31',12,7000.00000000,NULL,NULL,0,1,1,0,NULL),(8,10,'2018-07-30 00:00:00','2019-11-28 11:52:54','2018-07-30',NULL,'PJ1607-0003',1,'PROJALICE2','The Alice project number 3',12,0,1,6,100.00,NULL,NULL,NULL,NULL,NULL,NULL,3550.00000000,NULL,NULL,0,1,1,0,NULL),(9,4,'2018-07-31 00:00:00','2019-12-20 16:33:15','2018-07-31',NULL,'PJ1607-0004',1,'Project Top X','',12,0,2,2,27.00,NULL,NULL,NULL,NULL,'2019-12-20 20:33:15',12,4000.00000000,NULL,NULL,0,1,1,0,NULL),(10,1,'2019-12-21 19:46:33','2019-12-21 15:48:06','2019-12-21',NULL,'PJ1912-0005',1,'Contact for a new shop in Delhi','',12,0,1,1,20.00,NULL,NULL,NULL,NULL,NULL,NULL,18000.00000000,NULL,12,0,1,1,0,NULL),(11,10,'2019-12-21 19:49:28','2019-12-21 16:10:21','2019-12-02','2019-12-13','PJ1912-0006',1,'Request for new development of logo','Request to redesign a new logo',12,0,1,4,60.00,NULL,NULL,NULL,NULL,NULL,NULL,6500.00000000,NULL,12,1,1,1,0,NULL),(12,4,'2019-12-21 19:52:12','2019-12-21 15:52:12','2019-12-21',NULL,'PJ1912-0007',1,'Adding new tool for Customer Relationship Management','',12,1,0,1,0.00,NULL,NULL,NULL,NULL,NULL,NULL,16000.00000000,NULL,NULL,1,1,1,0,NULL),(13,26,'2019-12-21 19:53:21','2019-12-21 15:53:59','2019-12-21',NULL,'PJ1912-0008',1,'Cooking 100 apple pie for chrsitmas','',12,0,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,1,0,1,0,NULL);
 /*!40000 ALTER TABLE `llx_projet` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -10869,7 +12216,7 @@ CREATE TABLE `llx_projet_task_time` (
   `invoice_id` int(11) DEFAULT NULL,
   `invoice_line_id` int(11) DEFAULT NULL,
   `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `datec` date DEFAULT NULL,
+  `datec` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`rowid`),
   KEY `idx_projet_task_time_task` (`fk_task`),
@@ -10884,7 +12231,7 @@ CREATE TABLE `llx_projet_task_time` (
 
 LOCK TABLES `llx_projet_task_time` WRITE;
 /*!40000 ALTER TABLE `llx_projet_task_time` DISABLE KEYS */;
-INSERT INTO `llx_projet_task_time` VALUES (2,4,'2016-12-21','2016-12-21 12:00:00',0,3600,1,NULL,'',NULL,NULL,NULL,NULL,'0000-00-00 00:00:00'),(3,4,'2016-12-18','2016-12-18 12:00:00',0,3600,1,NULL,NULL,NULL,NULL,NULL,NULL,'0000-00-00 00:00:00'),(4,3,'2016-12-21','2016-12-21 12:00:00',0,3600,1,NULL,NULL,NULL,NULL,NULL,NULL,'0000-00-00 00:00:00'),(5,3,'2016-12-21','2016-12-21 12:00:00',0,1800,1,NULL,NULL,NULL,NULL,NULL,NULL,'0000-00-00 00:00:00'),(6,3,'2016-12-21','2016-12-21 12:00:00',0,3600,1,NULL,NULL,NULL,NULL,NULL,NULL,'0000-00-00 00:00:00'),(7,6,'2018-07-25','2018-07-25 00:00:00',0,18000,12,NULL,NULL,NULL,NULL,NULL,NULL,'0000-00-00 00:00:00'),(8,6,'2018-07-26','2018-07-26 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(9,6,'2018-07-27','2018-07-27 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(10,6,'2018-07-29','2018-07-29 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(11,6,'2018-07-31','2018-07-31 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(12,7,'2018-07-25','2018-07-25 00:00:00',0,10800,12,NULL,NULL,NULL,NULL,NULL,NULL,'0000-00-00 00:00:00'),(13,7,'2018-07-26','2018-07-26 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(14,7,'2018-07-27','2018-07-27 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(15,7,'2017-01-30','2017-01-30 10:00:00',1,660,12,NULL,'',NULL,NULL,NULL,NULL,'0000-00-00 00:00:00'),(16,4,'2020-06-13','2020-06-13 00:00:00',0,3600,12,NULL,'',NULL,NULL,NULL,NULL,'2020-06-12 17:13:30');
+INSERT INTO `llx_projet_task_time` VALUES (2,4,'2016-12-21','2016-12-21 12:00:00',0,3600,1,NULL,'',NULL,NULL,NULL,NULL,'2020-12-10 12:24:40'),(3,4,'2016-12-18','2016-12-18 12:00:00',0,3600,1,NULL,NULL,NULL,NULL,NULL,NULL,'2020-12-10 12:24:40'),(4,3,'2016-12-21','2016-12-21 12:00:00',0,3600,1,NULL,NULL,NULL,NULL,NULL,NULL,'2020-12-10 12:24:40'),(5,3,'2016-12-21','2016-12-21 12:00:00',0,1800,1,NULL,NULL,NULL,NULL,NULL,NULL,'2020-12-10 12:24:40'),(6,3,'2016-12-21','2016-12-21 12:00:00',0,3600,1,NULL,NULL,NULL,NULL,NULL,NULL,'2020-12-10 12:24:40'),(7,6,'2018-07-25','2018-07-25 00:00:00',0,18000,12,NULL,NULL,NULL,NULL,NULL,NULL,'2020-12-10 12:24:40'),(8,6,'2018-07-26','2018-07-26 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(9,6,'2018-07-27','2018-07-27 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(10,6,'2018-07-29','2018-07-29 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(11,6,'2018-07-31','2018-07-31 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(12,7,'2018-07-25','2018-07-25 00:00:00',0,10800,12,NULL,NULL,NULL,NULL,NULL,NULL,'2020-12-10 12:24:40'),(13,7,'2018-07-26','2018-07-26 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(14,7,'2018-07-27','2018-07-27 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(15,7,'2017-01-30','2017-01-30 10:00:00',1,660,12,NULL,'',NULL,NULL,NULL,NULL,'2020-12-10 12:24:40'),(16,4,'2020-06-13','2020-06-13 00:00:00',0,3600,12,NULL,'',NULL,NULL,NULL,NULL,'2020-06-12 17:13:30');
 /*!40000 ALTER TABLE `llx_projet_task_time` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -11029,7 +12376,7 @@ CREATE TABLE `llx_propal` (
 
 LOCK TABLES `llx_propal` WRITE;
 /*!40000 ALTER TABLE `llx_propal` DISABLE KEYS */;
-INSERT INTO `llx_propal` VALUES (1,2,NULL,'2020-06-12 17:12:08','PR1007-0001',1,NULL,NULL,'','2012-07-09 01:33:49','2019-07-09','2019-07-24 12:00:00','2019-08-08 14:24:18',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,30.00000000,3.84000000,0.00000000,0.00000000,33.84000000,NULL,NULL,1,0,'','','azur',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(2,1,NULL,'2020-06-12 17:12:08','PR1007-0002',1,NULL,NULL,'','2012-07-10 02:11:44','2019-07-10','2019-07-25 12:00:00','2019-07-10 02:12:55','2019-07-20 15:23:12',1,NULL,1,1,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,1,'','','azur',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(3,4,NULL,'2020-06-12 17:12:08','PR1007-0003',1,NULL,NULL,'','2012-07-18 11:35:11','2019-07-18','2019-08-02 12:00:00','2019-07-18 11:36:18','2019-07-20 15:21:15',1,NULL,1,1,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(5,19,NULL,'2020-06-12 17:12:08','PR1302-0005',1,NULL,NULL,'','2015-02-17 15:39:56','2020-02-17','2020-03-04 12:00:00','2019-11-15 23:27:10',NULL,1,NULL,12,NULL,1,0,NULL,NULL,0,10.00000000,2.00000000,0.00000000,0.00000000,12.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(6,19,NULL,'2020-06-12 17:12:08','PR1302-0006',1,NULL,NULL,'','2015-02-17 15:40:12','2020-02-17','2020-03-04 12:00:00',NULL,NULL,1,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(7,19,NULL,'2020-06-12 17:12:08','PR1302-0007',1,NULL,NULL,'','2015-02-17 15:41:15','2020-02-17','2020-03-04 12:00:00','2019-01-29 21:49:33',NULL,1,NULL,12,NULL,1,0,NULL,NULL,0,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,400.00000000,0.00000000,400.00000000,NULL),(8,19,NULL,'2020-06-12 17:12:08','PR1302-0008',1,NULL,NULL,'','2015-02-17 15:43:39','2020-02-17','2020-03-04 12:00:00',NULL,NULL,1,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(10,7,4,'2020-06-12 17:12:08','PR1909-0031',1,NULL,NULL,'','2017-11-15 23:37:08','2019-11-15','2020-11-30 12:00:00','2021-09-27 16:54:30',NULL,12,NULL,12,NULL,1,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,3,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',NULL,NULL,1.00000000,10.00000000,0.00000000,10.00000000,'propale/PR1909-0031/PR1909-0031.pdf'),(11,1,NULL,'2020-06-12 17:12:08','PR1702-0009',1,NULL,NULL,'','2017-02-16 01:44:58','2020-05-13','2020-05-28 12:00:00','2020-02-16 01:44:58',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,60.00000000,0.00000000,0.00000000,0.00000000,60.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,60.00000000,0.00000000,60.00000000,NULL),(12,7,NULL,'2020-06-12 17:12:08','PR1702-0010',1,NULL,NULL,'','2017-02-16 01:45:44','2019-06-24','2019-07-09 12:00:00','2020-02-16 01:45:44',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,832.00000000,0.00000000,0.00000000,0.00000000,832.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,832.00000000,0.00000000,832.00000000,NULL),(13,26,NULL,'2020-06-12 17:12:08','PR1702-0011',1,NULL,NULL,'','2017-02-16 01:46:15','2020-04-03','2020-04-18 12:00:00','2020-02-16 01:46:15',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,242.00000000,0.00000000,0.00000000,0.00000000,242.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,242.00000000,0.00000000,242.00000000,NULL),(14,3,NULL,'2020-06-12 17:12:08','PR1702-0012',1,NULL,NULL,'','2017-02-16 01:46:15','2019-06-19','2019-07-04 12:00:00','2019-02-16 01:46:15',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,245.00000000,0.00000000,0.00000000,0.00000000,245.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,245.00000000,0.00000000,245.00000000,NULL),(15,26,NULL,'2020-06-12 17:12:08','PR1702-0013',1,NULL,NULL,'','2017-02-16 01:46:15','2020-05-01','2020-05-16 12:00:00','2019-02-16 01:46:15',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,940.00000000,0.00000000,0.00000000,0.00000000,940.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,940.00000000,0.00000000,940.00000000,NULL),(16,1,NULL,'2020-06-12 17:12:08','PR1702-0014',1,NULL,NULL,'','2017-02-16 01:46:15','2020-05-13','2020-05-28 12:00:00','2020-02-16 01:46:15',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,125.00000000,0.00000000,0.00000000,0.00000000,125.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,125.00000000,0.00000000,125.00000000,NULL),(17,1,NULL,'2020-06-12 17:12:08','PR1702-0015',1,NULL,NULL,'','2017-02-16 01:46:15','2019-07-23','2019-08-07 12:00:00','2019-02-16 01:46:15',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,163.00000000,0.00000000,0.00000000,0.00000000,163.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,163.00000000,0.00000000,163.00000000,NULL),(18,26,NULL,'2020-06-12 17:12:08','PR1702-0016',1,NULL,NULL,'','2017-02-16 01:46:15','2020-02-13','2020-02-28 12:00:00','2020-02-16 01:46:15',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,900.00000000,0.00000000,0.00000000,0.00000000,900.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,900.00000000,0.00000000,900.00000000,NULL),(19,12,NULL,'2020-06-12 17:12:08','PR1702-0017',1,NULL,NULL,'','2017-02-16 01:46:15','2020-03-30','2020-04-14 12:00:00','2020-02-16 01:46:15',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,200.00000000,0.00000000,200.00000000,NULL),(20,26,NULL,'2020-06-12 17:12:08','PR1702-0018',1,NULL,NULL,'','2017-02-16 01:46:15','2019-11-13','2019-11-28 12:00:00','2019-02-16 01:46:15',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,830.00000000,0.00000000,0.00000000,0.00000000,830.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,830.00000000,0.00000000,830.00000000,NULL),(21,1,NULL,'2020-06-12 17:12:08','PR1702-0019',1,NULL,NULL,'','2017-02-16 01:46:15','2019-09-23','2020-10-08 12:00:00','2020-02-16 04:47:09',NULL,1,NULL,12,NULL,1,0,NULL,NULL,0,89.00000000,0.00000000,0.00000000,0.00000000,89.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,89.00000000,0.00000000,89.00000000,NULL),(22,26,NULL,'2020-06-12 17:12:08','PR1702-0020',1,NULL,NULL,'','2017-02-16 01:46:15','2019-11-13','2019-11-28 12:00:00','2019-02-16 01:46:15',NULL,1,NULL,1,NULL,0,0,NULL,NULL,0,70.00000000,0.00000000,0.00000000,0.00000000,70.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,70.00000000,0.00000000,70.00000000,'propale/PR1702-0020/PR1702-0020.pdf'),(23,12,NULL,'2020-06-12 17:12:08','PR1702-0021',1,NULL,NULL,'','2017-02-16 01:46:17','2020-04-03','2020-04-18 12:00:00','2019-02-17 16:07:18',NULL,2,NULL,12,NULL,1,0,NULL,NULL,0,715.00000000,0.00000000,0.00000000,0.00000000,715.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,715.00000000,0.00000000,715.00000000,NULL),(24,7,NULL,'2020-06-12 17:12:08','PR1702-0022',1,NULL,NULL,'','2017-02-16 01:46:17','2019-11-13','2019-11-28 12:00:00','2019-02-16 01:46:17',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,250.00000000,0.00000000,0.00000000,0.00000000,250.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,250.00000000,0.00000000,250.00000000,NULL),(25,3,NULL,'2020-06-12 17:12:08','PR1702-0023',1,NULL,NULL,'','2017-02-16 01:46:17','2019-07-09','2019-07-24 12:00:00','2019-02-16 01:46:17','2019-02-16 04:47:29',1,NULL,1,12,4,0,NULL,NULL,0,1018.00000000,0.00000000,0.00000000,0.00000000,1018.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,1018.00000000,0.00000000,1018.00000000,NULL),(26,1,NULL,'2020-06-12 17:12:08','PR1702-0024',1,NULL,NULL,'','2017-02-16 01:46:17','2020-04-03','2020-04-18 12:00:00','2019-02-16 01:46:18',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,710.00000000,0.00000000,0.00000000,0.00000000,710.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,710.00000000,0.00000000,710.00000000,NULL),(27,6,NULL,'2020-06-12 17:12:08','PR1702-0025',1,NULL,NULL,'','2017-02-16 01:46:18','2019-11-12','2019-11-27 12:00:00','2019-02-16 01:46:18',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,300.00000000,0.00000000,300.00000000,NULL),(28,19,NULL,'2020-06-12 17:12:08','PR1702-0026',1,NULL,NULL,'','2017-02-16 01:46:18','2019-07-30','2019-08-14 12:00:00','2020-02-16 01:46:18','2020-02-16 04:46:31',2,NULL,2,12,2,0,NULL,NULL,0,440.00000000,0.00000000,0.00000000,0.00000000,440.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,440.00000000,0.00000000,440.00000000,NULL),(29,1,NULL,'2020-06-12 17:12:08','PR1702-0027',1,NULL,NULL,'','2017-02-16 01:46:18','2019-07-23','2019-08-07 12:00:00','2020-02-16 01:46:18','2021-12-20 20:50:23',2,NULL,2,12,2,0,NULL,NULL,0,1000.00000000,0.00000000,0.00000000,0.00000000,1000.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,'propale/PR1702-0027/PR1702-0027.pdf'),(30,1,NULL,'2020-06-12 17:12:08','PR1702-0028',1,NULL,NULL,'','2017-02-16 01:46:18','2020-05-01','2020-05-16 12:00:00','2019-02-16 01:46:18','2019-02-16 04:46:42',2,NULL,2,12,3,0,NULL,NULL,0,1200.00000000,0.00000000,0.00000000,0.00000000,1200.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,1200.00000000,0.00000000,1200.00000000,NULL),(31,11,NULL,'2020-06-12 17:12:08','PR1702-0029',1,NULL,NULL,'','2017-02-16 01:46:18','2019-06-24','2019-07-09 12:00:00','2019-02-16 01:46:18',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,720.00000000,0.00000000,0.00000000,0.00000000,720.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,720.00000000,0.00000000,720.00000000,NULL),(32,19,NULL,'2020-06-12 17:12:08','PR1702-0030',1,NULL,NULL,'','2017-02-16 01:46:18','2019-11-12','2019-11-27 12:00:00','2019-02-16 01:46:18',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,608.00000000,0.00000000,0.00000000,0.00000000,608.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,608.00000000,0.00000000,608.00000000,NULL),(33,10,6,'2020-01-15 18:37:15','PR1909-0032',1,NULL,NULL,'','2019-09-27 17:07:40','2019-09-27','2019-10-12 12:00:00','2019-09-27 17:08:59',NULL,12,12,12,NULL,1,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,'This is a private note','This is a public note','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,'propale/PR1909-0032/PR1909-0032.pdf'),(34,10,6,'2020-01-18 17:13:33','PR1909-0033',1,NULL,NULL,'','2019-09-27 17:11:21','2019-09-27','2019-10-12 12:00:00','2019-09-27 17:13:13','2020-01-07 23:43:06',12,12,12,12,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,NULL,NULL,NULL,'a &amp; a<br />\r\nb &lt; r','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,'propale/PR1909-0033/PR1909-0033.pdf'),(35,10,NULL,'2020-01-01 19:54:50','(PROV35)',1,NULL,NULL,'','2019-09-27 17:53:44','2019-09-27','2019-10-12 12:00:00',NULL,NULL,12,NULL,NULL,NULL,0,0,NULL,NULL,0,5.00000000,0.00000000,0.00000000,0.00000000,5.00000000,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,5.00000000,0.00000000,5.00000000,'propale/(PROV35)/(PROV35).pdf'),(36,1,NULL,'2020-01-19 13:24:27','PR2001-0034',1,NULL,NULL,'','2020-01-01 23:55:35','2020-01-01','2020-01-16 12:00:00','2020-01-19 14:24:22','2020-01-19 14:24:27',12,NULL,12,12,2,0,NULL,NULL,0,4.00000000,0.24000000,0.00000000,0.00000000,4.24000000,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,4.00000000,0.24000000,4.24000000,'propale/PR2001-0034/PR2001-0034.pdf'),(37,10,NULL,'2020-01-05 20:46:07','(PROV37)',1,NULL,NULL,'','2020-01-06 00:44:16','2020-01-05','2020-01-20 12:00:00',NULL,NULL,12,NULL,NULL,NULL,0,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,'propale/(PROV37)/(PROV37).pdf'),(38,30,NULL,'2020-01-13 13:25:28','(PROV38)',1,NULL,NULL,'','2020-01-13 17:25:28','2020-01-13','2020-01-28 12:00:00',NULL,NULL,12,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,'propale/(PROV38)/(PROV38).pdf');
+INSERT INTO `llx_propal` VALUES (1,2,NULL,'2020-12-10 12:24:22','PR1007-0001',1,NULL,NULL,'','2012-07-09 01:33:49','2020-07-09','2020-07-24 12:00:00','2020-08-08 14:24:18',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,30.00000000,3.84000000,0.00000000,0.00000000,33.84000000,NULL,NULL,1,0,'','','azur',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(2,1,NULL,'2020-12-10 12:24:22','PR1007-0002',1,NULL,NULL,'','2012-07-10 02:11:44','2020-07-10','2020-07-25 12:00:00','2020-07-10 02:12:55','2020-07-20 15:23:12',1,NULL,1,1,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,1,'','','azur',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(3,4,NULL,'2020-12-10 12:24:22','PR1007-0003',1,NULL,NULL,'','2012-07-18 11:35:11','2020-07-18','2020-08-02 12:00:00','2020-07-18 11:36:18','2020-07-20 15:21:15',1,NULL,1,1,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(5,19,NULL,'2020-06-12 17:12:08','PR1302-0005',1,NULL,NULL,'','2015-02-17 15:39:56','2020-02-17','2020-03-04 12:00:00','2019-11-15 23:27:10',NULL,1,NULL,12,NULL,1,0,NULL,NULL,0,10.00000000,2.00000000,0.00000000,0.00000000,12.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(6,19,NULL,'2020-06-12 17:12:08','PR1302-0006',1,NULL,NULL,'','2015-02-17 15:40:12','2020-02-17','2020-03-04 12:00:00',NULL,NULL,1,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(7,19,NULL,'2020-06-12 17:12:08','PR1302-0007',1,NULL,NULL,'','2015-02-17 15:41:15','2020-02-17','2020-03-04 12:00:00','2019-01-29 21:49:33',NULL,1,NULL,12,NULL,1,0,NULL,NULL,0,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,400.00000000,0.00000000,400.00000000,NULL),(8,19,NULL,'2020-06-12 17:12:08','PR1302-0008',1,NULL,NULL,'','2015-02-17 15:43:39','2020-02-17','2020-03-04 12:00:00',NULL,NULL,1,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(10,7,4,'2020-12-10 12:24:22','PR1909-0031',1,NULL,NULL,'','2017-11-15 23:37:08','2020-11-15','2020-11-30 12:00:00','2021-09-27 16:54:30',NULL,12,NULL,12,NULL,1,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,3,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',NULL,NULL,1.00000000,10.00000000,0.00000000,10.00000000,'propale/PR1909-0031/PR1909-0031.pdf'),(11,1,NULL,'2020-06-12 17:12:08','PR1702-0009',1,NULL,NULL,'','2017-02-16 01:44:58','2020-05-13','2020-05-28 12:00:00','2020-02-16 01:44:58',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,60.00000000,0.00000000,0.00000000,0.00000000,60.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,60.00000000,0.00000000,60.00000000,NULL),(12,7,NULL,'2020-12-10 12:24:22','PR1702-0010',1,NULL,NULL,'','2017-02-16 01:45:44','2020-06-24','2020-07-09 12:00:00','2020-02-16 01:45:44',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,832.00000000,0.00000000,0.00000000,0.00000000,832.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,832.00000000,0.00000000,832.00000000,NULL),(13,26,NULL,'2020-06-12 17:12:08','PR1702-0011',1,NULL,NULL,'','2017-02-16 01:46:15','2020-04-03','2020-04-18 12:00:00','2020-02-16 01:46:15',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,242.00000000,0.00000000,0.00000000,0.00000000,242.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,242.00000000,0.00000000,242.00000000,NULL),(14,3,NULL,'2020-12-10 12:24:22','PR1702-0012',1,NULL,NULL,'','2017-02-16 01:46:15','2020-06-19','2020-07-04 12:00:00','2020-02-16 01:46:15',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,245.00000000,0.00000000,0.00000000,0.00000000,245.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,245.00000000,0.00000000,245.00000000,NULL),(15,26,NULL,'2020-06-12 17:12:08','PR1702-0013',1,NULL,NULL,'','2017-02-16 01:46:15','2020-05-01','2020-05-16 12:00:00','2019-02-16 01:46:15',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,940.00000000,0.00000000,0.00000000,0.00000000,940.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,940.00000000,0.00000000,940.00000000,NULL),(16,1,NULL,'2020-06-12 17:12:08','PR1702-0014',1,NULL,NULL,'','2017-02-16 01:46:15','2020-05-13','2020-05-28 12:00:00','2020-02-16 01:46:15',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,125.00000000,0.00000000,0.00000000,0.00000000,125.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,125.00000000,0.00000000,125.00000000,NULL),(17,1,NULL,'2020-12-10 12:24:22','PR1702-0015',1,NULL,NULL,'','2017-02-16 01:46:15','2020-07-23','2020-08-07 12:00:00','2020-02-16 01:46:15',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,163.00000000,0.00000000,0.00000000,0.00000000,163.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,163.00000000,0.00000000,163.00000000,NULL),(18,26,NULL,'2020-06-12 17:12:08','PR1702-0016',1,NULL,NULL,'','2017-02-16 01:46:15','2020-02-13','2020-02-28 12:00:00','2020-02-16 01:46:15',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,900.00000000,0.00000000,0.00000000,0.00000000,900.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,900.00000000,0.00000000,900.00000000,NULL),(19,12,NULL,'2020-06-12 17:12:08','PR1702-0017',1,NULL,NULL,'','2017-02-16 01:46:15','2020-03-30','2020-04-14 12:00:00','2020-02-16 01:46:15',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,200.00000000,0.00000000,200.00000000,NULL),(20,26,NULL,'2020-12-10 12:24:22','PR1702-0018',1,NULL,NULL,'','2017-02-16 01:46:15','2020-11-13','2020-11-28 12:00:00','2020-02-16 01:46:15',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,830.00000000,0.00000000,0.00000000,0.00000000,830.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,830.00000000,0.00000000,830.00000000,NULL),(21,1,NULL,'2020-12-10 12:24:22','PR1702-0019',1,NULL,NULL,'','2017-02-16 01:46:15','2020-09-23','2020-10-08 12:00:00','2020-02-16 04:47:09',NULL,1,NULL,12,NULL,1,0,NULL,NULL,0,89.00000000,0.00000000,0.00000000,0.00000000,89.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,89.00000000,0.00000000,89.00000000,NULL),(22,26,NULL,'2020-12-10 12:24:22','PR1702-0020',1,NULL,NULL,'','2017-02-16 01:46:15','2020-11-13','2020-11-28 12:00:00','2020-02-16 01:46:15',NULL,1,NULL,1,NULL,0,0,NULL,NULL,0,70.00000000,0.00000000,0.00000000,0.00000000,70.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,70.00000000,0.00000000,70.00000000,'propale/PR1702-0020/PR1702-0020.pdf'),(23,12,NULL,'2020-06-12 17:12:08','PR1702-0021',1,NULL,NULL,'','2017-02-16 01:46:17','2020-04-03','2020-04-18 12:00:00','2019-02-17 16:07:18',NULL,2,NULL,12,NULL,1,0,NULL,NULL,0,715.00000000,0.00000000,0.00000000,0.00000000,715.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,715.00000000,0.00000000,715.00000000,NULL),(24,7,NULL,'2020-12-10 12:24:22','PR1702-0022',1,NULL,NULL,'','2017-02-16 01:46:17','2020-11-13','2020-11-28 12:00:00','2020-02-16 01:46:17',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,250.00000000,0.00000000,0.00000000,0.00000000,250.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,250.00000000,0.00000000,250.00000000,NULL),(25,3,NULL,'2020-12-10 12:24:22','PR1702-0023',1,NULL,NULL,'','2017-02-16 01:46:17','2020-07-09','2020-07-24 12:00:00','2020-02-16 01:46:17','2020-02-16 04:47:29',1,NULL,1,12,4,0,NULL,NULL,0,1018.00000000,0.00000000,0.00000000,0.00000000,1018.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,1018.00000000,0.00000000,1018.00000000,NULL),(26,1,NULL,'2020-06-12 17:12:08','PR1702-0024',1,NULL,NULL,'','2017-02-16 01:46:17','2020-04-03','2020-04-18 12:00:00','2019-02-16 01:46:18',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,710.00000000,0.00000000,0.00000000,0.00000000,710.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,710.00000000,0.00000000,710.00000000,NULL),(27,6,NULL,'2020-12-10 12:24:22','PR1702-0025',1,NULL,NULL,'','2017-02-16 01:46:18','2020-11-12','2020-11-27 12:00:00','2020-02-16 01:46:18',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,300.00000000,0.00000000,300.00000000,NULL),(28,19,NULL,'2020-12-10 12:24:22','PR1702-0026',1,NULL,NULL,'','2017-02-16 01:46:18','2020-07-30','2020-08-14 12:00:00','2020-02-16 01:46:18','2020-02-16 04:46:31',2,NULL,2,12,2,0,NULL,NULL,0,440.00000000,0.00000000,0.00000000,0.00000000,440.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,440.00000000,0.00000000,440.00000000,NULL),(29,1,NULL,'2020-12-10 12:24:22','PR1702-0027',1,NULL,NULL,'','2017-02-16 01:46:18','2020-07-23','2020-08-07 12:00:00','2020-02-16 01:46:18','2021-12-20 20:50:23',2,NULL,2,12,2,0,NULL,NULL,0,1000.00000000,0.00000000,0.00000000,0.00000000,1000.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,'propale/PR1702-0027/PR1702-0027.pdf'),(30,1,NULL,'2020-06-12 17:12:08','PR1702-0028',1,NULL,NULL,'','2017-02-16 01:46:18','2020-05-01','2020-05-16 12:00:00','2019-02-16 01:46:18','2019-02-16 04:46:42',2,NULL,2,12,3,0,NULL,NULL,0,1200.00000000,0.00000000,0.00000000,0.00000000,1200.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,1200.00000000,0.00000000,1200.00000000,NULL),(31,11,NULL,'2020-12-10 12:24:22','PR1702-0029',1,NULL,NULL,'','2017-02-16 01:46:18','2020-06-24','2020-07-09 12:00:00','2020-02-16 01:46:18',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,720.00000000,0.00000000,0.00000000,0.00000000,720.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,720.00000000,0.00000000,720.00000000,NULL),(32,19,NULL,'2020-12-10 12:24:22','PR1702-0030',1,NULL,NULL,'','2017-02-16 01:46:18','2020-11-12','2020-11-27 12:00:00','2020-02-16 01:46:18',NULL,2,NULL,2,NULL,1,0,NULL,NULL,0,608.00000000,0.00000000,0.00000000,0.00000000,608.00000000,NULL,NULL,3,3,'','','',NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,608.00000000,0.00000000,608.00000000,NULL),(33,10,6,'2020-12-10 12:24:22','PR1909-0032',1,NULL,NULL,'','2019-09-27 17:07:40','2020-09-27','2020-10-12 12:00:00','2020-09-27 17:08:59',NULL,12,12,12,NULL,1,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,'This is a private note','This is a public note','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,'propale/PR1909-0032/PR1909-0032.pdf'),(34,10,6,'2020-12-10 12:24:22','PR1909-0033',1,NULL,NULL,'','2019-09-27 17:11:21','2020-09-27','2020-10-12 12:00:00','2020-09-27 17:13:13','2020-01-07 23:43:06',12,12,12,12,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,NULL,NULL,NULL,'a &amp; a<br />\r\nb &lt; r','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,'propale/PR1909-0033/PR1909-0033.pdf'),(35,10,NULL,'2020-12-10 12:24:22','(PROV35)',1,NULL,NULL,'','2019-09-27 17:53:44','2020-09-27','2020-10-12 12:00:00',NULL,NULL,12,NULL,NULL,NULL,0,0,NULL,NULL,0,5.00000000,0.00000000,0.00000000,0.00000000,5.00000000,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,5.00000000,0.00000000,5.00000000,'propale/(PROV35)/(PROV35).pdf'),(36,1,NULL,'2020-01-19 13:24:27','PR2001-0034',1,NULL,NULL,'','2020-01-01 23:55:35','2020-01-01','2020-01-16 12:00:00','2020-01-19 14:24:22','2020-01-19 14:24:27',12,NULL,12,12,2,0,NULL,NULL,0,4.00000000,0.24000000,0.00000000,0.00000000,4.24000000,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,4.00000000,0.24000000,4.24000000,'propale/PR2001-0034/PR2001-0034.pdf'),(37,10,NULL,'2020-01-05 20:46:07','(PROV37)',1,NULL,NULL,'','2020-01-06 00:44:16','2020-01-05','2020-01-20 12:00:00',NULL,NULL,12,NULL,NULL,NULL,0,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,'propale/(PROV37)/(PROV37).pdf'),(38,30,NULL,'2020-01-13 13:25:28','(PROV38)',1,NULL,NULL,'','2020-01-13 17:25:28','2020-01-13','2020-01-28 12:00:00',NULL,NULL,12,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,'propale/(PROV38)/(PROV38).pdf');
 /*!40000 ALTER TABLE `llx_propal` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -11180,6 +12527,247 @@ LOCK TABLES `llx_propaldet_extrafields` WRITE;
 /*!40000 ALTER TABLE `llx_propaldet_extrafields` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_rec_dossier`
+--
+
+DROP TABLE IF EXISTS `llx_rec_dossier`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_rec_dossier` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT 0,
+  `fk_soc` int(11) NOT NULL DEFAULT 0,
+  `fk_user` int(11) NOT NULL DEFAULT 0,
+  `fk_procedure` int(11) NOT NULL DEFAULT 0,
+  `fk_etape` int(11) NOT NULL DEFAULT 0,
+  `ref` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `statut` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `commentaire` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `date_last_etape` datetime DEFAULT NULL,
+  `date_start` datetime DEFAULT NULL,
+  `date_end` datetime DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_rec_dossier`
+--
+
+LOCK TABLES `llx_rec_dossier` WRITE;
+/*!40000 ALTER TABLE `llx_rec_dossier` DISABLE KEYS */;
+INSERT INTO `llx_rec_dossier` VALUES (1,'2019-10-08 17:06:17','2019-10-08 17:15:15',1,404,12,1,1,'REC1910-0001','OPEN','','2019-10-08 17:13:53','2019-10-08 17:06:17',NULL),(2,'2019-10-08 17:06:17','2019-10-08 17:13:44',1,1,12,1,1,'REC1910-0002','OPEN','','2019-10-08 17:13:44','2019-10-08 17:06:17',NULL);
+/*!40000 ALTER TABLE `llx_rec_dossier` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_rec_dossier_facture`
+--
+
+DROP TABLE IF EXISTS `llx_rec_dossier_facture`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_rec_dossier_facture` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_dossier` int(11) NOT NULL DEFAULT 0,
+  `fk_facture` int(11) NOT NULL DEFAULT 0,
+  `paye` int(11) NOT NULL DEFAULT 0,
+  `filepath` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `fk_dossier` (`fk_dossier`),
+  KEY `fk_facture` (`fk_facture`),
+  KEY `paye` (`paye`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_rec_dossier_facture`
+--
+
+LOCK TABLES `llx_rec_dossier_facture` WRITE;
+/*!40000 ALTER TABLE `llx_rec_dossier_facture` DISABLE KEYS */;
+INSERT INTO `llx_rec_dossier_facture` VALUES (1,'2019-10-08 17:06:17','2019-10-08 17:15:15',1,780,0,'/home/ldestailleur/git/dolibarr/documents/facture/FA1504-0251/FA1504-0251.pdf'),(2,'2019-10-08 17:06:17','2019-10-08 17:13:44',2,55,0,'/home/ldestailleur/git/dolibarr/documents/facture/FA1212-0009/FA1212-0009.pdf'),(3,'2019-10-08 17:06:39','2019-10-08 17:13:44',2,149,0,'/home/ldestailleur/git/dolibarr/documents/facture/FA1601-0024/FA1601-0024.pdf');
+/*!40000 ALTER TABLE `llx_rec_dossier_facture` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_rec_etape`
+--
+
+DROP TABLE IF EXISTS `llx_rec_etape`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_rec_etape` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_procedure` int(11) NOT NULL DEFAULT 0,
+  `rang` int(11) NOT NULL DEFAULT 0,
+  `delais` int(11) NOT NULL DEFAULT 0,
+  `ref` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `name` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `fk_action` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `titre_mail` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `bcc_mail` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `tpl_doc` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `description` longtext CHARACTER SET latin1 DEFAULT NULL,
+  `body_mail` longtext CHARACTER SET latin1 DEFAULT NULL,
+  `fk_service` int(11) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `fk_procedure` (`fk_procedure`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_rec_etape`
+--
+
+LOCK TABLES `llx_rec_etape` WRITE;
+/*!40000 ALTER TABLE `llx_rec_etape` DISABLE KEYS */;
+INSERT INTO `llx_rec_etape` VALUES (1,'2019-10-08 17:00:47','2019-10-08 17:11:23',1,1,0,'','etape 1 a','mail','aaa','','','aaa','aaaaa',0),(2,'2019-10-08 17:01:50','2019-10-08 17:10:56',1,2,2,'','Etape 2','doc','','','2-tpl_lettre (1).odt','','',0);
+/*!40000 ALTER TABLE `llx_rec_etape` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_rec_etape_document`
+--
+
+DROP TABLE IF EXISTS `llx_rec_etape_document`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_rec_etape_document` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_etape` int(11) NOT NULL DEFAULT 0,
+  `fk_document` int(11) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `fk_etape` (`fk_etape`),
+  KEY `fk_document` (`fk_document`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_rec_etape_document`
+--
+
+LOCK TABLES `llx_rec_etape_document` WRITE;
+/*!40000 ALTER TABLE `llx_rec_etape_document` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_rec_etape_document` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_rec_etape_history`
+--
+
+DROP TABLE IF EXISTS `llx_rec_etape_history`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_rec_etape_history` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_dossier` int(11) NOT NULL DEFAULT 0,
+  `fk_etape` int(11) NOT NULL DEFAULT 0,
+  `fk_commaction` int(11) NOT NULL DEFAULT 0,
+  `date_etape` datetime DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `fk_dossier` (`fk_dossier`),
+  KEY `fk_etape` (`fk_etape`),
+  KEY `fk_commaction` (`fk_commaction`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_rec_etape_history`
+--
+
+LOCK TABLES `llx_rec_etape_history` WRITE;
+/*!40000 ALTER TABLE `llx_rec_etape_history` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_rec_etape_history` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_rec_prerelance`
+--
+
+DROP TABLE IF EXISTS `llx_rec_prerelance`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_rec_prerelance` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_model` int(11) NOT NULL DEFAULT 0,
+  `nb_day` int(11) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `fk_model` (`fk_model`),
+  KEY `nb_day` (`nb_day`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_rec_prerelance`
+--
+
+LOCK TABLES `llx_rec_prerelance` WRITE;
+/*!40000 ALTER TABLE `llx_rec_prerelance` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_rec_prerelance` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_rec_procedure`
+--
+
+DROP TABLE IF EXISTS `llx_rec_procedure`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_rec_procedure` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT 0,
+  `active` int(11) NOT NULL DEFAULT 0,
+  `name` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `description` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `is_default` int(11) NOT NULL DEFAULT 0,
+  `allow_free_events` int(11) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `entity` (`entity`),
+  KEY `active` (`active`),
+  KEY `is_default` (`is_default`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_rec_procedure`
+--
+
+LOCK TABLES `llx_rec_procedure` WRITE;
+/*!40000 ALTER TABLE `llx_rec_procedure` DISABLE KEYS */;
+INSERT INTO `llx_rec_procedure` VALUES (1,'2019-10-08 17:00:22','2019-10-08 17:01:26',1,0,'Recouvrement standar','aaa',1,0);
+/*!40000 ALTER TABLE `llx_rec_procedure` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_reception`
 --
@@ -11269,6 +12857,320 @@ LOCK TABLES `llx_reception_extrafields` WRITE;
 /*!40000 ALTER TABLE `llx_reception_extrafields` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_recruitment_recruitmentcandidature`
+--
+
+DROP TABLE IF EXISTS `llx_recruitment_recruitmentcandidature`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_recruitment_recruitmentcandidature` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_recruitmentjobposition` int(11) DEFAULT NULL,
+  `ref` varchar(128) CHARACTER SET utf8mb4 NOT NULL DEFAULT '(PROV)',
+  `description` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `note_public` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `note_private` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_user_creat` int(11) NOT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `model_pdf` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `status` smallint(6) NOT NULL,
+  `firstname` varchar(128) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `lastname` varchar(128) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `email` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `phone` varchar(64) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `remuneration_requested` int(11) DEFAULT NULL,
+  `remuneration_proposed` int(11) DEFAULT NULL,
+  `fk_recruitment_origin` int(11) DEFAULT NULL,
+  `email_msgid` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `date_birth` date DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_recruitmentcandidature_email_msgid` (`email_msgid`),
+  KEY `idx_recruitment_recruitmentcandidature_rowid` (`rowid`),
+  KEY `idx_recruitment_recruitmentcandidature_ref` (`ref`),
+  KEY `llx_recruitment_recruitmentcandidature_fk_user_creat` (`fk_user_creat`),
+  KEY `idx_recruitment_recruitmentcandidature_status` (`status`),
+  CONSTRAINT `llx_recruitment_recruitmentcandidature_fk_user_creat` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=118 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_recruitment_recruitmentcandidature`
+--
+
+LOCK TABLES `llx_recruitment_recruitmentcandidature` WRITE;
+/*!40000 ALTER TABLE `llx_recruitment_recruitmentcandidature` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_recruitment_recruitmentcandidature` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_recruitment_recruitmentcandidature_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_recruitment_recruitmentcandidature_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_recruitment_recruitmentcandidature_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `aa` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_fk_object` (`fk_object`),
+  KEY `idx_recruitmentcandidature_fk_object` (`fk_object`)
+) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_recruitment_recruitmentcandidature_extrafields`
+--
+
+LOCK TABLES `llx_recruitment_recruitmentcandidature_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_recruitment_recruitmentcandidature_extrafields` DISABLE KEYS */;
+INSERT INTO `llx_recruitment_recruitmentcandidature_extrafields` VALUES (16,'2020-08-25 10:40:58',95,NULL,NULL),(17,'2020-08-25 10:52:58',72,NULL,NULL),(18,'2020-09-06 09:44:55',65,NULL,'fdsfsd'),(19,'2020-09-15 22:45:41',67,NULL,NULL),(20,'2020-11-04 10:14:10',112,NULL,NULL),(21,'2020-11-04 12:02:32',68,NULL,'aaaa');
+/*!40000 ALTER TABLE `llx_recruitment_recruitmentcandidature_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_recruitment_recruitmentjobposition`
+--
+
+DROP TABLE IF EXISTS `llx_recruitment_recruitmentjobposition`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_recruitment_recruitmentjobposition` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(128) CHARACTER SET utf8mb4 NOT NULL DEFAULT '(PROV)',
+  `label` varchar(255) CHARACTER SET utf8mb4 NOT NULL,
+  `qty` int(11) NOT NULL DEFAULT 1,
+  `fk_soc` int(11) DEFAULT NULL,
+  `fk_project` int(11) DEFAULT NULL,
+  `fk_user_recruiter` int(11) DEFAULT NULL,
+  `fk_user_supervisor` int(11) DEFAULT NULL,
+  `fk_establishment` int(11) DEFAULT NULL,
+  `date_planned` date DEFAULT NULL,
+  `description` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `note_public` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `note_private` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_user_creat` int(11) NOT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `model_pdf` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `status` smallint(6) NOT NULL,
+  `last_main_doc` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `email_recruiter` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `remuneration` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `remuneration_suggested` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_recruitment_recruitmentjobposition_rowid` (`rowid`),
+  KEY `idx_recruitment_recruitmentjobposition_ref` (`ref`),
+  KEY `idx_recruitment_recruitmentjobposition_fk_soc` (`fk_soc`),
+  KEY `idx_recruitment_recruitmentjobposition_fk_project` (`fk_project`),
+  KEY `llx_recruitment_recruitmentjobposition_fk_user_recruiter` (`fk_user_recruiter`),
+  KEY `llx_recruitment_recruitmentjobposition_fk_user_supervisor` (`fk_user_supervisor`),
+  KEY `llx_recruitment_recruitmentjobposition_fk_establishment` (`fk_establishment`),
+  KEY `llx_recruitment_recruitmentjobposition_fk_user_creat` (`fk_user_creat`),
+  KEY `idx_recruitment_recruitmentjobposition_status` (`status`),
+  CONSTRAINT `llx_recruitment_recruitmentjobposition_fk_establishment` FOREIGN KEY (`fk_establishment`) REFERENCES `llx_establishment` (`rowid`),
+  CONSTRAINT `llx_recruitment_recruitmentjobposition_fk_user_creat` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`),
+  CONSTRAINT `llx_recruitment_recruitmentjobposition_fk_user_recruiter` FOREIGN KEY (`fk_user_recruiter`) REFERENCES `llx_user` (`rowid`),
+  CONSTRAINT `llx_recruitment_recruitmentjobposition_fk_user_supervisor` FOREIGN KEY (`fk_user_supervisor`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_recruitment_recruitmentjobposition`
+--
+
+LOCK TABLES `llx_recruitment_recruitmentjobposition` WRITE;
+/*!40000 ALTER TABLE `llx_recruitment_recruitmentjobposition` DISABLE KEYS */;
+INSERT INTO `llx_recruitment_recruitmentjobposition` VALUES (2,'JOB2008-0001','Web designer',1,NULL,NULL,12,NULL,9,NULL,'Knowing HTML + CSS',NULL,'','2020-08-06 13:25:00','2020-09-02 17:17:47',12,12,NULL,'standard_recruitmentjobposition',3,'recruitment/recruitmentjobposition/JOB2008-0001/JOB2008-0001.pdf','',1,NULL,'To negociate'),(3,'JOB2009-0002','PHP Developer Senior',1,NULL,NULL,12,NULL,NULL,NULL,'5 years of experience required<br />\r\n<br />\r\nLocation: Berlin<br />\r\n&nbsp;',NULL,'','2020-09-02 17:23:00','2020-11-03 13:55:00',12,12,NULL,NULL,1,'recruitment/recruitmentjobposition/JOB2009-0002/JOB2009-0002.pdf','',1,NULL,'40000 - 50000'),(4,'JOB2009-0003','PHP Developer Junior',1,NULL,NULL,12,NULL,NULL,NULL,'Location: Madrid<br />\r\nWe are looking for a curious developer to work in our Web division.',NULL,NULL,'2020-11-11 17:24:00','2020-11-03 13:58:06',12,12,NULL,NULL,1,'recruitment/recruitmentjobposition/JOB2009-0003/JOB2009-0003.pdf','4444',1,NULL,'');
+/*!40000 ALTER TABLE `llx_recruitment_recruitmentjobposition` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_recruitment_recruitmentjobposition_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_recruitment_recruitmentjobposition_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_recruitment_recruitmentjobposition_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `bbb` double(24,8) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_fk_object` (`fk_object`),
+  KEY `idx_recruitmentjobposition_fk_object` (`fk_object`)
+) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_recruitment_recruitmentjobposition_extrafields`
+--
+
+LOCK TABLES `llx_recruitment_recruitmentjobposition_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_recruitment_recruitmentjobposition_extrafields` DISABLE KEYS */;
+INSERT INTO `llx_recruitment_recruitmentjobposition_extrafields` VALUES (6,'2020-09-06 18:39:58',2,NULL,NULL),(7,'2020-11-03 13:54:53',3,NULL,5.00000000),(18,'2020-11-09 08:51:51',4,NULL,NULL);
+/*!40000 ALTER TABLE `llx_recruitment_recruitmentjobposition_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_referenceletters`
+--
+
+DROP TABLE IF EXISTS `llx_referenceletters`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_referenceletters` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `title` varchar(100) CHARACTER SET utf8mb4 NOT NULL,
+  `element_type` varchar(50) CHARACTER SET utf8mb4 NOT NULL,
+  `use_custom_header` int(11) NOT NULL DEFAULT 0,
+  `header` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `use_custom_footer` int(11) NOT NULL DEFAULT 0,
+  `footer` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `use_landscape_format` int(11) NOT NULL DEFAULT 0,
+  `status` int(11) NOT NULL DEFAULT 1,
+  `default_doc` int(11) NOT NULL DEFAULT 0,
+  `import_key` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `fk_user_author` int(11) NOT NULL,
+  `datec` datetime NOT NULL,
+  `fk_user_mod` int(11) NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_referenceletters`
+--
+
+LOCK TABLES `llx_referenceletters` WRITE;
+/*!40000 ALTER TABLE `llx_referenceletters` DISABLE KEYS */;
+INSERT INTO `llx_referenceletters` VALUES (1,1,'Exemple de modèle de PROPOSITION','propal',1,'&nbsp;<br />\n<br />\n&nbsp;\n<table cellpadding=\"1\" cellspacing=\"1\">\n	<tbody>\n		<tr>\n			<td>MON LOGO ENTREPRISE</td>\n			<td style=\"text-align:right\"><strong>Proposition commerciale<br />\n			R&eacute;f. :&nbsp;{object_ref}</strong><br />\n			Date :&nbsp;{object_date}<br />\n			Date de fin de validit&eacute; :&nbsp;{object_date_end}<br />\n			Code client :&nbsp;{cust_company_customercode}<br />\n			{objets_lies}</td>\n		</tr>\n	</tbody>\n</table>',1,'<div style=\"text-align:center\"><br />\n<span style=\"font-size:8px\">{mycompany_juridicalstatus} - SIRET :&nbsp;{mycompany_idprof2}<br />\nNAF-APE :&nbsp;{mycompany_idprof3} - Num VA :&nbsp;{mycompany_vatnumber}</span><br />\n&nbsp;</div>\n',0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(2,1,'Exemple de modèle de FACTURE','invoice',1,'&nbsp;<br />\n<br />\n&nbsp;\n<table cellpadding=\"1\" cellspacing=\"1\">\n	<tbody>\n		<tr>\n			<td>MON LOGO ENTREPRISE</td>\n			<td style=\"text-align:right\"><strong>Facture<br />\n			R&eacute;f. :&nbsp;{object_ref}</strong><br />\n			Date facturation :&nbsp;{object_date}<br />\n			Date &eacute;ch&eacute;ance :&nbsp;{object_date_limit}<br />\n			Code client :&nbsp;{cust_company_customercode}<br />\n			{objets_lies}</td>\n		</tr>\n	</tbody>\n</table>',1,'<div style=\"text-align:center\"><br />\n<span style=\"font-size:8px\">{mycompany_juridicalstatus} - SIRET :&nbsp;{mycompany_idprof2}<br />\nNAF-APE :&nbsp;{mycompany_idprof3} - Num VA :&nbsp;{mycompany_vatnumber}</span><br />\n&nbsp;</div>',0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(3,1,'Exemple de modèle de COMMANDE','order',1,'&nbsp;<br />\n<br />\n&nbsp;\n<table cellpadding=\"1\" cellspacing=\"1\">\n	<tbody>\n		<tr>\n			<td>MON LOGO ENTREPRISE</td>\n			<td style=\"text-align:right\"><strong>Commande<br />\n			R&eacute;f. :&nbsp;{object_ref}</strong><br />\n			Date de commande :&nbsp;{object_date}<br />\n			{objets_lies}</td>\n		</tr>\n	</tbody>\n</table>',1,'<div style=\"text-align:center\"><br />\n<span style=\"font-size:8px\">{mycompany_juridicalstatus} - SIRET :&nbsp;{mycompany_idprof2}<br />\nNAF-APE :&nbsp;{mycompany_idprof3} - Num VA :&nbsp;{mycompany_vatnumber}</span><br />\n&nbsp;</div>',0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(4,1,'Exemple de modèle de CONTRAT','contract',1,'&nbsp;<br />\n<br />\n&nbsp;\n<table cellpadding=\"1\" cellspacing=\"1\">\n	<tbody>\n		<tr>\n			<td>MON LOGO ENTREPRISE</td>\n			<td style=\"text-align:right\"><strong>Fiche contrat<br />\n			R&eacute;f. :&nbsp;{object_ref}</strong><br />\n			Date :&nbsp;{object_date_creation}<br />\n			Code client :&nbsp;{cust_company_customercode}</td>\n		</tr>\n	</tbody>\n</table>',1,'<div style=\"text-align:center\"><br />\n<span style=\"font-size:8px\">{mycompany_juridicalstatus} - SIRET :&nbsp;{mycompany_idprof2}<br />\nNAF-APE :&nbsp;{mycompany_idprof3} - Num VA :&nbsp;{mycompany_vatnumber}</span><br />\n&nbsp;</div>',0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(5,1,'Exemple de modèle de DEMANDE DE PRIX','supplier_proposal',1,'&nbsp;<br />\n<br />\n&nbsp;\n<table cellpadding=\"1\" cellspacing=\"1\">\n	<tbody>\n		<tr>\n			<td>MON LOGO ENTREPRISE</td>\n			<td style=\"text-align:right\"><strong>Demande de prix<br />\n			R&eacute;f. :&nbsp;{object_ref}</strong><br />\n			Code fournisseur : :&nbsp;{cust_company_suppliercode}<br />\n			{objets_lies}</td>\n		</tr>\n	</tbody>\n</table>',1,'<div style=\"text-align:center\"><br />\n<span style=\"font-size:8px\">{mycompany_juridicalstatus} - SIRET :&nbsp;{mycompany_idprof2}<br />\nNAF-APE :&nbsp;{mycompany_idprof3} - Num VA :&nbsp;{mycompany_vatnumber}</span><br />\n&nbsp;</div>',0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(6,1,'Exemple de modèle de COMMANDE FOURNISSEUR','order_supplier',1,'&nbsp;<br />\n<br />\n&nbsp;\n<table cellpadding=\"1\" cellspacing=\"1\">\n	<tbody>\n		<tr>\n			<td>MON LOGO ENTREPRISE</td>\n			<td style=\"text-align:right\"><strong>Commande fournisseur {object_ref}<br />\n			R&eacute;f. :&nbsp;{objvar_object_ref_supplier}</strong><br />\n			Date pr&egrave;vue de livraison :&nbsp;{object_date_delivery_planed}<br />\n			Code fournisseur : :&nbsp;{cust_company_suppliercode}<br />\n			{objets_lies}</td>\n		</tr>\n	</tbody>\n</table>',1,'<div style=\"text-align:center\"><br />\n<span style=\"font-size:8px\">{mycompany_juridicalstatus} - SIRET :&nbsp;{mycompany_idprof2}<br />\nNAF-APE :&nbsp;{mycompany_idprof3} - Num VA :&nbsp;{mycompany_vatnumber}</span><br />\n&nbsp;</div>\n',0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56');
+/*!40000 ALTER TABLE `llx_referenceletters` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_referenceletters_chapters`
+--
+
+DROP TABLE IF EXISTS `llx_referenceletters_chapters`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_referenceletters_chapters` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `fk_referenceletters` int(11) NOT NULL,
+  `lang` varchar(5) CHARACTER SET utf8mb4 NOT NULL DEFAULT '',
+  `sort_order` int(11) NOT NULL DEFAULT 1,
+  `title` varchar(100) CHARACTER SET utf8mb4 NOT NULL,
+  `content_text` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `options_text` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `readonly` int(11) NOT NULL DEFAULT 0,
+  `same_page` int(11) NOT NULL DEFAULT 0,
+  `status` int(11) NOT NULL DEFAULT 1,
+  `import_key` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `fk_user_author` int(11) NOT NULL,
+  `datec` datetime NOT NULL,
+  `fk_user_mod` int(11) NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  PRIMARY KEY (`rowid`),
+  KEY `idx_referenceletters_chapters_fk_referenceletters` (`fk_referenceletters`),
+  CONSTRAINT `ibfk_referenceletters_chapters_fk_referenceletters` FOREIGN KEY (`fk_referenceletters`) REFERENCES `llx_referenceletters` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_referenceletters_chapters`
+--
+
+LOCK TABLES `llx_referenceletters_chapters` WRITE;
+/*!40000 ALTER TABLE `llx_referenceletters_chapters` DISABLE KEYS */;
+INSERT INTO `llx_referenceletters_chapters` VALUES (1,1,1,'fr_FR',1,'Header','<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:550px\">\n	<tbody>\n		<tr>\n			<td style=\"width:50%\">Emetteur :<br />\n			&nbsp;\n			<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:242px\">\n				<tbody>\n					<tr>\n						<td style=\"background-color:#e6e6e6; height:121px\"><br />\n						<strong>{mycompany_name}</strong><br />\n						{object_contactsale}<br />\n						{mycompany_address}<br />\n						{mycompany_zip}&nbsp;{mycompany_town}<br />\n						<br />\n						T&eacute;l. : {mycompany_phone} - Fax :&nbsp;{mycompany_fax}<br />\n						Email : {mycompany_email}<br />\n						Web :&nbsp;{mycompany_web}</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n			<td style=\"width:50%\">Adress&eacute; &agrave; :<br />\n			&nbsp;\n			<table border=\"1\" style=\"width:245px\">\n				<tbody>\n					<tr>\n						<td style=\"height:121px\"><br />\n						<strong>{cust_company_name}</strong><br />\n						{cust_contactclient}<br />\n						{cust_contactclientfact}<br />\n						{cust_company_address}<br />\n						{cust_company_zip}&nbsp;{cust_company_town}</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n		</tr>\n	</tbody>\n</table>',NULL,0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(2,1,1,'fr_FR',2,'Lines','&nbsp;<br />&nbsp;<br /><div style=\"text-align:right\">Montants exprim&eacute;s en Euros</div>\n\n<table border=\"1\" style=\"cellpadding:1; cellspacing:1; width:530px\">\n	<tbody>\n		<tr>\n			<td style=\"width:50%\"><strong>D&eacute;signation</strong></td>\n			<td style=\"width:10%\"><strong>TVA</strong></td>\n			<td style=\"width:10%\"><strong>P.U. HT</strong></td>\n			<td style=\"width:10%\"><strong>Qt&eacute;</strong></td>\n			<td style=\"width:10%\"><strong>R&eacute;duc.</strong></td>\n			<td style=\"width:10%\"><strong>Total HT</strong>[!-- BEGIN lines --]</td>\n		</tr>\n		<tr>\n			<td>{line_fulldesc}</td>\n			<td style=\"text-align:right\">{line_vatrate}</td>\n			<td style=\"text-align:right\">{line_up_locale}</td>\n			<td style=\"text-align:right\">{line_qty}</td>\n			<td style=\"text-align:right\">{line_discount_percent}</td>\n			<td style=\"text-align:right\">{line_price_ht_locale}[!-- END lines --]</td>\n		</tr>\n	</tbody></table>',NULL,0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(3,1,1,'fr_FR',3,'Footer','&nbsp;<br />\n&nbsp;<br />\n\n<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:500px\">\n	<tbody>\n		<tr>\n			<td rowspan=\"3\" style=\"width:60%\"><strong>Conditions de r&egrave;glement</strong> : {objvar_object_cond_reglement_doc}<br />\n			<strong>Mode de r&egrave;glement</strong> : {objvar_object_mode_reglement}</td>\n			<td style=\"width:20%\">Total HT</td>\n			<td style=\"text-align:right; width:20%\">{objvar_object_total_ht}</td>\n		</tr>\n		<tr>\n			<td style=\"background-color:#f5f5f5; width:20%\">{tva_detail_titres}</td>\n			<td style=\"background-color:#f5f5f5; text-align:right; width:20%\">{tva_detail_montants}</td>\n		</tr>\n		<tr>\n			<td style=\"background-color:#e6e6e6; width:20%\">Total TTC</td>\n			<td style=\"background-color:#e6e6e6; text-align:right; width:20%\">{objvar_object_total_ttc}</td>\n		</tr>\n	</tbody>\n</table>\n&nbsp;<br />\n&nbsp;<br />\n&nbsp;\n<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:500px\">\n	<tbody>\n		<tr>\n			<td style=\"width:55%\">&nbsp;</td>\n			<td style=\"width:45%\"><br />\n			Cachet, Date, Signature et mention &quot;Bon pour accord&quot;<br />\n			&nbsp;\n			<table border=\"1\" cellpadding=\"1\" cellspacing=\"1\" style=\"width:200px\">\n				<tbody>\n					<tr>\n						<td style=\"height:70px; width:220px\">&nbsp;</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n		</tr>\n	</tbody>\n</table>',NULL,0,1,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(4,1,2,'fr_FR',1,'Header','<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:550px\">\n	<tbody>\n		<tr>\n			<td style=\"width:50%\">Emetteur :<br />\n			&nbsp;\n			<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:242px\">\n				<tbody>\n					<tr>\n						<td style=\"background-color:#e6e6e6; height:121px\"><br />\n						<strong>{mycompany_name}</strong><br />\n						{object_contactsale}<br />\n						{mycompany_address}<br />\n						{mycompany_zip}&nbsp;{mycompany_town}<br />\n						<br />\n						T&eacute;l. : {mycompany_phone} - Fax :&nbsp;{mycompany_fax}<br />\n						Email : {mycompany_email}<br />\n						Web :&nbsp;{mycompany_web}</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n			<td style=\"width:50%\">Adress&eacute; &agrave; :<br />\n			&nbsp;\n			<table border=\"1\" style=\"width:245px\">\n				<tbody>\n					<tr>\n						<td style=\"height:121px\"><br />\n						<strong>{cust_company_name}</strong><br />\n						{cust_contactclient}<br />\n						{cust_contactclientfact}<br />\n						{cust_company_address}<br />\n						{cust_company_zip}&nbsp;{cust_company_town}</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n		</tr>\n	</tbody>\n</table>\n&nbsp;<br />\n&nbsp;<br />',NULL,0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(5,1,2,'fr_FR',2,'Lines','<div style=\"text-align:right\">Montants exprim&eacute;s en Euros</div>\n\n<table border=\"1\" style=\"cellpadding:1; cellspacing:1; width:530px\">\n	<tbody>\n		<tr>\n			<td style=\"width:50%\">D&eacute;signation</td>\n			<td style=\"width:10%\">TVA</td>\n			<td style=\"width:10%\">P.U. HT</td>\n			<td style=\"width:10%\">Qt&eacute;</td>\n			<td style=\"width:10%\">R&eacute;duc.</td>\n			<td style=\"width:10%\">Total HT[!-- BEGIN lines --]</td>\n		</tr>\n		<tr>\n			<td>{line_fulldesc}</td>\n			<td style=\"text-align:right\">{line_vatrate}</td>\n			<td style=\"text-align:right\">{line_up_locale}</td>\n			<td style=\"text-align:right\">{line_qty}</td>\n			<td style=\"text-align:right\">{line_discount_percent}</td>\n			<td style=\"text-align:right\">{line_price_ht_locale}[!-- END lines --]</td>\n		</tr>\n	</tbody>\n</table>\n&nbsp;<br />\n&nbsp;<br />',NULL,0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(6,1,2,'fr_FR',3,'Footer','&nbsp;\n<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:500px\">\n	<tbody>\n		<tr>\n			<td rowspan=\"6\" style=\"width:60%\"><strong>Conditions de r&egrave;glement</strong> : {objvar_object_cond_reglement_doc}<br />\n			<strong>Mode de r&egrave;glement</strong> : {objvar_object_mode_reglement}</td>\n			<td style=\"width:20%\">Total HT</td>\n			<td style=\"text-align:right; width:20%\">{objvar_object_total_ht}</td>\n		</tr>\n		<tr>\n			<td style=\"background-color:#f5f5f5; width:20%\">{tva_detail_titres}</td>\n			<td style=\"background-color:#f5f5f5; text-align:right; width:20%\">{tva_detail_montants}</td>\n		</tr>\n		<tr>\n			<td style=\"background-color:#e6e6e6; width:20%\">Total TTC</td>\n			<td style=\"background-color:#e6e6e6; text-align:right; width:20%\">{objvar_object_total_ttc}</td>\n		</tr>\n		<tr>\n			<td style=\"width:20%\">Pay&eacute;</td>\n			<td style=\"text-align:right; width:20%\">{deja_paye}</td>\n		</tr>\n		<tr>\n			<td style=\"width:20%\">Avoirs</td>\n			<td style=\"text-align:right; width:20%\">{somme_avoirs}</td>\n		</tr>\n		<tr>\n			<td style=\"background-color:#e6e6e6; width:20%\">Reste &agrave; payer</td>\n			<td style=\"background-color:#e6e6e6; text-align:right; width:20%\">{reste_a_payer}</td>\n		</tr>\n	</tbody>\n</table>\n&nbsp;<br />\n&nbsp;<br />\n<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:500px\">\n	<tbody>\n		<tr>\n			<td style=\"width:55%\">&nbsp;</td>\n			<td style=\"width:45%\">&nbsp;\n			<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:200px\">\n				<tbody>\n					<tr>\n						<td style=\"height:70px; width:220px\">{liste_paiements}</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n		</tr>\n	</tbody>\n</table>',NULL,0,1,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(7,1,3,'fr_FR',1,'Contenu','<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:550px\">\n	<tbody>\n		<tr>\n			<td style=\"width:50%\">Emetteur :<br />\n			&nbsp;\n			<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:242px\">\n				<tbody>\n					<tr>\n						<td style=\"background-color:#e6e6e6; height:121px\"><br />\n						<strong>{mycompany_name}</strong><br />\n						{object_contactsale}<br />\n						{mycompany_address}<br />\n						{mycompany_zip}&nbsp;{mycompany_town}<br />\n						<br />\n						T&eacute;l. : {mycompany_phone} - Fax :&nbsp;{mycompany_fax}<br />\n						Email : {mycompany_email}<br />\n						Web :&nbsp;{mycompany_web}</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n			<td style=\"width:50%\">Adress&eacute; &agrave; :<br />\n			&nbsp;\n			<table border=\"1\" style=\"width:245px\">\n				<tbody>\n					<tr>\n						<td style=\"height:121px\"><br />\n						<strong>{cust_company_name}</strong><br />\n						{cust_contactclient}<br />\n						{cust_contactclientfact}<br />\n						{cust_company_address}<br />\n						{cust_company_zip}&nbsp;{cust_company_town}</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n		</tr>\n	</tbody>\n</table>\n&nbsp;<br />\n&nbsp;<br />',NULL,0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(8,1,3,'fr_FR',2,'Lines','<div style=\"text-align:right\">Montants exprim&eacute;s en Euros</div>\n\n<table border=\"1\" style=\"cellpadding:1; cellspacing:1; width:530px\">\n	<tbody>\n		<tr>\n			<td style=\"width:50%\">D&eacute;signation</td>\n			<td style=\"width:10%\">TVA</td>\n			<td style=\"width:10%\">P.U. HT</td>\n			<td style=\"width:10%\">Qt&eacute;</td>\n			<td style=\"width:10%\">R&eacute;duc.</td>\n			<td style=\"width:10%\">Total HT[!-- BEGIN lines --]</td>\n		</tr>\n		<tr>\n			<td>{line_fulldesc}</td>\n			<td style=\"text-align:right\">{line_vatrate}</td>\n			<td style=\"text-align:right\">{line_up_locale}</td>\n			<td style=\"text-align:right\">{line_qty}</td>\n			<td style=\"text-align:right\">{line_discount_percent}</td>\n			<td style=\"text-align:right\">{line_price_ht_locale}[!-- END lines --]</td>\n		</tr>\n	</tbody>\n</table>\n&nbsp;<br />\n&nbsp;<br />',NULL,0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(9,1,3,'fr_FR',3,'Footer','&nbsp;\n\n&nbsp;\n<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:500px\">\n	<tbody>\n		<tr>\n			<td rowspan=\"3\" style=\"width:60%\"><strong>Conditions de r&egrave;glement</strong> : {objvar_object_cond_reglement_doc}<br />\n			<strong>Mode de r&egrave;glement</strong> : {objvar_object_mode_reglement}</td>\n			<td style=\"width:20%\">Total HT</td>\n			<td style=\"text-align:right; width:20%\">{objvar_object_total_ht}</td>\n		</tr>\n		<tr>\n			<td style=\"background-color:#f5f5f5; width:20%\">{tva_detail_titres}</td>\n			<td style=\"background-color:#f5f5f5; text-align:right; width:20%\">{tva_detail_montants}</td>\n		</tr>\n		<tr>\n			<td style=\"background-color:#e6e6e6; width:20%\">Total TTC</td>\n			<td style=\"background-color:#e6e6e6; text-align:right; width:20%\">{objvar_object_total_ttc}</td>\n		</tr>\n	</tbody>\n</table>',NULL,0,1,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(10,1,4,'fr_FR',1,'Contenu','<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:550px\">\n	<tbody>\n		<tr>\n			<td style=\"width:50%\">Emetteur :<br />\n			&nbsp;\n			<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:242px\">\n				<tbody>\n					<tr>\n						<td style=\"background-color:#e6e6e6; height:121px\"><br />\n						<strong>{mycompany_name}</strong><br />\n						{object_contactsale}<br />\n						{mycompany_address}<br />\n						{mycompany_zip}&nbsp;{mycompany_town}<br />\n						<br />\n						T&eacute;l. : {mycompany_phone} - Fax :&nbsp;{mycompany_fax}<br />\n						Email : {mycompany_email}<br />\n						Web :&nbsp;{mycompany_web}</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n			<td style=\"width:50%\">Adress&eacute; &agrave; :<br />\n			&nbsp;\n			<table border=\"1\" style=\"width:245px\">\n				<tbody>\n					<tr>\n						<td style=\"height:121px\"><br />\n						<strong>{cust_company_name}</strong><br />\n						{cust_contactclient}<br />\n						{cust_contactclientfact}<br />\n						{cust_company_address}<br />\n						{cust_company_zip}&nbsp;{cust_company_town}</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n		</tr>\n	</tbody>\n</table>\n&nbsp;<br />\n&nbsp;<br />',NULL,0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(11,1,4,'fr_FR',2,'Lines','<table border=\"1\" style=\"width:530px\">\n	<tbody>\n		<tr>\n			<td>[!-- BEGIN lines --]{line_product_ref} -&nbsp;{line_product_label}<br />\n			Quantit&eacute; :&nbsp;<strong>{line_qty}</strong> - Prix unitaire :&nbsp;<strong>{line_price_ht_locale}</strong><br />\n			Date d&eacute;but pr&eacute;vue : <strong>{date_ouverture_prevue}</strong> - Date pr&eacute;vue fin de service : <strong>{date_fin_validite}</strong><br />\n			Date d&eacute;but : <strong>{date_ouverture}</strong><br />\n			{line_desc}<br />\n			<br />\n			[!-- END lines --]</td>\n		</tr>\n	</tbody>\n</table>\n&nbsp;<br />\n&nbsp;<br />\n<br />\n<br />\n<br />',NULL,0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(12,1,4,'fr_FR',3,'Footer','<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:530px\">\n	<tbody>\n		<tr>\n			<td style=\"width:55%\"><br />\n			Pour&nbsp;{mycompany_name}, nom et signature :<br />\n			&nbsp;\n			<table border=\"1\" cellpadding=\"1\" cellspacing=\"1\" style=\"width:242px\">\n				<tbody>\n					<tr>\n						<td style=\"height:70px; width:220px\">&nbsp;</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n			<td style=\"width:45%\"><br />\n			Pour&nbsp;{cust_company_name}, nom et signature :<br />\n			&nbsp;\n			<table border=\"1\" cellpadding=\"1\" cellspacing=\"1\" style=\"width:242px\">\n				<tbody>\n					<tr>\n						<td style=\"height:70px; width:220px\">&nbsp;</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n		</tr>\n	</tbody>\n</table>',NULL,0,1,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(13,1,5,'fr_FR',1,'Contenu','<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:550px\">\n	<tbody>\n		<tr>\n			<td style=\"width:50%\">Emetteur :<br />\n			&nbsp;\n			<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:242px\">\n				<tbody>\n					<tr>\n						<td style=\"background-color:#e6e6e6; height:121px\"><br />\n						<strong>{mycompany_name}</strong><br />\n						{object_contactsale}<br />\n						{mycompany_address}<br />\n						{mycompany_zip}&nbsp;{mycompany_town}<br />\n						<br />\n						T&eacute;l. : {mycompany_phone} - Fax :&nbsp;{mycompany_fax}<br />\n						Email : {mycompany_email}<br />\n						Web :&nbsp;{mycompany_web}</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n			<td style=\"width:50%\">Adress&eacute; &agrave; :<br />\n			&nbsp;\n			<table border=\"1\" style=\"width:245px\">\n				<tbody>\n					<tr>\n						<td style=\"height:121px\"><br />\n						<strong>{cust_company_name}</strong><br />\n						{cust_contactclient}<br />\n						{cust_contactclientfact}<br />\n						{cust_company_address}<br />\n						{cust_company_zip}&nbsp;{cust_company_town}</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n		</tr>\n	</tbody>\n</table>\n&nbsp;<br />\n&nbsp;<br />',NULL,0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(14,1,5,'fr_FR',2,'Lines','<div style=\"text-align:right\">Montants exprim&eacute;s en Euros</div>\n\n<table border=\"1\" style=\"cellpadding:1; cellspacing:1; width:530px\">\n	<tbody>\n		<tr>\n			<td style=\"width:50%\">D&eacute;signation</td>\n			<td style=\"width:10%\">TVA</td>\n			<td style=\"width:10%\">P.U. HT</td>\n			<td style=\"width:10%\">Qt&eacute;</td>\n			<td style=\"width:10%\">Total HT[!-- BEGIN lines --]</td>\n		</tr>\n		<tr>\n			<td>{line_fulldesc}</td>\n			<td style=\"text-align:right\"></td>\n			<td style=\"text-align:right\"></td>\n			<td style=\"text-align:right\">{line_qty}</td>\n			<td style=\"text-align:right\">[!-- END lines --]</td>\n		</tr>\n	</tbody>\n</table>\n&nbsp;<br />\n&nbsp;<br />',NULL,0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(15,1,5,'fr_FR',3,'Footer','<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:500px\">\n	<tbody>\n		<tr>\n			<td rowspan=\"3\" style=\"width:60%\"><strong>Date pr&egrave;vue de livraison</strong> : {object_date_livraison}<br />\n			<strong>Mode de r&egrave;glement</strong> : {objvar_object_mode_reglement}</td>\n		</tr>\n	</tbody>\n</table>',NULL,0,1,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(16,1,6,'fr_FR',1,'Contenu','<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:550px\">\n	<tbody>\n		<tr>\n			<td style=\"width:50%\">Emetteur :<br />\n			&nbsp;\n			<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:242px\">\n				<tbody>\n					<tr>\n						<td style=\"background-color:#e6e6e6; height:121px\"><br />\n						<strong>{mycompany_name}</strong><br />\n						{object_contactsale}<br />\n						{mycompany_address}<br />\n						{mycompany_zip}&nbsp;{mycompany_town}<br />\n						<br />\n						T&eacute;l. : {mycompany_phone} - Fax :&nbsp;{mycompany_fax}<br />\n						Email : {mycompany_email}<br />\n						Web :&nbsp;{mycompany_web}</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n			<td style=\"width:50%\">Adress&eacute; &agrave; :<br />\n			&nbsp;\n			<table border=\"1\" style=\"width:245px\">\n				<tbody>\n					<tr>\n						<td style=\"height:121px\"><br />\n						<strong>{cust_company_name}</strong><br />\n						{cust_contactclient}<br />\n						{cust_contactclientfact}<br />\n						{cust_company_address}<br />\n						{cust_company_zip}&nbsp;{cust_company_town}</td>\n					</tr>\n				</tbody>\n			</table>\n			</td>\n		</tr>\n	</tbody>\n</table>\n&nbsp;<br />\n&nbsp;<br />',NULL,0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(17,1,6,'fr_FR',2,'Lines','<div style=\"text-align:right\">Montants exprim&eacute;s en Euros</div>\n\n<table border=\"1\" style=\"cellpadding:1; cellspacing:1; width:530px\">\n	<tbody>\n		<tr>\n			<td style=\"width:50%\">D&eacute;signation</td>\n			<td style=\"width:10%\">TVA</td>\n			<td style=\"width:10%\">P.U. HT</td>\n			<td style=\"width:10%\">Qt&eacute;</td>\n			<td style=\"width:10%\">R&eacute;duc.</td>\n			<td style=\"width:10%\">Total HT[!-- BEGIN lines --]</td>\n		</tr>\n		<tr>\n			<td>{line_fulldesc}</td>\n			<td style=\"text-align:right\">{line_vatrate}</td>\n			<td style=\"text-align:right\">{line_up_locale}</td>\n			<td style=\"text-align:right\">{line_qty}</td>\n			<td style=\"text-align:right\">{line_discount_percent}</td>\n			<td style=\"text-align:right\">{line_price_ht_locale}[!-- END lines --]</td>\n		</tr>\n	</tbody>\n</table>\n&nbsp;<br />\n&nbsp;<br />',NULL,0,0,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56'),(18,1,6,'fr_FR',3,'Footer','&nbsp;\n<table cellpadding=\"1\" cellspacing=\"1\" style=\"width:500px\">\n	<tbody>\n		<tr>\n			<td rowspan=\"3\" style=\"width:60%\"><strong>Conditions de r&egrave;glement</strong> : {object_payment_term}<br />\n			<strong>Mode de r&egrave;glement</strong> : {object_payment_mode}</td>\n			<td style=\"width:20%\">Total HT</td>\n			<td style=\"text-align:right; width:20%\">{objvar_object_total_ht}</td>\n		</tr>\n		<tr>\n			<td style=\"background-color:#f5f5f5; width:20%\">{tva_detail_titres}</td>\n			<td style=\"background-color:#f5f5f5; text-align:right; width:20%\">{tva_detail_montants}</td>\n		</tr>\n		<tr>\n			<td style=\"background-color:#e6e6e6; width:20%\">Total TTC</td>\n			<td style=\"background-color:#e6e6e6; text-align:right; width:20%\">{objvar_object_total_ttc}</td>\n		</tr>\n	</tbody>\n</table>',NULL,0,1,0,NULL,12,'2019-10-18 09:59:56',12,'2019-10-18 07:59:56');
+/*!40000 ALTER TABLE `llx_referenceletters_chapters` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_referenceletters_elements`
+--
+
+DROP TABLE IF EXISTS `llx_referenceletters_elements`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_referenceletters_elements` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `ref_int` varchar(20) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `title` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `outputref` int(11) NOT NULL DEFAULT 1,
+  `fk_referenceletters` int(11) NOT NULL,
+  `element_type` varchar(50) CHARACTER SET utf8mb4 NOT NULL,
+  `fk_element` int(11) NOT NULL,
+  `content_letter` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `import_key` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `fk_user_author` int(11) NOT NULL,
+  `datec` datetime NOT NULL,
+  `fk_user_mod` int(11) NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `use_custom_header` int(11) NOT NULL DEFAULT 0,
+  `header` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `use_custom_footer` int(11) NOT NULL DEFAULT 0,
+  `footer` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `use_landscape_format` int(11) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_referenceletters_elements_fk_referenceletters` (`fk_referenceletters`),
+  CONSTRAINT `ibfk_referenceletters_elements_fk_referenceletters` FOREIGN KEY (`fk_referenceletters`) REFERENCES `llx_referenceletters` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_referenceletters_elements`
+--
+
+LOCK TABLES `llx_referenceletters_elements` WRITE;
+/*!40000 ALTER TABLE `llx_referenceletters_elements` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_referenceletters_elements` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_referenceletters_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_referenceletters_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_referenceletters_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idxreferenceletters_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_referenceletters_extrafields`
+--
+
+LOCK TABLES `llx_referenceletters_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_referenceletters_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_referenceletters_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_resource`
 --
@@ -11367,10 +13269,83 @@ CREATE TABLE `llx_rights_def` (
 
 LOCK TABLES `llx_rights_def` WRITE;
 /*!40000 ALTER TABLE `llx_rights_def` DISABLE KEYS */;
-INSERT INTO `llx_rights_def` VALUES (11,'Read invoices','facture',1,'lire',NULL,'a',0,0,0),(11,'Lire les factures','facture',2,'lire',NULL,'a',1,10,0),(12,'Create and update invoices','facture',1,'creer',NULL,'a',0,0,0),(12,'Creer/modifier les factures','facture',2,'creer',NULL,'a',0,10,0),(13,'Devalidate invoices','facture',1,'invoice_advance','unvalidate','a',0,0,0),(13,'Dévalider les factures','facture',2,'invoice_advance','unvalidate','a',0,10,0),(14,'Validate invoices','facture',1,'invoice_advance','validate','a',0,0,0),(14,'Valider les factures','facture',2,'valider',NULL,'a',0,10,0),(15,'Send invoices by email','facture',1,'invoice_advance','send','a',0,0,0),(15,'Envoyer les factures par mail','facture',2,'invoice_advance','send','a',0,10,0),(16,'Issue payments on invoices','facture',1,'paiement',NULL,'a',0,0,0),(16,'Emettre des paiements sur les factures','facture',2,'paiement',NULL,'a',0,10,0),(19,'Delete invoices','facture',1,'supprimer',NULL,'a',0,0,0),(19,'Supprimer les factures','facture',2,'supprimer',NULL,'a',0,10,0),(21,'Lire les propositions commerciales','propale',1,'lire',NULL,'r',1,22,0),(21,'Lire les propositions commerciales','propale',2,'lire',NULL,'r',1,22,0),(22,'Creer/modifier les propositions commerciales','propale',1,'creer',NULL,'w',0,22,0),(22,'Creer/modifier les propositions commerciales','propale',2,'creer',NULL,'w',0,22,0),(24,'Valider les propositions commerciales','propale',1,'propal_advance','validate','d',0,22,0),(24,'Valider les propositions commerciales','propale',2,'valider',NULL,'d',0,22,0),(25,'Envoyer les propositions commerciales aux clients','propale',1,'propal_advance','send','d',0,22,0),(25,'Envoyer les propositions commerciales aux clients','propale',2,'propal_advance','send','d',0,22,0),(26,'Cloturer les propositions commerciales','propale',1,'propal_advance','close','d',0,22,0),(26,'Cloturer les propositions commerciales','propale',2,'propal_advance','close','d',0,22,0),(27,'Supprimer les propositions commerciales','propale',1,'supprimer',NULL,'d',0,22,0),(27,'Supprimer les propositions commerciales','propale',2,'supprimer',NULL,'d',0,22,0),(28,'Exporter les propositions commerciales et attributs','propale',1,'export',NULL,'r',0,22,0),(28,'Exporter les propositions commerciales et attributs','propale',2,'export',NULL,'r',0,22,0),(31,'Lire les produits','produit',1,'lire',NULL,'r',1,25,0),(31,'Lire les produits','produit',2,'lire',NULL,'r',1,25,0),(32,'Creer/modifier les produits','produit',1,'creer',NULL,'w',0,25,0),(32,'Creer/modifier les produits','produit',2,'creer',NULL,'w',0,25,0),(34,'Supprimer les produits','produit',1,'supprimer',NULL,'d',0,25,0),(34,'Supprimer les produits','produit',2,'supprimer',NULL,'d',0,25,0),(38,'Exporter les produits','produit',1,'export',NULL,'r',0,25,0),(38,'Exporter les produits','produit',2,'export',NULL,'r',0,25,0),(39,'Ignore minimum price','produit',1,'ignore_price_min_advance',NULL,'r',0,25,0),(41,'Read projects and tasks (shared projects or projects I am contact for). Can also enter time consumed on assigned tasks (timesheet)','projet',1,'lire',NULL,'r',1,14,0),(42,'Create/modify projects and tasks (shared projects or projects I am contact for)','projet',1,'creer',NULL,'w',0,14,0),(44,'Delete project and tasks (shared projects or projects I am contact for)','projet',1,'supprimer',NULL,'d',0,14,0),(45,'Export projects','projet',1,'export',NULL,'d',0,14,0),(61,'Lire les fiches d\'intervention','ficheinter',1,'lire',NULL,'r',1,41,0),(62,'Creer/modifier les fiches d\'intervention','ficheinter',1,'creer',NULL,'w',0,41,0),(64,'Supprimer les fiches d\'intervention','ficheinter',1,'supprimer',NULL,'d',0,41,0),(67,'Exporter les fiches interventions','ficheinter',1,'export',NULL,'r',0,41,0),(68,'Envoyer les fiches d\'intervention par courriel','ficheinter',1,'ficheinter_advance','send','r',0,41,0),(69,'Valider les fiches d\'intervention ','ficheinter',1,'ficheinter_advance','validate','a',0,41,0),(70,'Dévalider les fiches d\'intervention','ficheinter',1,'ficheinter_advance','unvalidate','a',0,41,0),(71,'Read members\' card','adherent',1,'lire',NULL,'r',0,55,0),(72,'Create/modify members (need also user module permissions if member linked to a user)','adherent',1,'creer',NULL,'w',0,55,0),(74,'Remove members','adherent',1,'supprimer',NULL,'d',0,55,0),(75,'Setup types of membership','adherent',1,'configurer',NULL,'w',0,55,0),(76,'Export members','adherent',1,'export',NULL,'r',0,55,0),(78,'Read subscriptions','adherent',1,'cotisation','lire','r',0,55,0),(79,'Create/modify/remove subscriptions','adherent',1,'cotisation','creer','w',0,55,0),(81,'Read sales orders','commande',1,'lire',NULL,'r',0,0,0),(82,'Creeat/modify sales orders','commande',1,'creer',NULL,'w',0,0,0),(84,'Validate sales orders','commande',1,'order_advance','validate','d',0,0,0),(86,'Send sale orders by email','commande',1,'order_advance','send','d',0,0,0),(87,'Close sale orders','commande',1,'order_advance','close','d',0,0,0),(88,'Cancel sale orders','commande',1,'order_advance','annuler','d',0,0,0),(89,'Delete sales orders','commande',1,'supprimer',NULL,'d',0,0,0),(91,'Lire les charges','tax',1,'charges','lire','r',0,50,0),(91,'Lire les charges','tax',2,'charges','lire','r',1,50,0),(92,'Creer/modifier les charges','tax',1,'charges','creer','w',0,50,0),(92,'Creer/modifier les charges','tax',2,'charges','creer','w',0,50,0),(93,'Supprimer les charges','tax',1,'charges','supprimer','d',0,50,0),(93,'Supprimer les charges','tax',2,'charges','supprimer','d',0,50,0),(94,'Exporter les charges','tax',1,'charges','export','r',0,50,0),(94,'Exporter les charges','tax',2,'charges','export','r',0,50,0),(101,'Lire les expeditions','expedition',1,'lire',NULL,'r',0,0,0),(102,'Creer modifier les expeditions','expedition',1,'creer',NULL,'w',0,0,0),(104,'Valider les expeditions','expedition',1,'shipping_advance','validate','d',0,0,0),(105,'Envoyer les expeditions aux clients','expedition',1,'shipping_advance','send','d',0,0,0),(106,'Exporter les expeditions','expedition',1,'shipment','export','r',0,0,0),(109,'Supprimer les expeditions','expedition',1,'supprimer',NULL,'d',0,0,0),(111,'Lire les comptes bancaires','banque',1,'lire',NULL,'r',0,51,0),(111,'Lire les comptes bancaires','banque',2,'lire',NULL,'r',1,51,0),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',1,'modifier',NULL,'w',0,51,0),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',2,'modifier',NULL,'w',0,51,0),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',1,'configurer',NULL,'a',0,51,0),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',2,'configurer',NULL,'a',0,51,0),(114,'Rapprocher les ecritures bancaires','banque',1,'consolidate',NULL,'w',0,51,0),(114,'Rapprocher les ecritures bancaires','banque',2,'consolidate',NULL,'w',0,51,0),(115,'Exporter transactions et releves','banque',1,'export',NULL,'r',0,51,0),(115,'Exporter transactions et releves','banque',2,'export',NULL,'r',0,51,0),(116,'Virements entre comptes','banque',1,'transfer',NULL,'w',0,51,0),(116,'Virements entre comptes','banque',2,'transfer',NULL,'w',0,51,0),(117,'Gerer les envois de cheques','banque',1,'cheque',NULL,'w',0,51,0),(117,'Gerer les envois de cheques','banque',2,'cheque',NULL,'w',0,51,0),(121,'Read third parties','societe',1,'lire',NULL,'r',0,0,0),(121,'Lire les societes','societe',2,'lire',NULL,'r',1,9,0),(122,'Create and update third parties','societe',1,'creer',NULL,'w',0,0,0),(122,'Creer modifier les societes','societe',2,'creer',NULL,'w',0,9,0),(125,'Delete third parties','societe',1,'supprimer',NULL,'d',0,0,0),(125,'Supprimer les societes','societe',2,'supprimer',NULL,'d',0,9,0),(126,'Export third parties','societe',1,'export',NULL,'r',0,0,0),(126,'Exporter les societes','societe',2,'export',NULL,'r',0,9,0),(141,'Read all projects and tasks (also private projects I am not contact for)','projet',1,'all','lire','r',0,14,0),(142,'Create/modify all projects and tasks (also private projects I am not contact for)','projet',1,'all','creer','w',0,14,0),(144,'Delete all projects and tasks (also private projects I am not contact for)','projet',1,'all','supprimer','d',0,14,0),(151,'Read withdrawals','prelevement',1,'bons','lire','r',1,52,0),(152,'Create/modify a withdrawals','prelevement',1,'bons','creer','w',0,52,0),(153,'Send withdrawals to bank','prelevement',1,'bons','send','a',0,52,0),(154,'credit/refuse withdrawals','prelevement',1,'bons','credit','a',0,52,0),(161,'Lire les contrats','contrat',1,'lire',NULL,'r',1,35,0),(162,'Creer / modifier les contrats','contrat',1,'creer',NULL,'w',0,35,0),(163,'Activer un service d\'un contrat','contrat',1,'activer',NULL,'w',0,35,0),(164,'Desactiver un service d\'un contrat','contrat',1,'desactiver',NULL,'w',0,35,0),(165,'Supprimer un contrat','contrat',1,'supprimer',NULL,'d',0,35,0),(167,'Export contracts','contrat',1,'export',NULL,'r',0,35,0),(221,'Consulter les mailings','mailing',1,'lire',NULL,'r',1,11,0),(221,'Consulter les mailings','mailing',2,'lire',NULL,'r',1,11,0),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',1,'creer',NULL,'w',0,11,0),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',2,'creer',NULL,'w',0,11,0),(223,'Valider les mailings (permet leur envoi)','mailing',1,'valider',NULL,'w',0,11,0),(223,'Valider les mailings (permet leur envoi)','mailing',2,'valider',NULL,'w',0,11,0),(229,'Supprimer les mailings','mailing',1,'supprimer',NULL,'d',0,11,0),(229,'Supprimer les mailings','mailing',2,'supprimer',NULL,'d',0,11,0),(237,'View recipients and info','mailing',1,'mailing_advance','recipient','r',0,11,0),(237,'View recipients and info','mailing',2,'mailing_advance','recipient','r',0,11,0),(238,'Manually send mailings','mailing',1,'mailing_advance','send','w',0,11,0),(238,'Manually send mailings','mailing',2,'mailing_advance','send','w',0,11,0),(239,'Delete mailings after validation and/or sent','mailing',1,'mailing_advance','delete','d',0,11,0),(239,'Delete mailings after validation and/or sent','mailing',2,'mailing_advance','delete','d',0,11,0),(241,'Lire les categories','categorie',1,'lire',NULL,'r',1,20,0),(242,'Creer/modifier les categories','categorie',1,'creer',NULL,'w',0,20,0),(243,'Supprimer les categories','categorie',1,'supprimer',NULL,'d',0,20,0),(251,'Consulter les autres utilisateurs','user',1,'user','lire','r',0,0,0),(252,'Consulter les permissions des autres utilisateurs','user',1,'user_advance','readperms','r',0,0,0),(253,'Creer/modifier utilisateurs internes et externes','user',1,'user','creer','w',0,0,0),(254,'Creer/modifier utilisateurs externes seulement','user',1,'user_advance','write','w',0,0,0),(255,'Modifier le mot de passe des autres utilisateurs','user',1,'user','password','w',0,0,0),(256,'Supprimer ou desactiver les autres utilisateurs','user',1,'user','supprimer','d',0,0,0),(262,'Read all third parties by internal users (otherwise only if commercial contact). Not effective for external users (limited to themselves).','societe',1,'client','voir','r',0,0,0),(262,'Consulter tous les tiers par utilisateurs internes (sinon uniquement si contact commercial). Non effectif pour utilisateurs externes (tjs limités à eux-meme).','societe',2,'client','voir','r',1,9,0),(281,'Read contacts','societe',1,'contact','lire','r',0,0,0),(281,'Lire les contacts','societe',2,'contact','lire','r',1,9,0),(282,'Create and update contact','societe',1,'contact','creer','w',0,0,0),(282,'Creer modifier les contacts','societe',2,'contact','creer','w',0,9,0),(283,'Delete contacts','societe',1,'contact','supprimer','d',0,0,0),(283,'Supprimer les contacts','societe',2,'contact','supprimer','d',0,9,0),(286,'Export contacts','societe',1,'contact','export','d',0,0,0),(286,'Exporter les contacts','societe',2,'contact','export','d',0,9,0),(300,'Read barcodes','barcode',1,'lire_advance',NULL,'r',1,0,0),(301,'Create/modify barcodes','barcode',1,'creer_advance',NULL,'w',0,0,0),(331,'Lire les bookmarks','bookmark',1,'lire',NULL,'r',0,50,0),(332,'Creer/modifier les bookmarks','bookmark',1,'creer',NULL,'r',0,50,0),(333,'Supprimer les bookmarks','bookmark',1,'supprimer',NULL,'r',0,50,0),(341,'Consulter ses propres permissions','user',1,'self_advance','readperms','r',0,0,0),(342,'Creer/modifier ses propres infos utilisateur','user',1,'self','creer','w',0,0,0),(343,'Modifier son propre mot de passe','user',1,'self','password','w',0,0,0),(344,'Modifier ses propres permissions','user',1,'self_advance','writeperms','w',0,0,0),(351,'Consulter les groupes','user',1,'group_advance','read','r',0,0,0),(352,'Consulter les permissions des groupes','user',1,'group_advance','readperms','r',0,0,0),(353,'Creer/modifier les groupes et leurs permissions','user',1,'group_advance','write','w',0,0,0),(354,'Supprimer ou desactiver les groupes','user',1,'group_advance','delete','d',0,0,0),(358,'Exporter les utilisateurs','user',1,'user','export','r',0,0,0),(511,'Read payments of employee salaries','salaries',1,'read',NULL,'r',0,0,0),(512,'Create/modify payments of empoyee salaries','salaries',1,'write',NULL,'w',0,0,0),(514,'Delete payments of employee salary','salaries',1,'delete',NULL,'d',0,0,0),(517,'Export payments of employee salaries','salaries',1,'export',NULL,'r',0,0,0),(520,'Read loans','loan',1,'read',NULL,'r',0,50,0),(522,'Create/modify loans','loan',1,'write',NULL,'w',0,50,0),(524,'Delete loans','loan',1,'delete',NULL,'d',0,50,0),(525,'Access loan calculator','loan',1,'calc',NULL,'r',0,50,0),(527,'Export loans','loan',1,'export',NULL,'r',0,50,0),(531,'Read services','service',1,'lire',NULL,'r',0,0,0),(532,'Create/modify services','service',1,'creer',NULL,'w',0,0,0),(534,'Delete les services','service',1,'supprimer',NULL,'d',0,0,0),(538,'Export services','service',1,'export',NULL,'r',0,0,0),(650,'Read bom of Bom','bom',1,'read',NULL,'w',0,60,0),(651,'Create/Update bom of Bom','bom',1,'write',NULL,'w',0,60,0),(652,'Delete bom of Bom','bom',1,'delete',NULL,'w',0,60,0),(660,'Read objects of Mrp','mrp',1,'read',NULL,'w',0,62,0),(661,'Create/Update objects of Mrp','mrp',1,'write',NULL,'w',0,62,0),(662,'Delete objects of Mrp','mrp',1,'delete',NULL,'w',0,62,0),(701,'Lire les dons','don',1,'lire',NULL,'r',1,50,0),(701,'Lire les dons','don',2,'lire',NULL,'r',1,50,0),(702,'Creer/modifier les dons','don',1,'creer',NULL,'w',0,50,0),(702,'Creer/modifier les dons','don',2,'creer',NULL,'w',0,50,0),(703,'Supprimer les dons','don',1,'supprimer',NULL,'d',0,50,0),(703,'Supprimer les dons','don',2,'supprimer',NULL,'d',0,50,0),(771,'Read expense reports (yours and your subordinates)','expensereport',1,'lire',NULL,'r',0,0,0),(772,'Create/modify expense reports','expensereport',1,'creer',NULL,'w',0,0,0),(773,'Delete expense reports','expensereport',1,'supprimer',NULL,'d',0,0,0),(775,'Approve expense reports','expensereport',1,'approve',NULL,'w',0,0,0),(776,'Pay expense reports','expensereport',1,'to_paid',NULL,'w',0,0,0),(777,'Read expense reports of everybody','expensereport',1,'readall',NULL,'r',0,0,0),(778,'Create expense reports for everybody','expensereport',1,'writeall_advance',NULL,'w',0,0,0),(779,'Export expense reports','expensereport',1,'export',NULL,'r',0,0,0),(1001,'Lire les stocks','stock',1,'lire',NULL,'r',1,40,0),(1002,'Creer/Modifier les stocks','stock',1,'creer',NULL,'w',0,40,0),(1003,'Supprimer les stocks','stock',1,'supprimer',NULL,'d',0,40,0),(1004,'Lire mouvements de stocks','stock',1,'mouvement','lire','r',1,40,0),(1005,'Creer/modifier mouvements de stocks','stock',1,'mouvement','creer','w',0,40,0),(1101,'Read delivery receipts','expedition',1,'livraison','lire','r',0,0,0),(1102,'Create/modify delivery receipts','expedition',1,'livraison','creer','w',0,0,0),(1104,'Validate delivery receipts','expedition',1,'livraison_advance','validate','d',0,0,0),(1109,'Delete delivery receipts','expedition',1,'livraison','supprimer','d',0,0,0),(1121,'Read supplier proposals','supplier_proposal',1,'lire',NULL,'w',0,0,0),(1122,'Create/modify supplier proposals','supplier_proposal',1,'creer',NULL,'w',0,0,0),(1123,'Validate supplier proposals','supplier_proposal',1,'validate_advance',NULL,'w',0,0,0),(1124,'Envoyer les demandes fournisseurs','supplier_proposal',1,'send_advance',NULL,'w',0,0,0),(1125,'Delete supplier proposals','supplier_proposal',1,'supprimer',NULL,'w',0,0,0),(1126,'Close supplier price requests','supplier_proposal',1,'cloturer',NULL,'w',0,0,0),(1181,'Consulter les fournisseurs','fournisseur',1,'lire',NULL,'r',0,0,0),(1182,'Consulter les commandes fournisseur','fournisseur',1,'commande','lire','r',0,0,0),(1183,'Creer une commande fournisseur','fournisseur',1,'commande','creer','w',0,0,0),(1184,'Valider une commande fournisseur','fournisseur',1,'supplier_order_advance','validate','w',0,0,0),(1185,'Approuver une commande fournisseur','fournisseur',1,'commande','approuver','w',0,0,0),(1186,'Commander une commande fournisseur','fournisseur',1,'commande','commander','w',0,0,0),(1187,'Receptionner une commande fournisseur','fournisseur',1,'commande','receptionner','d',0,0,0),(1188,'Supprimer une commande fournisseur','fournisseur',1,'commande','supprimer','d',0,0,0),(1189,'Check/Uncheck a supplier order reception','fournisseur',1,'commande_advance','check','w',0,0,0),(1191,'Exporter les commande fournisseurs, attributs','fournisseur',1,'commande','export','r',0,0,0),(1201,'Lire les exports','export',1,'lire',NULL,'r',1,72,0),(1202,'Creer/modifier un export','export',1,'creer',NULL,'w',0,72,0),(1231,'Consulter les factures fournisseur','fournisseur',1,'facture','lire','r',0,0,0),(1232,'Creer une facture fournisseur','fournisseur',1,'facture','creer','w',0,0,0),(1233,'Valider une facture fournisseur','fournisseur',1,'supplier_invoice_advance','validate','w',0,0,0),(1234,'Supprimer une facture fournisseur','fournisseur',1,'facture','supprimer','d',0,0,0),(1235,'Envoyer les factures par mail','fournisseur',1,'supplier_invoice_advance','send','a',0,0,0),(1236,'Exporter les factures fournisseurs, attributs et reglements','fournisseur',1,'facture','export','r',0,0,0),(1251,'Run mass imports of external data (data load)','import',1,'run',NULL,'r',0,70,0),(1321,'Export customer invoices, attributes and payments','facture',1,'facture','export','r',0,0,0),(1321,'Exporter les factures clients, attributs et reglements','facture',2,'facture','export','r',0,10,0),(1322,'Re-open a fully paid invoice','facture',1,'invoice_advance','reopen','r',0,0,0),(1421,'Export sales orders and attributes','commande',1,'commande','export','r',0,0,0),(2401,'Read actions/tasks linked to his account','agenda',1,'myactions','read','r',0,0,0),(2401,'Read actions/tasks linked to his account','agenda',2,'myactions','read','r',1,15,0),(2402,'Create/modify actions/tasks linked to his account','agenda',1,'myactions','create','w',0,0,0),(2402,'Create/modify actions/tasks linked to his account','agenda',2,'myactions','create','w',0,15,0),(2403,'Delete actions/tasks linked to his account','agenda',1,'myactions','delete','w',0,0,0),(2403,'Delete actions/tasks linked to his account','agenda',2,'myactions','delete','w',0,15,0),(2411,'Read actions/tasks of others','agenda',1,'allactions','read','r',0,0,0),(2411,'Read actions/tasks of others','agenda',2,'allactions','read','r',0,15,0),(2412,'Create/modify actions/tasks of others','agenda',1,'allactions','create','w',0,0,0),(2412,'Create/modify actions/tasks of others','agenda',2,'allactions','create','w',0,15,0),(2413,'Delete actions/tasks of others','agenda',1,'allactions','delete','w',0,0,0),(2413,'Delete actions/tasks of others','agenda',2,'allactions','delete','w',0,15,0),(2414,'Export actions/tasks of others','agenda',1,'export',NULL,'w',0,0,0),(2501,'Consulter/Télécharger les documents','ecm',1,'read',NULL,'r',0,0,0),(2503,'Soumettre ou supprimer des documents','ecm',1,'upload',NULL,'w',0,0,0),(2515,'Administrer les rubriques de documents','ecm',1,'setup',NULL,'w',0,0,0),(10001,'Read website content','website',1,'read',NULL,'w',0,0,0),(10002,'Create/modify website content (html and javascript content)','website',1,'write',NULL,'w',0,0,0),(10003,'Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.','website',1,'writephp',NULL,'w',0,0,0),(10005,'Delete website content','website',1,'delete',NULL,'w',0,0,0),(20001,'Read your own leave requests','holiday',1,'read',NULL,'w',0,0,0),(20001,'Créer / Modifier / Lire ses demandes de congés payés','holiday',2,'write',NULL,'w',1,42,0),(20002,'Create/modify your own leave requests','holiday',1,'write',NULL,'w',0,0,0),(20002,'Lire / Modifier toutes les demandes de congés payés','holiday',2,'lire_tous',NULL,'w',0,42,0),(20003,'Delete leave requests','holiday',1,'delete',NULL,'w',0,0,0),(20003,'Supprimer des demandes de congés payés','holiday',2,'delete',NULL,'w',0,42,0),(20004,'Read leave requests for everybody','holiday',1,'read_all',NULL,'w',0,0,0),(20004,'Définir les congés payés des utilisateurs','holiday',2,'define_holiday',NULL,'w',0,42,0),(20005,'Create/modify leave requests for everybody','holiday',1,'write_all',NULL,'w',0,0,0),(20005,'Voir les logs de modification des congés payés','holiday',2,'view_log',NULL,'w',0,42,0),(20006,'Setup leave requests of users (setup and update balance)','holiday',1,'define_holiday',NULL,'w',0,0,0),(20006,'Accéder au rapport mensuel des congés payés','holiday',2,'month_report',NULL,'w',0,42,0),(20007,'Approve leave requests','holiday',1,'approve',NULL,'w',0,0,0),(23001,'Read cron jobs','cron',1,'read',NULL,'w',0,0,0),(23002,'Create cron Jobs','cron',1,'create',NULL,'w',0,0,0),(23003,'Delete cron Jobs','cron',1,'delete',NULL,'w',0,0,0),(23004,'Execute cron Jobs','cron',1,'execute',NULL,'w',0,0,0),(50151,'Use Point Of Sale','takepos',1,'run',NULL,'a',0,0,0),(50401,'Bind products and invoices with accounting accounts','accounting',1,'bind','write','r',0,61,0),(50411,'Read operations in General Ledger','accounting',1,'mouvements','lire','r',0,61,0),(50412,'Write/Edit operations in General Ledger','accounting',1,'mouvements','creer','w',0,61,0),(50414,'Delete operations in Ledger','accounting',1,'mouvements','supprimer','d',0,61,0),(50415,'Delete all operations by year and journal in Ledger','accounting',1,'mouvements','supprimer_tous','d',0,61,0),(50418,'Export operations of the Ledger','accounting',1,'mouvements','export','r',0,61,0),(50420,'Report and export reports (turnover, balance, journals, general ledger)','accounting',1,'comptarapport','lire','r',0,61,0),(50430,'Define and close a fiscal year','accounting',1,'fiscalyear','write','r',0,61,0),(50440,'Manage chart of accounts, setup of accountancy','accounting',1,'chartofaccount',NULL,'r',0,61,0),(55001,'Read surveys','opensurvey',1,'read',NULL,'r',0,0,0),(55002,'Create/modify surveys','opensurvey',1,'write',NULL,'w',0,0,0),(56001,'Read ticket','ticket',1,'read',NULL,'r',0,60,0),(56002,'Create les tickets','ticket',1,'write',NULL,'w',0,60,0),(56003,'Delete les tickets','ticket',1,'delete',NULL,'d',0,60,0),(56004,'Manage tickets','ticket',1,'manage',NULL,'w',0,60,0),(56005,'See all tickets, even if not assigned to (not effective for external users, always restricted to the thirdpardy they depends on)','ticket',1,'view','all','r',0,60,0),(59001,'Visualiser les marges','margins',1,'liretous',NULL,'r',0,55,0),(59002,'Définir les marges','margins',1,'creer',NULL,'w',0,55,0),(59003,'Read every user margin','margins',1,'read','all','r',0,55,0),(63001,'Read resources','resource',1,'read',NULL,'w',0,0,0),(63002,'Create/Modify resources','resource',1,'write',NULL,'w',0,0,0),(63003,'Delete resources','resource',1,'delete',NULL,'w',0,0,0),(63004,'Link resources to agenda events','resource',1,'link',NULL,'w',0,0,0),(64001,'DirectPrint','printing',1,'read',NULL,'r',0,52,0),(101250,'Read surveys','opensurvey',2,'survey','read','r',0,40,0),(101251,'Create/modify surveys','opensurvey',2,'survey','write','w',0,40,0);
+INSERT INTO `llx_rights_def` VALUES (11,'Read invoices','facture',1,'lire',NULL,'a',0,0,0),(11,'Lire les factures','facture',2,'lire',NULL,'a',1,10,0),(12,'Create and update invoices','facture',1,'creer',NULL,'a',0,0,0),(12,'Creer/modifier les factures','facture',2,'creer',NULL,'a',0,10,0),(13,'Devalidate invoices','facture',1,'invoice_advance','unvalidate','a',0,0,0),(13,'Dévalider les factures','facture',2,'invoice_advance','unvalidate','a',0,10,0),(14,'Validate invoices','facture',1,'invoice_advance','validate','a',0,0,0),(14,'Valider les factures','facture',2,'valider',NULL,'a',0,10,0),(15,'Send invoices by email','facture',1,'invoice_advance','send','a',0,0,0),(15,'Envoyer les factures par mail','facture',2,'invoice_advance','send','a',0,10,0),(16,'Issue payments on invoices','facture',1,'paiement',NULL,'a',0,0,0),(16,'Emettre des paiements sur les factures','facture',2,'paiement',NULL,'a',0,10,0),(19,'Delete invoices','facture',1,'supprimer',NULL,'a',0,0,0),(19,'Supprimer les factures','facture',2,'supprimer',NULL,'a',0,10,0),(21,'Lire les propositions commerciales','propale',1,'lire',NULL,'r',1,22,0),(21,'Lire les propositions commerciales','propale',2,'lire',NULL,'r',1,22,0),(22,'Creer/modifier les propositions commerciales','propale',1,'creer',NULL,'w',0,22,0),(22,'Creer/modifier les propositions commerciales','propale',2,'creer',NULL,'w',0,22,0),(24,'Valider les propositions commerciales','propale',1,'propal_advance','validate','d',0,22,0),(24,'Valider les propositions commerciales','propale',2,'valider',NULL,'d',0,22,0),(25,'Envoyer les propositions commerciales aux clients','propale',1,'propal_advance','send','d',0,22,0),(25,'Envoyer les propositions commerciales aux clients','propale',2,'propal_advance','send','d',0,22,0),(26,'Cloturer les propositions commerciales','propale',1,'propal_advance','close','d',0,22,0),(26,'Cloturer les propositions commerciales','propale',2,'propal_advance','close','d',0,22,0),(27,'Supprimer les propositions commerciales','propale',1,'supprimer',NULL,'d',0,22,0),(27,'Supprimer les propositions commerciales','propale',2,'supprimer',NULL,'d',0,22,0),(28,'Exporter les propositions commerciales et attributs','propale',1,'export',NULL,'r',0,22,0),(28,'Exporter les propositions commerciales et attributs','propale',2,'export',NULL,'r',0,22,0),(31,'Lire les produits','produit',1,'lire',NULL,'r',1,25,0),(31,'Lire les produits','produit',2,'lire',NULL,'r',1,25,0),(32,'Creer/modifier les produits','produit',1,'creer',NULL,'w',0,25,0),(32,'Creer/modifier les produits','produit',2,'creer',NULL,'w',0,25,0),(34,'Supprimer les produits','produit',1,'supprimer',NULL,'d',0,25,0),(34,'Supprimer les produits','produit',2,'supprimer',NULL,'d',0,25,0),(38,'Exporter les produits','produit',1,'export',NULL,'r',0,25,0),(38,'Exporter les produits','produit',2,'export',NULL,'r',0,25,0),(39,'Ignore minimum price','produit',1,'ignore_price_min_advance',NULL,'r',0,25,0),(41,'Read projects and tasks (shared projects or projects I am contact for). Can also enter time consumed on assigned tasks (timesheet)','projet',1,'lire',NULL,'r',1,14,0),(42,'Create/modify projects and tasks (shared projects or projects I am contact for)','projet',1,'creer',NULL,'w',0,14,0),(44,'Delete project and tasks (shared projects or projects I am contact for)','projet',1,'supprimer',NULL,'d',0,14,0),(45,'Export projects','projet',1,'export',NULL,'d',0,14,0),(61,'Lire les fiches d\'intervention','ficheinter',1,'lire',NULL,'r',1,41,0),(62,'Creer/modifier les fiches d\'intervention','ficheinter',1,'creer',NULL,'w',0,41,0),(64,'Supprimer les fiches d\'intervention','ficheinter',1,'supprimer',NULL,'d',0,41,0),(67,'Exporter les fiches interventions','ficheinter',1,'export',NULL,'r',0,41,0),(68,'Envoyer les fiches d\'intervention par courriel','ficheinter',1,'ficheinter_advance','send','r',0,41,0),(69,'Valider les fiches d\'intervention ','ficheinter',1,'ficheinter_advance','validate','a',0,41,0),(70,'Dévalider les fiches d\'intervention','ficheinter',1,'ficheinter_advance','unvalidate','a',0,41,0),(71,'Read members\' card','adherent',1,'lire',NULL,'r',0,55,0),(72,'Create/modify members (need also user module permissions if member linked to a user)','adherent',1,'creer',NULL,'w',0,55,0),(74,'Remove members','adherent',1,'supprimer',NULL,'d',0,55,0),(75,'Setup types of membership','adherent',1,'configurer',NULL,'w',0,55,0),(76,'Export members','adherent',1,'export',NULL,'r',0,55,0),(78,'Read subscriptions','adherent',1,'cotisation','lire','r',0,55,0),(79,'Create/modify/remove subscriptions','adherent',1,'cotisation','creer','w',0,55,0),(81,'Read sales orders','commande',1,'lire',NULL,'r',0,0,0),(82,'Creeat/modify sales orders','commande',1,'creer',NULL,'w',0,0,0),(84,'Validate sales orders','commande',1,'order_advance','validate','d',0,0,0),(86,'Send sale orders by email','commande',1,'order_advance','send','d',0,0,0),(87,'Close sale orders','commande',1,'order_advance','close','d',0,0,0),(88,'Cancel sale orders','commande',1,'order_advance','annuler','d',0,0,0),(89,'Delete sales orders','commande',1,'supprimer',NULL,'d',0,0,0),(91,'Lire les charges','tax',1,'charges','lire','r',0,50,0),(91,'Lire les charges','tax',2,'charges','lire','r',1,50,0),(92,'Creer/modifier les charges','tax',1,'charges','creer','w',0,50,0),(92,'Creer/modifier les charges','tax',2,'charges','creer','w',0,50,0),(93,'Supprimer les charges','tax',1,'charges','supprimer','d',0,50,0),(93,'Supprimer les charges','tax',2,'charges','supprimer','d',0,50,0),(94,'Exporter les charges','tax',1,'charges','export','r',0,50,0),(94,'Exporter les charges','tax',2,'charges','export','r',0,50,0),(101,'Lire les expeditions','expedition',1,'lire',NULL,'r',0,0,0),(102,'Creer modifier les expeditions','expedition',1,'creer',NULL,'w',0,0,0),(104,'Valider les expeditions','expedition',1,'shipping_advance','validate','d',0,0,0),(105,'Envoyer les expeditions aux clients','expedition',1,'shipping_advance','send','d',0,0,0),(106,'Exporter les expeditions','expedition',1,'shipment','export','r',0,0,0),(109,'Supprimer les expeditions','expedition',1,'supprimer',NULL,'d',0,0,0),(111,'Lire les comptes bancaires','banque',1,'lire',NULL,'r',0,51,0),(111,'Lire les comptes bancaires','banque',2,'lire',NULL,'r',1,51,0),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',1,'modifier',NULL,'w',0,51,0),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',2,'modifier',NULL,'w',0,51,0),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',1,'configurer',NULL,'a',0,51,0),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',2,'configurer',NULL,'a',0,51,0),(114,'Rapprocher les ecritures bancaires','banque',1,'consolidate',NULL,'w',0,51,0),(114,'Rapprocher les ecritures bancaires','banque',2,'consolidate',NULL,'w',0,51,0),(115,'Exporter transactions et releves','banque',1,'export',NULL,'r',0,51,0),(115,'Exporter transactions et releves','banque',2,'export',NULL,'r',0,51,0),(116,'Virements entre comptes','banque',1,'transfer',NULL,'w',0,51,0),(116,'Virements entre comptes','banque',2,'transfer',NULL,'w',0,51,0),(117,'Gerer les envois de cheques','banque',1,'cheque',NULL,'w',0,51,0),(117,'Gerer les envois de cheques','banque',2,'cheque',NULL,'w',0,51,0),(121,'Read third parties','societe',1,'lire',NULL,'r',0,0,0),(121,'Lire les societes','societe',2,'lire',NULL,'r',1,9,0),(122,'Create and update third parties','societe',1,'creer',NULL,'w',0,0,0),(122,'Creer modifier les societes','societe',2,'creer',NULL,'w',0,9,0),(125,'Delete third parties','societe',1,'supprimer',NULL,'d',0,0,0),(125,'Supprimer les societes','societe',2,'supprimer',NULL,'d',0,9,0),(126,'Export third parties','societe',1,'export',NULL,'r',0,0,0),(126,'Exporter les societes','societe',2,'export',NULL,'r',0,9,0),(141,'Read all projects and tasks (also private projects I am not contact for)','projet',1,'all','lire','r',0,14,0),(142,'Create/modify all projects and tasks (also private projects I am not contact for)','projet',1,'all','creer','w',0,14,0),(144,'Delete all projects and tasks (also private projects I am not contact for)','projet',1,'all','supprimer','d',0,14,0),(151,'Read withdrawals','prelevement',1,'bons','lire','r',1,52,0),(152,'Create/modify a withdrawals','prelevement',1,'bons','creer','w',0,52,0),(153,'Send withdrawals to bank','prelevement',1,'bons','send','a',0,52,0),(154,'credit/refuse withdrawals','prelevement',1,'bons','credit','a',0,52,0),(161,'Lire les contrats','contrat',1,'lire',NULL,'r',1,35,0),(162,'Creer / modifier les contrats','contrat',1,'creer',NULL,'w',0,35,0),(163,'Activer un service d\'un contrat','contrat',1,'activer',NULL,'w',0,35,0),(164,'Desactiver un service d\'un contrat','contrat',1,'desactiver',NULL,'w',0,35,0),(165,'Supprimer un contrat','contrat',1,'supprimer',NULL,'d',0,35,0),(167,'Export contracts','contrat',1,'export',NULL,'r',0,35,0),(221,'Consulter les mailings','mailing',1,'lire',NULL,'r',1,11,0),(221,'Consulter les mailings','mailing',2,'lire',NULL,'r',1,11,0),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',1,'creer',NULL,'w',0,11,0),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',2,'creer',NULL,'w',0,11,0),(223,'Valider les mailings (permet leur envoi)','mailing',1,'valider',NULL,'w',0,11,0),(223,'Valider les mailings (permet leur envoi)','mailing',2,'valider',NULL,'w',0,11,0),(229,'Supprimer les mailings','mailing',1,'supprimer',NULL,'d',0,11,0),(229,'Supprimer les mailings','mailing',2,'supprimer',NULL,'d',0,11,0),(237,'View recipients and info','mailing',1,'mailing_advance','recipient','r',0,11,0),(237,'View recipients and info','mailing',2,'mailing_advance','recipient','r',0,11,0),(238,'Manually send mailings','mailing',1,'mailing_advance','send','w',0,11,0),(238,'Manually send mailings','mailing',2,'mailing_advance','send','w',0,11,0),(239,'Delete mailings after validation and/or sent','mailing',1,'mailing_advance','delete','d',0,11,0),(239,'Delete mailings after validation and/or sent','mailing',2,'mailing_advance','delete','d',0,11,0),(241,'Lire les categories','categorie',1,'lire',NULL,'r',1,20,0),(242,'Creer/modifier les categories','categorie',1,'creer',NULL,'w',0,20,0),(243,'Supprimer les categories','categorie',1,'supprimer',NULL,'d',0,20,0),(251,'Consulter les autres utilisateurs','user',1,'user','lire','r',0,0,0),(252,'Consulter les permissions des autres utilisateurs','user',1,'user_advance','readperms','r',0,0,0),(253,'Creer/modifier utilisateurs internes et externes','user',1,'user','creer','w',0,0,0),(254,'Creer/modifier utilisateurs externes seulement','user',1,'user_advance','write','w',0,0,0),(255,'Modifier le mot de passe des autres utilisateurs','user',1,'user','password','w',0,0,0),(256,'Supprimer ou desactiver les autres utilisateurs','user',1,'user','supprimer','d',0,0,0),(262,'Read all third parties by internal users (otherwise only if commercial contact). Not effective for external users (limited to themselves).','societe',1,'client','voir','r',0,0,0),(262,'Consulter tous les tiers par utilisateurs internes (sinon uniquement si contact commercial). Non effectif pour utilisateurs externes (tjs limités à eux-meme).','societe',2,'client','voir','r',1,9,0),(281,'Read contacts','societe',1,'contact','lire','r',0,0,0),(281,'Lire les contacts','societe',2,'contact','lire','r',1,9,0),(282,'Create and update contact','societe',1,'contact','creer','w',0,0,0),(282,'Creer modifier les contacts','societe',2,'contact','creer','w',0,9,0),(283,'Delete contacts','societe',1,'contact','supprimer','d',0,0,0),(283,'Supprimer les contacts','societe',2,'contact','supprimer','d',0,9,0),(286,'Export contacts','societe',1,'contact','export','d',0,0,0),(286,'Exporter les contacts','societe',2,'contact','export','d',0,9,0),(300,'Read barcodes','barcode',1,'lire_advance',NULL,'r',1,0,0),(301,'Create/modify barcodes','barcode',1,'creer_advance',NULL,'w',0,0,0),(331,'Lire les bookmarks','bookmark',1,'lire',NULL,'r',0,50,0),(332,'Creer/modifier les bookmarks','bookmark',1,'creer',NULL,'r',0,50,0),(333,'Supprimer les bookmarks','bookmark',1,'supprimer',NULL,'r',0,50,0),(341,'Consulter ses propres permissions','user',1,'self_advance','readperms','r',0,0,0),(342,'Creer/modifier ses propres infos utilisateur','user',1,'self','creer','w',0,0,0),(343,'Modifier son propre mot de passe','user',1,'self','password','w',0,0,0),(344,'Modifier ses propres permissions','user',1,'self_advance','writeperms','w',0,0,0),(351,'Consulter les groupes','user',1,'group_advance','read','r',0,0,0),(352,'Consulter les permissions des groupes','user',1,'group_advance','readperms','r',0,0,0),(353,'Creer/modifier les groupes et leurs permissions','user',1,'group_advance','write','w',0,0,0),(354,'Supprimer ou desactiver les groupes','user',1,'group_advance','delete','d',0,0,0),(358,'Exporter les utilisateurs','user',1,'user','export','r',0,0,0),(511,'Read payments of employee salaries (yours and your subordinates)','salaries',1,'read',NULL,'r',0,0,0),(512,'Create/modify payments of empoyee salaries','salaries',1,'write',NULL,'w',0,0,0),(514,'Delete payments of employee salary','salaries',1,'delete',NULL,'d',0,0,0),(517,'Read payments of salariests of every employee','salaries',1,'readall',NULL,'r',0,0,0),(519,'Export payments of employee salaries','salaries',1,'export',NULL,'r',0,0,0),(520,'Read loans','loan',1,'read',NULL,'r',0,50,0),(522,'Create/modify loans','loan',1,'write',NULL,'w',0,50,0),(524,'Delete loans','loan',1,'delete',NULL,'d',0,50,0),(525,'Access loan calculator','loan',1,'calc',NULL,'r',0,50,0),(527,'Export loans','loan',1,'export',NULL,'r',0,50,0),(531,'Read services','service',1,'lire',NULL,'r',0,0,0),(532,'Create/modify services','service',1,'creer',NULL,'w',0,0,0),(534,'Delete les services','service',1,'supprimer',NULL,'d',0,0,0),(538,'Export services','service',1,'export',NULL,'r',0,0,0),(561,'Read bank transfer payment orders','paymentbybanktransfer',1,'read',NULL,'r',0,0,0),(562,'Create/modify a bank transfer payment order','paymentbybanktransfer',1,'create',NULL,'w',0,0,0),(563,'Send/Transmit bank transfer payment order','paymentbybanktransfer',1,'send',NULL,'a',0,0,0),(564,'Record Debits/Rejects of bank transfer payment order','paymentbybanktransfer',1,'debit',NULL,'a',0,0,0),(650,'Read bom of Bom','bom',1,'read',NULL,'w',0,60,0),(651,'Create/Update bom of Bom','bom',1,'write',NULL,'w',0,60,0),(652,'Delete bom of Bom','bom',1,'delete',NULL,'w',0,60,0),(660,'Read objects of Mrp','mrp',1,'read',NULL,'w',0,62,0),(661,'Create/Update objects of Mrp','mrp',1,'write',NULL,'w',0,62,0),(662,'Delete objects of Mrp','mrp',1,'delete',NULL,'w',0,62,0),(701,'Lire les dons','don',1,'lire',NULL,'r',1,50,0),(701,'Lire les dons','don',2,'lire',NULL,'r',1,50,0),(702,'Creer/modifier les dons','don',1,'creer',NULL,'w',0,50,0),(702,'Creer/modifier les dons','don',2,'creer',NULL,'w',0,50,0),(703,'Supprimer les dons','don',1,'supprimer',NULL,'d',0,50,0),(703,'Supprimer les dons','don',2,'supprimer',NULL,'d',0,50,0),(750,'Read job positions to fill and candidatures','recruitment',1,'recruitmentjobposition','read','w',0,0,0),(751,'Create/Update job positions to fill and candidatures','recruitment',1,'recruitmentjobposition','write','w',0,0,0),(752,'Delete Job positions to fill and candidatures','recruitment',1,'recruitmentjobposition','delete','w',0,0,0),(771,'Read expense reports (yours and your subordinates)','expensereport',1,'lire',NULL,'r',0,0,0),(772,'Create/modify expense reports','expensereport',1,'creer',NULL,'w',0,0,0),(773,'Delete expense reports','expensereport',1,'supprimer',NULL,'d',0,0,0),(775,'Approve expense reports','expensereport',1,'approve',NULL,'w',0,0,0),(776,'Pay expense reports','expensereport',1,'to_paid',NULL,'w',0,0,0),(777,'Read expense reports of everybody','expensereport',1,'readall',NULL,'r',0,0,0),(778,'Create expense reports for everybody','expensereport',1,'writeall_advance',NULL,'w',0,0,0),(779,'Export expense reports','expensereport',1,'export',NULL,'r',0,0,0),(1001,'Lire les stocks','stock',1,'lire',NULL,'r',1,40,0),(1002,'Creer/Modifier les stocks','stock',1,'creer',NULL,'w',0,40,0),(1003,'Supprimer les stocks','stock',1,'supprimer',NULL,'d',0,40,0),(1004,'Lire mouvements de stocks','stock',1,'mouvement','lire','r',1,40,0),(1005,'Creer/modifier mouvements de stocks','stock',1,'mouvement','creer','w',0,40,0),(1101,'Read delivery receipts','expedition',1,'delivery','lire','r',0,0,0),(1102,'Create/modify delivery receipts','expedition',1,'delivery','creer','w',0,0,0),(1104,'Validate delivery receipts','expedition',1,'delivery_advance','validate','d',0,0,0),(1109,'Delete delivery receipts','expedition',1,'delivery','supprimer','d',0,0,0),(1121,'Read supplier proposals','supplier_proposal',1,'lire',NULL,'w',0,0,0),(1122,'Create/modify supplier proposals','supplier_proposal',1,'creer',NULL,'w',0,0,0),(1123,'Validate supplier proposals','supplier_proposal',1,'validate_advance',NULL,'w',0,0,0),(1124,'Envoyer les demandes fournisseurs','supplier_proposal',1,'send_advance',NULL,'w',0,0,0),(1125,'Delete supplier proposals','supplier_proposal',1,'supprimer',NULL,'w',0,0,0),(1126,'Close supplier price requests','supplier_proposal',1,'cloturer',NULL,'w',0,0,0),(1181,'Consulter les fournisseurs','fournisseur',1,'lire',NULL,'r',0,0,0),(1182,'Consulter les commandes fournisseur','fournisseur',1,'commande','lire','r',0,0,0),(1183,'Creer une commande fournisseur','fournisseur',1,'commande','creer','w',0,0,0),(1184,'Valider une commande fournisseur','fournisseur',1,'supplier_order_advance','validate','w',0,0,0),(1185,'Approuver une commande fournisseur','fournisseur',1,'commande','approuver','w',0,0,0),(1186,'Commander une commande fournisseur','fournisseur',1,'commande','commander','w',0,0,0),(1187,'Receptionner une commande fournisseur','fournisseur',1,'commande','receptionner','d',0,0,0),(1188,'Supprimer une commande fournisseur','fournisseur',1,'commande','supprimer','d',0,0,0),(1189,'Check/Uncheck a supplier order reception','fournisseur',1,'commande_advance','check','w',0,0,0),(1191,'Exporter les commande fournisseurs, attributs','fournisseur',1,'commande','export','r',0,0,0),(1201,'Lire les exports','export',1,'lire',NULL,'r',1,72,0),(1202,'Creer/modifier un export','export',1,'creer',NULL,'w',0,72,0),(1231,'Consulter les factures fournisseur','fournisseur',1,'facture','lire','r',0,0,0),(1232,'Creer une facture fournisseur','fournisseur',1,'facture','creer','w',0,0,0),(1233,'Valider une facture fournisseur','fournisseur',1,'supplier_invoice_advance','validate','w',0,0,0),(1234,'Supprimer une facture fournisseur','fournisseur',1,'facture','supprimer','d',0,0,0),(1235,'Envoyer les factures par mail','fournisseur',1,'supplier_invoice_advance','send','a',0,0,0),(1236,'Exporter les factures fournisseurs, attributs et reglements','fournisseur',1,'facture','export','r',0,0,0),(1251,'Run mass imports of external data (data load)','import',1,'run',NULL,'r',0,70,0),(1321,'Export customer invoices, attributes and payments','facture',1,'facture','export','r',0,0,0),(1321,'Exporter les factures clients, attributs et reglements','facture',2,'facture','export','r',0,10,0),(1322,'Re-open a fully paid invoice','facture',1,'invoice_advance','reopen','r',0,0,0),(1421,'Export sales orders and attributes','commande',1,'commande','export','r',0,0,0),(2401,'Read actions/tasks linked to his account','agenda',1,'myactions','read','r',0,0,0),(2401,'Read actions/tasks linked to his account','agenda',2,'myactions','read','r',1,15,0),(2402,'Create/modify actions/tasks linked to his account','agenda',1,'myactions','create','w',0,0,0),(2402,'Create/modify actions/tasks linked to his account','agenda',2,'myactions','create','w',0,15,0),(2403,'Delete actions/tasks linked to his account','agenda',1,'myactions','delete','w',0,0,0),(2403,'Delete actions/tasks linked to his account','agenda',2,'myactions','delete','w',0,15,0),(2411,'Read actions/tasks of others','agenda',1,'allactions','read','r',0,0,0),(2411,'Read actions/tasks of others','agenda',2,'allactions','read','r',0,15,0),(2412,'Create/modify actions/tasks of others','agenda',1,'allactions','create','w',0,0,0),(2412,'Create/modify actions/tasks of others','agenda',2,'allactions','create','w',0,15,0),(2413,'Delete actions/tasks of others','agenda',1,'allactions','delete','w',0,0,0),(2413,'Delete actions/tasks of others','agenda',2,'allactions','delete','w',0,15,0),(2414,'Export actions/tasks of others','agenda',1,'export',NULL,'w',0,0,0),(2501,'Read or download documents','ecm',1,'read',NULL,'r',0,0,0),(2503,'Upload a document','ecm',1,'upload',NULL,'w',0,0,0),(2515,'Administer directories of documents','ecm',1,'setup',NULL,'w',0,0,0),(3200,'Read archived events and fingerprints','blockedlog',1,'read',NULL,'w',0,0,0),(10001,'Read website content','website',1,'read',NULL,'w',0,0,0),(10002,'Create/modify website content (html and javascript content)','website',1,'write',NULL,'w',0,0,0),(10003,'Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.','website',1,'writephp',NULL,'w',0,0,0),(10005,'Delete website content','website',1,'delete',NULL,'w',0,0,0),(20001,'Read leave requests (yours and your subordinates)','holiday',1,'read',NULL,'w',0,0,0),(20001,'Créer / Modifier / Lire ses demandes de congés payés','holiday',2,'write',NULL,'w',1,42,0),(20002,'Create/modify leave requests','holiday',1,'write',NULL,'w',0,0,0),(20003,'Delete leave requests','holiday',1,'delete',NULL,'w',0,0,0),(20003,'Supprimer des demandes de congés payés','holiday',2,'delete',NULL,'w',0,42,0),(20004,'Read leave requests for everybody','holiday',1,'readall',NULL,'w',0,0,0),(20004,'Définir les congés payés des utilisateurs','holiday',2,'define_holiday',NULL,'w',0,42,0),(20005,'Create/modify leave requests for everybody','holiday',1,'writeall_advance',NULL,'w',0,0,0),(20005,'Voir les logs de modification des congés payés','holiday',2,'view_log',NULL,'w',0,42,0),(20006,'Setup leave requests of users (setup and update balance)','holiday',1,'define_holiday',NULL,'w',0,0,0),(20006,'Accéder au rapport mensuel des congés payés','holiday',2,'month_report',NULL,'w',0,42,0),(20007,'Approve leave requests','holiday',1,'approve',NULL,'w',0,0,0),(23001,'Read cron jobs','cron',1,'read',NULL,'w',0,0,0),(23002,'Create cron Jobs','cron',1,'create',NULL,'w',0,0,0),(23003,'Delete cron Jobs','cron',1,'delete',NULL,'w',0,0,0),(23004,'Execute cron Jobs','cron',1,'execute',NULL,'w',0,0,0),(50151,'Use Point Of Sale','takepos',1,'run',NULL,'a',0,0,0),(50401,'Bind products and invoices with accounting accounts','accounting',1,'bind','write','r',0,61,0),(50411,'Read operations in General Ledger','accounting',1,'mouvements','lire','r',0,61,0),(50412,'Write/Edit operations in General Ledger','accounting',1,'mouvements','creer','w',0,61,0),(50414,'Delete operations in Ledger','accounting',1,'mouvements','supprimer','d',0,61,0),(50415,'Delete all operations by year and journal in Ledger','accounting',1,'mouvements','supprimer_tous','d',0,61,0),(50418,'Export operations of the Ledger','accounting',1,'mouvements','export','r',0,61,0),(50420,'Report and export reports (turnover, balance, journals, general ledger)','accounting',1,'comptarapport','lire','r',0,61,0),(50430,'Define and close a fiscal year','accounting',1,'fiscalyear','write','r',0,61,0),(50440,'Manage chart of accounts, setup of accountancy','accounting',1,'chartofaccount',NULL,'r',0,61,0),(55001,'Read surveys','opensurvey',1,'read',NULL,'r',0,0,0),(55002,'Create/modify surveys','opensurvey',1,'write',NULL,'w',0,0,0),(56001,'Read ticket','ticket',1,'read',NULL,'r',0,60,0),(56002,'Create les tickets','ticket',1,'write',NULL,'w',0,60,0),(56003,'Delete les tickets','ticket',1,'delete',NULL,'d',0,60,0),(56004,'Manage tickets','ticket',1,'manage',NULL,'w',0,60,0),(56005,'See all tickets, even if not assigned to (not effective for external users, always restricted to the thirdpardy they depends on)','ticket',1,'view','all','r',0,60,0),(59001,'Visualiser les marges','margins',1,'liretous',NULL,'r',0,55,0),(59002,'Définir les marges','margins',1,'creer',NULL,'w',0,55,0),(59003,'Read every user margin','margins',1,'read','all','r',0,55,0),(63001,'Read resources','resource',1,'read',NULL,'w',0,0,0),(63002,'Create/Modify resources','resource',1,'write',NULL,'w',0,0,0),(63003,'Delete resources','resource',1,'delete',NULL,'w',0,0,0),(63004,'Link resources to agenda events','resource',1,'link',NULL,'w',0,0,0),(64001,'DirectPrint','printing',1,'read',NULL,'r',0,52,0),(101250,'Read surveys','opensurvey',2,'survey','read','r',0,40,0),(101251,'Create/modify surveys','opensurvey',2,'survey','write','w',0,40,0),(941601,'Lire les receptions','reception',1,'lire',NULL,'r',0,0,0),(941602,'Creer modifier les receptions','reception',1,'creer',NULL,'w',0,0,0),(941603,'Valider les receptions','reception',1,'reception_advance','validate','d',0,0,0),(941604,'Envoyer les receptions aux clients','reception',1,'reception_advance','send','d',0,0,0),(941605,'Exporter les receptions','reception',1,'reception','export','r',0,0,0),(941606,'Supprimer les receptions','reception',1,'supprimer',NULL,'d',0,0,0);
 /*!40000 ALTER TABLE `llx_rights_def` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_routing`
+--
+
+DROP TABLE IF EXISTS `llx_routing`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_routing` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `trigger_code` varchar(50) CHARACTER SET latin1 DEFAULT NULL,
+  `trigger_code_reverse` varchar(50) CHARACTER SET latin1 DEFAULT NULL,
+  `fk_warehouse_from` int(11) NOT NULL DEFAULT 0,
+  `fk_warehouse_to` int(11) NOT NULL DEFAULT 0,
+  `check_old` int(11) NOT NULL DEFAULT 0,
+  `message_condition` longtext CHARACTER SET latin1 DEFAULT NULL,
+  `message_code` longtext CHARACTER SET latin1 DEFAULT NULL,
+  `qty_field` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `fk_product_field` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `lines_field` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  `product_type_field` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `trigger_code` (`trigger_code`),
+  KEY `trigger_code_reverse` (`trigger_code_reverse`),
+  KEY `fk_warehouse_from` (`fk_warehouse_from`),
+  KEY `fk_warehouse_to` (`fk_warehouse_to`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_routing`
+--
+
+LOCK TABLES `llx_routing` WRITE;
+/*!40000 ALTER TABLE `llx_routing` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_routing` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_routing_stock`
+--
+
+DROP TABLE IF EXISTS `llx_routing_stock`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_routing_stock` (
+  `rowid` int(11) NOT NULL DEFAULT 0,
+  `date_cre` datetime DEFAULT NULL,
+  `date_maj` datetime DEFAULT NULL,
+  `fk_warehouse_from` int(11) NOT NULL DEFAULT 0,
+  `fk_warehouse_to` int(11) NOT NULL DEFAULT 0,
+  `fk_soc` int(11) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`rowid`),
+  KEY `date_cre` (`date_cre`),
+  KEY `date_maj` (`date_maj`),
+  KEY `fk_warehouse_from` (`fk_warehouse_from`),
+  KEY `fk_warehouse_to` (`fk_warehouse_to`),
+  KEY `fk_soc` (`fk_soc`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_routing_stock`
+--
+
+LOCK TABLES `llx_routing_stock` WRITE;
+/*!40000 ALTER TABLE `llx_routing_stock` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_routing_stock` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_sellyoursaas_cancellation_extrafields`
 --
@@ -11396,6 +13371,33 @@ LOCK TABLES `llx_sellyoursaas_cancellation_extrafields` WRITE;
 /*!40000 ALTER TABLE `llx_sellyoursaas_cancellation_extrafields` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_session`
+--
+
+DROP TABLE IF EXISTS `llx_session`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_session` (
+  `session_id` varchar(50) NOT NULL,
+  `session_variable` text DEFAULT NULL,
+  `last_accessed` datetime NOT NULL,
+  `fk_user` int(11) NOT NULL,
+  `remote_ip` varchar(64) DEFAULT NULL,
+  `user_agent` varchar(128) DEFAULT NULL,
+  PRIMARY KEY (`session_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_session`
+--
+
+LOCK TABLES `llx_session` WRITE;
+/*!40000 ALTER TABLE `llx_session` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_session` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_societe`
 --
@@ -11463,11 +13465,13 @@ CREATE TABLE `llx_societe` (
   `remise_supplier` double DEFAULT 0,
   `mode_reglement` tinyint(4) DEFAULT NULL,
   `cond_reglement` tinyint(4) DEFAULT NULL,
+  `transport_mode` tinyint(4) DEFAULT NULL,
   `mode_reglement_supplier` int(11) DEFAULT NULL,
   `outstanding_limit` double(24,8) DEFAULT NULL,
   `order_min_amount` double(24,8) DEFAULT NULL,
   `supplier_order_min_amount` double(24,8) DEFAULT NULL,
   `cond_reglement_supplier` int(11) DEFAULT NULL,
+  `transport_mode_supplier` tinyint(4) DEFAULT NULL,
   `fk_shipping_method` int(11) DEFAULT NULL,
   `tva_assuj` tinyint(4) DEFAULT 1,
   `localtax1_assuj` tinyint(4) DEFAULT 0,
@@ -11512,7 +13516,7 @@ CREATE TABLE `llx_societe` (
 
 LOCK TABLES `llx_societe` WRITE;
 /*!40000 ALTER TABLE `llx_societe` DISABLE KEYS */;
-INSERT INTO `llx_societe` VALUES (1,0,NULL,'2018-01-16 15:21:09','2012-07-08 14:21:44','Indian SAS',1,NULL,NULL,'CU1212-0007','SU1212-0005','7050','6050','1 alalah road',NULL,'Delhi',0,117,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,'0','','','','','',5000.00000000,1,NULL,NULL,NULL,1,1,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,'en_IN',NULL,NULL,1,'indiancompany.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(2,0,NULL,'2018-07-30 11:45:49','2012-07-08 14:23:48','Teclib',1,NULL,NULL,'CU1108-0001','SU1108-0001','411CU11080001','401SU11080001','',NULL,'Paris',0,1,NULL,NULL,'www.teclib.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,3,57,'0','123456789','','ACE14','','',400000.00000000,0,NULL,NULL,NULL,3,1,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,NULL,0.000,NULL,NULL,'fr_FR',NULL,NULL,1,'teclibcompany.png','','',0,NULL,NULL,'',0,NULL,NULL,0,'',NULL,0,NULL),(3,0,NULL,'2017-02-16 00:47:25','2012-07-08 22:42:12','Spanish Comp',1,NULL,NULL,'SPANISHCOMP','SU1601-0009',NULL,NULL,'1 via mallere',NULL,'Madrid',123,4,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,4,408,'0','','','','','',10000.00000000,0,NULL,NULL,NULL,1,1,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,'es_AR',NULL,NULL,1,'spanishcompany.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(4,0,NULL,'2018-01-22 17:24:53','2012-07-08 22:48:18','Prospector Vaalen',1,NULL,NULL,'CU1303-0014',NULL,NULL,NULL,'',NULL,'Bruxelles',103,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,4,201,'0','12345678','','','','',0.00000000,0,NULL,NULL,NULL,3,0,NULL,'PL_LOW',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'valeencompany.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(5,0,NULL,'2017-02-21 11:01:17','2012-07-08 23:22:57','NoCountry GmBh',1,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,0,0,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'nocountrycomp.png','','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(6,0,NULL,'2018-01-16 15:35:56','2012-07-09 00:15:09','Swiss Touch',1,NULL,NULL,'CU1601-0018','SU1601-0010',NULL,NULL,'',NULL,'Genevia',0,6,NULL,NULL,NULL,'swisstouch@example.ch',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,2,601,'0','','','','','',56000.00000000,0,NULL,NULL,NULL,3,1,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'swisstouch.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(7,0,NULL,'2018-01-16 15:38:32','2012-07-09 01:24:26','Generic customer',1,NULL,NULL,'CU1302-0011',NULL,NULL,NULL,'',NULL,NULL,0,7,NULL,NULL,NULL,'ttt@ttt.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,8,NULL,'0','','','','','',0.00000000,0,'Generic customer to use for Point Of Sale module.<br />',NULL,NULL,1,0,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'genericcustomer.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(10,0,NULL,'2020-01-13 12:57:02','2012-07-10 15:13:08','NLTechno',1,NULL,NULL,'CU1212-0005','SU1601-0011','411CU12120005','401SU16010011','',NULL,NULL,0,102,NULL,NULL,NULL,'vsmith@email.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,4,54,'0','493861496','49386149600039','6209Z','22-01-2007','FR123456789',10000.00000000,0,NULL,'aa < aa<br />\r\nd<strong>dd</strong>d',NULL,1,1,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,'123456789012',NULL,'fr_FR',NULL,NULL,1,'logo_nltechno_94x100.png','','',0,NULL,NULL,'The OpenSource company',0,NULL,'generic_odt:/home/ldestailleur/git/dolibarr_11.0/documents/doctemplates/thirdparties/template_thirdparty.ods',0,'',NULL,0,NULL),(11,0,NULL,'2019-11-28 11:52:58','2012-07-10 18:35:57','Company Corp 1',1,NULL,NULL,'CU1510-0017',NULL,'7051',NULL,'21 Green Hill street','75500','Los Angeles',0,11,'444123456',NULL,'companycorp1.com','companycorp1@example.com','{\"skype\":\"corp1\"}',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,1,NULL,'0','AB1234567','','','','USABS123',10000.00000000,0,NULL,NULL,NULL,3,0,NULL,'PL_LOW',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,NULL,0.000,NULL,NULL,'en_US',NULL,NULL,1,'comapnycorp1company.png','','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(12,0,NULL,'2019-09-26 11:38:11','2012-07-11 16:18:08','Dupont Alain',1,NULL,NULL,'CU1601-0019',NULL,'411CU16010019',NULL,'',NULL,NULL,0,0,NULL,NULL,NULL,'pcurie@example.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,1,0,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'pierrecurie.jpg','','',0,NULL,NULL,'',0,NULL,NULL,0,'',NULL,0,NULL),(13,0,NULL,'2019-10-08 09:57:51','2012-07-11 17:13:20','Company Corp 2',1,NULL,NULL,'CU1910-00021','SU1510-0008','411CU191000021','401SU15100008','',NULL,NULL,0,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,3,1,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'companycorp2company.png','','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(17,0,NULL,'2019-11-28 15:02:49','2013-08-01 02:41:26','Book Keeping Company',1,NULL,NULL,'CU1108-0004','SU1108-0004',NULL,'401SU11080004','The French Company',NULL,'Paris',0,1,NULL,NULL,NULL,NULL,'[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,0,1,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'bookkeepercompany.png','','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(19,0,NULL,'2019-09-26 12:03:13','2015-01-12 12:23:05','Magic Food Store',1,NULL,NULL,'CU1301-0008',NULL,NULL,NULL,'65 holdywood boulevard','123456','BigTown',0,4,NULL,'0101',NULL,'myemail@domain.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','10/10/2010','','',0.00000000,0,NULL,NULL,NULL,1,0,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0.000,NULL,0.000,NULL,NULL,'en_US',NULL,NULL,1,'magicfoodstore.png','','',0,NULL,NULL,'',0,NULL,'sepamandate',NULL,NULL,NULL,0,NULL),(25,0,NULL,'2018-01-22 17:21:17','2015-03-10 15:47:37','Print Company',1,NULL,NULL,'CU1303-0016','SU1303-0007',NULL,NULL,'21 Gutenberg street','45600','Berlin',0,5,NULL,NULL,NULL,'printcompany@example.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,0,1,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,'de_DE',NULL,NULL,1,'printcompany.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(26,0,NULL,'2019-09-26 12:06:05','2017-02-12 23:17:04','Calculation Power',1,NULL,NULL,'CU1702-0020',NULL,'411CU17020020',NULL,'',NULL,'Calgary',0,14,NULL,NULL,NULL,'calculationpower@example.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,'','','','','',NULL,0,NULL,NULL,NULL,3,0,NULL,'',0,0,0,12,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0.000,0,0.000,NULL,NULL,'en_US',NULL,NULL,1,'bookkeepercompany.png','','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(29,0,NULL,'2020-01-13 12:56:22','2020-01-06 00:39:58','Patient',1,NULL,NULL,'CU2001-00022',NULL,'411CU200100022',NULL,'',NULL,NULL,0,117,'01','02',NULL,NULL,'null',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,'','','','','',NULL,0,'aa < ddd',NULL,NULL,3,0,NULL,'',0,0,0,12,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.000,NULL,0.000,NULL,NULL,NULL,'patient@cabinetmed',NULL,1,NULL,'','',0,NULL,NULL,'',0,NULL,NULL,0,'',NULL,0,NULL),(30,0,NULL,'2020-01-17 14:21:26','2020-01-13 17:19:24','Italo',1,NULL,NULL,'CU2001-00023',NULL,'411CU200100023',NULL,'12 Alagio','123','Milano',777,3,NULL,NULL,NULL,NULL,'[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,'','','','','',NULL,0,NULL,NULL,NULL,3,0,NULL,'',0,0,0,12,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,0,0.000,NULL,4,NULL,NULL,NULL,1,NULL,'','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL);
+INSERT INTO `llx_societe` VALUES (1,0,NULL,'2018-01-16 15:21:09','2012-07-08 14:21:44','Indian SAS',1,NULL,NULL,'CU1212-0007','SU1212-0005','7050','6050','1 alalah road',NULL,'Delhi',0,117,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,'0','','','','','',5000.00000000,1,NULL,NULL,NULL,1,1,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,'en_IN',NULL,NULL,1,'indiancompany.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(2,0,NULL,'2018-07-30 11:45:49','2012-07-08 14:23:48','Teclib',1,NULL,NULL,'CU1108-0001','SU1108-0001','411CU11080001','401SU11080001','',NULL,'Paris',0,1,NULL,NULL,'www.teclib.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,3,57,'0','123456789','','ACE14','','',400000.00000000,0,NULL,NULL,NULL,3,1,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,NULL,0.000,NULL,NULL,'fr_FR',NULL,NULL,1,'teclibcompany.png','','',0,NULL,NULL,'',0,NULL,NULL,0,'',NULL,0,NULL),(3,0,NULL,'2017-02-16 00:47:25','2012-07-08 22:42:12','Spanish Comp',1,NULL,NULL,'SPANISHCOMP','SU1601-0009',NULL,NULL,'1 via mallere',NULL,'Madrid',123,4,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,4,408,'0','','','','','',10000.00000000,0,NULL,NULL,NULL,1,1,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,'es_AR',NULL,NULL,1,'spanishcompany.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(4,0,NULL,'2018-01-22 17:24:53','2012-07-08 22:48:18','Prospector Vaalen',1,NULL,NULL,'CU1303-0014',NULL,NULL,NULL,'',NULL,'Bruxelles',103,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,4,201,'0','12345678','','','','',0.00000000,0,NULL,NULL,NULL,3,0,NULL,'PL_LOW',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'valeencompany.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(5,0,NULL,'2017-02-21 11:01:17','2012-07-08 23:22:57','NoCountry GmBh',1,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,0,0,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'nocountrycomp.png','','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(6,0,NULL,'2018-01-16 15:35:56','2012-07-09 00:15:09','Swiss Touch',1,NULL,NULL,'CU1601-0018','SU1601-0010',NULL,NULL,'',NULL,'Genevia',0,6,NULL,NULL,NULL,'swisstouch@example.ch',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,2,601,'0','','','','','',56000.00000000,0,NULL,NULL,NULL,3,1,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'swisstouch.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(7,0,NULL,'2018-01-16 15:38:32','2012-07-09 01:24:26','Generic customer',1,NULL,NULL,'CU1302-0011',NULL,NULL,NULL,'',NULL,NULL,0,7,NULL,NULL,NULL,'ttt@ttt.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,8,NULL,'0','','','','','',0.00000000,0,'Generic customer to use for Point Of Sale module.<br />',NULL,NULL,1,0,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'genericcustomer.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(10,0,NULL,'2020-01-13 12:57:02','2012-07-10 15:13:08','NLTechno',1,NULL,NULL,'CU1212-0005','SU1601-0011','411CU12120005','401SU16010011','',NULL,NULL,0,102,NULL,NULL,NULL,'vsmith@email.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,4,54,'0','493861496','49386149600039','6209Z','22-01-2007','FR123456789',10000.00000000,0,NULL,'aa < aa<br />\r\nd<strong>dd</strong>d',NULL,1,1,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,'123456789012',NULL,'fr_FR',NULL,NULL,1,'logo_nltechno_94x100.png','','',0,NULL,NULL,'The OpenSource company',0,NULL,'generic_odt:/home/ldestailleur/git/dolibarr_11.0/documents/doctemplates/thirdparties/template_thirdparty.ods',0,'',NULL,0,NULL),(11,0,NULL,'2019-11-28 11:52:58','2012-07-10 18:35:57','Company Corp 1',1,NULL,NULL,'CU1510-0017',NULL,'7051',NULL,'21 Green Hill street','75500','Los Angeles',0,11,'444123456',NULL,'companycorp1.com','companycorp1@example.com','{\"skype\":\"corp1\"}',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,1,NULL,'0','AB1234567','','','','USABS123',10000.00000000,0,NULL,NULL,NULL,3,0,NULL,'PL_LOW',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,NULL,0.000,NULL,NULL,'en_US',NULL,NULL,1,'comapnycorp1company.png','','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(12,0,NULL,'2019-09-26 11:38:11','2012-07-11 16:18:08','Dupont Alain',1,NULL,NULL,'CU1601-0019',NULL,'411CU16010019',NULL,'',NULL,NULL,0,0,NULL,NULL,NULL,'pcurie@example.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,1,0,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'pierrecurie.jpg','','',0,NULL,NULL,'',0,NULL,NULL,0,'',NULL,0,NULL),(13,0,NULL,'2019-10-08 09:57:51','2012-07-11 17:13:20','Company Corp 2',1,NULL,NULL,'CU1910-00021','SU1510-0008','411CU191000021','401SU15100008','',NULL,NULL,0,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,3,1,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'companycorp2company.png','','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(17,0,NULL,'2019-11-28 15:02:49','2013-08-01 02:41:26','Book Keeping Company',1,NULL,NULL,'CU1108-0004','SU1108-0004',NULL,'401SU11080004','The French Company',NULL,'Paris',0,1,NULL,NULL,NULL,NULL,'[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,0,1,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'bookkeepercompany.png','','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(19,0,NULL,'2019-09-26 12:03:13','2015-01-12 12:23:05','Magic Food Store',1,NULL,NULL,'CU1301-0008',NULL,NULL,NULL,'65 holdywood boulevard','123456','BigTown',0,4,NULL,'0101',NULL,'myemail@domain.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','10/10/2010','','',0.00000000,0,NULL,NULL,NULL,1,0,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0.000,NULL,0.000,NULL,NULL,'en_US',NULL,NULL,1,'magicfoodstore.png','','',0,NULL,NULL,'',0,NULL,'sepamandate',NULL,NULL,NULL,0,NULL),(25,0,NULL,'2018-01-22 17:21:17','2015-03-10 15:47:37','Print Company',1,NULL,NULL,'CU1303-0016','SU1303-0007',NULL,NULL,'21 Gutenberg street','45600','Berlin',0,5,NULL,NULL,NULL,'printcompany@example.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,0,1,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,'de_DE',NULL,NULL,1,'printcompany.png','','',0,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(26,0,NULL,'2019-09-26 12:06:05','2017-02-12 23:17:04','Calculation Power',1,NULL,NULL,'CU1702-0020',NULL,'411CU17020020',NULL,'',NULL,'Calgary',0,14,NULL,NULL,NULL,'calculationpower@example.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,'','','','','',NULL,0,NULL,NULL,NULL,3,0,NULL,'',0,0,0,12,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0.000,0,0.000,NULL,NULL,'en_US',NULL,NULL,1,'bookkeepercompany.png','','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(29,0,NULL,'2020-01-13 12:56:22','2020-01-06 00:39:58','Patient',1,NULL,NULL,'CU2001-00022',NULL,'411CU200100022',NULL,'',NULL,NULL,0,117,'01','02',NULL,NULL,'null',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,'','','','','',NULL,0,'aa < ddd',NULL,NULL,3,0,NULL,'',0,0,0,12,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.000,NULL,0.000,NULL,NULL,NULL,'patient@cabinetmed',NULL,1,NULL,'','',0,NULL,NULL,'',0,NULL,NULL,0,'',NULL,0,NULL),(30,0,NULL,'2020-01-17 14:21:26','2020-01-13 17:19:24','Italo',1,NULL,NULL,'CU2001-00023',NULL,'411CU200100023',NULL,'12 Alagio','123','Milano',777,3,NULL,NULL,NULL,NULL,'[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,'','','','','',NULL,0,NULL,NULL,NULL,3,0,NULL,'',0,0,0,12,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,0,0.000,NULL,4,NULL,NULL,NULL,1,NULL,'','',0,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL);
 /*!40000 ALTER TABLE `llx_societe` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -11976,6 +13980,8 @@ CREATE TABLE `llx_socpeople` (
   `twitter` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `photo` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `priv` smallint(6) NOT NULL DEFAULT 0,
+  `fk_prospectcontactlevel` varchar(12) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_stcommcontact` int(11) NOT NULL DEFAULT 0,
   `no_email` smallint(6) NOT NULL DEFAULT 0,
   `fk_user_creat` int(11) DEFAULT 0,
   `fk_user_modif` int(11) DEFAULT NULL,
@@ -11999,7 +14005,7 @@ CREATE TABLE `llx_socpeople` (
 
 LOCK TABLES `llx_socpeople` WRITE;
 /*!40000 ALTER TABLE `llx_socpeople` DISABLE KEYS */;
-INSERT INTO `llx_socpeople` VALUES (1,'2012-07-08 14:26:14','2019-11-28 11:52:58',1,1,NULL,'MR','Indra','Mahala','','','',297,117,'2012-07-08','Project leader','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,12,'Met during a congress at Dubai','',NULL,NULL,NULL,1),(2,'2012-07-08 22:44:50','2019-11-28 11:52:58',NULL,1,NULL,'MR','Freeman','Public','','','',200,11,NULL,'','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,1,'A friend that is a free contact not linked to any company',NULL,NULL,NULL,NULL,1),(3,'2012-07-08 22:59:02','2019-11-28 11:52:58',NULL,1,NULL,'MR','Mywife','Nicy','','','',NULL,11,'1980-10-03','','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,1,12,'This is a private contact','',NULL,NULL,NULL,1),(4,'2012-07-09 00:16:58','2019-11-28 11:52:58',6,1,NULL,'MR','Rotchield','Evan','','','',NULL,6,NULL,'Bank director','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,1,'The bank director',NULL,NULL,NULL,NULL,1),(6,'2013-08-01 02:41:26','2019-11-28 11:52:58',17,1,NULL,'','Bookkeeper','Bob','','','',NULL,NULL,NULL,'book keeper','','','','','bbookkeeper@example.com','{\"skype\":\"skypebbookkeeper\"}',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',0,0,1,12,'','',NULL,NULL,NULL,1),(7,'2018-07-30 16:11:06','2019-11-28 11:52:58',NULL,1,'','MR','Dad','','','','',NULL,14,'1967-09-04','','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',1,0,12,12,'','',NULL,NULL,NULL,1),(8,'2018-07-30 16:13:03','2019-11-28 11:52:58',NULL,1,'','MLE','Mom','','','','',NULL,14,NULL,'','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',1,0,12,12,'','',NULL,NULL,NULL,1),(9,'2018-07-30 16:14:41','2019-11-28 11:52:58',NULL,1,'','MR','Francky','','','89455','Virigia',NULL,205,'1980-07-09','Baker','555-98989898','','','','francky@example.com','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',0,0,12,12,'','',NULL,NULL,NULL,1),(10,'2018-07-30 16:26:22','2019-11-28 11:52:58',10,1,'','','Destailleur','Laurent','','','',NULL,NULL,'1972-10-10','Dolibarr project leader','','','','','ldestailleur@example.com','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'ldestailleur_200x200.jpg',0,0,NULL,12,'','',NULL,NULL,NULL,1),(11,'2017-05-12 13:16:36','2019-11-28 11:52:58',11,1,'','MR','Smith','Laurent','45 Big road','897','Seattle',NULL,11,NULL,'Director','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'ldestailleur_200x200.png',0,0,12,12,'','',NULL,NULL,NULL,1),(12,'2017-05-12 13:19:31','2019-11-28 11:52:58',11,1,'','MR','Einstein','','','','',NULL,11,NULL,'Genius','333444555','','','','genius@example.com','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'Einstein.jpg',0,0,12,12,'','',NULL,NULL,NULL,1);
+INSERT INTO `llx_socpeople` VALUES (1,'2012-07-08 14:26:14','2019-11-28 11:52:58',1,1,NULL,'MR','Indra','Mahala','','','',297,117,'2012-07-08','Project leader','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,1,12,'Met during a congress at Dubai','',NULL,NULL,NULL,1),(2,'2012-07-08 22:44:50','2019-11-28 11:52:58',NULL,1,NULL,'MR','Freeman','Public','','','',200,11,NULL,'','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,1,1,'A friend that is a free contact not linked to any company',NULL,NULL,NULL,NULL,1),(3,'2012-07-08 22:59:02','2019-11-28 11:52:58',NULL,1,NULL,'MR','Mywife','Nicy','','','',NULL,11,'1980-10-03','','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0,0,1,12,'This is a private contact','',NULL,NULL,NULL,1),(4,'2012-07-09 00:16:58','2019-11-28 11:52:58',6,1,NULL,'MR','Rotchield','Evan','','','',NULL,6,NULL,'Bank director','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,1,1,'The bank director',NULL,NULL,NULL,NULL,1),(6,'2013-08-01 02:41:26','2019-11-28 11:52:58',17,1,NULL,'','Bookkeeper','Bob','','','',NULL,NULL,NULL,'book keeper','','','','','bbookkeeper@example.com','{\"skype\":\"skypebbookkeeper\"}',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',0,NULL,0,0,1,12,'','',NULL,NULL,NULL,1),(7,'2018-07-30 16:11:06','2019-11-28 11:52:58',NULL,1,'','MR','Dad','','','','',NULL,14,'1967-09-04','','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',1,NULL,0,0,12,12,'','',NULL,NULL,NULL,1),(8,'2018-07-30 16:13:03','2019-11-28 11:52:58',NULL,1,'','MLE','Mom','','','','',NULL,14,NULL,'','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',1,NULL,0,0,12,12,'','',NULL,NULL,NULL,1),(9,'2018-07-30 16:14:41','2019-11-28 11:52:58',NULL,1,'','MR','Francky','','','89455','Virigia',NULL,205,'1980-07-09','Baker','555-98989898','','','','francky@example.com','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',0,NULL,0,0,12,12,'','',NULL,NULL,NULL,1),(10,'2018-07-30 16:26:22','2019-11-28 11:52:58',10,1,'','','Destailleur','Laurent','','','',NULL,NULL,'1972-10-10','Dolibarr project leader','','','','','ldestailleur@example.com','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'ldestailleur_200x200.jpg',0,NULL,0,0,NULL,12,'','',NULL,NULL,NULL,1),(11,'2017-05-12 13:16:36','2019-11-28 11:52:58',11,1,'','MR','Smith','Laurent','45 Big road','897','Seattle',NULL,11,NULL,'Director','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'ldestailleur_200x200.png',0,NULL,0,0,12,12,'','',NULL,NULL,NULL,1),(12,'2017-05-12 13:19:31','2019-11-28 11:52:58',11,1,'','MR','Einstein','','','','',NULL,11,NULL,'Genius','333444555','','','','genius@example.com','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'Einstein.jpg',0,NULL,0,0,12,12,'','',NULL,NULL,NULL,1);
 /*!40000 ALTER TABLE `llx_socpeople` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -12226,7 +14232,7 @@ CREATE TABLE `llx_subscription` (
   `datec` datetime DEFAULT NULL,
   `fk_adherent` int(11) DEFAULT NULL,
   `dateadh` datetime DEFAULT NULL,
-  `datef` date DEFAULT NULL,
+  `datef` datetime DEFAULT NULL,
   `subscription` double(24,8) DEFAULT NULL,
   `fk_bank` int(11) DEFAULT NULL,
   `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -12244,7 +14250,7 @@ CREATE TABLE `llx_subscription` (
 
 LOCK TABLES `llx_subscription` WRITE;
 /*!40000 ALTER TABLE `llx_subscription` DISABLE KEYS */;
-INSERT INTO `llx_subscription` VALUES (2,'2020-01-21 00:02:14','2020-01-21 01:02:14',3,'2013-07-18 00:00:00','2014-07-17',50.00000000,51,'Subscription 2013',2,NULL,NULL),(3,'2020-01-21 09:22:37','2020-01-21 10:22:37',4,'2017-07-18 00:00:00','2018-07-17',50.00000000,52,'Subscription 2017',2,NULL,NULL),(4,'2020-01-21 09:23:17','2020-01-21 10:23:17',2,'2017-07-18 00:00:00','2018-07-17',50.00000000,53,'Subscription 2017',2,NULL,NULL),(5,'2020-01-21 09:23:28','2020-01-21 10:23:28',2,'2018-07-18 00:00:00','2019-07-17',50.00000000,54,'Subscription 2018',2,NULL,NULL),(6,'2020-01-21 09:23:49','2020-01-21 10:23:49',2,'2019-07-18 00:00:00','2020-07-17',50.00000000,55,'Subscription 2019',2,NULL,NULL);
+INSERT INTO `llx_subscription` VALUES (2,'2020-01-21 00:02:14','2020-01-21 01:02:14',3,'2013-07-18 00:00:00','2014-07-17 00:00:00',50.00000000,51,'Subscription 2013',2,NULL,NULL),(3,'2020-01-21 09:22:37','2020-01-21 10:22:37',4,'2017-07-18 00:00:00','2018-07-17 00:00:00',50.00000000,52,'Subscription 2017',2,NULL,NULL),(4,'2020-01-21 09:23:17','2020-01-21 10:23:17',2,'2017-07-18 00:00:00','2018-07-17 00:00:00',50.00000000,53,'Subscription 2017',2,NULL,NULL),(5,'2020-01-21 09:23:28','2020-01-21 10:23:28',2,'2018-07-18 00:00:00','2019-07-17 00:00:00',50.00000000,54,'Subscription 2018',2,NULL,NULL),(6,'2020-01-21 09:23:49','2020-01-21 10:23:49',2,'2019-07-18 00:00:00','2020-07-17 00:00:00',50.00000000,55,'Subscription 2019',2,NULL,NULL);
 /*!40000 ALTER TABLE `llx_subscription` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -12456,6 +14462,104 @@ LOCK TABLES `llx_takepos_floor_tables` WRITE;
 /*!40000 ALTER TABLE `llx_takepos_floor_tables` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_test`
+--
+
+DROP TABLE IF EXISTS `llx_test`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_test` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `datec` datetime DEFAULT NULL,
+  `label` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_test`
+--
+
+LOCK TABLES `llx_test` WRITE;
+/*!40000 ALTER TABLE `llx_test` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_test` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_test_test`
+--
+
+DROP TABLE IF EXISTS `llx_test_test`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_test_test` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(128) CHARACTER SET utf8mb4 NOT NULL DEFAULT '(PROV)',
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `label` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `amount` double DEFAULT NULL,
+  `qty` double DEFAULT NULL,
+  `fk_soc` int(11) DEFAULT NULL,
+  `fk_project` int(11) DEFAULT NULL,
+  `description` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `note_public` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `note_private` text CHARACTER SET utf8mb4 DEFAULT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_user_creat` int(11) NOT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `model_pdf` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `status` smallint(6) NOT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_test_test_rowid` (`rowid`),
+  KEY `idx_test_test_ref` (`ref`),
+  KEY `idx_test_test_entity` (`entity`),
+  KEY `idx_test_test_fk_soc` (`fk_soc`),
+  KEY `idx_test_test_fk_project` (`fk_project`),
+  KEY `llx_test_test_fk_user_creat` (`fk_user_creat`),
+  KEY `idx_test_test_status` (`status`),
+  CONSTRAINT `llx_test_test_fk_user_creat` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_test_test`
+--
+
+LOCK TABLES `llx_test_test` WRITE;
+/*!40000 ALTER TABLE `llx_test_test` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_test_test` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_test_test_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_test_test_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_test_test_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_fk_object` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_test_test_extrafields`
+--
+
+LOCK TABLES `llx_test_test_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_test_test_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_test_test_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_ticket`
 --
@@ -12488,6 +14592,7 @@ CREATE TABLE `llx_ticket` (
   `notify_tiers_at_create` tinyint(4) DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `email_msgid` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_ticket_track_id` (`track_id`),
   UNIQUE KEY `uk_ticket_ref` (`ref`,`entity`),
@@ -12505,7 +14610,7 @@ CREATE TABLE `llx_ticket` (
 
 LOCK TABLES `llx_ticket` WRITE;
 /*!40000 ALTER TABLE `llx_ticket` DISABLE KEYS */;
-INSERT INTO `llx_ticket` VALUES (2,1,'TS1909-0001','15ff11cay39skiaa',NULL,6,NULL,12,12,'Increase memory on server','Pleae increase the memory of server to 164GB',3,NULL,'0',NULL,'REQUEST','OTHER','NORMAL','2019-09-26 14:08:46',NULL,NULL,0,'2019-09-26 12:12:21',NULL),(3,1,'TS1909-0002','r5ya6gdi9f39dcjt',1,NULL,NULL,12,14,'Problem with customer','Please recontact customer.<br />\r\nNeed someone speaking chinese...',0,NULL,'100',NULL,'ISSUE','OTHER','NORMAL','2019-09-26 14:10:31',NULL,'2019-10-04 13:05:55',0,'2019-11-29 08:45:30',NULL),(4,1,'TS1910-0003','fdv9wrzcte7b3c8b',NULL,NULL,NULL,12,NULL,'test','test',2,NULL,'0',NULL,'COM','OTHER','NORMAL','2019-10-04 12:58:04',NULL,NULL,0,'2019-10-04 10:58:07',NULL),(6,1,'TS1911-0004','5gvo9bsjri55zef9',NULL,4,NULL,12,16,'What is the price for Dolibarr ERP CRM ?','I need to use it for 10 users.',3,NULL,'0',NULL,'COM','OTHER','NORMAL','2019-11-29 12:46:29','2019-11-29 12:46:34',NULL,0,'2019-11-29 08:48:00',NULL),(7,1,'TS1911-0005','d51wjy4nym7wltg7',NULL,NULL,'customer@customercompany.com',NULL,16,'What is the price for Dolibarr ERP CRM ?','I need it for 10 people...',8,NULL,'100',NULL,'COM','OTHER','NORMAL','2019-11-29 12:50:45','2019-11-29 12:52:32','2019-11-29 12:55:48',1,'2019-11-29 08:55:48',NULL);
+INSERT INTO `llx_ticket` VALUES (2,1,'TS1909-0001','15ff11cay39skiaa',NULL,6,NULL,12,12,'Increase memory on server','Pleae increase the memory of server to 164GB',3,NULL,'0',NULL,'REQUEST','OTHER','NORMAL','2019-09-26 14:08:46',NULL,NULL,0,'2019-09-26 12:12:21',NULL,NULL),(3,1,'TS1909-0002','r5ya6gdi9f39dcjt',1,NULL,NULL,12,14,'Problem with customer','Please recontact customer.<br />\r\nNeed someone speaking chinese...',0,NULL,'100',NULL,'ISSUE','OTHER','NORMAL','2019-09-26 14:10:31',NULL,'2019-10-04 13:05:55',0,'2019-11-29 08:45:30',NULL,NULL),(4,1,'TS1910-0003','fdv9wrzcte7b3c8b',NULL,NULL,NULL,12,NULL,'test','test',2,NULL,'0',NULL,'COM','OTHER','NORMAL','2019-10-04 12:58:04',NULL,NULL,0,'2019-10-04 10:58:07',NULL,NULL),(6,1,'TS1911-0004','5gvo9bsjri55zef9',NULL,4,NULL,12,16,'What is the price for Dolibarr ERP CRM ?','I need to use it for 10 users.',3,NULL,'0',NULL,'COM','OTHER','NORMAL','2019-11-29 12:46:29','2019-11-29 12:46:34',NULL,0,'2019-11-29 08:48:00',NULL,NULL),(7,1,'TS1911-0005','d51wjy4nym7wltg7',NULL,NULL,'customer@customercompany.com',NULL,16,'What is the price for Dolibarr ERP CRM ?','I need it for 10 people...',8,NULL,'100',NULL,'COM','OTHER','NORMAL','2019-11-29 12:50:45','2019-11-29 12:52:32','2019-11-29 12:55:48',1,'2019-11-29 08:55:48',NULL,NULL);
 /*!40000 ALTER TABLE `llx_ticket` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -12572,6 +14677,39 @@ LOCK TABLES `llx_tva` WRITE;
 /*!40000 ALTER TABLE `llx_tva` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_ultimatepdf_documentmergedpdf`
+--
+
+DROP TABLE IF EXISTS `llx_ultimatepdf_documentmergedpdf`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_ultimatepdf_documentmergedpdf` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) DEFAULT NULL,
+  `fk_element` int(11) DEFAULT NULL,
+  `file_name` varchar(255) DEFAULT NULL,
+  `element_name` varchar(255) NOT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp(),
+  `fk_user_creat` int(11) NOT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_ultimatepdf_documentmergedpdf_rowid` (`rowid`),
+  KEY `llx_ultimatepdf_documentmergedpdf_fk_user_creat` (`fk_user_creat`),
+  CONSTRAINT `llx_ultimatepdf_documentmergedpdf_fk_user_creat` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_ultimatepdf_documentmergedpdf`
+--
+
+LOCK TABLES `llx_ultimatepdf_documentmergedpdf` WRITE;
+/*!40000 ALTER TABLE `llx_ultimatepdf_documentmergedpdf` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_ultimatepdf_documentmergedpdf` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_user`
 --
@@ -12599,7 +14737,6 @@ CREATE TABLE `llx_user` (
   `lastname` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
   `firstname` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
   `job` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `skype` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `office_phone` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
   `office_fax` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
   `user_mobile` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -12652,17 +14789,15 @@ CREATE TABLE `llx_user` (
   `default_range` int(11) DEFAULT NULL,
   `default_c_exp_tax_cat` int(11) DEFAULT NULL,
   `dateemploymentend` date DEFAULT NULL,
-  `twitter` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `facebook` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `instagram` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `snapchat` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `googleplus` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `youtube` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `whatsapp` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `linkedin` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `fk_warehouse` int(11) DEFAULT NULL,
   `iplastlogin` varchar(250) COLLATE utf8_unicode_ci DEFAULT NULL,
   `ippreviouslogin` varchar(250) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `datelastpassvalidation` datetime DEFAULT NULL,
+  `datestartvalidity` datetime DEFAULT NULL,
+  `dateendvalidity` datetime DEFAULT NULL,
+  `idpers1` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `idpers2` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `idpers3` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_user_login` (`login`,`entity`),
   UNIQUE KEY `uk_user_fk_socpeople` (`fk_socpeople`),
@@ -12679,7 +14814,7 @@ CREATE TABLE `llx_user` (
 
 LOCK TABLES `llx_user` WRITE;
 /*!40000 ALTER TABLE `llx_user` DISABLE KEYS */;
-INSERT INTO `llx_user` VALUES (1,'2012-07-08 13:20:11','2019-11-28 11:52:58',NULL,NULL,'aeinstein',0,NULL,NULL,NULL,1,0,NULL,'11c9c772d6471aa24c27274bdd8a223b',NULL,NULL,'Einstein','Albert','',NULL,'123456789','','','','aeinstein@example.com','','[]','',0,'',1,1,NULL,NULL,NULL,'','2017-10-05 08:32:44','2017-10-03 11:43:50',NULL,'',1,'alberteinstein.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'aaaaff','',NULL,0,0,NULL,NULL,NULL,44.00000000,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(2,'2012-07-08 13:54:48','2019-11-28 11:52:58',NULL,NULL,'demo',1,NULL,NULL,NULL,1,0,NULL,'fe01ce2a7fbac8fafaed7c982a04e229',NULL,NULL,'Doe','David','Trainee',NULL,'09123123','','','','daviddoe@example.com','','[]','',0,'',1,1,NULL,NULL,NULL,'','2018-07-30 23:10:54','2018-07-30 23:04:17',NULL,'',1,'person9.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,35.00000000,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(3,'2012-07-11 16:18:59','2020-01-21 09:30:27',NULL,NULL,'pcurie',1,NULL,NULL,NULL,1,0,NULL,'ab335b4eb4c3c99334f656e5db9584c9',NULL,NULL,'Curie','Pierre','',NULL,'','','','','pcurie@example.com','','[]','',0,'',1,1,NULL,NULL,2,'','2014-12-21 17:38:55',NULL,NULL,'',1,'pierrecurie.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(4,'2015-01-23 17:52:27','2019-11-28 11:52:58',NULL,NULL,'bbookkeeper',1,NULL,NULL,NULL,1,0,NULL,'a7d30b58d647fcf59b7163f9592b1dbb',NULL,NULL,'Bookkeeper','Bob','Bookkeeper',NULL,'','','','','bbookkeeper@example.com','','{\"skype\":\"skypebbookkeeper\"}','',0,'',1,1,17,6,NULL,'','2015-02-25 10:18:41','2015-01-23 17:53:20',NULL,'',1,'person8.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,16.00000000,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(10,'2017-10-03 11:47:41','2019-11-28 11:52:58',NULL,NULL,'mcurie',1,NULL,NULL,NULL,1,0,NULL,'52cda011808bb282d1d3625ab607a145',NULL,'t3mnkbhs','Curie','Marie','',NULL,'','','','','mcurie@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'mariecurie.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'ffaaff','',NULL,0,0,NULL,NULL,NULL,44.00000000,'woman',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(11,'2017-10-05 09:07:52','2019-11-28 11:52:58',NULL,NULL,'zzeceo',1,NULL,NULL,NULL,1,0,NULL,'92af989c4c3a5140fb5d73eb77a52454',NULL,'cq78nf9m','Zeceo','Zack','President - CEO',NULL,'','','','','zzeceo@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'','2017-10-05 22:48:08','2017-10-05 21:18:46',NULL,'',1,'person4.jpeg',NULL,NULL,NULL,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,NULL,NULL,'2019-06-10 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(12,'2017-10-05 09:09:46','2020-01-07 13:47:17',NULL,NULL,'admin',0,NULL,NULL,NULL,1,0,NULL,'f6fdffe48c908deb0f4c3bd36c032e72',NULL,'nd6hgbcr','Adminson','Alice','Admin Technical',NULL,'','','','','aadminson@example.com','','[]','Alice - 123',1,NULL,1,1,NULL,NULL,NULL,'','2020-01-21 10:38:41','2020-01-21 10:35:27',NULL,'',1,'person6.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,2700.00000000,NULL,NULL,39.00000000,'woman',NULL,NULL,NULL,'generic_user_odt','1985-09-15',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(13,'2017-10-05 21:29:35','2019-11-28 11:52:58',NULL,NULL,'ccommercy',1,NULL,NULL,NULL,1,0,NULL,'179858e041af35e8f4c81d68c55fe9da',NULL,'y451ksdv','Commercy','Coraly','Commercial leader',NULL,'','','','','ccommercy@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'person7.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,1890.00000000,NULL,NULL,25.00000000,'woman',NULL,'2018-09-11 00:00:00',NULL,NULL,'1998-12-08',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(14,'2017-10-05 21:33:33','2019-11-28 11:52:58',NULL,NULL,'sscientol',1,NULL,NULL,NULL,1,0,NULL,'39bee07ac42f31c98e79cdcd5e5fe4c5',NULL,'s2hp8bxd','Scientol','Sam','Scientist leader',NULL,'','','','','sscientol@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'person3.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,3500.00000000,NULL,NULL,39.00000000,NULL,NULL,'2018-07-03 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(16,'2017-10-05 22:47:52','2019-11-28 11:52:58',NULL,NULL,'ccommerson',1,NULL,NULL,NULL,1,0,NULL,'d68005ccf362b82d084551b6291792a3',NULL,'cx9y1dk0','Charle1','Commerson','Sale representative',NULL,'','','','','ccommerson@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'','2017-10-05 23:46:24','2017-10-05 23:37:31',NULL,'',1,'person1.jpeg',NULL,NULL,13,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,2900.00000000,NULL,NULL,39.00000000,NULL,NULL,'2019-09-01 00:00:00',NULL,NULL,'1976-02-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(17,'2017-10-05 22:48:39','2019-11-28 11:52:58',NULL,NULL,'aleerfok',1,NULL,NULL,NULL,1,0,NULL,'a964065211872fb76f876c6c3e952ea3',NULL,'gw8cb7xj','Leerfok','Amanda','Sale representative',NULL,'','','','','aleerfok@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'','2017-10-05 23:16:06',NULL,NULL,'',0,'person5.jpeg',NULL,NULL,13,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,'woman',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(18,'2018-01-22 17:27:02','2019-11-28 11:52:58',NULL,NULL,'ldestailleur',1,NULL,NULL,NULL,1,0,NULL,'1bb7805145a7a5066df9e6d585b8b645',NULL,'87g06wbx','Destailleur','Laurent','Project leader of Dolibarr ERP CRM',NULL,'','','','','ldestailleur@example.com','','[]','<div><strong>Laurent DESTAILLEUR</strong></div>\r\n\r\n<div>\r\n<div><span style=\"color:#606163; font-family:arial; font-size:medium\"><strong>Project Director</strong></span><br />\r\n<span style=\"color:#336699\"><span style=\"color:#993399; font-family:tahoma,new york,times,serif\"><span style=\"color:#336699\">ldestailleur@example.com</span></span></span></div>\r\n\r\n<div>&nbsp;</div>\r\n\r\n<div>\r\n<div><span style=\"color:#993399; font-family:arial,helvetica,sans-serif; font-size:small\"><span style=\"color:#336699\"><a href=\"http://www.facebook.com/teclib\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">Facebook</a></span>&nbsp;|&nbsp;<span style=\"color:#336699\"><a href=\"http://twitter.com/teclib\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">Twitter</a></span>&nbsp;|&nbsp;<span style=\"color:#336699\"><span style=\"color:#993399\"><a href=\"http://www.teclib.com/\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">www.teclib.com</a></span></span></span></div>\r\n</div>\r\n</div>',0,NULL,1,1,10,10,NULL,'More information on http://www.destailleur.fr','2019-10-04 10:06:40','2017-09-06 11:55:30',NULL,'',1,'ldestailleur_200x200.jpg',NULL,NULL,NULL,NULL,NULL,NULL,'','','',NULL,NULL,'007f7f','',NULL,0,0,NULL,NULL,NULL,NULL,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(19,'2017-02-02 03:55:44','2020-01-16 15:44:42',NULL,NULL,'aboston',1,NULL,NULL,NULL,1,0,NULL,'a7a77a5aff2d5fc2f75f2f61507c88d4',NULL,NULL,'Boston','Alex','',NULL,'','','','','aboston@example.com','','[]','<strong>Alex Boston</strong><br />\r\nAdmin support service - 555 01 02 03 04',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',0,'person2.jpeg',NULL,NULL,12,NULL,NULL,25.00000000,'','','',NULL,NULL,'ff00ff','',NULL,0,0,2700.00000000,NULL,NULL,32.00000000,NULL,NULL,'2016-11-04 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL);
+INSERT INTO `llx_user` VALUES (1,'2012-07-08 13:20:11','2019-11-28 11:52:58',NULL,NULL,'aeinstein',0,NULL,NULL,NULL,1,0,NULL,'11c9c772d6471aa24c27274bdd8a223b',NULL,NULL,'Einstein','Albert','','123456789','','','','aeinstein@example.com','','[]','',0,'',1,1,NULL,NULL,NULL,'','2017-10-05 08:32:44','2017-10-03 11:43:50',NULL,'',1,'alberteinstein.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'aaaaff','',NULL,0,0,NULL,NULL,NULL,44.00000000,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(2,'2012-07-08 13:54:48','2019-11-28 11:52:58',NULL,NULL,'demo',1,NULL,NULL,NULL,1,0,NULL,'fe01ce2a7fbac8fafaed7c982a04e229',NULL,NULL,'Doe','David','Trainee','09123123','','','','daviddoe@example.com','','[]','',0,'',1,1,NULL,NULL,NULL,'','2018-07-30 23:10:54','2018-07-30 23:04:17',NULL,'',1,'person9.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,35.00000000,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,'2012-07-11 16:18:59','2020-01-21 09:30:27',NULL,NULL,'pcurie',1,NULL,NULL,NULL,1,0,NULL,'ab335b4eb4c3c99334f656e5db9584c9',NULL,NULL,'Curie','Pierre','','','','','','pcurie@example.com','','[]','',0,'',1,1,NULL,NULL,2,'','2014-12-21 17:38:55',NULL,NULL,'',1,'pierrecurie.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(4,'2015-01-23 17:52:27','2019-11-28 11:52:58',NULL,NULL,'bbookkeeper',1,NULL,NULL,NULL,1,0,NULL,'a7d30b58d647fcf59b7163f9592b1dbb',NULL,NULL,'Bookkeeper','Bob','Bookkeeper','','','','','bbookkeeper@example.com','','{\"skype\":\"skypebbookkeeper\"}','',0,'',1,1,17,6,NULL,'','2015-02-25 10:18:41','2015-01-23 17:53:20',NULL,'',1,'person8.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,16.00000000,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(10,'2017-10-03 11:47:41','2019-11-28 11:52:58',NULL,NULL,'mcurie',1,NULL,NULL,NULL,1,0,NULL,'52cda011808bb282d1d3625ab607a145',NULL,'t3mnkbhs','Curie','Marie','','','','','','mcurie@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'mariecurie.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'ffaaff','',NULL,0,0,NULL,NULL,NULL,44.00000000,'woman',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(11,'2017-10-05 09:07:52','2019-11-28 11:52:58',NULL,NULL,'zzeceo',1,NULL,NULL,NULL,1,0,NULL,'92af989c4c3a5140fb5d73eb77a52454',NULL,'cq78nf9m','Zeceo','Zack','President - CEO','','','','','zzeceo@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'','2017-10-05 22:48:08','2017-10-05 21:18:46',NULL,'',1,'person4.jpeg',NULL,NULL,NULL,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,NULL,NULL,'2019-06-10 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(12,'2017-10-05 09:09:46','2020-01-07 13:47:17',NULL,NULL,'admin',0,NULL,NULL,NULL,1,0,NULL,'f6fdffe48c908deb0f4c3bd36c032e72',NULL,'nd6hgbcr','Adminson','Alice','Admin Technical','','','','','aadminson@example.com','','[]','Alice - 123',1,NULL,1,1,NULL,NULL,NULL,'','2020-01-21 10:38:41','2020-01-21 10:35:27',NULL,'',1,'person6.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,2700.00000000,NULL,NULL,39.00000000,'woman',NULL,NULL,NULL,'generic_user_odt','1985-09-15',NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(13,'2017-10-05 21:29:35','2019-11-28 11:52:58',NULL,NULL,'ccommercy',1,NULL,NULL,NULL,1,0,NULL,'179858e041af35e8f4c81d68c55fe9da',NULL,'y451ksdv','Commercy','Coraly','Commercial leader','','','','','ccommercy@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'person7.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,1890.00000000,NULL,NULL,25.00000000,'woman',NULL,'2018-09-11 00:00:00',NULL,NULL,'1998-12-08',NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(14,'2017-10-05 21:33:33','2019-11-28 11:52:58',NULL,NULL,'sscientol',1,NULL,NULL,NULL,1,0,NULL,'39bee07ac42f31c98e79cdcd5e5fe4c5',NULL,'s2hp8bxd','Scientol','Sam','Scientist leader','','','','','sscientol@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'person3.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,3500.00000000,NULL,NULL,39.00000000,NULL,NULL,'2018-07-03 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(16,'2017-10-05 22:47:52','2019-11-28 11:52:58',NULL,NULL,'ccommerson',1,NULL,NULL,NULL,1,0,NULL,'d68005ccf362b82d084551b6291792a3',NULL,'cx9y1dk0','Charle1','Commerson','Sale representative','','','','','ccommerson@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'','2017-10-05 23:46:24','2017-10-05 23:37:31',NULL,'',1,'person1.jpeg',NULL,NULL,13,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,2900.00000000,NULL,NULL,39.00000000,NULL,NULL,'2019-09-01 00:00:00',NULL,NULL,'1976-02-05',NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(17,'2017-10-05 22:48:39','2019-11-28 11:52:58',NULL,NULL,'aleerfok',1,NULL,NULL,NULL,1,0,NULL,'a964065211872fb76f876c6c3e952ea3',NULL,'gw8cb7xj','Leerfok','Amanda','Sale representative','','','','','aleerfok@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'','2017-10-05 23:16:06',NULL,NULL,'',0,'person5.jpeg',NULL,NULL,13,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,'woman',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(18,'2018-01-22 17:27:02','2019-11-28 11:52:58',NULL,NULL,'ldestailleur',1,NULL,NULL,NULL,1,0,NULL,'1bb7805145a7a5066df9e6d585b8b645',NULL,'87g06wbx','Destailleur','Laurent','Project leader of Dolibarr ERP CRM','','','','','ldestailleur@example.com','','[]','<div><strong>Laurent DESTAILLEUR</strong></div>\r\n\r\n<div>\r\n<div><span style=\"color:#606163; font-family:arial; font-size:medium\"><strong>Project Director</strong></span><br />\r\n<span style=\"color:#336699\"><span style=\"color:#993399; font-family:tahoma,new york,times,serif\"><span style=\"color:#336699\">ldestailleur@example.com</span></span></span></div>\r\n\r\n<div>&nbsp;</div>\r\n\r\n<div>\r\n<div><span style=\"color:#993399; font-family:arial,helvetica,sans-serif; font-size:small\"><span style=\"color:#336699\"><a href=\"http://www.facebook.com/teclib\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">Facebook</a></span>&nbsp;|&nbsp;<span style=\"color:#336699\"><a href=\"http://twitter.com/teclib\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">Twitter</a></span>&nbsp;|&nbsp;<span style=\"color:#336699\"><span style=\"color:#993399\"><a href=\"http://www.teclib.com/\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">www.teclib.com</a></span></span></span></div>\r\n</div>\r\n</div>',0,NULL,1,1,10,10,NULL,'More information on http://www.mydomain.com','2019-10-04 10:06:40','2017-09-06 11:55:30',NULL,'',1,'ldestailleur_200x200.jpg',NULL,NULL,NULL,NULL,NULL,NULL,'','','',NULL,NULL,'007f7f','',NULL,0,0,NULL,NULL,NULL,NULL,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(19,'2017-02-02 03:55:44','2020-01-16 15:44:42',NULL,NULL,'aboston',1,NULL,NULL,NULL,1,0,NULL,'a7a77a5aff2d5fc2f75f2f61507c88d4',NULL,NULL,'Boston','Alex','','','','','','aboston@example.com','','[]','<strong>Alex Boston</strong><br />\r\nAdmin support service - 555 01 02 03 04',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',0,'person2.jpeg',NULL,NULL,12,NULL,NULL,25.00000000,'','','',NULL,NULL,'ff00ff','',NULL,0,0,2700.00000000,NULL,NULL,32.00000000,NULL,NULL,'2016-11-04 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_user` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -12880,7 +15015,7 @@ CREATE TABLE `llx_user_rights` (
   UNIQUE KEY `uk_user_rights` (`entity`,`fk_user`,`fk_id`),
   KEY `fk_user_rights_fk_user_user` (`fk_user`),
   CONSTRAINT `fk_user_rights_fk_user_user` FOREIGN KEY (`fk_user`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=19847 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=20083 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12889,10 +15024,38 @@ CREATE TABLE `llx_user_rights` (
 
 LOCK TABLES `llx_user_rights` WRITE;
 /*!40000 ALTER TABLE `llx_user_rights` DISABLE KEYS */;
-INSERT INTO `llx_user_rights` VALUES (12402,1,1,11),(12380,1,1,12),(12385,1,1,13),(12389,1,1,14),(12393,1,1,15),(12398,1,1,16),(12404,1,1,19),(9726,1,1,21),(9700,1,1,22),(9706,1,1,24),(9711,1,1,25),(9716,1,1,26),(9722,1,1,27),(9728,1,1,28),(9978,1,1,31),(9968,1,1,32),(9974,1,1,34),(1910,1,1,36),(9980,1,1,38),(11573,1,1,41),(11574,1,1,42),(11575,1,1,44),(11576,1,1,45),(7184,1,1,61),(7181,1,1,62),(7183,1,1,64),(7185,1,1,67),(7186,1,1,68),(1678,1,1,71),(1673,1,1,72),(1675,1,1,74),(1679,1,1,75),(1677,1,1,76),(1681,1,1,78),(1682,1,1,79),(12322,1,1,81),(12309,1,1,82),(12312,1,1,84),(12314,1,1,86),(12317,1,1,87),(12320,1,1,88),(12323,1,1,89),(11580,1,1,91),(11581,1,1,92),(11582,1,1,93),(11583,1,1,94),(10097,1,1,95),(10099,1,1,96),(10103,1,1,97),(10104,1,1,98),(7139,1,1,101),(7134,1,1,102),(7136,1,1,104),(7137,1,1,105),(7138,1,1,106),(7140,1,1,109),(10229,1,1,111),(10201,1,1,112),(10207,1,1,113),(10213,1,1,114),(10219,1,1,115),(10225,1,1,116),(10231,1,1,117),(12518,1,1,121),(12508,1,1,122),(12514,1,1,125),(12520,1,1,126),(11577,1,1,141),(11578,1,1,142),(11579,1,1,144),(2307,1,1,151),(2304,1,1,152),(2306,1,1,153),(2308,1,1,154),(10092,1,1,161),(10093,1,1,162),(10094,1,1,163),(10095,1,1,164),(10096,1,1,165),(1585,1,1,170),(12342,1,1,171),(12331,1,1,172),(12335,1,1,173),(12339,1,1,174),(12343,1,1,178),(10000,1,1,221),(9990,1,1,222),(9996,1,1,223),(10002,1,1,229),(10007,1,1,237),(10011,1,1,238),(10015,1,1,239),(1686,1,1,241),(1685,1,1,242),(1687,1,1,243),(12604,1,1,251),(12566,1,1,252),(12569,1,1,253),(12572,1,1,254),(12575,1,1,255),(12579,1,1,256),(1617,1,1,258),(12525,1,1,262),(12544,1,1,281),(12534,1,1,282),(12540,1,1,283),(12546,1,1,286),(12288,1,1,300),(12290,1,1,301),(11591,1,1,302),(1763,1,1,331),(1762,1,1,332),(1764,1,1,333),(12582,1,1,341),(12584,1,1,342),(12586,1,1,343),(12588,1,1,344),(12600,1,1,351),(12593,1,1,352),(12597,1,1,353),(12601,1,1,354),(12605,1,1,358),(12560,1,1,531),(12553,1,1,532),(12557,1,1,534),(1625,1,1,536),(12561,1,1,538),(12358,1,1,700),(12348,1,1,701),(12354,1,1,702),(12360,1,1,703),(1755,1,1,1001),(1754,1,1,1002),(1756,1,1,1003),(1758,1,1,1004),(1759,1,1,1005),(7146,1,1,1101),(7143,1,1,1102),(7145,1,1,1104),(7147,1,1,1109),(12412,1,1,1181),(12458,1,1,1182),(12417,1,1,1183),(12420,1,1,1184),(12423,1,1,1185),(12427,1,1,1186),(12431,1,1,1187),(12437,1,1,1188),(12434,1,1,1189),(1578,1,1,1201),(1579,1,1,1202),(12454,1,1,1231),(12443,1,1,1232),(12446,1,1,1233),(12449,1,1,1234),(12452,1,1,1235),(12455,1,1,1236),(12459,1,1,1237),(1736,1,1,1251),(12409,1,1,1321),(12326,1,1,1421),(8190,1,1,1791),(8187,1,1,1792),(8191,1,1,1793),(12264,1,1,2401),(12260,1,1,2402),(12266,1,1,2403),(12280,1,1,2411),(12276,1,1,2412),(12282,1,1,2413),(12286,1,1,2414),(1618,1,1,2500),(12370,1,1,2501),(12367,1,1,2503),(12371,1,1,2515),(9610,1,1,5001),(9611,1,1,5002),(12490,1,1,20001),(12468,1,1,20002),(12474,1,1,20003),(12480,1,1,20004),(12486,1,1,20005),(12492,1,1,20006),(12302,1,1,23001),(12295,1,1,23002),(12299,1,1,23003),(12303,1,1,23004),(7701,1,1,50101),(4984,1,1,50401),(4983,1,1,50402),(4985,1,1,50403),(4987,1,1,50411),(4988,1,1,50412),(4989,1,1,50415),(12498,1,1,55001),(12499,1,1,55002),(3564,1,1,100700),(3565,1,1,100701),(9596,1,1,101051),(9598,1,1,101052),(9600,1,1,101053),(9604,1,1,101060),(9605,1,1,101061),(7177,1,1,101201),(7178,1,1,101202),(10353,1,1,101250),(10355,1,1,101251),(8980,1,1,101261),(8981,1,1,101262),(7616,1,1,101331),(10030,1,1,101701),(10031,1,1,101702),(3582,1,1,102000),(3583,1,1,102001),(9819,1,1,400051),(9823,1,1,400052),(9827,1,1,400053),(9831,1,1,400055),(132,1,2,11),(133,1,2,12),(134,1,2,13),(135,1,2,14),(136,1,2,16),(137,1,2,19),(138,1,2,21),(139,1,2,22),(140,1,2,24),(141,1,2,25),(142,1,2,26),(143,1,2,27),(10359,1,2,31),(145,1,2,32),(10361,1,2,34),(146,1,2,36),(147,1,2,41),(148,1,2,42),(149,1,2,44),(150,1,2,61),(151,1,2,62),(152,1,2,64),(153,1,2,71),(154,1,2,72),(155,1,2,74),(156,1,2,75),(157,1,2,78),(158,1,2,79),(159,1,2,81),(160,1,2,82),(161,1,2,84),(162,1,2,86),(163,1,2,87),(164,1,2,88),(165,1,2,89),(166,1,2,91),(167,1,2,92),(168,1,2,93),(2475,1,2,95),(2476,1,2,96),(2477,1,2,97),(2478,1,2,98),(169,1,2,101),(170,1,2,102),(171,1,2,104),(172,1,2,109),(173,1,2,111),(174,1,2,112),(175,1,2,113),(176,1,2,114),(177,1,2,116),(178,1,2,117),(179,1,2,121),(180,1,2,122),(181,1,2,125),(182,1,2,141),(183,1,2,142),(184,1,2,144),(2479,1,2,151),(2480,1,2,152),(2481,1,2,153),(2482,1,2,154),(185,1,2,161),(186,1,2,162),(187,1,2,163),(188,1,2,164),(189,1,2,165),(190,1,2,170),(2471,1,2,171),(192,1,2,172),(2472,1,2,173),(193,1,2,221),(194,1,2,222),(195,1,2,229),(196,1,2,241),(197,1,2,242),(198,1,2,243),(199,1,2,251),(201,1,2,262),(202,1,2,281),(203,1,2,282),(204,1,2,283),(205,1,2,331),(15072,1,2,510),(2483,1,2,531),(207,1,2,532),(2484,1,2,534),(208,1,2,536),(2473,1,2,700),(210,1,2,701),(211,1,2,702),(2474,1,2,703),(15064,1,2,771),(15057,1,2,772),(15059,1,2,773),(15061,1,2,774),(15063,1,2,775),(15065,1,2,776),(212,1,2,1001),(213,1,2,1002),(214,1,2,1003),(215,1,2,1004),(216,1,2,1005),(217,1,2,1101),(218,1,2,1102),(219,1,2,1104),(220,1,2,1109),(15073,1,2,1121),(15074,1,2,1122),(15075,1,2,1123),(15076,1,2,1124),(15077,1,2,1125),(15078,1,2,1126),(221,1,2,1181),(222,1,2,1182),(223,1,2,1183),(224,1,2,1184),(225,1,2,1185),(226,1,2,1186),(227,1,2,1187),(228,1,2,1188),(229,1,2,1201),(230,1,2,1202),(231,1,2,1231),(232,1,2,1232),(233,1,2,1233),(234,1,2,1234),(235,1,2,1421),(236,1,2,2401),(237,1,2,2402),(238,1,2,2403),(239,1,2,2411),(240,1,2,2412),(241,1,2,2413),(242,1,2,2500),(2470,1,2,2501),(243,1,2,2515),(10363,1,2,20001),(10364,1,2,20002),(10365,1,2,20003),(10366,1,2,20004),(10367,1,2,20005),(10368,1,2,20006),(15054,1,2,23001),(10362,1,2,50101),(15067,1,2,55001),(15066,1,2,59001),(15068,1,2,63001),(15069,1,2,63002),(15070,1,2,63003),(15071,1,2,63004),(10372,1,2,101250),(1807,1,3,11),(1808,1,3,31),(1809,1,3,36),(1810,1,3,41),(1811,1,3,61),(1812,1,3,71),(1813,1,3,72),(1814,1,3,74),(1815,1,3,75),(1816,1,3,78),(1817,1,3,79),(1818,1,3,91),(1819,1,3,95),(1820,1,3,97),(1821,1,3,111),(1822,1,3,121),(1823,1,3,122),(1824,1,3,125),(1825,1,3,161),(1826,1,3,170),(1827,1,3,171),(1828,1,3,172),(1829,1,3,221),(1830,1,3,222),(1831,1,3,229),(1832,1,3,241),(1833,1,3,242),(1834,1,3,243),(1835,1,3,251),(1836,1,3,255),(1837,1,3,256),(1838,1,3,262),(1839,1,3,281),(1840,1,3,282),(1841,1,3,283),(1842,1,3,331),(1843,1,3,531),(1844,1,3,536),(1845,1,3,700),(1846,1,3,1001),(1847,1,3,1002),(1848,1,3,1003),(1849,1,3,1004),(1850,1,3,1005),(1851,1,3,1181),(1852,1,3,1182),(1853,1,3,1201),(1854,1,3,1202),(1855,1,3,1231),(1856,1,3,2401),(1857,1,3,2402),(1858,1,3,2403),(1859,1,3,2411),(1860,1,3,2412),(1861,1,3,2413),(1862,1,3,2500),(1863,1,3,2515),(8026,1,4,11),(8027,1,4,21),(8028,1,4,31),(8029,1,4,41),(8030,1,4,61),(8031,1,4,71),(8032,1,4,72),(8033,1,4,74),(8034,1,4,75),(8035,1,4,78),(8036,1,4,79),(8037,1,4,81),(8038,1,4,91),(8039,1,4,95),(8040,1,4,97),(8041,1,4,101),(8042,1,4,111),(8043,1,4,121),(8044,1,4,151),(8045,1,4,161),(8046,1,4,171),(8047,1,4,221),(8048,1,4,222),(8049,1,4,229),(8050,1,4,241),(8051,1,4,242),(8052,1,4,243),(8146,1,4,251),(8147,1,4,253),(8053,1,4,262),(8054,1,4,281),(8055,1,4,331),(8056,1,4,341),(8057,1,4,342),(8058,1,4,343),(8059,1,4,344),(8060,1,4,531),(8061,1,4,700),(8062,1,4,1001),(8063,1,4,1002),(8064,1,4,1003),(8065,1,4,1004),(8066,1,4,1005),(8067,1,4,1101),(8068,1,4,1181),(8069,1,4,1182),(8070,1,4,1201),(8071,1,4,1202),(8072,1,4,1231),(8073,1,4,2401),(8074,1,4,2501),(8075,1,4,2503),(8076,1,4,2515),(8077,1,4,20001),(8078,1,4,50101),(8079,1,4,101201),(8080,1,4,101261),(8081,1,4,102000),(8082,1,4,400051),(8083,1,4,400052),(8084,1,4,400053),(8085,1,4,400055),(12608,1,10,11),(12609,1,10,21),(12610,1,10,31),(12611,1,10,41),(12612,1,10,61),(12613,1,10,71),(12614,1,10,72),(12615,1,10,74),(12616,1,10,75),(12617,1,10,78),(12618,1,10,79),(12619,1,10,81),(12620,1,10,91),(12621,1,10,95),(12622,1,10,97),(12623,1,10,101),(12624,1,10,111),(12625,1,10,121),(12626,1,10,151),(12627,1,10,161),(12628,1,10,171),(12629,1,10,221),(12630,1,10,222),(12631,1,10,229),(12632,1,10,241),(12633,1,10,242),(12634,1,10,243),(12635,1,10,262),(12636,1,10,281),(12637,1,10,300),(12638,1,10,331),(12639,1,10,341),(12640,1,10,342),(12641,1,10,343),(12642,1,10,344),(12643,1,10,531),(12644,1,10,700),(12645,1,10,1001),(12646,1,10,1002),(12647,1,10,1003),(12648,1,10,1004),(12649,1,10,1005),(12650,1,10,1101),(12651,1,10,1181),(12652,1,10,1182),(12653,1,10,1201),(12654,1,10,1202),(12655,1,10,1231),(12656,1,10,2401),(12657,1,10,2501),(12658,1,10,2503),(12659,1,10,2515),(12660,1,10,20001),(12661,1,10,20002),(12662,1,10,23001),(12663,1,10,50101),(12664,1,11,11),(12665,1,11,21),(12666,1,11,31),(12667,1,11,41),(12668,1,11,61),(12669,1,11,71),(12670,1,11,72),(12671,1,11,74),(12672,1,11,75),(12673,1,11,78),(12674,1,11,79),(12675,1,11,81),(12676,1,11,91),(12677,1,11,95),(12678,1,11,97),(12679,1,11,101),(12680,1,11,111),(12681,1,11,121),(12682,1,11,151),(12683,1,11,161),(12684,1,11,171),(12685,1,11,221),(12686,1,11,222),(12687,1,11,229),(12688,1,11,241),(12689,1,11,242),(12690,1,11,243),(12691,1,11,262),(12692,1,11,281),(12693,1,11,300),(12694,1,11,331),(12695,1,11,341),(12696,1,11,342),(12697,1,11,343),(12698,1,11,344),(12699,1,11,531),(12700,1,11,700),(12701,1,11,1001),(12702,1,11,1002),(12703,1,11,1003),(12704,1,11,1004),(12705,1,11,1005),(12706,1,11,1101),(12707,1,11,1181),(12708,1,11,1182),(12709,1,11,1201),(12710,1,11,1202),(12711,1,11,1231),(12712,1,11,2401),(12713,1,11,2501),(12714,1,11,2503),(12715,1,11,2515),(12716,1,11,20001),(12717,1,11,20002),(12718,1,11,23001),(12719,1,11,50101),(19727,1,12,11),(19719,1,12,12),(19720,1,12,13),(19721,1,12,14),(19722,1,12,15),(19725,1,12,16),(19728,1,12,19),(14146,1,12,21),(14135,1,12,22),(14137,1,12,24),(14139,1,12,25),(14142,1,12,26),(14145,1,12,27),(14148,1,12,28),(14930,1,12,31),(14926,1,12,32),(14929,1,12,34),(14932,1,12,38),(13816,1,12,41),(13813,1,12,42),(13815,1,12,44),(13817,1,12,45),(14094,1,12,61),(14091,1,12,62),(14093,1,12,64),(14095,1,12,67),(14096,1,12,68),(16203,1,12,71),(16198,1,12,72),(16200,1,12,74),(16204,1,12,75),(16202,1,12,76),(16206,1,12,78),(16207,1,12,79),(19684,1,12,81),(19679,1,12,82),(19680,1,12,84),(19681,1,12,86),(19682,1,12,87),(19683,1,12,88),(19685,1,12,89),(15401,1,12,91),(15397,1,12,92),(15400,1,12,93),(15403,1,12,94),(13990,1,12,95),(12734,1,12,97),(19241,1,12,101),(19237,1,12,102),(19238,1,12,104),(19239,1,12,105),(19240,1,12,106),(19242,1,12,109),(15390,1,12,111),(15377,1,12,112),(15380,1,12,113),(15383,1,12,114),(15386,1,12,115),(15389,1,12,116),(15392,1,12,117),(19796,1,12,121),(19791,1,12,122),(19794,1,12,125),(19797,1,12,126),(13821,1,12,141),(13820,1,12,142),(13822,1,12,144),(13912,1,12,151),(13909,1,12,152),(13911,1,12,153),(13913,1,12,154),(14063,1,12,161),(14056,1,12,162),(14058,1,12,163),(14060,1,12,164),(14062,1,12,165),(14064,1,12,167),(13350,1,12,171),(13345,1,12,172),(13347,1,12,173),(13349,1,12,174),(13351,1,12,178),(13838,1,12,221),(13834,1,12,222),(13837,1,12,223),(13840,1,12,229),(13842,1,12,237),(13844,1,12,238),(13846,1,12,239),(13516,1,12,241),(13515,1,12,242),(13517,1,12,243),(19838,1,12,251),(19819,1,12,252),(19821,1,12,253),(19822,1,12,254),(19824,1,12,255),(19826,1,12,256),(19798,1,12,262),(19808,1,12,281),(19803,1,12,282),(19806,1,12,283),(19809,1,12,286),(19668,1,12,300),(19669,1,12,301),(16194,1,12,331),(16193,1,12,332),(16195,1,12,333),(19827,1,12,341),(19828,1,12,342),(19829,1,12,343),(19830,1,12,344),(19836,1,12,351),(19833,1,12,352),(19835,1,12,353),(19837,1,12,354),(19839,1,12,358),(19249,1,12,430),(16384,1,12,501),(16378,1,12,502),(13865,1,12,510),(19785,1,12,511),(19782,1,12,512),(19784,1,12,514),(19786,1,12,517),(15291,1,12,520),(15286,1,12,522),(15288,1,12,524),(15290,1,12,525),(15292,1,12,527),(19815,1,12,531),(19812,1,12,532),(19814,1,12,534),(19816,1,12,538),(16932,1,12,650),(16931,1,12,651),(16933,1,12,652),(17124,1,12,660),(17123,1,12,661),(17125,1,12,662),(13358,1,12,700),(19693,1,12,701),(19691,1,12,702),(19694,1,12,703),(19713,1,12,771),(19702,1,12,772),(19704,1,12,773),(15085,1,12,774),(19706,1,12,775),(19708,1,12,776),(19710,1,12,777),(19712,1,12,778),(19714,1,12,779),(14917,1,12,1001),(14916,1,12,1002),(14918,1,12,1003),(14920,1,12,1004),(14921,1,12,1005),(19247,1,12,1101),(19245,1,12,1102),(19246,1,12,1104),(19248,1,12,1109),(19233,1,12,1121),(19226,1,12,1122),(19228,1,12,1123),(19230,1,12,1124),(19232,1,12,1125),(19234,1,12,1126),(19731,1,12,1181),(19745,1,12,1182),(19734,1,12,1183),(19735,1,12,1184),(19737,1,12,1185),(19739,1,12,1186),(19741,1,12,1187),(19744,1,12,1188),(19742,1,12,1189),(19746,1,12,1191),(13827,1,12,1201),(13828,1,12,1202),(19754,1,12,1231),(19749,1,12,1232),(19750,1,12,1233),(19752,1,12,1234),(19753,1,12,1235),(19755,1,12,1236),(16302,1,12,1237),(13829,1,12,1251),(19729,1,12,1321),(19730,1,12,1322),(19686,1,12,1421),(19657,1,12,2401),(19655,1,12,2402),(19658,1,12,2403),(19665,1,12,2411),(19663,1,12,2412),(19666,1,12,2413),(19667,1,12,2414),(19698,1,12,2501),(19697,1,12,2503),(19699,1,12,2515),(16386,1,12,3200),(15435,1,12,5001),(15436,1,12,5002),(19845,1,12,10001),(19842,1,12,10002),(19844,1,12,10003),(19846,1,12,10005),(19767,1,12,20001),(19758,1,12,20002),(19760,1,12,20003),(19764,1,12,20004),(19766,1,12,20005),(19768,1,12,20006),(19762,1,12,20007),(19675,1,12,23001),(19672,1,12,23002),(19674,1,12,23003),(19676,1,12,23004),(19019,1,12,50101),(19817,1,12,50151),(19639,1,12,50401),(19647,1,12,50411),(19642,1,12,50412),(19644,1,12,50414),(19646,1,12,50415),(19648,1,12,50418),(19649,1,12,50420),(19650,1,12,50430),(19638,1,12,50440),(19770,1,12,55001),(19771,1,12,55002),(16740,1,12,56001),(16737,1,12,56002),(16739,1,12,56003),(16741,1,12,56004),(16742,1,12,56005),(17135,1,12,59001),(17136,1,12,59002),(17137,1,12,59003),(19778,1,12,63001),(19775,1,12,63002),(19777,1,12,63003),(19779,1,12,63004),(19772,1,12,64001),(17328,1,12,101130),(17327,1,12,101131),(17329,1,12,101132),(16009,1,12,101331),(16010,1,12,101332),(16011,1,12,101333),(19208,1,12,101701),(19209,1,12,101702),(12776,1,13,11),(12777,1,13,21),(12778,1,13,31),(12779,1,13,41),(12780,1,13,61),(12781,1,13,71),(12782,1,13,72),(12783,1,13,74),(12784,1,13,75),(12785,1,13,78),(12786,1,13,79),(12787,1,13,81),(12788,1,13,91),(12789,1,13,95),(12790,1,13,97),(12791,1,13,101),(12792,1,13,111),(12793,1,13,121),(12794,1,13,151),(12795,1,13,161),(12796,1,13,171),(12797,1,13,221),(12798,1,13,222),(12799,1,13,229),(12800,1,13,241),(12801,1,13,242),(12802,1,13,243),(12803,1,13,262),(12804,1,13,281),(12805,1,13,300),(12806,1,13,331),(12807,1,13,341),(12808,1,13,342),(12809,1,13,343),(12810,1,13,344),(12811,1,13,531),(12812,1,13,700),(12813,1,13,1001),(12814,1,13,1002),(12815,1,13,1003),(12816,1,13,1004),(12817,1,13,1005),(12818,1,13,1101),(12819,1,13,1181),(12820,1,13,1182),(12821,1,13,1201),(12822,1,13,1202),(12823,1,13,1231),(12824,1,13,2401),(12825,1,13,2501),(12826,1,13,2503),(12827,1,13,2515),(12828,1,13,20001),(12829,1,13,20002),(12830,1,13,23001),(12831,1,13,50101),(12832,1,14,11),(12833,1,14,21),(12834,1,14,31),(12835,1,14,41),(12836,1,14,61),(12837,1,14,71),(12838,1,14,72),(12839,1,14,74),(12840,1,14,75),(12841,1,14,78),(12842,1,14,79),(12843,1,14,81),(12844,1,14,91),(12845,1,14,95),(12846,1,14,97),(12847,1,14,101),(12848,1,14,111),(12849,1,14,121),(12850,1,14,151),(12851,1,14,161),(12852,1,14,171),(12853,1,14,221),(12854,1,14,222),(12855,1,14,229),(12856,1,14,241),(12857,1,14,242),(12858,1,14,243),(12859,1,14,262),(12860,1,14,281),(12861,1,14,300),(12862,1,14,331),(12863,1,14,341),(12864,1,14,342),(12865,1,14,343),(12866,1,14,344),(12867,1,14,531),(12868,1,14,700),(12869,1,14,1001),(12870,1,14,1002),(12871,1,14,1003),(12872,1,14,1004),(12873,1,14,1005),(12874,1,14,1101),(12875,1,14,1181),(12876,1,14,1182),(12877,1,14,1201),(12878,1,14,1202),(12879,1,14,1231),(12880,1,14,2401),(12881,1,14,2501),(12882,1,14,2503),(12883,1,14,2515),(12884,1,14,20001),(12885,1,14,20002),(12886,1,14,23001),(12887,1,14,50101),(12944,1,16,11),(12945,1,16,21),(12946,1,16,31),(13056,1,16,41),(13057,1,16,42),(13058,1,16,44),(13059,1,16,45),(12948,1,16,61),(12949,1,16,71),(12950,1,16,72),(12951,1,16,74),(12952,1,16,75),(12953,1,16,78),(12954,1,16,79),(12955,1,16,81),(12956,1,16,91),(12957,1,16,95),(12958,1,16,97),(12959,1,16,101),(12960,1,16,111),(12961,1,16,121),(13060,1,16,141),(13061,1,16,142),(13062,1,16,144),(12962,1,16,151),(12963,1,16,161),(12964,1,16,171),(12965,1,16,221),(12966,1,16,222),(12967,1,16,229),(12968,1,16,241),(12969,1,16,242),(12970,1,16,243),(13128,1,16,251),(13064,1,16,262),(12972,1,16,281),(12973,1,16,300),(12974,1,16,331),(12975,1,16,341),(12976,1,16,342),(12977,1,16,343),(12978,1,16,344),(12979,1,16,531),(12980,1,16,700),(12981,1,16,1001),(12982,1,16,1002),(12983,1,16,1003),(12984,1,16,1004),(12985,1,16,1005),(12986,1,16,1101),(12987,1,16,1181),(12988,1,16,1182),(12989,1,16,1201),(12990,1,16,1202),(12991,1,16,1231),(12992,1,16,2401),(12993,1,16,2501),(12994,1,16,2503),(12995,1,16,2515),(12996,1,16,20001),(12997,1,16,20002),(12998,1,16,23001),(12999,1,16,50101),(13000,1,17,11),(13001,1,17,21),(13002,1,17,31),(13065,1,17,41),(13066,1,17,42),(13067,1,17,44),(13068,1,17,45),(13004,1,17,61),(13005,1,17,71),(13006,1,17,72),(13007,1,17,74),(13008,1,17,75),(13009,1,17,78),(13010,1,17,79),(13011,1,17,81),(13012,1,17,91),(13013,1,17,95),(13014,1,17,97),(13015,1,17,101),(13016,1,17,111),(13017,1,17,121),(13069,1,17,141),(13070,1,17,142),(13071,1,17,144),(13018,1,17,151),(13019,1,17,161),(13020,1,17,171),(13021,1,17,221),(13022,1,17,222),(13023,1,17,229),(13024,1,17,241),(13025,1,17,242),(13026,1,17,243),(13028,1,17,281),(13029,1,17,300),(13030,1,17,331),(13031,1,17,341),(13032,1,17,342),(13033,1,17,343),(13034,1,17,344),(13035,1,17,531),(13036,1,17,700),(13037,1,17,1001),(13038,1,17,1002),(13039,1,17,1003),(13040,1,17,1004),(13041,1,17,1005),(13042,1,17,1101),(13043,1,17,1181),(13044,1,17,1182),(13045,1,17,1201),(13046,1,17,1202),(13047,1,17,1231),(13048,1,17,2401),(13049,1,17,2501),(13050,1,17,2503),(13051,1,17,2515),(13052,1,17,20001),(13053,1,17,20002),(13054,1,17,23001),(13055,1,17,50101),(14504,1,18,11),(14505,1,18,21),(14506,1,18,31),(14507,1,18,41),(14508,1,18,61),(14509,1,18,71),(14510,1,18,78),(14511,1,18,81),(14512,1,18,91),(14513,1,18,95),(14514,1,18,101),(14515,1,18,111),(14516,1,18,121),(14517,1,18,151),(14518,1,18,161),(14519,1,18,221),(14520,1,18,241),(14521,1,18,262),(14522,1,18,281),(14523,1,18,300),(14524,1,18,331),(14525,1,18,332),(14526,1,18,333),(14527,1,18,341),(14528,1,18,342),(14529,1,18,343),(14530,1,18,344),(14531,1,18,531),(14532,1,18,701),(14533,1,18,771),(14534,1,18,774),(14535,1,18,1001),(14536,1,18,1004),(14537,1,18,1101),(14538,1,18,1181),(14539,1,18,1182),(14540,1,18,1201),(14541,1,18,1231),(14542,1,18,2401),(14543,1,18,2501),(14544,1,18,2503),(14545,1,18,2515),(14546,1,18,20001),(14547,1,18,20002),(14548,1,18,50101),(14549,1,18,59001),(15242,1,19,21),(15243,1,19,31),(15244,1,19,41),(15245,1,19,61),(15246,1,19,71),(15247,1,19,78),(15248,1,19,81),(15249,1,19,101),(15250,1,19,121),(15251,1,19,151),(15252,1,19,161),(15253,1,19,221),(15254,1,19,241),(15255,1,19,262),(15256,1,19,281),(15257,1,19,300),(15258,1,19,331),(15259,1,19,332),(15260,1,19,341),(15261,1,19,342),(15262,1,19,343),(15263,1,19,344),(15264,1,19,531),(15265,1,19,701),(15266,1,19,771),(15267,1,19,774),(15268,1,19,777),(15269,1,19,1001),(15270,1,19,1004),(15271,1,19,1101),(15272,1,19,1121),(15273,1,19,1181),(15274,1,19,1182),(15275,1,19,1201),(15276,1,19,1231),(15277,1,19,2401),(15278,1,19,2501),(15279,1,19,20001),(15280,1,19,20002),(15281,1,19,50101),(15282,1,19,59001),(15283,1,19,63001);
+INSERT INTO `llx_user_rights` VALUES (12402,1,1,11),(12380,1,1,12),(12385,1,1,13),(12389,1,1,14),(12393,1,1,15),(12398,1,1,16),(12404,1,1,19),(9726,1,1,21),(9700,1,1,22),(9706,1,1,24),(9711,1,1,25),(9716,1,1,26),(9722,1,1,27),(9728,1,1,28),(9978,1,1,31),(9968,1,1,32),(9974,1,1,34),(1910,1,1,36),(9980,1,1,38),(11573,1,1,41),(11574,1,1,42),(11575,1,1,44),(11576,1,1,45),(7184,1,1,61),(7181,1,1,62),(7183,1,1,64),(7185,1,1,67),(7186,1,1,68),(1678,1,1,71),(1673,1,1,72),(1675,1,1,74),(1679,1,1,75),(1677,1,1,76),(1681,1,1,78),(1682,1,1,79),(12322,1,1,81),(12309,1,1,82),(12312,1,1,84),(12314,1,1,86),(12317,1,1,87),(12320,1,1,88),(12323,1,1,89),(11580,1,1,91),(11581,1,1,92),(11582,1,1,93),(11583,1,1,94),(10097,1,1,95),(10099,1,1,96),(10103,1,1,97),(10104,1,1,98),(7139,1,1,101),(7134,1,1,102),(7136,1,1,104),(7137,1,1,105),(7138,1,1,106),(7140,1,1,109),(10229,1,1,111),(10201,1,1,112),(10207,1,1,113),(10213,1,1,114),(10219,1,1,115),(10225,1,1,116),(10231,1,1,117),(12518,1,1,121),(12508,1,1,122),(12514,1,1,125),(12520,1,1,126),(11577,1,1,141),(11578,1,1,142),(11579,1,1,144),(2307,1,1,151),(2304,1,1,152),(2306,1,1,153),(2308,1,1,154),(10092,1,1,161),(10093,1,1,162),(10094,1,1,163),(10095,1,1,164),(10096,1,1,165),(1585,1,1,170),(12342,1,1,171),(12331,1,1,172),(12335,1,1,173),(12339,1,1,174),(12343,1,1,178),(10000,1,1,221),(9990,1,1,222),(9996,1,1,223),(10002,1,1,229),(10007,1,1,237),(10011,1,1,238),(10015,1,1,239),(1686,1,1,241),(1685,1,1,242),(1687,1,1,243),(12604,1,1,251),(12566,1,1,252),(12569,1,1,253),(12572,1,1,254),(12575,1,1,255),(12579,1,1,256),(1617,1,1,258),(12525,1,1,262),(12544,1,1,281),(12534,1,1,282),(12540,1,1,283),(12546,1,1,286),(12288,1,1,300),(12290,1,1,301),(11591,1,1,302),(1763,1,1,331),(1762,1,1,332),(1764,1,1,333),(12582,1,1,341),(12584,1,1,342),(12586,1,1,343),(12588,1,1,344),(12600,1,1,351),(12593,1,1,352),(12597,1,1,353),(12601,1,1,354),(12605,1,1,358),(12560,1,1,531),(12553,1,1,532),(12557,1,1,534),(1625,1,1,536),(12561,1,1,538),(12358,1,1,700),(12348,1,1,701),(12354,1,1,702),(12360,1,1,703),(1755,1,1,1001),(1754,1,1,1002),(1756,1,1,1003),(1758,1,1,1004),(1759,1,1,1005),(7146,1,1,1101),(7143,1,1,1102),(7145,1,1,1104),(7147,1,1,1109),(12412,1,1,1181),(12458,1,1,1182),(12417,1,1,1183),(12420,1,1,1184),(12423,1,1,1185),(12427,1,1,1186),(12431,1,1,1187),(12437,1,1,1188),(12434,1,1,1189),(1578,1,1,1201),(1579,1,1,1202),(12454,1,1,1231),(12443,1,1,1232),(12446,1,1,1233),(12449,1,1,1234),(12452,1,1,1235),(12455,1,1,1236),(12459,1,1,1237),(1736,1,1,1251),(12409,1,1,1321),(12326,1,1,1421),(8190,1,1,1791),(8187,1,1,1792),(8191,1,1,1793),(12264,1,1,2401),(12260,1,1,2402),(12266,1,1,2403),(12280,1,1,2411),(12276,1,1,2412),(12282,1,1,2413),(12286,1,1,2414),(1618,1,1,2500),(12370,1,1,2501),(12367,1,1,2503),(12371,1,1,2515),(9610,1,1,5001),(9611,1,1,5002),(12490,1,1,20001),(12474,1,1,20003),(12480,1,1,20004),(12486,1,1,20005),(12492,1,1,20006),(12302,1,1,23001),(12295,1,1,23002),(12299,1,1,23003),(12303,1,1,23004),(7701,1,1,50101),(4984,1,1,50401),(4983,1,1,50402),(4985,1,1,50403),(4987,1,1,50411),(4988,1,1,50412),(4989,1,1,50415),(12498,1,1,55001),(12499,1,1,55002),(3564,1,1,100700),(3565,1,1,100701),(9596,1,1,101051),(9598,1,1,101052),(9600,1,1,101053),(9604,1,1,101060),(9605,1,1,101061),(7177,1,1,101201),(7178,1,1,101202),(10353,1,1,101250),(10355,1,1,101251),(8980,1,1,101261),(8981,1,1,101262),(7616,1,1,101331),(10030,1,1,101701),(10031,1,1,101702),(3582,1,1,102000),(3583,1,1,102001),(9819,1,1,400051),(9823,1,1,400052),(9827,1,1,400053),(9831,1,1,400055),(132,1,2,11),(133,1,2,12),(134,1,2,13),(135,1,2,14),(136,1,2,16),(137,1,2,19),(138,1,2,21),(139,1,2,22),(140,1,2,24),(141,1,2,25),(142,1,2,26),(143,1,2,27),(10359,1,2,31),(145,1,2,32),(10361,1,2,34),(146,1,2,36),(147,1,2,41),(148,1,2,42),(149,1,2,44),(150,1,2,61),(151,1,2,62),(152,1,2,64),(153,1,2,71),(154,1,2,72),(155,1,2,74),(156,1,2,75),(157,1,2,78),(158,1,2,79),(159,1,2,81),(160,1,2,82),(161,1,2,84),(162,1,2,86),(163,1,2,87),(164,1,2,88),(165,1,2,89),(166,1,2,91),(167,1,2,92),(168,1,2,93),(2475,1,2,95),(2476,1,2,96),(2477,1,2,97),(2478,1,2,98),(169,1,2,101),(170,1,2,102),(171,1,2,104),(172,1,2,109),(173,1,2,111),(174,1,2,112),(175,1,2,113),(176,1,2,114),(177,1,2,116),(178,1,2,117),(179,1,2,121),(180,1,2,122),(181,1,2,125),(182,1,2,141),(183,1,2,142),(184,1,2,144),(2479,1,2,151),(2480,1,2,152),(2481,1,2,153),(2482,1,2,154),(185,1,2,161),(186,1,2,162),(187,1,2,163),(188,1,2,164),(189,1,2,165),(190,1,2,170),(2471,1,2,171),(192,1,2,172),(2472,1,2,173),(193,1,2,221),(194,1,2,222),(195,1,2,229),(196,1,2,241),(197,1,2,242),(198,1,2,243),(199,1,2,251),(201,1,2,262),(202,1,2,281),(203,1,2,282),(204,1,2,283),(205,1,2,331),(15072,1,2,510),(2483,1,2,531),(207,1,2,532),(2484,1,2,534),(208,1,2,536),(2473,1,2,700),(210,1,2,701),(211,1,2,702),(2474,1,2,703),(15064,1,2,771),(15057,1,2,772),(15059,1,2,773),(15061,1,2,774),(15063,1,2,775),(15065,1,2,776),(212,1,2,1001),(213,1,2,1002),(214,1,2,1003),(215,1,2,1004),(216,1,2,1005),(217,1,2,1101),(218,1,2,1102),(219,1,2,1104),(220,1,2,1109),(15073,1,2,1121),(15074,1,2,1122),(15075,1,2,1123),(15076,1,2,1124),(15077,1,2,1125),(15078,1,2,1126),(221,1,2,1181),(222,1,2,1182),(223,1,2,1183),(224,1,2,1184),(225,1,2,1185),(226,1,2,1186),(227,1,2,1187),(228,1,2,1188),(229,1,2,1201),(230,1,2,1202),(231,1,2,1231),(232,1,2,1232),(233,1,2,1233),(234,1,2,1234),(235,1,2,1421),(236,1,2,2401),(237,1,2,2402),(238,1,2,2403),(239,1,2,2411),(240,1,2,2412),(241,1,2,2413),(242,1,2,2500),(2470,1,2,2501),(243,1,2,2515),(10363,1,2,20001),(10365,1,2,20003),(10366,1,2,20004),(10367,1,2,20005),(10368,1,2,20006),(15054,1,2,23001),(10362,1,2,50101),(15067,1,2,55001),(15066,1,2,59001),(15068,1,2,63001),(15069,1,2,63002),(15070,1,2,63003),(15071,1,2,63004),(10372,1,2,101250),(1807,1,3,11),(1808,1,3,31),(1809,1,3,36),(1810,1,3,41),(1811,1,3,61),(1812,1,3,71),(1813,1,3,72),(1814,1,3,74),(1815,1,3,75),(1816,1,3,78),(1817,1,3,79),(1818,1,3,91),(1819,1,3,95),(1820,1,3,97),(1821,1,3,111),(1822,1,3,121),(1823,1,3,122),(1824,1,3,125),(1825,1,3,161),(1826,1,3,170),(1827,1,3,171),(1828,1,3,172),(1829,1,3,221),(1830,1,3,222),(1831,1,3,229),(1832,1,3,241),(1833,1,3,242),(1834,1,3,243),(1835,1,3,251),(1836,1,3,255),(1837,1,3,256),(1838,1,3,262),(1839,1,3,281),(1840,1,3,282),(1841,1,3,283),(1842,1,3,331),(1843,1,3,531),(1844,1,3,536),(1845,1,3,700),(1846,1,3,1001),(1847,1,3,1002),(1848,1,3,1003),(1849,1,3,1004),(1850,1,3,1005),(1851,1,3,1181),(1852,1,3,1182),(1853,1,3,1201),(1854,1,3,1202),(1855,1,3,1231),(1856,1,3,2401),(1857,1,3,2402),(1858,1,3,2403),(1859,1,3,2411),(1860,1,3,2412),(1861,1,3,2413),(1862,1,3,2500),(1863,1,3,2515),(8026,1,4,11),(8027,1,4,21),(8028,1,4,31),(8029,1,4,41),(8030,1,4,61),(8031,1,4,71),(8032,1,4,72),(8033,1,4,74),(8034,1,4,75),(8035,1,4,78),(8036,1,4,79),(8037,1,4,81),(8038,1,4,91),(8039,1,4,95),(8040,1,4,97),(8041,1,4,101),(8042,1,4,111),(8043,1,4,121),(8044,1,4,151),(8045,1,4,161),(8046,1,4,171),(8047,1,4,221),(8048,1,4,222),(8049,1,4,229),(8050,1,4,241),(8051,1,4,242),(8052,1,4,243),(8146,1,4,251),(8147,1,4,253),(8053,1,4,262),(8054,1,4,281),(8055,1,4,331),(8056,1,4,341),(8057,1,4,342),(8058,1,4,343),(8059,1,4,344),(8060,1,4,531),(8061,1,4,700),(8062,1,4,1001),(8063,1,4,1002),(8064,1,4,1003),(8065,1,4,1004),(8066,1,4,1005),(8067,1,4,1101),(8068,1,4,1181),(8069,1,4,1182),(8070,1,4,1201),(8071,1,4,1202),(8072,1,4,1231),(8073,1,4,2401),(8074,1,4,2501),(8075,1,4,2503),(8076,1,4,2515),(8077,1,4,20001),(8078,1,4,50101),(8079,1,4,101201),(8080,1,4,101261),(8081,1,4,102000),(8082,1,4,400051),(8083,1,4,400052),(8084,1,4,400053),(8085,1,4,400055),(12608,1,10,11),(12609,1,10,21),(12610,1,10,31),(12611,1,10,41),(12612,1,10,61),(12613,1,10,71),(12614,1,10,72),(12615,1,10,74),(12616,1,10,75),(12617,1,10,78),(12618,1,10,79),(12619,1,10,81),(12620,1,10,91),(12621,1,10,95),(12622,1,10,97),(12623,1,10,101),(12624,1,10,111),(12625,1,10,121),(12626,1,10,151),(12627,1,10,161),(12628,1,10,171),(12629,1,10,221),(12630,1,10,222),(12631,1,10,229),(12632,1,10,241),(12633,1,10,242),(12634,1,10,243),(12635,1,10,262),(12636,1,10,281),(12637,1,10,300),(12638,1,10,331),(12639,1,10,341),(12640,1,10,342),(12641,1,10,343),(12642,1,10,344),(12643,1,10,531),(12644,1,10,700),(12645,1,10,1001),(12646,1,10,1002),(12647,1,10,1003),(12648,1,10,1004),(12649,1,10,1005),(12650,1,10,1101),(12651,1,10,1181),(12652,1,10,1182),(12653,1,10,1201),(12654,1,10,1202),(12655,1,10,1231),(12656,1,10,2401),(12657,1,10,2501),(12658,1,10,2503),(12659,1,10,2515),(12660,1,10,20001),(12662,1,10,23001),(12663,1,10,50101),(12664,1,11,11),(12665,1,11,21),(12666,1,11,31),(12667,1,11,41),(12668,1,11,61),(12669,1,11,71),(12670,1,11,72),(12671,1,11,74),(12672,1,11,75),(12673,1,11,78),(12674,1,11,79),(12675,1,11,81),(12676,1,11,91),(12677,1,11,95),(12678,1,11,97),(12679,1,11,101),(12680,1,11,111),(12681,1,11,121),(12682,1,11,151),(12683,1,11,161),(12684,1,11,171),(12685,1,11,221),(12686,1,11,222),(12687,1,11,229),(12688,1,11,241),(12689,1,11,242),(12690,1,11,243),(12691,1,11,262),(12692,1,11,281),(12693,1,11,300),(12694,1,11,331),(12695,1,11,341),(12696,1,11,342),(12697,1,11,343),(12698,1,11,344),(12699,1,11,531),(12700,1,11,700),(12701,1,11,1001),(12702,1,11,1002),(12703,1,11,1003),(12704,1,11,1004),(12705,1,11,1005),(12706,1,11,1101),(12707,1,11,1181),(12708,1,11,1182),(12709,1,11,1201),(12710,1,11,1202),(12711,1,11,1231),(12712,1,11,2401),(12713,1,11,2501),(12714,1,11,2503),(12715,1,11,2515),(12716,1,11,20001),(12718,1,11,23001),(12719,1,11,50101),(19936,1,12,11),(19928,1,12,12),(19929,1,12,13),(19930,1,12,14),(19931,1,12,15),(19934,1,12,16),(19937,1,12,19),(14146,1,12,21),(14135,1,12,22),(14137,1,12,24),(14139,1,12,25),(14142,1,12,26),(14145,1,12,27),(14148,1,12,28),(14930,1,12,31),(14926,1,12,32),(14929,1,12,34),(14932,1,12,38),(13816,1,12,41),(13813,1,12,42),(13815,1,12,44),(13817,1,12,45),(14094,1,12,61),(14091,1,12,62),(14093,1,12,64),(14095,1,12,67),(14096,1,12,68),(16203,1,12,71),(16198,1,12,72),(16200,1,12,74),(16204,1,12,75),(16202,1,12,76),(16206,1,12,78),(16207,1,12,79),(19893,1,12,81),(19888,1,12,82),(19889,1,12,84),(19890,1,12,86),(19891,1,12,87),(19892,1,12,88),(19894,1,12,89),(15401,1,12,91),(15397,1,12,92),(15400,1,12,93),(15403,1,12,94),(13990,1,12,95),(12734,1,12,97),(19241,1,12,101),(19237,1,12,102),(19238,1,12,104),(19239,1,12,105),(19240,1,12,106),(19242,1,12,109),(15390,1,12,111),(15377,1,12,112),(15380,1,12,113),(15383,1,12,114),(15386,1,12,115),(15389,1,12,116),(15392,1,12,117),(20007,1,12,121),(20002,1,12,122),(20005,1,12,125),(20008,1,12,126),(13821,1,12,141),(13820,1,12,142),(13822,1,12,144),(13912,1,12,151),(13909,1,12,152),(13911,1,12,153),(13913,1,12,154),(14063,1,12,161),(14056,1,12,162),(14058,1,12,163),(14060,1,12,164),(14062,1,12,165),(14064,1,12,167),(13350,1,12,171),(13345,1,12,172),(13347,1,12,173),(13349,1,12,174),(13351,1,12,178),(13838,1,12,221),(13834,1,12,222),(13837,1,12,223),(13840,1,12,229),(13842,1,12,237),(13844,1,12,238),(13846,1,12,239),(13516,1,12,241),(13515,1,12,242),(13517,1,12,243),(20049,1,12,251),(20030,1,12,252),(20032,1,12,253),(20033,1,12,254),(20035,1,12,255),(20037,1,12,256),(20009,1,12,262),(20019,1,12,281),(20014,1,12,282),(20017,1,12,283),(20020,1,12,286),(19877,1,12,300),(19878,1,12,301),(16194,1,12,331),(16193,1,12,332),(16195,1,12,333),(20038,1,12,341),(20039,1,12,342),(20040,1,12,343),(20041,1,12,344),(20047,1,12,351),(20044,1,12,352),(20046,1,12,353),(20048,1,12,354),(20050,1,12,358),(19249,1,12,430),(16384,1,12,501),(16378,1,12,502),(13865,1,12,510),(19996,1,12,511),(19991,1,12,512),(19993,1,12,514),(19995,1,12,517),(19997,1,12,519),(15291,1,12,520),(15286,1,12,522),(15288,1,12,524),(15290,1,12,525),(15292,1,12,527),(20026,1,12,531),(20023,1,12,532),(20025,1,12,534),(20027,1,12,538),(20076,1,12,561),(20073,1,12,562),(20075,1,12,563),(20077,1,12,564),(16932,1,12,650),(16931,1,12,651),(16933,1,12,652),(17124,1,12,660),(17123,1,12,661),(17125,1,12,662),(13358,1,12,700),(19902,1,12,701),(19900,1,12,702),(19903,1,12,703),(20061,1,12,750),(20060,1,12,751),(20062,1,12,752),(19922,1,12,771),(19911,1,12,772),(19913,1,12,773),(15085,1,12,774),(19915,1,12,775),(19917,1,12,776),(19919,1,12,777),(19921,1,12,778),(19923,1,12,779),(14917,1,12,1001),(14916,1,12,1002),(14918,1,12,1003),(14920,1,12,1004),(14921,1,12,1005),(19247,1,12,1101),(19245,1,12,1102),(19246,1,12,1104),(19248,1,12,1109),(19233,1,12,1121),(19226,1,12,1122),(19228,1,12,1123),(19230,1,12,1124),(19232,1,12,1125),(19234,1,12,1126),(19940,1,12,1181),(19954,1,12,1182),(19943,1,12,1183),(19944,1,12,1184),(19946,1,12,1185),(19948,1,12,1186),(19950,1,12,1187),(19953,1,12,1188),(19951,1,12,1189),(19955,1,12,1191),(13827,1,12,1201),(13828,1,12,1202),(19963,1,12,1231),(19958,1,12,1232),(19959,1,12,1233),(19961,1,12,1234),(19962,1,12,1235),(19964,1,12,1236),(16302,1,12,1237),(13829,1,12,1251),(19938,1,12,1321),(19939,1,12,1322),(19895,1,12,1421),(19866,1,12,2401),(19864,1,12,2402),(19867,1,12,2403),(19874,1,12,2411),(19872,1,12,2412),(19875,1,12,2413),(19876,1,12,2414),(19907,1,12,2501),(19906,1,12,2503),(19908,1,12,2515),(20082,1,12,3200),(20081,1,12,3301),(15435,1,12,5001),(15436,1,12,5002),(20056,1,12,10001),(20053,1,12,10002),(20055,1,12,10003),(20057,1,12,10005),(19976,1,12,20001),(19967,1,12,20002),(19969,1,12,20003),(19973,1,12,20004),(19975,1,12,20005),(19977,1,12,20006),(19971,1,12,20007),(19884,1,12,23001),(19881,1,12,23002),(19883,1,12,23003),(19885,1,12,23004),(19019,1,12,50101),(20028,1,12,50151),(19848,1,12,50401),(19856,1,12,50411),(19851,1,12,50412),(19853,1,12,50414),(19855,1,12,50415),(19857,1,12,50418),(19858,1,12,50420),(19859,1,12,50430),(19847,1,12,50440),(19979,1,12,55001),(19980,1,12,55002),(16740,1,12,56001),(16737,1,12,56002),(16739,1,12,56003),(16741,1,12,56004),(16742,1,12,56005),(20078,1,12,59001),(20079,1,12,59002),(20080,1,12,59003),(19987,1,12,63001),(19984,1,12,63002),(19986,1,12,63003),(19988,1,12,63004),(19981,1,12,64001),(17328,1,12,101130),(17327,1,12,101131),(17329,1,12,101132),(16009,1,12,101331),(16010,1,12,101332),(16011,1,12,101333),(19208,1,12,101701),(19209,1,12,101702),(20069,1,12,941601),(20065,1,12,941602),(20066,1,12,941603),(20067,1,12,941604),(20068,1,12,941605),(20070,1,12,941606),(12776,1,13,11),(12777,1,13,21),(12778,1,13,31),(12779,1,13,41),(12780,1,13,61),(12781,1,13,71),(12782,1,13,72),(12783,1,13,74),(12784,1,13,75),(12785,1,13,78),(12786,1,13,79),(12787,1,13,81),(12788,1,13,91),(12789,1,13,95),(12790,1,13,97),(12791,1,13,101),(12792,1,13,111),(12793,1,13,121),(12794,1,13,151),(12795,1,13,161),(12796,1,13,171),(12797,1,13,221),(12798,1,13,222),(12799,1,13,229),(12800,1,13,241),(12801,1,13,242),(12802,1,13,243),(12803,1,13,262),(12804,1,13,281),(12805,1,13,300),(12806,1,13,331),(12807,1,13,341),(12808,1,13,342),(12809,1,13,343),(12810,1,13,344),(12811,1,13,531),(12812,1,13,700),(12813,1,13,1001),(12814,1,13,1002),(12815,1,13,1003),(12816,1,13,1004),(12817,1,13,1005),(12818,1,13,1101),(12819,1,13,1181),(12820,1,13,1182),(12821,1,13,1201),(12822,1,13,1202),(12823,1,13,1231),(12824,1,13,2401),(12825,1,13,2501),(12826,1,13,2503),(12827,1,13,2515),(12828,1,13,20001),(12830,1,13,23001),(12831,1,13,50101),(12832,1,14,11),(12833,1,14,21),(12834,1,14,31),(12835,1,14,41),(12836,1,14,61),(12837,1,14,71),(12838,1,14,72),(12839,1,14,74),(12840,1,14,75),(12841,1,14,78),(12842,1,14,79),(12843,1,14,81),(12844,1,14,91),(12845,1,14,95),(12846,1,14,97),(12847,1,14,101),(12848,1,14,111),(12849,1,14,121),(12850,1,14,151),(12851,1,14,161),(12852,1,14,171),(12853,1,14,221),(12854,1,14,222),(12855,1,14,229),(12856,1,14,241),(12857,1,14,242),(12858,1,14,243),(12859,1,14,262),(12860,1,14,281),(12861,1,14,300),(12862,1,14,331),(12863,1,14,341),(12864,1,14,342),(12865,1,14,343),(12866,1,14,344),(12867,1,14,531),(12868,1,14,700),(12869,1,14,1001),(12870,1,14,1002),(12871,1,14,1003),(12872,1,14,1004),(12873,1,14,1005),(12874,1,14,1101),(12875,1,14,1181),(12876,1,14,1182),(12877,1,14,1201),(12878,1,14,1202),(12879,1,14,1231),(12880,1,14,2401),(12881,1,14,2501),(12882,1,14,2503),(12883,1,14,2515),(12884,1,14,20001),(12886,1,14,23001),(12887,1,14,50101),(12944,1,16,11),(12945,1,16,21),(12946,1,16,31),(13056,1,16,41),(13057,1,16,42),(13058,1,16,44),(13059,1,16,45),(12948,1,16,61),(12949,1,16,71),(12950,1,16,72),(12951,1,16,74),(12952,1,16,75),(12953,1,16,78),(12954,1,16,79),(12955,1,16,81),(12956,1,16,91),(12957,1,16,95),(12958,1,16,97),(12959,1,16,101),(12960,1,16,111),(12961,1,16,121),(13060,1,16,141),(13061,1,16,142),(13062,1,16,144),(12962,1,16,151),(12963,1,16,161),(12964,1,16,171),(12965,1,16,221),(12966,1,16,222),(12967,1,16,229),(12968,1,16,241),(12969,1,16,242),(12970,1,16,243),(13128,1,16,251),(13064,1,16,262),(12972,1,16,281),(12973,1,16,300),(12974,1,16,331),(12975,1,16,341),(12976,1,16,342),(12977,1,16,343),(12978,1,16,344),(12979,1,16,531),(12980,1,16,700),(12981,1,16,1001),(12982,1,16,1002),(12983,1,16,1003),(12984,1,16,1004),(12985,1,16,1005),(12986,1,16,1101),(12987,1,16,1181),(12988,1,16,1182),(12989,1,16,1201),(12990,1,16,1202),(12991,1,16,1231),(12992,1,16,2401),(12993,1,16,2501),(12994,1,16,2503),(12995,1,16,2515),(12996,1,16,20001),(12998,1,16,23001),(12999,1,16,50101),(13000,1,17,11),(13001,1,17,21),(13002,1,17,31),(13065,1,17,41),(13066,1,17,42),(13067,1,17,44),(13068,1,17,45),(13004,1,17,61),(13005,1,17,71),(13006,1,17,72),(13007,1,17,74),(13008,1,17,75),(13009,1,17,78),(13010,1,17,79),(13011,1,17,81),(13012,1,17,91),(13013,1,17,95),(13014,1,17,97),(13015,1,17,101),(13016,1,17,111),(13017,1,17,121),(13069,1,17,141),(13070,1,17,142),(13071,1,17,144),(13018,1,17,151),(13019,1,17,161),(13020,1,17,171),(13021,1,17,221),(13022,1,17,222),(13023,1,17,229),(13024,1,17,241),(13025,1,17,242),(13026,1,17,243),(13028,1,17,281),(13029,1,17,300),(13030,1,17,331),(13031,1,17,341),(13032,1,17,342),(13033,1,17,343),(13034,1,17,344),(13035,1,17,531),(13036,1,17,700),(13037,1,17,1001),(13038,1,17,1002),(13039,1,17,1003),(13040,1,17,1004),(13041,1,17,1005),(13042,1,17,1101),(13043,1,17,1181),(13044,1,17,1182),(13045,1,17,1201),(13046,1,17,1202),(13047,1,17,1231),(13048,1,17,2401),(13049,1,17,2501),(13050,1,17,2503),(13051,1,17,2515),(13052,1,17,20001),(13054,1,17,23001),(13055,1,17,50101),(14504,1,18,11),(14505,1,18,21),(14506,1,18,31),(14507,1,18,41),(14508,1,18,61),(14509,1,18,71),(14510,1,18,78),(14511,1,18,81),(14512,1,18,91),(14513,1,18,95),(14514,1,18,101),(14515,1,18,111),(14516,1,18,121),(14517,1,18,151),(14518,1,18,161),(14519,1,18,221),(14520,1,18,241),(14521,1,18,262),(14522,1,18,281),(14523,1,18,300),(14524,1,18,331),(14525,1,18,332),(14526,1,18,333),(14527,1,18,341),(14528,1,18,342),(14529,1,18,343),(14530,1,18,344),(14531,1,18,531),(14532,1,18,701),(14533,1,18,771),(14534,1,18,774),(14535,1,18,1001),(14536,1,18,1004),(14537,1,18,1101),(14538,1,18,1181),(14539,1,18,1182),(14540,1,18,1201),(14541,1,18,1231),(14542,1,18,2401),(14543,1,18,2501),(14544,1,18,2503),(14545,1,18,2515),(14546,1,18,20001),(14548,1,18,50101),(14549,1,18,59001),(15242,1,19,21),(15243,1,19,31),(15244,1,19,41),(15245,1,19,61),(15246,1,19,71),(15247,1,19,78),(15248,1,19,81),(15249,1,19,101),(15250,1,19,121),(15251,1,19,151),(15252,1,19,161),(15253,1,19,221),(15254,1,19,241),(15255,1,19,262),(15256,1,19,281),(15257,1,19,300),(15258,1,19,331),(15259,1,19,332),(15260,1,19,341),(15261,1,19,342),(15262,1,19,343),(15263,1,19,344),(15264,1,19,531),(15265,1,19,701),(15266,1,19,771),(15267,1,19,774),(15268,1,19,777),(15269,1,19,1001),(15270,1,19,1004),(15271,1,19,1101),(15272,1,19,1121),(15273,1,19,1181),(15274,1,19,1182),(15275,1,19,1201),(15276,1,19,1231),(15277,1,19,2401),(15278,1,19,2501),(15279,1,19,20001),(15281,1,19,50101),(15282,1,19,59001),(15283,1,19,63001);
 /*!40000 ALTER TABLE `llx_user_rights` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_user_twofactorauth_webauthn`
+--
+
+DROP TABLE IF EXISTS `llx_user_twofactorauth_webauthn`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_user_twofactorauth_webauthn` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_user` int(11) NOT NULL,
+  `label` varchar(64) CHARACTER SET utf8mb4 NOT NULL,
+  `webauthnkey` text CHARACTER SET utf8mb4 NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_tfa_label_fk_user` (`fk_user`,`label`),
+  CONSTRAINT `fk_tfa_fk_user` FOREIGN KEY (`fk_user`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_user_twofactorauth_webauthn`
+--
+
+LOCK TABLES `llx_user_twofactorauth_webauthn` WRITE;
+/*!40000 ALTER TABLE `llx_user_twofactorauth_webauthn` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_user_twofactorauth_webauthn` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_usergroup`
 --
@@ -13212,9 +15375,10 @@ CREATE TABLE `llx_website` (
   `use_manifest` int(11) DEFAULT NULL,
   `lang` varchar(8) COLLATE utf8_unicode_ci DEFAULT NULL,
   `otherlang` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `position` int(11) DEFAULT 0,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_website_ref` (`ref`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -13223,7 +15387,7 @@ CREATE TABLE `llx_website` (
 
 LOCK TABLES `llx_website` WRITE;
 /*!40000 ALTER TABLE `llx_website` DISABLE KEYS */;
-INSERT INTO `llx_website` VALUES (2,1,'mywebsite','My web site',1,4,'','2019-10-08 20:55:48',NULL,'2019-11-28 12:02:46',12,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,1,'mypersonalsite','My personal web site',1,11,NULL,'2019-10-08 20:57:59',NULL,'2020-01-09 15:59:24',12,12,NULL,NULL,NULL,0,NULL,NULL);
+INSERT INTO `llx_website` VALUES (2,1,'mywebsite','My web site',1,4,'','2019-10-08 20:55:48',NULL,'2019-11-28 12:02:46',12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(3,1,'mypersonalsite','My personal web site',1,11,NULL,'2019-10-08 20:57:59',NULL,'2020-01-09 15:59:24',12,12,NULL,NULL,NULL,0,NULL,NULL,0),(4,1,'template-stellar','',1,23,'','2020-12-10 13:25:34',NULL,'2020-12-10 12:27:17',12,NULL,NULL,NULL,NULL,NULL,'en','',0),(5,1,'template-corporate','',1,11,'','2020-12-10 13:25:55',NULL,'2020-12-10 12:26:50',12,NULL,NULL,NULL,NULL,NULL,'en','',0);
 /*!40000 ALTER TABLE `llx_website` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -13283,10 +15447,13 @@ CREATE TABLE `llx_website_page` (
   `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
   `image` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `author_alias` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `allowed_in_frames` int(11) DEFAULT 0,
+  `object_type` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_object` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_website_page_url` (`fk_website`,`pageurl`),
   CONSTRAINT `fk_website_page_website` FOREIGN KEY (`fk_website`) REFERENCES `llx_website` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=26 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -13295,6 +15462,7 @@ CREATE TABLE `llx_website_page` (
 
 LOCK TABLES `llx_website_page` WRITE;
 /*!40000 ALTER TABLE `llx_website_page` DISABLE KEYS */;
+INSERT INTO `llx_website_page` VALUES (1,5,'blog','','Blog','Blog','blog','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">The latest news...</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionnews\" contenteditable=\"true\" class=\"section-50 section-md-50 section-md-bottom-50\">\n            <div><br><div class=\"text-align: center\">\n            <!--<h2>The latest news...</h2><br><br><br> -->\n            <?php \n            $weblangs->load(\"main\");\n            $fuser = new User($db);\n            $arrayofblogs = $websitepage->fetchAll($website->id, \'DESC\', \'date_creation\', 5, 0, array(\'type_container\'=>\'blogpost\', \'status\'=>1, \'lang\'=>\'null,\'.$websitepage->lang));\n            foreach($arrayofblogs as $blog)\n            {\n                print \'<div class=\"row justify-content-sm-center row-40\">\';\n                print \'<div class=\"container blog-box d-xl-inline-block margin-lr-30\" style=\"padding: 20px; box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;\">\';\n                            print \'<a class=\"centpercent\" href=\"\'.$blog->pageurl.\'.php\">\';\n                            print \'<div class=\"post-boxed-img-wrap\"><img src=\"\'.($blog->image ? \'viewimage.php?modulepart=medias&file=\'.str_replace(\'template-corporate\', $website->ref, $blog->image) : \'medias/image/\'.$website->ref.\'/calendar.svg\"\').\'\" alt=\"\" width=\"120\"></div>\';\n                            print \'<div class=\"post-boxed-caption\">\';\n                            print \'<div class=\"post-boxed-title font-weight-bold\">\'.$blog->title.\'</div>\';\n                            print \'<ul class=\"list-inline list-inline-dashed text-uppercase\">\';\n                            print \'<li>\'.dol_print_date($blog->date_creation, \'daytext\', \'tzserver\', $weblangs).\'</li>\';\n                            $fuser->fetch($blog->fk_user_creat);\n                            print \'<li><span>by<span> <span class=\"text-primary\">\'.$fuser->firstname.\'</span></span></li>\';\n                            print \'</ul>\';\n                            print \'<span class=\"nohover\">\'.$blog->description.\'</span>\';\n                            print \'</div>\';\n                            //includeContainer($blog->pageurl);\n                            print \'</a>\';\n                print \'</div>\';\n                print \'</div>\';\n            }\n            ?>\n            </div></div>\n        </section>\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(2,5,'blog-our-company-is-now-on-dolibarr','','Our company is now on Dolibarr ERP CRM','Our company has moved on Dolibarr ERP CRM. This is an important step in improving all of our services.','','<?php includeContainer(\'header\'); ?>\n\n      <?php print getStructuredData(\'blogpost\', $websitepage); ?>\n      \n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\" style=\"font-size: 2em\"><?php echo $websitepage->title; ?></span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n        <div class=\"container\" contenteditable=\"true\">\n            <br><br><br>\n            Like several thousands of companies, our company (<?php echo $mysoc->name ?>) has moved all its information system to <a href=\"https://www.dolibarr.org\">Dolibarr ERP CRM</a>. More than 20 applications have been replaced by only one, easier to use and fully integrated.\n            This is an important step in improving all of our services.\n            \n            <br><br><br>\n            \n            <figure>\n            <img src=\"/viewimage.php?modulepart=medias&file=image/template-corporate/background_dolibarr.jpg\">\n            <br><br>\n            <figcaption style=\"opacity: 0.5; text-align: center;\">Screenshot of our new Open Source solution</figcaption>\n            </figure>\n            \n            \n            \n            <br><br><br><br><br><br>\n        </div>\n\n\n<?php includeContainer(\'footer\'); ?>\n\n\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'blogpost','en',NULL,'','',NULL,'image/template-corporate/background_dolibarr.jpg','',0,NULL,NULL),(3,5,'blog-our-new-web-site-has-been-launched','','Our new web site has been launched','Our new website, based on Dolibarr CMS, has been launched. Modern and directly integrated with the internal management tools of the company, many new online services for our customers will be able to see the day...','','<?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\" style=\"font-size: 2em\"><?php echo $websitepage->title; ?></span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n        <div class=\"container\">\n            <br><br><br><br><br><br>\n\n\n            Our new website, based on Dolibarr CMS, has been launched. <br>\n            Now it is modern and directly integrated with the internal management tools of the company. Many new online services will be available for our customers...\n\n            \n                        <br><br><br>\n            \n            <figure>\n            <img src=\"/viewimage.php?modulepart=medias&file=image/template-corporate/background_rough-horn.jpg\">\n            <br><br>\n            <figcaption style=\"opacity: 0.5; text-align: center;\">Theme of our new web site</figcaption>\n            </figure>\n            \n\n            <br><br><br><br><br><br>\n        </div>\n\n\n<?php includeContainer(\'footer\'); ?>\n\n\n\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'blogpost','en',NULL,'','',NULL,'image/template-corporate/background_rough-horn.jpg','',0,NULL,NULL),(4,5,'careers','','Careers','Our job opportunities','career','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Job opportunities</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div style=\"margin: 50px\"><div class=\"text-align: center\">\n            <br>\n\n            <h2 style=\"margin-left: 10px; margin-right: 10px\">We are currently recruiting the following profiles...</h2><br><br> \n            \n            <section id=\"sectionnews\" contenteditable=\"false\" class=\"section-50 section-md-50 section-md-bottom-50\">\n            <?php\n            include_once DOL_DOCUMENT_ROOT.\'/recruitment/class/recruitmentjobposition.class.php\';\n            $jobposition = new RecruitmentJobPosition($db);\n            $fuser = new User($db);\n            $arrayofrecord = $jobposition->fetchAll(\'DESC\', \'date_creation\', 5, 0, array(\'status\'=>\'1,3,9\'));\n            $weblangs->load(\"main\");\n            foreach($arrayofrecord as $jobrecord)\n            {\n                print \'<div class=\"row justify-content-sm-center row-40\">\';\n                print \'<div class=\"container blog-box d-xl-inline-block\" style=\"box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;\">\';\n                            //print \'<a href=\"/public/recruitment/view.php?id=\'.$jobrecord->id.\'.php\">\';\n                            //print \'<div class=\"post-boxed-img-wrap\"><img src=\"\'.($blog->image ? \'viewimage.php?modulepart=medias&file=\'.$blog->image : \'medias/image/\'.$website->ref.\'/calendar.svg\"\').\'\" alt=\"\" width=\"120\"></div>\';\n                            print \'<div class=\"post-boxed-caption\">\';\n                            print \'<div class=\"post-boxed-title font-weight-bold\">\'.$jobrecord->label.\'</div>\';\n                            print \'<ul class=\"list-inline list-inline-dashed\">\';\n                            print \'<li><span class=\"text-primary\">\'.dol_print_date($jobrecord->date_creation, \'daytext\', \'tzserver\', $weblangs).\'</span></li>\';\n                            //$fuser->fetch($jobrecord->fk_user_recruitment);\n                            //print \'<li><span>par<span> <span class=\"text-primary\">\'.$fuser->firstname.\'</span></span></li>\';\n                            //print \'<li><span>Contact:<span> <span class=\"text-primary\">Laurent Destailleur - job@nltechno.com</span></span></li>\';\n                            print \'</ul>\';\n                            print \'</div>\';\n\n                            print \'<div class=\"left\" style=\"line-height: 1.5em; margin-top: 30px; margin-left: 20px; margin-right: 20px\">\';\n                            //includeContainer($blog->pageurl);\n                            \n                            if ($jobrecord->status == RecruitmentJobPosition::STATUS_RECRUITED) {\n                                $langs->load(\'recruitment\');\n                            	print info_admin($langs->trans(\"JobClosedTextCandidateFound\"), 0, 0, 0, \'warning\');\n                            	print \'<br>\';\n                            }\n                            if ($jobrecord->status == RecruitmentJobPosition::STATUS_CANCELED) {\n                                $langs->load(\'recruitment\');\n	                            print info_admin($langs->trans(\"JobClosedTextCanceled\"), 0, 0, 0, \'warning\');\n	                            print \'<br>\';\n                            }\n\n\n                            print \'<span class=\"nohover\">\'.$jobrecord->description.\'</span>\';\n                            \n                            print \'<br><br><span>Contact:<span> <span class=\"text-primary\">Laurent Destailleur - \'.$jobrecord->email_recruiter.\'</span></span>\';\n                            \n                            print \'</div>\';\n                            //print \'</a>\';\n                print \'</div>\';\n                print \'</div>\';\n            }\n            ?>\n            </section>\n            </div></div>\n        </section>\n\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(5,5,'carriere','','Carrière','Nos opportunités professionnelles','career','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Offres d\'emploi</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div style=\"margin: 50px\"><div class=\"text-align: center\">\n<br>\n<br>\n<br>\nNous n\'avons pas d\'offres d\'emploi ouvertes en ce moment...<br>\n<br>\n<br>\n<br>\n<br>\n            </div></div>\n        </section>\n\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','fr',NULL,'','',NULL,'','',0,NULL,NULL),(6,5,'clients-testimonials','','Clients Testimonials','Client Testimonials','testimonials, use cases, success story','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Testimonials</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n      <div class=\"center\">\n      <br><br>\n      <h1 class=\"text-center\">What they say <span class=\"text-thin\">about us</span></h1>\n      <br><br><br><br>\n      Send us your testimonial (by email to <a href=\"mailto:<?php echo $mysoc->email; ?>\"><?php echo $mysoc->email; ?></a>)\n      <br><br><br><br>\n      <br><br>\n      </div>\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(7,5,'contact','','Contact','Privacy Policies','Contact','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Contact</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div style=\"margin: 50px; text-align: center\">\n<h2>Contact us:</h2> <br> <br> \n<span class=\"fa fa-envelope-o\"></span> <?php echo $mysoc->email ?><br>\n<span class=\"fa fa-address-card-o\"></span> <?php echo $mysoc->getFullAddress() ?><br>\n            </div>\n        </section>\n\n\n        <!-- Google MAPS -->\n        <center><div class=\"mapouter\"><div class=\"gmap_canvas\"><iframe width=\"600\" height=\"500\" id=\"gmap_canvas\" src=\"https://maps.google.com/maps?q=<?php echo urlencode($mysoc->getFullAddress()); ?>&t=&z=13&ie=UTF8&iwloc=&output=embed\" frameborder=\"0\" scrolling=\"no\" marginheight=\"0\" marginwidth=\"0\"></iframe>\n        </div>\n        <style>.mapouter{text-align:right;height:500px;width:600px;}.gmap_canvas {overflow:hidden;background:none!important;height:500px;width:600px;}</style>\n        </div></center>\n\n    <br><br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(8,5,'faq','','FAQ','Frequently Asked Questions','faq','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">FAQs</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div class=\"container\">\n<div class=\"text-align: center\"><br><br><h2>Frequently Asked Questions</h2></div>\n<br>\n<br>\n<br>\n<h4>How can I contact you ?</h4><br>\nYou can contact us by using <a href=\"contact.php\">this page</a>.\n<br>\n<br>\n<br>\n<h4>What is your privacy policy ?</h4><br>\nYou may find information about our privacy policy on <a href=\"privacy-policies.php\">this page</a>.\n\n\n<br><br><br><br>\n\n            </div>\n        </section>\n\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(9,5,'footer','','Footer','Footer','','<!-- At least 2 div required to avoid ckeditor to insert a p -->\n<div class=\"dolcontenteditable\" contenteditable=\"true\">      \n\n    <footer class=\"page-foot bg-cape-cod context-dark\">\n        <section id=\"sectionfooter\" contenteditable=\"true\" class=\"section-40\">\n          <div class=\"container\">\n            <div class=\"row justify-content-sm-center\">\n              <div class=\"col-sm-9 col-md-12 col-xl-12\">\n                <div class=\"row row-50\">\n                  \n                  <div class=\"col-md-6 col-lg-4 col-xl-4\">\n                    <h4 class=\"text-small-16 text-uppercase footer-title\">Product and Services</h4>\n                    <div class=\"row\" style=\"padding-right: 20px\">\n                      <div class=\"col-6\">\n                        <ul class=\"list-marked-variant-2\">\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"product-p.php\">Product P</a></li>\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"service-s.php\">Service S</a></li>\n                        </ul>\n                      </div>\n                      <div class=\"col-6\">\n                        <ul class=\"list-marked-variant-2\">\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"pricing.php\">Prices</a></li>\n                        </ul>\n                      </div>\n                    </div>\n                  </div>\n\n                  <div class=\"col-md-6 col-lg-4 col-xl-4\">\n                    <h4 class=\"text-small-16 text-uppercase footer-title\">Quick links</h4>\n                    <div class=\"row\" style=\"padding-right: 20px\">\n                      <div class=\"col-6\">\n                        <ul class=\"list-marked-variant-2\">\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"home.php\">Home</a></li>\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"blog.php\">Blog</a></li>\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"search.php\">Search</a></li>\n                        </ul>\n                      </div>\n                      <div class=\"col-6\">\n                        <ul class=\"list-marked-variant-2\">\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"contact.php\">Contacts</a></li>\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"privacy-policies.php\">Privacy policies</a></li>\n                        </ul>\n                        <?php // echo $website->componentSelectLang(\'auto\', $weblangs, \'margin-top-10\'); ?>\n                      </div>\n                    </div>\n                  </div>\n                  \n                  <div class=\"col-md-6 col-lg-4 col-xl-4\">\n                    <h4 class=\"text-small-16 text-uppercase footer-title\">Contact us</h4>\n                    <address class=\"contact-info text-left\">\n                      <div class=\"unit unit-horizontal unit-spacing-md align-items-center\">\n                        <div class=\"unit-left\"><span class=\"icon text-white fa fa-phone\"></span></div>\n                        <div class=\"unit-body\"><a class=\"link-white\" href=\"callto:<?php echo $mysoc->phone; ?>\"><?php echo $mysoc->phone; ?></a></div>\n                      </div>\n                      <div class=\"unit unit-horizontal unit-spacing-md align-items-center\">\n                        <div class=\"unit-left\"><span class=\"icon text-white fa fa-envelope-o\"></span></div>\n                        <div class=\"unit-body\"><a class=\"link-white\" href=\"mailto:<?php echo $mysoc->email; ?>\"><?php echo $mysoc->email; ?></a></div>\n                      </div>\n                      <div class=\"unit unit-horizontal unit-spacing-md\">\n                        <div class=\"unit-left\"><span class=\"icon text-white fa fa-address-card-o\"></span></div>\n                        <div class=\"unit-body\"><span class=\"link-white\"><?php echo $mysoc->getFullAddress(1, \'<br>\', 1); ?></span></div>\n                      </div>\n                    </address>\n                    <div class=\"group-sm group-middle\">\n                      <p class=\"font-italic text-white\">Follow Us:</p>\n                      <ul class=\"list-inline\">\n                          <?php foreach($mysoc->socialnetworks as $key => $value) {\n                            print \'<li><a class=\"icon icon-xxs-smallest\" href=\"\'.(preg_match(\'/^http/\', $value) ? $value : \'https://www.\'.$key.\'.com/\'.$value).\'\"><span class=\"fab fa-\'.$key.\'\" style=\"margin-left: 5px; font-size: 1.6em\"></span></a></li>\';\n                          } ?>\n                      </ul>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n          </div>\n        </section>\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div class=\"center\">\n            Website generated and powered by <a href=\"https://www.dolibarr.org\" target=\"CRM and ERP for freelances, association and companies\">Dolibarr ERP & CRM</a>\n            </div>\n        </section>\n        \n      </footer>\n      \n      <!--<a href=\"#\" id=\"ui-to-top\" class=\"ui-to-top\"><span class=\"fa fa-angle-up\" style=\"color: #fff; font-size: 1.9em;\"></span></a>-->\n\n</div>\n\n\n<script src=\"/document.php?modulepart=medias&file=js/template-corporate/script.js\"></script>\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'other','en',NULL,'','',NULL,'','',0,NULL,NULL),(10,5,'header','','Header and Top Menu','Header with menu','','<!-- JQuery + Other js libs -->\n<script src=\"/document.php?modulepart=medias&file=js/template-corporate/extlib.min.js\"></script>\n\n\n<div class=\"dolcontenteditable dolsticky\" contenteditable=\"true\"><div class=\"div-page-head\">\n      <header class=\"page-head\">\n        <div class=\"rd-navbar-wrap\" style=\"height: 106px;\">\n          <nav class=\"rd-navbar rd-navbar-corporate-dark rd-navbar-original rd-navbar-static\" \n                data-layout=\"rd-navbar-fixed\" data-sm-layout=\"rd-navbar-fixed\" data-md-device-layout=\"rd-navbar-fixed\" \n                data-md-layout=\"rd-navbar-static\" data-lg-layout=\"rd-navbar-static\" data-xl-layout=\"rd-navbar-static\" data-xxl-layout=\"rd-navbar-static\"\n                data-lg-device-layout=\"rd-navbar-static\" data-xl-device-layout=\"rd-navbar-static\" data-xxl-device-layout=\"rd-navbar-static\"\n                data-stick-up-clone=\"false\" data-md-stick-up-offset=\"53px\" data-lg-stick-up-offset=\"53px\" data-md-stick-up=\"true\" data-lg-stick-up=\"true\">\n            <div class=\"rd-navbar-inner\">\n              \n              <div class=\"rd-navbar-group rd-navbar-search-wrap toggle-original-elements\">\n                <div class=\"rd-navbar-panel\">\n                  <button class=\"rd-navbar-toggle\" data-custom-toggle=\".rd-navbar-nav-wrap\" data-custom-toggle-disable-on-blur=\"true\"><span></span></button><a class=\"rd-navbar-brand brand\" href=\"home.php\">\n                      <img src=\"/viewimage.php?modulepart=mycompany&file=logos/<?php echo getImageFileNameForSize($mysoc->logo_squarred ? $mysoc->logo_squarred : $mysoc->logo, \'_small\') ?>\" alt=\"\" height=\"34\"></a>\n                </div>\n                <div class=\"rd-navbar-nav-wrap\">\n                  <div class=\"rd-navbar-nav-inner\">\n                    <div class=\"rd-navbar-search toggle-original-elements\">\n                      <form class=\"rd-search\" action=\"search.php\" method=\"POST\" data-search-live=\"rd-search-results-live\">\n                        <input type=\"hidden\" name=\"token\" value=\"<?php echo newToken(); ?>\" />\n                        <div class=\"form-wrap\">\n                          <input class=\"form-input\" id=\"rd-search-form-input\" type=\"text\" name=\"s\" autocomplete=\"off\" placeholder=\"Search...\">\n                          <div class=\"rd-search-results-live cleared\" id=\"rd-search-results-live\"></div>\n                        </div>\n                        <button class=\"rd-search-submit buttonwithnoborder\" type=\"submit\"><span class=\"icon icon-xs icon-dusty-gray fa fa-search\"></span></button>\n                      </form>\n                      <button class=\"buttonwithnoborder\" data-rd-navbar-toggle=\".rd-navbar-search, .rd-navbar-search-wrap\">\n                          <span class=\"icon icon-xs icon-dusty-gray fa fa-search\"></span>\n                      </button>\n                    </div>\n                    \n                    <!-- Tree with menu -->\n                    <ul class=\"rd-navbar-nav\">\n                      <li class=\"active\"><a href=\"/\">Home</a></li>\n                      <li class=\"rd-navbar--has-megamenu rd-navbar-submenu\"><a href=\"#\">Products | Services</a>\n                        <ul class=\"rd-navbar-megamenu rd-navbar-open-right\">\n                          <li>\n                            <h4 class=\"rd-megamenu-header\">Products and Services</h4>\n                            <ul class=\"rd-navbar-list\">\n                              <li><a href=\"product-p.php\">Product P</a></li>\n                              <li><a href=\"service-s.php\">Service S</a></li>\n                            </ul>\n                          </li>\n                          <li>\n                            <h4 class=\"rd-megamenu-header\">Pricing</h4>\n                            <ul class=\"rd-navbar-list\">\n                              <li><a href=\"pricing.php\">Pricing</a></li>\n                            </ul>\n                          </li>\n                        </ul>\n                      </li>\n                      <li><a href=\"blog.php\">Blog</a></li>\n                      <li class=\"rd-navbar--has-megamenu rd-navbar-submenu\"><a href=\"#\">Our company</a>\n                        <ul class=\"rd-navbar-megamenu rd-navbar-open-right\">\n                          <li>\n                            <h4 class=\"rd-megamenu-header\">Our business</h4>\n                            <ul class=\"rd-navbar-list\">\n                              <li><a href=\"clients-testimonials.php\">Clients testimonials</a></li>\n                              <li><a href=\"partners.php\">Partners</a></li>\n                            </ul>\n                          </li>\n                          <li>\n                            <h4 class=\"rd-megamenu-header\">Human Resources</h4>\n                            <ul class=\"rd-navbar-list\">\n                              <li><a href=\"our-team.php\">Our team</a></li>\n                              <li><a href=\"careers.php\">Careers</a></li>\n                            </ul>\n                          </li>\n                          <li>\n                            <h4 class=\"rd-megamenu-header\">Other</h4>\n                            <ul class=\"rd-navbar-list\">\n                              <li><a href=\"faq.php\">FAQ</a></li>\n                              <li><a href=\"search.php\">Search</a></li>\n                              <li><a href=\"contact.php\">Contact us</a></li>\n                              <li><a href=\"privacy-policies.php\">Privacy policies</a></li>\n                            </ul>\n                          </li>\n                        </ul>\n                      </li>\n                      <li><a href=\"contact.php\">Contacts</a></li>\n                    </ul>\n                    \n                  </div>\n                </div>\n              </div>\n            </div>\n          </nav>\n        </div>\n      </header>\n</div></div>\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'other','en',NULL,'','',NULL,'','',0,NULL,NULL),(11,5,'home','','Home','Welcome','','<div class=\"page\">\n        \n    <?php includeContainer(\'header\'); ?>\n        \n        \n      <!-- top images -->\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"swiper-container swiper-slider swiper-variant-1 bg-black swiper-container-horizontal\" data-loop=\"false\" data-autoplay=\"5500\" data-swipe=\"true\" data-simulate-touch=\"true\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" data-slide-bg=\"medias/image/template-corporate/background_rough-horn.jpg\" style=\"background-image: url(\'medias/image/template-corporate/background_rough-horn.jpg\'); background-size: cover; width: 1905px;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\"><span class=\"text-thin\">Boost your business</span>\n                      </div>\n                      <div data-caption-animate=\"fadeInUp\" data-caption-delay=\"450s\" class=\"fadeInUp animated\">\n                        <p class=\"text-big-19 text-white d-none d-md-inline-block\">We provide powerful solutions for all businesses</p>\n                      </div>\n                      <div class=\"button-block fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"550s\"><a class=\"btn btn-primary maincolorbisbackground\" href=\"contact.php\">Contact us</a></div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n            <div class=\"swiper-slide swiper-slide-next\" data-slide-bg=\"medias/image/template-corporate/background_sunset.jpg\" style=\"background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover; width: 1905px;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10 col-xl-12\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern not-animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">&nbsp;Best prices on the market&nbsp;\n                      </div>\n                      <div data-caption-animate=\"fadeInUp\" data-caption-delay=\"450s\" class=\"not-animated\">\n                        <p class=\"text-big-19 text-white d-none d-md-inline-block\">Our optimized processes allows us to provide you very competitive prices</p>\n                      </div>\n                      <div class=\"button-block not-animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"550s\"><a class=\"btn btn-primary\" href=\"contact.php\">Contact us</a></div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n          </div>\n          <div class=\"swiper-scrollbar d-xl-none\"><div class=\"swiper-scrollbar-drag\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms; width: 0px;\"></div></div>\n          <div class=\"swiper-nav-wrap d-none d-xl-block\">\n            <div class=\"swiper-button-prev swiper-button-disabled\"><span class=\"icon text-white fa fa-chevron-right fa-2x\"></span></div>\n            <div class=\"swiper-button-next\"><span class=\"icon text-white fa fa-chevron-right fa-2x\"></span></div>\n          </div>\n        </div>\n      </section>\n\n<!--<script>\nCKEDITOR.disableAutoInline = true;\nCKEDITOR.inline( \'sectionimage\' , { toolbar: [\'Bold\',\'Italic\'] } );\n</script>\n-->\n\n      <!--Products box-->\n      <section id=\"sectioniconbox\" contenteditable=\"true\">\n        <div class=\"row no-gutters justify-content-sm-center justify-content-md-start row-40 row-sm-0\">\n          <div class=\"col-sm-10 col-md-6 height-fill\">\n            <div class=\"icon-box icon-box-top-line icon-box-hover\">\n              <div class=\"box-top\">\n                <div class=\"box-icon\"><img width=\"50px\" src=\"medias/image/template-corporate/briefcase.svg\"></div>\n                <div class=\"box-header\">\n                  <h3><a href=\"our-team.php\">A competent team</a></h3>\n                </div>\n              </div>\n              <div class=\"box-body\">\n                <p class=\"text-black\">Our sales representative are also technicians.</p>\n              </div>\n            </div>\n          </div>\n          <div class=\"col-sm-10 col-md-6 height-fill\">\n            <div class=\"icon-box icon-box-top-line icon-box-hover\">\n              <div class=\"box-top\">\n                <div class=\"box-icon\"><img width=\"50px\" src=\"medias/image/template-corporate/package.svg\"></div>\n                <div class=\"box-header\">\n                  <h3><a href=\"pricing.php\">The best prices of market</a></h3>\n                </div>\n              </div>\n              <div class=\"box-body\">\n                <p class=\"text-black\">Take a look at our offers...</p>\n              </div>\n            </div>\n          </div>\n          <div class=\"col-sm-10 col-md-6 height-fill\">\n            <div class=\"icon-box icon-box-hover\">\n              <div class=\"box-top\">\n                <div class=\"box-icon\"><img width=\"50px\" src=\"medias/image/template-corporate/light-bulb.svg\"></div>\n                <div class=\"box-header\">\n                  <h3><a href=\"clients-testimonials.php\">A high level of satisfaction</a></h3>\n                </div>\n              </div>\n              <div class=\"box-body\">\n                <p class=\"text-black\">Our customer-supplier relationship is very appreciated by our customers</p>\n              </div>\n            </div>\n          </div>\n          <div class=\"col-sm-10 col-md-6 height-fill\">\n            <div class=\"icon-box icon-box-hover\">\n              <div class=\"box-top\">\n                <div class=\"box-icon\"><img width=\"50px\" src=\"medias/image/template-corporate/organization.svg\"></div>\n                <div class=\"box-header\">\n                  <h3><a href=\"/contact.php\">After Sale service</a></h3>\n                </div>\n              </div>\n              <div class=\"box-body\">\n                <p class=\"text-black\">We continue to follow and assist you after the sale. Contact us at any time.</p>\n              </div>\n            </div>\n          </div>\n        </div>\n      </section>\n\n\n      <!-- Looking for our sevices -->\n      <section id=\"sectionfirstclass\" contenteditable=\"true\" class=\"section-with-counters bg-accent text-center\">\n        <div class=\"container bg-cape-cod context-dark section-60 section-lg-90\">\n          <h2 class=\"text-rolling-stone font-weight-bold text-uppercase\">Looking for</h2>\n          <h1 class=\"section-title\"><span class=\"text-thin\">a high quality</span> service?</h1>\n          <p class=\"text-black\">With a lot of experience, hiring us is a security for your business!</p>\n          <div class=\"row list-md-dashed row-40\">\n            <div class=\"col-md-4\">\n              <div class=\"h1 small counter-bold counter maincolorbis\">11</div>\n              <div class=\"counter-title text-black font-weight-bold text-uppercase\">Years of Experience</div>\n            </div>\n            <div class=\"col-md-4\">\n              <div class=\"h1 small counter-bold counter maincolorbis\">\n                  <?php $sql = \"SELECT COUNT(*) as nb FROM \".MAIN_DB_PREFIX.\"user where statut = 1\"; $resql = $db->query($sql); $obj = $db->fetch_object($resql); print $obj->nb; ?>\n              </div>\n              <div class=\"counter-title text-black font-weight-bold text-uppercase\">Experts</div>\n            </div>\n            <div class=\"col-md-4\">\n              <div class=\"h1 small counter-bold counter maincolorbis\">\n                  <?php $sql = \"SELECT COUNT(*) as nb FROM \".MAIN_DB_PREFIX.\"societe where client in (1,3)\"; $resql = $db->query($sql); $obj = $db->fetch_object($resql); print $obj->nb; ?>\n              </div>\n              <div class=\"counter-title text-black font-weight-bold text-uppercase\">Trusted Clients</div>\n            </div>\n          </div>\n          <div class=\"button-block inset-sm-left-60 inset-sm-right-60\">\n            <div class=\"d-md-flex justify-content-md-center align-items-md-center\"><a class=\"btn btn-rect btn-primary d-block d-md-inline-block\" href=\"contact.php\">Contact us</a>\n            <span class=\"font-italic text-black inset-md-left-20 inset-md-right-20 d-block d-md-inline-block text-big-18\">&nbsp; or &nbsp;</span>\n            <a class=\"btn btn-rect btn-white-outline d-block d-md-inline-block maincolorbisbackground\" href=\"pricing.php\" style=\"min-width:236px;\">See our pricing</a></div>\n          </div>\n        </div>\n      </section>\n\n      \n      \n      <!-- Our plans -->\n      <section id=\"sectionplans\" contenteditable=\"true\" class=\"section-67 section-md-top-75 section-md-bottom-75\">\n        <div class=\"container\">\n            <div id=\"carousel-plans-month\" class=\"\" data-interval=\"0\" style=\"margin-top:50px\">\n                    <!-- begin .carousel-inner -->\n                    <div class=\"pricing-plan-slider\" role=\"listbox\">\n                        <!-- begin .item -->\n                        <div class=\"item active\">\n                            <!-- begin .container -->\n                            <div class=\"container\">\n                                <h1 class=\"text-center\">our <span class=\"text-thin\">plans</span></h1>\n\n                                <!-- begin .row -->\n                                <div class=\"plan-list flex-box row spacer-bottom-sm flexwrap_inherit\">\n                                    <!-- begin .plan-item -->\n                                    <div class=\"col-lg-15 col-md-4 col-sm-6 col-xs-12 box\">\n                                            <div class=\"plan-tile\"> \n                                                <div class=\"plan-box-header\"></div>\n                                                <div class=\"plan-title\">FREE</div>\n                                                <div class=\"plan-tag\">The best choice for personal use</div>\n                                                <div class=\"plan-feat\"><span class=\"summaryplan\">The service 1 for free</div>\n                                                <div class=\"plan-pricer\">\n                                                    <span class=\"plan-price\" id=\"monthly_plan_37\"><span><sup></sup>0<sup>€</sup></span>/ month</span>\n                                                </div>\n                                                <div class=\"plan-features\">\n                                                    <span class=\"plan-features-title\">Available features are :</span>                                                                                                        </span>\n                                                    <ul class=\"list-unstyled\">\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i>\n                                                            Service 1                                                            \n                                                        </li>\n                                                    </ul>\n                                                </div>\n                                                <div class=\"plan-btn plan-picker\">\n                                                    <a href=\"plan-a.php\" class=\"btn btn-rect btn-primary d-block d-md-inline-block\" id=\"plana\">Subcribe</a>\n                                                </div>\n                                            </div>  \n                                    </div>\n                                    <!-- end .plan-item -->\n                                    \n                                    <!-- begin .plan-item -->\n                                    <div class=\"col-lg-15 col-md-4 col-sm-6 col-xs-12 box \">                      \n                                            <div class=\"plan-tile\"> \n                                                <div class=\"plan-box-header\"></div>\n                                                <div class=\"plan-title\">STARTER</div>\n                                                <div class=\"plan-tag\">For small companiess</div>\n                                                <div class=\"plan-feat\">The service 1 and product 1 at low price</div>\n                                                <div class=\"plan-pricer\">\n                                                    <span class=\"plan-price\" id=\"starter\"><span><sup></sup>29<sup>€</sup></span>/ month</span>\n                                                </div>\n                                                <div class=\"plan-features\">\n                                                    <span class=\"plan-features-title\">Available features are :</span>                                                                                                        </span>\n                                                    <ul class=\"list-unstyled\">\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i>\n                                                            Service 1\n                                                        </li>\n                                                        <li>\n                                                        	<i class=\"fa fa-check\"></i>\n                                                        	Product 1\n                                                        </li>\n                                                    </ul>\n                                                </div>\n                                                <div class=\"plan-btn plan-picker\">\n                                                    <a href=\"plan-b.php\" class=\"btn btn-rect btn-primary d-block d-md-inline-block\" id=\"planb\">Subscribe</a>\n                                                </div>\n                                            </div>  \n                                    </div>\n                                    <!-- end .plan-item -->\n                                    \n                                    <!-- Most popular plan box -->\n                                    <div class=\"col-lg-15 col-md-4 col-sm-6 col-xs-12 box most-popular-plan-box2 most-popular-plan-box \">                  \n                                        <div class=\"plan-tile\">\n                                            <div class=\"plan-box-header\" id=\"default\"></div> \n                                                <div class=\"plan-title\">PREMIUM</div>\n                                                <div class=\"plan-tag\">For large companies</div>\n                                                <div class=\"plan-feat\">The full option package for a one shot price\n                                                </div>\n                                                <div class=\"plan-pricer\">\n                                                    <span class=\"plan-price planPremiumPrice\" id=\"premium\"><span><sup></sup>2499<sup>€</sup></span></span>\n                                                </div>\n                                                <div class=\"plan-features\">\n                                                    <span class=\"plan-features-title\">Available features are :</span>\n                                                    <ul class=\"list-unstyled\">\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i> \n                                                            Service 1                                                        </li>\n                                                        <li id=\"higherFeature\" class=\"hide\">\n                                                            <i class=\"fa fa-check\"></i> \n                                                            Service 2                                                        </li>\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i> \n                                                            Product 1                                                        </li>\n                                                    </ul>\n                                                </div>\n                                                <div class=\"plan-btn plan-picker\">\n                                                    <a href=\"planc.php\" class=\"btn btn-rect btn-primary d-block d-md-inline-block maincolorbisbackground\" id=\"planc\">Buy</a>\n                                                </div>\n                                            </div>  \n                                    </div>\n                                    <!-- Ends // Most Popular Plan Box --> \n                                </div>\n                                <!-- end .row -->\n                            </div>\n                            <!-- end .container -->\n                        </div>\n                        <!-- end .item -->\n                    </div>\n                    <!-- end .row -->\n                <!-- end .carousel -->          \n            </div>\n        </div>\n      </section>\n      \n      \n      <!-- Our team -->\n      <section id=\"sectionteam\" contenteditable=\"true\" class=\"section-66 section-md-top-100 section-md-bottom-75\">\n        <div class=\"container\">\n          <h1 class=\"text-center\">our <span class=\"text-thin\">team</span></h1>\n          <div class=\"row justify-content-sm-center\">\n            <div class=\"col-md-8 col-xl-12\">\n              <div class=\"owl-carousel owl-carousel-center owl-nav-modern owl-style-minimal owl-style-minimal-inverse text-center\" data-items=\"1\" data-md-items=\"2\" data-xl-items=\"3\" data-stage-padding=\"15\" data-loop=\"false\" data-margin=\"15\" data-mouse-drag=\"false\" data-nav=\"true\" data-dots=\"true\">\n                <div class=\"owl-item text-center\">\n                  <div class=\"thumbnail-variant-5\">\n                    <div class=\"thumbnail-variant-5-img-wrap\"><img class=\"img-circle\" src=\"medias/image/template-corporate/alberteinstein.jpg\" width=\"129\" height=\"129\" alt=\"\"></div>\n                    <h2>Albert Einstein</h2>\n                    <div>CEO</div>\n                    <div class=\"divider-fullwidth bg-porcelain\"></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-phone\"></span><a class=\"link-black\" href=\"callto:#\">+555 123 456</a></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-envelope-o\"></span><a class=\"link-black\" href=\"mailto:#\">email@example.com</a></div>\n                  </div>\n                </div>\n                <div class=\"owl-item text-center\">\n                  <div class=\"thumbnail-variant-5\">\n                    <div class=\"thumbnail-variant-5-img-wrap\"><img class=\"img-circle\" src=\"medias/image/template-corporate/pierrecurie.jpg\" width=\"129\" height=\"129\" alt=\"\"></div>\n                    <h2>Pierre Curie</h2>\n                    <div>CTO</div>\n                    <div class=\"divider-fullwidth bg-porcelain\"></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-phone\"></span><a class=\"link-black\" href=\"callto:#\">+555 123 456</a></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-envelope-o\"></span><a class=\"link-black\" href=\"mailto:#\">email@example.com</a></div>\n                  </div>\n                </div>\n                <div class=\"owl-item text-center\">\n                  <div class=\"thumbnail-variant-5\">\n                    <div class=\"thumbnail-variant-5-img-wrap\"><img class=\"img-circle\" src=\"medias/image/template-corporate/mariecurie.jpg\" width=\"129\" height=\"129\" alt=\"\"></div>\n                    <h2>Marie Curie</h2>\n                    <div>Bookkeeper</div>\n                    <div class=\"divider-fullwidth bg-porcelain\"></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-phone\"></span><a class=\"link-black\" href=\"callto:#\">+555 123 456</a></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-envelope-o\"></span><a class=\"link-black\" href=\"mailto:#\">email@example.com</a></div>\n                  </div>\n                </div>\n                <div class=\"owl-item text-center\">\n                  <div class=\"thumbnail-variant-5\">\n                    <div class=\"thumbnail-variant-5-img-wrap\"><img class=\"img-circle\" src=\"medias/image/template-corporate/daviddoe.png\" width=\"129\" height=\"129\" alt=\"\"></div>\n                    <h2>John Doe</h2>\n                    <div>Project leader</div>\n                    <div class=\"divider-fullwidth bg-porcelain\"></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-phone\"></span><a class=\"link-black\" href=\"callto:#\">+555 123 456</a></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-envelope-o\"></span><a class=\"link-black\" href=\"mailto:#\">email@example.com</a></div>\n                  </div>\n                </div>\n              </div>\n            </div>\n          </div>\n        </div>\n      </section>\n\n\n      <!-- Contact form -->\n      <section id=\"sectionformcontact\" contenteditable=\"true\" class=\"section-67 section-md-top-50 section-md-bottom-50 section-md-bottom-100 section-with-counters\">\n        <div class=\"container\">\n          <div class=\"row justify-content-sm-center\">\n            <div class=\"col-md-10 col-lg-10 col-xl-12\">\n              <div class=\"panel bg-accent bg-default-outline-btn text-center\" style=\"padding: 50px 15px;\">\n                <h1>Request <span class=\"text-thin\">a callback</span></h1>\n                <form class=\"formcontact\" method=\"POST\" action=\"request-callback.php\">\n                  <div class=\"inline-block valignmiddle\">\n                    <input class=\"form-input\" placeholder=\"Name\" id=\"index-request-name\" type=\"text\" name=\"name\" required>\n                  </div>\n                  <div class=\"inline-block valignmiddle\">\n                    <input class=\"form-input\" placeholder=\"Phone Number\" id=\"index-request-phone\" type=\"text\" name=\"phone\" required>\n                  </div>\n                  <div class=\"inline-block valignmiddle\">\n                    <input class=\"form-input\" placeholder=\"Email\" id=\"index-request-email\" type=\"text\" name=\"email\" required>\n                  </div>\n                  <div class=\"inline-block valignmiddle\">\n                    <button class=\"btn btn-rect btn-primary d-block d-md-inline-block maincolorbisbackground\" type=\"submit\">Submit</button>\n                  </div>\n                </form>\n              </div>\n            </div>\n          </div>\n        </div>\n      </section>\n      \n      \n      <!-- Testimonies -->\n      <section id=\"sectiontestimonies\" contenteditable=\"true\" class=\"maincolorbackground context-dark\">\n        <div class=\"container\">\n          <div class=\"row justify-content-sm-center justify-content-lg-start\">\n            <div class=\"col-sm-10 col-lg-12 text-left section-60 section-md-60\">\n              <div>\n                <h1 class=\"text-center text-lg-left\">successful <span class=\"text-thin\">cases</span></h1>\n                <div class=\"carousel-testimonials-home\">\n                  <div class=\"inset-xl-right-50\">\n                    <div class=\"slick-slider slick-slider slick-carousel-round-image slick-images\" id=\"child-carousel\" data-for=\".carousel-parent\" data-arrows=\"false\" data-loop=\"false\"\n                       data-dots=\"false\" data-swipe=\"true\" data-items=\"1\" data-sm-items=\"3\" data-md-items=\"3\" data-lg-items=\"3\" data-xl-items=\"4\" data-slide-to-scroll=\"1\" data-center-mode=\"false\" data-center-padding=\"0\">\n                      <div class=\"itemphotouser\">\n                        <div class=\"imp-wrap\"><img class=\"photouser\" src=\"medias/image/template-corporate/alberteinstein.jpg\" alt=\"\" width=\"99\" height=\"99\"/>\n                        </div>\n                      </div>\n                      <div class=\"itemphotouser\">\n                        <div class=\"imp-wrap\"><img class=\"photouser\" src=\"medias/image/template-corporate/pierrecurie.jpg\" alt=\"\" width=\"99\" height=\"99\"/>\n                        </div>\n                      </div>\n                      <div class=\"itemphotouser\">\n                        <div class=\"imp-wrap\"><img class=\"photouser\" src=\"medias/image/template-corporate/mariecurie.jpg\" alt=\"\" width=\"99\" height=\"99\"/>\n                        </div>\n                      </div>\n                      <div class=\"itemphotouser\">\n                        <div class=\"imp-wrap\"><img class=\"photouser\" src=\"medias/image/template-corporate/daviddoe.png\" alt=\"\" width=\"99\" height=\"99\"/>\n                        </div>\n                      </div>\n                    </div>\n                  </div>\n                  <div class=\"slick-slider carousel-parent slick-dots-variant-1\" data-arrows=\"false\" data-loop=\"false\" data-dots=\"true\"\n                  data-swipe=\"true\" data-child=\"#child-carousel\" data-for=\"#child-carousel\" data-items=\"1\" data-sm-items=\"1\" data-md-items=\"1\" data-lg-items=\"1\" data-xl-items=\"1\" data-slide-to-scroll=\"1\" data-center-mode=\"false\">\n                    <div class=\"inset-left-10 inset-right-10 inset-\">\n                      <div class=\"inset-xl-right-85\">\n                        <blockquote class=\"quote-left\">\n                          <div class=\"row align-items-sm-end row-20\">\n                            <div class=\"col-sm-6\">\n                              <div class=\"quote-name\">\n                                <cite>Albert Einstein</cite>\n                              </div>\n                              <div class=\"text-dusty-gray\">Scientist, www.emc2.org</div>\n                            </div>\n                            <div class=\"col-sm-6 text-center\">\n                              <div class=\"quote-desc row d-flex\">\n                                <div class=\"col-sm-6\">\n                                  <div class=\"quote-desc-text maincolorbis\">-20%</div>\n                                  <div class=\"text-medium text-dusty-gray text-uppercase\">Expenses</div>\n                                </div>\n                              </div>\n                            </div>\n                          </div>\n                          <div class=\"divider-fullwidth\"></div>\n                          <div>\n                            <span class=\"fa fa-quote-left\"><!-- Keep this comment --></span>\n                            <q>They did everything, with almost no time or effort for me. The best part was that I could trust their team to represent our company professionally with our clients.</q>\n                            <span class=\"fa fa-quote-right\"><!-- Keep this comment --></span>\n                          </div>\n                        </blockquote>\n                      </div>\n                    </div>\n                    <div class=\"inset-left-10 inset-right-10 inset-\">\n                      <div class=\"inset-xl-right-85\">\n                        <blockquote class=\"quote-left\">\n                          <div class=\"row row-20\">\n                            <div class=\"col-sm-6\">\n                              <div class=\"quote-name\">\n                                <cite>Pierre Curie</cite>\n                              </div>\n                              <div class=\"text-dusty-gray\">CEO “Cyclonic”</div>\n                            </div>\n                            <div class=\"col-sm-6 text-center\">\n                              <div class=\"quote-desc row d-flex\">\n                                <div class=\"col-sm-6\">\n                                  <div class=\"quote-desc-text maincolorbis\">-30%</div>\n                                  <div class=\"text-medium text-dusty-gray text-uppercase\">Expenses</div>\n                                </div>\n                              </div>\n                            </div>\n                          </div>\n                          <div class=\"divider-fullwidth\"></div>\n                          <div>\n                            <span class=\"fa fa-quote-left\"><!-- Keep this comment --></span>\n                            <q>Their course gave me the confidence to implement new techniques in my work. I learn “how” to write – “what” and “why” also became much clearer.</q>\n                            <span class=\"fa fa-quote-right\"><!-- Keep this comment --></span>\n                          </div>\n                        </blockquote>\n                      </div>\n                    </div>\n                    <div class=\"inset-left-10 inset-right-10 inset-\">\n                      <div class=\"inset-xl-right-85\">\n                        <blockquote class=\"quote-left\">\n                          <div class=\"row row-20\">\n                            <div class=\"col-sm-6\">\n                              <div class=\"quote-name\">\n                                <cite>Marie Curie</cite>\n                              </div>\n                              <div class=\"text-dusty-gray\">CTO \"Cyclonic\"</div>\n                            </div>\n                            <div class=\"col-sm-6 text-center\">\n                              <div class=\"quote-desc row d-flex\">\n                                <div class=\"col-sm-6\">\n                                  <div class=\"quote-desc-text maincolorbis\">+22%</div>\n                                  <div class=\"text-medium text-dusty-gray text-uppercase\">Turnover</div>\n                                </div>\n                              </div>\n                            </div>\n                          </div>\n                          <div class=\"divider-fullwidth\"></div>\n                          <div>\n                            <span class=\"fa fa-quote-left\"><!-- Keep this comment --></span>\n                            <q>We were skeptical to work with a consultant to optimize our sales emails, but they were highly recommended by many other startups we knew. They helped us to reach our objective of 20% turnover increase, in 4 monthes.</q>\n                            <span class=\"fa fa-quote-right\"><!-- Keep this comment --></span>\n                          </div>\n                        </blockquote>\n                      </div>\n                    </div>\n                    <div class=\"inset-left-10 inset-right-10 inset-\">\n                      <div class=\"inset-xl-right-85\">\n                        <blockquote class=\"quote-left\">\n                          <div class=\"row row-20\">\n                            <div class=\"col-sm-6\">\n                              <div class=\"quote-name\">\n                                <cite>John Doe</cite>\n                              </div>\n                              <div class=\"text-dusty-gray\">Sale representative</div>\n                            </div>\n                            <div class=\"col-sm-6 text-center\">\n                              <div class=\"quote-desc row d-flex\">\n                                <div class=\"col-sm-6\">\n                                  <div class=\"quote-desc-text maincolorbis\">+40%</div>\n                                  <div class=\"text-medium text-dusty-gray text-uppercase\">Quotes</div>\n                                </div>\n                              </div>\n                            </div>\n                          </div>\n                          <div class=\"divider-fullwidth\"></div>\n                          <div>\n                            <span class=\"fa fa-quote-left\"><!-- Keep this comment --></span>\n                            <q>Their work on our website and Internet marketing has made a significant different to our business. We’ve seen a +40% increase in quote requests from our website.</q>\n                            <span class=\"fa fa-quote-right\"><!-- Keep this comment --></span>\n                          </div>\n                        </blockquote>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n          </div>\n        </div>\n      </section>\n      \n\n      <!-- News -->\n      <section id=\"sectionnews\" contenteditable=\"true\" class=\"section-50 section-md-90 section-md-bottom-100\">\n        <div class=\"container text-center\">\n          <h1>Latest <span class=\"text-thin\">News</span></h1>\n          <div class=\"row justify-content-sm-center row-40\">\n            <?php \n            $MAXNEWS = 3;\n            $arrayofblogs = $websitepage->fetchAll($website->id, \'DESC\', \'date_creation\', $MAXNEWS, 0, array(\'type_container\'=>\'blogpost\', \'status\'=>1, \'lang\'=>\'null,\'.$websitepage->lang));\n            foreach($arrayofblogs as $blog)\n            {\n                ?>\n                <div class=\"col-sm-8 col-md-7 col-lg-4\">\n                  <div class=\"post-boxed d-xl-inline-block\">\n                    <a href=\"<?php echo $blog->pageurl ?>.php\">\n                    <div class=\"post-boxed-img-wrap\"><img src=\"<?php echo ($blog->image ? \'viewimage.php?modulepart=medias&file=\'.str_replace(\'template-corporate\', $website->ref, $blog->image) : \'medias/image/\'.$website->ref.\'/calendar.svg\"\'); ?>\" alt=\"\" height=\"80\"></div>\n                    <div class=\"post-boxed-caption\">\n                      <div class=\"post-boxed-title font-weight-bold\"><?php echo $blog->title ?></div>\n                      <ul class=\"list-inline list-inline-dashed text-uppercase\">\n                        <li><?php $weblangs->load(\"main\"); echo dol_print_date($blog->date_creation, \'daytext\', \'tzuser\', $weblangs); ?></li>\n                        <li><span>by<span> <span class=\"text-primary\"><?php echo $blog->author_alias ?></span></span></li>\n                      </ul>\n                    </div>\n                    </a>\n                  </div>\n                </div>\n                <?php \n            }\n            ?>\n \n          </div>\n        </div>\n      </section>\n\n\n    <?php includeContainer(\'footer\'); ?>\n\n\n</div>\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(12,5,'our-team','','Our team','Our team','team','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Our team</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionteam\" contenteditable=\"true\" class=\"section-50 section-md-50 section-md-bottom-50\">\n            <div class=\"container\"><div class=\"text-align: center\"><br>\n            <h2>The crew...</h2><br> <br><br> \n            <?php \n            include_once DOL_DOCUMENT_ROOT.\'/core/class/html.form.class.php\';\n            $websitepage = new WebsitePage($db);\n            $fuser = new User($db);\n            $arrayofusers = array();\n            $MAXNB=10;\n            $sql=\'SELECT rowid FROM \'.MAIN_DB_PREFIX.\'user WHERE statut = 1 and fk_soc IS NULL ORDER BY fk_user DESC LIMIT \'.$MAXNB;\n            $resql = $db->query($sql);\n            if (! $resql) dol_print_error($db);\n            while ($obj = $db->fetch_object($resql))\n            {\n                $arrayofusers[]=$obj->rowid;\n            }\n           \n            print \'<div class=\"row justify-content-sm-center row-40\">\';\n            foreach($arrayofusers as $id)\n            {\n                $fuser->fetch($id);\n\n                print \'<div class=\"col-sm-8 col-md-7 col-lg-4\">\';\n                print \'<div class=\"container blog-box d-xl-inline-block\" style=\"padding: 20px; box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;\">\';\n                print \'<div class=\"post-boxed-img-wrap\" style=\"height: 164px\">\';\n                if ($fuser->photo) print Form::showphoto(\'userphoto\', $fuser, 100, 0, 0, \'photowithmargin\', \'\', 0);\n                //print \'<img class=\"img-circle\" src=\"/viewimage.php?modulepart=userphoto&amp;file=\'.$fuser->photo.\'\" width=\"129\" height=\"129\" alt=\"\">\';\n                else print \'<img class=\"img-circle\" src=\"/viewimage.php?modulepart=medias&amp;file=image/template-corporate/daviddoe.png\" width=\"129\" height=\"129\" alt=\"\">\';\n                print \'</div>\';\n                print \'<div class=\"post-boxed-caption\">\';\n                print \'<div class=\"post-boxed-title font-weight-bold\">\'.$fuser->firstname.\'</div>\';\n                print \'<ul class=\"list-inline list-inline-dashed text-uppercase\">\';\n                //print \'<li>September 24, 2018</li>\';\n                if ($fuser->job) print \'<li><span class=\"text-primary\">\'.$fuser->job.\'</span></li>\';\n                else print \'<li></li>\';\n                print \'</ul>\';\n                print \'</div>\';\n                print \'</div>\';\n                print \'</div>\';\n            }\n            print \'</div>\';\n\n            ?>\n            </div></div>\n        </section>\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(13,5,'partners','','Partners','Partners','partners','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Partners</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div style=\"margin: 50px\"><div class=\"text-align: center\">\n<br><h2>Our partners...</h2>\n<br>\n<br>\n<br>\n<div class=\"row justify-content-sm-center row-40\">\n    <div class=\"col-sm-8 col-md-2 col-lg-2\">\n        <div>\n            <img src=\"/viewimage.php?modulepart=medias&file=image/template-corporate/dolibarr_256x256.png\" height=\"64px\"><br>\n            <div class=\"floatatbottom\"><a href=\"https://www.dolibarr.org\" target=\"_new\">Dolibarr ERP CRM</a></div>\n        </div>\n    </div>\n    <div class=\"col-sm-4 col-md-2 col-lg-2\">\n         <div>\n        <img src=\"/viewimage.php?modulepart=medias&file=image/template-corporate/php.png\" height=\"64px\"><br>\n        <div class=\"floatatbottom\"><a href=\"http://www.php.net\" target=\"_new\">PHP</a></div>\n        </div>\n    </div>\n    <div class=\"col-sm-4 col-md-2 col-lg-2\">\n         <div>\n        <img src=\"/viewimage.php?modulepart=medias&file=image/template-corporate/apache.png\" height=\"64px\"><br>\n        <div class=\"floatatbottom\"><a href=\"https://www.apache.org\" target=\"_new\">Apache</a></div>\n        </div>\n    </div>\n    <div class=\"col-sm-4 col-md-2 col-lg-2\">\n         <div>\n        <img src=\"/viewimage.php?modulepart=medias&file=image/template-corporate/mariadb.png\" height=\"64px\"><br>\n        <div class=\"floatatbottom\"><a href=\"https://www.mariadb.org\" target=\"_new\">MariaDB</a></div>\n        </div>\n    </div>\n</div>\n<br>\n<br>\n<br>\n<br>\n            </div></div>\n        </section>\n\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(14,5,'pricing','','Pricing','All the prices of our offers','pricing','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Our plans</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n\n\n      <!-- Our plans -->\n      <section id=\"sectionplans\" contenteditable=\"true\" class=\"section-67 section-md-top-50 section-md-bottom-75\">\n        <div class=\"container\">\n            <div id=\"carousel-plans-month\" class=\"\" data-interval=\"0\" style=\"margin-top:50px\">\n                    <!-- begin .carousel-inner -->\n                    <div class=\"pricing-plan-slider\" role=\"listbox\">\n                        <!-- begin .item -->\n                        <div class=\"item active\">\n                            <!-- begin .container -->\n                            <div class=\"container\">\n\n                                <!-- begin .row -->\n                                <div class=\"plan-list flex-box row spacer-bottom-sm flexwrap_inherit\">\n                                    <!-- begin .plan-item -->\n                                    <div class=\"col-lg-15 col-md-4 col-sm-6 col-xs-12 box\">\n                                            <div class=\"plan-tile\"> \n                                                <div class=\"plan-box-header\"></div>\n                                                <div class=\"plan-title\">FREE</div>\n                                                <div class=\"plan-tag\">The best choice for personal use</div>\n                                                <div class=\"plan-feat\"><span class=\"summaryplan\">The service 1 for free</div>\n                                                <div class=\"plan-pricer\">\n                                                    <span class=\"plan-price\" id=\"monthly_plan_37\"><span><sup></sup>0<sup>€</sup></span>/ month</span>\n                                                </div>\n                                                <div class=\"plan-features\">\n                                                    <span class=\"plan-features-title\">Available features are :</span>                                                                                                        </span>\n                                                    <ul class=\"list-unstyled\">\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i>\n                                                            Service 1                                                            \n                                                        </li>\n                                                    </ul>\n                                                </div>\n                                                <div class=\"plan-btn plan-picker\">\n                                                    <a href=\"plan-a.php\" class=\"btn btn-rect btn-primary d-block d-md-inline-block\" id=\"plana\">Subcribe</a>\n                                                </div>\n                                            </div>  \n                                    </div>\n                                    <!-- end .plan-item -->\n                                    \n                                    <!-- begin .plan-item -->\n                                    <div class=\"col-lg-15 col-md-4 col-sm-6 col-xs-12 box \">                      \n                                            <div class=\"plan-tile\"> \n                                                <div class=\"plan-box-header\"></div>\n                                                <div class=\"plan-title\">STARTER</div>\n                                                <div class=\"plan-tag\">For small companiess</div>\n                                                <div class=\"plan-feat\">The service 1 and product 1 at low price</div>\n                                                <div class=\"plan-pricer\">\n                                                    <span class=\"plan-price\" id=\"starter\"><span><sup></sup>29<sup>€</sup></span>/ month</span>\n                                                </div>\n                                                <div class=\"plan-features\">\n                                                    <span class=\"plan-features-title\">Available features are :</span>                                                                                                        </span>\n                                                    <ul class=\"list-unstyled\">\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i>\n                                                            Service 1\n                                                        </li>\n                                                        <li>\n                                                        	<i class=\"fa fa-check\"></i>\n                                                        	Product 1\n                                                        </li>\n                                                    </ul>\n                                                </div>\n                                                <div class=\"plan-btn plan-picker\">\n                                                    <a href=\"plan-b.php\" class=\"btn btn-rect btn-primary d-block d-md-inline-block\" id=\"planb\">Subscribe</a>\n                                                </div>\n                                            </div>  \n                                    </div>\n                                    <!-- end .plan-item -->\n                                    \n                                    <!-- Most popular plan box -->\n                                    <div class=\"col-lg-15 col-md-4 col-sm-6 col-xs-12 box most-popular-plan-box2 most-popular-plan-box \">                  \n                                        <div class=\"plan-tile\">\n                                            <div class=\"plan-box-header\" id=\"default\"></div> \n                                                <div class=\"plan-title\">PREMIUM</div>\n                                                <div class=\"plan-tag\">For large companies</div>\n                                                <div class=\"plan-feat\">The full option package for a one shot price\n                                                </div>\n                                                <div class=\"plan-pricer\">\n                                                    <span class=\"plan-price planPremiumPrice\" id=\"premium\"><span><sup></sup>2499<sup>€</sup></span></span>\n                                                </div>\n                                                <div class=\"plan-features\">\n                                                    <span class=\"plan-features-title\">Available features are :</span>\n                                                    <ul class=\"list-unstyled\">\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i> \n                                                            Service 1                                                        </li>\n                                                        <li id=\"higherFeature\" class=\"hide\">\n                                                            <i class=\"fa fa-check\"></i> \n                                                            Service 2                                                        </li>\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i> \n                                                            Product 1                                                        </li>\n                                                    </ul>\n                                                </div>\n                                                <div class=\"plan-btn plan-picker\">\n                                                    <a href=\"planc.php\" class=\"btn btn-rect btn-primary d-block d-md-inline-block maincolorbisbackground\" id=\"planc\">Buy</a>\n                                                </div>\n                                            </div>  \n                                    </div>\n                                    <!-- Ends // Most Popular Plan Box --> \n                                </div>\n                                <!-- end .row -->\n                            </div>\n                            <!-- end .container -->\n                        </div>\n                        <!-- end .item -->\n                    </div>\n                    <!-- end .row -->\n                <!-- end .carousel -->          \n            </div>\n        </div>\n      </section>\n      \n      \n        \n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(15,5,'privacy-policies','','Privacy Policies','Privacy Policies','Privacy policies, GDPR','<div class=\"page\">\n          \n    \n        <?php includeContainer(\'header\'); ?>\n\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Privacy Policy</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n<br><br><br>\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\" style=\"margin-top: 50px\">\n            <div class=\"container\">\n<p style = \"text-align: justify;\"> <h2> Information collected and used </h2> <br> </p>\n<p style = \"text-align: justify;\"> * Your customer information (email, phone, business name, first and last name of contact, address, postal code, country and VAT number) are stored when you become a customer. This information allows us to bill you. </ P>\n<p style = \"text-align: justify;\"> * If you paid using our online service, we also store the last 4 digits of your card. The full details of your credit card is stored by our payment provider Stripe (the world leader in online payment).</p>\n<p style = \"text-align: justify;\"> * You have the option to request the deletion of your data and the above information at any time (except data required y fiscal tracking rules, like your invoices). </p>\n<p style = \"text-align: justify;\"> * The Privacy Policies and GDPR referral contact for our services is: <?php echo $conf->global->MAIN_INFO_GDPR; ?> </p>\n<p style = \"text-align: justify;\"> <br> </p>\n<p style = \"text-align: justify;\"> <h2> Data Storage and Backups </h2> <br> </p>\n<p style = \"text-align: justify;\"> * The storage of collected data (see \'Information collected and used\') is done in a database. </p>\n<p style = \"text-align: justify;\"> * We made one backup every week. Only 4 weeks are kept. <br> </p>\n<p style = \"text-align: justify;\"> <br> </p>\n<p style = \"text-align: justify;\"> <h2> Subcontractor </h2> <br> </p>\n<p style = \"text-align: justify;\"> * Our services relies on the following subcontractors and service: <br>\n** The host of computer servers, which is ABC company. These servers are hosted in US. No customer information is communicated to this subcontractor who only provides the hardware and network layer, the installation and operation being carried out by us directly. <br>\n** The online payment service <a href=\"https://www.stripe.com\">Stripe</a>, which is used, to ensure regular payment of subscription or your invoices paid online. </p>\n<p style = \"text-align: justify;\"> <br> </p>\n<p style = \"text-align: justify;\"> <h2> Software Protection </h2> <br> </p>\n<p style = \"text-align: justify;\"> * Our services runs on Linux Ubuntu systems and software. They benefit from regular security updates when the operating system editor (Ubuntu Canonical) publishes them. <br> </p>\n<p style = \"text-align: justify;\"> * Our services are accessible in HTTPS (HTTP encrypted) only, encrypted with SHA256 certificates.<br> </p>\n<p style = \"text-align: justify;\"> * Our technical platform are protected by various solutions. <br> </p>\n<p style = \"text-align: justify;\"> <br> </p>\n<p style = \"text-align: justify;\"> <h2> Data theft </h2> <br> </p>\n<p style = \"text-align: justify;\"> * In case of suspicion of a theft of the data we have collected (see first point \'Information collected and used\'), customers will be informed by email, at email corresponding to their customer account <br> </p>\n<p style=\"text-align: justify;\"> </p>\n            </div>\n        </section>\n\n\n      <?php includeContainer(\'footer\'); ?>\n      \n      \n</div>\n    \n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(16,5,'product-p','','Product P','Product P','','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Product P</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div style=\"margin: 50px\"><div class=\"text-align: center\">\n<br>\n<br>\n<br>\nThis is a description page of our product P...<br>\n<br>\n<br>\n<br>\n<br>\n            </div></div>\n        </section>\n\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(17,5,'search','','Search Page','Search Page','','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Search</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n<br><br><br>\n\n<center>\n     \n    <div style=\"width: 60%\">\n    <form class=\"rd-search\" action=\"search.php\" method=\"POST\">\n        <input type=\"hidden\" name=\"token\" value=\"<?php echo newToken(); ?>\" />\n        <div class=\"form-wrap\">\n                  <input class=\"form-input\" id=\"rd-search-form-input\" type=\"text\" name=\"s\" autocomplete=\"off\" placeholder=\"Search...\" value=\"<?php echo dol_escape_htmltag(GETPOST(\'s\', \'alphanohtml\')); ?>\">\n                  <div class=\"rd-search-results-live cleared\" id=\"rd-search-results-live\"></div>\n        </div>\n        <button class=\"rd-search-submit buttonwithnoborder\" type=\"submit\"><span class=\"icon icon-xs icon-dusty-gray fa fa-search\"></span></button>\n    </form>\n    </div>\n    <br>\n                      \n     <?php\n     $weblangs->load(\"main\");\n     \n     if (function_exists(\'getPagesFromSearchCriterias\'))\n     {\n         if (GETPOSTISSET(\'s\'))\n         {\n             $listofpages = getPagesFromSearchCriterias(\'page\', \'meta\', GETPOST(\'s\', \'alphanohtml\'));\n             if ($listofpages[\'code\'] == \'OK\')\n             {\n                 foreach($listofpages[\'list\'] as $websitepagefound)\n                 {\n                    print \'<div class=\"rowsearchresult\"><a href=\"\'.$websitepagefound->ref.\'.php\">\'.$websitepagefound->title.\'</a> - \'.$websitepagefound->description.\'</div>\';\n                 }\n             }\n             else\n             {\n                 // If error, show message\n                 print $listofpages[\'message\'];\n             }\n         }\n     }\n     else\n     {\n         print $weblangs->trans(\"FeatureNotYetAvailable\");\n     }\n     ?>\n                      \n<br><br><br><br><br><br>\n</center>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(18,5,'service-s','','Service S','Service S','','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Service S</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div style=\"margin: 50px\"><div class=\"text-align: center\">\n<br>\n<br>\n<br>\nThis is a description page of our service S...<br>\n<br>\n<br>\n<br>\n<br>\n            </div></div>\n        </section>\n\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(19,5,'test','','test','Page test','test','Test\n<!-- Test \n<?php var_dump($langs->defaultlang); ?>\n<?php var_dump($weblangs->defaultlang); ?>\n-->',1,'2020-10-07 13:13:26',NULL,'2020-10-07 11:13:26',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(20,4,'credits','','Credits','Credits and legal notices','','	\n		<!-- Wrapper -->\n			<div id=\"wrapper\">\n\n				<!-- Header -->\n					<header id=\"header\">\n						<h1>Mentions légales</h1>\n						<p>Curriculum Vitae</p>\n					</header>\n\n                <!-- Menu -->\n                <?php includeContainer(\'menu\'); ?>\n\n				<!-- Main -->\n					<div id=\"main\">\n\n						<!-- Content -->\n							<section id=\"content\" class=\"main\">\n\n								<div class=\"chapo\"><p>\n								    \nThis site is edited by <?php echo $mysoc->name; ?>\n\n								    \n								</div>\n\n							</section>\n\n					</div>\n\n				<!-- Footer -->\n				<?php includeContainer(\'footer\'); ?>\n\n			</div>\n\n',1,'2019-08-15 16:39:56',NULL,'2020-02-21 09:27:17',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(21,4,'footer','','Footer','','','				<!-- Footer -->\n                    <footer id=\"footer\">\n						<section contenteditable=\"true\">\n							<h2>Aliquam sed mauris</h2>\n							<p>Sed lorem ipsum dolor sit amet et nullam consequat feugiat consequat magna adipiscing tempus etiam dolore veroeros. eget dapibus mauris. Cras aliquet, nisl ut viverra sollicitudin, ligula erat egestas velit, vitae tincidunt odio.</p>\n							<ul class=\"actions\">\n								<li><a href=\"generic.php\" class=\"buttonwebsite\">Learn More</a></li>\n							</ul>\n						</section>\n						<section contenteditable=\"true\">\n							<h2>Etiam feugiat</h2>\n							<dl class=\"alt\">\n								<dt>Address</dt>\n								<dd><?php echo $mysoc->getFullAddress(1, \'<br>\'); ?></dd>\n								<dt>Phone</dt>\n								<dd><?php echo $mysoc->phone; ?></dd>\n								<dt>Email</dt>\n								<dd><a href=\"mailto:<?php echo $mysoc->email; ?>\"><?php echo $mysoc->email; ?></a></dd>\n							</dl>\n							<ul class=\"icons\">\n	                          <ul class=\"list-inline\">\n                              <?php foreach($mysoc->socialnetworks as $key => $value) {\n                                print \'<li><a target=\"_blank\" class=\"icon alt fab fa-\'.$key.\'\" href=\"\'.(preg_match(\'/^http/\', $value) ? $value : \'https://www.\'.$key.\'.com/\'.$value).\'\"><span class=\"label\">\'.ucfirst($key).\'</span></a></li>\';\n                              } ?>\n                            </ul>\n						</section>\n						<div class=\"copyright\">&copy; Untitled. Design: <a href=\"https://html5up.net\">HTML5 UP</a> adapted for <a href=\"https://www.dolibarr.org\">Dolibarr</a> by <a href=\"https://www.nltechno.com\">NLTechno</a>.</div>\n					</footer>\n\n\n<script>\n// When the user scrolls down 20px from the top of the document, show the button\nwindow.onscroll = function() {scrollFunction()};\n\nfunction scrollFunction() {\n  console.log(\"Execute code for scroll Top button\");\n  if (document.body.scrollTop > 20 || document.documentElement.scrollTop > 20) {\n    document.getElementById(\"myBtnToTop\").style.display = \"block\";\n  } else {\n    document.getElementById(\"myBtnToTop\").style.display = \"none\";\n  }\n}\n\n// When the user clicks on the button, scroll to the top of the document\nfunction topFunction() {\n  document.body.scrollTop = 0; // For Safari\n  document.documentElement.scrollTop = 0; // For Chrome, Firefox, IE and Opera\n}\n</script>\n\n<button onclick=\"topFunction()\" id=\"myBtnToTop\" title=\"Go to top\">Top</button>\n',1,'2019-08-15 16:42:44',NULL,'2020-06-19 08:18:14',NULL,NULL,'page','fr',NULL,'','',NULL,'','',0,NULL,NULL),(22,4,'generic','','Generic page','Generic page or my personal Blog','My generic page','	\n<!-- Wrapper -->\n<div id=\"wrapper\">\n\n	<!-- Header -->\n		<header id=\"header\">\n			<h1>Another page</h1>\n			<p>Ipsum dolor sit amet nullam</p>\n		</header>\n\n    <!-- Menu -->\n    <?php includeContainer(\'menu\'); ?>\n\n	<!-- Main -->\n	<div id=\"main\">\n\n		<!-- Content -->\n		<section id=\"content\" class=\"main\" contenteditable=\"true\">\n			<span class=\"image main\"><img src=\"medias/image/template-stellar/pic01.jpg\" alt=\"\" /></span>\n			<h2>Magna feugiat lorem</h2>\n			<p>Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet. Pellentesque leo mauris, consectetur id ipsum sit amet, fergiat. Pellentesque in mi eu massa lacinia malesuada et a elit. Donec urna ex, lacinia in purus ac, pretium pulvinar mauris. Curabitur sapien risus, commodo eget turpis at, elementum convallis fames ac ante ipsum primis in faucibus.</p>\n			<p>Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet.</p>\n			<h2>Tempus veroeros</h2>\n			<p>Cep risus aliquam gravida cep ut lacus amet. Adipiscing faucibus nunc placerat. Tempus adipiscing turpis non blandit accumsan eget lacinia nunc integer interdum amet aliquam ut orci non col ut ut praesent.</p>\n		</section>\n\n        <!-- Blog list -->\n        <section id=\"sectionnews\" contenteditable=\"true\" class=\"main section-50 section-md-50 section-md-bottom-50\">\n			<h2>Latest Blog posts</h2>\n            <div class=\"center\">\n            <?php \n            $keyword = \'\';\n            $weblangs->loadLangs(array(\"main\",\"website\"));\n            $fuser = new User($db);\n            $arrayofblogs = $websitepage->fetchAll($website->id, \'DESC\', \'date_creation\', 5, 0, array(\'type_container\'=>\'blogpost\', \'status\'=>1, \'lang\'=>\'null,\'.$websitepage->lang));  // , \'keywords\'=>$keyword\n            if (is_numeric($arrayofblogs) && $arrayofblogs < 0)\n            {\n                print \'<div class=\"error\">\'.$weblangs->trans($websitepage->error).\'</div>\';\n            }\n            elseif (is_array($arrayofblogs) && ! empty($arrayofblogs))\n            {\n                foreach($arrayofblogs as $blog)\n                {\n                    print \'<div class=\"row justify-content-sm-center row-40\">\';\n                    print \'<div class=\"container blog-box centpercent\" style=\"padding: 20px; transition: .3s all ease;\">\';\n                                print \'<a href=\"\'.$blog->pageurl.\'.php\">\';\n                                print \'<div class=\"post-boxed-img-wrap\"><img src=\"\'.($blog->image ? \'viewimage.php?modulepart=medias&file=\'.$blog->image : \'medias/image/\'.$website->ref.\'/calendar.svg\"\').\'\" alt=\"\" width=\"120\"></div>\';\n                                print \'<div class=\"post-boxed-caption\">\';\n                                print \'<div class=\"post-boxed-title font-weight-bold\">\'.$blog->title.\'</div>\';\n                                print \'<ul class=\"list-inline list-inline-dashed text-uppercase\">\';\n                                print \'<li>\'.dol_print_date($blog->date_creation, \'daytext\', \'tzserver\', $weblangs).\'</li>\';\n                                $fuser->fetch($blog->fk_user_creat);\n                                print \'<li><span>by<span> <span class=\"text-primary\">\'.($fuser->firstname?$fuser->firstname:$fuser->login).\'</span></span></li>\';\n                                print \'</ul>\';\n                                print \'</div>\';\n                                //includeContainer($blog->pageurl);\n                                print \'<span class=\"nohover\">\'.$blog->description.\'</span>\';\n                                print \'</a>\';\n                    print \'</div>\';\n                    print \'</div>\';\n                }\n            }\n            else\n            {\n                    print \'<div class=\"row justify-content-sm-center row-40\">\';\n                    print \'<div class=\"container blog-box centpercent\" style=\"padding: 20px; transition: .3s all ease;\">\';\n                    //print $weblangs->trans(\"NoArticlesFoundForTheKeyword\", $keyword);\n                    print $weblangs->trans(\"NoArticlesFound\");\n                    print \'</div>\';\n                    print \'</div>\';\n                \n            }\n            ?>\n            </div>\n        </section>\n\n	</div>\n\n\n\n	<!-- Footer -->\n	<?php includeContainer(\'footer\'); ?>\n	\n	\n</div>\n\n',1,'2019-08-15 00:03:43',NULL,'2020-05-14 16:48:34',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(23,4,'home','','My personal blog','Home page or my personal Blog','My personal blog','<!-- Wrapper -->\n<div id=\"wrapper\">\n\n	<!-- Header -->\n		<header id=\"header\">\n			<section id=\"sectionheader\" contenteditable=\"true\">\n			<h1>David Doe</h1>\n			<p>Welcome on my website<br />\n			</p>\n			</section>\n		</header>\n\n	<!-- Nav -->\n    <?php includeContainer(\'menu\'); ?>\n\n	<!-- Main -->\n		<div id=\"main\">\n\n			<!-- Introduction -->\n				<section id=\"sectionintro\" class=\"main\" contenteditable=\"true\">\n					<div class=\"spotlight\">\n						<div class=\"content\">\n							<header class=\"major\">\n								<h2>Ipsum sed adipiscing</h2>\n							</header>\n							<p>Sed lorem ipsum dolor sit amet nullam consequat feugiat consequat magna\n							adipiscing magna etiam amet veroeros. Lorem ipsum dolor tempus sit cursus.\n							Tempus nisl et nullam lorem ipsum dolor sit amet aliquam.</p>\n							<ul class=\"actions\">\n								<li><a href=\"generic.php\" class=\"buttonwebsite\">Learn More</a></li>\n							</ul>\n						</div>\n						<span class=\"image\"><img class=\"logowebsite\" src=\"medias/image/template-stellar/daviddoe.png\" alt=\"\" /></span>\n					</div>\n				</section>\n\n			<!-- First Section -->\n				<section id=\"sectionfirst\" id=\"first\" class=\"main special\" contenteditable=\"true\">\n					<header class=\"major\">\n						<h2>Magna veroeros</h2>\n					</header>\n					<ul class=\"features\">\n						<li>\n							<span class=\"icon solid major style1 fa-code\"><!-- keep this comment --></span>\n							<h3>Ipsum consequat</h3>\n							<p>Sed lorem amet ipsum dolor et amet nullam consequat a feugiat consequat tempus veroeros sed consequat.</p>\n						</li>\n						<li>\n							<span class=\"icon major style3 fa-copy\"><!-- keep this comment  --></span>\n							<h3>Amed sed feugiat</h3>\n							<p>Sed lorem amet ipsum dolor et amet nullam consequat a feugiat consequat tempus veroeros sed consequat.</p>\n						</li>\n						<li>\n							<span class=\"icon major style5 fa-at\"><!-- keep this comment  --></span>\n							<h3>Dolor nullam</h3>\n							<p>Sed lorem amet ipsum dolor et amet nullam consequat a feugiat consequat tempus veroeros sed consequat.</p>\n						</li>\n					</ul>\n					<footer class=\"major\">\n						<ul class=\"actions special\">\n							<li><a href=\"generic.php\" class=\"buttonwebsite\">Learn More</a></li>\n						</ul>\n					</footer>\n				</section>\n\n			<!-- Second Section -->\n				<section id=\"sectionsecond\" class=\"main special\" contenteditable=\"true\">\n					<header class=\"major\">\n						<h2>Ipsum consequat</h2>\n						<p>Donec imperdiet consequat consequat. Suspendisse feugiat congue<br />\n						posuere. Nulla massa urna, fermentum eget quam aliquet.</p>\n					</header>\n					<ul class=\"statistics\">\n						<li class=\"style1\">\n							<span class=\"icon solid fa-code-branch\"><!-- keep this comment  --></span>\n							<strong>5,120</strong> Etiam\n						</li>\n						<li class=\"style2\">\n							<span class=\"icon fa-folder-open\"><!-- keep this comment  --></span>\n							<strong>8,192</strong> Magna\n						</li>\n						<li class=\"style3\">\n							<span class=\"icon solid fa-signal\"><!-- keep this comment  --></span>\n							<strong>2,048</strong> Tempus\n						</li>\n						<li class=\"style4\">\n							<span class=\"icon solid fa-laptop\"><!-- keep this comment  --></span>\n							<strong>4,096</strong> Aliquam\n						</li>\n						<li class=\"style5\">\n							<span class=\"icon fa-gem\"><!-- keep this comment  --></span>\n							<strong>1,024</strong> Nullam\n						</li>\n					</ul>\n					<p class=\"content\">Nam elementum nisl et mi a commodo porttitor. Morbi sit amet nisl eu arcu faucibus hendrerit vel a risus. Nam a orci mi, elementum ac arcu sit amet, fermentum pellentesque et purus. Integer maximus varius lorem, sed convallis diam accumsan sed. Etiam porttitor placerat sapien, sed eleifend a enim pulvinar faucibus semper quis ut arcu. Ut non nisl a mollis est efficitur vestibulum. Integer eget purus nec nulla mattis et accumsan ut magna libero. Morbi auctor iaculis porttitor. Sed ut magna ac risus et hendrerit scelerisque. Praesent eleifend lacus in lectus aliquam porta. Cras eu ornare dui curabitur lacinia.</p>\n					<footer class=\"major\">\n						<ul class=\"actions special\">\n							<li><a href=\"generic.php\" class=\"buttonwebsite\">Learn More</a></li>\n						</ul>\n					</footer>\n				</section>\n\n			<!-- Get Started -->\n				<section id=\"sectioncta\" class=\"main special\" contenteditable=\"true\">\n					<header class=\"major\">\n						<h2>Congue imperdiet</h2>\n						<p>Donec imperdiet consequat consequat. Suspendisse feugiat congue<br />\n						posuere. Nulla massa urna, fermentum eget quam aliquet.</p>\n					</header>\n					<footer class=\"major\">\n						<ul class=\"actions special\">\n							<li><a href=\"generic.php\" class=\"buttonwebsite primary\">Get Started</a></li>\n							<li><a href=\"generic.php\" class=\"buttonwebsite\">Learn More</a></li>\n						</ul>\n					</footer>\n				</section>\n\n		</div>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n\n',1,'2019-08-15 00:03:43',NULL,'2020-11-26 10:30:41',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(24,4,'menu','','Menu','Menu common to all pages','','<nav id=\"nav\">\n	<ul>\n		<li><a href=\"home.php\">Introduction</a></li>\n		<li><a href=\"home.php#sectionfirst\">Section on home page</a></li>\n		<li><a href=\"home.php#sectionsecond\">Another section on home page</a></li>\n		<li><a href=\"generic.php\">Another page</a></li>\n	</ul>\n</nav>\n',1,'2019-08-15 00:03:43',NULL,'2020-02-21 09:27:17',NULL,NULL,'menu','fr',NULL,'','',NULL,'','',0,NULL,NULL),(25,4,'this-is-a-blog-post','','This is a Blog post','This is a full meta description of the article','blog','<!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable=\"true\" if you want to use the inline editor for the content  -->\n<section id=\"mysection1\" contenteditable=\"true\" style=\"background: #fff; color: #000;\">\n    This is a blog post article...\n</section>\n',1,'2019-08-17 17:18:45',NULL,'2020-05-14 16:54:52',NULL,NULL,'blogpost','',NULL,'','',NULL,'','webmaster',0,NULL,NULL);
 /*!40000 ALTER TABLE `llx_website_page` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -13655,7 +15823,7 @@ CREATE TABLE `tmp_user` (
 
 LOCK TABLES `tmp_user` WRITE;
 /*!40000 ALTER TABLE `tmp_user` DISABLE KEYS */;
-INSERT INTO `tmp_user` VALUES (1,'2012-07-08 13:20:11','2019-11-28 11:52:58',NULL,NULL,'aeinstein',0,NULL,NULL,NULL,1,0,NULL,'11c9c772d6471aa24c27274bdd8a223b',NULL,NULL,'Einstein','Albert','',NULL,'123456789','','','','aeinstein@example.com','','[]','',0,'',1,1,NULL,NULL,NULL,'','2017-10-05 08:32:44','2017-10-03 11:43:50',NULL,'',1,'alberteinstein.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'aaaaff','',NULL,0,0,NULL,NULL,NULL,44.00000000,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(2,'2012-07-08 13:54:48','2019-11-28 11:52:58',NULL,NULL,'demo',1,NULL,NULL,NULL,1,0,NULL,'fe01ce2a7fbac8fafaed7c982a04e229',NULL,NULL,'Doe','David','Trainee',NULL,'09123123','','','','daviddoe@example.com','','[]','',0,'',1,1,NULL,NULL,NULL,'','2018-07-30 23:10:54','2018-07-30 23:04:17',NULL,'',1,'person9.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,35.00000000,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(3,'2012-07-11 16:18:59','2020-01-21 09:30:27',NULL,NULL,'pcurie',1,NULL,NULL,NULL,1,0,NULL,'ab335b4eb4c3c99334f656e5db9584c9',NULL,NULL,'Curie','Pierre','',NULL,'','','','','pcurie@example.com','','[]','',0,'',1,1,NULL,NULL,2,'','2014-12-21 17:38:55',NULL,NULL,'',1,'pierrecurie.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(4,'2015-01-23 17:52:27','2019-11-28 11:52:58',NULL,NULL,'bbookkeeper',1,NULL,NULL,NULL,1,0,NULL,'a7d30b58d647fcf59b7163f9592b1dbb',NULL,NULL,'Bookkeeper','Bob','Bookkeeper',NULL,'','','','','bbookkeeper@example.com','','{\"skype\":\"skypebbookkeeper\"}','',0,'',1,1,17,6,NULL,'','2015-02-25 10:18:41','2015-01-23 17:53:20',NULL,'',1,'person8.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,16.00000000,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(10,'2017-10-03 11:47:41','2019-11-28 11:52:58',NULL,NULL,'mcurie',1,NULL,NULL,NULL,1,0,NULL,'52cda011808bb282d1d3625ab607a145',NULL,'t3mnkbhs','Curie','Marie','',NULL,'','','','','mcurie@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'mariecurie.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'ffaaff','',NULL,0,0,NULL,NULL,NULL,44.00000000,'woman',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(11,'2017-10-05 09:07:52','2019-11-28 11:52:58',NULL,NULL,'zzeceo',1,NULL,NULL,NULL,1,0,NULL,'92af989c4c3a5140fb5d73eb77a52454',NULL,'cq78nf9m','Zeceo','Zack','President - CEO',NULL,'','','','','zzeceo@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'','2017-10-05 22:48:08','2017-10-05 21:18:46',NULL,'',1,'person4.jpeg',NULL,NULL,NULL,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,NULL,NULL,'2019-06-10 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(12,'2017-10-05 09:09:46','2020-01-07 13:47:17',NULL,NULL,'admin',0,NULL,NULL,NULL,1,0,NULL,'f6fdffe48c908deb0f4c3bd36c032e72',NULL,'nd6hgbcr','Adminson','Alice','Admin Technical',NULL,'','','','','aadminson@example.com','','[]','Alice - 123',1,NULL,1,1,NULL,NULL,NULL,'','2020-01-21 10:38:41','2020-01-21 10:35:27',NULL,'',1,'person6.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,2700.00000000,NULL,NULL,39.00000000,'woman',NULL,NULL,NULL,'generic_user_odt','1985-09-15',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(13,'2017-10-05 21:29:35','2019-11-28 11:52:58',NULL,NULL,'ccommercy',1,NULL,NULL,NULL,1,0,NULL,'179858e041af35e8f4c81d68c55fe9da',NULL,'y451ksdv','Commercy','Coraly','Commercial leader',NULL,'','','','','ccommercy@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'person7.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,1890.00000000,NULL,NULL,25.00000000,'woman',NULL,'2018-09-11 00:00:00',NULL,NULL,'1998-12-08',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(14,'2017-10-05 21:33:33','2019-11-28 11:52:58',NULL,NULL,'sscientol',1,NULL,NULL,NULL,1,0,NULL,'39bee07ac42f31c98e79cdcd5e5fe4c5',NULL,'s2hp8bxd','Scientol','Sam','Scientist leader',NULL,'','','','','sscientol@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'person3.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,3500.00000000,NULL,NULL,39.00000000,NULL,NULL,'2018-07-03 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(16,'2017-10-05 22:47:52','2019-11-28 11:52:58',NULL,NULL,'ccommerson',1,NULL,NULL,NULL,1,0,NULL,'d68005ccf362b82d084551b6291792a3',NULL,'cx9y1dk0','Charle1','Commerson','Sale representative',NULL,'','','','','ccommerson@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'','2017-10-05 23:46:24','2017-10-05 23:37:31',NULL,'',1,'person1.jpeg',NULL,NULL,13,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,2900.00000000,NULL,NULL,39.00000000,NULL,NULL,'2019-09-01 00:00:00',NULL,NULL,'1976-02-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(17,'2017-10-05 22:48:39','2019-11-28 11:52:58',NULL,NULL,'aleerfok',1,NULL,NULL,NULL,1,0,NULL,'a964065211872fb76f876c6c3e952ea3',NULL,'gw8cb7xj','Leerfok','Amanda','Sale representative',NULL,'','','','','aleerfok@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'','2017-10-05 23:16:06',NULL,NULL,'',0,'person5.jpeg',NULL,NULL,13,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,'woman',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(18,'2018-01-22 17:27:02','2019-11-28 11:52:58',NULL,NULL,'ldestailleur',1,NULL,NULL,NULL,1,0,NULL,'1bb7805145a7a5066df9e6d585b8b645',NULL,'87g06wbx','Destailleur','Laurent','Project leader of Dolibarr ERP CRM',NULL,'','','','','ldestailleur@example.com','','[]','<div><strong>Laurent DESTAILLEUR</strong></div>\r\n\r\n<div>\r\n<div><span style=\"color:#606163; font-family:arial; font-size:medium\"><strong>Project Director</strong></span><br />\r\n<span style=\"color:#336699\"><span style=\"color:#993399; font-family:tahoma,new york,times,serif\"><span style=\"color:#336699\">ldestailleur@example.com</span></span></span></div>\r\n\r\n<div>&nbsp;</div>\r\n\r\n<div>\r\n<div><span style=\"color:#993399; font-family:arial,helvetica,sans-serif; font-size:small\"><span style=\"color:#336699\"><a href=\"http://www.facebook.com/teclib\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">Facebook</a></span>&nbsp;|&nbsp;<span style=\"color:#336699\"><a href=\"http://twitter.com/teclib\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">Twitter</a></span>&nbsp;|&nbsp;<span style=\"color:#336699\"><span style=\"color:#993399\"><a href=\"http://www.teclib.com/\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">www.teclib.com</a></span></span></span></div>\r\n</div>\r\n</div>',0,NULL,1,1,10,10,NULL,'More information on http://www.destailleur.fr','2019-10-04 10:06:40','2017-09-06 11:55:30',NULL,'',1,'ldestailleur_200x200.jpg',NULL,NULL,NULL,NULL,NULL,NULL,'','','',NULL,NULL,'007f7f','',NULL,0,0,NULL,NULL,NULL,NULL,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(19,'2017-02-02 03:55:44','2020-01-16 15:44:42',NULL,NULL,'aboston',1,NULL,NULL,NULL,1,0,NULL,'a7a77a5aff2d5fc2f75f2f61507c88d4',NULL,NULL,'Boston','Alex','',NULL,'','','','','aboston@example.com','','[]','<strong>Alex Boston</strong><br />\r\nAdmin support service - 555 01 02 03 04',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',0,'person2.jpeg',NULL,NULL,12,NULL,NULL,25.00000000,'','','',NULL,NULL,'ff00ff','',NULL,0,0,2700.00000000,NULL,NULL,32.00000000,NULL,NULL,'2016-11-04 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL);
+INSERT INTO `tmp_user` VALUES (1,'2012-07-08 13:20:11','2019-11-28 11:52:58',NULL,NULL,'aeinstein',0,NULL,NULL,NULL,1,0,NULL,'11c9c772d6471aa24c27274bdd8a223b',NULL,NULL,'Einstein','Albert','',NULL,'123456789','','','','aeinstein@example.com','','[]','',0,'',1,1,NULL,NULL,NULL,'','2017-10-05 08:32:44','2017-10-03 11:43:50',NULL,'',1,'alberteinstein.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'aaaaff','',NULL,0,0,NULL,NULL,NULL,44.00000000,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(2,'2012-07-08 13:54:48','2019-11-28 11:52:58',NULL,NULL,'demo',1,NULL,NULL,NULL,1,0,NULL,'fe01ce2a7fbac8fafaed7c982a04e229',NULL,NULL,'Doe','David','Trainee',NULL,'09123123','','','','daviddoe@example.com','','[]','',0,'',1,1,NULL,NULL,NULL,'','2018-07-30 23:10:54','2018-07-30 23:04:17',NULL,'',1,'person9.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,35.00000000,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(3,'2012-07-11 16:18:59','2020-01-21 09:30:27',NULL,NULL,'pcurie',1,NULL,NULL,NULL,1,0,NULL,'ab335b4eb4c3c99334f656e5db9584c9',NULL,NULL,'Curie','Pierre','',NULL,'','','','','pcurie@example.com','','[]','',0,'',1,1,NULL,NULL,2,'','2014-12-21 17:38:55',NULL,NULL,'',1,'pierrecurie.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(4,'2015-01-23 17:52:27','2019-11-28 11:52:58',NULL,NULL,'bbookkeeper',1,NULL,NULL,NULL,1,0,NULL,'a7d30b58d647fcf59b7163f9592b1dbb',NULL,NULL,'Bookkeeper','Bob','Bookkeeper',NULL,'','','','','bbookkeeper@example.com','','{\"skype\":\"skypebbookkeeper\"}','',0,'',1,1,17,6,NULL,'','2015-02-25 10:18:41','2015-01-23 17:53:20',NULL,'',1,'person8.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,16.00000000,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(10,'2017-10-03 11:47:41','2019-11-28 11:52:58',NULL,NULL,'mcurie',1,NULL,NULL,NULL,1,0,NULL,'52cda011808bb282d1d3625ab607a145',NULL,'t3mnkbhs','Curie','Marie','',NULL,'','','','','mcurie@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'mariecurie.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'ffaaff','',NULL,0,0,NULL,NULL,NULL,44.00000000,'woman',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(11,'2017-10-05 09:07:52','2019-11-28 11:52:58',NULL,NULL,'zzeceo',1,NULL,NULL,NULL,1,0,NULL,'92af989c4c3a5140fb5d73eb77a52454',NULL,'cq78nf9m','Zeceo','Zack','President - CEO',NULL,'','','','','zzeceo@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'','2017-10-05 22:48:08','2017-10-05 21:18:46',NULL,'',1,'person4.jpeg',NULL,NULL,NULL,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,NULL,NULL,'2019-06-10 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(12,'2017-10-05 09:09:46','2020-01-07 13:47:17',NULL,NULL,'admin',0,NULL,NULL,NULL,1,0,NULL,'f6fdffe48c908deb0f4c3bd36c032e72',NULL,'nd6hgbcr','Adminson','Alice','Admin Technical',NULL,'','','','','aadminson@example.com','','[]','Alice - 123',1,NULL,1,1,NULL,NULL,NULL,'','2020-01-21 10:38:41','2020-01-21 10:35:27',NULL,'',1,'person6.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,2700.00000000,NULL,NULL,39.00000000,'woman',NULL,NULL,NULL,'generic_user_odt','1985-09-15',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(13,'2017-10-05 21:29:35','2019-11-28 11:52:58',NULL,NULL,'ccommercy',1,NULL,NULL,NULL,1,0,NULL,'179858e041af35e8f4c81d68c55fe9da',NULL,'y451ksdv','Commercy','Coraly','Commercial leader',NULL,'','','','','ccommercy@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'person7.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,1890.00000000,NULL,NULL,25.00000000,'woman',NULL,'2018-09-11 00:00:00',NULL,NULL,'1998-12-08',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(14,'2017-10-05 21:33:33','2019-11-28 11:52:58',NULL,NULL,'sscientol',1,NULL,NULL,NULL,1,0,NULL,'39bee07ac42f31c98e79cdcd5e5fe4c5',NULL,'s2hp8bxd','Scientol','Sam','Scientist leader',NULL,'','','','','sscientol@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'person3.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,3500.00000000,NULL,NULL,39.00000000,NULL,NULL,'2018-07-03 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(16,'2017-10-05 22:47:52','2019-11-28 11:52:58',NULL,NULL,'ccommerson',1,NULL,NULL,NULL,1,0,NULL,'d68005ccf362b82d084551b6291792a3',NULL,'cx9y1dk0','Charle1','Commerson','Sale representative',NULL,'','','','','ccommerson@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'','2017-10-05 23:46:24','2017-10-05 23:37:31',NULL,'',1,'person1.jpeg',NULL,NULL,13,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,2900.00000000,NULL,NULL,39.00000000,NULL,NULL,'2019-09-01 00:00:00',NULL,NULL,'1976-02-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(17,'2017-10-05 22:48:39','2019-11-28 11:52:58',NULL,NULL,'aleerfok',1,NULL,NULL,NULL,1,0,NULL,'a964065211872fb76f876c6c3e952ea3',NULL,'gw8cb7xj','Leerfok','Amanda','Sale representative',NULL,'','','','','aleerfok@example.com','','[]','',0,NULL,1,1,NULL,NULL,NULL,'','2017-10-05 23:16:06',NULL,NULL,'',0,'person5.jpeg',NULL,NULL,13,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,'woman',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(18,'2018-01-22 17:27:02','2019-11-28 11:52:58',NULL,NULL,'ldestailleur',1,NULL,NULL,NULL,1,0,NULL,'1bb7805145a7a5066df9e6d585b8b645',NULL,'87g06wbx','Destailleur','Laurent','Project leader of Dolibarr ERP CRM',NULL,'','','','','ldestailleur@example.com','','[]','<div><strong>Laurent DESTAILLEUR</strong></div>\r\n\r\n<div>\r\n<div><span style=\"color:#606163; font-family:arial; font-size:medium\"><strong>Project Director</strong></span><br />\r\n<span style=\"color:#336699\"><span style=\"color:#993399; font-family:tahoma,new york,times,serif\"><span style=\"color:#336699\">ldestailleur@example.com</span></span></span></div>\r\n\r\n<div>&nbsp;</div>\r\n\r\n<div>\r\n<div><span style=\"color:#993399; font-family:arial,helvetica,sans-serif; font-size:small\"><span style=\"color:#336699\"><a href=\"http://www.facebook.com/teclib\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">Facebook</a></span>&nbsp;|&nbsp;<span style=\"color:#336699\"><a href=\"http://twitter.com/teclib\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">Twitter</a></span>&nbsp;|&nbsp;<span style=\"color:#336699\"><span style=\"color:#993399\"><a href=\"http://www.teclib.com/\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">www.teclib.com</a></span></span></span></div>\r\n</div>\r\n</div>',0,NULL,1,1,10,10,NULL,'More information on http://www.mydomain.com','2019-10-04 10:06:40','2017-09-06 11:55:30',NULL,'',1,'ldestailleur_200x200.jpg',NULL,NULL,NULL,NULL,NULL,NULL,'','','',NULL,NULL,'007f7f','',NULL,0,0,NULL,NULL,NULL,NULL,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL),(19,'2017-02-02 03:55:44','2020-01-16 15:44:42',NULL,NULL,'aboston',1,NULL,NULL,NULL,1,0,NULL,'a7a77a5aff2d5fc2f75f2f61507c88d4',NULL,NULL,'Boston','Alex','',NULL,'','','','','aboston@example.com','','[]','<strong>Alex Boston</strong><br />\r\nAdmin support service - 555 01 02 03 04',0,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',0,'person2.jpeg',NULL,NULL,12,NULL,NULL,25.00000000,'','','',NULL,NULL,'ff00ff','',NULL,0,0,2700.00000000,NULL,NULL,32.00000000,NULL,NULL,'2016-11-04 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL);
 /*!40000 ALTER TABLE `tmp_user` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -13668,4 +15836,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-06-12 19:29:55
+-- Dump completed on 2020-12-10 13:37:32
diff --git a/dev/initdemo/mysqldump_dolibarr_3.5.0.sql b/dev/initdemo/mysqldump_dolibarr_3.5.0.sql
index 28b05e920d8..46053d1a187 100644
--- a/dev/initdemo/mysqldump_dolibarr_3.5.0.sql
+++ b/dev/initdemo/mysqldump_dolibarr_3.5.0.sql
@@ -181,7 +181,7 @@ CREATE TABLE `llx_actioncomm` (
 
 LOCK TABLES `llx_actioncomm` WRITE;
 /*!40000 ALTER TABLE `llx_actioncomm` DISABLE KEYS */;
-INSERT INTO `llx_actioncomm` VALUES (1,NULL,1,'2010-07-08 14:21:44','2010-07-08 14:21:44',NULL,NULL,50,NULL,'Company AAA and Co added into Dolibarr','2010-07-08 14:21:44','2010-07-08 12:21:44',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Company AAA and Co added into Dolibarr\nAuthor: admin',NULL,NULL),(2,NULL,1,'2010-07-08 14:23:48','2010-07-08 14:23:48',NULL,NULL,50,NULL,'Company Belin SARL added into Dolibarr','2010-07-08 14:23:48','2010-07-08 12:23:48',1,NULL,NULL,2,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Company Belin SARL added into Dolibarr\nAuthor: admin',NULL,NULL),(3,NULL,1,'2010-07-08 22:42:12','2010-07-08 22:42:12',NULL,NULL,50,NULL,'Company Spanish Comp added into Dolibarr','2010-07-08 22:42:12','2010-07-08 20:42:12',1,NULL,NULL,3,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Company Spanish Comp added into Dolibarr\nAuthor: admin',NULL,NULL),(4,NULL,1,'2010-07-08 22:48:18','2010-07-08 22:48:18',NULL,NULL,50,NULL,'Company Prospector Vaalen added into Dolibarr','2010-07-08 22:48:18','2010-07-08 20:48:18',1,NULL,NULL,4,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Company Prospector Vaalen added into Dolibarr\nAuthor: admin',NULL,NULL),(5,NULL,1,'2010-07-08 23:22:57','2010-07-08 23:22:57',NULL,NULL,50,NULL,'Company NoCountry Co added into Dolibarr','2010-07-08 23:22:57','2010-07-08 21:22:57',1,NULL,NULL,5,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Company NoCountry Co added into Dolibarr\nAuthor: admin',NULL,NULL),(6,NULL,1,'2010-07-09 00:15:09','2010-07-09 00:15:09',NULL,NULL,50,NULL,'Company Swiss customer added into Dolibarr','2010-07-09 00:15:09','2010-07-08 22:15:09',1,NULL,NULL,6,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Company Swiss customer added into Dolibarr\nAuthor: admin',NULL,NULL),(7,NULL,1,'2010-07-09 01:24:26','2010-07-09 01:24:26',NULL,NULL,50,NULL,'Company Generic customer added into Dolibarr','2010-07-09 01:24:26','2010-07-08 23:24:26',1,NULL,NULL,7,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Company Generic customer added into Dolibarr\nAuthor: admin',NULL,NULL),(8,NULL,1,'2010-07-10 14:54:27','2010-07-10 14:54:27',NULL,NULL,50,NULL,'Société Client salon ajoutée dans Dolibarr','2010-07-10 14:54:27','2010-07-10 12:54:27',1,NULL,NULL,8,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Société Client salon ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL),(9,NULL,1,'2010-07-10 14:54:44','2010-07-10 14:54:44',NULL,NULL,50,NULL,'Société Client salon invidivdu ajoutée dans Doliba','2010-07-10 14:54:44','2010-07-10 12:54:44',1,NULL,NULL,9,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Société Client salon invidivdu ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL),(10,NULL,1,'2010-07-10 14:56:10','2010-07-10 14:56:10',NULL,NULL,50,NULL,'Facture FA1007-0001 validée dans Dolibarr','2010-07-10 14:56:10','2011-07-18 17:29:22',1,NULL,NULL,9,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Facture FA1007-0001 validée dans Dolibarr\nAuteur: admin',1,'invoice'),(11,NULL,1,'2010-07-10 14:58:53','2010-07-10 14:58:53',NULL,NULL,50,NULL,'Facture FA1007-0001 validée dans Dolibarr','2010-07-10 14:58:53','2011-07-18 17:29:22',1,NULL,NULL,9,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Facture FA1007-0001 validée dans Dolibarr\nAuteur: admin',1,'invoice'),(12,NULL,1,'2010-07-10 15:00:55','2010-07-10 15:00:55',NULL,NULL,50,NULL,'Facture FA1007-0001 passée à payée dans Dolibarr','2010-07-10 15:00:55','2011-07-18 17:29:22',1,NULL,NULL,9,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Facture FA1007-0001 passée à payée dans Dolibarr\nAuteur: admin',1,'invoice'),(13,NULL,1,'2010-07-10 15:13:08','2010-07-10 15:13:08',NULL,NULL,50,NULL,'Société Smith Vick ajoutée dans Dolibarr','2010-07-10 15:13:08','2010-07-10 13:13:08',1,NULL,NULL,10,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Société Smith Vick ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL),(14,NULL,1,'2010-07-10 15:21:00','2010-07-10 16:21:00',NULL,NULL,5,NULL,'RDV avec mon chef','2010-07-10 15:21:48','2010-07-10 13:21:48',1,NULL,NULL,NULL,NULL,0,1,NULL,NULL,0,0,1,0,'',3600,NULL,'',NULL,NULL),(15,NULL,1,'2010-07-10 18:18:16','2010-07-10 18:18:16',NULL,NULL,50,NULL,'Contrat CONTRAT1 validé dans Dolibarr','2010-07-10 18:18:16','2010-07-10 16:18:16',1,NULL,NULL,2,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Contrat CONTRAT1 validé dans Dolibarr\nAuteur: admin',NULL,NULL),(16,NULL,1,'2010-07-10 18:35:57','2010-07-10 18:35:57',NULL,NULL,50,NULL,'Société Mon client ajoutée dans Dolibarr','2010-07-10 18:35:57','2010-07-10 16:35:57',1,NULL,NULL,11,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Société Mon client ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL),(17,NULL,1,'2010-07-11 16:18:08','2010-07-11 16:18:08',NULL,NULL,50,NULL,'Société Dupont Alain ajoutée dans Dolibarr','2010-07-11 16:18:08','2010-07-11 14:18:08',1,NULL,NULL,12,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Société Dupont Alain ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL),(18,NULL,1,'2010-07-11 17:11:00','2010-07-11 17:17:00',NULL,NULL,5,NULL,'Rendez-vous','2010-07-11 17:11:22','2010-07-11 15:11:22',1,NULL,NULL,NULL,NULL,0,1,NULL,NULL,0,0,1,0,'gfgdfgdf',360,NULL,'',NULL,NULL),(19,NULL,1,'2010-07-11 17:13:20','2010-07-11 17:13:20',NULL,NULL,50,NULL,'Société Vendeur de chips ajoutée dans Dolibarr','2010-07-11 17:13:20','2010-07-11 15:13:20',1,NULL,NULL,13,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Société Vendeur de chips ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL),(20,NULL,1,'2010-07-11 17:15:42','2010-07-11 17:15:42',NULL,NULL,50,NULL,'Commande CF1007-0001 validée','2010-07-11 17:15:42','2010-07-11 15:15:42',1,NULL,NULL,13,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Commande CF1007-0001 validée\nAuteur: admin',NULL,NULL),(21,NULL,1,'2010-07-11 18:47:33','2010-07-11 18:47:33',NULL,NULL,50,NULL,'Commande CF1007-0002 validée','2010-07-11 18:47:33','2010-07-11 16:47:33',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Commande CF1007-0002 validée\nAuteur: admin',NULL,NULL),(22,NULL,1,'2010-07-18 11:36:18','2010-07-18 11:36:18',NULL,NULL,50,NULL,'Proposition PR1007-0003 validée','2010-07-18 11:36:18','2011-07-18 17:29:22',1,NULL,NULL,4,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Proposition PR1007-0003 validée\nAuteur: admin',3,'propal'),(23,NULL,1,'2011-07-18 20:49:58','2011-07-18 20:49:58',NULL,NULL,50,NULL,'Invoice FA1007-0002 validated in Dolibarr','2011-07-18 20:49:58','2011-07-18 18:49:58',1,NULL,NULL,2,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1007-0002 validated in Dolibarr\nAuthor: admin',2,'invoice'),(24,NULL,1,'2011-07-28 01:37:00',NULL,NULL,NULL,1,NULL,'Phone call','2011-07-28 01:37:48','2011-07-27 23:37:48',1,NULL,NULL,NULL,2,0,1,NULL,NULL,0,0,1,-1,'',NULL,NULL,'',NULL,NULL),(25,NULL,1,'2011-08-01 02:31:24','2011-08-01 02:31:24',NULL,NULL,50,NULL,'Company mmm added into Dolibarr','2011-08-01 02:31:24','2011-08-01 00:31:24',1,NULL,NULL,15,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Company mmm added into Dolibarr\nAuthor: admin',15,'societe'),(26,NULL,1,'2011-08-01 02:31:43','2011-08-01 02:31:43',NULL,NULL,50,NULL,'Company ppp added into Dolibarr','2011-08-01 02:31:43','2011-08-01 00:31:43',1,NULL,NULL,16,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Company ppp added into Dolibarr\nAuthor: admin',16,'societe'),(27,NULL,1,'2011-08-01 02:41:26','2011-08-01 02:41:26',NULL,NULL,50,NULL,'Company aaa added into Dolibarr','2011-08-01 02:41:26','2011-08-01 00:41:26',1,NULL,NULL,17,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Company aaa added into Dolibarr\nAuthor: admin',17,'societe'),(28,NULL,1,'2011-08-01 03:34:11','2011-08-01 03:34:11',NULL,NULL,50,NULL,'Invoice FA1108-0003 validated in Dolibarr','2011-08-01 03:34:11','2011-08-01 01:34:11',1,NULL,NULL,7,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0003 validated in Dolibarr\nAuthor: admin',5,'invoice'),(29,NULL,1,'2011-08-01 03:34:11','2011-08-01 03:34:11',NULL,NULL,50,NULL,'Invoice FA1108-0003 validated in Dolibarr','2011-08-01 03:34:11','2011-08-01 01:34:11',1,NULL,NULL,7,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0003 changed to paid in Dolibarr\nAuthor: admin',5,'invoice'),(30,NULL,1,'2011-08-06 20:33:54','2011-08-06 20:33:54',NULL,NULL,50,NULL,'Invoice FA1108-0004 validated in Dolibarr','2011-08-06 20:33:54','2011-08-06 18:33:54',1,NULL,NULL,7,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0004 validated in Dolibarr\nAuthor: admin',6,'invoice'),(31,NULL,1,'2011-08-06 20:33:54','2011-08-06 20:33:54',NULL,NULL,50,NULL,'Invoice FA1108-0004 validated in Dolibarr','2011-08-06 20:33:54','2011-08-06 18:33:54',1,NULL,NULL,7,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0004 changed to paid in Dolibarr\nAuthor: admin',6,'invoice'),(38,NULL,1,'2011-08-08 02:41:55','2011-08-08 02:41:55',NULL,NULL,50,NULL,'Invoice FA1108-0005 validated in Dolibarr','2011-08-08 02:41:55','2011-08-08 00:41:55',1,NULL,NULL,2,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0005 validated in Dolibarr\nAuthor: admin',8,'invoice'),(40,NULL,1,'2011-08-08 02:53:40','2011-08-08 02:53:40',NULL,NULL,50,NULL,'Invoice FA1108-0005 changed to paid in Dolibarr','2011-08-08 02:53:40','2011-08-08 00:53:40',1,NULL,NULL,2,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0005 changed to paid in Dolibarr\nAuthor: admin',8,'invoice'),(41,NULL,1,'2011-08-08 02:54:05','2011-08-08 02:54:05',NULL,NULL,50,NULL,'Invoice FA1007-0002 changed to paid in Dolibarr','2011-08-08 02:54:05','2011-08-08 00:54:05',1,NULL,NULL,2,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1007-0002 changed to paid in Dolibarr\nAuthor: admin',2,'invoice'),(42,NULL,1,'2011-08-08 02:55:04','2011-08-08 02:55:04',NULL,NULL,50,NULL,'Invoice FA1107-0006 validated in Dolibarr','2011-08-08 02:55:04','2011-08-08 00:55:04',1,NULL,NULL,10,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1107-0006 validated in Dolibarr\nAuthor: admin',3,'invoice'),(43,NULL,1,'2011-08-08 02:55:26','2011-08-08 02:55:26',NULL,NULL,50,NULL,'Invoice FA1108-0007 validated in Dolibarr','2011-08-08 02:55:26','2011-08-08 00:55:26',1,NULL,NULL,10,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0007 validated in Dolibarr\nAuthor: admin',9,'invoice'),(44,NULL,1,'2011-08-08 02:55:58','2011-08-08 02:55:58',NULL,NULL,50,NULL,'Invoice FA1107-0006 changed to paid in Dolibarr','2011-08-08 02:55:58','2011-08-08 00:55:58',1,NULL,NULL,10,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1107-0006 changed to paid in Dolibarr\nAuthor: admin',3,'invoice'),(45,NULL,1,'2011-08-08 03:04:22','2011-08-08 03:04:22',NULL,NULL,50,NULL,'Order CO1108-0001 validated','2011-08-08 03:04:22','2011-08-08 01:04:22',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Order CO1108-0001 validated\nAuthor: admin',5,'order'),(46,NULL,1,'2011-08-08 13:59:09','2011-08-08 13:59:09',NULL,NULL,50,NULL,'Order CO1107-0002 validated','2011-08-08 13:59:10','2011-08-08 11:59:10',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Order CO1107-0002 validated\nAuthor: admin',1,'order'),(47,NULL,1,'2011-08-08 14:24:18','2011-08-08 14:24:18',NULL,NULL,50,NULL,'Proposal PR1007-0001 validated','2011-08-08 14:24:18','2011-08-08 12:24:18',1,NULL,NULL,2,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposal PR1007-0001 validated\nAuthor: admin',1,'propal'),(48,NULL,1,'2011-08-08 14:24:24','2011-08-08 14:24:24',NULL,NULL,50,NULL,'Proposal PR1108-0004 validated','2011-08-08 14:24:24','2011-08-08 12:24:24',1,NULL,NULL,17,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposal PR1108-0004 validated\nAuthor: admin',4,'propal'),(49,NULL,1,'2011-08-08 15:04:37','2011-08-08 15:04:37',NULL,NULL,50,NULL,'Order CF1108-0003 validated','2011-08-08 15:04:37','2011-08-08 13:04:37',1,NULL,NULL,17,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Order CF1108-0003 validated\nAuthor: admin',6,'order_supplier'),(50,NULL,1,'2012-12-08 17:56:47','2012-12-08 17:56:47',NULL,NULL,40,NULL,'Facture AV1212-0001 validée dans Dolibarr','2012-12-08 17:56:47','2012-12-08 16:56:47',1,NULL,NULL,10,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture AV1212-0001 validée dans Dolibarr\nAuteur: admin',10,'invoice'),(51,NULL,1,'2012-12-08 17:57:11','2012-12-08 17:57:11',NULL,NULL,40,NULL,'Facture AV1212-0001 validée dans Dolibarr','2012-12-08 17:57:11','2012-12-08 16:57:11',1,NULL,NULL,10,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture AV1212-0001 validée dans Dolibarr\nAuteur: admin',10,'invoice'),(52,NULL,1,'2012-12-08 17:58:27','2012-12-08 17:58:27',NULL,NULL,40,NULL,'Facture FA1212-0008 validée dans Dolibarr','2012-12-08 17:58:27','2012-12-08 16:58:27',1,NULL,NULL,10,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1212-0008 validée dans Dolibarr\nAuteur: admin',11,'invoice'),(53,NULL,1,'2012-12-08 18:20:49','2012-12-08 18:20:49',NULL,NULL,40,NULL,'Facture AV1212-0002 validée dans Dolibarr','2012-12-08 18:20:49','2012-12-08 17:20:49',1,NULL,NULL,10,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture AV1212-0002 validée dans Dolibarr\nAuteur: admin',12,'invoice'),(54,NULL,1,'2012-12-09 18:35:07','2012-12-09 18:35:07',NULL,NULL,40,NULL,'Facture AV1212-0002 passée à payée dans Dolibarr','2012-12-09 18:35:07','2012-12-09 17:35:07',1,NULL,NULL,10,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture AV1212-0002 passée à payée dans Dolibarr\nAuteur: admin',12,'invoice'),(55,NULL,1,'2012-12-09 20:14:42','2012-12-09 20:14:42',NULL,NULL,40,NULL,'Société doe john ajoutée dans Dolibarr','2012-12-09 20:14:42','2012-12-09 19:14:42',1,NULL,NULL,18,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Société doe john ajoutée dans Dolibarr\nAuteur: admin',18,'societe'),(56,NULL,1,'2012-12-12 18:54:19','2012-12-12 18:54:19',NULL,NULL,40,NULL,'Facture FA1212-0009 validée dans Dolibarr','2012-12-12 18:54:19','2012-12-12 17:54:19',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1212-0009 validée dans Dolibarr\nAuteur: admin',55,'invoice'),(121,NULL,1,'2012-12-06 10:00:00',NULL,NULL,NULL,50,NULL,'aaab','2012-12-21 17:48:08','2012-12-21 16:54:07',3,1,NULL,NULL,NULL,0,3,NULL,NULL,1,0,1,-1,NULL,NULL,NULL,NULL,NULL,NULL),(122,NULL,1,'2012-12-21 18:09:52','2012-12-21 18:09:52',NULL,NULL,40,NULL,'Facture client FA1007-0001 envoyée par EMail','2012-12-21 18:09:52','2012-12-21 17:09:52',1,NULL,NULL,9,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Mail envoyé par Firstname SuperAdminName <bidon@destailleur.fr> à laurent@destailleur.fr.\nSujet du mail: Envoi facture FA1007-0001\nCorps du mail:\nVeuillez trouver ci-joint la facture FA1007-0001\r\n\r\nVous pouvez cliquer sur le lien sécurisé ci-dessous pour effectuer votre paiement via Paypal\r\n\r\nhttp://localhost/dolibarrnew/public/paypal/newpayment.php?source=invoice&ref=FA1007-0001&securekey=50c82fab36bb3b6aa83e2a50691803b2\r\n\r\nCordialement',1,'invoice'),(123,NULL,1,'2013-01-06 13:13:57','2013-01-06 13:13:57',NULL,NULL,40,NULL,'Facture 16 validée dans Dolibarr','2013-01-06 13:13:57','2013-01-06 12:13:57',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture 16 validée dans Dolibarr\nAuteur: admin',16,'invoice_supplier'),(124,NULL,1,'2013-01-12 12:23:05','2013-01-12 12:23:05',NULL,NULL,40,NULL,'Patient aaa ajouté','2013-01-12 12:23:05','2013-01-12 11:23:05',1,NULL,NULL,19,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Patient aaa ajouté\nAuteur: admin',19,'societe'),(125,NULL,1,'2013-01-12 12:52:20','2013-01-12 12:52:20',NULL,NULL,40,NULL,'Patient pppoo ajouté','2013-01-12 12:52:20','2013-01-12 11:52:20',1,NULL,NULL,20,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Patient pppoo ajouté\nAuteur: admin',20,'societe'),(127,NULL,1,'2013-01-19 18:22:48','2013-01-19 18:22:48',NULL,NULL,40,NULL,'Facture FS1301-0001 validée dans Dolibarr','2013-01-19 18:22:48','2013-01-19 17:22:48',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FS1301-0001 validée dans Dolibarr\nAuteur: admin',148,'invoice'),(128,NULL,1,'2013-01-19 18:31:10','2013-01-19 18:31:10',NULL,NULL,40,NULL,'Facture FA6801-0010 validée dans Dolibarr','2013-01-19 18:31:10','2013-01-19 17:31:10',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA6801-0010 validée dans Dolibarr\nAuteur: admin',150,'invoice'),(129,NULL,1,'2013-01-19 18:31:10','2013-01-19 18:31:10',NULL,NULL,40,NULL,'Facture FA6801-0010 passée à payée dans Dolibarr','2013-01-19 18:31:10','2013-01-19 17:31:10',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA6801-0010 passée à payée dans Dolibarr\nAuteur: admin',150,'invoice'),(130,NULL,1,'2013-01-19 18:31:58','2013-01-19 18:31:58',NULL,NULL,40,NULL,'Facture FS1301-0002 validée dans Dolibarr','2013-01-19 18:31:58','2013-01-19 17:31:58',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FS1301-0002 validée dans Dolibarr\nAuteur: admin',151,'invoice'),(131,NULL,1,'2013-01-19 18:31:58','2013-01-19 18:31:58',NULL,NULL,40,NULL,'Facture FS1301-0002 passée à payée dans Dolibarr','2013-01-19 18:31:58','2013-01-19 17:31:58',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FS1301-0002 passée à payée dans Dolibarr\nAuteur: admin',151,'invoice'),(132,NULL,1,'2013-01-23 15:07:54','2013-01-23 15:07:54',NULL,NULL,50,NULL,'Consultation 24 saisie (aaa)','2013-01-23 15:07:54','2013-01-23 14:07:54',1,NULL,NULL,19,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Consultation 24 saisie (aaa)\nAuteur: admin',24,'cabinetmed_cons'),(133,NULL,1,'2013-01-23 16:56:58','2013-01-23 16:56:58',NULL,NULL,40,NULL,'Patient pa ajouté','2013-01-23 16:56:58','2013-01-23 15:56:58',1,NULL,NULL,21,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Patient pa ajouté\nAuteur: admin',21,'societe'),(134,NULL,1,'2013-01-23 17:34:00',NULL,NULL,NULL,50,NULL,'bbcv','2013-01-23 17:35:21','2013-01-23 16:35:21',1,NULL,1,2,NULL,0,1,NULL,NULL,0,0,1,-1,'',NULL,NULL,'',NULL,NULL),(135,NULL,1,'2013-02-12 15:54:00','2013-02-12 15:54:00',NULL,NULL,40,NULL,'Facture FA1212-0011 validée dans Dolibarr','2013-02-12 15:54:37','2013-02-20 20:11:54',1,1,NULL,7,NULL,0,NULL,NULL,1,0,0,1,50,NULL,NULL,NULL,'Facture FA1212-0011 valid&eacute;e dans Dolibarr<br />\r\nAuteur: admin',13,'invoice'),(136,NULL,1,'2013-02-12 17:06:51','2013-02-12 17:06:51',NULL,NULL,40,NULL,'Commande CO1107-0003 validée','2013-02-12 17:06:51','2013-02-12 16:06:51',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Commande CO1107-0003 validée\nAuteur: admin',2,'order'),(137,NULL,1,'2013-02-17 16:22:10','2013-02-17 16:22:10',NULL,NULL,40,NULL,'Proposition PR1302-0009 validée','2013-02-17 16:22:10','2013-02-17 15:22:10',1,NULL,NULL,19,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposition PR1302-0009 validée\nAuteur: admin',9,'propal'),(138,NULL,1,'2013-02-17 16:27:00','2013-02-17 16:27:00',NULL,NULL,40,NULL,'Facture FA1302-0012 validée dans Dolibarr','2013-02-17 16:27:00','2013-02-17 15:27:00',1,NULL,NULL,18,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1302-0012 validée dans Dolibarr\nAuteur: admin',152,'invoice'),(139,NULL,1,'2013-02-17 16:27:29','2013-02-17 16:27:29',NULL,NULL,40,NULL,'Proposition PR1302-0010 validée','2013-02-17 16:27:29','2013-02-17 15:27:29',1,NULL,NULL,18,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposition PR1302-0010 validée\nAuteur: admin',11,'propal'),(140,NULL,1,'2013-02-17 18:27:56','2013-02-17 18:27:56',NULL,NULL,40,NULL,'Commande CO1107-0004 validée','2013-02-17 18:27:56','2013-02-17 17:27:56',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Commande CO1107-0004 validée\nAuteur: admin',3,'order'),(141,NULL,1,'2013-02-17 18:38:14','2013-02-17 18:38:14',NULL,NULL,40,NULL,'Commande CO1302-0005 validée','2013-02-17 18:38:14','2013-02-17 17:38:14',1,NULL,NULL,18,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Commande CO1302-0005 validée\nAuteur: admin',7,'order'),(142,NULL,1,'2013-02-26 22:57:50','2013-02-26 22:57:50',NULL,NULL,40,NULL,'Company pppp added into Dolibarr','2013-02-26 22:57:50','2013-02-26 21:57:50',1,NULL,NULL,22,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Company pppp added into Dolibarr\nAuthor: admin',22,'societe'),(143,NULL,1,'2013-02-26 22:58:13','2013-02-26 22:58:13',NULL,NULL,40,NULL,'Company ttttt added into Dolibarr','2013-02-26 22:58:13','2013-02-26 21:58:13',1,NULL,NULL,23,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Company ttttt added into Dolibarr\nAuthor: admin',23,'societe'),(144,NULL,1,'2013-02-27 10:00:00','2013-02-27 19:20:00',NULL,NULL,5,NULL,'Rendez-vous','2013-02-27 19:20:53','2013-02-27 18:20:53',1,NULL,NULL,NULL,NULL,0,1,NULL,1,0,0,1,-1,'',33600,NULL,'',NULL,NULL),(145,NULL,1,'2013-02-27 19:28:00',NULL,NULL,NULL,2,NULL,'fdsfsd','2013-02-27 19:28:48','2013-02-27 18:29:53',1,1,NULL,NULL,NULL,0,1,NULL,1,0,0,1,-1,NULL,NULL,NULL,NULL,NULL,NULL),(146,NULL,1,'2013-03-06 10:05:07','2013-03-06 10:05:07',NULL,NULL,40,NULL,'Contrat (PROV3) validé dans Dolibarr','2013-03-06 10:05:07','2013-03-06 09:05:07',1,NULL,NULL,19,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Contrat (PROV3) validé dans Dolibarr\nAuteur: admin',3,'contract'),(147,NULL,1,'2013-03-06 16:43:37','2013-03-06 16:43:37',NULL,NULL,40,NULL,'Facture FA1307-0013 validée dans Dolibarr','2013-03-06 16:43:37','2013-03-06 15:43:37',1,NULL,NULL,12,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1307-0013 validée dans Dolibarr\nAuteur: admin',158,'invoice'),(148,NULL,1,'2013-03-06 16:44:12','2013-03-06 16:44:12',NULL,NULL,40,NULL,'Facture FA1407-0014 validée dans Dolibarr','2013-03-06 16:44:12','2013-03-06 15:44:12',1,NULL,NULL,12,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1407-0014 validée dans Dolibarr\nAuteur: admin',159,'invoice'),(149,NULL,1,'2013-03-06 16:47:48','2013-03-06 16:47:48',NULL,NULL,40,NULL,'Facture FA1507-0015 validée dans Dolibarr','2013-03-06 16:47:48','2013-03-06 15:47:48',1,NULL,NULL,12,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1507-0015 validée dans Dolibarr\nAuteur: admin',160,'invoice'),(150,NULL,1,'2013-03-06 16:48:16','2013-03-06 16:48:16',NULL,NULL,40,NULL,'Facture FA1607-0016 validée dans Dolibarr','2013-03-06 16:48:16','2013-03-06 15:48:16',1,NULL,NULL,12,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1607-0016 validée dans Dolibarr\nAuteur: admin',161,'invoice'),(151,NULL,1,'2013-03-06 17:13:59','2013-03-06 17:13:59',NULL,NULL,40,NULL,'Société smith smith ajoutée dans Dolibarr','2013-03-06 17:13:59','2013-03-06 16:13:59',1,NULL,NULL,24,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Société smith smith ajoutée dans Dolibarr\nAuteur: admin',24,'societe'),(152,NULL,1,'2013-03-08 10:02:22','2013-03-08 10:02:22',NULL,NULL,40,NULL,'Proposition (PROV12) validée dans Dolibarr','2013-03-08 10:02:22','2013-03-08 09:02:22',1,NULL,NULL,23,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposition (PROV12) validée dans Dolibarr\nAuteur: admin',12,'propal'),(203,NULL,1,'2013-03-09 19:39:27','2013-03-09 19:39:27',NULL,NULL,40,'AC_ORDER_SUPPLIER_VALIDATE','Commande CF1303-0004 validée','2013-03-09 19:39:27','2013-03-09 18:39:27',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Commande CF1303-0004 validée\nAuteur: admin',13,'order_supplier'),(204,NULL,1,'2013-03-10 15:47:37','2013-03-10 15:47:37',NULL,NULL,40,'AC_COMPANY_CREATE','Patient créé','2013-03-10 15:47:37','2013-03-10 14:47:37',1,NULL,NULL,25,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Patient créé\nAuteur: admin',25,'societe'),(205,NULL,1,'2013-03-10 15:57:32','2013-03-10 15:57:32',NULL,NULL,40,'AC_COMPANY_CREATE','Tiers créé','2013-03-10 15:57:32','2013-03-10 14:57:32',1,NULL,NULL,26,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Tiers créé\nAuteur: admin',26,'societe'),(206,NULL,1,'2013-03-10 15:58:28','2013-03-10 15:58:28',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1303-0017 validée','2013-03-10 15:58:28','2013-03-10 14:58:28',1,NULL,NULL,26,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1303-0017 validée\nAuteur: admin',208,'invoice'),(207,NULL,1,'2013-03-19 09:38:10','2013-03-19 09:38:10',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1303-0018 validée','2013-03-19 09:38:10','2013-03-19 08:38:10',1,NULL,NULL,19,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1303-0018 validée\nAuteur: admin',209,'invoice'),(208,NULL,1,'2013-03-20 14:30:11','2013-03-20 14:30:11',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1107-0019 validée','2013-03-20 14:30:11','2013-03-20 13:30:11',1,NULL,NULL,10,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1107-0019 validée\nAuteur: admin',210,'invoice'),(209,NULL,1,'2013-03-22 09:40:25','2013-03-22 09:40:25',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1303-0020 validée','2013-03-22 09:40:25','2013-03-22 08:40:25',1,NULL,NULL,19,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1303-0020 validée\nAuteur: admin',211,'invoice'),(210,NULL,1,'2013-03-23 17:16:25','2013-03-23 17:16:25',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1303-0020 validée','2013-03-23 17:16:25','2013-03-23 16:16:25',1,NULL,NULL,19,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1303-0020 validée\nAuteur: admin',211,'invoice'),(211,NULL,1,'2013-03-23 18:08:27','2013-03-23 18:08:27',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1307-0013 validée','2013-03-23 18:08:27','2013-03-23 17:08:27',1,NULL,NULL,12,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1307-0013 validée\nAuteur: admin',158,'invoice'),(212,NULL,1,'2013-03-24 15:54:00','2013-03-24 15:54:00',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1212-0021 validée','2013-03-24 15:54:00','2013-03-24 14:54:00',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1212-0021 validée\nAuteur: admin',32,'invoice'),(213,NULL,1,'2013-11-07 01:02:39','2013-11-07 01:02:39',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:02:39','2013-11-07 00:02:39',1,NULL,NULL,27,NULL,0,NULL,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',27,'societe'),(214,NULL,1,'2013-11-07 01:05:22','2013-11-07 01:05:22',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:05:22','2013-11-07 00:05:22',1,NULL,NULL,28,NULL,0,NULL,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',28,'societe'),(215,NULL,1,'2013-11-07 01:07:07','2013-11-07 01:07:07',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:07:07','2013-11-07 00:07:07',1,NULL,NULL,29,NULL,0,NULL,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',29,'societe'),(216,NULL,1,'2013-11-07 01:07:58','2013-11-07 01:07:58',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:07:58','2013-11-07 00:07:58',1,NULL,NULL,30,NULL,0,NULL,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',30,'societe'),(217,NULL,1,'2013-11-07 01:10:09','2013-11-07 01:10:09',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:10:09','2013-11-07 00:10:09',1,NULL,NULL,31,NULL,0,NULL,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',31,'societe'),(218,NULL,1,'2013-11-07 01:15:57','2013-11-07 01:15:57',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:15:57','2013-11-07 00:15:57',1,NULL,NULL,32,NULL,0,NULL,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',32,'societe'),(219,NULL,1,'2013-11-07 01:16:51','2013-11-07 01:16:51',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:16:51','2013-11-07 00:16:51',1,NULL,NULL,33,NULL,0,NULL,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',33,'societe');
+INSERT INTO `llx_actioncomm` VALUES (1,NULL,1,'2010-07-08 14:21:44','2010-07-08 14:21:44',NULL,NULL,50,NULL,'Company AAA and Co added into Dolibarr','2010-07-08 14:21:44','2010-07-08 12:21:44',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Company AAA and Co added into Dolibarr\nAuthor: admin',NULL,NULL),(2,NULL,1,'2010-07-08 14:23:48','2010-07-08 14:23:48',NULL,NULL,50,NULL,'Company Belin SARL added into Dolibarr','2010-07-08 14:23:48','2010-07-08 12:23:48',1,NULL,NULL,2,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Company Belin SARL added into Dolibarr\nAuthor: admin',NULL,NULL),(3,NULL,1,'2010-07-08 22:42:12','2010-07-08 22:42:12',NULL,NULL,50,NULL,'Company Spanish Comp added into Dolibarr','2010-07-08 22:42:12','2010-07-08 20:42:12',1,NULL,NULL,3,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Company Spanish Comp added into Dolibarr\nAuthor: admin',NULL,NULL),(4,NULL,1,'2010-07-08 22:48:18','2010-07-08 22:48:18',NULL,NULL,50,NULL,'Company Prospector Vaalen added into Dolibarr','2010-07-08 22:48:18','2010-07-08 20:48:18',1,NULL,NULL,4,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Company Prospector Vaalen added into Dolibarr\nAuthor: admin',NULL,NULL),(5,NULL,1,'2010-07-08 23:22:57','2010-07-08 23:22:57',NULL,NULL,50,NULL,'Company NoCountry Co added into Dolibarr','2010-07-08 23:22:57','2010-07-08 21:22:57',1,NULL,NULL,5,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Company NoCountry Co added into Dolibarr\nAuthor: admin',NULL,NULL),(6,NULL,1,'2010-07-09 00:15:09','2010-07-09 00:15:09',NULL,NULL,50,NULL,'Company Swiss customer added into Dolibarr','2010-07-09 00:15:09','2010-07-08 22:15:09',1,NULL,NULL,6,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Company Swiss customer added into Dolibarr\nAuthor: admin',NULL,NULL),(7,NULL,1,'2010-07-09 01:24:26','2010-07-09 01:24:26',NULL,NULL,50,NULL,'Company Generic customer added into Dolibarr','2010-07-09 01:24:26','2010-07-08 23:24:26',1,NULL,NULL,7,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Company Generic customer added into Dolibarr\nAuthor: admin',NULL,NULL),(8,NULL,1,'2010-07-10 14:54:27','2010-07-10 14:54:27',NULL,NULL,50,NULL,'Société Client salon ajoutée dans Dolibarr','2010-07-10 14:54:27','2010-07-10 12:54:27',1,NULL,NULL,8,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Société Client salon ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL),(9,NULL,1,'2010-07-10 14:54:44','2010-07-10 14:54:44',NULL,NULL,50,NULL,'Société Client salon invidivdu ajoutée dans Doliba','2010-07-10 14:54:44','2010-07-10 12:54:44',1,NULL,NULL,9,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Société Client salon invidivdu ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL),(10,NULL,1,'2010-07-10 14:56:10','2010-07-10 14:56:10',NULL,NULL,50,NULL,'Facture FA1007-0001 validée dans Dolibarr','2010-07-10 14:56:10','2011-07-18 17:29:22',1,NULL,NULL,9,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Facture FA1007-0001 validée dans Dolibarr\nAuteur: admin',1,'invoice'),(11,NULL,1,'2010-07-10 14:58:53','2010-07-10 14:58:53',NULL,NULL,50,NULL,'Facture FA1007-0001 validée dans Dolibarr','2010-07-10 14:58:53','2011-07-18 17:29:22',1,NULL,NULL,9,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Facture FA1007-0001 validée dans Dolibarr\nAuteur: admin',1,'invoice'),(12,NULL,1,'2010-07-10 15:00:55','2010-07-10 15:00:55',NULL,NULL,50,NULL,'Facture FA1007-0001 passée à payée dans Dolibarr','2010-07-10 15:00:55','2011-07-18 17:29:22',1,NULL,NULL,9,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Facture FA1007-0001 passée à payée dans Dolibarr\nAuteur: admin',1,'invoice'),(13,NULL,1,'2010-07-10 15:13:08','2010-07-10 15:13:08',NULL,NULL,50,NULL,'Société Smith Vick ajoutée dans Dolibarr','2010-07-10 15:13:08','2010-07-10 13:13:08',1,NULL,NULL,10,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Société Smith Vick ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL),(14,NULL,1,'2010-07-10 15:21:00','2010-07-10 16:21:00',NULL,NULL,5,NULL,'RDV avec mon chef','2010-07-10 15:21:48','2010-07-10 13:21:48',1,NULL,NULL,NULL,NULL,0,1,NULL,NULL,0,0,1,0,'',3600,NULL,'',NULL,NULL),(15,NULL,1,'2010-07-10 18:18:16','2010-07-10 18:18:16',NULL,NULL,50,NULL,'Contrat CONTRAT1 validé dans Dolibarr','2010-07-10 18:18:16','2010-07-10 16:18:16',1,NULL,NULL,2,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Contrat CONTRAT1 validé dans Dolibarr\nAuteur: admin',NULL,NULL),(16,NULL,1,'2010-07-10 18:35:57','2010-07-10 18:35:57',NULL,NULL,50,NULL,'Société Mon client ajoutée dans Dolibarr','2010-07-10 18:35:57','2010-07-10 16:35:57',1,NULL,NULL,11,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Société Mon client ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL),(17,NULL,1,'2010-07-11 16:18:08','2010-07-11 16:18:08',NULL,NULL,50,NULL,'Société Dupont Alain ajoutée dans Dolibarr','2010-07-11 16:18:08','2010-07-11 14:18:08',1,NULL,NULL,12,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Société Dupont Alain ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL),(18,NULL,1,'2010-07-11 17:11:00','2010-07-11 17:17:00',NULL,NULL,5,NULL,'Rendez-vous','2010-07-11 17:11:22','2010-07-11 15:11:22',1,NULL,NULL,NULL,NULL,0,1,NULL,NULL,0,0,1,0,'gfgdfgdf',360,NULL,'',NULL,NULL),(19,NULL,1,'2010-07-11 17:13:20','2010-07-11 17:13:20',NULL,NULL,50,NULL,'Société Vendeur de chips ajoutée dans Dolibarr','2010-07-11 17:13:20','2010-07-11 15:13:20',1,NULL,NULL,13,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Société Vendeur de chips ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL),(20,NULL,1,'2010-07-11 17:15:42','2010-07-11 17:15:42',NULL,NULL,50,NULL,'Commande CF1007-0001 validée','2010-07-11 17:15:42','2010-07-11 15:15:42',1,NULL,NULL,13,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Commande CF1007-0001 validée\nAuteur: admin',NULL,NULL),(21,NULL,1,'2010-07-11 18:47:33','2010-07-11 18:47:33',NULL,NULL,50,NULL,'Commande CF1007-0002 validée','2010-07-11 18:47:33','2010-07-11 16:47:33',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Commande CF1007-0002 validée\nAuteur: admin',NULL,NULL),(22,NULL,1,'2010-07-18 11:36:18','2010-07-18 11:36:18',NULL,NULL,50,NULL,'Proposition PR1007-0003 validée','2010-07-18 11:36:18','2011-07-18 17:29:22',1,NULL,NULL,4,NULL,0,NULL,NULL,1,0,0,1,100,'',NULL,NULL,'Proposition PR1007-0003 validée\nAuteur: admin',3,'propal'),(23,NULL,1,'2011-07-18 20:49:58','2011-07-18 20:49:58',NULL,NULL,50,NULL,'Invoice FA1007-0002 validated in Dolibarr','2011-07-18 20:49:58','2011-07-18 18:49:58',1,NULL,NULL,2,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1007-0002 validated in Dolibarr\nAuthor: admin',2,'invoice'),(24,NULL,1,'2011-07-28 01:37:00',NULL,NULL,NULL,1,NULL,'Phone call','2011-07-28 01:37:48','2011-07-27 23:37:48',1,NULL,NULL,NULL,2,0,1,NULL,NULL,0,0,1,-1,'',NULL,NULL,'',NULL,NULL),(25,NULL,1,'2011-08-01 02:31:24','2011-08-01 02:31:24',NULL,NULL,50,NULL,'Company mmm added into Dolibarr','2011-08-01 02:31:24','2011-08-01 00:31:24',1,NULL,NULL,15,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Company mmm added into Dolibarr\nAuthor: admin',15,'societe'),(26,NULL,1,'2011-08-01 02:31:43','2011-08-01 02:31:43',NULL,NULL,50,NULL,'Company ppp added into Dolibarr','2011-08-01 02:31:43','2011-08-01 00:31:43',1,NULL,NULL,16,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Company ppp added into Dolibarr\nAuthor: admin',16,'societe'),(27,NULL,1,'2011-08-01 02:41:26','2011-08-01 02:41:26',NULL,NULL,50,NULL,'Company aaa added into Dolibarr','2011-08-01 02:41:26','2011-08-01 00:41:26',1,NULL,NULL,17,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Company aaa added into Dolibarr\nAuthor: admin',17,'societe'),(28,NULL,1,'2011-08-01 03:34:11','2011-08-01 03:34:11',NULL,NULL,50,NULL,'Invoice FA1108-0003 validated in Dolibarr','2011-08-01 03:34:11','2011-08-01 01:34:11',1,NULL,NULL,7,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0003 validated in Dolibarr\nAuthor: admin',5,'invoice'),(29,NULL,1,'2011-08-01 03:34:11','2011-08-01 03:34:11',NULL,NULL,50,NULL,'Invoice FA1108-0003 validated in Dolibarr','2011-08-01 03:34:11','2011-08-01 01:34:11',1,NULL,NULL,7,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0003 changed to paid in Dolibarr\nAuthor: admin',5,'invoice'),(30,NULL,1,'2011-08-06 20:33:54','2011-08-06 20:33:54',NULL,NULL,50,NULL,'Invoice FA1108-0004 validated in Dolibarr','2011-08-06 20:33:54','2011-08-06 18:33:54',1,NULL,NULL,7,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0004 validated in Dolibarr\nAuthor: admin',6,'invoice'),(31,NULL,1,'2011-08-06 20:33:54','2011-08-06 20:33:54',NULL,NULL,50,NULL,'Invoice FA1108-0004 validated in Dolibarr','2011-08-06 20:33:54','2011-08-06 18:33:54',1,NULL,NULL,7,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0004 changed to paid in Dolibarr\nAuthor: admin',6,'invoice'),(38,NULL,1,'2011-08-08 02:41:55','2011-08-08 02:41:55',NULL,NULL,50,NULL,'Invoice FA1108-0005 validated in Dolibarr','2011-08-08 02:41:55','2011-08-08 00:41:55',1,NULL,NULL,2,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0005 validated in Dolibarr\nAuthor: admin',8,'invoice'),(40,NULL,1,'2011-08-08 02:53:40','2011-08-08 02:53:40',NULL,NULL,50,NULL,'Invoice FA1108-0005 changed to paid in Dolibarr','2011-08-08 02:53:40','2011-08-08 00:53:40',1,NULL,NULL,2,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0005 changed to paid in Dolibarr\nAuthor: admin',8,'invoice'),(41,NULL,1,'2011-08-08 02:54:05','2011-08-08 02:54:05',NULL,NULL,50,NULL,'Invoice FA1007-0002 changed to paid in Dolibarr','2011-08-08 02:54:05','2011-08-08 00:54:05',1,NULL,NULL,2,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1007-0002 changed to paid in Dolibarr\nAuthor: admin',2,'invoice'),(42,NULL,1,'2011-08-08 02:55:04','2011-08-08 02:55:04',NULL,NULL,50,NULL,'Invoice FA1107-0006 validated in Dolibarr','2011-08-08 02:55:04','2011-08-08 00:55:04',1,NULL,NULL,10,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1107-0006 validated in Dolibarr\nAuthor: admin',3,'invoice'),(43,NULL,1,'2011-08-08 02:55:26','2011-08-08 02:55:26',NULL,NULL,50,NULL,'Invoice FA1108-0007 validated in Dolibarr','2011-08-08 02:55:26','2011-08-08 00:55:26',1,NULL,NULL,10,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0007 validated in Dolibarr\nAuthor: admin',9,'invoice'),(44,NULL,1,'2011-08-08 02:55:58','2011-08-08 02:55:58',NULL,NULL,50,NULL,'Invoice FA1107-0006 changed to paid in Dolibarr','2011-08-08 02:55:58','2011-08-08 00:55:58',1,NULL,NULL,10,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1107-0006 changed to paid in Dolibarr\nAuthor: admin',3,'invoice'),(45,NULL,1,'2011-08-08 03:04:22','2011-08-08 03:04:22',NULL,NULL,50,NULL,'Order CO1108-0001 validated','2011-08-08 03:04:22','2011-08-08 01:04:22',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Order CO1108-0001 validated\nAuthor: admin',5,'order'),(46,NULL,1,'2011-08-08 13:59:09','2011-08-08 13:59:09',NULL,NULL,50,NULL,'Order CO1107-0002 validated','2011-08-08 13:59:10','2011-08-08 11:59:10',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Order CO1107-0002 validated\nAuthor: admin',1,'order'),(47,NULL,1,'2011-08-08 14:24:18','2011-08-08 14:24:18',NULL,NULL,50,NULL,'Proposal PR1007-0001 validated','2011-08-08 14:24:18','2011-08-08 12:24:18',1,NULL,NULL,2,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposal PR1007-0001 validated\nAuthor: admin',1,'propal'),(48,NULL,1,'2011-08-08 14:24:24','2011-08-08 14:24:24',NULL,NULL,50,NULL,'Proposal PR1108-0004 validated','2011-08-08 14:24:24','2011-08-08 12:24:24',1,NULL,NULL,17,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposal PR1108-0004 validated\nAuthor: admin',4,'propal'),(49,NULL,1,'2011-08-08 15:04:37','2011-08-08 15:04:37',NULL,NULL,50,NULL,'Order CF1108-0003 validated','2011-08-08 15:04:37','2011-08-08 13:04:37',1,NULL,NULL,17,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Order CF1108-0003 validated\nAuthor: admin',6,'order_supplier'),(50,NULL,1,'2012-12-08 17:56:47','2012-12-08 17:56:47',NULL,NULL,40,NULL,'Facture AV1212-0001 validée dans Dolibarr','2012-12-08 17:56:47','2012-12-08 16:56:47',1,NULL,NULL,10,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture AV1212-0001 validée dans Dolibarr\nAuteur: admin',10,'invoice'),(51,NULL,1,'2012-12-08 17:57:11','2012-12-08 17:57:11',NULL,NULL,40,NULL,'Facture AV1212-0001 validée dans Dolibarr','2012-12-08 17:57:11','2012-12-08 16:57:11',1,NULL,NULL,10,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture AV1212-0001 validée dans Dolibarr\nAuteur: admin',10,'invoice'),(52,NULL,1,'2012-12-08 17:58:27','2012-12-08 17:58:27',NULL,NULL,40,NULL,'Facture FA1212-0008 validée dans Dolibarr','2012-12-08 17:58:27','2012-12-08 16:58:27',1,NULL,NULL,10,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1212-0008 validée dans Dolibarr\nAuteur: admin',11,'invoice'),(53,NULL,1,'2012-12-08 18:20:49','2012-12-08 18:20:49',NULL,NULL,40,NULL,'Facture AV1212-0002 validée dans Dolibarr','2012-12-08 18:20:49','2012-12-08 17:20:49',1,NULL,NULL,10,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture AV1212-0002 validée dans Dolibarr\nAuteur: admin',12,'invoice'),(54,NULL,1,'2012-12-09 18:35:07','2012-12-09 18:35:07',NULL,NULL,40,NULL,'Facture AV1212-0002 passée à payée dans Dolibarr','2012-12-09 18:35:07','2012-12-09 17:35:07',1,NULL,NULL,10,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture AV1212-0002 passée à payée dans Dolibarr\nAuteur: admin',12,'invoice'),(55,NULL,1,'2012-12-09 20:14:42','2012-12-09 20:14:42',NULL,NULL,40,NULL,'Société doe john ajoutée dans Dolibarr','2012-12-09 20:14:42','2012-12-09 19:14:42',1,NULL,NULL,18,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Société doe john ajoutée dans Dolibarr\nAuteur: admin',18,'societe'),(56,NULL,1,'2012-12-12 18:54:19','2012-12-12 18:54:19',NULL,NULL,40,NULL,'Facture FA1212-0009 validée dans Dolibarr','2012-12-12 18:54:19','2012-12-12 17:54:19',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1212-0009 validée dans Dolibarr\nAuteur: admin',55,'invoice'),(121,NULL,1,'2012-12-06 10:00:00',NULL,NULL,NULL,50,NULL,'aaab','2012-12-21 17:48:08','2012-12-21 16:54:07',3,1,NULL,NULL,NULL,0,3,NULL,NULL,1,0,1,-1,NULL,NULL,NULL,NULL,NULL,NULL),(122,NULL,1,'2012-12-21 18:09:52','2012-12-21 18:09:52',NULL,NULL,40,NULL,'Facture client FA1007-0001 envoyée par EMail','2012-12-21 18:09:52','2012-12-21 17:09:52',1,NULL,NULL,9,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Mail envoyé par Firstname SuperAdminName <bidon@mydomain.com> à laurent@mydomain.com.\nSujet du mail: Envoi facture FA1007-0001\nCorps du mail:\nVeuillez trouver ci-joint la facture FA1007-0001\r\n\r\nVous pouvez cliquer sur le lien sécurisé ci-dessous pour effectuer votre paiement via Paypal\r\n\r\nhttp://localhost/dolibarrnew/public/paypal/newpayment.php?source=invoice&ref=FA1007-0001&securekey=50c82fab36bb3b6aa83e2a50691803b2\r\n\r\nCordialement',1,'invoice'),(123,NULL,1,'2013-01-06 13:13:57','2013-01-06 13:13:57',NULL,NULL,40,NULL,'Facture 16 validée dans Dolibarr','2013-01-06 13:13:57','2013-01-06 12:13:57',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture 16 validée dans Dolibarr\nAuteur: admin',16,'invoice_supplier'),(124,NULL,1,'2013-01-12 12:23:05','2013-01-12 12:23:05',NULL,NULL,40,NULL,'Patient aaa ajouté','2013-01-12 12:23:05','2013-01-12 11:23:05',1,NULL,NULL,19,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Patient aaa ajouté\nAuteur: admin',19,'societe'),(125,NULL,1,'2013-01-12 12:52:20','2013-01-12 12:52:20',NULL,NULL,40,NULL,'Patient pppoo ajouté','2013-01-12 12:52:20','2013-01-12 11:52:20',1,NULL,NULL,20,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Patient pppoo ajouté\nAuteur: admin',20,'societe'),(127,NULL,1,'2013-01-19 18:22:48','2013-01-19 18:22:48',NULL,NULL,40,NULL,'Facture FS1301-0001 validée dans Dolibarr','2013-01-19 18:22:48','2013-01-19 17:22:48',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FS1301-0001 validée dans Dolibarr\nAuteur: admin',148,'invoice'),(128,NULL,1,'2013-01-19 18:31:10','2013-01-19 18:31:10',NULL,NULL,40,NULL,'Facture FA6801-0010 validée dans Dolibarr','2013-01-19 18:31:10','2013-01-19 17:31:10',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA6801-0010 validée dans Dolibarr\nAuteur: admin',150,'invoice'),(129,NULL,1,'2013-01-19 18:31:10','2013-01-19 18:31:10',NULL,NULL,40,NULL,'Facture FA6801-0010 passée à payée dans Dolibarr','2013-01-19 18:31:10','2013-01-19 17:31:10',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA6801-0010 passée à payée dans Dolibarr\nAuteur: admin',150,'invoice'),(130,NULL,1,'2013-01-19 18:31:58','2013-01-19 18:31:58',NULL,NULL,40,NULL,'Facture FS1301-0002 validée dans Dolibarr','2013-01-19 18:31:58','2013-01-19 17:31:58',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FS1301-0002 validée dans Dolibarr\nAuteur: admin',151,'invoice'),(131,NULL,1,'2013-01-19 18:31:58','2013-01-19 18:31:58',NULL,NULL,40,NULL,'Facture FS1301-0002 passée à payée dans Dolibarr','2013-01-19 18:31:58','2013-01-19 17:31:58',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FS1301-0002 passée à payée dans Dolibarr\nAuteur: admin',151,'invoice'),(132,NULL,1,'2013-01-23 15:07:54','2013-01-23 15:07:54',NULL,NULL,50,NULL,'Consultation 24 saisie (aaa)','2013-01-23 15:07:54','2013-01-23 14:07:54',1,NULL,NULL,19,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Consultation 24 saisie (aaa)\nAuteur: admin',24,'cabinetmed_cons'),(133,NULL,1,'2013-01-23 16:56:58','2013-01-23 16:56:58',NULL,NULL,40,NULL,'Patient pa ajouté','2013-01-23 16:56:58','2013-01-23 15:56:58',1,NULL,NULL,21,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Patient pa ajouté\nAuteur: admin',21,'societe'),(134,NULL,1,'2013-01-23 17:34:00',NULL,NULL,NULL,50,NULL,'bbcv','2013-01-23 17:35:21','2013-01-23 16:35:21',1,NULL,1,2,NULL,0,1,NULL,NULL,0,0,1,-1,'',NULL,NULL,'',NULL,NULL),(135,NULL,1,'2013-02-12 15:54:00','2013-02-12 15:54:00',NULL,NULL,40,NULL,'Facture FA1212-0011 validée dans Dolibarr','2013-02-12 15:54:37','2013-02-20 20:11:54',1,1,NULL,7,NULL,0,NULL,NULL,1,0,0,1,50,NULL,NULL,NULL,'Facture FA1212-0011 valid&eacute;e dans Dolibarr<br />\r\nAuteur: admin',13,'invoice'),(136,NULL,1,'2013-02-12 17:06:51','2013-02-12 17:06:51',NULL,NULL,40,NULL,'Commande CO1107-0003 validée','2013-02-12 17:06:51','2013-02-12 16:06:51',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Commande CO1107-0003 validée\nAuteur: admin',2,'order'),(137,NULL,1,'2013-02-17 16:22:10','2013-02-17 16:22:10',NULL,NULL,40,NULL,'Proposition PR1302-0009 validée','2013-02-17 16:22:10','2013-02-17 15:22:10',1,NULL,NULL,19,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposition PR1302-0009 validée\nAuteur: admin',9,'propal'),(138,NULL,1,'2013-02-17 16:27:00','2013-02-17 16:27:00',NULL,NULL,40,NULL,'Facture FA1302-0012 validée dans Dolibarr','2013-02-17 16:27:00','2013-02-17 15:27:00',1,NULL,NULL,18,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1302-0012 validée dans Dolibarr\nAuteur: admin',152,'invoice'),(139,NULL,1,'2013-02-17 16:27:29','2013-02-17 16:27:29',NULL,NULL,40,NULL,'Proposition PR1302-0010 validée','2013-02-17 16:27:29','2013-02-17 15:27:29',1,NULL,NULL,18,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposition PR1302-0010 validée\nAuteur: admin',11,'propal'),(140,NULL,1,'2013-02-17 18:27:56','2013-02-17 18:27:56',NULL,NULL,40,NULL,'Commande CO1107-0004 validée','2013-02-17 18:27:56','2013-02-17 17:27:56',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Commande CO1107-0004 validée\nAuteur: admin',3,'order'),(141,NULL,1,'2013-02-17 18:38:14','2013-02-17 18:38:14',NULL,NULL,40,NULL,'Commande CO1302-0005 validée','2013-02-17 18:38:14','2013-02-17 17:38:14',1,NULL,NULL,18,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Commande CO1302-0005 validée\nAuteur: admin',7,'order'),(142,NULL,1,'2013-02-26 22:57:50','2013-02-26 22:57:50',NULL,NULL,40,NULL,'Company pppp added into Dolibarr','2013-02-26 22:57:50','2013-02-26 21:57:50',1,NULL,NULL,22,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Company pppp added into Dolibarr\nAuthor: admin',22,'societe'),(143,NULL,1,'2013-02-26 22:58:13','2013-02-26 22:58:13',NULL,NULL,40,NULL,'Company ttttt added into Dolibarr','2013-02-26 22:58:13','2013-02-26 21:58:13',1,NULL,NULL,23,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Company ttttt added into Dolibarr\nAuthor: admin',23,'societe'),(144,NULL,1,'2013-02-27 10:00:00','2013-02-27 19:20:00',NULL,NULL,5,NULL,'Rendez-vous','2013-02-27 19:20:53','2013-02-27 18:20:53',1,NULL,NULL,NULL,NULL,0,1,NULL,1,0,0,1,-1,'',33600,NULL,'',NULL,NULL),(145,NULL,1,'2013-02-27 19:28:00',NULL,NULL,NULL,2,NULL,'fdsfsd','2013-02-27 19:28:48','2013-02-27 18:29:53',1,1,NULL,NULL,NULL,0,1,NULL,1,0,0,1,-1,NULL,NULL,NULL,NULL,NULL,NULL),(146,NULL,1,'2013-03-06 10:05:07','2013-03-06 10:05:07',NULL,NULL,40,NULL,'Contrat (PROV3) validé dans Dolibarr','2013-03-06 10:05:07','2013-03-06 09:05:07',1,NULL,NULL,19,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Contrat (PROV3) validé dans Dolibarr\nAuteur: admin',3,'contract'),(147,NULL,1,'2013-03-06 16:43:37','2013-03-06 16:43:37',NULL,NULL,40,NULL,'Facture FA1307-0013 validée dans Dolibarr','2013-03-06 16:43:37','2013-03-06 15:43:37',1,NULL,NULL,12,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1307-0013 validée dans Dolibarr\nAuteur: admin',158,'invoice'),(148,NULL,1,'2013-03-06 16:44:12','2013-03-06 16:44:12',NULL,NULL,40,NULL,'Facture FA1407-0014 validée dans Dolibarr','2013-03-06 16:44:12','2013-03-06 15:44:12',1,NULL,NULL,12,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1407-0014 validée dans Dolibarr\nAuteur: admin',159,'invoice'),(149,NULL,1,'2013-03-06 16:47:48','2013-03-06 16:47:48',NULL,NULL,40,NULL,'Facture FA1507-0015 validée dans Dolibarr','2013-03-06 16:47:48','2013-03-06 15:47:48',1,NULL,NULL,12,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1507-0015 validée dans Dolibarr\nAuteur: admin',160,'invoice'),(150,NULL,1,'2013-03-06 16:48:16','2013-03-06 16:48:16',NULL,NULL,40,NULL,'Facture FA1607-0016 validée dans Dolibarr','2013-03-06 16:48:16','2013-03-06 15:48:16',1,NULL,NULL,12,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1607-0016 validée dans Dolibarr\nAuteur: admin',161,'invoice'),(151,NULL,1,'2013-03-06 17:13:59','2013-03-06 17:13:59',NULL,NULL,40,NULL,'Société smith smith ajoutée dans Dolibarr','2013-03-06 17:13:59','2013-03-06 16:13:59',1,NULL,NULL,24,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Société smith smith ajoutée dans Dolibarr\nAuteur: admin',24,'societe'),(152,NULL,1,'2013-03-08 10:02:22','2013-03-08 10:02:22',NULL,NULL,40,NULL,'Proposition (PROV12) validée dans Dolibarr','2013-03-08 10:02:22','2013-03-08 09:02:22',1,NULL,NULL,23,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposition (PROV12) validée dans Dolibarr\nAuteur: admin',12,'propal'),(203,NULL,1,'2013-03-09 19:39:27','2013-03-09 19:39:27',NULL,NULL,40,'AC_ORDER_SUPPLIER_VALIDATE','Commande CF1303-0004 validée','2013-03-09 19:39:27','2013-03-09 18:39:27',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Commande CF1303-0004 validée\nAuteur: admin',13,'order_supplier'),(204,NULL,1,'2013-03-10 15:47:37','2013-03-10 15:47:37',NULL,NULL,40,'AC_COMPANY_CREATE','Patient créé','2013-03-10 15:47:37','2013-03-10 14:47:37',1,NULL,NULL,25,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Patient créé\nAuteur: admin',25,'societe'),(205,NULL,1,'2013-03-10 15:57:32','2013-03-10 15:57:32',NULL,NULL,40,'AC_COMPANY_CREATE','Tiers créé','2013-03-10 15:57:32','2013-03-10 14:57:32',1,NULL,NULL,26,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Tiers créé\nAuteur: admin',26,'societe'),(206,NULL,1,'2013-03-10 15:58:28','2013-03-10 15:58:28',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1303-0017 validée','2013-03-10 15:58:28','2013-03-10 14:58:28',1,NULL,NULL,26,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1303-0017 validée\nAuteur: admin',208,'invoice'),(207,NULL,1,'2013-03-19 09:38:10','2013-03-19 09:38:10',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1303-0018 validée','2013-03-19 09:38:10','2013-03-19 08:38:10',1,NULL,NULL,19,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1303-0018 validée\nAuteur: admin',209,'invoice'),(208,NULL,1,'2013-03-20 14:30:11','2013-03-20 14:30:11',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1107-0019 validée','2013-03-20 14:30:11','2013-03-20 13:30:11',1,NULL,NULL,10,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1107-0019 validée\nAuteur: admin',210,'invoice'),(209,NULL,1,'2013-03-22 09:40:25','2013-03-22 09:40:25',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1303-0020 validée','2013-03-22 09:40:25','2013-03-22 08:40:25',1,NULL,NULL,19,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1303-0020 validée\nAuteur: admin',211,'invoice'),(210,NULL,1,'2013-03-23 17:16:25','2013-03-23 17:16:25',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1303-0020 validée','2013-03-23 17:16:25','2013-03-23 16:16:25',1,NULL,NULL,19,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1303-0020 validée\nAuteur: admin',211,'invoice'),(211,NULL,1,'2013-03-23 18:08:27','2013-03-23 18:08:27',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1307-0013 validée','2013-03-23 18:08:27','2013-03-23 17:08:27',1,NULL,NULL,12,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1307-0013 validée\nAuteur: admin',158,'invoice'),(212,NULL,1,'2013-03-24 15:54:00','2013-03-24 15:54:00',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1212-0021 validée','2013-03-24 15:54:00','2013-03-24 14:54:00',1,NULL,NULL,1,NULL,0,NULL,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1212-0021 validée\nAuteur: admin',32,'invoice'),(213,NULL,1,'2013-11-07 01:02:39','2013-11-07 01:02:39',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:02:39','2013-11-07 00:02:39',1,NULL,NULL,27,NULL,0,NULL,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',27,'societe'),(214,NULL,1,'2013-11-07 01:05:22','2013-11-07 01:05:22',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:05:22','2013-11-07 00:05:22',1,NULL,NULL,28,NULL,0,NULL,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',28,'societe'),(215,NULL,1,'2013-11-07 01:07:07','2013-11-07 01:07:07',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:07:07','2013-11-07 00:07:07',1,NULL,NULL,29,NULL,0,NULL,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',29,'societe'),(216,NULL,1,'2013-11-07 01:07:58','2013-11-07 01:07:58',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:07:58','2013-11-07 00:07:58',1,NULL,NULL,30,NULL,0,NULL,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',30,'societe'),(217,NULL,1,'2013-11-07 01:10:09','2013-11-07 01:10:09',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:10:09','2013-11-07 00:10:09',1,NULL,NULL,31,NULL,0,NULL,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',31,'societe'),(218,NULL,1,'2013-11-07 01:15:57','2013-11-07 01:15:57',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:15:57','2013-11-07 00:15:57',1,NULL,NULL,32,NULL,0,NULL,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',32,'societe'),(219,NULL,1,'2013-11-07 01:16:51','2013-11-07 01:16:51',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:16:51','2013-11-07 00:16:51',1,NULL,NULL,33,NULL,0,NULL,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',33,'societe');
 /*!40000 ALTER TABLE `llx_actioncomm` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -6805,7 +6805,7 @@ CREATE TABLE `llx_user` (
 
 LOCK TABLES `llx_user` WRITE;
 /*!40000 ALTER TABLE `llx_user` DISABLE KEYS */;
-INSERT INTO `llx_user` VALUES (1,'2010-07-08 13:20:11','2012-12-12 17:54:10','admin',0,NULL,NULL,NULL,'admin','21232f297a57a5a743894a0e4a801fc3',NULL,'SuperAdminName','Firstname','',NULL,'','','','bidon@destailleur.fr','',1,'','','',1,1,NULL,NULL,NULL,'','2014-04-05 16:19:30','2013-11-07 01:01:51',NULL,'',1,'01.jpg',NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(2,'2010-07-08 13:54:48','2010-07-08 11:54:48','demo',1,NULL,NULL,NULL,'demo','fe01ce2a7fbac8fafaed7c982a04e229',NULL,'John','Doe',NULL,NULL,'09123123','','','johndoe@mycompany.com',NULL,0,'','','',1,1,NULL,NULL,NULL,'','2013-03-24 16:30:29','2010-07-08 14:12:02',NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(3,'2010-07-11 16:18:59','2013-02-20 19:07:21','adupont',1,NULL,NULL,NULL,'adupont','00856ab2bbb748aa29aa335a6e3a2407',NULL,'Dupont','Alain','',NULL,'','','','toto@aa.com','',0,'','','',1,1,NULL,NULL,2,'','2012-12-21 17:38:55',NULL,NULL,'',1,NULL,NULL,NULL,2,NULL,NULL,NULL,0,0,NULL,NULL),(4,'2013-01-23 17:52:27','2013-02-20 19:48:01','aaa',1,NULL,NULL,NULL,'aaa','47bce5c74f589f4867dbd57e9ca9f808',NULL,'aaa','','',NULL,'','','','','',0,'','','',1,1,17,6,NULL,'','2013-02-25 10:18:41','2013-01-23 17:53:20',NULL,'',1,NULL,NULL,NULL,5,NULL,NULL,NULL,0,0,NULL,NULL),(5,'2013-01-23 17:52:37','2013-01-23 16:52:37','bbb',0,NULL,NULL,NULL,'bbb','08f8e0260c64418510cefb2b06eee5cd',NULL,'bbb','','',NULL,'','','','','',1,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(6,'2013-02-16 20:22:40','2013-02-16 19:22:40','aaab',2,NULL,NULL,NULL,'aaab','4c189b020ceb022e0ecc42482802e2b8',NULL,'aaab','','',NULL,'','','','','',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(7,'2013-02-16 20:48:15','2013-02-16 19:48:15','zzz',2,NULL,NULL,NULL,'zzz','f3abb86bd34cf4d52698f14c0da1dc60',NULL,'zzz','','',NULL,'','','','','',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(9,'2013-02-16 20:50:07','2013-03-24 16:10:14','zzzg',2,NULL,NULL,NULL,'jc28fg4h','93d789524fd223cf05eecea3f59cbe86',NULL,'zzzg','','',NULL,'','','','','fsdkkfsdf<br />\r\nfsdfsd<br />\r\n<strong>fsdfs</strong>',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,5,'','','',NULL,NULL,NULL,NULL);
+INSERT INTO `llx_user` VALUES (1,'2010-07-08 13:20:11','2012-12-12 17:54:10','admin',0,NULL,NULL,NULL,'admin','21232f297a57a5a743894a0e4a801fc3',NULL,'SuperAdminName','Firstname','',NULL,'','','','bidon@mydomain.com','',1,'','','',1,1,NULL,NULL,NULL,'','2014-04-05 16:19:30','2013-11-07 01:01:51',NULL,'',1,'01.jpg',NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(2,'2010-07-08 13:54:48','2010-07-08 11:54:48','demo',1,NULL,NULL,NULL,'demo','fe01ce2a7fbac8fafaed7c982a04e229',NULL,'John','Doe',NULL,NULL,'09123123','','','johndoe@mycompany.com',NULL,0,'','','',1,1,NULL,NULL,NULL,'','2013-03-24 16:30:29','2010-07-08 14:12:02',NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(3,'2010-07-11 16:18:59','2013-02-20 19:07:21','adupont',1,NULL,NULL,NULL,'adupont','00856ab2bbb748aa29aa335a6e3a2407',NULL,'Dupont','Alain','',NULL,'','','','toto@aa.com','',0,'','','',1,1,NULL,NULL,2,'','2012-12-21 17:38:55',NULL,NULL,'',1,NULL,NULL,NULL,2,NULL,NULL,NULL,0,0,NULL,NULL),(4,'2013-01-23 17:52:27','2013-02-20 19:48:01','aaa',1,NULL,NULL,NULL,'aaa','47bce5c74f589f4867dbd57e9ca9f808',NULL,'aaa','','',NULL,'','','','','',0,'','','',1,1,17,6,NULL,'','2013-02-25 10:18:41','2013-01-23 17:53:20',NULL,'',1,NULL,NULL,NULL,5,NULL,NULL,NULL,0,0,NULL,NULL),(5,'2013-01-23 17:52:37','2013-01-23 16:52:37','bbb',0,NULL,NULL,NULL,'bbb','08f8e0260c64418510cefb2b06eee5cd',NULL,'bbb','','',NULL,'','','','','',1,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(6,'2013-02-16 20:22:40','2013-02-16 19:22:40','aaab',2,NULL,NULL,NULL,'aaab','4c189b020ceb022e0ecc42482802e2b8',NULL,'aaab','','',NULL,'','','','','',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(7,'2013-02-16 20:48:15','2013-02-16 19:48:15','zzz',2,NULL,NULL,NULL,'zzz','f3abb86bd34cf4d52698f14c0da1dc60',NULL,'zzz','','',NULL,'','','','','',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(9,'2013-02-16 20:50:07','2013-03-24 16:10:14','zzzg',2,NULL,NULL,NULL,'jc28fg4h','93d789524fd223cf05eecea3f59cbe86',NULL,'zzzg','','',NULL,'','','','','fsdkkfsdf<br />\r\nfsdfsd<br />\r\n<strong>fsdfs</strong>',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,5,'','','',NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_user` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/dev/resources/iso-normes/Intracommreport-ManuelDebXml.pdf b/dev/resources/iso-normes/Intracommreport-ManuelDebXml.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..fef9f48f53e999ebf0239534d5ced7d68b1b1533
GIT binary patch
literal 225572
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

literal 0
HcmV?d00001

diff --git a/dev/resources/iso-normes/Intracommreport-ManuelDesXML.pdf b/dev/resources/iso-normes/Intracommreport-ManuelDesXML.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..b1074b3b8a3564618988feec2b03e00a7e052e4b
GIT binary patch
literal 187033
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%0DHwqp>k}yf=z~obG
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
Sr6mxAOrv0yFW1@1!u%H!Ss~;A

literal 0
HcmV?d00001

diff --git a/dev/resources/iso-normes/company_ids.txt b/dev/resources/iso-normes/company_ids.txt
new file mode 100644
index 00000000000..69c2af1d665
--- /dev/null
+++ b/dev/resources/iso-normes/company_ids.txt
@@ -0,0 +1,2 @@
+Spain  https://incwell.eu/en/company-formation-spain/
+France https://www.economie.gouv.fr/entreprises/numeros-identification-entreprise
diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml
index 03104270dcf..bf283993628 100644
--- a/dev/setup/codesniffer/ruleset.xml
+++ b/dev/setup/codesniffer/ruleset.xml
@@ -17,6 +17,7 @@
 	<exclude-pattern type="relative">*/nltechno*</exclude-pattern>
 	<exclude-pattern type="relative">*/htdocs/includes</exclude-pattern>
 	<exclude-pattern type="relative">*/htdocs/includes</exclude-pattern>
+	<exclude-pattern type="relative">.git</exclude-pattern>
 
 	<!-- List of all tests -->
 
diff --git a/dev/tools/dolibarr-postgres2mysql.php b/dev/tools/dolibarr-postgres2mysql.php
index c17a73dfe12..fd30540c019 100644
--- a/dev/tools/dolibarr-postgres2mysql.php
+++ b/dev/tools/dolibarr-postgres2mysql.php
@@ -357,8 +357,8 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 			$line = str_replace(" time with time zone", " time", $line);
 			$line = str_replace(" time without time zone", " time", $line);
 
-			$line = str_replace(" timestamp DEFAULT now()", " timestamp DEFAULT CURRENT_TIMESTAMP", $line);
-			$line = str_replace(" timestamp without time zone DEFAULT now()", " timestamp DEFAULT CURRENT_TIMESTAMP", $line);
+			$line = str_replace(" timestamp DEFAULT now()", " timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP", $line);
+			$line = str_replace(" timestamp without time zone DEFAULT now()", " timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP", $line);
 
 			if (strstr($line, "auto_increment") || preg_match('/ rowid int/', $line) || preg_match('/ id int/', $line)) {
 				$field = getfieldname($line);
diff --git a/dev/translation/README b/dev/translation/README
index 9727f91e2e6..8d6954878b5 100644
--- a/dev/translation/README
+++ b/dev/translation/README
@@ -2,13 +2,18 @@ README (English)
 --------------------------------
 This directory contains tools to generate translation files for a new
 languages or to update translation files for existing languages.
+
 See Dolibarr Wiki page:
 https://wiki.dolibarr.org/index.php/Translator_documentation
 For more information on how to use them.
 
-for Linux OS:
-To install transifex client:
+Translation of Dolibarr Project at Transifex:
+https://www.transifex.com/dolibarr-association/dolibarr/dashboard/
+
+
+Installation of Transifex Client:
+---------------------------------
+for Linux OS
+to install or to update transifex client: 
 sudo pip install --upgrade transifex-client
 
-To update transifex client:
-sudo pip install --upgrade transifex-client
diff --git a/dev/translation/autotranslator.php b/dev/translation/autotranslator.php
index 5e8cc13c3c8..fd02febbdcc 100755
--- a/dev/translation/autotranslator.php
+++ b/dev/translation/autotranslator.php
@@ -21,8 +21,8 @@
  *		\ingroup    dev
  * 		\brief      This script uses google language ajax api as the translator engine
  *                  The main translator function can be found at:
- *                  http://code.google.com/intl/fr/apis/language/translate/overview.html
- *                  http://translate.google.com/translate_tools
+ *                  defunct -http://code.google.com/intl/fr/apis/language/translate/overview.html-
+ *                  defunct -http://translate.google.com/translate_tools-
  *                  https://code.google.com/apis/console
  */
 
@@ -58,7 +58,7 @@ $dir=DOL_DOCUMENT_ROOT."/langs";
 if (! isset($argv[3])) {
     print "Usage:   ".$script_file."  lang_code_src lang_code_dest|all APIKEY [langfile.lang]\n";
     print "Example: ".$script_file."  en_US         pt_PT              123456\n";
-    print "Rem:     lang_code to use can be found on http://www.google.com/language_tools\n";
+    print "Rem:     lang_code to use can be found on https://translate.google.com\n";
     exit;
 }
 
diff --git a/dev/translation/erp_comparison_translation.txt b/dev/translation/erp_comparison_translation.txt
deleted file mode 100644
index 6cf7c4f7c60..00000000000
--- a/dev/translation/erp_comparison_translation.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-comparison of terms
-
-
-Dolibarr             SAP ERP					      Odoo							    
--------------------------------------------------------------------------
-Thirdparty			     Contact partner	    	Partner/Contact (company)
-Contact/address		   Contact person	  	    Partner/Contact (individual)
-
-Financial 			     Finance (FI)				  	Accounting
-Accounting
-
-
-Income / Expense	       ??					        Profit / Loss
-Balance				           ??					        Net profit
-Subledger account	   Subledger account	        ??
-
-CRM                  Sales & Distribution   Sales 
-Proposal                ??                  Quotation                         
-
-
-
-Proposal is ok but proposition looks better (proposal is for a detailed proposition). 
-We can say also "business proposition or business proposal".
-In India they are using "Quotation".
-                                                                        
diff --git a/doc/images/invoice.png b/doc/images/invoice.png
new file mode 100644
index 0000000000000000000000000000000000000000..9be03a52ed8411ebc6f8338fa1b1b1ae18c40b27
GIT binary patch
literal 64306
zcmcG$RZtyW)GgWs4Z(s1hY;M|-JReL!QI^n1PBl$xVyW%1qkjM+}(BKoc{h>=jGOY
zyXR0v!R~JM?p|xkm}8Df*jEKfWJEkf005AsrNop0;2j0{{f6)kJhGaRb_f1|b{3IV
zML<AU-c;NGU*fokYr3e|o4L3fI++5thAyV`&c;rrrgqL2_AY~o7cu}q0!WJqt9qoL
zteWepEUW_;>m4aSesn-G0};6#?aPXru^P^7GaANQwIOTX=fNzPpBT_Mvym3P$qa*G
z23sKljPIDU8ym%Kvfdv29!XocA?a~!djpF&;z|J|2!SN)M6VsR|NZt{CG;6y7!Agf
zlxpX{6Y?;@1TeyA`C-{HLEvk)kC;wqFv2kufg&h@BnZ=DUkAa9g;Nm_xxtI2Foge4
z{PE4X-uEi<1R24;ely?ujivUM(C7(B<$oV|m1Kx1?t9Mj+)_I|-K^8JCg??$H1yA=
z(L76_!V9u@>9O9X58lb3!3FVwW?8J1erPbcfFE7b5FkX8P{{9-jEixdg^&nd@^h(+
ze<%LxVPZT}{@1Vak`g5YOf^+LKKHZ5-4RoA^7R_K|DOK`T_lgU?|E1gcc0)ygp}Y_
zn*S3P?^gU9UsczU0ilx&Y+w_o9a*PG4jG=`s8hk!X@~cvp&|R++<L+Pyn&<^TDu*j
zJpmGn_gU^6-@aLgH>dl;z^kXe|6G^LBOtB>tEE*{r9bBJmRWu*ls9G3UsxEpWfVyA
z-z|4W{)$)A@V+~>wzYrLJC68o&3~@!dq+_?dEMM9bU0pQ1{^NhP8s>{1<?)|e68q5
zMRmxA(!zDU87AyJy)f|dkWpqh`OtOUDVJkBWp|KW;!F1rz?4RZkuG(j^>g=`I30|q
zNwlp~a)!HYG=4{QO%!s%|0(P9l+!6LlYL;3<937mYe7YN;K>Q+pFb&KVMiXKMKk=%
z^_JK;2S?jMh7EsG$cFNh7`H`4!ascIGBEuJ8U%{k<LgfUjJ0`HrgzEL<eRI1N9@~;
z`v)|vQLla$tHHYO0GYg|7bh$8`aU7NuJ(Zw;-&%FUy-;&?w?>s34CjR0<mvgHoYMm
z-YsN5^%;)@{QEcAMt{Y5oB9hS(J$N&*H#m*KAyBGS*`UHK2M*(e%G1CuYo=@SQ!2+
z%|b39@Y)~Q{tGEQS9L1*&o{R7#X8gVPOrzuC?X;xj;G!-jnYM!AIcA#bF|{}kt!3J
zYn`3zZI9rNuj52*3nk*;`rt8-Qat&XL!j-m{JZzv&dnVmHx=f%vM0#re7<D!XB@Q{
z*ZuR*j>8=I3wl~MqGc8etuJ1l=J!v`+jE3g1)P<HiiOWjmHc(xxh#{9NwNjI+yx7$
zD`O@N+>SnvT)w}>uO=-AzUYr;ole-Kx4s>VC=5SAE;;RX%*{%xn6&8D&sO=pAoDW|
z6Jvu+4YgL>4kS9V$74b8rG=lxm9(U#5rahx4Az(a2>a&gGEB(J(vA-0NKFr}to-Q}
zm6bi_Z6^nPRYHOl;#8XtHMTMvh+MUc*y1+w8(L0*$ls5)sq1izt46;}3EIV}aaY5*
z^=wSe66mgTZu*;0@?h!YP%`#oP=>zvPjeJQ2pjNnCLG!ZO%<24OCxnTLyXMxiU3A0
zUd9TzSK<(YKoWg1iNe)3%E<%rnZ3*B$6M>Qx*}Z)S>HRlvqKek0|RRVgSTuFicpNF
z4dDc_cL166USU2J3b7rp(GSt<J+3Gf%v%alQb7)EDntMVNBwnEG;OmN7pdRfI~3fR
zNSI!=UeY5+IQ7tvgr}&XE1h>jZ-xzyT|_TP)$eTSvwxt!e-8+$$(8~O^IKB_W<66z
z@5rl4NudA}bVIE1?OJY|?ntk6Ma{{y0-EpRQ?~V1Z#w->RN=$YQc@k>8pR*&U0ht2
zka0E^8))HT@bU3K60~pst2r)GDCqLhQc~KSYjc0<7Q((ZzMvnUh;DHr=Vyo_8yXG|
zul<GewQ4n|c<UFElBFd^7bCdvg@3G;ePimb4)12%X_28N8up;ZN{X`J^B$)Tb>5?k
z8;adWst(tCw{g(j60#Ll(i0r8D`}9j7Hk!bnCqneO7+v}itEDF|LwsmGi;iut6yul
z)c@&kBok}fd>84?plK}xm57haNla5UUw_Tg!e+&_=SQONQ@D6;A3Ul8kwE)yU)aso
zRtKlOK9>s>ISV?_?sap4j5N#1p}r~tg}J-K$K$xQ8b_&?knp2+E&G#rteTNyTqpB?
z5x&=jkolj2mMTr-Ay+FcK5$SG7-e&o{bZ8V<foVh^)Xh#ILiJgyUJ6t%`sH{eq$3q
zqvfUTgu#~E_%-#_i!gEgttI2+x!RDg_r0^7>Oa?;+Faj~!LE}hdyg+kBXN0o#+AAy
zm|?T>V!qJOMVb7|kTd$y;=x~GEsndxEkA$awdmf`L@1oE7LKL2I9F)bPi|etX7YP`
z-dee;VFATv1PA!|Pd5j@lVV5~G=&g>il9K7jEuB<WKx7cAIbcDGV+dJY}F2Rn|>T_
zR3j0wb!A-Y98vv83SY!6%@i7wZMV%#M;}-C{TJL(xYf|5dsf@3?A9y6OfaFy+EinS
zjW(I9*H*u?liOskNFYe`dW59~p#h4IR^|rGpNo~~y&xPlwKASBkG4_>f{cn8?<2-I
z*f`8;k9@WNCwuxxt~);lh|xuL`M=#(=s1<A`cC~@X@BVce%9I9(<5SNv{i#adDiJE
z3e}vP)&#kmpP!ST81z8HFC!Z&y1Zm(Su|qMI66K)+LtVv$(zVx#6VDe7|fq$`QF|A
zFL}t!zX%cvX64!IRc-D9a&pJdpU*P|)Mzjp)c!bnqoQUB2ic@&T&t*TlYW5^@#7`^
zHY_gUw4cuZj6qQxBzcv_xy)hfb#q4#H0$Un;&V^8DH5AAGWxmQm6d7KsVJ-3hv!mJ
z1Q}Y`jBYuo$`j8H3#0AWm-#u{FI2oE2SPUKd_TNFWi09Vv$!V@c2zs9|Aq;=l*Im3
z_m;<u=4uB3LUrf7CclW`1L*uP-RMe}tnaI#7}x-k@b!#;ZyO0QhU*pQzYL>VNnRYb
zm!{f$Ld+MqXLPhDkNDZg!q<G6<#QjEif~<0XS?bwR|9-q$0Iv(+?@|HdqWh?jl`^D
zP~*i2yBrT)VMl7_e&A;Cdx|;URJ?o=L`d0N?MKDi`)gZ15!2{(d(=OCe5@8O#%Q-9
z<#Q#L^R+k-3hvwP!9TM;1X=jd^qrl2N<}v!?kk2b&;Yi48i&!930y?MnI<a>C&Y4U
zYpp`ZsH8r>mW7sbV0H5A(6{CWn;~`%>`z!~iAiP3v6$pZGAVS}kqQG$qtnYe6O+}4
z>x_XUZ@wm;gRjD}>uA_ZCZ3kc_YDcWGbfVnmwSdJSi4w5nyofGz;7%b<7t&NtPf^Q
ztdp;K`uWi<N~DgSEk90=_RqWD<!)?5k8r>Y44|#4JS9(s1^Nc<(|Mb(Es8r>4gF=y
z`p%Dt>W+IU)>dbG_ZpORsUT`%-e$>1Xq)27%-2wzUrTm6b~w|568HFsUn~-JGc_R?
ziD2gLM!VKUhK_o&%C{LHA@E9{^*p}~A#EBjBt{|p7q`tl_wsNt9=g8R;4swHVWN{c
zQIEp#w(81FE-udei6MXBFZB_}asHGAk?qnw62aiyj4bE}o)!nMvPoAzM8b2IygZN)
z5sj)fk+qH0$H!-i<aO#iS%qVXudX#tR=5kQzb5@<adkaqF&(ap_{6%srJDAAI6+2O
z>32@p`_K_J_=+lbPBJm-B<O&IjEttNtVb_X)7@qBiBfWOpxW8_+G761+R6JPp`NyC
zzSl29oS-2#CJr|z_l2n!uJac^&178~b|!Y)<(h4S3VJZDW6yYA{V~ns&i=)Fv_SDZ
z#H&?w&;h;IRj9M^ZureXDw-2xyz93HIm7byc9ZA#Pzl;lx|T){o#ftp4Au;RF?soi
z%|E*yMJ*#pC<Lu<I}mLC#q{y6as)?<UHc2N+xxWV=i&RCPo4tbAq&XErQt{Tc-PrN
z*N3uyR&u-*kpX27x4!zMZ8HV8(y{<Pe!jqSR^x$ITyeF}5hCZ<4P$fdmkmzG(fe)x
zAhsiXFK6?Cv54GNe;JE7d2X&)5XO0ls7I4xvRAog($aW#F0QZF*P4Ih5i8E0QNyzl
zxZmB~eL$LJW|R9FCLR83#eGx6Z}lA>qk)0#+5WQ284(c$505w&7SR1EEK0v)_!|o^
z<amFjwLzoH4~d8WVUAWUo0Ph=J|Bka$o_^@KZQ+NN%<Yn=;x=;Xiyq7-?l$d6@^dv
z5s@0{`f2x5G%|iCMbo5w+Lfp%HBv8Ccn=dr#9wv}x08R4_lfir*w_u^3TYIybZqCV
zZMI^4|IZ#I@?D?woK859znQAG>J7M#u|got^u&$SE+3CK0>tqdkfQkbSZ4PX_O0=c
z|KbBcdP&9DOsT)pkiQF^rWky8GDF9cOH<Jnqk!DinX6muWvJ~FBVY0&tI&FzIehUr
z56|nM?aNsa{L#fHjX<IaU_cB`S6MSvUH9CQ`TabXme=*g6;<^5dgCh>aVp(*QeftH
zlqe0{1LdAv76F6newJx(&GmHrFM84ZUmMpjm$cS@EII?Klp#?Due$zy;ol>hs?2AC
z31Z2vSy|WhyD}4!rRE##apVehLQ!5tLpIp7*V^2hCepcavDI@NiN05cy;peiA-}D!
zZ`RiSs+8lUt*hU8Ir!U1z~92P!Sj0WG$;^fX(>!eskDYPmgL8~KV`HUePE67q@z=_
z+wS*rb~v+_!2=bbTq4)$p+t)L8tDT7<~26Z@0h}Kot&=LI=p>f`Sc9@AJ;nk8971h
zjW)jLq^ZT+6i2VonNFPjbR+Uv$>;bWxd~~bHPz5S{~;6~rd;de<OZn{p7*{dGfIG?
zmG;e%-NR;2f(?N_UE0ui&&V}nXEDM-DW%LmCXa``={rfg31S<GRikNPVJZL<k-R_O
zn)UE&j^FS%XyCWE$%t{qlul^MHi<9anx$xU^1R(G9W5LcrVLOZ@?H)*NQ;pe4nM$b
z-fPpX@HV8QtMb>0e?jzJ1Zxm{7UOBx{oUHQS!7c{-Jytrn~cm!B);k2zbN|pi(z3-
z!GV8Fyxfmw+x`9F;!-Z3JqPE?khhQlRm9*Q%3-X6GtpF~CBJ74+*H0KWxYooK*-I~
zJ^R;a8{zkY<Kp$)8yeoqp0hYK^g~y{yk@1dlDPbPQW69EHKb_D0{u6Y0NsiGPPWLt
zlZHVj63|jo;tl-{rlbVdey!Mm(Cr|m)cDkXKbmB)siz*l)$GyY!n{7C$^10Wk#fwI
z&Vs_%e0|j>>vG4pAcJ1YV7@TEFmw4TklSOHNpWt%<~H<cLgiK)>4Nn>8Gpq1b$5M^
z(0Y2%d%?LJzVdWB^MefQWz{F5A0N^-oz-6%PJCV;f4H@>@2Y7Njg?;(kN&W7G|LUx
z-&|Q-#uF^|JF-xOCw*{qDEF&EKBEJ^HR^tBx8?bMsOfwjvZ3@|YtA${%##3>krq{N
z%!h7z;kj0I>FvI-^5u)dxqos-nzQ|W^-Ry_vdXuk655X%Q=Uta^?3EvB2mgE&uI8h
zdsn8yN*~3QekdObdQ_88N=_^-m04>@o0@K2?+++uB6;3_EwpKtzPlcX7FQ|4OG)Ew
zR#2L~HlGMTO69WJIy!>>^XFZTgPdzaOSEFBQl6%+-O9^TsV}@#EZyL6Po@4`zay<X
zq>6ZHs;)kt8OIWGRzN|~>g_F=$qR-S!sVt3k2|@HJz<B7g!dTvq)KU)Gli$?(c4^r
z4Kjih!iSl<T0HmNaK+_D<XSb2fIQ~JnQUWunuN9Wj;F)R?ShsTv&u?6|JR4RN<DH$
z11ADPNKui$>B~nLOF4on^0Y@?T$gW$KSgPi+`G8V3(k$Bq_$em%#PKM*x0G}=d*TO
zP|A?G#XJv=)*+nhx{N!sDj1#urOmrBSRdZ$Spo%1(G%y*F1O5Xb@?)Qe3RTb0eg4X
zoqYy@g&F$G6MGzgoeVI}&h07+F6#+D38ltoNTj?S$Up<#uIbvIJWxPPVHXk~|D$<Y
z9A?>V{)HbOewdkn-qL>2>+3d6Xr4=fZqs?9ex+jc3SGPmgx+-xUa0Be;c#fo7T?@`
zxG<TF@a@@C#KOW*0cG|S<(r-PzMu=$Un4`d)Q#1)h$KdXPJaV+PH*|hTq=Trq_>-y
z<`h<Df(2c~;fY~90V6R(&lVoVTUneC=EIvcKfjs%QAfMw#6M<565{-AZWR(V>~)QM
z4lTi2T0D=Bgn@x49UYF(irT+aenn!DliRJfTH@pMt+nGeJDV3x<w1Vo{C>FD9IVip
zn8+x@8%e1%6fKad&yh{aZRTQiha7U+FLCpJ+S@6=zAT}py*^m5pZ^=Nq<a<)1q~(+
zW)7XX8n~90mdi__*e|F=C)|#?rG1u(iKQ`hpGgCAi+={eSB<Ah4(<X%hRKcJzl+eQ
zsjB6GOw=1X2=8@({zi%R{$-p!)R8iV;Yt(jWZYUo$PMaQT)asV3!RPYV%C@>&G1kH
z)7aQ(*Y5ItV+BEr?(5Z`AXN9W_@ww^MkiMnzBV^@SGP(U>Ks;_bF$d_=V!&}RP`Jx
ztEWFf<ff*15|JzoO+{0OYP-7=#DZ%z?)HYOat9OfWvU?p{`xf7iVv3q*!*72?q{R(
z^NDI|yA+h>ef{W|<n%ON4kwz+-9k+$gvnXQ4c0=r6|1Jx`5=ojfkL#Cn)a#F&vv~u
zp{1+K43AK6b)3~qH<ej5IrH`L(X}l2193VJc||!)KqCgFl|mqiY3&KEhSfSr2=3yd
z<LwO_bdmOBD5@gl^vjNu3TKn_{zTg1QpoA*lgIJAU<DIMUBT_+akDM;BvesH8=rMQ
zY|RKZR|)guuMEyNxLUT;=XGr?hor}AR4JdY(qbU8b1GU3n*5CD>dLNW;-!$77%f-H
z60ozg(-_YZbiTDp5xcUam}6P|?Yy7)w@;Ic%c5qH+{aHuL<Brjv}!aF7dse7sj<B5
z+@h;ve_k6Hxc~XHOswiE6%Au_iyz^EOZ468p+Ry^c8TZyxED6|-=QI;<;FQxb#1pp
zBVEn`xv>gs4P$tCVK1+q25WkF<YE8&7&3&+FzJZ1Rra_k&-Tv)QBcw%ey`hKB=3m@
zR&-mY`&L({Ry%}4{=&kNb8`b5f`);zBZ<JI@o@ak#zuQ{^Z%^GVAmMuigaspHPhyJ
z#&j#81rvbbd`+ZM)arVonVxuewKw*+OdXk!b#FD|6GdaAvwAtghxaLLMn8HfdpQ81
z7!xzU*NB4yNmL>-GBPPPj=={yo~X9vMR|N)x0$`Meh!WyM*SUA6C7TiMq<|fo_X~Q
zIaU2khjabJen$s?Az9h7k=YVVaZ@qLx|Wqp42q5VkTFGC?<cd~5JMNQyE2X6X&k0~
zecy2A4SQfRqoT}M(ubZ64<?C2P~Qyy1Tw>;z6)UbvOU)unuSdhCxfL-4d7_&lvN(!
z;<0oxSrdSDnZX%;qmxx>S%Ry#Aap=jaIi|1zItUPx3qNC`3kqgql=8;XW+TjYVHvk
zKlR}ePe+IG@peJ@{re`nm1aC5hVt^+QQO<$1T)vEgNyl!XbcQN9jd5p{rP!O$tauk
zn!JR#xZ>vfCbcqUbPRtyUUiCu)`y20?(`x`#l(e*r;?J&#5XNK#ra@O?|kD=c;LI`
z`HG5+bQsqu)kuY+CIYUDzrVkzk&`nr=zbkG(Z#@MJ6nCr7B0k-{t_=^`LgIvqf4YH
zD_PW9PRA%fBoX;8peH@u%H;?ZtfS=DnRYanm$bb-)#4M;WeQq4Iv`*bJ(gC~;dy<(
zH%31Yl`u!B7Z;zxZGLys8;Z*7<;9{&2XapC2J5&H*!;*J+8|e^j(!5tv3g7O4~E@<
z*(&q2{g*F!f<7ci*m3Uyu;UKDSuVD!m3<d{-k7Q+RLC2$wmJ*_VYA*yuR;O@V0l9n
zhDKCqFa<Jr>k1X4J3LuA$zhA8+IijT8|$8i-FJ?*w|Sk-By@GFQdqm<`^)6<L+w`A
z3_8nWhM0h|`HGIE2J4uR_z`=(4n(rB-F-nGCm4Xs%j?e0E^BXZ=ge-Q)m2%nFNoj!
z04d~qgX?IE^K*QBRXOO(gI&X%NZc-PAaBV?`{|RXEBnIq^za`j;73bK6X}<cBjSWa
zN=!S=rn9E8H2NdI7w*>9j-bF+WPA#0>d(^33w=Kd9RqGQhT^D^+R%yg>CjtJ)0%Ft
zt>-GzB7%Yn;xH8Q3~|)y(KC1)Hu^yR+f}|Gc6j(_aq(FY+;14e<2{K<3p*bHi9B3x
z?!(#h+ec_RZ0nO+Q~%WR>wh&voc1(3PQV2o)5gpyM!eDGu3@igw3;*A$`b@~ID0r#
z{!32Ii(WtdBOyITM6cgdWDk=HC1qtzP4dLsFwYl+X)Y;8I|fU`qNgIkR5HO!{YLR~
zjz|AQw1B}5=d7c(<-4jkG}`d(^}iAF%Z*I|&*|w-f$zHOk#zNt4q(qS!*!SOcf<$6
z<b68$A`eLzBco+LEqgS&Z*BcxIx5K*{ZzK)e!e|?<IDRGe`Zcg>u`&NQ9)y!icujt
zysFW1c~lxASo;)^Q&VHO`a6RLQ=Iy!F>3y1=XALt;*<SalcMAo{)|79Rrt9J>7%w*
zmfY712Idvo1%A@2&f-*<VKp^6^HtH(QWi|`a;0mvc)bLAy4`<wt=9s3yT8{C%iu?@
z&dq{tiq&ev07DLa{nUj>etvm9-75@q7kWCL`QXH*6&{!Dy2SuPA*BFA7mAsG!=-9f
z`fG%|rA16!Ffg<630jR7IbKV-)(ZuU`YVF&3NdNcyIa$rNj7%+!i)s6tS<@{UqIpu
zdU{`WKfDPBwXu8XXxa&P;cM5QMN_c`q3l`a1w-c>x=1Y`8#5^hdLmg8o`kFiF<7BP
zC*RbR-DCJL?uWm<PGzn3*W6j=8AA>6ilxGilZC|ciB;v$9fLLQ?UW~kWnL8`WbN%F
zycD`Ge~AO*v<(E-b=+RY^{z*^&98ZpIe9oZtfp^CHlJ-LwB76Y>mH`c6Gna!Wwo5!
zq;y*PIbCli8XAlGan0Uswl9^#Wg*I>aR^GfZvPO?Oxo|T=kGZgjsK@*?tk-iZg>1Z
z9=)|aLBP%8d8V7#c(*?C{VUD6UQ6xiWX?%oV1Mb{be?3_O>9(DlobY)yi5Vh?V*aW
z1RMZz62)WNmYqC~ms^7Lmq|hJ_`06BAE&-h4Gu51$dDl}w<Tp|q5ujN+P-IYFv6Xm
zchihtG-Q|Ri@G8WQS9TMa#zDM^seS3!!Oq7Np04?=;P<rdt|iKS-Y*<cFiz4^|Oc2
z?x6RYxp?_(ATG}_kq_AI#x7>M0JR&>dzPqjFJsf_m>Gl9#Sbc(M-MF9EV_H{-uUQ$
z98v41xZCnx>8~X56_XUxaV!F%2eVd6PZ};mf5Xk&2W5^V%B3$9Jzfse*_bLi>$=eV
zUbVDYNL+1@cOAjvj86QyZJ*Gv#FZ2JUDoQWhg*qWqFX3%tv*lLkAHBLz^Rca@R~eV
z7w;+Bm|ombbKoeaRdt9Van#(dho6~$V?D+7XA6H^^GTKoX~u}@Y`yK%(+zcqAy<@f
z)-^mgW?>Oy2Cw^TD!Ude?D}!`463wr9TM`y%Y9yM>r&s)koz>*5@p@eYlzMV?DD&d
z<k4@>CN@6yw^l7;MqmJ2f4F}090wbT>|B!>yma~kmd*Npt_F~;N%yV$f%gh}K1QT7
zyoy@4BYo6`?{jcvVq+!shtHpvch(`}X=it@Ctn(yD!!-LdRjOT0l;A94~-kGr|oG^
z+Y{#QTYkxCr`@k~rpn4KRb^@RMM9y?igt!>S}fd?Vz&_$#pSujM;igoo~mlFP-5zR
z($f1wnJzKy-tyNrMMc)7w0_O6lWhWd@GNDeIJ$%c4*V$OG`^3i^NoZNwiekscWy7W
zzXT$5sM+d_eA;V@M208l`k`jFm2wfUB8UeKZmKMHnJm~;`1vJORIEjN<CAd|1qJmm
z;+C9Uj(SFm@G*RR<YFC}ncLh>!=oa}1)H*K!=^OpKDa}O)hnE;jtQPZAD^F{w>rFo
zhlX%KD7VacyxP_qPpuvm6&cGNNaFuKZmb)y;0jrEw>0oO+%T=#r{a`AEcSD!Lac6;
z#C$K*>j<QqpX_d1oosK}YxABal2LaDkV(HQKB^Y&>VI|c(sEvmux{wG{%3ACRUTOK
zoh4E+pd|(sZqJ33_MWgxQIII$L_9EeSBgjruhZr&k0TBOlR8uI02l5f0JR5e`b`r%
zZofSS-sG~*RB)hCi<5CO3Snjx@y#QTMNaa!x<r5>6tUbGzO7*3Ie`;sL^Jbl9IVcD
z)f<+U%oc2po)6d6)s=Y?HCzP65o||sD5`C*+gu8BACnT-+8qpMzC$ZVzF&-#rHEVY
z@)x9|JNXj?FD@>Q7~Ip>m+yK!4-JQe!)cdpCc}vuElR4Cr}1rPZ!9vC5`+PmV|3NN
zT1jbko5zRR*sBDE#5%NdPb4?`7L03|{RcdwK1a2AA`*=Uq12)sL|G_)hDm7^tll+k
z+yK*yw?iQvzmi#cVyJ5&F5ZSEvt;8IH5M#8?w#t^_Hl_I3Z&KG4SOt#T|J5Uj?!;&
zWMNYl+KhK9o)ZIeycY);c2_Lb>p!B-I@2Rknrq!UIe99C8i9|#Y`-1pampZgKo!Jp
zpFFbuMVo2IN1$}5RO2|{i~r`CCunAReR6_u8+q;Jk;&B@Gcol0(cayvK4xYXUP;oR
ztJ86&aDQm1w5XLp;R7$PHwFe#TI7Oj2D4VVUmWGKhez?iTS;r4-O)yzT=f6e0-&Up
zM2cd)`;)TTW-sU!ucJ+)LZdc>chXeIu(UdCHBqTI*6LQ^`&S>@Dj^|(7v$yY%oQyy
zOIle<tu!??G1=C#KY}Z2>*Q!yqdXy#rNXKInURqiO7DX&T!6BwCe0i(%WkQE+j~dH
zFx83KWMqJZ9xGfkq@M&GZHdpbKyF|#;P#OI7A-ecgnVMDdhO(0ST+Ic)SC%YIvQ32
z)vY{o!tOh{^&M75e+pUv5K&f@I?y?OUEH(v{{ykv#kuqtv$aVd8%sfgi}FSCb4ob@
zTO@l?Q7#nMvLAnw4S}3I2Cp0Ddzk*#Ryw#mRZ{9CDH9p;#bRNXu~c@@!E$E~JG>$K
zHAdpsdt;Vt+A=c3!5=;u85zwEiIFNPD=SM&hbfoLE-bjaxi!|;t9E(4Ji5k`+1l9X
z>guj_`s!$DS(=#4=8At{NJ`7f%1TbAN{|^F9o25MDOtNX-5W~-O|qva*K{P&e!Y{P
zn%a;h1<W%Hco?TLva)q`b+GS*<>iqhC0N<mT-@9^=D2P*K!k@WzPPl+VLeaB!J$rt
z$%2DKNlB?jp{1qe=;#O|?D0Qe#dg1?$e5X#Nq_$w*}XfQDf%cV4fEh1HB?t!;xD{j
zY^OrkS{ZEl@-kw<$EtF>L)w@_b90ae1>jivza~CHj`6hooqk(iEv788={e6$1a=N-
zn8N}>+o}Gq!CmKV!2}#Zn`V}l)<!)>Oag?yA2G483JaImtP2sjOEcMS%Ss1eA0B*i
zVo0Qsdg~W$@FENUep8*DmC9Fc5t*Vgq~zy+d49Nt5q3FUy8TyUd_*-}YbtARe?B{_
zIyaM_pWk4;AR#GPCK8pInHdo=QfoT$czawV!(=r}6)ZAUV=M^|A38btwMNs%!U6{e
zhs$cVnB985-RD6W%gOKYun63!Qo9r;LlI9;PjD->8?0P!kJNI$4jR>fn=@abv(RL3
zfYf{M^IEKw=j7yc@6)MDqZUlS$qC|H&Zjx~Ln3A)P?y5*edprn_#Op?ftosJ<`BG_
zG!EM%a2NFT*Xk{2eu!+wd=_QUZ!b<QcsW~bV>a$b2<`#nO&-W07|2o&%VEm|R2mx^
zn%~c1gyS3PMI|sW(EgN{DrLE|w$F=(R=PMV8ElAvSBoc~s^Of51E}9zRU3Q$lx0A}
zcS2gzK?*-ox`;P5rA1rQVew=l>TV=|8nwz`q(Iq~ICbwAyV_t09ko(yek_@EESVJg
z024}@ZQpjv!NGy0b=`r>QWl}yMG+|}>G1F{@NFoTJhcKF$eyw|J39kn5)#;54kl%j
z80KbYT@I%U47&Vycz7l<`SAt)o^OvA*zG+ZZ!BG0>S->({Uzk{sFsW-@)78=UZ~vL
z+XHEp<tF>+@bKyO-G}RajVk@y>+9p0BGjaj$jHbH7E>7)7dAkuVEX39#oGE9Y^=h;
z!MU9-C6N3KMI~0q;9;kvlw^(bhMd8|!#_Pfx*g4i<rXhg8C2=E#7^wHpZu#44MhRa
z2nk<q4pr1ZhH&Bo%sZlJPQ#ub{`ZHU2j5VX9sKX&Y2DAnvov3HHp<%$kriJ_$$F-p
zv^r#`YipexLBu(v4187p5KdbFe8p<8vMoRP&{QnD{U6p8Q+g<yQJJSKAX<A?sV=6t
zeEyfUF7<u1&2QgNdMzdRI210!n;Mz~5mj-?le+2otagkSJ;7vcn-xM^7iE{~SDJlt
zno<*Cu<tW^Br30duygnk*OVH+pU5KygWFufL*4W0TxGo7uKoMf`OGl$hEs;TJh$8)
z@hCm5jBK2m8uQ|<*GIudS1K7@eT5h@;aD>9k7Om~-lN$w4O(<OkrXOam@qkCX{dof
zvNwt6p@|6%ngn1&&A+CoFpblmf|AnO+L}?j-ePYwMO$0j{d_Hh!&ckSa5II~{1I|q
zbw*oPT@4b|I#~j~cI%z|4jV$TWMgAvkkjRbM%!f!N(H$zj*9wvHga-tEI3spWaNbk
zollsUVoG2|Rg}b_r>&{!@o=?^LdcVxnyTO8^mlDd-@qVCB2StuHjYwpJcE~$mKMYp
z?u~eDNqBg8cK@mk?=Lph)YMqb$J?EDWkB)<ObI0=hs}<ldPf9wm(%4YFjs(qP*g+&
z=<e;!6aOOLBpUOEjMF=1KOdM$@U^c}yOn!(@LqXkqYh)0u`&gbRibPCWo&+z&-*-&
z&3dLZI&EXNjE4Lt5oIl}T&=}1dyRt`6%atmE-~fRdoSQcaUMi^Z~W^OGQZ1Y$wsN7
z0^+IXk-8M=a2k4A+VSD(_TtO}H~>?qKq#9GA(kuwlp~M{qsioAi!0#(84`KhTtO0f
zn_N+b>lUeCs{{gcgAQ`FGX#1E5?r26lO6cT@Bx&HnS<<mQxBl&f-C>$TYag{-^B`@
zCNR3N;`{;^*a(LrZiwdC-fXGe^V+aCq(+mDBaPpv4`J@7tcgkf(G0j&y~)hRboBIE
zbcvOfXDcnvP(pOrN%QNFI^U<e@87@Ma4b(wR)e4gAVCjP#kz(-&Sy(7gwcu=GHB@N
z+FcIOvnJpJazsNpEapBVT)E<mE2PJgQkUSV6;g@Z-RV@0lo&R+q7kjIJ8P9InN!lw
zwGyC6Di)nBBy4U?c-0&_+^=oa#}3!N{dMK$LkX45WA5U!{gq2qYZthbH2n>Ty>e1}
z3i%qG-m0!(YmYBpl37ap92sM5YARkdv+MNm1UYY85WJR<C;bfo84COJrv?2cEZhVr
zfU26BCHBa!Qv;Y9->Yie+}>)@VFNyg4$2&9W0ltXmY`*zm&t$~sK<0}=RPCmS%Z49
zSTd!zc3wR_J=ay7UtUE+pi$kOE<+aU%-?<A0GFqxrUo%MaL5D&mt}`mfCxrdKv-SC
zL;F-fAuXIt8a<x{c4OT|4~6kXQ>I9?YmCFIiRxfnXU0l=<o9hOUyha>Uo#bTNnn3t
zL{dWkMb~v}dZFF!H!i!vs;Z)jmjVg}+xE{xW`2GgXJ=m_-lcZy#W9%VRE!$)u=wP{
z#XR%zt~HX<Xr*teif{V1PdA6g-@X9==!<qt#Hl1dcXmvGudarm{TCDzl<3niGER(-
z!vV6gvSX|80;@v8gqC>iyzBy52C86BSr>#!%3uqWgM$Nb00S+U%*@QNiHI0}OHqZl
zI&SxyuftY4hCqrKVPQcDpB7X%m;=vOT11s*H~s{viGymzIV!D{)0UYgIlQ{dkmF`?
z+X}vV^gDZ=CWs^MxCQeH?UTzzgmoK3=%-RYwB%QQF3zOPd)tu+KBS}hU9mz{%=Y1I
zrLgF#B95mW?1#Ka$spL$ESCT9sZ!U89t*D+-ejJ=##vB<dE+Z~;^~nVmfq>KII4_+
z{mY@r!SX-;YlYywc-<$@k@*eYu3)@hE^<{amRd~=MMvZPgmv>>j)WECrDbDvbt7L&
z#oWioGhH9QTcb`C2YpC7;Uc>wUh_D1N^MODGE63lru-Dad~z)tNEJ>hrJOckz1YF4
zA}ia`SSUf4sHSn8>XW{$L4#dp^veq!N?NHDTd{-IpK}ceh>M#6lQ`&uFFPRpq*6#{
z&<Xk*sP-zOlos@Tya^@t<8t2nB}DSC)Ay;>^%%57#SESTyv_5qj<!<0t0r=C@>9^l
zc83$lq|X-XB(df|K?f{QT8I?2%}0a^WD5Fs-r5s>wKX)HD$}TfhDRx0GFe($f`WoF
zuyO_6POJHE%+EeAUua{6=e3TXlT9c_(B1!BGmhzNa~9>b9Xkv_h<l^K0d%u-=KM6Z
zXqO@*srR&{G3Akf<HcL)IjJ?N<#Dzf2utdii?B@8L)!T?<as^D#r|$zoq~<v8T<5F
zCtsn%-?oX5d2B^WQG2a4LjXDZdOQwqAF-)xMI>WRcMLl8Nzcvh#+6(CWu(WXhD%%f
z-zUE*Rp$vNr0etLh5R!T=<r;zcYhu-c+YiP#pYdcsX?Jn*pFiT!Ov=j5?J;}5-zIr
znf_cq>cGdxqE&a`BA5f(Kt$Tu*jQC{o=C65!paIoLPGLwsos(e?-X2Z&~$Yf+^2HI
zjcP!#tX%{){bQ(iIdjVB_CWOU(GjRD0+FpAMcnP-jQR8ZCBWo%qKOi!qN(|>M1_(e
zX}MCbt-ZayOJf*(FZm;*mZm26g-X3Q>5Pv%1_eBf<X3lP`?y;Y_)+(KmTPI8P3Poh
z#i9HMy4TTy^DcTSTDmTs{bC$=6XkA%R6sRyq<jn4_#EeqsSzmN9n_d$wer9&d}I&g
z`%TlEntL*B1$a6>_Wt}QmJ?fOZ88?uC)xQ^CW#42?i9%ioz$RDjYYL6JdAaH-8=bD
z6@9d+g>AlMVt<#MJbi2o0EBPdbGqkViIV|TKNh*AheXu4kDj3b3teYXaYJF(FMe|J
zc%asAdhasXAh}oq3JtR$pUT?Y+&r@P9nJmoMi9L5_7+QAT!Je+nyQ*A6?=#SLb$Sf
z$(&o25~i@yn~zp;RMhx%fh=g9?7ojKl9H0Pwzd>;V4&poxYz&z8FWBn;~i+hjdrU`
zh4T1B(E~;`D=RD547$zs>jFttyu_QR^;UC7-QS@F1Oz|}rJ$e?78V8pu<~sXG9i!4
zYO8ByWo79jnD=efRxMHdLC#%eAc{~eT8*_4lsbOgS^qxRS#5c+Ra}q$ClA?L;%vy`
zf<;SBpQ>2>ooX<F&XW`hAf);soaT7^Jq1~h(|afx$Cm2w^0q6-t=e)CUH6uQo_MSX
z(JR?2BhFvi9s3>c0%8zkhL2cEIf+w?v9Tir1s_@rgJ-T3&$Y2i03fF5G})V+V|SZu
zFLcf{Y2SwTH@V;K)7~xP12J)z`k+BpW-Ehm3|^;`hPLhGXLj_iM9cA-@uwcL!%$^F
z*~R)VBeb9QTkz5=q5M*fgc7Dgp6?y1znVXubgV8z({;A6HV;o}L@+MyC-?L5(FqN7
zF)v}^;I9@&w#Y#4mXRxlq;xC@080PhN7khGFNFmBHM%`t2NiX%1~T7lZ1}9_%eCsv
ze5t?7sh|6&<m4CzDTp&NR!z9ET3K785)1f%Sv<?v@=qY_2W+~@_J7})BdtQ33bXzz
zL$ds=9BNuywbeu!l6XC@OoU?Ih~udx6*udu<R69cNs4_Hh=}TZ<}&`!YP1O=q=pk~
zQYANPO;78k58oVLFwg{=;~(@0Ft?onfmv4bFY0sSO<Tfjb-t9nH&mC+WpNu2`UZ@o
zBsjz*!cmt40qgDT#-(f@47YHOouyQ_B|sSJujlA+4D52{CEwW0H1a0~+>BaLV*!^@
z#u=hoUsq*;<SIUnzBm+;h}HWxkF6sGiu)q0LJW=Lj?bx{l(%GiUPb6DJ~6MCKLT$S
zrs<CL2@8~$TjDaT{kIBIC2{ikhm;k6MYSetFIr!lQ%EOK4Neb!Fodh{fr)&0%P-O4
zPCjy}Rje#4Or(~cF4N=PZe?hAo}HD2M=`;|EbceMlrdHCX+I)&)Y7t5kytG&WOf%~
z51;8<9(eh5`S1*`Jed6WeeThK{}8Q}2nhS(hii>OQi4ja5f_>oc4x<e3#0<y#m1{k
zYn}P}y_6VJ3hJ!?$sow`;|n06i!f<%fAxGI5hU#WKH`_Yqn?s}eYM@Ui~p|sWWbhi
zRvjM@($XESZYZW7_&1vP(Ve?vw^dEpy6`~ogY;ZFs-E-P*_Wuiij)d^K^`vg_dvH*
zi-~Q~($GYfYV#(qk^iP@;1yyd24dfH&rQ713w9xBB+gHNJAPsmWwtZKSdgJvj@Dp*
zAj`@kBP8+fWM45l<BID?MwjPLytYL9DnGCM_r0WsMivpj0|90HFhog7ve9N}bX=X&
zR4Ud7gIMu58K8;)W3qZ<p+*~8tdp1b46ic#x*$asdvS3A7GzV0H{IRcAVg$O7LO!(
zGepAwL_;5<_zoDX?Ga^l{6!{>n2*Q}th%2h7(?@kK?)VSDr7{y??J)f#EHWL>3_dL
zZE$^cHAkz*WB1(`Gv09EIx1kSoL99GvE>e%5Lu^XW1UV%jfCp2bGo^7ByPAYlD^Aw
zVewTqv}IuUI0OKg3A@=95eXrT%ibf-)0yuZ<>-B(#c{I$Q(;_9O&=c{D-$EL)7|ya
zCP{oqX^#xFu{A9;KR<LNOkp9Mj6fDp5Q8ca6>>CCDm`8LTye#?=1DuwUCYeFvG->e
zg8U@=+Ia4-uW*WnB0YU@qt5Sbb$q0ZnQ(Kmcw1*aGBOg@>InscKTNf+np6z*bIcsr
z>gqIeqFgXJWYPuw4&!e@^J8Hcl&Z^KelyCWqoa4{>jo++z1x>y>11ehwJ86Fw$l}6
z#%fz~9Z%iWVQr~=og-xbobE|fZvHf3>oiE)zbr*WXy8C(ZCSR1<KTK*(q|n#qweCI
ztl<s(Aq_pUeShn0{D1@rFX#XI&Ffo-lP)}iZHwn{^RGnpT2$QjOWqJ<_kWF66)X3m
z;sfLgul53&D&0r(W5*(57ld^yWT%Uvr=vN31KPca6Q{h@S*JIVtjadkvvU2#ux=CM
zQI9JnFi^{Fyi}a?{EfD1i$?29{Iqm3EHC|TSFYwzfT}fF<9Y1cWp|(wN?+duk$yE8
zRJ6FXJbbq#MmF^$v8hvUF5U%_u;_RB`8==)3L5ZBYx9%MRC+@g@+5`|ruTDlKIY_X
zmC}$4Qz3}t==+Gq@@Q*+NMv-kU-f$HkJPYVApwtvbHe1vl!wceZsF}-yn_*bU5=l7
z&b3M``AviY#OLNJ7j%|<23?Apfx6fvMdvEnB(hpF$2h0=aR&&5^L+X9{hf@omJ)gI
zY~TP4@KqHvap?A!JeNn1GolbRHC_C%CZ5mc*FZQdI6%u%9~RV{Kd11_Wyo~fUEmCs
z*7`6nPyZ5q^4ao&$M(6r2(;heeY;0@O@mDaD^>Ti@|cmV)pk!tIyqgHywnZ}3#4l_
zGA$bH{k{FR$Hzo<b@ba%2P=01p>0ltK#N>wxr(_U(wkOWFpD4XebJed@zovqC-Px~
z6&{Uk@E8>ZGus)tyyeIoiT{JE@a;G?zym>zu=r{Se8bgF^ZQIKzkO;U0H?d$UAWo8
zb&GC6q<QhT_e1CR^Tw^{T&mk|NRbNX0v2cyz3;i5cIG4Tw^H%OcG-XQ2jaIVKM3$>
z)BKjAp|$p2R+V*7jegtf<N${dq*U(hK1<G#D#4;RfwZ)Z?YVCIJt>V$q3S$Cm6ANn
z*VEiWW|a*+r&?9gl9EyoDhs1E^l}&bg5y(HRS;jE`B`}aa^YkhO*ZS*$DT?(u>6)8
zGmDg{R+>lthenoSpq_ZQC7vL4<M<-KntyP9rT^c+Rn-ll2nuXAp08328SJ<7lV>hI
zK6-lj5@wFPS&RAEr~?Zdh6@g!*3wcL=i~4F{62W#T-F12s*jFhI13wd&Wr__I7q5)
zJCxGUTH@@T?McjMuzy`Po8pQNDCG?ZAd$|df(_a{-re2V5GqcUC6l%!zzO#~V+N9s
z4xaynIe?Eo*fgIXmk*WQUR|y2i>P(_UV<3)@mX1oX%5O76V`RV&T{YKR+AtqET}ih
z?Mf27?aq=yl>Y|92H)sh=n(&}4UGMNkE;Fd=fhIfN=->;q<{kQj+a}P4{|+1p1VHN
zD@gCks)foL>VDvqG~RQs{22HQ&u%pM8TONzqUW;fk57b5^bmj(UoS>2p4RoIfjUfx
zWPzCzR63%e8{*>N)Rn>RHvg{SK$IQyhoT<#c(^cCzZqg$OI8}Q<z3{#n_=sk2RpHm
z{WiNmzrzW)^(z$$5O6hC>KDO6C^4$}&Czv}T_69t-lMlgP#S~{i{l#iB&n;Naavxg
zf18h&xxD=uvzmD(Vg3^B7$9-p67x3cLA_GVnan?bBv3}H{U&m{;I)~f4r$CjX97P+
z0+~CW?(Y6%2-Trm-h1=|%&7Cq{2{&Fuf>0!FOe;U(fiRzBUb%R#Lw4Ga%@-Q-KMlO
z*uVS-iWqfk8<~#-NaTecFPywq7kJ2C_Sp}3e~}mzIO=ehCt^T|Dr|TADz_ZCalQgL
z0Pq#_8&1CoGgLfR#L&BL$L!*MI%45esh6r-_e!L|XLq0LN}!^$myoDRyUlXf&~N|>
zB@3I<yZ&<F8`MKZ*>{pi>1%8L!H>S7A9rXCRWaDucCdo~I`PwDpd1}byuJw;Si?Mw
zq>}y5@F9XWV)%bUhq(W*p+h{wSQjOwDZvRCVZ4ZzmWTCDPLO2h<4Xqzy^MU(cHZCv
zNx(rKiD;r1MHb6hS8jwWVht4)Q6<&&PTwwfaZoHHNroOA67t$B2M#dCc!AVfMR|Fr
zJ3V+NbY!<yv)n)VJ>JOwkI}}?UFFH6(PPQ=y~CC$oNd#PAiBfF&9=XMSqj^{xW1`$
zp#W0vApt*RyrQku>GG)QxPNu?_4)dlBWpeetv#&MgO*+K7k;Y;D(>O_=u3$GJ7Lw*
z_4IYuEbeccUnfEgq)A_Tdc-Bs<pzkk*~U9RerRuKeiK+*+DITwKC&L(+W(}e8$E<R
zCCBFtCy(H;&#v!@Fb&gbNE=$N&{g|#G|#>uawQEc)?t`8+H^Rv)$TYCRqFZbF`&g4
zuC)o=hOWDlqjkFxT#igaF>nC^a>{*Gu?yt;p@alXH+^F^y3v%;f}P&o|6)wYfq>dt
zzAh=!nbFkZk5}YQK#X)a?A#Bt6ms$&t6S!%A7UhQRB@smFs3~;F5_QvC1mt7wCm19
z+8-k{>8Unkr2vxJs&oFEexsH4PLTh`#M;G-xAZ|ZHH8(&x_V4e`w%g_3m*Qozmp(y
zoS;HJxUKOU5JC{(^H0z({rX7^TQB2e{kA9qxB0u>SQ&rb%agrt)#Di_9Yz4!wVL?g
z@P`QTKJyPkF@=yw&h{MKwtqY8Z8|)jHkYdwjd9TOC?;!{uKag+r(vm6ve@he+tOB3
z0MNP|<9G~T_p|;Om;cMv1I)hxI~-Si_w}_3lxT`5u9tAr&9m-N|0u;~UNz5yl;-97
z$uAkd97!l#kRr{GXvI-E?R6YFRW&5ld+v0+jjWmu#{779^ax~gjfdqzZ><w<?#%*6
zy&qB|zRXZQW`1g{C3mh>7U%fDNSAf0?qIUD$FJ2IGDp6Yw`Y*9&DVQgnj5Nid5xOF
z(w4<ofpg;(XJ%_S7WGAR(jf6|WH|b^NsIP;U+aFyvb6s1(sEl^7AH8+K*5l<-s9(Y
zSQ{pJeS2H_pbgb#M}TJ==S5Pz-(%63))b*Wj<HmJpZ4f%JFng_6Gr>IxhEYVFUpah
zf~T?TM5))=Hvc3OaEtEuv?pd}qwHBX2WlN*0G5~g$$3@~Qqa$@d1HFmKao$NhGyyE
zT8Be3^BxS-(u)>sj1PZKHNErYnl!VOw_jKp90<nV-fQr8e^j<fIPa%)|D>5=_qCg`
z^UdWN9p<5|^Hvk3x2VJR>ZQrkevPld^M3go&}=F+a5sJb)56kpHf^8n{CmbfApGD~
zw#_AF!EPfmun}sTm+AXEu)`wr@aoiO?6n_+%5io+LakxMR?0=2RBOL!5&#WMmh-{i
zI&;W$)xA1MN3ZG-^XszUW!iAXNKG;o2pu)JT@PJ`q<rS4kFsC>DCF%6@nsG%9=0k!
z{c#aGQka~d$(N?90-fj^Vkg+{0EsRPOUheA<Eo^qav<=f^jc$5@VbB5f@>h0h5noN
z=IDY~Nk!wldO>kJ&2_4wabB<M<YD+Bai-pS!F$D^_Dj|Jq5J#yIdPk#(-qNu_KK$+
zBlnle&&St6F0xoSkrG9l;koElFN^Q-+YdRQ{rTN?mkx2G94RLRlcpTxKKJmPdi{2=
z&h#AZ{Gw<Am=u)%?OzJ)!8)|migzyKkSIOxlu!CCx|HnmZy{SQFoZU|%*U-ic(hig
zgJ7NK{^io}#ykh|Vbd8F9NK=G{|rBKesY|0aWvWBK3R|e4-EjEcI@T&w_K#J(k3iz
zlA)D6fDi<a*K@fsrOh1$GS<##FIn0O5uqyYqmw(;Z0-z7fkFwWYv3mNsIiclDK9ll
zBW3EQM3l_cRvln^Xc77TI#?MLE^He0va!w-;HPopRm;h>H0$PM0}hQrb?-Aw?abd7
zkYf!GKetITRO)*=?Z2RlRK_a-&56#eAFxLTr*V=-u#m0Go+1UAb_9WiON+x{qve0e
zTUXI~X2Uo2Hr39MNw~zeGQ#nRp~Q;^^5lfPFZi4;j%=kbO(B=5PfgRXrKHp*3&XI^
z`>)uUqJz82h=4<8L@0E|?v_c=`-i{7aIl-Yl^j3Cv0T?*uBM%~W?0Ig90)(5!Z!v7
zzh9kQocn2PXBaSI;&iVIg)rUM`S6Q<bg-z%`|&S+__%NS5z6POGnQPeYw5v1=H+Xm
zsg3}^L})E(VDL%M0Ny&YmZU8Ij2L>XM<i=_Od5^aY2EC-G!P=%6y>GG*%LHlDkP(S
zy0lbtUCE?}L5r4OG$fpwl_{FClv=AMzAz8;veAmkIM>M_cq%;#ywU$}Er0?P4(_p<
zpr_N9b<@{F?iuZx@3~X}K+p>a`7RVSh`%nd--j1Z5)#^eeiC(Jmx>cGiN!{V;+db{
zQ&sn|38uRiw{bkZcrTGR1qivkodl;h(uz(nT<k-Mga5xEpNo|~DW=GDN14KG?*<N*
z+4sqfQ?{-7+DC>x#&p6D)#Vn)S8Y8<IE7&Hewg$A%)bzTvD99F)d|JFJF;y0JWyIi
z+;MMl%C6AH0JQ``jd@vkWX?ekh+WO(pEu$FGHlNdyL_S;;f(+wU{Anna`I=MGcTjv
zoVErkeD}YMq)~k;uKM=nK60ek$wuNvt3JR#>h%ZYdY{g(Oha$<u+}hymzL)w;`Yx$
z?vo@m!){T0%P6W7XCF%%Yt`$#dqG51g{1uR>o%NM){0V9Bf=Hz&0gKYL?@@C?#QRd
zgy1ENJNlzyThlI+lgN~9e(gpGCv*3lKP*^x+`C;FS3VV}!AHBTt<AY}*oO`U)X?;p
zH43IAlh{CxccRK6ZO5OwPa9ruj<%?s+mXy!5Xh@`n=7nC-RD@7eGTg5=6g>KDvg5P
zb&l-^koW^-FC(wS_ajAt=!nv<Wu{+H%%Zi3`If`)LM=_DmD=p3c;wCvU7d}iD^@BP
z_h22s@#S4|aii4V!2(ST7Q@3og4O7ptqJdlO(;EY@*rBPFW&Q>VFg|ig-cuj6}hRn
z8iA}zV{W_d=q&qm<@(hVEocJBuR|r-ARG2GA_5<*cGky*)l=gr_cRxA>!5`0{ugI&
z9TnHNZfzFs65Js`(BSUw?he7--3fsZ+}+)s!rh$&heCoo1b67l@0@$@xuZw-=>GVN
zF?JQT_b&EYYpyxp=RNO#LMmRzQ2=(~{WMALi?2c&U>}A|-tPAckBR2dQqiO|adC|1
zG^h&vXqu`d6Wv|Sb00~J-q5h-_hDdgHLLXP+&1M=VmlG4y9NOLSQQZw0k$tEbA{e>
z&8~=77srd@>M=>wpJUeeFJ}V#@b_VLb+&}=5k9u=i!GsC7_>l#6+4=h8ZmvE=w06U
zJ<~9N#}CDrDzOA)S3w*9*#^6)uaWbV`?h|cY7<HJSxk?5pq(0-UQY2TraV9oA?JE|
zy%KIQ*H`pFXZaEU(1zWoA~Qb0!@ts&7qER+(p$ZiWv+9sdRM5`+Q&6E(gOth@og3+
ze<RzRy|>>3>l3Z$*>RC*TX3Y{U#JU(=(vc%=sFrn#t$0r*ZSy1wEh!uV(|S-cDdaC
zBdzstOhq4rWw)nE@HqszYx?#{uad+XxsXYmX-iZzOFr~J8<W!Yu-d<Y>TnN98Ll*n
zwyryFNm%W`4y;IK?r72x?mk>}rl9@g51mrMvcxsr<u*_+*n>ntA>#LzQa{3VA&2?U
z5!;gzxV2DQ`?I=@;_ZtELGTNq|G*KHnX_hvckX&6|L^^C=RTeR$Vj95)2d3O3PNNO
z7K2iIwB1-QN(?H4h#iz8M-<wb+SHEw{!M}3^lG^!Y#nZQ6M;Ax#kkD1fsIv%Qjp{v
zbPD?`d!_X?6$0=<G~Qmjn&Ks*J#B$P-^!{%vcA94-ZZ@1_Erk^3rEtaiTIxA64{Rh
zS@L29QgFRbti(T9AF(+{*pF{afFfS-EWY`I3KmJOMn)sDkPGv!Q%9U307(~1B#h^z
zKE_xc?)vZ7e|B^=2vqWC18+m!8IHuKH-Zqt_NAs3I-72LyZG0Pd)FjhZ;f)0CO$`2
z{?VDAUDXd8?`pJPie^v$x|tS=2_pCn5KfUOSADQgv+(dd=+;{a@m?xN3iAz?<b)!!
z-N;&Y+WoX|PFL`AmS9(CpYUydJH>uq>GpTRwpJ}&wr<93Hb@EoOMa;T<M%7HC5o#(
zz*W-{m!XF2HVLtpF}J<Wb=K{{&T5SQZo1E5d)>{#x9r%q#6=ih0bWm<ZjZjQQ}4rW
zy9*<(n8O%cO<tYMG;e5+`IsJ;>vZG$zMSGxP4PI2K>ho|#bP5z%oR^9qEgA4oIe!z
zTeYP{f(||wXS{ArqL;9bYU<vhlw58{yUsfY#6M_<h}%6WC_ISxy17I*%AZTi%?l7|
z#gHhOL^oDnn;Z{DBN%#MBZq1g9evFBc}As({LdxrcAFLO1zJvxme7=Bu@*KoQwt=f
zyLp~3$M`&^*m$`t_54CDIQPPRagBibowo6EGB$fc+0Wm|6ix}>lPPgS-UF^urbbZ&
zfbUOJt^TgKP!8Rpz|d5BJ*6@@i3P08{nbTK$k3nb;E{A$D;YSzcPaY!#HCVsj_Z?6
z+XQ1+;?kyN_Fjh7n>yA!fmkKX1tNiX1dctJ&l2SEn&f=#4e*o+kcuDXV!tO&zMEbM
zLS;y=0suWL>Y^9K5F*Nb!9L{6%AYO81bhcJ2=DlO9rN<YHLI2-us$!t3_&8&5SP!&
z1;vHTuV271h}6L<_jm`awXLkAds>buHmvxEeLeS=?2ako^BQ^*F?es@GECz)mZKLc
zH9?q@7x`L6rZ`c<@afUbcD*Q;E+k~p<?hW~c#6GL-^B=DLE-b4^h<aQiv?3BLIp{3
zK%9LT-=hO5M@jKO*<)no#WI+UKxP!nc+uJ$EHdD;9Ns+q+q9^{c;piz-)Gi*>*HIy
z(zs<JgRf*lH7sF7oxA7zY%^!2=cE;Ly=u>1BBQU=bpFH5I7sk_*ihlxkN`-JP_S1;
zW=vWBu0h^vM}kU6L_)(_*`56*g29q_tu83jBVZw2%x1j;F@c#5Ca9>a!j{KkBr3;E
z1R;`a$nYod1ZXP7#~V8UNwo%VUF9$J#tm6t5T4E}sRFc?K$u2Ci?HGGpMi#}QV4E@
z>kX+8HQO-;O*@`x-!^Z<wUKTs1UU7wSkFyx005MTK;9F~l6mi=wy??xir6W4(8Bg*
zO+^oA9D|a>oQ9qP@Mo4)KlE~by|I}f0TPPoKpJ3)oBDEdAp&0h5IB#1=<evcH%{j{
z=}+LJ9O{8}w8n0HS_?ZA*X&QA2zRwqJQ0TIRbPM+Aw(6&bDHCg(Ke6JGv8e8e8!{z
zhRl}q(ZhOw6e0PveMmD`j#L55`t}Tx>y)du!^4MM7nD4%+I}8!Bs|uvDb$NTBki<Z
z2wk%Ac5V_ZO}Rf0eA=$aMzASAYC^bPZ%U3-+H8B(>KL_;SG3eufkfX$`q3mOx0Ku1
zxGzP0`{F3Wq&OIE;6Qjrb1|T+WMhRH;Z4X9n+W1s8@^6L+HnYck+aEWo}F8uUn(hd
zLEL<C9N;CKB`!tf>-7FLe6Tw@4^hdb-6QB<SCSEyk;p4$Z`67RK_QsCnD2atEkYo7
zErb|xz5KX`Wp6+Q19&*C!jP9TD$jS6AVqW7v~2Q|;u6fS`It=yI7r^Zl1V~gSEnWW
z%s@M&?xt>2n~ESCf%r)lRu>r=Y~UprP^m2aG%*2e&-$U3l$QhtguZ@b-zdz(a1h~)
ztTL?vZ|nDZ!{j2uE0`J-GwEkwr|#`VE+BK{bC>G(3F}cYe4eI%NMh3D;8d=>zlb%;
z(g`|Avtkph{XRL)2+1IZa`O?vTC~TuKa-caBqCsnFh1YpW@s+7pgujBQ$wNFLDVv;
z+{R4x)-fZaJ?2!my*)+c3`1kR&VtG=B7<@K^{XF!LqUwpS!@EHT50If5@&wdu|`1X
zFZPGe5Cp^X)|a8-mG~J{3xRXF8imH%_mSXDHk^#W(MOWBw?8s+8GP{IxpsFX@A=yY
z@ovhOhO7M;2$2Al=m!QVqIak21793eGCC$lfn&GQKQh#j^U2J4z^wY2VzEQ(@}Ybj
z<E6#y35Z^WVI{peT;F}?V|~ORam$xx=T|ot0N|}7y70Wr(Xg=z6Gk|}&E!2{K4;1E
zMZ+~*A>q+)B1KCFQc)3K!YH%vl=bGPe&sNTZ}%PLefkRGoYbA&Iz&9k7EK#yo73gv
zpS%1g*cYw_*{Fwk=Pp`lUCRA^-`ecaGv$`2!1K>|g(5OK^m|KzQ~VO;tK+LQ4Kj$!
z|GD}_G4osVO#%pw-%I4r{*V*~1f>NVsvYTQSEtL)I^w6!kXgs;0IkT$$l1t!Ys>XF
z6dFoOIx!F8blIL}w{#=M@213>L@U2<7N9Ri-{U2TTxhDZJxSeRe}_5<JT=7f@Nr6;
z?k1QP($`w;!00>zBe&&eb{?V7n22M#bXh65$Af(M3n#WHVwUYM@Jr{iG+T-QfawX`
zltH7|^!0KmwJeVv2~@P5A|bDbv4R-@n>_mSwxoB*6m@%~X-(7}3-9h(FEo0Q6p;}2
zBZ8J^)=i7MEOezUny<~(kS(@=KA+V{5B#<sz9l8r2cD0$t@{*`lOEzi$7DvTnYw@w
z8DH4x>(}SEwFq03U7WZgn6r&m9$UQX=c^ReM>zI=rj4l)Ow#X3x{41=Q!+};Z~C2|
zEgF|Lmo!1L%R1>p<me@v0#0OPGP5Rs3O=P=)Z*Tz%_rWC-xGnnH-y*GQfm;06^?a*
zEK|nm7lCclrOP4noD*R-AzJ2a%bZy|YKh0aF~s_6X7G2tT*E$3%t#GnPqU#7-8BNh
z$}k@1wffic0VYF&FoRs)t3QNd73$rg%i)Dk#kgU>+Z(QR=PA(k+%>u&-{dp1r_FDm
zF?P3UNiKA0vVw13oRMy!kv3*`k83-)9EkCzfi>Xn6=?$3+mSnQuwTSNB`*0hr(Gp-
zp4BR1!;YX?B!eCe6iqWr@U9Yv%+FCDV!quTA63|wKXqn}s1}s+-yXdBnRMWTaV>L;
z+01e|lXtTWeMvJ9+uc(d-dFi@SqGTDBX}|88nxdX>(tZCzDr<yjA-}U3736maDdG>
zR3hvkjoT#s8u_Ttn5vd__faCRyl~W>y9Kb)S{dCfQj0L%@CdiORqC;!mU+<Dcl_&)
zEq5XI=(VwC<|JAQgKo}7TGbDSw7>LBh}r0IUiD(_2C!MGf8L1H-Mw^<i@5P%5LJ0#
zs3ub}&k2WFVcOtrka_&uKgliL3}rid>2gW*w}7Avm4wKXZzeOR;aYnaVvy=HCwguf
zeYRs?0(oLUzJ#4u3EAFqfBBA<5mV8u1bMJzDP&1OZ9L(owiMK(0LR@KR2E#RU~?v$
zC^o>8<alwZAr|<1n7sBC=OjgjiQs-HeEdLwg*7}*+6i(1To{5^Zlmc19tGLq?mzRA
z=nF@hxD(i8ZlTC_`GB6fy@s|om}~^5H19MuR4hI(xn<Bse+M>W8__p&?QBT<$zh`4
z$%Xr7>tq$rt$!y_VtJWRiI!ZP|KxAC8zB4!@S1)Vkh@a9+T>4`@Ak1SU=%3tTZ0tN
zpQAC$8p|UXO@fGU_oNme7}CzY*}sN`Zy4%S2#nr1JmJRxh^u_KeAKTUl2JCyDjz*I
zAK@Xri(qt0myASxRZcTrY}q;BkS-{038w&7M#<<nw$5!;sKYg?trbTy<Fu_3cjBq)
zW29}me$AeI%)9fKrrIjF5-s;b8fs0xG5L_IC4JIx{0F)C`5M+IWFwvLe6Rw6Eg1Qd
zlJyCQ7yoNC5PdD}nTO$7Ck{fG#u$%)&IHSy-qi&GDOKn59A_UQD>R@W%S|7&CJOhQ
zL=8YM-rbS(K?E+uyTPu+2fx<TgOKe-AOU%LG0jZv=eH%DnS~PBVHDC4vc0C50PfUi
zwuMRi$?Jia$R;0T<`07Yae0f)n8X0Uv*<Jzbi4>BLDSY?IUCosJcVI5Bjp3y8rmfl
z33r{PB3JY{J3g=trovwnR(ctC({<iMZmFdkNE;UlA)_$W8_<0Z_JI}G{apT#f&^3A
zQeP0|v%-Lw(4>!fTV_U&g(x}qKcC&WN#P-K^M08%;~NsInOA(%6LjUMX>U8AlfyOs
zc~*Ke$=~xTsdM4H$a?WnR*vnnfCPX{R<=(;ZxB`jn8okd|Io&^O10)sft+d>#m>f6
z5?_wT+ypFpL7X&8d&YiG+yKF*;Wek|-BSdH48NvOOiw-)<vYqk0LWO4?3Rg5Y(GZH
z*>`zyX2T~N+Ewdax(!^-eJnb4!Ci95u2;fUWZL|ba}$5iup;|Zubg0UATrKX!z0hu
zy8&iEwk=3!zHG6GUDz!66U91kGzZp=w9`A*HBD|XR;o{y5rh-g=XBg8xh1~Ll_;1%
z_Nd$wKdQ0t)~<bdy?4nK<O7vSaKz~Wf@&&texG^U8Vx+c3FEa}jJlT!&p@yWJ+QS`
z>6;!iQx>qTJ0C0O0$tybG?ZdWW^UFODqA#{RqYyL^Gih5?sh|cD;X(Gk2BV6<)}jN
zQv*()HZ`el2X{C?S!qTZ)bG`$C+ElNa8RX30tQBUXMku<%;)_ZFLtU<7#%8d-GlNS
zzm#e1r=TQdPLIG^5?argg<ZWgxkjzSLxT>hec?H9h{+?#$ERSRhhCcHoUQpln-G`M
zdWL7gY6Rkufy4R^0-^SE3-lbTy2X484UIAO*M@wbJva#!83%kTtMb6JJHl!D9-g;q
z)Qcn4i);};O_dM%CPgd4oKU+;^C6fjfwV0EcsUoHwC)^}0dwsokDNyRwxU;D!3PBG
z+^Zo1N!|#f7l)8*MAr$c_NR&@*p_$&cQUmiez&RR>vcvVca>*;atQhkKvNX`HPQT7
zi?XGPeoE$)7U!ZyKR~#DY-WoY<t9mGc1<WuzX6Rsus<`m4;4w<lX&=zZ&C%xfK{@B
zeJk!dagd*6+Klt!Aitrs12;FUoKKVY=u3~J_-O4hnvB;qn>x{VQYWi(GW1<Il{9xY
zE)Ic(jmnvu8l5L>a?v-d!wHCgywMED(GOQE{6v(ZoKo|4EMz~{{N!>7KbA(_16kp(
zsBI@dN~QUI2@e#9YLvbt&Cc-sOvn_$>&;U9!BiNXXAAaowg;;L_<!srZ%-|@Shh%O
z2j(920aBXP!N}K8(-8*n!Y4O;Ua3Rpd&FZpzf4<$DTPYX@u(v5ni)_p2>p1*zVFBr
zl1G*}l<2gfADb{vFXkI~H2f&7YHLp-0+B~Yc*y$o{-|W;HI67j=3V3(_AsB6Dc%U(
zFe4qDKzsDGfvDXL-F(fs;fP$dmOW_GnXBQvh>C=HKP%53*^IMupZJmCNp!Ix5?JUS
z%jKE(yA4f=e@YgKx8B)xkvXI9DrIYd)@9Akl<tI0dyY}1LQvMC&Qjrxz!$~Mo9NM=
zy^qv3)XfmzdAqAxgaD}-mBVr`1yi^V<MqPaWmCeB`OS9(N2+-yxg%>h7G7jmgvwvR
zrCU9RkoriU1I~1VRM&mVDS0VEQ$pr6gHZe^`{{69kJI<HPfkhhtR%LjQZc@eHkte&
zMOVY$<mgElT{W|Z3dbKtG=N&cX@mfw=xY3j5Kg!qEWvCN@Js=3L2I6-y*(-OtDfl?
ztprgbB2m)MQqEmm%Ea<uamWO>Cj!oVcn)ueQPwsa6O*BS)JS=&3?BgyEv2TGaC4gX
zp7Z+>+BZ^|7cQ&9qwhaal4)J=W@%kQ=Et7|rI+C5kARQ1IDxJeHqehS?7tLdIlRrK
zk?E$l<NyarPL+;?=wU?O`Ybl<&5Uj5j;|S1B+!qB>h=m-9d;kI<3+L(bjz%(6c}x3
z{89c6uNw=`actQmbW~V|9mJpirR3&cnrO!YwsEbQjeks3)iA2@PCK_l{UphwlbGIx
zgCk1h?9x{Y^bb<uV-mP`a`)b?Z*%C-<=<GSzPu+9*)1&3oyhk*Uww;vUp2Tm8Z)17
zPR7Nr!>LY_Vtlypmd2v1Pb9I3C3KA1casX>Kt32sWMTxnX+MLL?z+u>a&p;oKYEvs
z^K*%?m7?C(OldS)m>n2^aBKW~f6SD+m(fXUn(yXhv2A}h(2I_U{WZj>7i3uW&%oC$
zPmtZ@oB=b!|Ba{=b*j9a=}TgS`Wpc|1;-Vib<8Ogq#`2{`%QAuFg8L*o_tk7KE$54
zent)zfpZ+`QrZfflcBNZhZ<w;<eg$c4Q~f^^Tcs@?G=eU^Rkc6r3_m*W_wyRhXhA7
z36)$6i)y>FrK2j?yA90t0vZwW{tb_|=tT%G%`0$+vbouqqjbE<YH)NXEE$4i(2tUM
zYM{a02??v?r)0I-UmQ`kk+U4gCy%_Mn)BAiZ;vGvKFQ`BD0qP0s#?LQ^11#~sXKs3
z2KG}v3D|PBCb#-GRF~l2tljVbM)3X{uKRy>nEfd3+ckY_aETrI-)KlEy9Jf?TZh69
z)EqFWJOo<HUcmQEc)<3#*{X*7ZboTZAqZEXt@&IZ72v=cu$m#*uSYojaA3-9!RvT0
zEu~>N9~#*~YEv!9SpbFd?)LnWa`IVzQtQb#VMM6NHj{Ck;UmIC`Zum=f~AISJvrUQ
z%re6VtGVU@S~?pr01zKFqjit8%Mq#PG<>Aol@@@JeF+-A-RfDZqh%+hsB0GUWCE(d
z#Sm?iIzj^ylx9*o%v&E6oJCzlz&RRQtI3aW2YYf=DbG=j#lLmBJ5q9N56Xoxioc&3
zB#v@kbX%1~+gJ=<s>SCzxsS+*eLpPO^wO6s^79&6B&@fJD@1)ey3EGBcX1Z$ICAYs
z+ZBKKL?BOOB@7F2UVQuyA@xA4=JkE)c`|(ZCGvTlao_zcl|+$?W8eH59*}kWQO5M?
zEA2X&U0)Jzg2S**wLvGf9(>J3ZUDXQeBG(zXC4Rd$S053F9$n;)h>GWdIDsZg6lVJ
zqzPiIM?zMHXm9J8Sq`T5^Mc*&S=OrtSAxI#y}!sI0|sT#VlCZx{02XCoC)l>u{M&Y
zaal}-L-a>Bq8Z8CvJnQpUtbP9)RT?%bTaWrDw)d>T*6a;GbgDfZFN*8jS}iGbV1x*
z$}8^IWhwb@T7nkY{~;;zmS>YD;0o3COWT1_m+cAEGCe)hsdz2c8I`k%DBUZR61O-$
zlNDoCp*mwG1I^=rh>~hDzHoY~GIhi+vhA`kV=Gv4VLAiISagvly5H8myQ%f-Y#|Kc
z;Fzg}6=Sk*I|%WUh@P*A-Gk&fTlJtnet`Gl7mTGwmkxSn-2QgC$=A%?;9s*gbQ|q@
z-Uc_6>k_EY@KbeuZceRcRXQz=q1i4UId6FwKB2MIByV;si1x4|m5MrY4?_r$<9zu9
z>iLfHlbi#c7aYf8vs$BFrR4e0fxAzO$-OY|eQjsJt<-#IQYbcp>?RX$p1z_#XI;Wh
zu(+z}#~@-SQD5gVpC5-ZFCC9vu$;6@-WPt`*1KiK*2tV))8%GkGvo|O0Ri}8h9Ppi
zJo4%HOR%})?H_&CyGMM@Ebr%+VLskUPmhWy=}}A!tSpT|s4sp-GRCu)8X}I+uoPU;
zk9xRZ+LMkFYR;$%6+~S1aQpP)T=5$68iAZ5?RJ{FvH=cq2jAMx;~_(-0<D>q7GXCu
zH8V0GC@LOab>tEi0@Rrz@UvHqdGhg^@g@G@(-GQzk8PJ-?BciI7d*P)FjaJwa~M&B
z$iYI`@QNl!uq8yCjTDT;r{DDmfUJq(^l?f6M!5yCjD*Tk%~A~U*&#nFQd+~ulZ-FU
z_>gtIF0;;OTM@d$geh&uEGrOUDf<Lt&9MiY0v$)*CsWTI=|6?DUY=AnCoT)&+?yFm
z{n;U4dBB&LG30jtsYbX!xuS<4fg@Y%b6IyCm0#V9;ZT`7sC~D+=N2lc;l~oKrU8~w
zmtq!w6^a6#pBnM0Mh*bEF3E3gROFYk<-o5uAG*#Ui7;2a1s)<H9HAU%E}(vpZ}nRo
zL2iN5ZuYAxpMjetc`#W|(0(R&_M(m5I~>VLO=sUMt8YhDUTIdcuFS=3$NN!ar3Y16
zamgIjq*1wF;L0`UbBgX9AZXDgYT^}TLMbe+VZuP4Z-6@1{OvI%LxPqrQNZ1c2~son
z89jScR@;TrS#qYT>mp)ug)g;}idL6Yw;KQbVyjq5zAnT~Zs~2)uz{B*O8zUXWhb0V
zq~;_A?#n$tC1UcjObf}UP-%TMd9EH;r}eEtiK6G3jw!t-To{1WnQuoHPnX|-@2phL
zgay5HYx}8ic(I61goV%yPMZF<(5c|_t~Mac-Q~%<y3MK+yaA>qLJq%8T{${6^}1#M
zSXDqSIwYN_xhbn6<B=|IAQq`JL#w9TPX}o(=1vC)3NcC>(fX;TX5%GX7K{|(G7j&~
zU_Vrw{T+<xWcXjR+&-=Y7H0Bp%Gd8Hyu{$8EW^~!?5!JCH^Cd4#BCthkbVzqQIMAY
z5fMQEuC*uH5s4ELv$j4eS1Sb<ECiG!>_4Y~LjcGq427^-stYJU0$nMsCFUv}GPWiZ
ze3ay*ufKp%Zrz5b9kPq$m4{Yf<F;W#t3SWuWa*qhM`cR+5~TYOUj~i<24Ei!u>P~U
z4FH12>_+;EchDiFABmLmt<h1cH~;0m`nT&9Y#_FDh+T}dA_SP-`=Ua?_uN~Jh4P62
z0I(2rIbQ7}Fj|3T@^!h|+l=HR%5``Dwf89+56p)&yxE;*m@-zZ6}ZE%=H(A&oDK-Q
zG85<QQ!d&e!U?mvzmITcNHeOIOz`wu)F@PwlVql+kLLB38?sMvr+|wE&n3^+r>9Vh
zl`)GOlm<^!H!9uSv^Nyhp0(3D#$T;%#8OdDin9!!e+CFixI+Om&gOzi7x|lFQ>oUx
z)X8O^&}D3eN?d<c_v)YJQ@|ooBz}HEW*&g9XL3ja#jwlsc$4#EFCFvwTLs=G&5XaZ
z^`wekP4%*U97>ZpNWVT+p9i`nS2|8wjI>@v9JRZAsVsHeKCFIn+q3BIJ|bpuY#Tbb
z9c|XDKnWpxd>YdDRnTlIC2v=5mp1|Jaa{ZjjbaR^t7>#*IqSc&0JIgT>%<yJ!Lb`{
zxy3)tw|}xMW`&J>BlYihC(b@VRf%o;kk0gkMIdt~Fidx%sh!b0FxysQ%~gOXt}{b1
zWIqy>wkDCDi?{E(?~htC7r0*+U_)v<$3A&6=$mBE(%p!!gGKnKvr~%6R{>c#iG;}Q
zB_Q7=wcB;1Nxdv_J3mKI<$a<1m>mA9)Ml*_#W07^<JtVn?}=WJiu30z%-i_`;C|No
zs^w`by19^p1gNO+E!6HP>~3OW;B~;3Gc~}9l$%z|ZyRM_{xI3u*jN2TgI=B@rn@Z8
zkAExmGjv~M<IHS%7Td}B){cHlJDvW9Q%m<%e(o~qHzBK;WtN3df7^?7L`|>5u8?tC
zs|V_L+yoYXIW+wUW>35lQs9EXid(DoWn@-u%Y-t(*rRzhNI~u<*8wepPX4ARHRreQ
zTk}R;bRr%a|9KB>d{H*fnbbv(d$IZKN@=X(Q_k>{!v?SRz~;U5XX@ke>LpmQ_mkuv
z(`Tt?4bxRg=qJmD0j38bHPR;c`o6idufIg!I)1C~;IlQi{_(r(-f}9MW!JAID>#4X
z!h~YlKTY=gP6rD}X!?B{Fkh}WviwP)6~~BcNKC*#m~|Tr`&TD;gkogeat3eh<xXJ3
zI{|tpS6gP4XPKEf>wqR@N0ks^Qi}`4A#e`sm;_pbwAH=ErgPStHQyBNL(Cdeve~ha
zk((IoqOlj)-GZ2oet|gmhv+p=Uker~s@Mt>CpNOVfs54nlzf#NS9T3PNV41U)v2#L
z<Fc|asx4uWLX-)h%%L^hH;&ql7!f4%v&HJFG2#5Uo{bs?e41fYMFM$$dc9EvObEam
z3ykA^D(768+QpqZz*!%;Rzb_Z#Nz;k<TVt*59Hv3oMEA*CnFk+H~MtOM@x@yg|C;U
zLrZsb0tiz8tSonz5*YL(Gwc>ejI}e2Zb?m_T`DorZK<Oxr<aJ#2}cip@`>h*MEGGE
z+Qrb|S@pt68zFblRL^Nzal6UvX)#fyU1QCqMlh8JtmbAD(KpI{IaRm<PnVk&&W;Jg
z>d{#v+zW~Rd7KDeX>NW@iai^tCg%v#eS=tcX?m@uFmxPTm(*3h(r{-OIZgYO$Vg-S
zq1X4u+uPXccX>okYO_vpJGFhS8qe2AXUK!giAR`^)JCq+mVTYM`A6LFWKZ;G2}AeJ
zf~7=o1i5m|bfn}a%ubA{fGjOlItVga`t4#cwpiq<Qof$NZUq{URPStVjtn^VKmh#4
zw&O(2@FQVPE4Y_ZM36Md*!Xli4mz8C1>>_X<|j6&f1cD7fiMQfM|`Bmk!5J5kbC7~
zl#1!u<F>!5D>;yX)8UefqdbcZ1D=ypDqz?>%?g^1q0)!RBJ69gDY56+E6{umhLqRi
zJb%+Bz@;*t^KroR`^EzK+`{l3+6M5r-xk=(t(%)zbDPY`qRR8OY&*kOpq$TrWZ+|O
znxvThL!efd>FIeW-rtc(GMdnd?Z&#J&-Iih?iT3r5slenx!(43-v~|S*K4bE%dfNL
zx#9PHjUD!NyW|ZhKi>%KJx%W8r<4Z6*BJGvJ-YXfI_^<$5?74-5OwEQd`_4UczmkG
zlQ0%MdLbpU<&%4n3{y!lie-m%(B?jyA*x16dNAR?b%G2i<o|4EoxGx2zMU=H4;Eu*
z7KVhsK=_sfd>n%M+k3=z{}c-FM*!_?>D%?VV@zP>fNy&lBp@iSs7$%QEN{r_Fd{$A
zK$phi*cLz^JM&Ymyz8Tas+Z-(LKx(FvxRIy|4Wk6mma5CAsiG#uc|plcpmSeyqa2d
zd;uoT&tywwO4L`;Ft{3>DGKw$K_k<QrH99?w18fw89MT&DD~sOFX{=dPW>8%J8bRF
zmGoHGh=`x)p2mAkobd@VSUrDfbgp)9_RJ*+Ko#dwVPjcdm$e_$VFlF|c|AbopF+XU
z;=P6Z*A)!?-DNUxe(T9ruQbZ94E&f40RTuyR9}S@<x~42QrV*Evh@gc&@e<w%^jH+
z4LyiHrO$w1G7@s;!(;MGhugrHMXXH9Gps=f1^7~dw}_05Y+lGDE@OfR!n2)AzEQUc
zwm4RYss0EO>#P&&UeXAA1@$Q2LAI9|pN+l_VWEMa9EAg|hm>z*S0UYdWYVT_6D>qH
z(y;&9r~><VpEsk}vu3uqTCXyHwCS?|;M@GRlolv7K6W^WV+h7llqoD+yF!39$xA(f
z<7oUK2~XV_3n^IHcv?)gCsM)&MZjgE5h=w5JfJJ_o!1{LLRng8xqIAgkr^r^hoXJM
zSPrrj@Vm`;wHKj;slI!mNirig@E1^JG(~-1e`*tPFOUbnjjrs^*cdh07@y$DGO^)n
z=HKN*u5Bj>Zqy<rN((LF!QT!s=aZR5f8*NM>LyH5ab~z$DnWs6_iaN)2P-ar2Wmh8
zIgi;=1y+Dw=};oW1j#&A8~9#3A6L`cl7n3>eb|&uw|g27Mj$<JAXAIbO8?jUCgFq|
zex0Aq_uFGBot7<1YZKTNEiaZaYGJdU0pYNiaL0RH4@GOYj<Oqx;u7|Sna)G+P5Isa
ze$jK&3o;yUPiLi_nmg11m&rk?q6ax1;08aZ_h7~FE^SjiPBjWBxOr|-5}+G&2PtOQ
zD!~HCw2F`8WdqpSkTiIEVr+J=!_u?TSmz#_B|iTB<@()1cMd{0&eMnvW*Y9jCH>Qp
z`5ASTF~5-48%3L`uPvSH15KtRpX%T5wCDp<6-!4mTWsLFNN)g%L?&|%2L3os=X;#p
z$_C@b8?TYcT8VXytP<yg1=Nqk#$<i2XuHSx3+*OxsxcJ6k8323Cr1x9_*+DlI=01M
zw%0Rtii^C*>ypb!AwpMvCG4gr@R6kfQWSzjx6>Cu<Nb>6q9Sn;8I`V3l0@jWI+}4K
zgTrED+NPc=#0vq0olBz)FBe*xcI`jE-ZhQ;c51sY;w02JmZ;v`Y)<IAVCMESQcF`X
z6Ow)dOY6fkOQ&YNy6>dhp#ec^$rVy`j|y(-@&UvSH;rP(beK{ZkrnSEaDZMl#fhTc
z@NOSA`NoS;&bDqnqm!vzei@ej9Xrt-Vk+>ENi~<&vq!UXGpm5`h>po<y?44Md&9dw
zaP9Uj$G)tdc1&W7dhz+GbIXj{94zCAcn{e)I+jIkDvA^n2=nkfoYf0$ZH^Njun0nf
zRj`w+)Db1s@*v}?PeDgNIru=LHs7~|!8?&vuY96MXS!@G*(qJTWyWg{TnQ=bNsqOg
z(!AURH%)s|A=Fav9Z|&=or=<<HkV6fcSgQLgNr3LqhoJ0tY>D@zYb^HQJ};Tj`TsC
zCCCvXT5Qh!)ah-AMG2cl+wNB<ai7~)fwOrcXF>qsEOh!zNI15`W4j`eF`4+Zck@AJ
zm-C-*?|b0{;94-JXrE_5qZHbZXZHspJwgG0LOq9&3%wx{0W4{{h<1-xPp`?_<(}i!
zJ4OI>tlC$ozAcQ&r~NDkZVseA^J^zEZhmETljdCDpYbD|#05hK{+oIiAQ@}TT6=Z#
z;ZCJXqQk1XtJLdDX1>JtW~kL4IXP46u5}G>PxL7ou`O{{$eqFT5LpAX*bp)j5X=0K
z0H&R-aYR-TEvlZrNBv+C6eNC)U#2I`GKqW|7GKEX%QbYYE8Zahl-R}NSlr?oh(s8Y
z#Q;FG$e%Xu-+Oz-n;iaNIOu3?g-RHae5EJhi;Tm>dAnIdPNDUpniWWnxX|-xT}a4j
zVVa&WmFUiU3W^Ln495FZpiyYt?uP)*miy0Z1*lT(j0&Gi&`t|d)4~c`Y!7TuXB-*Y
zePfPFi5Ra1vC($hFx$hvo(hsJigC!h=*;rH@uw2hc5y$u9BUAcS>8(XuOHH?rzS;9
zG6F}mV;eb_47EXI789*(`CmB7{M(mSBRje_a8<r;6nnl0^PSuo>Rcpl`c_3xrlLm?
zdz`LrC@dA&op$IDln?UXt-4-nc8gv{jyARPWJ)kK+kx;94Te1!xsN(LFKBZoQB8>}
z=}nuCEt6fGu8Y?<SR}BL&{4qhO~h3Ik&bSRF|o|nO2fbUL+XA#f;-A>?Wc|pDJe-N
zbi7d!FRC;>oq@T(u87wkGzhnY3$j@28%lC)7I5JeMG$I=Yx?P@Ml{?s0s@?{!P@bg
zq(YpiCQjzh+1VF<(_r<hOxWv_c@-r@B9YT6+%`>O-uPUm<zlZbv(4O?_jec{EG!X%
z0mtk=-zyx-J`sP<06)dZFaQ8JK>{v+N~l4NA<WdVR$I8KP};#Wn2?rguS<yG1s}<%
z;U|a9t2mK^lbK_lt?0@7kB_RzaTprf(K-*B9mReP{0xRZ#Tkv)#+jate0dt6=D1T|
zm_nRuBJG^&ZYvZ<hmOzPpAr10ky);=80tTh)z5!-E@S_9Lo<}W6=~pBW&ghp$8U0t
z5CpSFL`6k`IX)boSnyX9wDk0qWn~Xzvb)UQ5Wz1jF0QVdo!)b6DrBQf5o2a|CrcNW
zHvfGVj{heg`{DoLq<7;M)hIFYtN#AYKz@vH@nY4$5?CH&o?62$@DwO2B2)eW{KRXU
z)TfD)-yZ(jv80P1;1(%X<#Rji{lXm3P4_o_vov^cU06^M(2%gX*FuEQQ}vRGgt%+O
z0AT!m`Ds)Ck_*FS+{>sM>mb$D#`EaeqwZ^SKx=~Iud-wc_$$7|i#Rocb2iJtxcI_1
z{MEoeRi^QqKAi6uGQ(%KGZTMfGk!hA+=fmUL5_nhnr~AJ5vJ>5H|hI?)6a_;J>a-a
zLj5yFw<`P$FRRbf!f{HEBOIZX+|@7Fd7^iw<eJkvQmc}77oK}8@HIkvzX1ji3_Et~
zyNr6-*%1HiFnNUxy7IkADD?RL78Xt@8u~2(&VNYicV@;?3nJ43v;JIQP)Ey`yAx~$
zh?G~A%}(=Kmcg_>^FM^7qv>s15H|Ym>{l5lMJo<J1*LYzt!_-oZ2ilpdOvoQ(>M`W
zkwF6ll~`BRs$ccjHm`}!wUi2JE09`<>`NK8DsMDOrRUCMyM=epo$eLhut(p5r(hS`
z+=FUl?2&YOeLi|wi9HkWWF)hCMxiA%%gaJrkkq@ru|Rktr76|99FGbxpWTvoQ&mE`
zsbb_SVfZBBBlB`MKfU89-P~>t4MUmUmtzPq1{pn_n4;9O)C&-P;^49*Lr7$D%p%pa
z;n~{!bO!!ZjX(Wy*L~gvts}KCXQgjk6RdZlXR}0b=IH{z<yt;P68g5amuexiO;uXE
zl&ig+M`t#E|Aown%m(M2^&VP4lISyQ_?TnLH$zzVyfv#K(sN#=2DFbWin)rb7=LtL
zQlbVax>`%5?rh?Lx8=CDOS}9Y8wv`7$)IOa`Q*F$l69!x4td;up5L!Ugg`NVyO*84
zzXztf(`&^Y3AA3+aHqT1(>`Z`<gX(cDrf?mOc##C10Exj*QxbQ_I%KeE^;Pg){ppe
z;?@msjBRuK-~?S*8I>AcmNC>8zVs^|TppN@f5LfII%yFU6;FbjJZyX#KktD%53fcq
z@<DT5ec`kyz4j8#>U8{r9?Pw`QH{;kSzuNWfvdHsyDc=}tzhL`6*fP7A*d-O58jWO
zM+nQMF}SM+vjkK?PsqG+<TUL)y^8@89V3z1`|Av;b%t5|`27`YDBbh6N}CrKwrtOu
zj6!q1PMZeXA=%SAOg}I^?&>m}!ObQ-=8K<uj4#Ynwu|nCu_)G4+?Wi=%zWCFd82~I
z9S$N8g2^bYpQTz2ja?lWold!TycmVdhUyly){9qv$Rs(`U!e~g<?xw2p6QRxy!(Sm
zHF9NTWq*-gN}A*&U@KNSB#{;`i1KoB7RaU6(7?dCeu4cVcji_%3wm!TJwn(<s{Z`E
zNU9L;Byppzz@%t#C>&(0DFEB@%M2cQk~VcsOHvIJN!vn{E?RUr9hnu3^ANW2br$_z
zl&FU!f%yuN9ZNYDLar85JsX(x7_RrL>W<6RXNKCu$W8xCU!JkRskokLs0X-TQ;bQA
zo>h4n$mas#w^8nA;$(Pm1knsOTeO6BcDr!GmMi81kGcdh0I(fGdE_KcS~MXkMJLVB
z6>ALtKRH=xYoWEHKX)poy1Y>tJ=#DQxH8pR2K4~ZdJnhRLba${8AkvXeWbFT5AVq@
zd{mD=WIAgyHneZ+)a3%`)IW+>69i1uk8*HUWJB|1l&a1=CP!CdTv<=C4Susm;}AdP
zGY?d0m6n|V?ftyy69mV9%H9NQK7`~L8h^V9NZmvPcY(lgA#yo9YX?U`1Wix~?Dl;A
ztPY~-efL5T{!fE6$d^c3`&Q=%Wus!K?+bLOEX;2qC!xX2m)}9Avn8pvf{w)=zRF*I
z6QQDd={ScU%Iyi)&sas8rlJ<7-spfNuK`KP9{^s~_%#Lc;N^Qcos6uu3BbY63PX&F
zjw2oPN7`mwm9X-QaDnuC0V83IosI^|_nQRr@2ReoL5-1eAwjh6hCb(8$5*4KuInDa
z)|N^_6f;AR0x4A^m&Tu~238`gJ$+?WN;xK4TN;@&h$CR8x*n^UuP$d)B#tT!ZS|A(
zKFPgl22)1qS>x>}Ty(x`6R9jPA00R>bxeaxJa{wWK>FYkD<ysa%uY9YNCeLY?@|1L
z6TcoTM|vD_qVS2om_k36=l(dSKcL|wK)E&KJLplq-L-m>e}9}EvW`(JUd%2tlwxr#
z+;?_){toiWaWP&y`<Eg6I>jz%8}rM)Y$_*vV#$+i<UozjkA+n-mIbGBI3VkTMc;fn
z@9Cd?3Bue&3N^T@4QaGn*gVf%)@9rENo>zh7NXR`u%g1Nbq?VQ<MzUv;Y_?OL6oq8
zINFY(@En%{k8;n)M*shDiM>va+WG!Fv^x&fpXy^DL?XV_qQ--EXU~Wu8RD7N6a2RI
z<!si5x+`jj!xz2oug}b3zcq_Jdgs=A+xfdPbitUW!Uo67*YKjz(v1+1w{p9Ps28Dd
z$1>0U1C-P01dh%+->y@xTP~GC=zv=9XIUiF_U-)qyd6n_OeBQh={EP}1*ZFW)1~4E
z4-EbhPjSI2<jeMCl%L|O*6oP_HQm${T?N^Xh=Nl{#*bh2c4f7+z7e_~iT?~c-G1nT
zk|LUUj`=|!!ODtAXJ)j6W3~wUTKwY#)SBZ&nVXudvyE$Mj(uH;L%H^HGk=Pao?UeT
zBuEw-PHJdqjCgcU72JeMZ#EmfYm!ey@$f}iF?>?Z1rI6Di4%@Il-s4Q3nAaX+gMxw
zI#LKQ#prv!;rv{p42?*YO$@SmSI7Cj`I)GI|4k>#B-VjycP14)R1$m@CZnOFdm1~1
za=`;bI9&!!E|oOFYpURvZ5phIuV4FS=E=hTF{MSiVcNs7|38`6bV}eQ9ISH#rjBe1
zRfWs5Tg*X^Puzx!u-4g(R(Pb^PUE;U0Dxi8Q4IWA&`I#>p7+nn2?brsdy-ht^q}(i
zB?Lp!_@fl$_EoSbqv5Tr2xFwtW;1s!cda-8u%<`Y!e5;ZL^rh|v|%$tRCiQ%a^Ct}
z`y5LOre;2jRqnEOIz$K0VlXn!QBE^V(*B<J{;aBRsH|<cS(u;!(t0)Or%kdkq)UTs
zNrk&%05`)e3h0cxCiNx4yV=@?iWvwRj2_@>=y0d=y9wU<sdlk*Jxja9`Gae!t7c6@
zh)37;vHtvx?VD82=KRy_;L6}jN~&j)hkIU^@0k9PgZt5<z~17!8|hLCBzUlF<a0#R
zm9$$|*7y?rzF*TcekVPj@`}?MT{{^{@7Ly`?;e^KtGE4tUA}L6z`)kp+*vX9NzQrZ
z)tp!_m6Amtt-7I>Xc+OE=1hlTW3c#`wqxqgPpTgbbW?2vJ*Jn}vQN~eq?BC7xk*M3
zi_+7+w7*%k&=*#G({XQ#d`~!Gr<cZBX;FxE<v!cXYPP+y_TB92!biEC_55dfEZrsR
zU?dI9aM*`$+kk+1U4`tr9Zj~CG2aO`c+=Brw>y5Gl!_<yJ%iUSc%HOhtLBy>qJ{^M
zIU$HZMifs}0Po%sOQ?@qJ(>enJj6j2i42OrxkbJJVYcb=d`3S)tCXfr`b)xM3^+V-
z5|$%EK&gUg&t3VT<ySS<&6HiJ1yiLQ1<VJ&JRe^My+63P)Ec}+&R@+<V7uhVNQv9<
z4f)sjuSx!WQ%#k%f11JmA?<apL09~tHlh5@>-_PV+=|Ey|2fVH^`K6aE>-R&>_1{a
zmFZ<}A;>P9bEZbH-yIRM)=W3i%8eihuW;@VfCmeWDhv)$1p_b;D8P_OC?hgx0<h+!
zhKOTP6?-%|rWY>oOgnZjdeWP&B;>%R0|3;*WgtZ>WL!WTT1r%cZQf?*YlE1jr37C9
z!T=F;ZUFuOAT|0&`5>i;h5#i_iJh6PWvTtrFO{XJKykXXjI*)trf<XVx4f~y^x1H#
z7DI`@(q#02@-pCF9Vg3xPaGi#<h)gMP221q$?Ox$VpQjhWW<+WH$tE{hZkBm(BYX$
zy=VMdBp07FAHIC@cHtZCcn`cl3?ZBK+?tfa11N(ObXH1A`oAuG!pa&>o2j;Oao%b!
z537%12$4t8u$g-LWzqPqXCxiXM7Z5mqVW0wg83<`zRT-Qvd-EfYrKEJ-&RZ6H;PkF
z2iO&R;Djr?Bv$=RcfvVKm}l{?$(L5gPOVgCQ8X|J7&LEdGjTVaYNtQ~KVFz+cvgO%
z&96`NNj9qbIhj)yhlCY!fhZqRcCo&ueC4g)`awrOGqzQUcTBf1C2Z6sQ2a9R^)bwC
z&7bOU{6diJUjitX7D2#=rq5y;S&G<uWBGH~M`{iZj*lO|ij$9h0`Gu#BaS$OZ`rOz
z=0_Rw_%C>Om0c$Y!M)C%_#MSD7DDn@66hg7AP~%om{BJWvvuQgSUa3APYe$3pV0~h
zgH1*!CqFYWIf9z)U19!!$;V)*B|SYomlojGq+T0LXff#Uus;{B*xlRP+usMXwCmfT
z;=yR$2tqCgFwXGhueyr+W~}`e)uy2l_*Y$Z!+bY>e0-epa`3-D&#tbnuBmZwg;B1(
zxw!!&^^7b>!=t0I;h}pJ`Gv~Ch*wtDD{6X?6*%zC1UJ|Ici`v6L@Xx6NR#nlngdM1
zIP~=1f#=?PnQ@6&__UjJO{wr<s`lvG^iiQ}vA20MkL5`(M+_BQ#9-*J4@O@IT#+ul
zzigxi2BLWNbwPE1XsDI>R}ipGQv2Nk{wlEQwD=%O#k90lk%-6ZbYBXlf&LSzfYj9G
zfj=-|yk$jcs1HS(_sq;^4?lvm$?v#+{<u+ND&2VgM?BlT5YyW!C2iDY#t}~3duXO5
z{Z8c%x7;?Wv|D@X6-Th3y2{yOHQPP>MG+RQ<4yaODK+K+C!r~FLNc0&XYhz=<c&fy
zCTsTtm9I-BQ`ESrPRGlwp{*APmN5R~#T#s#;~hljXQ|WHqwU2QEQkK|mAQk2*O}<K
z(a!&odj^wN-vqiK6JQ9ksTp!N>M5=MOMOvgju;}#noA_FRv%h{1st9WC$|#T{R1%X
zb$;O$$<uKyizCWqd`#O221-OWuk`-EbR2R4<NvNqh<OI99)yjqZ*P((B#!68eXgWA
zUKvPh{S)VcXoAN311VK_7P>mpX&XPEe;PtT{dcLu)EDcCKd%dfe69}qCbt>KMe$Cr
z>KW^keHKRDOSnu^@=RFsFMPl}sxFtabddyStHY*3DAJcD-3mtji|uL4Y)&Ih?>*1_
z{nySxnd7zkCIdTjznlrGB&8c4t}m{Z-fjkuU4f~BuAO+y3sI13qr?LTr|f+8o)%zP
z`>_gItZQQ~OeYTJS1MytbmpQO$&?I5X7r|~eJ8h#X>OPO>&q}RMA3}BT!&v3FUf@7
z_a&mqK2{F(+tme}gqx1%%2<0LhoGB}uEUO6*=FmfLP%Sgs80<D0hnDIx9e*<4ipkQ
z`r2wuIfskXultya5i{Fj4^6Ld`}DcGK7agwjGQM0_@X%yM-6qw@^|iX`*$x{JhxID
zY|Hk~oCj10xE2^ZBJ~8}X)cG`-*e#lzFJ~;uCnzM{!_5vA8GgiGpJ7K&BPluwRQni
zpKy$qVyAzZpZ2x6=I7EDSPdvq@c<7z?l+45H|GqQU2ngOON%|`Mp_O!yKkr6>RS$4
zXS)a;)D3NV)rvR6Aj|KK?e;A78=SQW{l6JvW^qsyai(Zz1n{;V=^o}QEV0;Pw(;wc
z)6nm!VIT8{%mg@<R*g8hvg$p(W~EVLUvC{h=$75#7u~ZeljH;7H`fCl*}Svx!O->k
zohlW&SW<OP_A!Z*|EY#3mLYkMlg<V4>tt8Nj2yr<>T1+}o#f$Edy2y^S;#S)34A$)
zT;U?V8Gm~t8zHuDBC<7$LXU*`&*Fi!`GAJGt+T@6CO15eK#yZVkB-oki1zCH9030u
zX5%qSYcv%_Jsn+U&a{u)_ix1f(nIQb6oCKA0!-4HW$C2Xirjo`@7#ezf<-word}nW
zaLLp5^qehJ`Kz}GY^Bh5QzidzS=2Ds|B#RTL;&Fz!zX{~WFJz-8lR@GqNOUM+=+e6
zaT{qY9=GF!0+Iqb7(R`AEm7R8Goj=BpXmN~x#d1<vWyGsM3df$u`)pQ!ctQ`N_`Tm
z9V#@64d1L+Av!!L_oUt?L|n8$*|xuEw!F2qf}-i&0|-_PMXi*~JqM6{kL>s64F}E8
zhek7(aoxQd>$U};*%8i|wt~C3EeI73Y8{#F8jySDOUXAyHV!JtS%}>`D-{Y9p5mDq
zp<m~G1}bOKU%M*rKU(s}YRH$-ZmqeZX{Ab$WS;DAR3;aNe1iQw97aV;2oWw?yyy^<
znwq>NOn(rZApb_1kiq)jaxNGmuFmKb79QGKHQ|&xARZR;d+X%!F>CP-QK=r<xT#kn
zDUp->>Wzzn27W?C#{4t7T7Rl$51Qv+4X0=C!}tbuFE&e<`u&l**<A(kGB&%hV0|e8
zK@G?edeI>9MFQ4Y)+WEC-s8+S)sEi|^jJ-NBDDVVh%&$KO3dr*IlYLAn5}o{coy=5
z@=4|1vx<EOL3J0Qrr=K*e85c4J=u%{uduGU{GFQ5`R#Im*t~DGd*Uu?nX5ykUE}#>
zoaTaU!)p<2v63z73b{scMxvdc@i(DSzr8#pap7bm5^HZXp5$Efq@gU<gtKv|M)~xD
za<Q(Z=|?7Y0iF!O>$-`|&<<C7Ub@mhQ|}~)6_;NI{-xM(bAj&k<KA_SuJz31odYim
z6<*3;TS^0kPyl&+io_mX*9Fnw#uw#KnvNzR&!ZfE;JA6527Vj$K~$^pl4jwysayR7
ztn0DEe^g|Sc)|f}TFS+g7CX_H+B%)9y-5i)vmp-KGhjAyTK4tIB^K=b9=%S*E?*kq
z7+$HFHZYyd4Gx$NL@c<Oa{Qdf4)MR@6gAy{`qtcLjg(VGM8M7LWYog@snX~|4h}#@
zxRQY@5cwenJVc7Qrt#iLD@;NVx^W<N3e?`OES&g5&PfUygjvUex|!WJemF0kMTyg@
zJlb=TxI^;RHslLXP~S}*U0TU|MV5?dQusQ63dY<2$tDL7mhU)I7aQ0=9vc!K(D=vP
z9{Mje?#KCa^O@HzwT~yB{?yn9xcj~lqCN#uU0|khHtx2S4l03x{YGG%?7+$6P&)o2
z5dv6HecakFEwxDfLAT_D#Of+5;XV<G>A@S@qdY!7O}CE;-o}O0RIE{d#g@Rwhrt#i
z<qCdj-stqk#KY5Wq}kssEiF259R$BBq>P=bvMiX4E}{XcmBXAMfK(Hs&c#Je0tJll
z12;@N*xU1eYY)+ji;vf0e5>i&>e0Pu_@gKzKwo5n^Y?}HCigK}$EhG?3Gf+qcXw|t
zaEic3h%Me6HgaSQ;mX($V0<`@TL_#%Eu${GK*z*%1@B`yGBNo(fLHHv#~eoi6@_n!
zcEDN=@`}@oiVQhf*}v%Uvko;To}$~EKYtFFYI6$;3iQ7V1NfP&X51B8VAi|&=D-(}
zD=jNaM@wrxEKdi<<${UFV07_Sc?_ZVzPQf}48>%(*9r`ixASZ)o7WrQ8!Th#!NCET
z&U=5c`OcSFE8TtK%M<*|^R3At0}mklSXrp&&_9aZSdkK_EcwsROpZ&>R`qPl?P_c#
zXp;!_U~3>uDBV;6RcspET^9^Ur@>+e5eBn=;LKz|hi?J`GwFk>sy>71zr0|SiN3aq
z3b@^f$(Jub*S@N6IdSVV-fK;W-wzC$ID;u=<H_`aB^W$Wm{^GByQA?m)zrc4>0mVI
z%gf70vG43!05A#|+(_YdL9yiM=twDtKb_y(#T8EV6Bypi$>}kf#xh0x!!Ic%C5PAj
z7`#Tj_x<?S$A$iXw=s&!!?KLb?qZIa|1b95GOCTJU-+d?p-4+9rC6c37I$cI3+`Hq
zyF>8`uEiaSYw!R;+fuAZaED;Q0t5)bA$R)R_pbN6_kO(Vd^=f-wMb^qo|(P(%>4c5
zdM6$mEQSRf_X<gg$nRP<YjJ*wmjQi^f{BeJT9hT(3RiVczXaPLHohGJAu87czPv<o
z?#RdA$dD36Fh2NUjT$2$0!e0*201R{q~)wi;e0PLHRKD}E=%~<=ji*pf`v{+tnI@_
zKldAB>)e<=k7{tvev|9LfjS{ha`?g0r;8+GCe=INi_FZp{r<E7)QF*zShAVNis`P-
zt7XBx@#H+8Hp|a51DSD`g`EGixV@3XQY1$Yat;VKq3D)ehM#>Nssq#Cx&|!IjuiqG
zRrkkBv3@IXZzS(Z-oGDmTbN{C-+mf%T1$p{Fvgm=GUoebi7d@2bg;p;1d%F>M=bML
zQ{Q++al4uTSY6H*!Q_qWj=gNxi{49C8S7g4;Q%TVA);NCWx(;jc4p(8NX2(=Bp|)D
z{9do$0a^0jsE?3W6~nC0dL{g%QK;STz86aM%jv<`r;D)-)fw{zH4bV{PjI*fl{i)&
zYmRUkKIJ|<%#Xuk;JUWonl_kJozPDUMD<U_H>#>c3Efot4;$0H=$dYD!lh$c`}4>=
zhOlJuKIfg+PtX!WIj=rB>4&1ycbI;aAFp;MQixuIe2mde=O=(n;_sKoKkFfVpb6x*
z$k+Fg2c$RG1#m^J2&2}XkmY)z9;7i5cDyw2O(87b>fe5{Fcsv{dU(?t*K&74;4V(Y
zdfdJmRnXD6(B9=_LOA^8SaIqy!6Iv#qG!-&l`ejH9G<==ydLjV7{UO@DqeRu=v2`3
zRZ0Q>(eD%%AVgt}$S4j$@VH$l*VF0mcl<h%X3wI@{Y9S<3)Iw($;Fcw$JZ1Uyl(RH
zn4$kq_GtG%c}_+mHM6F01w9~&gY${D)T}ud>Sm3cv5~sKLFka|rpxCoQ`ol$*kC7v
zXF|?qTcLsJeGIw!e)jm7U2!^k-}m?>OS|5OE88zDaWbGni9nxAALq{MoXjQ7(~nuo
zFBqSVS_y2xWbDMf2lUyjt*V2h=;>@dSwFB|zJgBC429OMW_(Syz%Pw63+(tFHO3P1
zPWu<r_BmTTFTG8Yyl7MIr!iNlHB>lxyfJE8nVgHzU&Hn$jhvR`85A+=#Y<3FLxT=@
z=jL4<`SyQjxnd<W{a8}3dU{_aI0B=1pQleZ><~O-zMO1DD5J>2#Cr(O&?@1?_!`7y
zob7*uF9eUDjf$JYI#W|DA|1DSQ~wC4qW*gH(;5x6AD^FOkHk!V#y%8=E@^FB^gYJ+
zCuRJ<Q%4WQx~p8|ad7JQT}!3TG%TjYEWPWe?71N7Nk2c6Zd`@@EEthbIFv6%CEtzI
z7S4~m`<+8{!GV>6Jj>9hQDgk=c(}WwBv2qBnzl#nF4{k?xsp8csA~JJmV@pnSV#f~
zr`(>C(8(h3SvUdCXYTFiJfMUZBv13Oe;tl~cfg`~*Vkm+_kh$9*)b}c7z=;Z^tum-
z6nb||M$`%#&(1`bN+Qr+1pDJrLs#X}RZibu%K5PDLe-`xf%ZIIW}D@_1IGk1>E3}C
zF%8xW-b7<yCi;ZWgG|hcYuCGL&$7$1mp`j8u0E?98i!dQT$<P4OdD%VR??4(E;=9J
z@W0+6G_4ETFR|z}5(%$bJT5A$)&H%np{}k?yk$eC7dVo-Z!9$~)WOzAE1!6?;i#Va
zUN6l6OV!d?H;innvkqkU;JP497b0?C!j(9F-#q}p|NfViog)wWN^i+KRGF*2y1gPI
zxYe)Rb(GzPO&J-~@NmPlB{zCTwM>h@@ZsZ1^6?!&va-&F2NhPG36+;~^m9BMGWMVK
zKaB2)cHUUgG@5>|sl{8HhYDQ#6R9PbM@e~$xZcA(wt1cP#G`91c-(&hhopO2r$%FF
zDAvxB_2CmI4py4vwvpu~hwh)*eaRWhRl-swP4&4io|E=-<BAD>xTx<Vyi$YS6dMZC
zyR~DF!s+{1qGz~lNmtFN%>Qe8D<svl{=;AHdX#1<Jcu^C?@OKt5u^m?^SdhBj|FiW
zPaF+3^nF*~Yj7~Zvfc(A#56tjfom_1GAuw}uyRn8`XJ7YRF@(}n>=+6UXTBurf<6E
zIG_KO#;Ek`Bphze^<qMO|C86I`pUyPq(S20XQSfmJVe@U&tz?~00GG9eO;!TXW+Qx
zg!itmK=O7bCoen%Rek4``!@dliz(N<y<DFYa~VhP7-ZEf!he1#vrfEkzU8%|{|F0l
zST(u(5{oPR&z#>x$#9&enwsZ18O~>#121Eqr9sn#5!)V#RxGhv;SBwSEPX&naQFUK
zU0E#jGAX&WZ6GY<>Bbp;iCUXObdO9^hMxG?;PU^Or|P_MLc*_1c$_W2*Y<sQ_tZ!$
zNw_JkeF6OMu%jM0!W;r7l{(6JI5-L3b~~3I-qY9HMY&jxot{Xcx<RKxDny_@Qqe<E
zP4~2B0ZOO@J}DwY%(O`gU)<5K>7<;C6n#a{YbGC<<P(sWmpi|Pj|Kq|Dy1U<!jdw^
zxoH`L)d8h1%$8Qk82~>$amr@VR>}-ompFNYRA;h%c{D)y7(cR1jJGII;DWGAh^@h%
z72K*U$!8W9FuC9Y7d4B^o}>nme^d>Uv(~_9TfoPmUM~<lW^wH{l&{%#8{cC6xc_C8
zRV|02^iDm`*3i3bK2LP6jzqR!^)gC!@_)S!>sM;+Rno!gk~dmXC*8$)r!nQC;iCB|
zGqc)SE9`!X&BF;8-WdOrSPDaX34&82-ZJq_p8hBiMhKaIXR!xGp%3=6qO-Ptjl@J7
z^xM1daPrVO$F7jq?q|w0pyb1c|M3EBfU*Q`EJ<l;X(<Vr1O){pB_)CStTJ>D9zNXN
z*~t;}tp@-)0Oe|b9s*RQoEjU023`r^$jHb5CN_Wx!otd`ME?u`PdV7z=L&n2I4v|$
zQ&W3;d&|dBasv($T-+b(%s{LIE6`3^IXX5L4ERm2&+DS1{xRSHU=JYs!Hbmv>?cts
zfJSQb2EBhz%g2{IY|RAFL>L(A=Jsr0xc~@*O|LpVBjX=C%VTQ<z=x%#rjh}CVhs)7
z>vQh-zUb&^Wo2bHPR^i<V}?+v$GEs}0ZZM{QC&lWhmVg7utEVa31Er*_U)T2P}->a
zUV#FQ;O8!iJx-IaA;}+nvcaXfxl8Wu-hCPRKHk}GFQTHBmcD#liu~{ySAk^-`fGaV
z8i>*`czeJU=Lg?HhjTXYx(sn%)wZEKYm_j%Q<Z=I{F$7b{PE+pR6k-c&8rm(gr5K+
zCDM~uNJxJIgpVH$2#-_MCJTdul`UCYu)LXx3IF2_MP1!#AYcgK*IDvplw|eA({LSZ
z0!TX(V`J4k3Gl=)V1#@`M7@nf0`RH%o*paYG#Hf0$8t~t(4YXs8a^H#phajkWdSs(
zQO^bd2L`leUl;}s!24u<YfBI6j#zURupRwycCZA<sQ`JNG35TkhpGFUfbi@vRZ%<v
z`tt7Z{Ahh|Z*O*Xwzl?dxwhZcsgs3;MUJyB*bp;Wu620{Km*`2p1i;`3JRV9JJKa=
z4`uL<jErPD161ldx!6~Lyf@{k#hDf!7S;(AL+9nyYReM!IdGgTODM^DL`YetT|Pcl
zsW)Yh0njgriHQLB58%P5PBa2UKL`W^$nQviS+)o=GFkvgY6%4lV{7Z{0NhHObqXMM
z0JJRt5n<e54FU-^yTA`tR@4`Vv$M0)(_exF0hW)2rKRWEpT{}QxnjQKqoapFcK}Mo
zQ7|VvTVj0p{QMk{;%8^|L4y1H`#$^gQvm1&sPsPtP^Mb4p34G}5}IvUx3{;`)6-X{
z`)ms!0Isq)44e<!^M9seTb~BSB*uS6XHQQtp9A3b80hc+{vR^n>gwwJlBb8qLZe-h
zw_t2c%)xR8TY>^WiYq8A<X?J@7YeLjFL!rfE!vG2MW&_c#lGT?qZIyVZLPaF+|tql
z*qMPAZqUVOGA?_c2Gb5d00q@tU*GDEz?0SBGHnNRDkT*a6$OR2yu1Ln3fKgopWgul
z5<$n=A4?$4Gzwy3KpA{WMs{|Iaex{Jt@je}@-_gI?leEy*Vi{TcC<Iw0AQa05j<0#
zS4_;9E@83F2L@pOCO`lxumqIlyxcxFHHG;TNdl-@J_m~c^bokNv9U2>VPQa#V@+XY
zX6_#tumeUQmO}9K__)HL;otHBW@XSjseASO@)Cfgr0$n=b#;|w4gBW=ocX9&=KK;+
zNiV-73(!NwsMRKhfo0^-3P6QGz!|=gkF)ie7#P?ARuWx;!o)BD+lz>ZSo=4J_4ZR0
zna+Ox{-VOdK>cR`)N)B7ulnxYJ7D=&YL{!4Ycc>VJf##?fae5!?1CC=Yil78et<g&
zpsi|a%Z#D*06S{aEGGvj7|rKn0FX3MRTp}tmVmp!!NFm8q=&&Ft!B;u?Q%o_vIEFG
zG<IR$gB%<j0Cuv`sCurt+@zE{Z(?{&*DlSteIa~A(QR;WzeLrdvCYoexmwG8?l@X)
zU0(IaX~tNiaT~V?#|&S2i^#t7iy56o_x)b7X5)r$rzAf<ZPhPLvUIf!&vVQy>NsZ&
z3dogaiNua^LeIH5mfxc%$0cA02}o34<NPo)r&-&^TB+`w^IwE}n0Y3@Ly5;obe6_}
z@JtXjFuJO|jWFm4`p@E`n1Dc&-9(A1s%nqZw66;P5}@l&`98GI^VsjJbo>WGgV1>H
zo7wEkYhC${AlxS=CXAXK?VOx$j?9|ti9mDC_IYyq;U$Z}b{}~yg<_=?<|ts2ZGmOw
zX5kq$7L~V(5Rlty?sT+hRI_js^cwMnat$JGr^&FD=x3HzR>eCd85st)wzieJ;7)oj
zp(p5KivR)VMIpZvTXq?OpP49g+TGimtKd9*jrdpmyGDXVqrvX9_G)S{E|&Xn1YrAA
zCKd+D!aS29#KEa8`uK+FZ0__Z(C>so=!Z}Id;Gxl$&gWDwZLA?&K!KHBNzqW%#Qd@
z0>uucn&^s64V9D-E-ZG<CF5&Cu~m7Zr*1wzG_y6>*;t~6DCHt87>p9K3e6^_3+@b>
ztimtn$uZ&QUC=}k#qJ7SRY=(wM2zFRC%4`0+d5f`R(A`sq23G($a5J3;ZPOpDrf}X
zVBD3s(8t1qkbqJoBDukM*k|R9%^9!iL42)g+(z%$@|i43aminxcQ)`Fo4MlA>Nkm7
z!!0wH=b;Il0d#@T3RK9HbDBLPTcUK_;*sN6kNVB=`Mv^+U|LD&!0xniJa#EUt;cDf
z-@bHf|00tID$r5dNX}!0D7?2+!+~etFf|dD&D!BGLxFZkn7ud1^@lX#m{~+n)xiK)
zWHo#GD<zlV49kBm;A8d?1SD~bVp$+uw;^cs_ga*Mo+OIn+wjMTcys8GdW*gr`>=8C
z=A18op!Z6omeAMZ)V4KxZiiv;nLqyC=43EZtC3xeEBa?)nni;dLcl~E3^_FNBzdQ|
z^FWI_Ughd9Fa)NX2#-{U3)PuH78huy3+jzc^Ipak?aZLYL!fF!V86QH9oi6wF`za~
za@a->=6h?mnDKcC@yA))#dk>ydWE>K&IPrB(wfa@7llcyQ?0Ej_TT8Z^r}m1AYb&n
zCVR(N&>};Mlso(ttTjW`Qc^t!Mn^@%*%H&nQc7I-@0B?EH9F*k*<1r!$uP@TDoedo
zZDam&#f4ge_iY}f8q{xXx5f1N>l!y_Z;E&ILL>$6GfIm2ajPgs@GPEv`uxM!#HcOr
zk&ilR+%&b+_RbGRS+?JGi=fXuN?hsBeg*9R?+MRCA_6RdOWXl2agn!g+)tSFoHJa5
z#ZIDY(s<;FtjD=uPkczOdc0=&<5iI-+mu~9Yog{KK1Q!n(bO=65VQXBSsk?{347KO
z2N%-1nDqZTBkhZ!H66T~e+G%#j27alGe!%_?3m;%qo}SL_t$db(zu=#7`!O(M>~5J
z_k|Idnxa#E9*wj$1pDQB7}SAF$!V?hR+x22n%hmwOdmy4fV@c_w>VK$-V*9S#@Xjc
zOj|6~GC3aiTbx{YEqK*GjWXnC6fBq|fWT_ie{PLEY@d0*YNv^^OOVMXb$QuaUSoix
z;13R|nFD=RV}nTHb#+Jdit3@p9dxj_t7qLJ5<<NuVyuq8ew9r(IMk|NJpyK)b7t^@
zHlR1d!lok|FNV_mMqo;s%WQCWsV`Bv?5uRg*e&<MNV)Gp5D~id_M;MRjyDF#cNm*e
z;9H$PMGf4n*K}X*&$PPJkVxUK3ZIy|ZJ^|2_w!5lBm^Q|&jYG2_fHM_OlFoc{Q_tA
zoWN=zFZK>LQvVg%T;mS+HE{pTmxst3drw|BPyVfA5K?!`Y*4${I9(9!-4=VbWO84I
zD#$rFU}CJh6jG5k=XQ_w<}t0zXjMxI(aG=X1nz-B3*3AUv@HpVv#;_gu~anr*p`l1
zIWmDZPr6+D32jt+fYsQW9&X+S2kzfC4ovy%qS4$52g_QGIN!rA_ecISR%>mouBbj{
z1p;TwC;NLEP~SGvVXHfArAsf7CcKtmUmV8#gw2@TJ?#bEVyAD%eq;weoP6dMpFGcS
zR@u1MwW4KHJ;aHS#33C^jAD%-{>c4d>bh_J(a9OurZgtDDA=S!%X041)KFj2BSH}q
zm@XAr?#zdtrqhBf|HrHPm|d6pUDvB&!bN37Y7gQFDkc?ijmXT<GpZ6^`lF)m;)VR;
z(LPVbD&D|Sv)fO#CHG8<$!X`T6thP?eVY`{!D9I0<1sQeN9n~zdS{DLe`X@7kf;5n
zE0@Uiq(7{_T$%dVwAcH>qnz2*AIhQHxe8%dCVxJA7%#bW?z28KY<eOm$rB3y{6e=$
z<!sIqiWxN>P>xDP%%SCXz9G0~0uj!41EPNHDCCf8b{_Z%izuHvQt!}WSKK*Ngq2$Z
zxR8i#cD)AwV?hT6mSQ8w`Wu_-_N1%ss<iI6tZw$kA9cT+{(k!JzkrftFv1qN@ih!D
zqGghc7oxuo0m9O8wB<`Vs=C$*RG)i8(zEF4RAz;E<sseY%iw-h)d3xD(sp(=Sx=H6
zb<#Rh)eFxTDlETx{e)@Es*4w6;e&p{h)X%(?(UZ#S$rgLi-SZE{}!y+vppFAnQ84<
z(JHY8Cq&eHX0g|MUiW_$p?tF?=fxU5v>(NE^VC3io(#_Mwi!YjqJ3B|M*8nnL1RoC
z8jEq4aDb+wJUX&ze%WLTSEZpXR_6VyOb)>mcW@3nt`e+ievtAA>)7Knz)0Beun%xP
zql{(c2{F#FL*4GP_CkpcWLIHOL#Iuj#?@V``4m}~S3;}VLVgoJA8%RGh#g~5SbmqE
zSA*D(^EjIJ%m4m9bLC)ga8~@ae$iBwOB0%IK<e9F4>A441o(p`yazNa<e8HBDPwKQ
zvKAMmGlBlx4f~_sUrVnDw|p`uA;(CPQd04t%4^q#k+(Nw+z<X%j(ue;xDJ0bGD}9d
z2eV%&$Yx~z7|<bb(VNjoE$T1R;n=licQ2^2IN*e9i{S0p5XI<b&840v#mTDgy{dbv
zsks6xr`Lv)k4gw$d;Z1;``#<dgKQDtQb3A=dL%?}aNxQ<or4KWlEmr`dx>?ByMz+o
z$($_fA>o^kLhNG^@blZH&_JK!asR&4eNhi_>7%{vqqkmb-eB`f8D5p(>y3mQq%h>=
z;tXT0<p=C~Og+bsf@Tn$<GS15Ai9?7(T$*k8pV$hY%}^H-^36FapBUBh(%bg;L60r
z!_h@e^ut4A;Cx)cqu~#6Ru(EpeT3)I&X&w8v?Y(Dq~Rhfc?<bn1{xd;(&+AQNsYb7
zHcd|K!nfz;>SH#^ug`xWV}#PocEhMfUzMogh3^>Q!_mHXrMuN2dZgE^UAM{hVJQya
zg*TF-YgN;Yckl==u)`FG6_f3EcGX5Ge(*ZI8|o`1AZCr;A{agSVY~d<SW3e4{VSZG
zMCEtigsTb#(iL8{B=D;!V%$uosYJ8JePY0yCdt#I0T%eu;JWKgeo<ZJxxmREyOWB#
z3)tnO`GOg~gs}(zMyEBaP+TQX%kM*QhC!@QiJZ1-Qzo(9`8Rclw+^FN;;-KJI~KRY
zjdz~sxSLNu+9dcSbBUFIL2@5ww5+8+|2I({;@Z2`jLC?T)-yK!&3c?%e71=R`hC*$
z=rv&qJS_%c<~**izH{{CpmzT>)!Uq{u%wFj`EL9kqTz>a`Ym+4`^1+Jv};SS$3-Fh
zTcF$j6BniERTPi*c%Q#9N(&$wJWEJFHo7hMz1M3mxSfQ4c)elT+C!5i@H2^~*4}NP
z{f@k@_Tvm=F&7+0z}AP&=Au;ko178&Bc@&&Ey<mlcX9sqM)Tg)AOk2~ZA2$fS0|6x
z<!9-u6PG~8d7L2%oV<19u*6|T=lI?|Gu#HE03G<w-aV^is!VKT-Sx(L_lYuaZfRdq
zq>t!5^U8LOhA0l}?C!mF0Sa)1*AWZDF{9V0Rv?xU%OMGLfrE1>Exqyol27j^0Kc=p
z|8M&Fm+}-qaD0uUDDz(Xzw<c%)AxVV1pd#!{?EYv7j5>x_i6Dzi|zm4VhibhJ4E)v
zZFjP~zh40`^wARB{jB!!WtjO(&a<qW0fh;^@a~J{AY|8t-PlnFWNT2T#&l_E=|)+p
z>~nv<ogr8^*qj!4OXRGhFU-<^kp7!^;2qS3jw8as>GX)8{EQ_{7E`MlUH<Vs0&#*x
z&%*MPBdjL7#BpyYSb5wnSzM&QegjOKg%g&f`i?AXA+_IEq-b5VIt|6)k9@}mjr36A
zHd-OXR`!Sc4n&1$Pcz!Geuo*lL!Ei-tKFrejC+8Ia4z2fX?BG{NqTl$Se3V}Uyq0l
zO^7r8M`(-+wn@%kwh-qk3S54K6zK~pdg1hdYbO2%X?SW=^6I*4Z0<`Nqt{M@h&s~X
zN1Vigu;uxm$I_2L5-;Cx1m#k-J#qB`%qjJ!oduJDvVEgFGpV0W(1+Vw5-4{(@RdcV
zIcp5vN{vYG2-xprZ?ZN@nhZ6=8m19Bp;?btc6?e=WRUTZUs|!go<5U`S<z2P_x%9%
zarTMvgYLIcrO~Y_omEijr`zJ~K)JY)OKbl5vpvy^pGJ@o4OX{meUqSzsKw+BBEHSG
zB0~7ySnzV^8;6HCB3Isv14n_SDB%PC@f*}T*(1&e2IX_Y@{jx}pYzHx88tswO3Y1W
z)UBIy{Sdp0SZn&GrbG_Rs&6AoG8ZUUYvj$t$94L<h|$ZRqpe>-N{u~7%z9`tg{+V?
zM&zScDLmfp)VeJB-nT2K7){=owH&Mn>}b6N+)m7p)+thV=8f0GyqrDfCag;x=r)zi
zO|pr?AJVm_sm$kWP90}>3r%A@(Wi{qg3lD=iPr6`#2s}FwY=e)dr@E2(Z|i*t)NQe
z&=sL{w1WszH$DjD;v<UR#lTI%sA1OWi@a|{IG?aH-&ll-hg?VDb4lUOv`_qQXlvWp
z-`@4U^o~HZt|B!ncYDg^voX4A$ZN;nmEE9I?@NSi{Ck&XarcThzRzu!p`}5Gi0>j<
zcbhY-_v=<-lYG5TYecy`k8Yq?j?%E~mGHTa_=83hDB5&rIHe=#wk<m0$4=unvfitB
zumsF+|3U|JTs>ru$Pb*fdeipmpuyw})~?lhZBvQhy>!-_5>QmItvmX-weW_p&2fo)
zF;XwTqvnHH8m$pgy5aF}tr6$pR#e^%QnFBty`t;o8d-_+{CBnOB8zpVMR!LhG^_Sh
z+Q>16(r2tH@=!-*UD0{wCX@2;;N&3B{EFRy37*PdkwU`qs?N(9f2{f7SpdIw5p2?F
z5wq2SIfKT}ZTOV|VJpZL)kGW=*~mnIwH4=X(|JI+Gy#OLziTyb#v7zVP1@i!uj_}{
z8UETq&D%67v@BpgH_m&#YcukyrmW5B(s{L&WUwHOQ;1TaR3$|$d=oKMzaVUGYyP<M
z>e<BKB_{zhKd|$B*+(<`cNAUIKX!Cbe$;WJ%et7fxRdHwfBgGu$@^j4!twM+KAW)}
zECTkz=3^n3^Jh8}VtjuES9cBXso>HQ*e9*KxGQ0q89*SmA~5Nd31QONsQ-2UuW!@g
zf=EoX^38#?zhI4(nq<qxZ|hMM<{qapP-ii3)=r%wkj{tN{nJ*zl8dl-{QfKF+qI)g
z2Y<q%g-Ni+0{ijLy4O+CmT}aNYQU&W^m)eIk4`Ukks*`Oo-!3Lo~1&19VTN5fqd2)
zm5Wtj)JI<OH(SoRSQSUR-D#(5)G&J|vYj@BI6u_46TX(fOC#)4uJd||mw)wHbq04*
zn(|XAg<pYPG1Y@)BUxiTq0%jz9FMTev!A)u!yi0<Vw>i6sx+O2Z|;19JlfFAsGUCS
z(fTfkb*h;8wI(Oo7I~i#FilCliTDg7c@=T8S8+@O&TBZgb@lUZQn~7W$|@`Y`#TV(
ztX=c<_e8FrT2}pmxo&`dx+z+6D;<n(S@Q0&?Hkp*z%1zURxLU#<=S}-mM3ws*SyeB
zd|WLib$^6V<+p#p@t}xdc7iN<`Zkhcw{jv;D8+xswDH4Eb>Lvua$du=YRPG!L8w`?
z245lcHluHS^m!rLLKaf_m5XMyW_rwG_RmyMO|>eoB)`qLm1){C0f+FD;X10fjXi^J
z203j!sm8}X69-z5h$pC9ez2@!diK~hiZR5(u)}HQmvTIHwsE+8M1DE+Gq8a?lQ!fn
zO?zV7iAHZq)d~OpC`;ai?XO~d^untUC#sE3f!|f$$lj5MqzmY%(je@1T|4qvt8*gx
zky`(-ww>K`4W{CRzfGBvO17D_lu{FXvM=WlzR_j^l)@G=9&Cg&tIf`hU1terkYI=9
zkIOq9>-JkzSwctecqG)ZT<huNN$p}`#3F+60^DQQ;tXANL6wgEo5K!Fjg6yJ4J^;y
zla-=~<1#W#q9p@P0dEj?Er%me78(!h08jL7-$DghwcfBY8G#f`&%gcLAkqUHDJwo!
zlET#}i^yGJ!@QDEA^&udf~-~i7Mv$kqWXulK%GKFB-7)<+p7}YpryQYrs83M3!e(T
zl8}2J!O9cn?aj*qJj*&vb@$p#;(oYy#C0{2J(E(%bt0Yc>8unGI;t`?6C&rHw9s#p
zyb{0OS9N#_)!Te$zLn5bld}$yP)XIq<|%hWP-~g9h7&%5;LdqxMZLlC$99LSg`Q<!
zrwOS2E0rur=1aW!yV*z_YAU_9#=aWDF%(pBbdIRS8$Ak&(4MK>`X3Z7fAbo~Rn|5-
z+7~~C5YyQ&4cIQWTg~a#JQKR{O-+Gn1hvh0z&CsQ%?z<~;qU+l@E~NvCrwqX*J-1O
zulDWK)%4Am8pT;ZOO(@K38!zrKluUzhA5dMn*f~uep3PqwLXZCk|I+=Z-%(qK?Aq#
zte6VxWqch!J{R%&G}zb2Xqt5S2l#!?w!v0Om+{g@6*&|F!)=JK)Q|D|Mmh_gq@2u^
zTzmkz*{Iein{fHw(9wqwn_CU?K(ZHaHmx-tJA4b+5)G4iIY|{hbWu^{Gp#c3%exKI
z+>UT_Q9Yl;R&LD^l98P_ZJ^_~5__+|_d&v*Z7xNUM-vKGvk=8O3I<=o5`T#IoPjnL
zGtkK5>a^+DlUWIip%{wni1zmsM&vrpW4Co{)W4!GHOnZI={Z;$K5Hn~*Y~jeB1`k~
zvTGJlx%suE108T<Svx*RvteMg9vp<O7s~H6$z`5O2ne6`UD9bKB%Mewm`#X!IlBi~
zmk-{XykI%nku}2OA<^o2&Y-G1FhVpZ<as@&9cBJfE+y|;g4^iVPweM^hP?u&5IRv|
zhBR|+C`)9<gC|<wGm=er2ZQBqJvH)JZiO=!436CF5|25-2_=2Oduf|mkh0|}q~x*f
z-*}I)kzlFm9i1%G@|VNW%WabdY4Q+yj_M7DqLV<`4TH!dgJYr_{iphwf$yliKlaom
zTU#*t`1}HbGz><*<rux$Red=z|LR-yiUqw|b5;Cqy{kT^1~V*?<K@xa6cGR5hU!q;
zGRcs!kl;z@gr1?wr+*UouasyU$!DQ!X0SUr>KY+Zt7NI41>143Y`11f(>U7n?SpsD
z?`WV@Z~0M<*<yk$da#lC(b|-)YH|)`iH_2>YGW10sV=YbF@No$RJfi{t}tK!XX1i@
zrqlR^{id5KsTYkNzcSg##qyQdn|GQW_h-X;ebt(WmQJ*-`qL~ckZNX<LfsBQ<rRcO
zwu-p4p5CLK49Yb^?BWv5<)78-O08kyxxb5{1Y*r24lel@4!Y#NmLpQ|Ct*B0o$elK
zwWMs+TOLjiZ+Y8d6VCHzdY_+#9-QZHv1xPy?5s$a7kUXU<1WK-Px&9yPF}qsVQQz|
zZYznd9a0PFuNgX6Px@d!#PGEwcrVjA=#K|xSS6F#$~&mzVk`Cbx)|lc2S~+|uX6`~
zcriUJ|CZ)+R1tW%^6sA0bM7Fdk8y0FV-U3{L~$q#!S>7_&k$DT=eJ&M6lt86n<VZp
z;z0IOK?`22Kt6zBXgClMb+rz`&+C7q>gY#I>!iPR*@S<JuI6z5S*qo{-<D@yYLpTt
zay+f25y&)W#3GHWAu(5{C33wOnfu_;!+1&J32$qDYFhfOwM=}~;Jia`(5I7k34vH^
z)n*J@%i6`S+O~heGvr_=w*A7sEadySNCQ!v1FNLOMl-MFAHWesZHS;Sd;PZ*msUjb
zsnqsji@tKabYIvDf>xRa#P&<6V`tda`unszRz??G3H^KLYCj6RKOJnunKqkOAlzUa
z!m$nuvk;0&jpMyz<<fy=<dR26s@d~2k93|5T~`cz$pr9|(N*jm&9vk_iLBMQ`a83A
zTQ|8i+0icd=Ft@P=O5DR%mb~(N+ekvx0SZN-0R6V#w143lM%QnCFiw2?py8Ul3Rpx
z2;~h35+9R?R=oR#yYm?&FGNLkP-Or?x%JKnQN8<AeSnr*2+f8!AYOD?$V-*Y-oxH+
z%$ysHQjR!K3n7+DUlg<Z3NMH(>>HWC;Hz}qXgThg&UqkR+FaF=fc~e};ON*!6umdn
zOZb@&dNY;PEc0^<?}?0`H|I4I#TJL?k%)NdNr+(R%ao|iBWQ?vLb$ki5OS$$c*p@S
zcVXLN#yj4L&d<kABhSpnZ1^%ek}U)**Sh6GE@6Jz&a2U0fGH>UeII6;WRP{XN1Z>r
zc~i7M8dfuNFzldlwaVS`%Q^l)ROOsubu<A_oJc)NiB{)r04rNg)Lhr40a7wt#1)se
z=tM14XnIL(3kz{wsO|w#j~Mxyy~m{$4if$PDi-Oe`voMmfph)HRV7w2DC4n<v(q9c
z`taCLya_6M5&jqn@g_jGC4tZtL<^tRW-F>Ud5T4L4xVD^+pIf!uXnsG&A~q%Xe(fL
zcVPKjlJaW%C#LgrzpAZ4!<J+LHe`?PsKqPG=%)I)Lp2)e27#17egtRmWb&(L#X$_~
ze^V5!d$Msx^W$1-&t8;HjSirhbp72p55_9RE|U1QUS#`|c-nT;V$&ETo!T{9_`XOv
zt*m?)K`cy__reAWaA_0Uf+9hFlVzhdW``z(KZ8HlPSxg$>V4u29`eUjqxTpXh0}Pv
z9ii<_sdoKef>TZMCt`TJYh)TZ{j+7e5FYnRi7u9!o5U4^)A}2aDJxwrIlZu!XVC->
zS%Vg)HW<Ujs%zL$vCoX!lE;;=zUFMYqB(DS_~4nUagt_-lAm_5TU(_j5!s0Z77g{H
zws7o?zj`w(##zxrsrHoi_y_o^>?uVi1)l8GAAbRtw2bDfzc!n}q%+xMB7whK9K2f0
ze?fY=$d^%*u2S3dG-nT{8|0uAF?6z$zTOQjSUsXHGuWri+}w^6{q9%CGa62ts=Tjd
zZY0=8>J6vxa!CoK-`@#(O+%6P1{S4O3Z??f0BW+TlEBP#?^`Z@kdw8GVtr!IrME84
zxk7HDHN8~@Xx|BR(PK1DGJ$u(rdKC$eVu{JqG(wE=jTXoy1c?E6w<e7ty&Ia+HFs!
zht^43y;+LaPKMfjOh_rlrGW%+G_s4+=G1wXIi6$?(J_G3{%#tG>Id1bU7+lZ2}ymu
zdlu(BHm@O$3$Z?Cei+G|Th`Z_4G;50J`I*VxJ^_;of}NLoPsF#e8uXo5pI(Dul}{*
z!4`6`Xw{djLTSV!hzkgpc)bwA@q35mT8GfKYsu?{27GvO|F}kyU<mOSC^(jdHb9HQ
zU->C5-5}8>0d0tlEn-_c5!jfU57E*o4gS|ISHtQNg~c!}qe*E@4U8#-xU(FrH3!J~
zxI?UOTsm2+zd(}EHe3JMd;fg3y_}fzJXet_*aIv64O3|t>K{u}+SxjFv^PRA7Z+HH
z(J*Oo5D2i$IsEpB*O&_4rxdyhv)XSZmuz9Z^*T7on`&-$6rs^8zd9j@n4$t+^ZH#e
zSFeVAncSsSM)%SP33L>5r%+v-yKTflXNn|a&)&9U%4)0j2$TGUlA4)p2n{j?y%Flp
z-VzCOXZsamt!TL>3p3b2HJA7E)YHD}+#y7)sEd`p&#M`|4(t8U^IVe#7w61%BYk9C
zR=JF|q^+S(Wmyt$IQuX~@Jc`GBofs3b&7w<=6dW`oIEp#zp!*({IQCV5X#=KP;!&#
zZIJrxp@DezMM#uz^MCqVI;Ppr4(8D}nF#EC`RsyT#%!78STUlL?q*B_6sa|DV-n}U
zQ~%eZ=3S}cz5X8MY(fF&xZcNU0+MX@&NS6nk-YFr$Wn_yPASH1{V7=M?G9{tv67-G
zZD*amvY(0eGO@P7-%KQ)eEd%YGac9S0|D@xvtI%=T4UBZx9L-T8+K#EotrQpGH>_x
zC9S-)sS=D{-ihLQIn&mzMNastBh6-zDI|`d>hSV#xVWSw2+0`GbbalzbhqpS5c^}M
zFZG}+OdYRWpFPEc;Kbv1_XAMyDrFv&Ax_3|?i0(w?lg!td1HDy_KWV6X1jF`e|1)y
z#neEv&6es(^R^Be(SA`1H-@(!<jRr_E})zL=<BW-@jIIo9-?>{lZ;#xVt+u{a?7Iz
zKe8U-uFlQ=XKS?&ybl>Ed*xT(913yvduC!hUy>!*{$g1GIW-JQ{Z*;8Fw*Wl5d%t6
zw#OX#eH`n|CvPrmoIY*dj1#jEc24Y0scV2C64vYuMGki?BLnq-LkpUS>nt8NWSZ>G
zH1XCf@h$kPjOCLlEqnCWyhsx|JIHDfy{V=Vc6B^kMm7^3;B$TocDgDj(_k3x@bf#0
zk$3K<klkN&hkSCXEYPam`@L{@e0ly(F@1=Fmnm=5MH3c5EX6>I@;=)$TdxrTZQGn2
z?siWw2*Q#*kB0^aCAOqeqE;prYGnFS17G4599&8$_k0z_ISgg}q@(V(mNj!UZ4r;!
zec`oti1~gd%nFUM6D@G~dy%qbu|RN8rq&YYwJ_<?R9`b!m9NZDOwY@2qWS$ftAj+7
znvPTpXKe6odDFc&g(@)^nayeIP!ujy$6laHV*)^s&3w?;Fvy9)rTsHHsjp_~Z1o4x
z3fa@hqwy>%o4#98#5V==nD!hNZ?~Vb#?njkCj9*KF0<IA(rA#HU|*)ESZA%YWR%m(
zUZ-Y%NLhKHR9Qz$zl5){Xtf%6r=M^P$=oH8cJn*RFRw4C8F(qH<Q7R@5hfYQ<rrVV
z4K-R$2;}CU=jZfej>^nRW7-teuGE+r)<qJyjj{B{K#iPftU^ZZ1{8fi3Wv+%=1<U&
z?lTUnD&<#dSI*g=?|mV(>k*`yP!h>7{AtddnaY-|Ql9!;{7Fg9mJ78WQCjBpHZxR3
zbN7u)igtnaj`KB-60`^>IQ!=#9mkDBN>Px>TbE1JaMi^VaDT+7jKV(OAQWidTzniB
z(sa=Q%7EcQQ@c*C6ki-M9(sSM&hMP2vQAO4fT5r%a=5flz;O~?wrlmG-Z=|8cDk+X
zaRv+%v*;_c{+EQ|(n1Uni3m<;y%u@E<<EPOkOt7|qra5sxMF+6bAmUc$xU2EJE&o^
zYHDHoi-yZ@Z3}LYN*2~ciwd0(b2kuW1E+Kp(f&sR&neNq7OjEJ<(&Ce*>)a#)KRp>
ziPriwSUHZ<a<<cK-A4H#tm~!GHAH=YWqWeGWl`dp)F-bnRIW`2w&t7L^Dz-pE~!1g
z>BrYLlP=;9UDTWxy0)z~!xI@Xj#H!iJ(u~xrb;Vsi#s=1177l+wh870k~Me)%9ou)
z2m7m~*De>H)#tAZg3=GL#^r&6IiEydtDjkLT;52aF7%>l<S+|?{;6iL;dY<>NhHja
zIrDG(KK9fiFKqyhx<vo!FfJm@+74lpXNraM_?}!snUem(6}Fbp^E^R+Q;(8Vmz7G(
zLu}ZXoU(a*Z_1!Pg;CT27yECzh!*(l#y1rwxE?W=MXX;js?Cc5-|M=t4Yva}Cd^pj
z&Sg>udp9`=*m&|&<-~8N?3qaT$suMAGI&F+oSQ=jM2YaQlLj}kvzeG%T9|qUhVXFd
zSy?hhbwTV*cj}c;`o<1lMkf`JFn23c`>^rZ-ii(6sJjCP3n(KiQ<mLv_<pNTK*egv
zHudGvu+^C2){AP~azk<VO0x#u8S55OeghA@C%!bhg>jl~8gnccp&*^)#Yy`_5iV)=
zMxL3Q!XNF<-ObO*$n=iCiHso62B(NX2jyxJbo-l~6h6=Fkf~Jif(k~wJDy55XC3RT
zX7gU?_dGLo9%)B8;Ac(XqozD4H2yoWR4M$-m>#n@-E(r$EiXslL?_L=oh*Mxb4#M5
zuZbt7&CLoGtFm6Q-$ztsZ+LuNLQ+kW-6+w9&Ng4q{^&y$lrsc55NnmEu>0=f3_8=5
z<JLQ1nA{)bJN|jHa(ZQ>YlYpojxT7ab_}$ZXf?t=_Pk7&K_%TAbY85@mh|&SaAX;}
zSMOyXZl>{jnVJcrM4BEz`2wXkW_=rWkAS<9$jR7V$amrMIM>~a{K`#PPXo!?NC{f_
zs*kYYd9Ut^hsL@2<q7Xr#2is>uw!%>F<pHv2f7~A@-Vg7bo+jZb(ok`i`8G&4huza
zv03zk5`k0QV$Lp>=IO-o`_=-*<L{frX*dgp@@e44FJ?OXHpW08sy<3l@nKNqKxpa8
zx4=madqHzWEr_!{f250{fQ!P#QW%Pu%71&s-1$mYxi!;FsD*0=+6wVSOL!I6n1<-?
z9G@k=xDbUIvjqwlo}0Vgs)49{=|#84FwJW#TAgPqK?Y(=r(@HPCa<!T<I&+9RHMwh
z(@^I9<__b9Fr6y4nca!r?WtHF9l2QJaigXQwg~s~WcR~tYy*;_#?@rMg%SKpzvI(@
z^BK0;jiU{Ooc<j#;!B-@*fl(m)3HpPA0CS!?lwH77n!Rv>Z;>7*~u>Z!QK`Y7s|!s
zdvUyx#kA#jVC*dfq)<CmTw-ps9^7l?ALD9X!xFua$lDTzP#qQzob&&^jC;Hvyt{Kd
z(d_)-`rV{UH^M7yA>w|vwO9EtcM(-y_crnf48G_Ls{DOXXP_CbX;wG7qsXJ&ye9aT
z@^|x9d2z;P8@u61jZhm!d#?xqs^<SE7QmbPEx74Jwkm%BZ63_xB-C#@P7H3+*NxGv
zcL(Eza4^OZx#v9>SQ%1bqNerJ^&av_y(9>oe5|L+-eu2!g_1+KwBJOmy5rJ@^da8z
zNk{Ok&Pfj5qq2^_EVcz|U&o1;c)2>6NxO|r^euSZj_dl-qk8f`Y}F+V2ApFbxK6SC
z494mE^F5;H39U+JIydX}xaNiH4CZTRciJ#=wq=Oj;4ZCvF)Jn(zgZ|aMpipl8>A4V
zE#qqF3;)Y3<wK=?Y9bP_{6UbHkXGh$&0Yy(7J5gIBqfBnKr<<rKlf25aZb?wHaxzP
z!*m9muXsV>tE#*B$CH7!VwSHYD)z0oZ4cZW^g`|BLak+EYT~o`ISTiS%_);lP+>lx
z$8#(9o8Id5!-qIZ6Ao+3=Z7WVOusA&9$^@V`T9F@gKbfRvQtmI^V(Zh1(M8}<63hT
z8!dyYK?KOX&oWjh_fEH`0!|Zd@Eu9Lhn35JgG~^0CeS0@D}!i5<Ws4LpOft9-eroM
zii|%wi+-B|Ne<~Lo)@3Sr7MzVc(N*U!@a{)aval$!DgZ0xO=pJ)5T3|cuf8{*gSB5
zV()mnu$njag`>IoQ&ESTPTR6PA<X2(-^c`v@y4+=EO8;DN!Y>17!eWliuccc{TcW)
zcO9L}zHnGuUCAoew7J18B~=#E{{){5N#paI0%EMRLyjkjMCAoHxa=&Y@Q`!AJ&!@D
z+**<1z`tpx5p92uPO5*Y>`(HPR)z%xL+BgfqbJbJB={b5s!4dPM)rXmr4h?-5gO~5
zHzMh&MyYgc1|>F5&YGJTxs0@=LGC&M^&%ThMuA>>CV5t#X7-D!yr_AIRVk()6UgR%
zX?`w9e=9+h!{iADU(J@gYoQ~d#dG0Z*~ON=<xpc~(RCuwyF(KbiPvX&^Hok=`PAb6
zsuJY#Po)Ov$A1r^m@~BB4|1vPHu05B7H7*)bvnqv;Ju$b_uJO$PTN^`o5_flmHJ!S
zt%7ZL1_eD1z?7rqeLp3-P7Pf7a~NefNC%lUwfTy_GwgX|om_;6$Lxp0v+f<fAt7II
zI0hbQZyTEgUWeFxbTa3pld&{rb-|^TYK}~DG+k1<_=y>lQf_nqPc!~zfz_v-Um&q{
z5yS~l?`2{Urt7A5%+PXwmWx7H_qM7P(5%458eIoyPKQra_9e3gNek}6dB^Ir?;>>r
z{j8`&UZj=!?eqGYxH?C<p4$$L-}}w@_w{i&lld_<$L;=yB>n~uy}eqr!Gg3*ai?#R
z4Zr<l(Wzu4*@@Y7sr-2vJ_k`_pesF`IkUi0O)$sdz}^gVnQLOh8@|}Fx|8T-{mlg&
zOwHkvPDM()C22Ncqu4?q`TngtE3M3hrTLZ>ix;MFO57_eiFB<Yz~bLY>>Zh@dM#H^
zWMhmLsg6t^1wAplwJFgxSQpgMH|Vhv0o&`ZhW-wg?=h8lr-k>x$pVZ=6s<h?gMe+v
zsxy+9SB^lwifZ+QlQmDZwe`lkc)6=po2uEzi3nIsH5cuLNWYiuN8}Q>q0w%KO;;u2
zd#0CSytbw}(oe$~2`ZYlm&*g$Y;+Kh9T;1Var39_#lI+!w>aE}+$J?$nP{Er@AKFH
zZD<Q2W)wZlu>A?=6%{=i<lC}RF?aagfXm_>*IFywPjQaQ-|$^a{MDwUm|Jz7;dn=1
zCqJQE!6MJN!y7AZVaFc-Bp`?N=_>^(3p^lqKfK!<cU9NTOp@ECdp^9bt#1gEL?U&3
z0L~D?+N!q?^^cT;crQAJ<dTdOX*LC%9b|A<Ur~_VKhIqj@&`Q^yxl1Oz`tsEMy`eG
zEy@?Y=W${$;4oH40(1EVl)eUwJd+aIjC~aa<2>yot+DpZwD{$3Hk&!a^_XQMn<<@@
zJV?wPYar>fw|;OSQEP^+qoCPkUs5bJTWaSjvxM(_Yp0X&kGgaIOC1Fp@kVWNm+8Uk
zu6_@~6-v#F*2ZAng?U%)gDjrqS5Y=Jhv>aotIut1ZCBqRXQaC`ZA=92fCt_OHE}c}
zODc4Ri-s`&`6yhRsI)QJcUFj3uf^N5>yFZj_BbZBBI+L)(j#3?-P%-AX8pdk^&;8K
z#LYpX0fPe<-r<hd#WyQ^8K%(%9|w2;eG8#K`7=IX(W_$O%We4HY8f8P6EZ+Bf3_78
z8SG@jvog~qtpjfzIP_9KvPtt_8n#KlCixa@s(m0gh3sm3BAz?^7HT8sY5bD7GSKY%
zX5{<g^AmST=4lSGv(0Sy3-Lr<eT%N;7RoOP3Eu|=-#!m2z^m?WuSY!6^;{v(AWwsy
z#<1};@Nr%r#<216^D~#fvvs`uf)R`|LT7*<otrZsyCeKAr4&D-@VD$Fvc%kHI3)7&
zF1EKrR|Ji=a_jPt;%$D`mJ+ESuVHH<CuSQL4cs}Ha}Bv+YlO3Q=VQGY`wvnP8sFyW
z#TKQmI)A$fs;E}e-;TG}b<2;;-WF|x8jhi70&|BMV2SqW@vcxez)sEle?;szR4{k4
zV*gwU|MGL0XfUzlqYa7rROu)*rSZXTqPp{T!DY$#JTn<Ja=YU@V%5`>i*Pv+{cGEM
zdHjho^J625t-bZT7PN0qb}7rJl1*H|@$fjaxm^@jafBi7XD{!T-UcRI(thKEI>9w;
z{eQ*5hjw)z4<eiYhAqu5in#A2b@62hUD6q{=i}z&rF>h(!J2#i4K?6(X<lf7FUhLk
z$`x1Qp9RHyom`RY9UY-AI3`ptBcL)Ff(A^qPF>9Kut-I0oEC?a@HzzbH4rJ(jO+=S
ziCk@}`ru1NXtFYdh1~^H*q7_G@Cb}P##3U{i9SK!1agY1z0ygmfoN=L2`h1y$^<}?
zpB+`J?7nz=F#emdBuom}mvQ~o%frX{r0yx|+UGmuq+4x{^HG9Jsx)>1ANzlYKe)CJ
zc0|(f_<Q|GuNJ{X=v~#ycHC-nLg&Yt&%*ecD+nH{dY%~h(MMH?&P$`NLl3h<vH@^3
zo`5s%*0}XepN>QW$2&$x9&G=(w;ZY82oCH0E_<g20)IWu(?YFS-rv_2yCelO6~Pn1
zx~c}Q($8}lZ6h%EZ!44UP>@{}>%p=m*C_kShPm@DgE3+Yt9w6;<|%w){;Rhut8;O-
zU_(N!X1?^H@vfhn_sD<ol))!H6Jy#0QEWOjvlq^+-lt#M8wwx6d8d>syVlQF&Zq9B
z$!54^2ox@Hq9VE1d7OGDPvDs8u)NnVgKH6E=5_dS`XgCI)F0|lEoG5B5eExfOPg%N
zKE~&z4Up^KWvQ8Uyh)5o&87C<lort7Qq!puo4?ll6K2BT%nX4!`I@9(6a(oK7I2kQ
zrDi(MHtGisXUvOOLvw!(-tBPJczj9mzzWCilmvPW7GeHluAAX2|G)5uRE8+{r}ZKq
zw&q8D6mjBH_G;l;gyO*mvpGn#o=n;uj;tGrf>^J=V`CFZTYKeg-Rq5k`$JpS{Ns0*
z2;=?Mf_(mb8>Tu8B@RfN^ewlu=k-@kOktmHZs2(xLM-d8$yjdb@`Y(18@I<>Nu-y>
z+wsL&m$^P^T#+F>UW|;{&QDVSHvbDqEqDm-AAD4Qt-7ol5vz<R<Ru|-d%#iAC;5nL
zANky?bh|h9w+3HxH+g0Oxe~Y}qrjZUjVJA)j*%yJ&QMExKs`5+iU3KJwYWUg)OWpn
ziCVW+E#55Di>ah0Jv?6?ZdUqYU=?Ia&21-+s9Em$7SuAWdP+w~8{+aEwIwWSojy}!
zIIY8av_YA>H#|*xN4I)0yXDYln29TkzesgEilfFV*~;si1A0a>RSdH{NFz~~%FY(<
z;AqFnymBiB30i^M6daPW2lSl-I#4Q|luT-<uQcvc!`U}3w|(iJc@pI+%fwP4FHUI&
zDWq^=qw_}&n*=~0S^h)-%sOt?=X!M2?$6oRR#_tms$D}o{8Gox<WqOK#VT{AD#oOu
z;#$w8GpnLx2e@#`H|t+NE1zldhmtyP=&~#)5EG_#uew5w3B!qht7pInIhQF6z`m7D
zRM{^T@0bkqBp#lNNs$s=YCJqRN7^cETy*JirZ?@Si1fkyv9X0DL1u1jJRtLNx6{cy
zuuQ<0h$yixuh_EzA5|xRuV%bif9`U30%RHT4nPEWNy3@O6iF00WPJ{;F=Ik(zHCNK
zJn!lNz&z{0)AUL3e!cAJq|_}%;gVh{Fh!IYx0R#)PliS@H5C<*axn|TK+0oJt|(5I
zzO{RnnkoJ2e;69s1@jy}o_;|VdNKDH@Q9-|McI1h9!TM9eJN=gCo`<<G59F%;qg?D
zWkiQOoqX-<gYyyz0Wi}~y;B65qfR)94=12JDuz-i!|W$F_c$8_#L2eu@?~I$AX+4a
z6>*XLQ-%iL=jLUnn0wG<bkUvLz5y2+s!q}2@fg@BYj44ANLP@Z<0Z<pWvA-<y);ls
zY_+NVLWe^dhkvZ|CB&56lQjh{EXGj3kYBEE7OvxI-Ct7N{PA%<<vdr`M1Q8yNUzcy
zVh@ezblzYlRq9m#In{dfU=r_vd_;l}4q!}s=@!?jh~;R=xsai1vl#xGL=YFVu_)=f
z@5k;0KbmpNi7~tCRMKLUz?*gu{b6{F_<W{2T&h}T^ZdqhW_4!37&%htfBo^Jr2|-P
zOZIYkpwL44-m%l=^%yi2S`2xbM0T>R`jF&`nGOzAK`C^IUS3@A77LsCVM-w0y?o;U
z<W1$Aoj8Wbc5O~6uBG57a^^tiLnl9-Z3I0e#RwT1R4#4MPK8>rGRT}>CZmo%s1E;M
z?R`~LT+OpD2_z8QU4lC#5FmI049*bTA-KCc!9Br(4DRj{WPsp4xHGuBGw7M``=9%8
z*L}Kg=i#ii*V+%gyLWZ<>e^M+yM8}euDAZTwK0(be)P|C%sSrAl_QHTO!d!4_ibEc
zhgU5cZds_`YEI2fZ`HBVJ;mx=DzsT*S6Zz!$klv;n6{kK#!*w#X(X(jbTYK;W(<)D
zM_<g(M_ijWUSrCWwO_@WiSZx!j$fJ_4^1ma1QrrF0nR-T6~0b;zYKFGNfb49kpbLa
zKb{eXDi4}CSpx5uJ~w#MgYRg=FegMg^%n>CuHu3wCfBC?AV)1P3%tI^Y4c`vZ>POZ
z{Hc|04*FVI@+3L-*_ZYS=*D8(9E5*_8v||8cu53oyk_`xAcdyL!Y$A0?3nEx$C-b}
zd!I^0T0D3ep4UphfZhcmleI6q<Xhk(N|Jl50}>;#)h01kr8C5wvQ}4|RxP&TMbu8S
z<|$~HbxH&-?n_yB@RD8J2Z3>GdA^M$w0V|I+V{cXR%)~pagi6ivcpS7uT}S`h!-?Y
zK0J}Hru!?#$ZK;y{7zC)73w#-jy@X#DxH%*r~kl-5o$Hd@HhI-39Pf07nXG@w%V9q
zx*05Nx=~Xob#YK1^gmum$M&0f<(%xKU!g?-DVeJRUA}GJAt^xx`*pv+UKCmKq}8u%
zdC%mLs#@VRO<RWvJjE5X(_7SMI@b{qU2ZRp@MS$XYrm>yWmVQ5IZAVWju_BS-<e;y
z8dQk`e;$RoAF4dmvNTwYkG!U$?8b_fY4!Ki3iaD5b0~eOukgjl8j&Ak`qM)9TiTfm
zBeytB2y`D4jgiM*_D4X2@6$*%L)As||CMa`)S*S*<z6u{nFguj-fUxe|2EB5cP`6H
z2knpB?3S9oGVU=~pT3E`UI%m{@nR`g2c^mDvSn5b%-}j0<Szfhl~ii1tlHq;fJdwY
zXXWUvb!pEg1`sLucW-~dSAq6j+`^m)?z-d{)332c6$T@~-ZY<?B{l>+dIEMDCs9T*
z1UYbK4n)R9j!cE<cT>+)c}1HeR?V3`bMHr&drs>Ty?8Ucc<1oxzJ(m=+_r7wV@V-a
zSod3m7LvfPuJKO_NWf#i(}M#|_itE&t}FnQ2~IZY@0+?6cH-ujiz~>BVZuL)wuJD2
z8+xM{`ma`-wO1ss<M_^~Ive)K?MLq;1i_0RIdkiXV<RH8@(gL`Dk+-$Ac3ZOS18nJ
z$>_lIDLt6k+*i}pg6>@mH||Y~q@MM}r<gT|s9S6l%jRf?dd>8zNr6!HGGa0OH@IpG
zV#Fnyl6aCdw4q+>rmWj2*A@|hH1(gQBC#km`<<QE==w@fl=}Oo)Y3z?ZKpZy;TzTQ
z)TuapN-1WxJaZ$>+X?!6kD=?V+Z!!6{@PnGgbJ#Ios@qoN5Bzgz0~$&MGY}$U|u#e
z{zN&32$vkkw%o0x56u(y*wWKxefm2%yo&Al;m0=TB<pRoZ8wLIw<IRCLbMVr3=ex*
zF5@3DvlM{^+Dq^=b@B=W&|`{3gB*{(w1cuO!@f*8Ns*<DEzc5hTdVnde3I7Bdtr<#
z-l@<6Q-CkY+q0O6gWHso7Q5a!FOicNtcs<ko7DAIhxYz7;P%l_U8$MV_0}wRQ>t!v
zdA^`yY?j)O&I%Qb7h6`~+z!3@9)VtUPhGhNyY=qSlv3`ri$4E$zVM$~W~nEE9?SX9
zttrlYE-VDRu#)GSsHizGq2%s6tIY(S-{*%|Hl8N16H_eyj~j$hX&-)SJUf>?mBR{n
zBTKa{Uo;J6&aXM*)wi~l`^?@h$CHsJvPq5b@Zf!%Jknk4nM_e6Sh=%s-1x=g3~^s>
zF9rfd=IS4*Kli?2?(s~_F;fc4UHsF_SAT+Zx9+n+V;MrnpTJf3bcUzPE(gh%w~3Yk
z#;TgwmAvq~vUG6>%Tz$KKc1dnxxPhqcVk+t9FdJbt6-CN?WdUhxHRjrr1;VrlK!#o
z1D;>DatIwySjv)5?_tflF@F3sn~|Ny{o|nxTOH(O{13UQx>IFN#<fO9<g2yTTlUbv
zNv&6Nyjcot?<LtKZx0PF6FP!jN>2x;lHLMs3vNq<*O4zp@%dLHHdq^2H)`zz{4wgV
zI{B`^fY>AG!8(zi&#brV4z4yw(jf`yS>!Wgy_j<6N3Ll<Jm4T5YEImTzb~@DqRbei
z;KU}C!PvJ#+SDp=OelD@sTju`Uc?`5cV&19^LLv8#^B-tT-ntCCN(b_YK_D9Vkp!@
z=4C=~j@H8!4F_jvHS!9C-CE7%yQ9v#IHZ%u2i4NlRH3QtVKK-}VVYYBgj3tN#z9HN
z^fBl9S&vB3QJIK9Z;~7VfoWBvMcPYsrxBnLj+19FCB&6(-IH?l#B)2YfcUU10cxSE
zE!+_>hehRUyT*5CFf{8=>;ADJ-UF|t{qVKR)$;~RpL{4nyWDnW*dg!8#2vQ&#>n3`
z)XBn`6?xQaS;>8{lJ%VZHw!K7DgRW^{W0o4!|+CQ#1%=8ST*IwuGSOT0f@dekytxE
zrTt@FxpMgp7E8^YX~h!jJvY!g60>5m`ohE6Zni?FJR^I`34@~TmT4rT2koOIrxRgW
zK6946q8R{*5>>8OQ0FR=`CSG91#9VPYHPFQ8rR53A{Uf-q1(cLh8}-^+cO;M&q02X
zz|Vz@uol!l378!GTEa`|&!)dj&%M&O`LkCpEETzE34>HPCxqp5$(?|Cj`PyjAhLJL
zZ$gMTruI2e-BD+%7|})2kJaVeb~rY*r{<fFv;W3iL7`aFx(957CK3%TFE<JN)cM7U
z!MDxI+JGX)HrDrD@o2?r_F07bRP38ClXaf!2Ufa8W3x43w_%|As=k8Si-P({;7=^i
zG^@??{*3}!s|yrr{IH^arQmdZZuh;%?pGnlUL*iw8Tob7RXW=2Y73e6YW3UIUwjA%
zR2q&|@gYPq5dFsHta-kcSioZq1#2=aHLZ_osm5vWIr?5bg7NkgecW0#D|yTP?(tGJ
z(gC%~ac7TP<}2rvWu@!pM#iE5y)e7QR05Kux|MP9LY(nr_795wFHE(rC0(0@Sfu02
zgG?JVQ`hJi0MFChf^_(d_{~Pqu$(qlZhUE&4;p<Hi^4V3S2CLG*|eR%`!$C6{VT>1
zh8mvHazpEW>Ko8W(WIB!^1&x&t7NiuVga;ntW)9h&k;3N>YDY=^diZ5-f-l#Fa0kK
z?yHUp>GlYntLX8+uy1gYOa_%nBEt~@<*qX=hZYr)f3&3z)m5ikngS4|ws#TUkcZR!
zam))3M~njpR}a2F<meFPlEz<DEK3Juol+fdpMY<DPhz$P^-g58Pj6mD8!(PfnolLZ
zXjF8*p<3QucG;{gbw$fyv3IpI10`y(npEQ$<X05I@DTkQ5_Vz*!plTjQgjAs$w+IN
zPJ3rumTp&FF%S^4-!0d?h4VeXKf8f%D1@&}aEzy{VpcXmJ8NBA#+%J!omhSOc0a~E
zSxE1w7>Ldnr@`%()(oraCh_Qxf;VNIkI;zhhBzKTSODakn}ajv`CGem3A#s>lqth4
zhA3W!jP&{W_-CV0+7Iu^Q@fvKuBTQCQYhyJ684&Pg1mYM<K2ZcZcn9p=5;A2!bh%y
zD8sQ!f3_`rE*f-7VE8(>m|k0jCE0^~yrT)~gE40qWVceQ9zizX^q2;0F%(wW<whsD
zD>+*%gUha|Atl{;dW|l3241&|M$<TKeK*s&9egW$MY+;G%p03{Czbw1&F%Kt?NR`d
zF-zA4r_GAXozG-Lz2rmX-hJPUAS7Sr$X7RJ{c!6QLd7~>A-Rl~#Wy70+2e^W>7Dd9
zK{DrPbM41`qglSzD_7t-s@+sLC3_+PueH*=`2Cur*REgGWah_33~IU|k&f%1<7icu
zb}NEsDqVB7!q=K6bKtzKN~ei;{`fV9!xQ;Jg`lvz1E{s~X{@P|Hx+kuog#yfw<p7f
zPeX&_PHDvDrp!wFp&_9Ef+Mtdcy7t9s4%#sspD=-Yr00z=wdkU!7f3#EqGTwb07{Z
z+oEm0)UD-WeR@w(G!<9JcMbHAAIcM?$G4P8azl0|d?z!>^E&IhyDt!l_q_ka26v;7
z9EEeAXNJiPC=}yKP3PMwTNLHYnW8|o^Cc-i>@CGinuvEb>=4YITVE98{HH1{5;%P|
zPSUS>Io-O{ZK-nVYVi1geawosTl5(YVkRY?TPD}vC%}F#{d}DJ!&s@SRbM5>Xh-+c
ziI(e*M_2RGG>(cFSzhhl8}8?DR#y=J--Mj@Ak($?UgbVh62nqq+c^3rt-tA+TRwvL
z+i2A;9Cp)9`qyCHD-;S&z%Wy9g{EjMfzeFiAp$2%glvNPz7QVEze!*+J}R%Sn?qx{
z?UnHMRnuO{j-!+)a&qd~02$0(vD_iG4#%LRc0Ywf!Y`5czPA;BOt~xPN61T@Z--V=
z3VY}2Rg7W+&2;F22Kb;%Y`>cj%|x6!(T|Lr{5DIr-S#nd<tU>(T!m>K*G@(>!TBMj
z*RA&8X`7D2nuyKT47APpi~~#?A-zaiErRAtx*|ro*-ViJlUdX5)AXt2s&LO#^7hLg
zhN6r>S)Wptaje%G-?20)7Fm5q2k(EZdUIRWhDN$$hyllztULv^jzNNRRVzN~_EQUS
zFsN$rs0!!PwBYIe$lW&R#4o|0BIjw%tr4HPjkhUac5tpJjCF{0pRk<R^pE`<iOvpe
zF9Ao)1Gdm$E;vG7aTlq4O;HQ&W8vcgd~REPKV#%hDu!ZRTs8E$=Ci|4Z3=FdsT7fR
z0bP>o;prO#mDdOs6cuq!^}7C0A_BaoKG;SqUKIy`UQI;w&*j%^@YL?GBc1U*2S{9?
zT2SpgO7!zCG-7iQf@Vc8=BKbP*apsXh73maX{r?yR<J_X8|^qK^aQ`L43Wj5cRS`t
zvx%cn*H&m4*lVz+B21ZDe?*tRCg3YAnZ3l3$pgC<K{EtXGzHvmt9b~~NKM0+p$pxE
z3u)?V%Bp{@*?g(bQlG&TVkXF|Ih14K8b=rh<vy)1ervLUlOsY)S`U6r9gas|I}7#1
zEgG~X`|j`AU_J3J$8EwS%^|Veg|2vXR=|)&q2rb>yzxm}&JMwMz4X_TJB23j12jSv
z8jBv-Yvw5R2W9>t_|G5X8`CSGlZ&V-D7&}k`UrQ)J?3IMtxh5+ma&NSR``KNC6DaB
zvjU59Sr*Dy{b5JB@3<jvM}*4z;_j2q-L@LSmqUvfG^Ti>FhnW6-)b8C(XjomBPV{X
zDnEak<+GjX`^RnuU@sVTrPUyN+o(TcGRcHSvD8g2Xy;Gv65_4I+Gh#?Rc9@`$CT{i
zB73W4L|&FYnX-5-nO;0*2Ijji`RiI~$y@y_!78yYPj<gKyM9N#YT+X!;dtTTv8e0K
zPr@<E-(>ZBud=r~VYQAjQ~2S+F{j?%U&FITaXZTxx#MvgdgB*quQY?Ad%@-s?H^6p
zYdAuuzI9@5CO{5;t{Z|>EV*M^4&PUh4yYd)kJp?IXq~`TqxEmhgU)28RC@^7)j>s$
zmwv?Ztz7#$9UjhKnXh-B64(Y&s8?PYw*+%goPRlJHTgOgN0lthGqt{Vodq+4O!JsK
z=_l;6^S#jCFRRMz#CkVSJW&*r3Z`pq@YH-wY2MVgl`_!Zn#Q^C^&b=E;?ZosV<n@e
z^YQyWx%|*qZng3kbW%={HL(`^BJjBV$So*I^4FLC#nGep`V7p+B5e|S9boyxm;L$r
z0m*V5B!<W6Z6*hrx(S&ZNqrezb?t7g-M!0()#=O|iTF46cVJ-qC_N+c$;dS)Vc^pW
zlQhLu76r|;S!aV%s|Qdb(g=H9w`T^bGej_`Eq&>e?TpTzlNUAutzxD7m)C+g#q4u@
z@f>|KB&4zcU!^rKW6OxosQw})k&8@C2Lrwm|5Tx$;hTC{BEwBP4l~gDJIBj21Go0?
z%Q=YlQphHGBw?%yg7w(z-Yef9Wn%+O&0crxjQ4%7;)MutuYHkD&OI9hjoxsYlK&iA
zBe_i{fA6EbWG<m`{)ATYhp?%bcUSB?@DKrk)af5w0EL)@pI>M5ys{SR$hm2NLM41>
zF#hoq&&Ry9$MV3NJjuM{%dy*)`n=(?Vru{w=qop)>x{T`I>_O@K#=*e^MQ%YaMy-s
zw}lM9P*X$@nc}cu$~vRG>L-)~Eq@U<jx4p*XD=w-ixq6%@>t5xI7ULtd|L;KF3M|A
z|FSjpwsAK<b*zeWsGqXcDcx@J6(9_eZGG#$?2O7IC#O~cJ=FwNPBAPJd!;(#g2%u%
zuFxI|Jm&(=So8Y-N|hYl0{vd%%h}&&)%PP&KzydfFO(7NmHQ0nzcSb%3&svHHOh&z
z#}-4UHNF2vwq5n<cw8*_)K%OtwLZvaiec~%42z@J;7__ttxbQ~7Y^|bcRvymHO_WC
z&-TCs>?iC^XgKp(+Tp{EM9ZAeYLod`)&ePjlFu8RvVnHr)=9N-Y55EIkWu#NnA{7?
z!P7}d##(dy4^TVivlvR1+KoF6vN#HB8>t4=S$5956f=HU4I`5=n6Ux$WX-3?F^HrR
z8xxHq7AUbzsAb$0`*|hX^hbG$?K}HKW2p-~RSJE)r<L_UPQ<oZgmFow`V<>qxem3k
zIS(@fq12R{P+DwWW#s5jJ|0*8sSLD_#3shh&g{Q|4{pcxn)0&70JVvz-~<^D4S#Fg
z-jSimJ~QPWF?hZ)`ZRDimEKmTj<xw)AU1CMw`;~#;K!z#f~ZneiWIOi&)TePy@IAT
z;j#R{5nPm8Q<`821sysbn%~WofYn5f^0?AI^}}(}_Kydwub7bo8Y6maPEU5{>Z0h;
z278Ri-wj#QV=O@Up~fRs3?wmUelIpUt>ys<)tPK88{zW`Ma?F>Whd)NiE?p8&YJ2B
zbR1OT(%=sH*aHRyaJvG<_tLk`gcPN*_6yEu+OI<Qgs1z>+#6Kv3~w%Q`)uB=_+)M^
z)$NB#&j?J1EM0WqzWjhV!9xPHO^vyMD-0!HHF3*}+3tD!*24Kumww8cPqAfBP)2v+
zrj|^j@6sjy8dAJmDvzc0r5$hC#jjasOEIU(KD;3iYDvXW(arGm0{6}5YQqSFvB#>)
zv1>=7p{<cix)N(>Z{c(0e0MuDs+t<sv9x=~90TF!wV-|f59-`|lr{=DeE1jayK&5b
z#;uc;*3{J0EJ4(>q>I~IcQ?1^6w0+OQUu#~$-{8kpMM)BXJ%$*XP+P3*n<)gzv$2b
zS3WbwA5CX!Sbs9QMpsN{&9BiqAY#w=p)4GgFp3}y0`>u3e@q(8ejohKgQf)&eCK3z
z9AKFF(r5$A!d`}cf(6>%-JF|kVdZY{#Jgyce*OMBGrV$C#%krPI@dZ3$UrAb=y6Rd
zWVJ4>vF%k7z-d}dY;_61c0A~N=PwW(`jctNzuND9IiL`P#A6m+?V*jOtBIJcfcsAV
zQJszQ-0P_pSuxjcc{5V>v-<4oiTNZTW24g%DW|Dm3K(2;YM)?G>(sJ7L>Efm)HMXA
z7U`d<IBFQRc|emYi}7x8=d-!is7dPq)yB<oLI}RA=(A<PRM}aAl4RtETW~LdwKls1
zqDA&?pE}DNy19v(YLnS^C&{{I(SI5Vf1f>_4qS^|CGtz|u<rdE$C?4Ok!KsDaX%jP
zwf;PCu&wgXOZ^r~*Ci|PI+1$@GE*Ht<lORIUpJV~l{aWrru>S5sB$-+d_(#Ax4w{*
z+V=GsPkfugVjcTc+(Y!a3nf+ZS~{0cwyV-e$wQ*ZD*+d>j(0&v6@pJ6rs2o`hT1p`
z`FqM981<OGekpr0tVLS<ZWl+B_prC?y^hHS)8MkvR)P#>z=4uurW2bVoYEnTE>AUb
z_!oM=V`?-s2ZDtsOd^ID*aa^n%8(i`ADz?dFn-B0zbz0^P#@Ev$9cuHe}i`Lc(+E8
zi9UE%_|7uzBXiu}dP-@2gn9+-*wrzEHj6O_MlB$(R8+6gG!d$lfO$p&?4brbBKX&%
zX!!J4|4Lv_KKG*Qhr$63>iEX;D;a^^Cj<Zct?KfWrc51PcI{Soy4y$J8ZXsCeFplX
z7oj`p;kqdG{esQi$)S%hjX$)(*cmBj@GwcqW~*)%^w-<>+8_CJpbeR2XLvU97eb=+
z4sFpAxcwP3Re72LiP`)J?N!z`!uXDiXM@;VvLw+CFQ&?qB3Bg(=nM91ylJOFulwl2
zrW6`G;l9a-HoyyU2Qa$;Qn((t_;z$J9Q`NA)$ZZEC2RKS7fCI^{ja_7)wNb4)^60d
zQTYKPL}g3_15`%^{$x|T>1DpsAi@%}nBkKAl(hP*?yqZ80ZYgT7IObVe0^@tLog@_
z2tXhrO8&Y3YRn1V;vu9Dhntnt`B+0dVL`RLwA5uaj$0xvkvsLW9&D)093lIJ%NfdJ
zShs-QXYh=$u=?YleHgr*sZA93lQt+oi9u22;;=Syv1<AH34Hu8<cS+ilYfOlsaC^C
zLnZaLdp3FuGm4wr&pk>USJ_Lkv5hDR-p{b?9t?HL)is`3<QJj3cAAWCk?L0uBZ?Nn
z-%yl7kujjqDdXSCJ|AKIxJ^f0aGKWp%4@?LwA&X)UM_%{YW8q2pawGx8LfWk`N}+;
zMy~KV#tu#WX9IreP}+xAiV}>BAvPb;^_P-kvBflh<c7-7;ah#IS5??10Lr7{ULF)I
z3IJMnDNpL1hWYwv0Dzy;Ow&d_aa8?2__ET{1G}+s_%N*X?V6hAyue*0jw~}|b}|-k
zbqi5Ti`G^d&X%{M6sN<ot?D-V33?(d9+cY`gQb0aq!1-hOtdq@0zF?fRdEou&`&2=
zzQbL8-1CLnOr%<%zHf!dc{BFH{O@>AgT?;UxJYc8x?}JYPgi)ZJe*+^i}hIBGC6=l
zApR=Kob}39&<##^G1E}gdZm@~l%Io1rFIMzV&goQwaxmQ!BWS1Z0kfzo3$JxBMG*;
z9sR7QgpH?X1gs#uRDpnNkM?tQd<0B}ozeDTA&gc>Bl-ZTf|VE<LLPlxGL?TG-QkEu
zYgUfG-B4Q(>TftP(?Z_V?`ZaEPQ>fDH;KtpG?zQ(+_$S!eC6~3!8T4cvRGB3a83E$
z^U0CIWHtig#AXv6WUO{qs;L0>ECBts@a2vsY-@icQAo6fee^athi%61(+o?z(@fFN
zghH5P*3DO9>0Fd~a%zdoj7Fp9@|>hN@2UKu?)$5cCBN!N&xhvTxccY@I!9iT#kFyS
z-^A*8S}T&<PCMwZ<Z8M&9BnP6RvdGgq=%{Mzf#j>Qm$vSb~!xhWQU*ZFS@#1)($Fa
zsDGKz3yr=EHE_JcmVbv}i@neVslAilyU~e;p6s3LXc0-3ex{{xc5AEgdZM5klx|a0
z{*;||DLtmYApyJ37b4pBb5kf=WNy9RTKy2T%}61Tl}1YCSyp`ZSV9J%3SRG3Lh@<K
zKl5>!oMMfWqBX8v01}$iJXVXiN|X+iI#U*i3~$CMDaE#xGmC~*m7~#+z^c;31zI>2
zvWpG9)TL+=94c#Hm#$?<PsAtd&@{N_Zwc=XU@x?lypEI&odTKtHHRBBr9au3iWA0V
zClQ1Wo}U^qub<xHJJyvgTy^Y~@;Fcxnt0xMmWi-g8Ol5Q#z-&yQs`;wU}hdlyQ8rc
zR(GBwn28Kdvy42qK5)>ZZS)Bhbp}BEsq+6xMj`!ZAxBt@htueoo0#~VFm-BJbq2hu
ztgQ53tu%G`4d2`}*eJnbhH^SN9J^BiE$M{Snrs43d6gYvL$9*gtw65)rNzi_+*kaP
znh!R|<W!+n57jfPJ9aS^71`MwyO;ltpWUdHoELdN`J;y=;mdW%FyotNUv@Pq*S6xe
zTE}Ror=k~0^WtHc?t5g!al(et7IL*|-17%C<%oMXc{)G^Q6ld2Ha1ovQUGtU?d<mQ
zq&iZ8u*I@BS~N5R6_Vw7SmH5V<o{B*X-)7g`O>rVUzOR`afB6;qrQA!2Y(AkL8V4=
z<qr-_gcl44y#JOApO@3+&L|x3+4tW$uXX;gv$La`LQIF7=HH)qc_SrqArx=!WIv|L
zlOE@ZoWuQ%e=~U0L~x}Aei{1Lae;ql5D-vaGb6)qU;o>u`ERZM=kZ@~Ckp`^32v1C
zx6}U=MHEx5hR8D{44P1_!cl?(Ubt{0BxvG93d0nCIo<jADJYEg-@?~=tz%?hAiUSe
zS00P*^Vfft8~u*$|6S;u;NW1N6XH&ycizdkH9S{WNv#Ve$ee=U9q6)j-G-5~;KA9Y
zWnZZFkgMf`m_f@;b&+K~z7V<r$>`y7w|ZFc*-%(NW>IaMUbIQCjCUhN`{QeV@1+`e
z9eKHBh=QIIchrTM$9}_EMn8vX_z{@m)9Y?jTsJ#m(k!3r#cL2G_@;73BY{0e?k0<^
z=C*c%uqZ>(#>I_GwZRS*iStjrcYlqXqQ@+>QSDsNokG!vWp8|CFd$kYbwVohz;iD@
z)DFhI-gn$I&7mJ^546FE^3+^yZ;iqMIE$S{9vXsTb=y1-{V;p~<{^UEMk81Jnrq5h
z-!yM{$r--ShqBmA#YOR{WU7<2w4_)k`Jdr4N&fK_t&{A?tF!Em8OOlct%NgyK4JEk
zC+|l&!16%+E>(8Ci!b-h$l3H+Yq2~CBEj2~nqG-GJ`Nx~wa3c4{`Mb*e3%mEXVKok
z46_V3fe;ntZ~Gq%D;a~-3Gmtud{#vRN2&V$(;jWw!JI%7j2%x%cOnX_|8dOk_rd;U
zKN$%BYaHdAQV-&j@Y|A_!qnG!&T=O(d?MNWxMjgy2Z7>URjE4NyXq7yqU}+nh}MmH
zwC=tgh8@+-*+MJ+ut~%D+?XfhLP+-wB_*V1_~ym2tQEAsGQik-qsM#K*5Wukxw^F=
zJcT2E#B}guep{Hy8Pqhkulj9|La>T73vjqdk?D7~-lWrFN{J$xXk_)00Ikpk!CHgl
z2c^@R>2p2qDtq($`E|)jEX|Cxt~b#u;*iB!@Iw?a`RDkIq=(MSs#sEp!dxlTp8kY<
zz{V|Z8X70{{N8X3%Wm!m&&AIbi@vGzO)bSy=Qnw>pWxIn=aho%8)F8$<iXW(V^z0E
zi=d4Nk3}lPu0F?bS@=i^<Z5FY2rVTm>HN?Q^*ep!x{y!@D$D20**nYQ-st-|^E59*
z$8y~LSu35KF$<3Zv#M!<d=^^oS<QCQ_#i+iqIW7h?<vr}+24Bb3%iTe*^{AiN7b1q
z=>CXQ*BG!eMYN1XbXaHY5KPb`B|0D{*mi39@E0r(PgQ;FXwPKr(H6k3-JZ7$EplJk
z9>f-7+tr8eTsY&Yy$?U&qTbV~sGpxxM+6Hf-perBJx8jx=1_Vp{?)t>o|rYEv&JV_
zd4~o&PIi44l3HcZt}tK6e`Mqq^k}9Ovu?Wlh@8B^sXIoerJb8LOhneP@<@B>ruz|U
zM4VRPF!n@ys9qs7c)Hlnq_D~Sz4WK}#OWtTqt<dka^_vTp0u^KH6CO;jSXpaP^!b$
zc#gPK)sD32bq5Lpc3>U(xGYnlS8h=O@qzT$<u*RoxAa7c3<A;nOxV1rIK9)8ft4Cv
ziK^20$q)(7X<pU{D+x9^;mCGoJxyjyGZe0<5K>RBVCN7z3R^C*V#_xR-wf2x|I)}v
zfuf~9sc_o{gVGMTx9DvHlZkHhDsNIgnL8lMa(BNEuGifi@!%C@ONd-lxgJ#zu?f)7
zU#&gSPfoIKpQ&IkbHQA$L&IA1p(&@S83VI03RiI0j_uU-7n?XfmK)g5Tk_vQbOboI
zlVP`{jPnP@p;>}|5aDsk|4E9p*0aW@q>VN~{S$Pq1nw1n5_WY)8FQ94(132xbtyK~
zu6M7lHPWvos%A1@|II*5E)#U`CwQ3I(wJJRDJcY-m#bxL|4R9-=i@D)G+=}0!Huf@
zCZBwqWe-jQl&OVNzuc{zqOxD>08S#73cS#k5qD#ds#?2Wuf8BxN`^%*f8qkE-F|>2
zi4-oDKPHM*B_}&9{T@dSp<AVAgW~mSw|!z}JMz&k9Scn;{P8MrhIP)M%m{s%En=0_
zuGvBY!8F9Dx9>E6;V%`N-7Fy7X5#cVHKJ@1mGccJhi<EF8~v2?h7+WNpWOBorm~5+
zBi&xnPU_g}v`D8>>h=EVkrHXO^Zt@{cFtF{p6%#;hf1q%&2?b2cVR-cyHqKbx965E
zs8(!wkPhpx#U)!|J$?oRos|(vwxSLGwR1*i=It)pVW%2gt+8H0F?*!5lo4ubo8@^?
zpjT)3T}z3yqMYBIb{2`uF^c3w4)Gq9gID;Cpt-#6Nkp{<8SRN=xxQy%`)jId3*m>O
zh{Pw><kVl-y;kGP?csJ7#|Jxat5CCNzA!Uc2>;1W>o!kGsb)ekd^{jcZKp1+lGkd=
ztn+ztXA`ESKovtVTt4uM<N((I3+=-X$m-EC_DV7Dk_g0pr{dK0-Y$2gIlUTQ{>9<t
z#4-4N%fWjFwZS$m%4y?XHuHC!;V^~&w35adNg)GUj59;DffoG)_f!#eaE~iFW%vBA
zubrvE_bLdTyU5JQ*yx=87ZPg|E0|DO#ItL7@b|A%q>hJ;T-D}(^~ER-d+r+JaYpcE
z97;w&hpW}^IseIE?Aj=c>OS?C($ka59ERkB`g1d<h(=F6jMqXvfPld8&AV2b6Lmu_
ziCp5_%=4w{8+&8-!o@MrvKs4)vTEjB4?<l_>qJvbU$jdOPt47S3stQu11Wxo%Fxi&
zN(ub3A03#<631X|2Jvu-Q!dBjp0T06+>t$Fdhl!E+Aae2-8V3jI2_zveIe|Oh3qNQ
z4SCN_{LqMpvn<ILvUYbh^kK!%D#dOno09xH1L9XqbK$-d)tD%bR6WaA=f)v?OVs*~
z!Zx=vTqI(NnBx9a%pwJ8McEN67^MVKGfL_XmZx#vJT_U(Xm8h(Zyrw_gW6B)->fbu
zfdq*mxe2YttK%)e%)>Jioe|auc}b_`>e8l*H8ZTbDYoF(2Dmd>Vp6E;9y^fe_EnI+
zx)6g1F$n@voSAJ#8y$eDo5fC2&+EZQWi72AH#Pd<gU3kj7Hd@D@o3Ue^<?*tjvf(=
zhyC4d`(Q4a!H|lFlgp%sO9;|i$w8{~s;ZQ8=e0m?xZvveJg3QdCA+^z_*3Xhys^Dy
zCepk`S&a4-ovTnxbG=!2Bvrq2rOGq-mJq9{Y$mL5Km62A8nU-yW|Yq)B37biM@7^1
zVE6r33`^UciOzG-r08CdzuqzS*i30yF-faDL$~bho9DuCz>MKa(7aqT6;g>;r!TRP
znUZY7K`~tw5TLs*ec`SMds@823$ve*h1xuL4pJyNBhz}ed(MWM$GDO(E0%tMOHl^Y
zt$VCr{JVnh*K>*byqWflZ=wm<x)8N1DyGE4vI{{9&Y8zNCjub78N-4!Tvg`|M18@O
z?Ac0f6@)1s{la-tPNcf*G)aFU8x4%d@>b>qQ0v6#Ol;o&M3&!07Esa}1Gf>_rVW`*
zml_Q@=vH6@luBr9D*X!O2db)ehlJWcN^7?`%qZkNQ(jCV0045b%(1^D6)>h0kFnqG
zTdNK~ZkIC&PP?6K+j1BbDN*H#DDvKC<q}J$yD<%#3|V;16$a(Km_}zSSl_FBdGxlg
z_wl{|M|6(zR~ym_Vb6{}k#5JA)eB|0yZp7~LJxOF{?J1q+j5>5fx)M>bv(whW5&m>
zQh_4<DdT;U0$5<NRwS2g=GBPsa4NJ)ab+{~jz@!69BbZdHcOtcA98<93dt$K2K@4~
zf@~j*fvb&2ry+FtysE1uZqvgXu}d|a?;R!2c-mu(?$REuT0%rfz#5a{$CEB7^&5Ey
z)EsWGGD{^F>8UxDzDj+nZrTz^!lHMNzaIMZ$waEr&k)SS`+14&zk1skBxRR45H<@k
zi4w@KT_XXp4G7`ueDW{Eme5pFvP*JbHV?=ikUQm$!gn|}qlKO7_Tf>OBrMtGImf-X
z^RAL8u*5|-uh6_GAxV-it$-;`iqEl>@dR@}v(@${R3a*1Luz#-CHT{UJ9-#?2<2~$
zUN)oIOj{O-g|lHNI64k*G2e~hlRPA%(oZ_QWqY!Q7Uzw9FYi>n15gDpEGZlett!cJ
z`9}Gg*}7FbTuHIVS}@Pd!eyZHU)$eDrxE;1+ZX)?bs}wt*|*{$L!3$rJ$PHV<RgiN
zw4?{Jb=<~U;95dDr^Zy4m<hew(I=2rTD``3kzu=Cyx`x7P73RQZ_0KsL5}Vbv6oZ*
zO%dC#5ngH|qBaXYsiXd*9c*u{$dHjm2>fi>XFAvF^Z_CNv62oC@F4L2H+0;3DNwI2
U3B{86@K0wM08pY*?0evU0bicoRsaA1

literal 0
HcmV?d00001

diff --git a/doc/install/README-DE b/doc/install/README-DE
index c7ece3891f3..047e1915d18 100644
--- a/doc/install/README-DE
+++ b/doc/install/README-DE
@@ -1,33 +1,45 @@
 README (deutsch / german / allemand)
---------------------------------
+------------------------------------
 
 
---------------------------------
+------------------------------------
 Download / Herunterladen
---------------------------------
+------------------------------------
 
 * Dolibarr ERP/CRM kann man über die offizielle Dolibarr Website
+
     https://www.dolibarr.org/downloads 
-  oder direkt von Sourceforge
+    
+  oder direkt bei Sourceforge
+  
     https://sourceforge.net/projects/dolibarr/files/
+  
   herunterladen.
   
-  
-  
-* Die meisten externen Module/Themens sind über den DoliStore verfügbar:
-    https://www.dolistore.com/de/
 
 
---------------------------------
-Installation
---------------------------------
 
-* Für eine kurze Einleitung, schau auf die README Datei im Hauptverzeichnis.
+------------------------------------
+Installation / Hilfe
+------------------------------------
+
+* Für eine kurze Einleitung schau in die README Datei im Hauptverzeichnis.
 
 * Umfangreiche Dokumentationen sind im Dolibarr Wiki zu finden:
     https://wiki.dolibarr.org/index.php/Hauptseite 
     
 * eine Deutsche Community bietet der Dolibarr e.V. unter 
     https://www.dolibarr.de/ 
+
+
+
+
+------------------------------------
+Zusatzmodule
+------------------------------------
+
+* Die meisten externen Module/Themen sind über den offiziellen DoliStore verfügbar: 
+
+    https://www.dolistore.com/de/
     
-    
+
diff --git a/doc/install/README-FR b/doc/install/README-FR
index 2cee29cf2df..5872ec0e3d1 100644
--- a/doc/install/README-FR
+++ b/doc/install/README-FR
@@ -6,13 +6,14 @@ README (french)
 Téléchargement
 --------------------------------
 
-* Dolibarr ERP/CRM can be downloaded at sourceforge:
-http://sourceforge.net/projects/dolibarr/files
-or from Dolibarr official web site:
+* Dolibarr ERP/CRM peut être téléchargé sur sourceforge:
+https://sourceforge.net/projects/dolibarr/files
+
+ou sur le site officiel de Dolibarr:
 https://www.dolibarr.org
 
-* Most external modules are only available on DoliStore:
-https://www.dolistore.org
+* La plupart des modules externes ne sont disponibles que sur le DoliStore officiel:
+https://www.dolistore.com
 
 
 --------------------------------
@@ -24,4 +25,4 @@ README-FR à la racine.
 
 * Une documentation utilisateur francophone plus consistante est disponible en
 ligne sur le wiki de Dolibarr à l'adresse:
-https://wiki.dolibarr.org
+https://wiki.dolibarr.org/index.php/Accueil
diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 0ac79bcc3aa..47a984cd467 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -65,12 +65,12 @@ if (!$sortfield) $sortfield = "aa.account_number";
 if (!$sortorder) $sortorder = "ASC";
 
 $arrayfields = array(
-    'aa.account_number'=>array('label'=>$langs->trans("AccountNumber"), 'checked'=>1),
-    'aa.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
+	'aa.account_number'=>array('label'=>$langs->trans("AccountNumber"), 'checked'=>1),
+	'aa.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
 	'aa.labelshort'=>array('label'=>$langs->trans("LabelToShow"), 'checked'=>1),
 	'aa.account_parent'=>array('label'=>$langs->trans("Accountparent"), 'checked'=>1),
-    'aa.pcg_type'=>array('label'=>$langs->trans("Pcgtype"), 'checked'=>1, 'help'=>'PcgtypeDesc'),
-    'aa.reconcilable'=>array('label'=>$langs->trans("Reconcilable"), 'checked'=>1),
+	'aa.pcg_type'=>array('label'=>$langs->trans("Pcgtype"), 'checked'=>1, 'help'=>'PcgtypeDesc'),
+	'aa.reconcilable'=>array('label'=>$langs->trans("Reconcilable"), 'checked'=>1),
 	'aa.active'=>array('label'=>$langs->trans("Activated"), 'checked'=>1)
 );
 
@@ -93,24 +93,24 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    if (!empty($cancel)) $action = '';
+	if (!empty($cancel)) $action = '';
 
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-    {
-    	$search_account = "";
-    	$search_label = "";
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
+	{
+		$search_account = "";
+		$search_label = "";
 		$search_labelshort = "";
 		$search_accountparent = "";
-    	$search_pcgtype = "";
+		$search_pcgtype = "";
 		$search_array_options = array();
-    }
-    if ((GETPOST('valid_change_chart', 'alpha') && GETPOST('chartofaccounts', 'int') > 0)	// explicit click on button 'Change and load' with js on
-    	|| (GETPOST('chartofaccounts', 'int') > 0 && GETPOST('chartofaccounts', 'int') != $conf->global->CHARTOFACCOUNTS))	// a submit of form is done and chartofaccounts combo has been modified
-    {
-        if ($chartofaccounts > 0)
-        {
+	}
+	if ((GETPOST('valid_change_chart', 'alpha') && GETPOST('chartofaccounts', 'int') > 0)	// explicit click on button 'Change and load' with js on
+		|| (GETPOST('chartofaccounts', 'int') > 0 && GETPOST('chartofaccounts', 'int') != $conf->global->CHARTOFACCOUNTS))	// a submit of form is done and chartofaccounts combo has been modified
+	{
+		if ($chartofaccounts > 0)
+		{
 			// Get language code for this $chartofaccounts
 			$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_country as c, '.MAIN_DB_PREFIX.'accounting_system as a';
 			$sql .= ' WHERE c.rowid = a.fk_country AND a.rowid = '.(int) $chartofaccounts;
@@ -147,34 +147,34 @@ if (empty($reshook))
 				}
 			}
 
-            if (!dolibarr_set_const($db, 'CHARTOFACCOUNTS', $chartofaccounts, 'chaine', 0, '', $conf->entity)) {
-                $error++;
-            }
-        } else {
-            $error++;
-        }
-    }
+			if (!dolibarr_set_const($db, 'CHARTOFACCOUNTS', $chartofaccounts, 'chaine', 0, '', $conf->entity)) {
+				$error++;
+			}
+		} else {
+			$error++;
+		}
+	}
 
-    if ($action == 'disable') {
-    	if ($accounting->fetch($id)) {
-            $mode = GETPOST('mode', 'int');
-    		$result = $accounting->accountDeactivate($id, $mode);
-    	}
+	if ($action == 'disable') {
+		if ($accounting->fetch($id)) {
+			$mode = GETPOST('mode', 'int');
+			$result = $accounting->accountDeactivate($id, $mode);
+		}
 
-    	$action = 'update';
-    	if ($result < 0) {
-    		setEventMessages($accounting->error, $accounting->errors, 'errors');
-    	}
-    } elseif ($action == 'enable') {
-    	if ($accounting->fetch($id)) {
-            $mode = GETPOST('mode', 'int');
-    		$result = $accounting->account_activate($id, $mode);
-    	}
-    	$action = 'update';
-    	if ($result < 0) {
-    		setEventMessages($accounting->error, $accounting->errors, 'errors');
-    	}
-    }
+		$action = 'update';
+		if ($result < 0) {
+			setEventMessages($accounting->error, $accounting->errors, 'errors');
+		}
+	} elseif ($action == 'enable') {
+		if ($accounting->fetch($id)) {
+			$mode = GETPOST('mode', 'int');
+			$result = $accounting->account_activate($id, $mode);
+		}
+		$action = 'update';
+		if ($result < 0) {
+			setEventMessages($accounting->error, $accounting->errors, 'errors');
+		}
+	}
 }
 
 
@@ -273,9 +273,9 @@ if ($resql)
 	if ($search_pcgtype) $param .= '&search_pcgtype='.urlencode($search_pcgtype);
 	if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
 
-    if (!empty($conf->use_javascript_ajax))
-    {
-	    print '<!-- Add javascript to reload page when we click "Change plan" -->
+	if (!empty($conf->use_javascript_ajax))
+	{
+		print '<!-- Add javascript to reload page when we click "Change plan" -->
 			<script type="text/javascript">
 			$(document).ready(function () {
 		    	$("#change_chart").on("click", function (e) {
@@ -285,7 +285,7 @@ if ($resql)
 			    });
 			});
 	    	</script>';
-    }
+	}
 
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -294,64 +294,62 @@ if ($resql)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-    $newcardbutton .= dolGetButtonTitle($langs->trans("New"), $langs->trans("Addanaccount"), 'fa fa-plus-circle', './card.php?action=create');
+	$newcardbutton .= dolGetButtonTitle($langs->trans("New"), $langs->trans("Addanaccount"), 'fa fa-plus-circle', './card.php?action=create');
 
-
-    print_barre_liste($langs->trans('ListAccounts'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit);
+	print_barre_liste($langs->trans('ListAccounts'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 	// Box to select active chart of account
-    print $langs->trans("Selectchartofaccounts")." : ";
-    print '<select class="flat" name="chartofaccounts" id="chartofaccounts">';
-    $sql = "SELECT a.rowid, a.pcg_version, a.label, a.active, c.code as country_code";
-    $sql .= " FROM ".MAIN_DB_PREFIX."accounting_system as a";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON a.fk_country = c.rowid AND c.active = 1";
-    $sql .= " WHERE a.active = 1";
-    dol_syslog('accountancy/admin/account.php $sql='.$sql);
-    print $sql;
-    $resqlchart = $db->query($sql);
-    if ($resqlchart) {
-        $numbis = $db->num_rows($resqlchart);
-        $i = 0;
-        while ($i < $numbis) {
-            $obj = $db->fetch_object($resqlchart);
+	print $langs->trans("Selectchartofaccounts")." : ";
+	print '<select class="flat" name="chartofaccounts" id="chartofaccounts">';
+	$sql = "SELECT a.rowid, a.pcg_version, a.label, a.active, c.code as country_code";
+	$sql .= " FROM ".MAIN_DB_PREFIX."accounting_system as a";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON a.fk_country = c.rowid AND c.active = 1";
+	$sql .= " WHERE a.active = 1";
+	dol_syslog('accountancy/admin/account.php $sql='.$sql);
+	print $sql;
+	$resqlchart = $db->query($sql);
+	if ($resqlchart) {
+		$numbis = $db->num_rows($resqlchart);
+		$i = 0;
+		while ($i < $numbis) {
+			$obj = $db->fetch_object($resqlchart);
 
-            print '<option value="'.$obj->rowid.'"';
-            print ($pcgver == $obj->rowid) ? ' selected' : '';
-            print '>'.$obj->pcg_version.' - '.$obj->label.' - ('.$obj->country_code.')</option>';
+			print '<option value="'.$obj->rowid.'"';
+			print ($pcgver == $obj->rowid) ? ' selected' : '';
+			print '>'.$obj->pcg_version.' - '.$obj->label.' - ('.$obj->country_code.')</option>';
 
-            $i++;
-        }
-    } else dol_print_error($db);
-    print "</select>";
-    print ajax_combobox("chartofaccounts");
-    print '<input type="'.(empty($conf->use_javascript_ajax) ? 'submit' : 'button').'" class="button" name="change_chart" id="change_chart" value="'.dol_escape_htmltag($langs->trans("ChangeAndLoad")).'">';
+			$i++;
+		}
+	} else dol_print_error($db);
+	print "</select>";
+	print ajax_combobox("chartofaccounts");
+	print '<input type="'.(empty($conf->use_javascript_ajax) ? 'submit' : 'button').'" class="button" name="change_chart" id="change_chart" value="'.dol_escape_htmltag($langs->trans("ChangeAndLoad")).'">';
 
-    print '<br>';
+	print '<br>';
 	print '<br>';
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-    $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
-    $moreforfilter = '';
-    $massactionbutton = '';
+	$moreforfilter = '';
+	$massactionbutton = '';
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	// Line for search fields
 	print '<tr class="liste_titre_filter">';
-	if (!empty($arrayfields['aa.account_number']['checked']))	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_account" value="'.$search_account.'"></td>';
-	if (!empty($arrayfields['aa.label']['checked']))			print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_label" value="'.$search_label.'"></td>';
-	if (!empty($arrayfields['aa.labelshort']['checked']))		print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_labelshort" value="'.$search_labelshort.'"></td>';
+	if (!empty($arrayfields['aa.account_number']['checked']))	print '<td class="liste_titre"><input type="text" class="flat width100" name="search_account" value="'.$search_account.'"></td>';
+	if (!empty($arrayfields['aa.label']['checked']))			print '<td class="liste_titre"><input type="text" class="flat width150" name="search_label" value="'.$search_label.'"></td>';
+	if (!empty($arrayfields['aa.labelshort']['checked']))		print '<td class="liste_titre"><input type="text" class="flat width100" name="search_labelshort" value="'.$search_labelshort.'"></td>';
 	if (!empty($arrayfields['aa.account_parent']['checked'])) {
 		print '<td class="liste_titre">';
 		print $formaccounting->select_account($search_accountparent, 'search_accountparent', 2);
 		print '</td>';
 	}
-	if (!empty($arrayfields['aa.pcg_type']['checked']))		    print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_pcgtype" value="'.$search_pcgtype.'"></td>';
+	if (!empty($arrayfields['aa.pcg_type']['checked']))		    print '<td class="liste_titre"><input type="text" class="flat width100" name="search_pcgtype" value="'.$search_pcgtype.'"></td>';
 	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { if (!empty($arrayfields['aa.reconcilable']['checked']))   print '<td class="liste_titre">&nbsp;</td>'; }
 	if (!empty($arrayfields['aa.active']['checked']))			print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre maxwidthsearch">';
@@ -360,7 +358,7 @@ if ($resql)
 	print '</td>';
 	print '</tr>';
 
-    print '<tr class="liste_titre">';
+	print '<tr class="liste_titre">';
 	if (!empty($arrayfields['aa.account_number']['checked']))	print_liste_field_titre($arrayfields['aa.account_number']['label'], $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['aa.label']['checked']))			print_liste_field_titre($arrayfields['aa.label']['label'], $_SERVER["PHP_SELF"], "aa.label", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['aa.labelshort']['checked']))		print_liste_field_titre($arrayfields['aa.labelshort']['label'], $_SERVER["PHP_SELF"], "aa.labelshort", "", $param, '', $sortfield, $sortorder);
@@ -416,18 +414,24 @@ if ($resql)
 		// Account parent
 		if (!empty($arrayfields['aa.account_parent']['checked']))
 		{
-			if (!empty($obj->account_parent))
+			// Note: obj->account_parent is a foreign key to a rowid. It is field in child table and obj->rowid2 is same, but in parent table.
+			// So for orphans, obj->account_parent is set but not obj->rowid2
+			if (!empty($obj->account_parent) && !empty($obj->rowid2))
 			{
+				print "<td>";
+				print '<!-- obj->account_parent = '.$obj->account_parent.' obj->rowid2 = '.$obj->rowid2.' -->';
 				$accountparent->id = $obj->rowid2;
 				$accountparent->label = $obj->label2;
-				$accountparent->account_number = $obj->account_number2;
-
-				print "<td>";
+				$accountparent->account_number = $obj->account_number2; // Sotre an account number for output
 				print $accountparent->getNomUrl(1);
 				print "</td>\n";
 				if (!$i) $totalarray['nbfield']++;
 			} else {
-				print '<td>&nbsp;</td>';
+				print '<td>';
+				if (!empty($obj->account_parent)) {
+					print '<!-- Bad value for obj->account_parent = '.$obj->account_parent.': is a rowid that does not exists -->';
+				}
+				print '</td>';
 				if (!$i) $totalarray['nbfield']++;
 			}
 		}
@@ -481,11 +485,11 @@ if ($resql)
 		// Action
 		print '<td class="center">';
 		if ($user->rights->accounting->chartofaccount) {
-			print '<a class="editfielda" href="./card.php?action=update&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?chartofaccounts='.$object->id).'">';
+			print '<a class="editfielda" href="./card.php?action=update&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?'.$param).'">';
 			print img_edit();
 			print '</a>';
 			print '&nbsp;';
-			print '<a class="marginleftonly" href="./card.php?action=delete&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?chartofaccounts='.$object->id).'">';
+			print '<a class="marginleftonly" href="./card.php?action=delete&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?'.$param).'">';
 			print img_delete();
 			print '</a>';
 		}
diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index d3bd17d95a5..6d621a7e101 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -187,7 +187,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 	    	$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br>';
 	    }*/
 	}
-	if (isset($_POST["country"]) && ($_POST["country"] == '0') && ($id != 2))
+	if (GETPOSTISSET("country") && (GETPOST("country") == '0') && ($id != 2))
 	{
 		$ok = 0;
 		setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities("Country")), null, 'errors');
@@ -472,13 +472,13 @@ if ($id)
 
 			if ($valuetoshow != '') {
 				print '<td class="'.$class.'">';
-                if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) {
-                    print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
-                } elseif (!empty($tabhelp[$id][$value])) {
-                    print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
-                } else {
-                    print $valuetoshow;
-                }
+				if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) {
+					print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+				} elseif (!empty($tabhelp[$id][$value])) {
+					print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
+				} else {
+					print $valuetoshow;
+				}
 				print '</td>';
 			}
 			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') $alabelisused = 1;
@@ -609,7 +609,7 @@ if ($id)
 					if (empty($reshook)) fieldListAccountModel($fieldlist, $obj, $tabname[$id], 'edit');
 
 					print '<td colspan="3" class="right"><a name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
-					print '&nbsp;<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
+					print '&nbsp;<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
 				} else {
 				  	$tmpaction = 'view';
 					$parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index 29ed90bb7be..d1cee5ff59d 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -108,16 +108,16 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 			setEventMessages($object->error, $object->errors, 'errors');
 		} elseif ($res < 0)
 		{
-		    $error++;
-		    setEventMessages($object->error, $object->errors, 'errors');
-		    $action = "create";
+			$error++;
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action = "create";
 		}
 		if (!$error)
 		{
-		    setEventMessages("RecordCreatedSuccessfully", null, 'mesgs');
-		    $urltogo = $backtopage ? $backtopage : dol_buildpath('/accountancy/admin/account.php', 1);
-		    header("Location: ".$urltogo);
-		    exit;
+			setEventMessages("RecordCreatedSuccessfully", null, 'mesgs');
+			$urltogo = $backtopage ? $backtopage : dol_buildpath('/accountancy/admin/account.php', 1);
+			header("Location: ".$urltogo);
+			exit;
 		}
 	}
 } elseif ($action == 'edit' && $user->rights->accounting->chartofaccount) {
@@ -158,15 +158,15 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 		$result = $object->update($user);
 
 		if ($result > 0) {
-		    $urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"]."?id=".$id);
-		    header("Location: ".$urltogo);
+			$urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"]."?id=".$id);
+			header("Location: ".$urltogo);
 			exit();
 		} else {
 			$mesg = $object->error;
 		}
 	} else {
-	    $urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"]."?id=".$id);
-	    header("Location: ".$urltogo);
+		$urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"]."?id=".$id);
+		header("Location: ".$urltogo);
 		exit();
 	}
 } elseif ($action == 'delete' && $user->rights->accounting->chartofaccount) {
@@ -210,7 +210,7 @@ if ($action == 'create') {
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">';
 
@@ -247,17 +247,17 @@ if ($action == 'create') {
 	// Chart of accounts type
 	print '<tr><td>'.$langs->trans("Pcgtype").'</td>';
 	print '<td>';
-	print '<input type="text" name="pcg_type" value="'.dol_escape_htmltag(isset($_POST['pcg_type']) ?GETPOST('pcg_type', 'alpha') : $object->pcg_type).'">';
+	print '<input type="text" name="pcg_type" value="'.dol_escape_htmltag(GETPOSTISSET('pcg_type') ? GETPOST('pcg_type', 'alpha') : $object->pcg_type).'">';
 	print '</td></tr>';
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
-	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
+	print '<input class="button button-save" type="submit" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
@@ -272,7 +272,7 @@ if ($action == 'create') {
 		// Edit mode
 		if ($action == 'update')
 		{
-			dol_fiche_head($head, 'card', $langs->trans('AccountAccounting'), 0, 'billr');
+			print dol_get_fiche_head($head, 'card', $langs->trans('AccountAccounting'), 0, 'billr');
 
 			print '<form name="update" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
 			print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -309,17 +309,17 @@ if ($action == 'create') {
 			// Chart of accounts type
 			print '<tr><td>'.$langs->trans("Pcgtype").'</td>';
 			print '<td>';
-			print '<input type="text" name="pcg_type" value="'.dol_escape_htmltag(isset($_POST['pcg_type']) ?GETPOST('pcg_type', 'alpha') : $object->pcg_type).'">';
+			print '<input type="text" name="pcg_type" value="'.dol_escape_htmltag(GETPOSTISSET('pcg_type') ? GETPOST('pcg_type', 'alpha') : $object->pcg_type).'">';
 			print '</td></tr>';
 
 			print '</table>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
-			print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+			print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-			print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
+			print '<input type="submit" name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'">';
 			print '</div>';
 
 			print '</form>';
@@ -327,7 +327,7 @@ if ($action == 'create') {
 			// View mode
 			$linkback = '<a href="'.DOL_URL_ROOT.'/accountancy/admin/account.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-			dol_fiche_head($head, 'card', $langs->trans('AccountAccounting'), -1, 'billr');
+			print dol_get_fiche_head($head, 'card', $langs->trans('AccountAccounting'), -1, 'billr');
 
 			dol_banner_tab($object, 'ref', $linkback, 1, 'account_number', 'ref');
 
@@ -364,7 +364,7 @@ if ($action == 'create') {
 
 			print '</div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			/*
 			 * Actions buttons
diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index d605105f8e9..eefe62a47a4 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -102,7 +102,7 @@ print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="display">';
 
-dol_fiche_head();
+print dol_get_fiche_head();
 
 print '<table class="border centpercent">';
 
@@ -146,7 +146,7 @@ if (!empty($cat_id))
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '</form>';
 
@@ -172,7 +172,7 @@ if ($action == 'display' || $action == 'delete') {
 				print '<td class="right">';
 				print '<a href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&account_category='.$cat_id.'&cptid='.$cpt->rowid.'">';
 				print $langs->trans("DeleteFromCat");
-				print img_picto($langs->trans("DeleteFromCat"), 'unlink');
+				print img_picto($langs->trans("DeleteFromCat"), 'unlink', 'class="paddingleft"');
 				print "</a>";
 				print "</td>";
 				print "</tr>\n";
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 9469a1e64f1..53dfb1cd5f9 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -135,249 +135,249 @@ $sourceList = array();
 
 if (GETPOST('button_removefilter', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter_x', 'alpha'))
 {
-    $search_country_id = '';
+	$search_country_id = '';
 }
 
 // Actions add or modify an entry into a dictionary
 if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 {
-    $listfield = explode(',', str_replace(' ', '', $tabfield[$id]));
-    $listfieldinsert = explode(',', $tabfieldinsert[$id]);
-    $listfieldmodify = explode(',', $tabfieldinsert[$id]);
-    $listfieldvalue = explode(',', $tabfieldvalue[$id]);
+	$listfield = explode(',', str_replace(' ', '', $tabfield[$id]));
+	$listfieldinsert = explode(',', $tabfieldinsert[$id]);
+	$listfieldmodify = explode(',', $tabfieldinsert[$id]);
+	$listfieldvalue = explode(',', $tabfieldvalue[$id]);
 
-    // Check that all fields are filled
-    $ok = 1;
-    foreach ($listfield as $f => $value)
-    {
+	// Check that all fields are filled
+	$ok = 1;
+	foreach ($listfield as $f => $value)
+	{
 		if ($value == 'formula' && empty($_POST['formula'])) continue;
 		if ($value == 'range_account' && empty($_POST['range_account'])) continue;
 		if ($value == 'country' || $value == 'country_id') continue;
 		if (!GETPOSTISSET($value) || GETPOST($value) == '')
-        {
-            $ok = 0;
-            $fieldnamekey = $listfield[$f];
-            // We take translate key of field
-            if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey = 'Label';
-            if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
-            if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
-            if ($fieldnamekey == 'type') $fieldnamekey = 'Type';
-            if ($fieldnamekey == 'position') $fieldnamekey = 'Position';
+		{
+			$ok = 0;
+			$fieldnamekey = $listfield[$f];
+			// We take translate key of field
+			if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey = 'Label';
+			if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
+			if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
+			if ($fieldnamekey == 'type') $fieldnamekey = 'Type';
+			if ($fieldnamekey == 'position') $fieldnamekey = 'Position';
 			if ($fieldnamekey == 'category_type') $fieldnamekey = 'Calculated';
 
-            setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
-        }
-    }
-    if (isset($_POST["code"]))
-    {
-        if ($_POST["code"] == '0')
-    	{
-        	$ok = 0;
-    		setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
-        }
-    }
-    if (!is_numeric(GETPOST('position', 'alpha')))
-    {
-    	$langs->loadLangs(array("errors"));
+			setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
+		}
+	}
+	if (GETPOSTISSET("code"))
+	{
+		if ($_POST["code"] == '0')
+		{
+			$ok = 0;
+			setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
+		}
+	}
+	if (!is_numeric(GETPOST('position', 'alpha')))
+	{
+		$langs->loadLangs(array("errors"));
    		$ok = 0;
    		setEventMessages($langs->transnoentities('ErrorFieldMustBeANumeric', $langs->transnoentities("Position")), null, 'errors');
-    }
+	}
 
 	// Clean some parameters
 	if ($_POST["accountancy_code"] <= 0) $_POST["accountancy_code"] = ''; // If empty, we force to null
 	if ($_POST["accountancy_code_sell"] <= 0) $_POST["accountancy_code_sell"] = ''; // If empty, we force to null
 	if ($_POST["accountancy_code_buy"] <= 0) $_POST["accountancy_code_buy"] = ''; // If empty, we force to null
 
-    // Si verif ok et action add, on ajoute la ligne
-    if ($ok && GETPOST('actionadd', 'alpha'))
-    {
-        if ($tabrowid[$id])
-        {
-            // Recupere id libre pour insertion
-            $newid = 0;
-            $sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
-            $result = $db->query($sql);
-            if ($result)
-            {
-                $obj = $db->fetch_object($result);
-                $newid = ($obj->newid + 1);
-            } else {
-                dol_print_error($db);
-            }
-        }
+	// Si verif ok et action add, on ajoute la ligne
+	if ($ok && GETPOST('actionadd', 'alpha'))
+	{
+		if ($tabrowid[$id])
+		{
+			// Recupere id libre pour insertion
+			$newid = 0;
+			$sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
+			$result = $db->query($sql);
+			if ($result)
+			{
+				$obj = $db->fetch_object($result);
+				$newid = ($obj->newid + 1);
+			} else {
+				dol_print_error($db);
+			}
+		}
 
-        // Add new entry
-        $sql = "INSERT INTO ".$tabname[$id]." (";
-        // List of fields
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) $sql .= $tabrowid[$id].",";
-        $sql .= $tabfieldinsert[$id];
-        $sql .= ",active)";
-        $sql .= " VALUES(";
+		// Add new entry
+		$sql = "INSERT INTO ".$tabname[$id]." (";
+		// List of fields
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) $sql .= $tabrowid[$id].",";
+		$sql .= $tabfieldinsert[$id];
+		$sql .= ",active)";
+		$sql .= " VALUES(";
 
-        // List of values
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) $sql .= $newid.",";
-        $i = 0;
-        foreach ($listfieldinsert as $f => $value)
-        {
-            if ($value == 'entity') {
-            	$_POST[$listfieldvalue[$i]] = $conf->entity;
-            }
-            if ($i) $sql .= ",";
-            if ($_POST[$listfieldvalue[$i]] == '' && !$listfieldvalue[$i] == 'formula') $sql .= "null"; // For vat, we want/accept code = ''
-            else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
-            $i++;
-        }
-        $sql .= ",1)";
+		// List of values
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) $sql .= $newid.",";
+		$i = 0;
+		foreach ($listfieldinsert as $f => $value)
+		{
+			if ($value == 'entity') {
+				$_POST[$listfieldvalue[$i]] = $conf->entity;
+			}
+			if ($i) $sql .= ",";
+			if ($_POST[$listfieldvalue[$i]] == '' && !$listfieldvalue[$i] == 'formula') $sql .= "null"; // For vat, we want/accept code = ''
+			else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+			$i++;
+		}
+		$sql .= ",1)";
 
-        dol_syslog("actionadd", LOG_DEBUG);
-        $result = $db->query($sql);
-        if ($result)	// Add is ok
-        {
-            setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
-        	$_POST = array('id'=>$id); // Clean $_POST array, we keep only
-        } else {
-            if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-                setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
-            } else {
-                dol_print_error($db);
-            }
-        }
-    }
+		dol_syslog("actionadd", LOG_DEBUG);
+		$result = $db->query($sql);
+		if ($result)	// Add is ok
+		{
+			setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
+			$_POST = array('id'=>$id); // Clean $_POST array, we keep only
+		} else {
+			if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
+			} else {
+				dol_print_error($db);
+			}
+		}
+	}
 
-    // Si verif ok et action modify, on modifie la ligne
-    if ($ok && GETPOST('actionmodify', 'alpha'))
-    {
-        if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	// Si verif ok et action modify, on modifie la ligne
+	if ($ok && GETPOST('actionmodify', 'alpha'))
+	{
+		if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-        // Modify entry
-        $sql = "UPDATE ".$tabname[$id]." SET ";
-        // Modifie valeur des champs
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify))
-        {
-            $sql .= $tabrowid[$id]."=";
-            $sql .= "'".$db->escape($rowid)."', ";
-        }
-        $i = 0;
-        foreach ($listfieldmodify as $field)
-        {
-            if ($field == 'fk_country' && $_POST['country'] > 0) {
-            	$_POST[$listfieldvalue[$i]] = $_POST['country'];
-            } elseif ($field == 'entity') {
-            	$_POST[$listfieldvalue[$i]] = $conf->entity;
-            }
-            if ($i) $sql .= ",";
-            $sql .= $field."=";
-            if ($_POST[$listfieldvalue[$i]] == '' && !$listfieldvalue[$i] == 'range_account') $sql .= "null"; // For range_account, we want/accept code = ''
-            else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
-            $i++;
-        }
-        $sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
+		// Modify entry
+		$sql = "UPDATE ".$tabname[$id]." SET ";
+		// Modifie valeur des champs
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify))
+		{
+			$sql .= $tabrowid[$id]."=";
+			$sql .= "'".$db->escape($rowid)."', ";
+		}
+		$i = 0;
+		foreach ($listfieldmodify as $field)
+		{
+			if ($field == 'fk_country' && $_POST['country'] > 0) {
+				$_POST[$listfieldvalue[$i]] = $_POST['country'];
+			} elseif ($field == 'entity') {
+				$_POST[$listfieldvalue[$i]] = $conf->entity;
+			}
+			if ($i) $sql .= ",";
+			$sql .= $field."=";
+			if ($_POST[$listfieldvalue[$i]] == '' && !$listfieldvalue[$i] == 'range_account') $sql .= "null"; // For range_account, we want/accept code = ''
+			else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+			$i++;
+		}
+		$sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
 
-        dol_syslog("actionmodify", LOG_DEBUG);
-        //print $sql;
-        $resql = $db->query($sql);
-        if (!$resql)
-        {
-            setEventMessages($db->error(), null, 'errors');
-        }
-    }
-    //$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
+		dol_syslog("actionmodify", LOG_DEBUG);
+		//print $sql;
+		$resql = $db->query($sql);
+		if (!$resql)
+		{
+			setEventMessages($db->error(), null, 'errors');
+		}
+	}
+	//$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
 }
 
 if (GETPOST('actioncancel', 'alpha'))
 {
-    //$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
+	//$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
 }
 
 if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol." = ".((int) $rowid);
+	$sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol." = ".((int) $rowid);
 
-    dol_syslog("delete", LOG_DEBUG);
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
-        {
-            setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
-        } else {
-            dol_print_error($db);
-        }
-    }
+	dol_syslog("delete", LOG_DEBUG);
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
+		{
+			setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
+		} else {
+			dol_print_error($db);
+		}
+	}
 }
 
 // activate
 if ($action == $acts[0])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol." = ".((int) $rowid);
-    } elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code = '".$db->escape($code)."'";
-    }
+	if ($rowid) {
+		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol." = ".((int) $rowid);
+	} elseif ($code) {
+		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code = '".$db->escape($code)."'";
+	}
 
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		dol_print_error($db);
+	}
 }
 
 // disable
 if ($action == $acts[1])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    if ($rowid) {
-    	$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol." = ".((int) $rowid);
-    } elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code = '".$db->escape($code)."'";
-    }
+	if ($rowid) {
+		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol." = ".((int) $rowid);
+	} elseif ($code) {
+		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code = '".$db->escape($code)."'";
+	}
 
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		dol_print_error($db);
+	}
 }
 
 // favorite
 if ($action == 'activate_favorite')
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    if ($rowid) {
-    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol." = ".((int) $rowid);
-    } elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code = '".$db->escape($code)."'";
-    }
+	if ($rowid) {
+		$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol." = ".((int) $rowid);
+	} elseif ($code) {
+		$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code = '".$db->escape($code)."'";
+	}
 
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		dol_print_error($db);
+	}
 }
 
 // disable favorite
 if ($action == 'disable_favorite')
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    if ($rowid) {
-    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol." = ".((int) $rowid);
-    } elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code = '".$db->escape($code)."'";
-    }
+	if ($rowid) {
+		$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol." = ".((int) $rowid);
+	} elseif ($code) {
+		$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code = '".$db->escape($code)."'";
+	}
 
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		dol_print_error($db);
+	}
 }
 
 
@@ -401,7 +401,7 @@ print '<span class="opacitymedium">'.$langs->trans("AccountingAccountGroupsDesc"
 // Confirmation de la suppression de la ligne
 if ($action == 'delete')
 {
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$code.'&id='.$id.($search_country_id > 0 ? '&search_country_id='.$search_country_id : ''), $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$code.'&id='.$id.($search_country_id > 0 ? '&search_country_id='.$search_country_id : ''), $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
 }
 //var_dump($elementList);
 
@@ -410,407 +410,407 @@ if ($action == 'delete')
  */
 if ($id)
 {
-    // Complete requete recherche valeurs avec critere de tri
-    $sql = $tabsql[$id];
+	// Complete requete recherche valeurs avec critere de tri
+	$sql = $tabsql[$id];
 
-    if ($search_country_id > 0)
-    {
-        if (preg_match('/ WHERE /', $sql)) $sql .= " AND ";
-        else $sql .= " WHERE ";
-        $sql .= " (a.fk_country = ".$search_country_id." OR a.fk_country = 0)";
-    }
+	if ($search_country_id > 0)
+	{
+		if (preg_match('/ WHERE /', $sql)) $sql .= " AND ";
+		else $sql .= " WHERE ";
+		$sql .= " (a.fk_country = ".$search_country_id." OR a.fk_country = 0)";
+	}
 
-    // If sort order is "country", we use country_code instead
-    if ($sortfield == 'country') $sortfield = 'country_code';
-    $sql .= $db->order($sortfield, $sortorder);
-    $sql .= $db->plimit($listlimit + 1, $offset);
-    //print $sql;
+	// If sort order is "country", we use country_code instead
+	if ($sortfield == 'country') $sortfield = 'country_code';
+	$sql .= $db->order($sortfield, $sortorder);
+	$sql .= $db->plimit($listlimit + 1, $offset);
+	//print $sql;
 
-    $fieldlist = explode(',', $tabfield[$id]);
+	$fieldlist = explode(',', $tabfield[$id]);
 
-    print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
+	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
 
 	print '<div class="div-table-responsive">';
-    print '<table class="noborder centpercent">';
+	print '<table class="noborder centpercent">';
 
-    // Form to add a new line
-    if ($tabname[$id])
-    {
-        $alabelisused = 0;
+	// Form to add a new line
+	if ($tabname[$id])
+	{
+		$alabelisused = 0;
 
-        $fieldlist = explode(',', $tabfield[$id]);
+		$fieldlist = explode(',', $tabfield[$id]);
 
-        // Line for title
-        print '<tr class="liste_titre">';
-        foreach ($fieldlist as $field => $value)
-        {
-            // Determine le nom du champ par rapport aux noms possibles
-            // dans les dictionnaires de donnees
-            $valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
-            $valuetoshow = $langs->trans($valuetoshow); // try to translate
-            $class = "left";
-            if ($fieldlist[$field] == 'type') {
-                if ($tabname[$id] == MAIN_DB_PREFIX."c_paiement") {
-                    $valuetoshow = $form->textwithtooltip($langs->trans("Type"), $langs->trans("TypePaymentDesc"), 2, 1, img_help(1, ''));
-                } else {
-                    $valuetoshow = $langs->trans("Type");
-                }
-            }
-            if ($fieldlist[$field] == 'code') {
-                $valuetoshow = $langs->trans("Code");
-            }
-            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
-            	$valuetoshow = $langs->trans("Label");
-            }
-            if ($fieldlist[$field] == 'libelle_facture') {
-                $valuetoshow = $langs->trans("LabelOnDocuments");
-            }
-            if ($fieldlist[$field] == 'country') {
-                $valuetoshow = $langs->trans("Country");
-            }
-            if ($fieldlist[$field] == 'accountancy_code') {
-                $valuetoshow = $langs->trans("AccountancyCode");
-            }
-            if ($fieldlist[$field] == 'accountancy_code_sell') {
-                $valuetoshow = $langs->trans("AccountancyCodeSell");
-            }
-            if ($fieldlist[$field] == 'accountancy_code_buy') {
-                $valuetoshow = $langs->trans("AccountancyCodeBuy");
-            }
-            if ($fieldlist[$field] == 'pcg_version' || $fieldlist[$field] == 'fk_pcg_version') {
-                $valuetoshow = $langs->trans("Pcg_version");
-            }
-            if ($fieldlist[$field] == 'range_account') {
-                $valuetoshow = $langs->trans("Comment");
-            }
-            if ($fieldlist[$field] == 'category_type') {
-                $valuetoshow = $langs->trans("Calculated");
-            }
-
-            if ($valuetoshow != '') {
-                print '<td class="'.$class.'">';
-            	if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
-            	elseif (!empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
-            	else print $valuetoshow;
-                print '</td>';
-            }
-            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') $alabelisused = 1;
-        }
-
-        print '<td>';
-        print '<input type="hidden" name="id" value="'.$id.'">';
-        print '</td>';
-        print '<td style="min-width: 26px;"></td>';
-        print '<td style="min-width: 26px;"></td>';
-        print '<td style="min-width: 26px;"></td>';
-        print '</tr>';
-
-        // Line to enter new values
-        print '<tr class="oddeven nodrag nodrop nohover">';
-
-        $obj = new stdClass();
-        // If data was already input, we define them in obj to populate input fields.
-        if (GETPOST('actionadd', 'alpha'))
-        {
-            foreach ($fieldlist as $key=>$val)
-            {
-                if (GETPOST($val) != '')
-                	$obj->$val = GETPOST($val);
-            }
-        }
-
-        $tmpaction = 'create';
-        $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-        $reshook = $hookmanager->executeHooks('createDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
-        $error = $hookmanager->error; $errors = $hookmanager->errors;
-
-        if (empty($reshook))
-        {
-       		fieldListAccountingCategories($fieldlist, $obj, $tabname[$id], 'add');
-        }
-
-        print '<td colspan="4" class="right">';
-       	print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
-        print '</td>';
-        print "</tr>";
-
-        $colspan = count($fieldlist) + 3;
-        if ($id == 32) $colspan++;
-
-        print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>'; // Keep &nbsp; to have a line with enough height
-    }
-
-    // List of available record in database
-    dol_syslog("htdocs/admin/dict", LOG_DEBUG);
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
-
-        $param = '&id='.$id;
-        if ($search_country_id > 0) $param .= '&search_country_id='.$search_country_id;
-        $paramwithsearch = $param;
-        if ($sortorder) $paramwithsearch .= '&sortorder='.$sortorder;
-        if ($sortfield) $paramwithsearch .= '&sortfield='.$sortfield;
-        if (GETPOST('from', 'alpha')) $paramwithsearch .= '&from='.GETPOST('from', 'alpha');
-        // There is several pages
-        if ($num > $listlimit)
-        {
-            print '<tr class="none"><td class="right" colspan="'.(3 + count($fieldlist)).'">';
-            print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page + 1).'</span></li>');
-            print '</td></tr>';
-        }
-
-        // Title line with search boxes
-        print '<tr class="liste_titre liste_titre_add liste_titre_filter">';
-        $filterfound = 0;
-        foreach ($fieldlist as $field => $value)
-        {
-            $showfield = 1; // By defaut
-
-            if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { $showfield = 0; }
-
-            if ($showfield)
-            {
-                if ($value == 'country')
-                {
-                    print '<td class="liste_titre">';
-                    print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth200 maxwidthonsmartphone');
-                    print '</td>';
-                    $filterfound++;
-                } else {
-                    print '<td class="liste_titre"></td>';
-                }
-            }
-        }
-        print '<td class="liste_titre"></td>';
-        print '<td class="liste_titre"></td>';
-        print '<td class="liste_titre"></td>';
-        print '<td class="liste_titre center">';
-    	if ($filterfound)
-    	{
-        	$searchpicto = $form->showFilterAndCheckAddButtons(0);
-        	print $searchpicto;
-    	}
-    	print '</td>';
-    	print '</tr>';
-
-    	// Title of lines
-        print '<tr class="liste_titre">';
-        foreach ($fieldlist as $field => $value)
-        {
-            // Determine le nom du champ par rapport aux noms possibles
-            // dans les dictionnaires de donnees
-            $showfield = 1; // By defaut
-            $class = "left";
-            $sortable = 1;
-            $valuetoshow = '';
-
-            $valuetoshow = ucfirst($fieldlist[$field]); // By defaut
-            $valuetoshow = $langs->trans($valuetoshow); // try to translate
-            if ($fieldlist[$field] == 'source') {
-                $valuetoshow = $langs->trans("Contact");
-            }
-            if ($fieldlist[$field] == 'price') {
-                $valuetoshow = $langs->trans("PriceUHT");
-            }
-            if ($fieldlist[$field] == 'taux') {
-                if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") {
-                    $valuetoshow = $langs->trans("Rate");
-                } else {
-                    $valuetoshow = $langs->trans("Amount");
-                }
-				$class = 'center';
-            }
-            if ($fieldlist[$field] == 'type') {
-                $valuetoshow = $langs->trans("Type");
-            }
-            if ($fieldlist[$field] == 'code') {
-                $valuetoshow = $langs->trans("Code");
-            }
-            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
-            	$valuetoshow = $langs->trans("Label");
-            }
-            if ($fieldlist[$field] == 'country') {
-                $valuetoshow = $langs->trans("Country");
-            }
-            if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
-                $showfield = 0;
-            }
-            if ($fieldlist[$field] == 'accountancy_code') {
-                $valuetoshow = $langs->trans("AccountancyCode");
-            }
-            if ($fieldlist[$field] == 'accountancy_code_sell') {
-                $valuetoshow = $langs->trans("AccountancyCodeSell");
-                $sortable = 0;
-            }
-            if ($fieldlist[$field] == 'accountancy_code_buy') {
-                $valuetoshow = $langs->trans("AccountancyCodeBuy");
-                $sortable = 0;
-            }
-			if ($fieldlist[$field] == 'fk_pcg_version') {
-                $valuetoshow = $langs->trans("Pcg_version");
-            }
-            if ($fieldlist[$field] == 'account_parent') {
-                $valuetoshow = $langs->trans("Accountsparent");
-            }
-            if ($fieldlist[$field] == 'pcg_type') {
-                $valuetoshow = $langs->trans("Pcg_type");
-            }
-        	if ($fieldlist[$field] == 'type_template') {
-                $valuetoshow = $langs->trans("TypeOfTemplate");
-            }
+		// Line for title
+		print '<tr class="liste_titre">';
+		foreach ($fieldlist as $field => $value)
+		{
+			// Determine le nom du champ par rapport aux noms possibles
+			// dans les dictionnaires de donnees
+			$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
+			$valuetoshow = $langs->trans($valuetoshow); // try to translate
+			$class = "left";
+			if ($fieldlist[$field] == 'type') {
+				if ($tabname[$id] == MAIN_DB_PREFIX."c_paiement") {
+					$valuetoshow = $form->textwithtooltip($langs->trans("Type"), $langs->trans("TypePaymentDesc"), 2, 1, img_help(1, ''));
+				} else {
+					$valuetoshow = $langs->trans("Type");
+				}
+			}
+			if ($fieldlist[$field] == 'code') {
+				$valuetoshow = $langs->trans("Code");
+			}
+			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
+				$valuetoshow = $langs->trans("Label");
+			}
+			if ($fieldlist[$field] == 'libelle_facture') {
+				$valuetoshow = $langs->trans("LabelOnDocuments");
+			}
+			if ($fieldlist[$field] == 'country') {
+				$valuetoshow = $langs->trans("Country");
+			}
+			if ($fieldlist[$field] == 'accountancy_code') {
+				$valuetoshow = $langs->trans("AccountancyCode");
+			}
+			if ($fieldlist[$field] == 'accountancy_code_sell') {
+				$valuetoshow = $langs->trans("AccountancyCodeSell");
+			}
+			if ($fieldlist[$field] == 'accountancy_code_buy') {
+				$valuetoshow = $langs->trans("AccountancyCodeBuy");
+			}
+			if ($fieldlist[$field] == 'pcg_version' || $fieldlist[$field] == 'fk_pcg_version') {
+				$valuetoshow = $langs->trans("Pcg_version");
+			}
 			if ($fieldlist[$field] == 'range_account') {
-                $valuetoshow = $langs->trans("Comment");
-            }
+				$valuetoshow = $langs->trans("Comment");
+			}
 			if ($fieldlist[$field] == 'category_type') {
-                $valuetoshow = $langs->trans("Calculated");
-            }
-            // Affiche nom du champ
-            if ($showfield) {
-                print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), $param, "", $sortfield, $sortorder, $class.' ');
-            }
-        }
+				$valuetoshow = $langs->trans("Calculated");
+			}
+
+			if ($valuetoshow != '') {
+				print '<td class="'.$class.'">';
+				if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+				elseif (!empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
+				else print $valuetoshow;
+				print '</td>';
+			}
+			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') $alabelisused = 1;
+		}
+
+		print '<td>';
+		print '<input type="hidden" name="id" value="'.$id.'">';
+		print '</td>';
+		print '<td style="min-width: 26px;"></td>';
+		print '<td style="min-width: 26px;"></td>';
+		print '<td style="min-width: 26px;"></td>';
+		print '</tr>';
+
+		// Line to enter new values
+		print '<tr class="oddeven nodrag nodrop nohover">';
+
+		$obj = new stdClass();
+		// If data was already input, we define them in obj to populate input fields.
+		if (GETPOST('actionadd', 'alpha'))
+		{
+			foreach ($fieldlist as $key=>$val)
+			{
+				if (GETPOST($val) != '')
+					$obj->$val = GETPOST($val);
+			}
+		}
+
+		$tmpaction = 'create';
+		$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+		$reshook = $hookmanager->executeHooks('createDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+		$error = $hookmanager->error; $errors = $hookmanager->errors;
+
+		if (empty($reshook))
+		{
+	   		fieldListAccountingCategories($fieldlist, $obj, $tabname[$id], 'add');
+		}
+
+		print '<td colspan="4" class="right">';
+	   	print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
+		print '</td>';
+		print "</tr>";
+
+		$colspan = count($fieldlist) + 3;
+		if ($id == 32) $colspan++;
+
+		print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>'; // Keep &nbsp; to have a line with enough height
+	}
+
+	// List of available record in database
+	dol_syslog("htdocs/admin/dict", LOG_DEBUG);
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+
+		$param = '&id='.$id;
+		if ($search_country_id > 0) $param .= '&search_country_id='.$search_country_id;
+		$paramwithsearch = $param;
+		if ($sortorder) $paramwithsearch .= '&sortorder='.$sortorder;
+		if ($sortfield) $paramwithsearch .= '&sortfield='.$sortfield;
+		if (GETPOST('from', 'alpha')) $paramwithsearch .= '&from='.GETPOST('from', 'alpha');
+		// There is several pages
+		if ($num > $listlimit)
+		{
+			print '<tr class="none"><td class="right" colspan="'.(3 + count($fieldlist)).'">';
+			print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page + 1).'</span></li>');
+			print '</td></tr>';
+		}
+
+		// Title line with search boxes
+		print '<tr class="liste_titre liste_titre_add liste_titre_filter">';
+		$filterfound = 0;
+		foreach ($fieldlist as $field => $value)
+		{
+			$showfield = 1; // By defaut
+
+			if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { $showfield = 0; }
+
+			if ($showfield)
+			{
+				if ($value == 'country')
+				{
+					print '<td class="liste_titre">';
+					print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth200 maxwidthonsmartphone');
+					print '</td>';
+					$filterfound++;
+				} else {
+					print '<td class="liste_titre"></td>';
+				}
+			}
+		}
+		print '<td class="liste_titre"></td>';
+		print '<td class="liste_titre"></td>';
+		print '<td class="liste_titre"></td>';
+		print '<td class="liste_titre center">';
+		if ($filterfound)
+		{
+			$searchpicto = $form->showFilterAndCheckAddButtons(0);
+			print $searchpicto;
+		}
+		print '</td>';
+		print '</tr>';
+
+		// Title of lines
+		print '<tr class="liste_titre">';
+		foreach ($fieldlist as $field => $value)
+		{
+			// Determine le nom du champ par rapport aux noms possibles
+			// dans les dictionnaires de donnees
+			$showfield = 1; // By defaut
+			$class = "left";
+			$sortable = 1;
+			$valuetoshow = '';
+
+			$valuetoshow = ucfirst($fieldlist[$field]); // By defaut
+			$valuetoshow = $langs->trans($valuetoshow); // try to translate
+			if ($fieldlist[$field] == 'source') {
+				$valuetoshow = $langs->trans("Contact");
+			}
+			if ($fieldlist[$field] == 'price') {
+				$valuetoshow = $langs->trans("PriceUHT");
+			}
+			if ($fieldlist[$field] == 'taux') {
+				if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") {
+					$valuetoshow = $langs->trans("Rate");
+				} else {
+					$valuetoshow = $langs->trans("Amount");
+				}
+				$class = 'center';
+			}
+			if ($fieldlist[$field] == 'type') {
+				$valuetoshow = $langs->trans("Type");
+			}
+			if ($fieldlist[$field] == 'code') {
+				$valuetoshow = $langs->trans("Code");
+			}
+			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
+				$valuetoshow = $langs->trans("Label");
+			}
+			if ($fieldlist[$field] == 'country') {
+				$valuetoshow = $langs->trans("Country");
+			}
+			if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
+				$showfield = 0;
+			}
+			if ($fieldlist[$field] == 'accountancy_code') {
+				$valuetoshow = $langs->trans("AccountancyCode");
+			}
+			if ($fieldlist[$field] == 'accountancy_code_sell') {
+				$valuetoshow = $langs->trans("AccountancyCodeSell");
+				$sortable = 0;
+			}
+			if ($fieldlist[$field] == 'accountancy_code_buy') {
+				$valuetoshow = $langs->trans("AccountancyCodeBuy");
+				$sortable = 0;
+			}
+			if ($fieldlist[$field] == 'fk_pcg_version') {
+				$valuetoshow = $langs->trans("Pcg_version");
+			}
+			if ($fieldlist[$field] == 'account_parent') {
+				$valuetoshow = $langs->trans("Accountsparent");
+			}
+			if ($fieldlist[$field] == 'pcg_type') {
+				$valuetoshow = $langs->trans("Pcg_type");
+			}
+			if ($fieldlist[$field] == 'type_template') {
+				$valuetoshow = $langs->trans("TypeOfTemplate");
+			}
+			if ($fieldlist[$field] == 'range_account') {
+				$valuetoshow = $langs->trans("Comment");
+			}
+			if ($fieldlist[$field] == 'category_type') {
+				$valuetoshow = $langs->trans("Calculated");
+			}
+			// Affiche nom du champ
+			if ($showfield) {
+				print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), $param, "", $sortfield, $sortorder, $class.' ');
+			}
+		}
 		print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page ? 'page='.$page.'&' : ''), $param, '', $sortfield, $sortorder, 'center ');
-        print getTitleFieldOfList('');
-        print getTitleFieldOfList('');
-        print getTitleFieldOfList('');
-        print '</tr>';
+		print getTitleFieldOfList('');
+		print getTitleFieldOfList('');
+		print getTitleFieldOfList('');
+		print '</tr>';
 
-        if ($num)
-        {
-            // Lines with values
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
-                //print_r($obj);
-                print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
-                if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code)))
-                {
-                    $tmpaction = 'edit';
-                    $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-                    $reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
-                    $error = $hookmanager->error; $errors = $hookmanager->errors;
+		if ($num)
+		{
+			// Lines with values
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
+				//print_r($obj);
+				print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
+				if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code)))
+				{
+					$tmpaction = 'edit';
+					$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+					$reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+					$error = $hookmanager->error; $errors = $hookmanager->errors;
 
-                    // Show fields
-                    if (empty($reshook)) fieldListAccountingCategories($fieldlist, $obj, $tabname[$id], 'edit');
+					// Show fields
+					if (empty($reshook)) fieldListAccountingCategories($fieldlist, $obj, $tabname[$id], 'edit');
 
-                    print '<td></td>';
-                    print '<td></td>';
-                    print '<td class="center">';
-                    print '<input type="hidden" name="page" value="'.$page.'">';
-                    print '<input type="hidden" name="rowid" value="'.$rowid.'">';
-                    print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
-                    print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
-                    print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
-                    print '</td>';
-                    print '<td></td>';
-                } else {
-                    $tmpaction = 'view';
-                    $parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-                    $reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+					print '<td></td>';
+					print '<td></td>';
+					print '<td class="center">';
+					print '<input type="hidden" name="page" value="'.$page.'">';
+					print '<input type="hidden" name="rowid" value="'.$rowid.'">';
+					print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+					print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
+					print '<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'">';
+					print '</td>';
+					print '<td></td>';
+				} else {
+					$tmpaction = 'view';
+					$parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+					$reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 
-                    $error = $hookmanager->error; $errors = $hookmanager->errors;
+					$error = $hookmanager->error; $errors = $hookmanager->errors;
 
-                    if (empty($reshook))
-                    {
-                        foreach ($fieldlist as $field => $value)
-                        {
-                            $showfield = 1;
-                        	$class = "left";
-                            $valuetoshow = $obj->{$fieldlist[$field]};
-                            if ($value == 'category_type')
-                            {
-                                $valuetoshow = yn($valuetoshow);
-                            } elseif ($valuetoshow == 'all') {
-                                $valuetoshow = $langs->trans('All');
-                            } elseif ($fieldlist[$field] == 'country') {
-                                if (empty($obj->country_code))
-                                {
-                                    $valuetoshow = '-';
-                                } else {
-                                    $key = $langs->trans("Country".strtoupper($obj->country_code));
-                                    $valuetoshow = ($key != "Country".strtoupper($obj->country_code) ? $obj->country_code." - ".$key : $obj->country);
-                                }
-                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_country') {
-                                $key = $langs->trans("Country".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "Country".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_availability') {
-                                $langs->loadLangs(array("propal"));
-                                $key = $langs->trans("AvailabilityType".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "AvailabilityType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_actioncomm') {
-                                $key = $langs->trans("Action".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "Action".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
-                                $showfield = 0;
-                            }
+					if (empty($reshook))
+					{
+						foreach ($fieldlist as $field => $value)
+						{
+							$showfield = 1;
+							$class = "left";
+							$valuetoshow = $obj->{$fieldlist[$field]};
+							if ($value == 'category_type')
+							{
+								$valuetoshow = yn($valuetoshow);
+							} elseif ($valuetoshow == 'all') {
+								$valuetoshow = $langs->trans('All');
+							} elseif ($fieldlist[$field] == 'country') {
+								if (empty($obj->country_code))
+								{
+									$valuetoshow = '-';
+								} else {
+									$key = $langs->trans("Country".strtoupper($obj->country_code));
+									$valuetoshow = ($key != "Country".strtoupper($obj->country_code) ? $obj->country_code." - ".$key : $obj->country);
+								}
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_country') {
+								$key = $langs->trans("Country".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "Country".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_availability') {
+								$langs->loadLangs(array("propal"));
+								$key = $langs->trans("AvailabilityType".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "AvailabilityType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_actioncomm') {
+								$key = $langs->trans("Action".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "Action".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
+								$showfield = 0;
+							}
 
-                            $class = 'tddict';
+							$class = 'tddict';
 							// Show value for field
 							if ($showfield) print '<!-- '.$fieldlist[$field].' --><td class="'.$class.'">'.$valuetoshow.'</td>';
-                        }
-                    }
+						}
+					}
 
-                    // Can an entry be erased or disabled ?
-                    $iserasable = 1; $canbedisabled = 1; $canbemodified = 1; // true by default
-                    if (isset($obj->code))
-                    {
-                    	if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i', $obj->code))) { $iserasable = 0; $canbedisabled = 0; }
-                    }
+					// Can an entry be erased or disabled ?
+					$iserasable = 1; $canbedisabled = 1; $canbemodified = 1; // true by default
+					if (isset($obj->code))
+					{
+						if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i', $obj->code))) { $iserasable = 0; $canbedisabled = 0; }
+					}
 
-                    $canbemodified = $iserasable;
+					$canbemodified = $iserasable;
 
-                    $url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')).'&code='.(!empty($obj->code) ?urlencode($obj->code) : '');
-                    if ($param) $url .= '&'.$param;
-                    $url .= '&';
+					$url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')).'&code='.(!empty($obj->code) ?urlencode($obj->code) : '');
+					if ($param) $url .= '&'.$param;
+					$url .= '&';
 
-                    // Active
-                    print '<td class="center" class="nowrap">';
-                    if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
-                    else {
-                    	print $langs->trans("AlwaysActive");
-                    }
-                    print "</td>";
+					// Active
+					print '<td class="center" class="nowrap">';
+					if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
+					else {
+						print $langs->trans("AlwaysActive");
+					}
+					print "</td>";
 
-                    // Modify link
-                    if ($canbemodified) print '<td class="center"><a class="reposition editfielda" href="'.$url.'action=edit">'.img_edit().'</a></td>';
-                    else print '<td>&nbsp;</td>';
+					// Modify link
+					if ($canbemodified) print '<td class="center"><a class="reposition editfielda" href="'.$url.'action=edit">'.img_edit().'</a></td>';
+					else print '<td>&nbsp;</td>';
 
-                    // Delete link
-                    if ($iserasable)
-                    {
-                        print '<td class="center">';
-                        if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
-                        //else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
-                        print '</td>';
-                    } else print '<td>&nbsp;</td>';
+					// Delete link
+					if ($iserasable)
+					{
+						print '<td class="center">';
+						if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
+						//else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
+						print '</td>';
+					} else print '<td>&nbsp;</td>';
 
-                    // Link to setup the group
-                    print '<td class="center">';
-                    if (empty($obj->formula))
-                    {
-                        print '<a href="'.DOL_URL_ROOT.'/accountancy/admin/categories.php?action=display&save_lastsearch_values=1&account_category='.$obj->rowid.'">';
-                        print $langs->trans("ListOfAccounts");
-                        print '</a>';
-                    }
-                    print '</td>';
-                }
-                print "</tr>\n";
-                $i++;
-            }
-        }
-    } else {
-        dol_print_error($db);
-    }
+					// Link to setup the group
+					print '<td class="center">';
+					if (empty($obj->formula))
+					{
+						print '<a href="'.DOL_URL_ROOT.'/accountancy/admin/categories.php?action=display&save_lastsearch_values=1&account_category='.$obj->rowid.'">';
+						print $langs->trans("ListOfAccounts");
+						print '</a>';
+					}
+					print '</td>';
+				}
+				print "</tr>\n";
+				$i++;
+			}
+		}
+	} else {
+		dol_print_error($db);
+	}
 
-    print '</table>';
+	print '</table>';
 	print '</div>';
 
-    print '</form>';
+	print '</form>';
 }
 
 print '<br>';
@@ -865,7 +865,7 @@ function fieldListAccountingCategories($fieldlist, $obj = '', $tabname = '', $co
 				print '</td>';
 			}
 		} elseif ($fieldlist[$field] == 'category_type') {
-		    print '<td>';
+			print '<td>';
 			print $form->selectyesno($fieldlist[$field], (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1);
 			print '</td>';
 		} elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
diff --git a/htdocs/accountancy/admin/closure.php b/htdocs/accountancy/admin/closure.php
index a425fd45768..7e781b3fc71 100644
--- a/htdocs/accountancy/admin/closure.php
+++ b/htdocs/accountancy/admin/closure.php
@@ -39,8 +39,8 @@ $action = GETPOST('action', 'aZ09');
 
 
 $list_account_main = array(
-    'ACCOUNTING_RESULT_PROFIT',
-    'ACCOUNTING_RESULT_LOSS'
+	'ACCOUNTING_RESULT_PROFIT',
+	'ACCOUNTING_RESULT_LOSS'
 );
 
 /*
@@ -48,17 +48,17 @@ $list_account_main = array(
  */
 
 if ($action == 'update') {
-    $error = 0;
+	$error = 0;
 
-    $defaultjournal = GETPOST('ACCOUNTING_CLOSURE_DEFAULT_JOURNAL', 'alpha');
+	$defaultjournal = GETPOST('ACCOUNTING_CLOSURE_DEFAULT_JOURNAL', 'alpha');
 
-    if (!empty($defaultjournal)) {
-        if (!dolibarr_set_const($db, 'ACCOUNTING_CLOSURE_DEFAULT_JOURNAL', $defaultjournal, 'chaine', 0, '', $conf->entity)) {
-            $error++;
-        }
-    } else {
-        $error++;
-    }
+	if (!empty($defaultjournal)) {
+		if (!dolibarr_set_const($db, 'ACCOUNTING_CLOSURE_DEFAULT_JOURNAL', $defaultjournal, 'chaine', 0, '', $conf->entity)) {
+			$error++;
+		}
+	} else {
+		$error++;
+	}
 
 	foreach ($list_account_main as $constname) {
 		$constvalue = GETPOST($constname, 'alpha');
@@ -99,20 +99,20 @@ print '<input type="hidden" name="action" value="update">';
 print '<table class="noborder centpercent">';
 
 foreach ($list_account_main as $key) {
-    print '<tr class="oddeven value">';
-    // Param
-    $label = $langs->trans($key);
-    $keydesc = $key.'_Desc';
+	print '<tr class="oddeven value">';
+	// Param
+	$label = $langs->trans($key);
+	$keydesc = $key.'_Desc';
 
-    $htmltext = $langs->trans($keydesc);
-    print '<td class="fieldrequired" width="50%">';
-    print $form->textwithpicto($label, $htmltext);
-    print '</td>';
-    // Value
-    print '<td>'; // Do not force class=right, or it align also the content of the select box
-    print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
-    print '</td>';
-    print '</tr>';
+	$htmltext = $langs->trans($keydesc);
+	print '<td class="fieldrequired" width="50%">';
+	print $form->textwithpicto($label, $htmltext);
+	print '</td>';
+	// Value
+	print '<td>'; // Do not force class=right, or it align also the content of the select box
+	print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
+	print '</td>';
+	print '</tr>';
 }
 
 // Journal
diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index 3d03dc9c4b6..b9377ce4431 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -47,9 +47,9 @@ $action = GETPOST('action', 'aZ09');
 
 
 $list_account_main = array(
-    'ACCOUNTING_ACCOUNT_CUSTOMER',
-    'ACCOUNTING_ACCOUNT_SUPPLIER',
-    'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',
+	'ACCOUNTING_ACCOUNT_CUSTOMER',
+	'ACCOUNTING_ACCOUNT_SUPPLIER',
+	'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',
 );
 
 $list_account = array();
@@ -120,9 +120,9 @@ if ($action == 'update') {
 
 		$constvalue = GETPOST($constname, 'alpha');
 
-	    if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
-	        $error++;
-	    }
+		if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+			$error++;
+		}
 	}
 
 	if (!$error) {
@@ -159,20 +159,20 @@ print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td>'.$langs->trans("ThirdParties").' | '.$langs->trans("Users").'</td><td></td></tr>';
 
 foreach ($list_account_main as $key) {
-    print '<tr class="oddeven value">';
-    // Param
-    $label = $langs->trans($key);
-    $keydesc = $key.'_Desc';
+	print '<tr class="oddeven value">';
+	// Param
+	$label = $langs->trans($key);
+	$keydesc = $key.'_Desc';
 
-    $htmltext = $langs->trans($keydesc);
-    print '<td class="fieldrequired" width="50%">';
-    print $form->textwithpicto($label, $htmltext);
-    print '</td>';
-    // Value
-    print '<td>'; // Do not force class=right, or it align also the content of the select box
-    print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
-    print '</td>';
-    print '</tr>';
+	$htmltext = $langs->trans($keydesc);
+	print '<td class="fieldrequired" width="50%">';
+	print $form->textwithpicto($label, $htmltext);
+	print '</td>';
+	// Value
+	print '<td>'; // Do not force class=right, or it align also the content of the select box
+	print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
+	print '</td>';
+	print '</tr>';
 }
 
 
diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php
index b2262c603f9..ba45220c8cc 100644
--- a/htdocs/accountancy/admin/export.php
+++ b/htdocs/accountancy/admin/export.php
@@ -45,7 +45,7 @@ $action = GETPOST('action', 'aZ09');
 
 // Parameters ACCOUNTING_EXPORT_*
 $main_option = array(
-    'ACCOUNTING_EXPORT_PREFIX_SPEC',
+	'ACCOUNTING_EXPORT_PREFIX_SPEC',
 );
 
 $configuration = AccountancyExport::getTypeConfig();
@@ -58,22 +58,22 @@ $listcr = $configuration['cr'];
 
 
 $model_option = array(
-    '1' => array(
-        'label' => 'ACCOUNTING_EXPORT_FORMAT',
-        'param' => $listformat,
-    ),
-    '2' => array(
-        'label' => 'ACCOUNTING_EXPORT_SEPARATORCSV',
-        'param' => '',
-    ),
-    '3' => array(
-        'label' => 'ACCOUNTING_EXPORT_ENDLINE',
-        'param' => $listcr,
-    ),
-    '4' => array(
-        'label' => 'ACCOUNTING_EXPORT_DATE',
-        'param' => '',
-    ),
+	'1' => array(
+		'label' => 'ACCOUNTING_EXPORT_FORMAT',
+		'param' => $listformat,
+	),
+	'2' => array(
+		'label' => 'ACCOUNTING_EXPORT_SEPARATORCSV',
+		'param' => '',
+	),
+	'3' => array(
+		'label' => 'ACCOUNTING_EXPORT_ENDLINE',
+		'param' => $listcr,
+	),
+	'4' => array(
+		'label' => 'ACCOUNTING_EXPORT_DATE',
+		'param' => '',
+	),
 );
 
 
@@ -105,22 +105,22 @@ if ($action == 'update') {
 		}
 	}
 
-    foreach ($listparam[$modelcsv] as $key => $value) {
-        $constante = $key;
+	foreach ($listparam[$modelcsv] as $key => $value) {
+		$constante = $key;
 
-        if (strpos($constante, 'ACCOUNTING') !== false) {
-            $constvalue = GETPOST($key, 'alpha');
-            if (!dolibarr_set_const($db, $constante, $constvalue, 'chaine', 0, '', $conf->entity)) {
-                $error++;
-            }
-        }
-    }
+		if (strpos($constante, 'ACCOUNTING') !== false) {
+			$constvalue = GETPOST($key, 'alpha');
+			if (!dolibarr_set_const($db, $constante, $constvalue, 'chaine', 0, '', $conf->entity)) {
+				$error++;
+			}
+		}
+	}
 
 	if (!$error) {
-        // reload
-        $configuration = AccountancyExport::getTypeConfig();
-        $listparam = $configuration['param'];
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		// reload
+		$configuration = AccountancyExport::getTypeConfig();
+		$listparam = $configuration['param'];
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
@@ -148,36 +148,36 @@ print 'jQuery(document).ready(function () {'."\n";
 print '    function initfields()'."\n";
 print '    {'."\n";
 foreach ($listparam as $key => $param) {
-    print '        if (jQuery("#ACCOUNTING_EXPORT_MODELCSV").val()=="'.$key.'")'."\n";
-    print '        {'."\n";
-    print '            //console.log("'.$param['label'].'");'."\n";
-    if (empty($param['ACCOUNTING_EXPORT_FORMAT'])) {
-        print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").val("'.$conf->global->ACCOUNTING_EXPORT_FORMAT.'");'."\n";
-        print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").prop("disabled", true);'."\n";
-    } else {
-        print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").val("'.$param['ACCOUNTING_EXPORT_FORMAT'].'");'."\n";
-        print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").removeAttr("disabled");'."\n";
-    }
-    if (empty($param['ACCOUNTING_EXPORT_SEPARATORCSV'])) {
-        print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").val("");'."\n";
-        print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").prop("disabled", true);'."\n";
-    } else {
-        print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").val("'.$conf->global->ACCOUNTING_EXPORT_SEPARATORCSV.'");'."\n";
-        print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").removeAttr("disabled");'."\n";
-    }
-    if (empty($param['ACCOUNTING_EXPORT_ENDLINE'])) {
-        print '            jQuery("#ACCOUNTING_EXPORT_ENDLINE").prop("disabled", true);'."\n";
-    } else {
-        print '            jQuery("#ACCOUNTING_EXPORT_ENDLINE").removeAttr("disabled");'."\n";
-    }
-    if (empty($param['ACCOUNTING_EXPORT_DATE'])) {
-        print '            jQuery("#ACCOUNTING_EXPORT_DATE").val("");'."\n";
-        print '            jQuery("#ACCOUNTING_EXPORT_DATE").prop("disabled", true);'."\n";
-    } else {
-        print '            jQuery("#ACCOUNTING_EXPORT_DATE").val("'.$conf->global->ACCOUNTING_EXPORT_DATE.'");'."\n";
-        print '            jQuery("#ACCOUNTING_EXPORT_DATE").removeAttr("disabled");'."\n";
-    }
-    print '        }'."\n";
+	print '        if (jQuery("#ACCOUNTING_EXPORT_MODELCSV").val()=="'.$key.'")'."\n";
+	print '        {'."\n";
+	print '            //console.log("'.$param['label'].'");'."\n";
+	if (empty($param['ACCOUNTING_EXPORT_FORMAT'])) {
+		print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").val("'.$conf->global->ACCOUNTING_EXPORT_FORMAT.'");'."\n";
+		print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").prop("disabled", true);'."\n";
+	} else {
+		print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").val("'.$param['ACCOUNTING_EXPORT_FORMAT'].'");'."\n";
+		print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").removeAttr("disabled");'."\n";
+	}
+	if (empty($param['ACCOUNTING_EXPORT_SEPARATORCSV'])) {
+		print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").val("");'."\n";
+		print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").prop("disabled", true);'."\n";
+	} else {
+		print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").val("'.$conf->global->ACCOUNTING_EXPORT_SEPARATORCSV.'");'."\n";
+		print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").removeAttr("disabled");'."\n";
+	}
+	if (empty($param['ACCOUNTING_EXPORT_ENDLINE'])) {
+		print '            jQuery("#ACCOUNTING_EXPORT_ENDLINE").prop("disabled", true);'."\n";
+	} else {
+		print '            jQuery("#ACCOUNTING_EXPORT_ENDLINE").removeAttr("disabled");'."\n";
+	}
+	if (empty($param['ACCOUNTING_EXPORT_DATE'])) {
+		print '            jQuery("#ACCOUNTING_EXPORT_DATE").val("");'."\n";
+		print '            jQuery("#ACCOUNTING_EXPORT_DATE").prop("disabled", true);'."\n";
+	} else {
+		print '            jQuery("#ACCOUNTING_EXPORT_DATE").val("'.$conf->global->ACCOUNTING_EXPORT_DATE.'");'."\n";
+		print '            jQuery("#ACCOUNTING_EXPORT_DATE").removeAttr("disabled");'."\n";
+	}
+	print '        }'."\n";
 }
 print '    }'."\n";
 print '    initfields();'."\n";
@@ -262,17 +262,17 @@ if ($num2) {
 	foreach ($model_option as $key) {
 		print '<tr class="oddeven value">';
 
-        // Param
-        $label = $key['label'];
+		// Param
+		$label = $key['label'];
 		print '<td width="50%">'.$langs->trans($label).'</td>';
 
 		// Value
-        print '<td>';
-        if (is_array($key['param'])) {
-            print $form->selectarray($label, $key['param'], $conf->global->$label, 0);
-        } else {
-            print '<input type="text" size="20" id="'.$label.'" name="'.$key['label'].'" value="'.$conf->global->$label.'">';
-        }
+		print '<td>';
+		if (is_array($key['param'])) {
+			print $form->selectarray($label, $key['param'], $conf->global->$label, 0);
+		} else {
+			print '<input type="text" size="20" id="'.$label.'" name="'.$key['label'].'" value="'.$conf->global->$label.'">';
+		}
 
 		print '</td></tr>';
 	}
diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index 1ddcddf13e6..4aa1fd99ff4 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -113,7 +113,7 @@ if ($result)
 	$i = 0;
 
 
-    $addbutton .= dolGetButtonTitle($langs->trans('NewFiscalYear'), '', 'fa fa-plus-circle', 'fiscalyear_card.php?action=create', '', $user->rights->accounting->fiscalyear->write);
+	$addbutton .= dolGetButtonTitle($langs->trans('NewFiscalYear'), '', 'fa fa-plus-circle', 'fiscalyear_card.php?action=create', '', $user->rights->accounting->fiscalyear->write);
 
 
 	$title = $langs->trans('AccountingPeriods');
diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php
index a122d3acab5..c3b782de583 100644
--- a/htdocs/accountancy/admin/fiscalyear_card.php
+++ b/htdocs/accountancy/admin/fiscalyear_card.php
@@ -159,7 +159,7 @@ if ($action == 'create')
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">';
 
@@ -187,12 +187,12 @@ if ($action == 'create')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
-	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
+	print '<input class="button button-save" type="submit" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
@@ -202,7 +202,7 @@ if ($action == 'create')
 		$head = fiscalyear_prepare_head($object);
 
 		if ($action == 'edit') {
-			dol_fiche_head($head, 'card', $langs->trans("Fiscalyear"), 0, 'cron');
+			print dol_get_fiche_head($head, 'card', $langs->trans("Fiscalyear"), 0, 'cron');
 
 			print '<form name="update" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
 			print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -241,14 +241,14 @@ if ($action == 'create')
 			print '</table>';
 
 			print '<br><div class="center">';
-			print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+			print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-			print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
+			print '<input type="submit" name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'">';
 			print '</div>';
 
 			print '</form>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 		} else {
 			/*
 			 * Confirm delete
@@ -257,7 +257,7 @@ if ($action == 'create')
 				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("DeleteFiscalYear"), $langs->trans("ConfirmDeleteFiscalYear"), "confirm_delete");
 			}
 
-			dol_fiche_head($head, 'card', $langs->trans("Fiscalyear"), 0, 'cron');
+			print dol_get_fiche_head($head, 'card', $langs->trans("Fiscalyear"), 0, 'cron');
 
 			print '<table class="border centpercent">';
 
@@ -296,20 +296,20 @@ if ($action == 'create')
 
 			print "</table>";
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			if (!empty($user->rights->accounting->fiscalyear->write))
 			{
-    			/*
+				/*
     			 * Barre d'actions
     			 */
-    			print '<div class="tabsAction">';
+				print '<div class="tabsAction">';
 
-    			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&id='.$id.'">'.$langs->trans('Modify').'</a>';
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&id='.$id.'">'.$langs->trans('Modify').'</a>';
 
-    			// print '<a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?action=delete&token='.newToken().'&id=' . $id . '">' . $langs->trans('Delete') . '</a>';
+				// print '<a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?action=delete&token='.newToken().'&id=' . $id . '">' . $langs->trans('Delete') . '</a>';
 
-    			print '</div>';
+				print '</div>';
 			}
 		}
 	} else {
diff --git a/htdocs/accountancy/admin/fiscalyear_info.php b/htdocs/accountancy/admin/fiscalyear_info.php
index f293c9b450b..2971e2eb114 100644
--- a/htdocs/accountancy/admin/fiscalyear_info.php
+++ b/htdocs/accountancy/admin/fiscalyear_info.php
@@ -49,7 +49,7 @@ if ($id) {
 
 	$head = fiscalyear_prepare_head($object);
 
-	dol_fiche_head($head, 'info', $langs->trans("Fiscalyear"), 0, 'cron');
+	print dol_get_fiche_head($head, 'info', $langs->trans("Fiscalyear"), 0, 'cron');
 
 	print '<table width="100%"><tr><td>';
 	dol_print_object_info($object);
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index e48ee43ef8d..bb192f0a693 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -22,7 +22,7 @@
  * \brief		Setup page to configure journals
  */
 
-if (!defined('CSRFCHECK_WITH_TOKEN')) define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+if (!defined('CSRFCHECK_WITH_TOKEN')) define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
@@ -420,15 +420,15 @@ if ($id)
 			$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
 			$valuetoshow = $langs->trans($valuetoshow); // try to translate
 			$class = "left";
-            if ($fieldlist[$field] == 'code') {
-                $valuetoshow = $langs->trans("Code");
-            }
+			if ($fieldlist[$field] == 'code') {
+				$valuetoshow = $langs->trans("Code");
+			}
 			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
 				$valuetoshow = $langs->trans("Label");
 			}
-            if ($fieldlist[$field] == 'nature') {
-                $valuetoshow = $langs->trans("NatureOfJournal");
-            }
+			if ($fieldlist[$field] == 'nature') {
+				$valuetoshow = $langs->trans("NatureOfJournal");
+			}
 
 			if ($valuetoshow != '') {
 				print '<td class="'.$class.'">';
@@ -540,14 +540,14 @@ if ($id)
 			$valuetoshow = ucfirst($fieldlist[$field]); // By defaut
 			$valuetoshow = $langs->trans($valuetoshow); // try to translate
 			if ($fieldlist[$field] == 'code') {
-                $valuetoshow = $langs->trans("Code");
-            }
+				$valuetoshow = $langs->trans("Code");
+			}
 			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
-                $valuetoshow = $langs->trans("Label");
-            }
+				$valuetoshow = $langs->trans("Label");
+			}
 			if ($fieldlist[$field] == 'nature') {
-                $valuetoshow = $langs->trans("NatureOfJournal");
-            }
+				$valuetoshow = $langs->trans("NatureOfJournal");
+			}
 
 			// Affiche nom du champ
 			if ($showfield) {
@@ -582,7 +582,7 @@ if ($id)
 					print '<input type="hidden" name="page" value="'.$page.'">';
 					print '<input type="hidden" name="rowid" value="'.$rowid.'">';
 					print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
-					print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
+					print '<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'">';
 					print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
 					print '</td>';
 				} else {
@@ -594,7 +594,7 @@ if ($id)
 
 					if (empty($reshook))
 					{
-                        $langs->load("accountancy");
+						$langs->load("accountancy");
 						foreach ($fieldlist as $field => $value)
 						{
 							$showfield = 1;
@@ -607,7 +607,7 @@ if ($id)
 								$valuetoshow = ($obj->nature && $key != "AccountingJournalType".strtoupper($langs->trans($obj->nature)) ? $key : $obj->{$fieldlist[$field]});
 							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'accounting_journal') {
 								$valuetoshow = $langs->trans($obj->label);
-                            }
+							}
 
 							$class = 'tddict';
 							// Show value for field
@@ -619,15 +619,15 @@ if ($id)
 					$iserasable = 1; $canbedisabled = 1; $canbemodified = 1; // true by default
 					if (isset($obj->code) && $id != 10) {
 						if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i', $obj->code))) {
-                            $iserasable = 0;
-                            $canbedisabled = 0;
-                        } elseif ($obj->code == 'RECEP') {
-                            $iserasable = 0;
-                            $canbedisabled = 0;
-                        } elseif ($obj->code == 'EF0') {
-                            $iserasable = 0;
-                            $canbedisabled = 0;
-                        }
+							$iserasable = 0;
+							$canbedisabled = 0;
+						} elseif ($obj->code == 'RECEP') {
+							$iserasable = 0;
+							$canbedisabled = 0;
+						} elseif ($obj->code == 'EF0') {
+							$iserasable = 0;
+							$canbedisabled = 0;
+						}
 					}
 
 					$canbemodified = $iserasable;
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index d88800016a8..2f92cd5842e 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -42,7 +42,7 @@ if (empty($conf->accounting->enabled)) {
 	accessforbidden();
 }
 if (!$user->rights->accounting->bind->write)
-    accessforbidden();
+	accessforbidden();
 
 // search & action GETPOST
 $action = GETPOST('action', 'aZ09');
@@ -100,14 +100,14 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 // Purge search criteria
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
 {
-    $search_ref = '';
-    $search_label = '';
-    $search_desc = '';
+	$search_ref = '';
+	$search_label = '';
+	$search_desc = '';
 	$search_vat = '';
-    $search_onsell = '';
-    $search_onpurchase = '';
-    $search_current_account = '';
-    $search_current_account_valid = '-1';
+	$search_onsell = '';
+	$search_onpurchase = '';
+	$search_current_account = '';
+	$search_current_account_valid = '-1';
 }
 
 // Sales or Purchase mode ?
@@ -117,8 +117,8 @@ if ($action == 'update') {
 
 		$accounting_product_modes = array(
 				'ACCOUNTANCY_SELL',
-                'ACCOUNTANCY_SELL_INTRA',
-                'ACCOUNTANCY_SELL_EXPORT',
+				'ACCOUNTANCY_SELL_INTRA',
+				'ACCOUNTANCY_SELL_EXPORT',
 				'ACCOUNTANCY_BUY',
 				'ACCOUNTANCY_BUY_INTRA',
 				'ACCOUNTANCY_BUY_EXPORT'
@@ -172,22 +172,22 @@ if ($action == 'update') {
 					if ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
 						$sql .= " SET accountancy_code_sell = ".$accounting->account_number;
 					}
-                    if ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
-                        $sql .= " SET accountancy_code_sell_intra = ".$accounting->account_number;
-                    }
-                    if ($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
-                        $sql .= " SET accountancy_code_sell_export = ".$accounting->account_number;
-                    }
+					if ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
+						$sql .= " SET accountancy_code_sell_intra = ".$accounting->account_number;
+					}
+					if ($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
+						$sql .= " SET accountancy_code_sell_export = ".$accounting->account_number;
+					}
 					$sql .= " WHERE rowid = ".((int) $productid);
 
 					dol_syslog("/accountancy/admin/productaccount.php sql=".$sql, LOG_DEBUG);
 					if ($db->query($sql))
 					{
-					    $ok++;
-					    $db->commit();
+						$ok++;
+						$db->commit();
 					} else {
-					    $ko++;
-					    $db->rollback();
+						$ko++;
+						$db->rollback();
 					}
 				}
 
@@ -253,7 +253,7 @@ $sql .= " aa.rowid as aaid";
 $sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON";
 if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
-    $sql .= " p.accountancy_code_buy = aa.account_number AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'";
+	$sql .= " p.accountancy_code_buy = aa.account_number AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'";
 } elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA')
 {
 	$sql .= " p.accountancy_code_buy_intra = aa.account_number AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'";
@@ -271,9 +271,9 @@ if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
 }
 $sql .= ' WHERE p.entity IN ('.getEntity('product').')';
 if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
-    if (strlen(trim($search_current_account))) {
-        $sql .= natural_search("p.accountancy_code_buy", $search_current_account);
-    }
+	if (strlen(trim($search_current_account))) {
+		$sql .= natural_search("p.accountancy_code_buy", $search_current_account);
+	}
 } elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
 	if (strlen(trim($search_current_account))) {
 		$sql .= natural_search("p.accountancy_code_buy_intra", $search_current_account);
@@ -283,17 +283,17 @@ if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
 		$sql .= natural_search("p.accountancy_code_buy_export", $search_current_account);
 	}
 } elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
-    if (strlen(trim($search_current_account))) {
-        $sql .= natural_search("p.accountancy_code_sell", $search_current_account);
-    }
+	if (strlen(trim($search_current_account))) {
+		$sql .= natural_search("p.accountancy_code_sell", $search_current_account);
+	}
 } elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
-    if (strlen(trim($search_current_account))) {
-        $sql .= natural_search("p.accountancy_code_sell_intra", $search_current_account);
-    }
+	if (strlen(trim($search_current_account))) {
+		$sql .= natural_search("p.accountancy_code_sell_intra", $search_current_account);
+	}
 } else {
-    if (strlen(trim($search_current_account))) {
-        $sql .= natural_search("p.accountancy_code_sell_export", $search_current_account);
-    }
+	if (strlen(trim($search_current_account))) {
+		$sql .= natural_search("p.accountancy_code_sell_export", $search_current_account);
+	}
 }
 if ($search_current_account_valid == 'withoutvalidaccount')
 {
@@ -301,7 +301,7 @@ if ($search_current_account_valid == 'withoutvalidaccount')
 }
 if ($search_current_account_valid == 'withvalidaccount')
 {
-    $sql .= " AND aa.account_number IS NOT NULL";
+	$sql .= " AND aa.account_number IS NOT NULL";
 }
 // Add search filter like
 if (strlen(trim($search_ref))) {
@@ -324,13 +324,13 @@ $sql .= $db->order($sortfield, $sortorder);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-    	$page = 0;
-    	$offset = 0;
-    }
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -342,32 +342,32 @@ if ($result)
 	$num = $db->num_rows($result);
 	$i = 0;
 
-    $param = '';
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-    if ($search_ref > 0) $param .= "&search_desc=".urlencode($search_ref);
-    if ($search_label > 0) $param .= "&search_desc=".urlencode($search_label);
-    if ($search_desc > 0) $param .= "&search_desc=".urlencode($search_desc);
+	$param = '';
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+	if ($search_ref > 0) $param .= "&search_desc=".urlencode($search_ref);
+	if ($search_label > 0) $param .= "&search_desc=".urlencode($search_label);
+	if ($search_desc > 0) $param .= "&search_desc=".urlencode($search_desc);
 	if ($search_vat > 0) $param .= '&search_vat='.urlencode($search_vat);
-    if ($search_current_account > 0) $param .= "&search_current_account=".urlencode($search_current_account);
-    if ($search_current_account_valid && $search_current_account_valid != '-1') $param .= "&search_current_account_valid=".urlencode($search_current_account_valid);
-    if ($accounting_product_mode) $param .= '&accounting_product_mode='.urlencode($accounting_product_mode);
+	if ($search_current_account > 0) $param .= "&search_current_account=".urlencode($search_current_account);
+	if ($search_current_account_valid && $search_current_account_valid != '-1') $param .= "&search_current_account_valid=".urlencode($search_current_account_valid);
+	if ($accounting_product_mode) $param .= '&accounting_product_mode='.urlencode($accounting_product_mode);
 
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    print '<input type="hidden" name="action" value="update">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="action" value="update">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
-    print load_fiche_titre($langs->trans("ProductsBinding"), '', 'title_accountancy');
+	print load_fiche_titre($langs->trans("ProductsBinding"), '', 'title_accountancy');
 	print '<br>';
 
 	print '<span class="opacitymedium">'.$langs->trans("InitAccountancyDesc").'</span><br>';
 	print '<br>';
 
-    // Select mode
+	// Select mode
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans('Options').'</td><td>'.$langs->trans('Description').'</td>';
@@ -377,13 +377,13 @@ if ($result)
 	print "</td></tr>\n";
 	if ($mysoc->isInEEC())
 	{
-        print '<tr class="oddeven"><td class="titlefield"><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_SELL_INTRA"'.($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA' ? ' checked' : '').'> '.$langs->trans('OptionModeProductSellIntra').'</td>';
-        print '<td>'.$langs->trans('OptionModeProductSellIntraDesc');
-        print "</td></tr>\n";
+		print '<tr class="oddeven"><td class="titlefield"><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_SELL_INTRA"'.($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA' ? ' checked' : '').'> '.$langs->trans('OptionModeProductSellIntra').'</td>';
+		print '<td>'.$langs->trans('OptionModeProductSellIntraDesc');
+		print "</td></tr>\n";
 	}
-    print '<tr class="oddeven"><td class="titlefield"><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_SELL_EXPORT"'.($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT' ? ' checked' : '').'> '.$langs->trans('OptionModeProductSellExport').'</td>';
-    print '<td>'.$langs->trans('OptionModeProductSellExportDesc');
-    print "</td></tr>\n";
+	print '<tr class="oddeven"><td class="titlefield"><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_SELL_EXPORT"'.($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT' ? ' checked' : '').'> '.$langs->trans('OptionModeProductSellExport').'</td>';
+	print '<td>'.$langs->trans('OptionModeProductSellExportDesc');
+	print "</td></tr>\n";
 	print '<tr class="oddeven"><td class="titlefield"><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_BUY"'.($accounting_product_mode == 'ACCOUNTANCY_BUY' ? ' checked' : '').'> '.$langs->trans('OptionModeProductBuy').'</td>';
 	print '<td>'.$langs->trans('OptionModeProductBuyDesc')."</td></tr>\n";
 	if ($mysoc->isInEEC())
@@ -405,8 +405,8 @@ if ($result)
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
-    $buttonsave = '<input type="submit" class="button" id="changeaccount" name="changeaccount" value="'.$langs->trans("Save").'">';
-    //print '<br><div class="center">'.$buttonsave.'</div>';
+	$buttonsave = '<input type="submit" class="button button-save" id="changeaccount" name="changeaccount" value="'.$langs->trans("Save").'">';
+	//print '<br><div class="center">'.$buttonsave.'</div>';
 
 	$texte = $langs->trans("ListOfProductsServices");
 	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $buttonsave, $num, $nbtotalofrecords, '', 0, '', '', $limit, 0, 0, 1);
@@ -444,22 +444,22 @@ if ($result)
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
-    if (!empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC)) print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "p.description", "", $param, '', $sortfield, $sortorder);
+	if (!empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC)) print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "p.description", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "p.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ');
 	// On sell / On purchase
-    if ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
-        print_liste_field_titre("OnSell", $_SERVER["PHP_SELF"], "p.tosell", "", $param, '', $sortfield, $sortorder, 'center ');
-        $fieldtosortaccount = "p.accountancy_code_sell";
-    } elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
-        print_liste_field_titre("OnSell", $_SERVER["PHP_SELF"], "p.tosell", "", $param, '', $sortfield, $sortorder, 'center ');
-        $fieldtosortaccount = "p.accountancy_code_sell_intra";
-    } elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
-        print_liste_field_titre("OnSell", $_SERVER["PHP_SELF"], "p.tosell", "", $param, '', $sortfield, $sortorder, 'center ');
-        $fieldtosortaccount = "p.accountancy_code_sell_export";
-    } elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
-    	print_liste_field_titre("OnBuy", $_SERVER["PHP_SELF"], "p.tobuy", "", $param, '', $sortfield, $sortorder, 'center ');
-        $fieldtosortaccount = "p.accountancy_code_buy";
-    } elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
+	if ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
+		print_liste_field_titre("OnSell", $_SERVER["PHP_SELF"], "p.tosell", "", $param, '', $sortfield, $sortorder, 'center ');
+		$fieldtosortaccount = "p.accountancy_code_sell";
+	} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
+		print_liste_field_titre("OnSell", $_SERVER["PHP_SELF"], "p.tosell", "", $param, '', $sortfield, $sortorder, 'center ');
+		$fieldtosortaccount = "p.accountancy_code_sell_intra";
+	} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
+		print_liste_field_titre("OnSell", $_SERVER["PHP_SELF"], "p.tosell", "", $param, '', $sortfield, $sortorder, 'center ');
+		$fieldtosortaccount = "p.accountancy_code_sell_export";
+	} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
+		print_liste_field_titre("OnBuy", $_SERVER["PHP_SELF"], "p.tobuy", "", $param, '', $sortfield, $sortorder, 'center ');
+		$fieldtosortaccount = "p.accountancy_code_buy";
+	} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
 		print_liste_field_titre("OnBuy", $_SERVER["PHP_SELF"], "p.tobuy", "", $param, '', $sortfield, $sortorder, 'center ');
 		$fieldtosortaccount = "p.accountancy_code_buy_intra";
 	} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
@@ -475,8 +475,8 @@ if ($result)
 	$product_static = new Product($db);
 
 	$i = 0;
-    while ($i < min($num, $limit))
-    {
+	while ($i < min($num, $limit))
+	{
 		$obj = $db->fetch_object($result);
 
 		// Ref produit as link
@@ -494,12 +494,12 @@ if ($result)
 				$compta_prodsell = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodsell_id = $aarowid_prodsell;
 			} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
-	            $compta_prodsell = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
-    	        $compta_prodsell_id = $aarowid_prodsell_intra;
+				$compta_prodsell = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
+				$compta_prodsell_id = $aarowid_prodsell_intra;
 			} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
-            	$compta_prodsell = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
-            	$compta_prodsell_id = $aarowid_prodsell_export;
-        	} else {
+				$compta_prodsell = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
+				$compta_prodsell_id = $aarowid_prodsell_export;
+			} else {
 				$compta_prodsell = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodsell_id = $aarowid_prodsell;
 			}
@@ -560,11 +560,11 @@ if ($result)
 
 		if (!empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC))
 		{
-		    // TODO ADJUST DESCRIPTION SIZE
-    		// print '<td class="left">' . $obj->description . '</td>';
-    		// TODO: we should set a user defined value to adjust user square / wide screen size
-    		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
-    		print '<td>'.nl2br(dol_trunc($obj->description, $trunclength)).'</td>';
+			// TODO ADJUST DESCRIPTION SIZE
+			// print '<td class="left">' . $obj->description . '</td>';
+			// TODO: we should set a user defined value to adjust user square / wide screen size
+			$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
+			print '<td>'.nl2br(dol_trunc($obj->description, $trunclength)).'</td>';
 		}
 
 		// VAT
@@ -581,36 +581,36 @@ if ($result)
 		// Current accounting account
 		print '<td class="left">';
 		if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
-		    print length_accountg($obj->accountancy_code_buy);
-		    if ($obj->accountancy_code_buy && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+			print length_accountg($obj->accountancy_code_buy);
+			if ($obj->accountancy_code_buy && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
 		} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
-            print length_accountg($obj->accountancy_code_buy_intra);
-            if ($obj->accountancy_code_buy_intra && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
-        } elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
-            print length_accountg($obj->accountancy_code_buy_export);
-            if ($obj->accountancy_code_buy_export && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
-        } elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
-            print length_accountg($obj->accountancy_code_sell);
-            if ($obj->accountancy_code_sell && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
-        } elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
-		    print length_accountg($obj->accountancy_code_sell_intra);
-		    if ($obj->accountancy_code_sell_intra && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+			print length_accountg($obj->accountancy_code_buy_intra);
+			if ($obj->accountancy_code_buy_intra && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+		} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
+			print length_accountg($obj->accountancy_code_buy_export);
+			if ($obj->accountancy_code_buy_export && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+		} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
+			print length_accountg($obj->accountancy_code_sell);
+			if ($obj->accountancy_code_sell && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+		} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
+			print length_accountg($obj->accountancy_code_sell_intra);
+			if ($obj->accountancy_code_sell_intra && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
 		} else {
-            print length_accountg($obj->accountancy_code_sell_export);
-            if ($obj->accountancy_code_sell_export && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
-        }
+			print length_accountg($obj->accountancy_code_sell_export);
+			if ($obj->accountancy_code_sell_export && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+		}
 		print '</td>';
 
 		// New account to set
 		$defaultvalue = '';
 		if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
-    		// Accounting account buy
+			// Accounting account buy
 			print '<td class="left">';
 			//$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha');        This is id and we need a code
 			if (empty($defaultvalue)) $defaultvalue = $compta_prodbuy;
 			$codesell = length_accountg($obj->accountancy_code_buy);
 			if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
-			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1);
+			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
 			print '</td>';
 		} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
 			// Accounting account buy intra (In EEC)
@@ -620,7 +620,7 @@ if ($result)
 			$codesell = length_accountg($obj->accountancy_code_buy_intra);
 			//var_dump($defaultvalue.' - '.$codesell.' - '.$compta_prodsell);
 			if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
-			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1);
+			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
 			print '</td>';
 		} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
 			// Accounting account buy export (Out of EEC)
@@ -630,7 +630,7 @@ if ($result)
 			$codesell = length_accountg($obj->accountancy_code_buy_export);
 			//var_dump($defaultvalue.' - '.$codesell.' - '.$compta_prodsell);
 			if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
-			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1);
+			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
 			print '</td>';
 		} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
 			// Accounting account sell
@@ -640,32 +640,32 @@ if ($result)
 			$codesell = length_accountg($obj->accountancy_code_sell);
 			//var_dump($defaultvalue.' - '.$codesell.' - '.$compta_prodsell);
 			if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
-			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1);
+			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
 			print '</td>';
 		} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
-            // Accounting account sell intra (In EEC)
-            print '<td class="left">';
-            //$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha');        This is id and we need a code
-            if (empty($defaultvalue)) $defaultvalue = $compta_prodsell;
-            $codesell = length_accountg($obj->accountancy_code_sell_intra);
-            //var_dump($defaultvalue.' - '.$codesell.' - '.$compta_prodsell);
-            if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
-            print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1);
-            print '</td>';
-        } else {
-            // Accounting account sell export (Out of EEC)
-            print '<td class="left">';
-            //$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha');        This is id and we need a code
-            if (empty($defaultvalue)) $defaultvalue = $compta_prodsell;
-            $codesell = length_accountg($obj->accountancy_code_sell_export);
-            if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
-            print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1);
-            print '</td>';
-        }
+			// Accounting account sell intra (In EEC)
+			print '<td class="left">';
+			//$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha');        This is id and we need a code
+			if (empty($defaultvalue)) $defaultvalue = $compta_prodsell;
+			$codesell = length_accountg($obj->accountancy_code_sell_intra);
+			//var_dump($defaultvalue.' - '.$codesell.' - '.$compta_prodsell);
+			if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
+			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
+			print '</td>';
+		} else {
+			// Accounting account sell export (Out of EEC)
+			print '<td class="left">';
+			//$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha');        This is id and we need a code
+			if (empty($defaultvalue)) $defaultvalue = $compta_prodsell;
+			$codesell = length_accountg($obj->accountancy_code_sell_export);
+			if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
+			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
+			print '</td>';
+		}
 
 		// Checkbox select
 		print '<td class="center">';
-		print '<input type="checkbox" class="checkforselect" name="chk_prod[]" value="'.$obj->rowid.'"/></td>';
+		print '<input type="checkbox" class="checkforselect productforselectcodeventil_'.$product_static->id.'" name="chk_prod[]" value="'.$obj->rowid.'"/></td>';
 		print "</tr>";
 		$i++;
 	}
@@ -689,7 +689,17 @@ if ($result)
 	            if (atleastoneselected) jQuery("#changeaccount").attr(\'class\',\'button\');
 	            else jQuery("#changeaccount").attr(\'class\',\'button\');
         	}
-        	jQuery(".checkforselect, #checkallactions").click(function() {
+
+        	jQuery(".checkforselect").change(function() {
+        		init_savebutton();
+        	});
+        	jQuery(".productforselect").change(function() {
+				console.log($(this).attr("id")+" "+$(this).val());
+				if ($(this).val() && $(this).val() != -1) {
+					$(".productforselect"+$(this).attr("id")).prop(\'checked\', true);
+				} else {
+					$(".productforselect"+$(this).attr("id")).prop(\'checked\', false);
+				}
         		init_savebutton();
         	});
 
diff --git a/htdocs/accountancy/admin/subaccount.php b/htdocs/accountancy/admin/subaccount.php
new file mode 100644
index 00000000000..20fe5b86355
--- /dev/null
+++ b/htdocs/accountancy/admin/subaccount.php
@@ -0,0 +1,419 @@
+<?php
+/* Copyright (C) 2013-2016 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2020 Alexandre Spangaro   <aspangaro@open-dsi.fr>
+ * Copyright (C) 2016-2018 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file 		htdocs/accountancy/admin/subaccount.php
+ * \ingroup     Accountancy (Double entries)
+ * \brief		List of accounting sub-account (auxiliary accounts)
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("compta", "bills", "admin", "accountancy", "salaries", "hrm", "errors"));
+
+$mesg = '';
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'alpha');
+$id = GETPOST('id', 'int');
+$rowid = GETPOST('rowid', 'int');
+$massaction = GETPOST('massaction', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'accountingsubaccountlist'; // To manage different context of search
+
+$search_subaccount = GETPOST('search_subaccount', 'alpha');
+$search_label = GETPOST('search_label', 'alpha');
+$search_type = GETPOST('search_type', 'int');
+
+// Security check
+if ($user->socid > 0) accessforbidden();
+if (!$user->rights->accounting->chartofaccount) accessforbidden();
+
+// Load variable for pagination
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortfield) $sortfield = "label";
+if (!$sortorder) $sortorder = "ASC";
+
+$arrayfields = array(
+	'subaccount'=>array('label'=>$langs->trans("AccountNumber"), 'checked'=>1),
+	'label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
+	'type'=>array('label'=>$langs->trans("Type"), 'checked'=>1),
+	'reconcilable'=>array('label'=>$langs->trans("Reconcilable"), 'checked'=>1)
+);
+
+if ($conf->global->MAIN_FEATURES_LEVEL < 2) unset($arrayfields['reconcilable']);
+
+/*
+ * Actions
+ */
+
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha')) { $massaction = ''; }
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+	if (!empty($cancel)) $action = '';
+
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
+	{
+		$search_subaccount = "";
+		$search_label = "";
+		$search_type = "";
+		$search_array_options = array();
+	}
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$title = $langs->trans('ChartOfIndividualAccountsOfSubsidiaryLedger');
+
+llxHeader('', $title);
+
+// Customer
+$sql = "SELECT sa.rowid, sa.nom as label, sa.code_compta as subaccount, '1' as type, sa.entity";
+$sql .= " FROM ".MAIN_DB_PREFIX."societe sa";
+$sql .= " WHERE sa.entity IN (".getEntity('societe').")";
+$sql .= " AND sa.code_compta <> ''";
+//print $sql;
+if (strlen(trim($search_subaccount))) {
+	$lengthpaddingaccount = 0;
+	if ($conf->global->ACCOUNTING_LENGTH_AACCOUNT) {
+		$lengthpaddingaccount = max($conf->global->ACCOUNTING_LENGTH_AACCOUNT);
+	}
+	$search_subaccount_tmp = $search_subaccount;
+	$weremovedsomezero = 0;
+	if (strlen($search_subaccount_tmp) <= $lengthpaddingaccount) {
+		for ($i = 0; $i < $lengthpaddingaccount; $i++) {
+			if (preg_match('/0$/', $search_subaccount_tmp)) {
+				$weremovedsomezero++;
+				$search_subaccount_tmp = preg_replace('/0$/', '', $search_subaccount_tmp);
+			}
+		}
+	}
+
+	//var_dump($search_subaccount); exit;
+	if ($search_subaccount_tmp) {
+		if ($weremovedsomezero) {
+			$search_subaccount_tmp_clean = $search_subaccount_tmp;
+			$search_subaccount_clean = $search_subaccount;
+			$startchar = '%';
+			if (strpos($search_subaccount_tmp, '^') === 0)
+			{
+				$startchar = '';
+				$search_subaccount_tmp_clean = preg_replace('/^\^/', '', $search_subaccount_tmp);
+				$search_subaccount_clean = preg_replace('/^\^/', '', $search_subaccount);
+			}
+			$sql .= " AND (sa.code_compta LIKE '".$db->escape($startchar.$search_subaccount_tmp_clean)."'";
+			$sql .= " OR sa.code_compta LIKE '".$db->escape($startchar.$search_subaccount_clean)."%')";
+		} else $sql .= natural_search("sa.code_compta", $search_subaccount_tmp);
+	}
+}
+if (strlen(trim($search_label)))				$sql .= natural_search("sa.nom", $search_label);
+if (!empty($search_type) && $search_type >= 0)	$sql .= " HAVING type LIKE '".$db->escape($search_type)."'";
+
+// Supplier
+$sql .= " UNION ";
+$sql .= " SELECT sa.rowid, sa.nom as label, sa.code_compta_fournisseur as subaccount, '2' as type, sa.entity FROM ".MAIN_DB_PREFIX."societe sa";
+$sql .= " WHERE sa.entity IN (".getEntity('societe').")";
+$sql .= " AND sa.code_compta_fournisseur <> ''";
+//print $sql;
+if (strlen(trim($search_subaccount))) {
+	$lengthpaddingaccount = 0;
+	if ($conf->global->ACCOUNTING_LENGTH_AACCOUNT) {
+		$lengthpaddingaccount = max($conf->global->ACCOUNTING_LENGTH_AACCOUNT);
+	}
+	$search_subaccount_tmp = $search_subaccount;
+	$weremovedsomezero = 0;
+	if (strlen($search_subaccount_tmp) <= $lengthpaddingaccount) {
+		for ($i = 0; $i < $lengthpaddingaccount; $i++) {
+			if (preg_match('/0$/', $search_subaccount_tmp)) {
+				$weremovedsomezero++;
+				$search_subaccount_tmp = preg_replace('/0$/', '', $search_subaccount_tmp);
+			}
+		}
+	}
+
+	//var_dump($search_subaccount); exit;
+	if ($search_subaccount_tmp) {
+		if ($weremovedsomezero) {
+			$search_subaccount_tmp_clean = $search_subaccount_tmp;
+			$search_subaccount_clean = $search_subaccount;
+			$startchar = '%';
+			if (strpos($search_subaccount_tmp, '^') === 0)
+			{
+				$startchar = '';
+				$search_subaccount_tmp_clean = preg_replace('/^\^/', '', $search_subaccount_tmp);
+				$search_subaccount_clean = preg_replace('/^\^/', '', $search_subaccount);
+			}
+			$sql .= " AND (sa.code_compta_fournisseur LIKE '".$db->escape($startchar.$search_subaccount_tmp_clean)."'";
+			$sql .= " OR sa.code_compta_fournisseur LIKE '".$db->escape($startchar.$search_subaccount_clean)."%')";
+		} else $sql .= natural_search("sa.code_compta_fournisseur", $search_subaccount_tmp);
+	}
+}
+if (strlen(trim($search_label)))				$sql .= natural_search("sa.nom", $search_label);
+if (!empty($search_type) && $search_type >= 0)	$sql .= " HAVING type LIKE '".$db->escape($search_type)."'";
+
+// User
+$sql .= " UNION ";
+$sql .= " SELECT u.rowid, u.lastname as label, u.accountancy_code as subaccount, '3' as type, u.entity FROM ".MAIN_DB_PREFIX."user u";
+$sql .= " WHERE u.entity IN (".getEntity('user').")";
+$sql .= " AND u.accountancy_code <> ''";
+//print $sql;
+if (strlen(trim($search_subaccount))) {
+	$lengthpaddingaccount = 0;
+	if ($conf->global->ACCOUNTING_LENGTH_AACCOUNT) {
+		$lengthpaddingaccount = max($conf->global->ACCOUNTING_LENGTH_AACCOUNT);
+	}
+	$search_subaccount_tmp = $search_subaccount;
+	$weremovedsomezero = 0;
+	if (strlen($search_subaccount_tmp) <= $lengthpaddingaccount) {
+		for ($i = 0; $i < $lengthpaddingaccount; $i++) {
+			if (preg_match('/0$/', $search_subaccount_tmp)) {
+				$weremovedsomezero++;
+				$search_subaccount_tmp = preg_replace('/0$/', '', $search_subaccount_tmp);
+			}
+		}
+	}
+
+	//var_dump($search_subaccount); exit;
+	if ($search_subaccount_tmp) {
+		if ($weremovedsomezero) {
+			$search_subaccount_tmp_clean = $search_subaccount_tmp;
+			$search_subaccount_clean = $search_subaccount;
+			$startchar = '%';
+			if (strpos($search_subaccount_tmp, '^') === 0)
+			{
+				$startchar = '';
+				$search_subaccount_tmp_clean = preg_replace('/^\^/', '', $search_subaccount_tmp);
+				$search_subaccount_clean = preg_replace('/^\^/', '', $search_subaccount);
+			}
+			$sql .= " AND (u.accountancy_code LIKE '".$db->escape($startchar.$search_subaccount_tmp_clean)."'";
+			$sql .= " OR u.accountancy_code LIKE '".$db->escape($startchar.$search_subaccount_clean)."%')";
+		} else $sql .= natural_search("u.accountancy_code", $search_subaccount_tmp);
+	}
+}
+if (strlen(trim($search_label)))				$sql .= natural_search("u.lastname", $search_label);
+if (!empty($search_type) && $search_type >= 0)	$sql .= " HAVING type LIKE '".$db->escape($search_type)."'";
+
+$sql .= $db->order($sortfield, $sortorder);
+
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+	$resql = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($resql);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
+}
+
+$sql .= $db->plimit($limit + 1, $offset);
+
+dol_syslog('accountancy/admin/subaccount.php:: $sql='.$sql);
+$resql = $db->query($sql);
+
+if ($resql)
+{
+	$num = $db->num_rows($resql);
+
+	$param = '';
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+	if ($search_subaccount) $param .= '&search_subaccount='.urlencode($search_subaccount);
+	if ($search_label) $param .= '&search_label='.urlencode($search_label);
+	if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
+
+	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit, 0, 0, 1);
+
+	print '<div class="warning">'.$langs->trans("WarningCreateSubAccounts").'</div>';
+
+	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+
+	$moreforfilter = '';
+	$massactionbutton = '';
+
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+
+	// Line for search fields
+	print '<tr class="liste_titre_filter">';
+	if (!empty($arrayfields['subaccount']['checked']))	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_subaccount" value="'.$search_subaccount.'"></td>';
+	if (!empty($arrayfields['label']['checked']))		print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_label" value="'.$search_label.'"></td>';
+	if (!empty($arrayfields['type']['checked']))		print '<td class="liste_titre center">'.$form->selectarray('search_type', array('1'=>$langs->trans('Customer'), '2'=>$langs->trans('Supplier'), '3'=>$langs->trans('Employee')), $search_type, 1).'</td>';
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { if (!empty($arrayfields['reconcilable']['checked']))   print '<td class="liste_titre">&nbsp;</td>'; }
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
+	print $searchpicto;
+	print '</td>';
+	print '</tr>';
+
+	print '<tr class="liste_titre">';
+	if (!empty($arrayfields['subaccount']['checked']))	print_liste_field_titre($arrayfields['subaccount']['label'], $_SERVER["PHP_SELF"], "subaccount", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['label']['checked']))		print_liste_field_titre($arrayfields['label']['label'], $_SERVER["PHP_SELF"], "label", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['type']['checked']))		print_liste_field_titre($arrayfields['type']['label'], $_SERVER["PHP_SELF"], "type", "", $param, '', $sortfield, $sortorder, 'center ');
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { if (!empty($arrayfields['reconcilable']['checked']))	print_liste_field_titre($arrayfields['reconcilable']['label'], $_SERVER["PHP_SELF"], 'reconcilable', '', $param, '', $sortfield, $sortorder, 'center '); }
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+	print "</tr>\n";
+
+	$totalarray = array();
+	$i = 0;
+	while ($i < min($num, $limit))
+	{
+		$obj = $db->fetch_object($resql);
+
+		print '<tr class="oddeven">';
+
+		// Account number
+		if (!empty($arrayfields['subaccount']['checked']))
+		{
+			print "<td>";
+			print length_accounta($obj->subaccount);
+			print "</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+		}
+
+		// Subaccount label
+		if (!empty($arrayfields['label']['checked']))
+		{
+			print "<td>";
+			print $obj->label;
+			print "</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+		}
+
+		// Type
+		if (!empty($arrayfields['type']['checked']))
+		{
+			print '<td class="center">';
+			$s = '';
+			// Customer
+			if ($obj->type == 1)
+			{
+				$s .= '<a class="customer-back" style="padding-left: 6px; padding-right: 6px" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->rowid.'">'.$langs->trans("Customer").'</a>';
+			}
+			// Supplier
+			elseif ($obj->type == 2)
+			{
+				$s .= '<a class="vendor-back" style="padding-left: 6px; padding-right: 6px" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->rowid.'">'.$langs->trans("Supplier").'</a>';
+			}
+			// User
+			elseif ($obj->type == 3)
+			{
+				$s .= '<a class="user-back" style="padding-left: 6px; padding-right: 6px" title="'.$langs->trans("Employee").'" href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->id.'">'.$langs->trans("Employee").'</a>';
+			}
+			print $s;
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+
+		if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+			// Activated or not reconciliation on accounting account
+			if (!empty($arrayfields['reconcilable']['checked'])) {
+				print '<td class="center">';
+				if (empty($obj->reconcilable)) {
+					print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=enable&mode=1">';
+					print img_picto($langs->trans("Disabled"), 'switch_off');
+					print '</a>';
+				} else {
+					print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=disable&mode=1">';
+					print img_picto($langs->trans("Activated"), 'switch_on');
+					print '</a>';
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+		}
+
+		// Action
+		print '<td class="center">';
+			$e = '';
+			// Customer
+		if ($obj->type == 1)
+			{
+			$e .= '<a class="editfielda" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/societe/card.php?action=edit&socid='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_edit().'</a>';
+		}
+			// Supplier
+		elseif ($obj->type == 2)
+			{
+			$e .= '<a class="editfielda" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/societe/card.php?action=edit&socid='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_edit().'</a>';
+		}
+			// User
+		elseif ($obj->type == 3)
+			{
+			$e .= '<a class="editfielda" title="'.$langs->trans("Employee").'" href="'.DOL_URL_ROOT.'/user/card.php?action=edit&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_edit().'</a>';
+		}
+			print $e;
+		print '</td>'."\n";
+		if (!$i) $totalarray['nbfield']++;
+
+		print '</tr>'."\n";
+		$i++;
+	}
+
+	$db->free($resql);
+
+	$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
+	print "</table>";
+	print "</div>";
+
+	print '</form>';
+} else {
+	dol_print_error($db);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 3608622916d..232444b7d97 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -227,8 +227,8 @@ if ($action != 'export_csv')
 	$moreforfilter .= $form->selectDate($search_date_end ? $search_date_end : -1, 'date_end', 0, 0, 1, '', 1, 0);
 
 	$moreforfilter .= ' - ';
-	$moreforfilter .= $langs->trans('ShowSubtotalByGroup').': ';
-	$moreforfilter .= '<input type="checkbox" name="show_subgroup" value="show_subgroup"'.($show_subgroup == 'show_subgroup' ? ' checked' : '').'>';
+	$moreforfilter .= '<label for="show_subgroup">'.$langs->trans('ShowSubtotalByGroup').'</label>: ';
+	$moreforfilter .= '<input type="checkbox" name="show_subgroup" id="show_subgroup" value="show_subgroup"'.($show_subgroup == 'show_subgroup' ? ' checked' : '').'>';
 
 
 	$moreforfilter .= '</div>';
@@ -272,13 +272,15 @@ if ($action != 'export_csv')
 	$total_credit = 0;
 	$sous_total_debit = 0;
 	$sous_total_credit = 0;
+	$total_opening_balance = 0;
+	$sous_total_opening_balance = 0;
 	$displayed_account = "";
 
-    $accountingaccountstatic = new AccountingAccount($db);
+	$accountingaccountstatic = new AccountingAccount($db);
 
 	$sql = "SELECT t.numero_compte, (SUM(t.debit) - SUM(t.credit)) as opening_balance";
 	$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as t";
-	$sql .= " WHERE t.entity = ".$conf->entity;		// Never do sharing into accounting features
+	$sql .= " WHERE t.entity = ".$conf->entity; // Never do sharing into accounting features
 	$sql .= " AND t.doc_date < '".$db->idate($search_date_start)."'";
 	$sql .= " GROUP BY t.numero_compte";
 
@@ -292,17 +294,23 @@ if ($action != 'export_csv')
 
 	foreach ($object->lines as $line)
 	{
-        $accountingaccountstatic->fetch(null, $line->numero_compte, true);
-        if (!empty($accountingaccountstatic->account_number)) {
-            $accounting_account = $accountingaccountstatic->getNomUrl(0, 1);
-        } else {
-            $accounting_account = length_accountg($line->numero_compte);
-        }
+		$accountingaccountstatic->fetch(null, $line->numero_compte, true);
+		if (!empty($accountingaccountstatic->account_number)) {
+			$accounting_account = $accountingaccountstatic->getNomUrl(0, 1);
+		} else {
+			$accounting_account = length_accountg($line->numero_compte);
+		}
 
 		$link = '';
 		$total_debit += $line->debit;
 		$total_credit += $line->credit;
-		$root_account_description = $object->get_compte_racine($line->numero_compte);
+		$opening_balance = isset($opening_balances["'".$line->numero_compte."'"]) ? $opening_balances["'".$line->numero_compte."'"] : 0;
+		$total_opening_balance += $opening_balance;
+
+		$tmparrayforrootaccount = $object->getRootAccount($line->numero_compte);
+		$root_account_description = $tmparrayforrootaccount['label'];
+		$root_account_number = $tmparrayforrootaccount['account_number'];
+
 		if (empty($accountingaccountstatic->account_number)) {
 			$link = '<a href="'.DOL_URL_ROOT.'/accountancy/admin/card.php?action=create&accountingaccount='.length_accountg($line->numero_compte).'">'.img_edit_add().'</a>';
 		}
@@ -311,14 +319,14 @@ if ($action != 'export_csv')
 		if (!empty($show_subgroup))
 		{
 			// Show accounting account
-			if (empty($displayed_account) || $root_account_description != $displayed_account) {
+			if (empty($displayed_account) || $root_account_number != $displayed_account) {
 				// Show subtotal per accounting account
 				if ($displayed_account != "") {
 					print '<tr class="liste_total">';
 					print '<td class="right" colspan="2">'.$langs->trans("SubTotal").':</td>';
 					print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
 					print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
-					print '<td class="nowrap right">'.price(price2num($sous_total_credit - $sous_total_debit)).'</td>';
+					print '<td class="nowrap right">'.price(price2num($sous_total_opening_balance + $sous_total_credit - $sous_total_debit)).'</td>';
 					print "<td></td>\n";
 					print '</tr>';
 				}
@@ -328,18 +336,18 @@ if ($action != 'export_csv')
 				print '<td colspan="6" style="font-weight:bold; border-bottom: 1pt solid black;">'.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').'</td>';
 				print '</tr>';
 
-				$displayed_account = $root_account_description;
+				$displayed_account = $root_account_number;
 				$sous_total_debit = 0;
 				$sous_total_credit = 0;
+				$sous_total_opening_balance = 0;
 			}
 		}
 
-		// $object->get_compte_racine($line->numero_compte);
 		print '<td>'.$accounting_account.'</td>';
-		print '<td class="nowraponall right">'.price($opening_balances["'".$line->numero_compte."'"]).'</td>';
+		print '<td class="nowraponall right">'.price($opening_balance).'</td>';
 		print '<td class="nowraponall right">'.price($line->debit).'</td>';
 		print '<td class="nowraponall right">'.price($line->credit).'</td>';
-		print '<td class="nowraponall right">'.price($line->debit - $line->credit).'</td>';
+		print '<td class="nowraponall right">'.price(price2num($opening_balance + $line->debit - $line->credit, 'MT')).'</td>';
 		print '<td class="center">'.$link;
 		print '</td>';
 		print "</tr>\n";
@@ -347,16 +355,17 @@ if ($action != 'export_csv')
 		// Records the sub-total
 		$sous_total_debit += $line->debit;
 		$sous_total_credit += $line->credit;
+		$sous_total_opening_balance += $opening_balance;
 	}
 
 	if (!empty($show_subgroup))
 	{
-		print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("SubTotal").':</td><td class="nowrap right">'.price($sous_total_debit).'</td><td class="nowrap right">'.price($sous_total_credit).'</td><td class="nowrap right">'.price(price2num($sous_total_debit - $sous_total_credit)).'</td>';
+		print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("SubTotal").':</td><td class="nowrap right">'.price($sous_total_debit).'</td><td class="nowrap right">'.price($sous_total_credit).'</td><td class="nowrap right">'.price(price2num($sous_total_opening_balance + $sous_total_debit - $sous_total_credit, 'MT')).'</td>';
 		print "<td></td>\n";
 		print '</tr>';
 	}
 
-	print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("AccountBalance").':</td><td class="nowrap right">'.price($total_debit).'</td><td class="nowrap right">'.price($total_credit).'</td><td class="nowrap right">'.price(price2num($total_debit - $total_credit)).'</td>';
+	print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("AccountBalance").':</td><td class="nowrap right">'.price($total_debit).'</td><td class="nowrap right">'.price($total_credit).'</td><td class="nowrap right">'.price(price2num($total_opening_balance + $total_debit - $total_credit, 'MT')).'</td>';
 	print "<td></td>\n";
 	print '</tr>';
 
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index ef105b6709a..d0f43cfe3dd 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2013-2017  Florian Henry           <florian.henry@open-concept.pro>
  * Copyright (C) 2013-2018  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2017       Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric 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
@@ -114,12 +114,12 @@ if ($action == "confirm_update") {
 			$object->credit = $credit;
 
 			if (floatval($debit) != 0.0) {
-				$object->montant = $debit;	// deprecated
+				$object->montant = $debit; // deprecated
 				$object->amount = $debit;
 				$object->sens = 'D';
 			}
 			if (floatval($credit) != 0.0) {
-				$object->montant = $credit;	// deprecated
+				$object->montant = $credit; // deprecated
 				$object->amount = $credit;
 				$object->sens = 'C';
 			}
@@ -128,8 +128,7 @@ if ($action == "confirm_update") {
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 			} else {
-				if ($mode != '_tmp')
-				{
+				if ($mode != '_tmp') {
 					setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 				}
 
@@ -165,23 +164,23 @@ if ($action == "confirm_update") {
 		$object->label_operation = $label_operation;
 		$object->debit = $debit;
 		$object->credit = $credit;
-		$object->doc_date = GETPOST('doc_date', 'alpha');
-		$object->doc_type = GETPOST('doc_type', 'alpha');
+		$object->doc_date = (string) GETPOST('doc_date', 'alpha');
+		$object->doc_type = (string) GETPOST('doc_type', 'alpha');
 		$object->piece_num = $piece_num;
-		$object->doc_ref = GETPOST('doc_ref', 'alpha');
+		$object->doc_ref = (string) GETPOST('doc_ref', 'alpha');
 		$object->code_journal = $journal_code;
 		$object->journal_label = $journal_label;
-		$object->fk_doc = (int) GETPOST('fk_doc', 'int');
-		$object->fk_docdet = (int) GETPOST('fk_docdet', 'int');
+		$object->fk_doc = GETPOSTINT('fk_doc');
+		$object->fk_docdet = GETPOSTINT('fk_docdet');
 
 		if (floatval($debit) != 0.0) {
-			$object->montant = $debit;	// deprecated
+			$object->montant = $debit; // deprecated
 			$object->amount = $debit;
 			$object->sens = 'D';
 		}
 
 		if (floatval($credit) != 0.0) {
-			$object->montant = $credit;	// deprecated
+			$object->montant = $credit; // deprecated
 			$object->amount = $credit;
 			$object->sens = 'C';
 		}
@@ -190,8 +189,7 @@ if ($action == "confirm_update") {
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		} else {
-			if ($mode != '_tmp')
-			{
+			if ($mode != '_tmp') {
 				setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 			}
 
@@ -245,7 +243,7 @@ if ($action == "confirm_update") {
 		$object->journal_label = $journal_label;
 		$object->fk_doc = 0;
 		$object->fk_docdet = 0;
-		$object->montant = 0;	// deprecated
+		$object->montant = 0; // deprecated
 		$object->amount = 0;
 
 		$result = $object->createStd($user, 0, $mode);
@@ -328,7 +326,7 @@ llxHeader('', $langs->trans("CreateMvts"));
 
 // Confirmation to delete the command
 if ($action == 'delete') {
-	$formconfirm = $html->formconfirm($_SERVER["PHP_SELF"].'?id='.$id.'&mode='.$mode, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'confirm_delete', '', 0, 1);
+	$formconfirm = $html->formconfirm($_SERVER["PHP_SELF"].'?id='.$id.'&mode='.$mode, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt', $langs->transnoentitiesnoconv("RegistrationInAccounting")), 'confirm_delete', '', 0, 1);
 	print $formconfirm;
 }
 
@@ -351,7 +349,7 @@ if ($action == 'create')
 	print '<input type="hidden" name="next_num_mvt" value="'.$next_num_mvt.'">'."\n";
 	print '<input type="hidden" name="mode" value="_tmp">'."\n";
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">';
 
@@ -386,12 +384,12 @@ if ($action == 'create')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Create").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" value="'.$langs->trans("Cancel").'" class="button" onclick="history.go(-1)" />';
+	print '<input type="button" value="'.$langs->trans("Cancel").'" class="button button-cancel" onclick="history.go(-1)" />';
 	print '</div>';
 
 	print '</form>';
@@ -415,7 +413,7 @@ if ($action == 'create')
 		$head[$h][2] = 'transaction';
 		$h++;
 
-		dol_fiche_head($head, 'transaction', '', -1);
+		print dol_get_fiche_head($head, 'transaction', '', -1);
 
 		//dol_banner_tab($object, '', $backlink);
 
@@ -573,7 +571,7 @@ if ($action == 'create')
 
 		print '</div></div><!-ee-->';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div style="clear:both"></div>';
 
@@ -707,7 +705,7 @@ if ($action == 'create')
 					}
 
 					print ' &nbsp; ';
-					print '<a class="button" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/list.php">'.$langs->trans("Cancel").'</a>';
+					print '<a class="button button-cancel" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/list.php">'.$langs->trans("Cancel").'</a>';
 
 					print "</div>";
 				}
@@ -719,7 +717,7 @@ if ($action == 'create')
 	}
 }
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 813dbd4a37f..92de49d66ed 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -108,7 +108,7 @@ $hookmanager->initHooks(array('bookkeepinglist'));
 $formaccounting = new FormAccounting($db);
 $form = new Form($db);
 
-if (!in_array($action, array('export_file', 'delmouv', 'delmouvconfirm')) && !isset($_POST['begin']) && !isset($_GET['begin']) && !isset($_POST['formfilteraction']) && GETPOST('page', 'int') == '' && !GETPOST('noreset', 'int') && $user->rights->accounting->mouvements->export)
+if (!in_array($action, array('export_file', 'delmouv', 'delmouvconfirm')) && !GETPOSTISSET('begin') && !GETPOSTISSET('formfilteraction') && GETPOST('page', 'int') == '' && !GETPOST('noreset', 'int') && $user->rights->accounting->mouvements->export)
 {
 	if (empty($search_date_start) && empty($search_date_end) && !GETPOSTISSET('restore_lastsearch_values'))
 	{
@@ -151,7 +151,7 @@ $arrayfields = array(
 	't.code_journal'=>array('label'=>$langs->trans("Codejournal"), 'checked'=>1),
 	't.date_creation'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0),
 	't.tms'=>array('label'=>$langs->trans("DateModification"), 'checked'=>0),
-    't.date_export'=>array('label'=>$langs->trans("DateExport"), 'checked'=>1),
+	't.date_export'=>array('label'=>$langs->trans("DateExport"), 'checked'=>1),
 );
 
 if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) unset($arrayfields['t.lettering_code']);
@@ -176,145 +176,145 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $search_mvt_num = '';
-        $search_doc_type = '';
-        $search_doc_ref = '';
-        $search_doc_date = '';
-        $search_accountancy_code = '';
-        $search_accountancy_code_start = '';
-        $search_accountancy_code_end = '';
-        $search_accountancy_aux_code = '';
-        $search_accountancy_aux_code_start = '';
-        $search_accountancy_aux_code_end = '';
-        $search_mvt_label = '';
-        $search_direction = '';
-        $search_ledger_code = '';
-        $search_date_start = '';
-        $search_date_end = '';
-        $search_date_creation_start = '';
-        $search_date_creation_end = '';
-        $search_date_modification_start = '';
-        $search_date_modification_end = '';
-        $search_date_export_start = '';
-        $search_date_export_end = '';
-        $search_debit = '';
-        $search_credit = '';
-        $search_lettering_code = '';
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$search_mvt_num = '';
+		$search_doc_type = '';
+		$search_doc_ref = '';
+		$search_doc_date = '';
+		$search_accountancy_code = '';
+		$search_accountancy_code_start = '';
+		$search_accountancy_code_end = '';
+		$search_accountancy_aux_code = '';
+		$search_accountancy_aux_code_start = '';
+		$search_accountancy_aux_code_end = '';
+		$search_mvt_label = '';
+		$search_direction = '';
+		$search_ledger_code = '';
+		$search_date_start = '';
+		$search_date_end = '';
+		$search_date_creation_start = '';
+		$search_date_creation_end = '';
+		$search_date_modification_start = '';
+		$search_date_modification_end = '';
+		$search_date_export_start = '';
+		$search_date_export_end = '';
+		$search_debit = '';
+		$search_credit = '';
+		$search_lettering_code = '';
 		$search_not_reconciled = '';
-    }
+	}
 
-    // Must be after the remove filter action, before the export.
-    $param = '';
-    $filter = array();
-    if (!empty($search_date_start)) {
-        $filter['t.doc_date>='] = $search_date_start;
-        $tmp = dol_getdate($search_date_start);
-        $param .= '&search_date_startmonth='.urlencode($tmp['mon']).'&search_date_startday='.urlencode($tmp['mday']).'&search_date_startyear='.urlencode($tmp['year']);
-    }
-    if (!empty($search_date_end)) {
-        $filter['t.doc_date<='] = $search_date_end;
-        $tmp = dol_getdate($search_date_end);
-        $param .= '&search_date_endmonth='.urlencode($tmp['mon']).'&search_date_endday='.urlencode($tmp['mday']).'&search_date_endyear='.urlencode($tmp['year']);
-    }
-    if (!empty($search_doc_date)) {
-        $filter['t.doc_date'] = $search_doc_date;
-        $tmp = dol_getdate($search_doc_date);
-        $param .= '&doc_datemonth='.urlencode($tmp['mon']).'&doc_dateday='.urlencode($tmp['mday']).'&doc_dateyear='.urlencode($tmp['year']);
-    }
-    if (!empty($search_doc_type)) {
-        $filter['t.doc_type'] = $search_doc_type;
-        $param .= '&search_doc_type='.urlencode($search_doc_type);
-    }
-    if (!empty($search_doc_ref)) {
-        $filter['t.doc_ref'] = $search_doc_ref;
-        $param .= '&search_doc_ref='.urlencode($search_doc_ref);
-    }
-    if (!empty($search_accountancy_code)) {
-        $filter['t.numero_compte'] = $search_accountancy_code;
-        $param .= '&search_accountancy_code='.urlencode($search_accountancy_code);
-    }
-    if (!empty($search_accountancy_code_start)) {
-        $filter['t.numero_compte>='] = $search_accountancy_code_start;
-        $param .= '&search_accountancy_code_start='.urlencode($search_accountancy_code_start);
-    }
-    if (!empty($search_accountancy_code_end)) {
-        $filter['t.numero_compte<='] = $search_accountancy_code_end;
-        $param .= '&search_accountancy_code_end='.urlencode($search_accountancy_code_end);
-    }
-    if (!empty($search_accountancy_aux_code)) {
-        $filter['t.subledger_account'] = $search_accountancy_aux_code;
-        $param .= '&search_accountancy_aux_code='.urlencode($search_accountancy_aux_code);
-    }
-    if (!empty($search_accountancy_aux_code_start)) {
-        $filter['t.subledger_account>='] = $search_accountancy_aux_code_start;
-        $param .= '&search_accountancy_aux_code_start='.urlencode($search_accountancy_aux_code_start);
-    }
-    if (!empty($search_accountancy_aux_code_end)) {
-        $filter['t.subledger_account<='] = $search_accountancy_aux_code_end;
-        $param .= '&search_accountancy_aux_code_end='.urlencode($search_accountancy_aux_code_end);
-    }
-    if (!empty($search_mvt_label)) {
-        $filter['t.label_operation'] = $search_mvt_label;
-        $param .= '&search_mvt_label='.urlencode($search_mvt_label);
-    }
-    if (!empty($search_direction)) {
-        $filter['t.sens'] = $search_direction;
-        $param .= '&search_direction='.urlencode($search_direction);
-    }
-    if (!empty($search_ledger_code)) {
-        $filter['t.code_journal'] = $search_ledger_code;
-        $param .= '&search_ledger_code='.urlencode($search_ledger_code);
-    }
-    if (!empty($search_mvt_num)) {
-        $filter['t.piece_num'] = $search_mvt_num;
-        $param .= '&search_mvt_num='.urlencode($search_mvt_num);
-    }
-    if (!empty($search_date_creation_start)) {
-        $filter['t.date_creation>='] = $search_date_creation_start;
-        $tmp = dol_getdate($search_date_creation_start);
-        $param .= '&date_creation_startmonth='.urlencode($tmp['mon']).'&date_creation_startday='.urlencode($tmp['mday']).'&date_creation_startyear='.urlencode($tmp['year']);
-    }
-    if (!empty($search_date_creation_end)) {
-        $filter['t.date_creation<='] = $search_date_creation_end;
-        $tmp = dol_getdate($search_date_creation_end);
-        $param .= '&date_creation_endmonth='.urlencode($tmp['mon']).'&date_creation_endday='.urlencode($tmp['mday']).'&date_creation_endyear='.urlencode($tmp['year']);
-    }
-    if (!empty($search_date_modification_start)) {
-        $filter['t.tms>='] = $search_date_modification_start;
-        $tmp = dol_getdate($search_date_modification_start);
-        $param .= '&date_modification_startmonth='.urlencode($tmp['mon']).'&date_modification_startday='.urlencode($tmp['mday']).'&date_modification_startyear='.urlencode($tmp['year']);
-    }
-    if (!empty($search_date_modification_end)) {
-        $filter['t.tms<='] = $search_date_modification_end;
-        $tmp = dol_getdate($search_date_modification_end);
-        $param .= '&date_modification_endmonth='.urlencode($tmp['mon']).'&date_modification_endday='.urlencode($tmp['mday']).'&date_modification_endyear='.urlencode($tmp['year']);
-    }
-    if (!empty($search_date_export_start)) {
-        $filter['t.date_export>='] = $search_date_export_start;
-        $tmp = dol_getdate($search_date_export_start);
-        $param .= '&date_export_startmonth='.urlencode($tmp['mon']).'&date_export_startday='.urlencode($tmp['mday']).'&date_export_startyear='.urlencode($tmp['year']);
-    }
-    if (!empty($search_date_export_end)) {
-        $filter['t.date_export<='] = $search_date_export_end;
-        $tmp = dol_getdate($search_date_export_end);
-        $param .= '&date_export_endmonth='.urlencode($tmp['mon']).'&date_export_endday='.urlencode($tmp['mday']).'&date_export_endyear='.urlencode($tmp['year']);
-    }
-    if (!empty($search_debit)) {
-        $filter['t.debit'] = $search_debit;
-        $param .= '&search_debit='.urlencode($search_debit);
-    }
-    if (!empty($search_credit)) {
-        $filter['t.credit'] = $search_credit;
-        $param .= '&search_credit='.urlencode($search_credit);
-    }
-    if (!empty($search_lettering_code)) {
-        $filter['t.lettering_code'] = $search_lettering_code;
-        $param .= '&search_lettering_code='.urlencode($search_lettering_code);
-    }
+	// Must be after the remove filter action, before the export.
+	$param = '';
+	$filter = array();
+	if (!empty($search_date_start)) {
+		$filter['t.doc_date>='] = $search_date_start;
+		$tmp = dol_getdate($search_date_start);
+		$param .= '&search_date_startmonth='.urlencode($tmp['mon']).'&search_date_startday='.urlencode($tmp['mday']).'&search_date_startyear='.urlencode($tmp['year']);
+	}
+	if (!empty($search_date_end)) {
+		$filter['t.doc_date<='] = $search_date_end;
+		$tmp = dol_getdate($search_date_end);
+		$param .= '&search_date_endmonth='.urlencode($tmp['mon']).'&search_date_endday='.urlencode($tmp['mday']).'&search_date_endyear='.urlencode($tmp['year']);
+	}
+	if (!empty($search_doc_date)) {
+		$filter['t.doc_date'] = $search_doc_date;
+		$tmp = dol_getdate($search_doc_date);
+		$param .= '&doc_datemonth='.urlencode($tmp['mon']).'&doc_dateday='.urlencode($tmp['mday']).'&doc_dateyear='.urlencode($tmp['year']);
+	}
+	if (!empty($search_doc_type)) {
+		$filter['t.doc_type'] = $search_doc_type;
+		$param .= '&search_doc_type='.urlencode($search_doc_type);
+	}
+	if (!empty($search_doc_ref)) {
+		$filter['t.doc_ref'] = $search_doc_ref;
+		$param .= '&search_doc_ref='.urlencode($search_doc_ref);
+	}
+	if (!empty($search_accountancy_code)) {
+		$filter['t.numero_compte'] = $search_accountancy_code;
+		$param .= '&search_accountancy_code='.urlencode($search_accountancy_code);
+	}
+	if (!empty($search_accountancy_code_start)) {
+		$filter['t.numero_compte>='] = $search_accountancy_code_start;
+		$param .= '&search_accountancy_code_start='.urlencode($search_accountancy_code_start);
+	}
+	if (!empty($search_accountancy_code_end)) {
+		$filter['t.numero_compte<='] = $search_accountancy_code_end;
+		$param .= '&search_accountancy_code_end='.urlencode($search_accountancy_code_end);
+	}
+	if (!empty($search_accountancy_aux_code)) {
+		$filter['t.subledger_account'] = $search_accountancy_aux_code;
+		$param .= '&search_accountancy_aux_code='.urlencode($search_accountancy_aux_code);
+	}
+	if (!empty($search_accountancy_aux_code_start)) {
+		$filter['t.subledger_account>='] = $search_accountancy_aux_code_start;
+		$param .= '&search_accountancy_aux_code_start='.urlencode($search_accountancy_aux_code_start);
+	}
+	if (!empty($search_accountancy_aux_code_end)) {
+		$filter['t.subledger_account<='] = $search_accountancy_aux_code_end;
+		$param .= '&search_accountancy_aux_code_end='.urlencode($search_accountancy_aux_code_end);
+	}
+	if (!empty($search_mvt_label)) {
+		$filter['t.label_operation'] = $search_mvt_label;
+		$param .= '&search_mvt_label='.urlencode($search_mvt_label);
+	}
+	if (!empty($search_direction)) {
+		$filter['t.sens'] = $search_direction;
+		$param .= '&search_direction='.urlencode($search_direction);
+	}
+	if (!empty($search_ledger_code)) {
+		$filter['t.code_journal'] = $search_ledger_code;
+		$param .= '&search_ledger_code='.urlencode($search_ledger_code);
+	}
+	if (!empty($search_mvt_num)) {
+		$filter['t.piece_num'] = $search_mvt_num;
+		$param .= '&search_mvt_num='.urlencode($search_mvt_num);
+	}
+	if (!empty($search_date_creation_start)) {
+		$filter['t.date_creation>='] = $search_date_creation_start;
+		$tmp = dol_getdate($search_date_creation_start);
+		$param .= '&date_creation_startmonth='.urlencode($tmp['mon']).'&date_creation_startday='.urlencode($tmp['mday']).'&date_creation_startyear='.urlencode($tmp['year']);
+	}
+	if (!empty($search_date_creation_end)) {
+		$filter['t.date_creation<='] = $search_date_creation_end;
+		$tmp = dol_getdate($search_date_creation_end);
+		$param .= '&date_creation_endmonth='.urlencode($tmp['mon']).'&date_creation_endday='.urlencode($tmp['mday']).'&date_creation_endyear='.urlencode($tmp['year']);
+	}
+	if (!empty($search_date_modification_start)) {
+		$filter['t.tms>='] = $search_date_modification_start;
+		$tmp = dol_getdate($search_date_modification_start);
+		$param .= '&date_modification_startmonth='.urlencode($tmp['mon']).'&date_modification_startday='.urlencode($tmp['mday']).'&date_modification_startyear='.urlencode($tmp['year']);
+	}
+	if (!empty($search_date_modification_end)) {
+		$filter['t.tms<='] = $search_date_modification_end;
+		$tmp = dol_getdate($search_date_modification_end);
+		$param .= '&date_modification_endmonth='.urlencode($tmp['mon']).'&date_modification_endday='.urlencode($tmp['mday']).'&date_modification_endyear='.urlencode($tmp['year']);
+	}
+	if (!empty($search_date_export_start)) {
+		$filter['t.date_export>='] = $search_date_export_start;
+		$tmp = dol_getdate($search_date_export_start);
+		$param .= '&date_export_startmonth='.urlencode($tmp['mon']).'&date_export_startday='.urlencode($tmp['mday']).'&date_export_startyear='.urlencode($tmp['year']);
+	}
+	if (!empty($search_date_export_end)) {
+		$filter['t.date_export<='] = $search_date_export_end;
+		$tmp = dol_getdate($search_date_export_end);
+		$param .= '&date_export_endmonth='.urlencode($tmp['mon']).'&date_export_endday='.urlencode($tmp['mday']).'&date_export_endyear='.urlencode($tmp['year']);
+	}
+	if (!empty($search_debit)) {
+		$filter['t.debit'] = $search_debit;
+		$param .= '&search_debit='.urlencode($search_debit);
+	}
+	if (!empty($search_credit)) {
+		$filter['t.credit'] = $search_credit;
+		$param .= '&search_credit='.urlencode($search_credit);
+	}
+	if (!empty($search_lettering_code)) {
+		$filter['t.lettering_code'] = $search_lettering_code;
+		$param .= '&search_lettering_code='.urlencode($search_lettering_code);
+	}
 	if (!empty($search_not_reconciled)) {
 		$filter['t.reconciled_option'] = $search_not_reconciled;
 		$param .= '&search_not_reconciled='.urlencode($search_not_reconciled);
@@ -475,48 +475,48 @@ if ($action == 'export_file' && $user->rights->accounting->mouvements->export) {
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
 	} else {
-	    // Export files
+		// Export files
 		$accountancyexport = new AccountancyExport($db);
 		$accountancyexport->export($object->lines, $formatexportset);
 
-        if (!empty($accountancyexport->errors))
-        {
-            setEventMessages('', $accountancyexport->errors, 'errors');
-        } else {
-            // Specify as export : update field date_export
-            $error = 0;
-            $db->begin();
+		if (!empty($accountancyexport->errors))
+		{
+			setEventMessages('', $accountancyexport->errors, 'errors');
+		} else {
+			// Specify as export : update field date_export
+			$error = 0;
+			$db->begin();
 
-            if (is_array($object->lines))
-            {
-                foreach ($object->lines as $movement)
-                {
-                    $now = dol_now();
+			if (is_array($object->lines))
+			{
+				foreach ($object->lines as $movement)
+				{
+					$now = dol_now();
 
-                    $sql = " UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping";
-                    $sql .= " SET date_export = '".$db->idate($now)."'";
-                    $sql .= " WHERE rowid = ".$movement->id;
+					$sql = " UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping";
+					$sql .= " SET date_export = '".$db->idate($now)."'";
+					$sql .= " WHERE rowid = ".$movement->id;
 
-                    dol_syslog("/accountancy/bookeeping/list.php Function export_file Specify movements as exported sql=".$sql, LOG_DEBUG);
-                    $result = $db->query($sql);
-                    if (!$result)
-                    {
-                    	$error++;
-                        break;
-                    }
-                }
-            }
+					dol_syslog("/accountancy/bookeeping/list.php Function export_file Specify movements as exported sql=".$sql, LOG_DEBUG);
+					$result = $db->query($sql);
+					if (!$result)
+					{
+						$error++;
+						break;
+					}
+				}
+			}
 
-            if (!$error)
-            {
-            	$db->commit();
-            	// setEventMessages($langs->trans("AllExportedMovementsWereRecordedAsExported"), null, 'mesgs');
-            } else {
-            	$error++;
-            	$db->rollback();
-            	setEventMessages($langs->trans("NotAllExportedMovementsCouldBeRecordedAsExported"), null, 'errors');
-            }
-        }
+			if (!$error)
+			{
+				$db->commit();
+				// setEventMessages($langs->trans("AllExportedMovementsWereRecordedAsExported"), null, 'mesgs');
+			} else {
+				$error++;
+				$db->rollback();
+				setEventMessages($langs->trans("NotAllExportedMovementsCouldBeRecordedAsExported"), null, 'errors');
+			}
+		}
 		exit;
 	}
 }
@@ -529,7 +529,7 @@ if ($action == 'export_file' && $user->rights->accounting->mouvements->export) {
 $formother = new FormOther($db);
 $formfile = new FormFile($db);
 
-$title_page = $langs->trans("Bookkeeping");
+$title_page = $langs->trans("Operations").' - '.$langs->trans("Journals");
 
 // Count total nb of records
 $nbtotalofrecords = '';
@@ -608,43 +608,47 @@ if ($action == 'delbookkeepingyear') {
 			'default' => $deljournal
 	);
 
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'delbookkeepingyearconfirm', $form_question, '', 1, 300);
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt', $langs->transnoentitiesnoconv("RegistrationInAccounting")), 'delbookkeepingyearconfirm', $form_question, '', 1, 300);
 	print $formconfirm;
 }
 
 //$param='';	param started before
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="list">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.urlencode($optioncss).'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-print '<input type="hidden" name="page" value="'.$page.'">';
+print '<input type="hidden" name="sortfield" value="'.urlencode($sortfield).'">';
+print '<input type="hidden" name="sortorder" value="'.urlencode($sortorder).'">';
 
 if (count($filter)) $buttonLabel = $langs->trans("ExportFilteredList");
 else $buttonLabel = $langs->trans("ExportList");
 
-// Button re-export
-if (!empty($conf->global->ACCOUNTING_REEXPORT)) {
-    $newcardbutton = '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?action=setreexport&token='.newToken().'&value=0'.($param ? '&'.$param : '').'">'.img_picto($langs->trans("Activated"), 'switch_on').'</a> ';
-} else {
-    $newcardbutton = '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?action=setreexport&token='.newToken().'&value=1'.($param ? '&'.$param : '').'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a> ';
+$parameters = array();
+$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) {
+	// Button re-export
+	if (!empty($conf->global->ACCOUNTING_REEXPORT)) {
+		$newcardbutton = '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?action=setreexport&token='.newToken().'&value=0'.($param ? '&'.$param : '').'">'.img_picto($langs->trans("Activated"), 'switch_on').'</a> ';
+	} else {
+		$newcardbutton = '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?action=setreexport&token='.newToken().'&value=1'.($param ? '&'.$param : '').'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a> ';
+	}
+	$newcardbutton .= '<span class="valignmiddle marginrightonly">'.$langs->trans("IncludeDocsAlreadyExported").'</span>';
+
+	$newcardbutton .= dolGetButtonTitle($buttonLabel, $langs->trans("ExportFilteredList").' ('.$listofformat[$formatexportset].')', 'fa fa-file-export paddingleft', $_SERVER["PHP_SELF"].'?action=export_file'.($param ? '&'.$param : ''), $user->rights->accounting->mouvements->export);
+
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly'));
+
+	$url = './card.php?action=create';
+	if (!empty($socid)) $url .= '&socid='.$socid;
+	$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', $url, '', $user->rights->accounting->mouvements->creer);
 }
-$newcardbutton .= '<span class="valignmiddle marginrightonly">'.$langs->trans("IncludeDocsAlreadyExported").'</span>';
 
-$newcardbutton .= dolGetButtonTitle($buttonLabel, $langs->trans("ExportFilteredList").' ('.$listofformat[$formatexportset].')', 'fa fa-file-export paddingleft', $_SERVER["PHP_SELF"].'?action=export_file'.($param ? '&'.$param : ''), $user->rights->accounting->mouvements->export);
-
-$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param);
-
-$url = './card.php?action=create';
-if (!empty($socid)) $url .= '&socid='.$socid;
-$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', $url, '', $user->rights->accounting->mouvements->creer);
-
-print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit);
+print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
@@ -670,12 +674,10 @@ if (!empty($arrayfields['t.doc_date']['checked']))
 {
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
-	print $langs->trans('From').' ';
-	print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1);
+	print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
 	print '<div class="nowrap">';
-	print $langs->trans('to').' ';
-	print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1);
+	print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
 	print '</div>';
 	print '</td>';
 }
@@ -703,25 +705,25 @@ if (!empty($arrayfields['t.subledger_account']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<div class="nowrap">';
-	print $langs->trans('From').' ';
 	// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
 	// use setup of keypress to select thirdparty and this hang browser on large database.
 	if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
 	{
+		print $langs->trans('From').' ';
 		print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
 	} else {
-		print '<input type="text" class="maxwidth100" name="search_accountancy_aux_code_start" value="'.$search_accountancy_aux_code_start.'">';
+		print '<input type="text" class="maxwidth100" name="search_accountancy_aux_code_start" value="'.$search_accountancy_aux_code_start.'" placeholder="'.$langs->trans("From").'">';
 	}
 	print '</div>';
 	print '<div class="nowrap">';
-	print $langs->trans('to').' ';
 	// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
 	// use setup of keypress to select thirdparty and this hang browser on large database.
 	if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
 	{
+		print $langs->trans('to').' ';
 		print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
 	} else {
-		print '<input type="text" class="maxwidth100" name="search_accountancy_aux_code_end" value="'.$search_accountancy_aux_code_end.'">';
+		print '<input type="text" class="maxwidth100" name="search_accountancy_aux_code_end" value="'.$search_accountancy_aux_code_end.'" placeholder="'.$langs->trans("to").'">';
 	}
 	print '</div>';
 	print '</td>';
@@ -771,12 +773,10 @@ if (!empty($arrayfields['t.date_creation']['checked']))
 {
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
-	print $langs->trans('From').' ';
-	print $form->selectDate($search_date_creation_start, 'date_creation_start', 0, 0, 1);
+	print $form->selectDate($search_date_creation_start, 'date_creation_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
 	print '<div class="nowrap">';
-	print $langs->trans('to').' ';
-	print $form->selectDate($search_date_creation_end, 'date_creation_end', 0, 0, 1);
+	print $form->selectDate($search_date_creation_end, 'date_creation_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
 	print '</div>';
 	print '</td>';
 }
@@ -785,28 +785,24 @@ if (!empty($arrayfields['t.tms']['checked']))
 {
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
-	print $langs->trans('From').' ';
-	print $form->selectDate($search_date_modification_start, 'date_modification_start', 0, 0, 1);
+	print $form->selectDate($search_date_modification_start, 'date_modification_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
 	print '<div class="nowrap">';
-	print $langs->trans('to').' ';
-	print $form->selectDate($search_date_modification_end, 'date_modification_end', 0, 0, 1);
+	print $form->selectDate($search_date_modification_end, 'date_modification_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
 	print '</td>';
 }
 // Date export
 if (!empty($arrayfields['t.date_export']['checked']))
 {
-    print '<td class="liste_titre center">';
-    print '<div class="nowrap">';
-    print $langs->trans('From').' ';
-    print $form->selectDate($search_date_export_start, 'date_export_start', 0, 0, 1);
-    print '</div>';
-    print '<div class="nowrap">';
-    print $langs->trans('to').' ';
-    print $form->selectDate($search_date_export_end, 'date_export_end', 0, 0, 1);
-    print '</div>';
-    print '</td>';
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_export_start, 'date_export_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
+	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_export_end, 'date_export_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
+	print '</div>';
+	print '</td>';
 }
 // Action column
 print '<td class="liste_titre center">';
@@ -862,7 +858,7 @@ while ($i < min($num, $limit))
 	$line->label_operation = $obj->label_operation;
 	$line->debit = $obj->debit;
 	$line->credit = $obj->credit;
-	$line->montant = $obj->amount;	// deprecated
+	$line->montant = $obj->amount; // deprecated
 	$line->amount = $obj->amount;
 	$line->sens = $obj->sens;
 	$line->lettering_code = $obj->lettering_code;
@@ -901,65 +897,65 @@ while ($i < min($num, $limit))
 	// Document ref
 	if (!empty($arrayfields['t.doc_ref']['checked']))
 	{
-        if ($line->doc_type == 'customer_invoice')
-        {
-            $langs->loadLangs(array('bills'));
+		if ($line->doc_type == 'customer_invoice')
+		{
+			$langs->loadLangs(array('bills'));
 
-            require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-            $objectstatic = new Facture($db);
-            $objectstatic->fetch($line->fk_doc);
-            //$modulepart = 'facture';
+			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+			$objectstatic = new Facture($db);
+			$objectstatic->fetch($line->fk_doc);
+			//$modulepart = 'facture';
 
-            $filename = dol_sanitizeFileName($line->doc_ref);
-            $filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
-            $urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
-            $documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-        } elseif ($line->doc_type == 'supplier_invoice')
-        {
-            $langs->loadLangs(array('bills'));
+			$filename = dol_sanitizeFileName($line->doc_ref);
+			$filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
+			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
+			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
+		} elseif ($line->doc_type == 'supplier_invoice')
+		{
+			$langs->loadLangs(array('bills'));
 
-            require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-            $objectstatic = new FactureFournisseur($db);
-            $objectstatic->fetch($line->fk_doc);
-            //$modulepart = 'invoice_supplier';
+			require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+			$objectstatic = new FactureFournisseur($db);
+			$objectstatic->fetch($line->fk_doc);
+			//$modulepart = 'invoice_supplier';
 
-            $filename = dol_sanitizeFileName($line->doc_ref);
-            $filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($line->fk_doc, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
-            $subdir = get_exdir($objectstatic->id, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
-            $documentlink = $formfile->getDocumentsLink($objectstatic->element, $subdir, $filedir);
-        } elseif ($line->doc_type == 'expense_report')
-        {
-            $langs->loadLangs(array('trips'));
+			$filename = dol_sanitizeFileName($line->doc_ref);
+			$filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($line->fk_doc, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
+			$subdir = get_exdir($objectstatic->id, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
+			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $subdir, $filedir);
+		} elseif ($line->doc_type == 'expense_report')
+		{
+			$langs->loadLangs(array('trips'));
 
-            require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
-            $objectstatic = new ExpenseReport($db);
-            $objectstatic->fetch($line->fk_doc);
-            //$modulepart = 'expensereport';
+			require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+			$objectstatic = new ExpenseReport($db);
+			$objectstatic->fetch($line->fk_doc);
+			//$modulepart = 'expensereport';
 
-            $filename = dol_sanitizeFileName($line->doc_ref);
-            $filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
-            $urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
-            $documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-        } else {
-            // Other type
-        }
+			$filename = dol_sanitizeFileName($line->doc_ref);
+			$filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
+			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
+			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
+		} else {
+			// Other type
+		}
 
-        print '<td class="nowrap">';
+		print '<td class="nowrap">';
 
-        print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-        // Picto + Ref
-        print '<td class="nobordernopadding nowrap">';
+		print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+		// Picto + Ref
+		print '<td class="nobordernopadding nowrap">';
 
-        if ($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice' || $line->doc_type == 'expense_report')
-        {
-            print $objectstatic->getNomUrl(1, '', 0, 0, '', 0, -1, 1);
-            print $documentlink;
-        } else {
-            print $line->doc_ref;
-        }
-        print '</td></tr></table>';
+		if ($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice' || $line->doc_type == 'expense_report')
+		{
+			print $objectstatic->getNomUrl(1, '', 0, 0, '', 0, -1, 1);
+			print $documentlink;
+		} else {
+			print $line->doc_ref;
+		}
+		print '</td></tr></table>';
 
-        print "</td>\n";
+		print "</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 
@@ -1049,10 +1045,10 @@ while ($i < min($num, $limit))
 	print '<td class="nowraponall center">';
 	if (empty($line->date_export)) {
 		if ($user->rights->accounting->mouvements->creer) {
-			print '<a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_edit().'</a>';
+			print '<a class="editfielda paddingleft marginrightonly" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_edit().'</a>';
 		}
 		if ($user->rights->accounting->mouvements->supprimer) {
-			print '&nbsp;<a href="'.$_SERVER['PHP_SELF'].'?action=delmouv&mvt_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_delete().'</a>';
+			print '<a class="reposition paddingleft marginrightonly" href="'.$_SERVER['PHP_SELF'].'?action=delmouv&mvt_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_delete().'</a>';
 		}
 	}
 	print '</td>';
@@ -1073,9 +1069,9 @@ print '</div>';
 
 // TODO Replace this with mass delete action
 if ($user->rights->accounting->mouvements->supprimer_tous) {
-    print '<div class="tabsAction tabsActionNoBottom">'."\n";
-    print '<a class="butActionDelete" name="button_delmvt" href="'.$_SERVER["PHP_SELF"].'?action=delbookkeepingyear'.($param ? '&'.$param : '').'">'.$langs->trans("DeleteMvt").'</a>';
-    print '</div>';
+	print '<div class="tabsAction tabsActionNoBottom">'."\n";
+	print '<a class="butActionDelete" name="button_delmvt" href="'.$_SERVER["PHP_SELF"].'?action=delbookkeepingyear'.($param ? '&'.$param : '').'">'.$langs->trans("DeleteMvt").'</a>';
+	print '</div>';
 }
 
 print '</form>';
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index e0e16e00d12..18661f8a887 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -33,11 +33,10 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("accountancy"));
+$langs->loadLangs(array("accountancy", "compta"));
 
 $action = GETPOST('action', 'aZ09');
 $search_date_start = dol_mktime(0, 0, 0, GETPOST('search_date_startmonth', 'int'), GETPOST('search_date_startday', 'int'), GETPOST('search_date_startyear', 'int'));
@@ -55,6 +54,7 @@ if ($search_accountancy_code_end == - 1) {
 }
 $search_doc_ref = GETPOST('search_doc_ref', 'alpha');
 $search_label_operation = GETPOST('search_label_operation', 'alpha');
+$search_mvt_num = GETPOST('search_mvt_num', 'int');
 $search_direction = GETPOST('search_direction', 'alpha');
 $search_ledger_code = GETPOST('search_ledger_code', 'alpha');
 $search_debit = GETPOST('search_debit', 'alpha');
@@ -86,7 +86,7 @@ $hookmanager->initHooks(array('bookkeepingbyaccountlist'));
 $formaccounting = new FormAccounting($db);
 $form = new Form($db);
 
-if (empty($search_date_start) && empty($search_date_end) && GETPOSTISSET('search_date_startday') && GETPOSTISSET('search_date_startmonth') && GETPOSTISSET('search_date_starthour')) {
+if (empty($search_date_start) && empty($search_date_end) && !GETPOSTISSET('search_date_startday') && !GETPOSTISSET('search_date_startmonth') && !GETPOSTISSET('search_date_starthour')) {
 	$sql = "SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear ";
 	$sql .= " where date_start < '".$db->idate(dol_now())."' and date_end > '".$db->idate(dol_now())."'";
 	$sql .= $db->plimit(1);
@@ -138,7 +138,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-	include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 	{
@@ -149,6 +149,7 @@ if (empty($reshook))
 		$search_label_account = '';
 		$search_doc_ref = '';
 		$search_label_operation = '';
+		$search_mvt_num = '';
 		$search_direction = '';
 		$search_ledger_code = '';
 		$search_date_start = '';
@@ -171,51 +172,55 @@ if (empty($reshook))
 
 	if (!empty($search_date_start)) {
 		$filter['t.doc_date>='] = $search_date_start;
-		$param .= '&search_date_startmonth=' . GETPOST('search_date_startmonth', 'int') . '&search_date_startday=' . GETPOST('search_date_startday', 'int') . '&search_date_startyear=' . GETPOST('search_date_startyear', 'int');
+		$param .= '&search_date_startmonth='.GETPOST('search_date_startmonth', 'int').'&search_date_startday='.GETPOST('search_date_startday', 'int').'&search_date_startyear='.GETPOST('search_date_startyear', 'int');
 	}
 	if (!empty($search_date_end)) {
 		$filter['t.doc_date<='] = $search_date_end;
-		$param .= '&search_date_endmonth=' . GETPOST('search_date_endmonth', 'int') . '&search_date_endday=' . GETPOST('search_date_endday', 'int') . '&search_date_endyear=' . GETPOST('search_date_endyear', 'int');
+		$param .= '&search_date_endmonth='.GETPOST('search_date_endmonth', 'int').'&search_date_endday='.GETPOST('search_date_endday', 'int').'&search_date_endyear='.GETPOST('search_date_endyear', 'int');
 	}
 	if (!empty($search_doc_date)) {
 		$filter['t.doc_date'] = $search_doc_date;
-		$param .= '&doc_datemonth=' . GETPOST('doc_datemonth', 'int') . '&doc_dateday=' . GETPOST('doc_dateday', 'int') . '&doc_dateyear=' . GETPOST('doc_dateyear', 'int');
+		$param .= '&doc_datemonth='.GETPOST('doc_datemonth', 'int').'&doc_dateday='.GETPOST('doc_dateday', 'int').'&doc_dateyear='.GETPOST('doc_dateyear', 'int');
 	}
 	if (!empty($search_accountancy_code_start)) {
 		$filter['t.numero_compte>='] = $search_accountancy_code_start;
-		$param .= '&search_accountancy_code_start=' . urlencode($search_accountancy_code_start);
+		$param .= '&search_accountancy_code_start='.urlencode($search_accountancy_code_start);
 	}
 	if (!empty($search_accountancy_code_end)) {
 		$filter['t.numero_compte<='] = $search_accountancy_code_end;
-		$param .= '&search_accountancy_code_end=' . urlencode($search_accountancy_code_end);
+		$param .= '&search_accountancy_code_end='.urlencode($search_accountancy_code_end);
 	}
 	if (!empty($search_label_account)) {
 		$filter['t.label_compte'] = $search_label_account;
-		$param .= '&search_label_compte=' . urlencode($search_label_account);
+		$param .= '&search_label_compte='.urlencode($search_label_account);
+	}
+	if (!empty($search_mvt_num)) {
+		$filter['t.piece_num'] = $search_mvt_num;
+		$param .= '&search_mvt_num='.urlencode($search_mvt_num);
 	}
 	if (!empty($search_doc_ref)) {
 		$filter['t.doc_ref'] = $search_doc_ref;
-		$param .= '&search_doc_ref=' . urlencode($search_doc_ref);
+		$param .= '&search_doc_ref='.urlencode($search_doc_ref);
 	}
 	if (!empty($search_label_operation)) {
 		$filter['t.label_operation'] = $search_label_operation;
-		$param .= '&search_label_operation=' . urlencode($search_label_operation);
+		$param .= '&search_label_operation='.urlencode($search_label_operation);
 	}
 	if (!empty($search_direction)) {
 		$filter['t.sens'] = $search_direction;
-		$param .= '&search_direction=' . urlencode($search_direction);
+		$param .= '&search_direction='.urlencode($search_direction);
 	}
 	if (!empty($search_ledger_code)) {
 		$filter['t.code_journal'] = $search_ledger_code;
-		$param .= '&search_ledger_code=' . urlencode($search_ledger_code);
+		$param .= '&search_ledger_code='.urlencode($search_ledger_code);
 	}
 	if (!empty($search_debit)) {
 		$filter['t.debit'] = $search_debit;
-		$param .= '&search_debit=' . urlencode($search_debit);
+		$param .= '&search_debit='.urlencode($search_debit);
 	}
 	if (!empty($search_credit)) {
 		$filter['t.credit'] = $search_credit;
-		$param .= '&search_credit=' . urlencode($search_credit);
+		$param .= '&search_credit='.urlencode($search_credit);
 	}
 	if (!empty($search_lettering_code)) {
 		$filter['t.lettering_code'] = $search_lettering_code;
@@ -294,7 +299,7 @@ $formfile = new FormFile($db);
 $formother = new FormOther($db);
 $form = new Form($db);
 
-$title_page = $langs->trans("Bookkeeping").' '.strtolower($langs->trans("By")).' '.strtolower($langs->trans("AccountAccounting"));
+$title_page = $langs->trans("Operations").' - '.$langs->trans("VueByAccountAccounting").' ('.$langs->trans("Bookkeeping").')';
 
 llxHeader('', $title_page);
 
@@ -358,7 +363,7 @@ if ($action == 'delbookkeepingyear') {
 		'default' => $deljournal
 	);
 
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'delbookkeepingyearconfirm', $form_question, '', 1, 300);
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt', $langs->transnoentitiesnoconv("RegistrationInAccounting")), 'delbookkeepingyearconfirm', $form_question, '', 1, 300);
 	print $formconfirm;
 }
 
@@ -370,16 +375,22 @@ if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$opt
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-print '<input type="hidden" name="page" value="'.$page.'">';
 
+$parameters = array();
+$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) {
+	$newcardbutton = dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param);
+	$newcardbutton .= dolGetButtonTitle($langs->trans('VueByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
 
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param);
-$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', './card.php?action=create');
+	$newcardbutton .= ' &nbsp; ';
+
+	$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=create');
+}
 
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
 if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 
-print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy', 0, $viewflat.$newcardbutton, '', $limit);
+print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
@@ -394,10 +405,10 @@ $moreforfilter = '';
 // Accountancy account
 $moreforfilter .= '<div class="divsearchfield">';
 $moreforfilter .= $langs->trans('AccountAccounting').': ';
-$moreforfilter .= '<div class="nowrap">';
+$moreforfilter .= '<div class="nowrap inline-block">';
 $moreforfilter .= $langs->trans('From').' ';
 $moreforfilter .= $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, 'maxwidth200');
-$moreforfilter .= $langs->trans('to').' ';
+$moreforfilter .= ' '.$langs->trans('to').' ';
 $moreforfilter .= $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, 'maxwidth200');
 $moreforfilter .= '</div>';
 $moreforfilter .= '</div>';
@@ -419,18 +430,16 @@ print '<tr class="liste_titre_filter">';
 
 // Code journal
 if (!empty($arrayfields['t.code_journal']['checked'])) {
-	print '<td class="liste_titre center"><input type="text" name="search_ledger_code" size="3" value="' . dol_escape_htmltag($search_ledger_code) . '"></td>';
+	print '<td class="liste_titre center"><input type="text" name="search_ledger_code" size="3" value="'.dol_escape_htmltag($search_ledger_code).'"></td>';
 }
 // Date document
 if (!empty($arrayfields['t.doc_date']['checked'])) {
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
-	print $langs->trans('From') . ': ';
-	print $form->selectDate($search_date_start, 'search_date_start', 0, 0, 1);
+	print $form->selectDate($search_date_start, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
 	print '<div class="nowrap">';
-	print $langs->trans('to') . ': ';
-	print $form->selectDate($search_date_end, 'search_date_end', 0, 0, 1);
+	print $form->selectDate($search_date_end, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
 	print '</div>';
 	print '</td>';
 }
@@ -441,19 +450,19 @@ if (!empty($arrayfields['t.piece_num']['checked']))
 }
 // Ref document
 if (!empty($arrayfields['t.doc_ref']['checked'])) {
-	print '<td class="liste_titre"><input type="text" size="7" class="flat" name="search_doc_ref" value="' . dol_escape_htmltag($search_doc_ref) . '"/></td>';
+	print '<td class="liste_titre"><input type="text" size="7" class="flat" name="search_doc_ref" value="'.dol_escape_htmltag($search_doc_ref).'"/></td>';
 }
 // Label operation
 if (!empty($arrayfields['t.label_operation']['checked'])) {
-	print '<td class="liste_titre"><input type="text" size="7" class="flat" name="search_label_operation" value="' . dol_escape_htmltag($search_label_operation) . '"/></td>';
+	print '<td class="liste_titre"><input type="text" size="7" class="flat" name="search_label_operation" value="'.dol_escape_htmltag($search_label_operation).'"/></td>';
 }
 // Debit
 if (!empty($arrayfields['t.debit']['checked'])) {
-	print '<td class="liste_titre right"><input type="text" class="flat" name="search_debit" size="4" value="' . dol_escape_htmltag($search_debit) . '"></td>';
+	print '<td class="liste_titre right"><input type="text" class="flat" name="search_debit" size="4" value="'.dol_escape_htmltag($search_debit).'"></td>';
 }
 // Credit
 if (!empty($arrayfields['t.credit']['checked'])) {
-	print '<td class="liste_titre right"><input type="text" class="flat" name="search_credit" size="4" value="' . dol_escape_htmltag($search_credit) . '"></td>';
+	print '<td class="liste_titre right"><input type="text" class="flat" name="search_credit" size="4" value="'.dol_escape_htmltag($search_credit).'"></td>';
 }
 // Lettering code
 if (!empty($arrayfields['t.lettering_code']['checked']))
@@ -529,7 +538,7 @@ while ($i < min($num, $limit))
 			$balance = $sous_total_debit - $sous_total_credit;
 			print '<tr class="liste_total">';
 			print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
-			if ($balance > 0 )
+			if ($balance > 0)
 			{
 				print '<td class="nowraponall right">';
 				print price($sous_total_debit - $sous_total_credit);
@@ -660,7 +669,7 @@ while ($i < min($num, $limit))
 	if (!empty($arrayfields['t.label_operation']['checked'])) {
 		// Affiche un lien vers la facture client/fournisseur
 		$doc_ref = preg_replace('/\(.*\)/', '', $line->doc_ref);
-		print strlen(length_accounta($line->subledger_account)) == 0 ? '<td>' . $line->label_operation . '</td>' : '<td>' . $line->label_operation . '<br><span style="font-size:0.8em">(' . length_accounta($line->subledger_account) . ')</span></td>';
+		print strlen(length_accounta($line->subledger_account)) == 0 ? '<td>'.$line->label_operation.'</td>' : '<td>'.$line->label_operation.'<br><span style="font-size:0.8em">('.length_accounta($line->subledger_account).')</span></td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 
@@ -675,7 +684,7 @@ while ($i < min($num, $limit))
 
 	// Amount credit
 	if (!empty($arrayfields['t.credit']['checked'])) {
-		print '<td class="nowrap right">' . ($line->credit ? price($line->credit) : '') . '</td>';
+		print '<td class="nowrap right">'.($line->credit ? price($line->credit) : '').'</td>';
 		if (!$i) $totalarray['nbfield']++;
 		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalcredit';
 		$totalarray['val']['totalcredit'] += $line->credit;
@@ -697,10 +706,10 @@ while ($i < min($num, $limit))
 	print '<td class="nowraponall center">';
 	if (empty($line->date_export)) {
 		if ($user->rights->accounting->mouvements->creer) {
-			print '<a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_edit().'</a>';
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_edit().'</a>';
 		}
 		if ($user->rights->accounting->mouvements->supprimer) {
-			print '&nbsp;<a href="'.$_SERVER['PHP_SELF'].'?action=delmouv&mvt_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_delete().'</a>';
+			print ' &nbsp; <a class="paddingleft" href="'.$_SERVER['PHP_SELF'].'?action=delmouv&mvt_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_delete().'</a>';
 		}
 	}
 	print '</td>';
@@ -728,7 +737,7 @@ print '</tr>';
 $balance = $sous_total_debit - $sous_total_credit;
 print '<tr class="liste_total">';
 print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
-if ($balance > 0 )
+if ($balance > 0)
 {
 	print '<td class="nowraponall right">';
 	print price($sous_total_debit - $sous_total_credit);
diff --git a/htdocs/accountancy/bookkeeping/listbysubaccount.php b/htdocs/accountancy/bookkeeping/listbysubaccount.php
new file mode 100644
index 00000000000..3bc0351b09b
--- /dev/null
+++ b/htdocs/accountancy/bookkeeping/listbysubaccount.php
@@ -0,0 +1,770 @@
+<?php
+/* Copyright (C) 2016       Neil Orley          <neil.orley@oeris.fr>
+ * Copyright (C) 2013-2016  Olivier Geffroy     <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2016  Florian Henry       <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2020  Alexandre Spangaro  <aspangaro@open-dsi.fr>
+ * Copyright (C) 2018       Frédéric 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file 		htdocs/accountancy/bookkeeping/listbysubaccount.php
+ * \ingroup 	Accountancy (Double entries)
+ * \brief 		List operation of ledger ordered by subaccount number
+ */
+
+require '../../main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("accountancy", "compta"));
+
+$action = GETPOST('action', 'aZ09');
+$search_date_start = dol_mktime(0, 0, 0, GETPOST('search_date_startmonth', 'int'), GETPOST('search_date_startday', 'int'), GETPOST('search_date_startyear', 'int'));
+$search_date_end = dol_mktime(0, 0, 0, GETPOST('search_date_endmonth', 'int'), GETPOST('search_date_endday', 'int'), GETPOST('search_date_endyear', 'int'));
+$search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
+
+$search_accountancy_code = GETPOST("search_accountancy_code");
+$search_accountancy_code_start = GETPOST('search_accountancy_code_start', 'alpha');
+if ($search_accountancy_code_start == - 1) {
+	$search_accountancy_code_start = '';
+}
+$search_accountancy_code_end = GETPOST('search_accountancy_code_end', 'alpha');
+if ($search_accountancy_code_end == - 1) {
+	$search_accountancy_code_end = '';
+}
+$search_doc_ref = GETPOST('search_doc_ref', 'alpha');
+$search_label_operation = GETPOST('search_label_operation', 'alpha');
+$search_mvt_num = GETPOST('search_mvt_num', 'int');
+$search_direction = GETPOST('search_direction', 'alpha');
+$search_ledger_code = GETPOST('search_ledger_code', 'alpha');
+$search_debit = GETPOST('search_debit', 'alpha');
+$search_credit = GETPOST('search_credit', 'alpha');
+$search_lettering_code = GETPOST('search_lettering_code', 'alpha');
+$search_not_reconciled = GETPOST('search_reconciled_option', 'alpha');
+
+if (GETPOST("button_delmvt_x") || GETPOST("button_delmvt.x") || GETPOST("button_delmvt")) {
+	$action = 'delbookkeepingyear';
+}
+
+// Load variable for pagination
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page < 0) { $page = 0; }
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if ($sortorder == "") $sortorder = "ASC";
+if ($sortfield == "") $sortfield = "t.doc_date,t.rowid";
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$object = new BookKeeping($db);
+$formfile = new FormFile($db);
+$hookmanager->initHooks(array('bookkeepingbysubaccountlist'));
+
+$formaccounting = new FormAccounting($db);
+$form = new Form($db);
+
+if (empty($search_date_start) && empty($search_date_end) && !GETPOSTISSET('search_date_startday') && !GETPOSTISSET('search_date_startmonth') && !GETPOSTISSET('search_date_starthour')) {
+	$sql = "SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear ";
+	$sql .= " where date_start < '".$db->idate(dol_now())."' and date_end > '".$db->idate(dol_now())."'";
+	$sql .= $db->plimit(1);
+	$res = $db->query($sql);
+
+	if ($res->num_rows > 0) {
+		$fiscalYear = $db->fetch_object($res);
+		$search_date_start = strtotime($fiscalYear->date_start);
+		$search_date_end = strtotime($fiscalYear->date_end);
+	} else {
+		$month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
+		$year_start = dol_print_date(dol_now(), '%Y');
+		if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
+		$year_end = $year_start + 1;
+		$month_end = $month_start - 1;
+		if ($month_end < 1)
+		{
+			$month_end = 12;
+			$year_end--;
+		}
+		$search_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start);
+		$search_date_end = dol_get_last_day($year_end, $month_end);
+	}
+}
+
+$arrayfields = array(
+	// 't.subledger_account'=>array('label'=>$langs->trans("SubledgerAccount"), 'checked'=>1),
+	't.code_journal'=>array('label'=>$langs->trans("Codejournal"), 'checked'=>1),
+	't.piece_num'=>array('label'=>$langs->trans("TransactionNumShort"), 'checked'=>1),
+	't.doc_date'=>array('label'=>$langs->trans("Docdate"), 'checked'=>1),
+	't.doc_ref'=>array('label'=>$langs->trans("Piece"), 'checked'=>1),
+	't.label_operation'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
+	't.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1),
+	't.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1),
+	't.lettering_code'=>array('label'=>$langs->trans("LetteringCode"), 'checked'=>1),
+);
+
+if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) unset($arrayfields['t.lettering_code']);
+
+/*
+ * Action
+ */
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+
+$parameters = array('socid'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$search_doc_date = '';
+		$search_accountancy_code = '';
+		$search_accountancy_code_start = '';
+		$search_accountancy_code_end = '';
+		$search_label_account = '';
+		$search_doc_ref = '';
+		$search_label_operation = '';
+		$search_mvt_num = '';
+		$search_direction = '';
+		$search_ledger_code = '';
+		$search_date_start = '';
+		$search_date_end = '';
+		$search_date_startyear = '';
+		$search_date_startmonth = '';
+		$search_date_startday = '';
+		$search_date_endyear = '';
+		$search_date_endmonth = '';
+		$search_date_endday = '';
+		$search_debit = '';
+		$search_credit = '';
+		$search_lettering_code = '';
+		$search_not_reconciled = '';
+	}
+
+	// Must be after the remove filter action, before the export.
+	$param = '';
+	$filter = array();
+
+	if (!empty($search_date_start)) {
+		$filter['t.doc_date>='] = $search_date_start;
+		$param .= '&search_date_startmonth='.GETPOST('search_date_startmonth', 'int').'&search_date_startday='.GETPOST('search_date_startday', 'int').'&search_date_startyear='.GETPOST('search_date_startyear', 'int');
+	}
+	if (!empty($search_date_end)) {
+		$filter['t.doc_date<='] = $search_date_end;
+		$param .= '&search_date_endmonth='.GETPOST('search_date_endmonth', 'int').'&search_date_endday='.GETPOST('search_date_endday', 'int').'&search_date_endyear='.GETPOST('search_date_endyear', 'int');
+	}
+	if (!empty($search_doc_date)) {
+		$filter['t.doc_date'] = $search_doc_date;
+		$param .= '&doc_datemonth='.GETPOST('doc_datemonth', 'int').'&doc_dateday='.GETPOST('doc_dateday', 'int').'&doc_dateyear='.GETPOST('doc_dateyear', 'int');
+	}
+	if (!empty($search_accountancy_code_start)) {
+		$filter['t.subledger_account>='] = $search_accountancy_code_start;
+		$param .= '&search_accountancy_code_start='.urlencode($search_accountancy_code_start);
+	}
+	if (!empty($search_accountancy_code_end)) {
+		$filter['t.subledger_account<='] = $search_accountancy_code_end;
+		$param .= '&search_accountancy_code_end='.urlencode($search_accountancy_code_end);
+	}
+	if (!empty($search_label_account)) {
+		$filter['t.label_compte'] = $search_label_account;
+		$param .= '&search_label_compte='.urlencode($search_label_account);
+	}
+	if (!empty($search_mvt_num)) {
+		$filter['t.piece_num'] = $search_mvt_num;
+		$param .= '&search_mvt_num='.urlencode($search_mvt_num);
+	}
+	if (!empty($search_doc_ref)) {
+		$filter['t.doc_ref'] = $search_doc_ref;
+		$param .= '&search_doc_ref='.urlencode($search_doc_ref);
+	}
+	if (!empty($search_label_operation)) {
+		$filter['t.label_operation'] = $search_label_operation;
+		$param .= '&search_label_operation='.urlencode($search_label_operation);
+	}
+	if (!empty($search_direction)) {
+		$filter['t.sens'] = $search_direction;
+		$param .= '&search_direction='.urlencode($search_direction);
+	}
+	if (!empty($search_ledger_code)) {
+		$filter['t.code_journal'] = $search_ledger_code;
+		$param .= '&search_ledger_code='.urlencode($search_ledger_code);
+	}
+	if (!empty($search_debit)) {
+		$filter['t.debit'] = $search_debit;
+		$param .= '&search_debit='.urlencode($search_debit);
+	}
+	if (!empty($search_credit)) {
+		$filter['t.credit'] = $search_credit;
+		$param .= '&search_credit='.urlencode($search_credit);
+	}
+	if (!empty($search_lettering_code)) {
+		$filter['t.lettering_code'] = $search_lettering_code;
+		$param .= '&search_lettering_code='.urlencode($search_lettering_code);
+	}
+	if (!empty($search_not_reconciled)) {
+		$filter['t.reconciled_option'] = $search_not_reconciled;
+		$param .= '&search_not_reconciled='.urlencode($search_not_reconciled);
+	}
+}
+
+if ($action == 'delbookkeeping' && $user->rights->accounting->mouvements->supprimer) {
+	$import_key = GETPOST('importkey', 'alpha');
+
+	if (!empty($import_key)) {
+		$result = $object->deleteByImportkey($import_key);
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+
+		// Make a redirect to avoid to launch the delete later after a back button
+		header("Location: listbyaccount.php".($param ? '?'.$param : ''));
+		exit;
+	}
+}
+if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouvements->supprimer_tous) {
+	$delmonth = GETPOST('delmonth', 'int');
+	$delyear = GETPOST('delyear', 'int');
+	if ($delyear == -1) {
+		$delyear = 0;
+	}
+	$deljournal = GETPOST('deljournal', 'alpha');
+	if ($deljournal == -1) {
+		$deljournal = 0;
+	}
+
+	if (!empty($delmonth) || !empty($delyear) || !empty($deljournal))
+	{
+		$result = $object->deleteByYearAndJournal($delyear, $deljournal, '', ($delmonth > 0 ? $delmonth : 0));
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		} else {
+			setEventMessages("RecordDeleted", null, 'mesgs');
+		}
+
+		// Make a redirect to avoid to launch the delete later after a back button
+		header("Location: listbysubaccount.php".($param ? '?'.$param : ''));
+		exit;
+	} else {
+		setEventMessages("NoRecordDeleted", null, 'warnings');
+	}
+}
+if ($action == 'delmouvconfirm' && $user->rights->accounting->mouvements->supprimer) {
+	$mvt_num = GETPOST('mvt_num', 'int');
+
+	if (!empty($mvt_num)) {
+		$result = $object->deleteMvtNum($mvt_num);
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		} else {
+			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
+		}
+
+		header("Location: listbysubaccount.php?noreset=1".($param ? '&'.$param : ''));
+		exit;
+	}
+}
+
+
+/*
+ * View
+ */
+
+$formaccounting = new FormAccounting($db);
+$formfile = new FormFile($db);
+$formother = new FormOther($db);
+$form = new Form($db);
+
+$title_page = $langs->trans("Operations").' - '.$langs->trans("VueByAccountAccounting").' ('.$langs->trans("BookkeepingSubAccount").')';
+
+llxHeader('', $title_page);
+
+
+// List
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+	$nbtotalofrecords = $object->fetchAllByAccount($sortorder, $sortfield, 0, 0, $filter, 'AND', 1);
+	if ($nbtotalofrecords < 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+}
+
+$result = $object->fetchAllByAccount($sortorder, $sortfield, $limit, $offset, $filter, 'AND', 1);
+
+if ($result < 0) {
+	setEventMessages($object->error, $object->errors, 'errors');
+}
+
+$num = count($object->lines);
+
+
+if ($action == 'delmouv') {
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?mvt_num='.GETPOST('mvt_num'), $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvtPartial'), 'delmouvconfirm', '', 0, 1);
+	print $formconfirm;
+}
+if ($action == 'delbookkeepingyear') {
+	$form_question = array();
+	$delyear = GETPOST('delyear', 'int');
+	$deljournal = GETPOST('deljournal', 'alpha');
+
+	if (empty($delyear)) {
+		$delyear = dol_print_date(dol_now(), '%Y');
+	}
+	$month_array = array();
+	for ($i = 1; $i <= 12; $i++) {
+		$month_array[$i] = $langs->trans("Month".sprintf("%02d", $i));
+	}
+	$year_array = $formaccounting->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
+	$journal_array = $formaccounting->select_journal($deljournal, 'deljournal', '', 1, 1, 1, '', 0, 1);
+
+	$form_question['delmonth'] = array(
+		'name' => 'delmonth',
+		'type' => 'select',
+		'label' => $langs->trans('DelMonth'),
+		'values' => $month_array,
+		'default' => ''
+	);
+	$form_question['delyear'] = array(
+		'name' => 'delyear',
+		'type' => 'select',
+		'label' => $langs->trans('DelYear'),
+		'values' => $year_array,
+		'default' => $delyear
+	);
+	$form_question['deljournal'] = array(
+		'name' => 'deljournal',
+		'type' => 'other', // We don't use select here, the journal_array is already a select html component
+		'label' => $langs->trans('DelJournal'),
+		'value' => $journal_array,
+		'default' => $deljournal
+	);
+
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt', $langs->transnoentitiesnoconv("RegistrationInAccounting")), 'delbookkeepingyearconfirm', $form_question, '', 1, 300);
+	print $formconfirm;
+}
+
+
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="list">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) {
+	$newcardbutton = dolGetButtonTitle($langs->trans('ViewAccountList'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php', '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=create');
+}
+
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+
+print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit);
+
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+
+// Reverse sort order
+if (preg_match('/^asc/i', $sortorder)) $sortorder = "asc";
+else $sortorder = "desc";
+
+$moreforfilter = '';
+
+// Accountancy account
+$moreforfilter .= '<div class="divsearchfield">';
+$moreforfilter .= $langs->trans('AccountAccounting').': ';
+$moreforfilter .= '<div class="nowrap inline-block">';
+$moreforfilter .= $langs->trans('From').' ';
+$moreforfilter .= $formaccounting->select_auxaccount($search_accountancy_code_start, 'search_accountancy_code_start', 1, 'maxwidth200');
+$moreforfilter .= ' '.$langs->trans('to').' ';
+$moreforfilter .= $formaccounting->select_auxaccount($search_accountancy_code_end, 'search_accountancy_code_end', 1, 'maxwidth200');
+$moreforfilter .= '</div>';
+$moreforfilter .= '</div>';
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
+else $moreforfilter = $hookmanager->resPrint;
+
+print '<div class="liste_titre liste_titre_bydiv centpercent">';
+print $moreforfilter;
+print '</div>';
+
+print '<div class="div-table-responsive">';
+print '<table class="tagtable liste centpercent">';
+
+// Filters lines
+print '<tr class="liste_titre_filter">';
+
+// Code journal
+if (!empty($arrayfields['t.code_journal']['checked'])) {
+	print '<td class="liste_titre center"><input type="text" name="search_ledger_code" size="3" value="'.dol_escape_htmltag($search_ledger_code).'"></td>';
+}
+// Date document
+if (!empty($arrayfields['t.doc_date']['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_start, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
+	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_end, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
+	print '</div>';
+	print '</td>';
+}
+// Movement number
+if (!empty($arrayfields['t.piece_num']['checked']))
+{
+	print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="'.dol_escape_htmltag($search_mvt_num).'"></td>';
+}
+// Ref document
+if (!empty($arrayfields['t.doc_ref']['checked'])) {
+	print '<td class="liste_titre"><input type="text" size="7" class="flat" name="search_doc_ref" value="'.dol_escape_htmltag($search_doc_ref).'"/></td>';
+}
+// Label operation
+if (!empty($arrayfields['t.label_operation']['checked'])) {
+	print '<td class="liste_titre"><input type="text" size="7" class="flat" name="search_label_operation" value="'.dol_escape_htmltag($search_label_operation).'"/></td>';
+}
+// Debit
+if (!empty($arrayfields['t.debit']['checked'])) {
+	print '<td class="liste_titre right"><input type="text" class="flat" name="search_debit" size="4" value="'.dol_escape_htmltag($search_debit).'"></td>';
+}
+// Credit
+if (!empty($arrayfields['t.credit']['checked'])) {
+	print '<td class="liste_titre right"><input type="text" class="flat" name="search_credit" size="4" value="'.dol_escape_htmltag($search_credit).'"></td>';
+}
+// Lettering code
+if (!empty($arrayfields['t.lettering_code']['checked']))
+{
+	print '<td class="liste_titre center">';
+	print '<input type="text" size="3" class="flat" name="search_lettering_code" value="'.$search_lettering_code.'"/>';
+	print '<br><span class="nowrap"><input type="checkbox" name="search_reconciled_option" value="notreconciled"'.($search_not_reconciled == 'notreconciled' ? ' checked' : '').'>'.$langs->trans("NotReconciled").'</span>';
+	print '</td>';
+}
+
+// Fields from hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+// Action column
+print '<td class="liste_titre center">';
+$searchpicto = $form->showFilterButtons();
+print $searchpicto;
+print '</td>';
+print "</tr>\n";
+
+print '<tr class="liste_titre">';
+if (!empty($arrayfields['t.code_journal']['checked']))			print_liste_field_titre($arrayfields['t.code_journal']['label'], $_SERVER['PHP_SELF'], "t.code_journal", "", $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['t.doc_date']['checked']))				print_liste_field_titre($arrayfields['t.doc_date']['label'], $_SERVER['PHP_SELF'], "t.doc_date", "", $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['t.piece_num']['checked']))				print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['t.doc_ref']['checked']))				print_liste_field_titre($arrayfields['t.doc_ref']['label'], $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
+if (!empty($arrayfields['t.label_operation']['checked']))		print_liste_field_titre($arrayfields['t.label_operation']['label'], $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
+if (!empty($arrayfields['t.debit']['checked']))					print_liste_field_titre($arrayfields['t.debit']['label'], $_SERVER['PHP_SELF'], "t.debit", "", $param, '', $sortfield, $sortorder, 'right ');
+if (!empty($arrayfields['t.credit']['checked']))				print_liste_field_titre($arrayfields['t.credit']['label'], $_SERVER['PHP_SELF'], "t.credit", "", $param, '', $sortfield, $sortorder, 'right ');
+if (!empty($arrayfields['t.lettering_code']['checked']))		print_liste_field_titre($arrayfields['t.lettering_code']['label'], $_SERVER['PHP_SELF'], "t.lettering_code", "", $param, '', $sortfield, $sortorder, 'center ');
+// Hook fields
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+print "</tr>\n";
+
+
+$total_debit = 0;
+$total_credit = 0;
+$sous_total_debit = 0;
+$sous_total_credit = 0;
+$displayed_account_number = null; // Start with undefined to be able to distinguish with empty
+
+// Loop on record
+// --------------------------------------------------------------------
+$i = 0;
+$totalarray = array();
+while ($i < min($num, $limit))
+{
+	$line = $object->lines[$i];
+
+	$total_debit += $line->debit;
+	$total_credit += $line->credit;
+
+	$accountg = length_accounta($line->subledger_account);
+	//if (empty($accountg)) $accountg = '-';
+
+	// Is it a break ?
+	if ($accountg != $displayed_account_number || !isset($displayed_account_number)) {
+		$colspan = $totalarray['nbfield'] - 3;
+		$colspanend = $totalarray['nbfield'] - 7;
+		// Show a subtotal by accounting account
+		if (isset($displayed_account_number)) {
+			print '<tr class="liste_total">';
+			print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.length_accounta($displayed_account_number).':</td>';
+			print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
+			print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
+			print '<td colspan="'.$colspanend.'"></td>';
+			print '</tr>';
+			// Show balance of last shown account
+			$balance = $sous_total_debit - $sous_total_credit;
+			print '<tr class="liste_total">';
+			print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
+			if ($balance > 0)
+			{
+				print '<td class="nowraponall right">';
+				print price($sous_total_debit - $sous_total_credit);
+				print '</td>';
+				print '<td></td>';
+			} else {
+				print '<td></td>';
+				print '<td class="nowraponall right">';
+				print price($sous_total_credit - $sous_total_debit);
+				print '</td>';
+			}
+			print '<td colspan="'.$colspanend.'"></td>';
+			print '</tr>';
+		}
+
+		// Show the break account
+		print "<tr>";
+		print '<td colspan="'.($totalarray['nbfield'] ? $totalarray['nbfield'] : 9).'" style="font-weight:bold; border-bottom: 1pt solid black;">';
+		if ($line->subledger_account != "" && $line->subledger_account != '-1') print length_accounta($line->subledger_account).' : '.$object->get_compte_desc($line->numero_compte);
+		else print '<span class="error">'.$langs->trans("Unknown").'</span>';
+		print '</td>';
+		print '</tr>';
+
+		$displayed_account_number = $accountg;
+		//if (empty($displayed_account_number)) $displayed_account_number='-';
+		$sous_total_debit = 0;
+		$sous_total_credit = 0;
+
+		$colspan = 0;
+	}
+
+	print '<tr class="oddeven">';
+
+	// Journal code
+	if (!empty($arrayfields['t.code_journal']['checked']))
+	{
+		$accountingjournal = new AccountingJournal($db);
+		$result = $accountingjournal->fetch('', $line->code_journal);
+		$journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $line->code_journal);
+		print '<td class="center">'.$journaltoshow.'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Document date
+	if (!empty($arrayfields['t.doc_date']['checked']))
+	{
+		print '<td class="center">'.dol_print_date($line->doc_date, 'day').'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Piece number
+	if (!empty($arrayfields['t.piece_num']['checked']))
+	{
+		print '<td>';
+		$object->id = $line->id;
+		$object->piece_num = $line->piece_num;
+		print $object->getNomUrl(1, '', 0, '', 1);
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Document ref
+	if (!empty($arrayfields['t.doc_ref']['checked']))
+	{
+		if ($line->doc_type == 'customer_invoice')
+		{
+			$langs->loadLangs(array('bills'));
+
+			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+			$objectstatic = new Facture($db);
+			$objectstatic->fetch($line->fk_doc);
+			//$modulepart = 'facture';
+
+			$filename = dol_sanitizeFileName($line->doc_ref);
+			$filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
+			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
+			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
+		} elseif ($line->doc_type == 'supplier_invoice')
+		{
+			$langs->loadLangs(array('bills'));
+
+			require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+			$objectstatic = new FactureFournisseur($db);
+			$objectstatic->fetch($line->fk_doc);
+			//$modulepart = 'invoice_supplier';
+
+			$filename = dol_sanitizeFileName($line->doc_ref);
+			$filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($line->fk_doc, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
+			$subdir = get_exdir($objectstatic->id, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
+			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $subdir, $filedir);
+		} elseif ($line->doc_type == 'expense_report')
+		{
+			$langs->loadLangs(array('trips'));
+
+			require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+			$objectstatic = new ExpenseReport($db);
+			$objectstatic->fetch($line->fk_doc);
+			//$modulepart = 'expensereport';
+
+			$filename = dol_sanitizeFileName($line->doc_ref);
+			$filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
+			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
+			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
+		} else {
+			// Other type
+		}
+
+		print '<td class="nowrap">';
+
+		print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+		// Picto + Ref
+		print '<td class="nobordernopadding nowrap">';
+
+		if ($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice' || $line->doc_type == 'expense_report')
+		{
+			print $objectstatic->getNomUrl(1, '', 0, 0, '', 0, -1, 1);
+			print $documentlink;
+		} else {
+			print $line->doc_ref;
+		}
+		print '</td></tr></table>';
+
+		print "</td>\n";
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Label operation
+	if (!empty($arrayfields['t.label_operation']['checked'])) {
+		// Affiche un lien vers la facture client/fournisseur
+		$doc_ref = preg_replace('/\(.*\)/', '', $line->doc_ref);
+		print strlen(length_accounta($line->subledger_account)) == 0 ? '<td>'.$line->label_operation.'</td>' : '<td>'.$line->label_operation.'<br><span style="font-size:0.8em">('.length_accounta($line->subledger_account).')</span></td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Amount debit
+	if (!empty($arrayfields['t.debit']['checked']))
+	{
+		print '<td class="nowrap right">'.($line->debit ? price($line->debit) : '').'</td>';
+		if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totaldebit';
+		$totalarray['val']['totaldebit'] += $line->debit;
+	}
+
+	// Amount credit
+	if (!empty($arrayfields['t.credit']['checked'])) {
+		print '<td class="nowrap right">'.($line->credit ? price($line->credit) : '').'</td>';
+		if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalcredit';
+		$totalarray['val']['totalcredit'] += $line->credit;
+	}
+
+	// Lettering code
+	if (!empty($arrayfields['t.lettering_code']['checked']))
+	{
+		print '<td class="center">'.$line->lettering_code.'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Fields from hook
+	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
+	// Action column
+	print '<td class="nowraponall center">';
+	if (empty($line->date_export)) {
+		if ($user->rights->accounting->mouvements->creer) {
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_edit().'</a>';
+		}
+		if ($user->rights->accounting->mouvements->supprimer) {
+			print ' &nbsp; <a class="paddingleft" href="'.$_SERVER['PHP_SELF'].'?action=delmouv&mvt_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_delete().'</a>';
+		}
+	}
+	print '</td>';
+	if (!$i) $totalarray['nbfield']++;
+
+	// Comptabilise le sous-total
+	$sous_total_debit += $line->debit;
+	$sous_total_credit += $line->credit;
+
+	print "</tr>\n";
+
+	$i++;
+}
+
+// Show sub-total of last shown account
+$colspan = $totalarray['nbfield'] - 3;
+$colspanend = $totalarray['nbfield'] - 8;
+print '<tr class="liste_total">';
+print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.$accountg.':</td>';
+print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
+print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
+print '<td colspan="'.$colspanend.'"></td>';
+print '</tr>';
+// Show balance of last shown account
+$balance = $sous_total_debit - $sous_total_credit;
+print '<tr class="liste_total">';
+print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
+if ($balance > 0)
+{
+	print '<td class="nowraponall right">';
+	print price($sous_total_debit - $sous_total_credit);
+	print '</td>';
+	print '<td></td>';
+} else {
+	print '<td></td>';
+	print '<td class="nowraponall right">';
+	print price($sous_total_credit - $sous_total_debit);
+	print '</td>';
+}
+print '<td colspan="'.$colspanend.'"></td>';
+print '</tr>';
+
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+
+print "</table>";
+print '</div>';
+
+// TODO Replace this with mass delete action
+if ($user->rights->accounting->mouvements->supprimer_tous) {
+	print '<div class="tabsAction tabsActionNoBottom">'."\n";
+	print '<a class="butActionDelete" name="button_delmvt" href="'.$_SERVER["PHP_SELF"].'?action=delbookkeepingyear'.($param ? '&'.$param : '').'">'.$langs->trans("DeleteMvt").'</a>';
+	print '</div>';
+}
+
+print '</form>';
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
index 321ef282dff..e831e21f814 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
@@ -135,13 +135,13 @@ $head = societe_prepare_head($object);
 
 dol_htmloutput_mesg(is_numeric($error) ? '' : $error, $errors, 'error');
 
-dol_fiche_head($head, 'lettering_customer', $langs->trans("ThirdParty"), 0, 'company');
+print dol_get_fiche_head($head, 'lettering_customer', $langs->trans("ThirdParty"), 0, 'company');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom', '', '', 0, '', '', 'arearefnobottom');
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 $sql = "SELECT bk.rowid, bk.doc_date, bk.doc_type, bk.doc_ref, ";
 $sql .= " bk.subledger_account, bk.numero_compte , bk.label_compte, bk.debit, ";
@@ -195,17 +195,17 @@ dol_syslog("/accountancy/bookkeeping/thirdparty_lettering_customer.php", LOG_DEB
 if ($resql) {
 	$i = 0;
 
-    $param = "&socid=".$socid;
+	$param = "&socid=".$socid;
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="POST">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="socid" value="'.$object->id.'">';
 
-    $letteringbutton = '<a class="divButAction"><span class="valignmiddle"><input class="butAction" type="submit" value="lettering" name="lettering" id="lettering"></span></a>';
+	$letteringbutton = '<a class="divButAction"><span class="valignmiddle"><input class="butAction" type="submit" value="lettering" name="lettering" id="lettering"></span></a>';
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, $letteringbutton, '', $limit);
 
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="liste centpercent">'."\n";
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="liste centpercent">'."\n";
 
 	/*
     print '<tr class="liste_titre">';
@@ -244,13 +244,13 @@ if ($resql) {
 	print_liste_field_titre("Balancing", $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder);
 	print_liste_field_titre("Codejournal", $_SERVER["PHP_SELF"], "bk.code_journal", "", $param, "", $sortfield, $sortorder, 'center ');
 	print_liste_field_titre("LetteringCode", $_SERVER["PHP_SELF"], "bk.lettering_code", "", $param, "", $sortfield, $sortorder, 'center ');
-    print_liste_field_titre("", "", "", '', '', "", $sortfield, $sortorder, 'maxwidthsearch center ');
+	print_liste_field_titre("", "", "", '', '', "", $sortfield, $sortorder, 'maxwidthsearch center ');
 	print "</tr>\n";
 
 	$solde = 0;
 	$tmp = '';
 
-    while ($obj = $db->fetch_object($resql)) {
+	while ($obj = $db->fetch_object($resql)) {
 		if ($tmp != $obj->lettering_code || empty($tmp))						$tmp = $obj->lettering_code;
 		/*if ($tmp != $obj->lettering_code || empty($obj->lettering_code))*/	$solde += ($obj->credit - $obj->debit);
 
@@ -265,20 +265,20 @@ if ($resql) {
 		print '<td class="nowrap right">'.price(round($solde, 2)).'</td>';
 
 		// Journal
-        $accountingjournal = new AccountingJournal($db);
-        $result = $accountingjournal->fetch('', $obj->code_journal);
-        $journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $obj->code_journal);
-        print '<td class="center">'.$journaltoshow.'</td>';
+		$accountingjournal = new AccountingJournal($db);
+		$result = $accountingjournal->fetch('', $obj->code_journal);
+		$journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $obj->code_journal);
+		print '<td class="center">'.$journaltoshow.'</td>';
 
-        if (empty($obj->lettering_code)) {
-            print '<td class="nowrap center"><input type="checkbox" class="flat checkforselect" name="toselect[]" id="toselect[]" value="'.$obj->rowid.'" /></td>';
-            print '<td><a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$obj->piece_num.'">';
-            print img_edit();
-            print '</a></td>'."\n";
-        } else {
-            print '<td class="center">'.$obj->lettering_code.'</td>';
-            print '<td></td>';
-        }
+		if (empty($obj->lettering_code)) {
+			print '<td class="nowrap center"><input type="checkbox" class="flat checkforselect" name="toselect[]" id="toselect[]" value="'.$obj->rowid.'" /></td>';
+			print '<td><a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$obj->piece_num.'">';
+			print img_edit();
+			print '</a></td>'."\n";
+		} else {
+			print '<td class="center">'.$obj->lettering_code.'</td>';
+			print '<td></td>';
+		}
 
 		print "</tr>\n";
 	}
@@ -299,9 +299,9 @@ if ($resql) {
 
 	print "</table>";
 
-    print '<div class="tabsAction tabsActionNoBottom">'."\n";
-    print $letteringbutton;
-    print '</div>';
+	print '<div class="tabsAction tabsActionNoBottom">'."\n";
+	print $letteringbutton;
+	print '</div>';
 
 	print "</form>";
 	$db->free($resql);
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
index 144c2595d25..b5620f3ec25 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2013      Olivier Geffroy      <jeff@jeffinfo.com>
  * Copyright (C) 2013      Florian Henry	    <florian.henry@open-concept.pro>
  * Copyright (C) 2013-2019 Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2018-2019 Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020 Frédéric 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
@@ -41,7 +41,7 @@ $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm    = GETPOST('confirm', 'alpha');
 $toselect   = GETPOST('toselect', 'array');
-$socid      = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
+$socid      = GETPOST('socid', 'int') ? ((int) GETPOST('socid', 'int')) : ((int) GETPOST('id', 'int'));
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
@@ -134,13 +134,13 @@ $head = societe_prepare_head($object);
 
 dol_htmloutput_mesg(is_numeric($error) ? '' : $error, $errors, 'error');
 
-dol_fiche_head($head, 'lettering_supplier', $langs->trans("ThirdParty"), 0, 'company');
+print dol_get_fiche_head($head, 'lettering_supplier', $langs->trans("ThirdParty"), 0, 'company');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom', '', '', 0, '', '', 'arearefnobottom');
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 $sql = "SELECT bk.rowid, bk.doc_date, bk.doc_type, bk.doc_ref, ";
 $sql .= " bk.subledger_account, bk.numero_compte , bk.label_compte, bk.debit, ";
@@ -193,17 +193,17 @@ if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
-    $param = "&socid=".$socid;
+	$param = "&socid=".$socid;
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="POST">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="socid" value="'.$object->id.'">';
 
-    $letteringbutton = '<a class="divButAction"><span class="valignmiddle"><input class="butAction" type="submit" value="lettering" name="lettering" id="lettering"></span></a>';
+	$letteringbutton = '<a class="divButAction"><span class="valignmiddle"><input class="butAction" type="submit" value="lettering" name="lettering" id="lettering"></span></a>';
 
-    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, $letteringbutton, '', $limit);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, $letteringbutton, '', $limit);
 
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="liste centpercent">'."\n";
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="liste centpercent">'."\n";
 
 	/*
     print '<tr class="liste_titre">';
@@ -242,7 +242,7 @@ if ($resql) {
 	print_liste_field_titre("Balancing", $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder);
 	print_liste_field_titre("Codejournal", $_SERVER["PHP_SELF"], "bk.code_journal", "", $param, "", $sortfield, $sortorder, 'center ');
 	print_liste_field_titre("LetteringCode", $_SERVER["PHP_SELF"], "bk.lettering_code", "", $param, "", $sortfield, $sortorder, 'center ');
-    print_liste_field_titre("", "", "", '', '', "", $sortfield, $sortorder, 'maxwidthsearch center ');
+	print_liste_field_titre("", "", "", '', '', "", $sortfield, $sortorder, 'maxwidthsearch center ');
 	print "</tr>\n";
 
 	$solde = 0;
@@ -261,21 +261,21 @@ if ($resql) {
 		print '<td class="nowrap right">'.price($obj->credit).'</td>';
 		print '<td class="nowrap right">'.price(round($solde, 2)).'</td>';
 
-        // Journal
-        $accountingjournal = new AccountingJournal($db);
-        $result = $accountingjournal->fetch('', $obj->code_journal);
-        $journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $obj->code_journal);
-        print '<td class="center">'.$journaltoshow.'</td>';
+		// Journal
+		$accountingjournal = new AccountingJournal($db);
+		$result = $accountingjournal->fetch('', $obj->code_journal);
+		$journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $obj->code_journal);
+		print '<td class="center">'.$journaltoshow.'</td>';
 
 		if (empty($obj->lettering_code) && empty($obj->date_validated)) {
 			print '<td class="nowrap center"><input type="checkbox" class="flat checkforselect" name="toselect[]" id="toselect[]" value="'.$obj->rowid.'" /></td>';
-		    print '<td><a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$obj->piece_num.'">';
-		    print img_edit();
-            print '</a></td>'."\n";
+			print '<td><a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$obj->piece_num.'">';
+			print img_edit();
+			print '</a></td>'."\n";
 		} else {
-            print '<td class="center">'.$obj->lettering_code.'</td>';
-            print '<td></td>';
-        }
+			print '<td class="center">'.$obj->lettering_code.'</td>';
+			print '<td></td>';
+		}
 
 		print "</tr>\n";
 	}
@@ -296,9 +296,9 @@ if ($resql) {
 
 	print "</table>";
 
-    print '<div class="tabsAction tabsActionNoBottom">'."\n";
+	print '<div class="tabsAction tabsActionNoBottom">'."\n";
 	print $letteringbutton;
-    print '</div>';
+	print '</div>';
 
 	print "</form>";
 	$db->free($resql);
diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index c7f7f8cf68c..eb43348f1ea 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -31,10 +31,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
  */
 class AccountancyCategory // extends CommonObject
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string 		Error string
@@ -63,9 +63,9 @@ class AccountancyCategory // extends CommonObject
 	public $rowid;
 
 	/**
-     * @var int ID
-     */
-    public $id;
+	 * @var int ID
+	 */
+	public $id;
 
 	/**
 	 * @var string Accountancy code
@@ -73,11 +73,11 @@ class AccountancyCategory // extends CommonObject
 	public $code;
 
 	/**
-     * @var string Accountancy Category label
-     */
-    public $label;
+	 * @var string Accountancy Category label
+	 */
+	public $label;
 
-    /**
+	/**
 	 * @var string Accountancy range account
 	 */
 	public $range_account;
@@ -381,8 +381,8 @@ class AccountancyCategory // extends CommonObject
 	 * @param int $id Id
 	 * @return int <0 if KO, 0 if not found, >0 if OK
 	 */
-    public function display($id)
-    {
+	public function display($id)
+	{
 		global $conf;
 		$sql = "SELECT t.rowid, t.account_number, t.label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as t";
@@ -408,7 +408,7 @@ class AccountancyCategory // extends CommonObject
 
 			return -1;
 		}
-    }
+	}
 
 	/**
 	 * Function to select accounting category of an accounting account present in chart of accounts
@@ -417,8 +417,8 @@ class AccountancyCategory // extends CommonObject
 	 *
 	 * @return int <0 if KO, 0 if not found, >0 if OK
 	 */
-    public function getCptBK($id)
-    {
+	public function getCptBK($id)
+	{
 		global $conf;
 
 		$sql = "SELECT t.numero_compte, t.label_operation, t.doc_ref";
@@ -457,7 +457,7 @@ class AccountancyCategory // extends CommonObject
 
 			return -1;
 		}
-    }
+	}
 
 	/**
 	 * Function to select accounting category of an accounting account present in chart of accounts
@@ -466,41 +466,41 @@ class AccountancyCategory // extends CommonObject
 	 *
 	 * @return int <0 if KO, 0 if not found, >0 if OK
 	 */
-    public function getAccountsWithNoCategory($id)
-    {
-        global $conf;
+	public function getAccountsWithNoCategory($id)
+	{
+		global $conf;
 
-	    $sql = "SELECT aa.account_number as numero_compte, aa.label as label_compte";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as aa";
-	    $sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
-	    $sql .= " WHERE (aa.fk_accounting_category != ".$id." OR aa.fk_accounting_category IS NULL)";
-	    $sql .= " AND asy.rowid = ".$conf->global->CHARTOFACCOUNTS;
-	    $sql .= " AND aa.active = 1";
-	    $sql .= " AND aa.entity = ".$conf->entity;
-	    $sql .= " GROUP BY aa.account_number, aa.label";
-	    $sql .= " ORDER BY aa.account_number, aa.label";
+		$sql = "SELECT aa.account_number as numero_compte, aa.label as label_compte";
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as aa";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+		$sql .= " WHERE (aa.fk_accounting_category != ".$id." OR aa.fk_accounting_category IS NULL)";
+		$sql .= " AND asy.rowid = ".$conf->global->CHARTOFACCOUNTS;
+		$sql .= " AND aa.active = 1";
+		$sql .= " AND aa.entity = ".$conf->entity;
+		$sql .= " GROUP BY aa.account_number, aa.label";
+		$sql .= " ORDER BY aa.account_number, aa.label";
 
-	    $this->lines_CptBk = array();
+		$this->lines_CptBk = array();
 
-	    dol_syslog(__METHOD__, LOG_DEBUG);
-	    $resql = $this->db->query($sql);
-	    if ($resql) {
-	        $num = $this->db->num_rows($resql);
-	        if ($num) {
-	            while ($obj = $this->db->fetch_object($resql)) {
-	                $this->lines_cptbk[] = $obj;
-	            }
-	        }
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			if ($num) {
+				while ($obj = $this->db->fetch_object($resql)) {
+					$this->lines_cptbk[] = $obj;
+				}
+			}
 
-	        return $num;
-	    } else {
-	        $this->error = "Error ".$this->db->lasterror();
-	        $this->errors[] = $this->error;
-	        dol_syslog(__METHOD__." ".implode(','.$this->errors), LOG_ERR);
+			return $num;
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			$this->errors[] = $this->error;
+			dol_syslog(__METHOD__." ".implode(','.$this->errors), LOG_ERR);
 
-	        return -1;
-	    }
-    }
+			return -1;
+		}
+	}
 
 	/**
 	 * Function to add an accounting account in an accounting category
@@ -510,8 +510,8 @@ class AccountancyCategory // extends CommonObject
 	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
-    public function updateAccAcc($id_cat, $cpts = array())
-    {
+	public function updateAccAcc($id_cat, $cpts = array())
+	{
 		global $conf;
 		$error = 0;
 
@@ -523,7 +523,7 @@ class AccountancyCategory // extends CommonObject
 		$sql .= " AND asy.rowid = ".$conf->global->CHARTOFACCOUNTS;
 		$sql .= " AND aa.active = 1";
 		$sql .= " AND aa.entity = ".$conf->entity;
-        $sql .= " ORDER BY LENGTH(aa.account_number) DESC;"; // LENGTH is ok with mysql and postgresql
+		$sql .= " ORDER BY LENGTH(aa.account_number) DESC;"; // LENGTH is ok with mysql and postgresql
 
 		$this->db->begin();
 
@@ -539,13 +539,13 @@ class AccountancyCategory // extends CommonObject
 		$accountincptsadded = array();
 		while ($obj = $this->db->fetch_object($resql))
 		{
-		    $account_number_formated = length_accountg($obj->account_number);
-		    if (!empty($accountincptsadded[$account_number_formated])) continue;
+			$account_number_formated = length_accountg($obj->account_number);
+			if (!empty($accountincptsadded[$account_number_formated])) continue;
 
-		    if (array_key_exists($account_number_formated, $cpts))
+			if (array_key_exists($account_number_formated, $cpts))
 			{
-			    $accountincptsadded[$account_number_formated] = 1;
-			    // We found an account number that is in list $cpts of account to add
+				$accountincptsadded[$account_number_formated] = 1;
+				// We found an account number that is in list $cpts of account to add
 				$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_account";
 				$sql .= " SET fk_accounting_category=".$id_cat;
 				$sql .= " WHERE rowid=".$obj->rowid;
@@ -572,7 +572,7 @@ class AccountancyCategory // extends CommonObject
 
 			return 1;
 		}
-    }
+	}
 
 	/**
 	 * Function to delete an accounting account from an accounting category
@@ -581,8 +581,8 @@ class AccountancyCategory // extends CommonObject
 	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
-    public function deleteCptCat($cpt_id)
-    {
+	public function deleteCptCat($cpt_id)
+	{
 		$error = 0;
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_account as aa";
@@ -598,7 +598,7 @@ class AccountancyCategory // extends CommonObject
 		}
 
 		// Commit or rollback
-        if ($error) {
+		if ($error) {
 			foreach ($this->errors as $errmsg) {
 				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
@@ -606,12 +606,12 @@ class AccountancyCategory // extends CommonObject
 			$this->db->rollback();
 
 			return -1 * $error;
-        } else {
+		} else {
 			$this->db->commit();
 
-            return 1;
-        }
-    }
+			return 1;
+		}
+	}
 
 	/**
 	 * Function to know all category from accounting account
@@ -781,7 +781,7 @@ class AccountancyCategory // extends CommonObject
 							'formula' => $obj->formula,
 							'position' => $obj->position,
 							'category_type' => $obj->category_type,
-					        'bc' => $obj->sens
+							'bc' => $obj->sens
 					);
 					$i++;
 				}
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 0204602438f..f15a2a0c704 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -55,8 +55,10 @@ class AccountancyExport
 	public static $EXPORT_TYPE_QUADRATUS = 60;
 	public static $EXPORT_TYPE_WINFIC = 70;
 	public static $EXPORT_TYPE_OPENCONCERTO = 100;
-    public static $EXPORT_TYPE_LDCOMPTA = 110;
+	public static $EXPORT_TYPE_LDCOMPTA = 110;
 	public static $EXPORT_TYPE_LDCOMPTA10 = 120;
+	public static $EXPORT_TYPE_GESTINUMV3 = 130;
+	public static $EXPORT_TYPE_GESTINUMV5 = 135;
 	public static $EXPORT_TYPE_FEC = 1000;
 
 
@@ -111,12 +113,14 @@ class AccountancyExport
 			self::$EXPORT_TYPE_EBP => $langs->trans('Modelcsv_ebp'),
 			self::$EXPORT_TYPE_COGILOG => $langs->trans('Modelcsv_cogilog'),
 			self::$EXPORT_TYPE_AGIRIS => $langs->trans('Modelcsv_agiris'),
-            self::$EXPORT_TYPE_OPENCONCERTO => $langs->trans('Modelcsv_openconcerto'),
+			self::$EXPORT_TYPE_OPENCONCERTO => $langs->trans('Modelcsv_openconcerto'),
 			self::$EXPORT_TYPE_SAGE50_SWISS => $langs->trans('Modelcsv_Sage50_Swiss'),
+			self::$EXPORT_TYPE_CHARLEMAGNE => $langs->trans('Modelcsv_charlemagne'),
 			self::$EXPORT_TYPE_LDCOMPTA => $langs->trans('Modelcsv_LDCompta'),
 			self::$EXPORT_TYPE_LDCOMPTA10 => $langs->trans('Modelcsv_LDCompta10'),
+			self::$EXPORT_TYPE_GESTINUMV3 => $langs->trans('Modelcsv_Gestinum_v3'),
+			self::$EXPORT_TYPE_GESTINUMV5 => $langs->trans('Modelcsv_Gestinum_v5'),
 			self::$EXPORT_TYPE_FEC => $langs->trans('Modelcsv_FEC'),
-			self::$EXPORT_TYPE_CHARLEMAGNE => $langs->trans('Modelcsv_charlemagne'),
 		);
 
 		ksort($listofexporttypes, SORT_NUMERIC);
@@ -144,9 +148,12 @@ class AccountancyExport
 			self::$EXPORT_TYPE_COGILOG => 'cogilog',
 			self::$EXPORT_TYPE_AGIRIS => 'agiris',
 			self::$EXPORT_TYPE_OPENCONCERTO => 'openconcerto',
-            self::$EXPORT_TYPE_SAGE50_SWISS => 'sage50ch',
-            self::$EXPORT_TYPE_LDCOMPTA => 'ldcompta',
-            self::$EXPORT_TYPE_LDCOMPTA10 => 'ldcompta10',
+			self::$EXPORT_TYPE_SAGE50_SWISS => 'sage50ch',
+			self::$EXPORT_TYPE_CHARLEMAGNE => 'charlemagne',
+			self::$EXPORT_TYPE_LDCOMPTA => 'ldcompta',
+			self::$EXPORT_TYPE_LDCOMPTA10 => 'ldcompta10',
+			self::$EXPORT_TYPE_GESTINUMV3 => 'gestinumv3',
+			self::$EXPORT_TYPE_GESTINUMV5 => 'gestinumv5',
 			self::$EXPORT_TYPE_FEC => 'fec',
 		);
 
@@ -201,30 +208,32 @@ class AccountancyExport
 				self::$EXPORT_TYPE_AGIRIS => array(
 					'label' => $langs->trans('Modelcsv_agiris'),
 				),
-                self::$EXPORT_TYPE_OPENCONCERTO => array(
-                    'label' => $langs->trans('Modelcsv_openconcerto'),
-                    'ACCOUNTING_EXPORT_FORMAT' => 'csv',
-                ),
+				self::$EXPORT_TYPE_OPENCONCERTO => array(
+					'label' => $langs->trans('Modelcsv_openconcerto'),
+				),
 				self::$EXPORT_TYPE_SAGE50_SWISS => array(
 					'label' => $langs->trans('Modelcsv_Sage50_Swiss'),
-					'ACCOUNTING_EXPORT_FORMAT' => 'csv',
-				),
-                self::$EXPORT_TYPE_LDCOMPTA => array(
-                    'label' => $langs->trans('Modelcsv_LDCompta'),
-                    'ACCOUNTING_EXPORT_FORMAT' => 'csv',
-                ),
-				self::$EXPORT_TYPE_LDCOMPTA10 => array(
-                    'label' => $langs->trans('Modelcsv_LDCompta10'),
-                    'ACCOUNTING_EXPORT_FORMAT' => 'csv',
-                ),
-				self::$EXPORT_TYPE_FEC => array(
-					'label' => $langs->trans('Modelcsv_FEC'),
-					'ACCOUNTING_EXPORT_FORMAT' => 'txt',
 				),
 				self::$EXPORT_TYPE_CHARLEMAGNE => array(
 					'label' => $langs->trans('Modelcsv_charlemagne'),
 					'ACCOUNTING_EXPORT_FORMAT' => 'txt',
 				),
+				self::$EXPORT_TYPE_LDCOMPTA => array(
+					'label' => $langs->trans('Modelcsv_LDCompta'),
+				),
+				self::$EXPORT_TYPE_LDCOMPTA10 => array(
+					'label' => $langs->trans('Modelcsv_LDCompta10'),
+				),
+				self::$EXPORT_TYPE_GESTINUMV3 => array(
+					'label' => $langs->trans('Modelcsv_Gestinumv3'),
+				),
+				self::$EXPORT_TYPE_GESTINUMV5 => array(
+					'label' => $langs->trans('Modelcsv_Gestinumv5'),
+				),
+				self::$EXPORT_TYPE_FEC => array(
+					'label' => $langs->trans('Modelcsv_FEC'),
+					'ACCOUNTING_EXPORT_FORMAT' => 'txt',
+				),
 			),
 			'cr'=> array(
 				'1' => $langs->trans("Unix"),
@@ -254,7 +263,7 @@ class AccountancyExport
 		$filename = 'general_ledger-'.$this->getFormatCode($formatexportset);
 		$type_export = 'general_ledger';
 
-		global $db; 	// The tpl file use $db
+		global $db; // The tpl file use $db
 		include DOL_DOCUMENT_ROOT.'/accountancy/tpl/export_journal.tpl.php';
 
 
@@ -289,24 +298,30 @@ class AccountancyExport
 			case self::$EXPORT_TYPE_AGIRIS :
 				$this->exportAgiris($TData);
 				break;
-            case self::$EXPORT_TYPE_OPENCONCERTO :
-                $this->exportOpenConcerto($TData);
-                break;
+			case self::$EXPORT_TYPE_OPENCONCERTO :
+				$this->exportOpenConcerto($TData);
+				break;
 			case self::$EXPORT_TYPE_SAGE50_SWISS :
 				$this->exportSAGE50SWISS($TData);
 				break;
-            case self::$EXPORT_TYPE_LDCOMPTA :
-                $this->exportLDCompta($TData);
-                break;
-            case self::$EXPORT_TYPE_LDCOMPTA10 :
-                $this->exportLDCompta10($TData);
-                break;
-            case self::$EXPORT_TYPE_FEC :
-                $this->exportFEC($TData);
-                break;
 			case self::$EXPORT_TYPE_CHARLEMAGNE :
 				$this->exportCharlemagne($TData);
 				break;
+			case self::$EXPORT_TYPE_LDCOMPTA :
+				$this->exportLDCompta($TData);
+				break;
+			case self::$EXPORT_TYPE_LDCOMPTA10 :
+				$this->exportLDCompta10($TData);
+				break;
+			case self::$EXPORT_TYPE_GESTINUMV3 :
+				$this->exportGestimumV3($TData);
+				break;
+			case self::$EXPORT_TYPE_GESTINUMV5 :
+				$this->exportGestimumV5($TData);
+				break;
+			case self::$EXPORT_TYPE_FEC :
+				$this->exportFEC($TData);
+				break;
 			default:
 				$this->errors[] = $langs->trans('accountancy_error_modelnotfound');
 				break;
@@ -386,6 +401,7 @@ class AccountancyExport
 
 		foreach ($objectLines as $line) {
 			$date = dol_print_date($line->doc_date, '%d/%m/%Y');
+
 			print $date.$separator;
 			print $line->code_journal.$separator;
 			print length_accountg($line->numero_compte).$separator;
@@ -394,7 +410,7 @@ class AccountancyExport
 			print price($line->debit).$separator;
 			print price($line->credit).$separator;
 			print 'E'.$separator;
-			print length_accountg($line->subledger_account).$separator;
+			print length_accounta($line->subledger_account).$separator;
 			print $end_line;
 		}
 	}
@@ -599,7 +615,7 @@ class AccountancyExport
 			$Tab['num_compte'] = str_pad(self::trunc($code_compta, 6), 6, '0');
 
 			if ($data->sens == 'D') {
-				$Tab['montant_debit']  =  str_pad(number_format(abs($data->montant), 2, ',', ''), 13, ' ', STR_PAD_LEFT);
+				$Tab['montant_debit']  = str_pad(number_format(abs($data->montant), 2, ',', ''), 13, ' ', STR_PAD_LEFT);
 
 				$Tab['montant_crebit'] = str_pad(number_format(0, 2, ',', ''), 13, ' ', STR_PAD_LEFT);
 			} else {
@@ -659,10 +675,10 @@ class AccountancyExport
 			print $date.$separator;
 			print $line->code_journal.$separator;
 			if (empty($line->subledger_account)) {
-                print $line->numero_compte.$separator;
-            } else {
-                print $line->subledger_account.$separator;
-            }
+				print $line->numero_compte.$separator;
+			} else {
+				print $line->subledger_account.$separator;
+			}
 			//print substr(length_accountg($line->numero_compte), 0, 2) . $separator;
 			print '"'.dol_trunc($line->label_operation, 40, 'right', 'UTF-8', 1).'"'.$separator;
 			print '"'.dol_trunc($line->piece_num, 15, 'right', 'UTF-8', 1).'"'.$separator;
@@ -714,36 +730,36 @@ class AccountancyExport
 		}
 	}
 
-    /**
-     * Export format : OpenConcerto
-     *
-     * @param array $objectLines data
-     * @return void
-     */
-    public function exportOpenConcerto($objectLines)
-    {
+	/**
+	 * Export format : OpenConcerto
+	 *
+	 * @param array $objectLines data
+	 * @return void
+	 */
+	public function exportOpenConcerto($objectLines)
+	{
 
-        $separator = ';';
-        $end_line = "\n";
+		$separator = ';';
+		$end_line = "\n";
 
-        foreach ($objectLines as $line) {
-            $date = dol_print_date($line->doc_date, '%d/%m/%Y');
+		foreach ($objectLines as $line) {
+			$date = dol_print_date($line->doc_date, '%d/%m/%Y');
 
-            print $date.$separator;
-            print $line->code_journal.$separator;
-            if (empty($line->subledger_account)) {
-                print length_accountg($line->numero_compte).$separator;
-            } else {
-                print length_accounta($line->subledger_account).$separator;
-            }
-            print $line->doc_ref.$separator;
-            print $line->label_operation.$separator;
-            print price($line->debit).$separator;
-            print price($line->credit).$separator;
+			print $date.$separator;
+			print $line->code_journal.$separator;
+			if (empty($line->subledger_account)) {
+				print length_accountg($line->numero_compte).$separator;
+			} else {
+				print length_accounta($line->subledger_account).$separator;
+			}
+			print $line->doc_ref.$separator;
+			print $line->label_operation.$separator;
+			print price($line->debit).$separator;
+			print price($line->credit).$separator;
 
-            print $end_line;
-        }
-    }
+			print $end_line;
+		}
+	}
 
 	/**
 	 * Export format : Configurable CSV
@@ -785,7 +801,7 @@ class AccountancyExport
 	public function exportFEC($objectLines)
 	{
 		$separator = "\t";
-		$end_line = "\n";
+		$end_line = "\r\n";
 
 		print "JournalCode".$separator;
 		print "JournalLib".$separator;
@@ -808,214 +824,219 @@ class AccountancyExport
 		print $end_line;
 
 		foreach ($objectLines as $line) {
-			$date_creation = dol_print_date($line->date_creation, '%Y%m%d');
-			$date_document = dol_print_date($line->doc_date, '%Y%m%d');
-			$date_validation = dol_print_date($line->date_validated, '%Y%m%d');
+			if ($line->debit == 0 && $line->credit == 0) {
+                unset($array[$line]);
+            } else {
+				$date_creation = dol_print_date($line->date_creation, '%Y%m%d');
+				$date_document = dol_print_date($line->doc_date, '%Y%m%d');
+				$date_lettering = dol_print_date($line->date_lettering, '%Y%m%d');
+				$date_validation = dol_print_date($line->date_validated, '%Y%m%d');
 
-			// FEC:JournalCode
-			print $line->code_journal.$separator;
+				// FEC:JournalCode
+				print $line->code_journal.$separator;
 
-			// FEC:JournalLib
-			print $line->journal_label.$separator;
+				// FEC:JournalLib
+				print $line->journal_label.$separator;
 
-			// FEC:EcritureNum
-			print $line->piece_num.$separator;
+				// FEC:EcritureNum
+				print $line->piece_num.$separator;
 
-			// FEC:EcritureDate
-			print $date_document . $separator;
+				// FEC:EcritureDate
+				print $date_document.$separator;
 
-			// FEC:CompteNum
-			print $line->numero_compte.$separator;
+				// FEC:CompteNum
+				print $line->numero_compte.$separator;
 
-			// FEC:CompteLib
-			print dol_string_unaccent($line->label_compte) . $separator;
+				// FEC:CompteLib
+				print dol_string_unaccent($line->label_compte).$separator;
 
-			// FEC:CompAuxNum
-			print $line->subledger_account.$separator;
+				// FEC:CompAuxNum
+				print $line->subledger_account.$separator;
 
-			// FEC:CompAuxLib
-			print dol_string_unaccent($line->subledger_label) . $separator;
+				// FEC:CompAuxLib
+				print dol_string_unaccent($line->subledger_label).$separator;
 
-			// FEC:PieceRef
-			print $line->doc_ref.$separator;
+				// FEC:PieceRef
+				print $line->doc_ref.$separator;
 
-			// FEC:PieceDate
-			print dol_string_unaccent($date_creation) . $separator;
+				// FEC:PieceDate
+				print dol_string_unaccent($date_creation).$separator;
 
-			// FEC:EcritureLib
-			print $line->label_operation.$separator;
+				// FEC:EcritureLib
+				print dol_string_unaccent($line->label_operation).$separator;
 
-			// FEC:Debit
-			print price2fec($line->debit).$separator;
+				// FEC:Debit
+				print price2fec($line->debit).$separator;
 
-			// FEC:Credit
-			print price2fec($line->credit).$separator;
+				// FEC:Credit
+				print price2fec($line->credit).$separator;
 
-			// FEC:EcritureLet
-			print $line->lettering_code.$separator;
+				// FEC:EcritureLet
+				print $line->lettering_code.$separator;
 
-			// FEC:DateLet
-			print $line->date_lettering.$separator;
+				// FEC:DateLet
+				print $date_lettering.$separator;
 
-			// FEC:ValidDate
-			print $date_validation . $separator;
+				// FEC:ValidDate
+				print $date_validation.$separator;
 
-			// FEC:Montantdevise
-			print $line->multicurrency_amount.$separator;
+				// FEC:Montantdevise
+				print $line->multicurrency_amount.$separator;
 
-			// FEC:Idevise
-			print $line->multicurrency_code;
+				// FEC:Idevise
+				print $line->multicurrency_code;
 
-			print $end_line;
+				print $end_line;
+			}
 		}
 	}
 
-    /**
-     * Export format : SAGE50SWISS
-     *
-     * https://onlinehelp.sageschweiz.ch/default.aspx?tabid=19984
-     * http://media.topal.ch/Public/Schnittstellen/TAF/Specification/Sage50-TAF-format.pdf
-     *
-     * @param array $objectLines data
-     *
-     * @return void
-     */
-    public function exportSAGE50SWISS($objectLines)
-    {
-        // SAGE50SWISS
-        $this->separator = ',';
-        $this->end_line = "\r\n";
+	/**
+	 * Export format : SAGE50SWISS
+	 *
+	 * https://onlinehelp.sageschweiz.ch/default.aspx?tabid=19984
+	 * http://media.topal.ch/Public/Schnittstellen/TAF/Specification/Sage50-TAF-format.pdf
+	 *
+	 * @param array $objectLines data
+	 *
+	 * @return void
+	 */
+	public function exportSAGE50SWISS($objectLines)
+	{
+		// SAGE50SWISS
+		$this->separator = ',';
+		$this->end_line = "\r\n";
 
-        // Print header line
-        print "Blg,Datum,Kto,S/H,Grp,GKto,SId,SIdx,KIdx,BTyp,MTyp,Code,Netto,Steuer,FW-Betrag,Tx1,Tx2,PkKey,OpId,Flag";
-        print $this->end_line;
-        $thisPieceNum = "";
-        $thisPieceAccountNr = "";
-        $aSize = count($objectLines);
-        foreach ($objectLines as $aIndex=>$line)
+		// Print header line
+		print "Blg,Datum,Kto,S/H,Grp,GKto,SId,SIdx,KIdx,BTyp,MTyp,Code,Netto,Steuer,FW-Betrag,Tx1,Tx2,PkKey,OpId,Flag";
+		print $this->end_line;
+		$thisPieceNum = "";
+		$thisPieceAccountNr = "";
+		$aSize = count($objectLines);
+		foreach ($objectLines as $aIndex=>$line)
 		{
-            $sammelBuchung = false;
-            if ($aIndex - 2 >= 0 && $objectLines[$aIndex - 2]->piece_num == $line->piece_num)
-            {
-                $sammelBuchung = true;
-            } elseif ($aIndex + 2 < $aSize && $objectLines[$aIndex + 2]->piece_num == $line->piece_num)
-            {
-                $sammelBuchung = true;
-            } elseif ($aIndex + 1 < $aSize
-                    && $objectLines[$aIndex + 1]->piece_num == $line->piece_num
-                    && $aIndex - 1 < $aSize
-                    && $objectLines[$aIndex - 1]->piece_num == $line->piece_num
-                    )
-            {
-                $sammelBuchung = true;
-            }
+			$sammelBuchung = false;
+			if ($aIndex - 2 >= 0 && $objectLines[$aIndex - 2]->piece_num == $line->piece_num)
+			{
+				$sammelBuchung = true;
+			} elseif ($aIndex + 2 < $aSize && $objectLines[$aIndex + 2]->piece_num == $line->piece_num)
+			{
+				$sammelBuchung = true;
+			} elseif ($aIndex + 1 < $aSize
+					&& $objectLines[$aIndex + 1]->piece_num == $line->piece_num
+					&& $aIndex - 1 < $aSize
+					&& $objectLines[$aIndex - 1]->piece_num == $line->piece_num
+					)
+			{
+				$sammelBuchung = true;
+			}
 
-            //Blg
-            print $line->piece_num.$this->separator;
+			//Blg
+			print $line->piece_num.$this->separator;
 
-            // Datum
-            $date = dol_print_date($line->doc_date, '%d.%m.%Y');
-            print $date.$this->separator;
+			// Datum
+			$date = dol_print_date($line->doc_date, '%d.%m.%Y');
+			print $date.$this->separator;
 
-            // Kto
-            print length_accountg($line->numero_compte).$this->separator;
-            // S/H
-            if ($line->sens == 'D')
-            {
-                print 'S'.$this->separator;
-            } else {
-                print 'H'.$this->separator;
-            }
-            //Grp
-            print self::trunc($line->code_journal, 1).$this->separator;
-            // GKto
-            if (empty($line->code_tiers))
-            {
-                if ($line->piece_num == $thisPieceNum)
-                {
-                    print length_accounta($thisPieceAccountNr).$this->separator;
-                } else {
-                    print "div".$this->separator;
-                }
-            } else {
-                print length_accounta($line->code_tiers).$this->separator;
-            }
-            //SId
-            print $this->separator;
-            //SIdx
-            print "0".$this->separator;
-            //KIdx
-            print "0".$this->separator;
-            //BTyp
-            print "0".$this->separator;
+			// Kto
+			print length_accountg($line->numero_compte).$this->separator;
+			// S/H
+			if ($line->sens == 'D')
+			{
+				print 'S'.$this->separator;
+			} else {
+				print 'H'.$this->separator;
+			}
+			//Grp
+			print self::trunc($line->code_journal, 1).$this->separator;
+			// GKto
+			if (empty($line->code_tiers))
+			{
+				if ($line->piece_num == $thisPieceNum)
+				{
+					print length_accounta($thisPieceAccountNr).$this->separator;
+				} else {
+					print "div".$this->separator;
+				}
+			} else {
+				print length_accounta($line->code_tiers).$this->separator;
+			}
+			//SId
+			print $this->separator;
+			//SIdx
+			print "0".$this->separator;
+			//KIdx
+			print "0".$this->separator;
+			//BTyp
+			print "0".$this->separator;
 
-            //MTyp 1=Fibu Einzelbuchung 2=Sammebuchung
-            if ($sammelBuchung)
-            {
-                print "2".$this->separator;
-            } else {
-                print "1".$this->separator;
-            }
-            // Code
-            print '""'.$this->separator;
-            // Netto
-            if ($line->montant >= 0)
-            {
-                print $line->montant.$this->separator;
-            } else {
-                print ($line->montant * -1).$this->separator;
-            }
-            // Steuer
-            print "0.00".$this->separator;
-            // FW-Betrag
-            print "0.00".$this->separator;
-            // Tx1
-            $line1 = self::toAnsi($line->label_compte, 29);
-            if ($line1 == "LIQ" || $line1 == "LIQ Beleg ok" || strlen($line1) <= 3)
-            {
-                $line1 = "";
-            }
-            $line2 = self::toAnsi($line->doc_ref, 29);
-            if (strlen($line1) == 0)
-            {
-                $line1 = $line2;
-                $line2 = "";
-            }
-            if (strlen($line1) > 0 && strlen($line2) > 0 && (strlen($line1) + strlen($line2)) < 27)
-            {
-                $line1 = $line1.' / '.$line2;
-                $line2 = "";
-            }
+			//MTyp 1=Fibu Einzelbuchung 2=Sammebuchung
+			if ($sammelBuchung)
+			{
+				print "2".$this->separator;
+			} else {
+				print "1".$this->separator;
+			}
+			// Code
+			print '""'.$this->separator;
+			// Netto
+			if ($line->montant >= 0)
+			{
+				print $line->montant.$this->separator;
+			} else {
+				print ($line->montant * -1).$this->separator;
+			}
+			// Steuer
+			print "0.00".$this->separator;
+			// FW-Betrag
+			print "0.00".$this->separator;
+			// Tx1
+			$line1 = self::toAnsi($line->label_compte, 29);
+			if ($line1 == "LIQ" || $line1 == "LIQ Beleg ok" || strlen($line1) <= 3)
+			{
+				$line1 = "";
+			}
+			$line2 = self::toAnsi($line->doc_ref, 29);
+			if (strlen($line1) == 0)
+			{
+				$line1 = $line2;
+				$line2 = "";
+			}
+			if (strlen($line1) > 0 && strlen($line2) > 0 && (strlen($line1) + strlen($line2)) < 27)
+			{
+				$line1 = $line1.' / '.$line2;
+				$line2 = "";
+			}
 
-            print '"'.self::toAnsi($line1).'"'.$this->separator;
-            // Tx2
-            print '"'.self::toAnsi($line2).'"'.$this->separator;
-            //PkKey
-            print "0".$this->separator;
-            //OpId
-            print $this->separator;
+			print '"'.self::toAnsi($line1).'"'.$this->separator;
+			// Tx2
+			print '"'.self::toAnsi($line2).'"'.$this->separator;
+			//PkKey
+			print "0".$this->separator;
+			//OpId
+			print $this->separator;
 
-            // Flag
-            print "0";
+			// Flag
+			print "0";
 
-            print $this->end_line;
+			print $this->end_line;
 
-            if ($line->piece_num !== $thisPieceNum)
-            {
-                $thisPieceNum = $line->piece_num;
-                $thisPieceAccountNr = $line->numero_compte;
-            }
-        }
-    }
+			if ($line->piece_num !== $thisPieceNum)
+			{
+				$thisPieceNum = $line->piece_num;
+				$thisPieceAccountNr = $line->numero_compte;
+			}
+		}
+	}
 
-    /**
-     * Export format : LD Compta version 9
-     * http://www.ldsysteme.fr/fileadmin/telechargement/np/ldcompta/Documentation/IntCptW9.pdf
-     *
-     * @param array $objectLines data
-     *
-     * @return void
-     */
+	/**
+	 * Export format : LD Compta version 9
+	 * http://www.ldsysteme.fr/fileadmin/telechargement/np/ldcompta/Documentation/IntCptW9.pdf
+	 *
+	 * @param array $objectLines data
+	 *
+	 * @return void
+	 */
 	public function exportLDCompta($objectLines)
 	{
 
@@ -1168,23 +1189,23 @@ class AccountancyExport
 				{
 					$soc = $this->db->fetch_object($resql);
 
-	                $address = array('', '', '');
-                    if (strpos($soc->address, "\n") !== false) {
-	                    $address = explode("\n", $soc->address);
-	                    if (is_array($address) && count($address) > 0) {
-	                    	foreach ($address as $key=>$data) {
-			                    $address[$key] = str_replace(array("\t", "\n", "\r"), "", $data);
-			                    $address[$key] = dol_trunc($address[$key], 40, 'right', 'UTF-8', 1);
-		                    }
-	                    }
-                    } else {
-	                    $address[0] = substr(str_replace(array("\t", "\r"), " ", $soc->address), 0, 40);
-	                    $address[1] = substr(str_replace(array("\t", "\r"), " ", $soc->address), 41, 40);
-	                    $address[2] = substr(str_replace(array("\t", "\r"), " ", $soc->address), 82, 40);
-                    }
+					$address = array('', '', '');
+					if (strpos($soc->address, "\n") !== false) {
+						$address = explode("\n", $soc->address);
+						if (is_array($address) && count($address) > 0) {
+							foreach ($address as $key=>$data) {
+								$address[$key] = str_replace(array("\t", "\n", "\r"), "", $data);
+								$address[$key] = dol_trunc($address[$key], 40, 'right', 'UTF-8', 1);
+							}
+						}
+					} else {
+						$address[0] = substr(str_replace(array("\t", "\r"), " ", $soc->address), 0, 40);
+						$address[1] = substr(str_replace(array("\t", "\r"), " ", $soc->address), 41, 40);
+						$address[2] = substr(str_replace(array("\t", "\r"), " ", $soc->address), 82, 40);
+					}
 
 					$type_enregistrement = 'C';
-                    //TYPE
+					//TYPE
 					print $type_enregistrement.$separator;
 					//NOCL
 					print $soc->code_client.$separator;
@@ -1193,15 +1214,15 @@ class AccountancyExport
 					//LIBI
 					print $separator;
 					//TITR
-                    print $separator;
+					print $separator;
 					//RSSO
 					print $soc->nom.$separator;
 					//CAD1
-                    print  $address[0].$separator;
+					print  $address[0].$separator;
 					//CAD2
-                    print  $address[1].$separator;
+					print  $address[1].$separator;
 					//CAD3
-                    print  $address[2].$separator;
+					print  $address[2].$separator;
 					//COPO
 					print  $soc->zip.$separator;
 					//BUDI
@@ -1223,7 +1244,7 @@ class AccountancyExport
 					//COMM
 					print $separator;
 					//SIRE
-                    print str_replace(" ", "", $soc->siret).$separator;
+					print str_replace(" ", "", $soc->siret).$separator;
 					//RIBP
 					print $separator;
 					//DOBQ
@@ -1468,6 +1489,136 @@ class AccountancyExport
 		}
 	}
 
+	/**
+	 * Export format : Gestimum V3
+	 *
+	 * @param array $objectLines data
+	 *
+	 * @return void
+	 */
+	public function exportGestimumV3($objectLines)
+	{
+		global $langs;
+
+		$this->separator = ',';
+
+		$invoices_infos = array();
+		$supplier_invoices_infos = array();
+		foreach ($objectLines as $line) {
+			$date = dol_print_date($line->doc_date, '%d/%m/%Y');
+
+			$invoice_ref = $line->doc_ref;
+			$company_name = "";
+
+			if (($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice') && $line->fk_doc > 0) {
+				if (($line->doc_type == 'customer_invoice' && !isset($invoices_infos[$line->fk_doc])) ||
+					($line->doc_type == 'supplier_invoice' && !isset($supplier_invoices_infos[$line->fk_doc]))) {
+					if ($line->doc_type == 'customer_invoice') {
+						// Get new customer invoice ref and company name
+						$sql = 'SELECT f.facnumber, s.nom FROM ' . MAIN_DB_PREFIX . 'facture as f';
+						$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'societe AS s ON f.fk_soc = s.rowid';
+						$sql .= ' WHERE f.rowid = ' . $line->fk_doc;
+						$resql = $this->db->query($sql);
+						if ($resql) {
+							if ($obj = $this->db->fetch_object($resql)) {
+								// Save invoice infos
+								$invoices_infos[$line->fk_doc] = array('ref' => $obj->facnumber, 'company_name' => $obj->nom);
+								$invoice_ref = $obj->facnumber;
+								$company_name = $obj->nom;
+							}
+						}
+					} else {
+						// Get new supplier invoice ref and company name
+						$sql = 'SELECT ff.ref, s.nom FROM ' . MAIN_DB_PREFIX . 'facture_fourn as ff';
+						$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'societe AS s ON ff.fk_soc = s.rowid';
+						$sql .= ' WHERE ff.rowid = ' . $line->fk_doc;
+						$resql = $this->db->query($sql);
+						if ($resql) {
+							if ($obj = $this->db->fetch_object($resql)) {
+								// Save invoice infos
+								$supplier_invoices_infos[$line->fk_doc] = array('ref' => $obj->ref, 'company_name' => $obj->nom);
+								$invoice_ref = $obj->ref;
+								$company_name = $obj->nom;
+							}
+						}
+					}
+				} elseif ($line->doc_type == 'customer_invoice') {
+					// Retrieve invoice infos
+					$invoice_ref = $invoices_infos[$line->fk_doc]['ref'];
+					$company_name = $invoices_infos[$line->fk_doc]['company_name'];
+				} else {
+					// Retrieve invoice infos
+					$invoice_ref = $supplier_invoices_infos[$line->fk_doc]['ref'];
+					$company_name = $supplier_invoices_infos[$line->fk_doc]['company_name'];
+				}
+			}
+
+			print $line->id . $this->separator;
+			print $date . $this->separator;
+			print substr($line->code_journal, 0, 4) . $this->separator;
+
+			if ((substr($line->numero_compte, 0, 3) == '411') || (substr($line->numero_compte, 0, 3) == '401')) {
+				print length_accountg($line->subledger_account) . $this->separator;
+			} else {
+				print substr(length_accountg($line->numero_compte), 0, 15) . $this->separator;
+			}
+			//Libellé Auto
+			print $this->separator;
+			//print '"'.dol_trunc(str_replace('"', '', $line->label_operation),40,'right','UTF-8',1).'"' . $this->separator;
+			//Libellé manuel
+			print dol_trunc(str_replace('"', '', $invoice_ref . (!empty($company_name) ? ' - ' : '') . $company_name), 40, 'right', 'UTF-8', 1) . $this->separator;
+			//Numéro de pièce
+			print dol_trunc(str_replace('"', '', $line->piece_num), 10, 'right', 'UTF-8', 1) . $this->separator;
+			//Devise
+			print 'EUR' . $this->separator;
+			//Montant
+			print price2num(abs($line->montant)) . $this->separator;
+			//Sens
+			print $line->sens . $this->separator;
+			//Code lettrage
+			print $this->separator;
+			//Date Echéance
+			print $date;
+			print $this->end_line;
+		}
+	}
+
+	/**
+	 * Export format : Gestimum V5
+	 *
+	 * @param array $objectLines data
+	 *
+	 * @return void
+	 */
+	public function exportGestimumV5($objectLines)
+	{
+
+		$this->separator = ',';
+
+		foreach ($objectLines as $line) {
+			$date = dol_print_date($line->doc_date, '%d%m%Y');
+
+			print $line->id . $this->separator;
+			print $date . $this->separator;
+			print substr($line->code_journal, 0, 4) . $this->separator;
+			if ((substr($line->numero_compte, 0, 3) == '411') || (substr($line->numero_compte, 0, 3) == '401'))  {
+				print length_accountg($line->subledger_account) . $this->separator;
+			} else {
+				print substr(length_accountg($line->numero_compte), 0, 15) . $this->separator;
+			}
+			print $this->separator;
+			//print '"'.dol_trunc(str_replace('"', '', $line->label_operation),40,'right','UTF-8',1).'"' . $this->separator;
+			print '"'.dol_trunc(str_replace('"', '', $line->doc_ref), 40, 'right', 'UTF-8', 1).'"' . $this->separator;
+			print '"'.dol_trunc(str_replace('"', '', $line->piece_num), 10, 'right', 'UTF-8', 1).'"'.$this->separator;
+			print price2num($line->montant).$this->separator;
+			print $line->sens.$this->separator;
+			print $date . $this->separator;
+			print $this->separator;
+			print $this->separator;
+			print 'EUR';
+			print $this->end_line;
+		}
+	}
 
 	/**
 	 * trunc
@@ -1486,15 +1637,15 @@ class AccountancyExport
 	 *
 	 * @param string	$str 		Original string to encode and optionaly truncate
 	 * @param integer 	$size 		Truncate string after $size characters
-     * @return string 				String encoded in Windows-1251 charset
+	 * @return string 				String encoded in Windows-1251 charset
 	 */
 	public static function toAnsi($str, $size = -1)
-    {
+	{
 		$retVal = dol_string_nohtmltag($str, 1, 'Windows-1251');
-        if ($retVal >= 0 && $size >= 0)
-        {
-            $retVal = mb_substr($retVal, 0, $size, 'Windows-1251');
-        }
-        return $retVal;
+		if ($retVal >= 0 && $size >= 0)
+		{
+			$retVal = mb_substr($retVal, 0, $size, 'Windows-1251');
+		}
+		return $retVal;
 	}
 }
diff --git a/htdocs/accountancy/class/accountancysystem.class.php b/htdocs/accountancy/class/accountancysystem.class.php
index c2f3468016c..193a03f1726 100644
--- a/htdocs/accountancy/class/accountancysystem.class.php
+++ b/htdocs/accountancy/class/accountancysystem.class.php
@@ -28,10 +28,10 @@
  */
 class AccountancySystem
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -44,13 +44,13 @@ class AccountancySystem
 	public $rowid;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_pcg_version;
 
-    /**
-     * @var string pcg type
-     */
+	/**
+	 * @var string pcg type
+	 */
 	public $pcg_type;
 
 	/**
@@ -59,18 +59,18 @@ class AccountancySystem
 	public $numero;
 
 	/**
-     * @var string Accountancy System label
-     */
-    public $label;
+	 * @var string Accountancy System label
+	 */
+	public $label;
 
-    /**
-     * @var string account number
-     */
+	/**
+	 * @var string account number
+	 */
 	public $account_number;
 
-    /**
-     * @var string account parent
-     */
+	/**
+	 * @var string account parent
+	 */
 	public $account_parent;
 
 	/**
@@ -78,10 +78,10 @@ class AccountancySystem
 	 *
 	 * @param DoliDB $db handler
 	 */
-    public function __construct($db)
-    {
+	public function __construct($db)
+	{
 		$this->db = $db;
-    }
+	}
 
 
 	/**
@@ -93,42 +93,42 @@ class AccountancySystem
 	 */
 	public function fetch($rowid = 0, $ref = '')
 	{
-	    global $conf;
+		global $conf;
 
-	    if ($rowid > 0 || $ref)
-	    {
-	        $sql  = "SELECT a.rowid, a.pcg_version, a.label, a.active";
-	        $sql .= " FROM ".MAIN_DB_PREFIX."accounting_system as a";
-	        $sql .= " WHERE";
-	        if ($rowid) {
-	            $sql .= " a.rowid = ".((int) $rowid);
-	        } elseif ($ref) {
-	            $sql .= " a.pcg_version = '".$this->db->escape($ref)."'";
-	        }
+		if ($rowid > 0 || $ref)
+		{
+			$sql  = "SELECT a.rowid, a.pcg_version, a.label, a.active";
+			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_system as a";
+			$sql .= " WHERE";
+			if ($rowid) {
+				$sql .= " a.rowid = ".((int) $rowid);
+			} elseif ($ref) {
+				$sql .= " a.pcg_version = '".$this->db->escape($ref)."'";
+			}
 
-	        dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
-	        $result = $this->db->query($sql);
-	        if ($result) {
-	            $obj = $this->db->fetch_object($result);
+			dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+			$result = $this->db->query($sql);
+			if ($result) {
+				$obj = $this->db->fetch_object($result);
 
-	            if ($obj) {
-	                $this->id = $obj->rowid;
-	                $this->rowid = $obj->rowid;
-	                $this->pcg_version = $obj->pcg_version;
-	                $this->ref = $obj->pcg_version;
-	                $this->label = $obj->label;
-	                $this->active = $obj->active;
+				if ($obj) {
+					$this->id = $obj->rowid;
+					$this->rowid = $obj->rowid;
+					$this->pcg_version = $obj->pcg_version;
+					$this->ref = $obj->pcg_version;
+					$this->label = $obj->label;
+					$this->active = $obj->active;
 
-	                return $this->id;
-	            } else {
-	                return 0;
-	            }
-	        } else {
-	            $this->error = "Error ".$this->db->lasterror();
-	            $this->errors[] = "Error ".$this->db->lasterror();
-	        }
-	    }
-	    return -1;
+					return $this->id;
+				} else {
+					return 0;
+				}
+			} else {
+				$this->error = "Error ".$this->db->lasterror();
+				$this->errors[] = "Error ".$this->db->lasterror();
+			}
+		}
+		return -1;
 	}
 
 
@@ -138,8 +138,8 @@ class AccountancySystem
 	 * @param User $user making insert
 	 * @return int if KO, Id of line if OK
 	 */
-    public function create($user)
-    {
+	public function create($user)
+	{
 		$now = dol_now();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."accounting_system";
@@ -165,6 +165,6 @@ class AccountancySystem
 			dol_syslog($this->error, LOG_ERR);
 		}
 
-        return $result;
-    }
+		return $result;
+	}
 }
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 24f14d2ebd2..af8d26bb374 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -74,35 +74,35 @@ class AccountingAccount extends CommonObject
 	public $rowid;
 
 	/**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
 	/**
-     * @var string pcg version
-     */
+	 * @var string pcg version
+	 */
 	public $fk_pcg_version;
 
-    /**
-     * @var string pcg type
-     */
+	/**
+	 * @var string pcg type
+	 */
 	public $pcg_type;
 
-    /**
-     * @var string account number
-     */
+	/**
+	 * @var string account number
+	 */
 	public $account_number;
 
-    /**
-     * @var int ID parent account
-     */
+	/**
+	 * @var int ID parent account
+	 */
 	public $account_parent;
 
-    /**
-     * @var int ID category account
-     */
+	/**
+	 * @var int ID category account
+	 */
 	public $account_category;
 
 	/**
@@ -110,10 +110,10 @@ class AccountingAccount extends CommonObject
 	 */
 	public $status;
 
-    /**
-     * @var string Label of account
-     */
-    public $label;
+	/**
+	 * @var string Label of account
+	 */
+	public $label;
 
 	/**
 	 * @var string Label short of account
@@ -121,19 +121,19 @@ class AccountingAccount extends CommonObject
 	public $labelshort;
 
 	/**
-     * @var int ID
-     */
-    public $fk_user_author;
+	 * @var int ID
+	 */
+	public $fk_user_author;
 
-    /**
-     * @var int ID
-     */
-    public $fk_user_modif;
+	/**
+	 * @var int ID
+	 */
+	public $fk_user_modif;
 
 	/**
 	 * @var int active (duplicate with status)
 	 */
-    public $active;
+	public $active;
 
 	/**
 	 * @var int reconcilable
@@ -145,13 +145,13 @@ class AccountingAccount extends CommonObject
 	 *
 	 * @param DoliDB $db Database handle
 	 */
-    public function __construct($db)
-    {
+	public function __construct($db)
+	{
 		global $conf;
 
 		$this->db = $db;
 		$this->next_prev_filter = 'fk_pcg_version IN (SELECT pcg_version FROM '.MAIN_DB_PREFIX.'accounting_system WHERE rowid='.$conf->global->CHARTOFACCOUNTS.')'; // Used to add a filter in Form::showrefnav method
-    }
+	}
 
 	/**
 	 * Load record in memory
@@ -162,7 +162,7 @@ class AccountingAccount extends CommonObject
 	 * @param   string         $limittoachartaccount    'ABC'=Load record only if it is into chart account with code 'ABC' (better and faster than previous parameter if you have chart of account code).
 	 * @return 	int                                     <0 if KO, 0 if not found, Id of record if OK and found
 	 */
-    public function fetch($rowid = null, $account_number = null, $limittocurrentchart = 0, $limittoachartaccount = '')
+	public function fetch($rowid = null, $account_number = null, $limittocurrentchart = 0, $limittoachartaccount = '')
 	{
 		global $conf;
 
@@ -182,7 +182,7 @@ class AccountingAccount extends CommonObject
 				$sql .= ' AND a.fk_pcg_version IN (SELECT pcg_version FROM '.MAIN_DB_PREFIX.'accounting_system WHERE rowid='.$this->db->escape($conf->global->CHARTOFACCOUNTS).')';
 			}
 			if (!empty($limittoachartaccount)) {
-			    $sql .= " AND a.fk_pcg_version = '".$this->db->escape($limittoachartaccount)."'";
+				$sql .= " AND a.fk_pcg_version = '".$this->db->escape($limittoachartaccount)."'";
 			}
 
 			dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
@@ -229,8 +229,8 @@ class AccountingAccount extends CommonObject
 	 * @param  int     $notrigger  Disable triggers
 	 * @return int                 <0 if KO, >0 if OK
 	 */
-    public function create($user, $notrigger = 0)
-    {
+	public function create($user, $notrigger = 0)
+	{
 		global $conf;
 		$error = 0;
 		$now = dol_now();
@@ -318,7 +318,7 @@ class AccountingAccount extends CommonObject
 			$this->db->commit();
 			return $this->id;
 		}
-    }
+	}
 
 	/**
 	 * Update record
@@ -366,8 +366,8 @@ class AccountingAccount extends CommonObject
 	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
-    public function checkUsage()
-    {
+	public function checkUsage()
+	{
 		global $langs;
 
 		$sql = "(SELECT fk_code_ventilation FROM ".MAIN_DB_PREFIX."facturedet";
@@ -400,8 +400,8 @@ class AccountingAccount extends CommonObject
 	 * @param int $notrigger 0=triggers after, 1=disable triggers
 	 * @return int <0 if KO, >0 if OK
 	 */
-    public function delete($user, $notrigger = 0)
-    {
+	public function delete($user, $notrigger = 0)
+	{
 		$error = 0;
 
 		$result = $this->checkUsage();
@@ -436,9 +436,9 @@ class AccountingAccount extends CommonObject
 		} else {
 			return -1;
 		}
-    }
+	}
 
-    /**
+	/**
 	 * Return clicable name (with picto eventually)
 	 *
 	 * @param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
@@ -446,28 +446,29 @@ class AccountingAccount extends CommonObject
 	 * @param	int  	$nourl						1=Disable url
 	 * @param	string  $moretitle					Add more text to title tooltip
 	 * @param	int  	$notooltip					1=Disable tooltip
-     * @param	int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 * @param	int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 * @param	int     $withcompletelabel		    0=Short label (field short label), 1=Complete label (field label)
-	 * @param	string	$option						'bookkeeping', 'bookkeepinglistbyaccount', 'accountcard'
+	 * @param	string	$option						'ledger', 'journals', 'accountcard'
 	 * @return  string	String with URL
 	 */
-    public function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle = '', $notooltip = 0, $save_lastsearch_value = -1, $withcompletelabel = 0, $option = '')
+	public function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle = '', $notooltip = 0, $save_lastsearch_value = -1, $withcompletelabel = 0, $option = '')
 	{
-		global $langs, $conf, $user;
+		global $langs, $conf;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 
 		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
 		$result = '';
 
-		if (empty($option) || $option == 'bookkeeping') {
-			$url = DOL_URL_ROOT . '/accountancy/bookkeeping/list.php?search_accountancy_code_start=' . $this->account_number . '&search_accountancy_code_end=' . $this->account_number;
-			$labelurl = $langs->trans("ShowAccountingAccountInBookKeeping");
-		} elseif ($option == 'bookkeepinglistbyaccount') {
-			$url = DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?search_accountancy_code_start=' . $this->account_number . '&search_accountancy_code_end=' . $this->account_number;
-			$labelurl = $langs->trans("ShowAccountingAccountInBookKeepingByAccount");
+		$url = ''; $labelurl = '';
+		if (empty($option) || $option == 'ledger') {
+			$url = DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?search_accountancy_code_start='.urlencode($this->account_number).'&search_accountancy_code_end='.urlencode($this->account_number);
+			$labelurl = $langs->trans("ShowAccountingAccountInLedger");
+		} elseif ($option == 'journals') {
+			$url = DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?search_accountancy_code_start='.urlencode($this->account_number).'&search_accountancy_code_end='.urlencode($this->account_number);
+			$labelurl = $langs->trans("ShowAccountingAccountInJournals");
 		} elseif ($option == 'accountcard') {
-			$url = DOL_URL_ROOT . '/accountancy/admin/card.php?id=' . $this->id;
+			$url = DOL_URL_ROOT.'/accountancy/admin/card.php?id='.urlencode($this->id);
 			$labelurl = $langs->trans("ShowAccountingAccount");
 		}
 
@@ -523,7 +524,7 @@ class AccountingAccount extends CommonObject
 		if ($withpicto && $withpicto != 2) $result .= ' ';
 		if ($withpicto != 2) $result .= $linkstart.$label_link.$linkend;
 		return $result;
-    }
+	}
 
 	/**
 	 * Information on record
@@ -531,8 +532,8 @@ class AccountingAccount extends CommonObject
 	 * @param int $id of record
 	 * @return void
 	 */
-    public function info($id)
-    {
+	public function info($id)
+	{
 		$sql = 'SELECT a.rowid, a.datec, a.fk_user_author, a.fk_user_modif, a.tms';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'accounting_account as a';
 		$sql .= ' WHERE a.rowid = '.$id;
@@ -567,18 +568,18 @@ class AccountingAccount extends CommonObject
 	 * Deactivate an account (for status active or status reconcilable)
 	 *
 	 * @param  int  $id         Id
-     * @param  int  $mode       0=field active, 1=field reconcilable
+	 * @param  int  $mode       0=field active, 1=field reconcilable
 	 * @return int              <0 if KO, >0 if OK
 	 */
-    public function accountDeactivate($id, $mode = 0)
-    {
+	public function accountDeactivate($id, $mode = 0)
+	{
 		$result = $this->checkUsage();
 
 		$fieldtouse = 'active';
-        if ($mode == 1)
-        {
+		if ($mode == 1)
+		{
 			$fieldtouse = 'reconcilable';
-        }
+		}
 
 		if ($result > 0) {
 			$this->db->begin();
@@ -603,42 +604,39 @@ class AccountingAccount extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Account activated
 	 *
 	 * @param  int  $id         Id
-     * @param  int  $mode       0=field active, 1=field reconcilable
+	 * @param  int  $mode       0=field active, 1=field reconcilable
 	 * @return int              <0 if KO, >0 if OK
 	 */
-    public function account_activate($id, $mode = 0)
-    {
-        // phpcs:enable
+	public function account_activate($id, $mode = 0)
+	{
+		// phpcs:enable
 		$this->db->begin();
 
-        if ($mode == 0)
-        {
-            $fieldtouse = 'active';
-        } elseif ($mode == 1)
-        {
-            $fieldtouse = 'reconcilable';
-        }
+		$fieldtouse = 'active';
+		if ($mode == 1) {
+			$fieldtouse = 'reconcilable';
+		}
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_account ";
-		$sql .= "SET ".$fieldtouse." = '1'";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_account";
+		$sql .= " SET ".$fieldtouse." = '1'";
 		$sql .= " WHERE rowid = ".$this->db->escape($id);
 
 		dol_syslog(get_class($this)."::account_activate ".$fieldtouse." sql=".$sql, LOG_DEBUG);
 		$result = $this->db->query($sql);
-        if ($result) {
+		if ($result) {
 			$this->db->commit();
 			return 1;
-        } else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
-        }
-    }
+		}
+	}
 
 
 	/**
@@ -652,7 +650,7 @@ class AccountingAccount extends CommonObject
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un statut donne
 	 *
@@ -662,7 +660,7 @@ class AccountingAccount extends CommonObject
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$langs->loadLangs(array("users"));
 
diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 882eee71769..a76be081471 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -37,7 +37,7 @@ class AccountingJournal extends CommonObject
 	public $table_element = 'accounting_journal';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Fieldname with ID of parent key if this field has a parent
 	 */
 	public $fk_element = '';
 
@@ -56,29 +56,29 @@ class AccountingJournal extends CommonObject
 	 */
 	public $rowid;
 
-    /**
-     * @var string Accounting journal code
-     */
+	/**
+	 * @var string Accounting journal code
+	 */
 	public $code;
 
 	/**
-     * @var string Accounting Journal label
-     */
-    public $label;
+	 * @var string Accounting Journal label
+	 */
+	public $label;
 
-    /**
-     * @var int 1:various operations, 2:sale, 3:purchase, 4:bank, 5:expense-report, 8:inventory, 9: has-new
-     */
-    public $nature;
+	/**
+	 * @var int 1:various operations, 2:sale, 3:purchase, 4:bank, 5:expense-report, 8:inventory, 9: has-new
+	 */
+	public $nature;
 
-    /**
-     * @var int is active or not
-     */
+	/**
+	 * @var int is active or not
+	 */
 	public $active;
 
-    /**
-     * @var array array of lines
-     */
+	/**
+	 * @var array array of lines
+	 */
 	public $lines;
 
 	/**
@@ -86,10 +86,10 @@ class AccountingJournal extends CommonObject
 	 *
 	 * @param DoliDB $db Database handle
 	 */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 	/**
 	 * Load an object from database
@@ -155,8 +155,8 @@ class AccountingJournal extends CommonObject
 	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
-    public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
-    {
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	{
 		$sql = "SELECT rowid, code, label, nature, active";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		// Manage filter
@@ -284,7 +284,7 @@ class AccountingJournal extends CommonObject
 		return $this->LibType($this->nature, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return type of an accounting journal
 	 *
@@ -294,7 +294,7 @@ class AccountingJournal extends CommonObject
 	 */
 	public function LibType($nature, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$langs->loadLangs(array("accountancy"));
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 1e1e42a6047..8312b155b8b 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2014-2017  Olivier Geffroy     <jeff@jeffinfo.com>
  * Copyright (C) 2015-2017  Alexandre Spangaro  <aspangaro@open-dsi.fr>
  * Copyright (C) 2015-2017  Florian Henry       <florian.henry@open-concept.pro>
- * Copyright (C) 2018-2019  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric 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
@@ -57,80 +57,80 @@ class BookKeeping extends CommonObject
 	 */
 	public $id;
 
-    /**
-     * @var string Date of source document, in db date NOT NULL
-     */
+	/**
+	 * @var string Date of source document, in db date NOT NULL
+	 */
 	public $doc_date;
 
-    /**
-     * @var int Deadline for payment
-     */
+	/**
+	 * @var int Deadline for payment
+	 */
 	public $date_lim_reglement;
 
-    /**
-     * @var string doc_type
-     */
-    public $doc_type;
+	/**
+	 * @var string doc_type
+	 */
+	public $doc_type;
 
-    /**
-     * @var string doc_ref
-     */
+	/**
+	 * @var string doc_ref
+	 */
 	public $doc_ref;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_doc;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_docdet;
 
-    /**
-     * @var string thirdparty code
-     */
-    public $thirdparty_code;
+	/**
+	 * @var string thirdparty code
+	 */
+	public $thirdparty_code;
 
-    /**
-     * @var string subledger account
-     */
+	/**
+	 * @var string subledger account
+	 */
 	public $subledger_account;
 
-    /**
-     * @var string subledger label
-     */
+	/**
+	 * @var string subledger label
+	 */
 	public $subledger_label;
 
-    /**
-     * @var string  doc_type
-     */
+	/**
+	 * @var string  doc_type
+	 */
 	public $numero_compte;
 
-    /**
-     * @var string label compte
-     */
-    public $label_compte;
+	/**
+	 * @var string label compte
+	 */
+	public $label_compte;
 
-    /**
-     * @var string label operation
-     */
-    public $label_operation;
+	/**
+	 * @var string label operation
+	 */
+	public $label_operation;
 
-    /**
-     * @var float FEC:Debit
-     */
+	/**
+	 * @var float FEC:Debit
+	 */
 	public $debit;
 
-    /**
-     * @var float FEC:Credit
-     */
+	/**
+	 * @var float FEC:Credit
+	 */
 	public $credit;
 
-    /**
-     * @var float FEC:Amount (Not necessary)
-     * @deprecated Use $amount
-     */
+	/**
+	 * @var float FEC:Amount (Not necessary)
+	 * @deprecated Use $amount
+	 */
 	public $montant;
 
 	/**
@@ -138,34 +138,34 @@ class BookKeeping extends CommonObject
 	 */
 	public $amount;
 
-    /**
-     * @var string FEC:Sens (Not necessary)
-     */
+	/**
+	 * @var string FEC:Sens (Not necessary)
+	 */
 	public $sens;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_author;
 
-    /**
-     * @var string key for import
-     */
+	/**
+	 * @var string key for import
+	 */
 	public $import_key;
 
-    /**
-     * @var string code journal
-     */
+	/**
+	 * @var string code journal
+	 */
 	public $code_journal;
 
-    /**
-     * @var string label journal
-     */
+	/**
+	 * @var string label journal
+	 */
 	public $journal_label;
 
-    /**
-     * @var int accounting transaction id
-     */
+	/**
+	 * @var int accounting transaction id
+	 */
 	public $piece_num;
 
 	/**
@@ -179,8 +179,8 @@ class BookKeeping extends CommonObject
 	 *
 	 * @param DoliDb $db Database handler
 	 */
-    public function __construct(DoliDB $db)
-    {
+	public function __construct(DoliDB $db)
+	{
 		$this->db = $db;
 	}
 
@@ -191,8 +191,8 @@ class BookKeeping extends CommonObject
 	 * @param  bool	$notrigger	false=launch triggers after, true=disable triggers
 	 * @return int				<0 if KO, Id of created object if OK
 	 */
-    public function create(User $user, $notrigger = false)
-    {
+	public function create(User $user, $notrigger = false)
+	{
 		global $conf, $langs;
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -504,11 +504,11 @@ class BookKeeping extends CommonObject
 	 * @param  string  $mode 	   Mode
 	 * @return int				 <0 if KO, Id of created object if OK
 	 */
-    public function createStd(User $user, $notrigger = false, $mode = '')
-    {
+	public function createStd(User $user, $notrigger = false, $mode = '')
+	{
 		global $conf, $langs;
 
-        $langs->loadLangs(array("accountancy", "bills", "compta"));
+		$langs->loadLangs(array("accountancy", "bills", "compta"));
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -578,7 +578,7 @@ class BookKeeping extends CommonObject
 		$now = dol_now();
 
 		// Check parameters
-        $this->journal_label = $langs->trans($this->journal_label);
+		$this->journal_label = $langs->trans($this->journal_label);
 
 		// Insert request
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.$mode.' (';
@@ -673,8 +673,8 @@ class BookKeeping extends CommonObject
 	 *
 	 * @return int <0 if KO, 0 if not found, >0 if OK
 	 */
-    public function fetch($id, $ref = null, $mode = '')
-    {
+	public function fetch($id, $ref = null, $mode = '')
+	{
 		global $conf;
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -768,11 +768,12 @@ class BookKeeping extends CommonObject
 	 * @param int $offset offset limit
 	 * @param array $filter filter array
 	 * @param string $filtermode filter mode (AND or OR)
+	 * @param int $option option (0: general account or 1: subaccount)
 	 *
 	 * @return int <0 if KO, >=0 if OK
 	 */
-    public function fetchAllByAccount($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
-    {
+	public function fetchAllByAccount($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND', $option = 0)
+	{
 		global $conf;
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -836,7 +837,13 @@ class BookKeeping extends CommonObject
 			$sql .= ' AND '.implode(' '.$filtermode.' ', $sqlwhere);
 		}
 		// Affichage par compte comptable
-		$sql .= ' ORDER BY t.numero_compte ASC';
+		if (!empty($option)) {
+			$sql .= ' AND t.subledger_account IS NOT NULL';
+			$sql .= ' ORDER BY t.subledger_account ASC';
+		} else {
+			$sql .= ' ORDER BY t.numero_compte ASC';
+		}
+
 		if (!empty($sortfield)) {
 			$sql .= ', '.$sortfield.' '.$sortorder;
 		}
@@ -904,11 +911,11 @@ class BookKeeping extends CommonObject
 	 * @param int 			$offset                         Offset limit
 	 * @param array 		$filter                         Filter array
 	 * @param string 		$filtermode                     Filter mode (AND or OR)
-     * @param int           $showAlreadyExportMovements     Show movements when field 'date_export' is not empty (0:No / 1:Yes (Default))
+	 * @param int           $showAlreadyExportMovements     Show movements when field 'date_export' is not empty (0:No / 1:Yes (Default))
 	 * @return int                                          <0 if KO, >0 if OK
 	 */
-    public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND', $showAlreadyExportMovements = 1)
-    {
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND', $showAlreadyExportMovements = 1)
+	{
 		global $conf;
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -940,7 +947,7 @@ class BookKeeping extends CommonObject
 		$sql .= " t.date_creation,";
 		$sql .= " t.date_lim_reglement,";
 		$sql .= " t.tms as date_modification,";
-        $sql .= " t.date_export";
+		$sql .= " t.date_export";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		// Manage filter
 		$sqlwhere = array();
@@ -960,8 +967,8 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.tms>=' || $key == 't.tms<=') {
 					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
-                } elseif ($key == 't.date_export>=' || $key == 't.date_export<=') {
-                    $sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
+				} elseif ($key == 't.date_export>=' || $key == 't.date_export<=') {
+					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.credit' || $key == 't.debit') {
 					$sqlwhere[] = natural_search($key, $value, 1, 1);
 				} else {
@@ -970,9 +977,9 @@ class BookKeeping extends CommonObject
 			}
 		}
 		$sql .= ' WHERE t.entity IN ('.getEntity('accountancy').')';
-        if ($showAlreadyExportMovements == 0) {
-            $sql .= " AND t.date_export IS NULL";
-        }
+		if ($showAlreadyExportMovements == 0) {
+			$sql .= " AND t.date_export IS NULL";
+		}
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND '.implode(' '.$filtermode.' ', $sqlwhere);
 		}
@@ -1020,7 +1027,7 @@ class BookKeeping extends CommonObject
 				$line->date_creation = $this->db->jdate($obj->date_creation);
 				$line->date_lim_reglement = $this->db->jdate($obj->date_lim_reglement);
 				$line->date_modification = $this->db->jdate($obj->date_modification);
-                $line->date_export = $this->db->jdate($obj->date_export);
+				$line->date_export = $this->db->jdate($obj->date_export);
 
 				$this->lines[] = $line;
 
@@ -1133,8 +1140,8 @@ class BookKeeping extends CommonObject
 	 * @param  string  $mode       Mode ('' or _tmp')
 	 * @return int                 <0 if KO, >0 if OK
 	 */
-    public function update(User $user, $notrigger = false, $mode = '')
-    {
+	public function update(User $user, $notrigger = false, $mode = '')
+	{
 		$error = 0;
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -1300,8 +1307,8 @@ class BookKeeping extends CommonObject
 	 * @param string $mode Mode
 	 * @return int <0 if KO, >0 if OK
 	 */
-    public function delete(User $user, $notrigger = false, $mode = '')
-    {
+	public function delete(User $user, $notrigger = false, $mode = '')
+	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$error = 0;
@@ -1348,8 +1355,8 @@ class BookKeeping extends CommonObject
 	 * @param  string		$importkey		Import key
 	 * @return int Result
 	 */
-    public function deleteByImportkey($importkey)
-    {
+	public function deleteByImportkey($importkey)
+	{
 		$this->db->begin();
 
 		// first check if line not yet in bookkeeping
@@ -1379,11 +1386,11 @@ class BookKeeping extends CommonObject
 	 * @param  int	  $delmonth     Month
 	 * @return int					<0 if KO, >0 if OK
 	 */
-    public function deleteByYearAndJournal($delyear = 0, $journal = '', $mode = '', $delmonth = 0)
-    {
-    	global $langs;
+	public function deleteByYearAndJournal($delyear = 0, $journal = '', $mode = '', $delmonth = 0)
+	{
+		global $langs;
 
-    	if (empty($delyear) && empty($journal))
+		if (empty($delyear) && empty($journal))
 		{
 			$this->error = 'ErrorOneFieldRequired';
 			return -1;
@@ -1428,8 +1435,8 @@ class BookKeeping extends CommonObject
 	 * @param 	int 	$piecenum 	Piecenum to delete
 	 * @return 	int 				Result
 	 */
-    public function deleteMvtNum($piecenum)
-    {
+	public function deleteMvtNum($piecenum)
+	{
 		global $conf;
 
 		$this->db->begin();
@@ -1463,8 +1470,8 @@ class BookKeeping extends CommonObject
 	 * @param   int     $fromid     Id of object to clone
 	 * @return  int                 New id of clone
 	 */
-    public function createFromClone(User $user, $fromid)
-    {
+	public function createFromClone(User $user, $fromid)
+	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$error = 0;
@@ -1511,8 +1518,8 @@ class BookKeeping extends CommonObject
 	 *
 	 * @return void
 	 */
-    public function initAsSpecimen()
-    {
+	public function initAsSpecimen()
+	{
 		global $user;
 
 		$now = dol_now();
@@ -1530,14 +1537,14 @@ class BookKeeping extends CommonObject
 		$this->label_compte = 'Customer';
 		$this->label_operation = 'Sales of pea';
 		$this->debit = 99.9;
-		$this->credit = '';
-		$this->montant = '';
+		$this->credit = 0.0;
+		$this->amount = 0.0;
 		$this->sens = 'D';
 		$this->fk_user_author = $user->id;
-		$this->import_key = '';
+		$this->import_key = '20201027';
 		$this->code_journal = 'VT';
 		$this->journal_label = 'Journal de vente';
-		$this->piece_num = '';
+		$this->piece_num = 1234;
 		$this->date_creation = $now;
 	}
 
@@ -1548,8 +1555,8 @@ class BookKeeping extends CommonObject
 	 * @param string $mode Mode
 	 * @return int <0 if KO, >0 if OK
 	 */
-    public function fetchPerMvt($piecenum, $mode = '')
-    {
+	public function fetchPerMvt($piecenum, $mode = '')
+	{
 		global $conf;
 
 		$sql = "SELECT piece_num,doc_date,code_journal,journal_label,doc_ref,doc_type,date_creation";
@@ -1613,8 +1620,8 @@ class BookKeeping extends CommonObject
 	 * @param  string  $mode       Mode
 	 * @return int                 <0 if KO, >0 if OK
 	 */
-    public function fetchAllPerMvt($piecenum, $mode = '')
-    {
+	public function fetchAllPerMvt($piecenum, $mode = '')
+	{
 		global $conf;
 
 		$sql = "SELECT rowid, doc_date, doc_type,";
@@ -1664,16 +1671,16 @@ class BookKeeping extends CommonObject
 		return 1;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Export bookkeeping
 	 *
 	 * @param	string	$model	Model
 	 * @return	int				Result
 	 */
-    public function export_bookkeeping($model = 'ebp')
-    {
-        // phpcs:enable
+	public function export_bookkeeping($model = 'ebp')
+	{
+		// phpcs:enable
 		global $conf;
 
 		$sql = "SELECT rowid, doc_date, doc_type,";
@@ -1739,10 +1746,10 @@ class BookKeeping extends CommonObject
 
 		$this->db->begin();
 
-        if ($direction == 0)
+		if ($direction == 0)
 		{
 			$next_piecenum = $this->getNextNumMvt();
-            $now = dol_now();
+			$now = dol_now();
 
 			if ($next_piecenum < 0) {
 				$error++;
@@ -1819,22 +1826,22 @@ class BookKeeping extends CommonObject
 		*/
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	* Return list of accounts with label by chart of accounts
-	*
-	* @param string     $selectid   Preselected chart of accounts
-	* @param string     $htmlname	Name of field in html form
-	* @param int		$showempty	Add an empty field
-	* @param array		$event		Event options
-	* @param int		$select_in	Value is a aa.rowid (0 default) or aa.account_number (1)
-	* @param int		$select_out	Set value returned by select 0=rowid (default), 1=account_number
-	* @param int		$aabase		Set accounting_account base class to display empty=all or from 1 to 8 will display only account beginning by this number
-	* @return string	String with HTML select
-    */
-    public function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $aabase = '')
-    {
-        // phpcs:enable
+	 * Return list of accounts with label by chart of accounts
+	 *
+	 * @param string     $selectid   Preselected chart of accounts
+	 * @param string     $htmlname	Name of field in html form
+	 * @param int		$showempty	Add an empty field
+	 * @param array		$event		Event options
+	 * @param int		$select_in	Value is a aa.rowid (0 default) or aa.account_number (1)
+	 * @param int		$select_out	Set value returned by select 0=rowid (default), 1=account_number
+	 * @param int		$aabase		Set accounting_account base class to display empty=all or from 1 to 8 will display only account beginning by this number
+	 * @return string	String with HTML select
+	 */
+	public function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $aabase = '')
+	{
+		// phpcs:enable
 		global $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
@@ -1891,23 +1898,22 @@ class BookKeeping extends CommonObject
 		return $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * Description of a root accounting account
+	 * Return id and description of a root accounting account.
+	 * This function takes the parent of parent to get the root account !
 	 *
 	 * @param 	string 	$account	Accounting account
 	 * @return 	string 				Root account
 	 */
-	public function get_compte_racine($account = null)
+	public function getRootAccount($account = null)
 	{
-        // phpcs:enable
 		global $conf;
 		$pcgver = $conf->global->CHARTOFACCOUNTS;
 
-		$sql  = "SELECT root.account_number, root.label as label";
+		$sql  = "SELECT root.rowid, root.account_number, root.label as label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as aa";
 		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
-		$sql .= " AND asy.rowid = ".$pcgver;
+		$sql .= " AND asy.rowid = ".((int) $pcgver);
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as parent ON aa.account_parent = parent.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as root ON parent.account_parent = root.rowid";
 		$sql .= " WHERE aa.account_number = '".$this->db->escape($account)."'";
@@ -1923,7 +1929,7 @@ class BookKeeping extends CommonObject
 				$obj = $this->db->fetch_object($resql);
 			}
 
-			return $obj->label;
+			return array('id'=>$obj->rowid, 'account_number'=>$obj->account_number, 'label'=>$obj->label);
 		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			dol_syslog(__METHOD__." ".$this->error, LOG_ERR);
@@ -1932,16 +1938,16 @@ class BookKeeping extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Description of accounting account
 	 *
 	 * @param	string	$account	Accounting account
 	 * @return	string				Account desc
 	 */
-    public function get_compte_desc($account = null)
-    {
-        // phpcs:enable
+	public function get_compte_desc($account = null)
+	{
+		// phpcs:enable
 		global $conf;
 
 		$pcgver = $conf->global->CHARTOFACCOUNTS;
@@ -1989,13 +1995,13 @@ class BookKeepingLine
 	public $doc_ref;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_doc;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_docdet;
 
 	public $thirdparty_code;
@@ -2006,13 +2012,27 @@ class BookKeepingLine
 	public $label_operation;
 	public $debit;
 	public $credit;
-	public $montant;
-	public $sens;
-    public $lettering_code;
 
 	/**
-     * @var int ID
-     */
+	 * @var float Amount
+	 * @deprecated see $amount
+	 */
+	public $montant;
+
+	/**
+	 * @var float Amount
+	 */
+	public $amount;
+
+	/**
+	 * @var string Sens
+	 */
+	public $sens;
+	public $lettering_code;
+
+	/**
+	 * @var int ID
+	 */
 	public $fk_user_author;
 
 	public $import_key;
@@ -2021,17 +2041,17 @@ class BookKeepingLine
 	public $piece_num;
 
 	/**
-     * @var integer|string date_creation
-     */
+	 * @var integer|string date_creation
+	 */
 	public $date_creation;
 
 	/**
 	 * @var integer|string $date_modification;
 	 */
-    public $date_modification;
+	public $date_modification;
 
-    /**
-     * @var integer|string $date_export;
-     */
-    public $date_export;
+	/**
+	 * @var integer|string $date_export;
+	 */
+	public $date_export;
 }
diff --git a/htdocs/accountancy/closure/validate.php b/htdocs/accountancy/closure/validate.php
index 808ccfba0ef..1013ad1b6ce 100644
--- a/htdocs/accountancy/closure/validate.php
+++ b/htdocs/accountancy/closure/validate.php
@@ -63,24 +63,24 @@ $year_current = $year_start;
 
 if ($action == 'validate')
 {
-    $now = dol_now();
+	$now = dol_now();
 
-    // Update database
-    $db->begin();
-    $sql = "UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping as b";
-    $sql .= " SET b.date_validated = '".$db->idate($now)."'";
-    $sql .= ' WHERE b.date_validated IS NULL';
+	// Update database
+	$db->begin();
+	$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping as b";
+	$sql .= " SET b.date_validated = '".$db->idate($now)."'";
+	$sql .= ' WHERE b.date_validated IS NULL';
 
-    dol_syslog("htdocs/accountancy/closure/validate.php validate", LOG_DEBUG);
-    $resql = $db->query($sql);
-    if (!$resql1) {
-        $error++;
-        $db->rollback();
-        setEventMessages($db->lasterror(), null, 'errors');
-    } else {
-        $db->commit();
-    }
-    // End clean database
+	dol_syslog("htdocs/accountancy/closure/validate.php validate", LOG_DEBUG);
+	$resql = $db->query($sql);
+	if (!$resql1) {
+		$error++;
+		$db->rollback();
+		setEventMessages($db->lasterror(), null, 'errors');
+	} else {
+		$db->commit();
+	}
+	// End clean database
 }
 
 
@@ -135,8 +135,8 @@ if ($resql) {
 	while ($row = $db->fetch_row($resql)) {
 		for ($i = 1; $i <= 12; $i++) {
 			print '<td class="nowrap center">'.$row[$i].'<br><br>';
-            print '<input id="cb'.$row[$i].'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$row[$i].'"'.($selected ? ' checked="checked"' : '').'>';
-            print '</td>';
+			print '<input id="cb'.$row[$i].'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$row[$i].'"'.($selected ? ' checked="checked"' : '').'>';
+			print '</td>';
 		}
 		print '<td class="valigntop"><b>'.$row[13].'</b></td>';
 	}
diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php
index ed8f347a177..118e9b430a4 100644
--- a/htdocs/accountancy/customer/card.php
+++ b/htdocs/accountancy/customer/card.php
@@ -50,7 +50,7 @@ if ($action == 'ventil' && $user->rights->accounting->bind->write)
 {
 	if (!$cancel)
 	{
-	    if ($codeventil < 0) $codeventil = 0;
+		if ($codeventil < 0) $codeventil = 0;
 
 		$sql = " UPDATE ".MAIN_DB_PREFIX."facturedet";
 		$sql .= " SET fk_code_ventilation = ".$codeventil;
@@ -60,12 +60,12 @@ if ($action == 'ventil' && $user->rights->accounting->bind->write)
 		if (!$resql) {
 			setEventMessages($db->lasterror(), null, 'errors');
 		} else {
-		    setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-		    if ($backtopage)
-		    {
-		    	header("Location: ".$backtopage);
-		    	exit();
-		    }
+			setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
+			if ($backtopage)
+			{
+				header("Location: ".$backtopage);
+				exit();
+			}
 		}
 	} else {
 		header("Location: ./lines.php");
@@ -119,7 +119,7 @@ if (!empty($id)) {
 
 			print load_fiche_titre($langs->trans('CustomersVentilation'), '', 'title_accountancy');
 
-			dol_fiche_head();
+			print dol_get_fiche_head();
 
 			print '<table class="border centpercent">';
 
@@ -137,12 +137,12 @@ if (!empty($id)) {
 			print '</td></tr>';
 			print '</table>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
-			print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
+			print '<input class="button button-save" type="submit" value="'.$langs->trans("Save").'">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-			print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
+			print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
 			print '</div>';
 
 			print '</form>';
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 5d35040f6ab..9a78ea3bfc9 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -133,7 +133,7 @@ if (is_array($changeaccount) && count($changeaccount) > 0) {
 		}
 		if (!$error) {
 			$db->commit();
-			setEventMessages($langs->trans('Save'), null, 'mesgs');
+			setEventMessages($langs->trans("Save"), null, 'mesgs');
 		} else {
 			$db->rollback();
 			setEventMessages($db->lasterror(), null, 'errors');
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index a06d2f25d8c..eb2743258d7 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -357,12 +357,6 @@ if ($result) {
 
 	print '<span class="opacitymedium">'.$langs->trans("DescVentilTodoCustomer").'</span></br><br>';
 
-	/*$topicmail="Information";
-	 $modelmail="project";
-	 $objecttmp=new Project($db);
-	 $trackid='prj'.$object->id;
-	 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';*/
-
 	if ($msg) print $msg.'<br>';
 
 	$moreforfilter = '';
diff --git a/htdocs/accountancy/expensereport/card.php b/htdocs/accountancy/expensereport/card.php
index ab02592f6b8..3cf680adfbf 100644
--- a/htdocs/accountancy/expensereport/card.php
+++ b/htdocs/accountancy/expensereport/card.php
@@ -121,7 +121,7 @@ if (!empty($id)) {
 
 			print load_fiche_titre($langs->trans('ExpenseReportsVentilation'), '', 'title_accountancy');
 
-			dol_fiche_head();
+			print dol_get_fiche_head();
 
 			print '<table class="border centpercent">';
 
@@ -146,12 +146,12 @@ if (!empty($id)) {
 			print '</td></tr>';
 			print '</table>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
-			print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
+			print '<input class="button button-save" type="submit" value="'.$langs->trans("Save").'">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-			print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
+			print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
 			print '</div>';
 
 			print '</form>';
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index f99f1148044..02a6ce64df2 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -123,7 +123,7 @@ if (is_array($changeaccount) && count($changeaccount) > 0) {
 		}
 		if (!$error) {
 			$db->commit();
-			setEventMessages($langs->trans('Save'), null, 'mesgs');
+			setEventMessages($langs->trans("Save"), null, 'mesgs');
 		} else {
 			$db->rollback();
 			setEventMessages($db->lasterror(), null, 'errors');
@@ -166,7 +166,7 @@ print '<script type="text/javascript">
 $sql = "SELECT er.ref, er.rowid as erid,";
 $sql .= " erd.rowid, erd.fk_c_type_fees, erd.comments, erd.total_ht, erd.fk_code_ventilation, erd.tva_tx, erd.vat_src_code, erd.date,";
 $sql .= " f.id as type_fees_id, f.code as type_fees_code, f.label as type_fees_label,";
-$sql .= " u.rowid, u.login, u.lastname, u.firstname, u.email, u.gender, u.employee, u.photo, u.statut,";
+$sql .= " u.rowid as userid, u.login, u.lastname, u.firstname, u.email, u.gender, u.employee, u.photo, u.statut,";
 $sql .= " aa.label, aa.labelshort, aa.account_number";
 $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as er";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."expensereport_det as erd ON er.rowid = erd.fk_expensereport";
@@ -311,7 +311,7 @@ if ($result) {
 		$expensereportstatic->ref = $objp->ref;
 		$expensereportstatic->id = $objp->erid;
 
-		$userstatic->id = $objp->rowid;
+		$userstatic->id = $objp->userid;
 		$userstatic->ref = $objp->label;
 		$userstatic->login = $objp->login;
 		$userstatic->statut = $objp->statut;
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index c2fb21a911b..500c11d3cce 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -190,7 +190,7 @@ if (empty($chartaccountcode))
 $sql = "SELECT er.ref, er.rowid as erid, er.date_debut, er.date_valid,";
 $sql .= " erd.rowid, erd.fk_c_type_fees, erd.comments, erd.total_ht as price, erd.fk_code_ventilation, erd.tva_tx as tva_tx_line, erd.vat_src_code, erd.date,";
 $sql .= " f.id as type_fees_id, f.code as type_fees_code, f.label as type_fees_label, f.accountancy_code as code_buy,";
-$sql .= " u.rowid, u.login, u.lastname, u.firstname, u.email, u.gender, u.employee, u.photo, u.statut,";
+$sql .= " u.rowid as userid, u.login, u.lastname, u.firstname, u.email, u.gender, u.employee, u.photo, u.statut,";
 $sql .= " aa.rowid as aarowid";
 $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as er";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."expensereport_det as erd ON er.rowid = erd.fk_expensereport";
@@ -285,12 +285,6 @@ if ($result) {
 
 	print '<span class="opacitymedium">'.$langs->trans("DescVentilTodoExpenseReport").'</span></br><br>';
 
-	/*$topicmail="Information";
-	$modelmail="project";
-	$objecttmp=new Project($db);
-	$trackid='prj'.$object->id;
-	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';*/
-
 	if ($msg) print $msg.'<br>';
 
 	$moreforfilter = '';
@@ -356,7 +350,7 @@ if ($result) {
 		$expensereport_static->ref = $objp->ref;
 		$expensereport_static->id = $objp->erid;
 
-		$userstatic->id = $objp->rowid;
+		$userstatic->id = $objp->userid;
 		$userstatic->ref = $objp->label;
 		$userstatic->login = $objp->login;
 		$userstatic->statut = $objp->statut;
diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index 80ed833b828..834af1ff06a 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2016       Laurent Destailleur		<eldy@users.sourceforge.net>
+/* Copyright (C) 2016-2020  Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2016-2019  Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2019       Frédéric France			<frederic.france@netlogic.fr>
  *
@@ -45,14 +45,14 @@ $hookmanager->initHooks(array('accountancyindex'));
 
 if (GETPOST('addbox'))	// Add box (when submit is done from a form when ajax disabled)
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
-    $zone = GETPOST('areacode', 'aZ09');
-    $userid = GETPOST('userid', 'int');
-    $boxorder = GETPOST('boxorder', 'aZ09');
-    $boxorder .= GETPOST('boxcombo', 'aZ09');
+	require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
+	$zone = GETPOST('areacode', 'aZ09');
+	$userid = GETPOST('userid', 'int');
+	$boxorder = GETPOST('boxorder', 'aZ09');
+	$boxorder .= GETPOST('boxcombo', 'aZ09');
 
-    $result = InfoBox::saveboxorder($db, $zone, $boxorder, $userid);
-    if ($result > 0) setEventMessages($langs->trans("BoxAdded"), null);
+	$result = InfoBox::saveboxorder($db, $zone, $boxorder, $userid);
+	if ($result > 0) setEventMessages($langs->trans("BoxAdded"), null);
 }
 
 
@@ -64,11 +64,11 @@ llxHeader('', $langs->trans("AccountancyArea"));
 
 if ($conf->accounting->enabled)
 {
-    $step = 0;
+	$step = 0;
 
-    $resultboxes = FormOther::getBoxesArea($user, "27"); // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
+	$resultboxes = FormOther::getBoxesArea($user, "27"); // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
 
-    $helpisexpanded = empty($resultboxes['boxactivated']) || (empty($resultboxes['boxlista']) && empty($resultboxes['boxlistb'])); // If there is no widget, the tooltip help is expanded by default.
+	$helpisexpanded = empty($resultboxes['boxactivated']) || (empty($resultboxes['boxlista']) && empty($resultboxes['boxlistb'])); // If there is no widget, the tooltip help is expanded by default.
 	$showtutorial = '';
 
 	if (!$helpisexpanded)
@@ -92,9 +92,9 @@ if ($conf->accounting->enabled)
 
 	print load_fiche_titre($langs->trans("AccountancyArea"), $resultboxes['selectboxlist'], 'title_accountancy', 0, '', '', $showtutorial);
 
-    print '<div class="'.($helpisexpanded ? '' : 'hideobject').'" id="idfaq">'; // hideobject is to start hidden
-    print "<br>\n";
-    print '<span class="opacitymedium">'.$langs->trans("AccountancyAreaDescIntro")."</span><br>\n";
+	print '<div class="'.($helpisexpanded ? '' : 'hideobject').'" id="idfaq">'; // hideobject is to start hidden
+	print "<br>\n";
+	print '<span class="opacitymedium">'.$langs->trans("AccountancyAreaDescIntro")."</span><br>\n";
 	print "<br>\n"; print "<br>\n";
 
 	print load_fiche_titre('<span class="fa fa-calendar-check-o"></span> '.$langs->trans("AccountancyAreaDescActionOnce"), '', '')."\n";
@@ -103,13 +103,19 @@ if ($conf->accounting->enabled)
 
 	// STEPS
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescJournalSetup", $step, '<a href="'.DOL_URL_ROOT.'/accountancy/admin/journals_list.php?id=35"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("AccountingJournals").'</strong></a>');
+	$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescJournalSetup", $step, '{s}');
+	$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/admin/journals_list.php?id=35"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("AccountingJournals").'</strong></a>', $s);
+	print $s;
 	print "<br>\n";
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChartModel", $step, '<a href="'.DOL_URL_ROOT.'/accountancy/admin/accountmodel.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Pcg_version").'</strong></a>');
+	$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChartModel", $step, '{s}');
+	$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/admin/accountmodel.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Pcg_version").'</strong></a>', $s);
+	print $s;
 	print "<br>\n";
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChart", $step, '<a href="'.DOL_URL_ROOT.'/accountancy/admin/account.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Chartofaccounts").'</strong></a>');
+	$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChart", $step, '{s}');
+	$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/admin/account.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Chartofaccounts").'</strong></a>', $s);
+	print $s;
 	print "<br>\n";
 
 	print "<br>\n";
@@ -118,66 +124,51 @@ if ($conf->accounting->enabled)
 	print "<br>\n";
 
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescDefault", $step, '<a href="'.DOL_URL_ROOT.'/accountancy/admin/defaultaccounts.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong></a>');
+	$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescDefault", $step, '{s}');
+	$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/admin/defaultaccounts.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong></a>', $s);
+	print $s;
 	print "<br>\n";
 
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBank", $step, '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuBankAccounts").'</strong></a>')."\n";
+	$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBank", $step, '{s}')."\n";
+	$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuBankAccounts").'</strong></a>', $s);
+	print $s;
 	print "<br>\n";
 
 	$step++;
 	$textlink = '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=10&from=accountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuVatAccounts").'</strong></a>';
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescVat", $step, $textlink);
+	$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescVat", $step, '{s}');
+	$s = str_replace('{s}', $textlink, $s);
+	print $s;
 	print "<br>\n";
 	if (!empty($conf->tax->enabled))
 	{
 		$textlink = '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=7&from=accountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuTaxAccounts").'</strong></a>';
-	    $step++;
-	    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescContrib", $step, $textlink);
-	    print "<br>\n";
+		$step++;
+		$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescContrib", $step, '{s}');
+		$s = str_replace('{s}', $textlink, $s);
+		print $s;
+		print "<br>\n";
 	}
-	/*if (! empty($conf->salaries->enabled))
-	{
-	    $step++;
-	    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescSal", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").' - '.$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
-	    // htdocs/admin/salaries.php
-	    print "<br>\n";
-	    print "<br>\n";
-	}*/
 	if (!empty($conf->expensereport->enabled))  // TODO Move this in the default account page because this is only one accounting account per purpose, not several.
 	{
-	    $step++;
-	    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescExpenseReport", $step, '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=17&from=accountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuExpenseReportAccounts").'</strong></a>');
-	    print "<br>\n";
+		$step++;
+		$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescExpenseReport", $step, '{s}');
+		$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=17&from=accountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuExpenseReportAccounts").'</strong></a>', $s);
+		print $s;
+		print "<br>\n";
 	}
-	/*
-	if (! empty($conf->loan->enabled))
-	{
-	    $step++;
-	    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescLoan", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuSpecialExpenses").' - '.$langs->transnoentitiesnoconv("Loans").'</strong> '.$langs->transnoentitiesnoconv("or").' <strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
-	    print "<br>\n";
-	}
-	if (! empty($conf->don->enabled))
-	{
-	    $step++;
-	    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescDonation", $step, '<strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
-	    print "<br>\n";
-	}
-	if (! empty($conf->adherents->enabled))
-	{
-	    $step++;
-	    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescSubscription", $step, '<strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
-	    print "<br>\n";
-	}*/
 
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescProd", $step, '<a href="'.DOL_URL_ROOT.'/accountancy/admin/productaccount.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("ProductsBinding").'</strong></a>');
+	$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescProd", $step, '{s}');
+	$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/admin/productaccount.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("ProductsBinding").'</strong></a>', $s);
+	print $s;
 	print "<br>\n";
 
 
 	print '<br>';
 
-    // Step A - E
+	// Step A - E
 
 	print "<br>\n";
 	print load_fiche_titre('<span class="fa fa-calendar"></span> '.$langs->trans("AccountancyAreaDescActionFreq"), '', '');
@@ -188,62 +179,70 @@ if ($conf->accounting->enabled)
 	$langs->loadLangs(array('bills', 'trips'));
 
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("BillsCustomers"), '<a href="'.DOL_URL_ROOT.'/accountancy/customer/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("CustomersVentilation").'</strong></a>')."\n";
+	$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("BillsCustomers"), '{s}')."\n";
+	$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/customer/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("CustomersVentilation").'</strong></a>', $s);
+	print $s;
 	print "<br>\n";
 
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("BillsSuppliers"), '<a href="'.DOL_URL_ROOT.'/accountancy/supplier/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("SuppliersVentilation").'</strong></a>')."\n";
+	$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("BillsSuppliers"), '{s}')."\n";
+	$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/supplier/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("SuppliersVentilation").'</strong></a>', $s);
+	print $s;
 	print "<br>\n";
 
 	if (!empty($conf->expensereport->enabled) || !empty($conf->deplacement->enabled))
 	{
 		$step++;
-		print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("ExpenseReports"), '<a href="'.DOL_URL_ROOT.'/accountancy/expensereport/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'</strong></a>')."\n";
-	    print "<br>\n";
+		$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("ExpenseReports"), '{s}')."\n";
+		$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/expensereport/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'</strong></a>', $s);
+		print $s;
+		print "<br>\n";
 	}
 
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescWriteRecords", chr(64 + $step), $langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("RegistrationInAccounting"), $langs->transnoentitiesnoconv("WriteBookKeeping"))."\n";
+	$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescWriteRecords", chr(64 + $step), $langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("RegistrationInAccounting"), $langs->transnoentitiesnoconv("WriteBookKeeping"))."\n";
+	print $s;
 	print "<br>\n";
 
 	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescAnalyze", chr(64 + $step))."<br>\n";
+	$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescAnalyze", chr(64 + $step))."<br>\n";
+	print $s;
 	print "<br>\n";
 
 	print '<br>';
 
 	print '</div>';
 
-    print '<div class="clearboth"></div>';
+	print '<div class="clearboth"></div>';
 
-    print '<div class="fichecenter fichecenterbis">';
+	print '<div class="fichecenter fichecenterbis">';
 
-    /*
+	/*
      * Show boxes
      */
-    $boxlist .= '<div class="twocolumns">';
+	$boxlist .= '<div class="twocolumns">';
 
-    $boxlist .= '<div class="firstcolumn fichehalfleft boxhalfleft" id="boxhalfleft">';
+	$boxlist .= '<div class="firstcolumn fichehalfleft boxhalfleft" id="boxhalfleft">';
 
-    $boxlist .= $resultboxes['boxlista'];
+	$boxlist .= $resultboxes['boxlista'];
 
-    $boxlist .= '</div>';
+	$boxlist .= '</div>';
 
-    $boxlist .= '<div class="secondcolumn fichehalfright boxhalfright" id="boxhalfright">';
+	$boxlist .= '<div class="secondcolumn fichehalfright boxhalfright" id="boxhalfright">';
 
-    $boxlist .= $resultboxes['boxlistb'];
+	$boxlist .= $resultboxes['boxlistb'];
 
-    $boxlist .= '</div>';
-    $boxlist .= "\n";
+	$boxlist .= '</div>';
+	$boxlist .= "\n";
 
-    $boxlist .= '</div>';
+	$boxlist .= '</div>';
 
 
-    print $boxlist;
+	print $boxlist;
 
-    print '</div>';
+	print '</div>';
 } else {
-    print load_fiche_titre($langs->trans("AccountancyArea"), '', 'accountancy');
+	print load_fiche_titre($langs->trans("AccountancyArea"), '', 'accountancy');
 
 	print '<span class="opacitymedium">'.$langs->trans("Module10Desc")."</span><br>\n";
 }
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 7062c25b108..d353041234f 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2013-2019  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2013-2014  Florian Henry           <florian.henry@open-concept.pro>
  * Copyright (C) 2013-2014  Olivier Geffroy         <jeff@jeffinfo.com>
- * Copyright (C) 2017-2018  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2017-2020  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2018		Ferran Marcet	        <fmarcet@2byte.es>
  * Copyright (C) 2018		Eric Seigne	            <eric.seigne@cap-rel.fr>
  *
@@ -73,15 +73,18 @@ $date_endmonth = GETPOST('date_endmonth', 'int');
 $date_endday = GETPOST('date_endday', 'int');
 $date_endyear = GETPOST('date_endyear', 'int');
 $in_bookkeeping = GETPOST('in_bookkeeping', 'aZ09');
-if ($in_bookkeeping == '') $in_bookkeeping = 'notyet';
+if ($in_bookkeeping == '') {
+	$in_bookkeeping = 'notyet';
+}
 
 $now = dol_now();
 
 $action = GETPOST('action', 'aZ09');
 
 // Security check
-if ($user->socid > 0 && empty($id_journal))
+if ($user->socid > 0 && empty($id_journal)) {
 	accessforbidden();
+}
 
 
 /*
@@ -93,8 +96,7 @@ $error = 0;
 $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
 $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 
-if (empty($date_startmonth) || empty($date_endmonth))
-{
+if (empty($date_startmonth) || empty($date_endmonth)) {
 	// Period by default on transfer
 	$dates = getDefaultDatesForTransfer();
 	$date_start = $dates['date_start'];
@@ -103,8 +105,7 @@ if (empty($date_startmonth) || empty($date_endmonth))
 	$pastmonth = $dates['pastmonth'];
 }
 
-if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))) // We define date_start and date_end, only if we did not submit the form
-{
+if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))) { // We define date_start and date_end, only if we did not submit the form
 	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
 	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
@@ -124,19 +125,18 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as soc on bu1.url_id=soc.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on bu2.url_id=u.rowid";
 $sql .= " WHERE ba.fk_accountancy_journal=".$id_journal;
 $sql .= ' AND b.amount != 0 AND ba.entity IN ('.getEntity('bank_account', 0).')'; // We don't share object for accountancy
-if ($date_start && $date_end)
+if ($date_start && $date_end) {
 	$sql .= " AND b.dateo >= '".$db->idate($date_start)."' AND b.dateo <= '".$db->idate($date_end)."'";
+}
 // Define begin binding date
 if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
 	$sql .= " AND b.dateo >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
 }
 // Already in bookkeeping or not
-if ($in_bookkeeping == 'already')
-{
+if ($in_bookkeeping == 'already') {
 	$sql .= " AND (b.rowid IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab  WHERE ab.doc_type='bank') )";
 }
-if ($in_bookkeeping == 'notyet')
-{
+if ($in_bookkeeping == 'notyet') {
 	$sql .= " AND (b.rowid NOT IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab  WHERE ab.doc_type='bank') )";
 }
 $sql .= " ORDER BY b.datev";
@@ -177,13 +177,13 @@ if ($result) {
 	//print $sql;
 
 	// Variables
-	$account_supplier			= (($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER != "") ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : 'NotDefined'); // NotDefined is a reserved word
-	$account_customer			= (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER != "") ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : 'NotDefined'); // NotDefined is a reserved word
-	$account_employee			= (!empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) ? $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT : 'NotDefined'); // NotDefined is a reserved word
-	$account_pay_vat			= (!empty($conf->global->ACCOUNTING_VAT_PAY_ACCOUNT) ? $conf->global->ACCOUNTING_VAT_PAY_ACCOUNT : 'NotDefined'); // NotDefined is a reserved word
-	$account_pay_donation		= (!empty($conf->global->DONATION_ACCOUNTINGACCOUNT) ? $conf->global->DONATION_ACCOUNTINGACCOUNT : 'NotDefined'); // NotDefined is a reserved word
-	$account_pay_subscription	= (!empty($conf->global->ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT) ? $conf->global->ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT : 'NotDefined'); // NotDefined is a reserved word
-	$account_transfer			= (!empty($conf->global->ACCOUNTING_ACCOUNT_TRANSFER_CASH) ? $conf->global->ACCOUNTING_ACCOUNT_TRANSFER_CASH : 'NotDefined'); // NotDefined is a reserved word
+	$account_supplier = (($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER != "") ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : 'NotDefined'); // NotDefined is a reserved word
+	$account_customer = (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER != "") ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : 'NotDefined'); // NotDefined is a reserved word
+	$account_employee = (!empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) ? $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT : 'NotDefined'); // NotDefined is a reserved word
+	$account_pay_vat = (!empty($conf->global->ACCOUNTING_VAT_PAY_ACCOUNT) ? $conf->global->ACCOUNTING_VAT_PAY_ACCOUNT : 'NotDefined'); // NotDefined is a reserved word
+	$account_pay_donation = (!empty($conf->global->DONATION_ACCOUNTINGACCOUNT) ? $conf->global->DONATION_ACCOUNTINGACCOUNT : 'NotDefined'); // NotDefined is a reserved word
+	$account_pay_subscription = (!empty($conf->global->ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT) ? $conf->global->ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT : 'NotDefined'); // NotDefined is a reserved word
+	$account_transfer = (!empty($conf->global->ACCOUNTING_ACCOUNT_TRANSFER_CASH) ? $conf->global->ACCOUNTING_ACCOUNT_TRANSFER_CASH : 'NotDefined'); // NotDefined is a reserved word
 
 	$tabcompany = array();
 	$tabuser = array();
@@ -198,23 +198,28 @@ if ($result) {
 	// one line for bank record = tabbq
 	// one line for thirdparty record = tabtp
 	$i = 0;
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$obj = $db->fetch_object($result);
 
 		$lineisapurchase = -1;
 		$lineisasale = -1;
 		// Old method to detect if it's a sale or purchase
-		if ($obj->label == '(SupplierInvoicePayment)' || $obj->label == '(SupplierInvoicePaymentBack)') $lineisapurchase = 1;
-		if ($obj->label == '(CustomerInvoicePayment)' || $obj->label == '(CustomerInvoicePaymentBack)') $lineisasale = 1;
-		// Try a more reliable method to detect if record is a supplier payment or a customer payment
-		if ($lineisapurchase < 0)
-		{
-			if ($obj->typeop_payment_supplier == 'payment_supplier') $lineisapurchase = 1;
+		if ($obj->label == '(SupplierInvoicePayment)' || $obj->label == '(SupplierInvoicePaymentBack)') {
+			$lineisapurchase = 1;
 		}
-		if ($lineisasale < 0)
-		{
-			if ($obj->typeop_payment == 'payment') $lineisasale = 1;
+		if ($obj->label == '(CustomerInvoicePayment)' || $obj->label == '(CustomerInvoicePaymentBack)') {
+			$lineisasale = 1;
+		}
+		// Try a more reliable method to detect if record is a supplier payment or a customer payment
+		if ($lineisapurchase < 0) {
+			if ($obj->typeop_payment_supplier == 'payment_supplier') {
+				$lineisapurchase = 1;
+			}
+		}
+		if ($lineisasale < 0) {
+			if ($obj->typeop_payment == 'payment') {
+				$lineisasale = 1;
+			}
 		}
 		//var_dump($obj->type_payment); var_dump($obj->type_payment_supplier);
 		//var_dump($lineisapurchase); //var_dump($lineisasale);
@@ -224,28 +229,30 @@ if ($result) {
 
 		// Set accountancy code for thirdparty (example: '411CU...' or '411' if no subledger account defined on customer)
 		$compta_soc = 'NotDefined';
-		if ($lineisapurchase > 0)
+		if ($lineisapurchase > 0) {
 			$compta_soc = (($obj->code_compta_fournisseur != "") ? $obj->code_compta_fournisseur : $account_supplier);
-		if ($lineisasale > 0)
+		}
+		if ($lineisasale > 0) {
 			$compta_soc = (!empty($obj->code_compta) ? $obj->code_compta : $account_customer);
+		}
 
 		$tabcompany[$obj->rowid] = array(
-				'id' => $obj->socid,
-				'name' => $obj->name,
-				'code_compta' => $compta_soc,
-				'email' => $obj->email
+			'id' => $obj->socid,
+			'name' => $obj->name,
+			'code_compta' => $compta_soc,
+			'email' => $obj->email
 		);
 
 		// Set accountancy code for user
 		$compta_user = (!empty($obj->accountancy_code) ? $obj->accountancy_code : '');
 
 		$tabuser[$obj->rowid] = array(
-				'id' => $obj->userid,
-				'name' => dolGetFirstLastname($obj->firstname, $obj->lastname),
-				'lastname' => $obj->lastname,
-				'firstname' => $obj->firstname,
-				'email' => $obj->useremail,
-				'accountancy_code' => $compta_user
+			'id' => $obj->userid,
+			'name' => dolGetFirstLastname($obj->firstname, $obj->lastname),
+			'lastname' => $obj->lastname,
+			'firstname' => $obj->firstname,
+			'email' => $obj->useremail,
+			'accountancy_code' => $compta_user
 		);
 
 		// Variable bookkeeping ($obj->rowid is Bank Id)
@@ -264,10 +271,6 @@ if ($result) {
 		// Load of url links to the line into llx_bank
 		$links = $object->get_url($obj->rowid); // Get an array('url'=>, 'url_id'=>, 'label'=>, 'type'=> 'fk_bank'=> )
 
-		//var_dump($i);
-		//var_dump($tabpay);
-		//var_dump($tabcompany);
-
 		// By default
 		$tabpay[$obj->rowid]['type'] = 'unknown'; // Can be SOLD, miscellaneous entry, payment of patient, or any old record with no links in bank_url.
 		$tabtype[$obj->rowid] = 'unknown';
@@ -277,17 +280,14 @@ if ($result) {
 		if (is_array($links) && count($links) > 0) {
 			// Now loop on each link of record in bank.
 			foreach ($links as $key => $val) {
-				if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation', 'member', 'payment_loan', 'payment_salary', 'payment_various')))
-				{
+				if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation', 'member', 'payment_loan', 'payment_salary', 'payment_various'))) {
 					// So we excluded 'company' and 'user' here. We want only payment lines
 
 					// We save tabtype for a future use, to remember what kind of payment it is
 					$tabpay[$obj->rowid]['type'] = $links[$key]['type'];
 					$tabtype[$obj->rowid] = $links[$key]['type'];
-				} elseif (in_array($links[$key]['type'], array('company', 'user')))
-				{
-					if ($tabpay[$obj->rowid]['type'] == 'unknown')
-					{
+				} elseif (in_array($links[$key]['type'], array('company', 'user'))) {
+					if ($tabpay[$obj->rowid]['type'] == 'unknown') {
 						// We can guess here it is a bank record for a thirdparty company or a user.
 						// But we won't be able to record somewhere else than into a waiting account, because there is no other journal to record the contreparty.
 					}
@@ -312,16 +312,23 @@ if ($result) {
 					$societestatic->name = $links[$key]['label'];
 					$societestatic->email = $tabcompany[$obj->rowid]['email'];
 					$tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30);
-					if ($compta_soc) $tabtp[$obj->rowid][$compta_soc] += $obj->amount;
+					if ($compta_soc) {
+						$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
+					}
 				} elseif ($links[$key]['type'] == 'user') {
 					$userstatic->id = $links[$key]['url_id'];
 					$userstatic->name = $links[$key]['label'];
 					$userstatic->email = $tabuser[$obj->rowid]['email'];
 					$userstatic->firstname = $tabuser[$obj->rowid]['firstname'];
 					$userstatic->lastname = $tabuser[$obj->rowid]['lastname'];
-					if ($userstatic->id > 0) $tabpay[$obj->rowid]["soclib"] = $userstatic->getNomUrl(1, '', 30);
-					else $tabpay[$obj->rowid]["soclib"] = '???'; // Should not happen, but happens with old data when id of user was not saved on expense report payment.
-					if ($compta_user) $tabtp[$obj->rowid][$compta_user] += $obj->amount;
+					if ($userstatic->id > 0) {
+						$tabpay[$obj->rowid]["soclib"] = $userstatic->getNomUrl(1, '', 30);
+					} else {
+						$tabpay[$obj->rowid]["soclib"] = '???'; // Should not happen, but happens with old data when id of user was not saved on expense report payment.
+					}
+					if ($compta_user) {
+						$tabtp[$obj->rowid][$compta_user] += $obj->amount;
+					}
 				} elseif ($links[$key]['type'] == 'sc') {
 					$chargestatic->id = $links[$key]['url_id'];
 					$chargestatic->ref = $links[$key]['url_id'];
@@ -329,8 +336,9 @@ if ($result) {
 					$tabpay[$obj->rowid]["lib"] .= ' '.$chargestatic->getNomUrl(2);
 					$reg = array();
 					if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg)) {
-						if ($reg[1] == 'socialcontribution')
+						if ($reg[1] == 'socialcontribution') {
 							$reg[1] = 'SocialContribution';
+						}
 						$chargestatic->label = $langs->trans($reg[1]);
 					} else {
 						$chargestatic->label = $links[$key]['label'];
@@ -339,7 +347,7 @@ if ($result) {
 					$tabpay[$obj->rowid]["soclib"] = $chargestatic->getNomUrl(1, 30);
 					$tabpay[$obj->rowid]["paymentscid"] = $chargestatic->id;
 
-					// Retreive the accounting code of the social contribution of the payment from link of payment.
+					// Retrieve the accounting code of the social contribution of the payment from link of payment.
 					// Note: We have the social contribution id, it can be faster to get accounting code from social contribution id.
 					$sqlmid = 'SELECT cchgsoc.accountancy_code';
 					$sqlmid .= " FROM ".MAIN_DB_PREFIX."c_chargesociales cchgsoc";
@@ -394,9 +402,9 @@ if ($result) {
 					$tabpay[$obj->rowid]["paymentvariousid"] = $paymentvariousstatic->id;
 					$paymentvariousstatic->fetch($paymentvariousstatic->id);
 					$account_various = (!empty($paymentvariousstatic->accountancy_code) ? $paymentvariousstatic->accountancy_code : 'NotDefined'); // NotDefined is a reserved word
-                    $account_subledger = (!empty($paymentvariousstatic->subledger_account) ? $paymentvariousstatic->subledger_account : ''); // NotDefined is a reserved word
-                    $tabpay[$obj->rowid]["account_various"] = $account_various;
-                    $tabtp[$obj->rowid][$account_subledger] += $obj->amount;
+					$account_subledger = (!empty($paymentvariousstatic->subledger_account) ? $paymentvariousstatic->subledger_account : ''); // NotDefined is a reserved word
+					$tabpay[$obj->rowid]["account_various"] = $account_various;
+					$tabtp[$obj->rowid][$account_subledger] += $obj->amount;
 				} elseif ($links[$key]['type'] == 'payment_loan') {
 					$paymentloanstatic->id = $links[$key]['url_id'];
 					$paymentloanstatic->ref = $links[$key]['url_id'];
@@ -430,20 +438,19 @@ if ($result) {
 
 		// If no links were found to know the amount on thirdparty, we try to guess it.
 		// This may happens on bank entries without the links lines to 'company'.
-		if (empty($tabtp[$obj->rowid]) && !empty($tabmoreinfo[$obj->rowid]['withdraw']))	// If we dont find 'company' link because it is an old 'withdraw' record
-		{
+		if (empty($tabtp[$obj->rowid]) && !empty($tabmoreinfo[$obj->rowid]['withdraw'])) {	// If we dont find 'company' link because it is an old 'withdraw' record
 			foreach ($links as $key => $val) {
 				if ($links[$key]['type'] == 'payment') {
 					// Get thirdparty
 					$tmppayment->fetch($links[$key]['url_id']);
 					$arrayofamounts = $tmppayment->getAmountsArray();
-					foreach ($arrayofamounts as $invoiceid => $amount)
-					{
-						$tmpinvoice->fetch($invoiceid);
-						$tmpinvoice->fetch_thirdparty();
-						if ($tmpinvoice->thirdparty->code_compta)
-						{
-							$tabtp[$obj->rowid][$tmpinvoice->thirdparty->code_compta] += $amount;
+					if (is_array($arrayofamounts)) {
+						foreach ($arrayofamounts as $invoiceid => $amount) {
+							$tmpinvoice->fetch($invoiceid);
+							$tmpinvoice->fetch_thirdparty();
+							if ($tmpinvoice->thirdparty->code_compta) {
+								$tabtp[$obj->rowid][$tmpinvoice->thirdparty->code_compta] += $amount;
+							}
 						}
 					}
 				}
@@ -451,7 +458,9 @@ if ($result) {
 		}
 
 		// If no links were found to know the amount on thirdparty, we init it to account 'NotDefined'.
-		if (empty($tabtp[$obj->rowid])) $tabtp[$obj->rowid]['NotDefined'] = $tabbq[$obj->rowid][$compta_bank];
+		if (empty($tabtp[$obj->rowid])) {
+			$tabtp[$obj->rowid]['NotDefined'] = $tabbq[$obj->rowid][$compta_bank];
+		}
 
 		// Check account number is ok
 		/*if ($action == 'writebookkeeping')		// Make test now in such a case
@@ -492,8 +501,7 @@ if (!$error && $action == 'writebookkeeping') {
 	$now = dol_now();
 
 	$error = 0;
-	foreach ($tabpay as $key => $val)		// $key is rowid into llx_bank
-	{
+	foreach ($tabpay as $key => $val) {		// $key is rowid into llx_bank
 		$date = dol_print_date($db->jdate($val["date"]), 'day');
 
 		$ref = getSourceDocRef($val, $tabtype[$key]);
@@ -511,17 +519,18 @@ if (!$error && $action == 'writebookkeeping') {
 		var_dump($tabbq);exit;*/
 
 		// Bank
-		if (!$errorforline && is_array($tabbq[$key]))
-		{
+		if (!$errorforline && is_array($tabbq[$key])) {
 			// Line into bank account
-			foreach ($tabbq[$key] as $k => $mt)
-			{
-				if ($mt)
-				{
+			foreach ($tabbq[$key] as $k => $mt) {
+				if ($mt) {
 					$reflabel = '';
-					if (!empty($val['lib'])) $reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+					if (!empty($val['lib'])) {
+						$reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+					}
 					$reflabel .= $langs->trans("Bank").' '.dol_string_nohtmltag($val['bank_account_ref']);
-					if (!empty($val['soclib'])) $reflabel .= " - ".dol_string_nohtmltag($val['soclib']);
+					if (!empty($val['soclib'])) {
+						$reflabel .= " - ".dol_string_nohtmltag($val['soclib']);
+					}
 
 					$bookkeeping = new BookKeeping($db);
 					$bookkeeping->doc_date = $val["date"];
@@ -554,8 +563,7 @@ if (!$error && $action == 'writebookkeeping') {
 
 					$result = $bookkeeping->create($user);
 					if ($result < 0) {
-						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-						{
+						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
 							$error++;
 							$errorforline++;
 							setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
@@ -570,18 +578,16 @@ if (!$error && $action == 'writebookkeeping') {
 		}
 
 		// Third party
-		if (!$errorforline)
-		{
-			if (is_array($tabtp[$key]))
-			{
+		if (!$errorforline) {
+			if (is_array($tabtp[$key])) {
 				// Line into thirdparty account
 				foreach ($tabtp[$key] as $k => $mt) {
-					if ($mt)
-					{
+					if ($mt) {
 						$reflabel = '';
-						if (!empty($val['lib'])) $reflabel .= dol_string_nohtmltag($val['lib']).($val['soclib'] ? " - " : "");
-						if ($tabtype[$key] == 'banktransfert')
-						{
+						if (!empty($val['lib'])) {
+							$reflabel .= dol_string_nohtmltag($val['lib']).($val['soclib'] ? " - " : "");
+						}
+						if ($tabtype[$key] == 'banktransfert') {
 							$reflabel .= dol_string_nohtmltag($langs->transnoentitiesnoconv('TransitionalAccount').' '.$account_transfer);
 						} else {
 							$reflabel .= dol_string_nohtmltag($val['soclib']);
@@ -668,7 +674,7 @@ if (!$error && $action == 'writebookkeeping') {
 							$bookkeeping->label_compte = $accountingaccount->label;
 						} elseif ($tabtype[$key] == 'payment_various') {
 							$bookkeeping->subledger_account = $k;
-                            $bookkeeping->subledger_label = $tabcompany[$key]['name'];
+							$bookkeeping->subledger_label = $tabcompany[$key]['name'];
 							$bookkeeping->numero_compte = $tabpay[$key]["account_various"];
 
 							$accountingaccount->fetch(null, $bookkeeping->numero_compte, true);
@@ -681,8 +687,7 @@ if (!$error && $action == 'writebookkeeping') {
 							$accountingaccount->fetch(null, $k, true);
 							$bookkeeping->label_compte = $accountingaccount->label;
 						} else {
-							if ($tabtype[$key] == 'unknown')	// Unknown transaction, we will use a waiting account for thirdparty.
-							{
+							if ($tabtype[$key] == 'unknown') {	// Unknown transaction, we will use a waiting account for thirdparty.
 								// Temporary account
 								$bookkeeping->subledger_account = '';
 								$bookkeeping->subledger_label = '';
@@ -700,8 +705,7 @@ if (!$error && $action == 'writebookkeeping') {
 
 						$result = $bookkeeping->create($user);
 						if ($result < 0) {
-							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-							{
+							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
 								$error++;
 								$errorforline++;
 								setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
@@ -715,10 +719,11 @@ if (!$error && $action == 'writebookkeeping') {
 				}
 			} else {	// If thirdparty unknown, output the waiting account
 				foreach ($tabbq[$key] as $k => $mt) {
-					if ($mt)
-					{
+					if ($mt) {
 						$reflabel = '';
-						if (!empty($val['lib'])) $reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+						if (!empty($val['lib'])) {
+							$reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+						}
 						$reflabel .= dol_string_nohtmltag('WaitingAccount');
 
 						$bookkeeping = new BookKeeping($db);
@@ -745,8 +750,7 @@ if (!$error && $action == 'writebookkeeping') {
 						$result = $bookkeeping->create($user);
 
 						if ($result < 0) {
-							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-							{
+							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
 								$error++;
 								$errorforline++;
 								setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
@@ -761,23 +765,20 @@ if (!$error && $action == 'writebookkeeping') {
 			}
 		}
 
-		if (price2num($totaldebit, 'MT') != price2num($totalcredit, 'MT'))
-		{
+		if (price2num($totaldebit, 'MT') != price2num($totalcredit, 'MT')) {
 			$error++;
 			$errorforline++;
 			setEventMessages('Try to insert a non balanced transaction in book for '.$ref.'. Canceled. Surely a bug.', null, 'errors');
 		}
 
-		if (!$errorforline)
-		{
+		if (!$errorforline) {
 			$db->commit();
 		} else {
 			//print 'KO for line '.$key.' '.$error.'<br>';
 			$db->rollback();
 
 			$MAXNBERRORS = 5;
-			if ($error >= $MAXNBERRORS)
-			{
+			if ($error >= $MAXNBERRORS) {
 				setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped").' (>'.$MAXNBERRORS.')', null, 'errors');
 				break; // Break in the foreach
 			}
@@ -786,8 +787,7 @@ if (!$error && $action == 'writebookkeeping') {
 
 	if (empty($error) && count($tabpay) > 0) {
 		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
-	} elseif (count($tabpay) == $error)
-	{
+	} elseif (count($tabpay) == $error) {
 		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
 	} else {
 		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
@@ -796,8 +796,7 @@ if (!$error && $action == 'writebookkeeping') {
 	$action = '';
 
 	// Must reload data, so we make a redirect
-	if (count($tabpay) != $error)
-	{
+	if (count($tabpay) != $error) {
 		$param = 'id_journal='.$id_journal;
 		$param .= '&date_startday='.$date_startday;
 		$param .= '&date_startmonth='.$date_startmonth;
@@ -835,26 +834,28 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 	print '"'.$langs->transnoentitiesnoconv("Note").'"'.$sep;
 	print "\n";
 
-	foreach ($tabpay as $key => $val)
-	{
+	foreach ($tabpay as $key => $val) {
 		$date = dol_print_date($db->jdate($val["date"]), 'day');
 
 		$ref = getSourceDocRef($val, $tabtype[$key]);
 
 		// Bank
 		foreach ($tabbq[$key] as $k => $mt) {
-			if ($mt)
-			{
+			if ($mt) {
 				$reflabel = '';
-				if (!empty($val['lib'])) $reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+				if (!empty($val['lib'])) {
+					$reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+				}
 				$reflabel .= $langs->trans("Bank").' '.dol_string_nohtmltag($val['bank_account_ref']);
-				if (!empty($val['soclib'])) $reflabel .= " - ".dol_string_nohtmltag($val['soclib']);
+				if (!empty($val['soclib'])) {
+					$reflabel .= " - ".dol_string_nohtmltag($val['soclib']);
+				}
 
 				print '"'.$key.'"'.$sep;
 				print '"'.$date.'"'.$sep;
 				print '"'.$val["type_payment"].'"'.$sep;
 				print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
-				print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
+				print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
 				print "  ".$sep;
 				print '"'.$reflabel.'"'.$sep;
 				print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
@@ -868,12 +869,12 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 		// Third party
 		if (is_array($tabtp[$key])) {
 			foreach ($tabtp[$key] as $k => $mt) {
-				if ($mt)
-				{
+				if ($mt) {
 					$reflabel = '';
-					if (!empty($val['lib'])) $reflabel .= dol_string_nohtmltag($val['lib']).($val['soclib'] ? " - " : "");
-					if ($tabtype[$key] == 'banktransfert')
-					{
+					if (!empty($val['lib'])) {
+						$reflabel .= dol_string_nohtmltag($val['lib']).($val['soclib'] ? " - " : "");
+					}
+					if ($tabtype[$key] == 'banktransfert') {
 						$reflabel .= dol_string_nohtmltag($langs->transnoentitiesnoconv('TransitionalAccount').' '.$account_transfer);
 					} else {
 						$reflabel .= dol_string_nohtmltag($val['soclib']);
@@ -882,7 +883,7 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 					print '"'.$key.'"'.$sep;
 					print '"'.$date.'"'.$sep;
 					print '"'.$val["type_payment"].'"'.$sep;
-					print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
+					print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
 					if ($tabtype[$key] == 'payment_supplier') {
 						print '"'.$conf->global->ACCOUNTING_ACCOUNT_SUPPLIER.'"'.$sep;
 					} elseif ($tabtype[$key] == 'payment') {
@@ -892,7 +893,7 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 					} elseif ($tabtype[$key] == 'payment_salary') {
 						print '"'.$conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT.'"'.$sep;
 					} else {
-						print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
+						print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
 					}
 					print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
 					print '"'.$reflabel.'"'.$sep;
@@ -905,17 +906,18 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 			}
 		} else {	// If thirdparty unkown, output the waiting account
 			foreach ($tabbq[$key] as $k => $mt) {
-				if ($mt)
-				{
+				if ($mt) {
 					$reflabel = '';
-					if (!empty($val['lib'])) $reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+					if (!empty($val['lib'])) {
+						$reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+					}
 					$reflabel .= dol_string_nohtmltag('WaitingAccount');
 
 					print '"'.$key.'"'.$sep;
 					print '"'.$date.'"'.$sep;
 					print '"'.$val["type_payment"].'"'.$sep;
 					print '"'.length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE).'"'.$sep;
-					print '"'.length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE).'"'.$sep;
+					print '"'.length_accounta($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE).'"'.$sep;
 					print "".$sep;
 					print '"'.$reflabel.'"'.$sep;
 					print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
@@ -954,8 +956,8 @@ if (empty($action) || $action == 'view') {
 	$description .= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
 
 	$listofchoices = array('notyet'=>$langs->trans("NotYetInGeneralLedger"), 'already'=>$langs->trans("AlreadyInGeneralLedger"));
-    $period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
-    $period .= ' -  '.$langs->trans("JournalizationInLedgerStatus").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
+	$period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
+	$period .= ' -  '.$langs->trans("JournalizationInLedgerStatus").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
 
 	$varlink = 'id_journal='.$id_journal;
 
@@ -965,15 +967,18 @@ if (empty($action) || $action == 'view') {
 	// Test that setup is complete (we are in accounting, so test on entity is always on $conf->entity only, no sharing allowed)
 	$sql = 'SELECT COUNT(rowid) as nb FROM '.MAIN_DB_PREFIX.'bank_account WHERE entity = '.$conf->entity.' AND fk_accountancy_journal IS NULL AND clos=0';
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$obj = $db->fetch_object($resql);
-		if ($obj->nb > 0)
-		{
-			print '<br>'.img_warning().' '.$langs->trans("TheJournalCodeIsNotDefinedOnSomeBankAccount");
-			print ' : '.$langs->trans("AccountancyAreaDescBank", 9, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("BankAccounts").'</strong>');
+		if ($obj->nb > 0) {
+			print '<br><div class="warning">'.img_warning().' '.$langs->trans("TheJournalCodeIsNotDefinedOnSomeBankAccount");
+			$desc = ' : '.$langs->trans("AccountancyAreaDescBank", 9, '{link}');
+			$desc = str_replace('{link}', '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("BankAccounts").'</strong>', $desc);
+			print $desc;
+			print '</div>';
 		}
-	} else dol_print_error($db);
+	} else {
+		dol_print_error($db);
+	}
 
 
 	// Button to write into Ledger
@@ -987,14 +992,19 @@ if (empty($action) || $action == 'view') {
 
 	print '<div class="tabsAction tabsActionNoBottom">';
 
-	if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
+	if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') {
+		print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
+	}
 
 	if (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == "") || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1'
-	    || ($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == "") || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1') {
-	    print '<input type="button" class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="'.$langs->trans("WriteBookKeeping").'" />';
+		|| ($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == "") || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1') {
+		print '<input type="button" class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="'.$langs->trans("WriteBookKeeping").'" />';
 	} else {
-	    if ($in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
-        else print '<a class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
+		if ($in_bookkeeping == 'notyet') {
+			print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
+		} else {
+			print '<a class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
+		}
 	}
 
 	print '</div>';
@@ -1037,21 +1047,22 @@ if (empty($action) || $action == 'view') {
 
 	$r = '';
 
-	foreach ($tabpay as $key => $val)			  // $key is rowid in llx_bank
-	{
+	foreach ($tabpay as $key => $val) {			  // $key is rowid in llx_bank
 		$date = dol_print_date($db->jdate($val["date"]), 'day');
 
 		$ref = getSourceDocRef($val, $tabtype[$key]);
 
 		// Bank
-		foreach ($tabbq[$key] as $k => $mt)
-		{
-			if ($mt)
-			{
+		foreach ($tabbq[$key] as $k => $mt) {
+			if ($mt) {
 				$reflabel = '';
-				if (!empty($val['lib'])) $reflabel .= $val['lib']." - ";
+				if (!empty($val['lib'])) {
+					$reflabel .= $val['lib']." - ";
+				}
 				$reflabel .= $langs->trans("Bank").' '.$val['bank_account_ref'];
-				if (!empty($val['soclib'])) $reflabel .= " - ".$val['soclib'];
+				if (!empty($val['soclib'])) {
+					$reflabel .= " - ".$val['soclib'];
+				}
 
 				//var_dump($tabpay[$key]);
 				print '<!-- Bank bank.rowid='.$key.' type='.$tabpay[$key]['type'].' ref='.$tabpay[$key]['ref'].'-->';
@@ -1061,10 +1072,11 @@ if (empty($action) || $action == 'view') {
 				// Ledger account
 				print "<td>";
 				$accounttoshow = length_accountg($k);
-				if (empty($accounttoshow) || $accounttoshow == 'NotDefined')
-				{
+				if (empty($accounttoshow) || $accounttoshow == 'NotDefined') {
 					print '<span class="error">'.$langs->trans("BankAccountNotDefined").'</span>';
-				} else print $accounttoshow;
+				} else {
+					print $accounttoshow;
+				}
 				print "</td>";
 				// Subledger account
 				print "<td>";
@@ -1088,12 +1100,12 @@ if (empty($action) || $action == 'view') {
 		// Third party
 		if (is_array($tabtp[$key])) {
 			foreach ($tabtp[$key] as $k => $mt) {
-				if ($mt)
-				{
+				if ($mt) {
 					$reflabel = '';
-					if (!empty($val['lib'])) $reflabel .= $val['lib'].($val['soclib'] ? " - " : "");
-					if ($tabtype[$key] == 'banktransfert')
-					{
+					if (!empty($val['lib'])) {
+						$reflabel .= $val['lib'].($val['soclib'] ? " - " : "");
+					}
+					if ($tabtype[$key] == 'banktransfert') {
 						$reflabel .= $langs->trans('TransitionalAccount').' '.$account_transfer;
 					} else {
 						$reflabel .= $val['soclib'];
@@ -1107,21 +1119,32 @@ if (empty($action) || $action == 'view') {
 					print "<td>";
 					$account_ledger = $k;
 					// Try to force general ledger account depending on type
-					if ($tabtype[$key] == 'payment')				$account_ledger = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
-					if ($tabtype[$key] == 'payment_supplier')		$account_ledger = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
-					if ($tabtype[$key] == 'payment_expensereport')	$account_ledger = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
-					if ($tabtype[$key] == 'payment_salary')			$account_ledger = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
-					if ($tabtype[$key] == 'payment_vat')			$account_ledger = $conf->global->ACCOUNTING_VAT_PAY_ACCOUNT;
-					if ($tabtype[$key] == 'member')					$account_ledger = $conf->global->ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT;
-					if ($tabtype[$key] == 'payment_various')	    $account_ledger = $tabpay[$key]["account_various"];
-					$accounttoshow = length_accounta($account_ledger);
-					if (empty($accounttoshow) || $accounttoshow == 'NotDefined')
-					{
-						if ($tabtype[$key] == 'unknown')
-						{
+					if ($tabtype[$key] == 'payment') {
+						$account_ledger = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
+					}
+					if ($tabtype[$key] == 'payment_supplier') {
+						$account_ledger = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
+					}
+					if ($tabtype[$key] == 'payment_expensereport') {
+						$account_ledger = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
+					}
+					if ($tabtype[$key] == 'payment_salary') {
+						$account_ledger = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
+					}
+					if ($tabtype[$key] == 'payment_vat') {
+						$account_ledger = $conf->global->ACCOUNTING_VAT_PAY_ACCOUNT;
+					}
+					if ($tabtype[$key] == 'member') {
+						$account_ledger = $conf->global->ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT;
+					}
+					if ($tabtype[$key] == 'payment_various') {
+						$account_ledger = $tabpay[$key]["account_various"];
+					}
+					$accounttoshow = length_accountg($account_ledger);
+					if (empty($accounttoshow) || $accounttoshow == 'NotDefined') {
+						if ($tabtype[$key] == 'unknown') {
 							// We will accept writing, but into a waiting account
-							if (empty($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) || $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE == '-1')
-							{
+							if (empty($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) || $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE == '-1') {
 								print '<span class="error">'.$langs->trans('UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking').'</span>';
 							} else {
 								print '<span class="warning">'.$langs->trans('UnknownAccountForThirdparty', length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE)).'</span>'; // We will use a waiting account
@@ -1129,32 +1152,42 @@ if (empty($action) || $action == 'view') {
 						} else {
 							// We will refuse writing
 							$errorstring = 'UnknownAccountForThirdpartyBlocking';
-							if ($tabtype[$key] == 'payment')				$errorstring = 'MainAccountForCustomersNotDefined';
-							if ($tabtype[$key] == 'payment_supplier')		$errorstring = 'MainAccountForSuppliersNotDefined';
-							if ($tabtype[$key] == 'payment_expensereport')	$errorstring = 'MainAccountForUsersNotDefined';
-							if ($tabtype[$key] == 'payment_salary')			$errorstring = 'MainAccountForUsersNotDefined';
-							if ($tabtype[$key] == 'payment_vat')			$errorstring = 'MainAccountForVatPaymentNotDefined';
-							if ($tabtype[$key] == 'member')					$errorstring = 'MainAccountForSubscriptionPaymentNotDefined';
+							if ($tabtype[$key] == 'payment') {
+								$errorstring = 'MainAccountForCustomersNotDefined';
+							}
+							if ($tabtype[$key] == 'payment_supplier') {
+								$errorstring = 'MainAccountForSuppliersNotDefined';
+							}
+							if ($tabtype[$key] == 'payment_expensereport') {
+								$errorstring = 'MainAccountForUsersNotDefined';
+							}
+							if ($tabtype[$key] == 'payment_salary') {
+								$errorstring = 'MainAccountForUsersNotDefined';
+							}
+							if ($tabtype[$key] == 'payment_vat') {
+								$errorstring = 'MainAccountForVatPaymentNotDefined';
+							}
+							if ($tabtype[$key] == 'member') {
+								$errorstring = 'MainAccountForSubscriptionPaymentNotDefined';
+							}
 							print '<span class="error">'.$langs->trans($errorstring).'</span>';
 						}
-					} else print $accounttoshow;
+					} else {
+						print $accounttoshow;
+					}
 					print "</td>";
 
 					// Subledger account
 					print "<td>";
-					if (in_array($tabtype[$key], array('payment', 'payment_supplier', 'payment_expensereport', 'payment_salary', 'payment_various')))	// Type of payment with subledger
-					{
+					if (in_array($tabtype[$key], array('payment', 'payment_supplier', 'payment_expensereport', 'payment_salary', 'payment_various'))) {	// Type of payment with subledger
 						$accounttoshowsubledger = length_accounta($k);
-						if ($accounttoshow != $accounttoshowsubledger)
-						{
-							if (empty($accounttoshowsubledger) || $accounttoshowsubledger == 'NotDefined')
-							{
+						if ($accounttoshow != $accounttoshowsubledger) {
+							if (empty($accounttoshowsubledger) || $accounttoshowsubledger == 'NotDefined') {
 								/*var_dump($tabpay[$key]);
 								var_dump($tabtype[$key]);
 								var_dump($tabbq[$key]);*/
 								//print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
-								if (!empty($tabcompany[$key]['code_compta']))
-								{
+								if (!empty($tabcompany[$key]['code_compta'])) {
 									if (in_array($tabtype[$key], array('payment_various'))) {
 										// For such case, if subledger is not defined, we won't use subledger accounts.
 										print '<span class="warning">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored").'</span>';
@@ -1164,7 +1197,9 @@ if (empty($action) || $action == 'view') {
 								} else {
 									print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking").'</span>';
 								}
-							} else print $accounttoshowsubledger;
+							} else {
+								print $accounttoshowsubledger;
+							}
 						}
 					}
 					print "</td>";
@@ -1177,10 +1212,11 @@ if (empty($action) || $action == 'view') {
 			}
 		} else {	// Waiting account
 			foreach ($tabbq[$key] as $k => $mt) {
-				if ($mt)
-				{
+				if ($mt) {
 					$reflabel = '';
-					if (!empty($val['lib'])) $reflabel .= $val['lib']." - ";
+					if (!empty($val['lib'])) {
+						$reflabel .= $val['lib']." - ";
+					}
 					$reflabel .= 'WaitingAccount';
 
 					print '<!-- Wait bank.rowid='.$key.' -->';
@@ -1264,78 +1300,67 @@ function getSourceDocRef($val, $typerecord)
 	}
 
 	$sqlmid = '';
-	if ($typerecord == 'payment')
-	{
+	if ($typerecord == 'payment') {
 		$sqlmid = 'SELECT payfac.fk_facture as id, f.ref as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiement_facture as payfac, ".MAIN_DB_PREFIX."facture as f";
 		$sqlmid .= " WHERE payfac.fk_facture = f.rowid AND payfac.fk_paiement=".$val["paymentid"];
 		$ref = $langs->transnoentitiesnoconv("Invoice");
-	} elseif ($typerecord == 'payment_supplier')
-	{
+	} elseif ($typerecord == 'payment_supplier') {
 		$sqlmid = 'SELECT payfac.fk_facturefourn as id, f.ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiementfourn_facturefourn as payfac, ".MAIN_DB_PREFIX."facture_fourn as f";
 		$sqlmid .= " WHERE payfac.fk_facturefourn = f.rowid AND payfac.fk_paiementfourn=".$val["paymentsupplierid"];
 		$ref = $langs->transnoentitiesnoconv("SupplierInvoice");
-	} elseif ($typerecord == 'payment_expensereport')
-	{
+	} elseif ($typerecord == 'payment_expensereport') {
 		$sqlmid = 'SELECT e.rowid as id, e.ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_expensereport as pe, ".MAIN_DB_PREFIX."expensereport as e";
 		$sqlmid .= " WHERE pe.rowid=".$val["paymentexpensereport"]." AND pe.fk_expensereport = e.rowid";
 		$ref = $langs->transnoentitiesnoconv("ExpenseReport");
-	} elseif ($typerecord == 'payment_salary')
-	{
+	} elseif ($typerecord == 'payment_salary') {
 		$sqlmid = 'SELECT s.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_salary as s";
 		$sqlmid .= " WHERE s.rowid=".$val["paymentsalid"];
 		$ref = $langs->transnoentitiesnoconv("SalaryPayment");
-	} elseif ($typerecord == 'sc')
-	{
+	} elseif ($typerecord == 'sc') {
 		$sqlmid = 'SELECT sc.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiementcharge as sc";
 		$sqlmid .= " WHERE sc.rowid=".$val["paymentscid"];
 		$ref = $langs->transnoentitiesnoconv("SocialContribution");
-	} elseif ($typerecord == 'payment_vat')
-	{
+	} elseif ($typerecord == 'payment_vat') {
 		$sqlmid = 'SELECT v.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."tva as v";
 		$sqlmid .= " WHERE v.rowid=".$val["paymentvatid"];
 		$ref = $langs->transnoentitiesnoconv("PaymentVat");
-	} elseif ($typerecord == 'payment_donation')
-	{
+	} elseif ($typerecord == 'payment_donation') {
 		$sqlmid = 'SELECT payd.fk_donation as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_donation as payd";
 		$sqlmid .= " WHERE payd.fk_donation=".$val["paymentdonationid"];
 		$ref = $langs->transnoentitiesnoconv("Donation");
-	} elseif ($typerecord == 'payment_loan')
-	{
+	} elseif ($typerecord == 'payment_loan') {
 		$sqlmid = 'SELECT l.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_loan as l";
 		$sqlmid .= " WHERE l.rowid=".$val["paymentloanid"];
 		$ref = $langs->transnoentitiesnoconv("LoanPayment");
-	} elseif ($typerecord == 'payment_various')
-	{
+	} elseif ($typerecord == 'payment_various') {
 		$sqlmid = 'SELECT v.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_various as v";
 		$sqlmid .= " WHERE v.rowid=".$val["paymentvariousid"];
 		$ref = $langs->transnoentitiesnoconv("VariousPayment");
 	}
 	// Add warning
-	if (empty($sqlmid))
-	{
+	if (empty($sqlmid)) {
 		dol_syslog("Found a typerecord=".$typerecord." not supported", LOG_WARNING);
 	}
 
-	if ($sqlmid)
-	{
+	if ($sqlmid) {
 		dol_syslog("accountancy/journal/bankjournal.php::sqlmid=".$sqlmid, LOG_DEBUG);
 		$resultmid = $db->query($sqlmid);
-		if ($resultmid)
-		{
-			while ($objmid = $db->fetch_object($resultmid))
-			{
+		if ($resultmid) {
+			while ($objmid = $db->fetch_object($resultmid)) {
 				$ref .= ' '.$objmid->ref;
 			}
-		} else dol_print_error($db);
+		} else {
+			dol_print_error($db);
+		}
 	}
 
 	$ref = dol_trunc($langs->transnoentitiesnoconv("BankId").' '.$val['fk_bank'].' - '.$ref, 295); // 295 + 3 dots (...) is < than max size of 300
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index bf8275cee1c..26e2b4cdf77 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -110,11 +110,11 @@ if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
 // Already in bookkeeping or not
 if ($in_bookkeeping == 'already')
 {
-    $sql .= " AND er.rowid IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab  WHERE ab.doc_type='expense_report')";
+	$sql .= " AND er.rowid IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab  WHERE ab.doc_type='expense_report')";
 }
 if ($in_bookkeeping == 'notyet')
 {
-    $sql .= " AND er.rowid NOT IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab  WHERE ab.doc_type='expense_report')";
+	$sql .= " AND er.rowid NOT IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab  WHERE ab.doc_type='expense_report')";
 }
 $sql .= " ORDER BY er.date_debut";
 
@@ -370,8 +370,8 @@ if ($action == 'writebookkeeping') {
 
 			if ($error >= 10)
 			{
-			    setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped"), null, 'errors');
-			    break; // Break in the foreach
+				setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped"), null, 'errors');
+				break; // Break in the foreach
 			}
 		}
 	}
@@ -433,48 +433,48 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 	print "\n";
 
 	foreach ($taber as $key => $val) {
-	    $date = dol_print_date($val["date"], 'day');
+		$date = dol_print_date($val["date"], 'day');
 
-	    $userstatic->id = $tabuser[$key]['id'];
-	    $userstatic->name = $tabuser[$key]['name'];
+		$userstatic->id = $tabuser[$key]['id'];
+		$userstatic->name = $tabuser[$key]['name'];
 
-	    // Fees
-	    foreach ($tabht[$key] as $k => $mt) {
-	        $accountingaccount = new AccountingAccount($db);
-	        $accountingaccount->fetch(null, $k, true);
-	        if ($mt) {
-	            print '"'.$date.'"'.$sep;
-	            print '"'.$val["ref"].'"'.$sep;
-	            print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
-	            print '"'.dol_trunc($accountingaccount->label, 32).'"'.$sep;
-	            print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
-	            print '"'.($mt < 0 ? price(-$mt) : '').'"';
-	            print "\n";
-	        }
-	    }
-	    // VAT
-	    foreach ($tabtva[$key] as $k => $mt) {
-	        if ($mt) {
-	            print '"'.$date.'"'.$sep;
-	            print '"'.$val["ref"].'"'.$sep;
-	            print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
-	            print '"'.dol_trunc($langs->trans("VAT")).'"'.$sep;
-	            print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
-	            print '"'.($mt < 0 ? price(-$mt) : '').'"';
-	            print "\n";
-	        }
-	    }
+		// Fees
+		foreach ($tabht[$key] as $k => $mt) {
+			$accountingaccount = new AccountingAccount($db);
+			$accountingaccount->fetch(null, $k, true);
+			if ($mt) {
+				print '"'.$date.'"'.$sep;
+				print '"'.$val["ref"].'"'.$sep;
+				print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
+				print '"'.dol_trunc($accountingaccount->label, 32).'"'.$sep;
+				print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
+				print '"'.($mt < 0 ? price(-$mt) : '').'"';
+				print "\n";
+			}
+		}
+		// VAT
+		foreach ($tabtva[$key] as $k => $mt) {
+			if ($mt) {
+				print '"'.$date.'"'.$sep;
+				print '"'.$val["ref"].'"'.$sep;
+				print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
+				print '"'.dol_trunc($langs->trans("VAT")).'"'.$sep;
+				print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
+				print '"'.($mt < 0 ? price(-$mt) : '').'"';
+				print "\n";
+			}
+		}
 
-	    // Third party
-	    foreach ($tabttc[$key] as $k => $mt) {
-	        print '"'.$date.'"'.$sep;
-	        print '"'.$val["ref"].'"'.$sep;
-	        print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
-	        print '"'.dol_trunc($userstatic->name).'"'.$sep;
-	        print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
-	        print '"'.($mt >= 0 ? price($mt) : '').'"';
-	    }
-	    print "\n";
+		// Third party
+		foreach ($tabttc[$key] as $k => $mt) {
+			print '"'.$date.'"'.$sep;
+			print '"'.$val["ref"].'"'.$sep;
+			print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
+			print '"'.dol_trunc($userstatic->name).'"'.$sep;
+			print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
+			print '"'.($mt >= 0 ? price($mt) : '').'"';
+		}
+		print "\n";
 	}
 }
 
@@ -489,8 +489,8 @@ if (empty($action) || $action == 'view') {
 	$description .= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
 
 	$listofchoices = array('notyet'=>$langs->trans("NotYetInGeneralLedger"), 'already'=>$langs->trans("AlreadyInGeneralLedger"));
-    $period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
-    $period .= ' -  '.$langs->trans("JournalizationInLedgerStatus").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
+	$period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
+	$period .= ' -  '.$langs->trans("JournalizationInLedgerStatus").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
 
 	$varlink = 'id_journal='.$id_journal;
 
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 8e409b497b5..94f878527dd 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -669,7 +669,7 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 					print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
 					print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
 					print '""'.$sep;
-					print '"'.$langs->trans("VAT").' - '.$def_tva[$key].'"'.$sep;
+					print '"'.$langs->trans("VAT").' - '.join(', ', $def_tva[$key][$k]).' %"'.$sep;
 					print '"'.utf8_decode(dol_trunc($companystatic->name, 16)).' - '.$val["refsuppliersologest"].' - '.$langs->trans("VAT").join(', ', $def_tva[$key][$k]).' %'.($numtax ? ' - Localtax '.$numtax : '').'"'.$sep;
 					print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
 					print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
@@ -719,8 +719,8 @@ if (empty($action) || $action == 'view') {
 	}
 
 	$listofchoices = array('notyet'=>$langs->trans("NotYetInGeneralLedger"), 'already'=>$langs->trans("AlreadyInGeneralLedger"));
-    $period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
-    $period .= ' -  '.$langs->trans("JournalizationInLedgerStatus").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
+	$period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
+	$period .= ' -  '.$langs->trans("JournalizationInLedgerStatus").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
 
 	$varlink = 'id_journal='.$id_journal;
 
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 589bad72749..9f44e02aafa 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -130,7 +130,7 @@ if ($in_bookkeeping == 'already')
 if ($in_bookkeeping == 'notyet')
 {
 	$sql .= " AND f.rowid NOT IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='customer_invoice')";
-    // $sql .= " AND fd.rowid NOT IN (SELECT fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab WHERE ab.doc_type='customer_invoice')";		// Useless, we save one line for all products with same account
+	// $sql .= " AND fd.rowid NOT IN (SELECT fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab WHERE ab.doc_type='customer_invoice')";		// Useless, we save one line for all products with same account
 }
 $sql .= " ORDER BY f.datef";
 //print $sql;
@@ -628,7 +628,7 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 					print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
 					print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
 					print '""'.$sep;
-					print '"'.$langs->trans("VAT").' - '.$def_tva[$key].' %"'.$sep;
+					print '"'.$langs->trans("VAT").' - '.join(', ', $def_tva[$key][$k]).' %"'.$sep;
 					print '"'.utf8_decode(dol_trunc($companystatic->name, 16)).' - '.$invoicestatic->ref.' - '.$langs->trans("VAT").join(', ', $def_tva[$key][$k]).' %'.($numtax ? ' - Localtax '.$numtax : '').'"'.$sep;
 					print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
 					print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
@@ -658,8 +658,8 @@ if (empty($action) || $action == 'view') {
 	}
 
 	$listofchoices = array('notyet'=>$langs->trans("NotYetInGeneralLedger"), 'already'=>$langs->trans("AlreadyInGeneralLedger"));
-    $period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
-    $period .= ' -  '.$langs->trans("JournalizationInLedgerStatus").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
+	$period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
+	$period .= ' -  '.$langs->trans("JournalizationInLedgerStatus").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
 
 	$varlink = 'id_journal='.$id_journal;
 
diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php
index 4a4747cfaf4..f958004b813 100644
--- a/htdocs/accountancy/supplier/card.php
+++ b/htdocs/accountancy/supplier/card.php
@@ -54,7 +54,7 @@ if ($action == 'ventil' && $user->rights->accounting->bind->write)
 {
 	if (!$cancel)
 	{
-	    if ($codeventil < 0) $codeventil = 0;
+		if ($codeventil < 0) $codeventil = 0;
 
 		$sql = " UPDATE ".MAIN_DB_PREFIX."facture_fourn_det";
 		$sql .= " SET fk_code_ventilation = ".$codeventil;
@@ -64,12 +64,12 @@ if ($action == 'ventil' && $user->rights->accounting->bind->write)
 		if (!$resql) {
 			setEventMessages($db->lasterror(), null, 'errors');
 		} else {
-		    setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-		    if ($backtopage)
-		    {
-		    	header("Location: ".$backtopage);
-		    	exit();
-		    }
+			setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
+			if ($backtopage)
+			{
+				header("Location: ".$backtopage);
+				exit();
+			}
 		}
 	} else {
 		header("Location: ./lines.php");
@@ -121,7 +121,7 @@ if (!empty($id)) {
 
 			print load_fiche_titre($langs->trans('SuppliersVentilation'), '', 'title_accountancy');
 
-			dol_fiche_head();
+			print dol_get_fiche_head();
 
 			print '<table class="border centpercent">';
 
@@ -141,12 +141,12 @@ if (!empty($id)) {
 			print '</td></tr>';
 			print '</table>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
-			print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
+			print '<input class="button button-save" type="submit" value="'.$langs->trans("Save").'">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-			print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
+			print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
 			print '</div>';
 
 			print '</form>';
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 903d2188a80..e23d9f9868a 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -135,7 +135,7 @@ if (is_array($changeaccount) && count($changeaccount) > 0) {
 		}
 		if (!$error) {
 			$db->commit();
-			setEventMessages($langs->trans('Save'), null, 'mesgs');
+			setEventMessages($langs->trans("Save"), null, 'mesgs');
 		} else {
 			$db->rollback();
 			setEventMessages($db->lasterror(), null, 'errors');
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 96b36fa8fa3..cbdecd2e85e 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -358,12 +358,6 @@ if ($result) {
 
 	print '<span class="opacitymedium">'.$langs->trans("DescVentilTodoCustomer").'</span></br><br>';
 
-	/*$topicmail="Information";
-	 $modelmail="project";
-	 $objecttmp=new Project($db);
-	 $trackid='prj'.$object->id;
-	 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';*/
-
 	if ($msg) print $msg.'<br>';
 
 	$moreforfilter = '';
diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index f2c52daa4b0..8acf1f1b191 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -7,7 +7,8 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011-2012 Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2012      J. Fernando Lagrange <fernando@demo-tic.org>
- * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2015      Jean-François Ferry  <jfefe@aternatik.fr>
+ * Copyright (C) 2020       Frédéric 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
@@ -39,7 +40,12 @@ $langs->loadLangs(array("admin", "members"));
 if (!$user->admin) accessforbidden();
 
 
-$type = array('yesno', 'texte', 'chaine');
+$choices = array('yesno', 'texte', 'chaine');
+
+$value = GETPOST('value', 'alpha');
+$label = GETPOST('label', 'alpha');
+$scandir = GETPOST('scandir', 'alpha');
+$type = 'member';
 
 $action = GETPOST('action', 'aZ09');
 
@@ -48,29 +54,71 @@ $action = GETPOST('action', 'aZ09');
  * Actions
  */
 
-//
-if ($action == 'updateall') {
-    $db->begin();
-    $res1 = $res2 = $res3 = $res4 = $res5 = $res6 = 0;
-    $res1 = dolibarr_set_const($db, 'ADHERENT_LOGIN_NOT_REQUIRED', GETPOST('ADHERENT_LOGIN_NOT_REQUIRED', 'alpha') ? 0 : 1, 'chaine', 0, '', $conf->entity);
-    $res2 = dolibarr_set_const($db, 'ADHERENT_MAIL_REQUIRED', GETPOST('ADHERENT_MAIL_REQUIRED', 'alpha'), 'chaine', 0, '', $conf->entity);
-    $res3 = dolibarr_set_const($db, 'ADHERENT_DEFAULT_SENDINFOBYMAIL', GETPOST('ADHERENT_DEFAULT_SENDINFOBYMAIL', 'alpha'), 'chaine', 0, '', $conf->entity);
-    $res4 = dolibarr_set_const($db, 'ADHERENT_BANK_USE', GETPOST('ADHERENT_BANK_USE', 'alpha'), 'chaine', 0, '', $conf->entity);
-    // Use vat for invoice creation
-    if ($conf->facture->enabled) {
-        $res4 = dolibarr_set_const($db, 'ADHERENT_VAT_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_VAT_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
-        $res5 = dolibarr_set_const($db, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
-        if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
-            $res6 = dolibarr_set_const($db, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
-        }
-    }
-    if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0) {
-        setEventMessages('ErrorFailedToSaveDate', null, 'errors');
-        $db->rollback();
-    } else {
-        setEventMessages('RecordModifiedSuccessfully', null, 'mesgs');
-        $db->commit();
-    }
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
+if ($action == 'set_default') {
+	$ret = addDocumentModel($value, $type, $label, $scandir);
+	$res = true;
+} elseif ($action == 'del_default') {
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0) {
+		if ($conf->global->MEMBER_ADDON_PDF_ODT == "$value") {
+			dolibarr_del_const($db, 'MEMBER_ADDON_PDF_ODT', $conf->entity);
+		}
+	}
+	$res = true;
+} elseif ($action == 'setdoc') {
+	// Set default model
+	if (dolibarr_set_const($db, "MEMBER_ADDON_PDF_ODT", $value, 'chaine', 0, '', $conf->entity)) {
+		// La constante qui a ete lue en avant du nouveau set
+		// on passe donc par une variable pour avoir un affichage coherent
+		$conf->global->MEMBER_ADDON_PDF_ODT = $value;
+	}
+
+	// On active le modele
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0) {
+		$ret = addDocumentModel($value, $type, $label, $scandir);
+	}
+	$res = true;
+} elseif (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg)) {
+	$code = $reg[1];
+	if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0) {
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	} else {
+		dol_print_error($db);
+	}
+} elseif (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg)) {
+	$code = $reg[1];
+	if (dolibarr_del_const($db, $code, $conf->entity) > 0) {
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	} else {
+		dol_print_error($db);
+	}
+} elseif ($action == 'updateall') {
+	$db->begin();
+	$res1 = $res2 = $res3 = $res4 = $res5 = $res6 = 0;
+	$res1 = dolibarr_set_const($db, 'ADHERENT_LOGIN_NOT_REQUIRED', GETPOST('ADHERENT_LOGIN_NOT_REQUIRED', 'alpha') ? 0 : 1, 'chaine', 0, '', $conf->entity);
+	$res2 = dolibarr_set_const($db, 'ADHERENT_MAIL_REQUIRED', GETPOST('ADHERENT_MAIL_REQUIRED', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res3 = dolibarr_set_const($db, 'ADHERENT_DEFAULT_SENDINFOBYMAIL', GETPOST('ADHERENT_DEFAULT_SENDINFOBYMAIL', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res4 = dolibarr_set_const($db, 'ADHERENT_BANK_USE', GETPOST('ADHERENT_BANK_USE', 'alpha'), 'chaine', 0, '', $conf->entity);
+	// Use vat for invoice creation
+	if ($conf->facture->enabled) {
+		$res4 = dolibarr_set_const($db, 'ADHERENT_VAT_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_VAT_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
+		$res5 = dolibarr_set_const($db, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
+		if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+			$res6 = dolibarr_set_const($db, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
+		}
+	}
+	if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0) {
+		setEventMessages('ErrorFailedToSaveDate', null, 'errors');
+		$db->rollback();
+	} else {
+		setEventMessages('RecordModifiedSuccessfully', null, 'mesgs');
+		$db->commit();
+	}
 }
 
 // Action to update or add a constant
@@ -86,7 +134,7 @@ if ($action == 'update' || $action == 'add') {
 
 	$consttype = GETPOST('consttype', 'alpha');
 	$constnote = GETPOST('constnote');
-	$res = dolibarr_set_const($db, $constname, $constvalue, $type[$consttype], 0, $constnote, $conf->entity);
+	$res = dolibarr_set_const($db, $constname, $constvalue, $choices[$consttype], 0, $constnote, $conf->entity);
 
 	if (!$res > 0) $error++;
 
@@ -99,18 +147,18 @@ if ($action == 'update' || $action == 'add') {
 
 // Action to enable of a submodule of the adherent module
 if ($action == 'set') {
-    $result = dolibarr_set_const($db, GETPOST('name', 'alpha'), GETPOST('value'), '', 0, '', $conf->entity);
-    if ($result < 0) {
-        print $db->error();
-    }
+	$result = dolibarr_set_const($db, GETPOST('name', 'alpha'), GETPOST('value'), '', 0, '', $conf->entity);
+	if ($result < 0) {
+		print $db->error();
+	}
 }
 
 // Action to disable a submodule of the adherent module
 if ($action == 'unset') {
-    $result = dolibarr_del_const($db, GETPOST('name', 'alpha'), $conf->entity);
-    if ($result < 0) {
-        print $db->error();
-    }
+	$result = dolibarr_del_const($db, GETPOST('name', 'alpha'), $conf->entity);
+	if ($result < 0) {
+		print $db->error();
+	}
 }
 
 
@@ -132,7 +180,7 @@ print load_fiche_titre($langs->trans("MembersSetup"), $linkback, 'title_setup');
 
 $head = member_admin_prepare_head();
 
-dol_fiche_head($head, 'general', $langs->trans("Members"), -1, 'user');
+print dol_get_fiche_head($head, 'general', $langs->trans("Members"), -1, 'user');
 
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -169,7 +217,7 @@ if (!empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty(
 print '<td>';
 print $form->selectarray('ADHERENT_BANK_USE', $arraychoices, $conf->global->ADHERENT_BANK_USE, 0);
 if ($conf->global->ADHERENT_BANK_USE == 'bankdirect' || $conf->global->ADHERENT_BANK_USE == 'bankviainvoice') {
-    print '<br><div style="padding-top: 5px;"><span class="opacitymedium">'.$langs->trans("ABankAccountMustBeDefinedOnPaymentModeSetup").'</span></div>';
+	print '<br><div style="padding-top: 5px;"><span class="opacitymedium">'.$langs->trans("ABankAccountMustBeDefinedOnPaymentModeSetup").'</span></div>';
 }
 print '</td>';
 print "</tr>\n";
@@ -245,8 +293,139 @@ $helptext .= '__COMPANY__, __ADDRESS__, __ZIP__, __TOWN__, __COUNTRY__, __EMAIL_
 $helptext .= '__YEAR__, __MONTH__, __DAY__';
 
 form_constantes($constantes, 0, $helptext);
+$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
-dol_fiche_end();
+// Defini tableau def des modeles
+$def = array();
+$sql = "SELECT nom";
+$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
+$sql .= " WHERE type = '".$db->escape($type)."'";
+$sql .= " AND entity = ".$conf->entity;
+$resql = $db->query($sql);
+if ($resql) {
+	$i = 0;
+	$num_rows = $db->num_rows($resql);
+	while ($i < $num_rows) {
+		$array = $db->fetch_array($resql);
+		array_push($def, $array[0]);
+		$i++;
+	}
+} else {
+	dol_print_error($db);
+}
+
+print load_fiche_titre($langs->trans("MembersDocModules"), '', '');
+
+print '<table class="noborder centpercent">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Name").'</td>';
+print '<td>'.$langs->trans("Description").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Status")."</td>\n";
+print '<td align="center" width="60">'.$langs->trans("Default")."</td>\n";
+print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="80">'.$langs->trans("Preview").'</td>';
+print "</tr>\n";
+
+clearstatcache();
+
+foreach ($dirmodels as $reldir) {
+	foreach (array('', '/doc') as $valdir) {
+		$dir = dol_buildpath($reldir."core/modules/member".$valdir);
+		if (is_dir($dir)) {
+			$handle = opendir($dir);
+			if (is_resource($handle)) {
+				while (($file = readdir($handle)) !== false) {
+					$filelist[] = $file;
+				}
+				closedir($handle);
+				arsort($filelist);
+				foreach ($filelist as $file) {
+					if (preg_match('/\.class\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file)) {
+						if (file_exists($dir.'/'.$file)) {
+							$name = substr($file, 4, dol_strlen($file) - 14);
+							$classname = substr($file, 0, dol_strlen($file) - 10);
+
+							require_once $dir.'/'.$file;
+							$module = new $classname($db);
+
+							$modulequalified = 1;
+							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
+							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+								$modulequalified = 0;
+							}
+
+							if ($modulequalified) {
+								print '<tr class="oddeven"><td width="100">';
+								print (empty($module->name) ? $name : $module->name);
+								print "</td><td>\n";
+								if (method_exists($module, 'info')) {
+									print $module->info($langs);
+								} else {
+									print $module->description;
+								}
+								print '</td>';
+
+								// Active
+								if (in_array($name, $def)) {
+									print '<td class="center">'."\n";
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=del_default&amp;token='.newToken().'&amp;value='.$name.'">';
+									print img_picto($langs->trans("Enabled"), 'switch_on');
+									print '</a>';
+									print '</td>';
+								} else {
+									print '<td class="center">'."\n";
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=set_default&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print "</td>";
+								}
+
+								// Defaut
+								print '<td class="center">';
+								if ($conf->global->MEMBER_ADDON_PDF == $name) {
+									print img_picto($langs->trans("Default"), 'on');
+								} else {
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+								}
+								print '</td>';
+
+								// Info
+								$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+								$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+								if ($module->type == 'pdf') {
+									$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+								}
+								$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+								$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+								$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
+
+
+								print '<td class="center">';
+								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print '</td>';
+
+								// Preview
+								print '<td class="center">';
+								if ($module->type == 'pdf')
+								{
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
+								} else {
+									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+								}
+								print '</td>';
+
+								print "</tr>\n";
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+print '</table>';
+print "<br>";
+
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/adherents/admin/adherent_emails.php b/htdocs/adherents/admin/adherent_emails.php
index a3550e4a35a..4374d281895 100644
--- a/htdocs/adherents/admin/adherent_emails.php
+++ b/htdocs/adherents/admin/adherent_emails.php
@@ -119,7 +119,7 @@ print load_fiche_titre($langs->trans("MembersSetup"), $linkback, 'title_setup');
 
 $head = member_admin_prepare_head();
 
-dol_fiche_head($head, 'emails', $langs->trans("Members"), -1, 'user');
+print dol_get_fiche_head($head, 'emails', $langs->trans("Members"), -1, 'user');
 
 // TODO Use global form
 //print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
@@ -136,7 +136,7 @@ form_constantes($constantes, 0, $helptext);
 //print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
 //print '</form>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php
index 8ca29286cab..a391770fdd5 100644
--- a/htdocs/adherents/admin/adherent_extrafields.php
+++ b/htdocs/adherents/admin/adherent_extrafields.php
@@ -70,11 +70,11 @@ print load_fiche_titre($langs->trans("MembersSetup"), $linkback, 'title_setup');
 
 $head = member_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Members"), -1, 'user');
+print dol_get_fiche_head($head, 'attributes', $langs->trans("Members"), -1, 'user');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
@@ -95,7 +95,7 @@ if ($action == 'create') {
 	print '<div name="topofform"></div><br>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -107,7 +107,7 @@ if ($action == 'edit' && !empty($attrname)) {
 	print '<div name="topofform"></div><br>';
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/adherents/admin/adherent_type_extrafields.php b/htdocs/adherents/admin/adherent_type_extrafields.php
index 5546a99a334..92b5ed990e3 100644
--- a/htdocs/adherents/admin/adherent_type_extrafields.php
+++ b/htdocs/adherents/admin/adherent_type_extrafields.php
@@ -73,11 +73,11 @@ print load_fiche_titre($langs->trans("MembersSetup"), $linkback, 'title_setup');
 
 $head = member_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes_type', $langs->trans("Members"), -1, 'user');
+print dol_get_fiche_head($head, 'attributes_type', $langs->trans("Members"), -1, 'user');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index d030c73f530..d0cdb098bae 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -54,22 +54,22 @@ if ($action == 'update') {
 	$payonline = GETPOST('MEMBER_NEWFORM_PAYONLINE');
 	$forcetype = GETPOST('MEMBER_NEWFORM_FORCETYPE');
 
-    $res = dolibarr_set_const($db, "MEMBER_ENABLE_PUBLIC", $public, 'chaine', 0, '', $conf->entity);
-    $res = dolibarr_set_const($db, "MEMBER_NEWFORM_AMOUNT", $amount, 'chaine', 0, '', $conf->entity);
-    $res = dolibarr_set_const($db, "MEMBER_NEWFORM_EDITAMOUNT", $editamount, 'chaine', 0, '', $conf->entity);
-    $res = dolibarr_set_const($db, "MEMBER_NEWFORM_PAYONLINE", $payonline, 'chaine', 0, '', $conf->entity);
-    if ($forcetype < 0) $res = dolibarr_del_const($db, "MEMBER_NEWFORM_FORCETYPE", $conf->entity);
-    else {
-        $res = dolibarr_set_const($db, "MEMBER_NEWFORM_FORCETYPE", $forcetype, 'chaine', 0, '', $conf->entity);
-    }
+	$res = dolibarr_set_const($db, "MEMBER_ENABLE_PUBLIC", $public, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "MEMBER_NEWFORM_AMOUNT", $amount, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "MEMBER_NEWFORM_EDITAMOUNT", $editamount, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "MEMBER_NEWFORM_PAYONLINE", $payonline, 'chaine', 0, '', $conf->entity);
+	if ($forcetype < 0) $res = dolibarr_del_const($db, "MEMBER_NEWFORM_FORCETYPE", $conf->entity);
+	else {
+		$res = dolibarr_set_const($db, "MEMBER_NEWFORM_FORCETYPE", $forcetype, 'chaine', 0, '', $conf->entity);
+	}
 
-    if (!$res > 0) $error++;
+	if (!$res > 0) $error++;
 
  	if (!$error) {
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-	    setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 
@@ -94,11 +94,11 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="action" value="update">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
-dol_fiche_head($head, 'website', $langs->trans("Members"), -1, 'user');
+print dol_get_fiche_head($head, 'website', $langs->trans("Members"), -1, 'user');
 
 if ($conf->use_javascript_ajax) {
-    print "\n".'<script type="text/javascript" language="javascript">';
-    print 'jQuery(document).ready(function () {
+	print "\n".'<script type="text/javascript" language="javascript">';
+	print 'jQuery(document).ready(function () {
                 function initemail()
                 {
                     if (jQuery("#MEMBER_NEWFORM_PAYONLINE").val()==\'-1\')
@@ -127,7 +127,7 @@ if ($conf->use_javascript_ajax) {
                 jQuery("#MEMBER_ENABLE_PUBLIC").change(function() { initfields(); });
                 jQuery("#MEMBER_NEWFORM_PAYONLINE").change(function() { initemail(); });
 			})';
-    print '</script>'."\n";
+	print '</script>'."\n";
 }
 
 
@@ -208,7 +208,7 @@ if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 }
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '</form>';
 
diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php
index a7e7a6f3634..2e74fdde9be 100644
--- a/htdocs/adherents/agenda.php
+++ b/htdocs/adherents/agenda.php
@@ -65,8 +65,8 @@ $result = $object->fetch($id);
 if ($result > 0) {
 	$object->fetch_thirdparty();
 
-    $adht = new AdherentType($db);
-    $result = $adht->fetch($object->typeid);
+	$adht = new AdherentType($db);
+	$result = $adht->fetch($object->typeid);
 }
 
 
@@ -79,17 +79,17 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook)) {
-    // Cancel
-    if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
-        header("Location: ".$backtopage);
-        exit;
-    }
+	// Cancel
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
+		header("Location: ".$backtopage);
+		exit;
+	}
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
 		$actioncode = '';
-        $search_agenda_label = '';
-    }
+		$search_agenda_label = '';
+	}
 }
 
 
@@ -118,7 +118,7 @@ if ($object->id > 0) {
 	if (!empty($conf->notification->enabled)) $langs->load("mails");
 	$head = member_prepare_head($object);
 
-	dol_fiche_head($head, 'agenda', $langs->trans("Member"), -1, 'user');
+	print dol_get_fiche_head($head, 'agenda', $langs->trans("Member"), -1, 'user');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -133,34 +133,34 @@ if ($object->id > 0) {
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
-    //print '<div class="tabsAction">';
-    //print '</div>';
+	//print '<div class="tabsAction">';
+	//print '</div>';
 
 
 	$newcardbutton = '';
-    if (!empty($conf->agenda->enabled)) {
-        $newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&backtopage=1&origin=member&originid='.$id);
-    }
+	if (!empty($conf->agenda->enabled)) {
+		$newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&backtopage=1&origin=member&originid='.$id);
+	}
 
-    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
-    	print '<br>';
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+		print '<br>';
 
-    	$param = '&id='.$id;
-    	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-    	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+		$param = '&id='.$id;
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
-    	print_barre_liste($langs->trans("ActionsOnMember"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', '', $newcardbutton, '', 0, 1, 1);
+		print_barre_liste($langs->trans("ActionsOnMember"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', '', $newcardbutton, '', 0, 1, 1);
 
-    	// List of all actions
-    	$filters = array();
-    	$filters['search_agenda_label'] = $search_agenda_label;
+		// List of all actions
+		$filters = array();
+		$filters['search_agenda_label'] = $search_agenda_label;
 
-    	// TODO Replace this with same code than into list.php
-    	show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
-    }
+		// TODO Replace this with same code than into list.php
+		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
+	}
 }
 
 // End of page
diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
index aa9797959a7..46c4b07b57c 100644
--- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php
+++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
@@ -27,15 +27,15 @@
  */
 abstract class ActionsAdherentCardCommon
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $dirmodule;
-    public $targetmodule;
-    public $canvas;
-    public $card;
+	public $dirmodule;
+	public $targetmodule;
+	public $canvas;
+	public $card;
 
 	//! Template container
 	public $tpl = array();
@@ -54,52 +54,52 @@ abstract class ActionsAdherentCardCommon
 
 
 	/**
-     *  Get object
+	 *  Get object
 	 *
-     *  @param	int		$id		Object id
-     *  @return	object			Object loaded
-     */
-    public function getObject($id)
-    {
-    	//$ret = $this->getInstanceDao();
+	 *  @param	int		$id		Object id
+	 *  @return	object			Object loaded
+	 */
+	public function getObject($id)
+	{
+		//$ret = $this->getInstanceDao();
 
-    	/*if (is_object($this->object) && method_exists($this->object,'fetch'))
+		/*if (is_object($this->object) && method_exists($this->object,'fetch'))
     	{
     		if (! empty($id)) $this->object->fetch($id);
     	}
     	else
     	{*/
-    		$object = new Adherent($this->db);
-    		if (!empty($id)) $object->fetch($id);
-            $this->object = $object;
-    	//}
-    }
+			$object = new Adherent($this->db);
+			if (!empty($id)) $object->fetch($id);
+			$this->object = $object;
+		//}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Set content of ->tpl array, to use into template
-     *
-     *  @param	string		$action    Type of action
-     *  @param	int			$id			Id
-     *  @return	string					HTML output
-     */
-    public function assign_values(&$action, $id)
-    {
-        // phpcs:enable
-        global $conf, $langs, $user, $canvas;
-        global $form, $formcompany, $objsoc;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Set content of ->tpl array, to use into template
+	 *
+	 *  @param	string		$action    Type of action
+	 *  @param	int			$id			Id
+	 *  @return	string					HTML output
+	 */
+	public function assign_values(&$action, $id)
+	{
+		// phpcs:enable
+		global $conf, $langs, $user, $canvas;
+		global $form, $formcompany, $objsoc;
 
-        if ($action == 'add' || $action == 'update') $this->assign_post();
+		if ($action == 'add' || $action == 'update') $this->assign_post();
 
-        foreach ($this->object as $key => $value) {
-            $this->tpl[$key] = $value;
-        }
+		foreach ($this->object as $key => $value) {
+			$this->tpl[$key] = $value;
+		}
 
-        $this->tpl['error'] = $this->error;
-        $this->tpl['errors'] = $this->errors;
+		$this->tpl['error'] = $this->error;
+		$this->tpl['errors'] = $this->errors;
 
-        if ($action == 'create' || $action == 'edit') {
-        	if ($conf->use_javascript_ajax) {
+		if ($action == 'create' || $action == 'edit') {
+			if ($conf->use_javascript_ajax) {
 				$this->tpl['ajax_selectcountry'] = "\n".'<script type="text/javascript" language="javascript">
 				jQuery(document).ready(function () {
 						jQuery("#selectcountry_id").change(function() {
@@ -111,153 +111,153 @@ abstract class ActionsAdherentCardCommon
 				</script>'."\n";
 			}
 
-        	if (is_object($objsoc) && $objsoc->id > 0) {
-        		$this->tpl['company'] = $objsoc->getNomUrl(1);
-        		$this->tpl['company_id'] = $objsoc->id;
-        	} else {
-        		$this->tpl['company'] = $form->select_company($this->object->socid, 'socid', '', 1);
-        	}
+			if (is_object($objsoc) && $objsoc->id > 0) {
+				$this->tpl['company'] = $objsoc->getNomUrl(1);
+				$this->tpl['company_id'] = $objsoc->id;
+			} else {
+				$this->tpl['company'] = $form->select_company($this->object->socid, 'socid', '', 1);
+			}
 
-        	// Civility
-        	$this->tpl['select_civility'] = $formcompany->select_civility($this->object->civility_id);
+			// Civility
+			$this->tpl['select_civility'] = $formcompany->select_civility($this->object->civility_id);
 
-        	// Predefined with third party
-        	if ((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE')) {
-        		if (dol_strlen(trim($this->object->address)) == 0) $this->tpl['address'] = $objsoc->address;
-        		if (dol_strlen(trim($this->object->zip)) == 0) $this->object->zip = $objsoc->zip;
-        		if (dol_strlen(trim($this->object->town)) == 0) $this->object->town = $objsoc->town;
-        		if (dol_strlen(trim($this->object->phone_perso)) == 0) $this->object->phone_perso = $objsoc->phone;
-        		if (dol_strlen(trim($this->object->phone_mobile)) == 0) $this->object->phone_mobile = $objsoc->phone_mobile;
-        		if (dol_strlen(trim($this->object->email)) == 0) $this->object->email = $objsoc->email;
-        	}
+			// Predefined with third party
+			if ((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE')) {
+				if (dol_strlen(trim($this->object->address)) == 0) $this->tpl['address'] = $objsoc->address;
+				if (dol_strlen(trim($this->object->zip)) == 0) $this->object->zip = $objsoc->zip;
+				if (dol_strlen(trim($this->object->town)) == 0) $this->object->town = $objsoc->town;
+				if (dol_strlen(trim($this->object->phone_perso)) == 0) $this->object->phone_perso = $objsoc->phone;
+				if (dol_strlen(trim($this->object->phone_mobile)) == 0) $this->object->phone_mobile = $objsoc->phone_mobile;
+				if (dol_strlen(trim($this->object->email)) == 0) $this->object->email = $objsoc->email;
+			}
 
-            // Zip
-            $this->tpl['select_zip'] = $formcompany->select_ziptown($this->object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
+			// Zip
+			$this->tpl['select_zip'] = $formcompany->select_ziptown($this->object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
 
-            // Town
-            $this->tpl['select_town'] = $formcompany->select_ziptown($this->object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
+			// Town
+			$this->tpl['select_town'] = $formcompany->select_ziptown($this->object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
 
-            if (dol_strlen(trim($this->object->country_id)) == 0) $this->object->country_id = $objsoc->country_id;
+			if (dol_strlen(trim($this->object->country_id)) == 0) $this->object->country_id = $objsoc->country_id;
 
-            // Country
-            $this->tpl['select_country'] = $form->select_country($this->object->country_id, 'country_id');
-            $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
+			// Country
+			$this->tpl['select_country'] = $form->select_country($this->object->country_id, 'country_id');
+			$countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
-            if ($user->admin) $this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			if ($user->admin) $this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 
-            // State
-            if ($this->object->country_id) $this->tpl['select_state'] = $formcompany->select_state($this->object->state_id, $this->object->country_code);
-            else $this->tpl['select_state'] = $countrynotdefined;
+			// State
+			if ($this->object->country_id) $this->tpl['select_state'] = $formcompany->select_state($this->object->state_id, $this->object->country_code);
+			else $this->tpl['select_state'] = $countrynotdefined;
 
-            // Physical or Moral
-            $selectarray = array('0'=>$langs->trans("Physical"), '1'=>$langs->trans("Moral"));
-            $this->tpl['select_morphy'] = $form->selectarray('morphy', $selectarray, $this->object->morphy, 0);
-        }
+			// Physical or Moral
+			$selectarray = array('0'=>$langs->trans("Physical"), '1'=>$langs->trans("Moral"));
+			$this->tpl['select_morphy'] = $form->selectarray('morphy', $selectarray, $this->object->morphy, 0);
+		}
 
-        if ($action == 'view' || $action == 'edit' || $action == 'delete') {
-        	// Emailing
-        	if (!empty($conf->mailing->enabled)) {
+		if ($action == 'view' || $action == 'edit' || $action == 'delete') {
+			// Emailing
+			if (!empty($conf->mailing->enabled)) {
 				$langs->load("mails");
 				$this->tpl['nb_emailing'] = $this->object->getNbOfEMailings();
 			}
 
-        	// Dolibarr user
-        	if ($this->object->user_id) {
+			// Dolibarr user
+			if ($this->object->user_id) {
 				$dolibarr_user = new User($this->db);
 				$result = $dolibarr_user->fetch($this->object->user_id);
 				$this->tpl['dolibarr_user'] = $dolibarr_user->getLoginUrl(1);
 			} else $this->tpl['dolibarr_user'] = $langs->trans("NoDolibarrAccess");
-        }
+		}
 
-        if ($action == 'view' || $action == 'delete') {
-        	$this->tpl['showrefnav'] = $form->showrefnav($this->object, 'id');
+		if ($action == 'view' || $action == 'delete') {
+			$this->tpl['showrefnav'] = $form->showrefnav($this->object, 'id');
 
-        	if ($this->object->socid > 0) {
-        		$objsoc = new Societe($this->db);
+			if ($this->object->socid > 0) {
+				$objsoc = new Societe($this->db);
 
-        		$objsoc->fetch($this->object->socid);
-        		$this->tpl['company'] = $objsoc->getNomUrl(1);
-        	} else {
-        		$this->tpl['company'] = $langs->trans("AdherentNotLinkedToThirdParty");
-        	}
+				$objsoc->fetch($this->object->socid);
+				$this->tpl['company'] = $objsoc->getNomUrl(1);
+			} else {
+				$this->tpl['company'] = $langs->trans("AdherentNotLinkedToThirdParty");
+			}
 
-        	$this->tpl['civility'] = $this->object->getCivilityLabel();
+			$this->tpl['civility'] = $this->object->getCivilityLabel();
 
-            $this->tpl['address'] = dol_nl2br($this->object->address);
+			$this->tpl['address'] = dol_nl2br($this->object->address);
 
-            $this->tpl['zip'] = ($this->object->zip ? $this->object->zip.'&nbsp;' : '');
+			$this->tpl['zip'] = ($this->object->zip ? $this->object->zip.'&nbsp;' : '');
 
-            $img = picto_from_langcode($this->object->country_code);
-            $this->tpl['country'] = ($img ? $img.' ' : '').$this->object->country;
+			$img = picto_from_langcode($this->object->country_code);
+			$this->tpl['country'] = ($img ? $img.' ' : '').$this->object->country;
 
-            $this->tpl['phone_perso'] = dol_print_phone($this->object->phone_perso, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
-            $this->tpl['phone_mobile'] = dol_print_phone($this->object->phone_mobile, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
-            $this->tpl['email'] = dol_print_email($this->object->email, 0, $this->object->id, 'AC_EMAIL');
+			$this->tpl['phone_perso'] = dol_print_phone($this->object->phone_perso, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
+			$this->tpl['phone_mobile'] = dol_print_phone($this->object->phone_mobile, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
+			$this->tpl['email'] = dol_print_email($this->object->email, 0, $this->object->id, 'AC_EMAIL');
 
-            $this->tpl['visibility'] = $this->object->getmorphylib($this->object->morphy);
+			$this->tpl['visibility'] = $this->object->getmorphylib($this->object->morphy);
 
-            $this->tpl['note'] = nl2br($this->object->note);
-        }
+			$this->tpl['note'] = nl2br($this->object->note);
+		}
 
-        if ($action == 'create_user') {
-        	// Full firstname and lastname separated with a dot : firstname.lastname
-        	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-            require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-        	$login = dol_buildlogin($this->object->lastname, $this->object->firstname);
+		if ($action == 'create_user') {
+			// Full firstname and lastname separated with a dot : firstname.lastname
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+			$login = dol_buildlogin($this->object->lastname, $this->object->firstname);
 
-       		$generated_password = getRandomPassword(false);
-        	$password = $generated_password;
+	   		$generated_password = getRandomPassword(false);
+			$password = $generated_password;
 
-        	// Create a form array
-        	$formquestion = array(
-        	array('label' => $langs->trans("LoginToCreate"), 'type' => 'text', 'name' => 'login', 'value' => $login),
-        	array('label' => $langs->trans("Password"), 'type' => 'text', 'name' => 'password', 'value' => $password));
+			// Create a form array
+			$formquestion = array(
+			array('label' => $langs->trans("LoginToCreate"), 'type' => 'text', 'name' => 'login', 'value' => $login),
+			array('label' => $langs->trans("Password"), 'type' => 'text', 'name' => 'password', 'value' => $password));
 
-        	$this->tpl['action_create_user'] = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$this->object->id, $langs->trans("CreateDolibarrLogin"), $langs->trans("ConfirmCreateAdherent"), "confirm_create_user", $formquestion, 'no');
-        }
-    }
+			$this->tpl['action_create_user'] = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$this->object->id, $langs->trans("CreateDolibarrLogin"), $langs->trans("ConfirmCreateAdherent"), "confirm_create_user", $formquestion, 'no');
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Assign POST values into object
-     *
-     *  @return		string					HTML output
-     */
-    private function assign_post()
-    {
-        // phpcs:enable
-        global $langs, $mysoc;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Assign POST values into object
+	 *
+	 *  @return		string					HTML output
+	 */
+	private function assign_post()
+	{
+		// phpcs:enable
+		global $langs, $mysoc;
 
-        $this->object->old_name = $_POST["old_name"];
-        $this->object->old_firstname = $_POST["old_firstname"];
+		$this->object->old_name = $_POST["old_name"];
+		$this->object->old_firstname = $_POST["old_firstname"];
 
-        $this->object->fk_soc = $_POST["fk_soc"];
-        $this->object->lastname			= $_POST["lastname"];
-        $this->object->firstname		= $_POST["firstname"];
-        $this->object->civility_id = $_POST["civility_id"];
-        $this->object->address = $_POST["address"];
-        $this->object->zip = $_POST["zipcode"];
-        $this->object->town = $_POST["town"];
-        $this->object->country_id = $_POST["country_id"] ? $_POST["country_id"] : $mysoc->country_id;
-        $this->object->state_id = $_POST["state_id"];
-        $this->object->phone_perso = $_POST["phone_perso"];
-        $this->object->phone_mobile = $_POST["phone_mobile"];
-        $this->object->email			= $_POST["email"];
-        $this->object->note				= $_POST["note"];
-        $this->object->canvas = $_POST["canvas"];
+		$this->object->fk_soc = $_POST["fk_soc"];
+		$this->object->lastname			= $_POST["lastname"];
+		$this->object->firstname		= $_POST["firstname"];
+		$this->object->civility_id = $_POST["civility_id"];
+		$this->object->address = $_POST["address"];
+		$this->object->zip = $_POST["zipcode"];
+		$this->object->town = $_POST["town"];
+		$this->object->country_id = $_POST["country_id"] ? $_POST["country_id"] : $mysoc->country_id;
+		$this->object->state_id = $_POST["state_id"];
+		$this->object->phone_perso = $_POST["phone_perso"];
+		$this->object->phone_mobile = $_POST["phone_mobile"];
+		$this->object->email			= $_POST["email"];
+		$this->object->note				= $_POST["note"];
+		$this->object->canvas = $_POST["canvas"];
 
-        // We set country_id, and country_code label of the chosen country
-        if ($this->object->country_id) {
-            $sql = "SELECT code, label FROM ".MAIN_DB_PREFIX."c_country WHERE rowid = ".$this->object->country_id;
-            $resql = $this->db->query($sql);
-            if ($resql) {
-                $obj = $this->db->fetch_object($resql);
+		// We set country_id, and country_code label of the chosen country
+		if ($this->object->country_id) {
+			$sql = "SELECT code, label FROM ".MAIN_DB_PREFIX."c_country WHERE rowid = ".$this->object->country_id;
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$obj = $this->db->fetch_object($resql);
 
-                $this->object->country_code = $obj->code;
-                $this->object->country = $langs->trans("Country".$obj->code) ? $langs->trans("Country".$obj->code) : $obj->libelle;
-            } else {
-                dol_print_error($this->db);
-            }
-        }
-    }
+				$this->object->country_code = $obj->code;
+				$this->object->country = $langs->trans("Country".$obj->code) ? $langs->trans("Country".$obj->code) : $obj->libelle;
+			} else {
+				dol_print_error($this->db);
+			}
+		}
+	}
 }
diff --git a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
index db2473c55d9..43d6622f8c9 100644
--- a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
+++ b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
@@ -31,21 +31,21 @@ include_once DOL_DOCUMENT_ROOT.'/adherents/canvas/actions_adherentcard_common.cl
 class ActionsAdherentCardDefault extends ActionsAdherentCardCommon
 {
 	/**
-     *	Constructor
-     *
-     *	@param	DoliDB	$db				Handler acces data base
-     *	@param	string	$dirmodule		Name of directory of module
-     *	@param	string	$targetmodule	Name of directory of module where canvas is stored
-     *	@param	string	$canvas			Name of canvas
-     *	@param	string	$card			Name of tab (sub-canvas)
+	 *	Constructor
+	 *
+	 *	@param	DoliDB	$db				Handler acces data base
+	 *	@param	string	$dirmodule		Name of directory of module
+	 *	@param	string	$targetmodule	Name of directory of module where canvas is stored
+	 *	@param	string	$canvas			Name of canvas
+	 *	@param	string	$card			Name of tab (sub-canvas)
 	 */
 	public function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
 	{
-        $this->db               = $db;
-        $this->dirmodule = $dirmodule;
-        $this->targetmodule     = $targetmodule;
-        $this->canvas           = $canvas;
-        $this->card             = $card;
+		$this->db               = $db;
+		$this->dirmodule = $dirmodule;
+		$this->targetmodule     = $targetmodule;
+		$this->canvas           = $canvas;
+		$this->card             = $card;
 	}
 
 	/**
@@ -67,7 +67,7 @@ class ActionsAdherentCardDefault extends ActionsAdherentCardCommon
 		return $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Assign custom values for canvas
 	 *
@@ -77,47 +77,47 @@ class ActionsAdherentCardDefault extends ActionsAdherentCardCommon
 	 */
 	public function assign_values(&$action, $id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $limit, $offset, $sortfield, $sortorder;
 		global $conf, $db, $langs, $user;
 		global $form;
 
 		$ret = $this->getObject($id);
 
-        parent::assign_values($action, $id);
+		parent::assign_values($action, $id);
 
-        $this->tpl['title'] = $this->getTitle($action);
-        $this->tpl['error'] = $this->error;
-        $this->tpl['errors'] = $this->errors;
+		$this->tpl['title'] = $this->getTitle($action);
+		$this->tpl['error'] = $this->error;
+		$this->tpl['errors'] = $this->errors;
 
 		if ($action == 'view') {
-            // Card header
-            $head = member_prepare_head($this->object);
-            $title = $this->getTitle($action);
+			// Card header
+			$head = member_prepare_head($this->object);
+			$title = $this->getTitle($action);
 
-		    $this->tpl['showhead'] = dol_get_fiche_head($head, 'card', $title, 0, 'adherent');
-		    $this->tpl['showend'] = dol_get_fiche_end();
+			$this->tpl['showhead'] = dol_get_fiche_head($head, 'card', $title, 0, 'adherent');
+			$this->tpl['showend'] = dol_get_fiche_end();
 
-        	$objsoc = new Societe($db);
-            $objsoc->fetch($this->object->socid);
+			$objsoc = new Societe($db);
+			$objsoc->fetch($this->object->socid);
 
-            $this->tpl['actionstodo'] = show_actions_todo($conf, $langs, $db, $objsoc, $this->object, 1);
+			$this->tpl['actionstodo'] = show_actions_todo($conf, $langs, $db, $objsoc, $this->object, 1);
 
-            $this->tpl['actionsdone'] = show_actions_done($conf, $langs, $db, $objsoc, $this->object, 1);
-        } else {
+			$this->tpl['actionsdone'] = show_actions_done($conf, $langs, $db, $objsoc, $this->object, 1);
+		} else {
 			// Confirm delete contact
-        	if ($action == 'delete' && $user->rights->adherent->supprimer) {
-        		$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$this->object->id, $langs->trans("DeleteAdherent"), $langs->trans("ConfirmDeleteAdherent"), "confirm_delete", '', 0, 1);
-        	}
+			if ($action == 'delete' && $user->rights->adherent->supprimer) {
+				$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$this->object->id, $langs->trans("DeleteAdherent"), $langs->trans("ConfirmDeleteAdherent"), "confirm_delete", '', 0, 1);
+			}
 		}
 
 		if ($action == 'list') {
-	        $this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
+			$this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
 		}
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Fetch datas list and save into ->list_datas
 	 *
@@ -129,11 +129,11 @@ class ActionsAdherentCardDefault extends ActionsAdherentCardCommon
 	 */
 	public function LoadListDatas($limit, $offset, $sortfield, $sortorder)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
-        //$this->getFieldList();
+		//$this->getFieldList();
 
-        $this->list_datas = array();
+		$this->list_datas = array();
 	}
 }
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
index 92a4fbddd38..3259df07b8d 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
@@ -134,8 +134,8 @@ echo $this->control->tpl['ajax_selectcountry'];
 
 <tr>
 	<td colspan="4" class="center">
-	<input type="submit" class="button" name="save" value="<?php echo $langs->trans("Save"); ?>">&nbsp;
-	<input type="submit" class="button" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>">
+	<input type="submit" class="button button-save" name="save" value="<?php echo $langs->trans("Save"); ?>">&nbsp;
+	<input type="submit" class="button button-cancel" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>">
 	</td>
 </tr>
 
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
index 8789b2fcb34..539e174681f 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
@@ -118,21 +118,21 @@ if (!empty($this->control->tpl['action_delete'])) echo $this->control->tpl['acti
 <?php echo $this->control->tpl['showend'];
 
 if (empty($user->socid)) {
-    echo '<div class="tabsAction">';
+	echo '<div class="tabsAction">';
 
-    if ($user->rights->adherent->creer) {
-        echo '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&amp;action=edit&amp;canvas='.$canvas.'">'.$langs->trans('Modify').'</a>';
-    }
+	if ($user->rights->adherent->creer) {
+		echo '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&amp;action=edit&amp;canvas='.$canvas.'">'.$langs->trans('Modify').'</a>';
+	}
 
-    if (!$this->control->tpl['user_id'] && $user->rights->user->user->creer) {
-        echo '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&amp;action=create_user&amp;canvas='.$canvas.'">'.$langs->trans("CreateDolibarrLogin").'</a>';
-    }
+	if (!$this->control->tpl['user_id'] && $user->rights->user->user->creer) {
+		echo '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&amp;action=create_user&amp;canvas='.$canvas.'">'.$langs->trans("CreateDolibarrLogin").'</a>';
+	}
 
-    if ($user->rights->adherent->supprimer) {
-        echo '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&amp;action=delete&amp;canvas='.$canvas.'">'.$langs->trans('Delete').'</a>';
-    }
+	if ($user->rights->adherent->supprimer) {
+		echo '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&amp;action=delete&amp;canvas='.$canvas.'">'.$langs->trans('Delete').'</a>';
+	}
 
-    echo '</div><br>';
+	echo '</div><br>';
 }
 
 echo $this->control->tpl['actionstodo'];
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index d0a67153209..418c5cc5674 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -4,9 +4,9 @@
  * Copyright (C) 2004-2012  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2018  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2012       Marcos García           <marcosgdf@gmail.com>
- * Copyright (C) 2012-2018  Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2012-2020  Philippe Grand          <philippe.grand@atoo-net.com>
  * Copyright (C) 2015-2018  Alexandre Spangaro      <aspangaro@open-dsi.fr>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric 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
@@ -181,11 +181,19 @@ if (empty($reshook)) {
 		if ($result > 0) {
 			// Creation user
 			$nuser = new User($db);
-			$result = $nuser->create_from_member($object, GETPOST('login', 'alphanohtml'));
+			$tmpuser = dol_clone($object);
+			if (GETPOST('internalorexternal', 'aZ09') == 'internal') {
+				$tmpuser->fk_soc = 0;
+			}
+
+			$result = $nuser->create_from_member($tmpuser, GETPOST('login', 'alphanohtml'));
 
 			if ($result < 0) {
 				$langs->load("errors");
 				setEventMessages($langs->trans($nuser->error), null, 'errors');
+			} else {
+				setEventMessages($langs->trans("NewUserCreated", $nuser->login), null, 'mesgs');
+				$action = '';
 			}
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -213,7 +221,7 @@ if (empty($reshook)) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$birthdate = '';
-		if (GETPOST("birthday", 'int')	&& GETPOST("birthmonth", 'int') && GETPOST("birthyear", 'int'))
+		if (GETPOST("birthday", 'int') && GETPOST("birthmonth", 'int') && GETPOST("birthyear", 'int'))
 		{
 			$birthdate = dol_mktime(12, 0, 0, GETPOST("birthmonth", 'int'), GETPOST("birthday", 'int'), GETPOST("birthyear", 'int'));
 		}
@@ -374,14 +382,12 @@ if (empty($reshook)) {
 	if ($action == 'add' && $user->rights->adherent->creer) {
 		if ($canvas) $object->canvas = $canvas;
 		$birthdate = '';
-		if (isset($_POST["birthday"]) && $_POST["birthday"]
-				&& isset($_POST["birthmonth"]) && $_POST["birthmonth"]
-				&& isset($_POST["birthyear"]) && $_POST["birthyear"]) {
-			$birthdate = dol_mktime(12, 0, 0, $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
+		if (GETPOSTISSET("birthday") && GETPOST("birthday") && GETPOSTISSET("birthmonth") && GETPOST("birthmonth") && GETPOSTISSET("birthyear") && GETPOST("birthyear")) {
+			$birthdate = dol_mktime(12, 0, 0, GETPOST("birthmonth", 'int'), GETPOST("birthday", 'int'), GETPOST("birthyear", 'int'));
 		}
 		$datesubscription = '';
-		if (isset($_POST["reday"]) && isset($_POST["remonth"]) && isset($_POST["reyear"])) {
-			$datesubscription = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
+		if (GETPOSTISSET("reday") && GETPOSTISSET("remonth") && GETPOSTISSET("reyear")) {
+			$datesubscription = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST("reday", "int"), GETPOST("reyear", "int"));
 		}
 
 		$typeid = GETPOST("typeid", 'int');
@@ -828,7 +834,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<input type="hidden" name="socid" value="'.$socid.'">';
 		if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]).'">';
 
-		dol_fiche_head('');
+		print dol_get_fiche_head('');
 
 		print '<table class="border centpercent">';
 		print '<tbody>';
@@ -954,7 +960,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 			print '<tr><td>'.$form->editfieldkey("Categories", 'memcats', '', $object, 0).'</td><td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, 'parent', null, null, 1);
-			print $form->multiselectarray('memcats', $cate_arbo, GETPOST('memcats', 'array'), null, null, null, null, '100%');
+			print img_picto('', 'category').$form->multiselectarray('memcats', $cate_arbo, GETPOST('memcats', 'array'), null, null, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 			print "</td></tr>";
 		}
 
@@ -964,15 +970,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<tbody>';
 		print "</table>\n";
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
 		print '<input type="submit" name="button" class="button" value="'.$langs->trans("AddMember").'">';
 		print '&nbsp;&nbsp;';
 		if (!empty($backtopage)) {
-			print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
+			print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 		} else {
-			print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+			print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 		}
 		print '</div>';
 
@@ -1053,7 +1059,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<input type="hidden" name="statut" value="'.$object->statut.'" />';
 		if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]).'">';
 
-		dol_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user');
+		print dol_get_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user');
 
 		print '<table class="border centpercent">';
 
@@ -1067,7 +1073,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		// Password
 		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
-			print '<tr><td class="fieldrequired">'.$langs->trans("Password").'</td><td><input type="password" name="pass" class="minwidth300" maxlength="50" value="'.(isset($_POST["pass"]) ?GETPOST("pass", '', 2) : $object->pass).'"></td></tr>';
+			print '<tr><td class="fieldrequired">'.$langs->trans("Password").'</td><td><input type="password" name="pass" class="minwidth300" maxlength="50" value="'.(GETPOSTISSET("pass") ? GETPOST("pass", '', 2) : $object->pass).'"></td></tr>';
 		}
 		// Morphy
 		$morphys["phy"] = $langs->trans("Physical");
@@ -1126,7 +1132,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		// EMail
 		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED ? '<span class="fieldrequired">' : '').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED ? '</span>' : '').'</td>';
-		print '<td>'.img_picto('', 'object_email').' <input type="text" name="member_email" class="minwidth300" maxlength="255" value="'.(isset($_POST["member_email"]) ?GETPOST("member_email", '', 2) : $object->email).'"></td></tr>';
+		print '<td>'.img_picto('', 'object_email').' <input type="text" name="member_email" class="minwidth300" maxlength="255" value="'.(GETPOSTISSET("member_email") ? GETPOST("member_email", '', 2) : $object->email).'"></td></tr>';
 
 		// Address
 		print '<tr><td>'.$langs->trans("Address").'</td><td>';
@@ -1143,14 +1149,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		// Country
 		//$object->country_id=$object->country_id?$object->country_id:$mysoc->country_id;    // In edit mode we don't force to company country if not defined
 		print '<tr><td>'.$langs->trans('Country').'</td><td>';
-		print $form->select_country(isset($_POST["country_id"]) ? $_POST["country_id"] : $object->country_id, 'country_id');
+		print $form->select_country(GETPOSTISSET("country_id") ? GETPOST("country_id", "alpha") : $object->country_id, 'country_id');
 		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		print '</td></tr>';
 
 		// State
 		if (empty($conf->global->MEMBER_DISABLE_STATE)) {
 			print '<tr><td>'.$langs->trans('State').'</td><td>';
-			print $formcompany->select_state($object->state_id, isset($_POST["country_id"]) ?GETPOST("country_id") : $object->country_id);
+			print $formcompany->select_state($object->state_id, GETPOSTISSET("country_id") ? GETPOST("country_id", "alpha") : $object->country_id);
 			print '</td></tr>';
 		}
 
@@ -1224,12 +1230,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
 		print '</table>';
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
-		print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+		print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
 		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 
 		print '</form>';
@@ -1263,11 +1269,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		 */
 		$head = member_prepare_head($object);
 
-		dol_fiche_head($head, 'general', $langs->trans("Member"), -1, 'user');
+		print dol_get_fiche_head($head, 'general', $langs->trans("Member"), -1, 'user');
 
 		// Confirm create user
 		if ($action == 'create_user') {
-			$login = $object->login;
+			$login = (GETPOSTISSET('login') ? GETPOST('login', 'alphanohtml') : $object->login);
 			if (empty($login)) {
 				// Full firstname and name separated with a dot : firstname.name
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -1279,11 +1285,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			$formquestion = array(
 					array('label' => $langs->trans("LoginToCreate"), 'type' => 'text', 'name' => 'login', 'value' => $login)
 			);
-			$text = $langs->trans("ConfirmCreateLogin").'<br>';
-			if (!empty($conf->societe->enabled)) {
-				if ($object->socid > 0) $text .= $langs->trans("UserWillBeExternalUser");
-				else $text .= $langs->trans("UserWillBeInternalUser");
+			if (!empty($conf->societe->enabled) && $object->socid > 0) {
+				$object->fetch_thirdparty();
+				$formquestion[] = array('label' => $langs->trans("UserWillBe"), 'type' => 'radio', 'name' => 'internalorexternal', 'default'=>'external', 'values' => array('external'=>$langs->trans("External").' - '.$langs->trans("LinkedToDolibarrThirdParty").' '.$object->thirdparty->getNomUrl(1, '', 0, 1), 'internal'=>$langs->trans("Internal")));
 			}
+			$text = '';
+			if (!empty($conf->societe->enabled) && $object->socid <= 0) {
+				$text .= $langs->trans("UserWillBeInternalUser").'<br>';
+			}
+			$text .= $langs->trans("ConfirmCreateLogin");
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?rowid=".$object->id, $langs->trans("CreateDolibarrLogin"), $text, "confirm_create_user", $formquestion, 'yes');
 		}
 
@@ -1552,7 +1562,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'userid', '');
 		} else {
 			if ($object->user_id) {
-				$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'none');
+				$linkeduser = new User($db);
+				$linkeduser->fetch($object->user_id);
+				print $linkeduser->getNomUrl(-1);
 			} else {
 				print $langs->trans("NoDolibarrAccess");
 			}
@@ -1599,7 +1611,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print "</div></div></div>\n";
 		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		/*
@@ -1692,13 +1704,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					}
 				}
 
-				// Delete
-				if ($user->rights->adherent->supprimer) {
-					print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete")."</a></div>\n";
-				} else {
-					print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Delete")."</font></div>";
-				}
-
 				// Action SPIP
 				if (!empty($conf->mailmanspip->enabled) && !empty($conf->global->ADHERENT_USE_SPIP)) {
 					$isinspip = $mailmanspip->is_in_spip($object);
@@ -1710,6 +1715,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=add_spip">'.$langs->trans("AddIntoSpip")."</a></div>\n";
 					}
 				}
+
+				// Delete
+				if ($user->rights->adherent->supprimer) {
+					print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete")."</a></div>\n";
+				} else {
+					print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Delete")."</font></div>";
+				}
 			}
 		}
 		print '</div>';
diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
index 958750178f1..b62f58117a2 100644
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -56,163 +56,163 @@ $extrafields->fetch_name_optionals_label($object->table_element);
  */
 
 if ($mode == 'cardlogin' && empty($foruserlogin)) {
-    $mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login"));
+	$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login"));
 }
 
 if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg) {
-    $arrayofmembers = array();
+	$arrayofmembers = array();
 
-    // request taking into account member with up to date subscriptions
-    $sql = "SELECT d.rowid, d.firstname, d.lastname, d.login, d.societe as company, d.datefin,";
-    $sql .= " d.address, d.zip, d.town, d.country, d.birth, d.email, d.photo,";
-    $sql .= " t.libelle as type,";
-    $sql .= " c.code as country_code, c.label as country";
-    // Add fields from extrafields
-    if (!empty($extrafields->attributes[$object->table_element]['label']))
-    	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
-    $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as t, ".MAIN_DB_PREFIX."adherent as d";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.country = c.rowid";
-    if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_extrafields as ef on (d.rowid = ef.fk_object)";
-    $sql .= " WHERE d.fk_adherent_type = t.rowid AND d.statut = 1";
-    $sql .= " AND d.entity IN (".getEntity('adherent').")";
-    if (is_numeric($foruserid)) $sql .= " AND d.rowid=".$foruserid;
-    if ($foruserlogin) $sql .= " AND d.login='".$db->escape($foruserlogin)."'";
-    $sql .= " ORDER BY d.rowid ASC";
+	// request taking into account member with up to date subscriptions
+	$sql = "SELECT d.rowid, d.firstname, d.lastname, d.login, d.societe as company, d.datefin,";
+	$sql .= " d.address, d.zip, d.town, d.country, d.birth, d.email, d.photo,";
+	$sql .= " t.libelle as type,";
+	$sql .= " c.code as country_code, c.label as country";
+	// Add fields from extrafields
+	if (!empty($extrafields->attributes[$object->table_element]['label']))
+		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+	$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as t, ".MAIN_DB_PREFIX."adherent as d";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.country = c.rowid";
+	if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_extrafields as ef on (d.rowid = ef.fk_object)";
+	$sql .= " WHERE d.fk_adherent_type = t.rowid AND d.statut = 1";
+	$sql .= " AND d.entity IN (".getEntity('adherent').")";
+	if (is_numeric($foruserid)) $sql .= " AND d.rowid=".$foruserid;
+	if ($foruserlogin) $sql .= " AND d.login='".$db->escape($foruserlogin)."'";
+	$sql .= " ORDER BY d.rowid ASC";
 
-    dol_syslog("Search members", LOG_DEBUG);
-    $result = $db->query($sql);
-    if ($result) {
-    	$num = $db->num_rows($result);
-    	$i = 0;
-    	while ($i < $num) {
-    		$objp = $db->fetch_object($result);
+	dol_syslog("Search members", LOG_DEBUG);
+	$result = $db->query($sql);
+	if ($result) {
+		$num = $db->num_rows($result);
+		$i = 0;
+		while ($i < $num) {
+			$objp = $db->fetch_object($result);
 
-    		if ($objp->country == '-') $objp->country = '';
+			if ($objp->country == '-') $objp->country = '';
 
-    		$adherentstatic->id = $objp->rowid;
-    		$adherentstatic->lastname = $objp->lastname;
-    		$adherentstatic->firstname = $objp->firstname;
+			$adherentstatic->id = $objp->rowid;
+			$adherentstatic->lastname = $objp->lastname;
+			$adherentstatic->firstname = $objp->firstname;
 
-            // Format extrafield so they can be parsed in function complete_substitutions_array
-    		if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
-                $adherentstatic->array_options = array();
-                foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-                    $tmpkey = 'options_'.$key;
-                    if (!empty($objp->$tmpkey)) {
-                        $adherentstatic->array_options[$tmpkey] = $objp->$tmpkey;
-                    }
-                    //if (!empty($objp->$key))
-                    //    $objp->array_options[$tmpkey] = $objp->$key;
-                    //$objp->array_options[$tmpkey] = $extrafields->showOutputField($key, $objp->$tmpkey, '', 1); //$objp->$tmpkey;
-                }
-            }
+			// Format extrafield so they can be parsed in function complete_substitutions_array
+			if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+				$adherentstatic->array_options = array();
+				foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+					$tmpkey = 'options_'.$key;
+					if (!empty($objp->$tmpkey)) {
+						$adherentstatic->array_options[$tmpkey] = $objp->$tmpkey;
+					}
+					//if (!empty($objp->$key))
+					//    $objp->array_options[$tmpkey] = $objp->$key;
+					//$objp->array_options[$tmpkey] = $extrafields->showOutputField($key, $objp->$tmpkey, '', 1); //$objp->$tmpkey;
+				}
+			}
 
-    		// List of values to scan for a replacement
-            $substitutionarray = array(
-                '__ID__'=>$objp->rowid,
-                '__LOGIN__'=>$objp->login,
-                '__FIRSTNAME__'=>$objp->firstname,
-                '__LASTNAME__'=>$objp->lastname,
-                '__FULLNAME__'=>$adherentstatic->getFullName($langs),
-                '__COMPANY__'=>$objp->company,
-                '__ADDRESS__'=>$objp->address,
-                '__ZIP__'=>$objp->zip,
-                '__TOWN__'=>$objp->town,
-                '__COUNTRY__'=>$objp->country,
-                '__COUNTRY_CODE__'=>$objp->country_code,
-                '__EMAIL__'=>$objp->email,
-                '__BIRTH__'=>dol_print_date($objp->birth, 'day'),
-                '__TYPE__'=>$objp->type,
-                '__YEAR__'=>$year,
-                '__MONTH__'=>$month,
-                '__DAY__'=>$day,
-                '__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
-                '__SERVER__'=>"http://".$_SERVER["SERVER_NAME"]."/"
-            );
-            complete_substitutions_array($substitutionarray, $langs, $adherentstatic);
+			// List of values to scan for a replacement
+			$substitutionarray = array(
+				'__ID__'=>$objp->rowid,
+				'__LOGIN__'=>$objp->login,
+				'__FIRSTNAME__'=>$objp->firstname,
+				'__LASTNAME__'=>$objp->lastname,
+				'__FULLNAME__'=>$adherentstatic->getFullName($langs),
+				'__COMPANY__'=>$objp->company,
+				'__ADDRESS__'=>$objp->address,
+				'__ZIP__'=>$objp->zip,
+				'__TOWN__'=>$objp->town,
+				'__COUNTRY__'=>$objp->country,
+				'__COUNTRY_CODE__'=>$objp->country_code,
+				'__EMAIL__'=>$objp->email,
+				'__BIRTH__'=>dol_print_date($objp->birth, 'day'),
+				'__TYPE__'=>$objp->type,
+				'__YEAR__'=>$year,
+				'__MONTH__'=>$month,
+				'__DAY__'=>$day,
+				'__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
+				'__SERVER__'=>"http://".$_SERVER["SERVER_NAME"]."/"
+			);
+			complete_substitutions_array($substitutionarray, $langs, $adherentstatic);
 
-            // For business cards
-            if (empty($mode) || $mode == 'card' || $mode == 'cardlogin') {
-                $textleft = make_substitutions($conf->global->ADHERENT_CARD_TEXT, $substitutionarray);
-                $textheader = make_substitutions($conf->global->ADHERENT_CARD_HEADER_TEXT, $substitutionarray);
-                $textfooter = make_substitutions($conf->global->ADHERENT_CARD_FOOTER_TEXT, $substitutionarray);
-                $textright = make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
+			// For business cards
+			if (empty($mode) || $mode == 'card' || $mode == 'cardlogin') {
+				$textleft = make_substitutions($conf->global->ADHERENT_CARD_TEXT, $substitutionarray);
+				$textheader = make_substitutions($conf->global->ADHERENT_CARD_HEADER_TEXT, $substitutionarray);
+				$textfooter = make_substitutions($conf->global->ADHERENT_CARD_FOOTER_TEXT, $substitutionarray);
+				$textright = make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
 
-                if (is_numeric($foruserid) || $foruserlogin) {
-                    $nb = $_Avery_Labels[$model]['NX'] * $_Avery_Labels[$model]['NY'];
-                    if ($nb <= 0) $nb = 1; // Protection to avoid empty page
+				if (is_numeric($foruserid) || $foruserlogin) {
+					$nb = $_Avery_Labels[$model]['NX'] * $_Avery_Labels[$model]['NY'];
+					if ($nb <= 0) $nb = 1; // Protection to avoid empty page
 
-                    for ($j = 0; $j < $nb; $j++) {
-                        $arrayofmembers[] = array(
-                        	'textleft'=>$textleft,
-                            'textheader'=>$textheader,
-                            'textfooter'=>$textfooter,
-                            'textright'=>$textright,
-                            'id'=>$objp->rowid,
-                            'photo'=>$objp->photo
-                        );
-                    }
-                } else {
-                    $arrayofmembers[] = array(
-                        'textleft'=>$textleft,
-                        'textheader'=>$textheader,
-                        'textfooter'=>$textfooter,
-                        'textright'=>$textright,
-                        'id'=>$objp->rowid,
-                        'photo'=>$objp->photo
-                    );
-                }
-            }
+					for ($j = 0; $j < $nb; $j++) {
+						$arrayofmembers[] = array(
+							'textleft'=>$textleft,
+							'textheader'=>$textheader,
+							'textfooter'=>$textfooter,
+							'textright'=>$textright,
+							'id'=>$objp->rowid,
+							'photo'=>$objp->photo
+						);
+					}
+				} else {
+					$arrayofmembers[] = array(
+						'textleft'=>$textleft,
+						'textheader'=>$textheader,
+						'textfooter'=>$textfooter,
+						'textright'=>$textright,
+						'id'=>$objp->rowid,
+						'photo'=>$objp->photo
+					);
+				}
+			}
 
-            // For labels
-            if ($mode == 'label') {
-            	if (empty($conf->global->ADHERENT_ETIQUETTE_TEXT)) $conf->global->ADHERENT_ETIQUETTE_TEXT = "__FULLNAME__\n__ADDRESS__\n__ZIP__ __TOWN__\n__COUNTRY__";
-                $textleft = make_substitutions($conf->global->ADHERENT_ETIQUETTE_TEXT, $substitutionarray);
-                $textheader = '';
-                $textfooter = '';
-                $textright = '';
+			// For labels
+			if ($mode == 'label') {
+				if (empty($conf->global->ADHERENT_ETIQUETTE_TEXT)) $conf->global->ADHERENT_ETIQUETTE_TEXT = "__FULLNAME__\n__ADDRESS__\n__ZIP__ __TOWN__\n__COUNTRY__";
+				$textleft = make_substitutions($conf->global->ADHERENT_ETIQUETTE_TEXT, $substitutionarray);
+				$textheader = '';
+				$textfooter = '';
+				$textright = '';
 
-                $arrayofmembers[] = array('textleft'=>$textleft,
-                                        'textheader'=>$textheader,
-                                        'textfooter'=>$textfooter,
-                                        'textright'=>$textright,
-                                        'id'=>$objp->rowid,
-                                        'photo'=>$objp->photo);
-            }
+				$arrayofmembers[] = array('textleft'=>$textleft,
+										'textheader'=>$textheader,
+										'textfooter'=>$textfooter,
+										'textright'=>$textright,
+										'id'=>$objp->rowid,
+										'photo'=>$objp->photo);
+			}
 
-            $i++;
-    	}
+			$i++;
+		}
 
-    	// Build and output PDF
-        if (empty($mode) || $mode == 'card' || $mode == 'cardlogin') {
-            if (!count($arrayofmembers)) {
-                $mesg = $langs->trans("ErrorRecordNotFound");
-            }
-            if (empty($model) || $model == '-1') {
-            	$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DescADHERENT_CARD_TYPE"));
-            }
-            if (!$mesg) $result = members_card_pdf_create($db, $arrayofmembers, $model, $outputlangs);
-        } elseif ($mode == 'label') {
-            if (!count($arrayofmembers)) {
-                $mesg = $langs->trans("ErrorRecordNotFound");
-            }
-        	if (empty($modellabel) || $modellabel == '-1') {
-    			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DescADHERENT_ETIQUETTE_TYPE"));
-    		}
-        	if (!$mesg) $result = doc_label_pdf_create($db, $arrayofmembers, $modellabel, $outputlangs);
-        }
+		// Build and output PDF
+		if (empty($mode) || $mode == 'card' || $mode == 'cardlogin') {
+			if (!count($arrayofmembers)) {
+				$mesg = $langs->trans("ErrorRecordNotFound");
+			}
+			if (empty($model) || $model == '-1') {
+				$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DescADHERENT_CARD_TYPE"));
+			}
+			if (!$mesg) $result = members_card_pdf_create($db, $arrayofmembers, $model, $outputlangs);
+		} elseif ($mode == 'label') {
+			if (!count($arrayofmembers)) {
+				$mesg = $langs->trans("ErrorRecordNotFound");
+			}
+			if (empty($modellabel) || $modellabel == '-1') {
+				$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DescADHERENT_ETIQUETTE_TYPE"));
+			}
+			if (!$mesg) $result = doc_label_pdf_create($db, $arrayofmembers, $modellabel, $outputlangs);
+		}
 
-    	if ($result <= 0) {
-    		dol_print_error('', $result);
-    	}
-    } else {
-    	dol_print_error($db);
-    }
+		if ($result <= 0) {
+			dol_print_error('', $result);
+		}
+	} else {
+		dol_print_error($db);
+	}
 
-    if (!$mesg) {
-    	$db->close();
-    	exit;
-    }
+	if (!$mesg) {
+		$db->close();
+		exit;
+	}
 }
 
 
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 95ca2017b21..5df6db52f3d 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2009-2017	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2014-2018	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2015		Marcos García			<marcosgdf@gmail.com>
- * Copyright (C) 2015-2018	Frédéric France			<frederic.france@netlogic.fr>
+ * Copyright (C) 2015-2020	Frédéric France			<frederic.france@netlogic.fr>
  * Copyright (C) 2015		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2016		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018-2019	Thibault FOUCART		<support@ptibogxiv.net>
@@ -60,6 +60,9 @@ class Adherent extends CommonObject
 	 */
 	public $ismultientitymanaged = 1;
 
+	/**
+	 * @var string picto
+	 */
 	public $picto = 'member';
 
 
@@ -70,13 +73,19 @@ class Adherent extends CommonObject
 	 */
 	public $login;
 
-	//! Clear password in memory
+	/**
+	 * @var string Clear password in memory
+	 */
 	public $pass;
 
-	//! Clear password in database (defined if DATABASE_PWD_ENCRYPTED=0)
+	/**
+	 * @var string Clear password in database (defined if DATABASE_PWD_ENCRYPTED=0)
+	 */
 	public $pass_indatabase;
 
-	//! Encrypted password in database (always defined)
+	/**
+	 * @var string Encrypted password in database (always defined)
+	 */
 	public $pass_indatabase_crypted;
 
 	/**
@@ -94,6 +103,7 @@ class Adherent extends CommonObject
 	 * @var int Thirdparty ID
 	 */
 	public $fk_soc;
+	public $socid;
 
 	/**
 	 * @var string Address
@@ -169,6 +179,11 @@ class Adherent extends CommonObject
 	 */
 	public $phone_perso;
 
+	/**
+	 * @var string Professional Phone number
+	 */
+	public $phone_pro;
+
 	/**
 	 * @var string Mobile phone number
 	 */
@@ -184,6 +199,9 @@ class Adherent extends CommonObject
 	 */
 	public $poste;
 
+	/**
+	 * @var string mor or phy
+	 */
 	public $morphy;
 
 	public $public;
@@ -191,6 +209,10 @@ class Adherent extends CommonObject
 	// -1:brouillon, 0:resilie, >=1:valide,paye
 	// def in common object
 	//public $status;
+
+	/**
+	 * @var string photo of member
+	 */
 	public $photo;
 
 	/**
@@ -209,6 +231,9 @@ class Adherent extends CommonObject
 
 	public $datevalid;
 
+	/**
+	 * @var string gender
+	 */
 	public $gender;
 
 	public $birth;
@@ -258,7 +283,11 @@ class Adherent extends CommonObject
 	 */
 	public $entity;
 
-	public $fields = array('rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
+	/**
+	 * @var array fields
+	 */
+	public $fields = array(
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
 		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
 		'ref_ext' => array('type' => 'varchar(128)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 0, 'position' => 20),
 		'civility' => array('type' => 'varchar(6)', 'label' => 'Civility', 'enabled' => 1, 'visible' => -1, 'position' => 25),
@@ -296,9 +325,10 @@ class Adherent extends CommonObject
 		'fk_user_valid' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserValidation', 'enabled' => 1, 'visible' => -1, 'position' => 190),
 		'canvas' => array('type' => 'varchar(32)', 'label' => 'Canvas', 'enabled' => 1, 'visible' => -1, 'position' => 195),
 		'statut' => array('type' => 'smallint(6)', 'label' => 'Statut', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 500,
-			'arrayofkeyval' => array(0 => 'Draft', 1 => 'Validated', -1 => 'MemberStatusResiliatedShort')),
+		'arrayofkeyval' => array(0 => 'Draft', 1 => 'Validated', -1 => 'MemberStatusResiliatedShort')),
 		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'visible' => 0, 'position' => 800),
-		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 805));
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 805)
+	);
 
 
 	/**
@@ -407,7 +437,8 @@ class Adherent extends CommonObject
 		$infos .= $langs->transnoentities("Public").": ".yn($this->public);
 
 		// Substitutions
-		$substitutionarray = array('__ID__' => $this->id, '__MEMBER_ID__' => $this->id, '__CIVILITY__' => $this->getCivilityLabel(),
+		$substitutionarray = array(
+			'__ID__' => $this->id, '__MEMBER_ID__' => $this->id, '__CIVILITY__' => $this->getCivilityLabel(),
 			'__FIRSTNAME__' => $msgishtml ? dol_htmlentitiesbr($this->firstname) : ($this->firstname ? $this->firstname : ''),
 			'__LASTNAME__' => $msgishtml ? dol_htmlentitiesbr($this->lastname) : ($this->lastname ? $this->lastname : ''),
 			'__FULLNAME__' => $msgishtml ? dol_htmlentitiesbr($this->getFullName($langs)) : $this->getFullName($langs),
@@ -422,7 +453,8 @@ class Adherent extends CommonObject
 			'__PHONE__' => $msgishtml ? dol_htmlentitiesbr($this->phone) : ($this->phone ? $this->phone : ''),
 			'__PHONEPRO__' => $msgishtml ? dol_htmlentitiesbr($this->phone_perso) : ($this->phone_perso ? $this->phone_perso : ''),
 			'__PHONEMOBILE__' => $msgishtml ? dol_htmlentitiesbr($this->phone_mobile) : ($this->phone_mobile ? $this->phone_mobile : ''),
-			'__TYPE__' => $msgishtml ? dol_htmlentitiesbr($this->type) : ($this->type ? $this->type : ''));
+			'__TYPE__' => $msgishtml ? dol_htmlentitiesbr($this->type) : ($this->type ? $this->type : '')
+		);
 
 		complete_substitutions_array($substitutionarray, $langs, $this);
 
@@ -589,8 +621,7 @@ class Adherent extends CommonObject
 		$this->town = ($this->town ? $this->town : $this->town);
 		$this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
 		$this->state_id = ($this->state_id > 0 ? $this->state_id : $this->state_id);
-		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname = ucwords(trim($this->lastname));
-		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname = ucwords(trim($this->firstname));
+		$this->setUpperOrLowerCase();
 		$this->note_public = ($this->note_public ? $this->note_public : $this->note_public);
 		$this->note_private = ($this->note_private ? $this->note_private : $this->note_private);
 
@@ -1232,14 +1263,15 @@ class Adherent extends CommonObject
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as dep ON d.state_id = dep.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON d.rowid = u.fk_member";
 		$sql .= " WHERE d.fk_adherent_type = t.rowid";
-		if ($rowid)
-			$sql .= " AND d.rowid=".$rowid;
-		elseif ($ref || $fk_soc) {
+		if ($rowid) {
+			$sql .= " AND d.rowid=".((int) $rowid);
+		} elseif ($ref || $fk_soc) {
 			$sql .= " AND d.entity IN (".getEntity('adherent').")";
-			if ($ref)
+			if ($ref) {
 				$sql .= " AND d.rowid='".$this->db->escape($ref)."'";
-			elseif ($fk_soc > 0)
-				$sql .= " AND d.fk_soc=".$fk_soc;
+			} elseif ($fk_soc > 0) {
+				$sql .= " AND d.fk_soc=".((int) $fk_soc);
+			}
 		} elseif ($ref_ext) {
 			$sql .= " AND d.ref_ext='".$this->db->escape($ref_ext)."'";
 		}
@@ -1320,7 +1352,7 @@ class Adherent extends CommonObject
 
 				$this->model_pdf = $obj->model_pdf;
 
-				// Retreive all extrafield
+				// Retrieve all extrafield
 				// fetch optionals attributes and labels
 				if ($fetch_optionals) {
 					$this->fetch_optionals();
@@ -1958,11 +1990,11 @@ class Adherent extends CommonObject
 	 *	@param	int		$withpictoimg				0=No picto, 1=Include picto into link, 2=Only picto, -1=Include photo into link, -2=Only picto photo, -3=Only photo very small)
 	 *	@param	int		$maxlen						length max label
 	 *	@param	string	$option						Page for link ('card', 'category', 'subscription', ...)
-	 *	@param  string  $mode           			''=Show firstname+lastname as label (using default order), 'firstname'=Show only firstname, 'login'=Show login, 'ref'=Show ref
+	 *	@param  string  $mode           			''=Show firstname+lastname as label (using default order), 'firstname'=Show only firstname, 'lastname'=Show only lastname, 'login'=Show login, 'ref'=Show ref
 	 *	@param  string  $morecss        			Add more css on link
 	 *	@param  int		$save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@param	int		$notooltip					1=Disable tooltip
-	 *	@param  int		$addlinktonotes			1=Add link to notes
+	 *	@param  int		$addlinktonotes				1=Add link to notes
 	 *	@return	string								Chaine avec URL
 	 */
 	public function getNomUrl($withpictoimg = 0, $maxlen = 0, $option = 'card', $mode = '', $morecss = '', $save_lastsearch_value = -1, $notooltip = 0, $addlinktonotes = 0)
@@ -1983,7 +2015,8 @@ class Adherent extends CommonObject
 		}
 
 		$label .= '<div class="centpercent">';
-		$label .= '<u>'.$langs->trans("Member").'</u>';
+		$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Member").'</u>';
+		$label .= ' '.$this->getLibStatut(4);
 		if (!empty($this->ref)) $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 		if (!empty($this->firstname) || !empty($this->lastname)) $label .= '<br><b>'.$langs->trans('Name').':</b> '.$this->getFullName($langs);
 		if (!empty($this->company)) $label .= '<br><b>'.$langs->trans('Company').':</b> '.$this->company;
@@ -2041,7 +2074,7 @@ class Adherent extends CommonObject
 			} elseif ($mode == 'ref') {
 				$result .= $this->id;
 			} else {
-				$result .= $this->getFullName($langs, '', ($mode == 'firstname' ? 2 : -1), $maxlen);
+				$result .= $this->getFullName($langs, '', ($mode == 'firstname' ? 2 : ($mode == 'lastname' ? 4 : -1)), $maxlen);
 			}
 			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result .= '</span>';
 		}
@@ -2275,14 +2308,16 @@ class Adherent extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return	int
 	 */
 	public function initAsSpecimen()
 	{
 		global $user, $langs;
+		$now = dol_now();
 
 		// Initialise parametres
 		$this->id = 0;
+		$this->entity = 1;
 		$this->specimen = 1;
 		$this->civility_id = 0;
 		$this->lastname = 'DOLIBARR';
@@ -2299,24 +2334,30 @@ class Adherent extends CommonObject
 		$this->country = 'France';
 		$this->morphy = 'mor';
 		$this->email = 'specimen@specimen.com';
-		$this->socialnetworks = array('skype' => 'skypepseudo', 'twitter' => 'twitterpseudo', 'facebook' => 'facebookpseudo', 'linkedin' => 'linkedinpseudo');
+		$this->socialnetworks = array(
+			'skype' => 'skypepseudo',
+			'twitter' => 'twitterpseudo',
+			'facebook' => 'facebookpseudo',
+			'linkedin' => 'linkedinpseudo',
+		);
 		$this->phone = '0999999999';
 		$this->phone_perso = '0999999998';
 		$this->phone_mobile = '0999999997';
-		$this->note_private = 'No comment';
-		$this->birth = time();
+		$this->note_public = 'This is a public note';
+		$this->note_private = 'This is a private note';
+		$this->birth = $now;
 		$this->photo = '';
 		$this->public = 1;
 		$this->statut = 0;
 
-		$this->datefin = time();
-		$this->datevalid = time();
+		$this->datefin = $now;
+		$this->datevalid = $now;
 
 		$this->typeid = 1; // Id type adherent
 		$this->type = 'Type adherent'; // Libelle type adherent
 		$this->need_subscription = 0;
 
-		$this->first_subscription_date = time();
+		$this->first_subscription_date = $now;
 		$this->first_subscription_date_start = $this->first_subscription_date;
 		$this->first_subscription_date_end = dol_time_plus_duree($this->first_subscription_date_start, 1, 'y');
 		$this->first_subscription_amount = 10;
@@ -2325,6 +2366,7 @@ class Adherent extends CommonObject
 		$this->last_subscription_date_start = $this->first_subscription_date;
 		$this->last_subscription_date_end = dol_time_plus_duree($this->last_subscription_date_start, 1, 'y');
 		$this->last_subscription_amount = 10;
+		return 1;
 	}
 
 
@@ -2364,6 +2406,7 @@ class Adherent extends CommonObject
 		global $conf, $langs;
 
 		$info = array();
+		$socialnetworks = getArrayOfSocialNetworks();
 		$keymodified = false;
 
 		// Object classes
@@ -2378,8 +2421,13 @@ class Adherent extends CommonObject
 		}
 
 		// Possible LDAP KEY (constname => varname)
-		$ldapkey = array('LDAP_MEMBER_FIELD_FULLNAME' => 'fullname', 'LDAP_MEMBER_FIELD_NAME' => 'lastname', 'LDAP_MEMBER_FIELD_LOGIN' => 'login', 'LDAP_MEMBER_FIELD_LOGIN_SAMBA' => 'login',
-			'LDAP_MEMBER_FIELD_MAIL' => 'email');
+		$ldapkey = array(
+			'LDAP_MEMBER_FIELD_FULLNAME' => 'fullname',
+			'LDAP_MEMBER_FIELD_NAME' => 'lastname',
+			'LDAP_MEMBER_FIELD_LOGIN' => 'login',
+			'LDAP_MEMBER_FIELD_LOGIN_SAMBA' => 'login',
+			'LDAP_MEMBER_FIELD_MAIL' => 'email'
+		);
 
 		// Member
 		foreach ($ldapkey as $constname => $varname) {
@@ -2399,10 +2447,11 @@ class Adherent extends CommonObject
 		if ($this->zip && !empty($conf->global->LDAP_MEMBER_FIELD_ZIP)) $info[$conf->global->LDAP_MEMBER_FIELD_ZIP] = $this->zip;
 		if ($this->town && !empty($conf->global->LDAP_MEMBER_FIELD_TOWN)) $info[$conf->global->LDAP_MEMBER_FIELD_TOWN] = $this->town;
 		if ($this->country_code && !empty($conf->global->LDAP_MEMBER_FIELD_COUNTRY)) $info[$conf->global->LDAP_MEMBER_FIELD_COUNTRY] = $this->country_code;
-		if ($this->skype && !empty($conf->global->LDAP_MEMBER_FIELD_SKYPE)) $info[$conf->global->LDAP_MEMBER_FIELD_SKYPE] = $this->skype;
-		if ($this->twitter && !empty($conf->global->LDAP_MEMBER_FIELD_TWITTER)) $info[$conf->global->LDAP_MEMBER_FIELD_TWITTER] = $this->twitter;
-		if ($this->facebook && !empty($conf->global->LDAP_MEMBER_FIELD_FACEBOOK)) $info[$conf->global->LDAP_MEMBER_FIELD_FACEBOOK] = $this->facebook;
-		if ($this->linkedin && !empty($conf->global->LDAP_MEMBER_FIELD_LINKEDIN)) $info[$conf->global->LDAP_MEMBER_FIELD_LINKEDIN] = $this->linkedin;
+		foreach ($socialnetworks as $key => $value) {
+			if ($this->socialnetworks[$value['label']] && !empty($conf->global->{'LDAP_MEMBER_FIELD_'.strtoupper($value['label'])})) {
+				$info[$conf->global->{'LDAP_MEMBER_FIELD_'.strtoupper($value['label'])}] = $this->socialnetworks[$value['label']];
+			}
+		}
 		if ($this->phone && !empty($conf->global->LDAP_MEMBER_FIELD_PHONE)) $info[$conf->global->LDAP_MEMBER_FIELD_PHONE] = $this->phone;
 		if ($this->phone_perso && !empty($conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO)) $info[$conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO] = $this->phone_perso;
 		if ($this->phone_mobile && !empty($conf->global->LDAP_MEMBER_FIELD_MOBILE)) $info[$conf->global->LDAP_MEMBER_FIELD_MOBILE] = $this->phone_mobile;
@@ -2415,8 +2464,12 @@ class Adherent extends CommonObject
 
 		// When password is modified
 		if (!empty($this->pass)) {
-			if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD)) $info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD] = $this->pass; // this->pass = mot de passe non crypte
-			if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED)) $info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass, 4); // Create OpenLDAP MD5 password (TODO add type of encryption)
+			if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD)) {
+				$info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD] = $this->pass; // this->pass = mot de passe non crypte
+			}
+			if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED)) {
+				$info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass, 4); // Create OpenLDAP MD5 password (TODO add type of encryption)
+			}
 		} // Set LDAP password if possible
 		elseif ($conf->global->LDAP_SERVER_PROTOCOLVERSION !== '3') { // If ldap key is modified and LDAPv3 we use ldap_rename function for avoid lose encrypt password
 			if (!empty($conf->global->DATABASE_PWD_ENCRYPTED)) {
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 94bf34208ff..b5c701f2ad4 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -85,7 +85,6 @@ class AdherentType extends CommonObject
 
 	/**
 	 * @var int Subsription required (0 or 1)
-	 * @since 5.0
 	 */
 	public $subscription;
 
@@ -95,9 +94,15 @@ class AdherentType extends CommonObject
 	/** @var integer	Can vote */
 	public $vote;
 
-	/** @var string Email sent during validation */
+	/** @var string Email sent during validation of member */
 	public $mail_valid;
 
+	/** @var string Email sent after recording a new subscription */
+	public $mail_subscription = '';
+
+	/** @var string Email sent after resiliation */
+	public $mail_resiliate = '';
+
 	/** @var array Array of members */
 	public $members = array();
 
@@ -116,7 +121,7 @@ class AdherentType extends CommonObject
 	}
 
 	/**
-	 *    Load array this->multilangs
+	 * Load array this->multilangs
 	 *
 	 * @return int        <0 if KO, >0 if OK
 	 */
@@ -151,7 +156,7 @@ class AdherentType extends CommonObject
 	}
 
 	/**
-	 *    Update or add a translation for a product
+	 * Update or add a translation for this member type
 	 *
 	 * @param  User $user Object user making update
 	 * @return int        <0 if KO, >0 if OK
@@ -236,12 +241,11 @@ class AdherentType extends CommonObject
 	}
 
 	   /**
-	    *    Delete a language for this product
+	    * Delete a language for this member type
 	    *
-	    * @param string $langtodelete Language code to delete
-	    * @param User   $user         Object user making delete
-	    *
-	    * @return int                            <0 if KO, >0 if OK
+	    * @param string $langtodelete 	Language code to delete
+	    * @param User   $user         	Object user making delete
+	    * @return int                   <0 if KO, >0 if OK
 	    */
 	public function delMultiLangs($langtodelete, $user)
 	{
@@ -268,9 +272,9 @@ class AdherentType extends CommonObject
 	}
 
 	/**
-	 *  Fonction qui permet de creer le status de l'adherent
+	 *  Function to create the member type
 	 *
-	 *  @param	User		$user			User making creation
+	 *  @param	User	$user			User making creation
 	 *  @param	int		$notrigger		1=do not execute triggers, 0 otherwise
 	 *  @return	int						>0 if OK, < 0 if KO
 	 */
@@ -574,7 +578,7 @@ class AdherentType extends CommonObject
 	public function getmorphylib($morphy = '')
 	{
 		global $langs;
-		if ($morphy == 'phy') { return $langs->trans("Physical"); } elseif ($morphy == 'mor') { return $langs->trans("Moral"); } else return $langs->trans("MorPhy");
+		if ($morphy == 'phy') { return $langs->trans("Physical"); } elseif ($morphy == 'mor') { return $langs->trans("Moral"); } else return $langs->trans("MorAndPhy");
 		//return $morphy;
 	}
 
@@ -591,7 +595,15 @@ class AdherentType extends CommonObject
 		global $langs;
 
 		$result = '';
-		$label = $langs->trans("ShowTypeCard", $this->label);
+
+		$label = '';
+
+		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("MemberType").'</u>';
+		$label .= ' '.$this->getLibStatut(4);
+		$label .= '<br>'.$langs->trans("Label").': '.$this->label;
+		if (isset($this->subscription)) {
+			$label .= '<br>'.$langs->trans("SubscriptionRequired").': '.yn($this->subscription);
+		}
 
 		$linkstart = '<a href="'.DOL_URL_ROOT.'/adherents/type.php?rowid='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend = '</a>';
@@ -707,7 +719,7 @@ class AdherentType extends CommonObject
 	 */
 	public function initAsSpecimen()
 	{
-		global $conf, $user, $langs;
+		global $user;
 
 		// Initialise parametres
 		$this->id = 0;
@@ -735,8 +747,6 @@ class AdherentType extends CommonObject
 	 */
 	public function getMailOnValid()
 	{
-		global $conf;
-
 		if (!empty($this->mail_valid) && trim(dol_htmlentitiesbr_decode($this->mail_valid))) {
 			return $this->mail_valid;
 		}
@@ -751,8 +761,6 @@ class AdherentType extends CommonObject
 	 */
 	public function getMailOnSubscription()
 	{
-		global $conf;
-
 		// mail_subscription not  defined so never used
 		if (!empty($this->mail_subscription) && trim(dol_htmlentitiesbr_decode($this->mail_subscription))) {  // Property not yet defined
 			return $this->mail_subscription;
@@ -768,8 +776,6 @@ class AdherentType extends CommonObject
 	 */
 	public function getMailOnResiliate()
 	{
-		global $conf;
-
 		// NOTE mail_resiliate not defined so never used
 		if (!empty($this->mail_resiliate) && trim(dol_htmlentitiesbr_decode($this->mail_resiliate))) {  // Property not yet defined
 			return $this->mail_resiliate;
diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index d86a9e21d8c..62d0e03e27e 100644
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -32,18 +32,18 @@ include_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
  */
 class AdherentStats extends Stats
 {
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element;
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element;
 
-    public $memberid;
-    public $socid;
-    public $userid;
+	public $memberid;
+	public $socid;
+	public $userid;
 
-    public $from;
-    public $field;
-    public $where;
+	public $from;
+	public $field;
+	public $where;
 
 
 	/**
@@ -51,15 +51,15 @@ class AdherentStats extends Stats
 	 *
 	 *	@param 		DoliDB		$db			Database handler
 	 * 	@param 		int			$socid	   	Id third party
-     * 	@param   	int			$userid    	Id user for filter
+	 * 	@param   	int			$userid    	Id user for filter
 	 */
 	public function __construct($db, $socid = 0, $userid = 0)
 	{
 		global $user, $conf;
 
 		$this->db = $db;
-        $this->socid = $socid;
-        $this->userid = $userid;
+		$this->socid = $socid;
+		$this->userid = $userid;
 
 		$object = new Subscription($this->db);
 
@@ -74,16 +74,16 @@ class AdherentStats extends Stats
 		if ($this->memberid) {
 			$this->where .= " AND m.rowid = ".$this->memberid;
 		}
-        //if ($this->userid > 0) $this->where.=' AND fk_user_author = '.$this->userid;
+		//if ($this->userid > 0) $this->where.=' AND fk_user_author = '.$this->userid;
 	}
 
 
 	/**
 	 * Return the number of proposition by month for a given year
 	 *
-     * @param   int		$year       Year
-     *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
-     * @return	array				Array of nb each month
+	 * @param   int		$year       Year
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 * @return	array				Array of nb each month
 	 */
 	public function getNbByMonth($year, $format = 0)
 	{
@@ -95,7 +95,7 @@ class AdherentStats extends Stats
 		$sql .= " WHERE date_format(p.dateadh,'%Y') = ".((int) $year);
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getNbByMonth($year, $sql, $format);
 	}
@@ -103,7 +103,7 @@ class AdherentStats extends Stats
 	/**
 	 * Return the number of subscriptions by year
 	 *
-     * @return	array				Array of nb each year
+	 * @return	array				Array of nb each year
 	 */
 	public function getNbByYear()
 	{
@@ -114,7 +114,7 @@ class AdherentStats extends Stats
 		//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getNbByYear($sql);
 	}
@@ -122,9 +122,9 @@ class AdherentStats extends Stats
 	/**
 	 * Return the number of subscriptions by month for a given year
 	 *
-     * @param   int		$year       Year
-     * @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
-     * @return	array				Array of amount each month
+	 * @param   int		$year       Year
+	 * @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 * @return	array				Array of amount each month
 	 */
 	public function getAmountByMonth($year, $format = 0)
 	{
@@ -136,7 +136,7 @@ class AdherentStats extends Stats
 		$sql .= " WHERE date_format(p.dateadh,'%Y') = ".((int) $year);
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getAmountByMonth($year, $sql, $format);
 	}
@@ -144,8 +144,8 @@ class AdherentStats extends Stats
 	/**
 	 * Return average amount each month
 	 *
-     * @param   int		$year       Year
-     * @return	array				Array of average each month
+	 * @param   int		$year       Year
+	 * @return	array				Array of average each month
 	 */
 	public function getAverageByMonth($year)
 	{
@@ -157,7 +157,7 @@ class AdherentStats extends Stats
 		$sql .= " WHERE date_format(p.dateadh,'%Y') = ".((int) $year);
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getAverageByMonth($year, $sql);
 	}
@@ -177,7 +177,7 @@ class AdherentStats extends Stats
 		//if (!$user->rights->societe->client->voir && !$this->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY year";
-        $sql .= $this->db->order('year', 'DESC');
+		$sql .= $this->db->order('year', 'DESC');
 
 		return $this->_getAllByYear($sql);
 	}
diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index 230b839f726..6fa3058dca1 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2016	Xebax Christy	<xebax@wanadoo.fr>
  * Copyright (C) 2017	Regis Houssin	<regis.houssin@inodbox.com>
  * Copyright (C) 2020	Thibault FOUCART<support@ptibogxiv.net>
+ * Copyright (C) 2020		Frédéric 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
@@ -32,477 +33,481 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
  */
 class Members extends DolibarrApi
 {
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'morphy',
-        'typeid'
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'morphy',
+		'typeid'
+	);
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+	}
 
-    /**
-     * Get properties of a member object
-     *
-     * Return an array with member informations
-     *
-     * @param     int     $id ID of member
-     * @return    array|mixed data without useless information
-     *
-     * @throws    RestException
-     */
-    public function get($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->adherent->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a member object
+	 *
+	 * Return an array with member informations
+	 *
+	 * @param     int     $id ID of member
+	 * @return    array|mixed data without useless information
+	 *
+	 * @throws    RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->lire) {
+			throw new RestException(401);
+		}
 
-        $member = new Adherent($this->db);
-        $result = $member->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'member not found');
-        }
+		$member = new Adherent($this->db);
+		if ($id == 0) {
+			$result = $member->initAsSpecimen();
+		} else {
+			$result = $member->fetch($id);
+		}
+		if (!$result) {
+			throw new RestException(404, 'member not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('adherent', $member->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('adherent', $member->id) && $id > 0) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        return $this->_cleanObjectDatas($member);
-    }
+		return $this->_cleanObjectDatas($member);
+	}
 
-    /**
-     * Get properties of a member object by linked thirdparty
-     *
-     * Return an array with member informations
-     *
-     * @param     int     $thirdparty ID of third party
-     *
-     * @return array|mixed Data without useless information
-     *
-     * @url GET thirdparty/{thirdparty}
-     *
-     * @throws RestException 401
-     * @throws RestException 404
-     */
-    public function getByThirdparty($thirdparty)
-    {
-        if (! DolibarrApiAccess::$user->rights->adherent->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a member object by linked thirdparty
+	 *
+	 * Return an array with member informations
+	 *
+	 * @param     int     $thirdparty 	ID of third party
+	 *
+	 * @return Object 					Data without useless information
+	 *
+	 * @url GET thirdparty/{thirdparty}
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 */
+	public function getByThirdparty($thirdparty)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->lire) {
+			throw new RestException(401);
+		}
 
-        $member = new Adherent($this->db);
-        $result = $member->fetch('', '', $thirdparty);
-        if ( ! $result ) {
-            throw new RestException(404, 'member not found');
-        }
+		$member = new Adherent($this->db);
+		$result = $member->fetch('', '', $thirdparty);
+		if (!$result) {
+			throw new RestException(404, 'member not found');
+		}
 
-        if ( ! DolibarrApi::_checkAccessToResource('adherent', $member->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('adherent', $member->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        return $this->_cleanObjectDatas($member);
-    }
+		return $this->_cleanObjectDatas($member);
+	}
 
-    /**
-     * Get properties of a member object by linked thirdparty email
-     *
-     * Return an array with member informations
-     *
-     * @param  string $email            Email of third party
-     *
-     * @return array|mixed Data without useless information
-     *
-     * @url GET thirdparty/email/{email}
-     *
-     * @throws RestException 401
-     * @throws RestException 404
-     */
-    public function getByThirdpartyEmail($email)
-    {
-        if (! DolibarrApiAccess::$user->rights->adherent->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a member object by linked thirdparty email
+	 *
+	 * Return an array with member informations
+	 *
+	 * @param  string $email            Email of third party
+	 *
+	 * @return Object 					Data without useless information
+	 *
+	 * @url GET thirdparty/email/{email}
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 */
+	public function getByThirdpartyEmail($email)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->lire) {
+			throw new RestException(401);
+		}
 
-        $thirdparty = new Societe($this->db);
-        $result = $thirdparty->fetch('', '', '', '', '', '', '', '', '', '', $email);
-        if ( ! $result ) {
-            throw new RestException(404, 'thirdparty not found');
-        }
+		$thirdparty = new Societe($this->db);
+		$result = $thirdparty->fetch('', '', '', '', '', '', '', '', '', '', $email);
+		if (!$result) {
+			throw new RestException(404, 'thirdparty not found');
+		}
 
-        $member = new Adherent($this->db);
-        $result = $member->fetch('', '', $thirdparty->id);
-        if ( ! $result ) {
-            throw new RestException(404, 'member not found');
-        }
+		$member = new Adherent($this->db);
+		$result = $member->fetch('', '', $thirdparty->id);
+		if (!$result) {
+			throw new RestException(404, 'member not found');
+		}
 
-        if ( ! DolibarrApi::_checkAccessToResource('adherent', $member->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('adherent', $member->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        return $this->_cleanObjectDatas($member);
-    }
+		return $this->_cleanObjectDatas($member);
+	}
 
-    /**
-     * Get properties of a member object by linked thirdparty barcode
-     *
-     * Return an array with member informations
-     *
-     * @param  string $barcode            Barcode of third party
-     *
-     * @return array|mixed Data without useless information
-     *
-     * @url GET thirdparty/barcode/{barcode}
-     *
-     * @throws RestException 401
-     * @throws RestException 404
-     */
-    public function getByThirdpartyBarcode($barcode)
-    {
-        if (! DolibarrApiAccess::$user->rights->adherent->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a member object by linked thirdparty barcode
+	 *
+	 * Return an array with member informations
+	 *
+	 * @param  string $barcode      	Barcode of third party
+	 *
+	 * @return Object 					Data without useless information
+	 *
+	 * @url GET thirdparty/barcode/{barcode}
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 */
+	public function getByThirdpartyBarcode($barcode)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->lire) {
+			throw new RestException(401);
+		}
 
-        $thirdparty = new Societe($this->db);
-        $result = $thirdparty->fetch('', '', '', $barcode);
-        if ( ! $result ) {
-            throw new RestException(404, 'thirdparty not found');
-        }
+		$thirdparty = new Societe($this->db);
+		$result = $thirdparty->fetch('', '', '', $barcode);
+		if (!$result) {
+			throw new RestException(404, 'thirdparty not found');
+		}
 
-        $member = new Adherent($this->db);
-        $result = $member->fetch('', '', $thirdparty->id);
-        if ( ! $result ) {
-            throw new RestException(404, 'member not found');
-        }
+		$member = new Adherent($this->db);
+		$result = $member->fetch('', '', $thirdparty->id);
+		if (!$result) {
+			throw new RestException(404, 'member not found');
+		}
 
-        if ( ! DolibarrApi::_checkAccessToResource('adherent', $member->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('adherent', $member->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        return $this->_cleanObjectDatas($member);
-    }
+		return $this->_cleanObjectDatas($member);
+	}
 
-    /**
-     * List members
-     *
-     * Get a list of members
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Limit for list
-     * @param int       $page       Page number
-     * @param string    $typeid     ID of the type of member
+	/**
+	 * List members
+	 *
+	 * Get a list of members
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Limit for list
+	 * @param int       $page       Page number
+	 * @param string    $typeid     ID of the type of member
 	 * @param  int    $category   Use this param to filter list by category
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma.
-     *                              Example: "(t.ref:like:'SO-%') and ((t.date_creation:<:'20160101') or (t.nature:is:NULL))"
-     * @return array                Array of member objects
-     *
-     * @throws RestException
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $typeid = '', $category = 0, $sqlfilters = '')
-    {
-        global $db, $conf;
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma.
+	 *                              Example: "(t.ref:like:'SO-%') and ((t.date_creation:<:'20160101') or (t.nature:is:NULL))"
+	 * @return array                Array of member objects
+	 *
+	 * @throws RestException
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $typeid = '', $category = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        if (!DolibarrApiAccess::$user->rights->adherent->lire) {
-            throw new RestException(401);
-        }
+		if (!DolibarrApiAccess::$user->rights->adherent->lire) {
+			throw new RestException(401);
+		}
 
-        $sql = "SELECT t.rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."adherent as t";
-    	if ($category > 0) {
+		$sql = "SELECT t.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as t";
+		if ($category > 0) {
 			$sql .= ", ".MAIN_DB_PREFIX."categorie_member as c";
-    	}
-        $sql .= ' WHERE t.entity IN ('.getEntity('adherent').')';
-        if (!empty($typeid)) {
-            $sql .= ' AND t.fk_adherent_type='.$typeid;
-        }
-    	// Select members of given category
-    	if ($category > 0) {
+		}
+		$sql .= ' WHERE t.entity IN ('.getEntity('adherent').')';
+		if (!empty($typeid)) {
+			$sql .= ' AND t.fk_adherent_type='.$typeid;
+		}
+		// Select members of given category
+		if ($category > 0) {
 			$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
 			$sql .= " AND c.fk_member = t.rowid ";
-    	}
-        // Add sql filters
-        if ($sqlfilters) {
-            if (!DolibarrApi::_checkFilters($sqlfilters)) {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		}
+		// Add sql filters
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        $result = $this->db->query($sql);
-        if ($result) {
-            $i = 0;
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min) {
-            	$obj = $this->db->fetch_object($result);
-                $member = new Adherent($this->db);
-                if ($member->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($member);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve member list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No member found');
-        }
+		$result = $this->db->query($sql);
+		if ($result) {
+			$i = 0;
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min) {
+				$obj = $this->db->fetch_object($result);
+				$member = new Adherent($this->db);
+				if ($member->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($member);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve member list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No member found');
+		}
 
-        return $obj_ret;
-    }
+		return $obj_ret;
+	}
 
-    /**
-     * Create member object
-     *
-     * @param array $request_data   Request data
-     * @return int  ID of member
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->adherent->creer) {
-            throw new RestException(401);
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+	/**
+	 * Create member object
+	 *
+	 * @param array $request_data   Request data
+	 * @return int  ID of member
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->creer) {
+			throw new RestException(401);
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        $member = new Adherent($this->db);
-        foreach ($request_data as $field => $value) {
-            $member->$field = $value;
-        }
-        if ($member->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, 'Error creating member', array_merge(array($member->error), $member->errors));
-        }
-        return $member->id;
-    }
+		$member = new Adherent($this->db);
+		foreach ($request_data as $field => $value) {
+			$member->$field = $value;
+		}
+		if ($member->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, 'Error creating member', array_merge(array($member->error), $member->errors));
+		}
+		return $member->id;
+	}
 
-    /**
-     * Update member
-     *
-     * @param int   $id             ID of member to update
-     * @param array $request_data   Datas
-     * @return int
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->adherent->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Update member
+	 *
+	 * @param int   $id             ID of member to update
+	 * @param array $request_data   Datas
+	 * @return Object				Updated object
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->creer) {
+			throw new RestException(401);
+		}
 
-        $member = new Adherent($this->db);
-        $result = $member->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'member not found');
-        }
+		$member = new Adherent($this->db);
+		$result = $member->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'member not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('member', $member->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('member', $member->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            // Process the status separately because it must be updated using
-            // the validate() and resiliate() methods of the class Adherent.
-            if ($field == 'statut') {
-                if ($value == '0') {
-                    $result = $member->resiliate(DolibarrApiAccess::$user);
-                    if ($result < 0) {
-                        throw new RestException(500, 'Error when resiliating member: '.$member->error);
-                    }
-                } elseif ($value == '1') {
-                    $result = $member->validate(DolibarrApiAccess::$user);
-                    if ($result < 0) {
-                        throw new RestException(500, 'Error when validating member: '.$member->error);
-                    }
-                }
-            } else {
-                $member->$field = $value;
-            }
-        }
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			// Process the status separately because it must be updated using
+			// the validate() and resiliate() methods of the class Adherent.
+			if ($field == 'statut') {
+				if ($value == '0') {
+					$result = $member->resiliate(DolibarrApiAccess::$user);
+					if ($result < 0) {
+						throw new RestException(500, 'Error when resiliating member: '.$member->error);
+					}
+				} elseif ($value == '1') {
+					$result = $member->validate(DolibarrApiAccess::$user);
+					if ($result < 0) {
+						throw new RestException(500, 'Error when validating member: '.$member->error);
+					}
+				}
+			} else {
+				$member->$field = $value;
+			}
+		}
 
-        // If there is no error, update() returns the number of affected rows
-        // so if the update is a no op, the return value is zero.
-        if ($member->update(DolibarrApiAccess::$user) >= 0) {
-            return $this->get($id);
-        } else {
-            throw new RestException(500, $member->error);
-        }
-    }
+		// If there is no error, update() returns the number of affected rows
+		// so if the update is a no op, the return value is zero.
+		if ($member->update(DolibarrApiAccess::$user) >= 0) {
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $member->error);
+		}
+	}
 
-    /**
-     * Delete member
-     *
-     * @param int $id   member ID
-     * @return array
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->adherent->supprimer) {
-            throw new RestException(401);
-        }
-        $member = new Adherent($this->db);
-        $result = $member->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'member not found');
-        }
+	/**
+	 * Delete member
+	 *
+	 * @param int $id   member ID
+	 * @return array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->supprimer) {
+			throw new RestException(401);
+		}
+		$member = new Adherent($this->db);
+		$result = $member->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'member not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('member', $member->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('member', $member->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if (!$member->delete($member->id, DolibarrApiAccess::$user)) {
-            throw new RestException(401, 'error when deleting member');
-        }
+		if (!$member->delete($member->id, DolibarrApiAccess::$user)) {
+			throw new RestException(401, 'error when deleting member');
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'member deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'member deleted'
+			)
+		);
+	}
 
-    /**
-     * Validate fields before creating an object
-     *
-     * @param array|null    $data   Data to validate
-     * @return array
-     *
-     * @throws RestException
-     */
-    private function _validate($data)
-    {
-        $member = array();
-        foreach (Members::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $member[$field] = $data[$field];
-        }
-        return $member;
-    }
+	/**
+	 * Validate fields before creating an object
+	 *
+	 * @param array|null    $data   Data to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	private function _validate($data)
+	{
+		$member = array();
+		foreach (Members::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$member[$field] = $data[$field];
+		}
+		return $member;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object    Object to clean
+	 * @return  Object    Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        // Remove the subscriptions because they are handled as a subresource.
-        unset($object->subscriptions);
-        unset($object->fk_incoterms);
-        unset($object->label_incoterms);
-        unset($object->location_incoterms);
-        unset($object->fk_delivery_address);
-        unset($object->shipping_method_id);
+		// Remove the subscriptions because they are handled as a subresource.
+		unset($object->subscriptions);
+		unset($object->fk_incoterms);
+		unset($object->label_incoterms);
+		unset($object->location_incoterms);
+		unset($object->fk_delivery_address);
+		unset($object->shipping_method_id);
 
-        unset($object->total_ht);
-        unset($object->total_ttc);
-        unset($object->total_tva);
-        unset($object->total_localtax1);
-        unset($object->total_localtax2);
+		unset($object->total_ht);
+		unset($object->total_ttc);
+		unset($object->total_tva);
+		unset($object->total_localtax1);
+		unset($object->total_localtax2);
 
-        return $object;
-    }
+		return $object;
+	}
 
-    /**
-     * List subscriptions of a member
-     *
-     * Get a list of subscriptions
-     *
-     * @param int $id ID of member
-     * @return array Array of subscription objects
-     *
-     * @throws RestException
-     *
-     * @url GET {id}/subscriptions
-     */
-    public function getSubscriptions($id)
-    {
-        $obj_ret = array();
+	/**
+	 * List subscriptions of a member
+	 *
+	 * Get a list of subscriptions
+	 *
+	 * @param int $id ID of member
+	 * @return array Array of subscription objects
+	 *
+	 * @throws RestException
+	 *
+	 * @url GET {id}/subscriptions
+	 */
+	public function getSubscriptions($id)
+	{
+		$obj_ret = array();
 
-        if (!DolibarrApiAccess::$user->rights->adherent->cotisation->lire) {
-            throw new RestException(401);
-        }
+		if (!DolibarrApiAccess::$user->rights->adherent->cotisation->lire) {
+			throw new RestException(401);
+		}
 
-        $member = new Adherent($this->db);
-        $result = $member->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'member not found');
-        }
+		$member = new Adherent($this->db);
+		$result = $member->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'member not found');
+		}
 
-        $obj_ret = array();
-        foreach ($member->subscriptions as $subscription) {
-            $obj_ret[] = $this->_cleanObjectDatas($subscription);
-        }
-        return $obj_ret;
-    }
+		$obj_ret = array();
+		foreach ($member->subscriptions as $subscription) {
+			$obj_ret[] = $this->_cleanObjectDatas($subscription);
+		}
+		return $obj_ret;
+	}
 
-    /**
-     * Add a subscription for a member
-     *
-     * @param int $id               ID of member
-     * @param int $start_date       Start date {@from body} {@type timestamp}
-     * @param int $end_date         End date {@from body} {@type timestamp}
-     * @param float $amount         Amount (may be 0) {@from body}
-     * @param string $label         Label {@from body}
-     * @return int  ID of subscription
-     *
-     * @url POST {id}/subscriptions
-     */
-    public function createSubscription($id, $start_date, $end_date, $amount, $label = '')
-    {
-        if (!DolibarrApiAccess::$user->rights->adherent->cotisation->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Add a subscription for a member
+	 *
+	 * @param int $id               ID of member
+	 * @param int $start_date       Start date {@from body} {@type timestamp}
+	 * @param int $end_date         End date {@from body} {@type timestamp}
+	 * @param float $amount         Amount (may be 0) {@from body}
+	 * @param string $label         Label {@from body}
+	 * @return int  ID of subscription
+	 *
+	 * @url POST {id}/subscriptions
+	 */
+	public function createSubscription($id, $start_date, $end_date, $amount, $label = '')
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->cotisation->creer) {
+			throw new RestException(401);
+		}
 
-        $member = new Adherent($this->db);
-        $result = $member->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'member not found');
-        }
+		$member = new Adherent($this->db);
+		$result = $member->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'member not found');
+		}
 
-        return $member->subscription($start_date, $amount, 0, '', $label, '', '', '', $end_date);
-    }
+		return $member->subscription($start_date, $amount, 0, '', $label, '', '', '', $end_date);
+	}
 
-    /**
-     * Get categories for a member
-     *
-     * @param int		$id         ID of member
-     * @param string		$sortfield	Sort field
-     * @param string		$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     *
-     * @return mixed
-     *
-     * @url GET {id}/categories
-     */
+	/**
+	 * Get categories for a member
+	 *
+	 * @param int		$id         ID of member
+	 * @param string		$sortfield	Sort field
+	 * @param string		$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
+	 *
+	 * @return mixed
+	 *
+	 * @url GET {id}/categories
+	 */
 	public function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
 	{
 		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index 682fb9d707c..f9f410f34aa 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -27,289 +27,289 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
  */
 class MembersTypes extends DolibarrApi
 {
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'label',
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'label',
+	);
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+	}
 
-    /**
-     * Get properties of a member type object
-     *
-     * Return an array with member type informations
-     *
-     * @param     int     $id ID of member type
-     * @return    array|mixed data without useless information
-     *
-     * @throws    RestException
-     */
-    public function get($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->adherent->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a member type object
+	 *
+	 * Return an array with member type informations
+	 *
+	 * @param     int     $id ID of member type
+	 * @return    array|mixed data without useless information
+	 *
+	 * @throws    RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->lire) {
+			throw new RestException(401);
+		}
 
-        $membertype = new AdherentType($this->db);
-        $result = $membertype->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'member type not found');
-        }
+		$membertype = new AdherentType($this->db);
+		$result = $membertype->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'member type not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('member', $membertype->id, 'adherent_type')) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('member', $membertype->id, 'adherent_type')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        return $this->_cleanObjectDatas($membertype);
-    }
+		return $this->_cleanObjectDatas($membertype);
+	}
 
-    /**
-     * List members types
-     *
-     * Get a list of members types
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Limit for list
-     * @param int       $page       Page number
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.libelle:like:'SO-%') and (t.subscription:=:'1')"
-     * @return array                Array of member type objects
-     *
-     * @throws RestException
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
-    {
-        global $db, $conf;
+	/**
+	 * List members types
+	 *
+	 * Get a list of members types
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Limit for list
+	 * @param int       $page       Page number
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.libelle:like:'SO-%') and (t.subscription:=:'1')"
+	 * @return array                Array of member type objects
+	 *
+	 * @throws RestException
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        if (!DolibarrApiAccess::$user->rights->adherent->lire) {
-            throw new RestException(401);
-        }
+		if (!DolibarrApiAccess::$user->rights->adherent->lire) {
+			throw new RestException(401);
+		}
 
-        $sql = "SELECT t.rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as t";
-        $sql .= ' WHERE t.entity IN ('.getEntity('member_type').')';
+		$sql = "SELECT t.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as t";
+		$sql .= ' WHERE t.entity IN ('.getEntity('member_type').')';
 
-        // Add sql filters
-        if ($sqlfilters) {
-            if (!DolibarrApi::_checkFilters($sqlfilters)) {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		// Add sql filters
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        $result = $this->db->query($sql);
-        if ($result) {
-            $i = 0;
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min) {
-            	$obj = $this->db->fetch_object($result);
-                $membertype = new AdherentType($this->db);
-                if ($membertype->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($membertype);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve member type list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No member type found');
-        }
+		$result = $this->db->query($sql);
+		if ($result) {
+			$i = 0;
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min) {
+				$obj = $this->db->fetch_object($result);
+				$membertype = new AdherentType($this->db);
+				if ($membertype->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($membertype);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve member type list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No member type found');
+		}
 
-        return $obj_ret;
-    }
+		return $obj_ret;
+	}
 
-    /**
-     * Create member type object
-     *
-     * @param array $request_data   Request data
-     * @return int  ID of member type
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->adherent->configurer) {
-            throw new RestException(401);
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+	/**
+	 * Create member type object
+	 *
+	 * @param array $request_data   Request data
+	 * @return int  ID of member type
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->configurer) {
+			throw new RestException(401);
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        $membertype = new AdherentType($this->db);
-        foreach ($request_data as $field => $value) {
-            $membertype->$field = $value;
-        }
-        if ($membertype->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, 'Error creating member type', array_merge(array($membertype->error), $membertype->errors));
-        }
-        return $membertype->id;
-    }
+		$membertype = new AdherentType($this->db);
+		foreach ($request_data as $field => $value) {
+			$membertype->$field = $value;
+		}
+		if ($membertype->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, 'Error creating member type', array_merge(array($membertype->error), $membertype->errors));
+		}
+		return $membertype->id;
+	}
 
-    /**
-     * Update member type
-     *
-     * @param int   $id             ID of member type to update
-     * @param array $request_data   Datas
-     * @return int
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->adherent->configurer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Update member type
+	 *
+	 * @param int   $id             ID of member type to update
+	 * @param array $request_data   Datas
+	 * @return int
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->configurer) {
+			throw new RestException(401);
+		}
 
-        $membertype = new AdherentType($this->db);
-        $result = $membertype->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'member type not found');
-        }
+		$membertype = new AdherentType($this->db);
+		$result = $membertype->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'member type not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('member', $membertype->id, 'adherent_type')) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('member', $membertype->id, 'adherent_type')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            // Process the status separately because it must be updated using
-            // the validate() and resiliate() methods of the class AdherentType.
-            $membertype->$field = $value;
-        }
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			// Process the status separately because it must be updated using
+			// the validate() and resiliate() methods of the class AdherentType.
+			$membertype->$field = $value;
+		}
 
-        // If there is no error, update() returns the number of affected rows
-        // so if the update is a no op, the return value is zero.
-        if ($membertype->update(DolibarrApiAccess::$user) >= 0) {
-            return $this->get($id);
-        } else {
-            throw new RestException(500, $membertype->error);
-        }
-    }
+		// If there is no error, update() returns the number of affected rows
+		// so if the update is a no op, the return value is zero.
+		if ($membertype->update(DolibarrApiAccess::$user) >= 0) {
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $membertype->error);
+		}
+	}
 
-    /**
-     * Delete member type
-     *
-     * @param int $id   member type ID
-     * @return array
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->adherent->configurer) {
-            throw new RestException(401);
-        }
-        $membertype = new AdherentType($this->db);
-        $result = $membertype->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'member type not found');
-        }
+	/**
+	 * Delete member type
+	 *
+	 * @param int $id   member type ID
+	 * @return array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->configurer) {
+			throw new RestException(401);
+		}
+		$membertype = new AdherentType($this->db);
+		$result = $membertype->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'member type not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('member', $membertype->id, 'adherent_type')) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('member', $membertype->id, 'adherent_type')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if (!$membertype->delete()) {
-            throw new RestException(401, 'error when deleting member type');
-        }
+		if (!$membertype->delete()) {
+			throw new RestException(401, 'error when deleting member type');
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'member type deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'member type deleted'
+			)
+		);
+	}
 
-    /**
-     * Validate fields before creating an object
-     *
-     * @param array|null    $data   Data to validate
-     * @return array
-     *
-     * @throws RestException
-     */
-    private function _validate($data)
-    {
-        $membertype = array();
-        foreach (MembersTypes::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $membertype[$field] = $data[$field];
-        }
-        return $membertype;
-    }
+	/**
+	 * Validate fields before creating an object
+	 *
+	 * @param array|null    $data   Data to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	private function _validate($data)
+	{
+		$membertype = array();
+		foreach (MembersTypes::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$membertype[$field] = $data[$field];
+		}
+		return $membertype;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object    Object to clean
+	 * @return    Object    Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->array_options);
-        unset($object->linkedObjectsIds);
-        unset($object->context);
-        unset($object->canvas);
-        unset($object->fk_project);
-        unset($object->contact);
-        unset($object->contact_id);
-        unset($object->thirdparty);
-        unset($object->user);
-        unset($object->origin);
-        unset($object->origin_id);
-        unset($object->ref_ext);
-        unset($object->country);
-        unset($object->country_id);
-        unset($object->country_code);
-        unset($object->barcode_type);
-        unset($object->barcode_type_code);
-        unset($object->barcode_type_label);
-        unset($object->barcode_type_coder);
-        unset($object->mode_reglement_id);
-        unset($object->cond_reglement_id);
-        unset($object->cond_reglement);
-        unset($object->fk_delivery_address);
-        unset($object->shipping_method_id);
-        unset($object->model_pdf);
-        unset($object->fk_account);
-        unset($object->note_public);
-        unset($object->note_private);
-        unset($object->fk_incoterms);
-        unset($object->label_incoterms);
-        unset($object->location_incoterms);
-        unset($object->name);
-        unset($object->lastname);
-        unset($object->firstname);
-        unset($object->civility_id);
-        unset($object->total_ht);
-        unset($object->total_tva);
-        unset($object->total_localtax1);
-        unset($object->total_localtax2);
-        unset($object->total_ttc);
+		unset($object->array_options);
+		unset($object->linkedObjectsIds);
+		unset($object->context);
+		unset($object->canvas);
+		unset($object->fk_project);
+		unset($object->contact);
+		unset($object->contact_id);
+		unset($object->thirdparty);
+		unset($object->user);
+		unset($object->origin);
+		unset($object->origin_id);
+		unset($object->ref_ext);
+		unset($object->country);
+		unset($object->country_id);
+		unset($object->country_code);
+		unset($object->barcode_type);
+		unset($object->barcode_type_code);
+		unset($object->barcode_type_label);
+		unset($object->barcode_type_coder);
+		unset($object->mode_reglement_id);
+		unset($object->cond_reglement_id);
+		unset($object->cond_reglement);
+		unset($object->fk_delivery_address);
+		unset($object->shipping_method_id);
+		unset($object->model_pdf);
+		unset($object->fk_account);
+		unset($object->note_public);
+		unset($object->note_private);
+		unset($object->fk_incoterms);
+		unset($object->label_incoterms);
+		unset($object->location_incoterms);
+		unset($object->name);
+		unset($object->lastname);
+		unset($object->firstname);
+		unset($object->civility_id);
+		unset($object->total_ht);
+		unset($object->total_tva);
+		unset($object->total_localtax1);
+		unset($object->total_localtax2);
+		unset($object->total_ttc);
 
-        return $object;
-    }
+		return $object;
+	}
 }
diff --git a/htdocs/adherents/class/api_subscriptions.class.php b/htdocs/adherents/class/api_subscriptions.class.php
index d5adbb0bc5b..370de13c3a2 100644
--- a/htdocs/adherents/class/api_subscriptions.class.php
+++ b/htdocs/adherents/class/api_subscriptions.class.php
@@ -27,219 +27,219 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
  */
 class Subscriptions extends DolibarrApi
 {
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'fk_adherent',
-        'dateh',
-        'datef',
-        'amount',
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'fk_adherent',
+		'dateh',
+		'datef',
+		'amount',
+	);
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+	}
 
-    /**
-     * Get properties of a subscription object
-     *
-     * Return an array with subscription informations
-     *
-     * @param     int     $id ID of subscription
-     * @return    array|mixed data without useless information
-     *
-     * @throws    RestException
-     */
-    public function get($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->adherent->cotisation->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a subscription object
+	 *
+	 * Return an array with subscription informations
+	 *
+	 * @param     int     $id ID of subscription
+	 * @return    Object data without useless information
+	 *
+	 * @throws    RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->cotisation->lire) {
+			throw new RestException(401);
+		}
 
-        $subscription = new Subscription($this->db);
-        $result = $subscription->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Subscription not found');
-        }
+		$subscription = new Subscription($this->db);
+		$result = $subscription->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Subscription not found');
+		}
 
-        return $this->_cleanObjectDatas($subscription);
-    }
+		return $this->_cleanObjectDatas($subscription);
+	}
 
-    /**
-     * List subscriptions
-     *
-     * Get a list of subscriptions
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Limit for list
-     * @param int       $page       Page number
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.import_key:<:'20160101')"
-     * @return array Array of subscription objects
-     *
-     * @throws RestException
-     */
-    public function index($sortfield = "dateadh", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
-    {
-        global $db, $conf;
+	/**
+	 * List subscriptions
+	 *
+	 * Get a list of subscriptions
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Limit for list
+	 * @param int       $page       Page number
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.import_key:<:'20160101')"
+	 * @return array Array of subscription objects
+	 *
+	 * @throws RestException
+	 */
+	public function index($sortfield = "dateadh", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        if (!DolibarrApiAccess::$user->rights->adherent->cotisation->lire) {
-            throw new RestException(401);
-        }
+		if (!DolibarrApiAccess::$user->rights->adherent->cotisation->lire) {
+			throw new RestException(401);
+		}
 
-        $sql = "SELECT rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."subscription as t";
-        $sql .= ' WHERE 1 = 1';
-        // Add sql filters
-        if ($sqlfilters) {
-            if (!DolibarrApi::_checkFilters($sqlfilters)) {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		$sql = "SELECT rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."subscription as t";
+		$sql .= ' WHERE 1 = 1';
+		// Add sql filters
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        $result = $this->db->query($sql);
-        if ($result) {
-            $i = 0;
-            $num = $this->db->num_rows($result);
-            while ($i < min($limit, $num)) {
-            	$obj = $this->db->fetch_object($result);
-                $subscription = new Subscription($this->db);
-                if ($subscription->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($subscription);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve subscription list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No Subscription found');
-        }
+		$result = $this->db->query($sql);
+		if ($result) {
+			$i = 0;
+			$num = $this->db->num_rows($result);
+			while ($i < min($limit, $num)) {
+				$obj = $this->db->fetch_object($result);
+				$subscription = new Subscription($this->db);
+				if ($subscription->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($subscription);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve subscription list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No Subscription found');
+		}
 
-        return $obj_ret;
-    }
+		return $obj_ret;
+	}
 
-    /**
-     * Create subscription object
-     *
-     * @param array $request_data   Request data
-     * @return int  ID of subscription
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->adherent->cotisation->creer) {
-            throw new RestException(401);
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+	/**
+	 * Create subscription object
+	 *
+	 * @param array $request_data   Request data
+	 * @return int  ID of subscription
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->cotisation->creer) {
+			throw new RestException(401);
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        $subscription = new Subscription($this->db);
-        foreach ($request_data as $field => $value) {
-            $subscription->$field = $value;
-        }
-        if ($subscription->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, 'Error when creating subscription', array_merge(array($subscription->error), $subscription->errors));
-        }
-        return $subscription->id;
-    }
+		$subscription = new Subscription($this->db);
+		foreach ($request_data as $field => $value) {
+			$subscription->$field = $value;
+		}
+		if ($subscription->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, 'Error when creating subscription', array_merge(array($subscription->error), $subscription->errors));
+		}
+		return $subscription->id;
+	}
 
-    /**
-     * Update subscription
-     *
-     * @param int   $id             ID of subscription to update
-     * @param array $request_data   Datas
-     * @return int
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->adherent->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Update subscription
+	 *
+	 * @param int   $id             ID of subscription to update
+	 * @param array $request_data   Datas
+	 * @return Object
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->creer) {
+			throw new RestException(401);
+		}
 
-        $subscription = new Subscription($this->db);
-        $result = $subscription->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Subscription not found');
-        }
+		$subscription = new Subscription($this->db);
+		$result = $subscription->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Subscription not found');
+		}
 
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $subscription->$field = $value;
-        }
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$subscription->$field = $value;
+		}
 
-        if ($subscription->update(DolibarrApiAccess::$user) > 0) {
-            return $this->get($id);
-        } else {
-            throw new RestException(500, $subscription->error);
-        }
-    }
+		if ($subscription->update(DolibarrApiAccess::$user) > 0) {
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $subscription->error);
+		}
+	}
 
-    /**
-     * Delete subscription
-     *
-     * @param int $id   ID of subscription to delete
-     * @return array
-     */
-    public function delete($id)
-    {
-        // The right to delete a subscription comes with the right to create one.
-        if (!DolibarrApiAccess::$user->rights->adherent->cotisation->creer) {
-            throw new RestException(401);
-        }
-        $subscription = new Subscription($this->db);
-        $result = $subscription->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Subscription not found');
-        }
+	/**
+	 * Delete subscription
+	 *
+	 * @param int $id   ID of subscription to delete
+	 * @return array
+	 */
+	public function delete($id)
+	{
+		// The right to delete a subscription comes with the right to create one.
+		if (!DolibarrApiAccess::$user->rights->adherent->cotisation->creer) {
+			throw new RestException(401);
+		}
+		$subscription = new Subscription($this->db);
+		$result = $subscription->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Subscription not found');
+		}
 
-        if (!$subscription->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(401, 'error when deleting subscription');
-        }
+		if (!$subscription->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(401, 'error when deleting subscription');
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'subscription deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'subscription deleted'
+			)
+		);
+	}
 
-    /**
-     * Validate fields before creating an object
-     *
-     * @param array|null    $data   Data to validate
-     * @return array
-     *
-     * @throws RestException
-     */
-    private function _validate($data)
-    {
-        $subscription = array();
-        foreach (Subscriptions::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $subscription[$field] = $data[$field];
-        }
-        return $subscription;
-    }
+	/**
+	 * Validate fields before creating an object
+	 *
+	 * @param array|null    $data   Data to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	private function _validate($data)
+	{
+		$subscription = array();
+		foreach (Subscriptions::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$subscription[$field] = $data[$field];
+		}
+		return $subscription;
+	}
 }
diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index 5a75fdbae2e..b6349bf9dc2 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -32,435 +32,449 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
  */
 class Subscription extends CommonObject
 {
-    /**
-     * @var string ID to identify managed object
-     */
-    public $element = 'subscription';
+	/**
+	 * @var string ID to identify managed object
+	 */
+	public $element = 'subscription';
 
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element = 'subscription';
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'subscription';
 
-    /**
-     * @var int  Does myobject support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by fk_soc, 'field@table'=Test with link by field@table
-     */
-    public $ismultientitymanaged = 'fk_adherent@adherent';
+	/**
+	 * @var int  Does myobject support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by fk_soc, 'field@table'=Test with link by field@table
+	 */
+	public $ismultientitymanaged = 'fk_adherent@adherent';
 
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto = 'payment';
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'payment';
 
-    /**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	/**
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
-    /**
-     * Date modification record (tms)
-     *
-     * @var integer
-     */
-    public $datem;
+	/**
+	 * Date modification record (tms)
+	 *
+	 * @var integer
+	 */
+	public $datem;
 
-    /**
-     * Subscription start date (date subscription)
-     *
-     * @var integer
-     */
-    public $dateh;
+	/**
+	 * Subscription start date (date subscription)
+	 *
+	 * @var integer
+	 */
+	public $dateh;
 
-    /**
-     * Subscription end date
-     *
-     * @var integer
-     */
-    public $datef;
+	/**
+	 * Subscription end date
+	 *
+	 * @var integer
+	 */
+	public $datef;
 
-    /**
-     * @var int ID
-     */
-    public $fk_type;
-    public $fk_adherent;
+	/**
+	 * @var int ID
+	 */
+	public $fk_type;
+	public $fk_adherent;
 
-    public $amount;
+	public $amount;
 
-    /**
-     * @var int ID
-     */
-    public $fk_bank;
+	/**
+	 * @var int ID
+	 */
+	public $fk_bank;
 
-    public $fields = array(
-    	'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-    	'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>15),
-    	'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>20),
-    	'fk_adherent' =>array('type'=>'integer', 'label'=>'Member', 'enabled'=>1, 'visible'=>-1, 'position'=>25),
-    	'dateadh' =>array('type'=>'datetime', 'label'=>'DateSubscription', 'enabled'=>1, 'visible'=>-1, 'position'=>30),
-    	'datef' =>array('type'=>'datetime', 'label'=>'DateEndSubscription', 'enabled'=>1, 'visible'=>-1, 'position'=>35),
-    	'subscription' =>array('type'=>'double(24,8)', 'label'=>'Amount', 'enabled'=>1, 'visible'=>-1, 'position'=>40, 'isameasure'=>1),
-    	'fk_bank' =>array('type'=>'integer', 'label'=>'BankId', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
-    	'note' =>array('type'=>'text', 'label'=>'Note', 'enabled'=>1, 'visible'=>-1, 'position'=>50),
-    	'fk_type' =>array('type'=>'integer', 'label'=>'MemberType', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
-    	'fk_user_creat' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'position'=>60),
-    	'fk_user_valid' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>65),
-    );
+	public $fields = array(
+		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
+		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>15),
+		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>20),
+		'fk_adherent' =>array('type'=>'integer', 'label'=>'Member', 'enabled'=>1, 'visible'=>-1, 'position'=>25),
+		'dateadh' =>array('type'=>'datetime', 'label'=>'DateSubscription', 'enabled'=>1, 'visible'=>-1, 'position'=>30),
+		'datef' =>array('type'=>'datetime', 'label'=>'DateEndSubscription', 'enabled'=>1, 'visible'=>-1, 'position'=>35),
+		'subscription' =>array('type'=>'double(24,8)', 'label'=>'Amount', 'enabled'=>1, 'visible'=>-1, 'position'=>40, 'isameasure'=>1),
+		'fk_bank' =>array('type'=>'integer', 'label'=>'BankId', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
+		'note' =>array('type'=>'text', 'label'=>'Note', 'enabled'=>1, 'visible'=>-1, 'position'=>50),
+		'fk_type' =>array('type'=>'integer', 'label'=>'MemberType', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
+		'fk_user_creat' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'position'=>60),
+		'fk_user_valid' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>65),
+	);
 
 
-    /**
-     *	Constructor
-     *
-     *	@param 		DoliDB		$db		Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *	Constructor
+	 *
+	 *	@param 		DoliDB		$db		Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *	Function who permitted cretaion of the subscription
-     *
-     *	@param	User	$user			User that create
-     *	@param  bool 	$notrigger 		false=launch triggers after, true=disable triggers
-     *	@return	int						<0 if KO, Id subscription created if OK
-     */
-    public function create($user, $notrigger = false)
-    {
-        global $langs;
+	/**
+	 *	Function who permitted cretaion of the subscription
+	 *
+	 *	@param	User	$user			User that create
+	 *	@param  bool 	$notrigger 		false=launch triggers after, true=disable triggers
+	 *	@return	int						<0 if KO, Id subscription created if OK
+	 */
+	public function create($user, $notrigger = false)
+	{
+		global $langs;
 
-        $error = 0;
+		$error = 0;
 
-        $now = dol_now();
+		$now = dol_now();
 
-        // Check parameters
-        if ($this->datef <= $this->dateh) {
-            $this->error = $langs->trans("ErrorBadValueForDate");
-            return -1;
-        }
-        if (empty($this->datec)) $this->datec = $now;
+		// Check parameters
+		if ($this->datef <= $this->dateh) {
+			$this->error = $langs->trans("ErrorBadValueForDate");
+			return -1;
+		}
+		if (empty($this->datec)) $this->datec = $now;
 
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."subscription (fk_adherent, fk_type, datec, dateadh, datef, subscription, note)";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."subscription (fk_adherent, fk_type, datec, dateadh, datef, subscription, note)";
 
-        require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-        $member = new Adherent($this->db);
-        $result = $member->fetch($this->fk_adherent);
+		require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+		$member = new Adherent($this->db);
+		$result = $member->fetch($this->fk_adherent);
 
-        if ($this->fk_type == null) {	// If type not defined, we use the type of member
-            $type = $member->typeid;
-        } else {
-            $type = $this->fk_type;
-        }
-        $sql .= " VALUES (".$this->fk_adherent.", '".$type."', '".$this->db->idate($now)."',";
-        $sql .= " '".$this->db->idate($this->dateh)."',";
-        $sql .= " '".$this->db->idate($this->datef)."',";
-        $sql .= " ".$this->amount.",";
-        $sql .= " '".$this->db->escape($this->note_public ? $this->note_public : $this->note)."')";
+		if ($this->fk_type == null) {	// If type not defined, we use the type of member
+			$type = $member->typeid;
+		} else {
+			$type = $this->fk_type;
+		}
+		$sql .= " VALUES (".$this->fk_adherent.", '".$this->db->escape($type)."', '".$this->db->idate($now)."',";
+		$sql .= " '".$this->db->idate($this->dateh)."',";
+		$sql .= " '".$this->db->idate($this->datef)."',";
+		$sql .= " ".$this->amount.",";
+		$sql .= " '".$this->db->escape($this->note_public ? $this->note_public : $this->note)."')";
 
-        $resql = $this->db->query($sql);
-        if (!$resql) {
-            $error++;
-            $this->errors[] = $this->db->lasterror();
-        }
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error++;
+			$this->errors[] = $this->db->lasterror();
+		}
 
-        if (!$error) {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
-            $this->fk_type = $type;
-        }
+		if (!$error) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+			$this->fk_type = $type;
+		}
 
-        if (!$error && !$notrigger) {
-        	$this->context = array('member'=>$member);
-        	// Call triggers
-            $result = $this->call_trigger('MEMBER_SUBSCRIPTION_CREATE', $user);
-            if ($result < 0) { $error++; }
-            // End call triggers
-        }
+		if (!$error && !$notrigger) {
+			$this->context = array('member' => $member);
+			// Call triggers
+			$result = $this->call_trigger('MEMBER_SUBSCRIPTION_CREATE', $user);
+			if ($result < 0) { $error++; }
+			// End call triggers
+		}
 
-        // Commit or rollback
-        if ($error) {
-            $this->db->rollback();
-            return -1;
-        } else {
-            $this->db->commit();
-            return $this->id;
-        }
-    }
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+			return -1;
+		} else {
+			$this->db->commit();
+			return $this->id;
+		}
+	}
 
 
-    /**
-     *  Method to load a subscription
-     *
-     *  @param	int		$rowid		Id subscription
-     *  @return	int					<0 if KO, =0 if not found, >0 if OK
-     */
-    public function fetch($rowid)
-    {
-        $sql = "SELECT rowid, fk_type, fk_adherent, datec,";
-        $sql .= " tms,";
-        $sql .= " dateadh as dateh,";
-        $sql .= " datef,";
-        $sql .= " subscription, note, fk_bank";
-        $sql .= " FROM ".MAIN_DB_PREFIX."subscription";
-        $sql .= "	WHERE rowid=".$rowid;
+	/**
+	 *  Method to load a subscription
+	 *
+	 *  @param	int		$rowid		Id subscription
+	 *  @return	int					<0 if KO, =0 if not found, >0 if OK
+	 */
+	public function fetch($rowid)
+	{
+		$sql = "SELECT rowid, fk_type, fk_adherent, datec,";
+		$sql .= " tms,";
+		$sql .= " dateadh as dateh,";
+		$sql .= " datef,";
+		$sql .= " subscription, note, fk_bank";
+		$sql .= " FROM ".MAIN_DB_PREFIX."subscription";
+		$sql .= "	WHERE rowid=".$rowid;
 
-        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            if ($this->db->num_rows($resql)) {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id             = $obj->rowid;
-                $this->ref            = $obj->rowid;
+				$this->id             = $obj->rowid;
+				$this->ref            = $obj->rowid;
 
-                $this->fk_type        = $obj->fk_type;
-                $this->fk_adherent    = $obj->fk_adherent;
-                $this->datec          = $this->db->jdate($obj->datec);
-                $this->datem          = $this->db->jdate($obj->tms);
-                $this->dateh          = $this->db->jdate($obj->dateh);
-                $this->datef          = $this->db->jdate($obj->datef);
-                $this->amount         = $obj->subscription;
-                $this->note           = $obj->note;
-                $this->fk_bank        = $obj->fk_bank;
-                return 1;
-            } else {
-                return 0;
-            }
-        } else {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+				$this->fk_type        = $obj->fk_type;
+				$this->fk_adherent    = $obj->fk_adherent;
+				$this->datec          = $this->db->jdate($obj->datec);
+				$this->datem          = $this->db->jdate($obj->tms);
+				$this->dateh          = $this->db->jdate($obj->dateh);
+				$this->datef          = $this->db->jdate($obj->datef);
+				$this->amount         = $obj->subscription;
+				$this->note           = $obj->note;
+				$this->fk_bank        = $obj->fk_bank;
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    /**
-     *	Update subscription
-     *
-     *	@param	User	$user			User who updated
-     *	@param 	int		$notrigger		0=Disable triggers
-     *	@return	int						<0 if KO, >0 if OK
-     */
-    public function update($user, $notrigger = 0)
-    {
-        $error = 0;
+	/**
+	 *	Update subscription
+	 *
+	 *	@param	User	$user			User who updated
+	 *	@param 	int		$notrigger		0=Disable triggers
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	public function update($user, $notrigger = 0)
+	{
+		$error = 0;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."subscription SET ";
-        $sql .= " fk_type = ".$this->fk_type.",";
-        $sql .= " fk_adherent = ".$this->fk_adherent.",";
-        $sql .= " note=".($this->note ? "'".$this->db->escape($this->note)."'" : 'null').",";
-        $sql .= " subscription = '".price2num($this->amount)."',";
-        $sql .= " dateadh='".$this->db->idate($this->dateh)."',";
-        $sql .= " datef='".$this->db->idate($this->datef)."',";
-        $sql .= " datec='".$this->db->idate($this->datec)."',";
-        $sql .= " fk_bank = ".($this->fk_bank ? $this->fk_bank : 'null');
-        $sql .= " WHERE rowid = ".$this->id;
+		if (!is_numeric($this->amount)) {
+			$this->error = 'BadValueForParameterAmount';
+			return -1;
+		}
 
-        dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-            $member = new Adherent($this->db);
-            $result = $member->fetch($this->fk_adherent);
-            $result = $member->update_end_date($user);
+		$sql = "UPDATE ".MAIN_DB_PREFIX."subscription SET ";
+		$sql .= " fk_type = ".$this->fk_type.",";
+		$sql .= " fk_adherent = ".$this->fk_adherent.",";
+		$sql .= " note=".($this->note ? "'".$this->db->escape($this->note)."'" : 'null').",";
+		$sql .= " subscription = ".price2num($this->amount).",";
+		$sql .= " dateadh='".$this->db->idate($this->dateh)."',";
+		$sql .= " datef='".$this->db->idate($this->datef)."',";
+		$sql .= " datec='".$this->db->idate($this->datec)."',";
+		$sql .= " fk_bank = ".($this->fk_bank ? $this->fk_bank : 'null');
+		$sql .= " WHERE rowid = ".$this->id;
 
-            if (!$error && !$notrigger) {
-            	$this->context = array('member'=>$member);
-            	// Call triggers
-                $result = $this->call_trigger('MEMBER_SUBSCRIPTION_MODIFY', $user);
-                if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail
-                // End call triggers
-            }
-        } else {
-            $error++;
-            $this->error = $this->db->lasterror();
-        }
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+			$member = new Adherent($this->db);
+			$result = $member->fetch($this->fk_adherent);
+			$result = $member->update_end_date($user);
 
-        // Commit or rollback
-        if ($error) {
-            $this->db->rollback();
-            return -1;
-        } else {
-            $this->db->commit();
-            return $this->id;
-        }
-    }
+			if (!$error && !$notrigger) {
+				$this->context = array('member'=>$member);
+				// Call triggers
+				$result = $this->call_trigger('MEMBER_SUBSCRIPTION_MODIFY', $user);
+				if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail
+				// End call triggers
+			}
+		} else {
+			$error++;
+			$this->error = $this->db->lasterror();
+		}
 
-    /**
-     *	Delete a subscription
-     *
-     *	@param	User	$user		User that delete
-     *	@param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
-     *	@return	int					<0 if KO, 0 if not found, >0 if OK
-     */
-    public function delete($user, $notrigger = false)
-    {
-        $error = 0;
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+			return -1;
+		} else {
+			$this->db->commit();
+			return $this->id;
+		}
+	}
 
-        // It subscription is linked to a bank transaction, we get it
-        if ($this->fk_bank > 0) {
-            require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-            $accountline = new AccountLine($this->db);
-            $result = $accountline->fetch($this->fk_bank);
-        }
+	/**
+	 *	Delete a subscription
+	 *
+	 *	@param	User	$user		User that delete
+	 *	@param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *	@return	int					<0 if KO, 0 if not found, >0 if OK
+	 */
+	public function delete($user, $notrigger = false)
+	{
+		$error = 0;
 
-        $this->db->begin();
+		// It subscription is linked to a bank transaction, we get it
+		if ($this->fk_bank > 0) {
+			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+			$accountline = new AccountLine($this->db);
+			$result = $accountline->fetch($this->fk_bank);
+		}
 
-        if (!$error) {
-            if (!$notrigger) {
-                // Call triggers
-                $result = $this->call_trigger('MEMBER_SUBSCRIPTION_DELETE', $user);
-                if ($result < 0) { $error++; } // Do also here what you must do to rollback action if trigger fail
-                // End call triggers
-            }
-        }
+		$this->db->begin();
 
-        if (!$error) {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."subscription WHERE rowid = ".$this->id;
-            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if ($resql) {
-                $num = $this->db->affected_rows($resql);
-                if ($num) {
-                    require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-                    $member = new Adherent($this->db);
-                    $result = $member->fetch($this->fk_adherent);
-                    $result = $member->update_end_date($user);
+		if (!$error) {
+			if (!$notrigger) {
+				// Call triggers
+				$result = $this->call_trigger('MEMBER_SUBSCRIPTION_DELETE', $user);
+				if ($result < 0) { $error++; } // Do also here what you must do to rollback action if trigger fail
+				// End call triggers
+			}
+		}
 
-                    if ($this->fk_bank > 0 && is_object($accountline) && $accountline->id > 0) {	// If we found bank account line (this means this->fk_bank defined)
+		if (!$error) {
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."subscription WHERE rowid = ".$this->id;
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$num = $this->db->affected_rows($resql);
+				if ($num) {
+					require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+					$member = new Adherent($this->db);
+					$result = $member->fetch($this->fk_adherent);
+					$result = $member->update_end_date($user);
+
+					if ($this->fk_bank > 0 && is_object($accountline) && $accountline->id > 0) {	// If we found bank account line (this means this->fk_bank defined)
 						$result = $accountline->delete($user); // Return false if refused because line is conciliated
-                        if ($result > 0) {
-                            $this->db->commit();
-                            return 1;
-                        } else {
-                            $this->error = $accountline->error;
-                            $this->db->rollback();
-                            return -1;
-                        }
-                    } else {
-                        $this->db->commit();
-                        return 1;
-                    }
-                } else {
-                    $this->db->commit();
-                    return 0;
-                }
-            } else {
-                $error++;
-                $this->error = $this->db->lasterror();
-            }
-        }
+						if ($result > 0) {
+							$this->db->commit();
+							return 1;
+						} else {
+							$this->error = $accountline->error;
+							$this->db->rollback();
+							return -1;
+						}
+					} else {
+						$this->db->commit();
+						return 1;
+					}
+				} else {
+					$this->db->commit();
+					return 0;
+				}
+			} else {
+				$error++;
+				$this->error = $this->db->lasterror();
+			}
+		}
 
-        // Commit or rollback
-        if ($error) {
-            $this->db->rollback();
-            return -1;
-        } else {
-            $this->db->commit();
-            return 1;
-        }
-    }
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+			return -1;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
 
 
-    /**
-     *  Return clicable name (with picto eventually)
-     *
-     *	@param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
-     *  @param	int  	$notooltip					1=Disable tooltip
-     *	@param	string	$option						Page for link ('', 'nolink', ...)
-     *  @param  string  $morecss        			Add more css on link
-     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *	@return	string								Chaine avec URL
-     */
-    public function getNomUrl($withpicto = 0, $notooltip = 0, $option = '', $morecss = '', $save_lastsearch_value = -1)
-    {
-        global $langs;
+	/**
+	 *  Return clicable name (with picto eventually)
+	 *
+	 *	@param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
+	 *  @param	int  	$notooltip					1=Disable tooltip
+	 *	@param	string	$option						Page for link ('', 'nolink', ...)
+	 *  @param  string  $morecss        			Add more css on link
+	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return	string								Chaine avec URL
+	 */
+	public function getNomUrl($withpicto = 0, $notooltip = 0, $option = '', $morecss = '', $save_lastsearch_value = -1)
+	{
+		global $langs;
 
-        $result = '';
+		$result = '';
 
-        $langs->load("members");
-        $label = $langs->trans("ShowSubscription").': '.$this->ref;
+		$langs->load("members");
 
-        $url = DOL_URL_ROOT.'/adherents/subscription/card.php?rowid='.$this->id;
+		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Subscription").'</u>';
+		/*if (isset($this->statut)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}*/
+		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		if (!empty($this->dateh)) {
+			$label .= '<br><b>'.$langs->trans('DateStart').':</b> '.dol_print_date($this->dateh, 'day');
+		}
+		if (!empty($this->datef)) {
+			$label .= '<br><b>'.$langs->trans('DateEnd').':</b> '.dol_print_date($this->datef, 'day');
+		}
 
-        if ($option != 'nolink') {
-            // Add param to save lastsearch_values or not
-            $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-            if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-            if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		$url = DOL_URL_ROOT.'/adherents/subscription/card.php?rowid='.$this->id;
 
-        $linkstart = '<a href="'.$url.'" class="classfortooltip" title="'.dol_escape_htmltag($label, 1).'">';
-        $linkend = '</a>';
+		if ($option != 'nolink') {
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
-        $picto = 'payment';
+		$linkstart = '<a href="'.$url.'" class="classfortooltip" title="'.dol_escape_htmltag($label, 1).'">';
+		$linkend = '</a>';
 
-        $result .= $linkstart;
-        if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-        if ($withpicto != 2) $result .= $this->ref;
-        $result .= $linkend;
+		$result .= $linkstart;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->ref;
+		$result .= $linkend;
 
-        return $result;
-    }
+		return $result;
+	}
 
 
-    /**
-     *  Retourne le libelle du statut d'une adhesion
-     *
-     *  @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-     *  @return string				Label
-     */
-    public function getLibStatut($mode = 0)
-    {
-        return '';
-    }
+	/**
+	 *  Retourne le libelle du statut d'une adhesion
+	 *
+	 *  @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @return string				Label
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return '';
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Renvoi le libelle d'un statut donne
-     *
-     *  @param	int			$status      			Id status
-     *  @return string      						Label
-     */
-    public function LibStatut($status)
-    {
-        // phpcs:enable
-        global $langs;
-        $langs->load("members");
-        return '';
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Renvoi le libelle d'un statut donne
+	 *
+	 *  @param	int			$status      			Id status
+	 *  @return string      						Label
+	 */
+	public function LibStatut($status)
+	{
+		// phpcs:enable
+		global $langs;
+		$langs->load("members");
+		return '';
+	}
 
-    /**
-     *  Load information of the subscription object
-     *
-     *  @param	int		$id       Id subscription
-     *  @return	void
-     */
-    public function info($id)
-    {
-        $sql = 'SELECT c.rowid, c.datec,';
-        $sql .= ' c.tms as datem';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'subscription as c';
-        $sql .= ' WHERE c.rowid = '.$id;
+	/**
+	 *  Load information of the subscription object
+	 *
+	 *  @param	int		$id       Id subscription
+	 *  @return	void
+	 */
+	public function info($id)
+	{
+		$sql = 'SELECT c.rowid, c.datec,';
+		$sql .= ' c.tms as datem';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'subscription as c';
+		$sql .= ' WHERE c.rowid = '.$id;
 
-        $result = $this->db->query($sql);
-        if ($result) {
-            if ($this->db->num_rows($result)) {
-                $obj = $this->db->fetch_object($result);
-                $this->id = $obj->rowid;
+		$result = $this->db->query($sql);
+		if ($result) {
+			if ($this->db->num_rows($result)) {
+				$obj = $this->db->fetch_object($result);
+				$this->id = $obj->rowid;
 
-                $this->date_creation = $this->db->jdate($obj->datec);
-                $this->date_modification = $this->db->jdate($obj->datem);
-            }
+				$this->date_creation = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->datem);
+			}
 
-            $this->db->free($result);
-        } else {
-            dol_print_error($this->db);
-        }
-    }
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 }
diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index 32630b9e478..969bf3a8906 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -37,7 +37,8 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 $langs->loadLangs(array("companies", "members", "other"));
 
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTISSET('id') ? GETPOST('id', 'int') : GETPOST('rowid', 'int');
+$ref = GETPOST('ref', 'alphanohtml');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
@@ -60,7 +61,7 @@ if (!$sortfield) $sortfield = "name";
 $form = new Form($db);
 $object = new Adherent($db);
 $membert = new AdherentType($db);
-$result = $object->fetch($id);
+$result = $object->fetch($id, $ref);
 if ($result < 0) {
 	dol_print_error($db);
 	exit;
@@ -86,7 +87,7 @@ $helpurl = "EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Mi
 llxHeader("", $title, $helpurl);
 
 if ($id > 0) {
-    $result = $membert->fetch($object->typeid);
+	$result = $membert->fetch($object->typeid);
 	if ($result > 0) {
 		// Build file list
 		$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
@@ -95,47 +96,47 @@ if ($id > 0) {
 			$totalsize += $file['size'];
 		}
 
-	    if (!empty($conf->notification->enabled))
+		if (!empty($conf->notification->enabled))
 			$langs->load("mails");
 
 		$head = member_prepare_head($object);
 
-		dol_fiche_head($head, 'document', $langs->trans("Member"), -1, 'user');
+		print dol_get_fiche_head($head, 'document', $langs->trans("Member"), -1, 'user');
 
-    	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    	dol_banner_tab($object, 'rowid', $linkback);
+		dol_banner_tab($object, 'rowid', $linkback);
 
-        print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
+		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border tableforfield centpercent">';
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        // Login
-        if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
-            print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
-        }
+		// Login
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
+			print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
+		}
 
-        // Type
-        print '<tr><td>'.$langs->trans("Type").'</td><td class="valeur">'.$membert->getNomUrl(1)."</td></tr>\n";
+		// Type
+		print '<tr><td>'.$langs->trans("Type").'</td><td class="valeur">'.$membert->getNomUrl(1)."</td></tr>\n";
 
-        // Morphy
-        print '<tr><td class="titlefield">'.$langs->trans("MemberNature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>';
-        /*print '<td rowspan="'.$rowspan.'" class="center" valign="middle" width="25%">';
+		// Morphy
+		print '<tr><td class="titlefield">'.$langs->trans("MemberNature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>';
+		/*print '<td rowspan="'.$rowspan.'" class="center" valign="middle" width="25%">';
         print $form->showphoto('memberphoto',$object);
         print '</td>';*/
-        print '</tr>';
+		print '</tr>';
 
-        // Company
-        print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->company.'</td></tr>';
+		// Company
+		print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->company.'</td></tr>';
 
-        // Civility
-        print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'&nbsp;</td>';
-        print '</tr>';
+		// Civility
+		print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'&nbsp;</td>';
+		print '</tr>';
 
-    	// Number of Attached Files
+		// Number of Attached Files
 		print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
 
 		//Total Size Of Attached Files
@@ -145,7 +146,7 @@ if ($id > 0) {
 
 		print '</div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		$modulepart = 'member';
 		$permission = $user->rights->adherent->creer;
@@ -157,7 +158,7 @@ if ($id > 0) {
 		dol_print_error($db);
 	}
 } else {
-    $langs->load("errors");
+	$langs->load("errors");
 	print $langs->trans("ErrorRecordNotFound");
 }
 
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index c63bb9049ca..b2ef8e8854b 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -125,29 +125,29 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This is useless due to the global search combo
 	// Search contact/address
-    if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire) {
-    	$listofsearchfields['search_member'] = array('text'=>'Member');
-    }
+	if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire) {
+		$listofsearchfields['search_member'] = array('text'=>'Member');
+	}
 
-    if (count($listofsearchfields)) {
-    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-    	print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<div class="div-table-responsive-no-min">';
-    	print '<table class="noborder nohover centpercent">';
-    	$i = 0;
-    	foreach ($listofsearchfields as $key => $value) {
-    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    		print '<tr class="oddeven">';
-    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-    		print '</tr>';
-    		$i++;
-    	}
-    	print '</table>';
-        print '</div>';
-    	print '</form>';
-    	print '<br>';
-    }
+	if (count($listofsearchfields)) {
+		print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder nohover centpercent">';
+		$i = 0;
+		foreach ($listofsearchfields as $key => $value) {
+			if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+			print '<tr class="oddeven">';
+			print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+			if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+			print '</tr>';
+			$i++;
+		}
+		print '</table>';
+		print '</div>';
+		print '</form>';
+		print '<br>';
+	}
 }
 
 
@@ -158,53 +158,53 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This is usel
 if ($conf->use_javascript_ajax) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder nohover centpercent">';
-    print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
-    print '<tr><td class="center" colspan="2">';
+	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
+	print '<tr><td class="center" colspan="2">';
 
-    $SommeA = 0;
-    $SommeB = 0;
-    $SommeC = 0;
-    $SommeD = 0;
-    $total = 0;
-    $dataval = array();
-    $i = 0;
-    foreach ($AdherentType as $key => $adhtype) {
-        $dataval['draft'][] = array($i, isset($MemberToValidate[$key]) ? $MemberToValidate[$key] : 0);
-        $dataval['notuptodate'][] = array($i, isset($MembersValidated[$key]) ? $MembersValidated[$key] - (isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0) : 0);
-        $dataval['uptodate'][] = array($i, isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0);
-        $dataval['resiliated'][] = array($i, isset($MembersResiliated[$key]) ? $MembersResiliated[$key] : 0);
-        $SommeA += isset($MemberToValidate[$key]) ? $MemberToValidate[$key] : 0;
-        $SommeB += isset($MembersValidated[$key]) ? $MembersValidated[$key] - (isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0) : 0;
-        $SommeC += isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0;
-        $SommeD += isset($MembersResiliated[$key]) ? $MembersResiliated[$key] : 0;
-        $i++;
-    }
-    $total = $SommeA + $SommeB + $SommeC + $SommeD;
-    $dataseries = array();
-    $dataseries[] = array($langs->transnoentitiesnoconv("MenuMembersNotUpToDate"), round($SommeB));
-    $dataseries[] = array($langs->transnoentitiesnoconv("MenuMembersUpToDate"), round($SommeC));
-    $dataseries[] = array($langs->transnoentitiesnoconv("MembersStatusResiliated"), round($SommeD));
-    $dataseries[] = array($langs->transnoentitiesnoconv("MembersStatusToValid"), round($SommeA));
+	$SommeA = 0;
+	$SommeB = 0;
+	$SommeC = 0;
+	$SommeD = 0;
+	$total = 0;
+	$dataval = array();
+	$i = 0;
+	foreach ($AdherentType as $key => $adhtype) {
+		$dataval['draft'][] = array($i, isset($MemberToValidate[$key]) ? $MemberToValidate[$key] : 0);
+		$dataval['notuptodate'][] = array($i, isset($MembersValidated[$key]) ? $MembersValidated[$key] - (isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0) : 0);
+		$dataval['uptodate'][] = array($i, isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0);
+		$dataval['resiliated'][] = array($i, isset($MembersResiliated[$key]) ? $MembersResiliated[$key] : 0);
+		$SommeA += isset($MemberToValidate[$key]) ? $MemberToValidate[$key] : 0;
+		$SommeB += isset($MembersValidated[$key]) ? $MembersValidated[$key] - (isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0) : 0;
+		$SommeC += isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0;
+		$SommeD += isset($MembersResiliated[$key]) ? $MembersResiliated[$key] : 0;
+		$i++;
+	}
+	$total = $SommeA + $SommeB + $SommeC + $SommeD;
+	$dataseries = array();
+	$dataseries[] = array($langs->transnoentitiesnoconv("OutOfDate"), round($SommeB));
+	$dataseries[] = array($langs->transnoentitiesnoconv("UpToDate"), round($SommeC));
+	$dataseries[] = array($langs->transnoentitiesnoconv("MembersStatusResiliated"), round($SommeD));
+	$dataseries[] = array($langs->transnoentitiesnoconv("MembersStatusToValid"), round($SommeA));
 
-    include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
+	include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
 
-    include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
-    $dolgraph = new DolGraph();
-    $dolgraph->SetData($dataseries);
-    $dolgraph->SetDataColor(array($badgeStatus1, $badgeStatus4, $badgeStatus6, '-'.$badgeStatus0));
-    $dolgraph->setShowLegend(2);
-    $dolgraph->setShowPercent(1);
-    $dolgraph->SetType(array('pie'));
-    $dolgraph->setHeight('200');
-    $dolgraph->draw('idgraphstatus');
-    print $dolgraph->show($total ? 0 : 1);
+	include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+	$dolgraph = new DolGraph();
+	$dolgraph->SetData($dataseries);
+	$dolgraph->SetDataColor(array($badgeStatus1, $badgeStatus4, $badgeStatus6, '-'.$badgeStatus0));
+	$dolgraph->setShowLegend(2);
+	$dolgraph->setShowPercent(1);
+	$dolgraph->SetType(array('pie'));
+	$dolgraph->setHeight('200');
+	$dolgraph->draw('idgraphstatus');
+	print $dolgraph->show($total ? 0 : 1);
 
-    print '</td></tr>';
-    print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">';
-    print $SommeA + $SommeB + $SommeC + $SommeD;
-    print '</td></tr>';
-    print '</table>';
-    print '</div>';
+	print '</td></tr>';
+	print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">';
+	print $SommeA + $SommeB + $SommeC + $SommeD;
+	print '</td></tr>';
+	print '</table>';
+	print '</div>';
 }
 
 print '<br>';
@@ -223,17 +223,17 @@ $sql .= " AND d.rowid = c.fk_adherent";
 
 $result = $db->query($sql);
 if ($result) {
-    $num = $db->num_rows($result);
-    $i = 0;
-    while ($i < $num) {
-        $objp = $db->fetch_object($result);
-        $year = dol_print_date($db->jdate($objp->dateh), "%Y");
-        $Total[$year] = (isset($Total[$year]) ? $Total[$year] : 0) + $objp->subscription;
-        $Number[$year] = (isset($Number[$year]) ? $Number[$year] : 0) + 1;
-        $tot += $objp->subscription;
-        $numb += 1;
-        $i++;
-    }
+	$num = $db->num_rows($result);
+	$i = 0;
+	while ($i < $num) {
+		$objp = $db->fetch_object($result);
+		$year = dol_print_date($db->jdate($objp->dateh), "%Y");
+		$Total[$year] = (isset($Total[$year]) ? $Total[$year] : 0) + $objp->subscription;
+		$Number[$year] = (isset($Number[$year]) ? $Number[$year] : 0) + 1;
+		$tot += $objp->subscription;
+		$numb += 1;
+		$i++;
+	}
 }
 
 print '<div class="div-table-responsive-no-min">';
@@ -258,12 +258,12 @@ foreach ($Total as $key=>$value) {
 		break;
 	}
 	print '<tr class="oddeven">';
-    print "<td><a href=\"./subscription/list.php?date_select=$key\">$key</a></td>";
-    print "<td class=\"right\">".$Number[$key]."</td>";
-    print "<td class=\"right\">".price($value)."</td>";
-    print "<td class=\"right\">".price(price2num($value / $Number[$key], 'MT'))."</td>";
-    print "</tr>\n";
-    $i++;
+	print "<td><a href=\"./subscription/list.php?date_select=$key\">$key</a></td>";
+	print "<td class=\"right\">".$Number[$key]."</td>";
+	print "<td class=\"right\">".price($value)."</td>";
+	print "<td class=\"right\">".price(price2num($value / $Number[$key], 'MT'))."</td>";
+	print "</tr>\n";
+	$i++;
 }
 
 // Total
@@ -284,9 +284,10 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
  */
 $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
-$sql = "SELECT a.rowid, a.statut, a.lastname, a.firstname, a.societe as company, a.fk_soc,";
-$sql .= " a.tms as datem, datefin as date_end_subscription,";
-$sql .= " ta.rowid as typeid, ta.libelle as label, ta.subscription";
+$sql = "SELECT a.rowid, a.statut as status, a.lastname, a.firstname, a.societe as company, a.fk_soc,";
+$sql .= " a.gender, a.email, a.photo, a.morphy,";
+$sql .= " a.tms as datem, a.datefin as date_end_subscription,";
+$sql .= " ta.rowid as typeid, ta.libelle as label, ta.subscription as need_subscription";
 $sql .= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."adherent_type as ta";
 $sql .= " WHERE a.entity IN (".getEntity('adherent').")";
 $sql .= " AND a.fk_adherent_type = ta.rowid";
@@ -305,10 +306,18 @@ if ($resql) {
 		$i = 0;
 		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
-			print '<tr class="oddeven">';
+
 			$staticmember->id = $obj->rowid;
+			$staticmember->ref = $obj->rowid;
 			$staticmember->lastname = $obj->lastname;
 			$staticmember->firstname = $obj->firstname;
+			$staticmember->gender = $obj->gender;
+			$staticmember->email = $obj->email;
+			$staticmember->photo = $obj->photo;
+			$staticmember->morphy = $obj->morphy;
+			$staticmember->statut = $obj->status;
+			$staticmember->need_subscription = $obj->need_subscription;
+			$staticmember->datefin = $db->jdate($obj->date_end_subscription);
 			if (!empty($obj->fk_soc)) {
 				$staticmember->fk_soc = $obj->fk_soc;
 				$staticmember->fetch_thirdparty();
@@ -316,13 +325,16 @@ if ($resql) {
 			} else {
 				$staticmember->name = $obj->company;
 			}
-			$staticmember->ref = $staticmember->getFullName($langs);
+
 			$statictype->id = $obj->typeid;
 			$statictype->label = $obj->label;
-			print '<td class="nowraponall">'.$staticmember->getNomUrl(1, 32).'</td>';
+			$statictype->subscription = $obj->need_subscription;
+
+			print '<tr class="oddeven">';
+			print '<td class="nowraponall">'.$staticmember->getNomUrl(-1, 32).'</td>';
 			print '<td>'.$statictype->getNomUrl(1, 32).'</td>';
 			print '<td>'.dol_print_date($db->jdate($obj->datem), 'dayhour').'</td>';
-			print '<td class="right">'.$staticmember->LibStatut($obj->statut, ($obj->subscription == 'yes' ? 1 : 0), $db->jdate($obj->date_end_subscription), 3).'</td>';
+			print '<td class="right">'.$staticmember->getLibStatut(3).'</td>';
 			print '</tr>';
 			$i++;
 		}
@@ -339,11 +351,14 @@ if ($resql) {
  */
 $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
-$sql = "SELECT a.rowid, a.statut, a.lastname, a.firstname, a.societe as company, a.fk_soc,";
-$sql .= " datefin as date_end_subscription,";
+$sql = "SELECT a.rowid, a.statut as status, a.lastname, a.firstname, a.societe as company, a.fk_soc,";
+$sql .= " a.gender, a.email, a.photo, a.morphy,";
+$sql .= " a.datefin as date_end_subscription,";
+$sql .= " ta.rowid as typeid, ta.libelle as label, ta.subscription as need_subscription,";
 $sql .= " c.rowid as cid, c.tms as datem, c.datec as datec, c.dateadh as date_start, c.datef as date_end, c.subscription";
-$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."subscription as c";
+$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."adherent_type as ta, ".MAIN_DB_PREFIX."subscription as c";
 $sql .= " WHERE a.entity IN (".getEntity('adherent').")";
+$sql .= " AND a.fk_adherent_type = ta.rowid";
 $sql .= " AND c.fk_adherent = a.rowid";
 $sql .= $db->order("c.tms", "DESC");
 $sql .= $db->plimit($max, 0);
@@ -360,12 +375,18 @@ if ($resql) {
 		$i = 0;
 		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
-			print '<tr class="oddeven">';
-			$subscriptionstatic->id = $obj->cid;
-			$subscriptionstatic->ref = $obj->cid;
+
 			$staticmember->id = $obj->rowid;
+			$staticmember->ref = $obj->rowid;
 			$staticmember->lastname = $obj->lastname;
 			$staticmember->firstname = $obj->firstname;
+			$staticmember->gender = $obj->gender;
+			$staticmember->email = $obj->email;
+			$staticmember->photo = $obj->photo;
+			$staticmember->morphy = $obj->morphy;
+			$staticmember->statut = $obj->status;
+			$staticmember->need_subscription = $obj->need_subscription;
+			$staticmember->datefin = $db->jdate($obj->date_end_subscription);
 			if (!empty($obj->fk_soc)) {
 				$staticmember->fk_soc = $obj->fk_soc;
 				$staticmember->fetch_thirdparty();
@@ -373,9 +394,13 @@ if ($resql) {
 			} else {
 				$staticmember->name = $obj->company;
 			}
-			$staticmember->ref = $staticmember->getFullName($langs);
+
+			$subscriptionstatic->id = $obj->cid;
+			$subscriptionstatic->ref = $obj->cid;
+
+			print '<tr class="oddeven">';
 			print '<td class="nowraponall">'.$subscriptionstatic->getNomUrl(1).'</td>';
-			print '<td class="nowraponall">'.$staticmember->getNomUrl(1, 32, 'subscription').'</td>';
+			print '<td class="nowraponall">'.$staticmember->getNomUrl(-1, 32, 'subscription').'</td>';
 			print '<td class="nowraponall">'.get_date_range($db->jdate($obj->date_start), $db->jdate($obj->date_end)).'</td>';
 			print '<td class="right">'.price($obj->subscription).'</td>';
 			//print '<td class="right">'.$staticmember->LibStatut($obj->statut,($obj->subscription=='yes'?1:0),$db->jdate($obj->date_end_subscription),5).'</td>';
@@ -397,8 +422,8 @@ print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<th>'.$langs->trans("MembersTypes").'</th>';
 print '<th class=right>'.$langs->trans("MembersStatusToValid").'</th>';
-print '<th class=right>'.$langs->trans("MenuMembersNotUpToDate").'</th>';
-print '<th class=right>'.$langs->trans("MenuMembersUpToDate").'</th>';
+print '<th class=right>'.$langs->trans("OutOfDate").'</th>';
+print '<th class=right>'.$langs->trans("UpToDate").'</th>';
 print '<th class=right>'.$langs->trans("MembersStatusResiliated").'</th>';
 print "</tr>\n";
 
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index 3094c6a50ac..6be535b6e3b 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -38,7 +38,7 @@ $action = GETPOST('action', 'aZ09');
 // Protection
 $socid = 0;
 if ($user->socid > 0) {
-    $socid = $user->socid;
+	$socid = $user->socid;
 }
 
 $object = new Adherent($db);
@@ -84,7 +84,7 @@ llxHeader('', $langs->trans("Member"), 'EN:Module_Foundations|FR:Module_Adh&eacu
 
 $head = member_prepare_head($object);
 
-dol_fiche_head($head, 'ldap', $langs->trans("Member"), 0, 'user');
+print dol_get_fiche_head($head, 'ldap', $langs->trans("Member"), 0, 'user');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -128,7 +128,7 @@ print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 /*
  * Barre d'actions
@@ -165,24 +165,24 @@ if ($result > 0) {
 	$search = "(".$object->_load_ldap_dn($info, 2).")";
 
 	if (empty($dn)) {
-	    $langs->load("errors");
-	    print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Member")).'</font></td></tr>';
+		$langs->load("errors");
+		print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Member")).'</font></td></tr>';
 	} else {
-    	$records = $ldap->getAttribute($dn, $search);
+		$records = $ldap->getAttribute($dn, $search);
 
-    	//print_r($records);
+		//print_r($records);
 
-    	// Show tree
-    	if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0)) {
-    		if (!is_array($records)) {
-    			print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
-    		} else {
-    			$result = show_ldap_content($records, 0, $records['count'], true);
-    		}
-    	} else {
-    		print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
-    	}
-    }
+		// Show tree
+		if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0)) {
+			if (!is_array($records)) {
+				print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
+			} else {
+				$result = show_ldap_content($records, 0, $records['count'], true);
+			}
+		} else {
+			print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
+		}
+	}
 
 	$ldap->unbind();
 	$ldap->close();
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 9396b02d518..c9aaa856d22 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -204,30 +204,30 @@ if (empty($reshook)) {
 
 	// Close
 	if ($massaction == 'close' && $user->rights->adherent->creer) {
-	    $tmpmember = new Adherent($db);
-	    $error = 0;
-	    $nbclose = 0;
+		$tmpmember = new Adherent($db);
+		$error = 0;
+		$nbclose = 0;
 
-	    $db->begin();
+		$db->begin();
 
-        foreach ($toselect as $idtoclose) {
-            $tmpmember->fetch($idtoclose);
-            $result = $tmpmember->resiliate($user);
+		foreach ($toselect as $idtoclose) {
+			$tmpmember->fetch($idtoclose);
+			$result = $tmpmember->resiliate($user);
 
-            if ($result < 0 && !count($tmpmember->errors)) {
-    	        setEventMessages($tmpmember->error, $tmpmember->errors, 'errors');
-    	    } else {
-    	        if ($result > 0) $nbclose++;
-    	    }
-        }
+			if ($result < 0 && !count($tmpmember->errors)) {
+				setEventMessages($tmpmember->error, $tmpmember->errors, 'errors');
+			} else {
+				if ($result > 0) $nbclose++;
+			}
+		}
 
-        if (!$error) {
-            setEventMessages($langs->trans("XMembersClosed", $nbclose), null, 'mesgs');
+		if (!$error) {
+			setEventMessages($langs->trans("XMembersClosed", $nbclose), null, 'mesgs');
 
-            $db->commit();
-        } else {
-            $db->rollback();
-        }
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
 	}
 
 	// Mass actions
@@ -409,7 +409,7 @@ $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton = '';
 if ($user->rights->adherent->creer) {
-    $newcardbutton .= dolGetButtonTitle($langs->trans('NewMember'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/card.php?action=create');
+	$newcardbutton .= dolGetButtonTitle($langs->trans('NewMember'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/card.php?action=create');
 }
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
@@ -436,7 +436,7 @@ if ($sall) {
 
 // Filter on categories
 $moreforfilter = '';
-if (!empty($conf->categorie->enabled)) {
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= $langs->trans('Categories').': ';
@@ -560,7 +560,7 @@ if (!empty($arrayfields['d.email']['checked'])) {
 // End of subscription date
 if (!empty($arrayfields['d.datefin']['checked'])) {
 	print '<td class="liste_titre left">';
-	$selectarray=array('-1'=>'', 'withoutsubscription'=>$langs->trans("WithoutSubscription"), 'uptodate'=>$langs->trans("UpToDate"), 'outofdate'=>$langs->trans("OutOfDate"));
+	$selectarray = array('-1'=>'', 'withoutsubscription'=>$langs->trans("WithoutSubscription"), 'uptodate'=>$langs->trans("UpToDate"), 'outofdate'=>$langs->trans("OutOfDate"));
 	print $form->selectarray('search_filter', $selectarray, $search_filter);
 	print '</td>';
 }
@@ -656,6 +656,7 @@ while ($i < min($num, $limit)) {
 	$memberstatic->datefin = $datefin;
 	$memberstatic->socid = $obj->fk_soc;
 	$memberstatic->photo = $obj->photo;
+	$memberstatic->email = $obj->email;
 	$memberstatic->morphy = $obj->morphy;
 	$memberstatic->note_public = $obj->note_public;
 	$memberstatic->note_private = $obj->note_private;
@@ -725,12 +726,10 @@ while ($i < min($num, $limit)) {
 	if (!empty($arrayfields['d.morphy']['checked'])) {
 		print '<td class="center">';
 		$s = '';
-		if ($obj->morphy == 'phy')
-		{
+		if ($obj->morphy == 'phy') {
 			$s .= '<span class="customer-back" title="'.$langs->trans("Physical").'">'.dol_substr($langs->trans("Physical"), 0, 1).'</span>';
 		}
-		if ($obj->morphy == 'mor')
-		{
+		if ($obj->morphy == 'mor') {
 			$s .= '<span class="vendor-back" title="'.$langs->trans("Moral").'">'.dol_substr($langs->trans("Moral"), 0, 1).'</span>';
 		}
 		print $s;
diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index 85becb0aa3d..e611eb3bbcf 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -40,8 +40,8 @@ $result = restrictedArea($user, 'adherent', $id);
 $object = new Adherent($db);
 $result = $object->fetch($id);
 if ($result > 0) {
-    $adht = new AdherentType($db);
-    $result = $adht->fetch($object->typeid);
+	$adht = new AdherentType($db);
+	$result = $adht->fetch($object->typeid);
 }
 
 $permissionnote = $user->rights->adherent->creer; // Used by the include of actions_setnotes.inc.php
@@ -66,7 +66,7 @@ $form = new Form($db);
 if ($id) {
 	$head = member_prepare_head($object);
 
-	dol_fiche_head($head, 'note', $langs->trans("Member"), -1, 'user');
+	print dol_get_fiche_head($head, 'note', $langs->trans("Member"), -1, 'user');
 
 	print "<form method=\"post\" action=\"".$_SERVER['PHP_SELF']."\">";
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -75,44 +75,44 @@ if ($id) {
 
 	dol_banner_tab($object, 'id', $linkback);
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">';
 
-    // Login
-    if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
-        print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
-    }
+	// Login
+	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
+		print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
+	}
 
-    // Type
-    print '<tr><td>'.$langs->trans("Type").'</td><td class="valeur">'.$adht->getNomUrl(1)."</td></tr>\n";
+	// Type
+	print '<tr><td>'.$langs->trans("Type").'</td><td class="valeur">'.$adht->getNomUrl(1)."</td></tr>\n";
 
-    // Morphy
-    print '<tr><td class="titlefield">'.$langs->trans("MemberNature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>';
-    /*print '<td rowspan="'.$rowspan.'" class="center" valign="middle" width="25%">';
+	// Morphy
+	print '<tr><td class="titlefield">'.$langs->trans("MemberNature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>';
+	/*print '<td rowspan="'.$rowspan.'" class="center" valign="middle" width="25%">';
     print $form->showphoto('memberphoto',$member);
     print '</td>';*/
-    print '</tr>';
+	print '</tr>';
 
-    // Company
-    print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->company.'</td></tr>';
+	// Company
+	print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->company.'</td></tr>';
 
-    // Civility
-    print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'&nbsp;</td>';
-    print '</tr>';
+	// Civility
+	print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'&nbsp;</td>';
+	print '</tr>';
 
-    print "</table>";
+	print "</table>";
 
-    print '</div>';
+	print '</div>';
 
 
-    $cssclass = 'titlefield';
-    $permission = $user->rights->adherent->creer; // Used by the include of notes.tpl.php
-    include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+	$cssclass = 'titlefield';
+	$permission = $user->rights->adherent->creer; // Used by the include of notes.tpl.php
+	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index 62e503f8170..73c32c59684 100644
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -34,8 +34,8 @@ $mode = GETPOST('mode') ?GETPOST('mode') : '';
 
 // Security check
 if ($user->socid > 0) {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'adherent', '', '', 'cotisation');
 
@@ -69,7 +69,7 @@ $sql .= " d.morphy as code";
 $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
 $sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-$sql .= " AND d.statut != -1";	// Not draft
+$sql .= " AND d.statut != -1"; // Not draft
 $sql .= " GROUP BY d.morphy";
 $foundphy = $foundmor = 0;
 
@@ -100,7 +100,7 @@ $sql .= " d.morphy as code";
 $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
 $sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-$sql .= " AND d.statut >= 1";	// Active (not draft=-1, not resiliated=0)
+$sql .= " AND d.statut >= 1"; // Active (not draft=-1, not resiliated=0)
 $sql .= " GROUP BY d.morphy";
 $foundphy = $foundmor = 0;
 
@@ -128,7 +128,7 @@ if ($resql) {
 
 $head = member_stats_prepare_head($adh);
 
-dol_fiche_head($head, 'statsbyproperties', $langs->trans("Statistics"), -1, 'user');
+print dol_get_fiche_head($head, 'statsbyproperties', $langs->trans("Statistics"), -1, 'user');
 
 
 // Print title
@@ -173,7 +173,7 @@ foreach ($data as $val) {
 print '</table>';
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index f7001656bd9..c24cf1fdef4 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -35,8 +35,8 @@ $mode = GETPOST('mode') ?GETPOST('mode') : '';
 
 // Security check
 if ($user->socid > 0) {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'adherent', '', '', 'cotisation');
 
@@ -68,238 +68,238 @@ print load_fiche_titre($title, '', 'object_group');
 dol_mkdir($dir);
 
 if ($mode) {
-    // Define sql
-    if ($mode == 'memberbycountry') {
-        $label = $langs->trans("Country");
-        $tab = 'statscountry';
+	// Define sql
+	if ($mode == 'memberbycountry') {
+		$label = $langs->trans("Country");
+		$tab = 'statscountry';
 
-        $data = array();
-        $sql .= "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, c.code, c.label";
-        $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
-        $sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-        $sql .= " AND d.statut != -1";
-        $sql .= " GROUP BY c.label, c.code";
-        //print $sql;
-    }
+		$data = array();
+		$sql .= "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, c.code, c.label";
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
+		$sql .= " WHERE d.entity IN (".getEntity('adherent').")";
+		$sql .= " AND d.statut != -1";
+		$sql .= " GROUP BY c.label, c.code";
+		//print $sql;
+	}
 
 	if ($mode == 'memberbystate') {
-        $label = $langs->trans("Country");
-        $label2 = $langs->trans("State");
-        $tab = 'statsstate';
-
-        $data = array();
-        $sql .= "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, co.code, co.label, c.nom as label2"; //
-        $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c on d.state_id = c.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r on c.fk_region = r.code_region";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co on d.country = co.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
-        $sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-        $sql .= " AND d.statut != -1";
-        $sql .= " GROUP BY co.label, co.code, c.nom";
-        //print $sql;
-    }
-    if ($mode == 'memberbyregion') { //
 		$label = $langs->trans("Country");
-        $label2 = $langs->trans("Region"); //département
-        $tab = 'statsregion'; //onglet
+		$label2 = $langs->trans("State");
+		$tab = 'statsstate';
 
-        $data = array(); //tableau de donnée
-        $sql .= "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, co.code, co.label, r.nom as label2";
-        $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c on d.state_id = c.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r on c.fk_region = r.code_region";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co on d.country = co.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
-        $sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-        $sql .= " AND d.statut != -1";
-        $sql .= " GROUP BY co.label, co.code, r.nom"; //+
-        //print $sql;
-    }
-    if ($mode == 'memberbytown') {
-        $label = $langs->trans("Country");
-        $label2 = $langs->trans("Town");
-        $tab = 'statstown';
+		$data = array();
+		$sql .= "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, co.code, co.label, c.nom as label2"; //
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c on d.state_id = c.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r on c.fk_region = r.code_region";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co on d.country = co.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
+		$sql .= " WHERE d.entity IN (".getEntity('adherent').")";
+		$sql .= " AND d.statut != -1";
+		$sql .= " GROUP BY co.label, co.code, c.nom";
+		//print $sql;
+	}
+	if ($mode == 'memberbyregion') { //
+		$label = $langs->trans("Country");
+		$label2 = $langs->trans("Region"); //département
+		$tab = 'statsregion'; //onglet
 
-        $data = array();
-        $sql .= "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, c.code, c.label, d.town as label2";
-        $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
-        $sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-        $sql .= " AND d.statut != -1";
-        $sql .= " GROUP BY c.label, c.code, d.town";
-        //print $sql;
-    }
+		$data = array(); //tableau de donnée
+		$sql .= "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, co.code, co.label, r.nom as label2";
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c on d.state_id = c.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r on c.fk_region = r.code_region";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co on d.country = co.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
+		$sql .= " WHERE d.entity IN (".getEntity('adherent').")";
+		$sql .= " AND d.statut != -1";
+		$sql .= " GROUP BY co.label, co.code, r.nom"; //+
+		//print $sql;
+	}
+	if ($mode == 'memberbytown') {
+		$label = $langs->trans("Country");
+		$label2 = $langs->trans("Town");
+		$tab = 'statstown';
 
-    $langsen = new Translate('', $conf);
-    $langsen->setDefaultLang('en_US');
-    $langsen->load("dict");
-    //print $langsen->trans("Country"."FI");exit;
+		$data = array();
+		$sql .= "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, c.code, c.label, d.town as label2";
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
+		$sql .= " WHERE d.entity IN (".getEntity('adherent').")";
+		$sql .= " AND d.statut != -1";
+		$sql .= " GROUP BY c.label, c.code, d.town";
+		//print $sql;
+	}
 
-    // Define $data array
-    dol_syslog("Count member", LOG_DEBUG);
-    $resql = $db->query($sql);
-    if ($resql) {
-        $num = $db->num_rows($resql);
-        $i = 0;
-        while ($i < $num) {
-            $obj = $db->fetch_object($resql);
-            if ($mode == 'memberbycountry') {
-                $data[] = array('label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
-                            'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
+	$langsen = new Translate('', $conf);
+	$langsen->setDefaultLang('en_US');
+	$langsen->load("dict");
+	//print $langsen->trans("Country"."FI");exit;
+
+	// Define $data array
+	dol_syslog("Count member", LOG_DEBUG);
+	$resql = $db->query($sql);
+	if ($resql) {
+		$num = $db->num_rows($resql);
+		$i = 0;
+		while ($i < $num) {
+			$obj = $db->fetch_object($resql);
+			if ($mode == 'memberbycountry') {
+				$data[] = array('label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
+							'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
 							'code'=>$obj->code,
 							'nb'=>$obj->nb,
 							'lastdate'=>$db->jdate($obj->lastdate),
-                            'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
-                );
-            }
-            if ($mode == 'memberbyregion') { //+
+							'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
+				);
+			}
+			if ($mode == 'memberbyregion') { //+
 				$data[] = array(
-                    'label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
-                    'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
-				    'label2'=>($obj->label2 ? $obj->label2 : $langs->trans("Unknown")),
+					'label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
+					'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
+					'label2'=>($obj->label2 ? $obj->label2 : $langs->trans("Unknown")),
 					'nb'=>$obj->nb,
 					'lastdate'=>$db->jdate($obj->lastdate),
-                    'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
-                );
-	        }
-            if ($mode == 'memberbystate') {
-                $data[] = array('label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
-                            'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
-				            'label2'=>($obj->label2 ? $obj->label2 : $langs->trans("Unknown")),
+					'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
+				);
+			}
+			if ($mode == 'memberbystate') {
+				$data[] = array('label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
+							'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
+							'label2'=>($obj->label2 ? $obj->label2 : $langs->trans("Unknown")),
 							'nb'=>$obj->nb,
 							'lastdate'=>$db->jdate($obj->lastdate),
-                            'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
-                );
-            }
-            if ($mode == 'memberbytown') {
-                $data[] = array('label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
-                            'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
-                            'label2'=>($obj->label2 ? $obj->label2 : $langs->trans("Unknown")),
-                            'nb'=>$obj->nb,
-                            'lastdate'=>$db->jdate($obj->lastdate),
-                            'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
-                );
-            }
+							'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
+				);
+			}
+			if ($mode == 'memberbytown') {
+				$data[] = array('label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
+							'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
+							'label2'=>($obj->label2 ? $obj->label2 : $langs->trans("Unknown")),
+							'nb'=>$obj->nb,
+							'lastdate'=>$db->jdate($obj->lastdate),
+							'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
+				);
+			}
 
-            $i++;
-        }
-        $db->free($resql);
-    } else {
-        dol_print_error($db);
-    }
+			$i++;
+		}
+		$db->free($resql);
+	} else {
+		dol_print_error($db);
+	}
 }
 
 
 $head = member_stats_prepare_head($adh);
 
-dol_fiche_head($head, $tab, $langs->trans("Statistics"), -1, 'user');
+print dol_get_fiche_head($head, $tab, $langs->trans("Statistics"), -1, 'user');
 
 
 // Print title
 if ($mode && !count($data)) {
-    print $langs->trans("NoValidatedMemberYet").'<br>';
-    print '<br>';
+	print $langs->trans("NoValidatedMemberYet").'<br>';
+	print '<br>';
 } else {
-    if ($mode == 'memberbycountry') print '<span class="opacitymedium">'.$langs->trans("MembersByCountryDesc").'</span><br>';
-    elseif ($mode == 'memberbystate') print '<span class="opacitymedium">'.$langs->trans("MembersByStateDesc").'</span><br>';
-    elseif ($mode == 'memberbytown') print '<span class="opacitymedium">'.$langs->trans("MembersByTownDesc").'</span><br>';
-    elseif ($mode == 'memberbyregion') print '<span class="opacitymedium">'.$langs->trans("MembersByRegion").'</span><br>'; //+
-    else {
-    	print '<span class="opacitymedium">'.$langs->trans("MembersStatisticsDesc").'</span><br>';
-        print '<br>';
-        print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbycountry">'.$langs->trans("MembersStatisticsByCountries").'</a><br>';
-        print '<br>';
-        print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbystate">'.$langs->trans("MembersStatisticsByState").'</a><br>';
-        print '<br>';
-        print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbytown">'.$langs->trans("MembersStatisticsByTown").'</a><br>';
-        print '<br>'; //+
+	if ($mode == 'memberbycountry') print '<span class="opacitymedium">'.$langs->trans("MembersByCountryDesc").'</span><br>';
+	elseif ($mode == 'memberbystate') print '<span class="opacitymedium">'.$langs->trans("MembersByStateDesc").'</span><br>';
+	elseif ($mode == 'memberbytown') print '<span class="opacitymedium">'.$langs->trans("MembersByTownDesc").'</span><br>';
+	elseif ($mode == 'memberbyregion') print '<span class="opacitymedium">'.$langs->trans("MembersByRegion").'</span><br>'; //+
+	else {
+		print '<span class="opacitymedium">'.$langs->trans("MembersStatisticsDesc").'</span><br>';
+		print '<br>';
+		print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbycountry">'.$langs->trans("MembersStatisticsByCountries").'</a><br>';
+		print '<br>';
+		print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbystate">'.$langs->trans("MembersStatisticsByState").'</a><br>';
+		print '<br>';
+		print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbytown">'.$langs->trans("MembersStatisticsByTown").'</a><br>';
+		print '<br>'; //+
 		print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbyregion">'.$langs->trans("MembersStatisticsByRegion").'</a><br>'; //+
-    }
-    print '<br>';
+	}
+	print '<br>';
 }
 
 
 // Show graphics
 if (count($arrayjs) && $mode == 'memberbycountry') {
-    $color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
-    if (is_readable($color_file)) include_once $color_file;
+	$color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
+	if (is_readable($color_file)) include_once $color_file;
 
-    // Assume we've already included the proper headers so just call our script inline
-    // More doc: https://developers.google.com/chart/interactive/docs/gallery/geomap?hl=fr-FR
-    print "\n<script type='text/javascript'>\n";
-    print "google.load('visualization', '1', {'packages': ['geomap']});\n";
-    print "google.setOnLoadCallback(drawMap);\n";
-    print "function drawMap() {\n\tvar data = new google.visualization.DataTable();\n";
+	// Assume we've already included the proper headers so just call our script inline
+	// More doc: https://developers.google.com/chart/interactive/docs/gallery/geomap?hl=fr-FR
+	print "\n<script type='text/javascript'>\n";
+	print "google.load('visualization', '1', {'packages': ['geomap']});\n";
+	print "google.setOnLoadCallback(drawMap);\n";
+	print "function drawMap() {\n\tvar data = new google.visualization.DataTable();\n";
 
-    // Get the total number of rows
-    print "\tdata.addRows(".count($data).");\n";
-    print "\tdata.addColumn('string', 'Country');\n";
-    print "\tdata.addColumn('number', 'Number');\n";
+	// Get the total number of rows
+	print "\tdata.addRows(".count($data).");\n";
+	print "\tdata.addColumn('string', 'Country');\n";
+	print "\tdata.addColumn('number', 'Number');\n";
 
-    // loop and dump
-    $i = 0;
-    foreach ($data as $val) {
-        $valcountry = strtoupper($val['code']); // Should be ISO-3166 code (faster)
-        //$valcountry=ucfirst($val['label_en']);
-        if ($valcountry == 'Great Britain') { $valcountry = 'United Kingdom'; }    // fix case of uk (when we use labels)
-        print "\tdata.setValue(".$i.", 0, \"".$valcountry."\");\n";
-        print "\tdata.setValue(".$i.", 1, ".$val['nb'].");\n";
-        // Google's Geomap only supports up to 400 entries
-        if ($i >= 400) { break; }
-        $i++;
-    }
+	// loop and dump
+	$i = 0;
+	foreach ($data as $val) {
+		$valcountry = strtoupper($val['code']); // Should be ISO-3166 code (faster)
+		//$valcountry=ucfirst($val['label_en']);
+		if ($valcountry == 'Great Britain') { $valcountry = 'United Kingdom'; }    // fix case of uk (when we use labels)
+		print "\tdata.setValue(".$i.", 0, \"".$valcountry."\");\n";
+		print "\tdata.setValue(".$i.", 1, ".$val['nb'].");\n";
+		// Google's Geomap only supports up to 400 entries
+		if ($i >= 400) { break; }
+		$i++;
+	}
 
-    print "\tvar options = {};\n";
-    print "\toptions['dataMode'] = 'regions';\n";
-    print "\toptions['showZoomOut'] = false;\n";
-    //print "\toptions['zoomOutLabel'] = '".dol_escape_js($langs->transnoentitiesnoconv("Numbers"))."';\n";
-    print "\toptions['width'] = ".$graphwidth.";\n";
-    print "\toptions['height'] = ".$graphheight.";\n";
-    print "\toptions['colors'] = [0x".colorArrayToHex($theme_datacolor[1], 'BBBBBB').", 0x".colorArrayToHex($theme_datacolor[0], '444444')."];\n";
-    print "\tvar container = document.getElementById('".$mode."');\n";
-    print "\tvar geomap = new google.visualization.GeoMap(container);\n";
-    print "\tgeomap.draw(data, options);\n";
-    print "};\n";
-    print "</script>\n";
+	print "\tvar options = {};\n";
+	print "\toptions['dataMode'] = 'regions';\n";
+	print "\toptions['showZoomOut'] = false;\n";
+	//print "\toptions['zoomOutLabel'] = '".dol_escape_js($langs->transnoentitiesnoconv("Numbers"))."';\n";
+	print "\toptions['width'] = ".$graphwidth.";\n";
+	print "\toptions['height'] = ".$graphheight.";\n";
+	print "\toptions['colors'] = [0x".colorArrayToHex($theme_datacolor[1], 'BBBBBB').", 0x".colorArrayToHex($theme_datacolor[0], '444444')."];\n";
+	print "\tvar container = document.getElementById('".$mode."');\n";
+	print "\tvar geomap = new google.visualization.GeoMap(container);\n";
+	print "\tgeomap.draw(data, options);\n";
+	print "};\n";
+	print "</script>\n";
 
-    // print the div tag that will contain the map
-    print '<div class="center" id="'.$mode.'"></div>'."\n";
-    print '<br>';
+	// print the div tag that will contain the map
+	print '<div class="center" id="'.$mode.'"></div>'."\n";
+	print '<br>';
 }
 
 if ($mode) {
-    // Print array
+	// Print array
 	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 	print '<table class="liste centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td>'.$label.'</td>';
-    if ($label2) print '<td class="center">'.$label2.'</td>';
-    print '<td class="right">'.$langs->trans("NbOfMembers").' <span class="opacitymedium">('.$langs->trans("AllTime").')</span></td>';
-    print '<td class="center">'.$langs->trans("LastMemberDate").'</td>';
-    print '<td class="center">'.$langs->trans("LatestSubscriptionDate").'</td>';
-    print '</tr>';
+	print '<tr class="liste_titre">';
+	print '<td>'.$label.'</td>';
+	if ($label2) print '<td class="center">'.$label2.'</td>';
+	print '<td class="right">'.$langs->trans("NbOfMembers").' <span class="opacitymedium">('.$langs->trans("AllTime").')</span></td>';
+	print '<td class="center">'.$langs->trans("LastMemberDate").'</td>';
+	print '<td class="center">'.$langs->trans("LatestSubscriptionDate").'</td>';
+	print '</tr>';
 
-    foreach ($data as $val) {
-        $year = $val['year'];
-        print '<tr class="oddeven">';
-        print '<td>'.$val['label'].'</td>';
-        if ($label2) print '<td class="center">'.$val['label2'].'</td>';
-        print '<td class="right">'.$val['nb'].'</td>';
-        print '<td class="center">'.dol_print_date($val['lastdate'], 'dayhour').'</td>';
-        print '<td class="center">'.dol_print_date($val['lastsubscriptiondate'], 'dayhour').'</td>';
-        print '</tr>';
-    }
+	foreach ($data as $val) {
+		$year = $val['year'];
+		print '<tr class="oddeven">';
+		print '<td>'.$val['label'].'</td>';
+		if ($label2) print '<td class="center">'.$val['label2'].'</td>';
+		print '<td class="right">'.$val['nb'].'</td>';
+		print '<td class="center">'.dol_print_date($val['lastdate'], 'dayhour').'</td>';
+		print '<td class="center">'.dol_print_date($val['lastsubscriptiondate'], 'dayhour').'</td>';
+		print '</tr>';
+	}
 
-    print '</table>';
-    print '</div>';
+	print '</table>';
+	print '</div>';
 }
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index c6748538264..6ac4e3dd78a 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -36,8 +36,8 @@ $socid = GETPOST('socid', 'int'); if ($socid < 0) $socid = 0;
 
 // Security check
 if ($user->socid > 0) {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'adherent', '', '', 'cotisation');
 
@@ -79,24 +79,24 @@ $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=memberstats&file=subscripti
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
 if (!$mesg) {
-    $px1->SetData($data);
-    $i = $startyear;
-    while ($i <= $endyear) {
-        $legend[] = $i;
-        $i++;
-    }
-    $px1->SetLegend($legend);
-    $px1->SetMaxValue($px1->GetCeilMaxValue());
-    $px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
-    $px1->SetWidth($WIDTH);
-    $px1->SetHeight($HEIGHT);
-    $px1->SetYLabel($langs->trans("NbOfSubscriptions"));
-    $px1->SetShading(3);
-    $px1->SetHorizTickIncrement(1);
-    $px1->mode = 'depth';
-    $px1->SetTitle($langs->trans("NbOfSubscriptions"));
+	$px1->SetData($data);
+	$i = $startyear;
+	while ($i <= $endyear) {
+		$legend[] = $i;
+		$i++;
+	}
+	$px1->SetLegend($legend);
+	$px1->SetMaxValue($px1->GetCeilMaxValue());
+	$px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
+	$px1->SetWidth($WIDTH);
+	$px1->SetHeight($HEIGHT);
+	$px1->SetYLabel($langs->trans("NbOfSubscriptions"));
+	$px1->SetShading(3);
+	$px1->SetHorizTickIncrement(1);
+	$px1->mode = 'depth';
+	$px1->SetTitle($langs->trans("NbOfSubscriptions"));
 
-    $px1->draw($filenamenb, $fileurlnb);
+	$px1->draw($filenamenb, $fileurlnb);
 }
 
 // Build graphic amount of object
@@ -110,30 +110,30 @@ $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=memberstats&file=subscr
 $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
 if (!$mesg) {
-    $px2->SetData($data);
-    $i = $startyear;
-    while ($i <= $endyear) {
-        $legend[] = $i;
-        $i++;
-    }
-    $px2->SetLegend($legend);
-    $px2->SetMaxValue($px2->GetCeilMaxValue());
-    $px2->SetMinValue(min(0, $px2->GetFloorMinValue()));
-    $px2->SetWidth($WIDTH);
-    $px2->SetHeight($HEIGHT);
-    $px2->SetYLabel($langs->trans("AmountOfSubscriptions"));
-    $px2->SetShading(3);
-    $px2->SetHorizTickIncrement(1);
-    $px2->mode = 'depth';
-    $px2->SetTitle($langs->trans("AmountOfSubscriptions"));
+	$px2->SetData($data);
+	$i = $startyear;
+	while ($i <= $endyear) {
+		$legend[] = $i;
+		$i++;
+	}
+	$px2->SetLegend($legend);
+	$px2->SetMaxValue($px2->GetCeilMaxValue());
+	$px2->SetMinValue(min(0, $px2->GetFloorMinValue()));
+	$px2->SetWidth($WIDTH);
+	$px2->SetHeight($HEIGHT);
+	$px2->SetYLabel($langs->trans("AmountOfSubscriptions"));
+	$px2->SetShading(3);
+	$px2->SetHorizTickIncrement(1);
+	$px2->mode = 'depth';
+	$px2->SetTitle($langs->trans("AmountOfSubscriptions"));
 
-    $px2->draw($filenameamount, $fileurlamount);
+	$px2->draw($filenameamount, $fileurlamount);
 }
 
 
 $head = member_stats_prepare_head($adh);
 
-dol_fiche_head($head, 'statssubscription', $langs->trans("Statistics"), -1, 'user');
+print dol_get_fiche_head($head, 'statssubscription', $langs->trans("Statistics"), -1, 'user');
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
@@ -171,31 +171,31 @@ print '</tr>';
 
 $oldyear = 0;
 foreach ($data as $val) {
-    $year = $val['year'];
-    while ($oldyear > $year + 1) {	// If we have empty year
-        $oldyear--;
-        print '<tr class="oddeven" height="24">';
-        print '<td class="center">';
-        //print '<a href="month.php?year='.$oldyear.'&amp;mode='.$mode.'">';
-        print $oldyear;
-        //print '</a>';
-        print '</td>';
-        print '<td class="right">0</td>';
-        print '<td class="right">0</td>';
-        print '<td class="right">0</td>';
-        print '</tr>';
-    }
-    print '<tr class="oddeven" height="24">';
-    print '<td class="center">';
-    //print '<a href="month.php?year='.$year.'">';
-    print $year;
-    //print '</a>';
-    print '</td>';
-    print '<td class="right">'.$val['nb'].'</td>';
-    print '<td class="right">'.price(price2num($val['total'], 'MT'), 1).'</td>';
-    print '<td class="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>';
-    print '</tr>';
-    $oldyear = $year;
+	$year = $val['year'];
+	while ($oldyear > $year + 1) {	// If we have empty year
+		$oldyear--;
+		print '<tr class="oddeven" height="24">';
+		print '<td class="center">';
+		//print '<a href="month.php?year='.$oldyear.'&amp;mode='.$mode.'">';
+		print $oldyear;
+		//print '</a>';
+		print '</td>';
+		print '<td class="right">0</td>';
+		print '<td class="right">0</td>';
+		print '<td class="right">0</td>';
+		print '</tr>';
+	}
+	print '<tr class="oddeven" height="24">';
+	print '<td class="center">';
+	//print '<a href="month.php?year='.$year.'">';
+	print $year;
+	//print '</a>';
+	print '</td>';
+	print '<td class="right">'.$val['nb'].'</td>';
+	print '<td class="right">'.price(price2num($val['total'], 'MT'), 1).'</td>';
+	print '<td class="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>';
+	print '</tr>';
+	$oldyear = $year;
 }
 
 print '</table>';
@@ -208,9 +208,9 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
 if ($mesg) { print $mesg; } else {
-    print $px1->show();
-    print "<br>\n";
-    print $px2->show();
+	print $px1->show();
+	print "<br>\n";
+	print $px2->show();
 }
 print '</td></tr></table>';
 
@@ -219,7 +219,7 @@ print '</div></div></div>';
 print '<div style="clear:both"></div>';
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 67880c303cb..1c4e42da1fe 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -76,26 +76,26 @@ $defaultdelay = 1;
 $defaultdelayunit = 'y';
 
 if ($rowid) {
-    // Load member
-    $result = $object->fetch($rowid);
+	// Load member
+	$result = $object->fetch($rowid);
 
-    // Define variables to know what current user can do on users
-    $canadduser = ($user->admin || $user->rights->user->user->creer);
-    // Define variables to know what current user can do on properties of user linked to edited member
-    if ($object->user_id) {
-        // $user is the user editing, $object->user_id is the user's id linked to the edited member
-        $caneditfielduser = ((($user->id == $object->user_id) && $user->rights->user->self->creer)
-        || (($user->id != $object->user_id) && $user->rights->user->user->creer));
-        $caneditpassworduser = ((($user->id == $object->user_id) && $user->rights->user->self->password)
-        || (($user->id != $object->user_id) && $user->rights->user->user->password));
-    }
+	// Define variables to know what current user can do on users
+	$canadduser = ($user->admin || $user->rights->user->user->creer);
+	// Define variables to know what current user can do on properties of user linked to edited member
+	if ($object->user_id) {
+		// $user is the user editing, $object->user_id is the user's id linked to the edited member
+		$caneditfielduser = ((($user->id == $object->user_id) && $user->rights->user->self->creer)
+		|| (($user->id != $object->user_id) && $user->rights->user->user->creer));
+		$caneditpassworduser = ((($user->id == $object->user_id) && $user->rights->user->self->password)
+		|| (($user->id != $object->user_id) && $user->rights->user->user->password));
+	}
 }
 
 // Define variables to know what current user can do on members
 $canaddmember = $user->rights->adherent->creer;
 // Define variables to know what current user can do on properties of a member
 if ($rowid) {
-    $caneditfieldmember = $user->rights->adherent->creer;
+	$caneditfieldmember = $user->rights->adherent->creer;
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -130,242 +130,242 @@ if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights
 }
 
 if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights->user->user->creer)) {
-    $error = 0;
-    if (empty($user->rights->user->user->creer)) {    // If can edit only itself user, we can link to itself only
+	$error = 0;
+	if (empty($user->rights->user->user->creer)) {    // If can edit only itself user, we can link to itself only
 		if ($_POST["userid"] != $user->id && $_POST["userid"] != $object->user_id) {
-            $error++;
-            setEventMessages($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), null, 'errors');
+			$error++;
+			setEventMessages($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), null, 'errors');
 		}
-    }
+	}
 
-    if (!$error) {
-        if ($_POST["userid"] != $object->user_id) {  // If link differs from currently in database
+	if (!$error) {
+		if ($_POST["userid"] != $object->user_id) {  // If link differs from currently in database
 			$result = $object->setUserId($_POST["userid"]);
-            if ($result < 0) dol_print_error('', $object->error);
-            $_POST['action'] = '';
-            $action = '';
-        }
-    }
+			if ($result < 0) dol_print_error('', $object->error);
+			$_POST['action'] = '';
+			$action = '';
+		}
+	}
 }
 
 if ($action == 'setsocid') {
-    $error = 0;
-    if (!$error) {
-        if (GETPOST('socid', 'int') != $object->fk_soc) {    // If link differs from currently in database
+	$error = 0;
+	if (!$error) {
+		if (GETPOST('socid', 'int') != $object->fk_soc) {    // If link differs from currently in database
 			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."adherent";
-            $sql .= " WHERE fk_soc = '".GETPOST('socid', 'int')."'";
-            $resql = $db->query($sql);
-            if ($resql) {
-                $obj = $db->fetch_object($resql);
-                if ($obj && $obj->rowid > 0) {
-                    $othermember = new Adherent($db);
-                    $othermember->fetch($obj->rowid);
-                    $thirdparty = new Societe($db);
-                    $thirdparty->fetch(GETPOST('socid', 'int'));
-                    $error++;
-	                setEventMessages($langs->trans("ErrorMemberIsAlreadyLinkedToThisThirdParty", $othermember->getFullName($langs), $othermember->login, $thirdparty->name), null, 'errors');
-                }
-            }
+			$sql .= " WHERE fk_soc = '".GETPOST('socid', 'int')."'";
+			$resql = $db->query($sql);
+			if ($resql) {
+				$obj = $db->fetch_object($resql);
+				if ($obj && $obj->rowid > 0) {
+					$othermember = new Adherent($db);
+					$othermember->fetch($obj->rowid);
+					$thirdparty = new Societe($db);
+					$thirdparty->fetch(GETPOST('socid', 'int'));
+					$error++;
+					setEventMessages($langs->trans("ErrorMemberIsAlreadyLinkedToThisThirdParty", $othermember->getFullName($langs), $othermember->login, $thirdparty->name), null, 'errors');
+				}
+			}
 
-            if (!$error) {
-                $result = $object->setThirdPartyId(GETPOST('socid', 'int'));
-                if ($result < 0) dol_print_error('', $object->error);
-                $_POST['action'] = '';
-                $action = '';
-            }
-        }
-    }
+			if (!$error) {
+				$result = $object->setThirdPartyId(GETPOST('socid', 'int'));
+				if ($result < 0) dol_print_error('', $object->error);
+				$_POST['action'] = '';
+				$action = '';
+			}
+		}
+	}
 }
 
 if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !$_POST["cancel"]) {
-    $error = 0;
+	$error = 0;
 
-    $langs->load("banks");
+	$langs->load("banks");
 
-    $result = $object->fetch($rowid);
-    $result = $adht->fetch($object->typeid);
+	$result = $object->fetch($rowid);
+	$result = $adht->fetch($object->typeid);
 
-    // Subscription informations
-    $datesubscription = 0;
-    $datesubend = 0;
-    $paymentdate = 0;
-    if ($_POST["reyear"] && $_POST["remonth"] && $_POST["reday"]) {
-        $datesubscription = dol_mktime(0, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
-    }
-    if ($_POST["endyear"] && $_POST["endmonth"] && $_POST["endday"]) {
-        $datesubend = dol_mktime(0, 0, 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
-    }
-    if ($_POST["paymentyear"] && $_POST["paymentmonth"] && $_POST["paymentday"]) {
-        $paymentdate = dol_mktime(0, 0, 0, $_POST["paymentmonth"], $_POST["paymentday"], $_POST["paymentyear"]);
-    }
-    $amount = price2num(GETPOST("subscription", 'alpha')); // Amount of subscription
-    $label = $_POST["label"];
+	// Subscription informations
+	$datesubscription = 0;
+	$datesubend = 0;
+	$paymentdate = 0;
+	if ($_POST["reyear"] && $_POST["remonth"] && $_POST["reday"]) {
+		$datesubscription = dol_mktime(0, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
+	}
+	if ($_POST["endyear"] && $_POST["endmonth"] && $_POST["endday"]) {
+		$datesubend = dol_mktime(0, 0, 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
+	}
+	if ($_POST["paymentyear"] && $_POST["paymentmonth"] && $_POST["paymentday"]) {
+		$paymentdate = dol_mktime(0, 0, 0, $_POST["paymentmonth"], $_POST["paymentday"], $_POST["paymentyear"]);
+	}
+	$amount = price2num(GETPOST("subscription", 'alpha')); // Amount of subscription
+	$label = $_POST["label"];
 
-    // Payment informations
-    $accountid = $_POST["accountid"];
-    $operation = $_POST["operation"]; // Payment mode
-    $num_chq = GETPOST("num_chq", "alphanohtml");
-    $emetteur_nom = $_POST["chqemetteur"];
-    $emetteur_banque = $_POST["chqbank"];
-    $option = $_POST["paymentsave"];
-    if (empty($option)) $option = 'none';
-    $sendalsoemail = GETPOST("sendmail", 'alpha');
+	// Payment informations
+	$accountid = $_POST["accountid"];
+	$operation = $_POST["operation"]; // Payment mode
+	$num_chq = GETPOST("num_chq", "alphanohtml");
+	$emetteur_nom = $_POST["chqemetteur"];
+	$emetteur_banque = $_POST["chqbank"];
+	$option = $_POST["paymentsave"];
+	if (empty($option)) $option = 'none';
+	$sendalsoemail = GETPOST("sendmail", 'alpha');
 
-    // Check parameters
-    if (!$datesubscription) {
-        $error++;
-        $langs->load("errors");
-        $errmsg = $langs->trans("ErrorBadDateFormat", $langs->transnoentitiesnoconv("DateSubscription"));
-        setEventMessages($errmsg, null, 'errors');
-        $action = 'addsubscription';
-    }
-    if (GETPOST('end') && !$datesubend) {
-        $error++;
-        $langs->load("errors");
-        $errmsg = $langs->trans("ErrorBadDateFormat", $langs->transnoentitiesnoconv("DateEndSubscription"));
-        setEventMessages($errmsg, null, 'errors');
-        $action = 'addsubscription';
-    }
-    if (!$datesubend) {
-        $datesubend = dol_time_plus_duree(dol_time_plus_duree($datesubscription, $defaultdelay, $defaultdelayunit), -1, 'd');
-    }
-    if (($option == 'bankviainvoice' || $option == 'bankdirect') && !$paymentdate) {
-        $error++;
-        $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DatePayment"));
-        setEventMessages($errmsg, null, 'errors');
-        $action = 'addsubscription';
-    }
+	// Check parameters
+	if (!$datesubscription) {
+		$error++;
+		$langs->load("errors");
+		$errmsg = $langs->trans("ErrorBadDateFormat", $langs->transnoentitiesnoconv("DateSubscription"));
+		setEventMessages($errmsg, null, 'errors');
+		$action = 'addsubscription';
+	}
+	if (GETPOST('end') && !$datesubend) {
+		$error++;
+		$langs->load("errors");
+		$errmsg = $langs->trans("ErrorBadDateFormat", $langs->transnoentitiesnoconv("DateEndSubscription"));
+		setEventMessages($errmsg, null, 'errors');
+		$action = 'addsubscription';
+	}
+	if (!$datesubend) {
+		$datesubend = dol_time_plus_duree(dol_time_plus_duree($datesubscription, $defaultdelay, $defaultdelayunit), -1, 'd');
+	}
+	if (($option == 'bankviainvoice' || $option == 'bankdirect') && !$paymentdate) {
+		$error++;
+		$errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DatePayment"));
+		setEventMessages($errmsg, null, 'errors');
+		$action = 'addsubscription';
+	}
 
-    // Check if a payment is mandatory or not
-    if (!$error && $adht->subscription) {	// Member type need subscriptions
+	// Check if a payment is mandatory or not
+	if (!$error && $adht->subscription) {	// Member type need subscriptions
 		if (!is_numeric($amount)) {
-            // If field is '' or not a numeric value
-            $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
-        	setEventMessages($errmsg, null, 'errors');
-            $error++;
-            $action = 'addsubscription';
+			// If field is '' or not a numeric value
+			$errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
+			setEventMessages($errmsg, null, 'errors');
+			$error++;
+			$action = 'addsubscription';
 		} else {
-            if (!empty($conf->banque->enabled) && $_POST["paymentsave"] != 'none') {
-                if ($_POST["subscription"]) {
-                    if (!$_POST["label"])     $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
-                    if ($_POST["paymentsave"] != 'invoiceonly' && !$_POST["operation"]) $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
-                    if ($_POST["paymentsave"] != 'invoiceonly' && !($_POST["accountid"] > 0)) $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("FinancialAccount"));
-                } else {
-                    if ($_POST["accountid"])   $errmsg = $langs->trans("ErrorDoNotProvideAccountsIfNullAmount");
-                }
-                if ($errmsg) {
-                	$error++;
-        			setEventMessages($errmsg, null, 'errors');
-        			$error++;
-                	$action = 'addsubscription';
-                }
-            }
-        }
-    }
+			if (!empty($conf->banque->enabled) && $_POST["paymentsave"] != 'none') {
+				if ($_POST["subscription"]) {
+					if (!$_POST["label"])     $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
+					if ($_POST["paymentsave"] != 'invoiceonly' && !$_POST["operation"]) $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
+					if ($_POST["paymentsave"] != 'invoiceonly' && !($_POST["accountid"] > 0)) $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("FinancialAccount"));
+				} else {
+					if ($_POST["accountid"])   $errmsg = $langs->trans("ErrorDoNotProvideAccountsIfNullAmount");
+				}
+				if ($errmsg) {
+					$error++;
+					setEventMessages($errmsg, null, 'errors');
+					$error++;
+					$action = 'addsubscription';
+				}
+			}
+		}
+	}
 
-    // Record the subscription then complementary actions
-    if (!$error && $action == 'subscription') {
-        $db->begin();
+	// Record the subscription then complementary actions
+	if (!$error && $action == 'subscription') {
+		$db->begin();
 
-        // Create subscription
-        $crowid = $object->subscription($datesubscription, $amount, $accountid, $operation, $label, $num_chq, $emetteur_nom, $emetteur_banque, $datesubend);
-        if ($crowid <= 0) {
-            $error++;
-            $errmsg = $object->error;
-	        setEventMessages($object->error, $object->errors, 'errors');
-        }
+		// Create subscription
+		$crowid = $object->subscription($datesubscription, $amount, $accountid, $operation, $label, $num_chq, $emetteur_nom, $emetteur_banque, $datesubend);
+		if ($crowid <= 0) {
+			$error++;
+			$errmsg = $object->error;
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 
-        if (!$error) {
-        	$result = $object->subscriptionComplementaryActions($crowid, $option, $accountid, $datesubscription, $paymentdate, $operation, $label, $amount, $num_chq, $emetteur_nom, $emetteur_banque);
+		if (!$error) {
+			$result = $object->subscriptionComplementaryActions($crowid, $option, $accountid, $datesubscription, $paymentdate, $operation, $label, $amount, $num_chq, $emetteur_nom, $emetteur_banque);
 			if ($result < 0) {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			} else {
 				// If an invoice was created, it is into $object->invoice
 			}
-        }
+		}
 
-        if (!$error) {
-            $db->commit();
-        } else {
-            $db->rollback();
-            $action = 'addsubscription';
-        }
+		if (!$error) {
+			$db->commit();
+		} else {
+			$db->rollback();
+			$action = 'addsubscription';
+		}
 
-        if (!$error) {
-        	setEventMessages("SubscriptionRecorded", null, 'mesgs');
-        }
+		if (!$error) {
+			setEventMessages("SubscriptionRecorded", null, 'mesgs');
+		}
 
-        // Send email
-        if (!$error) {
-            // Send confirmation Email
-            if ($object->email && $sendalsoemail) {   // $object is 'Adherent'
+		// Send email
+		if (!$error) {
+			// Send confirmation Email
+			if ($object->email && $sendalsoemail) {   // $object is 'Adherent'
 				$subject = '';
-            	$msg = '';
+				$msg = '';
 
-            	// Send subscription email
-            	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-            	$formmail = new FormMail($db);
-            	// Set output language
-            	$outputlangs = new Translate('', $conf);
-            	$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
-            	// Load traductions files required by page
-            	$outputlangs->loadLangs(array("main", "members"));
+				// Send subscription email
+				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+				$formmail = new FormMail($db);
+				// Set output language
+				$outputlangs = new Translate('', $conf);
+				$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
+				// Load traductions files required by page
+				$outputlangs->loadLangs(array("main", "members"));
 
-            	// Get email content from template
-            	$arraydefaultmessage = null;
-            	$labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION;
+				// Get email content from template
+				$arraydefaultmessage = null;
+				$labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION;
 
-            	if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
+				if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-            	if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
-            		$subject = $arraydefaultmessage->topic;
-            		$msg     = $arraydefaultmessage->content;
-            	}
+				if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+					$subject = $arraydefaultmessage->topic;
+					$msg     = $arraydefaultmessage->content;
+				}
 
-            	$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
-            	complete_substitutions_array($substitutionarray, $outputlangs, $object);
-            	$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
-            	$texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnSubscription()), $substitutionarray, $outputlangs);
+				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+				complete_substitutions_array($substitutionarray, $outputlangs, $object);
+				$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+				$texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnSubscription()), $substitutionarray, $outputlangs);
 
-                // Attach a file ?
-                $file = '';
-                $listofpaths = array();
-                $listofnames = array();
-                $listofmimes = array();
-                if (is_object($object->invoice)) {
-                	$invoicediroutput = $conf->facture->dir_output;
-                	$fileparams = dol_most_recent_file($invoicediroutput.'/'.$object->invoice->ref, preg_quote($object->invoice->ref, '/').'[^\-]+');
-                	$file = $fileparams['fullname'];
+				// Attach a file ?
+				$file = '';
+				$listofpaths = array();
+				$listofnames = array();
+				$listofmimes = array();
+				if (is_object($object->invoice) && (!is_object($arraydefaultmessage) || intval($arraydefaultmessage->joinfiles))) {
+					$invoicediroutput = $conf->facture->dir_output;
+					$fileparams = dol_most_recent_file($invoicediroutput.'/'.$object->invoice->ref, preg_quote($object->invoice->ref, '/').'[^\-]+');
+					$file = $fileparams['fullname'];
 
-                	$listofpaths = array($file);
-                	$listofnames = array(basename($file));
-                	$listofmimes = array(dol_mimetype($file));
-                }
+					$listofpaths = array($file);
+					$listofnames = array(basename($file));
+					$listofmimes = array(dol_mimetype($file));
+				}
 
-                $moreinheader = 'X-Dolibarr-Info: send_an_email by adherents/subscription.php'."\r\n";
+				$moreinheader = 'X-Dolibarr-Info: send_an_email by adherents/subscription.php'."\r\n";
 
-                $result = $object->send_an_email($texttosend, $subjecttosend, $listofpaths, $listofmimes, $listofnames, "", "", 0, -1, '', $moreinheader);
-                if ($result < 0) {
-                	$errmsg = $object->error;
-                	setEventMessages($object->error, $object->errors, 'errors');
-                } else {
-                	setEventMessages($langs->trans("EmailSentToMember", $object->email), null, 'mesgs');
-                }
-            } else {
-            	setEventMessages($langs->trans("NoEmailSentToMember"), null, 'mesgs');
-            }
-        }
+				$result = $object->send_an_email($texttosend, $subjecttosend, $listofpaths, $listofmimes, $listofnames, "", "", 0, -1, '', $moreinheader);
+				if ($result < 0) {
+					$errmsg = $object->error;
+					setEventMessages($object->error, $object->errors, 'errors');
+				} else {
+					setEventMessages($langs->trans("EmailSentToMember", $object->email), null, 'mesgs');
+				}
+			} else {
+				setEventMessages($langs->trans("NoEmailSentToMember"), null, 'mesgs');
+			}
+		}
 
-        // Clean some POST vars
-        if (!$error) {
-            $_POST["subscription"] = '';
-            $_POST["accountid"] = '';
-            $_POST["operation"] = '';
-            $_POST["label"] = '';
-            $_POST["num_chq"] = '';
-        }
-    }
+		// Clean some POST vars
+		if (!$error) {
+			$_POST["subscription"] = '';
+			$_POST["accountid"] = '';
+			$_POST["operation"] = '';
+			$_POST["label"] = '';
+			$_POST["num_chq"] = '';
+		}
+	}
 }
 
 
@@ -393,32 +393,32 @@ if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
 
 
 if ($rowid > 0) {
-    $res = $object->fetch($rowid);
-    if ($res < 0) { dol_print_error($db, $object->error); exit; }
+	$res = $object->fetch($rowid);
+	if ($res < 0) { dol_print_error($db, $object->error); exit; }
 
-    $adht->fetch($object->typeid);
+	$adht->fetch($object->typeid);
 
-    $head = member_prepare_head($object);
+	$head = member_prepare_head($object);
 
-    $rowspan = 10;
-    if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) $rowspan++;
-    if (!empty($conf->societe->enabled)) $rowspan++;
+	$rowspan = 10;
+	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) $rowspan++;
+	if (!empty($conf->societe->enabled)) $rowspan++;
 
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="rowid" value="'.$object->id.'">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="rowid" value="'.$object->id.'">';
 
-    dol_fiche_head($head, 'subscription', $langs->trans("Member"), -1, 'user');
+	print dol_get_fiche_head($head, 'subscription', $langs->trans("Member"), -1, 'user');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'rowid', $linkback);
+	dol_banner_tab($object, 'rowid', $linkback);
 
-    print '<div class="fichecenter">';
-    print '<div class="fichehalfleft">';
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
 
-    print '<div class="underbanner clearboth"></div>';
-    print '<table class="border centpercent tableforfield">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">';
 
 	// Login
 	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
@@ -443,20 +443,20 @@ if ($rowid > 0) {
 	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 		print '<tr><td>'.$langs->trans("Password").'</td><td>'.preg_replace('/./i', '*', $object->pass);
 		if ((!empty($object->pass) || !empty($object->pass_crypted)) && empty($object->user_id)) {
-		    $langs->load("errors");
-		    $htmltext = $langs->trans("WarningPasswordSetWithNoAccount");
-		    print ' '.$form->textwithpicto('', $htmltext, 1, 'warning');
+			$langs->load("errors");
+			$htmltext = $langs->trans("WarningPasswordSetWithNoAccount");
+			print ' '.$form->textwithpicto('', $htmltext, 1, 'warning');
 		}
 		print '</td></tr>';
 	}
 
-    print '</table>';
+	print '</table>';
 
-    print '</div>';
-    print '<div class="fichehalfright"><div class="ficheaddleft">';
+	print '</div>';
+	print '<div class="fichehalfright"><div class="ficheaddleft">';
 
-    print '<div class="underbanner clearboth"></div>';
-    print '<table class="border tableforfield" width="100%">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border tableforfield" width="100%">';
 
 	// Birthday
 	print '<tr><td class="titlefield">'.$langs->trans("Birthday").'</td><td class="valeur">'.dol_print_date($object->birth, 'day').'</td></tr>';
@@ -472,25 +472,25 @@ if ($rowid > 0) {
 		print '</td></tr>';
 	}
 
-    // Other attributes
-    $cols = 2;
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+	// Other attributes
+	$cols = 2;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 	// Date end subscription
 	print '<tr><td>'.$langs->trans("SubscriptionEndDate").'</td><td class="valeur">';
 	if ($object->datefin) {
-	    print dol_print_date($object->datefin, 'day');
-	    if ($object->hasDelay()) {
-	        print " ".img_warning($langs->trans("Late"));
-	    }
+		print dol_print_date($object->datefin, 'day');
+		if ($object->hasDelay()) {
+			print " ".img_warning($langs->trans("Late"));
+		}
 	} else {
-	    if (!$adht->subscription) {
-	        print $langs->trans("SubscriptionNotRecorded");
-	        if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
-	    } else {
-	        print $langs->trans("SubscriptionNotReceived");
-	        if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
-	    }
+		if (!$adht->subscription) {
+			print $langs->trans("SubscriptionNotRecorded");
+			if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
+		} else {
+			print $langs->trans("SubscriptionNotReceived");
+			if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
+		}
 	}
 	print '</td></tr>';
 
@@ -550,100 +550,100 @@ if ($rowid > 0) {
 	}
 	print '</td></tr>';
 
-    print "</table>\n";
+	print "</table>\n";
 
 	print "</div></div></div>\n";
-    print '<div style="clear:both"></div>';
+	print '<div style="clear:both"></div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '</form>';
+	print '</form>';
 
 
-    /*
+	/*
      * Action buttons
      */
 
-    // Button to create a new subscription if member no draft neither resiliated
-    if ($user->rights->adherent->cotisation->creer) {
-        if ($action != 'addsubscription' && $action != 'create_thirdparty') {
-            print '<div class="tabsAction">';
+	// Button to create a new subscription if member no draft neither resiliated
+	if ($user->rights->adherent->cotisation->creer) {
+		if ($action != 'addsubscription' && $action != 'create_thirdparty') {
+			print '<div class="tabsAction">';
 
-            if ($object->statut > 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$rowid.'&action=addsubscription">'.$langs->trans("AddSubscription")."</a></div>";
-            else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("AddSubscription").'</a></div>';
+			if ($object->statut > 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$rowid.'&action=addsubscription">'.$langs->trans("AddSubscription")."</a></div>";
+			else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("AddSubscription").'</a></div>';
 
-            print '</div>';
-        }
-    }
+			print '</div>';
+		}
+	}
 
-    /*
+	/*
      * List of subscriptions
      */
-    if ($action != 'addsubscription' && $action != 'create_thirdparty') {
-        $sql = "SELECT d.rowid, d.firstname, d.lastname, d.societe, d.fk_adherent_type as type,";
-        $sql .= " c.rowid as crowid, c.subscription,";
-        $sql .= " c.datec, c.fk_type as cfk_type,";
-        $sql .= " c.dateadh as dateh,";
-        $sql .= " c.datef,";
-        $sql .= " c.fk_bank,";
-        $sql .= " b.rowid as bid,";
-        $sql .= " ba.rowid as baid, ba.label, ba.bank, ba.ref, ba.account_number, ba.fk_accountancy_journal, ba.number, ba.currency_code";
-        $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."subscription as c";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON c.fk_bank = b.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
-        $sql .= " WHERE d.rowid = c.fk_adherent AND d.rowid=".$rowid;
+	if ($action != 'addsubscription' && $action != 'create_thirdparty') {
+		$sql = "SELECT d.rowid, d.firstname, d.lastname, d.societe, d.fk_adherent_type as type,";
+		$sql .= " c.rowid as crowid, c.subscription,";
+		$sql .= " c.datec, c.fk_type as cfk_type,";
+		$sql .= " c.dateadh as dateh,";
+		$sql .= " c.datef,";
+		$sql .= " c.fk_bank,";
+		$sql .= " b.rowid as bid,";
+		$sql .= " ba.rowid as baid, ba.label, ba.bank, ba.ref, ba.account_number, ba.fk_accountancy_journal, ba.number, ba.currency_code";
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."subscription as c";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON c.fk_bank = b.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
+		$sql .= " WHERE d.rowid = c.fk_adherent AND d.rowid=".$rowid;
 		$sql .= $db->order($sortfield, $sortorder);
 
-        $result = $db->query($sql);
-        if ($result) {
-            $subscriptionstatic = new Subscription($db);
+		$result = $db->query($sql);
+		if ($result) {
+			$subscriptionstatic = new Subscription($db);
 
-            $num = $db->num_rows($result);
+			$num = $db->num_rows($result);
 
-            print '<table class="noborder centpercent">'."\n";
+			print '<table class="noborder centpercent">'."\n";
 
-            print '<tr class="liste_titre">';
-            print_liste_field_titre('Ref', $_SERVER["PHP_SELF"], 'c.rowid', '', $param, '', $sortfield, $sortorder);
-            print_liste_field_titre('DateCreation', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
-            print_liste_field_titre('Type', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
-            print_liste_field_titre('DateStart', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
-            print_liste_field_titre('DateEnd', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
-            print_liste_field_titre('Amount', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-            if (!empty($conf->banque->enabled)) {
-            	print_liste_field_titre('Account', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-            }
-            print "</tr>\n";
+			print '<tr class="liste_titre">';
+			print_liste_field_titre('Ref', $_SERVER["PHP_SELF"], 'c.rowid', '', $param, '', $sortfield, $sortorder);
+			print_liste_field_titre('DateCreation', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
+			print_liste_field_titre('Type', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
+			print_liste_field_titre('DateStart', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
+			print_liste_field_titre('DateEnd', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
+			print_liste_field_titre('Amount', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+			if (!empty($conf->banque->enabled)) {
+				print_liste_field_titre('Account', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+			}
+			print "</tr>\n";
 
-            $accountstatic = new Account($db);
-            $adh = new Adherent($db);
-            $adht = new AdherentType($db);
+			$accountstatic = new Account($db);
+			$adh = new Adherent($db);
+			$adht = new AdherentType($db);
 
-            $i = 0;
-            while ($i < $num) {
-                $objp = $db->fetch_object($result);
+			$i = 0;
+			while ($i < $num) {
+				$objp = $db->fetch_object($result);
 
-                $adh->id = $objp->rowid;
-                $adh->typeid = $objp->type;
+				$adh->id = $objp->rowid;
+				$adh->typeid = $objp->type;
 
-                $subscriptionstatic->ref = $objp->crowid;
-                $subscriptionstatic->id = $objp->crowid;
+				$subscriptionstatic->ref = $objp->crowid;
+				$subscriptionstatic->id = $objp->crowid;
 
-                $typeid = $objp->cfk_type;
-                if ($typeid > 0) {
-                    $adht->fetch($typeid);
-                }
+				$typeid = $objp->cfk_type;
+				if ($typeid > 0) {
+					$adht->fetch($typeid);
+				}
 
-                print '<tr class="oddeven">';
-                print '<td>'.$subscriptionstatic->getNomUrl(1).'</td>';
-                print '<td class="center">'.dol_print_date($db->jdate($objp->datec), 'dayhour')."</td>\n";
-                print '<td class="center">';
-                if ($typeid > 0) {
-                    print $adht->getNomUrl(1);
-                }
-                print '</td>';
-                print '<td class="center">'.dol_print_date($db->jdate($objp->dateh), 'day')."</td>\n";
-                print '<td class="center">'.dol_print_date($db->jdate($objp->datef), 'day')."</td>\n";
-                print '<td class="right">'.price($objp->subscription).'</td>';
+				print '<tr class="oddeven">';
+				print '<td>'.$subscriptionstatic->getNomUrl(1).'</td>';
+				print '<td class="center">'.dol_print_date($db->jdate($objp->datec), 'dayhour')."</td>\n";
+				print '<td class="center">';
+				if ($typeid > 0) {
+					print $adht->getNomUrl(1);
+				}
+				print '</td>';
+				print '<td class="center">'.dol_print_date($db->jdate($objp->dateh), 'day')."</td>\n";
+				print '<td class="center">'.dol_print_date($db->jdate($objp->datef), 'day')."</td>\n";
+				print '<td class="right">'.price($objp->subscription).'</td>';
 				if (!empty($conf->banque->enabled)) {
 					print '<td class="right">';
 					if ($objp->bid) {
@@ -660,71 +660,71 @@ if ($rowid > 0) {
 							$accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
 						}
 
-                        $accountstatic->ref = $objp->ref;
-                        print $accountstatic->getNomUrl(1);
-                    } else {
-                        print '&nbsp;';
-                    }
-                    print '</td>';
-                }
-                print "</tr>";
-                $i++;
-            }
+						$accountstatic->ref = $objp->ref;
+						print $accountstatic->getNomUrl(1);
+					} else {
+						print '&nbsp;';
+					}
+					print '</td>';
+				}
+				print "</tr>";
+				$i++;
+			}
 
-            if (empty($num)) {
-                $colspan = 6;
-                if (!empty($conf->banque->enabled)) $colspan++;
-                print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
-            }
+			if (empty($num)) {
+				$colspan = 6;
+				if (!empty($conf->banque->enabled)) $colspan++;
+				print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
+			}
 
-            print "</table>";
-        } else {
-            dol_print_error($db);
-        }
-    }
+			print "</table>";
+		} else {
+			dol_print_error($db);
+		}
+	}
 
 
-    if (($action != 'addsubscription' && $action != 'create_thirdparty')) {
-	    // Shon online payment link
-	    $useonlinepayment = (!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled));
+	if (($action != 'addsubscription' && $action != 'create_thirdparty')) {
+		// Shon online payment link
+		$useonlinepayment = (!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled));
 
-	    if ($useonlinepayment) {
-	    	print '<br>';
+		if ($useonlinepayment) {
+			print '<br>';
 
-	    	require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-	    	print showOnlinePaymentUrl('membersubscription', $object->ref);
-	    	print '<br>';
-	    }
-    }
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+			print showOnlinePaymentUrl('membersubscription', $object->ref);
+			print '<br>';
+		}
+	}
 
-    /*
+	/*
      * Add new subscription form
      */
-    if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->rights->adherent->cotisation->creer) {
-        print '<br>';
+	if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->rights->adherent->cotisation->creer) {
+		print '<br>';
 
-        print load_fiche_titre($langs->trans("NewCotisation"));
+		print load_fiche_titre($langs->trans("NewCotisation"));
 
-        // Define default choice for complementary actions
-        $bankdirect = 0; // 1 means option by default is write to bank direct with no invoice
-        $invoiceonly = 0; // 1 means option by default is invoice only
-        $bankviainvoice = 0; // 1 means option by default is write to bank via invoice
-        if (GETPOST('paymentsave')) {
-        	if (GETPOST('paymentsave') == 'bankdirect')     $bankdirect = 1;
-        	if (GETPOST('paymentsave') == 'invoiceonly')    $invoiceonly = 1;
-        	if (GETPOST('paymentsave') == 'bankviainvoice') $bankviainvoice = 1;
-        } else {
-        	if (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankviainvoice' && !empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) $bankviainvoice = 1;
-        	elseif (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankdirect' && !empty($conf->banque->enabled)) $bankdirect = 1;
-        	elseif (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'invoiceonly' && !empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) $invoiceonly = 1;
-        }
+		// Define default choice for complementary actions
+		$bankdirect = 0; // 1 means option by default is write to bank direct with no invoice
+		$invoiceonly = 0; // 1 means option by default is invoice only
+		$bankviainvoice = 0; // 1 means option by default is write to bank via invoice
+		if (GETPOST('paymentsave')) {
+			if (GETPOST('paymentsave') == 'bankdirect')     $bankdirect = 1;
+			if (GETPOST('paymentsave') == 'invoiceonly')    $invoiceonly = 1;
+			if (GETPOST('paymentsave') == 'bankviainvoice') $bankviainvoice = 1;
+		} else {
+			if (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankviainvoice' && !empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) $bankviainvoice = 1;
+			elseif (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankdirect' && !empty($conf->banque->enabled)) $bankdirect = 1;
+			elseif (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'invoiceonly' && !empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) $invoiceonly = 1;
+		}
 
-        print "\n\n<!-- Form add subscription -->\n";
+		print "\n\n<!-- Form add subscription -->\n";
 
-        if ($conf->use_javascript_ajax) {
-        	//var_dump($bankdirect.'-'.$bankviainvoice.'-'.$invoiceonly.'-'.empty($conf->global->ADHERENT_BANK_USE));
-            print "\n".'<script type="text/javascript" language="javascript">';
-            print '$(document).ready(function () {
+		if ($conf->use_javascript_ajax) {
+			//var_dump($bankdirect.'-'.$bankviainvoice.'-'.$invoiceonly.'-'.empty($conf->global->ADHERENT_BANK_USE));
+			print "\n".'<script type="text/javascript" language="javascript">';
+			print '$(document).ready(function () {
                         $(".bankswitchclass, .bankswitchclass2").'.(($bankdirect || $bankviainvoice) ? 'show()' : 'hide()').';
                         $("#none, #invoiceonly").click(function() {
                             $(".bankswitchclass").hide();
@@ -750,10 +750,10 @@ if ($rowid > 0) {
                             }
                         });
                         ';
-            if (GETPOST('paymentsave')) print '$("#'.GETPOST('paymentsave').'").prop("checked",true);';
-    	    print '});';
-            print '</script>'."\n";
-        }
+			if (GETPOST('paymentsave')) print '$("#'.GETPOST('paymentsave').'").prop("checked",true);';
+			print '});';
+			print '</script>'."\n";
+		}
 
 
 		// Confirm create third party
@@ -778,16 +778,16 @@ if ($rowid > 0) {
 			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) {
 				$tmpcompany = new Societe($db);
 				$tmpcompany->name = $companyname;
-                $tmpcompany->get_codeclient($tmpcompany, 0);
+				$tmpcompany->get_codeclient($tmpcompany, 0);
 				$customercode = $tmpcompany->code_client;
 				$formquestion[] = array(
-                    'label' => $langs->trans("CustomerCode"),
-                    'type' => 'text',
-                    'name' => 'customercode',
-                    'value' => $customercode,
-                    'morecss' => 'minwidth300',
-                    'moreattr' => 'maxlength="128"',
-                );
+					'label' => $langs->trans("CustomerCode"),
+					'type' => 'text',
+					'name' => 'customercode',
+					'value' => $customercode,
+					'morecss' => 'minwidth300',
+					'moreattr' => 'maxlength="128"',
+				);
 			}
 			// @todo Add other extrafields mandatory for thirdparty creation
 
@@ -795,99 +795,99 @@ if ($rowid > 0) {
 		}
 
 
-        print '<form name="subscription" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-        print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<input type="hidden" name="action" value="subscription">';
-        print '<input type="hidden" name="rowid" value="'.$rowid.'">';
-        print '<input type="hidden" name="memberlabel" id="memberlabel" value="'.dol_escape_htmltag($object->getFullName($langs)).'">';
-        print '<input type="hidden" name="thirdpartylabel" id="thirdpartylabel" value="'.dol_escape_htmltag($object->company).'">';
+		print '<form name="subscription" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="action" value="subscription">';
+		print '<input type="hidden" name="rowid" value="'.$rowid.'">';
+		print '<input type="hidden" name="memberlabel" id="memberlabel" value="'.dol_escape_htmltag($object->getFullName($langs)).'">';
+		print '<input type="hidden" name="thirdpartylabel" id="thirdpartylabel" value="'.dol_escape_htmltag($object->company).'">';
 
-		dol_fiche_head('');
+		print dol_get_fiche_head('');
 
 		print "<table class=\"border\" width=\"100%\">\n";
-        print '<tbody>';
+		print '<tbody>';
 
 		$today = dol_now();
-        $datefrom = 0;
-        $dateto = 0;
-        $paymentdate = -1;
+		$datefrom = 0;
+		$dateto = 0;
+		$paymentdate = -1;
 
-        // Date payment
-        if (GETPOST('paymentyear') && GETPOST('paymentmonth') && GETPOST('paymentday')) {
-            $paymentdate = dol_mktime(0, 0, 0, GETPOST('paymentmonth'), GETPOST('paymentday'), GETPOST('paymentyear'));
-        }
+		// Date payment
+		if (GETPOST('paymentyear') && GETPOST('paymentmonth') && GETPOST('paymentday')) {
+			$paymentdate = dol_mktime(0, 0, 0, GETPOST('paymentmonth'), GETPOST('paymentday'), GETPOST('paymentyear'));
+		}
 
-        print '<tr>';
-        // Date start subscription
-        print '<td class="fieldrequired">'.$langs->trans("DateSubscription").'</td><td>';
-        if (GETPOST('reday')) {
-            $datefrom = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-        }
-        if (!$datefrom) {
-        	$datefrom = $object->datevalid;
-        	if ($object->datefin > 0) {
-                $datefrom = dol_time_plus_duree($object->datefin, 1, 'd');
-            }
-        }
-        print $form->selectDate($datefrom, '', '', '', '', "subscription", 1, 1);
-        print "</td></tr>";
+		print '<tr>';
+		// Date start subscription
+		print '<td class="fieldrequired">'.$langs->trans("DateSubscription").'</td><td>';
+		if (GETPOST('reday')) {
+			$datefrom = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+		}
+		if (!$datefrom) {
+			$datefrom = $object->datevalid;
+			if ($object->datefin > 0) {
+				$datefrom = dol_time_plus_duree($object->datefin, 1, 'd');
+			}
+		}
+		print $form->selectDate($datefrom, '', '', '', '', "subscription", 1, 1);
+		print "</td></tr>";
 
-        // Date end subscription
-        if (GETPOST('endday')) {
-            $dateto = dol_mktime(0, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-        }
-        if (!$dateto) {
-            $dateto = -1; // By default, no date is suggested
-        }
-        print '<tr><td>'.$langs->trans("DateEndSubscription").'</td><td>';
-        print $form->selectDate($dateto, 'end', '', '', '', "subscription", 1, 0);
-        print "</td></tr>";
+		// Date end subscription
+		if (GETPOST('endday')) {
+			$dateto = dol_mktime(0, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
+		}
+		if (!$dateto) {
+			$dateto = -1; // By default, no date is suggested
+		}
+		print '<tr><td>'.$langs->trans("DateEndSubscription").'</td><td>';
+		print $form->selectDate($dateto, 'end', '', '', '', "subscription", 1, 0);
+		print "</td></tr>";
 
-        if ($adht->subscription) {
-            // Amount
-            print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="subscription" size="6" value="'.GETPOST('subscription').'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
+		if ($adht->subscription) {
+			// Amount
+			print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="subscription" size="6" value="'.GETPOST('subscription').'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
 
-            // Label
-            print '<tr><td>'.$langs->trans("Label").'</td>';
-            print '<td><input name="label" type="text" size="32" value="';
-            if (empty($conf->global->MEMBER_NO_DEFAULT_LABEL)) print $langs->trans("Subscription").' '.dol_print_date(($datefrom ? $datefrom : time()), "%Y");
-            print '"></td></tr>';
+			// Label
+			print '<tr><td>'.$langs->trans("Label").'</td>';
+			print '<td><input name="label" type="text" size="32" value="';
+			if (empty($conf->global->MEMBER_NO_DEFAULT_LABEL)) print $langs->trans("Subscription").' '.dol_print_date(($datefrom ? $datefrom : time()), "%Y");
+			print '"></td></tr>';
 
-            // Complementary action
-            if ((!empty($conf->banque->enabled) || !empty($conf->facture->enabled)) && empty($conf->global->ADHERENT_SUBSCRIPTION_HIDECOMPLEMENTARYACTIONS)) {
-                $company = new Societe($db);
-                if ($object->fk_soc) {
-                    $result = $company->fetch($object->fk_soc);
-                }
+			// Complementary action
+			if ((!empty($conf->banque->enabled) || !empty($conf->facture->enabled)) && empty($conf->global->ADHERENT_SUBSCRIPTION_HIDECOMPLEMENTARYACTIONS)) {
+				$company = new Societe($db);
+				if ($object->fk_soc) {
+					$result = $company->fetch($object->fk_soc);
+				}
 
-                // Title payments
-                //print '<tr><td colspan="2"><b>'.$langs->trans("Payment").'</b></td></tr>';
+				// Title payments
+				//print '<tr><td colspan="2"><b>'.$langs->trans("Payment").'</b></td></tr>';
 
-                // No more action
-                print '<tr><td class="tdtop fieldrequired">'.$langs->trans('MoreActions');
-                print '</td>';
-                print '<td>';
-                print '<input type="radio" class="moreaction" id="none" name="paymentsave" value="none"'.(empty($bankdirect) && empty($invoiceonly) && empty($bankviainvoice) ? ' checked' : '').'> '.$langs->trans("None").'<br>';
-                // Add entry into bank accoun
-                if (!empty($conf->banque->enabled)) {
-                    print '<input type="radio" class="moreaction" id="bankdirect" name="paymentsave" value="bankdirect"'.(!empty($bankdirect) ? ' checked' : '');
-                    print '> '.$langs->trans("MoreActionBankDirect").'<br>';
-                }
-                // Add invoice with no payments
-                if (!empty($conf->societe->enabled) && !empty($conf->facture->enabled)) {
-                    print '<input type="radio" class="moreaction" id="invoiceonly" name="paymentsave" value="invoiceonly"'.(!empty($invoiceonly) ? ' checked' : '');
-                    //if (empty($object->fk_soc)) print ' disabled';
-                    print '> '.$langs->trans("MoreActionInvoiceOnly");
-                    if ($object->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')';
-                    else {
-                    	print ' (';
-                    	if (empty($object->fk_soc)) print img_warning($langs->trans("NoThirdPartyAssociatedToMember"));
-                    	print $langs->trans("NoThirdPartyAssociatedToMember");
-                    	print ' - <a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">';
-                    	print $langs->trans("CreateDolibarrThirdParty");
-                    	print '</a>)';
-                    }
-                    if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. <span class="opacitymedium">'.$langs->trans("NoVatOnSubscription", 0).'</span>';
+				// No more action
+				print '<tr><td class="tdtop fieldrequired">'.$langs->trans('MoreActions');
+				print '</td>';
+				print '<td>';
+				print '<input type="radio" class="moreaction" id="none" name="paymentsave" value="none"'.(empty($bankdirect) && empty($invoiceonly) && empty($bankviainvoice) ? ' checked' : '').'> '.$langs->trans("None").'<br>';
+				// Add entry into bank accoun
+				if (!empty($conf->banque->enabled)) {
+					print '<input type="radio" class="moreaction" id="bankdirect" name="paymentsave" value="bankdirect"'.(!empty($bankdirect) ? ' checked' : '');
+					print '> '.$langs->trans("MoreActionBankDirect").'<br>';
+				}
+				// Add invoice with no payments
+				if (!empty($conf->societe->enabled) && !empty($conf->facture->enabled)) {
+					print '<input type="radio" class="moreaction" id="invoiceonly" name="paymentsave" value="invoiceonly"'.(!empty($invoiceonly) ? ' checked' : '');
+					//if (empty($object->fk_soc)) print ' disabled';
+					print '> '.$langs->trans("MoreActionInvoiceOnly");
+					if ($object->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')';
+					else {
+						print ' (';
+						if (empty($object->fk_soc)) print img_warning($langs->trans("NoThirdPartyAssociatedToMember"));
+						print $langs->trans("NoThirdPartyAssociatedToMember");
+						print ' - <a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">';
+						print $langs->trans("CreateDolibarrThirdParty");
+						print '</a>)';
+					}
+					if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. <span class="opacitymedium">'.$langs->trans("NoVatOnSubscription", 0).'</span>';
 					if (!empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) {
 						$prodtmp = new Product($db);
 						$result = $prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
@@ -896,23 +896,23 @@ if ($rowid > 0) {
 						}
 						print '. '.$langs->transnoentitiesnoconv("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS", $prodtmp->getNomUrl(1)); // must use noentitiesnoconv to avoid to encode html into getNomUrl of product
 					}
-                    print '<br>';
-                }
-                // Add invoice with payments
-                if (!empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) {
-                    print '<input type="radio" class="moreaction" id="bankviainvoice" name="paymentsave" value="bankviainvoice"'.(!empty($bankviainvoice) ? ' checked' : '');
-                    //if (empty($object->fk_soc)) print ' disabled';
-                    print '> '.$langs->trans("MoreActionBankViaInvoice");
-                    if ($object->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')';
-                    else {
-                    	print ' (';
-                    	if (empty($object->fk_soc)) print img_warning($langs->trans("NoThirdPartyAssociatedToMember"));
-                    	print $langs->trans("NoThirdPartyAssociatedToMember");
-                    	print ' - <a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">';
-                    	print $langs->trans("CreateDolibarrThirdParty");
-                    	print '</a>)';
-                    }
-                    if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. <span class="opacitymedium">'.$langs->trans("NoVatOnSubscription", 0).'</span>';
+					print '<br>';
+				}
+				// Add invoice with payments
+				if (!empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) {
+					print '<input type="radio" class="moreaction" id="bankviainvoice" name="paymentsave" value="bankviainvoice"'.(!empty($bankviainvoice) ? ' checked' : '');
+					//if (empty($object->fk_soc)) print ' disabled';
+					print '> '.$langs->trans("MoreActionBankViaInvoice");
+					if ($object->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')';
+					else {
+						print ' (';
+						if (empty($object->fk_soc)) print img_warning($langs->trans("NoThirdPartyAssociatedToMember"));
+						print $langs->trans("NoThirdPartyAssociatedToMember");
+						print ' - <a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">';
+						print $langs->trans("CreateDolibarrThirdParty");
+						print '</a>)';
+					}
+					if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. <span class="opacitymedium">'.$langs->trans("NoVatOnSubscription", 0).'</span>';
 					if (!empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) {
 						$prodtmp = new Product($db);
 						$result = $prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
@@ -921,123 +921,123 @@ if ($rowid > 0) {
 						}
 						print '. '.$langs->transnoentitiesnoconv("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS", $prodtmp->getNomUrl(1)); // must use noentitiesnoconv to avoid to encode html into getNomUrl of product
 					}
-                    print '<br>';
-                }
-                print '</td></tr>';
+					print '<br>';
+				}
+				print '</td></tr>';
 
-                // Bank account
-                print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("FinancialAccount").'</td><td>';
-                $form->select_comptes(GETPOST('accountid'), 'accountid', 0, '', 1);
-                print "</td></tr>\n";
+				// Bank account
+				print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("FinancialAccount").'</td><td>';
+				$form->select_comptes(GETPOST('accountid'), 'accountid', 0, '', 2);
+				print "</td></tr>\n";
 
-                // Payment mode
-                print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
-                $form->select_types_paiements(GETPOST('operation'), 'operation', '', 2);
-                print "</td></tr>\n";
+				// Payment mode
+				print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
+				$form->select_types_paiements(GETPOST('operation'), 'operation', '', 2);
+				print "</td></tr>\n";
 
-                // Date of payment
-                print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
-                print $form->selectDate(isset($paymentdate) ? $paymentdate : -1, 'payment', 0, 0, 1, 'subscription', 1, 1);
-                print "</td></tr>\n";
+				// Date of payment
+				print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
+				print $form->selectDate(isset($paymentdate) ? $paymentdate : -1, 'payment', 0, 0, 1, 'subscription', 1, 1);
+				print "</td></tr>\n";
 
-                print '<tr class="bankswitchclass2"><td>'.$langs->trans('Numero');
-                print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
-                print '</td>';
-                print '<td><input id="fieldnum_chq" name="num_chq" type="text" size="8" value="'.(!GETPOST('num_chq') ? '' : GETPOST('num_chq')).'"></td></tr>';
+				print '<tr class="bankswitchclass2"><td>'.$langs->trans('Numero');
+				print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
+				print '</td>';
+				print '<td><input id="fieldnum_chq" name="num_chq" type="text" size="8" value="'.(!GETPOST('num_chq') ? '' : GETPOST('num_chq')).'"></td></tr>';
 
-                print '<tr class="bankswitchclass2 fieldrequireddyn"><td>'.$langs->trans('CheckTransmitter');
-                print ' <em>('.$langs->trans("ChequeMaker").')</em>';
-                print '</td>';
-                print '<td><input id="fieldchqemetteur" name="chqemetteur" size="32" type="text" value="'.(!GETPOST('chqemetteur') ? '' : GETPOST('chqemetteur')).'"></td></tr>';
+				print '<tr class="bankswitchclass2 fieldrequireddyn"><td>'.$langs->trans('CheckTransmitter');
+				print ' <em>('.$langs->trans("ChequeMaker").')</em>';
+				print '</td>';
+				print '<td><input id="fieldchqemetteur" name="chqemetteur" size="32" type="text" value="'.(!GETPOST('chqemetteur') ? '' : GETPOST('chqemetteur')).'"></td></tr>';
 
-                print '<tr class="bankswitchclass2"><td>'.$langs->trans('Bank');
-                print ' <em>('.$langs->trans("ChequeBank").')</em>';
-                print '</td>';
-                print '<td><input id="chqbank" name="chqbank" size="32" type="text" value="'.(!GETPOST('chqbank') ? '' : GETPOST('chqbank')).'"></td></tr>';
-            }
-        }
+				print '<tr class="bankswitchclass2"><td>'.$langs->trans('Bank');
+				print ' <em>('.$langs->trans("ChequeBank").')</em>';
+				print '</td>';
+				print '<td><input id="chqbank" name="chqbank" size="32" type="text" value="'.(!GETPOST('chqbank') ? '' : GETPOST('chqbank')).'"></td></tr>';
+			}
+		}
 
-        print '<tr><td></td><td></td></tr>';
+		print '<tr><td></td><td></td></tr>';
 
-        print '<tr><td>'.$langs->trans("SendAcknowledgementByMail").'</td>';
-        print '<td>';
-        if (!$object->email) {
-            print $langs->trans("NoEMail");
-        } else {
-            $adht = new AdherentType($db);
-            $adht->fetch($object->typeid);
+		print '<tr><td>'.$langs->trans("SendAcknowledgementByMail").'</td>';
+		print '<td>';
+		if (!$object->email) {
+			print $langs->trans("NoEMail");
+		} else {
+			$adht = new AdherentType($db);
+			$adht->fetch($object->typeid);
 
-            // Send subscription email
-            $subject = '';
-            $msg = '';
+			// Send subscription email
+			$subject = '';
+			$msg = '';
 
-            // Send subscription email
-            include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-            $formmail = new FormMail($db);
-            // Set output language
-            $outputlangs = new Translate('', $conf);
-            $outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
-            // Load traductions files required by page
-            $outputlangs->loadLangs(array("main", "members"));
-            // Get email content from template
-            $arraydefaultmessage = null;
-            $labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION;
+			// Send subscription email
+			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+			$formmail = new FormMail($db);
+			// Set output language
+			$outputlangs = new Translate('', $conf);
+			$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
+			// Load traductions files required by page
+			$outputlangs->loadLangs(array("main", "members"));
+			// Get email content from template
+			$arraydefaultmessage = null;
+			$labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION;
 
-            if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
+			if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-            if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
-            	$subject = $arraydefaultmessage->topic;
-            	$msg     = $arraydefaultmessage->content;
-            }
+			if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+				$subject = $arraydefaultmessage->topic;
+				$msg     = $arraydefaultmessage->content;
+			}
 
-            $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
-            complete_substitutions_array($substitutionarray, $outputlangs, $object);
-            $subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
-            $texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnSubscription()), $substitutionarray, $outputlangs);
+			$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+			complete_substitutions_array($substitutionarray, $outputlangs, $object);
+			$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+			$texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnSubscription()), $substitutionarray, $outputlangs);
 
-            $tmp = '<input name="sendmail" type="checkbox"'.(GETPOST('sendmail', 'alpha') ? ' checked' : (!empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL) ? ' checked' : '')).'>';
-            $helpcontent = '';
-            $helpcontent .= '<b>'.$langs->trans("MailFrom").'</b>: '.$conf->global->ADHERENT_MAIL_FROM.'<br>'."\n";
-            $helpcontent .= '<b>'.$langs->trans("MailRecipient").'</b>: '.$object->email.'<br>'."\n";
-            $helpcontent .= '<b>'.$langs->trans("MailTopic").'</b>:<br>'."\n";
-            if ($subjecttosend) {
-                $helpcontent .= $subjecttosend."\n";
-            } else {
-                $langs->load("errors");
-                $helpcontent .= '<span class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Module310Name")).'</span>'."\n";
-            }
-            $helpcontent .= "<br>";
-            $helpcontent .= '<b>'.$langs->trans("MailText").'</b>:<br>';
-            if ($texttosend) {
-                $helpcontent .= dol_htmlentitiesbr($texttosend)."\n";
-            } else {
-                $langs->load("errors");
-                $helpcontent .= '<span class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Module310Name")).'</span>'."\n";
-            }
-            print $form->textwithpicto($tmp, $helpcontent, 1, 'help', '', 0, 2, 'helpemailtosend');
-        }
-        print '</td></tr>';
-        print '</tbody>';
-        print '</table>';
+			$tmp = '<input name="sendmail" type="checkbox"'.(GETPOST('sendmail', 'alpha') ? ' checked' : (!empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL) ? ' checked' : '')).'>';
+			$helpcontent = '';
+			$helpcontent .= '<b>'.$langs->trans("MailFrom").'</b>: '.$conf->global->ADHERENT_MAIL_FROM.'<br>'."\n";
+			$helpcontent .= '<b>'.$langs->trans("MailRecipient").'</b>: '.$object->email.'<br>'."\n";
+			$helpcontent .= '<b>'.$langs->trans("MailTopic").'</b>:<br>'."\n";
+			if ($subjecttosend) {
+				$helpcontent .= $subjecttosend."\n";
+			} else {
+				$langs->load("errors");
+				$helpcontent .= '<span class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Module310Name")).'</span>'."\n";
+			}
+			$helpcontent .= "<br>";
+			$helpcontent .= '<b>'.$langs->trans("MailText").'</b>:<br>';
+			if ($texttosend) {
+				$helpcontent .= dol_htmlentitiesbr($texttosend)."\n";
+			} else {
+				$langs->load("errors");
+				$helpcontent .= '<span class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Module310Name")).'</span>'."\n";
+			}
+			print $form->textwithpicto($tmp, $helpcontent, 1, 'help', '', 0, 2, 'helpemailtosend');
+		}
+		print '</td></tr>';
+		print '</tbody>';
+		print '</table>';
 
-        dol_fiche_end();
+		print dol_get_fiche_end();
 
-        print '<div class="center">';
-        print '<input type="submit" class="button" name="add" value="'.$langs->trans("AddSubscription").'">';
-        print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-        print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-        print '</div>';
+		print '<div class="center">';
+		print '<input type="submit" class="button" name="add" value="'.$langs->trans("AddSubscription").'">';
+		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+		print '</div>';
 
-        print '</form>';
+		print '</form>';
 
-        print "\n<!-- End form subscription -->\n\n";
-    }
+		print "\n<!-- End form subscription -->\n\n";
+	}
 
-    //print '</td></tr>';
-    //print '</table>';
+	//print '</td></tr>';
+	//print '</table>';
 } else {
-    $langs->load("errors");
-    print $langs->trans("ErrorRecordNotFound");
+	$langs->load("errors");
+	print $langs->trans("ErrorRecordNotFound");
 }
 
 // End of page
diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php
index a79355de768..1be08bb5b34 100644
--- a/htdocs/adherents/subscription/card.php
+++ b/htdocs/adherents/subscription/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2007-2019  Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric 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
@@ -40,10 +40,13 @@ $object = new Subscription($db);
 $errmsg = '';
 
 $action = GETPOST("action", 'alpha');
-$rowid = GETPOST("rowid", "int") ?GETPOST("rowid", "int") : GETPOST("id", "int");
+$rowid = GETPOST("rowid", "int") ? GETPOST("rowid", "int") : GETPOST("id", "int");
 $typeid = GETPOST("typeid", "int");
 $cancel = GETPOST('cancel', 'alpha');
 $confirm = GETPOST('confirm');
+$note = GETPOST('note', 'alpha');
+$typeid = (int) GETPOST('typeid', 'int');
+$amount = price2num(GETPOST('amount', 'alpha'), 'MT');
 
 if (!$user->rights->adherent->cotisation->lire)
 	 accessforbidden();
@@ -84,7 +87,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cance
 			} else {
 				$accountline->datev = dol_mktime($_POST['datesubhour'], $_POST['datesubmin'], 0, $_POST['datesubmonth'], $_POST['datesubday'], $_POST['datesubyear']);
 				$accountline->dateo = dol_mktime($_POST['datesubhour'], $_POST['datesubmin'], 0, $_POST['datesubmonth'], $_POST['datesubday'], $_POST['datesubyear']);
-				$accountline->amount = $_POST["amount"];
+				$accountline->amount = $amount;
 				$result = $accountline->update($user);
 				if ($result < 0) {
 					$errmsg = $accountline->error;
@@ -96,9 +99,9 @@ if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cance
 			// Modify values
 			$object->dateh = dol_mktime($_POST['datesubhour'], $_POST['datesubmin'], 0, $_POST['datesubmonth'], $_POST['datesubday'], $_POST['datesubyear']);
 			$object->datef = dol_mktime($_POST['datesubendhour'], $_POST['datesubendmin'], 0, $_POST['datesubendmonth'], $_POST['datesubendday'], $_POST['datesubendyear']);
-			$object->fk_type = $_POST["typeid"];
-			$object->note = $_POST["note"];
-			$object->amount = $_POST["amount"];
+			$object->fk_type = $typeid;
+			$object->note = $note;
+			$object->amount = $amount;
 			//print 'datef='.$object->datef.' '.$_POST['datesubendday'];
 
 			$result = $object->update($user);
@@ -110,7 +113,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cance
 			} else {
 				$db->rollback();
 
-			    if ($object->error) {
+				if ($object->error) {
 					$errmsg = $object->error;
 				} else {
 					foreach ($object->errors as $error) {
@@ -128,13 +131,13 @@ if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cance
 
 if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->adherent->cotisation->creer) {
 	$result = $object->fetch($rowid);
-    $result = $object->delete($user);
-    if ($result > 0) {
-    	header("Location: ".DOL_URL_ROOT."/adherents/card.php?rowid=".$object->fk_adherent);
-    	exit;
-    } else {
-    	$mesg = $adh->error;
-    }
+	$result = $object->delete($user);
+	if ($result > 0) {
+		header("Location: ".DOL_URL_ROOT."/adherents/card.php?rowid=".$object->fk_adherent);
+		exit;
+	} else {
+		$mesg = $adh->error;
+	}
 }
 
 
@@ -159,7 +162,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit') {
 	 *
 	 ********************************************/
 
-    $object->fetch($rowid);
+	$object->fetch($rowid);
 	$result = $adh->fetch($object->fk_adherent);
 
 	$head = subscription_prepare_head($object);
@@ -170,15 +173,15 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit') {
 	print "<input type=\"hidden\" name=\"rowid\" value=\"$rowid\">";
 	print "<input type=\"hidden\" name=\"fk_bank\" value=\"".$object->fk_bank."\">";
 
-	dol_fiche_head($head, 'general', $langs->trans("Subscription"), 0, 'payment');
+	print dol_get_fiche_head($head, 'general', $langs->trans("Subscription"), 0, 'payment');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/subscription/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/subscription/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    print "\n";
+	print "\n";
 	print '<table class="border centpercent">';
 
-    // Ref
-    print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td>';
+	// Ref
+	print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td>';
 	print '<td class="valeur" colspan="3">';
 	print $form->showrefnav($object, 'rowid', $linkback, 1);
 	print '</td></tr>';
@@ -195,50 +198,48 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit') {
 	print $form->selectarray("typeid", $adht->liste_array(), (GETPOSTISSET("typeid") ? GETPOST("typeid") : $object->fk_type));
 	print'</td></tr>';
 
-    // Date start subscription
-    print '<tr><td>'.$langs->trans("DateSubscription").'</td><td class="valeur" colspan="2">';
+	// Date start subscription
+	print '<tr><td>'.$langs->trans("DateSubscription").'</td><td class="valeur" colspan="2">';
 	print $form->selectDate($object->dateh, 'datesub', 1, 1, 0, 'update', 1);
 	print '</td>';
-    print '</tr>';
+	print '</tr>';
 
-    // Date end subscription
-    print '<tr><td>'.$langs->trans("DateEndSubscription").'</td><td class="valeur" colspan="2">';
+	// Date end subscription
+	print '<tr><td>'.$langs->trans("DateEndSubscription").'</td><td class="valeur" colspan="2">';
 	print $form->selectDate($object->datef, 'datesubend', 0, 0, 0, 'update', 1);
 	print '</td>';
-    print '</tr>';
+	print '</tr>';
 
-    // Amount
-    print '<tr><td>'.$langs->trans("Amount").'</td><td class="valeur" colspan="2">';
+	// Amount
+	print '<tr><td>'.$langs->trans("Amount").'</td><td class="valeur" colspan="2">';
 	print '<input type="text" class="flat" size="10" name="amount" value="'.price($object->amount).'"></td></tr>';
 
-    // Label
-    print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur" colspan="2">';
+	// Label
+	print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur" colspan="2">';
 	print '<input type="text" class="flat" size="60" name="note" value="'.$object->note.'"></td></tr>';
 
 	// Bank line
-	if (!empty($conf->banque->enabled)) {
-		if ($conf->global->ADHERENT_BANK_USE || $object->fk_bank) {
-			print '<tr><td>'.$langs->trans("BankTransactionLine").'</td><td class="valeur" colspan="2">';
-			if ($object->fk_bank) {
-				$bankline = new AccountLine($db);
-				$result = $bankline->fetch($object->fk_bank);
-				print $bankline->getNomUrl(1, 0, 'showall');
-			} else {
-				print $langs->trans("NoneF");
-			}
-			print '</td></tr>';
+	if (!empty($conf->banque->enabled) && ($conf->global->ADHERENT_BANK_USE || $object->fk_bank)) {
+		print '<tr><td>'.$langs->trans("BankTransactionLine").'</td><td class="valeur" colspan="2">';
+		if ($object->fk_bank) {
+			$bankline = new AccountLine($db);
+			$result = $bankline->fetch($object->fk_bank);
+			print $bankline->getNomUrl(1, 0, 'showall');
+		} else {
+			print $langs->trans("NoneF");
 		}
+		print '</td></tr>';
 	}
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '<div class="center">';
-    print '<input type="submit" class="button" name="submit" value="'.$langs->trans("Save").'">';
+	print '<div class="center">';
+	print '<input type="submit" class="button button-save" name="submit" value="'.$langs->trans("Save").'">';
 	print ' &nbsp; &nbsp; &nbsp; ';
-	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-    print '</div>';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
 
 	print '</form>';
 	print "\n";
@@ -251,99 +252,97 @@ if ($rowid && $action != 'edit') {
 	 *
 	 ********************************************/
 
-    $result = $object->fetch($rowid);
+	$result = $object->fetch($rowid);
 	$result = $adh->fetch($object->fk_adherent);
 
 	$head = subscription_prepare_head($object);
 
-	dol_fiche_head($head, 'general', $langs->trans("Subscription"), -1, 'payment');
+	print dol_get_fiche_head($head, 'general', $langs->trans("Subscription"), -1, 'payment');
 
-    // Confirmation to delete subscription
-    if ($action == 'delete') {
+	// Confirmation to delete subscription
+	if ($action == 'delete') {
 		//$formquestion=array();
-        //$formquestion['text']='<b>'.$langs->trans("ThisWillAlsoDeleteBankRecord").'</b>';
+		//$formquestion['text']='<b>'.$langs->trans("ThisWillAlsoDeleteBankRecord").'</b>';
 		$text = $langs->trans("ConfirmDeleteSubscription");
 		if (!empty($conf->banque->enabled) && !empty($conf->global->ADHERENT_BANK_USE)) $text .= '<br>'.img_warning().' '.$langs->trans("ThisWillAlsoDeleteBankRecord");
 		print $form->formconfirm($_SERVER["PHP_SELF"]."?rowid=".$object->id, $langs->trans("DeleteSubscription"), $text, "confirm_delete", $formquestion, 0, 1);
-    }
-
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-
-    $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/subscription/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-
-    dol_banner_tab($object, 'rowid', $linkback, 1);
-
-    print '<div class="fichecenter">';
-
-    print '<div class="underbanner clearboth"></div>';
-
-    print '<table class="border centpercent">';
-
-    // Member
-    $adh->ref = $adh->getFullName($langs);
-    print '<tr>';
-    print '<td class="titlefield">'.$langs->trans("Member").'</td><td class="valeur">'.$adh->getNomUrl(1, 0, 'subscription').'</td>';
-    print '</tr>';
-
-    // Type
-    print '<tr>';
-    print '<td class="titlefield">'.$langs->trans("Type").'</td>';
-    print '<td class="valeur">';
-    if ($object->fk_type > 0 || $adh->typeid > 0) {
-    	$typeid = ($object->fk_type > 0 ? $object->fk_type : $adh->typeid);
-    	$adht->fetch($typeid);
-        print $adht->getNomUrl(1);
-    } else {
-        print $langs->trans("NoType");
-    }
-    print '</td></tr>';
-
-    // Date subscription
-    print '<tr>';
-	print '<td>'.$langs->trans("DateSubscription").'</td><td class="valeur">'.dol_print_date($object->dateh, 'day').'</td>';
-    print '</tr>';
-
-    // Date end subscription
-    print '<tr>';
-	print '<td>'.$langs->trans("DateEndSubscription").'</td><td class="valeur">'.dol_print_date($object->datef, 'day').'</td>';
-    print '</tr>';
-
-    // Amount
-    print '<tr><td>'.$langs->trans("Amount").'</td><td class="valeur">'.price($object->amount).'</td></tr>';
-
-    // Label
-    print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur">'.$object->note.'</td></tr>';
-
-	// Bank line
-	if (!empty($conf->banque->enabled)) {
-		if ($conf->global->ADHERENT_BANK_USE || $object->fk_bank) {
-			print '<tr><td>'.$langs->trans("BankTransactionLine").'</td><td class="valeur">';
-			if ($object->fk_bank) {
-				$bankline = new AccountLine($db);
-				$result = $bankline->fetch($object->fk_bank);
-				print $bankline->getNomUrl(1, 0, 'showall');
-			} else {
-				print $langs->trans("NoneF");
-			}
-			print '</td></tr>';
-		}
 	}
 
-    print "</table>\n";
-    print '</div>';
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 
-    print '</form>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/subscription/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_fiche_end();
+	dol_banner_tab($object, 'rowid', $linkback, 1);
 
-    /*
+	print '<div class="fichecenter">';
+
+	print '<div class="underbanner clearboth"></div>';
+
+	print '<table class="border centpercent">';
+
+	// Member
+	$adh->ref = $adh->getFullName($langs);
+	print '<tr>';
+	print '<td class="titlefield">'.$langs->trans("Member").'</td><td class="valeur">'.$adh->getNomUrl(1, 0, 'subscription').'</td>';
+	print '</tr>';
+
+	// Type
+	print '<tr>';
+	print '<td class="titlefield">'.$langs->trans("Type").'</td>';
+	print '<td class="valeur">';
+	if ($object->fk_type > 0 || $adh->typeid > 0) {
+		$typeid = ($object->fk_type > 0 ? $object->fk_type : $adh->typeid);
+		$adht->fetch($typeid);
+		print $adht->getNomUrl(1);
+	} else {
+		print $langs->trans("NoType");
+	}
+	print '</td></tr>';
+
+	// Date subscription
+	print '<tr>';
+	print '<td>'.$langs->trans("DateSubscription").'</td><td class="valeur">'.dol_print_date($object->dateh, 'day').'</td>';
+	print '</tr>';
+
+	// Date end subscription
+	print '<tr>';
+	print '<td>'.$langs->trans("DateEndSubscription").'</td><td class="valeur">'.dol_print_date($object->datef, 'day').'</td>';
+	print '</tr>';
+
+	// Amount
+	print '<tr><td>'.$langs->trans("Amount").'</td><td class="valeur">'.price($object->amount).'</td></tr>';
+
+	// Label
+	print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur">'.$object->note.'</td></tr>';
+
+	// Bank line
+	if (!empty($conf->banque->enabled) && ($conf->global->ADHERENT_BANK_USE || $object->fk_bank)) {
+		print '<tr><td>'.$langs->trans("BankTransactionLine").'</td><td class="valeur">';
+		if ($object->fk_bank) {
+			$bankline = new AccountLine($db);
+			$result = $bankline->fetch($object->fk_bank);
+			print $bankline->getNomUrl(1, 0, 'showall');
+		} else {
+			print $langs->trans("NoneF");
+		}
+		print '</td></tr>';
+	}
+
+	print "</table>\n";
+	print '</div>';
+
+	print '</form>';
+
+	print dol_get_fiche_end();
+
+	/*
      * Barre d'actions
      *
      */
-    print '<div class="tabsAction">';
+	print '<div class="tabsAction">';
 
-    if ($user->rights->adherent->cotisation->creer) {
+	if ($user->rights->adherent->cotisation->creer) {
 		if (!$bankline->rappro) {
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify")."</a></div>";
 		} else {
@@ -351,19 +350,19 @@ if ($rowid && $action != 'edit') {
 		}
 	}
 
-    // Delete
-    if ($user->rights->adherent->cotisation->creer) {
-        print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete")."</a></div>\n";
-    }
+	// Delete
+	if ($user->rights->adherent->cotisation->creer) {
+		print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete")."</a></div>\n";
+	}
 
-    print '</div>';
+	print '</div>';
 
 
-    print '<div class="fichecenter"><div class="fichehalfleft">';
-    print '<a name="builddoc"></a>'; // ancre
+	print '<div class="fichecenter"><div class="fichehalfleft">';
+	print '<a name="builddoc"></a>'; // ancre
 
-    // Documents generes
-    /*
+	// Documents generes
+	/*
     $filename = dol_sanitizeFileName($object->ref);
     $filedir = $conf->facture->dir_output . '/' . dol_sanitizeFileName($object->ref);
     $urlsource = $_SERVER['PHP_SELF'] . '?facid=' . $object->id;
@@ -375,23 +374,23 @@ if ($rowid && $action != 'edit') {
     */
 	// Show links to link elements
 	//$linktoelem = $form->showLinkToObjectBlock($object, null, array('subscription'));
-    $somethingshown = $form->showLinkedObjectBlock($object, '');
+	$somethingshown = $form->showLinkedObjectBlock($object, '');
 
-    // Show links to link elements
-    /*$linktoelem = $form->showLinkToObjectBlock($object,array('order'));
+	// Show links to link elements
+	/*$linktoelem = $form->showLinkToObjectBlock($object,array('order'));
 	if ($linktoelem) print ($somethingshown?'':'<br>').$linktoelem;
     */
 
-    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-    // List of actions on element
-    /*
+	// List of actions on element
+	/*
     include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
     $formactions = new FormActions($db);
     $somethingshown = $formactions->showactions($object, 'invoice', $socid, 1);
     */
 
-    print '</div></div></div>';
+	print '</div></div></div>';
 }
 
 // End of page
diff --git a/htdocs/adherents/subscription/info.php b/htdocs/adherents/subscription/info.php
index 78b3fd4384b..a7a4a897505 100644
--- a/htdocs/adherents/subscription/info.php
+++ b/htdocs/adherents/subscription/info.php
@@ -51,7 +51,7 @@ $result = $object->fetch($rowid);
 
 $head = subscription_prepare_head($object);
 
-dol_fiche_head($head, 'info', $langs->trans("Subscription"), -1, 'payment');
+print dol_get_fiche_head($head, 'info', $langs->trans("Subscription"), -1, 'payment');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/subscription/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -72,7 +72,7 @@ print '</td></tr></table>';
 print '</div>';
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 364a7854fb7..05a0567a8d9 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -110,22 +110,22 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook)) {
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 		$search_type = "";
-	    $search_ref = "";
-	    $search_lastname = "";
-	    $search_firstname = "";
-	    $search_login = "";
-	    $search_note = "";
-	    $search_amount = "";
-	    $search_account = "";
-	    $toselect = '';
-	    $search_array_options = array();
-    }
+		$search_ref = "";
+		$search_lastname = "";
+		$search_firstname = "";
+		$search_login = "";
+		$search_note = "";
+		$search_amount = "";
+		$search_account = "";
+		$toselect = '';
+		$search_array_options = array();
+	}
 }
 
 
@@ -142,6 +142,7 @@ $now = dol_now();
 
 // List of subscriptions
 $sql = "SELECT d.rowid, d.login, d.firstname, d.lastname, d.societe, d.photo, d.statut,";
+$sql .= " d.gender, d.email, d.morphy,";
 $sql .= " c.rowid as crowid, c.fk_type, c.subscription,";
 $sql .= " c.dateadh, c.datef, c.datec as date_creation, c.tms as date_update,";
 $sql .= " c.fk_bank as bank, c.note,";
@@ -151,10 +152,9 @@ $sql .= " JOIN ".MAIN_DB_PREFIX."subscription as c on d.rowid = c.fk_adherent";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_extrafields as ef on (d.rowid = ef.fk_object)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON c.fk_bank=b.rowid";
 $sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-if (isset($date_select) && $date_select != '')
-{
-    $sql .= " AND c.dateadh >= '".((int) $date_select)."-01-01 00:00:00'";
-    $sql .= " AND c.dateadh < '".((int) $date_select + 1)."-01-01 00:00:00'";
+if (isset($date_select) && $date_select != '') {
+	$sql .= " AND c.dateadh >= '".((int) $date_select)."-01-01 00:00:00'";
+	$sql .= " AND c.dateadh < '".((int) $date_select + 1)."-01-01 00:00:00'";
 }
 if ($search_ref) {
 	if (is_numeric($search_ref)) $sql .= " AND (c.rowid = ".$db->escape($search_ref).")";
@@ -181,13 +181,13 @@ $sql .= $db->order($sortfield, $sortorder);
 // Count total nb of records with no order and no limits
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-    $resql = $db->query($sql);
-    if ($resql) $nbtotalofrecords = $db->num_rows($resql);
-    else dol_print_error($db);
-    if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	$resql = $db->query($sql);
+	if ($resql) $nbtotalofrecords = $db->num_rows($resql);
+	else dol_print_error($db);
+	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 		$page = 0;
-    	$offset = 0;
-    }
+		$offset = 0;
+	}
 }
 // Add limit
 $sql .= $db->plimit($limit + 1, $offset);
@@ -241,7 +241,7 @@ $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton = '';
 if ($user->rights->adherent->cotisation->creer) {
-    $newcardbutton .= dolGetButtonTitle($langs->trans('NewSubscription'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/list.php?status=-1,1');
+	$newcardbutton .= dolGetButtonTitle($langs->trans('NewSubscription'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/list.php?status=-1,1');
 }
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
@@ -395,6 +395,8 @@ while ($i < min($num, $limit)) {
 
 	$subscription->ref = $obj->crowid;
 	$subscription->id = $obj->crowid;
+	$subscription->dateh = $db->jdate($obj->dateadh);
+	$subscription->datef = $db->jdate($obj->datef);
 
 	$adherent->lastname = $obj->lastname;
 	$adherent->firstname = $obj->firstname;
@@ -403,11 +405,14 @@ while ($i < min($num, $limit)) {
 	$adherent->statut = $obj->statut;
 	$adherent->login = $obj->login;
 	$adherent->photo = $obj->photo;
+	$adherent->gender = $obj->gender;
+	$adherent->morphy = $obj->morphy;
+	$adherent->email = $obj->email;
 	$adherent->typeid = $obj->type;
 
 	$typeid = ($obj->fk_type > 0 ? $obj->fk_type : $adherent->typeid);
-    $adht = new AdherentType($db);
-    $adht->fetch($typeid);
+	$adht = new AdherentType($db);
+	$adht->fetch($typeid);
 
 	print '<tr class="oddeven">';
 
@@ -416,21 +421,19 @@ while ($i < min($num, $limit)) {
 		print '<td>'.$subscription->getNomUrl(1).'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
-    // Type
-    if (!empty($arrayfields['d.fk_type']['checked'])) {
-        print '<td class="nowraponall">';
-        if ($typeid > 0) {
-        	print $adht->getNomUrl(1);
-        }
-        print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+	// Type
+	if (!empty($arrayfields['d.fk_type']['checked'])) {
+		print '<td class="nowraponall">';
+		if ($typeid > 0) {
+			print $adht->getNomUrl(1);
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
 	}
 
 	// Lastname
 	if (!empty($arrayfields['d.lastname']['checked'])) {
-		$adherent->firstname = '';
-		print '<td>'.$adherent->getNomUrl(-1).'</td>';
-		$adherent->firstname = $obj->firstname;
+		print '<td>'.$adherent->getNomUrl(-1, 0, 'card', 'lastname').'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Firstname
diff --git a/htdocs/adherents/tpl/linkedobjectblock.tpl.php b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
index 136c1dab8f4..0414bf20a14 100644
--- a/htdocs/adherents/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
@@ -33,12 +33,12 @@ $langs->load("members");
 
 $total = 0;
 foreach ($linkedObjectBlock as $key => $objectlink) {
-    echo '<tr class="oddeven">';
-    echo '<td>'.$langs->trans("Subscription").'</td>';
-    echo '<td>'.$objectlink->getNomUrl(1).'</td>';
-    echo '<td class="center"></td>';
-    echo '<td class="center">'.dol_print_date($objectlink->dateh, 'day').'</td>';
-    echo '<td class="right">';
+	echo '<tr class="oddeven">';
+	echo '<td>'.$langs->trans("Subscription").'</td>';
+	echo '<td>'.$objectlink->getNomUrl(1).'</td>';
+	echo '<td class="center"></td>';
+	echo '<td class="center">'.dol_print_date($objectlink->dateh, 'day').'</td>';
+	echo '<td class="right">';
 	if ($user->rights->adherent->lire) {
 		$total = $total + $objectlink->amount;
 		echo price($objectlink->amount);
@@ -46,7 +46,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	echo '</td>';
 	echo '<td class="right"></td>';
 	echo '<td class="right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
-    echo '</tr>';
+	echo '</tr>';
 }
 
 echo "<!-- END PHP TEMPLATE -->\n";
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index ecd709bdd17..e9e6be408c8 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -207,7 +207,7 @@ llxHeader('', $langs->trans("MembersTypeSetup"), 'EN:Module_Foundations|FR:Modul
 
 // List of members type
 if (!$rowid && $action != 'create' && $action != 'edit') {
-	//dol_fiche_head('');
+	//print dol_get_fiche_head('');
 
 	$sql = "SELECT d.rowid, d.libelle as label, d.subscription, d.vote, d.statut as status, d.morphy";
 	$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as d";
@@ -247,7 +247,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 		print '<tr class="liste_titre">';
 		print '<th>'.$langs->trans("Ref").'</th>';
 		print '<th>'.$langs->trans("Label").'</th>';
-		print '<th class="center">'.$langs->trans("MemberNature").'</th>';
+		print '<th class="center">'.$langs->trans("MembersNature").'</th>';
 		print '<th class="center">'.$langs->trans("SubscriptionRequired").'</th>';
 		print '<th class="center">'.$langs->trans("VoteAllowed").'</th>';
 		print '<th class="center">'.$langs->trans("Status").'</th>';
@@ -263,6 +263,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 			$membertype->ref = $objp->rowid;
 			$membertype->label = $objp->rowid;
 			$membertype->status = $objp->status;
+			$membertype->subscription = $objp->subscription;
 
 			print '<tr class="oddeven">';
 			print '<td>';
@@ -271,7 +272,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 			print '</td>';
 			print '<td>'.dol_escape_htmltag($objp->label).'</td>';
 			print '<td class="center">';
-			if ($objp->morphy == 'phy') { print $langs->trans("Physical"); } elseif ($objp->morphy == 'mor') { print $langs->trans("Moral"); } else print $langs->trans("MorPhy");
+			if ($objp->morphy == 'phy') { print $langs->trans("Physical"); } elseif ($objp->morphy == 'mor') { print $langs->trans("Moral"); } else print $langs->trans("MorAndPhy");
 			print '</td>';
 			print '<td class="center">'.yn($objp->subscription).'</td>';
 			print '<td class="center">'.yn($objp->vote).'</td>';
@@ -308,7 +309,7 @@ if ($action == 'create') {
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 
-	dol_fiche_head('');
+	print dol_get_fiche_head('');
 
 	print '<table class="border centpercent">';
 	print '<tbody>';
@@ -321,10 +322,10 @@ if ($action == 'create') {
 
 	// Morphy
   	$morphys = array();
-	$morphys[""] = $langs->trans("MorPhy");
-	$morphys["phy"] = $langs->trans("Physical");
+  	$morphys[""] = $langs->trans("MorAndPhy");
+  	$morphys["phy"] = $langs->trans("Physical");
 	$morphys["mor"] = $langs->trans("Moral");
-	print '<tr><td><span>'.$langs->trans("MemberNature").'</span></td><td>';
+	print '<tr><td><span>'.$langs->trans("MembersNature").'</span></td><td>';
 	print $form->selectarray("morphy", $morphys, GETPOSTISSET("morphy") ? GETPOST("morphy", 'aZ09') : 'morphy');
 	print "</td></tr>";
 
@@ -343,12 +344,12 @@ if ($action == 'create') {
 
 	print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor('comment', $object->note, '', 280, 'dolibarr_notes', '', false, true, $conf->fckeditor->enabled, 15, '90%');
+	$doleditor = new DolEditor('comment', $object->note, '', 200, 'dolibarr_notes', '', false, true, $conf->fckeditor->enabled, 15, '90%');
 	$doleditor->Create();
 
 	print '<tr><td class="tdtop">'.$langs->trans("WelcomeEMail").'</td><td>';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor('mail_valid', $object->mail_valid, '', 280, 'dolibarr_notes', '', false, true, $conf->fckeditor->enabled, 15, '90%');
+	$doleditor = new DolEditor('mail_valid', $object->mail_valid, '', 250, 'dolibarr_notes', '', false, true, $conf->fckeditor->enabled, 15, '90%');
 	$doleditor->Create();
 	print '</td></tr>';
 
@@ -358,12 +359,12 @@ if ($action == 'create') {
 	print '<tbody>';
 	print "</table>\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" name="button" class="button" value="'.$langs->trans("Add").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'" onclick="history.go(-1)" />';
+	print '<input type="submit" name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'" onclick="history.go(-1)" />';
 	print '</div>';
 
 	print "</form>\n";
@@ -389,7 +390,7 @@ if ($rowid > 0) {
 
 		$head = member_type_prepare_head($object);
 
-		dol_fiche_head($head, 'card', $langs->trans("MemberType"), -1, 'group');
+		print dol_get_fiche_head($head, 'card', $langs->trans("MemberType"), -1, 'group');
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/type.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -401,7 +402,7 @@ if ($rowid > 0) {
 		print '<table class="border centpercent">';
 
 		// Morphy
-		print '<tr><td>'.$langs->trans("MemberNature").'</td><td class="valeur" >'.$object->getmorphylib($object->morphy).'</td>';
+		print '<tr><td>'.$langs->trans("MembersNature").'</td><td class="valeur" >'.$object->getmorphylib($object->morphy).'</td>';
 		print '</tr>';
 
 		print '<tr><td class="titlefield">'.$langs->trans("SubscriptionRequired").'</td><td>';
@@ -433,7 +434,7 @@ if ($rowid > 0) {
 		print '</table>';
 		print '</div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		/*
 		 * Buttons
@@ -614,13 +615,16 @@ if ($rowid > 0) {
 				$adh = new Adherent($db);
 				$adh->lastname = $objp->lastname;
 				$adh->firstname = $objp->firstname;
+				$adh->datefin = $datefin;
+				$adh->need_subscription = $objp->subscription;
+				$adh->statut = $objp->status;
 
 				// Lastname
 				print '<tr class="oddeven">';
 				if ($objp->company != '') {
-					print '<td><a href="card.php?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"), "user").' '.$adh->getFullName($langs, 0, -1, 20).' / '.dol_trunc($objp->societe, 12).'</a></td>'."\n";
+					print '<td><a href="card.php?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"), "user", 'class="paddingright"').$adh->getFullName($langs, 0, -1, 20).' / '.dol_trunc($objp->company, 12).'</a></td>'."\n";
 				} else {
-					print '<td><a href="card.php?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"), "user").' '.$adh->getFullName($langs, 0, -1, 32).'</a></td>'."\n";
+					print '<td><a href="card.php?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"), "user", 'class="paddingright"').$adh->getFullName($langs, 0, -1, 32).'</a></td>'."\n";
 				}
 
 				// Login
@@ -640,9 +644,9 @@ if ($rowid > 0) {
 				// EMail
 				print "<td>".dol_print_email($objp->email, 0, 0, 1)."</td>\n";
 
-				// Statut
+				// Status
 				print '<td class="nowrap">';
-				print $adh->LibStatut($objp->status, $objp->subscription, $datefin, 2);
+				print $adh->getLibStatut(2);
 				print "</td>";
 
 				// Date end subscription
@@ -668,11 +672,10 @@ if ($rowid > 0) {
 				// Actions
 				print '<td class="center">';
 				if ($user->rights->adherent->creer) {
-					print '<a class="editfielda" href="card.php?rowid='.$objp->rowid.'&action=edit&backtopage='.urlencode($_SERVER["PHP_SELF"].'?rowid='.$object->id).'">'.img_edit().'</a>';
+					print '<a class="editfielda marginleftonly" href="card.php?rowid='.$objp->rowid.'&action=edit&backtopage='.urlencode($_SERVER["PHP_SELF"].'?rowid='.$object->id).'">'.img_edit().'</a>';
 				}
-				print '&nbsp;';
 				if ($user->rights->adherent->supprimer) {
-					print '<a href="card.php?rowid='.$objp->rowid.'&action=resign">'.img_picto($langs->trans("Resiliate"), 'disable.png').'</a>';
+					print '<a class="marginleftonly" href="card.php?rowid='.$objp->rowid.'&action=resign">'.img_picto($langs->trans("Resiliate"), 'disable.png').'</a>';
 				}
 				print "</td>";
 
@@ -710,24 +713,24 @@ if ($rowid > 0) {
 		print '<input type="hidden" name="rowid" value="'.$object->id.'">';
 		print '<input type="hidden" name="action" value="update">';
 
-		dol_fiche_head($head, 'card', $langs->trans("MemberType"), 0, 'group');
+		print dol_get_fiche_head($head, 'card', $langs->trans("MemberType"), 0, 'group');
 
 		print '<table class="border centpercent">';
 
 		print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>'.$object->id.'</td></tr>';
 
-		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="label" size="40" value="'.dol_escape_htmltag($object->label).'"></td></tr>';
+		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" class="minwidth300" name="label" value="'.dol_escape_htmltag($object->label).'"></td></tr>';
 
 		print '<tr><td>'.$langs->trans("Status").'</td><td>';
 		print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $object->status);
 		print '</td></tr>';
 
 		// Morphy
-		$morphys[""] = $langs->trans("MorPhy");
+		$morphys[""] = $langs->trans("MorAndPhy");
 		$morphys["phy"] = $langs->trans("Physical");
 		$morphys["mor"] = $langs->trans("Moral");
-		print '<tr><td><span>'.$langs->trans("MemberNature").'</span></td><td>';
-		print $form->selectarray("morphy", $morphys, GETPOSTISSET("morphy") ? GETPOST("morphy") : $object->morphy);
+		print '<tr><td><span>'.$langs->trans("MembersNature").'</span></td><td>';
+		print $form->selectarray("morphy", $morphys, GETPOSTISSET("morphy") ? GETPOST("morphy", 'aZ09') : $object->morphy);
 		print "</td></tr>";
 
 		print '<tr><td>'.$langs->trans("SubscriptionRequired").'</td><td>';
@@ -759,12 +762,12 @@ if ($rowid > 0) {
 
 		print '</table>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
-		print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+		print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
+		print '<input type="submit" name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 
 		print "</form>";
diff --git a/htdocs/adherents/type_ldap.php b/htdocs/adherents/type_ldap.php
index 5e745293050..1d37f337a78 100644
--- a/htdocs/adherents/type_ldap.php
+++ b/htdocs/adherents/type_ldap.php
@@ -86,7 +86,7 @@ $form = new Form($db);
 
 $head = member_type_prepare_head($object);
 
-dol_fiche_head($head, 'ldap', $langs->trans("MemberType"), -1, 'group');
+print dol_get_fiche_head($head, 'ldap', $langs->trans("MemberType"), -1, 'group');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/type.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -114,7 +114,7 @@ print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 /*
  * Action bar
@@ -123,7 +123,7 @@ dol_fiche_end();
 print '<div class="tabsAction">';
 
 if ($conf->global->LDAP_MEMBER_TYPE_ACTIVE == 1) {
-    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=dolibarr2ldap">'.$langs->trans("ForceSynchronize").'</a>';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=dolibarr2ldap">'.$langs->trans("ForceSynchronize").'</a>';
 }
 
 print "</div>\n";
@@ -146,27 +146,27 @@ print '</tr>';
 $ldap = new Ldap();
 $result = $ldap->connect_bind();
 if ($result > 0) {
-    $info = $object->_load_ldap_info();
-    $dn = $object->_load_ldap_dn($info, 1);
-    $search = "(".$object->_load_ldap_dn($info, 2).")";
+	$info = $object->_load_ldap_info();
+	$dn = $object->_load_ldap_dn($info, 1);
+	$search = "(".$object->_load_ldap_dn($info, 2).")";
 
-    $records = $ldap->getAttribute($dn, $search);
+	$records = $ldap->getAttribute($dn, $search);
 
-    //print_r($records);
+	//print_r($records);
 
-    // Show tree
-    if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0)) {
-        if (!is_array($records)) {
-            print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
-        } else {
-            $result = show_ldap_content($records, 0, $records['count'], true);
-        }
-    } else {
-        print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
-    }
+	// Show tree
+	if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0)) {
+		if (!is_array($records)) {
+			print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
+		} else {
+			$result = show_ldap_content($records, 0, $records['count'], true);
+		}
+	} else {
+		print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
+	}
 
-    $ldap->unbind();
-    $ldap->close();
+	$ldap->unbind();
+	$ldap->close();
 } else {
 	setEventMessages($ldap->error, $ldap->errors, 'errors');
 }
diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php
index 10c43dadbe3..f2c3b785160 100644
--- a/htdocs/adherents/type_translation.php
+++ b/htdocs/adherents/type_translation.php
@@ -37,6 +37,7 @@ $langs->loadLangs(array('members', 'languages'));
 $id = GETPOST('rowid', 'int');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
+$ref = GETPOST('ref', 'alphanohtml');
 
 // Security check
 $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
@@ -67,15 +68,17 @@ if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && $user->rights->ad
 	$object->fetch($id);
 	$current_lang = $langs->getDefaultLang();
 
+	$forcelangprod = GETPOST("forcelangprod", 'aZ09');
+
 	// update of object
-	if ($_POST["forcelangprod"] == $current_lang) {
-		$object->label			= $_POST["libelle"];
-		$object->description = dol_htmlcleanlastbr($_POST["desc"]);
-		$object->other			= dol_htmlcleanlastbr($_POST["other"]);
+	if ($forcelangprod == $current_lang) {
+		$object->label		 = GETPOST("libelle", 'alphanohtml');
+		$object->description = dol_htmlcleanlastbr(GETPOST("desc", 'restricthtml'));
+		$object->other		 = dol_htmlcleanlastbr(GETPOST("other", 'restricthtml'));
 	} else {
-		$object->multilangs[$_POST["forcelangprod"]]["label"]		= $_POST["libelle"];
-		$object->multilangs[$_POST["forcelangprod"]]["description"] = dol_htmlcleanlastbr($_POST["desc"]);
-		$object->multilangs[$_POST["forcelangprod"]]["other"]		= dol_htmlcleanlastbr($_POST["other"]);
+		$object->multilangs[$forcelangprod]["label"] = GETPOST("libelle", 'alphanohtml');
+		$object->multilangs[$forcelangprod]["description"] = dol_htmlcleanlastbr(GETPOST("desc", 'restricthtml'));
+		$object->multilangs[$forcelangprod]["other"] = dol_htmlcleanlastbr(GETPOST("other", 'restricthtml'));
 	}
 
 	// backup into database
@@ -95,13 +98,13 @@ if ($action == 'vedit' && $cancel != $langs->trans("Cancel") && $user->rights->a
 
 	foreach ($object->multilangs as $key => $value) { // saving new values in the object
 		if ($key == $current_lang) {
-			$object->label			= $_POST["libelle-".$key];
-			$object->description = dol_htmlcleanlastbr($_POST["desc-".$key]);
-			$object->other			= dol_htmlcleanlastbr($_POST["other-".$key]);
+			$object->label			= GETPOST("libelle-".$key, 'alphanohtml');
+			$object->description = dol_htmlcleanlastbr(GETPOST("desc-".$key, 'restricthtml'));
+			$object->other			= dol_htmlcleanlastbr(GETPOST("other-".$key, 'restricthtml'));
 		} else {
-			$object->multilangs[$key]["label"]			= $_POST["libelle-".$key];
-			$object->multilangs[$key]["description"] = dol_htmlcleanlastbr($_POST["desc-".$key]);
-			$object->multilangs[$key]["other"]			= dol_htmlcleanlastbr($_POST["other-".$key]);
+			$object->multilangs[$key]["label"]			= GETPOST("libelle-".$key, 'alphanohtml');
+			$object->multilangs[$key]["description"] = dol_htmlcleanlastbr(GETPOST("desc-".$key, 'restricthtml'));
+			$object->multilangs[$key]["other"]			= dol_htmlcleanlastbr(GETPOST("other-".$key, 'restricthtml'));
 		}
 	}
 
@@ -154,19 +157,19 @@ $titre = $langs->trans("MemberType".$object->type);
 // Calculate $cnt_trans
 $cnt_trans = 0;
 if (!empty($object->multilangs)) {
-    foreach ($object->multilangs as $key => $value) {
-        $cnt_trans++;
-    }
+	foreach ($object->multilangs as $key => $value) {
+		$cnt_trans++;
+	}
 }
 
 
-dol_fiche_head($head, 'translation', $titre, 0, 'group');
+print dol_get_fiche_head($head, 'translation', $titre, 0, 'group');
 
 $linkback = '<a href="'.dol_buildpath('/adherents/type.php', 1).'">'.$langs->trans("BackToList").'</a>';
 
 dol_banner_tab($object, 'rowid', $linkback);
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 
@@ -179,10 +182,10 @@ dol_fiche_end();
 print "\n<div class=\"tabsAction\">\n";
 
 if ($action == '') {
-    if ($user->rights->produit->creer || $user->rights->service->creer) {
-        print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/type_translation.php?action=add&rowid='.$object->id.'">'.$langs->trans("Add").'</a>';
-        if ($cnt_trans > 0) print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/type_translation.php?action=edit&rowid='.$object->id.'">'.$langs->trans("Update").'</a>';
-    }
+	if ($user->rights->produit->creer || $user->rights->service->creer) {
+		print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/type_translation.php?action=add&rowid='.$object->id.'">'.$langs->trans("Add").'</a>';
+		if ($cnt_trans > 0) print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/type_translation.php?action=edit&rowid='.$object->id.'">'.$langs->trans("Update").'</a>';
+	}
 }
 
 print "\n</div>\n";
@@ -205,7 +208,7 @@ if ($action == 'edit') {
 
 			print '<div class="underbanner clearboth"></div>';
 			print '<table class="border centpercent">';
-			print '<tr><td class="tdtop titlefieldcreate fieldrequired">'.$langs->trans('Label').'</td><td><input name="libelle-'.$key.'" size="40" value="'.dol_escape_htmltag($object->multilangs[$key]["label"]).'"></td></tr>';
+			print '<tr><td class="tdtop titlefieldcreate fieldrequired">'.$langs->trans('Label').'</td><td><input name="libelle-'.$key.'" class="minwidth300" value="'.dol_escape_htmltag($object->multilangs[$key]["label"]).'"></td></tr>';
 			print '<tr><td class="tdtop">'.$langs->trans('Description').'</td><td>';
 			$doleditor = new DolEditor("desc-$key", $object->multilangs[$key]["description"], '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%');
 			$doleditor->Create();
@@ -218,9 +221,9 @@ if ($action == 'edit') {
 	print '<br>';
 
 	print '<div class="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+	print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
@@ -258,13 +261,13 @@ if ($action == 'add' && $user->rights->adherent->configurer) {
 	print '<input type="hidden" name="action" value="vadd">';
 	print '<input type="hidden" name="rowid" value="'.GETPOST("rowid", 'int').'">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">';
 	print '<tr><td class="tdtop titlefieldcreate fieldrequired">'.$langs->trans('Language').'</td><td>';
-    print $formadmin->select_language('', 'forcelangprod', 0, $object->multilangs, 1);
+	print $formadmin->select_language('', 'forcelangprod', 0, $object->multilangs, 1);
 	print '</td></tr>';
-	print '<tr><td class="tdtop fieldrequired">'.$langs->trans('Label').'</td><td><input name="libelle" size="40"></td></tr>';
+	print '<tr><td class="tdtop fieldrequired">'.$langs->trans('Label').'</td><td><input name="libelle" class="minwidth300" value="'.dol_escape_htmltag(GETPOST("libelle", 'alphanohtml')).'"></td></tr>';
 	print '<tr><td class="tdtop">'.$langs->trans('Description').'</td><td>';
 	$doleditor = new DolEditor('desc', '', '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%');
 	$doleditor->Create();
@@ -272,12 +275,12 @@ if ($action == 'add' && $user->rights->adherent->configurer) {
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+	print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
diff --git a/htdocs/adherents/vcard.php b/htdocs/adherents/vcard.php
index 6f2a274aed9..dbdbbc687ea 100644
--- a/htdocs/adherents/vcard.php
+++ b/htdocs/adherents/vcard.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2020		Tobias Sekan		<tobias.sekan@startmail.com>
+ * Copyright (C) 2020		Frédéric 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
@@ -39,8 +40,7 @@ $result = restrictedArea($user, 'adherent', $id, '', '', 'socid', 'rowid', $objc
 
 
 $result = $adherent->fetch($id);
-if ($result <= 0)
-{
+if ($result <= 0) {
 	dol_print_error($adherent->error);
 	exit;
 }
@@ -48,8 +48,7 @@ if ($result <= 0)
 $physicalperson = 1;
 
 $company = new Societe($db);
-if ($adherent->socid)
-{
+if ($adherent->socid) {
 	$result = $company->fetch($adherent->socid);
 }
 
@@ -66,43 +65,41 @@ $v->setPhoneNumber($adherent->phone_pro, "TYPE=WORK;VOICE");
 $v->setPhoneNumber($adherent->phone_mobile, "TYPE=CELL;VOICE");
 $v->setPhoneNumber($adherent->fax, "TYPE=WORK;FAX");
 
-$country = $adherent->country_code ? $adherent->country : '' ;
+$country = $adherent->country_code ? $adherent->country : '';
 
 $v->setAddress("", "", $adherent->address, $adherent->town, $adherent->state, $adherent->zip, $country, "TYPE=WORK;POSTAL");
 $v->setLabel("", "", $adherent->address, $adherent->town, $adherent->state, $adherent->zip, $country, "TYPE=WORK");
 
 $v->setEmail($adherent->email);
-$v->setNote($adherent->note);
+$v->setNote($adherent->note_public);
 $v->setTitle($adherent->poste);
 
 // Data from linked company
-if ($company->id)
-{
+if ($company->id) {
 	$v->setURL($company->url, "TYPE=WORK");
-	if (! $adherent->phone_pro) $v->setPhoneNumber($company->phone, "TYPE=WORK;VOICE");
-	if (! $adherent->fax)       $v->setPhoneNumber($company->fax, "TYPE=WORK;FAX");
-	if (! $adherent->zip)       $v->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "TYPE=WORK;POSTAL");
-
+	if (!$adherent->phone_pro) {
+		$v->setPhoneNumber($company->phone, "TYPE=WORK;VOICE");
+	}
+	if (!$adherent->fax) {
+		$v->setPhoneNumber($company->fax, "TYPE=WORK;FAX");
+	}
+	if (!$adherent->zip) {
+		$v->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "TYPE=WORK;POSTAL");
+	}
 	// when company e-mail is empty, use only adherent e-mail
-	if (empty(trim($company->email)))
-	{
+	if (empty(trim($company->email))) {
 		// was set before, don't set twice
-	}
-	// when adherent e-mail is empty, use only company e-mail
-	elseif (empty(trim($adherent->email)))
-	{
+	} elseif (empty(trim($adherent->email))) {
+		// when adherent e-mail is empty, use only company e-mail
 		$v->setEmail($company->email);
-	}
-	// when e-mail domain of adherent and company are the same, use adherent e-mail at first (and company e-mail at second)
-	elseif (strtolower(end(explode("@", $adherent->email))) == strtolower(end(explode("@", $company->email))))
-	{
+	} elseif (strtolower(end(explode("@", $adherent->email))) == strtolower(end(explode("@", $company->email)))) {
+		// when e-mail domain of adherent and company are the same, use adherent e-mail at first (and company e-mail at second)
 		$v->setEmail($adherent->email);
 
 		// support by Microsoft Outlook (2019 and possible earlier)
 		$v->setEmail($company->email, 'INTERNET');
-	}
-	// when e-mail of adherent and company complete different use company e-mail at first (and adherent e-mail at second)
-	else {
+	} else {
+		// when e-mail of adherent and company complete different use company e-mail at first (and adherent e-mail at second)
 		$v->setEmail($company->email);
 
 		// support by Microsoft Outlook (2019 and possible earlier)
@@ -110,12 +107,16 @@ if ($company->id)
 	}
 
 	// Si adherent lie a un tiers non de type "particulier"
-	if ($adherent->typent_code != 'TE_PRIVATE') $v->setOrg($company->name);
+	if ($company->typent_code != 'TE_PRIVATE') {
+		$v->setOrg($company->name);
+	}
 }
 
 // Personal informations
 $v->setPhoneNumber($adherent->phone_perso, "TYPE=HOME;VOICE");
-if ($adherent->birthday) $v->setBirthday($adherent->birthday);
+if ($adherent->birth) {
+	$v->setBirthday($adherent->birth);
+}
 
 $db->close();
 
@@ -124,7 +125,7 @@ $db->close();
 
 $output = $v->getVCard();
 
-$filename = trim(urldecode($v->getFileName()));      // "Nom prenom.vcf"
+$filename = trim(urldecode($v->getFileName())); // "Nom prenom.vcf"
 $filenameurlencoded = dol_sanitizeFileName(urlencode($filename));
 //$filename = dol_sanitizeFileName($filename);
 
diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php
index b039032b9c2..7a1d5b66ece 100644
--- a/htdocs/admin/accountant.php
+++ b/htdocs/admin/accountant.php
@@ -82,7 +82,7 @@ print load_fiche_titre($langs->trans("CompanyFoundation"), '', 'title_setup');
 
 $head = company_admin_prepare_head();
 
-dol_fiche_head($head, 'accountant', $langs->trans("Company"), -1, 'company');
+print dol_get_fiche_head($head, 'accountant', $langs->trans("Company"), -1, 'company');
 
 $form = new Form($db);
 $formother = new FormOther($db);
@@ -170,9 +170,9 @@ print '</td></tr>';
 print '</table>';
 
 print '<br><div class="center">';
-print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
 //print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-//print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+//print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 print '</div>';
 //print '<br>';
 
diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index 2cc79be297d..b1cc1d7619b 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
 
 if (!$user->admin)
-    accessforbidden();
+	accessforbidden();
 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'other', 'agenda'));
@@ -86,9 +86,9 @@ if (GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') |
 
 if ($action == "save" && empty($cancel))
 {
-    $i = 0;
+	$i = 0;
 
-    $db->begin();
+	$db->begin();
 
 	foreach ($triggers as $trigger)
 	{
@@ -102,13 +102,13 @@ if ($action == "save" && empty($cancel))
 	}
 
  	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-        $db->commit();
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-        $db->rollback();
-    }
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		$db->commit();
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+		$db->rollback();
+	}
 }
 
 
@@ -132,7 +132,7 @@ $param .= '&search_event='.urlencode($search_event);
 
 $head = agenda_prepare_head();
 
-dol_fiche_head($head, 'autoactions', $langs->trans("Agenda"), -1, 'action');
+print dol_get_fiche_head($head, 'autoactions', $langs->trans("Agenda"), -1, 'action');
 
 print '<span class="opacitymedium">'.$langs->trans("AgendaAutoActionDesc")." ".$langs->trans("OnlyActiveElementsAreShown", 'modules.php').'</span><br>';
 print "<br>\n";
@@ -197,10 +197,10 @@ if (!empty($triggers))
 print '</table>';
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center">';
-print '<input type="submit" name="save" class="button" value="'.$langs->trans("Save").'">';
+print '<input type="submit" name="save" class="button button-save" value="'.$langs->trans("Save").'">';
 print "</div>";
 
 print "</form>\n";
diff --git a/htdocs/admin/agenda_extrafields.php b/htdocs/admin/agenda_extrafields.php
index 605f3c76519..36c7bc3edf8 100644
--- a/htdocs/admin/agenda_extrafields.php
+++ b/htdocs/admin/agenda_extrafields.php
@@ -74,19 +74,19 @@ print load_fiche_titre($langs->trans("AgendaSetup"), $linkback, 'title_setup');
 
 $head = agenda_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Agenda"), -1, 'action');
+print dol_get_fiche_head($head, 'attributes', $langs->trans("Agenda"), -1, 'action');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -99,9 +99,9 @@ if ($action != 'create' && $action != 'edit')
 if ($action == 'create')
 {
 	print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -111,10 +111,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && !empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index e7e5edefaab..7fbd139072d 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -54,9 +54,9 @@ $colorlist = array('BECEDD', 'DDBECE', 'BFDDBE', 'F598B4', 'F68654', 'CBF654', '
 
 if ($actionsave)
 {
-    $db->begin();
+	$db->begin();
 
-    $disableext = GETPOST('AGENDA_DISABLE_EXT', 'alpha');
+	$disableext = GETPOST('AGENDA_DISABLE_EXT', 'alpha');
 	$res = dolibarr_set_const($db, 'AGENDA_DISABLE_EXT', $disableext, 'chaine', 0, '', $conf->entity);
 
 	$i = 1; $errorsaved = 0;
@@ -103,14 +103,14 @@ if ($actionsave)
 		$MAXAGENDA = empty($conf->global->AGENDA_EXT_NB) ? 5 : $conf->global->AGENDA_EXT_NB;
 	}
 
-    if (!$error)
-    {
-        $db->commit();
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        $db->rollback();
-        if (empty($errorsaved))	setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if (!$error)
+	{
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		$db->rollback();
+		if (empty($errorsaved))	setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 /*
@@ -136,7 +136,7 @@ print '<input type="hidden" name="action" value="save">';
 
 $head = agenda_prepare_head();
 
-dol_fiche_head($head, 'extsites', $langs->trans("Agenda"), -1, 'action');
+print dol_get_fiche_head($head, 'extsites', $langs->trans("Agenda"), -1, 'action');
 
 print '<span class="opacitymedium">'.$langs->trans("AgendaExtSitesDesc")."</span><br>\n";
 print "<br>\n";
@@ -224,10 +224,10 @@ while ($i <= $MAXAGENDA)
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center">';
-print '<input type="submit" id="save" name="save" class="button hideifnotset" value="'.$langs->trans("Save").'">';
+print '<input type="submit" id="save" name="save" class="button hideifnotset button-save" value="'.$langs->trans("Save").'">';
 print '</div>';
 
 print "</form>\n";
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 48368af45f2..c1f77f4995e 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 
 if (!$user->admin)
-    accessforbidden();
+	accessforbidden();
 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'other', 'agenda', 'users'));
@@ -80,49 +80,49 @@ if ($action == 'set')
 	$getDefaultFilter = GETPOST('AGENDA_DEFAULT_FILTER_TYPE');
 	$defaultfilter = (is_array($getDefaultFilter)) ? implode(',', $getDefaultFilter) : $getDefaultFilter;
 	dolibarr_set_const($db, 'AGENDA_USE_EVENT_TYPE_DEFAULT', GETPOST('AGENDA_USE_EVENT_TYPE_DEFAULT'), 'chaine', 0, '', $conf->entity);
-    dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_TYPE', $defaultfilter, 'chaine', 0, '', $conf->entity);
-    dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_STATUS', GETPOST('AGENDA_DEFAULT_FILTER_STATUS'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_TYPE', $defaultfilter, 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_STATUS', GETPOST('AGENDA_DEFAULT_FILTER_STATUS'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, 'AGENDA_DEFAULT_VIEW', GETPOST('AGENDA_DEFAULT_VIEW'), 'chaine', 0, '', $conf->entity);
 } elseif ($action == 'specimen')  // For orders
 {
-    $modele = GETPOST('module', 'alpha');
+	$modele = GETPOST('module', 'alpha');
 
-    $commande = new CommandeFournisseur($db);
-    $commande->initAsSpecimen();
-    $commande->thirdparty = $specimenthirdparty;
+	$commande = new CommandeFournisseur($db);
+	$commande->initAsSpecimen();
+	$commande->thirdparty = $specimenthirdparty;
 
-    // Search template files
-    $file = ''; $classname = ''; $filefound = 0;
-    $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-    foreach ($dirmodels as $reldir)
-    {
-    	$file = dol_buildpath($reldir."core/modules/action/doc/pdf_".$modele.".modules.php", 0);
-    	if (file_exists($file))
-    	{
-    		$filefound = 1;
-    		$classname = "pdf_".$modele;
-    		break;
-    	}
-    }
+	// Search template files
+	$file = ''; $classname = ''; $filefound = 0;
+	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir)
+	{
+		$file = dol_buildpath($reldir."core/modules/action/doc/pdf_".$modele.".modules.php", 0);
+		if (file_exists($file))
+		{
+			$filefound = 1;
+			$classname = "pdf_".$modele;
+			break;
+		}
+	}
 
-    if ($filefound)
-    {
-    	require_once $file;
+	if ($filefound)
+	{
+		require_once $file;
 
-    	$module = new $classname($db, $commande);
+		$module = new $classname($db, $commande);
 
-    	if ($module->write_file($commande, $langs) > 0)
-    	{
-    		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=action&file=SPECIMEN.pdf");
-    		return;
-    	} else {
-    		setEventMessages($module->error, $module->errors, 'errors');
-    		dol_syslog($module->error, LOG_ERR);
-    	}
-    } else {
-    	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-    	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
-    }
+		if ($module->write_file($commande, $langs) > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=action&file=SPECIMEN.pdf");
+			return;
+		} else {
+			setEventMessages($module->error, $module->errors, 'errors');
+			dol_syslog($module->error, LOG_ERR);
+		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
 }
 
 // Activate a model
@@ -135,7 +135,7 @@ elseif ($action == 'setmodel')
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->ACTION_EVENT_ADDON_PDF == "$value") dolibarr_del_const($db, 'ACTION_EVENT_ADDON_PDF', $conf->entity);
+		if ($conf->global->ACTION_EVENT_ADDON_PDF == "$value") dolibarr_del_const($db, 'ACTION_EVENT_ADDON_PDF', $conf->entity);
 	}
 }
 
@@ -175,7 +175,7 @@ print load_fiche_titre($langs->trans("AgendaSetup"), $linkback, 'title_setup');
 
 $head = agenda_prepare_head();
 
-dol_fiche_head($head, 'other', $langs->trans("Agenda"), -1, 'action');
+print dol_get_fiche_head($head, 'other', $langs->trans("Agenda"), -1, 'action');
 
 
 /*
@@ -194,115 +194,115 @@ $sql .= " AND entity = ".$conf->entity;
 $resql = $db->query($sql);
 if ($resql)
 {
-    $i = 0;
-    $num_rows = $db->num_rows($resql);
-    while ($i < $num_rows)
-    {
-        $array = $db->fetch_array($resql);
-        array_push($def, $array[0]);
-        $i++;
-    }
+	$i = 0;
+	$num_rows = $db->num_rows($resql);
+	while ($i < $num_rows)
+	{
+		$array = $db->fetch_array($resql);
+		array_push($def, $array[0]);
+		$i++;
+	}
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 {
-    print load_fiche_titre($langs->trans("AgendaModelModule"), '', '');
+	print load_fiche_titre($langs->trans("AgendaModelModule"), '', '');
 
-    print '<table class="noborder centpercent">'."\n";
-    print '<tr class="liste_titre">'."\n";
-    print '<td width="100">'.$langs->trans("Name").'</td>'."\n";
-    print '<td>'.$langs->trans("Description").'</td>'."\n";
-    print '<td class="center" width="60">'.$langs->trans("Status").'</td>'."\n";
-    print '<td class="center" width="60">'.$langs->trans("Default").'</td>'."\n";
-    print '<td class="center" width="40">'.$langs->trans("ShortInfo").'</td>';
-    print '<td class="center" width="40">'.$langs->trans("Preview").'</td>';
-    print '</tr>'."\n";
+	print '<table class="noborder centpercent">'."\n";
+	print '<tr class="liste_titre">'."\n";
+	print '<td width="100">'.$langs->trans("Name").'</td>'."\n";
+	print '<td>'.$langs->trans("Description").'</td>'."\n";
+	print '<td class="center" width="60">'.$langs->trans("Status").'</td>'."\n";
+	print '<td class="center" width="60">'.$langs->trans("Default").'</td>'."\n";
+	print '<td class="center" width="40">'.$langs->trans("ShortInfo").'</td>';
+	print '<td class="center" width="40">'.$langs->trans("Preview").'</td>';
+	print '</tr>'."\n";
 
-    clearstatcache();
+	clearstatcache();
 
-    foreach ($dirmodels as $reldir)
-    {
-    	$dir = dol_buildpath($reldir."core/modules/action/doc");
+	foreach ($dirmodels as $reldir)
+	{
+		$dir = dol_buildpath($reldir."core/modules/action/doc");
 
-        if (is_dir($dir))
-        {
-            $handle = opendir($dir);
-            if (is_resource($handle))
-            {
-                while (($file = readdir($handle)) !== false)
-                {
-                    if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-                    {
-            			$name = substr($file, 4, dol_strlen($file) - 16);
-            			$classname = substr($file, 0, dol_strlen($file) - 12);
+		if (is_dir($dir))
+		{
+			$handle = opendir($dir);
+			if (is_resource($handle))
+			{
+				while (($file = readdir($handle)) !== false)
+				{
+					if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
+					{
+						$name = substr($file, 4, dol_strlen($file) - 16);
+						$classname = substr($file, 0, dol_strlen($file) - 12);
 
-            			require_once $dir.'/'.$file;
-            			$module = new $classname($db, new ActionComm($db));
+						require_once $dir.'/'.$file;
+						$module = new $classname($db, new ActionComm($db));
 
-            			print '<tr class="oddeven">'."\n";
-            			print "<td>";
-            			print (empty($module->name) ? $name : $module->name);
-            			print "</td>\n";
-            			print "<td>\n";
-            			require_once $dir.'/'.$file;
-            			$module = new $classname($db, $specimenthirdparty);
-            			if (method_exists($module, 'info'))
-            				print $module->info($langs);
-            			else print $module->description;
-            			print "</td>\n";
+						print '<tr class="oddeven">'."\n";
+						print "<td>";
+						print (empty($module->name) ? $name : $module->name);
+						print "</td>\n";
+						print "<td>\n";
+						require_once $dir.'/'.$file;
+						$module = new $classname($db, $specimenthirdparty);
+						if (method_exists($module, 'info'))
+							print $module->info($langs);
+						else print $module->description;
+						print "</td>\n";
 
-            			// Active
-            			if (in_array($name, $def))
-            			{
-            			    print '<td class="center">'."\n";
-            			    if ($conf->global->ACTION_EVENT_ADDON_PDF != "$name")
-            			    {
-            				    print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action">';
-            				    print img_picto($langs->trans("Enabled"), 'switch_on');
-            				    print '</a>';
-            			    } else {
-            				    print img_picto($langs->trans("Enabled"), 'switch_on');
-            			    }
-            				print "</td>";
-            			} else {
-            				print '<td class="center">'."\n";
-            				print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmodel&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-            				print "</td>";
-            			}
+						// Active
+						if (in_array($name, $def))
+						{
+							print '<td class="center">'."\n";
+							if ($conf->global->ACTION_EVENT_ADDON_PDF != "$name")
+							{
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action">';
+								print img_picto($langs->trans("Enabled"), 'switch_on');
+								print '</a>';
+							} else {
+								print img_picto($langs->trans("Enabled"), 'switch_on');
+							}
+							print "</td>";
+						} else {
+							print '<td class="center">'."\n";
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmodel&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+							print "</td>";
+						}
 
-            			// Default
-            			print '<td class="center">';
-            			if ($conf->global->ACTION_EVENT_ADDON_PDF == "$name")
-            			{
-            				print img_picto($langs->trans("Default"), 'on');
-            			} else {
-            				print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-            			}
-            			print '</td>';
+						// Default
+						print '<td class="center">';
+						if ($conf->global->ACTION_EVENT_ADDON_PDF == "$name")
+						{
+							print img_picto($langs->trans("Default"), 'on');
+						} else {
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+						}
+						print '</td>';
 
-            			// Info
-            			$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
-            			$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-            			$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-            			$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-            			$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
-            			print '<td class="center">';
-            			print $form->textwithpicto('', $htmltooltip, 1, 0);
-            			print '</td>';
-            			print '<td class="center">';
-            			print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'order').'</a>';
-            			print '</td>';
+						// Info
+						$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+						$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+						$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+						$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+						$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+						print '<td class="center">';
+						print $form->textwithpicto('', $htmltooltip, 1, 0);
+						print '</td>';
+						print '<td class="center">';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
+						print '</td>';
 
-            			print "</tr>\n";
-                    }
-                }
-                closedir($handle);
-            }
-        }
-    }
-    print '</table><br>';
+						print "</tr>\n";
+					}
+				}
+				closedir($handle);
+			}
+		}
+	}
+	print '</table><br>';
 }
 
 print '<form action="'.$_SERVER["PHP_SELF"].'" name="agenda">';
@@ -343,13 +343,13 @@ print '</td></tr>'."\n";
 
 if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
 {
-    print '<!-- AGENDA_USE_EVENT_TYPE_DEFAULT -->';
-    print '<tr class="oddeven">'."\n";
-    print '<td>'.$langs->trans("AGENDA_USE_EVENT_TYPE_DEFAULT").'</td>'."\n";
-    print '<td class="center">&nbsp;</td>'."\n";
-    print '<td class="right nowrap">'."\n";
-    $formactions->select_type_actions($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT, "AGENDA_USE_EVENT_TYPE_DEFAULT", 'systemauto', 0, 1);
-    print '</td></tr>'."\n";
+	print '<!-- AGENDA_USE_EVENT_TYPE_DEFAULT -->';
+	print '<tr class="oddeven">'."\n";
+	print '<td>'.$langs->trans("AGENDA_USE_EVENT_TYPE_DEFAULT").'</td>'."\n";
+	print '<td class="center">&nbsp;</td>'."\n";
+	print '<td class="right nowrap">'."\n";
+	$formactions->select_type_actions($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT, "AGENDA_USE_EVENT_TYPE_DEFAULT", 'systemauto', 0, 1);
+	print '</td></tr>'."\n";
 }
 
 // AGENDA_DEFAULT_FILTER_TYPE
@@ -359,8 +359,8 @@ print '<td class="center">&nbsp;</td>'."\n";
 print '<td class="right nowrap">'."\n";
 $multiselect = 0;
 if (!empty($conf->global->MAIN_ENABLE_MULTISELECT_TYPE)) {
-    // We use an option here because it adds bugs when used on agenda page "peruser" and "list"
-    $multiselect = (!empty($conf->global->AGENDA_USE_EVENT_TYPE));
+	// We use an option here because it adds bugs when used on agenda page "peruser" and "list"
+	$multiselect = (!empty($conf->global->AGENDA_USE_EVENT_TYPE));
 }
 $formactions->select_type_actions($conf->global->AGENDA_DEFAULT_FILTER_TYPE, "AGENDA_DEFAULT_FILTER_TYPE", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1), 1, $multiselect);
 print '</td></tr>'."\n";
@@ -376,9 +376,9 @@ print '</td></tr>'."\n";
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
-print '<div class="center"><input class="button" type="submit" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
+print '<div class="center"><input class="button button-save" type="submit" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
 
 print '</form>';
 
diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php
index e4b3c59781c..9da8f89310a 100644
--- a/htdocs/admin/agenda_reminder.php
+++ b/htdocs/admin/agenda_reminder.php
@@ -25,9 +25,10 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+require_once DOL_DOCUMENT_ROOT.'/cron/class/cronjob.class.php';
 
 if (!$user->admin)
-    accessforbidden();
+	accessforbidden();
 
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "other", "agenda"));
@@ -73,49 +74,49 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 if ($action == 'set')
 {
 	dolibarr_set_const($db, 'AGENDA_USE_EVENT_TYPE_DEFAULT', GETPOST('AGENDA_USE_EVENT_TYPE_DEFAULT'), 'chaine', 0, '', $conf->entity);
-    dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_TYPE', GETPOST('AGENDA_DEFAULT_FILTER_TYPE'), 'chaine', 0, '', $conf->entity);
-    dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_STATUS', GETPOST('AGENDA_DEFAULT_FILTER_STATUS'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_TYPE', GETPOST('AGENDA_DEFAULT_FILTER_TYPE'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_STATUS', GETPOST('AGENDA_DEFAULT_FILTER_STATUS'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, 'AGENDA_DEFAULT_VIEW', GETPOST('AGENDA_DEFAULT_VIEW'), 'chaine', 0, '', $conf->entity);
 } elseif ($action == 'specimen')  // For orders
 {
-    $modele = GETPOST('module', 'alpha');
+	$modele = GETPOST('module', 'alpha');
 
-    $commande = new CommandeFournisseur($db);
-    $commande->initAsSpecimen();
-    $commande->thirdparty = $specimenthirdparty;
+	$commande = new CommandeFournisseur($db);
+	$commande->initAsSpecimen();
+	$commande->thirdparty = $specimenthirdparty;
 
-    // Search template files
-    $file = ''; $classname = ''; $filefound = 0;
-    $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-    foreach ($dirmodels as $reldir)
-    {
-    	$file = dol_buildpath($reldir."core/modules/action/doc/pdf_".$modele.".modules.php", 0);
-    	if (file_exists($file))
-    	{
-    		$filefound = 1;
-    		$classname = "pdf_".$modele;
-    		break;
-    	}
-    }
+	// Search template files
+	$file = ''; $classname = ''; $filefound = 0;
+	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir)
+	{
+		$file = dol_buildpath($reldir."core/modules/action/doc/pdf_".$modele.".modules.php", 0);
+		if (file_exists($file))
+		{
+			$filefound = 1;
+			$classname = "pdf_".$modele;
+			break;
+		}
+	}
 
-    if ($filefound)
-    {
-    	require_once $file;
+	if ($filefound)
+	{
+		require_once $file;
 
-    	$module = new $classname($db, $commande);
+		$module = new $classname($db, $commande);
 
-    	if ($module->write_file($commande, $langs) > 0)
-    	{
-    		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=action&file=SPECIMEN.pdf");
-    		return;
-    	} else {
-    		setEventMessages($module->error, $module->errors, 'errors');
-    		dol_syslog($module->error, LOG_ERR);
-    	}
-    } else {
-    	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-    	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
-    }
+		if ($module->write_file($commande, $langs) > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=action&file=SPECIMEN.pdf");
+			return;
+		} else {
+			setEventMessages($module->error, $module->errors, 'errors');
+			dol_syslog($module->error, LOG_ERR);
+		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
 }
 
 // Activate a model
@@ -128,7 +129,7 @@ elseif ($action == 'setmodel')
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->ACTION_EVENT_ADDON_PDF == "$value") dolibarr_del_const($db, 'ACTION_EVENT_ADDON_PDF', $conf->entity);
+		if ($conf->global->ACTION_EVENT_ADDON_PDF == "$value") dolibarr_del_const($db, 'ACTION_EVENT_ADDON_PDF', $conf->entity);
 	}
 }
 
@@ -166,7 +167,7 @@ print load_fiche_titre($langs->trans("AgendaSetup"), $linkback, 'title_setup');
 
 $head = agenda_prepare_head();
 
-dol_fiche_head($head, 'reminders', $langs->trans("Agenda"), -1, 'action');
+print dol_get_fiche_head($head, 'reminders', $langs->trans("Agenda"), -1, 'action');
 
 print '<form action="'.$_SERVER["PHP_SELF"].'" name="agenda">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -179,59 +180,75 @@ print '<td class="center">&nbsp;</td>'."\n";
 print '<td class="right">'.$langs->trans("Value").'</td>'."\n";
 print '</tr>'."\n";
 
+// AGENDA REMINDER BROWSER
+print '<tr class="oddeven">'."\n";
+print '<td>'.$langs->trans('AGENDA_REMINDER_BROWSER').'</td>'."\n";
+print '<td class="center">&nbsp;</td>'."\n";
+print '<td class="right">'."\n";
+
+if (empty($conf->global->AGENDA_REMINDER_BROWSER)) {
+	print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_BROWSER&amp;token='.newToken().'">'.img_picto($langs->trans('Disabled'), 'switch_off').'</a>';
+	print '</td></tr>'."\n";
+} else {
+	print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_BROWSER&amp;token='.newToken().'">'.img_picto($langs->trans('Enabled'), 'switch_on').'</a>';
+	print '</td></tr>'."\n";
 
-// AGENDA REMINDER EMAIL
-if ($conf->global->MAIN_FEATURES_LEVEL == 2)
-{
 	print '<tr class="oddeven">'."\n";
-	print '<td>'.$langs->trans('AGENDA_REMINDER_EMAIL', $langs->transnoentities("Module2300Name")).'</td>'."\n";
+	print '<td>'.$langs->trans('AGENDA_REMINDER_BROWSER_SOUND').'</td>'."\n";
 	print '<td class="center">&nbsp;</td>'."\n";
 	print '<td class="right">'."\n";
 
-	if (empty($conf->global->AGENDA_REMINDER_EMAIL)) {
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_EMAIL&amp;token='.newToken().'">'.img_picto($langs->trans('Disabled'), 'switch_off').'</a>';
-		print '</td></tr>'."\n";
+	if (empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_BROWSER_SOUND&amp;token='.newToken().'">'.img_picto($langs->trans('Disabled'), 'switch_off').'</a>';
 	} else {
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_EMAIL&amp;token='.newToken().'">'.img_picto($langs->trans('Enabled'), 'switch_on').'</a>';
-		print '</td></tr>'."\n";
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_BROWSER_SOUND&amp;token='.newToken().'">'.img_picto($langs->trans('Enabled'), 'switch_on').'</a>';
+	}
+
+	print '</td></tr>'."\n";
+}
+
+$job = new Cronjob($db);
+$job->fetch(0, 'ActionComm', 'sendEmailsReminder');
+
+// AGENDA REMINDER EMAIL
+print '<tr class="oddeven">'."\n";
+print '<td>'.$langs->trans('AGENDA_REMINDER_EMAIL', $langs->transnoentities("Module2300Name"));
+if (!empty($conf->cron->enabled)) {
+	if (!empty($conf->global->AGENDA_REMINDER_EMAIL)) {
+		if ($job->id > 0) {
+			if ($job->status == $job::STATUS_ENABLED) {
+				print '<br><span class="opacitymedium">'.$langs->trans("AGENDA_REMINDER_EMAIL_NOTE", $langs->transnoentitiesnoconv("sendEmailsReminder")).'</span>';
+			}
+		}
 	}
 }
+print '</td>'."\n";
+print '<td class="center">&nbsp;</td>'."\n";
+print '<td class="right">'."\n";
 
-// AGENDA REMINDER BROWSER
-if ($conf->global->MAIN_FEATURES_LEVEL == 2)
-{
-    print '<tr class="oddeven">'."\n";
-    print '<td>'.$langs->trans('AGENDA_REMINDER_BROWSER').'</td>'."\n";
-    print '<td class="center">&nbsp;</td>'."\n";
-    print '<td class="right">'."\n";
-
-    if (empty($conf->global->AGENDA_REMINDER_BROWSER)) {
-        print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_BROWSER&amp;token='.newToken().'">'.img_picto($langs->trans('Disabled'), 'switch_off').'</a>';
-        print '</td></tr>'."\n";
-    } else {
-        print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_BROWSER&amp;token='.newToken().'">'.img_picto($langs->trans('Enabled'), 'switch_on').'</a>';
-        print '</td></tr>'."\n";
-
-        print '<tr class="oddeven">'."\n";
-        print '<td>'.$langs->trans('AGENDA_REMINDER_BROWSER_SOUND').'</td>'."\n";
-        print '<td class="center">&nbsp;</td>'."\n";
-        print '<td class="right">'."\n";
-
-        if (empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) {
-            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_BROWSER_SOUND&amp;token='.newToken().'">'.img_picto($langs->trans('Disabled'), 'switch_off').'</a>';
-        } else {
-            print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_BROWSER_SOUND&amp;token='.newToken().'">'.img_picto($langs->trans('Enabled'), 'switch_on').'</a>';
-        }
-
-        print '</td></tr>'."\n";
-    }
+if (empty($conf->cron->enabled)) {
+	print '<span class="opacitymedium">'.$langs->trans("WarningModuleNotActive", $langs->transnoentitiesnoconv("Module2300Name")).'</span>';
+} else {
+	if (empty($conf->global->AGENDA_REMINDER_EMAIL)) {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_EMAIL&amp;token='.newToken().'">'.img_picto($langs->trans('Disabled'), 'switch_off').'</a>';
+	} else {
+		// Get the max frequency of reminder
+		if ($job->id > 0) {
+			if ($job->status != $job::STATUS_ENABLED) {
+				print '<span class="opacitymedium warning">'.$langs->trans("JobXMustBeEnabled", $langs->transnoentitiesnoconv("sendEmailsReminder")).'</span>';
+			} else {
+				print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_EMAIL&amp;token='.newToken().'">'.img_picto($langs->trans('Enabled'), 'switch_on').'</a>';
+			}
+		}
+	}
 }
+print '</td></tr>'."\n";
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
-//print '<div class="center"><input class="button" type="submit" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
+//print '<div class="center"><input class="button button-save" type="submit" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
 
 print '</form>';
 
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index 3075be2ada5..6d77b9f4416 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
 
 
 if (!$user->admin)
-    accessforbidden();
+	accessforbidden();
 
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "other", "agenda"));
@@ -41,23 +41,23 @@ $actionsave = GETPOST('save', 'alpha');
 // Sauvegardes parametres
 if ($actionsave)
 {
-    $i = 0;
+	$i = 0;
 
-    $db->begin();
+	$db->begin();
 
-    $i += dolibarr_set_const($db, 'MAIN_AGENDA_XCAL_EXPORTKEY', trim(GETPOST('MAIN_AGENDA_XCAL_EXPORTKEY', 'alpha')), 'chaine', 0, '', $conf->entity);
-    $i += dolibarr_set_const($db, 'MAIN_AGENDA_EXPORT_PAST_DELAY', trim(GETPOST('MAIN_AGENDA_EXPORT_PAST_DELAY', 'alpha')), 'chaine', 0, '', $conf->entity);
-    $i += dolibarr_set_const($db, 'MAIN_AGENDA_EXPORT_CACHE', trim(GETPOST('MAIN_AGENDA_EXPORT_CACHE', 'alpha')), 'chaine', 0, '', $conf->entity);
-    $i += dolibarr_set_const($db, 'AGENDA_EXPORT_FIX_TZ', trim(GETPOST('AGENDA_EXPORT_FIX_TZ', 'alpha')), 'chaine', 0, '', $conf->entity);
+	$i += dolibarr_set_const($db, 'MAIN_AGENDA_XCAL_EXPORTKEY', trim(GETPOST('MAIN_AGENDA_XCAL_EXPORTKEY', 'alpha')), 'chaine', 0, '', $conf->entity);
+	$i += dolibarr_set_const($db, 'MAIN_AGENDA_EXPORT_PAST_DELAY', trim(GETPOST('MAIN_AGENDA_EXPORT_PAST_DELAY', 'alpha')), 'chaine', 0, '', $conf->entity);
+	$i += dolibarr_set_const($db, 'MAIN_AGENDA_EXPORT_CACHE', trim(GETPOST('MAIN_AGENDA_EXPORT_CACHE', 'alpha')), 'chaine', 0, '', $conf->entity);
+	$i += dolibarr_set_const($db, 'AGENDA_EXPORT_FIX_TZ', trim(GETPOST('AGENDA_EXPORT_FIX_TZ', 'alpha')), 'chaine', 0, '', $conf->entity);
 
-    if ($i >= 4)
-    {
-        $db->commit();
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        $db->rollback();
-        setEventMessages($langs->trans("SaveFailed"), null, 'errors');
-    }
+	if ($i >= 4)
+	{
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		$db->rollback();
+		setEventMessages($langs->trans("SaveFailed"), null, 'errors');
+	}
 }
 
 
@@ -80,7 +80,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 
 $head = agenda_prepare_head();
 
-dol_fiche_head($head, 'xcal', $langs->trans("Agenda"), -1, 'action');
+print dol_get_fiche_head($head, 'xcal', $langs->trans("Agenda"), -1, 'action');
 
 print '<span class="opacitymedium">'.$langs->trans("AgendaSetupOtherDesc")."</span><br>\n";
 print "<br>\n";
@@ -135,10 +135,10 @@ print "</tr>";
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center">';
-print "<input type=\"submit\" name=\"save\" class=\"button\" value=\"".$langs->trans("Save")."\">";
+print '<input type="submit" name="save" class="button button-save" value="'.$langs->trans("Save").'">';
 print "</div>";
 
 print "</form>\n";
@@ -154,17 +154,20 @@ print "<br>";
 $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
 $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-
+$getentity = ($conf->entity > 1 ? "&entity=".$conf->entity : "");
 
 // Show message
 $message = '';
-$urlvcal = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=vcal&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank">'.$urlwithroot.'/public/agenda/agendaexport.php?format=vcal&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : 'KEYNOTDEFINED').'</a>';
+$urlvcal = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=vcal'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank">';
+$urlvcal .= $urlwithroot.'/public/agenda/agendaexport.php?format=vcal'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : 'KEYNOTDEFINED').'</a>';
 $message .= img_picto('', 'globe').' '.$langs->trans("WebCalUrlForVCalExport", 'vcal', $urlvcal);
 $message .= '<br>';
-$urlical = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical&type=event&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank">'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical&type=event&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : 'KEYNOTDEFINED').'</a>';
+$urlical = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical&type=event'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank">';
+$urlical .= $urlwithroot.'/public/agenda/agendaexport.php?format=ical&type=event'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : 'KEYNOTDEFINED').'</a>';
 $message .= img_picto('', 'globe').' '.$langs->trans("WebCalUrlForVCalExport", 'ical/ics', $urlical);
 $message .= '<br>';
-$urlrss = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=rss&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank">'.$urlwithroot.'/public/agenda/agendaexport.php?format=rss&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : 'KEYNOTDEFINED').'</a>';
+$urlrss = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=rss'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank">';
+$urlrss .= $urlwithroot.'/public/agenda/agendaexport.php?format=rss'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : 'KEYNOTDEFINED').'</a>';
 $message .= img_picto('', 'globe').' '.$langs->trans("WebCalUrlForVCalExport", 'rss', $urlrss);
 $message .= '<br>';
 $message .= '<br>';
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index 772ef604ab5..d21ffdb1630 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -215,7 +215,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="save">';
 
 $head = bank_admin_prepare_head(null);
-dol_fiche_head($head, 'general', $langs->trans("BankSetupModule"), -1, 'account');
+print dol_get_fiche_head($head, 'general', $langs->trans("BankSetupModule"), -1, 'account');
 
 //Show bank account order
 print load_fiche_titre($langs->trans("BankOrderShow"), '', '');
@@ -391,7 +391,7 @@ foreach ($dirmodels as $reldir) {
 								// Preview
 								print '<td class="center">';
 								if ($module->type == 'pdf') {
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
@@ -495,10 +495,10 @@ if ($conf->global->BANK_REPORT_LAST_NUM_RELEVE) {
 
 print "</tr>\n";
 print '</table>';
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center">';
-print '<input type="submit" id="save" name="save" class="button hideifnotset" value="'.$langs->trans("Save").'">';
+print '<input type="submit" id="save" name="save" class="button hideifnotset button-save" value="'.$langs->trans("Save").'">';
 print '</div>';
 
 print "</form>\n";
diff --git a/htdocs/admin/bank_extrafields.php b/htdocs/admin/bank_extrafields.php
index 312da228f50..aff2b90d897 100644
--- a/htdocs/admin/bank_extrafields.php
+++ b/htdocs/admin/bank_extrafields.php
@@ -71,19 +71,19 @@ print load_fiche_titre($langs->trans("BankSetupModule"), $linkback, 'title_setup
 
 $head = bank_admin_prepare_head(null);
 
-dol_fiche_head($head, 'attributes', $langs->trans("BankSetupModule"), -1, 'account');
+print dol_get_fiche_head($head, 'attributes', $langs->trans("BankSetupModule"), -1, 'account');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -93,9 +93,9 @@ if ($action != 'create' && $action != 'edit')
 if ($action == 'create')
 {
 	print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /*
@@ -103,10 +103,10 @@ if ($action == 'create')
  */
 if ($action == 'edit' && !empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index 529e3289a31..6ff8a988899 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -44,11 +44,11 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'setbarcodeproducton')
 {
-    $barcodenumberingmodule = GETPOST('value', 'alpha');
+	$barcodenumberingmodule = GETPOST('value', 'alpha');
 	$res = dolibarr_set_const($db, "BARCODE_PRODUCT_ADDON_NUM", $barcodenumberingmodule, 'chaine', 0, '', $conf->entity);
 	if ($barcodenumberingmodule == 'mod_barcode_product_standard' && empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK))
 	{
-	    $res = dolibarr_set_const($db, "BARCODE_STANDARD_PRODUCT_MASK", '020{000000000}', 'chaine', 0, '', $conf->entity);
+		$res = dolibarr_set_const($db, "BARCODE_STANDARD_PRODUCT_MASK", '020{000000000}', 'chaine', 0, '', $conf->entity);
 	}
 } elseif ($action == 'setbarcodeproductoff')
 {
@@ -76,45 +76,45 @@ if ($action == 'setcoder')
 	$res = dolibarr_set_const($db, "GENBARCODE_BARCODETYPE_THIRDPARTY", $coder_id, 'chaine', 0, '', $conf->entity);
 
 	if ($res > 0)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 } elseif ($action == 'updateengine')
 {
-    $sql = "SELECT rowid, coder";
-    $sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
-    $sql .= " WHERE entity = ".$conf->entity;
-    $sql .= " ORDER BY code";
+	$sql = "SELECT rowid, coder";
+	$sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
+	$sql .= " WHERE entity = ".$conf->entity;
+	$sql .= " ORDER BY code";
 
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-	    $num = $db->num_rows($resql);
-	    $i = 0;
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
 
-	    while ($i < $num)
-	    {
-	        $obj = $db->fetch_object($resql);
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
 
-	        if (GETPOST('coder'.$obj->rowid, 'alpha'))
-	        {
-	            $coder = GETPOST('coder'.$obj->rowid, 'alpha');
-	            $code_id = $obj->rowid;
+			if (GETPOST('coder'.$obj->rowid, 'alpha'))
+			{
+				$coder = GETPOST('coder'.$obj->rowid, 'alpha');
+				$code_id = $obj->rowid;
 
-	            $sqlp = "UPDATE ".MAIN_DB_PREFIX."c_barcode_type";
-	            $sqlp .= " SET coder = '".$db->escape($coder)."'";
-	            $sqlp .= " WHERE rowid = ".((int) $code_id);
-	            $sqlp .= " AND entity = ".$conf->entity;
+				$sqlp = "UPDATE ".MAIN_DB_PREFIX."c_barcode_type";
+				$sqlp .= " SET coder = '".$db->escape($coder)."'";
+				$sqlp .= " WHERE rowid = ".((int) $code_id);
+				$sqlp .= " AND entity = ".$conf->entity;
 
-	            $upsql = $db->query($sqlp);
-	            if (!$upsql) dol_print_error($db);
-	        }
+				$upsql = $db->query($sqlp);
+				if (!$upsql) dol_print_error($db);
+			}
 
-	        $i++;
-	    }
-    }
+			$i++;
+		}
+	}
 }
 
 
@@ -142,11 +142,11 @@ $dirbarcode = array_merge(array("/core/modules/barcode/doc/"), $conf->modules_pa
 
 foreach ($dirbarcode as $reldir)
 {
-    $dir = dol_buildpath($reldir);
-    $newdir = dol_osencode($dir);
+	$dir = dol_buildpath($reldir);
+	$newdir = dol_osencode($dir);
 
-    // Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php)
-    if (!is_dir($newdir)) continue;
+	// Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php)
+	if (!is_dir($newdir)) continue;
 
 	$handle = @opendir($newdir);
 	if (is_resource($handle))
@@ -190,9 +190,9 @@ print load_fiche_titre($langs->trans("BarcodeEncodeModule"), '', '');
 
 if (empty($conf->use_javascript_ajax))
 {
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" id="form_engine">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="updateengine">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" id="form_engine">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="updateengine">';
 }
 
 print '<table class="noborder centpercent">';
@@ -236,11 +236,11 @@ if ($resql)
 
 			foreach ($dirbarcode as $reldir)
 			{
-			    $dir = dol_buildpath($reldir, 0);
-			    $newdir = dol_osencode($dir);
+				$dir = dol_buildpath($reldir, 0);
+				$newdir = dol_osencode($dir);
 
-			    // Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php)
-			    if (!is_dir($newdir)) continue;
+				// Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php)
+				if (!is_dir($newdir)) continue;
 
 				$result = @include_once $newdir.$obj->coder.'.modules.php';
 				if ($result) break;
@@ -254,7 +254,7 @@ if ($resql)
 					if ($module->encodingIsSupported($obj->encoding))
 					{
 						// Build barcode on disk (not used, this is done to make debug easier)
-					    $result = $module->writeBarCode($obj->example, $obj->encoding, 'Y');
+						$result = $module->writeBarCode($obj->example, $obj->encoding, 'Y');
 						// Generate on the fly and output barcode with generator
 						$url = DOL_URL_ROOT.'/viewimage.php?modulepart=barcode&amp;generator='.urlencode($obj->coder).'&amp;code='.urlencode($obj->example).'&amp;encoding='.urlencode($obj->encoding);
 						//print $url;
@@ -282,8 +282,8 @@ print "</table>\n";
 
 if (empty($conf->use_javascript_ajax))
 {
-    print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"></div>';
-    print '</form>';
+	print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'"></div>';
+	print '</form>';
 }
 
 print "<br>";
@@ -371,48 +371,48 @@ if ($conf->product->enabled)
 		$dir = dol_buildpath($dirroot, 0);
 
 		$handle = @opendir($dir);
-	    if (is_resource($handle))
-	    {
-	    	while (($file = readdir($handle)) !== false)
-	    	{
-	    		if (preg_match('/^mod_barcode_product_.*php$/', $file))
-	    		{
-	    			$file = substr($file, 0, dol_strlen($file) - 4);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (preg_match('/^mod_barcode_product_.*php$/', $file))
+				{
+					$file = substr($file, 0, dol_strlen($file) - 4);
 
-	    		    try {
-	        			dol_include_once($dirroot.$file.'.php');
-	    			} catch (Exception $e)
-	    			{
-	    			    dol_syslog($e->getMessage(), LOG_ERR);
-	    			}
+					try {
+						dol_include_once($dirroot.$file.'.php');
+					} catch (Exception $e)
+					{
+						dol_syslog($e->getMessage(), LOG_ERR);
+					}
 
-	    			$modBarCode = new $file();
+					$modBarCode = new $file();
 
-	    			print '<tr class="oddeven">';
-	    			print '<td>'.(isset($modBarCode->name) ? $modBarCode->name : $modBarCode->nom)."</td><td>\n";
-	    			print $modBarCode->info($langs);
-	    			print '</td>';
-	    			print '<td class="nowrap">'.$modBarCode->getExample($langs)."</td>\n";
+					print '<tr class="oddeven">';
+					print '<td>'.(isset($modBarCode->name) ? $modBarCode->name : $modBarCode->nom)."</td><td>\n";
+					print $modBarCode->info($langs);
+					print '</td>';
+					print '<td class="nowrap">'.$modBarCode->getExample($langs)."</td>\n";
 
-	    			if ($conf->global->BARCODE_PRODUCT_ADDON_NUM == "$file")
-	    			{
-	    				print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setbarcodeproductoff&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
-	    				print img_picto($langs->trans("Activated"), 'switch_on');
-	    				print '</a></td>';
-	    			} else {
-	    				print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setbarcodeproducto&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
-	    				print img_picto($langs->trans("Disabled"), 'switch_off');
-	    				print '</a></td>';
-	    			}
-	    			print '<td class="center">';
-	    			$s = $modBarCode->getToolTip($langs, null, -1);
-	    			print $form->textwithpicto('', $s, 1);
-	    			print '</td>';
-	    			print "</tr>\n";
-	    		}
-	    	}
-	    	closedir($handle);
-	    }
+					if ($conf->global->BARCODE_PRODUCT_ADDON_NUM == "$file")
+					{
+						print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setbarcodeproductoff&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
+						print img_picto($langs->trans("Activated"), 'switch_on');
+						print '</a></td>';
+					} else {
+						print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setbarcodeproducto&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
+						print img_picto($langs->trans("Disabled"), 'switch_off');
+						print '</a></td>';
+					}
+					print '<td class="center">';
+					$s = $modBarCode->getToolTip($langs, null, -1);
+					print $form->textwithpicto('', $s, 1);
+					print '</td>';
+					print "</tr>\n";
+				}
+			}
+			closedir($handle);
+		}
 	}
 	print "</table>\n";
 }
diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php
index 3f331286aa2..34c3af89c53 100644
--- a/htdocs/admin/bom.php
+++ b/htdocs/admin/bom.php
@@ -181,7 +181,7 @@ print load_fiche_titre($langs->trans("BOMsSetup"), $linkback, 'title_setup');
 
 $head = bomAdminPrepareHead();
 
-dol_fiche_head($head, 'settings', $langs->trans("BOMs"), -1, 'bom');
+print dol_get_fiche_head($head, 'settings', $langs->trans("BOMs"), -1, 'bom');
 
 /*
  * BOMs Numbering model
@@ -232,8 +232,10 @@ foreach ($dirmodels as $reldir)
 						// Show example of numbering model
 						print '<td class="nowrap">';
 						$tmp = $module->getExample();
-						if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-						elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						if (preg_match('/^Error/', $tmp)) {
+							$langs->load("errors");
+							print '<div class="error">'.$langs->trans($tmp).'</div>';
+						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
 						else print $tmp;
 						print '</td>'."\n";
 
@@ -412,7 +414,7 @@ foreach ($dirmodels as $reldir)
 								print '<td class="center">';
 								if ($module->type == 'pdf')
 								{
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
diff --git a/htdocs/admin/bom_extrafields.php b/htdocs/admin/bom_extrafields.php
index 7ec50d9d7db..f2022229305 100644
--- a/htdocs/admin/bom_extrafields.php
+++ b/htdocs/admin/bom_extrafields.php
@@ -70,19 +70,19 @@ print load_fiche_titre($langs->trans("BOMsSetup"), $linkback, 'title_setup');
 
 $head = bomAdminPrepareHead();
 
-dol_fiche_head($head, 'bom_extrafields', $langs->trans("ExtraFields"), -1, 'account');
+print dol_get_fiche_head($head, 'bom_extrafields', $langs->trans("ExtraFields"), -1, 'account');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -92,9 +92,9 @@ if ($action != 'create' && $action != 'edit')
 if ($action == 'create')
 {
 	print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /*
@@ -102,10 +102,10 @@ if ($action == 'create')
  */
 if ($action == 'edit' && !empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 31723888e44..63c3350fd9d 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -31,7 +31,9 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'boxes', 'accountancy'));
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 $rowid = GETPOST('rowid', 'int');
 $action = GETPOST('action', 'aZ09');
@@ -46,39 +48,34 @@ $boxes = array();
  * Actions
  */
 
-if ($action == 'addconst')
-{
+if ($action == 'addconst') {
 	dolibarr_set_const($db, "MAIN_BOXES_MAXLINES", $_POST["MAIN_BOXES_MAXLINES"], '', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_ACTIVATE_FILECACHE", $_POST["MAIN_ACTIVATE_FILECACHE"], 'chaine', 0, '', $conf->entity);
 }
 
 if ($action == 'add') {
 	$error = 0;
+	$boxids = GETPOST('boxid', 'array');
+
 	$db->begin();
-	if (isset($_POST['boxid']) && is_array($_POST['boxid']))
-	{
-		foreach ($_POST['boxid'] as $boxid)
-		{
-			if (is_numeric($boxid['pos']) && $boxid['pos'] >= 0)	// 0=Home, 1=...
-			{
+	if (is_array($boxids)) {
+		foreach ($boxids as $boxid) {
+			if (is_numeric($boxid['pos']) && $boxid['pos'] >= 0) {	// 0=Home, 1=...
 				$pos = $boxid['pos'];
 
 				// Initialize distinct fk_user with all already existing values of fk_user (user that use a personalized view of boxes for page "pos")
 				$distinctfkuser = array();
-				if (!$error)
-				{
+				if (!$error) {
 					$sql = "SELECT fk_user";
 					$sql .= " FROM ".MAIN_DB_PREFIX."user_param";
 					$sql .= " WHERE param = 'MAIN_BOXES_".$db->escape($pos)."' AND value = '1'";
 					$sql .= " AND entity = ".$conf->entity;
 					dol_syslog("boxes.php search fk_user to activate box for", LOG_DEBUG);
 					$resql = $db->query($sql);
-					if ($resql)
-					{
+					if ($resql) {
 						$num = $db->num_rows($resql);
 						$i = 0;
-						while ($i < $num)
-						{
+						while ($i < $num) {
 							$obj = $db->fetch_object($resql);
 							$distinctfkuser[$obj->fk_user] = $obj->fk_user;
 							$i++;
@@ -91,26 +88,28 @@ if ($action == 'add') {
 
 				$distinctfkuser['0'] = '0'; // Add entry for fk_user = 0. We must use string as key and val
 
-				foreach ($distinctfkuser as $fk_user)
-				{
-					if (!$error && $fk_user != '')
-					{
+				foreach ($distinctfkuser as $fk_user) {
+					if (!$error && $fk_user != '') {
 						$arrayofexistingboxid = array();
 						$nbboxonleft = $nbboxonright = 0;
 						$sql = "SELECT box_id, box_order FROM ".MAIN_DB_PREFIX."boxes";
 						$sql .= " WHERE position = ".$pos." AND fk_user = ".$fk_user." AND entity = ".$conf->entity;
 						dol_syslog("boxes.php activate box", LOG_DEBUG);
 						$resql = $db->query($sql);
-						if ($resql)
-						{
-							while ($obj = $db->fetch_object($resql))
-							{
+						if ($resql) {
+							while ($obj = $db->fetch_object($resql)) {
 								$boxorder = $obj->box_order;
-								if (preg_match('/A/', $boxorder)) $nbboxonleft++;
-								if (preg_match('/B/', $boxorder)) $nbboxonright++;
+								if (preg_match('/A/', $boxorder)) {
+									$nbboxonleft++;
+								}
+								if (preg_match('/B/', $boxorder)) {
+									$nbboxonright++;
+								}
 								$arrayofexistingboxid[$obj->box_id] = 1;
 							}
-						} else dol_print_error($db);
+						} else {
+							dol_print_error($db);
+						}
 
 						if (empty($arrayofexistingboxid[$boxid['value']])) {
 							$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (";
@@ -121,8 +120,7 @@ if ($action == 'add') {
 
 							dol_syslog("boxes.php activate box", LOG_DEBUG);
 							$resql = $db->query($sql);
-							if (!$resql)
-							{
+							if (!$resql) {
 								setEventMessages($db->lasterror(), null, 'errors');
 								$error++;
 							}
@@ -134,8 +132,7 @@ if ($action == 'add') {
 			}
 		}
 	}
-	if (!$error)
-	{
+	if (!$error) {
 		$db->commit();
 		$action = '';
 	} else {
@@ -143,15 +140,13 @@ if ($action == 'add') {
 	}
 }
 
-if ($action == 'delete')
-{
+if ($action == 'delete') {
 	$sql = "SELECT box_id FROM ".MAIN_DB_PREFIX."boxes";
-	$sql .= " WHERE rowid=".$rowid;
+	$sql .= " WHERE rowid=".((int) $rowid);
 
 	$resql = $db->query($sql);
 	$obj = $db->fetch_object($resql);
-	if (!empty($obj->box_id))
-	{
+	if (!empty($obj->box_id)) {
 		$db->begin();
 
 		// Remove all personalized setup when a box is activated or disabled (why removing all ? We removed only removed boxes)
@@ -169,8 +164,7 @@ if ($action == 'delete')
 	}
 }
 
-if ($action == 'switch')
-{
+if ($action == 'switch') {
 	// We switch values of field box_order for the 2 lines of table boxes
 	$db->begin();
 
@@ -182,12 +176,10 @@ if ($action == 'switch')
 
 	$resultupdatefrom = 0;
 	$resultupdateto = 0;
-	if (is_object($objfrom) && is_object($objto))
-	{
+	if (is_object($objfrom) && is_object($objto)) {
 		$newfirst = $objto->box_order;
 		$newsecond = $objfrom->box_order;
-		if ($newfirst == $newsecond)
-		{
+		if ($newfirst == $newsecond) {
 			 $newsecondchar = preg_replace('/[0-9]+/', '', $newsecond);
 			 $newsecondnum = preg_replace('/[a-zA-Z]+/', '', $newsecond);
 			 $newsecond = sprintf("%s%02d", $newsecondchar ? $newsecondchar : 'A', $newsecondnum + 1);
@@ -195,16 +187,19 @@ if ($action == 'switch')
 		$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order='".$db->escape($newfirst)."' WHERE rowid=".((int) $objfrom->rowid);
 		dol_syslog($sql);
 		$resultupdatefrom = $db->query($sql);
-		if (!$resultupdatefrom) { dol_print_error($db); }
+		if (!$resultupdatefrom) {
+			dol_print_error($db);
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order='".$db->escape($newsecond)."' WHERE rowid=".((int) $objto->rowid);
 		dol_syslog($sql);
 		$resultupdateto = $db->query($sql);
-		if (!$resultupdateto) { dol_print_error($db); }
+		if (!$resultupdateto) {
+			dol_print_error($db);
+		}
 	}
 
-	if ($resultupdatefrom && $resultupdateto)
-	{
+	if ($resultupdatefrom && $resultupdateto) {
 		$db->commit();
 	} else {
 		$db->rollback();
@@ -241,33 +236,31 @@ $sql .= " ORDER by b.position, b.box_order";
 
 dol_syslog("Search available boxes", LOG_DEBUG);
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 
 	// Check record to know if we must recalculate sort order
 	$i = 0;
 	$decalage = 0;
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$obj = $db->fetch_object($resql);
 		$boxes[$obj->position][$obj->box_id] = 1;
 		$i++;
 
 		array_push($actives, $obj->box_id);
 
-		if ($obj->box_order == '' || $obj->box_order == '0' || $decalage) $decalage++;
+		if ($obj->box_order == '' || $obj->box_order == '0' || $decalage) {
+			$decalage++;
+		}
 		// We renumber the order of the boxes if one of them is in ''
 		// This occurs just after an insert.
-		if ($decalage)
-		{
+		if ($decalage) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order='".$db->escape($decalage)."' WHERE rowid=".$obj->rowid;
 			$db->query($sql);
 		}
 	}
 
-	if ($decalage)
-	{
+	if ($decalage) {
 		// If we have renumbered, we correct the field box_order
 		// This occurs just after an insert.
 		$sql = "SELECT box_order";
@@ -277,32 +270,24 @@ if ($resql)
 
 		dol_syslog("Execute requests to renumber box order", LOG_DEBUG);
 		$result = $db->query($sql);
-		if ($result)
-		{
-			while ($record = $db->fetch_array($result))
-			{
-				if (dol_strlen($record['box_order']) == 1)
-				{
-					if (preg_match("/[13579]{1}/", substr($record['box_order'], -1)))
-					{
+		if ($result) {
+			while ($record = $db->fetch_array($result)) {
+				if (dol_strlen($record['box_order']) == 1) {
+					if (preg_match("/[13579]{1}/", substr($record['box_order'], -1))) {
 						$box_order = "A0".$record['box_order'];
 						$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$db->escape($box_order)."' WHERE entity = ".$conf->entity." AND box_order = '".$db->escape($record['box_order'])."'";
 						$resql = $db->query($sql);
-					} elseif (preg_match("/[02468]{1}/", substr($record['box_order'], -1)))
-					{
+					} elseif (preg_match("/[02468]{1}/", substr($record['box_order'], -1))) {
 						$box_order = "B0".$record['box_order'];
 						$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$db->escape($box_order)."' WHERE entity = ".$conf->entity." AND box_order = '".$db->escape($record['box_order'])."'";
 						$resql = $db->query($sql);
 					}
-				} elseif (dol_strlen($record['box_order']) == 2)
-				{
-					if (preg_match("/[13579]{1}/", substr($record['box_order'], -1)))
-					{
+				} elseif (dol_strlen($record['box_order']) == 2) {
+					if (preg_match("/[13579]{1}/", substr($record['box_order'], -1))) {
 						$box_order = "A".$record['box_order'];
 						$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$db->escape($box_order)."' WHERE entity = ".$conf->entity." AND box_order = '".$db->escape($record['box_order'])."'";
 						$resql = $db->query($sql);
-					} elseif (preg_match("/[02468]{1}/", substr($record['box_order'], -1)))
-					{
+					} elseif (preg_match("/[02468]{1}/", substr($record['box_order'], -1))) {
 						$box_order = "B".$record['box_order'];
 						$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$db->escape($box_order)."' WHERE entity = ".$conf->entity." AND box_order = '".$db->escape($record['box_order'])."'";
 						$resql = $db->query($sql);
@@ -337,10 +322,8 @@ print '<td>'.$langs->trans("SourceFile").'</td>';
 print '<td width="160" class="center">'.$langs->trans("ActivateOn").'</td>';
 print "</tr>\n";
 
-foreach ($boxtoadd as $box)
-{
-	if (preg_match('/^([^@]+)@([^@]+)$/i', $box->boximg))
-	{
+foreach ($boxtoadd as $box) {
+	if (preg_match('/^([^@]+)@([^@]+)$/i', $box->boximg)) {
 		$logo = $box->boximg;
 	} else {
 		$logo = preg_replace("/^object_/i", "", $box->boximg);
@@ -349,14 +332,17 @@ foreach ($boxtoadd as $box)
 	print "\n".'<!-- Box '.$box->boxcode.' -->'."\n";
 	print '<tr class="oddeven">'."\n";
 	print '<td>'.img_object("", $logo, 'height="14px"').' '.$langs->transnoentitiesnoconv($box->boxlabel);
-	if (!empty($box->class) && preg_match('/graph_/', $box->class)) print ' ('.$langs->trans("Graph").')';
+	if (!empty($box->class) && preg_match('/graph_/', $box->class)) {
+		print ' ('.$langs->trans("Graph").')';
+	}
 	print '</td>'."\n";
 	print '<td>';
-	if ($box->note == '(WarningUsingThisBoxSlowDown)')
-	{
+	if ($box->note == '(WarningUsingThisBoxSlowDown)') {
 		$langs->load("errors");
 		print $langs->trans("WarningUsingThisBoxSlowDown");
-	} else print ($box->note ? $box->note : '&nbsp;');
+	} else {
+		print ($box->note ? $box->note : '&nbsp;');
+	}
 	print '</td>'."\n";
 	print '<td>'.$box->sourcefile.'</td>'."\n";
 
@@ -368,8 +354,7 @@ foreach ($boxtoadd as $box)
 
 	print '</tr>'."\n";
 }
-if (!count($boxtoadd) && count($boxactivated))
-{
+if (!count($boxtoadd) && count($boxactivated)) {
 	print '<tr><td class="opacitymedium" colspan="4">'.$langs->trans("AllWidgetsWereEnabled").'</td></tr>';
 }
 print '</table>'."\n";
@@ -399,10 +384,8 @@ print '</tr>'."\n";
 
 $box_order = 1;
 $foundrupture = 1;
-foreach ($boxactivated as $key => $box)
-{
-	if (preg_match('/^([^@]+)@([^@]+)$/i', $box->boximg))
-	{
+foreach ($boxactivated as $key => $box) {
+	if (preg_match('/^([^@]+)@([^@]+)$/i', $box->boximg)) {
 		$logo = $box->boximg;
 	} else {
 		$logo = preg_replace("/^object_/i", "", $box->boximg);
@@ -411,14 +394,17 @@ foreach ($boxactivated as $key => $box)
 	print "\n".'<!-- Box '.$box->boxcode.' -->'."\n";
 	print '<tr class="oddeven">';
 	print '<td>'.img_object("", $logo, 'height="14px"').' '.$langs->transnoentitiesnoconv($box->boxlabel);
-	if (!empty($box->class) && preg_match('/graph_/', $box->class)) print ' ('.$langs->trans("Graph").')';
+	if (!empty($box->class) && preg_match('/graph_/', $box->class)) {
+		print ' ('.$langs->trans("Graph").')';
+	}
 	print '</td>';
 	print '<td>';
-	if ($box->note == '(WarningUsingThisBoxSlowDown)')
-	{
+	if ($box->note == '(WarningUsingThisBoxSlowDown)') {
 		$langs->load("errors");
 		print img_warning('', 0).' '.$langs->trans("WarningUsingThisBoxSlowDown");
-	} else print ($box->note ? $box->note : '&nbsp;');
+	} else {
+		print ($box->note ? $box->note : '&nbsp;');
+	}
 	print '</td>';
 	print '<td class="center">'.(empty($pos_name[$box->position]) ? '' : $langs->trans($pos_name[$box->position])).'</td>';
 	$hasnext = ($key < (count($boxactivated) - 1));
@@ -447,6 +433,7 @@ print load_fiche_titre($langs->trans("Other"), '', '');
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="addconst">';
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
@@ -472,9 +459,10 @@ if ($conf->global->MAIN_FEATURES_LEVEL == 2 || !empty($conf->global->MAIN_ACTIVA
 }
 
 print '</table>';
+print '</div>';
 
 print '<br>';
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'" name="Button"></div>';
+print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'" name="Button"></div>';
 print '<br>';
 
 print '</form>';
diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index 6de752518c0..8c2acb5dc8b 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -99,7 +99,7 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_valu
 print load_fiche_titre($langs->trans("BankSetupModule"), $linkback, 'title_setup');
 
 $head = bank_admin_prepare_head(null);
-dol_fiche_head($head, 'checkreceipts', $langs->trans("BankSetupModule"), -1, 'account');
+print dol_get_fiche_head($head, 'checkreceipts', $langs->trans("BankSetupModule"), -1, 'account');
 
 /*
  *  Numbering module
@@ -168,8 +168,10 @@ foreach ($dirmodels as $reldir)
 							// Show example of numbering module
 							print '<td class="nowrap">';
 							$tmp = $module->getExample();
-							if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-							elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+							if (preg_match('/^Error/', $tmp)) {
+								$langs->load("errors");
+								print '<div class="error">'.$langs->trans($tmp).'</div>';
+							} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
 							else print $tmp;
 							print '</td>'."\n";
 
@@ -266,7 +268,7 @@ print "<br>";
 
 print '</table>'."\n";
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '</form>';
 
diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 5fa7b78ca8b..566d6b845e8 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -33,7 +33,7 @@ if (!$user->admin) accessforbidden();
 
 $action = GETPOST('action', 'aZ09');
 
-if (! in_array('clicktodial', $conf->modules)) {
+if (!in_array('clicktodial', $conf->modules)) {
 	accessforbidden($langs->trans("WarningModuleNotActive", $langs->transnoentitiesnoconv("Module58Name")));
 }
 
@@ -44,15 +44,15 @@ if (! in_array('clicktodial', $conf->modules)) {
 
 if ($action == 'setvalue' && $user->admin)
 {
-    $result1 = dolibarr_set_const($db, "CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS", GETPOST("CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS"), 'chaine', 0, '', $conf->entity);
-    $result2 = dolibarr_set_const($db, "CLICKTODIAL_URL", GETPOST("CLICKTODIAL_URL"), 'chaine', 0, '', $conf->entity);
+	$result1 = dolibarr_set_const($db, "CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS", GETPOST("CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS"), 'chaine', 0, '', $conf->entity);
+	$result2 = dolibarr_set_const($db, "CLICKTODIAL_URL", GETPOST("CLICKTODIAL_URL"), 'chaine', 0, '', $conf->entity);
 
-    if ($result1 >= 0 && $result2 >= 0)
-    {
+	if ($result1 >= 0 && $result2 >= 0)
+	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 
@@ -125,7 +125,7 @@ if (!empty($conf->global->CLICKTODIAL_URL))
 	if (GETPOST('phonefortest')) $phonefortest = GETPOST('phonefortest');
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print $langs->trans("LinkToTestClickToDial", $user->login).' : ';
 	print '<input class="flat" type="text" name="phonefortest" value="'.dol_escape_htmltag($phonefortest).'">';
 	print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("RefreshPhoneLink")).'">';
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index b920d9e6f9e..25a220e8e2d 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -246,7 +246,7 @@ print load_fiche_titre($langs->trans("OrdersSetup"), $linkback, 'title_setup');
 
 $head = order_admin_prepare_head();
 
-dol_fiche_head($head, 'general', $langs->trans("Orders"), -1, 'order');
+print dol_get_fiche_head($head, 'general', $langs->trans("Orders"), -1, 'order');
 
 /*
  * Orders Numbering model
@@ -297,8 +297,10 @@ foreach ($dirmodels as $reldir)
 						// Show example of numbering model
 						print '<td class="nowrap">';
 						$tmp = $module->getExample();
-						if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-						elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						if (preg_match('/^Error/', $tmp)) {
+							$langs->load("errors");
+							print '<div class="error">'.$langs->trans($tmp).'</div>';
+						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
 						else print $tmp;
 						print '</td>'."\n";
 
@@ -482,7 +484,7 @@ foreach ($dirmodels as $reldir)
 								print '<td class="center">';
 								if ($module->type == 'pdf')
 								{
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
diff --git a/htdocs/admin/commande_fournisseur_dispatch_extrafields.php b/htdocs/admin/commande_fournisseur_dispatch_extrafields.php
index e1ec33c02d4..98a98a7ec2c 100644
--- a/htdocs/admin/commande_fournisseur_dispatch_extrafields.php
+++ b/htdocs/admin/commande_fournisseur_dispatch_extrafields.php
@@ -79,11 +79,11 @@ print "<br>\n";
 
 $head = reception_admin_prepare_head();
 
-dol_fiche_head($head, 'attributeslines_reception', $langs->trans("Receptions"), -1, 'sending');
+print dol_get_fiche_head($head, 'attributeslines_reception', $langs->trans("Receptions"), -1, 'sending');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 724a978996b..b82f0fcd765 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -88,9 +88,9 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 		dolibarr_del_const($db, "MAIN_INFO_SOCIETE_STATE", $conf->entity);
 	}
 
-    $db->begin();
+	$db->begin();
 
-    dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOM", GETPOST("nom", 'nohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOM", GETPOST("nom", 'nohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ADDRESS", GETPOST("MAIN_INFO_SOCIETE_ADDRESS", 'nohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TOWN", GETPOST("MAIN_INFO_SOCIETE_TOWN", 'nohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ZIP", GETPOST("MAIN_INFO_SOCIETE_ZIP", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
@@ -141,8 +141,8 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 						// Create thumbs of logo (Note that PDF use original file and not thumbs)
 						if ($isimage > 0)
 						{
-						    // Create thumbs
-						    //$object->addThumbs($newfile);    // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retreive value with get...
+							// Create thumbs
+							//$object->addThumbs($newfile);    // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retrieve value with get...
 
 							// Create small thumb, Used on logon for example
 							$imgThumbSmall = vignette($dirforimage.$original_file, $maxwidthsmall, $maxheightsmall, '_small', $quality);
@@ -178,13 +178,6 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 		}
 	}
 
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_FACEBOOK_URL", GETPOST("facebookurl", 'alpha'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TWITTER_URL", GETPOST("twitterurl", 'alpha'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LINKEDIN_URL", GETPOST("linkedinurl", 'alpha'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_INSTAGRAM_URL", GETPOST("instagramurl", 'alpha'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_YOUTUBE_URL", GETPOST("youtubeurl", 'alpha'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_GITHUB_URL", GETPOST("githuburl", 'alpha'), 'chaine', 0, '', $conf->entity);
-
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_MANAGERS", GETPOST("MAIN_INFO_SOCIETE_MANAGERS", 'nohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_GDPR", GETPOST("MAIN_INFO_GDPR", 'nohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_CAPITAL", GETPOST("capital", 'nohtml'), 'chaine', 0, '', $conf->entity);
@@ -269,8 +262,8 @@ if ($action == 'addthumb' || $action == 'addthumbsquarred')  // Regenerate thumb
 
 			$reg = array();
 
-		    // Create thumbs
-			//$object->addThumbs($newfile);    // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retreive value with get...
+			// Create thumbs
+			//$object->addThumbs($newfile);    // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retrieve value with get...
 
 			// Create small thumb. Used on logon for example
 			$imgThumbSmall = vignette($conf->mycompany->dir_output.'/logos/'.$_GET["file"], $maxwidthsmall, $maxheightsmall, '_small', $quality);
@@ -373,7 +366,7 @@ print load_fiche_titre($langs->trans("CompanyFoundation"), '', 'title_setup');
 
 $head = company_admin_prepare_head();
 
-dol_fiche_head($head, 'company', $langs->trans("Company"), -1, 'company');
+print dol_get_fiche_head($head, 'company', $langs->trans("Company"), -1, 'company');
 
 print '<span class="opacitymedium">'.$langs->trans("CompanyFundationDesc", $langs->transnoentities("Save"))."</span><br>\n";
 print "<br>\n";
@@ -400,17 +393,18 @@ print '<tr class="liste_titre"><th class="titlefield wordbreak">'.$langs->trans(
 
 // Name
 print '<tr class="oddeven"><td class="fieldrequired wordbreak"><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
-print '<input name="nom" id="name" class="minwidth200" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM ? $conf->global->MAIN_INFO_SOCIETE_NOM : GETPOST("nom", 'nohtml')).'"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"').'></td></tr>'."\n";
+print '<input name="nom" id="name" class="minwidth200" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM ? $conf->global->MAIN_INFO_SOCIETE_NOM : GETPOST("nom", 'nohtml')).'"'.(empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? ' autofocus="autofocus"' : '').'></td></tr>'."\n";
 
 // Address
 print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_ADDRESS">'.$langs->trans("CompanyAddress").'</label></td><td>';
 print '<textarea name="MAIN_INFO_SOCIETE_ADDRESS" id="MAIN_INFO_SOCIETE_ADDRESS" class="quatrevingtpercent" rows="'.ROWS_3.'">'.($conf->global->MAIN_INFO_SOCIETE_ADDRESS ? $conf->global->MAIN_INFO_SOCIETE_ADDRESS : GETPOST("MAIN_INFO_SOCIETE_ADDRESS", 'nohtml')).'</textarea></td></tr>'."\n";
 
+// Zip
 print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_ZIP">'.$langs->trans("CompanyZip").'</label></td><td>';
-print '<input class="minwidth100" name="MAIN_INFO_SOCIETE_ZIP" id="MAIN_INFO_SOCIETE_ZIP" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ZIP ? $conf->global->MAIN_INFO_SOCIETE_ZIP : GETPOST("MAIN_INFO_SOCIETE_ZIP", 'alpha')).'"></td></tr>'."\n";
+print '<input class="width100" name="MAIN_INFO_SOCIETE_ZIP" id="MAIN_INFO_SOCIETE_ZIP" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ZIP ? $conf->global->MAIN_INFO_SOCIETE_ZIP : GETPOST("MAIN_INFO_SOCIETE_ZIP", 'alpha')).'"></td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_TOWN">'.$langs->trans("CompanyTown").'</label></td><td>';
-print '<input name="MAIN_INFO_SOCIETE_TOWN" class="minwidth100" id="MAIN_INFO_SOCIETE_TOWN" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TOWN ? $conf->global->MAIN_INFO_SOCIETE_TOWN : GETPOST("MAIN_INFO_SOCIETE_TOWN", 'nohtml')).'"></td></tr>'."\n";
+print '<input name="MAIN_INFO_SOCIETE_TOWN" class="minwidth200" id="MAIN_INFO_SOCIETE_TOWN" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TOWN ? $conf->global->MAIN_INFO_SOCIETE_TOWN : GETPOST("MAIN_INFO_SOCIETE_TOWN", 'nohtml')).'"></td></tr>'."\n";
 
 // Country
 print '<tr class="oddeven"><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
@@ -472,22 +466,30 @@ print '<tr class="oddeven"><td><label for="logo">'.$form->textwithpicto($langs->
 print '<div class="centpertent nobordernopadding valignmiddle "><div class="inline-block marginrightonly">';
 print '<input type="file" class="flat minwidth200" name="logo" id="logo" accept="image/*">';
 print '</div>';
-if (!empty($mysoc->logo_mini)) {
-	if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) {
+if (!empty($mysoc->logo_small)) {
+	if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
 		print '<div class="inline-block valignmiddle">';
-		print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini).'">';
+		print '<img style="max-height: 80px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small).'">';
 		print '</div>';
+	} elseif (!empty($mysoc->logo)) {
+	    if (!file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) {
+	        $imgThumbMini = vignette($conf->mycompany->dir_output.'/logos/'.$mysoc->logo, $maxwidthmini, $maxheightmini, '_mini', $quality);
+	    }
+	    $imgThumbSmall = vignette($conf->mycompany->dir_output.'/logos/'.$mysoc->logo, $maxwidthmini, $maxheightmini, '_small', $quality);
+	    print '<div class="inline-block valignmiddle">';
+	    print '<img style="max-height: 80px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.basename($imgThumbSmall)).'">';
+	    print '</div>';
 	}
 	print '<div class="inline-block valignmiddle marginrightonly"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogo">'.img_delete($langs->trans("Delete"), '', 'marginleftonly').'</a></div>';
 } elseif (!empty($mysoc->logo)) {
 	if (file_exists($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
 		print '<div class="inline-block valignmiddle">';
-		print '<img style="max-height: 60px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo).'">';
+		print '<img style="max-height: 80px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo).'">';
 		print '</div>';
 		print '<div class="inline-block valignmiddle marginrightonly"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogo">'.img_delete($langs->trans("Delete"), '', 'marginleftonly').'</a></div>';
 	} else {
 		print '<div class="inline-block valignmiddle">';
-		print '<img height="60" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
+		print '<img height="80" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
 		print '</div>';
 	}
 }
@@ -499,23 +501,31 @@ print '<tr class="oddeven"><td><label for="logo_squarred">'.$form->textwithpicto
 print '<div class="centpertent nobordernopadding valignmiddle"><div class="inline-block marginrightonly">';
 print '<input type="file" class="flat minwidth200" name="logo_squarred" id="logo_squarred" accept="image/*">';
 print '</div>';
-if (!empty($mysoc->logo_squarred_mini)) {
-	if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini)) {
+if (!empty($mysoc->logo_squarred_small)) {
+	if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_small)) {
 		print '<div class="inline-block valignmiddle marginrightonly">';
-		print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini).'">';
+		print '<img style="max-height: 80px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_small).'">';
 		print '</div>';
+	} elseif (!empty($mysoc->logo_squarred)) {
+	    if (!file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini)) {
+	        $imgThumbMini = vignette($conf->mycompany->dir_output.'/logos/'.$mysoc->logo_squarred, $maxwidthmini, $maxheightmini, '_mini', $quality);
+	    }
+	    $imgThumbSmall = vignette($conf->mycompany->dir_output.'/logos/'.$mysoc->logo_squarred, $maxwidthmini, $maxheightmini, '_small', $quality);
+	    print '<div class="inline-block valignmiddle">';
+	    print '<img style="max-height: 80px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.basename($imgThumbSmall)).'">';
+	    print '</div>';
 	}
 	print '<div class="inline-block valignmiddle marginrightonly"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogosquarred">'.img_delete($langs->trans("Delete"), '', 'marginleftonly').'</a></div>';
 } elseif (!empty($mysoc->logo_squarred)) {
 	if (file_exists($conf->mycompany->dir_output.'/logos/'.$mysoc->logo_squarred)) {
 		print '<div class="inline-block valignmiddle">';
-		print '<img style="max-height: 60px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo_squarred).'">';
+		print '<img style="max-height: 80px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo_squarred).'">';
 		print '</div>';
 		print '<div class="inline-block valignmiddle marginrightonly"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogosquarred">'.img_delete($langs->trans("Delete"), '', 'marginleftonly').'</a></div>';
 	}
 	else {
 		print '<div class="inline-block valignmiddle">';
-		print '<img height="60" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
+		print '<img height="80" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
 		print '</div>';
 	}
 }
@@ -529,25 +539,6 @@ print '</td></tr>';
 
 print '</table>';
 
-// Social networks
-print '<br>';
-print '<table class="noborder centpercent editmode">';
-print '<tr class="liste_titre">';
-print '<td class="titlefield">'.$langs->trans("SocialNetworksInformation").'</td><td>'.$langs->trans("Value").'</td>';
-print "</tr>\n";
-
-$listofnetworks = array('facebook'=>'facebook', 'twitter'=>'twitter', 'linkedin'=>'linkedin', 'instagram'=>'instagram', 'youtube'=>'youtube', 'github'=>'github');
-foreach ($listofnetworks as $networkkey => $networkicon) {
-	print '<tr class="oddeven"><td>';
-	print '<label for="'.$networkkey.'url">'.$langs->trans("SocialNetworks".ucfirst($networkkey)."URL").'</label></td><td>';
-	$networkconst = 'MAIN_INFO_SOCIETE_'.strtoupper($networkkey).'_URL';
-	print '<span class="fa paddingright fa-'.($networkicon ? $networkicon : 'link').'"></span>';
-	print '<input name="'.$networkkey.'url" id="'.$networkkey.'url" class="minwidth300" value="'.dol_escape_htmltag($conf->global->$networkconst).'"></td></tr>';
-	print '</td></tr>'."\n";
-}
-
-print "</table>";
-
 print '<br>';
 
 // IDs of the company (country-specific)
@@ -558,13 +549,13 @@ $langs->load("companies");
 
 // Managing Director(s)
 print '<tr class="oddeven"><td><label for="director">'.$langs->trans("ManagingDirectors").'</label></td><td>';
-print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="director" class="minwidth500" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MANAGERS).'"></td></tr>';
+print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="directors" class="minwidth200" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MANAGERS).'"></td></tr>';
 
 // GDPR contact
 print '<tr class="oddeven"><td>';
 print $form->textwithpicto($langs->trans("GDPRContact"), $langs->trans("GDPRContactDesc"));
 print '</td><td>';
-print '<input name="MAIN_INFO_GDPR" id="director" class="minwidth500" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_GDPR).'"></td></tr>';
+print '<input name="MAIN_INFO_GDPR" id="infodirector" class="minwidth500" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_GDPR).'"></td></tr>';
 
 // Capital
 print '<tr class="oddeven"><td><label for="capital">'.$langs->trans("Capital").'</label></td><td>';
@@ -694,7 +685,7 @@ print '<td class="right">&nbsp;</td>';
 print "</tr>\n";
 
 // Main tax
-print "<tr class=\"oddeven\"><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"use_vat\" value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION) ? "" : " checked")."> ".$langs->trans("VATIsUsed")."</label></td>";
+print '<tr class="oddeven"><td width="140"><label><input type="radio" name="optiontva" id="use_vat" value="1"'.(empty($conf->global->FACTURE_TVAOPTION) ? "" : " checked")."> ".$langs->trans("VATIsUsed")."</label></td>";
 print '<td colspan="2">';
 $tooltiphelp = '';
 if ($mysoc->country_code == 'FR') $tooltiphelp = '<i>'.$langs->trans("Example").': '.$langs->trans("VATIsUsedExampleFR")."</i>";
@@ -702,7 +693,7 @@ print "<label for=\"use_vat\">".$form->textwithpicto($langs->trans("VATIsUsedDes
 print "</td></tr>\n";
 
 
-print "<tr class=\"oddeven\"><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"no_vat\" value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION) ? " checked" : "")."> ".$langs->trans("VATIsNotUsed")."</label></td>";
+print '<tr class="oddeven"><td width="140"><label><input type="radio" name="optiontva" id="no_vat" value="0"'.(empty($conf->global->FACTURE_TVAOPTION) ? " checked" : "")."> ".$langs->trans("VATIsNotUsed")."</label></td>";
 print '<td colspan="2">';
 $tooltiphelp = '';
 if ($mysoc->country_code == 'FR') $tooltiphelp = "<i>".$langs->trans("Example").': '.$langs->trans("VATIsNotUsedExampleFR")."</i>\n";
@@ -722,12 +713,12 @@ print "</tr>\n";
 if ($mysoc->useLocalTax(1))
 {
 	// Note: When option is not set, it must not appears as set on on, because there is no default value for this option
-	print "<tr class=\"oddeven\"><td><input type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on") ? " checked" : "")."> ".$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code)."</td>";
+	print '<tr class="oddeven"><td><input type="radio" name="optionlocaltax1" id="lt1" value="localtax1on"'.(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on") ? " checked" : "")."> ".$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code)."</td>";
 	print '<td colspan="2">';
 	print '<div class="nobordernopadding">';
 	$tooltiphelp = $langs->transcountry("LocalTax1IsUsedExample", $mysoc->country_code);
 	$tooltiphelp = ($tooltiphelp != "LocalTax1IsUsedExample" ? "<i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsUsedExample", $mysoc->country_code)."</i>\n" : "");
-	print "<label for=\"lt1\">".$form->textwithpicto($langs->transcountry("LocalTax1IsUsedDesc", $mysoc->country_code), $tooltiphelp)."</label>";
+	print '<label for="lt1">'.$form->textwithpicto($langs->transcountry("LocalTax1IsUsedDesc", $mysoc->country_code), $tooltiphelp)."</label>";
 	if (!isOnlyOneLocalTax(1))
 	{
 		print '<br><label for="lt1">'.$langs->trans("LTRate").'</label>: ';
@@ -741,7 +732,7 @@ if ($mysoc->useLocalTax(1))
 	print "</div>";
 	print "</td></tr>\n";
 
-	print "<tr class=\"oddeven\"><td><input type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off") ? " checked" : "")."> ".$langs->transcountry("LocalTax1IsNotUsed", $mysoc->country_code)."</td>";
+	print '<tr class="oddeven"><td><input type="radio" name="optionlocaltax1" id="nolt1" value="localtax1off"'.((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off") ? " checked" : "")."> ".$langs->transcountry("LocalTax1IsNotUsed", $mysoc->country_code)."</td>";
 	print '<td colspan="2">';
 	$tooltiphelp = $langs->transcountry("LocalTax1IsNotUsedExample", $mysoc->country_code);
 	$tooltiphelp = ($tooltiphelp != "LocalTax1IsNotUsedExample" ? "<i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsNotUsedExample", $mysoc->country_code)."</i>\n" : "");
@@ -750,9 +741,9 @@ if ($mysoc->useLocalTax(1))
 } else {
 	if (empty($mysoc->country_code))
 	{
-		print '<tr class="oddeven nohover"><td class="opacitymedium">'.$countrynotdefined.'</td><td></td><td></td></tr>';
+		print '<tr class="oddeven nohover"><td class="">'.$countrynotdefined.'</td><td></td><td></td></tr>';
 	} else {
-		print '<tr class="oddeven nohover"><td class="opacitymedium" colspan="3">'.$langs->trans("NoLocalTaxXForThisCountry", $langs->transnoentitiesnoconv("Setup"), $langs->transnoentitiesnoconv("Dictionaries"), $langs->transnoentitiesnoconv("DictionaryVAT"), $langs->transnoentitiesnoconv("LocalTax1Management")).'</td></tr>';
+		print '<tr class="oddeven nohover"><td class="" colspan="3">'.$langs->trans("NoLocalTaxXForThisCountry", $langs->transnoentitiesnoconv("Setup"), $langs->transnoentitiesnoconv("Dictionaries"), $langs->transnoentitiesnoconv("DictionaryVAT"), $langs->transnoentitiesnoconv("LocalTax1Management")).'</td></tr>';
 	}
 }
 
@@ -769,23 +760,23 @@ print "</tr>\n";
 if ($mysoc->useLocalTax(2))
 {
 	// Note: When option is not set, it must not appears as set on on, because there is no default value for this option
-	print "<tr class=\"oddeven\"><td><input type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on") ? " checked" : "")."> ".$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code)."</td>";
+	print '<tr class="oddeven"><td><input type="radio" name="optionlocaltax2" id="lt2" value="localtax2on"'.(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on") ? " checked" : "")."> ".$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code)."</td>";
 	print '<td colspan="2">';
 	print '<div class="nobordernopadding">';
-	print "<label for=\"lt2\">".$langs->transcountry("LocalTax2IsUsedDesc", $mysoc->country_code)."</label>";
+	print '<label for="lt2">'.$langs->transcountry("LocalTax2IsUsedDesc", $mysoc->country_code)."</label>";
 	$tooltiphelp = $langs->transcountry("LocalTax2IsUsedExample", $mysoc->country_code);
 	$tooltiphelp = ($tooltiphelp != "LocalTax2IsUsedExample" ? "<i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsUsedExample", $mysoc->country_code)."</i>\n" : "");
 	if (!isOnlyOneLocalTax(2))
 	{
-	    print '<br><label for="lt2">'.$langs->trans("LTRate").'</label>: ';
-	    $formcompany->select_localtax(2, $conf->global->MAIN_INFO_VALUE_LOCALTAX2, "lt2");
+		print '<br><label for="lt2">'.$langs->trans("LTRate").'</label>: ';
+		$formcompany->select_localtax(2, $conf->global->MAIN_INFO_VALUE_LOCALTAX2, "lt2");
 	}
 	print '<br><label for="clt2">'.$langs->trans("CalcLocaltax").'</label>: ';
 	print $form->selectarray("clt2", $opcions, $conf->global->MAIN_INFO_LOCALTAX_CALC2);
 	print "</div>";
 	print "</td></tr>\n";
 
-	print "<tr class=\"oddeven\"><td><input type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off") ? " checked" : "")."> ".$langs->transcountry("LocalTax2IsNotUsed", $mysoc->country_code)."</td>";
+	print '<tr class="oddeven"><td><input type="radio" name="optionlocaltax2" id="nolt2" value="localtax2off"'.((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off") ? " checked" : "")."> ".$langs->transcountry("LocalTax2IsNotUsed", $mysoc->country_code)."</td>";
 	print '<td colspan="2">';
 	print "<div>";
 	$tooltiphelp = $langs->transcountry("LocalTax2IsNotUsedExample", $mysoc->country_code);
@@ -796,9 +787,9 @@ if ($mysoc->useLocalTax(2))
 } else {
 	if (empty($mysoc->country_code))
 	{
-		print '<tr class="oddeven nohover"><td class="opacitymedium">'.$countrynotdefined.'</td><td></td><td></td></tr>';
+		print '<tr class="oddeven nohover"><td class="">'.$countrynotdefined.'</td><td></td><td></td></tr>';
 	} else {
-		print '<tr class="oddeven nohover"><td class="opacitymedium" colspan="3">'.$langs->trans("NoLocalTaxXForThisCountry", $langs->transnoentitiesnoconv("Setup"), $langs->transnoentitiesnoconv("Dictionaries"), $langs->transnoentitiesnoconv("DictionaryVAT"), $langs->transnoentitiesnoconv("LocalTax2Management")).'</td></tr>';
+		print '<tr class="oddeven nohover"><td class="" colspan="3">'.$langs->trans("NoLocalTaxXForThisCountry", $langs->transnoentitiesnoconv("Setup"), $langs->transnoentitiesnoconv("Dictionaries"), $langs->transnoentitiesnoconv("DictionaryVAT"), $langs->transnoentitiesnoconv("LocalTax2Management")).'</td></tr>';
 	}
 }
 
@@ -824,9 +815,9 @@ if ($mysoc->useRevenueStamp())
 } else {
 	if (empty($mysoc->country_code))
 	{
-		print '<tr class="oddeven nohover"><td class="opacitymedium">'.$countrynotdefined.'</td><td></td><td></td></tr>';
+		print '<tr class="oddeven nohover"><td class="">'.$countrynotdefined.'</td><td></td><td></td></tr>';
 	} else {
-		print '<tr class="oddeven nohover"><td class="opacitymedium" colspan="3">'.$langs->trans("NoLocalTaxXForThisCountry", $langs->transnoentitiesnoconv("Setup"), $langs->transnoentitiesnoconv("Dictionaries"), $langs->transnoentitiesnoconv("DictionaryRevenueStamp"), $langs->transnoentitiesnoconv("RevenueStamp")).'</td></tr>';
+		print '<tr class="oddeven nohover"><td class="" colspan="3">'.$langs->trans("NoLocalTaxXForThisCountry", $langs->transnoentitiesnoconv("Setup"), $langs->transnoentitiesnoconv("Dictionaries"), $langs->transnoentitiesnoconv("DictionaryRevenueStamp"), $langs->transnoentitiesnoconv("RevenueStamp")).'</td></tr>';
 	}
 }
 
@@ -834,7 +825,7 @@ print "</table>";
 
 
 print '<br><div class="center">';
-print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
 print '</div>';
 
 print '</form>';
diff --git a/htdocs/admin/company_socialnetworks.php b/htdocs/admin/company_socialnetworks.php
new file mode 100644
index 00000000000..5cbdb948b4a
--- /dev/null
+++ b/htdocs/admin/company_socialnetworks.php
@@ -0,0 +1,142 @@
+<?php
+/* Copyright (C) 2001-2007	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2019	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2017	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2010-2014	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2011-2017	Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2015		Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2017       Rui Strecht			    <rui.strecht@aliartalentos.com>
+ * Copyright (C) 2020       Frédéric 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/admin/company_socialnetworks.php
+ *	\ingroup    company
+ *	\brief      Setup page to configure company social networks
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+
+$action = GETPOST('action', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'admincompany'; // To manage different context of search
+
+// Load translation files required by the page
+$langs->loadLangs(array('admin', 'companies'));
+
+if (!$user->admin) {
+	accessforbidden();
+}
+$listofnetworks = getArrayOfSocialNetworks();
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('adminsocialnetworkscompany', 'globaladmin'));
+
+/*
+ * Actions
+ */
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+if (($action == 'update' && !GETPOST("cancel", 'alpha'))) {
+	foreach ($listofnetworks as $key => $value) {
+		if (!empty($value['active'])) {
+			$networkconstname = 'MAIN_INFO_SOCIETE_'.strtoupper($key).'_URL';
+			$networkconstid = 'MAIN_INFO_SOCIETE_'.strtoupper($key);
+			if (GETPOSTISSET($key.'url') && GETPOST($key.'url', 'alpha') != '') {
+				dolibarr_set_const($db, $networkconstname, GETPOST($key.'url', 'alpha'), 'chaine', 0, '', $conf->entity);
+				dolibarr_set_const($db, $networkconstid, GETPOST($key, 'alpha'), 'chaine', 0, '', $conf->entity);
+			} elseif (GETPOSTISSET($key) && GETPOST($key, 'alpha') != '') {
+				if (!empty($listofnetworks[$key]['url'])) {
+					$url = str_replace('{socialid}', GETPOST($key, 'alpha'), $listofnetworks[$key]['url']);
+					dolibarr_set_const($db, $networkconstname, $url, 'chaine', 0, '', $conf->entity);
+				}
+				dolibarr_set_const($db, $networkconstid, GETPOST($key, 'alpha'), 'chaine', 0, '', $conf->entity);
+			} else {
+				dolibarr_del_const($db, $networkconstname, $conf->entity);
+				dolibarr_del_const($db, $networkconstid, $conf->entity);
+			}
+		}
+	}
+}
+
+
+/*
+ * View
+ */
+
+$wikihelp = 'EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones';
+llxHeader('', $langs->trans("Setup"), $wikihelp);
+
+print load_fiche_titre($langs->trans("CompanyFoundation"), '', 'title_setup');
+
+$head = company_admin_prepare_head();
+
+print dol_get_fiche_head($head, 'socialnetworks', $langs->trans("SocialNetworksInformation"), -1, 'company');
+
+print '<span class="opacitymedium">'.$langs->trans("CompanyFundationDesc", $langs->transnoentities("Save"))."</span><br>\n";
+print "<br>\n";
+
+
+/**
+ * Edit parameters
+ */
+
+print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update">';
+
+// Social networks
+print '<br>';
+print '<table class="noborder centpercent editmode">';
+print '<tr class="liste_titre">';
+print '<td class="titlefield">'.$langs->trans("SocialNetworksInformation").'</td><td>'.$langs->trans("Url").'</td><td>'.$langs->trans("SocialNetworkId").'</td><td></td>';
+print "</tr>\n";
+
+
+foreach ($listofnetworks as $key => $value) {
+	if (!empty($value['active'])) {
+		print '<tr class="oddeven">';
+		print '<td><label for="'.$key.'url">'.$langs->trans(ucfirst($key)).'</label></td>';
+		$networkconstname = 'MAIN_INFO_SOCIETE_'.strtoupper($key).'_URL';
+		$networkconstid = 'MAIN_INFO_SOCIETE_'.strtoupper($key);
+		print '<td><span class="fa paddingright '.($value['icon'] ? $value['icon'] : 'fa-link').'"></span>';
+		print '<input name="'.$key.'url" id="'.$key.'url" class="minwidth300" value="'.dol_escape_htmltag($conf->global->$networkconstname).'">';
+		print '</td><td>';
+		print '<input name="'.$key.'" id="'.$key.'" class="minwidth300" value="'.dol_escape_htmltag($conf->global->$networkconstid).'">';
+		print '</td>';
+		print '<td>'.dol_print_socialnetworks($conf->global->$networkconstid, 0, 0, $key, $listofnetworks).'</td>';
+		print '</tr>'."\n";
+	}
+}
+
+print "</table>";
+
+print '<br>';
+
+print '<br><div class="center">';
+print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '</form>';
+
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index faf38f44b16..a647d096037 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -40,14 +40,14 @@ $action = GETPOST('action', 'aZ09');
 
 // Other parameters ACCOUNTING_*
 $list = array(
-    'ACCOUNTING_PRODUCT_BUY_ACCOUNT',
-    'ACCOUNTING_PRODUCT_SOLD_ACCOUNT',
-    'ACCOUNTING_SERVICE_BUY_ACCOUNT',
-    'ACCOUNTING_SERVICE_SOLD_ACCOUNT',
-    'ACCOUNTING_VAT_SOLD_ACCOUNT',
-    'ACCOUNTING_VAT_BUY_ACCOUNT',
-    'ACCOUNTING_ACCOUNT_CUSTOMER',
-    'ACCOUNTING_ACCOUNT_SUPPLIER'
+	'ACCOUNTING_PRODUCT_BUY_ACCOUNT',
+	'ACCOUNTING_PRODUCT_SOLD_ACCOUNT',
+	'ACCOUNTING_SERVICE_BUY_ACCOUNT',
+	'ACCOUNTING_SERVICE_SOLD_ACCOUNT',
+	'ACCOUNTING_VAT_SOLD_ACCOUNT',
+	'ACCOUNTING_VAT_BUY_ACCOUNT',
+	'ACCOUNTING_ACCOUNT_CUSTOMER',
+	'ACCOUNTING_ACCOUNT_SUPPLIER'
 );
 
 /*
@@ -58,52 +58,52 @@ $accounting_mode = empty($conf->global->ACCOUNTING_MODE) ? 'RECETTES-DEPENSES' :
 
 if ($action == 'update')
 {
-    $error = 0;
+	$error = 0;
 
-    $accounting_modes = array(
-        'RECETTES-DEPENSES',
-        'CREANCES-DETTES'
-    );
+	$accounting_modes = array(
+		'RECETTES-DEPENSES',
+		'CREANCES-DETTES'
+	);
 
-    $accounting_mode = GETPOST('accounting_mode', 'alpha');
+	$accounting_mode = GETPOST('accounting_mode', 'alpha');
 
 
-    if (in_array($accounting_mode, $accounting_modes)) {
-        if (!dolibarr_set_const($db, 'ACCOUNTING_MODE', $accounting_mode, 'chaine', 0, '', $conf->entity)) {
-            $error++;
-        }
-    } else {
-        $error++;
-    }
+	if (in_array($accounting_mode, $accounting_modes)) {
+		if (!dolibarr_set_const($db, 'ACCOUNTING_MODE', $accounting_mode, 'chaine', 0, '', $conf->entity)) {
+			$error++;
+		}
+	} else {
+		$error++;
+	}
 
-    foreach ($list as $constname) {
-        $constvalue = GETPOST($constname, 'alpha');
+	foreach ($list as $constname) {
+		$constvalue = GETPOST($constname, 'alpha');
 
-        if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
-            $error++;
-        }
-    }
+		if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+			$error++;
+		}
+	}
 
-    $report_include_varpay = GETPOST('ACCOUNTING_REPORTS_INCLUDE_VARPAY', 'alpha');
-    if (!empty($report_include_varpay))
-        if ($report_include_varpay == 'yes')
-            if (!dolibarr_set_const($db, 'ACCOUNTING_REPORTS_INCLUDE_VARPAY', 1, 'chaine', 0, '', $conf->entity)) $error++;
-        if ($report_include_varpay == 'no')
-            if (!dolibarr_del_const($db, 'ACCOUNTING_REPORTS_INCLUDE_VARPAY', $conf->entity)) $error++;
+	$report_include_varpay = GETPOST('ACCOUNTING_REPORTS_INCLUDE_VARPAY', 'alpha');
+	if (!empty($report_include_varpay))
+		if ($report_include_varpay == 'yes')
+			if (!dolibarr_set_const($db, 'ACCOUNTING_REPORTS_INCLUDE_VARPAY', 1, 'chaine', 0, '', $conf->entity)) $error++;
+		if ($report_include_varpay == 'no')
+			if (!dolibarr_del_const($db, 'ACCOUNTING_REPORTS_INCLUDE_VARPAY', $conf->entity)) $error++;
 
-    $report_include_loan = GETPOST('ACCOUNTING_REPORTS_INCLUDE_LOAN', 'alpha');
-    if (!empty($report_include_loan))
-        if ($report_include_loan == 'yes')
-            if (!dolibarr_set_const($db, 'ACCOUNTING_REPORTS_INCLUDE_LOAN', 1, 'chaine', 0, '', $conf->entity)) $error++;
-        if ($report_include_loan == 'no')
-            if (!dolibarr_del_const($db, 'ACCOUNTING_REPORTS_INCLUDE_LOAN', $conf->entity)) $error++;
+	$report_include_loan = GETPOST('ACCOUNTING_REPORTS_INCLUDE_LOAN', 'alpha');
+	if (!empty($report_include_loan))
+		if ($report_include_loan == 'yes')
+			if (!dolibarr_set_const($db, 'ACCOUNTING_REPORTS_INCLUDE_LOAN', 1, 'chaine', 0, '', $conf->entity)) $error++;
+		if ($report_include_loan == 'no')
+			if (!dolibarr_del_const($db, 'ACCOUNTING_REPORTS_INCLUDE_LOAN', $conf->entity)) $error++;
 
-    if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 /*
diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php
index 3f1eb8d9651..0eadfa2c629 100644
--- a/htdocs/admin/confexped.php
+++ b/htdocs/admin/confexped.php
@@ -67,12 +67,12 @@ if ($action == 'disable_sending')
 if ($action == 'activate_delivery')
 {
 	dolibarr_set_const($db, "MAIN_SUBMODULE_EXPEDITION", "1", 'chaine', 0, '', $conf->entity); // We must also enable this
-	dolibarr_set_const($db, "MAIN_SUBMODULE_LIVRAISON", "1", 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_SUBMODULE_DELIVERY", "1", 'chaine', 0, '', $conf->entity);
 	header("Location: confexped.php");
 	exit;
 } elseif ($action == 'disable_delivery')
 {
-	dolibarr_del_const($db, "MAIN_SUBMODULE_LIVRAISON", $conf->entity);
+	dolibarr_del_const($db, "MAIN_SUBMODULE_DELIVERY", $conf->entity);
 	header("Location: confexped.php");
 	exit;
 }
@@ -92,7 +92,7 @@ print load_fiche_titre($langs->trans("SendingsSetup"), $linkback, 'title_setup')
 print '<br>';
 $head = expedition_admin_prepare_head();
 
-dol_fiche_head($head, 'general', $langs->trans("Sendings"), -1, 'shipment');
+print dol_get_fiche_head($head, 'general', $langs->trans("Sendings"), -1, 'shipment');
 
 // Miscellaneous parameters
 
@@ -121,7 +121,7 @@ else
 print "</td>";
 print '</tr>';
 
-// Bon de livraison activation/desactivation
+// Delivery note activate/deactivate Bon de livraison activation/desactivation
 print '<tr>';
 print '<td>';
 print $langs->trans("DeliveriesOrderAbility");
@@ -131,7 +131,7 @@ print '<td>';
 print '</td>';
 print '<td class="center">';
 
-if (empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+if (empty($conf->global->MAIN_SUBMODULE_DELIVERY))
 {
 	print '<a href="confexped.php?action=activate_delivery">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 } else {
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 4aacdb3cfc2..baf5fae0b34 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -155,7 +155,7 @@ llxHeader('', $langs->trans("Setup"), $wikihelp);
 // Add logic to show/hide buttons
 if ($conf->use_javascript_ajax)
 {
-    ?>
+	?>
 <script type="text/javascript">
 jQuery(document).ready(function() {
 	jQuery("#updateconst").hide();
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index e8440963f9f..b5e4c0ddf45 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -178,7 +178,7 @@ print load_fiche_titre($langs->trans("ContractsSetup"), $linkback, 'title_setup'
 
 $head = contract_admin_prepare_head();
 
-dol_fiche_head($head, 'contract', $langs->trans("Contracts"), -1, 'contract');
+print dol_get_fiche_head($head, 'contract', $langs->trans("Contracts"), -1, 'contract');
 
 /*
  * Contracts Numbering model
@@ -229,7 +229,11 @@ foreach ($dirmodels as $reldir)
 						// Show example of numbering model
 						print '<td class="nowrap">';
 						$tmp = $module->getExample();
-						if (preg_match('/^Error/', $tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						if (preg_match('/^Error/', $tmp)) {
+							$langs->load("errors");
+							print '<div class="error">'.$langs->trans($tmp).'</div>';
+						}
+						elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
 						else print $tmp;
 						print '</td>'."\n";
 
@@ -410,7 +414,7 @@ foreach ($dirmodels as $reldir)
 								print '<td class="center">';
 								if ($module->type == 'pdf')
 								{
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
@@ -476,19 +480,19 @@ print '</td></tr>'."\n";
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("HideClosedServiceByDefault").'</td>';
 print '<td width="60" class="right">';
-print $form->selectyesno("activate_hideClosedServiceByDefault", (! empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT)?$conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT:0), 1);
+print $form->selectyesno("activate_hideClosedServiceByDefault", (!empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) ? $conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT : 0), 1);
 print '</td>';
 print '</tr>';
 
 print '</table>';
 
 print '<div class="center">';
-print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 print '</div>';
 
 print '</form>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php
index 0438d5759ad..8f005c0f0d7 100644
--- a/htdocs/admin/dav.php
+++ b/htdocs/admin/dav.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/dav/dav.lib.php';
 $langs->loadLangs(array("admin", "other", "agenda"));
 
 if (!$user->admin)
-    accessforbidden();
+	accessforbidden();
 
 // Parameters
 $action = GETPOST('action', 'aZ09');
@@ -39,8 +39,8 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 $arrayofparameters = array(
 	'DAV_RESTICT_ON_IP'=>array('css'=>'minwidth200', 'enabled'=>1),
-    'DAV_ALLOW_PRIVATE_DIR'=>array('css'=>'minwidth200', 'enabled'=>2),
-    'DAV_ALLOW_PUBLIC_DIR'=>array('css'=>'minwidth200', 'enabled'=>1),
+	'DAV_ALLOW_PRIVATE_DIR'=>array('css'=>'minwidth200', 'enabled'=>2),
+	'DAV_ALLOW_PUBLIC_DIR'=>array('css'=>'minwidth200', 'enabled'=>1),
 	'DAV_ALLOW_ECM_DIR'=>array('css'=>'minwidth200', 'enabled'=>$conf->ecm->enabled)
 );
 
@@ -69,7 +69,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 
 $head = dav_admin_prepare_head();
 
-dol_fiche_head($head, 'webdav', '', -1, 'action');
+print dol_get_fiche_head($head, 'webdav', '', -1, 'action');
 
 if ($action == 'edit')
 {
@@ -95,7 +95,7 @@ if ($action == 'edit')
 		print '</td><td>';
 		if ($key == 'DAV_ALLOW_PRIVATE_DIR')
 		{
-		    print $langs->trans("AlwaysActive");
+			print $langs->trans("AlwaysActive");
 		} elseif ($key == 'DAV_ALLOW_PUBLIC_DIR' || $key == 'DAV_ALLOW_ECM_DIR')
 		{
 			print $form->selectyesno($key, $conf->global->$key, 1);
@@ -108,7 +108,7 @@ if ($action == 'edit')
 	print '</table>';
 
 	print '<br><div class="center">';
-	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
+	print '<input class="button button-save" type="submit" value="'.$langs->trans("Save").'">';
 	print '</div>';
 
 	print '</form>';
@@ -130,7 +130,7 @@ if ($action == 'edit')
 		print '</td><td>';
 		if ($key == 'DAV_ALLOW_PRIVATE_DIR')
 		{
-		    print $langs->trans("AlwaysActive");
+			print $langs->trans("AlwaysActive");
 		} elseif ($key == 'DAV_ALLOW_PUBLIC_DIR' || $key == 'DAV_ALLOW_ECM_DIR')
 		{
 			print yn($conf->global->$key);
@@ -148,10 +148,10 @@ if ($action == 'edit')
 }
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 /*print '<div class="center">';
-print "<input type=\"submit\" name=\"save\" class=\"button\" value=\"".$langs->trans("Save")."\">";
+print '<input type="submit" name="save" class="button button-save" value="'.$langs->trans("Save").'">';
 print "</div>";
 */
 print "</form>\n";
diff --git a/htdocs/admin/debugbar.php b/htdocs/admin/debugbar.php
index 88115195328..840157d47e0 100644
--- a/htdocs/admin/debugbar.php
+++ b/htdocs/admin/debugbar.php
@@ -50,9 +50,9 @@ if ($action == 'set')
 	$result1 = dolibarr_set_const($db, "DEBUGBAR_LOGS_LINES_NUMBER", GETPOST('DEBUGBAR_LOGS_LINES_NUMBER', 'int'), 'chaine', 0, '', 0);
 	$result2 = dolibarr_set_const($db, "DEBUGBAR_USE_LOG_FILE", GETPOST('DEBUGBAR_USE_LOG_FILE', 'int'), 'chaine', 0, '', 0);
 	if ($result1 < 0 || $result2 < 0)
-    {
-        $error++;
-    }
+	{
+		$error++;
+	}
 
 	if (!$error)
 	{
@@ -78,8 +78,8 @@ print load_fiche_titre($langs->trans("DebugBarSetup"), $linkback, 'title_setup')
 
 if (!function_exists('mb_check_encoding'))
 {
-    $langs->load("errors");
-    print info_admin($langs->trans("ErrorPHPNeedModule", 'mbstring'), 0, 0, 'error');
+	$langs->load("errors");
+	print info_admin($langs->trans("ErrorPHPNeedModule", 'mbstring'), 0, 0, 'error');
 }
 
 print '<br>';
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 17fa15af382..789762830e3 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -83,17 +83,17 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 // Purge search criteria
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-    $defaulturl = '';
-    $defaultkey = '';
-    $defaultvalue = '';
-    $toselect = '';
-    $search_array_options = array();
+	$defaulturl = '';
+	$defaultkey = '';
+	$defaultvalue = '';
+	$toselect = '';
+	$search_array_options = array();
 }
 
 if ($action == 'setMAIN_ENABLE_DEFAULT_VALUES')
 {
-    if (GETPOST('value')) dolibarr_set_const($db, 'MAIN_ENABLE_DEFAULT_VALUES', 1, 'chaine', 0, '', $conf->entity);
-    else dolibarr_set_const($db, 'MAIN_ENABLE_DEFAULT_VALUES', 0, 'chaine', 0, '', $conf->entity);
+	if (GETPOST('value')) dolibarr_set_const($db, 'MAIN_ENABLE_DEFAULT_VALUES', 1, 'chaine', 0, '', $conf->entity);
+	else dolibarr_set_const($db, 'MAIN_ENABLE_DEFAULT_VALUES', 0, 'chaine', 0, '', $conf->entity);
 }
 
 if (($action == 'add' || (GETPOST('add') && $action != 'update')) || GETPOST('actionmodify'))
@@ -102,57 +102,57 @@ if (($action == 'add' || (GETPOST('add') && $action != 'update')) || GETPOST('ac
 
 	if (($action == 'add' || (GETPOST('add') && $action != 'update')))
 	{
-    	if (empty($defaulturl))
-    	{
-    		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Url")), null, 'errors');
-    		$error++;
-    	}
-    	if (empty($defaultkey))
-    	{
-    		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Field")), null, 'errors');
-    		$error++;
-    	}
+		if (empty($defaulturl))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Url")), null, 'errors');
+			$error++;
+		}
+		if (empty($defaultkey))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Field")), null, 'errors');
+			$error++;
+		}
 	}
 	if (GETPOST('actionmodify'))
 	{
-	    if (empty($urlpage))
-	    {
-	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Url")), null, 'errors');
-	        $error++;
-	    }
-	    if (empty($key))
-	    {
-	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Field")), null, 'errors');
-	        $error++;
-	    }
+		if (empty($urlpage))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Url")), null, 'errors');
+			$error++;
+		}
+		if (empty($key))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Field")), null, 'errors');
+			$error++;
+		}
 	}
 
 	if (!$error)
 	{
-	    $db->begin();
+		$db->begin();
 
-	    if ($action == 'add' || (GETPOST('add') && $action != 'update'))
-	    {
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."default_values(type, user_id, page, param, value, entity) VALUES ('".$db->escape($mode)."', 0, '".$db->escape($defaulturl)."','".$db->escape($defaultkey)."','".$db->escape($defaultvalue)."', ".$db->escape($conf->entity).")";
-	    }
-	    if (GETPOST('actionmodify'))
-	    {
-		    $sql = "UPDATE ".MAIN_DB_PREFIX."default_values SET page = '".$db->escape($urlpage)."', param = '".$db->escape($key)."', value = '".$db->escape($value)."'";
-		    $sql .= " WHERE rowid = ".$id;
-	    }
+		if ($action == 'add' || (GETPOST('add') && $action != 'update'))
+		{
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."default_values(type, user_id, page, param, value, entity) VALUES ('".$db->escape($mode)."', 0, '".$db->escape($defaulturl)."','".$db->escape($defaultkey)."','".$db->escape($defaultvalue)."', ".$db->escape($conf->entity).")";
+		}
+		if (GETPOST('actionmodify'))
+		{
+			$sql = "UPDATE ".MAIN_DB_PREFIX."default_values SET page = '".$db->escape($urlpage)."', param = '".$db->escape($key)."', value = '".$db->escape($value)."'";
+			$sql .= " WHERE rowid = ".$id;
+		}
 
 		$result = $db->query($sql);
 		if ($result > 0)
 		{
-		    $db->commit();
+			$db->commit();
 			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 			$action = "";
 			$defaulturl = '';
 			$defaultkey = '';
 			$defaultvalue = '';
 		} else {
-	        $db->rollback();
-		    setEventMessages($db->lasterror(), null, 'errors');
+			$db->rollback();
+			setEventMessages($db->lasterror(), null, 'errors');
 			$action = '';
 		}
 	}
@@ -189,15 +189,15 @@ $param = '&mode='.$mode;
 $enabledisablehtml .= $langs->trans("EnableDefaultValues").' ';
 if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))
 {
-    // Button off, click to enable
-    $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&amp;token='.newToken().'&amp;value=1'.$param.'">';
-    $enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
-    $enabledisablehtml .= '</a>';
+	// Button off, click to enable
+	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&amp;token='.newToken().'&amp;value=1'.$param.'">';
+	$enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
+	$enabledisablehtml .= '</a>';
 } else {
-    // Button on, click to disable
-    $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&amp;token='.newToken().'&amp;value=0'.$param.'">';
-    $enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
-    $enabledisablehtml .= '</a>';
+	// Button on, click to disable
+	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&amp;token='.newToken().'&amp;value=0'.$param.'">';
+	$enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
+	$enabledisablehtml .= '</a>';
 }
 
 print load_fiche_titre($langs->trans("DefaultValues"), $enabledisablehtml, 'title_setup');
@@ -224,11 +224,11 @@ print '<input type="hidden" name="page" value="'.$page.'">';
 
 $head = defaultvalues_prepare_head();
 
-dol_fiche_head($head, $mode, '', -1, '');
+print dol_get_fiche_head($head, $mode, '', -1, '');
 
 if ($mode == 'sortorder')
 {
-    print info_admin($langs->trans("WarningSettingSortOrder")).'<br>';
+	print info_admin($langs->trans("WarningSettingSortOrder")).'<br>';
 }
 if ($mode == 'mandatory')
 {
@@ -253,30 +253,30 @@ print_liste_field_titre($texturl, $_SERVER["PHP_SELF"], 'page,param', '', $param
 $texthelp = $langs->trans("TheKeyIsTheNameOfHtmlField");
 if ($mode != 'sortorder')
 {
-    $textkey = $form->textwithpicto($langs->trans("Field"), $texthelp);
+	$textkey = $form->textwithpicto($langs->trans("Field"), $texthelp);
 } else {
-    $texthelp = 'field or alias.field';
-    $textkey = $form->textwithpicto($langs->trans("Field"), $texthelp);
+	$texthelp = 'field or alias.field';
+	$textkey = $form->textwithpicto($langs->trans("Field"), $texthelp);
 }
 print_liste_field_titre($textkey, $_SERVER["PHP_SELF"], 'param', '', $param, '', $sortfield, $sortorder);
 // Value
 if ($mode != 'focus' && $mode != 'mandatory')
 {
-    if ($mode != 'sortorder')
-    {
-        $substitutionarray = getCommonSubstitutionArray($langs, 2, array('object', 'objectamount')); // Must match list into GETPOST
+	if ($mode != 'sortorder')
+	{
+		$substitutionarray = getCommonSubstitutionArray($langs, 2, array('object', 'objectamount')); // Must match list into GETPOST
 		unset($substitutionarray['__USER_SIGNATURE__']);
-        $texthelp = $langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-        foreach ($substitutionarray as $key => $val)
-        {
-            $texthelp .= $key.' -> '.$val.'<br>';
-        }
-        $textvalue = $form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, 'subsitutiontooltip');
-    } else {
-        $texthelp = 'ASC or DESC';
-        $textvalue = $form->textwithpicto($langs->trans("SortOrder"), $texthelp);
-    }
-    print_liste_field_titre($textvalue, $_SERVER["PHP_SELF"], 'value', '', $param, '', $sortfield, $sortorder);
+		$texthelp = $langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+		foreach ($substitutionarray as $key => $val)
+		{
+			$texthelp .= $key.' -> '.$val.'<br>';
+		}
+		$textvalue = $form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, 'subsitutiontooltip');
+	} else {
+		$texthelp = 'ASC or DESC';
+		$textvalue = $form->textwithpicto($langs->trans("SortOrder"), $texthelp);
+	}
+	print_liste_field_titre($textvalue, $_SERVER["PHP_SELF"], 'value', '', $param, '', $sortfield, $sortorder);
 }
 // Entity
 if (!empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,page', '', $param, '', $sortfield, $sortorder);
@@ -301,9 +301,9 @@ print '</td>';
 // Value
 if ($mode != 'focus' && $mode != 'mandatory')
 {
-    print '<td>';
-    print '<input type="text" class="flat maxwidth100onsmartphone" name="defaultvalue" value="">';
-    print '</td>';
+	print '<td>';
+	print '<input type="text" class="flat maxwidth100onsmartphone" name="defaultvalue" value="">';
+	print '</td>';
 }
 // Limit to superadmin
 if (!empty($conf->multicompany->enabled) && !$user->entity)
@@ -361,32 +361,31 @@ if ($result)
 		// Value
 		if ($mode != 'focus' && $mode != 'mandatory')
 		{
-    		print '<td>';
-    		/*print '<input type="hidden" name="const['.$i.'][rowid]" value="'.$obj->rowid.'">';
+			print '<td>';
+			/*print '<input type="hidden" name="const['.$i.'][rowid]" value="'.$obj->rowid.'">';
     		print '<input type="hidden" name="const['.$i.'][lang]" value="'.$obj->lang.'">';
     		print '<input type="hidden" name="const['.$i.'][name]" value="'.$obj->transkey.'">';
     		print '<input type="text" id="value_'.$i.'" class="flat inputforupdate" size="30" name="const['.$i.'][value]" value="'.dol_escape_htmltag($obj->transvalue).'">';
     		*/
-    		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print dol_escape_htmltag($obj->value);
-    		else print '<input type="text" name="value" value="'.dol_escape_htmltag($obj->value).'">';
-    		print '</td>';
+			if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print dol_escape_htmltag($obj->value);
+			else print '<input type="text" name="value" value="'.dol_escape_htmltag($obj->value).'">';
+			print '</td>';
 		}
 
-	    print '<td></td>';
+		print '<td></td>';
 
 		// Actions
 		print '<td class="center">';
 		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid)
 		{
-    		print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=edit&token='.newToken().((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
-    		print ' &nbsp; ';
-    		print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=delete&token='.newToken().((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
+			print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=edit&token='.newToken().((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
+			print '<a class="marginleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=delete&token='.newToken().((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
 		} else {
-		    print '<input type="hidden" name="page" value="'.$page.'">';
-		    print '<input type="hidden" name="rowid" value="'.$id.'">';
-		    print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : 'none').'"></div>';
-		    print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
-		    print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
+			print '<input type="hidden" name="page" value="'.$page.'">';
+			print '<input type="hidden" name="rowid" value="'.$id.'">';
+			print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : 'none').'"></div>';
+			print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+			print '<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'">';
 		}
 		print '</td>';
 
@@ -395,13 +394,13 @@ if ($result)
 		$i++;
 	}
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 print '</table>';
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print "</form>\n";
 
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index d6c708c124e..d605f75c511 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -51,7 +51,7 @@ $modules = array(
 						'img' => 'projecttask'
 				)
 		),
-        'propal' => array(
+		'propal' => array(
 				array(
 						'code' => 'MAIN_DELAY_PROPALS_TO_CLOSE',
 						'img' => 'propal'
@@ -114,18 +114,18 @@ $modules = array(
 						'code' => 'MAIN_DELAY_EXPENSEREPORTS',
 						'img' => 'trip'
 				),
-    		    /* TODO Enable this
+				/* TODO Enable this
 		        array(
     		        'code' => 'MAIN_DELAY_EXPENSEREPORTS_TO_PAY',
     		        'img' => 'trip'
     		    )*/
 		),
-        'holiday' => array(
-            array(
-                'code' => 'MAIN_DELAY_HOLIDAYS',
-                'img' => 'holiday'
-            ),
-        ),
+		'holiday' => array(
+			array(
+				'code' => 'MAIN_DELAY_HOLIDAYS',
+				'img' => 'holiday'
+			),
+		),
 );
 
 $labelmeteo = array(0=>$langs->trans("No"), 1=>$langs->trans("Yes"), 2=>$langs->trans("OnMobileOnly"));
@@ -169,15 +169,15 @@ if ($action == 'update')
 	foreach ($modules as $module => $delays)
 	{
 		if (!empty($conf->$module->enabled))
-    	{
-    		foreach ($delays as $delay)
-    		{
-    			if (GETPOST($delay['code']) != '')
-    			{
-    				dolibarr_set_const($db, $delay['code'], GETPOST($delay['code']), 'chaine', 0, '', $conf->entity);
-    			}
-    		}
-    	}
+		{
+			foreach ($delays as $delay)
+			{
+				if (GETPOST($delay['code']) != '')
+				{
+					dolibarr_set_const($db, $delay['code'], GETPOST($delay['code']), 'chaine', 0, '', $conf->entity);
+				}
+			}
+		}
 	}
 
 	dolibarr_set_const($db, "MAIN_DISABLE_METEO", $_POST["MAIN_DISABLE_METEO"], 'chaine', 0, '', $conf->entity);
@@ -188,8 +188,8 @@ if ($action == 'update')
 	if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $plus = '_PERCENTAGE';
 	// Update values
 	for ($i = 0; $i < 4; $i++) {
-    	if (isset($_POST['MAIN_METEO'.$plus.'_LEVEL'.$i])) dolibarr_set_const($db, 'MAIN_METEO'.$plus.'_LEVEL'.$i, GETPOST('MAIN_METEO'.$plus.'_LEVEL'.$i, 'int'), 'chaine', 0, '', $conf->entity);
-    }
+		if (GETPOSTISSET('MAIN_METEO'.$plus.'_LEVEL'.$i)) dolibarr_set_const($db, 'MAIN_METEO'.$plus.'_LEVEL'.$i, GETPOST('MAIN_METEO'.$plus.'_LEVEL'.$i, 'int'), 'chaine', 0, '', $conf->entity);
+	}
 }
 
 
@@ -209,31 +209,31 @@ print "<br>\n";
 
 if ($action == 'edit')
 {
-    print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" name="form_index">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="update">';
+	print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" name="form_index">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="update">';
 
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
 
-    foreach ($modules as $module => $delays)
-    {
-    	if (!empty($conf->$module->enabled))
-    	{
-    		foreach ($delays as $delay)
-    		{
+	foreach ($modules as $module => $delays)
+	{
+		if (!empty($conf->$module->enabled))
+		{
+			foreach ($delays as $delay)
+			{
 				$value = (!empty($conf->global->{$delay['code']}) ? $conf->global->{$delay['code']}:0);
-    			print '<tr class="oddeven">';
-    			print '<td width="20px">'.img_object('', $delay['img']).'</td>';
-    			print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td><td class="nowraponall">';
-    			print '<input class="right maxwidth75" type="number" name="'.$delay['code'].'" value="'.$value.'"> '.$langs->trans("days").'</td></tr>';
-    		}
-    	}
-    }
+				print '<tr class="oddeven">';
+				print '<td width="20px">'.img_object('', $delay['img']).'</td>';
+				print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td><td class="nowraponall">';
+				print '<input class="right maxwidth75" type="number" name="'.$delay['code'].'" value="'.$value.'"> '.$langs->trans("days").'</td></tr>';
+			}
+		}
+	}
 
-    print '</table>';
+	print '</table>';
 
-    print '<br>';
+	print '<br>';
 
 	// Show if meteo is enabled
 	print '<table class="noborder centpercent">';
@@ -246,29 +246,29 @@ if ($action == 'edit')
 
 	print '</table>';
 } else {
-    /*
+	/*
      * Show parameters
      */
 
 	print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
 
-    foreach ($modules as $module => $delays)
-    {
-    	if (!empty($conf->$module->enabled))
-    	{
-    		foreach ($delays as $delay)
-    		{
-    			$value = (!empty($conf->global->{$delay['code']}) ? $conf->global->{$delay['code']}:0);
-    			print '<tr class="oddeven">';
-    			print '<td width="20px">'.img_object('', $delay['img']).'</td>';
-    			print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td>';
-    			print '<td class="right">'.$value.' '.$langs->trans("days").'</td></tr>';
-    		}
-    	}
-    }
+	foreach ($modules as $module => $delays)
+	{
+		if (!empty($conf->$module->enabled))
+		{
+			foreach ($delays as $delay)
+			{
+				$value = (!empty($conf->global->{$delay['code']}) ? $conf->global->{$delay['code']}:0);
+				print '<tr class="oddeven">';
+				print '<td width="20px">'.img_object('', $delay['img']).'</td>';
+				print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td>';
+				print '<td class="right">'.$value.' '.$langs->trans("days").'</td></tr>';
+			}
+		}
+	}
 
-    print '</table>';
+	print '</table>';
 
 	print '<br>';
 
@@ -432,7 +432,7 @@ if ($conf->global->MAIN_DISABLE_METEO != 1) {
 
 
 if ($action == 'edit') {
-	print '<br><div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
+	print '<br><div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
 	print '<br></form>';
 } else {
 	print '<br><div class="tabsAction">';
diff --git a/htdocs/admin/delivery.php b/htdocs/admin/delivery.php
new file mode 100644
index 00000000000..b1606268205
--- /dev/null
+++ b/htdocs/admin/delivery.php
@@ -0,0 +1,459 @@
+<?php
+/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
+ * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
+ * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2014 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2011-2013 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2011-2018 Philippe Grand       <philippe.grand@atoo-net.com>
+ * Copyright (C) 2015	   Claudio Aschieri		<c.aschieri@19.coop>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/admin/delivery.php
+ *      \ingroup    delivery
+ *      \brief      age to setup extra fields of delivery
+ */
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/expedition.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/delivery/class/delivery.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("admin", "sendings", "deliveries", "other"));
+
+if (!$user->admin) accessforbidden();
+
+$action  = GETPOST('action', 'alpha');
+$value   = GETPOST('value', 'alpha');
+$label   = GETPOST('label', 'alpha');
+$scandir = GETPOST('scan_dir', 'alpha');
+$type = 'delivery';
+
+
+/*
+ * Actions
+ */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
+if ($action == 'updateMask')
+{
+	$maskconstdelivery = GETPOST('maskconstdelivery', 'alpha');
+	$maskdelivery = GETPOST('maskdelivery', 'alpha');
+	if ($maskconstdelivery)  $res = dolibarr_set_const($db, $maskconstdelivery, $maskdelivery, 'chaine', 0, '', $conf->entity);
+
+	if (!$res > 0) $error++;
+
+ 	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+}
+
+if ($action == 'set_DELIVERY_FREE_TEXT')
+{
+	$free = GETPOST('DELIVERY_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
+	$res = dolibarr_set_const($db, "DELIVERY_FREE_TEXT", $free, 'chaine', 0, '', $conf->entity);
+
+	if (!$res > 0) $error++;
+
+ 	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+}
+
+if ($action == 'specimen')
+{
+	$modele = GETPOST('module', 'alpha');
+
+	$sending = new Delivery($db);
+	$sending->initAsSpecimen();
+
+	// Search template files
+	$file = ''; $classname = ''; $filefound = 0;
+	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir)
+	{
+		$file = dol_buildpath($reldir."core/modules/delivery/doc/pdf_".$modele.".modules.php", 0);
+		if (file_exists($file))
+		{
+			$filefound = 1;
+			$classname = "pdf_".$modele;
+			break;
+		}
+	}
+
+	if ($filefound)
+	{
+		require_once $file;
+
+		$module = new $classname($db);
+
+		if ($module->write_file($sending, $langs) > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=delivery&file=SPECIMEN.pdf");
+			return;
+		} else {
+			setEventMessages($module->error, $module->errors, 'errors');
+			dol_syslog($module->error, LOG_ERR);
+		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
+}
+
+if ($action == 'set')
+{
+	$ret = addDocumentModel($value, $type, $label, $scandir);
+}
+
+if ($action == 'del')
+{
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		if ($conf->global->DELIVERY_ADDON_PDF == "$value") dolibarr_del_const($db, 'DELIVERY_ADDON_PDF', $conf->entity);
+	}
+}
+
+if ($action == 'setdoc')
+{
+	if (dolibarr_set_const($db, "DELIVERY_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
+	{
+		// La constante qui a ete lue en avant du nouveau set
+		// on passe donc par une variable pour avoir un affichage coherent
+		$conf->global->DELIVERY_ADDON_PDF = $value;
+	}
+
+	// On active le modele
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		$ret = addDocumentModel($value, $type, $label, $scandir);
+	}
+}
+
+if ($action == 'setmod')
+{
+	// TODO Verifier si module numerotation choisi peut etre active
+	// par appel methode canBeActivated
+
+	dolibarr_set_const($db, "DELIVERY_ADDON_NUMBER", $value, 'chaine', 0, '', $conf->entity);
+}
+
+
+/*
+ * View
+ */
+
+$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+
+llxHeader("", "");
+
+$form = new Form($db);
+
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("SendingsSetup"), $linkback, 'title_setup');
+print '<br>';
+$head = expedition_admin_prepare_head();
+
+print dol_get_fiche_head($head, 'receivings', $langs->trans("Receivings"), -1, 'shipment');
+
+
+// Delivery numbering model
+
+print load_fiche_titre($langs->trans("DeliveryOrderNumberingModules"), '', '');
+
+print '<table class="noborder centpercent">';
+print '<tr class="liste_titre">';
+print '<td width="100">'.$langs->trans("Name").'</td>';
+print '<td>'.$langs->trans("Description").'</td>';
+print '<td class="nowrap">'.$langs->trans("Example").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
+print '<td align="center" width="16">'.$langs->trans("ShortInfo").'</td>';
+print '</tr>'."\n";
+
+clearstatcache();
+
+foreach ($dirmodels as $reldir)
+{
+	$dir = dol_buildpath($reldir."core/modules/delivery/");
+
+	if (is_dir($dir))
+	{
+		$handle = opendir($dir);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (preg_match('/^mod_delivery_([a-z0-9_]*)\.php$/', $file)) {
+					$file = substr($file, 0, dol_strlen($file) - 4);
+
+					require_once $dir.$file.'.php';
+
+					$module = new $file;
+
+					if ($module->isEnabled())
+					{
+						// Show modules according to features level
+						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+
+						print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
+						print $module->info();
+						print '</td>';
+
+						// Show example of numbering module
+						print '<td class="nowrap">';
+						$tmp = $module->getExample();
+						if (preg_match('/^Error/', $tmp)) {
+							$langs->load("errors");
+							print '<div class="error">'.$langs->trans($tmp).'</div>';
+						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						else print $tmp;
+						print '</td>'."\n";
+
+						print '<td class="center">';
+						if ($conf->global->DELIVERY_ADDON_NUMBER == "$file")
+						{
+							print img_picto($langs->trans("Activated"), 'switch_on');
+						} else {
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+						}
+						print '</td>';
+
+						$delivery = new Delivery($db);
+						$delivery->initAsSpecimen();
+
+						// Info
+						$htmltooltip = '';
+						$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+						$nextval = $module->getNextValue($mysoc, $delivery);
+						if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+							$htmltooltip .= ''.$langs->trans("NextValue").': ';
+							if ($nextval) {
+								if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+									$nextval = $langs->trans($nextval);
+								$htmltooltip .= $nextval.'<br>';
+							} else {
+								$htmltooltip .= $langs->trans($module->error).'<br>';
+							}
+						}
+
+						print '<td class="center">';
+						print $form->textwithpicto('', $htmltooltip, 1, 0);
+						print '</td>';
+
+						print '</tr>';
+					}
+				}
+			}
+			closedir($handle);
+		}
+	}
+}
+
+print '</table>';
+
+
+/*
+ *  Documents Models for delivery
+ */
+print '<br>';
+print load_fiche_titre($langs->trans("DeliveryOrderModel"), '', '');
+
+// Defini tableau def de modele
+$type = "delivery";
+$def = array();
+
+$sql = "SELECT nom";
+$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
+$sql .= " WHERE type = '".$db->escape($type)."'";
+$sql .= " AND entity = ".$conf->entity;
+
+$resql = $db->query($sql);
+if ($resql)
+{
+	$i = 0;
+	$num_rows = $db->num_rows($resql);
+	while ($i < $num_rows)
+	{
+		$array = $db->fetch_array($resql);
+		array_push($def, $array[0]);
+		$i++;
+	}
+} else {
+	dol_print_error($db);
+}
+
+print '<table class="noborder centpercent">';
+print '<tr class="liste_titre">';
+print '<td width="140">'.$langs->trans("Name").'</td>';
+print '<td>'.$langs->trans("Description").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Default").'</td>';
+print '<td align="center" width="32">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="32">'.$langs->trans("Preview").'</td>';
+print "</tr>\n";
+
+clearstatcache();
+
+foreach ($dirmodels as $reldir)
+{
+	$dir = dol_buildpath($reldir."core/modules/delivery/doc/");
+
+	if (is_dir($dir))
+	{
+		$handle = opendir($dir);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				$filelist[] = $file;
+			}
+			closedir($handle);
+			arsort($filelist);
+
+			foreach ($filelist as $file)
+			{
+				if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
+				{
+					if (file_exists($dir.'/'.$file))
+					{
+						$name = substr($file, 4, dol_strlen($file) - 16);
+						$classname = substr($file, 0, dol_strlen($file) - 12);
+
+						require_once $dir.'/'.$file;
+						$module = new $classname($db);
+
+						$modulequalified = 1;
+						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
+						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+
+						if ($modulequalified)
+						{
+							print '<tr class="oddeven"><td width="100">';
+							print (empty($module->name) ? $name : $module->name);
+							print "</td><td>\n";
+							if (method_exists($module, 'info')) print $module->info($langs);
+							else print $module->description;
+							print '</td>';
+
+							// Active
+							if (in_array($name, $def))
+							{
+								print "<td align=\"center\">\n";
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+								print img_picto($langs->trans("Enabled"), 'switch_on');
+								print '</a>';
+								print "</td>";
+							} else {
+								print "<td align=\"center\">\n";
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+								print "</td>";
+							}
+
+							// Default
+							print "<td align=\"center\">";
+							if ($conf->global->DELIVERY_ADDON_PDF == "$name")
+							{
+								print img_picto($langs->trans("Default"), 'on');
+							} else {
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+							}
+							print '</td>';
+
+							// Info
+							$htmltooltip = ''.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+							$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+							$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").'</u>:';
+							$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+							print '<td class="center">';
+							print $form->textwithpicto('', $htmltooltip, 1, 0);
+							print '</td>';
+
+							// Preview
+							print '<td class="center">';
+							if ($module->type == 'pdf')
+							{
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
+							} else {
+								print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+							}
+							print '</td>';
+
+							print '</tr>';
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+print '</table>';
+/*
+ *  Autres Options
+ */
+print "<br>";
+print load_fiche_titre($langs->trans("OtherOptions"), '', '');
+
+print '<table class="noborder centpercent">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Parameter").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
+print '<td width="80">&nbsp;</td>';
+print "</tr>\n";
+
+$substitutionarray = pdf_getSubstitutionArray($langs, null, null, 2);
+$substitutionarray['__(AnyTranslationKey)__'] = $langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach ($substitutionarray as $key => $val)	$htmltext .= $key.'<br>';
+$htmltext .= '</i>';
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="set_DELIVERY_FREE_TEXT">';
+print '<tr class="oddeven"><td colspan="2">';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnDeliveryReceipts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
+$variablename = 'DELIVERY_FREE_TEXT';
+if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
+{
+	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+} else {
+	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+	print $doleditor->Create();
+}
+print '</td><td class="right">';
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print "</td></tr>\n";
+print '</form>';
+
+print '</table>';
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/livraison_extrafields.php b/htdocs/admin/delivery_extrafields.php
similarity index 91%
rename from htdocs/admin/livraison_extrafields.php
rename to htdocs/admin/delivery_extrafields.php
index d30635333be..c0ed636abac 100644
--- a/htdocs/admin/livraison_extrafields.php
+++ b/htdocs/admin/delivery_extrafields.php
@@ -22,9 +22,9 @@
  */
 
 /**
- *      \file       htdocs/admin/livraison_extrafields.php
- *		\ingroup    livraison
- *		\brief      Page to setup extra fields of livraison
+ *      \file       htdocs/admin/delivery_extrafields.php
+ *		\ingroup    delivery
+ *		\brief      Page to setup extra fields of delivery
  */
 
 require '../main.inc.php';
@@ -49,7 +49,7 @@ foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoenti
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
-$elementtype = 'livraison'; //Must be the $table_element of the class that manage extrafield
+$elementtype = 'delivery'; //Must be the $table_element of the class that manage extrafield
 
 if (!$user->admin) accessforbidden();
 
@@ -76,11 +76,11 @@ print "<br>\n";
 
 $head = expedition_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes_receivings', $langs->trans("Receivings"), -1, 'shipment');
+print dol_get_fiche_head($head, 'attributes_receivings', $langs->trans("Receivings"), -1, 'shipment');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/admin/livraisondet_extrafields.php b/htdocs/admin/deliverydet_extrafields.php
similarity index 80%
rename from htdocs/admin/livraisondet_extrafields.php
rename to htdocs/admin/deliverydet_extrafields.php
index cc9dfa1c49f..322eff2f968 100644
--- a/htdocs/admin/livraisondet_extrafields.php
+++ b/htdocs/admin/deliverydet_extrafields.php
@@ -24,9 +24,9 @@
  */
 
 /**
- *      \file       htdocs/admin/livraisondet_extrafields.php
- *		\ingroup    livraison
- *		\brief      Page to setup extra fields of livraison
+ *      \file       htdocs/admin/deliverydet_extrafields.php
+ *		\ingroup    delivery
+ *		\brief      Page to setup extra fields of delivery
  */
 
 require '../main.inc.php';
@@ -50,7 +50,7 @@ foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoenti
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
-$elementtype = 'livraisondet'; //Must be the $table_element of the class that manage extrafield
+$elementtype = 'deliverydet'; //Must be the $table_element of the class that manage extrafield
 
 if (!$user->admin) accessforbidden();
 
@@ -77,19 +77,19 @@ print "<br>\n";
 
 $head = expedition_admin_prepare_head();
 
-dol_fiche_head($head, 'attributeslines_receivings', $langs->trans("Receivings"), -1, 'shipment');
+print dol_get_fiche_head($head, 'attributeslines_receivings', $langs->trans("Receivings"), -1, 'shipment');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -102,9 +102,9 @@ if ($action != 'create' && $action != 'edit')
 if ($action == 'create')
 {
 	print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -114,10 +114,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && !empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 1ac1e0f4ad4..d06f8a2ce31 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -8,10 +8,10 @@
  * Copyright (C) 2011		Remy Younes				<ryounes@gmail.com>
  * Copyright (C) 2012-2015	Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2012		Christophe Battarel		<christophe.battarel@ltairis.fr>
- * Copyright (C) 2011-2016	Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2011-2019	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2015		Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2016		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2020  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2020		Open-Dsi				<support@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -91,11 +91,7 @@ $hookmanager->initHooks(array('admin'));
 // Put here declaration of dictionaries properties
 
 // Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
-if (! empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES)) {
-	$taborder = array(9, 0, 4, 3, 2, 0, 1, 8, 19, 16, 39, 27, 40, 38, 0, 5, 11, 0, 32, 33, 34, 0, 6, 0, 29, 0, 7, 24, 28, 17, 35, 36, 0, 10, 23, 12, 13, 0, 14, 0, 22, 20, 18, 21, 0, 15, 30, 0, 37, 0, 25, 0);
-} else {
-	$taborder = array(9, 0, 4, 3, 2, 0, 1, 8, 19, 16, 27, 38, 0, 5, 11, 0, 32, 33, 34, 0, 6, 0, 29, 0, 7, 24, 28, 17, 35, 36, 0, 10, 23, 12, 13, 0, 14, 0, 22, 20, 18, 21, 0, 15, 30, 0, 37, 0, 25, 0);
-}
+$taborder = array(9, 0, 4, 3, 2, 0, 1, 8, 19, 16, 39, 27, 40, 38, 0, 5, 11, 0, 32, 33, 34, 0, 6, 0, 29, 0, 7, 24, 28, 17, 35, 36, 0, 10, 23, 12, 13, 0, 14, 0, 22, 20, 18, 21, 41, 0, 15, 30, 0, 37, 42, 0, 25, 0);
 
 // Name of SQL tables of dictionaries
 $tabname = array();
@@ -133,13 +129,14 @@ $tabname[30] = MAIN_DB_PREFIX."c_format_cards";
 $tabname[32] = MAIN_DB_PREFIX."c_hrm_public_holiday";
 $tabname[33] = MAIN_DB_PREFIX."c_hrm_department";
 $tabname[34] = MAIN_DB_PREFIX."c_hrm_function";
-
 $tabname[35] = MAIN_DB_PREFIX."c_exp_tax_cat";
 $tabname[36] = MAIN_DB_PREFIX."c_exp_tax_range";
 $tabname[37] = MAIN_DB_PREFIX."c_units";
 $tabname[38] = MAIN_DB_PREFIX."c_socialnetworks";
 $tabname[39] = MAIN_DB_PREFIX."c_prospectcontactlevel";
 $tabname[40] = MAIN_DB_PREFIX."c_stcommcontact";
+$tabname[41] = MAIN_DB_PREFIX."c_transport_mode";
+$tabname[42] = MAIN_DB_PREFIX."c_product_nature";
 
 // Dictionary labels
 $tablib = array();
@@ -183,6 +180,8 @@ $tablib[37] = "DictionaryMeasuringUnits";
 $tablib[38] = "DictionarySocialNetworks";
 $tablib[39] = "DictionaryProspectContactLevel";
 $tablib[40] = "DictionaryProspectContactStatus";
+$tablib[41] = "DictionaryTransportMode";
+$tablib[42] = "DictionaryProductNature";
 
 // Requests to extract data
 $tabsql = array();
@@ -226,6 +225,8 @@ $tabsql[37] = "SELECT r.rowid, r.code, r.label, r.short_label, r.unit_type, r.sc
 $tabsql[38] = "SELECT rowid, entity, code, label, url, icon, active FROM ".MAIN_DB_PREFIX."c_socialnetworks";
 $tabsql[39] = "SELECT code, label as libelle, sortorder, active FROM ".MAIN_DB_PREFIX."c_prospectcontactlevel";
 $tabsql[40] = "SELECT id      as rowid, code, libelle, picto, active FROM ".MAIN_DB_PREFIX."c_stcommcontact";
+$tabsql[41] = "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_transport_mode";
+$tabsql[42] = "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_product_nature";
 
 // Criteria to sort dictionaries
 $tabsqlsort = array();
@@ -269,6 +270,8 @@ $tabsqlsort[37] = "r.unit_type ASC, r.scale ASC, r.code ASC";
 $tabsqlsort[38] = "rowid, code ASC";
 $tabsqlsort[39] = "sortorder ASC";
 $tabsqlsort[40] = "code ASC";
+$tabsqlsort[41] = "code ASC";
+$tabsqlsort[42] = "code ASC";
 
 // Field names in select result for dictionary display
 $tabfield = array();
@@ -312,6 +315,8 @@ $tabfield[37] = "code,label,short_label,unit_type,scale";
 $tabfield[38] = "code,label,url,icon,entity";
 $tabfield[39] = "code,libelle,sortorder";
 $tabfield[40] = "code,libelle,picto";
+$tabfield[41] = "code,label";
+$tabfield[42] = "code,label";
 
 // Edit field names for editing a record
 $tabfieldvalue = array();
@@ -355,6 +360,8 @@ $tabfieldvalue[37] = "code,label,short_label,unit_type,scale";
 $tabfieldvalue[38] = "code,label,url,icon";
 $tabfieldvalue[39] = "code,libelle,sortorder";
 $tabfieldvalue[40] = "code,libelle,picto";
+$tabfieldvalue[41] = "code,label";
+$tabfieldvalue[42] = "code,label";
 
 // Field names in the table for inserting a record
 $tabfieldinsert = array();
@@ -399,6 +406,8 @@ $tabfieldinsert[37] = "code,label,short_label,unit_type,scale";
 $tabfieldinsert[38] = "code,label,url,icon,entity";
 $tabfieldinsert[39] = "code,label,sortorder";
 $tabfieldinsert[40] = "code,libelle,picto";
+$tabfieldinsert[41] = "code,label";
+$tabfieldinsert[42] = "code,label";
 
 // Rowid name of field depending if field is autoincrement on or off..
 // Use "" if id field is "rowid" and has autoincrement on
@@ -444,6 +453,8 @@ $tabrowid[37] = "";
 $tabrowid[38] = "";
 $tabrowid[39] = "code";
 $tabrowid[40] = "id";
+$tabrowid[41] = "";
+$tabrowid[42] = "rowid";
 
 // Condition to show dictionary in setup page
 $tabcond = array();
@@ -485,8 +496,10 @@ $tabcond[35] = !empty($conf->expensereport->enabled);
 $tabcond[36] = !empty($conf->expensereport->enabled);
 $tabcond[37] = !empty($conf->product->enabled);
 $tabcond[38] = !empty($conf->socialnetworks->enabled);
-$tabcond[39] = (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS));
-$tabcond[40] = ! empty($conf->societe->enabled);
+$tabcond[39] = (!empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && !empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES));
+$tabcond[40] = (!empty($conf->societe->enabled) && !empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES));
+$tabcond[41] = !empty($conf->intracommreport->enabled);
+$tabcond[42] = !empty($conf->product->enabled);
 
 // List of help for fields
 $tabhelp = array();
@@ -516,12 +529,12 @@ $tabhelp[23] = array('revenuestamp_type'=>'FixedOrPercent');
 $tabhelp[24] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[25] = array('code'=>$langs->trans('EnterAnyCode'));
 //$tabhelp[26] = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[27] = array('code'=>$langs->trans("EnterAnyCode"),'picto'=>$langs->trans("PictoHelp"));
+$tabhelp[27] = array('code'=>$langs->trans("EnterAnyCode"), 'picto'=>$langs->trans("PictoHelp"));
 $tabhelp[28] = array('affect'=>$langs->trans("FollowedByACounter"), 'delay'=>$langs->trans("MinimumNoticePeriod"), 'newbymonth'=>$langs->trans("NbAddedAutomatically"));
 $tabhelp[29] = array('code'=>$langs->trans("EnterAnyCode"), 'percent'=>$langs->trans("OpportunityPercent"), 'position'=>$langs->trans("PositionIntoComboList"));
 $tabhelp[30] = array('code'=>$langs->trans("EnterAnyCode"), 'name'=>$langs->trans("LabelName"), 'paper_size'=>$langs->trans("LabelPaperSize"));
 //$tabhelp[31] = array('pcg_version'=>$langs->trans("EnterAnyCode"));
-$tabhelp[32] = array('code'=>$langs->trans("EnterAnyCode"), 'dayrule'=>"Keep empty for a date defined with month and day (most common case).<br>Use a keyword like 'easter', 'eastermonday', ... for a date predefined by complex rules.", 'country'=>$langs->trans("EnterACountryOnlyIfSpecificToOneCountry"), 'year'=>$langs->trans("ZeroMeansEveryYear"));
+$tabhelp[32] = array('code'=>$langs->trans("EnterAnyCode"), 'dayrule'=>"Keep empty for a date defined with month and day (most common case).<br>Use a keyword like 'easter', 'eastermonday', ... for a date predefined by complex rules.", 'country'=>$langs->trans("CountryIfSpecificToOneCountry"), 'year'=>$langs->trans("ZeroMeansEveryYear"));
 $tabhelp[33] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[34] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[35] = array();
@@ -529,7 +542,9 @@ $tabhelp[36] = array('range_ik'=>$langs->trans('PrevRangeToThisRange'));
 $tabhelp[37] = array('code'=>$langs->trans("EnterAnyCode"), 'unit_type' => $langs->trans('MeasuringUnitTypeDesc'), 'scale' => $langs->trans('MeasuringScaleDesc'));
 $tabhelp[38] = array('code'=>$langs->trans("EnterAnyCode"), 'url' => $langs->trans('UrlSocialNetworksDesc'), 'icon' => $langs->trans('FafaIconSocialNetworksDesc'));
 $tabhelp[39] = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[40] = array('code'=>$langs->trans("EnterAnyCode"),'picto'=>$langs->trans("PictoHelp"));
+$tabhelp[40] = array('code'=>$langs->trans("EnterAnyCode"), 'picto'=>$langs->trans("PictoHelp"));
+$tabhelp[41] = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[42] = array('code'=>$langs->trans("EnterAnyCode"));
 
 // List of check for fields (NOT USED YET)
 $tabfieldcheck = array();
@@ -573,6 +588,8 @@ $tabfieldcheck[37] = array();
 $tabfieldcheck[38] = array();
 $tabfieldcheck[39] = array();
 $tabfieldcheck[40] = array();
+$tabfieldcheck[41] = array();
+$tabfieldcheck[42] = array();
 
 // Complete all arrays with entries found into modules
 complete_dictionary_with_modules($taborder, $tabname, $tablib, $tabsql, $tabsqlsort, $tabfield, $tabfieldvalue, $tabfieldinsert, $tabrowid, $tabcond, $tabhelp, $tabfieldcheck);
@@ -581,9 +598,9 @@ complete_dictionary_with_modules($taborder, $tabname, $tablib, $tabsql, $tabsqls
 // Defaut sortorder
 if (empty($sortfield))
 {
-    $tmp1 = explode(',', $tabsqlsort[$id]);
-    $tmp2 = explode(' ', $tmp1[0]);
-    $sortfield = preg_replace('/^.*\./', '', $tmp2[0]);
+	$tmp1 = explode(',', $tabsqlsort[$id]);
+	$tmp2 = explode(' ', $tmp1[0]);
+	$sortfield = preg_replace('/^.*\./', '', $tmp2[0]);
 }
 
 // Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
@@ -591,27 +608,27 @@ $elementList = array();
 $sourceList = array();
 if ($id == 11)
 {
-    $elementList = array(
-        '' => '',
-        'societe' => $langs->trans('ThirdParty'),
-        // 'proposal' => $langs->trans('Proposal'),
-        // 'order' => $langs->trans('Order'),
-        // 'invoice' => $langs->trans('Bill'),
-        'supplier_proposal' => $langs->trans('SupplierProposal'),
-        'order_supplier' => $langs->trans('SupplierOrder'),
-        'invoice_supplier' => $langs->trans('SupplierBill'),
-        // 'intervention' => $langs->trans('InterventionCard'),
-        // 'contract' => $langs->trans('Contract'),
-        'project' => $langs->trans('Project'),
-        'project_task' => $langs->trans('Task'),
-        'agenda' => $langs->trans('Agenda'),
-        'dolresource' => $langs->trans('Resource'),
-        // old deprecated
-        'propal' => $langs->trans('Proposal'),
-        'commande' => $langs->trans('Order'),
-        'facture' => $langs->trans('Bill'),
-        'fichinter' => $langs->trans('InterventionCard'),
-        'contrat' => $langs->trans('Contract'),
+	$elementList = array(
+		'' => '',
+		'societe' => $langs->trans('ThirdParty'),
+		// 'proposal' => $langs->trans('Proposal'),
+		// 'order' => $langs->trans('Order'),
+		// 'invoice' => $langs->trans('Bill'),
+		'supplier_proposal' => $langs->trans('SupplierProposal'),
+		'order_supplier' => $langs->trans('SupplierOrder'),
+		'invoice_supplier' => $langs->trans('SupplierBill'),
+		// 'intervention' => $langs->trans('InterventionCard'),
+		// 'contract' => $langs->trans('Contract'),
+		'project' => $langs->trans('Project'),
+		'project_task' => $langs->trans('Task'),
+		'agenda' => $langs->trans('Agenda'),
+		'dolresource' => $langs->trans('Resource'),
+		// old deprecated
+		'propal' => $langs->trans('Proposal'),
+		'commande' => $langs->trans('Order'),
+		'facture' => $langs->trans('Bill'),
+		'fichinter' => $langs->trans('InterventionCard'),
+		'contrat' => $langs->trans('Contract'),
 	);
 	if (!empty($conf->global->MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES)) $elementList["societe"] = $langs->trans('ThirdParty');
 
@@ -647,329 +664,332 @@ if ($id == 10)
 
 if (GETPOST('button_removefilter', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter_x', 'alpha'))
 {
-    $search_country_id = '';
-    $search_code = '';
+	$search_country_id = '';
+	$search_code = '';
 }
 
 // Actions add or modify an entry into a dictionary
 if (GETPOST('actionadd') || GETPOST('actionmodify'))
 {
-    $listfield = explode(',', str_replace(' ', '', $tabfield[$id]));
-    $listfieldinsert = explode(',', $tabfieldinsert[$id]);
-    $listfieldmodify = explode(',', $tabfieldinsert[$id]);
-    $listfieldvalue = explode(',', $tabfieldvalue[$id]);
+	$listfield = explode(',', str_replace(' ', '', $tabfield[$id]));
+	$listfieldinsert = explode(',', $tabfieldinsert[$id]);
+	$listfieldmodify = explode(',', $tabfieldinsert[$id]);
+	$listfieldvalue = explode(',', $tabfieldvalue[$id]);
 
-    // Check that all fields are filled
-    $ok = 1;
-    foreach ($listfield as $f => $value)
-    {
-    	// Discard check of mandatory fields for country for some tables
-        if ($value == 'country_id' && in_array($tablib[$id], array('DictionaryPublicHolidays', 'DictionaryVAT', 'DictionaryRegion', 'DictionaryCompanyType', 'DictionaryHolidayTypes', 'DictionaryRevenueStamp', 'DictionaryAccountancysystem', 'DictionaryAccountancyCategory'))) continue; // For some pages, country is not mandatory
-    	if ($value == 'country' && in_array($tablib[$id], array('DictionaryPublicHolidays', 'DictionaryCanton', 'DictionaryCompanyType', 'DictionaryRevenueStamp'))) continue; // For some pages, country is not mandatory
-        // Discard check of mandatory fiedls for other fields
-    	if ($value == 'localtax1' && empty($_POST['localtax1_type'])) continue;
-        if ($value == 'localtax2' && empty($_POST['localtax2_type'])) continue;
-        if ($value == 'color' && empty($_POST['color'])) continue;
+	// Check that all fields are filled
+	$ok = 1;
+	foreach ($listfield as $f => $value)
+	{
+		// Discard check of mandatory fields for country for some tables
+		if ($value == 'country_id' && in_array($tablib[$id], array('DictionaryPublicHolidays', 'DictionaryVAT', 'DictionaryRegion', 'DictionaryCompanyType', 'DictionaryHolidayTypes', 'DictionaryRevenueStamp', 'DictionaryAccountancysystem', 'DictionaryAccountancyCategory'))) continue; // For some pages, country is not mandatory
+		if ($value == 'country' && in_array($tablib[$id], array('DictionaryPublicHolidays', 'DictionaryCanton', 'DictionaryCompanyType', 'DictionaryHolidayTypes', 'DictionaryRevenueStamp'))) continue; // For some pages, country is not mandatory
+		// Discard check of mandatory fiedls for other fields
+		if ($value == 'localtax1' && empty($_POST['localtax1_type'])) continue;
+		if ($value == 'localtax2' && empty($_POST['localtax2_type'])) continue;
+		if ($value == 'color' && empty($_POST['color'])) continue;
 		if ($value == 'formula' && empty($_POST['formula'])) continue;
 		if ($value == 'dayrule' && empty($_POST['dayrule'])) continue;
 		if ($value == 'sortorder') continue; // For a column name 'sortorder', we use the field name 'position'
-		if ((!isset($_POST[$value]) || $_POST[$value] == '')
-        	&& (!in_array($listfield[$f], array('decalage', 'module', 'accountancy_code', 'accountancy_code_sell', 'accountancy_code_buy', 'tracking', 'picto'))  // Fields that are not mandatory
-        	&& (!($id == 10 && $listfield[$f] == 'code')) // Code is mandatory fir table 10
-        	)
+		if ((!GETPOSTISSET($value) || GETPOST($value) == '')
+			&& (!in_array($listfield[$f], array('decalage', 'module', 'accountancy_code', 'accountancy_code_sell', 'accountancy_code_buy', 'tracking', 'picto'))  // Fields that are not mandatory
+			&& (!($id == 10 && $listfield[$f] == 'code')) // Code is mandatory fir table 10
+			)
 		) {
-            $ok = 0;
-            $fieldnamekey = $listfield[$f];
-            // We take translate key of field
-            if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey = 'Label';
-            if ($fieldnamekey == 'libelle_facture') $fieldnamekey = 'LabelOnDocuments';
-            if ($fieldnamekey == 'nbjour')   $fieldnamekey = 'NbOfDays';
-            if ($fieldnamekey == 'decalage') $fieldnamekey = 'Offset';
-            if ($fieldnamekey == 'module')   $fieldnamekey = 'Module';
-            if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
-            if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
-            if ($fieldnamekey == 'taux') $fieldnamekey = 'Rate';
-            if ($fieldnamekey == 'type') $fieldnamekey = 'Type';
-            if ($fieldnamekey == 'position') $fieldnamekey = 'Position';
-            if ($fieldnamekey == 'unicode') $fieldnamekey = 'Unicode';
-            if ($fieldnamekey == 'deductible') $fieldnamekey = 'Deductible';
-            if ($fieldnamekey == 'sortorder') $fieldnamekey = 'SortOrder';
+			$ok = 0;
+			$fieldnamekey = $listfield[$f];
+			// We take translate key of field
+			if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey = 'Label';
+			if ($fieldnamekey == 'libelle_facture') $fieldnamekey = 'LabelOnDocuments';
+			if ($fieldnamekey == 'nbjour')   $fieldnamekey = 'NbOfDays';
+			if ($fieldnamekey == 'decalage') $fieldnamekey = 'Offset';
+			if ($fieldnamekey == 'module')   $fieldnamekey = 'Module';
+			if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
+			if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
+			if ($fieldnamekey == 'taux') $fieldnamekey = 'Rate';
+			if ($fieldnamekey == 'type') $fieldnamekey = 'Type';
+			if ($fieldnamekey == 'position') $fieldnamekey = 'Position';
+			if ($fieldnamekey == 'unicode') $fieldnamekey = 'Unicode';
+			if ($fieldnamekey == 'deductible') $fieldnamekey = 'Deductible';
+			if ($fieldnamekey == 'sortorder') $fieldnamekey = 'SortOrder';
 			if ($fieldnamekey == 'category_type') $fieldnamekey = 'Calculated';
 			if ($fieldnamekey == 'revenuestamp_type') $fieldnamekey = 'TypeOfRevenueStamp';
 			if ($fieldnamekey == 'use_default') $fieldnamekey = 'UseByDefault';
 
-            setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
-        }
-    }
-    // Other checks
-    if (GETPOST('actionadd') && $tabname[$id] == MAIN_DB_PREFIX."c_actioncomm" && isset($_POST["type"]) && in_array($_POST["type"], array('system', 'systemauto'))) {
-        $ok = 0;
-        setEventMessages($langs->transnoentities('ErrorReservedTypeSystemSystemAuto'), null, 'errors');
-    }
-    if (GETPOSTISSET("code"))
-    {
-    	if (GETPOST("code") == '0')
-    	{
-        	$ok = 0;
-    		setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
-        }
-        /*if (!is_numeric($_POST['code']))	// disabled, code may not be in numeric base
+			setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
+		}
+	}
+	// Other checks
+	if (GETPOST('actionadd') && $tabname[$id] == MAIN_DB_PREFIX."c_actioncomm" && GETPOSTISSET("type") && in_array(GETPOST("type"), array('system', 'systemauto'))) {
+		$ok = 0;
+		setEventMessages($langs->transnoentities('ErrorReservedTypeSystemSystemAuto'), null, 'errors');
+	}
+	if (GETPOSTISSET("code"))
+	{
+		if (GETPOST("code") == '0')
+		{
+			$ok = 0;
+			setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
+		}
+		/*if (!is_numeric($_POST['code']))	// disabled, code may not be in numeric base
     	{
 	    	$ok = 0;
 	    	$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br>';
 	    }*/
-    }
-    if (GETPOSTISSET("country") && ($_POST["country"] == '0') && ($id != 2))
-    {
-    	if (in_array($tablib[$id], array('DictionaryCompanyType', 'DictionaryHolidayTypes')))	// Field country is no mandatory for such dictionaries
-    	{
-    		$_POST["country"] = '';
-    	} else {
-        	$ok = 0;
-        	setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities("Country")), null, 'errors');
-    	}
-    }
-    if ($id == 3 && !is_numeric($_POST["code"]))
-    {
-       	$ok = 0;
-       	setEventMessages($langs->transnoentities("ErrorFieldMustBeANumeric", $langs->transnoentities("Code")), null, 'errors');
-    }
+	}
+	if (GETPOSTISSET("country") && ($_POST["country"] == '0') && ($id != 2))
+	{
+		if (in_array($tablib[$id], array('DictionaryCompanyType', 'DictionaryHolidayTypes')))	// Field country is no mandatory for such dictionaries
+		{
+			$_POST["country"] = '';
+		} else {
+			$ok = 0;
+			setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities("Country")), null, 'errors');
+		}
+	}
+	if (($id == 3 || $id == 42) && !is_numeric($_POST["code"])) {
+	   	$ok = 0;
+	   	setEventMessages($langs->transnoentities("ErrorFieldMustBeANumeric", $langs->transnoentities("Code")), null, 'errors');
+	}
 
 	// Clean some parameters
-    if ((!empty($_POST["localtax1_type"]) || ($_POST['localtax1_type'] == '0')) && empty($_POST["localtax1"])) $_POST["localtax1"] = '0'; // If empty, we force to 0
-    if ((!empty($_POST["localtax2_type"]) || ($_POST['localtax2_type'] == '0')) && empty($_POST["localtax2"])) $_POST["localtax2"] = '0'; // If empty, we force to 0
+	if ((!empty($_POST["localtax1_type"]) || ($_POST['localtax1_type'] == '0')) && empty($_POST["localtax1"])) $_POST["localtax1"] = '0'; // If empty, we force to 0
+	if ((!empty($_POST["localtax2_type"]) || ($_POST['localtax2_type'] == '0')) && empty($_POST["localtax2"])) $_POST["localtax2"] = '0'; // If empty, we force to 0
 	if ($_POST["accountancy_code"] <= 0) $_POST["accountancy_code"] = ''; // If empty, we force to null
 	if ($_POST["accountancy_code_sell"] <= 0) $_POST["accountancy_code_sell"] = ''; // If empty, we force to null
 	if ($_POST["accountancy_code_buy"] <= 0) $_POST["accountancy_code_buy"] = ''; // If empty, we force to null
-    if ($id == 10 && isset($_POST["code"]))  // Spaces are not allowed into code
-    {
-        $_POST["code"] = preg_replace('/\s/', '', $_POST["code"]);
-    }
+	if ($id == 10 && GETPOSTISSET("code"))  // Spaces are not allowed into code
+	{
+		$_POST["code"] = preg_replace('/\s/', '', $_POST["code"]);
+	}
 
-    // If check ok and action add, add the line
-    if ($ok && GETPOST('actionadd'))
-    {
-        if ($tabrowid[$id])
-        {
-            // Get free id for insert
-            $newid = 0;
-            $sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
-            $result = $db->query($sql);
-            if ($result)
-            {
-                $obj = $db->fetch_object($result);
-                $newid = ($obj->newid + 1);
-            } else {
-                dol_print_error($db);
-            }
-        }
+	// If check ok and action add, add the line
+	if ($ok && GETPOST('actionadd'))
+	{
+		if ($tabrowid[$id])
+		{
+			// Get free id for insert
+			$newid = 0;
+			$sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
+			$result = $db->query($sql);
+			if ($result)
+			{
+				$obj = $db->fetch_object($result);
+				$newid = ($obj->newid + 1);
+			} else {
+				dol_print_error($db);
+			}
+		}
 
-        // Add new entry
-        $sql = "INSERT INTO ".$tabname[$id]." (";
-        // List of fields
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
-        	$sql .= $tabrowid[$id].",";
-        $sql .= $tabfieldinsert[$id];
-        $sql .= ",active)";
-        $sql .= " VALUES(";
+		// Add new entry
+		$sql = "INSERT INTO ".$tabname[$id]." (";
+		// List of fields
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
+			$sql .= $tabrowid[$id].",";
+		$sql .= $tabfieldinsert[$id];
+		$sql .= ",active)";
+		$sql .= " VALUES(";
 
-        // List of values
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
-        	$sql .= $newid.",";
-        $i = 0;
-        foreach ($listfieldinsert as $f => $value)
-        {
-        	$keycode = $listfieldvalue[$i];
-        	if (empty($keycode)) $keycode = $value;
+		// List of values
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
+			$sql .= $newid.",";
+		$i = 0;
+		foreach ($listfieldinsert as $f => $value)
+		{
+			$keycode = $listfieldvalue[$i];
+			if (empty($keycode)) $keycode = $value;
 
-            if ($value == 'price' || preg_match('/^amount/i', $value) || $value == 'taux') {
-            	$_POST[$keycode] = price2num($_POST[$keycode], 'MU');
-            } elseif ($value == 'entity') {
-            	$_POST[$keycode] = getEntity($tabname[$id]);
-            }
+			if ($value == 'price' || preg_match('/^amount/i', $value) || $value == 'taux') {
+				$_POST[$keycode] = price2num($_POST[$keycode], 'MU');
+			} elseif ($value == 'entity') {
+				$_POST[$keycode] = getEntity($tabname[$id]);
+			}
 
-            if ($i) $sql .= ",";
+			if ($i) $sql .= ",";
 
-            if ($keycode == 'sortorder')		// For column name 'sortorder', we use the field name 'position'
-            {
-            	$sql .= "'".(int) GETPOST('position', 'int')."'";
-            } elseif ($_POST[$keycode] == '' && !($keycode == 'code' && $id == 10)) $sql .= "null"; // For vat, we want/accept code = ''
-            elseif ($keycode == 'content') {
-            	$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-            } elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
-            	$sql .= (int) GETPOST($keycode, 'int');
-            } else {
-            	$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
-            }
+			if ($keycode == 'sortorder')		// For column name 'sortorder', we use the field name 'position'
+			{
+				$sql .= "'".(int) GETPOST('position', 'int')."'";
+			} elseif ($_POST[$keycode] == '' && !($keycode == 'code' && $id == 10)) $sql .= "null"; // For vat, we want/accept code = ''
+			elseif ($keycode == 'content') {
+				$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
+			} elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
+				$sql .= (int) GETPOST($keycode, 'int');
+			} else {
+				$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
+			}
 
-            $i++;
-        }
-        $sql .= ",1)";
+			$i++;
+		}
+		$sql .= ",1)";
 
-        dol_syslog("actionadd", LOG_DEBUG);
-        $result = $db->query($sql);
-        if ($result)	// Add is ok
-        {
-            setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
-        	$_POST = array('id'=>$id); // Clean $_POST array, we keep only
-        } else {
-            if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-                setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
-            } else {
-                dol_print_error($db);
-            }
-        }
-    }
+		dol_syslog("actionadd", LOG_DEBUG);
+		$result = $db->query($sql);
+		if ($result)	// Add is ok
+		{
+			setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
+			$_POST = array('id'=>$id); // Clean $_POST array, we keep only
+		} else {
+			if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
+			} else {
+				dol_print_error($db);
+			}
+		}
+	}
 
-    // If verif ok and action modify, modify the line
-    if ($ok && GETPOST('actionmodify'))
-    {
-        if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	// If verif ok and action modify, modify the line
+	if ($ok && GETPOST('actionmodify'))
+	{
+		if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-        // Modify entry
-        $sql = "UPDATE ".$tabname[$id]." SET ";
-        // Modifie valeur des champs
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify))
-        {
-            $sql .= $tabrowid[$id]."=";
-            $sql .= "'".$db->escape($rowid)."', ";
-        }
-        $i = 0;
-        foreach ($listfieldmodify as $field)
-        {
-        	$keycode = $listfieldvalue[$i];
-        	if (empty($keycode)) $keycode = $field;
+		// Modify entry
+		$sql = "UPDATE ".$tabname[$id]." SET ";
+		// Modifie valeur des champs
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify))
+		{
+			$sql .= $tabrowid[$id]."=";
+			$sql .= "'".$db->escape($rowid)."', ";
+		}
+		$i = 0;
+		foreach ($listfieldmodify as $field)
+		{
+			$keycode = $listfieldvalue[$i];
+			if (empty($keycode)) $keycode = $field;
 
-            if ($field == 'price' || preg_match('/^amount/i', $field) || $field == 'taux') {
-            	$_POST[$keycode] = price2num($_POST[$keycode], 'MU');
-            } elseif ($field == 'entity') {
-            	$_POST[$keycode] = getEntity($tabname[$id]);
-            }
+			if ($field == 'price' || preg_match('/^amount/i', $field) || $field == 'taux') {
+				$_POST[$keycode] = price2num($_POST[$keycode], 'MU');
+			} elseif ($field == 'entity') {
+				$_POST[$keycode] = getEntity($tabname[$id]);
+			}
 
-            if ($i) $sql .= ",";
-            $sql .= $field."=";
-            if ($listfieldvalue[$i] == 'sortorder')		// For column name 'sortorder', we use the field name 'position'
-            {
-            	$sql .= (int) GETPOST('position', 'int');
-            } elseif ($_POST[$keycode] == '' && !($keycode == 'code' && $id == 10)) $sql .= "null"; // For vat, we want/accept code = ''
-            elseif ($keycode == 'content') {
-            	$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-            } elseif (in_array($keycode, array('private', 'position', 'scale'))) {
-            	$sql .= (int) GETPOST($keycode, 'int');
-            } else {
-            	$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
-            }
+			if ($i) $sql .= ",";
+			$sql .= $field."=";
+			if ($listfieldvalue[$i] == 'sortorder')		// For column name 'sortorder', we use the field name 'position'
+			{
+				$sql .= (int) GETPOST('position', 'int');
+			} elseif ($_POST[$keycode] == '' && !($keycode == 'code' && $id == 10)) $sql .= "null"; // For vat, we want/accept code = ''
+			elseif ($keycode == 'content') {
+				$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
+			} elseif (in_array($keycode, array('private', 'position', 'scale'))) {
+				$sql .= (int) GETPOST($keycode, 'int');
+			} else {
+				$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
+			}
 
-            $i++;
-        }
-        $sql .= " WHERE ".$rowidcol." = ".(int) $db->escape($rowid);
-        if (in_array('entity', $listfieldmodify)) $sql .= " AND entity = '".getEntity($tabname[$id])."'";
+			$i++;
+		}
+		if (in_array($rowidcol, array('code', 'code_iso'))) {
+			$sql .= " WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
+		} else {
+			$sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
+		}
+		if (in_array('entity', $listfieldmodify)) $sql .= " AND entity = '".getEntity($tabname[$id])."'";
 
-        dol_syslog("actionmodify", LOG_DEBUG);
-        //print $sql;
-        $resql = $db->query($sql);
-        if (!$resql)
-        {
-            setEventMessages($db->error(), null, 'errors');
-        }
-    }
-    //$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
+		dol_syslog("actionmodify", LOG_DEBUG);
+		//print $sql;
+		$resql = $db->query($sql);
+		if (!$resql)
+		{
+			setEventMessages($db->error(), null, 'errors');
+		}
+	}
+	//$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
 }
 
 if (GETPOST('actioncancel'))
 {
-    //$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
+	//$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
 }
 
 if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    $sql = "DELETE FROM ".$tabname[$id]." WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+	$sql = "DELETE FROM ".$tabname[$id]." WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 
-    dol_syslog("delete", LOG_DEBUG);
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
-        {
-            setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
-        } else {
-            dol_print_error($db);
-        }
-    }
+	dol_syslog("delete", LOG_DEBUG);
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
+		{
+			setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
+		} else {
+			dol_print_error($db);
+		}
+	}
 }
 
 // activate
 if ($action == $acts[0])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    } elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    }
+	if ($rowid) {
+		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+	} elseif ($code) {
+		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+	}
 
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		dol_print_error($db);
+	}
 }
 
 // disable
 if ($action == $acts[1])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    } elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    }
+	if ($rowid) {
+		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+	} elseif ($code) {
+		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+	}
 
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		dol_print_error($db);
+	}
 }
 
 // favorite
 if ($action == 'activate_favorite')
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    } elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    }
+	if ($rowid) {
+		$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+	} elseif ($code) {
+		$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+	}
 
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		dol_print_error($db);
+	}
 }
 
 // disable favorite
 if ($action == 'disable_favorite')
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    } elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    }
+	if ($rowid) {
+		$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+	} elseif ($code) {
+		$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+	}
 
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		dol_print_error($db);
+	}
 }
 
 
@@ -987,28 +1007,28 @@ llxHeader('', $title);
 $linkback = '';
 if ($id)
 {
-    $title .= ' - '.$langs->trans($tablib[$id]);
-    $linkback = '<a href="'.$_SERVER['PHP_SELF'].'">'.$langs->trans("BackToDictionaryList").'</a>';
+	$title .= ' - '.$langs->trans($tablib[$id]);
+	$linkback = '<a href="'.$_SERVER['PHP_SELF'].'">'.$langs->trans("BackToDictionaryList").'</a>';
 }
 $titlepicto = 'title_setup';
 if ($id == 10 && GETPOST('from') == 'accountancy')
 {
-    $title = $langs->trans("MenuVatAccounts");
-    $titlepicto = 'accountancy';
+	$title = $langs->trans("MenuVatAccounts");
+	$titlepicto = 'accountancy';
 }
 if ($id == 7 && GETPOST('from') == 'accountancy')
 {
-    $title = $langs->trans("MenuTaxAccounts");
-    $titlepicto = 'accountancy';
+	$title = $langs->trans("MenuTaxAccounts");
+	$titlepicto = 'accountancy';
 }
 
 print load_fiche_titre($title, $linkback, $titlepicto);
 
 if (empty($id))
 {
-    print '<span class="opacitymedium">'.$langs->trans("DictionaryDesc");
-    print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
-    print '</span><br>';
+	print '<span class="opacitymedium">'.$langs->trans("DictionaryDesc");
+	print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
+	print '</span><br>';
 }
 
 
@@ -1025,7 +1045,7 @@ if (GETPOST('from')) $paramwithsearch .= '&from='.urlencode(GETPOST('from', 'alp
 // Confirmation of the deletion of the line
 if ($action == 'delete')
 {
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'rowid='.urlencode($rowid).'&code='.urlencode($code).$paramwithsearch, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'rowid='.urlencode($rowid).'&code='.urlencode($code).$paramwithsearch, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
 }
 //var_dump($elementList);
 
@@ -1034,126 +1054,122 @@ if ($action == 'delete')
  */
 if ($id)
 {
-    // Complete search values request with sort criteria
-    $sql = $tabsql[$id];
+	// Complete search values request with sort criteria
+	$sql = $tabsql[$id];
 
-    if (!preg_match('/ WHERE /', $sql)) $sql .= " WHERE 1 = 1";
-    if ($search_country_id > 0) $sql .= " AND c.rowid = ".$search_country_id;
-    if ($search_code != '' && $id == 9)     $sql .= natural_search("code_iso", $search_code);
-    elseif ($search_code != '' && $id == 28)    $sql .= natural_search("h.code", $search_code);
-    elseif ($search_code != '' && $id == 32)    $sql .= natural_search("a.code", $search_code);
-    elseif ($search_code != '' && $id == 3)     $sql .= natural_search("r.code_region", $search_code);
-    elseif ($search_code != '' && $id != 9)     $sql .= natural_search("code", $search_code);
+	if (!preg_match('/ WHERE /', $sql)) $sql .= " WHERE 1 = 1";
+	if ($search_country_id > 0) $sql .= " AND c.rowid = ".$search_country_id;
+	if ($search_code != '' && $id == 9)     $sql .= natural_search("code_iso", $search_code);
+	elseif ($search_code != '' && $id == 28)    $sql .= natural_search("h.code", $search_code);
+	elseif ($search_code != '' && $id == 32)    $sql .= natural_search("a.code", $search_code);
+	elseif ($search_code != '' && $id == 3)     $sql .= natural_search("r.code_region", $search_code);
+	elseif ($search_code != '' && $id != 9)     $sql .= natural_search("code", $search_code);
 
-    if ($sortfield)
-    {
-        // If sort order is "country", we use country_code instead
-    	if ($sortfield == 'country') $sortfield = 'country_code';
-        $sql .= " ORDER BY ".$db->escape($sortfield);
-        if ($sortorder)
-        {
-        	$sql .= " ".strtoupper($db->escape($sortorder));
-        }
-        $sql .= ", ";
-        // Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
-        $tabsqlsort[$id] = preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i', '', $tabsqlsort[$id]);
-        $tabsqlsort[$id] = preg_replace('/([a-z]+\.)?'.$sortfield.',/i', '', $tabsqlsort[$id]);
-    } else {
-        $sql .= " ORDER BY ";
-    }
-    $sql .= $tabsqlsort[$id];
-    $sql .= $db->plimit($listlimit + 1, $offset);
-    //print $sql;
+	if ($sortfield)
+	{
+		// If sort order is "country", we use country_code instead
+		if ($sortfield == 'country') $sortfield = 'country_code';
+		$sql .= $db->order($sortfield, $sortorder);
+		$sql .= ", ";
+		// Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
+		$tabsqlsort[$id] = preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i', '', $tabsqlsort[$id]);
+		$tabsqlsort[$id] = preg_replace('/([a-z]+\.)?'.$sortfield.',/i', '', $tabsqlsort[$id]);
+	} else {
+		$sql .= " ORDER BY ";
+	}
+	$sql .= $tabsqlsort[$id];
+	$sql .= $db->plimit($listlimit + 1, $offset);
+	//print $sql;
 
-    if (empty($tabfield[$id]))
-    {
-    	dol_print_error($db, 'The table with id '.$id.' has no array tabfield defined');
-    	exit;
-    }
-    $fieldlist = explode(',', $tabfield[$id]);
+	if (empty($tabfield[$id]))
+	{
+		dol_print_error($db, 'The table with id '.$id.' has no array tabfield defined');
+		exit;
+	}
+	$fieldlist = explode(',', $tabfield[$id]);
 
-    print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
+	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
 
-    if ($id == 10 && empty($conf->global->FACTURE_TVAOPTION))
-    {
-    	print info_admin($langs->trans("VATIsUsedIsOff", $langs->transnoentities("Setup"), $langs->transnoentities("CompanyFoundation")));
-    	print "<br>\n";
-    }
+	if ($id == 10 && empty($conf->global->FACTURE_TVAOPTION))
+	{
+		print info_admin($langs->trans("VATIsUsedIsOff", $langs->transnoentities("Setup"), $langs->transnoentities("CompanyFoundation")));
+		print "<br>\n";
+	}
 
-    // Form to add a new line
-    if ($tabname[$id])
-    {
-        $alabelisused = 0;
-        $withentity = null;
+	// Form to add a new line
+	if ($tabname[$id])
+	{
+		$alabelisused = 0;
+		$withentity = null;
 
-        $fieldlist = explode(',', $tabfield[$id]);
+		$fieldlist = explode(',', $tabfield[$id]);
 
-	    print '<div class="div-table-responsive-no-min">';
-        print '<table class="noborder centpercent">';
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder centpercent">';
 
-        // Line for title
-        print '<tr class="liste_titre">';
-        foreach ($fieldlist as $field => $value)
-        {
-        	if ($fieldlist[$field] == 'entity') {
-        		$withentity = getEntity($tabname[$id]);
-        		continue;
-        	}
+		// Line for title
+		$tdsoffields = '<tr class="liste_titre">';
+		foreach ($fieldlist as $field => $value)
+		{
+			if ($fieldlist[$field] == 'entity') {
+				$withentity = getEntity($tabname[$id]);
+				continue;
+			}
 
-            // Define field friendly name from its technical name
-            $valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
-            $valuetoshow = $langs->trans($valuetoshow); // try to translate
-            $class = '';
+			// Define field friendly name from its technical name
+			$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
+			$valuetoshow = $langs->trans($valuetoshow); // try to translate
+			$class = '';
 
-            if ($fieldlist[$field] == 'pos') { $valuetoshow = $langs->trans("Position"); $class = 'maxwidth100'; }
-            if ($fieldlist[$field] == 'source') { $valuetoshow = $langs->trans("Contact"); }
-            if ($fieldlist[$field] == 'price') { $valuetoshow = $langs->trans("PriceUHT"); }
-            if ($fieldlist[$field] == 'taux') {
+			if ($fieldlist[$field] == 'pos') { $valuetoshow = $langs->trans("Position"); $class = 'maxwidth100'; }
+			if ($fieldlist[$field] == 'source') { $valuetoshow = $langs->trans("Contact"); }
+			if ($fieldlist[$field] == 'price') { $valuetoshow = $langs->trans("PriceUHT"); }
+			if ($fieldlist[$field] == 'taux') {
 				if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") $valuetoshow = $langs->trans("Rate");
 				else $valuetoshow = $langs->trans("Amount");
 				$class = 'center';
-            }
-            if ($fieldlist[$field] == 'localtax1_type') { $valuetoshow = $langs->trans("UseLocalTax")." 2"; $class = "center"; $sortable = 0; }
-            if ($fieldlist[$field] == 'localtax1') { $valuetoshow = $langs->trans("Rate")." 2"; $class = "center"; }
-            if ($fieldlist[$field] == 'localtax2_type') { $valuetoshow = $langs->trans("UseLocalTax")." 3"; $class = "center"; $sortable = 0; }
-            if ($fieldlist[$field] == 'localtax2') { $valuetoshow = $langs->trans("Rate")." 3"; $class = "center"; }
-            if ($fieldlist[$field] == 'organization') { $valuetoshow = $langs->trans("Organization"); }
-            if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
-            if ($fieldlist[$field] == 'type') {
+			}
+			if ($fieldlist[$field] == 'localtax1_type') { $valuetoshow = $langs->trans("UseLocalTax")." 2"; $class = "center"; $sortable = 0; }
+			if ($fieldlist[$field] == 'localtax1') { $valuetoshow = $langs->trans("Rate")." 2"; $class = "center"; }
+			if ($fieldlist[$field] == 'localtax2_type') { $valuetoshow = $langs->trans("UseLocalTax")." 3"; $class = "center"; $sortable = 0; }
+			if ($fieldlist[$field] == 'localtax2') { $valuetoshow = $langs->trans("Rate")." 3"; $class = "center"; }
+			if ($fieldlist[$field] == 'organization') { $valuetoshow = $langs->trans("Organization"); }
+			if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
+			if ($fieldlist[$field] == 'type') {
 				if ($tabname[$id] == MAIN_DB_PREFIX."c_paiement") $valuetoshow = $form->textwithtooltip($langs->trans("Type"), $langs->trans("TypePaymentDesc"), 2, 1, img_help(1, ''));
 				else $valuetoshow = $langs->trans("Type");
-            }
-            if ($fieldlist[$field] == 'code') { $valuetoshow = $langs->trans("Code"); $class = 'maxwidth100'; }
-            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label')
-            {
-            	$valuetoshow = $form->textwithtooltip($langs->trans("Label"), $langs->trans("LabelUsedByDefault"), 2, 1, img_help(1, ''));
-            }
-            if ($fieldlist[$field] == 'libelle_facture') {
-                $valuetoshow = $form->textwithtooltip($langs->trans("LabelOnDocuments"), $langs->trans("LabelUsedByDefault"), 2, 1, img_help(1, ''));
-            }
-            if ($fieldlist[$field] == 'country') {
-                if (in_array('region_id', $fieldlist)) { print '<td>&nbsp;</td>'; continue; }		// For region page, we do not show the country input
-                $valuetoshow = $langs->trans("Country");
-            }
-            if ($fieldlist[$field] == 'recuperableonly') { $valuetoshow = $langs->trans("NPR"); $class = "center"; }
-            if ($fieldlist[$field] == 'nbjour') { $valuetoshow = $langs->trans("NbOfDays"); }
-            if ($fieldlist[$field] == 'type_cdr') { $valuetoshow = $langs->trans("AtEndOfMonth"); $class = "center"; }
-            if ($fieldlist[$field] == 'decalage') { $valuetoshow = $langs->trans("Offset"); }
-            if ($fieldlist[$field] == 'width' || $fieldlist[$field] == 'nx') { $valuetoshow = $langs->trans("Width"); }
-            if ($fieldlist[$field] == 'height' || $fieldlist[$field] == 'ny') { $valuetoshow = $langs->trans("Height"); }
-            if ($fieldlist[$field] == 'unit' || $fieldlist[$field] == 'metric') { $valuetoshow = $langs->trans("MeasuringUnit"); }
-            if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { $valuetoshow = ''; }
-            if ($fieldlist[$field] == 'accountancy_code') { $valuetoshow = $langs->trans("AccountancyCode"); }
-            if ($fieldlist[$field] == 'accountancy_code_sell') { $valuetoshow = $langs->trans("AccountancyCodeSell"); }
-            if ($fieldlist[$field] == 'accountancy_code_buy') { $valuetoshow = $langs->trans("AccountancyCodeBuy"); }
-            if ($fieldlist[$field] == 'pcg_version' || $fieldlist[$field] == 'fk_pcg_version') { $valuetoshow = $langs->trans("Pcg_version"); }
-            if ($fieldlist[$field] == 'account_parent') { $valuetoshow = $langs->trans("Accountparent"); }
-            if ($fieldlist[$field] == 'pcg_type') { $valuetoshow = $langs->trans("Pcg_type"); }
-            if ($fieldlist[$field] == 'pcg_subtype') { $valuetoshow = $langs->trans("Pcg_subtype"); }
-            if ($fieldlist[$field] == 'sortorder') { $valuetoshow = $langs->trans("SortOrder"); }
-	        if ($fieldlist[$field] == 'short_label') { $valuetoshow = $langs->trans("ShortLabel"); }
+			}
+			if ($fieldlist[$field] == 'code') { $valuetoshow = $langs->trans("Code"); $class = 'maxwidth100'; }
+			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label')
+			{
+				$valuetoshow = $form->textwithtooltip($langs->trans("Label"), $langs->trans("LabelUsedByDefault"), 2, 1, img_help(1, ''));
+			}
+			if ($fieldlist[$field] == 'libelle_facture') {
+				$valuetoshow = $form->textwithtooltip($langs->trans("LabelOnDocuments"), $langs->trans("LabelUsedByDefault"), 2, 1, img_help(1, ''));
+			}
+			if ($fieldlist[$field] == 'country') {
+				if (in_array('region_id', $fieldlist)) { print '<td>&nbsp;</td>'; continue; }		// For region page, we do not show the country input
+				$valuetoshow = $langs->trans("Country");
+			}
+			if ($fieldlist[$field] == 'recuperableonly') { $valuetoshow = $langs->trans("NPR"); $class = "center"; }
+			if ($fieldlist[$field] == 'nbjour') { $valuetoshow = $langs->trans("NbOfDays"); }
+			if ($fieldlist[$field] == 'type_cdr') { $valuetoshow = $langs->trans("AtEndOfMonth"); $class = "center"; }
+			if ($fieldlist[$field] == 'decalage') { $valuetoshow = $langs->trans("Offset"); }
+			if ($fieldlist[$field] == 'width' || $fieldlist[$field] == 'nx') { $valuetoshow = $langs->trans("Width"); }
+			if ($fieldlist[$field] == 'height' || $fieldlist[$field] == 'ny') { $valuetoshow = $langs->trans("Height"); }
+			if ($fieldlist[$field] == 'unit' || $fieldlist[$field] == 'metric') { $valuetoshow = $langs->trans("MeasuringUnit"); }
+			if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { $valuetoshow = ''; }
+			if ($fieldlist[$field] == 'accountancy_code') { $valuetoshow = $langs->trans("AccountancyCode"); }
+			if ($fieldlist[$field] == 'accountancy_code_sell') { $valuetoshow = $langs->trans("AccountancyCodeSell"); }
+			if ($fieldlist[$field] == 'accountancy_code_buy') { $valuetoshow = $langs->trans("AccountancyCodeBuy"); }
+			if ($fieldlist[$field] == 'pcg_version' || $fieldlist[$field] == 'fk_pcg_version') { $valuetoshow = $langs->trans("Pcg_version"); }
+			if ($fieldlist[$field] == 'account_parent') { $valuetoshow = $langs->trans("Accountparent"); }
+			if ($fieldlist[$field] == 'pcg_type') { $valuetoshow = $langs->trans("Pcg_type"); }
+			if ($fieldlist[$field] == 'pcg_subtype') { $valuetoshow = $langs->trans("Pcg_subtype"); }
+			if ($fieldlist[$field] == 'sortorder') { $valuetoshow = $langs->trans("SortOrder"); }
+			if ($fieldlist[$field] == 'short_label') { $valuetoshow = $langs->trans("ShortLabel"); }
 			if ($fieldlist[$field] == 'range_account') { $valuetoshow = $langs->trans("Range"); }
 			if ($fieldlist[$field] == 'sens') { $valuetoshow = $langs->trans("Sens"); }
 			if ($fieldlist[$field] == 'category_type') { $valuetoshow = $langs->trans("Calculated"); }
@@ -1175,416 +1191,428 @@ if ($id)
 			if ($fieldlist[$field] == 'range_ik') { $valuetoshow = $langs->trans("RangeIk"); }
 			if ($fieldlist[$field] == 'fk_c_exp_tax_cat') { $valuetoshow = $langs->trans("CarCategory"); }
 			if ($fieldlist[$field] == 'revenuestamp_type') { $valuetoshow = $langs->trans('TypeOfRevenueStamp'); }
-			if ($fieldlist[$field] == 'use_default') { $valuetoshow = $langs->trans('Default'); }
+			if ($fieldlist[$field] == 'use_default') { $valuetoshow = $langs->trans('Default'); $class = 'center'; }
+			if ($fieldlist[$field] == 'unit_type') { $valuetoshow = $langs->trans('TypeOfUnit'); }
 
-            if ($id == 2)	// Special case for state page
-            {
-                if ($fieldlist[$field] == 'region_id') { $valuetoshow = '&nbsp;'; $showfield = 1; }
-                if ($fieldlist[$field] == 'region') { $valuetoshow = $langs->trans("Country").'/'.$langs->trans("Region"); $showfield = 1; }
-            }
+			if ($id == 2)	// Special case for state page
+			{
+				if ($fieldlist[$field] == 'region_id') { $valuetoshow = '&nbsp;'; $showfield = 1; }
+				if ($fieldlist[$field] == 'region') { $valuetoshow = $langs->trans("Country").'/'.$langs->trans("Region"); $showfield = 1; }
+			}
 
-            if ($valuetoshow != '')
-            {
-                print '<td'.($class ? ' class="'.$class.'"' : '').'>';
-                if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
-                elseif (!empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
-                else print $valuetoshow;
-                print '</td>';
-            }
-            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') $alabelisused = 1;
-        }
+			if ($valuetoshow != '')
+			{
+				$tdsoffields .= '<td'.($class ? ' class="'.$class.'"' : '').'>';
+				if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) $tdsoffields .= '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+				elseif (!empty($tabhelp[$id][$value])) $tdsoffields .= $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
+				else $tdsoffields .= $valuetoshow;
+				$tdsoffields .= '</td>';
+			}
+			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') $alabelisused = 1;
+		}
 
-        if ($id == 4) print '<td></td>';
-        print '<td>';
-        print '<input type="hidden" name="id" value="'.$id.'">';
-        if (!is_null($withentity))
-        	print '<input type="hidden" name="entity" value="'.$withentity.'">';
-        print '</td>';
-        print '<td style="min-width: 26px;"></td>';
-        print '<td style="min-width: 26px;"></td>';
-        print '</tr>';
+		if ($id == 4) $tdsoffields .= '<td></td>';
+		$tdsoffields .= '<td>';
+		$tdsoffields .= '<input type="hidden" name="id" value="'.$id.'">';
+		if (!is_null($withentity))
+			$tdsoffields .= '<input type="hidden" name="entity" value="'.$withentity.'">';
+		$tdsoffields .= '</td>';
+		$tdsoffields .= '<td style="min-width: 26px;"></td>';
+		$tdsoffields .= '<td style="min-width: 26px;"></td>';
+		$tdsoffields .= '</tr>';
 
-        // Line to enter new values
-        print '<!-- line to add new entry -->';
-        print '<tr class="oddeven nodrag nodrop nohover">';
+		print $tdsoffields;
 
-        $obj = new stdClass();
-        // If data was already input, we define them in obj to populate input fields.
-        if (GETPOST('actionadd'))
-        {
-            foreach ($fieldlist as $key=>$val)
-            {
-                if (GETPOST($val) != '')
-                	$obj->$val = GETPOST($val);
-            }
-        }
 
-        $tmpaction = 'create';
-        $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-        $reshook = $hookmanager->executeHooks('createDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
-        $error = $hookmanager->error; $errors = $hookmanager->errors;
+		$obj = new stdClass();
+		// If data was already input, we define them in obj to populate input fields.
+		if (GETPOST('actionadd'))
+		{
+			foreach ($fieldlist as $key=>$val)
+			{
+				if (GETPOST($val) != '')
+					$obj->$val = GETPOST($val);
+			}
+		}
 
-        if ($id == 3) unset($fieldlist[2]); // Remove field ??? if dictionary Regions
+		$tmpaction = 'create';
+		$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+		$reshook = $hookmanager->executeHooks('createDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+		$error = $hookmanager->error; $errors = $hookmanager->errors;
 
-        if (empty($reshook))
-        {
-       		fieldList($fieldlist, $obj, $tabname[$id], 'add');
-        }
+		if ($id == 3) unset($fieldlist[2]); // Remove field ??? if dictionary Regions
 
-        if ($id == 4) print '<td></td>';
-        print '<td colspan="3" class="center">';
-        if ($action != 'edit')
-        {
-        	print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
-        }
-        print '</td>';
-        print "</tr>";
+		// Line to enter new values
+		print '<!-- line to add new entry -->';
+		print '<tr class="oddeven nodrag nodrop nohover">';
 
-        $colspan = count($fieldlist) + 3;
-        if ($id == 4) $colspan++;
+		if (empty($reshook))
+		{
+	   		fieldList($fieldlist, $obj, $tabname[$id], 'add');
+		}
 
-        print '</table>';
+		if ($id == 4) print '<td></td>';
+		print '<td colspan="3" class="center">';
+		if ($action != 'edit')
+		{
+			print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
+		}
+		print '</td>';
+
+		print "</tr>";
+
+		print '</table>';
 		print '</div>';
-    }
+	}
 
-    print '</form>';
+	print '</form>';
 
 
-    print '<br>';
+	print '<br>';
 
 
-    print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
+	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
 
-    // List of available record in database
-    dol_syslog("htdocs/admin/dict", LOG_DEBUG);
+	// List of available record in database
+	dol_syslog("htdocs/admin/dict", LOG_DEBUG);
 
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
 
-        // There is several pages
-        if ($num > $listlimit || $page)
-        {
-            print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page + 1).'</span></li>');
-            print '<div class="clearboth"></div>';
-        }
+		// There is several pages
+		if ($num > $listlimit || $page)
+		{
+			print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page + 1).'</span></li>');
+			print '<div class="clearboth"></div>';
+		}
 
-	    print '<div class="div-table-responsive">';
-        print '<table class="noborder centpercent">';
+		print '<div class="div-table-responsive">';
+		print '<table class="noborder centpercent">';
 
-        // Title line with search input fields
-        print '<tr class="liste_titre_filter">';
-        $filterfound = 0;
-        foreach ($fieldlist as $field => $value)
-        {
-        	if ($fieldlist[$field] == 'entity') continue;
+		// Title line with search input fields
+		print '<tr class="liste_titre_filter">';
+		$filterfound = 0;
+		foreach ($fieldlist as $field => $value)
+		{
+			if ($fieldlist[$field] == 'entity') continue;
 
-            $showfield = 1; // By default
-
-            if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { $showfield = 0; }
-
-            if ($showfield)
-            {
-                if ($value == 'country')
-                {
-                    print '<td class="liste_titre">';
-                    print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth150 maxwidthonsmartphone');
-                    print '</td>';
-                    $filterfound++;
-                } elseif ($value == 'code')
-                {
-                    print '<td class="liste_titre">';
-                    print '<input type="text" class="maxwidth100" name="search_code" value="'.dol_escape_htmltag($search_code).'">';
-                    print '</td>';
-                    $filterfound++;
-                } else {
-                    print '<td class="liste_titre">';
-                    print '</td>';
-                }
-            }
-        }
-        if ($id == 4) print '<td></td>';
-        print '<td class="liste_titre"></td>';
-    	print '<td class="liste_titre right" colspan="2">';
-    	if ($filterfound)
-    	{
-        	$searchpicto = $form->showFilterAndCheckAddButtons(0);
-        	print $searchpicto;
-    	}
-    	print '</td>';
-        print '</tr>';
-
-        // Title of lines
-        print '<tr class="liste_titre">';
-        foreach ($fieldlist as $field => $value)
-        {
-        	if ($fieldlist[$field] == 'entity') continue;
-
-            // Determines the name of the field in relation to the possible names
-            // in data dictionaries
-            $showfield = 1; // By defaut
-            $cssprefix = '';
-            $sortable = 1;
-            $valuetoshow = ucfirst($fieldlist[$field]); // By defaut
-            $valuetoshow = $langs->trans($valuetoshow); // try to translate
-
-            // Special cases
-            if ($fieldlist[$field] == 'source') { $valuetoshow = $langs->trans("Contact"); }
-            if ($fieldlist[$field] == 'price') { $valuetoshow = $langs->trans("PriceUHT"); }
-            if ($fieldlist[$field] == 'taux') {
-				if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") $valuetoshow = $langs->trans("Rate");
-				else $valuetoshow = $langs->trans("Amount");
-				$cssprefix = 'center ';
-            }
-            if ($fieldlist[$field] == 'localtax1_type') { $valuetoshow = $langs->trans("UseLocalTax")." 2"; $cssprefix = "center "; $sortable = 0; }
-            if ($fieldlist[$field] == 'localtax1') { $valuetoshow = $langs->trans("Rate")." 2"; $cssprefix = "center "; $sortable = 0; }
-            if ($fieldlist[$field] == 'localtax2_type') { $valuetoshow = $langs->trans("UseLocalTax")." 3"; $cssprefix = "center "; $sortable = 0; }
-            if ($fieldlist[$field] == 'localtax2') { $valuetoshow = $langs->trans("Rate")." 3"; $cssprefix = "center "; $sortable = 0; }
-            if ($fieldlist[$field] == 'organization') { $valuetoshow = $langs->trans("Organization"); }
-            if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
-            if ($fieldlist[$field] == 'type') { $valuetoshow = $langs->trans("Type"); }
-            if ($fieldlist[$field] == 'code') { $valuetoshow = $langs->trans("Code"); }
-            if ($fieldlist[$field] == 'position') { $cssprefix = 'right '; }
-            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') { $valuetoshow = $langs->trans("Label"); }
-            if ($fieldlist[$field] == 'libelle_facture') { $valuetoshow = $langs->trans("LabelOnDocuments"); }
-            if ($fieldlist[$field] == 'country') { $valuetoshow = $langs->trans("Country"); }
-            if ($fieldlist[$field] == 'recuperableonly') { $valuetoshow = $langs->trans("NPR"); $cssprefix = "center "; }
-            if ($fieldlist[$field] == 'nbjour') { $valuetoshow = $langs->trans("NbOfDays"); }
-            if ($fieldlist[$field] == 'type_cdr') { $valuetoshow = $langs->trans("AtEndOfMonth"); $cssprefix = "center "; }
-            if ($fieldlist[$field] == 'decalage') { $valuetoshow = $langs->trans("Offset"); }
-            if ($fieldlist[$field] == 'width' || $fieldlist[$field] == 'nx') { $valuetoshow = $langs->trans("Width"); }
-            if ($fieldlist[$field] == 'height' || $fieldlist[$field] == 'ny') { $valuetoshow = $langs->trans("Height"); }
-            if ($fieldlist[$field] == 'unit' || $fieldlist[$field] == 'metric') { $valuetoshow = $langs->trans("MeasuringUnit"); }
-            if ($fieldlist[$field] == 'accountancy_code') { $valuetoshow = $langs->trans("AccountancyCode"); }
-            if ($fieldlist[$field] == 'accountancy_code_sell') { $valuetoshow = $langs->trans("AccountancyCodeSell"); $sortable = 0; }
-            if ($fieldlist[$field] == 'accountancy_code_buy') { $valuetoshow = $langs->trans("AccountancyCodeBuy"); $sortable = 0; }
-			if ($fieldlist[$field] == 'fk_pcg_version') { $valuetoshow = $langs->trans("Pcg_version"); }
-            if ($fieldlist[$field] == 'account_parent') { $valuetoshow = $langs->trans("Accountsparent"); }
-            if ($fieldlist[$field] == 'pcg_type') { $valuetoshow = $langs->trans("Pcg_type"); }
-            if ($fieldlist[$field] == 'pcg_subtype') { $valuetoshow = $langs->trans("Pcg_subtype"); }
-            if ($fieldlist[$field] == 'sortorder') { $valuetoshow = $langs->trans("SortOrder"); }
-            if ($fieldlist[$field] == 'short_label') { $valuetoshow = $langs->trans("ShortLabel"); }
-			if ($fieldlist[$field] == 'range_account') { $valuetoshow = $langs->trans("Range"); }
-			if ($fieldlist[$field] == 'sens') { $valuetoshow = $langs->trans("Sens"); }
-			if ($fieldlist[$field] == 'category_type') { $valuetoshow = $langs->trans("Calculated"); }
-			if ($fieldlist[$field] == 'formula') { $valuetoshow = $langs->trans("Formula"); }
-			if ($fieldlist[$field] == 'paper_size') { $valuetoshow = $langs->trans("PaperSize"); }
-			if ($fieldlist[$field] == 'orientation') { $valuetoshow = $langs->trans("Orientation"); }
-			if ($fieldlist[$field] == 'leftmargin') { $valuetoshow = $langs->trans("LeftMargin"); }
-			if ($fieldlist[$field] == 'topmargin') { $valuetoshow = $langs->trans("TopMargin"); }
-			if ($fieldlist[$field] == 'spacex') { $valuetoshow = $langs->trans("SpaceX"); }
-			if ($fieldlist[$field] == 'spacey') { $valuetoshow = $langs->trans("SpaceY"); }
-			if ($fieldlist[$field] == 'font_size') { $valuetoshow = $langs->trans("FontSize"); }
-			if ($fieldlist[$field] == 'custom_x') { $valuetoshow = $langs->trans("CustomX"); }
-			if ($fieldlist[$field] == 'custom_y') { $valuetoshow = $langs->trans("CustomY"); }
-			if ($fieldlist[$field] == 'percent') { $valuetoshow = $langs->trans("Percentage"); }
-			if ($fieldlist[$field] == 'affect') { $valuetoshow = $langs->trans("WithCounter"); }
-			if ($fieldlist[$field] == 'delay') { $valuetoshow = $langs->trans("NoticePeriod"); }
-			if ($fieldlist[$field] == 'newbymonth') { $valuetoshow = $langs->trans("NewByMonth"); }
-			if ($fieldlist[$field] == 'fk_tva') { $valuetoshow = $langs->trans("VAT"); }
-			if ($fieldlist[$field] == 'range_ik') { $valuetoshow = $langs->trans("RangeIk"); }
-			if ($fieldlist[$field] == 'fk_c_exp_tax_cat') { $valuetoshow = $langs->trans("CarCategory"); }
-			if ($fieldlist[$field] == 'revenuestamp_type') { $valuetoshow = $langs->trans('TypeOfRevenueStamp'); }
-			if ($fieldlist[$field] == 'use_default') { $valuetoshow = $langs->trans('Default'); }
+			$showfield = 1; // By default
 
 			if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { $showfield = 0; }
 
-            // Show field title
-            if ($showfield)
-            {
-                print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), $param, '', $sortfield, $sortorder, $cssprefix);
-            }
-        }
+			if ($showfield)
+			{
+				if ($value == 'country')
+				{
+					print '<td class="liste_titre">';
+					print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth150 maxwidthonsmartphone');
+					print '</td>';
+					$filterfound++;
+				} elseif ($value == 'code')
+				{
+					print '<td class="liste_titre">';
+					print '<input type="text" class="maxwidth100" name="search_code" value="'.dol_escape_htmltag($search_code).'">';
+					print '</td>';
+					$filterfound++;
+				} else {
+					print '<td class="liste_titre">';
+					print '</td>';
+				}
+			}
+		}
+		if ($id == 4) print '<td></td>';
+		print '<td class="liste_titre"></td>';
+		print '<td class="liste_titre right" colspan="2">';
+		if ($filterfound)
+		{
+			$searchpicto = $form->showFilterAndCheckAddButtons(0);
+			print $searchpicto;
+		}
+		print '</td>';
+		print '</tr>';
+
+		// Title of lines
+		print '<tr class="liste_titre">';
+		foreach ($fieldlist as $field => $value)
+		{
+			if ($fieldlist[$field] == 'entity') continue;
+
+			if (in_array($value, array('label', 'libelle', 'libelle_facture')) && empty($tabhelp[$id][$value])) {
+				$tabhelp[$id][$value] = $langs->trans('LabelUsedByDefault');
+			}
+
+			// Determines the name of the field in relation to the possible names
+			// in data dictionaries
+			$showfield = 1; // By defaut
+			$cssprefix = '';
+			$sortable = 1;
+			$valuetoshow = ucfirst($fieldlist[$field]); // By defaut
+			$valuetoshow = $langs->trans($valuetoshow); // try to translate
+
+			// Special cases
+			if ($fieldlist[$field] == 'source') { $valuetoshow = $langs->trans("Contact"); }
+			if ($fieldlist[$field] == 'price') { $valuetoshow = $langs->trans("PriceUHT"); }
+			if ($fieldlist[$field] == 'taux') {
+				if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") $valuetoshow = $langs->trans("Rate");
+				else $valuetoshow = $langs->trans("Amount");
+				$cssprefix = 'center ';
+			}
+			if ($fieldlist[$field] == 'localtax1_type') { $valuetoshow = $langs->trans("UseLocalTax")." 2"; $cssprefix = "center "; $sortable = 0; }
+			if ($fieldlist[$field] == 'localtax1') { $valuetoshow = $langs->trans("Rate")." 2"; $cssprefix = "center "; $sortable = 0; }
+			if ($fieldlist[$field] == 'localtax2_type') { $valuetoshow = $langs->trans("UseLocalTax")." 3"; $cssprefix = "center "; $sortable = 0; }
+			if ($fieldlist[$field] == 'localtax2') { $valuetoshow = $langs->trans("Rate")." 3"; $cssprefix = "center "; $sortable = 0; }
+			if ($fieldlist[$field] == 'organization') { $valuetoshow = $langs->trans("Organization"); }
+			if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
+			if ($fieldlist[$field] == 'type') { $valuetoshow = $langs->trans("Type"); }
+			if ($fieldlist[$field] == 'code') { $valuetoshow = $langs->trans("Code"); }
+			if ($fieldlist[$field] == 'pos') { $cssprefix = 'right '; $valuetoshow = $langs->trans("Position"); }
+			if ($fieldlist[$field] == 'position') { $cssprefix = 'right '; $valuetoshow = $langs->trans("Position"); }
+			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') { $valuetoshow = $langs->trans("Label"); }
+			if ($fieldlist[$field] == 'libelle_facture') { $valuetoshow = $langs->trans("LabelOnDocuments"); }
+			if ($fieldlist[$field] == 'country') { $valuetoshow = $langs->trans("Country"); }
+			if ($fieldlist[$field] == 'recuperableonly') { $valuetoshow = $langs->trans("NPR"); $cssprefix = "center "; }
+			if ($fieldlist[$field] == 'nbjour') { $valuetoshow = $langs->trans("NbOfDays"); }
+			if ($fieldlist[$field] == 'type_cdr') { $valuetoshow = $langs->trans("AtEndOfMonth"); $cssprefix = "center "; }
+			if ($fieldlist[$field] == 'decalage') { $valuetoshow = $langs->trans("Offset"); }
+			if ($fieldlist[$field] == 'width' || $fieldlist[$field] == 'nx') { $valuetoshow = $langs->trans("Width"); }
+			if ($fieldlist[$field] == 'height' || $fieldlist[$field] == 'ny') { $valuetoshow = $langs->trans("Height"); }
+			if ($fieldlist[$field] == 'unit' || $fieldlist[$field] == 'metric') { $valuetoshow = $langs->trans("MeasuringUnit"); }
+			if ($fieldlist[$field] == 'accountancy_code') { $valuetoshow = $langs->trans("AccountancyCode"); }
+			if ($fieldlist[$field] == 'accountancy_code_sell') { $valuetoshow = $langs->trans("AccountancyCodeSell"); $sortable = 0; }
+			if ($fieldlist[$field] == 'accountancy_code_buy') { $valuetoshow = $langs->trans("AccountancyCodeBuy"); $sortable = 0; }
+			if ($fieldlist[$field] == 'fk_pcg_version') { $valuetoshow = $langs->trans("Pcg_version"); }
+			if ($fieldlist[$field] == 'account_parent') { $valuetoshow = $langs->trans("Accountsparent"); }
+			if ($fieldlist[$field] == 'pcg_type') { $valuetoshow = $langs->trans("Pcg_type"); }
+			if ($fieldlist[$field] == 'pcg_subtype') { $valuetoshow = $langs->trans("Pcg_subtype"); }
+			if ($fieldlist[$field] == 'sortorder') { $valuetoshow = $langs->trans("SortOrder"); }
+			if ($fieldlist[$field] == 'short_label') { $valuetoshow = $langs->trans("ShortLabel"); }
+			if ($fieldlist[$field] == 'range_account') { $valuetoshow = $langs->trans("Range"); }
+			if ($fieldlist[$field] == 'sens') { $valuetoshow = $langs->trans("Sens"); }
+			if ($fieldlist[$field] == 'category_type') { $valuetoshow = $langs->trans("Calculated"); }
+			if ($fieldlist[$field] == 'formula') { $valuetoshow = $langs->trans("Formula"); }
+			if ($fieldlist[$field] == 'paper_size') { $valuetoshow = $langs->trans("PaperSize"); }
+			if ($fieldlist[$field] == 'orientation') { $valuetoshow = $langs->trans("Orientation"); }
+			if ($fieldlist[$field] == 'leftmargin') { $valuetoshow = $langs->trans("LeftMargin"); }
+			if ($fieldlist[$field] == 'topmargin') { $valuetoshow = $langs->trans("TopMargin"); }
+			if ($fieldlist[$field] == 'spacex') { $valuetoshow = $langs->trans("SpaceX"); }
+			if ($fieldlist[$field] == 'spacey') { $valuetoshow = $langs->trans("SpaceY"); }
+			if ($fieldlist[$field] == 'font_size') { $valuetoshow = $langs->trans("FontSize"); }
+			if ($fieldlist[$field] == 'custom_x') { $valuetoshow = $langs->trans("CustomX"); }
+			if ($fieldlist[$field] == 'custom_y') { $valuetoshow = $langs->trans("CustomY"); }
+			if ($fieldlist[$field] == 'percent') { $valuetoshow = $langs->trans("Percentage"); }
+			if ($fieldlist[$field] == 'affect') { $valuetoshow = $langs->trans("WithCounter"); }
+			if ($fieldlist[$field] == 'delay') { $valuetoshow = $langs->trans("NoticePeriod"); }
+			if ($fieldlist[$field] == 'newbymonth') { $valuetoshow = $langs->trans("NewByMonth"); }
+			if ($fieldlist[$field] == 'fk_tva') { $valuetoshow = $langs->trans("VAT"); }
+			if ($fieldlist[$field] == 'range_ik') { $valuetoshow = $langs->trans("RangeIk"); }
+			if ($fieldlist[$field] == 'fk_c_exp_tax_cat') { $valuetoshow = $langs->trans("CarCategory"); }
+			if ($fieldlist[$field] == 'revenuestamp_type') { $valuetoshow = $langs->trans('TypeOfRevenueStamp'); }
+			if ($fieldlist[$field] == 'use_default') { $valuetoshow = $langs->trans('Default'); $cssprefix = 'center '; }
+			if ($fieldlist[$field] == 'unit_type') { $valuetoshow = $langs->trans('TypeOfUnit'); }
+
+			if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { $showfield = 0; }
+
+			// Show field title
+			if ($showfield)
+			{
+				if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) $newvaluetoshow = '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+				elseif (!empty($tabhelp[$id][$value])) $newvaluetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
+				else $newvaluetoshow = $valuetoshow;
+
+				print getTitleFieldOfList($newvaluetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), $param, '', $sortfield, $sortorder, $cssprefix);
+			}
+		}
 		// Favorite - Only activated on country dictionary
-        if ($id == 4) print getTitleFieldOfList($langs->trans("Favorite"), 0, $_SERVER["PHP_SELF"], "favorite", ($page ? 'page='.$page.'&' : ''), $param, 'align="center"', $sortfield, $sortorder);
+		if ($id == 4) print getTitleFieldOfList($langs->trans("Favorite"), 0, $_SERVER["PHP_SELF"], "favorite", ($page ? 'page='.$page.'&' : ''), $param, 'align="center"', $sortfield, $sortorder);
 
 		print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page ? 'page='.$page.'&' : ''), $param, 'align="center"', $sortfield, $sortorder);
-        print getTitleFieldOfList('');
-        print getTitleFieldOfList('');
-        print '</tr>';
+		print getTitleFieldOfList('');
+		print getTitleFieldOfList('');
+		print '</tr>';
 
-        if ($num)
-        {
-            // Lines with values
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
-                //print_r($obj);
-                print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
-                if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code)))
-                {
-                    $tmpaction = 'edit';
-                    $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-                    $reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
-                    $error = $hookmanager->error; $errors = $hookmanager->errors;
+		if ($num)
+		{
+			// Lines with values
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
+				//print_r($obj);
+				print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
+				if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code)))
+				{
+					$tmpaction = 'edit';
+					$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+					$reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+					$error = $hookmanager->error; $errors = $hookmanager->errors;
 
-                    // Show fields
-                    if (empty($reshook)) {
-                    	$withentity = fieldList($fieldlist, $obj, $tabname[$id], 'edit');
-                    }
+					// Show fields
+					if (empty($reshook)) {
+						$withentity = fieldList($fieldlist, $obj, $tabname[$id], 'edit');
+					}
 
-                    print '<td colspan="3" class="center">';
-                    print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
-                    print '<input type="hidden" name="page" value="'.dol_escape_htmltag($page).'">';
-                    print '<input type="hidden" name="rowid" value="'.dol_escape_htmltag($rowid).'">';
-                    if (!is_null($withentity))
-                    	print '<input type="hidden" name="entity" value="'.$withentity.'">';
-                    print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
-                    print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
-                    print '</td>';
-                } else {
-	              	$tmpaction = 'view';
-                    $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-                    $reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+					print '<td colspan="3" class="center">';
+					print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
+					print '<input type="hidden" name="page" value="'.dol_escape_htmltag($page).'">';
+					print '<input type="hidden" name="rowid" value="'.dol_escape_htmltag($rowid).'">';
+					if (!is_null($withentity))
+						print '<input type="hidden" name="entity" value="'.$withentity.'">';
+					print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+					print '<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'">';
+					print '</td>';
+				} else {
+				  	$tmpaction = 'view';
+					$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+					$reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 
-                    $error = $hookmanager->error; $errors = $hookmanager->errors;
+					$error = $hookmanager->error; $errors = $hookmanager->errors;
 
-                    if (empty($reshook))
-                    {
-                    	$withentity = null;
+					if (empty($reshook))
+					{
+						$withentity = null;
 
-                        foreach ($fieldlist as $field => $value)
-                        {
-                        	//var_dump($fieldlist);
-                        	$class = '';
-                        	$showfield = 1;
-                        	$valuetoshow = $obj->{$fieldlist[$field]};
+						foreach ($fieldlist as $field => $value)
+						{
+							//var_dump($fieldlist);
+							$class = '';
+							$showfield = 1;
+							$valuetoshow = $obj->{$fieldlist[$field]};
 
-                        	if ($fieldlist[$field] == 'entity') {
-                        		$withentity = $valuetoshow;
-                        		continue;
-                        	}
+							if ($fieldlist[$field] == 'entity') {
+								$withentity = $valuetoshow;
+								continue;
+							}
 
-                            if ($value == 'element')
-                            {
-                                $valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
-                            } elseif ($value == 'source')
-                            {
-                                $valuetoshow = isset($sourceList[$valuetoshow]) ? $sourceList[$valuetoshow] : $valuetoshow;
-                            } elseif ($valuetoshow == 'all') {
-                                $valuetoshow = $langs->trans('All');
-                            } elseif ($fieldlist[$field] == 'country') {
-                                if (empty($obj->country_code))
-                                {
-                                    $valuetoshow = '-';
-                                } else {
-                                    $key = $langs->trans("Country".strtoupper($obj->country_code));
-                                    $valuetoshow = ($key != "Country".strtoupper($obj->country_code) ? $obj->country_code." - ".$key : $obj->country);
-                                }
-                            } elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
-                                $valuetoshow = yn($valuetoshow);
-                                $class = "center";
-                            } elseif ($fieldlist[$field] == 'type_cdr') {
-                				if (empty($valuetoshow)) $valuetoshow = $langs->trans('None');
-                				elseif ($valuetoshow == 1) $valuetoshow = $langs->trans('AtEndOfMonth');
-                				elseif ($valuetoshow == 2) $valuetoshow = $langs->trans('CurrentNext');
-                                $class = "center";
-                            } elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i', $fieldlist[$field])) {
-                                $valuetoshow = price($valuetoshow);
-                            }
-                            if ($value == 'private')
-                            {
-                                $valuetoshow = yn($elementList[$valuetoshow]);
-                            } elseif ($fieldlist[$field] == 'libelle_facture') {
-                                $langs->load("bills");
-                                $key = $langs->trans("PaymentCondition".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "PaymentCondition".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                                $valuetoshow = nl2br($valuetoshow);
-                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_country') {
-                                $key = $langs->trans("Country".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "Country".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_availability') {
-                                $langs->load("propal");
-                                $key = $langs->trans("AvailabilityType".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "AvailabilityType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_actioncomm') {
-                                $key = $langs->trans("Action".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "Action".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif (!empty($obj->code_iso) && $fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_currencies') {
-                                $key = $langs->trans("Currency".strtoupper($obj->code_iso));
-                                $valuetoshow = ($obj->code_iso && $key != "Currency".strtoupper($obj->code_iso) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_typent') {
-                                $key = $langs->trans(strtoupper($obj->code));
-                                $valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_prospectlevel') {
-                                $key = $langs->trans(strtoupper($obj->code));
-                                $valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_civility') {
-                                $key = $langs->trans("Civility".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "Civility".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_contact') {
-                            	$langs->load('agenda');
-                                $key = $langs->trans("TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_payment_term') {
-                                $langs->load("bills");
-                                $key = $langs->trans("PaymentConditionShort".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "PaymentConditionShort".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
-                                $langs->load("bills");
-                                $key = $langs->trans("PaymentType".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "PaymentType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'type' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
-                            	$payment_type_list = array(0=>$langs->trans('PaymentTypeCustomer'), 1=>$langs->trans('PaymentTypeSupplier'), 2=>$langs->trans('PaymentTypeBoth'));
-                            	$valuetoshow = $payment_type_list[$valuetoshow];
-                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_reason') {
-                                $key = $langs->trans("DemandReasonType".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "DemandReasonType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_method') {
-                                $langs->load("orders");
-                                $key = $langs->trans($obj->code);
-                                $valuetoshow = ($obj->code && $key != $obj->code) ? $key : $obj->{$fieldlist[$field]};
-                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_shipment_mode') {
-                                $langs->load("sendings");
-                                $key = $langs->trans("SendingMethod".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "SendingMethod".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paper_format')
-                            {
-                                $key = $langs->trans('PaperFormat'.strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != 'PaperFormat'.strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_fees')
-                            {
-                                $langs->load('trips');
-                                $key = $langs->trans(strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
-                                $showfield = 0;
-                            } elseif ($fieldlist[$field] == 'unicode') {
-                            	$valuetoshow = $langs->getCurrencySymbol($obj->code, 1);
-                            } elseif ($fieldlist[$field] == 'label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX.'c_units') {
-	                            $langs->load("products");
-	                            $valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'short_label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX.'c_units') {
-	                            $langs->load("products");
-	                            $valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
-                            } elseif (($fieldlist[$field] == 'unit') && ($tabname[$id] == MAIN_DB_PREFIX.'c_paper_format'))
-                            {
-                            	$key = $langs->trans('SizeUnit'.strtolower($obj->unit));
-                                $valuetoshow = ($obj->code && $key != 'SizeUnit'.strtolower($obj->unit) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'localtax1' || $fieldlist[$field] == 'localtax2') {
-							    $class = "center";
+							if ($value == 'element')
+							{
+								$valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
+							} elseif ($value == 'source')
+							{
+								$valuetoshow = isset($sourceList[$valuetoshow]) ? $sourceList[$valuetoshow] : $valuetoshow;
+							} elseif ($valuetoshow == 'all') {
+								$valuetoshow = $langs->trans('All');
+							} elseif ($fieldlist[$field] == 'country') {
+								if (empty($obj->country_code))
+								{
+									$valuetoshow = '-';
+								} else {
+									$key = $langs->trans("Country".strtoupper($obj->country_code));
+									$valuetoshow = ($key != "Country".strtoupper($obj->country_code) ? $obj->country_code." - ".$key : $obj->country);
+								}
+							} elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
+								$valuetoshow = yn($valuetoshow);
+								$class = "center";
+							} elseif ($fieldlist[$field] == 'type_cdr') {
+								if (empty($valuetoshow)) $valuetoshow = $langs->trans('None');
+								elseif ($valuetoshow == 1) $valuetoshow = $langs->trans('AtEndOfMonth');
+								elseif ($valuetoshow == 2) $valuetoshow = $langs->trans('CurrentNext');
+								$class = "center";
+							} elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i', $fieldlist[$field])) {
+								$valuetoshow = price($valuetoshow);
+							}
+							if ($value == 'private')
+							{
+								$valuetoshow = yn($elementList[$valuetoshow]);
+							} elseif ($fieldlist[$field] == 'libelle_facture') {
+								$langs->load("bills");
+								$key = $langs->trans("PaymentCondition".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "PaymentCondition".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+								$valuetoshow = nl2br($valuetoshow);
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_country') {
+								$key = $langs->trans("Country".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "Country".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_availability') {
+								$langs->load("propal");
+								$key = $langs->trans("AvailabilityType".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "AvailabilityType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_actioncomm') {
+								$key = $langs->trans("Action".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "Action".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif (!empty($obj->code_iso) && $fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_currencies') {
+								$key = $langs->trans("Currency".strtoupper($obj->code_iso));
+								$valuetoshow = ($obj->code_iso && $key != "Currency".strtoupper($obj->code_iso) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_typent') {
+								$key = $langs->trans(strtoupper($obj->code));
+								$valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_prospectlevel') {
+								$key = $langs->trans(strtoupper($obj->code));
+								$valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_civility') {
+								$key = $langs->trans("Civility".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "Civility".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_contact') {
+								$langs->load('agenda');
+								$key = $langs->trans("TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_payment_term') {
+								$langs->load("bills");
+								$key = $langs->trans("PaymentConditionShort".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "PaymentConditionShort".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
+								$langs->load("bills");
+								$key = $langs->trans("PaymentType".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "PaymentType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'type' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
+								$payment_type_list = array(0=>$langs->trans('PaymentTypeCustomer'), 1=>$langs->trans('PaymentTypeSupplier'), 2=>$langs->trans('PaymentTypeBoth'));
+								$valuetoshow = $payment_type_list[$valuetoshow];
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_reason') {
+								$key = $langs->trans("DemandReasonType".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "DemandReasonType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_method') {
+								$langs->load("orders");
+								$key = $langs->trans($obj->code);
+								$valuetoshow = ($obj->code && $key != $obj->code) ? $key : $obj->{$fieldlist[$field]};
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_shipment_mode') {
+								$langs->load("sendings");
+								$key = $langs->trans("SendingMethod".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "SendingMethod".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paper_format')
+							{
+								$key = $langs->trans('PaperFormat'.strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != 'PaperFormat'.strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_fees')
+							{
+								$langs->load('trips');
+								$key = $langs->trans(strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
+								$showfield = 0;
+							} elseif ($fieldlist[$field] == 'unicode') {
+								$valuetoshow = $langs->getCurrencySymbol($obj->code, 1);
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX.'c_units') {
+								$langs->load("products");
+								$valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'short_label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX.'c_units') {
+								$langs->load("products");
+								$valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
+							} elseif (($fieldlist[$field] == 'unit') && ($tabname[$id] == MAIN_DB_PREFIX.'c_paper_format'))
+							{
+								$key = $langs->trans('SizeUnit'.strtolower($obj->unit));
+								$valuetoshow = ($obj->code && $key != 'SizeUnit'.strtolower($obj->unit) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'localtax1' || $fieldlist[$field] == 'localtax2') {
+								$class = "center";
 							} elseif ($fieldlist[$field] == 'localtax1_type') {
-                                if ($obj->localtax1 != 0)
-							        $valuetoshow = $localtax_typeList[$valuetoshow];
-							    else $valuetoshow = '';
-							    $class = "center";
+								if ($obj->localtax1 != 0)
+									$valuetoshow = $localtax_typeList[$valuetoshow];
+								else $valuetoshow = '';
+								$class = "center";
 							} elseif ($fieldlist[$field] == 'localtax2_type') {
-							    if ($obj->localtax2 != 0)
-							        $valuetoshow = $localtax_typeList[$valuetoshow];
-							    else $valuetoshow = '';
-							    $class = "center";
+								if ($obj->localtax2 != 0)
+									$valuetoshow = $localtax_typeList[$valuetoshow];
+								else $valuetoshow = '';
+								$class = "center";
 							} elseif ($fieldlist[$field] == 'taux') {
-                                $valuetoshow = price($valuetoshow, 0, $langs, 0, 0);
-							    $class = "center";
+								$valuetoshow = price($valuetoshow, 0, $langs, 0, 0);
+								$class = "center";
 							} elseif (in_array($fieldlist[$field], array('recuperableonly'))) {
 								$class = "center";
 							} elseif ($fieldlist[$field] == 'accountancy_code' || $fieldlist[$field] == 'accountancy_code_sell' || $fieldlist[$field] == 'accountancy_code_buy') {
-                                $valuetoshow = length_accountg($valuetoshow);
-                            } elseif ($fieldlist[$field] == 'fk_tva')
+								$valuetoshow = length_accountg($valuetoshow);
+							} elseif ($fieldlist[$field] == 'fk_tva')
 							{
 								foreach ($form->cache_vatrates as $key => $Tab)
 								{
@@ -1608,50 +1636,56 @@ if ($id)
 								$valuetoshow = ($obj->label && $key != strtoupper($obj->label) ? $key : $obj->{$fieldlist[$field]});
 							} elseif ($fieldlist[$field] == 'code' && $id == 3) {
 								$valuetoshow = $obj->state_code;
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_product_nature') {
+								$langs->load("products");
+								$valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
 							}
-                            $class .= ($class ? ' ' : '').'tddict';
-                            if ($fieldlist[$field] == 'note' && $id == 10) $class .= ' tdoverflowmax200';
-                            if ($fieldlist[$field] == 'tracking') $class .= ' tdoverflowauto';
-                            if ($fieldlist[$field] == 'position') $class .= ' right';
-                            if ($fieldlist[$field] == 'localtax1_type') $class .= ' nowrap';
-                            if ($fieldlist[$field] == 'localtax2_type') $class .= ' nowrap';
-                            // Show value for field
+							$class .= ($class ? ' ' : '').'tddict';
+							if ($fieldlist[$field] == 'note' && $id == 10) $class .= ' tdoverflowmax200';
+							if ($fieldlist[$field] == 'tracking') $class .= ' tdoverflowauto';
+							if ($fieldlist[$field] == 'position') $class .= ' right';
+							if ($fieldlist[$field] == 'localtax1_type') $class .= ' nowrap';
+							if ($fieldlist[$field] == 'localtax2_type') $class .= ' nowrap';
+							if ($fieldlist[$field] == 'pos') $class .= ' right';
+							if ($fieldlist[$field] == 'use_default') $class .= ' center';
+							// Show value for field
 							if ($showfield) print '<!-- '.$fieldlist[$field].' --><td class="'.$class.'">'.$valuetoshow.'</td>';
-                        }
-                    }
+						}
+					}
 
-                    // Can an entry be erased or disabled ?
-                    // all true by default
-                    $iserasable = 1;
-                    $canbedisabled = 1;
-                    $canbemodified = 1;
-                    if (isset($obj->code) && $id != 10)
-                    {
-                    	if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i', $obj->code))) { $iserasable = 0; $canbedisabled = 0; } elseif ($obj->code == 'RECEP') { $iserasable = 0; $canbedisabled = 0; } elseif ($obj->code == 'EF0') { $iserasable = 0; $canbedisabled = 0; }
-                    }
+					// Can an entry be erased or disabled ?
+					// all true by default
+					$iserasable = 1;
+					$canbedisabled = 1;
+					$canbemodified = 1;
+					if (isset($obj->code) && $id != 10 && $id != 42)
+					{
+						if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i', $obj->code))) { $iserasable = 0; $canbedisabled = 0; } elseif ($obj->code == 'RECEP') { $iserasable = 0; $canbedisabled = 0; } elseif ($obj->code == 'EF0') { $iserasable = 0; $canbedisabled = 0; }
+					}
 					if ($id == 25 && in_array($obj->code, array('banner', 'blogpost', 'other', 'page')))
 					{
 						$iserasable = 0; $canbedisabled = 0;
 						if (in_array($obj->code, array('banner'))) $canbedisabled = 1;
 					}
-                    if (isset($obj->type) && in_array($obj->type, array('system', 'systemauto'))) { $iserasable = 0; }
-                    if (in_array($obj->code, array('AC_OTH', 'AC_OTH_AUTO')) || in_array($obj->type, array('systemauto'))) { $canbedisabled = 0; $canbedisabled = 0; }
-                    $canbemodified = $iserasable;
-                    if ($obj->code == 'RECEP') $canbemodified = 1;
-                    if ($tabname[$id] == MAIN_DB_PREFIX."c_actioncomm") $canbemodified = 1;
+					if (isset($obj->type) && in_array($obj->type, array('system', 'systemauto'))) { $iserasable = 0; }
+					if (in_array($obj->code, array('AC_OTH', 'AC_OTH_AUTO')) || in_array($obj->type, array('systemauto'))) { $canbedisabled = 0; $canbedisabled = 0; }
+					$canbemodified = $iserasable;
 
-                    // Build Url. The table is id=, the id of line is rowid=
-                    $rowidcol = $tabrowid[$id];
-                    // If rowidcol not defined
-                    if (empty($rowidcol) || in_array($id, array(6, 7, 8, 13, 17, 19, 27, 32))) $rowidcol = 'rowid';
-                    $url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.((!empty($obj->{$rowidcol}) || $obj->{$rowidcol} == '0') ? $obj->{$rowidcol}:(!empty($obj->code) ?urlencode($obj->code) : '')).'&code='.(!empty($obj->code) ?urlencode($obj->code) : '');
-                    if (!empty($param)) $url .= '&'.$param;
-                    if (!is_null($withentity)) $url .= '&entity='.$withentity;
-                    $url .= '&';
+					if ($obj->code == 'RECEP') $canbemodified = 1;
+					if ($tabname[$id] == MAIN_DB_PREFIX."c_actioncomm") $canbemodified = 1;
+
+					// Build Url. The table is id=, the id of line is rowid=
+					$rowidcol = $tabrowid[$id];
+					// If rowidcol not defined
+					if (empty($rowidcol) || in_array($id, array(6, 7, 8, 13, 17, 19, 27, 32))) $rowidcol = 'rowid';
+					$url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.((!empty($obj->{$rowidcol}) || $obj->{$rowidcol} == '0') ? $obj->{$rowidcol}:(!empty($obj->code) ?urlencode($obj->code) : '')).'&code='.(!empty($obj->code) ?urlencode($obj->code) : '');
+					if (!empty($param)) $url .= '&'.$param;
+					if (!is_null($withentity)) $url .= '&entity='.$withentity;
+					$url .= '&';
 
 					// Favorite
 					// Only activated on country dictionary
-                    if ($id == 4)
+					if ($id == 4)
 					{
 						print '<td class="nowrap center">';
 						if ($iserasable) print '<a class="reposition" href="'.$url.'action='.$acts[$obj->favorite].'_favorite">'.$actl[$obj->favorite].'</a>';
@@ -1659,98 +1693,98 @@ if ($id)
 						print '</td>';
 					}
 
-                    // Active
-                    print '<td class="nowrap center">';
-                    if ($canbedisabled) print '<a class="reposition" href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
-                    else {
-                 		if (in_array($obj->code, array('AC_OTH', 'AC_OTH_AUTO'))) print $langs->trans("AlwaysActive");
-                 		elseif (isset($obj->type) && in_array($obj->type, array('systemauto')) && empty($obj->active)) print $langs->trans("Deprecated");
-                  		elseif (isset($obj->type) && in_array($obj->type, array('system')) && !empty($obj->active) && $obj->code != 'AC_OTH') print $langs->trans("UsedOnlyWithTypeOption");
-                    	else print $langs->trans("AlwaysActive");
-                    }
-                    print "</td>";
+					// Active
+					print '<td class="nowrap center">';
+					if ($canbedisabled) print '<a class="reposition" href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
+					else {
+				 		if (in_array($obj->code, array('AC_OTH', 'AC_OTH_AUTO'))) print $langs->trans("AlwaysActive");
+				 		elseif (isset($obj->type) && in_array($obj->type, array('systemauto')) && empty($obj->active)) print $langs->trans("Deprecated");
+				  		elseif (isset($obj->type) && in_array($obj->type, array('system')) && !empty($obj->active) && $obj->code != 'AC_OTH') print $langs->trans("UsedOnlyWithTypeOption");
+						else print $langs->trans("AlwaysActive");
+					}
+					print "</td>";
 
-                    // Modify link
-                    if ($canbemodified) print '<td align="center"><a class="reposition editfielda" href="'.$url.'action=edit&token='.newToken().'">'.img_edit().'</a></td>';
-                    else print '<td>&nbsp;</td>';
+					// Modify link
+					if ($canbemodified) print '<td align="center"><a class="reposition editfielda" href="'.$url.'action=edit&token='.newToken().'">'.img_edit().'</a></td>';
+					else print '<td>&nbsp;</td>';
 
-                    // Delete link
-                    if ($iserasable)
-                    {
-                        print '<td class="center">';
-                        if ($user->admin) print '<a href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a>';
-                        //else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
-                        print '</td>';
-                    } else print '<td>&nbsp;</td>';
+					// Delete link
+					if ($iserasable)
+					{
+						print '<td class="center">';
+						if ($user->admin) print '<a href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a>';
+						//else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
+						print '</td>';
+					} else print '<td>&nbsp;</td>';
 
-                    print "</tr>\n";
-                }
-                $i++;
-            }
-        }
+					print "</tr>\n";
+				}
+				$i++;
+			}
+		}
 
-        print '</table>';
-        print '</div>';
-    } else {
-        dol_print_error($db);
-    }
+		print '</table>';
+		print '</div>';
+	} else {
+		dol_print_error($db);
+	}
 
-    print '</form>';
+	print '</form>';
 } else {
-    /*
+	/*
      * Show list of dictionary to show
      */
 
-    $lastlineisempty = false;
+	$lastlineisempty = false;
 
 	print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td colspan="2">'.$langs->trans("Dictionary").'</td>';
-    print '<td>'.$langs->trans("Table").'</td>';
-    print '</tr>';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td colspan="2">'.$langs->trans("Dictionary").'</td>';
+	print '<td>'.$langs->trans("Table").'</td>';
+	print '</tr>';
 
-    $showemptyline = '';
-    foreach ($taborder as $i)
-    {
-        if (isset($tabname[$i]) && empty($tabcond[$i])) continue;
+	$showemptyline = '';
+	foreach ($taborder as $i)
+	{
+		if (isset($tabname[$i]) && empty($tabcond[$i])) continue;
 
-        if ($i)
-        {
-        	if ($showemptyline)
-        	{
-        		print '<tr class="oddeven"><td width="50%">&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
-        		$showemptyline = 0;
-        	}
+		if ($i)
+		{
+			if ($showemptyline)
+			{
+				print '<tr class="oddeven"><td width="50%">&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
+				$showemptyline = 0;
+			}
 
 
-            $value = $tabname[$i];
-            print '<tr class="oddeven"><td width="50%">';
-            if (!empty($tabcond[$i]))
-            {
-                print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$i.'">'.$langs->trans($tablib[$i]).'</a>';
-            } else {
-                print $langs->trans($tablib[$i]);
-            }
-            print '</td>';
-            print '<td>';
-            /*if (empty($tabcond[$i]))
+			$value = $tabname[$i];
+			print '<tr class="oddeven"><td width="50%">';
+			if (!empty($tabcond[$i]))
+			{
+				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$i.'">'.$langs->trans($tablib[$i]).'</a>';
+			} else {
+				print $langs->trans($tablib[$i]);
+			}
+			print '</td>';
+			print '<td>';
+			/*if (empty($tabcond[$i]))
              {
              print info_admin($langs->trans("DictionaryDisabledSinceNoModuleNeedIt"),1);
              }*/
-            print '</td>';
-            print '<td>'.$tabname[$i].'</td></tr>';
-            $lastlineisempty = false;
-        } else {
-            if (!$lastlineisempty)
-            {
-                $showemptyline = 1;
-                $lastlineisempty = true;
-            }
-        }
-    }
-    print '</table>';
-    print '</div>';
+			print '</td>';
+			print '<td>'.$tabname[$i].'</td></tr>';
+			$lastlineisempty = false;
+		} else {
+			if (!$lastlineisempty)
+			{
+				$showemptyline = 1;
+				$lastlineisempty = true;
+			}
+		}
+	}
+	print '</table>';
+	print '</div>';
 }
 
 print '<br>';
@@ -1789,14 +1823,14 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			continue;
 		}
 
-	    if (in_array($fieldlist[$field], array('code', 'libelle', 'type')) && $tabname == MAIN_DB_PREFIX."c_actioncomm" && in_array($obj->type, array('system', 'systemauto')))
-        {
-            $hidden = (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'');
-            print '<td>';
-            print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$hidden.'">';
-            print $langs->trans($hidden);
-            print '</td>';
-        } elseif ($fieldlist[$field] == 'country')
+		if (in_array($fieldlist[$field], array('code', 'libelle', 'type')) && $tabname == MAIN_DB_PREFIX."c_actioncomm" && in_array($obj->type, array('system', 'systemauto')))
+		{
+			$hidden = (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'');
+			print '<td>';
+			print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$hidden.'">';
+			print $langs->trans($hidden);
+			print '</td>';
+		} elseif ($fieldlist[$field] == 'country')
 		{
 			if (in_array('region_id', $fieldlist))
 			{
@@ -1865,8 +1899,8 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print $form->selectarray($fieldlist[$field], $select_list, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'2'));
 			print '</td>';
 		} elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'type_cdr' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
-		    if ($fieldlist[$field] == 'type_cdr') print '<td class="center">';
-		    else print '<td>';
+			if ($fieldlist[$field] == 'type_cdr') print '<td class="center">';
+			else print '<td>';
 			if ($fieldlist[$field] == 'type_cdr') {
 				print $form->selectarray($fieldlist[$field], array(0=>$langs->trans('None'), 1=>$langs->trans('AtEndOfMonth'), 2=>$langs->trans('CurrentNext')), (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''));
 			} else {
@@ -1880,27 +1914,27 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print '<input type="text" class="flat" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '').'" size="3" name="'.$fieldlist[$field].'">';
 			print '</td>';
 		} elseif (in_array($fieldlist[$field], array('libelle_facture'))) {
-		    print '<td>';
-		    $transfound = 0;
-		    $transkey = '';
-	        // Special case for labels
-	        if ($tabname == MAIN_DB_PREFIX.'c_payment_term')
-	        {
-	            $langs->load("bills");
-	            $transkey = "PaymentCondition".strtoupper($obj->code);
-    	        if ($langs->trans($transkey) != $transkey)
-                {
-                    $transfound = 1;
-                    print $form->textwithpicto($langs->trans($transkey), $langs->trans("GoIntoTranslationMenuToChangeThis"));
-                }
-	        }
-		    if (!$transfound)
-		    {
-		        print '<textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'</textarea>';
-		    } else {
-                print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$transkey.'">';
-            }
-		    print '</td>';
+			print '<td>';
+			$transfound = 0;
+			$transkey = '';
+			// Special case for labels
+			if ($tabname == MAIN_DB_PREFIX.'c_payment_term')
+			{
+				$langs->load("bills");
+				$transkey = "PaymentCondition".strtoupper($obj->code);
+				if ($langs->trans($transkey) != $transkey)
+				{
+					$transfound = 1;
+					print $form->textwithpicto($langs->trans($transkey), $langs->trans("GoIntoTranslationMenuToChangeThis"));
+				}
+			}
+			if (!$transfound)
+			{
+				print '<textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'</textarea>';
+			} else {
+				print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$transkey.'">';
+			}
+			print '</td>';
 		} elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i', $fieldlist[$field])) {
 			print '<td><input type="text" class="flat minwidth75" value="'.price((!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'')).'" name="'.$fieldlist[$field].'"></td>';
 		} elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
@@ -1927,12 +1961,12 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print '<td>';
 			if (!empty($conf->accounting->enabled))
 			{
-			    $fieldname = $fieldlist[$field];
+				$fieldname = $fieldlist[$field];
 				$accountancy_account = (!empty($obj->$fieldname) ? $obj->$fieldname : 0);
 				print $formaccounting->select_account($accountancy_account, '.'.$fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
 			} else {
-			    $fieldname = $fieldlist[$field];
-			    print '<input type="text" size="10" class="flat" value="'.(isset($obj->$fieldname) ? $obj->$fieldname : '').'" name="'.$fieldlist[$field].'">';
+				$fieldname = $fieldlist[$field];
+				print '<input type="text" size="10" class="flat" value="'.(isset($obj->$fieldname) ? $obj->$fieldname : '').'" name="'.$fieldlist[$field].'">';
 			}
 			print '</td>';
 		} elseif ($fieldlist[$field] == 'fk_tva')
@@ -1951,42 +1985,47 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print $form->selectExpenseRanges($obj->fk_range);
 			print '</td>';
 		} else {
-            $fieldValue = isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'';
+			$fieldValue = isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'';
 
 			if ($fieldlist[$field] == 'sortorder')
-            {
-                $fieldlist[$field] = 'position';
-            }
+			{
+				$fieldlist[$field] = 'position';
+			}
 
 			$classtd = ''; $class = '';
 			if ($fieldlist[$field] == 'code') $class = 'maxwidth100';
-			if (in_array($fieldlist[$field], array('dayrule', 'day', 'month', 'year', 'pos', 'use_default', 'affect', 'delay', 'position', 'sortorder', 'sens', 'category_type'))) $class = 'maxwidth50';
+			if (in_array($fieldlist[$field], array('dayrule', 'day', 'month', 'year', 'pos', 'use_default', 'affect', 'delay', 'position', 'sortorder', 'sens', 'category_type'))) {
+				$class = 'maxwidth50 center';
+			}
+			if (in_array($fieldlist[$field], array('use_default'))) {
+				$classtd = 'center';
+			}
 			if (in_array($fieldlist[$field], array('libelle', 'label', 'tracking'))) $class = 'quatrevingtpercent';
 			print '<td class="'.$classtd.'">';
 			$transfound = 0;
-            $transkey = '';
+			$transkey = '';
 			if (in_array($fieldlist[$field], array('label', 'libelle')))		// For label
 			{
-			    // Special case for labels
-			    if ($tabname == MAIN_DB_PREFIX.'c_civility') {
-			        $transkey = "Civility".strtoupper($obj->code);
-			    }
-			    if ($tabname == MAIN_DB_PREFIX.'c_payment_term') {
-			        $langs->load("bills");
-			        $transkey = "PaymentConditionShort".strtoupper($obj->code);
-			    }
-			    if ($transkey && $langs->trans($transkey) != $transkey)
-			    {
-			        $transfound = 1;
-			        print $form->textwithpicto($langs->trans($transkey), $langs->trans("GoIntoTranslationMenuToChangeThis"));
-			    }
+				// Special case for labels
+				if ($tabname == MAIN_DB_PREFIX.'c_civility') {
+					$transkey = "Civility".strtoupper($obj->code);
+				}
+				if ($tabname == MAIN_DB_PREFIX.'c_payment_term') {
+					$langs->load("bills");
+					$transkey = "PaymentConditionShort".strtoupper($obj->code);
+				}
+				if ($transkey && $langs->trans($transkey) != $transkey)
+				{
+					$transfound = 1;
+					print $form->textwithpicto($langs->trans($transkey), $langs->trans("GoIntoTranslationMenuToChangeThis"));
+				}
 			}
 			if (!$transfound)
 			{
-                print '<input type="text" class="flat'.($class ? ' '.$class : '').'" value="'.dol_escape_htmltag($fieldValue).'" name="'.$fieldlist[$field].'">';
+				print '<input type="text" class="flat'.($class ? ' '.$class : '').'" value="'.dol_escape_htmltag($fieldValue).'" name="'.$fieldlist[$field].'">';
 			} else {
-                print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$transkey.'">';
-            }
+				print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$transkey.'">';
+			}
 			print '</td>';
 		}
 	}
diff --git a/htdocs/admin/dolistore/ajax/image.php b/htdocs/admin/dolistore/ajax/image.php
index 7c25e9d33a5..e2666eb3312 100644
--- a/htdocs/admin/dolistore/ajax/image.php
+++ b/htdocs/admin/dolistore/ajax/image.php
@@ -19,7 +19,7 @@
 
 if (!defined('REQUIRE_JQUERY_BLOCKUI')) define('REQUIRE_JQUERY_BLOCKUI', 1);
 if (!defined('NOTOKENRENEWAL')) {
-    define('NOTOKENRENEWAL', 1);
+	define('NOTOKENRENEWAL', 1);
 }
 
 
diff --git a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
index 0227db8d969..0bd03301389 100644
--- a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
+++ b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
@@ -68,22 +68,22 @@ class PrestaShopWebservice
 	 * @param string $url Root URL for the shop
 	 * @param string $key Authentification key
 	 * @param mixed $debug Debug mode Activated (true) or deactivated (false)
-	*/
-    public function __construct($url, $key, $debug = true)
-    {
+	 */
+	public function __construct($url, $key, $debug = true)
+	{
 		if (!extension_loaded('curl'))
 		  throw new PrestaShopWebserviceException('Please activate the PHP extension \'curl\' to allow use of PrestaShop webservice library');
 		$this->url = $url;
 		$this->key = $key;
 		$this->debug = $debug;
 		$this->version = 'unknown';
-    }
+	}
 
 	/**
 	 * Take the status code and throw an exception if the server didn't return 200 or 201 code
 	 *
 	 * @param int $status_code Status code of an HTTP return
-     * @return void
+	 * @return void
 	 */
 	protected function checkStatusCode($status_code)
 	{
@@ -221,7 +221,9 @@ class PrestaShopWebservice
 	 * Load XML from string. Can throw exception
 	 *
 	 * @param 	string 				$response 	String from a CURL response
-	 * @return 	SimpleXMLElement 				status_code, response
+	 * @return 	SimpleXMLElement|boolean		status_code, response
+	 *
+	 * @throw PrestaShopWebserviceException
 	 */
 	protected function parseXML($response)
 	{
@@ -250,7 +252,9 @@ class PrestaShopWebservice
 	 * Examples are given in the tutorial</p>
 	 *
 	 * @param 	array 				$options	Options
-	 * @return 	SimpleXMLElement 				status_code, response
+	 * @return 	SimpleXMLElement|boolean 		status_code, response
+	 *
+	 * @throw PrestaShopWebserviceException
 	 */
 	public function add($options)
 	{
@@ -268,14 +272,14 @@ class PrestaShopWebservice
 		} else {
 			throw new PrestaShopWebserviceException('Bad parameters given');
 		}
-		$request = self::executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'POST', CURLOPT_POSTFIELDS => $xml));
+		$request = $this->executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'POST', CURLOPT_POSTFIELDS => $xml));
 
-		self::checkStatusCode($request['status_code']);
-		return self::parseXML($request['response']);
+		$this->checkStatusCode($request['status_code']);
+		return $this->parseXML($request['response']);
 	}
 
 	/**
- 	 * Retrieve (GET) a resource
+	 * Retrieve (GET) a resource
 	 * <p>Unique parameter must take : <br><br>
 	 * 'url' => Full URL for a GET request of Webservice (ex: http://mystore.com/api/customers/1/)<br>
 	 * OR<br>
@@ -300,7 +304,9 @@ class PrestaShopWebservice
 	 * ?>
 	 * </code>
 	 * @param 	array 			$options 	Array representing resource to get.
-	 * @return 	SimpleXMLElement 			status_code, response
+	 * @return 	SimpleXMLElement|boolean	status_code, response
+	 *
+	 * @throw PrestaShopWebserviceException
 	 */
 	public function get($options)
 	{
@@ -326,16 +332,18 @@ class PrestaShopWebservice
 			throw new PrestaShopWebserviceException('Bad parameters given ');
 		}
 
-		$request = self::executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'GET'));
-		self::checkStatusCode($request['status_code']); // check the response validity
-		return self::parseXML($request['response']);
+		$request = $this->executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'GET'));
+		$this->checkStatusCode($request['status_code']); // check the response validity
+		return $this->parseXML($request['response']);
 	}
 
 	/**
- 	 * Head method (HEAD) a resource
+	 * Head method (HEAD) a resource
 	 *
 	 * @param 	array 				$options 	Array representing resource for head request.
 	 * @return 	SimpleXMLElement 				status_code, response
+	 *
+	 * @throw PrestaShopWebserviceException
 	 */
 	public function head($options)
 	{
@@ -358,8 +366,8 @@ class PrestaShopWebservice
 		} else {
 			throw new PrestaShopWebserviceException('Bad parameters given');
 		}
-		$request = self::executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'HEAD', CURLOPT_NOBODY => true));
-		self::checkStatusCode($request['status_code']); // check the response validity
+		$request = $this->executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'HEAD', CURLOPT_NOBODY => true));
+		$this->checkStatusCode($request['status_code']); // check the response validity
 		return $request['header'];
 	}
 	/**
@@ -371,7 +379,9 @@ class PrestaShopWebservice
 	 * Examples are given in the tutorial</p>
 	 *
 	 * @param 	array 				$options 	Array representing resource to edit.
-	 * @return	SimpleXMLElement 				status_code, response
+	 * @return	SimpleXMLElement|boolean 		status_code, response
+	 *
+	 * @throw PrestaShopWebserviceException
 	 */
 	public function edit($options)
 	{
@@ -390,9 +400,9 @@ class PrestaShopWebservice
 			throw new PrestaShopWebserviceException('Bad parameters given');
 		}
 
-		$request = self::executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'PUT', CURLOPT_POSTFIELDS => $xml));
-		self::checkStatusCode($request['status_code']); // check the response validity
-		return self::parseXML($request['response']);
+		$request = $this->executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'PUT', CURLOPT_POSTFIELDS => $xml));
+		$this->checkStatusCode($request['status_code']); // check the response validity
+		return $this->parseXML($request['response']);
 	}
 }
 
diff --git a/htdocs/admin/dolistore/class/dolistore.class.php b/htdocs/admin/dolistore/class/dolistore.class.php
index 1d764a849be..c20f46b0bd5 100644
--- a/htdocs/admin/dolistore/class/dolistore.class.php
+++ b/htdocs/admin/dolistore/class/dolistore.class.php
@@ -19,7 +19,7 @@
 include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 if (!class_exists('PrestaShopWebservice')) // We keep this because some modules add this lib too into a different path. This is to avoid "Cannot declare class PrestaShopWebservice" errors.
 {
-    include_once DOL_DOCUMENT_ROOT.'/admin/dolistore/class/PSWebServiceLibrary.class.php';
+	include_once DOL_DOCUMENT_ROOT.'/admin/dolistore/class/PSWebServiceLibrary.class.php';
 }
 
 
@@ -28,17 +28,17 @@ if (!class_exists('PrestaShopWebservice')) // We keep this because some modules
  */
 class Dolistore
 {
-    /**
-     * beginning of pagination
-     * @var int
-     */
-    public $start;
+	/**
+	 * beginning of pagination
+	 * @var int
+	 */
+	public $start;
 
-    /**
-     * end of pagination
-     * @var int
-     */
-    public $end;
+	/**
+	 * end of pagination
+	 * @var int
+	 */
+	public $end;
 
 	public $per_page; // pagination: display per page
 	public $categorie; // the current categorie
@@ -79,33 +79,33 @@ class Dolistore
 	 */
 	public function getRemoteCategories()
 	{
-	    global $conf;
+		global $conf;
 
-	    try {
-	        $this->api = new PrestaShopWebservice($conf->global->MAIN_MODULE_DOLISTORE_API_SRV, $conf->global->MAIN_MODULE_DOLISTORE_API_KEY, $this->debug_api);
-	        dol_syslog("Call API with MAIN_MODULE_DOLISTORE_API_SRV = ".$conf->global->MAIN_MODULE_DOLISTORE_API_SRV);
-	        // $conf->global->MAIN_MODULE_DOLISTORE_API_KEY is for the login of basic auth. There is no password as it is public data.
+		try {
+			$this->api = new PrestaShopWebservice($conf->global->MAIN_MODULE_DOLISTORE_API_SRV, $conf->global->MAIN_MODULE_DOLISTORE_API_KEY, $this->debug_api);
+			dol_syslog("Call API with MAIN_MODULE_DOLISTORE_API_SRV = ".$conf->global->MAIN_MODULE_DOLISTORE_API_SRV);
+			// $conf->global->MAIN_MODULE_DOLISTORE_API_KEY is for the login of basic auth. There is no password as it is public data.
 
-	        // Here we set the option array for the Webservice : we want categories resources
-	        $opt              = array();
-	        $opt['resource']  = 'categories';
-	        $opt['display']   = '[id,id_parent,nb_products_recursive,active,is_root_category,name,description]';
-	        $opt['sort']      = 'id_asc';
+			// Here we set the option array for the Webservice : we want categories resources
+			$opt              = array();
+			$opt['resource']  = 'categories';
+			$opt['display']   = '[id,id_parent,nb_products_recursive,active,is_root_category,name,description]';
+			$opt['sort']      = 'id_asc';
 
-	        // Call
-	        dol_syslog("Call API with opt = ".var_export($opt, true));
-	        $xml              = $this->api->get($opt);
-	        $this->categories = $xml->categories->children();
-	    } catch (PrestaShopWebserviceException $e) {
-	        // Here we are dealing with errors
-	        $trace = $e->getTrace();
-	        if ($trace[0]['args'][0] == 404) die('Bad ID');
-	        elseif ($trace[0]['args'][0] == 401) die('Bad auth key');
-	        else {
-	            print 'Can not access to '.$conf->global->MAIN_MODULE_DOLISTORE_API_SRV.'<br>';
-	            print $e->getMessage();
-	        }
-	    }
+			// Call
+			dol_syslog("Call API with opt = ".var_export($opt, true));
+			$xml              = $this->api->get($opt);
+			$this->categories = $xml->categories->children();
+		} catch (PrestaShopWebserviceException $e) {
+			// Here we are dealing with errors
+			$trace = $e->getTrace();
+			if ($trace[0]['args'][0] == 404) die('Bad ID');
+			elseif ($trace[0]['args'][0] == 401) die('Bad auth key');
+			else {
+				print 'Can not access to '.$conf->global->MAIN_MODULE_DOLISTORE_API_SRV.'<br>';
+				print $e->getMessage();
+			}
+		}
 	}
 
 	/**
@@ -153,7 +153,7 @@ class Dolistore
 				}
 				$opt['filter[id]'] = '['.implode('|', $products).']';
 			} elseif ($this->categorie != 0) {   // We filter on category, so we first get list of product id in this category
-			    // $opt2['url'] is set by default to $this->url.'/api/'.$options['resource'];
+				// $opt2['url'] is set by default to $this->url.'/api/'.$options['resource'];
 				$opt2['resource'] = 'categories';
 				$opt2['id']       = $this->categorie;
 
@@ -189,7 +189,7 @@ class Dolistore
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return tree of Dolistore categories. $this->categories must have been loaded before.
 	 *
@@ -198,7 +198,7 @@ class Dolistore
 	 */
 	public function get_categories($parent = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if (!isset($this->categories)) die('not possible');
 		if ($parent != 0) {
 			$html = '<ul>';
@@ -235,7 +235,7 @@ class Dolistore
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return list of product formated for output
 	 *
@@ -243,7 +243,7 @@ class Dolistore
 	 */
 	public function get_products()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf;
 		$html       = "";
 		$last_month = time() - (30 * 24 * 60 * 60);
@@ -270,7 +270,7 @@ class Dolistore
 
 			// free or pay ?
 			if ($product->price > 0) {
-			    $price = '<h3>'.price(price2num($product->price, 'MT'), 0, $langs, 1, -1, -1, 'EUR').' '.$langs->trans("HT").'</h3>';
+				$price = '<h3>'.price(price2num($product->price, 'MT'), 0, $langs, 1, -1, -1, 'EUR').' '.$langs->trans("HT").'</h3>';
 				$download_link = '<a target="_blank" href="'.$this->shop_url.$product->id.'"><img width="32" src="'.DOL_URL_ROOT.'/admin/dolistore/img/follow.png" /></a>';
 			} else {
 				$price         = '<h3>'.$langs->trans('Free').'</h3>';
@@ -282,12 +282,12 @@ class Dolistore
 			if ($this->version_compare($product->dolibarr_min, DOL_VERSION) <= 0) {
 				if ($this->version_compare($product->dolibarr_max, DOL_VERSION) >= 0) {
 					//compatible
-                    $version = '<span class="compatible">'.$langs->trans('CompatibleUpTo', $product->dolibarr_max,
+					$version = '<span class="compatible">'.$langs->trans('CompatibleUpTo', $product->dolibarr_max,
 						$product->dolibarr_min, $product->dolibarr_max).'</span>';
 					$compatible = '';
 				} else {
 					//never compatible, module expired
-                    $version = '<span class="notcompatible">'.$langs->trans('NotCompatible', DOL_VERSION,
+					$version = '<span class="notcompatible">'.$langs->trans('NotCompatible', DOL_VERSION,
 						$product->dolibarr_min, $product->dolibarr_max).'</span>';
 					$compatible = 'NotCompatible';
 				}
@@ -306,50 +306,50 @@ class Dolistore
                 <td class="margeCote"><h2 class="appTitle">'.$product->name->language[$this->lang - 1]
 						.'<br/><small>'.$version.'</small></h2>
                     <small> '.dol_print_date(dol_stringtotime($product->date_upd), 'dayhour').' - '.$langs->trans('Ref').': '.$product->reference.' - '.$langs->trans('Id').': '.$product->id.'</small><br><br>'.$product->description_short->language[$this->lang - 1].'</td>';
-            // do not load if display none
-            //$html .= '<td style="display:none;" class="long_description">'.$product->description->language[$this->lang - 1].'</td>';
-            $html .= '<td class="margeCote center">'.$price.'</td>';
-            $html .= '<td class="margeCote">'.$download_link.'</td>';
-            $html .= '</tr>';
-        }
-        return $html;
-    }
+			// do not load if display none
+			//$html .= '<td style="display:none;" class="long_description">'.$product->description->language[$this->lang - 1].'</td>';
+			$html .= '<td class="margeCote center">'.$price.'</td>';
+			$html .= '<td class="margeCote">'.$download_link.'</td>';
+			$html .= '</tr>';
+		}
+		return $html;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * get previous link
-     *
-     * @param   string    $text     symbol previous
-     * @return  string              html previous link
-     */
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * get previous link
+	 *
+	 * @param   string    $text     symbol previous
+	 * @return  string              html previous link
+	 */
 	public function get_previous_link($text = '<<')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return '<a href="'.$this->get_previous_url().'" class="button">'.$text.'</a>';
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * get next link
-     *
-     * @param   string    $text     symbol next
-     * @return  string              html next link
-     */
-    public function get_next_link($text = '>>')
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * get next link
+	 *
+	 * @param   string    $text     symbol next
+	 * @return  string              html next link
+	 */
+	public function get_next_link($text = '>>')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return '<a href="'.$this->get_next_url().'" class="button">'.$text.'</a>';
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * get previous url
-     *
-     * @return string    previous url
-     */
-    public function get_previous_url()
-    {
-        // phpcs:enable
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * get previous url
+	 *
+	 * @return string    previous url
+	 */
+	public function get_previous_url()
+	{
+		// phpcs:enable
 		$param_array = array();
 		if ($this->start < $this->per_page) {
 			$sub = 0;
@@ -363,17 +363,17 @@ class Dolistore
 		}
 		$param = http_build_query($param_array);
 		return $this->url."&".$param;
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * get next url
-     *
-     * @return string    next url
-     */
-    public function get_next_url()
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * get next url
+	 *
+	 * @return string    next url
+	 */
+	public function get_next_url()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$param_array = array();
 		if (count($this->products) < $this->per_page) {
 			$add = 0;
@@ -389,17 +389,17 @@ class Dolistore
 		return $this->url."&".$param;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * version compare
-     *
-     * @param   string  $v1     version 1
-     * @param   string  $v2     version 2
-     * @return int              result of compare
-     */
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * version compare
+	 *
+	 * @param   string  $v1     version 1
+	 * @param   string  $v2     version 2
+	 * @return int              result of compare
+	 */
 	public function version_compare($v1, $v2)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$v1       = explode('.', $v1);
 		$v2       = explode('.', $v2);
 		$ret      = 0;
diff --git a/htdocs/admin/dolistore/class/index.html b/htdocs/admin/dolistore/class/index.html
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/htdocs/admin/dolistore/class/index.html
@@ -0,0 +1 @@
+
diff --git a/htdocs/admin/dolistore/index.html b/htdocs/admin/dolistore/index.html
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/htdocs/admin/dolistore/index.html
@@ -0,0 +1 @@
+
diff --git a/htdocs/admin/ecm.php b/htdocs/admin/ecm.php
index 76bf86993e2..33df8a4b6e3 100644
--- a/htdocs/admin/ecm.php
+++ b/htdocs/admin/ecm.php
@@ -23,6 +23,7 @@
  */
 
 require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
 // Load translation files required by the page
@@ -70,6 +71,10 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_valu
 print load_fiche_titre($langs->trans("ECMSetup"), $linkback, 'title_setup');
 print '<br>';
 
+$head = ecm_admin_prepare_head();
+
+print dol_get_fiche_head($head, 'ecm', $langs->trans("ECM"), -1, 'ecm');
+
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Description").'</td>';
diff --git a/htdocs/admin/ecm_directories_extrafields.php b/htdocs/admin/ecm_directories_extrafields.php
new file mode 100644
index 00000000000..3179c01960c
--- /dev/null
+++ b/htdocs/admin/ecm_directories_extrafields.php
@@ -0,0 +1,123 @@
+<?php
+/* Copyright (C) 2001-2002  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2003       Jean-Louis Bergamo      <jlb@j1b.org>
+ * Copyright (C) 2004-2013  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2012       Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2012       Florian Henry           <florian.henry@open-concept.pro>
+ * Copyright (C) 2013       Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2015       Claudio Aschieri        <c.aschieri@19.coop>
+ * Copyright (C) 2020       Frédéric 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/admin/ecm_directories_extrafields.php
+ *  \ingroup    ecm
+ *  \brief      Page to setup extra fields of ecm
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+
+if (!$user->admin)
+	accessforbidden();
+
+// Load translation files required by the page
+$langs->loadLangs(array('admin', 'other', 'ecm'));
+
+
+$extrafields = new ExtraFields($db);
+$form = new Form($db);
+
+// List of supported format
+$tmptype2label = ExtraFields::$type2label;
+$type2label = array('');
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
+
+$action = GETPOST('action', 'aZ09');
+$attrname = GETPOST('attrname', 'alpha');
+$elementtype = 'ecm_directories'; //Must be the $table_element of the class that manage extrafield
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+
+/*
+ * Actions
+ */
+
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
+
+
+/*
+ * View
+ */
+
+$textobject = $langs->transnoentitiesnoconv("ECM");
+
+llxHeader('', $langs->trans("ECMSetup"));
+
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("ECMSetup"), $linkback, 'title_setup');
+print "<br>\n";
+
+$head = ecm_admin_prepare_head();
+
+print dol_get_fiche_head($head, 'attributes_ecm_directories', $langs->trans("ECM"), -1, 'ecm');
+
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
+
+print dol_get_fiche_end();
+
+
+// Buttons
+if ($action != 'create' && $action != 'edit') {
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
+}
+
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Creation of an optional field                                              */
+/*                                                                            */
+/* ************************************************************************** */
+
+if ($action == 'create') {
+	print '<br><div id="newattrib"></div>';
+	print load_fiche_titre($langs->trans('NewAttribute'));
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+}
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Edition of an optional field                                                */
+/*                                                                            */
+/* ************************************************************************** */
+if ($action == 'edit' && !empty($attrname)) {
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/ecm_files_extrafields.php b/htdocs/admin/ecm_files_extrafields.php
new file mode 100644
index 00000000000..9fc297fd37a
--- /dev/null
+++ b/htdocs/admin/ecm_files_extrafields.php
@@ -0,0 +1,123 @@
+<?php
+/* Copyright (C) 2001-2002  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2003       Jean-Louis Bergamo      <jlb@j1b.org>
+ * Copyright (C) 2004-2013  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2012       Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2012       Florian Henry           <florian.henry@open-concept.pro>
+ * Copyright (C) 2013       Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2015       Claudio Aschieri        <c.aschieri@19.coop>
+ * Copyright (C) 2020       Frédéric 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/admin/ecm_files_extrafields.php
+ *  \ingroup    ecm
+ *  \brief      Page to setup extra fields of ecm
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+
+if (!$user->admin)
+	accessforbidden();
+
+// Load translation files required by the page
+$langs->loadLangs(array('admin', 'other', 'ecm'));
+
+
+$extrafields = new ExtraFields($db);
+$form = new Form($db);
+
+// List of supported format
+$tmptype2label = ExtraFields::$type2label;
+$type2label = array('');
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
+
+$action = GETPOST('action', 'aZ09');
+$attrname = GETPOST('attrname', 'alpha');
+$elementtype = 'ecm_files'; //Must be the $table_element of the class that manage extrafield
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+
+/*
+ * Actions
+ */
+
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
+
+
+/*
+ * View
+ */
+
+$textobject = $langs->transnoentitiesnoconv("ECM");
+
+llxHeader('', $langs->trans("ECMSetup"));
+
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("ECMSetup"), $linkback, 'title_setup');
+print "<br>\n";
+
+$head = ecm_admin_prepare_head();
+
+print dol_get_fiche_head($head, 'attributes_ecm_files', $langs->trans("ECM"), -1, 'ecm');
+
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
+
+print dol_get_fiche_end();
+
+
+// Buttons
+if ($action != 'create' && $action != 'edit') {
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
+}
+
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Creation of an optional field                                              */
+/*                                                                            */
+/* ************************************************************************** */
+
+if ($action == 'create') {
+	print '<br><div id="newattrib"></div>';
+	print load_fiche_titre($langs->trans('NewAttribute'));
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+}
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Edition of an optional field                                                */
+/*                                                                            */
+/* ************************************************************************** */
+if ($action == 'edit' && !empty($attrname)) {
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index eb9ffb52831..adfaaf4f816 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -223,21 +223,6 @@ $help_url = "EN:Module_EMail_Collector|FR:Module_Collecteur_de_courrier_électro
 
 llxHeader('', 'EmailCollector', $help_url);
 
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
-
 // Part to create
 if ($action == 'create') {
 	print load_fiche_titre($langs->trans("NewEmailCollector", $langs->transnoentitiesnoconv("EmailCollector")));
@@ -247,7 +232,7 @@ if ($action == 'create') {
 	print '<input type="hidden" name="action" value="add">';
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
-	dol_fiche_head(array(), '');
+	print dol_get_fiche_head(array(), '');
 
 	print '<table class="border centpercent tableforfield">'."\n";
 
@@ -261,12 +246,12 @@ if ($action == 'create') {
 
 	print '</table>'."\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
 	print '&nbsp; ';
-	print '<input type="'.($backtopage ? "submit" : "button").'" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
+	print '<input type="'.($backtopage ? "submit" : "button").'" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
 	print '</div>';
 
 	print '</form>';
@@ -283,7 +268,7 @@ if (($id || $ref) && $action == 'edit')
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent tableforfield">'."\n";
 
@@ -295,10 +280,10 @@ if (($id || $ref) && $action == 'edit')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
-	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+	print ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
@@ -313,7 +298,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$object->fetchActions();
 
 	$head = emailcollectorPrepareHead($object);
-	dol_fiche_head($head, 'card', $langs->trans("EmailCollector"), -1, 'email');
+	print dol_get_fiche_head($head, 'card', $langs->trans("EmailCollector"), -1, 'email');
 
 	$formconfirm = '';
 
@@ -427,12 +412,16 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		$morehtml .= $form->textwithpicto('', 'connect string '.$connectstringserver);
 	} else {
-		$morehtml .= 'IMAP functions not available on your PHP';
+		$morehtml .= 'IMAP functions not available on your PHP. ';
 	}
 
 	if (!$connection)
 	{
 		$morehtml .= 'Failed to open IMAP connection '.$connectstringsource;
+		if (function_exists('imap_last_error')) {
+			$morehtml .= '<br>'.imap_last_error();
+		}
+		//var_dump(imap_errors())
 	} else {
 		$morehtml .= imap_num_msg($connection);
 	}
@@ -614,7 +603,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		{
 			print '<input type="text" class="quatrevingtquinzepercent" name="operationparam2" value="'.$ruleaction['actionparam'].'"><br>';
 			print '<input type="hidden" name="rowidoperation2" value="'.$ruleaction['id'].'"><br>';
-			print '<input type="submit" class="button" name="saveoperation2" value="'.$langs->trans("Save").'"> <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+			print '<input type="submit" class="button button-save" name="saveoperation2" value="'.$langs->trans("Save").'">';
+			print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 		} else {
 			print $ruleaction['actionparam'];
 		}
@@ -655,7 +645,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div><br>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	// Buttons for actions
 	if ($action != 'presend' && $action != 'editline') {
@@ -688,61 +678,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	{
 		print info_admin($debuginfo);
 	}
-
-
-	// Select mail models is same action as presend
-	if (GETPOST('modelselected')) {
-		$action = 'presend';
-	}
-
-	/*
-	if ($action != 'presend') {
-		print '<div class="fichecenter"><div class="fichehalfleft">';
-		print '<a name="builddoc"></a>'; // ancre
-	*/
-		// Documents
-		/*$objref = dol_sanitizeFileName($object->ref);
-	    $relativepath = $comref . '/' . $comref . '.pdf';
-	    $filedir = $conf->emailcollector->dir_output . '/' . $objref;
-	    $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
-	    $genallowed = $user->rights->emailcollector->read;	// If you can read, you can build the PDF to read content
-	    $delallowed = $user->rights->emailcollector->create;	// If you can create/edit, you can remove a file on card
-	    print $formfile->showdocuments('emailcollector', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
-		*/
-	/*
-		// Show links to link elements
-		$linktoelem = $form->showLinkToObjectBlock($object, null, array('emailcollector'));
-		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
-		$MAXEVENT = 10;
-
-		$morehtmlright = '<a href="' . dol_buildpath('/emailcollector/emailcollector_info.php', 1) . '?id=' . $object->id . '">';
-		$morehtmlright .= $langs->trans("SeeAll");
-		$morehtmlright .= '</a>';
-
-		// List of actions on element
-		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
-		$formactions = new FormActions($db);
-		$somethingshown = $formactions->showactions($object, 'emailcollector_emailcollector', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
-
-		print '</div></div></div>';
-	}
-	*/
-
-	//Select mail models is same action as presend
-	/*
-	 if (GETPOST('modelselected')) $action = 'presend';
-
-	 // Presend form
-	 $modelmail='inventory';
-	 $defaulttopic='InformationMessage';
-	 $diroutput = $conf->product->dir_output.'/inventory';
-	 $trackid = 'stockinv'.$object->id;
-
-	 include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
-	 */
 }
 
 // End of page
diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index d44f96e0877..3674d88a372 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -393,7 +393,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
@@ -426,9 +426,9 @@ foreach ($object->fields as $key => $val)
 	elseif (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 	elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') $cssforfield .= ($cssforfield ? ' ' : '').'right';
 	if (!empty($arrayfields['t.'.$key]['checked']))
-    {
-        print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
-    }
+	{
+		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+	}
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -470,26 +470,26 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	{
 		$cssforfield = (empty($val['css']) ? '' : $val['css']);
 		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	    elseif ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
+		elseif ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
 
-	    if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	    elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 
-	    if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status'))) $cssforfield .= ($cssforfield ? ' ' : '').'right';
-	    //if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status'))) $cssforfield .= ($cssforfield ? ' ' : '').'right';
+		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
 
-	    if (!empty($arrayfields['t.'.$key]['checked']))
-	    {
-	    	print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
-	    	if ($key == 'status') print $object->getLibStatut(5);
-	    	else print $object->showOutputField($val, $key, $object->$key, '');
-	    	print '</td>';
-	    	if (!$i) $totalarray['nbfield']++;
-	    	if (!empty($val['isameasure']))
-	    	{
-	    		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
-	    		$totalarray['val']['t.'.$key] += $object->$key;
-	    	}
+		if (!empty($arrayfields['t.'.$key]['checked']))
+		{
+			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
+			if ($key == 'status') print $object->getLibStatut(5);
+			else print $object->showOutputField($val, $key, $object->$key, '');
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+			if (!empty($val['isameasure']))
+			{
+				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+				$totalarray['val']['t.'.$key] += $object->$key;
+			}
 		}
 	}
 	// Extra fields
diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index 37d1a795428..66099eb3a30 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -102,7 +102,7 @@ print '<input type="hidden" name="action" value="save">';
 
 $head = security_prepare_head();
 
-dol_fiche_head($head, 'audit', '', -1);
+print dol_get_fiche_head($head, 'audit', '', -1);
 
 print '<table class="noborder" width="100%">';
 print "<tr class=\"liste_titre\">";
@@ -118,17 +118,17 @@ foreach ($eventstolog as $key => $arr)
 		print '<td>'.$arr['id'].'</td>';
 		print '<td class="center">';
 		$key = 'MAIN_LOGEVENTS_'.$arr['id'];
-		$value = $conf->global->$key;
+		$value = empty($conf->global->$key) ? '' : $conf->global->$key;
 		print '<input class="oddeven checkforselect" type="checkbox" name="'.$key.'" value="1"'.($value ? ' checked' : '').'>';
 		print '</td></tr>'."\n";
 	}
 }
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center">';
-print "<input type=\"submit\" name=\"save\" class=\"button\" value=\"".$langs->trans("Save")."\">";
+print '<input type="submit" name="save" class="button button-save" value="'.$langs->trans("Save").'">';
 print '</div>';
 
 print "</form>\n";
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 56f4f5a9be2..9a09c62b818 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -184,7 +184,7 @@ print load_fiche_titre($langs->trans("SendingsSetup"), $linkback, 'title_setup')
 print '<br>';
 $head = expedition_admin_prepare_head();
 
-dol_fiche_head($head, 'shipment', $langs->trans("Sendings"), -1, 'shipment');
+print dol_get_fiche_head($head, 'shipment', $langs->trans("Sendings"), -1, 'shipment');
 
 // Shipment numbering model
 
@@ -212,8 +212,7 @@ foreach ($dirmodels as $reldir)
 		{
 			while (($file = readdir($handle)) !== false)
 			{
-				if (substr($file, 0, 15) == 'mod_expedition_' && substr($file, dol_strlen($file) - 3, 3) == 'php')
-				{
+				if (preg_match('/^mod_expedition_([a-z0-9_]*)\.php$/', $file)) {
 					$file = substr($file, 0, dol_strlen($file) - 4);
 
 					require_once $dir.$file.'.php';
@@ -226,7 +225,7 @@ foreach ($dirmodels as $reldir)
 						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-						print '<tr><td>'.$module->nom."</td>\n";
+						print '<tr><td>'.$module->name."</td>\n";
 						print '<td>';
 						print $module->info();
 						print '</td>';
@@ -235,7 +234,8 @@ foreach ($dirmodels as $reldir)
 						print '<td class="nowrap">';
 						$tmp = $module->getExample();
 						if (preg_match('/^Error/', $tmp)) {
-							$langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>';
+							$langs->load("errors");
+							print '<div class="error">'.$langs->trans($tmp).'</div>';
 						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
 						else print $tmp;
 						print '</td>'."\n";
@@ -415,7 +415,7 @@ foreach ($dirmodels as $reldir)
 								print '<td class="center">';
 								if ($module->type == 'pdf')
 								{
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'sending').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
diff --git a/htdocs/admin/expedition_extrafields.php b/htdocs/admin/expedition_extrafields.php
index d9bf58027f8..901caf58c00 100644
--- a/htdocs/admin/expedition_extrafields.php
+++ b/htdocs/admin/expedition_extrafields.php
@@ -76,11 +76,11 @@ print "<br>\n";
 
 $head = expedition_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes_shipment', $langs->trans("Sendings"), -1, 'shipment');
+print dol_get_fiche_head($head, 'attributes_shipment', $langs->trans("Sendings"), -1, 'shipment');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/admin/expeditiondet_extrafields.php b/htdocs/admin/expeditiondet_extrafields.php
index a00816d9d75..6f917618bf2 100644
--- a/htdocs/admin/expeditiondet_extrafields.php
+++ b/htdocs/admin/expeditiondet_extrafields.php
@@ -77,19 +77,19 @@ print "<br>\n";
 
 $head = expedition_admin_prepare_head();
 
-dol_fiche_head($head, 'attributeslines_shipment', $langs->trans("Sendings"), -1, 'shipment');
+print dol_get_fiche_head($head, 'attributeslines_shipment', $langs->trans("Sendings"), -1, 'shipment');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -102,9 +102,9 @@ if ($action != 'create' && $action != 'edit')
 if ($action == 'create')
 {
 	print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -114,10 +114,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && !empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index 3ac71cfa6b0..a93f5c3c608 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -61,11 +61,11 @@ if ($action == 'updateMask')
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 } elseif ($action == 'specimen') // For fiche inter
 {
 	$modele = GETPOST('module', 'alpha');
@@ -80,7 +80,7 @@ if ($action == 'updateMask')
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir)
 	{
-	    $file = dol_buildpath($reldir."core/modules/expensereport/doc/pdf_".$modele.".modules.php", 0);
+		$file = dol_buildpath($reldir."core/modules/expensereport/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file))
 		{
 			$filefound = 1;
@@ -122,7 +122,7 @@ elseif ($action == 'set')
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->EXPENSEREPORT_ADDON_PDF == "$value") dolibarr_del_const($db, 'EXPENSEREPORT_ADDON_PDF', $conf->entity);
+		if ($conf->global->EXPENSEREPORT_ADDON_PDF == "$value") dolibarr_del_const($db, 'EXPENSEREPORT_ADDON_PDF', $conf->entity);
 	}
 }
 
@@ -150,7 +150,7 @@ elseif ($action == 'setdoc')
 	dolibarr_set_const($db, "EXPENSEREPORT_ADDON", $value, 'chaine', 0, '', $conf->entity);
 } elseif ($action == 'setoptions')
 {
-    $db->begin();
+	$db->begin();
 
 	$freetext = GETPOST('EXPENSEREPORT_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
 	$res1 = dolibarr_set_const($db, "EXPENSEREPORT_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
@@ -161,13 +161,13 @@ elseif ($action == 'setdoc')
 	if (!$res1 > 0 || !$res2 > 0) $error++;
 
  	if (!$error)
-    {
-        $db->commit();
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        $db->rollback();
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	{
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		$db->rollback();
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 
@@ -187,7 +187,7 @@ print load_fiche_titre($langs->trans("ExpenseReportsSetup"), $linkback, 'title_s
 
 $head = expensereport_admin_prepare_head();
 
-dol_fiche_head($head, 'expensereport', $langs->trans("ExpenseReports"), -1, 'trip');
+print dol_get_fiche_head($head, 'expensereport', $langs->trans("ExpenseReports"), -1, 'trip');
 
 /*
  * Expense report numbering model
@@ -235,13 +235,15 @@ foreach ($dirmodels as $reldir)
 						print $module->info();
 						print '</td>';
 
-                        // Show example of numbering model
-                        print '<td class="nowrap">';
-                        $tmp = $module->getExample();
-                        if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-                        elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-                        else print $tmp;
-                        print '</td>'."\n";
+						// Show example of numbering model
+						print '<td class="nowrap">';
+						$tmp = $module->getExample();
+						if (preg_match('/^Error/', $tmp)) {
+							$langs->load("errors");
+							print '<div class="error">'.$langs->trans($tmp).'</div>';
+						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						else print $tmp;
+						print '</td>'."\n";
 
 						print '<td class="center">';
 						if ($conf->global->EXPENSEREPORT_ADDON == $file)
@@ -261,16 +263,16 @@ foreach ($dirmodels as $reldir)
 						$htmltooltip = '';
 						$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 						$nextval = $module->getNextValue($exp);
-                        if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-                            $htmltooltip .= ''.$langs->trans("NextValue").': ';
-                            if ($nextval) {
-                                if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
-                                    $nextval = $langs->trans($nextval);
-                                $htmltooltip .= $nextval.'<br>';
-                            } else {
-                                $htmltooltip .= $langs->trans($module->error).'<br>';
-                            }
-                        }
+						if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+							$htmltooltip .= ''.$langs->trans("NextValue").': ';
+							if ($nextval) {
+								if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+									$nextval = $langs->trans($nextval);
+								$htmltooltip .= $nextval.'<br>';
+							} else {
+								$htmltooltip .= $langs->trans($module->error).'<br>';
+							}
+						}
 
 						print '<td class="center">';
 						print $form->textwithpicto('', $htmltooltip, 1, 0);
@@ -345,81 +347,81 @@ foreach ($dirmodels as $reldir)
 			foreach ($filelist as $file)
 			{
 				if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-		    	{
-		    		if (file_exists($dir.'/'.$file))
-		    		{
-		    			$name = substr($file, 4, dol_strlen($file) - 16);
-		    			$classname = substr($file, 0, dol_strlen($file) - 12);
+				{
+					if (file_exists($dir.'/'.$file))
+					{
+						$name = substr($file, 4, dol_strlen($file) - 16);
+						$classname = substr($file, 0, dol_strlen($file) - 12);
 
-		    			require_once $dir.'/'.$file;
-		    			$module = new $classname($db);
+						require_once $dir.'/'.$file;
+						$module = new $classname($db);
 
-		    			$modulequalified = 1;
-		    			if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
-		    			if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+						$modulequalified = 1;
+						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
+						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
 
-		    			if ($modulequalified)
-		    			{
-		    				print '<tr class="oddeven"><td width="100">';
-		    				print (empty($module->name) ? $name : $module->name);
-		    				print "</td><td>\n";
-		    				if (method_exists($module, 'info')) print $module->info($langs);
-		    				else print $module->description;
-		    				print '</td>';
+						if ($modulequalified)
+						{
+							print '<tr class="oddeven"><td width="100">';
+							print (empty($module->name) ? $name : $module->name);
+							print "</td><td>\n";
+							if (method_exists($module, 'info')) print $module->info($langs);
+							else print $module->description;
+							print '</td>';
 
-		    				// Active
-		    				if (in_array($name, $def))
-		    				{
-		    					print '<td class="center">'."\n";
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
-		    					print img_picto($langs->trans("Enabled"), 'switch_on');
-		    					print '</a>';
-		    					print "</td>";
-		    				} else {
-		    					print '<td class="center">'."\n";
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-		    					print "</td>";
-		    				}
+							// Active
+							if (in_array($name, $def))
+							{
+								print '<td class="center">'."\n";
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+								print img_picto($langs->trans("Enabled"), 'switch_on');
+								print '</a>';
+								print "</td>";
+							} else {
+								print '<td class="center">'."\n";
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+								print "</td>";
+							}
 
-		    				// Default
-		    				print '<td class="center">';
-		    				if ($conf->global->EXPENSEREPORT_ADDON_PDF == "$name")
-		    				{
-		    					print img_picto($langs->trans("Default"), 'on');
-		    				} else {
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-		    				}
-		    				print '</td>';
+							// Default
+							print '<td class="center">';
+							if ($conf->global->EXPENSEREPORT_ADDON_PDF == "$name")
+							{
+								print img_picto($langs->trans("Default"), 'on');
+							} else {
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+							}
+							print '</td>';
 
-		    				// Info
-		    				$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
-		    				$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-		    				$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-		    				$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-		    				$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
-		    				$htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
-		    				$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
-		    				$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
-		    				$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
-		    				print '<td class="center">';
-		    				print $form->textwithpicto('', $htmltooltip, -1, 0);
-		    				print '</td>';
+							// Info
+							$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+							$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+							$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+							$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+							$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+							$htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
+							$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
+							$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
+							$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
+							print '<td class="center">';
+							print $form->textwithpicto('', $htmltooltip, -1, 0);
+							print '</td>';
 
-		    				// Preview
-		    				print '<td class="center">';
-		    				if ($module->type == 'pdf')
-		    				{
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'intervention').'</a>';
-		    				} else {
-		    					print img_object($langs->trans("PreviewNotAvailable"), 'generic');
-		    				}
-		    				print '</td>';
+							// Preview
+							print '<td class="center">';
+							if ($module->type == 'pdf')
+							{
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
+							} else {
+								print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+							}
+							print '</td>';
 
-		    				print '</tr>';
-		    			}
-		    		}
-		    	}
-		    }
+							print '</tr>';
+						}
+					}
+				}
+			}
 		}
 	}
 }
@@ -457,11 +459,11 @@ print $form->textwithpicto($langs->trans("FreeLegalTextOnExpenseReports"), $lang
 $variablename = 'EXPENSEREPORT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
-    print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 } else {
-    include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
-    print $doleditor->Create();
+	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+	print $doleditor->Create();
 }
 print '</td></tr>'."\n";
 
@@ -475,12 +477,12 @@ print '</td></tr>'."\n";
 print '</table>';
 
 print '<div class="center">';
-print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 print '</div>';
 
 print '</form>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/expensereport_extrafields.php b/htdocs/admin/expensereport_extrafields.php
index ba29df4b766..ac88ec78912 100644
--- a/htdocs/admin/expensereport_extrafields.php
+++ b/htdocs/admin/expensereport_extrafields.php
@@ -70,11 +70,11 @@ print load_fiche_titre($langs->trans("ExpenseReportsSetup"), $linkback, 'title_s
 
 $head = expensereport_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("ExpenseReports"), -1, 'trip');
+print dol_get_fiche_head($head, 'attributes', $langs->trans("ExpenseReports"), -1, 'trip');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/admin/expensereport_ik.php b/htdocs/admin/expensereport_ik.php
index f55e78d4105..968833b764c 100644
--- a/htdocs/admin/expensereport_ik.php
+++ b/htdocs/admin/expensereport_ik.php
@@ -95,7 +95,7 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_valu
 print load_fiche_titre($langs->trans("ExpenseReportsSetup"), $linkback, 'title_setup');
 
 $head = expensereport_admin_prepare_head();
-dol_fiche_head($head, 'expenseik', $langs->trans("ExpenseReportsIk"), -1, 'trip');
+print dol_get_fiche_head($head, 'expenseik', $langs->trans("ExpenseReportsIk"), -1, 'trip');
 
 echo '<span class="opacitymedium">'.$langs->trans('ExpenseReportIkDesc').'</span>';
 print '<br><br>';
@@ -163,8 +163,8 @@ foreach ($rangesbycateg as $fk_c_exp_tax_cat => $Tab)
 		{
 			if ($action == 'edit' && $range->ik->id == $id && $range->rowid == $fk_range && $range->fk_c_exp_tax_cat == $fk_c_exp_tax_cat)
 			{
-				echo '<input id="" class="button" name="save" value="'.$langs->trans('Save').'" type="submit" />';
-				echo '<input class="button" value="'.$langs->trans('Cancel').'" onclick="javascript:history.go(-1)" type="button" />';
+				echo '<input id="" class="button button-save" name="save" value="'.$langs->trans("Save").'" type="submit" />';
+				echo '<input class="button button-cancel" value="'.$langs->trans("Cancel").'" onclick="javascript:history.go(-1)" type="button" />';
 			} else {
 				echo '<a class="editfielda marginrightonly paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?action=edit&token='.newToken().'&id='.$range->ik->id.'&fk_c_exp_tax_cat='.$range->fk_c_exp_tax_cat.'&fk_range='.$range->rowid.'">'.img_edit().'</a>';
 				if (!empty($range->ik->id)) echo '<a class="paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&id='.$range->ik->id.'">'.img_delete().'</a>';
@@ -180,7 +180,7 @@ foreach ($rangesbycateg as $fk_c_exp_tax_cat => $Tab)
 echo '</table>';
 echo '</form>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/expensereport_rules.php b/htdocs/admin/expensereport_rules.php
index e0012139154..9b56ac5901b 100644
--- a/htdocs/admin/expensereport_rules.php
+++ b/htdocs/admin/expensereport_rules.php
@@ -151,7 +151,7 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_valu
 print load_fiche_titre($langs->trans("ExpenseReportsSetup"), $linkback, 'title_setup');
 
 $head = expensereport_admin_prepare_head();
-dol_fiche_head($head, 'expenserules', $langs->trans("ExpenseReportsRules"), -1, 'trip');
+print dol_get_fiche_head($head, 'expenserules', $langs->trans("ExpenseReportsRules"), -1, 'trip');
 
 echo '<span class="opacitymedium">'.$langs->trans('ExpenseReportRulesDesc').'</span>';
 print '<br><br>';
@@ -309,7 +309,7 @@ foreach ($rules as $rule)
 		echo '<a class="paddingright paddingleft" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&id='.$rule->id.'">'.img_delete().'</a>';
 	} else {
 		echo '<input type="submit" class="button" value="'.$langs->trans('Update').'" />&nbsp;';
-		echo '<a href="'.$_SERVER['PHP_SELF'].'" class="button">'.$langs->trans('Cancel').'</a>';
+		echo '<a href="'.$_SERVER['PHP_SELF'].'" class="button button-cancel">'.$langs->trans("Cancel").'</a>';
 	}
 	echo '</td>';
 
@@ -338,7 +338,7 @@ echo '<script type="text/javascript"> $(function() {
 
 }); </script>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/export.php b/htdocs/admin/export.php
index ae7faafa937..5dd541b34b5 100644
--- a/htdocs/admin/export.php
+++ b/htdocs/admin/export.php
@@ -71,7 +71,7 @@ $head[$h][1] = $langs->trans("Setup");
 $head[$h][2] = 'setup';
 $h++;
 
-dol_fiche_head($head, 'setup', $langs->trans("ExportsArea"), -1, "technic");
+print dol_get_fiche_head($head, 'setup', $langs->trans("ExportsArea"), -1, "technic");
 
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -103,7 +103,7 @@ print '</table>';
 
 print '</form>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index 7f5bcde4b3d..48db3ee4429 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -55,31 +55,31 @@ $sql .= " WHERE ".$db->decrypt('name')." LIKE 'EXTERNAL_RSS_URLRSS_%'";
 $result = $db->query($sql); // We can't use SELECT MAX() because EXTERNAL_RSS_URLRSS_10 is lower than EXTERNAL_RSS_URLRSS_9
 if ($result)
 {
-    while ($obj = $db->fetch_object($result))
-    {
-        preg_match('/([0-9]+)$/i', $obj->name, $reg);
-        if ($reg[1] && $reg[1] > $lastexternalrss) $lastexternalrss = $reg[1];
-    }
+	while ($obj = $db->fetch_object($result))
+	{
+		preg_match('/([0-9]+)$/i', $obj->name, $reg);
+		if ($reg[1] && $reg[1] > $lastexternalrss) $lastexternalrss = $reg[1];
+	}
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 if ($action == 'add' || GETPOST("modify"))
 {
-    $external_rss_title = "external_rss_title_".GETPOST("norss", 'int');
-    $external_rss_urlrss = "external_rss_urlrss_".GETPOST("norss", 'int');
+	$external_rss_title = "external_rss_title_".GETPOST("norss", 'int');
+	$external_rss_urlrss = "external_rss_urlrss_".GETPOST("norss", 'int');
 
-    if (!empty($_POST[$external_rss_urlrss]))
-    {
-        $boxlabel = '(ExternalRSSInformations)';
-        //$external_rss_url = "external_rss_url_" . $_POST["norss"];
+	if (!empty($_POST[$external_rss_urlrss]))
+	{
+		$boxlabel = '(ExternalRSSInformations)';
+		//$external_rss_url = "external_rss_url_" . $_POST["norss"];
 
-        $db->begin();
+		$db->begin();
 
 		if ($_POST["modify"])
 		{
 			// Supprime boite box_external_rss de definition des boites
-            /* $sql = "UPDATE ".MAIN_DB_PREFIX."boxes_def";
+			/* $sql = "UPDATE ".MAIN_DB_PREFIX."boxes_def";
 			$sql.= " SET name = '".$db->escape($boxlabel)."'";
 	        $sql.= " WHERE file ='box_external_rss.php' AND note like '".$db->escape($_POST["norss"])." %'";
 
@@ -92,56 +92,56 @@ if ($action == 'add' || GETPOST("modify"))
             */
 		} else {
 			// Ajoute boite box_external_rss dans definition des boites
-	        $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes_def (file, note)";
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes_def (file, note)";
 			$sql .= " VALUES ('box_external_rss.php','".$db->escape(GETPOST("norss", 'int').' ('.GETPOST($external_rss_title, 'alpha')).")')";
-	        if (!$db->query($sql))
-	        {
-	        	dol_print_error($db);
-	            $err++;
-	        }
+			if (!$db->query($sql))
+			{
+				dol_print_error($db);
+				$err++;
+			}
 		}
 
 		$result1 = dolibarr_set_const($db, "EXTERNAL_RSS_TITLE_".GETPOST("norss", 'int'), GETPOST($external_rss_title, 'alpha'), 'chaine', 0, '', $conf->entity);
 		if ($result1) $result2 = dolibarr_set_const($db, "EXTERNAL_RSS_URLRSS_".GETPOST("norss", 'int'), GETPOST($external_rss_urlrss, 'alpha'), 'chaine', 0, '', $conf->entity);
 
-        if ($result1 && $result2)
-        {
-            $db->commit();
-            header("Location: ".$_SERVER["PHP_SELF"]);
-            exit;
-        } else {
-            $db->rollback();
-            dol_print_error($db);
-        }
-    }
+		if ($result1 && $result2)
+		{
+			$db->commit();
+			header("Location: ".$_SERVER["PHP_SELF"]);
+			exit;
+		} else {
+			$db->rollback();
+			dol_print_error($db);
+		}
+	}
 }
 
 if ($_POST["delete"])
 {
-    if (GETPOST("norss", 'int'))
-    {
-        $db->begin();
+	if (GETPOST("norss", 'int'))
+	{
+		$db->begin();
 
 		// Supprime boite box_external_rss de definition des boites
-        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."boxes_def";
-        $sql .= " WHERE file = 'box_external_rss.php' AND note LIKE '".$db->escape(GETPOST("norss", 'int'))." %'";
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."boxes_def";
+		$sql .= " WHERE file = 'box_external_rss.php' AND note LIKE '".$db->escape(GETPOST("norss", 'int'))." %'";
 
 		$resql = $db->query($sql);
 		if ($resql)
-        {
+		{
 			$num = $db->num_rows($resql);
 			$i = 0;
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
 
-		        $sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
-		        $sql .= " WHERE entity = ".$conf->entity;
-		        $sql .= " AND box_id = ".$obj->rowid;
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
+				$sql .= " WHERE entity = ".$conf->entity;
+				$sql .= " AND box_id = ".$obj->rowid;
 				$resql = $db->query($sql);
 
-		        $sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def";
-		        $sql .= " WHERE rowid = ".$obj->rowid;
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def";
+				$sql .= " WHERE rowid = ".$obj->rowid;
 				$resql = $db->query($sql);
 
 				if (!$resql)
@@ -159,22 +159,22 @@ if ($_POST["delete"])
 			$db->rollback();
 			dol_print_error($db, "sql=".$sql);
 			exit;
-        }
+		}
 
 
 		$result1 = dolibarr_del_const($db, "EXTERNAL_RSS_TITLE_".GETPOST("norss", 'int'), $conf->entity);
 		if ($result1) $result2 = dolibarr_del_const($db, "EXTERNAL_RSS_URLRSS_".GETPOST("norss", 'int'), $conf->entity);
 
-        if ($result1 && $result2)
-        {
-            $db->commit();
-            header("Location: external_rss.php");
-            exit;
-        } else {
-            $db->rollback();
-            dol_print_error($db);
-        }
-    }
+		if ($result1 && $result2)
+		{
+			$db->commit();
+			header("Location: external_rss.php");
+			exit;
+		} else {
+			$db->rollback();
+			dol_print_error($db);
+		}
+	}
 }
 
 
@@ -242,9 +242,9 @@ if ($resql)
 		$idrss = $reg[1];
 		$keyrsstitle = "EXTERNAL_RSS_TITLE_".$idrss;
 		$keyrssurl = "EXTERNAL_RSS_URLRSS_".$idrss;
-        //print "x".$idrss;
+		//print "x".$idrss;
 
-        $rssparser = new RssParser($db);
+		$rssparser = new RssParser($db);
 		$result = $rssparser->parser($conf->global->$keyrssurl, 5, 300, $conf->externalrss->dir_temp);
 
 		print "<br>";
@@ -255,8 +255,8 @@ if ($resql)
 
 		print '<tr class="liste_titre">';
 		print "<td>".$langs->trans("RSS")." ".($i + 1)."</td>";
-        print '<td class="right">';
-        print '<input type="submit" class="button buttongen" name="modify" value="'.$langs->trans("Modify").'">';
+		print '<td class="right">';
+		print '<input type="submit" class="button buttongen" name="modify" value="'.$langs->trans("Modify").'">';
 		print " &nbsp; ";
 		print '<input type="submit" class="button buttongen" name="delete" value="'.$langs->trans("Delete").'">';
 		print '<input type="hidden" name="norss" value="'.$idrss.'">';
@@ -279,8 +279,8 @@ if ($resql)
 		print '<tr class="oddeven">';
 		print "<td>".$langs->trans("Status")."</td>";
 		print "<td>";
-	    if ($result > 0 && empty($rss->error))
-	    {
+		if ($result > 0 && empty($rss->error))
+		{
 			print '<font class="ok">'.$langs->trans("Online").'</div>';
 		} else {
 			print '<font class="error">'.$langs->trans("Offline");
@@ -292,8 +292,8 @@ if ($resql)
 		print '</tr>'."\n";
 
 		// Logo
-	    if ($result > 0 && empty($rss->error))
-	    {
+		if ($result > 0 && empty($rss->error))
+		{
 			print '<tr class="oddeven">';
 			print "<td>".$langs->trans("Logo")."</td>";
 			print '<td>';
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 0c12f11b4a3..00dcb7c3180 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -245,7 +245,7 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_valu
 print load_fiche_titre($langs->trans("BillsSetup"), $linkback, 'title_setup');
 
 $head = invoice_admin_prepare_head();
-dol_fiche_head($head, 'general', $langs->trans("Invoices"), -1, 'invoice');
+print dol_get_fiche_head($head, 'general', $langs->trans("Invoices"), -1, 'invoice');
 
 /*
  *  Numbering module
@@ -313,8 +313,10 @@ foreach ($dirmodels as $reldir)
 							// Show example of numbering module
 							print '<td class="nowrap">';
 							$tmp = $module->getExample();
-							if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-							elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+							if (preg_match('/^Error/', $tmp)) {
+								$langs->load("errors");
+								print '<div class="error">'.$langs->trans($tmp).'</div>';
+							} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
 							else print $tmp;
 							print '</td>'."\n";
 
@@ -547,7 +549,7 @@ foreach ($dirmodels as $reldir)
 								print '<td class="center">';
 								if ($module->type == 'pdf')
 								{
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
@@ -802,7 +804,7 @@ print '</table>';
 print "</div>\n";
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/facture_situation.php b/htdocs/admin/facture_situation.php
index 61969651634..364297712e7 100644
--- a/htdocs/admin/facture_situation.php
+++ b/htdocs/admin/facture_situation.php
@@ -60,8 +60,8 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
 llxHeader(
-    "", $langs->trans("BillsSetup"),
-    'EN:Invoice_Configuration|FR:Configuration_module_facture|ES:ConfiguracionFactura'
+	"", $langs->trans("BillsSetup"),
+	'EN:Invoice_Configuration|FR:Configuration_module_facture|ES:ConfiguracionFactura'
 );
 
 $form = new Form($db);
@@ -71,7 +71,7 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_valu
 print load_fiche_titre($langs->trans("BillsSetup"), $linkback, 'title_setup');
 
 $head = invoice_admin_prepare_head();
-dol_fiche_head($head, 'situation', $langs->trans("InvoiceSituation"), -1, 'invoice');
+print dol_get_fiche_head($head, 'situation', $langs->trans("InvoiceSituation"), -1, 'invoice');
 
 
 print '<span class="opacitymedium">'.$langs->trans("InvoiceFirstSituationDesc").'</span><br><br>';
@@ -104,12 +104,7 @@ $arrayAvailableType = array(
 	Facture::TYPE_SITUATION => $langs->trans("InvoiceSituation"),
 	Facture::TYPE_STANDARD.'+'.Facture::TYPE_SITUATION => $langs->trans("InvoiceSituation").' + '.$langs->trans("InvoiceStandard"),
 );
-$selected = array();
-$implodeglue = '+';
-if (!empty($conf->global->{$confkey}) && !is_array($conf->global->{$confkey})) {
-	$selected = explode('+', $conf->global->{$confkey});
-}
-
+$selected = $conf->global->$confkey;
 $curentInput = (empty($inputCount) ? 1 : ($inputCount + 1));
 $formSelectInvoiceType = $form->selectarray('value'.$curentInput, $arrayAvailableType, $selected, 1);
 _printInputFormPart($confkey, $langs->trans('AllowedInvoiceForRetainedWarranty'), '', array(), $formSelectInvoiceType);
@@ -118,10 +113,10 @@ _printInputFormPart($confkey, $langs->trans('AllowedInvoiceForRetainedWarranty')
 _printOnOff('INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION', $langs->trans('RetainedwarrantyOnlyForSituationFinal'));
 
 $metas = array(
-    'type' => 'number',
-    'step' => '0.01',
-    'min' => 0,
-    'max' => 100
+	'type' => 'number',
+	'step' => '0.01',
+	'min' => 0,
+	'max' => 100
 );
 _printInputFormPart('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT', $langs->trans('RetainedwarrantyDefaultPercent'), '', $metas);
 
@@ -145,7 +140,7 @@ _updateBtn();
 
 print '</form>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
@@ -158,10 +153,10 @@ $db->close();
  */
 function _updateBtn()
 {
-    global $langs;
-    print '<div class="center">';
-    print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
-    print '</div>';
+	global $langs;
+	print '<div class="center">';
+	print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
+	print '</div>';
 }
 
 /**
@@ -175,18 +170,18 @@ function _updateBtn()
  */
 function _printOnOff($confkey, $title = false, $desc = '')
 {
-    global $langs;
+	global $langs;
 
-    print '<tr class="oddeven">';
-    print '<td>'.($title ? $title : $langs->trans($confkey));
-    if (!empty($desc)) {
-        print '<br><small>'.$langs->trans($desc).'</small>';
-    }
-    print '</td>';
-    print '<td class="center" width="20">&nbsp;</td>';
-    print '<td class="right" width="300">';
-    print ajax_constantonoff($confkey);
-    print '</td></tr>';
+	print '<tr class="oddeven">';
+	print '<td>'.($title ? $title : $langs->trans($confkey));
+	if (!empty($desc)) {
+		print '<br><small>'.$langs->trans($desc).'</small>';
+	}
+	print '</td>';
+	print '<td class="center" width="20">&nbsp;</td>';
+	print '<td class="right" width="300">';
+	print ajax_constantonoff($confkey);
+	print '</td></tr>';
 }
 
 
@@ -204,53 +199,53 @@ function _printOnOff($confkey, $title = false, $desc = '')
  */
 function _printInputFormPart($confkey, $title = false, $desc = '', $metas = array(), $type = 'input', $help = false)
 {
-    global $langs, $conf, $db, $inputCount;
+	global $langs, $conf, $db, $inputCount;
 
-    $inputCount = empty($inputCount) ? 1 : ($inputCount + 1);
-    $form = new Form($db);
+	$inputCount = empty($inputCount) ? 1 : ($inputCount + 1);
+	$form = new Form($db);
 
-    $defaultMetas = array(
-        'name' => 'value'.$inputCount
-    );
+	$defaultMetas = array(
+		'name' => 'value'.$inputCount
+	);
 
-    if ($type != 'textarea') {
-        $defaultMetas['type']   = 'text';
-        $defaultMetas['value']  = $conf->global->{$confkey};
-    }
+	if ($type != 'textarea') {
+		$defaultMetas['type']   = 'text';
+		$defaultMetas['value']  = $conf->global->{$confkey};
+	}
 
 
-    $metas = array_merge($defaultMetas, $metas);
-    $metascompil = '';
-    foreach ($metas as $key => $values) {
-        $metascompil .= ' '.$key.'="'.$values.'" ';
-    }
+	$metas = array_merge($defaultMetas, $metas);
+	$metascompil = '';
+	foreach ($metas as $key => $values) {
+		$metascompil .= ' '.$key.'="'.$values.'" ';
+	}
 
-    print '<tr class="oddeven">';
-    print '<td>';
+	print '<tr class="oddeven">';
+	print '<td>';
 
-    if (!empty($help)) {
-        print $form->textwithtooltip(($title ? $title : $langs->trans($confkey)), $langs->trans($help), 2, 1, img_help(1, ''));
-    } else {
-        print $title ? $title : $langs->trans($confkey);
-    }
+	if (!empty($help)) {
+		print $form->textwithtooltip(($title ? $title : $langs->trans($confkey)), $langs->trans($help), 2, 1, img_help(1, ''));
+	} else {
+		print $title ? $title : $langs->trans($confkey);
+	}
 
-    if (!empty($desc)) {
-        print '<br><small>'.$langs->trans($desc).'</small>';
-    }
+	if (!empty($desc)) {
+		print '<br><small>'.$langs->trans($desc).'</small>';
+	}
 
-    print '</td>';
-    print '<td class="center" width="20">&nbsp;</td>';
-    print '<td class="right" width="300">';
-    print '<input type="hidden" name="param'.$inputCount.'" value="'.$confkey.'">';
+	print '</td>';
+	print '<td class="center" width="20">&nbsp;</td>';
+	print '<td class="right" width="300">';
+	print '<input type="hidden" name="param'.$inputCount.'" value="'.$confkey.'">';
 
-    print '<input type="hidden" name="action" value="setModuleOptions">';
-    if ($type == 'textarea') {
-        print '<textarea '.$metascompil.'  >'.dol_htmlentities($conf->global->{$confkey}).'</textarea>';
+	print '<input type="hidden" name="action" value="setModuleOptions">';
+	if ($type == 'textarea') {
+		print '<textarea '.$metascompil.'  >'.dol_htmlentities($conf->global->{$confkey}).'</textarea>';
 	} elseif ($type == 'input') {
-        print '<input '.$metascompil.'  />';
-    } else {
+		print '<input '.$metascompil.'  />';
+	} else {
 		// custom
 		print $type;
-    }
-    print '</td></tr>';
+	}
+	print '</td></tr>';
 }
diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index 4c1e495939a..bc6b0dc33ac 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -82,23 +82,23 @@ $picto = array(
 
 foreach ($modules as $const => $desc)
 {
-    if ($action == 'activate_'.strtolower($const))
-    {
-        dolibarr_set_const($db, "FCKEDITOR_ENABLE_".$const, "1", 'chaine', 0, '', $conf->entity);
-        // Si fckeditor est active dans la description produit/service, on l'active dans les formulaires
-        if ($const == 'PRODUCTDESC' && !empty($conf->global->PRODUIT_DESC_IN_FORM))
-        {
-            dolibarr_set_const($db, "FCKEDITOR_ENABLE_DETAILS", "1", 'chaine', 0, '', $conf->entity);
-        }
-        header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    }
-    if ($action == 'disable_'.strtolower($const))
-    {
-        dolibarr_del_const($db, "FCKEDITOR_ENABLE_".$const, $conf->entity);
-        header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    }
+	if ($action == 'activate_'.strtolower($const))
+	{
+		dolibarr_set_const($db, "FCKEDITOR_ENABLE_".$const, "1", 'chaine', 0, '', $conf->entity);
+		// Si fckeditor est active dans la description produit/service, on l'active dans les formulaires
+		if ($const == 'PRODUCTDESC' && !empty($conf->global->PRODUIT_DESC_IN_FORM))
+		{
+			dolibarr_set_const($db, "FCKEDITOR_ENABLE_DETAILS", "1", 'chaine', 0, '', $conf->entity);
+		}
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
+	if ($action == 'disable_'.strtolower($const))
+	{
+		dolibarr_del_const($db, "FCKEDITOR_ENABLE_".$const, $conf->entity);
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
 }
 
 if (GETPOST('save', 'alpha'))
@@ -115,7 +115,7 @@ if (GETPOST('save', 'alpha'))
 	}
 
 	$fckeditor_test = GETPOST('formtestfield');
-    if (!empty($fckeditor_test)) {
+	if (!empty($fckeditor_test)) {
 		if (!dolibarr_set_const($db, 'FCKEDITOR_TEST', $fckeditor_test, 'chaine', 0, '', $conf->entity)) {
 			$error++;
 		}
@@ -124,11 +124,11 @@ if (GETPOST('save', 'alpha'))
 	}
 
 	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 /*
@@ -145,80 +145,79 @@ if (empty($conf->use_javascript_ajax))
 {
 	setEventMessages(array($langs->trans("NotAvailable"), $langs->trans("JavascriptDisabled")), null, 'errors');
 } else {
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td colspan="2">'.$langs->trans("ActivateFCKeditor").'</td>';
-    print '<td class="center" width="100">'.$langs->trans("Action").'</td>';
-    print "</tr>\n";
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td colspan="2">'.$langs->trans("ActivateFCKeditor").'</td>';
+	print '<td class="center" width="100">'.$langs->trans("Action").'</td>';
+	print "</tr>\n";
 
-    // Modules
-    foreach ($modules as $const => $desc)
-    {
-        // Si condition non remplie, on ne propose pas l'option
-        if (!$conditions[$const]) continue;
+	// Modules
+	foreach ($modules as $const => $desc)
+	{
+		// Si condition non remplie, on ne propose pas l'option
+		if (!$conditions[$const]) continue;
 
-        print '<tr class="oddeven">';
-        print '<td width="16">'.img_object("", $picto[$const]).'</td>';
-        print '<td>'.$langs->trans($desc).'</td>';
-        print '<td class="center" width="100">';
-        $constante = 'FCKEDITOR_ENABLE_'.$const;
-        $value = (isset($conf->global->$constante) ? $conf->global->$constante : 0);
-        if ($value == 0)
-        {
-            print '<a href="'.$_SERVER['PHP_SELF'].'?action=activate_'.strtolower($const).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-        } elseif ($value == 1)
-        {
-            print '<a href="'.$_SERVER['PHP_SELF'].'?action=disable_'.strtolower($const).'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
-        }
+		print '<tr class="oddeven">';
+		print '<td width="16">'.img_object("", $picto[$const]).'</td>';
+		print '<td>'.$langs->trans($desc).'</td>';
+		print '<td class="center" width="100">';
+		$constante = 'FCKEDITOR_ENABLE_'.$const;
+		$value = (isset($conf->global->$constante) ? $conf->global->$constante : 0);
+		if ($value == 0)
+		{
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=activate_'.strtolower($const).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+		} elseif ($value == 1)
+		{
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=disable_'.strtolower($const).'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
+		}
 
-        print "</td>";
-        print '</tr>';
-    }
+		print "</td>";
+		print '</tr>';
+	}
 
-    print '</table>'."\n";
+	print '</table>'."\n";
 
 	print '<br>'."\n";
 
 	print '<form name="formtest" method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-    print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 
 	// Skins
-    show_skin(null, 1);
-    print '<br>'."\n";
+	show_skin(null, 1);
+	print '<br>'."\n";
 
-    $listofmodes = array('dolibarr_mailings', 'dolibarr_notes', 'dolibarr_details', 'dolibarr_readonly', 'Full', 'Full_inline');
-    $linkstomode = '';
-    foreach ($listofmodes as $newmode)
-    {
-        if ($linkstomode) $linkstomode .= ' - ';
-        $linkstomode .= '<a href="'.$_SERVER["PHP_SELF"].'?mode='.$newmode.'">';
-        if ($mode == $newmode) $linkstomode .= '<strong>';
-        $linkstomode .= $newmode;
-        if ($mode == $newmode) $linkstomode .= '</strong>';
-        $linkstomode .= '</a>';
-    }
-    $linkstomode .= '';
+	$listofmodes = array('dolibarr_mailings', 'dolibarr_notes', 'dolibarr_details', 'dolibarr_readonly', 'Full', 'Full_inline');
+	$linkstomode = '';
+	foreach ($listofmodes as $newmode)
+	{
+		if ($linkstomode) $linkstomode .= ' - ';
+		$linkstomode .= '<a href="'.$_SERVER["PHP_SELF"].'?mode='.$newmode.'">';
+		if ($mode == $newmode) $linkstomode .= '<strong>';
+		$linkstomode .= $newmode;
+		if ($mode == $newmode) $linkstomode .= '</strong>';
+		$linkstomode .= '</a>';
+	}
+	$linkstomode .= '';
 	print load_fiche_titre($langs->trans("TestSubmitForm"), $linkstomode, '');
-    print '<input type="hidden" name="mode" value="'.dol_escape_htmltag($mode).'">';
-    if ($mode != 'Full_inline')
-    {
-        $uselocalbrowser = true;
-        $readonly = ($mode == 'dolibarr_readonly' ? 1 : 0);
-        $editor = new DolEditor('formtestfield', isset($conf->global->FCKEDITOR_TEST) ? $conf->global->FCKEDITOR_TEST : 'Test', '', 200, $mode, 'In', true, $uselocalbrowser, 1, 120, 8, $readonly);
-        $editor->Create();
-    } else {
-        print '<div style="border: 1px solid #888;" contenteditable="true">';
-        print $conf->global->FCKEDITOR_TEST;
-        print '</div>';
-    }
-    print '<br><div class="center"><input class="button" type="submit" name="save" value="'.$langs->trans("Save").'"></div>'."\n";
-    print '<div id="divforlog"></div>';
-    print '</form>'."\n";
+	print '<input type="hidden" name="mode" value="'.dol_escape_htmltag($mode).'">';
+	if ($mode != 'Full_inline')
+	{
+		$uselocalbrowser = true;
+		$readonly = ($mode == 'dolibarr_readonly' ? 1 : 0);
+		$editor = new DolEditor('formtestfield', isset($conf->global->FCKEDITOR_TEST) ? $conf->global->FCKEDITOR_TEST : 'Test', '', 200, $mode, 'In', true, $uselocalbrowser, 1, 120, 8, $readonly);
+		$editor->Create();
+	} else {
+		print '<div style="border: 1px solid #888;" contenteditable="true">';
+		print $conf->global->FCKEDITOR_TEST;
+		print '</div>';
+	}
+	print '<br><div class="center"><input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'"></div>'."\n";
+	print '<div id="divforlog"></div>';
+	print '</form>'."\n";
 
-    // Add env of ckeditor
-    // This is to show how CKEditor detect browser to understand why editor is disabled or not
-    if (1 == 2)		// Change this to enable output
-    {
+	// Add env of ckeditor
+	// This is to show how CKEditor detect browser to understand why editor is disabled or not. To help debug.
+	/*
 	    print '<br><script language="javascript">
 	    function jsdump(obj, id) {
 		    var out = \'\';
@@ -232,6 +231,7 @@ if (empty($conf->use_javascript_ajax))
 	    jsdump(CKEDITOR.env, "divforlog");
 	    </script>';
     }
+    */
 }
 
 // End of page
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 5199165d4f4..e3178d946a0 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -61,11 +61,11 @@ if ($action == 'updateMask')
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 } elseif ($action == 'specimen') // For fiche inter
 {
 	$modele = GETPOST('module', 'alpha');
@@ -78,7 +78,7 @@ if ($action == 'updateMask')
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir)
 	{
-	    $file = dol_buildpath($reldir."core/modules/fichinter/doc/pdf_".$modele.".modules.php", 0);
+		$file = dol_buildpath($reldir."core/modules/fichinter/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file))
 		{
 			$filefound = 1;
@@ -116,7 +116,7 @@ elseif ($action == 'set')
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->FICHEINTER_ADDON_PDF == "$value") dolibarr_del_const($db, 'FICHEINTER_ADDON_PDF', $conf->entity);
+		if ($conf->global->FICHEINTER_ADDON_PDF == "$value") dolibarr_del_const($db, 'FICHEINTER_ADDON_PDF', $conf->entity);
 	}
 }
 
@@ -150,11 +150,11 @@ elseif ($action == 'setdoc')
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 } elseif ($action == 'set_FICHINTER_DRAFT_WATERMARK')
 {
 	$draft = GETPOST('FICHINTER_DRAFT_WATERMARK', 'alpha');
@@ -163,11 +163,11 @@ elseif ($action == 'setdoc')
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 } elseif ($action == 'set_FICHINTER_PRINT_PRODUCTS')
 {
 	$val = GETPOST('FICHINTER_PRINT_PRODUCTS', 'alpha');
@@ -176,14 +176,14 @@ elseif ($action == 'setdoc')
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 } elseif ($action == 'set_FICHINTER_USE_SERVICE_DURATION') {
 	$val = GETPOST('FICHINTER_USE_SERVICE_DURATION', 'alpha');
-    $res = dolibarr_set_const($db, "FICHINTER_USE_SERVICE_DURATION", ($val == 'on' ? 1 : 0), 'bool', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "FICHINTER_USE_SERVICE_DURATION", ($val == 'on' ? 1 : 0), 'bool', 0, '', $conf->entity);
 
 	if (!$res > 0) {
 		$error++;
@@ -195,31 +195,31 @@ elseif ($action == 'setdoc')
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 } elseif ($action == 'set_FICHINTER_WITHOUT_DURATION') {
-    $val = GETPOST('FICHINTER_WITHOUT_DURATION', 'alpha');
-    $res = dolibarr_set_const($db, "FICHINTER_WITHOUT_DURATION", ($val == 'on' ? 1 : 0), 'bool', 0, '', $conf->entity);
+	$val = GETPOST('FICHINTER_WITHOUT_DURATION', 'alpha');
+	$res = dolibarr_set_const($db, "FICHINTER_WITHOUT_DURATION", ($val == 'on' ? 1 : 0), 'bool', 0, '', $conf->entity);
 
-    if (!$res > 0) {
-        $error++;
-    }
+	if (!$res > 0) {
+		$error++;
+	}
 
-    if (!$error) {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 } elseif ($action == 'set_FICHINTER_DATE_WITHOUT_HOUR') {
-    $val = GETPOST('FICHINTER_DATE_WITHOUT_HOUR', 'alpha');
-    $res = dolibarr_set_const($db, "FICHINTER_DATE_WITHOUT_HOUR", ($val == 'on' ? 1 : 0), 'bool', 0, '', $conf->entity);
+	$val = GETPOST('FICHINTER_DATE_WITHOUT_HOUR', 'alpha');
+	$res = dolibarr_set_const($db, "FICHINTER_DATE_WITHOUT_HOUR", ($val == 'on' ? 1 : 0), 'bool', 0, '', $conf->entity);
 
-    if (!$res > 0) {
-        $error++;
-    }
+	if (!$res > 0) {
+		$error++;
+	}
 
-    if (!$error) {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 
@@ -240,7 +240,7 @@ print load_fiche_titre($langs->trans("InterventionsSetup"), $linkback, 'title_se
 
 $head = fichinter_admin_prepare_head();
 
-dol_fiche_head($head, 'ficheinter', $langs->trans("Interventions"), -1, 'intervention');
+print dol_get_fiche_head($head, 'ficheinter', $langs->trans("Interventions"), -1, 'intervention');
 
 // Interventions numbering model
 
@@ -288,13 +288,15 @@ foreach ($dirmodels as $reldir)
 						print $module->info();
 						print '</td>';
 
-                        // Show example of numbering model
-                        print '<td class="nowrap">';
-                        $tmp = $module->getExample();
-                        if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-                        elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-                        else print $tmp;
-                        print '</td>'."\n";
+						// Show example of numbering model
+						print '<td class="nowrap">';
+						$tmp = $module->getExample();
+						if (preg_match('/^Error/', $tmp)) {
+							$langs->load("errors");
+							print '<div class="error">'.$langs->trans($tmp).'</div>';
+						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						else print $tmp;
+						print '</td>'."\n";
 
 						print '<td class="center">';
 						if ($conf->global->FICHEINTER_ADDON == $classname)
@@ -312,16 +314,16 @@ foreach ($dirmodels as $reldir)
 						$htmltooltip = '';
 						$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 						$nextval = $module->getNextValue($mysoc, $ficheinter);
-                        if ("$nextval" != $langs->trans("NotAvailable")) {   // Keep " on nextval
-                            $htmltooltip .= ''.$langs->trans("NextValue").': ';
-                            if ($nextval) {
-                                if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
-                                    $nextval = $langs->trans($nextval);
-                                $htmltooltip .= $nextval.'<br>';
-                            } else {
-                                $htmltooltip .= $langs->trans($module->error).'<br>';
-                            }
-                        }
+						if ("$nextval" != $langs->trans("NotAvailable")) {   // Keep " on nextval
+							$htmltooltip .= ''.$langs->trans("NextValue").': ';
+							if ($nextval) {
+								if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+									$nextval = $langs->trans($nextval);
+								$htmltooltip .= $nextval.'<br>';
+							} else {
+								$htmltooltip .= $langs->trans($module->error).'<br>';
+							}
+						}
 						print '<td class="center">';
 						print $form->textwithpicto('', $htmltooltip, 1, 0);
 						print '</td>';
@@ -399,83 +401,83 @@ foreach ($dirmodels as $reldir)
 			foreach ($filelist as $file)
 			{
 				if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-		    	{
-		    		if (file_exists($dir.'/'.$file))
-		    		{
-		    			$name = substr($file, 4, dol_strlen($file) - 16);
-		    			$classname = substr($file, 0, dol_strlen($file) - 12);
+				{
+					if (file_exists($dir.'/'.$file))
+					{
+						$name = substr($file, 4, dol_strlen($file) - 16);
+						$classname = substr($file, 0, dol_strlen($file) - 12);
 
-		    			require_once $dir.'/'.$file;
-		    			$module = new $classname($db);
+						require_once $dir.'/'.$file;
+						$module = new $classname($db);
 
-		    			$modulequalified = 1;
-		    			if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
-		    			if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+						$modulequalified = 1;
+						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
+						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
 
-		    			if ($modulequalified)
-		    			{
-		    				print '<tr class="oddeven"><td width="100">';
-		    				print (empty($module->name) ? $name : $module->name);
-		    				print "</td><td>\n";
-		    				if (method_exists($module, 'info')) print $module->info($langs);
-		    				else print $module->description;
-		    				print '</td>';
+						if ($modulequalified)
+						{
+							print '<tr class="oddeven"><td width="100">';
+							print (empty($module->name) ? $name : $module->name);
+							print "</td><td>\n";
+							if (method_exists($module, 'info')) print $module->info($langs);
+							else print $module->description;
+							print '</td>';
 
-		    				// Active
-		    				if (in_array($name, $def))
-		    				{
-		    					print "<td align=\"center\">\n";
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
-		    					print img_picto($langs->trans("Enabled"), 'switch_on');
-		    					print '</a>';
-		    					print "</td>";
-		    				} else {
-		    					print "<td align=\"center\">\n";
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-		    					print "</td>";
-		    				}
+							// Active
+							if (in_array($name, $def))
+							{
+								print "<td align=\"center\">\n";
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+								print img_picto($langs->trans("Enabled"), 'switch_on');
+								print '</a>';
+								print "</td>";
+							} else {
+								print "<td align=\"center\">\n";
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+								print "</td>";
+							}
 
-		    				// Default
-		    				print "<td align=\"center\">";
-		    				if ($conf->global->FICHEINTER_ADDON_PDF == "$name")
-		    				{
-		    					print img_picto($langs->trans("Default"), 'on');
-		    				} else {
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-		    				}
-		    				print '</td>';
+							// Default
+							print "<td align=\"center\">";
+							if ($conf->global->FICHEINTER_ADDON_PDF == "$name")
+							{
+								print img_picto($langs->trans("Default"), 'on');
+							} else {
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+							}
+							print '</td>';
 
-		    				// Info
-		    				$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
-		    				$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-		    				$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-		    				$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
+							// Info
+							$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+							$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+							$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+							$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
 
-		    				$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-		    				$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
-		    				$htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
-		    				$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
-		    				$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
-		    				$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
-		    				print '<td class="center">';
-		    				print $form->textwithpicto('', $htmltooltip, -1, 0);
-		    				print '</td>';
+							$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+							$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+							$htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
+							$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
+							$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
+							$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
+							print '<td class="center">';
+							print $form->textwithpicto('', $htmltooltip, -1, 0);
+							print '</td>';
 
-		    				// Preview
-		    				print '<td class="center">';
-		    				if ($module->type == 'pdf')
-		    				{
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'intervention').'</a>';
-		    				} else {
-		    					print img_object($langs->trans("PreviewNotAvailable"), 'generic');
-		    				}
-		    				print '</td>';
+							// Preview
+							print '<td class="center">';
+							if ($module->type == 'pdf')
+							{
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
+							} else {
+								print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+							}
+							print '</td>';
 
-		    				print '</tr>';
-		    			}
-		    		}
-		    	}
-		    }
+							print '</tr>';
+						}
+					}
+				}
+			}
 		}
 	}
 }
@@ -509,11 +511,11 @@ print $form->textwithpicto($langs->trans("FreeLegalTextOnInterventions"), $langs
 $variablename = 'FICHINTER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
-    print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 } else {
-    include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
-    print $doleditor->Create();
+	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+	print $doleditor->Create();
 }
 print '</td><td class="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index 6b8fe0ab3b7..63d15169da2 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -47,7 +47,7 @@ if ($action == 'set')
 
 	$gimcdf = GETPOST("GEOIPMAXMIND_COUNTRY_DATAFILE");
 
-	if (!$error && $gimcdf && ! preg_match('/\.(dat|mmdb)$/', $gimcdf)) {
+	if (!$error && $gimcdf && !preg_match('/\.(dat|mmdb)$/', $gimcdf)) {
 		setEventMessages($langs->trans("ErrorFileMustHaveFormat", '.dat|.mmdb'), null, 'errors');
 		$error++;
 	}
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index 23a0cec8130..eca8319d661 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -177,7 +177,7 @@ print load_fiche_titre($langs->trans("HolidaySetup"), $linkback, 'title_setup');
 
 $head = holiday_admin_prepare_head();
 
-dol_fiche_head($head, 'holiday', $langs->trans("Holidays"), -1, 'holiday');
+print dol_get_fiche_head($head, 'holiday', $langs->trans("Holidays"), -1, 'holiday');
 
 /*
  * Holiday Numbering model
@@ -229,7 +229,10 @@ foreach ($dirmodels as $reldir)
 						// Show example of numbering model
 						print '<td class="nowrap">';
 						$tmp = $module->getExample();
-						if (preg_match('/^Error/', $tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						if (preg_match('/^Error/', $tmp)) {
+							$langs->load("errors");
+							print '<div class="error">'.$langs->trans($tmp).'</div>';
+						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
 						else print $tmp;
 						print '</td>'."\n";
 
@@ -282,7 +285,7 @@ print '<br>';
 
 
 if ($conf->global->MAIN_FEATURES_LEVEL < 2) {
-	dol_fiche_end();
+	print dol_get_fiche_end();
 	// End of page
 	llxFooter();
 	$db->close();
@@ -423,7 +426,7 @@ foreach ($dirmodels as $reldir)
 								print '<td class="center">';
 								if ($module->type == 'pdf')
 								{
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
@@ -494,14 +497,14 @@ print '</div>';
 
 
 print '<div class="center">';
-print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 print '</div>';
 
 print '</form>';
 
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/holiday_extrafields.php b/htdocs/admin/holiday_extrafields.php
index 30eb707782b..077ad08a12a 100644
--- a/htdocs/admin/holiday_extrafields.php
+++ b/htdocs/admin/holiday_extrafields.php
@@ -70,19 +70,19 @@ print load_fiche_titre($langs->trans("HolidaySetup"), $linkback, 'title_setup');
 
 $head = holiday_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Holidays"), -1, 'holiday');
+print dol_get_fiche_head($head, 'attributes', $langs->trans("Holidays"), -1, 'holiday');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -95,9 +95,9 @@ if ($action != 'create' && $action != 'edit')
 if ($action == 'create')
 {
 	print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -107,10 +107,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && !empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index f220d83ebcd..bebb9f7d0bd 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2001-2005	Rodolphe Quiedeville		<rodolphe@quiedeville.org>
+/* Copyright (C) 2001-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2004-2015	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2017	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2016		Juanjo Menent			<jmenent@2byte.es>
@@ -122,7 +122,7 @@ if ($action == 'update')
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TEXTTITLE', $conf->entity);
 	else dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLE', $val, 'chaine', 0, '', $conf->entity);
 
-	$val=(implode(',', (colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLELINK'), array()))));
+	$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLELINK'), array()))));
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TEXTTITLELINK', $conf->entity);
 	else dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLELINK', $val, 'chaine', 0, '', $conf->entity);
 
@@ -156,7 +156,8 @@ if ($action == 'update')
 	dolibarr_set_const($db, "MAIN_SIZE_SHORTLIST_LIMIT", GETPOST("main_size_shortliste_limit", 'int'), 'chaine', 0, '', $conf->entity);
 
 	//dolibarr_set_const($db, "MAIN_DISABLE_JAVASCRIPT", GETPOST("MAIN_DISABLE_JAVASCRIPT", 'aZ09'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_BUTTON_HIDE_UNAUTHORIZED", GETPOST("MAIN_BUTTON_HIDE_UNAUTHORIZED", 'aZ09'), 'chaine', 0, '', $conf->entity);
+	//dolibarr_set_const($db, "MAIN_BUTTON_HIDE_UNAUTHORIZED", GETPOST("MAIN_BUTTON_HIDE_UNAUTHORIZED", 'aZ09'), 'chaine', 0, '', $conf->entity);
+	//dolibarr_set_const($db, "MAIN_MENU_HIDE_UNAUTHORIZED", GETPOST("MAIN_MENU_HIDE_UNAUTHORIZED", 'aZ09'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_START_WEEK", GETPOST("MAIN_START_WEEK", 'int'), 'chaine', 0, '', $conf->entity);
 
 	dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_DAYS", GETPOST("MAIN_DEFAULT_WORKING_DAYS", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
@@ -241,33 +242,33 @@ print '<input type="hidden" name="action" value="update">';
 clearstatcache();
 
 print '<br>';
-print '<table summary="edit" class="noborder centpercent editmode">';
-print '<tr class="liste_titre"><th>'.$langs->trans("Language").'</th><th></th>';
-print '<th width="20">&nbsp;</td>';
+print '<div class="div-table-responsive-no-min">';
+print '<table summary="edit" class="noborder centpercent editmode tableforfield">';
+print '<tr class="liste_titre"><th>'.img_picto('', 'language').' '.$langs->trans("Language").'</th><th></th>';
 print '</tr>';
 
 // Default language
-print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DefaultLanguage").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("DefaultLanguage").'</td><td>';
 print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'MAIN_LANG_DEFAULT', 1, null, '', 0, 0, 'minwidth300', 2);
-print '<input class="button" type="submit" name="submit" value="'.$langs->trans("Save").'">';
+print '<input class="button button-save" type="submit" name="submit" value="'.$langs->trans("Save").'">';
 print '</td>';
-print '<td width="20">&nbsp;</td>';
 print '</tr>';
 
 // Multilingual GUI
-print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("EnableMultilangInterface").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("EnableMultilangInterface").'</td><td>';
 print ajax_constantonoff("MAIN_MULTILANGS", array(), $conf->entity, 0, 0, 1, 0);
 print '</td>';
-print '<td width="20">&nbsp;</td>';
 print '</tr>';
 
 print '</table><br>'."\n";
+print '</div>';
 
 // Themes and themes options
 showSkins(null, 1);
 print '<br>';
 
 // Other
+print '<div class="div-table-responsive-no-min">';
 print '<table summary="otherparameters" class="noborder centpercent editmode">';
 print '<tr class="liste_titre"><th>'.$langs->trans("Miscellaneous").'</th><th></th>';
 print '<th width="20">&nbsp;</tg>';
@@ -302,37 +303,46 @@ print '</tr>';
  */
 
 // First day for weeks
-print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("WeekStartOnDay").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("WeekStartOnDay").'</td><td>';
 print $formother->select_dayofweek((isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : '1'), 'MAIN_START_WEEK', 0);
 print '</td>';
 print '<td width="20">&nbsp;</td>';
 print '</tr>';
 
 // DefaultWorkingDays
-print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DefaultWorkingDays").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("DefaultWorkingDays").'</td><td>';
 print '<input type="text" name="MAIN_DEFAULT_WORKING_DAYS" size="5" value="'.(isset($conf->global->MAIN_DEFAULT_WORKING_DAYS) ? $conf->global->MAIN_DEFAULT_WORKING_DAYS : '1-5').'">';
 print '</td>';
 print '<td width="20">&nbsp;</td>';
 print '</tr>';
 
 // DefaultWorkingHours
-print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DefaultWorkingHours").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("DefaultWorkingHours").'</td><td>';
 print '<input type="text" name="MAIN_DEFAULT_WORKING_HOURS" size="5" value="'.(isset($conf->global->MAIN_DEFAULT_WORKING_HOURS) ? $conf->global->MAIN_DEFAULT_WORKING_HOURS : '9-18').'">';
 print '</td>';
 print '<td width="20">&nbsp;</td>';
 print '</tr>';
 
 // Firstname/Name
-print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("FirstnameNamePosition").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("FirstnameNamePosition").'</td><td>';
 $array = array(0=>$langs->trans("Firstname").' '.$langs->trans("Lastname"), 1=>$langs->trans("Lastname").' '.$langs->trans("Firstname"));
 print $form->selectarray('MAIN_FIRSTNAME_NAME_POSITION', $array, (isset($conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? $conf->global->MAIN_FIRSTNAME_NAME_POSITION : 0));
 print '</td>';
 print '<td width="20">&nbsp;</td>';
 print '</tr>';
 
+// Hide unauthorized menus
+print '<tr class="oddeven"><td>'.$langs->trans("HideUnauthorizedMenu").'</td><td>';
+//print $form->selectyesno('MAIN_MENU_HIDE_UNAUTHORIZED', isset($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) ? $conf->global->MAIN_MENU_HIDE_UNAUTHORIZED : 0, 1);
+print ajax_constantonoff("MAIN_MENU_HIDE_UNAUTHORIZED", array(), $conf->entity, 0, 0, 1, 0);
+print '</td>';
+print '<td width="20">&nbsp;</td>';
+print '</tr>';
+
 // Hide unauthorized button
-print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("ButtonHideUnauthorized").'</td><td>';
-print $form->selectyesno('MAIN_BUTTON_HIDE_UNAUTHORIZED', isset($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) ? $conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED : 0, 1);
+print '<tr class="oddeven"><td>'.$langs->trans("ButtonHideUnauthorized").'</td><td>';
+//print $form->selectyesno('MAIN_BUTTON_HIDE_UNAUTHORIZED', isset($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) ? $conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED : 0, 1);
+print ajax_constantonoff("MAIN_BUTTON_HIDE_UNAUTHORIZED", array(), $conf->entity, 0, 0, 1, 0);
 print '</td>';
 print '<td width="20">&nbsp;</td>';
 print '</tr>';
@@ -340,7 +350,7 @@ print '</tr>';
 // Hide version link
 /*
 
-print '<tr><td class="titlefield">'.$langs->trans("HideVersionLink").'</td><td>';
+print '<tr><td>'.$langs->trans("HideVersionLink").'</td><td>';
 print $form->selectyesno('MAIN_HIDE_VERSION',$conf->global->MAIN_HIDE_VERSION,1);
 print '</td>';
 print '<td width="20">&nbsp;</td>';
@@ -348,7 +358,7 @@ print '</tr>';
 */
 
 // Show bugtrack link
-print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
 print ajax_constantonoff("MAIN_BUGTRACK_ENABLELINK", array(), $conf->entity, 0, 0, 1, 0);
 //print $form->selectyesno('MAIN_BUGTRACK_ENABLELINK', $conf->global->MAIN_BUGTRACK_ENABLELINK, 1);
 print '</td>';
@@ -357,7 +367,7 @@ print '</tr>';
 
 // Hide wiki link on login page
 $pictohelp = '<span class="fa fa-question-circle"></span>';
-print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableLinkToHelp", $pictohelp).'</td><td>';
+print '<tr class="oddeven"><td>'.str_replace('{picto}', $pictohelp, $langs->trans("DisableLinkToHelp", '{picto}')).'</td><td>';
 print ajax_constantonoff("MAIN_HELP_DISABLELINK", array(), $conf->entity, 0, 0, 1, 0);
 //print $form->selectyesno('MAIN_HELP_DISABLELINK', isset($conf->global->MAIN_HELP_DISABLELINK) ? $conf->global->MAIN_HELP_DISABLELINK : 0, 1);
 print '</td>';
@@ -368,7 +378,7 @@ print '</tr>';
 $substitutionarray = getCommonSubstitutionArray($langs, 0, array('object', 'objectamount'));
 complete_substitutions_array($substitutionarray, $langs);
 
-print '<tr class="oddeven"><td class="titlefield">';
+print '<tr class="oddeven"><td>';
 $texthelp = $langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
 foreach ($substitutionarray as $key => $val)
 {
@@ -384,18 +394,19 @@ $doleditor->Create();
 print '</td></tr>'."\n";
 
 print '</table>'."\n";
+print '</div>';
 
 print '<br>';
 
 // Other
 print '<div class="div-table-responsive-no-min">';
 print '<table summary="edit" class="noborder centpercent editmode">';
-print '<tr class="liste_titre"><th class="titlefield">'.$langs->trans("LoginPage").'</th><th></th>';
+print '<tr class="liste_titre"><th>'.$langs->trans("LoginPage").'</th><th></th>';
 print '<th width="20">&nbsp;</th>';
 print '</tr>';
 
 // Hide helpcenter link on login page
-print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableLinkToHelpCenter").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("DisableLinkToHelpCenter").'</td><td>';
 print ajax_constantonoff("MAIN_HELPCENTER_DISABLELINK", array(), $conf->entity, 0, 0, 0, 0);
 print '</td>';
 print '<td width="20">&nbsp;</td>';
@@ -443,7 +454,7 @@ print '</div>';
 
 print '<br>';
 print '<div class="center">';
-print '<input class="button" type="submit" name="submit" value="'.$langs->trans("Save").'">';
+print '<input class="button button-save" type="submit" name="submit" value="'.$langs->trans("Save").'">';
 print '</div>';
 
 print '</form>';
diff --git a/htdocs/admin/import.php b/htdocs/admin/import.php
index d36ffd5265f..e70d8eadbba 100644
--- a/htdocs/admin/import.php
+++ b/htdocs/admin/import.php
@@ -70,7 +70,7 @@ $head[$h][1] = $langs->trans("Setup");
 $head[$h][2] = 'setup';
 $h++;
 
-dol_fiche_head($head, 'setup', $langs->trans("ImportArea"), -1, "technic");
+print dol_get_fiche_head($head, 'setup', $langs->trans("ImportArea"), -1, "technic");
 
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -93,7 +93,7 @@ print '</table>';
 
 print '</form>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index 1a27d61e55d..44bfd678fb4 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -47,24 +47,24 @@ print load_fiche_titre($langs->trans("SetupArea"), '', 'tools');
 
 if (!empty($conf->global->MAIN_MOTD_SETUPPAGE))
 {
-    $conf->global->MAIN_MOTD_SETUPPAGE = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', $conf->global->MAIN_MOTD_SETUPPAGE);
-    if (!empty($conf->global->MAIN_MOTD_SETUPPAGE))
-    {
-    	$i = 0;
-    	while (preg_match('/__\(([a-zA-Z|@]+)\)__/i', $conf->global->MAIN_MOTD_SETUPPAGE, $reg) && $i < 100)
-    	{
-    		$tmp = explode('|', $reg[1]);
-    		if (!empty($tmp[1])) $langs->load($tmp[1]);
-    		$conf->global->MAIN_MOTD_SETUPPAGE = preg_replace('/__\('.preg_quote($reg[1]).'\)__/i', $langs->trans($tmp[0]), $conf->global->MAIN_MOTD_SETUPPAGE);
-    		$i++;
-    	}
+	$conf->global->MAIN_MOTD_SETUPPAGE = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', $conf->global->MAIN_MOTD_SETUPPAGE);
+	if (!empty($conf->global->MAIN_MOTD_SETUPPAGE))
+	{
+		$i = 0;
+		while (preg_match('/__\(([a-zA-Z|@]+)\)__/i', $conf->global->MAIN_MOTD_SETUPPAGE, $reg) && $i < 100)
+		{
+			$tmp = explode('|', $reg[1]);
+			if (!empty($tmp[1])) $langs->load($tmp[1]);
+			$conf->global->MAIN_MOTD_SETUPPAGE = preg_replace('/__\('.preg_quote($reg[1]).'\)__/i', $langs->trans($tmp[0]), $conf->global->MAIN_MOTD_SETUPPAGE);
+			$i++;
+		}
 
-    	print "\n<!-- Start of welcome text for setup page -->\n";
-        print '<table width="100%" class="notopnoleftnoright"><tr><td>';
-        print dol_htmlentitiesbr($conf->global->MAIN_MOTD_SETUPPAGE);
-        print '</td></tr></table><br>';
-        print "\n<!-- End of welcome text for setup page -->\n";
-    }
+		print "\n<!-- Start of welcome text for setup page -->\n";
+		print '<table width="100%" class="notopnoleftnoright"><tr><td>';
+		print dol_htmlentitiesbr($conf->global->MAIN_MOTD_SETUPPAGE);
+		print '</td></tr></table><br>';
+		print "\n<!-- End of welcome text for setup page -->\n";
+	}
 }
 
 print '<span class="opacitymedium hideonsmartphone">';
@@ -109,7 +109,7 @@ print $hookmanager->resPrint;
 if (empty($reshook))
 {
 	// Show into other
-    print '<span class="opacitymedium">'.$langs->trans("SetupDescription5")."</span><br>";
+	print '<span class="opacitymedium">'.$langs->trans("SetupDescription5")."</span><br>";
 	print "<br>";
 
 	// Show logo
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index 951b93f908c..b8c207644c6 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -108,7 +108,7 @@ $form = new Form($db);
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
-dol_fiche_head($head, 'ldap', $langs->trans("LDAPSetup"), -1);
+print dol_get_fiche_head($head, 'ldap', $langs->trans("LDAPSetup"), -1);
 
 print '<table class="noborder centpercent">';
 
@@ -251,7 +251,7 @@ print '</td><td>'.$langs->trans('Password').' (ex: secret)</td></tr>';
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
 
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index 54de74c6371..b29fa00e49e 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -105,7 +105,7 @@ if (!function_exists("ldap_connect"))
 	setEventMessages($langs->trans("LDAPFunctionsNotAvailableOnPHP"), null, 'errors');
 }
 
-dol_fiche_head($head, 'contacts', $langs->trans("LDAPSetup"), -1);
+print dol_get_fiche_head($head, 'contacts', $langs->trans("LDAPSetup"), -1);
 
 
 print $langs->trans("LDAPDescContact").'<br>';
@@ -246,7 +246,7 @@ print '</table>';
 
 print info_admin($langs->trans("LDAPDescValues"));
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
 
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index 4e0c430fb90..61d2e8b69e9 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -61,19 +61,19 @@ if ($action == 'setvalue' && $user->admin)
 	if (!dolibarr_set_const($db, 'LDAP_GROUP_FIELD_GROUPID', GETPOST("fieldgroupid", 'alphanohtml'), 'chaine', 0, '', $conf->entity)) $error++;
 
 	// This one must be after the others
-    $valkey = '';
-    $key = GETPOST("key");
-    if ($key) $valkey = $conf->global->$key;
-    if (!dolibarr_set_const($db, 'LDAP_KEY_GROUPS', $valkey, 'chaine', 0, '', $conf->entity)) $error++;
+	$valkey = '';
+	$key = GETPOST("key");
+	if ($key) $valkey = $conf->global->$key;
+	if (!dolibarr_set_const($db, 'LDAP_KEY_GROUPS', $valkey, 'chaine', 0, '', $conf->entity)) $error++;
 
-    if (!$error)
-    {
-    	$db->commit();
-    	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-    	$db->rollback();
-    	dol_print_error($db);
-    }
+	if (!$error)
+	{
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		$db->rollback();
+		dol_print_error($db);
+	}
 }
 
 
@@ -95,7 +95,7 @@ if (!function_exists("ldap_connect"))
 	setEventMessages($langs->trans("LDAPFunctionsNotAvailableOnPHP"), null, 'errors');
 }
 
-dol_fiche_head($head, 'groups', $langs->trans("LDAPSetup"), -1);
+print dol_get_fiche_head($head, 'groups', $langs->trans("LDAPSetup"), -1);
 
 
 print $langs->trans("LDAPDescGroups").'<br>';
@@ -180,7 +180,7 @@ print '</table>';
 
 print info_admin($langs->trans("LDAPDescValues"));
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
 
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index 0cd09d27f7e..214a4f2cb9b 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -125,7 +125,7 @@ if (!function_exists("ldap_connect"))
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
-dol_fiche_head($head, 'members', $langs->trans("LDAPSetup"), -1);
+print dol_get_fiche_head($head, 'members', $langs->trans("LDAPSetup"), -1);
 
 
 print $langs->trans("LDAPDescMembers").'<br>';
@@ -366,7 +366,7 @@ print '</table>';
 
 print info_admin($langs->trans("LDAPDescValues"));
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
 
diff --git a/htdocs/admin/ldap_members_types.php b/htdocs/admin/ldap_members_types.php
index 371437e1640..489e6047f9b 100644
--- a/htdocs/admin/ldap_members_types.php
+++ b/htdocs/admin/ldap_members_types.php
@@ -93,7 +93,7 @@ if (!function_exists("ldap_connect"))
 	setEventMessages($langs->trans("LDAPFunctionsNotAvailableOnPHP"), null, 'errors');
 }
 
-dol_fiche_head($head, 'memberstypes', $langs->trans("LDAPSetup"), -1);
+print dol_get_fiche_head($head, 'memberstypes', $langs->trans("LDAPSetup"), -1);
 
 
 print $langs->trans("LDAPDescMembersTypes").'<br>';
@@ -162,7 +162,7 @@ print '</table>';
 
 print info_admin($langs->trans("LDAPDescValues"));
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
 
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index d5778fbfb1c..efb34cca413 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -121,7 +121,7 @@ print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
 
-dol_fiche_head($head, 'users', $langs->trans("LDAPSetup"), -1);
+print dol_get_fiche_head($head, 'users', $langs->trans("LDAPSetup"), -1);
 
 print $langs->trans("LDAPDescUsers").'<br>';
 print '<br>';
@@ -336,7 +336,7 @@ print '</table>';
 
 print info_admin($langs->trans("LDAPDescValues"));
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
 
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index db29deef9d7..34da6f7d34e 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -35,8 +35,8 @@ $action = GETPOST('action', 'aZ09');
 $currencycode = GETPOST('currencycode', 'alpha');
 
 if (!empty($conf->multicurrency->enabled) && !empty($conf->global->MULTICURRENCY_USE_LIMIT_BY_CURRENCY)) {
-    // When MULTICURRENCY_USE_LIMIT_BY_CURRENCY is on, we use always a defined currency code instead of '' even for default.
-    $currencycode = (!empty($currencycode) ? $currencycode : $conf->currency);
+	// When MULTICURRENCY_USE_LIMIT_BY_CURRENCY is on, we use always a defined currency code instead of '' even for default.
+	$currencycode = (!empty($currencycode) ? $currencycode : $conf->currency);
 }
 
 $mainmaxdecimalsunit = 'MAIN_MAX_DECIMALS_UNIT'.(!empty($currencycode) ? '_'.$currencycode : '');
@@ -56,41 +56,41 @@ if ($action == 'update')
 	if ($_POST[$mainmaxdecimalsunit] > $MAXDEC
 	|| $_POST[$mainmaxdecimalstot] > $MAXDEC
 	|| $_POST[$mainmaxdecimalsshown] > $MAXDEC)
-    {
-        $error++;
-	    setEventMessages($langs->trans("ErrorDecimalLargerThanAreForbidden", $MAXDEC), null, 'errors');
-    }
+	{
+		$error++;
+		setEventMessages($langs->trans("ErrorDecimalLargerThanAreForbidden", $MAXDEC), null, 'errors');
+	}
 
-    if ($_POST[$mainmaxdecimalsunit].(!empty($currencycode) ? '_'.$currencycode : '') < 0
-    || $_POST[$mainmaxdecimalstot] < 0
-    || $_POST[$mainmaxdecimalsshown] < 0)
-    {
-        $langs->load("errors");
-        $error++;
-	    setEventMessages($langs->trans("ErrorNegativeValueNotAllowed"), null, 'errors');
-    }
+	if ($_POST[$mainmaxdecimalsunit].(!empty($currencycode) ? '_'.$currencycode : '') < 0
+	|| $_POST[$mainmaxdecimalstot] < 0
+	|| $_POST[$mainmaxdecimalsshown] < 0)
+	{
+		$langs->load("errors");
+		$error++;
+		setEventMessages($langs->trans("ErrorNegativeValueNotAllowed"), null, 'errors');
+	}
 
-    if ($valmainroundingruletot)
-    {
-        if ($valmainroundingruletot * pow(10, $valmainmaxdecimalstot) < 1)
-        {
-            $langs->load("errors");
-            $error++;
-	        setEventMessages($langs->trans("ErrorMAIN_ROUNDING_RULE_TOTCanMAIN_MAX_DECIMALS_TOT"), null, 'errors');
-        }
-    }
+	if ($valmainroundingruletot)
+	{
+		if ($valmainroundingruletot * pow(10, $valmainmaxdecimalstot) < 1)
+		{
+			$langs->load("errors");
+			$error++;
+			setEventMessages($langs->trans("ErrorMAIN_ROUNDING_RULE_TOTCanMAIN_MAX_DECIMALS_TOT"), null, 'errors');
+		}
+	}
 
-    if (!$error)
-    {
-        dolibarr_set_const($db, $mainmaxdecimalsunit, $valmainmaxdecimalsunit, 'chaine', 0, '', $conf->entity);
-        dolibarr_set_const($db, $mainmaxdecimalstot, $valmainmaxdecimalstot, 'chaine', 0, '', $conf->entity);
-        dolibarr_set_const($db, $mainmaxdecimalsshown, $valmainmaxdecimalsshown, 'chaine', 0, '', $conf->entity);
+	if (!$error)
+	{
+		dolibarr_set_const($db, $mainmaxdecimalsunit, $valmainmaxdecimalsunit, 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, $mainmaxdecimalstot, $valmainmaxdecimalstot, 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, $mainmaxdecimalsshown, $valmainmaxdecimalsshown, 'chaine', 0, '', $conf->entity);
 
-    	dolibarr_set_const($db, $mainroundingruletot, $valmainroundingruletot, 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, $mainroundingruletot, $valmainroundingruletot, 'chaine', 0, '', $conf->entity);
 
-        header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup".(!empty($currencycode) ? '&currencycode='.$currencycode : ''));
-        exit;
-    }
+		header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup".(!empty($currencycode) ? '&currencycode='.$currencycode : ''));
+		exit;
+	}
 }
 
 
@@ -100,9 +100,12 @@ if ($action == 'update')
 
 $form = new Form($db);
 
-llxHeader();
+$title = $langs->trans("LimitsSetup");
+$help_url = '';
 
-print load_fiche_titre($langs->trans("LimitsSetup"), '', 'title_setup');
+llxHeader('', $title, $help_url);
+
+print load_fiche_titre($title, '', 'title_setup');
 
 $aCurrencies = array($conf->currency); // Default currency always first position
 
@@ -125,7 +128,8 @@ if (!empty($conf->multicurrency->enabled) && !empty($conf->global->MULTICURRENCY
 	if (!empty($aCurrencies) && count($aCurrencies) > 1)
 	{
 		$head = multicurrencyLimitPrepareHead($aCurrencies);
-		dol_fiche_head($head, $currencycode, '', -1, "multicurrency");
+
+		print dol_get_fiche_head($head, $currencycode, '', -1, '');
 	}
 }
 
@@ -134,74 +138,76 @@ print "<br>\n";
 
 if ($action == 'edit')
 {
-    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="update">';
-    if (!empty($conf->multicurrency->enabled) && !empty($conf->global->MULTICURRENCY_USE_LIMIT_BY_CURRENCY)) {
-    	print '<input type="hidden" name="currencycode" value="'.$currencycode.'">';
-    }
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="update">';
+	if (!empty($conf->multicurrency->enabled) && !empty($conf->global->MULTICURRENCY_USE_LIMIT_BY_CURRENCY)) {
+		print '<input type="hidden" name="currencycode" value="'.$currencycode.'">';
+	}
 
-    clearstatcache();
+	clearstatcache();
 
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-    print '<tr class="oddeven"><td>';
-    print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_UNIT"), $langs->trans("ParameterActiveForNextInputOnly"));
-    print '</td><td><input class="flat" name="'.$mainmaxdecimalsunit.'" size="3" value="'.(isset($conf->global->$mainmaxdecimalsunit) ? $conf->global->$mainmaxdecimalsunit : $conf->global->MAIN_MAX_DECIMALS_UNIT).'"></td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_UNIT"), $langs->trans("ParameterActiveForNextInputOnly"));
+	print '</td><td><input class="flat" name="'.$mainmaxdecimalsunit.'" size="3" value="'.(isset($conf->global->$mainmaxdecimalsunit) ? $conf->global->$mainmaxdecimalsunit : $conf->global->MAIN_MAX_DECIMALS_UNIT).'"></td></tr>';
 
-    print '<tr class="oddeven"><td>';
-    print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_TOT"), $langs->trans("ParameterActiveForNextInputOnly"));
-    print '</td><td><input class="flat" name="'.$mainmaxdecimalstot.'" size="3" value="'.(isset($conf->global->$mainmaxdecimalstot) ? $conf->global->$mainmaxdecimalstot : $conf->global->MAIN_MAX_DECIMALS_TOT).'"></td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_TOT"), $langs->trans("ParameterActiveForNextInputOnly"));
+	print '</td><td><input class="flat" name="'.$mainmaxdecimalstot.'" size="3" value="'.(isset($conf->global->$mainmaxdecimalstot) ? $conf->global->$mainmaxdecimalstot : $conf->global->MAIN_MAX_DECIMALS_TOT).'"></td></tr>';
 
-    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAX_DECIMALS_SHOWN").'</td>';
-    print '<td><input class="flat" name="'.$mainmaxdecimalsshown.'" size="3" value="'.(isset($conf->global->$mainmaxdecimalsshown) ? $conf->global->$mainmaxdecimalsshown : $conf->global->MAIN_MAX_DECIMALS_SHOWN).'"></td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAX_DECIMALS_SHOWN").'</td>';
+	print '<td><input class="flat" name="'.$mainmaxdecimalsshown.'" size="3" value="'.(isset($conf->global->$mainmaxdecimalsshown) ? $conf->global->$mainmaxdecimalsshown : $conf->global->MAIN_MAX_DECIMALS_SHOWN).'"></td></tr>';
 
-    print '<tr class="oddeven"><td>';
-    print $form->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"), $langs->trans("ParameterActiveForNextInputOnly"));
-    print '</td><td><input class="flat" name="'.$mainroundingruletot.'" size="3" value="'.(isset($conf->global->$mainroundingruletot) ? $conf->global->$mainroundingruletot : $conf->global->MAIN_ROUNDING_RULE_TOT).'"></td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"), $langs->trans("ParameterActiveForNextInputOnly"));
+	print '</td><td><input class="flat" name="'.$mainroundingruletot.'" size="3" value="'.(isset($conf->global->$mainroundingruletot) ? $conf->global->$mainroundingruletot : $conf->global->MAIN_ROUNDING_RULE_TOT).'"></td></tr>';
 
-    print '</table>';
+	print '</table>';
 
-    print '<br>';
-    print '<div class="center">';
-    print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
-    print '</div>';
+	print '<br>';
+	print '<div class="center">';
+	print '<input class="button button-save" type="submit" value="'.$langs->trans("Save").'">';
+	print '</div>';
 	print '<br>';
 
-    print '</form>';
-    print '<br>';
+	print '</form>';
+	print '<br>';
 } else {
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-    print '<tr class="oddeven"><td>';
-    print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_UNIT"), $langs->trans("ParameterActiveForNextInputOnly"));
-    print '</td><td align="right">'.(isset($conf->global->$mainmaxdecimalsunit) ? $conf->global->$mainmaxdecimalsunit : $conf->global->MAIN_MAX_DECIMALS_UNIT).'</td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_UNIT"), $langs->trans("ParameterActiveForNextInputOnly"));
+	print '</td><td align="right">'.(isset($conf->global->$mainmaxdecimalsunit) ? $conf->global->$mainmaxdecimalsunit : $conf->global->MAIN_MAX_DECIMALS_UNIT).'</td></tr>';
 
-    print '<tr class="oddeven"><td>';
-    print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_TOT"), $langs->trans("ParameterActiveForNextInputOnly"));
-    print '</td><td align="right">'.(isset($conf->global->$mainmaxdecimalstot) ? $conf->global->$mainmaxdecimalstot : $conf->global->MAIN_MAX_DECIMALS_TOT).'</td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_TOT"), $langs->trans("ParameterActiveForNextInputOnly"));
+	print '</td><td align="right">'.(isset($conf->global->$mainmaxdecimalstot) ? $conf->global->$mainmaxdecimalstot : $conf->global->MAIN_MAX_DECIMALS_TOT).'</td></tr>';
 
-    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAX_DECIMALS_SHOWN").'</td>';
-    print '<td align="right">'.(isset($conf->global->$mainmaxdecimalsshown) ? $conf->global->$mainmaxdecimalsshown : $conf->global->MAIN_MAX_DECIMALS_SHOWN).'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAX_DECIMALS_SHOWN").'</td>';
+	print '<td align="right">'.(isset($conf->global->$mainmaxdecimalsshown) ? $conf->global->$mainmaxdecimalsshown : $conf->global->MAIN_MAX_DECIMALS_SHOWN).'</td></tr>';
 
-    print '<tr class="oddeven"><td>';
-    print $form->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"), $langs->trans("ParameterActiveForNextInputOnly"));
-    print '</td><td align="right">'.(isset($conf->global->$mainroundingruletot) ? $conf->global->$mainroundingruletot : $conf->global->MAIN_ROUNDING_RULE_TOT).'</td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"), $langs->trans("ParameterActiveForNextInputOnly"));
+	print '</td><td align="right">'.(isset($conf->global->$mainroundingruletot) ? $conf->global->$mainroundingruletot : $conf->global->MAIN_ROUNDING_RULE_TOT).'</td></tr>';
 
-    print '</table>';
+	print '</table>';
+	print '</div>';
 
-    print '<div class="tabsAction">';
-    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit'.(!empty($currencycode) ? '&currencycode='.$currencycode : '').'">'.$langs->trans("Modify").'</a>';
-    print '</div>';
+	print '<div class="tabsAction">';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit'.(!empty($currencycode) ? '&currencycode='.$currencycode : '').'">'.$langs->trans("Modify").'</a>';
+	print '</div>';
 }
 
 if (!empty($conf->multicurrency->enabled) && !empty($conf->global->MULTICURRENCY_USE_LIMIT_BY_CURRENCY))
 {
 	if (!empty($aCurrencies) && count($aCurrencies) > 1)
 	{
-		dol_fiche_end();
+		print dol_get_fiche_end();
 	}
 }
 
@@ -248,59 +254,59 @@ if (empty($mysoc->country_code))
 	$resql = $db->query($sql);
 	if ($resql)
 	{
-	    $num = $db->num_rows($resql);
-	    if ($num)
-	    {
-	        for ($i = 0; $i < $num; $i++)
-	        {
-	            $obj = $db->fetch_object($resql);
-	            $vat_rates[] = array('vat_rate'=>$obj->vat_rate, 'code'=>$obj->vat_code, 'localtax_rate1'=>$obj->localtax_rate1, 'locltax_rate2'=>$obj->localtax_rate2);
-	        }
-	    }
+		$num = $db->num_rows($resql);
+		if ($num)
+		{
+			for ($i = 0; $i < $num; $i++)
+			{
+				$obj = $db->fetch_object($resql);
+				$vat_rates[] = array('vat_rate'=>$obj->vat_rate, 'code'=>$obj->vat_code, 'localtax_rate1'=>$obj->localtax_rate1, 'locltax_rate2'=>$obj->localtax_rate2);
+			}
+		}
 	} else dol_print_error($db);
 
 	if (count($vat_rates))
 	{
-	    foreach ($vat_rates as $vatarray)
-	    {
-	        $vat = $vatarray['vat_rate'];
-	        for ($qty = 1; $qty <= 2; $qty++)
-	        {
-	            $vattxt = $vat.($vatarray['code'] ? ' ('.$vatarray['code'].')' : '');
+		foreach ($vat_rates as $vatarray)
+		{
+			$vat = $vatarray['vat_rate'];
+			for ($qty = 1; $qty <= 2; $qty++)
+			{
+				$vattxt = $vat.($vatarray['code'] ? ' ('.$vatarray['code'].')' : '');
 
-	            $localtax_array = getLocalTaxesFromRate($vattxt, 0, $mysoc, $mysoc);
+				$localtax_array = getLocalTaxesFromRate($vattxt, 0, $mysoc, $mysoc);
 
-	            $s = 10 / 3;
-	            $tmparray = calcul_price_total($qty, price2num($s, 'MU'), 0, $vat, -1, -1, 0, 'HT', 0, 0, $mysoc, $localtax_array);
-	            print '<span class="opacitymedium">'.$langs->trans("UnitPriceOfProduct").":</span> ".price2num($s, 'MU');
-	            print " x ".$langs->trans("Quantity").": ".$qty;
-	            print " - ".$langs->trans("VAT").": ".$vat.'%';
-	            print ($vatarray['code'] ? ' ('.$vatarray['code'].')' : '');
-	            print ' &nbsp; -> &nbsp; <span class="opacitymedium">'.$langs->trans("TotalPriceAfterRounding").":</span> ";
-	            print $tmparray[0].' / '.$tmparray[1].($tmparray[9] ? '+'.$tmparray[9] : '').($tmparray[10] ? '+'.$tmparray[10] : '').' / '.$tmparray[2];
-	            print "<br>\n";
-	        }
-	    }
+				$s = 10 / 3;
+				$tmparray = calcul_price_total($qty, price2num($s, 'MU'), 0, $vat, -1, -1, 0, 'HT', 0, 0, $mysoc, $localtax_array);
+				print '<span class="opacitymedium">'.$langs->trans("UnitPriceOfProduct").":</span> ".price2num($s, 'MU');
+				print " x ".$langs->trans("Quantity").": ".$qty;
+				print " - ".$langs->trans("VAT").": ".$vat.'%';
+				print ($vatarray['code'] ? ' ('.$vatarray['code'].')' : '');
+				print ' &nbsp; -> &nbsp; <span class="opacitymedium">'.$langs->trans("TotalPriceAfterRounding").":</span> ";
+				print $tmparray[0].' / '.$tmparray[1].($tmparray[9] ? '+'.$tmparray[9] : '').($tmparray[10] ? '+'.$tmparray[10] : '').' / '.$tmparray[2];
+				print "<br>\n";
+			}
+		}
 	} else {
-	    // More examples if not specific vat rate found
-	    // This example must be kept for test purpose with current value because value used (2/7, 10/3, and vat 0, 10)
-	    // were calculated to show all possible cases of rounding. If we change this, examples becomes useless or show the same rounding rule.
+		// More examples if not specific vat rate found
+		// This example must be kept for test purpose with current value because value used (2/7, 10/3, and vat 0, 10)
+		// were calculated to show all possible cases of rounding. If we change this, examples becomes useless or show the same rounding rule.
 
-	    $localtax_array = array();
+		$localtax_array = array();
 
-	    $s = 10 / 3; $qty = 1; $vat = 10;
-	    $tmparray = calcul_price_total($qty, price2num($s, 'MU'), 0, $vat, -1, -1, 0, 'HT', 0, 0, $mysoc, $localtax_array);
-	    print '<span class="opacitymedium">'.$langs->trans("UnitPriceOfProduct").":</span> ".price2num($s, 'MU');
-	    print " x ".$langs->trans("Quantity").": ".$qty;
-	    print " - ".$langs->trans("VAT").": ".$vat.'%';
-	    print ' &nbsp; -> &nbsp; <span class="opacitymedium">'.$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
+		$s = 10 / 3; $qty = 1; $vat = 10;
+		$tmparray = calcul_price_total($qty, price2num($s, 'MU'), 0, $vat, -1, -1, 0, 'HT', 0, 0, $mysoc, $localtax_array);
+		print '<span class="opacitymedium">'.$langs->trans("UnitPriceOfProduct").":</span> ".price2num($s, 'MU');
+		print " x ".$langs->trans("Quantity").": ".$qty;
+		print " - ".$langs->trans("VAT").": ".$vat.'%';
+		print ' &nbsp; -> &nbsp; <span class="opacitymedium">'.$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
 
-	    $s = 10 / 3; $qty = 2; $vat = 10;
-	    $tmparray = calcul_price_total($qty, price2num($s, 'MU'), 0, $vat, -1, -1, 0, 'HT', 0, 0, $mysoc, $localtax_array);
-	    print '<span class="opacitymedium">'.$langs->trans("UnitPriceOfProduct").":</span> ".price2num($s, 'MU');
-	    print " x ".$langs->trans("Quantity").": ".$qty;
-	    print " - ".$langs->trans("VAT").": ".$vat.'%';
-	    print ' &nbsp; -> &nbsp; <span class="opacitymedium">'.$langs->trans("TotalPriceAfterRounding").":</span> ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
+		$s = 10 / 3; $qty = 2; $vat = 10;
+		$tmparray = calcul_price_total($qty, price2num($s, 'MU'), 0, $vat, -1, -1, 0, 'HT', 0, 0, $mysoc, $localtax_array);
+		print '<span class="opacitymedium">'.$langs->trans("UnitPriceOfProduct").":</span> ".price2num($s, 'MU');
+		print " x ".$langs->trans("Quantity").": ".$qty;
+		print " - ".$langs->trans("VAT").": ".$vat.'%';
+		print ' &nbsp; -> &nbsp; <span class="opacitymedium">'.$langs->trans("TotalPriceAfterRounding").":</span> ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
 	}
 }
 
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
deleted file mode 100644
index f3477e151a2..00000000000
--- a/htdocs/admin/livraison.php
+++ /dev/null
@@ -1,460 +0,0 @@
-<?php
-/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
- * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
- * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2014 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2011-2013 Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2011-2018 Philippe Grand       <philippe.grand@atoo-net.com>
- * Copyright (C) 2015	   Claudio Aschieri		<c.aschieri@19.coop>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *      \file       htdocs/admin/livraison.php
- *      \ingroup    livraison
- *      \brief      Page d'administration/configuration du module Livraison
- */
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/expedition.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array("admin", "sendings", "deliveries", "other"));
-
-if (!$user->admin) accessforbidden();
-
-$action  = GETPOST('action', 'alpha');
-$value   = GETPOST('value', 'alpha');
-$label   = GETPOST('label', 'alpha');
-$scandir = GETPOST('scan_dir', 'alpha');
-$type = 'delivery';
-
-
-/*
- * Actions
- */
-
-include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
-
-if ($action == 'updateMask')
-{
-    $maskconstdelivery = GETPOST('maskconstdelivery', 'alpha');
-    $maskdelivery = GETPOST('maskdelivery', 'alpha');
-    if ($maskconstdelivery)  $res = dolibarr_set_const($db, $maskconstdelivery, $maskdelivery, 'chaine', 0, '', $conf->entity);
-
-    if (!$res > 0) $error++;
-
- 	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
-}
-
-if ($action == 'set_DELIVERY_FREE_TEXT')
-{
-    $free = GETPOST('DELIVERY_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
-    $res = dolibarr_set_const($db, "DELIVERY_FREE_TEXT", $free, 'chaine', 0, '', $conf->entity);
-
-    if (!$res > 0) $error++;
-
- 	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
-}
-
-if ($action == 'specimen')
-{
-    $modele = GETPOST('module', 'alpha');
-
-    $sending = new Livraison($db);
-    $sending->initAsSpecimen();
-
-    // Search template files
-    $file = ''; $classname = ''; $filefound = 0;
-    $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-    foreach ($dirmodels as $reldir)
-    {
-        $file = dol_buildpath($reldir."core/modules/livraison/doc/pdf_".$modele.".modules.php", 0);
-        if (file_exists($file))
-        {
-            $filefound = 1;
-            $classname = "pdf_".$modele;
-            break;
-        }
-    }
-
-    if ($filefound)
-    {
-        require_once $file;
-
-        $module = new $classname($db);
-
-        if ($module->write_file($sending, $langs) > 0)
-        {
-            header("Location: ".DOL_URL_ROOT."/document.php?modulepart=livraison&file=SPECIMEN.pdf");
-            return;
-        } else {
-            setEventMessages($module->error, $module->errors, 'errors');
-            dol_syslog($module->error, LOG_ERR);
-        }
-    } else {
-		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-        dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
-    }
-}
-
-if ($action == 'set')
-{
-    $ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-if ($action == 'del')
-{
-    $ret = delDocumentModel($value, $type);
-    if ($ret > 0)
-    {
-        if ($conf->global->LIVRAISON_ADDON_PDF == "$value") dolibarr_del_const($db, 'LIVRAISON_ADDON_PDF', $conf->entity);
-    }
-}
-
-if ($action == 'setdoc')
-{
-    if (dolibarr_set_const($db, "LIVRAISON_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
-    {
-        // La constante qui a ete lue en avant du nouveau set
-        // on passe donc par une variable pour avoir un affichage coherent
-        $conf->global->LIVRAISON_ADDON_PDF = $value;
-    }
-
-    // On active le modele
-    $ret = delDocumentModel($value, $type);
-    if ($ret > 0)
-    {
-        $ret = addDocumentModel($value, $type, $label, $scandir);
-    }
-}
-
-if ($action == 'setmod')
-{
-    // TODO Verifier si module numerotation choisi peut etre active
-    // par appel methode canBeActivated
-
-    dolibarr_set_const($db, "LIVRAISON_ADDON_NUMBER", $value, 'chaine', 0, '', $conf->entity);
-}
-
-
-/*
- * View
- */
-
-$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-
-llxHeader("", "");
-
-$form = new Form($db);
-
-$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("SendingsSetup"), $linkback, 'title_setup');
-print '<br>';
-$head = expedition_admin_prepare_head();
-
-dol_fiche_head($head, 'receivings', $langs->trans("Receivings"), -1, 'shipment');
-
-
-// Delivery numbering model
-
-print load_fiche_titre($langs->trans("DeliveryOrderNumberingModules"), '', '');
-
-print '<table class="noborder centpercent">';
-print '<tr class="liste_titre">';
-print '<td width="100">'.$langs->trans("Name").'</td>';
-print '<td>'.$langs->trans("Description").'</td>';
-print '<td class="nowrap">'.$langs->trans("Example").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
-print '<td align="center" width="16">'.$langs->trans("ShortInfo").'</td>';
-print '</tr>'."\n";
-
-clearstatcache();
-
-foreach ($dirmodels as $reldir)
-{
-    $dir = dol_buildpath($reldir."core/modules/livraison/");
-
-    if (is_dir($dir))
-    {
-        $handle = opendir($dir);
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (substr($file, 0, 14) == 'mod_livraison_' && substr($file, dol_strlen($file) - 3, 3) == 'php')
-                {
-                    $file = substr($file, 0, dol_strlen($file) - 4);
-
-                    require_once $dir.$file.'.php';
-
-                    $module = new $file;
-
-					if ($module->isEnabled())
-                    {
-						// Show modules according to features level
-						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
-
-
-                        print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
-                        print $module->info();
-                        print '</td>';
-
-                        // Show example of numbering module
-                        print '<td class="nowrap">';
-                        $tmp = $module->getExample();
-                        if (preg_match('/^Error/', $tmp)) {
-							$langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>';
-						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-                        else print $tmp;
-                        print '</td>'."\n";
-
-                        print '<td class="center">';
-                        if ($conf->global->LIVRAISON_ADDON_NUMBER == "$file")
-                        {
-                            print img_picto($langs->trans("Activated"), 'switch_on');
-                        } else {
-                            print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-                        }
-                        print '</td>';
-
-                        $livraison = new Livraison($db);
-                        $livraison->initAsSpecimen();
-
-                        // Info
-                        $htmltooltip = '';
-                        $htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
-                        $nextval = $module->getNextValue($mysoc, $livraison);
-                        if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-                            $htmltooltip .= ''.$langs->trans("NextValue").': ';
-                            if ($nextval) {
-                                if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
-                                    $nextval = $langs->trans($nextval);
-                                $htmltooltip .= $nextval.'<br>';
-                            } else {
-                                $htmltooltip .= $langs->trans($module->error).'<br>';
-                            }
-                        }
-
-                        print '<td class="center">';
-                        print $form->textwithpicto('', $htmltooltip, 1, 0);
-                        print '</td>';
-
-                        print '</tr>';
-                    }
-                }
-            }
-            closedir($handle);
-        }
-    }
-}
-
-print '</table>';
-
-
-/*
- *  Documents Models for delivery
- */
-print '<br>';
-print load_fiche_titre($langs->trans("DeliveryOrderModel"), '', '');
-
-// Defini tableau def de modele
-$type = "delivery";
-$def = array();
-
-$sql = "SELECT nom";
-$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql .= " WHERE type = '".$db->escape($type)."'";
-$sql .= " AND entity = ".$conf->entity;
-
-$resql = $db->query($sql);
-if ($resql)
-{
-	$i = 0;
-	$num_rows = $db->num_rows($resql);
-	while ($i < $num_rows)
-	{
-		$array = $db->fetch_array($resql);
-		array_push($def, $array[0]);
-		$i++;
-	}
-} else {
-	dol_print_error($db);
-}
-
-print '<table class="noborder centpercent">';
-print '<tr class="liste_titre">';
-print '<td width="140">'.$langs->trans("Name").'</td>';
-print '<td>'.$langs->trans("Description").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Default").'</td>';
-print '<td align="center" width="32">'.$langs->trans("ShortInfo").'</td>';
-print '<td align="center" width="32">'.$langs->trans("Preview").'</td>';
-print "</tr>\n";
-
-clearstatcache();
-
-foreach ($dirmodels as $reldir)
-{
-    $dir = dol_buildpath($reldir."core/modules/livraison/doc/");
-
-    if (is_dir($dir))
-    {
-        $handle = opendir($dir);
-        if (is_resource($handle))
-        {
-        	while (($file = readdir($handle)) !== false)
-			{
-				$filelist[] = $file;
-			}
-			closedir($handle);
-			arsort($filelist);
-
-			foreach ($filelist as $file)
-			{
-                if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-                {
-                	if (file_exists($dir.'/'.$file))
-                	{
-		    			$name = substr($file, 4, dol_strlen($file) - 16);
-		    			$classname = substr($file, 0, dol_strlen($file) - 12);
-
-		    			require_once $dir.'/'.$file;
-		    			$module = new $classname($db);
-
-		    			$modulequalified = 1;
-		    			if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
-		    			if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
-
-		    			if ($modulequalified)
-		    			{
-		    				print '<tr class="oddeven"><td width="100">';
-		    				print (empty($module->name) ? $name : $module->name);
-		    				print "</td><td>\n";
-		    				if (method_exists($module, 'info')) print $module->info($langs);
-		    				else print $module->description;
-		    				print '</td>';
-
-		    				// Active
-		    				if (in_array($name, $def))
-		    				{
-		    					print "<td align=\"center\">\n";
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
-		    					print img_picto($langs->trans("Enabled"), 'switch_on');
-		    					print '</a>';
-		    					print "</td>";
-		    				} else {
-		    					print "<td align=\"center\">\n";
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-		    					print "</td>";
-		    				}
-
-		    				// Default
-		    				print "<td align=\"center\">";
-		    				if ($conf->global->LIVRAISON_ADDON_PDF == "$name")
-		    				{
-		    					print img_picto($langs->trans("Default"), 'on');
-		    				} else {
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-		    				}
-		    				print '</td>';
-
-		    				// Info
-		    				$htmltooltip = ''.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-		    				$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-		    				$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").'</u>:';
-		    				$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
-		    				print '<td class="center">';
-		    				print $form->textwithpicto('', $htmltooltip, 1, 0);
-		    				print '</td>';
-
-		    				// Preview
-		    				print '<td class="center">';
-		    				if ($module->type == 'pdf')
-		    				{
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'sending').'</a>';
-		    				} else {
-		    					print img_object($langs->trans("PreviewNotAvailable"), 'generic');
-		    				}
-		    				print '</td>';
-
-		    				print '</tr>';
-		    			}
-                	}
-                }
-            }
-        }
-    }
-}
-
-print '</table>';
-/*
- *  Autres Options
- */
-print "<br>";
-print load_fiche_titre($langs->trans("OtherOptions"), '', '');
-
-print '<table class="noborder centpercent">';
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Parameter").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
-print '<td width="80">&nbsp;</td>';
-print "</tr>\n";
-
-$substitutionarray = pdf_getSubstitutionArray($langs, null, null, 2);
-$substitutionarray['__(AnyTranslationKey)__'] = $langs->trans("Translation");
-$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
-foreach ($substitutionarray as $key => $val)	$htmltext .= $key.'<br>';
-$htmltext .= '</i>';
-
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="set_DELIVERY_FREE_TEXT">';
-print '<tr class="oddeven"><td colspan="2">';
-print $form->textwithpicto($langs->trans("FreeLegalTextOnDeliveryReceipts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
-$variablename = 'DELIVERY_FREE_TEXT';
-if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
-{
-    print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-} else {
-    include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
-    print $doleditor->Create();
-}
-print '</td><td class="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-print "</td></tr>\n";
-print '</form>';
-
-print '</table>';
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/admin/loan.php b/htdocs/admin/loan.php
index a138d9d0bf2..ee358300ca4 100644
--- a/htdocs/admin/loan.php
+++ b/htdocs/admin/loan.php
@@ -33,7 +33,7 @@ $langs->loadLangs(array('admin', 'loan'));
 
 // Security check
 if (!$user->admin)
-    accessforbidden();
+	accessforbidden();
 
 $action = GETPOST('action', 'aZ09');
 
@@ -50,22 +50,22 @@ $list = array(
 
 if ($action == 'update')
 {
-    $error = 0;
+	$error = 0;
 
-    foreach ($list as $constname) {
-        $constvalue = GETPOST($constname, 'alpha');
+	foreach ($list as $constname) {
+		$constvalue = GETPOST($constname, 'alpha');
 
-        if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
-            $error++;
-        }
-    }
+		if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+			$error++;
+		}
+	}
 
-    if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 /*
diff --git a/htdocs/admin/mailman.php b/htdocs/admin/mailman.php
index d9d3ae8142d..8070beab59b 100644
--- a/htdocs/admin/mailman.php
+++ b/htdocs/admin/mailman.php
@@ -63,53 +63,53 @@ if ($action == 'update' || $action == 'add')
 	}
 
  	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 // Action activation d'un sous module du module adherent
 if ($action == 'set')
 {
-    $result = dolibarr_set_const($db, $_GET["name"], $_GET["value"], '', 0, '', $conf->entity);
-    if ($result < 0)
-    {
-        dol_print_error($db);
-    }
+	$result = dolibarr_set_const($db, $_GET["name"], $_GET["value"], '', 0, '', $conf->entity);
+	if ($result < 0)
+	{
+		dol_print_error($db);
+	}
 }
 
 // Action desactivation d'un sous module du module adherent
 if ($action == 'unset')
 {
-    $result = dolibarr_del_const($db, $_GET["name"], $conf->entity);
-    if ($result < 0)
-    {
-        dol_print_error($db);
-    }
+	$result = dolibarr_del_const($db, $_GET["name"], $conf->entity);
+	if ($result < 0)
+	{
+		dol_print_error($db);
+	}
 }
 
 if (($action == 'testsubscribe' || $action == 'testunsubscribe') && !empty($conf->global->ADHERENT_USE_MAILMAN))
 {
-    $email = GETPOST($action.'email');
-    if (!isValidEmail($email))
-    {
-        $langs->load("errors");
-        setEventMessages($langs->trans("ErrorBadEMail", $email), null, 'errors');
-    } else {
-        include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php';
-        $mailmanspip = new MailmanSpip($db);
+	$email = GETPOST($action.'email');
+	if (!isValidEmail($email))
+	{
+		$langs->load("errors");
+		setEventMessages($langs->trans("ErrorBadEMail", $email), null, 'errors');
+	} else {
+		include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php';
+		$mailmanspip = new MailmanSpip($db);
 
-        $object = new stdClass();
-        $object->email = $email;
-        $object->pass = $email;
-        /*$object->element='member';
+		$object = new stdClass();
+		$object->email = $email;
+		$object->pass = $email;
+		/*$object->element='member';
         $object->type='Preferred Partners'; */
 
-        if ($action == 'testsubscribe')
-        {
-            $result = $mailmanspip->add_to_mailman($object);
+		if ($action == 'testsubscribe')
+		{
+			$result = $mailmanspip->add_to_mailman($object);
 			if ($result < 0)
 			{
 				$error++;
@@ -117,19 +117,19 @@ if (($action == 'testsubscribe' || $action == 'testunsubscribe') && !empty($conf
 			} else {
 				setEventMessages($langs->trans("MailmanCreationSuccess"), null);
 			}
-        }
-        if ($action == 'testunsubscribe')
-        {
-            $result = $mailmanspip->del_to_mailman($object);
-            if ($result < 0)
+		}
+		if ($action == 'testunsubscribe')
+		{
+			$result = $mailmanspip->del_to_mailman($object);
+			if ($result < 0)
 			{
 				$error++;
 				setEventMessages($mailmanspip->error, $mailmanspip->errors, 'errors');
 			} else {
 				setEventMessages($langs->trans("MailmanDeletionSuccess"), null);
 			}
-        }
-    }
+		}
+	}
 }
 
 
@@ -149,31 +149,31 @@ $head = mailmanspip_admin_prepare_head();
 
 if (!empty($conf->global->ADHERENT_USE_MAILMAN))
 {
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="update">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="update">';
 
-    dol_fiche_head($head, 'mailman', $langs->trans("Setup"), -1, 'user');
+	print dol_get_fiche_head($head, 'mailman', $langs->trans("Setup"), -1, 'user');
 
-    //$link=img_picto($langs->trans("Active"),'tick').' ';
-    $link = '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=unset&token='.newToken().'&value=0&name=ADHERENT_USE_MAILMAN">';
-    //$link.=$langs->trans("Disable");
-    $link .= img_picto($langs->trans("Activated"), 'switch_on');
-    $link .= '</a>';
-    // Edition des varibales globales
-    $constantes = array(
-        'ADHERENT_MAILMAN_ADMINPW',
-        'ADHERENT_MAILMAN_URL',
-        'ADHERENT_MAILMAN_UNSUB_URL',
-        'ADHERENT_MAILMAN_LISTS'
-    );
+	//$link=img_picto($langs->trans("Active"),'tick').' ';
+	$link = '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=unset&token='.newToken().'&value=0&name=ADHERENT_USE_MAILMAN">';
+	//$link.=$langs->trans("Disable");
+	$link .= img_picto($langs->trans("Activated"), 'switch_on');
+	$link .= '</a>';
+	// Edition des varibales globales
+	$constantes = array(
+		'ADHERENT_MAILMAN_ADMINPW',
+		'ADHERENT_MAILMAN_URL',
+		'ADHERENT_MAILMAN_UNSUB_URL',
+		'ADHERENT_MAILMAN_LISTS'
+	);
 
-    print load_fiche_titre($langs->trans('MailmanTitle'), $link, '');
+	print load_fiche_titre($langs->trans('MailmanTitle'), $link, '');
 
-    print '<br>';
+	print '<br>';
 
-    // JQuery activity
-    print '<script type="text/javascript">
+	// JQuery activity
+	print '<script type="text/javascript">
     var i1=0;
     var i2=0;
     var i3=0;
@@ -193,48 +193,48 @@ if (!empty($conf->global->ADHERENT_USE_MAILMAN))
 	});
     </script>';
 
-    form_constantes($constantes, 2);
+	form_constantes($constantes, 2);
 
-    print '*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-    print '%LISTE%, %MAILMAN_ADMINPW%, %EMAIL% <br>';
+	print '*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+	print '%LISTE%, %MAILMAN_ADMINPW%, %EMAIL% <br>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
+	print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
 
-    print '</form>';
+	print '</form>';
 } else {
-    dol_fiche_head($head, 'mailman', $langs->trans("Setup"), 0, 'user');
+	print dol_get_fiche_head($head, 'mailman', $langs->trans("Setup"), 0, 'user');
 
-    $link = '<a href="'.$_SERVER["PHP_SELF"].'?action=set&token='.newToken().'&value=1&name=ADHERENT_USE_MAILMAN">';
-    //$link.=img_$langs->trans("Activate")
-    $link .= img_picto($langs->trans("Disabled"), 'switch_off');
-    $link .= '</a>';
-    print load_fiche_titre($langs->trans('MailmanTitle'), $link, '');
+	$link = '<a href="'.$_SERVER["PHP_SELF"].'?action=set&token='.newToken().'&value=1&name=ADHERENT_USE_MAILMAN">';
+	//$link.=img_$langs->trans("Activate")
+	$link .= img_picto($langs->trans("Disabled"), 'switch_off');
+	$link .= '</a>';
+	print load_fiche_titre($langs->trans('MailmanTitle'), $link, '');
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 
 if (!empty($conf->global->ADHERENT_USE_MAILMAN))
 {
-    print '<form action="'.$_SERVER["PHP_SELF"].'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="testsubscribe">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="testsubscribe">';
 
-    print $langs->trans("TestSubscribe").'<br>';
-    print $langs->trans("EMail").' <input type="email" class="flat" name="testsubscribeemail" value="'.GETPOST('testsubscribeemail').'"> <input class="button" type="submit" value="'.$langs->trans("Test").'"><br>';
+	print $langs->trans("TestSubscribe").'<br>';
+	print $langs->trans("EMail").' <input type="email" class="flat" name="testsubscribeemail" value="'.GETPOST('testsubscribeemail').'"> <input class="button" type="submit" value="'.$langs->trans("Test").'"><br>';
 
-    print '</form>';
+	print '</form>';
 
-    print '<form action="'.$_SERVER["PHP_SELF"].'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="testunsubscribe">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="testunsubscribe">';
 
-    print $langs->trans("TestUnSubscribe").'<br>';
-    print $langs->trans("EMail").' <input type="email" class="flat" name="testunsubscribeemail" value="'.GETPOST('testunsubscribeemail').'"> <input class="button" type="submit" value="'.$langs->trans("Test").'"><br>';
+	print $langs->trans("TestUnSubscribe").'<br>';
+	print $langs->trans("EMail").' <input type="email" class="flat" name="testunsubscribeemail" value="'.GETPOST('testunsubscribeemail').'"> <input class="button" type="submit" value="'.$langs->trans("Test").'"><br>';
 
-    print '</form>';
+	print '</form>';
 }
 
 // End of page
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 8971f5a69d4..77f4d14dc77 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 $langs->loadLangs(array("companies", "products", "admin", "mails", "other", "errors"));
 
 $action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
 
 if (!$user->admin) accessforbidden();
 
@@ -64,33 +65,46 @@ complete_substitutions_array($substitutionarrayfortest, $langs);
  * Actions
  */
 
-if ($action == 'update' && empty($_POST["cancel"]))
+if ($action == 'update' && !$cancel)
 {
-	dolibarr_set_const($db, "MAIN_DISABLE_ALL_MAILS", GETPOST("MAIN_DISABLE_ALL_MAILS", 'int'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_FORCE_SENDTO", GETPOST("MAIN_MAIL_FORCE_SENDTO", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_ENABLED_USER_DEST_SELECT", GETPOST("MAIN_MAIL_ENABLED_USER_DEST_SELECT", 'int'), 'chaine', 0, '', $conf->entity);
-	// Send mode parameters
-	dolibarr_set_const($db, "MAIN_MAIL_SENDMODE", GETPOST("MAIN_MAIL_SENDMODE", 'aZ09'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_SMTP_PORT", GETPOST("MAIN_MAIL_SMTP_PORT", 'int'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_SMTP_SERVER", GETPOST("MAIN_MAIL_SMTP_SERVER", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_SMTPS_ID", GETPOST("MAIN_MAIL_SMTPS_ID", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW", GETPOST("MAIN_MAIL_SMTPS_PW", 'none'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_TLS", GETPOST("MAIN_MAIL_EMAIL_TLS", 'int'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_STARTTLS", GETPOST("MAIN_MAIL_EMAIL_STARTTLS", 'int'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED", GETPOST("MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED", 'int'), 'chaine', 0, '', $conf->entity);
+	if (!$error && !GETPOST("MAIN_MAIL_EMAIL_FROM", 'alphanohtml')) {
+		$error++;
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("MAIN_MAIL_EMAIL_FROM")), null, 'errors');
+		$action = 'edit';
+	}
+	if (!$error && !isValidEmail(GETPOST("MAIN_MAIL_EMAIL_FROM", 'alphanohtml'))) {
+		$error++;
+		setEventMessages($langs->trans("ErrorBadEMail", GETPOST("MAIN_MAIL_EMAIL_FROM", 'alphanohtml')), null, 'errors');
+		$action = 'edit';
+	}
 
-	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_ENABLED", GETPOST("MAIN_MAIL_EMAIL_DKIM_ENABLED", 'int'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_DOMAIN", GETPOST("MAIN_MAIL_EMAIL_DKIM_DOMAIN", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_SELECTOR", GETPOST("MAIN_MAIL_EMAIL_DKIM_SELECTOR", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY", GETPOST("MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	// Content parameters
-	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_FROM", GETPOST("MAIN_MAIL_EMAIL_FROM", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_ERRORS_TO", GETPOST("MAIN_MAIL_ERRORS_TO", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_AUTOCOPY_TO", GETPOST("MAIN_MAIL_AUTOCOPY_TO", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, 'MAIN_MAIL_DEFAULT_FROMTYPE', GETPOST('MAIN_MAIL_DEFAULT_FROMTYPE', 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	if (!$error) {
+		dolibarr_set_const($db, "MAIN_DISABLE_ALL_MAILS", GETPOST("MAIN_DISABLE_ALL_MAILS", 'int'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_FORCE_SENDTO", GETPOST("MAIN_MAIL_FORCE_SENDTO", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_ENABLED_USER_DEST_SELECT", GETPOST("MAIN_MAIL_ENABLED_USER_DEST_SELECT", 'int'), 'chaine', 0, '', $conf->entity);
+		// Send mode parameters
+		dolibarr_set_const($db, "MAIN_MAIL_SENDMODE", GETPOST("MAIN_MAIL_SENDMODE", 'aZ09'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_SMTP_PORT", GETPOST("MAIN_MAIL_SMTP_PORT", 'int'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_SMTP_SERVER", GETPOST("MAIN_MAIL_SMTP_SERVER", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_SMTPS_ID", GETPOST("MAIN_MAIL_SMTPS_ID", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW", GETPOST("MAIN_MAIL_SMTPS_PW", 'none'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_TLS", GETPOST("MAIN_MAIL_EMAIL_TLS", 'int'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_STARTTLS", GETPOST("MAIN_MAIL_EMAIL_STARTTLS", 'int'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED", GETPOST("MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED", 'int'), 'chaine', 0, '', $conf->entity);
 
-	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
-	exit;
+		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_ENABLED", GETPOST("MAIN_MAIL_EMAIL_DKIM_ENABLED", 'int'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_DOMAIN", GETPOST("MAIN_MAIL_EMAIL_DKIM_DOMAIN", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_SELECTOR", GETPOST("MAIN_MAIL_EMAIL_DKIM_SELECTOR", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY", GETPOST("MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+		// Content parameters
+		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_FROM", GETPOST("MAIN_MAIL_EMAIL_FROM", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_ERRORS_TO", GETPOST("MAIN_MAIL_ERRORS_TO", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_AUTOCOPY_TO", GETPOST("MAIN_MAIL_AUTOCOPY_TO", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, 'MAIN_MAIL_DEFAULT_FROMTYPE', GETPOST('MAIN_MAIL_DEFAULT_FROMTYPE', 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+
+		header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
+		exit;
+	}
 }
 
 
@@ -164,6 +178,7 @@ if ($action == 'edit')
                             jQuery("#MAIN_MAIL_EMAIL_DKIM_DOMAIN").prop("disabled", true);
                             jQuery("#MAIN_MAIL_EMAIL_DKIM_SELECTOR").prop("disabled", true);
                             jQuery("#MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY").prop("disabled", true);
+                            jQuery(".smtp_method").hide();
                             jQuery(".dkim").hide();
                             ';
 		if ($linuxlike)
@@ -174,13 +189,13 @@ if ($action == 'edit')
                             jQuery("#smtp_server_mess").show();
                             jQuery("#smtp_port_mess").show();';
 		} else {
-            print '
+			print '
                             jQuery("#MAIN_MAIL_SMTP_SERVER").prop("disabled", true);
                             jQuery("#MAIN_MAIL_SMTP_PORT").prop("disabled", true);
-                            jQuery("#smtp_server_mess").hide();
+							jQuery("#smtp_server_mess").hide();
                             jQuery("#smtp_port_mess").hide();';
-        }
-        print '
+		}
+		print '
                         }
                         if (jQuery("#MAIN_MAIL_SENDMODE").val()==\'smtps\')
                         {
@@ -206,7 +221,8 @@ if ($action == 'edit')
                             jQuery("#MAIN_MAIL_SMTP_PORT").show();
                             jQuery("#smtp_server_mess").hide();
 			                jQuery("#smtp_port_mess").hide();
-                            jQuery(".dkim").hide();
+                            jQuery(".smtp_method").show();
+							jQuery(".dkim").hide();
 						}
                         if (jQuery("#MAIN_MAIL_SENDMODE").val()==\'swiftmailer\')
                         {
@@ -232,6 +248,7 @@ if ($action == 'edit')
                             jQuery("#MAIN_MAIL_SMTP_PORT").show();
                             jQuery("#smtp_server_mess").hide();
                             jQuery("#smtp_port_mess").hide();
+							jQuery(".smtp_method").show();
                             jQuery(".dkim").show();
                         }
                     }
@@ -252,14 +269,14 @@ if ($action == 'edit')
 							jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED").val(0);
                     });
                })';
-        print '</script>'."\n";
+		print '</script>'."\n";
 	}
 
 	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
 
-	dol_fiche_head($head, 'common', '', -1);
+	print dol_get_fiche_head($head, 'common', '', -1);
 
 	print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
 	print "<br>\n";
@@ -304,13 +321,15 @@ if ($action == 'edit')
 	print '</td></tr>';
 
 	// Host server
-	print '<tr class="oddeven"><td>';
-	if (!$conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail')
-	{
+	print '<tr class="oddeven">';
+	if (!$conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail') {
+		print '<td>';
 		print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
 		print '</td><td>';
 		print '<span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
+		print '</td>';
 	} else {
+		print '<td>';
 		$mainserver = (!empty($conf->global->MAIN_MAIL_SMTP_SERVER) ? $conf->global->MAIN_MAIL_SMTP_SERVER : '');
 		$smtpserver = ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined");
 		if ($linuxlike) print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
@@ -319,17 +338,19 @@ if ($action == 'edit')
 		// SuperAdministrator access only
 		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
 		{
-			print '<input class="flat" id="MAIN_MAIL_SMTP_SERVER" name="MAIN_MAIL_SMTP_SERVER" size="18" value="'.$mainserver.'" autocomplete="off">';
+			print '<input class="flat minwidth300" id="MAIN_MAIL_SMTP_SERVER" name="MAIN_MAIL_SMTP_SERVER" value="'.$mainserver.'" autocomplete="off">';
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER_sav" name="MAIN_MAIL_SMTP_SERVER_sav" value="'.$mainserver.'">';
 			print '<span id="smtp_server_mess" class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
+			print ' <span class="opacitymedium smtp_method">'.$langs->trans("SeeLinkToOnlineDocumentation").'</span>';
 		} else {
 			$text = !empty($mainserver) ? $mainserver : $smtpserver;
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER" name="MAIN_MAIL_SMTP_SERVER" value="'.$mainserver.'">';
 		}
+		print '</td>';
 	}
-	print '</td></tr>';
+	print '</tr>';
 
 	// Port
 	print '<tr class="oddeven"><td>';
@@ -395,8 +416,8 @@ if ($action == 'edit')
 		print '</td></tr>';
 	}
 
-    // TLS
-    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
+	// TLS
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
 	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))))
 	{
 		if (function_exists('openssl_open'))
@@ -439,20 +460,20 @@ if ($action == 'edit')
 	} else print yn(0).' ('.$langs->trans("NotSupported").')';
 	print '</td></tr>';
 
-    // DKIM Domain
-    print '<tr class="oddeven dkim"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_DOMAIN").'</td>';
-    print '<td><input class="flat" id="MAIN_MAIL_EMAIL_DKIM_DOMAIN" name="MAIN_MAIL_EMAIL_DKIM_DOMAIN" size="32" value="'.(!empty($conf->global->MAIN_MAIL_EMAIL_DKIM_DOMAIN) ? $conf->global->MAIN_MAIL_EMAIL_DKIM_DOMAIN : '');
-    print '"></td></tr>';
+	// DKIM Domain
+	print '<tr class="oddeven dkim"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_DOMAIN").'</td>';
+	print '<td><input class="flat" id="MAIN_MAIL_EMAIL_DKIM_DOMAIN" name="MAIN_MAIL_EMAIL_DKIM_DOMAIN" size="32" value="'.(!empty($conf->global->MAIN_MAIL_EMAIL_DKIM_DOMAIN) ? $conf->global->MAIN_MAIL_EMAIL_DKIM_DOMAIN : '');
+	print '"></td></tr>';
 
-    // DKIM Selector
-    print '<tr class="oddeven dkim"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_SELECTOR").'</td>';
-    print '<td><input class="flat" id="MAIN_MAIL_EMAIL_DKIM_SELECTOR" name="MAIN_MAIL_EMAIL_DKIM_SELECTOR" size="32" value="'.(!empty($conf->global->MAIN_MAIL_EMAIL_DKIM_SELECTOR) ? $conf->global->MAIN_MAIL_EMAIL_DKIM_SELECTOR : '');
-    print '"></td></tr>';
+	// DKIM Selector
+	print '<tr class="oddeven dkim"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_SELECTOR").'</td>';
+	print '<td><input class="flat" id="MAIN_MAIL_EMAIL_DKIM_SELECTOR" name="MAIN_MAIL_EMAIL_DKIM_SELECTOR" size="32" value="'.(!empty($conf->global->MAIN_MAIL_EMAIL_DKIM_SELECTOR) ? $conf->global->MAIN_MAIL_EMAIL_DKIM_SELECTOR : '');
+	print '"></td></tr>';
 
-    // DKIM PRIVATE KEY
-    print '<tr class="oddeven dkim"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY").'</td>';
-    print '<td><textarea id="MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY" name="MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY" rows="15" cols="100">'.(!empty($conf->global->MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY) ? $conf->global->MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY : '').'</textarea>';
-    print '</td></tr>';
+	// DKIM PRIVATE KEY
+	print '<tr class="oddeven dkim"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY").'</td>';
+	print '<td><textarea id="MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY" name="MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY" rows="15" cols="100">'.(!empty($conf->global->MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY) ? $conf->global->MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY : '').'</textarea>';
+	print '</td></tr>';
 
 	print '</table>';
 
@@ -462,8 +483,8 @@ if ($action == 'edit')
 	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("OtherOptions").'</td><td></td></tr>';
 
 	// From
-	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM", ini_get('sendmail_from') ?ini_get('sendmail_from') : $langs->transnoentities("Undefined")).'</td>';
-	print '<td><input class="flat" name="MAIN_MAIL_EMAIL_FROM" size="32" value="'.(!empty($conf->global->MAIN_MAIL_EMAIL_FROM) ? $conf->global->MAIN_MAIL_EMAIL_FROM : '');
+	print '<tr class="oddeven"><td class="fieldrequired">'.$langs->trans("MAIN_MAIL_EMAIL_FROM", ini_get('sendmail_from') ?ini_get('sendmail_from') : $langs->transnoentities("Undefined")).'</td>';
+	print '<td><input class="flat minwidth200" name="MAIN_MAIL_EMAIL_FROM" value="'.(!empty($conf->global->MAIN_MAIL_EMAIL_FROM) ? $conf->global->MAIN_MAIL_EMAIL_FROM : '');
 	print '"></td></tr>';
 
 	// Default from type
@@ -492,17 +513,17 @@ if ($action == 'edit')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<br><div class="center">';
-	print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
+	print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
 } else {
-	dol_fiche_head($head, 'common', '', -1);
+	print dol_get_fiche_head($head, 'common', '', -1);
 
 	print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
 	print "<br>\n";
@@ -515,211 +536,215 @@ if ($action == 'edit')
 	if (!empty($conf->global->MAIN_DISABLE_ALL_MAILS)) print img_warning($langs->trans("Disabled"));
 	print '</td></tr>';
 
-	// Force e-mail recipient
-	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_FORCE_SENDTO").'</td><td>'.$conf->global->MAIN_MAIL_FORCE_SENDTO;
-	if (!empty($conf->global->MAIN_MAIL_FORCE_SENDTO))
-	{
-		if (!isValidEmail($conf->global->MAIN_MAIL_FORCE_SENDTO)) print img_warning($langs->trans("ErrorBadEMail"));
-		else print img_warning($langs->trans("RecipientEmailsWillBeReplacedWithThisValue"));
+	if (empty($conf->global->MAIN_DISABLE_ALL_MAILS)) {
+		// Force e-mail recipient
+		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_FORCE_SENDTO").'</td><td>'.$conf->global->MAIN_MAIL_FORCE_SENDTO;
+		if (!empty($conf->global->MAIN_MAIL_FORCE_SENDTO))
+		{
+			if (!isValidEmail($conf->global->MAIN_MAIL_FORCE_SENDTO)) print img_warning($langs->trans("ErrorBadEMail"));
+			else print img_warning($langs->trans("RecipientEmailsWillBeReplacedWithThisValue"));
+		}
+		print '</td></tr>';
 	}
-	print '</td></tr>';
 
 	print '</table>';
 
-	print '<br>';
+	if (empty($conf->global->MAIN_DISABLE_ALL_MAILS)) {
+		print '<br>';
 
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td></td></tr>';
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td></td></tr>';
 
-	// Method
-	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
-	$text = $listofmethods[$conf->global->MAIN_MAIL_SENDMODE];
-	if (empty($text)) $text = $langs->trans("Undefined").img_warning();
-	print $text;
+		// Method
+		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
+		$text = $listofmethods[$conf->global->MAIN_MAIL_SENDMODE];
+		if (empty($text)) $text = $langs->trans("Undefined").img_warning();
+		print $text;
 
-	if ($conf->global->MAIN_MAIL_SENDMODE == 'mail' && empty($conf->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP)) {
-		print $form->textwithpicto('', $langs->trans("WarningPHPMail").'<br>'.$langs->trans("WarningPHPMailA").'<br>'.$langs->trans("WarningPHPMailB").'<br>'.$langs->trans("WarningPHPMailC"), 1, 'warning');
-	}
+		if ($conf->global->MAIN_MAIL_SENDMODE == 'mail' && empty($conf->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP)) {
+			print $form->textwithpicto('', $langs->trans("WarningPHPMail").'<br>'.$langs->trans("WarningPHPMailA").'<br>'.$langs->trans("WarningPHPMailB").'<br>'.$langs->trans("WarningPHPMailC").'<br><br>'.$langs->trans("WarningPHPMailD"), 1, 'warning');
+		}
 
-	print '</td></tr>';
+		print '</td></tr>';
 
-	// Host server
-	if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail'))
-	{
-		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").'</td><td><span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span></td></tr>';
-	} else {
-		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER", ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined")).'</td><td>'.(!empty($conf->global->MAIN_MAIL_SMTP_SERVER) ? $conf->global->MAIN_MAIL_SMTP_SERVER : '').'</td></tr>';
-	}
-
-	// Port
-	if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail'))
-	{
-		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").'</td><td><span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span></td></tr>';
-	} else {
-		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT", ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined")).'</td><td>'.(!empty($conf->global->MAIN_MAIL_SMTP_PORT) ? $conf->global->MAIN_MAIL_SMTP_PORT : '').'</td></tr>';
-	}
-
-	// SMTPS ID
-	if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
-	{
-		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'.$conf->global->MAIN_MAIL_SMTPS_ID.'</td></tr>';
-	}
-
-	// SMTPS PW
-	if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
-	{
-		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'.preg_replace('/./', '*', $conf->global->MAIN_MAIL_SMTPS_PW).'</td></tr>';
-	}
-
-	// TLS
-	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
-	if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
-	{
-		if (function_exists('openssl_open'))
+		// Host server
+		if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail'))
 		{
-			print yn($conf->global->MAIN_MAIL_EMAIL_TLS);
-		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-	} else print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
-	print '</td></tr>';
+			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").'</td><td><span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span></td></tr>';
+		} else {
+			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER", ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined")).'</td><td>'.(!empty($conf->global->MAIN_MAIL_SMTP_SERVER) ? $conf->global->MAIN_MAIL_SMTP_SERVER : '').'</td></tr>';
+		}
 
-	// STARTTLS
-	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").'</td><td>';
-	if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
-	{
-		if (function_exists('openssl_open'))
+		// Port
+		if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail'))
 		{
-			print yn($conf->global->MAIN_MAIL_EMAIL_STARTTLS);
-		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-	} else print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
-	print '</td></tr>';
+			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").'</td><td><span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span></td></tr>';
+		} else {
+			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT", ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined")).'</td><td>'.(!empty($conf->global->MAIN_MAIL_SMTP_PORT) ? $conf->global->MAIN_MAIL_SMTP_PORT : '').'</td></tr>';
+		}
 
-	// SMTP_ALLOW_SELF_SIGNED
-	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED").'</td><td>';
-	if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
-	{
-		if (function_exists('openssl_open'))
+		// SMTPS ID
+		if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
 		{
-			print yn($conf->global->MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED);
-		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-	} else print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
-	print '</td></tr>';
+			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'.$conf->global->MAIN_MAIL_SMTPS_ID.'</td></tr>';
+		}
 
+		// SMTPS PW
+		if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
+		{
+			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'.preg_replace('/./', '*', $conf->global->MAIN_MAIL_SMTPS_PW).'</td></tr>';
+		}
 
-	if ($conf->global->MAIN_MAIL_SENDMODE == 'swiftmailer')
-	{
-		// DKIM
-		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_ENABLED").'</td><td>';
-		if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('swiftmailer')))
+		// TLS
+		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
+		if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
 		{
 			if (function_exists('openssl_open'))
 			{
-				print yn($conf->global->MAIN_MAIL_EMAIL_DKIM_ENABLED);
+				print yn($conf->global->MAIN_MAIL_EMAIL_TLS);
 			} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-		} else print yn(0).' ('.$langs->trans("NotSupported").')';
+		} else print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
 		print '</td></tr>';
 
-	    // Domain
-	    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_DOMAIN").'</td>';
-	    print '<td>'.$conf->global->MAIN_MAIL_EMAIL_DKIM_DOMAIN;
-	    print '</td></tr>';
-
-	    // Selector
-	    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_SELECTOR").'</td>';
-	    print '<td>'.$conf->global->MAIN_MAIL_EMAIL_DKIM_SELECTOR;
-	    print '</td></tr>';
-
-	    // PRIVATE KEY
-	    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY").'</td>';
-	    print '<td>'.$conf->global->MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY;
-	    print '</td></tr>';
-	}
-
-	print '</table>';
-
-	if ($conf->global->MAIN_MAIL_SENDMODE == 'mail' && empty($conf->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP)) {
-		print info_admin($langs->trans("WarningPHPMail").'<br>'.$langs->trans("WarningPHPMailA").'<br>'.$langs->trans("WarningPHPMailB").'<br>'.$langs->trans("WarningPHPMailC"), 0, 0, 'warning');
-	}
-
-	print '<br>';
-
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("OtherOptions").'</td><td></td></tr>';
-
-	// From
-	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM", ini_get('sendmail_from') ?ini_get('sendmail_from') : $langs->transnoentities("Undefined")).'</td>';
-	print '<td>'.$conf->global->MAIN_MAIL_EMAIL_FROM;
-	if (!empty($conf->global->MAIN_MAIL_EMAIL_FROM) && !isValidEmail($conf->global->MAIN_MAIL_EMAIL_FROM)) print img_warning($langs->trans("ErrorBadEMail"));
-	print '</td></tr>';
-
-	// Default from type
-	$liste = array();
-	$liste['user'] = $langs->trans('UserEmail');
-	$liste['company'] = $langs->trans('CompanyEmail').' ('.(empty($conf->global->MAIN_INFO_SOCIETE_MAIL) ? $langs->trans("NotDefined") : $conf->global->MAIN_INFO_SOCIETE_MAIL).')';
-	$sql = 'SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile';
-	$sql .= ' WHERE active = 1 AND (private = 0 OR private = '.$user->id.')';
-	$resql = $db->query($sql);
-	if ($resql)
-	{
-		$num = $db->num_rows($resql);
-		$i = 0;
-		while ($i < $num)
+		// STARTTLS
+		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").'</td><td>';
+		if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
 		{
-			$obj = $db->fetch_object($resql);
-			if ($obj)
+			if (function_exists('openssl_open'))
 			{
-				$liste['senderprofile_'.$obj->rowid] = $obj->label.' <'.$obj->email.'>';
-			}
-			$i++;
-		}
-	} else dol_print_error($db);
+				print yn($conf->global->MAIN_MAIL_EMAIL_STARTTLS);
+			} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+		} else print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
+		print '</td></tr>';
 
-	print '<tr class="oddeven"><td>'.$langs->trans('MAIN_MAIL_DEFAULT_FROMTYPE').'</td>';
-	print '<td>';
-	if ($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE === 'robot')
-	{
-		print $langs->trans('RobotEmail');
-	} elseif ($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE === 'user')
-	{
-		print $langs->trans('UserEmail');
-	} elseif ($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE === 'company')
-	{
-		print $langs->trans('CompanyEmail').' '.dol_escape_htmltag('<'.$mysoc->email.'>');
-	} else {
-		$id = preg_replace('/senderprofile_/', '', $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE);
-		if ($id > 0)
+		// SMTP_ALLOW_SELF_SIGNED
+		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED").'</td><td>';
+		if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
 		{
-			include_once DOL_DOCUMENT_ROOT.'/core/class/emailsenderprofile.class.php';
-			$emailsenderprofile = new EmailSenderProfile($db);
-			$emailsenderprofile->fetch($id);
-			print $emailsenderprofile->label.' '.dol_escape_htmltag('<'.$emailsenderprofile->email.'>');
+			if (function_exists('openssl_open'))
+			{
+				print yn($conf->global->MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED);
+			} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+		} else print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
+		print '</td></tr>';
+
+
+		if ($conf->global->MAIN_MAIL_SENDMODE == 'swiftmailer')
+		{
+			// DKIM
+			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_ENABLED").'</td><td>';
+			if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('swiftmailer')))
+			{
+				if (function_exists('openssl_open'))
+				{
+					print yn($conf->global->MAIN_MAIL_EMAIL_DKIM_ENABLED);
+				} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+			} else print yn(0).' ('.$langs->trans("NotSupported").')';
+			print '</td></tr>';
+
+			// Domain
+			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_DOMAIN").'</td>';
+			print '<td>'.$conf->global->MAIN_MAIL_EMAIL_DKIM_DOMAIN;
+			print '</td></tr>';
+
+			// Selector
+			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_SELECTOR").'</td>';
+			print '<td>'.$conf->global->MAIN_MAIL_EMAIL_DKIM_SELECTOR;
+			print '</td></tr>';
+
+			// PRIVATE KEY
+			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY").'</td>';
+			print '<td>'.$conf->global->MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY;
+			print '</td></tr>';
 		}
+
+		print '</table>';
+
+		if ($conf->global->MAIN_MAIL_SENDMODE == 'mail' && empty($conf->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP)) {
+			print info_admin($langs->trans("WarningPHPMail").'<br>'.$langs->trans("WarningPHPMailA").'<br>'.$langs->trans("WarningPHPMailB").'<br>'.$langs->trans("WarningPHPMailC").'<br><br>'.$langs->trans("WarningPHPMailD"), 0, 0, 'warning');
+		}
+
+		print '<br>';
+
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("OtherOptions").'</td><td></td></tr>';
+
+		// From
+		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM", ini_get('sendmail_from') ?ini_get('sendmail_from') : $langs->transnoentities("Undefined")).'</td>';
+		print '<td>'.$conf->global->MAIN_MAIL_EMAIL_FROM;
+		if (!empty($conf->global->MAIN_MAIL_EMAIL_FROM) && !isValidEmail($conf->global->MAIN_MAIL_EMAIL_FROM)) print img_warning($langs->trans("ErrorBadEMail"));
+		print '</td></tr>';
+
+		// Default from type
+		$liste = array();
+		$liste['user'] = $langs->trans('UserEmail');
+		$liste['company'] = $langs->trans('CompanyEmail').' ('.(empty($conf->global->MAIN_INFO_SOCIETE_MAIL) ? $langs->trans("NotDefined") : $conf->global->MAIN_INFO_SOCIETE_MAIL).')';
+		$sql = 'SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile';
+		$sql .= ' WHERE active = 1 AND (private = 0 OR private = '.$user->id.')';
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$num = $db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
+				if ($obj)
+				{
+					$liste['senderprofile_'.$obj->rowid] = $obj->label.' <'.$obj->email.'>';
+				}
+				$i++;
+			}
+		} else dol_print_error($db);
+
+		print '<tr class="oddeven"><td>'.$langs->trans('MAIN_MAIL_DEFAULT_FROMTYPE').'</td>';
+		print '<td>';
+		if ($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE === 'robot')
+		{
+			print $langs->trans('RobotEmail');
+		} elseif ($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE === 'user')
+		{
+			print $langs->trans('UserEmail');
+		} elseif ($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE === 'company')
+		{
+			print $langs->trans('CompanyEmail').' '.dol_escape_htmltag('<'.$mysoc->email.'>');
+		} else {
+			$id = preg_replace('/senderprofile_/', '', $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE);
+			if ($id > 0)
+			{
+				include_once DOL_DOCUMENT_ROOT.'/core/class/emailsenderprofile.class.php';
+				$emailsenderprofile = new EmailSenderProfile($db);
+				$emailsenderprofile->fetch($id);
+				print $emailsenderprofile->label.' '.dol_escape_htmltag('<'.$emailsenderprofile->email.'>');
+			}
+		}
+		print '</td></tr>';
+
+		// Errors To
+		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_ERRORS_TO").'</td>';
+		print '<td>'.$conf->global->MAIN_MAIL_ERRORS_TO;
+		if (!empty($conf->global->MAIN_MAIL_ERRORS_TO) && !isValidEmail($conf->global->MAIN_MAIL_ERRORS_TO)) print img_warning($langs->trans("ErrorBadEMail"));
+		print '</td></tr>';
+
+		// Autocopy to
+		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>';
+		print '<td>';
+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO))
+		{
+			print $conf->global->MAIN_MAIL_AUTOCOPY_TO;
+			if (!isValidEmail($conf->global->MAIN_MAIL_AUTOCOPY_TO)) print img_warning($langs->trans("ErrorBadEMail"));
+		} else {
+			print '&nbsp;';
+		}
+		print '</td></tr>';
+
+		//Add user to select destinaries list
+		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_ENABLED_USER_DEST_SELECT").'</td><td>'.yn($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT).'</td></tr>';
+
+		print '</table>';
 	}
-	print '</td></tr>';
 
-	// Errors To
-	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_ERRORS_TO").'</td>';
-	print '<td>'.$conf->global->MAIN_MAIL_ERRORS_TO;
-	if (!empty($conf->global->MAIN_MAIL_ERRORS_TO) && !isValidEmail($conf->global->MAIN_MAIL_ERRORS_TO)) print img_warning($langs->trans("ErrorBadEMail"));
-	print '</td></tr>';
-
-	// Autocopy to
-	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>';
-	print '<td>';
-	if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO))
-	{
-		print $conf->global->MAIN_MAIL_AUTOCOPY_TO;
-		if (!isValidEmail($conf->global->MAIN_MAIL_AUTOCOPY_TO)) print img_warning($langs->trans("ErrorBadEMail"));
-	} else {
-		print '&nbsp;';
-	}
-	print '</td></tr>';
-
-	//Add user to select destinaries list
-	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_ENABLED_USER_DEST_SELECT").'</td><td>'.yn($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT).'</td></tr>';
-
-	print '</table>';
-
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	// Actions button
@@ -727,21 +752,23 @@ if ($action == 'edit')
 
 	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
 
-	if ($conf->global->MAIN_MAIL_SENDMODE != 'mail' || !$linuxlike)
-	{
-		if (function_exists('fsockopen') && $port && $server)
+	if (empty($conf->global->MAIN_DISABLE_ALL_MAILS)) {
+		if ($conf->global->MAIN_MAIL_SENDMODE != 'mail' || !$linuxlike)
 		{
-			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testconnect#formmailbeforetitle">'.$langs->trans("DoTestServerAvailability").'</a>';
+			if (function_exists('fsockopen') && $port && $server)
+			{
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testconnect#formmailbeforetitle">'.$langs->trans("DoTestServerAvailability").'</a>';
+			}
+		} else {
+			print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("FeatureNotAvailableOnLinux").'">'.$langs->trans("DoTestServerAvailability").'</a>';
 		}
-	} else {
-		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("FeatureNotAvailableOnLinux").'">'.$langs->trans("DoTestServerAvailability").'</a>';
-	}
 
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=test&mode=init#formmailbeforetitle">'.$langs->trans("DoTestSend").'</a>';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=test&mode=init#formmailbeforetitle">'.$langs->trans("DoTestSend").'</a>';
 
-	if (!empty($conf->fckeditor->enabled))
-	{
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testhtml&mode=init#formmailbeforetitle">'.$langs->trans("DoTestSendHTML").'</a>';
+		if (!empty($conf->fckeditor->enabled))
+		{
+			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testhtml&mode=init#formmailbeforetitle">'.$langs->trans("DoTestSendHTML").'</a>';
+		}
 	}
 
 	print '</div>';
@@ -775,7 +802,7 @@ if ($action == 'edit')
 		{
 			if (!empty($conf->global->MAIN_EXTERNAL_MAIL_SPF_STRING_TO_ADD))
 			{
-				// List of string to add in SPF if the setup use the mail method
+				// List of string to add in SPF if the setup use the mail method. Example 'include:sendgrid.net include:spf.mydomain.com'
 				$text .= ($text ? '<br><br>' : '').$langs->trans("WarningPHPMailSPF", $conf->global->MAIN_EXTERNAL_MAIL_SPF_STRING_TO_ADD);
 			} else {
 				// MAIN_EXTERNAL_SMTP_CLIENT_IP_ADDRESS is list of IPs where email is sent from. Example: '1.2.3.4, [aaaa:bbbb:cccc:dddd]'.
@@ -788,12 +815,13 @@ if ($action == 'edit')
 		} else {
 			if (!empty($conf->global->MAIN_EXTERNAL_SMTP_CLIENT_IP_ADDRESS))
 			{
-				// List of IP show as record to add as allowed IP if we use the smtp method
+				// List of IP show as record to add as allowed IP if we use the smtp method. Value is '1.2.3.4, [aaaa:bbbb:cccc:dddd]'
+				// TODO Add a key to allow to show the IP/name of server detected dynamically
 				$text .= ($text ? '<br><br>' : '').$langs->trans("WarningPHPMail2", $conf->global->MAIN_EXTERNAL_SMTP_CLIENT_IP_ADDRESS);
 			}
-			if (!empty($conf->global->MAIN_EXTERNAL_SMTP_SPF_STRING_TO_ADD))	// Should be required only if you have set to use your own SMTP and wat to warn users to update their domain name to match your SMTP server.
+			if (!empty($conf->global->MAIN_EXTERNAL_SMTP_SPF_STRING_TO_ADD))	// Should be required only if you have preset the Dolibarr to use your own SMTP and you want to warn users to update their domain name to match your SMTP server.
 			{
-				// List of string to add in SPF if we use the smtp method
+				// List of string to add in SPF if we use the smtp method. Example 'include:spf.mydomain.com'
 				$text .= ($text ? '<br><br>' : '').$langs->trans("WarningPHPMailSPF", $conf->global->MAIN_EXTERNAL_SMTP_SPF_STRING_TO_ADD);
 			}
 		}
@@ -829,14 +857,14 @@ if ($action == 'edit')
 		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 		print load_fiche_titre($action == 'testhtml' ? $langs->trans("DoTestSendHTML") : $langs->trans("DoTestSend"));
 
-		dol_fiche_head('');
+		print dol_get_fiche_head('');
 
 		// Cree l'objet formulaire mail
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 		$formmail = new FormMail($db);
 		$formmail->trackid = (($action == 'testhtml') ? "testhtml" : "test");
-		$formmail->fromname = (isset($_POST['fromname']) ? $_POST['fromname'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
-		$formmail->frommail = (isset($_POST['frommail']) ? $_POST['frommail'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
+		$formmail->fromname = (GETPOSTISSET('fromname') ? $_POST['fromname'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
+		$formmail->frommail = (GETPOSTISSET('frommail') ? $_POST['frommail'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
 		$formmail->fromid = $user->id;
 		$formmail->fromalsorobot = 1;
 		$formmail->fromtype = (GETPOSTISSET('fromtype') ?GETPOST('fromtype', 'aZ09') : (!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
@@ -844,13 +872,13 @@ if ($action == 'edit')
 		$formmail->withsubstit = 1;
 		$formmail->withfrom = 1;
 		$formmail->witherrorsto = 1;
-		$formmail->withto = (!empty($_POST['sendto']) ? $_POST['sendto'] : ($user->email ? $user->email : 1));
-		$formmail->withtocc = (!empty($_POST['sendtocc']) ? $_POST['sendtocc'] : 1); // ! empty to keep field if empty
-		$formmail->withtoccc = (!empty($_POST['sendtoccc']) ? $_POST['sendtoccc'] : 1); // ! empty to keep field if empty
-		$formmail->withtopic = (isset($_POST['subject']) ? $_POST['subject'] : $langs->trans("Test"));
+		$formmail->withto = (!empty($_POST['sendto']) ? GETPOST('sendto', 'restricthtml') : ($user->email ? $user->email : 1));
+		$formmail->withtocc = (!empty($_POST['sendtocc']) ? GETPOST('sendtocc', 'restricthtml') : 1); // ! empty to keep field if empty
+		$formmail->withtoccc = (!empty($_POST['sendtoccc']) ? GETPOST('sendtoccc', 'restricthtml') : 1); // ! empty to keep field if empty
+		$formmail->withtopic = (GETPOSTISSET('subject') ? GETPOST('subject') : $langs->trans("Test"));
 		$formmail->withtopicreadonly = 0;
 		$formmail->withfile = 2;
-		$formmail->withbody = (isset($_POST['message']) ? $_POST['message'] : ($action == 'testhtml' ? $langs->transnoentities("PredefinedMailTestHtml") : $langs->transnoentities("PredefinedMailTest")));
+		$formmail->withbody = (GETPOSTISSET('message') ? GETPOST('message', 'restricthtml') : ($action == 'testhtml' ? $langs->transnoentities("PredefinedMailTestHtml") : $langs->transnoentities("PredefinedMailTest")));
 		$formmail->withbodyreadonly = 0;
 		$formmail->withcancel = 1;
 		$formmail->withdeliveryreceipt = 1;
@@ -872,7 +900,7 @@ if ($action == 'edit')
 
 		print $formmail->get_form('addfile', 'removefile');
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		// References
 		print '<span class="opacitymedium">'.$langs->trans("EMailsWillHaveMessageID").': ';
diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index b97437216d6..84cc97d86d4 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -60,7 +60,7 @@ complete_substitutions_array($substitutionarrayfortest, $langs);
 
 if ($action == 'update' && empty($_POST["cancel"]))
 {
-    // Send mode parameters
+	// Send mode parameters
 	dolibarr_set_const($db, "MAIN_MAIL_SENDMODE_EMAILING", GETPOST("MAIN_MAIL_SENDMODE_EMAILING"), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_MAIL_SMTP_PORT_EMAILING", GETPOST("MAIN_MAIL_SMTP_PORT_EMAILING"), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_MAIL_SMTP_SERVER_EMAILING", GETPOST("MAIN_MAIL_SMTP_SERVER_EMAILING"), 'chaine', 0, '', $conf->entity);
@@ -226,7 +226,7 @@ if ($action == 'edit')
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
 
-	dol_fiche_head($head, 'common_emailing', '', -1);
+	print dol_get_fiche_head($head, 'common_emailing', '', -1);
 
 	print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
 	print "<br>\n";
@@ -382,22 +382,22 @@ if ($action == 'edit')
 	} else print yn(0).' ('.$langs->trans("NotSupported").')';
 	print '</td></tr>';
 
-    print '</table>';
+	print '</table>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '<br><div class="center">';
-    print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
-    print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-    print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
-    print '</div>';
+	print '<br><div class="center">';
+	print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
+	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+	print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
 
 	print '</form>';
 } else {
-    dol_fiche_head($head, 'common_emailing', '', -1);
+	print dol_get_fiche_head($head, 'common_emailing', '', -1);
 
-    print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
-    print "<br>\n";
+	print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
+	print "<br>\n";
 
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
@@ -475,13 +475,13 @@ if ($action == 'edit')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
-    if ($conf->global->MAIN_MAIL_SENDMODE_EMAILING == 'mail' && empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
-    {
-        print '<br>';
-        /*
+	if ($conf->global->MAIN_MAIL_SENDMODE_EMAILING == 'mail' && empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
+	{
+		print '<br>';
+		/*
 	    // Warning 1
     	if ($linuxlike)
     	{
@@ -491,12 +491,12 @@ if ($action == 'edit')
     			print info_admin($langs->trans("SendmailOptionNotComplete"));
     		}
     	}*/
-    	// Warning 2
-   	    print info_admin($langs->trans("SendmailOptionMayHurtBuggedMTA"));
-    }
+		// Warning 2
+   		print info_admin($langs->trans("SendmailOptionMayHurtBuggedMTA"));
+	}
 
 
-    // Buttons for actions
+	// Buttons for actions
 
 	print '<div class="tabsAction">';
 
@@ -527,8 +527,8 @@ if ($action == 'edit')
 
 	if ($conf->global->MAIN_MAIL_SENDMODE_EMAILING == 'mail' && !in_array($action, array('testconnect', 'test', 'testhtml')))
 	{
-        $text = $langs->trans("WarningPHPMail");
-	    print info_admin($text);
+		$text = $langs->trans("WarningPHPMail");
+		print info_admin($text);
 	}
 
 	// Run the test to connect
@@ -556,28 +556,28 @@ if ($action == 'edit')
 	// Show email send test form
 	if ($action == 'test' || $action == 'testhtml')
 	{
-	    print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
+		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 		print load_fiche_titre($action == 'testhtml' ? $langs->trans("DoTestSendHTML") : $langs->trans("DoTestSend"));
 
-		dol_fiche_head('');
+		print dol_get_fiche_head('');
 
 		// Cree l'objet formulaire mail
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 		$formmail = new FormMail($db);
-		$formmail->fromname = (isset($_POST['fromname']) ? $_POST['fromname'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
-		$formmail->frommail = (isset($_POST['frommail']) ? $_POST['frommail'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
+		$formmail->fromname = (GETPOSTISSET('fromname') ? GETPOST('fromname', 'restricthtml') : $conf->global->MAIN_MAIL_EMAIL_FROM);
+		$formmail->frommail = (GETPOSTISSET('frommail') ? GETPOST('frommail', 'restricthtml') : $conf->global->MAIN_MAIL_EMAIL_FROM);
 		$formmail->trackid = (($action == 'testhtml') ? "testhtml" : "test");
 		$formmail->withfromreadonly = 0;
 		$formmail->withsubstit = 0;
 		$formmail->withfrom = 1;
 		$formmail->witherrorsto = 1;
-		$formmail->withto = (!empty($_POST['sendto']) ? $_POST['sendto'] : ($user->email ? $user->email : 1));
-		$formmail->withtocc = (!empty($_POST['sendtocc']) ? $_POST['sendtocc'] : 1); // ! empty to keep field if empty
-		$formmail->withtoccc = (!empty($_POST['sendtoccc']) ? $_POST['sendtoccc'] : 1); // ! empty to keep field if empty
-		$formmail->withtopic = (isset($_POST['subject']) ? $_POST['subject'] : $langs->trans("Test"));
+		$formmail->withto = (!GETPOST('sendto') ? GETPOST('sendto', 'restricthtml') : ($user->email ? $user->email : 1));
+		$formmail->withtocc = (!GETPOST(['sendtocc']) ? GETPOST('sendtocc', 'restricthtml') : 1); // ! empty to keep field if empty
+		$formmail->withtoccc = (!GETPOST(['sendtoccc']) ? GETPOST('sendtoccc', 'restricthtml') : 1); // ! empty to keep field if empty
+		$formmail->withtopic = (GETPOSTISSET('subject') ? GETPOST('subject') : $langs->trans("Test"));
 		$formmail->withtopicreadonly = 0;
 		$formmail->withfile = 2;
-		$formmail->withbody = (isset($_POST['message']) ? $_POST['message'] : ($action == 'testhtml' ? $langs->transnoentities("PredefinedMailTestHtml") : $langs->transnoentities("PredefinedMailTest")));
+		$formmail->withbody = (GETPOSTISSET('message') ? GETPOST('message', 'restricthtml') : ($action == 'testhtml' ? $langs->transnoentities("PredefinedMailTestHtml") : $langs->transnoentities("PredefinedMailTest")));
 		$formmail->withbodyreadonly = 0;
 		$formmail->withcancel = 1;
 		$formmail->withdeliveryreceipt = 1;
@@ -592,14 +592,14 @@ if ($action == 'edit')
 		$formmail->param["returnurl"] = $_SERVER["PHP_SELF"];
 
 		// Init list of files
-        if (GETPOST("mode") == 'init')
+		if (GETPOST("mode") == 'init')
 		{
 			$formmail->clear_attached_files();
 		}
 
 		print $formmail->get_form('addfile', 'removefile');
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 	}
 }
 
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index 16ae12ffcc5..eff7cb24205 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -205,7 +205,7 @@ print load_fiche_titre($title, $linkback, $titlepicto);
 
 $head = email_admin_prepare_head();
 
-dol_fiche_head($head, 'senderprofiles', '', -1);
+print dol_get_fiche_head($head, 'senderprofiles', '', -1);
 
 print '<span class="opacitymedium">'.$langs->trans("EMailsSenderProfileDesc")."</span><br>\n";
 print "<br>\n";
@@ -381,9 +381,9 @@ if ($action != 'create') {
 		print '</table>';
 		print '<br>';
 		print '<div class="center">';
-		print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
+		print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
 		print ' &nbsp; ';
-		print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
+		print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 	}
 } else {
@@ -414,9 +414,9 @@ if ($action != 'create') {
 	print '</table>';
 	print '<br>';
 	print '<div class="center">';
-	print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
+	print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
 	print ' &nbsp; ';
-	print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 	//print '</form>';
 }
@@ -427,7 +427,7 @@ print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorde
 $topicmail = "Information";
 //$modelmail="subscription";
 $objecttmp = new EmailSenderProfile($db);
-//$trackid='sub'.$object->id;
+//$trackid = (($action == 'testhtml') ? "testhtml" : "test");
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($search_all)
@@ -474,7 +474,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
@@ -645,7 +645,7 @@ if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $n
 	print $formfile->showdocuments('massfilesarea_emailsenderprofile', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 7c79505158a..6538d5c3011 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2011-2016  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2015       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2016       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric 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
@@ -67,7 +67,6 @@ $actl[1] = img_picto($langs->trans("Activated"), 'switch_on');
 
 $listoffset = GETPOST('listoffset', 'alpha');
 $listlimit = GETPOST('listlimit', 'alpha') > 0 ?GETPOST('listlimit', 'alpha') : 1000;
-$active = 1;
 
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
@@ -140,36 +139,77 @@ if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
 
 
 $tabhelp = array();
-$tabhelp[25] = array('topic'=>$helpsubstit, 'joinfiles'=>$langs->trans('AttachMainDocByDefault'), 'content'=>$helpsubstit, 'content_lines'=>$helpsubstitforlines, 'type_template'=>$langs->trans("TemplateForElement"), 'private'=>$langs->trans("TemplateIsVisibleByOwnerOnly"), 'position'=>$langs->trans("PositionIntoComboList"));
+$tabhelp[25] = array(
+	'topic'=>$helpsubstit,
+	'joinfiles'=>$langs->trans('AttachMainDocByDefault'),
+	'content'=>$helpsubstit,
+	'content_lines'=>$helpsubstitforlines,
+	'type_template'=>$langs->trans("TemplateForElement"),
+	'private'=>$langs->trans("TemplateIsVisibleByOwnerOnly"),
+	'position'=>$langs->trans("PositionIntoComboList")
+);
 
 // List of check for fields (NOT USED YET)
 $tabfieldcheck = array();
 $tabfieldcheck[25] = array();
 
 
-// Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
 $elementList = array();
-$sourceList = array();
 
 // We save list of template email Dolibarr can manage. This list can found by a grep into code on "->param['models']"
 $elementList = array();
-if ($conf->propal->enabled && $user->rights->propal->lire)     $elementList['propal_send'] = $langs->trans('MailToSendProposal');
-if ($conf->commande->enabled && $user->rights->commande->lire) $elementList['order_send'] = $langs->trans('MailToSendOrder');
-if ($conf->facture->enabled && $user->rights->facture->lire)   $elementList['facture_send'] = $langs->trans('MailToSendInvoice');
-if ($conf->expedition->enabled)        $elementList['shipping_send'] = $langs->trans('MailToSendShipment');
-if ($conf->reception->enabled) 		   $elementList['reception_send'] = $langs->trans('MailToSendReception');
-if ($conf->ficheinter->enabled)        $elementList['fichinter_send'] = $langs->trans('MailToSendIntervention');
-if ($conf->supplier_proposal->enabled) $elementList['supplier_proposal_send'] = $langs->trans('MailToSendSupplierRequestForQuotation');
-if (($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || ($conf->supplier_order->enabled && $user->rights->supplier_order->lire))	$elementList['order_supplier_send'] = $langs->trans('MailToSendSupplierOrder');
-if (($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || ($conf->supplier_invoice->enabled && $user->rights->supplier_invoice->lire))	$elementList['invoice_supplier_send'] = $langs->trans('MailToSendSupplierInvoice');
-if ($conf->societe->enabled && $user->rights->societe->lire)           $elementList['thirdparty'] = $langs->trans('MailToThirdparty');
-if ($conf->adherent->enabled && $user->rights->adherent->lire)          $elementList['member'] = $langs->trans('MailToMember');
-if ($conf->contrat->enabled && $user->rights->contrat->lire)           $elementList['contract'] = $langs->trans('MailToSendContract');
-if ($conf->projet->enabled)            $elementList['project'] = $langs->trans('MailToProject');
-if ($conf->ticket->enabled && $user->rights->ticket->read)            $elementList['ticket_send'] = $langs->trans('MailToTicket');
-if ($conf->recruitment->enabled && $user->rights->recruitment->recruitmentjobposition->read)            $elementList['recruitmentcandidature_send'] = $langs->trans('RecruitmentCandidatures');
-if ($conf->agenda->enabled)            $elementList['actioncomm_send'] = $langs->trans('MailToSendEventPush');
-$elementList['user'] = $langs->trans('MailToUser');
+// Add all and none after the sort
+$elementList['all'] = '-- '.dol_escape_htmltag($langs->trans("All")).' --';
+$elementList['none'] = '-- '.dol_escape_htmltag($langs->trans("None")).' --';
+$elementList['user'] = img_picto('', 'user', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToUser'));
+if ($conf->adherent->enabled && $user->rights->adherent->lire) {
+	$elementList['member'] = img_picto('', 'object_member', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToMember'));
+}
+if ($conf->recruitment->enabled && $user->rights->recruitment->recruitmentjobposition->read) {
+	$elementList['recruitmentcandidature_send'] = img_picto('', 'recruitmentcandidature', 'class="paddingright"').dol_escape_htmltag($langs->trans('RecruitmentCandidatures'));
+}
+if ($conf->societe->enabled && $user->rights->societe->lire) {
+	$elementList['thirdparty'] = img_picto('', 'company', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToThirdparty'));
+}
+if ($conf->projet->enabled) {
+	$elementList['project'] = img_picto('', 'project', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToProject'));
+}
+if ($conf->propal->enabled && $user->rights->propal->lire) {
+	$elementList['propal_send'] = img_picto('', 'propal', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendProposal'));
+}
+if ($conf->commande->enabled && $user->rights->commande->lire) {
+	$elementList['order_send'] = img_picto('', 'order', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendOrder'));
+}
+if ($conf->facture->enabled && $user->rights->facture->lire) {
+	$elementList['facture_send'] = img_picto('', 'bill', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendInvoice'));
+}
+if ($conf->expedition->enabled) {
+	$elementList['shipping_send'] = img_picto('', 'dolly', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendShipment'));
+}
+if ($conf->reception->enabled) {
+	$elementList['reception_send'] = img_picto('', 'dolly', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendReception'));
+}
+if ($conf->ficheinter->enabled) {
+	$elementList['fichinter_send'] = img_picto('', 'intervention', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendIntervention'));
+}
+if ($conf->supplier_proposal->enabled) {
+	$elementList['supplier_proposal_send'] = img_picto('', 'propal', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendSupplierRequestForQuotation'));
+}
+if (($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || ($conf->supplier_order->enabled && $user->rights->supplier_order->lire)) {
+	$elementList['order_supplier_send'] = img_picto('', 'order', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendSupplierOrder'));
+}
+if (($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || ($conf->supplier_invoice->enabled && $user->rights->supplier_invoice->lire)) {
+	$elementList['invoice_supplier_send'] = img_picto('', 'bill', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendSupplierInvoice'));
+}
+if ($conf->contrat->enabled && $user->rights->contrat->lire) {
+	$elementList['contract'] = img_picto('', 'contract', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendContract'));
+}
+if ($conf->ticket->enabled && $user->rights->ticket->read) {
+	$elementList['ticket_send'] = img_picto('', 'ticket', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToTicket'));
+}
+if ($conf->agenda->enabled) {
+	$elementList['actioncomm_send'] = img_picto('', 'action', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendEventPush'));
+}
 
 $parameters = array('elementList'=>$elementList);
 $reshook = $hookmanager->executeHooks('emailElementlist', $parameters); // Note that $action and $object may have been modified by some hooks
@@ -179,11 +219,7 @@ if ($reshook == 0) {
 	}
 }
 
-// Add all and none after the sort
-$elementList['all'] = '-- '.$langs->trans("All").' -- ('.$langs->trans('VisibleEverywhere').')';
-$elementList['none'] = '-- '.$langs->trans("None").' -- ('.$langs->trans('VisibleNowhere').')';
-
-asort($elementList);
+//asort($elementList);
 
 $id = 25;
 
@@ -192,18 +228,22 @@ $id = 25;
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list';
+	$massaction = '';
+}
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+		// All tests are required to be compatible with all browsers
 		$search_label = '';
 		$search_type_template = '';
 		$search_lang = '';
@@ -214,8 +254,7 @@ if (empty($reshook))
 	}
 
 	// Actions add or modify an entry into a dictionary
-	if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
-	{
+	if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		$listfield = explode(',', str_replace(' ', '', $tabfield[$id]));
 		$listfieldinsert = explode(',', $tabfieldinsert[$id]);
 		$listfieldmodify = explode(',', $tabfieldinsert[$id]);
@@ -223,16 +262,16 @@ if (empty($reshook))
 
 		// Check that all fields are filled
 		$ok = 1;
-		foreach ($listfield as $f => $value)
-		{
+		foreach ($listfield as $f => $value) {
 			// Not mandatory fields
 			if ($value == 'joinfiles') continue;
 			if ($value == 'content') continue;
 			if ($value == 'content_lines') continue;
 
+			// Rename some POST variables into a generic name
 			if (GETPOST('actionmodify', 'alpha') && $value == 'topic') $_POST['topic'] = $_POST['topic-'.$rowid];
 
-			if ((!isset($_POST[$value]) || $_POST[$value] == '' || $_POST[$value] == '-1') && $value != 'lang' && $value != 'fk_user' && $value != 'position')
+			if ((!GETPOSTISSET($value) || GETPOST($value) == '' || GETPOST($value) == '-1') && $value != 'lang' && $value != 'fk_user' && $value != 'position')
 			{
 				$ok = 0;
 				$fieldnamekey = $listfield[$f];
@@ -268,6 +307,7 @@ if (empty($reshook))
 				if ($value == 'lang') $keycode = 'langcode';
 				if (empty($keycode)) $keycode = $value;
 
+				// Clean input variables
 				if ($value == 'entity') $_POST[$keycode] = $conf->entity;
 				if ($value == 'fk_user' && !($_POST[$keycode] > 0)) $_POST[$keycode] = '';
 				if ($value == 'private' && !is_numeric($_POST[$keycode])) $_POST[$keycode] = '0';
@@ -277,9 +317,15 @@ if (empty($reshook))
 				if ($i) $sql .= ", ";
 				if (GETPOST($keycode) == '' && $keycode != 'langcode')      $sql .= "null"; // langcode must be '' if not defined so the unique key that include lang will work
 				elseif (GETPOST($keycode) == '0' && $keycode == 'langcode') $sql .= "''"; // langcode must be '' if not defined so the unique key that include lang will work
-				elseif ($keycode == 'content') {
+				elseif ($keycode == 'fk_user') {
+					if (!$user->admin) {	// A non admin user can only edit its own template
+						$sql .= " ".((int) $user->id);
+					} else {
+						$sql .= " ".((int) GETPOST($keycode, 'int'));
+					}
+				} elseif ($keycode == 'content') {
 					$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-				} elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
+				} elseif (in_array($keycode, array('joinfiles', 'private', 'position'))) {
 					$sql .= (int) GETPOST($keycode, 'int');
 				} else {
 					$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
@@ -303,7 +349,7 @@ if (empty($reshook))
 			}
 		}
 
-		// Si verif ok et action modify, on modifie la ligne
+		// We modify the line
 		if ($ok && GETPOST('actionmodify'))
 		{
 			$rowidcol = "rowid";
@@ -318,6 +364,7 @@ if (empty($reshook))
 				if ($field == 'lang') $keycode = 'langcode';
 				if (empty($keycode)) $keycode = $field;
 
+				// Rename some POST variables into a generic name
 				if ($field == 'fk_user' && !($_POST['fk_user'] > 0)) $_POST['fk_user'] = '';
 				if ($field == 'topic') $_POST['topic'] = $_POST['topic-'.$rowid];
 				if ($field == 'joinfiles') $_POST['joinfiles'] = $_POST['joinfiles-'.$rowid];
@@ -330,9 +377,15 @@ if (empty($reshook))
 
 				if (GETPOST($keycode) == '' || ($keycode != 'langcode' && $keycode != 'position' && $keycode != 'private' && !GETPOST($keycode))) $sql .= "null"; // langcode,... must be '' if not defined so the unique key that include lang will work
 				elseif (GETPOST($keycode) == '0' && $keycode == 'langcode') $sql .= "''"; // langcode must be '' if not defined so the unique key that include lang will work
-				elseif ($keycode == 'content') {
+				elseif ($keycode == 'fk_user') {
+					if (!$user->admin) {	// A non admin user can only edit its own template
+						$sql .= " ".((int) $user->id);
+					} else {
+						$sql .= " ".((int) GETPOST($keycode, 'int'));
+					}
+				} elseif ($keycode == 'content') {
 					$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-				} elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
+				} elseif (in_array($keycode, array('joinfiles', 'private', 'position'))) {
 					$sql .= (int) GETPOST($keycode, 'int');
 				} else {
 					$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
@@ -342,6 +395,9 @@ if (empty($reshook))
 			}
 
 			$sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
+			if (!$user->admin) {	// A non admin user can only edit its own template
+				$sql .= " AND fk_user  = ".((int) $user->id);
+			}
 			//print $sql;exit;
 			dol_syslog("actionmodify", LOG_DEBUG);
 			//print $sql;
@@ -360,7 +416,9 @@ if (empty($reshook))
 		$rowidcol = "rowid";
 
 		$sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."=".((int) $rowid);
-
+		if (!$user->admin) {	// A non admin user can only edit its own template
+			$sql .= " AND fk_user  = ".((int) $user->id);
+		}
 		dol_syslog("delete", LOG_DEBUG);
 		$result = $db->query($sql);
 		if (!$result)
@@ -414,7 +472,7 @@ $formadmin = new FormAdmin($db);
 $help_url = '';
 $title = $langs->trans("EMailsSetup");
 
-llxHeader('', $title);
+llxHeader('', $title, $help_url);
 
 $linkback = '';
 $titlepicto = 'title_setup';
@@ -423,17 +481,16 @@ print load_fiche_titre($title, $linkback, $titlepicto);
 
 $head = email_admin_prepare_head();
 
-dol_fiche_head($head, 'templates', '', -1);
+print dol_get_fiche_head($head, 'templates', '', -1);
 
 // Confirmation de la suppression de la ligne
 if ($action == 'delete')
 {
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$code.'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
 }
-//var_dump($elementList);
 
 
-$sql = "SELECT rowid as rowid, label, type_template, lang, fk_user, private, position, topic, joinfiles, content_lines, content, enabled, active";
+$sql = "SELECT rowid as rowid, module, label, type_template, lang, fk_user, private, position, topic, joinfiles, content_lines, content, enabled, active";
 $sql .= " FROM ".MAIN_DB_PREFIX."c_email_templates";
 $sql .= " WHERE entity IN (".getEntity('email_template').")";
 if (!$user->admin)
@@ -458,148 +515,142 @@ $sql .= $db->plimit($listlimit + 1, $offset);
 
 $fieldlist = explode(',', $tabfield[$id]);
 
-// Form to add a new line
-print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
+if ($action == 'view') {
+	// Form to add a new line
+	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
 
-print '<div class="div-table-responsive-no-min">';
-print '<table class="noborder centpercent">';
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
 
-// Line to enter new values (title)
-print '<tr class="liste_titre">';
-foreach ($fieldlist as $field => $value)
-{
-	// Determine le nom du champ par rapport aux noms possibles
-	// dans les dictionnaires de donnees
-	$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
-	$valuetoshow = $langs->trans($valuetoshow); // try to translate
-	$align = "left";
-	if ($fieldlist[$field] == 'fk_user') { $valuetoshow = $langs->trans("Owner"); }
-	if ($fieldlist[$field] == 'lang') { $valuetoshow = (empty($conf->global->MAIN_MULTILANGS) ? '&nbsp;' : $langs->trans("Language")); }
-	if ($fieldlist[$field] == 'type') { $valuetoshow = $langs->trans("Type"); }
-	if ($fieldlist[$field] == 'code') { $valuetoshow = $langs->trans("Code"); }
-	if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') { $valuetoshow = $langs->trans("Code"); }
-	if ($fieldlist[$field] == 'type_template') { $valuetoshow = $langs->trans("TypeOfTemplate"); }
-	if ($fieldlist[$field] == 'private') { $align = 'center'; }
-	if ($fieldlist[$field] == 'position') { $align = 'center'; }
-
-	if ($fieldlist[$field] == 'topic') { $valuetoshow = ''; }
-	if ($fieldlist[$field] == 'joinfiles') { $valuetoshow = ''; }
-	if ($fieldlist[$field] == 'content') { $valuetoshow = ''; }
-	if ($fieldlist[$field] == 'content_lines') { $valuetoshow = ''; }
-
-	if ($valuetoshow != '')
+	// Line to enter new values (title)
+	print '<tr class="liste_titre">';
+	foreach ($fieldlist as $field => $value)
 	{
-		print '<td align="'.$align.'">';
-		if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
-		elseif (!empty($tabhelp[$id][$value]))
+		// Determine le nom du champ par rapport aux noms possibles
+		// dans les dictionnaires de donnees
+		$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
+		$valuetoshow = $langs->trans($valuetoshow); // try to translate
+		$align = "left";
+		if ($fieldlist[$field] == 'fk_user') { $valuetoshow = $langs->trans("Owner"); }
+		if ($fieldlist[$field] == 'lang') { $valuetoshow = (empty($conf->global->MAIN_MULTILANGS) ? '&nbsp;' : $langs->trans("Language")); }
+		if ($fieldlist[$field] == 'type') { $valuetoshow = $langs->trans("Type"); }
+		if ($fieldlist[$field] == 'code') { $valuetoshow = $langs->trans("Code"); }
+		if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') { $valuetoshow = $langs->trans("Code"); }
+		if ($fieldlist[$field] == 'type_template') { $valuetoshow = $langs->trans("TypeOfTemplate"); $align = "center"; }
+		if ($fieldlist[$field] == 'private') { $align = 'center'; }
+		if ($fieldlist[$field] == 'position') { $align = 'center'; }
+
+		if ($fieldlist[$field] == 'topic') { $valuetoshow = ''; }
+		if ($fieldlist[$field] == 'joinfiles') { $valuetoshow = ''; }
+		if ($fieldlist[$field] == 'content') { $valuetoshow = ''; }
+		if ($fieldlist[$field] == 'content_lines') { $valuetoshow = ''; }
+
+		if ($valuetoshow != '')
 		{
-			if (in_array($value, array('topic'))) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, $value); // Tooltip on click
-			else print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2); // Tooltip on hover
-		} else print $valuetoshow;
-		print '</td>';
+			print '<td class="'.$align.'">';
+			if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+			elseif (!empty($tabhelp[$id][$value]))
+			{
+				if (in_array($value, array('topic'))) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, $value); // Tooltip on click
+				else print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2); // Tooltip on hover
+			} else print $valuetoshow;
+			print '</td>';
+		}
 	}
-}
-print '<td>';
-print '<input type="hidden" name="id" value="'.$id.'">';
-print '</td>';
-print '</tr>';
+	print '<td>';
+	print '<input type="hidden" name="id" value="'.$id.'">';
+	print '</td>';
+	print '</tr>';
 
-$obj = new stdClass();
-// If data was already input, we define them in obj to populate input fields.
-if (GETPOST('actionadd'))
-{
-	foreach ($fieldlist as $key => $val) {
-		if (GETPOST($val) != '')
+	$obj = new stdClass();
+	// If data was already input, we define them in obj to populate input fields.
+	if (GETPOST('actionadd'))
+	{
+		foreach ($fieldlist as $key => $val) {
+			if (GETPOST($val) != '')
 			$obj->$val = GETPOST($val);
+		}
 	}
-}
 
-$tmpaction = 'create';
-$parameters = array(
+	$tmpaction = 'create';
+	$parameters = array(
 	'fieldlist' => $fieldlist,
 	'tabname' => $tabname[$id]
-);
-$reshook = $hookmanager->executeHooks('createEmailTemplateFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
-$error = $hookmanager->error;
-$errors = $hookmanager->errors;
+	);
+	$reshook = $hookmanager->executeHooks('createEmailTemplateFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+	$error = $hookmanager->error;
+	$errors = $hookmanager->errors;
 
 
-// Line to enter new values (input fields)
-print '<tr class="oddeven">';
+	// Line to enter new values (input fields)
+	print '<tr class="oddeven">';
 
-if (empty($reshook))
-{
-	if ($action == 'edit') {
-		fieldList($fieldlist, $obj, $tabname[$id], 'hide');
-	} else {
-		fieldList($fieldlist, $obj, $tabname[$id], 'add');
-	}
-}
-
-print '<td class="right">';
-print '</td>';
-print "</tr>";
-
-// Show fields for topic, join files and body
-$fieldsforcontent = array('topic', 'joinfiles', 'content');
-if (!empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) { $fieldsforcontent = array('topic', 'joinfiles', 'content', 'content_lines'); }
-foreach ($fieldsforcontent as $tmpfieldlist)
-{
-	print '<tr class="impair nodrag nodrop nohover"><td colspan="6" class="nobottom">';
-
-	// Label
-	if ($tmpfieldlist == 'topic')
+	if (empty($reshook))
 	{
-		print '<strong>'.$form->textwithpicto($langs->trans("Topic"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong> ';
+		if ($action == 'edit') {
+			fieldList($fieldlist, $obj, $tabname[$id], 'hide');
+		} else {
+			fieldList($fieldlist, $obj, $tabname[$id], 'add');
+		}
 	}
-	if ($tmpfieldlist == 'joinfiles')
+
+	print '<td class="right">';
+	print '</td>';
+	print "</tr>";
+
+	// Show fields for topic, join files and body
+	$fieldsforcontent = array('topic', 'joinfiles', 'content');
+	if (!empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) { $fieldsforcontent = array('topic', 'joinfiles', 'content', 'content_lines'); }
+	foreach ($fieldsforcontent as $tmpfieldlist)
 	{
-		print '<strong>'.$form->textwithpicto($langs->trans("FilesAttachedToEmail"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong> ';
-	}
-	if ($tmpfieldlist == 'content')
+		print '<tr class="impair nodrag nodrop nohover"><td colspan="6" class="nobottom">';
+
+		// Label
+		if ($tmpfieldlist == 'topic')
+		{
+			print '<strong>'.$form->textwithpicto($langs->trans("Topic"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong> ';
+		}
+		if ($tmpfieldlist == 'joinfiles')
+		{
+			print '<strong>'.$form->textwithpicto($langs->trans("FilesAttachedToEmail"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong> ';
+		}
+		if ($tmpfieldlist == 'content')
 		print $form->textwithpicto($langs->trans("Content"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'<br>';
-	if ($tmpfieldlist == 'content_lines')
+		if ($tmpfieldlist == 'content_lines')
 		print $form->textwithpicto($langs->trans("ContentForLines"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'<br>';
 
-	// Input field
-	if ($tmpfieldlist == 'topic') {
-		print '<input type="text" class="flat minwidth500" name="'.$tmpfieldlist.'" value="'.(!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '').'">';
-	} elseif ($tmpfieldlist == 'joinfiles') {
-		print '<input type="text" class="flat maxwidth50" name="'.$tmpfieldlist.'" value="'.(isset($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '1').'">';
-	} else {
-		if ($context != 'hide') {
+		// Input field
+		if ($tmpfieldlist == 'topic') {
+			print '<input type="text" class="flat minwidth500" name="'.$tmpfieldlist.'" value="'.(!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '').'">';
+		} elseif ($tmpfieldlist == 'joinfiles') {
+			print '<input type="text" class="flat maxwidth50" name="'.$tmpfieldlist.'" value="'.(isset($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '1').'">';
+		} else {
 			// print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
 			$okforextended = true;
 			if (empty($conf->global->FCKEDITOR_ENABLE_MAIL))
-				$okforextended = false;
-			$doleditor = new DolEditor($tmpfieldlist, (!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 120, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_4, '90%');
+			$okforextended = false;
+			$doleditor = new DolEditor($tmpfieldlist, (!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 180, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_4, '90%');
 			print $doleditor->Create(1);
-		} else print '&nbsp;';
-	}
-	print '</td>';
-	if ($tmpfieldlist == 'topic') {
-		print '<td class="center" rowspan="'.(count($fieldsforcontent)).'">';
-		if ($action != 'edit') {
-			print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
 		}
 		print '</td>';
+		if ($tmpfieldlist == 'topic') {
+			print '<td class="center" rowspan="'.(count($fieldsforcontent)).'">';
+			if ($action != 'edit') {
+				print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
+			}
+			print '</td>';
+		}
+		// else print '<td></td>';
+		print '</tr>';
 	}
-	// else print '<td></td>';
-	print '</tr>';
-}
-
-
-
-$colspan = count($fieldlist) + 1;
-//print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';	// Keep &nbsp; to have a line with enough height
-
-print '</table>';
-print '</div>';
-print '</form>';
-print '<br>';
 
+	print '</table>';
+	print '</div>';
+	print '</form>';
+	print '<br>';
+} // END IF not edit
 
 print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -640,26 +691,24 @@ if ($resql)
 	// Title line with search boxes
 	print '<tr class="liste_titre">';
 
-	$filterfound = 0;
 	foreach ($fieldlist as $field => $value)
 	{
 		if ($value == 'label') {
-			print '<td class="liste_titre"><input type="text" name="search_label" class="maxwidth100" value="'.dol_escape_htmltag($search_label).'"></td>';
+			print '<td class="liste_titre"><input type="text" name="search_label" class="maxwidth200" value="'.dol_escape_htmltag($search_label).'"></td>';
 		} elseif ($value == 'lang') {
 			print '<td class="liste_titre">';
-			print $formadmin->select_language($search_lang, 'search_lang', 0, null, 1, 0, 0, 'maxwidth100');
+			print $formadmin->select_language($search_lang, 'search_lang', 0, null, 1, 0, 0, 'maxwidth150');
 			print '</td>';
 		} elseif ($value == 'fk_user') {
 			print '<td class="liste_titre">';
-			$restrictid = array();
-			if (!$user->admin) $restrictid = array($user->id);
-			//var_dump($restrictid);
-			print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, 'hierarchyme', null, 0, 0, 1, '', 0, '', 'maxwidth100');
+			print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, ($user->admin ? '' : 'hierarchyme'), null, 0, 0, 1, '', 0, '', 'maxwidth150');
 			print '</td>';
 		} elseif ($value == 'topic') {
 			print '<td class="liste_titre"><input type="text" name="search_topic" value="'.dol_escape_htmltag($search_topic).'"></td>';
 		} elseif ($value == 'type_template') {
-			print '<td class="liste_titre">'.$form->selectarray('search_type_template', $elementList, $search_type_template, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100 maxwidth100onsmartphone').'</td>';
+			print '<td class="liste_titre center">';
+			print $form->selectarray('search_type_template', $elementList, $search_type_template, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth200', 1, '', 0, 1);
+			print '</td>';
 		} elseif (!in_array($value, array('content', 'content_lines'))) {
 			print '<td class="liste_titre"></td>';
 		}
@@ -745,7 +794,7 @@ if ($resql)
 				print '<input type="hidden" name="rowid" value="'.$rowid.'">';
 				print '<input type="submit" class="button buttongen" name="actionmodify" value="'.$langs->trans("Modify").'">';
 				print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
-				print '<input type="submit" class="button buttongen" name="actioncancel" value="'.$langs->trans("Cancel").'">';
+				print '<input type="submit" class="button buttongen button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'">';
 				print '</td>';
 
 				$fieldsforcontent = array('topic', 'joinfiles', 'content');
@@ -780,7 +829,7 @@ if ($resql)
 							print $form->textwithpicto($langs->trans("Content"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'<br>';
 							$okforextended = true;
 							if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $okforextended = false;
-							$doleditor = new DolEditor($tmpfieldlist.'-'.$rowid, (!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_6, '90%');
+							$doleditor = new DolEditor($tmpfieldlist.'-'.$rowid, (!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 500, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_6, '90%');
 							print $doleditor->Create(1);
 						}
 						print '</td>';
@@ -791,6 +840,13 @@ if ($resql)
 
 				print "</tr>\n";
 			} else {
+				if ($obj->module) {
+					$tempmodulekey = $obj->module;
+					if (empty($conf->$tempmodulekey) || empty($conf->$tempmodulekey->enabled)) {
+						$i++;
+						continue;
+					}
+				}
 				$keyforobj = 'type_template';
 				if (!in_array($obj->$keyforobj, array_keys($elementList)))
 				{
@@ -818,22 +874,26 @@ if ($resql)
 					{
 						if (in_array($fieldlist[$field], array('content', 'content_lines'))) continue;
 						$showfield = 1;
-						$align = "left";
+						$align = "";
+						$class = "tddict";
 						$valuetoshow = $obj->{$fieldlist[$field]};
-						if ($value == 'label' || $value == 'topic')
-						{
+						if ($value == 'label' || $value == 'topic') {
 							$valuetoshow = dol_escape_htmltag($valuetoshow);
 						}
-						if ($value == 'type_template')
-						{
-							$valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
+						if ($value == 'label') {
+							$class .= ' tdoverflowmax100';
 						}
-						if ($value == 'lang' && $valuetoshow)
-						{
+						/*if ($value == 'topic') {
+							$class .= ' tdoverflowmax300';
+						}*/
+						if ($value == 'type_template') {
+							$valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
+							$align = "center";
+						}
+						if ($value == 'lang' && $valuetoshow) {
 							$valuetoshow = $valuetoshow.' - '.$langs->trans("Language_".$valuetoshow);
 						}
-						if ($value == 'fk_user')
-						{
+						if ($value == 'fk_user') {
 							if ($valuetoshow > 0)
 							{
 								$fuser = new User($db);
@@ -841,29 +901,25 @@ if ($resql)
 								$valuetoshow = $fuser->getNomUrl(1);
 							}
 						}
-						if ($value == 'private')
-						{
+						if ($value == 'private') {
 							$align = "center";
 							if ($valuetoshow) $valuetoshow = yn($valuetoshow);
 							else $valuetoshow = '';
 						}
-						if ($value == 'position')
-						{
+						if ($value == 'position') {
 							$align = "center";
 						}
-						if ($value == 'joinfiles')
-						{
+						if ($value == 'joinfiles') {
 							$align = "center";
 							if ($valuetoshow) $valuetoshow = 1;
 							else $valuetoshow = '';
 						}
+						if ($align) $class .= ' '.$align;
 
-						$class = 'tddict';
 						// Show value for field
-						if ($showfield)
-						{
+						if ($showfield) {
 						   	print '<!-- '.$fieldlist[$field].' -->';
-						   	print '<td align="'.$align.'" class="'.$class.'">'.$valuetoshow.'</td>';
+						   	print '<td class="'.$class.'">'.$valuetoshow.'</td>';
 						}
 					}
 				}
@@ -942,7 +998,7 @@ print '</div>';
 print '</form>';
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
@@ -962,7 +1018,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 {
 	global $conf, $langs, $user, $db;
 	global $form;
-	global $elementList, $sourceList;
+	global $elementList;
 
 	$formadmin = new FormAdmin($db);
 
@@ -971,9 +1027,8 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 		if ($fieldlist[$field] == 'fk_user')
 		{
 			print '<td>';
-			if ($user->admin)
-			{
-				print $form->select_dolusers($obj->{$fieldlist[$field]}, 'fk_user', 1, null, 0, '', null, 0, 0, 1, '', 0, '', 'maxwidth200');
+			if ($user->admin) {
+				print $form->select_dolusers($obj->{$fieldlist[$field]}, 'fk_user', 1, null, 0, ($user->admin ? '' : 'hierarchyme'), null, 0, 0, 1, '', 0, '', 'maxwidth200');
 			} else {
 				if ($context == 'add')	// I am not admin and we show the add form
 				{
@@ -1016,14 +1071,14 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 		// Le type de template
 		elseif ($fieldlist[$field] == 'type_template')
 		{
-			print '<td>';
+			print '<td class="center">';
 			if ($context == 'edit' && !empty($obj->{$fieldlist[$field]}) && !in_array($obj->{$fieldlist[$field]}, array_keys($elementList)))
 			{
-				// Current tempalte type is an unknown type, so we must keep it as it is.
+				// Current template type is an unknown type, so we must keep it as it is.
 				print '<input type="hidden" name="type_template" value="'.$obj->{$fieldlist[$field]}.'">';
 				print $obj->{$fieldlist[$field]};
 			} else {
-				print $form->selectarray('type_template', $elementList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth150 maxwidth100onsmartphone');
+				print $form->selectarray('type_template', $elementList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth200', 1, '', 0, 1);
 			}
 			print '</td>';
 		} elseif ($context == 'add' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) continue;
@@ -1032,7 +1087,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 		else {
 			$size = ''; $class = ''; $classtd = '';
 			if ($fieldlist[$field] == 'code') $class = 'maxwidth100';
-			if ($fieldlist[$field] == 'label') $class = 'maxwidth100';
+			if ($fieldlist[$field] == 'label') $class = 'maxwidth200';
 			if ($fieldlist[$field] == 'private') { $class = 'maxwidth50'; $classtd = 'center'; }
 			if ($fieldlist[$field] == 'position') { $class = 'maxwidth50'; $classtd = 'center'; }
 			if ($fieldlist[$field] == 'libelle') $class = 'quatrevingtpercent';
diff --git a/htdocs/admin/mails_ticket.php b/htdocs/admin/mails_ticket.php
index 39e159535ba..1e1c3db3fad 100644
--- a/htdocs/admin/mails_ticket.php
+++ b/htdocs/admin/mails_ticket.php
@@ -60,7 +60,7 @@ complete_substitutions_array($substitutionarrayfortest, $langs);
 
 if ($action == 'update' && empty($_POST["cancel"]))
 {
-    // Send mode parameters
+	// Send mode parameters
 	dolibarr_set_const($db, "MAIN_MAIL_SENDMODE_TICKET", GETPOST("MAIN_MAIL_SENDMODE_TICKET"), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_MAIL_SMTP_PORT_TICKET", GETPOST("MAIN_MAIL_SMTP_PORT_TICKET"), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_MAIL_SMTP_SERVER_TICKET", GETPOST("MAIN_MAIL_SMTP_SERVER_TICKET"), 'chaine', 0, '', $conf->entity);
@@ -215,7 +215,7 @@ if ($action == 'edit')
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
 
-	dol_fiche_head($head, 'common_ticket', '', -1);
+	print dol_get_fiche_head($head, 'common_ticket', '', -1);
 
 	print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
 	print "<br>\n";
@@ -359,22 +359,22 @@ if ($action == 'edit')
 	} else print yn(0).' ('.$langs->trans("NotSupported").')';
 	print '</td></tr>';
 
-    print '</table>';
+	print '</table>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '<br><div class="center">';
-    print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
-    print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-    print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
-    print '</div>';
+	print '<br><div class="center">';
+	print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
+	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+	print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
 
 	print '</form>';
 } else {
-    dol_fiche_head($head, 'common_ticket', '', -1);
+	print dol_get_fiche_head($head, 'common_ticket', '', -1);
 
-    print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
-    print "<br>\n";
+	print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
+	print "<br>\n";
 
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
@@ -441,13 +441,13 @@ if ($action == 'edit')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
-    if ($conf->global->MAIN_MAIL_SENDMODE_TICKET == 'mail' && empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
-    {
-        print '<br>';
-        /*
+	if ($conf->global->MAIN_MAIL_SENDMODE_TICKET == 'mail' && empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
+	{
+		print '<br>';
+		/*
 	    // Warning 1
     	if ($linuxlike)
     	{
@@ -457,12 +457,12 @@ if ($action == 'edit')
     			print info_admin($langs->trans("SendmailOptionNotComplete"));
     		}
     	}*/
-    	// Warning 2
-   	    print info_admin($langs->trans("SendmailOptionMayHurtBuggedMTA"));
-    }
+		// Warning 2
+   		print info_admin($langs->trans("SendmailOptionMayHurtBuggedMTA"));
+	}
 
 
-    // Buttons for actions
+	// Buttons for actions
 
 	print '<div class="tabsAction">';
 
@@ -493,8 +493,8 @@ if ($action == 'edit')
 
 	if ($conf->global->MAIN_MAIL_SENDMODE_TICKET == 'mail' && !in_array($action, array('testconnect', 'test', 'testhtml')))
 	{
-        $text = $langs->trans("WarningPHPMail");
-	    print info_admin($text);
+		$text = $langs->trans("WarningPHPMail");
+		print info_admin($text);
 	}
 
 	// Run the test to connect
@@ -522,28 +522,28 @@ if ($action == 'edit')
 	// Show email send test form
 	if ($action == 'test' || $action == 'testhtml')
 	{
-	    print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
+		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 		print load_fiche_titre($action == 'testhtml' ? $langs->trans("DoTestSendHTML") : $langs->trans("DoTestSend"));
 
-		dol_fiche_head('');
+		print dol_get_fiche_head('');
 
 		// Cree l'objet formulaire mail
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 		$formmail = new FormMail($db);
-		$formmail->fromname = (isset($_POST['fromname']) ? $_POST['fromname'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
-		$formmail->frommail = (isset($_POST['frommail']) ? $_POST['frommail'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
+		$formmail->fromname = (GETPOSTISSET('fromname') ? $_POST['fromname'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
+		$formmail->frommail = (GETPOSTISSET('frommail') ? $_POST['frommail'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
 		$formmail->trackid = (($action == 'testhtml') ? "testhtml" : "test");
 		$formmail->withfromreadonly = 0;
 		$formmail->withsubstit = 0;
 		$formmail->withfrom = 1;
 		$formmail->witherrorsto = 1;
-		$formmail->withto = (!empty($_POST['sendto']) ? $_POST['sendto'] : ($user->email ? $user->email : 1));
-		$formmail->withtocc = (!empty($_POST['sendtocc']) ? $_POST['sendtocc'] : 1); // ! empty to keep field if empty
-		$formmail->withtoccc = (!empty($_POST['sendtoccc']) ? $_POST['sendtoccc'] : 1); // ! empty to keep field if empty
-		$formmail->withtopic = (isset($_POST['subject']) ? $_POST['subject'] : $langs->trans("Test"));
+		$formmail->withto = (!empty($_POST['sendto']) ? GETPOST('sendto', 'restricthtml') : ($user->email ? $user->email : 1));
+		$formmail->withtocc = (!empty($_POST['sendtocc']) ? GETPOST('sendtocc', 'restricthtml') : 1); // ! empty to keep field if empty
+		$formmail->withtoccc = (!empty($_POST['sendtoccc']) ? GETPOST('sendtoccc', 'restricthtml') : 1); // ! empty to keep field if empty
+		$formmail->withtopic = (GETPOSTISSET('subject') ? GETPOST('subject') : $langs->trans("Test"));
 		$formmail->withtopicreadonly = 0;
 		$formmail->withfile = 2;
-		$formmail->withbody = (isset($_POST['message']) ? $_POST['message'] : ($action == 'testhtml' ? $langs->transnoentities("PredefinedMailTestHtml") : $langs->transnoentities("PredefinedMailTest")));
+		$formmail->withbody = (GETPOSTISSET('message') ? GETPOST('message', 'restricthtml') : ($action == 'testhtml' ? $langs->transnoentities("PredefinedMailTestHtml") : $langs->transnoentities("PredefinedMailTest")));
 		$formmail->withbodyreadonly = 0;
 		$formmail->withcancel = 1;
 		$formmail->withdeliveryreceipt = 1;
@@ -558,14 +558,14 @@ if ($action == 'edit')
 		$formmail->param["returnurl"] = $_SERVER["PHP_SELF"];
 
 		// Init list of files
-        if (GETPOST("mode") == 'init')
+		if (GETPOST("mode") == 'init')
 		{
 			$formmail->clear_attached_files();
 		}
 
 		print $formmail->get_form('addfile', 'removefile');
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 	}
 }
 
diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index ff15bbdcd40..6fce2f01294 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -141,17 +141,11 @@ $head[$h][1] = $langs->trans("MenuAdmin");
 $head[$h][2] = 'editor';
 $h++;
 
-$head[$h][0] = DOL_URL_ROOT."/admin/menus/other.php";
-$head[$h][1] = $langs->trans("Miscellaneous");
-$head[$h][2] = 'misc';
-$h++;
-
-
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="update">';
 
-dol_fiche_head($head, 'handler', '', -1);
+print dol_get_fiche_head($head, 'handler', '', -1);
 
 print '<span class="opacitymedium">'.$langs->trans("MenusDesc")."</span><br>\n";
 print "<br>\n";
@@ -206,10 +200,10 @@ print '</tr>';
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center">';
-print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
+print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
 print '</div>';
 
 print '</form>';
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index 31e0f896633..f182fb39cbd 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -34,13 +34,14 @@ $langs->loadLangs(array("other", "admin"));
 $cancel = GETPOST('cancel', 'alphanohtml'); // We click on a Cancel button
 $confirm = GETPOST('confirm');
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 $dirstandard = array();
 $dirsmartphone = array();
 $dirmenus = array_merge(array("/core/menus/"), (array) $conf->modules_parts['menus']);
-foreach ($dirmenus as $dirmenu)
-{
+foreach ($dirmenus as $dirmenu) {
 	$dirstandard[] = $dirmenu.'standard';
 	$dirsmartphone[] = $dirmenu.'smartphone';
 }
@@ -56,8 +57,12 @@ $menu_handler_smartphone = preg_replace('/_frontoffice.php/i', '', $menu_handler
 
 $menu_handler = $menu_handler_top;
 
-if (GETPOST("handler_origine")) $menu_handler = GETPOST("handler_origine");
-if (GETPOST("menu_handler"))    $menu_handler = GETPOST("menu_handler");
+if (GETPOST("handler_origine")) {
+	$menu_handler = GETPOST("handler_origine");
+}
+if (GETPOST("menu_handler")) {
+	$menu_handler = GETPOST("menu_handler");
+}
 
 
 
@@ -65,22 +70,16 @@ if (GETPOST("menu_handler"))    $menu_handler = GETPOST("menu_handler");
  * Actions
  */
 
-if ($action == 'update')
-{
-	if (!$cancel)
-	{
+if ($action == 'update') {
+	if (!$cancel) {
 		$leftmenu = ''; $mainmenu = '';
-		if (GETPOST('menuIdParent', 'alphanohtml') && !is_numeric(GETPOST('menuIdParent', 'alphanohtml')))
-		{
+		if (GETPOST('menuIdParent', 'alphanohtml') && !is_numeric(GETPOST('menuIdParent', 'alphanohtml'))) {
 			$tmp = explode('&', GETPOST('menuIdParent', 'alphanohtml'));
-			foreach ($tmp as $s)
-			{
-				if (preg_match('/fk_mainmenu=/', $s))
-				{
+			foreach ($tmp as $s) {
+				if (preg_match('/fk_mainmenu=/', $s)) {
 					$mainmenu = preg_replace('/fk_mainmenu=/', '', $s);
 				}
-				if (preg_match('/fk_leftmenu=/', $s))
-				{
+				if (preg_match('/fk_leftmenu=/', $s)) {
 					$leftmenu = preg_replace('/fk_leftmenu=/', '', $s);
 				}
 			}
@@ -88,31 +87,31 @@ if ($action == 'update')
 
 		$menu = new Menubase($db);
 		$result = $menu->fetch(GETPOST('menuId', 'int'));
-		if ($result > 0)
-		{
-			$menu->title = GETPOST('titre', 'alphanohtml');
-			$menu->leftmenu = GETPOST('leftmenu', 'aZ09');
-			$menu->url = GETPOST('url', 'alphanohtml');
-			$menu->langs = GETPOST('langs', 'alphanohtml');
-			$menu->position = GETPOST('position', 'int');
-			$menu->enabled = GETPOST('enabled', 'alphanohtml');
-			$menu->perms = GETPOST('perms', 'alphanohtml');
-			$menu->target = GETPOST('target', 'alphanohtml');
-			$menu->user = GETPOST('user', 'alphanohtml');
-			$menu->mainmenu = GETPOST('propertymainmenu', 'alphanohtml');
-			if (is_numeric(GETPOST('menuIdParent', 'alphanohtml')))
-			{
-				$menu->fk_menu = GETPOST('menuIdParent', 'alphanohtml');
+		if ($result > 0) {
+			$menu->title = (string) GETPOST('titre', 'alphanohtml');
+			$menu->leftmenu = (string) GETPOST('leftmenu', 'aZ09');
+			$menu->url = (string) GETPOST('url', 'alphanohtml');
+			$menu->langs = (string) GETPOST('langs', 'alphanohtml');
+			$menu->position = (int) GETPOST('position', 'int');
+			$menu->enabled = (string) GETPOST('enabled', 'alphanohtml');
+			$menu->perms = (string) GETPOST('perms', 'alphanohtml');
+			$menu->target = (string) GETPOST('target', 'alphanohtml');
+			$menu->user = (string) GETPOST('user', 'alphanohtml');
+			$menu->mainmenu = (string) GETPOST('propertymainmenu', 'alphanohtml');
+			if (is_numeric(GETPOST('menuIdParent', 'alphanohtml'))) {
+				$menu->fk_menu = (int) GETPOST('menuIdParent', 'alphanohtml');
 			} else {
-			   	if (GETPOST('type', 'alphanohtml') == 'top') $menu->fk_menu = 0;
-			   	else $menu->fk_menu = -1;
+				if (GETPOST('type', 'alphanohtml') == 'top') {
+					$menu->fk_menu = 0;
+				} else {
+					$menu->fk_menu = -1;
+				}
 				$menu->fk_mainmenu = $mainmenu;
 				$menu->fk_leftmenu = $leftmenu;
 			}
 
 			$result = $menu->update($user);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 			} else {
 				setEventMessages($menu->error, $menu->errors, 'errors');
@@ -130,26 +129,21 @@ if ($action == 'update')
 	}
 }
 
-if ($action == 'add')
-{
-	if ($cancel)
-	{
+if ($action == 'add') {
+	if ($cancel) {
 		header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".$menu_handler);
 		exit;
 	}
 
-	$leftmenu = ''; $mainmenu = '';
-	if (GETPOST('menuId', 'alphanohtml', 3) && !is_numeric(GETPOST('menuId', 'alphanohtml', 3)))
-	{
+	$leftmenu = '';
+	$mainmenu = '';
+	if (GETPOST('menuId', 'alphanohtml', 3) && !is_numeric(GETPOST('menuId', 'alphanohtml', 3))) {
 		$tmp = explode('&', GETPOST('menuId', 'alphanohtml', 3));
-		foreach ($tmp as $s)
-		{
-			if (preg_match('/fk_mainmenu=/', $s))
-			{
+		foreach ($tmp as $s) {
+			if (preg_match('/fk_mainmenu=/', $s)) {
 				$mainmenu = preg_replace('/fk_mainmenu=/', '', $s);
 			}
-			if (preg_match('/fk_leftmenu=/', $s))
-			{
+			if (preg_match('/fk_leftmenu=/', $s)) {
 				$leftmenu = preg_replace('/fk_leftmenu=/', '', $s);
 			}
 		}
@@ -158,70 +152,64 @@ if ($action == 'add')
 	$langs->load("errors");
 
 	$error = 0;
-	if (!$error && !$_POST['menu_handler'])
-	{
+	if (!$error && !$_POST['menu_handler']) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("MenuHandler")), null, 'errors');
 		$action = 'create';
 		$error++;
 	}
-	if (!$error && !$_POST['type'])
-	{
+	if (!$error && !$_POST['type']) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Type")), null, 'errors');
 		$action = 'create';
 		$error++;
 	}
-	if (!$error && !$_POST['url'])
-	{
+	if (!$error && !$_POST['url']) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("URL")), null, 'errors');
 		$action = 'create';
 		$error++;
 	}
-	if (!$error && !$_POST['titre'])
-	{
+	if (!$error && !$_POST['titre']) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Title")), null, 'errors');
 		$action = 'create';
 		$error++;
 	}
-	if (!$error && $_POST['menuId'] && $_POST['type'] == 'top')
-	{
+	if (!$error && $_POST['menuId'] && $_POST['type'] == 'top') {
 		setEventMessages($langs->trans("ErrorTopMenuMustHaveAParentWithId0"), null, 'errors');
 		$action = 'create';
 		$error++;
 	}
-	if (!$error && !$_POST['menuId'] && $_POST['type'] == 'left')
-	{
+	if (!$error && !$_POST['menuId'] && $_POST['type'] == 'left') {
 		setEventMessages($langs->trans("ErrorLeftMenuMustHaveAParentId"), null, 'errors');
 		$action = 'create';
 		$error++;
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$menu = new Menubase($db);
 		$menu->menu_handler = preg_replace('/_menu$/', '', GETPOST('menu_handler', 'aZ09'));
-		$menu->type = GETPOST('type', 'alphanohtml');
-		$menu->title = GETPOST('titre', 'alphanohtml');
-		$menu->url = GETPOST('url', 'alphanohtml');
-		$menu->langs = GETPOST('langs', 'alphanohtml');
-		$menu->position = GETPOST('position', 'int');
-		$menu->enabled = GETPOST('enabled', 'alphanohtml');
-		$menu->perms = GETPOST('perms', 'alphanohtml');
-		$menu->target = GETPOST('target', 'alphanohtml');
-		$menu->user = GETPOST('user', 'alphanohtml');
-		$menu->mainmenu = GETPOST('propertymainmenu', 'alphanohtml');
-		if (is_numeric(GETPOST('menuId', 'alphanohtml', 3)))
-		{
-			$menu->fk_menu = GETPOST('menuId', 'alphanohtml', 3);
+		$menu->type = (string) GETPOST('type', 'alphanohtml');
+		$menu->title = (string) GETPOST('titre', 'alphanohtml');
+		$menu->url = (string) GETPOST('url', 'alphanohtml');
+		$menu->langs = (string) GETPOST('langs', 'alphanohtml');
+		$menu->position = (int) GETPOST('position', 'int');
+		$menu->enabled = (string) GETPOST('enabled', 'alphanohtml');
+		$menu->perms = (string) GETPOST('perms', 'alphanohtml');
+		$menu->target = (string) GETPOST('target', 'alphanohtml');
+		$menu->user = (string) GETPOST('user', 'alphanohtml');
+		$menu->mainmenu = (string) GETPOST('propertymainmenu', 'alphanohtml');
+		if (is_numeric(GETPOST('menuId', 'alphanohtml', 3))) {
+			$menu->fk_menu = (int) GETPOST('menuId', 'alphanohtml', 3);
 		} else {
-			if (GETPOST('type', 'alphanohtml') == 'top') $menu->fk_menu = 0;
-			else $menu->fk_menu = -1;
+			if (GETPOST('type', 'alphanohtml') == 'top') {
+				$menu->fk_menu = 0;
+			} else {
+				$menu->fk_menu = -1;
+			}
 			$menu->fk_mainmenu = $mainmenu;
 			$menu->fk_leftmenu = $leftmenu;
 		}
 
 		$result = $menu->create($user);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".GETPOST('menu_handler', 'aZ09'));
 			exit;
 		} else {
@@ -232,15 +220,13 @@ if ($action == 'add')
 }
 
 // delete
-if ($action == 'confirm_delete' && $confirm == 'yes')
-{
+if ($action == 'confirm_delete' && $confirm == 'yes') {
 	$db->begin();
 
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."menu WHERE rowid = ".GETPOST('menuId', 'int');
 	$result = $db->query($sql);
 
-	if ($result == 0)
-	{
+	if ($result == 0) {
 		$db->commit();
 
 		llxHeader();
@@ -268,8 +254,7 @@ $formadmin = new FormAdmin($db);
 llxHeader('', $langs->trans("Menu"));
 
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print '<script type="text/javascript" language="javascript">
     jQuery(document).ready(function() {
     	function init_topleft()
@@ -299,20 +284,17 @@ if ($action == 'create')
 	print '<form action="./edit.php?action=add&menuId='.GETPOST('menuId', 'int').'" method="post" name="formmenucreate">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">';
 
 	// Id
 	$parent_rowid = GETPOST('menuId', 'int');
-	if (GETPOST('menuId', 'int'))
-	{
+	if (GETPOST('menuId', 'int')) {
 		$sql = "SELECT m.rowid, m.mainmenu, m.leftmenu, m.level, m.langs FROM ".MAIN_DB_PREFIX."menu as m WHERE m.rowid = ".GETPOST('menuId', 'int');
 		$res = $db->query($sql);
-		if ($res)
-		{
-			while ($menu = $db->fetch_array($res))
-			{
+		if ($res) {
+			while ($menu = $db->fetch_array($res)) {
 				$parent_rowid = $menu['rowid'];
 				$parent_mainmenu = $menu['mainmenu'];
 				$parent_leftmenu = $menu['leftmenu'];
@@ -340,8 +322,7 @@ if ($action == 'create')
 
 	// Type
 	print '<tr><td class="fieldrequired">'.$langs->trans('Type').'</td><td>';
-	if ($parent_rowid)
-	{
+	if ($parent_rowid) {
 		print $langs->trans('Left');
 		print '<input type="hidden" name="type" value="left">';
 	} else {
@@ -355,15 +336,14 @@ if ($action == 'create')
 
 	// Mainmenu code
 	print '<tr><td class="fieldrequired">'.$langs->trans('MainMenuCode').'</td>';
-   	print '<td><input type="text" class="minwidth300" id="propertymainmenu" name="propertymainmenu" value="'.(GETPOSTISSET("propertymainmenu") ? GETPOST("propertymainmenu", 'alphanohtml') : '').'"></td>';
+	print '<td><input type="text" class="minwidth300" id="propertymainmenu" name="propertymainmenu" value="'.(GETPOSTISSET("propertymainmenu") ? GETPOST("propertymainmenu", 'alphanohtml') : '').'"></td>';
 	print '<td>';
 	print $langs->trans("Example").': mytopmenukey';
 	print '</td></tr>';
 
 	// MenuId Parent
 	print '<tr><td class="fieldrequired">'.$langs->trans('MenuIdParent').'</td>';
-	if ($parent_rowid)
-	{
+	if ($parent_rowid) {
 		print '<td>'.$parent_rowid.'<input type="hidden" name="menuId" value="'.$parent_rowid.'"></td>';
 	} else {
 		print '<td><input type="text" class="minwidth300" id="menuId" name="menuId" value="'.(GETPOSTISSET("menuId") ? GETPOST("menuId", 'int') : '').'"></td>';
@@ -373,16 +353,20 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Title
-	print '<tr><td class="fieldrequired">'.$langs->trans('Title').'</td><td><input type="text" class="minwidth300" name="titre" value="'.dol_escape_htmltag(GETPOST("titre", 'alphanohtml')).'"></td><td>'.$langs->trans('DetailTitre').'</td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans('Title').'</td>';
+	print '<td><input type="text" class="minwidth300" name="titre" value="'.dol_escape_htmltag(GETPOST("titre", 'alphanohtml')).'"></td><td>'.$langs->trans('DetailTitre').'</td></tr>';
 
 	// URL
-	print '<tr><td class="fieldrequired">'.$langs->trans('URL').'</td><td><input type="text" class="minwidth500" name="url" value="'.GETPOST("url", 'alphanohtml').'"></td><td>'.$langs->trans('DetailUrl').'</td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans('URL').'</td>';
+	print '<td><input type="text" class="minwidth500" name="url" value="'.GETPOST("url", 'alphanohtml').'"></td><td>'.$langs->trans('DetailUrl').'</td></tr>';
 
 	// Langs
-	print '<tr><td>'.$langs->trans('LangFile').'</td><td><input type="text" class="minwidth300" name="langs" value="'.$parent_langs.'"></td><td>'.$langs->trans('DetailLangs').'</td></tr>';
+	print '<tr><td>'.$langs->trans('LangFile').'</td>';
+	print '<td><input type="text" class="minwidth300" name="langs" value="'.$parent_langs.'"></td><td>'.$langs->trans('DetailLangs').'</td></tr>';
 
 	// Position
-	print '<tr><td>'.$langs->trans('Position').'</td><td><input type="text" class="width100" name="position" value="'.dol_escape_htmltag(GETPOSTISSET("position") ? GETPOST("position", 'int') : 100).'"></td><td>'.$langs->trans('DetailPosition').'</td></tr>';
+	print '<tr><td>'.$langs->trans('Position').'</td>';
+	print '<td><input type="text" class="width100" name="position" value="'.dol_escape_htmltag(GETPOSTISSET("position") ? GETPOST("position", 'int') : 100).'"></td><td>'.$langs->trans('DetailPosition').'</td></tr>';
 
 	// Target
 	print '<tr><td>'.$langs->trans('Target').'</td><td><select class="flat" name="target">';
@@ -391,24 +375,25 @@ if ($action == 'create')
 	print '</select></td></td><td>'.$langs->trans('DetailTarget').'</td></tr>';
 
 	// Enabled
-	print '<tr><td>'.$langs->trans('Enabled').'</td><td><input type="text" class="minwidth500" name="enabled" value="'.(GETPOSTISSET('enabled') ? GETPOST("enabled", 'alphanohtml') : '1').'"></td><td>'.$langs->trans('DetailEnabled').'</td></tr>';
+	print '<tr><td>'.$langs->trans('Enabled').'</td>';
+	print '<td><input type="text" class="minwidth500" name="enabled" value="'.(GETPOSTISSET('enabled') ? GETPOST("enabled", 'alphanohtml') : '1').'"></td><td>'.$langs->trans('DetailEnabled').'</td></tr>';
 
 	// Perms
-	print '<tr><td>'.$langs->trans('Rights').'</td><td><input type="text" class="minwidth500" name="perms" value="'.(GETPOSTISSET('perms') ? GETPOST('perms', 'alphanohtml') : '1').'"></td><td>'.$langs->trans('DetailRight').'</td></tr>';
+	print '<tr><td>'.$langs->trans('Rights').'</td>';
+	print '<td><input type="text" class="minwidth500" name="perms" value="'.(GETPOSTISSET('perms') ? GETPOST('perms', 'alphanohtml') : '1').'"></td><td>'.$langs->trans('DetailRight').'</td></tr>';
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
-	print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+	print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
-} elseif ($action == 'edit')
-{
+} elseif ($action == 'edit') {
 	print load_fiche_titre($langs->trans("ModifMenu"), '', 'title_setup');
 	print '<br>';
 
@@ -417,7 +402,7 @@ if ($action == 'create')
 	print '<input type="hidden" name="handler_origine" value="'.$menu_handler.'">';
 	print '<input type="hidden" name="menuId" value="'.GETPOST('menuId', 'int').'">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">';
 
@@ -432,8 +417,11 @@ if ($action == 'create')
 	print '<tr><td>'.$langs->trans('MenuModule').'</td><td>'.$menu->module.'</td><td>'.$langs->trans('DetailMenuModule').'</td></tr>';
 
 	// Handler
-	if ($menu->menu_handler == 'all') $handler = $langs->trans('AllMenus');
-	else $handler = $menu->menu_handler;
+	if ($menu->menu_handler == 'all') {
+		$handler = $langs->trans('AllMenus');
+	} else {
+		$handler = $menu->menu_handler;
+	}
 	print '<tr><td class="fieldrequired">'.$langs->trans('MenuHandler').'</td><td>'.$handler.'</td><td>'.$langs->trans('DetailMenuHandler').'</td></tr>';
 
 	// User
@@ -444,18 +432,18 @@ if ($action == 'create')
 	print '</select></td><td>'.$langs->trans('DetailUser').'</td></tr>';
 
 	// Type
-	print '<tr><td class="fieldrequired">'.$langs->trans('Type').'</td><td>'.$langs->trans(ucfirst($menu->type)).'</td><td>'.$langs->trans('DetailType').'</td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans('Type').'</td>';
+	print '<td>'.$langs->trans(ucfirst($menu->type)).'</td><td>'.$langs->trans('DetailType').'</td></tr>';
 
 	// Mainmenu code
-	if ($menu->type == 'top')
-	{
+	if ($menu->type == 'top') {
 		print '<tr><td class="fieldrequired">'.$langs->trans('MainMenuCode').'</td>';
 		/*if ($parent_rowid)
-	     {
-	     print '<td>'.$parent_rowid.'<input type="hidden" name="propertyleftmenu" value="'.$parent_rowid.'"></td>';
-	     }
-	     else
-	     {*/
+		 {
+		 print '<td>'.$parent_rowid.'<input type="hidden" name="propertyleftmenu" value="'.$parent_rowid.'"></td>';
+		 }
+		 else
+		 {*/
 		print '<td><input type="text" class="minwidth300" id="propertymainmenu" name="propertymainmenu" value="'.(GETPOST("propertymainmenu", 'alphanohtml') ?GETPOST("propertymainmenu", 'alphanohtml') : $menu->mainmenu).'"></td>';
 		//}
 		print '<td>';
@@ -467,8 +455,12 @@ if ($action == 'create')
 	print '<tr><td class="fieldrequired">'.$langs->trans('MenuIdParent');
 	print '</td>';
 	$valtouse = $menu->fk_menu;
-	if ($menu->fk_mainmenu) $valtouse = 'fk_mainmenu='.$menu->fk_mainmenu;
-	if ($menu->fk_leftmenu) $valtouse .= '&fk_leftmenu='.$menu->fk_leftmenu;
+	if ($menu->fk_mainmenu) {
+		$valtouse = 'fk_mainmenu='.$menu->fk_mainmenu;
+	}
+	if ($menu->fk_leftmenu) {
+		$valtouse .= '&fk_leftmenu='.$menu->fk_leftmenu;
+	}
 	print '<td><input type="text" name="menuIdParent" value="'.$valtouse.'" class="minwidth300"></td>';
 	print '<td>'.$langs->trans('DetailMenuIdParent');
 	print ', '.$langs->trans("Example").': fk_mainmenu=abc&fk_leftmenu=def';
@@ -478,16 +470,20 @@ if ($action == 'create')
 	//print '<tr><td>'.$langs->trans('Level').'</td><td>'.$menu->level.'</td><td>'.$langs->trans('DetailLevel').'</td></tr>';
 
 	// Title
-	print '<tr><td class="fieldrequired">'.$langs->trans('Title').'</td><td><input type="text" class="minwidth300" name="titre" value="'.dol_escape_htmltag($menu->title).'"></td><td>'.$langs->trans('DetailTitre').'</td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans('Title').'</td>';
+	print '<td><input type="text" class="minwidth300" name="titre" value="'.dol_escape_htmltag($menu->title).'"></td><td>'.$langs->trans('DetailTitre').'</td></tr>';
 
 	// Url
-	print '<tr><td class="fieldrequired">'.$langs->trans('URL').'</td><td><input type="text" class="quatrevingtpercent" name="url" value="'.$menu->url.'"></td><td>'.$langs->trans('DetailUrl').'</td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans('URL').'</td>';
+	print '<td><input type="text" class="quatrevingtpercent" name="url" value="'.$menu->url.'"></td><td>'.$langs->trans('DetailUrl').'</td></tr>';
 
 	// Langs
-	print '<tr><td>'.$langs->trans('LangFile').'</td><td><input type="text" class="minwidth300" name="langs" value="'.dol_escape_htmltag($menu->langs).'"></td><td>'.$langs->trans('DetailLangs').'</td></tr>';
+	print '<tr><td>'.$langs->trans('LangFile').'</td>';
+	print '<td><input type="text" class="minwidth300" name="langs" value="'.dol_escape_htmltag($menu->langs).'"></td><td>'.$langs->trans('DetailLangs').'</td></tr>';
 
 	// Position
-	print '<tr><td>'.$langs->trans('Position').'</td><td><input type="text" class="minwidth100" name="position" value="'.$menu->position.'"></td><td>'.$langs->trans('DetailPosition').'</td></tr>';
+	print '<tr><td>'.$langs->trans('Position').'</td>';
+	print '<td><input type="text" class="minwidth100" name="position" value="'.$menu->position.'"></td><td>'.$langs->trans('DetailPosition').'</td></tr>';
 
 	// Target
 	print '<tr><td>'.$langs->trans('Target').'</td><td><select class="flat" name="target">';
@@ -496,24 +492,30 @@ if ($action == 'create')
 	print '</select></td><td>'.$langs->trans('DetailTarget').'</td></tr>';
 
 	// Enabled
-	print '<tr><td>'.$langs->trans('Enabled').'</td><td><input type="text" class="minwidth500" name="enabled" value="'.dol_escape_htmltag($menu->enabled).'"></td><td>'.$langs->trans('DetailEnabled');
-	if (!empty($menu->enabled)) print ' ('.$langs->trans("ConditionIsCurrently").': '.yn(dol_eval($menu->enabled, 1)).')';
+	print '<tr><td>'.$langs->trans('Enabled').'</td>';
+	print '<td><input type="text" class="minwidth500" name="enabled" value="'.dol_escape_htmltag($menu->enabled).'"></td><td>'.$langs->trans('DetailEnabled');
+	if (!empty($menu->enabled)) {
+		print ' ('.$langs->trans("ConditionIsCurrently").': '.yn(dol_eval($menu->enabled, 1)).')';
+	}
 	print '</td></tr>';
 
 	// Perms
-	print '<tr><td>'.$langs->trans('Rights').'</td><td><input type="text" class="minwidth500" name="perms" value="'.dol_escape_htmltag($menu->perms).'"></td><td>'.$langs->trans('DetailRight');
-	if (!empty($menu->perms)) print ' ('.$langs->trans("ConditionIsCurrently").': '.yn(dol_eval($menu->perms, 1)).')';
+	print '<tr><td>'.$langs->trans('Rights').'</td>';
+	print '<td><input type="text" class="minwidth500" name="perms" value="'.dol_escape_htmltag($menu->perms).'"></td><td>'.$langs->trans('DetailRight');
+	if (!empty($menu->perms)) {
+		print ' ('.$langs->trans("ConditionIsCurrently").': '.yn(dol_eval($menu->perms, 1)).')';
+	}
 	print '</td></tr>';
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	// Bouton
 	print '<div class="center">';
-	print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+	print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index b7b0060c778..a1ebb21838b 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -38,8 +38,8 @@ $dirsmartphone = array();
 $dirmenus = array_merge(array("/core/menus/"), (array) $conf->modules_parts['menus']);
 foreach ($dirmenus as $dirmenu)
 {
-    $dirstandard[] = $dirmenu.'standard';
-    $dirsmartphone[] = $dirmenu.'smartphone';
+	$dirstandard[] = $dirmenu.'standard';
+	$dirsmartphone[] = $dirmenu.'smartphone';
 }
 
 $action = GETPOST('action', 'aZ09');
@@ -224,12 +224,7 @@ $head[$h][1] = $langs->trans("MenuAdmin");
 $head[$h][2] = 'editor';
 $h++;
 
-$head[$h][0] = DOL_URL_ROOT."/admin/menus/other.php";
-$head[$h][1] = $langs->trans("Miscellaneous");
-$head[$h][2] = 'misc';
-$h++;
-
-dol_fiche_head($head, 'editor', '', -1);
+print dol_get_fiche_head($head, 'editor', '', -1);
 
 print '<span class="opacitymedium">'.$langs->trans("MenusEditorDesc")."</span><br>\n";
 print "<br>\n";
@@ -244,13 +239,13 @@ if ($action == 'delete')
 	$result = $db->query($sql);
 	$obj = $db->fetch_object($result);
 
-    print $form->formconfirm("index.php?menu_handler=".$menu_handler."&menuId=".GETPOST('menuId', 'int'), $langs->trans("DeleteMenu"), $langs->trans("ConfirmDeleteMenu", $obj->title), "confirm_delete");
+	print $form->formconfirm("index.php?menu_handler=".$menu_handler."&menuId=".GETPOST('menuId', 'int'), $langs->trans("DeleteMenu"), $langs->trans("ConfirmDeleteMenu", $obj->title), "confirm_delete");
 }
 
 $newcardbutton = '';
 if ($user->admin)
 {
-    $newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/admin/menus/edit.php?menuId=0&action=create&menu_handler='.urlencode($menu_handler).'&backtopage='.urlencode($_SERVER['PHP_SELF']));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/admin/menus/edit.php?menuId=0&action=create&menu_handler='.urlencode($menu_handler).'&backtopage='.urlencode($_SERVER['PHP_SELF']));
 }
 
 print '<form name="newmenu" class="nocellnopadd" action="'.$_SERVER["PHP_SELF"].'">';
@@ -297,7 +292,7 @@ if ($conf->use_javascript_ajax)
 
 	//il faut d'abord declarer un element racine de l'arbre
 
-    $data[] = array('rowid'=>0, 'fk_menu'=>-1, 'title'=>"racine", 'mainmenu'=>'', 'leftmenu'=>'', 'fk_mainmenu'=>'', 'fk_leftmenu'=>'');
+	$data[] = array('rowid'=>0, 'fk_menu'=>-1, 'title'=>"racine", 'mainmenu'=>'', 'leftmenu'=>'', 'fk_mainmenu'=>'', 'fk_leftmenu'=>'');
 
 	//puis tous les elements enfants
 
@@ -330,23 +325,23 @@ if ($conf->use_javascript_ajax)
 			$entry .= '</td></tr></table>';
 
 			$buttons = '<a class="editfielda marginleftonly marginrightonly" href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_edit('default', 0, 'class="menuEdit" id="edit'.$menu['rowid'].'"').'</a> ';
-			$buttons .=	'<a class="marginleftonly marginrightonly" href="edit.php?menu_handler='.$menu_handler_to_search.'&action=create&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_edit_add('default').'</a> ';
-			$buttons .=	'<a class="marginleftonly marginrightonly" href="index.php?menu_handler='.$menu_handler_to_search.'&action=delete&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_delete('default').'</a> ';
-			$buttons .=	'&nbsp; &nbsp; &nbsp;';
-			$buttons .=	'<a class="marginleftonly marginrightonly" href="index.php?menu_handler='.$menu_handler_to_search.'&action=up&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_picto("Up", "1uparrow").'</a><a href="index.php?menu_handler='.$menu_handler_to_search.'&action=down&menuId='.$menu['rowid'].'">'.img_picto("Down", "1downarrow").'</a>';
+			$buttons .= '<a class="marginleftonly marginrightonly" href="edit.php?menu_handler='.$menu_handler_to_search.'&action=create&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_edit_add('default').'</a> ';
+			$buttons .= '<a class="marginleftonly marginrightonly" href="index.php?menu_handler='.$menu_handler_to_search.'&action=delete&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_delete('default').'</a> ';
+			$buttons .= '&nbsp; &nbsp; &nbsp;';
+			$buttons .= '<a class="marginleftonly marginrightonly" href="index.php?menu_handler='.$menu_handler_to_search.'&action=up&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_picto("Up", "1uparrow").'</a><a href="index.php?menu_handler='.$menu_handler_to_search.'&action=down&menuId='.$menu['rowid'].'">'.img_picto("Down", "1downarrow").'</a>';
 
 			$data[] = array(
 				'rowid'=>$menu['rowid'],
-			    'module'=>$menu['module'],
+				'module'=>$menu['module'],
 				'fk_menu'=>$menu['fk_menu'],
 				'title'=>$titre,
-			    'mainmenu'=>$menu['mainmenu'],
+				'mainmenu'=>$menu['mainmenu'],
 				'leftmenu'=>$menu['leftmenu'],
 				'fk_mainmenu'=>$menu['fk_mainmenu'],
 				'fk_leftmenu'=>$menu['fk_leftmenu'],
-			    'position'=>$menu['position'],
+				'position'=>$menu['position'],
 				'entry'=>$entry,
-			    'buttons'=>$buttons
+				'buttons'=>$buttons
 			);
 			$i++;
 		}
@@ -369,36 +364,36 @@ if ($conf->use_javascript_ajax)
 
 
 	// Process remaining records (records that are not linked to root by any path)
-    $remainingdata = array();
+	$remainingdata = array();
 	foreach ($data as $datar)
 	{
-	    if (empty($datar['rowid']) || $tree_recur_alreadyadded[$datar['rowid']]) continue;
-	    $remainingdata[] = $datar;
+		if (empty($datar['rowid']) || $tree_recur_alreadyadded[$datar['rowid']]) continue;
+		$remainingdata[] = $datar;
 	}
 
 	if (count($remainingdata))
 	{
-    	print '<table class="noborder centpercent">';
+		print '<table class="noborder centpercent">';
 
-    	print '<tr class="liste_titre">';
-    	print '<td>'.$langs->trans("NotTopTreeMenuPersonalized").'</td>';
-    	print '<td class="right"></td>';
-    	print '</tr>';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("NotTopTreeMenuPersonalized").'</td>';
+		print '<td class="right"></td>';
+		print '</tr>';
 
-    	print '<tr>';
-    	print '<td colspan="2">';
-    	foreach ($remainingdata as $datar)
-    	{
-            $father = array('rowid'=>$datar['rowid'], 'title'=>"???", 'mainmenu'=>$datar['fk_mainmenu'], 'leftmenu'=>$datar['fk_leftmenu'], 'fk_mainmenu'=>'', 'fk_leftmenu'=>'');
-    	    //print 'Start with rowid='.$datar['rowid'].' mainmenu='.$father ['mainmenu'].' leftmenu='.$father ['leftmenu'].'<br>'."\n";
-    	    tree_recur($data, $father, 0, 'iddivjstree'.$datar['rowid'], 1, 1);
-    	}
+		print '<tr>';
+		print '<td colspan="2">';
+		foreach ($remainingdata as $datar)
+		{
+			$father = array('rowid'=>$datar['rowid'], 'title'=>"???", 'mainmenu'=>$datar['fk_mainmenu'], 'leftmenu'=>$datar['fk_leftmenu'], 'fk_mainmenu'=>'', 'fk_leftmenu'=>'');
+			//print 'Start with rowid='.$datar['rowid'].' mainmenu='.$father ['mainmenu'].' leftmenu='.$father ['leftmenu'].'<br>'."\n";
+			tree_recur($data, $father, 0, 'iddivjstree'.$datar['rowid'], 1, 1);
+		}
 
-    	print '</td>';
+		print '</td>';
 
-    	print '</tr>';
+		print '</tr>';
 
-    	print '</table>';
+		print '</table>';
 	}
 
 	print '</div>';
diff --git a/htdocs/admin/menus/other.php b/htdocs/admin/menus/other.php
deleted file mode 100644
index cd8c7cccfa6..00000000000
--- a/htdocs/admin/menus/other.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/* Copyright (C) 2010-2012 Regis Houssin  <regis.houssin@inodbox.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *	    \file       htdocs/admin/menus/other.php
- *      \ingroup    core
- *      \brief      Menus options setup
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array("user", "other", "admin"));
-
-if (!$user->admin) accessforbidden();
-
-$action = GETPOST('action', 'aZ09');
-
-
-/*
- * Actions
- */
-
-if ($action == 'activate_hidemenu')
-{
-	dolibarr_set_const($db, "MAIN_MENU_HIDE_UNAUTHORIZED", '1', 'chaine', 0, '', $conf->entity);
-	header("Location: ".$_SERVER["PHP_SELF"]);
-	exit;
-} elseif ($action == 'disable_hidemenu')
-{
-	dolibarr_del_const($db, "MAIN_MENU_HIDE_UNAUTHORIZED", $conf->entity);
-	header("Location: ".$_SERVER["PHP_SELF"]);
-	exit;
-}
-
-
-/*
- * View
- */
-
-llxHeader('', $langs->trans("Setup"));
-
-print load_fiche_titre($langs->trans("Menus"), '', 'title_setup');
-
-
-$h = 0;
-
-$head[$h][0] = DOL_URL_ROOT."/admin/menus.php";
-$head[$h][1] = $langs->trans("MenuHandlers");
-$head[$h][2] = 'handler';
-$h++;
-
-$head[$h][0] = DOL_URL_ROOT."/admin/menus/index.php";
-$head[$h][1] = $langs->trans("MenuAdmin");
-$head[$h][2] = 'editor';
-$h++;
-
-$head[$h][0] = DOL_URL_ROOT."/admin/menus/other.php";
-$head[$h][1] = $langs->trans("Miscellaneous");
-$head[$h][2] = 'misc';
-$h++;
-
-dol_fiche_head($head, 'misc', '', -1);
-
-
-// Other Options
-
-print '<table class="noborder centpercent">';
-print '<tr class="liste_titre">';
-print '<td colspan="3">'.$langs->trans("Parameters").'</td>';
-print '<td class="center" width="80">'.$langs->trans("Status").'</td>';
-print '</tr>';
-
-// Hide unauthorized menu
-print '<tr class="oddeven">';
-print '<td colspan="3">'.$langs->trans("HideUnauthorizedMenu").'</td>';
-print '<td class="center">';
-if (empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))
-{
-	print '<a href="'.$_SERVER["PHP_SELF"].'?action=activate_hidemenu">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-} else {
-	print '<a href="'.$_SERVER["PHP_SELF"].'?action=disable_hidemenu">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
-}
-print "</td>";
-print '</tr>';
-
-print '</table>';
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index c788eca01d3..7aa36b843cd 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -91,106 +91,106 @@ foreach ($modulesdir as $dir)
 		while (($file = readdir($handle)) !== false)
 		{
 			//print "$i ".$file."\n<br>";
-		    if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php')
-		    {
-		        $modName = substr($file, 0, dol_strlen($file) - 10);
+			if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php')
+			{
+				$modName = substr($file, 0, dol_strlen($file) - 10);
 
-		        if ($modName)
-		        {
-		        	if (!empty($modNameLoaded[$modName]))
-		        	{
-		        		$mesg = "Error: Module ".$modName." was found twice: Into ".$modNameLoaded[$modName]." and ".$dir.". You probably have an old file on your disk.<br>";
-		        		setEventMessages($mesg, null, 'warnings');
-		        		dol_syslog($mesg, LOG_ERR);
+				if ($modName)
+				{
+					if (!empty($modNameLoaded[$modName]))
+					{
+						$mesg = "Error: Module ".$modName." was found twice: Into ".$modNameLoaded[$modName]." and ".$dir.". You probably have an old file on your disk.<br>";
+						setEventMessages($mesg, null, 'warnings');
+						dol_syslog($mesg, LOG_ERR);
 						continue;
-		        	}
+					}
 
-		            try {
-		                $res = include_once $dir.$file;
-		                if (class_exists($modName))
+					try {
+						$res = include_once $dir.$file;
+						if (class_exists($modName))
 						{
 							try {
-				                $objMod = new $modName($db);
+								$objMod = new $modName($db);
 								$modNameLoaded[$modName] = $dir;
 
-    		    		        if (!$objMod->numero > 0 && $modName != 'modUser')
-    		            		{
-    		         		    	dol_syslog('The module descriptor '.$modName.' must have a numero property', LOG_ERR);
-    		            		}
+								if (!$objMod->numero > 0 && $modName != 'modUser')
+								{
+					 				dol_syslog('The module descriptor '.$modName.' must have a numero property', LOG_ERR);
+								}
 								$j = $objMod->numero;
 
-    							$modulequalified = 1;
+								$modulequalified = 1;
 
-		    					// We discard modules according to features level (PS: if module is activated we always show it)
-		    					$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
-		    					if ($objMod->version == 'development' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 2))) $modulequalified = 0;
-		    					if ($objMod->version == 'experimental' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 1))) $modulequalified = 0;
+								// We discard modules according to features level (PS: if module is activated we always show it)
+								$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
+								if ($objMod->version == 'development' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 2))) $modulequalified = 0;
+								if ($objMod->version == 'experimental' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 1))) $modulequalified = 0;
 								if (preg_match('/deprecated/', $objMod->version) && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL >= 0))) $modulequalified = 0;
 
-		    					// We discard modules according to property disabled
-		    					//if (! empty($objMod->hidden)) $modulequalified=0;
+								// We discard modules according to property disabled
+								//if (! empty($objMod->hidden)) $modulequalified=0;
 
-		    					if ($modulequalified > 0)
-		    					{
-		    					    $publisher = dol_escape_htmltag($objMod->getPublisher());
-		    					    $external = ($objMod->isCoreOrExternalModule() == 'external');
-		    					    if ($external)
-		    					    {
-		    					        if ($publisher)
-		    					        {
-		    					            $arrayofnatures['external_'.$publisher] = $langs->trans("External").' - '.$publisher;
-		    					        } else {
-		    					            $arrayofnatures['external_'] = $langs->trans("External").' - '.$langs->trans("UnknownPublishers");
-		    					        }
-		    					    }
-		    					    ksort($arrayofnatures);
-		    					}
+								if ($modulequalified > 0)
+								{
+									$publisher = dol_escape_htmltag($objMod->getPublisher());
+									$external = ($objMod->isCoreOrExternalModule() == 'external');
+									if ($external)
+									{
+										if ($publisher)
+										{
+											$arrayofnatures['external_'.$publisher] = $langs->trans("External").' - '.$publisher;
+										} else {
+											$arrayofnatures['external_'] = $langs->trans("External").' - '.$langs->trans("UnknownPublishers");
+										}
+									}
+									ksort($arrayofnatures);
+								}
 
-		    					// Define array $categ with categ with at least one qualified module
-		    					if ($modulequalified > 0)
-		    					{
-		    						$modules[$i] = $objMod;
-		    			            $filename[$i] = $modName;
+								// Define array $categ with categ with at least one qualified module
+								if ($modulequalified > 0)
+								{
+									$modules[$i] = $objMod;
+									$filename[$i] = $modName;
 
-		    			            // Gives the possibility to the module, to provide his own family info and position of this family
-		    			            if (is_array($objMod->familyinfo) && !empty($objMod->familyinfo)) {
-		    			            	if (!is_array($familyinfo)) $familyinfo = array();
-		    			            	$familyinfo = array_merge($familyinfo, $objMod->familyinfo);
-		    			            	$familykey = key($objMod->familyinfo);
-		    			            } else {
-		    			            	$familykey = $objMod->family;
-		    			            }
+									// Gives the possibility to the module, to provide his own family info and position of this family
+									if (is_array($objMod->familyinfo) && !empty($objMod->familyinfo)) {
+										if (!is_array($familyinfo)) $familyinfo = array();
+										$familyinfo = array_merge($familyinfo, $objMod->familyinfo);
+										$familykey = key($objMod->familyinfo);
+									} else {
+										$familykey = $objMod->family;
+									}
 
-		    			            $moduleposition = ($objMod->module_position ? $objMod->module_position : '50');
-		    			            if ($moduleposition == '50' && ($objMod->isCoreOrExternalModule() == 'external'))
-		    			            {
-		    			                $moduleposition = '80'; // External modules at end by default
-		    			            }
+									$moduleposition = ($objMod->module_position ? $objMod->module_position : '50');
+									if ($moduleposition == '50' && ($objMod->isCoreOrExternalModule() == 'external'))
+									{
+										$moduleposition = '80'; // External modules at end by default
+									}
 
-		    			            $orders[$i] = $familyinfo[$familykey]['position']."_".$familykey."_".$moduleposition."_".$j; // Sort by family, then by module position then number
-		    						$dirmod[$i] = $dir;
-		    						//print $i.'-'.$dirmod[$i].'<br>';
-		    			            // Set categ[$i]
-		    						$specialstring = 'unknown';
-		    			            if ($objMod->version == 'development' || $objMod->version == 'experimental') $specialstring = 'expdev';
-		    						if (isset($categ[$specialstring])) $categ[$specialstring]++; // Array of all different modules categories
-		    			            else $categ[$specialstring] = 1;
-		    						$j++;
-		    			            $i++;
-		    					} else dol_syslog("Module ".get_class($objMod)." not qualified");
+									$orders[$i] = $familyinfo[$familykey]['position']."_".$familykey."_".$moduleposition."_".$j; // Sort by family, then by module position then number
+									$dirmod[$i] = $dir;
+									//print $i.'-'.$dirmod[$i].'<br>';
+									// Set categ[$i]
+									$specialstring = 'unknown';
+									if ($objMod->version == 'development' || $objMod->version == 'experimental') $specialstring = 'expdev';
+									if (isset($categ[$specialstring])) $categ[$specialstring]++; // Array of all different modules categories
+									else $categ[$specialstring] = 1;
+									$j++;
+									$i++;
+								} else dol_syslog("Module ".get_class($objMod)." not qualified");
 							} catch (Exception $e)
-		            		{
-		            		     dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
-		            		}
+							{
+								 dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
+							}
 						} else {
 							print "Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)<br>";
 						}
 					} catch (Exception $e)
-		            {
-		                 dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
-		            }
-		        }
-		    }
+					{
+						 dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
+					}
+				}
+			}
 		}
 		closedir($handle);
 	} else {
@@ -208,16 +208,16 @@ unset($objMod);
 $i = 0;
 foreach ($orders as $tmpkey => $tmpvalue)
 {
-    $tmpMod  = $modules[$tmpkey];
-    if ($tmpMod->numero == $id)
-    {
-        $key = $i;
-        $modName = $filename[$tmpkey];
-        $dirofmodule = $dirmod[$tmpkey];
-        $objMod = $tmpMod;
-        break;
-    }
-    $i++;
+	$tmpMod = $modules[$tmpkey];
+	if ($tmpMod->numero == $id)
+	{
+		$key = $i;
+		$modName = $filename[$tmpkey];
+		$dirofmodule = $dirmod[$tmpkey];
+		$objMod = $tmpMod;
+		break;
+	}
+	$i++;
 }
 $value = $orders[$key];
 $tab = explode('_', $value);
@@ -265,7 +265,7 @@ $picto = 'object_'.$objMod->picto;
 print load_fiche_titre(($modulename ? $modulename : $moduledesc), $moreinfo, $picto, 0, '', 'titlemodulehelp');
 print '<br>';
 
-dol_fiche_head($head, $mode, '', -1);
+print dol_get_fiche_head($head, $mode, '', -1);
 
 if (!$modulename)
 {
@@ -296,7 +296,7 @@ $versiontrans .= $objMod->getVersion(1);
 $imginfo = "info";
 if ($objMod->isCoreOrExternalModule() == 'external')
 {
-    $imginfo = "info_black";
+	$imginfo = "info_black";
 }
 
 // Define text of description of module
@@ -304,138 +304,138 @@ $text = '';
 
 if ($mode == 'desc')
 {
-    if ($moduledesc) $text .= '<br>'.$moduledesc.'<br><br><br>';
+	if ($moduledesc) $text .= '<br>'.$moduledesc.'<br><br><br>';
 
-    $text .= '<span class="opacitymedium">'.$langs->trans("Version").':</span> '.$version;
+	$text .= '<span class="opacitymedium">'.$langs->trans("Version").':</span> '.$version;
 
-    $moduledescriptorfile = get_class($objMod).'.class.php';
-    $text .= '<br><span class="opacitymedium">'.$langs->trans("DescriptorFile").':</span> '.$moduledescriptorfile;
+	$moduledescriptorfile = get_class($objMod).'.class.php';
+	$text .= '<br><span class="opacitymedium">'.$langs->trans("DescriptorFile").':</span> '.$moduledescriptorfile;
 
-    $textexternal = '';
-    if ($objMod->isCoreOrExternalModule() == 'external')
-    {
-        $textexternal .= '<br><span class="opacitymedium">'.$langs->trans("Origin").':</span> '.$langs->trans("ExternalModule").' - '.$langs->trans("InstalledInto", $dirofmodule);
-        if ($objMod->editor_name != 'dolibarr') $textexternal .= '<br><span class="opacitymedium">'.$langs->trans("Publisher").':</span> '.(empty($objMod->editor_name) ? $langs->trans("Unknown") : $objMod->editor_name);
-        $editor_url = $objMod->editor_url;
-        if (!preg_match('/^http/', $editor_url)) $editor_url = 'http://'.$editor_url;
-        if (!empty($objMod->editor_url) && !preg_match('/dolibarr\.org/i', $objMod->editor_url)) $textexternal .= ($objMod->editor_name != 'dolibarr' ? ' - ' : '').img_picto('', 'globe').' <a href="'.$editor_url.'" target="_blank">'.$objMod->editor_url.'</a>';
-        $text .= $textexternal;
-        $text .= '<br>';
-    } else {
-        $text .= '<br><span class="opacitymedium">'.$langs->trans("Origin").':</span> '.$langs->trans("Core").'<br>';
-    }
+	$textexternal = '';
+	if ($objMod->isCoreOrExternalModule() == 'external')
+	{
+		$textexternal .= '<br><span class="opacitymedium">'.$langs->trans("Origin").':</span> '.$langs->trans("ExternalModule").' - '.$langs->trans("InstalledInto", $dirofmodule);
+		if ($objMod->editor_name != 'dolibarr') $textexternal .= '<br><span class="opacitymedium">'.$langs->trans("Publisher").':</span> '.(empty($objMod->editor_name) ? $langs->trans("Unknown") : $objMod->editor_name);
+		$editor_url = $objMod->editor_url;
+		if (!preg_match('/^http/', $editor_url)) $editor_url = 'http://'.$editor_url;
+		if (!empty($objMod->editor_url) && !preg_match('/dolibarr\.org/i', $objMod->editor_url)) $textexternal .= ($objMod->editor_name != 'dolibarr' ? ' - ' : '').img_picto('', 'globe').' <a href="'.$editor_url.'" target="_blank">'.$objMod->editor_url.'</a>';
+		$text .= $textexternal;
+		$text .= '<br>';
+	} else {
+		$text .= '<br><span class="opacitymedium">'.$langs->trans("Origin").':</span> '.$langs->trans("Core").'<br>';
+	}
 
-    $moduledesclong = $objMod->getDescLong();
-    if ($moduledesclong) $text .= '<br><hr><div class="moduledesclong">'.$moduledesclong.'<div>';
+	$moduledesclong = $objMod->getDescLong();
+	if ($moduledesclong) $text .= '<br><hr><div class="moduledesclong">'.$moduledesclong.'<div>';
 }
 
 if ($mode == 'feature')
 {
-    $text .= '<br><strong>'.$langs->trans("DependsOn").':</strong> ';
-    if (count($objMod->depends)) $text .= join(',', $objMod->depends);
+	$text .= '<br><strong>'.$langs->trans("DependsOn").':</strong> ';
+	if (count($objMod->depends)) $text .= join(',', $objMod->depends);
 	else $text .= $langs->trans("None");
-    $text .= '<br><strong>'.$langs->trans("RequiredBy").':</strong> ';
+	$text .= '<br><strong>'.$langs->trans("RequiredBy").':</strong> ';
 	if (count($objMod->requiredby)) $text .= join(',', $objMod->requiredby);
 	else $text .= $langs->trans("None");
 
-    $text .= '<br><br>';
+	$text .= '<br><br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddDataTables").':</strong> ';
+	$text .= '<br><strong>'.$langs->trans("AddDataTables").':</strong> ';
 	$sqlfiles = dol_dir_list(dol_buildpath($moduledir.'/sql/'), 'files', 0, 'llx.*\.sql', array('\.key\.sql', '\.sql\.back'));
-    if (count($sqlfiles) > 0)
-    {
-    	$text .= $langs->trans("Yes").' (';
-    	$i = 0;
-    	foreach ($sqlfiles as $val)
-    	{
-    		$text .= ($i ? ', ' : '').preg_replace('/\.sql$/', '', preg_replace('/llx_/', '', $val['name']));
-    		$i++;
-    	}
-    	$text .= ')';
-    } else $text .= $langs->trans("No");
+	if (count($sqlfiles) > 0)
+	{
+		$text .= $langs->trans("Yes").' (';
+		$i = 0;
+		foreach ($sqlfiles as $val)
+		{
+			$text .= ($i ? ', ' : '').preg_replace('/\.sql$/', '', preg_replace('/llx_/', '', $val['name']));
+			$i++;
+		}
+		$text .= ')';
+	} else $text .= $langs->trans("No");
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddDictionaries").':</strong> ';
-    if (isset($objMod->dictionaries) && isset($objMod->dictionaries['tablib']) && is_array($objMod->dictionaries['tablib']) && count($objMod->dictionaries['tablib']))
-    {
-        $i = 0;
-        foreach ($objMod->dictionaries['tablib'] as $val)
-        {
-            $text .= ($i ? ', ' : '').$val;
-            $i++;
-        }
-    } else $text .= $langs->trans("No");
+	$text .= '<br><strong>'.$langs->trans("AddDictionaries").':</strong> ';
+	if (isset($objMod->dictionaries) && isset($objMod->dictionaries['tablib']) && is_array($objMod->dictionaries['tablib']) && count($objMod->dictionaries['tablib']))
+	{
+		$i = 0;
+		foreach ($objMod->dictionaries['tablib'] as $val)
+		{
+			$text .= ($i ? ', ' : '').$val;
+			$i++;
+		}
+	} else $text .= $langs->trans("No");
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddData").':</strong> ';
-    $filedata = dol_buildpath($moduledir.'/sql/data.sql');
-    if (dol_is_file($filedata))
-    {
-        $text .= $langs->trans("Yes").' ('.$moduledir.'/sql/data.sql)';
-    } else $text .= $langs->trans("No");
+	$text .= '<br><strong>'.$langs->trans("AddData").':</strong> ';
+	$filedata = dol_buildpath($moduledir.'/sql/data.sql');
+	if (dol_is_file($filedata))
+	{
+		$text .= $langs->trans("Yes").' ('.$moduledir.'/sql/data.sql)';
+	} else $text .= $langs->trans("No");
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddRemoveTabs").':</strong> ';
-    if (isset($objMod->tabs) && is_array($objMod->tabs) && count($objMod->tabs))
-    {
-        $i = 0;
-        foreach ($objMod->tabs as $val)
-        {
-        	if (is_array($val)) $val = $val['data'];
-        	if (is_string($val))
-        	{
-            	$tmp = explode(':', $val, 3);
-            	$text .= ($i ? ', ' : '').$tmp[0].':'.$tmp[1];
-           		$i++;
-        	}
-        }
-    } else $text .= $langs->trans("No");
+	$text .= '<br><strong>'.$langs->trans("AddRemoveTabs").':</strong> ';
+	if (isset($objMod->tabs) && is_array($objMod->tabs) && count($objMod->tabs))
+	{
+		$i = 0;
+		foreach ($objMod->tabs as $val)
+		{
+			if (is_array($val)) $val = $val['data'];
+			if (is_string($val))
+			{
+				$tmp = explode(':', $val, 3);
+				$text .= ($i ? ', ' : '').$tmp[0].':'.$tmp[1];
+		   		$i++;
+			}
+		}
+	} else $text .= $langs->trans("No");
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddModels").':</strong> ';
-    if (isset($objMod->module_parts) && isset($objMod->module_parts['models']) && $objMod->module_parts['models'])
-    {
-        $text .= $langs->trans("Yes");
-    } else $text .= $langs->trans("No");
+	$text .= '<br><strong>'.$langs->trans("AddModels").':</strong> ';
+	if (isset($objMod->module_parts) && isset($objMod->module_parts['models']) && $objMod->module_parts['models'])
+	{
+		$text .= $langs->trans("Yes");
+	} else $text .= $langs->trans("No");
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddSubstitutions").':</strong> ';
-    if (isset($objMod->module_parts) && isset($objMod->module_parts['substitutions']) && $objMod->module_parts['substitutions'])
-    {
-        $text .= $langs->trans("Yes");
-    } else $text .= $langs->trans("No");
+	$text .= '<br><strong>'.$langs->trans("AddSubstitutions").':</strong> ';
+	if (isset($objMod->module_parts) && isset($objMod->module_parts['substitutions']) && $objMod->module_parts['substitutions'])
+	{
+		$text .= $langs->trans("Yes");
+	} else $text .= $langs->trans("No");
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddSheduledJobs").':</strong> ';
-    if (isset($objMod->cronjobs) && is_array($objMod->cronjobs) && count($objMod->cronjobs))
-    {
-        $i = 0;
-        foreach ($objMod->cronjobs as $val)
-        {
-            $text .= ($i ? ', ' : '').($val['label']);
-            $i++;
-        }
-    } else $text .= $langs->trans("No");
+	$text .= '<br><strong>'.$langs->trans("AddSheduledJobs").':</strong> ';
+	if (isset($objMod->cronjobs) && is_array($objMod->cronjobs) && count($objMod->cronjobs))
+	{
+		$i = 0;
+		foreach ($objMod->cronjobs as $val)
+		{
+			$text .= ($i ? ', ' : '').($val['label']);
+			$i++;
+		}
+	} else $text .= $langs->trans("No");
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddTriggers").':</strong> ';
-    $moreinfoontriggerfile = '';
-    if (isset($objMod->module_parts) && isset($objMod->module_parts['triggers']) && $objMod->module_parts['triggers'])
-    {
-    	$yesno = 'Yes';
-    } else {
-    	$yesno = 'No';
-    }
-    require_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
-    $interfaces = new Interfaces($db);
-    $triggers = $interfaces->getTriggersList(array((($objMod->isCoreOrExternalModule() == 'external') ? '/'.$moduledir : '').'/core/triggers'));
+	$text .= '<br><strong>'.$langs->trans("AddTriggers").':</strong> ';
+	$moreinfoontriggerfile = '';
+	if (isset($objMod->module_parts) && isset($objMod->module_parts['triggers']) && $objMod->module_parts['triggers'])
+	{
+		$yesno = 'Yes';
+	} else {
+		$yesno = 'No';
+	}
+	require_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+	$interfaces = new Interfaces($db);
+	$triggers = $interfaces->getTriggersList(array((($objMod->isCoreOrExternalModule() == 'external') ? '/'.$moduledir : '').'/core/triggers'));
 	foreach ($triggers as $triggercursor)
 	{
 		if ($triggercursor['module'] == $moduledir)
@@ -445,116 +445,116 @@ if ($mode == 'feature')
 		}
 	}
 
-    $text .= $langs->trans($yesno).$moreinfoontriggerfile;
+	$text .= $langs->trans($yesno).$moreinfoontriggerfile;
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddBoxes").':</strong> ';
-    if (isset($objMod->boxes) && is_array($objMod->boxes) && count($objMod->boxes))
-    {
-        $i = 0;
-        foreach ($objMod->boxes as $val)
-        {
-            $text .= ($i ? ', ' : '').($val['file'] ? $val['file'] : $val[0]);
-            $i++;
-        }
-    } else $text .= $langs->trans("No");
+	$text .= '<br><strong>'.$langs->trans("AddBoxes").':</strong> ';
+	if (isset($objMod->boxes) && is_array($objMod->boxes) && count($objMod->boxes))
+	{
+		$i = 0;
+		foreach ($objMod->boxes as $val)
+		{
+			$text .= ($i ? ', ' : '').($val['file'] ? $val['file'] : $val[0]);
+			$i++;
+		}
+	} else $text .= $langs->trans("No");
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddHooks").':</strong> ';
-    if (isset($objMod->module_parts) && is_array($objMod->module_parts['hooks']) && count($objMod->module_parts['hooks']))
-    {
-    	$i = 0;
-        foreach ($objMod->module_parts['hooks'] as $key => $val)
-        {
-        	if ($key === 'entity') continue;
+	$text .= '<br><strong>'.$langs->trans("AddHooks").':</strong> ';
+	if (isset($objMod->module_parts) && is_array($objMod->module_parts['hooks']) && count($objMod->module_parts['hooks']))
+	{
+		$i = 0;
+		foreach ($objMod->module_parts['hooks'] as $key => $val)
+		{
+			if ($key === 'entity') continue;
 
-        	// For special values
-        	if ($key === 'data')
-        	{
-        		if (is_array($val))
-        		{
-        			foreach ($val as $value)
-        			{
-        				$text .= ($i ? ', ' : '').($value);
-        				$i++;
-        			}
+			// For special values
+			if ($key === 'data')
+			{
+				if (is_array($val))
+				{
+					foreach ($val as $value)
+					{
+						$text .= ($i ? ', ' : '').($value);
+						$i++;
+					}
 
-        			continue;
-        		}
-        	}
+					continue;
+				}
+			}
 
-        	$text .= ($i ? ', ' : '').($val);
-        	$i++;
-        }
-    } else $text .= $langs->trans("No");
+			$text .= ($i ? ', ' : '').($val);
+			$i++;
+		}
+	} else $text .= $langs->trans("No");
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddPermissions").':</strong> ';
-    if (isset($objMod->rights) && is_array($objMod->rights) && count($objMod->rights))
-    {
-        $i = 0;
-        foreach ($objMod->rights as $val)
-        {
-        	$text .= ($i ? ', ' : '').($val[1]);
-        	$i++;
-        }
-    } else $text .= $langs->trans("No");
+	$text .= '<br><strong>'.$langs->trans("AddPermissions").':</strong> ';
+	if (isset($objMod->rights) && is_array($objMod->rights) && count($objMod->rights))
+	{
+		$i = 0;
+		foreach ($objMod->rights as $val)
+		{
+			$text .= ($i ? ', ' : '').($val[1]);
+			$i++;
+		}
+	} else $text .= $langs->trans("No");
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddMenus").':</strong> ';
-    if (isset($objMod->menu) && !empty($objMod->menu)) // objMod can be an array or just an int 1
-    {
-        $text .= $langs->trans("Yes");
-    } else $text .= $langs->trans("No");
+	$text .= '<br><strong>'.$langs->trans("AddMenus").':</strong> ';
+	if (isset($objMod->menu) && !empty($objMod->menu)) // objMod can be an array or just an int 1
+	{
+		$text .= $langs->trans("Yes");
+	} else $text .= $langs->trans("No");
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddExportProfiles").':</strong> ';
-    if (isset($objMod->export_label) && is_array($objMod->export_label) && count($objMod->export_label))
-    {
-        $i = 0;
-        foreach ($objMod->export_label as $val)
-        {
-            $text .= ($i ? ', ' : '').($val);
-            $i++;
-        }
-    } else $text .= $langs->trans("No");
+	$text .= '<br><strong>'.$langs->trans("AddExportProfiles").':</strong> ';
+	if (isset($objMod->export_label) && is_array($objMod->export_label) && count($objMod->export_label))
+	{
+		$i = 0;
+		foreach ($objMod->export_label as $val)
+		{
+			$text .= ($i ? ', ' : '').($val);
+			$i++;
+		}
+	} else $text .= $langs->trans("No");
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddImportProfiles").':</strong> ';
-    if (isset($objMod->import_label) && is_array($objMod->import_label) && count($objMod->import_label))
-    {
-        $i = 0;
-        foreach ($objMod->import_label as $val)
-        {
-            $text .= ($i ? ', ' : '').($val);
-            $i++;
-        }
-    } else $text .= $langs->trans("No");
+	$text .= '<br><strong>'.$langs->trans("AddImportProfiles").':</strong> ';
+	if (isset($objMod->import_label) && is_array($objMod->import_label) && count($objMod->import_label))
+	{
+		$i = 0;
+		foreach ($objMod->import_label as $val)
+		{
+			$text .= ($i ? ', ' : '').($val);
+			$i++;
+		}
+	} else $text .= $langs->trans("No");
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddOtherPagesOrServices").':</strong> ';
-    $text .= $langs->trans("DetectionNotPossible");
+	$text .= '<br><strong>'.$langs->trans("AddOtherPagesOrServices").':</strong> ';
+	$text .= $langs->trans("DetectionNotPossible");
 }
 
 
 if ($mode == 'changelog')
 {
-    $changelog = $objMod->getChangeLog();
-    if ($changelog) $text .= '<div class="moduledesclong">'.$changelog.'<div>';
-    else $text .= '<div class="moduledesclong">'.$langs->trans("NotAvailable").'</div>';
+	$changelog = $objMod->getChangeLog();
+	if ($changelog) $text .= '<div class="moduledesclong">'.$changelog.'<div>';
+	else $text .= '<div class="moduledesclong">'.$langs->trans("NotAvailable").'</div>';
 }
 
 print $text;
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '</div>';
 
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index c61e352aad8..e9984316394 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -28,6 +28,10 @@
  *  \brief      Page to activate/disable all modules
  */
 
+if (!defined('CSRFCHECK_WITH_TOKEN')) {
+	define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
+}
+
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -39,7 +43,9 @@ require_once DOL_DOCUMENT_ROOT.'/admin/dolistore/class/dolistore.class.php';
 $langs->loadLangs(array("errors", "admin", "modulebuilder"));
 
 $mode = GETPOSTISSET('mode') ? GETPOST('mode', 'alpha') : (empty($conf->global->MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT) ? 'commonkanban' : 'common');
-if (empty($mode)) $mode = 'common';
+if (empty($mode)) {
+	$mode = 'common';
+}
 $action = GETPOST('action', 'aZ09');
 //var_dump($_POST);exit;
 $value = GETPOST('value', 'alpha');
@@ -60,8 +66,9 @@ $options['search']    = GETPOST('search_keyword', 'alpha');
 $dolistore            = new Dolistore(false);
 
 
-if (!$user->admin)
+if (!$user->admin) {
 	accessforbidden();
+}
 
 $familyinfo = array(
 	'hr'=>array('position'=>'001', 'label'=>$langs->trans("ModuleFamilyHr")),
@@ -79,12 +86,19 @@ $familyinfo = array(
 );
 
 $param = '';
-if (!GETPOST('buttonreset', 'alpha'))
-{
-	if ($search_keyword) $param .= '&search_keyword='.urlencode($search_keyword);
-	if ($search_status && $search_status != '-1')  $param .= '&search_status='.urlencode($search_status);
-	if ($search_nature && $search_nature != '-1')  $param .= '&search_nature='.urlencode($search_nature);
-	if ($search_version && $search_version != '-1') $param .= '&search_version='.urlencode($search_version);
+if (!GETPOST('buttonreset', 'alpha')) {
+	if ($search_keyword) {
+		$param .= '&search_keyword='.urlencode($search_keyword);
+	}
+	if ($search_status && $search_status != '-1') {
+		$param .= '&search_status='.urlencode($search_status);
+	}
+	if ($search_nature && $search_nature != '-1') {
+		$param .= '&search_nature='.urlencode($search_nature);
+	}
+	if ($search_version && $search_version != '-1') {
+		$param .= '&search_version='.urlencode($search_version);
+	}
 }
 
 $dirins = DOL_DOCUMENT_ROOT.'/custom';
@@ -102,18 +116,18 @@ $formconfirm = '';
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (GETPOST('buttonreset', 'alpha'))
-{
+if (GETPOST('buttonreset', 'alpha')) {
 	$search_keyword = '';
 	$search_status = '';
 	$search_nature = '';
 	$search_version = '';
 }
 
-if ($action == 'install')
-{
+if ($action == 'install') {
 	$error = 0;
 
 	// $original_file should match format module_modulename-x.y[.z].zip
@@ -121,54 +135,45 @@ if ($action == 'install')
 	$original_file = preg_replace('/\(\d+\)\.zip$/i', '.zip', $original_file);
 	$newfile = $conf->admin->dir_temp.'/'.$original_file.'/'.$original_file;
 
-	if (!$original_file)
-	{
+	if (!$original_file) {
 		$langs->load("Error");
 		setEventMessages($langs->trans("ErrorModuleFileRequired"), null, 'warnings');
 		$error++;
 	} else {
-		if (!$error && !preg_match('/\.zip$/i', $original_file))
-		{
+		if (!$error && !preg_match('/\.zip$/i', $original_file)) {
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorFileMustBeADolibarrPackage", $original_file), null, 'errors');
 			$error++;
 		}
-		if (!$error && !preg_match('/^(module[a-zA-Z0-9]*|theme)_.*\-([0-9][0-9\.]*)\.zip$/i', $original_file))
-		{
+		if (!$error && !preg_match('/^(module[a-zA-Z0-9]*|theme)_.*\-([0-9][0-9\.]*)\.zip$/i', $original_file)) {
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorFilenameDosNotMatchDolibarrPackageRules", $original_file, 'module_*-x.y*.zip'), null, 'errors');
 			$error++;
 		}
-		if (empty($_FILES['fileinstall']['tmp_name']))
-		{
+		if (empty($_FILES['fileinstall']['tmp_name'])) {
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
 			$error++;
 		}
 	}
 
-	if (!$error)
-	{
-		if ($original_file)
-		{
+	if (!$error) {
+		if ($original_file) {
 			@dol_delete_dir_recursive($conf->admin->dir_temp.'/'.$original_file);
 			dol_mkdir($conf->admin->dir_temp.'/'.$original_file);
 		}
 
 		$tmpdir = preg_replace('/\.zip$/i', '', $original_file).'.dir';
-		if ($tmpdir)
-		{
+		if ($tmpdir) {
 			@dol_delete_dir_recursive($conf->admin->dir_temp.'/'.$tmpdir);
 			dol_mkdir($conf->admin->dir_temp.'/'.$tmpdir);
 		}
 
 		$result = dol_move_uploaded_file($_FILES['fileinstall']['tmp_name'], $newfile, 1, 0, $_FILES['fileinstall']['error']);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			$result = dol_uncompress($newfile, $conf->admin->dir_temp.'/'.$tmpdir);
 
-			if (!empty($result['error']))
-			{
+			if (!empty($result['error'])) {
 				$langs->load("errors");
 				setEventMessages($langs->trans($result['error'], $original_file), null, 'errors');
 				$error++;
@@ -179,19 +184,16 @@ if ($action == 'install')
 				// Search dir $modulename
 				$modulenamedir = $conf->admin->dir_temp.'/'.$tmpdir.'/'.$modulename; // Example ./mymodule
 
-				if (!dol_is_dir($modulenamedir))
-				{
+				if (!dol_is_dir($modulenamedir)) {
 					$modulenamedir = $conf->admin->dir_temp.'/'.$tmpdir.'/htdocs/'.$modulename; // Example ./htdocs/mymodule
 					//var_dump($modulenamedir);
-					if (!dol_is_dir($modulenamedir))
-					{
+					if (!dol_is_dir($modulenamedir)) {
 						setEventMessages($langs->trans("ErrorModuleFileSeemsToHaveAWrongFormat").'<br>'.$langs->trans("ErrorModuleFileSeemsToHaveAWrongFormat2", $modulename, 'htdocs/'.$modulename), null, 'errors');
 						$error++;
 					}
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					// TODO Make more test
 				}
 
@@ -207,18 +209,22 @@ if ($action == 'install')
 				//var_dump($modulenamearrays);exit;
 
 				foreach ($modulenamearrays as $modulenameval) {
-					if (strpos($modulenameval, '#') === 0) continue; // Discard comments
-					if (strpos($modulenameval, '//') === 0) continue; // Discard comments
-					if (!trim($modulenameval)) continue;
+					if (strpos($modulenameval, '#') === 0) {
+						continue; // Discard comments
+					}
+					if (strpos($modulenameval, '//') === 0) {
+						continue; // Discard comments
+					}
+					if (!trim($modulenameval)) {
+						continue;
+					}
 
 					// Now we install the module
-					if (!$error)
-					{
+					if (!$error) {
 						@dol_delete_dir_recursive($dirins.'/'.$modulenameval); // delete the zip file
 						dol_syslog("We copy now directory ".$conf->admin->dir_temp.'/'.$tmpdir.'/htdocs/'.$modulenameval." into target dir ".$dirins.'/'.$modulenameval);
 						$result = dolCopyDir($modulenamedir, $dirins.'/'.$modulenameval, '0444', 1);
-						if ($result <= 0)
-						{
+						if ($result <= 0) {
 							dol_syslog('Failed to call dolCopyDir result='.$result." with param ".$modulenamedir." and ".$dirins.'/'.$modulenameval, LOG_WARNING);
 							$langs->load("errors");
 							setEventMessages($langs->trans("ErrorFailToCopyDir", $modulenamedir, $dirins.'/'.$modulenameval), null, 'errors');
@@ -233,40 +239,39 @@ if ($action == 'install')
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		setEventMessages($langs->trans("SetupIsReadyForUse", DOL_URL_ROOT.'/admin/modules.php?mainmenu=home', $langs->transnoentitiesnoconv("Home").' - '.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Modules")), null, 'warnings');
 	}
 }
 
-if ($action == 'set' && $user->admin)
-{
+if ($action == 'set' && $user->admin) {
 	$resarray = activateModule($value);
-	if (!empty($resarray['errors'])) setEventMessages('', $resarray['errors'], 'errors');
-	else {
+	if (!empty($resarray['errors'])) {
+		setEventMessages('', $resarray['errors'], 'errors');
+	} else {
 		//var_dump($resarray);exit;
-		if ($resarray['nbperms'] > 0)
-		{
+		if ($resarray['nbperms'] > 0) {
 			$tmpsql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."user WHERE admin <> 1";
 			$resqltmp = $db->query($tmpsql);
-			if ($resqltmp)
-			{
+			if ($resqltmp) {
 				$obj = $db->fetch_object($resqltmp);
 				//var_dump($obj->nb);exit;
-				if ($obj && $obj->nb > 1)
-				{
+				if ($obj && $obj->nb > 1) {
 					$msg = $langs->trans('ModuleEnabledAdminMustCheckRights');
 					setEventMessages($msg, null, 'warnings');
 				}
-			} else dol_print_error($db);
+			} else {
+				dol_print_error($db);
+			}
 		}
 	}
 	header("Location: ".$_SERVER["PHP_SELF"]."?mode=".$mode.$param.($page_y ? '&page_y='.$page_y : ''));
 	exit;
-} elseif ($action == 'reset' && $user->admin && GETPOST('confirm') == 'yes')
-{
+} elseif ($action == 'reset' && $user->admin && GETPOST('confirm') == 'yes') {
 	$result = unActivateModule($value);
-	if ($result) setEventMessages($result, null, 'errors');
+	if ($result) {
+		setEventMessages($result, null, 'errors');
+	}
 	header("Location: ".$_SERVER["PHP_SELF"]."?mode=".$mode.$param.($page_y ? '&page_y='.$page_y : ''));
 	exit;
 }
@@ -279,12 +284,11 @@ if ($action == 'set' && $user->admin)
 
 $form = new Form($db);
 
-//$morejs  = array("/admin/dolistore/js/dolistore.js.php");
+$morejs = array();
 $morecss = array("/admin/dolistore/css/dolistore.css");
 
 // Set dir where external modules are installed
-if (!dol_is_dir($dirins))
-{
+if (!dol_is_dir($dirins)) {
 	dol_mkdir($dirins);
 }
 $dirins_ok = (dol_is_dir($dirins));
@@ -308,25 +312,19 @@ $i = 0; // is a sequencer of modules found
 $j = 0; // j is module number. Automatically affected if module number not defined.
 $modNameLoaded = array();
 
-foreach ($modulesdir as $dir)
-{
+foreach ($modulesdir as $dir) {
 	// Load modules attributes in arrays (name, numero, orders) from dir directory
 	//print $dir."\n<br>";
 	dol_syslog("Scan directory ".$dir." for module descriptor files (modXXX.class.php)");
 	$handle = @opendir($dir);
-	if (is_resource($handle))
-	{
-		while (($file = readdir($handle)) !== false)
-		{
+	if (is_resource($handle)) {
+		while (($file = readdir($handle)) !== false) {
 			//print "$i ".$file."\n<br>";
-			if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php')
-			{
+			if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php') {
 				$modName = substr($file, 0, dol_strlen($file) - 10);
 
-				if ($modName)
-				{
-					if (!empty($modNameLoaded[$modName]))   // In cache of already loaded modules ?
-					{
+				if ($modName) {
+					if (!empty($modNameLoaded[$modName])) {   // In cache of already loaded modules ?
 						$mesg = "Error: Module ".$modName." was found twice: Into ".$modNameLoaded[$modName]." and ".$dir.". You probably have an old file on your disk.<br>";
 						setEventMessages($mesg, null, 'warnings');
 						dol_syslog($mesg, LOG_ERR);
@@ -335,14 +333,12 @@ foreach ($modulesdir as $dir)
 
 					try {
 						$res = include_once $dir.$file; // A class already exists in a different file will send a non catchable fatal error.
-						if (class_exists($modName))
-						{
+						if (class_exists($modName)) {
 							try {
 								$objMod = new $modName($db);
 								$modNameLoaded[$modName] = $dir;
-								if (!$objMod->numero > 0 && $modName != 'modUser')
-								{
-					 				dol_syslog('The module descriptor '.$modName.' must have a numero property', LOG_ERR);
+								if (!$objMod->numero > 0 && $modName != 'modUser') {
+									dol_syslog('The module descriptor '.$modName.' must have a numero property', LOG_ERR);
 								}
 								$j = $objMod->numero;
 
@@ -350,21 +346,26 @@ foreach ($modulesdir as $dir)
 
 								// We discard modules according to features level (PS: if module is activated we always show it)
 								$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
-								if ($objMod->version == 'development' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 2))) $modulequalified = 0;
-								if ($objMod->version == 'experimental' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 1))) $modulequalified = 0;
-								if (preg_match('/deprecated/', $objMod->version) && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL >= 0))) $modulequalified = 0;
+								if ($objMod->version == 'development' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 2))) {
+									$modulequalified = 0;
+								}
+								if ($objMod->version == 'experimental' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 1))) {
+									$modulequalified = 0;
+								}
+								if (preg_match('/deprecated/', $objMod->version) && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL >= 0))) {
+									$modulequalified = 0;
+								}
 
 								// We discard modules according to property ->hidden
-								if (!empty($objMod->hidden)) $modulequalified = 0;
+								if (!empty($objMod->hidden)) {
+									$modulequalified = 0;
+								}
 
-								if ($modulequalified > 0)
-								{
+								if ($modulequalified > 0) {
 									$publisher = dol_escape_htmltag($objMod->getPublisher());
 									$external = ($objMod->isCoreOrExternalModule() == 'external');
-									if ($external)
-									{
-										if ($publisher)
-										{
+									if ($external) {
+										if ($publisher) {
 											$arrayofnatures['external_'.$publisher] = $langs->trans("External").' - '.$publisher;
 										} else {
 											$arrayofnatures['external_'] = $langs->trans("External").' - '.$langs->trans("UnknownPublishers");
@@ -385,25 +386,21 @@ foreach ($modulesdir as $dir)
 									}
 
 									$moduleposition = ($objMod->module_position ? $objMod->module_position : '50');
-									if ($moduleposition == '50' && ($objMod->isCoreOrExternalModule() == 'external'))
-									{
+									if ($moduleposition == '50' && ($objMod->isCoreOrExternalModule() == 'external')) {
 										$moduleposition = '80'; // External modules at end by default
 									}
 
 									// Add list of warnings to show into arrayofwarnings and arrayofwarningsext
-									if (!empty($objMod->warnings_activation))
-									{
+									if (!empty($objMod->warnings_activation)) {
 										$arrayofwarnings[$modName] = $objMod->warnings_activation;
 									}
-									if (!empty($objMod->warnings_activation_ext))
-									{
+									if (!empty($objMod->warnings_activation_ext)) {
 										$arrayofwarningsext[$modName] = $objMod->warnings_activation_ext;
 									}
 
-									$familyposition = $familyinfo[$familykey]['position'];
+									$familyposition = (empty($familyinfo[$familykey]['position']) ? 0 : $familyinfo[$familykey]['position']);
 									$listOfOfficialModuleGroups = array('hr', 'technic', 'interface', 'technic', 'portal', 'financial', 'crm', 'base', 'products', 'srm', 'ecm', 'projects', 'other');
-									if ($external && ! in_array($familykey, $listOfOfficialModuleGroups))
-									{
+									if ($external && !in_array($familykey, $listOfOfficialModuleGroups)) {
 										// If module is extern and into a custom group (not into an official predefined one), it must appear at end (custom groups should not be before official groups).
 										if (is_numeric($familyposition)) {
 											$familyposition = sprintf("%03d", (int) $familyposition + 100);
@@ -414,21 +411,26 @@ foreach ($modulesdir as $dir)
 
 									// Set categ[$i]
 									$specialstring = 'unknown';
-									if ($objMod->version == 'development' || $objMod->version == 'experimental') $specialstring = 'expdev';
-									if (isset($categ[$specialstring])) $categ[$specialstring]++; // Array of all different modules categories
-									else $categ[$specialstring] = 1;
+									if ($objMod->version == 'development' || $objMod->version == 'experimental') {
+										$specialstring = 'expdev';
+									}
+									if (isset($categ[$specialstring])) {
+										$categ[$specialstring]++; // Array of all different modules categories
+									} else {
+										$categ[$specialstring] = 1;
+									}
 									$j++;
 									$i++;
-								} else dol_syslog("Module ".get_class($objMod)." not qualified");
-							} catch (Exception $e)
-							{
+								} else {
+									dol_syslog("Module ".get_class($objMod)." not qualified");
+								}
+							} catch (Exception $e) {
 								 dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
 							}
 						} else {
 							print "Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)<br>";
 						}
-					} catch (Exception $e)
-					{
+					} catch (Exception $e) {
 						 dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
 					}
 				}
@@ -440,12 +442,13 @@ foreach ($modulesdir as $dir)
 	}
 }
 
-if ($action == 'reset_confirm' && $user->admin)
-{
+if ($action == 'reset_confirm' && $user->admin) {
 	if (!empty($modules[$value])) {
 		$objMod = $modules[$value];
 
-		if (!empty($objMod->langfiles)) $langs->loadLangs($objMod->langfiles);
+		if (!empty($objMod->langfiles)) {
+			$langs->loadLangs($objMod->langfiles);
+		}
 
 		$form = new Form($db);
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?value='.$value.'&mode='.$mode.$param, $langs->trans('ConfirmUnactivation'), $langs->trans(GETPOST('confirm_message_code')), 'reset', '', 'no', 1);
@@ -462,16 +465,27 @@ asort($orders);
 $nbofactivatedmodules = count($conf->modules);
 $moreinfo = $langs->trans("TitleNumberOfActivatedModules");
 $moreinfo2 = ($nbofactivatedmodules - 1)." / ".count($modules);
-if ($nbofactivatedmodules <= 1) $moreinfo2 .= ' '.img_warning($langs->trans("YouMustEnableOneModule"));
+if ($nbofactivatedmodules <= 1) {
+	$moreinfo2 .= ' '.img_warning($langs->trans("YouMustEnableOneModule"));
+}
 
 print load_fiche_titre($langs->trans("ModulesSetup"), '', 'title_setup');
 
 // Start to show page
-if ($mode == 'common')       print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDesc", img_picto('', 'switch_off'))."<br></span>\n";
-if ($mode == 'commonkanban') print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDesc", img_picto('', 'switch_off'))."<br></span>\n";
-if ($mode == 'marketplace')  print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesMarketPlaceDesc")."<br></span>\n";
-if ($mode == 'deploy')       print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules"))."<br></span>\n";
-if ($mode == 'develop')      print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDevelopDesc")."<br></span>\n";
+if ($mode == 'common' || $mode == 'commonkanban') {
+	$desc = $langs->trans("ModulesDesc", '{picto}');
+	$desc = str_replace('{picto}', img_picto('', 'switch_off'), $desc);
+	print '<span class="opacitymedium hideonsmartphone">'.$desc."<br></span>\n";
+}
+if ($mode == 'marketplace') {
+	print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesMarketPlaceDesc")."<br></span>\n";
+}
+if ($mode == 'deploy') {
+	print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules"))."<br></span>\n";
+}
+if ($mode == 'develop') {
+	print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDevelopDesc")."<br></span>\n";
+}
 
 $head = modules_prepare_head();
 
@@ -479,22 +493,20 @@ $head = modules_prepare_head();
 print "<br>\n";
 
 
-if ($mode == 'common' || $mode == 'commonkanban')
-{
+if ($mode == 'common' || $mode == 'commonkanban') {
 	dol_set_focus('#search_keyword');
 
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') {
+		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	}
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="mode" value="'.$mode.'">';
 
-	$newmode = $mode;
-	if ($newmode == 'common') $newmode = 'commonkanban';
-
-	dol_fiche_head($head, $newmode, '', -1);
+	print dol_get_fiche_head($head, 'modules', '', -1);
 
 	$moreforfilter = '<div class="valignmiddle">';
 
@@ -510,33 +522,37 @@ if ($mode == 'common' || $mode == 'commonkanban')
 	$moreforfilter .= $langs->trans('Keyword').': <input type="text" id="search_keyword" name="search_keyword" class="maxwidth100" value="'.dol_escape_htmltag($search_keyword).'">';
 	$moreforfilter .= '</div>';
 	$moreforfilter .= '<div class="divsearchfield paddingtop">';
-	$moreforfilter .= $langs->trans('Origin').': '.$form->selectarray('search_nature', $arrayofnatures, dol_escape_htmltag($search_nature), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
+	$moreforfilter .= $langs->trans('Origin').': '.$form->selectarray('search_nature', $arrayofnatures, dol_escape_htmltag($search_nature), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth200', 1);
 	$moreforfilter .= '</div>';
-	if (!empty($conf->global->MAIN_FEATURES_LEVEL))
-	{
+	if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
 		$array_version = array('stable'=>$langs->transnoentitiesnoconv("Stable"));
-		if ($conf->global->MAIN_FEATURES_LEVEL < 0) $array_version['deprecated'] = $langs->trans("Deprecated");
-		if ($conf->global->MAIN_FEATURES_LEVEL > 0) $array_version['experimental'] = $langs->trans("Experimental");
-		if ($conf->global->MAIN_FEATURES_LEVEL > 1) $array_version['development'] = $langs->trans("Development");
+		if ($conf->global->MAIN_FEATURES_LEVEL < 0) {
+			$array_version['deprecated'] = $langs->trans("Deprecated");
+		}
+		if ($conf->global->MAIN_FEATURES_LEVEL > 0) {
+			$array_version['experimental'] = $langs->trans("Experimental");
+		}
+		if ($conf->global->MAIN_FEATURES_LEVEL > 1) {
+			$array_version['development'] = $langs->trans("Development");
+		}
 		$moreforfilter .= '<div class="divsearchfield paddingtop">';
-		$moreforfilter .= $langs->trans('Version').': '.$form->selectarray('search_version', $array_version, $search_version, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
+		$moreforfilter .= $langs->trans('Version').': '.$form->selectarray('search_version', $array_version, $search_version, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1);
 		$moreforfilter .= '</div>';
 	}
 	$moreforfilter .= '<div class="divsearchfield paddingtop">';
-	$moreforfilter .= $langs->trans('Status').': '.$form->selectarray('search_status', array('active'=>$langs->transnoentitiesnoconv("Enabled"), 'disabled'=>$langs->transnoentitiesnoconv("Disabled")), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
+	$moreforfilter .= $langs->trans('Status').': '.$form->selectarray('search_status', array('active'=>$langs->transnoentitiesnoconv("Enabled"), 'disabled'=>$langs->transnoentitiesnoconv("Disabled")), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1);
 	$moreforfilter .= '</div>';
 	$moreforfilter .= ' ';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= '<input type="submit" name="buttonsubmit" class="button" value="'.dol_escape_htmltag($langs->trans("Refresh")).'">';
 	$moreforfilter .= ' ';
-	$moreforfilter .= '<input type="submit" name="buttonreset" class="button" value="'.dol_escape_htmltag($langs->trans("Reset")).'">';
+	$moreforfilter .= '<input type="submit" name="buttonreset" class="butActionDelete noborderbottom" value="'.dol_escape_htmltag($langs->trans("Reset")).'">';
 	$moreforfilter .= '</div>';
 	$moreforfilter .= '</div>';
 
 	$moreforfilter .= '</div>';
 
-	if (!empty($moreforfilter))
-	{
+	if (!empty($moreforfilter)) {
 		print $moreforfilter;
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
@@ -550,14 +566,15 @@ if ($mode == 'common' || $mode == 'commonkanban')
 	$object = new stdClass();
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('insertExtraHeader', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	if ($reshook < 0) {
+		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	}
 
 	// Show list of modules
 	$oldfamily = '';
 	$linenum = 0;
 
-	foreach ($orders as $key => $value)
-	{
+	foreach ($orders as $key => $value) {
 		$linenum++;
 		$tab = explode('_', $value);
 		$familykey = $tab[1];
@@ -567,12 +584,13 @@ if ($mode == 'common' || $mode == 'commonkanban')
 		$objMod = $modules[$modName];
 
 		//print $objMod->name." - ".$key." - ".$objMod->version."<br>";
-		if ($mode == 'expdev' && $objMod->version != 'development' && $objMod->version != 'experimental') continue; // Discard if not for current tab
+		if ($mode == 'expdev' && $objMod->version != 'development' && $objMod->version != 'experimental') {
+			continue; // Discard if not for current tab
+		}
 
-		if (!$objMod->getName())
-		{
+		if (!$objMod->getName()) {
 			dol_syslog("Error for module ".$key." - Property name of module looks empty", LOG_WARNING);
-	  		continue;
+			continue;
 		}
 
 		$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
@@ -585,48 +603,65 @@ if ($mode == 'common' || $mode == 'commonkanban')
 		$moduleauthor = $objMod->getPublisher();
 
 		// We discard showing according to filters
-		if ($search_keyword)
-		{
+		if ($search_keyword) {
 			$qualified = 0;
 			if (preg_match('/'.preg_quote($search_keyword).'/i', $modulename)
 				|| preg_match('/'.preg_quote($search_keyword).'/i', $moduletechnicalname)
 				|| preg_match('/'.preg_quote($search_keyword).'/i', $moduledesc)
 				|| preg_match('/'.preg_quote($search_keyword).'/i', $moduledesclong)
 				|| preg_match('/'.preg_quote($search_keyword).'/i', $moduleauthor)
-				) $qualified = 1;
-			if (!$qualified) continue;
+				) {
+				$qualified = 1;
+			}
+			if (!$qualified) {
+				continue;
+			}
 		}
-		if ($search_status)
-		{
-			if ($search_status == 'active' && empty($conf->global->$const_name)) continue;
-			if ($search_status == 'disabled' && !empty($conf->global->$const_name)) continue;
+		if ($search_status) {
+			if ($search_status == 'active' && empty($conf->global->$const_name)) {
+				continue;
+			}
+			if ($search_status == 'disabled' && !empty($conf->global->$const_name)) {
+				continue;
+			}
 		}
-		if ($search_nature)
-		{
-			if (preg_match('/^external/', $search_nature) && $objMod->isCoreOrExternalModule() != 'external') continue;
+		if ($search_nature) {
+			if (preg_match('/^external/', $search_nature) && $objMod->isCoreOrExternalModule() != 'external') {
+				continue;
+			}
 			$reg = array();
-			if (preg_match('/^external_(.*)$/', $search_nature, $reg))
-			{
+			if (preg_match('/^external_(.*)$/', $search_nature, $reg)) {
 				//print $reg[1].'-'.dol_escape_htmltag($objMod->getPublisher());
 				$publisher = dol_escape_htmltag($objMod->getPublisher());
-				if ($reg[1] && dol_escape_htmltag($reg[1]) != $publisher) continue;
-				if (!$reg[1] && !empty($publisher)) continue;
+				if ($reg[1] && dol_escape_htmltag($reg[1]) != $publisher) {
+					continue;
+				}
+				if (!$reg[1] && !empty($publisher)) {
+					continue;
+				}
+			}
+			if ($search_nature == 'core' && $objMod->isCoreOrExternalModule() == 'external') {
+				continue;
 			}
-			if ($search_nature == 'core' && $objMod->isCoreOrExternalModule() == 'external') continue;
 		}
-		if ($search_version)
-		{
-			if (($objMod->version == 'development' || $objMod->version == 'experimental' || preg_match('/deprecated/', $objMod->version)) && $search_version == 'stable') continue;
-			if ($objMod->version != 'development' && ($search_version == 'development')) continue;
-			if ($objMod->version != 'experimental' && ($search_version == 'experimental')) continue;
-			if (!preg_match('/deprecated/', $objMod->version) && ($search_version == 'deprecated')) continue;
+		if ($search_version) {
+			if (($objMod->version == 'development' || $objMod->version == 'experimental' || preg_match('/deprecated/', $objMod->version)) && $search_version == 'stable') {
+				continue;
+			}
+			if ($objMod->version != 'development' && ($search_version == 'development')) {
+				continue;
+			}
+			if ($objMod->version != 'experimental' && ($search_version == 'experimental')) {
+				continue;
+			}
+			if (!preg_match('/deprecated/', $objMod->version) && ($search_version == 'deprecated')) {
+				continue;
+			}
 		}
 
 		// Load all lang files of module
-		if (isset($objMod->langfiles) && is_array($objMod->langfiles))
-		{
-			foreach ($objMod->langfiles as $domain)
-			{
+		if (isset($objMod->langfiles) && is_array($objMod->langfiles)) {
+			foreach ($objMod->langfiles as $domain) {
 				$langs->load($domain);
 			}
 		}
@@ -653,8 +688,7 @@ if ($mode == 'common' || $mode == 'commonkanban')
 
 		$atleastoneforfamily++;
 
-		if ($familykey != $oldfamily)
-		{
+		if ($familykey != $oldfamily) {
 			$familytext = empty($familyinfo[$familykey]['label']) ? $familykey : $familyinfo[$familykey]['label'];
 			$oldfamily = $familykey;
 		}
@@ -662,17 +696,22 @@ if ($mode == 'common' || $mode == 'commonkanban')
 		// Version (with picto warning or not)
 		$version = $objMod->getVersion(0);
 		$versiontrans = '';
-		if (preg_match('/development/i', $version))  $versiontrans .= img_warning($langs->trans("Development"), 'style="float: left"');
-		if (preg_match('/experimental/i', $version)) $versiontrans .= img_warning($langs->trans("Experimental"), 'style="float: left"');
-		if (preg_match('/deprecated/i', $version))   $versiontrans .= img_warning($langs->trans("Deprecated"), 'style="float: left"');
+		if (preg_match('/development/i', $version)) {
+			$versiontrans .= img_warning($langs->trans("Development"), '', 'floatleft paddingright');
+		}
+		if (preg_match('/experimental/i', $version)) {
+			$versiontrans .= img_warning($langs->trans("Experimental"), '', 'floatleft paddingright');
+		}
+		if (preg_match('/deprecated/i', $version)) {
+			$versiontrans .= img_warning($langs->trans("Deprecated"), '', 'floatleft paddingright');
+		}
 		if ($objMod->isCoreOrExternalModule() == 'external' || preg_match('/development|experimental|deprecated/i', $version)) {
 			$versiontrans .= $objMod->getVersion(1);
 		}
 
 		// Define imginfo
 		$imginfo = "info";
-		if ($objMod->isCoreOrExternalModule() == 'external')
-		{
+		if ($objMod->isCoreOrExternalModule() == 'external') {
 			$imginfo = "info_black";
 		}
 
@@ -680,61 +719,63 @@ if ($mode == 'common' || $mode == 'commonkanban')
 		$codetoconfig = '';
 
 		// Activate/Disable and Setup (2 columns)
-		if (!empty($conf->global->$const_name))	// If module is already activated
-		{
+		if (!empty($conf->global->$const_name)) {	// If module is already activated
 			// Set $codeenabledisable
 			$disableSetup = 0;
-			if (!empty($arrayofwarnings[$modName]))
-			{
+			if (!empty($arrayofwarnings[$modName])) {
 				$codeenabledisable .= '<!-- This module has a warning to show when we activate it (note: your country is '.$mysoc->country_code.') -->'."\n";
 			}
-			if (!empty($objMod->disabled))
-			{
+			if (!empty($objMod->disabled)) {
 				$codeenabledisable .= $langs->trans("Disabled");
-			} elseif (!empty($objMod->always_enabled) || ((!empty($conf->multicompany->enabled) && $objMod->core_enabled) && ($user->entity || $conf->entity != 1)))
-			{
-				if (method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) $codeenabledisable .= $langs->trans("Used");
-				else {
+			} elseif (!empty($objMod->always_enabled) || ((!empty($conf->multicompany->enabled) && $objMod->core_enabled) && ($user->entity || $conf->entity != 1))) {
+				if (method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) {
+					$codeenabledisable .= $langs->trans("Used");
+				} else {
 					$codeenabledisable .= img_picto($langs->trans("Required"), 'switch_on', '', false, 0, 0, '', 'opacitymedium valignmiddle');
 					//print $langs->trans("Required");
 				}
-				if (!empty($conf->multicompany->enabled) && $user->entity) $disableSetup++;
+				if (!empty($conf->multicompany->enabled) && $user->entity) {
+					$disableSetup++;
+				}
 			} else {
 				if (!empty($objMod->warnings_unactivation[$mysoc->country_code]) && method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) {
-					$codeenabledisable .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=reset_confirm&amp;confirm_message_code='.$objMod->warnings_unactivation[$mysoc->country_code].'&amp;value='.$modName.'&amp;mode='.$mode.$param.'">';
+					$codeenabledisable .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;token='.newToken().'&amp;module_position='.$module_position.'&amp;action=reset_confirm&amp;confirm_message_code='.$objMod->warnings_unactivation[$mysoc->country_code].'&amp;value='.$modName.'&amp;mode='.$mode.$param.'">';
 					$codeenabledisable .= img_picto($langs->trans("Activated"), 'switch_on');
 					$codeenabledisable .= '</a>';
 				} else {
-					$codeenabledisable .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=reset&amp;value='.$modName.'&amp;mode='.$mode.'&amp;confirm=yes'.$param.'">';
+					$codeenabledisable .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;token='.newToken().'&amp;module_position='.$module_position.'&amp;action=reset&amp;value='.$modName.'&amp;mode='.$mode.'&amp;confirm=yes'.$param.'">';
 					$codeenabledisable .= img_picto($langs->trans("Activated"), 'switch_on');
 					$codeenabledisable .= '</a>';
 				}
 			}
 
 			// Set $codetoconfig
-			if (!empty($objMod->config_page_url) && !$disableSetup)
-			{
+			if (!empty($objMod->config_page_url) && !$disableSetup) {
 				$backtourlparam = '';
-				if ($search_keyword != '') $backtourlparam .= ($backtourlparam ? '&' : '?').'search_keyword='.$search_keyword; // No urlencode here, done later
-				if ($search_nature > -1)   $backtourlparam .= ($backtourlparam ? '&' : '?').'search_nature='.$search_nature;
-				if ($search_version > -1)  $backtourlparam .= ($backtourlparam ? '&' : '?').'search_version='.$search_version;
-				if ($search_status > -1)   $backtourlparam .= ($backtourlparam ? '&' : '?').'search_status='.$search_status;
+				if ($search_keyword != '') {
+					$backtourlparam .= ($backtourlparam ? '&' : '?').'search_keyword='.$search_keyword; // No urlencode here, done later
+				}
+				if ($search_nature > -1) {
+					$backtourlparam .= ($backtourlparam ? '&' : '?').'search_nature='.$search_nature;
+				}
+				if ($search_version > -1) {
+					$backtourlparam .= ($backtourlparam ? '&' : '?').'search_version='.$search_version;
+				}
+				if ($search_status > -1) {
+					$backtourlparam .= ($backtourlparam ? '&' : '?').'search_status='.$search_status;
+				}
 				$backtourl = $_SERVER["PHP_SELF"].$backtourlparam;
 
 				$regs = array();
-				if (is_array($objMod->config_page_url))
-				{
+				if (is_array($objMod->config_page_url)) {
 					$i = 0;
-					foreach ($objMod->config_page_url as $page)
-					{
+					foreach ($objMod->config_page_url as $page) {
 						$urlpage = $page;
-						if ($i++)
-						{
+						if ($i++) {
 							$codetoconfig .= '<a href="'.$urlpage.'" title="'.$langs->trans($page).'">'.img_picto(ucfirst($page), "setup").'</a>';
 							//    print '<a href="'.$page.'">'.ucfirst($page).'</a>&nbsp;';
 						} else {
-							if (preg_match('/^([^@]+)@([^@]+)$/i', $urlpage, $regs))
-							{
+							if (preg_match('/^([^@]+)@([^@]+)$/i', $urlpage, $regs)) {
 								$urltouse = dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1);
 								$codetoconfig .= '<a href="'.$urltouse.(preg_match('/\?/', $urltouse) ? '&' : '?').'save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
 							} else {
@@ -743,8 +784,7 @@ if ($mode == 'common' || $mode == 'commonkanban')
 							}
 						}
 					}
-				} elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs))
-				{
+				} elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs)) {
 					$codetoconfig .= '<a class="valignmiddle" href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1).'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
 				} else {
 					$codetoconfig .= '<a class="valignmiddle" href="'.$objMod->config_page_url.'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
@@ -755,42 +795,36 @@ if ($mode == 'common' || $mode == 'commonkanban')
 		} else // Module not yet activated
 		{
 			// Set $codeenabledisable
-			if (!empty($objMod->always_enabled))
-			{
+			if (!empty($objMod->always_enabled)) {
 				// Should never happened
-			} elseif (!empty($objMod->disabled))
-			{
+			} elseif (!empty($objMod->disabled)) {
 				$codeenabledisable .= $langs->trans("Disabled");
 			} else {
 				// Module qualified for activation
 				$warningmessage = '';
-				if (!empty($arrayofwarnings[$modName]))
-				{
+				if (!empty($arrayofwarnings[$modName])) {
 					$codeenabledisable .= '<!-- This module is a core module and it may have a warning to show when we activate it (note: your country is '.$mysoc->country_code.') -->'."\n";
-					foreach ($arrayofwarnings[$modName] as $keycountry => $cursorwarningmessage)
-					{
-						if (preg_match('/^always/', $keycountry) || ($mysoc->country_code && preg_match('/^'.$mysoc->country_code.'/', $keycountry)))
-						{
+					foreach ($arrayofwarnings[$modName] as $keycountry => $cursorwarningmessage) {
+						if (preg_match('/^always/', $keycountry) || ($mysoc->country_code && preg_match('/^'.$mysoc->country_code.'/', $keycountry))) {
 							$warningmessage .= ($warningmessage ? "\n" : "").$langs->trans($cursorwarningmessage, $objMod->getName(), $mysoc->country_code);
 						}
 					}
 				}
-				if ($objMod->isCoreOrExternalModule() == 'external' && !empty($arrayofwarningsext))
-				{
+				if ($objMod->isCoreOrExternalModule() == 'external' && !empty($arrayofwarningsext)) {
 					$codeenabledisable .= '<!-- This module is an external module and it may have a warning to show (note: your country is '.$mysoc->country_code.') -->'."\n";
-					foreach ($arrayofwarningsext as $keymodule => $arrayofwarningsextbycountry)
-					{
+					foreach ($arrayofwarningsext as $keymodule => $arrayofwarningsextbycountry) {
 						$keymodulelowercase = strtolower(preg_replace('/^mod/', '', $keymodule));
-						if (in_array($keymodulelowercase, $conf->modules))    // If module that request warning is on
-						{
-							foreach ($arrayofwarningsextbycountry as $keycountry => $cursorwarningmessage)
-							{
-								if (preg_match('/^always/', $keycountry) || ($mysoc->country_code && preg_match('/^'.$mysoc->country_code.'/', $keycountry)))
-								{
+						if (in_array($keymodulelowercase, $conf->modules)) {    // If module that request warning is on
+							foreach ($arrayofwarningsextbycountry as $keycountry => $cursorwarningmessage) {
+								if (preg_match('/^always/', $keycountry) || ($mysoc->country_code && preg_match('/^'.$mysoc->country_code.'/', $keycountry))) {
 									$warningmessage .= ($warningmessage ? "\n" : "").$langs->trans($cursorwarningmessage, $objMod->getName(), $mysoc->country_code, $modules[$keymodule]->getName());
 									$warningmessage .= ($warningmessage ? "\n" : "").($warningmessage ? "\n" : "").$langs->trans("Module").' : '.$objMod->getName();
-									if (!empty($objMod->editor_name)) $warningmessage .= ($warningmessage ? "\n" : "").$langs->trans("Publisher").' : '.$objMod->editor_name;
-									if (!empty($objMod->editor_name)) $warningmessage .= ($warningmessage ? "\n" : "").$langs->trans("ModuleTriggeringThisWarning").' : '.$modules[$keymodule]->getName();
+									if (!empty($objMod->editor_name)) {
+										$warningmessage .= ($warningmessage ? "\n" : "").$langs->trans("Publisher").' : '.$objMod->editor_name;
+									}
+									if (!empty($objMod->editor_name)) {
+										$warningmessage .= ($warningmessage ? "\n" : "").$langs->trans("ModuleTriggeringThisWarning").' : '.$modules[$keymodule]->getName();
+									}
 								}
 							}
 						}
@@ -798,7 +832,9 @@ if ($mode == 'common' || $mode == 'commonkanban')
 				}
 				$codeenabledisable .= '<!-- Message to show: '.$warningmessage.' -->'."\n";
 				$codeenabledisable .= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;token='.newToken().'&amp;module_position='.$module_position.'&amp;action=set&amp;value='.$modName.'&amp;mode='.$mode.$param.'"';
-				if ($warningmessage) $codeenabledisable .= ' onclick="return confirm(\''.dol_escape_js($warningmessage).'\');"';
+				if ($warningmessage) {
+					$codeenabledisable .= ' onclick="return confirm(\''.dol_escape_js($warningmessage).'\');"';
+				}
 				$codeenabledisable .= '>';
 				$codeenabledisable .= img_picto($langs->trans("Disabled"), 'switch_off');
 				$codeenabledisable .= "</a>\n";
@@ -813,17 +849,21 @@ if ($mode == 'common' || $mode == 'commonkanban')
 			print $objMod->getKanbanView($codeenabledisable, $codetoconfig);
 		} else {
 			print '<tr class="oddeven">'."\n";
-			if (!empty($conf->global->MAIN_MODULES_SHOW_LINENUMBERS)) print '<td width="20px">'.$linenum.'</td>';
+			if (!empty($conf->global->MAIN_MODULES_SHOW_LINENUMBERS)) {
+				print '<td width="20px">'.$linenum.'</td>';
+			}
 
 			// Picto + Name of module
 			print '  <td width="200px">';
 			$alttext = '';
 			//if (is_array($objMod->need_dolibarr_version)) $alttext.=($alttext?' - ':'').'Dolibarr >= '.join('.',$objMod->need_dolibarr_version);
 			//if (is_array($objMod->phpmin)) $alttext.=($alttext?' - ':'').'PHP >= '.join('.',$objMod->phpmin);
-			if (!empty($objMod->picto))
-			{
-				if (preg_match('/^\//i', $objMod->picto)) print img_picto($alttext, $objMod->picto, 'class="valignmiddle pictomodule paddingrightonly"', 1);
-				else print img_object($alttext, $objMod->picto, 'class="valignmiddle pictomodule paddingrightonly"');
+			if (!empty($objMod->picto)) {
+				if (preg_match('/^\//i', $objMod->picto)) {
+					print img_picto($alttext, $objMod->picto, 'class="valignmiddle pictomodule paddingrightonly"', 1);
+				} else {
+					print img_object($alttext, $objMod->picto, 'class="valignmiddle pictomodule paddingrightonly"');
+				}
 			} else {
 				print img_object($alttext, 'generic', 'class="valignmiddle paddingrightonly"');
 			}
@@ -871,8 +911,7 @@ if ($mode == 'common' || $mode == 'commonkanban')
 		}
 	}
 
-	if ($oldfamily)
-	{
+	if ($oldfamily) {
 		if ($mode == 'commonkanban') {
 			print '</div>';
 		} else {
@@ -881,7 +920,7 @@ if ($mode == 'common' || $mode == 'commonkanban')
 		}
 	}
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<br>';
 
@@ -891,9 +930,8 @@ if ($mode == 'common' || $mode == 'commonkanban')
 	print '</form>';
 }
 
-if ($mode == 'marketplace')
-{
-	dol_fiche_head($head, $mode, '', -1);
+if ($mode == 'marketplace') {
+	print dol_get_fiche_head($head, $mode, '', -1);
 
 	// Marketplace
 	print '<div class="div-table-responsive-no-min">';
@@ -914,12 +952,11 @@ if ($mode == 'marketplace')
 	print "</table>\n";
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<br>';
 
-	if (empty($conf->global->MAIN_DISABLE_DOLISTORE_SEARCH) && $conf->global->MAIN_FEATURES_LEVEL >= 1)
-	{
+	if (empty($conf->global->MAIN_DISABLE_DOLISTORE_SEARCH) && $conf->global->MAIN_FEATURES_LEVEL >= 1) {
 		// $options is array with filter criterias
 		//var_dump($options);
 		$dolistore->getRemoteCategories();
@@ -935,17 +972,17 @@ if ($mode == 'marketplace')
 		print '<form method="POST" class="centpercent" id="searchFormList" action="'.$dolistore->url.'">';
 		?>
 					<input type="hidden" name="token" value="<?php echo newToken(); ?>">
-	            	<input type="hidden" name="mode" value="marketplace">
-	                <div class="divsearchfield"><?php echo $langs->trans('Keyword') ?>:
-	                    <input name="search_keyword" placeholder="<?php echo $langs->trans('Chercher un module') ?>" id="search_keyword" type="text" size="50" value="<?php echo $options['search'] ?>"><br>
-	                </div>
-	                <div class="divsearchfield">
-	                    <input class="button buttongen" value="<?php echo $langs->trans('Rechercher') ?>" type="submit">
-	                    <a class="buttonreset" href="<?php echo $dolistore->url ?>"><?php echo $langs->trans('Reset') ?></a>
-
-	                    &nbsp;
+					<input type="hidden" name="mode" value="marketplace">
+					<div class="divsearchfield"><?php echo $langs->trans('Keyword') ?>:
+						<input name="search_keyword" placeholder="<?php echo $langs->trans('Chercher un module') ?>" id="search_keyword" type="text" size="50" value="<?php echo $options['search'] ?>"><br>
 					</div>
-	    <?php
+					<div class="divsearchfield">
+						<input class="button buttongen" value="<?php echo $langs->trans('Rechercher') ?>" type="submit">
+						<a class="buttonreset" href="<?php echo $dolistore->url ?>"><?php echo $langs->trans('Reset') ?></a>
+
+						&nbsp;
+					</div>
+		<?php
 		print $previouslink;
 		print $nextlink;
 		print '</form>';
@@ -956,48 +993,45 @@ if ($mode == 'marketplace')
 
 		?>
 
-	        <div id="category-tree-left">
-	            <ul class="tree">
-	                <?php echo $dolistore->get_categories(); ?>
-	            </ul>
-	        </div>
-	        <div id="listing-content">
-	            <table summary="list_of_modules" id="list_of_modules" class="productlist centpercent">
-	                <tbody id="listOfModules">
-	                    <?php echo $dolistore->get_products($categorie); ?>
-	                </tbody>
-	            </table>
-	        </div>
+			<div id="category-tree-left">
+				<ul class="tree">
+					<?php echo $dolistore->get_categories(); ?>
+				</ul>
+			</div>
+			<div id="listing-content">
+				<table summary="list_of_modules" id="list_of_modules" class="productlist centpercent">
+					<tbody id="listOfModules">
+						<?php echo $dolistore->get_products($categorie); ?>
+					</tbody>
+				</table>
+			</div>
 
-	    <?php
+		<?php
 	}
 }
 
 
 // Install external module
 
-if ($mode == 'deploy')
-{
-	dol_fiche_head($head, $mode, '', -1);
+if ($mode == 'deploy') {
+	print dol_get_fiche_head($head, $mode, '', -1);
 
 	$dolibarrdataroot = preg_replace('/([\\/]+)$/i', '', DOL_DATA_ROOT);
 	$allowonlineinstall = true;
 	$allowfromweb = 1;
-	if (dol_is_file($dolibarrdataroot.'/installmodules.lock')) $allowonlineinstall = false;
+	if (dol_is_file($dolibarrdataroot.'/installmodules.lock')) {
+		$allowonlineinstall = false;
+	}
 
 	$fullurl = '<a href="'.$urldolibarrmodules.'" target="_blank">'.$urldolibarrmodules.'</a>';
 	$message = '';
-	if (!empty($allowonlineinstall))
-	{
-		if (!in_array('/custom', explode(',', $dolibarr_main_url_root_alt)))
-		{
+	if (!empty($allowonlineinstall)) {
+		if (!in_array('/custom', explode(',', $dolibarr_main_url_root_alt))) {
 			$message = info_admin($langs->trans("ConfFileMustContainCustom", DOL_DOCUMENT_ROOT.'/custom', DOL_DOCUMENT_ROOT));
 			$allowfromweb = -1;
 		} else {
-			if ($dirins_ok)
-			{
-				if (!is_writable(dol_osencode($dirins)))
-				{
+			if ($dirins_ok) {
+				if (!is_writable(dol_osencode($dirins))) {
 					$langs->load("errors");
 					$message = info_admin($langs->trans("ErrorFailedToWriteInDir", $dirins), 0, 0, '1', 'warning');
 					$allowfromweb = 0;
@@ -1012,8 +1046,7 @@ if ($mode == 'deploy')
 		$allowfromweb = 0;
 	}
 
-	if ($allowfromweb < 1)
-	{
+	if ($allowfromweb < 1) {
 		print $langs->trans("SomethingMakeInstallFromWebNotPossible");
 		print $message;
 		//print $langs->trans("SomethingMakeInstallFromWebNotPossible2");
@@ -1022,10 +1055,8 @@ if ($mode == 'deploy')
 
 	print '<br>';
 
-	if ($allowfromweb >= 0)
-	{
-		if ($allowfromweb == 1)
-		{
+	if ($allowfromweb >= 0) {
+		if ($allowfromweb == 1) {
 			//print $langs->trans("ThisIsProcessToFollow").'<br>';
 		} else {
 			print $langs->trans("ThisIsAlternativeProcessToFollow").'<br>';
@@ -1036,8 +1067,7 @@ if ($mode == 'deploy')
 			print '<b>'.$langs->trans("StepNb", 3).'</b>: ';
 		}
 
-		if ($allowfromweb == 1)
-		{
+		if ($allowfromweb == 1) {
 			print $langs->trans("UnpackPackageInModulesRoot", $dirins).'<br>';
 
 			print '<br>';
@@ -1051,36 +1081,48 @@ if ($mode == 'deploy')
 
 			$max = $conf->global->MAIN_UPLOAD_DOC; // In Kb
 			$maxphp = @ini_get('upload_max_filesize'); // In unknown
-			if (preg_match('/k$/i', $maxphp)) $maxphp = $maxphp * 1;
-			if (preg_match('/m$/i', $maxphp)) $maxphp = $maxphp * 1024;
-			if (preg_match('/g$/i', $maxphp)) $maxphp = $maxphp * 1024 * 1024;
-			if (preg_match('/t$/i', $maxphp)) $maxphp = $maxphp * 1024 * 1024 * 1024;
+			if (preg_match('/k$/i', $maxphp)) {
+				$maxphp = $maxphp * 1;
+			}
+			if (preg_match('/m$/i', $maxphp)) {
+				$maxphp = $maxphp * 1024;
+			}
+			if (preg_match('/g$/i', $maxphp)) {
+				$maxphp = $maxphp * 1024 * 1024;
+			}
+			if (preg_match('/t$/i', $maxphp)) {
+				$maxphp = $maxphp * 1024 * 1024 * 1024;
+			}
 			$maxphp2 = @ini_get('post_max_size'); // In unknown
-			if (preg_match('/k$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1;
-			if (preg_match('/m$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1024;
-			if (preg_match('/g$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1024 * 1024;
-			if (preg_match('/t$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1024 * 1024 * 1024;
+			if (preg_match('/k$/i', $maxphp2)) {
+				$maxphp2 = $maxphp2 * 1;
+			}
+			if (preg_match('/m$/i', $maxphp2)) {
+				$maxphp2 = $maxphp2 * 1024;
+			}
+			if (preg_match('/g$/i', $maxphp2)) {
+				$maxphp2 = $maxphp2 * 1024 * 1024;
+			}
+			if (preg_match('/t$/i', $maxphp2)) {
+				$maxphp2 = $maxphp2 * 1024 * 1024 * 1024;
+			}
 			// Now $max and $maxphp and $maxphp2 are in Kb
 			$maxmin = $max;
 			$maxphptoshow = $maxphptoshowparam = '';
-			if ($maxphp > 0)
-			{
+			if ($maxphp > 0) {
 				$maxmin = min($max, $maxphp);
 				$maxphptoshow = $maxphp;
 				$maxphptoshowparam = 'upload_max_filesize';
 			}
-			if ($maxphp2 > 0)
-			{
+			if ($maxphp2 > 0) {
 				$maxmin = min($max, $maxphp2);
-				if ($maxphp2 < $maxphp)
-				{
+				if ($maxphp2 < $maxphp) {
 					$maxphptoshow = $maxphp2;
 					$maxphptoshowparam = 'post_max_size';
 				}
 			}
 
-			if ($maxmin > 0)
-			{
+			if ($maxmin > 0) {
 				print '<script type="text/javascript">
 				$(document).ready(function() {
 					jQuery("#fileinstall").on("change", function() {
@@ -1099,10 +1141,8 @@ if ($mode == 'deploy')
 
 			print '<input type="submit" name="send" value="'.dol_escape_htmltag($langs->trans("Send")).'" class="button">';
 
-			if (!empty($conf->global->MAIN_UPLOAD_DOC))
-			{
-				if ($user->admin)
-				{
+			if (!empty($conf->global->MAIN_UPLOAD_DOC)) {
+				if ($user->admin) {
 					$langs->load('other');
 					print ' ';
 					print info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphptoshow, $maxphptoshowparam), 1);
@@ -1124,22 +1164,19 @@ if ($mode == 'deploy')
 		}
 	}
 
-	if (!empty($result['return']))
-	{
+	if (!empty($result['return'])) {
 		print '<br>';
 
-		foreach ($result['return'] as $value)
-		{
+		foreach ($result['return'] as $value) {
 			echo $value.'<br>';
 		}
 	}
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
-if ($mode == 'develop')
-{
-	dol_fiche_head($head, $mode, '', -1);
+if ($mode == 'develop') {
+	print dol_get_fiche_head($head, $mode, '', -1);
 
 	// Marketplace
 	print "<table summary=\"list_of_modules\" class=\"noborder\" width=\"100%\">\n";
@@ -1151,8 +1188,6 @@ if ($mode == 'develop')
 
 	print '<tr class="oddeven" height="80">'."\n";
 	print '<td class="left">';
-	//span class="fa fa-bug"></span>
-	//print '<img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner.png">';
 	print '<div class="imgmaxheight50 logo_setup"></div>';
 	print '</td>';
 	print '<td>'.$langs->trans("TryToUseTheModuleBuilder", $langs->transnoentitiesnoconv("ModuleBuilder")).'</td>';
@@ -1170,7 +1205,7 @@ if ($mode == 'develop')
 
 	print "</table>\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php
index 863633176bd..af6210eee1f 100644
--- a/htdocs/admin/mrp.php
+++ b/htdocs/admin/mrp.php
@@ -182,7 +182,7 @@ print load_fiche_titre($langs->trans("MrpSetupPage"), $linkback, 'title_setup');
 
 $head = mrpAdminPrepareHead();
 
-dol_fiche_head($head, 'settings', $langs->trans("MOs"), -1, 'mrp');
+print dol_get_fiche_head($head, 'settings', $langs->trans("MOs"), -1, 'mrp');
 
 /*
  * MOs Numbering model
@@ -233,8 +233,10 @@ foreach ($dirmodels as $reldir)
 						// Show example of numbering model
 						print '<td class="nowrap">';
 						$tmp = $module->getExample();
-						if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-						elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						if (preg_match('/^Error/', $tmp)) {
+							$langs->load("errors");
+							print '<div class="error">'.$langs->trans($tmp).'</div>';
+						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
 						else print $tmp;
 						print '</td>'."\n";
 
@@ -413,7 +415,7 @@ foreach ($dirmodels as $reldir)
 								print '<td class="center">';
 								if ($module->type == 'pdf')
 								{
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
diff --git a/htdocs/admin/mrp_extrafields.php b/htdocs/admin/mrp_extrafields.php
index b0bd0e522ab..2a48713869c 100644
--- a/htdocs/admin/mrp_extrafields.php
+++ b/htdocs/admin/mrp_extrafields.php
@@ -70,19 +70,19 @@ print load_fiche_titre($langs->trans("MrpSetupPage"), $linkback, 'title_setup');
 
 $head = mrpAdminPrepareHead();
 
-dol_fiche_head($head, 'mrp_extrafields', $langs->trans("ExtraFields"), -1, 'account');
+print dol_get_fiche_head($head, 'mrp_extrafields', $langs->trans("ExtraFields"), -1, 'account');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -92,9 +92,9 @@ if ($action != 'create' && $action != 'edit')
 if ($action == 'create')
 {
 	print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /*
@@ -102,10 +102,10 @@ if ($action == 'create')
  */
 if ($action == 'edit' && !empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index a447551b04e..962adae93aa 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -34,7 +34,7 @@ $langs->loadLangs(array('admin', 'multicurrency'));
 
 // Access control
 if (!$user->admin) {
-    accessforbidden();
+	accessforbidden();
 }
 
 // Parameters
@@ -52,9 +52,9 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 	$value = GETPOST($code, 'alpha');
 	if (dolibarr_set_const($db, $code, $value, 'chaine', 0, '', $conf->entity) > 0)
 	{
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
+		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
 
@@ -63,9 +63,9 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 	$code = $reg[1];
 	if (dolibarr_del_const($db, $code, 0) > 0)
 	{
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
+		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
 
@@ -132,17 +132,17 @@ if ($action == 'add_currency')
 	}
 } elseif ($action == 'setapilayer')
 {
-    if (GETPOSTISSET('modify_apilayer'))
-    {
-        dolibarr_set_const($db, 'MULTICURRENCY_APP_ID', GETPOST('MULTICURRENCY_APP_ID', 'alpha'));
-        dolibarr_set_const($db, 'MULTICURRENCY_APP_SOURCE', GETPOST('MULTICURRENCY_APP_SOURCE', 'alpha'));
-        //dolibarr_set_const($db, 'MULTICURRENCY_ALTERNATE_SOURCE', GETPOST('MULTICURRENCY_ALTERNATE_SOURCE', 'alpha'));
-    } else {
-        $result = MultiCurrency::syncRates($conf->global->MULTICURRENCY_APP_ID);
-        if ($result > 0) {
-        	setEventMessages($langs->trans("CurrencyRateSyncSucceed"), null, "mesgs");
-        }
-    }
+	if (GETPOSTISSET('modify_apilayer'))
+	{
+		dolibarr_set_const($db, 'MULTICURRENCY_APP_ID', GETPOST('MULTICURRENCY_APP_ID', 'alpha'));
+		dolibarr_set_const($db, 'MULTICURRENCY_APP_SOURCE', GETPOST('MULTICURRENCY_APP_SOURCE', 'alpha'));
+		//dolibarr_set_const($db, 'MULTICURRENCY_ALTERNATE_SOURCE', GETPOST('MULTICURRENCY_ALTERNATE_SOURCE', 'alpha'));
+	} else {
+		$result = MultiCurrency::syncRates($conf->global->MULTICURRENCY_APP_ID);
+		if ($result > 0) {
+			setEventMessages($langs->trans("CurrencyRateSyncSucceed"), null, "mesgs");
+		}
+	}
 }
 
 
@@ -176,7 +176,7 @@ print load_fiche_titre($langs->trans($page_name), $linkback);
 
 // Configuration header
 $head = multicurrencyAdminPrepareHead();
-dol_fiche_head($head, 'settings', $langs->trans("ModuleSetup"), -1, "multicurrency");
+print dol_get_fiche_head($head, 'settings', $langs->trans("ModuleSetup"), -1, "multicurrency");
 
 
 print '<table class="noborder centpercent">';
@@ -189,10 +189,10 @@ print '<tr class="oddeven">';
 print '<td>'.$langs->transnoentitiesnoconv("MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE").'</td>';
 print '<td class="center">';
 if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE');
+	print ajax_constantonoff('MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE');
 } else {
-    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE", $arrval, $conf->global->MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE);
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $form->selectarray("MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE", $arrval, $conf->global->MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE);
 }
 print '</td></tr>';
 
@@ -201,26 +201,26 @@ print '<tr class="oddeven">';
 print '<td>'.$langs->transnoentitiesnoconv("multicurrency_useOriginTx").'</td>';
 print '<td class="center">';
 if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('MULTICURRENCY_USE_ORIGIN_TX');
+	print ajax_constantonoff('MULTICURRENCY_USE_ORIGIN_TX');
 } else {
-    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("MULTICURRENCY_USE_ORIGIN_TX", $arrval, $conf->global->MULTICURRENCY_USE_ORIGIN_TX);
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $form->selectarray("MULTICURRENCY_USE_ORIGIN_TX", $arrval, $conf->global->MULTICURRENCY_USE_ORIGIN_TX);
 }
 print '</td></tr>';
 
 // Online payment with currency on document. This option should be on by default.
 if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 {
-    print '<tr class="oddeven">';
-    print '<td>'.$langs->transnoentitiesnoconv("MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT").'</td>';
-    print '<td class="center">';
-    if ($conf->use_javascript_ajax) {
-        print ajax_constantonoff('MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT');
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT", $arrval, $conf->global->MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT);
-    }
-    print '</td></tr>';
+	print '<tr class="oddeven">';
+	print '<td>'.$langs->transnoentitiesnoconv("MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT").'</td>';
+	print '<td class="center">';
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT", $arrval, $conf->global->MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT);
+	}
+	print '</td></tr>';
 }
 
 /* TODO uncomment when the functionality will integrated
@@ -258,9 +258,9 @@ print '<br>';
 
 if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION))
 {
-    print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" id="form_sync">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="setapilayer">';
+	print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" id="form_sync">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="setapilayer">';
 
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index b484e7acea9..bb13aa9d37a 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -61,8 +61,8 @@ if ($action == 'settemplates')
 			$triggername = $reg[1];
 			$constvalue = GETPOST($key, 'alpha');
 			$consttype = 'emailtemplate:xxx';
-			$tmparray=explode(':', $constvalue);
-			if (! empty($tmparray[0]) && ! empty($tmparray[1])) {
+			$tmparray = explode(':', $constvalue);
+			if (!empty($tmparray[0]) && !empty($tmparray[1])) {
 				$constvalue = $tmparray[0];
 				$consttype = 'emailtemplate:'.$tmparray[1];
 				//var_dump($constvalue);
@@ -96,19 +96,19 @@ if ($action == 'setvalue' && $user->admin)
 	$db->begin();
 
 	$result = dolibarr_set_const($db, "NOTIFICATION_EMAIL_FROM", GETPOST("email_from", "restricthtml"), 'chaine', 0, '', $conf->entity);
-    if ($result < 0) $error++;
+	if ($result < 0) $error++;
 
 
-    if (!$error)
-    {
-    	$db->commit();
+	if (!$error)
+	{
+		$db->commit();
 
-    	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-    	$db->rollback();
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		$db->rollback();
 
-    	setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 
@@ -116,50 +116,50 @@ if ($action == 'setfixednotif' && $user->admin)
 {
 	$db->begin();
 
-    if (!$error && is_array($_POST))
-    {
-    	$reg = array();
-	    foreach ($_POST as $key => $val)
-	    {
-	    	if (!preg_match('/^NOTIF_(.*)_key$/', $key, $reg)) continue;
+	if (!$error && is_array($_POST))
+	{
+		$reg = array();
+		foreach ($_POST as $key => $val)
+		{
+			if (!preg_match('/^NOTIF_(.*)_key$/', $key, $reg)) continue;
 
-	    	$newval = '';
-	    	$newkey = '';
+			$newval = '';
+			$newkey = '';
 
-	    	$shortkey = preg_replace('/_key$/', '', $key);
-    		//print $shortkey.'<br>';
+			$shortkey = preg_replace('/_key$/', '', $key);
+			//print $shortkey.'<br>';
 
-	    	if (preg_match('/^NOTIF_(.*)_old_(.*)_key/', $key, $reg))
-	    	{
+			if (preg_match('/^NOTIF_(.*)_old_(.*)_key/', $key, $reg))
+			{
 				dolibarr_del_const($db, 'NOTIFICATION_FIXEDEMAIL_'.$reg[1].'_THRESHOLD_HIGHER_'.$reg[2], $conf->entity);
 
 				$newkey = 'NOTIFICATION_FIXEDEMAIL_'.$reg[1].'_THRESHOLD_HIGHER_'.((int) GETPOST($shortkey.'_amount'));
 				$newval = GETPOST($shortkey.'_key');
 				//print $newkey.' - '.$newval.'<br>';
-	    	} elseif (preg_match('/^NOTIF_(.*)_new_key/', $key, $reg))
-	    	{
-	    		// Add a new entry
-	    		$newkey = 'NOTIFICATION_FIXEDEMAIL_'.$reg[1].'_THRESHOLD_HIGHER_'.((int) GETPOST($shortkey.'_amount'));
-	    		$newval = GETPOST($shortkey.'_key');
-	    	}
+			} elseif (preg_match('/^NOTIF_(.*)_new_key/', $key, $reg))
+			{
+				// Add a new entry
+				$newkey = 'NOTIFICATION_FIXEDEMAIL_'.$reg[1].'_THRESHOLD_HIGHER_'.((int) GETPOST($shortkey.'_amount'));
+				$newval = GETPOST($shortkey.'_key');
+			}
 
-	    	if ($newkey && $newval)
-	    	{
+			if ($newkey && $newval)
+			{
 				$result = dolibarr_set_const($db, $newkey, $newval, 'chaine', 0, '', $conf->entity);
-	    	}
-	    }
-    }
+			}
+		}
+	}
 
   	if (!$error)
-    {
-    	$db->commit();
+	{
+		$db->commit();
 
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
 		$db->rollback();
 
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 
@@ -203,7 +203,7 @@ print '</td>';
 print '</tr>';
 print '</table>';
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
+print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
 
 print '</form>';
 
@@ -292,7 +292,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 	print '</table>';
 }
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
+print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
 
 print '</form>';
 
@@ -318,66 +318,66 @@ print "</tr>\n";
 
 foreach ($listofnotifiedevents as $notifiedevent)
 {
-    $label = $langs->trans("Notify_".$notifiedevent['code']); //!=$langs->trans("Notify_".$notifiedevent['code'])?$langs->trans("Notify_".$notifiedevent['code']):$notifiedevent['label'];
+	$label = $langs->trans("Notify_".$notifiedevent['code']); //!=$langs->trans("Notify_".$notifiedevent['code'])?$langs->trans("Notify_".$notifiedevent['code']):$notifiedevent['label'];
 
-    $elementLabel = $langs->trans(ucfirst($notifiedevent['elementtype']));
+	$elementLabel = $langs->trans(ucfirst($notifiedevent['elementtype']));
 	// Special cases
-    if ($notifiedevent['elementtype'] == 'order_supplier') $elementLabel = $langs->trans('SupplierOrder');
-    elseif ($notifiedevent['elementtype'] == 'propal') $elementLabel = $langs->trans('Proposal');
-    elseif ($notifiedevent['elementtype'] == 'facture') $elementLabel = $langs->trans('Bill');
-    elseif ($notifiedevent['elementtype'] == 'commande') $elementLabel = $langs->trans('Order');
+	if ($notifiedevent['elementtype'] == 'order_supplier') $elementLabel = $langs->trans('SupplierOrder');
+	elseif ($notifiedevent['elementtype'] == 'propal') $elementLabel = $langs->trans('Proposal');
+	elseif ($notifiedevent['elementtype'] == 'facture') $elementLabel = $langs->trans('Bill');
+	elseif ($notifiedevent['elementtype'] == 'commande') $elementLabel = $langs->trans('Order');
 	elseif ($notifiedevent['elementtype'] == 'ficheinter') $elementLabel = $langs->trans('Intervention');
 	elseif ($notifiedevent['elementtype'] == 'shipping') $elementLabel = $langs->trans('Shipping');
 	elseif ($notifiedevent['elementtype'] == 'expensereport') $elementLabel = $langs->trans('ExpenseReport');
 
-    print '<tr class="oddeven">';
-    print '<td>'.$elementLabel.'</td>';
-    print '<td>'.$notifiedevent['code'].'</td>';
-    print '<td>'.$label.'</td>';
-    print '<td>';
-    // Notification with threshold
-    foreach ($conf->global as $key => $val)
-    {
+	print '<tr class="oddeven">';
+	print '<td>'.$elementLabel.'</td>';
+	print '<td>'.$notifiedevent['code'].'</td>';
+	print '<td>'.$label.'</td>';
+	print '<td>';
+	// Notification with threshold
+	foreach ($conf->global as $key => $val)
+	{
 		if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifiedevent['code'].'_THRESHOLD_HIGHER_(.*)/', $key, $reg)) continue;
 
-	    $param = 'NOTIFICATION_FIXEDEMAIL_'.$notifiedevent['code'].'_THRESHOLD_HIGHER_'.$reg[1];
-    	$value = GETPOST('NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_key') ?GETPOST('NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_key', 'alpha') : $conf->global->$param;
+		$param = 'NOTIFICATION_FIXEDEMAIL_'.$notifiedevent['code'].'_THRESHOLD_HIGHER_'.$reg[1];
+		$value = GETPOST('NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_key') ?GETPOST('NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_key', 'alpha') : $conf->global->$param;
 
-    	$s = '<input type="text" size="32" name="NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_key" value="'.dol_escape_htmltag($value).'">'; // Do not use type="email" here, we must be able to enter a list of email with , separator.
-	    $arrayemail = explode(',', $value);
+		$s = '<input type="text" size="32" name="NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_key" value="'.dol_escape_htmltag($value).'">'; // Do not use type="email" here, we must be able to enter a list of email with , separator.
+		$arrayemail = explode(',', $value);
 		$showwarning = 0;
 		foreach ($arrayemail as $keydet => $valuedet)
 		{
 			$valuedet = trim($valuedet);
 			if (!empty($valuedet) && !isValidEmail($valuedet, 1)) $showwarning++;
 		}
-	    if ((!empty($conf->global->$param)) && $showwarning) $s .= ' '.img_warning($langs->trans("ErrorBadEMail"));
-	    print $form->textwithpicto($s, $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients").'<br>'.$langs->trans("YouCanAlsoUseSupervisorKeyword"), 1, 'help', '', 0, 2);
+		if ((!empty($conf->global->$param)) && $showwarning) $s .= ' '.img_warning($langs->trans("ErrorBadEMail"));
+		print $form->textwithpicto($s, $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients").'<br>'.$langs->trans("YouCanAlsoUseSupervisorKeyword"), 1, 'help', '', 0, 2);
 		print '<br>';
-    }
-    // New entry input fields
-    $s = '<input type="text" size="32" name="NOTIF_'.$notifiedevent['code'].'_new_key" value="">'; // Do not use type="email" here, we must be able to enter a list of email with , separator.
-    print $form->textwithpicto($s, $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients").'<br>'.$langs->trans("YouCanAlsoUseSupervisorKeyword"), 1, 'help', '', 0, 2);
-    print '</td>';
+	}
+	// New entry input fields
+	$s = '<input type="text" size="32" name="NOTIF_'.$notifiedevent['code'].'_new_key" value="">'; // Do not use type="email" here, we must be able to enter a list of email with , separator.
+	print $form->textwithpicto($s, $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients").'<br>'.$langs->trans("YouCanAlsoUseSupervisorKeyword"), 1, 'help', '', 0, 2);
+	print '</td>';
 
-    print '<td>';
-    // Notification with threshold
-    foreach ($conf->global as $key => $val)
-    {
+	print '<td>';
+	// Notification with threshold
+	foreach ($conf->global as $key => $val)
+	{
 		if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifiedevent['code'].'_THRESHOLD_HIGHER_(.*)/', $key, $reg)) continue;
 
-    	print $langs->trans("AmountHT").' >= <input type="text" size="4" name="NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_amount" value="'.dol_escape_htmltag($reg[1]).'">';
+		print $langs->trans("AmountHT").' >= <input type="text" size="4" name="NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_amount" value="'.dol_escape_htmltag($reg[1]).'">';
 		print '<br>';
-    }
-    // New entry input fields
+	}
+	// New entry input fields
 	print $langs->trans("AmountHT").' >= <input type="text" size="4" name="NOTIF_'.$notifiedevent['code'].'_new_amount" value="">';
 	print '</td>';
 
-    print '<td>';
+	print '<td>';
 	// TODO Add link to show message content
 
-    print '</td>';
-    print '</tr>';
+	print '</td>';
+	print '</tr>';
 }
 print '</table>';
 
@@ -389,7 +389,7 @@ print '</div>';
 
 print '<br>';
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
+print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
 
 print '</form>';
 
diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index 8b0e9516abd..a71e09fad56 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -38,7 +38,7 @@ $langs->loadLangs(array('admin', 'oauth'));
 
 // Security check
 if (!$user->admin)
-    accessforbidden();
+	accessforbidden();
 
 $action = GETPOST('action', 'aZ09');
 
@@ -49,23 +49,23 @@ $action = GETPOST('action', 'aZ09');
 
 if ($action == 'update')
 {
-    $error = 0;
+	$error = 0;
 
-    foreach ($list as $constname) {
-        $constvalue = GETPOST($constname[1], 'alpha');
-        if (!dolibarr_set_const($db, $constname[1], $constvalue, 'chaine', 0, '', $conf->entity))
-            $error++;
-        $constvalue = GETPOST($constname[2], 'alpha');
-        if (!dolibarr_set_const($db, $constname[2], $constvalue, 'chaine', 0, '', $conf->entity))
-            $error++;
-    }
+	foreach ($list as $constname) {
+		$constvalue = GETPOST($constname[1], 'alpha');
+		if (!dolibarr_set_const($db, $constname[1], $constvalue, 'chaine', 0, '', $conf->entity))
+			$error++;
+		$constvalue = GETPOST($constname[2], 'alpha');
+		if (!dolibarr_set_const($db, $constname[2], $constvalue, 'chaine', 0, '', $conf->entity))
+			$error++;
+	}
 
-    if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null);
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null);
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 /*
@@ -85,7 +85,7 @@ print '<input type="hidden" name="action" value="update">';
 
 $head = oauthadmin_prepare_head();
 
-dol_fiche_head($head, 'services', '', -1, 'technic');
+print dol_get_fiche_head($head, 'services', '', -1, 'technic');
 
 
 print '<span class="opacitymedium">'.$langs->trans("ListOfSupportedOauthProviders").'</span><br><br>';
@@ -97,51 +97,51 @@ $i = 0;
 // $list is defined into oauth.lib.php
 foreach ($list as $key)
 {
-    $supported = 0;
-    if (in_array($key[0], array_keys($supportedoauth2array))) $supported = 1;
-    if (!$supported) continue; // show only supported
+	$supported = 0;
+	if (in_array($key[0], array_keys($supportedoauth2array))) $supported = 1;
+	if (!$supported) continue; // show only supported
 
-    $i++;
+	$i++;
 
-    print '<tr class="liste_titre'.($i > 1 ? ' liste_titre_add' : '').'">';
-    // Api Name
-    $label = $langs->trans($key[0]);
-    print '<td>'.$label.'</td>';
-    print '<td>';
-    if (!empty($key[3])) print $langs->trans($key[3]);
-    print '</td>';
-    print '</tr>';
+	print '<tr class="liste_titre'.($i > 1 ? ' liste_titre_add' : '').'">';
+	// Api Name
+	$label = $langs->trans($key[0]);
+	print '<td>'.$label.'</td>';
+	print '<td>';
+	if (!empty($key[3])) print $langs->trans($key[3]);
+	print '</td>';
+	print '</tr>';
 
-    if ($supported)
-    {
-        $redirect_uri = $urlwithroot.'/core/modules/oauth/'.$supportedoauth2array[$key[0]].'_oauthcallback.php';
-        print '<tr class="oddeven value">';
-        print '<td>'.$langs->trans("UseTheFollowingUrlAsRedirectURI").'</td>';
-        print '<td><input style="width: 80%" type"text" name="uri'.$key[0].'" value="'.$redirect_uri.'">';
-        print '</td></tr>';
-    } else {
-        print '<tr class="oddeven value">';
-        print '<td>'.$langs->trans("UseTheFollowingUrlAsRedirectURI").'</td>';
-        print '<td>'.$langs->trans("FeatureNotYetSupported").'</td>';
-        print '</td></tr>';
-    }
+	if ($supported)
+	{
+		$redirect_uri = $urlwithroot.'/core/modules/oauth/'.$supportedoauth2array[$key[0]].'_oauthcallback.php';
+		print '<tr class="oddeven value">';
+		print '<td>'.$langs->trans("UseTheFollowingUrlAsRedirectURI").'</td>';
+		print '<td><input style="width: 80%" type"text" name="uri'.$key[0].'" value="'.$redirect_uri.'">';
+		print '</td></tr>';
+	} else {
+		print '<tr class="oddeven value">';
+		print '<td>'.$langs->trans("UseTheFollowingUrlAsRedirectURI").'</td>';
+		print '<td>'.$langs->trans("FeatureNotYetSupported").'</td>';
+		print '</td></tr>';
+	}
 
-    // Api Id
-    print '<tr class="oddeven value">';
-    print '<td><label for="'.$key[1].'">'.$langs->trans($key[1]).'</label></td>';
-    print '<td><input type="text" size="100" id="'.$key[1].'" name="'.$key[1].'" value="'.$conf->global->{$key[1]}.'">';
-    print '</td></tr>';
+	// Api Id
+	print '<tr class="oddeven value">';
+	print '<td><label for="'.$key[1].'">'.$langs->trans($key[1]).'</label></td>';
+	print '<td><input type="text" size="100" id="'.$key[1].'" name="'.$key[1].'" value="'.$conf->global->{$key[1]}.'">';
+	print '</td></tr>';
 
-    // Api Secret
-    print '<tr class="oddeven value">';
-    print '<td><label for="'.$key[2].'">'.$langs->trans($key[2]).'</label></td>';
-    print '<td><input type="password" size="100" id="'.$key[2].'" name="'.$key[2].'" value="'.$conf->global->{$key[2]}.'">';
-    print '</td></tr>';
+	// Api Secret
+	print '<tr class="oddeven value">';
+	print '<td><label for="'.$key[2].'">'.$langs->trans($key[2]).'</label></td>';
+	print '<td><input type="password" size="100" id="'.$key[2].'" name="'.$key[2].'" value="'.$conf->global->{$key[2]}.'">';
+	print '</td></tr>';
 }
 
 print '</table>'."\n";
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
 
diff --git a/htdocs/admin/oauthlogintokens.php b/htdocs/admin/oauthlogintokens.php
index 2d843a52577..4fb0bbb7452 100644
--- a/htdocs/admin/oauthlogintokens.php
+++ b/htdocs/admin/oauthlogintokens.php
@@ -58,50 +58,50 @@ if (!$mode) $mode = 'setup';
 
 if ($action == 'setconst' && $user->admin)
 {
-    $error = 0;
-    $db->begin();
+	$error = 0;
+	$db->begin();
 
-    $setupconstarray = GETPOST('setupdriver', 'array');
+	$setupconstarray = GETPOST('setupdriver', 'array');
 
-    foreach ($setupconstarray as $setupconst) {
-        //print '<pre>'.print_r($setupconst, true).'</pre>';
+	foreach ($setupconstarray as $setupconst) {
+		//print '<pre>'.print_r($setupconst, true).'</pre>';
 
-    	$constname = dol_escape_htmltag($setupconst['varname']);
-    	$constvalue = dol_escape_htmltag($setupconst['value']);
-    	$consttype = dol_escape_htmltag($setupconst['type']);
-    	$constnote = dol_escape_htmltag($setupconst['note']);
+		$constname = dol_escape_htmltag($setupconst['varname']);
+		$constvalue = dol_escape_htmltag($setupconst['value']);
+		$consttype = dol_escape_htmltag($setupconst['type']);
+		$constnote = dol_escape_htmltag($setupconst['note']);
 
-    	$result = dolibarr_set_const($db, $constname, $constvalue, $consttype, 0, $constnote, $conf->entity);
-        if (!$result > 0) $error++;
-    }
+		$result = dolibarr_set_const($db, $constname, $constvalue, $consttype, 0, $constnote, $conf->entity);
+		if (!$result > 0) $error++;
+	}
 
-    if (!$error)
-    {
-        $db->commit();
-        setEventMessages($langs->trans("SetupSaved"), null);
-    } else {
-        $db->rollback();
-        dol_print_error($db);
-    }
-    $action = '';
+	if (!$error)
+	{
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null);
+	} else {
+		$db->rollback();
+		dol_print_error($db);
+	}
+	$action = '';
 }
 
 if ($action == 'setvalue' && $user->admin)
 {
-    $db->begin();
+	$db->begin();
 
-    $result = dolibarr_set_const($db, $varname, $value, 'chaine', 0, '', $conf->entity);
-    if (!$result > 0) $error++;
+	$result = dolibarr_set_const($db, $varname, $value, 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) $error++;
 
-    if (!$error)
-    {
-        $db->commit();
-        setEventMessages($langs->trans("SetupSaved"), null);
-    } else {
-        $db->rollback();
-        dol_print_error($db);
-    }
-    $action = '';
+	if (!$error)
+	{
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null);
+	} else {
+		$db->rollback();
+		dol_print_error($db);
+	}
+	$action = '';
 }
 
 
@@ -123,7 +123,7 @@ print load_fiche_titre($langs->trans('ConfigOAuth'), $linkback, 'title_setup');
 
 $head = oauthadmin_prepare_head();
 
-dol_fiche_head($head, 'tokengeneration', '', -1, 'technic');
+print dol_get_fiche_head($head, 'tokengeneration', '', -1, 'technic');
 
 if (GETPOST('error')) {
 	setEventMessages(GETPOST('error'), null, 'errors');
@@ -131,278 +131,278 @@ if (GETPOST('error')) {
 
 if ($mode == 'setup' && $user->admin)
 {
-    print '<span class="opacitymedium">'.$langs->trans("OAuthSetupForLogin")."</span><br><br>\n";
+	print '<span class="opacitymedium">'.$langs->trans("OAuthSetupForLogin")."</span><br><br>\n";
 
-    foreach ($list as $key)
-    {
-        $supported = 0;
-        if (in_array($key[0], array_keys($supportedoauth2array))) $supported = 1;
-        if (!$supported) continue; // show only supported
+	foreach ($list as $key)
+	{
+		$supported = 0;
+		if (in_array($key[0], array_keys($supportedoauth2array))) $supported = 1;
+		if (!$supported) continue; // show only supported
 
 
-        $OAUTH_SERVICENAME = 'Unknown';
-        if ($key[0] == 'OAUTH_GITHUB_NAME')
-        {
-            $OAUTH_SERVICENAME = 'GitHub';
-            // List of keys that will be converted into scopes (from constants 'SCOPE_state_in_uppercase' in file of service).
-            // We pass this param list in to 'state' because we need it before and after the redirect.
-            $shortscope = 'user,public_repo';
-            $urltorenew = $urlwithroot.'/core/modules/oauth/github_oauthcallback.php?shortscope='.$shortscope.'&state='.$shortscope.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
-            $urltodelete = $urlwithroot.'/core/modules/oauth/github_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
-            $urltocheckperms = 'https://github.com/settings/applications/';
-        } elseif ($key[0] == 'OAUTH_GOOGLE_NAME')
-        {
-            $OAUTH_SERVICENAME = 'Google';
-            // List of keys that will be converted into scopes (from constants 'SCOPE_state_in_uppercase' in file of service).
-            // We pass this param list in to 'state' because we need it before and after the redirect.
-            $shortscope = 'userinfo_email,userinfo_profile,cloud_print';
-            if (!empty($conf->global->OAUTH_GSUITE)){
-            	$shortscope .= ',admin_directory_user';
+		$OAUTH_SERVICENAME = 'Unknown';
+		if ($key[0] == 'OAUTH_GITHUB_NAME')
+		{
+			$OAUTH_SERVICENAME = 'GitHub';
+			// List of keys that will be converted into scopes (from constants 'SCOPE_state_in_uppercase' in file of service).
+			// We pass this param list in to 'state' because we need it before and after the redirect.
+			$shortscope = 'user,public_repo';
+			$urltorenew = $urlwithroot.'/core/modules/oauth/github_oauthcallback.php?shortscope='.$shortscope.'&state='.$shortscope.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+			$urltodelete = $urlwithroot.'/core/modules/oauth/github_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+			$urltocheckperms = 'https://github.com/settings/applications/';
+		} elseif ($key[0] == 'OAUTH_GOOGLE_NAME')
+		{
+			$OAUTH_SERVICENAME = 'Google';
+			// List of keys that will be converted into scopes (from constants 'SCOPE_state_in_uppercase' in file of service).
+			// We pass this param list in to 'state' because we need it before and after the redirect.
+			$shortscope = 'userinfo_email,userinfo_profile,cloud_print';
+			if (!empty($conf->global->OAUTH_GSUITE)) {
+				$shortscope .= ',admin_directory_user';
 			}
-            //$scope.=',gmail_full';
-            $urltorenew = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?shortscope='.$shortscope.'&state='.$shortscope.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
-            $urltodelete = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
-            $urltocheckperms = 'https://security.google.com/settings/security/permissions';
-        } elseif ($key[0] == 'OAUTH_STRIPE_TEST_NAME')
-        {
-        	$OAUTH_SERVICENAME = 'StripeTest';
-        	$urltorenew = $urlwithroot.'/core/modules/oauth/stripetest_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
-        	$urltodelete = '';
-        	$urltocheckperms = '';
-        } elseif ($key[0] == 'OAUTH_STRIPE_LIVE_NAME')
-        {
-        	$OAUTH_SERVICENAME = 'StripeLive';
-        	$urltorenew = $urlwithroot.'/core/modules/oauth/stripelive_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
-        	$urltodelete = '';
-        	$urltocheckperms = '';
-        } else {
+			//$scope.=',gmail_full';
+			$urltorenew = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?shortscope='.$shortscope.'&state='.$shortscope.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+			$urltodelete = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+			$urltocheckperms = 'https://security.google.com/settings/security/permissions';
+		} elseif ($key[0] == 'OAUTH_STRIPE_TEST_NAME')
+		{
+			$OAUTH_SERVICENAME = 'StripeTest';
+			$urltorenew = $urlwithroot.'/core/modules/oauth/stripetest_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+			$urltodelete = '';
+			$urltocheckperms = '';
+		} elseif ($key[0] == 'OAUTH_STRIPE_LIVE_NAME')
+		{
+			$OAUTH_SERVICENAME = 'StripeLive';
+			$urltorenew = $urlwithroot.'/core/modules/oauth/stripelive_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+			$urltodelete = '';
+			$urltocheckperms = '';
+		} else {
 			$urltorenew = '';
 			$urltodelete = '';
 			$urltocheckperms = '';
 		}
 
 
-        // Show value of token
-        $tokenobj = null;
-        // Token
-        require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
-        require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
-        // Dolibarr storage
-        $storage = new DoliStorage($db, $conf);
-        try {
-            $tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME);
-        } catch (Exception $e)
-        {
-            // Return an error if token not found
-        }
+		// Show value of token
+		$tokenobj = null;
+		// Token
+		require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
+		require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
+		// Dolibarr storage
+		$storage = new DoliStorage($db, $conf);
+		try {
+			$tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME);
+		} catch (Exception $e)
+		{
+			// Return an error if token not found
+		}
 
-        // Set other properties
-        $refreshtoken = false;
-        $expiredat = '';
+		// Set other properties
+		$refreshtoken = false;
+		$expiredat = '';
 
-        $expire = false;
-        // Is token expired or will token expire in the next 30 seconds
-        if (is_object($tokenobj)) {
-            $expire = ($tokenobj->getEndOfLife() !== $tokenobj::EOL_NEVER_EXPIRES && $tokenobj->getEndOfLife() !== $tokenobj::EOL_UNKNOWN && time() > ($tokenobj->getEndOfLife() - 30));
-        }
+		$expire = false;
+		// Is token expired or will token expire in the next 30 seconds
+		if (is_object($tokenobj)) {
+			$expire = ($tokenobj->getEndOfLife() !== $tokenobj::EOL_NEVER_EXPIRES && $tokenobj->getEndOfLife() !== $tokenobj::EOL_UNKNOWN && time() > ($tokenobj->getEndOfLife() - 30));
+		}
 
-        if ($key[1] != '' && $key[2] != '') {
-            if (is_object($tokenobj)) {
-                $refreshtoken = $tokenobj->getRefreshToken();
+		if ($key[1] != '' && $key[2] != '') {
+			if (is_object($tokenobj)) {
+				$refreshtoken = $tokenobj->getRefreshToken();
 
-                $endoflife = $tokenobj->getEndOfLife();
-                if ($endoflife == $tokenobj::EOL_NEVER_EXPIRES)
-                {
-                    $expiredat = $langs->trans("Never");
-                } elseif ($endoflife == $tokenobj::EOL_UNKNOWN)
-                {
-                    $expiredat = $langs->trans("Unknown");
-                } else {
-                    $expiredat = dol_print_date($endoflife, "dayhour");
-                }
-            }
-        }
+				$endoflife = $tokenobj->getEndOfLife();
+				if ($endoflife == $tokenobj::EOL_NEVER_EXPIRES)
+				{
+					$expiredat = $langs->trans("Never");
+				} elseif ($endoflife == $tokenobj::EOL_UNKNOWN)
+				{
+					$expiredat = $langs->trans("Unknown");
+				} else {
+					$expiredat = dol_print_date($endoflife, "dayhour");
+				}
+			}
+		}
 
-        $submit_enabled = 0;
+		$submit_enabled = 0;
 
-        print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=setup&amp;driver='.$driver.'" autocomplete="off">';
-        print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<input type="hidden" name="action" value="setconst">';
+		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=setup&amp;driver='.$driver.'" autocomplete="off">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="action" value="setconst">';
 
 
-        print '<table class="noborder centpercent">'."\n";
+		print '<table class="noborder centpercent">'."\n";
 
-        print '<tr class="liste_titre">';
-        print '<th class="titlefieldcreate">'.$langs->trans($key[0]).'</th>';
-        print '<th></th>';
-        print '<th></th>';
-        print "</tr>\n";
+		print '<tr class="liste_titre">';
+		print '<th class="titlefieldcreate">'.$langs->trans($key[0]).'</th>';
+		print '<th></th>';
+		print '<th></th>';
+		print "</tr>\n";
 
-        print '<tr class="oddeven">';
-        print '<td'.($key['required'] ? ' class="required"' : '').'>';
-        //var_dump($key);
-        print $langs->trans("OAuthIDSecret").'</td>';
-        print '<td>';
-        print $langs->trans("SeePreviousTab");
-        print '</td>';
-        print '<td>';
-        print '</td>';
-        print '</tr>'."\n";
+		print '<tr class="oddeven">';
+		print '<td'.($key['required'] ? ' class="required"' : '').'>';
+		//var_dump($key);
+		print $langs->trans("OAuthIDSecret").'</td>';
+		print '<td>';
+		print $langs->trans("SeePreviousTab");
+		print '</td>';
+		print '<td>';
+		print '</td>';
+		print '</tr>'."\n";
 
-        print '<tr class="oddeven">';
-        print '<td'.($key['required'] ? ' class="required"' : '').'>';
-        //var_dump($key);
-        print $langs->trans("IsTokenGenerated");
-        print '</td>';
-        print '<td>';
-        if (is_object($tokenobj)) print $langs->trans("HasAccessToken");
-        else print $langs->trans("NoAccessToken");
-        print '</td>';
-        print '<td>';
-        // Links to delete/checks token
-        if (is_object($tokenobj))
-        {
-            //test on $storage->hasAccessToken($OAUTH_SERVICENAME) ?
-            print '<a class="button" href="'.$urltodelete.'">'.$langs->trans('DeleteAccess').'</a><br>';
-        }
-        // Request remote token
-        if ($urltorenew)
-        {
-        	print '<a class="button" href="'.$urltorenew.'">'.$langs->trans('RequestAccess').'</a><br>';
-        }
-        // Check remote access
-        if ($urltocheckperms)
-        {
-            print '<br>'.$langs->trans("ToCheckDeleteTokenOnProvider", $OAUTH_SERVICENAME).': <a href="'.$urltocheckperms.'" target="_'.strtolower($OAUTH_SERVICENAME).'">'.$urltocheckperms.'</a>';
-        }
-        print '</td>';
-        print '</tr>';
+		print '<tr class="oddeven">';
+		print '<td'.($key['required'] ? ' class="required"' : '').'>';
+		//var_dump($key);
+		print $langs->trans("IsTokenGenerated");
+		print '</td>';
+		print '<td>';
+		if (is_object($tokenobj)) print $langs->trans("HasAccessToken");
+		else print $langs->trans("NoAccessToken");
+		print '</td>';
+		print '<td>';
+		// Links to delete/checks token
+		if (is_object($tokenobj))
+		{
+			//test on $storage->hasAccessToken($OAUTH_SERVICENAME) ?
+			print '<a class="button" href="'.$urltodelete.'">'.$langs->trans('DeleteAccess').'</a><br>';
+		}
+		// Request remote token
+		if ($urltorenew)
+		{
+			print '<a class="button" href="'.$urltorenew.'">'.$langs->trans('RequestAccess').'</a><br>';
+		}
+		// Check remote access
+		if ($urltocheckperms)
+		{
+			print '<br>'.$langs->trans("ToCheckDeleteTokenOnProvider", $OAUTH_SERVICENAME).': <a href="'.$urltocheckperms.'" target="_'.strtolower($OAUTH_SERVICENAME).'">'.$urltocheckperms.'</a>';
+		}
+		print '</td>';
+		print '</tr>';
 
-        print '<tr class="oddeven">';
-        print '<td'.($key['required'] ? ' class="required"' : '').'>';
-        //var_dump($key);
-        print $langs->trans("Token").'</td>';
-        print '<td colspan="2">';
-        if (is_object($tokenobj))
-        {
-            //var_dump($tokenobj);
-            print $tokenobj->getAccessToken().'<br>';
-            //print 'Refresh: '.$tokenobj->getRefreshToken().'<br>';
-            //print 'EndOfLife: '.$tokenobj->getEndOfLife().'<br>';
-            //var_dump($tokenobj->getExtraParams());
-            /*print '<br>Extra: <br><textarea class="quatrevingtpercent">';
+		print '<tr class="oddeven">';
+		print '<td'.($key['required'] ? ' class="required"' : '').'>';
+		//var_dump($key);
+		print $langs->trans("Token").'</td>';
+		print '<td colspan="2">';
+		if (is_object($tokenobj))
+		{
+			//var_dump($tokenobj);
+			print $tokenobj->getAccessToken().'<br>';
+			//print 'Refresh: '.$tokenobj->getRefreshToken().'<br>';
+			//print 'EndOfLife: '.$tokenobj->getEndOfLife().'<br>';
+			//var_dump($tokenobj->getExtraParams());
+			/*print '<br>Extra: <br><textarea class="quatrevingtpercent">';
             print ''.join(',',$tokenobj->getExtraParams());
             print '</textarea>';*/
-        }
-        print '</td>';
-        print '</tr>'."\n";
+		}
+		print '</td>';
+		print '</tr>'."\n";
 
-        if (is_object($tokenobj))
-        {
-            // Token refresh
-            print '<tr class="oddeven">';
-            print '<td'.($key['required'] ? ' class="required"' : '').'>';
-            //var_dump($key);
-            print $langs->trans("TOKEN_REFRESH").'</td>';
-            print '<td colspan="2">';
-            print yn($refreshtoken);
-            print '</td>';
-            print '</tr>';
+		if (is_object($tokenobj))
+		{
+			// Token refresh
+			print '<tr class="oddeven">';
+			print '<td'.($key['required'] ? ' class="required"' : '').'>';
+			//var_dump($key);
+			print $langs->trans("TOKEN_REFRESH").'</td>';
+			print '<td colspan="2">';
+			print yn($refreshtoken);
+			print '</td>';
+			print '</tr>';
 
-            // Token expired
-            print '<tr class="oddeven">';
-            print '<td'.($key['required'] ? ' class="required"' : '').'>';
-            //var_dump($key);
-            print $langs->trans("TOKEN_EXPIRED").'</td>';
-            print '<td colspan="2">';
-            print yn($expire);
-            print '</td>';
-            print '</tr>';
+			// Token expired
+			print '<tr class="oddeven">';
+			print '<td'.($key['required'] ? ' class="required"' : '').'>';
+			//var_dump($key);
+			print $langs->trans("TOKEN_EXPIRED").'</td>';
+			print '<td colspan="2">';
+			print yn($expire);
+			print '</td>';
+			print '</tr>';
 
-            // Token expired at
-            print '<tr class="oddeven">';
-            print '<td'.($key['required'] ? ' class="required"' : '').'>';
-            //var_dump($key);
-            print $langs->trans("TOKEN_EXPIRE_AT").'</td>';
-            print '<td colspan="2">';
-            print $expiredat;
-            print '</td>';
-            print '</tr>';
-        }
+			// Token expired at
+			print '<tr class="oddeven">';
+			print '<td'.($key['required'] ? ' class="required"' : '').'>';
+			//var_dump($key);
+			print $langs->trans("TOKEN_EXPIRE_AT").'</td>';
+			print '<td colspan="2">';
+			print $expiredat;
+			print '</td>';
+			print '</tr>';
+		}
 
-        print '</table>';
+		print '</table>';
 
-        if (!empty($driver))
-        {
-            if ($submit_enabled) {
-                print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Modify")).'"></div>';
-            }
-        }
+		if (!empty($driver))
+		{
+			if ($submit_enabled) {
+				print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Modify")).'"></div>';
+			}
+		}
 
 
-        print '</form>';
-    }
+		print '</form>';
+	}
 }
 
 if ($mode == 'test' && $user->admin)
 {
-    print $langs->trans('PrintTestDesc'.$driver)."<br><br>\n";
+	print $langs->trans('PrintTestDesc'.$driver)."<br><br>\n";
 
-    print '<table class="noborder centpercent">';
-    if (!empty($driver))
-    {
-        require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php';
-        $classname = 'printing_'.$driver;
-        $langs->load($driver);
-        $printer = new $classname($db);
-        //print '<pre>'.print_r($printer, true).'</pre>';
-        if (count($printer->getlistAvailablePrinters())) {
-            if ($printer->listAvailablePrinters() == 0) {
-                print $printer->resprint;
-            } else {
-                setEventMessages($printer->error, $printer->errors, 'errors');
-            }
-        } else {
-            print $langs->trans('PleaseConfigureDriverfromList');
-        }
-    }
+	print '<table class="noborder centpercent">';
+	if (!empty($driver))
+	{
+		require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php';
+		$classname = 'printing_'.$driver;
+		$langs->load($driver);
+		$printer = new $classname($db);
+		//print '<pre>'.print_r($printer, true).'</pre>';
+		if (count($printer->getlistAvailablePrinters())) {
+			if ($printer->listAvailablePrinters() == 0) {
+				print $printer->resprint;
+			} else {
+				setEventMessages($printer->error, $printer->errors, 'errors');
+			}
+		} else {
+			print $langs->trans('PleaseConfigureDriverfromList');
+		}
+	}
 
-    print '</table>';
+	print '</table>';
 }
 
 if ($mode == 'userconf' && $user->admin)
 {
-    print $langs->trans('PrintUserConfDesc'.$driver)."<br><br>\n";
+	print $langs->trans('PrintUserConfDesc'.$driver)."<br><br>\n";
 
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<th>'.$langs->trans("User").'</th>';
-    print '<th>'.$langs->trans("PrintModule").'</th>';
-    print '<th>'.$langs->trans("PrintDriver").'</th>';
-    print '<th>'.$langs->trans("Printer").'</th>';
-    print '<th>'.$langs->trans("PrinterLocation").'</th>';
-    print '<th>'.$langs->trans("PrinterId").'</th>';
-    print '<th>'.$langs->trans("NumberOfCopy").'</th>';
-    print '<th class="center">'.$langs->trans("Delete").'</th>';
-    print "</tr>\n";
-    $sql = 'SELECT p.rowid, p.printer_name, p.printer_location, p.printer_id, p.copy, p.module, p.driver, p.userid, u.login FROM '.MAIN_DB_PREFIX.'printing as p, '.MAIN_DB_PREFIX.'user as u WHERE p.userid=u.rowid';
-    $resql = $db->query($sql);
-    while ($row = $db->fetch_array($resql)) {
-        print '<tr class="oddeven">';
-        print '<td>'.$row['login'].'</td>';
-        print '<td>'.$row['module'].'</td>';
-        print '<td>'.$row['driver'].'</td>';
-        print '<td>'.$row['printer_name'].'</td>';
-        print '<td>'.$row['printer_location'].'</td>';
-        print '<td>'.$row['printer_id'].'</td>';
-        print '<td>'.$row['copy'].'</td>';
-        print '<td class="center">'.img_picto($langs->trans("Delete"), 'delete').'</td>';
-        print "</tr>\n";
-    }
-    print '</table>';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<th>'.$langs->trans("User").'</th>';
+	print '<th>'.$langs->trans("PrintModule").'</th>';
+	print '<th>'.$langs->trans("PrintDriver").'</th>';
+	print '<th>'.$langs->trans("Printer").'</th>';
+	print '<th>'.$langs->trans("PrinterLocation").'</th>';
+	print '<th>'.$langs->trans("PrinterId").'</th>';
+	print '<th>'.$langs->trans("NumberOfCopy").'</th>';
+	print '<th class="center">'.$langs->trans("Delete").'</th>';
+	print "</tr>\n";
+	$sql = 'SELECT p.rowid, p.printer_name, p.printer_location, p.printer_id, p.copy, p.module, p.driver, p.userid, u.login FROM '.MAIN_DB_PREFIX.'printing as p, '.MAIN_DB_PREFIX.'user as u WHERE p.userid=u.rowid';
+	$resql = $db->query($sql);
+	while ($row = $db->fetch_array($resql)) {
+		print '<tr class="oddeven">';
+		print '<td>'.$row['login'].'</td>';
+		print '<td>'.$row['module'].'</td>';
+		print '<td>'.$row['driver'].'</td>';
+		print '<td>'.$row['printer_name'].'</td>';
+		print '<td>'.$row['printer_location'].'</td>';
+		print '<td>'.$row['printer_id'].'</td>';
+		print '<td>'.$row['copy'].'</td>';
+		print '<td class="center">'.img_picto($langs->trans("Delete"), 'delete').'</td>';
+		print "</tr>\n";
+	}
+	print '</table>';
 }
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/openinghours.php b/htdocs/admin/openinghours.php
index d4886bb2a57..c3cbcb3d0ae 100644
--- a/htdocs/admin/openinghours.php
+++ b/htdocs/admin/openinghours.php
@@ -75,7 +75,7 @@ print load_fiche_titre($langs->trans("CompanyFoundation"), '', 'title_setup');
 
 $head = company_admin_prepare_head();
 
-dol_fiche_head($head, 'openinghours', $langs->trans("Company"), -1, 'company');
+print dol_get_fiche_head($head, 'openinghours', $langs->trans("Company"), -1, 'company');
 
 print '<span class="opacitymedium">'.$langs->trans("OpeningHoursDesc")."</span><br>\n";
 print "<br>\n";
@@ -97,40 +97,40 @@ if (empty($action) || $action == 'edit' || $action == 'updateedit')
 	print '</td><td>';
 	print '<input name="monday" id="monday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_MONDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_MONDAY : GETPOST("monday", 'alpha')).'"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"').'></td></tr>'."\n";
 
-    print '<tr class="oddeven"><td>';
-    print $form->textwithpicto($langs->trans("Tuesday"), $langs->trans("OpeningHoursFormatDesc"));
-    print '</td><td>';
-    print '<input name="tuesday" id="tuesday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_TUESDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_TUESDAY : GETPOST("tuesday", 'alpha')).'"></td></tr>'."\n";
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("Tuesday"), $langs->trans("OpeningHoursFormatDesc"));
+	print '</td><td>';
+	print '<input name="tuesday" id="tuesday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_TUESDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_TUESDAY : GETPOST("tuesday", 'alpha')).'"></td></tr>'."\n";
 
-    print '<tr class="oddeven"><td>';
-    print $form->textwithpicto($langs->trans("Wednesday"), $langs->trans("OpeningHoursFormatDesc"));
-    print '</td><td>';
-    print '<input name="wednesday" id="wednesday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_WEDNESDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_WEDNESDAY : GETPOST("wednesday", 'alpha')).'"></td></tr>'."\n";
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("Wednesday"), $langs->trans("OpeningHoursFormatDesc"));
+	print '</td><td>';
+	print '<input name="wednesday" id="wednesday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_WEDNESDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_WEDNESDAY : GETPOST("wednesday", 'alpha')).'"></td></tr>'."\n";
 
-    print '<tr class="oddeven"><td>';
-    print $form->textwithpicto($langs->trans("Thursday"), $langs->trans("OpeningHoursFormatDesc"));
-    print '</td><td>';
-    print '<input name="thursday" id="thursday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_THURSDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_THURSDAY : GETPOST("thursday", 'alpha')).'"></td></tr>'."\n";
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("Thursday"), $langs->trans("OpeningHoursFormatDesc"));
+	print '</td><td>';
+	print '<input name="thursday" id="thursday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_THURSDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_THURSDAY : GETPOST("thursday", 'alpha')).'"></td></tr>'."\n";
 
-    print '<tr class="oddeven"><td>';
-    print $form->textwithpicto($langs->trans("Friday"), $langs->trans("OpeningHoursFormatDesc"));
-    print '</td><td>';
-    print '<input name="friday" id="friday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_FRIDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_FRIDAY : GETPOST("friday", 'alpha')).'"></td></tr>'."\n";
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("Friday"), $langs->trans("OpeningHoursFormatDesc"));
+	print '</td><td>';
+	print '<input name="friday" id="friday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_FRIDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_FRIDAY : GETPOST("friday", 'alpha')).'"></td></tr>'."\n";
 
-    print '<tr class="oddeven"><td>';
-    print $form->textwithpicto($langs->trans("Saturday"), $langs->trans("OpeningHoursFormatDesc"));
-    print '</td><td>';
-    print '<input name="saturday" id="saturday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_SATURDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_SATURDAY : GETPOST("saturday", 'alpha')).'"></td></tr>'."\n";
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("Saturday"), $langs->trans("OpeningHoursFormatDesc"));
+	print '</td><td>';
+	print '<input name="saturday" id="saturday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_SATURDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_SATURDAY : GETPOST("saturday", 'alpha')).'"></td></tr>'."\n";
 
-    print '<tr class="oddeven"><td>';
-    print $form->textwithpicto($langs->trans("Sunday"), $langs->trans("OpeningHoursFormatDesc"));
-    print '</td><td>';
-    print '<input name="sunday" id="sunday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_SUNDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_SUNDAY : GETPOST("sunday", 'alpha')).'"></td></tr>'."\n";
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("Sunday"), $langs->trans("OpeningHoursFormatDesc"));
+	print '</td><td>';
+	print '<input name="sunday" id="sunday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_SUNDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_SUNDAY : GETPOST("sunday", 'alpha')).'"></td></tr>'."\n";
 
-    print '</table>';
+	print '</table>';
 
 	print '<br><div class="center">';
-	print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+	print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
 	print '</div>';
 	print '<br>';
 
diff --git a/htdocs/admin/order_extrafields.php b/htdocs/admin/order_extrafields.php
index 1b2bb0c0cd0..5d5573d4579 100644
--- a/htdocs/admin/order_extrafields.php
+++ b/htdocs/admin/order_extrafields.php
@@ -73,19 +73,19 @@ print load_fiche_titre($langs->trans("OrdersSetup"), $linkback, 'title_setup');
 
 $head = order_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Orders"), -1, 'order');
+print dol_get_fiche_head($head, 'attributes', $langs->trans("Orders"), -1, 'order');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -98,9 +98,9 @@ if ($action != 'create' && $action != 'edit')
 if ($action == 'create')
 {
 	print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -110,10 +110,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && !empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/admin/orderdet_extrafields.php b/htdocs/admin/orderdet_extrafields.php
index 1f645241646..2f7462a3cf0 100644
--- a/htdocs/admin/orderdet_extrafields.php
+++ b/htdocs/admin/orderdet_extrafields.php
@@ -74,19 +74,19 @@ print load_fiche_titre($langs->trans("OrdersSetup"), $linkback, 'title_setup');
 
 $head = order_admin_prepare_head();
 
-dol_fiche_head($head, 'attributeslines', $langs->trans("Orders"), -1, 'order');
+print dol_get_fiche_head($head, 'attributeslines', $langs->trans("Orders"), -1, 'order');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -99,9 +99,9 @@ if ($action != 'create' && $action != 'edit')
 if ($action == 'create')
 {
 	print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -111,10 +111,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && !empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index 92b5c9511d5..378e1b4fe68 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -47,23 +47,23 @@ if (empty($conf->global->PAYMENT_ADDON)) $conf->global->PAYMENT_ADDON = 'mod_pay
 
 if ($action == 'updateMask')
 {
-    $maskconstpayment = GETPOST('maskconstpayment', 'alpha');
-    $maskpayment = GETPOST('maskpayment', 'alpha');
-    if ($maskconstpayment) $res = dolibarr_set_const($db, $maskconstpayment, $maskpayment, 'chaine', 0, '', $conf->entity);
+	$maskconstpayment = GETPOST('maskconstpayment', 'alpha');
+	$maskpayment = GETPOST('maskpayment', 'alpha');
+	if ($maskconstpayment) $res = dolibarr_set_const($db, $maskconstpayment, $maskpayment, 'chaine', 0, '', $conf->entity);
 
-    if (!$res > 0) $error++;
+	if (!$res > 0) $error++;
 
-    if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 if ($action == 'setmod')
 {
-    dolibarr_set_const($db, "PAYMENT_ADDON", $value, 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "PAYMENT_ADDON", $value, 'chaine', 0, '', $conf->entity);
 }
 
 if ($action == 'setparams')
@@ -72,8 +72,8 @@ if ($action == 'setparams')
 	$res = dolibarr_set_const($db, "FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS", $freetext, 'chaine', 0, '', $conf->entity);
 	if (!$res > 0) $error++;
 
-    $res = dolibarr_set_const($db, "PAYMENTS_REPORT_GROUP_BY_MOD", GETPOST('PAYMENTS_REPORT_GROUP_BY_MOD', 'int'), 'chaine', 0, '', $conf->entity);
-    if (!$res > 0) $error++;
+	$res = dolibarr_set_const($db, "PAYMENTS_REPORT_GROUP_BY_MOD", GETPOST('PAYMENTS_REPORT_GROUP_BY_MOD', 'int'), 'chaine', 0, '', $conf->entity);
+	if (!$res > 0) $error++;
 
 	if ($error)
 	{
@@ -81,7 +81,7 @@ if ($action == 'setparams')
 	}
 	if (!$error)
 	{
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
 }
 
@@ -101,7 +101,7 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_valu
 print load_fiche_titre($langs->trans("BillsSetup"), $linkback, 'title_setup');
 
 $head = invoice_admin_prepare_head();
-dol_fiche_head($head, 'payment', $langs->trans("Invoices"), -1, 'invoice');
+print dol_get_fiche_head($head, 'payment', $langs->trans("Invoices"), -1, 'invoice');
 
 /*
  *  Numbering module
@@ -123,105 +123,107 @@ clearstatcache();
 
 foreach ($dirmodels as $reldir)
 {
-    $dir = dol_buildpath($reldir."core/modules/payment/");
-    if (is_dir($dir))
-    {
-        $handle = opendir($dir);
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (!is_dir($dir.$file) || (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS'))
-                {
-                    $filebis = $file;
-                    $classname = preg_replace('/\.php$/', '', $file);
-                    // For compatibility
-                    if (!is_file($dir.$filebis))
-                    {
-                        $filebis = $file."/".$file.".modules.php";
-                        $classname = "mod_payment_".$file;
-                    }
-                    // Check if there is a filter on country
-                    preg_match('/\-(.*)_(.*)$/', $classname, $reg);
-                    if (!empty($reg[2]) && $reg[2] != strtoupper($mysoc->country_code)) continue;
+	$dir = dol_buildpath($reldir."core/modules/payment/");
+	if (is_dir($dir))
+	{
+		$handle = opendir($dir);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (!is_dir($dir.$file) || (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS'))
+				{
+					$filebis = $file;
+					$classname = preg_replace('/\.php$/', '', $file);
+					// For compatibility
+					if (!is_file($dir.$filebis))
+					{
+						$filebis = $file."/".$file.".modules.php";
+						$classname = "mod_payment_".$file;
+					}
+					// Check if there is a filter on country
+					preg_match('/\-(.*)_(.*)$/', $classname, $reg);
+					if (!empty($reg[2]) && $reg[2] != strtoupper($mysoc->country_code)) continue;
 
-                    $classname = preg_replace('/\-.*$/', '', $classname);
-                    if (!class_exists($classname) && is_readable($dir.$filebis) && (preg_match('/mod_/', $filebis) || preg_match('/mod_/', $classname)) && substr($filebis, dol_strlen($filebis) - 3, 3) == 'php')
-                    {
-                        // Charging the numbering class
-                        require_once $dir.$filebis;
+					$classname = preg_replace('/\-.*$/', '', $classname);
+					if (!class_exists($classname) && is_readable($dir.$filebis) && (preg_match('/mod_/', $filebis) || preg_match('/mod_/', $classname)) && substr($filebis, dol_strlen($filebis) - 3, 3) == 'php')
+					{
+						// Charging the numbering class
+						require_once $dir.$filebis;
 
-                        $module = new $classname($db);
+						$module = new $classname($db);
 
-                        // Show modules according to features level
-                        if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+						// Show modules according to features level
+						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-                        if ($module->isEnabled())
-                        {
-                            $var = !$var;
-                            print '<tr class="oddeven"><td width="100">';
-                            echo preg_replace('/\-.*$/', '', preg_replace('/mod_payment_/', '', preg_replace('/\.php$/', '', $file)));
-                            print "</td><td>\n";
+						if ($module->isEnabled())
+						{
+							$var = !$var;
+							print '<tr class="oddeven"><td width="100">';
+							echo preg_replace('/\-.*$/', '', preg_replace('/mod_payment_/', '', preg_replace('/\.php$/', '', $file)));
+							print "</td><td>\n";
 
-                            print $module->info();
+							print $module->info();
 
-                            print '</td>';
+							print '</td>';
 
-                            // Show example of numbering module
-                            print '<td class="nowrap">';
-                            $tmp = $module->getExample();
-                            if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-                            elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-                            else print $tmp;
-                            print '</td>'."\n";
+							// Show example of numbering module
+							print '<td class="nowrap">';
+							$tmp = $module->getExample();
+							if (preg_match('/^Error/', $tmp)) {
+								$langs->load("errors");
+								print '<div class="error">'.$langs->trans($tmp).'</div>';
+							} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+							else print $tmp;
+							print '</td>'."\n";
 
-                            print '<td class="center">';
-                            //print "> ".$conf->global->PAYMENT_ADDON." - ".$file;
-                            if ($conf->global->PAYMENT_ADDON == $file || $conf->global->PAYMENT_ADDON.'.php' == $file)
-                            {
-                                print img_picto($langs->trans("Activated"), 'switch_on');
-                            } else {
-                                print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmo&token='.newToken().'&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-                            }
-                            print '</td>';
+							print '<td class="center">';
+							//print "> ".$conf->global->PAYMENT_ADDON." - ".$file;
+							if ($conf->global->PAYMENT_ADDON == $file || $conf->global->PAYMENT_ADDON.'.php' == $file)
+							{
+								print img_picto($langs->trans("Activated"), 'switch_on');
+							} else {
+								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmo&token='.newToken().'&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+							}
+							print '</td>';
 
-                            $payment = new Paiement($db);
-                            $payment->initAsSpecimen();
+							$payment = new Paiement($db);
+							$payment->initAsSpecimen();
 
-                            // Example
-                            $htmltooltip = '';
-                            $htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
-                            $nextval = $module->getNextValue($mysoc, $payment);
-                            if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-                                    $htmltooltip .= $langs->trans("NextValue").': ';
-                                if ($nextval) {
-                                    if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
-                                        $nextval = $langs->trans($nextval);
-                                    $htmltooltip .= $nextval.'<br>';
-                                } else {
-                                    $htmltooltip .= $langs->trans($module->error).'<br>';
-                                }
-                            }
+							// Example
+							$htmltooltip = '';
+							$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+							$nextval = $module->getNextValue($mysoc, $payment);
+							if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+									$htmltooltip .= $langs->trans("NextValue").': ';
+								if ($nextval) {
+									if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+										$nextval = $langs->trans($nextval);
+									$htmltooltip .= $nextval.'<br>';
+								} else {
+									$htmltooltip .= $langs->trans($module->error).'<br>';
+								}
+							}
 
-                            print '<td class="center">';
-                            print $form->textwithpicto('', $htmltooltip, 1, 0);
+							print '<td class="center">';
+							print $form->textwithpicto('', $htmltooltip, 1, 0);
 
-                            if ($conf->global->PAYMENT_ADDON.'.php' == $file)  // If module is the one used, we show existing errors
-                            {
-                                if (!empty($module->error)) dol_htmloutput_mesg($module->error, '', 'error', 1);
-                            }
+							if ($conf->global->PAYMENT_ADDON.'.php' == $file)  // If module is the one used, we show existing errors
+							{
+								if (!empty($module->error)) dol_htmloutput_mesg($module->error, '', 'error', 1);
+							}
 
-                            print '</td>';
+							print '</td>';
 
-                            print "</tr>\n";
-                        }
-                    }
-                }
-            }
-            closedir($handle);
-        }
-    }
+							print "</tr>\n";
+						}
+					}
+				}
+			}
+			closedir($handle);
+		}
+	}
 }
 
 print '</table>';
@@ -262,7 +264,7 @@ print "</td></tr>\n";
 print '</table>';
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<br>';
 print '<div class="center">';
diff --git a/htdocs/admin/paymentbybanktransfer.php b/htdocs/admin/paymentbybanktransfer.php
index 718e64e6446..cd0db2a1def 100644
--- a/htdocs/admin/paymentbybanktransfer.php
+++ b/htdocs/admin/paymentbybanktransfer.php
@@ -192,7 +192,7 @@ print '</td></tr>';
 print '</table>';
 print '<br>';
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
+print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
 
 print '</form>';
 
@@ -340,7 +340,7 @@ foreach ($dirmodels as $reldir)
                                 print '<td class="center">';
                                 if ($module->type == 'pdf')
                                 {
-                                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
+                                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
                                 }
                                 else
                                 {
@@ -361,7 +361,7 @@ foreach ($dirmodels as $reldir)
 */
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<br>';
 
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 363edca6c80..16a1c42ddaa 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members'));
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks'));
 
 if (!$user->admin) accessforbidden();
 
@@ -46,42 +46,41 @@ $cancel = GETPOST('cancel', 'alpha');
  */
 
 if ($cancel) {
-    $action = '';
+	$action = '';
 }
 
 if ($action == 'update')
 {
-	dolibarr_set_const($db, "MAIN_PDF_FORMAT", $_POST["MAIN_PDF_FORMAT"], 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_PDF_FORMAT", GETPOST("MAIN_PDF_FORMAT"), 'chaine', 0, '', $conf->entity);
 
-	dolibarr_set_const($db, "MAIN_PDF_MARGIN_LEFT", $_POST["MAIN_PDF_MARGIN_LEFT"], 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_PDF_MARGIN_RIGHT", $_POST["MAIN_PDF_MARGIN_RIGHT"], 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_PDF_MARGIN_TOP", $_POST["MAIN_PDF_MARGIN_TOP"], 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_PDF_MARGIN_BOTTOM", $_POST["MAIN_PDF_MARGIN_BOTTOM"], 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_PDF_MARGIN_LEFT", GETPOST("MAIN_PDF_MARGIN_LEFT"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_PDF_MARGIN_RIGHT", GETPOST("MAIN_PDF_MARGIN_TOP"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_PDF_MARGIN_BOTTOM", GETPOST("MAIN_PDF_MARGIN_BOTTOM"), 'chaine', 0, '', $conf->entity);
 
-	dolibarr_set_const($db, "MAIN_PROFID1_IN_ADDRESS", GETPOST("MAIN_PROFID1_IN_ADDRESS", "nohtml"), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_PROFID2_IN_ADDRESS", GETPOST("MAIN_PROFID2_IN_ADDRESS", "nohtml"), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_PROFID3_IN_ADDRESS", GETPOST("MAIN_PROFID3_IN_ADDRESS", "nohtml"), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_PROFID4_IN_ADDRESS", GETPOST("MAIN_PROFID4_IN_ADDRESS", "nohtml"), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_PROFID5_IN_ADDRESS", GETPOST("MAIN_PROFID5_IN_ADDRESS", "nohtml"), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_PROFID6_IN_ADDRESS", GETPOST("MAIN_PROFID6_IN_ADDRESS", "nohtml"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_PROFID1_IN_ADDRESS", GETPOST("MAIN_PROFID1_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_PROFID2_IN_ADDRESS", GETPOST("MAIN_PROFID2_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_PROFID3_IN_ADDRESS", GETPOST("MAIN_PROFID3_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_PROFID4_IN_ADDRESS", GETPOST("MAIN_PROFID4_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_PROFID5_IN_ADDRESS", GETPOST("MAIN_PROFID5_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_PROFID6_IN_ADDRESS", GETPOST("MAIN_PROFID6_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
 
-	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT", $_POST["MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT"], 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT", GETPOST("MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT"), 'chaine', 0, '', $conf->entity);
 
-	dolibarr_set_const($db, "MAIN_TVAINTRA_NOT_IN_ADDRESS", $_POST["MAIN_TVAINTRA_NOT_IN_ADDRESS"], 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS", $_POST["MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS"], 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_DESC", $_POST["MAIN_GENERATE_DOCUMENTS_HIDE_DESC"], 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_REF", $_POST["MAIN_GENERATE_DOCUMENTS_HIDE_REF"], 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_TVAINTRA_NOT_IN_ADDRESS", GETPOST("MAIN_TVAINTRA_NOT_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS", GETPOST("MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_DESC", GETPOST("MAIN_GENERATE_DOCUMENTS_HIDE_DESC"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_REF", GETPOST("MAIN_GENERATE_DOCUMENTS_HIDE_REF"), 'chaine', 0, '', $conf->entity);
 
 	dolibarr_set_const($db, "MAIN_DOCUMENTS_LOGO_HEIGHT", GETPOST("MAIN_DOCUMENTS_LOGO_HEIGHT", 'int'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INVERT_SENDER_RECIPIENT", $_POST["MAIN_INVERT_SENDER_RECIPIENT"], 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_PDF_USE_ISO_LOCATION", $_POST["MAIN_PDF_USE_ISO_LOCATION"], 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS", $_POST["MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS"], 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INVERT_SENDER_RECIPIENT", GETPOST("MAIN_INVERT_SENDER_RECIPIENT"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_PDF_USE_ISO_LOCATION", GETPOST("MAIN_PDF_USE_ISO_LOCATION"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS", GETPOST("MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS"), 'chaine', 0, '', $conf->entity);
 
+	dolibarr_set_const($db, "MAIN_PDF_MAIN_HIDE_SECOND_TAX", GETPOST("MAIN_PDF_MAIN_HIDE_SECOND_TAX"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_PDF_MAIN_HIDE_THIRD_TAX", GETPOST("MAIN_PDF_MAIN_HIDE_THIRD_TAX"), 'chaine', 0, '', $conf->entity);
 
-    dolibarr_set_const($db, "MAIN_PDF_MAIN_HIDE_SECOND_TAX", $_POST["MAIN_PDF_MAIN_HIDE_SECOND_TAX"], 'chaine', 0, '', $conf->entity);
-    dolibarr_set_const($db, "MAIN_PDF_MAIN_HIDE_THIRD_TAX", $_POST["MAIN_PDF_MAIN_HIDE_THIRD_TAX"], 'chaine', 0, '', $conf->entity);
-
-    dolibarr_set_const($db, "PDF_USE_ALSO_LANGUAGE_CODE", GETPOST('PDF_USE_ALSO_LANGUAGE_CODE', 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "PDF_USE_ALSO_LANGUAGE_CODE", GETPOST('PDF_USE_ALSO_LANGUAGE_CODE', 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "SHOW_SUBPRODUCT_REF_IN_PDF", GETPOST('SHOW_SUBPRODUCT_REF_IN_PDF', 'alpha'), 'chaine', 0, '', $conf->entity);
 
 	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 
@@ -333,12 +332,16 @@ print $formadmin->select_language(GETPOSTISSET('PDF_USE_ALSO_LANGUAGE_CODE') ? G
 //}
 print '</td></tr>';
 
+// SHOW_SUBPRODUCT_REF_IN_PDF - Option to show the detail of product ref for kits.
+print '<tr class="oddeven"><td>'.$langs->trans("SHOW_SUBPRODUCT_REF_IN_PDF", $langs->transnoentitiesnoconv("AssociatedProductsAbility"), $langs->transnoentitiesnoconv("Products")).'</td><td>';
+print $form->selectyesno('SHOW_SUBPRODUCT_REF_IN_PDF', (!empty($conf->global->SHOW_SUBPRODUCT_REF_IN_PDF)) ? $conf->global->SHOW_SUBPRODUCT_REF_IN_PDF : 0, 1);
+print '</td></tr>';
 
 print '</table>';
 print '</div>';
 
 print '<br><div class="center">';
-print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
+print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
 print '</div>';
 
 print '</form>';
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index cd9d290b828..4905f4f2497 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -44,18 +44,18 @@ $entity = $conf->entity;
 
 if ($action == 'add')
 {
-    $sql = "UPDATE ".MAIN_DB_PREFIX."rights_def SET bydefault=1";
-    $sql .= " WHERE id = ".GETPOST("pid", 'int');
-    $sql .= " AND entity = ".$conf->entity;
-    $db->query($sql);
+	$sql = "UPDATE ".MAIN_DB_PREFIX."rights_def SET bydefault=1";
+	$sql .= " WHERE id = ".GETPOST("pid", 'int');
+	$sql .= " AND entity = ".$conf->entity;
+	$db->query($sql);
 }
 
 if ($action == 'remove')
 {
-    $sql = "UPDATE ".MAIN_DB_PREFIX."rights_def SET bydefault=0";
-    $sql .= " WHERE id = ".GETPOST('pid', 'int');
-    $sql .= " AND entity = ".$conf->entity;
-    $db->query($sql);
+	$sql = "UPDATE ".MAIN_DB_PREFIX."rights_def SET bydefault=0";
+	$sql .= " WHERE id = ".GETPOST('pid', 'int');
+	$sql .= " AND entity = ".$conf->entity;
+	$db->query($sql);
 }
 
 
@@ -116,7 +116,7 @@ $db->commit();
 
 $head = security_prepare_head();
 
-dol_fiche_head($head, 'default', '', -1);
+print dol_get_fiche_head($head, 'default', '', -1);
 
 
 // Show warning about external users
@@ -145,81 +145,81 @@ $sql .= " ORDER BY r.family_position, r.module_position, r.module, r.id";
 $result = $db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
-    $i = 0;
-    $oldmod = '';
+	$num = $db->num_rows($result);
+	$i = 0;
+	$oldmod = '';
 
-    while ($i < $num)
-    {
-        $obj = $db->fetch_object($result);
+	while ($i < $num)
+	{
+		$obj = $db->fetch_object($result);
 
-        // If line is for a module that doe snot existe anymore (absent of includes/module), we ignore it
-        if (empty($modules[$obj->module]))
-        {
-            $i++;
-            continue;
-        }
+		// If line is for a module that doe snot existe anymore (absent of includes/module), we ignore it
+		if (empty($modules[$obj->module]))
+		{
+			$i++;
+			continue;
+		}
 
-        // Save field module_position in database if value is still zero
-        if (empty($obj->module_position))
-        {
-        	if (is_object($modules[$obj->module]) && ($modules[$obj->module]->module_position > 0))
-        	{
-        		// TODO Define familyposition
-        		$family = $modules[$obj->module]->family_position;
-        		$familyposition = 0;
-        		$sqlupdate = 'UPDATE '.MAIN_DB_PREFIX."rights_def SET module_position = ".$modules[$obj->module]->module_position.",";
-        		$sqlupdate .= " family_position = ".$familyposition;
-        		$sqlupdate .= " WHERE module_position = 0 AND module = '".$db->escape($obj->module)."'";
-        		$db->query($sqlupdate);
-        	}
-        }
+		// Save field module_position in database if value is still zero
+		if (empty($obj->module_position))
+		{
+			if (is_object($modules[$obj->module]) && ($modules[$obj->module]->module_position > 0))
+			{
+				// TODO Define familyposition
+				$family = $modules[$obj->module]->family_position;
+				$familyposition = 0;
+				$sqlupdate = 'UPDATE '.MAIN_DB_PREFIX."rights_def SET module_position = ".$modules[$obj->module]->module_position.",";
+				$sqlupdate .= " family_position = ".$familyposition;
+				$sqlupdate .= " WHERE module_position = 0 AND module = '".$db->escape($obj->module)."'";
+				$db->query($sqlupdate);
+			}
+		}
 
-        // Check if permission we found is inside a module definition. If not, we discard it.
-        $found = false;
-        foreach ($modules[$obj->module]->rights as $key => $val)
-        {
-        	if ($val[4] == $obj->perms && (empty($val[5]) || $val[5] == $obj->subperms))
-        	{
-        		$found = true;
-        		break;
-        	}
-        }
+		// Check if permission we found is inside a module definition. If not, we discard it.
+		$found = false;
+		foreach ($modules[$obj->module]->rights as $key => $val)
+		{
+			if ($val[4] == $obj->perms && (empty($val[5]) || $val[5] == $obj->subperms))
+			{
+				$found = true;
+				break;
+			}
+		}
 		if (!$found)
 		{
 			$i++;
 			continue;
 		}
 
-        // Break found, it's a new module to catch
+		// Break found, it's a new module to catch
 		if (isset($obj->module) && ($oldmod <> $obj->module))
-        {
-        	$oldmod = $obj->module;
+		{
+			$oldmod = $obj->module;
 
-        	// Break detected, we get objMod
-            $objMod = $modules[$obj->module];
-            $picto = ($objMod->picto ? $objMod->picto : 'generic');
+			// Break detected, we get objMod
+			$objMod = $modules[$obj->module];
+			$picto = ($objMod->picto ? $objMod->picto : 'generic');
 
-            // Show break line
-            print '<tr class="oddeven trforbreak">';
-            print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">';
-            print img_object('', $picto, 'class="pictoobjectwidth paddingright"').' '.$objMod->getName();
-            print '<a name="'.$objMod->getName().'"></a>';
-            print '</td>';
-           	print '<td>&nbsp;</td>';
-            print '<td>&nbsp;</td>';
-            print '<td>&nbsp;</td>';
-            // Permission id
-            if ($user->admin) print '<td class="right"></td>';
-            print '</tr>'."\n";
-        }
+			// Show break line
+			print '<tr class="oddeven trforbreak">';
+			print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">';
+			print img_object('', $picto, 'class="pictoobjectwidth paddingright"').' '.$objMod->getName();
+			print '<a name="'.$objMod->getName().'"></a>';
+			print '</td>';
+		   	print '<td>&nbsp;</td>';
+			print '<td>&nbsp;</td>';
+			print '<td>&nbsp;</td>';
+			// Permission id
+			if ($user->admin) print '<td class="right"></td>';
+			print '</tr>'."\n";
+		}
 
-        $perm_libelle = ($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id) != ("PermissionAdvanced".$obj->id)) ? $langs->trans("PermissionAdvanced".$obj->id) : (($langs->trans("Permission".$obj->id) != ("Permission".$obj->id)) ? $langs->trans("Permission".$obj->id) : $obj->label));
+		$perm_libelle = ($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id) != ("PermissionAdvanced".$obj->id)) ? $langs->trans("PermissionAdvanced".$obj->id) : (($langs->trans("Permission".$obj->id) != ("Permission".$obj->id)) ? $langs->trans("Permission".$obj->id) : $obj->label));
 
-        print '<tr class="oddeven">';
+		print '<tr class="oddeven">';
 
-        // Picto and label of module
-        print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">';
+		// Picto and label of module
+		print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">';
 		print '</td>';
 
 		// Tick
@@ -247,20 +247,20 @@ if ($result)
 		}
 
 		// Permission and tick
-        print '<td>'.$perm_libelle.'</td>';
+		print '<td>'.$perm_libelle.'</td>';
 
-        // Permission id
-        if ($user->admin) print '<td class="right"><span class="opacitymedium">'.$obj->id.'</span></td>';
+		// Permission id
+		if ($user->admin) print '<td class="right"><span class="opacitymedium">'.$obj->id.'</span></td>';
 
-        print '</tr>'."\n";
+		print '</tr>'."\n";
 
-        $i++;
-    }
+		$i++;
+	}
 } else dol_print_error($db);
 print '</table>';
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index 50d01924364..72e116ab3a7 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -199,7 +199,7 @@ print '</td></tr>';
 print '</table>';
 print '<br>';
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
+print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
 
 print '</form>';
 
@@ -347,7 +347,7 @@ foreach ($dirmodels as $reldir)
                                 print '<td class="center">';
                                 if ($module->type == 'pdf')
                                 {
-                                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
+                                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
                                 }
                                 else
                                 {
@@ -368,7 +368,7 @@ foreach ($dirmodels as $reldir)
 */
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<br>';
 
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 3b574956cd0..78c22e7b397 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -76,7 +76,7 @@ if ($action == 'updateMask') {
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir)
 	{
-	    $file = dol_buildpath($reldir."core/modules/propale/doc/pdf_".$modele.".modules.php");
+		$file = dol_buildpath($reldir."core/modules/propale/doc/pdf_".$modele.".modules.php");
 		if (file_exists($file))
 		{
 			$filefound = 1;
@@ -154,25 +154,25 @@ if ($action == 'updateMask') {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 } elseif ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL') {
-    $res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL", $value, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL", $value, 'chaine', 0, '', $conf->entity);
 
-    if (!$res > 0) $error++;
+	if (!$res > 0) $error++;
 
-    if (!$error) {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 } elseif ($action == 'set') {
 	// Activate a model
 	$ret = addDocumentModel($value, $type, $label, $scandir);
 } elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
-        if ($conf->global->PROPALE_ADDON_PDF == "$value") dolibarr_del_const($db, 'PROPALE_ADDON_PDF', $conf->entity);
+		if ($conf->global->PROPALE_ADDON_PDF == "$value") dolibarr_del_const($db, 'PROPALE_ADDON_PDF', $conf->entity);
 	}
 } elseif ($action == 'setdoc') {
-    if (dolibarr_set_const($db, "PROPALE_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity)) {
+	if (dolibarr_set_const($db, "PROPALE_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity)) {
 		$conf->global->PROPALE_ADDON_PDF = $value;
 	}
 
@@ -206,7 +206,7 @@ print load_fiche_titre($langs->trans("PropalSetup"), $linkback, 'title_setup');
 
 $head = propal_admin_prepare_head();
 
-dol_fiche_head($head, 'general', $langs->trans("Proposals"), -1, 'propal');
+print dol_get_fiche_head($head, 'general', $langs->trans("Proposals"), -1, 'propal');
 
 /*
  *  Module numerotation
@@ -253,13 +253,15 @@ foreach ($dirmodels as $reldir)
 						print $module->info();
 						print '</td>';
 
-                        // Show example of numbering module
-                        print '<td class="nowrap">';
-                        $tmp = $module->getExample();
-                        if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-                        elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-                        else print $tmp;
-                        print '</td>'."\n";
+						// Show example of numbering module
+						print '<td class="nowrap">';
+						$tmp = $module->getExample();
+						if (preg_match('/^Error/', $tmp)) {
+							$langs->load("errors");
+							print '<div class="error">'.$langs->trans($tmp).'</div>';
+						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						else print $tmp;
+						print '</td>'."\n";
 
 						print '<td class="center">';
 						if ($conf->global->PROPALE_ADDON == "$file")
@@ -280,16 +282,16 @@ foreach ($dirmodels as $reldir)
 						$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 						$propal->type = 0;
 						$nextval = $module->getNextValue($mysoc, $propal);
-                        if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-                            $htmltooltip .= ''.$langs->trans("NextValue").': ';
-                            if ($nextval) {
-                                if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
-                                    $nextval = $langs->trans($nextval);
-                                $htmltooltip .= $nextval.'<br>';
-                            } else {
-                                $htmltooltip .= $langs->trans($module->error).'<br>';
-                            }
-                        }
+						if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+							$htmltooltip .= ''.$langs->trans("NextValue").': ';
+							if ($nextval) {
+								if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+									$nextval = $langs->trans($nextval);
+								$htmltooltip .= $nextval.'<br>';
+							} else {
+								$htmltooltip .= $langs->trans($module->error).'<br>';
+							}
+						}
 
 						print '<td class="center">';
 						print $form->textwithpicto('', $htmltooltip, 1, 0);
@@ -348,83 +350,83 @@ clearstatcache();
 
 foreach ($dirmodels as $reldir)
 {
-    foreach (array('', '/doc') as $valdir)
-    {
-    	$realpath = $reldir."core/modules/propale".$valdir;
-    	$dir = dol_buildpath($realpath);
+	foreach (array('', '/doc') as $valdir)
+	{
+		$realpath = $reldir."core/modules/propale".$valdir;
+		$dir = dol_buildpath($realpath);
 
-        if (is_dir($dir))
-        {
-            $handle = opendir($dir);
-            if (is_resource($handle))
-            {
-                while (($file = readdir($handle)) !== false)
-                {
-                    $filelist[] = $file;
-                }
-                closedir($handle);
-                arsort($filelist);
+		if (is_dir($dir))
+		{
+			$handle = opendir($dir);
+			if (is_resource($handle))
+			{
+				while (($file = readdir($handle)) !== false)
+				{
+					$filelist[] = $file;
+				}
+				closedir($handle);
+				arsort($filelist);
 
-                foreach ($filelist as $file)
-                {
-                    if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-                    {
-                    	if (file_exists($dir.'/'.$file))
-                    	{
-                    		$name = substr($file, 4, dol_strlen($file) - 16);
-	                        $classname = substr($file, 0, dol_strlen($file) - 12);
+				foreach ($filelist as $file)
+				{
+					if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
+					{
+						if (file_exists($dir.'/'.$file))
+						{
+							$name = substr($file, 4, dol_strlen($file) - 16);
+							$classname = substr($file, 0, dol_strlen($file) - 12);
 
-	                        require_once $dir.'/'.$file;
-	                        $module = new $classname($db);
+							require_once $dir.'/'.$file;
+							$module = new $classname($db);
 
-	                        $modulequalified = 1;
-	                        if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
-	                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+							$modulequalified = 1;
+							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
+							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
 
-	                        if ($modulequalified)
-	                        {
-	                            $var = !$var;
-	                            print '<tr class="oddeven"><td width="100">';
-	                            print (empty($module->name) ? $name : $module->name);
-	                            print "</td><td>\n";
-	                            if (method_exists($module, 'info')) print $module->info($langs);
-	                            else print $module->description;
-	                            print '</td>';
+							if ($modulequalified)
+							{
+								$var = !$var;
+								print '<tr class="oddeven"><td width="100">';
+								print (empty($module->name) ? $name : $module->name);
+								print "</td><td>\n";
+								if (method_exists($module, 'info')) print $module->info($langs);
+								else print $module->description;
+								print '</td>';
 
-	                            // Active
-	                            if (in_array($name, $def))
-	                            {
-	                            	print '<td class="center">'."\n";
-	                            	print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'">';
-	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
-	                            	print '</a>';
-	                            	print '</td>';
-	                            } else {
-	                                print "<td align=\"center\">\n";
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-	                                print "</td>";
-	                            }
+								// Active
+								if (in_array($name, $def))
+								{
+									print '<td class="center">'."\n";
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'">';
+									print img_picto($langs->trans("Enabled"), 'switch_on');
+									print '</a>';
+									print '</td>';
+								} else {
+									print "<td align=\"center\">\n";
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print "</td>";
+								}
 
-	                            // Defaut
-	                            print "<td align=\"center\">";
-	                            if ($conf->global->PROPALE_ADDON_PDF == "$name")
-	                            {
-	                                print img_picto($langs->trans("Default"), 'on');
-	                            } else {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	                            }
-	                            print '</td>';
+								// Defaut
+								print "<td align=\"center\">";
+								if ($conf->global->PROPALE_ADDON_PDF == "$name")
+								{
+									print img_picto($langs->trans("Default"), 'on');
+								} else {
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+								}
+								print '</td>';
 
-	                            // Info
-	                            $htmltooltip = $langs->trans("Name").': '.$module->name;
-	                            $htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-	                            if ($module->type == 'pdf')
-	                            {
-	                                $htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-	                            }
-	                            $htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
+								// Info
+								$htmltooltip = $langs->trans("Name").': '.$module->name;
+								$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+								if ($module->type == 'pdf')
+								{
+									$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+								}
+								$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
 
-	                            $htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+								$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
 								$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
 								$htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
 								$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
@@ -434,28 +436,28 @@ foreach ($dirmodels as $reldir)
 								$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftProposal").': '.yn($module->option_draft_watermark, 1, 1);
 
 
-	                            print '<td class="center">';
-	                            print $form->textwithpicto('', $htmltooltip, 1, 0);
-	                            print '</td>';
+								print '<td class="center">';
+								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print '</td>';
 
-	                            // Preview
-	                            print '<td class="center">';
-	                            if ($module->type == 'pdf')
-	                            {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-	                            } else {
-	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
-	                            }
-	                            print '</td>';
+								// Preview
+								print '<td class="center">';
+								if ($module->type == 'pdf')
+								{
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
+								} else {
+									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+								}
+								print '</td>';
 
-	                            print "</tr>\n";
-	                        }
-                    	}
-                    }
-                }
-            }
-        }
-    }
+								print "</tr>\n";
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 }
 
 print '</table>';
@@ -623,11 +625,11 @@ print $form->textwithpicto($langs->trans("FreeLegalTextOnProposal"), $langs->tra
 $variablename = 'PROPOSAL_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
-    print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 } else {
-    include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
-    print $doleditor->Create();
+	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+	print $doleditor->Create();
 }
 print '</td><td class="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php
index 795cbec5ede..0349f8a3435 100644
--- a/htdocs/admin/proxy.php
+++ b/htdocs/admin/proxy.php
@@ -94,7 +94,7 @@ print '<input type="hidden" name="action" value="set_proxy">';
 
 $head = security_prepare_head();
 
-dol_fiche_head($head, 'proxy', '', -1);
+print dol_get_fiche_head($head, 'proxy', '', -1);
 
 
 if ($conf->use_javascript_ajax)
@@ -135,7 +135,7 @@ print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ConnectionTimeout").'</td><td class="right">';
 print '</td>';
 print '<td class="nowrap">';
-print '<input class="flat" name="MAIN_USE_CONNECT_TIMEOUT" type="text" size="4" value="'.(isset($_POST["MAIN_USE_CONNECT_TIMEOUT"]) ?GETPOST("MAIN_USE_CONNECT_TIMEOUT") : $conf->global->MAIN_USE_CONNECT_TIMEOUT).'">';
+print '<input class="flat" name="MAIN_USE_CONNECT_TIMEOUT" type="text" size="4" value="'.(GETPOSTISSET("MAIN_USE_CONNECT_TIMEOUT") ? GETPOST("MAIN_USE_CONNECT_TIMEOUT") : $conf->global->MAIN_USE_CONNECT_TIMEOUT).'">';
 print ' '.strtolower($langs->trans("Seconds"));
 print '</td>';
 print '</tr>';
@@ -197,7 +197,7 @@ print '</tr>';
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center">';
 print '<input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'">';
diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index 92b9ffbd8b4..3c878c5c664 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -43,7 +43,7 @@ $printername = GETPOST('printername', 'alpha');
 $printerid = GETPOST('printerid', 'int');
 $parameter = GETPOST('parameter', 'alpha');
 
-$template = GETPOST('template', 'alpha');
+$template = GETPOST('template', 'nohtml');
 $templatename = GETPOST('templatename', 'alpha');
 $templateid = GETPOST('templateid', 'int');
 
@@ -53,16 +53,16 @@ if (!$mode) $mode = 'config';
 
 // used in library escpos maybe useful if php doesn't support gzdecode
 if (!function_exists('gzdecode')) {
-    /**
-     * Gzdecode
-     *
-     * @param string    $data   data to deflate
-     * @return string           data deflated
-     */
-    function gzdecode($data)
-    {
-        return gzinflate(substr($data, 10, -8));
-    }
+	/**
+	 * Gzdecode
+	 *
+	 * @param string    $data   data to deflate
+	 * @return string           data deflated
+	 */
+	function gzdecode($data)
+	{
+		return gzinflate(substr($data, 10, -8));
+	}
 }
 
 
@@ -71,167 +71,167 @@ if (!function_exists('gzdecode')) {
  */
 
 if ($action == 'addprinter' && $user->admin) {
-    $error = 0;
-    if (empty($printername)) {
-        $error++;
-        setEventMessages($langs->trans("PrinterNameEmpty"), null, 'errors');
-    }
+	$error = 0;
+	if (empty($printername)) {
+		$error++;
+		setEventMessages($langs->trans("PrinterNameEmpty"), null, 'errors');
+	}
 
-    if (empty($parameter)) {
-        setEventMessages($langs->trans("PrinterParameterEmpty"), null, 'warnings');
-    }
+	if (empty($parameter)) {
+		setEventMessages($langs->trans("PrinterParameterEmpty"), null, 'warnings');
+	}
 
-    if (!$error) {
-    	$db->begin();
-    	$result = $printer->addPrinter($printername, GETPOST('printertypeid', 'int'), GETPOST('printerprofileid', 'int'), $parameter);
-        if ($result > 0) $error++;
+	if (!$error) {
+		$db->begin();
+		$result = $printer->addPrinter($printername, GETPOST('printertypeid', 'int'), GETPOST('printerprofileid', 'int'), $parameter);
+		if ($result > 0) $error++;
 
-        if (!$error)
-        {
-            $db->commit();
-            setEventMessages($langs->trans("PrinterAdded", $printername), null);
-        } else {
-            $db->rollback();
-            dol_print_error($db);
-        }
-    }
-    $action = '';
+		if (!$error)
+		{
+			$db->commit();
+			setEventMessages($langs->trans("PrinterAdded", $printername), null);
+		} else {
+			$db->rollback();
+			dol_print_error($db);
+		}
+	}
+	$action = '';
 }
 
 if ($action == 'deleteprinter' && $user->admin) {
-    $error = 0;
-    if (empty($printerid)) {
-        $error++;
-        setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
-    }
+	$error = 0;
+	if (empty($printerid)) {
+		$error++;
+		setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
+	}
 
-    if (!$error) {
-    	$db->begin();
-    	$result = $printer->deletePrinter($printerid);
-        if ($result > 0) $error++;
+	if (!$error) {
+		$db->begin();
+		$result = $printer->deletePrinter($printerid);
+		if ($result > 0) $error++;
 
-        if (!$error)
-        {
-            $db->commit();
-            setEventMessages($langs->trans("PrinterDeleted", $printername), null);
-        } else {
-            $db->rollback();
-            dol_print_error($db);
-        }
-    }
-    $action = '';
+		if (!$error)
+		{
+			$db->commit();
+			setEventMessages($langs->trans("PrinterDeleted", $printername), null);
+		} else {
+			$db->rollback();
+			dol_print_error($db);
+		}
+	}
+	$action = '';
 }
 
 if ($action == 'updateprinter' && $user->admin) {
-    $error = 0;
-    if (empty($printerid)) {
-        $error++;
-        setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
-    }
+	$error = 0;
+	if (empty($printerid)) {
+		$error++;
+		setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
+	}
 
-    if (!$error) {
-    	$db->begin();
-    	$result = $printer->updatePrinter($printername, GETPOST('printertypeid', 'int'), GETPOST('printerprofileid', 'int'), $parameter, $printerid);
-        if ($result > 0) $error++;
+	if (!$error) {
+		$db->begin();
+		$result = $printer->updatePrinter($printername, GETPOST('printertypeid', 'int'), GETPOST('printerprofileid', 'int'), $parameter, $printerid);
+		if ($result > 0) $error++;
 
-        if (!$error) {
-            $db->commit();
-            setEventMessages($langs->trans("PrinterUpdated", $printername), null);
-        } else {
-            $db->rollback();
-            dol_print_error($db);
-        }
-    }
-    $action = '';
+		if (!$error) {
+			$db->commit();
+			setEventMessages($langs->trans("PrinterUpdated", $printername), null);
+		} else {
+			$db->rollback();
+			dol_print_error($db);
+		}
+	}
+	$action = '';
 }
 
 if ($action == 'testprinter' && $user->admin) {
-    $error = 0;
-    if (empty($printerid)) {
-        $error++;
-        setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
-    }
+	$error = 0;
+	if (empty($printerid)) {
+		$error++;
+		setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
+	}
 
-    if (!$error) {
-        // test
-        $ret = $printer->sendTestToPrinter($printerid);
-        if ($ret == 0) {
-            setEventMessages($langs->trans("TestSentToPrinter", $printername), null);
-        } else {
-            setEventMessages($printer->error, $printer->errors, 'errors');
-        }
-    }
-    $action = '';
+	if (!$error) {
+		// test
+		$ret = $printer->sendTestToPrinter($printerid);
+		if ($ret == 0) {
+			setEventMessages($langs->trans("TestSentToPrinter", $printername), null);
+		} else {
+			setEventMessages($printer->error, $printer->errors, 'errors');
+		}
+	}
+	$action = '';
 }
 
 if ($action == 'testtemplate' && $user->admin) {
-    $error = 0;
-    // if (empty($printerid)) {
-    //     $error++;
-    //     setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
-    // }
+	$error = 0;
+	// if (empty($printerid)) {
+	//     $error++;
+	//     setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
+	// }
 
-    // if (! $error) {
+	// if (! $error) {
 	// test
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 	$object = new Facture($db);
 	//$object->initAsSpecimen();
 	$object->fetch(18);
 	//var_dump($object->lines);
-    $ret = $printer->sendToPrinter($object, $templateid, 1);
-    if ($ret == 0) {
-        setEventMessages($langs->trans("TestTemplateToPrinter", $printername), null);
-    } else {
-        setEventMessages($printer->error, $printer->errors, 'errors');
-    }
-    //}
-    $action = '';
+	$ret = $printer->sendToPrinter($object, $templateid, 1);
+	if ($ret == 0) {
+		setEventMessages($langs->trans("TestTemplateToPrinter", $printername), null);
+	} else {
+		setEventMessages($printer->error, $printer->errors, 'errors');
+	}
+	//}
+	$action = '';
 }
 
 if ($action == 'updatetemplate' && $user->admin) {
-    $error = 0;
-    if (empty($templateid)) {
-        $error++;
-        setEventMessages($langs->trans("TemplateIdEmpty"), null, 'errors');
-    }
+	$error = 0;
+	if (empty($templateid)) {
+		$error++;
+		setEventMessages($langs->trans("TemplateIdEmpty"), null, 'errors');
+	}
 
-    if (!$error) {
-    	$db->begin();
-    	$result = $printer->updateTemplate($templatename, $template, $templateid);
-        if ($result > 0) $error++;
+	if (!$error) {
+		$db->begin();
+		$result = $printer->updateTemplate($templatename, $template, $templateid);
+		if ($result > 0) $error++;
 
-        if (!$error) {
-            $db->commit();
-            setEventMessages($langs->trans("TemplateUpdated", $templatename), null);
-        } else {
-            $db->rollback();
-            dol_print_error($db);
-        }
-    }
-    $action = '';
+		if (!$error) {
+			$db->commit();
+			setEventMessages($langs->trans("TemplateUpdated", $templatename), null);
+		} else {
+			$db->rollback();
+			dol_print_error($db);
+		}
+	}
+	$action = '';
 }
 
 if ($action == 'addtemplate' && $user->admin) {
-    $error = 0;
-    if (empty($templatename)) {
-        $error++;
-        setEventMessages($langs->trans("TemplateNameEmpty"), null, 'errors');
-    }
+	$error = 0;
+	if (empty($templatename)) {
+		$error++;
+		setEventMessages($langs->trans("TemplateNameEmpty"), null, 'errors');
+	}
 
-    if (!$error) {
-    	$db->begin();
-    	$result = $printer->addTemplate($templatename, $template);
-        if ($result > 0) $error++;
+	if (!$error) {
+		$db->begin();
+		$result = $printer->addTemplate($templatename, $template);
+		if ($result > 0) $error++;
 
-        if (!$error) {
-            $db->commit();
-            setEventMessages($langs->trans("TemplateAdded", $templatename), null);
-        } else {
-            $db->rollback();
-            dol_print_error($db);
-        }
-    }
-    $action = '';
+		if (!$error) {
+			$db->commit();
+			setEventMessages($langs->trans("TemplateAdded", $templatename), null);
+		} else {
+			$db->rollback();
+			dol_print_error($db);
+		}
+	}
+	$action = '';
 }
 
 if ($action == 'deletetemplate' && $user->admin) {
@@ -273,173 +273,173 @@ $head = receiptprinteradmin_prepare_head($mode);
 
 // mode = config
 if ($mode == 'config' && $user->admin) {
-    print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=config" autocomplete="off">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    if ($action != 'editprinter') {
-        print '<input type="hidden" name="action" value="addprinter">';
-    } else {
-        print '<input type="hidden" name="action" value="updateprinter">';
-    }
+	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=config" autocomplete="off">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	if ($action != 'editprinter') {
+		print '<input type="hidden" name="action" value="addprinter">';
+	} else {
+		print '<input type="hidden" name="action" value="updateprinter">';
+	}
 
 
-    dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
+	print dol_get_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
 
-    print '<span class="opacitymedium">'.$langs->trans("ReceiptPrinterDesc")."</span><br><br>\n";
+	print '<span class="opacitymedium">'.$langs->trans("ReceiptPrinterDesc")."</span><br><br>\n";
 
-    print '<table class="noborder centpercent">'."\n";
-    print '<tr class="liste_titre">';
-    print '<th>'.$langs->trans("Name").'</th>';
-    print '<th>'.$langs->trans("Type").'</th>';
-    print '<th>'.$langs->trans("Profile").'</th>';
-    print '<th>'.$langs->trans("Parameters").'</th>';
-    print '<th></th>';
-    print "</tr>\n";
-    $ret = $printer->listprinters();
-    $nbofprinters = count($printer->listprinters);
+	print '<table class="noborder centpercent">'."\n";
+	print '<tr class="liste_titre">';
+	print '<th>'.$langs->trans("Name").'</th>';
+	print '<th>'.$langs->trans("Type").'</th>';
+	print '<th>'.$langs->trans("Profile").'</th>';
+	print '<th>'.$langs->trans("Parameters").'</th>';
+	print '<th></th>';
+	print "</tr>\n";
+	$ret = $printer->listprinters();
+	$nbofprinters = count($printer->listprinters);
 
-    if ($action != 'editprinter') {
-    	print '<tr>';
-    	print '<td><input size="50" type="text" name="printername"></td>';
-    	$ret = $printer->selectTypePrinter();
-    	print '<td>'.$printer->resprint.'</td>';
-    	$ret = $printer->selectProfilePrinter();
-    	print '<td>'.$printer->profileresprint.'</td>';
-    	print '<td><input size="60" type="text" name="parameter"></td>';
-    	print '<td class="right">';
-    	if ($action != 'editprinter') {
-    		print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Add")).'"></div>';
-    	}
-    	print '</td>';
-    	print '</tr>';
-    }
+	if ($action != 'editprinter') {
+		print '<tr>';
+		print '<td><input size="50" type="text" name="printername"></td>';
+		$ret = $printer->selectTypePrinter();
+		print '<td>'.$printer->resprint.'</td>';
+		$ret = $printer->selectProfilePrinter();
+		print '<td>'.$printer->profileresprint.'</td>';
+		print '<td><input size="60" type="text" name="parameter"></td>';
+		print '<td class="right">';
+		if ($action != 'editprinter') {
+			print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Add")).'"></div>';
+		}
+		print '</td>';
+		print '</tr>';
+	}
 
-    if ($ret > 0) {
-        setEventMessages($printer->error, $printer->errors, 'errors');
-    } else {
-        for ($line = 0; $line < $nbofprinters; $line++) {
-            print '<tr class="oddeven">';
-            if ($action == 'editprinter' && $printer->listprinters[$line]['rowid'] == $printerid) {
-                print '<input type="hidden" name="printerid" value="'.$printer->listprinters[$line]['rowid'].'">';
-                print '<td><input size="50" type="text" name="printername" value="'.$printer->listprinters[$line]['name'].'"></td>';
-                $ret = $printer->selectTypePrinter($printer->listprinters[$line]['fk_type']);
-                print '<td>'.$printer->resprint.'</td>';
-                $ret = $printer->selectProfilePrinter($printer->listprinters[$line]['fk_profile']);
-                print '<td>'.$printer->profileresprint.'</td>';
-                print '<td><input size="60" type="text" name="parameter" value="'.$printer->listprinters[$line]['parameter'].'"></td>';
-                print '<td>';
-                print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
-                print '</td>';
-                print '</tr>';
-            } else {
-                print '<td>'.$printer->listprinters[$line]['name'].'</td>';
-                print '<td>'.$langs->trans($printer->listprinters[$line]['fk_type_name']).'</td>';
-                print '<td>'.$langs->trans($printer->listprinters[$line]['fk_profile_name']).'</td>';
-                print '<td>'.$printer->listprinters[$line]['parameter'].'</td>';
-                // edit icon
-                print '<td class="right"><a class="editfielda marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=config&amp;action=editprinter&amp;printerid='.$printer->listprinters[$line]['rowid'].'">';
-                print img_picto($langs->trans("Edit"), 'edit');
-                print '</a>';
-                // delete icon
-                print '<a class="marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=config&amp;action=deleteprinter&amp;token='.newToken().'&amp;printerid='.$printer->listprinters[$line]['rowid'].'&amp;printername='.$printer->listprinters[$line]['name'].'">';
-                print img_picto($langs->trans("Delete"), 'delete');
-                print '</a>';
-                // test icon
-                print '<a class="marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=config&amp;action=testprinter&amp;token='.newToken().'&amp;printerid='.$printer->listprinters[$line]['rowid'].'&amp;printername='.$printer->listprinters[$line]['name'].'">';
-                print img_picto($langs->trans("TestPrinter"), 'printer');
-                print '</a></td>';
-                print '</tr>';
-            }
-        }
-    }
+	if ($ret > 0) {
+		setEventMessages($printer->error, $printer->errors, 'errors');
+	} else {
+		for ($line = 0; $line < $nbofprinters; $line++) {
+			print '<tr class="oddeven">';
+			if ($action == 'editprinter' && $printer->listprinters[$line]['rowid'] == $printerid) {
+				print '<input type="hidden" name="printerid" value="'.$printer->listprinters[$line]['rowid'].'">';
+				print '<td><input size="50" type="text" name="printername" value="'.$printer->listprinters[$line]['name'].'"></td>';
+				$ret = $printer->selectTypePrinter($printer->listprinters[$line]['fk_type']);
+				print '<td>'.$printer->resprint.'</td>';
+				$ret = $printer->selectProfilePrinter($printer->listprinters[$line]['fk_profile']);
+				print '<td>'.$printer->profileresprint.'</td>';
+				print '<td><input size="60" type="text" name="parameter" value="'.$printer->listprinters[$line]['parameter'].'"></td>';
+				print '<td>';
+				print '<div class="center"><input type="submit" class="button button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
+				print '</td>';
+				print '</tr>';
+			} else {
+				print '<td>'.$printer->listprinters[$line]['name'].'</td>';
+				print '<td>'.$langs->trans($printer->listprinters[$line]['fk_type_name']).'</td>';
+				print '<td>'.$langs->trans($printer->listprinters[$line]['fk_profile_name']).'</td>';
+				print '<td>'.$printer->listprinters[$line]['parameter'].'</td>';
+				// edit icon
+				print '<td class="right"><a class="editfielda marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=config&amp;action=editprinter&amp;printerid='.$printer->listprinters[$line]['rowid'].'">';
+				print img_picto($langs->trans("Edit"), 'edit');
+				print '</a>';
+				// delete icon
+				print '<a class="marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=config&amp;action=deleteprinter&amp;token='.newToken().'&amp;printerid='.$printer->listprinters[$line]['rowid'].'&amp;printername='.$printer->listprinters[$line]['name'].'">';
+				print img_picto($langs->trans("Delete"), 'delete');
+				print '</a>';
+				// test icon
+				print '<a class="marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=config&amp;action=testprinter&amp;token='.newToken().'&amp;printerid='.$printer->listprinters[$line]['rowid'].'&amp;printername='.$printer->listprinters[$line]['name'].'">';
+				print img_picto($langs->trans("TestPrinter"), 'printer');
+				print '</a></td>';
+				print '</tr>';
+			}
+		}
+	}
 
-    print '</table>';
+	print '</table>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '</form>';
+	print '</form>';
 
-    print '<br>';
+	print '<br>';
 
 
-    print load_fiche_titre($langs->trans("ReceiptPrinterTypeDesc"), '', '')."\n";
+	print load_fiche_titre($langs->trans("ReceiptPrinterTypeDesc"), '', '')."\n";
 
-    print '<table class="noborder centpercent">'."\n";
-    print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_DUMMY").':</td><td>'.$langs->trans("CONNECTOR_DUMMY_HELP").'</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_NETWORK_PRINT").':</td><td>'.$langs->trans("CONNECTOR_NETWORK_PRINT_HELP").'</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_FILE_PRINT").':</td><td>'.$langs->trans("CONNECTOR_FILE_PRINT_HELP").'</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_WINDOWS_PRINT").':</td><td>'.$langs->trans("CONNECTOR_WINDOWS_PRINT_HELP").'</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_CUPS_PRINT").':</td><td>'.$langs->trans("CONNECTOR_CUPS_PRINT_HELP").'</td></tr>';
-    print '</table>';
+	print '<table class="noborder centpercent">'."\n";
+	print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_DUMMY").':</td><td>'.$langs->trans("CONNECTOR_DUMMY_HELP").'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_NETWORK_PRINT").':</td><td>'.$langs->trans("CONNECTOR_NETWORK_PRINT_HELP").'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_FILE_PRINT").':</td><td>'.$langs->trans("CONNECTOR_FILE_PRINT_HELP").'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_WINDOWS_PRINT").':</td><td>'.$langs->trans("CONNECTOR_WINDOWS_PRINT_HELP").'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_CUPS_PRINT").':</td><td>'.$langs->trans("CONNECTOR_CUPS_PRINT_HELP").'</td></tr>';
+	print '</table>';
 
-    print '<br>';
+	print '<br>';
 
 
-    print load_fiche_titre($langs->trans("ReceiptPrinterProfileDesc"), '', '')."\n";
+	print load_fiche_titre($langs->trans("ReceiptPrinterProfileDesc"), '', '')."\n";
 
-    print '<table class="noborder centpercent">'."\n";
-    print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_DEFAULT").':</td><td>'.$langs->trans("PROFILE_DEFAULT_HELP").'</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_SIMPLE").':</td><td>'.$langs->trans("PROFILE_SIMPLE_HELP").'</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_EPOSTEP").':</td><td>'.$langs->trans("PROFILE_EPOSTEP_HELP").'</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_P822D").':</td><td>'.$langs->trans("PROFILE_P822D_HELP").'</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_STAR").':</td><td>'.$langs->trans("PROFILE_STAR_HELP").'</td></tr>';
-    print '</table>';
+	print '<table class="noborder centpercent">'."\n";
+	print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_DEFAULT").':</td><td>'.$langs->trans("PROFILE_DEFAULT_HELP").'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_SIMPLE").':</td><td>'.$langs->trans("PROFILE_SIMPLE_HELP").'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_EPOSTEP").':</td><td>'.$langs->trans("PROFILE_EPOSTEP_HELP").'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_P822D").':</td><td>'.$langs->trans("PROFILE_P822D_HELP").'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_STAR").':</td><td>'.$langs->trans("PROFILE_STAR_HELP").'</td></tr>';
+	print '</table>';
 }
 
 // mode = template
 if ($mode == 'template' && $user->admin) {
-	dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
+	print dol_get_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
 
 	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=template" autocomplete="off">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    if ($action != 'edittemplate') {
-        print '<input type="hidden" name="action" value="addtemplate">';
-    } else {
-        print '<input type="hidden" name="action" value="updatetemplate">';
-    }
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	if ($action != 'edittemplate') {
+		print '<input type="hidden" name="action" value="addtemplate">';
+	} else {
+		print '<input type="hidden" name="action" value="updatetemplate">';
+	}
 
-    print '<table class="noborder centpercent">'."\n";
-    print '<tr class="liste_titre">';
-    print '<th>'.$langs->trans("Name").'</th>';
-    print '<th>'.$langs->trans("Template").'</th>';
-    print '<th></th>';
-    print "</tr>\n";
-    $ret = $printer->listPrintersTemplates();
-    //print '<pre>'.print_r($printer->listprinterstemplates, true).'</pre>';
-    if ($ret > 0) {
-        setEventMessages($printer->error, $printer->errors, 'errors');
-    } else {
-        $max = count($printer->listprinterstemplates);
-        for ($line = 0; $line < $max; $line++) {
-            print '<tr class="oddeven">';
-            if ($action == 'edittemplate' && $printer->listprinterstemplates[$line]['rowid'] == $templateid) {
-                print '<input type="hidden" name="templateid" value="'.$printer->listprinterstemplates[$line]['rowid'].'">';
-                print '<td><input size="50" type="text" name="templatename" value="'.$printer->listprinterstemplates[$line]['name'].'"></td>';
-                print '<td>';
-                print '<textarea name="template" wrap="soft" cols="120" rows="12">'.$printer->listprinterstemplates[$line]['template'].'</textarea>';
-                print '</td>';
-                print '<td></td>';
-            } else {
-                print '<td>'.$printer->listprinterstemplates[$line]['name'].'</td>';
-                print '<td>'.nl2br(htmlentities($printer->listprinterstemplates[$line]['template'])).'</td>';
-                // edit icon
-                print '<td><a class="editfielda paddingleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=edittemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'">';
-                print img_picto($langs->trans("Edit"), 'edit');
-                print '</a>';
-                // delete icon
-                print '<a class="paddingleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=deletetemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'&amp;templatename='.$printer->listprinterstemplates[$line]['name'].'">';
-                print img_picto($langs->trans("Delete"), 'delete');
-                print '</a>';
-                // test icon
-                print '<a class="paddingleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=testtemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'&amp;templatename='.$printer->listprinterstemplates[$line]['name'].'">';
-                print img_picto($langs->trans("TestPrinterTemplate"), 'printer');
-                print '</a></td>';
-            }
-            print '</tr>';
-        }
-    }
+	print '<table class="noborder centpercent">'."\n";
+	print '<tr class="liste_titre">';
+	print '<th>'.$langs->trans("Name").'</th>';
+	print '<th>'.$langs->trans("Template").'</th>';
+	print '<th></th>';
+	print "</tr>\n";
+	$ret = $printer->listPrintersTemplates();
+	//print '<pre>'.print_r($printer->listprinterstemplates, true).'</pre>';
+	if ($ret > 0) {
+		setEventMessages($printer->error, $printer->errors, 'errors');
+	} else {
+		$max = count($printer->listprinterstemplates);
+		for ($line = 0; $line < $max; $line++) {
+			print '<tr class="oddeven">';
+			if ($action == 'edittemplate' && $printer->listprinterstemplates[$line]['rowid'] == $templateid) {
+				print '<input type="hidden" name="templateid" value="'.$printer->listprinterstemplates[$line]['rowid'].'">';
+				print '<td><input size="50" type="text" name="templatename" value="'.$printer->listprinterstemplates[$line]['name'].'"></td>';
+				print '<td>';
+				print '<textarea name="template" wrap="soft" cols="120" rows="12">'.$printer->listprinterstemplates[$line]['template'].'</textarea>';
+				print '</td>';
+				print '<td></td>';
+			} else {
+				print '<td>'.$printer->listprinterstemplates[$line]['name'].'</td>';
+				print '<td>'.dol_htmlentitiesbr($printer->listprinterstemplates[$line]['template']).'</td>';
+				// edit icon
+				print '<td><a class="editfielda paddingleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=edittemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'">';
+				print img_picto($langs->trans("Edit"), 'edit');
+				print '</a>';
+				// delete icon
+				print '<a class="paddingleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=deletetemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'&amp;templatename='.$printer->listprinterstemplates[$line]['name'].'">';
+				print img_picto($langs->trans("Delete"), 'delete');
+				print '</a>';
+				// test icon
+				print '<a class="paddingleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=testtemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'&amp;templatename='.$printer->listprinterstemplates[$line]['name'].'">';
+				print img_picto($langs->trans("TestPrinterTemplate"), 'printer');
+				print '</a></td>';
+			}
+			print '</tr>';
+		}
+	}
 
-    if ($action != 'edittemplate') {
-    	print '<tr>';
+	if ($action != 'edittemplate') {
+		print '<tr>';
 		print '<td><input size="50" type="text" name="templatename" value="'.$printer->listprinterstemplates[$line]['name'].'"></td>';
 		print '<td>';
 		print '<textarea name="template" wrap="soft" cols="120" rows="12">';
@@ -448,35 +448,35 @@ if ($mode == 'template' && $user->admin) {
 		print '</td>';
 		print '<td></td>';
 		print '</tr>';
-    }
+	}
 
-    print '</table>';
+	print '</table>';
 
-    if ($action != 'edittemplate') {
+	if ($action != 'edittemplate') {
 		print '<input type="hidden" name="templateid" value="'.$printer->listprinterstemplates[$line]['rowid'].'">';
 		print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Add")).'"></div>';
-    } else {
-        print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
-    }
-    print '</form>';
+	} else {
+		print '<div class="center"><input type="submit" class="button button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
+	}
+	print '</form>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '<br>';
+	print '<br>';
 
-    print '<table class="noborder centpercent">'."\n";
-    print '<tr class="liste_titre">';
-    print '<th>'.$langs->trans("Tag").'</th>';
-    print '<th>'.$langs->trans("Description").'</th>';
-    print "</tr>\n";
+	print '<table class="noborder centpercent">'."\n";
+	print '<tr class="liste_titre">';
+	print '<th>'.$langs->trans("Tag").'</th>';
+	print '<th>'.$langs->trans("Description").'</th>';
+	print "</tr>\n";
 
-    $langs->loadLangs(array("bills", "companies"));
-    foreach ($printer->tags as $key => $val) {
-        print '<tr class="oddeven">';
-        print '<td>&lt;'.$key.'&gt;</td><td>'.$langs->trans($val).'</td>';
-        print '</tr>';
-    }
-    print '</table>';
+	$langs->loadLangs(array("bills", "companies"));
+	foreach ($printer->tags as $key => $val) {
+		print '<tr class="oddeven">';
+		print '<td>{'.$key.'}</td><td>'.$langs->trans($val).'</td>';
+		print '</tr>';
+	}
+	print '</table>';
 }
 
 // End of page
diff --git a/htdocs/admin/reception_extrafields.php b/htdocs/admin/reception_extrafields.php
index d9babd5d95b..605b8cf465e 100644
--- a/htdocs/admin/reception_extrafields.php
+++ b/htdocs/admin/reception_extrafields.php
@@ -79,11 +79,11 @@ print "<br>\n";
 
 $head = reception_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes_reception', $langs->trans("Receptions"), -1, 'sending');
+print dol_get_fiche_head($head, 'attributes_reception', $langs->trans("Receptions"), -1, 'sending');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php
index f84d9a3a7f9..5da0dd84630 100644
--- a/htdocs/admin/reception_setup.php
+++ b/htdocs/admin/reception_setup.php
@@ -189,7 +189,7 @@ print load_fiche_titre($langs->trans("ReceptionsSetup"), $linkback, 'title_setup
 print '<br>';
 $head = reception_admin_prepare_head();
 
-dol_fiche_head($head, 'reception', $langs->trans("Receptions"), -1, 'sending');
+print dol_get_fiche_head($head, 'reception', $langs->trans("Receptions"), -1, 'sending');
 
 // Reception numbering model
 
@@ -240,7 +240,8 @@ foreach ($dirmodels as $reldir)
 						print '<td class="nowrap">';
 						$tmp = $module->getExample();
 						if (preg_match('/^Error/', $tmp)) {
-							$langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>';
+							$langs->load("errors");
+							print '<div class="error">'.$langs->trans($tmp).'</div>';
 						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
 						else print $tmp;
 						print '</td>'."\n";
@@ -423,7 +424,7 @@ foreach ($dirmodels as $reldir)
 								print '<td class="center">';
 								if ($module->type == 'pdf')
 								{
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'reception').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
diff --git a/htdocs/admin/resource.php b/htdocs/admin/resource.php
index b57e41ddfd4..ecf72df9b37 100644
--- a/htdocs/admin/resource.php
+++ b/htdocs/admin/resource.php
@@ -70,7 +70,7 @@ print load_fiche_titre($langs->trans('ResourceSetup'), $linkback, 'title_setup')
 
 $head = resource_admin_prepare_head();
 
-dol_fiche_head($head, 'general', $langs->trans("ResourceSingular"), -1, 'action');
+print dol_get_fiche_head($head, 'general', $langs->trans("ResourceSingular"), -1, 'action');
 
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -142,7 +142,7 @@ print '</form>';
 //RESOURCE_HIDE_ADD_CONTACT_USER
 //RESOURCE_HIDE_ADD_CONTACT_THIPARTY
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/resource_extrafields.php b/htdocs/admin/resource_extrafields.php
index 61b0bf900df..219643e8303 100644
--- a/htdocs/admin/resource_extrafields.php
+++ b/htdocs/admin/resource_extrafields.php
@@ -73,19 +73,19 @@ print "<br>\n";
 
 $head = resource_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("ResourceSingular"), -1, 'action');
+print dol_get_fiche_head($head, 'attributes', $langs->trans("ResourceSingular"), -1, 'action');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -98,9 +98,9 @@ if ($action != 'create' && $action != 'edit')
 if ($action == 'create')
 {
 	print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -110,10 +110,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && !empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index f25cdf25958..30085d3f1f1 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -53,51 +53,51 @@ if ($action == 'setgeneraterule')
 
 if ($action == 'activate_encrypt')
 {
-    $error = 0;
+	$error = 0;
 
 	$db->begin();
 
-    dolibarr_set_const($db, "DATABASE_PWD_ENCRYPTED", "1", 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "DATABASE_PWD_ENCRYPTED", "1", 'chaine', 0, '', $conf->entity);
 
-    $sql = "SELECT u.rowid, u.pass, u.pass_crypted";
-    $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
-    $sql .= " WHERE u.pass IS NOT NULL AND LENGTH(u.pass) < 32"; // Not a MD5 value
+	$sql = "SELECT u.rowid, u.pass, u.pass_crypted";
+	$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
+	$sql .= " WHERE u.pass IS NOT NULL AND LENGTH(u.pass) < 32"; // Not a MD5 value
 
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $numrows = $db->num_rows($resql);
-        $i = 0;
-        while ($i < $numrows)
-        {
-            $obj = $db->fetch_object($resql);
-            if (dol_hash($obj->pass))
-            {
-                $sql = "UPDATE ".MAIN_DB_PREFIX."user";
-                $sql .= " SET pass_crypted = '".dol_hash($obj->pass)."', pass = NULL";
-                $sql .= " WHERE rowid=".$obj->rowid;
-                //print $sql;
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$numrows = $db->num_rows($resql);
+		$i = 0;
+		while ($i < $numrows)
+		{
+			$obj = $db->fetch_object($resql);
+			if (dol_hash($obj->pass))
+			{
+				$sql = "UPDATE ".MAIN_DB_PREFIX."user";
+				$sql .= " SET pass_crypted = '".dol_hash($obj->pass)."', pass = NULL";
+				$sql .= " WHERE rowid=".$obj->rowid;
+				//print $sql;
 
-                $resql2 = $db->query($sql);
-                if (!$resql2)
-                {
-                    dol_print_error($db);
-                    $error++;
-                    break;
-                }
+				$resql2 = $db->query($sql);
+				if (!$resql2)
+				{
+					dol_print_error($db);
+					$error++;
+					break;
+				}
 
-                $i++;
-            }
-        }
-    } else dol_print_error($db);
+				$i++;
+			}
+		}
+	} else dol_print_error($db);
 
 	//print $error." ".$sql;
-    //exit;
-    if (!$error)
+	//exit;
+	if (!$error)
 	{
 		$db->commit();
 		header("Location: security.php");
-	    exit;
+		exit;
 	} else {
 		$db->rollback();
 		dol_print_error($db, '');
@@ -109,9 +109,9 @@ if ($action == 'activate_encrypt')
 	if ($allow_disable_encryption)
 	{
 		dolibarr_del_const($db, "DATABASE_PWD_ENCRYPTED", $conf->entity);
-    }
+	}
 	header("Location: security.php");
-    exit;
+	exit;
 }
 
 if ($action == 'activate_encryptdbpassconf')
@@ -119,9 +119,9 @@ if ($action == 'activate_encryptdbpassconf')
 	$result = encodedecode_dbpassconf(1);
 	if ($result > 0)
 	{
-	    sleep(3); // Don't know why but we need to wait file is completely saved before making the reload. Even with flush and clearstatcache, we need to wait.
+		sleep(3); // Don't know why but we need to wait file is completely saved before making the reload. Even with flush and clearstatcache, we need to wait.
 
-	    // database value not required
+		// database value not required
 		//dolibarr_set_const($db, "MAIN_DATABASE_PWD_CONFIG_ENCRYPTED", "1");
 		header("Location: security.php");
 		exit;
@@ -133,7 +133,7 @@ if ($action == 'activate_encryptdbpassconf')
 	$result = encodedecode_dbpassconf(0);
 	if ($result > 0)
 	{
-	    sleep(3); // Don't know why but we need to wait file is completely saved before making the reload. Even with flush and clearstatcache, we need to wait.
+		sleep(3); // Don't know why but we need to wait file is completely saved before making the reload. Even with flush and clearstatcache, we need to wait.
 
 		// database value not required
 		//dolibarr_del_const($db, "MAIN_DATABASE_PWD_CONFIG_ENCRYPTED",$conf->entity);
@@ -158,24 +158,24 @@ if ($action == 'activate_MAIN_SECURITY_DISABLEFORGETPASSLINK')
 
 if ($action == 'updatepattern')
 {
-    $pattern = GETPOST("pattern", "alpha");
-    $explodePattern = explode(';', $pattern);
+	$pattern = GETPOST("pattern", "alpha");
+	$explodePattern = explode(';', $pattern);
 
-    $patternInError = false;
-    if ($explodePattern[0] < 1 || $explodePattern[4] < 0) {
-        $patternInError = true;
-    }
+	$patternInError = false;
+	if ($explodePattern[0] < 1 || $explodePattern[4] < 0) {
+		$patternInError = true;
+	}
 
-    if ($explodePattern[0] < $explodePattern[1] + $explodePattern[2] + $explodePattern[3]) {
-        $patternInError = true;
-    }
+	if ($explodePattern[0] < $explodePattern[1] + $explodePattern[2] + $explodePattern[3]) {
+		$patternInError = true;
+	}
 
-    if (!$patternInError) {
-	    dolibarr_set_const($db, "USER_PASSWORD_PATTERN", $pattern, 'chaine', 0, '', $conf->entity);
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	    header("Location: security.php");
-	    exit;
-    }
+	if (!$patternInError) {
+		dolibarr_set_const($db, "USER_PASSWORD_PATTERN", $pattern, 'chaine', 0, '', $conf->entity);
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		header("Location: security.php");
+		exit;
+	}
 }
 
 
@@ -197,7 +197,7 @@ print "<br>\n";
 
 $head = security_prepare_head();
 
-dol_fiche_head($head, 'passwords', '', -1);
+print dol_get_fiche_head($head, 'passwords', '', -1);
 
 
 // Choix du gestionnaire du generateur de mot de passe
@@ -214,20 +214,20 @@ $handle = opendir($dir);
 $i = 1;
 if (is_resource($handle))
 {
-    while (($file = readdir($handle)) !== false)
-    {
-        if (preg_match('/(modGeneratePass[a-z]+)\.class\.php$/i', $file, $reg))
-        {
-            // Charging the numbering class
-            $classname = $reg[1];
-            require_once $dir.'/'.$file;
+	while (($file = readdir($handle)) !== false)
+	{
+		if (preg_match('/(modGeneratePass[a-z]+)\.class\.php$/i', $file, $reg))
+		{
+			// Charging the numbering class
+			$classname = $reg[1];
+			require_once $dir.'/'.$file;
 
-            $obj = new $classname($db, $conf, $langs, $user);
-            $arrayhandler[$obj->id] = $obj;
-    		$i++;
-        }
-    }
-    closedir($handle);
+			$obj = new $classname($db, $conf, $langs, $user);
+			$arrayhandler[$obj->id] = $obj;
+			$i++;
+		}
+	}
+	closedir($handle);
 }
 asort($arrayhandler);
 
@@ -241,33 +241,36 @@ print '</tr>';
 foreach ($arrayhandler as $key => $module)
 {
 	// Show modules according to features level
-    if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-    if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+	if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+	if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
 	if ($module->isEnabled())
 	{
-        print '<tr class="oddeven"><td width="100">';
-        print ucfirst($key);
-        print "</td><td>\n";
-        print $module->getDescription().'<br>';
-        print $langs->trans("MinLength").': '.$module->length;
-        print '</td>';
+		print '<tr class="oddeven"><td width="100">';
+		print ucfirst($key);
+		print "</td><td>\n";
+		print $module->getDescription().'<br>';
+		print $langs->trans("MinLength").': '.$module->length;
+		print '</td>';
 
-        // Show example of numbering module
-        print '<td class="nowrap">';
-        $tmp = $module->getExample();
-        if (preg_match('/^Error/', $tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-        else print $tmp;
-        print '</td>'."\n";
+		// Show example of numbering module
+		print '<td class="nowrap">';
+		$tmp = $module->getExample();
+		if (preg_match('/^Error/', $tmp)) {
+			$langs->load("errors");
+			print '<div class="error">'.$langs->trans($tmp).'</div>';
+		} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+		else print $tmp;
+		print '</td>'."\n";
 
-        print '<td width="100" align="center">';
-        if ($conf->global->USER_PASSWORD_GENERATED == $key)
-        {
-            print img_picto('', 'tick');
-        } else {
-            print '<a href="'.$_SERVER['PHP_SELF'].'?action=setgeneraterule&amp;token='.newToken().'&amp;value='.$key.'">'.$langs->trans("Activate").'</a>';
-        }
-        print "</td></tr>\n";
+		print '<td width="100" align="center">';
+		if ($conf->global->USER_PASSWORD_GENERATED == $key)
+		{
+			print img_picto('', 'tick');
+		} else {
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=setgeneraterule&amp;token='.newToken().'&amp;value='.$key.'">'.$langs->trans("Activate").'</a>';
+		}
+		print "</td></tr>\n";
 	}
 }
 print '</table>';
@@ -323,7 +326,7 @@ if ($conf->global->USER_PASSWORD_GENERATED == "Perso") {
 
 	print '<br>';
 	print '<div class="center">';
-	print '<a class="button" id="linkChangePattern">'.$langs->trans("Save").'</a>';
+	print '<a class="button button-save" id="linkChangePattern">'.$langs->trans("Save").'</a>';
 	print '</div>';
 	print '<br><br>';
 
@@ -493,14 +496,14 @@ print '<br>';
 
 if (GETPOST('info', 'int') > 0)
 {
-    if (function_exists('password_hash'))
-    {
-        print $langs->trans("Note: The function password_hash exists on your PHP")."<br>\n";
-    } else {
-        print $langs->trans("Note: The function password_hash does not exists on your PHP")."<br>\n";
-    }
-    print 'MAIN_SECURITY_HASH_ALGO = '.$conf->global->MAIN_SECURITY_HASH_ALGO."<br>\n";
-    print 'MAIN_SECURITY_SALT = '.$conf->global->MAIN_SECURITY_SALT."<br>\n";
+	if (function_exists('password_hash'))
+	{
+		print $langs->trans("Note: The function password_hash exists on your PHP")."<br>\n";
+	} else {
+		print $langs->trans("Note: The function password_hash does not exists on your PHP")."<br>\n";
+	}
+	print 'MAIN_SECURITY_HASH_ALGO = '.$conf->global->MAIN_SECURITY_HASH_ALGO."<br>\n";
+	print 'MAIN_SECURITY_SALT = '.$conf->global->MAIN_SECURITY_SALT."<br>\n";
 }
 
 print '</div>';
diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php
index 4b665123e4f..2669e741c6e 100644
--- a/htdocs/admin/security_file.php
+++ b/htdocs/admin/security_file.php
@@ -45,9 +45,9 @@ $upload_dir = $conf->admin->dir_temp;
 
 if (GETPOST('sendit') && !empty($conf->global->MAIN_UPLOAD_DOC))
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-    dol_add_file_process($upload_dir, 1, 0, 'userfile');
+	dol_add_file_process($upload_dir, 1, 0, 'userfile');
 }
 
 if ($action == 'updateform')
@@ -100,7 +100,7 @@ print '<input type="hidden" name="action" value="updateform">';
 
 $head = security_prepare_head();
 
-dol_fiche_head($head, 'file', '', -1);
+print dol_get_fiche_head($head, 'file', '', -1);
 
 
 // Upload options
@@ -144,16 +144,19 @@ print '</td>';
 print '<td>';
 if (ini_get('safe_mode') && !empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
 {
-    $langs->load("errors");
-    $basedir = preg_replace('/"/', '', dirname($conf->global->MAIN_ANTIVIRUS_COMMAND));
-    $listdir = explode(';', ini_get('safe_mode_exec_dir'));
-    if (!in_array($basedir, $listdir))
-    {
-        print img_warning($langs->trans('WarningSafeModeOnCheckExecDir'));
-        dol_syslog("safe_mode is on, basedir is ".$basedir.", safe_mode_exec_dir is ".ini_get('safe_mode_exec_dir'), LOG_WARNING);
-    }
+	$langs->load("errors");
+	$basedir = preg_replace('/"/', '', dirname($conf->global->MAIN_ANTIVIRUS_COMMAND));
+	$listdir = explode(';', ini_get('safe_mode_exec_dir'));
+	if (!in_array($basedir, $listdir))
+	{
+		print img_warning($langs->trans('WarningSafeModeOnCheckExecDir'));
+		dol_syslog("safe_mode is on, basedir is ".$basedir.", safe_mode_exec_dir is ".ini_get('safe_mode_exec_dir'), LOG_WARNING);
+	}
+}
+print '<input type="text" '.(defined('MAIN_ANTIVIRUS_COMMAND') ? 'disabled' : '').' name="MAIN_ANTIVIRUS_COMMAND" class="minwidth500imp" value="'.(!empty($conf->global->MAIN_ANTIVIRUS_COMMAND) ?dol_escape_htmltag($conf->global->MAIN_ANTIVIRUS_COMMAND) : '').'">';
+if (defined('MAIN_ANTIVIRUS_COMMAND')) {
+	print '<br><span class="opacitymedium">'.$langs->trans("ValueIsForcedBySystem").'</span>';
 }
-print '<input type="text" name="MAIN_ANTIVIRUS_COMMAND" class="minwidth500imp" value="'.(!empty($conf->global->MAIN_ANTIVIRUS_COMMAND) ?dol_escape_htmltag($conf->global->MAIN_ANTIVIRUS_COMMAND) : '').'">';
 print "</td>";
 print '</tr>';
 
@@ -165,13 +168,16 @@ print '<span class="opacitymedium">'.$langs->trans("AntiVirusParamExample").'</s
 print '</td>';
 print '<td>';
 print '<input type="text" name="MAIN_ANTIVIRUS_PARAM" class="minwidth500imp" value="'.(!empty($conf->global->MAIN_ANTIVIRUS_PARAM) ?dol_escape_htmltag($conf->global->MAIN_ANTIVIRUS_PARAM) : '').'">';
+if (defined('MAIN_ANTIVIRUS_PARAM')) {
+	print '<br><span class="opacitymedium">'.$langs->trans("ValueIsForcedBySystem").'</span>';
+}
 print "</td>";
 print '</tr>';
 
 print '</table>';
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'"></div>';
 
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index 4eb6af14843..5f063dbe2a2 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -93,7 +93,7 @@ print '<input type="hidden" name="action" value="updateform">';
 
 $head = security_prepare_head();
 
-dol_fiche_head($head, 'misc', '', -1);
+print dol_get_fiche_head($head, 'misc', '', -1);
 
 
 // Other Options
@@ -121,8 +121,8 @@ if (function_exists("imagecreatefrompng"))
 		}
 	}
 } else {
-    $desc = $form->textwithpicto('', $langs->transnoentities("EnableGDLibraryDesc"), 1, 'warning');
-    print $desc;
+	$desc = $form->textwithpicto('', $langs->transnoentities("EnableGDLibraryDesc"), 1, 'warning');
+	print $desc;
 }
 print '</td></tr>';
 
@@ -184,7 +184,7 @@ print '</tr>';
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'"></div>';
 
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index e09304a4921..fd1bcb69bdb 100644
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2007-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2009      Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2013 	   Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2020      Frédéric 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
@@ -30,15 +31,16 @@ $langs->loadLangs(array("companies", "admin", "products", "sms", "other", "error
 
 $cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 
-if (!$user->admin)
-accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 $substitutionarrayfortest = array(
-'__ID__' => 'TESTIdRecord',
-'__PHONEFROM__' => 'TESTPhoneFrom',
-'__PHONETO__' => 'TESTPhoneTo',
-'__LASTNAME__' => 'TESTLastname',
-'__FIRSTNAME__' => 'TESTFirstname'
+	'__ID__' => 'TESTIdRecord',
+	'__PHONEFROM__' => 'TESTPhoneFrom',
+	'__PHONETO__' => 'TESTPhoneTo',
+	'__LASTNAME__' => 'TESTLastname',
+	'__FIRSTNAME__' => 'TESTFirstname'
 );
 
 $action = GETPOST('action', 'aZ09');
@@ -48,8 +50,7 @@ $action = GETPOST('action', 'aZ09');
  * Actions
  */
 
-if ($action == 'update' && !$cancel)
-{
+if ($action == 'update' && !$cancel) {
 	dolibarr_set_const($db, "MAIN_DISABLE_ALL_SMS", GETPOST("MAIN_DISABLE_ALL_SMS", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 
 	dolibarr_set_const($db, "MAIN_SMS_SENDMODE", GETPOST("MAIN_SMS_SENDMODE", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
@@ -64,13 +65,16 @@ if ($action == 'update' && !$cancel)
 /*
  * Send sms
  */
-if ($action == 'send' && !$_POST['cancel'])
-{
+if ($action == 'send' && !$_POST['cancel']) {
 	$error = 0;
 
 	$smsfrom = '';
-	if (!empty($_POST["fromsms"])) $smsfrom = GETPOST("fromsms", 'alphanohtml');
-	if (empty($smsfrom)) $smsfrom = GETPOST("fromname", 'alphanohtml');
+	if (!empty($_POST["fromsms"])) {
+		$smsfrom = GETPOST("fromsms", 'alphanohtml');
+	}
+	if (empty($smsfrom)) {
+		$smsfrom = GETPOST("fromname", 'alphanohtml');
+	}
 	$sendto     = GETPOST("sendto", 'alphanohtml');
 	$body       = GETPOST('message', 'alphanohtml');
 	$deliveryreceipt = GETPOST("deliveryreceipt", 'alphanohtml');
@@ -83,43 +87,37 @@ if ($action == 'send' && !$_POST['cancel'])
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formsms.class.php';
 	$formsms = new FormSms($db);
 
-	if (!empty($formsms->error))
-	{
+	if (!empty($formsms->error)) {
 		setEventMessages($formsms->error, $formsms->errors, 'errors');
-	    $action = 'test';
-	    $error++;
+		$action = 'test';
+		$error++;
 	}
-    if (empty($body))
-    {
-        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Message")), null, 'errors');
-        $action = 'test';
-        $error++;
-    }
-	if (empty($smsfrom) || !str_replace('+', '', $smsfrom))
-	{
+	if (empty($body)) {
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Message")), null, 'errors');
+		$action = 'test';
+		$error++;
+	}
+	if (empty($smsfrom) || !str_replace('+', '', $smsfrom)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("SmsFrom")), null, 'errors');
-        $action = 'test';
+		$action = 'test';
 		$error++;
 	}
-	if (empty($sendto) || !str_replace('+', '', $sendto))
-	{
+	if (empty($sendto) || !str_replace('+', '', $sendto)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("SmsTo")), null, 'errors');
-        $action = 'test';
+		$action = 'test';
 		$error++;
 	}
-	if (!$error)
-	{
+	if (!$error) {
 		// Make substitutions into message
-        complete_substitutions_array($substitutionarrayfortest, $langs);
-	    $body = make_substitutions($body, $substitutionarrayfortest);
+		complete_substitutions_array($substitutionarrayfortest, $langs);
+		$body = make_substitutions($body, $substitutionarrayfortest);
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/CSMSFile.class.php';
 
 		$smsfile = new CSMSFile($sendto, $smsfrom, $body, $deliveryreceipt, $deferred, $priority, $class); // This define OvhSms->login, pass, session and account
 		$result = $smsfile->sendfile(); // This send SMS
 
-		if ($result)
-		{
+		if ($result) {
 			setEventMessages($langs->trans("SmsSuccessfulySent", $smsfrom, $sendto), null, 'mesgs');
 			setEventMessages($smsfile->error, $smsfile->errors, 'mesgs');
 		} else {
@@ -138,8 +136,12 @@ if ($action == 'send' && !$_POST['cancel'])
  */
 
 $linuxlike = 1;
-if (preg_match('/^win/i', PHP_OS)) $linuxlike = 0;
-if (preg_match('/^mac/i', PHP_OS)) $linuxlike = 0;
+if (preg_match('/^win/i', PHP_OS)) {
+	$linuxlike = 0;
+}
+if (preg_match('/^mac/i', PHP_OS)) {
+	$linuxlike = 0;
+}
 
 $wikihelp = 'EN:Setup Sms|FR:Paramétrage Sms|ES:Configuración Sms';
 llxHeader('', $langs->trans("Setup"), $wikihelp);
@@ -153,11 +155,14 @@ print "<br>\n";
 $listofmethods = (is_array($conf->modules_parts['sms']) ? $conf->modules_parts['sms'] : array());
 asort($listofmethods);
 
-if ($action == 'edit')
-{
-	$form = new Form($db);
+if (!count($listofmethods)) {
+	$descnosms = $langs->trans("NoSmsEngine", '{Dolistore}');
+	$descnosms = str_replace('{Dolistore}', '<a href="http://www.dolistore.com/search.php?orderby=position&orderway=desc&search_query=smsmanager">DoliStore</a>', $descnosms);
+	print '<div class="warning">'.$descnosms.'</div>';
+}
 
-	if (!count($listofmethods)) print '<div class="warning">'.$langs->trans("NoSmsEngine", '<a href="http://www.dolistore.com/search.php?orderby=position&orderway=desc&search_query=smsmanager">DoliStore</a>').'</div>';
+if ($action == 'edit') {
+	$form = new Form($db);
 
 	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -178,9 +183,12 @@ if ($action == 'edit')
 
 	// Method
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_SMS_SENDMODE").'</td><td>';
-	if (count($listofmethods)) print $form->selectarray('MAIN_SMS_SENDMODE', $listofmethods, $conf->global->MAIN_SMS_SENDMODE, 1);
-	else print '<font class="error">'.$langs->trans("None").'</font>';
-    print '</td></tr>';
+	if (count($listofmethods)) {
+		print $form->selectarray('MAIN_SMS_SENDMODE', $listofmethods, $conf->global->MAIN_SMS_SENDMODE, 1);
+	} else {
+		print '<font class="error">'.$langs->trans("None").'</font>';
+	}
+	print '</td></tr>';
 
 	// From
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMS_FROM", $langs->transnoentities("Undefined")).'</td>';
@@ -196,16 +204,14 @@ if ($action == 'edit')
 	print '</table>';
 
 	print '<br><div class="center">';
-	print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'"'.(!count($listofmethods) ? ' disabled' : '').'>';
+	print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'"'.(!count($listofmethods) ? ' disabled' : '').'>';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
 	print '<br>';
 } else {
-	if (!count($listofmethods)) print '<div class="warning">'.$langs->trans("NoSmsEngine", '<a target="_blank" href="http://www.dolistore.com/search.php?orderby=position&orderway=desc&search_query=smsmanager">DoliStore</a>').'</div>';
-
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
@@ -218,14 +224,18 @@ if ($action == 'edit')
 	// Method
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_SMS_SENDMODE").'</td><td>';
 	$text = $listofmethods[$conf->global->MAIN_SMS_SENDMODE];
-	if (empty($text)) $text = $langs->trans("Undefined").' '.img_warning();
+	if (empty($text)) {
+		$text = $langs->trans("Undefined").' '.img_warning();
+	}
 	print $text;
 	print '</td></tr>';
 
 	// From
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMS_FROM", $langs->transnoentities("Undefined")).'</td>';
 	print '<td>'.$conf->global->MAIN_MAIL_SMS_FROM;
-	if (!empty($conf->global->MAIN_MAIL_SMS_FROM) && !isValidPhone($conf->global->MAIN_MAIL_SMS_FROM)) print ' '.img_warning($langs->trans("ErrorBadPhone"));
+	if (!empty($conf->global->MAIN_MAIL_SMS_FROM) && !isValidPhone($conf->global->MAIN_MAIL_SMS_FROM)) {
+		print ' '.img_warning($langs->trans("ErrorBadPhone"));
+	}
 	print '</td></tr>';
 
 	// Autocopy to
@@ -234,7 +244,7 @@ if ($action == 'edit')
 	print '<td>'.$conf->global->MAIN_MAIL_AUTOCOPY_TO;
 	if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO) && ! isValidEmail($conf->global->MAIN_MAIL_AUTOCOPY_TO)) print img_warning($langs->trans("ErrorBadEMail"));
 	print '</td></tr>';
-    */
+	*/
 
 	print '</table>';
 
@@ -257,11 +267,10 @@ if ($action == 'edit')
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("FeatureNotAvailableOnLinux").'">'.$langs->trans("DoTestServerAvailability").'</a>';
 	}*/
 
-	if (count($listofmethods) && !empty($conf->global->MAIN_SMS_SENDMODE))
-	{
-	    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=test&amp;mode=init">'.$langs->trans("DoTestSend").'</a>';
+	if (count($listofmethods) && !empty($conf->global->MAIN_SMS_SENDMODE)) {
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=test&amp;mode=init">'.$langs->trans("DoTestSend").'</a>';
 	} else {
-        print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("DoTestSend").'</a>';
+		print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("DoTestSend").'</a>';
 	}
 	print '</div>';
 
@@ -290,17 +299,16 @@ if ($action == 'edit')
 	}*/
 
 	// Affichage formulaire de TEST simple
-	if ($action == 'test')
-	{
+	if ($action == 'test') {
 		print '<br>';
 		print load_fiche_titre($langs->trans("DoTestSend"));
 
 		// Cree l'objet formulaire mail
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formsms.class.php';
 		$formsms = new FormSms($db);
-        $formsms->fromtype = 'user';
-        $formsms->fromid = $user->id;
-        $formsms->fromsms = (GETPOSTISSET('fromsms') ? $_POST['fromsms'] : ($conf->global->MAIN_MAIL_SMS_FROM ? $conf->global->MAIN_MAIL_SMS_FROM : $user->user_mobile));
+		$formsms->fromtype = 'user';
+		$formsms->fromid = $user->id;
+		$formsms->fromsms = (GETPOSTISSET('fromsms') ? $_POST['fromsms'] : ($conf->global->MAIN_MAIL_SMS_FROM ? $conf->global->MAIN_MAIL_SMS_FROM : $user->user_mobile));
 		$formsms->withfromreadonly = 0;
 		$formsms->withsubstit = 0;
 		$formsms->withfrom = 1;
diff --git a/htdocs/admin/socialnetworks.php b/htdocs/admin/socialnetworks.php
index b848dccd998..0ab3a91432b 100644
--- a/htdocs/admin/socialnetworks.php
+++ b/htdocs/admin/socialnetworks.php
@@ -43,26 +43,26 @@ $action = GETPOST('action', 'aZ09');
  */
 if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 {
-    $code = $reg[1];
-    if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
-    {
-        header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    } else {
-        dol_print_error($db);
-    }
+	$code = $reg[1];
+	if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	} else {
+		dol_print_error($db);
+	}
 }
 
 if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 {
-    $code = $reg[1];
-    if (dolibarr_del_const($db, $code, $conf->entity) > 0)
-    {
-        header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    } else {
-        dol_print_error($db);
-    }
+	$code = $reg[1];
+	if (dolibarr_del_const($db, $code, $conf->entity) > 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	} else {
+		dol_print_error($db);
+	}
 }
 
 
@@ -89,26 +89,26 @@ $h++;
 
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 
-dol_fiche_head($head, 'setup', '', 0, 'user');
+print dol_get_fiche_head($head, 'setup', '', 0, 'user');
 
 print '<br>';
 
 $arrayofsocialnetworks = array('jabber'=>'Jabber', 'skype'=>'Skype', 'twitter'=>'Twitter', 'facebook'=>'Facebook', 'linkedin'=>'LinkedIn');
 
 foreach ($arrayofsocialnetworks as $snkey => $snlabel) {
-    $consttocheck = 'SOCIALNETWORKS_'.strtoupper($snkey);
-    if ($conf->use_javascript_ajax) {
-        $link = ajax_constantonoff($consttocheck);
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        $link = $form->selectarray($consttocheck, $arrval, $conf->global->$consttocheck);
-    }
+	$consttocheck = 'SOCIALNETWORKS_'.strtoupper($snkey);
+	if ($conf->use_javascript_ajax) {
+		$link = ajax_constantonoff($consttocheck);
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		$link = $form->selectarray($consttocheck, $arrval, $conf->global->$consttocheck);
+	}
 
-    print $langs->trans('EnableFeatureFor', $snlabel).' '.$link.'<br><br>';
+	print $langs->trans('EnableFeatureFor', $snlabel).' '.$link.'<br><br>';
 }
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '</form>';
 
diff --git a/htdocs/admin/spip.php b/htdocs/admin/spip.php
index ca44caac258..2fa111578a9 100644
--- a/htdocs/admin/spip.php
+++ b/htdocs/admin/spip.php
@@ -55,48 +55,48 @@ if ($action == 'update' || $action == 'add')
 	$consttypearray = GETPOST("consttype", 'array');
 	$constnotearray = GETPOST("constnote", 'array');
 
-    // Action mise a jour ou ajout d'une constante
-    if ($action == 'update' || $action == 'add')
-    {
-    	foreach ($constnamearray as $key => $val)
-    	{
-    		$constname = dol_escape_htmltag($constnamearray[$key]);
-    		$constvalue = dol_escape_htmltag($constvaluearray[$key]);
-    		$consttype = dol_escape_htmltag($consttypearray[$key]);
-    		$constnote = dol_escape_htmltag($constnotearray[$key]);
+	// Action mise a jour ou ajout d'une constante
+	if ($action == 'update' || $action == 'add')
+	{
+		foreach ($constnamearray as $key => $val)
+		{
+			$constname = dol_escape_htmltag($constnamearray[$key]);
+			$constvalue = dol_escape_htmltag($constvaluearray[$key]);
+			$consttype = dol_escape_htmltag($consttypearray[$key]);
+			$constnote = dol_escape_htmltag($constnotearray[$key]);
 
-        	$res = dolibarr_set_const($db, $constname, $constvalue, $type[$consttype], 0, $constnote, $conf->entity);
+			$res = dolibarr_set_const($db, $constname, $constvalue, $type[$consttype], 0, $constnote, $conf->entity);
 
-    		if (!$res > 0) $error++;
-    	}
+			if (!$res > 0) $error++;
+		}
 
-     	if (!$error)
-        {
-            setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-        } else {
-            setEventMessages($langs->trans("Error"), null, 'errors');
-        }
-    }
+	 	if (!$error)
+		{
+			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("Error"), null, 'errors');
+		}
+	}
 }
 
 // Action activation d'un sous module du module adherent
 if ($action == 'set')
 {
-    $result = dolibarr_set_const($db, $_GET["name"], $_GET["value"], '', 0, '', $conf->entity);
-    if ($result < 0)
-    {
-        dol_print_error($db);
-    }
+	$result = dolibarr_set_const($db, $_GET["name"], $_GET["value"], '', 0, '', $conf->entity);
+	if ($result < 0)
+	{
+		dol_print_error($db);
+	}
 }
 
 // Action desactivation d'un sous module du module adherent
 if ($action == 'unset')
 {
-    $result = dolibarr_del_const($db, $_GET["name"], $conf->entity);
-    if ($result < 0)
-    {
-        dol_print_error($db);
-    }
+	$result = dolibarr_del_const($db, $_GET["name"], $conf->entity);
+	if ($result < 0)
+	{
+		dol_print_error($db);
+	}
 }
 
 
@@ -126,41 +126,41 @@ if (!empty($conf->global->ADHERENT_USE_SPIP))
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
 
-	dol_fiche_head($head, 'spip', $langs->trans("Setup"), -1, 'user');
+	print dol_get_fiche_head($head, 'spip', $langs->trans("Setup"), -1, 'user');
 
-    //$link=img_picto($langs->trans("Active"),'tick').' ';
-    $link = '<a href="'.$_SERVER["PHP_SELF"].'?action=unset&token='.newToken().'&value=0&name=ADHERENT_USE_SPIP">';
-    //$link.=$langs->trans("Disable");
-    $link .= img_picto($langs->trans("Activated"), 'switch_on');
-    $link .= '</a>';
-    // Edition des varibales globales
-    $constantes = array(
-    	'ADHERENT_SPIP_SERVEUR',
-    	'ADHERENT_SPIP_DB',
-    	'ADHERENT_SPIP_USER',
-    	'ADHERENT_SPIP_PASS'
+	//$link=img_picto($langs->trans("Active"),'tick').' ';
+	$link = '<a href="'.$_SERVER["PHP_SELF"].'?action=unset&token='.newToken().'&value=0&name=ADHERENT_USE_SPIP">';
+	//$link.=$langs->trans("Disable");
+	$link .= img_picto($langs->trans("Activated"), 'switch_on');
+	$link .= '</a>';
+	// Edition des varibales globales
+	$constantes = array(
+		'ADHERENT_SPIP_SERVEUR',
+		'ADHERENT_SPIP_DB',
+		'ADHERENT_SPIP_USER',
+		'ADHERENT_SPIP_PASS'
 	);
 
-    print load_fiche_titre($langs->trans('SPIPTitle'), $link, '');
+	print load_fiche_titre($langs->trans('SPIPTitle'), $link, '');
 	print '<br>';
 
 	form_constantes($constantes, 2);
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
+	print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
 
-    print '</form>';
+	print '</form>';
 } else {
-    dol_fiche_head($head, 'spip', $langs->trans("Setup"), 0, 'user');
+	print dol_get_fiche_head($head, 'spip', $langs->trans("Setup"), 0, 'user');
 
-    $link = '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value=1&amp;name=ADHERENT_USE_SPIP">';
-    //$link.=$langs->trans("Activate");
-    $link .= img_picto($langs->trans("Disabled"), 'switch_off');
-    $link .= '</a>';
-    print load_fiche_titre($langs->trans('SPIPTitle'), $link, '');
+	$link = '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value=1&amp;name=ADHERENT_USE_SPIP">';
+	//$link.=$langs->trans("Activate");
+	$link .= img_picto($langs->trans("Disabled"), 'switch_off');
+	$link .= '</a>';
+	print load_fiche_titre($langs->trans('SPIPTitle'), $link, '');
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 20b1252456e..031b0ef102f 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -93,7 +93,7 @@ if ($action == 'warehouse')
 {
 	$value = GETPOST('default_warehouse', 'alpha');
 	$res = dolibarr_set_const($db, "MAIN_DEFAULT_WAREHOUSE", $value, 'chaine', 0, '', $conf->entity);
-	if ($value == -1 || empty($value) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)){
+	if ($value == -1 || empty($value) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) {
 		$res = dolibarr_del_const($db, "MAIN_DEFAULT_WAREHOUSE", $conf->entity);
 	}
 	if (!$res > 0) $error++;
@@ -184,7 +184,7 @@ print load_fiche_titre($langs->trans("StockSetup"), $linkback, 'title_setup');
 
 $head = stock_admin_prepare_head();
 
-dol_fiche_head($head, 'general', $langs->trans("StockSetup"), -1, 'stock');
+print dol_get_fiche_head($head, 'general', $langs->trans("StockSetup"), -1, 'stock');
 
 $form = new Form($db);
 $formproduct = new FormProduct($db);
@@ -483,13 +483,15 @@ if ($virtualdiffersfromphysical)
 	print '</tr>'."\n";
 
 	print '<tr class="oddeven">';
-	print '<td>'.$langs->trans("UseVirtualStockByDefault").'</td>';
+	print '<td>';
+	print $form->textwithpicto($langs->trans("UseRealStockByDefault"), $langs->trans("ReplenishmentCalculation"));
+	print '</td>';
 	print '<td class="right">';
 	if ($conf->use_javascript_ajax) {
-		print ajax_constantonoff('STOCK_USE_VIRTUAL_STOCK');
+		print ajax_constantonoff('STOCK_USE_REAL_STOCK_BY_DEFAULT_FOR_REPLENISHMENT');
 	} else {
 		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-		print $form->selectarray("STOCK_USE_VIRTUAL_STOCK", $arrval, $conf->global->STOCK_USE_VIRTUAL_STOCK);
+		print $form->selectarray("STOCK_USE_REAL_STOCK_BY_DEFAULT_FOR_REPLENISHMENT", $arrval, $conf->global->STOCK_USE_REAL_STOCK_BY_DEFAULT_FOR_REPLENISHMENT);
 	}
 	print "</td>\n";
 	print "</tr>\n";
@@ -636,7 +638,7 @@ foreach ($dirmodels as $reldir)
 								print '<td class="center">';
 								if ($module->type == 'pdf')
 								{
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
@@ -668,8 +670,8 @@ print load_fiche_titre($langs->trans("Other"), '', '');
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
-print "<td>".$langs->trans("Other")."</td>\n";
-print '<td class="right">'.$langs->trans("Status").'</td>'."\n";
+print "<td>".$langs->trans("Parameter")."</td>\n";
+print '<td class="right">'.$langs->trans("Value").'</td>'."\n";
 print '</tr>'."\n";
 
 print '<tr class="oddeven">';
@@ -684,7 +686,7 @@ print '<tr class="oddeven">';
 print '<td>'.$langs->trans("UserDefaultWarehouse").'</td>';
 print '<td class="right">';
 if ($conf->use_javascript_ajax) {
-	print ajax_constantonoff('MAIN_DEFAULT_WAREHOUSE_USER', array(), null,  0, 0, 1);
+	print ajax_constantonoff('MAIN_DEFAULT_WAREHOUSE_USER', array(), null, 0, 0, 1);
 } else {
 	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
 	print $form->selectarray("MAIN_DEFAULT_WAREHOUSE_USER", $arrval, $conf->global->MAIN_DEFAULT_WAREHOUSE_USER);
@@ -692,7 +694,7 @@ if ($conf->use_javascript_ajax) {
 print "</td>\n";
 print "</tr>\n";
 
-if (! empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) {
+if (!empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("UserWarehouseAutoCreate").'</td>';
 	print '<td class="right">';
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index c4f2e48ff4a..86faa655687 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -57,15 +57,15 @@ $specimenthirdparty->initAsSpecimen();
 
 if ($action == 'updateMask')
 {
-    $maskconstinvoice = GETPOST('maskconstinvoice', 'alpha');
+	$maskconstinvoice = GETPOST('maskconstinvoice', 'alpha');
 	$maskconstcredit = GETPOST('maskconstcredit', 'alpha');
-    $maskinvoice = GETPOST('maskinvoice', 'alpha');
+	$maskinvoice = GETPOST('maskinvoice', 'alpha');
 	$maskcredit = GETPOST('maskcredit', 'alpha');
 
-    if ($maskconstinvoice)  $res = dolibarr_set_const($db, $maskconstinvoice, $maskinvoice, 'chaine', 0, '', $conf->entity);
+	if ($maskconstinvoice)  $res = dolibarr_set_const($db, $maskconstinvoice, $maskinvoice, 'chaine', 0, '', $conf->entity);
 	if ($maskconstcredit)  $res = dolibarr_set_const($db, $maskconstcredit, $maskcredit, 'chaine', 0, '', $conf->entity);
 
-    if (!$res > 0) $error++;
+	if (!$res > 0) $error++;
 
 	if (!$error)
 	{
@@ -77,44 +77,44 @@ if ($action == 'updateMask')
 
 if ($action == 'specimen')  // For invoices
 {
-    $modele = GETPOST('module', 'alpha');
+	$modele = GETPOST('module', 'alpha');
 
-    $facture = new FactureFournisseur($db);
-    $facture->initAsSpecimen();
-    $facture->thirdparty = $specimenthirdparty; // Define who should has build the invoice (so the supplier)
+	$facture = new FactureFournisseur($db);
+	$facture->initAsSpecimen();
+	$facture->thirdparty = $specimenthirdparty; // Define who should has build the invoice (so the supplier)
 
-    // Search template files
-    $file = ''; $classname = ''; $filefound = 0;
-    $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-    foreach ($dirmodels as $reldir)
-    {
-    	$file = dol_buildpath($reldir."core/modules/supplier_invoice/doc/pdf_".$modele.".modules.php", 0);
-    	if (file_exists($file))
-    	{
-    		$filefound = 1;
-    		$classname = "pdf_".$modele;
-    		break;
-    	}
-    }
+	// Search template files
+	$file = ''; $classname = ''; $filefound = 0;
+	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir)
+	{
+		$file = dol_buildpath($reldir."core/modules/supplier_invoice/doc/pdf_".$modele.".modules.php", 0);
+		if (file_exists($file))
+		{
+			$filefound = 1;
+			$classname = "pdf_".$modele;
+			break;
+		}
+	}
 
-    if ($filefound)
-    {
-    	require_once $file;
+	if ($filefound)
+	{
+		require_once $file;
 
-    	$module = new $classname($db, $facture);
+		$module = new $classname($db, $facture);
 
-    	if ($module->write_file($facture, $langs) > 0)
-    	{
-    		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=facture_fournisseur&file=SPECIMEN.pdf");
-    		return;
-    	} else {
-    		setEventMessages($module->error, $module->errors, 'errors');
-    		dol_syslog($module->error, LOG_ERR);
-    	}
-    } else {
-    	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-    	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
-    }
+		if ($module->write_file($facture, $langs) > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=facture_fournisseur&file=SPECIMEN.pdf");
+			return;
+		} else {
+			setEventMessages($module->error, $module->errors, 'errors');
+			dol_syslog($module->error, LOG_ERR);
+		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
 }
 
 // Activate a model
@@ -126,52 +126,51 @@ elseif ($action == 'set')
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->INVOICE_SUPPLIER_ADDON_PDF == "$value") dolibarr_del_const($db, 'INVOICE_SUPPLIER_ADDON_PDF', $conf->entity);
+		if ($conf->global->INVOICE_SUPPLIER_ADDON_PDF == "$value") dolibarr_del_const($db, 'INVOICE_SUPPLIER_ADDON_PDF', $conf->entity);
 	}
 }
 
 // Set default model
 elseif ($action == 'setdoc')
 {
-    if (dolibarr_set_const($db, "INVOICE_SUPPLIER_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
-    {
-        // La constante qui a ete lue en avant du nouveau set
-        // on passe donc par une variable pour avoir un affichage coherent
-        $conf->global->INVOICE_SUPPLIER_ADDON_PDF = $value;
-    }
+	if (dolibarr_set_const($db, "INVOICE_SUPPLIER_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
+	{
+		// La constante qui a ete lue en avant du nouveau set
+		// on passe donc par une variable pour avoir un affichage coherent
+		$conf->global->INVOICE_SUPPLIER_ADDON_PDF = $value;
+	}
 
-    // On active le modele
-    $ret = delDocumentModel($value, $type);
-    if ($ret > 0)
-    {
-        $ret = addDocumentModel($value, $type, $label, $scandir);
-    }
-} elseif ($action == 'unsetdoc')
-{
-    dolibarr_del_const($db, "INVOICE_SUPPLIER_ADDON_PDF", $conf->entity);
+	// On active le modele
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		$ret = addDocumentModel($value, $type, $label, $scandir);
+	}
+} elseif ($action == 'unsetdoc') {
+	dolibarr_del_const($db, "INVOICE_SUPPLIER_ADDON_PDF", $conf->entity);
 }
 
 if ($action == 'setmod')
 {
-    // TODO Verifier si module numerotation choisi peut etre active
-    // par appel methode canBeActivated
+	// TODO Verifier si module numerotation choisi peut etre active
+	// par appel methode canBeActivated
 
-    dolibarr_set_const($db, "INVOICE_SUPPLIER_ADDON_NUMBER", $value, 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "INVOICE_SUPPLIER_ADDON_NUMBER", $value, 'chaine', 0, '', $conf->entity);
 }
 
 if ($action == 'addcat')
 {
-    $fourn = new Fournisseur($db);
-    $fourn->CreateCategory($user, GETPOST('cat', 'alphanohtml'));
+	$fourn = new Fournisseur($db);
+	$fourn->CreateCategory($user, GETPOST('cat', 'alphanohtml'));
 }
 
 if ($action == 'set_SUPPLIER_INVOICE_FREE_TEXT')
 {
-    $freetext = GETPOST('SUPPLIER_INVOICE_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
+	$freetext = GETPOST('SUPPLIER_INVOICE_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
 
-    $res = dolibarr_set_const($db, "SUPPLIER_INVOICE_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "SUPPLIER_INVOICE_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
 
-    if (!$res > 0) $error++;
+	if (!$res > 0) $error++;
 
 	if (!$error)
 	{
@@ -199,7 +198,7 @@ print "<br>";
 
 $head = supplierorder_admin_prepare_head();
 
-dol_fiche_head($head, 'invoice', $langs->trans("Suppliers"), -1, 'company');
+print dol_get_fiche_head($head, 'invoice', $langs->trans("Suppliers"), -1, 'company');
 
 
 // Supplier invoice numbering module
@@ -221,79 +220,80 @@ foreach ($dirmodels as $reldir)
 {
 	$dir = dol_buildpath($reldir."core/modules/supplier_invoice");
 
-    if (is_dir($dir))
-    {
-        $handle = opendir($dir);
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (substr($file, 0, 24) == 'mod_facture_fournisseur_' && substr($file, dol_strlen($file) - 3, 3) == 'php')
-                {
-                    $file = substr($file, 0, dol_strlen($file) - 4);
+	if (is_dir($dir))
+	{
+		$handle = opendir($dir);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (substr($file, 0, 24) == 'mod_facture_fournisseur_' && substr($file, dol_strlen($file) - 3, 3) == 'php')
+				{
+					$file = substr($file, 0, dol_strlen($file) - 4);
 
-                    require_once $dir.'/'.$file.'.php';
+					require_once $dir.'/'.$file.'.php';
 
-                    $module = new $file;
+					$module = new $file;
 
-                    if ($module->isEnabled())
-                    {
-                        // Show modules according to features level
-                        if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+					if ($module->isEnabled())
+					{
+						// Show modules according to features level
+						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
 
-                        print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
-                        print $module->info();
-                        print '</td>';
+						print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
+						print $module->info();
+						print '</td>';
 
-                        // Show example of numbering model
-                        print '<td class="nowrap">';
-                        $tmp = $module->getExample();
-                        if (preg_match('/^Error/', $tmp)) {
-                            $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>';
-                        } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-                        else print $tmp;
-                        print '</td>'."\n";
+						// Show example of numbering model
+						print '<td class="nowrap">';
+						$tmp = $module->getExample();
+						if (preg_match('/^Error/', $tmp)) {
+							$langs->load("errors");
+							print '<div class="error">'.$langs->trans($tmp).'</div>';
+						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						else print $tmp;
+						print '</td>'."\n";
 
-                        print '<td class="center">';
-                        if ($conf->global->INVOICE_SUPPLIER_ADDON_NUMBER == "$file")
-                        {
-                            print img_picto($langs->trans("Activated"), 'switch_on');
-                        } else {
-                            print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-                        }
-                        print '</td>';
+						print '<td class="center">';
+						if ($conf->global->INVOICE_SUPPLIER_ADDON_NUMBER == "$file")
+						{
+							print img_picto($langs->trans("Activated"), 'switch_on');
+						} else {
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+						}
+						print '</td>';
 
-                        $invoice = new FactureFournisseur($db);
-                        $invoice->initAsSpecimen();
+						$invoice = new FactureFournisseur($db);
+						$invoice->initAsSpecimen();
 
-                        // Info
-                        $htmltooltip = '';
-                        $htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
-                        $nextval = $module->getNextValue($mysoc, $invoice);
-                        if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-                            $htmltooltip .= ''.$langs->trans("NextValue").': ';
-                            if ($nextval) {
-                                if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
-                                    $nextval = $langs->trans($nextval);
-                                $htmltooltip .= $nextval.'<br>';
-                            } else {
-                                $htmltooltip .= $langs->trans($module->error).'<br>';
-                            }
-                        }
+						// Info
+						$htmltooltip = '';
+						$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+						$nextval = $module->getNextValue($mysoc, $invoice);
+						if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+							$htmltooltip .= ''.$langs->trans("NextValue").': ';
+							if ($nextval) {
+								if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+									$nextval = $langs->trans($nextval);
+								$htmltooltip .= $nextval.'<br>';
+							} else {
+								$htmltooltip .= $langs->trans($module->error).'<br>';
+							}
+						}
 
-                        print '<td class="center">';
-                        print $form->textwithpicto('', $htmltooltip, 1, 0);
-                        print '</td>';
+						print '<td class="center">';
+						print $form->textwithpicto('', $htmltooltip, 1, 0);
+						print '</td>';
 
-                        print '</tr>';
-                    }
-                }
-            }
-            closedir($handle);
-        }
-    }
+						print '</tr>';
+					}
+				}
+			}
+			closedir($handle);
+		}
+	}
 }
 
 print '</table><br>';
@@ -318,16 +318,16 @@ $sql .= " AND entity = ".$conf->entity;
 $resql = $db->query($sql);
 if ($resql)
 {
-    $i = 0;
-    $num_rows = $db->num_rows($resql);
-    while ($i < $num_rows)
-    {
-        $array = $db->fetch_array($resql);
-        array_push($def, $array[0]);
-        $i++;
-    }
+	$i = 0;
+	$num_rows = $db->num_rows($resql);
+	while ($i < $num_rows)
+	{
+		$array = $db->fetch_array($resql);
+		array_push($def, $array[0]);
+		$i++;
+	}
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 print '<table class="noborder centpercent">'."\n";
@@ -347,94 +347,94 @@ foreach ($dirmodels as $reldir)
 	$realpath = $reldir."core/modules/supplier_invoice/doc";
 	$dir = dol_buildpath($realpath);
 
-    if (is_dir($dir))
-    {
-        $handle = opendir($dir);
+	if (is_dir($dir))
+	{
+		$handle = opendir($dir);
 
 
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-                {
-                    $name = substr($file, 4, dol_strlen($file) - 16);
-                    $classname = substr($file, 0, dol_strlen($file) - 12);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
+				{
+					$name = substr($file, 4, dol_strlen($file) - 16);
+					$classname = substr($file, 0, dol_strlen($file) - 12);
 
-	                require_once $dir.'/'.$file;
-	                $module = new $classname($db, new FactureFournisseur($db));
+					require_once $dir.'/'.$file;
+					$module = new $classname($db, new FactureFournisseur($db));
 
 
-                    print "<tr class=\"oddeven\">\n";
-                    print "<td>";
-	                print (empty($module->name) ? $name : $module->name);
-	                print "</td>\n";
-                    print "<td>\n";
-                    require_once $dir.'/'.$file;
-                    $module = new $classname($db, $specimenthirdparty);
-                    if (method_exists($module, 'info')) print $module->info($langs);
-	                else print $module->description;
+					print "<tr class=\"oddeven\">\n";
+					print "<td>";
+					print (empty($module->name) ? $name : $module->name);
+					print "</td>\n";
+					print "<td>\n";
+					require_once $dir.'/'.$file;
+					$module = new $classname($db, $specimenthirdparty);
+					if (method_exists($module, 'info')) print $module->info($langs);
+					else print $module->description;
 
-                    print "</td>\n";
+					print "</td>\n";
 
-                    // Active
-                    if (in_array($name, $def))
-                    {
-                        print '<td class="center">'."\n";
-                        //if ($conf->global->INVOICE_SUPPLIER_ADDON_PDF != "$name")
-                        //{
-                            // Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
-                            print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier">';
-                            print img_picto($langs->trans("Enabled"), 'switch_on');
-                            print '</a>';
-                        /*}
+					// Active
+					if (in_array($name, $def))
+					{
+						print '<td class="center">'."\n";
+						//if ($conf->global->INVOICE_SUPPLIER_ADDON_PDF != "$name")
+						//{
+							// Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier">';
+							print img_picto($langs->trans("Enabled"), 'switch_on');
+							print '</a>';
+						/*}
                         else
                         {
                             print img_picto($langs->trans("Enabled"),'switch_on');
                         }*/
-                        print "</td>";
-                    } else {
-                        print '<td class="center">'."\n";
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-                        print "</td>";
-                    }
+						print "</td>";
+					} else {
+						print '<td class="center">'."\n";
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+						print "</td>";
+					}
 
-                    // Default
-                    print '<td class="center">';
-                    if ($conf->global->INVOICE_SUPPLIER_ADDON_PDF == "$name")
-                    {
-                        //print img_picto($langs->trans("Default"),'on');
-                        // Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier"" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
-                    } else {
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-                    }
-                    print '</td>';
+					// Default
+					print '<td class="center">';
+					if ($conf->global->INVOICE_SUPPLIER_ADDON_PDF == "$name")
+					{
+						//print img_picto($langs->trans("Default"),'on');
+						// Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier"" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+					} else {
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+					}
+					print '</td>';
 
-                    // Info
-                    $htmltooltip = ''.$langs->trans("Name").': '.$module->name;
-                    $htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-                    $htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-                    $htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
+					// Info
+					$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+					$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+					$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+					$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
 
-                    $htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-                    $htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
-                    $htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
-                    $htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
-                    print '<td class="center">';
-                    print $form->textwithpicto('', $htmltooltip, 1, 0);
-                    print '</td>';
-                    print '<td class="center">';
-                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'order').'</a>';
-                    print '</td>';
+					$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+					$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+					$htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
+					$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
+					print '<td class="center">';
+					print $form->textwithpicto('', $htmltooltip, 1, 0);
+					print '</td>';
+					print '<td class="center">';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
+					print '</td>';
 
-                    print "</tr>\n";
-                }
-            }
+					print "</tr>\n";
+				}
+			}
 
-            closedir($handle);
-        }
-    }
+			closedir($handle);
+		}
+	}
 }
 
 print '</table><br>';
@@ -466,11 +466,11 @@ print $form->textwithpicto($langs->trans("FreeLegalTextOnInvoices"), $langs->tra
 $variablename = 'SUPPLIER_INVOICE_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
-    print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 } else {
-    include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
-    print $doleditor->Create();
+	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+	print $doleditor->Create();
 }
 print '</td><td class="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 9afa2bb2d1f..e2433c5348b 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -58,12 +58,12 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask')
 {
-    $maskconstorder = GETPOST('maskconstorder', 'alpha');
-    $maskvalue = GETPOST('maskorder', 'alpha');
+	$maskconstorder = GETPOST('maskconstorder', 'alpha');
+	$maskvalue = GETPOST('maskorder', 'alpha');
 
-    if ($maskconstorder)  $res = dolibarr_set_const($db, $maskconstorder, $maskvalue, 'chaine', 0, '', $conf->entity);
+	if ($maskconstorder)  $res = dolibarr_set_const($db, $maskconstorder, $maskvalue, 'chaine', 0, '', $conf->entity);
 
-    if (!$res > 0) $error++;
+	if (!$res > 0) $error++;
 
 	if (!$error)
 	{
@@ -73,44 +73,44 @@ if ($action == 'updateMask')
 	}
 } elseif ($action == 'specimen')  // For orders
 {
-    $modele = GETPOST('module', 'alpha');
+	$modele = GETPOST('module', 'alpha');
 
-    $commande = new CommandeFournisseur($db);
-    $commande->initAsSpecimen();
-    $commande->thirdparty = $specimenthirdparty;
+	$commande = new CommandeFournisseur($db);
+	$commande->initAsSpecimen();
+	$commande->thirdparty = $specimenthirdparty;
 
-    // Search template files
-    $file = ''; $classname = ''; $filefound = 0;
-    $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-    foreach ($dirmodels as $reldir)
-    {
-    	$file = dol_buildpath($reldir."core/modules/supplier_order/doc/pdf_".$modele.".modules.php", 0);
-    	if (file_exists($file))
-    	{
-    		$filefound = 1;
-    		$classname = "pdf_".$modele;
-    		break;
-    	}
-    }
+	// Search template files
+	$file = ''; $classname = ''; $filefound = 0;
+	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir)
+	{
+		$file = dol_buildpath($reldir."core/modules/supplier_order/doc/pdf_".$modele.".modules.php", 0);
+		if (file_exists($file))
+		{
+			$filefound = 1;
+			$classname = "pdf_".$modele;
+			break;
+		}
+	}
 
-    if ($filefound)
-    {
-    	require_once $file;
+	if ($filefound)
+	{
+		require_once $file;
 
-    	$module = new $classname($db, $commande);
+		$module = new $classname($db, $commande);
 
-    	if ($module->write_file($commande, $langs) > 0)
-    	{
-    		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=commande_fournisseur&file=SPECIMEN.pdf");
-    		return;
-    	} else {
-    		setEventMessages($module->error, $module->errors, 'errors');
-    		dol_syslog($module->error, LOG_ERR);
-    	}
-    } else {
-    	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-    	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
-    }
+		if ($module->write_file($commande, $langs) > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=commande_fournisseur&file=SPECIMEN.pdf");
+			return;
+		} else {
+			setEventMessages($module->error, $module->errors, 'errors');
+			dol_syslog($module->error, LOG_ERR);
+		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
 }
 
 // Activate a model
@@ -122,7 +122,7 @@ elseif ($action == 'set')
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF == "$value") dolibarr_del_const($db, 'COMMANDE_SUPPLIER_ADDON_PDF', $conf->entity);
+		if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF == "$value") dolibarr_del_const($db, 'COMMANDE_SUPPLIER_ADDON_PDF', $conf->entity);
 	}
 }
 
@@ -144,64 +144,64 @@ elseif ($action == 'setdoc')
 	}
 } elseif ($action == 'setmod')
 {
-    // TODO Verifier si module numerotation choisi peut etre active
-    // par appel methode canBeActivated
+	// TODO Verifier si module numerotation choisi peut etre active
+	// par appel methode canBeActivated
 
-    dolibarr_set_const($db, "COMMANDE_SUPPLIER_ADDON_NUMBER", $value, 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "COMMANDE_SUPPLIER_ADDON_NUMBER", $value, 'chaine', 0, '', $conf->entity);
 } elseif ($action == 'addcat')
 {
-    $fourn = new Fournisseur($db);
-    $fourn->CreateCategory($user, GETPOST('cat', 'alphanohtml'));
+	$fourn = new Fournisseur($db);
+	$fourn->CreateCategory($user, GETPOST('cat', 'alphanohtml'));
 } elseif ($action == 'set_SUPPLIER_ORDER_OTHER')
 {
-    $freetext = GETPOST('SUPPLIER_ORDER_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
+	$freetext = GETPOST('SUPPLIER_ORDER_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
 	$doubleapproval = GETPOST('SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED', 'alpha');
 	$doubleapproval = price2num($doubleapproval);
 
-    $res1 = dolibarr_set_const($db, "SUPPLIER_ORDER_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
-    $res2 = dolibarr_set_const($db, "SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED", $doubleapproval, 'chaine', 0, '', $conf->entity);
+	$res1 = dolibarr_set_const($db, "SUPPLIER_ORDER_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
+	$res2 = dolibarr_set_const($db, "SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED", $doubleapproval, 'chaine', 0, '', $conf->entity);
 
-    // TODO We add/delete permission here until permission can have a condition on a global var
-    include_once DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php';
-    $newmodule = new modFournisseur($db);
+	// TODO We add/delete permission here until permission can have a condition on a global var
+	include_once DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php';
+	$newmodule = new modFournisseur($db);
 
-    if ($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)
-    {
-    	// clear default rights array
-    	$newmodule->rights = array();
-    	// add new right
-    	$r = 0;
-    	$newmodule->rights[$r][0] = 1190;
-    	$newmodule->rights[$r][1] = $langs->trans("Permission1190");
-    	$newmodule->rights[$r][2] = 'w';
-    	$newmodule->rights[$r][3] = 0;
-    	$newmodule->rights[$r][4] = 'commande';
-    	$newmodule->rights[$r][5] = 'approve2';
+	if ($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)
+	{
+		// clear default rights array
+		$newmodule->rights = array();
+		// add new right
+		$r = 0;
+		$newmodule->rights[$r][0] = 1190;
+		$newmodule->rights[$r][1] = $langs->trans("Permission1190");
+		$newmodule->rights[$r][2] = 'w';
+		$newmodule->rights[$r][3] = 0;
+		$newmodule->rights[$r][4] = 'commande';
+		$newmodule->rights[$r][5] = 'approve2';
 
-    	// Insert
-    	$newmodule->insert_permissions(1);
-    } else {
-    	// Remove all rights with Permission1190
-    	$newmodule->delete_permissions();
+		// Insert
+		$newmodule->insert_permissions(1);
+	} else {
+		// Remove all rights with Permission1190
+		$newmodule->delete_permissions();
 
-    	// Add all right without Permission1190
-    	$newmodule->insert_permissions(1);
-    }
+		// Add all right without Permission1190
+		$newmodule->insert_permissions(1);
+	}
 }
 
 // Activate ask for payment bank
 elseif ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER')
 {
-    $res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER", $value, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER", $value, 'chaine', 0, '', $conf->entity);
 
-    if (!$res > 0) $error++;
+	if (!$res > 0) $error++;
 
-    if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 
@@ -222,7 +222,7 @@ print "<br>";
 
 $head = supplierorder_admin_prepare_head();
 
-dol_fiche_head($head, 'order', $langs->trans("Suppliers"), -1, 'company');
+print dol_get_fiche_head($head, 'order', $langs->trans("Suppliers"), -1, 'company');
 
 
 // Supplier order numbering module
@@ -244,79 +244,80 @@ foreach ($dirmodels as $reldir)
 {
 	$dir = dol_buildpath($reldir."core/modules/supplier_order/");
 
-    if (is_dir($dir))
-    {
-        $handle = opendir($dir);
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (substr($file, 0, 25) == 'mod_commande_fournisseur_' && substr($file, dol_strlen($file) - 3, 3) == 'php')
-                {
-                    $file = substr($file, 0, dol_strlen($file) - 4);
+	if (is_dir($dir))
+	{
+		$handle = opendir($dir);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (substr($file, 0, 25) == 'mod_commande_fournisseur_' && substr($file, dol_strlen($file) - 3, 3) == 'php')
+				{
+					$file = substr($file, 0, dol_strlen($file) - 4);
 
-                    require_once $dir.$file.'.php';
+					require_once $dir.$file.'.php';
 
-                    $module = new $file;
+					$module = new $file;
 
-                    if ($module->isEnabled())
-                    {
-                        // Show modules according to features level
-                        if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+					if ($module->isEnabled())
+					{
+						// Show modules according to features level
+						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
 
-                        print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
-                        print $module->info();
-                        print '</td>';
+						print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
+						print $module->info();
+						print '</td>';
 
-                        // Show example of numbering module
-                        print '<td class="nowrap">';
-                        $tmp = $module->getExample();
-                        if (preg_match('/^Error/', $tmp)) {
-                            $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>';
-                        } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-                        else print $tmp;
-                        print '</td>'."\n";
+						// Show example of numbering module
+						print '<td class="nowrap">';
+						$tmp = $module->getExample();
+						if (preg_match('/^Error/', $tmp)) {
+							$langs->load("errors");
+							print '<div class="error">'.$langs->trans($tmp).'</div>';
+						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						else print $tmp;
+						print '</td>'."\n";
 
-                        print '<td class="center">';
-                        if ($conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER == "$file")
-                        {
-                            print img_picto($langs->trans("Activated"), 'switch_on');
-                        } else {
-                            print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-                        }
-                        print '</td>';
+						print '<td class="center">';
+						if ($conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER == "$file")
+						{
+							print img_picto($langs->trans("Activated"), 'switch_on');
+						} else {
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+						}
+						print '</td>';
 
-                        $commande = new CommandeFournisseur($db);
-                        $commande->initAsSpecimen();
+						$commande = new CommandeFournisseur($db);
+						$commande->initAsSpecimen();
 
-                        // Info
-                        $htmltooltip = '';
-                        $htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
-                        $nextval = $module->getNextValue($mysoc, $commande);
-                        if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-                            $htmltooltip .= ''.$langs->trans("NextValue").': ';
-                            if ($nextval) {
-                                if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
-                                    $nextval = $langs->trans($nextval);
-                                $htmltooltip .= $nextval.'<br>';
-                            } else {
-                                $htmltooltip .= $langs->trans($module->error).'<br>';
-                            }
-                        }
+						// Info
+						$htmltooltip = '';
+						$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+						$nextval = $module->getNextValue($mysoc, $commande);
+						if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+							$htmltooltip .= ''.$langs->trans("NextValue").': ';
+							if ($nextval) {
+								if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+									$nextval = $langs->trans($nextval);
+								$htmltooltip .= $nextval.'<br>';
+							} else {
+								$htmltooltip .= $langs->trans($module->error).'<br>';
+							}
+						}
 
-                        print '<td class="center">';
-                        print $form->textwithpicto('', $htmltooltip, 1, 0);
-                        print '</td>';
+						print '<td class="center">';
+						print $form->textwithpicto('', $htmltooltip, 1, 0);
+						print '</td>';
 
-                        print '</tr>';
-                    }
-                }
-            }
-            closedir($handle);
-        }
-    }
+						print '</tr>';
+					}
+				}
+			}
+			closedir($handle);
+		}
+	}
 }
 
 print '</table><br>';
@@ -339,16 +340,16 @@ $sql .= " AND entity = ".$conf->entity;
 $resql = $db->query($sql);
 if ($resql)
 {
-    $i = 0;
-    $num_rows = $db->num_rows($resql);
-    while ($i < $num_rows)
-    {
-        $array = $db->fetch_array($resql);
-        array_push($def, $array[0]);
-        $i++;
-    }
+	$i = 0;
+	$num_rows = $db->num_rows($resql);
+	while ($i < $num_rows)
+	{
+		$array = $db->fetch_array($resql);
+		array_push($def, $array[0]);
+		$i++;
+	}
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 print '<table class="noborder centpercent">'."\n";
@@ -368,86 +369,86 @@ foreach ($dirmodels as $reldir)
 	$realpath = $reldir."core/modules/supplier_order/doc";
 	$dir = dol_buildpath($realpath);
 
-    if (is_dir($dir))
-    {
-        $handle = opendir($dir);
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-                {
-                    $name = substr($file, 4, dol_strlen($file) - 16);
-                    $classname = substr($file, 0, dol_strlen($file) - 12);
+	if (is_dir($dir))
+	{
+		$handle = opendir($dir);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
+				{
+					$name = substr($file, 4, dol_strlen($file) - 16);
+					$classname = substr($file, 0, dol_strlen($file) - 12);
 
-	                require_once $dir.'/'.$file;
-	                $module = new $classname($db, new CommandeFournisseur($db));
+					require_once $dir.'/'.$file;
+					$module = new $classname($db, new CommandeFournisseur($db));
 
 
-                    print "<tr class=\"oddeven\">\n";
-                    print "<td>";
-	                print (empty($module->name) ? $name : $module->name);
-	                print "</td>\n";
-                    print "<td>\n";
-                    require_once $dir.'/'.$file;
-                    $module = new $classname($db, $specimenthirdparty);
-                    if (method_exists($module, 'info')) print $module->info($langs);
-                    else print $module->description;
-                    print "</td>\n";
+					print "<tr class=\"oddeven\">\n";
+					print "<td>";
+					print (empty($module->name) ? $name : $module->name);
+					print "</td>\n";
+					print "<td>\n";
+					require_once $dir.'/'.$file;
+					$module = new $classname($db, $specimenthirdparty);
+					if (method_exists($module, 'info')) print $module->info($langs);
+					else print $module->description;
+					print "</td>\n";
 
-                    // Active
-                    if (in_array($name, $def))
-                    {
-                        print '<td class="center">'."\n";
-                        if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF != "$name")
-                        {
-                            print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier">';
-                            print img_picto($langs->trans("Enabled"), 'switch_on');
-                            print '</a>';
-                        } else {
-                            print img_picto($langs->trans("Enabled"), 'switch_on');
-                        }
-                        print "</td>";
-                    } else {
-                        print '<td class="center">'."\n";
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-                        print "</td>";
-                    }
+					// Active
+					if (in_array($name, $def))
+					{
+						print '<td class="center">'."\n";
+						if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF != "$name")
+						{
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier">';
+							print img_picto($langs->trans("Enabled"), 'switch_on');
+							print '</a>';
+						} else {
+							print img_picto($langs->trans("Enabled"), 'switch_on');
+						}
+						print "</td>";
+					} else {
+						print '<td class="center">'."\n";
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+						print "</td>";
+					}
 
-                    // Default
-                    print '<td class="center">';
-                    if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF == "$name")
-                    {
-                        print img_picto($langs->trans("Default"), 'on');
-                    } else {
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-                    }
-                    print '</td>';
+					// Default
+					print '<td class="center">';
+					if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF == "$name")
+					{
+						print img_picto($langs->trans("Default"), 'on');
+					} else {
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+					}
+					print '</td>';
 
-                    // Info
-                    $htmltooltip = ''.$langs->trans("Name").': '.$module->name;
-                    $htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-                    $htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-                    $htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
+					// Info
+					$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+					$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+					$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+					$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
 
-                    $htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-                    $htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
-                    $htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
-                    $htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
-                    print '<td class="center">';
-                    print $form->textwithpicto('', $htmltooltip, 1, 0);
-                    print '</td>';
-                    print '<td class="center">';
-                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'order').'</a>';
-                    print '</td>';
+					$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+					$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+					$htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
+					$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
+					print '<td class="center">';
+					print $form->textwithpicto('', $htmltooltip, 1, 0);
+					print '</td>';
+					print '<td class="center">';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
+					print '</td>';
 
-                    print "</tr>\n";
-                }
-            }
+					print "</tr>\n";
+				}
+			}
 
-            closedir($handle);
-        }
-    }
+			closedir($handle);
+		}
+	}
 }
 
 print '</table><br>';
@@ -521,11 +522,11 @@ print $form->textwithpicto($langs->trans("FreeLegalTextOnOrders"), $langs->trans
 $variablename = 'SUPPLIER_ORDER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
-    print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 } else {
-    include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
-    print $doleditor->Create();
+	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+	print $doleditor->Create();
 }
 print '</td><td class="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index 003c0247f20..3408496de31 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -48,21 +48,21 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask')
 {
-    $maskconstsupplierpayment = GETPOST('maskconstsupplierpayment', 'alpha');
-    $masksupplierpayment = GETPOST('masksupplierpayment', 'alpha');
-    if ($maskconstsupplierpayment) $res = dolibarr_set_const($db, $maskconstsupplierpayment, $masksupplierpayment, 'chaine', 0, '', $conf->entity);
+	$maskconstsupplierpayment = GETPOST('maskconstsupplierpayment', 'alpha');
+	$masksupplierpayment = GETPOST('masksupplierpayment', 'alpha');
+	if ($maskconstsupplierpayment) $res = dolibarr_set_const($db, $maskconstsupplierpayment, $masksupplierpayment, 'chaine', 0, '', $conf->entity);
 
-    if (!$res > 0) $error++;
+	if (!$res > 0) $error++;
 
-    if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 } elseif ($action == 'setmod')
 {
-    dolibarr_set_const($db, "SUPPLIER_PAYMENT_ADDON", $value, 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "SUPPLIER_PAYMENT_ADDON", $value, 'chaine', 0, '', $conf->entity);
 }
 
 // Activate a model
@@ -74,7 +74,7 @@ elseif ($action == 'set')
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->FACTURE_ADDON_PDF == "$value") dolibarr_del_const($db, 'SUPPLIER_PAYMENT_ADDON_PDF', $conf->entity);
+		if ($conf->global->FACTURE_ADDON_PDF == "$value") dolibarr_del_const($db, 'SUPPLIER_PAYMENT_ADDON_PDF', $conf->entity);
 	}
 }
 
@@ -96,54 +96,54 @@ elseif ($action == 'setdoc')
 	}
 } elseif ($action == 'specimen')
 {
-    $modele = GETPOST('module', 'alpha');
+	$modele = GETPOST('module', 'alpha');
 
-    $paiementFourn = new PaiementFourn($db);
-    $paiementFourn->initAsSpecimen();
+	$paiementFourn = new PaiementFourn($db);
+	$paiementFourn->initAsSpecimen();
 
 	// Search template files
 	$file = ''; $classname = ''; $filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir)
 	{
-	    $file = dol_buildpath($reldir."core/modules/supplier_payment/doc/pdf_".$modele.".modules.php", 0);
-    	if (file_exists($file))
-    	{
-    		$filefound = 1;
-    		$classname = "pdf_".$modele;
-    		break;
-    	}
-    }
+		$file = dol_buildpath($reldir."core/modules/supplier_payment/doc/pdf_".$modele.".modules.php", 0);
+		if (file_exists($file))
+		{
+			$filefound = 1;
+			$classname = "pdf_".$modele;
+			break;
+		}
+	}
 
-    if ($filefound)
-    {
-    	require_once $file;
+	if ($filefound)
+	{
+		require_once $file;
 
-    	$module = new $classname($db);
+		$module = new $classname($db);
 
-    	if ($module->write_file($paiementFourn, $langs) > 0)
-    	{
-    		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=supplier_payment&file=SPECIMEN.pdf");
-    		return;
-    	} else {
-    		setEventMessages($module->error, $module->errors, 'errors');
-    		dol_syslog($module->error, LOG_ERR);
-    	}
-    } else {
-    	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-    	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
-    }
+		if ($module->write_file($paiementFourn, $langs) > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=supplier_payment&file=SPECIMEN.pdf");
+			return;
+		} else {
+			setEventMessages($module->error, $module->errors, 'errors');
+			dol_syslog($module->error, LOG_ERR);
+		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
 } elseif ($action == 'setparams')
 {
-       $res = dolibarr_set_const($db, "PAYMENTS_FOURN_REPORT_GROUP_BY_MOD", GETPOST('PAYMENTS_FOURN_REPORT_GROUP_BY_MOD', 'int'), 'chaine', 0, '', $conf->entity);
-       if (!$res > 0) $error++;
+	   $res = dolibarr_set_const($db, "PAYMENTS_FOURN_REPORT_GROUP_BY_MOD", GETPOST('PAYMENTS_FOURN_REPORT_GROUP_BY_MOD', 'int'), 'chaine', 0, '', $conf->entity);
+	   if (!$res > 0) $error++;
 
 	if ($error)
-       {
+	   {
 			setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 	if (!$error)
-       {
+	   {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
 }
@@ -165,7 +165,7 @@ print load_fiche_titre($langs->trans("SupplierPaymentSetup"), $linkback, 'title_
 print "<br>";
 
 $head = supplierorder_admin_prepare_head();
-dol_fiche_head($head, 'supplierpayment', $langs->trans("Suppliers"), -1, 'company');
+print dol_get_fiche_head($head, 'supplierpayment', $langs->trans("Suppliers"), -1, 'company');
 
 /*
  *  Numbering module
@@ -184,16 +184,16 @@ $sql .= " AND entity = ".$conf->entity;
 $resql = $db->query($sql);
 if ($resql)
 {
-    $i = 0;
-    $num_rows = $db->num_rows($resql);
-    while ($i < $num_rows)
-    {
-        $array = $db->fetch_array($resql);
-        array_push($def, $array[0]);
-        $i++;
-    }
+	$i = 0;
+	$num_rows = $db->num_rows($resql);
+	while ($i < $num_rows)
+	{
+		$array = $db->fetch_array($resql);
+		array_push($def, $array[0]);
+		$i++;
+	}
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 print '<table class="noborder centpercent">';
@@ -209,104 +209,106 @@ clearstatcache();
 
 foreach ($dirmodels as $reldir)
 {
-    $dir = dol_buildpath($reldir."core/modules/supplier_payment/");
-    if (is_dir($dir))
-    {
-        $handle = opendir($dir);
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (!is_dir($dir.$file) || (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS'))
-                {
-                    $filebis = $file;
-                    $classname = preg_replace('/\.php$/', '', $file);
-                    // For compatibility
-                    if (!is_file($dir.$filebis))
-                    {
-                        $filebis = $file."/".$file.".modules.php";
-                        $classname = "mod_supplier_payment_".$file;
-                    }
-                    // Check if there is a filter on country
-                    preg_match('/\-(.*)_(.*)$/', $classname, $reg);
-                    if (!empty($reg[2]) && $reg[2] != strtoupper($mysoc->country_code)) continue;
+	$dir = dol_buildpath($reldir."core/modules/supplier_payment/");
+	if (is_dir($dir))
+	{
+		$handle = opendir($dir);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (!is_dir($dir.$file) || (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS'))
+				{
+					$filebis = $file;
+					$classname = preg_replace('/\.php$/', '', $file);
+					// For compatibility
+					if (!is_file($dir.$filebis))
+					{
+						$filebis = $file."/".$file.".modules.php";
+						$classname = "mod_supplier_payment_".$file;
+					}
+					// Check if there is a filter on country
+					preg_match('/\-(.*)_(.*)$/', $classname, $reg);
+					if (!empty($reg[2]) && $reg[2] != strtoupper($mysoc->country_code)) continue;
 
-                    $classname = preg_replace('/\-.*$/', '', $classname);
-                    if (!class_exists($classname) && is_readable($dir.$filebis) && (preg_match('/mod_/', $filebis) || preg_match('/mod_/', $classname)) && substr($filebis, dol_strlen($filebis) - 3, 3) == 'php')
-                    {
-                        // Charging the numbering class
-                        require_once $dir.$filebis;
+					$classname = preg_replace('/\-.*$/', '', $classname);
+					if (!class_exists($classname) && is_readable($dir.$filebis) && (preg_match('/mod_/', $filebis) || preg_match('/mod_/', $classname)) && substr($filebis, dol_strlen($filebis) - 3, 3) == 'php')
+					{
+						// Charging the numbering class
+						require_once $dir.$filebis;
 
-                        $module = new $classname($db);
+						$module = new $classname($db);
 
-                        // Show modules according to features level
-                        if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+						// Show modules according to features level
+						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-                        if ($module->isEnabled())
-                        {
-                            print '<tr class="oddeven"><td width="100">';
-                            echo preg_replace('/\-.*$/', '', preg_replace('/mod_supplier_payment_/', '', preg_replace('/\.php$/', '', $file)));
-                            print "</td><td>\n";
+						if ($module->isEnabled())
+						{
+							print '<tr class="oddeven"><td width="100">';
+							echo preg_replace('/\-.*$/', '', preg_replace('/mod_supplier_payment_/', '', preg_replace('/\.php$/', '', $file)));
+							print "</td><td>\n";
 
-                            print $module->info();
+							print $module->info();
 
-                            print '</td>';
+							print '</td>';
 
-                            // Show example of numbering module
-                            print '<td class="nowrap">';
-                            $tmp = $module->getExample();
-                            if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-                            elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-                            else print $tmp;
-                            print '</td>'."\n";
+							// Show example of numbering module
+							print '<td class="nowrap">';
+							$tmp = $module->getExample();
+							if (preg_match('/^Error/', $tmp)) {
+								$langs->load("errors");
+								print '<div class="error">'.$langs->trans($tmp).'</div>';
+							} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+							else print $tmp;
+							print '</td>'."\n";
 
-                            print '<td class="center">';
-                            //print "> ".$conf->global->SUPPLIER_PAYMENT_ADDON." - ".$file;
-                            if ($conf->global->SUPPLIER_PAYMENT_ADDON == $file || $conf->global->SUPPLIER_PAYMENT_ADDON.'.php' == $file)
-                            {
-                                print img_picto($langs->trans("Activated"), 'switch_on');
-                            } else {
-                                print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value='.preg_replace('/\.php$/', '', $file).'&scandir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-                            }
-                            print '</td>';
+							print '<td class="center">';
+							//print "> ".$conf->global->SUPPLIER_PAYMENT_ADDON." - ".$file;
+							if ($conf->global->SUPPLIER_PAYMENT_ADDON == $file || $conf->global->SUPPLIER_PAYMENT_ADDON.'.php' == $file)
+							{
+								print img_picto($langs->trans("Activated"), 'switch_on');
+							} else {
+								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value='.preg_replace('/\.php$/', '', $file).'&scandir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+							}
+							print '</td>';
 
-                            $payment = new PaiementFourn($db);
-                            $payment->initAsSpecimen();
+							$payment = new PaiementFourn($db);
+							$payment->initAsSpecimen();
 
-                            // Example
-                            $htmltooltip = '';
-                            $htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
-                            $nextval = $module->getNextValue($mysoc, $payment);
-                            if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-                                    $htmltooltip .= $langs->trans("NextValue").': ';
-                                if ($nextval) {
-                                    if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
-                                        $nextval = $langs->trans($nextval);
-                                    $htmltooltip .= $nextval.'<br>';
-                                } else {
-                                    $htmltooltip .= $langs->trans($module->error).'<br>';
-                                }
-                            }
+							// Example
+							$htmltooltip = '';
+							$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+							$nextval = $module->getNextValue($mysoc, $payment);
+							if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+									$htmltooltip .= $langs->trans("NextValue").': ';
+								if ($nextval) {
+									if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+										$nextval = $langs->trans($nextval);
+									$htmltooltip .= $nextval.'<br>';
+								} else {
+									$htmltooltip .= $langs->trans($module->error).'<br>';
+								}
+							}
 
-                            print '<td class="center">';
-                            print $form->textwithpicto('', $htmltooltip, 1, 0);
+							print '<td class="center">';
+							print $form->textwithpicto('', $htmltooltip, 1, 0);
 
-                            if ($conf->global->PAYMENT_ADDON.'.php' == $file)  // If module is the one used, we show existing errors
-                            {
-                                if (!empty($module->error)) dol_htmloutput_mesg($module->error, '', 'error', 1);
-                            }
+							if ($conf->global->PAYMENT_ADDON.'.php' == $file)  // If module is the one used, we show existing errors
+							{
+								if (!empty($module->error)) dol_htmloutput_mesg($module->error, '', 'error', 1);
+							}
 
-                            print '</td>';
+							print '</td>';
 
-                            print "</tr>\n";
-                        }
-                    }
-                }
-            }
-            closedir($handle);
-        }
-    }
+							print "</tr>\n";
+						}
+					}
+				}
+			}
+			closedir($handle);
+		}
+	}
 }
 
 print '</table>';
@@ -335,91 +337,91 @@ foreach ($dirmodels as $reldir)
 	$realpath = $reldir."core/modules/supplier_payment/doc";
 	$dir = dol_buildpath($realpath);
 
-    if (is_dir($dir))
-    {
-        $handle = opendir($dir);
+	if (is_dir($dir))
+	{
+		$handle = opendir($dir);
 
 
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-                {
-                    $name = substr($file, 4, dol_strlen($file) - 16);
-                    $classname = substr($file, 0, dol_strlen($file) - 12);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
+				{
+					$name = substr($file, 4, dol_strlen($file) - 16);
+					$classname = substr($file, 0, dol_strlen($file) - 12);
 
-	                require_once $dir.'/'.$file;
-	                $module = new $classname($db, new PaiementFourn($db));
+					require_once $dir.'/'.$file;
+					$module = new $classname($db, new PaiementFourn($db));
 
-                    print "<tr class=\"oddeven\">\n";
-                    print "<td>";
-	                print (empty($module->name) ? $name : $module->name);
-	                print "</td>\n";
-                    print "<td>\n";
-                    require_once $dir.'/'.$file;
-                    $module = new $classname($db, $specimenthirdparty);
-                    if (method_exists($module, 'info')) print $module->info($langs);
-	                else print $module->description;
+					print "<tr class=\"oddeven\">\n";
+					print "<td>";
+					print (empty($module->name) ? $name : $module->name);
+					print "</td>\n";
+					print "<td>\n";
+					require_once $dir.'/'.$file;
+					$module = new $classname($db, $specimenthirdparty);
+					if (method_exists($module, 'info')) print $module->info($langs);
+					else print $module->description;
 
-                    print "</td>\n";
+					print "</td>\n";
 
-                    // Active
-                    if (in_array($name, $def))
-                    {
-                        print '<td class="center">'."\n";
-                        //if ($conf->global->SUPPLIER_PAYMENT_ADDON_PDF != "$name")
-                        //{
-                            // Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
-                            print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT">';
-                            print img_picto($langs->trans("Enabled"), 'switch_on');
-                            print '</a>';
-                        /*}
+					// Active
+					if (in_array($name, $def))
+					{
+						print '<td class="center">'."\n";
+						//if ($conf->global->SUPPLIER_PAYMENT_ADDON_PDF != "$name")
+						//{
+							// Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT">';
+							print img_picto($langs->trans("Enabled"), 'switch_on');
+							print '</a>';
+						/*}
                         else
                         {
                             print img_picto($langs->trans("Enabled"),'switch_on');
                         }*/
-                        print "</td>";
-                    } else {
-                        print '<td class="center">'."\n";
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-                        print "</td>";
-                    }
+						print "</td>";
+					} else {
+						print '<td class="center">'."\n";
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+						print "</td>";
+					}
 
-                    // Default
-                    print '<td class="center">';
-                    if ($conf->global->SUPPLIER_PAYMENT_ADDON_PDF == "$name")
-                    {
-                        //print img_picto($langs->trans("Default"),'on');
-                        // Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT"" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
-                    } else {
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-                    }
-                    print '</td>';
+					// Default
+					print '<td class="center">';
+					if ($conf->global->SUPPLIER_PAYMENT_ADDON_PDF == "$name")
+					{
+						//print img_picto($langs->trans("Default"),'on');
+						// Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT"" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+					} else {
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+					}
+					print '</td>';
 
-                    // Info
-                    $htmltooltip = ''.$langs->trans("Name").': '.$module->name;
-                    $htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-                    $htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-                    $htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
+					// Info
+					$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+					$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+					$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+					$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
 
-                    $htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-                    $htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
-                    print '<td class="center">';
-                    print $form->textwithpicto('', $htmltooltip, 1, 0);
-                    print '</td>';
-                    print '<td class="center">';
-                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'order').'</a>';
-                    print '</td>';
+					$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+					$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+					print '<td class="center">';
+					print $form->textwithpicto('', $htmltooltip, 1, 0);
+					print '</td>';
+					print '<td class="center">';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
+					print '</td>';
 
-                    print "</tr>\n";
-                }
-            }
+					print "</tr>\n";
+				}
+			}
 
-            closedir($handle);
-        }
-    }
+			closedir($handle);
+		}
+	}
 }
 
 print '</table>';
@@ -454,7 +456,7 @@ print "</td></tr>\n";
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<br>';
 print '<div class="center">';
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 7bf34fa669a..0855a41cf8f 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -77,7 +77,7 @@ if ($action == 'specimen')
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir)
 	{
-	    $file = dol_buildpath($reldir."core/modules/supplier_proposal/doc/pdf_".$modele.".modules.php");
+		$file = dol_buildpath($reldir."core/modules/supplier_proposal/doc/pdf_".$modele.".modules.php");
 		if (file_exists($file))
 		{
 			$filefound = 1;
@@ -139,16 +139,16 @@ if ($action == 'set_SUPPLIER_PROPOSAL_FREE_TEXT')
 
 if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL')
 {
-    $res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL", $value, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL", $value, 'chaine', 0, '', $conf->entity);
 
-    if (!$res > 0) $error++;
+	if (!$res > 0) $error++;
 
-    if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 // Activate a model
@@ -160,11 +160,11 @@ if ($action == 'set')
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF == "$value") dolibarr_del_const($db, 'SUPPLIER_PROPOSAL_ADDON_PDF', $conf->entity);
+		if ($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF == "$value") dolibarr_del_const($db, 'SUPPLIER_PROPOSAL_ADDON_PDF', $conf->entity);
 	}
 } elseif ($action == 'setdoc')
 {
-    if (dolibarr_set_const($db, "SUPPLIER_PROPOSAL_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
+	if (dolibarr_set_const($db, "SUPPLIER_PROPOSAL_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
 	{
 		$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF = $value;
 	}
@@ -202,7 +202,7 @@ print load_fiche_titre($langs->trans("SupplierProposalSetup"), $linkback, 'title
 
 $head = supplier_proposal_admin_prepare_head();
 
-dol_fiche_head($head, 'general', $langs->trans("CommRequests"), -1, 'supplier_proposal');
+print dol_get_fiche_head($head, 'general', $langs->trans("CommRequests"), -1, 'supplier_proposal');
 
 /*
  *  Module numerotation
@@ -248,13 +248,15 @@ foreach ($dirmodels as $reldir)
 						print $module->info();
 						print '</td>';
 
-                        // Show example of numbering module
-                        print '<td class="nowrap">';
-                        $tmp = $module->getExample();
-                        if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-                        elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-                        else print $tmp;
-                        print '</td>'."\n";
+						// Show example of numbering module
+						print '<td class="nowrap">';
+						$tmp = $module->getExample();
+						if (preg_match('/^Error/', $tmp)) {
+							$langs->load("errors");
+							print '<div class="error">'.$langs->trans($tmp).'</div>';
+						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						else print $tmp;
+						print '</td>'."\n";
 
 						print '<td class="center">';
 						if ($conf->global->SUPPLIER_PROPOSAL_ADDON == "$file")
@@ -274,16 +276,16 @@ foreach ($dirmodels as $reldir)
 						$htmltooltip = '';
 						$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 						$nextval = $module->getNextValue($mysoc, $supplier_proposal);
-                        if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-                            $htmltooltip .= ''.$langs->trans("NextValue").': ';
-                            if ($nextval) {
-                                if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
-                                    $nextval = $langs->trans($nextval);
-                                $htmltooltip .= $nextval.'<br>';
-                            } else {
-                                $htmltooltip .= $langs->trans($module->error).'<br>';
-                            }
-                        }
+						if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+							$htmltooltip .= ''.$langs->trans("NextValue").': ';
+							if ($nextval) {
+								if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+									$nextval = $langs->trans($nextval);
+								$htmltooltip .= $nextval.'<br>';
+							} else {
+								$htmltooltip .= $langs->trans($module->error).'<br>';
+							}
+						}
 
 						print '<td class="center">';
 						print $form->textwithpicto('', $htmltooltip, 1, 0);
@@ -342,82 +344,82 @@ clearstatcache();
 
 foreach ($dirmodels as $reldir)
 {
-    foreach (array('', '/doc') as $valdir)
-    {
-    	$realpath = $reldir."core/modules/supplier_proposal".$valdir;
-    	$dir = dol_buildpath($realpath);
+	foreach (array('', '/doc') as $valdir)
+	{
+		$realpath = $reldir."core/modules/supplier_proposal".$valdir;
+		$dir = dol_buildpath($realpath);
 
-        if (is_dir($dir))
-        {
-            $handle = opendir($dir);
-            if (is_resource($handle))
-            {
-                while (($file = readdir($handle)) !== false)
-                {
-                    $filelist[] = $file;
-                }
-                closedir($handle);
-                arsort($filelist);
+		if (is_dir($dir))
+		{
+			$handle = opendir($dir);
+			if (is_resource($handle))
+			{
+				while (($file = readdir($handle)) !== false)
+				{
+					$filelist[] = $file;
+				}
+				closedir($handle);
+				arsort($filelist);
 
-                foreach ($filelist as $file)
-                {
-                    if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-                    {
-                    	if (file_exists($dir.'/'.$file))
-                    	{
-                    		$name = substr($file, 4, dol_strlen($file) - 16);
-	                        $classname = substr($file, 0, dol_strlen($file) - 12);
+				foreach ($filelist as $file)
+				{
+					if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
+					{
+						if (file_exists($dir.'/'.$file))
+						{
+							$name = substr($file, 4, dol_strlen($file) - 16);
+							$classname = substr($file, 0, dol_strlen($file) - 12);
 
-	                        require_once $dir.'/'.$file;
-	                        $module = new $classname($db);
+							require_once $dir.'/'.$file;
+							$module = new $classname($db);
 
-	                        $modulequalified = 1;
-	                        if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
-	                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+							$modulequalified = 1;
+							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
+							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
 
-	                        if ($modulequalified)
-	                        {
-	                            print '<tr class="oddeven"><td width="100">';
-	                            print (empty($module->name) ? $name : $module->name);
-	                            print "</td><td>\n";
-	                            if (method_exists($module, 'info')) print $module->info($langs);
-	                            else print $module->description;
-	                            print '</td>';
+							if ($modulequalified)
+							{
+								print '<tr class="oddeven"><td width="100">';
+								print (empty($module->name) ? $name : $module->name);
+								print "</td><td>\n";
+								if (method_exists($module, 'info')) print $module->info($langs);
+								else print $module->description;
+								print '</td>';
 
-	                            // Active
-	                            if (in_array($name, $def))
-	                            {
-	                            	print '<td class="center">'."\n";
-	                            	print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'">';
-	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
-	                            	print '</a>';
-	                            	print '</td>';
-	                            } else {
-	                                print "<td align=\"center\">\n";
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-	                                print "</td>";
-	                            }
+								// Active
+								if (in_array($name, $def))
+								{
+									print '<td class="center">'."\n";
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'">';
+									print img_picto($langs->trans("Enabled"), 'switch_on');
+									print '</a>';
+									print '</td>';
+								} else {
+									print "<td align=\"center\">\n";
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print "</td>";
+								}
 
-	                            // Defaut
-	                            print "<td align=\"center\">";
-	                            if ($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF == "$name")
-	                            {
-	                                print img_picto($langs->trans("Default"), 'on');
-	                            } else {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	                            }
-	                            print '</td>';
+								// Defaut
+								print "<td align=\"center\">";
+								if ($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF == "$name")
+								{
+									print img_picto($langs->trans("Default"), 'on');
+								} else {
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+								}
+								print '</td>';
 
-	                            // Info
-	                            $htmltooltip = ''.$langs->trans("Name").': '.$module->name;
-	                            $htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-	                            if ($module->type == 'pdf')
-	                            {
-	                                $htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-	                            }
-	                            $htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
+								// Info
+								$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+								$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+								if ($module->type == 'pdf')
+								{
+									$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+								}
+								$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
 
-	                            $htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+								$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
 								$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
 								$htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
 								$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
@@ -427,28 +429,28 @@ foreach ($dirmodels as $reldir)
 								$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftProposal").': '.yn($module->option_draft_watermark, 1, 1);
 
 
-	                            print '<td class="center">';
-	                            print $form->textwithpicto('', $htmltooltip, 1, 0);
-	                            print '</td>';
+								print '<td class="center">';
+								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print '</td>';
 
-	                            // Preview
-	                            print '<td class="center">';
-	                            if ($module->type == 'pdf')
-	                            {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-	                            } else {
-	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
-	                            }
-	                            print '</td>';
+								// Preview
+								print '<td class="center">';
+								if ($module->type == 'pdf')
+								{
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
+								} else {
+									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+								}
+								print '</td>';
 
-	                            print "</tr>\n";
-	                        }
-                    	}
-                    }
-                }
-            }
-        }
-    }
+								print "</tr>\n";
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 }
 
 print '</table>';
@@ -482,11 +484,11 @@ print $form->textwithpicto($langs->trans("FreeLegalTextOnSupplierProposal"), $la
 $variablename = 'SUPPLIER_PROPOSAL_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
-    print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 } else {
-    include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
-    print $doleditor->Create();
+	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+	print $doleditor->Create();
 }
 print '</td><td class="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
@@ -508,23 +510,23 @@ print '</form>';
 
 if ($conf->banque->enabled)
 {
-    print '<tr class="oddeven"><td>';
-    print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").'</td><td>&nbsp</td><td class="right">';
-    if (!empty($conf->use_javascript_ajax))
-    {
-        print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL');
-    } else {
-        if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL))
-        {
-            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL&amp;token='.newToken().'&amp;value=1">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-        } else {
-            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL&amp;token='.newToken().'&amp;value=0">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
-        }
-    }
-    print '</td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").'</td><td>&nbsp</td><td class="right">';
+	if (!empty($conf->use_javascript_ajax))
+	{
+		print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL');
+	} else {
+		if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL))
+		{
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL&amp;token='.newToken().'&amp;value=1">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+		} else {
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL&amp;token='.newToken().'&amp;value=0">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
+		}
+	}
+	print '</td></tr>';
 } else {
-    print '<tr class="oddeven"><td>';
-    print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
 }
 
 print '</table>';
diff --git a/htdocs/admin/supplierinvoice_extrafields.php b/htdocs/admin/supplierinvoice_extrafields.php
index 50e2fbbbb91..ca12e4dfaa4 100644
--- a/htdocs/admin/supplierinvoice_extrafields.php
+++ b/htdocs/admin/supplierinvoice_extrafields.php
@@ -74,19 +74,19 @@ print "<br>\n";
 
 $head = supplierorder_admin_prepare_head();
 
-dol_fiche_head($head, 'supplierinvoice', $langs->trans("Suppliers"), -1, 'company');
+print dol_get_fiche_head($head, 'supplierinvoice', $langs->trans("Suppliers"), -1, 'company');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -99,9 +99,9 @@ if ($action != 'create' && $action != 'edit')
 if ($action == 'create')
 {
 	print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -111,10 +111,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && !empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/admin/supplierinvoicedet_extrafields.php b/htdocs/admin/supplierinvoicedet_extrafields.php
index 15a96009392..ac40ef66e09 100644
--- a/htdocs/admin/supplierinvoicedet_extrafields.php
+++ b/htdocs/admin/supplierinvoicedet_extrafields.php
@@ -76,11 +76,11 @@ print "<br>\n";
 
 $head = supplierorder_admin_prepare_head();
 
-dol_fiche_head($head, 'supplierinvoicedet', $langs->trans("Suppliers"), -1, 'company');
+print dol_get_fiche_head($head, 'supplierinvoicedet', $langs->trans("Suppliers"), -1, 'company');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/admin/supplierorder_extrafields.php b/htdocs/admin/supplierorder_extrafields.php
index 17d866d8f94..c46eebfb037 100644
--- a/htdocs/admin/supplierorder_extrafields.php
+++ b/htdocs/admin/supplierorder_extrafields.php
@@ -74,11 +74,11 @@ print "<br>\n";
 
 $head = supplierorder_admin_prepare_head();
 
-dol_fiche_head($head, 'supplierorder', $langs->trans("Suppliers"), -1, 'company');
+print dol_get_fiche_head($head, 'supplierorder', $langs->trans("Suppliers"), -1, 'company');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/admin/supplierorderdet_extrafields.php b/htdocs/admin/supplierorderdet_extrafields.php
index 1bcfcec05c4..97cf92883f9 100644
--- a/htdocs/admin/supplierorderdet_extrafields.php
+++ b/htdocs/admin/supplierorderdet_extrafields.php
@@ -75,19 +75,19 @@ print "<br>\n";
 
 $head = supplierorder_admin_prepare_head();
 
-dol_fiche_head($head, 'supplierorderdet', $langs->trans("Suppliers"), -1, 'company');
+print dol_get_fiche_head($head, 'supplierorderdet', $langs->trans("Suppliers"), -1, 'company');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -100,9 +100,9 @@ if ($action != 'create' && $action != 'edit')
 if ($action == 'create')
 {
 	print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -112,10 +112,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && !empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 60de87d2d2e..45500843aed 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -85,7 +85,7 @@ if ($action == 'set')
 	$db->begin();
 
 	$newActiveModules = array();
-	$selectedModules = (isset($_POST['SYSLOG_HANDLERS']) ? $_POST['SYSLOG_HANDLERS'] : array());
+	$selectedModules = (GETPOSTISSET('SYSLOG_HANDLERS') ? GETPOST('SYSLOG_HANDLERS') : array());
 
 	// Save options of handler
 	foreach ($syslogModules as $syslogHandler)
@@ -97,11 +97,10 @@ if ($action == 'set')
 			if (in_array($syslogHandler, $selectedModules)) $newActiveModules[] = $syslogHandler;
 			foreach ($module->configure() as $option)
 			{
-				if (isset($_POST[$option['constant']]))
+				if (GETPOSTISSET($option['constant']))
 				{
-					$_POST[$option['constant']] = trim($_POST[$option['constant']]);
 					dolibarr_del_const($db, $option['constant'], -1);
-					dolibarr_set_const($db, $option['constant'], $_POST[$option['constant']], 'chaine', 0, '', 0);
+					dolibarr_set_const($db, $option['constant'], trim(GETPOST($option['constant'])), 'chaine', 0, '', 0);
 				}
 			}
 		}
@@ -109,8 +108,8 @@ if ($action == 'set')
 
 	$activeModules = $newActiveModules;
 
-    dolibarr_del_const($db, 'SYSLOG_HANDLERS', -1); // To be sure ther is not a setup into another entity
-    dolibarr_set_const($db, 'SYSLOG_HANDLERS', json_encode($activeModules), 'chaine', 0, '', 0);
+	dolibarr_del_const($db, 'SYSLOG_HANDLERS', -1); // To be sure ther is not a setup into another entity
+	dolibarr_set_const($db, 'SYSLOG_HANDLERS', json_encode($activeModules), 'chaine', 0, '', 0);
 
 	// Check configuration
 	foreach ($activeModules as $modulename) {
@@ -213,7 +212,7 @@ foreach ($syslogModules as $moduleName)
 	print '<input class="oddeven" type="checkbox" name="SYSLOG_HANDLERS[]" value="'.$moduleName.'" '.(in_array($moduleName, $activeModules) ? 'checked' : '').($moduleactive <= 0 ? 'disabled' : '').'> ';
 	print $module->getName();
 	if ($moduleName == 'mod_syslog_syslog') {
-		if (! $module->isActive()) {
+		if (!$module->isActive()) {
 			$langs->load("errors");
 			print $form->textwithpicto('', $langs->trans("ErrorPHPNeedModule", 'SysLog'));
 		}
@@ -226,22 +225,22 @@ foreach ($syslogModules as $moduleName)
 	{
 		foreach ($setuparray as $option)
 		{
-		    $tmpoption = $option['constant'];
-		    if (!empty($tmpoption))
-		    {
-    			if (isset($_POST[$tmpoption])) $value = $_POST[$tmpoption];
-    			elseif (!empty($conf->global->$tmpoption)) $value = $conf->global->$tmpoption;
-		    } else $value = (isset($option['default']) ? $option['default'] : '');
+			$tmpoption = $option['constant'];
+			if (!empty($tmpoption))
+			{
+				if (GETPOSTISSET($tmpoption)) $value = GETPOST($tmpoption);
+				elseif (!empty($conf->global->$tmpoption)) $value = $conf->global->$tmpoption;
+			} else $value = (isset($option['default']) ? $option['default'] : '');
 
 			print $option['name'].': <input type="text" class="flat" name="'.$option['constant'].'" value="'.$value.'"'.(isset($option['attr']) ? ' '.$option['attr'] : '').'>';
 			if (!empty($option['example'])) print '<br>'.$langs->trans("Example").': '.$option['example'];
 
 			if ($option['constant'] == 'SYSLOG_FILE' && preg_match('/^DOL_DATA_ROOT\/[^\/]*$/', $value))
 			{
-    			$filelogparam = ' (<a href="'.DOL_URL_ROOT.'/document.php?modulepart=logs&file='.basename($value).'">';
-    			$filelogparam .= $langs->trans('Download');
-    			$filelogparam .= $filelog.'</a>)';
-    			print $filelogparam;
+				$filelogparam = ' (<a href="'.DOL_URL_ROOT.'/document.php?modulepart=logs&file='.basename($value).'">';
+				$filelogparam .= $langs->trans('Download');
+				$filelogparam .= ' '.basename($value).'</a>)';
+				print $filelogparam;
 			}
 		}
 	}
diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php
index bbac6bdfe0c..0668e4612ae 100644
--- a/htdocs/admin/system/about.php
+++ b/htdocs/admin/system/about.php
@@ -83,6 +83,7 @@ print '<li>';
 print '<a target="_blank" href="https://www.dolibarr.org/" rel="external">'.$langs->trans("OfficialWebSite").'</a>';
 print '</li>';
 // Show local site
+/*
 if (preg_match('/^fr_/i', $langs->getDefaultLang()))
 {
 	print '<li>';
@@ -112,7 +113,7 @@ if (preg_match('/^de_/i', $langs->getDefaultLang()))
 	print '<li>';
 	print '<a target="_blank" href="https://www.dolibarr.de/" rel="external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("Germany")).'</a>';
 	print '</li>';
-}
+}*/
 print '<li>';
 print '<a target="_blank" href="https://wiki.dolibarr.org/" rel="external">'.$langs->trans("OfficialWiki").'</a>';
 print '</li>';
@@ -168,7 +169,7 @@ print $langs->trans("OtherResources").':';
 print '<ul>';
 
 $url = 'https://saas.dolibarr.org'; $title = $langs->trans("OfficialWebHostingService");
-if (preg_match('/^fr_/i', $langs->getDefaultLang())) $url = 'https://wiki.dolibarr.org/index.php/Solutions_de_Cloud';
+if (preg_match('/^fr_/i', $langs->getDefaultLang())) $url = 'https://wiki.dolibarr.org/index.php/Solutions_Cloud_pour_Dolibarr_ERP_CRM';
 if (preg_match('/^es_/i', $langs->getDefaultLang())) $url = 'https://wiki.dolibarr.org/index.php/Soluciones_en_la_Nube';
 print '<li>';
 print '<a target="_blank" href="'.$url.'" rel="external">'.$title.'</a>';
@@ -188,25 +189,25 @@ print '<div class="clearboth"></div>';
 $showpromotemessage = 1;
 if ($showpromotemessage)
 {
-    $tmp = versiondolibarrarray();
-    if (is_numeric($tmp[2]))    // Not alpha, beta or rc
-    {
-        print '<br>';
-        print '<br>';
+	$tmp = versiondolibarrarray();
+	if (is_numeric($tmp[2]))    // Not alpha, beta or rc
+	{
+		print '<br>';
+		print '<br>';
 
-        if ((empty($tmp[2]) && (strpos($tmp[1], '0') === 0)) || (strpos($tmp[2], '0') === 0))
-        {
-            print $langs->trans("TitleExampleForMajorRelease").':<br>';
-            print '<textarea style="width:80%; min-height: 60px">';
-            print $langs->trans("ExampleOfNewsMessageForMajorRelease", DOL_VERSION, DOL_VERSION);
-            print '</textarea>';
-        } else {
-            print $langs->trans("TitleExampleForMaintenanceRelease").':<br>';
-            print '<textarea style="width:80%; min-height: 60px">';
-            print $langs->trans("ExampleOfNewsMessageForMaintenanceRelease", DOL_VERSION, DOL_VERSION);
-            print '</textarea>';
-        }
-    }
+		if ((empty($tmp[2]) && (strpos($tmp[1], '0') === 0)) || (strpos($tmp[2], '0') === 0))
+		{
+			print $langs->trans("TitleExampleForMajorRelease").':<br>';
+			print '<textarea style="width:80%; min-height: 60px">';
+			print $langs->trans("ExampleOfNewsMessageForMajorRelease", DOL_VERSION, DOL_VERSION);
+			print '</textarea>';
+		} else {
+			print $langs->trans("TitleExampleForMaintenanceRelease").':<br>';
+			print '<textarea style="width:80%; min-height: 60px">';
+			print $langs->trans("ExampleOfNewsMessageForMaintenanceRelease", DOL_VERSION, DOL_VERSION);
+			print '</textarea>';
+		}
+	}
 }
 
 // End of page
diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php
index b3be7fcf267..c1fec2e0181 100644
--- a/htdocs/admin/system/constall.php
+++ b/htdocs/admin/system/constall.php
@@ -77,7 +77,6 @@ $configfileparameters = array(
 							'?dolibarr_lib_FPDI_PATH',
 							'?dolibarr_lib_TCPDI_PATH',
 							'?dolibarr_lib_NUSOAP_PATH',
-							'?dolibarr_lib_PHPEXCEL_PATH',
 							'?dolibarr_lib_GEOIP_PATH',
 							'?dolibarr_lib_ODTPHP_PATH',
 							'?dolibarr_lib_ODTPHP_PATHTOPCLZIP',
@@ -124,7 +123,6 @@ $configfilelib = array(
 					'dolibarr_lib_TCPDF_PATH',
 					'dolibarr_lib_FPDI_PATH',
 					'dolibarr_lib_NUSOAP_PATH',
-					'dolibarr_lib_PHPEXCEL_PATH',
 					'dolibarr_lib_GEOIP_PATH',
 					'dolibarr_lib_ODTPHP_PATH',
 					'dolibarr_lib_ODTPHP_PATHTOPCLZIP',
diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index 683fc3c4f3a..00020845bde 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -119,7 +119,7 @@ if (!$base)
 				print '<td><a href="dbtable.php?table='.$obj->Name.'">'.$obj->Name.'</a></td>';
 				print '<td>'.$obj->Engine.'</td>';
 				if (isset($obj->Engine) && $obj->Engine == "MyISAM") {
-				    print '<td><a class="reposition" href="database-tables.php?action=convert&amp;table='.$obj->Name.'">'.$langs->trans("Convert").' InnoDb</a></td>';
+					print '<td><a class="reposition" href="database-tables.php?action=convert&amp;table='.$obj->Name.'">'.$langs->trans("Convert").' InnoDb</a></td>';
 				} else {
 					print '<td>&nbsp;</td>';
 				}
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index 6b08fc4fe8f..8681efa08ef 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -77,7 +77,7 @@ if (!count($listofvars) && !count($listofstatus))
 	foreach ($arraylist as $listname)
 	{
 		print '<br>';
-        print '<div class="div-table-responsive-no-min">';
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print '<td width="300">'.$langs->trans("Parameters").'</td>';
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 57d288dfb4c..80454403a32 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2005-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
+/* Copyright (C) 2005-2020	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2007		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2007-2012	Regis Houssin			<regis.houssin@inodbox.com>
  *
@@ -19,7 +19,7 @@
 
 /**
  *  \file       htdocs/admin/system/dolibarr.php
- *  \brief      Page to show Dolibarr informations
+ *  \brief      Page to show Dolibarr information
  */
 
 require '../../main.inc.php';
@@ -48,9 +48,13 @@ $version = '0.0';
 
 if ($action == 'getlastversion')
 {
-    $result = getURLContent('https://sourceforge.net/projects/dolibarr/rss');
-    //var_dump($result['content']);
-    $sfurl = simplexml_load_string($result['content']);
+	$result = getURLContent('https://sourceforge.net/projects/dolibarr/rss');
+	//var_dump($result['content']);
+	if (function_exists('simplexml_load_string')) {
+		$sfurl = simplexml_load_string($result['content']);
+	} else {
+		setEventMessages($langs->trans("ErrorPHPDoesNotSupport", "xml"), null, 'errors');
+	}
 }
 
 
@@ -74,26 +78,29 @@ print '<tr class="oddeven"><td>'.$langs->trans("CurrentVersion").' ('.$langs->tr
 // If current version differs from last upgrade
 if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE))
 {
-    // Compare version with last install database version (upgrades never occured)
-    if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_INSTALL) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, $conf->global->MAIN_VERSION_LAST_INSTALL));
+	// Compare version with last install database version (upgrades never occured)
+	if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_INSTALL) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, $conf->global->MAIN_VERSION_LAST_INSTALL));
 } else {
-    // Compare version with last upgrade database version
-    if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_UPGRADE) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, $conf->global->MAIN_VERSION_LAST_UPGRADE));
+	// Compare version with last upgrade database version
+	if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_UPGRADE) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, $conf->global->MAIN_VERSION_LAST_UPGRADE));
 }
 
+$version = DOL_VERSION;
+if (preg_match('/[a-z]+/i', $version)) $version = 'develop'; // If version contains text, it is not an official tagged version, so we use the full change log.
+print ' &nbsp; <a href="https://raw.githubusercontent.com/Dolibarr/dolibarr/'.$version.'/ChangeLog" target="_blank">'.$langs->trans("SeeChangeLog").'</a>';
+
+$newversion = '';
 if (function_exists('curl_init'))
 {
     $conf->global->MAIN_USE_RESPONSE_TIMEOUT = 10;
     print ' &nbsp; &nbsp; - &nbsp; &nbsp; ';
-    if ($action == 'getlastversion')
-    {
-        if ($sfurl)
-        {
-            while (!empty($sfurl->channel[0]->item[$i]->title) && $i < 10000)
-            {
+    if ($action == 'getlastversion') {
+        if ($sfurl) {
+        	$i = 0;
+            while (!empty($sfurl->channel[0]->item[$i]->title) && $i < 10000) {
                 $title = $sfurl->channel[0]->item[$i]->title;
-                if (preg_match('/([0-9]+\.([0-9\.]+))/', $title, $reg))
-                {
+                $reg = array();
+                if (preg_match('/([0-9]+\.([0-9\.]+))/', $title, $reg)) {
                     $newversion = $reg[1];
                     $newversionarray = explode('.', $newversion);
                     $versionarray = explode('.', $version);
@@ -103,23 +110,25 @@ if (function_exists('curl_init'))
                 $i++;
             }
 
-            // Show version
-            print $langs->trans("LastStableVersion").' : <b>'.(($version != '0.0') ? $version : $langs->trans("Unknown")).'</b>';
+			// Show version
+			print $langs->trans("LastStableVersion").' : <b>'.(($version != '0.0') ? $version : $langs->trans("Unknown")).'</b>';
+			if ($version != '0.0') {
+				print ' &nbsp; <a href="https://raw.githubusercontent.com/Dolibarr/dolibarr/'.$version.'/ChangeLog" target="_blank">'.$langs->trans("SeeChangeLog").'</a>';
+			}
         } else {
-            print $langs->trans("LastStableVersion").' : <b>'.$langs->trans("UpdateServerOffline").'</b>';
-        }
-    } else {
-        print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="butAction">'.$langs->trans("Check").'</a>';
-    }
+			print $langs->trans("LastStableVersion").' : <b>'.$langs->trans("UpdateServerOffline").'</b>';
+		}
+	} else {
+		print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="butAction">'.$langs->trans("Check").'</a>';
+	}
 }
 
 // Now show link to the changelog
-print ' &nbsp; &nbsp; - &nbsp; &nbsp; ';
+//print ' &nbsp; &nbsp; - &nbsp; &nbsp; ';
 
 $version = DOL_VERSION;
 if (preg_match('/[a-z]+/i', $version)) $version = 'develop'; // If version contains text, it is not an official tagged version, so we use the full change log.
 
-print '<a href="https://raw.githubusercontent.com/Dolibarr/dolibarr/'.$version.'/ChangeLog" target="_blank">'.$langs->trans("SeeChangeLog").'</a>';
 print '</td></tr>'."\n";
 print '<tr class="oddeven"><td>'.$langs->trans("VersionLastUpgrade").' ('.$langs->trans("Database").')</td><td>'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</td></tr>'."\n";
 print '<tr class="oddeven"><td>'.$langs->trans("VersionLastInstall").'</td><td>'.$conf->global->MAIN_VERSION_LAST_INSTALL.'</td></tr>'."\n";
@@ -168,7 +177,7 @@ if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_S
 {
 	$shmoparray = dol_listshmop();
 
-    print '<div class="div-table-responsive-no-min">';
+	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td class="titlefield">'.$langs->trans("LanguageFilesCachedIntoShmopSharedMemory").'</td>';
@@ -221,7 +230,7 @@ print '<tr class="oddeven"><td>'.$langs->trans("CurrentTimeZone").'</td><td>'; /
 $a = getServerTimeZoneInt('now');
 $b = getServerTimeZoneInt('winter');
 $c = getServerTimeZoneInt('summer');
-$daylight = (is_numeric($c) && is_numeric($b)) ?round($c - $b) : 'unknown';
+$daylight = round($c - $b);
 //print $a." ".$b." ".$c." ".$daylight;
 $val = ($a >= 0 ? '+' : '').$a;
 $val .= ' ('.($a == 'unknown' ? 'unknown' : ($a >= 0 ? '+' : '').($a * 3600)).')';
@@ -280,8 +289,8 @@ $configfileparameters = array(
 		'dolibarr_main_document_root'=> $langs->trans("DocumentRootServer"),
 		'?dolibarr_main_document_root_alt' => $langs->trans("DocumentRootServer").' (alt)',
 		'dolibarr_main_data_root' => $langs->trans("DataRootServer"),
-        'dolibarr_main_instance_unique_id' => $langs->trans("InstanceUniqueID"),
-        'separator1' => '',
+		'dolibarr_main_instance_unique_id' => $langs->trans("InstanceUniqueID"),
+		'separator1' => '',
 		'dolibarr_main_db_host' => $langs->trans("DatabaseServer"),
 		'dolibarr_main_db_port' => $langs->trans("DatabasePort"),
 		'dolibarr_main_db_name' => $langs->trans("DatabaseName"),
@@ -293,7 +302,7 @@ $configfileparameters = array(
 		'?dolibarr_main_db_prefix' => $langs->trans("Prefix"),
 		'separator2' => '',
 		'dolibarr_main_authentication' => $langs->trans("AuthenticationMode"),
-        '?multicompany_transverse_mode'=>  $langs->trans("MultiCompanyMode"),
+		'?multicompany_transverse_mode'=>  $langs->trans("MultiCompanyMode"),
 		'separator'=> '',
 		'?dolibarr_main_auth_ldap_login_attribute' => 'dolibarr_main_auth_ldap_login_attribute',
 		'?dolibarr_main_auth_ldap_host' => 'dolibarr_main_auth_ldap_host',
@@ -310,7 +319,6 @@ $configfileparameters = array(
 		'?dolibarr_lib_FPDI_PATH' => 'dolibarr_lib_FPDI_PATH',
 		'?dolibarr_lib_TCPDI_PATH' => 'dolibarr_lib_TCPDI_PATH',
 		'?dolibarr_lib_NUSOAP_PATH' => 'dolibarr_lib_NUSOAP_PATH',
-		'?dolibarr_lib_PHPEXCEL_PATH' => 'dolibarr_lib_PHPEXCEL_PATH',
 		'?dolibarr_lib_GEOIP_PATH' => 'dolibarr_lib_GEOIP_PATH',
 		'?dolibarr_lib_ODTPHP_PATH' => 'dolibarr_lib_ODTPHP_PATH',
 		'?dolibarr_lib_ODTPHP_PATHTOPCLZIP' => 'dolibarr_lib_ODTPHP_PATHTOPCLZIP',
@@ -349,8 +357,8 @@ foreach ($configfileparameters as $key => $value)
 
 		if (preg_match('/^\?/', $key) && empty(${$newkey}))
 		{
-		    if ($newkey != 'multicompany_transverse_mode' || empty($conf->multicompany->enabled))
-                continue; // We discard parameters starting with ?
+			if ($newkey != 'multicompany_transverse_mode' || empty($conf->multicompany->enabled))
+				continue; // We discard parameters starting with ?
 		}
 		if (strpos($newkey, 'separator') !== false && $lastkeyshown == 'separator') continue;
 
@@ -365,7 +373,7 @@ foreach ($configfileparameters as $key => $value)
 			print '<td>'.$newkey.'</td>';
 			// Value
 			print "<td>";
-			if ($newkey == 'dolibarr_main_db_pass') {
+			if (in_array($newkey, array('dolibarr_main_db_pass', 'dolibarr_main_auth_ldap_admin_pass'))) {
 				if (empty($dolibarr_main_prod)) {
 					print '<!-- '.${$newkey}.' -->';
 				}
@@ -387,14 +395,14 @@ foreach ($configfileparameters as $key => $value)
 					++$i;
 				}
 			} elseif ($newkey == 'dolibarr_main_instance_unique_id') {
-			    //print $conf->file->instance_unique_id;
-			    global $dolibarr_main_cookie_cryptkey;
-			    $valuetoshow = ${$newkey} ? ${$newkey} : $dolibarr_main_cookie_cryptkey; // Use $dolibarr_main_instance_unique_id first then $dolibarr_main_cookie_cryptkey
-			    print $valuetoshow;
-			    if (empty($valuetoshow)) {
-			        print img_warning("EditConfigFileToAddEntry", 'dolibarr_main_instance_unique_id');
-			    }
-			    print ' &nbsp; <span class="opacitymedium">('.$langs->trans("HashForPing").'='.md5('dolibarr'.$valuetoshow).')</span>';
+				//print $conf->file->instance_unique_id;
+				global $dolibarr_main_cookie_cryptkey;
+				$valuetoshow = ${$newkey} ? ${$newkey} : $dolibarr_main_cookie_cryptkey; // Use $dolibarr_main_instance_unique_id first then $dolibarr_main_cookie_cryptkey
+				print $valuetoshow;
+				if (empty($valuetoshow)) {
+					print img_warning("EditConfigFileToAddEntry", 'dolibarr_main_instance_unique_id');
+				}
+				print ' &nbsp; <span class="opacitymedium">('.$langs->trans("HashForPing").'='.md5('dolibarr'.$valuetoshow).')</span>';
 			} elseif ($newkey == 'dolibarr_main_prod') {
 				print ${$newkey};
 
@@ -410,7 +418,7 @@ foreach ($configfileparameters as $key => $value)
 					print img_warning($langs->trans('SwitchThisForABetterSecurity', 0));
 				}
 			} else {
-			    print ${$newkey};
+				print ${$newkey};
 			}
 			if ($newkey == 'dolibarr_main_url_root' && ${$newkey} != DOL_MAIN_URL_ROOT) print ' (currently overwritten by autodetected value: '.DOL_MAIN_URL_ROOT.')';
 			print "</td>";
@@ -464,7 +472,7 @@ if ($resql)
 		print '<tr class="oddeven">';
 		print '<td class="tdoverflowmax300">'.$obj->name.'</td>'."\n";
 		print '<td class="tdoverflowmax300">';
-		if (preg_match('/(_pass|password|_pw|_key|securekey|serverkey|secret\d?|p12key|exportkey|_PW_[a-z]+|token)$/i', $obj->name)) {
+		if (isASecretKey($obj->name)) {
 			if (empty($dolibarr_main_prod)) {
 				print '<!-- '.$obj->value.' -->';
 			}
diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index a3d54104a02..a94a78a9794 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 $langs->load("admin");
 
 if (!$user->admin)
-    accessforbidden();
+	accessforbidden();
 
 $error = 0;
 
@@ -57,13 +57,13 @@ print '<tr class="oddeven"><td width="300">'.$langs->trans("VersionLastUpgrade")
 print '<tr class="oddeven"><td width="300">'.$langs->trans("VersionProgram").'</td><td>'.DOL_VERSION;
 // If current version differs from last upgrade
 if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE)) {
-    // Compare version with last install database version (upgrades never occured)
-    if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_INSTALL)
-        print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, $conf->global->MAIN_VERSION_LAST_INSTALL));
+	// Compare version with last install database version (upgrades never occured)
+	if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_INSTALL)
+		print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, $conf->global->MAIN_VERSION_LAST_INSTALL));
 } else {
-    // Compare version with last upgrade database version
-    if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_UPGRADE)
-        print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, $conf->global->MAIN_VERSION_LAST_UPGRADE));
+	// Compare version with last upgrade database version
+	if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_UPGRADE)
+		print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, $conf->global->MAIN_VERSION_LAST_UPGRADE));
 }
 print '</td></tr>'."\n";
 print '</table>';
@@ -96,24 +96,24 @@ print $langs->trans("MakeIntegrityAnalysisFrom").':<br>';
 print '<!-- for a local check target=local&xmlshortfile=... -->'."\n";
 if (dol_is_file($xmlfile))
 {
-    print '<input type="radio" name="target" value="local"'.((!GETPOST('target') || GETPOST('target') == 'local') ? 'checked="checked"' : '').'"> '.$langs->trans("LocalSignature").' = ';
-    print '<input name="xmlshortfile" class="flat minwidth400" value="'.dol_escape_htmltag($xmlshortfile).'">';
-    print '<br>';
+	print '<input type="radio" name="target" value="local"'.((!GETPOST('target') || GETPOST('target') == 'local') ? 'checked="checked"' : '').'"> '.$langs->trans("LocalSignature").' = ';
+	print '<input name="xmlshortfile" class="flat minwidth400" value="'.dol_escape_htmltag($xmlshortfile).'">';
+	print '<br>';
 } else {
-    print '<input type="radio" name="target" value="local"> '.$langs->trans("LocalSignature").' = ';
-    print '<input name="xmlshortfile" class="flat minwidth400" value="'.dol_escape_htmltag($xmlshortfile).'">';
-    print ' <span class="warning">('.$langs->trans("AvailableOnlyOnPackagedVersions").')</span>';
-    print '<br>';
+	print '<input type="radio" name="target" value="local"> '.$langs->trans("LocalSignature").' = ';
+	print '<input name="xmlshortfile" class="flat minwidth400" value="'.dol_escape_htmltag($xmlshortfile).'">';
+	print ' <span class="warning">('.$langs->trans("AvailableOnlyOnPackagedVersions").')</span>';
+	print '<br>';
 }
 print '<!-- for a remote target=remote&xmlremote=... -->'."\n";
 if ($enableremotecheck)
 {
-    print '<input type="radio" name="target" value="remote"'.(GETPOST('target') == 'remote' ? 'checked="checked"' : '').'> '.$langs->trans("RemoteSignature").' = ';
-    print '<input name="xmlremote" class="flat minwidth400" value="'.dol_escape_htmltag($xmlremote).'"><br>';
+	print '<input type="radio" name="target" value="remote"'.(GETPOST('target') == 'remote' ? 'checked="checked"' : '').'> '.$langs->trans("RemoteSignature").' = ';
+	print '<input name="xmlremote" class="flat minwidth400" value="'.dol_escape_htmltag($xmlremote).'"><br>';
 } else {
-    print '<input type="radio" name="target" value="remote" disabled="disabled"> '.$langs->trans("RemoteSignature").' = '.$xmlremote;
-    if (!GETPOST('xmlremote')) print ' <span class="warning">('.$langs->trans("FeatureAvailableOnlyOnStable").')</span>';
-    print '<br>';
+	print '<input type="radio" name="target" value="remote" disabled="disabled"> '.$langs->trans("RemoteSignature").' = '.$xmlremote;
+	if (!GETPOST('xmlremote')) print ' <span class="warning">('.$langs->trans("FeatureAvailableOnlyOnStable").')</span>';
+	print '<br>';
 }
 print '<br><div class="center"><input type="submit" name="check" class="button" value="'.$langs->trans("Check").'"></div>';
 print '</form>';
@@ -122,275 +122,275 @@ print '<br>';
 
 if (GETPOST('target') == 'local')
 {
-    if (dol_is_file($xmlfile))
-    {
-    	// If file is a zip file (.../filelist-x.y.z.xml.zip), we uncompress it before
-    	if (preg_match('/\.zip$/i', $xmlfile)) {
-    		dol_mkdir($conf->admin->dir_temp);
-    		$xmlfilenew = preg_replace('/\.zip$/i', '', $xmlfile);
-    		$result = dol_uncompress($xmlfile, $conf->admin->dir_temp);
-    		if (empty($result['error'])) {
-    			$xmlfile = $conf->admin->dir_temp.'/'.basename($xmlfilenew);
-    		} else {
-    			print $langs->trans('FailedToUncompressFile').': '.$xmlfile;
-    			$error++;
-    		}
-    	}
-        $xml = simplexml_load_file($xmlfile);
-    } else {
-        print $langs->trans('XmlNotFound').': '.$xmlfile;
-        $error++;
-    }
+	if (dol_is_file($xmlfile))
+	{
+		// If file is a zip file (.../filelist-x.y.z.xml.zip), we uncompress it before
+		if (preg_match('/\.zip$/i', $xmlfile)) {
+			dol_mkdir($conf->admin->dir_temp);
+			$xmlfilenew = preg_replace('/\.zip$/i', '', $xmlfile);
+			$result = dol_uncompress($xmlfile, $conf->admin->dir_temp);
+			if (empty($result['error'])) {
+				$xmlfile = $conf->admin->dir_temp.'/'.basename($xmlfilenew);
+			} else {
+				print $langs->trans('FailedToUncompressFile').': '.$xmlfile;
+				$error++;
+			}
+		}
+		$xml = simplexml_load_file($xmlfile);
+	} else {
+		print $langs->trans('XmlNotFound').': '.$xmlfile;
+		$error++;
+	}
 }
 if (GETPOST('target') == 'remote')
 {
-    $xmlarray = getURLContent($xmlremote);
+	$xmlarray = getURLContent($xmlremote);
 
-    // Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
-    if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '404')
-    {
-        $xmlfile = $xmlarray['content'];
-        //print "xmlfilestart".$xmlfile."xmlfileend";
-        $xml = simplexml_load_string($xmlfile);
-    } else {
-        $errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
-        setEventMessages($errormsg, null, 'errors');
-        $error++;
-    }
+	// Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
+	if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '400' && $xmlarray['http_code'] != '404')
+	{
+		$xmlfile = $xmlarray['content'];
+		//print "xmlfilestart".$xmlfile."xmlfileend";
+		$xml = simplexml_load_string($xmlfile);
+	} else {
+		$errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
+		setEventMessages($errormsg, null, 'errors');
+		$error++;
+	}
 }
 
 
 if (!$error && $xml)
 {
-    $checksumconcat = array();
-    $file_list = array();
-    $out = '';
+	$checksumconcat = array();
+	$file_list = array();
+	$out = '';
 
-    // Forced constants
-    if (is_object($xml->dolibarr_constants[0]))
-    {
-        $out .= load_fiche_titre($langs->trans("ForcedConstants"));
+	// Forced constants
+	if (is_object($xml->dolibarr_constants[0]))
+	{
+		$out .= load_fiche_titre($langs->trans("ForcedConstants"));
 
 		$out .= '<div class="div-table-responsive-no-min">';
-        $out .= '<table class="noborder">';
-        $out .= '<tr class="liste_titre">';
-        $out .= '<td>#</td>';
-        $out .= '<td>'.$langs->trans("Constant").'</td>';
-        $out .= '<td class="center">'.$langs->trans("ExpectedValue").'</td>';
-        $out .= '<td class="center">'.$langs->trans("Value").'</td>';
-        $out .= '</tr>'."\n";
+		$out .= '<table class="noborder">';
+		$out .= '<tr class="liste_titre">';
+		$out .= '<td>#</td>';
+		$out .= '<td>'.$langs->trans("Constant").'</td>';
+		$out .= '<td class="center">'.$langs->trans("ExpectedValue").'</td>';
+		$out .= '<td class="center">'.$langs->trans("Value").'</td>';
+		$out .= '</tr>'."\n";
 
-        $i = 0;
-        foreach ($xml->dolibarr_constants[0]->constant as $constant)    // $constant is a simpleXMLElement
-        {
-            $constname = $constant['name'];
-            $constvalue = (string) $constant;
-            $constvalue = (empty($constvalue) ? '0' : $constvalue);
-            // Value found
-            $value = '';
-            if ($constname && $conf->global->$constname != '') $value = $conf->global->$constname;
-            $valueforchecksum = (empty($value) ? '0' : $value);
+		$i = 0;
+		foreach ($xml->dolibarr_constants[0]->constant as $constant)    // $constant is a simpleXMLElement
+		{
+			$constname = $constant['name'];
+			$constvalue = (string) $constant;
+			$constvalue = (empty($constvalue) ? '0' : $constvalue);
+			// Value found
+			$value = '';
+			if ($constname && $conf->global->$constname != '') $value = $conf->global->$constname;
+			$valueforchecksum = (empty($value) ? '0' : $value);
 
-            $checksumconcat[] = $valueforchecksum;
+			$checksumconcat[] = $valueforchecksum;
 
-            $i++;
-            $out .= '<tr class="oddeven">';
-            $out .= '<td>'.$i.'</td>'."\n";
-            $out .= '<td>'.dol_escape_htmltag($constname).'</td>'."\n";
-            $out .= '<td class="center">'.dol_escape_htmltag($constvalue).'</td>'."\n";
-            $out .= '<td class="center">'.dol_escape_htmltag($valueforchecksum).'</td>'."\n";
-            $out .= "</tr>\n";
-        }
+			$i++;
+			$out .= '<tr class="oddeven">';
+			$out .= '<td>'.$i.'</td>'."\n";
+			$out .= '<td>'.dol_escape_htmltag($constname).'</td>'."\n";
+			$out .= '<td class="center">'.dol_escape_htmltag($constvalue).'</td>'."\n";
+			$out .= '<td class="center">'.dol_escape_htmltag($valueforchecksum).'</td>'."\n";
+			$out .= "</tr>\n";
+		}
 
-        if ($i == 0)
-        {
-            $out .= '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-        }
-        $out .= '</table>';
-        $out .= '</div>';
+		if ($i == 0)
+		{
+			$out .= '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+		}
+		$out .= '</table>';
+		$out .= '</div>';
 
-        $out .= '<br>';
-    }
+		$out .= '<br>';
+	}
 
-    // Scan htdocs
-    if (is_object($xml->dolibarr_htdocs_dir[0]))
-    {
-        //var_dump($xml->dolibarr_htdocs_dir[0]['includecustom']);exit;
-        $includecustom = (empty($xml->dolibarr_htdocs_dir[0]['includecustom']) ? 0 : $xml->dolibarr_htdocs_dir[0]['includecustom']);
+	// Scan htdocs
+	if (is_object($xml->dolibarr_htdocs_dir[0]))
+	{
+		//var_dump($xml->dolibarr_htdocs_dir[0]['includecustom']);exit;
+		$includecustom = (empty($xml->dolibarr_htdocs_dir[0]['includecustom']) ? 0 : $xml->dolibarr_htdocs_dir[0]['includecustom']);
 
-        // Defined qualified files (must be same than into generate_filelist_xml.php)
-        $regextoinclude = '\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
-        $regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|conf|install|public\/test|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
-        $scanfiles = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude);
+		// Defined qualified files (must be same than into generate_filelist_xml.php)
+		$regextoinclude = '\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
+		$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|conf|install|public\/test|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
+		$scanfiles = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude);
 
-        // Fill file_list with files in signature, new files, modified files
-        $ret = getFilesUpdated($file_list, $xml->dolibarr_htdocs_dir[0], '', DOL_DOCUMENT_ROOT, $checksumconcat); // Fill array $file_list
-        // Complete with list of new files
-        foreach ($scanfiles as $keyfile => $valfile)
-        {
-            $tmprelativefilename = preg_replace('/^'.preg_quote(DOL_DOCUMENT_ROOT, '/').'/', '', $valfile['fullname']);
-            if (!in_array($tmprelativefilename, $file_list['insignature']))
-            {
-                $md5newfile = @md5_file($valfile['fullname']); // Can fails if we don't have permission to open/read file
-                $file_list['added'][] = array('filename'=>$tmprelativefilename, 'md5'=>$md5newfile);
-            }
-        }
+		// Fill file_list with files in signature, new files, modified files
+		$ret = getFilesUpdated($file_list, $xml->dolibarr_htdocs_dir[0], '', DOL_DOCUMENT_ROOT, $checksumconcat); // Fill array $file_list
+		// Complete with list of new files
+		foreach ($scanfiles as $keyfile => $valfile)
+		{
+			$tmprelativefilename = preg_replace('/^'.preg_quote(DOL_DOCUMENT_ROOT, '/').'/', '', $valfile['fullname']);
+			if (!in_array($tmprelativefilename, $file_list['insignature']))
+			{
+				$md5newfile = @md5_file($valfile['fullname']); // Can fails if we don't have permission to open/read file
+				$file_list['added'][] = array('filename'=>$tmprelativefilename, 'md5'=>$md5newfile);
+			}
+		}
 
-        // Files missings
-        $out .= load_fiche_titre($langs->trans("FilesMissing"));
+		// Files missings
+		$out .= load_fiche_titre($langs->trans("FilesMissing"));
 
 		$out .= '<div class="div-table-responsive-no-min">';
-        $out .= '<table class="noborder">';
-        $out .= '<tr class="liste_titre">';
-        $out .= '<td>#</td>';
-        $out .= '<td>'.$langs->trans("Filename").'</td>';
-        $out .= '<td class="right">'.$langs->trans("ExpectedSize").'</td>';
-        $out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
-        $out .= '</tr>'."\n";
-        $tmpfilelist = dol_sort_array($file_list['missing'], 'filename');
-        if (is_array($tmpfilelist) && count($tmpfilelist))
-        {
-            $i = 0;
-	        foreach ($tmpfilelist as $file)
-	        {
-	            $i++;
-	            $out .= '<tr class="oddeven">';
-	            $out .= '<td>'.$i.'</td>'."\n";
-	            $out .= '<td>'.dol_escape_htmltag($file['filename']).'</td>'."\n";
-	            $out .= '<td class="right">';
-	            if (!empty($file['expectedsize'])) $out .= dol_print_size($file['expectedsize']);
-	            $out .= '</td>'."\n";
-	            $out .= '<td class="center">'.dol_escape_htmltag($file['expectedmd5']).'</td>'."\n";
-	            $out .= "</tr>\n";
-	        }
-        } else {
-            $out .= '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-        }
-        $out .= '</table>';
-        $out .= '</div>';
+		$out .= '<table class="noborder">';
+		$out .= '<tr class="liste_titre">';
+		$out .= '<td>#</td>';
+		$out .= '<td>'.$langs->trans("Filename").'</td>';
+		$out .= '<td class="right">'.$langs->trans("ExpectedSize").'</td>';
+		$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
+		$out .= '</tr>'."\n";
+		$tmpfilelist = dol_sort_array($file_list['missing'], 'filename');
+		if (is_array($tmpfilelist) && count($tmpfilelist))
+		{
+			$i = 0;
+			foreach ($tmpfilelist as $file)
+			{
+				$i++;
+				$out .= '<tr class="oddeven">';
+				$out .= '<td>'.$i.'</td>'."\n";
+				$out .= '<td>'.dol_escape_htmltag($file['filename']).'</td>'."\n";
+				$out .= '<td class="right">';
+				if (!empty($file['expectedsize'])) $out .= dol_print_size($file['expectedsize']);
+				$out .= '</td>'."\n";
+				$out .= '<td class="center">'.dol_escape_htmltag($file['expectedmd5']).'</td>'."\n";
+				$out .= "</tr>\n";
+			}
+		} else {
+			$out .= '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+		}
+		$out .= '</table>';
+		$out .= '</div>';
 
-        $out .= '<br>';
+		$out .= '<br>';
 
-        // Files modified
-        $out .= load_fiche_titre($langs->trans("FilesModified"));
+		// Files modified
+		$out .= load_fiche_titre($langs->trans("FilesModified"));
 
-        $totalsize = 0;
+		$totalsize = 0;
 		$out .= '<div class="div-table-responsive-no-min">';
-        $out .= '<table class="noborder">';
-        $out .= '<tr class="liste_titre">';
-        $out .= '<td>#</td>';
-        $out .= '<td>'.$langs->trans("Filename").'</td>';
-        $out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
-        $out .= '<td class="center">'.$langs->trans("CurrentChecksum").'</td>';
-        $out .= '<td class="right">'.$langs->trans("ExpectedSize").'</td>';
-        $out .= '<td class="right">'.$langs->trans("CurrentSize").'</td>';
-        $out .= '<td class="right">'.$langs->trans("DateModification").'</td>';
-        $out .= '</tr>'."\n";
-        $tmpfilelist2 = dol_sort_array($file_list['updated'], 'filename');
-        if (is_array($tmpfilelist2) && count($tmpfilelist2))
-        {
-            $i = 0;
-	        foreach ($tmpfilelist2 as $file)
-	        {
-	            $i++;
-	            $out .= '<tr class="oddeven">';
-	            $out .= '<td>'.$i.'</td>'."\n";
-	            $out .= '<td>'.dol_escape_htmltag($file['filename']).'</td>'."\n";
-	            $out .= '<td class="center">'.dol_escape_htmltag($file['expectedmd5']).'</td>'."\n";
-	            $out .= '<td class="center">'.dol_escape_htmltag($file['md5']).'</td>'."\n";
-	            $out .= '<td class="right">';
-	            if ($file['expectedsize']) $out .= dol_print_size($file['expectedsize']);
-	            $out .= '</td>'."\n";
-	            $size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
-	            $totalsize += $size;
-	            $out .= '<td class="right">'.dol_print_size($size).'</td>'."\n";
-	            $out .= '<td class="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']), 'dayhour').'</td>'."\n";
-	            $out .= "</tr>\n";
-	        }
-            $out .= '<tr class="liste_total">';
-            $out .= '<td></td>'."\n";
-            $out .= '<td>'.$langs->trans("Total").'</td>'."\n";
-            $out .= '<td class="center"></td>'."\n";
-            $out .= '<td class="center"></td>'."\n";
-            $out .= '<td class="center"></td>'."\n";
-            $out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
-            $out .= '<td class="right"></td>'."\n";
-            $out .= "</tr>\n";
-        } else {
-            $out .= '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-        }
-        $out .= '</table>';
-        $out .= '</div>';
+		$out .= '<table class="noborder">';
+		$out .= '<tr class="liste_titre">';
+		$out .= '<td>#</td>';
+		$out .= '<td>'.$langs->trans("Filename").'</td>';
+		$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
+		$out .= '<td class="center">'.$langs->trans("CurrentChecksum").'</td>';
+		$out .= '<td class="right">'.$langs->trans("ExpectedSize").'</td>';
+		$out .= '<td class="right">'.$langs->trans("CurrentSize").'</td>';
+		$out .= '<td class="right">'.$langs->trans("DateModification").'</td>';
+		$out .= '</tr>'."\n";
+		$tmpfilelist2 = dol_sort_array($file_list['updated'], 'filename');
+		if (is_array($tmpfilelist2) && count($tmpfilelist2))
+		{
+			$i = 0;
+			foreach ($tmpfilelist2 as $file)
+			{
+				$i++;
+				$out .= '<tr class="oddeven">';
+				$out .= '<td>'.$i.'</td>'."\n";
+				$out .= '<td>'.dol_escape_htmltag($file['filename']).'</td>'."\n";
+				$out .= '<td class="center">'.dol_escape_htmltag($file['expectedmd5']).'</td>'."\n";
+				$out .= '<td class="center">'.dol_escape_htmltag($file['md5']).'</td>'."\n";
+				$out .= '<td class="right">';
+				if ($file['expectedsize']) $out .= dol_print_size($file['expectedsize']);
+				$out .= '</td>'."\n";
+				$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
+				$totalsize += $size;
+				$out .= '<td class="right">'.dol_print_size($size).'</td>'."\n";
+				$out .= '<td class="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']), 'dayhour').'</td>'."\n";
+				$out .= "</tr>\n";
+			}
+			$out .= '<tr class="liste_total">';
+			$out .= '<td></td>'."\n";
+			$out .= '<td>'.$langs->trans("Total").'</td>'."\n";
+			$out .= '<td class="center"></td>'."\n";
+			$out .= '<td class="center"></td>'."\n";
+			$out .= '<td class="center"></td>'."\n";
+			$out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
+			$out .= '<td class="right"></td>'."\n";
+			$out .= "</tr>\n";
+		} else {
+			$out .= '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+		}
+		$out .= '</table>';
+		$out .= '</div>';
 
-        $out .= '<br>';
+		$out .= '<br>';
 
-        // Files added
-        $out .= load_fiche_titre($langs->trans("FilesAdded"));
+		// Files added
+		$out .= load_fiche_titre($langs->trans("FilesAdded"));
 
-        $totalsize = 0;
+		$totalsize = 0;
 		$out .= '<div class="div-table-responsive-no-min">';
-        $out .= '<table class="noborder">';
-        $out .= '<tr class="liste_titre">';
-        $out .= '<td>#</td>';
-        $out .= '<td>'.$langs->trans("Filename").'</td>';
-        $out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
-        $out .= '<td class="center">'.$langs->trans("CurrentChecksum").'</td>';
-        $out .= '<td class="right">'.$langs->trans("Size").'</td>';
-        $out .= '<td class="right">'.$langs->trans("DateModification").'</td>';
-        $out .= '</tr>'."\n";
-        $tmpfilelist3 = dol_sort_array($file_list['added'], 'filename');
-        if (is_array($tmpfilelist3) && count($tmpfilelist3))
-        {
-            $i = 0;
-            foreach ($tmpfilelist3 as $file)
-            {
-                $i++;
-                $out .= '<tr class="oddeven">';
-                $out .= '<td>'.$i.'</td>'."\n";
-                $out .= '<td>'.dol_escape_htmltag($file['filename']);
-                if (!preg_match('/^win/i', PHP_OS)) {
-                	$htmltext = $langs->trans("YouCanDeleteFileOnServerWith", 'rm '.DOL_DOCUMENT_ROOT.$file['filename']); // The slash is included int file['filename']
-                	$out .= ' '.$form->textwithpicto('', $htmltext, 1, 'help', '', 0, 2, 'helprm'.$i);
-                }
-                $out .= '</td>'."\n";
-                $out .= '<td class="center">'.dol_escape_htmltag($file['expectedmd5']).'</td>'."\n";
-                $out .= '<td class="center">'.dol_escape_htmltag($file['md5']).'</td>'."\n";
-                $size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
-                $totalsize += $size;
-                $out .= '<td class="right">'.dol_print_size($size).'</td>'."\n";
-                $out .= '<td class="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']), 'dayhour').'</td>'."\n";
-                $out .= "</tr>\n";
-            }
-            $out .= '<tr class="liste_total">';
-            $out .= '<td></td>'."\n";
-            $out .= '<td>'.$langs->trans("Total").'</td>'."\n";
-            $out .= '<td class="center"></td>'."\n";
-            $out .= '<td class="center"></td>'."\n";
-            $out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
-            $out .= '<td class="right"></td>'."\n";
-            $out .= "</tr>\n";
-        } else {
-            $out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-        }
-        $out .= '</table>';
-        $out .= '</div>';
+		$out .= '<table class="noborder">';
+		$out .= '<tr class="liste_titre">';
+		$out .= '<td>#</td>';
+		$out .= '<td>'.$langs->trans("Filename").'</td>';
+		$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
+		$out .= '<td class="center">'.$langs->trans("CurrentChecksum").'</td>';
+		$out .= '<td class="right">'.$langs->trans("Size").'</td>';
+		$out .= '<td class="right">'.$langs->trans("DateModification").'</td>';
+		$out .= '</tr>'."\n";
+		$tmpfilelist3 = dol_sort_array($file_list['added'], 'filename');
+		if (is_array($tmpfilelist3) && count($tmpfilelist3))
+		{
+			$i = 0;
+			foreach ($tmpfilelist3 as $file)
+			{
+				$i++;
+				$out .= '<tr class="oddeven">';
+				$out .= '<td>'.$i.'</td>'."\n";
+				$out .= '<td>'.dol_escape_htmltag($file['filename']);
+				if (!preg_match('/^win/i', PHP_OS)) {
+					$htmltext = $langs->trans("YouCanDeleteFileOnServerWith", 'rm '.DOL_DOCUMENT_ROOT.$file['filename']); // The slash is included int file['filename']
+					$out .= ' '.$form->textwithpicto('', $htmltext, 1, 'help', '', 0, 2, 'helprm'.$i);
+				}
+				$out .= '</td>'."\n";
+				$out .= '<td class="center">'.dol_escape_htmltag($file['expectedmd5']).'</td>'."\n";
+				$out .= '<td class="center">'.dol_escape_htmltag($file['md5']).'</td>'."\n";
+				$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
+				$totalsize += $size;
+				$out .= '<td class="right">'.dol_print_size($size).'</td>'."\n";
+				$out .= '<td class="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']), 'dayhour').'</td>'."\n";
+				$out .= "</tr>\n";
+			}
+			$out .= '<tr class="liste_total">';
+			$out .= '<td></td>'."\n";
+			$out .= '<td>'.$langs->trans("Total").'</td>'."\n";
+			$out .= '<td class="center"></td>'."\n";
+			$out .= '<td class="center"></td>'."\n";
+			$out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
+			$out .= '<td class="right"></td>'."\n";
+			$out .= "</tr>\n";
+		} else {
+			$out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+		}
+		$out .= '</table>';
+		$out .= '</div>';
 
 
-        // Show warning
-        if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3))
-        {
-            setEventMessages($langs->trans("FileIntegrityIsStrictlyConformedWithReference"), null, 'mesgs');
-        } else {
-            setEventMessages($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), null, 'warnings');
-        }
-    } else {
-        print 'Error: Failed to found dolibarr_htdocs_dir into XML file '.$xmlfile;
-        $error++;
-    }
+		// Show warning
+		if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3))
+		{
+			setEventMessages($langs->trans("FileIntegrityIsStrictlyConformedWithReference"), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), null, 'warnings');
+		}
+	} else {
+		print 'Error: Failed to found dolibarr_htdocs_dir into XML file '.$xmlfile;
+		$error++;
+	}
 
 
-    // Scan scripts
-    /*
+	// Scan scripts
+	/*
     if (is_object($xml->dolibarr_script_dir[0]))
     {
         $file_list = array();
@@ -398,44 +398,44 @@ if (!$error && $xml)
     }*/
 
 
-    asort($checksumconcat); // Sort list of checksum
-    //var_dump($checksumconcat);
-    $checksumget = md5(join(',', $checksumconcat));
-    $checksumtoget = trim((string) $xml->dolibarr_htdocs_dir_checksum);
+	asort($checksumconcat); // Sort list of checksum
+	//var_dump($checksumconcat);
+	$checksumget = md5(join(',', $checksumconcat));
+	$checksumtoget = trim((string) $xml->dolibarr_htdocs_dir_checksum);
 
-    /*var_dump(count($file_list['added']));
+	/*var_dump(count($file_list['added']));
     var_dump($checksumget);
     var_dump($checksumtoget);
     var_dump($checksumget == $checksumtoget);*/
 
-    $outexpectedchecksum = ($checksumtoget ? $checksumtoget : $langs->trans("Unknown"));
-    if ($checksumget == $checksumtoget)
-    {
-    	if (count($file_list['added']))
-    	{
-    		$resultcode = 'warning';
-    		$resultcomment = 'FileIntegrityIsOkButFilesWereAdded';
-    		$outcurrentchecksum = $checksumget.' - <span class="'.$resultcode.'">'.$langs->trans("FileIntegrityIsOkButFilesWereAdded").'</span>';
-    	} else {
-    		$resultcode = 'ok';
-    		$resultcomment = 'Success';
-    		$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
-    	}
-    } else {
-    	$resultcode = 'error';
-    	$resultcomment = 'Error';
-    	$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
-    }
+	$outexpectedchecksum = ($checksumtoget ? $checksumtoget : $langs->trans("Unknown"));
+	if ($checksumget == $checksumtoget)
+	{
+		if (count($file_list['added']))
+		{
+			$resultcode = 'warning';
+			$resultcomment = 'FileIntegrityIsOkButFilesWereAdded';
+			$outcurrentchecksum = $checksumget.' - <span class="'.$resultcode.'">'.$langs->trans("FileIntegrityIsOkButFilesWereAdded").'</span>';
+		} else {
+			$resultcode = 'ok';
+			$resultcomment = 'Success';
+			$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
+		}
+	} else {
+		$resultcode = 'error';
+		$resultcomment = 'Error';
+		$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
+	}
 
-    print load_fiche_titre($langs->trans("GlobalChecksum")).'<br>';
-    print $langs->trans("ExpectedChecksum").' = '.$outexpectedchecksum.'<br>';
-    print $langs->trans("CurrentChecksum").' = '.$outcurrentchecksum;
+	print load_fiche_titre($langs->trans("GlobalChecksum")).'<br>';
+	print $langs->trans("ExpectedChecksum").' = '.$outexpectedchecksum.'<br>';
+	print $langs->trans("CurrentChecksum").' = '.$outcurrentchecksum;
 
-    print '<br>';
-    print '<br>';
+	print '<br>';
+	print '<br>';
 
-    // Output detail
-    print $out;
+	// Output detail
+	print $out;
 }
 
 // End of page
diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php
index 06003068bb2..2bbe919c72e 100644
--- a/htdocs/admin/system/index.php
+++ b/htdocs/admin/system/index.php
@@ -94,10 +94,10 @@ if ($db->type == 'pgsql')
 {
 	// Check option standard_conforming_strings is on
 	$paramarray = $db->getServerParametersValues('standard_conforming_strings');
-    //	if ($paramarray['standard_conforming_strings'] != 'on' && $paramarray['standard_conforming_strings'] != 1)
-    //	{
-    //		$langs->load("errors");
-    //	}
+	//	if ($paramarray['standard_conforming_strings'] != 'on' && $paramarray['standard_conforming_strings'] != 1)
+	//	{
+	//		$langs->load("errors");
+	//	}
 }
 print '<br>';
 
diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index c909084f1d6..28dcb6641ef 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -56,11 +56,13 @@ $arrayfields = array(
 	'name'=>array('label'=>$langs->trans("Modules"), 'checked'=>1, 'position'=>10),
 	'version'=>array('label'=>$langs->trans("Version"), 'checked'=>1, 'position'=>20),
 	'id'=>array('label'=>$langs->trans("IdModule"), 'checked'=>1, 'position'=>30),
+	'module_position'=>array('label'=>$langs->trans("Position"), 'checked'=>1, 'position'=>35),
 	'permission'=>array('label'=>$langs->trans("IdPermissions"), 'checked'=>1, 'position'=>40)
 );
 
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
+
 /*
  * Actions
  */
@@ -129,6 +131,7 @@ foreach ($modules as $key=>$module) {
 	$newModule->name = $module->getName();
 	$newModule->version = $module->getVersion();
 	$newModule->id = $key;
+	$newModule->module_position = $module->module_position;
 
 	$alt = $module->name.' - '.$modules_files[$key];
 
@@ -223,6 +226,10 @@ if ($arrayfields['id']['checked']) {
 	print '<input class="flat" type="text" name="search_id" size="8" value="'.$search_id.'">';
 	print '</td>';
 }
+if ($arrayfields['module_position']['checked']) {
+	print '<td class="liste_titre left">';
+	print '</td>';
+}
 if ($arrayfields['permission']['checked']) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat" type="text" name="search_permission" size="8" value="'.$search_permission.'">';
@@ -247,6 +254,9 @@ if ($arrayfields['version']['checked']) {
 if ($arrayfields['id']['checked']) {
 	print_liste_field_titre($arrayfields['id']['label'], $_SERVER["PHP_SELF"], "id", "", "", "", $sortfield, $sortorder);
 }
+if ($arrayfields['module_position']['checked']) {
+	print_liste_field_titre($arrayfields['module_position']['label'], $_SERVER["PHP_SELF"], "module_position", "", "", "", $sortfield, $sortorder);
+}
 if ($arrayfields['permission']['checked']) {
 	print_liste_field_titre($arrayfields['permission']['label'], $_SERVER["PHP_SELF"], "permission", "", "", "", $sortfield, $sortorder);
 }
@@ -273,6 +283,8 @@ if ($sortfield == "id" && $sortorder == "desc") usort($moduleList, "compareIdDes
 if ($sortfield == "permission" && $sortorder == "asc") usort($moduleList, "comparePermissionIdsAsc");
 if ($sortfield == "permission" && $sortorder == "desc") usort($moduleList, "comparePermissionIdsDesc");
 
+$moduleList = dol_sort_array($moduleList, 'module_position');
+
 foreach ($moduleList as $module) {
 	print '<tr class="oddeven">';
 
@@ -291,6 +303,10 @@ foreach ($moduleList as $module) {
 		print '<td class="center">'.$module->id.'</td>';
 	}
 
+	if ($arrayfields['module_position']['checked']) {
+		print '<td class="center">'.$module->module_position.'</td>';
+	}
+
 	if ($arrayfields['permission']['checked']) {
 		$idperms = '';
 
diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index ec6dc9d4a88..6d9e3574789 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -49,7 +49,7 @@ llxHeader();
 
 print load_fiche_titre($langs->trans("PerfDolibarr"), '', 'title_setup');
 
-print $langs->trans("YouMayFindPerfAdviceHere", 'https://wiki.dolibarr.org/index.php/FAQ_Increase_Performance').' (<a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("Reload").'</a>)<br>';
+print '<span class="opacitymedium">'.$langs->trans("YouMayFindPerfAdviceHere", 'https://wiki.dolibarr.org/index.php/FAQ_Increase_Performance').'</span> (<a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("Reload").'</a>)<br>';
 
 // Recupere la version de PHP
 $phpversion = version_php();
@@ -62,7 +62,7 @@ print "<br><strong>Web server</strong> - ".$langs->trans("Version").": ".$_SERVE
 print '<br>';
 print '<strong>'.$langs->trans("XDebug").'</strong>: ';
 $test = !function_exists('xdebug_is_enabled');
-if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
+if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotSlowedDownByThis");
 else {
 	print img_picto('', 'warning').' '.$langs->trans("ModuleActivated", $langs->transnoentities("XDebug"));
 	print ' - '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php">XDebug admin page</a>';
@@ -73,7 +73,7 @@ print '<br>';
 print '<br>';
 print '<strong>'.$langs->trans("Syslog").'</strong>: ';
 $test = empty($conf->syslog->enabled);
-if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
+if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotSlowedDownByThis");
 else {
 	print img_picto('', 'warning').' '.$langs->trans("ModuleActivated", $langs->transnoentities("Syslog"));
 	//print ' '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php'.'">XDebug admin page</a>';
@@ -84,10 +84,10 @@ print '<br>';
 print '<br>';
 print '<strong>'.$langs->trans("DebugBar").'</strong>: ';
 $test = empty($conf->debugbar->enabled);
-if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
+if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotSlowedDownByThis");
 else {
 	print img_picto('', 'warning').' '.$langs->trans("ModuleActivated", $langs->transnoentities("DebugBar"));
-    //print ' '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php'.'">XDebug admin page</a>';
+	//print ' '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php'.'">XDebug admin page</a>';
 }
 print '<br>';
 
@@ -431,7 +431,6 @@ print '<br>';
 print '<strong>';
 print $form->textwithpicto($langs->trans("CompressionOfResources"), $langs->trans("CompressionOfResourcesDesc"));
 print '</strong>: ';
-//$tmp=getURLContent(DOL_URL_ROOT.'/index.php','GET');var_dump($tmp);
 print '<br>';
 // on PHP
 print '<div id="httpcompphpok">'.img_picto('', 'tick.png').' '.$langs->trans("FilesOfTypeCompressed", 'php (.php)').'</div>';
diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index 05038c13bbc..cf38687f66f 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -28,9 +28,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-$langs->load("admin");
-$langs->load("install");
-$langs->load("errors");
+$langs->loadLangs(array("admin", "install", "errors"));
 
 if (!$user->admin)
 	accessforbidden();
@@ -95,7 +93,7 @@ if (versioncompare(versionphparray(), $arrayphpminversionerror) < 0)
 print '</td></tr>';
 print '<tr><td>GET and POST support</td><td>';
 
-if (!isset($_GET["testget"]) && !isset($_POST["testpost"]) && !isset($_GET["mainmenu"]))
+if (!isset($_GET["testget"]) && !isset($_POST["testpost"]) && !isset($_GET["mainmenu"]))	// We must keep $_GET and $_POST here
 {
 	print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("PHPSupportPOSTGETKo");
 	print ' (<a href="'.$_SERVER["PHP_SELF"].'?testget=ok">'.$langs->trans("Recheck").'</a>)';
@@ -105,43 +103,28 @@ if (!isset($_GET["testget"]) && !isset($_POST["testpost"]) && !isset($_GET["main
 
 print '</td></tr>';
 print '<tr><td>Sessions support</td><td>';
-
 if (!function_exists("session_id"))
 {
 	print '<img src="'.$ErrorPicturePath.'" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportSessions");
 } else {
 	print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupportSessions");
 }
-
 print '</td></tr>';
 
 print '<tr><td>UTF-8 support</td><td>';
-
 if (!function_exists("utf8_encode"))
 {
 	print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("ErrorPHPDoesNotSupport", "UTF8");
 } else {
 	print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupport", "UTF8");
 }
-
-print '</td></tr>';
-
-print '<tr><td>MBString support</td><td>';
-
-if (!function_exists("mb_check_encoding"))
-{
-	print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("ErrorPHPDoesNotSupport", "mbstring");
-} else {
-	print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupport", "mbstring");
-}
-
 print '</td></tr>';
 
 print '</table>';
 
 print '<br>';
 
-$activatedExtensions = array_map('strtolower', getActivatedExtensions());
+$activatedExtensions = array();
 $loadedExtensions    = array_map('strtolower', get_loaded_extensions(false));
 
 print '<table class="noborder centpercent">';
@@ -153,12 +136,33 @@ print '<td align="center">'.$langs->trans("FunctionTest").'</td>';
 print '<td>'.$langs->trans("Result").'</td>';
 print '</tr>';
 
+$functions = ["mb_check_encoding"];
+$name      = "MBString";
+
+print "<tr>";
+print "<td>".$name."</td>";
+//print getTableColumn($name, $activatedExtensions);
+print getTableColumn($name, $loadedExtensions);
+print getTableColumnFunction($functions);
+print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
+print "</tr>";
+
+$functions = ["json_decode"];
+$name      = "JSON";
+
+print "<tr>";
+print "<td>".$name."</td>";
+//print getTableColumn($name, $activatedExtensions);
+print getTableColumn($name, $loadedExtensions);
+print getTableColumnFunction($functions);
+print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
+print "</tr>";
+
 $functions = ["imagecreate"];
 $name      = "GD";
 
 print "<tr>";
 print "<td>".$name."</td>";
-//print getTableColumn($name, $activatedExtensions);
 print getTableColumn($name, $loadedExtensions);
 print getTableColumnFunction($functions);
 print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
@@ -169,7 +173,6 @@ $name      = "Curl";
 
 print "<tr>";
 print "<td>".$name."</td>";
-//print getTableColumn($name, $activatedExtensions);
 print getTableColumn($name, $loadedExtensions);
 print getTableColumnFunction($functions);
 print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
@@ -182,20 +185,27 @@ if (empty($_SERVER["SERVER_ADMIN"]) || $_SERVER["SERVER_ADMIN"] != 'doliwamp@loc
 
 	print "<tr>";
 	print "<td>".$name."</td>";
-	//print getTableColumn($name, $activatedExtensions);
 	print getTableColumn($name, $loadedExtensions);
 	print getTableColumnFunction($functions);
 	print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
-
 	print "</tr>";
 }
 
+$functions = ["imap_open"];
+$name      = "IMAP";
+
+print "<tr>";
+print "<td>".$name."</td>";
+print getTableColumn($name, $loadedExtensions);
+print getTableColumnFunction($functions);
+print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
+print "</tr>";
+
 $functions = array();
 $name      = "xDebug";
 
 print "<tr>";
 print "<td>".$name."</td>";
-//print getTableColumn($name, $activatedExtensions);
 print getTableColumn($name, $loadedExtensions);
 print getTableColumnFunction($functions);
 print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
@@ -225,7 +235,7 @@ foreach ($phparray as $key => $value)
 			print '<td>'.$keyparam.'</td>';
 			$valtoshow = $keyvalue;
 			if ($keyparam == 'X-ChromePhp-Data') $valtoshow = dol_trunc($keyvalue, 80);
-			print '<td colspan="2">';
+			print '<td colspan="2" class="wordbreak">';
 			if ($keyparam == 'Path') $valtoshow = implode('; ', explode(';', trim($valtoshow)));
 			if ($keyparam == 'PATH') $valtoshow = implode('; ', explode(';', trim($valtoshow)));
 			if ($keyparam == '_SERVER["PATH"]') $valtoshow = implode('; ', explode(';', trim($valtoshow)));
@@ -234,7 +244,7 @@ foreach ($phparray as $key => $value)
 			print '</tr>';
 		} else {
 			print '<tr class="oddeven">';
-			print '<td>'.$keyparam.'</td>';
+			print '<td class="wordbreak">'.$keyparam.'</td>';
 			$i = 0;
 			foreach ($keyvalue as $keyparam2 => $keyvalue2)
 			{
@@ -258,78 +268,6 @@ foreach ($phparray as $key => $value)
 llxFooter();
 $db->close();
 
-/**
- * Return all list with all activated, but possible not loaded PHP extensions
- *
- * @return array
- */
-function getActivatedExtensions()
-{
-	$file    = getConfigFilePath();
-	$handle  = fopen(GetConfigFilePath(), "r");
-	$content = fread($handle, filesize($file));
-
-	fclose($handle);
-
-	$configLines = explode("\r", $content);
-
-	$extensions = array();
-	$lastLine = "";
-
-	foreach ($configLines as $line)
-	{
-		$line = trim($line);
-
-		// ignore comment lines
-		if (substr($line, 0, 1) === ";")
-		{
-			continue;
-		}
-
-		// extension
-		if (substr($line, 0, 9) === "extension" && substr($line, 0, 10) !== "extension_")
-		{
-			$value = trim(end(explode("=", $line)));
-
-			$extensions[] = $value === "gd2" ? "gd" : $value;
-		}
-
-		// zend_extension
-		if (substr($line, 0, 14) === "zend_extension")
-		{
-			$extensions[] = str_replace("[", "", str_replace("]", "", $lastLine));
-		}
-
-		$lastLine = $line;
-	}
-
-	return array_unique($extensions);
-}
-
-/**
- * Return the path to the current used php config file
- *
- * @return string
- */
-function getConfigFilePath()
-{
-	$phparray = phpinfo_array();
-
-	foreach ($phparray as $value)
-	{
-		foreach ($value as $keyparam => $keyvalue)
-		{
-			if (strtolower($keyparam) !== "loaded configuration file")
-			{
-				continue;
-			}
-
-			return $keyvalue;
-		}
-	}
-
-	return "";
-}
 
 /**
  * Return a table column with a indicator (okay or warning), based on the given name and list
@@ -398,7 +336,7 @@ function getTableColumnFunction(array $functions)
  * Return a result column with a translated result text
  *
  * @param string $name			The name of the PHP extension
- * @param array $activated		A list with all activated PHP extensions
+ * @param array $activated		A list with all activated PHP extensions. Deprecated.
  * @param array $loaded			A list with all loaded PHP extensions
  * @param array $functions		A list with all PHP functions to check
  *
@@ -418,8 +356,8 @@ function getResultColumn($name, array $activated, array $loaded, array $function
 	}
 
 	$html = "<td>";
-	$html .= $result ? $langs->trans("PHPSupport".$name) : $langs->trans("ErrorPHPDoesNotSupport".$name);
+	$html .= $result ? $langs->trans("PHPSupport", $name) : $langs->trans("ErrorPHPDoesNotSupport", $name);
 	$html .= "</td>";
 
-    return $html;
+	return $html;
 }
diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
new file mode 100644
index 00000000000..f978c0dcd81
--- /dev/null
+++ b/htdocs/admin/system/security.php
@@ -0,0 +1,183 @@
+<?php
+/* Copyright (C) 2013-2019	Laurent Destailleur		<eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/admin/system/security.php
+ *  \brief      Page to show Security information
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/events.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("install", "other", "admin"));
+
+if (!$user->admin)
+	accessforbidden();
+
+if (GETPOST('action', 'aZ09') == 'donothing')
+{
+	exit;
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$nowstring = dol_print_date(dol_now(), 'dayhourlog');
+
+llxHeader();
+
+print load_fiche_titre($langs->trans("Security"), '', 'title_setup');
+
+print '<span class="opacitymedium">'.$langs->trans("YouMayFindSecurityAdviceHere", 'hhttps://wiki.dolibarr.org/index.php/Security_information').'</span> (<a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("Reload").'</a>)<br>';
+print '<br>';
+
+print load_fiche_titre($langs->trans("PHPSetup"), '', 'folder');
+
+// Get version of PHP
+$phpversion = version_php();
+print "<strong>PHP</strong> - ".$langs->trans("Version").": ".$phpversion."<br>\n";
+
+// Get versionof web server
+print "<br><strong>Web server</strong> - ".$langs->trans("Version").": ".$_SERVER["SERVER_SOFTWARE"]."<br>\n";
+print '<br>';
+
+print "<strong>PHP safe_mode</strong> = ".(ini_get('safe_mode') ? ini_get('safe_mode') : yn(0))."<br>\n";
+print "<strong>PHP open_basedir</strong> = ".(ini_get('open_basedir') ? ini_get('open_basedir') : yn(0))."<br>\n";
+print '<br>';
+
+// XDebug
+print '<strong>'.$langs->trans("XDebug").'</strong>: ';
+$test = !function_exists('xdebug_is_enabled');
+if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotRiskOfLeakWithThis");
+else {
+	print img_picto('', 'warning').' '.$langs->trans("ModuleActivatedMayExposeInformation", $langs->transnoentities("XDebug"));
+	print ' - '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php">XDebug admin page</a>';
+}
+print '<br>';
+
+print '<br>';
+print load_fiche_titre($langs->trans("ConfigFile"), '', 'folder');
+
+print '<strong>'.$langs->trans("dolibarr_main_prod").'</strong>: '.$dolibarr_main_prod;
+if (empty($dolibarr_main_prod)) {
+	print ' &nbsp; '.img_picto('', 'warning').' '.$langs->trans("IfYouAreOnAProductionSetThis", 1);
+}
+print '<br>';
+
+print '<strong>'.$langs->trans("dolibarr_nocsrfcheck").'</strong>: '.$dolibarr_nocsrfcheck;
+if (!empty($dolibarr_nocsrfcheck)) {
+	print img_picto('', 'warning').' &nbsp;  '.$langs->trans("IfYouAreOnAProductionSetThis", 0);
+}
+
+print '<br>';
+
+print '<br>';
+print '<br>';
+print load_fiche_titre($langs->trans("Permissions"), '', 'folder');
+
+print '<strong>'.$langs->trans("PermissionsOnFilesInWebRoot").'</strong>: ';
+// TODO Check permission are read only except for custom dir
+print 'TODO';
+print '<br>';
+
+print '<strong>'.$langs->trans("PermissionsOnFile", 'conf.php').'</strong>: ';
+// TODO Check permission on file conf.php (read only for the web user)
+print 'TODO';
+print '<br>';
+
+print '<br>';
+
+print '<br>';
+print load_fiche_titre($langs->trans("Modules"), '', 'folder');
+
+// Module log
+print '<strong>'.$langs->trans("Syslog").'</strong>: ';
+$test = empty($conf->syslog->enabled);
+if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotRiskOfLeakWithThis");
+else {
+	print img_picto('', 'warning').' '.$langs->trans("ModuleActivatedMayExposeInformation", $langs->transnoentities("Syslog"));
+	//print ' '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php'.'">XDebug admin page</a>';
+}
+print '<br>';
+
+// Module debugbar
+print '<strong>'.$langs->trans("DebugBar").'</strong>: ';
+$test = empty($conf->debugbar->enabled);
+if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotRiskOfLeakWithThis");
+else {
+	print img_picto('', 'error').' '.$langs->trans("ModuleActivatedDoNotUseInProduction", $langs->transnoentities("DebugBar"));
+	//print ' '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php'.'">XDebug admin page</a>';
+}
+print '<br>';
+
+print '<br>';
+print '<br>';
+print load_fiche_titre($langs->trans("Menu").' '.$langs->trans("SecuritySetup"), '', 'folder');
+
+//print '<strong>'.$langs->trans("PasswordEncryption").'</strong>: ';
+print '<strong>MAIN_SECURITY_HASH_ALGO</strong> = '.(empty($conf->global->MAIN_SECURITY_HASH_ALGO) ? 'unset' : '')." &nbsp; ";
+print '<span class="opacitymedium"> &nbsp; If unset: \'md5\'</span> ';
+print '<span class="opacitymedium"> - Recommanded value: \'password_hash\'</span><br>';
+print '<strong>MAIN_SECURITY_SALT</strong> = '.$conf->global->MAIN_SECURITY_SALT.'<br>';
+print '<br>';
+// TODO
+
+print '<strong>'.$langs->trans("AntivirusEnabledOnUpload").'</strong>: ';
+print yn($conf->global->MAIN_ANTIVIRUS_COMMAND ? 1 : 0);
+if (!empty($conf->global->MAIN_ANTIVIRUS_COMMAND)) {
+	print ' &nbsp; - '.$conf->global->MAIN_ANTIVIRUS_COMMAND;
+	if (defined('MAIN_ANTIVIRUS_COMMAND')) {
+		print ' - <span class="opacitymedium">'.$langs->trans("ValueIsForcedBySystem").'</span>';
+	}
+}
+print '<br>';
+
+print '<br>';
+
+$securityevent = new Events($db);
+$eventstolog = $securityevent->eventstolog;
+
+print '<strong>'.$langs->trans("LogEvents").'</strong>: ';
+// Loop on each event type
+foreach ($eventstolog as $key => $arr)
+{
+	if ($arr['id'])
+	{
+		$key = 'MAIN_LOGEVENTS_'.$arr['id'];
+		$value = empty($conf->global->$key) ? '' : $conf->global->$key;
+		if ($value) print $key.', ';
+	}
+}
+
+
+
+
+
+
+
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index 51a089336c6..0963a264c52 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -125,7 +125,7 @@ if (!empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans('TaxSetup'), $linkback, 'title_setup');
 
-//dol_fiche_head(null, '', '', -1);
+//print dol_get_fiche_head(null, '', '', -1);
 
 if (empty($mysoc->tva_assuj))
 {
diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index b30dd9c5f13..c1546f1da2c 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -182,11 +182,11 @@ print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
 // Configuration header
 $head = ticketAdminPrepareHead();
 
-dol_fiche_head($head, 'settings', $langs->trans("Module56000Name"), -1, "ticket");
+print dol_get_fiche_head($head, 'settings', $langs->trans("Module56000Name"), -1, "ticket");
 
 print '<span class="opacitymedium">'.$langs->trans("TicketSetupDictionaries").'</span> : <a href="'.DOL_URL_ROOT.'/admin/dict.php">'.$langs->trans("ClickHereToGoTo", $langs->transnoentitiesnoconv("DictionarySetup")).'</a><br>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 /*
@@ -240,6 +240,7 @@ foreach ($dirmodels as $reldir) {
 						print '<td class="nowrap">';
 						$tmp = $module->getExample();
 						if (preg_match('/^Error/', $tmp)) {
+							$langs->load("errors");
 							print '<div class="error">'.$langs->trans($tmp).'</div>';
 						} elseif ($tmp == 'NotConfigured') {
 							print $langs->trans($tmp);
@@ -410,7 +411,7 @@ print '</td></tr>';
 print '</table>';
 
 print '<div class="center">';
-print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 print '</div>';
 
 print '</form>';
diff --git a/htdocs/admin/ticket_extrafields.php b/htdocs/admin/ticket_extrafields.php
index 91e5df44180..4a50beaa32e 100644
--- a/htdocs/admin/ticket_extrafields.php
+++ b/htdocs/admin/ticket_extrafields.php
@@ -71,11 +71,11 @@ print load_fiche_titre($langs->trans("TicketSetup"), $linkback, 'title_setup');
 
 $head = ticketAdminPrepareHead();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Module56000Name"), -1, "ticket");
+print dol_get_fiche_head($head, 'attributes', $langs->trans("Module56000Name"), -1, "ticket");
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // Buttons
 if ($action != 'create' && $action != 'edit') {
diff --git a/htdocs/admin/ticket_public.php b/htdocs/admin/ticket_public.php
index 011de9422bf..80f458a2b5c 100644
--- a/htdocs/admin/ticket_public.php
+++ b/htdocs/admin/ticket_public.php
@@ -32,7 +32,7 @@ $langs->loadLangs(array("admin", "ticket"));
 
 // Access control
 if (!$user->admin) {
-    accessforbidden();
+	accessforbidden();
 }
 
 // Parameters
@@ -50,62 +50,62 @@ $error = 0;
 
 if ($action == 'setTICKET_ENABLE_PUBLIC_INTERFACE')
 {
-    if (GETPOST('value')) dolibarr_set_const($db, 'TICKET_ENABLE_PUBLIC_INTERFACE', 1, 'chaine', 0, '', $conf->entity);
-    else dolibarr_set_const($db, 'TICKET_ENABLE_PUBLIC_INTERFACE', 0, 'chaine', 0, '', $conf->entity);
+	if (GETPOST('value')) dolibarr_set_const($db, 'TICKET_ENABLE_PUBLIC_INTERFACE', 1, 'chaine', 0, '', $conf->entity);
+	else dolibarr_set_const($db, 'TICKET_ENABLE_PUBLIC_INTERFACE', 0, 'chaine', 0, '', $conf->entity);
 }
 
 if ($action == 'setvar') {
-    include_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
+	include_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
 
-    $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_PUBLIC_INTERFACE_TOPIC', '', 'chaine', 0, '', $conf->entity);
-    }
-    if (!$res > 0) {
-    	$error++;
-    }
+	$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_PUBLIC_INTERFACE_TOPIC', '', 'chaine', 0, '', $conf->entity);
+	}
+	if (!$res > 0) {
+		$error++;
+	}
 
-    $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_PUBLIC_TEXT_HOME', $langs->trans('TicketPublicInterfaceTextHome'), 'chaine', 0, '', $conf->entity);
-    }
-    if (!$res > 0) {
-    	$error++;
-    }
+	$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_PUBLIC_TEXT_HOME', $langs->trans('TicketPublicInterfaceTextHome'), 'chaine', 0, '', $conf->entity);
+	}
+	if (!$res > 0) {
+		$error++;
+	}
 
-    $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++;
-    }
+	$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);
-    } else {
-    	$res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_NEW', $langs->trans('TicketMessageMailNewText'), '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);
+	} else {
+		$res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_NEW', $langs->trans('TicketMessageMailNewText'), 'chaine', 0, '', $conf->entity);
+	}
+	if (!$res > 0) {
+		$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);
-    } else {
-    	$res = dolibarr_set_const($db, 'TICKET_URL_PUBLIC_INTERFACE', '', 'chaine', 0, '', $conf->entity);
-    }
-    if (!$res > 0) {
-    	$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);
+	} else {
+		$res = dolibarr_set_const($db, 'TICKET_URL_PUBLIC_INTERFACE', '', 'chaine', 0, '', $conf->entity);
+	}
+	if (!$res > 0) {
+		$error++;
+	}
 
 	$param_public_notification_new_message_default_email = GETPOST('TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL', 'alpha');
 	$res = dolibarr_set_const($db, 'TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL', $param_public_notification_new_message_default_email, 'chaine', 0, '', $conf->entity);
@@ -115,38 +115,38 @@ if ($action == 'setvar') {
 }
 
 if ($action == 'setvarother') {
-    $param_enable_public_interface = GETPOST('TICKET_ENABLE_PUBLIC_INTERFACE', 'alpha');
-    $res = dolibarr_set_const($db, 'TICKET_ENABLE_PUBLIC_INTERFACE', $param_enable_public_interface, 'chaine', 0, '', $conf->entity);
-    if (!$res > 0) {
-        $error++;
-    }
+	$param_enable_public_interface = GETPOST('TICKET_ENABLE_PUBLIC_INTERFACE', 'alpha');
+	$res = dolibarr_set_const($db, 'TICKET_ENABLE_PUBLIC_INTERFACE', $param_enable_public_interface, 'chaine', 0, '', $conf->entity);
+	if (!$res > 0) {
+		$error++;
+	}
 
-    $param_must_exists = GETPOST('TICKET_EMAIL_MUST_EXISTS', 'alpha');
-    $res = dolibarr_set_const($db, 'TICKET_EMAIL_MUST_EXISTS', $param_must_exists, 'chaine', 0, '', $conf->entity);
-    if (!$res > 0) {
-        $error++;
-    }
+	$param_must_exists = GETPOST('TICKET_EMAIL_MUST_EXISTS', 'alpha');
+	$res = dolibarr_set_const($db, 'TICKET_EMAIL_MUST_EXISTS', $param_must_exists, 'chaine', 0, '', $conf->entity);
+	if (!$res > 0) {
+		$error++;
+	}
 
-    $param_disable_email = GETPOST('TICKET_DISABLE_CUSTOMER_MAILS', 'alpha');
-    $res = dolibarr_set_const($db, 'TICKET_DISABLE_CUSTOMER_MAILS', $param_disable_email, 'chaine', 0, '', $conf->entity);
-    if (!$res > 0) {
-        $error++;
-    }
+	$param_disable_email = GETPOST('TICKET_DISABLE_CUSTOMER_MAILS', 'alpha');
+	$res = dolibarr_set_const($db, 'TICKET_DISABLE_CUSTOMER_MAILS', $param_disable_email, '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++;
+	   	$error++;
    	}
 
-    if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
-    {
-    	$param_notification_also_main_addressemail = GETPOST('TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS', 'alpha');
-	    $res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS', $param_notification_also_main_addressemail, 'chaine', 0, '', $conf->entity);
-	    if (!$res > 0) {
-	        $error++;
-	    }
-    }
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
+	{
+		$param_notification_also_main_addressemail = GETPOST('TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS', 'alpha');
+		$res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS', $param_notification_also_main_addressemail, 'chaine', 0, '', $conf->entity);
+		if (!$res > 0) {
+			$error++;
+		}
+	}
 }
 
 
@@ -171,25 +171,25 @@ print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
 // Configuration header
 $head = ticketAdminPrepareHead();
 
-dol_fiche_head($head, 'public', $langs->trans("Module56000Name"), -1, "ticket");
+print dol_get_fiche_head($head, 'public', $langs->trans("Module56000Name"), -1, "ticket");
 
 print '<span class="opacitymedium">'.$langs->trans("TicketPublicAccess").'</span> : <a class="wordbreak" href="'.dol_buildpath('/public/ticket/index.php', 1).'" target="_blank" >'.dol_buildpath('/public/ticket/index.php', 2).'</a>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 $enabledisablehtml = $langs->trans("TicketsActivatePublicInterface").' ';
 if (empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
 {
-    // Button off, click to enable
-    $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setTICKET_ENABLE_PUBLIC_INTERFACE&token='.newToken().'&value=1'.$param.'">';
-    $enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
-    $enabledisablehtml .= '</a>';
+	// Button off, click to enable
+	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setTICKET_ENABLE_PUBLIC_INTERFACE&token='.newToken().'&value=1'.$param.'">';
+	$enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
+	$enabledisablehtml .= '</a>';
 } else {
-    // Button on, click to disable
-    $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setTICKET_ENABLE_PUBLIC_INTERFACE&token='.newToken().'&value=0'.$param.'">';
-    $enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
-    $enabledisablehtml .= '</a>';
+	// Button on, click to disable
+	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setTICKET_ENABLE_PUBLIC_INTERFACE&token='.newToken().'&value=0'.$param.'">';
+	$enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
+	$enabledisablehtml .= '</a>';
 }
 print $enabledisablehtml;
 print '<input type="hidden" id="TICKET_ENABLE_PUBLIC_INTERFACE" name="TICKET_ENABLE_PUBLIC_INTERFACE" value="'.(empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE) ? 0 : 1).'">';
@@ -198,37 +198,37 @@ print '<br><br>';
 
 if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
 {
-    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="'.newToken().'">';
-        print '<input type="hidden" name="action" value="setvarother">';
-    }
+	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="'.newToken().'">';
+		print '<input type="hidden" name="action" value="setvarother">';
+	}
 
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameters").'</td>';
-    print '<td class="left">';
-    print '</td>';
-    print '<td class="center">';
-    print '</td>';
-    print '</tr>';
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><td>'.$langs->trans("Parameters").'</td>';
+	print '<td class="left">';
+	print '</td>';
+	print '<td class="center">';
+	print '</td>';
+	print '</tr>';
 
-    // Check if email exists
-    print '<tr class="oddeven"><td>'.$langs->trans("TicketsEmailMustExist").'</td>';
-    print '<td class="left">';
-    if ($conf->use_javascript_ajax) {
-        print ajax_constantonoff('TICKET_EMAIL_MUST_EXISTS');
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("TICKET_EMAIL_MUST_EXISTS", $arrval, $conf->global->TICKET_EMAIL_MUST_EXISTS);
-    }
-    print '</td>';
-    print '<td class="center">';
-    print $form->textwithpicto('', $langs->trans("TicketsEmailMustExistHelp"), 1, 'help');
-    print '</td>';
-    print '</tr>';
+	// Check if email exists
+	print '<tr class="oddeven"><td>'.$langs->trans("TicketsEmailMustExist").'</td>';
+	print '<td class="left">';
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('TICKET_EMAIL_MUST_EXISTS');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("TICKET_EMAIL_MUST_EXISTS", $arrval, $conf->global->TICKET_EMAIL_MUST_EXISTS);
+	}
+	print '</td>';
+	print '<td class="center">';
+	print $form->textwithpicto('', $langs->trans("TicketsEmailMustExistHelp"), 1, 'help');
+	print '</td>';
+	print '</tr>';
 
-    /*if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
+	/*if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
     {
     	// Show logo for module
     	print '<tr class="oddeven"><td>' . $langs->trans("TicketsShowModuleLogo") . '</td>';
@@ -246,145 +246,145 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
     	print '</tr>';
     }*/
 
-    // Show logo for company
-    print '<tr class="oddeven"><td>'.$langs->trans("TicketsShowCompanyLogo").'</td>';
-    print '<td class="left">';
-    if ($conf->use_javascript_ajax) {
-    	print ajax_constantonoff('TICKET_SHOW_COMPANY_LOGO');
-    } else {
-    	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    	print $form->selectarray("TICKET_SHOW_COMPANY_LOGO", $arrval, $conf->global->TICKET_SHOW_COMPANY_LOGO);
-    }
-    print '</td>';
-    print '<td class="center">';
-    print $form->textwithpicto('', $langs->trans("TicketsShowCompanyLogoHelp"), 1, 'help');
-    print '</td>';
-    print '</tr>';
+	// Show logo for company
+	print '<tr class="oddeven"><td>'.$langs->trans("TicketsShowCompanyLogo").'</td>';
+	print '<td class="left">';
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('TICKET_SHOW_COMPANY_LOGO');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("TICKET_SHOW_COMPANY_LOGO", $arrval, $conf->global->TICKET_SHOW_COMPANY_LOGO);
+	}
+	print '</td>';
+	print '<td class="center">';
+	print $form->textwithpicto('', $langs->trans("TicketsShowCompanyLogoHelp"), 1, 'help');
+	print '</td>';
+	print '</tr>';
 
-    // Also send to main email address
-    if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
-    {
-    	print '<tr class="oddeven"><td>'.$langs->trans("TicketsEmailAlsoSendToMainAddress").'</td>';
-    	print '<td class="left">';
-    	if ($conf->use_javascript_ajax) {
-    	    print ajax_constantonoff('TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS');
-    	} else {
-    	    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    	    print $form->selectarray("TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS", $arrval, $conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS);
-    	}
-    	print '</td>';
-    	print '<td class="center">';
-    	print $form->textwithpicto('', $langs->trans("TicketsEmailAlsoSendToMainAddressHelp"), 1, 'help');
-    	print '</td>';
-    	print '</tr>';
-    }
+	// Also send to main email address
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
+	{
+		print '<tr class="oddeven"><td>'.$langs->trans("TicketsEmailAlsoSendToMainAddress").'</td>';
+		print '<td class="left">';
+		if ($conf->use_javascript_ajax) {
+			print ajax_constantonoff('TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS');
+		} else {
+			$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+			print $form->selectarray("TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS", $arrval, $conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS);
+		}
+		print '</td>';
+		print '<td class="center">';
+		print $form->textwithpicto('', $langs->trans("TicketsEmailAlsoSendToMainAddressHelp"), 1, 'help');
+		print '</td>';
+		print '</tr>';
+	}
 
-    if (!$conf->use_javascript_ajax) {
-        print '<tr class="impair"><td colspan="3" align="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></td>';
-        print '</tr>';
-    }
+	if (!$conf->use_javascript_ajax) {
+		print '<tr class="impair"><td colspan="3" align="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></td>';
+		print '</tr>';
+	}
 
-    print '</table>';
-    print '</div>';
-    print '<br>';
+	print '</table>';
+	print '</div>';
+	print '<br>';
 
-    if (!$conf->use_javascript_ajax) {
-        print '</form>';
-    }
+	if (!$conf->use_javascript_ajax) {
+		print '</form>';
+	}
 
-    // Admin var of module
-    print load_fiche_titre($langs->trans("TicketParamMail"));
+	// Admin var of module
+	print load_fiche_titre($langs->trans("TicketParamMail"));
 
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
 
-    print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" enctype="multipart/form-data" >';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="setvar">';
+	print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" enctype="multipart/form-data" >';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="setvar">';
 
-    print '<tr class="liste_titre">';
-    print '<td colspan="3">'.$langs->trans("Parameter").'</td>';
-    print "</tr>\n";
+	print '<tr class="liste_titre">';
+	print '<td colspan="3">'.$langs->trans("Parameter").'</td>';
+	print "</tr>\n";
 
-    if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) {
-        print '<tr>';
-        print '<td colspan="3"><div class="info">'.$langs->trans("TicketCkEditorEmailNotActivated").'</div></td>';
-        print "</tr>\n";
-    }
+	if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) {
+		print '<tr>';
+		print '<td colspan="3"><div class="info">'.$langs->trans("TicketCkEditorEmailNotActivated").'</div></td>';
+		print "</tr>\n";
+	}
 
-    // Interface topic
-    $url_interface = $conf->global->TICKET_PUBLIC_INTERFACE_TOPIC;
-    print '<tr><td>'.$langs->trans("TicketPublicInterfaceTopicLabelAdmin").'</label>';
-    print '</td><td>';
-    print '<input type="text"   name="TICKET_PUBLIC_INTERFACE_TOPIC" value="'.$conf->global->TICKET_PUBLIC_INTERFACE_TOPIC.'" size="40" ></td>';
-    print '</td>';
-    print '<td class="center">';
-    print $form->textwithpicto('', $langs->trans("TicketPublicInterfaceTopicHelp"), 1, 'help');
-    print '</td></tr>';
+	// Interface topic
+	$url_interface = $conf->global->TICKET_PUBLIC_INTERFACE_TOPIC;
+	print '<tr><td>'.$langs->trans("TicketPublicInterfaceTopicLabelAdmin").'</label>';
+	print '</td><td>';
+	print '<input type="text"   name="TICKET_PUBLIC_INTERFACE_TOPIC" value="'.$conf->global->TICKET_PUBLIC_INTERFACE_TOPIC.'" size="40" ></td>';
+	print '</td>';
+	print '<td class="center">';
+	print $form->textwithpicto('', $langs->trans("TicketPublicInterfaceTopicHelp"), 1, 'help');
+	print '</td></tr>';
 
-    // Texte d'accueil homepage
-    $public_text_home = $conf->global->TICKET_PUBLIC_TEXT_HOME ? $conf->global->TICKET_PUBLIC_TEXT_HOME : $langs->trans('TicketPublicInterfaceTextHome');
-    print '<tr><td>'.$langs->trans("TicketPublicInterfaceTextHomeLabelAdmin").'</label>';
-    print '</td><td>';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor = new DolEditor('TICKET_PUBLIC_TEXT_HOME', $public_text_home, '100%', 180, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
-    $doleditor->Create();
-    print '</td>';
-    print '<td class="center">';
-    print $form->textwithpicto('', $langs->trans("TicketPublicInterfaceTextHomeHelpAdmin"), 1, 'help');
-    print '</td></tr>';
+	// Texte d'accueil homepage
+	$public_text_home = $conf->global->TICKET_PUBLIC_TEXT_HOME ? $conf->global->TICKET_PUBLIC_TEXT_HOME : $langs->trans('TicketPublicInterfaceTextHome');
+	print '<tr><td>'.$langs->trans("TicketPublicInterfaceTextHomeLabelAdmin").'</label>';
+	print '</td><td>';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	$doleditor = new DolEditor('TICKET_PUBLIC_TEXT_HOME', $public_text_home, '100%', 180, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
+	$doleditor->Create();
+	print '</td>';
+	print '<td class="center">';
+	print $form->textwithpicto('', $langs->trans("TicketPublicInterfaceTextHomeHelpAdmin"), 1, 'help');
+	print '</td></tr>';
 
-    // Texte d'aide à la saisie du message
-    $public_text_help_message = $conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE ? $conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE : $langs->trans('TicketPublicPleaseBeAccuratelyDescribe');
-    print '<tr><td>'.$langs->trans("TicketPublicInterfaceTextHelpMessageLabelAdmin").'</label>';
-    print '</td><td>';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor = new DolEditor('TICKET_PUBLIC_TEXT_HELP_MESSAGE', $public_text_help_message, '100%', 180, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
-    $doleditor->Create();
-    print '</td>';
-    print '<td class="center">';
-    print $form->textwithpicto('', $langs->trans("TicketPublicInterfaceTextHelpMessageHelpAdmin"), 1, 'help');
-    print '</td></tr>';
+	// Texte d'aide à la saisie du message
+	$public_text_help_message = $conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE ? $conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE : $langs->trans('TicketPublicPleaseBeAccuratelyDescribe');
+	print '<tr><td>'.$langs->trans("TicketPublicInterfaceTextHelpMessageLabelAdmin").'</label>';
+	print '</td><td>';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	$doleditor = new DolEditor('TICKET_PUBLIC_TEXT_HELP_MESSAGE', $public_text_help_message, '100%', 180, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
+	$doleditor->Create();
+	print '</td>';
+	print '<td class="center">';
+	print $form->textwithpicto('', $langs->trans("TicketPublicInterfaceTextHelpMessageHelpAdmin"), 1, 'help');
+	print '</td></tr>';
 
-    // Activate email creation to user
-    print '<tr class="pair"><td>'.$langs->trans("TicketsDisableCustomerEmail").'</td>';
-    print '<td class="left">';
-    if ($conf->use_javascript_ajax) {
-        print ajax_constantonoff('TICKET_DISABLE_CUSTOMER_MAILS');
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("TICKET_DISABLE_CUSTOMER_MAILS", $arrval, $conf->global->TICKET_DISABLE_CUSTOMER_MAILS);
-    }
-    print '</td>';
-    print '<td class="center">';
-    print $form->textwithpicto('', $langs->trans("TicketsDisableEmailHelp"), 1, 'help');
-    print '</td>';
-    print '</tr>';
+	// Activate email creation to user
+	print '<tr class="pair"><td>'.$langs->trans("TicketsDisableCustomerEmail").'</td>';
+	print '<td class="left">';
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('TICKET_DISABLE_CUSTOMER_MAILS');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("TICKET_DISABLE_CUSTOMER_MAILS", $arrval, $conf->global->TICKET_DISABLE_CUSTOMER_MAILS);
+	}
+	print '</td>';
+	print '<td class="center">';
+	print $form->textwithpicto('', $langs->trans("TicketsDisableEmailHelp"), 1, 'help');
+	print '</td>';
+	print '</tr>';
 
-    // Texte de création d'un ticket
-    $mail_mesg_new = $conf->global->TICKET_MESSAGE_MAIL_NEW ? $conf->global->TICKET_MESSAGE_MAIL_NEW : $langs->trans('TicketNewEmailBody');
-    print '<tr><td>'.$langs->trans("TicketNewEmailBodyLabel").'</label>';
-    print '</td><td>';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor = new DolEditor('TICKET_MESSAGE_MAIL_NEW', $mail_mesg_new, '100%', 120, 'dolibarr_mailings', '', false, true, $conf->global->FCKEDITOR_ENABLE_MAIL, ROWS_2, 70);
-    $doleditor->Create();
-    print '</td>';
-    print '<td class="center">';
-    print $form->textwithpicto('', $langs->trans("TicketNewEmailBodyHelp"), 1, 'help');
-    print '</td></tr>';
+	// Texte de création d'un ticket
+	$mail_mesg_new = $conf->global->TICKET_MESSAGE_MAIL_NEW ? $conf->global->TICKET_MESSAGE_MAIL_NEW : $langs->trans('TicketNewEmailBody');
+	print '<tr><td>'.$langs->trans("TicketNewEmailBodyLabel").'</label>';
+	print '</td><td>';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	$doleditor = new DolEditor('TICKET_MESSAGE_MAIL_NEW', $mail_mesg_new, '100%', 120, 'dolibarr_mailings', '', false, true, $conf->global->FCKEDITOR_ENABLE_MAIL, ROWS_2, 70);
+	$doleditor->Create();
+	print '</td>';
+	print '<td class="center">';
+	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" class="minwidth500" name="TICKET_URL_PUBLIC_INTERFACE" value="'.$conf->global->TICKET_URL_PUBLIC_INTERFACE.'"></td>';
-    print '</td>';
-    print '<td class="center">';
-    print $form->textwithpicto('', $langs->trans("TicketUrlPublicInterfaceHelpAdmin"), 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" class="minwidth500" name="TICKET_URL_PUBLIC_INTERFACE" value="'.$conf->global->TICKET_URL_PUBLIC_INTERFACE.'"></td>';
+	print '</td>';
+	print '<td class="center">';
+	print $form->textwithpicto('', $langs->trans("TicketUrlPublicInterfaceHelpAdmin"), 1, 'help');
+	print '</td></tr>';
 
 	// Activate email notification when a new message is added
-	print '<tr class="pair"><td>' . $langs->trans("TicketsPublicNotificationNewMessage") . '</td>';
+	print '<tr class="pair"><td>'.$langs->trans("TicketsPublicNotificationNewMessage").'</td>';
 	print '<td class="left">';
 	if ($conf->use_javascript_ajax) {
 		print ajax_constantonoff('TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_ENABLED');
@@ -399,9 +399,9 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
 	print '</tr>';
 
 	// Send notification when a new message is added to a email if a user is not assigned to the ticket
-	print '<tr><td>' . $langs->trans("TicketPublicNotificationNewMessageDefaultEmail") . '</label>';
+	print '<tr><td>'.$langs->trans("TicketPublicNotificationNewMessageDefaultEmail").'</label>';
 	print '</td><td>';
-	print '<input type="text" name="TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL" value="' . $conf->global->TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL . '" size="40" ></td>';
+	print '<input type="text" name="TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL" value="'.$conf->global->TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL.'" size="40" ></td>';
 	print '</td>';
 	print '<td align="center">';
 	print $form->textwithpicto('', $langs->trans("TicketPublicNotificationNewMessageDefaultEmailHelp"), 1, 'help');
@@ -410,9 +410,9 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
 	print '</table>';
 	print '</div>';
 
-    print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
+	print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
 
-    print '</form>';
+	print '</form>';
 }
 
 // End of page
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index f1a95a48e9f..4128c0d7075 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -65,6 +65,7 @@ if ($action == 'delete')
 	$action = '';
 }
 
+
 /*
  * View
  */
@@ -119,7 +120,9 @@ if (in_array($type, array('pgsql'))) {
 print "});\n";
 print "</script>\n";
 
-print load_fiche_titre($langs->trans("Backup"), '', 'title_setup');
+$title = $langs->trans("Backup");
+
+print load_fiche_titre($title, '', 'title_setup');
 //print_barre_liste($langs->trans("Backup"), '', '', '', '', '', $langs->trans("BackupDesc",DOL_DATA_ROOT), 0, 0, 'title_setup');
 
 print '<div class="center opacitymedium">';
@@ -139,7 +142,9 @@ print '<br>';
 
 print '<div id="backupdatabaseleft" class="fichehalfleft" >';
 
-print load_fiche_titre($title ? $title : $langs->trans("BackupDumpWizard"));
+$title = $langs->trans("BackupDumpWizard");
+
+print load_fiche_titre($title);
 
 print '<table width="100%" class="'.($useinecm ? 'nobordernopadding' : 'liste').' nohover">';
 print '<tr class="liste_titre">';
@@ -147,7 +152,7 @@ print '<td class="liste_titre">';
 print $langs->trans("DatabaseName").' : <b>'.$dolibarr_main_db_name.'</b><br>';
 print '</td>';
 print '</tr>';
-print '<tr class="oddeven"><td style="padding-left: 8px">';
+print '<tr class="oddeven nohover"><td style="padding-left: 8px" class="nohover">';
 print '<table class="centpercent">';
 print '<tr>';
 print '<td class="tdtop">';
@@ -155,19 +160,19 @@ print '<td class="tdtop">';
 print '<div id="div_container_exportoptions">';
 print '<fieldset id="exportoptions"><legend>'.$langs->trans("ExportMethod").'</legend>';
 if (in_array($type, array('mysql', 'mysqli'))) {
-    print '<div class="formelementrow"><input type="radio" name="what" value="mysql" id="radio_dump_mysql" />';
-    print '<label for="radio_dump_mysql">MySQL	Dump (mysqldump)</label>';
-    print '</div>';
-    print '<br>';
-    print '<div class="formelementrow"><input type="radio" name="what" value="mysqlnobin" id="radio_dump_mysql_nobin" />';
-    print '<label for="radio_dump_mysql">MySQL Dump (php) '.img_warning($langs->trans('BackupPHPWarning')).'</label>';
-    print '</div>';
+	print '<div class="formelementrow"><input type="radio" name="what" value="mysql" id="radio_dump_mysql" />';
+	print '<label for="radio_dump_mysql">MySQL	Dump (mysqldump)</label>';
+	print '</div>';
+	print '<br>';
+	print '<div class="formelementrow"><input type="radio" name="what" value="mysqlnobin" id="radio_dump_mysql_nobin" />';
+	print '<label for="radio_dump_mysql_nobin">MySQL Dump (php) '.img_warning($langs->trans('BackupPHPWarning')).'</label>';
+	print '</div>';
 } elseif (in_array($type, array('pgsql'))) {
-    print '<div class="formelementrow"><input type="radio" name="what"	value="postgresql" id="radio_dump_postgresql" />';
-    print '<label for="radio_dump_postgresql">PostgreSQL Dump (pg_dump)</label>';
-    print '</div>';
+	print '<div class="formelementrow"><input type="radio" name="what" value="postgresql" id="radio_dump_postgresql" />';
+	print '<label for="radio_dump_postgresql">PostgreSQL Dump (pg_dump)</label>';
+	print '</div>';
 } else {
-    print 'No method available with database '.$label;
+	print 'No method available with database '.$label;
 }
 print '</fieldset>';
 print '</div>';
@@ -178,200 +183,200 @@ print '<td class="tdtop">';
 
 print '<div id="div_container_sub_exportoptions">';
 if (in_array($type, array('mysql', 'mysqli'))) {
-    print "<!--  Fieldset mysqldump -->\n";
-    print '<fieldset id="mysql_options"><legend>'.$langs->trans("MySqlExportParameters").'</legend>';
+	print "<!--  Fieldset mysqldump -->\n";
+	print '<fieldset id="mysql_options"><legend>'.$langs->trans("MySqlExportParameters").'</legend>';
 
-    print '<div class="formelementrow">'.$langs->trans("FullPathToMysqldumpCommand");
-    if (empty($conf->global->SYSTEMTOOLS_MYSQLDUMP))
-    {
-        $fullpathofmysqldump = $db->getPathOfDump();
-    } else {
-        $fullpathofmysqldump = $conf->global->SYSTEMTOOLS_MYSQLDUMP;
-    }
-    print '<br>';
-    print '<input type="text" name="mysqldump" style="width: 80%" value="'.$fullpathofmysqldump.'" /></div>';
+	print '<div class="formelementrow">'.$langs->trans("FullPathToMysqldumpCommand");
+	if (empty($conf->global->SYSTEMTOOLS_MYSQLDUMP))
+	{
+		$fullpathofmysqldump = $db->getPathOfDump();
+	} else {
+		$fullpathofmysqldump = $conf->global->SYSTEMTOOLS_MYSQLDUMP;
+	}
+	print '<br>';
+	print '<input type="text" name="mysqldump" style="width: 80%" value="'.$fullpathofmysqldump.'" /></div>';
 
-    print '<br>';
-    print '<fieldset><legend>'.$langs->trans("ExportOptions").'</legend>';
-    print '<div class="formelementrow">';
-    print '<input type="checkbox" name="use_transaction" value="yes" id="checkbox_use_transaction" />';
-    print '<label for="checkbox_use_transaction">'.$langs->trans("UseTransactionnalMode").'</label>';
-    print '</div>';
+	print '<br>';
+	print '<fieldset><legend>'.$langs->trans("ExportOptions").'</legend>';
+	print '<div class="formelementrow">';
+	print '<input type="checkbox" name="use_transaction" value="yes" id="checkbox_use_transaction" />';
+	print '<label for="checkbox_use_transaction">'.$langs->trans("UseTransactionnalMode").'</label>';
+	print '</div>';
 
-    if (!empty($conf->global->MYSQL_OLD_OPTION_DISABLE_FK)) {
-        print '<div class="formelementrow">';
-        print '<input type="checkbox" name="disable_fk" value="yes" id="checkbox_disable_fk" checked />';
-        print '<label for="checkbox_disable_fk">'.$langs->trans("CommandsToDisableForeignKeysForImport").' '.img_info($langs->trans('CommandsToDisableForeignKeysForImportWarning')).'</label>';
-        print '</div>';
-    }
+	if (!empty($conf->global->MYSQL_OLD_OPTION_DISABLE_FK)) {
+		print '<div class="formelementrow">';
+		print '<input type="checkbox" name="disable_fk" value="yes" id="checkbox_disable_fk" checked />';
+		print '<label for="checkbox_disable_fk">'.$langs->trans("CommandsToDisableForeignKeysForImport").' '.img_info($langs->trans('CommandsToDisableForeignKeysForImportWarning')).'</label>';
+		print '</div>';
+	}
 
-    print '<label for="select_sql_compat">'.$langs->trans("ExportCompatibility").'</label>';
+	print '<label for="select_sql_compat">'.$langs->trans("ExportCompatibility").'</label>';
 
-    print '<select name="sql_compat" id="select_sql_compat" class="flat">';
-    print '<option value="NONE" selected>NONE</option>';
-    print '<option value="ANSI">ANSI</option>';
-    print '<option value="DB2">DB2</option>';
-    print '<option value="MAXDB">MAXDB</option>';
-    print '<option value="MYSQL323">MYSQL323</option>';
-    print '<option value="MYSQL40">MYSQL40</option>';
-    print '<option value="MSSQL">MSSQL</option>';
-    print '<option value="ORACLE">ORACLE</option>';
-    print '<option value="POSTGRESQL">POSTGRESQL</option>';
-    print '</select>';
-    print '<br>';
+	print '<select name="sql_compat" id="select_sql_compat" class="flat">';
+	print '<option value="NONE" selected>NONE</option>';
+	print '<option value="ANSI">ANSI</option>';
+	print '<option value="DB2">DB2</option>';
+	print '<option value="MAXDB">MAXDB</option>';
+	print '<option value="MYSQL323">MYSQL323</option>';
+	print '<option value="MYSQL40">MYSQL40</option>';
+	print '<option value="MSSQL">MSSQL</option>';
+	print '<option value="ORACLE">ORACLE</option>';
+	print '<option value="POSTGRESQL">POSTGRESQL</option>';
+	print '</select>';
+	print '<br>';
 
-    print '<input type="checkbox" name="use_mysql_quick_param" value="yes" id="checkbox_use_quick" />';
-    print '<label for="checkbox_use_quick">';
-    print $form->textwithpicto($langs->trans('ExportUseMySQLQuickParameter'), $langs->trans('ExportUseMySQLQuickParameterHelp'));
+	print '<input type="checkbox" name="use_mysql_quick_param" value="yes" id="checkbox_use_quick" />';
+	print '<label for="checkbox_use_quick">';
+	print $form->textwithpicto($langs->trans('ExportUseMySQLQuickParameter'), $langs->trans('ExportUseMySQLQuickParameterHelp'));
 	print '</label>';
 	print '<br/>';
 
-    print '<!-- <input type="checkbox" name="drop_database" value="yes" id="checkbox_drop_database" />';
-    print '<label for="checkbox_drop_database">'.$langs->trans("AddDropDatabase").'</label>';
-    print '-->';
-    print '</fieldset>';
+	print '<!-- <input type="checkbox" name="drop_database" value="yes" id="checkbox_drop_database" />';
+	print '<label for="checkbox_drop_database">'.$langs->trans("AddDropDatabase").'</label>';
+	print '-->';
+	print '</fieldset>';
 
-    print '<br>';
-    print '<fieldset>';
-    print '<legend>';
-    print '<input type="checkbox" name="sql_structure" value="structure" id="checkbox_sql_structure" checked />';
-    print '<label for="checkbox_sql_structure">'.$langs->trans('ExportStructure').'</label>';
-    print '</legend>';
+	print '<br>';
+	print '<fieldset>';
+	print '<legend>';
+	print '<input type="checkbox" name="sql_structure" value="structure" id="checkbox_sql_structure" checked />';
+	print '<label for="checkbox_sql_structure">'.$langs->trans('ExportStructure').'</label>';
+	print '</legend>';
 
-    print '<input type="checkbox" name="drop"'.((! GETPOSTISSET("drop") || GETPOST('drop')) ? ' checked' : '').' id="checkbox_dump_drop" />';
-    print '<label for="checkbox_dump_drop">'.$langs->trans("AddDropTable").'</label>';
-    print '<br>';
-    print '</fieldset>';
+	print '<input type="checkbox" name="drop"'.((!GETPOSTISSET("drop") || GETPOST('drop')) ? ' checked' : '').' id="checkbox_dump_drop" />';
+	print '<label for="checkbox_dump_drop">'.$langs->trans("AddDropTable").'</label>';
+	print '<br>';
+	print '</fieldset>';
 
-    print '<br>';
-    print '<fieldset>';
-    print '<legend>';
-    print '<input type="checkbox" name="sql_data" value="data" id="checkbox_sql_data" checked />';
-    print '<label for="checkbox_sql_data">'.$langs->trans("Datas").'</label>';
-    print '</legend>';
-    print '<input type="checkbox" name="showcolumns" value="yes" id="checkbox_dump_showcolumns" checked />';
-    print '<label for="checkbox_dump_showcolumns">'.$langs->trans("NameColumn").'</label>';
-    print '<br>';
+	print '<br>';
+	print '<fieldset>';
+	print '<legend>';
+	print '<input type="checkbox" name="sql_data" value="data" id="checkbox_sql_data" checked />';
+	print '<label for="checkbox_sql_data">'.$langs->trans("Datas").'</label>';
+	print '</legend>';
+	print '<input type="checkbox" name="showcolumns" value="yes" id="checkbox_dump_showcolumns" checked />';
+	print '<label for="checkbox_dump_showcolumns">'.$langs->trans("NameColumn").'</label>';
+	print '<br>';
 
-    print '<input type="checkbox" name="extended_ins" value="yes" id="checkbox_dump_extended_ins" checked />';
-    print '<label for="checkbox_dump_extended_ins">'.$langs->trans("ExtendedInsert").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="extended_ins" value="yes" id="checkbox_dump_extended_ins" checked />';
+	print '<label for="checkbox_dump_extended_ins">'.$langs->trans("ExtendedInsert").'</label>';
+	print '<br>';
 
-    print '<input type="checkbox" name="disable-add-locks" value="no" id="checkbox_dump_disable-add-locks" />';
-    print '<label for="checkbox_dump_disable-add-locks">'.$langs->trans("NoLockBeforeInsert").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="disable-add-locks" value="no" id="checkbox_dump_disable-add-locks" />';
+	print '<label for="checkbox_dump_disable-add-locks">'.$langs->trans("NoLockBeforeInsert").'</label>';
+	print '<br>';
 
-    print '<input type="checkbox" name="delayed" value="yes" id="checkbox_dump_delayed" />';
-    print '<label for="checkbox_dump_delayed">'.$langs->trans("DelayedInsert").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="delayed" value="yes" id="checkbox_dump_delayed" />';
+	print '<label for="checkbox_dump_delayed">'.$langs->trans("DelayedInsert").'</label>';
+	print '<br>';
 
-    print '<input type="checkbox" name="sql_ignore" value="yes" id="checkbox_dump_ignore" />';
-    print '<label for="checkbox_dump_ignore">'.$langs->trans("IgnoreDuplicateRecords").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="sql_ignore" value="yes" id="checkbox_dump_ignore" />';
+	print '<label for="checkbox_dump_ignore">'.$langs->trans("IgnoreDuplicateRecords").'</label>';
+	print '<br>';
 
-    print '<input type="checkbox" name="hexforbinary" value="yes" id="checkbox_hexforbinary" checked />';
-    print '<label for="checkbox_hexforbinary">'.$langs->trans("EncodeBinariesInHexa").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="hexforbinary" value="yes" id="checkbox_hexforbinary" checked />';
+	print '<label for="checkbox_hexforbinary">'.$langs->trans("EncodeBinariesInHexa").'</label>';
+	print '<br>';
 
-    print '<input type="checkbox" name="charset_utf8" value="yes" id="checkbox_charset_utf8" checked disabled />';
-    print '<label for="checkbox_charset_utf8">'.$langs->trans("UTF8").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="charset_utf8" value="yes" id="checkbox_charset_utf8" checked disabled />';
+	print '<label for="checkbox_charset_utf8">'.$langs->trans("UTF8").'</label>';
+	print '<br>';
 
-    print '</fieldset>';
-    print '</fieldset>';
-    print "<!--  Fieldset mysql_nobin -->\n";
-    print '<fieldset id="mysql_nobin_options">';
-    print '<legend>'.$langs->trans("MySqlExportParameters").'</legend>';
-    print '<fieldset>';
-    print '<legend>'.$langs->trans("ExportOptions").'</legend>';
-    print '<div class="formelementrow">';
-    print '<input type="checkbox" name="nobin_use_transaction" value="yes" id="checkbox_use_transaction" />';
-    print '<label for="checkbox_use_transaction">'.$langs->trans("UseTransactionnalMode").'</label>';
+	print '</fieldset>';
+	print '</fieldset>';
+	print "<!--  Fieldset mysql_nobin -->\n";
+	print '<fieldset id="mysql_nobin_options">';
+	print '<legend>'.$langs->trans("MySqlExportParameters").'</legend>';
+	print '<fieldset>';
+	print '<legend>'.$langs->trans("ExportOptions").'</legend>';
+	print '<div class="formelementrow">';
+	print '<input type="checkbox" name="nobin_use_transaction" value="yes" id="checkbox_use_transaction" />';
+	print '<label for="checkbox_use_transaction">'.$langs->trans("UseTransactionnalMode").'</label>';
 
-    print '</div>';
-    if (!empty($conf->global->MYSQL_OLD_OPTION_DISABLE_FK)) {
-        print '<div class="formelementrow">';
-        print '<input type="checkbox" name="nobin_disable_fk" value="yes" id="checkbox_disable_fk" checked />';
-        print '<label for="checkbox_disable_fk">'.$langs->trans("CommandsToDisableForeignKeysForImport").' '.img_info($langs->trans('CommandsToDisableForeignKeysForImportWarning')).'</label>';
-        print '</div>';
-    }
-    print '</fieldset>';
+	print '</div>';
+	if (!empty($conf->global->MYSQL_OLD_OPTION_DISABLE_FK)) {
+		print '<div class="formelementrow">';
+		print '<input type="checkbox" name="nobin_disable_fk" value="yes" id="checkbox_disable_fk" checked />';
+		print '<label for="checkbox_disable_fk">'.$langs->trans("CommandsToDisableForeignKeysForImport").' '.img_info($langs->trans('CommandsToDisableForeignKeysForImportWarning')).'</label>';
+		print '</div>';
+	}
+	print '</fieldset>';
 
-    print '<br>';
-    print '<fieldset><legend>'.$langs->trans('ExportStructure').'</legend>';
-    print '<input type="checkbox" name="nobin_drop"'.((! GETPOSTISSET("nobin_drop") || GETPOST('nobin_drop')) ? ' checked' : '').' id="checkbox_dump_drop" />';
-    print '<label for="checkbox_dump_drop">'.$langs->trans("AddDropTable").'</label>';
-    print '<br>';
-    print '</fieldset>';
+	print '<br>';
+	print '<fieldset><legend>'.$langs->trans('ExportStructure').'</legend>';
+	print '<input type="checkbox" name="nobin_drop"'.((!GETPOSTISSET("nobin_drop") || GETPOST('nobin_drop')) ? ' checked' : '').' id="checkbox_dump_drop" />';
+	print '<label for="checkbox_dump_drop">'.$langs->trans("AddDropTable").'</label>';
+	print '<br>';
+	print '</fieldset>';
 
-    print '<br>';
-    print '<fieldset>';
-    print '<legend>'.$langs->trans("Datas").'</legend>';
+	print '<br>';
+	print '<fieldset>';
+	print '<legend>'.$langs->trans("Datas").'</legend>';
 
-    print '<input type="checkbox" name="nobin_nolocks" value="no" id="checkbox_dump_disable-add-locks" />';
-    print '<label for="checkbox_dump_disable-add-locks">'.$langs->trans("NoLockBeforeInsert").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="nobin_nolocks" value="no" id="checkbox_dump_disable-add-locks" />';
+	print '<label for="checkbox_dump_disable-add-locks">'.$langs->trans("NoLockBeforeInsert").'</label>';
+	print '<br>';
 
-    print '<input type="checkbox" name="nobin_delayed" value="yes" id="checkbox_dump_delayed" />';
-    print '<label for="checkbox_dump_delayed">'.$langs->trans("DelayedInsert").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="nobin_delayed" value="yes" id="checkbox_dump_delayed" />';
+	print '<label for="checkbox_dump_delayed">'.$langs->trans("DelayedInsert").'</label>';
+	print '<br>';
 
-    print '<input type="checkbox" name="nobin_sql_ignore" value="yes" id="checkbox_dump_ignore" />';
-    print '<label for="checkbox_dump_ignore">'.$langs->trans("IgnoreDuplicateRecords").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="nobin_sql_ignore" value="yes" id="checkbox_dump_ignore" />';
+	print '<label for="checkbox_dump_ignore">'.$langs->trans("IgnoreDuplicateRecords").'</label>';
+	print '<br>';
 
-    print '<input type="checkbox" name="nobin_charset_utf8" value="yes" id="checkbox_charset_utf8" checked disabled />';
-    print '<label for="checkbox_charset_utf8">'.$langs->trans("UTF8").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="nobin_charset_utf8" value="yes" id="checkbox_charset_utf8" checked disabled />';
+	print '<label for="checkbox_charset_utf8">'.$langs->trans("UTF8").'</label>';
+	print '<br>';
 
-    print '</fieldset>';
-    print '</fieldset>';
+	print '</fieldset>';
+	print '</fieldset>';
 }
 
 if (in_array($type, array('pgsql'))) {
-    print "<!--  Fieldset pg_dump -->\n";
-    print '<fieldset id="postgresql_options"><legend>'.$langs->trans("PostgreSqlExportParameters").'</legend>';
+	print "<!--  Fieldset pg_dump -->\n";
+	print '<fieldset id="postgresql_options"><legend>'.$langs->trans("PostgreSqlExportParameters").'</legend>';
 
-    print '<div class="formelementrow">'.$langs->trans("FullPathToPostgreSQLdumpCommand");
-    if (empty($conf->global->SYSTEMTOOLS_POSTGRESQLDUMP)) {
-        $fullpathofpgdump = $db->getPathOfDump();
-    } else {
-        $fullpathofpgdump = $conf->global->SYSTEMTOOLS_POSTGRESQLDUMP;
-    }
-    print '<br>';
-    print '<input type="text" name="postgresqldump" style="width: 80%" value="'.$fullpathofpgdump.'" /></div>';
+	print '<div class="formelementrow">'.$langs->trans("FullPathToPostgreSQLdumpCommand");
+	if (empty($conf->global->SYSTEMTOOLS_POSTGRESQLDUMP)) {
+		$fullpathofpgdump = $db->getPathOfDump();
+	} else {
+		$fullpathofpgdump = $conf->global->SYSTEMTOOLS_POSTGRESQLDUMP;
+	}
+	print '<br>';
+	print '<input type="text" name="postgresqldump" style="width: 80%" value="'.$fullpathofpgdump.'" /></div>';
 
-    print '<br>';
-    print '<fieldset>';
-    print '<legend>'.$langs->trans("ExportOptions").'</legend>';
-    print '<label for="select_sql_compat">'.$langs->trans("ExportCompatibility").'</label>';
-    print '<select name="sql_compat" id="select_sql_compat" class="flat">';
-    print '<option value="POSTGRESQL" selected>POSTGRESQL</option>';
-    print '<option value="ANSI">ANSI</option>';
-    print '</select>';
-    print '<br>';
-    print '<!-- <input type="checkbox" name="drop_database" value="yes" id="checkbox_drop_database" />';
-    print '<label for="checkbox_drop_database">'.$langs->trans("AddDropDatabase").'</label>';
-    print '-->';
-    print '</fieldset>';
-    print '<br>';
-    print '<fieldset>';
-    print '<legend>';
-    print '<input type="checkbox" name="sql_structure" value="structure" id="checkbox_sql_structure" checked />';
-    print '<label for="checkbox_sql_structure">'.$langs->trans('ExportStructure').'</label>';
-    print '</legend>';
-    print '</fieldset>';
-    print '<br>';
-    print '<fieldset>';
-    print '<legend>';
-    print '<input type="checkbox" name="sql_data" value="data" id="checkbox_sql_data" checked />';
-    print '<label for="checkbox_sql_data">'.$langs->trans("Datas").'</label>';
-    print '</legend>';
-    print '<input type="checkbox" name="showcolumns" value="yes" id="checkbox_dump_showcolumns" checked />';
-    print '<label for="checkbox_dump_showcolumns">'.$langs->trans("NameColumn").'</label>';
-    print '<br>';
-    print '</fieldset>';
-    print '</fieldset>';
+	print '<br>';
+	print '<fieldset>';
+	print '<legend>'.$langs->trans("ExportOptions").'</legend>';
+	print '<label for="select_sql_compat">'.$langs->trans("ExportCompatibility").'</label>';
+	print '<select name="sql_compat" id="select_sql_compat" class="flat">';
+	print '<option value="POSTGRESQL" selected>POSTGRESQL</option>';
+	print '<option value="ANSI">ANSI</option>';
+	print '</select>';
+	print '<br>';
+	print '<!-- <input type="checkbox" name="drop_database" value="yes" id="checkbox_drop_database" />';
+	print '<label for="checkbox_drop_database">'.$langs->trans("AddDropDatabase").'</label>';
+	print '-->';
+	print '</fieldset>';
+	print '<br>';
+	print '<fieldset>';
+	print '<legend>';
+	print '<input type="checkbox" name="sql_structure" value="structure" id="checkbox_sql_structure" checked />';
+	print '<label for="checkbox_sql_structure">'.$langs->trans('ExportStructure').'</label>';
+	print '</legend>';
+	print '</fieldset>';
+	print '<br>';
+	print '<fieldset>';
+	print '<legend>';
+	print '<input type="checkbox" name="sql_data" value="data" id="checkbox_sql_data" checked />';
+	print '<label for="checkbox_sql_data">'.$langs->trans("Datas").'</label>';
+	print '</legend>';
+	print '<input type="checkbox" name="showcolumns" value="yes" id="checkbox_dump_showcolumns" checked />';
+	print '<label for="checkbox_dump_showcolumns">'.$langs->trans("NameColumn").'</label>';
+	print '<br>';
+	print '</fieldset>';
+	print '</fieldset>';
 }
 print '</div>';
 
@@ -418,16 +423,16 @@ if (in_array($type, array('mysql', 'mysqli'))) {
 	//     'id' => 'radio_compression_zip',
 	//     'label' => $langs->trans("FormatZip")
 	// );
-    $compression['bz'] = array(
+	$compression['bz'] = array(
 		'function' => 'bzopen',
 		'id' => 'radio_compression_bzip',
 		'label' => $langs->trans("Bzip2")
 	);
-    $compression['none'] = array(
-    	'function' => '',
-    	'id' => 'radio_compression_none',
-    	'label' => $langs->trans("None")
-    );
+	$compression['none'] = array(
+		'function' => '',
+		'id' => 'radio_compression_none',
+		'label' => $langs->trans("None")
+	);
 } else {
 	$compression['none'] = array(
 		'function' => '',
@@ -480,14 +485,14 @@ print '<br>';
 
 if (!empty($_SESSION["commandbackuplastdone"]))
 {
-    print '<br><b>'.$langs->trans("RunCommandSummary").':</b><br>'."\n";
-    print '<textarea rows="'.ROWS_2.'" class="centpercent">'.$_SESSION["commandbackuplastdone"].'</textarea><br>'."\n";
-    print '<br>';
+	print '<br><b>'.$langs->trans("RunCommandSummary").':</b><br>'."\n";
+	print '<textarea rows="'.ROWS_2.'" class="centpercent">'.$_SESSION["commandbackuplastdone"].'</textarea><br>'."\n";
+	print '<br>';
 
-    //print $paramclear;
+	//print $paramclear;
 
-    // Now show result
-    print '<b>'.$langs->trans("BackupResult").':</b> ';
+	// Now show result
+	print '<b>'.$langs->trans("BackupResult").':</b> ';
 	print $_SESSION["commandbackupresult"];
 
 	$_SESSION["commandbackuplastdone"] = '';
@@ -568,20 +573,20 @@ $filecompression['zip'] = array('function' => 'dol_compress_dir', 'id' => 'radio
 $i = 0;
 foreach ($filecompression as $key => $val)
 {
-    if (!$val['function'] || function_exists($val['function']))	// Enabled export format
-    {
-    	$checked = '';
-    	if ($key == 'gz') $checked = ' checked';
-        print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'"'.$checked.'>';
-        print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
-    } else // Disabled export format
-    {
-        print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'" disabled>';
-        print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
-        print ' <span class="opacitymedium">('.$langs->trans("NotAvailable").')</span>';
-    }
-    print ' &nbsp; &nbsp; ';
-    $i++;
+	if (!$val['function'] || function_exists($val['function']))	// Enabled export format
+	{
+		$checked = '';
+		if ($key == 'gz') $checked = ' checked';
+		print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'"'.$checked.'>';
+		print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
+	} else // Disabled export format
+	{
+		print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'" disabled>';
+		print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
+		print ' <span class="opacitymedium">('.$langs->trans("NotAvailable").')</span>';
+	}
+	print ' &nbsp; &nbsp; ';
+	$i++;
 }
 
 print '</div>';
diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php
index 224bbc14b56..91fbb81b90e 100644
--- a/htdocs/admin/tools/dolibarr_import.php
+++ b/htdocs/admin/tools/dolibarr_import.php
@@ -58,8 +58,8 @@ jQuery(document).ready(function() {
 		jQuery("#postgresql_options").show();
 	});
 	<?php
-	    if ($label == 'MySQL')      print 'jQuery("#radio_dump_mysql").click();';
-	    if ($label == 'PostgreSQL') print 'jQuery("#radio_dump_postgresql").click();';
+		if ($label == 'MySQL')      print 'jQuery("#radio_dump_mysql").click();';
+		if ($label == 'PostgreSQL') print 'jQuery("#radio_dump_postgresql").click();';
 	?>
 });
 </script>
@@ -97,26 +97,26 @@ print $langs->trans("RestoreDesc3", $dolibarr_main_db_name).'<br><br>';
 <fieldset id="exportoptions">
 	<legend><?php echo $langs->trans("ImportMethod"); ?></legend>
     <?php
-    if (in_array($type, array('mysql', 'mysqli')))
-    {
-        ?>
+	if (in_array($type, array('mysql', 'mysqli')))
+	{
+		?>
     <div class="formelementrow">
         <input type="radio" name="what" value="mysql" id="radio_dump_mysql"<?php echo ($radio_dump == 'mysql_options' ? ' checked' : ''); ?> />
         <label for="radio_dump_mysql">MySQL (mysql)</label>
     </div>
         <?php
-    } elseif (in_array($type, array('pgsql')))
-    {
-        ?>
+	} elseif (in_array($type, array('pgsql')))
+	{
+		?>
     <div class="formelementrow">
         <input type="radio" name="what" value="mysql" id="radio_dump_postgresql"<?php echo ($radio_dump == 'postgresql_options' ? ' checked' : ''); ?> />
         <label for="radio_dump_postgresql">PostgreSQL Restore (pg_restore or psql)</label>
     </div>
         <?php
-    } else {
-        print 'No method available with database '.$label;
-    }
-    ?>
+	} else {
+		print 'No method available with database '.$label;
+	}
+	?>
 </fieldset>
 </div>
 <?php } ?>
@@ -128,8 +128,8 @@ print $langs->trans("RestoreDesc3", $dolibarr_main_db_name).'<br><br>';
 <?php
 if (in_array($type, array('mysql', 'mysqli')))
 {
-    print '<fieldset id="mysql_options">';
-    print '<legend>'.$langs->trans('RestoreMySQL').'</legend>';
+	print '<fieldset id="mysql_options">';
+	print '<legend>'.$langs->trans('RestoreMySQL').'</legend>';
 	print '<div class="formelementrow centpercent">';
 	// Parameteres execution
 	$command = $db->getPathOfRestore();
@@ -152,46 +152,46 @@ if (in_array($type, array('mysql', 'mysqli')))
 	print '<textarea rows="1" id="restorecommand" class="centpercent">'.$langs->trans("ImportMySqlCommand", $command, ($showpass ? $paramclear : $paramcrypted)).'</textarea><br>';
 	print ajax_autoselect('restorecommand');
 
-    if (empty($_GET["showpass"]) && $dolibarr_main_db_pass) {
-        print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=1&amp;radio_dump=mysql_options">'.$langs->trans("UnHidePassword").'</a>';
-    }
-    //else print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=0&amp;radio_dump=mysql_options">'.$langs->trans("HidePassword").'</a>';
-    print '</div>';
-    print '</fieldset>';
+	if (empty($_GET["showpass"]) && $dolibarr_main_db_pass) {
+		print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=1&amp;radio_dump=mysql_options">'.$langs->trans("UnHidePassword").'</a>';
+	}
+	//else print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=0&amp;radio_dump=mysql_options">'.$langs->trans("HidePassword").'</a>';
+	print '</div>';
+	print '</fieldset>';
 } elseif (in_array($type, array('pgsql')))
 {
-    print '<fieldset id="postgresql_options">';
-    print '<legend>Restore PostgreSQL</legend>';
-    print '<div class="formelementrow">';
-    // Parameteres execution
-    $command = $db->getPathOfRestore();
-    if (preg_match("/\s/", $command)) $command = $command = escapeshellarg($command); // Use quotes on command
+	print '<fieldset id="postgresql_options">';
+	print '<legend>Restore PostgreSQL</legend>';
+	print '<div class="formelementrow">';
+	// Parameteres execution
+	$command = $db->getPathOfRestore();
+	if (preg_match("/\s/", $command)) $command = $command = escapeshellarg($command); // Use quotes on command
 
-    $param = " -d ".$dolibarr_main_db_name;
-    $param .= " -h ".$dolibarr_main_db_host;
-    if (!empty($dolibarr_main_db_port)) $param .= " -p ".$dolibarr_main_db_port;
-    $param .= " -U ".$dolibarr_main_db_user;
-    $paramcrypted = $param;
-    $paramclear = $param;
-    /*if (! empty($dolibarr_main_db_pass))
+	$param = " -d ".$dolibarr_main_db_name;
+	$param .= " -h ".$dolibarr_main_db_host;
+	if (!empty($dolibarr_main_db_port)) $param .= " -p ".$dolibarr_main_db_port;
+	$param .= " -U ".$dolibarr_main_db_user;
+	$paramcrypted = $param;
+	$paramclear = $param;
+	/*if (! empty($dolibarr_main_db_pass))
     {
         $paramcrypted.=" -p".preg_replace('/./i','*',$dolibarr_main_db_pass);
         $paramclear.=" -p".$dolibarr_main_db_pass;
     }*/
-    $paramcrypted .= " -W";
-    $paramclear .= " -W";
-    // With psql:
-    $paramcrypted .= " -f";
-    $paramclear .= " -f";
+	$paramcrypted .= " -W";
+	$paramclear .= " -W";
+	// With psql:
+	$paramcrypted .= " -f";
+	$paramclear .= " -f";
 
-    echo $langs->trans("ImportPostgreSqlDesc");
-    print '<br>';
-    print '<textarea rows="1" id="restorecommand" class="centpercent">'.$langs->trans("ImportPostgreSqlCommand", $command, ($showpass ? $paramclear : $paramcrypted)).'</textarea><br>';
-    print ajax_autoselect('restorecommand');
-    //if (empty($_GET["showpass"]) && $dolibarr_main_db_pass) print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=1&amp;radio_dump=postgresql_options">'.$langs->trans("UnHidePassword").'</a>';
-    //else print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=0&amp;radio_dump=mysql_options">'.$langs->trans("HidePassword").'</a>';
-    print '</div>';
-    print '</fieldset>';
+	echo $langs->trans("ImportPostgreSqlDesc");
+	print '<br>';
+	print '<textarea rows="1" id="restorecommand" class="centpercent">'.$langs->trans("ImportPostgreSqlCommand", $command, ($showpass ? $paramclear : $paramcrypted)).'</textarea><br>';
+	print ajax_autoselect('restorecommand');
+	//if (empty($_GET["showpass"]) && $dolibarr_main_db_pass) print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=1&amp;radio_dump=postgresql_options">'.$langs->trans("UnHidePassword").'</a>';
+	//else print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=0&amp;radio_dump=mysql_options">'.$langs->trans("HidePassword").'</a>';
+	print '</div>';
+	print '</fieldset>';
 }
 
 print '</div>';
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index cbe25f0ff75..0c3679c62fa 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -49,9 +49,9 @@ if (!$user->admin) accessforbidden();
 
 if ($file && !$what)
 {
-    //print DOL_URL_ROOT.'/dolibarr_export.php';
+	//print DOL_URL_ROOT.'/dolibarr_export.php';
 	header("Location: ".DOL_URL_ROOT.'/admin/tools/dolibarr_export.php?msg='.urlencode($langs->trans("ErrorFieldRequired", $langs->transnoentities("ExportMethod"))).(GETPOST('page_y', 'int') ? '&page_y='.GETPOST('page_y', 'int') : ''));
-    exit;
+	exit;
 }
 
 $errormsg = '';
@@ -83,16 +83,16 @@ $_SESSION["commandbackupresult"] = '';
 $ExecTimeLimit = 600;
 if (!empty($ExecTimeLimit))
 {
-    $err = error_reporting();
-    error_reporting(0); // Disable all errors
-    //error_reporting(E_ALL);
-    @set_time_limit($ExecTimeLimit); // Need more than 240 on Windows 7/64
-    error_reporting($err);
+	$err = error_reporting();
+	error_reporting(0); // Disable all errors
+	//error_reporting(E_ALL);
+	@set_time_limit($ExecTimeLimit); // Need more than 240 on Windows 7/64
+	error_reporting($err);
 }
 $MemoryLimit = 0;
 if (!empty($MemoryLimit))
 {
-    @ini_set('memory_limit', $MemoryLimit);
+	@ini_set('memory_limit', $MemoryLimit);
 }
 
 $form = new Form($db);
@@ -122,51 +122,51 @@ $utils = new Utils($db);
 // MYSQL
 if ($what == 'mysql')
 {
-    $cmddump = GETPOST("mysqldump"); // Do not sanitize here with 'alpha', will be sanitize later by dol_sanitizePathName and escapeshellarg
-    $cmddump = dol_sanitizePathName($cmddump);
+	$cmddump = GETPOST("mysqldump", 'none'); // Do not sanitize here with 'alpha', will be sanitize later by dol_sanitizePathName and escapeshellarg
+	$cmddump = dol_sanitizePathName($cmddump);
 
-    if (!empty($dolibarr_main_restrict_os_commands))
-    {
-        $arrayofallowedcommand = explode(',', $dolibarr_main_restrict_os_commands);
-        dol_syslog("Command are restricted to ".$dolibarr_main_restrict_os_commands.". We check that one of this command is inside ".$cmddump);
-        $basenamecmddump = basename($cmddump);
-        if (!in_array($basenamecmddump, $arrayofallowedcommand))	// the provided command $cmddump must be an allowed command
-        {
-            $errormsg = $langs->trans('CommandIsNotInsideAllowedCommands');
-        }
-    }
+	if (!empty($dolibarr_main_restrict_os_commands))
+	{
+		$arrayofallowedcommand = explode(',', $dolibarr_main_restrict_os_commands);
+		dol_syslog("Command are restricted to ".$dolibarr_main_restrict_os_commands.". We check that one of this command is inside ".$cmddump);
+		$basenamecmddump = basename($cmddump);
+		if (!in_array($basenamecmddump, $arrayofallowedcommand))	// the provided command $cmddump must be an allowed command
+		{
+			$errormsg = $langs->trans('CommandIsNotInsideAllowedCommands');
+		}
+	}
 
-    if (!$errormsg && $cmddump)
-    {
-        dolibarr_set_const($db, 'SYSTEMTOOLS_MYSQLDUMP', $cmddump, 'chaine', 0, '', $conf->entity);
-    }
+	if (!$errormsg && $cmddump)
+	{
+		dolibarr_set_const($db, 'SYSTEMTOOLS_MYSQLDUMP', $cmddump, 'chaine', 0, '', $conf->entity);
+	}
 
-    if (!$errormsg)
-    {
-        $utils->dumpDatabase(GETPOST('compression', 'alpha'), $what, 0, $file);
-        $errormsg = $utils->error;
-        $_SESSION["commandbackuplastdone"] = $utils->result['commandbackuplastdone'];
-        $_SESSION["commandbackuptorun"] = $utils->result['commandbackuptorun'];
-    }
+	if (!$errormsg)
+	{
+		$utils->dumpDatabase(GETPOST('compression', 'alpha'), $what, 0, $file);
+		$errormsg = $utils->error;
+		$_SESSION["commandbackuplastdone"] = $utils->result['commandbackuplastdone'];
+		$_SESSION["commandbackuptorun"] = $utils->result['commandbackuptorun'];
+	}
 }
 
 // MYSQL NO BIN
 if ($what == 'mysqlnobin')
 {
-    $utils->dumpDatabase(GETPOST('compression', 'alpha'), $what, 0, $file);
+	$utils->dumpDatabase(GETPOST('compression', 'alpha'), $what, 0, $file);
 
-    $errormsg = $utils->error;
-    $_SESSION["commandbackuplastdone"] = $utils->result['commandbackuplastdone'];
-    $_SESSION["commandbackuptorun"] = $utils->result['commandbackuptorun'];
+	$errormsg = $utils->error;
+	$_SESSION["commandbackuplastdone"] = $utils->result['commandbackuplastdone'];
+	$_SESSION["commandbackuptorun"] = $utils->result['commandbackuptorun'];
 }
 
 // POSTGRESQL
 if ($what == 'postgresql')
 {
-    $cmddump = GETPOST("postgresqldump"); // Do not sanitize here with 'alpha', will be sanitize later by dol_sanitizePathName and escapeshellarg
-    $cmddump = dol_sanitizePathName($cmddump);
+	$cmddump = GETPOST("postgresqldump", 'none'); // Do not sanitize here with 'alpha', will be sanitize later by dol_sanitizePathName and escapeshellarg
+	$cmddump = dol_sanitizePathName($cmddump);
 
-    /* Not required, the command is output on screen but not ran for pgsql
+	/* Not required, the command is output on screen but not ran for pgsql
     if (! empty($dolibarr_main_restrict_os_commands))
     {
     	$arrayofallowedcommand=explode(',', $dolibarr_main_restrict_os_commands);
@@ -178,20 +178,20 @@ if ($what == 'postgresql')
     	}
     } */
 
-    if (!$errormsg && $cmddump)
-    {
-        dolibarr_set_const($db, 'SYSTEMTOOLS_POSTGRESQLDUMP', $cmddump, 'chaine', 0, '', $conf->entity);
-    }
+	if (!$errormsg && $cmddump)
+	{
+		dolibarr_set_const($db, 'SYSTEMTOOLS_POSTGRESQLDUMP', $cmddump, 'chaine', 0, '', $conf->entity);
+	}
 
-    if (!$errormsg)
-    {
-        $utils->dumpDatabase(GETPOST('compression', 'alpha'), $what, 0, $file);
-        $errormsg = $utils->error;
-        $_SESSION["commandbackuplastdone"] = $utils->result['commandbackuplastdone'];
-        $_SESSION["commandbackuptorun"] = $utils->result['commandbackuptorun'];
-    }
+	if (!$errormsg)
+	{
+		$utils->dumpDatabase(GETPOST('compression', 'alpha'), $what, 0, $file);
+		$errormsg = $utils->error;
+		$_SESSION["commandbackuplastdone"] = $utils->result['commandbackuplastdone'];
+		$_SESSION["commandbackuptorun"] = $utils->result['commandbackuptorun'];
+	}
 
-    $what = ''; // Clear to show message to run command
+	$what = ''; // Clear to show message to run command
 }
 
 
@@ -200,20 +200,20 @@ if ($errormsg)
 	setEventMessages($langs->trans("Error")." : ".$errormsg, null, 'errors');
 
 	$resultstring = '';
-    $resultstring .= '<div class="error">'.$langs->trans("Error")." : ".$errormsg.'</div>';
+	$resultstring .= '<div class="error">'.$langs->trans("Error")." : ".$errormsg.'</div>';
 
-    $_SESSION["commandbackupresult"] = $resultstring;
+	$_SESSION["commandbackupresult"] = $resultstring;
 } else {
 	if ($what)
 	{
-        setEventMessages($langs->trans("BackupFileSuccessfullyCreated").'.<br>'.$langs->trans("YouCanDownloadBackupFile"), null, 'mesgs');
+		setEventMessages($langs->trans("BackupFileSuccessfullyCreated").'.<br>'.$langs->trans("YouCanDownloadBackupFile"), null, 'mesgs');
 
-        $resultstring = '<div class="ok">';
-        $resultstring .= $langs->trans("BackupFileSuccessfullyCreated").'.<br>';
-        $resultstring .= $langs->trans("YouCanDownloadBackupFile");
-        $resultstring .= '<div>';
+		$resultstring = '<div class="ok">';
+		$resultstring .= $langs->trans("BackupFileSuccessfullyCreated").'.<br>';
+		$resultstring .= $langs->trans("YouCanDownloadBackupFile");
+		$resultstring .= '<div>';
 
-        $_SESSION["commandbackupresult"] = $resultstring;
+		$_SESSION["commandbackupresult"] = $resultstring;
 	}
 	/*else
 	{
diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php
index 485df8c318b..6e0b0508a07 100644
--- a/htdocs/admin/tools/export_files.php
+++ b/htdocs/admin/tools/export_files.php
@@ -33,8 +33,8 @@ $langs->load("admin");
 $action = GETPOST('action', 'aZ09');
 $what = GETPOST('what', 'alpha');
 $export_type = GETPOST('export_type', 'alpha');
-$file = GETPOST('zipfilename_template', 'alpha');
-$compression = GETPOST('compression');
+$file = trim(GETPOST('zipfilename_template', 'alpha'));
+$compression = GETPOST('compression', 'aZ09');
 
 $file = dol_sanitizeFileName($file);
 $file = preg_replace('/(\.zip|\.tar|\.tgz|\.gz|\.tar\.gz|\.bz2)$/i', '', $file);
@@ -59,8 +59,8 @@ $errormsg = '';
 
 if ($action == 'delete')
 {
-    $filerelative = dol_sanitizeFileName(GETPOST('urlfile', 'alpha'));
-    $filepath = $conf->admin->dir_output.'/'.$filerelative;
+	$filerelative = dol_sanitizeFileName(GETPOST('urlfile', 'alpha'));
+	$filepath = $conf->admin->dir_output.'/'.$filerelative;
 	$ret = dol_delete_file($filepath, 1);
 	if ($ret) setEventMessages($langs->trans("FileWasRemoved", $filerelative), null, 'mesgs');
 	else setEventMessages($langs->trans("ErrorFailToDeleteFile", $filerelative), null, 'errors');
@@ -76,16 +76,16 @@ if ($action == 'delete')
 $ExecTimeLimit = 1800; // 30mn
 if (!empty($ExecTimeLimit))
 {
-    $err = error_reporting();
-    error_reporting(0); // Disable all errors
-    //error_reporting(E_ALL);
-    @set_time_limit($ExecTimeLimit); // Need more than 240 on Windows 7/64
-    error_reporting($err);
+	$err = error_reporting();
+	error_reporting(0); // Disable all errors
+	//error_reporting(E_ALL);
+	@set_time_limit($ExecTimeLimit); // Need more than 240 on Windows 7/64
+	error_reporting($err);
 }
 $MemoryLimit = 0;
 if (!empty($MemoryLimit))
 {
-    @ini_set('memory_limit', $MemoryLimit);
+	@ini_set('memory_limit', $MemoryLimit);
 }
 
 $form = new Form($db);
@@ -113,54 +113,54 @@ $utils = new Utils($db);
 if ($compression == 'zip')
 {
 	$file .= '.zip';
-    $ret = dol_compress_dir(DOL_DATA_ROOT, $outputdir."/".$file, $compression, '/(\.log|\/temp\/|documents\/admin\/documents\/)/');
-    if ($ret < 0)
-    {
-    	if ($ret == -2) {
-    		$langs->load("errors");
-    		$errormsg = $langs->trans("ErrNoZipEngine");
-    	} else {
-    		$langs->load("errors");
-    		$errormsg = $langs->trans("ErrorFailedToWriteInDir", $outputdir);
-    	}
-    }
+	$ret = dol_compress_dir(DOL_DATA_ROOT, $outputdir."/".$file, $compression, '/(\.back|\.old|\.log|[\\\/]temp[\\\/]|documents[\\\/]admin[\\\/]documents[\\\/])/i');
+	if ($ret < 0)
+	{
+		if ($ret == -2) {
+			$langs->load("errors");
+			$errormsg = $langs->trans("ErrNoZipEngine");
+		} else {
+			$langs->load("errors");
+			$errormsg = $langs->trans("ErrorFailedToWriteInDir", $outputdir);
+		}
+	}
 } elseif (in_array($compression, array('gz', 'bz')))
 {
 	$userlogin = ($user->login ? $user->login : 'unknown');
 
 	$outputfile = $conf->admin->dir_temp.'/export_files.'.$userlogin.'.out'; // File used with popen method
 
-    $file .= '.tar';
-    // We also exclude '/temp/' dir and 'documents/admin/documents'
-    $cmd = "tar -cf ".$outputdir."/".$file." --exclude-vcs --exclude 'temp' --exclude 'dolibarr.log' --exclude 'dolibarr_*.log' --exclude 'documents/admin/documents' -C ".dirname(DOL_DATA_ROOT)." ".basename(DOL_DATA_ROOT);
+	$file .= '.tar';
+	// We also exclude '/temp/' dir and 'documents/admin/documents'
+	$cmd = "tar -cf ".$outputdir."/".$file." --exclude-vcs --exclude 'temp' --exclude 'dolibarr.log' --exclude 'dolibarr_*.log' --exclude 'documents/admin/documents' -C ".dirname(DOL_DATA_ROOT)." ".basename(DOL_DATA_ROOT);
 
-    $result = $utils->executeCLI($cmd, $outputfile);
+	$result = $utils->executeCLI($cmd, $outputfile);
 
-    $retval = $result['error'];
-    if ($result['result'] || !empty($retval))
-    {
-        $langs->load("errors");
-        dol_syslog("Documents tar retval after exec=".$retval, LOG_ERR);
-        $errormsg = 'Error tar generation return '.$retval;
-    } else {
-        if ($compression == 'gz')
-        {
-            $cmd = "gzip -f ".$outputdir."/".$file;
-        }
-        if ($compression == 'bz')
-        {
-            $cmd = "bzip2 -f ".$outputdir."/".$file;
-        }
+	$retval = $result['error'];
+	if ($result['result'] || !empty($retval))
+	{
+		$langs->load("errors");
+		dol_syslog("Documents tar retval after exec=".$retval, LOG_ERR);
+		$errormsg = 'Error tar generation return '.$retval;
+	} else {
+		if ($compression == 'gz')
+		{
+			$cmd = "gzip -f ".$outputdir."/".$file;
+		}
+		if ($compression == 'bz')
+		{
+			$cmd = "bzip2 -f ".$outputdir."/".$file;
+		}
 
-        $result = $utils->executeCLI($cmd, $outputfile);
+		$result = $utils->executeCLI($cmd, $outputfile);
 
-        $retval = $result['error'];
-        if ($result['result'] || !empty($retval))
-        {
-            $errormsg = 'Error '.$compression.' generation return '.$retval;
-            unlink($outputdir."/".$file);
-        }
-    }
+		$retval = $result['error'];
+		if ($result['result'] || !empty($retval))
+		{
+			$errormsg = 'Error '.$compression.' generation return '.$retval;
+			unlink($outputdir."/".$file);
+		}
+	}
 }
 
 if ($errormsg)
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index 32567f14074..00c4bdc36dd 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -76,11 +76,11 @@ $nowarray = dol_getdate($now);
 
 if (empty($date_start)) // We define date_start and date_end
 {
-    $date_start = dol_get_first_day($nowarray['year'], $nowarray['mon'], false);
+	$date_start = dol_get_first_day($nowarray['year'], $nowarray['mon'], false);
 }
 if (empty($date_end))
 {
-    $date_end = dol_mktime(23, 59, 59, $nowarray['mon'], $nowarray['mday'], $nowarray['year']);
+	$date_end = dol_mktime(23, 59, 59, $nowarray['mon'], $nowarray['mday'], $nowarray['year']);
 }
 // Set $date_startmonth...
 $tmp = dol_getdate($date_start);
@@ -104,14 +104,14 @@ $now = dol_now();
 // Purge search criteria
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-    $date_start = -1;
-    $date_end = -1;
-    $search_code = '';
-    $search_ip = '';
-    $search_user = '';
-    $search_desc = '';
-    $search_ua = '';
-    $search_prefix_session = '';
+	$date_start = -1;
+	$date_end = -1;
+	$search_code = '';
+	$search_ip = '';
+	$search_user = '';
+	$search_desc = '';
+	$search_ua = '';
+	$search_prefix_session = '';
 }
 
 // Purge audit events
@@ -144,7 +144,7 @@ if ($action == 'confirm_purge' && $confirm == 'yes' && $user->admin)
 	$result = $securityevent->create($user);
 	if ($result > 0)
 	{
-	    $db->commit();
+		$db->commit();
 		dol_syslog($text, LOG_WARNING);
 	} else {
 		$error++;
@@ -167,7 +167,7 @@ $usefilter = 0;
 
 $sql = "SELECT e.rowid, e.type, e.ip, e.user_agent, e.dateevent,";
 $sql .= " e.fk_user, e.description, e.prefix_session,";
-$sql .= " u.login";
+$sql .= " u.login, u.admin, u.entity, u.firstname, u.lastname, u.statut as status";
 $sql .= " FROM ".MAIN_DB_PREFIX."events as e";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = e.fk_user";
 $sql .= " WHERE e.entity IN (".getEntity('event').")";
@@ -219,16 +219,16 @@ if ($result)
 	if ($date_endday)     $param .= "&date_endday=".urlencode($date_endday);
 	if ($date_endyear)    $param .= "&date_endyear=".urlencode($date_endyear);
 
-    $langs->load('withdrawals');
-    if ($num)
-    {
-        $center = '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=purge">'.$langs->trans("Purge").'</a>';
-    }
+	$langs->load('withdrawals');
+	if ($num)
+	{
+		$center = '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=purge">'.$langs->trans("Purge").'</a>';
+	}
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 
-    print_barre_liste($langs->trans("ListOfSecurityEvents"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $nbtotalofrecords, 'setup', 0, '', '', $limit);
+	print_barre_liste($langs->trans("ListOfSecurityEvents"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $nbtotalofrecords, 'setup', 0, '', '', $limit);
 
 	if ($action == 'purge')
 	{
@@ -337,7 +337,18 @@ if ($result)
 		{
 			$userstatic->id = $obj->fk_user;
 			$userstatic->login = $obj->login;
+			$userstatic->admin = $obj->admin;
+			$userstatic->entity = $obj->entity;
+			$userstatic->status = $obj->status;
+
 			print $userstatic->getLoginUrl(1);
+			if (!empty($conf->multicompany->enabled) && $userstatic->admin && !$userstatic->entity)
+			{
+				print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
+			} elseif ($userstatic->admin)
+			{
+				print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
+			}
 		} else print '&nbsp;';
 		print '</td>';
 
diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php
index aedc41e0b23..d8e0a0383a2 100644
--- a/htdocs/admin/tools/listsessions.php
+++ b/htdocs/admin/tools/listsessions.php
@@ -37,8 +37,8 @@ $confirm = GETPOST('confirm', 'alpha');
 // Security check
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -192,7 +192,7 @@ if ($savehandler == 'files')
 {
 	if (count($listofsessions))
 	{
-	    print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=purge">'.$langs->trans("PurgeSessions").'</a>';
+		print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=purge">'.$langs->trans("PurgeSessions").'</a>';
 	}
 }
 
diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php
index c41b43b3b48..e9d0f5a8ac1 100644
--- a/htdocs/admin/tools/purge.php
+++ b/htdocs/admin/tools/purge.php
@@ -48,16 +48,16 @@ if (!empty($conf->syslog->enabled))
  */
 if ($action == 'purge' && !preg_match('/^confirm/i', $choice) && ($choice != 'allfiles' || $confirm == 'yes'))
 {
-    // Increase limit of time. Works only if we are not in safe mode
-    $ExecTimeLimit = 600;
-    if (!empty($ExecTimeLimit))
-    {
-        $err = error_reporting();
-        error_reporting(0); // Disable all errors
-        //error_reporting(E_ALL);
-        @set_time_limit($ExecTimeLimit); // Need more than 240 on Windows 7/64
-        error_reporting($err);
-    }
+	// Increase limit of time. Works only if we are not in safe mode
+	$ExecTimeLimit = 600;
+	if (!empty($ExecTimeLimit))
+	{
+		$err = error_reporting();
+		error_reporting(0); // Disable all errors
+		//error_reporting(E_ALL);
+		@set_time_limit($ExecTimeLimit); // Need more than 240 on Windows 7/64
+		error_reporting($err);
+	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/utils.class.php';
 	$utils = new Utils($db);
@@ -90,18 +90,18 @@ print '<table class="border centpercent">';
 
 print '<tr class="border"><td style="padding: 4px">';
 
-if (!empty($conf->syslog->enabled))
-{
+if (!empty($conf->syslog->enabled)) {
 	print '<input type="radio" name="choice" value="logfile"';
 	print ($choice && $choice == 'logfile') ? ' checked' : '';
 	$filelogparam = $filelog;
-	if ($user->admin && preg_match('/^dolibarr.*\.log$/', basename($filelog)))
-	{
-	    $filelogparam = '<a class="wordbreak" href="'.DOL_URL_ROOT.'/document.php?modulepart=logs&file=';
-	    $filelogparam .= basename($filelog);
-	    $filelogparam .= '">'.$filelog.'</a>';
+	if ($user->admin && preg_match('/^dolibarr.*\.log$/', basename($filelog))) {
+		$filelogparam = '<a class="wordbreak" href="'.DOL_URL_ROOT.'/document.php?modulepart=logs&file=';
+		$filelogparam .= basename($filelog);
+		$filelogparam .= '">'.$filelog.'</a>';
 	}
-	print '> '.$langs->trans("PurgeDeleteLogFile", $filelogparam);
+	$desc = $langs->trans("PurgeDeleteLogFile", '{filelogparam}');
+	$desc = str_replace('{filelogparam}', $filelogparam, $desc);
+	print '> '.$desc;
 	print '<br><br>';
 }
 
@@ -123,8 +123,7 @@ print '</td></tr></table>';
 
 print '</form>';
 
-if (preg_match('/^confirm/i', $choice))
-{
+if (preg_match('/^confirm/i', $choice)) {
 	print '<br>';
 	$formquestion = array();
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?choice=allfiles', $langs->trans('Purge'), $langs->trans('ConfirmPurge').img_warning().' ', 'purge', $formquestion, 'no', 2);
diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index 27b53e8266e..f39766818f3 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -54,7 +54,7 @@ $version = '0.0';
 
 if ($action == 'getlastversion')
 {
-	$result = getURLContent('http://sourceforge.net/projects/dolibarr/rss');
+	$result = getURLContent('https://sourceforge.net/projects/dolibarr/rss');
 	//var_dump($result['content']);
 	$sfurl = simplexml_load_string($result['content']);
 }
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 560530c9161..76cae0443b3 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -73,16 +73,16 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 // Purge search criteria
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-    $transkey = '';
-    $transvalue = '';
-    $toselect = '';
-    $search_array_options = array();
+	$transkey = '';
+	$transvalue = '';
+	$toselect = '';
+	$search_array_options = array();
 }
 
 if ($action == 'setMAIN_ENABLE_OVERWRITE_TRANSLATION')
 {
-    if (GETPOST('value')) dolibarr_set_const($db, 'MAIN_ENABLE_OVERWRITE_TRANSLATION', 1, 'chaine', 0, '', $conf->entity);
-    else dolibarr_set_const($db, 'MAIN_ENABLE_OVERWRITE_TRANSLATION', 0, 'chaine', 0, '', $conf->entity);
+	if (GETPOST('value')) dolibarr_set_const($db, 'MAIN_ENABLE_OVERWRITE_TRANSLATION', 1, 'chaine', 0, '', $conf->entity);
+	else dolibarr_set_const($db, 'MAIN_ENABLE_OVERWRITE_TRANSLATION', 0, 'chaine', 0, '', $conf->entity);
 }
 
 if ($action == 'update')
@@ -139,25 +139,25 @@ if ($action == 'add')
 	}
 	if (!$error)
 	{
-	    $db->begin();
+		$db->begin();
 
-	    $sql = "INSERT INTO ".MAIN_DB_PREFIX."overwrite_trans(lang, transkey, transvalue, entity) VALUES ('".$db->escape($langcode)."','".$db->escape($transkey)."','".$db->escape($transvalue)."', ".$db->escape($conf->entity).")";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."overwrite_trans(lang, transkey, transvalue, entity) VALUES ('".$db->escape($langcode)."','".$db->escape($transkey)."','".$db->escape($transvalue)."', ".$db->escape($conf->entity).")";
 		$result = $db->query($sql);
 		if ($result > 0)
 		{
-		    $db->commit();
-		    setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+			$db->commit();
+			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 			$action = "";
 			$transkey = "";
 			$transvalue = "";
 		} else {
-		    $db->rollback();
-		    if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		    {
-		        setEventMessages($langs->trans("WarningAnEntryAlreadyExistForTransKey"), null, 'warnings');
-		    } else {
-		        setEventMessages($db->lasterror(), null, 'errors');
-            }
+			$db->rollback();
+			if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+			{
+				setEventMessages($langs->trans("WarningAnEntryAlreadyExistForTransKey"), null, 'warnings');
+			} else {
+				setEventMessages($db->lasterror(), null, 'errors');
+			}
 			$action = '';
 		}
 	}
@@ -196,25 +196,22 @@ $enabledisablehtml = '';
 $enabledisablehtml .= $langs->trans("EnableOverwriteTranslation").' ';
 if (empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
 {
-    // Button off, click to enable
-    $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&token='.newToken().'&value=1'.$param.'">';
-    $enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
-    $enabledisablehtml .= '</a>';
+	// Button off, click to enable
+	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&token='.newToken().'&value=1'.$param.'">';
+	$enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
+	$enabledisablehtml .= '</a>';
 } else {
-    // Button on, click to disable
-    $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&token='.newToken().'&value=0'.$param.'">';
-    $enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
-    $enabledisablehtml .= '</a>';
+	// Button on, click to disable
+	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&token='.newToken().'&value=0'.$param.'">';
+	$enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
+	$enabledisablehtml .= '</a>';
 }
 
 print load_fiche_titre($langs->trans("Translation"), $enabledisablehtml, 'title_setup');
 
-//print '<span class="opacitymedium">'.$langs->trans("TranslationDesc")."</span><br>\n";
-//print "<br>\n";
-
 $current_language_code = $langs->defaultlang;
 $s = picto_from_langcode($current_language_code);
-print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("CurrentUserLanguage").': <strong>'.$s.' '.$current_language_code.'</strong>', $langs->trans("TranslationDesc")).'</span><br>';
+print $form->textwithpicto('<span class="opacitymedium">'.$langs->trans("CurrentUserLanguage").':</span> <strong>'.$s.' '.$current_language_code.'</strong>', $langs->trans("TranslationDesc")).'</span><br>';
 
 print '<br>';
 
@@ -235,7 +232,7 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
 $head = translation_prepare_head();
 
-dol_fiche_head($head, $mode, '', -1, '');
+print dol_get_fiche_head($head, $mode, '', -1, '');
 
 if ($mode == 'overwrite')
 {
@@ -247,43 +244,43 @@ if ($mode == 'overwrite')
 	if ($action == 'edit' || empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION)) $disablededit = ' disabled';
 
 	print '<div class="justify"><span class="opacitymedium">';
-    print img_info().' '.$langs->trans("SomeTranslationAreUncomplete");
-    $urlwikitranslatordoc = 'https://wiki.dolibarr.org/index.php/Translator_documentation';
-    print ' ('.$langs->trans("SeeAlso", '<a href="'.$urlwikitranslatordoc.'" target="_blank">'.$langs->trans("Here").'</a>').')<br>';
-    print $langs->trans("TranslationOverwriteDesc", $langs->transnoentitiesnoconv("Language"), $langs->transnoentitiesnoconv("Key"), $langs->transnoentitiesnoconv("NewTranslationStringToShow"))."\n";
-    print ' ('.$langs->trans("TranslationOverwriteDesc2").').'."<br>\n";
-    print '</span></div>';
+	print img_info().' '.$langs->trans("SomeTranslationAreUncomplete");
+	$urlwikitranslatordoc = 'https://wiki.dolibarr.org/index.php/Translator_documentation';
+	print ' ('.$langs->trans("SeeAlso", '<a href="'.$urlwikitranslatordoc.'" target="_blank">'.$langs->trans("Here").'</a>').')<br>';
+	print $langs->trans("TranslationOverwriteDesc", $langs->transnoentitiesnoconv("Language"), $langs->transnoentitiesnoconv("Key"), $langs->transnoentitiesnoconv("NewTranslationStringToShow"))."\n";
+	print ' ('.$langs->trans("TranslationOverwriteDesc2").').'."<br>\n";
+	print '</span></div>';
 
-    print '<br>';
+	print '<br>';
 
 
 	print '<input type="hidden" name="action" value="'.($action == 'edit' ? 'update' : 'add').'">';
-    print '<input type="hidden" id="mode" name="mode" value="'.$mode.'">';
+	print '<input type="hidden" id="mode" name="mode" value="'.$mode.'">';
 
 	print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Language_en_US_es_MX_etc", $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("Key", $_SERVER["PHP_SELF"], 'transkey', '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("NewTranslationStringToShow", $_SERVER["PHP_SELF"], 'transvalue', '', $param, '', $sortfield, $sortorder);
-    //if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,transkey', '', $param, '', $sortfield, $sortorder);
-    print '<td align="center"></td>';
-    print "</tr>\n";
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Language_en_US_es_MX_etc", $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Key", $_SERVER["PHP_SELF"], 'transkey', '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("NewTranslationStringToShow", $_SERVER["PHP_SELF"], 'transvalue', '', $param, '', $sortfield, $sortorder);
+	//if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,transkey', '', $param, '', $sortfield, $sortorder);
+	print '<td align="center"></td>';
+	print "</tr>\n";
 
 
-    // Line to add new record
-    print "\n";
+	// Line to add new record
+	print "\n";
 
-    print '<tr class="oddeven"><td>';
-    print $formadmin->select_language(GETPOST('langcode'), 'langcode', 0, null, 1, 0, $disablededit ? 1 : 0, 'maxwidthonsmartphone', 1);
-    print '</td>'."\n";
-    print '<td>';
-    print '<input type="text" class="flat maxwidthonsmartphone"'.$disablededit.' name="transkey" id="transkey" value="'.(!empty($transkey) ? $transkey : "").'">';
-    print '</td><td>';
-    print '<input type="text" class="quatrevingtpercent"'.$disablededit.' name="transvalue" id="transvalue" value="'.(!empty($transvalue) ? $transvalue : "").'">';
-    print '</td>';
-    // Limit to superadmin
-    /*if (! empty($conf->multicompany->enabled) && !$user->entity)
+	print '<tr class="oddeven"><td>';
+	print $formadmin->select_language(GETPOST('langcode'), 'langcode', 0, null, 1, 0, $disablededit ? 1 : 0, 'maxwidthonsmartphone', 1);
+	print '</td>'."\n";
+	print '<td>';
+	print '<input type="text" class="flat maxwidthonsmartphone"'.$disablededit.' name="transkey" id="transkey" value="'.(!empty($transkey) ? $transkey : "").'">';
+	print '</td><td>';
+	print '<input type="text" class="quatrevingtpercent"'.$disablededit.' name="transvalue" id="transvalue" value="'.(!empty($transvalue) ? $transvalue : "").'">';
+	print '</td>';
+	// Limit to superadmin
+	/*if (! empty($conf->multicompany->enabled) && !$user->entity)
     {
     	print '<td>';
     	print '<input type="text" class="flat" size="1" name="entity" value="'.$conf->entity.'">';
@@ -292,118 +289,117 @@ if ($mode == 'overwrite')
     }
     else
     {*/
-    	print '<td class="center">';
-    	print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
-    //}
-    print '<input type="submit" class="button"'.$disabled.' value="'.$langs->trans("Add").'" name="add" title="'.dol_escape_htmltag($langs->trans("YouMustEnabledTranslationOverwriteBefore")).'">';
-    print "</td>\n";
-    print '</tr>';
+		print '<td class="center">';
+		print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
+	//}
+	print '<input type="submit" class="button"'.$disabled.' value="'.$langs->trans("Add").'" name="add" title="'.dol_escape_htmltag($langs->trans("YouMustEnabledTranslationOverwriteBefore")).'">';
+	print "</td>\n";
+	print '</tr>';
 
 
-    // Show constants
-    $sql = "SELECT rowid, entity, lang, transkey, transvalue";
-    $sql .= " FROM ".MAIN_DB_PREFIX."overwrite_trans";
-    $sql .= " WHERE 1 = 1";
-    $sql .= " AND entity IN (".getEntity('overwrite_trans').")";
-    $sql .= $db->order($sortfield, $sortorder);
+	// Show constants
+	$sql = "SELECT rowid, entity, lang, transkey, transvalue";
+	$sql .= " FROM ".MAIN_DB_PREFIX."overwrite_trans";
+	$sql .= " WHERE 1 = 1";
+	$sql .= " AND entity IN (".getEntity('overwrite_trans').")";
+	$sql .= $db->order($sortfield, $sortorder);
 
-    dol_syslog("translation::select from table", LOG_DEBUG);
-    $result = $db->query($sql);
-    if ($result)
-    {
-    	$num = $db->num_rows($result);
-    	$i = 0;
+	dol_syslog("translation::select from table", LOG_DEBUG);
+	$result = $db->query($sql);
+	if ($result)
+	{
+		$num = $db->num_rows($result);
+		$i = 0;
 
-    	while ($i < $num)
-    	{
-    		$obj = $db->fetch_object($result);
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($result);
 
-    		print "\n";
+			print "\n";
 
-    		print '<tr class="oddeven">';
+			print '<tr class="oddeven">';
 
-    		print '<td>'.$obj->lang.'</td>'."\n";
-    		print '<td>'.$obj->transkey.'</td>'."\n";
+			print '<td>'.$obj->lang.'</td>'."\n";
+			print '<td>'.$obj->transkey.'</td>'."\n";
 
-    		// Value
-    		print '<td>';
-    		/*print '<input type="hidden" name="const['.$i.'][rowid]" value="'.$obj->rowid.'">';
+			// Value
+			print '<td>';
+			/*print '<input type="hidden" name="const['.$i.'][rowid]" value="'.$obj->rowid.'">';
     		print '<input type="hidden" name="const['.$i.'][lang]" value="'.$obj->lang.'">';
     		print '<input type="hidden" name="const['.$i.'][name]" value="'.$obj->transkey.'">';
     		print '<input type="text" id="value_'.$i.'" class="flat inputforupdate" size="30" name="const['.$i.'][value]" value="'.dol_escape_htmltag($obj->transvalue).'">';
     		*/
-    		if ($action == 'edit' && $obj->rowid == GETPOST('rowid', 'int'))
-    		{
-    			print '<input type="text" class="quatrevingtpercent" name="transvalue" value="'.dol_escape_htmltag($obj->transvalue).'">';
-    		} else {
-    			print dol_escape_htmltag($obj->transvalue);
-    		}
-    		print '</td>';
+			if ($action == 'edit' && $obj->rowid == GETPOST('rowid', 'int'))
+			{
+				print '<input type="text" class="quatrevingtpercent" name="transvalue" value="'.dol_escape_htmltag($obj->transvalue).'">';
+			} else {
+				print dol_escape_htmltag($obj->transvalue);
+			}
+			print '</td>';
 
-    		print '<td class="center">';
-    		if ($action == 'edit' && $obj->rowid == GETPOST('rowid', 'int'))
-    		{
-    			print '<input type="hidden" class="button" name="rowid" value="'.$obj->rowid.'">';
-    			print '<input type="submit" class="button buttongen" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
-    			print ' &nbsp; ';
-    			print '<input type="submit" class="button buttongen" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
-    		} else {
-    			print '<a class="reposition editfielda paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=edit'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
+			print '<td class="center">';
+			if ($action == 'edit' && $obj->rowid == GETPOST('rowid', 'int'))
+			{
+				print '<input type="hidden" class="button" name="rowid" value="'.$obj->rowid.'">';
+				print '<input type="submit" class="button buttongen button-save" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 				print ' &nbsp; ';
-    			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=delete&token='.newToken().((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
-    		}
-    		print '</td>';
+				print '<input type="submit" class="button buttongen button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+			} else {
+				print '<a class="reposition editfielda paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=edit'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
+				print ' &nbsp; ';
+				print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=delete&token='.newToken().((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
+			}
+			print '</td>';
 
-    		print "</tr>\n";
-    		print "\n";
-    		$i++;
-    	}
-    }
+			print "</tr>\n";
+			print "\n";
+			$i++;
+		}
+	}
 
-    print '</table>';
-    print '</div>';
+	print '</table>';
+	print '</div>';
 }
 
 if ($mode == 'searchkey')
 {
-    $langcode = GETPOST('langcode') ?GETPOST('langcode') : $langs->defaultlang;
+	$langcode = GETPOSTISSET('langcode') ? GETPOST('langcode') : $langs->defaultlang;
 
-    $newlang = new Translate('', $conf);
-    $newlang->setDefaultLang($langcode);
+	$newlang = new Translate('', $conf);
+	$newlang->setDefaultLang($langcode);
 
-    $newlangfileonly = new Translate('', $conf);
-    $newlangfileonly->setDefaultLang($langcode);
+	$newlangfileonly = new Translate('', $conf);
+	$newlangfileonly->setDefaultLang($langcode);
 
-    $recordtoshow = array();
+	$recordtoshow = array();
 
-    // Search modules dirs
-    $modulesdir = dolGetModulesDirs();
+	// Search modules dirs
+	$modulesdir = dolGetModulesDirs();
 
-    $nbtotaloffiles = 0;
-    $nbempty = 0;
-    /*var_dump($langcode);
+	$nbtotaloffiles = 0;
+	$nbempty = 0;
+	/*var_dump($langcode);
      var_dump($transkey);
      var_dump($transvalue);*/
-    if (empty($langcode) || $langcode == '-1') $nbempty++;
-    if (empty($transkey)) $nbempty++;
-    if (empty($transvalue)) $nbempty++;
-    if ($action == 'search' && ($nbempty > 999))    // 999 to disable this
-    {
-        setEventMessages($langs->trans("WarningAtLeastKeyOrTranslationRequired"), null, 'warnings');
-    } else {
-        // Search into dir of modules (the $modulesdir is already a list that loop on $conf->file->dol_document_root)
-        $i = 0;
-        foreach ($modulesdir as $keydir => $tmpsearchdir)
-        {
-        	$searchdir = $tmpsearchdir; // $searchdir can be '.../htdocs/core/modules/' or '.../htdocs/custom/mymodule/core/modules/'
+	if (empty($langcode) || $langcode == '-1') $nbempty++;
+	if (empty($transkey)) $nbempty++;
+	if (empty($transvalue)) $nbempty++;
+	if ($action == 'search' && ($nbempty > 999)) {    // 999 to disable this
+		setEventMessages($langs->trans("WarningAtLeastKeyOrTranslationRequired"), null, 'warnings');
+	} else {
+		// Search into dir of modules (the $modulesdir is already a list that loop on $conf->file->dol_document_root)
+		$i = 0;
+		foreach ($modulesdir as $keydir => $tmpsearchdir)
+		{
+			$searchdir = $tmpsearchdir; // $searchdir can be '.../htdocs/core/modules/' or '.../htdocs/custom/mymodule/core/modules/'
 
-        	// Directory of translation files
-        	$dir_lang = dirname(dirname($searchdir))."/langs/".$langcode; // The 2 dirname is to go up in dir for 2 levels
-        	$dir_lang_osencoded = dol_osencode($dir_lang);
+			// Directory of translation files
+			$dir_lang = dirname(dirname($searchdir))."/langs/".$langcode; // The 2 dirname is to go up in dir for 2 levels
+			$dir_lang_osencoded = dol_osencode($dir_lang);
 
-        	$filearray = dol_dir_list($dir_lang_osencoded, 'files', 0, '', '', $sortfield, (strtolower($sortorder) == 'asc' ?SORT_ASC:SORT_DESC), 1);
-        	foreach ($filearray as $file)
-        	{
+			$filearray = dol_dir_list($dir_lang_osencoded, 'files', 0, '', '', $sortfield, (strtolower($sortorder) == 'asc' ?SORT_ASC:SORT_DESC), 1);
+			foreach ($filearray as $file)
+			{
 				$tmpfile = preg_replace('/.lang/i', '', basename($file['name']));
 				$moduledirname = (basename(dirname(dirname($dir_lang))));
 
@@ -416,138 +412,138 @@ if ($mode == 'searchkey')
 				if ($result < 0) print 'Failed to load language file '.$tmpfile.'<br>'."\n";
 				else $nbtotaloffiles++;
 				//print 'After loading lang '.$langkey.', newlang has '.count($newlang->tab_translate).' records<br>'."\n";
-        	}
-        	$i++;
-        }
+			}
+			$i++;
+		}
 
-        // Now search into translation array
-        foreach ($newlang->tab_translate as $key => $val)
-        {
-            if ($transkey && !preg_match('/'.preg_quote($transkey, '/').'/i', $key)) continue;
-            if ($transvalue && !preg_match('/'.preg_quote($transvalue, '/').'/i', $val)) continue;
-            $recordtoshow[$key] = $val;
-        }
-    }
+		// Now search into translation array
+		foreach ($newlang->tab_translate as $key => $val)
+		{
+			if ($transkey && !preg_match('/'.preg_quote($transkey, '/').'/i', $key)) continue;
+			if ($transvalue && !preg_match('/'.preg_quote($transvalue, '/').'/i', $val)) continue;
+			$recordtoshow[$key] = $val;
+		}
+	}
 
-    //print '<br>';
-    $nbtotalofrecordswithoutfilters = count($newlang->tab_translate);
-    $nbtotalofrecords = count($recordtoshow);
-    $num = $limit + 1;
-    if (($offset + $num) > $nbtotalofrecords) $num = $limit;
+	//print '<br>';
+	$nbtotalofrecordswithoutfilters = count($newlang->tab_translate);
+	$nbtotalofrecords = count($recordtoshow);
+	$num = $limit + 1;
+	if (($offset + $num) > $nbtotalofrecords) $num = $limit;
 
-    //print 'param='.$param.' $_SERVER["PHP_SELF"]='.$_SERVER["PHP_SELF"].' num='.$num.' page='.$page.' nbtotalofrecords='.$nbtotalofrecords." sortfield=".$sortfield." sortorder=".$sortorder;
-    $title = $langs->trans("TranslationKeySearch");
-    if ($nbtotalofrecords > 0) $title .= ' <span class="opacitymedium colorblack paddingleft">('.$nbtotalofrecords.' / '.$nbtotalofrecordswithoutfilters.' - '.$nbtotaloffiles.' '.$langs->trans("Files").')</span>';
-    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, -1 * $nbtotalofrecords, '', 0, '', '', $limit, 0, 0, 1);
+	//print 'param='.$param.' $_SERVER["PHP_SELF"]='.$_SERVER["PHP_SELF"].' num='.$num.' page='.$page.' nbtotalofrecords='.$nbtotalofrecords." sortfield=".$sortfield." sortorder=".$sortorder;
+	$title = $langs->trans("TranslationKeySearch");
+	if ($nbtotalofrecords > 0) $title .= ' <span class="opacitymedium colorblack paddingleft">('.$nbtotalofrecords.' / '.$nbtotalofrecordswithoutfilters.' - '.$nbtotaloffiles.' '.$langs->trans("Files").')</span>';
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, -1 * $nbtotalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
-    print '<input type="hidden" id="action" name="action" value="search">';
-    print '<input type="hidden" id="mode" name="mode" value="'.$mode.'">';
+	print '<input type="hidden" id="action" name="action" value="search">';
+	print '<input type="hidden" id="mode" name="mode" value="'.$mode.'">';
 
 	print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Language_en_US_es_MX_etc", $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("Key", $_SERVER["PHP_SELF"], 'transkey', '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("CurrentTranslationString", $_SERVER["PHP_SELF"], 'transvalue', '', $param, '', $sortfield, $sortorder);
-    //if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,transkey', '', $param, '', $sortfield, $sortorder);
-    print '<td align="center"></td>';
-    print "</tr>\n";
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Language_en_US_es_MX_etc", $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Key", $_SERVER["PHP_SELF"], 'transkey', '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("CurrentTranslationString", $_SERVER["PHP_SELF"], 'transvalue', '', $param, '', $sortfield, $sortorder);
+	//if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,transkey', '', $param, '', $sortfield, $sortorder);
+	print '<td align="center"></td>';
+	print "</tr>\n";
 
-    // Line to search new record
-    print "\n";
+	// Line to search new record
+	print "\n";
 
-    print '<tr class="oddeven"><td>';
-    //print $formadmin->select_language($langcode,'langcode',0,null,$langs->trans("All"),0,0,'',1);
-    print $formadmin->select_language($langcode, 'langcode', 0, null, 0, 0, 0, 'maxwidthonsmartphone', 1);
-    print '</td>'."\n";
-    print '<td>';
-    print '<input type="text" class="flat maxwidthonsmartphone" name="transkey" value="'.$transkey.'">';
-    print '</td><td>';
-    print '<input type="text" class="quatrevingtpercent" name="transvalue" value="'.$transvalue.'">';
-    // Limit to superadmin
-    /*if (! empty($conf->multicompany->enabled) && !$user->entity)
+	print '<tr class="oddeven"><td>';
+	//print $formadmin->select_language($langcode,'langcode',0,null,$langs->trans("All"),0,0,'',1);
+	print $formadmin->select_language($langcode, 'langcode', 0, null, 0, 0, 0, 'maxwidthonsmartphone', 1);
+	print '</td>'."\n";
+	print '<td>';
+	print '<input type="text" class="flat maxwidthonsmartphone" name="transkey" value="'.$transkey.'">';
+	print '</td><td>';
+	print '<input type="text" class="quatrevingtpercent" name="transvalue" value="'.$transvalue.'">';
+	// Limit to superadmin
+	/*if (! empty($conf->multicompany->enabled) && !$user->entity)
     {
         print '</td><td>';
         print '<input type="text" class="flat" size="1" name="entitysearch" value="'.$conf->entity.'">';
     }
     else
     {*/
-        print '<input type="hidden" name="entitysearch" value="'.$conf->entity.'">';
-    //}
-    print '</td>';
-    // Action column
-    print '<td class="nowrap right">';
-    $searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
-    print $searchpicto;
-    print '</td>';
-    print '</tr>';
+		print '<input type="hidden" name="entitysearch" value="'.$conf->entity.'">';
+	//}
+	print '</td>';
+	// Action column
+	print '<td class="nowrap right">';
+	$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
+	print $searchpicto;
+	print '</td>';
+	print '</tr>';
 
-    if ($sortfield == 'transkey' && strtolower($sortorder) == 'asc') ksort($recordtoshow);
-    if ($sortfield == 'transkey' && strtolower($sortorder) == 'desc') krsort($recordtoshow);
-    if ($sortfield == 'transvalue' && strtolower($sortorder) == 'asc') asort($recordtoshow);
-    if ($sortfield == 'transvalue' && strtolower($sortorder) == 'desc') arsort($recordtoshow);
+	if ($sortfield == 'transkey' && strtolower($sortorder) == 'asc') ksort($recordtoshow);
+	if ($sortfield == 'transkey' && strtolower($sortorder) == 'desc') krsort($recordtoshow);
+	if ($sortfield == 'transvalue' && strtolower($sortorder) == 'asc') asort($recordtoshow);
+	if ($sortfield == 'transvalue' && strtolower($sortorder) == 'desc') arsort($recordtoshow);
 
-    // Show result
-    $i = 0;
-    foreach ($recordtoshow as $key => $val)
-    {
-        $i++;
-        if ($i <= $offset) continue;
-        if ($i > ($offset + $limit)) break;
-        print '<tr class="oddeven"><td>'.$langcode.'</td><td>'.$key.'</td><td>';
-        print dol_escape_htmltag($val);
-        print '</td><td class="right nowraponall">';
-        if (!empty($newlangfileonly->tab_translate[$key]))
-        {
-            if ($val != $newlangfileonly->tab_translate[$key])
-            {
-                // retrieve rowid
-                $sql = "SELECT rowid";
-                $sql .= " FROM ".MAIN_DB_PREFIX."overwrite_trans";
-                $sql .= " WHERE transkey = '".$key."'";
-                $sql .= " AND entity IN (".getEntity('overwrite_trans').")";
-                dol_syslog("translation::select from table", LOG_DEBUG);
-                $result = $db->query($sql);
-                if ($result)
-                {
-                    $obj = $db->fetch_object($result);
-                }
-                print '<a class="editfielda reposition paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&action=edit">'.img_edit().'</a>';
-                print ' ';
-                print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&action=delete&token='.newToken().'">'.img_delete().'</a>';
-                print '&nbsp;&nbsp;';
-                $htmltext = $langs->trans("OriginalValueWas", '<i>'.$newlangfileonly->tab_translate[$key].'</i>');
-                print $form->textwithpicto('', $htmltext, 1, 'info');
-            } elseif (!empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
-            {
-            	//print $key.'-'.$val;
-                print '<a class="reposition paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=overwrite&amp;langcode='.$langcode.'&amp;transkey='.$key.'">'.img_edit_add($langs->trans("Overwrite")).'</a>';
-            }
+	// Show result
+	$i = 0;
+	foreach ($recordtoshow as $key => $val)
+	{
+		$i++;
+		if ($i <= $offset) continue;
+		if ($i > ($offset + $limit)) break;
+		print '<tr class="oddeven"><td>'.$langcode.'</td><td>'.$key.'</td><td>';
+		print dol_escape_htmltag($val);
+		print '</td><td class="right nowraponall">';
+		if (!empty($newlangfileonly->tab_translate[$key]))
+		{
+			if ($val != $newlangfileonly->tab_translate[$key])
+			{
+				// retrieve rowid
+				$sql = "SELECT rowid";
+				$sql .= " FROM ".MAIN_DB_PREFIX."overwrite_trans";
+				$sql .= " WHERE transkey = '".$key."'";
+				$sql .= " AND entity IN (".getEntity('overwrite_trans').")";
+				dol_syslog("translation::select from table", LOG_DEBUG);
+				$result = $db->query($sql);
+				if ($result)
+				{
+					$obj = $db->fetch_object($result);
+				}
+				print '<a class="editfielda reposition paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&action=edit">'.img_edit().'</a>';
+				print ' ';
+				print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&action=delete&token='.newToken().'">'.img_delete().'</a>';
+				print '&nbsp;&nbsp;';
+				$htmltext = $langs->trans("OriginalValueWas", '<i>'.$newlangfileonly->tab_translate[$key].'</i>');
+				print $form->textwithpicto('', $htmltext, 1, 'info');
+			} elseif (!empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
+			{
+				//print $key.'-'.$val;
+				print '<a class="reposition paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=overwrite&amp;langcode='.$langcode.'&amp;transkey='.$key.'">'.img_edit_add($langs->trans("Overwrite")).'</a>';
+			}
 
-            if (!empty($conf->global->MAIN_FEATURES_LEVEL))
-            {
-            	$transifexlangfile = '$'; // $ means 'All'
-            	//$transifexurl = 'https://www.transifex.com/dolibarr-association/dolibarr/translate/#'.$langcode.'/'.$transifexlangfile.'?key='.$key;
-            	$transifexurl = 'https://www.transifex.com/dolibarr-association/dolibarr/translate/#'.$langcode.'/'.$transifexlangfile.'?q=key%3A'.$key;
+			if (!empty($conf->global->MAIN_FEATURES_LEVEL))
+			{
+				$transifexlangfile = '$'; // $ means 'All'
+				//$transifexurl = 'https://www.transifex.com/dolibarr-association/dolibarr/translate/#'.$langcode.'/'.$transifexlangfile.'?key='.$key;
+				$transifexurl = 'https://www.transifex.com/dolibarr-association/dolibarr/translate/#'.$langcode.'/'.$transifexlangfile.'?q=key%3A'.$key;
 
-            	print ' &nbsp; <a href="'.$transifexurl.'" target="transifex">'.img_picto($langs->trans('FixOnTransifex'), 'globe').'</a>';
-            }
-        } else {
-            $htmltext = $langs->trans("TransKeyWithoutOriginalValue", $key);
-            print $form->textwithpicto('', $htmltext, 1, 'warning');
-        }
-        /*if (! empty($conf->multicompany->enabled) && !$user->entity)
+				print ' &nbsp; <a href="'.$transifexurl.'" target="transifex">'.img_picto($langs->trans('FixOnTransifex'), 'globe').'</a>';
+			}
+		} else {
+			$htmltext = $langs->trans("TransKeyWithoutOriginalValue", $key);
+			print $form->textwithpicto('', $htmltext, 1, 'warning');
+		}
+		/*if (! empty($conf->multicompany->enabled) && !$user->entity)
         {
             print '<td>'.$val.'</td>';
         }*/
-        print '</td></tr>'."\n";
-    }
+		print '</td></tr>'."\n";
+	}
 
-    print '</table>';
-    print '</div>';
+	print '</table>';
+	print '</div>';
 }
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print "</form>\n";
 
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index 620efb0540e..ea6cdf2b6f8 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2004		Benoit Mortier			<benoit.mortier@opensides.be>
  * Copyright (C) 2005-2011	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2015		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2020       Frédéric 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
@@ -42,6 +43,8 @@ $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 $value = GETPOST('value', 'alpha');
+$label = GETPOST('label', 'alpha');
+$scandir = GETPOST('scandir', 'alpha');
 $type = 'user';
 
 
@@ -60,7 +63,7 @@ if ($action == 'set_default')
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->USER_ADDON_PDF_ODT == "$value") dolibarr_del_const($db, 'USER_ADDON_PDF_ODT', $conf->entity);
+		if ($conf->global->USER_ADDON_PDF_ODT == "$value") dolibarr_del_const($db, 'USER_ADDON_PDF_ODT', $conf->entity);
 	}
 	$res = true;
 }
@@ -84,24 +87,24 @@ elseif ($action == 'setdoc')
 	$res = true;
 } elseif (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 {
-    $code = $reg[1];
-    if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
-    {
-        header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    } else {
-        dol_print_error($db);
-    }
+	$code = $reg[1];
+	if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	} else {
+		dol_print_error($db);
+	}
 } elseif (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 {
-    $code = $reg[1];
-    if (dolibarr_del_const($db, $code, $conf->entity) > 0)
-    {
-        header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    } else {
-        dol_print_error($db);
-    }
+	$code = $reg[1];
+	if (dolibarr_del_const($db, $code, $conf->entity) > 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	} else {
+		dol_print_error($db);
+	}
 }
 //Set hide closed customer into combox or select
 elseif ($action == 'sethideinactiveuser')
@@ -132,7 +135,7 @@ print load_fiche_titre($langs->trans("UsersSetup"), $linkback, 'title_setup');
 
 $head = user_admin_prepare_head();
 
-dol_fiche_head($head, 'card', $langs->trans("MenuUsersAndGroups"), -1, 'user');
+print dol_get_fiche_head($head, 'card', $langs->trans("MenuUsersAndGroups"), -1, 'user');
 
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
@@ -225,110 +228,110 @@ clearstatcache();
 
 foreach ($dirmodels as $reldir)
 {
-    foreach (array('', '/doc') as $valdir)
-    {
-    	$dir = dol_buildpath($reldir."core/modules/user".$valdir);
-        if (is_dir($dir))
-        {
-            $handle = opendir($dir);
-            if (is_resource($handle))
-            {
-                while (($file = readdir($handle)) !== false)
-                {
-                    $filelist[] = $file;
-                }
-                closedir($handle);
-                arsort($filelist);
+	foreach (array('', '/doc') as $valdir)
+	{
+		$dir = dol_buildpath($reldir."core/modules/user".$valdir);
+		if (is_dir($dir))
+		{
+			$handle = opendir($dir);
+			if (is_resource($handle))
+			{
+				while (($file = readdir($handle)) !== false)
+				{
+					$filelist[] = $file;
+				}
+				closedir($handle);
+				arsort($filelist);
 
-                foreach ($filelist as $file)
-                {
-                    if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-                    {
-                    	if (file_exists($dir.'/'.$file))
-                    	{
-                    		$name = substr($file, 4, dol_strlen($file) - 16);
-	                        $classname = substr($file, 0, dol_strlen($file) - 12);
+				foreach ($filelist as $file)
+				{
+					if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
+					{
+						if (file_exists($dir.'/'.$file))
+						{
+							$name = substr($file, 4, dol_strlen($file) - 16);
+							$classname = substr($file, 0, dol_strlen($file) - 12);
 
-	                        require_once $dir.'/'.$file;
-	                        $module = new $classname($db);
+							require_once $dir.'/'.$file;
+							$module = new $classname($db);
 
-	                        $modulequalified = 1;
-	                        if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
-	                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+							$modulequalified = 1;
+							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
+							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
 
-	                        if ($modulequalified)
-	                        {
-	                            print '<tr class="oddeven"><td width="100">';
-	                            print (empty($module->name) ? $name : $module->name);
-	                            print "</td><td>\n";
-	                            if (method_exists($module, 'info')) print $module->info($langs);
-	                            else print $module->description;
-	                            print '</td>';
+							if ($modulequalified)
+							{
+								print '<tr class="oddeven"><td width="100">';
+								print (empty($module->name) ? $name : $module->name);
+								print "</td><td>\n";
+								if (method_exists($module, 'info')) print $module->info($langs);
+								else print $module->description;
+								print '</td>';
 
-	                            // Active
-	                            if (in_array($name, $def))
-	                            {
-	                            	print '<td class="center">'."\n";
-	                            	print '<a href="'.$_SERVER["PHP_SELF"].'?action=del_default&amp;token='.newToken().'&amp;value='.$name.'">';
-	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
-	                            	print '</a>';
-	                            	print '</td>';
-	                            } else {
-	                                print '<td class="center">'."\n";
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set_default&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-	                                print "</td>";
-	                            }
+								// Active
+								if (in_array($name, $def))
+								{
+									print '<td class="center">'."\n";
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=del_default&amp;token='.newToken().'&amp;value='.$name.'">';
+									print img_picto($langs->trans("Enabled"), 'switch_on');
+									print '</a>';
+									print '</td>';
+								} else {
+									print '<td class="center">'."\n";
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=set_default&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print "</td>";
+								}
 
-	                            // Defaut
-	                            print '<td class="center">';
-	                            if ($conf->global->USER_ADDON_PDF == $name)
-	                            {
-	                                print img_picto($langs->trans("Default"), 'on');
-	                            } else {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	                            }
-	                            print '</td>';
+								// Defaut
+								print '<td class="center">';
+								if ($conf->global->USER_ADDON_PDF == $name)
+								{
+									print img_picto($langs->trans("Default"), 'on');
+								} else {
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+								}
+								print '</td>';
 
-	                            // Info
-		    					$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
-					    		$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-			                    if ($module->type == 'pdf')
-			                    {
-			                        $htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-			                    }
-					    		$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-					    		$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
-					    		$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
+								// Info
+								$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+								$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+								if ($module->type == 'pdf')
+								{
+									$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+								}
+								$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+								$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+								$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
 
 
-	                            print '<td class="center">';
-	                            print $form->textwithpicto('', $htmltooltip, 1, 0);
-	                            print '</td>';
+								print '<td class="center">';
+								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print '</td>';
 
-	                            // Preview
-	                            print '<td class="center">';
-	                            if ($module->type == 'pdf')
-	                            {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
-	                            } else {
-	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
-	                            }
-	                            print '</td>';
+								// Preview
+								print '<td class="center">';
+								if ($module->type == 'pdf')
+								{
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
+								} else {
+									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+								}
+								print '</td>';
 
-	                            print "</tr>\n";
-	                        }
-                    	}
-                    }
-                }
-            }
-        }
-    }
+								print "</tr>\n";
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 }
 
 print '</table>';
 print "<br>";
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php
index 9ae01790bb2..0725cc83f18 100644
--- a/htdocs/admin/usergroup.php
+++ b/htdocs/admin/usergroup.php
@@ -57,7 +57,7 @@ if ($action == 'set_default')
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->USERGROUP_ADDON_PDF_ODT == "$value") dolibarr_del_const($db, 'USERGROUP_ADDON_PDF_ODT', $conf->entity);
+		if ($conf->global->USERGROUP_ADDON_PDF_ODT == "$value") dolibarr_del_const($db, 'USERGROUP_ADDON_PDF_ODT', $conf->entity);
 	}
 	$res = true;
 }
@@ -81,24 +81,24 @@ elseif ($action == 'setdoc')
 	$res = true;
 } elseif (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 {
-    $code = $reg[1];
-    if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
-    {
-        header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    } else {
-        dol_print_error($db);
-    }
+	$code = $reg[1];
+	if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	} else {
+		dol_print_error($db);
+	}
 } elseif (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 {
-    $code = $reg[1];
-    if (dolibarr_del_const($db, $code, $conf->entity) > 0)
-    {
-        header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    } else {
-        dol_print_error($db);
-    }
+	$code = $reg[1];
+	if (dolibarr_del_const($db, $code, $conf->entity) > 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	} else {
+		dol_print_error($db);
+	}
 }
 /*
  * View
@@ -113,7 +113,7 @@ print load_fiche_titre($langs->trans("UsersSetup"), $linkback, 'title_setup');
 
 $head = user_admin_prepare_head();
 
-dol_fiche_head($head, 'usergroupcard', $langs->trans("MenuUsersAndGroups"), -1, 'user');
+print dol_get_fiche_head($head, 'usergroupcard', $langs->trans("MenuUsersAndGroups"), -1, 'user');
 
 
 $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -157,110 +157,110 @@ clearstatcache();
 
 foreach ($dirmodels as $reldir)
 {
-    foreach (array('', '/doc') as $valdir)
-    {
-    	$dir = dol_buildpath($reldir."core/modules/usergroup".$valdir);
-        if (is_dir($dir))
-        {
-            $handle = opendir($dir);
-            if (is_resource($handle))
-            {
-                while (($file = readdir($handle)) !== false)
-                {
-                    $filelist[] = $file;
-                }
-                closedir($handle);
-                arsort($filelist);
+	foreach (array('', '/doc') as $valdir)
+	{
+		$dir = dol_buildpath($reldir."core/modules/usergroup".$valdir);
+		if (is_dir($dir))
+		{
+			$handle = opendir($dir);
+			if (is_resource($handle))
+			{
+				while (($file = readdir($handle)) !== false)
+				{
+					$filelist[] = $file;
+				}
+				closedir($handle);
+				arsort($filelist);
 
-                foreach ($filelist as $file)
-                {
-                    if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-                    {
-                    	if (file_exists($dir.'/'.$file))
-                    	{
-                    		$name = substr($file, 4, dol_strlen($file) - 16);
-	                        $classname = substr($file, 0, dol_strlen($file) - 12);
+				foreach ($filelist as $file)
+				{
+					if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
+					{
+						if (file_exists($dir.'/'.$file))
+						{
+							$name = substr($file, 4, dol_strlen($file) - 16);
+							$classname = substr($file, 0, dol_strlen($file) - 12);
 
-	                        require_once $dir.'/'.$file;
-	                        $module = new $classname($db);
+							require_once $dir.'/'.$file;
+							$module = new $classname($db);
 
-	                        $modulequalified = 1;
-	                        if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
-	                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+							$modulequalified = 1;
+							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
+							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
 
-	                        if ($modulequalified)
-	                        {
-	                            print '<tr class="oddeven"><td width="100">';
-	                            print (empty($module->name) ? $name : $module->name);
-	                            print "</td><td>\n";
-	                            if (method_exists($module, 'info')) print $module->info($langs);
-	                            else print $module->description;
-	                            print '</td>';
+							if ($modulequalified)
+							{
+								print '<tr class="oddeven"><td width="100">';
+								print (empty($module->name) ? $name : $module->name);
+								print "</td><td>\n";
+								if (method_exists($module, 'info')) print $module->info($langs);
+								else print $module->description;
+								print '</td>';
 
-	                            // Active
-	                            if (in_array($name, $def))
-	                            {
-	                            	print '<td class="center">'."\n";
-	                            	print '<a href="'.$_SERVER["PHP_SELF"].'?action=del_default&amp;token='.newToken().'&amp;value='.$name.'">';
-	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
-	                            	print '</a>';
-	                            	print '</td>';
-	                            } else {
-	                                print '<td class="center">'."\n";
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set_default&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-	                                print "</td>";
-	                            }
+								// Active
+								if (in_array($name, $def))
+								{
+									print '<td class="center">'."\n";
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=del_default&amp;token='.newToken().'&amp;value='.$name.'">';
+									print img_picto($langs->trans("Enabled"), 'switch_on');
+									print '</a>';
+									print '</td>';
+								} else {
+									print '<td class="center">'."\n";
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=set_default&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print "</td>";
+								}
 
-	                            // Defaut
-	                            print '<td class="center">';
-	                            if ($conf->global->USERGROUP_ADDON_PDF == $name)
-	                            {
-	                                print img_picto($langs->trans("Default"), 'on');
-	                            } else {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	                            }
-	                            print '</td>';
+								// Defaut
+								print '<td class="center">';
+								if ($conf->global->USERGROUP_ADDON_PDF == $name)
+								{
+									print img_picto($langs->trans("Default"), 'on');
+								} else {
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+								}
+								print '</td>';
 
-	                            // Info
-		    					$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
-					    		$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-			                    if ($module->type == 'pdf')
-			                    {
-			                        $htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-			                    }
-					    		$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-					    		$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
-					    		$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
+								// Info
+								$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+								$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+								if ($module->type == 'pdf')
+								{
+									$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+								}
+								$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+								$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+								$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
 
 
-	                            print '<td class="center">';
-	                            print $form->textwithpicto('', $htmltooltip, 1, 0);
-	                            print '</td>';
+								print '<td class="center">';
+								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print '</td>';
 
-	                            // Preview
-	                            print '<td class="center">';
-	                            if ($module->type == 'pdf')
-	                            {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
-	                            } else {
-	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
-	                            }
-	                            print '</td>';
+								// Preview
+								print '<td class="center">';
+								if ($module->type == 'pdf')
+								{
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
+								} else {
+									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+								}
+								print '</td>';
 
-	                            print "</tr>\n";
-	                        }
-                    	}
-                    }
-                }
-            }
-        }
-    }
+								print "</tr>\n";
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 }
 
 print '</table>';
 print "<br>";
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index b8520ecc227..0ca4be65910 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -124,252 +124,252 @@ $sourceList = array();
 // Actions add or modify a website
 if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 {
-    $listfield = explode(',', $tabfield[$id]);
-    $listfieldinsert = explode(',', $tabfieldinsert[$id]);
-    $listfieldmodify = explode(',', $tabfieldinsert[$id]);
-    $listfieldvalue = explode(',', $tabfieldvalue[$id]);
+	$listfield = explode(',', $tabfield[$id]);
+	$listfieldinsert = explode(',', $tabfieldinsert[$id]);
+	$listfieldmodify = explode(',', $tabfieldinsert[$id]);
+	$listfieldvalue = explode(',', $tabfieldvalue[$id]);
 
-    // Check that all fields are filled
-    $ok = 1;
-    foreach ($listfield as $f => $value)
-    {
-    	if ($value == 'ref' && (!GETPOSTISSET($value) || GETPOST($value) == ''))
-	    {
-    	    $ok = 0;
-        	$fieldnamekey = $listfield[$f];
-	        setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
-	        break;
-    	} elseif ($value == 'ref' && !preg_match('/^[a-z0-9_\-\.]+$/i', $_POST[$value]))
-	    {
+	// Check that all fields are filled
+	$ok = 1;
+	foreach ($listfield as $f => $value)
+	{
+		if ($value == 'ref' && (!GETPOSTISSET($value) || GETPOST($value) == ''))
+		{
 			$ok = 0;
-    	    $fieldnamekey = $listfield[$f];
+			$fieldnamekey = $listfield[$f];
+			setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
+			break;
+		} elseif ($value == 'ref' && !preg_match('/^[a-z0-9_\-\.]+$/i', $_POST[$value]))
+		{
+			$ok = 0;
+			$fieldnamekey = $listfield[$f];
 			setEventMessages($langs->transnoentities("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities($fieldnamekey)), null, 'errors');
 			break;
-	    }
-    }
+		}
+	}
 
-    // Clean parameters
-    if (!empty($_POST['ref']))
-    {
-    	$websitekey = strtolower($_POST['ref']);
-    }
+	// Clean parameters
+	if (!empty($_POST['ref']))
+	{
+		$websitekey = strtolower($_POST['ref']);
+	}
 
-    // Si verif ok et action add, on ajoute la ligne
-    if ($ok && GETPOST('actionadd', 'alpha'))
-    {
-        if ($tabrowid[$id])
-        {
-            // Recupere id libre pour insertion
-            $newid = 0;
-            $sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
-            $result = $db->query($sql);
-            if ($result)
-            {
-                $obj = $db->fetch_object($result);
-                $newid = ($obj->newid + 1);
-            } else {
-                dol_print_error($db);
-            }
-        }
+	// Si verif ok et action add, on ajoute la ligne
+	if ($ok && GETPOST('actionadd', 'alpha'))
+	{
+		if ($tabrowid[$id])
+		{
+			// Recupere id libre pour insertion
+			$newid = 0;
+			$sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
+			$result = $db->query($sql);
+			if ($result)
+			{
+				$obj = $db->fetch_object($result);
+				$newid = ($obj->newid + 1);
+			} else {
+				dol_print_error($db);
+			}
+		}
 
-        /* $website=new Website($db);
+		/* $website=new Website($db);
         $website->ref=
         $website->description=
         $website->virtualhost=
         $website->create($user); */
 
-        // Add new entry
-        $sql = "INSERT INTO ".$tabname[$id]." (";
-        // List of fields
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
-        	$sql .= $tabrowid[$id].",";
-        $sql .= $tabfieldinsert[$id];
-        $sql .= ",status)";
-        $sql .= " VALUES(";
+		// Add new entry
+		$sql = "INSERT INTO ".$tabname[$id]." (";
+		// List of fields
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
+			$sql .= $tabrowid[$id].",";
+		$sql .= $tabfieldinsert[$id];
+		$sql .= ",status)";
+		$sql .= " VALUES(";
 
-        // List of values
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
-        	$sql .= $newid.",";
-        $i = 0;
-        foreach ($listfieldinsert as $f => $value)
-        {
-            if ($value == 'entity') {
-            	$_POST[$listfieldvalue[$i]] = $conf->entity;
-            }
-            if ($value == 'ref') {
-            	$_POST[$listfieldvalue[$i]] = strtolower($_POST[$listfieldvalue[$i]]);
-            }
-            if ($i) $sql .= ",";
-            if ($_POST[$listfieldvalue[$i]] == '') $sql .= "null";
-            else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
-            $i++;
-        }
-        $sql .= ",1)";
+		// List of values
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
+			$sql .= $newid.",";
+		$i = 0;
+		foreach ($listfieldinsert as $f => $value)
+		{
+			if ($value == 'entity') {
+				$_POST[$listfieldvalue[$i]] = $conf->entity;
+			}
+			if ($value == 'ref') {
+				$_POST[$listfieldvalue[$i]] = strtolower($_POST[$listfieldvalue[$i]]);
+			}
+			if ($i) $sql .= ",";
+			if ($_POST[$listfieldvalue[$i]] == '') $sql .= "null";
+			else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+			$i++;
+		}
+		$sql .= ",1)";
 
-        dol_syslog("actionadd", LOG_DEBUG);
-        $result = $db->query($sql);
-        if ($result)	// Add is ok
-        {
-            setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
-        	unset($_POST); // Clean $_POST array, we keep only
-        } else {
-            if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-                setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
-            } else {
-                dol_print_error($db);
-            }
-        }
-    }
+		dol_syslog("actionadd", LOG_DEBUG);
+		$result = $db->query($sql);
+		if ($result)	// Add is ok
+		{
+			setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
+			unset($_POST); // Clean $_POST array, we keep only
+		} else {
+			if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
+			} else {
+				dol_print_error($db);
+			}
+		}
+	}
 
-    // Si verif ok et action modify, on modifie la ligne
-    if ($ok && GETPOST('actionmodify', 'alpha'))
-    {
-        if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	// Si verif ok et action modify, on modifie la ligne
+	if ($ok && GETPOST('actionmodify', 'alpha'))
+	{
+		if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-        $db->begin();
+		$db->begin();
 
-        $website = new Website($db);
-        $rowid = GETPOST('rowid', 'int');
-        $website->fetch($rowid);
+		$website = new Website($db);
+		$rowid = GETPOST('rowid', 'int');
+		$website->fetch($rowid);
 
-        // Modify entry
-        $sql = "UPDATE ".$tabname[$id]." SET ";
-        // Modifie valeur des champs
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify))
-        {
-            $sql .= $tabrowid[$id]."=";
-            $sql .= "'".$db->escape($rowid)."', ";
-        }
-        $i = 0;
-        foreach ($listfieldmodify as $field)
-        {
-            if ($field == 'entity') {
-            	$_POST[$listfieldvalue[$i]] = $conf->entity;
-            }
-            if ($i) $sql .= ",";
-            $sql .= $field."=";
-            if ($_POST[$listfieldvalue[$i]] == '') $sql .= "null";
-            else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
-            $i++;
-        }
-        $sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
+		// Modify entry
+		$sql = "UPDATE ".$tabname[$id]." SET ";
+		// Modifie valeur des champs
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify))
+		{
+			$sql .= $tabrowid[$id]."=";
+			$sql .= "'".$db->escape($rowid)."', ";
+		}
+		$i = 0;
+		foreach ($listfieldmodify as $field)
+		{
+			if ($field == 'entity') {
+				$_POST[$listfieldvalue[$i]] = $conf->entity;
+			}
+			if ($i) $sql .= ",";
+			$sql .= $field."=";
+			if ($_POST[$listfieldvalue[$i]] == '') $sql .= "null";
+			else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+			$i++;
+		}
+		$sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
 
-        dol_syslog("actionmodify", LOG_DEBUG);
-        //print $sql;
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $newname = dol_sanitizeFileName(GETPOST('ref', 'aZ09'));
-            if ($newname != $website->ref)
-            {
-	            $srcfile = DOL_DATA_ROOT.'/website/'.$website->ref;
-	            $destfile = DOL_DATA_ROOT.'/website/'.$newname;
+		dol_syslog("actionmodify", LOG_DEBUG);
+		//print $sql;
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$newname = dol_sanitizeFileName(GETPOST('ref', 'aZ09'));
+			if ($newname != $website->ref)
+			{
+				$srcfile = DOL_DATA_ROOT.'/website/'.$website->ref;
+				$destfile = DOL_DATA_ROOT.'/website/'.$newname;
 
-            	if (dol_is_dir($destfile))
-            	{
-            		$error++;
-            		setEventMessages($langs->trans('ErrorDirAlreadyExists', $destfile), null, 'errors');
-            	} else {
-	                @rename($srcfile, $destfile);
+				if (dol_is_dir($destfile))
+				{
+					$error++;
+					setEventMessages($langs->trans('ErrorDirAlreadyExists', $destfile), null, 'errors');
+				} else {
+					@rename($srcfile, $destfile);
 
-		            // We must now rename $website->ref into $newname inside files
-		            $arrayreplacement = array($website->ref.'/htmlheader.html' => $newname.'/htmlheader.html');
-		            $listofilestochange = dol_dir_list($destfile, 'files', 0, '\.php$');
+					// We must now rename $website->ref into $newname inside files
+					$arrayreplacement = array($website->ref.'/htmlheader.html' => $newname.'/htmlheader.html');
+					$listofilestochange = dol_dir_list($destfile, 'files', 0, '\.php$');
 					foreach ($listofilestochange as $key => $value)
-		            {
-		            	dolReplaceInFile($value['fullname'], $arrayreplacement);
-		            }
-            	}
-            }
-        } else {
-        	$error++;
-            setEventMessages($db->lasterror(), null, 'errors');
-        }
+					{
+						dolReplaceInFile($value['fullname'], $arrayreplacement);
+					}
+				}
+			}
+		} else {
+			$error++;
+			setEventMessages($db->lasterror(), null, 'errors');
+		}
 
-        if (!$error)
-        {
-        	$db->commit();
-        } else {
-        	$db->rollback();
-        }
-    }
-    //$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
+		if (!$error)
+		{
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
+	}
+	//$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
 }
 
 if (GETPOST('actioncancel', 'alpha'))
 {
-    //$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
+	//$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
 }
 
 if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    $website = new Website($db);
-    $website->fetch($rowid);
+	$website = new Website($db);
+	$website->fetch($rowid);
 
-    if ($website->id > 0)
-    {
-    	$sql = "DELETE from ".MAIN_DB_PREFIX."website_account WHERE fk_website = ".((int) $rowid);
-    	$result = $db->query($sql);
+	if ($website->id > 0)
+	{
+		$sql = "DELETE from ".MAIN_DB_PREFIX."website_account WHERE fk_website = ".((int) $rowid);
+		$result = $db->query($sql);
 
-    	$sql = "DELETE from ".MAIN_DB_PREFIX."website_page WHERE fk_website = ".((int) $rowid);
-    	$result = $db->query($sql);
+		$sql = "DELETE from ".MAIN_DB_PREFIX."website_page WHERE fk_website = ".((int) $rowid);
+		$result = $db->query($sql);
 
-    	$sql = "DELETE from ".MAIN_DB_PREFIX."website_extrafields WHERE fk_object = ".((int) $rowid);
-    	$result = $db->query($sql);
+		$sql = "DELETE from ".MAIN_DB_PREFIX."website_extrafields WHERE fk_object = ".((int) $rowid);
+		$result = $db->query($sql);
 
-    	$sql = "DELETE from ".MAIN_DB_PREFIX."website WHERE rowid = ".((int) $rowid);
-	    $result = $db->query($sql);
-	    if (!$result)
-	    {
-	        if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
-	        {
-	            setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
-	        } else {
-	            dol_print_error($db);
-	        }
-	    }
+		$sql = "DELETE from ".MAIN_DB_PREFIX."website WHERE rowid = ".((int) $rowid);
+		$result = $db->query($sql);
+		if (!$result)
+		{
+			if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
+			{
+				setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
+			} else {
+				dol_print_error($db);
+			}
+		}
 
-	    if ($website->ref)
-	    {
-	    	dol_delete_dir_recursive($conf->website->dir_output.'/'.$website->ref);
-	    }
-    } else {
-    	dol_print_error($db, 'Failed to load website with id '.$rowid);
-    }
+		if ($website->ref)
+		{
+			dol_delete_dir_recursive($conf->website->dir_output.'/'.$website->ref);
+		}
+	} else {
+		dol_print_error($db, 'Failed to load website with id '.$rowid);
+	}
 }
 
 // activate
 if ($action == $acts[0])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET status = 1 WHERE rowid = ".((int) $rowid);
-    }
+	if ($rowid) {
+		$sql = "UPDATE ".$tabname[$id]." SET status = 1 WHERE rowid = ".((int) $rowid);
+	}
 
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		dol_print_error($db);
+	}
 }
 
 // disable
 if ($action == $acts[1])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET status = 0 WHERE rowid = ".((int) $rowid);
-    }
+	if ($rowid) {
+		$sql = "UPDATE ".$tabname[$id]." SET status = 0 WHERE rowid = ".((int) $rowid);
+	}
 
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		dol_print_error($db);
+	}
 }
 
 
@@ -401,7 +401,7 @@ $head[$h][1] = $langs->trans("Options");
 $head[$h][2] = 'options';
 $h++;
 
-dol_fiche_head($head, 'website', '', -1);
+print dol_get_fiche_head($head, 'website', '', -1);
 
 
 print '<span class="opacitymedium">'.$langs->trans("WebsiteSetupDesc").'</span><br>';
@@ -411,7 +411,7 @@ print "<br>\n";
 // Confirmation de la suppression de la ligne
 if ($action == 'delete')
 {
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid, $langs->trans('DeleteWebsite'), $langs->trans('ConfirmDeleteWebsite'), 'confirm_delete', '', 0, 1, 220);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid, $langs->trans('DeleteWebsite'), $langs->trans('ConfirmDeleteWebsite'), 'confirm_delete', '', 0, 1, 220);
 }
 //var_dump($elementList);
 
@@ -420,208 +420,208 @@ if ($action == 'delete')
  */
 if ($id)
 {
-    // Complete requete recherche valeurs avec critere de tri
-    $sql = $tabsql[$id];
-    $sql .= $db->order($sortfield, $sortorder);
-    $sql .= $db->plimit($limit + 1, $offset);
-    //print $sql;
+	// Complete requete recherche valeurs avec critere de tri
+	$sql = $tabsql[$id];
+	$sql .= $db->order($sortfield, $sortorder);
+	$sql .= $db->plimit($limit + 1, $offset);
+	//print $sql;
 
-    $fieldlist = explode(',', $tabfield[$id]);
+	$fieldlist = explode(',', $tabfield[$id]);
 
-    print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<table class="noborder centpercent">';
+	print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<table class="noborder centpercent">';
 
-    // Form to add a new line
-    if ($tabname[$id])
-    {
-        $alabelisused = 0;
-        $var = false;
+	// Form to add a new line
+	if ($tabname[$id])
+	{
+		$alabelisused = 0;
+		$var = false;
 
-        $fieldlist = explode(',', $tabfield[$id]);
+		$fieldlist = explode(',', $tabfield[$id]);
 
-        // Line for title
-        print '<tr class="liste_titre">';
-        foreach ($fieldlist as $field => $value)
-        {
-            // Determine le nom du champ par rapport aux noms possibles
-            // dans les dictionnaires de donnees
-            $valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
-            $valuetoshow = $langs->trans($valuetoshow); // try to translate
-            $align = '';
-            if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
-            if ($valuetoshow != '')
-            {
-                print '<td class="'.$align.'">';
-            	if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
-            	elseif (!empty($tabhelp[$id][$value]))
-           		{
-           			if ($value == 'virtualhost') print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, 'tooltipvirtual');
-           			else print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
-           		} else print $valuetoshow;
-                print '</td>';
-            }
-            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') $alabelisused = 1;
-        }
+		// Line for title
+		print '<tr class="liste_titre">';
+		foreach ($fieldlist as $field => $value)
+		{
+			// Determine le nom du champ par rapport aux noms possibles
+			// dans les dictionnaires de donnees
+			$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
+			$valuetoshow = $langs->trans($valuetoshow); // try to translate
+			$align = '';
+			if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
+			if ($valuetoshow != '')
+			{
+				print '<td class="'.$align.'">';
+				if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+				elseif (!empty($tabhelp[$id][$value]))
+		   		{
+		   			if ($value == 'virtualhost') print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, 'tooltipvirtual');
+		   			else print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
+		   		} else print $valuetoshow;
+				print '</td>';
+			}
+			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') $alabelisused = 1;
+		}
 
-        print '<td colspan="4">';
-        print '</td>';
-        print '</tr>';
+		print '<td colspan="4">';
+		print '</td>';
+		print '</tr>';
 
-        // Line to enter new values
-        print "<tr ".$bcnd[$var].">";
+		// Line to enter new values
+		print "<tr ".$bcnd[$var].">";
 
-        $obj = new stdClass();
-        // If data was already input, we define them in obj to populate input fields.
-        if (GETPOST('actionadd', 'alpha'))
-        {
-            foreach ($fieldlist as $key=>$val)
-            {
-                if (GETPOST($val, 'alpha'))
-                	$obj->$val = GETPOST($val);
-            }
-        }
+		$obj = new stdClass();
+		// If data was already input, we define them in obj to populate input fields.
+		if (GETPOST('actionadd', 'alpha'))
+		{
+			foreach ($fieldlist as $key=>$val)
+			{
+				if (GETPOST($val, 'alpha'))
+					$obj->$val = GETPOST($val);
+			}
+		}
 
-        fieldListWebsites($fieldlist, $obj, $tabname[$id], 'add');
+		fieldListWebsites($fieldlist, $obj, $tabname[$id], 'add');
 
-        print '<td colspan="3" class="right">';
-        if ($action != 'edit')
-        {
-        	print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
-        }
-        print '</td>';
-        print "</tr>";
+		print '<td colspan="3" class="right">';
+		if ($action != 'edit')
+		{
+			print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
+		}
+		print '</td>';
+		print "</tr>";
 
-        $colspan = count($fieldlist) + 2;
-    }
+		$colspan = count($fieldlist) + 2;
+	}
 
-    print '</table>';
-    print '</form>';
+	print '</table>';
+	print '</form>';
 
 
-    // List of websites in database
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
-        if ($num)
-        {
-            print '<br>';
+	// List of websites in database
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+		if ($num)
+		{
+			print '<br>';
 
-            print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            print '<input type="hidden" name="page" value="'.$page.'">';
-            print '<input type="hidden" name="rowid" value="'.$rowid.'">';
+			print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="page" value="'.$page.'">';
+			print '<input type="hidden" name="rowid" value="'.$rowid.'">';
 
-            print '<table class="noborder centpercent">';
+			print '<table class="noborder centpercent">';
 
-            // Title of lines
-            print '<tr class="liste_titre">';
-            foreach ($fieldlist as $field => $value)
-            {
-                // Determine le nom du champ par rapport aux noms possibles
-                // dans les dictionnaires de donnees
-                $showfield = 1; // Par defaut
-                $align = "left";
-                $sortable = 1;
-                $valuetoshow = '';
-                /*
+			// Title of lines
+			print '<tr class="liste_titre">';
+			foreach ($fieldlist as $field => $value)
+			{
+				// Determine le nom du champ par rapport aux noms possibles
+				// dans les dictionnaires de donnees
+				$showfield = 1; // Par defaut
+				$align = "left";
+				$sortable = 1;
+				$valuetoshow = '';
+				/*
                 $tmparray=getLabelOfField($fieldlist[$field]);
                 $showfield=$tmp['showfield'];
                 $valuetoshow=$tmp['valuetoshow'];
                 $align=$tmp['align'];
                 $sortable=$tmp['sortable'];
 				*/
-                $valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
-                $valuetoshow = $langs->trans($valuetoshow); // try to translate
-                if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
-                if ($fieldlist[$field] == 'type') { $valuetoshow = $langs->trans("Type"); }
-                if ($fieldlist[$field] == 'code') { $valuetoshow = $langs->trans("Code"); }
+				$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
+				$valuetoshow = $langs->trans($valuetoshow); // try to translate
+				if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
+				if ($fieldlist[$field] == 'type') { $valuetoshow = $langs->trans("Type"); }
+				if ($fieldlist[$field] == 'code') { $valuetoshow = $langs->trans("Code"); }
 
-                // Affiche nom du champ
-                if ($showfield)
-                {
-                    print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), "", "align=".$align, $sortfield, $sortorder);
-                }
-            }
+				// Affiche nom du champ
+				if ($showfield)
+				{
+					print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), "", "align=".$align, $sortfield, $sortorder);
+				}
+			}
 
 			print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "status", ($page ? 'page='.$page.'&' : ''), "", 'align="center"', $sortfield, $sortorder);
-            print getTitleFieldOfList('');
-            print getTitleFieldOfList('');
-            print '</tr>';
+			print getTitleFieldOfList('');
+			print getTitleFieldOfList('');
+			print '</tr>';
 
-            // Lines with values
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
-                //print_r($obj);
-                print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
-                if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code)))
-                {
-                    $tmpaction = 'edit';
-                    $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-                    $reshook = $hookmanager->executeHooks('editWebsiteFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
-                    $error = $hookmanager->error; $errors = $hookmanager->errors;
+			// Lines with values
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
+				//print_r($obj);
+				print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
+				if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code)))
+				{
+					$tmpaction = 'edit';
+					$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+					$reshook = $hookmanager->executeHooks('editWebsiteFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+					$error = $hookmanager->error; $errors = $hookmanager->errors;
 
-                    if (empty($reshook)) fieldListWebsites($fieldlist, $obj, $tabname[$id], 'edit');
+					if (empty($reshook)) fieldListWebsites($fieldlist, $obj, $tabname[$id], 'edit');
 
-                    print '<td colspan="3" class="right"><a name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
-                    print '&nbsp;<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
-                } else {
-	              	$tmpaction = 'view';
-                    $parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-                    $reshook = $hookmanager->executeHooks('viewWebsiteFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+					print '<td colspan="3" class="right"><a name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+					print '&nbsp;<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
+				} else {
+				  	$tmpaction = 'view';
+					$parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+					$reshook = $hookmanager->executeHooks('viewWebsiteFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 
-                    $error = $hookmanager->error; $errors = $hookmanager->errors;
+					$error = $hookmanager->error; $errors = $hookmanager->errors;
 
-                    if (empty($reshook))
-                    {
-                        foreach ($fieldlist as $field => $value)
-                        {
-                            $showfield = 1;
-                        	$align = "left";
-                        	$fieldname = $fieldlist[$field];
-                            $valuetoshow = $obj->$fieldname;
+					if (empty($reshook))
+					{
+						foreach ($fieldlist as $field => $value)
+						{
+							$showfield = 1;
+							$align = "left";
+							$fieldname = $fieldlist[$field];
+							$valuetoshow = $obj->$fieldname;
 
 							// Show value for field
 							if ($showfield) print '<td align="'.$align.'">'.$valuetoshow.'</td>';
-                        }
-                    }
+						}
+					}
 
-                    // Can an entry be erased or disabled ?
-                    $iserasable = 1; $isdisable = 1; // true by default
-                    if ($obj->status) $iserasable = 0; // We can't delete a website on. Disable it first.
+					// Can an entry be erased or disabled ?
+					$iserasable = 1; $isdisable = 1; // true by default
+					if ($obj->status) $iserasable = 0; // We can't delete a website on. Disable it first.
 
-                    $url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')).'&amp;code='.(!empty($obj->code) ?urlencode($obj->code) : '').'&amp;';
+					$url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')).'&amp;code='.(!empty($obj->code) ?urlencode($obj->code) : '').'&amp;';
 
-                    // Active
-                    print '<td align="center" class="nowrap">';
-                    print '<a class="reposition" href="'.$url.'action='.$acts[($obj->status ? 1 : 0)].'">'.$actl[($obj->status ? 1 : 0)].'</a>';
-                    print "</td>";
+					// Active
+					print '<td align="center" class="nowrap">';
+					print '<a class="reposition" href="'.$url.'action='.$acts[($obj->status ? 1 : 0)].'">'.$actl[($obj->status ? 1 : 0)].'</a>';
+					print "</td>";
 
-                    // Modify link
-                    print '<td align="center"><a class="reposition" href="'.$url.'action=edit&token='.newToken().'">'.img_edit().'</a></td>';
+					// Modify link
+					print '<td align="center"><a class="reposition" href="'.$url.'action=edit&token='.newToken().'">'.img_edit().'</a></td>';
 
-                    // Delete link
-                    if ($iserasable) print '<td align="center"><a class="reposition" href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a></td>';
-                    else print '<td class="center">'.img_delete($langs->trans("DisableSiteFirst"), 'class="opacitymedium"').'</td>';
+					// Delete link
+					if ($iserasable) print '<td align="center"><a class="reposition" href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a></td>';
+					else print '<td class="center">'.img_delete($langs->trans("DisableSiteFirst"), 'class="opacitymedium"').'</td>';
 
-                    print "</tr>\n";
-                }
-                $i++;
-            }
+					print "</tr>\n";
+				}
+				$i++;
+			}
 
-            print '</table>';
+			print '</table>';
 
-            print '</form>';
-        }
-    } else {
-        dol_print_error($db);
-    }
+			print '</form>';
+		}
+	} else {
+		dol_print_error($db);
+	}
 }
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
@@ -649,7 +649,7 @@ function fieldListWebsites($fieldlist, $obj = '', $tabname = '', $context = '')
 
 	foreach ($fieldlist as $field => $value)
 	{
-	    $fieldname = $fieldlist[$field];
+		$fieldname = $fieldlist[$field];
 		if ($fieldlist[$field] == 'lang')
 		{
 			print '<td>';
diff --git a/htdocs/admin/website_options.php b/htdocs/admin/website_options.php
index 1df7642b646..8c803defb37 100644
--- a/htdocs/admin/website_options.php
+++ b/htdocs/admin/website_options.php
@@ -94,7 +94,7 @@ $head[$h][1] = $langs->trans("Options");
 $head[$h][2] = 'options';
 $h++;
 
-dol_fiche_head($head, 'options', '', -1);
+print dol_get_fiche_head($head, 'options', '', -1);
 
 
 if ($action == 'edit')
@@ -116,7 +116,7 @@ if ($action == 'edit')
 	print '</table>';
 
 	print '<br><div class="center">';
-	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
+	print '<input class="button button-save" type="submit" value="'.$langs->trans("Save").'">';
 	print '</div>';
 
 	print '</form>';
@@ -140,7 +140,7 @@ if ($action == 'edit')
 }
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index a8bcbcf8172..6bd3edca2b8 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -139,7 +139,7 @@ if (!empty($conf->modules_parts['workflow']) && is_array($conf->modules_parts['w
 }
 
 // remove not available workflows (based on activated modules and global defined keys)
-$workflowcodes  = array_filter($workflowcodes, function ($var) {
+$workflowcodes = array_filter($workflowcodes, function ($var) {
 	return $var['enabled']; });
 
 /*
diff --git a/htdocs/api/admin/explorer.php b/htdocs/api/admin/explorer.php
index 22263b8b9ba..835a5485544 100644
--- a/htdocs/api/admin/explorer.php
+++ b/htdocs/api/admin/explorer.php
@@ -43,10 +43,10 @@ $langs->load("admin");
 // Enable and test if module Api is enabled
 if (empty($conf->global->MAIN_MODULE_API))
 {
-    dol_syslog("Call Dolibarr API interfaces with module REST disabled");
-    print $langs->trans("WarningModuleNotActive", 'Api').'.<br><br>';
-    print $langs->trans("ToActivateModule");
-    exit;
+	dol_syslog("Call Dolibarr API interfaces with module REST disabled");
+	print $langs->trans("WarningModuleNotActive", 'Api').'.<br><br>';
+	print $langs->trans("ToActivateModule");
+	exit;
 }
 
 
@@ -61,45 +61,45 @@ $listofapis = array();
 $modulesdir = dolGetModulesDirs();
 foreach ($modulesdir as $dir)
 {
-    /*
+	/*
      * Search available module
      */
-    //dol_syslog("Scan directory ".$dir." for API modules");
+	//dol_syslog("Scan directory ".$dir." for API modules");
 
-    $handle = @opendir(dol_osencode($dir));
-    if (is_resource($handle))
-    {
-        while (($file = readdir($handle)) !== false)
-        {
-            if (is_readable($dir.$file) && preg_match("/^(mod.*)\.class\.php$/i", $file, $reg))
-            {
-                $modulename = $reg[1];
+	$handle = @opendir(dol_osencode($dir));
+	if (is_resource($handle))
+	{
+		while (($file = readdir($handle)) !== false)
+		{
+			if (is_readable($dir.$file) && preg_match("/^(mod.*)\.class\.php$/i", $file, $reg))
+			{
+				$modulename = $reg[1];
 
-                // Defined if module is enabled
-                $enabled = true;
-                $module = $part = $obj = strtolower(preg_replace('/^mod/i', '', $modulename));
-                //if ($part == 'propale') $part='propal';
-                if ($module == 'societe') {
+				// Defined if module is enabled
+				$enabled = true;
+				$module = $part = $obj = strtolower(preg_replace('/^mod/i', '', $modulename));
+				//if ($part == 'propale') $part='propal';
+				if ($module == 'societe') {
 					$obj = 'thirdparty';
 				}
-                if ($module == 'categorie') {
-                    $part = 'categories';
+				if ($module == 'categorie') {
+					$part = 'categories';
 					$obj = 'category';
 				}
-                if ($module == 'facture') {
-                    $part = 'compta/facture';
+				if ($module == 'facture') {
+					$part = 'compta/facture';
 					$obj = 'facture';
 				}
-                if ($module == 'ficheinter') {
-                    $obj = 'fichinter';
-                    $part = 'fichinter';
-                    $module = 'fichinter';
-                }
+				if ($module == 'ficheinter') {
+					$obj = 'fichinter';
+					$part = 'fichinter';
+					$module = 'fichinter';
+				}
 
-                if (empty($conf->$module->enabled)) $enabled = false;
+				if (empty($conf->$module->enabled)) $enabled = false;
 
-                if ($enabled) {
-                    /*
+				if ($enabled) {
+					/*
                      * If exists, load the API class for enable module
                      *
                      * Search files named api_<object>.class.php into /htdocs/<module>/class directory
@@ -107,25 +107,25 @@ foreach ($modulesdir as $dir)
                      * @todo : take care of externals module!
                      * @todo : use getElementProperties() function ?
                      */
-                    $dir_part = DOL_DOCUMENT_ROOT.'/'.$part.'/class/';
+					$dir_part = DOL_DOCUMENT_ROOT.'/'.$part.'/class/';
 
-                    $handle_part = @opendir(dol_osencode($dir_part));
-                    if (is_resource($handle_part))
-                    {
-                        while (($file_searched = readdir($handle_part)) !== false)
-                        {
-                            if (is_readable($dir_part.$file_searched) && preg_match("/^api_(.*)\.class\.php$/i", $file_searched, $reg))
-                            {
-                                $classname = ucwords($reg[1]);
-                                require_once $dir_part.$file_searched;
-                                if (class_exists($classname))
-                                {
-                                    dol_syslog("Found API classname=".$classname." into ".$dir);
-                                    $listofapis[] = $classname;
-                                }
-                            }
+					$handle_part = @opendir(dol_osencode($dir_part));
+					if (is_resource($handle_part))
+					{
+						while (($file_searched = readdir($handle_part)) !== false)
+						{
+							if (is_readable($dir_part.$file_searched) && preg_match("/^api_(.*)\.class\.php$/i", $file_searched, $reg))
+							{
+								$classname = ucwords($reg[1]);
+								require_once $dir_part.$file_searched;
+								if (class_exists($classname))
+								{
+									dol_syslog("Found API classname=".$classname." into ".$dir);
+									$listofapis[] = $classname;
+								}
+							}
 
-                            /*
+							/*
                             if (is_readable($dir_part.$file_searched) && preg_match("/^(api_.*)\.class\.php$/i",$file_searched,$reg))
                             {
                                 $classname=$reg[1];
@@ -150,12 +150,12 @@ foreach ($modulesdir as $dir)
                                 //     //$listofapis[]=array('classname'=>$classname, 'fullpath'=>$file_searched);
                                 // }
                             }*/
-                        }
-                    }
-                }
-            }
-        }
-    }
+						}
+					}
+				}
+			}
+		}
+	}
 }
 
 //var_dump($listofapis);
@@ -188,28 +188,28 @@ $oldclass = '';
 print $langs->trans("ListOfAvailableAPIs").':<br>';
 foreach ($listofapis['v1'] as $key => $val)
 {
-    if ($key == 'login') continue;
-    if ($key == 'index') continue;
+	if ($key == 'login') continue;
+	if ($key == 'index') continue;
 
-    if ($key)
-    {
-        foreach ($val as $method => $val2)
-        {
-            $newclass = $val2['className'];
+	if ($key)
+	{
+		foreach ($val as $method => $val2)
+		{
+			$newclass = $val2['className'];
 
-            if (preg_match('/restler/i', $newclass)) continue;
+			if (preg_match('/restler/i', $newclass)) continue;
 
-            if ($oldclass != $newclass)
-            {
-                print "\n<br>\n".$langs->trans("Class").': '.$newclass.'<br>'."\n";
-                $oldclass = $newclass;
-            }
-            //print $key.' - '.$val['classname'].' - '.$val['fullpath']." - ".DOL_MAIN_URL_ROOT.'/api/index.php/'.strtolower(preg_replace('/Api$/','',$val['classname']))."/xxx<br>\n";
-            $url = $urlwithroot.'/api/index.php/'.$key;
-            $url .= '?api_key=token';
-            print img_picto('', 'globe').' '.$method.' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
-        }
-    }
+			if ($oldclass != $newclass)
+			{
+				print "\n<br>\n".$langs->trans("Class").': '.$newclass.'<br>'."\n";
+				$oldclass = $newclass;
+			}
+			//print $key.' - '.$val['classname'].' - '.$val['fullpath']." - ".DOL_MAIN_URL_ROOT.'/api/index.php/'.strtolower(preg_replace('/Api$/','',$val['classname']))."/xxx<br>\n";
+			$url = $urlwithroot.'/api/index.php/'.$key;
+			$url .= '?api_key=token';
+			print img_picto('', 'globe').' '.$method.' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
+		}
+	}
 }
 
 print '<br>';
diff --git a/htdocs/api/admin/index.php b/htdocs/api/admin/index.php
index a7eab61211d..1d15d5b9e75 100644
--- a/htdocs/api/admin/index.php
+++ b/htdocs/api/admin/index.php
@@ -64,11 +64,11 @@ if ($action == 'setproductionmode')
 			}
 		}
 
-	    if (!$error)
-	    {
-    		header("Location: ".$_SERVER["PHP_SELF"]);
-	   	    exit;
-	    }
+		if (!$error)
+		{
+			header("Location: ".$_SERVER["PHP_SELF"]);
+	   		exit;
+		}
 	} else {
 		dol_print_error($db);
 	}
@@ -112,13 +112,13 @@ print '<td>'.$langs->trans("ApiProductionMode").'</td>';
 $production_mode = (empty($conf->global->API_PRODUCTION_MODE) ?false:true);
 if ($production_mode)
 {
-    print '<td><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&token='.newToken().'&value='.($i + 1).'&status=0">';
-    print img_picto($langs->trans("Activated"), 'switch_on');
-    print '</a></td>';
+	print '<td><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&token='.newToken().'&value='.($i + 1).'&status=0">';
+	print img_picto($langs->trans("Activated"), 'switch_on');
+	print '</a></td>';
 } else {
-    print '<td><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&token='.newToken().'&value='.($i + 1).'&status=1">';
-    print img_picto($langs->trans("Disabled"), 'switch_off');
-    print '</a></td>';
+	print '<td><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&token='.newToken().'&value='.($i + 1).'&status=1">';
+	print img_picto($langs->trans("Disabled"), 'switch_off');
+	print '</a></td>';
 }
 print '<td>&nbsp;</td>';
 print '</tr>';
@@ -129,7 +129,7 @@ print ' '.$langs->trans("Example").': '.$langs->trans("IPListExample");
 print '</td>';
 print '<td><input type="text" name="API_RESTRICT_ON_IP" value="'.dol_escape_htmltag($conf->global->API_RESTRICT_ON_IP).'"></td>';
 print '<td>';
-print '<input type="submit" class="button" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'"></td>';
+print '<input type="submit" class="button button-save" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'"></td>';
 print '</td>';
 print '</tr>';
 
@@ -157,10 +157,11 @@ print '<br>';
 print '<u>'.$langs->trans("ApiExporerIs").':</u><br>';
 if (dol_is_dir(DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/explorer'))
 {
-    $url = DOL_MAIN_URL_ROOT.'/api/index.php/explorer';
-    print img_picto('', 'globe').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
+	$url = DOL_MAIN_URL_ROOT.'/api/index.php/explorer';
+	print img_picto('', 'globe').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
 } else {
-    print $langs->trans("NotAvailableWithThisDistribution");
+	$langs->load("errors");
+	print info_admin($langs->trans("ErrorNotAvailableWithThisDistribution"), 0, 0, 'error');
 }
 
 llxFooter();
diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 554edbb892e..c8ff1078977 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2016	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2020		Frédéric 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
@@ -29,206 +30,205 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 class DolibarrApi
 {
 
-    /**
-     * @var DoliDb        $db Database object
-     */
-    protected $db;
+	/**
+	 * @var DoliDb        $db Database object
+	 */
+	protected $db;
 
-    /**
-     * @var Restler     $r	Restler object
-     */
-    public $r;
+	/**
+	 * @var Restler     $r	Restler object
+	 */
+	public $r;
 
-    /**
-     * Constructor
-     *
-     * @param	DoliDb	$db		        Database handler
-     * @param   string  $cachedir       Cache dir
-     * @param   boolean $refreshCache   Update cache
-     */
-    public function __construct($db, $cachedir = '', $refreshCache = false)
-    {
-        global $conf, $dolibarr_main_url_root;
+	/**
+	 * Constructor
+	 *
+	 * @param	DoliDb	$db		        Database handler
+	 * @param   string  $cachedir       Cache dir
+	 * @param   boolean $refreshCache   Update cache
+	 */
+	public function __construct($db, $cachedir = '', $refreshCache = false)
+	{
+		global $conf, $dolibarr_main_url_root;
 
-        if (empty($cachedir)) $cachedir = $conf->api->dir_temp;
-        Defaults::$cacheDirectory = $cachedir;
+		if (empty($cachedir)) $cachedir = $conf->api->dir_temp;
+		Defaults::$cacheDirectory = $cachedir;
 
-        $this->db = $db;
-        $production_mode = (empty($conf->global->API_PRODUCTION_MODE) ? false : true);
-        $this->r = new Restler($production_mode, $refreshCache);
+		$this->db = $db;
+		$production_mode = (empty($conf->global->API_PRODUCTION_MODE) ? false : true);
+		$this->r = new Restler($production_mode, $refreshCache);
 
-        $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
-        $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+		$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 
-        $urlwithouturlrootautodetect = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim(DOL_MAIN_URL_ROOT));
-        $urlwithrootautodetect = $urlwithouturlroot.DOL_URL_ROOT; // This is to use local domain autodetected by dolibarr from url
+		$urlwithouturlrootautodetect = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim(DOL_MAIN_URL_ROOT));
+		$urlwithrootautodetect = $urlwithouturlroot.DOL_URL_ROOT; // This is to use local domain autodetected by dolibarr from url
 
-        $this->r->setBaseUrls($urlwithouturlroot, $urlwithouturlrootautodetect);
-        $this->r->setAPIVersion(1);
-        //$this->r->setSupportedFormats('json');
-        //$this->r->setSupportedFormats('jsonFormat');
-    }
+		$this->r->setBaseUrls($urlwithouturlroot, $urlwithouturlrootautodetect);
+		$this->r->setAPIVersion(1);
+		//$this->r->setSupportedFormats('json');
+		//$this->r->setSupportedFormats('jsonFormat');
+	}
 
-    /**
-     * Executed method when API is called without parameter
-     *
-     * Display a short message an return a http code 200
-     *
-     * @return array
-     */
-    /* Disabled, most APIs does not share same signature for method index
-    function index()
-    {
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => __class__.' is up and running!'
-            )
-        );
-    }*/
+	/**
+	 * Executed method when API is called without parameter
+	 *
+	 * Display a short message an return a http code 200
+	 *
+	 * @return array
+	 */
+	/* Disabled, most APIs does not share same signature for method index
+	function index()
+	{
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => __class__.' is up and running!'
+			)
+		);
+	}*/
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object	Object to clean
-     * @return	array	Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        // Remove $db object property for object
-        unset($object->db);
-        unset($object->isextrafieldmanaged);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object	Object to clean
+	 * @return	Object			Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		// Remove $db object property for object
+		unset($object->db);
+		unset($object->isextrafieldmanaged);
 		unset($object->ismultientitymanaged);
 		unset($object->restrictiononfksoc);
 		unset($object->table_rowid);
 
-        // Remove linkedObjects. We should already have linkedObjectIds that avoid huge responses
-        unset($object->linkedObjects);
+		// Remove linkedObjects. We should already have linkedObjectsIds that avoid huge responses
+		unset($object->linkedObjects);
 
-        unset($object->fields);
-        unset($object->oldline);
+		unset($object->fields);
+		unset($object->oldline);
 
-        unset($object->error);
-        unset($object->errors);
+		unset($object->error);
+		unset($object->errors);
+		unset($object->errorhidden);
 
-        unset($object->ref_previous);
-        unset($object->ref_next);
-        unset($object->ref_int);
+		unset($object->ref_previous);
+		unset($object->ref_next);
+		unset($object->ref_int);
 
-        unset($object->projet); // Should be fk_project
-        unset($object->project); // Should be fk_project
-        unset($object->author); // Should be fk_user_author
-        unset($object->timespent_old_duration);
-        unset($object->timespent_id);
-        unset($object->timespent_duration);
-        unset($object->timespent_date);
-        unset($object->timespent_datehour);
-        unset($object->timespent_withhour);
-        unset($object->timespent_fk_user);
-        unset($object->timespent_note);
-        unset($object->fk_delivery_address);
+		unset($object->projet); // Should be fk_project
+		unset($object->project); // Should be fk_project
+		unset($object->author); // Should be fk_user_author
+		unset($object->timespent_old_duration);
+		unset($object->timespent_id);
+		unset($object->timespent_duration);
+		unset($object->timespent_date);
+		unset($object->timespent_datehour);
+		unset($object->timespent_withhour);
+		unset($object->timespent_fk_user);
+		unset($object->timespent_note);
+		unset($object->fk_delivery_address);
 
-        unset($object->statuts);
-        unset($object->statuts_short);
-        unset($object->statuts_logo);
-        unset($object->statuts_long);
-        unset($object->labelStatus);
-        unset($object->labelStatusShort);
+		unset($object->statuts);
+		unset($object->statuts_short);
+		unset($object->statuts_logo);
+		unset($object->statuts_long);
+		unset($object->labelStatus);
+		unset($object->labelStatusShort);
 
-        unset($object->stats_propale);
-      	unset($object->stats_commande);
-        unset($object->stats_contrat);
-        unset($object->stats_facture);
-        unset($object->stats_commande_fournisseur);
-        unset($object->stats_reception);
-        unset($object->stats_mrptoconsume);
-        unset($object->stats_mrptoproduce);
+		unset($object->stats_propale);
+	  	unset($object->stats_commande);
+		unset($object->stats_contrat);
+		unset($object->stats_facture);
+		unset($object->stats_commande_fournisseur);
+		unset($object->stats_reception);
+		unset($object->stats_mrptoconsume);
+		unset($object->stats_mrptoproduce);
 
-        unset($object->element);
-        unset($object->fk_element);
-        unset($object->table_element);
-        unset($object->table_element_line);
-        unset($object->class_element_line);
-        unset($object->picto);
+		unset($object->element);
+		unset($object->fk_element);
+		unset($object->table_element);
+		unset($object->table_element_line);
+		unset($object->class_element_line);
+		unset($object->picto);
 
-        unset($object->fieldsforcombobox);
+		unset($object->fieldsforcombobox);
 
-        unset($object->skip_update_total);
-        unset($object->context);
-        unset($object->next_prev_filter);
+		unset($object->skip_update_total);
+		unset($object->context);
+		unset($object->next_prev_filter);
 
-        unset($object->region);
-        unset($object->region_code);
+		unset($object->region);
+		unset($object->region_code);
 
-        unset($object->libelle_statut);
-        unset($object->libelle_paiement);
+		unset($object->libelle_statut);
+		unset($object->libelle_paiement);
 
-        if ($object->table_element != 'ticket') {
-        	unset($object->comments);
-        }
+		if ($object->table_element != 'ticket') {
+			unset($object->comments);
+		}
 
-        // Remove the $oldcopy property because it is not supported by the JSON
-        // encoder. The following error is generated when trying to serialize
-        // it: "Error encoding/decoding JSON: Type is not supported"
-        // Note: Event if this property was correctly handled by the JSON
-        // encoder, it should be ignored because keeping it would let the API
-        // have a very strange behavior: calling PUT and then GET on the same
-        // resource would give different results:
-        // PUT /objects/{id} -> returns object with oldcopy = previous version of the object
-        // GET /objects/{id} -> returns object with oldcopy empty
-        unset($object->oldcopy);
+		// Remove the $oldcopy property because it is not supported by the JSON
+		// encoder. The following error is generated when trying to serialize
+		// it: "Error encoding/decoding JSON: Type is not supported"
+		// Note: Event if this property was correctly handled by the JSON
+		// encoder, it should be ignored because keeping it would let the API
+		// have a very strange behavior: calling PUT and then GET on the same
+		// resource would give different results:
+		// PUT /objects/{id} -> returns object with oldcopy = previous version of the object
+		// GET /objects/{id} -> returns object with oldcopy empty
+		unset($object->oldcopy);
 
-        // If object has lines, remove $db property
-        if (isset($object->lines) && is_array($object->lines) && count($object->lines) > 0) {
-            $nboflines = count($object->lines);
-        	for ($i = 0; $i < $nboflines; $i++)
-            {
-                $this->_cleanObjectDatas($object->lines[$i]);
+		// If object has lines, remove $db property
+		if (isset($object->lines) && is_array($object->lines) && count($object->lines) > 0) {
+			$nboflines = count($object->lines);
+			for ($i = 0; $i < $nboflines; $i++)
+			{
+				$this->_cleanObjectDatas($object->lines[$i]);
 
-                unset($object->lines[$i]->contact);
-                unset($object->lines[$i]->contact_id);
-                unset($object->lines[$i]->country);
-                unset($object->lines[$i]->country_id);
-                unset($object->lines[$i]->country_code);
-                unset($object->lines[$i]->mode_reglement_id);
-                unset($object->lines[$i]->mode_reglement_code);
-                unset($object->lines[$i]->mode_reglement);
-                unset($object->lines[$i]->cond_reglement_id);
-                unset($object->lines[$i]->cond_reglement_code);
-                unset($object->lines[$i]->cond_reglement);
-                unset($object->lines[$i]->fk_delivery_address);
-                unset($object->lines[$i]->fk_projet);
-                unset($object->lines[$i]->fk_project);
-                unset($object->lines[$i]->thirdparty);
-                unset($object->lines[$i]->user);
-                unset($object->lines[$i]->model_pdf);
-                unset($object->lines[$i]->modelpdf);
-                unset($object->lines[$i]->note_public);
-                unset($object->lines[$i]->note_private);
-                unset($object->lines[$i]->fk_incoterms);
-                unset($object->lines[$i]->label_incoterms);
-                unset($object->lines[$i]->location_incoterms);
-                unset($object->lines[$i]->name);
-                unset($object->lines[$i]->lastname);
-                unset($object->lines[$i]->firstname);
-                unset($object->lines[$i]->civility_id);
-                unset($object->lines[$i]->fk_multicurrency);
-                unset($object->lines[$i]->multicurrency_code);
-                unset($object->lines[$i]->shipping_method_id);
-            }
-        }
-
-        if (!empty($object->thirdparty) && is_object($object->thirdparty))
-        {
-        	$this->_cleanObjectDatas($object->thirdparty);
-        }
+				unset($object->lines[$i]->contact);
+				unset($object->lines[$i]->contact_id);
+				unset($object->lines[$i]->country);
+				unset($object->lines[$i]->country_id);
+				unset($object->lines[$i]->country_code);
+				unset($object->lines[$i]->mode_reglement_id);
+				unset($object->lines[$i]->mode_reglement_code);
+				unset($object->lines[$i]->mode_reglement);
+				unset($object->lines[$i]->cond_reglement_id);
+				unset($object->lines[$i]->cond_reglement_code);
+				unset($object->lines[$i]->cond_reglement);
+				unset($object->lines[$i]->fk_delivery_address);
+				unset($object->lines[$i]->fk_projet);
+				unset($object->lines[$i]->fk_project);
+				unset($object->lines[$i]->thirdparty);
+				unset($object->lines[$i]->user);
+				unset($object->lines[$i]->model_pdf);
+				unset($object->lines[$i]->modelpdf);
+				unset($object->lines[$i]->note_public);
+				unset($object->lines[$i]->note_private);
+				unset($object->lines[$i]->fk_incoterms);
+				unset($object->lines[$i]->label_incoterms);
+				unset($object->lines[$i]->location_incoterms);
+				unset($object->lines[$i]->name);
+				unset($object->lines[$i]->lastname);
+				unset($object->lines[$i]->firstname);
+				unset($object->lines[$i]->civility_id);
+				unset($object->lines[$i]->fk_multicurrency);
+				unset($object->lines[$i]->multicurrency_code);
+				unset($object->lines[$i]->shipping_method_id);
+			}
+		}
 
+		if (!empty($object->thirdparty) && is_object($object->thirdparty)) {
+			$this->_cleanObjectDatas($object->thirdparty);
+		}
 		return $object;
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * Check user access to a resource
 	 *
@@ -240,12 +240,12 @@ class DolibarrApi
 	 * @param string	$feature2		Feature to check, second level of permission (optional). Can be or check with 'level1|level2'.
 	 * @param string	$dbt_keyfield   Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional)
 	 * @param string	$dbt_select     Field name for select if not rowid. Not used if objectid is null (optional)
-     * @return bool
+	 * @return bool
 	 * @throws RestException
 	 */
-    protected static function _checkAccessToResource($resource, $resource_id = 0, $dbtablename = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid')
-    {
-        // phpcs:enable
+	protected static function _checkAccessToResource($resource, $resource_id = 0, $dbtablename = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid')
+	{
+		// phpcs:enable
 		// Features/modules to check
 		$featuresarray = array($resource);
 		if (preg_match('/&/', $resource)) {
@@ -260,9 +260,9 @@ class DolibarrApi
 		}
 
 		return checkUserAccessToObject(DolibarrApiAccess::$user, $featuresarray, $resource_id, $dbtablename, $feature2, $dbt_keyfield, $dbt_select);
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * Return if a $sqlfilters parameter is valid
 	 *
@@ -271,30 +271,30 @@ class DolibarrApi
 	 */
 	protected function _checkFilters($sqlfilters)
 	{
-        // phpcs:enable
-	    //$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-	    //$tmp=preg_replace_all('/'.$regexstring.'/', '', $sqlfilters);
-	    $tmp = $sqlfilters;
-	    $ok = 0;
-	    $i = 0; $nb = strlen($tmp);
-	    $counter = 0;
-	    while ($i < $nb)
-	    {
-	        if ($tmp[$i] == '(') $counter++;
-	        if ($tmp[$i] == ')') $counter--;
-            if ($counter < 0)
-            {
-	            $error = "Bad sqlfilters=".$sqlfilters;
-	            dol_syslog($error, LOG_WARNING);
-	            return false;
-            }
-            $i++;
-	    }
-	    return true;
+		// phpcs:enable
+		//$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+		//$tmp=preg_replace_all('/'.$regexstring.'/', '', $sqlfilters);
+		$tmp = $sqlfilters;
+		$ok = 0;
+		$i = 0; $nb = strlen($tmp);
+		$counter = 0;
+		while ($i < $nb)
+		{
+			if ($tmp[$i] == '(') $counter++;
+			if ($tmp[$i] == ')') $counter--;
+			if ($counter < 0)
+			{
+				$error = "Bad sqlfilters=".$sqlfilters;
+				dol_syslog($error, LOG_WARNING);
+				return false;
+			}
+			$i++;
+		}
+		return true;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * Function to forge a SQL criteria
 	 *
@@ -303,22 +303,22 @@ class DolibarrApi
 	 */
 	protected static function _forge_criteria_callback($matches)
 	{
-        // phpcs:enable
-	    global $db;
+		// phpcs:enable
+		global $db;
 
-	    //dol_syslog("Convert matches ".$matches[1]);
-	    if (empty($matches[1])) return '';
-	    $tmp = explode(':', $matches[1]);
-        if (count($tmp) < 3) return '';
+		//dol_syslog("Convert matches ".$matches[1]);
+		if (empty($matches[1])) return '';
+		$tmp = explode(':', $matches[1]);
+		if (count($tmp) < 3) return '';
 
-	    $tmpescaped = $tmp[2];
-	    $regbis = array();
-	    if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis))
-	    {
-	        $tmpescaped = "'".$db->escape($regbis[1])."'";
-	    } else {
-	        $tmpescaped = $db->escape($tmpescaped);
-	    }
-	    return $db->escape($tmp[0]).' '.strtoupper($db->escape($tmp[1]))." ".$tmpescaped;
+		$tmpescaped = $tmp[2];
+		$regbis = array();
+		if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis))
+		{
+			$tmpescaped = "'".$db->escape($regbis[1])."'";
+		} else {
+			$tmpescaped = $db->escape($tmpescaped);
+		}
+		return $db->escape($tmp[0]).' '.strtoupper($db->escape($tmp[1]))." ".$tmpescaped;
 	}
 }
diff --git a/htdocs/api/class/api_access.class.php b/htdocs/api/class/api_access.class.php
index 84f7bf303e7..926a51456c7 100644
--- a/htdocs/api/class/api_access.class.php
+++ b/htdocs/api/class/api_access.class.php
@@ -19,9 +19,9 @@
 // Create the autoloader for Luracast
 require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/AutoLoader.php';
 call_user_func(function () {
-    $loader = Luracast\Restler\AutoLoader::instance();
-    spl_autoload_register($loader);
-    return $loader;
+	$loader = Luracast\Restler\AutoLoader::instance();
+	spl_autoload_register($loader);
+	return $loader;
 });
 
 require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/iAuthenticate.php';
@@ -52,7 +52,7 @@ class DolibarrApiAccess implements iAuthenticate
 	/**
 	 * @var string $role		user role
 	 */
-    public static $role = 'user';
+	public static $role = 'user';
 
 	/**
 	 * @var User		$user	Loggued user
@@ -69,7 +69,7 @@ class DolibarrApiAccess implements iAuthenticate
 		$this->db = $db;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName
 	/**
 	 * Check access
 	 *
@@ -80,7 +80,7 @@ class DolibarrApiAccess implements iAuthenticate
 	 */
 	public function __isAllowed()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $db;
 
 		$login = '';
@@ -97,17 +97,17 @@ class DolibarrApiAccess implements iAuthenticate
 		$api_key = '';
 		if (isset($_GET['api_key']))	// For backward compatibility
 		{
-		    // TODO Add option to disable use of api key on url. Return errors if used.
-		    $api_key = $_GET['api_key'];
+			// TODO Add option to disable use of api key on url. Return errors if used.
+			$api_key = $_GET['api_key'];
 		}
 		if (isset($_GET['DOLAPIKEY']))
 		{
-		    // TODO Add option to disable use of api key on url. Return errors if used.
-		    $api_key = $_GET['DOLAPIKEY']; // With GET method
+			// TODO Add option to disable use of api key on url. Return errors if used.
+			$api_key = $_GET['DOLAPIKEY']; // With GET method
 		}
 		if (isset($_SERVER['HTTP_DOLAPIKEY']))         // Param DOLAPIKEY in header can be read with HTTP_DOLAPIKEY
 		{
-		    $api_key = $_SERVER['HTTP_DOLAPIKEY']; // With header method (recommanded)
+			$api_key = $_SERVER['HTTP_DOLAPIKEY']; // With header method (recommanded)
 		}
 
 		if ($api_key)
@@ -149,7 +149,7 @@ class DolibarrApiAccess implements iAuthenticate
 
 			if (!$login)
 			{
-			    throw new RestException(503, 'Error when searching login user from api key');
+				throw new RestException(503, 'Error when searching login user from api key');
 			}
 			$fuser = new User($this->db);
 			$result = $fuser->fetch('', $login, '', 0, (empty($userentity) ? -1 : $conf->entity)); // If user is not entity 0, we search in working entity $conf->entity  (that may have been forced to a different value than user entity)
@@ -161,49 +161,49 @@ class DolibarrApiAccess implements iAuthenticate
 
 			if ($fuser->socid) {
 				static::$role = 'external';
-            }
+			}
 
 			if ($fuser->admin) {
 				static::$role = 'admin';
-            }
-        } else {
-		    throw new RestException(401, "Failed to login to API. No parameter 'HTTP_DOLAPIKEY' on HTTP header (and no parameter DOLAPIKEY in URL).");
+			}
+		} else {
+			throw new RestException(401, "Failed to login to API. No parameter 'HTTP_DOLAPIKEY' on HTTP header (and no parameter DOLAPIKEY in URL).");
 		}
 
-	    $userClass::setCacheIdentifier(static::$role);
-	    Resources::$accessControlFunction = 'DolibarrApiAccess::verifyAccess';
-	    $requirefortest = static::$requires;
-	    if (!is_array($requirefortest)) $requirefortest = explode(',', $requirefortest);
-	    return in_array(static::$role, (array) $requirefortest) || static::$role == 'admin';
+		$userClass::setCacheIdentifier(static::$role);
+		Resources::$accessControlFunction = 'DolibarrApiAccess::verifyAccess';
+		$requirefortest = static::$requires;
+		if (!is_array($requirefortest)) $requirefortest = explode(',', $requirefortest);
+		return in_array(static::$role, (array) $requirefortest) || static::$role == 'admin';
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName
 	/**
 	 * @return string string to be used with WWW-Authenticate header
 	 */
-    public function __getWWWAuthenticateString()
-    {
-        // phpcs:enable
-        return '';
-    }
+	public function __getWWWAuthenticateString()
+	{
+		// phpcs:enable
+		return '';
+	}
 
-    /**
-     * Verify access
-     *
-     * @param   array $m Properties of method
-     *
-     * @access private
-     * @return bool
-     */
-    public static function verifyAccess(array $m)
-    {
-        $requires = isset($m['class']['DolibarrApiAccess']['properties']['requires'])
-                ? $m['class']['DolibarrApiAccess']['properties']['requires']
-                : false;
+	/**
+	 * Verify access
+	 *
+	 * @param   array $m Properties of method
+	 *
+	 * @access private
+	 * @return bool
+	 */
+	public static function verifyAccess(array $m)
+	{
+		$requires = isset($m['class']['DolibarrApiAccess']['properties']['requires'])
+				? $m['class']['DolibarrApiAccess']['properties']['requires']
+				: false;
 
 
-        return $requires
-            ? static::$role == 'admin' || in_array(static::$role, (array) $requires)
-            : true;
-    }
+		return $requires
+			? static::$role == 'admin' || in_array(static::$role, (array) $requires)
+			: true;
+	}
 }
diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 9605f46f219..da9545aa248 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -120,7 +120,7 @@ class Documents extends DolibarrApi
 	/**
 	 * Build a document.
 	 *
-	 * Test sample 1: { "module_part": "invoice", "original_file": "FA1701-001/FA1701-001.pdf", "doctemplate": "crabe", "langcode": "fr_FR" }.
+	 * Test sample 1: { "modulepart": "invoice", "original_file": "FA1701-001/FA1701-001.pdf", "doctemplate": "crabe", "langcode": "fr_FR" }.
 	 *
 	 * @param   string  $modulepart    Name of module or area concerned by file download ('invoice', 'order', ...).
 	 * @param   string  $original_file  Relative path with filename, relative to modulepart (for example: IN201701-999/IN201701-999.pdf).
@@ -229,9 +229,7 @@ class Documents extends DolibarrApi
 			if ($result <= 0) {
 				throw new RestException(500, 'Error generating document');
 			}
-		}
-		else
-		{
+		} else {
 			throw new RestException(403, 'Generation not available for this modulepart');
 		}
 
@@ -277,6 +275,8 @@ class Documents extends DolibarrApi
 		}
 
 		$id = (empty($id) ? 0 : $id);
+		$recursive = 0;
+		$type = 'files';
 
 		if ($modulepart == 'societe' || $modulepart == 'thirdparty')
 		{
@@ -409,7 +409,7 @@ class Documents extends DolibarrApi
 
 			$upload_dir = $conf->fournisseur->dir_output."/facture/".get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').dol_sanitizeFileName($object->ref);
 		}
-        elseif ($modulepart == 'produit' || $modulepart == 'product')
+		elseif ($modulepart == 'produit' || $modulepart == 'product')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
@@ -419,9 +419,9 @@ class Documents extends DolibarrApi
 
 			$object = new Product($this->db);
 			$result = $object->fetch($id, $ref);
-			if ($result==0) {
+			if ($result == 0) {
 				throw new RestException(404, 'Product not found');
-			} elseif ($result<0) {
+			} elseif ($result < 0) {
 				throw new RestException(500, 'Error while fetching object: '.$object->error);
 			}
 
@@ -474,15 +474,40 @@ class Documents extends DolibarrApi
 			}
 
 			$upload_dir = $conf->categorie->multidir_output[$object->entity].'/'.get_exdir($object->id, 2, 0, 0, $object, 'category').$object->id."/photos/".dol_sanitizeFileName($object->ref);
-		}
-		else
-		{
+		} elseif ($modulepart == 'ecm') {
+			throw new RestException(500, 'Modulepart Ecm not implemented yet.');
+			// // require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
+
+			// if (!DolibarrApiAccess::$user->rights->ecm->read) {
+			// 	throw new RestException(401);
+			// }
+
+			// // $object = new EcmDirectory($this->db);
+			// // $result = $object->fetch($ref);
+			// // if (!$result) {
+			// // 	throw new RestException(404, 'EcmDirectory not found');
+			// // }
+			// $upload_dir = $conf->ecm->dir_output;
+			// $type = 'all';
+			// $recursive = 0;
+		} else {
 			throw new RestException(500, 'Modulepart '.$modulepart.' not implemented yet.');
 		}
 
-		$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+		$filearray = dol_dir_list($upload_dir, $type, $recursive, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 		if (empty($filearray)) {
-			throw new RestException(404, 'Search for modulepart '.$modulepart.' with Id '.$object->id.(!empty($object->Ref) ? ' or Ref '.$object->ref : '').' does not return any document.');
+			throw new RestException(404, 'Search for modulepart '.$modulepart.' with Id '.$object->id.(!empty($object->ref) ? ' or Ref '.$object->ref : '').' does not return any document.');
+		} else {
+			if (($object->id) > 0 && !empty($modulepart)) {
+				require_once DOL_DOCUMENT_ROOT . '/ecm/class/ecmfiles.class.php';
+				$ecmfile = new EcmFiles($this->db);
+				$result = $ecmfile->fetchAll('', '', 0, 0, array('t.src_object_type' => $modulepart, 't.src_object_id' => $object->id));
+				if ($result < 0) {
+					throw new RestException(503, 'Error when retrieve ecm list : ' . $this->db->lasterror());
+				} elseif (is_array($ecmfile->lines) && count($ecmfile->lines) > 0) {
+					$filearray['ecmfiles_infos'] = $ecmfile->lines;
+				}
+			}
 		}
 
 		return $filearray;
@@ -517,7 +542,7 @@ class Documents extends DolibarrApi
 	 * @param   string  $filecontent        File content (string with file content. An empty file will be created if this parameter is not provided)
 	 * @param   string  $fileencoding       File encoding (''=no encoding, 'base64'=Base 64)
 	 * @param   int 	$overwriteifexists  Overwrite file if exists (1 by default)
-     * @return  string
+	 * @return  string
 	 *
 	 * @throws RestException 400
 	 * @throws RestException 401
@@ -594,9 +619,7 @@ class Documents extends DolibarrApi
 					{
 						$tmpreldir = dol_sanitizeFileName($object->project->ref).'/';
 					}
-				}
-				else
-				{
+				} else {
 					throw new RestException(500, 'Error while fetching Task '.$ref);
 				}
 			}
@@ -616,9 +639,13 @@ class Documents extends DolibarrApi
 				require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 				$object = new Adherent($this->db);
 			}
-			// TODO Implement additional moduleparts
-			else
+			elseif ($modulepart == 'proposal' || $modulepart == 'propal' || $modulepart == 'propale')
 			{
+				$modulepart = 'propale';
+				require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+				$object = new Propal($this->db);
+			} else {
+				// TODO Implement additional moduleparts
 				throw new RestException(500, 'Modulepart '.$modulepart.' not implemented yet.');
 			}
 
@@ -629,7 +656,7 @@ class Documents extends DolibarrApi
 				if ($result == 0)
 				{
 					throw new RestException(404, "Object with ref '".$ref."' was not found.");
-			    }
+				}
 				elseif ($result < 0)
 				{
 					throw new RestException(500, 'Error while fetching object: '.$object->error);
@@ -656,9 +683,7 @@ class Documents extends DolibarrApi
 			{
 				throw new RestException(500, 'This value of modulepart does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.');
 			}
-		}
-		else
-		{
+		} else {
 			if ($modulepart == 'invoice') $modulepart = 'facture';
 			if ($modulepart == 'member') $modulepart = 'adherent';
 
@@ -678,7 +703,7 @@ class Documents extends DolibarrApi
 
 		if (dol_mkdir($upload_dir) < 0) // needed by products
 		{
-		    throw new RestException(500, 'Error while trying to create directory.');
+			throw new RestException(500, 'Error while trying to create directory.');
 		}
 
 		$destfile = $upload_dir.'/'.$original_file;
@@ -696,20 +721,16 @@ class Documents extends DolibarrApi
 		}
 
 		$fhandle = @fopen($destfiletmp, 'w');
-		if ($fhandle)
-		{
+		if ($fhandle) {
 			$nbofbyteswrote = fwrite($fhandle, $newfilecontent);
 			fclose($fhandle);
 			@chmod($destfiletmp, octdec($conf->global->MAIN_UMASK));
-		}
-		else
-		{
+		} else {
 			throw new RestException(500, "Failed to open file '".$destfiletmp."' for write");
 		}
 
 		$result = dol_move($destfiletmp, $destfile, 0, $overwriteifexists, 1);
-		if (!$result)
-		{
+		if (!$result) {
 			throw new RestException(500, "Failed to move file into '".$destfile."'");
 		}
 
@@ -731,63 +752,63 @@ class Documents extends DolibarrApi
 	 */
 	public function delete($modulepart, $original_file)
 	{
-	    global $conf, $langs;
+		global $conf, $langs;
 
-	    if (empty($modulepart)) {
-	        throw new RestException(400, 'bad value for parameter modulepart');
-	    }
-	    if (empty($original_file)) {
-	        throw new RestException(400, 'bad value for parameter original_file');
-	    }
+		if (empty($modulepart)) {
+			throw new RestException(400, 'bad value for parameter modulepart');
+		}
+		if (empty($original_file)) {
+			throw new RestException(400, 'bad value for parameter original_file');
+		}
 
-	    //--- Finds and returns the document
-	    $entity = $conf->entity;
+		//--- Finds and returns the document
+		$entity = $conf->entity;
 
-	    // Special cases that need to use get_exdir to get real dir of object
-	    // If future, all object should use this to define path of documents.
-	    /*
+		// Special cases that need to use get_exdir to get real dir of object
+		// If future, all object should use this to define path of documents.
+		/*
 	    $tmpreldir = '';
 	    if ($modulepart == 'supplier_invoice') {
 	    	$tmpreldir = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier');
 	    }
 
 	    $relativefile = $tmpreldir.dol_sanitizeFileName($object->ref); */
-	    $relativefile = $original_file;
+		$relativefile = $original_file;
 
-	    $check_access = dol_check_secure_access_document($modulepart, $relativefile, $entity, DolibarrApiAccess::$user, '', 'read');
-	    $accessallowed = $check_access['accessallowed'];
-	    $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
-	    $original_file = $check_access['original_file'];
+		$check_access = dol_check_secure_access_document($modulepart, $relativefile, $entity, DolibarrApiAccess::$user, '', 'read');
+		$accessallowed = $check_access['accessallowed'];
+		$sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
+		$original_file = $check_access['original_file'];
 
-	    if (preg_match('/\.\./', $original_file) || preg_match('/[<>|]/', $original_file)) {
-	        throw new RestException(401);
-	    }
-	    if (!$accessallowed) {
-	        throw new RestException(401);
-	    }
+		if (preg_match('/\.\./', $original_file) || preg_match('/[<>|]/', $original_file)) {
+			throw new RestException(401);
+		}
+		if (!$accessallowed) {
+			throw new RestException(401);
+		}
 
-	    $filename = basename($original_file);
-	    $original_file_osencoded = dol_osencode($original_file); // New file name encoded in OS encoding charset
+		$filename = basename($original_file);
+		$original_file_osencoded = dol_osencode($original_file); // New file name encoded in OS encoding charset
 
-	    if (!file_exists($original_file_osencoded))
-	    {
-	        dol_syslog("Try to download not found file ".$original_file_osencoded, LOG_WARNING);
-	        throw new RestException(404, 'File not found');
-	    }
+		if (!file_exists($original_file_osencoded))
+		{
+			dol_syslog("Try to download not found file ".$original_file_osencoded, LOG_WARNING);
+			throw new RestException(404, 'File not found');
+		}
 
-	    if (@unlink($original_file_osencoded)) {
-    	    return array(
-    	        'success' => array(
-    	            'code' => 200,
-    	            'message' => 'Document deleted'
-    	        )
-    	    );
-	    }
+		if (@unlink($original_file_osencoded)) {
+			return array(
+				'success' => array(
+					'code' => 200,
+					'message' => 'Document deleted'
+				)
+			);
+		}
 
-	    throw new RestException(401);
+		throw new RestException(401);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName
 	/**
 	 * Validate fields before create or update object
 	 *
@@ -795,9 +816,9 @@ class Documents extends DolibarrApi
 	 * @return  array
 	 * @throws  RestException
 	 */
-    private function _validate_file($data)
-    {
-        // phpcs:enable
+	private function _validate_file($data)
+	{
+		// phpcs:enable
 		$result = array();
 		foreach (Documents::$DOCUMENT_FIELDS as $field) {
 			if (!isset($data[$field]))
diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php
index 078d631aa3d..cb2fdd54d66 100644
--- a/htdocs/api/class/api_login.class.php
+++ b/htdocs/api/class/api_login.class.php
@@ -26,41 +26,41 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 class Login
 {
 
-    /**
-     * Constructor of the class
-     */
-    public function __construct()
-    {
-        global $db;
-        $this->db = $db;
-    }
+	/**
+	 * Constructor of the class
+	 */
+	public function __construct()
+	{
+		global $db;
+		$this->db = $db;
+	}
 
 	/**
 	 * Login
 	 *
 	 * Request the API token for a couple username / password.
 	 * Using method POST is recommanded for security reasons (method GET is often logged by default by web servers with parameters so with login and pass into server log file).
-	 * Both methods are provided for developer conveniance. Best is to not use at all the login API method and enter directly the "DOLAPIKEY" into field at the top right of page. Note: The API key (DOLAPIKEY) can be found/set on the user page.
+	 * Both methods are provided for developer conveniance. Best is to not use at all the login API method and enter directly the "DOLAPIKEY" into field at the top right of page. Note: The API token (DOLAPIKEY) can be found/set on the user page.
 	 *
 	 * @param   string  $login			User login
 	 * @param   string  $password		User password
 	 * @param   string  $entity			Entity (when multicompany module is used). '' means 1=first company.
 	 * @param   int     $reset          Reset token (0=get current token, 1=ask a new token and canceled old token. This means access using current existing API token of user will fails: new token will be required for new access)
-     * @return  array                   Response status and user token
-     *
+	 * @return  array                   Response status and user token
+	 *
 	 * @throws RestException 403
 	 * @throws RestException 500
 	 *
 	 * @url GET /
 	 * @url POST /
 	 */
-    public function index($login, $password, $entity = '', $reset = 0)
-    {
-	    global $conf, $dolibarr_main_authentication, $dolibarr_auto_user;
+	public function index($login, $password, $entity = '', $reset = 0)
+	{
+		global $conf, $dolibarr_main_authentication, $dolibarr_auto_user;
 
-	    // TODO Remove the API login. The token must be generated from backoffice only.
+		// TODO Remove the API login. The token must be generated from backoffice only.
 
-	    // Authentication mode
+		// Authentication mode
 		if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication = 'dolibarr';
 
 		// Authentication mode: forceuser
@@ -108,22 +108,22 @@ class Login
 				throw new RestException(403, 'User need write permission on itself to reset its API token');
 			}
 
-    		// Generate token for user
-    		$token = dol_hash($login.uniqid().$conf->global->MAIN_API_KEY, 1);
+			// Generate token for user
+			$token = dol_hash($login.uniqid().$conf->global->MAIN_API_KEY, 1);
 
-    		// We store API token into database
-    		$sql = "UPDATE ".MAIN_DB_PREFIX."user";
-    		$sql .= " SET api_key = '".$this->db->escape($token)."'";
-    		$sql .= " WHERE login = '".$this->db->escape($login)."'";
+			// We store API token into database
+			$sql = "UPDATE ".MAIN_DB_PREFIX."user";
+			$sql .= " SET api_key = '".$this->db->escape($token)."'";
+			$sql .= " WHERE login = '".$this->db->escape($login)."'";
 
-    		dol_syslog(get_class($this)."::login", LOG_DEBUG); // No log
-    		$result = $this->db->query($sql);
-    		if (!$result)
-    		{
-    			throw new RestException(500, 'Error when updating api_key for user :'.$this->db->lasterror());
-    		}
+			dol_syslog(get_class($this)."::login", LOG_DEBUG); // No log
+			$result = $this->db->query($sql);
+			if (!$result)
+			{
+				throw new RestException(500, 'Error when updating api_key for user :'.$this->db->lasterror());
+			}
 		} else {
-            $token = $tmpuser->api_key;
+			$token = $tmpuser->api_key;
 		}
 
 		//return token
@@ -131,9 +131,9 @@ class Login
 			'success' => array(
 				'code' => 200,
 				'token' => $token,
-			    'entity' => $tmpuser->entity,
-			    'message' => 'Welcome '.$login.($reset ? ' - Token is new' : ' - This is your token (generated by a previous call). You can use it to make any REST API call, or enter it into the DOLAPIKEY field to use the Dolibarr API explorer.')
+				'entity' => $tmpuser->entity,
+				'message' => 'Welcome '.$login.($reset ? ' - Token is new' : ' - This is your token (generated by a previous call). You can use it to make any REST API call, or enter it into the DOLAPIKEY field to use the Dolibarr API explorer.')
 			)
 		);
-    }
+	}
 }
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index f0812262e4b..5e6abbeeb6e 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2016	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2017	Regis Houssin	        <regis.houssin@inodbox.com>
  * Copyright (C) 2017	Neil Orley	            <neil.orley@oeris.fr>
- * Copyright (C) 2018   Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020   Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2018-2020   Thibault FOUCART        <support@ptibogxiv.net>
  *
  *
@@ -35,19 +35,84 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/ccountry.class.php';
  */
 class Setup extends DolibarrApi
 {
-    private $translations = null;
+	private $translations = null;
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db;
+		$this->db = $db;
+	}
+
+	/**
+	 * Get the list of ordering methods.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number {@min 0}
+	 * @param int       $active     Payment type is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters SQL criteria to filter with. Syntax example "(t.code:=:'OrderByWWW')"
+	 *
+	 * @url     GET dictionary/ordering_methods
+	 *
+	 * @return array [List of ordering methods]
+	 *
+	 * @throws RestException 400
+	 */
+	public function getOrderingMethods($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		if (!DolibarrApiAccess::$user->rights->commande->lire) {
+			throw new RestException(401);
+		}
+
+		$sql = "SELECT rowid, code, libelle as label, module";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_input_method as t";
+		$sql .= " WHERE t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(400, $this->db->lasterror());
+		}
+
+		return $list;
+	}
 
     /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db;
-        $this->db = $db;
-    }
-
-    /**
-     * Get the list of ordering methods.
+     * Get the list of ordering origins.
      *
      * @param string    $sortfield  Sort field
      * @param string    $sortorder  Sort order
@@ -56,1062 +121,31 @@ class Setup extends DolibarrApi
      * @param int       $active     Payment type is active or not {@min 0} {@max 1}
      * @param string    $sqlfilters SQL criteria to filter with. Syntax example "(t.code:=:'OrderByWWW')"
      *
-     * @url     GET dictionary/ordering_methods
+     * @url     GET dictionary/ordering_origins
      *
-     * @return array [List of ordering methods]
+     * @return array [List of ordering reasons]
      *
      * @throws RestException 400
      */
-    public function getOrderingMethods($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+    public function getOrderingOrigins($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
     {
         $list = array();
 
-        $sql = "SELECT rowid, code, libelle as label, module";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_input_method as t";
-        $sql .= " WHERE t.active = ".$active;
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+        if (!DolibarrApiAccess::$user->rights->commande->lire) {
+            throw new RestException(401);
         }
 
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(400, $this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get the list of payments types.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number {@min 0}
-     * @param int       $active     Payment type is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters SQL criteria to filter with. Syntax example "(t.code:=:'CHQ')"
-     *
-     * @url     GET dictionary/payment_types
-     *
-     * @return array [List of payment types]
-     *
-     * @throws RestException 400
-     */
-    public function getPaymentTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-
-        $sql = "SELECT id, code, type, libelle as label, module";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_paiement as t";
-        $sql .= " WHERE t.entity IN (".getEntity('c_paiement').")";
-        $sql .= " AND t.active = ".$active;
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
-            }
-              $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(400, $this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get the list of states/provinces.
-     *
-     * The names of the states will be translated to the given language if
-     * the $lang parameter is provided. The value of $lang must be a language
-     * code supported by Dolibarr, for example 'en_US' or 'fr_FR'.
-     * The returned list is sorted by state ID.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param string    $filter     To filter the countries by name
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array                List of countries
-     *
-     * @url     GET dictionary/states
-     *
-     * @throws RestException
-     */
-    public function getListOfStates($sortfield = "code_departement", $sortorder = 'ASC', $limit = 100, $page = 0, $filter = '', $sqlfilters = '')
-    {
-        $list = array();
-
-        // Note: The filter is not applied in the SQL request because it must
-        // be applied to the translated names, not to the names in database.
-        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."c_departements as t";
-        $sql .= " WHERE 1 = 1";
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $obj = $this->db->fetch_object($result);
-                $state = new Cstate($this->db);
-                if ($state->fetch($obj->rowid) > 0) {
-                    if (empty($filter) || stripos($state->label, $filter) !== false) {
-                        $list[] = $this->_cleanObjectDatas($state);
-                    }
-                }
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of states');
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get state by ID.
-     *
-     * @param int       $id        ID of state
-     * @return array 			   Array of cleaned object properties
-     *
-     * @url     GET dictionary/states/{id}
-     *
-     * @throws RestException
-     */
-    public function getStateByID($id)
-    {
-        return $this->_fetchCstate($id, '');
-    }
-
-    /**
-     * Get state by Code.
-     *
-     * @param string    $code      Code of state
-     * @return array 			   Array of cleaned object properties
-     *
-     * @url     GET dictionary/states/byCode/{code}
-     *
-     * @throws RestException
-     */
-    public function getStateByCode($code)
-    {
-        return $this->_fetchCstate('', $code);
-    }
-
-    /**
-     * Get the list of countries.
-     *
-     * The names of the countries will be translated to the given language if
-     * the $lang parameter is provided. The value of $lang must be a language
-     * code supported by Dolibarr, for example 'en_US' or 'fr_FR'.
-     * The returned list is sorted by country ID.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param string    $filter     To filter the countries by name
-     * @param string    $lang       Code of the language the label of the countries must be translated to
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array                List of countries
-     *
-     * @url     GET dictionary/countries
-     *
-     * @throws RestException
-     */
-    public function getListOfCountries($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $filter = '', $lang = '', $sqlfilters = '')
-    {
-        $list = array();
-
-        // Note: The filter is not applied in the SQL request because it must
-        // be applied to the translated names, not to the names in database.
-        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."c_country as t";
-        $sql .= " WHERE 1 = 1";
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $obj = $this->db->fetch_object($result);
-                $country = new Ccountry($this->db);
-                if ($country->fetch($obj->rowid) > 0) {
-                    // Translate the name of the country if needed
-                    // and then apply the filter if there is one.
-                    $this->translateLabel($country, $lang, 'Country');
-
-                    if (empty($filter) || stripos($country->label, $filter) !== false) {
-                        $list[] = $this->_cleanObjectDatas($country);
-                    }
-                }
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of countries');
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get country by ID.
-     *
-     * @param int       $id        ID of country
-     * @param string    $lang      Code of the language the name of the
-     *                             country must be translated to
-     * @return array 			   Array of cleaned object properties
-     *
-     * @url     GET dictionary/countries/{id}
-     *
-     * @throws RestException
-     */
-    public function getCountryByID($id, $lang = '')
-    {
-        return $this->_fetchCcountry($id, '', '', $lang);
-    }
-
-    /**
-     * Get country by Code.
-     *
-     * @param string    $code      Code of country
-     * @param string    $lang      Code of the language the name of the
-     *                             country must be translated to
-     * @return array 			   Array of cleaned object properties
-     *
-     * @url     GET dictionary/countries/byCode/{code}
-     *
-     * @throws RestException
-     */
-    public function getCountryByCode($code, $lang = '')
-    {
-        return $this->_fetchCcountry('', $code, '', $lang);
-    }
-
-    /**
-     * Get country by Iso.
-     *
-     * @param string    $iso       ISO of country
-     * @param string    $lang      Code of the language the name of the
-     *                             country must be translated to
-     * @return array 			   Array of cleaned object properties
-     *
-     * @url     GET dictionary/countries/byISO/{iso}
-     *
-     * @throws RestException
-     */
-    public function getCountryByISO($iso, $lang = '')
-    {
-        return $this->_fetchCcountry('', '', $iso, $lang);
-    }
-
-    /**
-    * Get state.
-    *
-    * @param int       $id        ID of state
-    * @param string    $code      Code of state
-    * @return array 			   Array of cleaned object properties
-    *
-    * @throws RestException
-    */
-    private function _fetchCstate($id, $code = '')
-    {
-        $state = new Cstate($this->db);
-
-        $result = $state->fetch($id, $code);
-        if ($result < 0) {
-            throw new RestException(503, 'Error when retrieving state : '.$state->error);
-        } elseif ($result == 0) {
-            throw new RestException(404, 'State not found');
-        }
-
-        return $this->_cleanObjectDatas($state);
-    }
-
-    /**
-    * Get country.
-    *
-    * @param int       $id        ID of country
-    * @param string    $code      Code of country
-    * @param string    $iso       ISO of country
-    * @param string    $lang      Code of the language the name of the
-    *                             country must be translated to
-    * @return array 			   Array of cleaned object properties
-    *
-    * @throws RestException
-    */
-    private function _fetchCcountry($id, $code = '', $iso = '', $lang = '')
-    {
-        $country = new Ccountry($this->db);
-
-        $result = $country->fetch($id, $code, $iso);
-        if ($result < 0) {
-            throw new RestException(503, 'Error when retrieving country : '.$country->error);
-        } elseif ($result == 0) {
-            throw new RestException(404, 'country not found');
-        }
-
-        $this->translateLabel($country, $lang, 'Country');
-
-        return $this->_cleanObjectDatas($country);
-    }
-
-    /**
-     * Get the list of delivery times.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number {@min 0}
-     * @param int       $active     Delivery times is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters SQL criteria to filter with.
-     *
-     * @url     GET dictionary/availability
-     *
-     * @return array [List of availability]
-     *
-     * @throws RestException 400
-     */
-    public function getAvailability($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-
-        $sql = "SELECT rowid, code, label";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_availability as t";
-        $sql .= " WHERE t.active = ".$active;
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
-            }
-                  $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(400, $this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param object    $object    Object to clean
-     * @return array 				Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
-
-        unset($object->error);
-        unset($object->errors);
-
-        return $object;
-    }
-
-    /**
-     * Translate the name of the object to the given language.
-     *
-     * @param object   $object    Object with label to translate
-     * @param string   $lang      Code of the language the name of the object must be translated to
-     * @param string   $prefix 	  Prefix for translation key
-     *
-     * @return void
-     */
-    private function translateLabel($object, $lang, $prefix = 'Country')
-    {
-        if (!empty($lang)) {
-            // Load the translations if this is a new language.
-            if ($this->translations == null || $this->translations->getDefaultLang() !== $lang) {
-                global $conf;
-                $this->translations = new Translate('', $conf);
-                $this->translations->setDefaultLang($lang);
-                $this->translations->load('dict');
-            }
-            if ($object->code) {
-                $key = $prefix.$object->code;
-
-                $translation = $this->translations->trans($key);
-                if ($translation != $key) {
-                    $object->label = html_entity_decode($translation);
-                }
-            }
-        }
-    }
-
-    /**
-     * Get the list of shipment methods.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param int       $active     Payment term is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     *
-     * @return array List of shipment methods
-     *
-     * @url     GET dictionary/shipment_methods
-     *
-     * @throws RestException
-     */
-    public function getListOfShipmentMethods($sortfield = "rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-        $sql = "SELECT t.rowid, t.code, t.libelle, t.description, t.tracking";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as t";
-        $sql .= " WHERE t.active = ".$active;
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of shipment methods : '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get the list of events types.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param string    $type       To filter on type of event
-     * @param string    $module     To filter on module events
-     * @param int       $active     Event's type is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array				List of events types
-     *
-     * @url     GET dictionary/event_types
-     *
-     * @throws RestException
-     */
-    public function getListOfEventTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $type = '', $module = '', $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-
-        $sql = "SELECT id, code, type, libelle as label, module";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm as t";
-        $sql .= " WHERE t.active = ".$active;
-        if ($type) $sql .= " AND t.type LIKE '%".$this->db->escape($type)."%'";
-        if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of events types : '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-
-    /**
-     * Get the list of Expense Report types.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param string    $module     To filter on module
-     * @param int       $active     Event's type is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array				List of expense report types
-     *
-     * @url     GET dictionary/expensereport_types
-     *
-     * @throws RestException
-     */
-    public function getListOfExpenseReportsTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $module = '', $active = 1, $sqlfilters = '')
-    {
-    	$list = array();
-
-    	$sql = "SELECT id, code, label, accountancy_code, active, module, position";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."c_type_fees as t";
-    	$sql .= " WHERE t.active = ".$active;
-    	if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
-    	// Add sql filters
-    	if ($sqlfilters)
-    	{
-    		if (!DolibarrApi::_checkFilters($sqlfilters))
-    		{
-    			throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-    		}
-    		$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-    		$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-    	}
-
-
-    	$sql .= $this->db->order($sortfield, $sortorder);
-
-    	if ($limit) {
-    		if ($page < 0) {
-    			$page = 0;
-    		}
-    		$offset = $limit * $page;
-
-    		$sql .= $this->db->plimit($limit, $offset);
-    	}
-
-    	$result = $this->db->query($sql);
-
-    	if ($result) {
-    		$num = $this->db->num_rows($result);
-    		$min = min($num, ($limit <= 0 ? $num : $limit));
-    		for ($i = 0; $i < $min; $i++) {
-    			$list[] = $this->db->fetch_object($result);
-    		}
-    	} else {
-    		throw new RestException(503, 'Error when retrieving list of expense report types : '.$this->db->lasterror());
-    	}
-
-    	return $list;
-    }
-
-
-    /**
-     * Get the list of contacts types.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param string    $type       To filter on type of contact
-     * @param string    $module     To filter on module contacts
-     * @param int       $active     Contact's type is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array	  List of Contacts types
-     *
-     * @url     GET dictionary/contact_types
-     *
-     * @throws RestException
-     */
-    public function getListOfContactTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $type = '', $module = '', $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-
-        $sql = "SELECT rowid, code, element as type, libelle as label, source, module, position";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as t";
-        $sql .= " WHERE t.active = ".$active;
-        if ($type) $sql .= " AND type LIKE '%".$this->db->escape($type)."%'";
-        if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of contacts types : '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get the list of civilities.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param string    $module     To filter on module events
-     * @param int       $active     Civility is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array		List of civility types
-     *
-     * @url     GET dictionary/civilities
-     *
-     * @throws RestException
-     */
-    public function getListOfCivilities($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $module = '', $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-
         $sql = "SELECT rowid, code, label, module";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_civility as t";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_input_reason as t";
         $sql .= " WHERE t.active = ".$active;
-        if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
         // Add sql filters
         if ($sqlfilters)
         {
             if (!DolibarrApi::_checkFilters($sqlfilters))
             {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+                throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of civility : '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get the list of currencies.
-     *
-     * @param int       $multicurrency  Multicurrency rates (0: no multicurrency, 1: last rate, 2: all rates) {@min 0} {@max 2}
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param int       $active     Payment term is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array				List of currencies
-     *
-     * @url     GET dictionary/currencies
-     *
-     * @throws RestException
-     */
-    public function getListOfCurrencies($multicurrency = 0, $sortfield = "code_iso", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-        $sql = "SELECT t.code_iso, t.label, t.unicode";
-        if (!empty($multicurrency)) $sql .= " , cr.date_sync, cr.rate ";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_currencies as t";
-        if (!empty($multicurrency)) {
-            $sql .= " JOIN ".MAIN_DB_PREFIX."multicurrency as m ON m.code=t.code_iso";
-            $sql .= " JOIN ".MAIN_DB_PREFIX."multicurrency_rate as cr ON (m.rowid = cr.fk_multicurrency)";
-        }
-        $sql .= " WHERE t.active = ".$active;
-        if (!empty($multicurrency)) {
-            $sql .= " AND m.entity IN (".getEntity('multicurrency').")";
-            if (!empty($multicurrency) && $multicurrency != 2) {
-                $sql .= " AND cr.date_sync = (SELECT MAX(cr2.date_sync) FROM ".MAIN_DB_PREFIX."multicurrency_rate AS cr2 WHERE cr2.fk_multicurrency = m.rowid)";
-            }
-        }
-
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of currency : '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get the list of extra fields.
-     *
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param string    $type       Type of element ('adherent', 'commande', 'thirdparty', 'facture', 'propal', 'product', ...)
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'SO-%')"
-     * @return array				List of extra fields
-     *
-     * @url     GET extrafields
-     *
-     * @throws RestException
-     */
-    public function getListOfExtrafields($sortfield = "t.pos", $sortorder = 'ASC', $type = '', $sqlfilters = '')
-    {
-        $list = array();
-
-        if ($type == 'thirdparty') $type = 'societe';
-        if ($type == 'contact') $type = 'socpeople';
-
-        $sql = "SELECT t.rowid, t.name, t.label, t.type, t.size, t.elementtype, t.fieldunique, t.fieldrequired, t.param, t.pos, t.alwayseditable, t.perms, t.list, t.fielddefault, t.fieldcomputed";
-        $sql .= " FROM ".MAIN_DB_PREFIX."extrafields as t";
-        $sql .= " WHERE t.entity IN (".getEntity('extrafields').")";
-        if (!empty($type)) $sql .= " AND t.elementtype = '".$this->db->escape($type)."'";
-        // Add sql filters
-        if ($sqlfilters)
-        {
-        	if (!DolibarrApi::_checkFilters($sqlfilters))
-        	{
-        		throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-        	}
-        	$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-        	$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-        	if ($this->db->num_rows($resql))
-        	{
-        		while ($tab = $this->db->fetch_object($resql))
-        		{
-        			// New usage
-        			$list[$tab->elementtype][$tab->name]['type'] = $tab->type;
-        			$list[$tab->elementtype][$tab->name]['label'] = $tab->label;
-        			$list[$tab->elementtype][$tab->name]['size'] = $tab->size;
-        			$list[$tab->elementtype][$tab->name]['elementtype'] = $tab->elementtype;
-        			$list[$tab->elementtype][$tab->name]['default'] = $tab->fielddefault;
-        			$list[$tab->elementtype][$tab->name]['computed'] = $tab->fieldcomputed;
-        			$list[$tab->elementtype][$tab->name]['unique'] = $tab->fieldunique;
-        			$list[$tab->elementtype][$tab->name]['required'] = $tab->fieldrequired;
-        			$list[$tab->elementtype][$tab->name]['param'] = ($tab->param ? unserialize($tab->param) : '');
-        			$list[$tab->elementtype][$tab->name]['pos'] = $tab->pos;
-        			$list[$tab->elementtype][$tab->name]['alwayseditable'] = $tab->alwayseditable;
-        			$list[$tab->elementtype][$tab->name]['perms'] = $tab->perms;
-        			$list[$tab->elementtype][$tab->name]['list'] = $tab->list;
-        		}
-        	}
-        } else {
-            throw new RestException(503, 'Error when retrieving list of extra fields : '.$this->db->lasterror());
-        }
-
-        if (!count($list))
-        {
-        	throw new RestException(404, 'No extrafield found');
-        }
-
-        return $list;
-    }
-
-
-    /**
-     * Get the list of towns.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param string    $zipcode    To filter on zipcode
-     * @param string    $town       To filter on city name
-     * @param int       $active     Payment term is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array				List of towns
-     *
-     * @url     GET dictionary/towns
-     *
-     * @throws RestException
-     */
-    public function getListOfTowns($sortfield = "zip,town", $sortorder = 'ASC', $limit = 100, $page = 0, $zipcode = '', $town = '', $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-
-        $sql = "SELECT rowid AS id, zip, town, fk_county, fk_pays AS fk_country";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_ziptown as t";
-        $sql .= " AND t.active = ".$active;
-        if ($zipcode) $sql .= " AND t.zip LIKE '%".$this->db->escape($zipcode)."%'";
-        if ($town)    $sql .= " AND t.town LIKE '%".$this->db->escape($town)."%'";
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of towns : '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get the list of payments terms.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number {@min 0}
-     * @param int       $active     Payment term is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters SQL criteria to filter. Syntax example "(t.code:=:'CHQ')"
-     *
-     * @url     GET dictionary/payment_terms
-     *
-     * @return array List of payment terms
-     *
-     * @throws RestException 400
-     */
-    public function getPaymentTerms($sortfield = "sortorder", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-
-        $sql = "SELECT rowid as id, code, sortorder, libelle as label, libelle_facture as descr, type_cdr, nbjour, decalage, module";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
-        $sql .= " WHERE t.entity IN (".getEntity('c_payment_term').")";
-        $sql .= " AND t.active = ".$active;
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(400, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-                $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
             $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
@@ -1142,738 +176,1797 @@ class Setup extends DolibarrApi
         return $list;
     }
 
-    /**
-     * Get the list of shipping methods.
-     *
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number {@min 0}
-     * @param int       $active     Shipping methodsm is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters SQL criteria to filter. Syntax example "(t.code:=:'CHQ')"
-     *
-     * @url     GET dictionary/shipping_methods
-     *
-     * @return array List of shipping methods
-     *
-     * @throws RestException 400
-     */
-    public function getShippingModes($limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        $list = array();
+	/**
+	 * Get the list of payments types.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number {@min 0}
+	 * @param int       $active     Payment type is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters SQL criteria to filter with. Syntax example "(t.code:=:'CHQ')"
+	 *
+	 * @url     GET dictionary/payment_types
+	 *
+	 * @return array [List of payment types]
+	 *
+	 * @throws RestException 400
+	 */
+	public function getPaymentTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
 
-        $sql = "SELECT rowid as id, code, libelle as label, description, tracking, module";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as t";
-        $sql .= " WHERE t.entity IN (".getEntity('c_shipment_mode').")";
-        $sql .= " AND t.active = ".$active;
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(400, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-                $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		if (!DolibarrApiAccess::$user->rights->propal->lire && !DolibarrApiAccess::$user->rights->commande->lire && !DolibarrApiAccess::$user->rights->facture->lire) {
+			throw new RestException(401);
+		}
+
+		$sql = "SELECT id, code, type, libelle as label, module";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_paiement as t";
+		$sql .= " WHERE t.entity IN (".getEntity('c_paiement').")";
+		$sql .= " AND t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			  $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
 
-        //$sql.= $this->db->order($sortfield, $sortorder);
+		$sql .= $this->db->order($sortfield, $sortorder);
 
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit, $offset);
-        }
+			$sql .= $this->db->plimit($limit, $offset);
+		}
 
-        $result = $this->db->query($sql);
+		$result = $this->db->query($sql);
 
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(400, $this->db->lasterror());
-        }
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(400, $this->db->lasterror());
+		}
 
-        return $list;
-    }
+		return $list;
+	}
 
-    /**
-     * Get the list of measuring units.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param int       $active     Measuring unit is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array				List of measuring unit
-     *
-     * @url     GET dictionary/units
-     *
-     * @throws RestException
-     */
-    public function getListOfMeasuringUnits($sortfield = "rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-        //TODO link with multicurrency module
-        $sql = "SELECT t.rowid, t.code, t.label,t.short_label, t.active, t.scale, t.unit_type";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_units as t";
-        $sql .= " WHERE t.active = ".$active;
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+	/**
+	 * Get the list of states/provinces.
+	 *
+	 * The names of the states will be translated to the given language if
+	 * the $lang parameter is provided. The value of $lang must be a language
+	 * code supported by Dolibarr, for example 'en_US' or 'fr_FR'.
+	 * The returned list is sorted by state ID.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param string    $filter     To filter the countries by name
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array                List of countries
+	 *
+	 * @url     GET dictionary/states
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfStates($sortfield = "code_departement", $sortorder = 'ASC', $limit = 100, $page = 0, $filter = '', $sqlfilters = '')
+	{
+		$list = array();
+
+		// Note: The filter is not applied in the SQL request because it must
+		// be applied to the translated names, not to the names in database.
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."c_departements as t";
+		$sql .= " WHERE 1 = 1";
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$obj = $this->db->fetch_object($result);
+				$state = new Cstate($this->db);
+				if ($state->fetch($obj->rowid) > 0) {
+					if (empty($filter) || stripos($state->label, $filter) !== false) {
+						$list[] = $this->_cleanObjectDatas($state);
+					}
+				}
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of states');
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get state by ID.
+	 *
+	 * @param int       $id        ID of state
+	 * @return array 			   Array of cleaned object properties
+	 *
+	 * @url     GET dictionary/states/{id}
+	 *
+	 * @throws RestException
+	 */
+	public function getStateByID($id)
+	{
+		return $this->_fetchCstate($id, '');
+	}
+
+	/**
+	 * Get state by Code.
+	 *
+	 * @param string    $code      Code of state
+	 * @return array 			   Array of cleaned object properties
+	 *
+	 * @url     GET dictionary/states/byCode/{code}
+	 *
+	 * @throws RestException
+	 */
+	public function getStateByCode($code)
+	{
+		return $this->_fetchCstate('', $code);
+	}
+
+	/**
+	 * Get the list of countries.
+	 *
+	 * The names of the countries will be translated to the given language if
+	 * the $lang parameter is provided. The value of $lang must be a language
+	 * code supported by Dolibarr, for example 'en_US' or 'fr_FR'.
+	 * The returned list is sorted by country ID.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param string    $filter     To filter the countries by name
+	 * @param string    $lang       Code of the language the label of the countries must be translated to
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array                List of countries
+	 *
+	 * @url     GET dictionary/countries
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfCountries($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $filter = '', $lang = '', $sqlfilters = '')
+	{
+		$list = array();
+
+		// Note: The filter is not applied in the SQL request because it must
+		// be applied to the translated names, not to the names in database.
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."c_country as t";
+		$sql .= " WHERE 1 = 1";
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$obj = $this->db->fetch_object($result);
+				$country = new Ccountry($this->db);
+				if ($country->fetch($obj->rowid) > 0) {
+					// Translate the name of the country if needed
+					// and then apply the filter if there is one.
+					$this->translateLabel($country, $lang, 'Country');
+
+					if (empty($filter) || stripos($country->label, $filter) !== false) {
+						$list[] = $this->_cleanObjectDatas($country);
+					}
+				}
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of countries');
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get country by ID.
+	 *
+	 * @param int       $id        ID of country
+	 * @param string    $lang      Code of the language the name of the
+	 *                             country must be translated to
+	 * @return array 			   Array of cleaned object properties
+	 *
+	 * @url     GET dictionary/countries/{id}
+	 *
+	 * @throws RestException
+	 */
+	public function getCountryByID($id, $lang = '')
+	{
+		return $this->_fetchCcountry($id, '', '', $lang);
+	}
+
+	/**
+	 * Get country by Code.
+	 *
+	 * @param string    $code      Code of country
+	 * @param string    $lang      Code of the language the name of the
+	 *                             country must be translated to
+	 * @return array 			   Array of cleaned object properties
+	 *
+	 * @url     GET dictionary/countries/byCode/{code}
+	 *
+	 * @throws RestException
+	 */
+	public function getCountryByCode($code, $lang = '')
+	{
+		return $this->_fetchCcountry('', $code, '', $lang);
+	}
+
+	/**
+	 * Get country by Iso.
+	 *
+	 * @param string    $iso       ISO of country
+	 * @param string    $lang      Code of the language the name of the
+	 *                             country must be translated to
+	 * @return array 			   Array of cleaned object properties
+	 *
+	 * @url     GET dictionary/countries/byISO/{iso}
+	 *
+	 * @throws RestException
+	 */
+	public function getCountryByISO($iso, $lang = '')
+	{
+		return $this->_fetchCcountry('', '', $iso, $lang);
+	}
+
+	/**
+	 * Get state.
+	 *
+	 * @param int       $id        ID of state
+	 * @param string    $code      Code of state
+	 * @return array 			   Array of cleaned object properties
+	 *
+	 * @throws RestException
+	 */
+	private function _fetchCstate($id, $code = '')
+	{
+		$state = new Cstate($this->db);
+
+		$result = $state->fetch($id, $code);
+		if ($result < 0) {
+			throw new RestException(503, 'Error when retrieving state : '.$state->error);
+		} elseif ($result == 0) {
+			throw new RestException(404, 'State not found');
+		}
+
+		return $this->_cleanObjectDatas($state);
+	}
+
+	/**
+	 * Get country.
+	 *
+	 * @param int       $id        ID of country
+	 * @param string    $code      Code of country
+	 * @param string    $iso       ISO of country
+	 * @param string    $lang      Code of the language the name of the
+	 *                             country must be translated to
+	 * @return array 			   Array of cleaned object properties
+	 *
+	 * @throws RestException
+	 */
+	private function _fetchCcountry($id, $code = '', $iso = '', $lang = '')
+	{
+		$country = new Ccountry($this->db);
+
+		$result = $country->fetch($id, $code, $iso);
+		if ($result < 0) {
+			throw new RestException(503, 'Error when retrieving country : '.$country->error);
+		} elseif ($result == 0) {
+			throw new RestException(404, 'country not found');
+		}
+
+		$this->translateLabel($country, $lang, 'Country');
+
+		return $this->_cleanObjectDatas($country);
+	}
+
+	/**
+	 * Get the list of delivery times.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number {@min 0}
+	 * @param int       $active     Delivery times is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters SQL criteria to filter with.
+	 *
+	 * @url     GET dictionary/availability
+	 *
+	 * @return array [List of availability]
+	 *
+	 * @throws RestException 400
+	 */
+	public function getAvailability($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		if (!DolibarrApiAccess::$user->rights->commande->lire) {
+			throw new RestException(401);
+		}
+
+		$sql = "SELECT rowid, code, label";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_availability as t";
+		$sql .= " WHERE t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
+			}
+				  $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
 
-        $sql .= $this->db->order($sortfield, $sortorder);
+		$sql .= $this->db->order($sortfield, $sortorder);
 
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit, $offset);
-        }
+			$sql .= $this->db->plimit($limit, $offset);
+		}
 
-        $result = $this->db->query($sql);
+		$result = $this->db->query($sql);
 
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of measuring units: '.$this->db->lasterror());
-        }
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(400, $this->db->lasterror());
+		}
 
-        return $list;
-    }
+		return $list;
+	}
 
-    /**
-     * Get the list of social networks.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param int       $active     Social network is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array				List of social networks
-     *
-     * @url     GET dictionary/socialnetworks
-     *
-     * @throws RestException
-     */
-    public function getListOfsocialNetworks($sortfield = "rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param Object    $object    Object to clean
+	 * @return Object 				Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        if (empty($conf->socialnetworks->enabled)) {
-            throw new RestException(400, 'API not available: this dictionary is not enabled by setup');
-        }
+		unset($object->error);
+		unset($object->errors);
+
+		return $object;
+	}
+
+	/**
+	 * Translate the name of the object to the given language.
+	 *
+	 * @param object   $object    Object with label to translate
+	 * @param string   $lang      Code of the language the name of the object must be translated to
+	 * @param string   $prefix 	  Prefix for translation key
+	 *
+	 * @return void
+	 */
+	private function translateLabel($object, $lang, $prefix = 'Country')
+	{
+		if (!empty($lang)) {
+			// Load the translations if this is a new language.
+			if ($this->translations == null || $this->translations->getDefaultLang() !== $lang) {
+				global $conf;
+				$this->translations = new Translate('', $conf);
+				$this->translations->setDefaultLang($lang);
+				$this->translations->load('dict');
+			}
+			if ($object->code) {
+				$key = $prefix.$object->code;
+
+				$translation = $this->translations->trans($key);
+				if ($translation != $key) {
+					$object->label = html_entity_decode($translation);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Get the list of shipment methods.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param int       $active     Payment term is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 *
+	 * @return array List of shipment methods
+	 *
+	 * @url     GET dictionary/shipment_methods
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfShipmentMethods($sortfield = "rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+		$sql = "SELECT t.rowid, t.code, t.libelle, t.description, t.tracking";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as t";
+		$sql .= " WHERE t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of shipment methods : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of events types.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param string    $type       To filter on type of event
+	 * @param string    $module     To filter on module events
+	 * @param int       $active     Event's type is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array				List of events types
+	 *
+	 * @url     GET dictionary/event_types
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfEventTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $type = '', $module = '', $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT id, code, type, libelle as label, module";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm as t";
+		$sql .= " WHERE t.active = ".$active;
+		if ($type) $sql .= " AND t.type LIKE '%".$this->db->escape($type)."%'";
+		if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of events types : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+
+	/**
+	 * Get the list of Expense Report types.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param string    $module     To filter on module
+	 * @param int       $active     Event's type is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array				List of expense report types
+	 *
+	 * @url     GET dictionary/expensereport_types
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfExpenseReportsTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $module = '', $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT id, code, label, accountancy_code, active, module, position";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_fees as t";
+		$sql .= " WHERE t.active = ".$active;
+		if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of expense report types : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+
+	/**
+	 * Get the list of contacts types.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param string    $type       To filter on type of contact
+	 * @param string    $module     To filter on module contacts
+	 * @param int       $active     Contact's type is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array	  List of Contacts types
+	 *
+	 * @url     GET dictionary/contact_types
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfContactTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $type = '', $module = '', $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT rowid, code, element as type, libelle as label, source, module, position";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as t";
+		$sql .= " WHERE t.active = ".$active;
+		if ($type) $sql .= " AND type LIKE '%".$this->db->escape($type)."%'";
+		if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of contacts types : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of civilities.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param string    $module     To filter on module events
+	 * @param int       $active     Civility is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array		List of civility types
+	 *
+	 * @url     GET dictionary/civilities
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfCivilities($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $module = '', $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT rowid, code, label, module";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_civility as t";
+		$sql .= " WHERE t.active = ".$active;
+		if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of civility : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of currencies.
+	 *
+	 * @param int       $multicurrency  Multicurrency rates (0: no multicurrency, 1: last rate, 2: all rates) {@min 0} {@max 2}
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param int       $active     Payment term is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array				List of currencies
+	 *
+	 * @url     GET dictionary/currencies
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfCurrencies($multicurrency = 0, $sortfield = "code_iso", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+		$sql = "SELECT t.code_iso, t.label, t.unicode";
+		if (!empty($multicurrency)) $sql .= " , cr.date_sync, cr.rate ";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_currencies as t";
+		if (!empty($multicurrency)) {
+			$sql .= " JOIN ".MAIN_DB_PREFIX."multicurrency as m ON m.code=t.code_iso";
+			$sql .= " JOIN ".MAIN_DB_PREFIX."multicurrency_rate as cr ON (m.rowid = cr.fk_multicurrency)";
+		}
+		$sql .= " WHERE t.active = ".$active;
+		if (!empty($multicurrency)) {
+			$sql .= " AND m.entity IN (".getEntity('multicurrency').")";
+			if (!empty($multicurrency) && $multicurrency != 2) {
+				$sql .= " AND cr.date_sync = (SELECT MAX(cr2.date_sync) FROM ".MAIN_DB_PREFIX."multicurrency_rate AS cr2 WHERE cr2.fk_multicurrency = m.rowid)";
+			}
+		}
+
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of currency : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of extra fields.
+	 *
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param string    $type       Type of element ('adherent', 'commande', 'thirdparty', 'facture', 'propal', 'product', ...)
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'SO-%')"
+	 * @return array				List of extra fields
+	 *
+	 * @url     GET extrafields
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfExtrafields($sortfield = "t.pos", $sortorder = 'ASC', $type = '', $sqlfilters = '')
+	{
+		$list = array();
+
+		if (!DolibarrApiAccess::$user->admin) {
+			throw new RestException(401, 'Only an admin user can get list of extrafields');
+		}
+
+		if ($type == 'thirdparty') $type = 'societe';
+		if ($type == 'contact') $type = 'socpeople';
+
+		$sql = "SELECT t.rowid, t.name, t.label, t.type, t.size, t.elementtype, t.fieldunique, t.fieldrequired, t.param, t.pos, t.alwayseditable, t.perms, t.list, t.fielddefault, t.fieldcomputed";
+		$sql .= " FROM ".MAIN_DB_PREFIX."extrafields as t";
+		$sql .= " WHERE t.entity IN (".getEntity('extrafields').")";
+		if (!empty($type)) $sql .= " AND t.elementtype = '".$this->db->escape($type)."'";
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				while ($tab = $this->db->fetch_object($resql))
+				{
+					// New usage
+					$list[$tab->elementtype][$tab->name]['type'] = $tab->type;
+					$list[$tab->elementtype][$tab->name]['label'] = $tab->label;
+					$list[$tab->elementtype][$tab->name]['size'] = $tab->size;
+					$list[$tab->elementtype][$tab->name]['elementtype'] = $tab->elementtype;
+					$list[$tab->elementtype][$tab->name]['default'] = $tab->fielddefault;
+					$list[$tab->elementtype][$tab->name]['computed'] = $tab->fieldcomputed;
+					$list[$tab->elementtype][$tab->name]['unique'] = $tab->fieldunique;
+					$list[$tab->elementtype][$tab->name]['required'] = $tab->fieldrequired;
+					$list[$tab->elementtype][$tab->name]['param'] = ($tab->param ? unserialize($tab->param) : '');
+					$list[$tab->elementtype][$tab->name]['pos'] = $tab->pos;
+					$list[$tab->elementtype][$tab->name]['alwayseditable'] = $tab->alwayseditable;
+					$list[$tab->elementtype][$tab->name]['perms'] = $tab->perms;
+					$list[$tab->elementtype][$tab->name]['list'] = $tab->list;
+				}
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of extra fields : '.$this->db->lasterror());
+		}
+
+		if (!count($list))
+		{
+			throw new RestException(404, 'No extrafield found');
+		}
+
+		return $list;
+	}
+
+
+	/**
+	 * Get the list of towns.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param string    $zipcode    To filter on zipcode
+	 * @param string    $town       To filter on city name
+	 * @param int       $active     Payment term is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array				List of towns
+	 *
+	 * @url     GET dictionary/towns
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfTowns($sortfield = "zip,town", $sortorder = 'ASC', $limit = 100, $page = 0, $zipcode = '', $town = '', $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT rowid AS id, zip, town, fk_county, fk_pays AS fk_country";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_ziptown as t";
+		$sql .= " AND t.active = ".$active;
+		if ($zipcode) $sql .= " AND t.zip LIKE '%".$this->db->escape($zipcode)."%'";
+		if ($town)    $sql .= " AND t.town LIKE '%".$this->db->escape($town)."%'";
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of towns : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of payments terms.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number {@min 0}
+	 * @param int       $active     Payment term is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters SQL criteria to filter. Syntax example "(t.code:=:'CHQ')"
+	 *
+	 * @url     GET dictionary/payment_terms
+	 *
+	 * @return array List of payment terms
+	 *
+	 * @throws RestException 400
+	 */
+	public function getPaymentTerms($sortfield = "sortorder", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		if (!DolibarrApiAccess::$user->rights->propal->lire && !DolibarrApiAccess::$user->rights->commande->lire && !DolibarrApiAccess::$user->rights->facture->lire) {
+			throw new RestException(401);
+		}
+
+		$sql = "SELECT rowid as id, code, sortorder, libelle as label, libelle_facture as descr, type_cdr, nbjour, decalage, module";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
+		$sql .= " WHERE t.entity IN (".getEntity('c_payment_term').")";
+		$sql .= " AND t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(400, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+				$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(400, $this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of shipping methods.
+	 *
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number {@min 0}
+	 * @param int       $active     Shipping methodsm is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters SQL criteria to filter. Syntax example "(t.code:=:'CHQ')"
+	 *
+	 * @url     GET dictionary/shipping_methods
+	 *
+	 * @return array List of shipping methods
+	 *
+	 * @throws RestException 400
+	 */
+	public function getShippingModes($limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT rowid as id, code, libelle as label, description, tracking, module";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as t";
+		$sql .= " WHERE t.entity IN (".getEntity('c_shipment_mode').")";
+		$sql .= " AND t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(400, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+				$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		//$sql.= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(400, $this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of measuring units.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param int       $active     Measuring unit is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array				List of measuring unit
+	 *
+	 * @url     GET dictionary/units
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfMeasuringUnits($sortfield = "rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+		//TODO link with multicurrency module
+		$sql = "SELECT t.rowid, t.code, t.label,t.short_label, t.active, t.scale, t.unit_type";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_units as t";
+		$sql .= " WHERE t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of measuring units: '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of social networks.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param int       $active     Social network is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array				List of social networks
+	 *
+	 * @url     GET dictionary/socialnetworks
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfsocialNetworks($sortfield = "rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		global $conf;
+
+		if (empty($conf->socialnetworks->enabled)) {
+			throw new RestException(400, 'API not available: this dictionary is not enabled by setup');
+		}
 
 		$list = array();
-        //TODO link with multicurrency module
-        $sql = "SELECT t.rowid, t.entity, t.code, t.label, t.url, t.icon, t.active";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_socialnetworks as t";
-        $sql .= " WHERE t.entity IN (".getEntity('c_socialnetworks').")";
-        $sql .= " AND t.active = ".$active;
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of social networks: '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-     /**
-     * Get the list of tickets categories.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param int       $active     Payment term is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array				List of ticket categories
-     *
-     * @url     GET dictionary/ticket_categories
-     *
-     * @throws RestException
-     */
-    public function getTicketsCategories($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-    	$list = array();
-
-    	$sql = "SELECT rowid, code, pos,  label, use_default, description";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_category as t";
-        $sql .= " WHERE t.active = ".$active;
-    	// Add sql filters
-    	if ($sqlfilters)
-    	{
-    		if (!DolibarrApi::_checkFilters($sqlfilters))
-    		{
-    			throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-    		}
-    		$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-    		$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-    	}
-
-
-    	$sql .= $this->db->order($sortfield, $sortorder);
-
-    	if ($limit) {
-    		if ($page < 0) {
-    			$page = 0;
-    		}
-    		$offset = $limit * $page;
-
-    		$sql .= $this->db->plimit($limit, $offset);
-    	}
-
-    	$result = $this->db->query($sql);
-
-    	if ($result) {
-    		$num = $this->db->num_rows($result);
-    		$min = min($num, ($limit <= 0 ? $num : $limit));
-    		for ($i = 0; $i < $min; $i++) {
-    			$list[] = $this->db->fetch_object($result);
-    		}
-    	} else {
-    		throw new RestException(503, 'Error when retrieving list of ticket categories : '.$this->db->lasterror());
-    	}
-
-    	return $list;
-    }
-
-    /**
-     * Get the list of tickets severity.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param int       $active     Payment term is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array				List of ticket severities
-     *
-     * @url     GET dictionary/ticket_severities
-     *
-     * @throws RestException
-     */
-    public function getTicketsSeverities($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-    	$list = array();
-
-    	$sql = "SELECT rowid, code, pos,  label, use_default, color, description";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_severity as t";
-        $sql .= " WHERE t.active = ".$active;
-    	// Add sql filters
-    	if ($sqlfilters)
-    	{
-    		if (!DolibarrApi::_checkFilters($sqlfilters))
-    		{
-    			throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-    		}
-    		$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-    		$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-    	}
-
-
-    	$sql .= $this->db->order($sortfield, $sortorder);
-
-    	if ($limit) {
-    		if ($page < 0) {
-    			$page = 0;
-    		}
-    		$offset = $limit * $page;
-
-    		$sql .= $this->db->plimit($limit, $offset);
-    	}
-
-    	$result = $this->db->query($sql);
-
-    	if ($result) {
-    		$num = $this->db->num_rows($result);
-    		$min = min($num, ($limit <= 0 ? $num : $limit));
-    		for ($i = 0; $i < $min; $i++) {
-    			$list[] = $this->db->fetch_object($result);
-    		}
-    	} else {
-    		throw new RestException(503, 'Error when retrieving list of ticket severities : '.$this->db->lasterror());
-    	}
-
-    	return $list;
-    }
-
-    /**
-     * Get the list of tickets types.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param int       $active     Payment term is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array				List of ticket types
-     *
-     * @url     GET dictionary/ticket_types
-     *
-     * @throws RestException
-     */
-    public function getTicketsTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-    	$list = array();
-
-    	$sql = "SELECT rowid, code, pos,  label, use_default, description";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_type as t";
-        $sql .= " WHERE t.active = ".(int) $active;
-    	// if ($type) $sql .= " AND t.type LIKE '%".$this->db->escape($type)."%'";
-    	// if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
-    	// Add sql filters
-    	if ($sqlfilters)
-    	{
-    		if (!DolibarrApi::_checkFilters($sqlfilters))
-    		{
-    			throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-    		}
-    		$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-    		$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-    	}
-
-
-    	$sql .= $this->db->order($sortfield, $sortorder);
-
-    	if ($limit) {
-    		if ($page < 0) {
-    			$page = 0;
-    		}
-    		$offset = $limit * $page;
-
-    		$sql .= $this->db->plimit($limit, $offset);
-    	}
-
-    	$result = $this->db->query($sql);
-
-    	if ($result) {
-    		$num = $this->db->num_rows($result);
-    		$min = min($num, ($limit <= 0 ? $num : $limit));
-    		for ($i = 0; $i < $min; $i++) {
-    			$list[] = $this->db->fetch_object($result);
-    		}
-    	} else {
-    		throw new RestException(503, 'Error when retrieving list of ticket types : '.$this->db->lasterror());
-    	}
-
-    	return $list;
-    }
-
-    /**
-     * Get properties of company
-     *
-     * @url	GET /company
-     *
-     * @return  array|mixed Data without useless information
-     *
-     */
-    public function getCompany()
-    {
-        global $mysoc;
-
-        return $this->_cleanObjectDatas($mysoc);
-    }
-
-
-    /**
-     * Get value of a setup variables
-     *
-     * Note that conf variables that stores security key or password hashes can't be loaded with API.
-     *
-     * @param	string			$constantname	Name of conf variable to get
-     * @return  array|mixed 				Data without useless information
-     *
-     * @url     GET conf/{constantname}
-     *
-     * @throws RestException 403 Forbidden
-     * @throws RestException 404 Error Bad or unknown value for constantname
-     */
-    public function getConf($constantname)
-    {
-    	global $conf;
-
-    	if (!DolibarrApiAccess::$user->admin
-    		&& (empty($conf->global->API_LOGIN_ALLOWED_FOR_ADMIN_CHECK) || DolibarrApiAccess::$user->login != $conf->global->API_LOGIN_ALLOWED_FOR_ADMIN_CHECK)) {
-    		throw new RestException(403, 'Error API open to admin users only or to the login user defined with constant API_LOGIN_ALLOWED_FOR_ADMIN_CHECK');
-    	}
-
-    	if (!preg_match('/^[a-zA-Z0-9_]+$/', $constantname) || !isset($conf->global->$constantname)) {
-    		throw new RestException(404, 'Error Bad or unknown value for constantname');
-    	}
-    	if (preg_match('/(_pass|_pw|password|secret|_key|key$)/i', $constantname)) {
-    		throw new RestException(403, 'Forbidden');
-    	}
-
-    	return $conf->global->$constantname;
-    }
-
-    /**
-     * Do a test of integrity for files and setup.
-     *
-     * @param string	$target			Can be 'local' or 'default' or Url of the signatures file to use for the test. Must be reachable by the tested Dolibarr.
-     * @return array					Result of file and setup integrity check
-     *
-     * @url     GET checkintegrity
-     *
-     * @throws RestException 404 Signature file not found
-     * @throws RestException 500 Technical error
-     * @throws RestException 503 Forbidden
-     */
-    public function getCheckIntegrity($target)
-    {
-    	global $langs, $conf;
-
-    	if (!DolibarrApiAccess::$user->admin
-    		&& (empty($conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK) || DolibarrApiAccess::$user->login != $conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK))
-    	{
-    		throw new RestException(503, 'Error API open to admin users only or to the login user defined with constant API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK');
-    	}
-
-    	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    	require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-
-    	$langs->load("admin");
-
-    	$outexpectedchecksum = '';
-    	$outcurrentchecksum = '';
-
-    	// Modified or missing files
-    	$file_list = array('missing' => array(), 'updated' => array());
-
-    	// Local file to compare to
-    	$xmlshortfile = GETPOST('xmlshortfile') ?GETPOST('xmlshortfile') : '/install/filelist-'.DOL_VERSION.'.xml';
-    	$xmlfile = DOL_DOCUMENT_ROOT.$xmlshortfile;
-    	// Remote file to compare to
-    	$xmlremote = ($target == 'default' ? '' : $target);
-    	if (empty($xmlremote) && !empty($conf->global->MAIN_FILECHECK_URL)) $xmlremote = $conf->global->MAIN_FILECHECK_URL;
-    	$param = 'MAIN_FILECHECK_URL_'.DOL_VERSION;
-    	if (empty($xmlremote) && !empty($conf->global->$param)) $xmlremote = $conf->global->$param;
-    	if (empty($xmlremote)) $xmlremote = 'https://www.dolibarr.org/files/stable/signatures/filelist-'.DOL_VERSION.'.xml';
-
-    	if ($target == 'local')
-    	{
-    		if (dol_is_file($xmlfile))
-    		{
-    			$xml = simplexml_load_file($xmlfile);
-    		} else {
-    			throw new RestException(500, $langs->trans('XmlNotFound').': '.$xmlfile);
-    		}
-    	} else {
-    		$xmlarray = getURLContent($xmlremote);
-
-    		// Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
-    		if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '404')
-    		{
-    			$xmlfile = $xmlarray['content'];
-    			//print "xmlfilestart".$xmlfile."endxmlfile";
-    			$xml = simplexml_load_string($xmlfile);
-    		} else {
-    			$errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
-    			throw new RestException(500, $errormsg);
-    		}
-    	}
-
-
-
-    	if ($xml)
-    	{
-    		$checksumconcat = array();
-    		$file_list = array();
-    		$out = '';
-
-    		// Forced constants
-    		if (is_object($xml->dolibarr_constants[0]))
-    		{
-    			$out .= load_fiche_titre($langs->trans("ForcedConstants"));
-
-    			$out .= '<div class="div-table-responsive-no-min">';
-    			$out .= '<table class="noborder">';
-    			$out .= '<tr class="liste_titre">';
-    			$out .= '<td>#</td>';
-    			$out .= '<td>'.$langs->trans("Constant").'</td>';
-    			$out .= '<td class="center">'.$langs->trans("ExpectedValue").'</td>';
-    			$out .= '<td class="center">'.$langs->trans("Value").'</td>';
-    			$out .= '</tr>'."\n";
-
-    			$i = 0;
-    			foreach ($xml->dolibarr_constants[0]->constant as $constant)    // $constant is a simpleXMLElement
-    			{
-    				$constname = $constant['name'];
-    				$constvalue = (string) $constant;
-    				$constvalue = (empty($constvalue) ? '0' : $constvalue);
-    				// Value found
-    				$value = '';
-    				if ($constname && $conf->global->$constname != '') $value = $conf->global->$constname;
-    				$valueforchecksum = (empty($value) ? '0' : $value);
-
-    				$checksumconcat[] = $valueforchecksum;
-
-    				$i++;
-    				$out .= '<tr class="oddeven">';
-    				$out .= '<td>'.$i.'</td>'."\n";
-    				$out .= '<td>'.$constname.'</td>'."\n";
-    				$out .= '<td class="center">'.$constvalue.'</td>'."\n";
-    				$out .= '<td class="center">'.$valueforchecksum.'</td>'."\n";
-    				$out .= "</tr>\n";
-    			}
-
-    			if ($i == 0)
-    			{
-    				$out .= '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-    			}
-    			$out .= '</table>';
-    			$out .= '</div>';
-
-    			$out .= '<br>';
-    		}
-
-    		// Scan htdocs
-    		if (is_object($xml->dolibarr_htdocs_dir[0]))
-    		{
-    			//var_dump($xml->dolibarr_htdocs_dir[0]['includecustom']);exit;
-    			$includecustom = (empty($xml->dolibarr_htdocs_dir[0]['includecustom']) ? 0 : $xml->dolibarr_htdocs_dir[0]['includecustom']);
-
-    			// Defined qualified files (must be same than into generate_filelist_xml.php)
-    			$regextoinclude = '\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|bak|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
-    			$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|conf|install|public\/test|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
-    			$scanfiles = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude);
-
-    			// Fill file_list with files in signature, new files, modified files
-    			$ret = getFilesUpdated($file_list, $xml->dolibarr_htdocs_dir[0], '', DOL_DOCUMENT_ROOT, $checksumconcat); // Fill array $file_list
-    			// Complete with list of new files
-    			foreach ($scanfiles as $keyfile => $valfile)
-    			{
-    				$tmprelativefilename = preg_replace('/^'.preg_quote(DOL_DOCUMENT_ROOT, '/').'/', '', $valfile['fullname']);
-    				if (!in_array($tmprelativefilename, $file_list['insignature']))
-    				{
-    					$md5newfile = @md5_file($valfile['fullname']); // Can fails if we don't have permission to open/read file
-    					$file_list['added'][] = array('filename'=>$tmprelativefilename, 'md5'=>$md5newfile);
-    				}
-    			}
-
-    			// Files missings
-    			$out .= load_fiche_titre($langs->trans("FilesMissing"));
-
-    			$out .= '<div class="div-table-responsive-no-min">';
-    			$out .= '<table class="noborder">';
-    			$out .= '<tr class="liste_titre">';
-    			$out .= '<td>#</td>';
-    			$out .= '<td>'.$langs->trans("Filename").'</td>';
-    			$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
-    			$out .= '</tr>'."\n";
-    			$tmpfilelist = dol_sort_array($file_list['missing'], 'filename');
-    			if (is_array($tmpfilelist) && count($tmpfilelist))
-    			{
-    				$i = 0;
-    				foreach ($tmpfilelist as $file)
-    				{
-    					$i++;
-    					$out .= '<tr class="oddeven">';
-    					$out .= '<td>'.$i.'</td>'."\n";
-    					$out .= '<td>'.$file['filename'].'</td>'."\n";
-    					$out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n";
-    					$out .= "</tr>\n";
-    				}
-    			} else {
-    				$out .= '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-    			}
-    			$out .= '</table>';
-    			$out .= '</div>';
-
-    			$out .= '<br>';
-
-    			// Files modified
-    			$out .= load_fiche_titre($langs->trans("FilesModified"));
-
-    			$totalsize = 0;
-    			$out .= '<div class="div-table-responsive-no-min">';
-    			$out .= '<table class="noborder">';
-    			$out .= '<tr class="liste_titre">';
-    			$out .= '<td>#</td>';
-    			$out .= '<td>'.$langs->trans("Filename").'</td>';
-    			$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
-    			$out .= '<td class="center">'.$langs->trans("CurrentChecksum").'</td>';
-    			$out .= '<td class="right">'.$langs->trans("Size").'</td>';
-    			$out .= '<td class="right">'.$langs->trans("DateModification").'</td>';
-    			$out .= '</tr>'."\n";
-    			$tmpfilelist2 = dol_sort_array($file_list['updated'], 'filename');
-    			if (is_array($tmpfilelist2) && count($tmpfilelist2))
-    			{
-    				$i = 0;
-    				foreach ($tmpfilelist2 as $file)
-    				{
-    					$i++;
-    					$out .= '<tr class="oddeven">';
-    					$out .= '<td>'.$i.'</td>'."\n";
-    					$out .= '<td>'.$file['filename'].'</td>'."\n";
-    					$out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n";
-    					$out .= '<td class="center">'.$file['md5'].'</td>'."\n";
-    					$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
-    					$totalsize += $size;
-    					$out .= '<td class="right">'.dol_print_size($size).'</td>'."\n";
-    					$out .= '<td class="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']), 'dayhour').'</td>'."\n";
-    					$out .= "</tr>\n";
-    				}
-    				$out .= '<tr class="liste_total">';
-    				$out .= '<td></td>'."\n";
-    				$out .= '<td>'.$langs->trans("Total").'</td>'."\n";
-    				$out .= '<td align="center"></td>'."\n";
-    				$out .= '<td align="center"></td>'."\n";
-    				$out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
-    				$out .= '<td class="right"></td>'."\n";
-    				$out .= "</tr>\n";
-    			} else {
-    				$out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-    			}
-    			$out .= '</table>';
-    			$out .= '</div>';
-
-    			$out .= '<br>';
-
-    			// Files added
-    			$out .= load_fiche_titre($langs->trans("FilesAdded"));
-
-    			$totalsize = 0;
-    			$out .= '<div class="div-table-responsive-no-min">';
-    			$out .= '<table class="noborder">';
-    			$out .= '<tr class="liste_titre">';
-    			$out .= '<td>#</td>';
-    			$out .= '<td>'.$langs->trans("Filename").'</td>';
-    			$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
-    			$out .= '<td class="center">'.$langs->trans("CurrentChecksum").'</td>';
-    			$out .= '<td class="right">'.$langs->trans("Size").'</td>';
-    			$out .= '<td class="right">'.$langs->trans("DateModification").'</td>';
-    			$out .= '</tr>'."\n";
-    			$tmpfilelist3 = dol_sort_array($file_list['added'], 'filename');
-    			if (is_array($tmpfilelist3) && count($tmpfilelist3))
-    			{
-    				$i = 0;
-    				foreach ($tmpfilelist3 as $file)
-    				{
-    					$i++;
-    					$out .= '<tr class="oddeven">';
-    					$out .= '<td>'.$i.'</td>'."\n";
-    					$out .= '<td>'.$file['filename'].'</td>'."\n";
-    					$out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n";
-    					$out .= '<td class="center">'.$file['md5'].'</td>'."\n";
-    					$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
-    					$totalsize += $size;
-    					$out .= '<td class="right">'.dol_print_size($size).'</td>'."\n";
-    					$out .= '<td class="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']), 'dayhour').'</td>'."\n";
-    					$out .= "</tr>\n";
-    				}
-    				$out .= '<tr class="liste_total">';
-    				$out .= '<td></td>'."\n";
-    				$out .= '<td>'.$langs->trans("Total").'</td>'."\n";
-    				$out .= '<td align="center"></td>'."\n";
-    				$out .= '<td align="center"></td>'."\n";
-    				$out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
-    				$out .= '<td class="right"></td>'."\n";
-    				$out .= "</tr>\n";
-    			} else {
-    				$out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-    			}
-    			$out .= '</table>';
-    			$out .= '</div>';
-
-
-    			// Show warning
-    			if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3))
-    			{
-    				//setEventMessages($langs->trans("FileIntegrityIsStrictlyConformedWithReference"), null, 'mesgs');
-    			} else {
-    				//setEventMessages($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), null, 'warnings');
-    			}
-    		} else {
-    			throw new RestException(500, 'Error: Failed to found dolibarr_htdocs_dir into XML file '.$xmlfile);
-    		}
-
-
-    		// Scan scripts
-
-
-    		asort($checksumconcat); // Sort list of checksum
-    		//var_dump($checksumconcat);
-    		$checksumget = md5(join(',', $checksumconcat));
-    		$checksumtoget = trim((string) $xml->dolibarr_htdocs_dir_checksum);
-
-    		$outexpectedchecksum = ($checksumtoget ? $checksumtoget : $langs->trans("Unknown"));
-    		if ($checksumget == $checksumtoget)
-    		{
-    			if (count($file_list['added']))
-    			{
-    				$resultcode = 'warning';
-    				$resultcomment = 'FileIntegrityIsOkButFilesWereAdded';
-    				//$outcurrentchecksum =  $checksumget.' - <span class="'.$resultcode.'">'.$langs->trans("FileIntegrityIsOkButFilesWereAdded").'</span>';
-    				$outcurrentchecksum = $checksumget;
-    			} else {
-    				$resultcode = 'ok';
-    				$resultcomment = 'Success';
-    				//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
-    				$outcurrentchecksum = $checksumget;
-    			}
-    		} else {
-    			$resultcode = 'error';
-    			$resultcomment = 'Error';
-    			//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
-    			$outcurrentchecksum = $checksumget;
-    		}
-    	} else {
-    		throw new RestException(404, 'No signature file known');
-    	}
-
-    	return array('resultcode'=>$resultcode, 'resultcomment'=>$resultcomment, 'expectedchecksum'=> $outexpectedchecksum, 'currentchecksum'=> $outcurrentchecksum, 'out'=>$out);
-    }
+		//TODO link with multicurrency module
+		$sql = "SELECT t.rowid, t.entity, t.code, t.label, t.url, t.icon, t.active";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_socialnetworks as t";
+		$sql .= " WHERE t.entity IN (".getEntity('c_socialnetworks').")";
+		$sql .= " AND t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of social networks: '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	 /**
+	  * Get the list of tickets categories.
+	  *
+	  * @param string    $sortfield  Sort field
+	  * @param string    $sortorder  Sort order
+	  * @param int       $limit      Number of items per page
+	  * @param int       $page       Page number (starting from zero)
+	  * @param int       $active     Payment term is active or not {@min 0} {@max 1}
+	  * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	  * @return array				List of ticket categories
+	  *
+	  * @url     GET dictionary/ticket_categories
+	  *
+	  * @throws RestException
+	  */
+	public function getTicketsCategories($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT rowid, code, pos,  label, use_default, description";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_category as t";
+		$sql .= " WHERE t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of ticket categories : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of tickets severity.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param int       $active     Payment term is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array				List of ticket severities
+	 *
+	 * @url     GET dictionary/ticket_severities
+	 *
+	 * @throws RestException
+	 */
+	public function getTicketsSeverities($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT rowid, code, pos,  label, use_default, color, description";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_severity as t";
+		$sql .= " WHERE t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of ticket severities : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of tickets types.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param int       $active     Payment term is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array				List of ticket types
+	 *
+	 * @url     GET dictionary/ticket_types
+	 *
+	 * @throws RestException
+	 */
+	public function getTicketsTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT rowid, code, pos,  label, use_default, description";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_type as t";
+		$sql .= " WHERE t.active = ".(int) $active;
+		// if ($type) $sql .= " AND t.type LIKE '%".$this->db->escape($type)."%'";
+		// if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of ticket types : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get properties of company
+	 *
+	 * @url	GET /company
+	 *
+	 * @return  array|mixed Data without useless information
+	 *
+	 */
+	public function getCompany()
+	{
+		global $mysoc;
+
+		unset($mysoc->skype);
+		unset($mysoc->twitter);
+		unset($mysoc->facebook);
+		unset($mysoc->linkedin);
+
+		unset($mysoc->note);
+		unset($mysoc->lines);
+
+		return $this->_cleanObjectDatas($mysoc);
+	}
+
+
+	/**
+	 * Get value of a setup variables
+	 *
+	 * Note that conf variables that stores security key or password hashes can't be loaded with API.
+	 *
+	 * @param	string			$constantname	Name of conf variable to get
+	 * @return  array|mixed 				Data without useless information
+	 *
+	 * @url     GET conf/{constantname}
+	 *
+	 * @throws RestException 403 Forbidden
+	 * @throws RestException 404 Error Bad or unknown value for constantname
+	 */
+	public function getConf($constantname)
+	{
+		global $conf;
+
+		if (!DolibarrApiAccess::$user->admin
+			&& (empty($conf->global->API_LOGINS_ALLOWED_FOR_CONST_READ) || DolibarrApiAccess::$user->login != $conf->global->API_LOGINS_ALLOWED_FOR_CONST_READ)) {
+			throw new RestException(403, 'Error API open to admin users only or to the users with logins defined into constant API_LOGINS_ALLOWED_FOR_CONST_READ');
+		}
+
+		if (!preg_match('/^[a-zA-Z0-9_]+$/', $constantname) || !isset($conf->global->$constantname)) {
+			throw new RestException(404, 'Error Bad or unknown value for constantname');
+		}
+		if (isASecretKey($constantname)) {
+			throw new RestException(403, 'Forbidden. This parameter cant be read with APIs');
+		}
+
+		return $conf->global->$constantname;
+	}
+
+	/**
+	 * Do a test of integrity for files and setup.
+	 *
+	 * @param string	$target			Can be 'local' or 'default' or Url of the signatures file to use for the test. Must be reachable by the tested Dolibarr.
+	 * @return array					Result of file and setup integrity check
+	 *
+	 * @url     GET checkintegrity
+	 *
+	 * @throws RestException 404 Signature file not found
+	 * @throws RestException 500 Technical error
+	 * @throws RestException 503 Forbidden
+	 */
+	public function getCheckIntegrity($target)
+	{
+		global $langs, $conf;
+
+		if (!DolibarrApiAccess::$user->admin
+			&& (empty($conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK) || DolibarrApiAccess::$user->login != $conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK))
+		{
+			throw new RestException(503, 'Error API open to admin users only or to the users with logins defined into constant API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK');
+		}
+
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+
+		$langs->load("admin");
+
+		$outexpectedchecksum = '';
+		$outcurrentchecksum = '';
+
+		// Modified or missing files
+		$file_list = array('missing' => array(), 'updated' => array());
+
+		// Local file to compare to
+		$xmlshortfile = GETPOST('xmlshortfile') ?GETPOST('xmlshortfile') : '/install/filelist-'.DOL_VERSION.'.xml';
+		$xmlfile = DOL_DOCUMENT_ROOT.$xmlshortfile;
+		// Remote file to compare to
+		$xmlremote = ($target == 'default' ? '' : $target);
+		if (empty($xmlremote) && !empty($conf->global->MAIN_FILECHECK_URL)) $xmlremote = $conf->global->MAIN_FILECHECK_URL;
+		$param = 'MAIN_FILECHECK_URL_'.DOL_VERSION;
+		if (empty($xmlremote) && !empty($conf->global->$param)) $xmlremote = $conf->global->$param;
+		if (empty($xmlremote)) $xmlremote = 'https://www.dolibarr.org/files/stable/signatures/filelist-'.DOL_VERSION.'.xml';
+
+		if ($target == 'local')
+		{
+			if (dol_is_file($xmlfile))
+			{
+				$xml = simplexml_load_file($xmlfile);
+			} else {
+				throw new RestException(500, $langs->trans('XmlNotFound').': '.$xmlfile);
+			}
+		} else {
+			$xmlarray = getURLContent($xmlremote);
+
+			// Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
+			if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '400' && $xmlarray['http_code'] != '404')
+			{
+				$xmlfile = $xmlarray['content'];
+				//print "xmlfilestart".$xmlfile."endxmlfile";
+				$xml = simplexml_load_string($xmlfile);
+			} else {
+				$errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
+				throw new RestException(500, $errormsg);
+			}
+		}
+
+
+
+		if ($xml)
+		{
+			$checksumconcat = array();
+			$file_list = array();
+			$out = '';
+
+			// Forced constants
+			if (is_object($xml->dolibarr_constants[0]))
+			{
+				$out .= load_fiche_titre($langs->trans("ForcedConstants"));
+
+				$out .= '<div class="div-table-responsive-no-min">';
+				$out .= '<table class="noborder">';
+				$out .= '<tr class="liste_titre">';
+				$out .= '<td>#</td>';
+				$out .= '<td>'.$langs->trans("Constant").'</td>';
+				$out .= '<td class="center">'.$langs->trans("ExpectedValue").'</td>';
+				$out .= '<td class="center">'.$langs->trans("Value").'</td>';
+				$out .= '</tr>'."\n";
+
+				$i = 0;
+				foreach ($xml->dolibarr_constants[0]->constant as $constant)    // $constant is a simpleXMLElement
+				{
+					$constname = $constant['name'];
+					$constvalue = (string) $constant;
+					$constvalue = (empty($constvalue) ? '0' : $constvalue);
+					// Value found
+					$value = '';
+					if ($constname && $conf->global->$constname != '') $value = $conf->global->$constname;
+					$valueforchecksum = (empty($value) ? '0' : $value);
+
+					$checksumconcat[] = $valueforchecksum;
+
+					$i++;
+					$out .= '<tr class="oddeven">';
+					$out .= '<td>'.$i.'</td>'."\n";
+					$out .= '<td>'.$constname.'</td>'."\n";
+					$out .= '<td class="center">'.$constvalue.'</td>'."\n";
+					$out .= '<td class="center">'.$valueforchecksum.'</td>'."\n";
+					$out .= "</tr>\n";
+				}
+
+				if ($i == 0)
+				{
+					$out .= '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+				}
+				$out .= '</table>';
+				$out .= '</div>';
+
+				$out .= '<br>';
+			}
+
+			// Scan htdocs
+			if (is_object($xml->dolibarr_htdocs_dir[0]))
+			{
+				//var_dump($xml->dolibarr_htdocs_dir[0]['includecustom']);exit;
+				$includecustom = (empty($xml->dolibarr_htdocs_dir[0]['includecustom']) ? 0 : $xml->dolibarr_htdocs_dir[0]['includecustom']);
+
+				// Defined qualified files (must be same than into generate_filelist_xml.php)
+				$regextoinclude = '\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|bak|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
+				$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|conf|install|public\/test|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
+				$scanfiles = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude);
+
+				// Fill file_list with files in signature, new files, modified files
+				$ret = getFilesUpdated($file_list, $xml->dolibarr_htdocs_dir[0], '', DOL_DOCUMENT_ROOT, $checksumconcat); // Fill array $file_list
+				// Complete with list of new files
+				foreach ($scanfiles as $keyfile => $valfile)
+				{
+					$tmprelativefilename = preg_replace('/^'.preg_quote(DOL_DOCUMENT_ROOT, '/').'/', '', $valfile['fullname']);
+					if (!in_array($tmprelativefilename, $file_list['insignature']))
+					{
+						$md5newfile = @md5_file($valfile['fullname']); // Can fails if we don't have permission to open/read file
+						$file_list['added'][] = array('filename'=>$tmprelativefilename, 'md5'=>$md5newfile);
+					}
+				}
+
+				// Files missings
+				$out .= load_fiche_titre($langs->trans("FilesMissing"));
+
+				$out .= '<div class="div-table-responsive-no-min">';
+				$out .= '<table class="noborder">';
+				$out .= '<tr class="liste_titre">';
+				$out .= '<td>#</td>';
+				$out .= '<td>'.$langs->trans("Filename").'</td>';
+				$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
+				$out .= '</tr>'."\n";
+				$tmpfilelist = dol_sort_array($file_list['missing'], 'filename');
+				if (is_array($tmpfilelist) && count($tmpfilelist))
+				{
+					$i = 0;
+					foreach ($tmpfilelist as $file)
+					{
+						$i++;
+						$out .= '<tr class="oddeven">';
+						$out .= '<td>'.$i.'</td>'."\n";
+						$out .= '<td>'.$file['filename'].'</td>'."\n";
+						$out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n";
+						$out .= "</tr>\n";
+					}
+				} else {
+					$out .= '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+				}
+				$out .= '</table>';
+				$out .= '</div>';
+
+				$out .= '<br>';
+
+				// Files modified
+				$out .= load_fiche_titre($langs->trans("FilesModified"));
+
+				$totalsize = 0;
+				$out .= '<div class="div-table-responsive-no-min">';
+				$out .= '<table class="noborder">';
+				$out .= '<tr class="liste_titre">';
+				$out .= '<td>#</td>';
+				$out .= '<td>'.$langs->trans("Filename").'</td>';
+				$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
+				$out .= '<td class="center">'.$langs->trans("CurrentChecksum").'</td>';
+				$out .= '<td class="right">'.$langs->trans("Size").'</td>';
+				$out .= '<td class="right">'.$langs->trans("DateModification").'</td>';
+				$out .= '</tr>'."\n";
+				$tmpfilelist2 = dol_sort_array($file_list['updated'], 'filename');
+				if (is_array($tmpfilelist2) && count($tmpfilelist2))
+				{
+					$i = 0;
+					foreach ($tmpfilelist2 as $file)
+					{
+						$i++;
+						$out .= '<tr class="oddeven">';
+						$out .= '<td>'.$i.'</td>'."\n";
+						$out .= '<td>'.$file['filename'].'</td>'."\n";
+						$out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n";
+						$out .= '<td class="center">'.$file['md5'].'</td>'."\n";
+						$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
+						$totalsize += $size;
+						$out .= '<td class="right">'.dol_print_size($size).'</td>'."\n";
+						$out .= '<td class="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']), 'dayhour').'</td>'."\n";
+						$out .= "</tr>\n";
+					}
+					$out .= '<tr class="liste_total">';
+					$out .= '<td></td>'."\n";
+					$out .= '<td>'.$langs->trans("Total").'</td>'."\n";
+					$out .= '<td align="center"></td>'."\n";
+					$out .= '<td align="center"></td>'."\n";
+					$out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
+					$out .= '<td class="right"></td>'."\n";
+					$out .= "</tr>\n";
+				} else {
+					$out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+				}
+				$out .= '</table>';
+				$out .= '</div>';
+
+				$out .= '<br>';
+
+				// Files added
+				$out .= load_fiche_titre($langs->trans("FilesAdded"));
+
+				$totalsize = 0;
+				$out .= '<div class="div-table-responsive-no-min">';
+				$out .= '<table class="noborder">';
+				$out .= '<tr class="liste_titre">';
+				$out .= '<td>#</td>';
+				$out .= '<td>'.$langs->trans("Filename").'</td>';
+				$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
+				$out .= '<td class="center">'.$langs->trans("CurrentChecksum").'</td>';
+				$out .= '<td class="right">'.$langs->trans("Size").'</td>';
+				$out .= '<td class="right">'.$langs->trans("DateModification").'</td>';
+				$out .= '</tr>'."\n";
+				$tmpfilelist3 = dol_sort_array($file_list['added'], 'filename');
+				if (is_array($tmpfilelist3) && count($tmpfilelist3))
+				{
+					$i = 0;
+					foreach ($tmpfilelist3 as $file)
+					{
+						$i++;
+						$out .= '<tr class="oddeven">';
+						$out .= '<td>'.$i.'</td>'."\n";
+						$out .= '<td>'.$file['filename'].'</td>'."\n";
+						$out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n";
+						$out .= '<td class="center">'.$file['md5'].'</td>'."\n";
+						$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
+						$totalsize += $size;
+						$out .= '<td class="right">'.dol_print_size($size).'</td>'."\n";
+						$out .= '<td class="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']), 'dayhour').'</td>'."\n";
+						$out .= "</tr>\n";
+					}
+					$out .= '<tr class="liste_total">';
+					$out .= '<td></td>'."\n";
+					$out .= '<td>'.$langs->trans("Total").'</td>'."\n";
+					$out .= '<td align="center"></td>'."\n";
+					$out .= '<td align="center"></td>'."\n";
+					$out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
+					$out .= '<td class="right"></td>'."\n";
+					$out .= "</tr>\n";
+				} else {
+					$out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+				}
+				$out .= '</table>';
+				$out .= '</div>';
+
+
+				// Show warning
+				if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3))
+				{
+					//setEventMessages($langs->trans("FileIntegrityIsStrictlyConformedWithReference"), null, 'mesgs');
+				} else {
+					//setEventMessages($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), null, 'warnings');
+				}
+			} else {
+				throw new RestException(500, 'Error: Failed to found dolibarr_htdocs_dir into XML file '.$xmlfile);
+			}
+
+
+			// Scan scripts
+
+
+			asort($checksumconcat); // Sort list of checksum
+			//var_dump($checksumconcat);
+			$checksumget = md5(join(',', $checksumconcat));
+			$checksumtoget = trim((string) $xml->dolibarr_htdocs_dir_checksum);
+
+			$outexpectedchecksum = ($checksumtoget ? $checksumtoget : $langs->trans("Unknown"));
+			if ($checksumget == $checksumtoget)
+			{
+				if (count($file_list['added']))
+				{
+					$resultcode = 'warning';
+					$resultcomment = 'FileIntegrityIsOkButFilesWereAdded';
+					//$outcurrentchecksum =  $checksumget.' - <span class="'.$resultcode.'">'.$langs->trans("FileIntegrityIsOkButFilesWereAdded").'</span>';
+					$outcurrentchecksum = $checksumget;
+				} else {
+					$resultcode = 'ok';
+					$resultcomment = 'Success';
+					//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
+					$outcurrentchecksum = $checksumget;
+				}
+			} else {
+				$resultcode = 'error';
+				$resultcomment = 'Error';
+				//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
+				$outcurrentchecksum = $checksumget;
+			}
+		} else {
+			throw new RestException(404, 'No signature file known');
+		}
+
+		return array('resultcode'=>$resultcode, 'resultcomment'=>$resultcomment, 'expectedchecksum'=> $outexpectedchecksum, 'currentchecksum'=> $outcurrentchecksum, 'out'=>$out);
+	}
 }
diff --git a/htdocs/api/class/api_status.class.php b/htdocs/api/class/api_status.class.php
index 45c69e318e0..6c80e838f0a 100644
--- a/htdocs/api/class/api_status.class.php
+++ b/htdocs/api/class/api_status.class.php
@@ -26,21 +26,21 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
  */
 class Status
 {
-    /**
-     * Get status (Dolibarr version)
-     *
-     * @return array
-     */
-    public function index()
-    {
-        global $conf;
+	/**
+	 * Get status (Dolibarr version)
+	 *
+	 * @return array
+	 */
+	public function index()
+	{
+		global $conf;
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'dolibarr_version' => DOL_VERSION,
-                'access_locked' => (empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED) ? '0' : $conf->global->MAIN_ONLY_LOGIN_ALLOWED),
-            ),
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'dolibarr_version' => DOL_VERSION,
+				'access_locked' => (empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED) ? '0' : $conf->global->MAIN_ONLY_LOGIN_ALLOWED),
+			),
+		);
+	}
 }
diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index 1ae504f523a..2c85533fd11 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -46,9 +46,9 @@ if (!$res) die("Include of main fails");
 require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/AutoLoader.php';
 
 call_user_func(function () {
-    $loader = Luracast\Restler\AutoLoader::instance();
-    spl_autoload_register($loader);
-    return $loader;
+	$loader = Luracast\Restler\AutoLoader::instance();
+	spl_autoload_register($loader);
+	return $loader;
 });
 
 require_once DOL_DOCUMENT_ROOT.'/api/class/api.class.php';
@@ -69,22 +69,22 @@ if (!empty($conf->global->MAIN_NGINX_FIX))
 // Enable and test if module Api is enabled
 if (empty($conf->global->MAIN_MODULE_API))
 {
-    $langs->load("admin");
-    dol_syslog("Call Dolibarr API interfaces with module REST disabled");
-    print $langs->trans("WarningModuleNotActive", 'Api').'.<br><br>';
-    print $langs->trans("ToActivateModule");
-    //session_destroy();
-    exit(0);
+	$langs->load("admin");
+	dol_syslog("Call Dolibarr API interfaces with module REST disabled");
+	print $langs->trans("WarningModuleNotActive", 'Api').'.<br><br>';
+	print $langs->trans("ToActivateModule");
+	//session_destroy();
+	exit(0);
 }
 
 // Test if explorer is not disabled
 if (preg_match('/api\/index\.php\/explorer/', $url) && !empty($conf->global->API_EXPLORER_DISABLED))
 {
-    $langs->load("admin");
-    dol_syslog("Call Dolibarr API interfaces with module REST disabled");
-    print $langs->trans("WarningAPIExplorerDisabled").'.<br><br>';
-    //session_destroy();
-    exit(0);
+	$langs->load("admin");
+	dol_syslog("Call Dolibarr API interfaces with module REST disabled");
+	print $langs->trans("WarningAPIExplorerDisabled").'.<br><br>';
+	//session_destroy();
+	exit(0);
 }
 
 
@@ -114,7 +114,7 @@ preg_match('/index\.php\/([^\/]+)(.*)$/', $url, $reg);
 $refreshcache = (empty($conf->global->API_PRODUCTION_DO_NOT_ALWAYS_REFRESH_CACHE) ? true : false);
 if (!empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/swagger.json' || $reg[2] == '/swagger.json/root' || $reg[2] == '/resources.json' || $reg[2] == '/resources.json/root'))
 {
-    $refreshcache = true;
+	$refreshcache = true;
 }
 
 $api = new DolibarrApi($db, '', $refreshcache);
@@ -150,104 +150,104 @@ if (!empty($conf->global->API_RESTRICT_ON_IP))
 // Call Explorer file for all APIs definitions (this part is slow)
 if (!empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/swagger.json' || $reg[2] == '/swagger.json/root' || $reg[2] == '/resources.json' || $reg[2] == '/resources.json/root'))
 {
-    // Scan all API files to load them
+	// Scan all API files to load them
 
-    $listofapis = array();
+	$listofapis = array();
 
-    $modulesdir = dolGetModulesDirs();
-    foreach ($modulesdir as $dir)
-    {
-        // Search available module
-        dol_syslog("Scan directory ".$dir." for module descriptor files, then search for API files");
+	$modulesdir = dolGetModulesDirs();
+	foreach ($modulesdir as $dir)
+	{
+		// Search available module
+		dol_syslog("Scan directory ".$dir." for module descriptor files, then search for API files");
 
-        $handle = @opendir(dol_osencode($dir));
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-            	$regmod = array();
-                if (is_readable($dir.$file) && preg_match("/^mod(.*)\.class\.php$/i", $file, $regmod))
-                {
-                    $module = strtolower($regmod[1]);
-                    $moduledirforclass = getModuleDirForApiClass($module);
-                    $modulenameforenabled = $module;
-                    if ($module == 'propale') { $modulenameforenabled = 'propal'; }
-                    if ($module == 'supplierproposal') { $modulenameforenabled = 'supplier_proposal'; }
-                    if ($module == 'ficheinter') { $modulenameforenabled = 'ficheinter'; }
+		$handle = @opendir(dol_osencode($dir));
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				$regmod = array();
+				if (is_readable($dir.$file) && preg_match("/^mod(.*)\.class\.php$/i", $file, $regmod))
+				{
+					$module = strtolower($regmod[1]);
+					$moduledirforclass = getModuleDirForApiClass($module);
+					$modulenameforenabled = $module;
+					if ($module == 'propale') { $modulenameforenabled = 'propal'; }
+					if ($module == 'supplierproposal') { $modulenameforenabled = 'supplier_proposal'; }
+					if ($module == 'ficheinter') { $modulenameforenabled = 'ficheinter'; }
 
-                    dol_syslog("Found module file ".$file." - module=".$module." - modulenameforenabled=".$modulenameforenabled." - moduledirforclass=".$moduledirforclass);
+					dol_syslog("Found module file ".$file." - module=".$module." - modulenameforenabled=".$modulenameforenabled." - moduledirforclass=".$moduledirforclass);
 
-                    // Defined if module is enabled
-                    $enabled = true;
-                    if (empty($conf->$modulenameforenabled->enabled)) $enabled = false;
+					// Defined if module is enabled
+					$enabled = true;
+					if (empty($conf->$modulenameforenabled->enabled)) $enabled = false;
 
-                    if ($enabled)
-                    {
-                        // If exists, load the API class for enable module
-                        // Search files named api_<object>.class.php into /htdocs/<module>/class directory
-                        // @todo : use getElementProperties() function ?
-                        $dir_part = dol_buildpath('/'.$moduledirforclass.'/class/');
+					if ($enabled)
+					{
+						// If exists, load the API class for enable module
+						// Search files named api_<object>.class.php into /htdocs/<module>/class directory
+						// @todo : use getElementProperties() function ?
+						$dir_part = dol_buildpath('/'.$moduledirforclass.'/class/');
 
-                        $handle_part = @opendir(dol_osencode($dir_part));
-                        if (is_resource($handle_part))
-                        {
-                            while (($file_searched = readdir($handle_part)) !== false)
-                            {
-                                if ($file_searched == 'api_access.class.php') continue;
+						$handle_part = @opendir(dol_osencode($dir_part));
+						if (is_resource($handle_part))
+						{
+							while (($file_searched = readdir($handle_part)) !== false)
+							{
+								if ($file_searched == 'api_access.class.php') continue;
 
-                                $regapi = array();
-                                if (is_readable($dir_part.$file_searched) && preg_match("/^api_(.*)\.class\.php$/i", $file_searched, $regapi))
-                                {
-                                    $classname = ucwords($regapi[1]);
-                                    $classname = str_replace('_', '', $classname);
-                                    require_once $dir_part.$file_searched;
-                                    if (class_exists($classname.'Api'))
-                                    {
-                                        //dol_syslog("Found API by index.php: classname=".$classname."Api for module ".$dir." into ".$dir_part.$file_searched);
-                                        $listofapis[strtolower($classname.'Api')] = $classname.'Api';
-                                    } elseif (class_exists($classname))
-                                    {
-                                        //dol_syslog("Found API by index.php: classname=".$classname." for module ".$dir." into ".$dir_part.$file_searched);
-                                        $listofapis[strtolower($classname)] = $classname;
-                                    } else {
-                                        dol_syslog("We found an api_xxx file (".$file_searched.") but class ".$classname." does not exists after loading file", LOG_WARNING);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
+								$regapi = array();
+								if (is_readable($dir_part.$file_searched) && preg_match("/^api_(.*)\.class\.php$/i", $file_searched, $regapi))
+								{
+									$classname = ucwords($regapi[1]);
+									$classname = str_replace('_', '', $classname);
+									require_once $dir_part.$file_searched;
+									if (class_exists($classname.'Api'))
+									{
+										//dol_syslog("Found API by index.php: classname=".$classname."Api for module ".$dir." into ".$dir_part.$file_searched);
+										$listofapis[strtolower($classname.'Api')] = $classname.'Api';
+									} elseif (class_exists($classname))
+									{
+										//dol_syslog("Found API by index.php: classname=".$classname." for module ".$dir." into ".$dir_part.$file_searched);
+										$listofapis[strtolower($classname)] = $classname;
+									} else {
+										dol_syslog("We found an api_xxx file (".$file_searched.") but class ".$classname." does not exists after loading file", LOG_WARNING);
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 
-    // Sort the classes before adding them to Restler.
-    // The Restler API Explorer shows the classes in the order they are added and it's a mess if they are not sorted.
-    asort($listofapis);
-    foreach ($listofapis as $apiname => $classname)
-    {
-        $api->r->addAPIClass($classname, $apiname);
-    }
-    //var_dump($api->r);
+	// Sort the classes before adding them to Restler.
+	// The Restler API Explorer shows the classes in the order they are added and it's a mess if they are not sorted.
+	asort($listofapis);
+	foreach ($listofapis as $apiname => $classname)
+	{
+		$api->r->addAPIClass($classname, $apiname);
+	}
+	//var_dump($api->r);
 }
 
 // Call one APIs or one definition of an API
 $regbis = array();
 if (!empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/swagger.json' && $reg[2] != '/resources.json' && preg_match('/^\/(swagger|resources)\.json\/(.+)$/', $reg[2], $regbis) && $regbis[2] != 'root')))
 {
-    $moduleobject = $reg[1];
-    if ($moduleobject == 'explorer')  // If we call page to explore details of a service
-    {
-    	$moduleobject = $regbis[2];
-    }
+	$moduleobject = $reg[1];
+	if ($moduleobject == 'explorer')  // If we call page to explore details of a service
+	{
+		$moduleobject = $regbis[2];
+	}
 
-    $moduleobject = strtolower($moduleobject);
-    $moduledirforclass = getModuleDirForApiClass($moduleobject);
+	$moduleobject = strtolower($moduleobject);
+	$moduledirforclass = getModuleDirForApiClass($moduleobject);
 
-    // Load a dedicated API file
-    dol_syslog("Load a dedicated API file moduleobject=".$moduleobject." moduledirforclass=".$moduledirforclass);
+	// Load a dedicated API file
+	dol_syslog("Load a dedicated API file moduleobject=".$moduleobject." moduledirforclass=".$moduledirforclass);
 
-    $tmpmodule = $moduleobject;
+	$tmpmodule = $moduleobject;
 	if ($tmpmodule != 'api')
 		$tmpmodule = preg_replace('/api$/i', '', $tmpmodule);
 	$classfile = str_replace('_', '', $tmpmodule);
@@ -274,7 +274,7 @@ if (!empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/swagger.json' &&
 	if ($dir_part_file)
 		$res = include_once $dir_part_file;
 	if (!$res) {
-	    dol_syslog('Failed to make include_once '.$dir_part_file, LOG_WARNING);
+		dol_syslog('Failed to make include_once '.$dir_part_file, LOG_WARNING);
 		print 'API not found (failed to include API file)';
 		header('HTTP/1.1 501 API not found (failed to include API file)');
 		//session_destroy();
diff --git a/htdocs/asset/admin/assets_extrafields.php b/htdocs/asset/admin/assets_extrafields.php
index 0bdbff93569..3334610b927 100644
--- a/htdocs/asset/admin/assets_extrafields.php
+++ b/htdocs/asset/admin/assets_extrafields.php
@@ -66,11 +66,11 @@ print load_fiche_titre($langs->trans("AssetsSetup"), $linkback, 'title_setup');
 
 $head = asset_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Assets"), -1, 'generic');
+print dol_get_fiche_head($head, 'attributes', $langs->trans("Assets"), -1, 'generic');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/asset/admin/assets_type_extrafields.php b/htdocs/asset/admin/assets_type_extrafields.php
index ba42a3374dc..e17d421437d 100644
--- a/htdocs/asset/admin/assets_type_extrafields.php
+++ b/htdocs/asset/admin/assets_type_extrafields.php
@@ -65,11 +65,11 @@ print load_fiche_titre($langs->trans("AssetsSetup"), $linkback, 'title_setup');
 
 $head = asset_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes_type', $langs->trans("Assets"), -1, 'generic');
+print dol_get_fiche_head($head, 'attributes_type', $langs->trans("Assets"), -1, 'generic');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
@@ -91,7 +91,7 @@ if ($action == 'create')
 	print "<br>";
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -104,7 +104,7 @@ if ($action == 'edit' && !empty($attrname))
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index 64e2bc2b5ad..42a5888c537 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -60,7 +60,7 @@ print load_fiche_titre($langs->trans("AssetsSetup"), $linkback, 'title_setup');
 
 $head = asset_admin_prepare_head();
 
-dol_fiche_head($head, 'settings', $langs->trans("Assets"), -1, 'generic');
+print dol_get_fiche_head($head, 'settings', $langs->trans("Assets"), -1, 'generic');
 
 
 if ($action == 'edit')
@@ -82,7 +82,7 @@ if ($action == 'edit')
 	print '</table>';
 
 	print '<br><div class="center">';
-	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
+	print '<input class="button button-save" type="submit" value="'.$langs->trans("Save").'">';
 	print '</div>';
 
 	print '</form>';
@@ -105,7 +105,7 @@ if ($action == 'edit')
 	print '</div>';
 }
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php
index 7ef3d9c011e..58307781cf2 100644
--- a/htdocs/asset/card.php
+++ b/htdocs/asset/card.php
@@ -168,7 +168,7 @@ if ($action == 'create')
 	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 
-	dol_fiche_head(array(), '');
+	print dol_get_fiche_head(array(), '');
 
 	print '<table class="border centpercent tableforfieldcreate">'."\n";
 
@@ -180,12 +180,12 @@ if ($action == 'create')
 
 	print '</table>'."\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
 	print '&nbsp; ';
-	print '<input type="'.($backtopage ? "submit" : "button").'" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
+	print '<input type="'.($backtopage ? "submit" : "button").'" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
 	print '</div>';
 
 	print '</form>';
@@ -206,7 +206,7 @@ if (($id || $ref) && $action == 'edit')
 	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent tableforfieldedit">'."\n";
 
@@ -218,10 +218,10 @@ if (($id || $ref) && $action == 'edit')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
-	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+	print ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
@@ -233,7 +233,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$res = $object->fetch_optionals();
 
 	$head = asset_prepare_head($object);
-	dol_fiche_head($head, 'card', $langs->trans("Asset"), -1, $object->picto);
+	print dol_get_fiche_head($head, 'card', $langs->trans("Asset"), -1, $object->picto);
 
 	$formconfirm = '';
 
@@ -297,7 +297,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	// Buttons for actions
diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index 2cc48489f7f..f4823ae9b6f 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -84,9 +84,9 @@ class Asset extends CommonObject
 		'ref' => array('type'=>'varchar(10)', 'label'=>'Ref', 'visible'=>1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'showoncombobox'=>1),
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,),
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'notnull'=>-1, 'searchall'=>1),
+		'fk_asset_type' => array('type'=>'integer:AssetType:asset/class/asset_type.class.php', 'label'=>'AssetsType', 'visible'=>1, 'enabled'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'searchall'=>1),
 		'amount_ht' => array('type'=>'double(24,8)', 'label'=>'AmountHTShort', 'visible'=>1, 'enabled'=>1, 'position'=>40, 'notnull'=>-1, 'isameasure'=>'1', 'help'=>"Help text",),
-		'amount_vat' => array('type'=>'double(24,8)', 'label'=>'AmountVAT', 'visible'=>1, 'enabled'=>1, 'position'=>40, 'notnull'=>-1, 'isameasure'=>'1', 'help'=>"Help text",),
-		'fk_asset_type' => array('type'=>'integer:AssetType:asset/class/asset_type.class.php', 'label'=>'AssetsType', 'visible'=>1, 'enabled'=>1, 'position'=>50, 'notnull'=>1, 'index'=>1, 'searchall'=>1),
+		'amount_vat' => array('type'=>'double(24,8)', 'label'=>'AmountVAT', 'visible'=>1, 'enabled'=>1, 'position'=>41, 'notnull'=>-1, 'isameasure'=>'1', 'help'=>"Help text",),
 		'description' => array('type'=>'text', 'label'=>'Description', 'visible'=>-1, 'enabled'=>1, 'position'=>90, 'notnull'=>-1,),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'visible'=>-1, 'enabled'=>1, 'position'=>91, 'notnull'=>-1,),
 		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'visible'=>-1, 'enabled'=>1, 'position'=>92, 'notnull'=>-1,),
@@ -113,44 +113,44 @@ class Asset extends CommonObject
 	 */
 	public $entity;
 
-    /**
-     * @var string Asset label
-     */
-    public $label;
+	/**
+	 * @var string Asset label
+	 */
+	public $label;
 
 	public $amount;
 
 	/**
 	 * @var int Thirdparty ID
 	 */
-    public $fk_soc;
+	public $fk_soc;
 
 	/**
 	 * @var string description
 	 */
 	public $description;
 
-	public $note_public;
-	public $note_private;
-
 	/**
-     * @var integer|string date_creation
-     */
+	 * @var integer|string date_creation
+	 */
 	public $date_creation;
 
 
 	public $tms;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_creat;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
+	/**
+	 * @var string import key
+	 */
 	public $import_key;
 
 	/**
@@ -158,28 +158,6 @@ class Asset extends CommonObject
 	 */
 	public $status;
 
-	// If this object has a subtable with lines
-
-	/**
-	 * @var int    Name of subtable line
-	 */
-	//public $table_element_line = 'assetdet';
-	/**
-	 * @var int    Field with ID of parent key if this field has a parent
-	 */
-	//public $fk_element = 'fk_asset';
-	/**
-	 * @var int    Name of subtable class that manage subtable lines
-	 */
-	//public $class_element_line = 'Assetline';
-	/**
-	 * @var array	List of child tables. To test if we can delete object.
-	 */
-	//protected $childtables=array();
-	/**
-	 * @var AssetLine[]     Array of subtable lines
-	 */
-	//public $lines = array();
 
 	/**
 	 * Constructor
@@ -381,7 +359,7 @@ class Asset extends CommonObject
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return the status
 	 *
@@ -391,12 +369,14 @@ class Asset extends CommonObject
 	 */
 	public static function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$langs->load("contracts");
+		$labelStatus = array();
 		$labelStatus[self::STATUS_DRAFT] = $langs->trans('Disabled');
 		$labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+		$labelStatusShort = array();
 		$labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Disabled');
 		$labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled');
 
@@ -407,7 +387,7 @@ class Asset extends CommonObject
 	}
 
 	/**
-	 *	Charge les informations d'ordre info dans l'objet commande
+	 *	Load info into asset object
 	 *
 	 *	@param  int		$id       Id of order
 	 *	@return	void
diff --git a/htdocs/asset/class/asset_type.class.php b/htdocs/asset/class/asset_type.class.php
index db2407a9376..5af5f3d7591 100644
--- a/htdocs/asset/class/asset_type.class.php
+++ b/htdocs/asset/class/asset_type.class.php
@@ -87,7 +87,7 @@ class AssetType extends CommonObject
 	 *
 	 *	@param 		DoliDB		$db		Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		$this->db = $db;
 	}
@@ -100,8 +100,8 @@ class AssetType extends CommonObject
 	 *  @param	int			$notrigger		1=do not execute triggers, 0 otherwise
 	 *  @return	int							>0 if OK, < 0 if KO
 	 */
-    public function create($user, $notrigger = 0)
-    {
+	public function create($user, $notrigger = 0)
+	{
 		global $conf;
 
 		$error = 0;
@@ -164,7 +164,7 @@ class AssetType extends CommonObject
 			$this->db->rollback();
 			return -1;
 		}
-    }
+	}
 
 	/**
 	 *  Met a jour en base donnees du type
@@ -173,7 +173,7 @@ class AssetType extends CommonObject
 	 *  @param	int			$notrigger		1=do not execute triggers, 0 otherwise
 	 *  @return	int							>0 if OK, < 0 if KO
 	 */
-    public function update($user, $notrigger = 0)
+	public function update($user, $notrigger = 0)
 	{
 		global $conf, $hookmanager;
 
@@ -299,7 +299,7 @@ class AssetType extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of asset's type
 	 *
@@ -307,7 +307,7 @@ class AssetType extends CommonObject
 	 */
 	public function liste_array()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		$assettypes = array();
@@ -424,8 +424,8 @@ class AssetType extends CommonObject
 	 *
 	 *  @return	void
 	 */
-    public function initAsSpecimen()
-    {
+	public function initAsSpecimen()
+	{
 		global $conf, $user, $langs;
 
 		// Initialize parameters
@@ -440,15 +440,15 @@ class AssetType extends CommonObject
 		$this->asset = array(
 			$user->id => $user
 		);
-    }
+	}
 
-    /**
-     *     getLibStatut
-     *
-     *     @return string     Return status of a type of asset
-     */
-    public function getLibStatut()
-    {
-        return '';
-    }
+	/**
+	 *     getLibStatut
+	 *
+	 *     @return string     Return status of a type of asset
+	 */
+	public function getLibStatut()
+	{
+		return '';
+	}
 }
diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php
index b43ec8d40cf..4c2e36aed9a 100644
--- a/htdocs/asset/document.php
+++ b/htdocs/asset/document.php
@@ -103,7 +103,7 @@ if ($object->id)
 	if (!empty($conf->notification->enabled)) $langs->load("mails");
 	$head = asset_prepare_head($object);
 
-	dol_fiche_head($head, 'document', $langs->trans("Asset"), -1, 'generic');
+	print dol_get_fiche_head($head, 'document', $langs->trans("Asset"), -1, 'generic');
 
 
 	// Build file list
@@ -135,7 +135,7 @@ if ($object->id)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$modulepart = 'asset';
 	//$permission = $user->rights->asset->create;
diff --git a/htdocs/asset/info.php b/htdocs/asset/info.php
index 801a7c85b36..d211cf0dbad 100644
--- a/htdocs/asset/info.php
+++ b/htdocs/asset/info.php
@@ -62,7 +62,7 @@ $object->info($id);
 
 $head = asset_prepare_head($object);
 
-dol_fiche_head($head, 'info', $langs->trans("Asset"), -1, 'generic');
+print dol_get_fiche_head($head, 'info', $langs->trans("Asset"), -1, 'generic');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/don/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
@@ -82,7 +82,7 @@ print '</td></tr></table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php
index d9bfea71510..cffcc8a962d 100644
--- a/htdocs/asset/list.php
+++ b/htdocs/asset/list.php
@@ -339,7 +339,7 @@ print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sort
 $topicmail = "SendAssetsRef";
 $modelmail = "asset";
 $objecttmp = new Asset($db);
-$trackid = 'xxxx'.$object->id;
+$trackid = 'asset'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($sall)
@@ -386,7 +386,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
diff --git a/htdocs/asset/note.php b/htdocs/asset/note.php
index f19249ce1d2..514e05bff72 100644
--- a/htdocs/asset/note.php
+++ b/htdocs/asset/note.php
@@ -85,7 +85,7 @@ if ($id > 0 || !empty($ref))
 
 	$head = asset_prepare_head($object);
 
-	dol_fiche_head($head, 'note', $langs->trans("Asset"), -1, 'generic');
+	print dol_get_fiche_head($head, 'note', $langs->trans("Asset"), -1, 'generic');
 
 	// Object card
 	// ------------------------------------------------------------
@@ -146,7 +146,7 @@ if ($id > 0 || !empty($ref))
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/asset/type.php b/htdocs/asset/type.php
index 1045e9135ee..fecebb676a8 100644
--- a/htdocs/asset/type.php
+++ b/htdocs/asset/type.php
@@ -196,7 +196,7 @@ llxHeader('', $langs->trans("AssetsTypeSetup"), $helpurl);
 // List of asset type
 if (!$rowid && $action != 'create' && $action != 'edit')
 {
-	//dol_fiche_head('');
+	//print dol_get_fiche_head('');
 
 	$sql = "SELECT d.rowid, d.label as label, d.accountancy_code_asset, d.accountancy_code_depreciation_asset, d.accountancy_code_depreciation_expense, d.note";
 	$sql .= " FROM ".MAIN_DB_PREFIX."asset_type as d";
@@ -324,7 +324,7 @@ if ($action == 'create')
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 
-	dol_fiche_head('');
+	print dol_get_fiche_head('');
 
 	print '<table class="border centpercent">';
 	print '<tbody>';
@@ -382,12 +382,12 @@ if ($action == 'create')
 	print '<tbody>';
 	print "</table>\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" name="button" class="button" value="'.$langs->trans("Add").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'" onclick="history.go(-1)" />';
+	print '<input type="submit" name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'" onclick="history.go(-1)" />';
 	print '</div>';
 
 	print "</form>\n";
@@ -416,7 +416,7 @@ if ($rowid > 0)
 
 		$head = asset_type_prepare_head($object);
 
-		dol_fiche_head($head, 'card', $langs->trans("AssetType"), -1, 'setup');
+		print dol_get_fiche_head($head, 'card', $langs->trans("AssetType"), -1, 'setup');
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/asset/type.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -490,7 +490,7 @@ if ($rowid > 0)
 		print '</table>';
 		print '</div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		/*
 		 * Buttons
@@ -533,7 +533,7 @@ if ($rowid > 0)
 		print '<input type="hidden" name="rowid" value="'.$object->id.'">';
 		print '<input type="hidden" name="action" value="update">';
 
-		dol_fiche_head($head, 'card', $langs->trans("AssetsType"), -1, 'setup');
+		print dol_get_fiche_head($head, 'card', $langs->trans("AssetsType"), -1, 'setup');
 
 		print '<table class="border centpercent">';
 
@@ -595,10 +595,10 @@ if ($rowid > 0)
 
 		print '</table>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
-		print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-		print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+		print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+		print ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 
 		print "</form>";
diff --git a/htdocs/asterisk/cidlookup.php b/htdocs/asterisk/cidlookup.php
index 87aaeb6d46f..7a3660e350e 100644
--- a/htdocs/asterisk/cidlookup.php
+++ b/htdocs/asterisk/cidlookup.php
@@ -35,8 +35,8 @@ $notfound = $langs->trans("Unknown");
 // Security check
 if (empty($conf->clicktodial->enabled))
 {
-    print "Error: Module Click to dial is not enabled.\n";
-    exit;
+	print "Error: Module Click to dial is not enabled.\n";
+	exit;
 }
 
 // Check parameters
diff --git a/htdocs/asterisk/wrapper.php b/htdocs/asterisk/wrapper.php
index ecc7c4fee6c..0a9ac82ce23 100644
--- a/htdocs/asterisk/wrapper.php
+++ b/htdocs/asterisk/wrapper.php
@@ -44,10 +44,10 @@ if (!defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
  */
 function llxHeader()
 {
-    print '<html>'."\n";
-    print '<head>'."\n";
-    print '<title>Asterisk redirection from Dolibarr...</title>'."\n";
-    print '</head>'."\n";
+	print '<html>'."\n";
+	print '<head>'."\n";
+	print '<title>Asterisk redirection from Dolibarr...</title>'."\n";
+	print '</head>'."\n";
 }
 
 /**
@@ -58,7 +58,7 @@ function llxHeader()
  */
 function llxFooter()
 {
-    print "\n".'</html>'."\n";
+	print "\n".'</html>'."\n";
 }
 
 require_once '../main.inc.php';
@@ -69,8 +69,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 // Security check
 if (empty($conf->clicktodial->enabled))
 {
-    accessforbidden();
-    exit;
+	accessforbidden();
+	exit;
 }
 
 
@@ -146,46 +146,46 @@ $number = strtolower($called);
 $pos = strpos($number, "local");
 if (!empty($number))
 {
-    if ($pos === false)
-    {
-        $errno = 0;
-        $errstr = 0;
-        $strCallerId = "Dolibarr call $found <".strtolower($number).">";
-        $oSocket = @fsockopen($strHost, $port, $errno, $errstr, 10);
-        if (!$oSocket)
-        {
-            print '<body>'."\n";
-            $txt = "Failed to execute fsockopen($strHost, $port, \$errno, \$errstr, 10)<br>\n";
-            print $txt;
-            dol_syslog($txt, LOG_ERR);
-            $txt = $errstr." (".$errno.")<br>\n";
-            print $txt;
-            dol_syslog($txt, LOG_ERR);
-            print '</body>'."\n";
-        } else {
-            $txt = "Call Asterisk dialer for caller: ".$caller.", called: ".$called." clicktodiallogin: ".$login;
-            dol_syslog($txt);
-            print '<body onload="javascript:history.go(-1);">'."\n";
-            print '<!-- '.$txt.' -->';
-            fputs($oSocket, "Action: login\r\n");
-            fputs($oSocket, "Events: off\r\n");
-            fputs($oSocket, "Username: $login\r\n");
-            fputs($oSocket, "Secret: $password\r\n\r\n");
-            fputs($oSocket, "Action: originate\r\n");
-            fputs($oSocket, "Channel: ".$channel.$caller."\r\n");
-            fputs($oSocket, "WaitTime: $strWaitTime\r\n");
-            fputs($oSocket, "CallerId: $strCallerId\r\n");
-            fputs($oSocket, "Exten: ".$prefix.$number."\r\n");
-            fputs($oSocket, "Context: $strContext\r\n");
-            fputs($oSocket, "Priority: $strPriority\r\n\r\n");
-            fputs($oSocket, "Action: Logoff\r\n\r\n");
-            sleep(2);
-            fclose($oSocket);
-            print '</body>'."\n";
-        }
-    }
+	if ($pos === false)
+	{
+		$errno = 0;
+		$errstr = 0;
+		$strCallerId = "Dolibarr call $found <".strtolower($number).">";
+		$oSocket = @fsockopen($strHost, $port, $errno, $errstr, 10);
+		if (!$oSocket)
+		{
+			print '<body>'."\n";
+			$txt = "Failed to execute fsockopen($strHost, $port, \$errno, \$errstr, 10)<br>\n";
+			print $txt;
+			dol_syslog($txt, LOG_ERR);
+			$txt = $errstr." (".$errno.")<br>\n";
+			print $txt;
+			dol_syslog($txt, LOG_ERR);
+			print '</body>'."\n";
+		} else {
+			$txt = "Call Asterisk dialer for caller: ".$caller.", called: ".$called." clicktodiallogin: ".$login;
+			dol_syslog($txt);
+			print '<body onload="javascript:history.go(-1);">'."\n";
+			print '<!-- '.$txt.' -->';
+			fputs($oSocket, "Action: login\r\n");
+			fputs($oSocket, "Events: off\r\n");
+			fputs($oSocket, "Username: $login\r\n");
+			fputs($oSocket, "Secret: $password\r\n\r\n");
+			fputs($oSocket, "Action: originate\r\n");
+			fputs($oSocket, "Channel: ".$channel.$caller."\r\n");
+			fputs($oSocket, "WaitTime: $strWaitTime\r\n");
+			fputs($oSocket, "CallerId: $strCallerId\r\n");
+			fputs($oSocket, "Exten: ".$prefix.$number."\r\n");
+			fputs($oSocket, "Context: $strContext\r\n");
+			fputs($oSocket, "Priority: $strPriority\r\n\r\n");
+			fputs($oSocket, "Action: Logoff\r\n\r\n");
+			sleep(2);
+			fclose($oSocket);
+			print '</body>'."\n";
+		}
+	}
 } else {
-    print 'Bad parameters in URL. Must be '.$_SERVER['PHP_SELF'].'?caller=99999&called=99999&login=xxxxx&password=xxxxx';
+	print 'Bad parameters in URL. Must be '.$_SERVER['PHP_SELF'].'?caller=99999&called=99999&login=xxxxx&password=xxxxx';
 }
 
 // End of page
diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index dabd05bf745..8a513034a4a 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -148,7 +148,7 @@ if ($action == 'builddoc')
 		$module = new $classname($db);
 		if ($generator != 'tcpdfbarcode')
 		{
-		    // May be phpbarcode
+			// May be phpbarcode
 			$template = 'standardlabel';
 			$is2d = false;
 			if ($module->encodingIsSupported($encoding))
@@ -178,19 +178,19 @@ if ($action == 'builddoc')
 	{
 		// List of values to scan for a replacement
 		$substitutionarray = array(
-		    '%LOGIN%' => $user->login,
-		    '%COMPANY%' => $mysoc->name,
-		    '%ADDRESS%' => $mysoc->address,
-		    '%ZIP%' => $mysoc->zip,
-		    '%TOWN%' => $mysoc->town,
-		    '%COUNTRY%' => $mysoc->country,
-		    '%COUNTRY_CODE%' => $mysoc->country_code,
-		    '%EMAIL%' => $mysoc->email,
-		    '%YEAR%' => $year,
-		    '%MONTH%' => $month,
-		    '%DAY%' => $day,
-		    '%DOL_MAIN_URL_ROOT%' => DOL_MAIN_URL_ROOT,
-		    '%SERVER%' => "http://".$_SERVER["SERVER_NAME"]."/",
+			'%LOGIN%' => $user->login,
+			'%COMPANY%' => $mysoc->name,
+			'%ADDRESS%' => $mysoc->address,
+			'%ZIP%' => $mysoc->zip,
+			'%TOWN%' => $mysoc->town,
+			'%COUNTRY%' => $mysoc->country,
+			'%COUNTRY_CODE%' => $mysoc->country_code,
+			'%EMAIL%' => $mysoc->email,
+			'%YEAR%' => $year,
+			'%MONTH%' => $month,
+			'%DAY%' => $day,
+			'%DOL_MAIN_URL_ROOT%' => DOL_MAIN_URL_ROOT,
+			'%SERVER%' => "http://".$_SERVER["SERVER_NAME"]."/",
 		);
 		complete_substitutions_array($substitutionarray, $langs);
 
@@ -291,8 +291,8 @@ print '</div><div class="tagtd maxwidthonsmartphone" style="overflow: hidden; wh
 $arrayoflabels = array();
 foreach (array_keys($_Avery_Labels) as $codecards)
 {
-    $labeltoshow = $_Avery_Labels[$codecards]['name'];
-    //$labeltoshow.=' ('.$_Avery_Labels[$row['code']]['paper-size'].')';
+	$labeltoshow = $_Avery_Labels[$codecards]['name'];
+	//$labeltoshow.=' ('.$_Avery_Labels[$row['code']]['paper-size'].')';
 	$arrayoflabels[$codecards] = $labeltoshow;
 }
 asort($arrayoflabels);
@@ -378,22 +378,22 @@ print '<br>';
 
 if (!empty($user->rights->produit->lire) || !empty($user->rights->service->lire))
 {
-    print '<input id="fillfromproduct" type="radio" '.((GETPOST("selectorforbarcode") == 'fillfromproduct') ? 'checked ' : '').'name="selectorforbarcode" value="fillfromproduct" class="radiobarcodeselect"> '.$langs->trans("FillBarCodeTypeAndValueFromProduct").' &nbsp; ';
-    print '<br>';
-    print '<div class="showforproductselector">';
-    $form->select_produits(GETPOST('productid', 'int'), 'productid', '', '', 0, -1, 2, '', 0, array(), 0, '1', 0, 'minwidth400imp', 1);
-    print ' &nbsp; <input type="submit" id="submitproduct" name="submitproduct" class="button" value="'.(dol_escape_htmltag($langs->trans("GetBarCode"))).'">';
-    print '</div>';
+	print '<input id="fillfromproduct" type="radio" '.((GETPOST("selectorforbarcode") == 'fillfromproduct') ? 'checked ' : '').'name="selectorforbarcode" value="fillfromproduct" class="radiobarcodeselect"> '.$langs->trans("FillBarCodeTypeAndValueFromProduct").' &nbsp; ';
+	print '<br>';
+	print '<div class="showforproductselector">';
+	$form->select_produits(GETPOST('productid', 'int'), 'productid', '', '', 0, -1, 2, '', 0, array(), 0, '1', 0, 'minwidth400imp', 1);
+	print ' &nbsp; <input type="submit" id="submitproduct" name="submitproduct" class="button" value="'.(dol_escape_htmltag($langs->trans("GetBarCode"))).'">';
+	print '</div>';
 }
 
 if (!empty($user->rights->societe->lire))
 {
-    print '<input id="fillfromthirdparty" type="radio" '.((GETPOST("selectorforbarcode") == 'fillfromthirdparty') ? 'checked ' : '').'name="selectorforbarcode" value="fillfromthirdparty" class="radiobarcodeselect"> '.$langs->trans("FillBarCodeTypeAndValueFromThirdParty").' &nbsp; ';
-    print '<br>';
-    print '<div class="showforthirdpartyselector">';
-    print $form->select_company(GETPOST('socid', 'int'), 'socid', '', 'SelectThirdParty', 0, 0, array(), 0, 'minwidth300');
-    print ' &nbsp; <input type="submit" id="submitthirdparty" name="submitthirdparty" class="button showforthirdpartyselector" value="'.(dol_escape_htmltag($langs->trans("GetBarCode"))).'">';
-    print '</div>';
+	print '<input id="fillfromthirdparty" type="radio" '.((GETPOST("selectorforbarcode") == 'fillfromthirdparty') ? 'checked ' : '').'name="selectorforbarcode" value="fillfromthirdparty" class="radiobarcodeselect"> '.$langs->trans("FillBarCodeTypeAndValueFromThirdParty").' &nbsp; ';
+	print '<br>';
+	print '<div class="showforthirdpartyselector">';
+	print $form->select_company(GETPOST('socid', 'int'), 'socid', '', 'SelectThirdParty', 0, 0, array(), 0, 'minwidth300');
+	print ' &nbsp; <input type="submit" id="submitthirdparty" name="submitthirdparty" class="button showforthirdpartyselector" value="'.(dol_escape_htmltag($langs->trans("GetBarCode"))).'">';
+	print '</div>';
 }
 
 print '<br>';
diff --git a/htdocs/blockedlog/admin/blockedlog.php b/htdocs/blockedlog/admin/blockedlog.php
index 051f8bb049a..39725eae3b7 100644
--- a/htdocs/blockedlog/admin/blockedlog.php
+++ b/htdocs/blockedlog/admin/blockedlog.php
@@ -35,6 +35,8 @@ if (!$user->admin || empty($conf->blockedlog->enabled)) accessforbidden();
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
+$withtab = GETPOST('withtab', 'int');
+
 
 /*
  * Actions
@@ -49,7 +51,7 @@ if (preg_match('/set_(.*)/', $action, $reg))
 
 	if (dolibarr_set_const($db, $code, $values, 'chaine', 0, '', $conf->entity) > 0)
 	{
-		header("Location: ".$_SERVER["PHP_SELF"]);
+		header("Location: ".$_SERVER["PHP_SELF"].($withtab ? '?withtab='.$withtab : ''));
 		exit;
 	} else {
 		dol_print_error($db);
@@ -61,7 +63,7 @@ if (preg_match('/del_(.*)/', $action, $reg))
 	$code = $reg[1];
 	if (dolibarr_del_const($db, $code, 0) > 0)
 	{
-		Header("Location: ".$_SERVER["PHP_SELF"]);
+		Header("Location: ".$_SERVER["PHP_SELF"].($withtab ? '?withtab='.$withtab : ''));
 		exit;
 	} else {
 		dol_print_error($db);
@@ -79,17 +81,15 @@ $block_static = new BlockedLog($db);
 llxHeader('', $langs->trans("BlockedLogSetup"));
 
 $linkback = '';
-if (GETPOST('withtab', 'alpha'))
-{
+if ($withtab) {
 	$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php').'">'.$langs->trans("BackToModuleList").'</a>';
 }
 
 print load_fiche_titre($langs->trans("ModuleSetup").' '.$langs->trans('BlockedLog'), $linkback);
 
-if (GETPOST('withtab', 'alpha'))
-{
+if ($withtab) {
 	$head = blockedlogadmin_prepare_head();
-	dol_fiche_head($head, 'blockedlog', '', -1);
+	print dol_get_fiche_head($head, 'blockedlog', '', -1);
 }
 
 
@@ -114,21 +114,26 @@ if (!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY)) {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("BlockedLogAuthorityUrl").img_info($langs->trans('BlockedLogAuthorityNeededToStoreYouFingerprintsInNonAlterableRemote')).'</td>';
 	print '<td class="right" width="300">';
+
 	print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="set_BLOCKEDLOG_AUTHORITY_URL">';
+	print '<input type="hidden" name="withtab" value="'.$withtab.'">';
 	print '<input type="text" name="BLOCKEDLOG_AUTHORITY_URL" value="'.$conf->global->BLOCKEDLOG_AUTHORITY_URL.'" size="40" />';
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 	print '</form>';
+
 	print '</td></tr>';
 }
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("BlockedLogDisableNotAllowedForCountry").'</td>';
 print '<td>';
+
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="set_BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY">';
+print '<input type="hidden" name="withtab" value="'.$withtab.'">';
 
 $sql = "SELECT rowid, code as code_iso, code_iso as code_iso3, label, favorite";
 $sql .= " FROM ".MAIN_DB_PREFIX."c_country";
@@ -168,9 +173,9 @@ print '</tr>';
 
 print '</table>';
 
-if (GETPOST('withtab', 'alpha'))
+if ($withtab)
 {
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 print '<br><br>';
diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index d0bee7c613c..67c6c394815 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -286,7 +286,7 @@ print load_fiche_titre($title, $linkback);
 if (GETPOST('withtab', 'alpha'))
 {
 	$head = blockedlogadmin_prepare_head();
-	dol_fiche_head($head, 'fingerprints', '', -1);
+	print dol_get_fiche_head($head, 'fingerprints', '', -1);
 }
 
 print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("FingerprintsDesc")."<br></span>\n";
@@ -559,7 +559,7 @@ jQuery(document).ready(function () {
 
 if (!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY) && !empty($conf->global->BLOCKEDLOG_AUTHORITY_URL))
 {
-    ?>
+	?>
 		<script type="text/javascript">
 
 			$.ajax({
@@ -582,7 +582,7 @@ if (!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY) && !empty($conf->glob
 
 if (GETPOST('withtab', 'alpha'))
 {
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 print '<br><br>';
diff --git a/htdocs/blockedlog/ajax/block-info.php b/htdocs/blockedlog/ajax/block-info.php
index e83a71ea9b7..ac501e6bdca 100644
--- a/htdocs/blockedlog/ajax/block-info.php
+++ b/htdocs/blockedlog/ajax/block-info.php
@@ -39,6 +39,8 @@ $block = new BlockedLog($db);
 
 if ((!$user->admin && !$user->rights->blockedlog->read) || empty($conf->blockedlog->enabled)) accessforbidden();
 
+$langs->loadLangs(array("admin"));
+
 
 /*
  * View
diff --git a/htdocs/blockedlog/class/authority.class.php b/htdocs/blockedlog/class/authority.class.php
index 69967d503a1..faed3ac7530 100644
--- a/htdocs/blockedlog/class/authority.class.php
+++ b/htdocs/blockedlog/class/authority.class.php
@@ -50,18 +50,18 @@ class BlockedLogAuthority
 	 *
 	 *      @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
-    {
-    	$this->db = $db;
-    }
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 	/**
 	 *	Get the blockchain
 	 *
 	 *	@return     string         			blockchain
 	 */
-    public function getLocalBlockChain()
-    {
+	public function getLocalBlockChain()
+	{
 
 		$block_static = new BlockedLog($this->db);
 
@@ -76,18 +76,18 @@ class BlockedLogAuthority
 		}
 
 		return $this->blockchain;
-    }
+	}
 
 	/**
 	 *	Get hash of the block chain to check
 	 *
 	 *	@return     string         			hash md5 of blockchain
 	 */
-    public function getBlockchainHash()
-    {
+	public function getBlockchainHash()
+	{
 
 		return md5($this->signature.$this->blockchain);
-    }
+	}
 
 	/**
 	 *	Get hash of the block chain to check
@@ -95,23 +95,23 @@ class BlockedLogAuthority
 	 *	@param      string		$hash		hash md5 of blockchain to test
 	 *	@return     boolean
 	 */
-    public function checkBlockchain($hash)
-    {
+	public function checkBlockchain($hash)
+	{
 
 		return ($hash === $this->getBlockchainHash());
-    }
+	}
 
 	/**
 	 *	Add a new block to the chain
 	 *
-     *	@param      string		$block		new block to chain
-     *  @return void
+	 *	@param      string		$block		new block to chain
+	 *  @return void
 	 */
-    public function addBlock($block)
-    {
+	public function addBlock($block)
+	{
 
 		$this->blockchain .= $block;
-    }
+	}
 
 	/**
 	 *	hash already exist into chain ?
@@ -119,8 +119,8 @@ class BlockedLogAuthority
 	 *	@param      string		$block		new block to chain
 	 *	@return     boolean
 	 */
-    public function checkBlock($block)
-    {
+	public function checkBlock($block)
+	{
 
 		if (strlen($block) != 64) return false;
 
@@ -131,7 +131,7 @@ class BlockedLogAuthority
 		} else {
 			return false;
 		}
-    }
+	}
 
 
 	/**
@@ -141,8 +141,8 @@ class BlockedLogAuthority
 	 *	@param      string		$signature		Signature of object to load
 	 *	@return     int         				>0 if OK, <0 if KO, 0 if not found
 	 */
-    public function fetch($id, $signature = '')
-    {
+	public function fetch($id, $signature = '')
+	{
 
 		global $langs;
 
@@ -186,7 +186,7 @@ class BlockedLogAuthority
 			$this->error = $this->db->error();
 			return -1;
 		}
-    }
+	}
 
 	/**
 	 *	Create authority in database.
@@ -194,8 +194,8 @@ class BlockedLogAuthority
 	 *	@param	User	$user      		Object user that create
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-    public function create($user)
-    {
+	public function create($user)
+	{
 
 		global $conf, $langs, $hookmanager;
 
@@ -236,7 +236,7 @@ class BlockedLogAuthority
 			$this->db->rollback();
 			return -1;
 		}
-    }
+	}
 
 	/**
 	 *	Create authority in database.
@@ -244,8 +244,8 @@ class BlockedLogAuthority
 	 *	@param	User	$user      		Object user that create
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-    public function update($user)
-    {
+	public function update($user)
+	{
 
 		global $conf, $langs, $hookmanager;
 
@@ -272,15 +272,15 @@ class BlockedLogAuthority
 			$this->db->rollback();
 			return -1;
 		}
-    }
+	}
 
 	/**
 	 *	For cron to sync to authority.
 	 *
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-    public function syncSignatureWithAuthority()
-    {
+	public function syncSignatureWithAuthority()
+	{
 		global $conf, $langs;
 
 		//TODO create cron task on activation
@@ -311,6 +311,6 @@ class BlockedLogAuthority
 			}
 		}
 
-        return 1;
-    }
+		return 1;
+	}
 }
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index b8d0304c5eb..f6402ca3b04 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -18,16 +18,6 @@
  * See https://medium.com/@lhartikk/a-blockchain-in-200-lines-of-code-963cc1cc0e54
  */
 
-/*ini_set('unserialize_callback_func', 'mycallback');
-
-function mycallback($classname)
-{
-	//var_dump($classname);
-	include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-
-}*/
-
-
 
 /**
  *	Class to manage Blocked Log
@@ -101,8 +91,8 @@ class BlockedLog
 	public $fk_user = 0;
 
 	/**
-     * @var integer|string date_creation
-     */
+	 * @var integer|string date_creation
+	 */
 	public $date_creation;
 
 	/**
@@ -182,8 +172,8 @@ class BlockedLog
 		if ($conf->banque->enabled) $this->trackedevents['PAYMENT_VARIOUS_MODIFY'] = 'logPAYMENT_VARIOUS_MODIFY';
 		if ($conf->banque->enabled) $this->trackedevents['PAYMENT_VARIOUS_DELETE'] = 'logPAYMENT_VARIOUS_DELETE';
 
-		// $conf->global->BANK_ENABLE_POS_CASHCONTROL must be set to 1 by all POS modules
-		$moduleposenabled = ($conf->cashdesk->enabled || $conf->takepos->enabled || !empty($conf->global->BANK_ENABLE_POS_CASHCONTROL));
+		// $conf->global->BANK_ENABLE_POS_CASHCONTROL must be set to 1 by all external POS modules
+		$moduleposenabled = (!empty($conf->cashdesk->enabled) || !empty($conf->takepos->enabled) || !empty($conf->global->BANK_ENABLE_POS_CASHCONTROL));
 		if ($moduleposenabled) $this->trackedevents['CASHCONTROL_VALIDATE'] = 'logCASHCONTROL_VALIDATE';
 
 		if (!empty($conf->global->BLOCKEDLOG_ADD_ACTIONS_SUPPORTED)) {
@@ -196,7 +186,7 @@ class BlockedLog
 
 	/**
 	 *  Try to retrieve source object (it it still exists)
-     * @return string
+	 * @return string
 	 */
 	public function getObjectLink()
 	{
@@ -301,7 +291,7 @@ class BlockedLog
 
 	/**
 	 *      try to retrieve user author
-     * @return string
+	 * @return string
 	 */
 	public function getUser()
 	{
@@ -377,20 +367,20 @@ class BlockedLog
 		$arrayoffieldstoexclude = array(
 			'table_element', 'fields', 'ref_previous', 'ref_next', 'origin', 'origin_id', 'oldcopy', 'picto', 'error', 'errors', 'model_pdf', 'modelpdf', 'last_main_doc', 'civility_id', 'contact', 'contact_id',
 			'table_element_line', 'ismultientitymanaged', 'isextrafieldmanaged',
-            'linkedObjectsIds',
-            'linkedObjects',
-            'fk_delivery_address',
+			'linkedObjectsIds',
+			'linkedObjects',
+			'fk_delivery_address',
 			'context',
-		    'projet'          // There is already ->fk_project
+			'projet'          // There is already ->fk_project
 		);
 		// Add more fields to exclude depending on object type
 		if ($this->element == 'cashcontrol') {
-            $arrayoffieldstoexclude = array_merge($arrayoffieldstoexclude, array(
-		        'name', 'lastname', 'firstname', 'region', 'region_id', 'region_code', 'state', 'state_id', 'state_code', 'country', 'country_id', 'country_code',
-		        'total_ht', 'total_tva', 'total_ttc', 'total_localtax1', 'total_localtax2',
-		        'barcode_type', 'barcode_type_code', 'barcode_type_label', 'barcode_type_coder', 'mode_reglement_id', 'cond_reglement_id', 'mode_reglement', 'cond_reglement', 'shipping_method_id',
-		        'fk_incoterms', 'label_incoterms', 'location_incoterms', 'lines')
-		    );
+			$arrayoffieldstoexclude = array_merge($arrayoffieldstoexclude, array(
+				'name', 'lastname', 'firstname', 'region', 'region_id', 'region_code', 'state', 'state_id', 'state_code', 'country', 'country_id', 'country_code',
+				'total_ht', 'total_tva', 'total_ttc', 'total_localtax1', 'total_localtax2',
+				'barcode_type', 'barcode_type_code', 'barcode_type_label', 'barcode_type_coder', 'mode_reglement_id', 'cond_reglement_id', 'mode_reglement', 'cond_reglement', 'shipping_method_id',
+				'fk_incoterms', 'label_incoterms', 'location_incoterms', 'lines')
+			);
 		}
 
 		// Add thirdparty info
@@ -454,7 +444,9 @@ class BlockedLog
 								'ref', 'multicurrency_code', 'multicurrency_total_ht', 'multicurrency_total_tva', 'multicurrency_total_ttc', 'qty', 'product_type', 'vat_src_code', 'tva_tx', 'info_bits', 'localtax1_tx', 'localtax2_tx', 'total_ht', 'total_tva', 'total_ttc', 'total_localtax1', 'total_localtax2'
 							))) continue; // Discard if not into a dedicated list
 
-							if (!is_object($this->object_data->invoiceline[$lineid])) $this->object_data->invoiceline[$lineid] = new stdClass();
+							if (empty($this->object_data->invoiceline[$lineid]) || !is_object($this->object_data->invoiceline[$lineid])) {		// To avoid warning
+								$this->object_data->invoiceline[$lineid] = new stdClass();
+							}
 
 							$this->object_data->invoiceline[$lineid]->{$keyline} = $valueline;
 						}
@@ -465,7 +457,7 @@ class BlockedLog
 			if (!empty($object->newref)) $this->object_data->ref = $object->newref;
 		} elseif ($this->element == 'invoice_supplier')
 		{
-			foreach ($object as $key=>$value)
+			foreach ($object as $key => $value)
 			{
 				if (in_array($key, $arrayoffieldstoexclude)) continue; // Discard some properties
 				if (!in_array($key, array(
@@ -559,7 +551,7 @@ class BlockedLog
 					foreach ($tmpobject->thirdparty as $key=>$value)
 					{
 						if (in_array($key, $arrayoffieldstoexclude)) continue; // Discard some properties
-                        if (!in_array($key, array(
+						if (!in_array($key, array(
 						'name', 'name_alias', 'ref_ext', 'address', 'zip', 'town', 'state_code', 'country_code', 'idprof1', 'idprof2', 'idprof3', 'idprof4', 'idprof5', 'idprof6', 'phone', 'fax', 'email', 'barcode',
 						'tva_intra', 'localtax1_assuj', 'localtax1_value', 'localtax2_assuj', 'localtax2_value', 'managers', 'capital', 'typent_code', 'forme_juridique_code', 'code_client', 'code_fournisseur'
 						))) continue; // Discard if not into a dedicated list
@@ -576,7 +568,7 @@ class BlockedLog
 					foreach ($tmpobject as $key=>$value)
 					{
 						if (in_array($key, $arrayoffieldstoexclude)) continue; // Discard some properties
-                        if (!in_array($key, array(
+						if (!in_array($key, array(
 						'ref', 'ref_client', 'ref_supplier', 'date', 'datef', 'type', 'total_ht', 'total_tva', 'total_ttc', 'localtax1', 'localtax2', 'revenuestamp', 'datepointoftax', 'note_public'
 						))) continue; // Discard if not into a dedicated list
 						if (!is_object($value))
@@ -632,8 +624,8 @@ class BlockedLog
 	 *	@param      int		$id       	Id of object to load
 	 *	@return     int         			>0 if OK, <0 if KO, 0 if not found
 	 */
-    public function fetch($id)
-    {
+	public function fetch($id)
+	{
 
 		global $langs;
 
@@ -722,8 +714,8 @@ class BlockedLog
 	 *
 	 *	@return	boolean
 	 */
-    public function setCertified()
-    {
+	public function setCertified()
+	{
 
 		$res = $this->db->query("UPDATE ".MAIN_DB_PREFIX."blockedlog SET certified=1 WHERE rowid=".$this->id);
 		if ($res === false) return false;
@@ -738,8 +730,8 @@ class BlockedLog
 	 *  @param	int		$forcesignature		Force signature (for example '0000000000' when we disabled the module)
 	 *	@return	int							<0 if KO, >0 if OK
 	 */
-    public function create($user, $forcesignature = '')
-    {
+	public function create($user, $forcesignature = '')
+	{
 
 		global $conf, $langs, $hookmanager;
 
@@ -1034,14 +1026,14 @@ class BlockedLog
 	}
 
 
-    /**
-     * Check if module was already used or not for at least one recording.
-     *
-     * @param   int     $ignoresystem       Ignore system events for the test
-     * @return  bool
-     */
-    public function alreadyUsed($ignoresystem = 0)
-    {
+	/**
+	 * Check if module was already used or not for at least one recording.
+	 *
+	 * @param   int     $ignoresystem       Ignore system events for the test
+	 * @return  bool
+	 */
+	public function alreadyUsed($ignoresystem = 0)
+	{
 		global $conf;
 
 		$result = false;
@@ -1061,5 +1053,5 @@ class BlockedLog
 		dol_syslog("Module Blockedlog alreadyUsed with ignoresystem=".$ignoresystem." is ".$result);
 
 		return $result;
-    }
+	}
 }
diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php
index d8361d30258..a7cc68d5677 100644
--- a/htdocs/bom/bom_agenda.php
+++ b/htdocs/bom/bom_agenda.php
@@ -43,10 +43,10 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 if (GETPOST('actioncode', 'array'))
 {
-    $actioncode = GETPOST('actioncode', 'array', 3);
-    if (!count($actioncode)) $actioncode = '0';
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) $actioncode = '0';
 } else {
-    $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
@@ -90,19 +90,19 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Cancel
-    if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-    {
-        header("Location: ".$backtopage);
-        exit;
-    }
+	// Cancel
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage))
+	{
+		header("Location: ".$backtopage);
+		exit;
+	}
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $actioncode = '';
-        $search_agenda_label = '';
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$actioncode = '';
+		$search_agenda_label = '';
+	}
 }
 
 
@@ -126,7 +126,7 @@ if ($object->id > 0)
 	$head = bomPrepareHead($object);
 
 
-	dol_fiche_head($head, 'agenda', $langs->trans("BillOfMaterials"), -1, 'bom');
+	print dol_get_fiche_head($head, 'agenda', $langs->trans("BillOfMaterials"), -1, 'bom');
 
 	// Object card
 	// ------------------------------------------------------------
@@ -177,66 +177,66 @@ if ($object->id > 0)
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
-    $object->info($object->id);
+	$object->info($object->id);
 	dol_print_object_info($object, 1);
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 
 	// Actions buttons
 
-    $objthirdparty = $object;
-    $objcon = new stdClass();
+	$objthirdparty = $object;
+	$objcon = new stdClass();
 
-    $out = '&origin='.$object->element.'&originid='.$object->id;
-    $permok = $user->rights->agenda->myactions->create;
-    if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
-    {
-        //$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
-        if (get_class($objthirdparty) == 'Societe') $out .= '&amp;socid='.$objthirdparty->id;
-        $out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage=1&amp;percentage=-1';
-    	//$out.=$langs->trans("AddAnAction").' ';
-    	//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
-    	//$out.="</a>";
+	$out = '&origin='.$object->element.'&originid='.$object->id;
+	$permok = $user->rights->agenda->myactions->create;
+	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
+	{
+		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
+		if (get_class($objthirdparty) == 'Societe') $out .= '&amp;socid='.$objthirdparty->id;
+		$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage=1&amp;percentage=-1';
+		//$out.=$langs->trans("AddAnAction").' ';
+		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
+		//$out.="</a>";
 	}
 
 
 	print '<div class="tabsAction">';
 
-    if (!empty($conf->agenda->enabled))
-    {
-    	if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
-    	{
-        	print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
-    	} else {
-        	print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
-    	}
-    }
+	if (!empty($conf->agenda->enabled))
+	{
+		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
+		{
+			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
+		} else {
+			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
+		}
+	}
 
-    print '</div>';
+	print '</div>';
 
-    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-    {
-    	$param = '&id='.$object->id.'&socid='.$socid;
-        if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-        if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
+	{
+		$param = '&id='.$object->id.'&socid='.$socid;
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 
 
 		//print load_fiche_titre($langs->trans("ActionsOnBom"), '', '');
 
-        // List of all actions
+		// List of all actions
 		$filters = array();
-        $filters['search_agenda_label'] = $search_agenda_label;
+		$filters['search_agenda_label'] = $search_agenda_label;
 
-        // TODO Replace this with same code than into list.php
-        show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
-    }
+		// TODO Replace this with same code than into list.php
+		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
+	}
 }
 
 // End of page
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 7daf29416c2..5c170d0aa72 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -133,7 +133,7 @@ if (empty($reshook))
 		$error = 0;
 
 		// Set if we used free entry or predefined product
-		$idprod = GETPOST('idprod', 'int');
+		$idprod = (int) GETPOST('idprod', 'int');
 		$qty = GETPOST('qty', 'int');
 		$qty_frozen = GETPOST('qty_frozen', 'int');
 		$disable_stock_change = GETPOST('disable_stock_change', 'int');
@@ -172,8 +172,7 @@ if (empty($reshook))
    			$bomline->position = ($ranktouse + 1);
 
 			$result = $bomline->create($user);
-			if ($result <= 0)
-			{
+			if ($result <= 0) {
 				setEventMessages($bomline->error, $bomline->errors, 'errors');
 				$action = '';
 			} else {
@@ -263,7 +262,7 @@ if ($action == 'create')
 	print '<input type="hidden" name="action" value="add">';
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
-	dol_fiche_head(array(), '');
+	print dol_get_fiche_head(array(), '');
 
 	print '<table class="border centpercent tableforfieldcreate">'."\n";
 
@@ -275,12 +274,12 @@ if ($action == 'create')
 
 	print '</table>'."\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
 	print '&nbsp; ';
-	print '<input type="'.($backtopage ? "submit" : "button").'" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
+	print '<input type="'.($backtopage ? "submit" : "button").'" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
 	print '</div>';
 
 	print '</form>';
@@ -297,7 +296,7 @@ if (($id || $ref) && $action == 'edit')
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	//$object->fields['keyfield']['disabled'] = 1;
 
@@ -311,10 +310,10 @@ if (($id || $ref) && $action == 'edit')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
-	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+	print ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
@@ -326,7 +325,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$res = $object->fetch_optionals();
 
 	$head = bomPrepareHead($object);
-	dol_fiche_head($head, 'card', $langs->trans("BillOfMaterials"), -1, 'bom');
+	print dol_get_fiche_head($head, 'card', $langs->trans("BillOfMaterials"), -1, 'bom');
 
 	$formconfirm = '';
 
@@ -535,7 +534,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 
@@ -640,12 +639,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				}
 			}
 
-			// Close / Cancel
-			if ($permissiontoadd && $object->status == $object::STATUS_VALIDATED)
-			{
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=close">'.$langs->trans("Disable").'</a>';
-			}
-
 			// Re-open
 			if ($permissiontoadd && $object->status == $object::STATUS_CANCELED)
 			{
@@ -667,6 +660,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=clone&object=bom">'.$langs->trans("ToClone").'</a>';
 			}
 
+			// Close / Cancel
+			if ($permissiontoadd && $object->status == $object::STATUS_VALIDATED)
+			{
+				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=close">'.$langs->trans("Disable").'</a>';
+			}
+
 			/*
     		if ($user->rights->bom->write)
     		{
diff --git a/htdocs/bom/bom_document.php b/htdocs/bom/bom_document.php
index 45aedbe8ee2..cf752878605 100644
--- a/htdocs/bom/bom_document.php
+++ b/htdocs/bom/bom_document.php
@@ -69,8 +69,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
-//if ($id > 0 || ! empty($ref)) $upload_dir = $conf->bom->multidir_output[$object->entity?$object->entity:1] . "/bom/" . dol_sanitizeFileName($object->id);
-if ($id > 0 || !empty($ref)) $upload_dir = $conf->bom->multidir_output[$object->entity ? $object->entity : 1]."/bom/".dol_sanitizeFileName($object->ref);
+if ($id > 0 || !empty($ref)) $upload_dir = $conf->bom->multidir_output[$object->entity ? $object->entity : 1]."/bom/".get_exdir(0, 0, 0, 1, $object);
 
 
 /*
@@ -98,7 +97,7 @@ if ($object->id)
 	 */
 	$head = bomPrepareHead($object);
 
-	dol_fiche_head($head, 'document', $langs->trans("BillOfMaterials"), -1, 'bom');
+	print dol_get_fiche_head($head, 'document', $langs->trans("BillOfMaterials"), -1, 'bom');
 
 
 	// Build file list
@@ -115,9 +114,9 @@ if ($object->id)
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">';
 
 	// Number of files
@@ -130,7 +129,7 @@ if ($object->id)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$modulepart = 'bom';
 	$permission = $user->rights->bom->write;
diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index 121517b2544..8f8c13f2556 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -85,7 +85,7 @@ $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val)
 {
-	if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
+	if (GETPOST('search_'.$key, 'alpha') !== '') $search[$key] = GETPOST('search_'.$key, 'alpha');
 }
 
 // List of fields to search into when doing a "search in all"
@@ -311,6 +311,7 @@ foreach ($search as $key => $val)
 	}
 	if ($search[$key] != '') $sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
 }
+
 if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -382,21 +383,6 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 
 llxHeader('', $title, $help_url);
 
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
-
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
@@ -438,7 +424,7 @@ print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sort
 $topicmail = "SendBillOfMaterialsRef";
 $modelmail = "bom";
 $objecttmp = new BOM($db);
-$trackid = 'xxxx'.$object->id;
+$trackid = 'bom'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($search_all)
@@ -468,7 +454,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive">';
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
@@ -485,7 +471,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
@@ -556,22 +542,22 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
 
-    // Show here line of result
-    print '<tr class="oddeven">';
-    foreach ($object->fields as $key => $val)
-    {
-    	$cssforfield = (empty($val['css']) ? '' : $val['css']);
-    	if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-    	elseif ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
+	// Show here line of result
+	print '<tr class="oddeven">';
+	foreach ($object->fields as $key => $val)
+	{
+		$cssforfield = (empty($val['css']) ? '' : $val['css']);
+		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
+		elseif ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
 
-    	if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-    	elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 
-    	if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') $cssforfield .= ($cssforfield ? ' ' : '').'right';
-    	if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') $cssforfield .= ($cssforfield ? ' ' : '').'right';
+		if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
 
-        if (!empty($arrayfields['t.'.$key]['checked']))
-        {
+		if (!empty($arrayfields['t.'.$key]['checked']))
+		{
 			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
 			if ($key == 'status') print $object->getLibStatut(5);
 			else print $object->showOutputField($val, $key, $object->$key, '');
@@ -582,8 +568,8 @@ while ($i < ($limit ? min($num, $limit) : $num))
 				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				$totalarray['val']['t.'.$key] += $object->$key;
 			}
-        }
-    }
+		}
+	}
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
diff --git a/htdocs/bom/bom_note.php b/htdocs/bom/bom_note.php
index df1693e84b0..78b38732f7f 100644
--- a/htdocs/bom/bom_note.php
+++ b/htdocs/bom/bom_note.php
@@ -83,7 +83,7 @@ if ($id > 0 || !empty($ref))
 
 	$head = bomPrepareHead($object);
 
-	dol_fiche_head($head, 'note', $langs->trans("BillOfMaterials"), -1, 'bom');
+	print dol_get_fiche_head($head, 'note', $langs->trans("BillOfMaterials"), -1, 'bom');
 
 	// Object card
 	// ------------------------------------------------------------
@@ -144,7 +144,7 @@ if ($id > 0 || !empty($ref))
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/bom/class/api_boms.class.php b/htdocs/bom/class/api_boms.class.php
index b9123b8c226..563cfe35263 100644
--- a/htdocs/bom/class/api_boms.class.php
+++ b/htdocs/bom/class/api_boms.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2019 Maxime Kohlhaas <maxime@atm-consulting.fr>
+ * Copyright (C) 2020     	Frédéric 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
@@ -35,317 +36,315 @@ require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
  */
 class Boms extends DolibarrApi
 {
-    /**
-     * @var BOM $bom {@type BOM}
-     */
-    public $bom;
+	/**
+	 * @var BOM $bom {@type BOM}
+	 */
+	public $bom;
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
 		global $db, $conf;
 		$this->db = $db;
-        $this->bom = new BOM($this->db);
-    }
+		$this->bom = new BOM($this->db);
+	}
 
-    /**
-     * Get properties of a bom object
-     *
-     * Return an array with bom informations
-     *
-     * @param 	int 	$id ID of bom
-     * @return 	array|mixed data without useless information
+	/**
+	 * Get properties of a bom object
 	 *
-     * @url	GET {id}
-     * @throws 	RestException
-     */
-    public function get($id)
-    {
+	 * Return an array with bom informations
+	 *
+	 * @param 	int 	$id ID of bom
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @url	GET {id}
+	 * @throws 	RestException
+	 */
+	public function get($id)
+	{
 		if (!DolibarrApiAccess::$user->rights->bom->read) {
 			throw new RestException(401);
 		}
 
-        $result = $this->bom->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'BOM not found');
-        }
+		$result = $this->bom->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'BOM not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('bom', $this->bom->id, 'bom_bom')) {
+		if (!DolibarrApi::_checkAccessToResource('bom', $this->bom->id, 'bom_bom')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		return $this->_cleanObjectDatas($this->bom);
-    }
+	}
 
 
-    /**
-     * List boms
-     *
-     * Get a list of boms
-     *
-     * @param string	       $sortfield	        Sort field
-     * @param string	       $sortorder	        Sort order
-     * @param int		       $limit		        Limit for list
-     * @param int		       $page		        Page number
-     * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-     * @return  array                               Array of order objects
-     *
-     * @throws RestException
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
-    {
-        global $db, $conf;
+	/**
+	 * List boms
+	 *
+	 * Get a list of boms
+	 *
+	 * @param string	       $sortfield	        Sort field
+	 * @param string	       $sortorder	        Sort order
+	 * @param int		       $limit		        Limit for list
+	 * @param int		       $page		        Page number
+	 * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+	 * @return  array                               Array of order objects
+	 *
+	 * @throws RestException
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
-        $tmpobject = new BOM($this->db);
+		$obj_ret = array();
+		$tmpobject = new BOM($this->db);
 
-        $socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : '';
+		$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : '';
 
-        $restrictonsocid = 0; // Set to 1 if there is a field socid in table of object
+		$restrictonsocid = 0; // Set to 1 if there is a field socid in table of object
 
-        // If the internal user must only see his customers, force searching by him
-        $search_sale = 0;
-        if ($restrictonsocid && !DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
+		// If the internal user must only see his customers, force searching by him
+		$search_sale = 0;
+		if ($restrictonsocid && !DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
 
-        $sql = "SELECT t.rowid";
-        if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql .= " FROM ".MAIN_DB_PREFIX.$tmpobject->table_element." as t";
+		$sql = "SELECT t.rowid";
+		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		$sql .= " FROM ".MAIN_DB_PREFIX.$tmpobject->table_element." as t";
 
-        if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
-        $sql .= " WHERE 1 = 1";
+		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		$sql .= " WHERE 1 = 1";
 
-        // Example of use $mode
-        //if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
-        //if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
+		// Example of use $mode
+		//if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
+		//if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
 
-        if ($tmpobject->ismultientitymanaged) $sql .= ' AND t.entity IN ('.getEntity($tmpobject->element).')';
-        if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-        if ($restrictonsocid && $socid) $sql .= " AND t.fk_soc = ".$socid;
-        if ($restrictonsocid && $search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
-        // Insert sale filter
-        if ($restrictonsocid && $search_sale > 0)
-        {
-            $sql .= " AND sc.fk_user = ".$search_sale;
-        }
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		if ($tmpobject->ismultientitymanaged) $sql .= ' AND t.entity IN ('.getEntity($tmpobject->element).')';
+		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
+		if ($restrictonsocid && $socid) $sql .= " AND t.fk_soc = ".$socid;
+		if ($restrictonsocid && $search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		// Insert sale filter
+		if ($restrictonsocid && $search_sale > 0)
+		{
+			$sql .= " AND sc.fk_user = ".$search_sale;
+		}
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-        	$num = $this->db->num_rows($result);
-            $i = 0;
-            while ($i < $num)
-            {
-            	$obj = $this->db->fetch_object($result);
-            	$bom_static = new BOM($this->db);
-                if ($bom_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($bom_static);
-                }
-                $i++;
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieve bom list');
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No bom found');
-        }
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($result);
+				$bom_static = new BOM($this->db);
+				if ($bom_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($bom_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve bom list');
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No bom found');
+		}
 		return $obj_ret;
-    }
+	}
 
-    /**
-     * Create bom object
-     *
-     * @param array $request_data   Request datas
-     * @return int  ID of bom
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->bom->write) {
-            throw new RestException(401);
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+	/**
+	 * Create bom object
+	 *
+	 * @param array $request_data   Request datas
+	 * @return int  ID of bom
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->bom->write) {
+			throw new RestException(401);
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        foreach ($request_data as $field => $value) {
-            $this->bom->$field = $value;
-        }
-        if (!$this->bom->create(DolibarrApiAccess::$user)) {
-            throw new RestException(500, "Error creating BOM", array_merge(array($this->bom->error), $this->bom->errors));
-        }
-        return $this->bom->id;
-    }
+		foreach ($request_data as $field => $value) {
+			$this->bom->$field = $value;
+		}
+		if (!$this->bom->create(DolibarrApiAccess::$user)) {
+			throw new RestException(500, "Error creating BOM", array_merge(array($this->bom->error), $this->bom->errors));
+		}
+		return $this->bom->id;
+	}
 
-    /**
-     * Update bom
-     *
-     * @param int   $id             Id of bom to update
-     * @param array $request_data   Datas
-     *
-     * @return int
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->bom->write) {
-            throw new RestException(401);
-        }
+	/**
+	 * Update bom
+	 *
+	 * @param int   $id             Id of bom to update
+	 * @param array $request_data   Datas
+	 *
+	 * @return int
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->bom->write) {
+			throw new RestException(401);
+		}
 
-        $result = $this->bom->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'BOM not found');
-        }
+		$result = $this->bom->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'BOM not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('bom', $this->bom->id, 'bom_bom')) {
+		if (!DolibarrApi::_checkAccessToResource('bom', $this->bom->id, 'bom_bom')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $this->bom->$field = $value;
-        }
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$this->bom->$field = $value;
+		}
 
-        if ($this->bom->update($id, DolibarrApiAccess::$user) > 0)
-        {
-            return $this->get($id);
-        } else {
-            throw new RestException(500, $this->bom->error);
-        }
-    }
+		if ($this->bom->update(DolibarrApiAccess::$user) > 0) {
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $this->bom->error);
+		}
+	}
 
-    /**
-     * Delete bom
-     *
-     * @param   int     $id   BOM ID
-     * @return  array
-     */
-    public function delete($id)
-    {
-    	if (!DolibarrApiAccess::$user->rights->bom->delete) {
+	/**
+	 * Delete bom
+	 *
+	 * @param   int     $id   BOM ID
+	 * @return  array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->bom->delete) {
 			throw new RestException(401);
 		}
-        $result = $this->bom->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'BOM not found');
-        }
+		$result = $this->bom->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'BOM not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('bom', $this->bom->id, 'bom_bom')) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('bom', $this->bom->id, 'bom_bom')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
 		if (!$this->bom->delete(DolibarrApiAccess::$user))
-        {
-            throw new RestException(500, 'Error when deleting BOM : '.$this->bom->error);
-        }
+		{
+			throw new RestException(500, 'Error when deleting BOM : '.$this->bom->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'BOM deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'BOM deleted'
+			)
+		);
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object     Object to clean
-     * @return  array               Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-    	$object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-    	unset($object->rowid);
-    	unset($object->canvas);
+		unset($object->rowid);
+		unset($object->canvas);
 
-    	unset($object->name);
-    	unset($object->lastname);
-    	unset($object->firstname);
-    	unset($object->civility_id);
-    	unset($object->statut);
-    	unset($object->state);
-    	unset($object->state_id);
-    	unset($object->state_code);
-    	unset($object->region);
-    	unset($object->region_code);
-    	unset($object->country);
-    	unset($object->country_id);
-    	unset($object->country_code);
-    	unset($object->barcode_type);
-    	unset($object->barcode_type_code);
-    	unset($object->barcode_type_label);
-    	unset($object->barcode_type_coder);
-    	unset($object->total_ht);
-    	unset($object->total_tva);
-    	unset($object->total_localtax1);
-    	unset($object->total_localtax2);
-    	unset($object->total_ttc);
-    	unset($object->fk_account);
-    	unset($object->comments);
-    	unset($object->note);
-    	unset($object->mode_reglement_id);
-    	unset($object->cond_reglement_id);
-    	unset($object->cond_reglement);
-    	unset($object->shipping_method_id);
-    	unset($object->fk_incoterms);
-    	unset($object->label_incoterms);
-    	unset($object->location_incoterms);
+		unset($object->name);
+		unset($object->lastname);
+		unset($object->firstname);
+		unset($object->civility_id);
+		unset($object->statut);
+		unset($object->state);
+		unset($object->state_id);
+		unset($object->state_code);
+		unset($object->region);
+		unset($object->region_code);
+		unset($object->country);
+		unset($object->country_id);
+		unset($object->country_code);
+		unset($object->barcode_type);
+		unset($object->barcode_type_code);
+		unset($object->barcode_type_label);
+		unset($object->barcode_type_coder);
+		unset($object->total_ht);
+		unset($object->total_tva);
+		unset($object->total_localtax1);
+		unset($object->total_localtax2);
+		unset($object->total_ttc);
+		unset($object->fk_account);
+		unset($object->comments);
+		unset($object->note);
+		unset($object->mode_reglement_id);
+		unset($object->cond_reglement_id);
+		unset($object->cond_reglement);
+		unset($object->shipping_method_id);
+		unset($object->fk_incoterms);
+		unset($object->label_incoterms);
+		unset($object->location_incoterms);
 
-    	// If object has lines, remove $db property
-    	if (isset($object->lines) && is_array($object->lines) && count($object->lines) > 0) {
-    		$nboflines = count($object->lines);
-    		for ($i = 0; $i < $nboflines; $i++)
-    		{
-    			$this->_cleanObjectDatas($object->lines[$i]);
+		// If object has lines, remove $db property
+		if (isset($object->lines) && is_array($object->lines) && count($object->lines) > 0) {
+			$nboflines = count($object->lines);
+			for ($i = 0; $i < $nboflines; $i++)
+			{
+				$this->_cleanObjectDatas($object->lines[$i]);
 
-    			unset($object->lines[$i]->lines);
-    			unset($object->lines[$i]->note);
-    		}
-    	}
+				unset($object->lines[$i]->lines);
+				unset($object->lines[$i]->note);
+			}
+		}
 
-    	return $object;
-    }
+		return $object;
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param	array		$data   Array of data to validate
-     * @return	array
-     *
-     * @throws	RestException
-     */
-    private function _validate($data)
-    {
-        $myobject = array();
-        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");
-                $myobject[$field] = $data[$field];
-        }
-        return $myobject;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param	array		$data   Array of data to validate
+	 * @return	array
+	 *
+	 * @throws	RestException
+	 */
+	private function _validate($data)
+	{
+		$myobject = array();
+		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");
+				$myobject[$field] = $data[$field];
+		}
+		return $myobject;
+	}
 }
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index bd67f311d19..8444c4e1812 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -92,42 +92,83 @@ class BOM extends CommonObject
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=> 1, 'default'=>1, 'index'=>1, 'position'=>5),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'noteditable'=>1, 'visible'=>4, 'position'=>10, 'notnull'=>1, 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of BOM", 'showoncombobox'=>'1',),
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'notnull'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'autofocusoncreate'=>1),
+		//'bomtype' => array('type'=>'integer', 'label'=>'Type', 'enabled'=>1, 'visible'=>1, 'position'=>10, 'notnull'=>1, 'default'=>'0', 'arrayofkeyval'=>array(0=>'Manufacturing', 1=>'Disassembly')),
+		'bomtype' => array('type'=>'integer', 'label'=>'Type', 'enabled'=>1, 'visible'=>-1, 'position'=>32, 'notnull'=>1, 'default'=>'0', 'arrayofkeyval'=>array(0=>'Manufacturing')),
+		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:1:(finished IS NULL or finished <> 0)', 'label'=>'Product', 'picto'=>'product', 'enabled'=>1, 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'help'=>'ProductBOMHelp', 'css'=>'maxwidth500'),
 		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-1, 'position'=>60, 'notnull'=>-1,),
-		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:1:(finished IS NULL or finished <> 0)', 'label'=>'Product', 'enabled'=>1, 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'help'=>'ProductBOMHelp'),
-	    'qty' => array('type'=>'real', 'label'=>'Quantity', 'enabled'=>1, 'visible'=>1, 'default'=>1, 'position'=>55, 'notnull'=>1, 'isameasure'=>'1', 'css'=>'maxwidth75imp'),
+		'qty' => array('type'=>'real', 'label'=>'Quantity', 'enabled'=>1, 'visible'=>1, 'default'=>1, 'position'=>55, 'notnull'=>1, 'isameasure'=>'1', 'css'=>'maxwidth75imp'),
 		//'efficiency' => array('type'=>'real', 'label'=>'ManufacturingEfficiency', 'enabled'=>1, 'visible'=>-1, 'default'=>1, 'position'=>100, 'notnull'=>0, 'css'=>'maxwidth50imp', 'help'=>'ValueOfMeansLossForProductProduced'),
 		'duration' => array('type'=>'duration', 'label'=>'EstimatedDuration', 'enabled'=>1, 'visible'=>-1, 'position'=>101, 'notnull'=>-1, 'css'=>'maxwidth50imp', 'help'=>'EstimatedDurationDesc'),
-		'fk_warehouse' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:0', 'label'=>'WarehouseForProduction', 'enabled'=>1, 'visible'=>-1, 'position'=>102),
+		'fk_warehouse' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:0', 'label'=>'WarehouseForProduction', 'picto'=>'stock', 'enabled'=>1, 'visible'=>-1, 'position'=>102, 'css'=>'maxwidth500'),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>-2, 'position'=>161, 'notnull'=>-1,),
 		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>-2, 'position'=>162, 'notnull'=>-1,),
 		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>300, 'notnull'=>1,),
 		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'position'=>501, 'notnull'=>1,),
 		'date_valid' => array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-2, 'position'=>502, 'notnull'=>0,),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>510, 'notnull'=>1, 'foreignkey'=>'user.rowid',),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'position'=>511, 'notnull'=>-1,),
-		'fk_user_valid' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-2, 'position'=>512, 'notnull'=>0,),
+		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserCreation', 'picto'=>'user', 'enabled'=>1, 'visible'=>-2, 'position'=>510, 'notnull'=>1, 'foreignkey'=>'user.rowid',),
+		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'picto'=>'user', 'enabled'=>1, 'visible'=>-2, 'position'=>511, 'notnull'=>-1,),
+		'fk_user_valid' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'picto'=>'user', 'enabled'=>1, 'visible'=>-2, 'position'=>512, 'notnull'=>0,),
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000, 'notnull'=>-1,),
 		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>1010),
 		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>2, 'position'=>1000, 'notnull'=>1, 'default'=>0, 'index'=>1, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Enabled', 9=>'Disabled')),
 	);
-	public $rowid;
-	public $ref;
-	public $label;
-	public $description;
-	public $note_public;
-	public $note_private;
 
 	/**
-     * @var integer|string date_creation
-     */
+	 * @var int rowid
+	 */
+	public $rowid;
+
+	/**
+	 * @var string ref
+	 */
+	public $ref;
+
+	/**
+	 * @var string label
+	 */
+	public $label;
+
+	/**
+	 * @var int bomtype
+	 */
+	public $bomtype;
+
+	/**
+	 * @var string description
+	 */
+	public $description;
+
+	/**
+	 * @var integer|string date_creation
+	 */
 	public $date_creation;
 
 
 	public $tms;
+
+	/**
+	 * @var int Id User creator
+	 */
 	public $fk_user_creat;
+
+	/**
+	 * @var int Id User modifying
+	 */
 	public $fk_user_modif;
+
+	/**
+	 * @var string import key
+	 */
 	public $import_key;
+
+	/**
+	 * @var int status
+	 */
 	public $status;
+
+	/**
+	 * @var int product Id
+	 */
 	public $fk_product;
 	public $qty;
 	public $efficiency;
@@ -142,19 +183,19 @@ class BOM extends CommonObject
 	public $table_element_line = 'bom_bomline';
 
 	/**
-	 * @var int    Field with ID of parent key if this field has a parent
+	 * @var string    Fieldname with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_bom';
 
 	/**
-	 * @var int    Name of subtable class that manage subtable lines
+	 * @var string    Name of subtable class that manage subtable lines
 	 */
 	public $class_element_line = 'BOMLine';
 
-	/**
-	 * @var array	List of child tables. To test if we can delete object.
-	 */
-	//protected $childtables=array();
+	// /**
+	//  * @var array	List of child tables. To test if we can delete object.
+	//  */
+	// protected $childtables=array();
 
 	/**
 	 * @var array	List of child tables. To know object to delete on cascade.
@@ -204,7 +245,7 @@ class BOM extends CommonObject
 		// Translate some data of arrayofkeyval
 		foreach ($this->fields as $key => $val)
 		{
-			if (is_array($val['arrayofkeyval']))
+			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
 			{
 				foreach ($val['arrayofkeyval'] as $key2 => $val2)
 				{
@@ -238,89 +279,89 @@ class BOM extends CommonObject
 	public function createFromClone(User $user, $fromid)
 	{
 		global $langs, $hookmanager, $extrafields;
-	    $error = 0;
+		$error = 0;
 
-	    dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
-	    $object = new self($this->db);
+		$object = new self($this->db);
 
-	    $this->db->begin();
+		$this->db->begin();
 
-	    // Load source object
-	    $result = $object->fetchCommon($fromid);
-	    if ($result > 0 && !empty($object->table_element_line)) $object->fetchLines();
+		// Load source object
+		$result = $object->fetchCommon($fromid);
+		if ($result > 0 && !empty($object->table_element_line)) $object->fetchLines();
 
-	    // Get lines so they will be clone
-	    //foreach ($object->lines as $line)
-	    //	$line->fetch_optionals();
+		// Get lines so they will be clone
+		//foreach ($object->lines as $line)
+		//	$line->fetch_optionals();
 
-	    // Reset some properties
-	    unset($object->id);
-	    unset($object->fk_user_creat);
-	    unset($object->import_key);
+		// Reset some properties
+		unset($object->id);
+		unset($object->fk_user_creat);
+		unset($object->import_key);
 
-	    // Clear fields
-	    $object->ref = empty($this->fields['ref']['default']) ? $langs->trans("copy_of_").$object->ref : $this->fields['ref']['default'];
-	    $object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
-	    $object->status = self::STATUS_DRAFT;
-	    // ...
-	    // Clear extrafields that are unique
-	    if (is_array($object->array_options) && count($object->array_options) > 0)
-	    {
-	    	$extrafields->fetch_name_optionals_label($object->table_element);
-	    	foreach ($object->array_options as $key => $option)
-	    	{
-	    		$shortkey = preg_replace('/options_/', '', $key);
-	    		if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
-	    		{
-	    			//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
-	    			unset($object->array_options[$key]);
-	    		}
-	    	}
-	    }
+		// Clear fields
+		$object->ref = empty($this->fields['ref']['default']) ? $langs->trans("copy_of_").$object->ref : $this->fields['ref']['default'];
+		$object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
+		$object->status = self::STATUS_DRAFT;
+		// ...
+		// Clear extrafields that are unique
+		if (is_array($object->array_options) && count($object->array_options) > 0)
+		{
+			$extrafields->fetch_name_optionals_label($object->table_element);
+			foreach ($object->array_options as $key => $option)
+			{
+				$shortkey = preg_replace('/options_/', '', $key);
+				if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
+				{
+					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					unset($object->array_options[$key]);
+				}
+			}
+		}
 
-	    // Create clone
+		// Create clone
 		$object->context['createfromclone'] = 'createfromclone';
-	    $result = $object->createCommon($user);
-	    if ($result < 0) {
-	        $error++;
-	        $this->error = $object->error;
-	        $this->errors = $object->errors;
-	    }
+		$result = $object->createCommon($user);
+		if ($result < 0) {
+			$error++;
+			$this->error = $object->error;
+			$this->errors = $object->errors;
+		}
 
-	    if (!$error)
-	    {
-	    	// copy internal contacts
-	    	if ($this->copy_linked_contact($object, 'internal') < 0)
-	    	{
-	    		$error++;
-	    	}
-	    }
+		if (!$error)
+		{
+			// copy internal contacts
+			if ($this->copy_linked_contact($object, 'internal') < 0)
+			{
+				$error++;
+			}
+		}
 
-	    if (!$error)
-	    {
-	    	// copy external contacts if same company
-	    	if (property_exists($this, 'socid') && $this->socid == $object->socid)
-	    	{
-	    		if ($this->copy_linked_contact($object, 'external') < 0)
-	    			$error++;
-	    	}
-	    }
+		if (!$error)
+		{
+			// copy external contacts if same company
+			if (property_exists($this, 'socid') && $this->socid == $object->socid)
+			{
+				if ($this->copy_linked_contact($object, 'external') < 0)
+					$error++;
+			}
+		}
 
-	    // If there is lines, create lines too
+		// If there is lines, create lines too
 
 
 
-	    unset($object->context['createfromclone']);
+		unset($object->context['createfromclone']);
 
-	    // End
-	    if (!$error) {
-	        $this->db->commit();
-	        return $object;
-	    } else {
-	        $this->db->rollback();
-	        return -1;
-	    }
+		// End
+		if (!$error) {
+			$this->db->commit();
+			return $object;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
 	}
 
 	/**
@@ -480,47 +521,47 @@ class BOM extends CommonObject
 	 */
 	public function getNextNumRef($prod)
 	{
-	    global $langs, $conf;
-	    $langs->load("mrp");
+		global $langs, $conf;
+		$langs->load("mrp");
 
-	    if (!empty($conf->global->BOM_ADDON))
-	    {
-	        $mybool = false;
+		if (!empty($conf->global->BOM_ADDON))
+		{
+			$mybool = false;
 
-	        $file = $conf->global->BOM_ADDON.".php";
-	        $classname = $conf->global->BOM_ADDON;
+			$file = $conf->global->BOM_ADDON.".php";
+			$classname = $conf->global->BOM_ADDON;
 
-	        // Include file with class
-	        $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-	        foreach ($dirmodels as $reldir)
-	        {
-	            $dir = dol_buildpath($reldir."core/modules/bom/");
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+			foreach ($dirmodels as $reldir)
+			{
+				$dir = dol_buildpath($reldir."core/modules/bom/");
 
-	            // Load file with numbering class (if found)
-	            $mybool |= @include_once $dir.$file;
-	        }
+				// Load file with numbering class (if found)
+				$mybool |= @include_once $dir.$file;
+			}
 
-	        if ($mybool === false)
-	        {
-	            dol_print_error('', "Failed to include file ".$file);
-	            return '';
-	        }
+			if ($mybool === false)
+			{
+				dol_print_error('', "Failed to include file ".$file);
+				return '';
+			}
 
-	        $obj = new $classname();
-	        $numref = $obj->getNextValue($prod, $this);
+			$obj = new $classname();
+			$numref = $obj->getNextValue($prod, $this);
 
-	        if ($numref != "")
-	        {
-	            return $numref;
-	        } else {
-	            $this->error = $obj->error;
-	            //dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
-	            return "";
-	        }
-	    } else {
-	        print $langs->trans("Error")." ".$langs->trans("Error_BOM_ADDON_NotDefined");
-	        return "";
-	    }
+			if ($numref != "")
+			{
+				return $numref;
+			} else {
+				$this->error = $obj->error;
+				//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
+				return "";
+			}
+		} else {
+			print $langs->trans("Error")." ".$langs->trans("Error_BOM_ADDON_NotDefined");
+			return "";
+		}
 	}
 
 	/**
@@ -532,20 +573,20 @@ class BOM extends CommonObject
 	 */
 	public function validate($user, $notrigger = 0)
 	{
-	    global $conf, $langs;
+		global $conf, $langs;
 
-	    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	    $error = 0;
+		$error = 0;
 
-	    // Protection
-	    if ($this->status == self::STATUS_VALIDATED)
-	    {
-	        dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
-	        return 0;
-	    }
+		// Protection
+		if ($this->status == self::STATUS_VALIDATED)
+		{
+			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			return 0;
+		}
 
-	    /*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->bom->create))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->bom->create))
 	        || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->bom->bom_advance->validate))))
 	    {
 	        $this->error='NotEnoughPermissions';
@@ -553,100 +594,100 @@ class BOM extends CommonObject
 	        return -1;
 	    }*/
 
-	    $now = dol_now();
+		$now = dol_now();
 
-	    $this->db->begin();
+		$this->db->begin();
 
-	    // Define new ref
-	    if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
-	    {
-	        $this->fetch_product();
-	        $num = $this->getNextNumRef($this->product);
-	    } else {
-	        $num = $this->ref;
-	    }
-	    $this->newref = dol_sanitizeFileName($num);
+		// Define new ref
+		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
+		{
+			$this->fetch_product();
+			$num = $this->getNextNumRef($this->product);
+		} else {
+			$num = $this->ref;
+		}
+		$this->newref = dol_sanitizeFileName($num);
 
-	    // Validate
-	    $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-	    $sql .= " SET ref = '".$this->db->escape($num)."',";
-	    $sql .= " status = ".self::STATUS_VALIDATED.",";
-	    $sql .= " date_valid='".$this->db->idate($now)."',";
-	    $sql .= " fk_user_valid = ".$user->id;
-	    $sql .= " WHERE rowid = ".$this->id;
+		// Validate
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " SET ref = '".$this->db->escape($num)."',";
+		$sql .= " status = ".self::STATUS_VALIDATED.",";
+		$sql .= " date_valid='".$this->db->idate($now)."',";
+		$sql .= " fk_user_valid = ".$user->id;
+		$sql .= " WHERE rowid = ".$this->id;
 
-	    dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
-	    $resql = $this->db->query($sql);
-	    if (!$resql)
-	    {
-	        dol_print_error($this->db);
-	        $this->error = $this->db->lasterror();
-	        $error++;
-	    }
+		dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql)
+		{
+			dol_print_error($this->db);
+			$this->error = $this->db->lasterror();
+			$error++;
+		}
 
-	    if (!$error && !$notrigger)
-	    {
-	        // Call trigger
-	        $result = $this->call_trigger('BOM_VALIDATE', $user);
-	        if ($result < 0) $error++;
-	        // End call triggers
-	    }
+		if (!$error && !$notrigger)
+		{
+			// Call trigger
+			$result = $this->call_trigger('BOM_VALIDATE', $user);
+			if ($result < 0) $error++;
+			// End call triggers
+		}
 
-	    if (!$error)
-	    {
-	        $this->oldref = $this->ref;
+		if (!$error)
+		{
+			$this->oldref = $this->ref;
 
-	        // Rename directory if dir was a temporary ref
-	        if (preg_match('/^[\(]?PROV/i', $this->ref))
-	        {
-	        	// Now we rename also files into index
-	        	$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'bom/".$this->db->escape($this->newref)."'";
-	        	$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'bom/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
-	        	$resql = $this->db->query($sql);
-	        	if (!$resql) { $error++; $this->error = $this->db->lasterror(); }
+			// Rename directory if dir was a temporary ref
+			if (preg_match('/^[\(]?PROV/i', $this->ref))
+			{
+				// Now we rename also files into index
+				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'bom/".$this->db->escape($this->newref)."'";
+				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'bom/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
+				$resql = $this->db->query($sql);
+				if (!$resql) { $error++; $this->error = $this->db->lasterror(); }
 
-	        	// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
-	        	$oldref = dol_sanitizeFileName($this->ref);
-	            $newref = dol_sanitizeFileName($num);
-	            $dirsource = $conf->bom->dir_output.'/'.$oldref;
-	            $dirdest = $conf->bom->dir_output.'/'.$newref;
-	            if (!$error && file_exists($dirsource))
-	            {
-	                dol_syslog(get_class($this)."::validate() rename dir ".$dirsource." into ".$dirdest);
+				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
+				$oldref = dol_sanitizeFileName($this->ref);
+				$newref = dol_sanitizeFileName($num);
+				$dirsource = $conf->bom->dir_output.'/'.$oldref;
+				$dirdest = $conf->bom->dir_output.'/'.$newref;
+				if (!$error && file_exists($dirsource))
+				{
+					dol_syslog(get_class($this)."::validate() rename dir ".$dirsource." into ".$dirdest);
 
-	                if (@rename($dirsource, $dirdest))
-	                {
-	                    dol_syslog("Rename ok");
-	                    // Rename docs starting with $oldref with $newref
-	                    $listoffiles = dol_dir_list($conf->bom->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
-	                    foreach ($listoffiles as $fileentry)
-	                    {
-	                        $dirsource = $fileentry['name'];
-	                        $dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
-	                        $dirsource = $fileentry['path'].'/'.$dirsource;
-	                        $dirdest = $fileentry['path'].'/'.$dirdest;
-	                        @rename($dirsource, $dirdest);
-	                    }
-	                }
-	            }
-	        }
-	    }
+					if (@rename($dirsource, $dirdest))
+					{
+						dol_syslog("Rename ok");
+						// Rename docs starting with $oldref with $newref
+						$listoffiles = dol_dir_list($conf->bom->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+						foreach ($listoffiles as $fileentry)
+						{
+							$dirsource = $fileentry['name'];
+							$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+							$dirsource = $fileentry['path'].'/'.$dirsource;
+							$dirdest = $fileentry['path'].'/'.$dirdest;
+							@rename($dirsource, $dirdest);
+						}
+					}
+				}
+			}
+		}
 
-	    // Set new ref and current status
-	    if (!$error)
-	    {
-	        $this->ref = $num;
-	        $this->status = self::STATUS_VALIDATED;
-	    }
+		// Set new ref and current status
+		if (!$error)
+		{
+			$this->ref = $num;
+			$this->status = self::STATUS_VALIDATED;
+		}
 
-	    if (!$error)
-	    {
-	        $this->db->commit();
-	        return 1;
-	    } else {
-	        $this->db->rollback();
-	        return -1;
-	    }
+		if (!$error)
+		{
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
 	}
 
 	/**
@@ -730,56 +771,54 @@ class BOM extends CommonObject
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option						On what the link point to ('nolink', ...)
-     *  @param	int  	$notooltip					1=Disable tooltip
-     *  @param  string  $morecss            		Add more css on link
-     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param	int  	$notooltip					1=Disable tooltip
+	 *  @param  string  $morecss            		Add more css on link
+	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string								String with URL
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
 	{
 		global $db, $conf, $langs, $hookmanager;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
 
-        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-        $result = '';
+		$result = '';
 
-        $label = img_picto('', $this->picto).' <u>'.$langs->trans("BillOfMaterials").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
-        if (isset($this->status)) {
-        	$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
-        }
+		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("BillOfMaterials").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-        $url = dol_buildpath('/bom/bom_card.php', 1).'?id='.$this->id;
+		$url = dol_buildpath('/bom/bom_card.php', 1).'?id='.$this->id;
 
-        if ($option != 'nolink')
-        {
-	        // Add param to save lastsearch_values or not
-	        $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-	        if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-	        if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option != 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label = $langs->trans("ShowBillOfMaterials");
-                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowBillOfMaterials");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 
-            /*
+			/*
              $hookmanager->initHooks(array('bomdao'));
              $parameters=array('id'=>$this->id);
              $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
              if ($reshook > 0) $linkclose = $hookmanager->resPrint;
              */
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -812,7 +851,7 @@ class BOM extends CommonObject
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return the status
 	 *
@@ -827,9 +866,9 @@ class BOM extends CommonObject
 		{
 			global $langs;
 			//$langs->load("mrp");
-			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
-			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
-			$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Disabled');
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
+			$this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
 		}
 
 		$statusType = 'status'.$status;
@@ -897,20 +936,20 @@ class BOM extends CommonObject
 	 */
 	public function getLinesArray()
 	{
-	    $this->lines = array();
+		$this->lines = array();
 
-	    $objectline = new BOMLine($this->db);
-	    $result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_bom = '.$this->id));
+		$objectline = new BOMLine($this->db);
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_bom = '.$this->id));
 
-	    if (is_numeric($result))
-	    {
-	        $this->error = $this->error;
-	        $this->errors = $this->errors;
-	        return $result;
-	    } else {
-	        $this->lines = $result;
-	        return $this->lines;
-	    }
+		if (is_numeric($result))
+		{
+			$this->error = $this->error;
+			$this->errors = $this->errors;
+			return $result;
+		} else {
+			$this->lines = $result;
+			return $this->lines;
+		}
 	}
 
 	/**
@@ -954,9 +993,9 @@ class BOM extends CommonObject
 	 */
 	public function initAsSpecimen()
 	{
-	    $this->initAsSpecimenCommon();
-	    $this->ref = 'BOM-123';
-	    $this->date = $this->date_creation;
+		$this->initAsSpecimenCommon();
+		$this->ref = 'BOM-123';
+		$this->date = $this->date_creation;
 	}
 
 
@@ -1005,9 +1044,9 @@ class BOM extends CommonObject
 
 		foreach ($this->lines as &$line) {
 			$tmpproduct = new Product($this->db);
-			$result= $tmpproduct->fetch($line->fk_product);
+			$result = $tmpproduct->fetch($line->fk_product);
 			if ($result < 0) {
-				$this->error=$tmpproduct->error;
+				$this->error = $tmpproduct->error;
 				return -1;
 			}
 			$line->unit_cost = price2num((!empty($tmpproduct->cost_price)) ? $tmpproduct->cost_price : $tmpproduct->pmp);
@@ -1091,20 +1130,48 @@ class BOMLine extends CommonObjectLine
 		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-1, 'position'=>60, 'notnull'=>-1,),
 		'qty' => array('type'=>'double(24,8)', 'label'=>'Quantity', 'enabled'=>1, 'visible'=>1, 'position'=>100, 'notnull'=>1, 'isameasure'=>'1',),
 		'qty_frozen' => array('type'=>'smallint', 'label'=>'QuantityFrozen', 'enabled'=>1, 'visible'=>1, 'default'=>0, 'position'=>105, 'css'=>'maxwidth50imp', 'help'=>'QuantityConsumedInvariable'),
-	    'disable_stock_change' => array('type'=>'smallint', 'label'=>'DisableStockChange', 'enabled'=>1, 'visible'=>1, 'default'=>0, 'position'=>108, 'css'=>'maxwidth50imp', 'help'=>'DisableStockChangeHelp'),
-	    'efficiency' => array('type'=>'double(24,8)', 'label'=>'ManufacturingEfficiency', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'position'=>110, 'notnull'=>1, 'css'=>'maxwidth50imp', 'help'=>'ValueOfEfficiencyConsumedMeans'),
+		'disable_stock_change' => array('type'=>'smallint', 'label'=>'DisableStockChange', 'enabled'=>1, 'visible'=>1, 'default'=>0, 'position'=>108, 'css'=>'maxwidth50imp', 'help'=>'DisableStockChangeHelp'),
+		'efficiency' => array('type'=>'double(24,8)', 'label'=>'ManufacturingEfficiency', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'position'=>110, 'notnull'=>1, 'css'=>'maxwidth50imp', 'help'=>'ValueOfEfficiencyConsumedMeans'),
 		'position' => array('type'=>'integer', 'label'=>'Rank', 'enabled'=>1, 'visible'=>0, 'default'=>0, 'position'=>200, 'notnull'=>1,),
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000, 'notnull'=>-1,),
 	);
+
+	/**
+	 * @var int rowid
+	 */
 	public $rowid;
+
+	/**
+	 * @var int fk_bom
+	 */
 	public $fk_bom;
+
+	/**
+	 * @var int Id of product
+	 */
 	public $fk_product;
+
+	/**
+	 * @var string description
+	 */
 	public $description;
 	public $qty;
+
+	/**
+	 * @var int qty frozen
+	 */
 	public $qty_frozen;
 	public $disable_stock_change;
 	public $efficiency;
+
+	/**
+	 * @var int position of line
+	 */
 	public $position;
+
+	/**
+	 * @var string import key
+	 */
 	public $import_key;
 	// END MODULEBUILDER PROPERTIES
 
@@ -1145,7 +1212,7 @@ class BOMLine extends CommonObjectLine
 		// Translate some data of arrayofkeyval
 		foreach ($this->fields as $key => $val)
 		{
-			if (is_array($val['arrayofkeyval']))
+			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
 			{
 				foreach ($val['arrayofkeyval'] as $key2 => $val2)
 				{
@@ -1287,51 +1354,51 @@ class BOMLine extends CommonObjectLine
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option						On what the link point to ('nolink', ...)
-     *  @param	int  	$notooltip					1=Disable tooltip
-     *  @param  string  $morecss            		Add more css on link
-     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *  @return	string								String with URL
-     */
-    public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
-    {
-        global $db, $conf, $langs, $hookmanager;
+	 *  @param	int  	$notooltip					1=Disable tooltip
+	 *  @param  string  $morecss            		Add more css on link
+	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @return	string								String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
+		global $db, $conf, $langs, $hookmanager;
 
-        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-        $result = '';
+		$result = '';
 
-        $label = '<u>'.$langs->trans("BillOfMaterialsLine").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label = '<u>'.$langs->trans("BillOfMaterialsLine").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-        $url = dol_buildpath('/bom/bomline_card.php', 1).'?id='.$this->id;
+		$url = dol_buildpath('/bom/bomline_card.php', 1).'?id='.$this->id;
 
-        if ($option != 'nolink')
-        {
-	        // Add param to save lastsearch_values or not
-	        $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-	        if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-	        if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option != 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label = $langs->trans("ShowBillOfMaterialsLine");
-                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowBillOfMaterialsLine");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 
-            /*
+			/*
              $hookmanager->initHooks(array('bomlinedao'));
              $parameters=array('id'=>$this->id);
              $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
              if ($reshook > 0) $linkclose = $hookmanager->resPrint;
              */
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -1351,7 +1418,7 @@ class BOMLine extends CommonObjectLine
 		else $result .= $hookmanager->resPrint;
 
 		return $result;
-    }
+	}
 
 	/**
 	 *  Return label of the status
@@ -1364,7 +1431,7 @@ class BOMLine extends CommonObjectLine
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return the status
 	 *
diff --git a/htdocs/bom/lib/bom.lib.php b/htdocs/bom/lib/bom.lib.php
index e88b1aa32a3..313c7a1a7ff 100644
--- a/htdocs/bom/lib/bom.lib.php
+++ b/htdocs/bom/lib/bom.lib.php
@@ -76,55 +76,55 @@ function bomAdminPrepareHead()
  */
 function bomPrepareHead($object)
 {
-    global $db, $langs, $conf;
+	global $db, $langs, $conf;
 
-    $langs->load("mrp");
+	$langs->load("mrp");
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT."/bom/bom_card.php?id=".$object->id;
-    $head[$h][1] = $langs->trans("BOM");
-    $head[$h][2] = 'card';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/bom/bom_card.php?id=".$object->id;
+	$head[$h][1] = $langs->trans("BOM");
+	$head[$h][2] = 'card';
+	$h++;
 
-    if (isset($object->fields['note_public']) || isset($object->fields['note_private']))
-    {
-        $nbNote = 0;
-        if (!empty($object->note_private)) $nbNote++;
-        if (!empty($object->note_public)) $nbNote++;
-        $head[$h][0] = DOL_URL_ROOT.'/bom/bom_note.php?id='.$object->id;
-        $head[$h][1] = $langs->trans('Notes');
-        if ($nbNote > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
-        $head[$h][2] = 'note';
-        $h++;
-    }
+	if (isset($object->fields['note_public']) || isset($object->fields['note_private']))
+	{
+		$nbNote = 0;
+		if (!empty($object->note_private)) $nbNote++;
+		if (!empty($object->note_public)) $nbNote++;
+		$head[$h][0] = DOL_URL_ROOT.'/bom/bom_note.php?id='.$object->id;
+		$head[$h][1] = $langs->trans('Notes');
+		if ($nbNote > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+		$head[$h][2] = 'note';
+		$h++;
+	}
 
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    $upload_dir = $conf->bom->dir_output."/bom/".dol_sanitizeFileName($object->ref);
-    $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
-    $head[$h][0] = DOL_URL_ROOT.'/bom/bom_document.php?id='.$object->id;
-    $head[$h][1] = $langs->trans('Documents');
-    if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>' : '');
-    $head[$h][2] = 'document';
-    $h++;
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->bom->dir_output."/bom/".dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+	$nbLinks = Link::count($db, $object->element, $object->id);
+	$head[$h][0] = DOL_URL_ROOT.'/bom/bom_document.php?id='.$object->id;
+	$head[$h][1] = $langs->trans('Documents');
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>' : '');
+	$head[$h][2] = 'document';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/bom/bom_agenda.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("Events");
-    $head[$h][2] = 'agenda';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/bom/bom_agenda.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Events");
+	$head[$h][2] = 'agenda';
+	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    //$this->tabs = array(
-    //	'entity:+tabname:Title:@bom:/bom/mypage.php?id=__ID__'
-    //); // to add new tab
-    //$this->tabs = array(
-    //	'entity:-tabname:Title:@bom:/bom/mypage.php?id=__ID__'
-    //); // to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'bom');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	//$this->tabs = array(
+	//	'entity:+tabname:Title:@bom:/bom/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@bom:/bom/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'bom');
 
-    return $head;
+	return $head;
 }
diff --git a/htdocs/bom/tpl/linkedobjectblock.tpl.php b/htdocs/bom/tpl/linkedobjectblock.tpl.php
index 45340577228..3debc7e7d87 100644
--- a/htdocs/bom/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/bom/tpl/linkedobjectblock.tpl.php
@@ -41,41 +41,41 @@ $total = 0;
 $ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink)
 {
-    $ilink++;
-    $product_static = new Product($db);
-    $trclass = 'oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
-    echo '<tr class="'.$trclass.'" >';
-    echo '<td class="linkedcol-element" >'.$langs->trans("Bom");
-    if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
-        print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
-    }
-    echo '</td>';
-    echo '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
+	$ilink++;
+	$product_static = new Product($db);
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	echo '<tr class="'.$trclass.'" >';
+	echo '<td class="linkedcol-element" >'.$langs->trans("Bom");
+	if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
+		print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
+	}
+	echo '</td>';
+	echo '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
 
-    echo '<td class="linkedcol-ref" align="center">';
-	$result=$product_static->fetch($objectlink->fk_product);
-	if ($result<0) {
+	echo '<td class="linkedcol-ref" align="center">';
+	$result = $product_static->fetch($objectlink->fk_product);
+	if ($result < 0) {
 		setEventMessage($product_static->error, 'errors');
-	} elseif ($result>0)  {
+	} elseif ($result > 0) {
 		$product_static->getNomUrl(1);
 	}
-    print '</td>';
-    echo '<td class="linkedcol-date" align="center">'.dol_print_date($objectlink->date_creation, 'day').'</td>';
-    echo '<td class="linkedcol-amount right">';
-    if ($user->rights->commande->lire) {
-        $total = $total + $objectlink->total_ht;
-        echo price($objectlink->total_ht);
-    }
-    echo '</td>';
-    echo '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
-    echo '<td class="linkedcol-action right">';
-    // For now, shipments must stay linked to order, so link is not deletable
-    if ($object->element != 'shipping') {
-        echo '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a>';
-    }
-    echo '</td>';
-    echo "</tr>\n";
+	print '</td>';
+	echo '<td class="linkedcol-date" align="center">'.dol_print_date($objectlink->date_creation, 'day').'</td>';
+	echo '<td class="linkedcol-amount right">';
+	if ($user->rights->commande->lire) {
+		$total = $total + $objectlink->total_ht;
+		echo price($objectlink->total_ht);
+	}
+	echo '</td>';
+	echo '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
+	echo '<td class="linkedcol-action right">';
+	// For now, shipments must stay linked to order, so link is not deletable
+	if ($object->element != 'shipping') {
+		echo '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a>';
+	}
+	echo '</td>';
+	echo "</tr>\n";
 }
 
 echo "<!-- END PHP TEMPLATE -->\n";
diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index 2a675cc60e1..d29cdb7c6bb 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -60,7 +60,7 @@ if ($nolinesbefore) {
 	print '<div id="add"></div><span class="hideonsmartphone">'.$langs->trans('AddNewLine').'</span>';
 	print '</td>';
 	print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
-	if ($conf->global->PRODUCT_USE_UNITS)
+	if (!empty($conf->global->PRODUCT_USE_UNITS))
 	{
 		print '<td class="linecoluseunit left">';
 		print '<span id="title_units">';
@@ -109,11 +109,11 @@ $coldisplay++;
 print '<td class="bordertop nobottom linecolqty right"><input type="text" size="2" name="qty" id="qty" class="flat right" value="'.(GETPOSTISSET("qty") ? GETPOST("qty", 'alpha', 2) : 1).'">';
 print '</td>';
 
-if ($conf->global->PRODUCT_USE_UNITS)
+if (!empty($conf->global->PRODUCT_USE_UNITS))
 {
 	$coldisplay++;
 	print '<td class="nobottom linecoluseunit left">';
-	print $form->selectUnits(empty($line->fk_unit) ? $conf->global->PRODUCT_USE_UNITS : $line->fk_unit, "units");
+	// print $form->selectUnits(empty($line->fk_unit) ? $conf->global->PRODUCT_USE_UNITS : $line->fk_unit, "units");
 	print '</td>';
 }
 
diff --git a/htdocs/bom/tpl/objectline_edit.tpl.php b/htdocs/bom/tpl/objectline_edit.tpl.php
index 3840f495dea..77638b875ff 100644
--- a/htdocs/bom/tpl/objectline_edit.tpl.php
+++ b/htdocs/bom/tpl/objectline_edit.tpl.php
@@ -82,8 +82,8 @@ if ($line->fk_product > 0) {
 if (is_object($hookmanager))
 {
 	$fk_parent_line = (GETPOST('fk_parent_line') ? GETPOST('fk_parent_line') : $line->fk_parent_line);
-    $parameters = array('line'=>$line, 'fk_parent_line'=>$fk_parent_line, 'var'=>$var, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer);
-    $reshook = $hookmanager->executeHooks('formEditProductOptions', $parameters, $this, $action);
+	$parameters = array('line'=>$line, 'fk_parent_line'=>$fk_parent_line, 'var'=>$var, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer);
+	$reshook = $hookmanager->executeHooks('formEditProductOptions', $parameters, $this, $action);
 }
 
 print '</td>';
@@ -108,11 +108,11 @@ if (($line->info_bits & 2) != 2) {
 }
 print '</td>';
 
-if ($conf->global->PRODUCT_USE_UNITS)
+if (!empty($conf->global->PRODUCT_USE_UNITS))
 {
-    $coldisplay++;
+	$coldisplay++;
 	print '<td class="nobottom linecoluseunit left">';
-	print $form->selectUnits($line->fk_unit, "units");
+	// print $form->selectUnits($line->fk_unit, "units");
 	print '</td>';
 }
 
@@ -135,9 +135,9 @@ print '</td>';
 $coldisplay += $colspan;
 print '<td class="nobottom linecoledit center valignmiddle" colspan="'.$colspan.'">';
 $coldisplay += $colspan;
-print '<input type="submit" class="button buttongen marginbottomonly" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'">';
+print '<input type="submit" class="button buttongen marginbottomonly button-save" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'">';
 print '<br>';
-print '<input type="submit" class="button buttongen marginbottomonly" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'">';
+print '<input type="submit" class="button buttongen marginbottomonly button-cancel" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'">';
 print '</td>';
 print '</tr>';
 
diff --git a/htdocs/bom/tpl/objectline_title.tpl.php b/htdocs/bom/tpl/objectline_title.tpl.php
index 56e6cb59657..ad9c54a34ea 100644
--- a/htdocs/bom/tpl/objectline_title.tpl.php
+++ b/htdocs/bom/tpl/objectline_title.tpl.php
@@ -54,7 +54,7 @@ print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
 // Qty
 print '<td class="linecolqty right">'.$form->textwithpicto($langs->trans('Qty'), $langs->trans("QtyRequiredIfNoLoss")).'</td>';
 
-if ($conf->global->PRODUCT_USE_UNITS)
+if (!empty($conf->global->PRODUCT_USE_UNITS))
 {
 	print '<td class="linecoluseunit left">'.$langs->trans('Unit').'</td>';
 }
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index c5ee3870272..87c1a72789d 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -79,10 +79,10 @@ $coldisplay++;
 echo price($line->qty, 0, '', 0, 0); // Yes, it is a quantity, not a price, but we just want the formating role of function price
 print '</td>';
 
-if ($conf->global->PRODUCT_USE_UNITS)
+if (!empty($conf->global->PRODUCT_USE_UNITS))
 {
 	print '<td class="linecoluseunit nowrap left">';
-	$label = $line->getLabelOfUnit('short');
+	$label = $tmpproduct->getLabelOfUnit('long');
 	if ($label !== '') {
 		print $langs->trans($label);
 	}
@@ -111,21 +111,21 @@ print '</td>';
 if ($this->status == 0 && ($object_rights->write) && $action != 'selectlines') {
 	print '<td class="linecoledit center">';
 	$coldisplay++;
-    if (($line->info_bits & 2) == 2 || !empty($disableedit)) {
-    } else {
-        print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=editline&amp;lineid='.$line->id.'">'.img_edit().'</a>';
-    }
-    print '</td>';
+	if (($line->info_bits & 2) == 2 || !empty($disableedit)) {
+	} else {
+		print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=editline&amp;lineid='.$line->id.'">'.img_edit().'</a>';
+	}
+	print '</td>';
 
-    print '<td class="linecoldelete center">';
-    $coldisplay++;
-    if (($line->fk_prev_id == null) && empty($disableremove)) {
-        //La suppression n'est autorisée que si il n'y a pas de ligne dans une précédente situation
-        print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=deleteline&amp;token='.newToken().'&amp;lineid='.$line->id.'">';
-        print img_delete();
-        print '</a>';
-    }
-    print '</td>';
+	print '<td class="linecoldelete center">';
+	$coldisplay++;
+	if (($line->fk_prev_id == null) && empty($disableremove)) {
+		//La suppression n'est autorisée que si il n'y a pas de ligne dans une précédente situation
+		print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=deleteline&amp;token='.newToken().'&amp;lineid='.$line->id.'">';
+		print img_delete();
+		print '</a>';
+	}
+	print '</td>';
 
 	if ($num > 1 && $conf->browser->layout != 'phone' && empty($disablemove)) {
 		print '<td class="linecolmove tdlineupdown center">';
@@ -146,14 +146,14 @@ if ($this->status == 0 && ($object_rights->write) && $action != 'selectlines') {
 		$coldisplay++;
 	}
 } else {
-    print '<td colspan="3"></td>';
-    $coldisplay = $coldisplay + 3;
+	print '<td colspan="3"></td>';
+	$coldisplay = $coldisplay + 3;
 }
 
 if ($action == 'selectlines') {
-    print '<td class="linecolcheck center">';
-    print '<input type="checkbox" class="linecheckbox" name="line_checkbox['.($i + 1).']" value="'.$line->id.'" >';
-    print '</td>';
+	print '<td class="linecolcheck center">';
+	print '<input type="checkbox" class="linecheckbox" name="line_checkbox['.($i + 1).']" value="'.$line->id.'" >';
+	print '</td>';
 }
 
 print '</tr>';
diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 994bf13c031..63a95fed4c0 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -29,108 +29,108 @@
  */
 function printDropdownBookmarksList()
 {
-    global $conf, $user, $db, $langs;
+	global $conf, $user, $db, $langs;
 
-    require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 
-    $langs->load("bookmarks");
+	$langs->load("bookmarks");
 
-    $url = $_SERVER["PHP_SELF"];
+	$url = $_SERVER["PHP_SELF"];
 
-    if (!empty($_SERVER["QUERY_STRING"]))
-    {
-        $url .= (dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '');
-    } else {
-        global $sortfield, $sortorder;
-        $tmpurl = '';
-        // No urlencode, all param $url will be urlencoded later
-        if ($sortfield) $tmpurl .= ($tmpurl ? '&' : '').'sortfield='.$sortfield;
-        if ($sortorder) $tmpurl .= ($tmpurl ? '&' : '').'sortorder='.$sortorder;
-        if (is_array($_POST))
-        {
-            foreach ($_POST as $key => $val)
-            {
-                if (preg_match('/^search_/', $key) && $val != '') $tmpurl .= ($tmpurl ? '&' : '').$key.'='.$val;
-            }
-        }
-        $url .= ($tmpurl ? '?'.$tmpurl : '');
-    }
+	if (!empty($_SERVER["QUERY_STRING"]))
+	{
+		$url .= (dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '');
+	} else {
+		global $sortfield, $sortorder;
+		$tmpurl = '';
+		// No urlencode, all param $url will be urlencoded later
+		if ($sortfield) $tmpurl .= ($tmpurl ? '&' : '').'sortfield='.$sortfield;
+		if ($sortorder) $tmpurl .= ($tmpurl ? '&' : '').'sortorder='.$sortorder;
+		if (is_array($_POST))
+		{
+			foreach ($_POST as $key => $val)
+			{
+				if (preg_match('/^search_/', $key) && $val != '') $tmpurl .= ($tmpurl ? '&' : '').$key.'='.$val;
+			}
+		}
+		$url .= ($tmpurl ? '?'.$tmpurl : '');
+	}
 
-    $searchForm = '<!-- form with POST method by default, will be replaced with GET for external link by js -->'."\n";
-    $searchForm .= '<form id="top-menu-action-bookmark" name="actionbookmark" method="POST" action=""'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' onsubmit="return false"' : '').'>';
-    $searchForm .= '<input type="hidden" name="token" value="'.newToken().'">';
+	$searchForm = '<!-- form with POST method by default, will be replaced with GET for external link by js -->'."\n";
+	$searchForm .= '<form id="top-menu-action-bookmark" name="actionbookmark" method="POST" action=""'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' onsubmit="return false"' : '').'>';
+	$searchForm .= '<input type="hidden" name="token" value="'.newToken().'">';
 
 
-    // Url to list bookmark
-    $listbtn = '<a class="top-menu-dropdown-link" title="'.$langs->trans('AddThisPageToBookmarks').'" href="'.DOL_URL_ROOT.'/bookmarks/list.php" >';
-    $listbtn .= '<span class="fa fa-list paddingright"></span>'.$langs->trans('Bookmarks').'</a>';
+	// Url to list bookmark
+	$listbtn = '<a class="top-menu-dropdown-link" title="'.$langs->trans('AddThisPageToBookmarks').'" href="'.DOL_URL_ROOT.'/bookmarks/list.php" >';
+	$listbtn .= '<span class="fa fa-list paddingright"></span>'.$langs->trans('Bookmarks').'</a>';
 
-    // Url to go on create new bookmark page
-    $newbtn = '';
-    if (!empty($user->rights->bookmark->creer))
-    {
-        //$urltoadd=DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;urlsource='.urlencode($url).'&amp;url='.urlencode($url);
-        $urltoadd = DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;url='.urlencode($url);
-        $newbtn .= '<a class="top-menu-dropdown-link" title="'.$langs->trans('AddThisPageToBookmarks').'" href="'.dol_escape_htmltag($urltoadd).'" >';
-        $newbtn .= img_picto('', 'bookmark', '', false, 0, 0, '', 'paddingright').dol_escape_htmltag($langs->trans('AddThisPageToBookmarks')).'</a>';
-    }
+	// Url to go on create new bookmark page
+	$newbtn = '';
+	if (!empty($user->rights->bookmark->creer))
+	{
+		//$urltoadd=DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;urlsource='.urlencode($url).'&amp;url='.urlencode($url);
+		$urltoadd = DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;url='.urlencode($url);
+		$newbtn .= '<a class="top-menu-dropdown-link" title="'.$langs->trans('AddThisPageToBookmarks').'" href="'.dol_escape_htmltag($urltoadd).'" >';
+		$newbtn .= img_picto('', 'bookmark', '', false, 0, 0, '', 'paddingright').dol_escape_htmltag($langs->trans('AddThisPageToBookmarks')).'</a>';
+	}
 
-    // Menu with list of bookmarks
-    $sql = "SELECT rowid, title, url, target FROM ".MAIN_DB_PREFIX."bookmark";
-    $sql .= " WHERE (fk_user = ".$user->id." OR fk_user is NULL OR fk_user = 0)";
-    $sql .= " AND entity IN (".getEntity('bookmarks').")";
-    $sql .= " ORDER BY position";
-    if ($resql = $db->query($sql))
-    {
-    	if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
-	    	$bookmarkList = '<div id="dropdown-bookmarks-list" >';
-	    	$i = 0;
-	    	while ((empty($conf->global->BOOKMARKS_SHOW_IN_MENU) || $i < $conf->global->BOOKMARKS_SHOW_IN_MENU) && $obj = $db->fetch_object($resql))
-	    	{
-	    		$bookmarkList .= '<a class="dropdown-item bookmark-item'.(strpos($obj->url, 'http') === 0 ? ' bookmark-item-external' : '').'" id="bookmark-item-'.$obj->rowid.'" data-id="'.$obj->rowid.'" '.($obj->target == 1 ? ' target="_blank"' : '').' href="'.dol_escape_htmltag($obj->url).'" >';
-	    		$bookmarkList .= dol_escape_htmltag($obj->title);
-	    		$bookmarkList .= '</a>';
-	    		$i++;
-	    	}
-	    	$bookmarkList .= '</div>';
+	// Menu with list of bookmarks
+	$sql = "SELECT rowid, title, url, target FROM ".MAIN_DB_PREFIX."bookmark";
+	$sql .= " WHERE (fk_user = ".$user->id." OR fk_user is NULL OR fk_user = 0)";
+	$sql .= " AND entity IN (".getEntity('bookmarks').")";
+	$sql .= " ORDER BY position";
+	if ($resql = $db->query($sql))
+	{
+		if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			$bookmarkList = '<div id="dropdown-bookmarks-list" >';
+			$i = 0;
+			while ((empty($conf->global->BOOKMARKS_SHOW_IN_MENU) || $i < $conf->global->BOOKMARKS_SHOW_IN_MENU) && $obj = $db->fetch_object($resql))
+			{
+				$bookmarkList .= '<a class="dropdown-item bookmark-item'.(strpos($obj->url, 'http') === 0 ? ' bookmark-item-external' : '').'" id="bookmark-item-'.$obj->rowid.'" data-id="'.$obj->rowid.'" '.($obj->target == 1 ? ' target="_blank"' : '').' href="'.dol_escape_htmltag($obj->url).'" >';
+				$bookmarkList .= dol_escape_htmltag($obj->title);
+				$bookmarkList .= '</a>';
+				$i++;
+			}
+			$bookmarkList .= '</div>';
 
-	    	$searchForm .= '<input name="bookmark" id="top-bookmark-search-input" class="dropdown-search-input" placeholder="'.$langs->trans('Bookmarks').'" autocomplete="off" >';
-    	} else {
-    		$searchForm .= '<select name"=bookmark" id="boxbookmark" class="topmenu-bookmark-dropdown .dropdown-toggle">';
-    		//$searchForm .= '<option>--'.$langs->trans("Bookmarks").'--</option>';
-    		$searchForm .= '<option hidden value="listbookmarks" class="optiongrey" selected rel="'.DOL_URL_ROOT.'/bookmarks/list.php">'.$langs->trans('Bookmarks').'</option>';
-    		$searchForm .= '<option value="listbookmark" class="optionblue" rel="'.dol_escape_htmltag(DOL_URL_ROOT.'/bookmarks/list.php').'" ';
-    		$searchForm .= ' data-html="'.dol_escape_htmltag(img_picto('', 'bookmark').' '.($user->rights->bookmark->creer ? $langs->trans('EditBookmarks') : $langs->trans('ListOfBookmarks')).'...').'">';
-    		$searchForm .= dol_escape_htmltag($user->rights->bookmark->creer ? $langs->trans('EditBookmarks') : $langs->trans('ListOfBookmarks')).'...</option>';
-    		// Url to go on create new bookmark page
-    		if (!empty($user->rights->bookmark->creer))
-    		{
-    			$urltoadd = DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;url='.urlencode($url);
-    			$searchForm .= '<option value="newbookmark" class="optionblue" rel="'.dol_escape_htmltag($urltoadd).'"';
-    			$searchForm .= ' data-html="'.dol_escape_htmltag(img_picto('', 'bookmark').' '.$langs->trans('AddThisPageToBookmarks').'...').'">'.dol_escape_htmltag($langs->trans('AddThisPageToBookmarks').'...').'</option>';
-    		}
-    		$i = 0;
-    		while ((empty($conf->global->BOOKMARKS_SHOW_IN_MENU) || $i < $conf->global->BOOKMARKS_SHOW_IN_MENU) && $obj = $db->fetch_object($resql))
-    		{
-    			$searchForm .= '<option name="bookmark'.$obj->rowid.'" value="'.$obj->rowid.'" '.($obj->target == 1 ? ' target="_blank"' : '').' rel="'.dol_escape_htmltag($obj->url).'" >';
-    			$searchForm .= dol_escape_htmltag($obj->title);
-    			$searchForm .= '</option>';
-    			$i++;
-    		}
-    		$searchForm .= '</select>';
-    	}
-    } else {
-    	dol_print_error($db);
-    }
+			$searchForm .= '<input name="bookmark" id="top-bookmark-search-input" class="dropdown-search-input" placeholder="'.$langs->trans('Bookmarks').'" autocomplete="off" >';
+		} else {
+			$searchForm .= '<select name"=bookmark" id="boxbookmark" class="topmenu-bookmark-dropdown .dropdown-toggle">';
+			//$searchForm .= '<option>--'.$langs->trans("Bookmarks").'--</option>';
+			$searchForm .= '<option hidden value="listbookmarks" class="optiongrey" selected rel="'.DOL_URL_ROOT.'/bookmarks/list.php">'.$langs->trans('Bookmarks').'</option>';
+			$searchForm .= '<option value="listbookmark" class="optionblue" rel="'.dol_escape_htmltag(DOL_URL_ROOT.'/bookmarks/list.php').'" ';
+			$searchForm .= ' data-html="'.dol_escape_htmltag(img_picto('', 'bookmark').' '.($user->rights->bookmark->creer ? $langs->trans('EditBookmarks') : $langs->trans('ListOfBookmarks')).'...').'">';
+			$searchForm .= dol_escape_htmltag($user->rights->bookmark->creer ? $langs->trans('EditBookmarks') : $langs->trans('ListOfBookmarks')).'...</option>';
+			// Url to go on create new bookmark page
+			if (!empty($user->rights->bookmark->creer))
+			{
+				$urltoadd = DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;url='.urlencode($url);
+				$searchForm .= '<option value="newbookmark" class="optionblue" rel="'.dol_escape_htmltag($urltoadd).'"';
+				$searchForm .= ' data-html="'.dol_escape_htmltag(img_picto('', 'bookmark').' '.$langs->trans('AddThisPageToBookmarks').'...').'">'.dol_escape_htmltag($langs->trans('AddThisPageToBookmarks').'...').'</option>';
+			}
+			$i = 0;
+			while ((empty($conf->global->BOOKMARKS_SHOW_IN_MENU) || $i < $conf->global->BOOKMARKS_SHOW_IN_MENU) && $obj = $db->fetch_object($resql))
+			{
+				$searchForm .= '<option name="bookmark'.$obj->rowid.'" value="'.$obj->rowid.'" '.($obj->target == 1 ? ' target="_blank"' : '').' rel="'.dol_escape_htmltag($obj->url).'" >';
+				$searchForm .= dol_escape_htmltag($obj->title);
+				$searchForm .= '</option>';
+				$i++;
+			}
+			$searchForm .= '</select>';
+		}
+	} else {
+		dol_print_error($db);
+	}
 
-    $searchForm .= '</form>';
+	$searchForm .= '</form>';
 
-    // Generate the return string
-    if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
-    	$html = $searchForm;
+	// Generate the return string
+	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+		$html = $searchForm;
 
-    	$html .= '<!-- script to open selected choice -->
+		$html .= '<!-- script to open selected choice -->
 				<script>
 	        	$(document).ready(function () {
     			    jQuery("#boxbookmark").change(function() {
@@ -160,22 +160,22 @@ function printDropdownBookmarksList()
 		       		});
     			})
 				</script>';
-    } else {
-    	$html = '
+	} else {
+		$html = '
 	        <!-- search input -->
 	        <div class="dropdown-header bookmark-header">
 	            ' . $searchForm.'
 	        </div>
 	        ';
 
-	    $html .= '
+		$html .= '
 	        <!-- Menu Body -->
 	        <div class="bookmark-body dropdown-body">
 	        '.$bookmarkList.'
 	        </div>
 	        ';
 
-	    $html .= '
+		$html .= '
 	        <!-- Menu Footer-->
 	        <div class="bookmark-footer">
 	                '.$newbtn.$listbtn.'
@@ -183,7 +183,7 @@ function printDropdownBookmarksList()
 	        </div>
 	    ';
 
-	    $html .= '<!-- script to open/close the popup -->
+		$html .= '<!-- script to open/close the popup -->
 				<script>
 	            $( document ).on("keyup", "#top-bookmark-search-input", function () {
 
@@ -200,7 +200,7 @@ function printDropdownBookmarksList()
 	                $("#top-bookmark-search-filter-count").text(count);
 	            });
 			    </script>';
-    }
+	}
 
-    return $html;
+	return $html;
 }
diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index 93926e4ba92..ddb043292f6 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -32,13 +32,13 @@ $langs->loadLangs(array('bookmarks', 'other'));
 
 // Security check
 if (!$user->rights->bookmark->lire) {
-    restrictedArea($user, 'bookmarks');
+	restrictedArea($user, 'bookmarks');
 }
 
 $id = GETPOST("id", 'int');
 $action = GETPOST("action", "alpha");
-$title = GETPOST("title", "alpha");
-$url = GETPOST("url", "alpha");
+$title = (string) GETPOST("title", "alpha");
+$url = (string) GETPOST("url", "alpha");
 $urlsource = GETPOST("urlsource", "alpha");
 $target = GETPOST("target", "alpha");
 $userid = GETPOST("userid", "int");
@@ -71,8 +71,9 @@ if ($action == 'add' || $action == 'addproduct' || $action == 'update')
 
 	if ($action == 'update') $object->fetch(GETPOST("id", 'int'));
 	// Check if null because user not admin can't set an user and send empty value here.
-	if (!empty($userid))
+	if (!empty($userid)) {
 		$object->fk_user = $userid;
+	}
 	$object->title = $title;
 	$object->url = $url;
 	$object->target = $target;
@@ -149,11 +150,11 @@ if ($action == 'create')
 
 	print load_fiche_titre($langs->trans("NewBookmark"));
 
-	dol_fiche_head($head, $hselected, $langs->trans("Bookmark"), 0, 'bookmark');
+	print dol_get_fiche_head($head, $hselected, $langs->trans("Bookmark"), 0, 'bookmark');
 
 	print '<table class="border centpercent tableforfieldcreate">';
 
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("BookmarkTitle").'</td><td><input id="titlebookmark" class="flat minwidth100" name="title" value="'.$title.'"></td><td class="hideonsmartphone">'.$langs->trans("SetHereATitleForLink").'</td></tr>';
+	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("BookmarkTitle").'</td><td><input id="titlebookmark" class="flat minwidth300" name="title" value="'.dol_escape_htmltag($title).'"></td><td class="hideonsmartphone">'.$langs->trans("SetHereATitleForLink").'</td></tr>';
 	dol_set_focus('#titlebookmark');
 
 	// Url
@@ -167,21 +168,21 @@ if ($action == 'create')
 
 	// Owner
 	print '<tr><td>'.$langs->trans("Owner").'</td><td>';
-	print img_picto('', 'user').' '.$form->select_dolusers(isset($_POST['userid']) ? $_POST['userid'] : $user->id, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+	print img_picto('', 'user').' '.$form->select_dolusers(GETPOSTISSET('userid') ? GETPOST('userid', 'int') : $user->id, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 	print '</td><td class="hideonsmartphone">&nbsp;</td></tr>';
 
 	// Position
 	print '<tr><td>'.$langs->trans("Position").'</td><td>';
-	print '<input class="flat" name="position" size="5" value="'.(isset($_POST["position"]) ? $_POST["position"] : $object->position).'">';
+	print '<input class="flat" name="position" size="5" value="'.(GETPOSTISSET("position") ? GETPOST("position", 'int') : $object->position).'">';
 	print '</td><td class="hideonsmartphone">&nbsp;</td></tr>';
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div align="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("CreateBookmark").'" name="create"> &nbsp; ';
-	print '<input type="submit" class="button" value="'.$langs->trans("Cancel").'" name="cancel">';
+	print '<input type="submit" class="button button-cancel" value="'.$langs->trans("Cancel").'" name="cancel">';
 	print '</div>';
 
 	print '</form>';
@@ -215,15 +216,15 @@ if ($id > 0 && !preg_match('/^add/i', $action))
 	}
 
 
-	dol_fiche_head($head, $hselected, $langs->trans("Bookmark"), -1, 'bookmark');
+	print dol_get_fiche_head($head, $hselected, $langs->trans("Bookmark"), -1, 'bookmark');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/bookmarks/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', '', 0);
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', '', 0);
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">';
 
 	print '<tr><td class="titlefield">';
@@ -238,7 +239,7 @@ if ($id > 0 && !preg_match('/^add/i', $action))
 	}
 
 	print '</td><td>';
-	if ($action == 'edit') print '<input class="flat minwidth200" name="title" value="'.(isset($_POST["title"]) ?GETPOST("title", '', 2) : $object->title).'">';
+	if ($action == 'edit') print '<input class="flat minwidth300" name="title" value="'.(GETPOSTISSET("title") ? GETPOST("title", '', 2) : $object->title).'">';
 	else print $object->title;
 	print '</td></tr>';
 
@@ -251,7 +252,7 @@ if ($id > 0 && !preg_match('/^add/i', $action))
 		print '</span>';
 	}
 	print '</td><td>';
-	if ($action == 'edit') print '<input class="flat minwidth500" name="url" value="'.(isset($_POST["url"]) ? $_POST["url"] : $object->url).'">';
+	if ($action == 'edit') print '<input class="flat minwidth500 quatrevingtpercent" name="url" value="'.(GETPOSTISSET("url") ? GETPOST("url") : $object->url).'">';
 	else print '<a href="'.(preg_match('/^http/i', $object->url) ? $object->url : DOL_URL_ROOT.$object->url).'"'.($object->target ? ' target="_blank"' : '').'>'.$object->url.'</a>';
 	print '</td></tr>';
 
@@ -259,7 +260,7 @@ if ($id > 0 && !preg_match('/^add/i', $action))
 	if ($action == 'edit')
 	{
 		$liste = array(1=>$langs->trans("OpenANewWindow"), 0=>$langs->trans("ReplaceWindow"));
-		print $form->selectarray('target', $liste, isset($_POST["target"]) ? $_POST["target"] : $object->target);
+		print $form->selectarray('target', $liste, GETPOSTISSET("target") ? GETPOST("target") : $object->target);
 	} else {
 		if ($object->target == 0) print $langs->trans("ReplaceWindow");
 		if ($object->target == 1) print $langs->trans("OpenANewWindow");
@@ -269,7 +270,7 @@ if ($id > 0 && !preg_match('/^add/i', $action))
 	print '<tr><td>'.$langs->trans("Owner").'</td><td>';
 	if ($action == 'edit' && $user->admin)
 	{
-		print img_picto('', 'user').' '.$form->select_dolusers(isset($_POST['userid']) ? $_POST['userid'] : ($object->fk_user ? $object->fk_user : ''), 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+		print img_picto('', 'user').' '.$form->select_dolusers(GETPOSTISSET('userid') ? GETPOST('userid', 'int') : ($object->fk_user ? $object->fk_user : ''), 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 	} else {
 		if ($object->fk_user > 0)
 		{
@@ -284,7 +285,7 @@ if ($id > 0 && !preg_match('/^add/i', $action))
 
 	// Position
 	print '<tr><td>'.$langs->trans("Position").'</td><td>';
-	if ($action == 'edit') print '<input class="flat" name="position" size="5" value="'.(isset($_POST["position"]) ? $_POST["position"] : $object->position).'">';
+	if ($action == 'edit') print '<input class="flat" name="position" size="5" value="'.(GETPOSTISSET("position") ? GETPOST("position", 'int') : $object->position).'">';
 	else print $object->position;
 	print '</td></tr>';
 
@@ -295,11 +296,11 @@ if ($id > 0 && !preg_match('/^add/i', $action))
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	if ($action == 'edit')
 	{
-		print '<div align="center"><input class="button" type="submit" name="save" value="'.$langs->trans("Save").'"> &nbsp; &nbsp; <input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
+		print '<div align="center"><input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'"> &nbsp; &nbsp; <input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
 		print '</form>';
 	}
 
diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php
index 5fab4496f6e..f7098f1d780 100644
--- a/htdocs/bookmarks/class/bookmark.class.php
+++ b/htdocs/bookmarks/class/bookmark.class.php
@@ -28,217 +28,223 @@
  */
 class Bookmark extends CommonObject
 {
-    /**
+	/**
 	 * @var string ID to identify managed object
 	 */
 	public $element = 'bookmark';
 
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element = 'bookmark';
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'bookmark';
 
-    /**
+	/**
 	 * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 	 * @var int
 	 */
-    public $ismultientitymanaged = 1;
+	public $ismultientitymanaged = 1;
 
-    /**
+	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
 	public $picto = 'bookmark';
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
-     * @var int ID
-     */
-    public $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
 
-    /**
+	/**
 	 * @var int User ID
 	 */
 	public $fk_user;
 
-    /**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	/**
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
-    public $url;
+	/**
+	 * @var string url
+	 */
+	public $url;
 
-    public $target; // 0=replace, 1=new window
+	public $target; // 0=replace, 1=new window
 
-    public $title;
+	/**
+	 * @var string title
+	 */
+	public $title;
 
-    public $position;
+	public $position;
 
-    public $favicon;
+	public $favicon;
 
 
-    /**
+	/**
 	 *	Constructor
 	 *
 	 *  @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
-    /**
-     *    Directs the bookmark
-     *
-     *    @param    int		$id		Bookmark Id Loader
-     *    @return	int				<0 if KO, >0 if OK
-     */
-    public function fetch($id)
-    {
-        global $conf;
+	/**
+	 *    Directs the bookmark
+	 *
+	 *    @param    int		$id		Bookmark Id Loader
+	 *    @return	int				<0 if KO, >0 if OK
+	 */
+	public function fetch($id)
+	{
+		global $conf;
 
-        $sql = "SELECT rowid, fk_user, dateb as datec, url, target,";
-        $sql .= " title, position, favicon";
-        $sql .= " FROM ".MAIN_DB_PREFIX."bookmark";
-        $sql .= " WHERE rowid = ".$id;
-        $sql .= " AND entity = ".$conf->entity;
+		$sql = "SELECT rowid, fk_user, dateb as datec, url, target,";
+		$sql .= " title, position, favicon";
+		$sql .= " FROM ".MAIN_DB_PREFIX."bookmark";
+		$sql .= " WHERE rowid = ".$id;
+		$sql .= " AND entity = ".$conf->entity;
 
 		dol_syslog("Bookmark::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
 
-            $this->id = $obj->rowid;
-            $this->ref = $obj->rowid;
+			$this->id = $obj->rowid;
+			$this->ref = $obj->rowid;
 
-            $this->fk_user = $obj->fk_user;
-            $this->datec   = $this->db->jdate($obj->datec);
-            $this->url     = $obj->url;
-            $this->target  = $obj->target;
-            $this->title   = $obj->title;
-            $this->position = $obj->position;
-            $this->favicon = $obj->favicon;
+			$this->fk_user = $obj->fk_user;
+			$this->datec   = $this->db->jdate($obj->datec);
+			$this->url     = $obj->url;
+			$this->target  = $obj->target;
+			$this->title   = $obj->title;
+			$this->position = $obj->position;
+			$this->favicon = $obj->favicon;
 
-            $this->db->free($resql);
-            return $this->id;
-        } else {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+			$this->db->free($resql);
+			return $this->id;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
-    /**
-     *      Insert bookmark into database
-     *
-     *      @return     int     <0 si ko, rowid du bookmark cree si ok
-     */
-    public function create()
-    {
-        global $conf;
+	/**
+	 *      Insert bookmark into database
+	 *
+	 *      @return     int     <0 si ko, rowid du bookmark cree si ok
+	 */
+	public function create()
+	{
+		global $conf;
 
-    	// Clean parameters
-    	$this->url = trim($this->url);
-    	$this->title = trim($this->title);
+		// Clean parameters
+		$this->url = trim($this->url);
+		$this->title = trim($this->title);
 		if (empty($this->position)) $this->position = 0;
 
 		$now = dol_now();
 
-    	$this->db->begin();
+		$this->db->begin();
 
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."bookmark (fk_user,dateb,url,target";
-        $sql .= ",title,favicon,position";
-        $sql .= ",entity";
-        $sql .= ") VALUES (";
-        $sql .= ($this->fk_user > 0 ? $this->fk_user : "0").",";
-        $sql .= " '".$this->db->idate($now)."',";
-        $sql .= " '".$this->db->escape($this->url)."', '".$this->db->escape($this->target)."',";
-        $sql .= " '".$this->db->escape($this->title)."', '".$this->db->escape($this->favicon)."', '".$this->db->escape($this->position)."'";
-        $sql .= ", ".$this->db->escape($conf->entity);
-        $sql .= ")";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."bookmark (fk_user,dateb,url,target";
+		$sql .= ",title,favicon,position";
+		$sql .= ",entity";
+		$sql .= ") VALUES (";
+		$sql .= ($this->fk_user > 0 ? $this->fk_user : "0").",";
+		$sql .= " '".$this->db->idate($now)."',";
+		$sql .= " '".$this->db->escape($this->url)."', '".$this->db->escape($this->target)."',";
+		$sql .= " '".$this->db->escape($this->title)."', '".$this->db->escape($this->favicon)."', '".$this->db->escape($this->position)."'";
+		$sql .= ", ".$this->db->escape($conf->entity);
+		$sql .= ")";
 
-        dol_syslog("Bookmark::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $id = $this->db->last_insert_id(MAIN_DB_PREFIX."bookmark");
-            if ($id > 0)
-            {
-                $this->id = $id;
-                $this->db->commit();
-                return $id;
-            } else {
-                $this->error = $this->db->lasterror();
-                $this->errno = $this->db->lasterrno();
-                $this->db->rollback();
-                return -2;
-            }
-        } else {
-            $this->error = $this->db->lasterror();
-            $this->errno = $this->db->lasterrno();
-            $this->db->rollback();
-            return -1;
-        }
-    }
+		dol_syslog("Bookmark::create", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$id = $this->db->last_insert_id(MAIN_DB_PREFIX."bookmark");
+			if ($id > 0)
+			{
+				$this->id = $id;
+				$this->db->commit();
+				return $id;
+			} else {
+				$this->error = $this->db->lasterror();
+				$this->errno = $this->db->lasterrno();
+				$this->db->rollback();
+				return -2;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->errno = $this->db->lasterrno();
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
-    /**
-     *      Update bookmark record
-     *
-     *      @return     int         <0 if KO, > if OK
-     */
-    public function update()
-    {
-    	// Clean parameters
-    	$this->url = trim($this->url);
-    	$this->title = trim($this->title);
+	/**
+	 *      Update bookmark record
+	 *
+	 *      @return     int         <0 if KO, > if OK
+	 */
+	public function update()
+	{
+		// Clean parameters
+		$this->url = trim($this->url);
+		$this->title = trim($this->title);
 		if (empty($this->position)) $this->position = 0;
 
-    	$sql = "UPDATE ".MAIN_DB_PREFIX."bookmark";
-        $sql .= " SET fk_user = ".($this->fk_user > 0 ? $this->fk_user : "0");
-        $sql .= " ,dateb = '".$this->db->idate($this->datec)."'";
-        $sql .= " ,url = '".$this->db->escape($this->url)."'";
-        $sql .= " ,target = '".$this->db->escape($this->target)."'";
-        $sql .= " ,title = '".$this->db->escape($this->title)."'";
-        $sql .= " ,favicon = '".$this->db->escape($this->favicon)."'";
-        $sql .= " ,position = '".$this->db->escape($this->position)."'";
-        $sql .= " WHERE rowid = ".$this->id;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."bookmark";
+		$sql .= " SET fk_user = ".($this->fk_user > 0 ? $this->fk_user : "0");
+		$sql .= " ,dateb = '".$this->db->idate($this->datec)."'";
+		$sql .= " ,url = '".$this->db->escape($this->url)."'";
+		$sql .= " ,target = '".$this->db->escape($this->target)."'";
+		$sql .= " ,title = '".$this->db->escape($this->title)."'";
+		$sql .= " ,favicon = '".$this->db->escape($this->favicon)."'";
+		$sql .= " ,position = '".$this->db->escape($this->position)."'";
+		$sql .= " WHERE rowid = ".$this->id;
 
-        dol_syslog("Bookmark::update", LOG_DEBUG);
-        if ($this->db->query($sql))
-        {
-            return 1;
-        } else {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+		dol_syslog("Bookmark::update", LOG_DEBUG);
+		if ($this->db->query($sql))
+		{
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
-    /**
-     *      Removes the bookmark
-     *
-     *      @param      int		$id     Id removed bookmark
-     *      @return     int         	<0 si ko, >0 si ok
-     */
-    public function remove($id)
-    {
-        $sql  = "DELETE FROM ".MAIN_DB_PREFIX."bookmark";
-        $sql .= " WHERE rowid = ".$id;
+	/**
+	 *      Removes the bookmark
+	 *
+	 *      @param      int		$id     Id removed bookmark
+	 *      @return     int         	<0 si ko, >0 si ok
+	 */
+	public function remove($id)
+	{
+		$sql  = "DELETE FROM ".MAIN_DB_PREFIX."bookmark";
+		$sql .= " WHERE rowid = ".$id;
 
-        dol_syslog("Bookmark::remove", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            return 1;
-        } else {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+		dol_syslog("Bookmark::remove", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
 	/**
 	 * Function used to replace a thirdparty id with another one.
@@ -265,7 +271,7 @@ class Bookmark extends CommonObject
 	 */
 	public function getLibStatut($mode)
 	{
-	    return '';
+		return '';
 	}
 
 	/**
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 7f70d74f5d9..6ad2770aa25 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2005-2012 Laurent Destailleur       <eldy@users.sourceforge.net>
+/* Copyright (C) 2005-2020 Laurent Destailleur       <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -197,14 +197,14 @@ while ($i < min($num, $limit))
 	// Title
 	print "<td>";
 	$linkintern = 1;
-	if ($linkintern) print "<a href=\"".$obj->url."\">";
+	if ($linkintern) print '<a href="'.$obj->url.'">';
 	print $title;
 	if ($linkintern) print "</a>";
 	print "</td>\n";
 
 	// Url
 	print '<td class="tdoverflowmax200">';
-	if (!$linkintern) print '<a href="'.$obj->url.'"'.($obj->target ? ' target="newlink"' : '').'>';
+	if (!$linkintern) print '<a href="'.$obj->url.'"'.($obj->target ? ' target="newlink" rel="noopener"' : '').'>';
 	print $link;
 	if (!$linkintern) print '</a>';
 	print "</td>\n";
@@ -241,7 +241,7 @@ while ($i < min($num, $limit))
 	print '<td class="nowrap right">';
 	if ($user->rights->bookmark->creer)
 	{
-		print '<a class="editfielda" href="'.DOL_URL_ROOT."/bookmarks/card.php?action=edit&token='.newToken().'&id=".$obj->rowid."&backtopage=".urlencode($_SERVER["PHP_SELF"]).'">'.img_edit()."</a>";
+		print '<a class="editfielda" href="'.DOL_URL_ROOT.'/bookmarks/card.php?action=edit&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_edit()."</a>";
 	}
 	if ($user->rights->bookmark->supprimer)
 	{
diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php
index dfd6e99a9ea..5f0e9baddf5 100644
--- a/htdocs/cashdesk/admin/cashdesk.php
+++ b/htdocs/cashdesk/admin/cashdesk.php
@@ -65,13 +65,13 @@ if (GETPOST('action', 'alpha') == 'set')
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        $db->commit();
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        $db->rollback();
-	    setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	{
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		$db->rollback();
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 /*
@@ -146,13 +146,13 @@ if (!empty($conf->stock->enabled))
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskDoNotDecreaseStock").'</td>'; // Force warehouse (this is not a default value)
 	print '<td colspan="2">';
 	if (empty($conf->productbatch->enabled)) {
-	    print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK', $conf->global->CASHDESK_NO_DECREASE_STOCK, 1);
+		print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK', $conf->global->CASHDESK_NO_DECREASE_STOCK, 1);
 	} else {
-	    if (!$conf->global->CASHDESK_NO_DECREASE_STOCK) {
-	        $res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK", 1, 'chaine', 0, '', $conf->entity);
-	    }
-	    print $langs->trans("Yes").'<br>';
-	    print '<span class="opacitymedium">'.$langs->trans('StockDecreaseForPointOfSaleDisabledbyBatch').'</span>';
+		if (!$conf->global->CASHDESK_NO_DECREASE_STOCK) {
+			$res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK", 1, 'chaine', 0, '', $conf->entity);
+		}
+		print $langs->trans("Yes").'<br>';
+		print '<span class="opacitymedium">'.$langs->trans('StockDecreaseForPointOfSaleDisabledbyBatch').'</span>';
 	}
 	print '</td></tr>';
 
@@ -174,17 +174,17 @@ if (!empty($conf->stock->enabled))
 // Use Dolibarr Receipt Printer
 if (!empty($conf->receiptprinter->enabled))
 {
-    print '<tr class="oddeven"><td>';
-    print $langs->trans("DolibarrReceiptPrinter").' ('.$langs->trans("FeatureNotYetAvailable").')';
-    print '<td colspan="2">';
-    print $form->selectyesno("CASHDESK_DOLIBAR_RECEIPT_PRINTER", $conf->global->CASHDESK_DOLIBAR_RECEIPT_PRINTER, 1);
-    print "</td></tr>\n";
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("DolibarrReceiptPrinter").' ('.$langs->trans("FeatureNotYetAvailable").')';
+	print '<td colspan="2">';
+	print $form->selectyesno("CASHDESK_DOLIBAR_RECEIPT_PRINTER", $conf->global->CASHDESK_DOLIBAR_RECEIPT_PRINTER, 1);
+	print "</td></tr>\n";
 }
 
 print '</table>';
 print '<br>';
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
+print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
 
 print "</form>\n";
 
diff --git a/htdocs/cashdesk/affContenu.php b/htdocs/cashdesk/affContenu.php
index 7b513ada33c..72cb99123a4 100644
--- a/htdocs/cashdesk/affContenu.php
+++ b/htdocs/cashdesk/affContenu.php
@@ -34,8 +34,8 @@ if ($_GET['id'] == 'NOUV')
 // Recuperation, s'il existe, de l'objet contenant les infos de la vente en cours ...
 if (isset($_SESSION['serObjFacturation']))
 {
-    $obj_facturation = unserialize($_SESSION['serObjFacturation']);
-    unset($_SESSION['serObjFacturation']);
+	$obj_facturation = unserialize($_SESSION['serObjFacturation']);
+	unset($_SESSION['serObjFacturation']);
 } else {
 	// ... sinon, c'est une nouvelle vente
 	$obj_facturation = new Facturation();
diff --git a/htdocs/cashdesk/class/Auth.class.php b/htdocs/cashdesk/class/Auth.class.php
index cc71d1c20d8..7dbe7ceae3e 100644
--- a/htdocs/cashdesk/class/Auth.class.php
+++ b/htdocs/cashdesk/class/Auth.class.php
@@ -94,45 +94,45 @@ class Auth
 
 		$test = true;
 
-        // Authentication mode
-        if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication = 'http,dolibarr';
-        // Authentication mode: forceuser
-        if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user = 'auto';
-        // Set authmode
-        $authmode = explode(',', $dolibarr_main_authentication);
+		// Authentication mode
+		if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication = 'http,dolibarr';
+		// Authentication mode: forceuser
+		if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user = 'auto';
+		// Set authmode
+		$authmode = explode(',', $dolibarr_main_authentication);
 
-        // No authentication mode
-        if (!count($authmode))
-        {
-            $langs->load('main');
-            dol_print_error('', $langs->trans("ErrorConfigParameterNotDefined", 'dolibarr_main_authentication'));
-            exit;
-        }
+		// No authentication mode
+		if (!count($authmode))
+		{
+			$langs->load('main');
+			dol_print_error('', $langs->trans("ErrorConfigParameterNotDefined", 'dolibarr_main_authentication'));
+			exit;
+		}
 
 		$usertotest = $aLogin;
 		$passwordtotest = $aPasswd;
 		$entitytotest = $conf->entity;
 
-        // Validation tests user / password
-        // If ok, the variable will be initialized login
-        // If error, we will put error message in session under the name dol_loginmesg
-        $goontestloop = false;
-        if (isset($_SERVER["REMOTE_USER"]) && in_array('http', $authmode)) $goontestloop = true;
-        if (isset($aLogin) || GETPOST('openid_mode', 'alpha', 1)) $goontestloop = true;
+		// Validation tests user / password
+		// If ok, the variable will be initialized login
+		// If error, we will put error message in session under the name dol_loginmesg
+		$goontestloop = false;
+		if (isset($_SERVER["REMOTE_USER"]) && in_array('http', $authmode)) $goontestloop = true;
+		if (isset($aLogin) || GETPOST('openid_mode', 'alpha', 1)) $goontestloop = true;
 
-        if ($test && $goontestloop)
-        {
-            include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+		if ($test && $goontestloop)
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 			$login = checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $authmode);
-            if ($login)
-            {
-                $this->login($aLogin);
-                $this->passwd($aPasswd);
-                $ret = 0;
-            } else {
-                $ret = -1;
-            }
-        }
+			if ($login)
+			{
+				$this->login($aLogin);
+				$this->passwd($aPasswd);
+				$ret = 0;
+			} else {
+				$ret = -1;
+			}
+		}
 
 		return $ret;
 	}
diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php
index f2223b0b45d..23eafadc7b8 100644
--- a/htdocs/cashdesk/class/Facturation.class.php
+++ b/htdocs/cashdesk/class/Facturation.class.php
@@ -25,553 +25,553 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
  */
 class Facturation
 {
-    /**
-     * Attributs "volatiles" : reinitialises apres chaque traitement d'un article
-     * <p>Attributs "volatiles" : reinitialises apres chaque traitement d'un article</p>
-     * int $id			=> 'rowid' du produit dans llx_product
-     * string $ref		=> 'ref' du produit dans llx_product
-     * int $qte			=> Quantite pour le produit en cours de traitement
-     * int $stock		=> Stock theorique pour le produit en cours de traitement
-     * int $remise_percent	=> Remise en pourcent sur le produit en cours
-     * int $montant_remise	=> Remise en pourcent sur le produit en cours
-     * int $prix		=> Prix HT du produit en cours
-     * int $tva			=> 'rowid' du taux de tva dans llx_c_tva
-     */
+	/**
+	 * Attributs "volatiles" : reinitialises apres chaque traitement d'un article
+	 * <p>Attributs "volatiles" : reinitialises apres chaque traitement d'un article</p>
+	 * int $id			=> 'rowid' du produit dans llx_product
+	 * string $ref		=> 'ref' du produit dans llx_product
+	 * int $qte			=> Quantite pour le produit en cours de traitement
+	 * int $stock		=> Stock theorique pour le produit en cours de traitement
+	 * int $remise_percent	=> Remise en pourcent sur le produit en cours
+	 * int $montant_remise	=> Remise en pourcent sur le produit en cours
+	 * int $prix		=> Prix HT du produit en cours
+	 * int $tva			=> 'rowid' du taux de tva dans llx_c_tva
+	 */
 
-    /**
+	/**
 	 * @var int ID
 	 */
 	public $id;
 
-    protected $ref;
-    protected $qte;
-    protected $stock;
-    protected $remise_percent;
-    protected $montant_remise;
-    protected $prix;
-    protected $tva;
+	protected $ref;
+	protected $qte;
+	protected $stock;
+	protected $remise_percent;
+	protected $montant_remise;
+	protected $prix;
+	protected $tva;
 
-    /**
-     * Attributs persistants : utilises pour toute la duree de la vente (jusqu'a validation ou annulation)
-     * string $num_facture	=> Numero de la facture (de la forme FAYYMM-XXXX)
-     * string $mode_reglement	=> Mode de reglement (ESP, CB ou CHQ)
-     * int $montant_encaisse	=> Montant encaisse en cas de reglement en especes
-     * int $montant_rendu	=> Monnaie rendue en cas de reglement en especes
-     * int $paiement_le		=> Date de paiement en cas de paiement differe
-     *
-     * int $prix_total_ht	=> Prix total hors taxes
-     * int $montant_tva		=> Montant total de la TVA, tous taux confondus
-     * int $prix_total_ttc	=> Prix total TTC
-     */
-    protected $num_facture;
-    protected $mode_reglement;
-    protected $montant_encaisse;
-    protected $montant_rendu;
-    protected $paiement_le;
+	/**
+	 * Attributs persistants : utilises pour toute la duree de la vente (jusqu'a validation ou annulation)
+	 * string $num_facture	=> Numero de la facture (de la forme FAYYMM-XXXX)
+	 * string $mode_reglement	=> Mode de reglement (ESP, CB ou CHQ)
+	 * int $montant_encaisse	=> Montant encaisse en cas de reglement en especes
+	 * int $montant_rendu	=> Monnaie rendue en cas de reglement en especes
+	 * int $paiement_le		=> Date de paiement en cas de paiement differe
+	 *
+	 * int $prix_total_ht	=> Prix total hors taxes
+	 * int $montant_tva		=> Montant total de la TVA, tous taux confondus
+	 * int $prix_total_ttc	=> Prix total TTC
+	 */
+	protected $num_facture;
+	protected $mode_reglement;
+	protected $montant_encaisse;
+	protected $montant_rendu;
+	protected $paiement_le;
 
-    protected $prix_total_ht;
-    protected $montant_tva;
-    protected $prix_total_ttc;
+	protected $prix_total_ht;
+	protected $montant_tva;
+	protected $prix_total_ttc;
 
 
-    /**
-     *	Constructor
-     */
-    public function __construct()
-    {
-        $this->raz();
-        $this->razPers();
-    }
+	/**
+	 *	Constructor
+	 */
+	public function __construct()
+	{
+		$this->raz();
+		$this->razPers();
+	}
 
 
-    // Data processing methods
+	// Data processing methods
 
 
-    /**
-     *  Add a product into cart
-     *
-     *  @return	void
-     */
-    public function ajoutArticle()
-    {
-        global $conf, $db, $mysoc;
+	/**
+	 *  Add a product into cart
+	 *
+	 *  @return	void
+	 */
+	public function ajoutArticle()
+	{
+		global $conf, $db, $mysoc;
 
-        $thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
+		$thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
 
-        $societe = new Societe($db);
-        $societe->fetch($thirdpartyid);
+		$societe = new Societe($db);
+		$societe->fetch($thirdpartyid);
 
-        $product = new Product($db);
-        $product->fetch($this->id);
+		$product = new Product($db);
+		$product->fetch($this->id);
 
 
-        $vatrowid = $this->tva();
+		$vatrowid = $this->tva();
 
-        $tmp = getTaxesFromId($vatrowid);
-        $txtva = $tmp['rate'].(empty($tmp['code']) ? '' : ' ('.$tmp['code'].')');
-        $vat_npr = $tmp['npr'];
+		$tmp = getTaxesFromId($vatrowid);
+		$txtva = $tmp['rate'].(empty($tmp['code']) ? '' : ' ('.$tmp['code'].')');
+		$vat_npr = $tmp['npr'];
 
-        $localtaxarray = getLocalTaxesFromRate($vatrowid, 0, $societe, $mysoc, 1);
+		$localtaxarray = getLocalTaxesFromRate($vatrowid, 0, $societe, $mysoc, 1);
 
-        // Clean vat code
-        $reg = array();
-        $vat_src_code = '';
-        if (preg_match('/\((.*)\)/', $txtva, $reg))
-        {
-            $vat_src_code = $reg[1];
-            $txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
-        }
+		// Clean vat code
+		$reg = array();
+		$vat_src_code = '';
+		if (preg_match('/\((.*)\)/', $txtva, $reg))
+		{
+			$vat_src_code = $reg[1];
+			$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
+		}
 
-        // Define part of HT, VAT, TTC
-        $resultarray = calcul_price_total($this->qte, $this->prix(), $this->remisePercent(), $txtva, -1, -1, 0, 'HT', $vat_npr, $product->type, $mysoc, $localtaxarray);
+		// Define part of HT, VAT, TTC
+		$resultarray = calcul_price_total($this->qte, $this->prix(), $this->remisePercent(), $txtva, -1, -1, 0, 'HT', $vat_npr, $product->type, $mysoc, $localtaxarray);
 
-        // Calculation of total HT without discount
-        $total_ht = $resultarray[0];
-        $total_vat = $resultarray[1];
-        $total_ttc = $resultarray[2];
-        $total_localtax1 = $resultarray[9];
-        $total_localtax2 = $resultarray[10];
+		// Calculation of total HT without discount
+		$total_ht = $resultarray[0];
+		$total_vat = $resultarray[1];
+		$total_ttc = $resultarray[2];
+		$total_localtax1 = $resultarray[9];
+		$total_localtax2 = $resultarray[10];
 
-        // Calculation of the discount amount
-        if ($this->remisePercent())
-        {
-            $remise_percent = $this->remisePercent();
-        } else {
-            $remise_percent = 0;
-        }
-        $montant_remise_ht = ($resultarray[6] - $resultarray[0]);
-        $this->amountDiscount($montant_remise_ht);
+		// Calculation of the discount amount
+		if ($this->remisePercent())
+		{
+			$remise_percent = $this->remisePercent();
+		} else {
+			$remise_percent = 0;
+		}
+		$montant_remise_ht = ($resultarray[6] - $resultarray[0]);
+		$this->amountDiscount($montant_remise_ht);
 
-        $newcartarray = $_SESSION['poscart'];
+		$newcartarray = $_SESSION['poscart'];
 
-        $i = 0;
-        if (!is_null($newcartarray) && !empty($newcartarray)) {
-            $i = count($newcartarray);
-        }
+		$i = 0;
+		if (!is_null($newcartarray) && !empty($newcartarray)) {
+			$i = count($newcartarray);
+		}
 
-        $newcartarray[$i]['id'] = $i;
-        $newcartarray[$i]['ref'] = $product->ref;
-        $newcartarray[$i]['label'] = $product->label;
-        $newcartarray[$i]['price'] = $product->price;
-        $newcartarray[$i]['price_ttc'] = $product->price_ttc;
+		$newcartarray[$i]['id'] = $i;
+		$newcartarray[$i]['ref'] = $product->ref;
+		$newcartarray[$i]['label'] = $product->label;
+		$newcartarray[$i]['price'] = $product->price;
+		$newcartarray[$i]['price_ttc'] = $product->price_ttc;
 
-        if (!empty($conf->global->PRODUIT_MULTIPRICES))
-        {
-            if (isset($product->multiprices[$societe->price_level]))
-            {
-                $newcartarray[$i]['price'] = $product->multiprices[$societe->price_level];
-                $newcartarray[$i]['price_ttc'] = $product->multiprices_ttc[$societe->price_level];
-            }
-        }
+		if (!empty($conf->global->PRODUIT_MULTIPRICES))
+		{
+			if (isset($product->multiprices[$societe->price_level]))
+			{
+				$newcartarray[$i]['price'] = $product->multiprices[$societe->price_level];
+				$newcartarray[$i]['price_ttc'] = $product->multiprices_ttc[$societe->price_level];
+			}
+		}
 
-        $newcartarray[$i]['fk_article'] = $this->id;
-        $newcartarray[$i]['qte'] = $this->qte();
-        $newcartarray[$i]['fk_tva'] = $this->tva(); // Vat rowid
-        $newcartarray[$i]['remise_percent'] = $remise_percent;
-        $newcartarray[$i]['remise'] = price2num($montant_remise_ht);
-        $newcartarray[$i]['total_ht'] = price2num($total_ht, 'MT');
-        $newcartarray[$i]['total_ttc'] = price2num($total_ttc, 'MT');
-        $newcartarray[$i]['total_vat'] = price2num($total_vat, 'MT');
-        $newcartarray[$i]['total_localtax1'] = price2num($total_localtax1, 'MT');
-        $newcartarray[$i]['total_localtax2'] = price2num($total_localtax2, 'MT');
-        $_SESSION['poscart'] = $newcartarray;
+		$newcartarray[$i]['fk_article'] = $this->id;
+		$newcartarray[$i]['qte'] = $this->qte();
+		$newcartarray[$i]['fk_tva'] = $this->tva(); // Vat rowid
+		$newcartarray[$i]['remise_percent'] = $remise_percent;
+		$newcartarray[$i]['remise'] = price2num($montant_remise_ht);
+		$newcartarray[$i]['total_ht'] = price2num($total_ht, 'MT');
+		$newcartarray[$i]['total_ttc'] = price2num($total_ttc, 'MT');
+		$newcartarray[$i]['total_vat'] = price2num($total_vat, 'MT');
+		$newcartarray[$i]['total_localtax1'] = price2num($total_localtax1, 'MT');
+		$newcartarray[$i]['total_localtax2'] = price2num($total_localtax2, 'MT');
+		$_SESSION['poscart'] = $newcartarray;
 
-        $this->raz();
-    }
+		$this->raz();
+	}
 
-    /**
-     *  Remove a product from panel
-     *
-     *  @param  int		$aArticle	Id of line into cart to remove
-     *  @return	void
-     */
-    public function supprArticle($aArticle)
-    {
-        $poscart = $_SESSION['poscart'];
+	/**
+	 *  Remove a product from panel
+	 *
+	 *  @param  int		$aArticle	Id of line into cart to remove
+	 *  @return	void
+	 */
+	public function supprArticle($aArticle)
+	{
+		$poscart = $_SESSION['poscart'];
 
-        $j = 0;
-        $newposcart = array();
-        foreach ($poscart as $key => $val)
-        {
-            if ($poscart[$key]['id'] != $aArticle)
-            {
-                $newposcart[$j] = $poscart[$key];
-                $newposcart[$j]['id'] = $j;
-                $j++;
-            }
-        }
-        unset($poscart);
-        //var_dump($poscart);exit;
-        $_SESSION['poscart'] = $newposcart;
-    }
+		$j = 0;
+		$newposcart = array();
+		foreach ($poscart as $key => $val)
+		{
+			if ($poscart[$key]['id'] != $aArticle)
+			{
+				$newposcart[$j] = $poscart[$key];
+				$newposcart[$j]['id'] = $j;
+				$j++;
+			}
+		}
+		unset($poscart);
+		//var_dump($poscart);exit;
+		$_SESSION['poscart'] = $newposcart;
+	}
 
-    /**
-     * Calculation of total HT, total TTC and VAT amounts
-     *
-     * @return	int		Total
-     */
-    public function calculTotaux()
-    {
-        global $db;
+	/**
+	 * Calculation of total HT, total TTC and VAT amounts
+	 *
+	 * @return	int		Total
+	 */
+	public function calculTotaux()
+	{
+		global $db;
 
-        $total_ht = 0;
-        $total_ttc = 0;
-        $total_vat = 0;
-        $total_localtax1 = 0;
-        $total_localtax2 = 0;
+		$total_ht = 0;
+		$total_ttc = 0;
+		$total_vat = 0;
+		$total_localtax1 = 0;
+		$total_localtax2 = 0;
 
-        $tab = (!empty($_SESSION['poscart']) ? $_SESSION['poscart'] : array());
+		$tab = (!empty($_SESSION['poscart']) ? $_SESSION['poscart'] : array());
 
-        $tab_size = count($tab);
-        for ($i = 0; $i < $tab_size; $i++)
-        {
-            // Total HT
-            $remise = $tab[$i]['remise'];
-            $total_ht += ($tab[$i]['total_ht']);
-            $total_vat += ($tab[$i]['total_vat']);
-            $total_ttc += ($tab[$i]['total_ttc']);
-            $total_localtax1 += ($tab[$i]['total_localtax1']);
-            $total_localtax2 += ($tab[$i]['total_localtax2']);
-        }
+		$tab_size = count($tab);
+		for ($i = 0; $i < $tab_size; $i++)
+		{
+			// Total HT
+			$remise = $tab[$i]['remise'];
+			$total_ht += ($tab[$i]['total_ht']);
+			$total_vat += ($tab[$i]['total_vat']);
+			$total_ttc += ($tab[$i]['total_ttc']);
+			$total_localtax1 += ($tab[$i]['total_localtax1']);
+			$total_localtax2 += ($tab[$i]['total_localtax2']);
+		}
 
-        $this->prix_total_ttc = $total_ttc;
-        $this->prix_total_ht = $total_ht;
-        $this->prix_total_vat = $total_vat;
-        $this->prix_total_localtax1 = $total_localtax1;
-        $this->prix_total_localtax2 = $total_localtax2;
+		$this->prix_total_ttc = $total_ttc;
+		$this->prix_total_ht = $total_ht;
+		$this->prix_total_vat = $total_vat;
+		$this->prix_total_localtax1 = $total_localtax1;
+		$this->prix_total_localtax2 = $total_localtax2;
 
-        $this->montant_tva = $total_ttc - $total_ht;
-        //print 'total: '.$this->prix_total_ttc; exit;
-    }
+		$this->montant_tva = $total_ttc - $total_ht;
+		//print 'total: '.$this->prix_total_ttc; exit;
+	}
 
-    /**
-     * Reset attributes
-     *
-     * @return	void
-     */
-    public function raz()
-    {
-        $this->id('RESET');
-        $this->ref('RESET');
-        $this->qte('RESET');
-        $this->stock('RESET');
-        $this->remisePercent('RESET');
-        $this->amountDiscount('RESET');
-        $this->prix('RESET');
-        $this->tva('RESET');
-    }
+	/**
+	 * Reset attributes
+	 *
+	 * @return	void
+	 */
+	public function raz()
+	{
+		$this->id('RESET');
+		$this->ref('RESET');
+		$this->qte('RESET');
+		$this->stock('RESET');
+		$this->remisePercent('RESET');
+		$this->amountDiscount('RESET');
+		$this->prix('RESET');
+		$this->tva('RESET');
+	}
 
-    /**
-     * Resetting persistent attributes
-     *
-     *  @return	void
-     */
-    private function razPers()
-    {
-        $this->numInvoice('RESET');
-        $this->getSetPaymentMode('RESET');
-        $this->amountCollected('RESET');
-        $this->amountReturned('RESET');
-        $this->paiementLe('RESET');
+	/**
+	 * Resetting persistent attributes
+	 *
+	 *  @return	void
+	 */
+	private function razPers()
+	{
+		$this->numInvoice('RESET');
+		$this->getSetPaymentMode('RESET');
+		$this->amountCollected('RESET');
+		$this->amountReturned('RESET');
+		$this->paiementLe('RESET');
 
-        $this->amountWithoutTax('RESET');
-        $this->amountVat('RESET');
-        $this->amountWithTax('RESET');
-    }
+		$this->amountWithoutTax('RESET');
+		$this->amountVat('RESET');
+		$this->amountWithTax('RESET');
+	}
 
 
-    // Methods for modifying protected attributes
+	// Methods for modifying protected attributes
 
-    /**
-     * Getter for id
-     *
-     * @param	int		$aId	Id
-     * @return  int             Id
-     */
-    public function id($aId = null)
-    {
+	/**
+	 * Getter for id
+	 *
+	 * @param	int		$aId	Id
+	 * @return  int             Id
+	 */
+	public function id($aId = null)
+	{
 
-        if (!$aId)
-        {
-            return $this->id;
-        } elseif ($aId == 'RESET')
-        {
-            $this->id = null;
-        } else {
-            $this->id = $aId;
-        }
-    }
+		if (!$aId)
+		{
+			return $this->id;
+		} elseif ($aId == 'RESET')
+		{
+			$this->id = null;
+		} else {
+			$this->id = $aId;
+		}
+	}
 
-    /**
-     * Getter for ref
-     *
-     * @param	string	$aRef	Ref
-     * @return	string			Ref
-     */
-    public function ref($aRef = null)
-    {
+	/**
+	 * Getter for ref
+	 *
+	 * @param	string	$aRef	Ref
+	 * @return	string			Ref
+	 */
+	public function ref($aRef = null)
+	{
 
-        if (is_null($aRef))
-        {
-            return $this->ref;
-        } elseif ($aRef == 'RESET')
-        {
-            $this->ref = null;
-        } else {
-            $this->ref = $aRef;
-        }
-    }
+		if (is_null($aRef))
+		{
+			return $this->ref;
+		} elseif ($aRef == 'RESET')
+		{
+			$this->ref = null;
+		} else {
+			$this->ref = $aRef;
+		}
+	}
 
-    /**
-     * Getter for qte
-     *
-     * @param	int		$aQte		Qty
-     * @return	int					Qty
-     */
-    public function qte($aQte = null)
-    {
-        if (is_null($aQte))
-        {
-            return $this->qte;
-        } elseif ($aQte == 'RESET')
-        {
-            $this->qte = null;
-        } else {
-            $this->qte = $aQte;
-        }
-    }
+	/**
+	 * Getter for qte
+	 *
+	 * @param	int		$aQte		Qty
+	 * @return	int					Qty
+	 */
+	public function qte($aQte = null)
+	{
+		if (is_null($aQte))
+		{
+			return $this->qte;
+		} elseif ($aQte == 'RESET')
+		{
+			$this->qte = null;
+		} else {
+			$this->qte = $aQte;
+		}
+	}
 
-    /**
-     * Getter for stock
-     *
-     * @param   string	$aStock		Stock
-     * @return	string				Stock
-     */
-    public function stock($aStock = null)
-    {
+	/**
+	 * Getter for stock
+	 *
+	 * @param   string	$aStock		Stock
+	 * @return	string				Stock
+	 */
+	public function stock($aStock = null)
+	{
 
-        if (is_null($aStock))
-        {
-            return $this->stock;
-        } elseif ($aStock == 'RESET')
-        {
-            $this->stock = null;
-        } else {
-            $this->stock = $aStock;
-        }
-    }
+		if (is_null($aStock))
+		{
+			return $this->stock;
+		} elseif ($aStock == 'RESET')
+		{
+			$this->stock = null;
+		} else {
+			$this->stock = $aStock;
+		}
+	}
 
-    /**
-     * Getter for remise_percent
-     *
-     * @param	string	$aRemisePercent		Discount
-     * @return	string						Discount
-     */
-    public function remisePercent($aRemisePercent = null)
-    {
+	/**
+	 * Getter for remise_percent
+	 *
+	 * @param	string	$aRemisePercent		Discount
+	 * @return	string						Discount
+	 */
+	public function remisePercent($aRemisePercent = null)
+	{
 
-        if (is_null($aRemisePercent))
-        {
-            return $this->remise_percent;
-        } elseif ($aRemisePercent == 'RESET')
-        {
-            $this->remise_percent = null;
-        } else {
-            $this->remise_percent = $aRemisePercent;
-        }
-    }
+		if (is_null($aRemisePercent))
+		{
+			return $this->remise_percent;
+		} elseif ($aRemisePercent == 'RESET')
+		{
+			$this->remise_percent = null;
+		} else {
+			$this->remise_percent = $aRemisePercent;
+		}
+	}
 
-    /**
-     * Getter for montant_remise
-     *
-     * @param	int		$aMontantRemise		Amount
-     * @return	string						Amount
-     */
-    public function amountDiscount($aMontantRemise = null)
-    {
+	/**
+	 * Getter for montant_remise
+	 *
+	 * @param	int		$aMontantRemise		Amount
+	 * @return	string						Amount
+	 */
+	public function amountDiscount($aMontantRemise = null)
+	{
 
-        if (is_null($aMontantRemise)) {
-            return $this->montant_remise;
-        } elseif ($aMontantRemise == 'RESET') {
-            $this->montant_remise = null;
-        } else {
-            $this->montant_remise = $aMontantRemise;
-        }
-    }
+		if (is_null($aMontantRemise)) {
+			return $this->montant_remise;
+		} elseif ($aMontantRemise == 'RESET') {
+			$this->montant_remise = null;
+		} else {
+			$this->montant_remise = $aMontantRemise;
+		}
+	}
 
-    /**
-     * Getter for prix
-     *
-     * @param	int		$aPrix		Price
-     * @return	string				Stock
-     */
-    public function prix($aPrix = null)
-    {
+	/**
+	 * Getter for prix
+	 *
+	 * @param	int		$aPrix		Price
+	 * @return	string				Stock
+	 */
+	public function prix($aPrix = null)
+	{
 
-        if (is_null($aPrix)) {
-            return $this->prix;
-        } elseif ($aPrix == 'RESET') {
-            $this->prix = null;
-        } else {
-            $this->prix = $aPrix;
-        }
-    }
+		if (is_null($aPrix)) {
+			return $this->prix;
+		} elseif ($aPrix == 'RESET') {
+			$this->prix = null;
+		} else {
+			$this->prix = $aPrix;
+		}
+	}
 
-    /**
-     * Getter for tva
-     *
-     * @param	int		$aTva		Vat
-     * @return	int					Vat
-     */
-    public function tva($aTva = null)
-    {
-        if (is_null($aTva)) {
-            return $this->tva;
-        } elseif ($aTva == 'RESET') {
-            $this->tva = null;
-        } else {
-            $this->tva = $aTva;
-        }
-    }
+	/**
+	 * Getter for tva
+	 *
+	 * @param	int		$aTva		Vat
+	 * @return	int					Vat
+	 */
+	public function tva($aTva = null)
+	{
+		if (is_null($aTva)) {
+			return $this->tva;
+		} elseif ($aTva == 'RESET') {
+			$this->tva = null;
+		} else {
+			$this->tva = $aTva;
+		}
+	}
 
-    /**
-     * Get num invoice
-     *
-     * @param string	$aNumFacture		Invoice ref
-     * @return	string						Invoice ref
-     */
-    public function numInvoice($aNumFacture = null)
-    {
-        if (is_null($aNumFacture)) {
-            return $this->num_facture;
-        } elseif ($aNumFacture == 'RESET') {
-            $this->num_facture = null;
-        } else {
-            $this->num_facture = $aNumFacture;
-        }
-    }
+	/**
+	 * Get num invoice
+	 *
+	 * @param string	$aNumFacture		Invoice ref
+	 * @return	string						Invoice ref
+	 */
+	public function numInvoice($aNumFacture = null)
+	{
+		if (is_null($aNumFacture)) {
+			return $this->num_facture;
+		} elseif ($aNumFacture == 'RESET') {
+			$this->num_facture = null;
+		} else {
+			$this->num_facture = $aNumFacture;
+		}
+	}
 
-    /**
-     * Get payment mode
-     *
-     * @param	int		$aModeReglement		Payment mode
-     * @return	int							Payment mode
-     */
-    public function getSetPaymentMode($aModeReglement = null)
-    {
+	/**
+	 * Get payment mode
+	 *
+	 * @param	int		$aModeReglement		Payment mode
+	 * @return	int							Payment mode
+	 */
+	public function getSetPaymentMode($aModeReglement = null)
+	{
 
-        if (is_null($aModeReglement)) {
-            return $this->mode_reglement;
-        } elseif ($aModeReglement == 'RESET') {
-            $this->mode_reglement = null;
-        } else {
-            $this->mode_reglement = $aModeReglement;
-        }
-    }
+		if (is_null($aModeReglement)) {
+			return $this->mode_reglement;
+		} elseif ($aModeReglement == 'RESET') {
+			$this->mode_reglement = null;
+		} else {
+			$this->mode_reglement = $aModeReglement;
+		}
+	}
 
-    /**
-     * Get amount
-     *
-     * @param	int		$aMontantEncaisse		Amount
-     * @return	int								Amount
-     */
-    public function amountCollected($aMontantEncaisse = null)
-    {
+	/**
+	 * Get amount
+	 *
+	 * @param	int		$aMontantEncaisse		Amount
+	 * @return	int								Amount
+	 */
+	public function amountCollected($aMontantEncaisse = null)
+	{
 
-        if (is_null($aMontantEncaisse)) {
-            return $this->montant_encaisse;
-        } elseif ($aMontantEncaisse == 'RESET') {
-            $this->montant_encaisse = null;
-        } else {
-            $this->montant_encaisse = $aMontantEncaisse;
-        }
-    }
+		if (is_null($aMontantEncaisse)) {
+			return $this->montant_encaisse;
+		} elseif ($aMontantEncaisse == 'RESET') {
+			$this->montant_encaisse = null;
+		} else {
+			$this->montant_encaisse = $aMontantEncaisse;
+		}
+	}
 
-    /**
-     * Get amount
-     *
-     * @param	int			$aMontantRendu		Amount
-     * @return	int								Amount
-     */
-    public function amountReturned($aMontantRendu = null)
-    {
+	/**
+	 * Get amount
+	 *
+	 * @param	int			$aMontantRendu		Amount
+	 * @return	int								Amount
+	 */
+	public function amountReturned($aMontantRendu = null)
+	{
 
-        if (is_null($aMontantRendu)) {
-            return $this->montant_rendu;
-        } elseif ($aMontantRendu == 'RESET') {
-            $this->montant_rendu = null;
-        } else {
-            $this->montant_rendu = $aMontantRendu;
-        }
-    }
+		if (is_null($aMontantRendu)) {
+			return $this->montant_rendu;
+		} elseif ($aMontantRendu == 'RESET') {
+			$this->montant_rendu = null;
+		} else {
+			$this->montant_rendu = $aMontantRendu;
+		}
+	}
 
-    /**
-     * Get payment date
-     *
-     * @param	integer		$aPaiementLe		Date
-     * @return	integer							Date
-     */
-    public function paiementLe($aPaiementLe = null)
-    {
-        if (is_null($aPaiementLe)) {
-            return $this->paiement_le;
-        } elseif ($aPaiementLe == 'RESET') {
-            $this->paiement_le = null;
-        } else {
-            $this->paiement_le = $aPaiementLe;
-        }
-    }
+	/**
+	 * Get payment date
+	 *
+	 * @param	integer		$aPaiementLe		Date
+	 * @return	integer							Date
+	 */
+	public function paiementLe($aPaiementLe = null)
+	{
+		if (is_null($aPaiementLe)) {
+			return $this->paiement_le;
+		} elseif ($aPaiementLe == 'RESET') {
+			$this->paiement_le = null;
+		} else {
+			$this->paiement_le = $aPaiementLe;
+		}
+	}
 
-    /**
-     * Get total HT
-     *
-     * @param	int		$aTotalHt		Total amount
-     * @return	int						Total amount
-     */
-    public function amountWithoutTax($aTotalHt = null)
-    {
-        if (is_null($aTotalHt)) {
-            return $this->prix_total_ht;
-        } elseif ($aTotalHt == 'RESET') {
-            $this->prix_total_ht = null;
-        } else {
-            $this->prix_total_ht = $aTotalHt;
-        }
-    }
+	/**
+	 * Get total HT
+	 *
+	 * @param	int		$aTotalHt		Total amount
+	 * @return	int						Total amount
+	 */
+	public function amountWithoutTax($aTotalHt = null)
+	{
+		if (is_null($aTotalHt)) {
+			return $this->prix_total_ht;
+		} elseif ($aTotalHt == 'RESET') {
+			$this->prix_total_ht = null;
+		} else {
+			$this->prix_total_ht = $aTotalHt;
+		}
+	}
 
-    /**
-     * Get amount vat
-     *
-     * @param	int		$aMontantTva	Amount vat
-     * @return	int						Amount vat
-     */
-    public function amountVat($aMontantTva = null)
-    {
-        if (is_null($aMontantTva)) {
-            return $this->montant_tva;
-        } elseif ($aMontantTva == 'RESET') {
-            $this->montant_tva = null;
-        } else {
-            $this->montant_tva = $aMontantTva;
-        }
-    }
+	/**
+	 * Get amount vat
+	 *
+	 * @param	int		$aMontantTva	Amount vat
+	 * @return	int						Amount vat
+	 */
+	public function amountVat($aMontantTva = null)
+	{
+		if (is_null($aMontantTva)) {
+			return $this->montant_tva;
+		} elseif ($aMontantTva == 'RESET') {
+			$this->montant_tva = null;
+		} else {
+			$this->montant_tva = $aMontantTva;
+		}
+	}
 
-    /**
-     * Get total TTC
-     *
-     * @param	int		$aTotalTtc		Amount ttc
-     * @return	int						Amount ttc
-     */
-    public function amountWithTax($aTotalTtc = null)
-    {
-        if (is_null($aTotalTtc))
-        {
-            return $this->prix_total_ttc;
-        } elseif ($aTotalTtc == 'RESET')
-        {
-            $this->prix_total_ttc = null;
-        } else {
-            $this->prix_total_ttc = $aTotalTtc;
-        }
-    }
+	/**
+	 * Get total TTC
+	 *
+	 * @param	int		$aTotalTtc		Amount ttc
+	 * @return	int						Amount ttc
+	 */
+	public function amountWithTax($aTotalTtc = null)
+	{
+		if (is_null($aTotalTtc))
+		{
+			return $this->prix_total_ttc;
+		} elseif ($aTotalTtc == 'RESET')
+		{
+			$this->prix_total_ttc = null;
+		} else {
+			$this->prix_total_ttc = $aTotalTtc;
+		}
+	}
 }
diff --git a/htdocs/cashdesk/facturation_verif.php b/htdocs/cashdesk/facturation_verif.php
index 16b4bfec017..76ad8571118 100644
--- a/htdocs/cashdesk/facturation_verif.php
+++ b/htdocs/cashdesk/facturation_verif.php
@@ -67,15 +67,15 @@ switch ($action)
 					{
 						$ret[$key] = $value;
 					}
-                    // Here $ret['tva_tx'] is vat rate of product but we want to not use the one into table but found by function
+					// Here $ret['tva_tx'] is vat rate of product but we want to not use the one into table but found by function
 
 					$productid = $ret['rowid'];
 					$product = new Product($db);
-                    $product->fetch($productid);
-                    $prod = $product;
+					$product->fetch($productid);
+					$prod = $product;
 
 					$thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
-                    $societe = new Societe($db);
+					$societe = new Societe($db);
 					$societe->fetch($thirdpartyid);
 
 					// Update if prices fields are defined
@@ -91,39 +91,39 @@ switch ($action)
 					// multiprix
 					if (!empty($conf->global->PRODUIT_MULTIPRICES) && !empty($societe->price_level))
 					{
-					    $pu_ht = $prod->multiprices[$societe->price_level];
-					    $pu_ttc = $prod->multiprices_ttc[$societe->price_level];
-					    $price_min = $prod->multiprices_min[$societe->price_level];
-					    $price_base_type = $prod->multiprices_base_type[$societe->price_level];
-					    if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
-					    {
-					        if (isset($prod->multiprices_tva_tx[$societe->price_level])) $tva_tx = $prod->multiprices_tva_tx[$societe->price_level];
-					        if (isset($prod->multiprices_recuperableonly[$societe->price_level])) $tva_npr = $prod->multiprices_recuperableonly[$societe->price_level];
-					    }
+						$pu_ht = $prod->multiprices[$societe->price_level];
+						$pu_ttc = $prod->multiprices_ttc[$societe->price_level];
+						$price_min = $prod->multiprices_min[$societe->price_level];
+						$price_base_type = $prod->multiprices_base_type[$societe->price_level];
+						if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
+						{
+							if (isset($prod->multiprices_tva_tx[$societe->price_level])) $tva_tx = $prod->multiprices_tva_tx[$societe->price_level];
+							if (isset($prod->multiprices_recuperableonly[$societe->price_level])) $tva_npr = $prod->multiprices_recuperableonly[$societe->price_level];
+						}
 					} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 					{
-					    require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
+						require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
-					    $prodcustprice = new Productcustomerprice($db);
+						$prodcustprice = new Productcustomerprice($db);
 
-					    $filter = array('t.fk_product' => $prod->id, 't.fk_soc' => $societe->id);
+						$filter = array('t.fk_product' => $prod->id, 't.fk_soc' => $societe->id);
 
-					    $result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
-					    if ($result >= 0)
-					    {
-					        if (count($prodcustprice->lines) > 0)
-					        {
-					            $pu_ht = price($prodcustprice->lines[0]->price);
-					            $pu_ttc = price($prodcustprice->lines[0]->price_ttc);
-					            $price_base_type = $prodcustprice->lines[0]->price_base_type;
-					            $tva_tx = $prodcustprice->lines[0]->tva_tx;
-					            if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) $tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
-					            $tva_npr = $prodcustprice->lines[0]->recuperableonly;
-					            if (empty($tva_tx)) $tva_npr = 0;
-					        }
-					    } else {
-					        setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
-					    }
+						$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
+						if ($result >= 0)
+						{
+							if (count($prodcustprice->lines) > 0)
+							{
+								$pu_ht = price($prodcustprice->lines[0]->price);
+								$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
+								$price_base_type = $prodcustprice->lines[0]->price_base_type;
+								$tva_tx = $prodcustprice->lines[0]->tva_tx;
+								if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) $tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
+								$tva_npr = $prodcustprice->lines[0]->recuperableonly;
+								if (empty($tva_tx)) $tva_npr = 0;
+							}
+						} else {
+							setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
+						}
 					}
 
 					$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
@@ -131,17 +131,17 @@ switch ($action)
 
 					// if price ht is forced (ie: calculated by margin rate and cost price). TODO Why this ?
 					if (!empty($price_ht)) {
-					    $pu_ht = price2num($price_ht, 'MU');
-					    $pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
+						$pu_ht = price2num($price_ht, 'MU');
+						$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
 					}
 					// On reevalue prix selon taux tva car taux tva transaction peut etre different
 					// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
 					elseif ($tmpvat != $tmpprodvat) {
-					    if ($price_base_type != 'HT') {
-					        $pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
-					    } else {
-					        $pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
-					    }
+						if ($price_base_type != 'HT') {
+							$pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
+						} else {
+							$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
+						}
 					}
 
 					$obj_facturation->id($ret['rowid']);
@@ -187,17 +187,17 @@ switch ($action)
 		$newthirdpartyid = GETPOST('CASHDESK_ID_THIRDPARTY', 'int');
 		if ($newthirdpartyid > 0)
 		{
-		    $_SESSION["CASHDESK_ID_THIRDPARTY"] = $newthirdpartyid;
+			$_SESSION["CASHDESK_ID_THIRDPARTY"] = $newthirdpartyid;
 		}
 
 		$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation';
-        break;
+		break;
 
 	case 'ajout_article':	// We have clicked on button "Add product"
 
 		if (!empty($obj_facturation->id))	// A product was previously selected and stored in session, so we can add it
 		{
-		    dol_syslog("facturation_verif save vat ".$_POST['selTva']);
+			dol_syslog("facturation_verif save vat ".$_POST['selTva']);
 			$obj_facturation->qte($_POST['txtQte']);
 			$obj_facturation->tva($_POST['selTva']); // id of vat. Saved so we can use it for next product
 			$obj_facturation->remisePercent($_POST['txtRemise']);
diff --git a/htdocs/cashdesk/include/environnement.php b/htdocs/cashdesk/include/environnement.php
index 19736d4b46a..d97056470f1 100644
--- a/htdocs/cashdesk/include/environnement.php
+++ b/htdocs/cashdesk/include/environnement.php
@@ -32,7 +32,7 @@ $conf_db_base = $dolibarr_main_db_name;
 $conf_fksoc = (!empty($_SESSION["CASHDESK_ID_THIRDPARTY"])) ? $_SESSION["CASHDESK_ID_THIRDPARTY"] : ($conf->global->CASHDESK_ID_THIRDPARTY > 0 ? $conf->global->CASHDESK_ID_THIRDPARTY : 0);
 // Identifiant unique correspondant a l'entrepot a utiliser
 $conf_fkentrepot = (!empty($_SESSION["CASHDESK_ID_WAREHOUSE"])) ? $_SESSION["CASHDESK_ID_WAREHOUSE"] : ($conf->global->CASHDESK_ID_WAREHOUSE > 0 ? $conf->global->CASHDESK_ID_WAREHOUSE : 0);
-if (!empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) $conf_fkentrepot = 0; // If option to disable stock decrease is on, we set warehouse id to 0.
+if (!empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) $conf_fkentrepot = 0; // If option to disable the stock decrease is on, we set warehouse id to 0.
 
 // Identifiant unique correspondant au compte caisse / liquide
 $conf_fkaccount_cash = (!empty($_SESSION["CASHDESK_ID_BANKACCOUNT_CASH"])) ? $_SESSION["CASHDESK_ID_BANKACCOUNT_CASH"] : ($conf->global->CASHDESK_ID_BANKACCOUNT_CASH > 0 ? $conf->global->CASHDESK_ID_BANKACCOUNT_CASH : 0);
@@ -46,6 +46,3 @@ $conf_fkaccount_cb = (!empty($_SESSION["CASHDESK_ID_BANKACCOUNT_CB"])) ? $_SESSI
 // View parameters
 $conf_taille_listes = (empty($conf->global->PRODUIT_LIMIT_SIZE) ? 1000 : $conf->global->PRODUIT_LIMIT_SIZE); // Number max of lines to show in lists
 $conf_nbr_car_listes = 60; // Nombre max de caracteres par ligne dans les listes
-
-// Add hidden option to force decrease of stock whatever is user setup
-if (!empty($conf->global->CASHDESK_FORCE_STOCK_ON_BILL)) $conf->global->STOCK_CALCULATE_ON_BILL = 1;
diff --git a/htdocs/cashdesk/index_verif.php b/htdocs/cashdesk/index_verif.php
index e8366e981cc..45ce3857068 100644
--- a/htdocs/cashdesk/index_verif.php
+++ b/htdocs/cashdesk/index_verif.php
@@ -51,9 +51,9 @@ if (empty($username))
 // Check third party id
 if (!($thirdpartyid > 0))
 {
-    $retour = $langs->trans("ErrorFieldRequired", $langs->transnoentities("CashDeskThirdPartyForSell"));
-    header('Location: '.DOL_URL_ROOT.'/cashdesk/index.php?err='.urlencode($retour).'&user='.$username.'&socid='.$thirdpartyid.'&warehouseid='.$warehouseid.'&bankid_cash='.$bankid_cash.'&bankid_cheque='.$bankid_cheque.'&bankid_cb='.$bankid_cb);
-    exit;
+	$retour = $langs->trans("ErrorFieldRequired", $langs->transnoentities("CashDeskThirdPartyForSell"));
+	header('Location: '.DOL_URL_ROOT.'/cashdesk/index.php?err='.urlencode($retour).'&user='.$username.'&socid='.$thirdpartyid.'&warehouseid='.$warehouseid.'&bankid_cash='.$bankid_cash.'&bankid_cheque='.$bankid_cheque.'&bankid_cb='.$bankid_cb);
+	exit;
 }
 
 // If we setup stock module to ask movement on invoices, we must not allow access if required setup not finished.
@@ -107,12 +107,12 @@ if ($retour >= 0)
 		$_SESSION['lastname'] = $tab['lastname'];
 		$_SESSION['firstname'] = $tab['firstname'];
 		$_SESSION['CASHDESK_ID_THIRDPARTY'] = ($thirdpartyid > 0 ? $thirdpartyid : '');
-        $_SESSION['CASHDESK_ID_WAREHOUSE'] = ($warehouseid > 0 ? $warehouseid : '');
+		$_SESSION['CASHDESK_ID_WAREHOUSE'] = ($warehouseid > 0 ? $warehouseid : '');
 
-        $_SESSION['CASHDESK_ID_BANKACCOUNT_CASH'] = ($bankid_cash > 0 ? $bankid_cash : '');
-        $_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE'] = ($bankid_cheque > 0 ? $bankid_cheque : '');
-        $_SESSION['CASHDESK_ID_BANKACCOUNT_CB'] = ($bankid_cb > 0 ? $bankid_cb : '');
-        //var_dump($_SESSION);exit;
+		$_SESSION['CASHDESK_ID_BANKACCOUNT_CASH'] = ($bankid_cash > 0 ? $bankid_cash : '');
+		$_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE'] = ($bankid_cheque > 0 ? $bankid_cheque : '');
+		$_SESSION['CASHDESK_ID_BANKACCOUNT_CB'] = ($bankid_cb > 0 ? $bankid_cb : '');
+		//var_dump($_SESSION);exit;
 
 		header('Location: '.DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation&id=NOUV');
 		exit;
@@ -121,7 +121,7 @@ if ($retour >= 0)
 	}
 } else {
 	// Load translation files required by the page
-    $langs->loadLangs(array("other", "errors"));
+	$langs->loadLangs(array("other", "errors"));
 	$retour = $langs->trans("ErrorBadLoginPassword");
 	header('Location: '.DOL_URL_ROOT.'/cashdesk/index.php?err='.urlencode($retour).'&user='.$username.'&socid='.$thirdpartyid.'&warehouseid='.$warehouseid);
 	exit;
diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php
index e1dc53ed6e8..d48fc544eb0 100644
--- a/htdocs/cashdesk/tpl/facturation1.tpl.php
+++ b/htdocs/cashdesk/tpl/facturation1.tpl.php
@@ -118,7 +118,7 @@ for ($i = 0; $i < $nbtoshow; $i++)
 					$buyer = new Societe($db);
 					if ($_SESSION["CASHDESK_ID_THIRDPARTY"] > 0) $buyer->fetch($_SESSION["CASHDESK_ID_THIRDPARTY"]);
 					echo $form->load_tva('selTva', (GETPOSTISSET("selTva") ? GETPOST("selTva", 'alpha', 2) : $vatrate), $mysoc, $buyer, 0, 0, '', false, -1);
-			    ?>
+				?>
                 </td>
 				<td></td>
 			</tr>
@@ -141,7 +141,7 @@ for ($i = 0; $i < $nbtoshow; $i++)
 </fieldset>
 
 <!-- ========================= Cadre "Amount" ============================= -->
-<form id="frmDifference"  class="formulaire1" method="post" onsubmit="javascript: return verifReglement()" action="validation_verif.php?action=valide_achat">
+<form id="frmDifference"  class="formulaire1" method="post" onsubmit="javascript: return verifReglement()" action="validation_verif.php?action=validate_sell">
 	<input type="hidden" name="hdnChoix" value="" />
 	<input type="hidden" name="token" value="<?php echo newToken(); ?>" />
 <fieldset class="cadre_facturation"><legend class="titre1"><?php echo $langs->trans("Amount"); ?></legend>
diff --git a/htdocs/cashdesk/tpl/liste_articles.tpl.php b/htdocs/cashdesk/tpl/liste_articles.tpl.php
index bd73954f6a0..e3c3c285966 100644
--- a/htdocs/cashdesk/tpl/liste_articles.tpl.php
+++ b/htdocs/cashdesk/tpl/liste_articles.tpl.php
@@ -50,22 +50,22 @@ $tab = (!empty($_SESSION['poscart']) ? $_SESSION['poscart'] : array());
 $tab_size = count($tab);
 if ($tab_size <= 0) print '<div class="center">'.$langs->trans("NoArticle").'</div><br>';
 else {
-    for ($i = 0; $i < $tab_size; $i++)
-    {
-        echo ('<div class="cadre_article">'."\n");
-        echo ('<p><a href="facturation_verif.php?action=suppr_article&suppr_id='.$tab[$i]['id'].'" title="'.$langs->trans("DeleteArticle").'">'.$tab[$i]['ref'].' - '.$tab[$i]['label'].'</a></p>'."\n");
+	for ($i = 0; $i < $tab_size; $i++)
+	{
+		echo ('<div class="cadre_article">'."\n");
+		echo ('<p><a href="facturation_verif.php?action=suppr_article&suppr_id='.$tab[$i]['id'].'" title="'.$langs->trans("DeleteArticle").'">'.$tab[$i]['ref'].' - '.$tab[$i]['label'].'</a></p>'."\n");
 
-        if ($tab[$i]['remise_percent'] > 0) {
-            $remise_percent = ' -'.$tab[$i]['remise_percent'].'%';
-        } else {
-            $remise_percent = '';
-        }
+		if ($tab[$i]['remise_percent'] > 0) {
+			$remise_percent = ' -'.$tab[$i]['remise_percent'].'%';
+		} else {
+			$remise_percent = '';
+		}
 
-        $remise = $tab[$i]['remise'];
+		$remise = $tab[$i]['remise'];
 
-        echo ('<p>'.$tab[$i]['qte'].' x '.price2num($tab[$i]['price'], 'MT').$remise_percent.' = '.price(price2num($tab[$i]['total_ht'], 'MT'), 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT").' ('.price(price2num($tab[$i]['total_ttc'], 'MT'), 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC").')</p>'."\n");
-        echo ('</div>'."\n");
-    }
+		echo ('<p>'.$tab[$i]['qte'].' x '.price2num($tab[$i]['price'], 'MT').$remise_percent.' = '.price(price2num($tab[$i]['total_ht'], 'MT'), 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT").' ('.price(price2num($tab[$i]['total_ttc'], 'MT'), 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC").')</p>'."\n");
+		echo ('</div>'."\n");
+	}
 }
 
 echo ('<p class="cadre_prix_total">'.$langs->trans("Total").' : '.price(price2num($total_ttc, 'MT'), 0, $langs, 0, 0, -1, $conf->currency).'<br></p>'."\n");
diff --git a/htdocs/cashdesk/tpl/ticket.tpl.php b/htdocs/cashdesk/tpl/ticket.tpl.php
index b5994456252..101ea687e7b 100644
--- a/htdocs/cashdesk/tpl/ticket.tpl.php
+++ b/htdocs/cashdesk/tpl/ticket.tpl.php
@@ -55,11 +55,11 @@ $object->fetch($facid);
         </p>
 
         <p class="date_heure"><?php
-        // Recuperation et affichage de la date et de l'heure
-        $now = dol_now();
-        print dol_print_date($now, 'dayhourtext').'<br>';
-        print $object->ref;
-        ?></p>
+		// Recuperation et affichage de la date et de l'heure
+		$now = dol_now();
+		print dol_print_date($now, 'dayhourtext').'<br>';
+		print $object->ref;
+		?></p>
     </div>
 </div>
 
@@ -78,14 +78,14 @@ $object->fetch($facid);
     <tbody>
     <?php
 
-    $tab = array();
-    $tab = $_SESSION['poscart'];
+	$tab = array();
+	$tab = $_SESSION['poscart'];
 
-    $tab_size = count($tab);
-    for ($i = 0; $i < $tab_size; $i++)
-    {
-        $remise = $tab[$i]['remise'];
-        ?>
+	$tab_size = count($tab);
+	for ($i = 0; $i < $tab_size; $i++)
+	{
+		$remise = $tab[$i]['remise'];
+		?>
     <tr>
         <td><?php echo $tab[$i]['ref']; ?></td>
         <td><?php echo $tab[$i]['label']; ?></td>
@@ -94,8 +94,8 @@ $object->fetch($facid);
         <td class="total"><?php echo price(price2num($tab[$i]['total_ht'], 'MT'), 0, $langs, 0, 0, -1, $conf->currency); ?></td>
     </tr>
         <?php
-    }
-    ?>
+	}
+	?>
     </tbody>
 </table>
 
diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php
index 0434473d359..cc558cca058 100644
--- a/htdocs/cashdesk/tpl/validation1.tpl.php
+++ b/htdocs/cashdesk/tpl/validation1.tpl.php
@@ -97,7 +97,7 @@ if ($obj_facturation->amountReturned()) {
 
 	</table>
 
-	<form id="frmValidation" class="formulaire2" method="post" action="validation_verif.php?action=valide_facture">
+	<form id="frmValidation" class="formulaire2" method="post" action="validation_verif.php?action=validate_invoice">
 		<input type="hidden" name="token" value="<?php echo newToken(); ?>" />
 		<p class="note_label">
 			<?php
diff --git a/htdocs/cashdesk/validation_ticket.php b/htdocs/cashdesk/validation_ticket.php
index 7e4e101c9b8..28ad91dc4e7 100644
--- a/htdocs/cashdesk/validation_ticket.php
+++ b/htdocs/cashdesk/validation_ticket.php
@@ -35,7 +35,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $obj_facturation);
 if (empty($reshook))
 {
-    require 'tpl/ticket.tpl.php';
+	require 'tpl/ticket.tpl.php';
 }
 
 
diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
index 6b8e9af94f1..9468c395756 100644
--- a/htdocs/cashdesk/validation_verif.php
+++ b/htdocs/cashdesk/validation_verif.php
@@ -39,11 +39,11 @@ $bankaccountid = GETPOST('cashdeskbank');
 switch ($action)
 {
 	default:
-	    $redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=validation';
+		$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=validation';
 		break;
 
-	case 'valide_achat':
-	    $thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
+	case 'validate_sell':
+		$thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
 
 		$company = new Societe($db);
 		$company->fetch($thirdpartyid);
@@ -97,9 +97,9 @@ switch ($action)
 
 			$obj_facturation->amountReturned($encaisse - $total);
 		} else {
-		    //$txtDatePaiement=$_POST['txtDatePaiement'];
-		    $datePaiement = dol_mktime(0, 0, 0, $_POST['txtDatePaiementmonth'], $_POST['txtDatePaiementday'], $_POST['txtDatePaiementyear']);
-		    $txtDatePaiement = dol_print_date($datePaiement, 'dayrfc');
+			//$txtDatePaiement=$_POST['txtDatePaiement'];
+			$datePaiement = dol_mktime(0, 0, 0, $_POST['txtDatePaiementmonth'], $_POST['txtDatePaiementday'], $_POST['txtDatePaiementyear']);
+			$txtDatePaiement = dol_print_date($datePaiement, 'dayrfc');
 			$obj_facturation->paiementLe($txtDatePaiement);
 		}
 
@@ -112,7 +112,7 @@ switch ($action)
 		break;
 
 
-	case 'valide_facture':
+	case 'validate_invoice':
 		$now = dol_now();
 
 		// Recuperation de la date et de l'heure
@@ -252,12 +252,12 @@ switch ($action)
 				}
 			} else {
 				setEventMessages($invoice->error, $invoice->errors, 'errors');
-			    $error++;
+				$error++;
 			}
 
 			$id = $invoice->id;
 		} else {
-		    $resultcreate = $invoice->create($user, 0, 0);
+			$resultcreate = $invoice->create($user, 0, 0);
 			if ($resultcreate > 0)
 			{
 				$warehouseidtodecrease = (isset($_SESSION["CASHDESK_ID_WAREHOUSE"]) ? $_SESSION["CASHDESK_ID_WAREHOUSE"] : 0);
@@ -282,8 +282,8 @@ switch ($action)
 							if ($invoice->type == $invoice::TYPE_CREDIT_NOTE) $result = $mouvP->reception($user, $invoice->lines[$i]->fk_product, $warehouseidtodecrease, $invoice->lines[$i]->qty, $invoice->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarrFromPos", $invoice->newref));
 							else $result = $mouvP->livraison($user, $invoice->lines[$i]->fk_product, $warehouseidtodecrease, $invoice->lines[$i]->qty, $invoice->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarrFromPos", $invoice->newref));
 							if ($result < 0) {
-							    setEventMessages($mouvP->error, $mouvP->errors, 'errors');
-							    $error++;
+								setEventMessages($mouvP->error, $mouvP->errors, 'errors');
+								$error++;
 							}
 						}
 					}
@@ -303,33 +303,33 @@ switch ($action)
 				$paiement_id = $payment->create($user);
 				if ($paiement_id > 0)
 				{
-                    if (!$error)
-                    {
-                        $result = $payment->addPaymentToBank($user, 'payment', '(CustomerInvoicePayment)', $bankaccountid, '', '');
-                        if (!$result > 0)
-                        {
-                            $errmsg = $paiement->error;
-                            $error++;
-                        }
-                    }
+					if (!$error)
+					{
+						$result = $payment->addPaymentToBank($user, 'payment', '(CustomerInvoicePayment)', $bankaccountid, '', '');
+						if (!$result > 0)
+						{
+							$errmsg = $paiement->error;
+							$error++;
+						}
+					}
 
-                    if (!$error)
-                    {
-                    	if ($invoice->total_ttc == $obj_facturation->amountWithTax()
-                    		&& $obj_facturation->getSetPaymentMode() != 'DIFF')
-                    	{
-                    		// We set status to payed
-                    		$result = $invoice->set_paid($user);
-                  			//print 'set paid';exit;
-                    	}
-                    }
+					if (!$error)
+					{
+						if ($invoice->total_ttc == $obj_facturation->amountWithTax()
+							&& $obj_facturation->getSetPaymentMode() != 'DIFF')
+						{
+							// We set status to payed
+							$result = $invoice->set_paid($user);
+				  			//print 'set paid';exit;
+						}
+					}
 				} else {
-				    setEventMessages($invoice->error, $invoice->errors, 'errors');
-				    $error++;
+					setEventMessages($invoice->error, $invoice->errors, 'errors');
+					$error++;
 				}
 			} else {
 				setEventMessages($invoice->error, $invoice->errors, 'errors');
-			    $error++;
+				$error++;
 			}
 		}
 
@@ -344,7 +344,7 @@ switch ($action)
 		}
 		break;
 
-		// End of case: valide_facture
+		// End of case: validate_invoice
 }
 
 unset($_SESSION['serObjFacturation']);
diff --git a/htdocs/categories/admin/categorie.php b/htdocs/categories/admin/categorie.php
index eb8af1ee44a..693a3e53a2a 100644
--- a/htdocs/categories/admin/categorie.php
+++ b/htdocs/categories/admin/categorie.php
@@ -42,26 +42,26 @@ $action = GETPOST('action', 'aZ09');
 $reg = array();
 if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 {
-    $code = $reg[1];
-    if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
-    {
-        header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    } else {
-        setEventMessages($db->lasterror(), null, 'errors');
-    }
+	$code = $reg[1];
+	if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	} else {
+		setEventMessages($db->lasterror(), null, 'errors');
+	}
 }
 
 if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 {
-    $code = $reg[1];
-    if (dolibarr_del_const($db, $code, $conf->entity) > 0)
-    {
-        header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    } else {
-         setEventMessages($db->lasterror(), null, 'errors');
-    }
+	$code = $reg[1];
+	if (dolibarr_del_const($db, $code, $conf->entity) > 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	} else {
+		 setEventMessages($db->lasterror(), null, 'errors');
+	}
 }
 
 
@@ -81,7 +81,7 @@ print load_fiche_titre($langs->trans("CategoriesSetup"), $linkback, 'title_setup
 
 $head = categoriesadmin_prepare_head();
 
-dol_fiche_head($head, 'setup', $langs->trans("Categories"), -1, 'category');
+print dol_get_fiche_head($head, 'setup', $langs->trans("Categories"), -1, 'category');
 
 
 print '<table class="noborder centpercent">';
diff --git a/htdocs/categories/admin/categorie_extrafields.php b/htdocs/categories/admin/categorie_extrafields.php
index 72151abdcdb..ff6a4ca7881 100644
--- a/htdocs/categories/admin/categorie_extrafields.php
+++ b/htdocs/categories/admin/categorie_extrafields.php
@@ -68,19 +68,19 @@ print load_fiche_titre($langs->trans("CategoriesSetup"), $linkback, 'title_setup
 
 $head = categoriesadmin_prepare_head();
 
-dol_fiche_head($head, 'attributes_categories', $langs->trans("Categories"), -1, 'category');
+print dol_get_fiche_head($head, 'attributes_categories', $langs->trans("Categories"), -1, 'category');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -93,9 +93,9 @@ if ($action != 'create' && $action != 'edit')
 if ($action == 'create')
 {
 	print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -105,10 +105,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && !empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
index 096a5497efd..feca9c4f204 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2007		Patrick Raguin		<patrick.raguin@gmail.com>
  * Copyright (C) 2013		Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2020       Frédéric 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
@@ -35,26 +36,24 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 $langs->load("categories");
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = (int) GETPOST('socid', 'int');
 if (!$user->rights->categorie->lire) accessforbidden();
 
 $action		= GETPOST('action', 'alpha');
 $cancel		= GETPOST('cancel', 'alpha');
 $origin		= GETPOST('origin', 'alpha');
-$catorigin = GETPOST('catorigin', 'int');
-$type = GETPOST('type', 'alpha');
+$catorigin  = (int) GETPOST('catorigin', 'int');
+$type       = GETPOST('type', 'aZ09');
 $urlfrom	= GETPOST('urlfrom', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-$socid = GETPOST('socid', 'int');
-$label = GETPOST('label');
-$description = GETPOST('description');
-$color = GETPOST('color');
-$visible = GETPOST('visible');
-$parent = GETPOST('parent');
+$label = (string) GETPOST('label', 'alphanohtml');
+$description = (string) GETPOST('description', 'restricthtml');
+$color = preg_replace('/[^0-9a-f#]/i', '', (string) GETPOST('color', 'alphanohtml'));
+$visible = (int) GETPOST('visible', 'int');
+$parent = (int) GETPOST('parent', 'int');
 
-if ($origin)
-{
+if ($origin) {
 	if ($type == Categorie::TYPE_PRODUCT)     $idProdOrigin     = $origin;
 	if ($type == Categorie::TYPE_SUPPLIER)    $idSupplierOrigin = $origin;
 	if ($type == Categorie::TYPE_CUSTOMER)    $idCompanyOrigin  = $origin;
@@ -73,6 +72,8 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('categorycard'));
 
+$error = 0;
+
 
 /*
  *	Actions
@@ -88,32 +89,25 @@ if ($action == 'add' && $user->rights->categorie->creer)
 		{
 			header("Location: ".$urlfrom);
 			exit;
-		} elseif ($backtopage)
-		{
+		} elseif ($backtopage) {
 			header("Location: ".$backtopage);
 			exit;
-		} elseif ($idProdOrigin)
-		{
+		} elseif ($idProdOrigin) {
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProdOrigin.'&type='.$type);
 			exit;
-		} elseif ($idCompanyOrigin)
-		{
+		} elseif ($idCompanyOrigin) {
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idCompanyOrigin.'&type='.$type);
 			exit;
-		} elseif ($idSupplierOrigin)
-		{
+		} elseif ($idSupplierOrigin) {
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idSupplierOrigin.'&type='.$type);
 			exit;
-		} elseif ($idMemberOrigin)
-		{
+		} elseif ($idMemberOrigin) {
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idMemberOrigin.'&type='.$type);
 			exit;
-		} elseif ($idContactOrigin)
-		{
+		} elseif ($idContactOrigin) {
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idContactOrigin.'&type='.$type);
 			exit;
-		} elseif ($idProjectOrigin)
-		{
+		} elseif ($idProjectOrigin) {
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProjectOrigin.'&type='.$type);
 			exit;
 		} else {
@@ -127,7 +121,7 @@ if ($action == 'add' && $user->rights->categorie->creer)
 	$object->label			= $label;
 	$object->color			= $color;
 	$object->description = dol_htmlcleanlastbr($description);
-	$object->socid			= ($socid ? $socid : 'null');
+	$object->socid			= ($socid > 0 ? $socid : 0);
 	$object->visible = $visible;
 	$object->type = $type;
 
@@ -233,7 +227,7 @@ if ($user->rights->categorie->creer)
 
 		print load_fiche_titre($langs->trans("CreateCat"));
 
-		dol_fiche_head('');
+		print dol_get_fiche_head('');
 
 		print '<table width="100%" class="border">';
 
@@ -262,7 +256,7 @@ if ($user->rights->categorie->creer)
 
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
+		print $hookmanager->resPrint;
 		if (empty($reshook))
 		{
 			print $object->showOptionals($extrafields, 'edit', $parameters);
@@ -270,12 +264,12 @@ if ($user->rights->categorie->creer)
 
 		print '</table>';
 
-		dol_fiche_end('');
+		print dol_get_fiche_end('');
 
 		print '<div class="center">';
 		print '<input type="submit" class="button" value="'.$langs->trans("CreateThisCat").'" name="creation" />';
 		print '&nbsp; &nbsp; &nbsp;';
-		print '<input type="submit" class="button" value="'.$langs->trans("Cancel").'" name="cancel" />';
+		print '<input type="submit" class="button button-cancel" value="'.$langs->trans("Cancel").'" name="cancel" />';
 		print '</div>';
 
 		print '</form>';
diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index 5f0a28340f9..03610100c9c 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -658,7 +658,7 @@ class Categories extends DolibarrApi
 	 * Clean sensible object datas
 	 *
 	 * @param   Categorie  $object    Object to clean
-	 * @return    array    Array of cleaned object properties
+	 * @return  Object     Object with cleaned properties
 	 */
 	protected function _cleanObjectDatas($object)
 	{
@@ -769,6 +769,7 @@ class Categories extends DolibarrApi
 
 		$objects = $result;
 		$cleaned_objects = array();
+		$objects_api = null;
 		if ($type == 'member') {
 			$objects_api = new Members();
 		} elseif ($type == 'customer' || $type == 'supplier') {
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 1bc9f47ded4..f55b3403546 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -208,6 +208,11 @@ class Categorie extends CommonObject
 	 */
 	public $color;
 
+	/**
+	 * @var int Visible
+	 */
+	public $visible;
+
 	/**
 	 * @var int		  Id of thirdparty when CATEGORY_ASSIGNED_TO_A_CUSTOMER is set
 	 */
@@ -312,42 +317,38 @@ class Categorie extends CommonObject
 		$sql = "SELECT rowid, fk_parent, entity, label, description, color, fk_soc, visible, type, ref_ext";
 		$sql .= ", date_creation, tms, fk_user_creat, fk_user_modif";
 		$sql .= " FROM ".MAIN_DB_PREFIX."categorie";
-		if ($id > 0)
-		{
+		if ($id > 0) {
 			$sql .= " WHERE rowid = ".$id;
-		} elseif (!empty($ref_ext))
-		{
+		} elseif (!empty($ref_ext)) {
 			$sql .= " WHERE ref_ext LIKE '".$this->db->escape($ref_ext)."'";
 		} else {
 			$sql .= " WHERE label = '".$this->db->escape($label)."' AND entity IN (".getEntity('category').")";
-			if (!is_null($type)) $sql .= " AND type = ".$this->db->escape($type);
+			if (!is_null($type)) $sql .= " AND type = ".((int) $type);
 		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql) > 0)
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql) > 0) {
 				$res = $this->db->fetch_array($resql);
 
 				$this->id = $res['rowid'];
 				//$this->ref = $res['rowid'];
-				$this->fk_parent	= $res['fk_parent'];
+				$this->fk_parent	= (int) $res['fk_parent'];
 				$this->label		= $res['label'];
 				$this->description = $res['description'];
 				$this->color    	= $res['color'];
-				$this->socid		= $res['fk_soc'];
-				$this->visible = $res['visible'];
-				$this->type = $res['type'];
+				$this->socid		= (int) $res['fk_soc'];
+				$this->visible = (int) $res['visible'];
+				$this->type = (int) $res['type'];
 				$this->ref_ext = $res['ref_ext'];
-				$this->entity = $res['entity'];
+				$this->entity = (int) $res['entity'];
 				$this->date_creation = $this->db->jdate($res['date_creation']);
 				$this->date_modification = $this->db->jdate($res['tms']);
-				$this->user_creation = $res['fk_user_creat'];
-				$this->user_modification = $res['fk_user_modif'];
+				$this->user_creation = (int) $res['fk_user_creat'];
+				$this->user_modification = (int) $res['fk_user_modif'];
 
-				// Retreive all extrafield
+				// Retrieve all extrafield
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
 
@@ -397,8 +398,7 @@ class Categorie extends CommonObject
 		if (empty($this->visible)) $this->visible = 0;
 		$this->fk_parent = ($this->fk_parent != "" ? intval($this->fk_parent) : 0);
 
-		if ($this->already_exists())
-		{
+		if ($this->already_exists()) {
 			$this->error = $langs->trans("ImpossibleAddCat", $this->label);
 			$this->error .= " : ".$langs->trans("CategoryExistsAtSameLevel");
 			dol_syslog($this->error, LOG_WARNING);
@@ -412,8 +412,7 @@ class Categorie extends CommonObject
 		$sql .= " label,";
 		$sql .= " description,";
 		$sql .= " color,";
-		if (!empty($conf->global->CATEGORY_ASSIGNED_TO_A_CUSTOMER))
-		{
+		if (!empty($conf->global->CATEGORY_ASSIGNED_TO_A_CUSTOMER)) {
 			$sql .= "fk_soc,";
 		}
 		$sql .= " visible,";
@@ -424,54 +423,47 @@ class Categorie extends CommonObject
 		$sql .= " date_creation,";
 		$sql .= " fk_user_creat";
 		$sql .= ") VALUES (";
-		$sql .= $this->db->escape($this->fk_parent).",";
-		$sql .= "'".$this->db->escape($this->label)."',";
-		$sql .= "'".$this->db->escape($this->description)."',";
-		$sql .= "'".$this->db->escape($this->color)."',";
-		if (!empty($conf->global->CATEGORY_ASSIGNED_TO_A_CUSTOMER))
-		{
-			$sql .= ($this->socid != -1 ? $this->socid : 'null').",";
+		$sql .= (int) $this->fk_parent.",";
+		$sql .= "'".$this->db->escape($this->label)."', ";
+		$sql .= "'".$this->db->escape($this->description)."', ";
+		$sql .= "'".$this->db->escape($this->color)."', ";
+		if (!empty($conf->global->CATEGORY_ASSIGNED_TO_A_CUSTOMER)) {
+			$sql .= ($this->socid > 0 ? $this->socid : 'null').", ";
 		}
-		$sql .= "'".$this->db->escape($this->visible)."',";
-		$sql .= $this->db->escape($type).",";
-		$sql .= (!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : 'null').",";
-		$sql .= (!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : 'null').",";
-		$sql .= $this->db->escape($conf->entity).",";
+		$sql .= "'".$this->db->escape($this->visible)."', ";
+		$sql .= $this->db->escape($type).", ";
+		$sql .= (!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : 'null').", ";
+		$sql .= (!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : 'null').", ";
+		$sql .= (int) $conf->entity.", ";
 		$sql .= "'".$this->db->idate($now)."', ";
 		$sql .= (int) $user->id;
 		$sql .= ")";
 
 		$res = $this->db->query($sql);
-		if ($res)
-		{
+		if ($res) {
 			$id = $this->db->last_insert_id(MAIN_DB_PREFIX."categorie");
 
-			if ($id > 0)
-			{
+			if ($id > 0) {
 				$this->id = $id;
 
 				$action = 'create';
 
 				// Actions on extra fields
-				if (!$error)
-				{
+				if (!$error) {
 					$result = $this->insertExtraFields();
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$error++;
 					}
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					// Call trigger
 					$result = $this->call_trigger('CATEGORY_CREATE', $user);
 					if ($result < 0) { $error++; }
 					// End call triggers
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					$this->db->commit();
 					return $id;
 				} else {
@@ -510,8 +502,7 @@ class Categorie extends CommonObject
 		$this->fk_parent = ($this->fk_parent != "" ? intval($this->fk_parent) : 0);
 		$this->visible = ($this->visible != "" ? intval($this->visible) : 0);
 
-		if ($this->already_exists())
-		{
+		if ($this->already_exists()) {
 			$this->error = $langs->trans("ImpossibleUpdateCat");
 			$this->error .= " : ".$langs->trans("CategoryExistsAtSameLevel");
 			return -1;
@@ -524,32 +515,27 @@ class Categorie extends CommonObject
 		$sql .= " description = '".$this->db->escape($this->description)."',";
 		$sql .= " ref_ext = '".$this->db->escape($this->ref_ext)."',";
 		$sql .= " color = '".$this->db->escape($this->color)."'";
-		if (!empty($conf->global->CATEGORY_ASSIGNED_TO_A_CUSTOMER))
-		{
-			$sql .= ", fk_soc = ".($this->socid != -1 ? $this->socid : 'null');
+		if (!empty($conf->global->CATEGORY_ASSIGNED_TO_A_CUSTOMER)) {
+			$sql .= ", fk_soc = ".($this->socid > 0 ? $this->socid : 'null');
 		}
-		$sql .= ", visible = '".$this->db->escape($this->visible)."'";
-		$sql .= ", fk_parent = ".$this->fk_parent;
+		$sql .= ", visible = ".(int) $this->visible;
+		$sql .= ", fk_parent = ".(int) $this->fk_parent;
 		$sql .= ", fk_user_modif = ".(int) $user->id;
 		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
+		if ($this->db->query($sql)) {
 			$action = 'update';
 
 			// Actions on extra fields
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				// Call trigger
 				$result = $this->call_trigger('CATEGORY_MODIFY', $user);
 				if ($result < 0) { $error++; $this->db->rollback(); return -1; }
@@ -586,8 +572,7 @@ class Categorie extends CommonObject
 
 		$this->db->begin();
 
-		if (!$error && !$notrigger)
-		{
+		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('CATEGORY_DELETE', $user);
 			if ($result < 0) $error++;
@@ -595,14 +580,12 @@ class Categorie extends CommonObject
 		}
 
 		/* FIX #1317 : Check for child category and move up 1 level*/
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."categorie";
 			$sql .= " SET fk_parent = ".$this->fk_parent;
 			$sql .= " WHERE fk_parent = ".$this->id;
 
-			if (!$this->db->query($sql))
-			{
+			if (!$this->db->query($sql)) {
 				$this->error = $this->db->lasterror();
 				$error++;
 			}
@@ -630,18 +613,15 @@ class Categorie extends CommonObject
 		}
 
 		// Removed extrafields
-		if (!$error)
-		{
+		if (!$error) {
 			$result = $this->deleteExtraFields();
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$error++;
 				dol_syslog(get_class($this)."::delete erreur ".$this->error, LOG_ERR);
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -676,29 +656,23 @@ class Categorie extends CommonObject
 		$sql .= " VALUES (".$this->id.", ".$obj->id.")";
 
 		dol_syslog(get_class($this).'::add_type', LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
-			if (!empty($conf->global->CATEGORIE_RECURSIV_ADD))
-			{
+		if ($this->db->query($sql)) {
+			if (!empty($conf->global->CATEGORIE_RECURSIV_ADD)) {
 				$sql = 'SELECT fk_parent FROM '.MAIN_DB_PREFIX.'categorie';
 				$sql .= " WHERE rowid = ".$this->id;
 
 				dol_syslog(get_class($this)."::add_type", LOG_DEBUG);
 				$resql = $this->db->query($sql);
-				if ($resql)
-				{
-					if ($this->db->num_rows($resql) > 0)
-					{
+				if ($resql) {
+					if ($this->db->num_rows($resql) > 0) {
 						$objparent = $this->db->fetch_object($resql);
 
-						if (!empty($objparent->fk_parent))
-						{
+						if (!empty($objparent->fk_parent)) {
 							$cat = new Categorie($this->db);
 							$cat->id = $objparent->fk_parent;
 							if (!$cat->containsObject($type, $obj->id)) {
 								$result = $cat->add_type($obj, $type);
-								if ($result < 0)
-								{
+								if ($result < 0) {
 									$this->error = $cat->error;
 									$error++;
 								}
@@ -710,8 +684,7 @@ class Categorie extends CommonObject
 					$this->error = $this->db->lasterror();
 				}
 
-				if ($error)
-				{
+				if ($error) {
 					$this->db->rollback();
 					return -1;
 				}
@@ -725,8 +698,7 @@ class Categorie extends CommonObject
 			if ($result < 0) { $error++; }
 			// End call triggers
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -735,8 +707,7 @@ class Categorie extends CommonObject
 			}
 		} else {
 			$this->db->rollback();
-			if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-			{
+			if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 				$this->error = $this->db->lasterrno();
 				return -3;
 			} else {
@@ -778,16 +749,14 @@ class Categorie extends CommonObject
 		$sql .= " AND fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])." = ".$obj->id;
 
 		dol_syslog(get_class($this).'::del_type', LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
+		if ($this->db->query($sql)) {
 			// Call trigger
 			$this->context = array('unlinkoff'=>$obj); // Save object we want to link category to into category instance to provide information to trigger
 			$result = $this->call_trigger('CATEGORY_UNLINK', $user);
 			if ($result < 0) { $error++; }
 			// End call triggers
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -829,8 +798,7 @@ class Categorie extends CommonObject
 		$sql .= " AND c.fk_categorie = ".$this->id;
 		$sql .= " AND c.fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])." = o.rowid";
 		// Protection for external users
-		if (($type == 'customer' || $type == 'supplier') && $user->socid > 0)
-		{
+		if (($type == 'customer' || $type == 'supplier') && $user->socid > 0) {
 			$sql .= " AND o.rowid = ".$user->socid;
 		}
 		if ($limit > 0 || $offset > 0)  $sql .= $this->db->plimit($limit + 1, $offset);
@@ -838,10 +806,8 @@ class Categorie extends CommonObject
 
 		dol_syslog(get_class($this)."::getObjectsInCateg", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($rec = $this->db->fetch_array($resql))
-			{
+		if ($resql) {
+			while ($rec = $this->db->fetch_array($resql)) {
 				if ($onlyids) {
 					$objs[] = $rec['fk_'.(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])];
 				} else {
@@ -927,20 +893,17 @@ class Categorie extends CommonObject
 
 		$offset = 0;
 		$nbtotalofrecords = '';
-		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-		{
+		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 			$result = $this->db->query($sql);
 			$nbtotalofrecords = $this->db->num_rows($result);
-			if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-			{
+			if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 				$page = 0;
 				$offset = 0;
 			}
 		}
 
 		if ($limit) {
-			if ($page < 0)
-			{
+			if ($page < 0) {
 				$page = 0;
 			}
 			$offset = $limit * $page;
@@ -949,17 +912,14 @@ class Categorie extends CommonObject
 		}
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$i = 0;
 			$num = $this->db->num_rows($result);
 			$min = min($num, ($limit <= 0 ? $num : $limit));
-			while ($i < $min)
-			{
+			while ($i < $min) {
 				$obj = $this->db->fetch_object($result);
 				$category_static = new Categorie($this->db);
-				if ($category_static->fetch($obj->rowid))
-				{
+				if ($category_static->fetch($obj->rowid)) {
 					$categories[$i]['id'] = $category_static->id;
 					$categories[$i]['fk_parent']		= $category_static->fk_parent;
 					$categories[$i]['label']			= $category_static->label;
@@ -1004,11 +964,9 @@ class Categorie extends CommonObject
 		$sql .= " AND entity IN (".getEntity('category').")";
 
 		$res = $this->db->query($sql);
-		if ($res)
-		{
+		if ($res) {
 			$cats = array();
-			while ($rec = $this->db->fetch_array($res))
-			{
+			while ($rec = $this->db->fetch_array($res)) {
 				$cat = new Categorie($this->db);
 				$cat->fetch($rec['rowid']);
 				$cats[] = $cat;
@@ -1039,10 +997,8 @@ class Categorie extends CommonObject
 
 		dol_syslog(get_class($this)."::load_motherof", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$this->motherof[$obj->id_son] = $obj->id_parent;
 			}
 			return 1;
@@ -1083,19 +1039,15 @@ class Categorie extends CommonObject
 			return -1;
 		}
 
-		if (is_string($markafterid))
-		{
+		if (is_string($markafterid)) {
 			$markafterid = explode(',', $markafterid);
-		} elseif (is_numeric($markafterid))
-		{
-			if ($markafterid > 0)
-			{
+		} elseif (is_numeric($markafterid)) {
+			if ($markafterid > 0) {
 				$markafterid = array($markafterid);
 			} else {
 				$markafterid = array();
 			}
-		} elseif (!is_array($markafterid))
-		{
+		} elseif (!is_array($markafterid)) {
 			$markafterid = array();
 		}
 
@@ -1115,11 +1067,9 @@ class Categorie extends CommonObject
 
 		dol_syslog(get_class($this)."::get_full_arbo get category list", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$i = 0;
-			while ($obj = $this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				$this->cats[$obj->rowid]['rowid'] = $obj->rowid;
 				$this->cats[$obj->rowid]['id'] = $obj->rowid;
 				$this->cats[$obj->rowid]['fk_parent'] = $obj->fk_parent;
@@ -1137,15 +1087,13 @@ class Categorie extends CommonObject
 
 		// We add the fullpath property to each elements of first level (no parent exists)
 		dol_syslog(get_class($this)."::get_full_arbo call to build_path_from_id_categ", LOG_DEBUG);
-		foreach ($this->cats as $key => $val)
-		{
+		foreach ($this->cats as $key => $val) {
 			//print 'key='.$key.'<br>'."\n";
 			$this->build_path_from_id_categ($key, 0); // Process a branch from the root category key (this category has no parent)
 		}
 
 		// Include or exclude leaf including $markafterid from tree
-		if (count($markafterid) > 0)
-		{
+		if (count($markafterid) > 0) {
 			$keyfiltercatid = '('.implode('|', $markafterid).')';
 
 			//print "Look to discard category ".$markafterid."\n";
@@ -1153,13 +1101,11 @@ class Categorie extends CommonObject
 			$keyfilter2 = '_'.$keyfiltercatid.'$';
 			$keyfilter3 = '^'.$keyfiltercatid.'_';
 			$keyfilter4 = '_'.$keyfiltercatid.'_';
-			foreach ($this->cats as $key => $val)
-			{
+			foreach ($this->cats as $key => $val) {
 				$test = (preg_match('/'.$keyfilter1.'/', $val['fullpath']) || preg_match('/'.$keyfilter2.'/', $val['fullpath'])
 					|| preg_match('/'.$keyfilter3.'/', $val['fullpath']) || preg_match('/'.$keyfilter4.'/', $val['fullpath']));
 
-				if (($test && !$include) || (!$test && $include))
-				{
+				if (($test && !$include) || (!$test && $include)) {
 					unset($this->cats[$key]);
 				}
 			}
@@ -1189,8 +1135,7 @@ class Categorie extends CommonObject
 		// phpcs:enable
 		dol_syslog(get_class($this)."::build_path_from_id_categ id_categ=".$id_categ." protection=".$protection, LOG_DEBUG);
 
-		if (!empty($this->cats[$id_categ]['fullpath']))
-		{
+		if (!empty($this->cats[$id_categ]['fullpath'])) {
 			// Already defined
 			dol_syslog(get_class($this)."::build_path_from_id_categ fullpath and fulllabel already defined", LOG_WARNING);
 			return;
@@ -1204,8 +1149,7 @@ class Categorie extends CommonObject
 		$this->cats[$id_categ]['fulllabel'] = $this->cats[$id_categ]['label'];
 		$i = 0; $cursor_categ = $id_categ;
 		//print 'Work for id_categ='.$id_categ.'<br>'."\n";
-		while ((empty($protection) || $i < $protection) && !empty($this->motherof[$cursor_categ]))
-		{
+		while ((empty($protection) || $i < $protection) && !empty($this->motherof[$cursor_categ])) {
 			//print '&nbsp; cursor_categ='.$cursor_categ.' i='.$i.' '.$this->motherof[$cursor_categ].'<br>'."\n";
 			$this->cats[$id_categ]['fullpath'] = '_'.$this->motherof[$cursor_categ].$this->cats[$id_categ]['fullpath'];
 			$this->cats[$id_categ]['fulllabel'] = $this->cats[$this->motherof[$cursor_categ]]['label'].' >> '.$this->cats[$id_categ]['fulllabel'];
@@ -1231,8 +1175,7 @@ class Categorie extends CommonObject
 	{
 		// phpcs:enable
 		// Display $this->cats
-		foreach ($this->cats as $key => $val)
-		{
+		foreach ($this->cats as $key => $val) {
 			print 'id: '.$this->cats[$key]['id'];
 			print ' label: '.$this->cats[$key]['label'];
 			print ' mother: '.$this->cats[$key]['fk_parent'];
@@ -1260,16 +1203,14 @@ class Categorie extends CommonObject
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."categorie";
 		$sql .= " WHERE entity IN (".getEntity('category').")";
 		if (!is_null($type))
-			$sql .= " AND type = ".$type;
+			$sql .= " AND type = ".(int) $type;
 		if ($parent)
 			$sql .= " AND fk_parent = 0";
 
 		$res = $this->db->query($sql);
-		if ($res)
-		{
+		if ($res) {
 			$cats = array();
-			while ($rec = $this->db->fetch_array($res))
-			{
+			while ($rec = $this->db->fetch_array($res)) {
 				$cat = new Categorie($this->db);
 				$cat->fetch($rec['rowid']);
 				$cats[$rec['rowid']] = $cat;
@@ -1319,18 +1260,15 @@ class Categorie extends CommonObject
 
 		dol_syslog(get_class($this)."::already_exists", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql) > 0)						// Checking for empty resql
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql) > 0) {						// Checking for empty resql
 				$obj = $this->db->fetch_array($resql);
 				/* If object called create, obj cannot have is id.
 				 * If object called update, he mustn't have the same label as an other category for this mother.
 				 * So if the result have the same id, update is not for label, and if result have an other one,
 				 * update may be for label.
 				 */
-				if ($obj[0] > 0 && $obj[0] != $this->id)
-				{
+				if ($obj[0] > 0 && $obj[0] != $this->id) {
 					dol_syslog(get_class($this)."::already_exists category with name=".$this->label." and parent ".$this->fk_parent." exists: rowid=".$obj[0]." current_id=".$this->id, LOG_DEBUG);
 					return 1;
 				}
@@ -1361,24 +1299,19 @@ class Categorie extends CommonObject
 		$ways = array();
 
 		$allways = $this->get_all_ways(); // Load array of categories
-		foreach ($allways as $way)
-		{
+		foreach ($allways as $way) {
 			$w = array();
 			$i = 0;
 			$forced_color = '';
-			foreach ($way as $cat)
-			{
+			foreach ($way as $cat) {
 				$i++;
 
-				if (empty($nocolor))
-				{
+				if (empty($nocolor)) {
 					$forced_color = 'toreplace';
-					if ($i == count($way))
-					{
+					if ($i == count($way)) {
 						// Check contrast with background and correct text color
 						$forced_color = 'categtextwhite';
-						if ($cat->color)
-						{
+						if ($cat->color) {
 							if (colorIsLight($cat->color)) $forced_color = 'categtextblack';
 						}
 					}
@@ -1421,12 +1354,9 @@ class Categorie extends CommonObject
 
 		$res = $this->db->query($sql);
 
-		if ($res)
-		{
-			while ($rec = $this->db->fetch_array($res))
-			{
-				if ($rec['fk_parent'] > 0)
-				{
+		if ($res) {
+			while ($rec = $this->db->fetch_array($res)) {
+				if ($rec['fk_parent'] > 0) {
 					$cat = new Categorie($this->db);
 					$cat->fetch($rec['fk_parent']);
 					$parents[] = $cat;
@@ -1452,13 +1382,10 @@ class Categorie extends CommonObject
 		$ways = array();
 
 		$parents = $this->get_meres();
-		if (!empty($parents))
-		{
-			foreach ($parents as $parent)
-			{
+		if (!empty($parents)) {
+			foreach ($parents as $parent) {
 				$allways = $parent->get_all_ways();
-				foreach ($allways as $way)
-				{
+				foreach ($allways as $way) {
 					$w = $way;
 					$w[] = $this;
 					$ways[] = $w;
@@ -1488,19 +1415,17 @@ class Categorie extends CommonObject
 
 		if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type];
 
-		if ($type === Categorie::TYPE_BANK_LINE)   // TODO Remove this with standard category code
-		{
-			// Load bank groups
+		if ($type === Categorie::TYPE_BANK_LINE) {   // TODO Remove this with standard category code after migration of llx_bank_categ into llx_categorie
+			// Load bank categories
 			$sql = "SELECT c.label, c.rowid";
 			$sql .= " FROM ".MAIN_DB_PREFIX."bank_class as a, ".MAIN_DB_PREFIX."bank_categ as c";
 			$sql .= " WHERE a.lineid=".$id." AND a.fk_categ = c.rowid";
+			$sql .= " AND c.entity IN (".getEntity('category').")";
 			$sql .= " ORDER BY c.label";
 
 			$res = $this->db->query($sql);
-			if ($res)
-			{
-				while ($obj = $this->db->fetch_object($res))
-				{
+			if ($res) {
+				while ($obj = $this->db->fetch_object($res)) {
 					if ($mode == 'id') {
 						$cats[] = $obj->rowid;
 					} elseif ($mode == 'label') {
@@ -1523,10 +1448,8 @@ class Categorie extends CommonObject
 			$sql .= " AND c.entity IN (".getEntity('category').")";
 
 			$res = $this->db->query($sql);
-			if ($res)
-			{
-				while ($obj = $this->db->fetch_object($res))
-				{
+			if ($res) {
+				while ($obj = $this->db->fetch_object($res)) {
 					if ($mode == 'id') {
 						$cats[] = $obj->rowid;
 					} elseif ($mode == 'label') {
@@ -1579,24 +1502,20 @@ class Categorie extends CommonObject
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."categorie";
 		$sql .= " WHERE type = ".$this->MAP_ID[$type];
 		$sql .= " AND entity IN (".getEntity('category').")";
-		if ($nom)
-		{
+		if ($nom) {
 			if (!$exact)
 				$nom = '%'.str_replace('*', '%', $nom).'%';
 			if (!$case)
 				$sql .= " AND label LIKE '".$this->db->escape($nom)."'";
 			else $sql .= " AND label LIKE BINARY '".$this->db->escape($nom)."'";
 		}
-		if ($id)
-		{
+		if ($id) {
 			$sql .= " AND rowid = '".$id."'";
 		}
 
 		$res = $this->db->query($sql);
-		if ($res)
-		{
-			while ($rec = $this->db->fetch_array($res))
-			{
+		if ($res) {
+			while ($rec = $this->db->fetch_array($res)) {
 				$cat = new Categorie($this->db);
 				$cat->fetch($rec['rowid']);
 				$cats[] = $cat;
@@ -1628,12 +1547,11 @@ class Categorie extends CommonObject
 
 		// Check contrast with background and correct text color
 		$forced_color = 'categtextwhite';
-		if ($this->color)
-		{
+		if ($this->color) {
 			if (colorIsLight($this->color)) $forced_color = 'categtextblack';
 		}
 
-		$link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$this->id.'&type='.$this->type.$moreparam.'&backtopage='.urlencode($_SERVER['PHP_SELF'].($moreparam?'?'.$moreparam:'')).'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip '.$forced_color.'">';
+		$link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$this->id.'&type='.$this->type.$moreparam.'&backtopage='.urlencode($_SERVER['PHP_SELF'].($moreparam ? '?'.$moreparam : '')).'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip '.$forced_color.'">';
 		$linkend = '</a>';
 
 		$picto = 'category';
@@ -1662,14 +1580,12 @@ class Categorie extends CommonObject
 		$dir = $sdir.'/'.get_exdir($this->id, 2, 0, 0, $this, 'category').$this->id."/";
 		$dir .= "photos/";
 
-		if (!file_exists($dir))
-		{
+		if (!file_exists($dir)) {
 			dol_mkdir($dir);
 		}
 
 		if (file_exists($dir)) {
-			if (is_array($file['name']) && count($file['name']) > 0)
-			{
+			if (is_array($file['name']) && count($file['name']) > 0) {
 				$nbfile = count($file['name']);
 				for ($i = 0; $i <= $nbfile; $i++) {
 					$originImage = $dir.$file['name'][$i];
@@ -1714,22 +1630,17 @@ class Categorie extends CommonObject
 
 		$dirthumb = $dir.'thumbs/';
 
-		if (file_exists($dir))
-		{
+		if (file_exists($dir)) {
 			$handle = opendir($dir);
-			if (is_resource($handle))
-			{
-				while (($file = readdir($handle)) !== false)
-				{
-					if (dol_is_file($dir.$file) && preg_match('/(\.jpeg|\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i', $dir.$file))
-					{
+			if (is_resource($handle)) {
+				while (($file = readdir($handle)) !== false) {
+					if (dol_is_file($dir.$file) && preg_match('/(\.jpeg|\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i', $dir.$file)) {
 						$nbphoto++;
 						$photo = $file;
 
 						// On determine nom du fichier vignette
 						$photo_vignette = '';
-						if (preg_match('/(\.jpeg|\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i', $photo, $regs))
-						{
+						if (preg_match('/(\.jpeg|\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i', $photo, $regs)) {
 							$photo_vignette = preg_replace('/'.$regs[0].'/i', '', $photo).'_small'.$regs[0];
 						}
 
@@ -1773,11 +1684,9 @@ class Categorie extends CommonObject
 		dol_delete_file($file, 1);
 
 		// Si elle existe, on efface la vignette
-		if (preg_match('/(\.jpeg|\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i', $filename, $regs))
-		{
+		if (preg_match('/(\.jpeg|\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i', $filename, $regs)) {
 			$photo_vignette = preg_replace('/'.$regs[0].'/i', '', $filename).'_small'.$regs[0];
-			if (file_exists($dirthumb.$photo_vignette))
-			{
+			if (file_exists($dirthumb.$photo_vignette)) {
 				dol_delete_file($dirthumb.$photo_vignette, 1);
 			}
 		}
@@ -1812,8 +1721,7 @@ class Categorie extends CommonObject
 		$langs_available = $langs->get_available_languages();
 		$current_lang = $langs->getDefaultLang();
 
-		foreach ($langs_available as $key => $value)
-		{
+		foreach ($langs_available as $key => $value) {
 			$sql = "SELECT rowid";
 			$sql .= " FROM ".MAIN_DB_PREFIX."categorie_lang";
 			$sql .= " WHERE fk_category=".$this->id;
@@ -1821,10 +1729,8 @@ class Categorie extends CommonObject
 
 			$result = $this->db->query($sql);
 
-			if ($key == $current_lang)
-			{
-				if ($this->db->num_rows($result)) // si aucune ligne dans la base
-				{
+			if ($key == $current_lang) {
+				if ($this->db->num_rows($result)) { // si aucune ligne dans la base
 					$sql2 = "UPDATE ".MAIN_DB_PREFIX."categorie_lang";
 					$sql2 .= " SET label='".$this->db->escape($this->label)."',";
 					$sql2 .= " description='".$this->db->escape($this->description)."'";
@@ -1835,15 +1741,12 @@ class Categorie extends CommonObject
 					$sql2 .= "','".$this->db->escape($this->multilangs["$key"]["description"])."')";
 				}
 				dol_syslog(get_class($this).'::setMultiLangs', LOG_DEBUG);
-				if (!$this->db->query($sql2))
-				{
+				if (!$this->db->query($sql2)) {
 					$this->error = $this->db->lasterror();
 					return -1;
 				}
-			} elseif (isset($this->multilangs["$key"]))
-			{
-				if ($this->db->num_rows($result)) // si aucune ligne dans la base
-				{
+			} elseif (isset($this->multilangs["$key"])) {
+				if ($this->db->num_rows($result)) { // si aucune ligne dans la base
 					$sql2 = "UPDATE ".MAIN_DB_PREFIX."categorie_lang";
 					$sql2 .= " SET label='".$this->db->escape($this->multilangs["$key"]["label"])."',";
 					$sql2 .= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
@@ -1857,8 +1760,7 @@ class Categorie extends CommonObject
 				// on ne sauvegarde pas des champs vides
 				if ($this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"] || $this->multilangs["$key"]["note"])
 					dol_syslog(get_class($this).'::setMultiLangs', LOG_DEBUG);
-				if (!$this->db->query($sql2))
-				{
+				if (!$this->db->query($sql2)) {
 					$this->error = $this->db->lasterror();
 					return -1;
 				}
@@ -1892,13 +1794,10 @@ class Categorie extends CommonObject
 		$sql .= " WHERE fk_category=".$this->id;
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			while ($obj = $this->db->fetch_object($result))
-			{
+		if ($result) {
+			while ($obj = $this->db->fetch_object($result)) {
 				//print 'lang='.$obj->lang.' current='.$current_lang.'<br>';
-				if ($obj->lang == $current_lang) // si on a les traduct. dans la langue courante on les charge en infos principales.
-				{
+				if ($obj->lang == $current_lang) { // si on a les traduct. dans la langue courante on les charge en infos principales.
 					$this->label = $obj->label;
 					$this->description = $obj->description;
 				}
@@ -1988,26 +1887,20 @@ class Categorie extends CommonObject
 	{
 		if ($type == 'bank_account') $type = 'account';
 
-		if (empty($searchList) && !is_array($searchList))
-		{
+		if (empty($searchList) && !is_array($searchList)) {
 			return "";
 		}
 
-		foreach ($searchList as $searchCategory)
-		{
-			if (intval($searchCategory) == -2)
-			{
+		$searchCategorySqlList = array();
+		foreach ($searchList as $searchCategory) {
+			if (intval($searchCategory) == -2) {
 				$searchCategorySqlList[] = " cp.fk_categorie IS NULL";
-			} elseif (intval($searchCategory) > 0)
-			{
-				$searchCategorySqlList[] = " ".$rowIdName
-										." IN (SELECT fk_".$type." FROM ".MAIN_DB_PREFIX."categorie_".$type
-										." WHERE fk_categorie = ".$searchCategory.")";
+			} elseif (intval($searchCategory) > 0) {
+				$searchCategorySqlList[] = " ".$rowIdName." IN (SELECT fk_".$type." FROM ".MAIN_DB_PREFIX."categorie_".$type." WHERE fk_categorie = ".((int) $searchCategory).")";
 			}
 		}
 
-		if (!empty($searchCategorySqlList))
-		{
+		if (!empty($searchCategorySqlList)) {
 			return " AND (".implode(' AND ', $searchCategorySqlList).")";
 		} else {
 			return "";
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index 53a343046b7..f4b7e12cc30 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2006-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2007      Patrick Raguin	  	<patrick.raguin@gmail.com>
+ * Copyright (C) 2020      Frédéric 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
@@ -33,21 +34,20 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 $langs->load("categories");
 
 $id = GETPOST('id', 'int');
-$ref = GETPOST('ref');
-$type = GETPOST('type');
+$ref = GETPOST('ref', 'alphanohtml');
+$type = GETPOST('type', 'aZ09');		// Can be int or string
 $action = (GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'edit');
 $confirm = GETPOST('confirm');
 $cancel = GETPOST('cancel', 'alpha');
 
-$socid = GETPOST('socid', 'int');
-$label = GETPOST('label');
-$description = GETPOST('description');
-$color = GETPOST('color', 'alpha');
-$visible = GETPOST('visible');
-$parent = GETPOST('parent');
+$socid = (int) GETPOST('socid', 'int');
+$label = (string) GETPOST('label', 'alphanohtml');
+$description = (string) GETPOST('description', 'restricthtml');
+$color = preg_replace('/[^0-9a-f#]/i', '', (string) GETPOST('color', 'alphanohtml'));
+$visible = (int) GETPOST('visible', 'int');
+$parent = (int) GETPOST('parent', 'int');
 
-if ($id == "")
-{
+if ($id == "") {
 	dol_print_error('', 'Missing parameter id');
 	exit();
 }
@@ -56,9 +56,8 @@ if ($id == "")
 $result = restrictedArea($user, 'categorie', $id, '&category');
 
 $object = new Categorie($db);
-if ($id > 0)
-{
-    $result = $object->fetch($id);
+if ($id > 0) {
+	$result = $object->fetch($id);
 }
 
 $extrafields = new ExtraFields($db);
@@ -67,45 +66,39 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('categorycard'));
 
+$error = 0;
+
 
 /*
  * Actions
  */
 
-if ($cancel)
-{
-    header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type);
-    exit;
+if ($cancel) {
+	header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type);
+	exit;
 }
 
 // Action mise a jour d'une categorie
-if ($action == 'update' && $user->rights->categorie->creer)
-{
-    $object->oldcopy = dol_clone($object);
+if ($action == 'update' && $user->rights->categorie->creer) {
+	$object->oldcopy = dol_clone($object);
 	$object->label          = $label;
 	$object->description    = dol_htmlcleanlastbr($description);
 	$object->color          = $color;
-	$object->socid          = ($socid ? $socid : 'null');
+	$object->socid          = ($socid > 0 ? $socid : 0);
 	$object->visible        = $visible;
-
-	if ($parent != "-1")
-		$object->fk_parent = $parent;
-	else $object->fk_parent = "";
+	$object->fk_parent = $parent != -1 ? $parent : 0;
 
 
-	if (empty($object->label))
-	{
-	    $error++;
+	if (empty($object->label)) {
+		$error++;
 		$action = 'edit';
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
 	}
-	if (!$error && empty($object->error))
-	{
+	if (!$error && empty($object->error)) {
 		$ret = $extrafields->setOptionalsFromPost(null, $object);
 		if ($ret < 0) $error++;
 
-		if (!$error && $object->update($user) > 0)
-		{
+		if (!$error && $object->update($user) > 0) {
 			header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type);
 			exit;
 		} else {
@@ -139,7 +132,7 @@ print '<input type="hidden" name="action" value="update">';
 print '<input type="hidden" name="id" value="'.$object->id.'">';
 print '<input type="hidden" name="type" value="'.$type.'">';
 
-dol_fiche_head('');
+print dol_get_fiche_head('');
 
 print '<table class="border centpercent">';
 
@@ -152,7 +145,7 @@ print '</tr>';
 // Description
 print '<tr>';
 print '<td>'.$langs->trans("Description").'</td>';
-print '<td >';
+print '<td>';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 $doleditor = new DolEditor('description', $object->description, '', 200, 'dolibarr_notes', '', false, true, $conf->fckeditor->enabled, ROWS_6, '90%');
 $doleditor->Create();
@@ -161,7 +154,7 @@ print '</td></tr>';
 // Color
 print '<tr>';
 print '<td>'.$langs->trans("Color").'</td>';
-print '<td >';
+print '<td>';
 print $formother->selectColor($object->color, 'color');
 print '</td></tr>';
 
@@ -173,18 +166,17 @@ print '</td></tr>';
 $parameters = array();
 $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	print $object->showOptionals($extrafields, 'edit', $parameters);
 }
 
 print '</table>';
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
-print '<div class="center"><input type="submit" class="button" name"submit" value="'.$langs->trans("Modify").'"> &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
+print '<div class="center"><input type="submit" class="button" name"submit" value="'.$langs->trans("Modify").'"> &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
 
 print '</form>';
 
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index 35420759ded..5adc7bbb17b 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -109,6 +109,8 @@ if (empty($nosearch)) {
 
 		foreach ($cats as $cat)
 		{
+			$color = $categstatic->color ? ' style="background: #'.$categstatic->color.';"' : ' style="background: #bbb"';
+
 			print "\t".'<tr class="oddeven">'."\n";
 			print "\t\t<td>";
 			$categstatic->id = $cat->id;
@@ -116,7 +118,7 @@ if (empty($nosearch)) {
 			$categstatic->label = $cat->label;
 			$categstatic->type = $cat->type;
 			$categstatic->color = $cat->color;
-			print '<span class="noborderoncategories" '.($categstatic->color ? ' style="background: #'.$categstatic->color.';"' : ' style="background: #aaa"').'>';
+			print '<span class="noborderoncategories"'.$color.'>';
 			print $categstatic->getNomUrl(1, '');
 			print '</span>';
 			print "</td>\n";
@@ -170,10 +172,12 @@ foreach ($fulltree as $key => $val)
 		$counter = "<td class='left' width='40px;'>".(is_countable($elements) ? count($elements) : '0')."</td>";
 	}
 
+	$color = $categstatic->color ? ' style="background: #'.sprintf("%06s", $categstatic->color).';"' : ' style="background: #bbb"';
+
 	$data[] = array(
 	'rowid'=>$val['rowid'],
 	'fk_menu'=>$val['fk_parent'],
-	'entry'=>'<table class="nobordernopadding centpercent"><tr><td><span class="noborderoncategories" '.($categstatic->color ? ' style="background: #'.$categstatic->color.';"' : ' style="background: #aaa"').'>'.$li.'</span></td>'.$counter.
+	'entry'=>'<table class="nobordernopadding centpercent"><tr><td><span class="noborderoncategories"'.$color.'>'.$li.'</span></td>'.$counter.
 		'<td class="right" width="20px;"><a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$val['id'].'&type='.$type.$moreparam.'&backtolist='.urlencode($_SERVER["PHP_SELF"].'?type='.$type.$moreparam).'">'.img_view().'</a></td></tr></table>'
 	);
 }
diff --git a/htdocs/categories/info.php b/htdocs/categories/info.php
index bef54f9dd6b..f64f3be8f9e 100644
--- a/htdocs/categories/info.php
+++ b/htdocs/categories/info.php
@@ -44,8 +44,8 @@ $result = restrictedArea($user, 'categorie', $id, '&category');
 
 $object = new Categorie($db);
 if (!$object->fetch($id) > 0) {
-    dol_print_error($db);
-    exit;
+	dol_print_error($db);
+	exit;
 }
 $type = $object->type;
 if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
@@ -64,7 +64,7 @@ $title = Categorie::$MAP_TYPE_TITLE_AREA[$type];
 
 $head = categories_prepare_head($object, $type);
 
-dol_fiche_head($head, 'info', $langs->trans($title), -1, 'category');
+print dol_get_fiche_head($head, 'info', $langs->trans($title), -1, 'category');
 $backtolist = (GETPOST('backtolist') ? GETPOST('backtolist') : DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type);
 $linkback = '<a href="'.$backtolist.'">'.$langs->trans("BackToList").'</a>';
 $object->next_prev_filter = ' type = '.$type;
@@ -72,7 +72,7 @@ $object->ref = $object->label;
 $morehtmlref = '<br><div class="refidno"><a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type.'">'.$langs->trans("Root").'</a> >> ';
 $ways = $object->print_all_ways(" &gt;&gt; ", '', 1);
 foreach ($ways as $way) {
-    $morehtmlref .= $way."<br>\n";
+	$morehtmlref .= $way."<br>\n";
 }
 $morehtmlref .= '</div>';
 
@@ -95,7 +95,7 @@ print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php
index dc0a980a6f8..73c7664f6c2 100644
--- a/htdocs/categories/photos.php
+++ b/htdocs/categories/photos.php
@@ -44,8 +44,8 @@ $confirm = GETPOST('confirm');
 
 if ($id == '' && $label == '')
 {
-    dol_print_error('', 'Missing parameter id');
-    exit();
+	dol_print_error('', 'Missing parameter id');
+	exit();
 }
 
 // Security check
@@ -70,34 +70,34 @@ if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backwar
 
 if (isset($_FILES['userfile']) && $_FILES['userfile']['size'] > 0 && $_POST["sendit"] && !empty($conf->global->MAIN_UPLOAD_DOC))
 {
-    if ($object->id) {
-        $file = $_FILES['userfile'];
-        if (is_array($file['name']) && count($file['name']) > 0)
-        {
-            foreach ($file['name'] as $i => $name)
-            {
-                if (empty($file['tmp_name'][$i]) || intval($conf->global->MAIN_UPLOAD_DOC) * 1000 <= filesize($file['tmp_name'][$i]))
-                {
-                    setEventMessage($file['name'][$i].' : '.$langs->trans(empty($file['tmp_name'][$i]) ? 'ErrorFailedToSaveFile' : 'MaxSizeForUploadedFiles'));
-                    unset($file['name'][$i], $file['type'][$i], $file['tmp_name'][$i], $file['error'][$i], $file['size'][$i]);
-                }
-            }
-        }
+	if ($object->id) {
+		$file = $_FILES['userfile'];
+		if (is_array($file['name']) && count($file['name']) > 0)
+		{
+			foreach ($file['name'] as $i => $name)
+			{
+				if (empty($file['tmp_name'][$i]) || intval($conf->global->MAIN_UPLOAD_DOC) * 1000 <= filesize($file['tmp_name'][$i]))
+				{
+					setEventMessage($file['name'][$i].' : '.$langs->trans(empty($file['tmp_name'][$i]) ? 'ErrorFailedToSaveFile' : 'MaxSizeForUploadedFiles'));
+					unset($file['name'][$i], $file['type'][$i], $file['tmp_name'][$i], $file['error'][$i], $file['size'][$i]);
+				}
+			}
+		}
 
-        if (!empty($file['tmp_name'])) {
-            $object->add_photo($upload_dir, $file);
-        }
-    }
+		if (!empty($file['tmp_name'])) {
+			$object->add_photo($upload_dir, $file);
+		}
+	}
 }
 
 if ($action == 'confirm_delete' && $_GET["file"] && $confirm == 'yes' && $user->rights->categorie->creer)
 {
-    $object->delete_photo($upload_dir."/".$_GET["file"]);
+	$object->delete_photo($upload_dir."/".$_GET["file"]);
 }
 
 if ($action == 'addthumb' && $_GET["file"])
 {
-    $object->addThumbs($upload_dir."/".$_GET["file"]);
+	$object->addThumbs($upload_dir."/".$_GET["file"]);
 }
 
 
@@ -117,7 +117,7 @@ if ($object->id)
 	$head = categories_prepare_head($object, $type);
 
 
-	dol_fiche_head($head, 'photos', $langs->trans($title), -1, 'category');
+	print dol_get_fiche_head($head, 'photos', $langs->trans($title), -1, 'category');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type.'">'.$langs->trans("BackToList").'</a>';
 	$object->next_prev_filter = ' type = '.$object->type;
@@ -126,7 +126,7 @@ if ($object->id)
 	$ways = $object->print_all_ways(" &gt;&gt; ", '', 1);
 	foreach ($ways as $way)
 	{
-	    $morehtmlref .= $way."<br>\n";
+		$morehtmlref .= $way."<br>\n";
 	}
 	$morehtmlref .= '</div>';
 
@@ -137,7 +137,7 @@ if ($object->id)
 	*/
 	if ($action == 'delete')
 	{
-	    print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&type='.$type.'&file='.$_GET["file"], $langs->trans('DeletePicture'), $langs->trans('ConfirmDeletePicture'), 'confirm_delete', '', 0, 1);
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&type='.$type.'&file='.$_GET["file"], $langs->trans('DeletePicture'), $langs->trans('ConfirmDeletePicture'), 'confirm_delete', '', 0, 1);
 	}
 
 	print '<br>';
@@ -159,9 +159,9 @@ if ($object->id)
 	print '</td></tr>';
 
 	print "</table>\n";
-    print '</div>';
+	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 
@@ -213,62 +213,62 @@ if ($object->id)
 
 		if (is_array($listofphoto) && count($listofphoto))
 		{
-    		print '<br>';
-            print '<table width="100%" valign="top" align="center">';
+			print '<br>';
+			print '<table width="100%" valign="top" align="center">';
 
-    		foreach ($listofphoto as $key => $obj)
-    		{
-    			$nbphoto++;
+			foreach ($listofphoto as $key => $obj)
+			{
+				$nbphoto++;
 
-    			if ($nbbyrow && ($nbphoto % $nbbyrow == 1)) print '<tr align=center valign=middle border=1>';
-    			if ($nbbyrow) print '<td width="'.ceil(100 / $nbbyrow).'%" class="photo">';
+				if ($nbbyrow && ($nbphoto % $nbbyrow == 1)) print '<tr align=center valign=middle border=1>';
+				if ($nbbyrow) print '<td width="'.ceil(100 / $nbbyrow).'%" class="photo">';
 
-    			print '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart=category&entity='.$object->entity.'&file='.urlencode($pdir.$obj['photo']).'" alt="Taille origine" target="_blank">';
+				print '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart=category&entity='.$object->entity.'&file='.urlencode($pdir.$obj['photo']).'" alt="Taille origine" target="_blank">';
 
-    			// Si fichier vignette disponible, on l'utilise, sinon on utilise photo origine
-    			if ($obj['photo_vignette'])
-    			{
-    				$filename = $obj['photo_vignette'];
-    			} else {
-    				$filename = $obj['photo'];
-    			}
+				// Si fichier vignette disponible, on l'utilise, sinon on utilise photo origine
+				if ($obj['photo_vignette'])
+				{
+					$filename = $obj['photo_vignette'];
+				} else {
+					$filename = $obj['photo'];
+				}
 
-    			// Nom affiche
-    			$viewfilename = $obj['photo'];
+				// Nom affiche
+				$viewfilename = $obj['photo'];
 
-    			// Taille de l'image
-    			$object->get_image_size($dir.$filename);
-    			$imgWidth = ($object->imgWidth < $maxWidth) ? $object->imgWidth : $maxWidth;
-    			$imgHeight = ($object->imgHeight < $maxHeight) ? $object->imgHeight : $maxHeight;
+				// Taille de l'image
+				$object->get_image_size($dir.$filename);
+				$imgWidth = ($object->imgWidth < $maxWidth) ? $object->imgWidth : $maxWidth;
+				$imgHeight = ($object->imgHeight < $maxHeight) ? $object->imgHeight : $maxHeight;
 
-    			print '<img border="0" width="'.$imgWidth.'" height="'.$imgHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=category&entity='.$object->entity.'&file='.urlencode($pdir.$filename).'">';
+				print '<img border="0" width="'.$imgWidth.'" height="'.$imgHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=category&entity='.$object->entity.'&file='.urlencode($pdir.$filename).'">';
 
-    			print '</a>';
-    			print '<br>'.$viewfilename;
-    			print '<br>';
+				print '</a>';
+				print '<br>'.$viewfilename;
+				print '<br>';
 
-    			// On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites
-    			if (!$obj['photo_vignette'] && preg_match('/(\.bmp|\.gif|\.jpg|\.jpeg|\.png)$/i', $obj['photo']) && ($object->imgWidth > $maxWidth || $object->imgHeight > $maxHeight))
-    			{
-    				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addthumb&amp;type='.$type.'&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'), 'refresh').'&nbsp;&nbsp;</a>';
-    			}
-    			if ($user->rights->categorie->creer)
-    			{
-    				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'&amp;type='.$type.'&amp;file='.urlencode($pdir.$viewfilename).'">';
-    				print img_delete().'</a>';
-    			}
-    			if ($nbbyrow) print '</td>';
-    			if ($nbbyrow && ($nbphoto % $nbbyrow == 0)) print '</tr>';
-    		}
+				// On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites
+				if (!$obj['photo_vignette'] && preg_match('/(\.bmp|\.gif|\.jpg|\.jpeg|\.png)$/i', $obj['photo']) && ($object->imgWidth > $maxWidth || $object->imgHeight > $maxHeight))
+				{
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addthumb&amp;type='.$type.'&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'), 'refresh').'&nbsp;&nbsp;</a>';
+				}
+				if ($user->rights->categorie->creer)
+				{
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'&amp;type='.$type.'&amp;file='.urlencode($pdir.$viewfilename).'">';
+					print img_delete().'</a>';
+				}
+				if ($nbbyrow) print '</td>';
+				if ($nbbyrow && ($nbphoto % $nbbyrow == 0)) print '</tr>';
+			}
 
-    		// Ferme tableau
-    		while ($nbphoto % $nbbyrow)
-    		{
-    			print '<td width="'.ceil(100 / $nbbyrow).'%">&nbsp;</td>';
-    			$nbphoto++;
-    		}
+			// Ferme tableau
+			while ($nbphoto % $nbbyrow)
+			{
+				print '<td width="'.ceil(100 / $nbbyrow).'%">&nbsp;</td>';
+				$nbphoto++;
+			}
 
-    		print '</table>';
+			print '</table>';
 		}
 
 		if ($nbphoto < 1)
@@ -277,7 +277,7 @@ if ($object->id)
 		}
 	}
 } else {
-    print $langs->trans("ErrorUnknown");
+	print $langs->trans("ErrorUnknown");
 }
 
 // End of page
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index f5755a697ca..423819c49ac 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -83,43 +83,43 @@ $cancel != $langs->trans("Cancel") &&
 	$current_lang = $langs->getDefaultLang();
 
 	// check parameters
-    $forcelangprod = GETPOST('forcelangprod', 'alpha');
-    $libelle = GETPOST('libelle', 'alpha');
-    $desc = GETPOST('desc', 'restricthtml');
+	$forcelangprod = GETPOST('forcelangprod', 'alpha');
+	$libelle = GETPOST('libelle', 'alpha');
+	$desc = GETPOST('desc', 'restricthtml');
 
-    if (empty($forcelangprod)) {
-        $error++;
-        $object->errors[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Translation'));
-    }
+	if (empty($forcelangprod)) {
+		$error++;
+		$object->errors[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Translation'));
+	}
 
-    if (!$error) {
-        if (empty($libelle)) {
-            $error++;
-            $object->errors[] = $langs->trans('Language_'.$forcelangprod).' : '.$langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Label'));
-        }
+	if (!$error) {
+		if (empty($libelle)) {
+			$error++;
+			$object->errors[] = $langs->trans('Language_'.$forcelangprod).' : '.$langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Label'));
+		}
 
-        if (!$error) {
-            // update de l'objet
-            if ($forcelangprod == $current_lang) {
-                $object->label = $libelle;
-                $object->description = dol_htmlcleanlastbr($desc);
-            } else {
-                $object->multilangs[$forcelangprod]["label"] = $libelle;
-                $object->multilangs[$forcelangprod]["description"] = dol_htmlcleanlastbr($desc);
-            }
+		if (!$error) {
+			// update de l'objet
+			if ($forcelangprod == $current_lang) {
+				$object->label = $libelle;
+				$object->description = dol_htmlcleanlastbr($desc);
+			} else {
+				$object->multilangs[$forcelangprod]["label"] = $libelle;
+				$object->multilangs[$forcelangprod]["description"] = dol_htmlcleanlastbr($desc);
+			}
 
-            // sauvegarde en base
-            $res = $object->setMultiLangs($user);
-            if ($res < 0) $error++;
-        }
-    }
+			// sauvegarde en base
+			$res = $object->setMultiLangs($user);
+			if ($res < 0) $error++;
+		}
+	}
 
-    if ($error) {
-        $action = 'add';
-        setEventMessages($object->error, $object->errors, 'errors');
-    } else {
-        $action = '';
-    }
+	if ($error) {
+		$action = 'add';
+		setEventMessages($object->error, $object->errors, 'errors');
+	} else {
+		$action = '';
+	}
 }
 
 // Validation de l'edition
@@ -132,13 +132,13 @@ $cancel != $langs->trans("Cancel") &&
 
 	foreach ($object->multilangs as $key => $value) // enregistrement des nouvelles valeurs dans l'objet
 	{
-        $libelle = GETPOST('libelle-'.$key, 'alpha');
-        $desc = GETPOST('desc-'.$key);
+		$libelle = GETPOST('libelle-'.$key, 'alpha');
+		$desc = GETPOST('desc-'.$key);
 
-        if (empty($libelle)) {
-            $error++;
-            $object->errors[] = $langs->trans('Language_'.$key).' : '.$langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Label'));
-        }
+		if (empty($libelle)) {
+			$error++;
+			$object->errors[] = $langs->trans('Language_'.$key).' : '.$langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Label'));
+		}
 
 		if ($key == $current_lang) {
 			$object->label       = $libelle;
@@ -149,17 +149,17 @@ $cancel != $langs->trans("Cancel") &&
 		}
 	}
 
-    if (!$error) {
-        $res = $object->setMultiLangs($user);
-        if ($res < 0)   $error++;
-    }
+	if (!$error) {
+		$res = $object->setMultiLangs($user);
+		if ($res < 0)   $error++;
+	}
 
-    if ($error) {
-        $action = 'edit';
-        setEventMessages($object->error, $object->errors, 'errors');
-    } else {
-        $action = '';
-    }
+	if ($error) {
+		$action = 'edit';
+		setEventMessages($object->error, $object->errors, 'errors');
+	} else {
+		$action = '';
+	}
 }
 
 
@@ -181,13 +181,13 @@ $head = categories_prepare_head($object, $type);
 $cnt_trans = 0;
 if (!empty($object->multilangs))
 {
-    foreach ($object->multilangs as $key => $value)
-    {
-        $cnt_trans++;
-    }
+	foreach ($object->multilangs as $key => $value)
+	{
+		$cnt_trans++;
+	}
 }
 
-dol_fiche_head($head, 'translation', $langs->trans($title), -1, 'category');
+print dol_get_fiche_head($head, 'translation', $langs->trans($title), -1, 'category');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type.'">'.$langs->trans("BackToList").'</a>';
 $object->next_prev_filter = ' type = '.$object->type;
@@ -195,7 +195,7 @@ $object->ref = $object->label;
 $morehtmlref = '<br><div class="refidno"><a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type.'">'.$langs->trans("Root").'</a> >> ';
 $ways = $object->print_all_ways(" &gt;&gt; ", '', 1);
 foreach ($ways as $way) {
-    $morehtmlref .= $way."<br>\n";
+	$morehtmlref .= $way."<br>\n";
 }
 $morehtmlref .= '</div>';
 
@@ -223,7 +223,7 @@ print '</td></tr>';
 print '</table>';
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 
@@ -238,11 +238,11 @@ print "\n<div class=\"tabsAction\">\n";
 
 if ($action == '')
 {
-    if ($user->rights->produit->creer || $user->rights->service->creer)
-    {
-        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&type='.$type.'">'.$langs->trans('Add').'</a>';
-        if ($cnt_trans > 0) print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&id='.$object->id.'&type='.$type.'">'.$langs->trans('Update').'</a>';
-    }
+	if ($user->rights->produit->creer || $user->rights->service->creer)
+	{
+		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&type='.$type.'">'.$langs->trans('Add').'</a>';
+		if ($cnt_trans > 0) print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&id='.$object->id.'&type='.$type.'">'.$langs->trans('Update').'</a>';
+	}
 }
 
 print "\n</div>\n";
@@ -258,20 +258,20 @@ if ($action == 'edit')
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="vedit">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
-    print '<input type="hidden" name="type" value="'.$type.'">';
+	print '<input type="hidden" name="type" value="'.$type.'">';
 
 	if (!empty($object->multilangs))
 	{
 		foreach ($object->multilangs as $key => $value)
 		{
-		    print "<br><b><u>".$langs->trans('Language_'.$key)." :</u></b><br>";
+			print "<br><b><u>".$langs->trans('Language_'.$key)." :</u></b><br>";
 			print '<table class="border centpercent">';
 
 			// Label
-            $libelle = (GETPOST('libelle-'.$key, 'alpha') ? GETPOST('libelle-'.$key, 'alpha') : $object->multilangs[$key]['label']);
+			$libelle = (GETPOST('libelle-'.$key, 'alpha') ? GETPOST('libelle-'.$key, 'alpha') : $object->multilangs[$key]['label']);
 			print '<tr><td class="titlefield fieldrequired">'.$langs->trans('Label').'</td><td><input name="libelle-'.$key.'" size="40" value="'.$libelle.'"></td></tr>';
 			// Desc
-            $desc = (GETPOST('desc-'.$key) ? GETPOST('desc-'.$key) : $object->multilangs[$key]['description']);
+			$desc = (GETPOST('desc-'.$key) ? GETPOST('desc-'.$key) : $object->multilangs[$key]['description']);
 			print '<tr><td class="tdtop">'.$langs->trans('Description').'</td><td>';
 			$doleditor = new DolEditor("desc-$key", $desc, '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%');
 			$doleditor->Create();
@@ -285,28 +285,28 @@ if ($action == 'edit')
 	print '<br>';
 
 	print '<div class="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+	print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
 } elseif ($action != 'add')
 {
-    if ($cnt_trans) print '<div class="underbanner clearboth"></div>';
+	if ($cnt_trans) print '<div class="underbanner clearboth"></div>';
 
-    if (!empty($object->multilangs))
+	if (!empty($object->multilangs))
 	{
 		foreach ($object->multilangs as $key => $value)
 		{
-		    $s = picto_from_langcode($key);
+			$s = picto_from_langcode($key);
 			print '<table class="border centpercent">';
 			print '<tr class="liste_titre"><td colspan="2">'.($s ? $s.' ' : '')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'&langtodelete='.$key.'&type='.$type.'">'.img_delete('', '').'</a></td></tr>';
 			print '<tr><td class="titlefield">'.$langs->trans('Label').'</td><td>'.$object->multilangs[$key]["label"].'</td></tr>';
 			print '<tr><td>'.$langs->trans('Description').'</td><td>'.$object->multilangs[$key]["description"].'</td></tr>';
 			if (!empty($conf->global->CATEGORY_USE_OTHER_FIELD_IN_TRANSLATION))
 			{
-                print '<tr><td>'.$langs->trans('Other').' ('.$langs->trans("NotUsed").')</td><td>'.$object->multilangs[$key]["other"].'</td></tr>';
+				print '<tr><td>'.$langs->trans('Other').' ('.$langs->trans("NotUsed").')</td><td>'.$object->multilangs[$key]["other"].'</td></tr>';
 			}
 			print '</table>';
 		}
@@ -329,11 +329,11 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="vadd">';
 	print '<input type="hidden" name="id" value="'.$id.'">';
-    print '<input type="hidden" name="type" value="'.$type.'">';
+	print '<input type="hidden" name="type" value="'.$type.'">';
 
 	print '<table class="border centpercent">';
 	print '<tr><td class="titlefield fieldrequired">'.$langs->trans('Translation').'</td><td>';
-    print $formadmin->select_language(GETPOST('forcelangprod', 'alpha'), 'forcelangprod', 0, $object->multilangs);
+	print $formadmin->select_language(GETPOST('forcelangprod', 'alpha'), 'forcelangprod', 0, $object->multilangs);
 	print '</td></tr>';
 	print '<tr><td class="fieldrequired">'.$langs->trans('Label').'</td>';
 	print '<td><input name="libelle" class="minwidth200 maxwidth300" value="'.GETPOST('libelle', 'alpha').'"></td></tr>';
@@ -346,9 +346,9 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service
 	print '</table>';
 
 	print '<div class="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+	print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 30b706a4b3a..864de6e2e98 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2005-2012  Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2020		Tobias Sekan		<tobias.sekan@startmail.com>
+ * Copyright (C) 2020		Josep Lluís Amador  <joseplluis@lliuretic.cat>
  *
  * 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
@@ -81,6 +82,10 @@ if ($result <= 0) {
 	dol_print_error($db, $object->error); exit;
 }
 
+$objecttype = $object->type;
+if (is_numeric($objecttype)) $objecttype = Categorie::$MAP_ID_TO_CODE[$objecttype];
+if ($type === '') $type = $objecttype;
+
 if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
 
 $extrafields = new ExtraFields($db);
@@ -89,10 +94,16 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('categorycard', 'globalcard'));
 
+// Protection when type provided is not similare to type of category
+if ($objecttype != $type) {
+	print 'Error: Value for type parameter does not match value of the type of the category with id='.$id;
+	exit;
+}
 
 /*
  *	Actions
  */
+
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 // Remove element from category
@@ -125,19 +136,19 @@ if ($id > 0 && $removeelem > 0)
 		$tmpobject = new Contact($db);
 		$result = $tmpobject->fetch($removeelem);
 		$elementtype = 'contact';
-    } elseif ($type == Categorie::TYPE_ACCOUNT && $user->rights->banque->configurer)
-    {
-        require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-        $tmpobject = new Account($db);
-        $result = $tmpobject->fetch($removeelem);
-        $elementtype = 'account';
-    } elseif ($type == Categorie::TYPE_PROJECT && $user->rights->projet->creer)
-    {
-        require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-        $tmpobject = new Project($db);
-        $result = $tmpobject->fetch($removeelem);
-        $elementtype = 'project';
-    } elseif ($type == Categorie::TYPE_USER && $user->rights->user->user->creer)
+	} elseif ($type == Categorie::TYPE_ACCOUNT && $user->rights->banque->configurer)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+		$tmpobject = new Account($db);
+		$result = $tmpobject->fetch($removeelem);
+		$elementtype = 'account';
+	} elseif ($type == Categorie::TYPE_PROJECT && $user->rights->projet->creer)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+		$tmpobject = new Project($db);
+		$result = $tmpobject->fetch($removeelem);
+		$elementtype = 'project';
+	} elseif ($type == Categorie::TYPE_USER && $user->rights->user->user->creer)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 		$tmpobject = new User($db);
@@ -160,12 +171,29 @@ if ($user->rights->categorie->supprimer && $action == 'confirm_delete' && $confi
 	}
 }
 
-if ($type == Categorie::TYPE_PRODUCT && $elemid && $action == 'addintocategory' && ($user->rights->produit->creer || $user->rights->service->creer))
+if ($elemid && $action == 'addintocategory' &&
+	(($type == Categorie::TYPE_PRODUCT && ($user->rights->produit->creer || $user->rights->service->creer)) ||
+	 ($type == Categorie::TYPE_CUSTOMER && $user->rights->societe->creer) ||
+	 ($type == Categorie::TYPE_SUPPLIER && $user->rights->societe->creer)
+   ))
 {
-	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-	$newobject = new Product($db);
+	if ($type == Categorie::TYPE_PRODUCT)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+		$newobject = new Product($db);
+		$elementtype = 'product';
+	} elseif ($type == Categorie::TYPE_CUSTOMER)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		$newobject = new Societe($db);
+		$elementtype = 'customer';
+	} elseif ($type == Categorie::TYPE_SUPPLIER)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		$newobject = new Societe($db);
+		$elementtype = 'supplier';
+	}
 	$result = $newobject->fetch($elemid);
-	$elementtype = 'product';
 
 	// TODO Add into categ
 	$result = $object->add_type($newobject, $elementtype);
@@ -200,7 +228,7 @@ $title = Categorie::$MAP_TYPE_TITLE_AREA[$type];
 $head = categories_prepare_head($object, $type);
 
 
-dol_fiche_head($head, 'card', $langs->trans($title), -1, 'category');
+print dol_get_fiche_head($head, 'card', $langs->trans($title), -1, 'category');
 $backtolist = (GETPOST('backtolist') ? GETPOST('backtolist') : DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type);
 $linkback = '<a href="'.$backtolist.'">'.$langs->trans("BackToList").'</a>';
 $object->next_prev_filter = ' type = '.$object->type;
@@ -209,7 +237,7 @@ $morehtmlref = '<br><div class="refidno"><a href="'.DOL_URL_ROOT.'/categories/in
 $ways = $object->print_all_ways(" &gt;&gt; ", '', 1);
 foreach ($ways as $way)
 {
-    $morehtmlref .= $way."<br>\n";
+	$morehtmlref .= $way."<br>\n";
 }
 $morehtmlref .= '</div>';
 
@@ -249,7 +277,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 print '</table>';
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 /*
@@ -260,13 +288,13 @@ print "<div class='tabsAction'>\n";
 
 if ($user->rights->categorie->creer)
 {
-	$socid = ($object->socid ? "&amp;socid=".$object->socid : "");
-	print "<a class='butAction' href='edit.php?id=".$object->id.$socid."&amp;type=".$type."'>".$langs->trans("Modify")."</a>";
+	$socid = ($object->socid ? "&socid=".$object->socid : "");
+	print '<a class="butAction" href="edit.php?id='.$object->id.$socid.'&type='.$type.'">'.$langs->trans("Modify").'</a>';
 }
 
 if ($user->rights->categorie->supprimer)
 {
-	print "<a class='butActionDelete' href='".DOL_URL_ROOT."/categories/viewcat.php?action=delete&amp;token='.newToken().'&amp;id=".$object->id."&amp;type=".$type."'>".$langs->trans("Delete")."</a>";
+	print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id.'&type='.$type.'">'.$langs->trans("Delete").'</a>';
 }
 
 print "</div>";
@@ -504,6 +532,84 @@ if ($type == Categorie::TYPE_PRODUCT)
 	}
 }
 
+if ($type == Categorie::TYPE_CUSTOMER)
+{
+	$permission = $user->rights->societe->creer;
+
+	$socs = $object->getObjectsInCateg($type, 0, $limit, $offset);
+	if ($socs < 0)
+	{
+		dol_print_error($db, $object->error, $object->errors);
+	} else {
+		// Form to add record into a category
+		$showclassifyform = 1;
+		if ($showclassifyform)
+		{
+			print '<br>';
+			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="typeid" value="'.$typeid.'">';
+			print '<input type="hidden" name="type" value="'.$typeid.'">';
+			print '<input type="hidden" name="id" value="'.$object->id.'">';
+			print '<input type="hidden" name="action" value="addintocategory">';
+			print '<table class="noborder centpercent">';
+			print '<tr class="liste_titre"><td>';
+			print $langs->trans("AddCustomerIntoCategory").' &nbsp;';
+			print $form->select_company('', 'elemid', 's.client IN (1,3)');
+			print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
+			print '</tr>';
+			print '</table>';
+			print '</form>';
+		}
+
+		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
+		print '<input type="hidden" name="type" value="'.$typeid.'">';
+		print '<input type="hidden" name="id" value="'.$object->id.'">';
+		print '<input type="hidden" name="action" value="list">';
+
+		print '<br>';
+		$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($socs); $nbtotalofrecords = ''; $newcardbutton = '';
+		print_barre_liste($langs->trans("Customers"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'companies', 0, $newcardbutton, '', $limit);
+
+		print '<table class="noborder centpercent">'."\n";
+		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Name").'</td></tr>'."\n";
+
+		if (count($socs) > 0)
+		{
+			$i = 0;
+			foreach ($socs as $key => $soc)
+			{
+				$i++;
+				if ($i > $limit) break;
+
+				print "\t".'<tr class="oddeven">'."\n";
+				print '<td class="nowrap" valign="top">';
+				print $soc->getNomUrl(1);
+				print "</td>\n";
+				// Link to delete from category
+				print '<td class="right">';
+				if ($permission)
+				{
+					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$soc->id."'>";
+					print $langs->trans("DeleteFromCat");
+					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
+					print "</a>";
+				}
+				print '</td>';
+				print "</tr>\n";
+			}
+		} else {
+			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
+		}
+		print "</table>\n";
+
+		print '</form>'."\n";
+	}
+}
+
+
 if ($type == Categorie::TYPE_SUPPLIER)
 {
 	$permission = $user->rights->societe->creer;
@@ -513,6 +619,27 @@ if ($type == Categorie::TYPE_SUPPLIER)
 	{
 		dol_print_error($db, $object->error, $object->errors);
 	} else {
+		// Form to add record into a category
+		$showclassifyform = 1;
+		if ($showclassifyform)
+		{
+			print '<br>';
+			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="typeid" value="'.$typeid.'">';
+			print '<input type="hidden" name="type" value="'.$typeid.'">';
+			print '<input type="hidden" name="id" value="'.$object->id.'">';
+			print '<input type="hidden" name="action" value="addintocategory">';
+			print '<table class="noborder centpercent">';
+			print '<tr class="liste_titre"><td>';
+			print $langs->trans("AddSupplierIntoCategory").' &nbsp;';
+			print $form->select_company('', 'elemid', 's.fournisseur = 1');
+			print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
+			print '</tr>';
+			print '</table>';
+			print '</form>';
+		}
+
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -561,62 +688,6 @@ if ($type == Categorie::TYPE_SUPPLIER)
 	}
 }
 
-if ($type == Categorie::TYPE_CUSTOMER)
-{
-	$permission = $user->rights->societe->creer;
-
-	$socs = $object->getObjectsInCateg($type, 0, $limit, $offset);
-	if ($socs < 0)
-	{
-		dol_print_error($db, $object->error, $object->errors);
-	} else {
-		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
-		print '<input type="hidden" name="type" value="'.$typeid.'">';
-		print '<input type="hidden" name="id" value="'.$object->id.'">';
-		print '<input type="hidden" name="action" value="list">';
-
-		print '<br>';
-		$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($socs); $nbtotalofrecords = ''; $newcardbutton = '';
-		print_barre_liste($langs->trans("Customers"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'companies', 0, $newcardbutton, '', $limit);
-
-		print '<table class="noborder centpercent">'."\n";
-		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Name").'</td></tr>'."\n";
-
-		if (count($socs) > 0)
-		{
-			$i = 0;
-			foreach ($socs as $key => $soc)
-			{
-				$i++;
-				if ($i > $limit) break;
-
-				print "\t".'<tr class="oddeven">'."\n";
-				print '<td class="nowrap" valign="top">';
-				print $soc->getNomUrl(1);
-				print "</td>\n";
-				// Link to delete from category
-				print '<td class="right">';
-				if ($permission)
-				{
-					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$soc->id."'>";
-					print $langs->trans("DeleteFromCat");
-					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
-					print "</a>";
-				}
-				print '</td>';
-				print "</tr>\n";
-			}
-		} else {
-			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
-		}
-		print "</table>\n";
-
-		print '</form>'."\n";
-	}
-}
-
 // List of members
 if ($type == Categorie::TYPE_MEMBER)
 {
@@ -741,61 +812,61 @@ if ($type == Categorie::TYPE_CONTACT)
 // List of bank accounts
 if ($type == Categorie::TYPE_ACCOUNT)
 {
-    require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-    $permission = $user->rights->banque->creer;
+	$permission = $user->rights->banque->creer;
 
-    $accounts = $object->getObjectsInCateg($type, 0, $limit, $offset);
-    if ($accounts < 0)
-    {
-        dol_print_error($db, $object->error, $object->errors);
-    } else {
-    	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-    	print '<input type="hidden" name="token" value="'.newToken().'">';
-    	print '<input type="hidden" name="typeid" value="'.$typeid.'">';
-    	print '<input type="hidden" name="type" value="'.$typeid.'">';
-    	print '<input type="hidden" name="id" value="'.$object->id.'">';
-    	print '<input type="hidden" name="action" value="list">';
+	$accounts = $object->getObjectsInCateg($type, 0, $limit, $offset);
+	if ($accounts < 0)
+	{
+		dol_print_error($db, $object->error, $object->errors);
+	} else {
+		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
+		print '<input type="hidden" name="type" value="'.$typeid.'">';
+		print '<input type="hidden" name="id" value="'.$object->id.'">';
+		print '<input type="hidden" name="action" value="list">';
 
-    	print '<br>';
-    	$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($accounts); $nbtotalofrecords = ''; $newcardbutton = '';
-    	print_barre_liste($langs->trans("Account"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'bank_account', 0, $newcardbutton, '', $limit);
+		print '<br>';
+		$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($accounts); $nbtotalofrecords = ''; $newcardbutton = '';
+		print_barre_liste($langs->trans("Account"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'bank_account', 0, $newcardbutton, '', $limit);
 
-    	print "<table class='noborder' width='100%'>\n";
-        print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Ref").'</td></tr>'."\n";
+		print "<table class='noborder' width='100%'>\n";
+		print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Ref").'</td></tr>'."\n";
 
-        if (count($accounts) > 0)
-        {
-        	$i = 0;
-            foreach ($accounts as $key => $account)
-            {
-            	$i++;
-            	if ($i > $limit) break;
+		if (count($accounts) > 0)
+		{
+			$i = 0;
+			foreach ($accounts as $key => $account)
+			{
+				$i++;
+				if ($i > $limit) break;
 
-                print "\t".'<tr class="oddeven">'."\n";
-                print '<td class="nowrap" valign="top">';
-                print $account->getNomUrl(1, 0);
-                print "</td>\n";
-                print '<td class="tdtop">'.$account->bank."</td>\n";
-                print '<td class="tdtop">'.$account->number."</td>\n";
-                // Link to delete from category
-                print '<td class="right">';
-                if ($permission)
-                {
-                    print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$account->id."'>";
-                    print $langs->trans("DeleteFromCat");
-                    print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
-                    print "</a>";
-                }
-                print "</tr>\n";
-            }
-        } else {
-            print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
-        }
-        print "</table>\n";
+				print "\t".'<tr class="oddeven">'."\n";
+				print '<td class="nowrap" valign="top">';
+				print $account->getNomUrl(1, 0);
+				print "</td>\n";
+				print '<td class="tdtop">'.$account->bank."</td>\n";
+				print '<td class="tdtop">'.$account->number."</td>\n";
+				// Link to delete from category
+				print '<td class="right">';
+				if ($permission)
+				{
+					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$account->id."'>";
+					print $langs->trans("DeleteFromCat");
+					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
+					print "</a>";
+				}
+				print "</tr>\n";
+			}
+		} else {
+			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
+		}
+		print "</table>\n";
 
-        print '</form>'."\n";
-    }
+		print '</form>'."\n";
+	}
 }
 
 // List of Project
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 3c8ed94c2bf..124b8dcf1dd 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -71,8 +71,6 @@ $offsetunit = GETPOST('offsetunittype_duration', 'aZ09');
 $remindertype = GETPOST('selectremindertype', 'aZ09');
 $modelmail = GETPOST('actioncommsendmodel_mail', 'int');
 
-//var_dump($_POST); exit;
-
 $datep = dol_mktime($fulldayevent ? '00' : $aphour, $fulldayevent ? '00' : $apmin, 0, GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'));
 $datef = dol_mktime($fulldayevent ? '23' : $p2hour, $fulldayevent ? '59' : $p2min, $fulldayevent ? '59' : '0', GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'));
 
@@ -98,21 +96,19 @@ $formactions = new FormActions($db);
 
 // Load object
 if ($id > 0 && $action != 'add') {
-    $ret = $object->fetch($id);
-    if ($ret > 0) {
-        $ret = $object->fetch_optionals();
-        $ret1 = $object->fetch_userassigned();
-    }
-    if ($ret < 0 || $ret1 < 0) {
-        dol_print_error('', $object->error);
-    }
+	$ret = $object->fetch($id);
+	if ($ret > 0) {
+		$ret = $object->fetch_optionals();
+		$ret1 = $object->fetch_userassigned();
+	}
+	if ($ret < 0 || $ret1 < 0) {
+		dol_print_error('', $object->error);
+	}
 }
 
 // fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 
-//var_dump($_POST);
-
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('actioncard', 'globalcard'));
 
@@ -121,8 +117,8 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 $TRemindTypes = array();
-if (!empty($conf->global->AGENDA_REMINDER_EMAIL)) $TRemindTypes['email'] = $langs->trans('EMail');
-if (!empty($conf->global->AGENDA_REMINDER_BROWSER)) $TRemindTypes['browser'] = $langs->trans('BrowserPush');
+if (!empty($conf->global->AGENDA_REMINDER_BROWSER)) $TRemindTypes['browser'] = array('label'=>$langs->trans('BrowserPush'), 'disabled'=>(empty($conf->global->AGENDA_REMINDER_BROWSER) ? 1 : 0));
+if (!empty($conf->global->AGENDA_REMINDER_EMAIL)) $TRemindTypes['email'] = array('label'=>$langs->trans('EMail'), 'disabled'=>(empty($conf->global->AGENDA_REMINDER_EMAIL) ? 1 : 0));
 
 $TDurationTypes = array('y'=>$langs->trans('Years'), 'm'=>$langs->trans('Month'), 'w'=>$langs->trans('Weeks'), 'd'=>$langs->trans('Days'), 'h'=>$langs->trans('Hours'), 'i'=>$langs->trans('Minutes'));
 
@@ -144,7 +140,7 @@ if (empty($reshook) && (GETPOST('removedassigned') || GETPOST('removedassigned')
 	{
 		if ($val['id'] == $idtoremove || $val['id'] == -1) unset($tmpassigneduserids[$key]);
 	}
-	//var_dump($_POST['removedassigned']);exit;
+
 	$_SESSION['assignedtouser'] = json_encode($tmpassigneduserids);
 	$donotclearsession = 1;
 	if ($action == 'add') $action = 'create';
@@ -176,10 +172,10 @@ if (empty($reshook) && (GETPOST('addassignedtouser') || GETPOST('updateassignedt
 
 // Link to a project
 if (empty($reshook) && $action == 'classin' && ($user->rights->agenda->allactions->create ||
-    (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create)))
+	(($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create)))
 {
-    //$object->fetch($id);
-    $object->setProject(GETPOST('projectid', 'int'));
+	//$object->fetch($id);
+	$object->setProject(GETPOST('projectid', 'int'));
 }
 
 // Action clone object
@@ -191,10 +187,10 @@ if (empty($reshook) && $action == 'confirm_clone' && $confirm == 'yes')
 	} else {
 		if ($id > 0) {
 			//$object->fetch($id);
-            if (!empty($object->socpeopleassigned)) {
-                reset($object->socpeopleassigned);
-                $object->contact_id = key($object->socpeopleassigned);
-            }
+			if (!empty($object->socpeopleassigned)) {
+				reset($object->socpeopleassigned);
+				$object->contact_id = key($object->socpeopleassigned);
+			}
 			$result = $object->createFromClone($user, GETPOST('socid', 'int'));
 			if ($result > 0) {
 				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
@@ -212,13 +208,13 @@ if (empty($reshook) && $action == 'add')
 {
 	$error = 0;
 
-    if (empty($backtopage))
-    {
-        if ($socid > 0) $backtopage = DOL_URL_ROOT.'/societe/agenda.php?socid='.$socid;
-        else $backtopage = DOL_URL_ROOT.'/comm/action/index.php';
-    }
+	if (empty($backtopage))
+	{
+		if ($socid > 0) $backtopage = DOL_URL_ROOT.'/societe/agenda.php?socid='.$socid;
+		else $backtopage = DOL_URL_ROOT.'/comm/action/index.php';
+	}
 
-    if (!empty($socpeopleassigned[0]))
+	if (!empty($socpeopleassigned[0]))
 	{
 		$result = $contact->fetch($socpeopleassigned[0]);
 	}
@@ -229,9 +225,9 @@ if (empty($reshook) && $action == 'add')
 		exit;
 	}
 
-    $percentage = in_array(GETPOST('status'), array(-1, 100)) ?GETPOST('status') : (in_array(GETPOST('complete'), array(-1, 100)) ?GETPOST('complete') : GETPOST("percentage")); // If status is -1 or 100, percentage is not defined and we must use status
+	$percentage = in_array(GETPOST('status'), array(-1, 100)) ?GETPOST('status') : (in_array(GETPOST('complete'), array(-1, 100)) ?GETPOST('complete') : GETPOST("percentage")); // If status is -1 or 100, percentage is not defined and we must use status
 
-    // Clean parameters
+	// Clean parameters
 	$datep = dol_mktime($fulldayevent ? '00' : GETPOST("aphour", 'int'), $fulldayevent ? '00' : GETPOST("apmin", 'int'), $fulldayevent ? '00' : GETPOST("apsec", 'int'), GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'));
 	$datef = dol_mktime($fulldayevent ? '23' : GETPOST("p2hour", 'int'), $fulldayevent ? '59' : GETPOST("p2min", 'int'), $fulldayevent ? '59' : GETPOST("apsec", 'int'), GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'));
 
@@ -284,17 +280,17 @@ if (empty($reshook) && $action == 'add')
 				}
 			}
 		}
-		$object->fk_project = isset($_POST["projectid"]) ? $_POST["projectid"] : 0;
+		$object->fk_project = GETPOSTISSET("projectid") ? GETPOST("projectid", 'int') : 0;
 
 		$taskid = GETPOST('taskid', 'int');
 		if (!empty($taskid)) {
-		    $taskProject = new Task($db);
-		    if ($taskProject->fetch($taskid) > 0) {
-		        $object->fk_project = $taskProject->fk_project;
-		    }
+			$taskProject = new Task($db);
+			if ($taskProject->fetch($taskid) > 0) {
+				$object->fk_project = $taskProject->fk_project;
+			}
 
-		    $object->fk_element = $taskid;
-		    $object->elementtype = 'task';
+			$object->fk_element = $taskid;
+			$object->elementtype = 'task';
 		}
 
 		$object->datep = $datep;
@@ -328,7 +324,7 @@ if (empty($reshook) && $action == 'add')
 
 	$object->note_private = trim(GETPOST("note", "restricthtml"));
 
-	if (isset($_POST["contactid"])) $object->contact = $contact;
+	if (GETPOSTISSET("contactid")) $object->contact = $contact;
 
 	if (GETPOST('socid', 'int') > 0)
 	{
@@ -393,27 +389,27 @@ if (empty($reshook) && $action == 'add')
 				$moreparam = '';
 				if ($user->id != $object->userownerid) $moreparam = "filtert=-1"; // We force to remove filter so created record is visible when going back to per user view.
 
-                //Create reminders
-                if ($addreminder == 'on'){
-                    $actionCommReminder = new ActionCommReminder($db);
+				// Create reminders
+				if ($addreminder == 'on') {
+					$actionCommReminder = new ActionCommReminder($db);
 
-                    $dateremind = dol_time_plus_duree($datep, -$offsetvalue, $offsetunit);
+					$dateremind = dol_time_plus_duree($datep, -$offsetvalue, $offsetunit);
 
-                    $actionCommReminder->dateremind = $dateremind;
-                    $actionCommReminder->typeremind = $remindertype;
-                    $actionCommReminder->offsetunit = $offsetunit;
-                    $actionCommReminder->offsetvalue = $offsetvalue;
-                    $actionCommReminder->status = $actionCommReminder::STATUS_TODO;
-                    $actionCommReminder->fk_actioncomm = $object->id;
-                    if ($remindertype == 'email') $actionCommReminder->fk_email_template = $modelmail;
+					$actionCommReminder->dateremind = $dateremind;
+					$actionCommReminder->typeremind = $remindertype;
+					$actionCommReminder->offsetunit = $offsetunit;
+					$actionCommReminder->offsetvalue = $offsetvalue;
+					$actionCommReminder->status = $actionCommReminder::STATUS_TODO;
+					$actionCommReminder->fk_actioncomm = $object->id;
+					if ($remindertype == 'email') $actionCommReminder->fk_email_template = $modelmail;
 
-                    // the notification must be created for every user assigned to the event
+					// the notification must be created for every user assigned to the event
 					foreach ($object->userassigned as $userassigned)
 					{
 						$actionCommReminder->fk_user = $userassigned['id'];
 						$res = $actionCommReminder->create($user);
 
-						if ($res <= 0){
+						if ($res <= 0) {
 							// If error
 							$db->rollback();
 							$langs->load("errors");
@@ -423,13 +419,13 @@ if (empty($reshook) && $action == 'add')
 							break;
 						}
 					}
-                }
+				}
 
-                if ($error) {
-                	$db->rollback();
-                } else {
+				if ($error) {
+					$db->rollback();
+				} else {
 					$db->commit();
-                }
+				}
 
 				if (!empty($backtopage))
 				{
@@ -465,14 +461,14 @@ if (empty($reshook) && $action == 'update')
 {
 	if (empty($cancel))
 	{
-        $fulldayevent = GETPOST('fullday');
-        $aphour = GETPOST('aphour');
-        $apmin = GETPOST('apmin');
-        $p2hour = GETPOST('p2hour');
-        $p2min = GETPOST('p2min');
+		$fulldayevent = GETPOST('fullday');
+		$aphour = GETPOST('aphour');
+		$apmin = GETPOST('apmin');
+		$p2hour = GETPOST('p2hour');
+		$p2min = GETPOST('p2min');
 		$percentage = in_array(GETPOST('status'), array(-1, 100)) ?GETPOST('status') : (in_array(GETPOST('complete'), array(-1, 100)) ?GETPOST('complete') : GETPOST("percentage")); // If status is -1 or 100, percentage is not defined and we must use status
 
-	    // Clean parameters
+		// Clean parameters
 		if ($aphour == -1) $aphour = '0';
 		if ($apmin == -1) $apmin = '0';
 		if ($p2hour == -1) $p2hour = '0';
@@ -492,22 +488,21 @@ if (empty($reshook) && $action == 'update')
 		$object->datef       = $datef;
 		$object->percentage  = $percentage;
 		$object->priority    = GETPOST("priority", "int");
-        $object->fulldayevent = GETPOST("fullday") ? 1 : 0;
-        $object->location    = GETPOST('location', "alphanohtml");
+		$object->fulldayevent = GETPOST("fullday") ? 1 : 0;
+		$object->location    = GETPOST('location', "alphanohtml");
 		$object->socid       = GETPOST("socid", "int");
 		$socpeopleassigned   = GETPOST("socpeopleassigned", 'array');
 		$object->socpeopleassigned = array();
 		foreach ($socpeopleassigned as $cid) $object->socpeopleassigned[$cid] = array('id' => $cid);
-		$object->contact_id   = GETPOST("contactid", 'int');
-        if (empty($object->contact_id) && !empty($object->socpeopleassigned)) {
-            reset($object->socpeopleassigned);
-            $object->contact_id = key($object->socpeopleassigned);
-        }
+		$object->contact_id = GETPOST("contactid", 'int');
+		if (empty($object->contact_id) && !empty($object->socpeopleassigned)) {
+			reset($object->socpeopleassigned);
+			$object->contact_id = key($object->socpeopleassigned);
+		}
 		$object->fk_project  = GETPOST("projectid", 'int');
 		$object->note_private = trim(GETPOST("note", "restricthtml"));
 		$object->fk_element	 = GETPOST("fk_element", "int");
 		$object->elementtype = GETPOST("elementtype", "alphanohtml");
-
 		if (!$datef && $percentage == 100)
 		{
 			$error++; $donotclearsession = 1;
@@ -568,64 +563,64 @@ if (empty($reshook) && $action == 'update')
 		$ret = $extrafields->setOptionalsFromPost(null, $object);
 		if ($ret < 0) $error++;
 
-        if (!$error) {
-            // check if an event resource is already in use
-            if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $object->element == 'action') {
-                $eventDateStart = $object->datep;
-                $eventDateEnd = $object->datef;
+		if (!$error) {
+			// check if an event resource is already in use
+			if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $object->element == 'action') {
+				$eventDateStart = $object->datep;
+				$eventDateEnd = $object->datef;
 
-                $sql  = "SELECT er.rowid, r.ref as r_ref, ac.id as ac_id, ac.label as ac_label";
-                $sql .= " FROM ".MAIN_DB_PREFIX."element_resources as er";
-                $sql .= " INNER JOIN ".MAIN_DB_PREFIX."resource as r ON r.rowid = er.resource_id AND er.resource_type = 'dolresource'";
-                $sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm as ac ON ac.id = er.element_id AND er.element_type = '".$db->escape($object->element)."'";
-                $sql .= " WHERE ac.id != ".$object->id;
-                $sql .= " AND er.resource_id IN (";
-                $sql .= " SELECT resource_id FROM ".MAIN_DB_PREFIX."element_resources";
-                $sql .= " WHERE element_id = ".$object->id;
-                $sql .= " AND element_type = '".$db->escape($object->element)."'";
-                $sql .= " AND busy = 1";
-                $sql .= ")";
-                $sql .= " AND er.busy = 1";
-                $sql .= " AND (";
+				$sql  = "SELECT er.rowid, r.ref as r_ref, ac.id as ac_id, ac.label as ac_label";
+				$sql .= " FROM ".MAIN_DB_PREFIX."element_resources as er";
+				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."resource as r ON r.rowid = er.resource_id AND er.resource_type = 'dolresource'";
+				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm as ac ON ac.id = er.element_id AND er.element_type = '".$db->escape($object->element)."'";
+				$sql .= " WHERE ac.id != ".$object->id;
+				$sql .= " AND er.resource_id IN (";
+				$sql .= " SELECT resource_id FROM ".MAIN_DB_PREFIX."element_resources";
+				$sql .= " WHERE element_id = ".$object->id;
+				$sql .= " AND element_type = '".$db->escape($object->element)."'";
+				$sql .= " AND busy = 1";
+				$sql .= ")";
+				$sql .= " AND er.busy = 1";
+				$sql .= " AND (";
 
-                // event date start between ac.datep and ac.datep2 (if datep2 is null we consider there is no end)
-                $sql .= " (ac.datep <= '".$db->idate($eventDateStart)."' AND (ac.datep2 IS NULL OR ac.datep2 >= '".$db->idate($eventDateStart)."'))";
-                // event date end between ac.datep and ac.datep2
-                if (!empty($eventDateEnd)) {
-                    $sql .= " OR (ac.datep <= '".$db->idate($eventDateEnd)."' AND (ac.datep2 >= '".$db->idate($eventDateEnd)."'))";
-                }
-                // event date start before ac.datep and event date end after ac.datep2
-                $sql .= " OR (";
-                $sql .= "ac.datep >= '".$db->idate($eventDateStart)."'";
-                if (!empty($eventDateEnd)) {
-                    $sql .= " AND (ac.datep2 IS NOT NULL AND ac.datep2 <= '".$db->idate($eventDateEnd)."')";
-                }
-                $sql .= ")";
+				// event date start between ac.datep and ac.datep2 (if datep2 is null we consider there is no end)
+				$sql .= " (ac.datep <= '".$db->idate($eventDateStart)."' AND (ac.datep2 IS NULL OR ac.datep2 >= '".$db->idate($eventDateStart)."'))";
+				// event date end between ac.datep and ac.datep2
+				if (!empty($eventDateEnd)) {
+					$sql .= " OR (ac.datep <= '".$db->idate($eventDateEnd)."' AND (ac.datep2 >= '".$db->idate($eventDateEnd)."'))";
+				}
+				// event date start before ac.datep and event date end after ac.datep2
+				$sql .= " OR (";
+				$sql .= "ac.datep >= '".$db->idate($eventDateStart)."'";
+				if (!empty($eventDateEnd)) {
+					$sql .= " AND (ac.datep2 IS NOT NULL AND ac.datep2 <= '".$db->idate($eventDateEnd)."')";
+				}
+				$sql .= ")";
 
-                $sql .= ")";
-                $resql = $db->query($sql);
-                if (!$resql) {
-                    $error++;
-                    $object->error = $db->lasterror();
-                    $object->errors[] = $object->error;
-                } else {
-                    if ($db->num_rows($resql) > 0) {
-                        // already in use
-                        $error++;
-                        $object->error = $langs->trans('ErrorResourcesAlreadyInUse').' : ';
-                        while ($obj = $db->fetch_object($resql)) {
-                            $object->error .= '<br> - '.$langs->trans('ErrorResourceUseInEvent', $obj->r_ref, $obj->ac_label.' ['.$obj->ac_id.']');
-                        }
-                        $object->errors[] = $object->error;
-                    }
-                    $db->free($resql);
-                }
+				$sql .= ")";
+				$resql = $db->query($sql);
+				if (!$resql) {
+					$error++;
+					$object->error = $db->lasterror();
+					$object->errors[] = $object->error;
+				} else {
+					if ($db->num_rows($resql) > 0) {
+						// already in use
+						$error++;
+						$object->error = $langs->trans('ErrorResourcesAlreadyInUse').' : ';
+						while ($obj = $db->fetch_object($resql)) {
+							$object->error .= '<br> - '.$langs->trans('ErrorResourceUseInEvent', $obj->r_ref, $obj->ac_label.' ['.$obj->ac_id.']');
+						}
+						$object->errors[] = $object->error;
+					}
+					$db->free($resql);
+				}
 
-                if ($error) {
-                    setEventMessages($object->error, $object->errors, 'errors');
-                }
-            }
-        }
+				if ($error) {
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
+			}
+		}
 
 		if (!$error)
 		{
@@ -650,7 +645,7 @@ if (empty($reshook) && $action == 'update')
 				}
 
 				//Create reminders
-				if ($addreminder == 'on' && $object->datep > dol_now()){
+				if ($addreminder == 'on' && $object->datep > dol_now()) {
 					$actionCommReminder = new ActionCommReminder($db);
 
 					$dateremind = dol_time_plus_duree($datep, -$offsetvalue, $offsetunit);
@@ -669,7 +664,7 @@ if (empty($reshook) && $action == 'update')
 						$actionCommReminder->fk_user = $userassigned['id'];
 						$res = $actionCommReminder->create($user);
 
-						if ($res <= 0){
+						if ($res <= 0) {
 							// If error
 							$langs->load("errors");
 							$error = $langs->trans('ErrorReminderActionCommCreation');
@@ -693,12 +688,12 @@ if (empty($reshook) && $action == 'update')
 
 	if (!$error)
 	{
-        if (!empty($backtopage))
-        {
-        	unset($_SESSION['assignedtouser']);
-            header("Location: ".$backtopage);
-            exit;
-        }
+		if (!empty($backtopage))
+		{
+			unset($_SESSION['assignedtouser']);
+			header("Location: ".$backtopage);
+			exit;
+		}
 	}
 }
 
@@ -708,9 +703,9 @@ if (empty($reshook) && $action == 'update')
 if (empty($reshook) && $action == 'confirm_delete' && GETPOST("confirm") == 'yes')
 {
 	$object->fetch($id);
-    $object->fetch_optionals();
-    $object->fetch_userassigned();
-    $object->oldcopy = clone $object;
+	$object->fetch_optionals();
+	$object->fetch_userassigned();
+	$object->oldcopy = clone $object;
 
 	if ($user->rights->agenda->myactions->delete
 		|| $user->rights->agenda->allactions->delete)
@@ -733,112 +728,112 @@ if (empty($reshook) && $action == 'confirm_delete' && GETPOST("confirm") == 'yes
  */
 if (empty($reshook) && GETPOST('actionmove', 'alpha') == 'mupdate')
 {
-    $error = 0;
+	$error = 0;
 
-    $shour = dol_print_date($object->datep, "%H");
-    $smin = dol_print_date($object->datep, "%M");
+	$shour = dol_print_date($object->datep, "%H");
+	$smin = dol_print_date($object->datep, "%M");
 
-    $newdate = GETPOST('newdate', 'alpha');
-    if (empty($newdate) || strpos($newdate, 'dayevent_') != 0)
-    {
-        header("Location: ".$backtopage);
-        exit;
-    }
+	$newdate = GETPOST('newdate', 'alpha');
+	if (empty($newdate) || strpos($newdate, 'dayevent_') != 0)
+	{
+		header("Location: ".$backtopage);
+		exit;
+	}
 
-    $datep = dol_mktime($shour, $smin, 0, substr($newdate, 13, 2), substr($newdate, 15, 2), substr($newdate, 9, 4));
-    if ($datep != $object->datep)
-    {
-        if (!empty($object->datef))
-        {
-            $object->datef += $datep - $object->datep;
-        }
-        $object->datep = $datep;
+	$datep = dol_mktime($shour, $smin, 0, substr($newdate, 13, 2), substr($newdate, 15, 2), substr($newdate, 9, 4));
+	if ($datep != $object->datep)
+	{
+		if (!empty($object->datef))
+		{
+			$object->datef += $datep - $object->datep;
+		}
+		$object->datep = $datep;
 
-        if (!$error) {
-            // check if an event resource is already in use
-            if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $object->element == 'action') {
-                $eventDateStart = $object->datep;
-                $eventDateEnd = $object->datef;
+		if (!$error) {
+			// check if an event resource is already in use
+			if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $object->element == 'action') {
+				$eventDateStart = $object->datep;
+				$eventDateEnd = $object->datef;
 
-                $sql  = "SELECT er.rowid, r.ref as r_ref, ac.id as ac_id, ac.label as ac_label";
-                $sql .= " FROM ".MAIN_DB_PREFIX."element_resources as er";
-                $sql .= " INNER JOIN ".MAIN_DB_PREFIX."resource as r ON r.rowid = er.resource_id AND er.resource_type = 'dolresource'";
-                $sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm as ac ON ac.id = er.element_id AND er.element_type = '".$db->escape($object->element)."'";
-                $sql .= " WHERE ac.id != ".$object->id;
-                $sql .= " AND er.resource_id IN (";
-                $sql .= " SELECT resource_id FROM ".MAIN_DB_PREFIX."element_resources";
-                $sql .= " WHERE element_id = ".$object->id;
-                $sql .= " AND element_type = '".$db->escape($object->element)."'";
-                $sql .= " AND busy = 1";
-                $sql .= ")";
-                $sql .= " AND er.busy = 1";
-                $sql .= " AND (";
+				$sql  = "SELECT er.rowid, r.ref as r_ref, ac.id as ac_id, ac.label as ac_label";
+				$sql .= " FROM ".MAIN_DB_PREFIX."element_resources as er";
+				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."resource as r ON r.rowid = er.resource_id AND er.resource_type = 'dolresource'";
+				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm as ac ON ac.id = er.element_id AND er.element_type = '".$db->escape($object->element)."'";
+				$sql .= " WHERE ac.id != ".$object->id;
+				$sql .= " AND er.resource_id IN (";
+				$sql .= " SELECT resource_id FROM ".MAIN_DB_PREFIX."element_resources";
+				$sql .= " WHERE element_id = ".$object->id;
+				$sql .= " AND element_type = '".$db->escape($object->element)."'";
+				$sql .= " AND busy = 1";
+				$sql .= ")";
+				$sql .= " AND er.busy = 1";
+				$sql .= " AND (";
 
-                // event date start between ac.datep and ac.datep2 (if datep2 is null we consider there is no end)
-                $sql .= " (ac.datep <= '".$db->idate($eventDateStart)."' AND (ac.datep2 IS NULL OR ac.datep2 >= '".$db->idate($eventDateStart)."'))";
-                // event date end between ac.datep and ac.datep2
-                if (!empty($eventDateEnd)) {
-                    $sql .= " OR (ac.datep <= '".$db->idate($eventDateEnd)."' AND (ac.datep2 >= '".$db->idate($eventDateEnd)."'))";
-                }
-                // event date start before ac.datep and event date end after ac.datep2
-                $sql .= " OR (";
-                $sql .= "ac.datep >= '".$db->idate($eventDateStart)."'";
-                if (!empty($eventDateEnd)) {
-                    $sql .= " AND (ac.datep2 IS NOT NULL AND ac.datep2 <= '".$db->idate($eventDateEnd)."')";
-                }
-                $sql .= ")";
+				// event date start between ac.datep and ac.datep2 (if datep2 is null we consider there is no end)
+				$sql .= " (ac.datep <= '".$db->idate($eventDateStart)."' AND (ac.datep2 IS NULL OR ac.datep2 >= '".$db->idate($eventDateStart)."'))";
+				// event date end between ac.datep and ac.datep2
+				if (!empty($eventDateEnd)) {
+					$sql .= " OR (ac.datep <= '".$db->idate($eventDateEnd)."' AND (ac.datep2 >= '".$db->idate($eventDateEnd)."'))";
+				}
+				// event date start before ac.datep and event date end after ac.datep2
+				$sql .= " OR (";
+				$sql .= "ac.datep >= '".$db->idate($eventDateStart)."'";
+				if (!empty($eventDateEnd)) {
+					$sql .= " AND (ac.datep2 IS NOT NULL AND ac.datep2 <= '".$db->idate($eventDateEnd)."')";
+				}
+				$sql .= ")";
 
-                $sql .= ")";
-                $resql = $db->query($sql);
-                if (!$resql) {
-                    $error++;
-                    $object->error = $db->lasterror();
-                    $object->errors[] = $object->error;
-                } else {
-                    if ($db->num_rows($resql) > 0) {
-                        // already in use
-                        $error++;
-                        $object->error = $langs->trans('ErrorResourcesAlreadyInUse').' : ';
-                        while ($obj = $db->fetch_object($resql)) {
-                            $object->error .= '<br> - '.$langs->trans('ErrorResourceUseInEvent', $obj->r_ref, $obj->ac_label.' ['.$obj->ac_id.']');
-                        }
-                        $object->errors[] = $object->error;
-                    }
-                    $db->free($resql);
-                }
+				$sql .= ")";
+				$resql = $db->query($sql);
+				if (!$resql) {
+					$error++;
+					$object->error = $db->lasterror();
+					$object->errors[] = $object->error;
+				} else {
+					if ($db->num_rows($resql) > 0) {
+						// already in use
+						$error++;
+						$object->error = $langs->trans('ErrorResourcesAlreadyInUse').' : ';
+						while ($obj = $db->fetch_object($resql)) {
+							$object->error .= '<br> - '.$langs->trans('ErrorResourceUseInEvent', $obj->r_ref, $obj->ac_label.' ['.$obj->ac_id.']');
+						}
+						$object->errors[] = $object->error;
+					}
+					$db->free($resql);
+				}
 
-                if ($error) {
-                    setEventMessages($object->error, $object->errors, 'errors');
-                }
-            }
-        }
+				if ($error) {
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
+			}
+		}
 
-        if (!$error) {
-            $db->begin();
-            $result = $object->update($user);
-            if ($result < 0) {
-                $error++;
-                setEventMessages($object->error, $object->errors, 'errors');
-                $db->rollback();
-            } else {
-                $db->commit();
-            }
-        }
-    }
-    if (!empty($backtopage))
-    {
-        header("Location: ".$backtopage);
-        exit;
-    } else {
-        $action = '';
-    }
+		if (!$error) {
+			$db->begin();
+			$result = $object->update($user);
+			if ($result < 0) {
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+				$db->rollback();
+			} else {
+				$db->commit();
+			}
+		}
+	}
+	if (!empty($backtopage))
+	{
+		header("Location: ".$backtopage);
+		exit;
+	} else {
+		$action = '';
+	}
 }
 
 // Actions to delete doc
 $upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($object->ref);
 $permissiontoadd = ($user->rights->agenda->allactions->create || (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->read));
 if (empty($reshook)) {
-    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 }
 
 
@@ -873,10 +868,10 @@ if ($action == 'create')
 
 	dol_set_focus("#label");
 
-    if (!empty($conf->use_javascript_ajax))
-    {
-        print "\n".'<script type="text/javascript">';
-        print '$(document).ready(function () {
+	if (!empty($conf->use_javascript_ajax))
+	{
+		print "\n".'<script type="text/javascript">';
+		print '$(document).ready(function () {
         			function setdatefields()
 	            	{
 	            		if ($("#fullday:checked").val() == null) {
@@ -926,8 +921,8 @@ if ($action == 'create')
                     else $("#dateend").removeClass("fieldrequired");
                     setdatefields();
                })';
-        print '</script>'."\n";
-    }
+		print '</script>'."\n";
+	}
 
 	print '<form name="formaction" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -939,7 +934,7 @@ if ($action == 'create')
 	if (GETPOST("actioncode", 'aZ09') == 'AC_RDV') print load_fiche_titre($langs->trans("AddActionRendezVous"), '', 'title_agenda');
 	else print load_fiche_titre($langs->trans("AddAnAction"), '', 'title_agenda');
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">';
 
@@ -955,39 +950,39 @@ if ($action == 'create')
 	// Title
 	print '<tr><td'.(empty($conf->global->AGENDA_USE_EVENT_TYPE) ? ' class="fieldrequired titlefieldcreate"' : '').'>'.$langs->trans("Label").'</td><td><input type="text" id="label" name="label" class="soixantepercent" value="'.GETPOST('label').'"></td></tr>';
 
-    // Full day
-    print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td><input type="checkbox" id="fullday" name="fullday" '.(GETPOST('fullday') ? ' checked' : '').'></td></tr>';
+	// Full day
+	print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td><input type="checkbox" id="fullday" name="fullday" '.(GETPOST('fullday') ? ' checked' : '').'></td></tr>';
 
-    $datep = ($datep ? $datep : $object->datep);
-    if (GETPOST('datep', 'int', 1)) $datep = dol_stringtotime(GETPOST('datep', 'int', 1), 0);
-    $datef = ($datef ? $datef : $object->datef);
-    if (GETPOST('datef', 'int', 1)) $datef = dol_stringtotime(GETPOST('datef', 'int', 1), 0);
-    if (empty($datef) && !empty($datep))
-    {
-    	if (GETPOST("actioncode", 'aZ09') == 'AC_RDV' || empty($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT)) {
-    		$datef = dol_time_plus_duree($datep, (empty($conf->global->AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS) ? 1 : $conf->global->AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS), 'h');
-    	}
-    }
+	$datep = ($datep ? $datep : $object->datep);
+	if (GETPOST('datep', 'int', 1)) $datep = dol_stringtotime(GETPOST('datep', 'int', 1), 0);
+	$datef = ($datef ? $datef : $object->datef);
+	if (GETPOST('datef', 'int', 1)) $datef = dol_stringtotime(GETPOST('datef', 'int', 1), 0);
+	if (empty($datef) && !empty($datep))
+	{
+		if (GETPOST("actioncode", 'aZ09') == 'AC_RDV' || empty($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT)) {
+			$datef = dol_time_plus_duree($datep, (empty($conf->global->AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS) ? 1 : $conf->global->AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS), 'h');
+		}
+	}
 
-    // Date start
+	// Date start
 	print '<tr><td class="nowrap">';
 	print '<span class="fieldrequired">'.$langs->trans("DateActionStart").'</span>';
 	print ' - ';
 	print '<span id="dateend"'.(GETPOST("actioncode", 'aZ09') == 'AC_RDV' ? ' class="fieldrequired"' : '').'>'.$langs->trans("DateActionEnd").'</span>';
 	print '</td><td>';
 	if (GETPOST("afaire") == 1) {
-        print $form->selectDate($datep, 'ap', 1, 1, 0, "action", 1, 2, 0, 'fulldaystart');	// Empty value not allowed for start date and hours if "todo"
-    } else {
-        print $form->selectDate($datep, 'ap', 1, 1, 1, "action", 1, 2, 0, 'fulldaystart');
-    }
-    print ' <span class="hideonsmartphone">&nbsp; &nbsp; - &nbsp; &nbsp;</span> ';
+		print $form->selectDate($datep, 'ap', 1, 1, 0, "action", 1, 2, 0, 'fulldaystart'); // Empty value not allowed for start date and hours if "todo"
+	} else {
+		print $form->selectDate($datep, 'ap', 1, 1, 1, "action", 1, 2, 0, 'fulldaystart');
+	}
+	print ' <span class="hideonsmartphone">&nbsp; &nbsp; - &nbsp; &nbsp;</span> ';
 	//print ' - ';
-    if (GETPOST("afaire") == 1) {
-    	print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend');
-    } else {
-    	print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend');
-    }
-    print '</td></tr>';
+	if (GETPOST("afaire") == 1) {
+		print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend');
+	} else {
+		print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend');
+	}
+	print '</td></tr>';
 
 	// Date end
 	/*print '<tr><td>';
@@ -1001,7 +996,7 @@ if ($action == 'create')
     }
 	print '</td></tr>';*/
 
-    // Dev in progress
+	// Dev in progress
 	$userepeatevent = ($conf->global->MAIN_FEATURES_LEVEL == 2 ? 1 : 0);
 	if ($userepeatevent)
 	{
@@ -1056,8 +1051,8 @@ if ($action == 'create')
 	print '<tr><td>'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td>';
 	print '<td>';
 	$percent = -1;
-	if (isset($_GET['status']) || isset($_POST['status'])) $percent = GETPOST('status');
-	elseif (isset($_GET['percentage']) || isset($_POST['percentage'])) $percent = GETPOST('percentage');
+	if (GETPOSTISSET('status')) $percent = GETPOST('status');
+	elseif (GETPOSTISSET('percentage')) $percent = GETPOST('percentage');
 	else {
 		if (GETPOST('complete') == '0' || GETPOST("afaire") == 1) $percent = '0';
 		elseif (GETPOST('complete') == 100 || GETPOST("afaire") == 2) $percent = 100;
@@ -1065,52 +1060,51 @@ if ($action == 'create')
 	$formactions->form_select_status_action('formaction', $percent, 1, 'complete', 0, 0, 'maxwidth200');
 	print '</td></tr>';
 
-    // Location
-    if (empty($conf->global->AGENDA_DISABLE_LOCATION))
-    {
-		print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3"><input type="text" name="location" class="minwidth300" value="'.(GETPOST('location') ? GETPOST('location') : $object->location).'"></td></tr>';
-    }
+	// Location
+	if (empty($conf->global->AGENDA_DISABLE_LOCATION))
+	{
+		print '<tr><td>'.$langs->trans("Location").'</td><td><input type="text" name="location" class="minwidth300 maxwidth150onsmartphone" value="'.(GETPOST('location') ? GETPOST('location') : $object->location).'"></td></tr>';
+	}
 
 	// Assigned to
 	print '<tr><td class="tdtop nowrap">'.$langs->trans("ActionAffectedTo").'</td><td>';
 	$listofuserid = array();
+	$listofcontactid = array();
+	$listofotherid = array();
+
 	if (empty($donotclearsession))
 	{
 		$assignedtouser = GETPOST("assignedtouser") ?GETPOST("assignedtouser") : (!empty($object->userownerid) && $object->userownerid > 0 ? $object->userownerid : $user->id);
 		if ($assignedtouser) $listofuserid[$assignedtouser] = array('id'=>$assignedtouser, 'mandatory'=>0, 'transparency'=>$object->transparency); // Owner first
-		$listofuserid[$user->id]['transparency'] = GETPOSTISSET('transparency') ?GETPOST('transparency', 'alpha') : 1; // 1 by default at first init
+		//$listofuserid[$user->id] = array('id'=>$user->id, 'mandatory'=>0, 'transparency'=>(GETPOSTISSET('transparency') ? GETPOST('transparency', 'alpha') : 1)); // 1 by default at first init
+		$listofuserid[$assignedtouser]['transparency'] = (GETPOSTISSET('transparency') ? GETPOST('transparency', 'alpha') : 1); // 1 by default at first init
 		$_SESSION['assignedtouser'] = json_encode($listofuserid);
 	} else {
 		if (!empty($_SESSION['assignedtouser']))
 		{
 			$listofuserid = json_decode($_SESSION['assignedtouser'], true);
 		}
-		$listofuserid[$user->id]['transparency'] = GETPOSTISSET('transparency') ?GETPOST('transparency', 'alpha') : 0; // 0 by default when refreshing
+		$firstelem = reset($listofuserid);
+		if (isset($listofuserid[$firstelem['id']])) $listofuserid[$firstelem['id']]['transparency'] = (GETPOSTISSET('transparency') ? GETPOST('transparency', 'alpha') : 0); // 0 by default when refreshing
 	}
 	print '<div class="assignedtouser">';
 	print $form->select_dolusers_forevent(($action == 'create' ? 'add' : 'update'), 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, 'AND u.statut != 0', 1, $listofuserid, $listofcontactid, $listofotherid);
 	print '</div>';
-	/*if (in_array($user->id,array_keys($listofuserid)))
-	{
-		print '<div class="myavailability">';
-		print $langs->trans("MyAvailability").': <input id="transparency" type="checkbox" name="transparency"'.(((! isset($_GET['transparency']) && ! isset($_POST['transparency'])) || GETPOST('transparency'))?' checked':'').'> '.$langs->trans("Busy");
-		print '</div>';
-	}*/
 	print '</td></tr>';
 
 	// Done by
 	if (!empty($conf->global->AGENDA_ENABLE_DONEBY))
 	{
 		print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td>';
-		print $form->select_dolusers(GETPOST("doneby") ?GETPOST("doneby") : (!empty($object->userdoneid) && $percent == 100 ? $object->userdoneid : 0), 'doneby', 1);
+		print $form->select_dolusers(GETPOSTISSET("doneby") ? GETPOST("doneby", 'int') : (!empty($object->userdoneid) && $percent == 100 ? $object->userdoneid : 0), 'doneby', 1);
 		print '</td></tr>';
 	}
 
 	if ($conf->categorie->enabled) {
 		// Categories
-		print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
+		print '<tr><td>'.$langs->trans("Categories").'</td><td>';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_ACTIONCOMM, '', 'parent', 64, 0, 1);
-		print $form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, '', 0, '100%');
+		print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'minwidth300 quatrevingtpercent widthcentpercentminusx', 0, 0);
 		print "</td></tr>";
 	}
 
@@ -1126,8 +1120,7 @@ if ($action == 'create')
 	{
 		// Related company
 		print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("ActionOnCompany").'</td><td>';
-		if (GETPOST('socid', 'int') > 0)
-		{
+		if (GETPOST('socid', 'int') > 0) {
 			$societe = new Societe($db);
 			$societe->fetch(GETPOST('socid', 'int'));
 			print $societe->getNomUrl(1);
@@ -1148,7 +1141,8 @@ if ($action == 'create')
 		print '<tr><td class="nowrap">'.$langs->trans("ActionOnContact").'</td><td>';
 		$preselectedids = GETPOST('socpeopleassigned', 'array');
 		if (GETPOST('contactid', 'int')) $preselectedids[GETPOST('contactid', 'int')] = GETPOST('contactid', 'int');
-		print img_picto('', 'contact', 'class="paddingrightonly"').$form->selectcontacts(GETPOST('socid', 'int'), $preselectedids, 'socpeopleassigned[]', 1, '', '', 0, 'quatrevingtpercent', false, 0, array(), false, 'multiple', 'contactid');
+		print img_picto('', 'contact', 'class="paddingrightonly"');
+		print $form->selectcontacts(GETPOST('socid', 'int'), $preselectedids, 'socpeopleassigned[]', 1, '', '', 0, 'minwidth300 quatrevingtpercent', false, 0, array(), false, 'multiple', 'contactid');
 		print '</td></tr>';
 	}
 
@@ -1161,7 +1155,7 @@ if ($action == 'create')
 
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("Project").'</td><td id="project-input-container" >';
 		print img_picto('', 'project', 'class="paddingrightonly"');
-		$numproject = $formproject->select_projects((!empty($societe->id) ? $societe->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');
+		print $formproject->select_projects((!empty($societe->id) ? $societe->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
 
 		print ' <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$societe->id.'&action=create"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddProject").'"></span></a>';
 		$urloption = '?action=create&donotclearsession=1';
@@ -1171,10 +1165,11 @@ if ($action == 'create')
 		print "\n".'<script type="text/javascript">';
 		print '$(document).ready(function () {
 	               $("#projectid").change(function () {
-                        var url = "'.$url.'&projectid="+$("#projectid").val();
+                        var url = "'.DOL_URL_ROOT.'/projet/ajax/projects.php?mode=gettasks&socid="+$("#projectid").val()+"&projectid="+$("#projectid").val();
+						console.log("Call url to get new list of tasks: "+url);
                         $.get(url, function(data) {
-                            console.log($( data ).find("#taskid").html());
-                            if (data) $("#taskid").html( $( data ).find("#taskid").html() ).select2();
+                            console.log(data);
+                            if (data) $("#taskid").html(data).select2();
                         })
                   });
                })';
@@ -1186,7 +1181,7 @@ if ($action == 'create')
 		print img_picto('', 'projecttask', 'class="paddingrightonly"');
 		$projectsListId = false;
 		if (!empty($projectid)) { $projectsListId = $projectid; }
-		$tid = GETPOST("projecttaskid") ?GETPOST("projecttaskid") : '';
+		$tid = GETPOST("projecttaskid") ? GETPOST("projecttaskid") : '';
 		$formproject->selectTasks((!empty($societe->id) ? $societe->id : -1), $tid, 'taskid', 24, 0, '1', 1, 0, 0, 'maxwidth500', $projectsListId);
 		print '</td></tr>';
 	}
@@ -1197,10 +1192,10 @@ if ($action == 'create')
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("LinkedObject").'</td>';
 		print '<td colspan="3">'.dolGetElementUrl($originid, $origin, 1).'</td></tr>';
-		print '<input type="hidden" name="fk_element" size="10" value="'.GETPOST('originid').'">';
-		print '<input type="hidden" name="elementtype" size="10" value="'.GETPOST('origin').'">';
-		print '<input type="hidden" name="originid" size="10" value="'.GETPOST('originid').'">';
-		print '<input type="hidden" name="origin" size="10" value="'.GETPOST('origin').'">';
+		print '<input type="hidden" name="fk_element" value="'.GETPOST('originid', 'int').'">';
+		print '<input type="hidden" name="elementtype" value="'.GETPOST('origin').'">';
+		print '<input type="hidden" name="originid" value="'.GETPOST('originid', 'int').'">';
+		print '<input type="hidden" name="origin" value="'.GETPOST('origin').'">';
 	}
 
 	$reg = array();
@@ -1210,24 +1205,24 @@ if ($action == 'create')
 	}
 
 	// Priority
-	if (! empty($conf->global->AGENDA_SUPPORT_PRIORITY_IN_EVENTS)) {
+	if (!empty($conf->global->AGENDA_SUPPORT_PRIORITY_IN_EVENTS)) {
 		print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("Priority").'</td><td colspan="3">';
 		print '<input type="text" name="priority" value="'.(GETPOSTISSET('priority') ? GETPOST('priority', 'int') : ($object->priority ? $object->priority : '')).'" size="5">';
 		print '</td></tr>';
 	}
 
-    // Description
-    print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor = new DolEditor('note', (GETPOSTISSET('note') ? GETPOST('note', 'restricthtml') : $object->note_private), '', 120, 'dolibarr_notes', 'In', true, true, $conf->fckeditor->enabled, ROWS_4, '90%');
-    $doleditor->Create();
-    print '</td></tr>';
+	// Description
+	print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	$doleditor = new DolEditor('note', (GETPOSTISSET('note') ? GETPOST('note', 'restricthtml') : $object->note_private), '', 120, 'dolibarr_notes', 'In', true, true, $conf->fckeditor->enabled, ROWS_4, '90%');
+	$doleditor->Create();
+	print '</td></tr>';
 
-    // Other attributes
-    $parameters = array();
-    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-    if (empty($reshook))
+	// Other attributes
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	if (empty($reshook))
 	{
 		print $object->showOptionals($extrafields, 'edit', $parameters);
 	}
@@ -1235,46 +1230,42 @@ if ($action == 'create')
 	print '</table>';
 
 
-    if ($conf->global->AGENDA_REMINDER_EMAIL || $conf->global->AGENDA_REMINDER_BROWSER)
-    {
-        //checkbox create reminder
-        print '<hr>';
-    	print '<br>';
-        print '<label for="addreminder">'.$langs->trans("AddReminder").'</label> <input type="checkbox" id="addreminder" name="addreminder"><br><br>';
+	if ($conf->global->AGENDA_REMINDER_EMAIL || $conf->global->AGENDA_REMINDER_BROWSER)
+	{
+		//checkbox create reminder
+		print '<hr>';
+		print '<br>';
+		print '<label for="addreminder">'.$langs->trans("AddReminder").'</label> <input type="checkbox" id="addreminder" name="addreminder"><br><br>';
 
-        print '<div class="reminderparameters" style="display: none;">';
+		print '<div class="reminderparameters" style="display: none;">';
 
-        //print '<hr>';
-        //print load_fiche_titre($langs->trans("AddReminder"), '', '');
+		//print '<hr>';
+		//print load_fiche_titre($langs->trans("AddReminder"), '', '');
 
-        print '<table class="border centpercent">';
+		print '<table class="border centpercent">';
 
-        //Reminder
-        print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("ReminderTime").'</td><td colspan="3">';
-        print '<input type="number" name="offsetvalue" value="10" size="5">';
-        print '</td></tr>';
+		//Reminder
+		print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("ReminderTime").'</td><td colspan="3">';
+		print '<input class="width50" type="number" name="offsetvalue" value="'.(GETPOSTISSET('offsetvalue') ? GETPOST('offsetvalue', 'int') : '15').'"> ';
+		print $form->selectTypeDuration('offsetunit', 'i', array('y', 'm'));
+		print '</td></tr>';
 
-        //Time Type
-        print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("TimeType").'</td><td colspan="3">';
-        print $form->selectTypeDuration('offsetunit', 'i');
-        print '</td></tr>';
+		//Reminder Type
+		print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("ReminderType").'</td><td colspan="3">';
+		print $form->selectarray('selectremindertype', $TRemindTypes, '', 0, 0, 0, '', 0, 0, 0, '', 'mimnwidth200', 1);
+		print '</td></tr>';
 
-        //Reminder Type
-        print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("ReminderType").'</td><td colspan="3">';
-        print $form->selectarray('selectremindertype', $TRemindTypes);
-        print '</td></tr>';
-
-        //Mail Model
-        print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("EMailTemplates").'</td><td colspan="3">';
-        print $form->selectModelMail('actioncommsend', 'actioncomm_send', 1);
-        print '</td></tr>';
+		//Mail Model
+		print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("EMailTemplates").'</td><td colspan="3">';
+		print $form->selectModelMail('actioncommsend', 'actioncomm_send', 1, 1);
+		print '</td></tr>';
 
 
-        print '</table>';
-        print '</div>';
+		print '</table>';
+		print '</div>';
 
-        print "\n".'<script type="text/javascript">';
-        print '$(document).ready(function () {
+		print "\n".'<script type="text/javascript">';
+		print '$(document).ready(function () {
 	            		$("#addreminder").click(function(){
 	            		    if (this.checked) {
 	            		      $(".reminderparameters").show();
@@ -1292,18 +1283,18 @@ if ($action == 'create')
 	            		    };
 	            		});
                    })';
-        print '</script>'."\n";
-    }
+		print '</script>'."\n";
+	}
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="save" value="'.$langs->trans("Add").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 	if (empty($backtopage)) {
-		print '<input type="button" class="button" name="cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+		print '<input type="button" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 	} else {
-		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	}
 	print '</div>';
 
@@ -1331,7 +1322,7 @@ if ($id > 0)
 
 	if ($listUserAssignedUpdated || $donotclearsession)
 	{
-        $percentage = in_array(GETPOST('status'), array(-1, 100)) ?GETPOST('status') : (in_array(GETPOST('complete'), array(-1, 100)) ?GETPOST('complete') : GETPOST("percentage")); // If status is -1 or 100, percentage is not defined and we must use status
+		$percentage = in_array(GETPOST('status'), array(-1, 100)) ?GETPOST('status') : (in_array(GETPOST('complete'), array(-1, 100)) ?GETPOST('complete') : GETPOST("percentage")); // If status is -1 or 100, percentage is not defined and we must use status
 
 		$datep = dol_mktime($fulldayevent ? '00' : $aphour, $fulldayevent ? '00' : $apmin, 0, $_POST["apmonth"], $_POST["apday"], $_POST["apyear"]);
 		$datef = dol_mktime($fulldayevent ? '23' : $p2hour, $fulldayevent ? '59' : $p2min, $fulldayevent ? '59' : '0', $_POST["p2month"], $_POST["p2day"], $_POST["p2year"]);
@@ -1342,7 +1333,7 @@ if ($id > 0)
 		$object->datef       = $datef;
 		$object->percentage  = $percentage;
 		$object->priority    = GETPOST("priority", "alphanohtml");
-        $object->fulldayevent = GETPOST("fullday") ? 1 : 0;
+		$object->fulldayevent = GETPOST("fullday") ? 1 : 0;
 		$object->location    = GETPOST('location', "alpanohtml");
 		$object->socid       = GETPOST("socid", "int");
 		$socpeopleassigned   = GETPOST("socpeopleassigned", 'array');
@@ -1350,7 +1341,7 @@ if ($id > 0)
 		$object->contact_id   = GETPOST("contactid", 'int');
 		$object->fk_project  = GETPOST("projectid", 'int');
 
-		$object_private = GETPOST("note", 'restricthtml');
+		$object->note_private = GETPOST("note", 'restricthtml');
 	}
 
 	if ($result2 < 0 || $result3 < 0 || $result4 < 0 || $result5 < 0)
@@ -1380,10 +1371,10 @@ if ($id > 0)
 
 	if ($action == 'edit')
 	{
-	    if (!empty($conf->use_javascript_ajax))
-        {
-            print "\n".'<script type="text/javascript">';
-            print '$(document).ready(function () {
+		if (!empty($conf->use_javascript_ajax))
+		{
+			print "\n".'<script type="text/javascript">';
+			print '$(document).ready(function () {
 	            		function setdatefields()
 	            		{
 	            			if ($("#fullday:checked").val() == null) {
@@ -1403,8 +1394,8 @@ if ($id > 0)
 	            			setdatefields();
 	            		});
                    })';
-            print '</script>'."\n";
-        }
+			print '</script>'."\n";
+		}
 
 		print '<form name="formaction" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -1414,7 +1405,7 @@ if ($id > 0)
 		if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : htmlentities($_SERVER["HTTP_REFERER"])).'">';
 		if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) print '<input type="hidden" name="actioncode" value="'.$object->type_code.'">';
 
-		dol_fiche_head($head, 'card', $langs->trans("Action"), 0, 'action');
+		print dol_get_fiche_head($head, 'card', $langs->trans("Action"), 0, 'action');
 
 		print '<table class="border tableforfield" width="100%">';
 
@@ -1424,42 +1415,42 @@ if ($id > 0)
 		// Type of event
 		if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
 		{
-		    print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td colspan="3">';
-		    if ($object->type_code != 'AC_OTH_AUTO')
-		    {
-		    	$formactions->select_type_actions(GETPOST("actioncode", 'aZ09') ?GETPOST("actioncode", 'aZ09') : $object->type_code, "actioncode", "systemauto");
-		    } else {
-                print '<input type="hidden" name="actioncode" value="'.$object->type_code.'">'.$langs->trans("Action".$object->type_code);
-		    }
+			print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td colspan="3">';
+			if ($object->type_code != 'AC_OTH_AUTO')
+			{
+				$formactions->select_type_actions(GETPOST("actioncode", 'aZ09') ?GETPOST("actioncode", 'aZ09') : $object->type_code, "actioncode", "systemauto");
+			} else {
+				print '<input type="hidden" name="actioncode" value="'.$object->type_code.'">'.$langs->trans("Action".$object->type_code);
+			}
 			print '</td></tr>';
 		}
 
 		// Title
 		print '<tr><td class="fieldrequired">'.$langs->trans("Title").'</td><td colspan="3"><input type="text" name="label" class="soixantepercent" value="'.$object->label.'"></td></tr>';
 
-        // Full day event
-        print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td colspan="3"><input type="checkbox" id="fullday" name="fullday" '.($object->fulldayevent ? ' checked' : '').'></td></tr>';
+		// Full day event
+		print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td colspan="3"><input type="checkbox" id="fullday" name="fullday" '.($object->fulldayevent ? ' checked' : '').'></td></tr>';
 
 		// Date start
 		print '<tr><td class="nowrap"><span class="fieldrequired">'.$langs->trans("DateActionStart").' - '.$langs->trans("DateActionEnd").'</span></td><td colspan="3">';
 		if (GETPOST("afaire") == 1) {
-            print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 0, "action", 1, 1, 0, 'fulldaystart');
-        } elseif (GETPOST("afaire") == 2) {
-            print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 1, "action", 1, 1, 0, 'fulldaystart');
-        } else {
-            print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 1, "action", 1, 1, 0, 'fulldaystart');
-        }
-        print ' - ';
+			print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 0, "action", 1, 1, 0, 'fulldaystart');
+		} elseif (GETPOST("afaire") == 2) {
+			print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 1, "action", 1, 1, 0, 'fulldaystart');
+		} else {
+			print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 1, "action", 1, 1, 0, 'fulldaystart');
+		}
+		print ' - ';
 		if (GETPOST("afaire") == 1) {
-            print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend');
-        } elseif (GETPOST("afaire") == 2) {
-            print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend');
-        } else {
-            print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend');
-        }
+			print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend');
+		} elseif (GETPOST("afaire") == 2) {
+			print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend');
+		} else {
+			print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend');
+		}
 		print '</td></tr>';
 
-        // Dev in progress
+		// Dev in progress
 		$userepeatevent = ($conf->global->MAIN_FEATURES_LEVEL == 2 ? 1 : 0);
 		if ($userepeatevent)
 		{
@@ -1516,50 +1507,50 @@ if ($id > 0)
 		$formactions->form_select_status_action('formaction', $percent, 1, 'complete', 0, 0, 'maxwidth200');
 		print '</td></tr>';
 
-        // Location
-	    if (empty($conf->global->AGENDA_DISABLE_LOCATION))
-	    {
+		// Location
+		if (empty($conf->global->AGENDA_DISABLE_LOCATION))
+		{
 			print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3"><input type="text" name="location" class="soixantepercent" value="'.$object->location.'"></td></tr>';
-	    }
+		}
 
 		// Assigned to
-	    $listofuserid = array(); // User assigned
-	    if (empty($donotclearsession))
-	    {
-	    	if ($object->userownerid > 0)
-	    	{
-	    		$listofuserid[$object->userownerid] = array(
-	    			'id'=>$object->userownerid,
-	    			'type'=>'user',
-	    			//'transparency'=>$object->userassigned[$user->id]['transparency'],
-	    			'transparency'=>$object->transparency, // Force transparency on ownerfrom event
-	    			'answer_status'=>$object->userassigned[$object->userownerid]['answer_status'],
-	    			'mandatory'=>$object->userassigned[$object->userownerid]['mandatory']
-	    		);
-	    	}
-	    	if (!empty($object->userassigned))	// Now concat assigned users
-	    	{
-	    		// Restore array with key with same value than param 'id'
-	    		$tmplist1 = $object->userassigned;
-	    		foreach ($tmplist1 as $key => $val)
-	    		{
-	    			if ($val['id'] && $val['id'] != $object->userownerid)
-	    			{
-	    				$listofuserid[$val['id']] = $val;
-	    			}
-	    		}
-	    	}
-	    	$_SESSION['assignedtouser'] = json_encode($listofuserid);
-	    } else {
-	    	if (!empty($_SESSION['assignedtouser']))
-	    	{
-	    		$listofuserid = json_decode($_SESSION['assignedtouser'], true);
-	    	}
-	    }
-	    $listofcontactid = $object->socpeopleassigned; // Contact assigned
-	    $listofotherid = $object->otherassigned; // Other undefined email (not used yet)
+		$listofuserid = array(); // User assigned
+		if (empty($donotclearsession))
+		{
+			if ($object->userownerid > 0)
+			{
+				$listofuserid[$object->userownerid] = array(
+					'id'=>$object->userownerid,
+					'type'=>'user',
+					//'transparency'=>$object->userassigned[$user->id]['transparency'],
+					'transparency'=>$object->transparency, // Force transparency on ownerfrom event
+					'answer_status'=>$object->userassigned[$object->userownerid]['answer_status'],
+					'mandatory'=>$object->userassigned[$object->userownerid]['mandatory']
+				);
+			}
+			if (!empty($object->userassigned))	// Now concat assigned users
+			{
+				// Restore array with key with same value than param 'id'
+				$tmplist1 = $object->userassigned;
+				foreach ($tmplist1 as $key => $val)
+				{
+					if ($val['id'] && $val['id'] != $object->userownerid)
+					{
+						$listofuserid[$val['id']] = $val;
+					}
+				}
+			}
+			$_SESSION['assignedtouser'] = json_encode($listofuserid);
+		} else {
+			if (!empty($_SESSION['assignedtouser']))
+			{
+				$listofuserid = json_decode($_SESSION['assignedtouser'], true);
+			}
+		}
+		$listofcontactid = $object->socpeopleassigned; // Contact assigned
+		$listofotherid = $object->otherassigned; // Other undefined email (not used yet)
 
-	    print '<tr><td class="tdtop nowrap fieldrequired">'.$langs->trans("ActionAssignedTo").'</td><td colspan="3">';
+		print '<tr><td class="tdtop nowrap fieldrequired">'.$langs->trans("ActionAssignedTo").'</td><td colspan="3">';
 		print '<div class="assignedtouser">';
 		print $form->select_dolusers_forevent(($action == 'create' ? 'add' : 'update'), 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, 'AND u.statut != 0', 1, $listofuserid, $listofcontactid, $listofotherid);
 		print '</div>';
@@ -1579,7 +1570,7 @@ if ($id > 0)
 			print '</td></tr>';
 		}
 		// Tags-Categories
-        if ($conf->categorie->enabled) {
+		if ($conf->categorie->enabled) {
 			print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_ACTIONCOMM, '', 'parent', 64, 0, 1);
 			$c = new Categorie($db);
@@ -1588,7 +1579,7 @@ if ($id > 0)
 			foreach ($cats as $cat) {
 				$arrayselected[] = $cat->id;
 			}
-			print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
+			print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 			print "</td></tr>";
 		}
 
@@ -1639,7 +1630,7 @@ if ($id > 0)
 		}
 
 		// Priority
-		if (! empty($conf->global->AGENDA_SUPPORT_PRIORITY_IN_EVENTS)) {
+		if (!empty($conf->global->AGENDA_SUPPORT_PRIORITY_IN_EVENTS)) {
 			print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("Priority").'</td><td>';
 			print '<input type="text" name="priority" value="'.($object->priority ? $object->priority : '').'" size="5">';
 			print '</td></tr>';
@@ -1649,19 +1640,19 @@ if ($id > 0)
 		if (!empty($object->fk_element) && !empty($object->elementtype))
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-            print '<tr>';
+			print '<tr>';
 			print '<td>'.$langs->trans("LinkedObject").'</td>';
 
 			if ($object->elementtype == 'task' && !empty($conf->projet->enabled))
 			{
-			    print '<td id="project-task-input-container" >';
+				print '<td id="project-task-input-container" >';
 
 				$urloption = '?action=create&donotclearsession=1'; // we use create not edit for more flexibility
-			    $url = DOL_URL_ROOT.'/comm/action/card.php'.$urloption;
+				$url = DOL_URL_ROOT.'/comm/action/card.php'.$urloption;
 
-			    // update task list
-			    print "\n".'<script type="text/javascript" >';
-			    print '$(document).ready(function () {
+				// update task list
+				print "\n".'<script type="text/javascript" >';
+				print '$(document).ready(function () {
 	               $("#projectid").change(function () {
                         var url = "'.$url.'&projectid="+$("#projectid").val();
                         $.get(url, function(data) {
@@ -1670,36 +1661,36 @@ if ($id > 0)
                         })
                   });
                })';
-			    print '</script>'."\n";
+				print '</script>'."\n";
 
-			    $formproject->selectTasks((!empty($societe->id) ? $societe->id : -1), $object->fk_element, 'fk_element', 24, 0, 0, 1, 0, 0, 'maxwidth500', $object->fk_project);
-			    print '<input type="hidden" name="elementtype" value="'.$object->elementtype.'">';
+				$formproject->selectTasks((!empty($societe->id) ? $societe->id : -1), $object->fk_element, 'fk_element', 24, 0, 0, 1, 0, 0, 'maxwidth500', $object->fk_project);
+				print '<input type="hidden" name="elementtype" value="'.$object->elementtype.'">';
 
-			    print '</td>';
+				print '</td>';
 			} else {
-			    print '<td>';
-			    print dolGetElementUrl($object->fk_element, $object->elementtype, 1);
-			    print '<input type="hidden" name="fk_element" value="'.$object->fk_element.'">';
-			    print '<input type="hidden" name="elementtype" value="'.$object->elementtype.'">';
-			    print '</td>';
+				print '<td>';
+				print dolGetElementUrl($object->fk_element, $object->elementtype, 1);
+				print '<input type="hidden" name="fk_element" value="'.$object->fk_element.'">';
+				print '<input type="hidden" name="elementtype" value="'.$object->elementtype.'">';
+				print '</td>';
 			}
 
 			print '</tr>';
 		}
 
-        // Description
-        print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
-        // Editeur wysiwyg
-        require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-        $doleditor = new DolEditor('note', $object->note_private, '', 200, 'dolibarr_notes', 'In', true, true, $conf->fckeditor->enabled, ROWS_5, '90%');
-        $doleditor->Create();
-        print '</td></tr>';
+		// Description
+		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
+		// Editeur wysiwyg
+		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+		$doleditor = new DolEditor('note', $object->note_private, '', 200, 'dolibarr_notes', 'In', true, true, $conf->fckeditor->enabled, ROWS_5, '90%');
+		$doleditor->Create();
+		print '</td></tr>';
 
-        // Other attributes
-        $parameters = array();
-        $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-        if (empty($reshook))
+		// Other attributes
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		if (empty($reshook))
 		{
 			print $object->showOptionals($extrafields, 'edit', $parameters);
 		}
@@ -1729,36 +1720,31 @@ if ($id > 0)
 				$actionCommReminder->typeremind = 'email';
 			}
 
-			print '<tr><td>'.$langs->trans("AddReminder").'</td><td colspan="3"><input type="checkbox" id="addreminder" name="addreminder" '.$checked.'></td></tr>';
+			print '<label for="addreminder">'.$langs->trans("AddReminder").'</label> <input type="checkbox" id="addreminder" name="addreminder" '.$checked.'><br>';
 
 			print '<div class="reminderparameters" '.(empty($checked) ? 'style="display: none;"' : '').'>';
 
+			print '<br>';
+
 			print '<table class="border centpercent">';
 
-			//Reminder
+			// Reminder
 			print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("ReminderTime").'</td><td colspan="3">';
-			print '<input type="number" name="offsetvalue" value="'.$actionCommReminder->offsetvalue.'" size="5">';
+			print '<input type="number" name="offsetvalue" class="width50" value="'.$actionCommReminder->offsetvalue.'"> ';
+			print $form->selectTypeDuration('offsetunit', $actionCommReminder->offsetunit, array('y', 'm'));
 			print '</td></tr>';
 
-			//Time Type
-			print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("TimeType").'</td><td colspan="3">';
-			print $form->selectTypeDuration('offsetunit', $actionCommReminder->offsetunit);
-			print '</td></tr>';
-
-			//Reminder Type
-			$TRemindTypes = array();
-			if (!empty($conf->global->AGENDA_REMINDER_EMAIL)) $TRemindTypes['email'] = $langs->trans('EMail');
-			if (!empty($conf->global->AGENDA_REMINDER_BROWSER)) $TRemindTypes['browser'] = $langs->trans('BrowserPush');
+			// Reminder Type
 			print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("ReminderType").'</td><td colspan="3">';
-			print $form->selectarray('selectremindertype', $TRemindTypes, $actionCommReminder->typeremind);
+			print $form->selectarray('selectremindertype', $TRemindTypes, $actionCommReminder->typeremind, 0, 0, 0, '', 0, 0, 0, '', 'minwidth200', 1);
 			print '</td></tr>';
 
 			$hide = '';
 			if ($actionCommReminder->typeremind == 'browser') $hide = 'style="display:none;"';
 
-			//Mail Model
+			// Mail Model
 			print '<tr '.$hide.'><td class="titlefieldcreate nowrap">'.$langs->trans("EMailTemplates").'</td><td colspan="3">';
-			print $form->selectModelMail('actioncommsend', 'actioncomm_send', 1);
+			print $form->selectModelMail('actioncommsend', 'actioncomm_send', 1, 1);
 			print '</td></tr>';
 
 			print '</table>';
@@ -1784,19 +1770,21 @@ if ($id > 0)
 
                    })';
 			print '</script>'."\n";
+
+			print '</div>';		// End of div for reminderparameters
 		}
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
-		print '<input type="submit" class="button" name="edit" value="'.$langs->trans("Save").'">';
+		print '<input type="submit" class="button button-save" name="edit" value="'.$langs->trans("Save").'">';
 		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 
 		print '</form>';
 	} else {
-		dol_fiche_head($head, 'card', $langs->trans("Action"), -1, 'action');
+		print dol_get_fiche_head($head, 'card', $langs->trans("Action"), -1, 'action');
 
 
 		// Clone event
@@ -1836,46 +1824,46 @@ if ($id > 0)
 		// Project
 		if (!empty($conf->projet->enabled))
 		{
-		    $langs->load("projects");
-		    //$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-		    $morehtmlref .= $langs->trans('Project').' ';
-    		if ($user->rights->agenda->allactions->create ||
-	       	    (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create))
-		    {
-		        if ($action != 'classify') {
+			$langs->load("projects");
+			//$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+			$morehtmlref .= $langs->trans('Project').' ';
+			if ($user->rights->agenda->allactions->create ||
+		   		(($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create))
+			{
+				if ($action != 'classify') {
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-                }
-                if ($action == 'classify') {
-                    //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                    $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                    $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                    $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                    $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                    $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                    $morehtmlref .= '</form>';
-                } else {
-                    $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-                }
-		    } else {
-		        if (!empty($object->fk_project)) {
-		            $proj = new Project($db);
-		            $proj->fetch($object->fk_project);
-		            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-		            $morehtmlref .= $proj->ref;
-		            $morehtmlref .= '</a>';
-		            if ($proj->title) $morehtmlref .= ' - '.$proj->title;
-		        } else {
-		            $morehtmlref .= '';
-		        }
-		    }
+				}
+				if ($action == 'classify') {
+					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				if (!empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
+					if ($proj->title) $morehtmlref .= ' - '.$proj->title;
+				} else {
+					$morehtmlref .= '';
+				}
+			}
 		}
 		$morehtmlref .= '</div>';
 
 
 		dol_banner_tab($object, 'id', $linkback, ($user->socid ? 0 : 1), 'id', 'ref', $morehtmlref);
 
-	    print '<div class="fichecenter">';
-	    print '<div class="fichehalfleft">';
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
 
 		print '<div class="underbanner clearboth"></div>';
 
@@ -1888,8 +1876,8 @@ if ($id > 0)
 			print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td>'.$langs->trans($object->type).'</td></tr>';
 		}
 
-        // Full day event
-        print '<tr><td class="titlefield">'.$langs->trans("EventOnFullDay").'</td><td>'.yn($object->fulldayevent, 3).'</td></tr>';
+		// Full day event
+		print '<tr><td class="titlefield">'.$langs->trans("EventOnFullDay").'</td><td>'.yn($object->fulldayevent, 3).'</td></tr>';
 
 		$rowspan = 4;
 		if (empty($conf->global->AGENDA_DISABLE_LOCATION)) $rowspan++;
@@ -1904,19 +1892,19 @@ if ($id > 0)
 
 		// Date end
 		print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td>';
-        if (!$object->fulldayevent) print dol_print_date($object->datef, 'dayhour');
+		if (!$object->fulldayevent) print dol_print_date($object->datef, 'dayhour');
 		else print dol_print_date($object->datef, 'day');
 		if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now - $delay_warning)) print img_warning($langs->trans("Late"));
 		print '</td></tr>';
 
-        // Location
-	    if (empty($conf->global->AGENDA_DISABLE_LOCATION))
-    	{
+		// Location
+		if (empty($conf->global->AGENDA_DISABLE_LOCATION))
+		{
 			print '<tr><td>'.$langs->trans("Location").'</td><td>'.$object->location.'</td></tr>';
-    	}
+		}
 
 		// Assigned to
-    	print '<tr><td class="nowrap">'.$langs->trans("ActionAssignedTo").'</td><td>';
+		print '<tr><td class="nowrap">'.$langs->trans("ActionAssignedTo").'</td><td>';
 		$listofuserid = array();
 		if (empty($donotclearsession))
 		{
@@ -1954,8 +1942,6 @@ if ($id > 0)
 		/*
 		if ($object->datep != $object->datef && in_array($user->id,array_keys($listofuserid)))
 		{
-			//var_dump($object->userassigned);
-			//var_dump($listofuserid);
 			print '<div class="myavailability">';
 			print $langs->trans("MyAvailability").': '.(($object->userassigned[$user->id]['transparency'] > 0)?$langs->trans("Busy"):$langs->trans("Available"));	// We show nothing if event is assigned to nobody
 			print '</div>';
@@ -1994,8 +1980,8 @@ if ($id > 0)
 
 		if ($conf->societe->enabled)
 		{
-		    // Related company
-		    print '<tr><td class="titlefield">'.$langs->trans("ActionOnCompany").'</td><td>'.($object->thirdparty->id ? $object->thirdparty->getNomUrl(1) : ('<span class="opacitymedium">'.$langs->trans("None").'</span>'));
+			// Related company
+			print '<tr><td class="titlefield">'.$langs->trans("ActionOnCompany").'</td><td>'.($object->thirdparty->id ? $object->thirdparty->getNomUrl(1) : ('<span class="opacitymedium">'.$langs->trans("None").'</span>'));
 			if (is_object($object->thirdparty) && $object->thirdparty->id > 0 && $object->type_code == 'AC_TEL')
 			{
 				if ($object->thirdparty->fetch($object->thirdparty->id))
@@ -2057,43 +2043,43 @@ if ($id > 0)
 		print dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note_private));
 		print '</td></tr>';
 
-        // Other attributes
-        include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+		// Other attributes
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
-        // Reminders
-        if ($conf->global->AGENDA_REMINDER_EMAIL || $conf->global->AGENDA_REMINDER_BROWSER)
-        {
-        	$filtreuserid = $user->id;
-        	if ($user->rights->agenda->allactions->read) $filtreuserid = 0;
-        	$object->loadReminders('', $filteruserid, false);
+		// Reminders
+		if ($conf->global->AGENDA_REMINDER_EMAIL || $conf->global->AGENDA_REMINDER_BROWSER)
+		{
+			$filtreuserid = $user->id;
+			if ($user->rights->agenda->allactions->read) $filtreuserid = 0;
+			$object->loadReminders('', $filteruserid, false);
 
-        	print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("Reminders").'</td><td>';
+			print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("Reminders").'</td><td>';
 
-        	if (count($object->reminders) > 0) {
-        		$tmpuserstatic = new User($db);
+			if (count($object->reminders) > 0) {
+				$tmpuserstatic = new User($db);
 
-        		foreach ($object->reminders as $actioncommreminderid => $actioncommreminder) {
-        			print $TRemindTypes[$actioncommreminder->typeremind];
-        			if ($actioncommreminder->fk_user > 0) {
-        				$tmpuserstatic->fetch($actioncommreminder->fk_user);
-        				print ' ('.$tmpuserstatic->getNomUrl(0, '', 0, 0, 16).')';
-        			}
-        			print ' - '.$actioncommreminder->offsetvalue.' '.$TDurationTypes[$actioncommreminder->offsetunit];
-        			if ($actioncommreminder->status == $actioncommreminder::STATUS_TODO) {
-        				print ' - <span class="opacitymedium">';
-        				print $langs->trans("NotSent");
-        				print ' </span>';
-        			} elseif ($actioncommreminder->status == $actioncommreminder::STATUS_DONE) {
-        				print ' - <span class="opacitymedium">';
-        				print $langs->trans("Done");
-        				print ' </span>';
-        			}
-        			print '<br>';
-        		}
-        	}
+				foreach ($object->reminders as $actioncommreminderid => $actioncommreminder) {
+					print $TRemindTypes[$actioncommreminder->typeremind];
+					if ($actioncommreminder->fk_user > 0) {
+						$tmpuserstatic->fetch($actioncommreminder->fk_user);
+						print ' ('.$tmpuserstatic->getNomUrl(0, '', 0, 0, 16).')';
+					}
+					print ' - '.$actioncommreminder->offsetvalue.' '.$TDurationTypes[$actioncommreminder->offsetunit];
+					if ($actioncommreminder->status == $actioncommreminder::STATUS_TODO) {
+						print ' - <span class="opacitymedium">';
+						print $langs->trans("NotSent");
+						print ' </span>';
+					} elseif ($actioncommreminder->status == $actioncommreminder::STATUS_DONE) {
+						print ' - <span class="opacitymedium">';
+						print $langs->trans("Done");
+						print ' </span>';
+					}
+					print '<br>';
+				}
+			}
 
-        	print '</td></tr>';
-        }
+			print '</td></tr>';
+		}
 
 		print '</table>';
 
@@ -2101,7 +2087,7 @@ if ($id > 0)
 		print '</div>';
 		print '<div class="clearboth"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 	}
 
 
@@ -2150,26 +2136,26 @@ if ($id > 0)
 		if (empty($conf->global->AGENDA_DISABLE_BUILDDOC))
 		{
 			print '<div style="clear:both;"></div><div class="fichecenter"><div class="fichehalfleft">';
-            print '<a name="builddoc"></a>'; // ancre
+			print '<a name="builddoc"></a>'; // ancre
 
-            /*
+			/*
              * Documents generes
              */
 
-            $filedir = $conf->agenda->multidir_output[$conf->entity].'/'.$object->id;
-            $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+			$filedir = $conf->agenda->multidir_output[$conf->entity].'/'.$object->id;
+			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 
-            $genallowed = $user->rights->agenda->myactions->read;
-	        $delallowed = $user->rights->agenda->myactions->create;
+			$genallowed = $user->rights->agenda->myactions->read;
+			$delallowed = $user->rights->agenda->myactions->create;
 
 
-            print $formfile->showdocuments('actions', $object->id, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 0, 0, '', '', '', $object->default_lang);
+			print $formfile->showdocuments('actions', $object->id, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 0, 0, '', '', '', $object->default_lang);
 
 			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 
 			print '</div></div></div>';
-	    }
+		}
 	}
 }
 
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 97896448a3f..5a9b0afa336 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -524,7 +524,7 @@ class ActionComm extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."actioncomm", "id");
+			$this->ref = $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."actioncomm", "id");
 
 			// Now insert assigned users
 			if (!$error)
@@ -626,7 +626,7 @@ class ActionComm extends CommonObject
 		// Load source object
 		$objFrom = clone $this;
 
-		// Retreive all extrafield
+		// Retrieve all extrafield
 		// fetch optionals attributes and labels
 		$this->fetch_optionals();
 
@@ -1000,7 +1000,7 @@ class ActionComm extends CommonObject
 
 		// Clean parameters
 		$this->label = trim($this->label);
-		$this->note_private = dol_htmlcleanlastbr(trim(empty($this->note_private) ? $this->note : $this->note_private));
+		$this->note_private = dol_htmlcleanlastbr(trim(!isset($this->note_private) ? $this->note : $this->note_private));
 		if (empty($this->percentage))    $this->percentage = 0;
 		if (empty($this->priority) || !is_numeric($this->priority)) $this->priority = 0;
 		if (empty($this->transparency))  $this->transparency = 0;
@@ -1206,16 +1206,17 @@ class ActionComm extends CommonObject
 	 * Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
 	 * @param	User	$user   			Objet user
-	 * @param	int		$load_state_board	Charge indicateurs this->nb de tableau de bord
-	 * @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+	 * @param	int		$load_state_board	Load indicator array this->nb
+	 * @return WorkboardResponse|int 		<0 if KO, WorkboardResponse if OK
 	 */
 	public function load_board($user, $load_state_board = 0)
 	{
 		// phpcs:enable
 		global $conf, $langs;
 
-		if (empty($load_state_board)) $sql = "SELECT a.id, a.datep as dp";
-		else {
+		if (empty($load_state_board)) {
+			$sql = "SELECT a.id, a.datep as dp";
+		} else {
 			$this->nb = array();
 			$sql = "SELECT count(a.id) as nb";
 		}
@@ -1243,13 +1244,14 @@ class ActionComm extends CommonObject
 				$response->img = img_object('', "action", 'class="inline-block valigntextmiddle"');
 			}
 			// This assignment in condition is not a bug. It allows walking the results.
-			while ($obj = $this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				if (empty($load_state_board)) {
 					$response->nbtodo++;
 					$agenda_static->datep = $this->db->jdate($obj->dp);
 					if ($agenda_static->hasDelay()) $response->nbtodolate++;
-				} else $this->nb["actionscomm"] = $obj->nb;
+				} else {
+					$this->nb["actionscomm"] = $obj->nb;
+				}
 			}
 
 			$this->db->free($resql);
@@ -2052,6 +2054,7 @@ class ActionComm extends CommonObject
 		}
 
 		$now = dol_now();
+		$actionCommReminder = new ActionCommReminder($this->db);
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -2066,7 +2069,6 @@ class ActionComm extends CommonObject
 
 		if ($resql) {
 			$formmail = new FormMail($this->db);
-			$actionCommReminder = new ActionCommReminder($this->db);
 
 			while ($obj = $this->db->fetch_object($resql)) {
 				$res = $actionCommReminder->fetch($obj->id);
@@ -2075,16 +2077,15 @@ class ActionComm extends CommonObject
 					$errorsMsg[] = "Failed to load invoice ActionComm Reminder";
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					//Select email template
 					$arraymessage = $formmail->getEMailTemplate($this->db, 'actioncomm_send', $user, $langs, (!empty($actionCommReminder->fk_email_template)) ? $actionCommReminder->fk_email_template : -1, 1);
 
 					// Load event
 					$res = $this->fetch($actionCommReminder->fk_actioncomm);
-					if ($res > 0)
-					{
+					if ($res > 0) {
 						// PREPARE EMAIL
+						$errormesg = '';
 
 						// Make substitution in email content
 						$substitutionarray = getCommonSubstitutionArray($langs, 0, '', $this);
@@ -2100,43 +2101,65 @@ class ActionComm extends CommonObject
 						// Recipient
 						$recipient = new User($this->db);
 						$res = $recipient->fetch($actionCommReminder->fk_user);
-						if ($res > 0 && !empty($recipient->email)) $to = $recipient->email;
-						else {
-							$errorsMsg[] = "Failed to load recipient";
+						if ($res > 0) {
+							if (!empty($recipient->email)) {
+								$to = $recipient->email;
+							} else {
+								$errormesg = "Failed to send remind to user id=".$actionCommReminder->fk_user.". No email defined for user.";
+								$error++;
+							}
+						} else {
+							$errormesg = "Failed to load recipient with user id=".$actionCommReminder->fk_user;
 							$error++;
 						}
 
 						// Sender
 						$from = $conf->global->MAIN_MAIL_EMAIL_FROM;
 						if (empty($from)) {
-							$errorsMsg[] = "Failed to load recipient";
+							$errormesg = "Failed to get sender into global setup MAIN_MAIL_EMAIL_FROM";
 							$error++;
 						}
 
-						// Errors Recipient
-						$errors_to = $conf->global->MAIN_MAIL_ERRORS_TO;
+						if (!$error) {
+							// Errors Recipient
+							$errors_to = $conf->global->MAIN_MAIL_ERRORS_TO;
 
-						// Mail Creation
-						$cMailFile = new CMailFile($sendTopic, $to, $from, $sendContent, array(), array(), array(), '', "", 0, 1, $errors_to, '', '', '', '', '');
+							// Mail Creation
+							$cMailFile = new CMailFile($sendTopic, $to, $from, $sendContent, array(), array(), array(), '', "", 0, 1, $errors_to, '', '', '', '', '');
 
-						// Sending Mail
-						if ($cMailFile->sendfile())
-						{
+							// Sending Mail
+							if ($cMailFile->sendfile()) {
+								$nbMailSend++;
+							} else {
+								$errormesg = $cMailFile->error.' : '.$to;
+								$error++;
+							}
+						}
+
+						if (!$error) {
 							$actionCommReminder->status = $actionCommReminder::STATUS_DONE;
+
 							$res = $actionCommReminder->update($user);
-							if ($res < 0)
-							{
-								$errorsMsg[] = "Failed to update status of ActionComm Reminder";
+							if ($res < 0) {
+								$errorsMsg[] = "Failed to update status to done of ActionComm Reminder";
+								$error++;
+								break; // This is to avoid to have this error on all the selected email. If we fails here for one record, it may fails for others. We must solve first.
+							}
+						} else {
+							$actionCommReminder->status = $actionCommReminder::STATUS_ERROR;
+							$actionCommReminder->lasterror = dol_trunc($errormesg, 128, 'right', 'UTF-8', 1);
+
+							$res = $actionCommReminder->update($user);
+							if ($res < 0) {
+								$errorsMsg[] = "Failed to update status to error of ActionComm Reminder";
 								$error++;
 								break; // This is to avoid to have this error on all the selected email. If we fails here for one record, it may fails for others. We must solve first.
 							} else {
-								$nbMailSend++;
+								$errorsMsg[] = $errormesg;
 							}
-						} else {
-							$errorsMsg[] = $cMailFile->error.' : '.$to;
-							$error++;
 						}
 					} else {
+						$errorsMsg[] = 'Failed to fetch record actioncomm with ID = '.$actionCommReminder->fk_actioncomm;
 						$error++;
 					}
 				}
@@ -2145,11 +2168,11 @@ class ActionComm extends CommonObject
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Delete also very old past events (we do not keep more than 1 month record in past)
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm_reminder";
 			$sql .= " WHERE dateremind < '".$this->db->idate($now - (3600 * 24 * 32))."'";
+			$sql .= " AND status = ".$actionCommReminder::STATUS_DONE;
 			$resql = $this->db->query($sql);
 
 			if (!$resql) {
@@ -2162,9 +2185,8 @@ class ActionComm extends CommonObject
 			$this->output = 'Nb of emails sent : '.$nbMailSend;
 			$this->db->commit();
 			return 0;
-		}
-		else {
-			$this->db->rollback();
+		} else {
+			$this->db->commit(); // We commit also on error, to have the error message recorded.
 			$this->error = 'Nb of emails sent : '.$nbMailSend.', '.(!empty($errorsMsg)) ? join(', ', $errorsMsg) : $error;
 			return $error;
 		}
diff --git a/htdocs/comm/action/class/actioncommreminder.class.php b/htdocs/comm/action/class/actioncommreminder.class.php
index 16384edfcde..0f43dae13f8 100644
--- a/htdocs/comm/action/class/actioncommreminder.class.php
+++ b/htdocs/comm/action/class/actioncommreminder.class.php
@@ -52,6 +52,7 @@ class ActionCommReminder extends CommonObject
 
 	const STATUS_TODO = 0;
 	const STATUS_DONE = 1;
+	const STATUS_ERROR = -1;
 
 
 	/**
@@ -77,15 +78,16 @@ class ActionCommReminder extends CommonObject
 	 */
 	public $fields = array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-1, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
-        'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,),
-        'dateremind' => array('type'=>'datetime', 'label'=>'DateRemind', 'visible'=>1, 'enabled'=>1, 'position'=>60, 'notnull'=>1, 'index'=>1,),
+		'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,),
+		'dateremind' => array('type'=>'datetime', 'label'=>'DateRemind', 'visible'=>1, 'enabled'=>1, 'position'=>60, 'notnull'=>1, 'index'=>1,),
 		'typeremind' => array('type'=>'varchar(32)', 'label'=>'TypeRemind', 'visible'=>-1, 'enabled'=>1, 'position'=>55, 'notnull'=>1, 'comment'=>"email, browser, sms",),
 		'fk_user' => array('type'=>'integer', 'label'=>'User', 'visible'=>-1, 'enabled'=>1, 'position'=>65, 'notnull'=>1, 'index'=>1,),
 		'offsetvalue' => array('type'=>'integer', 'label'=>'OffsetValue', 'visible'=>1, 'enabled'=>1, 'position'=>56, 'notnull'=>1,),
 		'offsetunit' => array('type'=>'varchar(1)', 'label'=>'OffsetUnit', 'visible'=>1, 'enabled'=>1, 'position'=>57, 'notnull'=>1, 'comment'=>"y, m, d, w, h, i",),
 		'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>58, 'notnull'=>1, 'default'=>0, 'index'=>0, 'arrayofkeyval'=>array('0'=>'ToDo', '1'=>'Done')),
-		'fk_actioncomm' => array('type'=>'integer', 'label'=>'Project', 'visible'=>1, 'enabled'=>1, 'position'=>59, 'notnull'=>1, 'index'=>1,),
-		'fk_email_template' => array('type'=>'integer', 'label'=>'EmailTemplate', 'visible'=>1, 'enabled'=>1, 'position'=>60, 'notnull'=>0),
+		'lasterror' => array('type'=>'varchar(128)', 'label'=>'LastError', 'visible'=>-1, 'enabled'=>1, 'position'=>59, 'index'=>0),
+		'fk_actioncomm' => array('type'=>'integer', 'label'=>'Project', 'visible'=>1, 'enabled'=>1, 'position'=>70, 'notnull'=>1, 'index'=>1,),
+		'fk_email_template' => array('type'=>'integer', 'label'=>'EmailTemplate', 'visible'=>1, 'enabled'=>1, 'position'=>80, 'notnull'=>0),
 	);
 
 	/**
@@ -93,10 +95,10 @@ class ActionCommReminder extends CommonObject
 	 */
 	public $rowid;
 
-    /**
-     * @var int Entity
-     */
-    public $entity;
+	/**
+	 * @var int Entity
+	 */
+	public $entity;
 
 	public $dateremind;
 	public $typeremind;
@@ -114,6 +116,11 @@ class ActionCommReminder extends CommonObject
 	 */
 	public $status;
 
+	/**
+	 * @var string Last error message
+	 */
+	public $lasterror;
+
 	/**
 	 * @var int Project
 	 */
@@ -204,7 +211,7 @@ class ActionCommReminder extends CommonObject
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return the status
 	 *
@@ -214,34 +221,22 @@ class ActionCommReminder extends CommonObject
 	 */
 	public static function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
-		if ($mode == 0 || $mode == 1)
-		{
-			if ($status == 1) return $langs->trans('Done');
-			elseif ($status == 0) return $langs->trans('ToDo');
-		} elseif ($mode == 2)
-		{
-			if ($status == 1) return img_picto($langs->trans('Done'), 'statut4').' '.$langs->trans('Done');
-			elseif ($status == 0) return img_picto($langs->trans('ToDo'), 'statut5').' '.$langs->trans('ToDo');
-		} elseif ($mode == 3)
-		{
-			if ($status == 1) return img_picto($langs->trans('Done'), 'statut4');
-			elseif ($status == 0) return img_picto($langs->trans('ToDo'), 'statut5');
-		} elseif ($mode == 4)
-		{
-			if ($status == 1) return img_picto($langs->trans('Done'), 'statut4').' '.$langs->trans('Done');
-			elseif ($status == 0) return img_picto($langs->trans('ToDo'), 'statut5').' '.$langs->trans('ToDo');
-		} elseif ($mode == 5)
-		{
-			if ($status == 1) return $langs->trans('Done').' '.img_picto($langs->trans('Done'), 'statut4');
-			elseif ($status == 0) return $langs->trans('ToDo').' '.img_picto($langs->trans('ToDo'), 'statut5');
-		} elseif ($mode == 6)
-		{
-			if ($status == 1) return $langs->trans('Done').' '.img_picto($langs->trans('Done'), 'statut4');
-			elseif ($status == 0) return $langs->trans('ToDo').' '.img_picto($langs->trans('ToDo'), 'statut5');
-		}
+		$labelStatus = $langs->trans('ToDo');
+		if ($status == 1) $labelStatus = $langs->trans('Done');
+		elseif ($status == -1) $labelStatus = $langs->trans('Error');
+
+		$labelStatusShort = $langs->trans('ToDo');
+		if ($status == 1) $labelStatus = $langs->trans('Done');
+		elseif ($status == -1) $labelStatus = $langs->trans('Error');
+
+		$statusType = 'status5';
+		if ($status == 1) $statusType = 'status4';
+		elseif ($status == -1) $statusType = 'status8';
+
+		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
 	}
 
 	/**
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index 473c87e22a0..ca551c51e50 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -29,361 +29,361 @@
 class AgendaEvents extends DolibarrApi
 {
 
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+	);
 
-    /**
-     * @var ActionComm $actioncomm {@type ActionComm}
-     */
-    public $actioncomm;
+	/**
+	 * @var ActionComm $actioncomm {@type ActionComm}
+	 */
+	public $actioncomm;
 
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-        $this->actioncomm = new ActionComm($this->db);
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->actioncomm = new ActionComm($this->db);
+	}
 
-    /**
-     * Get properties of a Agenda Events object
-     *
-     * Return an array with Agenda Events informations
-     *
-     * @param       int         $id         ID of Agenda Events
-     * @return 	    array|mixed             Data without useless information
-     *
-     * @throws 	RestException
-     */
-    public function get($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->agenda->myactions->read) {
-            throw new RestException(401, "Insufficient rights to read an event");
-        }
-        if ($id == 0) {
-            $result = $this->actioncomm->initAsSpecimen();
-        } else {
-            $result = $this->actioncomm->fetch($id);
-            if ($result) {
-                $this->actioncomm->fetch_optionals();
-                $this->actioncomm->fetchObjectLinked();
-            }
-        }
-        if (!$result) {
-            throw new RestException(404, 'Agenda Events not found');
-        }
+	/**
+	 * Get properties of a Agenda Events object
+	 *
+	 * Return an array with Agenda Events informations
+	 *
+	 * @param       int         $id         ID of Agenda Events
+	 * @return 	    array|mixed             Data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->agenda->myactions->read) {
+			throw new RestException(401, "Insufficient rights to read an event");
+		}
+		if ($id == 0) {
+			$result = $this->actioncomm->initAsSpecimen();
+		} else {
+			$result = $this->actioncomm->fetch($id);
+			if ($result) {
+				$this->actioncomm->fetch_optionals();
+				$this->actioncomm->fetchObjectLinked();
+			}
+		}
+		if (!$result) {
+			throw new RestException(404, 'Agenda Events not found');
+		}
 
-        if (!DolibarrApiAccess::$user->rights->agenda->allactions->read && $this->actioncomm->userownerid != DolibarrApiAccess::$user->id) {
-            throw new RestException(401, "Insufficient rights to read event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
-        }
+		if (!DolibarrApiAccess::$user->rights->agenda->allactions->read && $this->actioncomm->userownerid != DolibarrApiAccess::$user->id) {
+			throw new RestException(401, "Insufficient rights to read event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('agenda', $this->actioncomm->id, 'actioncomm', '', 'fk_soc', 'id')) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        return $this->_cleanObjectDatas($this->actioncomm);
-    }
+		if (!DolibarrApi::_checkAccessToResource('agenda', $this->actioncomm->id, 'actioncomm', '', 'fk_soc', 'id')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		return $this->_cleanObjectDatas($this->actioncomm);
+	}
 
-    /**
-     * List Agenda Events
-     *
-     * Get a list of Agenda Events
-     *
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     * @param string   	$user_ids   User ids filter field (owners of event). Example: '1' or '1,2,3'          {@pattern /^[0-9,]*$/i}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'%dol%') and (t.datec:<:'20160101')"
-     * @return  array               Array of Agenda Events objects
-     */
-    public function index($sortfield = "t.id", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = 0, $sqlfilters = '')
-    {
-        global $db, $conf;
+	/**
+	 * List Agenda Events
+	 *
+	 * Get a list of Agenda Events
+	 *
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
+	 * @param string   	$user_ids   User ids filter field (owners of event). Example: '1' or '1,2,3'          {@pattern /^[0-9,]*$/i}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'%dol%') and (t.datec:<:'20160101')"
+	 * @return  array               Array of Agenda Events objects
+	 */
+	public function index($sortfield = "t.id", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        if (!DolibarrApiAccess::$user->rights->agenda->myactions->read) {
-            throw new RestException(401, "Insufficient rights to read events");
-        }
+		if (!DolibarrApiAccess::$user->rights->agenda->myactions->read) {
+			throw new RestException(401, "Insufficient rights to read events");
+		}
 
-        // case of external user
-        $socid = 0;
-        if (!empty(DolibarrApiAccess::$user->socid)) $socid = DolibarrApiAccess::$user->socid;
+		// case of external user
+		$socid = 0;
+		if (!empty(DolibarrApiAccess::$user->socid)) $socid = DolibarrApiAccess::$user->socid;
 
-        // If the internal user must only see his customers, force searching by him
-        $search_sale = 0;
-        if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
-        if (empty($conf->societe->enabled)) $search_sale = 0; // If module thirdparty not enabled, sale representative is something that does not exists
+		// If the internal user must only see his customers, force searching by him
+		$search_sale = 0;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
+		if (empty($conf->societe->enabled)) $search_sale = 0; // If module thirdparty not enabled, sale representative is something that does not exists
 
-        $sql = "SELECT t.id as rowid";
-        if (!empty($conf->societe->enabled))
-            if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as t";
-        if (!empty($conf->societe->enabled))
-            if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
-        $sql .= ' WHERE t.entity IN ('.getEntity('agenda').')';
-        if (!empty($conf->societe->enabled))
-            if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-        if ($user_ids) $sql .= " AND t.fk_user_action IN (".$user_ids.")";
-        if ($socid > 0) $sql .= " AND t.fk_soc = ".$socid;
-        // Insert sale filter
-        if ($search_sale > 0)
-        {
-            $sql .= " AND sc.fk_user = ".$search_sale;
-        }
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		$sql = "SELECT t.id as rowid";
+		if (!empty($conf->societe->enabled))
+			if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as t";
+		if (!empty($conf->societe->enabled))
+			if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		$sql .= ' WHERE t.entity IN ('.getEntity('agenda').')';
+		if (!empty($conf->societe->enabled))
+			if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
+		if ($user_ids) $sql .= " AND t.fk_user_action IN (".$user_ids.")";
+		if ($socid > 0) $sql .= " AND t.fk_soc = ".$socid;
+		// Insert sale filter
+		if ($search_sale > 0)
+		{
+			$sql .= " AND sc.fk_user = ".$search_sale;
+		}
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        $result = $this->db->query($sql);
+		$result = $this->db->query($sql);
 
-        if ($result)
-        {
-            $i = 0;
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
-            	$obj = $this->db->fetch_object($result);
-            	$actioncomm_static = new ActionComm($this->db);
-                if ($actioncomm_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($actioncomm_static);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve Agenda Event list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No Agenda Event found');
-        }
-        return $obj_ret;
-    }
+		if ($result)
+		{
+			$i = 0;
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min)
+			{
+				$obj = $this->db->fetch_object($result);
+				$actioncomm_static = new ActionComm($this->db);
+				if ($actioncomm_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($actioncomm_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve Agenda Event list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No Agenda Event found');
+		}
+		return $obj_ret;
+	}
 
-    /**
-     * Create Agenda Event object
-     *
-     * @param   array   $request_data   Request data
-     * @return  int                     ID of Agenda Event
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->agenda->myactions->create) {
-            throw new RestException(401, "Insufficient rights to create your Agenda Event");
-        }
-        if (!DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
-            throw new RestException(401, "Insufficient rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
-        }
+	/**
+	 * Create Agenda Event object
+	 *
+	 * @param   array   $request_data   Request data
+	 * @return  int                     ID of Agenda Event
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->agenda->myactions->create) {
+			throw new RestException(401, "Insufficient rights to create your Agenda Event");
+		}
+		if (!DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
+			throw new RestException(401, "Insufficient rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
+		}
 
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        foreach ($request_data as $field => $value) {
-            $this->actioncomm->$field = $value;
-        }
-        /*if (isset($request_data["lines"])) {
+		foreach ($request_data as $field => $value) {
+			$this->actioncomm->$field = $value;
+		}
+		/*if (isset($request_data["lines"])) {
           $lines = array();
           foreach ($request_data["lines"] as $line) {
             array_push($lines, (object) $line);
           }
           $this->expensereport->lines = $lines;
         }*/
-        if ($this->actioncomm->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, "Error creating event", array_merge(array($this->actioncomm->error), $this->actioncomm->errors));
-        }
+		if ($this->actioncomm->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, "Error creating event", array_merge(array($this->actioncomm->error), $this->actioncomm->errors));
+		}
 
-        return $this->actioncomm->id;
-    }
+		return $this->actioncomm->id;
+	}
 
 
-    /**
-     * Update Agenda Event general fields
-     *
-     * @param int   $id             Id of Agenda Event to update
-     * @param array $request_data   Datas
-     *
-     * @return int
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->agenda->myactions->create) {
-            throw new RestException(401, "Insufficient rights to create your Agenda Event");
-        }
-        if (!DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
-            throw new RestException(401, "Insufficient rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
-        }
+	/**
+	 * Update Agenda Event general fields
+	 *
+	 * @param int   $id             Id of Agenda Event to update
+	 * @param array $request_data   Datas
+	 *
+	 * @return int
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->agenda->myactions->create) {
+			throw new RestException(401, "Insufficient rights to create your Agenda Event");
+		}
+		if (!DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
+			throw new RestException(401, "Insufficient rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
+		}
 
-        $result = $this->actioncomm->fetch($id);
-        if ($result) {
-            $this->actioncomm->fetch_optionals();
-            $this->actioncomm->fetch_userassigned();
-            $this->actioncomm->oldcopy = clone $this->actioncomm;
-        }
-        if (!$result) {
-            throw new RestException(404, 'actioncomm not found');
-        }
+		$result = $this->actioncomm->fetch($id);
+		if ($result) {
+			$this->actioncomm->fetch_optionals();
+			$this->actioncomm->fetch_userassigned();
+			$this->actioncomm->oldcopy = clone $this->actioncomm;
+		}
+		if (!$result) {
+			throw new RestException(404, 'actioncomm not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('actioncomm', $this->actioncomm->id, 'actioncomm', '', 'fk_soc', 'id')) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $this->actioncomm->$field = $value;
-        }
+		if (!DolibarrApi::_checkAccessToResource('actioncomm', $this->actioncomm->id, 'actioncomm', '', 'fk_soc', 'id')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$this->actioncomm->$field = $value;
+		}
 
-        if ($this->actioncomm->update(DolibarrApiAccess::$user, 1) > 0)
-            return $this->get($id);
+		if ($this->actioncomm->update(DolibarrApiAccess::$user, 1) > 0)
+			return $this->get($id);
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Delete Agenda Event
-     *
-     * @param   int     $id         Agenda Event ID
-     *
-     * @return  array
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->agenda->myactions->delete) {
-            throw new RestException(401, "Insufficient rights to delete your Agenda Event");
-        }
+	/**
+	 * Delete Agenda Event
+	 *
+	 * @param   int     $id         Agenda Event ID
+	 *
+	 * @return  array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->agenda->myactions->delete) {
+			throw new RestException(401, "Insufficient rights to delete your Agenda Event");
+		}
 
-        $result = $this->actioncomm->fetch($id);
-        if ($result) {
-            $this->actioncomm->fetch_optionals();
-            $this->actioncomm->fetch_userassigned();
-            $this->actioncomm->oldcopy = clone $this->actioncomm;
-        }
+		$result = $this->actioncomm->fetch($id);
+		if ($result) {
+			$this->actioncomm->fetch_optionals();
+			$this->actioncomm->fetch_userassigned();
+			$this->actioncomm->oldcopy = clone $this->actioncomm;
+		}
 
-        if (!DolibarrApiAccess::$user->rights->agenda->allactions->delete && DolibarrApiAccess::$user->id != $this->actioncomm->userownerid) {
-            throw new RestException(401, "Insufficient rights to delete an Agenda Event of owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
-        }
+		if (!DolibarrApiAccess::$user->rights->agenda->allactions->delete && DolibarrApiAccess::$user->id != $this->actioncomm->userownerid) {
+			throw new RestException(401, "Insufficient rights to delete an Agenda Event of owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
+		}
 
-        if (!$result) {
-            throw new RestException(404, 'Agenda Event not found');
-        }
+		if (!$result) {
+			throw new RestException(404, 'Agenda Event not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('actioncomm', $this->actioncomm->id, 'actioncomm', '', 'fk_soc', 'id')) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('actioncomm', $this->actioncomm->id, 'actioncomm', '', 'fk_soc', 'id')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if (!$this->actioncomm->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(500, 'Error when delete Agenda Event : '.$this->actioncomm->error);
-        }
+		if (!$this->actioncomm->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(500, 'Error when delete Agenda Event : '.$this->actioncomm->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Agenda Event deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Agenda Event deleted'
+			)
+		);
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param   array           $data   Array with data to verify
-     * @return  array
-     * @throws  RestException
-     */
-    private function _validate($data)
-    {
-        $event = array();
-        foreach (AgendaEvents::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $event[$field] = $data[$field];
-        }
-        return $event;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param   array           $data   Array with data to verify
+	 * @return  array
+	 * @throws  RestException
+	 */
+	private function _validate($data)
+	{
+		$event = array();
+		foreach (AgendaEvents::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$event[$field] = $data[$field];
+		}
+		return $event;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param	object	$object		Object to clean
-     * @return	array				Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->note); // alreaydy into note_private
-        unset($object->usermod);
-        unset($object->libelle);
-        unset($object->context);
-        unset($object->canvas);
-        unset($object->contact);
-        unset($object->contact_id);
-        unset($object->thirdparty);
-        unset($object->user);
-        unset($object->origin);
-        unset($object->origin_id);
-        unset($object->ref_ext);
-        unset($object->statut);
-        unset($object->state_code);
-        unset($object->state_id);
-        unset($object->state);
-        unset($object->region);
-        unset($object->region_code);
-        unset($object->country);
-        unset($object->country_id);
-        unset($object->country_code);
-        unset($object->barcode_type);
-        unset($object->barcode_type_code);
-        unset($object->barcode_type_label);
-        unset($object->barcode_type_coder);
-        unset($object->mode_reglement_id);
-        unset($object->cond_reglement_id);
-        unset($object->cond_reglement);
-        unset($object->fk_delivery_address);
-        unset($object->shipping_method_id);
-        unset($object->fk_account);
-        unset($object->total_ht);
-        unset($object->total_tva);
-        unset($object->total_localtax1);
-        unset($object->total_localtax2);
-        unset($object->total_ttc);
-        unset($object->fk_incoterms);
-        unset($object->label_incoterms);
-        unset($object->location_incoterms);
-        unset($object->name);
-        unset($object->lastname);
-        unset($object->firstname);
-        unset($object->civility_id);
-        unset($object->contact);
-        unset($object->societe);
+		unset($object->note); // alreaydy into note_private
+		unset($object->usermod);
+		unset($object->libelle);
+		unset($object->context);
+		unset($object->canvas);
+		unset($object->contact);
+		unset($object->contact_id);
+		unset($object->thirdparty);
+		unset($object->user);
+		unset($object->origin);
+		unset($object->origin_id);
+		unset($object->ref_ext);
+		unset($object->statut);
+		unset($object->state_code);
+		unset($object->state_id);
+		unset($object->state);
+		unset($object->region);
+		unset($object->region_code);
+		unset($object->country);
+		unset($object->country_id);
+		unset($object->country_code);
+		unset($object->barcode_type);
+		unset($object->barcode_type_code);
+		unset($object->barcode_type_label);
+		unset($object->barcode_type_coder);
+		unset($object->mode_reglement_id);
+		unset($object->cond_reglement_id);
+		unset($object->cond_reglement);
+		unset($object->fk_delivery_address);
+		unset($object->shipping_method_id);
+		unset($object->fk_account);
+		unset($object->total_ht);
+		unset($object->total_tva);
+		unset($object->total_localtax1);
+		unset($object->total_localtax2);
+		unset($object->total_ttc);
+		unset($object->fk_incoterms);
+		unset($object->label_incoterms);
+		unset($object->location_incoterms);
+		unset($object->name);
+		unset($object->lastname);
+		unset($object->firstname);
+		unset($object->civility_id);
+		unset($object->contact);
+		unset($object->societe);
 
-        unset($object->actions);
-        unset($object->lines);
+		unset($object->actions);
+		unset($object->lines);
 
-        return $object;
-    }
+		return $object;
+	}
 }
diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
index 6e86a556a1a..3b932b2f59c 100644
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -28,201 +28,226 @@
  */
 class CActionComm
 {
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
-     * @var int ID
-     */
-    public $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
 
-    public $code;
-    public $type;
-    public $libelle; // deprecated
+	/**
+	 * @var string code
+	 */
+	public $code;
 
-    /**
-     * @var string Type of agenda event label
-     */
-    public $label;
+	/**
+	 * @var string type
+	 */
+	public $type;
 
-    public $active;
-    public $color;
+	/**
+	 * @var string label
+	 * @deprecated
+	 * @see $label
+	 */
+	public $libelle;
 
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto;
+	/**
+	 * @var string Type of agenda event label
+	 */
+	public $label;
 
-    public $type_actions = array();
+	/**
+	 * @var int active
+	 */
+	public $active;
+
+	/**
+	 * @var string color hex
+	 */
+	public $color;
+
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto;
+
+	/**
+	 * @var array array of type_actions
+	 */
+	public $type_actions = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param	DoliDB		$db		Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param	DoliDB		$db		Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
-    /**
-     *  Load action type from database
-     *
-     *  @param  int     $id     id or code of action type to read
-     *  @return int             1=ok, 0=not found, -1=error
-     */
-    public function fetch($id)
-    {
-        $sql = "SELECT id, code, type, libelle as label, color, active, picto";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm";
-        if (is_numeric($id)) $sql .= " WHERE id=".$id;
-        else $sql .= " WHERE code='".$this->db->escape($id)."'";
+	/**
+	 *  Load action type from database
+	 *
+	 *  @param  int|string	$id     id or code of action type to read
+	 *  @return int             	1=ok, 0=not found, -1=error
+	 */
+	public function fetch($id)
+	{
+		$sql = "SELECT id, code, type, libelle as label, color, active, picto";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm";
+		if (is_numeric($id)) $sql .= " WHERE id=".(int) $id;
+		else $sql .= " WHERE code='".$this->db->escape($id)."'";
 
-        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id      = $obj->id;
-                $this->code    = $obj->code;
-                $this->type    = $obj->type;
-                $this->libelle = $obj->label; // deprecated
-                $this->label   = $obj->label;
-                $this->active  = $obj->active;
-                $this->color   = $obj->color;
+				$this->id      = $obj->id;
+				$this->code    = $obj->code;
+				$this->type    = $obj->type;
+				$this->libelle = $obj->label; // deprecated
+				$this->label   = $obj->label;
+				$this->active  = $obj->active;
+				$this->color   = $obj->color;
 
-                $this->db->free($resql);
-                return 1;
-            } else {
-                $this->db->free($resql);
-                return 0;
-            }
-        } else {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+				$this->db->free($resql);
+				return 1;
+			} else {
+				$this->db->free($resql);
+				return 0;
+			}
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return list of event types: array(id=>label) or array(code=>label)
-     *
-     *  @param  string|int  $active         1 or 0 to filter on event state active or not ('' by default = no filter)
-     *  @param  string      $idorcode       'id' or 'code'
-     *  @param  string      $excludetype    Type to exclude ('system' or 'systemauto')
-     *  @param  int         $onlyautoornot  1=Group all type AC_XXX into 1 line AC_MANUAL. 0=Keep details of type, -1=Keep details and add a combined line "All manual"
-     *  @param  string      $morefilter     Add more SQL filter
-     *  @param  int         $shortlabel     1=Get short label instead of long label
-     *  @return mixed                       Array of all event types if OK, <0 if KO. Key of array is id or code depending on parameter $idorcode.
-     */
-    public function liste_array($active = '', $idorcode = 'id', $excludetype = '', $onlyautoornot = 0, $morefilter = '', $shortlabel = 0)
-    {
-        // phpcs:enable
-        global $langs, $conf;
-        $langs->load("commercial");
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return list of event types: array(id=>label) or array(code=>label)
+	 *
+	 *  @param  string|int  $active         1 or 0 to filter on event state active or not ('' by default = no filter)
+	 *  @param  string      $idorcode       'id' or 'code'
+	 *  @param  string      $excludetype    Type to exclude ('system' or 'systemauto')
+	 *  @param  int         $onlyautoornot  1=Group all type AC_XXX into 1 line AC_MANUAL. 0=Keep details of type, -1=Keep details and add a combined line "All manual"
+	 *  @param  string      $morefilter     Add more SQL filter
+	 *  @param  int         $shortlabel     1=Get short label instead of long label
+	 *  @return mixed                       Array of all event types if OK, <0 if KO. Key of array is id or code depending on parameter $idorcode.
+	 */
+	public function liste_array($active = '', $idorcode = 'id', $excludetype = '', $onlyautoornot = 0, $morefilter = '', $shortlabel = 0)
+	{
+		// phpcs:enable
+		global $langs, $conf;
+		$langs->load("commercial");
 
-        $repid = array();
-        $repcode = array();
+		$repid = array();
+		$repcode = array();
 
-        $sql = "SELECT id, code, libelle as label, module, type, color, picto";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm";
-        $sql .= " WHERE 1=1";
-        if ($active != '') $sql .= " AND active=".$active;
-        if (!empty($excludetype)) $sql .= " AND type <> '".$this->db->escape($excludetype)."'";
-        if ($morefilter) $sql .= " AND ".$morefilter;
-        $sql .= " ORDER BY module, position, type";
+		$sql = "SELECT id, code, libelle as label, module, type, color, picto";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm";
+		$sql .= " WHERE 1=1";
+		if ($active != '') {
+			$sql .= " AND active=".(int) $active;
+		}
+		if (!empty($excludetype)) $sql .= " AND type <> '".$this->db->escape($excludetype)."'";
+		if ($morefilter) $sql .= " AND ".$morefilter;
+		$sql .= " ORDER BY module, position, type";
 
-        dol_syslog(get_class($this)."::liste_array", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $nump = $this->db->num_rows($resql);
-            if ($nump)
-            {
-                $i = 0;
-                while ($i < $nump)
-                {
-                    $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::liste_array", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$nump = $this->db->num_rows($resql);
+			if ($nump)
+			{
+				$i = 0;
+				while ($i < $nump)
+				{
+					$obj = $this->db->fetch_object($resql);
 
-                    $qualified = 1;
+					$qualified = 1;
 
-                    // $obj->type can be system, systemauto, module, moduleauto, xxx, xxxauto
-                    if ($qualified && $onlyautoornot > 0 && preg_match('/^system/', $obj->type) && !preg_match('/^AC_OTH/', $obj->code)) $qualified = 0; // We discard detailed system events. We keep only the 2 generic lines (AC_OTH and AC_OTH_AUTO)
+					// $obj->type can be system, systemauto, module, moduleauto, xxx, xxxauto
+					if ($qualified && $onlyautoornot > 0 && preg_match('/^system/', $obj->type) && !preg_match('/^AC_OTH/', $obj->code)) $qualified = 0; // We discard detailed system events. We keep only the 2 generic lines (AC_OTH and AC_OTH_AUTO)
 
-                    if ($qualified && $obj->module)
-                    {
-                        if ($obj->module == 'invoice' && !$conf->facture->enabled)	$qualified=0;
-                        if ($obj->module == 'order'   && !$conf->commande->enabled) $qualified=0;
-                        if ($obj->module == 'propal'  && !$conf->propal->enabled)	  $qualified=0;
-                        if ($obj->module == 'invoice_supplier' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || ! $conf->supplier_invoice->enabled))	$qualified=0;
-                        if ($obj->module == 'order_supplier'   && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || ! $conf->supplier_order->enabled))	$qualified=0;
-                        if ($obj->module == 'shipping' && !$conf->expedition->enabled)	 $qualified=0;
-                    }
+					if ($qualified && $obj->module)
+					{
+						if ($obj->module == 'invoice' && !$conf->facture->enabled)	$qualified = 0;
+						if ($obj->module == 'order' && !$conf->commande->enabled) $qualified = 0;
+						if ($obj->module == 'propal' && !$conf->propal->enabled)	  $qualified = 0;
+						if ($obj->module == 'invoice_supplier' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !$conf->supplier_invoice->enabled))	$qualified = 0;
+						if ($obj->module == 'order_supplier' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !$conf->supplier_order->enabled))	$qualified = 0;
+						if ($obj->module == 'shipping' && !$conf->expedition->enabled)	 $qualified = 0;
+					}
 
-                    if ($qualified)
-                    {
-                        $keyfortrans = '';
-                    	$transcode = '';
-                    	$code = $obj->code;
-                    	if ($onlyautoornot > 0 && $code == 'AC_OTH') $code = 'AC_MANUAL';
-                    	if ($onlyautoornot > 0 && $code == 'AC_OTH_AUTO') $code = 'AC_AUTO';
-                    	if ($shortlabel)
-                    	{
-                    		$keyfortrans = "Action".$code.'Short';
-                    		$transcode = $langs->trans($keyfortrans);
-                    	}
-                    	if (empty($keyfortrans) || $keyfortrans == $transcode)
-                    	{
-                    		$keyfortrans = "Action".$code;
-                    		$transcode = $langs->trans($keyfortrans);
-                    	}
-                    	$label = (($transcode != $keyfortrans) ? $transcode : $langs->trans($obj->label));
-                        if ($onlyautoornot == -1 && !empty($conf->global->AGENDA_USE_EVENT_TYPE) && !preg_match('/auto/i', $code))
-                        {
-                            $label = '&nbsp; '.$label;
-                            $repid[-99] = $langs->trans("ActionAC_MANUAL");
-                            $repcode['AC_NON_AUTO'] = $langs->trans("ActionAC_MANUAL");
-                        }
-                    	$repid[$obj->id] = $label;
-                    	$repcode[$obj->code] = $label;
-                        if ($onlyautoornot > 0 && preg_match('/^module/', $obj->type) && $obj->module) $repcode[$obj->code] .= ' ('.$langs->trans("Module").': '.$obj->module.')';
-                    }
-                    $i++;
-                }
-            }
-            if ($idorcode == 'id') $this->liste_array = $repid;
-            if ($idorcode == 'code') $this->liste_array = $repcode;
-            return $this->liste_array;
-        } else {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+					if ($qualified)
+					{
+						$keyfortrans = '';
+						$transcode = '';
+						$code = $obj->code;
+						if ($onlyautoornot > 0 && $code == 'AC_OTH') $code = 'AC_MANUAL';
+						if ($onlyautoornot > 0 && $code == 'AC_OTH_AUTO') $code = 'AC_AUTO';
+						if ($shortlabel)
+						{
+							$keyfortrans = "Action".$code.'Short';
+							$transcode = $langs->trans($keyfortrans);
+						}
+						if (empty($keyfortrans) || $keyfortrans == $transcode)
+						{
+							$keyfortrans = "Action".$code;
+							$transcode = $langs->trans($keyfortrans);
+						}
+						$label = (($transcode != $keyfortrans) ? $transcode : $langs->trans($obj->label));
+						if ($onlyautoornot == -1 && !empty($conf->global->AGENDA_USE_EVENT_TYPE) && !preg_match('/auto/i', $code))
+						{
+							$label = '&nbsp; '.$label;
+							$repid[-99] = $langs->trans("ActionAC_MANUAL");
+							$repcode['AC_NON_AUTO'] = $langs->trans("ActionAC_MANUAL");
+						}
+						$repid[$obj->id] = $label;
+						$repcode[$obj->code] = $label;
+						if ($onlyautoornot > 0 && preg_match('/^module/', $obj->type) && $obj->module) $repcode[$obj->code] .= ' ('.$langs->trans("Module").': '.$obj->module.')';
+					}
+					$i++;
+				}
+			}
+			if ($idorcode == 'id') $this->liste_array = $repid;
+			if ($idorcode == 'code') $this->liste_array = $repcode;
+			return $this->liste_array;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Return name of action type as a label translated
-     *
-     *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Picto only
-     *  @return string			      	Label of action type
-     */
-    public function getNomUrl($withpicto = 0)
-    {
-        global $langs;
+	/**
+	 *  Return name of action type as a label translated
+	 *
+	 *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Picto only
+	 *  @return string			      	Label of action type
+	 */
+	public function getNomUrl($withpicto = 0)
+	{
+		global $langs;
 
-        // Check if translation available
-        $transcode = $langs->trans("Action".$this->code);
-        if ($transcode != "Action".$this->code) return $transcode;
-    }
+		// Check if translation available
+		$transcode = $langs->trans("Action".$this->code);
+		if ($transcode != "Action".$this->code) return $transcode;
+	}
 }
diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php
index b806dde94f9..4789e49f44a 100644
--- a/htdocs/comm/action/class/ical.class.php
+++ b/htdocs/comm/action/class/ical.class.php
@@ -32,144 +32,144 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/xcal.lib.php';
  */
 class ICal
 {
-    // Text in file
-    public $file_text;
-    public $cal; // Array to save iCalendar parse data
-    public $event_count; // Number of Events
-    public $todo_count; // Number of Todos
-    public $freebusy_count; // Number of Freebusy
-    public $last_key; //Help variable save last key (multiline string)
+	// Text in file
+	public $file_text;
+	public $cal; // Array to save iCalendar parse data
+	public $event_count; // Number of Events
+	public $todo_count; // Number of Todos
+	public $freebusy_count; // Number of Freebusy
+	public $last_key; //Help variable save last key (multiline string)
 
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Read text file, icalender text file
-     *
-     *  @param  string  $file       File
-     *  @return string
-     */
-    public function read_file($file)
-    {
-        // phpcs:enable
-        $this->file = $file;
-        $file_text = '';
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Read text file, icalender text file
+	 *
+	 *  @param  string  $file       File
+	 *  @return string
+	 */
+	public function read_file($file)
+	{
+		// phpcs:enable
+		$this->file = $file;
+		$file_text = '';
 
-        $tmparray = file($file);
-        if (is_array($tmparray))
-        {
-            $file_text = join("", $tmparray); //load file
-            $file_text = preg_replace("/[\r\n]{1,} /", "", $file_text);
-        }
-        return $file_text; // return all text
-    }
+		$tmparray = file($file);
+		if (is_array($tmparray))
+		{
+			$file_text = join("", $tmparray); //load file
+			$file_text = preg_replace("/[\r\n]{1,} /", "", $file_text);
+		}
+		return $file_text; // return all text
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Returns the number of calendar events
-     *
-     * @return int
-     */
-    public function get_event_count()
-    {
-        // phpcs:enable
-        return $this->event_count;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Returns the number of calendar events
+	 *
+	 * @return int
+	 */
+	public function get_event_count()
+	{
+		// phpcs:enable
+		return $this->event_count;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Returns the number of to do
-     *
-     * @return int
-     */
-    public function get_todo_count()
-    {
-        // phpcs:enable
-        return $this->todo_count;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Returns the number of to do
+	 *
+	 * @return int
+	 */
+	public function get_todo_count()
+	{
+		// phpcs:enable
+		return $this->todo_count;
+	}
 
-    /**
-     * Translate Calendar
-     *
-     * @param	string 	$uri	Url
-     * @return	array|string
-     */
-    public function parse($uri)
-    {
-        $this->cal = array(); // new empty array
+	/**
+	 * Translate Calendar
+	 *
+	 * @param	string 	$uri	Url
+	 * @return	array|string
+	 */
+	public function parse($uri)
+	{
+		$this->cal = array(); // new empty array
 
-        $this->event_count = -1;
+		$this->event_count = -1;
 
-        // read FILE text
-        $this->file_text = $this->read_file($uri);
+		// read FILE text
+		$this->file_text = $this->read_file($uri);
 
-        $this->file_text = preg_split("[\n]", $this->file_text);
+		$this->file_text = preg_split("[\n]", $this->file_text);
 
-        // is this text vcalendar standard text ? on line 1 is BEGIN:VCALENDAR
-        if (!stristr($this->file_text[0], 'BEGIN:VCALENDAR')) return 'error not VCALENDAR';
+		// is this text vcalendar standard text ? on line 1 is BEGIN:VCALENDAR
+		if (!stristr($this->file_text[0], 'BEGIN:VCALENDAR')) return 'error not VCALENDAR';
 
-        $insidealarm = 0;
-        $tmpkey = ''; $tmpvalue = ''; $type = '';
-        foreach ($this->file_text as $text)
-        {
-            $text = trim($text); // trim one line
-            if (!empty($text))
-            {
-                // get Key and Value VCALENDAR:Begin -> Key = VCALENDAR, Value = begin
-                list($key, $value) = $this->retun_key_value($text);
-                //var_dump($text.' -> '.$key.' - '.$value);
+		$insidealarm = 0;
+		$tmpkey = ''; $tmpvalue = ''; $type = '';
+		foreach ($this->file_text as $text)
+		{
+			$text = trim($text); // trim one line
+			if (!empty($text))
+			{
+				// get Key and Value VCALENDAR:Begin -> Key = VCALENDAR, Value = begin
+				list($key, $value) = $this->retun_key_value($text);
+				//var_dump($text.' -> '.$key.' - '.$value);
 
-                switch ($text) // search special string
-                {
-                    case "BEGIN:VTODO":
-                        $this->todo_count = $this->todo_count + 1; // new to do begin
-                        $type = "VTODO";
-                        break;
+				switch ($text) // search special string
+				{
+					case "BEGIN:VTODO":
+						$this->todo_count = $this->todo_count + 1; // new to do begin
+						$type = "VTODO";
+						break;
 
-                    case "BEGIN:VEVENT":
-                        $this->event_count = $this->event_count + 1; // new event begin
-                        $type = "VEVENT";
-                        break;
+					case "BEGIN:VEVENT":
+						$this->event_count = $this->event_count + 1; // new event begin
+						$type = "VEVENT";
+						break;
 
-                    case "BEGIN:VFREEBUSY":
-                        $this->freebusy_count = $this->freebusy_count + 1; // new event begin
-                        $type = "VFREEBUSY";
-                        break;
+					case "BEGIN:VFREEBUSY":
+						$this->freebusy_count = $this->freebusy_count + 1; // new event begin
+						$type = "VFREEBUSY";
+						break;
 
-                    case "BEGIN:VCALENDAR": // all other special string
-                    case "BEGIN:DAYLIGHT":
-                    case "BEGIN:VTIMEZONE":
-                    case "BEGIN:STANDARD":
-                        $type = $value; // save array under value key
-                        break;
+					case "BEGIN:VCALENDAR": // all other special string
+					case "BEGIN:DAYLIGHT":
+					case "BEGIN:VTIMEZONE":
+					case "BEGIN:STANDARD":
+						$type = $value; // save array under value key
+						break;
 
-                    case "END:VTODO": // end special text - goto VCALENDAR key
-                    case "END:VEVENT":
-                    case "END:VFREEBUSY":
+					case "END:VTODO": // end special text - goto VCALENDAR key
+					case "END:VEVENT":
+					case "END:VFREEBUSY":
 
-                    case "END:VCALENDAR":
-                    case "END:DAYLIGHT":
-                    case "END:VTIMEZONE":
-                    case "END:STANDARD":
-                        $type = "VCALENDAR";
-                        break;
+					case "END:VCALENDAR":
+					case "END:DAYLIGHT":
+					case "END:VTIMEZONE":
+					case "END:STANDARD":
+						$type = "VCALENDAR";
+						break;
 
-                    // Manage VALARM that are inside a VEVENT to avoid fields of VALARM to overwrites fields of VEVENT
-                    case "BEGIN:VALARM":
-                        $insidealarm = 1;
-                        break;
-                    case "END:VALARM":
-                        $insidealarm = 0;
-                        break;
+					// Manage VALARM that are inside a VEVENT to avoid fields of VALARM to overwrites fields of VEVENT
+					case "BEGIN:VALARM":
+						$insidealarm = 1;
+						break;
+					case "END:VALARM":
+						$insidealarm = 0;
+						break;
 
-                    default: // no special string (SUMMARY, DESCRIPTION, ...)
-                    	if ($tmpvalue)
+					default: // no special string (SUMMARY, DESCRIPTION, ...)
+						if ($tmpvalue)
 						{
 							$tmpvalue .= $text;
 							if (!preg_match('/=$/', $text))	// No more lines
@@ -180,96 +180,96 @@ class ICal
 								$tmpvalue = '';
 							}
 						} elseif (preg_match('/^ENCODING=QUOTED-PRINTABLE:/i', $value))
-                    	{
-                    		if (preg_match('/=$/', $value))
-                    		{
-                    			$tmpkey = $key;
-                    			$tmpvalue = $tmpvalue.preg_replace('/=$/', "", $value); // We must wait to have next line to have complete message
-                    		} else {
-                    			$value = quotedPrintDecode(preg_replace('/^ENCODING=QUOTED-PRINTABLE:/i', '', $tmpvalue.$value));
-                    		}
-                    	}                    	//$value=quotedPrintDecode($tmpvalue.$value);
-                    	if (!$insidealarm && !$tmpkey) $this->add_to_array($type, $key, $value); // add to array
-                        break;
-                }
-            }
-        }
+						{
+							if (preg_match('/=$/', $value))
+							{
+								$tmpkey = $key;
+								$tmpvalue = $tmpvalue.preg_replace('/=$/', "", $value); // We must wait to have next line to have complete message
+							} else {
+								$value = quotedPrintDecode(preg_replace('/^ENCODING=QUOTED-PRINTABLE:/i', '', $tmpvalue.$value));
+							}
+						}                    	//$value=quotedPrintDecode($tmpvalue.$value);
+						if (!$insidealarm && !$tmpkey) $this->add_to_array($type, $key, $value); // add to array
+						break;
+				}
+			}
+		}
 
-        //var_dump($this->cal);
-        return $this->cal;
-    }
+		//var_dump($this->cal);
+		return $this->cal;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Add to $this->ical array one value and key.
-     *
-     * @param 	string 	$type		Type ('VTODO', 'VEVENT', 'VFREEBUSY', 'VCALENDAR'...)
-     * @param 	string 	$key		Key	('DTSTART', ...). Note: Field is never 'DTSTART;TZID=...' because ';...' was before removed and added as another property
-     * @param 	string 	$value		Value
-     * @return	void
-     */
-    public function add_to_array($type, $key, $value)
-    {
-        // phpcs:enable
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Add to $this->ical array one value and key.
+	 *
+	 * @param 	string 	$type		Type ('VTODO', 'VEVENT', 'VFREEBUSY', 'VCALENDAR'...)
+	 * @param 	string 	$key		Key	('DTSTART', ...). Note: Field is never 'DTSTART;TZID=...' because ';...' was before removed and added as another property
+	 * @param 	string 	$value		Value
+	 * @return	void
+	 */
+	public function add_to_array($type, $key, $value)
+	{
+		// phpcs:enable
 
-        //print 'type='.$type.' key='.$key.' value='.$value.'<br>'."\n";
+		//print 'type='.$type.' key='.$key.' value='.$value.'<br>'."\n";
 
-        if (empty($key))
-        {
-            $key = $this->last_key;
-            switch ($type)
-            {
-                case 'VEVENT': $value = $this->cal[$type][$this->event_count][$key].$value; break;
-                case 'VFREEBUSY': $value = $this->cal[$type][$this->freebusy_count][$key].$value; break;
-                case 'VTODO': $value = $this->cal[$type][$this->todo_count][$key].$value; break;
-            }
-        }
+		if (empty($key))
+		{
+			$key = $this->last_key;
+			switch ($type)
+			{
+				case 'VEVENT': $value = $this->cal[$type][$this->event_count][$key].$value; break;
+				case 'VFREEBUSY': $value = $this->cal[$type][$this->freebusy_count][$key].$value; break;
+				case 'VTODO': $value = $this->cal[$type][$this->todo_count][$key].$value; break;
+			}
+		}
 
-        if (($key == "DTSTAMP") || ($key == "LAST-MODIFIED") || ($key == "CREATED")) $value = $this->ical_date_to_unix($value);
-        //if ($key == "RRULE" ) $value = $this->ical_rrule($value);
+		if (($key == "DTSTAMP") || ($key == "LAST-MODIFIED") || ($key == "CREATED")) $value = $this->ical_date_to_unix($value);
+		//if ($key == "RRULE" ) $value = $this->ical_rrule($value);
 
-        if (stristr($key, "DTSTART") || stristr($key, "DTEND") || stristr($key, "DTSTART;VALUE=DATE") || stristr($key, "DTEND;VALUE=DATE"))
-        {
-        	if (stristr($key, "DTSTART;VALUE=DATE") || stristr($key, "DTEND;VALUE=DATE"))
-        	{
-        		list($key, $value) = array($key, $value);
-        	} else {
-        		list($key, $value) = $this->ical_dt_date($key, $value);
-        	}
-        }
+		if (stristr($key, "DTSTART") || stristr($key, "DTEND") || stristr($key, "DTSTART;VALUE=DATE") || stristr($key, "DTEND;VALUE=DATE"))
+		{
+			if (stristr($key, "DTSTART;VALUE=DATE") || stristr($key, "DTEND;VALUE=DATE"))
+			{
+				list($key, $value) = array($key, $value);
+			} else {
+				list($key, $value) = $this->ical_dt_date($key, $value);
+			}
+		}
 
-        switch ($type)
-        {
-            case "VTODO":
-                $this->cal[$type][$this->todo_count][$key] = $value;
-                break;
+		switch ($type)
+		{
+			case "VTODO":
+				$this->cal[$type][$this->todo_count][$key] = $value;
+				break;
 
-            case "VEVENT":
-                $this->cal[$type][$this->event_count][$key] = $value;
-                break;
+			case "VEVENT":
+				$this->cal[$type][$this->event_count][$key] = $value;
+				break;
 
-            case "VFREEBUSY":
-                $this->cal[$type][$this->freebusy_count][$key] = $value;
-                break;
+			case "VFREEBUSY":
+				$this->cal[$type][$this->freebusy_count][$key] = $value;
+				break;
 
-            default:
-                $this->cal[$type][$key] = $value;
-                break;
-        }
-        $this->last_key = $key;
-    }
+			default:
+				$this->cal[$type][$key] = $value;
+				break;
+		}
+		$this->last_key = $key;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Parse text "XXXX:value text some with : " and return array($key = "XXXX", $value="value");
-     *
-     * @param 	string 	$text	Text
-     * @return 	array
-     */
-    public function retun_key_value($text)
-    {
-        // phpcs:enable
-        /*
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Parse text "XXXX:value text some with : " and return array($key = "XXXX", $value="value");
+	 *
+	 * @param 	string 	$text	Text
+	 * @return 	array
+	 */
+	public function retun_key_value($text)
+	{
+		// phpcs:enable
+		/*
         preg_match("/([^:]+)[:]([\w\W]+)/", $text, $matches);
 
         if (empty($matches))
@@ -281,173 +281,173 @@ class ICal
             $matches = array_splice($matches, 1, 2);
             return $matches;
         }*/
-        return explode(':', $text, 2);
-    }
+		return explode(':', $text, 2);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Parse RRULE  return array
-     *
-     * @param 	string 	$value	string
-     * @return 	array
-     */
-    public function ical_rrule($value)
-    {
-        // phpcs:enable
-        $result = array();
-        $rrule = explode(';', $value);
-        foreach ($rrule as $line)
-        {
-            $rcontent = explode('=', $line);
-            $result[$rcontent[0]] = $rcontent[1];
-        }
-        return $result;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Parse RRULE  return array
+	 *
+	 * @param 	string 	$value	string
+	 * @return 	array
+	 */
+	public function ical_rrule($value)
+	{
+		// phpcs:enable
+		$result = array();
+		$rrule = explode(';', $value);
+		foreach ($rrule as $line)
+		{
+			$rcontent = explode('=', $line);
+			$result[$rcontent[0]] = $rcontent[1];
+		}
+		return $result;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Return Unix time from ical date time fomrat (YYYYMMDD[T]HHMMSS[Z] or YYYYMMDD[T]HHMMSS)
-     *
-     * @param 	string		$ical_date		String date
-     * @return 	int
-     */
-    public function ical_date_to_unix($ical_date)
-    {
-        // phpcs:enable
-        $ical_date = str_replace('T', '', $ical_date);
-        $ical_date = str_replace('Z', '', $ical_date);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return Unix time from ical date time fomrat (YYYYMMDD[T]HHMMSS[Z] or YYYYMMDD[T]HHMMSS)
+	 *
+	 * @param 	string		$ical_date		String date
+	 * @return 	int
+	 */
+	public function ical_date_to_unix($ical_date)
+	{
+		// phpcs:enable
+		$ical_date = str_replace('T', '', $ical_date);
+		$ical_date = str_replace('Z', '', $ical_date);
 
-        $ntime = 0;
-        // TIME LIMITED EVENT
-        if (preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})([0-9]{0,2})/', $ical_date, $date))
-            $ntime = dol_mktime($date[4], $date[5], $date[6], $date[2], $date[3], $date[1], true);
+		$ntime = 0;
+		// TIME LIMITED EVENT
+		if (preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})([0-9]{0,2})/', $ical_date, $date))
+			$ntime = dol_mktime($date[4], $date[5], $date[6], $date[2], $date[3], $date[1], true);
 
-        //if (empty($date[4])) print 'Error bad date: '.$ical_date.' - date1='.$date[1];
-        //print dol_print_date($ntime,'dayhour');exit;
-        return $ntime; // ntime is a GTM time
-    }
+		//if (empty($date[4])) print 'Error bad date: '.$ical_date.' - date1='.$date[1];
+		//print dol_print_date($ntime,'dayhour');exit;
+		return $ntime; // ntime is a GTM time
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Return unix date from iCal date format
-     *
-     * @param 	string 		$key			Key
-     * @param 	string 		$value			Value
-     * @return 	array
-     */
-    public function ical_dt_date($key, $value)
-    {
-        // phpcs:enable
-        $return_value = array();
-        $value = $this->ical_date_to_unix($value);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return unix date from iCal date format
+	 *
+	 * @param 	string 		$key			Key
+	 * @param 	string 		$value			Value
+	 * @return 	array
+	 */
+	public function ical_dt_date($key, $value)
+	{
+		// phpcs:enable
+		$return_value = array();
+		$value = $this->ical_date_to_unix($value);
 
-        // Analyse TZID
-        $temp = explode(";", $key);
+		// Analyse TZID
+		$temp = explode(";", $key);
 
-        if (empty($temp[1])) // not TZID
-        {
-            $value = str_replace('T', '', $value);
-            return array($key, $value);
-        }
+		if (empty($temp[1])) // not TZID
+		{
+			$value = str_replace('T', '', $value);
+			return array($key, $value);
+		}
 
-        $key = $temp[0];
-        $temp = explode("=", $temp[1]);
-        $return_value[$temp[0]] = $temp[1];
-        $return_value['unixtime'] = $value;
+		$key = $temp[0];
+		$temp = explode("=", $temp[1]);
+		$return_value[$temp[0]] = $temp[1];
+		$return_value['unixtime'] = $value;
 
-        return array($key, $return_value);
-    }
+		return array($key, $return_value);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Return sorted eventlist as array or false if calendar is empty
-     *
-     * @return array|false
-     */
-    public function get_sort_event_list()
-    {
-        // phpcs:enable
-        $temp = $this->get_event_list();
-        if (!empty($temp))
-        {
-            usort($temp, array(&$this, "ical_dtstart_compare"));
-            return $temp;
-        } else {
-            return false;
-        }
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return sorted eventlist as array or false if calendar is empty
+	 *
+	 * @return array|false
+	 */
+	public function get_sort_event_list()
+	{
+		// phpcs:enable
+		$temp = $this->get_event_list();
+		if (!empty($temp))
+		{
+			usort($temp, array(&$this, "ical_dtstart_compare"));
+			return $temp;
+		} else {
+			return false;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Compare two unix timestamp
-     *
-     * @param 	array 	$a		Operand a
-     * @param 	array 	$b		Operand b
-     * @return 	integer
-     */
-    public function ical_dtstart_compare($a, $b)
-    {
-        // phpcs:enable
-        return strnatcasecmp($a['DTSTART']['unixtime'], $b['DTSTART']['unixtime']);
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Compare two unix timestamp
+	 *
+	 * @param 	array 	$a		Operand a
+	 * @param 	array 	$b		Operand b
+	 * @return 	integer
+	 */
+	public function ical_dtstart_compare($a, $b)
+	{
+		// phpcs:enable
+		return strnatcasecmp($a['DTSTART']['unixtime'], $b['DTSTART']['unixtime']);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Return eventlist array (not sorted eventlist array)
-     *
-     * @return array
-     */
-    public function get_event_list()
-    {
-        // phpcs:enable
-        return (!empty($this->cal['VEVENT']) ? $this->cal['VEVENT'] : '');
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return eventlist array (not sorted eventlist array)
+	 *
+	 * @return array
+	 */
+	public function get_event_list()
+	{
+		// phpcs:enable
+		return (!empty($this->cal['VEVENT']) ? $this->cal['VEVENT'] : '');
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Return eventlist array (not sort eventlist array)
-     *
-     * @return array
-     */
-    public function get_freebusy_list()
-    {
-        // phpcs:enable
-        return $this->cal['VFREEBUSY'];
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return eventlist array (not sort eventlist array)
+	 *
+	 * @return array
+	 */
+	public function get_freebusy_list()
+	{
+		// phpcs:enable
+		return $this->cal['VFREEBUSY'];
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Return to do array (not sorted todo array)
-     *
-     * @return array
-     */
-    public function get_todo_list()
-    {
-        // phpcs:enable
-        return $this->cal['VTODO'];
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return to do array (not sorted todo array)
+	 *
+	 * @return array
+	 */
+	public function get_todo_list()
+	{
+		// phpcs:enable
+		return $this->cal['VTODO'];
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Return base calendar data
-     *
-     * @return array
-     */
-    public function get_calender_data()
-    {
-        // phpcs:enable
-        return $this->cal['VCALENDAR'];
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return base calendar data
+	 *
+	 * @return array
+	 */
+	public function get_calender_data()
+	{
+		// phpcs:enable
+		return $this->cal['VCALENDAR'];
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Return array with all data
-     *
-     * @return array
-     */
-    public function get_all_data()
-    {
-        // phpcs:enable
-        return $this->cal;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return array with all data
+	 *
+	 * @return array
+	 */
+	public function get_all_data()
+	{
+		// phpcs:enable
+		return $this->cal;
+	}
 }
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index bed4054e018..613ac76380e 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -120,7 +120,7 @@ if ($object->id > 0)
 	$now = dol_now();
 	$delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;
 
-	dol_fiche_head($head, 'documents', $langs->trans("Action"), -1, 'action');
+	print dol_get_fiche_head($head, 'documents', $langs->trans("Action"), -1, 'action');
 
 	$linkback = img_picto($langs->trans("BackToList"), 'object_list', 'class="hideonsmartphone pictoactionview"');
 	$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list">'.$langs->trans("BackToList").'</a>';
@@ -254,7 +254,7 @@ if ($object->id > 0)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	$modulepart = 'actions';
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index a48dc03aea2..f5822669bba 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -336,7 +336,7 @@ if ($status == 'todo') $title = $langs->trans("ToDoActions");
 */
 
 $param = '';
-if ($actioncode || isset($_GET['search_actioncode']) || isset($_POST['search_actioncode'])) {
+if ($actioncode || GETPOSTISSET('search_actioncode')) {
 	if (is_array($actioncode)) {
 		foreach ($actioncode as $str_action) $param .= "&search_actioncode[]=".urlencode($str_action);
 	} else $param .= "&search_actioncode=".urlencode($actioncode);
@@ -360,7 +360,9 @@ if (empty($action) || $action == 'show_month')
 	$nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $month, 1, $year), "%b %Y");
 	$nav .= " </span>\n";
 	$nav .= " &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month.$param."\"><i class=\"fa fa-chevron-right\"></i></a>\n";
-	$nav .= " &nbsp; <a href=\"?year=".$nowyear."&amp;month=".$nowmonth.$param."\">".$langs->trans("Today")."</a> ";
+	if (empty($conf->dol_optimize_smallscreen)) {
+		$nav .= " &nbsp; <a href=\"?year=".$nowyear."&amp;month=".$nowmonth.$param."\">".$langs->trans("Today")."</a> ";
+	}
 	$picto = 'calendar';
 }
 if ($action == 'show_week')
@@ -369,7 +371,9 @@ if ($action == 'show_week')
 	$nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y").", ".$langs->trans("Week")." ".$week;
 	$nav .= " </span>\n";
 	$nav .= " &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\"><i class=\"fa fa-chevron-right\" title=\"".dol_escape_htmltag($langs->trans("Next"))."\"></i></a>\n";
-	$nav .= " &nbsp; <a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a> ";
+	if (empty($conf->dol_optimize_smallscreen)) {
+		$nav .= " &nbsp; <a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a> ";
+	}
 	$picto = 'calendarweek';
 }
 if ($action == 'show_day')
@@ -378,7 +382,9 @@ if ($action == 'show_day')
 	$nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $month, $day, $year), "daytextshort");
 	$nav .= " </span>\n";
 	$nav .= " &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\"><i class=\"fa fa-chevron-right\"></i></a>\n";
-	$nav .= " &nbsp; <a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a> ";
+	if (empty($conf->dol_optimize_smallscreen)) {
+		$nav .= " &nbsp; <a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a> ";
+	}
 	$picto = 'calendarday';
 }
 
@@ -409,9 +415,9 @@ print '<form method="POST" id="searchFormList" class="listactionsfilter" action=
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
-//dol_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action');
+//print dol_get_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action');
 //print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, $listofextcals, $actioncode, $usergroup, '', $resourceid);
-//dol_fiche_end();
+//print dol_get_fiche_end();
 
 $viewmode = '';
 $viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&restore_lastsearch_values=1">';
@@ -512,7 +518,7 @@ if (!empty($conf->use_javascript_ajax))	// If javascript on
 	}
 
 	// Birthdays
-	$s .= '<div class="nowrap inline-block"><input type="checkbox" id="check_birthday" name="check_birthday" class="check_birthday"> <span class="check_birthday_text">'.$langs->trans("AgendaShowBirthdayEvents").'</span> &nbsp; </div>';
+	$s .= '<div class="nowrap inline-block"><input type="checkbox" id="check_birthday" name="check_birthday" class="check_birthday"><label for="check_birthday"> <span class="check_birthday_text">'.$langs->trans("AgendaShowBirthdayEvents").'</span></label> &nbsp; </div>';
 
 	// Calendars from hooks
 	$parameters = array(); $object = null;
@@ -1259,7 +1265,7 @@ if (empty($action) || $action == 'show_month')      // View by month
 				/* Show days before the beginning of the current month (previous month)  */
 				$style = 'cal_other_month cal_past';
 				if ($iter_day == 6) $style .= ' cal_other_month_right';
-				echo '  <td class="'.$style.' nowrap" width="14%" valign="top">';
+				echo '  <td class="'.$style.' nowrap tdtop" width="14%">';
 				show_day_events($db, $max_day_in_prev_month + $tmpday, $prev_month, $prev_year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
 				echo "  </td>\n";
 			} elseif ($tmpday <= $max_day_in_month) {
@@ -1272,14 +1278,14 @@ if (empty($action) || $action == 'show_month')      // View by month
 				if ($today) $style = 'cal_today';
 				if ($curtime < $todaytms) $style .= ' cal_past';
 				//var_dump($todayarray['mday']."==".$tmpday." && ".$todayarray['mon']."==".$month." && ".$todayarray['year']."==".$year.' -> '.$style);
-				echo '  <td class="'.$style.' nowrap" width="14%" valign="top">';
+				echo '  <td class="'.$style.' nowrap tdtop" width="14%">';
 				show_day_events($db, $tmpday, $month, $year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
-				echo "  </td>\n";
+				echo "</td>\n";
 			} else {
 				/* Show days after the current month (next month) */
 				$style = 'cal_other_month';
 				if ($iter_day == 6) $style .= ' cal_other_month_right';
-				echo '  <td class="'.$style.' nowrap" width="14%" valign="top">';
+				echo '  <td class="'.$style.' nowrap tdtop" width="14%">';
 				show_day_events($db, $tmpday - $max_day_in_month, $next_month, $next_year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
 				echo "</td>\n";
 			}
@@ -1471,32 +1477,34 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 
 	print "\n";
 
-	// Line with title of day
 	$curtime = dol_mktime(0, 0, 0, $month, $day, $year);
-	print '<div id="dayevent_'.$dateint.'" class="dayevent tagtable centpercent nobordernopadding">'."\n";
+	$urltoshow = DOL_URL_ROOT.'/comm/action/index.php?action=show_day&day='.str_pad($day, 2, "0", STR_PAD_LEFT).'&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year.$newparam;
+	$urltocreate = '';
+	if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
+	{
+		$newparam .= '&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year;
+		$hourminsec = '100000';
+		$urltocreate = DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.sprintf("%04d%02d%02d", $year, $month, $day).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : ''));
+	}
+
+	// Line with title of day
+	print '<div id="dayevent_'.$dateint.'" class="cursorpointer dayevent tagtable centpercent nobordernopadding" onclick="window.location=\''.$urltocreate.'\';">'."\n";
 
 	if ($nonew <= 0)
 	{
-		print '<div class="tagtr"><div class="nowrap float">';
-		print '<a class="dayevent-aday" style="color: #666" href="'.DOL_URL_ROOT.'/comm/action/index.php?';
-		print 'action=show_day&day='.str_pad($day, 2, "0", STR_PAD_LEFT).'&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year;
-		print $newparam;
-		print '">';
+		print '<div class="tagtr"><div class="nowrap tagtd"><div class="left inline-block">';
+		print '<a class="dayevent-aday" style="color: #666" href="'.$urltoshow.'">';
 		if ($showinfo) print dol_print_date($curtime, 'daytextshort');
 		else print dol_print_date($curtime, '%d');
 		print '</a>';
-		print '</div><div class="floatright nowrap">';
+		print '</div><div class="nowrap floatright inline-block marginrightonly">';
 		if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
 		{
-			$newparam .= '&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year;
-
-			//$param='month='.$monthshown.'&year='.$year;
-			$hourminsec = '100000';
-			print '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.sprintf("%04d%02d%02d", $year, $month, $day).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : '')).'">';
+			print '<a class="cursoradd" href="'.$urltocreate.'">'; // Explicit link, usefull for nojs interfaces
 			print img_picto($langs->trans("NewAction"), 'edit_add.png');
 			print '</a>';
 		}
-		print '</div></div>'."\n";
+		print '</div></div></div>'."\n";
 	}
 
 	if ($nonew < 0)
@@ -1832,7 +1840,9 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 			break;
 		}
 	}
-	if (!$i) print '&nbsp;';
+	if (!$i) {	// No events
+		print '&nbsp;';
+	}
 
 	if (!empty($conf->global->MAIN_JS_SWITCH_AGENDA) && $i > $maxprint && $maxprint)
 	{
diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php
index 8575ac67653..40787abb8c3 100644
--- a/htdocs/comm/action/info.php
+++ b/htdocs/comm/action/info.php
@@ -29,8 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 if (!empty($conf->projet->enabled)) {
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
 // Load translation files required by the page
@@ -41,8 +41,8 @@ $id = GETPOST('id', 'int');
 // Security check
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id');
@@ -62,7 +62,7 @@ $object->fetch($id);
 $object->info($object->id);
 
 $head = actions_prepare_head($object);
-dol_fiche_head($head, 'info', $langs->trans("Action"), -1, 'action');
+print dol_get_fiche_head($head, 'info', $langs->trans("Action"), -1, 'action');
 
 $linkback = img_picto($langs->trans("BackToList"), 'object_list', 'class="hideonsmartphone pictoactionview"');
 $linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php">'.$langs->trans("BackToList").'</a>';
@@ -86,19 +86,19 @@ $morehtmlref = '<div class="refidno">';
 // Project
 if (!empty($conf->projet->enabled))
 {
-    $langs->load("projects");
-    //$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-    $morehtmlref .= $langs->trans('Project').': ';
-    if (!empty($object->fk_project)) {
-        $proj = new Project($db);
-        $proj->fetch($object->fk_project);
-        $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-        $morehtmlref .= $proj->ref;
-        $morehtmlref .= '</a>';
-        if ($proj->title) $morehtmlref .= ' - '.$proj->title;
-    } else {
-        $morehtmlref .= '';
-    }
+	$langs->load("projects");
+	//$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	$morehtmlref .= $langs->trans('Project').': ';
+	if (!empty($object->fk_project)) {
+		$proj = new Project($db);
+		$proj->fetch($object->fk_project);
+		$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+		$morehtmlref .= $proj->ref;
+		$morehtmlref .= '</a>';
+		if ($proj->title) $morehtmlref .= ' - '.$proj->title;
+	} else {
+		$morehtmlref .= '';
+	}
 }
 $morehtmlref .= '</div>';
 
@@ -112,7 +112,7 @@ print '<table width="100%"><tr><td>';
 dol_print_object_info($object);
 print '</td></tr></table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 92975aafec0..510fa67dcdb 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -38,7 +38,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("users", "companies", "agenda", "commercial", "other"));
+$langs->loadLangs(array("users", "companies", "agenda", "commercial", "other", "orders", "bills"));
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
@@ -57,10 +57,10 @@ $confirm = GETPOST('confirm', 'alpha');
 // Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)
 if (GETPOST('search_actioncode', 'array'))
 {
-    $actioncode = GETPOST('search_actioncode', 'array', 3);
-    if (!count($actioncode)) $actioncode = '0';
+	$actioncode = GETPOST('search_actioncode', 'array', 3);
+	if (!count($actioncode)) $actioncode = '0';
 } else {
-    $actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
+	$actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
 $search_id = GETPOST('search_id', 'alpha');
@@ -166,13 +166,13 @@ if (GETPOST('cancel', 'alpha'))
 if (GETPOST("viewcal") || GETPOST("viewweek") || GETPOST("viewday"))
 {
 	$param = '';
-    if (is_array($_POST))
-    {
-    	foreach ($_POST as $key => $val)
-    	{
-    		$param .= '&'.$key.'='.urlencode($val);
-    	}
-    }
+	if (is_array($_POST))
+	{
+		foreach ($_POST as $key => $val)
+		{
+			$param .= '&'.$key.'='.urlencode($val);
+		}
+	}
 	//print $param;
 	header("Location: ".DOL_URL_ROOT.'/comm/action/index.php?'.$param);
 	exit;
@@ -187,15 +187,15 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 // Purge search criteria
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-    //$actioncode='';
-    $search_id = '';
+	//$actioncode='';
+	$search_id = '';
 	$search_title = '';
-    $search_note = '';
-    $datestart = '';
-    $dateend = '';
-    $search_status = '';
+	$search_note = '';
+	$datestart = '';
+	$dateend = '';
+	$search_status = '';
 	$toselect = '';
-    $search_array_options = array();
+	$search_array_options = array();
 }
 
 if (empty($reshook) && !empty($massaction))
@@ -341,26 +341,26 @@ $sql .= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
 if (!empty($actioncode))
 {
-    if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
-    {
-        if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
-        elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
-        else {
-            if ($actioncode == 'AC_OTH') $sql .= " AND c.type != 'systemauto'";
-            if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND c.type = 'systemauto'";
-        }
-    } else {
-        if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
-        elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
-        else {
-            if (is_array($actioncode))
-            {
-                $sql .= " AND c.code IN ('".implode("','", $actioncode)."')";
-            } else {
-                $sql .= " AND c.code IN ('".implode("','", explode(',', $actioncode))."')";
-            }
-        }
-    }
+	if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
+	{
+		if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
+		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
+		else {
+			if ($actioncode == 'AC_OTH') $sql .= " AND c.type != 'systemauto'";
+			if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND c.type = 'systemauto'";
+		}
+	} else {
+		if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
+		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
+		else {
+			if (is_array($actioncode))
+			{
+				$sql .= " AND c.code IN ('".implode("','", $actioncode)."')";
+			} else {
+				$sql .= " AND c.code IN ('".implode("','", explode(',', $actioncode))."')";
+			}
+		}
+	}
 }
 if ($resourceid > 0) $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);
 if ($pid) $sql .= " AND a.fk_project=".$db->escape($pid);
@@ -381,10 +381,10 @@ if ($search_note) $sql .= natural_search('a.note', $search_note);
 // We must filter on assignement table
 if ($filtert > 0 || $usergroup > 0)
 {
-    $sql .= " AND (";
-    if ($filtert > 0) $sql .= "(ar.fk_element = ".$filtert." OR (ar.fk_element IS NULL AND a.fk_user_action=".$filtert."))"; // The OR is for backward compatibility
-    if ($usergroup > 0) $sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
-    $sql .= ")";
+	$sql .= " AND (";
+	if ($filtert > 0) $sql .= "(ar.fk_element = ".$filtert." OR (ar.fk_element IS NULL AND a.fk_user_action=".$filtert."))"; // The OR is for backward compatibility
+	if ($usergroup > 0) $sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
+	$sql .= ")";
 }
 
 // The second or of next test is to take event with no end date (we suppose duration is 1 hour in such case)
@@ -405,13 +405,13 @@ $sql .= $db->order($sortfield, $sortorder);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-    	$page = 0;
-    	$offset = 0;
-    }
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -452,13 +452,13 @@ if ($resql)
 	if ($showbirthday)    $nav .= '<input type="hidden" name="search_showbirthday" value="1">';
 	print $nav;
 
-    //dol_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action');
-    //print_actions_filter($form, $canedit, $search_status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, -1, $actioncode, $usergroup, '', $resourceid);
-    //dol_fiche_end();
+	//print dol_get_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action');
+	//print_actions_filter($form, $canedit, $search_status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, -1, $actioncode, $usergroup, '', $resourceid);
+	//print dol_get_fiche_end();
 
-    // Add link to show birthdays
-    $link = '';
-    /*
+	// Add link to show birthdays
+	$link = '';
+	/*
     if (empty($conf->use_javascript_ajax))
     {
         $newparam=$param;   // newparam is for birthday links
@@ -473,49 +473,49 @@ if ($resql)
     }
     */
 
-    $s = $newtitle;
+	$s = $newtitle;
 
 	// Calendars from hooks
-    $parameters = array(); $object = null;
+	$parameters = array(); $object = null;
 	$reshook = $hookmanager->executeHooks('addCalendarChoice', $parameters, $object, $action);
-    if (empty($reshook))
-    {
-		$s .= $hookmanager->resPrint;
-    } elseif ($reshook > 1)
+	if (empty($reshook))
 	{
-    	$s = $hookmanager->resPrint;
-    }
+		$s .= $hookmanager->resPrint;
+	} elseif ($reshook > 1)
+	{
+		$s = $hookmanager->resPrint;
+	}
 
-    $viewmode = '';
-    $viewmode .= '<a class="btnTitle btnTitleSelected reposition" href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&restore_lastsearch_values=1">';
-    //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
-    $viewmode .= img_picto($langs->trans("List"), 'object_list-alt', 'class="pictoactionview block"');
-    //$viewmode .= '</span>';
-    $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewList").'</span></a>';
+	$viewmode = '';
+	$viewmode .= '<a class="btnTitle btnTitleSelected reposition" href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&restore_lastsearch_values=1">';
+	//$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
+	$viewmode .= img_picto($langs->trans("List"), 'object_list-alt', 'class="pictoactionview block"');
+	//$viewmode .= '</span>';
+	$viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewList").'</span></a>';
 
-    $viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
-    //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
-    $viewmode .= img_picto($langs->trans("ViewCal"), 'object_calendar', 'class="pictoactionview block"');
-    //$viewmode .= '</span>';
-    $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewCal").'</span></a>';
+	$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
+	//$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
+	$viewmode .= img_picto($langs->trans("ViewCal"), 'object_calendar', 'class="pictoactionview block"');
+	//$viewmode .= '</span>';
+	$viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewCal").'</span></a>';
 
-    $viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_week&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
-    //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
-    $viewmode .= img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="pictoactionview block"');
-    //$viewmode .= '</span>';
-    $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewWeek").'</span></a>';
+	$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_week&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
+	//$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
+	$viewmode .= img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="pictoactionview block"');
+	//$viewmode .= '</span>';
+	$viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewWeek").'</span></a>';
 
-    $viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
-    //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
-    $viewmode .= img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="pictoactionview block"');
-    //$viewmode .= '</span>';
-    $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewDay").'</span></a>';
+	$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
+	//$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
+	$viewmode .= img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="pictoactionview block"');
+	//$viewmode .= '</span>';
+	$viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewDay").'</span></a>';
 
-    $viewmode .= '<a class="btnTitle reposition marginrightonly" href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
-    //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
-    $viewmode .= img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="pictoactionview block"');
-    //$viewmode .= '</span>';
-    $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewPerUser").'</span></a>';
+	$viewmode .= '<a class="btnTitle reposition marginrightonly" href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
+	//$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
+	$viewmode .= img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="pictoactionview block"');
+	//$viewmode .= '</span>';
+	$viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewPerUser").'</span></a>';
 
 	$viewmode .= '<span class="marginrightonly"></span>';
 
@@ -538,21 +538,21 @@ if ($resql)
 
 	print $s;
 
-    include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-    $moreforfilter = '';
+	$moreforfilter = '';
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 	if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
-    $i = 0;
+	$i = 0;
 
-    print '<div class="liste_titre liste_titre_bydiv centpercent">';
-    print_actions_filter($form, $canedit, $search_status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, -1, $actioncode, $usergroup, '', $resourceid);
-    print '</div>';
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print_actions_filter($form, $canedit, $search_status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, -1, $actioncode, $usergroup, '', $resourceid);
+	print '</div>';
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
 	if (!empty($arrayfields['a.id']['checked']))		print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_id" value="'.$search_id.'"></td>';
@@ -571,8 +571,8 @@ if ($resql)
 		print '</td>';
 	}
 	if (!empty($arrayfields['s.nom']['checked'])) {
-        print '<td class="liste_titre"></td>';
-    }
+		print '<td class="liste_titre"></td>';
+	}
 	if (!empty($arrayfields['a.fk_contact']['checked']))	print '<td class="liste_titre"></td>';
 	if (!empty($arrayfields['a.fk_element']['checked']))	print '<td class="liste_titre"></td>';
 
@@ -588,10 +588,10 @@ if ($resql)
 	if (!empty($arrayfields['a.tms']['checked']))		print '<td class="liste_titre"></td>';
 	if (!empty($arrayfields['a.percent']['checked'])) {
 		print '<td class="liste_titre center">';
-        $formactions->form_select_status_action('formaction', $search_status, 1, 'search_status', 1, 2, 'minwidth100imp maxwidth125');
-    	print ajax_combobox('selectsearch_status');
-    	print '</td>';
-    }
+		$formactions->form_select_status_action('formaction', $search_status, 1, 'search_status', 1, 2, 'minwidth100imp maxwidth125');
+		print ajax_combobox('selectsearch_status');
+		print '</td>';
+	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
 	$searchpicto = $form->showFilterButtons();
@@ -610,10 +610,10 @@ if ($resql)
 	if (!empty($arrayfields['a.datep2']['checked']))	  print_liste_field_titre($arrayfields['a.datep2']['label'], $_SERVER["PHP_SELF"], "a.datep2", $param, '', 'align="center"', $sortfield, $sortorder);
 	if (!empty($arrayfields['s.nom']['checked']))	      print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", $param, "", "", $sortfield, $sortorder);
 	if (!empty($arrayfields['a.fk_contact']['checked'])) print_liste_field_titre($arrayfields['a.fk_contact']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
-    if (!empty($arrayfields['a.fk_element']['checked'])) print_liste_field_titre($arrayfields['a.fk_element']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
+	if (!empty($arrayfields['a.fk_element']['checked'])) print_liste_field_titre($arrayfields['a.fk_element']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
 
 	// Extra fields
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 
 	// Hook fields
 	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
@@ -634,18 +634,18 @@ if ($resql)
 	require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
 	$caction = new CActionComm($db);
 	$arraylist = $caction->liste_array(1, 'code', '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : 0), '', 1);
-    $contactListCache = array();
+	$contactListCache = array();
 
 	while ($i < min($num, $limit))
 	{
 		$obj = $db->fetch_object($resql);
 
-        // Discard auto action if option is on
-        if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->type_code == 'AC_OTH_AUTO')
-        {
-        	$i++;
-        	continue;
-        }
+		// Discard auto action if option is on
+		if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->type_code == 'AC_OTH_AUTO')
+		{
+			$i++;
+			continue;
+		}
 
 		$actionstatic->id = $obj->id;
 		$actionstatic->ref = $obj->id;
@@ -771,29 +771,29 @@ if ($resql)
 		if (!empty($arrayfields['a.fk_contact']['checked'])) {
 			print '<td class="tdoverflowmax100">';
 
-            if (!empty($actionstatic->socpeopleassigned))
-            {
-                $contactList = array();
-                foreach ($actionstatic->socpeopleassigned as $socpeopleassigned)
-                {
-                    if (!isset($contactListCache[$socpeopleassigned['id']]))
-                    {
-                        // if no cache found we fetch it
-                        $contact = new Contact($db);
-                        if ($contact->fetch($socpeopleassigned['id']) > 0)
-                        {
-                            $contactListCache[$socpeopleassigned['id']] = $contact->getNomUrl(1, '', 0);
-                            $contactList[] = $contact->getNomUrl(1, '', 0);
-                        }
-                    } else {
-                        // use cache
-                        $contactList[] = $contactListCache[$socpeopleassigned['id']];
-                    }
-                }
-                if (!empty($contactList)) {
-                    print implode(', ', $contactList);
-                }
-            } elseif ($obj->fk_contact > 0) //keep for retrocompatibility with faraway event
+			if (!empty($actionstatic->socpeopleassigned))
+			{
+				$contactList = array();
+				foreach ($actionstatic->socpeopleassigned as $socpeopleassigned)
+				{
+					if (!isset($contactListCache[$socpeopleassigned['id']]))
+					{
+						// if no cache found we fetch it
+						$contact = new Contact($db);
+						if ($contact->fetch($socpeopleassigned['id']) > 0)
+						{
+							$contactListCache[$socpeopleassigned['id']] = $contact->getNomUrl(1, '', 0);
+							$contactList[] = $contact->getNomUrl(1, '', 0);
+						}
+					} else {
+						// use cache
+						$contactList[] = $contactListCache[$socpeopleassigned['id']];
+					}
+				}
+				if (!empty($contactList)) {
+					print implode(', ', $contactList);
+				}
+			} elseif ($obj->fk_contact > 0) //keep for retrocompatibility with faraway event
 			{
 				$contactstatic->id = $obj->fk_contact;
 				$contactstatic->email = $obj->email;
@@ -812,15 +812,15 @@ if ($resql)
 
 		// Linked object
 		if (!empty($arrayfields['a.fk_element']['checked'])) {
-            print '<td class="tdoverflowmax150">';
-            //var_dump($obj->fkelement.' '.$obj->elementtype);
-            if ($obj->fk_element > 0 && !empty($obj->elementtype)) {
-                include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-                print dolGetElementUrl($obj->fk_element, $obj->elementtype, 1);
-            } else {
-                print "&nbsp;";
-            }
-            print '</td>';
+			print '<td class="tdoverflowmax150">';
+			//var_dump($obj->fkelement.' '.$obj->elementtype);
+			if ($obj->fk_element > 0 && !empty($obj->elementtype)) {
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+				print dolGetElementUrl($obj->fk_element, $obj->elementtype, 1);
+			} else {
+				print "&nbsp;";
+			}
+			print '</td>';
 		}
 
 		// Extra fields
@@ -858,7 +858,7 @@ if ($resql)
 		$i++;
 	}
 	print "</table>";
-    print '</div>';
+	print '</div>';
 	print '</form>';
 
 	$db->free($resql);
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 72b25c9d731..c5f81e358cc 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -74,7 +74,7 @@ if (!$user->rights->agenda->myactions->read) accessforbidden();
 if (!$user->rights->agenda->allactions->read) $canedit = 0;
 if (!$user->rights->agenda->allactions->read || $filter == 'mine')  // If no permission to see all, we show only affected to me
 {
-    $filtert = $user->id;
+	$filtert = $user->id;
 }
 
 //$action=GETPOST('action','alpha');
@@ -92,10 +92,10 @@ $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always ''
 // Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)
 if (GETPOST('search_actioncode', 'array'))
 {
-    $actioncode = GETPOST('search_actioncode', 'array', 3);
-    if (!count($actioncode)) $actioncode = '0';
+	$actioncode = GETPOST('search_actioncode', 'array', 3);
+	if (!count($actioncode)) $actioncode = '0';
 } else {
-    $actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode", "alpha") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
+	$actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode", "alpha") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
 
@@ -122,20 +122,20 @@ $tmparray = explode('-', $tmp);
 $begin_d = 1;
 $end_d = 53;
 
-if ($status == '' && !isset($_GET['status']) && !isset($_POST['status'])) $status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
-if (empty($action) && !isset($_GET['action']) && !isset($_POST['action'])) $action = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
+if ($status == '' && !GETPOSTISSET('status')) $status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
+if (empty($action) && !GETPOSTISSET('action')) $action = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
 
 if (GETPOST('viewcal', 'alpha') && $action != 'show_day' && $action != 'show_week' && $action != 'show_peruser') {
-    $action = 'show_month'; $day = '';
+	$action = 'show_month'; $day = '';
 }                                                   // View by month
 if (GETPOST('viewweek', 'alpha') || $action == 'show_week') {
-    $action = 'show_week'; $week = ($week ? $week : date("W")); $day = ($day ? $day : date("d"));
+	$action = 'show_week'; $week = ($week ? $week : date("W")); $day = ($day ? $day : date("d"));
 }  // View by week
 if (GETPOST('viewday', 'alpha') || $action == 'show_day') {
-    $action = 'show_day'; $day = ($day ? $day : date("d"));
+	$action = 'show_day'; $day = ($day ? $day : date("d"));
 }                                  // View by day
 if (GETPOST('viewyear', 'alpha') || $action == 'show_year') {
-    $action = 'show_year';
+	$action = 'show_year';
 }                                  // View by year
 
 // Load translation files required by the page
@@ -151,13 +151,13 @@ $hookmanager->initHooks(array('agenda'));
 
 if ($action == 'delete_action')
 {
-    $event = new ActionComm($db);
-    $event->fetch($actionid);
-    $event->fetch_optionals();
-    $event->fetch_userassigned();
-    $event->oldcopy = clone $event;
+	$event = new ActionComm($db);
+	$event->fetch($actionid);
+	$event->fetch_optionals();
+	$event->fetch_userassigned();
+	$event->oldcopy = clone $event;
 
-    $result = $event->delete();
+	$result = $event->delete();
 }
 
 
@@ -227,13 +227,13 @@ if ($status == 'done') $title = $langs->trans("DoneActions");
 if ($status == 'todo') $title = $langs->trans("ToDoActions");
 
 $param = '';
-if ($actioncode || isset($_GET['search_actioncode']) || isset($_POST['search_actioncode'])) {
+if ($actioncode || GETPOSTISSET('search_actioncode')) {
 	if (is_array($actioncode)) {
 		foreach ($actioncode as $str_action) $param .= "&search_actioncode[]=".urlencode($str_action);
 	} else $param .= "&search_actioncode=".urlencode($actioncode);
 }
 if ($resourceid > 0) $param .= "&search_resourceid=".urlencode($resourceid);
-if ($status || isset($_GET['status']) || isset($_POST['status'])) $param .= "&search_status=".urlencode($status);
+if ($status || GETPOSTISSET('status')) $param .= "&search_status=".urlencode($status);
 if ($filter)        $param .= "&search_filter=".urlencode($filter);
 if ($filtert)       $param .= "&search_filtert=".urlencode($filtert);
 if ($usergroup)     $param .= "&search_usergroup=".urlencode($usergroup);
@@ -274,34 +274,17 @@ $lastdaytoshow = dol_time_plus_duree($firstdaytoshow, 7, 'd');
 $max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year));
 
 $tmpday = $first_day;
-$picto = 'calendartype';
+$picto = 'calendarweek';
 
 $nav = "<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\">".img_previous($langs->trans("Previous"))."</a>\n";
 $nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y")."</span> \n";
 $nav .= "<a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\">".img_next($langs->trans("Next"))."</a>\n";
-$nav .= " &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
-$picto = 'calendarweek';
+if (empty($conf->dol_optimize_smallscreen)) {
+	$nav .= " &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
+}
 
-/*$nav .= ' &nbsp; <form name="dateselect" action="'.$_SERVER["PHP_SELF"].'?action=show_peruser'.$param.'">';
-$nav .= '<input type="hidden" name="token" value="'.newToken().'">';
-$nav .= '<input type="hidden" name="action" value="'.$action.'">';
-$nav .= '<input type="hidden" name="filtert" value="'.$filtert.'">';
-$nav .= '<input type="hidden" name="usergroup" value="'.$usergroup.'">';
-$nav .= '<input type="hidden" name="actioncode" value="'.$actioncode.'">';
-$nav .= '<input type="hidden" name="resourceid" value="'.$resourceid.'">';
-$nav .= '<input type="hidden" name="status" value="'.$status.'">';
-$nav .= '<input type="hidden" name="socid" value="'.$socid.'">';
-$nav .= '<input type="hidden" name="projectid" value="'.$projectid.'">';
-$nav .= '<input type="hidden" name="begin_h" value="'.$begin_h.'">';
-$nav .= '<input type="hidden" name="end_h" value="'.$end_h.'">';
-$nav .= '<input type="hidden" name="begin_d" value="'.$begin_d.'">';
-$nav .= '<input type="hidden" name="end_d" value="'.$end_d.'">';
-$nav .= '<input type="hidden" name="showbirthday" value="'.$showbirthday.'">';
-*/
 $nav .= $form->selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0);
-//$nav .= ' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
 $nav .= ' <button type="submit" class="liste_titre button_search" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';
-//$nav .= '</form>';
 
 // Must be after the nav definition
 $param .= '&year='.urlencode($year).'&month='.urlencode($month).($day ? '&day='.urlencode($day) : '');
@@ -334,8 +317,8 @@ if ($conf->use_javascript_ajax)
 	$s .= 'jQuery(".family_birthday").toggle();'."\n";
 	if ($action == "show_week" || $action == "show_month" || empty($action))
 	{
-    	$s .= 'jQuery( "td.sortable" ).sortable({connectWith: ".sortable",placeholder: "ui-state-highlight",items: "div:not(.unsortable)", receive: function( event, ui ) {';
-    	$s .= 'var frm=jQuery("#move_event");frm.attr("action",ui.item.find("a.cal_event").attr("href")).children("#newdate").val(jQuery(event.target).closest("div").attr("id"));frm.submit();}});'."\n";
+		$s .= 'jQuery( "td.sortable" ).sortable({connectWith: ".sortable",placeholder: "ui-state-highlight",items: "div:not(.unsortable)", receive: function( event, ui ) {';
+		$s .= 'var frm=jQuery("#move_event");frm.attr("action",ui.item.find("a.cal_event").attr("href")).children("#newdate").val(jQuery(event.target).closest("div").attr("id"));frm.submit();}});'."\n";
 	}
   	$s .= '});'."\n";
 	$s .= '</script>'."\n";
@@ -362,15 +345,15 @@ if ($conf->use_javascript_ajax)
 		//$s.='<div class="nowrap float"><input type="checkbox" id="check_birthday" name="check_birthday"> '.$langs->trans("AgendaShowBirthdayEvents").' &nbsp; </div>';
 
 		// Calendars from hooks
-	    $parameters = array(); $object = null;
+		$parameters = array(); $object = null;
 		$reshook = $hookmanager->executeHooks('addCalendarChoice', $parameters, $object, $action);
-	    if (empty($reshook))
-	    {
-			$s .= $hookmanager->resPrint;
-	    } elseif ($reshook > 1)
+		if (empty($reshook))
 		{
-	    	$s = $hookmanager->resPrint;
-	    }
+			$s .= $hookmanager->resPrint;
+		} elseif ($reshook > 1)
+		{
+			$s = $hookmanager->resPrint;
+		}
 	}
 }
 
@@ -468,26 +451,26 @@ $sql .= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
 if (!empty($actioncode))
 {
-    if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
-    {
-        if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
-        elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        else {
-            if ($actioncode == 'AC_OTH') $sql .= " AND ca.type != 'systemauto'";
-            if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        }
-    } else {
-        if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
-        elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        else {
-        	if (is_array($actioncode))
-        	{
-        		$sql .= " AND ca.code IN ('".implode("','", $actioncode)."')";
-        	} else {
-        		$sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
-        	}
-        }
-    }
+	if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
+	{
+		if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
+		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
+		else {
+			if ($actioncode == 'AC_OTH') $sql .= " AND ca.type != 'systemauto'";
+			if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND ca.type = 'systemauto'";
+		}
+	} else {
+		if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
+		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
+		else {
+			if (is_array($actioncode))
+			{
+				$sql .= " AND ca.code IN ('".implode("','", $actioncode)."')";
+			} else {
+				$sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
+			}
+		}
+	}
 }
 if ($resourceid > 0) $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);
 if ($pid) $sql .= " AND a.fk_project=".$db->escape($pid);
@@ -497,28 +480,28 @@ if ($socid > 0) $sql .= ' AND a.fk_soc = '.$socid;
 if ($filtert > 0 || $usergroup > 0) $sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
 if ($action == 'show_day')
 {
-    $sql .= " AND (";
-    $sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
-    $sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
-    $sql .= " OR ";
-    $sql .= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
-    $sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
-    $sql .= " OR ";
-    $sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
-    $sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
-    $sql .= ')';
+	$sql .= " AND (";
+	$sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
+	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+	$sql .= " OR ";
+	$sql .= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
+	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+	$sql .= " OR ";
+	$sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
+	$sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+	$sql .= ')';
 } else {
-    // To limit array
-    $sql .= " AND (";
-    $sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, 1, 1, $year) - (60 * 60 * 24 * 7))."'"; // Start 7 days before
-    $sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, 12, 31, $year) + (60 * 60 * 24 * 7))."')"; // End 7 days after
-    $sql .= " OR ";
-    $sql .= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0, 0, 0, 1, 1, $year) - (60 * 60 * 24 * 7))."'";
-    $sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, 12, 31, $year) + (60 * 60 * 24 * 7))."')";
-    $sql .= " OR ";
-    $sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, 12, 1, $year) - (60 * 60 * 24 * 7))."'";
-    $sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, 12, 31, $year) + (60 * 60 * 24 * 7))."')";
-    $sql .= ')';
+	// To limit array
+	$sql .= " AND (";
+	$sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, 1, 1, $year) - (60 * 60 * 24 * 7))."'"; // Start 7 days before
+	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, 12, 31, $year) + (60 * 60 * 24 * 7))."')"; // End 7 days after
+	$sql .= " OR ";
+	$sql .= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0, 0, 0, 1, 1, $year) - (60 * 60 * 24 * 7))."'";
+	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, 12, 31, $year) + (60 * 60 * 24 * 7))."')";
+	$sql .= " OR ";
+	$sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, 12, 1, $year) - (60 * 60 * 24 * 7))."'";
+	$sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, 12, 31, $year) + (60 * 60 * 24 * 7))."')";
+	$sql .= ')';
 }
 if ($type) $sql .= " AND ca.id = ".$type;
 if ($status == '0') { $sql .= " AND a.percent = 0"; }
@@ -529,10 +512,10 @@ if ($status == 'todo') { $sql .= " AND (a.percent >= 0 AND a.percent < 100)"; }
 // We must filter on assignement table
 if ($filtert > 0 || $usergroup > 0)
 {
-    $sql .= " AND (";
-    if ($filtert > 0) $sql .= "ar.fk_element = ".$filtert;
-    if ($usergroup > 0) $sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
-    $sql .= ")";
+	$sql .= " AND (";
+	if ($filtert > 0) $sql .= "ar.fk_element = ".$filtert;
+	if ($usergroup > 0) $sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
+	$sql .= ")";
 }
 // Sort on date
 $sql .= ' ORDER BY fk_user_action, datep'; //fk_user_action
@@ -542,104 +525,104 @@ dol_syslog("comm/action/pertype.php", LOG_DEBUG);
 $resql = $db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
-    $i = 0;
-    while ($i < $num)
-    {
-        $obj = $db->fetch_object($resql);
+	$num = $db->num_rows($resql);
+	$i = 0;
+	while ($i < $num)
+	{
+		$obj = $db->fetch_object($resql);
 
-        // Discard auto action if option is on
-        if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO')
-        {
-        	$i++;
-        	continue;
-        }
+		// Discard auto action if option is on
+		if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO')
+		{
+			$i++;
+			continue;
+		}
 
-        $datep = $db->jdate($obj->datep);
-        $datep2 = $db->jdate($obj->datep2);
+		$datep = $db->jdate($obj->datep);
+		$datep2 = $db->jdate($obj->datep2);
 
-        // Create a new object action
-        $event = new ActionComm($db);
-        $event->id = $obj->id;
-        $event->datep = $datep; // datep and datef are GMT date
-        $event->datef = $datep2;
-        $event->type_code = $obj->code;
-        $event->type_color = $obj->color;
-        $event->label = $obj->label;
-        $event->percentage = $obj->percent;
-        $event->authorid = $obj->fk_user_author; // user id of creator
-        $event->userownerid = $obj->fk_user_action; // user id of owner
-        $event->priority = $obj->priority;
-        $event->fulldayevent = $obj->fulldayevent;
-        $event->location = $obj->location;
-        $event->transparency = $obj->transparency;
+		// Create a new object action
+		$event = new ActionComm($db);
+		$event->id = $obj->id;
+		$event->datep = $datep; // datep and datef are GMT date
+		$event->datef = $datep2;
+		$event->type_code = $obj->code;
+		$event->type_color = $obj->color;
+		$event->label = $obj->label;
+		$event->percentage = $obj->percent;
+		$event->authorid = $obj->fk_user_author; // user id of creator
+		$event->userownerid = $obj->fk_user_action; // user id of owner
+		$event->priority = $obj->priority;
+		$event->fulldayevent = $obj->fulldayevent;
+		$event->location = $obj->location;
+		$event->transparency = $obj->transparency;
 
-        $event->fk_project = $obj->fk_project;
+		$event->fk_project = $obj->fk_project;
 
-        $event->socid = $obj->fk_soc;
-        $event->contact_id = $obj->fk_contact;
+		$event->socid = $obj->fk_soc;
+		$event->contact_id = $obj->fk_contact;
 
-        $event->fk_element = $obj->fk_element;
-        $event->elementtype = $obj->elementtype;
+		$event->fk_element = $obj->fk_element;
+		$event->elementtype = $obj->elementtype;
 
-        // Defined date_start_in_calendar and date_end_in_calendar property
-        // They are date start and end of action but modified to not be outside calendar view.
-        if ($event->percentage <= 0)
-        {
-        	$event->date_start_in_calendar = $datep;
-        	if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
-        	else $event->date_end_in_calendar = $datep;
-        } else {
-        	$event->date_start_in_calendar = $datep;
-        	if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
-        	else $event->date_end_in_calendar = $datep;
-        }
-        // Define ponctual property
-        if ($event->date_start_in_calendar == $event->date_end_in_calendar)
-        {
-            $event->ponctuel = 1;
-        }
+		// Defined date_start_in_calendar and date_end_in_calendar property
+		// They are date start and end of action but modified to not be outside calendar view.
+		if ($event->percentage <= 0)
+		{
+			$event->date_start_in_calendar = $datep;
+			if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
+			else $event->date_end_in_calendar = $datep;
+		} else {
+			$event->date_start_in_calendar = $datep;
+			if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
+			else $event->date_end_in_calendar = $datep;
+		}
+		// Define ponctual property
+		if ($event->date_start_in_calendar == $event->date_end_in_calendar)
+		{
+			$event->ponctuel = 1;
+		}
 
-        // Check values
-        if ($event->date_end_in_calendar < $firstdaytoshow ||
-        $event->date_start_in_calendar >= $lastdaytoshow)
-        {
-            // This record is out of visible range
-        	unset($event);
-        } else {
+		// Check values
+		if ($event->date_end_in_calendar < $firstdaytoshow ||
+		$event->date_start_in_calendar >= $lastdaytoshow)
+		{
+			// This record is out of visible range
+			unset($event);
+		} else {
 			//print $i.' - '.dol_print_date($this->date_start_in_calendar, 'dayhour').' - '.dol_print_date($this->date_end_in_calendar, 'dayhour').'<br>'."\n";
 			$event->fetch_userassigned(); // This load $event->userassigned
 
 			if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar = $firstdaytoshow;
-            if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar = ($lastdaytoshow - 1);
+			if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar = ($lastdaytoshow - 1);
 
-            // Add an entry in actionarray for each day
-            $daycursor = $event->date_start_in_calendar;
-            $annee = date('Y', $daycursor);
-            $mois = date('m', $daycursor);
-            $jour = date('d', $daycursor);
+			// Add an entry in actionarray for each day
+			$daycursor = $event->date_start_in_calendar;
+			$annee = date('Y', $daycursor);
+			$mois = date('m', $daycursor);
+			$jour = date('d', $daycursor);
 
-            // Loop on each day covered by action to prepare an index to show on calendar
-            $loop = true; $j = 0;
-            $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
-            do {
-                //if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
+			// Loop on each day covered by action to prepare an index to show on calendar
+			$loop = true; $j = 0;
+			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
+			do {
+				//if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
 
-                $eventarray[$daykey][] = $event;
-                $j++;
+				$eventarray[$daykey][] = $event;
+				$j++;
 
-                $daykey += 60 * 60 * 24;
-                if ($daykey > $event->date_end_in_calendar) $loop = false;
-            } while ($loop);
+				$daykey += 60 * 60 * 24;
+				if ($daykey > $event->date_end_in_calendar) $loop = false;
+			} while ($loop);
 
-            //print 'Event '.$i.' id='.$event->id.' (start='.dol_print_date($event->datep).'-end='.dol_print_date($event->datef);
-            //print ' startincalendar='.dol_print_date($event->date_start_in_calendar).'-endincalendar='.dol_print_date($event->date_end_in_calendar).') was added in '.$j.' different index key of array<br>';
-        }
-        $i++;
-    }
-    $db->free($resql);
+			//print 'Event '.$i.' id='.$event->id.' (start='.dol_print_date($event->datep).'-end='.dol_print_date($event->datef);
+			//print ' startincalendar='.dol_print_date($event->date_start_in_calendar).'-endincalendar='.dol_print_date($event->date_end_in_calendar).') was added in '.$j.' different index key of array<br>';
+		}
+		$i++;
+	}
+	$db->free($resql);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 $maxnbofchar = 18;
@@ -651,7 +634,7 @@ $cacheusers = array();
 $color_file = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/theme_vars.inc.php";
 if (is_readable($color_file))
 {
-    include_once $color_file;
+	include_once $color_file;
 }
 if (!is_array($theme_datacolor)) $theme_datacolor = array(array(120, 130, 150), array(200, 160, 180), array(190, 190, 220));
 
@@ -739,7 +722,7 @@ foreach ($typeofevents as $typeofevent)
 			continue;
 		}
 
-        // Show days of the current week
+		// Show days of the current week
 		$curtime = dol_time_plus_duree($firstdaytoshow, $iter_day, 'd');
 		$tmparray = dol_getdate($curtime, 'fast');
 		$tmpday = $tmparray['mday'];
@@ -963,15 +946,15 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 							$busy = $event->transparency;
 							$cases1[$h][$event->id]['busy'] = $busy;
 							$cases1[$h][$event->id]['string'] = dol_print_date($event->date_start_in_calendar, 'dayhour');
-		                    if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
-			        		{
-				        		$tmpa = dol_getdate($event->date_start_in_calendar, true);
-				        		$tmpb = dol_getdate($event->date_end_in_calendar, true);
-				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour');
-				        		else $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour');
-			        		}
-			        		if ($event->label) $cases1[$h][$event->id]['string'] .= ' - '.$event->label;
-			        		$cases1[$h][$event->id]['typecode'] = $event->type_code;
+							if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
+							{
+								$tmpa = dol_getdate($event->date_start_in_calendar, true);
+								$tmpb = dol_getdate($event->date_end_in_calendar, true);
+								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour');
+								else $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour');
+							}
+							if ($event->label) $cases1[$h][$event->id]['string'] .= ' - '.$event->label;
+							$cases1[$h][$event->id]['typecode'] = $event->type_code;
 							$cases1[$h][$event->id]['color'] = $color;
 							if ($event->fk_project > 0)
 							{
@@ -1010,13 +993,13 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 							$cases2[$h][$event->id]['busy'] = $busy;
 							$cases2[$h][$event->id]['string'] = dol_print_date($event->date_start_in_calendar, 'dayhour');
 							if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
-			        		{
-				        		$tmpa = dol_getdate($event->date_start_in_calendar, true);
-				        		$tmpb = dol_getdate($event->date_end_in_calendar, true);
-				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour');
-				        		else $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour');
-			        		}
-			        		if ($event->label) $cases2[$h][$event->id]['string'] .= ' - '.$event->label;
+							{
+								$tmpa = dol_getdate($event->date_start_in_calendar, true);
+								$tmpb = dol_getdate($event->date_end_in_calendar, true);
+								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour');
+								else $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour');
+							}
+							if ($event->label) $cases2[$h][$event->id]['string'] .= ' - '.$event->label;
 							$cases2[$h][$event->id]['typecode'] = $event->type_code;
 							$cases2[$h][$event->id]['color'] = $color;
 							if ($event->fk_project > 0)
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index f99cc3cbd16..3ddea1c0cbf 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -74,7 +74,7 @@ if (!$user->rights->agenda->myactions->read) accessforbidden();
 if (!$user->rights->agenda->allactions->read) $canedit = 0;
 if (!$user->rights->agenda->allactions->read || $filter == 'mine')  // If no permission to see all, we show only affected to me
 {
-    $filtert = $user->id;
+	$filtert = $user->id;
 }
 
 //$action=GETPOST('action','alpha');
@@ -92,10 +92,10 @@ $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always ''
 // Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)
 if (GETPOST('search_actioncode', 'array'))
 {
-    $actioncode = GETPOST('search_actioncode', 'array', 3);
-    if (!count($actioncode)) $actioncode = '0';
+	$actioncode = GETPOST('search_actioncode', 'array', 3);
+	if (!count($actioncode)) $actioncode = '0';
 } else {
-    $actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode", "alpha") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
+	$actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode", "alpha") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
 
@@ -125,17 +125,17 @@ if ($begin_d < 1 || $begin_d > 7) $begin_d = 1;
 if ($end_d < 1 || $end_d > 7) $end_d = 7;
 if ($end_d < $begin_d) $end_d = $begin_d + 1;
 
-if ($status == '' && !isset($_GET['status']) && !isset($_POST['status'])) $status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
-if (empty($action) && !isset($_GET['action']) && !isset($_POST['action'])) $action = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
+if ($status == '' && !GETPOSTISSET('status')) $status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
+if (empty($action) && !GETPOSTISSET('action')) $action = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
 
 if (GETPOST('viewcal', 'alpha') && $action != 'show_day' && $action != 'show_week' && $action != 'show_peruser') {
-    $action = 'show_month'; $day = '';
+	$action = 'show_month'; $day = '';
 }                                                   // View by month
 if (GETPOST('viewweek', 'alpha') || $action == 'show_week') {
-    $action = 'show_week'; $week = ($week ? $week : date("W")); $day = ($day ? $day : date("d"));
+	$action = 'show_week'; $week = ($week ? $week : date("W")); $day = ($day ? $day : date("d"));
 }  // View by week
 if (GETPOST('viewday', 'alpha') || $action == 'show_day') {
-    $action = 'show_day'; $day = ($day ? $day : date("d"));
+	$action = 'show_day'; $day = ($day ? $day : date("d"));
 }                                  // View by day
 
 // Load translation files required by the page
@@ -151,13 +151,13 @@ $hookmanager->initHooks(array('agenda'));
 
 if ($action == 'delete_action')
 {
-    $event = new ActionComm($db);
-    $event->fetch($actionid);
-    $event->fetch_optionals();
-    $event->fetch_userassigned();
-    $event->oldcopy = clone $event;
+	$event = new ActionComm($db);
+	$event->fetch($actionid);
+	$event->fetch_optionals();
+	$event->fetch_userassigned();
+	$event->oldcopy = clone $event;
 
-    $result = $event->delete();
+	$result = $event->delete();
 }
 
 
@@ -227,13 +227,13 @@ if ($status == 'done') $title = $langs->trans("DoneActions");
 if ($status == 'todo') $title = $langs->trans("ToDoActions");
 
 $param = '';
-if ($actioncode || isset($_GET['search_actioncode']) || isset($_POST['search_actioncode'])) {
+if ($actioncode || GETPOSTISSET('search_actioncode')) {
 	if (is_array($actioncode)) {
 		foreach ($actioncode as $str_action) $param .= "&search_actioncode[]=".urlencode($str_action);
 	} else $param .= "&search_actioncode=".urlencode($actioncode);
 }
 if ($resourceid > 0) $param .= "&search_resourceid=".urlencode($resourceid);
-if ($status || isset($_GET['status']) || isset($_POST['status'])) $param .= "&search_status=".urlencode($status);
+if ($status || GETPOSTISSET('status')) $param .= "&search_status=".urlencode($status);
 if ($filter)        $param .= "&search_filter=".urlencode($filter);
 if ($filtert)       $param .= "&search_filtert=".urlencode($filtert);
 if ($usergroup)     $param .= "&search_usergroup=".urlencode($usergroup);
@@ -285,28 +285,11 @@ $nav = "<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev
 $nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y").", ".$langs->trans("Week")." ".$week;
 $nav .= " </span>\n";
 $nav .= " &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\"><i class=\"fa fa-chevron-right\" title=\"".dol_escape_htmltag($langs->trans("Next"))."\"></i></a>\n";
-$nav .= " &nbsp; <a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a> ";
-
-/*$nav.=' &nbsp; <form name="dateselect" action="'.$_SERVER["PHP_SELF"].'?action=show_peruser'.$param.'">';
-$nav.='<input type="hidden" name="token" value="' . newToken() . '">';
-$nav.='<input type="hidden" name="action" value="' . $action . '">';
-$nav.='<input type="hidden" name="filtert" value="' . $filtert . '">';
-$nav.='<input type="hidden" name="usergroup" value="' . $usergroup . '">';
-$nav.='<input type="hidden" name="actioncode" value="' . $actioncode . '">';
-$nav.='<input type="hidden" name="resourceid" value="' . $resourceid . '">';
-$nav.='<input type="hidden" name="status" value="' . $status . '">';
-$nav.='<input type="hidden" name="socid" value="' . $socid . '">';
-$nav.='<input type="hidden" name="projectid" value="' . $projectid . '">';
-$nav.='<input type="hidden" name="begin_h" value="' . $begin_h . '">';
-$nav.='<input type="hidden" name="end_h" value="' . $end_h . '">';
-$nav.='<input type="hidden" name="begin_d" value="' . $begin_d . '">';
-$nav.='<input type="hidden" name="end_d" value="' . $end_d . '">';
-$nav.='<input type="hidden" name="showbirthday" value="' . $showbirthday . '">';
-*/
+if (empty($conf->dol_optimize_smallscreen)) {
+	$nav .= " &nbsp; <a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a> ";
+}
 $nav .= $form->selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0);
-//$nav .= ' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
 $nav .= ' <button type="submit" class="liste_titre button_search" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';
-//$nav.='</form>';
 
 // Must be after the nav definition
 $param .= '&year='.urlencode($year).'&month='.urlencode($month).($day ? '&day='.urlencode($day) : '');
@@ -340,8 +323,8 @@ if ($conf->use_javascript_ajax)
 	$s .= 'jQuery(".family_birthday").toggle();'."\n";
 	if ($action == "show_week" || $action == "show_month" || empty($action))
 	{
-    	$s .= 'jQuery( "td.sortable" ).sortable({connectWith: ".sortable",placeholder: "ui-state-highlight",items: "div:not(.unsortable)", receive: function( event, ui ) {';
-    	$s .= 'var frm=jQuery("#move_event");frm.attr("action",ui.item.find("a.cal_event").attr("href")).children("#newdate").val(jQuery(event.target).closest("div").attr("id"));frm.submit();}});'."\n";
+		$s .= 'jQuery( "td.sortable" ).sortable({connectWith: ".sortable",placeholder: "ui-state-highlight",items: "div:not(.unsortable)", receive: function( event, ui ) {';
+		$s .= 'var frm=jQuery("#move_event");frm.attr("action",ui.item.find("a.cal_event").attr("href")).children("#newdate").val(jQuery(event.target).closest("div").attr("id"));frm.submit();}});'."\n";
 	}
   	$s .= '});'."\n";
 	$s .= '</script>'."\n";
@@ -368,15 +351,15 @@ if ($conf->use_javascript_ajax)
 		//$s.='<div class="nowrap float"><input type="checkbox" id="check_birthday" name="check_birthday"> '.$langs->trans("AgendaShowBirthdayEvents").' &nbsp; </div>';
 
 		// Calendars from hooks
-	    $parameters = array(); $object = null;
+		$parameters = array(); $object = null;
 		$reshook = $hookmanager->executeHooks('addCalendarChoice', $parameters, $object, $action);
-	    if (empty($reshook))
-	    {
-			$s .= $hookmanager->resPrint;
-	    } elseif ($reshook > 1)
+		if (empty($reshook))
 		{
-	    	$s = $hookmanager->resPrint;
-	    }
+			$s .= $hookmanager->resPrint;
+		} elseif ($reshook > 1)
+		{
+			$s = $hookmanager->resPrint;
+		}
 	}
 }
 
@@ -425,7 +408,7 @@ if ($user->rights->agenda->myactions->create || $user->rights->agenda->allaction
 
 	//$param='month='.$monthshown.'&year='.$year;
 	$hourminsec = '100000';
-    $newcardbutton .= dolGetButtonTitle($langs->trans("AddAction"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.sprintf("%04d%02d%02d", $tmpforcreatebutton['year'], $tmpforcreatebutton['mon'], $tmpforcreatebutton['mday']).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : '')));
+	$newcardbutton .= dolGetButtonTitle($langs->trans("AddAction"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.sprintf("%04d%02d%02d", $tmpforcreatebutton['year'], $tmpforcreatebutton['mon'], $tmpforcreatebutton['mday']).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : '')));
 }
 
 print_barre_liste($langs->trans("Agenda"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, -1, 'object_action', 0, $nav.'<span class="marginleftonly"></span>'.$newcardbutton, '', $limit, 1, 0, 1, $viewmode);
@@ -474,26 +457,26 @@ $sql .= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
 if (!empty($actioncode))
 {
-    if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
-    {
-        if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
-        elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        else {
-            if ($actioncode == 'AC_OTH') $sql .= " AND ca.type != 'systemauto'";
-            if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        }
-    } else {
-        if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
-        elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        else {
-            if (is_array($actioncode))
-            {
-  	        	$sql .= " AND ca.code IN ('".implode("','", $actioncode)."')";
-            } else {
-  	        	$sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
-            }
-        }
-    }
+	if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
+	{
+		if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
+		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
+		else {
+			if ($actioncode == 'AC_OTH') $sql .= " AND ca.type != 'systemauto'";
+			if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND ca.type = 'systemauto'";
+		}
+	} else {
+		if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
+		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
+		else {
+			if (is_array($actioncode))
+			{
+  				$sql .= " AND ca.code IN ('".implode("','", $actioncode)."')";
+			} else {
+  				$sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
+			}
+		}
+	}
 }
 if ($resourceid > 0) $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);
 if ($pid) $sql .= " AND a.fk_project=".$db->escape($pid);
@@ -503,28 +486,28 @@ if ($socid > 0) $sql .= ' AND a.fk_soc = '.$socid;
 if ($filtert > 0 || $usergroup > 0) $sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
 if ($action == 'show_day')
 {
-    $sql .= " AND (";
-    $sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
-    $sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
-    $sql .= " OR ";
-    $sql .= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
-    $sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
-    $sql .= " OR ";
-    $sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
-    $sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
-    $sql .= ')';
+	$sql .= " AND (";
+	$sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
+	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+	$sql .= " OR ";
+	$sql .= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
+	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+	$sql .= " OR ";
+	$sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
+	$sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+	$sql .= ')';
 } else {
-    // To limit array
-    $sql .= " AND (";
-    $sql .= " (a.datep BETWEEN '".$db->idate($firstdaytoshow - (60 * 60 * 24 * 2))."'"; // Start 2 day before $firstdaytoshow
-    $sql .= " AND '".$db->idate($lastdaytoshow + (60 * 60 * 24 * 2))."')"; // End 2 day after $lastdaytoshow
-    $sql .= " OR ";
-    $sql .= " (a.datep2 BETWEEN '".$db->idate($firstdaytoshow - (60 * 60 * 24 * 2))."'";
-    $sql .= " AND '".$db->idate($lastdaytoshow + (60 * 60 * 24 * 2))."')";
-    $sql .= " OR ";
-    $sql .= " (a.datep < '".$db->idate($firstdaytoshow - (60 * 60 * 24 * 2))."'";
-    $sql .= " AND a.datep2 > '".$db->idate($lastdaytoshow + (60 * 60 * 24 * 2))."')";
-    $sql .= ')';
+	// To limit array
+	$sql .= " AND (";
+	$sql .= " (a.datep BETWEEN '".$db->idate($firstdaytoshow - (60 * 60 * 24 * 2))."'"; // Start 2 day before $firstdaytoshow
+	$sql .= " AND '".$db->idate($lastdaytoshow + (60 * 60 * 24 * 2))."')"; // End 2 day after $lastdaytoshow
+	$sql .= " OR ";
+	$sql .= " (a.datep2 BETWEEN '".$db->idate($firstdaytoshow - (60 * 60 * 24 * 2))."'";
+	$sql .= " AND '".$db->idate($lastdaytoshow + (60 * 60 * 24 * 2))."')";
+	$sql .= " OR ";
+	$sql .= " (a.datep < '".$db->idate($firstdaytoshow - (60 * 60 * 24 * 2))."'";
+	$sql .= " AND a.datep2 > '".$db->idate($lastdaytoshow + (60 * 60 * 24 * 2))."')";
+	$sql .= ')';
 }
 if ($type) $sql .= " AND ca.id = ".$type;
 if ($status == '0') { $sql .= " AND a.percent = 0"; }
@@ -535,10 +518,10 @@ if ($status == 'todo') { $sql .= " AND (a.percent >= 0 AND a.percent < 100)"; }
 // We must filter on assignement table
 if ($filtert > 0 || $usergroup > 0)
 {
-    $sql .= " AND (";
-    if ($filtert > 0) $sql .= "ar.fk_element = ".$filtert;
-    if ($usergroup > 0) $sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
-    $sql .= ")";
+	$sql .= " AND (";
+	if ($filtert > 0) $sql .= "ar.fk_element = ".$filtert;
+	if ($usergroup > 0) $sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
+	$sql .= ")";
 }
 // Sort on date
 $sql .= ' ORDER BY fk_user_action, datep'; //fk_user_action
@@ -548,105 +531,105 @@ dol_syslog("comm/action/peruser.php", LOG_DEBUG);
 $resql = $db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
+	$num = $db->num_rows($resql);
 
-    $i = 0;
-    while ($i < $num)
-    {
-        $obj = $db->fetch_object($resql);
+	$i = 0;
+	while ($i < $num)
+	{
+		$obj = $db->fetch_object($resql);
 
-        // Discard auto action if option is on
-        if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO')
-        {
-        	$i++;
-        	continue;
-        }
+		// Discard auto action if option is on
+		if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO')
+		{
+			$i++;
+			continue;
+		}
 
-        $datep = $db->jdate($obj->datep);
-        $datep2 = $db->jdate($obj->datep2);
+		$datep = $db->jdate($obj->datep);
+		$datep2 = $db->jdate($obj->datep2);
 
-        // Create a new object action
-        $event = new ActionComm($db);
-        $event->id = $obj->id;
-        $event->datep = $datep; // datep and datef are GMT date
-        $event->datef = $datep2;
-        $event->type_code = $obj->code;
-        $event->type_color = $obj->color;
-        $event->label = $obj->label;
-        $event->percentage = $obj->percent;
-        $event->authorid = $obj->fk_user_author; // user id of creator
-        $event->userownerid = $obj->fk_user_action; // user id of owner
-        $event->priority = $obj->priority;
-        $event->fulldayevent = $obj->fulldayevent;
-        $event->location = $obj->location;
-        $event->transparency = $obj->transparency;
+		// Create a new object action
+		$event = new ActionComm($db);
+		$event->id = $obj->id;
+		$event->datep = $datep; // datep and datef are GMT date
+		$event->datef = $datep2;
+		$event->type_code = $obj->code;
+		$event->type_color = $obj->color;
+		$event->label = $obj->label;
+		$event->percentage = $obj->percent;
+		$event->authorid = $obj->fk_user_author; // user id of creator
+		$event->userownerid = $obj->fk_user_action; // user id of owner
+		$event->priority = $obj->priority;
+		$event->fulldayevent = $obj->fulldayevent;
+		$event->location = $obj->location;
+		$event->transparency = $obj->transparency;
 
-        $event->fk_project = $obj->fk_project;
+		$event->fk_project = $obj->fk_project;
 
-        $event->socid = $obj->fk_soc;
-        $event->contact_id = $obj->fk_contact;
+		$event->socid = $obj->fk_soc;
+		$event->contact_id = $obj->fk_contact;
 
-        $event->fk_element = $obj->fk_element;
-        $event->elementtype = $obj->elementtype;
+		$event->fk_element = $obj->fk_element;
+		$event->elementtype = $obj->elementtype;
 
-        // Defined date_start_in_calendar and date_end_in_calendar property
-        // They are date start and end of action but modified to not be outside calendar view.
-        if ($event->percentage <= 0)
-        {
-            $event->date_start_in_calendar = $datep;
-            if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
-            else $event->date_end_in_calendar = $datep;
-        } else {
-            $event->date_start_in_calendar = $datep;
-            if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
-            else $event->date_end_in_calendar = $datep;
-        }
-        // Define ponctual property
-        if ($event->date_start_in_calendar == $event->date_end_in_calendar)
-        {
-            $event->ponctuel = 1;
-        }
+		// Defined date_start_in_calendar and date_end_in_calendar property
+		// They are date start and end of action but modified to not be outside calendar view.
+		if ($event->percentage <= 0)
+		{
+			$event->date_start_in_calendar = $datep;
+			if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
+			else $event->date_end_in_calendar = $datep;
+		} else {
+			$event->date_start_in_calendar = $datep;
+			if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
+			else $event->date_end_in_calendar = $datep;
+		}
+		// Define ponctual property
+		if ($event->date_start_in_calendar == $event->date_end_in_calendar)
+		{
+			$event->ponctuel = 1;
+		}
 
-        // Check values
-        if ($event->date_end_in_calendar < $firstdaytoshow ||
-        $event->date_start_in_calendar >= $lastdaytoshow)
-        {
-            // This record is out of visible range
-            unset($event);
-        } else {
+		// Check values
+		if ($event->date_end_in_calendar < $firstdaytoshow ||
+		$event->date_start_in_calendar >= $lastdaytoshow)
+		{
+			// This record is out of visible range
+			unset($event);
+		} else {
 			//print $i.' - '.dol_print_date($this->date_start_in_calendar, 'dayhour').' - '.dol_print_date($this->date_end_in_calendar, 'dayhour').'<br>'."\n";
-        	$event->fetch_userassigned(); // This load $event->userassigned
+			$event->fetch_userassigned(); // This load $event->userassigned
 
 			if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar = $firstdaytoshow;
-            if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar = ($lastdaytoshow - 1);
+			if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar = ($lastdaytoshow - 1);
 
-            // Add an entry in actionarray for each day
-            $daycursor = $event->date_start_in_calendar;
-            $annee = date('Y', $daycursor);
-            $mois = date('m', $daycursor);
-            $jour = date('d', $daycursor);
+			// Add an entry in actionarray for each day
+			$daycursor = $event->date_start_in_calendar;
+			$annee = date('Y', $daycursor);
+			$mois = date('m', $daycursor);
+			$jour = date('d', $daycursor);
 
-            // Loop on each day covered by action to prepare an index to show on calendar
-            $loop = true; $j = 0;
-            $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
-            do {
-                //if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
+			// Loop on each day covered by action to prepare an index to show on calendar
+			$loop = true; $j = 0;
+			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
+			do {
+				//if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
 
-                $eventarray[$daykey][] = $event;
-                $j++;
+				$eventarray[$daykey][] = $event;
+				$j++;
 
-                $daykey += 60 * 60 * 24;
-                if ($daykey > $event->date_end_in_calendar) $loop = false;
-            } while ($loop);
+				$daykey += 60 * 60 * 24;
+				if ($daykey > $event->date_end_in_calendar) $loop = false;
+			} while ($loop);
 
-            //print 'Event '.$i.' id='.$event->id.' (start='.dol_print_date($event->datep).'-end='.dol_print_date($event->datef);
-            //print ' startincalendar='.dol_print_date($event->date_start_in_calendar).'-endincalendar='.dol_print_date($event->date_end_in_calendar).') was added in '.$j.' different index key of array<br>';
-        }
-        $i++;
-    }
-    $db->free($resql);
+			//print 'Event '.$i.' id='.$event->id.' (start='.dol_print_date($event->datep).'-end='.dol_print_date($event->datef);
+			//print ' startincalendar='.dol_print_date($event->date_start_in_calendar).'-endincalendar='.dol_print_date($event->date_end_in_calendar).') was added in '.$j.' different index key of array<br>';
+		}
+		$i++;
+	}
+	$db->free($resql);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 $maxnbofchar = 18;
@@ -658,7 +641,7 @@ $cacheusers = array();
 $color_file = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/theme_vars.inc.php";
 if (is_readable($color_file))
 {
-    include_once $color_file;
+	include_once $color_file;
 }
 if (!is_array($theme_datacolor)) $theme_datacolor = array(array(120, 130, 150), array(200, 160, 180), array(190, 190, 220));
 
@@ -690,7 +673,7 @@ while ($currentdaytoshow < $lastdaytoshow) {
 	echo '<table width="100%" class="noborder nocellnopadd cal_month">';
 
 	echo '<tr class="liste_titre">';
-	echo '<td class="nopaddingtopimp nopaddingbottomimp">';
+	echo '<td class="nopaddingtopimp nopaddingbottomimp nowraponsmartphone">';
 
 	if ($canedit && $action == 'show_peruser')
 	{
@@ -767,15 +750,15 @@ while ($currentdaytoshow < $lastdaytoshow) {
 	{
 		foreach ($eventarray as $daykey => $notused)
 		{
-		    // Get all assigned users for each event
-		    foreach ($eventarray[$daykey] as $index => $event)
-		    {
-			    $event->fetch_userassigned();
+			// Get all assigned users for each event
+			foreach ($eventarray[$daykey] as $index => $event)
+			{
+				$event->fetch_userassigned();
 				$listofuserid = $event->userassigned;
 				foreach ($listofuserid as $userid => $tmp) {
 				   	if (!in_array($userid, $usernamesid)) $usernamesid[$userid] = $userid;
 				}
-		    }
+			}
 		}
 	} else {
 		/* Use this list to have for all users */
@@ -787,17 +770,17 @@ while ($currentdaytoshow < $lastdaytoshow) {
 		//print $sql;
 		$resql = $db->query($sql);
 		if ($resql) {
-		    $num = $db->num_rows($resql);
-		    $i = 0;
-		    if ($num)
-		    {
-		        while ($i < $num)
-		        {
-		            $obj = $db->fetch_object($resql);
+			$num = $db->num_rows($resql);
+			$i = 0;
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
 					$usernamesid[$obj->rowid] = $obj->rowid;
 					$i++;
-		        }
-		    }
+				}
+			}
 		} else dol_print_error($db);
 	}
 	//var_dump($usernamesid);
@@ -863,7 +846,7 @@ while ($currentdaytoshow < $lastdaytoshow) {
 				continue;
 			}
 
-	        // Show days of the current week
+			// Show days of the current week
 			$curtime = dol_time_plus_duree($currentdaytoshow, $iter_day, 'd');
 			$tmparray = dol_getdate($curtime, 'fast');
 			$tmpday = $tmparray['mday'];
@@ -1119,13 +1102,13 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 							$busy = $event->transparency;
 							$cases1[$h][$event->id]['busy'] = $busy;
 							$cases1[$h][$event->id]['string'] = dol_print_date($event->date_start_in_calendar, 'dayhour');
-		                    if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
-			        		{
-				        		$tmpa = dol_getdate($event->date_start_in_calendar, true);
-				        		$tmpb = dol_getdate($event->date_end_in_calendar, true);
-				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour');
-				        		else $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour');
-			        		}
+							if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
+							{
+								$tmpa = dol_getdate($event->date_start_in_calendar, true);
+								$tmpb = dol_getdate($event->date_end_in_calendar, true);
+								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour');
+								else $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour');
+							}
 							if ($event->label) $cases1[$h][$event->id]['string'] .= ' - '.$event->label;
 							$cases1[$h][$event->id]['typecode'] = $event->type_code;
 							$cases1[$h][$event->id]['color'] = $color;
@@ -1166,12 +1149,12 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 							$cases2[$h][$event->id]['busy'] = $busy;
 							$cases2[$h][$event->id]['string'] = dol_print_date($event->date_start_in_calendar, 'dayhour');
 							if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
-			        		{
-				        		$tmpa = dol_getdate($event->date_start_in_calendar, true);
-				        		$tmpb = dol_getdate($event->date_end_in_calendar, true);
-				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour');
-				        		else $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour');
-			        		}
+							{
+								$tmpa = dol_getdate($event->date_start_in_calendar, true);
+								$tmpb = dol_getdate($event->date_end_in_calendar, true);
+								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour');
+								else $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour');
+							}
 							if ($event->label) $cases2[$h][$event->id]['string'] .= ' - '.$event->label;
 							$cases2[$h][$event->id]['typecode'] = $event->type_code;
 							$cases2[$h][$event->id]['color'] = $color;
@@ -1258,7 +1241,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 		}
 
 		$ids1 = '';
-        $ids2 = '';
+		$ids2 = '';
 		if (is_array($cases1[$h]) && count($cases1[$h]) && array_keys($cases1[$h])) $ids1 = join(',', array_keys($cases1[$h]));
 		if (is_array($cases2[$h]) && count($cases2[$h]) && array_keys($cases2[$h])) $ids2 = join(',', array_keys($cases2[$h]));
 
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index fbb49772d3e..3534d3d8996 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -91,13 +91,13 @@ $sql .= " ORDER BY year DESC, month DESC, df DESC";
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-    	$page = 0;
-    	$offset = 0;
-    }
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -113,7 +113,7 @@ if ($resql)
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
@@ -125,10 +125,10 @@ if ($resql)
 	$moreforfilter = '';
 
 	$i = 0;
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
-    print '<tr class="liste_titre">';
+	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Period").'</td>';
 	print '<td class="center">'.$langs->trans("EventsNb").'</td>';
 	print '<td class="center">'.$langs->trans("Action").'</td>';
diff --git a/htdocs/comm/admin/propal_extrafields.php b/htdocs/comm/admin/propal_extrafields.php
index d154dc7aafb..84af27bb7b9 100644
--- a/htdocs/comm/admin/propal_extrafields.php
+++ b/htdocs/comm/admin/propal_extrafields.php
@@ -68,19 +68,19 @@ print load_fiche_titre($langs->trans("PropalSetup"), $linkback, 'title_setup');
 
 $head = propal_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Proposals"), -1, 'propal');
+print dol_get_fiche_head($head, 'attributes', $langs->trans("Proposals"), -1, 'propal');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a></div>';
-    print "</div>";
+	print '<div class="tabsAction">';
+	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a></div>';
+	print "</div>";
 }
 
 
@@ -92,10 +92,10 @@ if ($action != 'create' && $action != 'edit')
 
 if ($action == 'create')
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print "<br>";
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -105,10 +105,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && !empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/comm/admin/propaldet_extrafields.php b/htdocs/comm/admin/propaldet_extrafields.php
index 1acdbfa5ca1..fa12fe9b555 100644
--- a/htdocs/comm/admin/propaldet_extrafields.php
+++ b/htdocs/comm/admin/propaldet_extrafields.php
@@ -75,11 +75,11 @@ print load_fiche_titre($langs->trans("PropalSetup"), $linkback, 'title_setup');
 
 $head = propal_admin_prepare_head();
 
-dol_fiche_head($head, 'attributeslines', $langs->trans("Proposals"), -1, 'propal');
+print dol_get_fiche_head($head, 'attributeslines', $langs->trans("Proposals"), -1, 'propal');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 79278fef056..fe41203e946 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -86,6 +86,15 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('thirdpartycomm', 'globalcard'));
 
+// Security check
+$result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', 0);
+
+if ($object->id > 0) {
+	if (!($object->client > 0) || empty($user->rights->societe->lire)) {
+		accessforbidden();
+	}
+}
+
 $now = dol_now();
 
 
@@ -138,12 +147,12 @@ if (empty($reshook))
 	}
 
 	// customer preferred shipping method
-    if ($action == 'setshippingmethod' && $user->rights->societe->creer)
-    {
-        $object->fetch($id);
-        $result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
-        if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
-    }
+	if ($action == 'setshippingmethod' && $user->rights->societe->creer)
+	{
+		$object->fetch($id);
+		$result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
+		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+	}
 
 	// assujetissement a la TVA
 	if ($action == 'setassujtva' && $user->rights->societe->creer)
@@ -170,6 +179,7 @@ if (empty($reshook))
 		$object->stcomm_id = dol_getIdFromCode($db, GETPOST('stcomm', 'alpha'), 'c_stcomm');
 		$result = $object->update($object->id, $user);
 		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+		else $result = $object->fetch($object->id);
 	}
 
 	// update outstandng limit
@@ -191,31 +201,31 @@ if (empty($reshook))
 	}
 
 	// Set sales representatives
-    if ($action == 'set_salesrepresentatives' && $user->rights->societe->creer)
+	if ($action == 'set_salesrepresentatives' && $user->rights->societe->creer)
 	{
 		$object->fetch($id);
 		$result = $object->setSalesRep(GETPOST('commercial', 'array'));
 	}
 
 	if ($action == 'update_extras') {
-        $object->fetch($id);
+		$object->fetch($id);
 
-        $object->oldcopy = dol_clone($object);
+		$object->oldcopy = dol_clone($object);
 
-        // Fill array 'array_options' with data from update form
-        $ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
-        if ($ret < 0) $error++;
-        if (!$error)
-        {
-        	$result = $object->insertExtraFields('COMPANY_MODIFY');
+		// Fill array 'array_options' with data from update form
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
+		if ($ret < 0) $error++;
+		if (!$error)
+		{
+			$result = $object->insertExtraFields('COMPANY_MODIFY');
 			if ($result < 0)
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
 			}
-        }
-        if ($error) $action = 'edit_extras';
-    }
+		}
+		if ($error) $action = 'edit_extras';
+	}
 }
 
 
@@ -245,15 +255,15 @@ if ($object->id > 0)
 {
 	$head = societe_prepare_head($object);
 
-	dol_fiche_head($head, 'customer', $langs->trans("ThirdParty"), -1, 'company');
+	print dol_get_fiche_head($head, 'customer', $langs->trans("ThirdParty"), -1, 'company');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
+	dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
 
 	print '<div class="fichecenter"><div class="fichehalfleft">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">';
 
 	// Prospect/Customer
@@ -262,16 +272,16 @@ if ($object->id > 0)
 	print '</td></tr>';
 
 	// Prefix
-    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-    {
-        print '<tr><td>'.$langs->trans("Prefix").'</td><td>';
-	    print ($object->prefix_comm ? $object->prefix_comm : '&nbsp;');
-	    print '</td></tr>';
-    }
+	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+	{
+		print '<tr><td>'.$langs->trans("Prefix").'</td><td>';
+		print ($object->prefix_comm ? $object->prefix_comm : '&nbsp;');
+		print '</td></tr>';
+	}
 
 	if ($object->client)
 	{
-        $langs->load("compta");
+		$langs->load("compta");
 
 		print '<tr><td>';
 		print $langs->trans('CustomerCode').'</td><td>';
@@ -386,64 +396,64 @@ if ($object->id > 0)
 	// Relative discounts (Discounts-Drawbacks-Rebates)
 	if ($isCustomer)
 	{
-    	print '<tr><td class="nowrap">';
-    	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-    	print $langs->trans("CustomerRelativeDiscountShort");
-    	print '<td><td class="right">';
-    	if ($user->rights->societe->creer && !$user->socid > 0)
-    	{
-    		print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.img_edit($langs->trans("Modify")).'</a>';
-    	}
-    	print '</td></tr></table>';
-    	print '</td><td>'.($object->remise_percent ? '<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.$object->remise_percent.'%</a>' : '').'</td>';
-    	print '</tr>';
+		print '<tr><td class="nowrap">';
+		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+		print $langs->trans("CustomerRelativeDiscountShort");
+		print '<td><td class="right">';
+		if ($user->rights->societe->creer && !$user->socid > 0)
+		{
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.img_edit($langs->trans("Modify")).'</a>';
+		}
+		print '</td></tr></table>';
+		print '</td><td>'.($object->remise_percent ? '<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.$object->remise_percent.'%</a>' : '').'</td>';
+		print '</tr>';
 
-    	// Absolute discounts (Discounts-Drawbacks-Rebates)
-    	print '<tr><td class="nowrap">';
-    	print '<table width="100%" class="nobordernopadding">';
-    	print '<tr><td class="nowrap">';
-    	print $langs->trans("CustomerAbsoluteDiscountShort");
-    	print '<td><td class="right">';
-    	if ($user->rights->societe->creer && !$user->socid > 0)
-    	{
-    		print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.img_edit($langs->trans("Modify")).'</a>';
-    	}
-    	print '</td></tr></table>';
-    	print '</td>';
-    	print '<td>';
-    	$amount_discount = $object->getAvailableDiscounts();
-    	if ($amount_discount < 0) dol_print_error($db, $object->error);
-    	if ($amount_discount > 0) print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.price($amount_discount, 1, $langs, 1, -1, -1, $conf->currency).'</a>';
-    	//else print $langs->trans("DiscountNone");
-    	print '</td>';
-    	print '</tr>';
+		// Absolute discounts (Discounts-Drawbacks-Rebates)
+		print '<tr><td class="nowrap">';
+		print '<table width="100%" class="nobordernopadding">';
+		print '<tr><td class="nowrap">';
+		print $langs->trans("CustomerAbsoluteDiscountShort");
+		print '<td><td class="right">';
+		if ($user->rights->societe->creer && !$user->socid > 0)
+		{
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.img_edit($langs->trans("Modify")).'</a>';
+		}
+		print '</td></tr></table>';
+		print '</td>';
+		print '<td>';
+		$amount_discount = $object->getAvailableDiscounts();
+		if ($amount_discount < 0) dol_print_error($db, $object->error);
+		if ($amount_discount > 0) print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.price($amount_discount, 1, $langs, 1, -1, -1, $conf->currency).'</a>';
+		//else print $langs->trans("DiscountNone");
+		print '</td>';
+		print '</tr>';
 	}
 
 	// Max outstanding bill
 	if ($object->client)
 	{
-	    print '<tr class="nowrap">';
-	    print '<td>';
-	    print $form->editfieldkey("OutstandingBill", 'outstanding_limit', $object->outstanding_limit, $object, $user->rights->societe->creer);
-	    print '</td><td>';
-	    $limit_field_type = (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE)) ? 'numeric' : 'amount';
-	    print $form->editfieldval("OutstandingBill", 'outstanding_limit', $object->outstanding_limit, $object, $user->rights->societe->creer, $limit_field_type, ($object->outstanding_limit != '' ? price($object->outstanding_limit) : ''));
-	    print '</td>';
-	    print '</tr>';
+		print '<tr class="nowrap">';
+		print '<td>';
+		print $form->editfieldkey("OutstandingBill", 'outstanding_limit', $object->outstanding_limit, $object, $user->rights->societe->creer);
+		print '</td><td>';
+		$limit_field_type = (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE)) ? 'numeric' : 'amount';
+		print $form->editfieldval("OutstandingBill", 'outstanding_limit', $object->outstanding_limit, $object, $user->rights->societe->creer, $limit_field_type, ($object->outstanding_limit != '' ? price($object->outstanding_limit) : ''));
+		print '</td>';
+		print '</tr>';
 	}
 
 	if ($object->client)
 	{
 		if (!empty($conf->commande->enabled) && !empty($conf->global->ORDER_MANAGE_MIN_AMOUNT))
 		{
-		    print '<!-- Minimim amount for orders -->'."\n";
-		    print '<tr class="nowrap">';
-		    print '<td>';
-		    print $form->editfieldkey("OrderMinAmount", 'order_min_amount', $object->order_min_amount, $object, $user->rights->societe->creer);
-		    print '</td><td>';
-		    print $form->editfieldval("OrderMinAmount", 'order_min_amount', $object->order_min_amount, $object, $user->rights->societe->creer, $limit_field_type, ($object->order_min_amount != '' ? price($object->order_min_amount) : ''));
-		    print '</td>';
-		    print '</tr>';
+			print '<!-- Minimim amount for orders -->'."\n";
+			print '<tr class="nowrap">';
+			print '<td>';
+			print $form->editfieldkey("OrderMinAmount", 'order_min_amount', $object->order_min_amount, $object, $user->rights->societe->creer);
+			print '</td><td>';
+			print $form->editfieldval("OrderMinAmount", 'order_min_amount', $object->order_min_amount, $object, $user->rights->societe->creer, $limit_field_type, ($object->order_min_amount != '' ? price($object->order_min_amount) : ''));
+			print '</td>';
+			print '</tr>';
 		}
 	}
 
@@ -468,24 +478,45 @@ if ($object->id > 0)
 		print '</tr>';
 	}
 
-    // Preferred shipping Method
-    if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD)) {
-        print '<tr><td class="nowrap">';
-        print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-        print $langs->trans('SendingMethod');
-        print '<td>';
-        if (($action != 'editshipping') && $user->rights->societe->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshipping&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
-        print '</tr></table>';
-        print '</td><td>';
-        if ($action == 'editshipping')
-        {
-            $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->shipping_method_id, 'shipping_method_id', 1);
-        } else {
-            $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->shipping_method_id, 'none');
-        }
-        print "</td>";
-        print '</tr>';
-    }
+	// Preferred shipping Method
+	if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD)) {
+		print '<tr><td class="nowrap">';
+		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+		print $langs->trans('SendingMethod');
+		print '<td>';
+		if (($action != 'editshipping') && $user->rights->societe->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshipping&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+		print '</tr></table>';
+		print '</td><td>';
+		if ($action == 'editshipping')
+		{
+			$form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->shipping_method_id, 'shipping_method_id', 1);
+		} else {
+			$form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->shipping_method_id, 'none');
+		}
+		print "</td>";
+		print '</tr>';
+	}
+
+	if (!empty($conf->intracommreport->enabled))
+	{
+		// Transport mode by default
+		print '<tr><td class="nowrap">';
+		print '<table class="centpercent nobordernopadding"><tr><td class="nowrap">';
+		print $langs->trans('IntracommReportTransportMode');
+		print '<td>';
+		if (($action != 'edittransportmode') && $user->rights->societe->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edittransportmode&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+		print '</tr></table>';
+		print '</td><td>';
+		if ($action == 'edittransportmode')
+		{
+			$form->formSelectTransportMode($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_transport_mode, 'fk_transport_mode', 1);
+		}
+		else {
+			$form->formSelectTransportMode($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_transport_mode, 'none');
+		}
+		print "</td>";
+		print '</tr>';
+	}
 
 	// Categories
 	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
@@ -500,70 +531,70 @@ if ($object->id > 0)
 	$parameters = array('socid'=>$object->id);
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
-    // Sales representative
+	// Sales representative
 	include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
 
-    // Module Adherent
-    if (!empty($conf->adherent->enabled))
-    {
-        $langs->load("members");
-        $langs->load("users");
+	// Module Adherent
+	if (!empty($conf->adherent->enabled))
+	{
+		$langs->load("members");
+		$langs->load("users");
 
-        print '<tr><td class="titlefield">'.$langs->trans("LinkedToDolibarrMember").'</td>';
-        print '<td>';
-        $adh = new Adherent($db);
-        $result = $adh->fetch('', '', $object->id);
-        if ($result > 0)
-        {
-            $adh->ref = $adh->getFullName($langs);
-            print $adh->getNomUrl(1);
-        } else {
-            print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
-        }
-        print '</td>';
-        print "</tr>\n";
-    }
+		print '<tr><td class="titlefield">'.$langs->trans("LinkedToDolibarrMember").'</td>';
+		print '<td>';
+		$adh = new Adherent($db);
+		$result = $adh->fetch('', '', $object->id);
+		if ($result > 0)
+		{
+			$adh->ref = $adh->getFullName($langs);
+			print $adh->getNomUrl(1);
+		} else {
+			print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
+		}
+		print '</td>';
+		print "</tr>\n";
+	}
 
 	print "</table>";
 
 	// Prospection level and status
 	if ($object->client == 2 || $object->client == 3)
 	{
-    	print '<br>';
+		print '<br>';
 
-    	print '<div class="underbanner clearboth"></div>';
-    	print '<table class="border centpercent tableforfield">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border centpercent tableforfield">';
 
-	    // Level of prospection
-	    print '<tr><td class="titlefield nowrap">';
-	    print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-	    print $langs->trans('ProspectLevel');
-	    print '<td>';
-	    if ($action != 'editlevel' && $user->rights->societe->creer) print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editlevel&amp;socid='.$object->id.'">'.img_edit($langs->trans('Modify'), 1).'</a></td>';
-	    print '</tr></table>';
-	    print '</td><td>';
-	    if ($action == 'editlevel')
-	    {
-	        $formcompany->form_prospect_level($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_prospectlevel, 'prospect_level_id', 1);
-	    } else {
-	        print $object->getLibProspLevel();
-	    }
-        print "</td>";
-        print '</tr>';
+		// Level of prospection
+		print '<tr><td class="titlefield nowrap">';
+		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+		print $langs->trans('ProspectLevel');
+		print '<td>';
+		if ($action != 'editlevel' && $user->rights->societe->creer) print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editlevel&amp;socid='.$object->id.'">'.img_edit($langs->trans('Modify'), 1).'</a></td>';
+		print '</tr></table>';
+		print '</td><td>';
+		if ($action == 'editlevel')
+		{
+			$formcompany->form_prospect_level($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_prospectlevel, 'prospect_level_id', 1);
+		} else {
+			print $object->getLibProspLevel();
+		}
+		print "</td>";
+		print '</tr>';
 
-        // Status of prospection
-        $object->loadCacheOfProspStatus();
-        print '<tr><td>'.$langs->trans("StatusProsp").'</td><td>'.$object->getLibProspCommStatut(4, $object->cacheprospectstatus[$object->stcomm_id]['label']);
-        print ' &nbsp; &nbsp; ';
-        print '<div class="floatright">';
-        foreach ($object->cacheprospectstatus as $key => $val)
-        {
+		// Status of prospection
+		$object->loadCacheOfProspStatus();
+		print '<tr><td>'.$langs->trans("StatusProsp").'</td><td>'.$object->getLibProspCommStatut(4, $object->cacheprospectstatus[$object->stcomm_id]['label']);
+		print ' &nbsp; &nbsp; ';
+		print '<div class="floatright">';
+		foreach ($object->cacheprospectstatus as $key => $val)
+		{
 			$titlealt = 'default';
 			if (!empty($val['code']) && !in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt = $val['label'];
 			if ($object->stcomm_id != $val['id']) print '<a class="pictosubstatus reposition" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&stcomm='.$val['code'].'&action=setstcomm&token='.newToken().'">'.img_action($titlealt, $val['code'], $val['picto']).'</a>';
 		}
-        print '</div></td></tr>';
-        print "</table>";
+		print '</div></td></tr>';
+		print "</table>";
 	}
 
 	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
@@ -618,10 +649,11 @@ if ($object->id > 0)
 	if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	{
 		// Box factures
-		$tmp = $object->getOutstandingBills();
+		$tmp = $object->getOutstandingBills('customer', 0);
 		$outstandingOpened = $tmp['opened'];
 		$outstandingTotal = $tmp['total_ht'];
 		$outstandingTotalIncTax = $tmp['total_ttc'];
+
 		$text = $langs->trans("OverAllInvoices");
 		$link = DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->id;
 		$icon = 'bill';
@@ -647,6 +679,24 @@ if ($object->id > 0)
 		$boxstat .= '<span class="boxstatsindicator'.($outstandingOpened > 0 ? ' amountremaintopay' : '').'">'.price($outstandingOpened, 1, $langs, 1, -1, -1, $conf->currency).$warn.'</span>';
 		$boxstat .= '</div>';
 		if ($link) $boxstat .= '</a>';
+
+		$tmp = $object->getOutstandingBills('customer', 1);
+		$outstandingOpenedLate = $tmp['opened'];
+		if ($outstandingOpened != $outstandingOpenedLate && !empty($outstandingOpenedLate)) {
+			$warn = '';
+			if ($object->outstanding_limit != '' && $object->outstanding_limit < $outstandingOpenedLate) {
+				$warn = ' '.img_warning($langs->trans("OutstandingBillReached"));
+			}
+			$text = $langs->trans("CurrentOutstandingBillLate");
+			$link = DOL_URL_ROOT.'/compta/recap-compta.php?socid='.$object->id;
+			$icon = 'bill';
+			if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+			$boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
+			$boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
+			$boxstat .= '<span class="boxstatsindicator'.($outstandingOpenedLate > 0 ? ' amountremaintopay' : '').'">'.price($outstandingOpenedLate, 1, $langs, 1, -1, -1, $conf->currency).$warn.'</span>';
+			$boxstat .= '</div>';
+			if ($link) $boxstat .= '</a>';
+		}
 	}
 
 	$parameters = array();
@@ -670,9 +720,9 @@ if ($object->id > 0)
 		$langs->load("propal");
 
 		$sql = "SELECT s.nom, s.rowid, p.rowid as propalid, p.fk_statut, p.total_ht";
-        $sql .= ", p.tva as total_tva";
-        $sql .= ", p.total as total_ttc";
-        $sql .= ", p.ref, p.ref_client, p.remise";
+		$sql .= ", p.tva as total_tva";
+		$sql .= ", p.total as total_ttc";
+		$sql .= ", p.ref, p.ref_client, p.remise";
 		$sql .= ", p.datep as dp, p.fin_validite as date_limit";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c";
 		$sql .= " WHERE p.fk_soc = s.rowid AND p.fk_statut = c.id";
@@ -686,17 +736,17 @@ if ($object->id > 0)
 			$propal_static = new Propal($db);
 
 			$num = $db->num_rows($resql);
-            if ($num > 0)
-            {
-            	print '<div class="div-table-responsive-no-min">';
-            	print '<table class="noborder centpercent lastrecordtable">';
+			if ($num > 0)
+			{
+				print '<div class="div-table-responsive-no-min">';
+				print '<table class="noborder centpercent lastrecordtable">';
 
-                print '<tr class="liste_titre">';
-    			print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastPropals", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/comm/propal/list.php?socid='.$object->id.'">'.$langs->trans("AllPropals").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
-                print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/comm/propal/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
-    			print '</tr></table></td>';
-    			print '</tr>';
-            }
+				print '<tr class="liste_titre">';
+				print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastPropals", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/comm/propal/list.php?socid='.$object->id.'">'.$langs->trans("AllPropals").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
+				print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/comm/propal/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
+				print '</tr></table></td>';
+				print '</tr>';
+			}
 
 			$i = 0;
 			while ($i < $num && $i < $MAXLIST)
@@ -704,17 +754,17 @@ if ($object->id > 0)
 				$objp = $db->fetch_object($resql);
 
 				print '<tr class="oddeven">';
-                print '<td class="nowrap">';
-                $propal_static->id = $objp->propalid;
-                $propal_static->ref = $objp->ref;
-                $propal_static->ref_client = $objp->ref_client;
-                $propal_static->total_ht = $objp->total_ht;
-                $propal_static->total_tva = $objp->total_tva;
-                $propal_static->total_ttc = $objp->total_ttc;
-                print $propal_static->getNomUrl(1);
-                if (($db->jdate($objp->date_limit) < ($now - $conf->propal->cloture->warning_delay)) && $objp->fk_statut == $propal_static::STATUS_VALIDATED) {
-                    print " ".img_warning();
-                }
+				print '<td class="nowrap">';
+				$propal_static->id = $objp->propalid;
+				$propal_static->ref = $objp->ref;
+				$propal_static->ref_client = $objp->ref_client;
+				$propal_static->total_ht = $objp->total_ht;
+				$propal_static->total_tva = $objp->total_tva;
+				$propal_static->total_ttc = $objp->total_ttc;
+				print $propal_static->getNomUrl(1);
+				if (($db->jdate($objp->date_limit) < ($now - $conf->propal->cloture->warning_delay)) && $objp->fk_statut == $propal_static::STATUS_VALIDATED) {
+					print " ".img_warning();
+				}
 				print '</td><td class="right" width="80px">'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
 				print '<td class="right" style="min-width: 60px">'.price($objp->total_ht).'</td>';
 				print '<td class="right" style="min-width: 60px" class="nowrap">'.$propal_static->LibStatut($objp->fk_statut, 5).'</td></tr>';
@@ -737,12 +787,12 @@ if ($object->id > 0)
 	 */
 	if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
 	{
-        $sql = "SELECT s.nom, s.rowid";
-        $sql .= ", c.rowid as cid, c.total_ht";
-        $sql .= ", c.tva as total_tva";
-        $sql .= ", c.total_ttc";
-        $sql .= ", c.ref, c.ref_client, c.fk_statut, c.facture";
-        $sql .= ", c.date_commande as dc";
+		$sql = "SELECT s.nom, s.rowid";
+		$sql .= ", c.rowid as cid, c.total_ht";
+		$sql .= ", c.tva as total_tva";
+		$sql .= ", c.total_ttc";
+		$sql .= ", c.ref, c.ref_client, c.fk_statut, c.facture";
+		$sql .= ", c.date_commande as dc";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
 		$sql .= " WHERE c.fk_soc = s.rowid ";
 		$sql .= " AND s.rowid = ".$object->id;
@@ -795,8 +845,8 @@ if ($object->id > 0)
 				$commande_static->billed = $objp->billed;
 
 				print '<tr class="oddeven">';
-                print '<td class="nowrap">';
-                print $commande_static->getNomUrl(1);
+				print '<td class="nowrap">';
+				print $commande_static->getNomUrl(1);
 				print '</td><td class="right" width="80px">'.dol_print_date($db->jdate($objp->dc), 'day')."</td>\n";
 				print '<td class="right" style="min-width: 60px">'.price($objp->total_ht).'</td>';
 				print '<td class="right" style="min-width: 60px" class="nowrap">'.$commande_static->LibStatut($objp->fk_statut, $objp->facture, 5).'</td></tr>';
@@ -814,78 +864,78 @@ if ($object->id > 0)
 		}
 	}
 
-    /*
+	/*
      *   Latest shipments
      */
-    if (!empty($conf->expedition->enabled) && $user->rights->expedition->lire)
-    {
-        $sql = 'SELECT e.rowid as id';
-        $sql .= ', e.ref';
-        $sql .= ', e.date_creation';
-        $sql .= ', e.fk_statut as statut';
-        $sql .= ', s.nom';
-        $sql .= ', s.rowid as socid';
-        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."expedition as e";
-        $sql .= " WHERE e.fk_soc = s.rowid AND s.rowid = ".$object->id;
-        $sql .= " AND e.entity IN (".getEntity('expedition').")";
-        $sql .= ' GROUP BY e.rowid';
-        $sql .= ', e.ref';
-        $sql .= ', e.date_creation';
-        $sql .= ', e.fk_statut';
-        $sql .= ', s.nom';
-        $sql .= ', s.rowid';
-        $sql .= " ORDER BY e.date_creation DESC";
+	if (!empty($conf->expedition->enabled) && $user->rights->expedition->lire)
+	{
+		$sql = 'SELECT e.rowid as id';
+		$sql .= ', e.ref';
+		$sql .= ', e.date_creation';
+		$sql .= ', e.fk_statut as statut';
+		$sql .= ', s.nom';
+		$sql .= ', s.rowid as socid';
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."expedition as e";
+		$sql .= " WHERE e.fk_soc = s.rowid AND s.rowid = ".$object->id;
+		$sql .= " AND e.entity IN (".getEntity('expedition').")";
+		$sql .= ' GROUP BY e.rowid';
+		$sql .= ', e.ref';
+		$sql .= ', e.date_creation';
+		$sql .= ', e.fk_statut';
+		$sql .= ', s.nom';
+		$sql .= ', s.rowid';
+		$sql .= " ORDER BY e.date_creation DESC";
 
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-        	$sendingstatic = new Expedition($db);
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$sendingstatic = new Expedition($db);
 
-        	$num = $db->num_rows($resql);
-            if ($num > 0) {
-            	print '<div class="div-table-responsive-no-min">';
-            	print '<table class="noborder centpercent lastrecordtable">';
+			$num = $db->num_rows($resql);
+			if ($num > 0) {
+				print '<div class="div-table-responsive-no-min">';
+				print '<table class="noborder centpercent lastrecordtable">';
 
-                print '<tr class="liste_titre">';
-                print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastSendings", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/expedition/list.php?socid='.$object->id.'">'.$langs->trans("AllSendings").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
-                print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/expedition/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
-                print '</tr></table></td>';
-                print '</tr>';
-            }
+				print '<tr class="liste_titre">';
+				print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastSendings", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/expedition/list.php?socid='.$object->id.'">'.$langs->trans("AllSendings").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
+				print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/expedition/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
+				print '</tr></table></td>';
+				print '</tr>';
+			}
 
-            $i = 0;
-            while ($i < $num && $i < $MAXLIST)
-            {
-                $objp = $db->fetch_object($resql);
+			$i = 0;
+			while ($i < $num && $i < $MAXLIST)
+			{
+				$objp = $db->fetch_object($resql);
 
-                $sendingstatic->id = $objp->id;
-                $sendingstatic->ref = $objp->ref;
+				$sendingstatic->id = $objp->id;
+				$sendingstatic->ref = $objp->ref;
 
-                print '<tr class="oddeven">';
-                print '<td class="nowrap">';
-                print $sendingstatic->getNomUrl(1);
-                print '</td>';
-                if ($objp->date_creation > 0) {
-                    print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->date_creation), 'day').'</td>';
-                } else {
-                    print '<td class="right"><b>!!!</b></td>';
-                }
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">';
+				print $sendingstatic->getNomUrl(1);
+				print '</td>';
+				if ($objp->date_creation > 0) {
+					print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->date_creation), 'day').'</td>';
+				} else {
+					print '<td class="right"><b>!!!</b></td>';
+				}
 
-                print '<td class="nowrap right" width="100" >'.$sendingstatic->LibStatut($objp->statut, 5).'</td>';
-                print "</tr>\n";
-                $i++;
-            }
-            $db->free($resql);
+				print '<td class="nowrap right" width="100" >'.$sendingstatic->LibStatut($objp->statut, 5).'</td>';
+				print "</tr>\n";
+				$i++;
+			}
+			$db->free($resql);
 
-            if ($num > 0)
-            {
-                print "</table>";
-                print '</div>';
-            }
-        } else {
-            dol_print_error($db);
-        }
-    }
+			if ($num > 0)
+			{
+				print "</table>";
+				print '</div>';
+			}
+		} else {
+			dol_print_error($db);
+		}
+	}
 
 	/*
 	 * Latest contracts
@@ -910,7 +960,7 @@ if ($object->id > 0)
 				print '<div class="div-table-responsive-no-min">';
 				print '<table class="noborder centpercent lastrecordtable">';
 
-			    print '<tr class="liste_titre">';
+				print '<tr class="liste_titre">';
 				print '<td colspan="5"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastContracts", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td>';
 				print '<td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/contrat/list.php?socid='.$object->id.'">'.$langs->trans("AllContracts").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
 				//print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/contract/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"),'stats').'</a></td>';
@@ -933,7 +983,7 @@ if ($object->id > 0)
 				$late = '';
 				foreach ($contrat->lines as $line) {
 					if ($contrat->statut == Contrat::STATUS_VALIDATED && $line->statut == ContratLigne::STATUS_OPEN) {
-						if (((!empty($line->date_fin_validite)?$line->date_fin_validite:0) + $conf->contrat->services->expires->warning_delay) < $now) $late = img_warning($langs->trans("Late"));
+						if (((!empty($line->date_fin_validite) ? $line->date_fin_validite : 0) + $conf->contrat->services->expires->warning_delay) < $now) $late = img_warning($langs->trans("Late"));
 					}
 				}
 
@@ -987,7 +1037,7 @@ if ($object->id > 0)
 				print '<div class="div-table-responsive-no-min">';
 				print '<table class="noborder centpercent lastrecordtable">';
 
-			    print '<tr class="liste_titre">';
+				print '<tr class="liste_titre">';
 				print '<td colspan="3"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastInterventions", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/fichinter/list.php?socid='.$object->id.'">'.$langs->trans("AllInterventions").'<span class="badge marginleftonlyshort">'.$num.'</span></td>';
 				print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/fichinter/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
 				print '</tr></table></td>';
@@ -1000,11 +1050,11 @@ if ($object->id > 0)
 				$objp = $db->fetch_object($resql);
 
 				$fichinter_static->id = $objp->id;
-                $fichinter_static->statut = $objp->fk_statut;
+				$fichinter_static->statut = $objp->fk_statut;
 
 				print '<tr class="oddeven">';
 				print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/fichinter/card.php?id='.$objp->id.'">'.img_object($langs->trans("ShowPropal"), "propal").' '.$objp->ref.'</a></td>'."\n";
-                //print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->startdate)).'</td>'."\n";
+				//print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->startdate)).'</td>'."\n";
 				print '<td class="right" style="min-width: 60px">'.convertSecondToTime($objp->duration).'</td>'."\n";
 				print '<td class="nowrap right" style="min-width: 60px">'.$fichinter_static->getLibStatut(5).'</td>'."\n";
 				print '</tr>';
@@ -1130,10 +1180,10 @@ if ($object->id > 0)
 	 */
 	if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	{
-        $sql = 'SELECT f.rowid as facid, f.ref, f.type';
-        $sql .= ', f.total as total_ht';
-        $sql .= ', f.tva as total_tva';
-        $sql .= ', f.total_ttc';
+		$sql = 'SELECT f.rowid as facid, f.ref, f.type';
+		$sql .= ', f.total as total_ht';
+		$sql .= ', f.tva as total_tva';
+		$sql .= ', f.total_ttc';
 		$sql .= ', f.datef as df, f.datec as dc, f.paye as paye, f.fk_statut as statut';
 		$sql .= ', s.nom, s.rowid as socid';
 		$sql .= ', SUM(pf.amount) as am';
@@ -1159,7 +1209,7 @@ if ($object->id > 0)
 
 				print '<tr class="liste_titre">';
 				print '<td colspan="5"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastCustomersBills", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->id.'">'.$langs->trans("AllBills").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
-                print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
+				print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
 				print '</tr></table></td>';
 				print '</tr>';
 			}
@@ -1192,9 +1242,9 @@ if ($object->id > 0)
 
 				if (!empty($conf->global->MAIN_SHOW_PRICE_WITH_TAX_IN_SUMMARIES))
 				{
-    				print '<td class="right" style="min-width: 60px">';
-    				print price($objp->total_ttc);
-    				print '</td>';
+					print '<td class="right" style="min-width: 60px">';
+					print price($objp->total_ttc);
+					print '</td>';
 				}
 
 				print '<td class="nowrap right" style="min-width: 60px">'.($facturestatic->LibStatut($objp->paye, $objp->statut, 5, $objp->am)).'</td>';
@@ -1216,7 +1266,7 @@ if ($object->id > 0)
 	print '</div></div></div>';
 	print '<div style="clear:both"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	/*
@@ -1228,81 +1278,79 @@ if ($object->id > 0)
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
 
-    if (empty($reshook))
-    {
-        if ($object->status != 1)
-        {
-            print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("ThirdPartyIsClosed").'</a></div>';
-        }
+	if (empty($reshook))
+	{
+		if ($object->status != 1)
+		{
+			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("ThirdPartyIsClosed").'</a></div>';
+		}
 
-    	if (!empty($conf->propal->enabled) && $user->rights->propal->creer && $object->status == 1)
-    	{
-    		$langs->load("propal");
-    		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/propal/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddProp").'</a></div>';
-    	}
+		if (!empty($conf->propal->enabled) && $user->rights->propal->creer && $object->status == 1)
+		{
+			$langs->load("propal");
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/propal/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddProp").'</a></div>';
+		}
 
-    	if (!empty($conf->commande->enabled) && $user->rights->commande->creer && $object->status == 1)
-    	{
-    		$langs->load("orders");
-    		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddOrder").'</a></div>';
-    	}
+		if (!empty($conf->commande->enabled) && $user->rights->commande->creer && $object->status == 1)
+		{
+			$langs->load("orders");
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddOrder").'</a></div>';
+		}
 
-    	if ($user->rights->contrat->creer && $object->status == 1)
-    	{
-    		$langs->load("contracts");
-    		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/contrat/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddContract").'</a></div>';
-    	}
+		if ($user->rights->contrat->creer && $object->status == 1)
+		{
+			$langs->load("contracts");
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/contrat/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddContract").'</a></div>';
+		}
 
-    	if (!empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer && $object->status == 1)
-    	{
-    		$langs->load("fichinter");
-    		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddIntervention").'</a></div>';
-    	}
+		if (!empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer && $object->status == 1)
+		{
+			$langs->load("fichinter");
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddIntervention").'</a></div>';
+		}
 
-    	// Add invoice
-    	if ($user->socid == 0)
-    	{
-    		if (!empty($conf->deplacement->enabled) && $object->status == 1)
-    		{
-    			$langs->load("trips");
-    			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/deplacement/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddTrip").'</a></div>';
-    		}
+		// Add invoice
+		if ($user->socid == 0)
+		{
+			if (!empty($conf->deplacement->enabled) && $object->status == 1)
+			{
+				$langs->load("trips");
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/deplacement/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddTrip").'</a></div>';
+			}
 
-    		if (!empty($conf->facture->enabled) && $object->status == 1)
-    		{
-    			if (empty($user->rights->facture->creer))
-    			{
-    			    print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
-    			} else {
-    				$langs->load("bills");
-    				$langs->load("orders");
+			if (!empty($conf->facture->enabled) && $object->status == 1)
+			{
+				if (empty($user->rights->facture->creer))
+				{
+					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
+				} else {
+					$langs->loadLangs(array("orders", "bills"));
 
-    				if (!empty($conf->commande->enabled))
-    				{
-    				    if ($object->client != 0 && $object->client != 2)
-    				    {
-    					    if (!empty($orders2invoice) && $orders2invoice > 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->id.'&search_billed=0&autoselectall=1">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
-    					    else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice")).'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
-    				    } else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
-    				}
+					if (!empty($conf->commande->enabled))
+					{
+						if ($object->client != 0 && $object->client != 2) {
+							if (!empty($orders2invoice) && $orders2invoice > 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->id.'&search_billed=0&autoselectall=1">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
+							else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice")).'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
+						} else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
+					}
 
-    				if ($object->client != 0 && $object->client != 2) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a></div>';
-    				else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
-    			}
-    		}
-    	}
+					if ($object->client != 0 && $object->client != 2) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a></div>';
+					else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
+				}
+			}
+		}
 
-    	// Add action
-    	if (!empty($conf->agenda->enabled) && !empty($conf->global->MAIN_REPEATTASKONEACHTAB) && $object->status == 1)
-    	{
-    		if ($user->rights->agenda->myactions->create)
-    		{
-    			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a></div>';
-    		} else {
-    			print '<div class="inline-block divButAction"><a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a></div>';
-    		}
-    	}
-    }
+		// Add action
+		if (!empty($conf->agenda->enabled) && !empty($conf->global->MAIN_REPEATTASKONEACHTAB) && $object->status == 1)
+		{
+			if ($user->rights->agenda->myactions->create)
+			{
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a></div>';
+			} else {
+				print '<div class="inline-block divButAction"><a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a></div>';
+			}
+		}
+	}
 
 	print '</div>';
 
@@ -1312,14 +1360,14 @@ if ($object->id > 0)
 		show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id);
 	}
 
-    if (!empty($conf->global->MAIN_REPEATTASKONEACHTAB))
-    {
-        print load_fiche_titre($langs->trans("ActionsOnCompany"), '', '');
+	if (!empty($conf->global->MAIN_REPEATTASKONEACHTAB))
+	{
+		print load_fiche_titre($langs->trans("ActionsOnCompany"), '', '');
 
-        // List of todo actions
+		// List of todo actions
 		show_actions_todo($conf, $langs, $db, $object);
 
-        // List of done actions
+		// List of done actions
 		show_actions_done($conf, $langs, $db, $object);
 	}
 } else {
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index 1038afa923f..9c4e1437ced 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -59,13 +59,13 @@ llxHeader('', $langs->trans("Contacts"));
 
 if ($type == "c" || $type == "p")
 {
-    $label = $langs->trans("Customers");
-    $urlfiche = "card.php";
+	$label = $langs->trans("Customers");
+	$urlfiche = "card.php";
 }
 if ($type == "f")
 {
-    $label = $langs->trans("Suppliers");
-    $urlfiche = "card.php";
+	$label = $langs->trans("Suppliers");
+	$urlfiche = "card.php";
 }
 
 /*
@@ -88,29 +88,29 @@ if ($socid) $sql .= " AND s.rowid = ".$socid;
 
 if (dol_strlen($stcomm))
 {
-    $sql .= " AND s.fk_stcomm=".$db->escape($stcomm);
+	$sql .= " AND s.fk_stcomm=".$db->escape($stcomm);
 }
 
 if (!empty($search_lastname))
 {
-    $sql .= " AND p.name LIKE '%".$db->escape($search_lastname)."%'";
+	$sql .= " AND p.name LIKE '%".$db->escape($search_lastname)."%'";
 }
 
 if (!empty($search_firstname))
 {
-    $sql .= " AND p.firstname LIKE '%".$db->escape($search_firstname)."%'";
+	$sql .= " AND p.firstname LIKE '%".$db->escape($search_firstname)."%'";
 }
 
 if (!empty($search_company))
 {
-    $sql .= " AND s.nom LIKE '%".$db->escape($search_company)."%'";
+	$sql .= " AND s.nom LIKE '%".$db->escape($search_company)."%'";
 }
 
 if (!empty($contactname)) // acces a partir du module de recherche
 {
-    $sql .= " AND (p.name LIKE '%".$db->escape($contactname)."%' OR lower(p.firstname) LIKE '%".$db->escape($contactname)."%') ";
-    $sortfield = "p.name";
-    $sortorder = "ASC";
+	$sql .= " AND (p.name LIKE '%".$db->escape($contactname)."%' OR lower(p.firstname) LIKE '%".$db->escape($contactname)."%') ";
+	$sortfield = "p.name";
+	$sortorder = "ASC";
 }
 
 $sql .= $db->order($sortfield, $sortorder);
@@ -171,7 +171,7 @@ if ($resql)
 
 	$db->free($resql);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // End of page
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index cfd2d67ea4e..384b88655f6 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -137,10 +137,14 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {
  * Draft customer proposals
  */
 if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
-	$sql = "SELECT p.rowid, p.ref, p.ref_client, p.total_ht, p.tva as total_tva, p.total as total_ttc";
-	$sql .= ", s.rowid as socid, s.nom as name, s.client, s.canvas, s.code_client, s.email, s.entity, s.code_compta";
-	$sql .= " FROM ".MAIN_DB_PREFIX."propal as p";
-	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+	$sql = "SELECT p.rowid, p.ref, p.ref_client, p.total_ht, p.tva as total_tva, p.total as total_ttc, p.fk_statut as status";
+	$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+	$sql .= ", s.code_client, s.code_compta, s.client";
+	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+	$sql .= ", s.logo, s.email, s.entity";
+	$sql .= ", s.canvas";
+	$sql .= " FROM ".MAIN_DB_PREFIX."propal as p,";
+	$sql .= " ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql .= " WHERE p.entity IN (".getEntity($propalstatic->element).")";
 	$sql .= " AND p.fk_soc = s.rowid";
@@ -167,21 +171,26 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
 				$propalstatic->total_ht = $obj->total_ht;
 				$propalstatic->total_tva = $obj->total_tva;
 				$propalstatic->total_ttc = $obj->total_ttc;
+				$propalstatic->statut = $obj->status;
 
 				$companystatic->id = $obj->socid;
 				$companystatic->name = $obj->name;
-				$companystatic->client = $obj->client;
+				$companystatic->name_alias = $obj->name_alias;
 				$companystatic->code_client = $obj->code_client;
-				$companystatic->code_fournisseur = $obj->code_fournisseur;
-				$companystatic->canvas = $obj->canvas;
-				$companystatic->entity = $obj->entity;
-				$companystatic->email = $obj->email;
 				$companystatic->code_compta = $obj->code_compta;
+				$companystatic->client = $obj->client;
+				$companystatic->code_fournisseur = $obj->code_fournisseur;
+				$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
+				$companystatic->fournisseur = $obj->fournisseur;
+				$companystatic->logo = $obj->logo;
+				$companystatic->email = $obj->email;
+				$companystatic->entity = $obj->entity;
+				$companystatic->canvas = $obj->canvas;
 
 				print '<tr class="oddeven">';
-				print '<td class="nowrap">'.$propalstatic->getNomUrl(1).'</td>';
-				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'customer', 16).'</td>';
-				print '<td class="nowrap right">'.price((!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc)).'</td>';
+				print '<td class="nowrap tdoverflowmax100">'.$propalstatic->getNomUrl(1).'</td>';
+				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'customer').'</td>';
+				print '<td class="nowrap right tdamount">'.price((!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc)).'</td>';
 				print '</tr>';
 
 				$i++;
@@ -203,10 +212,14 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
  * Draft supplier proposals
  */
 if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire) {
-	$sql = "SELECT p.rowid, p.ref, p.total_ht, p.tva as total_tva, p.total as total_ttc";
-	$sql .= ", s.rowid as socid, s.nom as name, s.client, s.canvas, s.code_client, s.code_fournisseur, s.entity, s.email";
-	$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
-	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+	$sql = "SELECT p.rowid, p.ref, p.total_ht, p.tva as total_tva, p.total as total_ttc, p.fk_statut as status";
+	$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+	$sql .= ", s.code_client, s.code_compta, s.client";
+	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+	$sql .= ", s.logo, s.email, s.entity";
+	$sql .= ", s.canvas";
+	$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p,";
+	$sql .= " ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql .= " WHERE p.entity IN (".getEntity($supplierproposalstatic->element).")";
 	$sql .= " AND p.fk_statut = ".SupplierProposal::STATUS_DRAFT;
@@ -232,20 +245,26 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
 				$supplierproposalstatic->total_ht = $obj->total_ht;
 				$supplierproposalstatic->total_tva = $obj->total_tva;
 				$supplierproposalstatic->total_ttc = $obj->total_ttc;
+				$supplierproposalstatic->statut = $obj->status;
 
 				$companystatic->id = $obj->socid;
 				$companystatic->name = $obj->name;
-				$companystatic->client = $obj->client;
+				$companystatic->name_alias = $obj->name_alias;
 				$companystatic->code_client = $obj->code_client;
+				$companystatic->code_compta = $obj->code_compta;
+				$companystatic->client = $obj->client;
 				$companystatic->code_fournisseur = $obj->code_fournisseur;
-				$companystatic->canvas = $obj->canvas;
-				$companystatic->entity = $obj->entity;
+				$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
+				$companystatic->fournisseur = $obj->fournisseur;
+				$companystatic->logo = $obj->logo;
 				$companystatic->email = $obj->email;
+				$companystatic->entity = $obj->entity;
+				$companystatic->canvas = $obj->canvas;
 
 				print '<tr class="oddeven">';
-				print '<td class="nowrap">'.$supplierproposalstatic->getNomUrl(1).'</td>';
-				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'supplier', 16).'</td>';
-				print '<td class="nowrap right">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
+				print '<td class="nowrap tdoverflowmax100">'.$supplierproposalstatic->getNomUrl(1).'</td>';
+				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'supplier').'</td>';
+				print '<td class="nowrap right tdamount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
 				print '</tr>';
 
 				$i++;
@@ -267,10 +286,14 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
  * Draft customer orders
  */
 if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
-	$sql = "SELECT c.rowid, c.ref, c.ref_client, c.total_ht, c.tva as total_tva, c.total_ttc";
-	$sql .= ", s.rowid as socid, s.nom as name, s.client, s.canvas, s.code_client, s.email, s.entity, s.code_compta";
-	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
-	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+	$sql = "SELECT c.rowid, c.ref, c.ref_client, c.total_ht, c.tva as total_tva, c.total_ttc, c.fk_statut as status";
+	$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+	$sql .= ", s.code_client, s.code_compta, s.client";
+	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+	$sql .= ", s.logo, s.email, s.entity";
+	$sql .= ", s.canvas";
+	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c,";
+	$sql .= " ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql .= " WHERE c.entity IN (".getEntity($orderstatic->element).")";
 	$sql .= " AND c.fk_statut = ".Commande::STATUS_DRAFT;
@@ -297,20 +320,26 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 				$orderstatic->total_ht = $obj->total_ht;
 				$orderstatic->total_tva = $obj->total_tva;
 				$orderstatic->total_ttc = $obj->total_ttc;
+				$orderstatic->statut = $obj->status;
 
 				$companystatic->id = $obj->socid;
 				$companystatic->name = $obj->name;
-				$companystatic->client = $obj->client;
+				$companystatic->name_alias = $obj->name_alias;
 				$companystatic->code_client = $obj->code_client;
+				$companystatic->code_compta = $obj->code_compta;
+				$companystatic->client = $obj->client;
 				$companystatic->code_fournisseur = $obj->code_fournisseur;
-				$companystatic->canvas = $obj->canvas;
+				$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
+				$companystatic->fournisseur = $obj->fournisseur;
+				$companystatic->logo = $obj->logo;
 				$companystatic->email = $obj->email;
 				$companystatic->entity = $obj->entity;
+				$companystatic->canvas = $obj->canvas;
 
 				print '<tr class="oddeven">';
-				print '<td class="nowrap">'.$orderstatic->getNomUrl(1).'</td>';
-				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'customer', 16).'</td>';
-				print '<td class="nowrap right">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
+				print '<td class="nowrap tdoverflowmax100">'.$orderstatic->getNomUrl(1).'</td>';
+				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'customer').'</td>';
+				print '<td class="nowrap right tdamount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
 				print '</tr>';
 
 				$i++;
@@ -329,13 +358,17 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 
 
 /*
- * Draft suppliers orders
+ * Draft purchase orders
  */
 if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)) && $user->rights->fournisseur->commande->lire) {
-	$sql = "SELECT cf.rowid, cf.ref, cf.ref_supplier, cf.total_ttc";
-	$sql .= ", s.rowid as socid, s.nom as name, s.client, s.canvas, s.code_client, s.code_fournisseur, s.entity, s.email";
-	$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf";
-	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+	$sql = "SELECT cf.rowid, cf.ref, cf.ref_supplier, cf.total_ttc, cf.fk_statut as status";
+	$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+	$sql .= ", s.code_client, s.code_compta, s.client";
+	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+	$sql .= ", s.logo, s.email, s.entity";
+	$sql .= ", s.canvas";
+	$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf,";
+	$sql .= " ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql .= " WHERE cf.entity IN (".getEntity($supplierorderstatic->element).")";
 	$sql .= " AND cf.fk_statut = ".CommandeFournisseur::STATUS_DRAFT;
@@ -362,20 +395,26 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				$supplierorderstatic->total_ht = $obj->total_ht;
 				$supplierorderstatic->total_tva = $obj->total_tva;
 				$supplierorderstatic->total_ttc = $obj->total_ttc;
+				$supplierorderstatic->statut = $obj->status;
 
 				$companystatic->id = $obj->socid;
 				$companystatic->name = $obj->name;
-				$companystatic->client = $obj->client;
+				$companystatic->name_alias = $obj->name_alias;
 				$companystatic->code_client = $obj->code_client;
+				$companystatic->code_compta = $obj->code_compta;
+				$companystatic->client = $obj->client;
 				$companystatic->code_fournisseur = $obj->code_fournisseur;
-				$companystatic->canvas = $obj->canvas;
-				$companystatic->entity = $obj->entity;
+				$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
+				$companystatic->fournisseur = $obj->fournisseur;
+				$companystatic->logo = $obj->logo;
 				$companystatic->email = $obj->email;
+				$companystatic->entity = $obj->entity;
+				$companystatic->canvas = $obj->canvas;
 
 				print '<tr class="oddeven">';
-				print '<td class="nowrap">'.$supplierorderstatic->getNomUrl(1).'</td>';
-				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'supplier', 16).'</td>';
-				print '<td class="nowrap right">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
+				print '<td class="nowrap tdoverflowmax100">'.$supplierorderstatic->getNomUrl(1).'</td>';
+				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'supplier').'</td>';
+				print '<td class="nowrap right tdamount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
 				print '</tr>';
 
 				$i++;
@@ -399,7 +438,12 @@ print '<div class="ficheaddleft">';
  * Last modified customers or prospects
  */
 if (!empty($conf->societe->enabled) && $user->rights->societe->lire) {
-	$sql = "SELECT s.rowid, s.nom as name, s.client, s.datec, s.tms, s.canvas, s.code_client, s.code_compta, s.entity, s.email";
+	$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+	$sql .= ", s.code_client, s.code_compta, s.client";
+	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+	$sql .= ", s.logo, s.email, s.entity";
+	$sql .= ", s.canvas";
+	$sql .= ", s.datec, s.tms";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql .= " WHERE s.entity IN (".getEntity($companystatic->element).")";
@@ -430,20 +474,44 @@ if (!empty($conf->societe->enabled) && $user->rights->societe->lire) {
 			while ($i < $num && $i < $max) {
 				$objp = $db->fetch_object($resql);
 
-				$companystatic->id = $objp->rowid;
+				$companystatic->id = $objp->socid;
 				$companystatic->name = $objp->name;
-				$companystatic->client = $objp->client;
+				$companystatic->name_alias = $objp->name_alias;
 				$companystatic->code_client = $objp->code_client;
-				$companystatic->code_fournisseur = $objp->code_fournisseur;
-				$companystatic->canvas = $objp->canvas;
 				$companystatic->code_compta = $objp->code_compta;
-				$companystatic->entity = $objp->entity;
+				$companystatic->client = $objp->client;
+				$companystatic->code_fournisseur = $objp->code_fournisseur;
+				$companystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
+				$companystatic->fournisseur = $objp->fournisseur;
+				$companystatic->logo = $objp->logo;
 				$companystatic->email = $objp->email;
+				$companystatic->entity = $objp->entity;
+				$companystatic->canvas = $objp->canvas;
 
 				print '<tr class="oddeven">';
-				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'customer', 48).'</td>';
-				print '<td class="right" nowrap>'.$companystatic->getLibCustProspStatut().'</td>';
-				print '<td class="right" nowrap>'.dol_print_date($db->jdate($objp->tms), 'day').'</td>';
+				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'customer').'</td>';
+				print '<td class="nowrap">';
+				//print $companystatic->getLibCustProspStatut();
+
+				$obj = $companystatic;
+				$s = '';
+				if (($obj->client == 2 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
+				{
+					$s .= '<a class="customer-back opacitymedium" title="'.$langs->trans("Prospect").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Prospect"), 0, 1).'</a>';
+				}
+				if (($obj->client == 1 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
+				{
+					$s .= '<a class="customer-back" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Customer"), 0, 1).'</a>';
+				}
+				/*
+				if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $obj->fournisseur)
+				{
+					$s .= '<a class="vendor-back" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Supplier"), 0, 1).'</a>';
+				}*/
+				print $s;
+
+				print '</td>';
+				print '<td class="right nowrap tddate">'.dol_print_date($db->jdate($objp->tms), 'day').'</td>';
 				print '</tr>';
 
 				$i++;
@@ -464,7 +532,12 @@ if (!empty($conf->societe->enabled) && $user->rights->societe->lire) {
  * Last suppliers
  */
 if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->societe->lire) {
-	$sql = "SELECT s.nom as name, s.rowid, s.datec as dc, s.canvas, s.tms as dm, s.code_fournisseur, s.entity, s.email";
+	$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+	$sql .= ", s.code_client, s.code_compta, s.client";
+	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+	$sql .= ", s.logo, s.email, s.entity";
+	$sql .= ", s.canvas";
+	$sql .= ", s.datec as dc, s.tms as dm";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql .= " WHERE s.entity IN (".getEntity($companystatic->element).")";
@@ -477,31 +550,56 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 	$resql = $db->query($sql);
 	if ($resql) {
 		$num = $db->num_rows($resql);
-		startSimpleTable($langs->trans("BoxTitleLastModifiedSuppliers", min($max, $num)), "societe/list.php", "type=f");
+		startSimpleTable($langs->trans("BoxTitleLastModifiedSuppliers", min($max, $num)), "societe/list.php", "type=f", 1);
 
 		if ($num) {
 			$i = 0;
 			while ($i < $num && $i < $max) {
 				$objp = $db->fetch_object($resql);
 
-				$companystatic->id = $objp->rowid;
+				$companystatic->id = $objp->socid;
 				$companystatic->name = $objp->name;
+				$companystatic->name_alias = $objp->name_alias;
 				$companystatic->code_client = $objp->code_client;
+				$companystatic->code_compta = $objp->code_compta;
+				$companystatic->client = $objp->client;
 				$companystatic->code_fournisseur = $objp->code_fournisseur;
-				$companystatic->canvas = $objp->canvas;
-				$companystatic->entity = $objp->entity;
+				$companystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
+				$companystatic->fournisseur = $objp->fournisseur;
+				$companystatic->logo = $objp->logo;
 				$companystatic->email = $objp->email;
+				$companystatic->entity = $objp->entity;
+				$companystatic->canvas = $objp->canvas;
 
 				print '<tr class="oddeven">';
-				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'supplier', 44).'</td>';
-				print '<td class="right">'.dol_print_date($db->jdate($objp->dm), 'day').'</td>';
+				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'supplier').'</td>';
+				print '<td>';
+
+				$obj = $companystatic;
+				$s = '';
+				/*if (($obj->client == 2 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
+				{
+					$s .= '<a class="customer-back opacitymedium" title="'.$langs->trans("Prospect").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Prospect"), 0, 1).'</a>';
+				}
+				if (($obj->client == 1 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
+				{
+					$s .= '<a class="customer-back" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Customer"), 0, 1).'</a>';
+				}*/
+				if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $obj->fournisseur)
+				{
+					$s .= '<a class="vendor-back" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Supplier"), 0, 1).'</a>';
+				}
+				print $s;
+
+				print '</td>';
+				print '<td class="right tddate">'.dol_print_date($db->jdate($objp->dm), 'day').'</td>';
 				print '</tr>';
 
 				$i++;
 			}
 		}
 
-		addSummaryTableLine(2, $num);
+		addSummaryTableLine(3, $num);
 		finishSimpleTable(true);
 
 		$db->free($resql);
@@ -533,7 +631,11 @@ if ($user->rights->agenda->myactions->read) {
 if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) { // TODO A REFAIRE DEPUIS NOUVEAU CONTRAT
 	$staticcontrat = new Contrat($db);
 
-	$sql = "SELECT s.nom as name, s.rowid, s.canvas, s.code_client, s.entity, s.email";
+	$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+	$sql .= ", s.code_client, s.code_compta, s.client";
+	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+	$sql .= ", s.logo, s.email, s.entity";
+	$sql .= ", s.canvas";
 	$sql .= ", c.statut, c.rowid as contratid, p.ref, c.fin_validite as datefin, c.date_cloture as dateclo";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= ", ".MAIN_DB_PREFIX."contrat as c";
@@ -558,16 +660,25 @@ if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) { // T
 			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 
-				$companystatic->id = $objp->rowid;
-				$companystatic->name = $objp->name;
-				$companystatic->code_client = $objp->code_client;
-				$companystatic->code_fournisseur = $objp->code_fournisseur;
-				$companystatic->canvas = $objp->canvas;
-				$companystatic->entity = $objp->entity;
-				$companystatic->email = $objp->email;
+				$companystatic->id = $obj->socid;
+				$companystatic->name = $obj->name;
+				$companystatic->name_alias = $obj->name_alias;
+				$companystatic->code_client = $obj->code_client;
+				$companystatic->code_compta = $obj->code_compta;
+				$companystatic->client = $obj->client;
+				$companystatic->code_fournisseur = $obj->code_fournisseur;
+				$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
+				$companystatic->fournisseur = $obj->fournisseur;
+				$companystatic->logo = $obj->logo;
+				$companystatic->email = $obj->email;
+				$companystatic->entity = $obj->entity;
+				$companystatic->canvas = $obj->canvas;
+
+				$staticcontrat->id = $obj->contratid;
+				$staticcontrat->ref = $obj->ref;
 
 				print '<tr class="oddeven">';
-				print '<td><a href=\"../contrat/card.php?id=".$obj->contratid."\">".img_object($langs->trans("ShowContract","contract"), "contract")." ".$obj->ref."</a></td>';
+				print '<td>'.$staticcontrat->getNomUrl(1).'</td>';
 				print '<td>'.$companystatic->getNomUrl(1, 'customer', 44).'</td>';
 				print '<td class="right">'.$staticcontrat->LibStatut($obj->statut, 3).'</td>';
 				print '</tr>';
@@ -591,7 +702,11 @@ if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) { // T
  */
 if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
 	$sql = "SELECT p.rowid as propalid, p.entity, p.total as total_ttc, p.total_ht, p.tva as total_tva, p.ref, p.ref_client, p.fk_statut, p.datep as dp, p.fin_validite as dfv";
-	$sql .= ", s.nom as name, s.rowid, s.code_client, s.entity, s.email";
+	$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+	$sql .= ", s.code_client, s.code_compta, s.client";
+	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+	$sql .= ", s.logo, s.email, s.entity";
+	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."propal as p";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -631,14 +746,19 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
 				$propalstatic->total_tva = $obj->total_tva;
 				$propalstatic->total_ttc = $obj->total_ttc;
 
-				$companystatic->id = $obj->rowid;
+				$companystatic->id = $obj->socid;
 				$companystatic->name = $obj->name;
-				$companystatic->client = $obj->client;
+				$companystatic->name_alias = $obj->name_alias;
 				$companystatic->code_client = $obj->code_client;
+				$companystatic->code_compta = $obj->code_compta;
+				$companystatic->client = $obj->client;
 				$companystatic->code_fournisseur = $obj->code_fournisseur;
-				$companystatic->canvas = $obj->canvas;
-				$companystatic->entity = $obj->entity;
+				$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
+				$companystatic->fournisseur = $obj->fournisseur;
+				$companystatic->logo = $obj->logo;
 				$companystatic->email = $obj->email;
+				$companystatic->entity = $obj->entity;
+				$companystatic->canvas = $obj->canvas;
 
 				$filename = dol_sanitizeFileName($obj->ref);
 				$filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);
@@ -657,8 +777,8 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
 				print '</td>';
 
 				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'customer', 44).'</td>';
-				print '<td class="right">'.dol_print_date($db->jdate($obj->dp), 'day').'</td>';
-				print '<td class="right">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
+				print '<td class="right tddate">'.dol_print_date($db->jdate($obj->dp), 'day').'</td>';
+				print '<td class="right tdamount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
 				print '<td align="center" width="14">'.$propalstatic->LibStatut($obj->fk_statut, 3).'</td>';
 
 				print '</tr>';
@@ -692,7 +812,11 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
  */
 if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 	$sql = "SELECT c.rowid as commandeid, c.total_ttc, c.total_ht, c.tva as total_tva, c.ref, c.ref_client, c.fk_statut, c.date_valid as dv, c.facture as billed";
-	$sql .= ", s.nom as name, s.rowid, s.code_client, s.entity, s.email";
+	$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+	$sql .= ", s.code_client, s.code_compta, s.client";
+	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+	$sql .= ", s.logo, s.email, s.entity";
+	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -732,14 +856,19 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 				$orderstatic->total_tva = $obj->total_tva;
 				$orderstatic->total_ttc = $obj->total_ttc;
 
-				$companystatic->id = $obj->rowid;
+				$companystatic->id = $obj->socid;
 				$companystatic->name = $obj->name;
-				$companystatic->client = $obj->client;
+				$companystatic->name_alias = $obj->name_alias;
 				$companystatic->code_client = $obj->code_client;
+				$companystatic->code_compta = $obj->code_compta;
+				$companystatic->client = $obj->client;
 				$companystatic->code_fournisseur = $obj->code_fournisseur;
-				$companystatic->canvas = $obj->canvas;
-				$companystatic->entity = $obj->entity;
+				$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
+				$companystatic->fournisseur = $obj->fournisseur;
+				$companystatic->logo = $obj->logo;
 				$companystatic->email = $obj->email;
+				$companystatic->entity = $obj->entity;
+				$companystatic->canvas = $obj->canvas;
 
 				$filename = dol_sanitizeFileName($obj->ref);
 				$filedir = $conf->commande->dir_output.'/'.dol_sanitizeFileName($obj->ref);
@@ -758,8 +887,8 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 				print '</td>';
 
 				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'customer', 44).'</td>';
-				print '<td class="right">'.dol_print_date($db->jdate($obj->dp), 'day').'</td>';
-				print '<td class="right">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
+				print '<td class="right tddate">'.dol_print_date($db->jdate($obj->dp), 'day').'</td>';
+				print '<td class="right tdamount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
 				print '<td align="center" width="14">'.$orderstatic->LibStatut($obj->fk_statut, $obj->billed, 3).'</td>';
 
 				print '</tr>';
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index 29b06819e9e..eb6d29d12a5 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -415,7 +415,7 @@ $formother = new FormOther($db);
 if ($object->fetch($id) >= 0) {
 	$head = emailing_prepare_head($object);
 
-	dol_fiche_head($head, 'advtargets', $langs->trans("Mailing"), 0, 'email');
+	print dol_get_fiche_head($head, 'advtargets', $langs->trans("Mailing"), 0, 'email');
 
 	print '<table class="border centpercent">';
 
@@ -426,7 +426,7 @@ if ($object->fetch($id) >= 0) {
 	print $form->showrefnav($object, 'id', $linkback);
 	print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->titre.'</td></tr>';
+	print '<tr><td>'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->title.'</td></tr>';
 
 	print '<tr><td>'.$langs->trans("MailFrom").'</td><td colspan="3">'.dol_print_email($object->email_from, 0, 0, 0, 0, 1).'</td></tr>';
 
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 78b9dea4bc6..1a3a1c9fe62 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -103,7 +103,7 @@ if (empty($reshook))
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	    $action = '';
+		$action = '';
 	}
 
 	// Action send emailing for everybody
@@ -135,7 +135,7 @@ if (empty($reshook))
 			$from     = $object->email_from;
 			$replyto  = $object->email_replyto;
 			$errorsto = $object->email_errorsto;
-			// Le message est-il en html
+			// Is the message in html
 			$msgishtml = -1; // Unknown by default
 			if (preg_match('/[\s\t]*<html>/i', $message)) $msgishtml = 1;
 
@@ -144,8 +144,8 @@ if (empty($reshook))
 
 			$nbok = 0; $nbko = 0;
 
-			// On choisit les mails non deja envoyes pour ce mailing (statut=0)
-			// ou envoyes en erreur (statut=-1)
+			// We choose mails not already sent for this mailing (statut=0)
+			// or sent in error (statut=-1)
 			$sql = "SELECT mc.rowid, mc.fk_mailing, mc.lastname, mc.firstname, mc.email, mc.other, mc.source_url, mc.source_id, mc.source_type, mc.tag";
 			$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
 			$sql .= " WHERE mc.statut < 1 AND mc.fk_mailing = ".$object->id;
@@ -155,7 +155,7 @@ if (empty($reshook))
 			$resql = $db->query($sql);
 			if ($resql)
 			{
-				$num = $db->num_rows($resql); // nb of possible recipients
+				$num = $db->num_rows($resql); // Number of possible recipients
 
 				if ($num)
 				{
@@ -163,7 +163,7 @@ if (empty($reshook))
 
 					$now = dol_now();
 
-					// Positionne date debut envoi
+					// Positioning date of start sending
 					$sql = "UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi='".$db->idate($now)."' WHERE rowid=".$object->id;
 					$resql2 = $db->query($sql);
 					if (!$resql2)
@@ -188,18 +188,18 @@ if (empty($reshook))
 						// Make substitutions on topic and body. From (AA=YY;BB=CC;...) we keep YY, CC, ...
 						$other = explode(';', $obj->other);
 						$tmpfield = explode('=', $other[0], 2); $other1 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
-	                    $tmpfield = explode('=', $other[1], 2); $other2 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
-	                    $tmpfield = explode('=', $other[2], 2); $other3 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
-	                    $tmpfield = explode('=', $other[3], 2); $other4 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
-	                    $tmpfield = explode('=', $other[4], 2); $other5 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
+						$tmpfield = explode('=', $other[1], 2); $other2 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
+						$tmpfield = explode('=', $other[2], 2); $other3 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
+						$tmpfield = explode('=', $other[3], 2); $other4 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
+						$tmpfield = explode('=', $other[4], 2); $other5 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
 
-	                    $signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $user->signature : '');
+						$signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $user->signature : '');
 
-	                    $targetobject = null; // Not defined with mass emailing
-	                    $parameters = array('mode'=>'emailing');
-	                    $substitutionarray = getCommonSubstitutionArray($langs, 0, array('object', 'objectamount'), $targetobject); // Note: On mass emailing, this is null because be don't know object
+						$targetobject = null; // Not defined with mass emailing
+						$parameters = array('mode'=>'emailing');
+						$substitutionarray = getCommonSubstitutionArray($langs, 0, array('object', 'objectamount'), $targetobject); // Note: On mass emailing, this is null because be don't know object
 
-	                    // Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
+						// Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
 						$substitutionarray['__ID__'] = $obj->source_id;
 						$substitutionarray['__EMAIL__'] = $obj->email;
 						$substitutionarray['__LASTNAME__'] = $obj->lastname;
@@ -253,7 +253,7 @@ if (empty($reshook))
 						}
 						//$substitutionisok=true;
 
-	                    complete_substitutions_array($substitutionarray, $langs);
+						complete_substitutions_array($substitutionarray, $langs);
 						$newsubject = make_substitutions($subject, $substitutionarray);
 						$newmessage = make_substitutions($message, $substitutionarray);
 
@@ -273,7 +273,7 @@ if (empty($reshook))
 							}
 						}
 
-						// Fabrication du mail
+						// Mail making
 						$trackid = 'emailing-'.$obj->fk_mailing.'-'.$obj->rowid;
 						$mail = new CMailFile($newsubject, $sendto, $from, $newmessage, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $errorsto, $arr_css, $trackid, '', 'emailing');
 
@@ -319,7 +319,7 @@ if (empty($reshook))
 										dol_print_error($db);
 									}
 
-								    //Update status communication of contact prospect
+									//Update status communication of contact prospect
 									$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.rowid=".$obj->rowid." AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
 									dol_syslog("card.php: set prospect contact status", LOG_DEBUG);
 
@@ -331,13 +331,13 @@ if (empty($reshook))
 								}
 							}
 
-						    if (!empty($conf->global->MAILING_DELAY))
-						    {
-						    	dol_syslog("Wait a delay of MAILING_DELAY=".$conf->global->MAILING_DELAY);
-                            	sleep($conf->global->MAILING_DELAY);
-                        	}
+							if (!empty($conf->global->MAILING_DELAY))
+							{
+								dol_syslog("Wait a delay of MAILING_DELAY=".$conf->global->MAILING_DELAY);
+								sleep($conf->global->MAILING_DELAY);
+							}
 
-                        	//test if CHECK READ change statut prospect contact
+							//test if CHECK READ change statut prospect contact
 						} else {
 							// Mail failed
 							$nbko++;
@@ -408,16 +408,16 @@ if (empty($reshook))
 
 		if (!$error)
 		{
-			// Le message est-il en html
-			$msgishtml = -1; // Inconnu par defaut
+			// Is the message in html
+			$msgishtml = -1; // Unknow by default
 			if (preg_match('/[\s\t]*<html>/i', $object->body)) $msgishtml = 1;
 
 			// other are set at begin of page
 			$object->substitutionarrayfortest['__EMAIL__'] = $object->sendto;
 			$object->substitutionarrayfortest['__MAILTOEMAIL__'] = '<a href="mailto:'.$object->sendto.'">'.$object->sendto.'</a>';
 
-			// Pratique les substitutions sur le sujet et message
-	        complete_substitutions_array($object->substitutionarrayfortest, $langs);
+			// Subject and message substitutions
+			complete_substitutions_array($object->substitutionarrayfortest, $langs);
 			$tmpsujet = make_substitutions($object->sujet, $object->substitutionarrayfortest);
 			$tmpbody = make_substitutions($object->body, $object->substitutionarrayfortest);
 
@@ -426,11 +426,11 @@ if (empty($reshook))
 			$arr_name = array();
 			$arr_css  = array();
 
-	        // Ajout CSS
-	        if (!empty($object->bgcolor)) $arr_css['bgcolor'] = (preg_match('/^#/', $object->bgcolor) ? '' : '#').$object->bgcolor;
-	        if (!empty($object->bgimage)) $arr_css['bgimage'] = $object->bgimage;
+			// Add CSS
+			if (!empty($object->bgcolor)) $arr_css['bgcolor'] = (preg_match('/^#/', $object->bgcolor) ? '' : '#').$object->bgcolor;
+			if (!empty($object->bgimage)) $arr_css['bgimage'] = $object->bgimage;
 
-	        // Attached files
+			// Attached files
 			$listofpaths = dol_dir_list($upload_dir, 'all', 0, '', '', 'name', SORT_ASC, 0);
 			if (count($listofpaths))
 			{
@@ -462,16 +462,16 @@ if (empty($reshook))
 	{
 		$mesgs = array();
 
-		$object->email_from     = GETPOST("from");
-		$object->email_replyto  = GETPOST("replyto");
-		$object->email_errorsto = GETPOST("errorsto");
-		$object->titre          = GETPOST("titre");
+		$object->email_from     = GETPOST("from", "none"); // Must allow 'name <email>'
+		$object->email_replyto  = GETPOST("replyto", "none"); // Must allow 'name <email>'
+		$object->email_errorsto = GETPOST("errorsto", "none"); // Must allow 'name <email>'
+		$object->title          = GETPOST("title");
 		$object->sujet          = GETPOST("sujet");
 		$object->body           = GETPOST("bodyemail", 'restricthtml');
 		$object->bgcolor        = GETPOST("bgcolor");
 		$object->bgimage        = GETPOST("bgimage");
 
-		if (!$object->titre) {
+		if (!$object->title) {
 			$mesgs[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailTitle"));
 		}
 		if (!$object->sujet) {
@@ -491,21 +491,20 @@ if (empty($reshook))
 			$mesgs[] = $object->error;
 		}
 
-		setEventMessages($mesg, $mesgs, 'errors');
+		setEventMessages(null, $mesgs, 'errors');
 		$action = "create";
 	}
 
 	// Action update description of emailing
-	if ($action == 'settitre' || $action == 'setemail_from' || $action == 'setreplyto' || $action == 'setemail_errorsto')
+	if ($action == 'settitle' || $action == 'setemail_from' || $action == 'setreplyto' || $action == 'setemail_errorsto')
 	{
 		$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
 
-		if ($action == 'settitre') $object->titre = trim(GETPOST('titre', 'alpha'));
-		elseif ($action == 'setemail_from') $object->email_from = trim(GETPOST('email_from', 'alpha'));
-		elseif ($action == 'setemail_replyto') $object->email_replyto = trim(GETPOST('email_replyto', 'alpha'));
-		elseif ($action == 'setemail_errorsto') {
-            $object->email_errorsto = trim(GETPOST('email_errorsto', 'alpha'));
-        } elseif ($action == 'settitre' && empty($object->titre)) {
+		if ($action == 'settitle') $object->title = trim(GETPOST('title', 'alpha'));
+		elseif ($action == 'setemail_from') $object->email_from = trim(GETPOST('email_from', 'none')); // Must allow 'name <email>'
+		elseif ($action == 'setemail_replyto') $object->email_replyto = trim(GETPOST('email_replyto', 'none')); // Must allow 'name <email>'
+		elseif ($action == 'setemail_errorsto') $object->email_errorsto = trim(GETPOST('email_errorsto', 'none')); // Must allow 'name <email>'
+		elseif ($action == 'settitle' && empty($object->title)) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailTitle"));
 		} elseif ($action == 'setfrom' && empty($object->email_from)) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailFrom"));
@@ -534,25 +533,25 @@ if (empty($reshook))
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	    // Set tmp user directory
-	    dol_add_file_process($upload_dir, 0, 0);
+		// Set tmp user directory
+		dol_add_file_process($upload_dir, 0, 0);
 
 		$action = "edit";
 	}
 
-	// Action remove file
+	// Action of file remove
 	if (!empty($_POST["removedfile"]))
 	{
 		$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	    dol_remove_file_process($_POST['removedfile'], 0, 0); // We really delete file linked to mailing
+		dol_remove_file_process($_POST['removedfile'], 0, 0); // We really delete file linked to mailing
 
 		$action = "edit";
 	}
 
-	// Action update emailing
+	// Action of emailing update
 	if ($action == 'update' && empty($_POST["removedfile"]) && empty($_POST["cancel"]))
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -592,7 +591,7 @@ if (empty($reshook))
 		}
 	}
 
-	// Action confirmation validation
+	// Action of validation confirmation
 	if ($action == 'confirm_valid' && $confirm == 'yes')
 	{
 		if ($object->id > 0)
@@ -606,20 +605,20 @@ if (empty($reshook))
 		}
 	}
 
-	// Action confirmation validation
+	// Action of validation confirmation
 	if ($action == 'confirm_settodraft' && $confirm == 'yes')
 	{
 		if ($object->id > 0)
 		{
 			$result = $object->setStatut(0);
-            if ($result > 0)
-            {
-    			//setEventMessages($langs->trans("MailingSuccessfullyValidated"), null, 'mesgs');
-    			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-    			exit;
-            } else {
-                setEventMessages($object->error, $object->errors, 'errors');
-            }
+			if ($result > 0)
+			{
+				//setEventMessages($langs->trans("MailingSuccessfullyValidated"), null, 'mesgs');
+				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+				exit;
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
 		} else {
 			dol_print_error($db);
 		}
@@ -652,7 +651,7 @@ if (empty($reshook))
 		}
 	}
 
-	// Action confirmation suppression
+	// Action of delete confirmation
 	if ($action == 'confirm_delete' && $confirm == 'yes')
 	{
 		if ($object->delete($object->id))
@@ -708,17 +707,17 @@ if ($action == 'create')
 	// Print mail form
 	print load_fiche_titre($langs->trans("NewMailing"), $availablelink, 'object_email');
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">';
-	print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("MailTitle").'</td><td><input class="flat minwidth300" name="titre" value="'.dol_escape_htmltag(GETPOST('titre')).'" autofocus="autofocus"></td></tr>';
+	print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("MailTitle").'</td><td><input class="flat minwidth300" name="title" value="'.dol_escape_htmltag(GETPOST('title')).'" autofocus="autofocus"></td></tr>';
 	print '<tr><td class="fieldrequired">'.$langs->trans("MailFrom").'</td><td><input class="flat minwidth200" name="from" value="'.$conf->global->MAILING_EMAIL_FROM.'"></td></tr>';
 	print '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td><input class="flat minwidth200" name="errorsto" value="'.(!empty($conf->global->MAILING_EMAIL_ERRORSTO) ? $conf->global->MAILING_EMAIL_ERRORSTO : $conf->global->MAIN_MAIL_ERRORS_TO).'"></td></tr>';
 
 	// Other attributes
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
+	print $hookmanager->resPrint;
 	if (empty($reshook))
 	{
 		print $object->showOptionals($extrafields, 'edit');
@@ -736,13 +735,13 @@ if ($action == 'create')
 	print '</table>';
 
 	print '<div style="padding-top: 10px">';
-	// Editeur wysiwyg
+	// wysiwyg editor
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 	$doleditor = new DolEditor('bodyemail', GETPOST('bodyemail', 'restricthtml'), '', 600, 'dolibarr_mailings', '', true, true, $conf->global->FCKEDITOR_ENABLE_MAILING, 20, '90%');
 	$doleditor->Create();
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("CreateMailing").'"></div>';
 
@@ -759,7 +758,7 @@ if ($action == 'create')
 		{
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("SetToDraft"), $langs->trans("ConfirmUnvalidateEmailing"), "confirm_settodraft", '', '', 1);
 		}
-		// Confirmation validation of mailing
+		// Confirmation of mailing validation
 		if ($action == 'valid')
 		{
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ValidMailing"), $langs->trans("ConfirmValidMailing"), "confirm_valid", '', '', 1);
@@ -776,14 +775,14 @@ if ($action == 'create')
 
 		if ($action != 'edit' && $action != 'edithtml')
 		{
-			dol_fiche_head($head, 'card', $langs->trans("Mailing"), -1, 'email');
+			print dol_get_fiche_head($head, 'card', $langs->trans("Mailing"), -1, 'email');
 
 			/*
-			 * Mailing en mode visu
+			 * View mode mailing
 			 */
 			if ($action == 'sendall')
 			{
-                // Define message to recommand from command line
+				// Define message to recommand from command line
 				$sendingmode = $conf->global->EMAILING_MAIL_SENDMODE;
 				if (empty($sendingmode)) $sendingmode = $conf->global->MAIN_MAIL_SENDMODE;
 				if (empty($sendingmode)) $sendingmode = 'mail'; // If not defined, we use php mail function
@@ -801,33 +800,32 @@ if ($action == 'create')
 					setEventMessages($langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']), null, 'warnings');
 					if (!empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS)) setEventMessages($langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS), null, 'warnings');
 					$_GET["action"] = '';
-				} elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
-				{
-				    if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
-				    if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
+				} elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0) {
+					if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
+					if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
 
 					// The feature is forbidden from GUI, we show just message to use from command line.
-				    setEventMessages($langs->trans("MailingNeedCommand"), null, 'warnings');
+					setEventMessages($langs->trans("MailingNeedCommand"), null, 'warnings');
 					setEventMessages('<textarea cols="60" rows="'.ROWS_1.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>', null, 'warnings');
 					if ($conf->file->mailing_limit_sendbyweb != '-1')  // MAILING_LIMIT_SENDBYWEB was set to -1 in database, but it is allowed ot increase it.
 					{
-					    setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings'); // You can send online with constant...
+						setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings'); // You can send online with constant...
 					}
 					$_GET["action"] = '';
 				} else {
-				    if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
-				    if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
+					if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
+					if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
 
-				    $text = '';
-				    if ($conf->global->MAILING_LIMIT_SENDBYCLI >= 0)
-                    {
-                    	$text .= $langs->trans("MailingNeedCommand");
-                    	$text .= '<br><textarea cols="60" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.' '.$user->login.'</textarea>';
-                    	$text .= '<br><br>';
-                    }
-				    $text .= $langs->trans('ConfirmSendingEmailing').'<br>';
+					$text = '';
+					if (!isset($conf->global->MAILING_LIMIT_SENDBYCLI) || $conf->global->MAILING_LIMIT_SENDBYCLI >= 0)
+					{
+						$text .= $langs->trans("MailingNeedCommand");
+						$text .= '<br><textarea cols="60" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.' '.$user->login.'</textarea>';
+						$text .= '<br><br>';
+					}
+					$text .= $langs->trans('ConfirmSendingEmailing').'<br>';
 					$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
-					print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('SendMailing'), $text, 'sendallconfirmed', $formquestion, '', 1, 330, 600);
+					print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('SendMailing'), $text, 'sendallconfirmed', '', '', 1, 330, 600);
 				}
 			}
 
@@ -854,9 +852,9 @@ if ($action == 'create')
 
 			// Description
 			print '<tr><td class="titlefield">';
-			print $form->editfieldkey("MailTitle", 'titre', $object->titre, $object, $user->rights->mailing->creer && $object->statut < 3, 'string');
+			print $form->editfieldkey("MailTitle", 'title', $object->title, $object, $user->rights->mailing->creer && $object->statut < 3, 'string');
 			print '</td><td>';
-			print $form->editfieldval("MailTitle", 'titre', $object->titre, $object, $user->rights->mailing->creer && $object->statut < 3, 'string');
+			print $form->editfieldval("MailTitle", 'title', $object->title, $object, $user->rights->mailing->creer && $object->statut < 3, 'string');
 			print '</td></tr>';
 
 			// From
@@ -868,7 +866,11 @@ if ($action == 'create')
 			if ($email && !isValidEmail($email)) {
 				$langs->load("errors");
 				print img_warning($langs->trans("ErrorBadEMail", $email));
+			} elseif ($email && !isValidMailDomain($email)) {
+				$langs->load("errors");
+				print img_warning($langs->trans("ErrorBadMXDomain", $email));
 			}
+
 			print '</td></tr>';
 
 			// Errors to
@@ -880,33 +882,36 @@ if ($action == 'create')
 			if ($email && !isValidEmail($email)) {
 				$langs->load("errors");
 				print img_warning($langs->trans("ErrorBadEMail", $email));
+			} elseif ($email && !isValidMailDomain($email)) {
+				$langs->load("errors");
+				print img_warning($langs->trans("ErrorBadMXDomain", $email));
 			}
 			print '</td></tr>';
 
-			// Nb of distinct emails
+			// Number of distinct emails
 			print '<tr><td>';
 			print $langs->trans("TotalNbOfDistinctRecipients");
 			print '</td><td colspan="3">';
 			$nbemail = ($object->nbemail ? $object->nbemail : 0);
 			if (is_numeric($nbemail))
 			{
-			    $text = '';
-			    if ((!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || ($object->statut == 2 && $nbtry < $nbemail)))
-			    {
-    				if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
-    				{
-    					$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
-    				} else {
-    					$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
-    				}
-			    }
-			    if (empty($nbemail)) $nbemail .= ' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
+				$text = '';
+				if ((!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || ($object->statut == 2 && $nbtry < $nbemail)))
+				{
+					if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
+					{
+						$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
+					} else {
+						$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
+					}
+				}
+				if (empty($nbemail)) $nbemail .= ' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
 				if ($text)
-    			{
-    			    print $form->textwithpicto($nbemail, $text, 1, 'warning');
-    			} else {
-    				print $nbemail;
-    			}
+				{
+					print $form->textwithpicto($nbemail, $text, 1, 'warning');
+				} else {
+					print $nbemail;
+				}
 			}
 			print '</td></tr>';
 
@@ -917,7 +922,7 @@ if ($action == 'create')
 
 			print "</div>";
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 
 			// Clone confirmation
@@ -929,12 +934,12 @@ if ($action == 'create')
 				array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneContent"), 'value' => 1),
 				array('type' => 'checkbox', 'name' => 'clone_receivers', 'label' => $langs->trans("CloneReceivers"), 'value' => 0)
 				);
-				// Paiement incomplet. On demande si motif = escompte ou autre
+				// Incomplete payment. On demande si motif = escompte ou autre
 				print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneEMailing', $object->ref), 'confirm_clone', $formquestion, 'yes', 2, 240);
 			}
 
 			/*
-			 * Boutons d'action
+			 * Actions Buttons
 			 */
 
 			if (GETPOST('cancel', 'alpha') || $confirm == 'no' || $action == '' || in_array($action, array('settodraft', 'valid', 'delete', 'sendall', 'clone', 'test')))
@@ -1021,15 +1026,15 @@ if ($action == 'create')
 				print '</div>';
 			}
 
-			// Affichage formulaire de TEST
+			// Display of the TEST form
 			if ($action == 'test')
 			{
-			    print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
-			    print load_fiche_titre($langs->trans("TestMailing"));
+				print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
+				print load_fiche_titre($langs->trans("TestMailing"));
 
-			    dol_fiche_head(null, '', '', -1);
+				print dol_get_fiche_head(null, '', '', -1);
 
-			    // Create l'objet formulaire mail
+				// Create mail form object
 				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 				$formmail = new FormMail($db);
 				$formmail->fromname = $object->email_from;
@@ -1046,9 +1051,9 @@ if ($action == 'create')
 				$formmail->withbodyreadonly = 1;
 				$formmail->withcancel = 1;
 				$formmail->withdeliveryreceipt = 0;
-				// Tableau des substitutions
+				// Table of substitutions
 				$formmail->substit = $object->substitutionarrayfortest;
-				// Tableau des parametres complementaires du post
+				// Table of post's complementary params
 				$formmail->param["action"] = "send";
 				$formmail->param["models"] = 'none';
 				$formmail->param["mailid"] = $object->id;
@@ -1058,7 +1063,7 @@ if ($action == 'create')
 
 				print '<br>';
 
-				dol_fiche_end();
+				print dol_get_fiche_end();
 
 				print dol_set_focus('#sendto');
 			}
@@ -1074,7 +1079,7 @@ if ($action == 'create')
 			// Print mail content
 			print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto('<span class="opacitymedium hideonsmartphone">'.$langs->trans("AvailableVariables").'</span>', $htmltext, 1, 'helpclickable', '', 0, 2, 'emailsubstitionhelp'), 'generic');
 
-			dol_fiche_head('', '', '', -1);
+			print dol_get_fiche_head('', '', '', -1);
 
 			print '<table class="bordernooddeven" width="100%">';
 
@@ -1097,32 +1102,32 @@ if ($action == 'create')
 			}
 			print '</td></tr>';
 
-            // Background color
-            /*print '<tr><td width="15%">'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
+			// Background color
+			/*print '<tr><td width="15%">'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
             print $htmlother->selectColor($object->bgcolor,'bgcolor','',0);
             print '</td></tr>';*/
 
 			print '</table>';
 
-		    // Message
+			// Message
 			print '<div style="padding-top: 10px; background: '.($object->bgcolor ? (preg_match('/^#/', $object->bgcolor) ? '' : '#').$object->bgcolor : 'white').'">';
 			if (empty($object->bgcolor) || strtolower($object->bgcolor) == 'ffffff')	// CKEditor does not apply the color of the div into its content area
 			{
 				$readonly = 1;
-				// Editeur wysiwyg
+				// wysiwyg editor
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', false, true, empty($conf->global->FCKEDITOR_ENABLE_MAILING) ? 0 : 1, 20, '90%', $readonly);
 				$doleditor->Create();
 			} else print dol_htmlentitiesbr($object->body);
 			print '</div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 		} else {
 			/*
-			 * Mailing en mode edition (CKeditor or HTML source)
+			 * Edition mode mailing (CKeditor or HTML source)
 			 */
 
-			dol_fiche_head($head, 'card', $langs->trans("Mailing"), -1, 'email');
+			print dol_get_fiche_head($head, 'card', $langs->trans("Mailing"), -1, 'email');
 
 			$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -1144,13 +1149,13 @@ if ($action == 'create')
 			*/
 
 			// Topic
-			print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->titre.'</td></tr>';
+			print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->title.'</td></tr>';
 			// From
 			print '<tr><td class="titlefield">'.$langs->trans("MailFrom").'</td><td colspan="3">'.dol_print_email($object->email_from, 0, 0, 0, 0, 1).'</td></tr>';
 			// To
 			print '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td colspan="3">'.dol_print_email($object->email_errorsto, 0, 0, 0, 0, 1).'</td></tr>';
 
-			// Nb of distinct emails
+			// Number of distinct emails
 			print '<tr><td>';
 			print $langs->trans("TotalNbOfDistinctRecipients");
 			print '</td><td colspan="3">';
@@ -1180,7 +1185,7 @@ if ($action == 'create')
 			// Other attributes
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-            print $hookmanager->resPrint;
+			print $hookmanager->resPrint;
 			if (empty($reshook))
 			{
 				print $object->showOptionals($extrafields, 'edit', $parameters);
@@ -1189,7 +1194,7 @@ if ($action == 'create')
 			print '</table>';
 			print '</div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 
 
@@ -1210,7 +1215,7 @@ if ($action == 'create')
 			// Print mail content
 			print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'generic');
 
-			dol_fiche_head(null, '', '', -1);
+			print dol_get_fiche_head(null, '', '', -1);
 
 			print '<table class="bordernooddeven" width="100%">';
 
@@ -1255,7 +1260,7 @@ if ($action == 'create')
 			print $out;
 			print '</td></tr>';
 
-		    // Background color
+			// Background color
 			print '<tr><td>'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
 			print $htmlother->selectColor($object->bgcolor, 'bgcolor', '', 0);
 			print '</td></tr>';
@@ -1267,14 +1272,14 @@ if ($action == 'create')
 
 			if ($action == 'edit')
 			{
-				// Editeur wysiwyg
+				// wysiwyg editor
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', true, true, $conf->global->FCKEDITOR_ENABLE_MAILING, 20, '90%');
 				$doleditor->Create();
 			}
 			if ($action == 'edithtml')
 			{
-				// Editor HTML source
+				// HTML source editor
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', true, true, 'ace', 20, '90%');
 				$doleditor->Create(0, '', false, 'HTML Source', 'php');
@@ -1283,12 +1288,12 @@ if ($action == 'create')
 			print '</div>';
 
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
-			print '<input type="submit" class="button buttonforacesave" value="'.$langs->trans("Save").'" name="save">';
+			print '<input type="submit" class="button buttonforacesave button-save" value="'.$langs->trans("Save").'" name="save">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-			print '<input type="submit" class="button" value="'.$langs->trans("Cancel").'" name="cancel">';
+			print '<input type="submit" class="button button-cancel" value="'.$langs->trans("Cancel").'" name="cancel">';
 			print '</div>';
 
 			print '</form>';
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index ef2f3cc772e..0d621dfa186 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -78,13 +78,13 @@ if ($action == 'add')
 
 	foreach ($modulesdir as $dir)
 	{
-	    // Load modules attributes in arrays (name, numero, orders) from dir directory
-	    //print $dir."\n<br>";
-	    dol_syslog("Scan directory ".$dir." for modules");
+		// Load modules attributes in arrays (name, numero, orders) from dir directory
+		//print $dir."\n<br>";
+		dol_syslog("Scan directory ".$dir." for modules");
 
-	    // Loading Class
-	    $file = $dir."/".$module.".modules.php";
-	    $classname = "mailing_".$module;
+		// Loading Class
+		$file = $dir."/".$module.".modules.php";
+		$classname = "mailing_".$module;
 
 		if (file_exists($file))
 		{
@@ -213,7 +213,7 @@ if ($object->fetch($id) >= 0)
 {
 	$head = emailing_prepare_head($object);
 
-	dol_fiche_head($head, 'targets', $langs->trans("Mailing"), -1, 'email');
+	print dol_get_fiche_head($head, 'targets', $langs->trans("Mailing"), -1, 'email');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -237,7 +237,7 @@ if ($object->fetch($id) >= 0)
 
 	print '<table class="border centpercent tableforfield">';
 
-	print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->titre.'</td></tr>';
+	print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->title.'</td></tr>';
 
 	print '<tr><td>'.$langs->trans("MailFrom").'</td><td colspan="3">';
 	$emailarray = CMailFile::getArrayAddress($object->email_from);
@@ -305,7 +305,7 @@ if ($object->fetch($id) >= 0)
 
 	print "</div>";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<br>';
 
@@ -337,12 +337,12 @@ if ($object->fetch($id) >= 0)
 
 		foreach ($modulesdir as $dir)
 		{
-		    $modulenames = array();
+			$modulenames = array();
 
-		    // Load modules attributes in arrays (name, numero, orders) from dir directory
-		    //print $dir."\n<br>";
-		    dol_syslog("Scan directory ".$dir." for modules");
-		    $handle = @opendir($dir);
+			// Load modules attributes in arrays (name, numero, orders) from dir directory
+			//print $dir."\n<br>";
+			dol_syslog("Scan directory ".$dir." for modules");
+			$handle = @opendir($dir);
 			if (is_resource($handle))
 			{
 				while (($file = readdir($handle)) !== false)
@@ -396,7 +396,7 @@ if ($object->fetch($id) >= 0)
 						print '<form '.$bctag[$var].' name="'.$modulename.'" action="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&module='.$modulename.'" method="POST" enctype="multipart/form-data">';
 						print '<input type="hidden" name="token" value="'.newToken().'">';
 					} else {
-					    print '<div '.$bctag[$var].'>';
+						print '<div '.$bctag[$var].'>';
 					}
 
 					print '<div class="tagtd">';
@@ -425,14 +425,14 @@ if ($object->fetch($id) >= 0)
 					print '<div class="tagtd left">';
 					if ($allowaddtarget)
 					{
-    					try {
-    						$filter = $obj->formFilter();
-    					} catch (Exception $e)
-    					{
-    						dol_syslog($e->getMessage(), LOG_ERR);
-    					}
-    					if ($filter) print $filter;
-    					else print $langs->trans("None");
+						try {
+							$filter = $obj->formFilter();
+						} catch (Exception $e)
+						{
+							dol_syslog($e->getMessage(), LOG_ERR);
+						}
+						if ($filter) print $filter;
+						else print $langs->trans("None");
 					}
 					print '</div>';
 
@@ -441,7 +441,7 @@ if ($object->fetch($id) >= 0)
 					{
 						print '<input type="submit" class="button" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
 					} else {
-					    print '<input type="submit" class="button disabled" disabled="disabled" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
+						print '<input type="submit" class="button disabled" disabled="disabled" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
 						//print $langs->trans("MailNoChangePossible");
 						print "&nbsp;";
 					}
@@ -474,13 +474,13 @@ if ($object->fetch($id) >= 0)
 	$nbtotalofrecords = '';
 	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 	{
-	    $result = $db->query($sql);
-	    $nbtotalofrecords = $db->num_rows($result);
-	    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-	    {
-	    	$page = 0;
-	    	$offset = 0;
-	    }
+		$result = $db->query($sql);
+		$nbtotalofrecords = $db->num_rows($result);
+		if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+		{
+			$page = 0;
+			$offset = 0;
+		}
 	}
 
 	//$nbtotalofrecords=$object->nbemail;     // nbemail is a denormalized field storing nb of targets
@@ -503,7 +503,7 @@ if ($object->fetch($id) >= 0)
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-        print '<input type="hidden" name="page" value="'.$page.'">';
+		print '<input type="hidden" name="page" value="'.$page.'">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
 
 		$morehtmlcenter = '';
@@ -521,7 +521,7 @@ if ($object->fetch($id) >= 0)
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-        print '<input type="hidden" name="page" value="'.$page.'">';
+		print '<input type="hidden" name="page" value="'.$page.'">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
 		print '<input type="hidden" name="limit" value="'.$limit.'">';
 
@@ -611,30 +611,30 @@ if ($object->fetch($id) >= 0)
 				print '<td>'.$obj->firstname.'</td>';
 				print '<td>'.$obj->other.'</td>';
 				print '<td class="center">';
-                if (empty($obj->source_id) || empty($obj->source_type))
-                {
-                    print empty($obj->source_url) ? '' : $obj->source_url; // For backward compatibility
-                } else {
-                    if ($obj->source_type == 'member')
-                    {
+				if (empty($obj->source_id) || empty($obj->source_type))
+				{
+					print empty($obj->source_url) ? '' : $obj->source_url; // For backward compatibility
+				} else {
+					if ($obj->source_type == 'member')
+					{
 						$objectstaticmember->fetch($obj->source_id);
-                        print $objectstaticmember->getNomUrl(1);
-                    } elseif ($obj->source_type == 'user')
-                    {
+						print $objectstaticmember->getNomUrl(1);
+					} elseif ($obj->source_type == 'user')
+					{
 						$objectstaticuser->fetch($obj->source_id);
-                        print $objectstaticuser->getNomUrl(1);
-                    } elseif ($obj->source_type == 'thirdparty')
-                    {
+						print $objectstaticuser->getNomUrl(1);
+					} elseif ($obj->source_type == 'thirdparty')
+					{
 						$objectstaticcompany->fetch($obj->source_id);
-                        print $objectstaticcompany->getNomUrl(1);
-                    } elseif ($obj->source_type == 'contact')
-                    {
-                    	$objectstaticcontact->fetch($obj->source_id);
-                    	print $objectstaticcontact->getNomUrl(1);
-                    } else {
-                        print $obj->source_url;
-                    }
-                }
+						print $objectstaticcompany->getNomUrl(1);
+					} elseif ($obj->source_type == 'contact')
+					{
+						$objectstaticcontact->fetch($obj->source_id);
+						print $objectstaticcontact->getNomUrl(1);
+					} else {
+						print $obj->source_url;
+					}
+				}
 				print '</td>';
 
 				// Date last update
@@ -680,9 +680,9 @@ if ($object->fetch($id) >= 0)
 		} else {
 			if ($object->statut < 2)
 			{
-			    print '<tr><td colspan="9" class="opacitymedium">';
-    			print $langs->trans("NoTargetYet");
-    			print '</td></tr>';
+				print '<tr><td colspan="9" class="opacitymedium">';
+				print $langs->trans("NoTargetYet");
+				print '</td></tr>';
 			}
 		}
 		print "</table><br>";
diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index f82ebec9d6f..b7f20319229 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -1,20 +1,20 @@
 <?php
 /* Advance Targeting Emailling for mass emailing module
  * Copyright (C) 2013  Florian Henry <florian.henry@open-concept.pro>
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 
 /**
  * 	\file		comm/mailing/class/advtargetemailing.class.php
@@ -28,20 +28,10 @@
  */
 class AdvanceTargetingMailing extends CommonObject
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
-
 	/**
-	 * @var string Error code (or message)
+	 * @var DoliDB Database handler.
 	 */
-	public $error = '';
-
-	/**
-	 * @var string[] Error codes (or messages)
-	 */
-	public $errors = array();
+	public $db;
 
 	/**
 	 * @var string ID to identify managed object
@@ -58,20 +48,57 @@ class AdvanceTargetingMailing extends CommonObject
 	 */
 	public $id;
 
-    public $name;
-    public $entity;
-    public $fk_element;
-    public $type_element;
-    public $filtervalue;
-    public $fk_user_author;
-    public $datec = '';
-    public $fk_user_mod;
-    public $tms = '';
+	/**
+	 * @var string name
+	 */
+	public $name;
 
-    public $select_target_type = array();
-    public $type_statuscommprospect = array();
-    public $thirdparty_lines;
-    public $contact_lines;
+	/**
+	 * @var int	element id (it's not the name of a field)
+	 */
+	public $fk_element;
+
+	/**
+	 * @var string type element
+	 */
+	public $type_element;
+
+	/**
+	 * @var string filter value
+	 */
+	public $filtervalue;
+
+	/**
+	 * @var int user author id
+	 */
+	public $fk_user_author;
+
+	/**
+	 * @var int|string datec
+	 */
+	public $datec = '';
+
+	/**
+	 * @var int user mod id
+	 */
+	public $fk_user_mod;
+
+	/**
+	 * @var int|string tms
+	 */
+	public $tms = '';
+
+	/**
+	 * @var array select target type
+	 */
+	public $select_target_type = array();
+
+	/**
+	 * @var array type status comm prospect
+	 */
+	public $type_statuscommprospect = array();
+	public $thirdparty_lines;
+	public $contact_lines;
 
 
 	/**
@@ -79,7 +106,7 @@ class AdvanceTargetingMailing extends CommonObject
 	 *
 	 *  @param  DoliDb		$db		Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		global $langs;
 		$langs->load('customers');
@@ -87,17 +114,17 @@ class AdvanceTargetingMailing extends CommonObject
 		$this->db = $db;
 
 		$this->select_target_type = array(
-				'2' => $langs->trans('Contacts'),
-				'1' => $langs->trans('Contacts').'+'.$langs->trans('ThirdParty'),
-				'3' => $langs->trans('ThirdParty'),
-				'4' => $langs->trans('ContactsWithThirdpartyFilter')
+			'2' => $langs->trans('Contacts'),
+			'1' => $langs->trans('Contacts').'+'.$langs->trans('ThirdParty'),
+			'3' => $langs->trans('ThirdParty'),
+			'4' => $langs->trans('ContactsWithThirdpartyFilter')
 		);
 		$this->type_statuscommprospect = array(
-				-1 => $langs->trans("StatusProspect-1"),
-				0 => $langs->trans("StatusProspect0"),
-				1 => $langs->trans("StatusProspect1"),
-				2 => $langs->trans("StatusProspect2"),
-				3 => $langs->trans("StatusProspect3")
+			-1 => $langs->trans("StatusProspect-1"),
+			0 => $langs->trans("StatusProspect0"),
+			1 => $langs->trans("StatusProspect1"),
+			2 => $langs->trans("StatusProspect2"),
+			3 => $langs->trans("StatusProspect3")
 		);
 	}
 
@@ -108,17 +135,25 @@ class AdvanceTargetingMailing extends CommonObject
 	 *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
 	 *  @return int      		   	 <0 if KO, Id of created object if OK
 	 */
-    public function create($user, $notrigger = 0)
+	public function create($user, $notrigger = 0)
 	{
 		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
-		if (isset($this->fk_element)) $this->fk_element = (int) $this->fk_element;
-		if (isset($this->type_element)) $this->type_element = trim($this->type_element);
+		if (isset($this->fk_element)) {
+			$this->fk_element = (int) $this->fk_element;
+		}
+		if (isset($this->type_element)) {
+			$this->type_element = trim($this->type_element);
+		}
 
-		if (isset($this->name)) $this->name = trim($this->name);
-		if (isset($this->filtervalue)) $this->filtervalue = trim($this->filtervalue);
+		if (isset($this->name)) {
+			$this->name = trim($this->name);
+		}
+		if (isset($this->filtervalue)) {
+			$this->filtervalue = trim($this->filtervalue);
+		}
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -148,18 +183,17 @@ class AdvanceTargetingMailing extends CommonObject
 
 		dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."advtargetemailing");
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -177,7 +211,7 @@ class AdvanceTargetingMailing extends CommonObject
 	 *  @param	int		$id    Id object
 	 *  @return int          	<0 if KO, >0 if OK
 	 */
-    public function fetch($id)
+	public function fetch($id)
 	{
 		global $langs;
 		$sql = "SELECT";
@@ -198,10 +232,8 @@ class AdvanceTargetingMailing extends CommonObject
 
 		dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
@@ -226,16 +258,16 @@ class AdvanceTargetingMailing extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Load object in memory from the database
 	 *
 	 *  @param	int		$id    Id object
 	 *  @return int          	<0 if KO, >0 if OK
 	 */
-    public function fetch_by_mailing($id = 0)
+	public function fetch_by_mailing($id = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
@@ -259,10 +291,8 @@ class AdvanceTargetingMailing extends CommonObject
 
 		dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
@@ -290,7 +320,7 @@ class AdvanceTargetingMailing extends CommonObject
 
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Load object in memory from the database
 	 *
@@ -298,9 +328,9 @@ class AdvanceTargetingMailing extends CommonObject
 	 *  @param	string	$type_element	Type target
 	 *  @return int          			<0 if KO, >0 if OK
 	 */
-    public function fetch_by_element($id = 0, $type_element = 'mailing')
+	public function fetch_by_element($id = 0, $type_element = 'mailing')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
@@ -324,10 +354,8 @@ class AdvanceTargetingMailing extends CommonObject
 
 		dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
@@ -359,16 +387,24 @@ class AdvanceTargetingMailing extends CommonObject
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
 	 *  @return int     		   	 <0 if KO, >0 if OK
 	 */
-    public function update($user, $notrigger = 0)
+	public function update($user, $notrigger = 0)
 	{
 		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
-		if (isset($this->fk_element)) $this->fk_element = (int) $this->fk_element;
-		if (isset($this->type_element)) $this->type_element = trim($this->type_element);
-		if (isset($this->name)) $this->name = trim($this->name);
-		if (isset($this->filtervalue)) $this->filtervalue = trim($this->filtervalue);
+		if (isset($this->fk_element)) {
+			$this->fk_element = (int) $this->fk_element;
+		}
+		if (isset($this->type_element)) {
+			$this->type_element = trim($this->type_element);
+		}
+		if (isset($this->name)) {
+			$this->name = trim($this->name);
+		}
+		if (isset($this->filtervalue)) {
+			$this->filtervalue = trim($this->filtervalue);
+		}
 
 		// Check parameters
 		// Put here code to add a control on parameters values
@@ -389,15 +425,13 @@ class AdvanceTargetingMailing extends CommonObject
 		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-            $error++;
-            $this->errors[] = "Error ".$this->db->lasterror();
-        }
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
+		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -416,28 +450,27 @@ class AdvanceTargetingMailing extends CommonObject
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
 	 *  @return	int					 <0 if KO, >0 if OK
 	 */
-    public function delete($user, $notrigger = 0)
+	public function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
 		$error = 0;
 
 		$this->db->begin();
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."advtargetemailing";
 			$sql .= " WHERE rowid=".$this->id;
 
 			dol_syslog(get_class($this)."::delete sql=".$sql);
 			$resql = $this->db->query($sql);
-			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+			if (!$resql) {
+				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			}
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -451,13 +484,13 @@ class AdvanceTargetingMailing extends CommonObject
 
 
 	/**
-	 * Save query in database to retreive it
+	 * Save query in database to retrieve it
 	 *
 	 *	@param  	User		$user    		User that deletes
 	 * 	@param		array		$arrayquery		All element to Query
 	 * 	@return		int			<0 if KO, >0 if OK
 	 */
-    public function savequery($user, $arrayquery)
+	public function savequery($user, $arrayquery)
 	{
 		global $langs, $conf;
 
@@ -477,16 +510,16 @@ class AdvanceTargetingMailing extends CommonObject
 
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Load object in memory from database
 	 *
 	 * 	@param		array		$arrayquery	All element to Query
 	 * 	@return		int			<0 if KO, >0 if OK
 	 */
-    public function query_thirdparty($arrayquery)
+	public function query_thirdparty($arrayquery)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf, $extrafields;
 
 		$sql = "SELECT";
@@ -563,7 +596,7 @@ class AdvanceTargetingMailing extends CommonObject
 
 				$extrafields->fetch_name_optionals_label($elementtype);
 
-				foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$val) {
+				foreach ($extrafields->attributes[$elementtype]['label'] as $key => $val) {
 					if (($extrafields->attributes[$elementtype]['type'][$key] == 'varchar') ||
 						($extrafields->attributes[$elementtype]['type'][$key] == 'text')) {
 						if (!empty($arrayquery['options_'.$key])) {
@@ -593,7 +626,9 @@ class AdvanceTargetingMailing extends CommonObject
 				}
 			}
 
-			if (count($sqlwhere) > 0)	$sql .= " WHERE ".implode(" AND ", $sqlwhere);
+			if (count($sqlwhere) > 0) {
+				$sql .= " WHERE ".implode(" AND ", $sqlwhere);
+			}
 		}
 
 
@@ -604,10 +639,8 @@ class AdvanceTargetingMailing extends CommonObject
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 
-			if ($num)
-			{
-				while ($i < $num)
-				{
+			if ($num) {
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 
 					$this->thirdparty_lines[$i] = $obj->rowid;
@@ -625,7 +658,7 @@ class AdvanceTargetingMailing extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Load object in memory from database
 	 *
@@ -633,9 +666,9 @@ class AdvanceTargetingMailing extends CommonObject
 	 * 	@param		int			$withThirdpartyFilter	add contact with tridparty filter
 	 * 	@return		int			<0 if KO, >0 if OK
 	 */
-    public function query_contact($arrayquery, $withThirdpartyFilter = 0)
+	public function query_contact($arrayquery, $withThirdpartyFilter = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf;
 
 		$sql = "SELECT";
@@ -674,8 +707,7 @@ class AdvanceTargetingMailing extends CommonObject
 			}
 			if ($arrayquery['contact_no_email'] != '') {
 				$tmpwhere = '';
-				if (!empty($arrayquery['contact_no_email']))
-				{
+				if (!empty($arrayquery['contact_no_email'])) {
 					$tmpwhere .= "(t.email IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE t.entity IN (".getEntity('mailing').") AND email = '".$this->db->escape($arrayquery['contact_no_email'])."'))";
 				} else {
 					$tmpwhere .= "(t.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE t.entity IN (".getEntity('mailing').") AND email = '".$this->db->escape($arrayquery['contact_no_email'])."'))";
@@ -704,7 +736,7 @@ class AdvanceTargetingMailing extends CommonObject
 
 				$extrafields->fetch_name_optionals_label($elementtype);
 
-				foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$val) {
+				foreach ($extrafields->attributes[$elementtype]['label'] as $key => $val) {
 					if (($extrafields->attributes[$elementtype]['type'][$key] == 'varchar') ||
 					($extrafields->attributes[$elementtype]['type'][$key] == 'text')) {
 						if (!empty($arrayquery['options_'.$key.'_cnct'])) {
@@ -806,7 +838,7 @@ class AdvanceTargetingMailing extends CommonObject
 
 						$extrafields->fetch_name_optionals_label($elementtype);
 
-						foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$val) {
+						foreach ($extrafields->attributes[$elementtype]['label'] as $key => $val) {
 							if (($extrafields->attributes[$elementtype]['type'][$key] == 'varchar') ||
 								($extrafields->attributes[$elementtype]['type'][$key] == 'text')) {
 								if (!empty($arrayquery['options_'.$key])) {
@@ -837,7 +869,9 @@ class AdvanceTargetingMailing extends CommonObject
 					}
 				}
 			}
-			if (count($sqlwhere) > 0)	$sql .= " WHERE ".implode(" AND ", $sqlwhere);
+			if (count($sqlwhere) > 0) {
+				$sql .= " WHERE ".implode(" AND ", $sqlwhere);
+			}
 		}
 
 		dol_syslog(get_class($this)."::query_contact sql=".$sql, LOG_DEBUG);
@@ -847,10 +881,8 @@ class AdvanceTargetingMailing extends CommonObject
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 
-			if ($num)
-			{
-				while ($i < $num)
-				{
+			if ($num) {
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 
 					$this->contact_lines[$i] = $obj->rowid;
@@ -878,8 +910,8 @@ class AdvanceTargetingMailing extends CommonObject
 	 *  									For exemple  jean;joe;jim%%;!jimo;!jima%> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 	 * 	@return		string		Sql to use for the where condition
 	 */
-    public function transformToSQL($column_to_test, $criteria)
-    {
+	public function transformToSQL($column_to_test, $criteria)
+	{
 		$return_sql_criteria = '(';
 
 		//This is a multiple value test
diff --git a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
index 53fafb0ce61..9d230404cba 100644
--- a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
@@ -28,9 +28,9 @@
 class FormAdvTargetEmailing extends Form
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -42,12 +42,12 @@ class FormAdvTargetEmailing extends Form
 	 *
 	 * @param DoliDB $db handler
 	 */
-    public function __construct($db)
-    {
-        global $langs;
+	public function __construct($db)
+	{
+		global $langs;
 
-        $this->db = $db;
-    }
+		$this->db = $db;
+	}
 
 	/**
 	 * Affiche un champs select contenant une liste
@@ -56,8 +56,8 @@ class FormAdvTargetEmailing extends Form
 	 * @param string $htmlname select field
 	 * @return string select field
 	 */
-    public function multiselectProspectionStatus($selected_array = array(), $htmlname = 'cust_prospect_status')
-    {
+	public function multiselectProspectionStatus($selected_array = array(), $htmlname = 'cust_prospect_status')
+	{
 		global $conf, $langs;
 		$options_array = array();
 
@@ -84,7 +84,7 @@ class FormAdvTargetEmailing extends Form
 			dol_print_error($this->db);
 		}
 		return $this->advMultiselectarray($htmlname, $options_array, $selected_array);
-    }
+	}
 
 	/**
 	 * Return combo list of activated countries, into language of user
@@ -93,8 +93,8 @@ class FormAdvTargetEmailing extends Form
 	 * @param array $selected_array or Code or Label of preselected country
 	 * @return string HTML string with select
 	 */
-    public function multiselectCountry($htmlname = 'country_id', $selected_array = array())
-    {
+	public function multiselectCountry($htmlname = 'country_id', $selected_array = array())
+	{
 		global $conf, $langs;
 
 		$langs->load("dict");
@@ -142,7 +142,7 @@ class FormAdvTargetEmailing extends Form
 		}
 
 		return $this->advMultiselectarray($htmlname, $options_array, $selected_array);
-    }
+	}
 
 	/**
 	 * Return select list for categories (to use in form search selectors)
@@ -152,14 +152,14 @@ class FormAdvTargetEmailing extends Form
 	 * @param User $user User action
 	 * @return string combo list code
 	 */
-    public function multiselectselectSalesRepresentatives($htmlname, $selected_array, $user)
-    {
+	public function multiselectselectSalesRepresentatives($htmlname, $selected_array, $user)
+	{
 
 		global $conf;
 
 		$options_array = array();
 
-        $sql_usr = '';
+		$sql_usr = '';
 		$sql_usr .= "SELECT DISTINCT u2.rowid, u2.lastname as name, u2.firstname, u2.login";
 		$sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u2, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql_usr .= " WHERE u2.entity IN (0,".$conf->entity.")";
@@ -183,7 +183,7 @@ class FormAdvTargetEmailing extends Form
 		}
 
 		return $this->advMultiselectarray($htmlname, $options_array, $selected_array);
-    }
+	}
 
 	/**
 	 * Return select list for categories (to use in form search selectors)
@@ -192,8 +192,8 @@ class FormAdvTargetEmailing extends Form
 	 * @param array $selected_array selected array
 	 * @return string combo list code
 	 */
-    public function multiselectselectLanguage($htmlname = '', $selected_array = array())
-    {
+	public function multiselectselectLanguage($htmlname = '', $selected_array = array())
+	{
 
 		global $conf, $langs;
 
@@ -208,7 +208,7 @@ class FormAdvTargetEmailing extends Form
 		}
 		asort($options_array);
 		return $this->advMultiselectarray($htmlname, $options_array, $selected_array);
-    }
+	}
 
 	/**
 	 * Return multiselect list of entities for extrafeild type sellist
@@ -330,14 +330,14 @@ class FormAdvTargetEmailing extends Form
 	 * @param int $showempty show empty
 	 * @return string HTML combo
 	 */
-    public function advMultiselectarray($htmlname, $options_array = array(), $selected_array = array(), $showempty = 0)
-    {
+	public function advMultiselectarray($htmlname, $options_array = array(), $selected_array = array(), $showempty = 0)
+	{
 		global $conf, $langs;
 
 		$form = new Form($this->db);
 		$return = $form->multiselectarray($htmlname, $options_array, $selected_array, 0, 0, '', 0, 295);
 		return $return;
-    }
+	}
 
 	/**
 	 * Return a combo list to select emailing target selector
@@ -349,8 +349,8 @@ class FormAdvTargetEmailing extends Form
 	 * @param	string		$morecss		More CSS
 	 * @return	string 						HTML combo
 	 */
-    public function selectAdvtargetemailingTemplate($htmlname = 'template_id', $selected = 0, $showempty = 0, $type_element = 'mailing', $morecss = '')
-    {
+	public function selectAdvtargetemailingTemplate($htmlname = 'template_id', $selected = 0, $showempty = 0, $type_element = 'mailing', $morecss = '')
+	{
 		global $conf, $user, $langs;
 
 		$out = '';
@@ -390,5 +390,5 @@ class FormAdvTargetEmailing extends Form
 		}
 		$this->db->free($resql);
 		return $out;
-    }
+	}
 }
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 1bb4864876c..2f2b16bd119 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -46,48 +46,131 @@ class Mailing extends CommonObject
 	 */
 	public $picto = 'email';
 
-	public $titre;
+	/**
+	 * @var string title
+	 */
+	public $title;
+
+	/**
+	 * @var string subject
+	 */
 	public $sujet;
+
+	/**
+	 * @var string body
+	 */
 	public $body;
+
+	/**
+	 * @var int number of email
+	 */
 	public $nbemail;
+
+	/**
+	 * @var string background color
+	 */
 	public $bgcolor;
+
+	/**
+	 * @var string background image
+	 */
 	public $bgimage;
 
+	/**
+	 * @var int status
+	 */
 	public $statut; // Status 0=Draft, 1=Validated, 2=Sent partially, 3=Sent completely
 
+	/**
+	 * @var string email from
+	 */
 	public $email_from;
+
+	/**
+	 * @var string email reply to
+	 */
 	public $email_replyto;
+
+	/**
+	 * @var string email errors to
+	 */
 	public $email_errorsto;
 
+	/**
+	 * @var string first joined file
+	 */
 	public $joined_file1;
+
+	/**
+	 * @var string second joined file
+	 */
 	public $joined_file2;
+
+	/**
+	 * @var string third joined file
+	 */
 	public $joined_file3;
+
+	/**
+	 * @var string fourth joined file
+	 */
 	public $joined_file4;
 
+	/**
+	 * @var int id of user create
+	 * @deprecated
+	 */
+	public $user_creation;
+
+	/**
+	 * @var int id of user create
+	 */
 	public $user_creat;
+
+	/**
+	 * @var int id of user validate
+	 * @deprecated
+	 */
+	public $user_validation;
+
+	/**
+	 * @var int id of user validate
+	 */
 	public $user_valid;
 
 	/**
-     * @var integer|string date_creation
-     */
+	 * @var integer|string date_creation
+	 */
 	public $date_creat;
 
-
+	/**
+	 * @var int date validate
+	 */
 	public $date_valid;
 
+	/**
+	 * @var array extraparams
+	 */
 	public $extraparams = array();
 
+	/**
+	 * @var array statut dest
+	 */
 	public $statut_dest = array();
+
+	/**
+	 * @var array statuts
+	 */
 	public $statuts = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDb      $db      Database handler
-     */
-    public function __construct($db)
-    {
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDb      $db      Database handler
+	 */
+	public function __construct($db)
+	{
 		$this->db = $db;
 
 		// List of language codes for status
@@ -101,7 +184,7 @@ class Mailing extends CommonObject
 		$this->statut_dest[1] = 'MailingStatusSent';
 		$this->statut_dest[2] = 'MailingStatusRead';
 		$this->statut_dest[3] = 'MailingStatusReadAndUnsubscribe'; // Read but ask to not be contacted anymore
-    }
+	}
 
 	/**
 	 *  Create an EMailing
@@ -115,11 +198,10 @@ class Mailing extends CommonObject
 
 		$this->db->begin();
 
-		$this->titre = trim($this->titre);
+		$this->title = trim($this->title);
 		$this->email_from = trim($this->email_from);
 
-		if (!$this->email_from)
-		{
+		if (!$this->email_from) {
 			$this->error = $langs->trans("ErrorMailFromRequired");
 			return -1;
 		}
@@ -130,19 +212,16 @@ class Mailing extends CommonObject
 		$sql .= " (date_creat, fk_user_creat, entity)";
 		$sql .= " VALUES ('".$this->db->idate($now)."', ".$user->id.", ".$conf->entity.")";
 
-		if (!$this->titre)
-		{
-			$this->titre = $langs->trans("NoTitle");
+		if (!$this->title) {
+			$this->title = $langs->trans("NoTitle");
 		}
 
 		dol_syslog("Mailing::Create", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."mailing");
 
-			if ($this->update($user) > 0)
-			{
+			if ($this->update($user) > 0) {
 				$this->db->commit();
 			} else {
 				$this->error = $this->db->lasterror();
@@ -167,7 +246,7 @@ class Mailing extends CommonObject
 	public function update($user)
 	{
 		$sql = "UPDATE ".MAIN_DB_PREFIX."mailing ";
-		$sql .= " SET titre = '".$this->db->escape($this->titre)."'";
+		$sql .= " SET titre = '".$this->db->escape($this->title)."'";
 		$sql .= ", sujet = '".$this->db->escape($this->sujet)."'";
 		$sql .= ", body = '".$this->db->escape($this->body)."'";
 		$sql .= ", email_from = '".$this->db->escape($this->email_from)."'";
@@ -175,12 +254,11 @@ class Mailing extends CommonObject
 		$sql .= ", email_errorsto = '".$this->db->escape($this->email_errorsto)."'";
 		$sql .= ", bgcolor = '".($this->bgcolor ? $this->db->escape($this->bgcolor) : null)."'";
 		$sql .= ", bgimage = '".($this->bgimage ? $this->db->escape($this->bgimage) : null)."'";
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".(int) $this->id;
 
 		dol_syslog("Mailing::Update", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			return 1;
 		} else {
 			$this->error = $this->db->lasterror();
@@ -198,7 +276,7 @@ class Mailing extends CommonObject
 	{
 		global $conf;
 
-		$sql = "SELECT m.rowid, m.titre, m.sujet, m.body, m.bgcolor, m.bgimage";
+		$sql = "SELECT m.rowid, m.titre as title, m.sujet, m.body, m.bgcolor, m.bgimage";
 		$sql .= ", m.email_from, m.email_replyto, m.email_errorsto";
 		$sql .= ", m.statut, m.nbemail";
 		$sql .= ", m.fk_user_creat, m.fk_user_valid";
@@ -211,21 +289,19 @@ class Mailing extends CommonObject
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 
 				$this->id = $obj->rowid;
 				$this->ref = $obj->rowid;
 				$this->statut = $obj->statut;
 				$this->nbemail = $obj->nbemail;
-				$this->titre = $obj->titre;
+				$this->title = $obj->title;
 
 				$this->sujet = $obj->sujet;
-				if (!empty($conf->global->FCKEDITOR_ENABLE_MAILING) && dol_textishtml(dol_html_entity_decode($obj->body, ENT_COMPAT | ENT_HTML401))) {
-					$this->body = dol_html_entity_decode($obj->body, ENT_COMPAT | ENT_HTML401);
+				if (!empty($conf->global->FCKEDITOR_ENABLE_MAILING) && dol_textishtml(dol_html_entity_decode($obj->body, ENT_COMPAT | ENT_HTML5))) {
+					$this->body = dol_html_entity_decode($obj->body, ENT_COMPAT | ENT_HTML5);
 				} else {
 					$this->body = $obj->body;
 				}
@@ -283,11 +359,10 @@ class Mailing extends CommonObject
 		$object->statut = 0;
 
 		// Clear fields
-		$object->titre = $langs->trans("CopyOf").' '.$object->titre.' '.dol_print_date(dol_now());
+		$object->title = $langs->trans("CopyOf").' '.$object->title.' '.dol_print_date(dol_now());
 
 		// If no option copy content
-		if (empty($option1))
-		{
+		if (empty($option1)) {
 			// Clear values
 			$object->nbemail            = 0;
 			$object->sujet              = '';
@@ -312,15 +387,13 @@ class Mailing extends CommonObject
 		$result = $object->create($user);
 
 		// Other options
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$this->error = $object->error;
 			$this->errors = array_merge($this->errors, $object->errors);
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Clone recipient targets
 			if (!empty($option2)) {
 				require_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php';
@@ -341,10 +414,8 @@ class Mailing extends CommonObject
 				$sql .= " WHERE fk_mailing = ".$fromid;
 
 				$result = $this->db->query($sql);
-				if ($result)
-				{
-					if ($this->db->num_rows($result))
-					{
+				if ($result) {
+					if ($this->db->num_rows($result)) {
 						while ($obj = $this->db->fetch_object($result)) {
 							$target_array[] = array(
 								'fk_contact'=>$obj->fk_contact,
@@ -370,8 +441,7 @@ class Mailing extends CommonObject
 		unset($object->context['createfromclone']);
 
 		// End
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return $object->id;
 		} else {
@@ -395,8 +465,7 @@ class Mailing extends CommonObject
 		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog("Mailing::valid", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
+		if ($this->db->query($sql)) {
 			return 1;
 		} else {
 			$this->error = $this->db->lasterror();
@@ -418,8 +487,7 @@ class Mailing extends CommonObject
 
 		dol_syslog("Mailing::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			return $this->delete_targets();
 		} else {
 			$this->error = $this->db->lasterror();
@@ -427,7 +495,7 @@ class Mailing extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Delete targets emailing
 	 *
@@ -435,14 +503,13 @@ class Mailing extends CommonObject
 	 */
 	public function delete_targets()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles";
 		$sql .= " WHERE fk_mailing = ".$this->id;
 
 		dol_syslog("Mailing::delete_targets", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			return 1;
 		} else {
 			$this->error = $this->db->lasterror();
@@ -451,7 +518,7 @@ class Mailing extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Change status of each recipient
 	 *
@@ -460,15 +527,14 @@ class Mailing extends CommonObject
 	 */
 	public function reset_targets_status($user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
 		$sql .= " SET statut = 0";
 		$sql .= " WHERE fk_mailing = ".$this->id;
 
 		dol_syslog("Mailing::reset_targets_status", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			return 1;
 		} else {
 			$this->error = $this->db->lasterror();
@@ -485,26 +551,30 @@ class Mailing extends CommonObject
 	 */
 	public function countNbOfTargets($mode)
 	{
-	    $sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."mailing_cibles";
-	    $sql .= " WHERE fk_mailing = ".$this->id;
-	    if ($mode == 'alreadysent') $sql .= " AND statut <> 0";
-	    elseif ($mode == 'alreadysentok') $sql .= " AND statut > 0";
-	    elseif ($mode == 'alreadysentko') $sql .= " AND statut = -1";
-	    else {
-	        $this->error = 'BadValueForParameterMode';
-	        return -2;
-	    }
+		$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."mailing_cibles";
+		$sql .= " WHERE fk_mailing = ".$this->id;
+		if ($mode == 'alreadysent') {
+			$sql .= " AND statut <> 0";
+		} elseif ($mode == 'alreadysentok') {
+			$sql .= " AND statut > 0";
+		} elseif ($mode == 'alreadysentko') {
+			$sql .= " AND statut = -1";
+		} else {
+			$this->error = 'BadValueForParameterMode';
+			return -2;
+		}
 
-	    $resql = $this->db->query($sql);
-	    if ($resql)
-	    {
-	        $obj = $this->db->fetch_object($resql);
-	        if ($obj) return $obj->nb;
-	    } else {
-	        $this->error = $this->db->lasterror();
-	        return -1;
-	    }
-	    return 0;
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$obj = $this->db->fetch_object($resql);
+			if ($obj) {
+				return $obj->nb;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+		return 0;
 	}
 
 
@@ -524,7 +594,9 @@ class Mailing extends CommonObject
 		global $dolibarr_main_authentication, $dolibarr_main_demo;
 		global $menumanager;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 		$companylink = '';
@@ -535,19 +607,20 @@ class Mailing extends CommonObject
 
 		$url = DOL_URL_ROOT.'/comm/mailing/card.php?id='.$this->id;
 
-		if ($option != 'nolink')
-		{
+		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowEMailing");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -560,15 +633,21 @@ class Mailing extends CommonObject
 			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
 			 */
-		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
@@ -576,8 +655,11 @@ class Mailing extends CommonObject
 		$hookmanager->initHooks(array('emailingdao'));
 		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -593,7 +675,7 @@ class Mailing extends CommonObject
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un statut donne
 	 *
@@ -603,7 +685,7 @@ class Mailing extends CommonObject
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$langs->load("mailing");
 
@@ -611,8 +693,12 @@ class Mailing extends CommonObject
 		$labelStatusShort = $langs->trans($this->statuts[$status]);
 
 		$statusType = 'status'.$status;
-		if ($status == 2) $statusType = 'status3';
-		if ($status == 3) $statusType = 'status6';
+		if ($status == 2) {
+			$statusType = 'status3';
+		}
+		if ($status == 3) {
+			$statusType = 'status6';
+		}
 
 		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
 	}
@@ -647,9 +733,15 @@ class Mailing extends CommonObject
 		$labelStatusShort[3] = $langs->trans('MailingStatusNotContact');
 
 		$statusType = 'status'.$status;
-		if ($status == -1) $statusType = 'status8';
-		if ($status == 1) $statusType = 'status6';
-		if ($status == 2) $statusType = 'status4';
+		if ($status == -1) {
+			$statusType = 'status8';
+		}
+		if ($status == 1) {
+			$statusType = 'status6';
+		}
+		if ($status == 2) {
+			$statusType = 'status4';
+		}
 
 		$param = array();
 		if ($status == - 1) {
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index cf439e4314b..8c1e392ed68 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -57,19 +57,19 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 //if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 //{
-    // Recherche emails
-    print '<form method="post" action="'.DOL_URL_ROOT.'/comm/mailing/list.php">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder nohover centpercent">';
-    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchAMailing").'</td></tr>';
-    print '<tr class="oddeven"><td class="nowrap">';
-    print $langs->trans("Ref").':</td><td><input type="text" class="flat inputsearch" name="sref"></td>';
-    print '<td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-    print '<tr class="oddeven"><td class="nowrap">';
-    print $langs->trans("Other").':</td><td><input type="text" class="flat inputsearch" name="sall"></td>';
+	// Recherche emails
+	print '<form method="post" action="'.DOL_URL_ROOT.'/comm/mailing/list.php">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder nohover centpercent">';
+	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchAMailing").'</td></tr>';
+	print '<tr class="oddeven"><td class="nowrap">';
+	print $langs->trans("Ref").':</td><td><input type="text" class="flat inputsearch" name="sref"></td>';
+	print '<td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+	print '<tr class="oddeven"><td class="nowrap">';
+	print $langs->trans("Other").':</td><td><input type="text" class="flat inputsearch" name="sall"></td>';
 
-    print "</table></div></form><br>\n";
+	print "</table></div></form><br>\n";
 //}
 
 
@@ -82,63 +82,63 @@ $handle = opendir($dir);
 
 if (is_resource($handle))
 {
-    while (($file = readdir($handle)) !== false)
-    {
-        if (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
-        {
-            if (preg_match("/(.*)\.(.*)\.(.*)/i", $file, $reg))
-            {
-                $modulename = $reg[1];
-       			if ($modulename == 'example') continue;
+	while (($file = readdir($handle)) !== false)
+	{
+		if (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
+		{
+			if (preg_match("/(.*)\.(.*)\.(.*)/i", $file, $reg))
+			{
+				$modulename = $reg[1];
+	   			if ($modulename == 'example') continue;
 
-                // Loading Class
-                $file = $dir."/".$modulename.".modules.php";
-                $classname = "mailing_".$modulename;
-                require_once $file;
-                $mailmodule = new $classname($db);
+				// Loading Class
+				$file = $dir."/".$modulename.".modules.php";
+				$classname = "mailing_".$modulename;
+				require_once $file;
+				$mailmodule = new $classname($db);
 
-                $qualified = 1;
-                foreach ($mailmodule->require_module as $key)
-                {
-                    if (!$conf->$key->enabled || (!$user->admin && $mailmodule->require_admin))
-                    {
-                        $qualified = 0;
-                        //print "Les pr�requis d'activation du module mailing ne sont pas respect�s. Il ne sera pas actif";
-                        break;
-                    }
-                }
+				$qualified = 1;
+				foreach ($mailmodule->require_module as $key)
+				{
+					if (!$conf->$key->enabled || (!$user->admin && $mailmodule->require_admin))
+					{
+						$qualified = 0;
+						//print "Les pr�requis d'activation du module mailing ne sont pas respect�s. Il ne sera pas actif";
+						break;
+					}
+				}
 
-                // Si le module mailing est qualifi�
-                if ($qualified)
-                {
-                    foreach ($mailmodule->getSqlArrayForStats() as $sql)
-                    {
-                        print '<tr class="oddeven">';
+				// Si le module mailing est qualifi�
+				if ($qualified)
+				{
+					foreach ($mailmodule->getSqlArrayForStats() as $sql)
+					{
+						print '<tr class="oddeven">';
 
-                        $result = $db->query($sql);
-                        if ($result) {
-                            $num = $db->num_rows($result);
+						$result = $db->query($sql);
+						if ($result) {
+							$num = $db->num_rows($result);
 
-                            $i = 0;
+							$i = 0;
 
-                            while ($i < $num)
-                            {
-                                $obj = $db->fetch_object($result);
-                                print '<td>'.img_object('', $mailmodule->picto).' '.$obj->label.'</td><td class="right">'.$obj->nb.'<td>';
-                                $i++;
-                            }
+							while ($i < $num)
+							{
+								$obj = $db->fetch_object($result);
+								print '<td>'.img_object('', $mailmodule->picto).' '.$obj->label.'</td><td class="right">'.$obj->nb.'<td>';
+								$i++;
+							}
 
-                            $db->free($result);
-                        } else {
-                            dol_print_error($db);
-                        }
-                        print '</tr>';
-                    }
-                }
-            }
-        }
-    }
-    closedir($handle);
+							$db->free($result);
+						} else {
+							dol_print_error($db);
+						}
+						print '</tr>';
+					}
+				}
+			}
+		}
+	}
+	closedir($handle);
 }
 
 
@@ -160,42 +160,42 @@ $sql .= " ORDER BY m.date_creat DESC";
 $sql .= " LIMIT ".$limit;
 $result = $db->query($sql);
 if ($result) {
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td colspan="2">'.$langs->trans("LastMailings", $limit).'</td>';
-    print '<td class="center">'.$langs->trans("DateCreation").'</td>';
-    print '<td class="center">'.$langs->trans("NbOfEMails").'</td>';
-    print '<td class="right"><a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("AllEMailings").'</a></td></tr>';
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td colspan="2">'.$langs->trans("LastMailings", $limit).'</td>';
+	print '<td class="center">'.$langs->trans("DateCreation").'</td>';
+	print '<td class="center">'.$langs->trans("NbOfEMails").'</td>';
+	print '<td class="right"><a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("AllEMailings").'</a></td></tr>';
 
-    $num = $db->num_rows($result);
-    if ($num > 0)
-    {
-        $i = 0;
+	$num = $db->num_rows($result);
+	if ($num > 0)
+	{
+		$i = 0;
 
-        while ($i < $num)
-	    {
-	        $obj = $db->fetch_object($result);
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($result);
 			$mailstatic = new Mailing($db);
 			$mailstatic->id = $obj->rowid;
 			$mailstatic->ref = $obj->rowid;
 
-	        print '<tr class="oddeven">';
-	        print '<td class="nowrap">'.$mailstatic->getNomUrl(1).'</td>';
-	        print '<td>'.dol_trunc($obj->titre, 38).'</td>';
-	        print '<td class="center">'.dol_print_date($db->jdate($obj->date_creat), 'day').'</td>';
-	        print '<td class="center">'.($obj->nbemail ? $obj->nbemail : "0").'</td>';
-	        print '<td class="right">'.$mailstatic->LibStatut($obj->statut, 5).'</td>';
-            print '</tr>';
-	        $i++;
-	    }
-    } else {
-        print '<tr><td class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-    }
-    print "</table></div><br>";
-    $db->free($result);
+			print '<tr class="oddeven">';
+			print '<td class="nowrap">'.$mailstatic->getNomUrl(1).'</td>';
+			print '<td>'.dol_trunc($obj->title, 38).'</td>';
+			print '<td class="center">'.dol_print_date($db->jdate($obj->date_creat), 'day').'</td>';
+			print '<td class="center">'.($obj->nbemail ? $obj->nbemail : "0").'</td>';
+			print '<td class="right">'.$mailstatic->LibStatut($obj->statut, 5).'</td>';
+			print '</tr>';
+			$i++;
+		}
+	} else {
+		print '<tr><td class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+	}
+	print "</table></div><br>";
+	$db->free($result);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
@@ -204,12 +204,12 @@ print '</div></div></div>';
 
 
 if ($langs->file_exists("html/spam.html", 0)) {
-    print "<br><br><br><br>".$langs->trans("Note")."<br>";
-    print '<div style="padding: 4px; background: #FAFAFA; border: 1px solid #BBBBBB;" >';
-    dol_print_file($langs, "html/spam.html", 0);
-    print '</div>';
+	print "<br><br><br><br>".$langs->trans("Note")."<br>";
+	print '<div style="padding: 4px; background: #FAFAFA; border: 1px solid #BBBBBB;" >';
+	dol_print_file($langs, "html/spam.html", 0);
+	print '</div>';
 
-    print '<br>';
+	print '<br>';
 }
 
 $parameters = array('user' => $user);
diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php
index 070d46f6104..199a5caad8b 100644
--- a/htdocs/comm/mailing/info.php
+++ b/htdocs/comm/mailing/info.php
@@ -52,7 +52,7 @@ if ($object->fetch($id) >= 0)
 {
 	$head = emailing_prepare_head($object);
 
-	dol_fiche_head($head, 'info', $langs->trans("Mailing"), -1, 'email');
+	print dol_get_fiche_head($head, 'info', $langs->trans("Mailing"), -1, 'email');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -81,7 +81,7 @@ if ($object->fetch($id) >= 0)
 	//print '</td></tr></table>';
 
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index d22dd130507..9da825e262e 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -60,7 +60,7 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-    'm.titre'=>'Ref',
+	'm.titre'=>'Ref',
 );
 
 
@@ -169,7 +169,7 @@ if ($resql)
 	$newcardbutton = '';
 	if ($user->rights->mailing->creer)
 	{
-        $newcardbutton .= dolGetButtonTitle($langs->trans('NewMailing'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/mailing/card.php?action=create');
+		$newcardbutton .= dolGetButtonTitle($langs->trans('NewMailing'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/mailing/card.php?action=create');
 	}
 
 	$i = 0;
@@ -190,8 +190,8 @@ if ($resql)
 
 	$moreforfilter = '';
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre">';
@@ -238,7 +238,7 @@ if ($resql)
 		print $email->getNomUrl(1);
 		print '</td>';
 
-		print '<td>'.$obj->titre.'</td>';
+		print '<td>'.$obj->title.'</td>';
 		// Date creation
 
 		print '<td class="center">';
diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php
index cd5d5c9ace9..c8a674773a2 100644
--- a/htdocs/comm/multiprix.php
+++ b/htdocs/comm/multiprix.php
@@ -80,7 +80,7 @@ if ($_socid > 0)
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="setpricelevel">';
 
-	dol_fiche_head($head, $tabchoice, $langs->trans("ThirdParty"), 0, 'company');
+	print dol_get_fiche_head($head, $tabchoice, $langs->trans("ThirdParty"), 0, 'company');
 
 	print '<table class="border centpercent tableforfield">';
 
@@ -105,9 +105,9 @@ if ($_socid > 0)
 
 	print "</table>";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
-	print '<div align="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
+	print '<div align="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
 
 	print "</form>";
 
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 8febd8868e9..12146179db0 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -13,6 +13,7 @@
  * Copyright (C) 2014       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2016       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2020	    Nicolas ZABOURI         <info@inovea-conseil.com>
  *
  * 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
@@ -165,24 +166,26 @@ if (empty($reshook))
 			if ($object->id > 0) {
 				if (!empty($conf->global->PROPAL_CLONE_DATE_DELIVERY)) {
 					//Get difference between old and new delivery date and change lines according to difference
-                    $date_delivery = dol_mktime(12, 0, 0,
+					$date_delivery = dol_mktime(12, 0, 0,
 						GETPOST('date_deliverymonth', 'int'),
 						GETPOST('date_deliveryday', 'int'),
 						GETPOST('date_deliveryyear', 'int')
 					);
-					if (!empty($object->date_livraison) && !empty($date_delivery))
+					$date_delivery_old = (empty($object->delivery_date) ? $object->date_livraison : $object->delivery_date);
+					if (!empty($date_delivery_old) && !empty($date_delivery))
 					{
 						//Attempt to get the date without possible hour rounding errors
-                        $old_date_delivery = dol_mktime(12, 0, 0,
-							dol_print_date($object->date_livraison, '%m'),
-							dol_print_date($object->date_livraison, '%d'),
-							dol_print_date($object->date_livraison, '%Y')
+						$old_date_delivery = dol_mktime(12, 0, 0,
+							dol_print_date($date_delivery_old, '%m'),
+							dol_print_date($date_delivery_old, '%d'),
+							dol_print_date($date_delivery_old, '%Y')
 						);
 						//Calculate the difference and apply if necessary
 						$difference = $date_delivery - $old_date_delivery;
 						if ($difference != 0)
 						{
 							$object->date_livraison = $date_delivery;
+							$object->delivery_date = $date_delivery;
 							foreach ($object->lines as $line)
 							{
 								if (isset($line->date_start)) $line->date_start = $line->date_start + $difference;
@@ -286,7 +289,7 @@ if (empty($reshook))
 			dol_print_error($db, $object->error);
 	} elseif ($action == 'setdate_livraison' && $usercancreate)
 	{
-		$result = $object->set_date_livraison($user, dol_mktime(12, 0, 0, $_POST['date_livraisonmonth'], $_POST['date_livraisonday'], $_POST['date_livraisonyear']));
+		$result = $object->setDeliveryDate($user, dol_mktime(12, 0, 0, $_POST['date_livraisonmonth'], $_POST['date_livraisonday'], $_POST['date_livraisonyear']));
 		if ($result < 0)
 			dol_print_error($db, $object->error);
 	} // Positionne ref client
@@ -339,7 +342,9 @@ if (empty($reshook))
 				if ($object->fetch(GETPOST('copie_propal', 'int')) > 0) {
 					$object->ref = GETPOST('ref');
 					$object->datep = $datep;
-					$object->date_livraison = $date_delivery;
+					$object->date = $datep;
+					$object->date_livraison = $date_delivery; // deprecated
+					$object->delivery_date = $date_delivery;
 					$object->availability_id = GETPOST('availability_id');
 					$object->demand_reason_id = GETPOST('demand_reason_id');
 					$object->fk_delivery_address = GETPOST('fk_address', 'int');
@@ -353,16 +358,14 @@ if (empty($reshook))
 					$object->socid = GETPOST('socid', 'int');
 					$object->contact_id = GETPOST('contactid', 'int');
 					$object->fk_project = GETPOST('projectid', 'int');
-					$object->model_pdf = GETPOST('model');
+					$object->model_pdf = GETPOST('model', 'alphanohtml');
 					$object->author = $user->id; // deprecated
+					$object->user_author_id = $user->id;
 					$object->note_private = GETPOST('note_private', 'restricthtml');
 					$object->note_public = GETPOST('note_public', 'restricthtml');
 					$object->statut = Propal::STATUS_DRAFT;
 					$object->fk_incoterms = GETPOST('incoterm_id', 'int');
 					$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
-
-					// the create is done below and further more the existing create_from function is quite hilarating
-					//$id = $object->create_from($user);
 				} else {
 					setEventMessages($langs->trans("ErrorFailedToCopyProposal", GETPOST('copie_propal')), null, 'errors');
 				}
@@ -370,14 +373,16 @@ if (empty($reshook))
 				$object->ref = GETPOST('ref');
 				$object->ref_client = GETPOST('ref_client');
 				$object->datep = $datep;
+				$object->date = $datep;
 				$object->date_livraison = $date_delivery;
-				$object->availability_id = GETPOST('availability_id');
-				$object->demand_reason_id = GETPOST('demand_reason_id');
-				$object->fk_delivery_address = GETPOST('fk_address');
+				$object->delivery_date = $date_delivery;
+				$object->availability_id = GETPOST('availability_id', 'int');
+				$object->demand_reason_id = GETPOST('demand_reason_id', 'int');
+				$object->fk_delivery_address = GETPOST('fk_address', 'int');
 				$object->shipping_method_id = GETPOST('shipping_method_id', 'int');
-				$object->duree_validite = GETPOST('duree_validite');
-				$object->cond_reglement_id = GETPOST('cond_reglement_id');
-				$object->mode_reglement_id = GETPOST('mode_reglement_id');
+				$object->duree_validite = price2num(GETPOST('duree_validite', 'alpha'));
+				$object->cond_reglement_id = GETPOST('cond_reglement_id', 'int');
+				$object->mode_reglement_id = GETPOST('mode_reglement_id', 'int');
 				$object->fk_account = GETPOST('fk_account', 'int');
 				$object->contact_id = GETPOST('contactid', 'int');
 				$object->fk_project = GETPOST('projectid', 'int');
@@ -542,9 +547,8 @@ if (empty($reshook))
 
 				if ($id > 0)
 				{
-					// Insertion contact par defaut si defini
-					if (GETPOST('contactid') > 0)
-					{
+					// Insert default contacts if defined
+					if (GETPOST('contactid') > 0) {
 						$result = $object->add_contact(GETPOST('contactid'), 'CUSTOMER', 'external');
 						if ($result < 0)
 						{
@@ -665,82 +669,82 @@ if (empty($reshook))
 		}
 	} // add lines from objectlinked
 	elseif ($action == 'import_lines_from_object'
-	    && $user->rights->propal->creer
-	    && $object->statut == Propal::STATUS_DRAFT
-	    )
+		&& $user->rights->propal->creer
+		&& $object->statut == Propal::STATUS_DRAFT
+		)
 	{
-	    $fromElement = GETPOST('fromelement');
-	    $fromElementid = GETPOST('fromelementid');
-	    $importLines = GETPOST('line_checkbox');
+		$fromElement = GETPOST('fromelement');
+		$fromElementid = GETPOST('fromelementid');
+		$importLines = GETPOST('line_checkbox');
 
-	    if (!empty($importLines) && is_array($importLines) && !empty($fromElement) && ctype_alpha($fromElement) && !empty($fromElementid))
-	    {
-	        if ($fromElement == 'commande')
-	        {
-	            dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
-	            $lineClassName = 'OrderLine';
-	        } elseif ($fromElement == 'propal')
-	        {
-	            dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
-	            $lineClassName = 'PropaleLigne';
-	        }
-	        $nextRang = count($object->lines) + 1;
-	        $importCount = 0;
-	        $error = 0;
-	        foreach ($importLines as $lineId)
-	        {
-	            $lineId = intval($lineId);
-	            $originLine = new $lineClassName($db);
-	            if (intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0)
-	            {
-	                $originLine->fetch_optionals();
-	                $desc = $originLine->desc;
-	                $pu_ht = $originLine->subprice;
-	                $qty = $originLine->qty;
-	                $txtva = $originLine->tva_tx;
-	                $txlocaltax1 = $originLine->localtax1_tx;
-	                $txlocaltax2 = $originLine->localtax2_tx;
-	                $fk_product = $originLine->fk_product;
-	                $remise_percent = $originLine->remise_percent;
-	                $date_start = $originLine->date_start;
-	                $date_end = $originLine->date_end;
-	                $ventil = 0;
-	                $info_bits = $originLine->info_bits;
-	                $fk_remise_except = $originLine->fk_remise_except;
-	                $price_base_type = 'HT';
-	                $pu_ttc = 0;
-	                $type = $originLine->product_type;
-	                $rang = $nextRang++;
-	                $special_code = $originLine->special_code;
-	                $origin = $originLine->element;
-	                $origin_id = $originLine->id;
-	                $fk_parent_line = 0;
-	                $fk_fournprice = $originLine->fk_fournprice;
-	                $pa_ht = $originLine->pa_ht;
-	                $label = $originLine->label;
-	                $array_options = $originLine->array_options;
-	                $situation_percent = 100;
-	                $fk_prev_id = '';
-	                $fk_unit = $originLine->fk_unit;
-	                $pu_ht_devise = $originLine->multicurrency_subprice;
+		if (!empty($importLines) && is_array($importLines) && !empty($fromElement) && ctype_alpha($fromElement) && !empty($fromElementid))
+		{
+			if ($fromElement == 'commande')
+			{
+				dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
+				$lineClassName = 'OrderLine';
+			} elseif ($fromElement == 'propal')
+			{
+				dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
+				$lineClassName = 'PropaleLigne';
+			}
+			$nextRang = count($object->lines) + 1;
+			$importCount = 0;
+			$error = 0;
+			foreach ($importLines as $lineId)
+			{
+				$lineId = intval($lineId);
+				$originLine = new $lineClassName($db);
+				if (intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0)
+				{
+					$originLine->fetch_optionals();
+					$desc = $originLine->desc;
+					$pu_ht = $originLine->subprice;
+					$qty = $originLine->qty;
+					$txtva = $originLine->tva_tx;
+					$txlocaltax1 = $originLine->localtax1_tx;
+					$txlocaltax2 = $originLine->localtax2_tx;
+					$fk_product = $originLine->fk_product;
+					$remise_percent = $originLine->remise_percent;
+					$date_start = $originLine->date_start;
+					$date_end = $originLine->date_end;
+					$ventil = 0;
+					$info_bits = $originLine->info_bits;
+					$fk_remise_except = $originLine->fk_remise_except;
+					$price_base_type = 'HT';
+					$pu_ttc = 0;
+					$type = $originLine->product_type;
+					$rang = $nextRang++;
+					$special_code = $originLine->special_code;
+					$origin = $originLine->element;
+					$origin_id = $originLine->id;
+					$fk_parent_line = 0;
+					$fk_fournprice = $originLine->fk_fournprice;
+					$pa_ht = $originLine->pa_ht;
+					$label = $originLine->label;
+					$array_options = $originLine->array_options;
+					$situation_percent = 100;
+					$fk_prev_id = '';
+					$fk_unit = $originLine->fk_unit;
+					$pu_ht_devise = $originLine->multicurrency_subprice;
 
-	                $res = $object->addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $price_base_type, $pu_ttc, $info_bits, $type, $rang, $special_code, $fk_parent_line, $fk_fournprice, $pa_ht, $label, $date_start, $date_end, $array_options, $fk_unit, $origin, $origin_id, $pu_ht_devise, $fk_remise_except);
+					$res = $object->addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $price_base_type, $pu_ttc, $info_bits, $type, $rang, $special_code, $fk_parent_line, $fk_fournprice, $pa_ht, $label, $date_start, $date_end, $array_options, $fk_unit, $origin, $origin_id, $pu_ht_devise, $fk_remise_except);
 
-	                if ($res > 0) {
-	                    $importCount++;
-	                } else {
-	                    $error++;
-	                }
-	            } else {
-	                $error++;
-	            }
-	        }
+					if ($res > 0) {
+						$importCount++;
+					} else {
+						$error++;
+					}
+				} else {
+					$error++;
+				}
+			}
 
-	        if ($error)
-	        {
-	            setEventMessages($langs->trans('ErrorsOnXLines', $error), null, 'errors');
-	        }
-	    }
+			if ($error)
+			{
+				setEventMessages($langs->trans('ErrorsOnXLines', $error), null, 'errors');
+			}
+		}
 	}
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
@@ -805,7 +809,7 @@ if (empty($reshook))
 			$tva_tx = '';
 		}
 
-		$qty = GETPOST('qty'.$predef);
+		$qty = price2num(GETPOST('qty'.$predef), 'MS');
 		$remise_percent = GETPOST('remise_percent'.$predef);
 		if (empty($remise_percent)) $remise_percent = 0;
 
@@ -889,8 +893,8 @@ if (empty($reshook))
 					$price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
 					if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
 					{
-					    if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx = $prod->multiprices_tva_tx[$object->thirdparty->price_level];
-					    if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr = $prod->multiprices_recuperableonly[$object->thirdparty->price_level];
+						if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx = $prod->multiprices_tva_tx[$object->thirdparty->price_level];
+						if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr = $prod->multiprices_recuperableonly[$object->thirdparty->price_level];
 					}
 				} // If price per customer
 				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
@@ -907,6 +911,7 @@ if (empty($reshook))
 						if (count($prodcustprice->lines) > 0) {
 							$pu_ht = price($prodcustprice->lines[0]->price);
 							$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
+							$price_min =  price($prodcustprice->lines[0]->price_min);
 							$price_base_type = $prodcustprice->lines[0]->price_base_type;
 							$tva_tx = ($prodcustprice->lines[0]->default_vat_code ? $prodcustprice->lines[0]->tva_tx.' ('.$prodcustprice->lines[0]->default_vat_code.' )' : $prodcustprice->lines[0]->tva_tx);
 							if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) $tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
@@ -1228,7 +1233,10 @@ if (empty($reshook))
 					}
 				}
 			}
-			$result = $object->updateline(GETPOST('lineid'), $pu_ht, GETPOST('qty'), GETPOST('remise_percent'), $vat_rate, $localtax1_rate, $localtax2_rate, $description, 'HT', $info_bits, $special_code, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, $type, $date_start, $date_end, $array_options, $_POST["units"], $pu_ht_devise);
+
+			$qty = price2num(GETPOST('qty'), 'MS');
+
+			$result = $object->updateline(GETPOST('lineid', 'int'), $pu_ht, $qty, GETPOST('remise_percent'), $vat_rate, $localtax1_rate, $localtax2_rate, $description, 'HT', $info_bits, $special_code, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, $type, $date_start, $date_end, $array_options, $_POST["units"], $pu_ht_devise);
 
 			if ($result >= 0) {
 				$db->commit();
@@ -1282,8 +1290,8 @@ if (empty($reshook))
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
 		exit();
 	} elseif ($action == 'classin' && $usercancreate) {
-        // Set project
-        $object->setProject(GETPOST('projectid', 'int'));
+		// Set project
+		$object->setProject(GETPOST('projectid', 'int'));
 	} // Delivery time
 	elseif ($action == 'setavailability' && $usercancreate) {
 		$result = $object->set_availability($user, GETPOST('availability_id', 'int'));
@@ -1320,7 +1328,7 @@ if (empty($reshook))
 		if ($ret < 0) $error++;
 		if (!$error)
 		{
-			$result = $object->insertExtraFields('PROPAL_MODIFY');
+			$result = $object->updateExtraField(GETPOST('attribute', 'restricthtml'), 'PROPAL_MODIFY', $user);
 			if ($result < 0)
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -1336,7 +1344,8 @@ if (empty($reshook))
 		{
 			if ($object->id > 0) {
 				$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-				$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+				$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+				$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 			}
 
 			if ($result >= 0) {
@@ -1483,7 +1492,7 @@ if ($action == 'create')
 		print '<input type="hidden" name="projectid" value="'.$projectid.'">';
 	}
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">';
 
@@ -1503,18 +1512,16 @@ if ($action == 'create')
 		print $soc->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="'.$soc->id.'">';
 		print '</td>';
-		if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD) && !empty($soc->shipping_method_id)) {
-			$shipping_method_id = $soc->shipping_method_id;
-		}
 	} else {
 		print '<td>';
 		print $form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300 maxwidth500');
 		// reload page to retrieve customer informations
-		if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
+		if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED))
 		{
 			print '<script type="text/javascript">
 			$(document).ready(function() {
 				$("#socid").change(function() {
+					console.log("We have changed the company - Reload page");
 					var socid = $(this).val();
 					// reload page
 					window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid+"&ref_client="+$("input[name=ref_client]").val();
@@ -1529,7 +1536,7 @@ if ($action == 'create')
 
 	if ($socid > 0)
 	{
-        // Contacts (ask contact only if thirdparty already defined).
+		// Contacts (ask contact only if thirdparty already defined).
 		print "<tr><td>".$langs->trans("DefaultContact").'</td><td>';
 		$form->select_contacts($soc->id, $contactid, 'contactid', 1, $srccontactslist);
 		print '</td></tr>';
@@ -1552,7 +1559,7 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Validaty duration
-	print '<tr><td class="fieldrequired">'.$langs->trans("ValidityDuration").'</td><td><input name="duree_validite" class="width50" value="'.(GETPOST('duree_validite', 'int') ? GETPOST('duree_validite', 'int') : $conf->global->PROPALE_VALIDITY_DURATION).'"> '.$langs->trans("days").'</td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("ValidityDuration").'</td><td><input name="duree_validite" class="width50" value="'.(GETPOSTISSET('duree_validite') ? GETPOST('duree_validite', 'alphanohtml') : $conf->global->PROPALE_VALIDITY_DURATION).'"> '.$langs->trans("days").'</td></tr>';
 
 	// Terms of payment
 	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
@@ -1586,6 +1593,9 @@ if ($action == 'create')
 
 	// Shipping Method
 	if (!empty($conf->expedition->enabled)) {
+		if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD) && !empty($soc->shipping_method_id)) {
+			$shipping_method_id = $soc->shipping_method_id;
+		}
 		print '<tr><td>'.$langs->trans('SendingMethod').'</td><td>';
 		print $form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1);
 		print '</td></tr>';
@@ -1714,9 +1724,9 @@ if ($action == 'create')
 
 		if (!empty($conf->multicurrency->enabled))
 		{
-		    print '<tr><td>'.$langs->trans('MulticurrencyAmountHT').'</td><td>'.price($objectsrc->multicurrency_total_ht).'</td></tr>';
-		    print '<tr><td>'.$langs->trans('MulticurrencyAmountVAT').'</td><td>'.price($objectsrc->multicurrency_total_tva)."</td></tr>";
-		    print '<tr><td>'.$langs->trans('MulticurrencyAmountTTC').'</td><td>'.price($objectsrc->multicurrency_total_ttc)."</td></tr>";
+			print '<tr><td>'.$langs->trans('MulticurrencyAmountHT').'</td><td>'.price($objectsrc->multicurrency_total_ht).'</td></tr>';
+			print '<tr><td>'.$langs->trans('MulticurrencyAmountVAT').'</td><td>'.price($objectsrc->multicurrency_total_tva)."</td></tr>";
+			print '<tr><td>'.$langs->trans('MulticurrencyAmountTTC').'</td><td>'.price($objectsrc->multicurrency_total_ttc)."</td></tr>";
 		}
 	}
 
@@ -1770,13 +1780,13 @@ if ($action == 'create')
 		print '</table>';
 	}
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$langs->load("bills");
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("CreateDraft").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+	print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 	print '</div>';
 
 	print "</form>";
@@ -1804,7 +1814,7 @@ if ($action == 'create')
 	$soc->fetch($object->socid);
 
 	$head = propal_prepare_head($object);
-	dol_fiche_head($head, 'comm', $langs->trans('Proposal'), -1, 'propal');
+	print dol_get_fiche_head($head, 'comm', $langs->trans('Proposal'), -1, 'propal');
 
 	$formconfirm = '';
 
@@ -1817,8 +1827,8 @@ if ($action == 'create')
 			// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
 			array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '(s.client=1 OR s.client=2 OR s.client=3)'))
 		);
-		if (!empty($conf->global->PROPAL_CLONE_DATE_DELIVERY) && !empty($object->date_livraison)) {
-			$formquestion[] = array('type' => 'date', 'name' => 'date_delivery', 'label' => $langs->trans("DeliveryDate"), 'value' => $object->date_livraison);
+		if (!empty($conf->global->PROPAL_CLONE_DATE_DELIVERY) && !empty($object->delivery_date)) {
+			$formquestion[] = array('type' => 'date', 'name' => 'date_delivery', 'label' => $langs->trans("DeliveryDate"), 'value' => $object->delivery_date);
 		}
 		// Incomplete payment. We ask if reason = discount or other
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmClonePropal', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
@@ -1828,7 +1838,7 @@ if ($action == 'create')
 	{
 		//Form to close proposal (signed or not)
 		$formquestion = array(
-			array('type' => 'select', 'name' => 'statut', 'label' => '<span class="fieldrequired">'.$langs->trans("CloseAs").'</span>', 'values' => array(2=>$object->LibStatut($object::STATUS_SIGNED), 3=>$object->LibStatut($object::STATUS_NOTSIGNED))),
+			array('type' => 'select', 'name' => 'statut', 'label' => '<span class="fieldrequired">'.$langs->trans("CloseAs").'</span>', 'values' => array($object::STATUS_SIGNED => $object->LibStatut($object::STATUS_SIGNED), $object::STATUS_NOTSIGNED => $object->LibStatut($object::STATUS_NOTSIGNED))),
 			array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"), 'value' => '')				// Field to complete private note (not replace)
 		);
 
@@ -2042,9 +2052,9 @@ if ($action == 'create')
 	// Delivery date
 	$langs->load('deliveries');
 	print '<tr><td>';
-	print $form->editfieldkey($langs->trans('DeliveryDate'), 'date_livraison', $object->date_livraison, $object, $usercancreate, 'datepicker');
+	print $form->editfieldkey($langs->trans('DeliveryDate'), 'date_livraison', $object->delivery_date, $object, $usercancreate, 'datepicker');
 	print '</td><td>';
-	print $form->editfieldval($langs->trans('DeliveryDate'), 'date_livraison', $object->date_livraison, $object, $usercancreate, 'datepicker');
+	print $form->editfieldval($langs->trans('DeliveryDate'), 'date_livraison', $object->delivery_date, $object, $usercancreate, 'datepicker');
 	print '</td>';
 	print '</tr>';
 
@@ -2204,21 +2214,21 @@ if ($action == 'create')
 		print '</tr>';
 	}
 
-    $tmparray = $object->getTotalWeightVolume();
-    $totalWeight = $tmparray['weight'];
-    $totalVolume = $tmparray['volume'];
-    if ($totalWeight) {
-        print '<tr><td>'.$langs->trans("CalculatedWeight").'</td>';
-        print '<td>';
-        print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND) ? $conf->global->MAIN_WEIGHT_DEFAULT_ROUND : -1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? $conf->global->MAIN_WEIGHT_DEFAULT_UNIT : 'no');
-        print '</td></tr>';
-    }
-    if ($totalVolume) {
-        print '<tr><td>'.$langs->trans("CalculatedVolume").'</td>';
-        print '<td>';
-        print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no');
-        print '</td></tr>';
-    }
+	$tmparray = $object->getTotalWeightVolume();
+	$totalWeight = $tmparray['weight'];
+	$totalVolume = $tmparray['volume'];
+	if ($totalWeight) {
+		print '<tr><td>'.$langs->trans("CalculatedWeight").'</td>';
+		print '<td>';
+		print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND) ? $conf->global->MAIN_WEIGHT_DEFAULT_ROUND : -1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? $conf->global->MAIN_WEIGHT_DEFAULT_UNIT : 'no');
+		print '</td></tr>';
+	}
+	if ($totalVolume) {
+		print '<tr><td>'.$langs->trans("CalculatedVolume").'</td>';
+		print '<td>';
+		print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no');
+		print '</td></tr>';
+	}
 
 	// Incoterms
 	if (!empty($conf->incoterm->enabled))
@@ -2350,7 +2360,7 @@ if ($action == 'create')
 	print '<div class="div-table-responsive-no-min">';
 	if (!empty($object->lines) || ($object->statut == Propal::STATUS_DRAFT && $usercancreate && $action != 'selectlines' && $action != 'editline'))
 	{
-	    print '<table id="tablelines" class="noborder noshadow" width="100%">';
+		print '<table id="tablelines" class="noborder noshadow" width="100%">';
 	}
 
 	if (!empty($object->lines))
@@ -2361,25 +2371,27 @@ if ($action == 'create')
 	// Form to add new line
 	if ($object->statut == Propal::STATUS_DRAFT && $usercancreate && $action != 'selectlines')
 	{
-		if ($action != 'editline')
-		{
+		if ($action != 'editline') {
 			// Add products/services form
 			$object->formAddObjectLine(1, $mysoc, $soc);
 
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		} else {
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('formEditObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		}
 	}
 
 	if (!empty($object->lines) || ($object->statut == Propal::STATUS_DRAFT && $usercancreate && $action != 'selectlines' && $action != 'editline'))
 	{
-	    print '</table>';
+		print '</table>';
 	}
 	print '</div>';
 
 	print "</form>\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	/*
@@ -2397,7 +2409,8 @@ if ($action == 'create')
 			if ($action != 'editline')
 			{
 				// Validate
-				if ($object->statut == Propal::STATUS_DRAFT && $object->total_ttc >= 0 && count($object->lines) > 0)
+				if (($object->statut == Propal::STATUS_DRAFT && $object->total_ttc >= 0 && count($object->lines) > 0)
+					|| ($object->statut == Propal::STATUS_DRAFT && !empty($conf->global->PROPAL_ENABLE_NEGATIVE) && count($object->lines) > 0))
 				{
 					if ($usercanvalidate)
 					{
@@ -2529,7 +2542,7 @@ if ($action == 'create')
 		$compatibleImportElementsList = false;
 		if ($user->rights->propal->creer && $object->statut == Propal::STATUS_DRAFT)
 		{
-		    $compatibleImportElementsList = array('commande', 'propal'); // import from linked elements
+			$compatibleImportElementsList = array('commande', 'propal'); // import from linked elements
 		}
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, $compatibleImportElementsList);
 
diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index 0f157396f35..fd2cb3d371c 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
  */
 class Proposals extends DolibarrApi
 {
-    /**
+	/**
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
 	static $FIELDS = array(
@@ -65,60 +65,60 @@ class Proposals extends DolibarrApi
 	 */
 	public function get($id, $contact_list = 1)
 	{
-        return $this->_fetch($id, '', '', $contact_list);
+		return $this->_fetch($id, '', '', $contact_list);
 	}
 
-    /**
-     * Get properties of an proposal object by ref
-     *
-     * Return an array with proposal informations
-     *
-     * @param       string		$ref			Ref of object
-     * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
-     * @return 	array|mixed data without useless information
-     *
-     * @url GET    ref/{ref}
-     *
-     * @throws 	RestException
-     */
-    public function getByRef($ref, $contact_list = 1)
-    {
-        return $this->_fetch('', $ref, '', $contact_list);
-    }
+	/**
+	 * Get properties of an proposal object by ref
+	 *
+	 * Return an array with proposal informations
+	 *
+	 * @param       string		$ref			Ref of object
+	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @url GET    ref/{ref}
+	 *
+	 * @throws 	RestException
+	 */
+	public function getByRef($ref, $contact_list = 1)
+	{
+		return $this->_fetch('', $ref, '', $contact_list);
+	}
 
-    /**
-     * Get properties of an proposal object by ref_ext
-     *
-     * Return an array with proposal informations
-     *
-     * @param       string		$ref_ext			External reference of object
-     * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
-     * @return 	array|mixed data without useless information
-     *
-     * @url GET    ref_ext/{ref_ext}
-     *
-     * @throws 	RestException
-     */
-    public function getByRefExt($ref_ext, $contact_list = 1)
-    {
-        return $this->_fetch('', '', $ref_ext, $contact_list);
-    }
+	/**
+	 * Get properties of an proposal object by ref_ext
+	 *
+	 * Return an array with proposal informations
+	 *
+	 * @param       string		$ref_ext			External reference of object
+	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @url GET    ref_ext/{ref_ext}
+	 *
+	 * @throws 	RestException
+	 */
+	public function getByRefExt($ref_ext, $contact_list = 1)
+	{
+		return $this->_fetch('', '', $ref_ext, $contact_list);
+	}
 
-    /**
-     * Get properties of an proposal object
-     *
-     * Return an array with proposal informations
-     *
-     * @param       int         $id             ID of order
+	/**
+	 * Get properties of an proposal object
+	 *
+	 * Return an array with proposal informations
+	 *
+	 * @param       int         $id             ID of order
 	 * @param		string		$ref			Ref of object
 	 * @param		string		$ref_ext		External reference of object
-     * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
-     * @return 	array|mixed data without useless information
-     *
-     * @throws 	RestException
-     */
-    private function _fetch($id, $ref = '', $ref_ext = '', $contact_list = 1)
-    {
+	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	private function _fetch($id, $ref = '', $ref_ext = '', $contact_list = 1)
+	{
 		if (!DolibarrApiAccess::$user->rights->propal->lire) {
 			throw new RestException(401);
 		}
@@ -151,8 +151,8 @@ class Proposals extends DolibarrApi
 	 * @param string    $sqlfilters         Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.datec:<:'20160101')"
 	 * @return  array                       Array of order objects
 	 */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
-    {
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
+	{
 		global $db, $conf;
 
 		$obj_ret = array();
@@ -201,8 +201,8 @@ class Proposals extends DolibarrApi
 			$sql .= $this->db->plimit($limit + 1, $offset);
 		}
 
-        dol_syslog("API Rest request");
-        $result = $this->db->query($sql);
+		dol_syslog("API Rest request");
+		$result = $this->db->query($sql);
 
 		if ($result)
 		{
@@ -235,13 +235,13 @@ class Proposals extends DolibarrApi
 	 * @param   array   $request_data   Request data
 	 * @return  int     ID of proposal
 	 */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->propal->creer) {
-            throw new RestException(401, "Insuffisant rights");
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->propal->creer) {
+			throw new RestException(401, "Insuffisant rights");
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
 			$this->propal->$field = $value;
@@ -258,7 +258,7 @@ class Proposals extends DolibarrApi
 		}
 
 		return $this->propal->id;
-    }
+	}
 
 	/**
 	 * Get lines of a commercial proposal
@@ -269,26 +269,26 @@ class Proposals extends DolibarrApi
 	 *
 	 * @return int
 	 */
-    public function getLines($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->propal->lire) {
-            throw new RestException(401);
-        }
+	public function getLines($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->propal->lire) {
+			throw new RestException(401);
+		}
 
-	    $result = $this->propal->fetch($id);
-	    if (!$result) {
-		    throw new RestException(404, 'Commercial Proposal not found');
-	    }
+		$result = $this->propal->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Commercial Proposal not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
-		    throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-	    }
-	    $this->propal->getLinesArray();
-	    $result = array();
-	    foreach ($this->propal->lines as $line) {
-		    array_push($result, $this->_cleanObjectDatas($line));
-	    }
-	    return $result;
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$this->propal->getLinesArray();
+		$result = array();
+		foreach ($this->propal->lines as $line) {
+			array_push($result, $this->_cleanObjectDatas($line));
+		}
+		return $result;
 	}
 
 	/**
@@ -309,50 +309,50 @@ class Proposals extends DolibarrApi
 
 		$result = $this->propal->fetch($id);
 		if (!$result) {
-		    throw new RestException(404, 'Commercial Proposal not found');
+			throw new RestException(404, 'Commercial Proposal not found');
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        $request_data = (object) $request_data;
+		$request_data = (object) $request_data;
 
-        $updateRes = $this->propal->addline(
-                        $request_data->desc,
-                        $request_data->subprice,
-                        $request_data->qty,
-                        $request_data->tva_tx,
-                        $request_data->localtax1_tx,
-                        $request_data->localtax2_tx,
-                        $request_data->fk_product,
-                        $request_data->remise_percent,
-                        'HT',
-                        0,
-                        $request_data->info_bits,
-                        $request_data->product_type,
-                        $request_data->rang,
-                        $request_data->special_code,
-      					$request_data->fk_parent_line,
-                        $request_data->fk_fournprice,
-                        $request_data->pa_ht,
-                        $request_data->label,
-                        $request_data->date_start,
-                        $request_data->date_end,
-                        $request_data->array_options,
-                        $request_data->fk_unit,
-                        $request_data->origin,
-                        $request_data->origin_id,
-                        $request_data->multicurrency_subprice,
-                        $request_data->fk_remise_except
-        );
+		$updateRes = $this->propal->addline(
+						$request_data->desc,
+						$request_data->subprice,
+						$request_data->qty,
+						$request_data->tva_tx,
+						$request_data->localtax1_tx,
+						$request_data->localtax2_tx,
+						$request_data->fk_product,
+						$request_data->remise_percent,
+						'HT',
+						0,
+						$request_data->info_bits,
+						$request_data->product_type,
+						$request_data->rang,
+						$request_data->special_code,
+	  					$request_data->fk_parent_line,
+						$request_data->fk_fournprice,
+						$request_data->pa_ht,
+						$request_data->label,
+						$request_data->date_start,
+						$request_data->date_end,
+						$request_data->array_options,
+						$request_data->fk_unit,
+						$request_data->origin,
+						$request_data->origin_id,
+						$request_data->multicurrency_subprice,
+						$request_data->fk_remise_except
+		);
 
-        if ($updateRes > 0) {
-            return $updateRes;
-        } else {
-            throw new RestException(400, $this->propal->error);
-        }
-    }
+		if ($updateRes > 0) {
+			return $updateRes;
+		} else {
+			throw new RestException(400, $this->propal->error);
+		}
+	}
 
 	/**
 	 * Update a line of given commercial proposal
@@ -388,37 +388,37 @@ class Proposals extends DolibarrApi
 	  		throw new RestException(404, 'Proposal line not found');
 	  	}
 
-        $updateRes = $this->propal->updateline(
-            $lineid,
-            isset($request_data->subprice) ? $request_data->subprice : $propalline->subprice,
-            isset($request_data->qty) ? $request_data->qty : $propalline->qty,
-            isset($request_data->remise_percent) ? $request_data->remise_percent : $propalline->remise_percent,
-            isset($request_data->tva_tx) ? $request_data->tva_tx : $propalline->tva_tx,
-            isset($request_data->localtax1_tx) ? $request_data->localtax1_tx : $propalline->localtax1_tx,
-            isset($request_data->localtax2_tx) ? $request_data->localtax2_tx : $propalline->localtax2_tx,
-            isset($request_data->desc) ? $request_data->desc : $propalline->desc,
-            'HT',
-            isset($request_data->info_bits) ? $request_data->info_bits : $propalline->info_bits,
-            isset($request_data->special_code) ? $request_data->special_code : $propalline->special_code,
-            isset($request_data->fk_parent_line) ? $request_data->fk_parent_line : $propalline->fk_parent_line,
-            0,
-            isset($request_data->fk_fournprice) ? $request_data->fk_fournprice : $propalline->fk_fournprice,
-            isset($request_data->pa_ht) ? $request_data->pa_ht : $propalline->pa_ht,
-            isset($request_data->label) ? $request_data->label : $propalline->label,
-            isset($request_data->product_type) ? $request_data->product_type : $propalline->product_type,
-            isset($request_data->date_start) ? $request_data->date_start : $propalline->date_start,
-            isset($request_data->date_end) ? $request_data->date_end : $propalline->date_end,
-            isset($request_data->array_options) ? $request_data->array_options : $propalline->array_options,
-            isset($request_data->fk_unit) ? $request_data->fk_unit : $propalline->fk_unit,
-            isset($request_data->multicurrency_subprice) ? $request_data->multicurrency_subprice : $propalline->subprice
-        );
+		$updateRes = $this->propal->updateline(
+			$lineid,
+			isset($request_data->subprice) ? $request_data->subprice : $propalline->subprice,
+			isset($request_data->qty) ? $request_data->qty : $propalline->qty,
+			isset($request_data->remise_percent) ? $request_data->remise_percent : $propalline->remise_percent,
+			isset($request_data->tva_tx) ? $request_data->tva_tx : $propalline->tva_tx,
+			isset($request_data->localtax1_tx) ? $request_data->localtax1_tx : $propalline->localtax1_tx,
+			isset($request_data->localtax2_tx) ? $request_data->localtax2_tx : $propalline->localtax2_tx,
+			isset($request_data->desc) ? $request_data->desc : $propalline->desc,
+			'HT',
+			isset($request_data->info_bits) ? $request_data->info_bits : $propalline->info_bits,
+			isset($request_data->special_code) ? $request_data->special_code : $propalline->special_code,
+			isset($request_data->fk_parent_line) ? $request_data->fk_parent_line : $propalline->fk_parent_line,
+			0,
+			isset($request_data->fk_fournprice) ? $request_data->fk_fournprice : $propalline->fk_fournprice,
+			isset($request_data->pa_ht) ? $request_data->pa_ht : $propalline->pa_ht,
+			isset($request_data->label) ? $request_data->label : $propalline->label,
+			isset($request_data->product_type) ? $request_data->product_type : $propalline->product_type,
+			isset($request_data->date_start) ? $request_data->date_start : $propalline->date_start,
+			isset($request_data->date_end) ? $request_data->date_end : $propalline->date_end,
+			isset($request_data->array_options) ? $request_data->array_options : $propalline->array_options,
+			isset($request_data->fk_unit) ? $request_data->fk_unit : $propalline->fk_unit,
+			isset($request_data->multicurrency_subprice) ? $request_data->multicurrency_subprice : $propalline->subprice
+		);
 
-	    if ($updateRes > 0) {
-		    $result = $this->get($id);
-		    unset($result->line);
-		    return $this->_cleanObjectDatas($result);
-	    }
-	    return false;
+		if ($updateRes > 0) {
+			$result = $this->get($id);
+			unset($result->line);
+			return $this->_cleanObjectDatas($result);
+		}
+		return false;
 	}
 
 	/**
@@ -432,13 +432,13 @@ class Proposals extends DolibarrApi
 	 *
 	 * @return int
 	 *
-     * @throws RestException 401
-     * @throws RestException 404
+	 * @throws RestException 401
+	 * @throws RestException 404
 	 */
-    public function deleteLine($id, $lineid)
-    {
+	public function deleteLine($id, $lineid)
+	{
 		if (!DolibarrApiAccess::$user->rights->propal->creer) {
-            throw new RestException(401);
+			throw new RestException(401);
 		}
 
 		$result = $this->propal->fetch($id);
@@ -460,7 +460,7 @@ class Proposals extends DolibarrApi
 		}
 	}
 
-    /**
+	/**
 	 * Add a contact type of given commercial proposal
 	 *
 	 * @param int    $id             Id of commercial proposal to update
@@ -471,76 +471,83 @@ class Proposals extends DolibarrApi
 	 *
 	 * @return int
 	 *
-     * @throws RestException 401
-     * @throws RestException 404
+	 * @throws RestException 401
+	 * @throws RestException 404
 	 */
-    public function postContact($id, $contactid, $type)
-    {
-        if (!DolibarrApiAccess::$user->rights->propal->creer) {
-            throw new RestException(401);
-        }
+	public function postContact($id, $contactid, $type)
+	{
+		if (!DolibarrApiAccess::$user->rights->propal->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->propal->fetch($id);
+		$result = $this->propal->fetch($id);
 
 		if (!$result) {
 			throw new RestException(404, 'Proposal not found');
 		}
 
-        if (!in_array($type, array('BILLING', 'SHIPPING', 'CUSTOMER'), true)) {
-            throw new RestException(500, 'Availables types: BILLING, SHIPPING OR CUSTOMER');
-        }
+		if (!in_array($type, array('BILLING', 'SHIPPING', 'CUSTOMER'), true)) {
+			throw new RestException(500, 'Availables types: BILLING, SHIPPING OR CUSTOMER');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        $result = $this->propal->add_contact($contactid, $type, 'external');
+		$result = $this->propal->add_contact($contactid, $type, 'external');
 
-        if (!$result) {
-            throw new RestException(500, 'Error when added the contact');
-        }
+		if (!$result) {
+			throw new RestException(500, 'Error when added the contact');
+		}
 
-        return $this->propal;
-    }
+		return $this->propal;
+	}
 
-     /**
-	 * Delete a contact type of given commercial proposal
-	 *
-	 * @param int    $id             Id of commercial proposal to update
-	 * @param int    $rowid          Row key of the contact in the array contact_ids.
-	 *
-	 * @url	DELETE {id}/contact/{rowid}
-	 *
-	 * @return int
-	 *
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 500
-	 */
-    public function deleteContact($id, $rowid)
-    {
-        if (!DolibarrApiAccess::$user->rights->propal->creer) {
-            throw new RestException(401);
-        }
+	 /**
+	  * Delete a contact type of given commercial proposal
+	  *
+	  * @param int    $id             Id of commercial proposal to update
+	  * @param int    $contactid      Row key of the contact in the array contact_ids.
+	  * @param string $type           Type of the contact (BILLING, SHIPPING, CUSTOMER).
+	  *
+	  * @url	DELETE {id}/contact/{contactid}/{type}
+	  *
+	  * @return int
+	  *
+	  * @throws RestException 401
+	  * @throws RestException 404
+	  * @throws RestException 500
+	  */
+	public function deleteContact($id, $contactid, $type)
+	{
+		if (!DolibarrApiAccess::$user->rights->propal->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->propal->fetch($id);
+		$result = $this->propal->fetch($id);
 
 		if (!$result) {
 			throw new RestException(404, 'Proposal not found');
 		}
 
-        if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        $result = $this->propal->delete_contact($rowid);
+		$contacts = $this->invoice->liste_contact();
 
-        if (!$result) {
-            throw new RestException(500, 'Error when deleted the contact');
-        }
+		foreach ($contacts as $contact) {
+			if ($contact['id'] == $contactid && $contact['code'] == $type) {
+				$result = $this->propal->delete_contact($contact['rowid']);
 
-        return $this->propal;
-    }
+				if (!$result) {
+					throw new RestException(500, 'Error when deleted the contact');
+				}
+			}
+		}
+
+		return $this->_cleanObjectDatas($this->propal);
+	}
 
 	/**
 	 * Update commercial proposal general fields (won't touch lines of commercial proposal)
@@ -549,12 +556,12 @@ class Proposals extends DolibarrApi
 	 * @param array $request_data   Datas
 	 *
 	 * @return int
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->propal->creer) {
-            throw new RestException(401);
-        }
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->propal->creer) {
+			throw new RestException(401);
+		}
 
 		$result = $this->propal->fetch($id);
 		if (!$result) {
@@ -624,14 +631,14 @@ class Proposals extends DolibarrApi
 	}
 
 	/**
-	* Set a proposal to draft
-	*
-	* @param   int     $id             Order ID
-	*
-	* @url POST    {id}/settodraft
-	*
-	* @return  array
-	*/
+	 * Set a proposal to draft
+	 *
+	 * @param   int     $id             Order ID
+	 *
+	 * @url POST    {id}/settodraft
+	 *
+	 * @return  array
+	 */
 	public function settodraft($id)
 	{
 		if (!DolibarrApiAccess::$user->rights->propal->creer) {
@@ -683,14 +690,14 @@ class Proposals extends DolibarrApi
 	 * @url POST    {id}/validate
 	 *
 	 * @throws RestException 304
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 500
-     *
-     * @return array
-     */
-    public function validate($id, $notrigger = 0)
-    {
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 500
+	 *
+	 * @return array
+	 */
+	public function validate($id, $notrigger = 0)
+	{
 		if (!DolibarrApiAccess::$user->rights->propal->creer) {
 			throw new RestException(401);
 		}
@@ -711,19 +718,19 @@ class Proposals extends DolibarrApi
 			throw new RestException(500, 'Error when validating Commercial Proposal: '.$this->propal->error);
 		}
 
-        $result = $this->propal->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Commercial Proposal not found');
-        }
+		$result = $this->propal->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Commercial Proposal not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $this->propal->fetchObjectLinked();
+		$this->propal->fetchObjectLinked();
 
-        return $this->_cleanObjectDatas($this->propal);
-    }
+		return $this->_cleanObjectDatas($this->propal);
+	}
 
 	/**
 	 * Close (Accept or refuse) a quote / commercial proposal
@@ -773,47 +780,47 @@ class Proposals extends DolibarrApi
 		return $this->_cleanObjectDatas($this->propal);
 	}
 
-    /**
-     * Set a commercial proposal billed. Could be also called setbilled
-     *
-     * @param   int     $id             Commercial proposal ID
-     *
-     * @url POST    {id}/setinvoiced
-     *
-     * @return  array
-     */
-    public function setinvoiced($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->propal->creer) {
-            throw new RestException(401);
-        }
-        $result = $this->propal->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Commercial Proposal not found');
-        }
+	/**
+	 * Set a commercial proposal billed. Could be also called setbilled
+	 *
+	 * @param   int     $id             Commercial proposal ID
+	 *
+	 * @url POST    {id}/setinvoiced
+	 *
+	 * @return  array
+	 */
+	public function setinvoiced($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->propal->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->propal->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Commercial Proposal not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $result = $this->propal->classifyBilled(DolibarrApiAccess::$user);
-        if ($result < 0) {
-            throw new RestException(500, 'Error : '.$this->propal->error);
-        }
+		$result = $this->propal->classifyBilled(DolibarrApiAccess::$user);
+		if ($result < 0) {
+			throw new RestException(500, 'Error : '.$this->propal->error);
+		}
 
-        $result = $this->propal->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Proposal not found');
-        }
+		$result = $this->propal->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Proposal not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $this->propal->fetchObjectLinked();
+		$this->propal->fetchObjectLinked();
 
-        return $this->_cleanObjectDatas($this->propal);
-    }
+		return $this->_cleanObjectDatas($this->propal);
+	}
 
 
 	/**
@@ -835,25 +842,25 @@ class Proposals extends DolibarrApi
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->note);
-        unset($object->name);
-        unset($object->lastname);
-        unset($object->firstname);
-        unset($object->civility_id);
-        unset($object->address);
+		unset($object->note);
+		unset($object->name);
+		unset($object->lastname);
+		unset($object->firstname);
+		unset($object->civility_id);
+		unset($object->address);
 
-        return $object;
-    }
+		return $object;
+	}
 }
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 7e34ac6fc3c..274c04b0698 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -13,7 +13,7 @@
  * Copyright (C) 2013      Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2014-2015 Marcos García            <marcosgdf@gmail.com>
  * Copyright (C) 2018      Nicolas ZABOURI			<info@inovea-conseil.com>
- * Copyright (C) 2018-2019 Frédéric France          <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020 Frédéric France          <frederic.france@netlogic.fr>
  * Copyright (C) 2018      Ferran Marcet         	<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -66,7 +66,7 @@ class Propal extends CommonObject
 	public $table_element_line = 'propaldet';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Fieldname with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_propal';
 
@@ -124,9 +124,9 @@ class Propal extends CommonObject
 	 */
 	public $datec;
 
-    /**
-     * @var integer|string $date_creation;
-     */
+	/**
+	 * @var integer|string $date_creation;
+	 */
 	public $date_creation;
 
 	/**
@@ -136,13 +136,13 @@ class Propal extends CommonObject
 	public $datev;
 
 	/**
-     * @var integer|string $date_validation;
-     */
+	 * @var integer|string $date_validation;
+	 */
 	public $date_validation;
 
 	/**
-     * @var integer|string date of the quote;
-     */
+	 * @var integer|string date of the quote;
+	 */
 	public $date;
 
 	/**
@@ -152,9 +152,15 @@ class Propal extends CommonObject
 	public $datep;
 
 	/**
-	 * @var integer|string $date_livraison;
+	 * @var int	Date expected for delivery
+	 * @deprecated
 	 */
-	public $date_livraison;
+	public $date_livraison; // deprecated; Use delivery_date instead.
+
+	/**
+	 * @var integer|string 	$delivery_date;
+	 */
+	public $delivery_date; // Date expected of shipment (date starting shipment, not the reception that occurs some days after)
 
 
 	public $fin_validite;
@@ -186,19 +192,22 @@ class Propal extends CommonObject
 	public $remise_absolue = 0;
 
 	/**
-     * @var int ID
-     * @deprecated
-     */
+	 * @var int ID
+	 * @deprecated
+	 */
 	public $fk_address;
 
 	public $address_type;
 	public $address;
+
 	public $availability_id;
 	public $availability_code;
+
+	public $duree_validite;
+
 	public $demand_reason_id;
 	public $demand_reason_code;
 
-	public $products = array();
 	public $extraparams = array();
 
 	/**
@@ -210,12 +219,10 @@ class Propal extends CommonObject
 	public $labelStatus = array();
 	public $labelStatusShort = array();
 
-	public $specimen;
-
 	// Multicurrency
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_multicurrency;
 
 	public $multicurrency_code;
@@ -338,7 +345,7 @@ class Propal extends CommonObject
 	 *	@param      int		$socid		Id third party
 	 *	@param      int		$propalid   Id proposal
 	 */
-    public function __construct($db, $socid = 0, $propalid = 0)
+	public function __construct($db, $socid = 0, $propalid = 0)
 	{
 		global $conf, $langs;
 
@@ -347,15 +354,13 @@ class Propal extends CommonObject
 		$this->socid = $socid;
 		$this->id = $propalid;
 
-		$this->products = array();
-
-		$this->duree_validite = $conf->global->PROPALE_VALIDITY_DURATION;
+		$this->duree_validite = ((int) $conf->global->PROPALE_VALIDITY_DURATION);
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Add line into array products
+	 *  Add line into array ->lines
 	 *  $this->thirdparty should be loaded
 	 *
 	 * 	@param  int		$idproduct       	Product Id to add
@@ -364,11 +369,10 @@ class Propal extends CommonObject
 	 *  @return	int							<0 if KO, >0 if OK
 	 *
 	 *	TODO	Replace calls to this function by generation objet Ligne
-	 *			inserted into table $this->products
 	 */
-    public function add_product($idproduct, $qty, $remise_percent = 0)
+	public function add_product($idproduct, $qty, $remise_percent = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $mysoc;
 
 		if (!$qty) $qty = 1;
@@ -413,16 +417,16 @@ class Propal extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Adding line of fixed discount in the proposal in DB
 	 *
 	 *	@param     int		$idremise			Id of fixed discount
 	 *  @return    int          				>0 if OK, <0 if KO
 	 */
-    public function insert_discount($idremise)
+	public function insert_discount($idremise)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
@@ -489,43 +493,43 @@ class Propal extends CommonObject
 		}
 	}
 
-    /**
-     *    	Add a proposal line into database (linked to product/service or not)
-     *      The parameters are already supposed to be appropriate and with final values to the call
-     *      of this method. Also, for the VAT rate, it must have already been defined
-     *      by whose calling the method get_default_tva (societe_vendeuse, societe_acheteuse, '' product)
-     *      and desc must already have the right value (it's up to the caller to manage multilanguage)
-     *
-     * 		@param    	string		$desc				Description of line
-     * 		@param    	float		$pu_ht				Unit price
-     * 		@param    	float		$qty             	Quantity
-     * 		@param    	float		$txtva           	Force Vat rate, -1 for auto (Can contain the vat_src_code too with syntax '9.9 (CODE)')
-     * 		@param		float		$txlocaltax1		Local tax 1 rate (deprecated, use instead txtva with code inside)
-     *  	@param		float		$txlocaltax2		Local tax 2 rate (deprecated, use instead txtva with code inside)
-     *		@param    	int			$fk_product      	Product/Service ID predefined
-     * 		@param    	float		$remise_percent  	Pourcentage de remise de la ligne
-     * 		@param    	string		$price_base_type	HT or TTC
-     * 		@param    	float		$pu_ttc             Prix unitaire TTC
-     * 		@param    	int			$info_bits			Bits for type of lines
-     *      @param      int			$type               Type of line (0=product, 1=service). Not used if fk_product is defined, the type of product is used.
-     *      @param      int			$rang               Position of line
-     *      @param		int			$special_code		Special code (also used by externals modules!)
-     *      @param		int			$fk_parent_line		Id of parent line
-     *      @param		int			$fk_fournprice		Id supplier price
-     *      @param		int			$pa_ht				Buying price without tax
-     *      @param		string		$label				???
-     *		@param      int			$date_start       	Start date of the line
-     *		@param      int			$date_end         	End date of the line
-     *      @param		array		$array_options		extrafields array
-     * 		@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
-     *      @param		string		$origin				Depend on global conf MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION can be 'orderdet', 'propaldet'..., else 'order','propal,'....
-     *      @param		int			$origin_id			Depend on global conf MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION can be Id of origin object (aka line id), else object id
-     * 		@param		double		$pu_ht_devise		Unit price in currency
-     * 		@param		int    		$fk_remise_except	Id discount if line is from a discount
-     *    	@return    	int         	    			>0 if OK, <0 if KO
-     *    	@see       	add_product()
-     */
-    public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $fk_product = 0, $remise_percent = 0.0, $price_base_type = 'HT', $pu_ttc = 0.0, $info_bits = 0, $type = 0, $rang = -1, $special_code = 0, $fk_parent_line = 0, $fk_fournprice = 0, $pa_ht = 0, $label = '', $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $origin = '', $origin_id = 0, $pu_ht_devise = 0, $fk_remise_except = 0)
+	/**
+	 *    	Add a proposal line into database (linked to product/service or not)
+	 *      The parameters are already supposed to be appropriate and with final values to the call
+	 *      of this method. Also, for the VAT rate, it must have already been defined
+	 *      by whose calling the method get_default_tva (societe_vendeuse, societe_acheteuse, '' product)
+	 *      and desc must already have the right value (it's up to the caller to manage multilanguage)
+	 *
+	 * 		@param    	string		$desc				Description of line
+	 * 		@param    	float		$pu_ht				Unit price
+	 * 		@param    	float		$qty             	Quantity
+	 * 		@param    	float		$txtva           	Force Vat rate, -1 for auto (Can contain the vat_src_code too with syntax '9.9 (CODE)')
+	 * 		@param		float		$txlocaltax1		Local tax 1 rate (deprecated, use instead txtva with code inside)
+	 *  	@param		float		$txlocaltax2		Local tax 2 rate (deprecated, use instead txtva with code inside)
+	 *		@param    	int			$fk_product      	Product/Service ID predefined
+	 * 		@param    	float		$remise_percent  	Pourcentage de remise de la ligne
+	 * 		@param    	string		$price_base_type	HT or TTC
+	 * 		@param    	float		$pu_ttc             Prix unitaire TTC
+	 * 		@param    	int			$info_bits			Bits for type of lines
+	 *      @param      int			$type               Type of line (0=product, 1=service). Not used if fk_product is defined, the type of product is used.
+	 *      @param      int			$rang               Position of line
+	 *      @param		int			$special_code		Special code (also used by externals modules!)
+	 *      @param		int			$fk_parent_line		Id of parent line
+	 *      @param		int			$fk_fournprice		Id supplier price
+	 *      @param		int			$pa_ht				Buying price without tax
+	 *      @param		string		$label				???
+	 *		@param      int			$date_start       	Start date of the line
+	 *		@param      int			$date_end         	End date of the line
+	 *      @param		array		$array_options		extrafields array
+	 * 		@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
+	 *      @param		string		$origin				Depend on global conf MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION can be 'orderdet', 'propaldet'..., else 'order','propal,'....
+	 *      @param		int			$origin_id			Depend on global conf MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION can be Id of origin object (aka line id), else object id
+	 * 		@param		double		$pu_ht_devise		Unit price in currency
+	 * 		@param		int    		$fk_remise_except	Id discount if line is from a discount
+	 *    	@return    	int         	    			>0 if OK, <0 if KO
+	 *    	@see       	add_product()
+	 */
+	public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $fk_product = 0, $remise_percent = 0.0, $price_base_type = 'HT', $pu_ttc = 0.0, $info_bits = 0, $type = 0, $rang = -1, $special_code = 0, $fk_parent_line = 0, $fk_fournprice = 0, $pa_ht = 0, $label = '', $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $origin = '', $origin_id = 0, $pu_ht_devise = 0, $fk_remise_except = 0)
 	{
 		global $mysoc, $conf, $langs;
 
@@ -650,8 +654,8 @@ class Propal extends CommonObject
 			$this->line->tva_tx = $txtva;
 			$this->line->localtax1_tx = ($total_localtax1 ? $localtaxes_type[1] : 0);
 			$this->line->localtax2_tx = ($total_localtax2 ? $localtaxes_type[3] : 0);
-			$this->line->localtax1_type = $localtaxes_type[0];
-			$this->line->localtax2_type = $localtaxes_type[2];
+			$this->line->localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
+			$this->line->localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
 			$this->line->fk_product = $fk_product;
 			$this->line->product_type = $type;
 			$this->line->fk_remise_except = $fk_remise_except;
@@ -702,27 +706,27 @@ class Propal extends CommonObject
 				// Reorder if child line
 				if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
 
-                // Mise a jour informations denormalisees au niveau de la propale meme
-                $result = $this->update_price(1, 'auto', 0, $mysoc); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
-                if ($result > 0)
-                {
-                    $this->db->commit();
-                    return $this->line->id;
-                } else {
-                    $this->error = $this->db->error();
-                    $this->db->rollback();
-                    return -1;
-                }
-            } else {
-                $this->error = $this->line->error;
-                $this->db->rollback();
-                return -2;
-            }
-        } else {
+				// Mise a jour informations denormalisees au niveau de la propale meme
+				$result = $this->update_price(1, 'auto', 0, $mysoc); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
+				if ($result > 0)
+				{
+					$this->db->commit();
+					return $this->line->id;
+				} else {
+					$this->error = $this->db->error();
+					$this->db->rollback();
+					return -1;
+				}
+			} else {
+				$this->error = $this->line->error;
+				$this->db->rollback();
+				return -2;
+			}
+		} else {
 			dol_syslog(get_class($this)."::addline status of proposal must be Draft to allow use of ->addline()", LOG_ERR);
 			return -3;
 		}
-    }
+	}
 
 
 	/**
@@ -753,11 +757,11 @@ class Propal extends CommonObject
 	 * 	@param		int			$notrigger			disable line update trigger
 	 *  @return     int     		        		0 if OK, <0 if KO
 	 */
-    public function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $desc = '', $price_base_type = 'HT', $info_bits = 0, $special_code = 0, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = 0, $pa_ht = 0, $label = '', $type = 0, $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0)
+	public function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $desc = '', $price_base_type = 'HT', $info_bits = 0, $special_code = 0, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = 0, $pa_ht = 0, $label = '', $type = 0, $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0)
 	{
 		global $mysoc, $langs;
 
-        dol_syslog(get_class($this)."::updateLine rowid=$rowid, pu=$pu, qty=$qty, remise_percent=$remise_percent,
+		dol_syslog(get_class($this)."::updateLine rowid=$rowid, pu=$pu, qty=$qty, remise_percent=$remise_percent,
         txtva=$txtva, desc=$desc, price_base_type=$price_base_type, info_bits=$info_bits, special_code=$special_code, fk_parent_line=$fk_parent_line, pa_ht=$pa_ht, type=$type, date_start=$date_start, date_end=$date_end");
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
@@ -774,11 +778,11 @@ class Propal extends CommonObject
 		if (!empty($qty) && $special_code == 3) $special_code = 0; // Remove option tag
 		if (empty($type)) $type = 0;
 
-        if ($date_start && $date_end && $date_start > $date_end) {
-            $langs->load("errors");
-            $this->error = $langs->trans('ErrorStartDateGreaterEnd');
-            return -1;
-        }
+		if ($date_start && $date_end && $date_start > $date_end) {
+			$langs->load("errors");
+			$this->error = $langs->trans('ErrorStartDateGreaterEnd');
+			return -1;
+		}
 
 		if ($this->statut == self::STATUS_DRAFT)
 		{
@@ -922,7 +926,7 @@ class Propal extends CommonObject
 	 *  @param		int		$lineid			Id of line to delete
 	 *  @return     int         			>0 if OK, <0 if KO
 	 */
-    public function deleteline($lineid)
+	public function deleteline($lineid)
 	{
 		global $user;
 
@@ -960,7 +964,7 @@ class Propal extends CommonObject
 	 * 	@param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *  @return     int     			<0 if KO, >=0 if OK
 	 */
-    public function create($user, $notrigger = 0)
+	public function create($user, $notrigger = 0)
 	{
 		global $conf, $hookmanager;
 		$error = 0;
@@ -983,6 +987,9 @@ class Propal extends CommonObject
 			$this->multicurrency_tx = 1;
 		}
 
+		// Set tmp vars
+		$delivery_date = empty($this->delivery_date) ? $this->date_livraison : $this->delivery_date;
+
 		dol_syslog(get_class($this)."::create");
 
 		// Check parameters
@@ -1070,7 +1077,7 @@ class Propal extends CommonObject
 		$sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'NULL');
 		$sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
 		$sql .= ", '".$this->db->escape($this->ref_client)."'";
-		$sql .= ", ".($this->date_livraison != '' ? "'".$this->db->idate($this->date_livraison)."'" : "NULL");
+		$sql .= ", ".(empty($delivery_date) ? "NULL" : "'".$this->db->idate($delivery_date)."'");
 		$sql .= ", ".($this->shipping_method_id > 0 ? $this->shipping_method_id : 'NULL');
 		$sql .= ", ".$this->availability_id;
 		$sql .= ", ".$this->demand_reason_id;
@@ -1092,68 +1099,68 @@ class Propal extends CommonObject
 			if ($this->id)
 			{
 				$this->ref = '(PROV'.$this->id.')';
-				$sql = 'UPDATE '.MAIN_DB_PREFIX."propal SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
+				$sql = 'UPDATE '.MAIN_DB_PREFIX."propal SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".((int) $this->id);
 
 				dol_syslog(get_class($this)."::create", LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if (!$resql) $error++;
 
-                if (!empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
-                {
-                	$this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
-                }
+				if (!empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
+				{
+					$this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
+				}
 
-                // Add object linked
-                if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects))
-                {
-                	foreach ($this->linked_objects as $origin => $tmp_origin_id)
-                	{
-                		if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
-                		{
-                			foreach ($tmp_origin_id as $origin_id)
-                			{
-                				$ret = $this->add_object_linked($origin, $origin_id);
-                				if (!$ret)
-                				{
-                					$this->error = $this->db->lasterror();
-                					$error++;
-                				}
-                			}
-                		} else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
-                		{
-                			$origin_id = $tmp_origin_id;
-                			$ret = $this->add_object_linked($origin, $origin_id);
-                			if (!$ret)
-                			{
-                				$this->error = $this->db->lasterror();
-                				$error++;
-                			}
-                		}
-                	}
-                }
+				// Add object linked
+				if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects))
+				{
+					foreach ($this->linked_objects as $origin => $tmp_origin_id)
+					{
+						if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+						{
+							foreach ($tmp_origin_id as $origin_id)
+							{
+								$ret = $this->add_object_linked($origin, $origin_id);
+								if (!$ret)
+								{
+									$this->error = $this->db->lasterror();
+									$error++;
+								}
+							}
+						} else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+						{
+							$origin_id = $tmp_origin_id;
+							$ret = $this->add_object_linked($origin, $origin_id);
+							if (!$ret)
+							{
+								$this->error = $this->db->lasterror();
+								$error++;
+							}
+						}
+					}
+				}
 
-                /*
+				/*
                  *  Insertion du detail des produits dans la base
                  *  Insert products detail in database
                  */
-                if (!$error)
-                {
-                    $fk_parent_line = 0;
-                    $num = count($this->lines);
+				if (!$error)
+				{
+					$fk_parent_line = 0;
+					$num = count($this->lines);
 
 					for ($i = 0; $i < $num; $i++)
 					{
-                        if (!is_object($this->lines[$i]))	// If this->lines is not array of objects, coming from REST API
-                        {   // Convert into object this->lines[$i].
-                            $line = (object) $this->lines[$i];
-                        } else {
-                            $line = $this->lines[$i];
-                        }
+						if (!is_object($this->lines[$i]))	// If this->lines is not array of objects, coming from REST API
+						{   // Convert into object this->lines[$i].
+							$line = (object) $this->lines[$i];
+						} else {
+							$line = $this->lines[$i];
+						}
 						// Reset fk_parent_line for line that are not child lines or special product
 						if (($line->product_type != 9 && empty($line->fk_parent_line)) || $line->product_type == 9) {
 							$fk_parent_line = 0;
 						}
-                        // Complete vat rate with code
+						// Complete vat rate with code
 						$vatrate = $line->tva_tx;
 						if ($line->vat_src_code && !preg_match('/\(.*\)/', $vatrate)) $vatrate .= ' ('.$line->vat_src_code.')';
 
@@ -1268,24 +1275,6 @@ class Propal extends CommonObject
 		}
 	}
 
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *	Insert into DB a proposal object completely defined by its data members (ex, results from copy).
-	 *
-	 *	@param 		User	$user	User that create
-	 *	@return    	int				Id of the new object if ok, <0 if ko
-	 *	@see       	create()
-	 */
-    public function create_from($user)
-	{
-        // phpcs:enable
-		// i love this function because $this->products is not used in create function...
-		$this->products = $this->lines;
-
-		return $this->create($user);
-	}
-
 	/**
 	 *		Load an object from its id and create a new one in database
 	 *
@@ -1311,7 +1300,6 @@ class Propal extends CommonObject
 
 		// Load source object
 		$object->fetch($this->id);
-		$object->fetch_lines();
 
 		$objsoc = new Societe($this->db);
 
@@ -1320,10 +1308,10 @@ class Propal extends CommonObject
 		{
 			if ($objsoc->fetch($socid) > 0)
 			{
-			    $object->socid = $objsoc->id;
-			    $object->cond_reglement_id	= (!empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
-			    $object->mode_reglement_id	= (!empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
-			    $object->fk_delivery_address = '';
+				$object->socid = $objsoc->id;
+				$object->cond_reglement_id	= (!empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
+				$object->mode_reglement_id	= (!empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
+				$object->fk_delivery_address = '';
 
 				/*if (!empty($conf->projet->enabled))
                 {
@@ -1335,7 +1323,7 @@ class Propal extends CommonObject
     					$clonedObj->fk_project = '';
     				}
                 }*/
-			    $object->fk_project = ''; // A cloned proposal is set by default to no project.
+				$object->fk_project = ''; // A cloned proposal is set by default to no project.
 			}
 
 			// reset ref_client
@@ -1343,12 +1331,12 @@ class Propal extends CommonObject
 
 			// TODO Change product price if multi-prices
 		} else {
-		    $objsoc->fetch($object->socid);
+			$objsoc->fetch($object->socid);
 		}
 
 		$object->id = 0;
 		$object->ref = '';
-		$object->entity = (! empty($forceentity) ? $forceentity : $object->entity);
+		$object->entity = (!empty($forceentity) ? $forceentity : $object->entity);
 		$object->statut = self::STATUS_DRAFT;
 
 		// Clear fields
@@ -1368,18 +1356,18 @@ class Propal extends CommonObject
 		$result = $object->create($user);
 		if ($result < 0)
 		{
-		    $this->error = $object->error;
-		    $this->errors = array_merge($this->errors, $object->errors);
-		    $error++;
+			$this->error = $object->error;
+			$this->errors = array_merge($this->errors, $object->errors);
+			$error++;
 		}
 
 		if (!$error)
 		{
 			// copy internal contacts
-		    if ($object->copy_linked_contact($this, 'internal') < 0)
-		    {
+			if ($object->copy_linked_contact($this, 'internal') < 0)
+			{
 				$error++;
-		    }
+			}
 		}
 
 		if (!$error)
@@ -1387,7 +1375,7 @@ class Propal extends CommonObject
 			// copy external contacts if same company
 			if ($this->socid == $object->socid)
 			{
-			    if ($object->copy_linked_contact($this, 'external') < 0)
+				if ($object->copy_linked_contact($this, 'external') < 0)
 					$error++;
 			}
 		}
@@ -1425,7 +1413,7 @@ class Propal extends CommonObject
 	 *	@param		string		$ref_ext	Ref ext of proposal
 	 *	@return     int         			>0 if OK, <0 if KO
 	 */
-    public function fetch($rowid, $ref = '', $ref_ext = '')
+	public function fetch($rowid, $ref = '', $ref_ext = '')
 	{
 		$sql = "SELECT p.rowid, p.ref, p.entity, p.remise, p.remise_percent, p.remise_absolue, p.fk_soc";
 		$sql .= ", p.total, p.tva, p.localtax1, p.localtax2, p.total_ht";
@@ -1433,7 +1421,7 @@ class Propal extends CommonObject
 		$sql .= ", p.date_valid as datev";
 		$sql .= ", p.datep as dp";
 		$sql .= ", p.fin_validite as dfv";
-		$sql .= ", p.date_livraison as date_livraison";
+		$sql .= ", p.date_livraison as delivery_date";
 		$sql .= ", p.model_pdf, p.last_main_doc, p.ref_client, p.extraparams";
 		$sql .= ", p.note_private, p.note_public";
 		$sql .= ", p.fk_projet as fk_project, p.fk_statut";
@@ -1497,14 +1485,14 @@ class Propal extends CommonObject
 				$this->project = null; // Clear if another value was already set by fetch_projet
 
 				$this->model_pdf            = $obj->model_pdf;
-				$this->modelpdf             = $obj->model_pdf;	// deprecated
+				$this->modelpdf             = $obj->model_pdf; // deprecated
 				$this->last_main_doc = $obj->last_main_doc;
 				$this->note                 = $obj->note_private; // TODO deprecated
 				$this->note_private         = $obj->note_private;
 				$this->note_public          = $obj->note_public;
 
 				$this->status               = (int) $obj->fk_statut;
-				$this->statut               = $this->status;		// deprecated
+				$this->statut               = $this->status; // deprecated
 				$this->statut_libelle       = $obj->statut_label;
 
 				$this->datec                = $this->db->jdate($obj->datec); // TODO deprecated
@@ -1515,7 +1503,8 @@ class Propal extends CommonObject
 				$this->date                 = $this->db->jdate($obj->dp); // Proposal date
 				$this->datep                = $this->db->jdate($obj->dp); // deprecated
 				$this->fin_validite         = $this->db->jdate($obj->dfv);
-				$this->date_livraison       = $this->db->jdate($obj->date_livraison);
+				$this->date_livraison       = $this->db->jdate($obj->delivery_date); // deprecated
+				$this->delivery_date        = $this->db->jdate($obj->delivery_date);
 				$this->shipping_method_id   = ($obj->fk_shipping_method > 0) ? $obj->fk_shipping_method : null;
 				$this->availability_id      = $obj->fk_availability;
 				$this->availability_code    = $obj->availability_code;
@@ -1558,7 +1547,7 @@ class Propal extends CommonObject
 					$this->brouillon = 1;
 				}
 
-				// Retreive all extrafield
+				// Retrieve all extrafield
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
 
@@ -1591,7 +1580,7 @@ class Propal extends CommonObject
 	 *      @param      int		$notrigger	    0=launch triggers after, 1=disable triggers
 	 *      @return     int      			   	<0 if KO, >0 if OK
 	 */
-    public function update(User $user, $notrigger = 0)
+	public function update(User $user, $notrigger = 0)
 	{
 		global $conf;
 
@@ -1604,14 +1593,13 @@ class Propal extends CommonObject
 		if (isset($this->note_public)) $this->note_public = trim($this->note_public);
 		if (isset($this->model_pdf)) $this->model_pdf = trim($this->model_pdf);
 		if (isset($this->import_key)) $this->import_key = trim($this->import_key);
-		if (!empty($this->duree_validite)) $this->fin_validite = $this->date + ($this->duree_validite * 24 * 3600);
+		if (!empty($this->duree_validite) && is_numeric($this->duree_validite)) $this->fin_validite = $this->date + ($this->duree_validite * 24 * 3600);
 
 		// Check parameters
 		// Put here code to add control on parameters values
 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."propal SET";
-
 		$sql .= " ref=".(isset($this->ref) ? "'".$this->db->escape($this->ref)."'" : "null").",";
 		$sql .= " ref_client=".(isset($this->ref_client) ? "'".$this->db->escape($this->ref_client)."'" : "null").",";
 		$sql .= " ref_ext=".(isset($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null").",";
@@ -1630,11 +1618,11 @@ class Propal extends CommonObject
 		$sql .= " fk_projet=".(isset($this->fk_project) ? $this->fk_project : "null").",";
 		$sql .= " fk_cond_reglement=".(isset($this->cond_reglement_id) ? $this->cond_reglement_id : "null").",";
 		$sql .= " fk_mode_reglement=".(isset($this->mode_reglement_id) ? $this->mode_reglement_id : "null").",";
+		$sql .= " fk_input_reason=".(isset($this->demand_reason_id) ? $this->demand_reason_id : "null").",";
 		$sql .= " note_private=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
 		$sql .= " note_public=".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null").",";
 		$sql .= " model_pdf=".(isset($this->modelpdf) ? "'".$this->db->escape($this->modelpdf)."'" : "null").",";
 		$sql .= " import_key=".(isset($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null")."";
-
 		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
@@ -1679,7 +1667,7 @@ class Propal extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Load array lines
 	 *
@@ -1691,13 +1679,13 @@ class Propal extends CommonObject
 	public function fetch_lines($only_product = 0, $loadalsotranslation = 0)
 	{
 		global $langs, $conf;
-        // phpcs:enable
+		// phpcs:enable
 		$this->lines = array();
 
 		$sql = 'SELECT d.rowid, d.fk_propal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,';
 		$sql .= ' d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,';
 		$sql .= ' d.fk_unit,';
-		$sql .= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label, p.tobatch as product_batch,';
+		$sql .= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label, p.tobatch as product_tobatch, p.barcode as product_barcode,';
 		$sql .= ' p.weight, p.weight_units, p.volume, p.volume_units,';
 		$sql .= ' d.date_start, d.date_end,';
 		$sql .= ' d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc';
@@ -1759,11 +1747,14 @@ class Propal extends CommonObject
 				$line->fk_product       = $objp->fk_product;
 
 				$line->ref = $objp->product_ref; // deprecated
-				$line->product_ref = $objp->product_ref;
 				$line->libelle = $objp->product_label; // deprecated
+
+				$line->product_ref = $objp->product_ref;
 				$line->product_label = $objp->product_label;
 				$line->product_desc     = $objp->product_desc; // Description produit
 				$line->product_tobatch  = $objp->product_tobatch;
+				$line->product_barcode  = $objp->product_barcode;
+
 				$line->fk_product_type  = $objp->fk_product_type; // deprecated
 				$line->fk_unit          = $objp->fk_unit;
 				$line->weight = $objp->weight;
@@ -1785,11 +1776,11 @@ class Propal extends CommonObject
 				$line->fetch_optionals();
 
 				// multilangs
-        		if (!empty($conf->global->MAIN_MULTILANGS) && !empty($objp->fk_product) && !empty($loadalsotranslation)) {
-                    $line = new Product($this->db);
-                    $line->fetch($objp->fk_product);
-                    $line->getMultiLangs();
-        		}
+				if (!empty($conf->global->MAIN_MULTILANGS) && !empty($objp->fk_product) && !empty($loadalsotranslation)) {
+					$line = new Product($this->db);
+					$line->fetch($objp->fk_product);
+					$line->getMultiLangs();
+				}
 
 				$this->lines[$i] = $line;
 				//dol_syslog("1 ".$line->fk_product);
@@ -1813,7 +1804,7 @@ class Propal extends CommonObject
 	 *  @param	int		$notrigger	1=Does not execute triggers, 0=execute triggers
 	 *  @return int         		<0 if KO, 0=Nothing done, >=0 if OK
 	 */
-    public function valid($user, $notrigger = 0)
+	public function valid($user, $notrigger = 0)
 	{
 		global $conf;
 
@@ -1928,7 +1919,7 @@ class Propal extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Define proposal date
 	 *
@@ -1937,9 +1928,9 @@ class Propal extends CommonObject
 	 *  @param  int			$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *  @return	int         			<0 if KO, >0 if OK
 	 */
-    public function set_date($user, $date, $notrigger = 0)
+	public function set_date($user, $date, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if (empty($date))
 		{
 			$this->error = 'ErrorBadParameter';
@@ -1995,7 +1986,7 @@ class Propal extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define end validity date
 	 *
@@ -2004,9 +1995,9 @@ class Propal extends CommonObject
 	 *  @param  	int		$notrigger			1=Does not execute triggers, 0= execute triggers
 	 *	@return     int         				<0 if KO, >0 if OK
 	 */
-    public function set_echeance($user, $date_fin_validite, $notrigger = 0)
+	public function set_echeance($user, $date_fin_validite, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if (!empty($user->rights->propal->creer))
 		{
 			$error = 0;
@@ -2055,18 +2046,32 @@ class Propal extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Set delivery date
 	 *
 	 *	@param      User 	$user        		Object user that modify
-	 *	@param      int		$date_livraison     Delivery date
+	 *	@param      int		$delivery_date		Delivery date
+	 *  @param  	int		$notrigger			1=Does not execute triggers, 0= execute triggers
+	 *	@return     int         				<0 if ko, >0 if ok
+	 *	@deprecated Use  setDeliveryDate
+	 */
+	public function set_date_livraison($user, $delivery_date, $notrigger = 0)
+	{
+		// phpcs:enable
+		return $this->setDeliveryDate($user, $delivery_date, $notrigger);
+	}
+
+	/**
+	 *	Set delivery date
+	 *
+	 *	@param      User 	$user        		Object user that modify
+	 *	@param      int		$delivery_date     Delivery date
 	 *  @param  	int		$notrigger			1=Does not execute triggers, 0= execute triggers
 	 *	@return     int         				<0 if ko, >0 if ok
 	 */
-    public function set_date_livraison($user, $date_livraison, $notrigger = 0)
+	public function setDeliveryDate($user, $delivery_date, $notrigger = 0)
 	{
-        // phpcs:enable
 		if (!empty($user->rights->propal->creer))
 		{
 			$error = 0;
@@ -2074,7 +2079,7 @@ class Propal extends CommonObject
 			$this->db->begin();
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."propal ";
-			$sql .= " SET date_livraison = ".($date_livraison != '' ? "'".$this->db->idate($date_livraison)."'" : 'null');
+			$sql .= " SET date_livraison = ".($delivery_date != '' ? "'".$this->db->idate($delivery_date)."'" : 'null');
 			$sql .= " WHERE rowid = ".$this->id;
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
@@ -2088,7 +2093,8 @@ class Propal extends CommonObject
 			if (!$error)
 			{
 				$this->oldcopy = clone $this;
-				$this->date_livraison = $date_livraison;
+				$this->date_livraison = $delivery_date;
+				$this->delivery_date = $delivery_date;
 			}
 
 			if (!$notrigger && empty($error))
@@ -2115,7 +2121,7 @@ class Propal extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Set delivery
 	 *
@@ -2124,9 +2130,9 @@ class Propal extends CommonObject
 	 *  @param  	int		$notrigger		1=Does not execute triggers, 0= execute triggers
 	 *  @return     int           			<0 if KO, >0 if OK
 	 */
-    public function set_availability($user, $id, $notrigger = 0)
+	public function set_availability($user, $id, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if (!empty($user->rights->propal->creer) && $this->statut >= self::STATUS_DRAFT)
 		{
 			$error = 0;
@@ -2182,7 +2188,7 @@ class Propal extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Set source of demand
 	 *
@@ -2191,9 +2197,9 @@ class Propal extends CommonObject
 	 *  @param  	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *  @return     int           		<0 if KO, >0 if OK
 	 */
-    public function set_demand_reason($user, $id, $notrigger = 0)
+	public function set_demand_reason($user, $id, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if (!empty($user->rights->propal->creer) && $this->statut >= self::STATUS_DRAFT)
 		{
 			$error = 0;
@@ -2251,7 +2257,7 @@ class Propal extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set customer reference number
 	 *
@@ -2260,9 +2266,9 @@ class Propal extends CommonObject
 	 *  @param  	int		$notrigger		1=Does not execute triggers, 0= execute triggers
 	 *  @return     int						<0 if ko, >0 if ok
 	 */
-    public function set_ref_client($user, $ref_client, $notrigger = 0)
+	public function set_ref_client($user, $ref_client, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if (!empty($user->rights->propal->creer))
 		{
 			$error = 0;
@@ -2312,7 +2318,7 @@ class Propal extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Set an overall discount on the proposal
 	 *
@@ -2321,9 +2327,9 @@ class Propal extends CommonObject
 	 *  @param  	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return     int         		<0 if ko, >0 if ok
 	 */
-    public function set_remise_percent($user, $remise, $notrigger = 0)
+	public function set_remise_percent($user, $remise, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$remise = trim($remise) ?trim($remise) : 0;
 
 		if (!empty($user->rights->propal->creer))
@@ -2377,7 +2383,7 @@ class Propal extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Set an absolute overall discount on the proposal
 	 *
@@ -2386,9 +2392,9 @@ class Propal extends CommonObject
 	 *  @param  	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return     int         		<0 if ko, >0 if ok
 	 */
-    public function set_remise_absolue($user, $remise, $notrigger = 0)
+	public function set_remise_absolue($user, $remise, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$remise = trim($remise) ?trim($remise) : 0;
 
 		if (!empty($user->rights->propal->creer))
@@ -2453,7 +2459,7 @@ class Propal extends CommonObject
 	 *  @param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return     int         		<0 if KO, >0 if OK
 	 */
-    public function reopen($user, $statut, $note = '', $notrigger = 0)
+	public function reopen($user, $statut, $note = '', $notrigger = 0)
 	{
 
 		$this->statut = $statut;
@@ -2512,7 +2518,7 @@ class Propal extends CommonObject
 	 *  @param		int		$notrigger	1=Does not execute triggers, 0=Execute triggers
 	 *	@return     int         		<0 if KO, >0 if OK
 	 */
-    public function cloture($user, $status, $note = "", $notrigger = 0)
+	public function cloture($user, $status, $note = "", $notrigger = 0)
 	{
 		global $langs, $conf;
 
@@ -2611,7 +2617,7 @@ class Propal extends CommonObject
 	 *  @param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return     int     			<0 si ko, >0 si ok
 	 */
-    public function classifyBilled(User $user, $notrigger = 0)
+	public function classifyBilled(User $user, $notrigger = 0)
 	{
 		$error = 0;
 
@@ -2657,7 +2663,7 @@ class Propal extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Set draft status
 	 *
@@ -2665,15 +2671,15 @@ class Propal extends CommonObject
 	 *  @param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return		int					<0 if KO, >0 if OK
 	 */
-    public function setDraft($user, $notrigger = 0)
+	public function setDraft($user, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$error = 0;
 
 		// Protection
 		if ($this->statut <= self::STATUS_DRAFT)
 		{
-		    return 0;
+			return 0;
 		}
 
 		dol_syslog(get_class($this)."::setDraft", LOG_DEBUG);
@@ -2706,10 +2712,10 @@ class Propal extends CommonObject
 
 		if (!$error)
 		{
-		    $this->statut = self::STATUS_DRAFT;
-		    $this->brouillon = 1;
+			$this->statut = self::STATUS_DRAFT;
+			$this->brouillon = 1;
 
-		    $this->db->commit();
+			$this->db->commit();
 			return 1;
 		} else {
 			foreach ($this->errors as $errmsg)
@@ -2723,7 +2729,7 @@ class Propal extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Return list of proposal (eventually filtered on user) into an array
 	 *
@@ -2737,9 +2743,9 @@ class Propal extends CommonObject
 	 *    @param    string	$sortorder			Sort order
 	 *    @return	int		       				-1 if KO, array with result if OK
 	 */
-    public function liste_array($shortlist = 0, $draft = 0, $notcurrentuser = 0, $socid = 0, $limit = 0, $offset = 0, $sortfield = 'p.datep', $sortorder = 'DESC')
+	public function liste_array($shortlist = 0, $draft = 0, $notcurrentuser = 0, $socid = 0, $limit = 0, $offset = 0, $sortfield = 'p.datep', $sortorder = 'DESC')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user;
 
 		$ga = array();
@@ -2801,21 +2807,21 @@ class Propal extends CommonObject
 	 *
 	 *	@return	array		Array of invoices
 	 */
-    public function getInvoiceArrayList()
+	public function getInvoiceArrayList()
 	{
 		return $this->InvoiceArrayList($this->id);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Returns an array with id and ref of related invoices
 	 *
 	 *	@param		int		$id			Id propal
 	 *	@return		array				Array of invoices id
 	 */
-    public function InvoiceArrayList($id)
+	public function InvoiceArrayList($id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$ga = array();
 		$linkedInvoices = array();
 
@@ -2893,9 +2899,9 @@ class Propal extends CommonObject
 	 *
 	 *	@param	User	$user        	Object user that delete
 	 *	@param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
-	 *	@return	int						1 if ok, otherwise if error
+	 *	@return	int						>0 if OK, <=0 if KO
 	 */
-    public function delete($user, $notrigger = 0)
+	public function delete($user, $notrigger = 0)
 	{
 		global $conf;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -2904,102 +2910,99 @@ class Propal extends CommonObject
 
 		$this->db->begin();
 
-		if (!$notrigger)
-		{
+		if (!$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('PROPAL_DELETE', $user);
 			if ($result < 0) { $error++; }
 			// End call triggers
 		}
 
-		if (!$error)
-		{
-            $main = MAIN_DB_PREFIX.'propaldet';
-            $ef = $main."_extrafields";
-            $sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_propal = ".$this->id.")";
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."propaldet WHERE fk_propal = ".$this->id;
-			if ($this->db->query($sqlef) && $this->db->query($sql))
-			{
-				$sql = "DELETE FROM ".MAIN_DB_PREFIX."propal WHERE rowid = ".$this->id;
-				if ($this->db->query($sql))
-				{
-					// Delete linked object
-					$res = $this->deleteObjectLinked();
-					if ($res < 0) $error++;
+		// Delete extrafields of lines and lines
+		if (!$error && !empty($this->table_element_line)) {
+			$tabletodelete = $this->table_element_line;
+			$sqlef = "DELETE FROM ".MAIN_DB_PREFIX.$tabletodelete."_extrafields WHERE fk_object IN (SELECT rowid FROM ".MAIN_DB_PREFIX.$tabletodelete." WHERE ".$this->fk_element." = ".$this->id.")";
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$tabletodelete." WHERE ".$this->fk_element." = ".$this->id;
+			if (!$this->db->query($sqlef) || !$this->db->query($sql)) {
+				$error++;
+				$this->error = $this->db->lasterror();
+				$this->errors[] = $this->error;
+				dol_syslog(get_class($this)."::delete error ".$this->error, LOG_ERR);
+			}
+		}
 
-					// Delete linked contacts
-					$res = $this->delete_linked_contact();
-					if ($res < 0) $error++;
+		if (!$error) {
+			// Delete linked object
+			$res = $this->deleteObjectLinked();
+			if ($res < 0) $error++;
+		}
 
-					if (!$error)
-					{
-						// Delete record into ECM index (Note that delete is also done when deleting files with the dol_delete_dir_recursive
-						$this->deleteEcmFiles();
+		if (!$error) {
+			// Delete linked contacts
+			$res = $this->delete_linked_contact();
+			if ($res < 0) $error++;
+		}
 
-						// We remove directory
-						$ref = dol_sanitizeFileName($this->ref);
-						if ($conf->propal->multidir_output[$this->entity] && !empty($this->ref))
-						{
-							$dir = $conf->propal->multidir_output[$this->entity]."/".$ref;
-							$file = $dir."/".$ref.".pdf";
-							if (file_exists($file))
-							{
-								dol_delete_preview($this);
+		// Removed extrafields of object
+		if (!$error) {
+			$result = $this->deleteExtraFields();
+			if ($result < 0) {
+				$error++;
+				dol_syslog(get_class($this)."::delete error ".$this->error, LOG_ERR);
+			}
+		}
 
-								if (!dol_delete_file($file, 0, 0, 0, $this)) // For triggers
-								{
-									$this->error = 'ErrorFailToDeleteFile';
-									$this->errors = array('ErrorFailToDeleteFile');
-									$this->db->rollback();
-									return 0;
-								}
-							}
-							if (file_exists($dir))
-							{
-								$res = @dol_delete_dir_recursive($dir);
-								if (!$res)
-								{
-									$this->error = 'ErrorFailToDeleteDir';
-									$this->errors = array('ErrorFailToDeleteDir');
-									$this->db->rollback();
-									return 0;
-								}
-							}
-						}
-					}
+		// Delete main record
+		if (!$error) {
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element." WHERE rowid = ".$this->id;
+			$res = $this->db->query($sql);
+			if (!$res) {
+				$error++;
+				$this->error = $this->db->lasterror();
+				$this->errors[] = $this->error;
+				dol_syslog(get_class($this)."::delete error ".$this->error, LOG_ERR);
+			}
+		}
 
-					// Removed extrafields
-					if (!$error)
-					{
-						$result = $this->deleteExtraFields();
-						if ($result < 0)
-						{
-							$error++;
-							$errorflag = -4;
-							dol_syslog(get_class($this)."::delete erreur ".$errorflag." ".$this->error, LOG_ERR);
-						}
-					}
+		// Delete record into ECM index and physically
+		if (!$error) {
+			$res = $this->deleteEcmFiles(0); // Deleting files physically is done later with the dol_delete_dir_recursive
+			if (!$res) {
+				$error++;
+			}
+		}
 
-					if (!$error)
-					{
-						dol_syslog(get_class($this)."::delete ".$this->id." by ".$user->id, LOG_DEBUG);
-						$this->db->commit();
-						return 1;
-					} else {
-						$this->error = $this->db->lasterror();
+		if (!$error) {
+			// We remove directory
+			$ref = dol_sanitizeFileName($this->ref);
+			if ($conf->propal->multidir_output[$this->entity] && !empty($this->ref)) {
+				$dir = $conf->propal->multidir_output[$this->entity]."/".$ref;
+				$file = $dir."/".$ref.".pdf";
+				if (file_exists($file)) {
+					dol_delete_preview($this);
+
+					if (!dol_delete_file($file, 0, 0, 0, $this)) {
+						$this->error = 'ErrorFailToDeleteFile';
+						$this->errors[] = $this->error;
+						$this->db->rollback();
+						return 0;
+					}
+				}
+				if (file_exists($dir)) {
+					$res = @dol_delete_dir_recursive($dir);
+					if (!$res) {
+						$this->error = 'ErrorFailToDeleteDir';
+						$this->errors[] = $this->error;
 						$this->db->rollback();
 						return 0;
 					}
-				} else {
-					$this->error = $this->db->lasterror();
-					$this->db->rollback();
-					return -3;
 				}
-			} else {
-				$this->error = $this->db->lasterror();
-				$this->db->rollback();
-				return -2;
 			}
+		}
+
+		if (!$error) {
+			dol_syslog(get_class($this)."::delete ".$this->id." by ".$user->id, LOG_DEBUG);
+			$this->db->commit();
+			return 1;
 		} else {
 			$this->db->rollback();
 			return -1;
@@ -3014,7 +3017,7 @@ class Propal extends CommonObject
 	 *  @return int                  	>0 if OK, <0 if KO
 	 *  @deprecated  use set_availability
 	 */
-    public function availability($availability_id, $notrigger = 0)
+	public function availability($availability_id, $notrigger = 0)
 	{
 		global $user;
 
@@ -3072,7 +3075,7 @@ class Propal extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Change source demand
 	 *
@@ -3081,9 +3084,9 @@ class Propal extends CommonObject
 	 *	@return int						>0 si ok, <0 si ko
 	 *	@deprecated use set_demand_reason
 	 */
-    public function demand_reason($demand_reason_id, $notrigger = 0)
+	public function demand_reason($demand_reason_id, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user;
 
 		if ($this->statut >= self::STATUS_DRAFT)
@@ -3147,13 +3150,13 @@ class Propal extends CommonObject
 	 * 	@param	int		$id		Proposal id
 	 *  @return	void
 	 */
-    public function info($id)
+	public function info($id)
 	{
 		$sql = "SELECT c.rowid, ";
 		$sql .= " c.datec, c.date_valid as datev, c.date_cloture as dateo,";
 		$sql .= " c.fk_user_author, c.fk_user_valid, c.fk_user_cloture";
 		$sql .= " FROM ".MAIN_DB_PREFIX."propal as c";
-		$sql .= " WHERE c.rowid = ".$id;
+		$sql .= " WHERE c.rowid = ".((int) $id);
 
 		$result = $this->db->query($sql);
 
@@ -3200,12 +3203,12 @@ class Propal extends CommonObject
 	 *    	@param      int			$mode        0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
 	 *    	@return     string		Label
 	 */
-    public function getLibStatut($mode = 0)
+	public function getLibStatut($mode = 0)
 	{
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    	Return label of a status (draft, validated, ...)
 	 *
@@ -3213,9 +3216,9 @@ class Propal extends CommonObject
 	 *    	@param      int			$mode      	0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
 	 *    	@return     string		Label
 	 */
-    public function LibStatut($status, $mode = 1)
+	public function LibStatut($status, $mode = 1)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		// Init/load array of translation of status
@@ -3223,16 +3226,16 @@ class Propal extends CommonObject
 		{
 			global $langs;
 			$langs->load("propal");
-			$this->labelStatus[0] = $langs->trans("PropalStatusDraft");
-			$this->labelStatus[1] = $langs->trans("PropalStatusValidated");
-			$this->labelStatus[2] = $langs->trans("PropalStatusSigned");
-			$this->labelStatus[3] = $langs->trans("PropalStatusNotSigned");
-			$this->labelStatus[4] = $langs->trans("PropalStatusBilled");
-			$this->labelStatusShort[0] = $langs->trans("PropalStatusDraftShort");
-			$this->labelStatusShort[1] = $langs->trans("PropalStatusValidatedShort");
-			$this->labelStatusShort[2] = $langs->trans("PropalStatusSignedShort");
-			$this->labelStatusShort[3] = $langs->trans("PropalStatusNotSignedShort");
-			$this->labelStatusShort[4] = $langs->trans("PropalStatusBilledShort");
+			$this->labelStatus[0] = $langs->transnoentitiesnoconv("PropalStatusDraft");
+			$this->labelStatus[1] = $langs->transnoentitiesnoconv("PropalStatusValidated");
+			$this->labelStatus[2] = $langs->transnoentitiesnoconv("PropalStatusSigned");
+			$this->labelStatus[3] = $langs->transnoentitiesnoconv("PropalStatusNotSigned");
+			$this->labelStatus[4] = $langs->transnoentitiesnoconv("PropalStatusBilled");
+			$this->labelStatusShort[0] = $langs->transnoentitiesnoconv("PropalStatusDraftShort");
+			$this->labelStatusShort[1] = $langs->transnoentitiesnoconv("PropalStatusValidatedShort");
+			$this->labelStatusShort[2] = $langs->transnoentitiesnoconv("PropalStatusSignedShort");
+			$this->labelStatusShort[3] = $langs->transnoentitiesnoconv("PropalStatusNotSignedShort");
+			$this->labelStatusShort[4] = $langs->transnoentitiesnoconv("PropalStatusBilledShort");
 		}
 
 		$statusType = '';
@@ -3246,7 +3249,7 @@ class Propal extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
@@ -3254,9 +3257,9 @@ class Propal extends CommonObject
 	 *      @param          int		$mode   "opened" for proposal to close, "signed" for proposal to invoice
 	 *      @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
 	 */
-    public function load_board($user, $mode)
+	public function load_board($user, $mode)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		$clause = " WHERE";
@@ -3286,8 +3289,8 @@ class Propal extends CommonObject
 			if ($mode == 'opened') {
 				$delay_warning = $conf->propal->cloture->warning_delay;
 				$status = self::STATUS_VALIDATED;
-				$label = $langs->trans("PropalsToClose");
-				$labelShort = $langs->trans("ToAcceptRefuse");
+				$label = $langs->transnoentitiesnoconv("PropalsToClose");
+				$labelShort = $langs->transnoentitiesnoconv("ToAcceptRefuse");
 			}
 			if ($mode == 'signed') {
 				$delay_warning = $conf->propal->facturation->warning_delay;
@@ -3337,7 +3340,7 @@ class Propal extends CommonObject
 	 *
 	 *  @return	void
 	 */
-    public function initAsSpecimen()
+	public function initAsSpecimen()
 	{
 		global $conf, $langs;
 
@@ -3414,7 +3417,7 @@ class Propal extends CommonObject
 			{
 				$prodid = mt_rand(1, $num_prods);
 				$line->fk_product = $prodids[$prodid];
-		        $line->product_ref = 'SPECIMEN';
+				$line->product_ref = 'SPECIMEN';
 			}
 
 			$this->lines[$xnbp] = $line;
@@ -3427,15 +3430,15 @@ class Propal extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Charge indicateurs this->nb de tableau de bord
 	 *
 	 *      @return     int         <0 if ko, >0 if ok
 	 */
-    public function load_state_board()
+	public function load_state_board()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user;
 
 		$this->nb = array();
@@ -3477,7 +3480,7 @@ class Propal extends CommonObject
 	 *  @param	Societe		$soc  	Object thirdparty
 	 *  @return string      		Reference libre pour la propale
 	 */
-    public function getNextNumRef($soc)
+	public function getNextNumRef($soc)
 	{
 		global $conf, $langs;
 		$langs->load("propal");
@@ -3532,10 +3535,10 @@ class Propal extends CommonObject
 	 *	@param      string	$get_params    	          Parametres added to url
 	 *  @param	    int   	$notooltip		          1=Disable tooltip
 	 *  @param      int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *  @param      int     $addlinktonotes           -1=Disable, 0=Just add label show notes, 1=Add private note (only internal user), 2=Add public note (internal or external user), 3=Add private (internal user) and public note (internal and external user)
+	 *  @param      int     $addlinktonotes           -1=Disable, 0=Just add label show notes, 1=Add private note (only internal user), 2=Add public note (internal or external user), 3=Add private (internal user) and public note (internal and external user)
 	 *	@return     string          		          String with URL
 	 */
-    public function getNomUrl($withpicto = 0, $option = '', $get_params = '', $notooltip = 0, $save_lastsearch_value = -1, $addlinktonotes = -1)
+	public function getNomUrl($withpicto = 0, $option = '', $get_params = '', $notooltip = 0, $save_lastsearch_value = -1, $addlinktonotes = -1)
 	{
 		global $langs, $conf, $user;
 
@@ -3547,21 +3550,28 @@ class Propal extends CommonObject
 
 		if ($user->rights->propal->lire)
 		{
-			$label = img_picto('', $this->picto).' <u>'.$langs->trans("Proposal").'</u>';
-			if (!empty($this->ref))
-				$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-			if (!empty($this->ref_client))
-				$label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.$this->ref_client;
-			if (!empty($this->total_ht))
-				$label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
-			if (!empty($this->total_tva))
-				$label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
-			if (!empty($this->total_ttc))
-				$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+			$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Proposal").'</u>';
 			if (isset($this->statut)) {
-				$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
+				$label .= ' '.$this->getLibStatut(5);
+			}
+			if (!empty($this->ref)) {
+				$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+			}
+			if (!empty($this->ref_client)) {
+				$label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.$this->ref_client;
+			}
+			if (!empty($this->total_ht)) {
+				$label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
+			}
+			if (!empty($this->total_tva)) {
+				$label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+			}
+			if (!empty($this->total_ttc)) {
+				$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+			}
+			if (!empty($this->delivery_date)) {
+					$label .= '<br><b>'.$langs->trans('DeliveryDate').':</b> '.dol_print_date($this->delivery_date, 'dayhour');
 			}
-
 
 			if ($option == '') {
 				$url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$this->id.$get_params;
@@ -3603,45 +3613,45 @@ class Propal extends CommonObject
 		if ($withpicto != 2) $result .= $this->ref;
 		$result .= $linkend;
 
-        if ($addlinktonotes >= 0) {
-            $txttoshow = '';
+		if ($addlinktonotes >= 0) {
+			$txttoshow = '';
 
-            if ($addlinktonotes == 0) {
-                if (!empty($this->note_private) || !empty($this->note_public)) {
-                    $txttoshow = $langs->trans('ViewPrivateNote');
-                }
-            } elseif ($addlinktonotes == 1) {
-                if (!empty($this->note_private)) {
-                    $txttoshow .= ($user->socid > 0 ? '' : dol_string_nohtmltag($this->note_private, 1));
-                }
-            } elseif ($addlinktonotes == 2) {
-                if (!empty($this->note_public)) {
-                    $txttoshow .= dol_string_nohtmltag($this->note_public, 1);
-                }
-            } elseif ($addlinktonotes == 3) {
-                if ($user->socid > 0) {
-                    if (!empty($this->note_public)) {
-                        $txttoshow .= dol_string_nohtmltag($this->note_public, 1);
-                    }
-                } else {
-                    if (!empty($this->note_public)) {
-                        $txttoshow .= dol_string_nohtmltag($this->note_public, 1);
-                    }
-                    if (!empty($this->note_private)) {
-                        if (!empty($txttoshow)) $txttoshow .= '<br><br>';
-                        $txttoshow .= dol_string_nohtmltag($this->note_private, 1);
-                    }
-                }
-            }
+			if ($addlinktonotes == 0) {
+				if (!empty($this->note_private) || !empty($this->note_public)) {
+					$txttoshow = $langs->trans('ViewPrivateNote');
+				}
+			} elseif ($addlinktonotes == 1) {
+				if (!empty($this->note_private)) {
+					$txttoshow .= ($user->socid > 0 ? '' : dol_string_nohtmltag($this->note_private, 1));
+				}
+			} elseif ($addlinktonotes == 2) {
+				if (!empty($this->note_public)) {
+					$txttoshow .= dol_string_nohtmltag($this->note_public, 1);
+				}
+			} elseif ($addlinktonotes == 3) {
+				if ($user->socid > 0) {
+					if (!empty($this->note_public)) {
+						$txttoshow .= dol_string_nohtmltag($this->note_public, 1);
+					}
+				} else {
+					if (!empty($this->note_public)) {
+						$txttoshow .= dol_string_nohtmltag($this->note_public, 1);
+					}
+					if (!empty($this->note_private)) {
+						if (!empty($txttoshow)) $txttoshow .= '<br><br>';
+						$txttoshow .= dol_string_nohtmltag($this->note_private, 1);
+					}
+				}
+			}
 
-            if ($txttoshow) {
-                $result .= ' <span class="note inline-block">';
-                $result .= '<a href="'.DOL_URL_ROOT.'/comm/propal/note.php?id='.$this->id.'" class="classfortooltip" title="'.dol_escape_htmltag($txttoshow).'">';
-                $result .= img_picto('', 'note');
-                $result .= '</a>';
-                $result .= '</span>';
-            }
-        }
+			if ($txttoshow) {
+				$result .= ' <span class="note inline-block">';
+				$result .= '<a href="'.DOL_URL_ROOT.'/comm/propal/note.php?id='.$this->id.'" class="classfortooltip" title="'.dol_escape_htmltag($txttoshow).'">';
+				$result .= img_picto('', 'note');
+				$result .= '</a>';
+				$result .= '</span>';
+			}
+		}
 
 		return $result;
 	}
@@ -3651,7 +3661,7 @@ class Propal extends CommonObject
 	 *
 	 * 	@return int		>0 if OK, <0 if KO
 	 */
-    public function getLinesArray()
+	public function getLinesArray()
 	{
 		return $this->fetch_lines();
 	}
@@ -3664,7 +3674,7 @@ class Propal extends CommonObject
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
-         *  @param   null|array  $moreparams     Array to provide more information
+	 *  @param   null|array  $moreparams     Array to provide more information
 	 * 	@return     int         				0 if KO, 1 if OK
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
@@ -3723,68 +3733,71 @@ class PropaleLigne extends CommonObjectLine
 	 */
 	public $table_element = 'propaldet';
 
-    public $oldline;
+	public $oldline;
 
 	// From llx_propaldet
-    public $fk_propal;
-    public $fk_parent_line;
-    public $desc; // Description ligne
-    public $fk_product; // Id produit predefini
+	public $fk_propal;
+	public $fk_parent_line;
+	public $desc; // Description ligne
+	public $fk_product; // Id produit predefini
 	/**
 	 * @deprecated
 	 * @see $product_type
 	 */
-    public $fk_product_type;
+	public $fk_product_type;
 	/**
 	 * Product type.
 	 * @var int
 	 * @see Product::TYPE_PRODUCT, Product::TYPE_SERVICE
 	 */
-    public $product_type = Product::TYPE_PRODUCT;
+	public $product_type = Product::TYPE_PRODUCT;
 
-    public $qty;
-    public $tva_tx;
-    public $subprice;
-    public $remise_percent;
-    public $fk_remise_except;
+	public $qty;
 
-    public $rang = 0;
+	public $tva_tx;
+	public $vat_src_code;
 
-    public $fk_fournprice;
-    public $pa_ht;
-    public $marge_tx;
-    public $marque_tx;
+	public $subprice;
+	public $remise_percent;
+	public $fk_remise_except;
 
-    public $special_code; // Tag for special lines (exlusive tags)
+	public $rang = 0;
+
+	public $fk_fournprice;
+	public $pa_ht;
+	public $marge_tx;
+	public $marque_tx;
+
+	public $special_code; // Tag for special lines (exlusive tags)
 	// 1: frais de port
 	// 2: ecotaxe
 	// 3: option line (when qty = 0)
 
-    public $info_bits = 0; // Some other info:
+	public $info_bits = 0; // Some other info:
 	// Bit 0: 	0 si TVA normal - 1 si TVA NPR
 	// Bit 1:	0 ligne normale - 1 si ligne de remise fixe
 
-    public $total_ht; // Total HT  de la ligne toute quantite et incluant la remise ligne
-    public $total_tva; // Total TVA  de la ligne toute quantite et incluant la remise ligne
-    public $total_ttc; // Total TTC de la ligne toute quantite et incluant la remise ligne
+	public $total_ht; // Total HT  de la ligne toute quantite et incluant la remise ligne
+	public $total_tva; // Total TVA  de la ligne toute quantite et incluant la remise ligne
+	public $total_ttc; // Total TTC de la ligne toute quantite et incluant la remise ligne
 
 	/**
 	 * @deprecated
 	 * @see $remise_percent, $fk_remise_except
 	 */
-    public $remise;
+	public $remise;
 	/**
 	 * @deprecated
 	 * @see $subprice
 	 */
-    public $price;
+	public $price;
 
 	// From llx_product
 	/**
 	 * @deprecated
 	 * @see $product_ref
 	 */
-    public $ref;
+	public $ref;
 	/**
 	 * Product reference
 	 * @var string
@@ -3794,7 +3807,12 @@ class PropaleLigne extends CommonObjectLine
 	 * @deprecated
 	 * @see $product_label
 	 */
-    public $libelle;
+	public $libelle;
+	/**
+	 * @deprecated
+	 * @see $product_label
+	 */
+	public $label;
 	/**
 	 *  Product label
 	 * @var string
@@ -3806,32 +3824,44 @@ class PropaleLigne extends CommonObjectLine
 	 */
 	public $product_desc;
 
-    public $localtax1_tx; // Local tax 1
-    public $localtax2_tx; // Local tax 2
-    public $localtax1_type; // Local tax 1 type
-    public $localtax2_type; // Local tax 2 type
-    public $total_localtax1; // Line total local tax 1
-    public $total_localtax2; // Line total local tax 2
+	/**
+	 * Product use lot
+	 * @var string
+	 */
+	public $product_tobatch;
 
-    public $date_start;
-    public $date_end;
+	/**
+	 * Product barcode
+	 * @var string
+	 */
+	public $product_barcode;
 
-    public $skip_update_total; // Skip update price total for special lines
+	public $localtax1_tx; // Local tax 1
+	public $localtax2_tx; // Local tax 2
+	public $localtax1_type; // Local tax 1 type
+	public $localtax2_type; // Local tax 2 type
+	public $total_localtax1; // Line total local tax 1
+	public $total_localtax2; // Line total local tax 2
+
+	public $date_start;
+	public $date_end;
+
+	public $skip_update_total; // Skip update price total for special lines
 
 	// Multicurrency
-    public $fk_multicurrency;
-    public $multicurrency_code;
-    public $multicurrency_subprice;
-    public $multicurrency_total_ht;
-    public $multicurrency_total_tva;
-    public $multicurrency_total_ttc;
+	public $fk_multicurrency;
+	public $multicurrency_code;
+	public $multicurrency_subprice;
+	public $multicurrency_total_ht;
+	public $multicurrency_total_tva;
+	public $multicurrency_total_ttc;
 
 	/**
 	 * 	Class line Contructor
 	 *
 	 * 	@param	DoliDB	$db	Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		$this->db = $db;
 	}
@@ -3842,7 +3872,7 @@ class PropaleLigne extends CommonObjectLine
 	 *	@param	int		$rowid		Propal line id
 	 *	@return	int					<0 if KO, >0 if OK
 	 */
-    public function fetch($rowid)
+	public function fetch($rowid)
 	{
 		$sql = 'SELECT pd.rowid, pd.fk_propal, pd.fk_parent_line, pd.fk_product, pd.label as custom_label, pd.description, pd.price, pd.qty, pd.vat_src_code, pd.tva_tx,';
 		$sql .= ' pd.remise, pd.remise_percent, pd.fk_remise_except, pd.subprice,';
@@ -3932,7 +3962,7 @@ class PropaleLigne extends CommonObjectLine
 	 *	@param		int		$notrigger		1=Does not execute triggers, 0= execute triggers
 	 *	@return		int						<0 if KO, >0 if OK
 	 */
-    public function insert($notrigger = 0)
+	public function insert($notrigger = 0)
 	{
 		global $conf, $user;
 
@@ -3964,7 +3994,7 @@ class PropaleLigne extends CommonObjectLine
 		if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva = 0;
 		if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc = 0;
 
-	    // if buy price not defined, define buyprice as configured in margin admin
+		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0 && $pa_ht_isemptystring)
 		{
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
@@ -4071,7 +4101,7 @@ class PropaleLigne extends CommonObjectLine
 	 *	@param 	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return	 int  				<0 if ko, >0 if ok
 	 */
-    public function delete(User $user, $notrigger = 0)
+	public function delete(User $user, $notrigger = 0)
 	{
 		global $conf;
 
@@ -4122,7 +4152,7 @@ class PropaleLigne extends CommonObjectLine
 	 *	@param 	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return	int					<0 if ko, >0 if ok
 	 */
-    public function update($notrigger = 0)
+	public function update($notrigger = 0)
 	{
 		global $conf, $user;
 
@@ -4130,7 +4160,7 @@ class PropaleLigne extends CommonObjectLine
 
 		$pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
 
-		if (empty($this->id) && ! empty($this->rowid)) $this->id = $this->rowid;
+		if (empty($this->id) && !empty($this->rowid)) $this->id = $this->rowid;
 
 		// Clean parameters
 		if (empty($this->tva_tx)) $this->tva_tx = 0;
@@ -4241,16 +4271,16 @@ class PropaleLigne extends CommonObjectLine
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Update DB line fields total_xxx
 	 *	Used by migration
 	 *
 	 *	@return		int		<0 if KO, >0 if OK
 	 */
-    public function update_total()
+	public function update_total()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->db->begin();
 
 		// Mise a jour ligne en base
diff --git a/htdocs/comm/propal/class/propalestats.class.php b/htdocs/comm/propal/class/propalestats.class.php
index 747bb75433c..ca95be53fc1 100644
--- a/htdocs/comm/propal/class/propalestats.class.php
+++ b/htdocs/comm/propal/class/propalestats.class.php
@@ -36,18 +36,18 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
  */
 class PropaleStats extends Stats
 {
-    /**
+	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element;
 
-    public $socid;
-    public $userid;
+	public $socid;
+	public $userid;
 
-    public $from;
-    public $field;
-    public $where;
-    public $join;
+	public $from;
+	public $field;
+	public $where;
+	public $join;
 
 
 	/**
@@ -55,65 +55,65 @@ class PropaleStats extends Stats
 	 *
 	 * @param 	DoliDB	$db		    Database handler
 	 * @param 	int		$socid	    Id third party for filter. This value must be forced during the new to external user company if user is an external user.
-     * @param   int		$userid     Id user for filter (creation user)
+	 * @param   int		$userid     Id user for filter (creation user)
 	 * @param 	string	$mode	    Option ('customer', 'supplier')
-     * @param	int		$typentid   Id typent of thirdpary for filter
-     * @param	int		$categid    Id category of thirdpary for filter
+	 * @param	int		$typentid   Id typent of thirdpary for filter
+	 * @param	int		$categid    Id category of thirdpary for filter
 	 */
-    public function __construct($db, $socid = 0, $userid = 0, $mode = 'customer', $typentid = 0, $categid = 0)
+	public function __construct($db, $socid = 0, $userid = 0, $mode = 'customer', $typentid = 0, $categid = 0)
 	{
 		global $user, $conf;
 
 		$this->db = $db;
-        $this->socid = ($socid > 0 ? $socid : 0);
-        $this->userid = $userid;
-        $this->join = '';
+		$this->socid = ($socid > 0 ? $socid : 0);
+		$this->userid = $userid;
+		$this->join = '';
 
-        if ($mode == 'customer')
-        {
-    		$object = new Propal($this->db);
+		if ($mode == 'customer')
+		{
+			$object = new Propal($this->db);
 
-    		$this->from = MAIN_DB_PREFIX.$object->table_element." as p";
-    		$this->from_line = MAIN_DB_PREFIX.$object->table_element_line." as tl";
-    		$this->field_date = 'p.datep';
-    		$this->field = 'total_ht';
-    		$this->field_line = 'total_ht';
+			$this->from = MAIN_DB_PREFIX.$object->table_element." as p";
+			$this->from_line = MAIN_DB_PREFIX.$object->table_element_line." as tl";
+			$this->field_date = 'p.datep';
+			$this->field = 'total_ht';
+			$this->field_line = 'total_ht';
 
-    		$this->where .= " p.fk_statut > 0";
-        }
-        if ($mode == 'supplier')
-        {
-    		$object = new SupplierProposal($this->db);
+			//$this->where .= " p.fk_statut > 0";
+		}
+		if ($mode == 'supplier')
+		{
+			$object = new SupplierProposal($this->db);
 
-    		$this->from = MAIN_DB_PREFIX.$object->table_element." as p";
-    		$this->from_line = MAIN_DB_PREFIX.$object->table_element_line." as tl";
-    		$this->field_date = 'p.date_valid';
-    		$this->field = 'total_ht';
-    		$this->field_line = 'total_ht';
+			$this->from = MAIN_DB_PREFIX.$object->table_element." as p";
+			$this->from_line = MAIN_DB_PREFIX.$object->table_element_line." as tl";
+			$this->field_date = 'p.date_valid';
+			$this->field = 'total_ht';
+			$this->field_line = 'total_ht';
 
-    		$this->where .= " p.fk_statut > 0"; // Validated, accepted, refused and closed
-        }
+			//$this->where .= " p.fk_statut > 0"; // Validated, accepted, refused and closed
+		}
 		//$this->where.= " AND p.fk_soc = s.rowid AND p.entity = ".$conf->entity;
-		$this->where .= " AND p.entity IN (".getEntity('propal').")";
+		$this->where .= ($this->where ? ' AND ' : '')."p.entity IN (".getEntity('propal').")";
 		if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		if ($this->socid)
 		{
 			$this->where .= " AND p.fk_soc = ".$this->socid;
 		}
-        if ($this->userid > 0) $this->where .= ' AND fk_user_author = '.$this->userid;
+		if ($this->userid > 0) $this->where .= ' AND fk_user_author = '.$this->userid;
 
-        if ($typentid)
-        {
-            $this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc';
-            $this->where .= ' AND s.fk_typent = '.$typentid;
-        }
+		if ($typentid)
+		{
+			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc';
+			$this->where .= ' AND s.fk_typent = '.$typentid;
+		}
 
-        if ($categid)
-        {
-            $this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cs ON cs.fk_soc = p.fk_soc';
-            $this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as c ON c.rowid = cs.fk_categorie';
-            $this->where .= ' AND c.rowid = '.$categid;
-        }
+		if ($categid)
+		{
+			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cs ON cs.fk_soc = p.fk_soc';
+			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as c ON c.rowid = cs.fk_categorie';
+			$this->where .= ' AND c.rowid = '.$categid;
+		}
 	}
 
 
@@ -121,21 +121,21 @@ class PropaleStats extends Stats
 	 * Return propals number by month for a year
 	 *
 	 * @param	int		$year		Year to scan
-     *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 * @return	array				Array with number by month
 	 */
-    public function getNbByMonth($year, $format = 0)
+	public function getNbByMonth($year, $format = 0)
 	{
 		global $user;
 
 		$sql = "SELECT date_format(".$this->field_date.",'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE ".$this->field_date." BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		$res = $this->_getNbByMonth($year, $sql, $format);
 		return $res;
@@ -147,17 +147,17 @@ class PropaleStats extends Stats
 	 * @return	array	Array with number by year
 	 *
 	 */
-    public function getNbByYear()
+	public function getNbByYear()
 	{
 		global $user;
 
 		$sql = "SELECT date_format(".$this->field_date.",'%Y') as dm, COUNT(*) as nb, SUM(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getNbByYear($sql);
 	}
@@ -166,21 +166,21 @@ class PropaleStats extends Stats
 	 * Return the propals amount by month for a year
 	 *
 	 * @param	int		$year		Year to scan
-     * @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 * @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 * @return	array				Array with amount by month
 	 */
-    public function getAmountByMonth($year, $format)
+	public function getAmountByMonth($year, $format)
 	{
 		global $user;
 
 		$sql = "SELECT date_format(".$this->field_date.",'%m') as dm, SUM(p.".$this->field.")";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE ".$this->field_date." BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		$res = $this->_getAmountByMonth($year, $sql, $format);
 		return $res;
@@ -192,18 +192,18 @@ class PropaleStats extends Stats
 	 * @param	int		$year	year for stats
 	 * @return	array			array with number by month
 	 */
-    public function getAverageByMonth($year)
+	public function getAverageByMonth($year)
 	{
 		global $user;
 
 		$sql = "SELECT date_format(".$this->field_date.",'%m') as dm, AVG(p.".$this->field.")";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE ".$this->field_date." BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getAverageByMonth($year, $sql);
 	}
@@ -213,17 +213,17 @@ class PropaleStats extends Stats
 	 *
 	 *	@return	array	Array of values
 	 */
-    public function getAllByYear()
+	public function getAllByYear()
 	{
 		global $user;
 
 		$sql = "SELECT date_format(".$this->field_date.",'%Y') as year, COUNT(*) as nb, SUM(".$this->field.") as total, AVG(".$this->field.") as avg";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY year";
-        $sql .= $this->db->order('year', 'DESC');
+		$sql .= $this->db->order('year', 'DESC');
 
 		return $this->_getAllByYear($sql);
 	}
@@ -234,23 +234,23 @@ class PropaleStats extends Stats
 	 *	Return nb, amount of predefined product for year
 	 *
 	 *	@param	int		$year			Year to scan
-     *  @param 	int     $limit      	Limit
+	 *  @param 	int     $limit      	Limit
 	 *	@return	array					Array of values
 	 */
-    public function getAllByProduct($year, $limit = 10)
+	public function getAllByProduct($year, $limit = 10)
 	{
 		global $user;
 
 		$sql = "SELECT product.ref, COUNT(product.ref) as nb, SUM(tl.".$this->field_line.") as total, AVG(tl.".$this->field_line.") as avg";
 		$sql .= " FROM ".$this->from.", ".$this->from_line.", ".MAIN_DB_PREFIX."product as product";
 		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " AND p.rowid = tl.fk_propal AND tl.fk_product = product.rowid";
-    	$sql .= " AND ".$this->field_date." BETWEEN '".$this->db->idate(dol_get_first_day($year, 1, false))."' AND '".$this->db->idate(dol_get_last_day($year, 12, false))."'";
+		$sql .= " AND ".$this->field_date." BETWEEN '".$this->db->idate(dol_get_first_day($year, 1, false))."' AND '".$this->db->idate(dol_get_last_day($year, 12, false))."'";
 		$sql .= " GROUP BY product.ref";
-        $sql .= $this->db->order('nb', 'DESC');
-        //$sql.= $this->db->plimit(20);
+		$sql .= $this->db->order('nb', 'DESC');
+		//$sql.= $this->db->plimit(20);
 
 		return $this->_getAllByProduct($sql, $limit);
 	}
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index 16be5930e89..af3679de945 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -76,11 +76,12 @@ if (!$error)
 
 if ($action == 'addcontact' && $user->rights->propale->creer)
 {
-    if ($object->id > 0)
-    {
-    	$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
-  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
-    }
+	if ($object->id > 0)
+	{
+		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
+	}
 
 	if ($result >= 0)
 	{
@@ -100,7 +101,7 @@ elseif ($action == 'swapstatut' && $user->rights->propale->creer)
 {
 	if ($object->id > 0)
 	{
-	    $result = $object->swapContactStatus(GETPOST('ligne'));
+		$result = $object->swapContactStatus(GETPOST('ligne'));
 	}
 } // Deletes a contact
 elseif ($action == 'deletecontact' && $user->rights->propale->creer)
@@ -135,8 +136,8 @@ $formother = new FormOther($db);
 
 if ($object->id > 0)
 {
-    $head = propal_prepare_head($object);
-	dol_fiche_head($head, 'contact', $langs->trans("Proposal"), -1, 'propal');
+	$head = propal_prepare_head($object);
+	print dol_get_fiche_head($head, 'contact', $langs->trans("Proposal"), -1, 'propal');
 
 
 	// Proposal card
@@ -153,42 +154,42 @@ if ($object->id > 0)
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    if ($user->rights->propal->creer)
-	    {
-            if ($action != 'classify') {
-                //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
-                $morehtmlref .= ' : ';
-            }
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	            $morehtmlref .= $proj->ref;
-	            $morehtmlref .= '</a>';
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->propal->creer)
+		{
+			if ($action != 'classify') {
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+				$morehtmlref .= ' : ';
+			}
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	// Contacts lines (modules that overwrite templates must declare this into descriptor)
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 70c67566091..fbe7fdbec5c 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -78,9 +78,9 @@ $object->fetch($id, $ref);
 
 if ($object->id > 0)
 {
-    $object->fetch_thirdparty();
-    $upload_dir = $conf->propal->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
-    include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
+	$object->fetch_thirdparty();
+	$upload_dir = $conf->propal->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+	include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 }
 
 
@@ -97,7 +97,7 @@ if ($object->id > 0)
 	$upload_dir = $conf->propal->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
 
 	$head = propal_prepare_head($object);
-	dol_fiche_head($head, 'document', $langs->trans('Proposal'), -1, 'propal');
+	print dol_get_fiche_head($head, 'document', $langs->trans('Proposal'), -1, 'propal');
 
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
@@ -122,36 +122,36 @@ if ($object->id > 0)
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    if ($user->rights->propal->creer)
-	    {
-	        if ($action != 'classify') {
-	        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->propal->creer)
+		{
+			if ($action != 'classify') {
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
 				$morehtmlref .= ' : ';
-            }
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	            $morehtmlref .= $proj->ref;
-	            $morehtmlref .= '</a>';
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+			}
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
@@ -172,7 +172,7 @@ if ($object->id > 0)
 	print '</div>';
 
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$modulepart = 'propal';
 	$permission = $user->rights->propal->creer;
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index 692f561867a..b51f138b0e5 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -154,7 +154,7 @@ if ($resql)
 		}
 	}
 
-	if ($conf->use_javascript_ajax)	{
+	if ($conf->use_javascript_ajax) {
 		print '<tr>';
 		print '<td align="center" colspan="2">';
 
diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php
index 3bf82b4f728..cf63d919f62 100644
--- a/htdocs/comm/propal/info.php
+++ b/htdocs/comm/propal/info.php
@@ -46,8 +46,8 @@ $result = restrictedArea($user, 'propal', $id);
 $object = new Propal($db);
 if (!$object->fetch($id, $ref) > 0)
 {
-    dol_print_error($db);
-    exit;
+	dol_print_error($db);
+	exit;
 }
 
 
@@ -63,7 +63,7 @@ llxHeader('', $langs->trans('Proposal'), 'EN:Commercial_Proposals|FR:Proposition
 $object->fetch_thirdparty();
 
 $head = propal_prepare_head($object);
-dol_fiche_head($head, 'info', $langs->trans('Proposal'), -1, 'propal');
+print dol_get_fiche_head($head, 'info', $langs->trans('Proposal'), -1, 'propal');
 
 $object->info($object->id);
 
@@ -82,36 +82,36 @@ $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->ge
 // Project
 if (!empty($conf->projet->enabled))
 {
-    $langs->load("projects");
-    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-    if ($user->rights->propal->creer)
-    {
-        if ($action != 'classify') {
-            //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
-            $morehtmlref .= ' : ';
-        }
-        if ($action == 'classify') {
-            //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-            $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-            $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-            $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-            $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-            $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-            $morehtmlref .= '</form>';
-        } else {
-            $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-        }
-    } else {
-        if (!empty($object->fk_project)) {
-            $proj = new Project($db);
-            $proj->fetch($object->fk_project);
-            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-            $morehtmlref .= $proj->ref;
-            $morehtmlref .= '</a>';
-        } else {
-            $morehtmlref .= '';
-        }
-    }
+	$langs->load("projects");
+	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+	if ($user->rights->propal->creer)
+	{
+		if ($action != 'classify') {
+			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+			$morehtmlref .= ' : ';
+		}
+		if ($action == 'classify') {
+			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+			$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			$morehtmlref .= '</form>';
+		} else {
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+		}
+	} else {
+		if (!empty($object->fk_project)) {
+			$proj = new Project($db);
+			$proj->fetch($object->fk_project);
+			$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+			$morehtmlref .= $proj->ref;
+			$morehtmlref .= '</a>';
+		} else {
+			$morehtmlref .= '';
+		}
+	}
 }
 $morehtmlref .= '</div>';
 
@@ -126,7 +126,7 @@ dol_print_object_info($object);
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index e50078993f8..d8f523f16da 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -188,14 +188,7 @@ $arrayfields = array(
 	'p.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
 
 /*
@@ -542,7 +535,7 @@ if ($resql)
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view products
-	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -551,7 +544,7 @@ if ($resql)
 		$moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter .= '</div>';
 	}
-	if (!empty($conf->categorie->enabled))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index ef35903fcd0..06be1179fb1 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -75,8 +75,8 @@ if ($id > 0 || !empty($ref))
 	{
 		if ($object->fetch_thirdparty() > 0)
 		{
-		    $head = propal_prepare_head($object);
-			dol_fiche_head($head, 'note', $langs->trans('Proposal'), -1, 'propal');
+			$head = propal_prepare_head($object);
+			print dol_get_fiche_head($head, 'note', $langs->trans('Proposal'), -1, 'propal');
 
 			$cssclass = 'titlefield';
 			//if ($action == 'editnote_public') $cssclass='titlefieldcreate';
@@ -97,36 +97,36 @@ if ($id > 0 || !empty($ref))
 			// Project
 			if (!empty($conf->projet->enabled))
 			{
-			    $langs->load("projects");
-			    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-			    if ($user->rights->propal->creer)
-			    {
-			        if ($action != 'classify') {
-			        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+				$langs->load("projects");
+				$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+				if ($user->rights->propal->creer)
+				{
+					if ($action != 'classify') {
+						//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
 						$morehtmlref .= ' : ';
 					}
-		            if ($action == 'classify') {
-		                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-		                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-		                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-		                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-		                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-		                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-		                $morehtmlref .= '</form>';
-		            } else {
-		                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-		            }
-			    } else {
-			        if (!empty($object->fk_project)) {
-			            $proj = new Project($db);
-			            $proj->fetch($object->fk_project);
-			            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-			            $morehtmlref .= $proj->ref;
-			            $morehtmlref .= '</a>';
-			        } else {
-			            $morehtmlref .= '';
-			        }
-			    }
+					if ($action == 'classify') {
+						//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+						$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+						$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+						$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+						$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+						$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+						$morehtmlref .= '</form>';
+					} else {
+						$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+					}
+				} else {
+					if (!empty($object->fk_project)) {
+						$proj = new Project($db);
+						$proj->fetch($object->fk_project);
+						$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+						$morehtmlref .= $proj->ref;
+						$morehtmlref .= '</a>';
+					} else {
+						$morehtmlref .= '';
+					}
+				}
 			}
 			$morehtmlref .= '</div>';
 
@@ -140,7 +140,7 @@ if ($id > 0 || !empty($ref))
 
 			print '</div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 		}
 	}
 }
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index 49e1141fec1..34feb8bbe44 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -37,11 +37,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
 $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
-$mode = GETPOST("mode") ?GETPOST("mode") : 'customer';
+$mode = GETPOSTISSET("mode") ? GETPOST("mode", 'aZ09') : 'customer';
 if ($mode == 'customer' && !$user->rights->propale->lire) accessforbidden();
 if ($mode == 'supplier' && !$user->rights->supplier_proposal->lire) accessforbidden();
 
-$object_status = GETPOST('object_status');
+$object_status = GETPOST('object_status', 'intcomma');
 $typent_id = GETPOST('typent_id', 'int');
 $categ_id = GETPOST('categ_id', 'categ_id');
 
@@ -50,12 +50,12 @@ $socid = GETPOST('socid', 'int');
 // Security check
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $nowyear = strftime("%Y", dol_now());
-$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
+$year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
 //$startyear=$year-2;
 $startyear = $year - 1;
 $endyear = $year;
@@ -77,19 +77,19 @@ $langs->loadLangs(array('propal', 'other', 'companies'));
 
 if ($mode == 'customer')
 {
-    $picto = 'propal';
-    $title = $langs->trans("ProposalsStatistics");
-    $dir = $conf->propale->dir_temp;
-    $cat_type = Categorie::TYPE_CUSTOMER;
-    $cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Customer"));
+	$picto = 'propal';
+	$title = $langs->trans("ProposalsStatistics");
+	$dir = $conf->propale->dir_temp;
+	$cat_type = Categorie::TYPE_CUSTOMER;
+	$cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Customer"));
 }
 if ($mode == 'supplier')
 {
 	$picto = 'supplier_proposal';
-    $title = $langs->trans("ProposalsStatisticsSuppliers").' ('.$langs->trans("SentToSuppliers").")";
-    $dir = $conf->supplier_proposal->dir_temp;
-    $cat_type = Categorie::TYPE_SUPPLIER;
-    $cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Supplier"));
+	$title = $langs->trans("ProposalsStatisticsSuppliers");
+	$dir = $conf->supplier_proposal->dir_temp;
+	$cat_type = Categorie::TYPE_SUPPLIER;
+	$cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Supplier"));
 }
 
 llxHeader('', $title);
@@ -110,36 +110,36 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filenamenb = $dir.'/proposalsnbinyear-'.$user->id.'-'.$year.'.png';
-    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsnbinyear-'.$user->id.'-'.$year.'.png';
+	$filenamenb = $dir.'/proposalsnbinyear-'.$user->id.'-'.$year.'.png';
+	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsnbinyear-'.$user->id.'-'.$year.'.png';
 } else {
-    $filenamenb = $dir.'/proposalsnbinyear-'.$year.'.png';
-    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsnbinyear-'.$year.'.png';
+	$filenamenb = $dir.'/proposalsnbinyear-'.$year.'.png';
+	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsnbinyear-'.$year.'.png';
 }
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
 if (!$mesg)
 {
-    $px1->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px1->SetLegend($legend);
-    $px1->SetMaxValue($px1->GetCeilMaxValue());
-    $px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
-    $px1->SetWidth($WIDTH);
-    $px1->SetHeight($HEIGHT);
-    $px1->SetYLabel($langs->trans("NbOfProposals"));
-    $px1->SetShading(3);
-    $px1->SetHorizTickIncrement(1);
-    $px1->mode = 'depth';
-    $px1->SetTitle($langs->trans("NumberOfProposalsByMonth"));
+	$px1->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px1->SetLegend($legend);
+	$px1->SetMaxValue($px1->GetCeilMaxValue());
+	$px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
+	$px1->SetWidth($WIDTH);
+	$px1->SetHeight($HEIGHT);
+	$px1->SetYLabel($langs->trans("NbOfProposals"));
+	$px1->SetShading(3);
+	$px1->SetHorizTickIncrement(1);
+	$px1->mode = 'depth';
+	$px1->SetTitle($langs->trans("NumberOfProposalsByMonth"));
 
-    $px1->draw($filenamenb, $fileurlnb);
+	$px1->draw($filenamenb, $fileurlnb);
 }
 
 // Build graphic amount of object
@@ -148,36 +148,36 @@ $data = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, 0);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filenameamount = $dir.'/proposalsamountinyear-'.$user->id.'-'.$year.'.png';
-    $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsamountinyear-'.$user->id.'-'.$year.'.png';
+	$filenameamount = $dir.'/proposalsamountinyear-'.$user->id.'-'.$year.'.png';
+	$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsamountinyear-'.$user->id.'-'.$year.'.png';
 } else {
-    $filenameamount = $dir.'/proposalsamountinyear-'.$year.'.png';
-    $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsamountinyear-'.$year.'.png';
+	$filenameamount = $dir.'/proposalsamountinyear-'.$year.'.png';
+	$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsamountinyear-'.$year.'.png';
 }
 
 $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
 if (!$mesg)
 {
-    $px2->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px2->SetLegend($legend);
-    $px2->SetMaxValue($px2->GetCeilMaxValue());
-    $px2->SetMinValue(min(0, $px2->GetFloorMinValue()));
-    $px2->SetWidth($WIDTH);
-    $px2->SetHeight($HEIGHT);
-    $px2->SetYLabel($langs->trans("AmountOfProposals"));
-    $px2->SetShading(3);
-    $px2->SetHorizTickIncrement(1);
-    $px2->mode = 'depth';
-    $px2->SetTitle($langs->trans("AmountOfProposalsByMonthHT"));
+	$px2->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px2->SetLegend($legend);
+	$px2->SetMaxValue($px2->GetCeilMaxValue());
+	$px2->SetMinValue(min(0, $px2->GetFloorMinValue()));
+	$px2->SetWidth($WIDTH);
+	$px2->SetHeight($HEIGHT);
+	$px2->SetYLabel($langs->trans("AmountOfProposals"));
+	$px2->SetShading(3);
+	$px2->SetHorizTickIncrement(1);
+	$px2->mode = 'depth';
+	$px2->SetTitle($langs->trans("AmountOfProposalsByMonthHT"));
 
-    $px2->draw($filenameamount, $fileurlamount);
+	$px2->draw($filenameamount, $fileurlamount);
 }
 
 $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
@@ -185,38 +185,38 @@ $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 $fileurl_avg = '';
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	$filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
 } else {
-    $filename_avg = $dir.'/ordersaverage-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
+	$filename_avg = $dir.'/ordersaverage-'.$year.'.png';
+	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
+	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
 }
 
 $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
 if (!$mesg)
 {
-    $px3->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px3->SetLegend($legend);
-    $px3->SetYLabel($langs->trans("AmountAverage"));
-    $px3->SetMaxValue($px3->GetCeilMaxValue());
-    $px3->SetMinValue($px3->GetFloorMinValue());
-    $px3->SetWidth($WIDTH);
-    $px3->SetHeight($HEIGHT);
-    $px3->SetShading(3);
-    $px3->SetHorizTickIncrement(1);
-    $px3->mode = 'depth';
-    $px3->SetTitle($langs->trans("AmountAverage"));
+	$px3->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px3->SetLegend($legend);
+	$px3->SetYLabel($langs->trans("AmountAverage"));
+	$px3->SetMaxValue($px3->GetCeilMaxValue());
+	$px3->SetMinValue($px3->GetFloorMinValue());
+	$px3->SetWidth($WIDTH);
+	$px3->SetHeight($HEIGHT);
+	$px3->SetShading(3);
+	$px3->SetHorizTickIncrement(1);
+	$px3->mode = 'depth';
+	$px3->SetTitle($langs->trans("AmountAverage"));
 
-    $px3->draw($filename_avg, $fileurl_avg);
+	$px3->draw($filename_avg, $fileurl_avg);
 }
 
 
@@ -240,7 +240,7 @@ $h++;
 
 complete_head_from_modules($conf, $langs, null, $head, $h, 'propal_stats');
 
-dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
+print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
@@ -260,23 +260,23 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 	$filter = 's.client IN (1,2,3)';
 	print $form->select_company($socid, 'socid', $filter, 1, 0, 0, array(), 0, '', 'style="width: 95%"');
 	print '</td></tr>';
-    // ThirdParty Type
-    print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>';
-    $sortparam_typent = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
-    print $form->selectarray("typent_id", $formcompany->typent_array(0), $typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam_typent);
-    if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-    print '</td></tr>';
-    // Category
-    print '<tr><td>'.$cat_label.'</td><td>';
-    print $formother->select_categories($cat_type, $categ_id, 'categ_id', true);
-    print '</td></tr>';
+	// ThirdParty Type
+	print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>';
+	$sortparam_typent = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
+	print $form->selectarray("typent_id", $formcompany->typent_array(0), $typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam_typent);
+	if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+	print '</td></tr>';
+	// Category
+	print '<tr><td>'.$cat_label.'</td><td>';
+	print $formother->select_categories($cat_type, $categ_id, 'categ_id', true);
+	print '</td></tr>';
 	// User
 	print '<tr><td class="left">'.$langs->trans("CreatedBy").'</td><td class="left">';
 	print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 	print '</td></tr>';
 	// Status
 	print '<tr><td class="left">'.$langs->trans("Status").'</td><td class="left">';
-    $formpropal->selectProposalStatus(($object_status != '' ? $object_status : -1), 0, 0, 1, $mode, 'object_status');
+	$formpropal->selectProposalStatus(($object_status != '' ? $object_status : -1), 0, 0, 1, $mode, 'object_status');
 	print '</td></tr>';
 	// Year
 	print '<tr><td class="left">'.$langs->trans("Year").'</td><td class="left">';
@@ -306,31 +306,31 @@ print '</tr>';
 $oldyear = 0;
 foreach ($data as $val)
 {
-    $year = $val['year'];
-    while (!empty($year) && $oldyear > $year + 1)
-    {	// If we have empty year
-        $oldyear--;
+	$year = $val['year'];
+	while (!empty($year) && $oldyear > $year + 1)
+	{	// If we have empty year
+		$oldyear--;
 
-        print '<tr class="oddeven" height="24">';
-        print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$oldyear.'</a></td>';
-        print '<td class="right">0</td>';
-        print '<td class="right"></td>';
-        print '<td class="right">0</td>';
-        print '<td class="right"></td>';
-        print '<td class="right">0</td>';
-        print '<td class="right"></td>';
-        print '</tr>';
-    }
-    print '<tr class="oddeven" height="24">';
-    print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.'</a></td>';
-    print '<td class="right">'.$val['nb'].'</td>';
+		print '<tr class="oddeven" height="24">';
+		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$oldyear.'</a></td>';
+		print '<td class="right">0</td>';
+		print '<td class="right"></td>';
+		print '<td class="right">0</td>';
+		print '<td class="right"></td>';
+		print '<td class="right">0</td>';
+		print '<td class="right"></td>';
+		print '</tr>';
+	}
+	print '<tr class="oddeven" height="24">';
+	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.'</a></td>';
+	print '<td class="right">'.$val['nb'].'</td>';
 	print '<td class="right" style="'.(($val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['nb_diff']).'</td>';
-    print '<td class="right">'.price(price2num($val['total'], 'MT'), 1).'</td>';
+	print '<td class="right">'.price(price2num($val['total'], 'MT'), 1).'</td>';
 	print '<td class="right" style="'.(($val['total_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['total_diff']).'</td>';
-    print '<td class="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>';
+	print '<td class="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>';
 	print '<td class="right" style="'.(($val['avg_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['avg_diff']).'</td>';
-    print '</tr>';
-    $oldyear = $year;
+	print '</tr>';
+	$oldyear = $year;
 }
 
 print '</table>';
@@ -342,11 +342,11 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td align="center">';
 if ($mesg) { print $mesg; } else {
-    print $px1->show();
-    print "<br>\n";
-    print $px2->show();
-    print "<br>\n";
-    print $px3->show();
+	print $px1->show();
+	print "<br>\n";
+	print $px2->show();
+	print "<br>\n";
+	print $px3->show();
 }
 print '</td></tr></table>';
 
@@ -355,7 +355,7 @@ print '</div></div></div>';
 print '<div style="clear:both"></div>';
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
index 160ae657ce9..300b35cc868 100644
--- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
@@ -25,8 +25,8 @@
 
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
-    print "Error, template page can't be called as URL";
-    exit;
+	print "Error, template page can't be called as URL";
+	exit;
 }
 
 
@@ -46,42 +46,42 @@ $total = 0;
 $ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink)
 {
-    $ilink++;
+	$ilink++;
 
-    $trclass = 'oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
-    print '<tr class="'.$trclass.'"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'" >';
-    print '<td class="linkedcol-element" >'.$langs->trans("Proposal");
-    if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES)
-    {
-        $url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$objectlink->id;
-        print '<a class="objectlinked_importbtn" href="'.$url.'&amp;action=selectlines"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a>';
-    }
-    print '</td>';
-    print '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
-    print '<td class="linkedcol-ref" >'.$objectlink->ref_client.'</td>';
-    print '<td class="linkedcol-date center">'.dol_print_date($objectlink->date, 'day').'</td>';
-    print '<td class="linkedcol-amount right">';
-    if ($user->rights->propale->lire) {
-    	$total = $total + $objectlink->total_ht;
-    	echo price($objectlink->total_ht);
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	print '<tr class="'.$trclass.'"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'" >';
+	print '<td class="linkedcol-element" >'.$langs->trans("Proposal");
+	if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES)
+	{
+		$url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$objectlink->id;
+		print '<a class="objectlinked_importbtn" href="'.$url.'&amp;action=selectlines"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a>';
 	}
-    print '</td>';
-    print '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
-    print '<td class="linkedcol-action right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
-    print "</tr>\n";
+	print '</td>';
+	print '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
+	print '<td class="linkedcol-ref" >'.$objectlink->ref_client.'</td>';
+	print '<td class="linkedcol-date center">'.dol_print_date($objectlink->date, 'day').'</td>';
+	print '<td class="linkedcol-amount right">';
+	if ($user->rights->propale->lire) {
+		$total = $total + $objectlink->total_ht;
+		echo price($objectlink->total_ht);
+	}
+	print '</td>';
+	print '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
+	print '<td class="linkedcol-action right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
+	print "</tr>\n";
 }
 if (count($linkedObjectBlock) > 1)
 {
-    print '<tr class="liste_total '.(empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : '').'">';
-    print '<td>'.$langs->trans("Total").'</td>';
-    print '<td></td>';
-    print '<td class="center"></td>';
-    print '<td class="center"></td>';
-    print '<td class="right">'.price($total).'</td>';
-    print '<td class="right"></td>';
-    print '<td class="right"></td>';
-    print "</tr>\n";
+	print '<tr class="liste_total '.(empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : '').'">';
+	print '<td>'.$langs->trans("Total").'</td>';
+	print '<td></td>';
+	print '<td class="center"></td>';
+	print '<td class="center"></td>';
+	print '<td class="right">'.price($total).'</td>';
+	print '<td class="right"></td>';
+	print '<td class="right"></td>';
+	print "</tr>\n";
 }
 
 print "<!-- END PHP TEMPLATE -->\n";
diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php
index d99b3509b26..7ae61362f09 100644
--- a/htdocs/comm/prospect/index.php
+++ b/htdocs/comm/prospect/index.php
@@ -206,11 +206,11 @@ if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
 				print img_object($langs->trans("ShowPropal"), "propal").' '.$obj->ref.'</a></td>';
 
 				print "<td>";
-                $companystatic->id = $obj->socid;
-                $companystatic->name = $obj->name;
-                $companystatic->client = $obj->client;
-                $companystatic->canvas = $obj->canvas;
-                print $companystatic->getNomUrl(1, '', 44);
+				$companystatic->id = $obj->socid;
+				$companystatic->name = $obj->name;
+				$companystatic->client = $obj->client;
+				$companystatic->canvas = $obj->canvas;
+				print $companystatic->getNomUrl(1, '', 44);
 				print "</td>\n";
 				print "<td align=\"right\">";
 				print dol_print_date($db->jdate($obj->dp), 'day')."</td>\n";
@@ -257,11 +257,11 @@ if ($resql)
 			$obj = $db->fetch_object($resql);
 
 			print '<tr class="oddeven"><td width="12%">';
-            $companystatic->id = $obj->socid;
-            $companystatic->name = $obj->name;
-            $companystatic->client = $obj->client;
-            $companystatic->canvas = $obj->canvas;
-            print $companystatic->getNomUrl(1, 'prospect', 44);
+			$companystatic->id = $obj->socid;
+			$companystatic->name = $obj->name;
+			$companystatic->client = $obj->client;
+			$companystatic->canvas = $obj->canvas;
+			print $companystatic->getNomUrl(1, 'prospect', 44);
 			print '</td></tr>';
 			$i++;
 		}
diff --git a/htdocs/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php
index e393f5fce56..1acf2cbf218 100644
--- a/htdocs/comm/prospect/recap-prospect.php
+++ b/htdocs/comm/prospect/recap-prospect.php
@@ -34,8 +34,8 @@ if (!empty($conf->facture->enabled)) $langs->load("bills");
 $socid = $_GET["socid"];
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 
@@ -48,38 +48,38 @@ llxHeader();
 
 if ($socid > 0)
 {
-    $societe = new Societe($db);
-    $societe->fetch($socid);
+	$societe = new Societe($db);
+	$societe->fetch($socid);
 
-    /*
+	/*
      * Affichage onglets
      */
 	$head = societe_prepare_head($societe);
 
-    dol_fiche_head($head, 'prospect', $langs->trans("ThirdParty"), 0, 'company');
+	print dol_get_fiche_head($head, 'prospect', $langs->trans("ThirdParty"), 0, 'company');
 
 
-    print "<table width=\"100%\">\n";
-    print '<tr><td valign="top" width="50%">';
+	print "<table width=\"100%\">\n";
+	print '<tr><td valign="top" width="50%">';
 
-    print '<table class="border centpercent">';
+	print '<table class="border centpercent">';
 
-    // Name
-    print '<tr><td width="20%">'.$langs->trans("Thirdpary").'</td><td width="80%" colspan="3">'.$societe->getNomUrl(1).'</td></tr>';
+	// Name
+	print '<tr><td width="20%">'.$langs->trans("Thirdpary").'</td><td width="80%" colspan="3">'.$societe->getNomUrl(1).'</td></tr>';
 
 	// Prefix
-    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-    {
-        print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
-        print ($societe->prefix_comm ? $societe->prefix_comm : '&nbsp;');
-        print '</td></tr>';
-    }
+	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+	{
+		print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
+		print ($societe->prefix_comm ? $societe->prefix_comm : '&nbsp;');
+		print '</td></tr>';
+	}
 
-    print "</table>";
+	print "</table>";
 
-    print "</td></tr></table>\n";
+	print "</td></tr></table>\n";
 
-    print '</div>';
+	print '</div>';
 
 
 	print $langs->trans("FeatureNotYetAvailable");
diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php
index 284c248f1f0..254305a9443 100644
--- a/htdocs/comm/recap-client.php
+++ b/htdocs/comm/recap-client.php
@@ -34,8 +34,8 @@ if (!empty($conf->facture->enabled)) $langs->load("bills");
 $socid = $_GET["socid"];
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 
@@ -48,38 +48,38 @@ llxHeader();
 
 if ($socid > 0)
 {
-    $societe = new Societe($db);
-    $societe->fetch($socid);
+	$societe = new Societe($db);
+	$societe->fetch($socid);
 
-    /*
+	/*
      * Affichage onglets
      */
 	$head = societe_prepare_head($societe);
 
-    dol_fiche_head($head, 'customer', $langs->trans("ThirdParty"), 0, 'company');
+	print dol_get_fiche_head($head, 'customer', $langs->trans("ThirdParty"), 0, 'company');
 
 
-    print "<table width=\"100%\">\n";
-    print '<tr><td valign="top" width="50%">';
+	print "<table width=\"100%\">\n";
+	print '<tr><td valign="top" width="50%">';
 
-    print '<table class="border centpercent">';
+	print '<table class="border centpercent">';
 
-    // Name
-    print '<tr><td width="20%">'.$langs->trans("ThirdParty").'</td><td width="80%" colspan="3">'.$societe->getNomUrl(1).'</td></tr>';
+	// Name
+	print '<tr><td width="20%">'.$langs->trans("ThirdParty").'</td><td width="80%" colspan="3">'.$societe->getNomUrl(1).'</td></tr>';
 
-    // Prefix
-    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-    {
-        print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
-        print ($societe->prefix_comm ? $societe->prefix_comm : '&nbsp;');
-        print '</td></tr>';
-    }
+	// Prefix
+	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+	{
+		print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
+		print ($societe->prefix_comm ? $societe->prefix_comm : '&nbsp;');
+		print '</td></tr>';
+	}
 
-    print "</table>";
+	print "</table>";
 
-    print "</td></tr></table>\n";
+	print "</td></tr></table>\n";
 
-    print '</div>';
+	print '</div>';
 
 
 	print $langs->trans("FeatureNotYetAvailable");
diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index cab1a311dbb..e93944d4fbe 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -47,8 +47,8 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 if (GETPOST('cancel', 'alpha') && !empty($backtopage))
 {
-     header("Location: ".$backtopage);
-     exit;
+	 header("Location: ".$backtopage);
+	 exit;
 }
 
 if (GETPOST('action', 'aZ09') == 'setremise')
@@ -66,14 +66,14 @@ if (GETPOST('action', 'aZ09') == 'setremise')
 
 	if ($result > 0)
 	{
-	    if (!empty($backtopage))
-	    {
-    		header("Location: ".$backtopage);
-    		exit;
-	    } else {
-    		header("Location: remise.php?id=".$_GET["id"]);
-    		exit;
-	    }
+		if (!empty($backtopage))
+		{
+			header("Location: ".$backtopage);
+			exit;
+		} else {
+			header("Location: remise.php?id=".$_GET["id"]);
+			exit;
+		}
 	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -108,28 +108,28 @@ if ($socid > 0)
 	print '<form method="POST" action="remise.php?id='.$object->id.'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="setremise">';
-    print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
-	dol_fiche_head($head, 'relativediscount', $langs->trans("ThirdParty"), -1, 'company');
+	print dol_get_fiche_head($head, 'relativediscount', $langs->trans("ThirdParty"), -1, 'company');
 
-    dol_banner_tab($object, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
+	dol_banner_tab($object, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 
-    if (!$isCustomer && !$isSupplier) {
-    	print '<p class="opacitymedium">'.$langs->trans('ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts').'</p>';
+	if (!$isCustomer && !$isSupplier) {
+		print '<p class="opacitymedium">'.$langs->trans('ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts').'</p>';
 
-    	dol_fiche_end();
+		print dol_get_fiche_end();
 
-    	print '</form>';
+		print '</form>';
 
-    	// End of page
-        llxFooter();
-        $db->close();
-    	exit;
-    }
+		// End of page
+		llxFooter();
+		$db->close();
+		exit;
+	}
 
 	print '<table class="border centpercent">';
 
@@ -172,7 +172,7 @@ if ($socid > 0)
 			print '<input type="radio" name="discount_type" id="discount_type_0" checked value="0"/> <label for="discount_type_0">'.$langs->trans('Customer').'</label>';
 		}
 		if ($isSupplier) {
-		    print ' <input type="radio" name="discount_type" id="discount_type_1"'.($isCustomer ? '' : ' checked').' value="1"/> <label for="discount_type_1">'.$langs->trans('Supplier').'</label>';
+			print ' <input type="radio" name="discount_type" id="discount_type_1"'.($isCustomer ? '' : ' checked').' value="1"/> <label for="discount_type_1">'.$langs->trans('Supplier').'</label>';
 		}
 		print '</td></tr>';
 	}
@@ -189,15 +189,15 @@ if ($socid > 0)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-    if (!empty($backtopage))
-    {
-        print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	    print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-    }
+	if (!empty($backtopage))
+	{
+		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+	}
 	print '</div>';
 
 	print "</form>";
@@ -234,22 +234,22 @@ if ($socid > 0)
 			print '<td class="center">'.$langs->trans("User").'</td>';
 			print '</tr>';
 			$num = $db->num_rows($resql);
-	        if ($num > 0)
-	        {
-			    $i = 0;
-	            while ($i < $num)
-	    		{
-	    			$obj = $db->fetch_object($resql);
-	    			print '<tr class="oddeven">';
-	    			print '<td>'.dol_print_date($db->jdate($obj->dc), "dayhour").'</td>';
-	    			print '<td class="center">'.price2num($obj->remise_percent).'%</td>';
-	    			print '<td class="left">'.$obj->note.'</td>';
-	    			print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'</a></td>';
-	    			print '</tr>';
-	    			$i++;
-	    		}
+			if ($num > 0)
+			{
+				$i = 0;
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
+					print '<tr class="oddeven">';
+					print '<td>'.dol_print_date($db->jdate($obj->dc), "dayhour").'</td>';
+					print '<td class="center">'.price2num($obj->remise_percent).'%</td>';
+					print '<td class="left">'.$obj->note.'</td>';
+					print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'</a></td>';
+					print '</tr>';
+					$i++;
+				}
 			} else {
-			    print '<tr><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+				print '<tr><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 			}
 			$db->free($resql);
 			print "</table>";
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 16a7d362ba6..57c1cf40114 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -52,8 +52,8 @@ if ($user->socid > 0)
 
 if (GETPOST('cancel', 'alpha') && !empty($backtopage))
 {
-     header("Location: ".$backtopage);
-     exit;
+	 header("Location: ".$backtopage);
+	 exit;
 }
 
 if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes')
@@ -138,8 +138,8 @@ if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes')
 
 		$db->begin();
 		$discount->fk_facture_source = 0; // This is to delete only the require record (that we will recreate with two records) and not all family with same fk_facture_source
-        // This is to delete only the require record (that we will recreate with two records) and not all family with same fk_invoice_supplier_source
-        $discount->fk_invoice_supplier_source = 0;
+		// This is to delete only the require record (that we will recreate with two records) and not all family with same fk_invoice_supplier_source
+		$discount->fk_invoice_supplier_source = 0;
 		$res = $discount->delete($user);
 		$newid1 = $newdiscount1->create($user);
 		$newid2 = $newdiscount2->create($user);
@@ -181,13 +181,13 @@ if ($action == 'setremise' && $user->rights->societe->creer)
 
 			if ($discountid > 0)
 			{
-			    if (!empty($backtopage))
-			    {
-			        header("Location: ".$backtopage.'&discountid='.$discountid);
-			        exit;
-			    } else {
-				    header("Location: remx.php?id=".$id);
-				    exit;
+				if (!empty($backtopage))
+				{
+					header("Location: ".$backtopage.'&discountid='.$discountid);
+					exit;
+				} else {
+					header("Location: remx.php?id=".$id);
+					exit;
 				}
 			} else {
 				$error++;
@@ -248,27 +248,27 @@ if ($socid > 0)
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="setremise">';
-    print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
-	dol_fiche_head($head, 'absolutediscount', $langs->trans("ThirdParty"), -1, 'company');
+	print dol_get_fiche_head($head, 'absolutediscount', $langs->trans("ThirdParty"), -1, 'company');
 
-    dol_banner_tab($object, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
+	dol_banner_tab($object, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 
-    if (!$isCustomer && !$isSupplier) {
-    	print '<p class="opacitymedium">'.$langs->trans('ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts').'</p>';
+	if (!$isCustomer && !$isSupplier) {
+		print '<p class="opacitymedium">'.$langs->trans('ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts').'</p>';
 
-    	dol_fiche_end();
+		print dol_get_fiche_end();
 
-    	print '</form>';
+		print '</form>';
 
-    	llxFooter();
-    	$db->close();
-    	exit;
-    }
+		llxFooter();
+		$db->close();
+		exit;
+	}
 
 
 	print '<table class="border centpercent tableforfield borderbottom">';
@@ -298,7 +298,7 @@ if ($socid > 0)
 		if (!empty($user->fk_soc))    // No need to show this for external users
 		{
 			print '<tr><td>'.$langs->trans("CustomerAbsoluteDiscountMy").'</td>';
-	    	print '<td>'.$remise_user.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
+			print '<td>'.$remise_user.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
 		}
 	}
 
@@ -336,61 +336,61 @@ if ($socid > 0)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	if ($user->rights->societe->creer)
 	{
-    	print '<br>';
+		print '<br>';
 
-    	print load_fiche_titre($langs->trans("NewGlobalDiscount"), '', '');
+		print load_fiche_titre($langs->trans("NewGlobalDiscount"), '', '');
 
 
-    	if ($isCustomer && !$isSupplier) {
-    		print '<input type="hidden" name="discount_type" value="0" />';
-    	}
+		if ($isCustomer && !$isSupplier) {
+			print '<input type="hidden" name="discount_type" value="0" />';
+		}
 
-    	if (!$isCustomer && $isSupplier) {
-    		print '<input type="hidden" name="discount_type" value="1" />';
-    	}
+		if (!$isCustomer && $isSupplier) {
+			print '<input type="hidden" name="discount_type" value="1" />';
+		}
 
-    	dol_fiche_head();
+		print dol_get_fiche_head();
 
-    	print '<table class="border centpercent">';
+		print '<table class="border centpercent">';
 		if ($isCustomer && $isSupplier) {
 			print '<tr><td class="titlefield fieldrequired">'.$langs->trans('DiscountType').'</td>';
 			print '<td><input type="radio" name="discount_type" id="discount_type_0" checked="checked" value="0"/> <label for="discount_type_0">'.$langs->trans('Customer').'</label>';
 			print ' &nbsp; <input type="radio" name="discount_type" id="discount_type_1" value="1"/> <label for="discount_type_1">'.$langs->trans('Supplier').'</label>';
 			print '</td></tr>';
 		}
-    	print '<tr><td class="titlefield fieldrequired">'.$langs->trans("AmountHT").'</td>';
-    	print '<td><input type="text" size="5" name="amount_ht" value="'.price2num(GETPOST("amount_ht")).'">';
-    	print '<span class="hideonsmartphone">&nbsp;'.$langs->trans("Currency".$conf->currency).'</span></td></tr>';
-    	print '<tr><td>'.$langs->trans("VAT").'</td>';
-    	print '<td>';
-    	print $form->load_tva('tva_tx', GETPOSTISSET('tva_tx') ? GETPOST('tva_tx', 'alpha') : 0, $mysoc, $object, 0, 0, '', 0, 1);
-    	print '</td></tr>';
-    	print '<tr><td class="fieldrequired" >'.$langs->trans("NoteReason").'</td>';
-    	print '<td><input type="text" class="quatrevingtpercent" name="desc" value="'.GETPOST('desc', 'alphanohtml').'"></td></tr>';
+		print '<tr><td class="titlefield fieldrequired">'.$langs->trans("AmountHT").'</td>';
+		print '<td><input type="text" size="5" name="amount_ht" value="'.price2num(GETPOST("amount_ht")).'">';
+		print '<span class="hideonsmartphone">&nbsp;'.$langs->trans("Currency".$conf->currency).'</span></td></tr>';
+		print '<tr><td>'.$langs->trans("VAT").'</td>';
+		print '<td>';
+		print $form->load_tva('tva_tx', GETPOSTISSET('tva_tx') ? GETPOST('tva_tx', 'alpha') : 0, $mysoc, $object, 0, 0, '', 0, 1);
+		print '</td></tr>';
+		print '<tr><td class="fieldrequired" >'.$langs->trans("NoteReason").'</td>';
+		print '<td><input type="text" class="quatrevingtpercent" name="desc" value="'.GETPOST('desc', 'alphanohtml').'"></td></tr>';
 
-    	print "</table>";
+		print "</table>";
 
-    	dol_fiche_end();
+		print dol_get_fiche_end();
 	}
 
 	if ($user->rights->societe->creer)
 	{
-        print '<div class="center">';
-    	print '<input type="submit" class="button" name="submit" value="'.$langs->trans("AddGlobalDiscount").'">';
-        if (!empty($backtopage))
-        {
-            print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-    	    print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-        }
-    	print '</div>';
-    }
+		print '<div class="center">';
+		print '<input type="submit" class="button" name="submit" value="'.$langs->trans("AddGlobalDiscount").'">';
+		if (!empty($backtopage))
+		{
+			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+			print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+		}
+		print '</div>';
+	}
 
-    print '</form>';
+	print '</form>';
 
 
 	print '<br>';
@@ -441,13 +441,13 @@ if ($socid > 0)
 			print '<td class="right">'.$langs->trans("AmountHT").'</td>';
 			if (!empty($conf->multicurrency->enabled))
 			{
-                print '<td class="right">'.$langs->trans("MulticurrencyAmountHT").'</td>';
+				print '<td class="right">'.$langs->trans("MulticurrencyAmountHT").'</td>';
 			}
 			print '<td class="right">'.$langs->trans("VATRate").'</td>';
 			print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
 			if (!empty($conf->multicurrency->enabled))
 			{
-			    print '<td class="right">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
+				print '<td class="right">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
 			}
 			print '<td width="100" class="center">'.$langs->trans("DiscountOfferedBy").'</td>';
 			print '<td width="50">&nbsp;</td>';
@@ -459,76 +459,76 @@ if ($socid > 0)
 			$num = $db->num_rows($resql);
 			if ($num > 0)
 			{
-	    		while ($i < $num)
-	    		{
-	    			$obj = $db->fetch_object($resql);
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
 
-	    			print '<tr class="oddeven">';
-	    			print '<td>'.dol_print_date($db->jdate($obj->dc), 'dayhour').'</td>';
-	    			if (preg_match('/\(CREDIT_NOTE\)/', $obj->description))
-	    			{
-	    				print '<td class="minwidth100">';
-	    				$facturestatic->id = $obj->fk_facture_source;
-	    				$facturestatic->ref = $obj->ref;
-	    				$facturestatic->type = $obj->type;
-	    				print preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $obj->description).' '.$facturestatic->getNomURl(1);
-	    				print '</td>';
-	    			} elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
-	    			{
-	    				print '<td class="minwidth100">';
-	    				$facturestatic->id = $obj->fk_facture_source;
-	    				$facturestatic->ref = $obj->ref;
-	    				$facturestatic->type = $obj->type;
-	    				print preg_replace('/\(DEPOSIT\)/', $langs->trans("InvoiceDeposit"), $obj->description).' '.$facturestatic->getNomURl(1);
-	    				print '</td>';
-	    			} elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description))
-	    			{
-	    				print '<td class="minwidth100">';
-	    				$facturestatic->id = $obj->fk_facture_source;
-	    				$facturestatic->ref = $obj->ref;
-	    				$facturestatic->type = $obj->type;
-	    				print preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("ExcessReceived"), $obj->description).' '.$facturestatic->getNomURl(1);
-	    				print '</td>';
-	    			} else {
-	    				print '<td class="minwidth100">';
-	    				print $obj->description;
-	    				print '</td>';
-	    			}
-	    			print '<td class="nowrap">'.$langs->trans("NotConsumed").'</td>';
-	    			print '<td class="right">'.price($obj->amount_ht).'</td>';
-	    			if (!empty($conf->multicurrency->enabled))
-	    			{
-	    			    print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
-	    			}
-	    			print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
-	    			print '<td class="right">'.price($obj->amount_ttc).'</td>';
-	    			if (!empty($conf->multicurrency->enabled))
-	    			{
-	    			    print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
-	    			}
-	    			print '<td class="center">';
-	    			print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'</a>';
-	    			print '</td>';
-	    			if ($user->rights->societe->creer || $user->rights->facture->creer)
-	    			{
-	    				print '<td class="center nowrap">';
-	    				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=split&remid='.$obj->rowid.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.img_split($langs->trans("SplitDiscount")).'</a>';
-	    				print '<a class="reposition marginleftonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=remove&remid='.$obj->rowid.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.img_delete($langs->trans("RemoveDiscount")).'</a>';
-	    				print '</td>';
-	    			} else print '<td>&nbsp;</td>';
-	    			print '</tr>';
+					print '<tr class="oddeven">';
+					print '<td>'.dol_print_date($db->jdate($obj->dc), 'dayhour').'</td>';
+					if (preg_match('/\(CREDIT_NOTE\)/', $obj->description))
+					{
+						print '<td class="minwidth100">';
+						$facturestatic->id = $obj->fk_facture_source;
+						$facturestatic->ref = $obj->ref;
+						$facturestatic->type = $obj->type;
+						print preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $obj->description).' '.$facturestatic->getNomURl(1);
+						print '</td>';
+					} elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
+					{
+						print '<td class="minwidth100">';
+						$facturestatic->id = $obj->fk_facture_source;
+						$facturestatic->ref = $obj->ref;
+						$facturestatic->type = $obj->type;
+						print preg_replace('/\(DEPOSIT\)/', $langs->trans("InvoiceDeposit"), $obj->description).' '.$facturestatic->getNomURl(1);
+						print '</td>';
+					} elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description))
+					{
+						print '<td class="minwidth100">';
+						$facturestatic->id = $obj->fk_facture_source;
+						$facturestatic->ref = $obj->ref;
+						$facturestatic->type = $obj->type;
+						print preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("ExcessReceived"), $obj->description).' '.$facturestatic->getNomURl(1);
+						print '</td>';
+					} else {
+						print '<td class="minwidth100">';
+						print $obj->description;
+						print '</td>';
+					}
+					print '<td class="nowrap">'.$langs->trans("NotConsumed").'</td>';
+					print '<td class="right">'.price($obj->amount_ht).'</td>';
+					if (!empty($conf->multicurrency->enabled))
+					{
+						print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
+					}
+					print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
+					print '<td class="right">'.price($obj->amount_ttc).'</td>';
+					if (!empty($conf->multicurrency->enabled))
+					{
+						print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
+					}
+					print '<td class="center">';
+					print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'</a>';
+					print '</td>';
+					if ($user->rights->societe->creer || $user->rights->facture->creer)
+					{
+						print '<td class="center nowrap">';
+						print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=split&remid='.$obj->rowid.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.img_split($langs->trans("SplitDiscount")).'</a>';
+						print '<a class="reposition marginleftonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=remove&remid='.$obj->rowid.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.img_delete($langs->trans("RemoveDiscount")).'</a>';
+						print '</td>';
+					} else print '<td>&nbsp;</td>';
+					print '</tr>';
 
-	    			if ($_GET["action"] == 'split' && GETPOST('remid') == $obj->rowid)
-	    			{
-	    				$showconfirminfo['rowid'] = $obj->rowid;
-	    				$showconfirminfo['amount_ttc'] = $obj->amount_ttc;
-	    			}
-	    			$i++;
-	    		}
+					if ($_GET["action"] == 'split' && GETPOST('remid') == $obj->rowid)
+					{
+						$showconfirminfo['rowid'] = $obj->rowid;
+						$showconfirminfo['amount_ttc'] = $obj->amount_ttc;
+					}
+					$i++;
+				}
 			} else {
 				$colspan = 8;
 				if (!empty($conf->multicurrency->enabled)) $colspan += 2;
-			    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+				print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 			}
 			$db->free($resql);
 			print "</table>";
@@ -589,13 +589,13 @@ if ($socid > 0)
 			print '<td class="right">'.$langs->trans("AmountHT").'</td>';
 			if (!empty($conf->multicurrency->enabled))
 			{
-			    print '<td class="right">'.$langs->trans("MulticurrencyAmountHT").'</td>';
+				print '<td class="right">'.$langs->trans("MulticurrencyAmountHT").'</td>';
 			}
 			print '<td class="right">'.$langs->trans("VATRate").'</td>';
 			print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
 			if (!empty($conf->multicurrency->enabled))
 			{
-			    print '<td class="right">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
+				print '<td class="right">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
 			}
 			print '<td width="100" class="center">'.$langs->trans("DiscountOfferedBy").'</td>';
 			print '<td width="50">&nbsp;</td>';
@@ -646,13 +646,13 @@ if ($socid > 0)
 					print '<td class="right">'.price($obj->amount_ht).'</td>';
 					if (!empty($conf->multicurrency->enabled))
 					{
-					    print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
+						print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
 					}
 					print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
 					print '<td class="right">'.price($obj->amount_ttc).'</td>';
 					if (!empty($conf->multicurrency->enabled))
 					{
-					    print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
+						print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
 					}
 					print '<td class="center">';
 					print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'</a>';
@@ -770,13 +770,13 @@ if ($socid > 0)
 			print '<td class="right">'.$langs->trans("AmountHT").'</td>';
 			if (!empty($conf->multicurrency->enabled))
 			{
-			    print '<td class="right">'.$langs->trans("MulticurrencyAmountHT").'</td>';
+				print '<td class="right">'.$langs->trans("MulticurrencyAmountHT").'</td>';
 			}
 			print '<td class="right">'.$langs->trans("VATRate").'</td>';
 			print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
 			if (!empty($conf->multicurrency->enabled))
 			{
-			    print '<td class="right">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
+				print '<td class="right">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
 			}
 			print '<td width="100" class="center">'.$langs->trans("Author").'</td>';
 			print '<td width="50">&nbsp;</td>';
@@ -787,12 +787,12 @@ if ($socid > 0)
 			$num = $db->num_rows($resql);
 			if ($num > 0)
 			{
-	    		for ($i = 0; $i < $num; $i++)
-	    		{
-	    			$sqlobj = $db->fetch_object($resql);
-	    			$tab_sqlobj[] = $sqlobj;
-	    			$tab_sqlobjOrder[] = $db->jdate($sqlobj->dc);
-	    		}
+				for ($i = 0; $i < $num; $i++)
+				{
+					$sqlobj = $db->fetch_object($resql);
+					$tab_sqlobj[] = $sqlobj;
+					$tab_sqlobjOrder[] = $db->jdate($sqlobj->dc);
+				}
 			}
 			$db->free($resql);
 
@@ -809,69 +809,69 @@ if ($socid > 0)
 			$num = count($tab_sqlobj);
 			if ($num > 0)
 			{
-			    $i = 0;
-	    		while ($i < $num)
-	    		{
-	    			$obj = array_shift($tab_sqlobj);
-	    			print '<tr class="oddeven">';
-	    			print '<td>'.dol_print_date($db->jdate($obj->dc), 'dayhour').'</td>';
-	    			if (preg_match('/\(CREDIT_NOTE\)/', $obj->description))
-	    			{
-	    				print '<td class="minwidth100">';
-	    				$facturestatic->id = $obj->fk_facture_source;
-	    				$facturestatic->ref = $obj->invoice_source_ref;
-	    				$facturestatic->type = $obj->type;
-	    				print preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $obj->description).' '.$facturestatic->getNomURl(1);
-	    				print '</td>';
-	    			} elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
-	    			{
-	    				print '<td class="minwidth100">';
-	    				$facturestatic->id = $obj->fk_facture_source;
-	    				$facturestatic->ref = $obj->invoice_source_ref;
-	    				$facturestatic->type = $obj->type;
-	    				print preg_replace('/\(DEPOSIT\)/', $langs->trans("InvoiceDeposit"), $obj->description).' '.$facturestatic->getNomURl(1);
-	    				print '</td>';
-	    			} elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description))
-	    			{
-	    				print '<td class="minwidth100">';
-	    				$facturestatic->id = $obj->fk_facture_source;
-	    				$facturestatic->ref = $obj->invoice_source_ref;
-	    				$facturestatic->type = $obj->type;
-	    				print preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("Invoice"), $obj->description).' '.$facturestatic->getNomURl(1);
-	    				print '</td>';
-	    			} else {
-	    				print '<td class="minwidth100">';
-	    				print $obj->description;
-	    				print '</td>';
-	    			}
-	    			print '<td class="left nowrap">';
-	    			if ($obj->invoiceid)
-	    			{
-	    				print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->invoiceid.'">'.img_object($langs->trans("ShowBill"), 'bill').' '.$obj->ref.'</a>';
-	    			}
-	    			print '</td>';
-	    			print '<td class="right">'.price($obj->amount_ht).'</td>';
-	    			if (!empty($conf->multicurrency->enabled))
-	    			{
-	    			    print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
-	    			}
-	    			print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
-	    			print '<td class="right">'.price($obj->amount_ttc).'</td>';
-	    			if (!empty($conf->multicurrency->enabled))
-	    			{
-	    			    print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
-	    			}
-	    			print '<td class="center">';
-	    			print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'</a>';
-	    			print '</td>';
-	    			print '<td>&nbsp;</td>';
-	    			print '</tr>';
-	    			$i++;
-	    		}
+				$i = 0;
+				while ($i < $num)
+				{
+					$obj = array_shift($tab_sqlobj);
+					print '<tr class="oddeven">';
+					print '<td>'.dol_print_date($db->jdate($obj->dc), 'dayhour').'</td>';
+					if (preg_match('/\(CREDIT_NOTE\)/', $obj->description))
+					{
+						print '<td class="minwidth100">';
+						$facturestatic->id = $obj->fk_facture_source;
+						$facturestatic->ref = $obj->invoice_source_ref;
+						$facturestatic->type = $obj->type;
+						print preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $obj->description).' '.$facturestatic->getNomURl(1);
+						print '</td>';
+					} elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
+					{
+						print '<td class="minwidth100">';
+						$facturestatic->id = $obj->fk_facture_source;
+						$facturestatic->ref = $obj->invoice_source_ref;
+						$facturestatic->type = $obj->type;
+						print preg_replace('/\(DEPOSIT\)/', $langs->trans("InvoiceDeposit"), $obj->description).' '.$facturestatic->getNomURl(1);
+						print '</td>';
+					} elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description))
+					{
+						print '<td class="minwidth100">';
+						$facturestatic->id = $obj->fk_facture_source;
+						$facturestatic->ref = $obj->invoice_source_ref;
+						$facturestatic->type = $obj->type;
+						print preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("Invoice"), $obj->description).' '.$facturestatic->getNomURl(1);
+						print '</td>';
+					} else {
+						print '<td class="minwidth100">';
+						print $obj->description;
+						print '</td>';
+					}
+					print '<td class="left nowrap">';
+					if ($obj->invoiceid)
+					{
+						print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->invoiceid.'">'.img_object($langs->trans("ShowBill"), 'bill').' '.$obj->ref.'</a>';
+					}
+					print '</td>';
+					print '<td class="right">'.price($obj->amount_ht).'</td>';
+					if (!empty($conf->multicurrency->enabled))
+					{
+						print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
+					}
+					print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
+					print '<td class="right">'.price($obj->amount_ttc).'</td>';
+					if (!empty($conf->multicurrency->enabled))
+					{
+						print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
+					}
+					print '<td class="center">';
+					print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'</a>';
+					print '</td>';
+					print '<td>&nbsp;</td>';
+					print '</tr>';
+					$i++;
+				}
 			} else {
 				$colspan = 8;
 				if (!empty($conf->multicurrency->enabled)) $colspan += 2;
-			    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+				print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 			}
 
 			print "</table>";
@@ -940,13 +940,13 @@ if ($socid > 0)
 			print '<td class="right">'.$langs->trans("AmountHT").'</td>';
 			if (!empty($conf->multicurrency->enabled))
 			{
-			    print '<td class="right">'.$langs->trans("MulticurrencyAmountHT").'</td>';
+				print '<td class="right">'.$langs->trans("MulticurrencyAmountHT").'</td>';
 			}
 			print '<td class="right">'.$langs->trans("VATRate").'</td>';
 			print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
 			if (!empty($conf->multicurrency->enabled))
 			{
-			    print '<td class="right">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
+				print '<td class="right">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
 			}
 			print '<td width="100" class="center">'.$langs->trans("Author").'</td>';
 			print '<td width="50">&nbsp;</td>';
@@ -1022,13 +1022,13 @@ if ($socid > 0)
 					print '<td class="right">'.price($obj->amount_ht).'</td>';
 					if (!empty($conf->multicurrency->enabled))
 					{
-					    print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
+						print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
 					}
 					print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
 					print '<td class="right">'.price($obj->amount_ttc).'</td>';
 					if (!empty($conf->multicurrency->enabled))
 					{
-					    print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
+						print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
 					}
 					print '<td class="center">';
 					print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'</a>';
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 5de377930d7..213819b0915 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -120,6 +120,8 @@ if (!empty($conf->expedition->enabled) && !empty($conf->global->WAREHOUSE_ASK_WA
 
 $error = 0;
 
+$date_delivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
+
 
 /*
  * Actions
@@ -242,7 +244,7 @@ if (empty($reshook))
 	{
 		$datecommande = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
 		$datelivraison = dol_mktime(12, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year'));
-        $selectedLines = GETPOST('toselect', 'array');
+		$selectedLines = GETPOST('toselect', 'array');
 
 		if ($datecommande == '') {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Date')), null, 'errors');
@@ -274,7 +276,8 @@ if (empty($reshook))
 			$object->fk_account = GETPOST('fk_account', 'int');
 			$object->availability_id = GETPOST('availability_id');
 			$object->demand_reason_id = GETPOST('demand_reason_id');
-			$object->date_livraison = $datelivraison;
+			$object->date_livraison = $datelivraison; // deprecated
+			$object->delivery_date = $datelivraison;
 			$object->shipping_method_id = GETPOST('shipping_method_id', 'int');
 			$object->warehouse_id = GETPOST('warehouse_id', 'int');
 			$object->fk_delivery_address = GETPOST('fk_address');
@@ -349,7 +352,7 @@ if (empty($reshook))
 
 							for ($i = 0; $i < $num; $i++)
 							{
-                                if (!in_array($lines[$i]->id, $selectedLines)) continue; // Skip unselected lines
+								if (!in_array($lines[$i]->id, $selectedLines)) continue; // Skip unselected lines
 
 								$label = (!empty($lines[$i]->label) ? $lines[$i]->label : '');
 								$desc = (!empty($lines[$i]->desc) ? $lines[$i]->desc : '');
@@ -450,26 +453,14 @@ if (empty($reshook))
 				if (!$error)
 				{
 					$object_id = $object->create($user);
-
-					// If some invoice's lines already known
-					$NBLINES = 8;
-					for ($i = 1; $i <= $NBLINES; $i++) {
-						if ($_POST['idprod'.$i]) {
-							$xid = 'idprod'.$i;
-							$xqty = 'qty'.$i;
-							$xremise = 'remise_percent'.$i;
-							$object->add_product($_POST[$xid], $_POST[$xqty], $_POST[$xremise]);
-						}
-					}
 				}
 			}
 
 			// Insert default contacts if defined
 			if ($object_id > 0)
 			{
-				if (GETPOST('contactid'))
-				{
-					$result = $object->add_contact(GETPOST('contactid'), 'CUSTOMER', 'external');
+				if (GETPOST('contactid', 'int')) {
+					$result = $object->add_contact(GETPOST('contactid', 'int'), 'CUSTOMER', 'external');
 					if ($result < 0) {
 						setEventMessages($langs->trans("ErrorFailedToAddContact"), null, 'errors');
 						$error++;
@@ -537,14 +528,14 @@ if (empty($reshook))
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'setdate_livraison' && $usercancreate) {
-	    // print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
-	    $datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
+		// print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
+		$date_delivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
 
-	    $object->fetch($id);
-	    $result = $object->set_date_livraison($user, $datedelivery);
-	    if ($result < 0) {
-	        setEventMessages($object->error, $object->errors, 'errors');
-	    }
+		$object->fetch($id);
+		$result = $object->setDeliveryDate($user, $date_delivery);
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	} elseif ($action == 'setmode' && $usercancreate) {
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
 		if ($result < 0)
@@ -653,8 +644,8 @@ if (empty($reshook))
 			$tva_tx = '';
 		}
 
-		$qty = GETPOST('qty'.$predef);
-		$remise_percent = (GETPOST('remise_percent'.$predef) != '' ? GETPOST('remise_percent'.$predef) : 0);
+		$qty = price2num(GETPOST('qty'.$predef, 'alpha'));
+		$remise_percent = (GETPOSTISSET('remise_percent'.$predef) ? price2num(GETPOST('remise_percent'.$predef, 'alpha')) : 0);
 
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -738,8 +729,8 @@ if (empty($reshook))
 					$price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
 					if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
 					{
-					    if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx = $prod->multiprices_tva_tx[$object->thirdparty->price_level];
-					    if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr = $prod->multiprices_recuperableonly[$object->thirdparty->price_level];
+						if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx = $prod->multiprices_tva_tx[$object->thirdparty->price_level];
+						if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr = $prod->multiprices_recuperableonly[$object->thirdparty->price_level];
 					}
 				}
 				// If price per customer
@@ -758,6 +749,7 @@ if (empty($reshook))
 						{
 							$pu_ht = price($prodcustprice->lines[0]->price);
 							$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
+							$price_min =  price($prodcustprice->lines[0]->price_min);
 							$price_base_type = $prodcustprice->lines[0]->price_base_type;
 							$tva_tx = $prodcustprice->lines[0]->tva_tx;
 							if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) $tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
@@ -928,6 +920,7 @@ if (empty($reshook))
 
 				if ($result > 0) {
 					$ret = $object->fetch($object->id); // Reload to get new records
+					$object->fetch_thirdparty();
 
 					if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 						// Define output language
@@ -1117,7 +1110,7 @@ if (empty($reshook))
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	} elseif ($action == 'updateline' && $usercancreate && GETPOST('cancel', 'alpha') == $langs->trans('Cancel')) {
+	} elseif ($action == 'updateline' && $usercancreate && GETPOST('cancel', 'alpha') == $langs->trans("Cancel")) {
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
 		exit();
 	} elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate)
@@ -1273,93 +1266,84 @@ if (empty($reshook))
 		if ($error) $action = 'edit_extras';
 	}
 
-	if ($action == 'set_thirdparty' && $usercancreate)
-	{
-		$object->fetch($id);
-		$object->setValueFrom('fk_soc', $socid, '', '', 'date', '', $user, 'ORDER_MODIFY');
-
-		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
-		exit();
-	}
-
 	// add lines from objectlinked
 	if ($action == 'import_lines_from_object'
-	    && $usercancreate
-	    && $object->statut == Commande::STATUS_DRAFT
+		&& $usercancreate
+		&& $object->statut == Commande::STATUS_DRAFT
 	  )
 	{
-	    $fromElement = GETPOST('fromelement');
-	    $fromElementid = GETPOST('fromelementid');
-	    $importLines = GETPOST('line_checkbox');
+		$fromElement = GETPOST('fromelement');
+		$fromElementid = GETPOST('fromelementid');
+		$importLines = GETPOST('line_checkbox');
 
-	    if (!empty($importLines) && is_array($importLines) && !empty($fromElement) && ctype_alpha($fromElement) && !empty($fromElementid))
-	    {
-	        if ($fromElement == 'commande')
-	        {
-	            dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
-	            $lineClassName = 'OrderLine';
-	        } elseif ($fromElement == 'propal')
-	        {
-	            dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
-	            $lineClassName = 'PropaleLigne';
-	        }
-	        $nextRang = count($object->lines) + 1;
-	        $importCount = 0;
-	        $error = 0;
-	        foreach ($importLines as $lineId)
-	        {
-	            $lineId = intval($lineId);
-	            $originLine = new $lineClassName($db);
-	            if (intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0)
-	            {
-	                $originLine->fetch_optionals();
-	                $desc = $originLine->desc;
-	                $pu_ht = $originLine->subprice;
-	                $qty = $originLine->qty;
-	                $txtva = $originLine->tva_tx;
-	                $txlocaltax1 = $originLine->localtax1_tx;
-	                $txlocaltax2 = $originLine->localtax2_tx;
-	                $fk_product = $originLine->fk_product;
-	                $remise_percent = $originLine->remise_percent;
-	                $date_start = $originLine->date_start;
-	                $date_end = $originLine->date_end;
-	                $ventil = 0;
-	                $info_bits = $originLine->info_bits;
-	                $fk_remise_except = $originLine->fk_remise_except;
-	                $price_base_type = 'HT';
-	                $pu_ttc = 0;
-	                $type = $originLine->product_type;
-	                $rang = $nextRang++;
-	                $special_code = $originLine->special_code;
-	                $origin = $originLine->element;
-	                $origin_id = $originLine->id;
-	                $fk_parent_line = 0;
-	                $fk_fournprice = $originLine->fk_fournprice;
-	                $pa_ht = $originLine->pa_ht;
-	                $label = $originLine->label;
-	                $array_options = $originLine->array_options;
-	                $situation_percent = 100;
-	                $fk_prev_id = '';
-	                $fk_unit = $originLine->fk_unit;
-	                $pu_ht_devise = $originLine->multicurrency_subprice;
+		if (!empty($importLines) && is_array($importLines) && !empty($fromElement) && ctype_alpha($fromElement) && !empty($fromElementid))
+		{
+			if ($fromElement == 'commande')
+			{
+				dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
+				$lineClassName = 'OrderLine';
+			} elseif ($fromElement == 'propal')
+			{
+				dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
+				$lineClassName = 'PropaleLigne';
+			}
+			$nextRang = count($object->lines) + 1;
+			$importCount = 0;
+			$error = 0;
+			foreach ($importLines as $lineId)
+			{
+				$lineId = intval($lineId);
+				$originLine = new $lineClassName($db);
+				if (intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0)
+				{
+					$originLine->fetch_optionals();
+					$desc = $originLine->desc;
+					$pu_ht = $originLine->subprice;
+					$qty = $originLine->qty;
+					$txtva = $originLine->tva_tx;
+					$txlocaltax1 = $originLine->localtax1_tx;
+					$txlocaltax2 = $originLine->localtax2_tx;
+					$fk_product = $originLine->fk_product;
+					$remise_percent = $originLine->remise_percent;
+					$date_start = $originLine->date_start;
+					$date_end = $originLine->date_end;
+					$ventil = 0;
+					$info_bits = $originLine->info_bits;
+					$fk_remise_except = $originLine->fk_remise_except;
+					$price_base_type = 'HT';
+					$pu_ttc = 0;
+					$type = $originLine->product_type;
+					$rang = $nextRang++;
+					$special_code = $originLine->special_code;
+					$origin = $originLine->element;
+					$origin_id = $originLine->id;
+					$fk_parent_line = 0;
+					$fk_fournprice = $originLine->fk_fournprice;
+					$pa_ht = $originLine->pa_ht;
+					$label = $originLine->label;
+					$array_options = $originLine->array_options;
+					$situation_percent = 100;
+					$fk_prev_id = '';
+					$fk_unit = $originLine->fk_unit;
+					$pu_ht_devise = $originLine->multicurrency_subprice;
 
-	                $res = $object->addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $info_bits, $fk_remise_except, $price_base_type, $pu_ttc, $date_start, $date_end, $type, $rang, $special_code, $fk_parent_line, $fk_fournprice, $pa_ht, $label, $array_options, $fk_unit, $origin, $origin_id, $pu_ht_devise);
+					$res = $object->addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $info_bits, $fk_remise_except, $price_base_type, $pu_ttc, $date_start, $date_end, $type, $rang, $special_code, $fk_parent_line, $fk_fournprice, $pa_ht, $label, $array_options, $fk_unit, $origin, $origin_id, $pu_ht_devise);
 
-	                if ($res > 0) {
-	                    $importCount++;
-	                } else {
-	                    $error++;
-	                }
-	            } else {
-	                $error++;
-	            }
-	        }
+					if ($res > 0) {
+						$importCount++;
+					} else {
+						$error++;
+					}
+				} else {
+					$error++;
+				}
+			}
 
-	        if ($error)
-	        {
-	            setEventMessages($langs->trans('ErrorsOnXLines', $error), null, 'errors');
-	        }
-	    }
+			if ($error)
+			{
+				setEventMessages($langs->trans('ErrorsOnXLines', $error), null, 'errors');
+			}
+		}
 	}
 
 	// Actions when printing a doc from card
@@ -1384,7 +1368,8 @@ if (empty($reshook))
 		{
 			if ($object->id > 0) {
 				$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-				$result = $object->add_contact($contactid, GETPOST('type'), GETPOST('source'));
+				$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+				$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 			}
 
 			if ($result >= 0) {
@@ -1515,7 +1500,8 @@ if ($action == 'create' && $usercancreate)
 			$remise_absolue		= (!empty($objectsrc->remise_absolue) ? $objectsrc->remise_absolue : (!empty($soc->remise_absolue) ? $soc->remise_absolue : 0));
 			$dateorder = empty($conf->global->MAIN_AUTOFILL_DATE_ORDER) ?-1 : '';
 
-			$datedelivery = (!empty($objectsrc->date_livraison) ? $objectsrc->date_livraison : '');
+			$date_delivery = (!empty($objectsrc->delivery_date) ? $objectsrc->delivery_date : '');
+			if (empty($date_delivery)) $date_delivery = (!empty($objectsrc->date_livraison) ? $objectsrc->date_livraison : '');
 
 			if (!empty($conf->multicurrency->enabled))
 			{
@@ -1556,7 +1542,7 @@ if ($action == 'create' && $usercancreate)
 	print '<input type="hidden" name="originid" value="'.$originid.'">';
 	if (!empty($currency_tx)) print '<input type="hidden" name="originmulticurrency_tx" value="'.$currency_tx.'">';
 
-	dol_fiche_head('');
+	print dol_get_fiche_head('');
 
 	print '<table class="border centpercent">';
 
@@ -1580,13 +1566,14 @@ if ($action == 'create' && $usercancreate)
 		print '</td>';
 	} else {
 		print '<td>';
-		print $form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3)', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
+		print img_picto('', 'company').$form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3)', 'SelectThirdParty', 0, 0, null, 0, 'minwidth175 maxwidth500 widthcentpercentminusxx');
 		// reload page to retrieve customer informations
-		if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
+		if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED))
 		{
 			print '<script type="text/javascript">
 			$(document).ready(function() {
 				$("#socid").change(function() {
+					console.log("We have changed the company - Reload page");
 					var socid = $(this).val();
 					// reload page
 					window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid+"&ref_client="+$("input[name=ref_client]").val();
@@ -1627,8 +1614,7 @@ if ($action == 'create' && $usercancreate)
 	// Date delivery planned
 	print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
 	print '<td colspan="3">';
-	//print dol_print_date($object->date_livraison, "day");	// date_livraison come from order and will be stored into date_delivery planed.
-	$date_delivery = ($date_delivery ? $date_delivery : $object->date_livraison); // $date_delivery comes from GETPOST
+	$date_delivery = ($date_delivery ? $date_delivery : $object->date_delivery);
 	print $form->selectDate($date_delivery ? $date_delivery : -1, 'date_delivery', 1, 1, 1);
 	print "</td>\n";
 	print '</tr>';
@@ -1668,7 +1654,7 @@ if ($action == 'create' && $usercancreate)
 		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 		$formproduct = new FormProduct($db);
 		print '<tr><td>'.$langs->trans('Warehouse').'</td><td>';
-		print $formproduct->selectWarehouses($warehouse_id, 'warehouse_id', '', 1);
+		print img_picto('', 'stock').$formproduct->selectWarehouses($warehouse_id, 'warehouse_id', '', 1, 0, 0, '', 0, 0, array(), 'maxwidth175 maxwidth500 widthcentpercentminusxx');
 		print '</td></tr>';
 	}
 
@@ -1685,7 +1671,8 @@ if ($action == 'create' && $usercancreate)
 		$langs->load("projects");
 		print '<tr>';
 		print '<td>'.$langs->trans("Project").'</td><td>';
-		$numprojet = $formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0, 'maxwidth500');
+		print img_picto('', 'project');
+		$numprojet = $formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0, 'maxwidth175 maxwidth500 widthcentpercentminusxx');
 		print ' <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 		print '</td>';
 		print '</tr>';
@@ -1714,7 +1701,7 @@ if ($action == 'create' && $usercancreate)
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);
 	print $hookmanager->resPrint;
 	if (empty($reshook)) {
-		if (!empty($conf->global->THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_ORDER)) {
+		if (!empty($conf->global->THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_ORDER) && !empty($soc->id)) {
 			// copy from thirdparty
 			$tpExtrafields = new Extrafields($db);
 			$tpExtrafieldLabels = $tpExtrafields->fetch_name_optionals_label($soc->table_element);
@@ -1828,13 +1815,13 @@ if ($action == 'create' && $usercancreate)
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	// Button "Create Draft"
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="bouton" value="'.$langs->trans('CreateDraft').'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button" name="cancel" value="'.$langs->trans("Cancel").'" onclick="javascript:history.go(-1)">';
+	print '<input type="button" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'" onclick="javascript:history.go(-1)">';
 	print '</div>';
 
 	// Show origin lines
@@ -1849,7 +1836,7 @@ if ($action == 'create' && $usercancreate)
 		print '</table>';
 	}
 
-    print '</form>';
+	print '</form>';
 } else {
 	// Mode view
 	$now = dol_now();
@@ -1863,10 +1850,11 @@ if ($action == 'create' && $usercancreate)
 		$author = new User($db);
 		$author->fetch($object->user_author_id);
 
+		$object->fetch_thirdparty();
 		$res = $object->fetch_optionals();
 
 		$head = commande_prepare_head($object);
-		dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), -1, 'order');
+		print dol_get_fiche_head($head, 'order', $langs->trans("CustomerOrder"), -1, 'order');
 
 		$formconfirm = '';
 
@@ -1990,7 +1978,7 @@ if ($action == 'create' && $usercancreate)
 				);
 			}
 
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Cancel'), $text, 'confirm_cancel', $formquestion, 0, 1);
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("Cancel"), $text, 'confirm_cancel', $formquestion, 0, 1);
 		}
 
 		// Confirmation to delete line
@@ -2023,7 +2011,6 @@ if ($action == 'create' && $usercancreate)
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/commande/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-
 		$morehtmlref = '<div class="refidno">';
 		// Ref customer
 		$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string', '', 0, 1);
@@ -2145,12 +2132,12 @@ if ($action == 'create' && $usercancreate)
 			print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setdate_livraison">';
-			print $form->selectDate($object->date_livraison ? $object->date_livraison : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
+			print $form->selectDate($object->delivery_date ? $object->delivery_date : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		} else {
-			print $object->date_livraison ? dol_print_date($object->date_livraison, 'dayhour') : '&nbsp;';
-			if ($object->hasDelay() && !empty($object->date_livraison)) {
+			print $object->delivery_date ? dol_print_date($object->delivery_date, 'dayhour') : '&nbsp;';
+			if ($object->hasDelay() && !empty($object->delivery_date)) {
 				print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
 			}
 		}
@@ -2473,7 +2460,7 @@ if ($action == 'create' && $usercancreate)
 
 		print "</form>\n";
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		/*
 		 * Buttons for actions
@@ -2555,7 +2542,7 @@ if ($action == 'create' && $usercancreate)
 					$numshipping = $object->nb_expedition();
 
 					if ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && ($object->getNbOfProductsLines() > 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES))) {
-						if (($conf->expedition_bon->enabled && $user->rights->expedition->creer) || ($conf->livraison_bon->enabled && $user->rights->expedition->livraison->creer)) {
+						if (($conf->expedition_bon->enabled && $user->rights->expedition->creer) || ($conf->delivery_note->enabled && $user->rights->expedition->delivery->creer)) {
 							if ($user->rights->expedition->creer) {
 								print '<a class="butAction" href="'.DOL_URL_ROOT.'/expedition/shipment.php?id='.$object->id.'">'.$langs->trans('CreateShipment').'</a>';
 							} else {
@@ -2572,7 +2559,6 @@ if ($action == 'create' && $usercancreate)
 				if (($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_SHIPMENTONPROCESS) && $usercanclose) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=shipped">'.$langs->trans('ClassifyShipped').'</a></div>';
 				}
-
 				// Create bill and Classify billed
 				// Note: Even if module invoice is not enabled, we should be able to use button "Classified billed"
 				if ($object->statut > Commande::STATUS_DRAFT && !$object->billed && $object->total_ttc >= 0) {
@@ -2596,7 +2582,7 @@ if ($action == 'create' && $usercancreate)
 				// Cancel order
 				if ($object->statut == Commande::STATUS_VALIDATED && (!empty($usercanclose) || !empty($usercancancel)))
 				{
-					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=cancel">'.$langs->trans('Cancel').'</a></div>';
+					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=cancel">'.$langs->trans("Cancel").'</a></div>';
 				}
 
 				// Delete order
@@ -2635,9 +2621,9 @@ if ($action == 'create' && $usercancreate)
 
 			$compatibleImportElementsList = false;
 			if ($usercancreate
-			    && $object->statut == Commande::STATUS_DRAFT)
+				&& $object->statut == Commande::STATUS_DRAFT)
 			{
-			    $compatibleImportElementsList = array('commande', 'propal'); // import from linked elements
+				$compatibleImportElementsList = array('commande', 'propal'); // import from linked elements
 			}
 			$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, $compatibleImportElementsList);
 
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index 2202ad5b67e..71a26eea698 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -544,9 +544,10 @@ class Orders extends DolibarrApi
 	 * Unlink a contact type of given order
 	 *
 	 * @param int    $id             Id of order to update
-	 * @param int    $rowid          Row key of the contact in the array contact_ids.
+	 * @param int    $contactid      Id of contact
+	 * @param string $type           Type of the contact (BILLING, SHIPPING, CUSTOMER).
 	 *
-	 * @url	DELETE {id}/contact/{rowid}
+	 * @url	DELETE {id}/contact/{contactid}/{type}
 	 *
 	 * @return int
 	 *
@@ -554,7 +555,7 @@ class Orders extends DolibarrApi
 	 * @throws RestException 404
 	 * @throws RestException 500
 	 */
-	public function deleteContact($id, $rowid)
+	public function deleteContact($id, $contactid, $type)
 	{
 		if (!DolibarrApiAccess::$user->rights->commande->creer) {
 			throw new RestException(401);
@@ -569,10 +570,16 @@ class Orders extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		$result = $this->commande->delete_linked_contact($rowid);
+		 $contacts = $this->commande->liste_contact();
 
-		if (!$result) {
-			throw new RestException(500, 'Error when deleted the contact');
+		foreach ($contacts as $contact) {
+			if ($contact['id'] == $contactid && $contact['code'] == $type) {
+				$result = $this->commande->delete_contact($contact['rowid']);
+
+				if (!$result) {
+					throw new RestException(500, 'Error when deleted the contact');
+				}
+			}
 		}
 
 		return array(
@@ -943,8 +950,8 @@ class Orders extends DolibarrApi
 	/**
 	 * Clean sensible object datas
 	 *
-	 * @param   object  $object    Object to clean
-	 * @return    array    Array of cleaned object properties
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
 	 */
 	protected function _cleanObjectDatas($object)
 	{
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 5c314226214..9ea05a13065 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -180,7 +180,13 @@ class Commande extends CommonOrder
 	 */
 	public $date_commande;
 
-	public $date_livraison; // Date expected of shipment (date starting shipment, not the reception that occurs some days after)
+	/**
+	 * @var int	Date expected for delivery
+	 * @deprecated
+	 */
+	public $date_livraison; // deprecated; Use delivery_date instead.
+
+	public $delivery_date; // Date expected of shipment (date starting shipment, not the reception that occurs some days after)
 
 	/**
 	 * @var int ID
@@ -193,6 +199,7 @@ class Commande extends CommonOrder
 	public $rang;
 	public $special_code;
 	public $source; // Order mode. How we received order (by phone, by email, ...)
+
 	public $extraparams = array();
 
 	public $linked_objects = array();
@@ -362,8 +369,6 @@ class Commande extends CommonOrder
 
 		$this->remise = 0;
 		$this->remise_percent = 0;
-
-		$this->products = array();
 	}
 
 	/**
@@ -478,7 +483,7 @@ class Commande extends CommonOrder
 		$sql .= " fk_user_valid = ".$user->id;
 		$sql .= " WHERE rowid = ".$this->id;
 
-		dol_syslog(get_class($this)."::valid()", LOG_DEBUG);
+		dol_syslog(get_class($this)."::valid", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql)
 		{
@@ -544,7 +549,7 @@ class Commande extends CommonOrder
 				$dirdest = $conf->commande->multidir_output[$this->entity].'/'.$newref;
 				if (!$error && file_exists($dirsource))
 				{
-					dol_syslog(get_class($this)."::valid() rename dir ".$dirsource." into ".$dirdest);
+					dol_syslog(get_class($this)."::valid rename dir ".$dirsource." into ".$dirdest);
 
 					if (@rename($dirsource, $dirdest))
 					{
@@ -745,6 +750,10 @@ class Commande extends CommonOrder
 		if ($usercanclose)
 		{
 			$this->db->begin();
+			if ($this->statut == self::STATUS_CLOSED)
+			{
+				return 0;
+			}
 
 			$now = dol_now();
 
@@ -876,8 +885,9 @@ class Commande extends CommonOrder
 		// Clean parameters
 		$this->brouillon = 1; // set command as draft
 
-		// $date_commande is deprecated
+		// Set tmp vars
 		$date = ($this->date_commande ? $this->date_commande : $this->date);
+		$delivery_date = empty($this->delivery_date) ? $this->date_livraison : $this->delivery_date;
 
 		// Multicurrency (test on $this->multicurrency_tx because we should take the default rate only if not using origin rate)
 		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $date);
@@ -950,10 +960,10 @@ class Commande extends CommonOrder
 		$sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
 		$sql .= ", ".($this->availability_id > 0 ? $this->availability_id : "null");
 		$sql .= ", ".($this->demand_reason_id > 0 ? $this->demand_reason_id : "null");
-		$sql .= ", ".($this->date_livraison ? "'".$this->db->idate($this->date_livraison)."'" : "null");
+		$sql .= ", ".($delivery_date ? "'".$this->db->idate($delivery_date)."'" : "null");
 		$sql .= ", ".($this->fk_delivery_address > 0 ? $this->fk_delivery_address : 'NULL');
-		$sql .= ", ".($this->shipping_method_id > 0 ? $this->shipping_method_id : 'NULL');
-		$sql .= ", ".($this->warehouse_id > 0 ? $this->warehouse_id : 'NULL');
+		$sql .= ", ".(!empty($this->shipping_method_id) && $this->shipping_method_id > 0 ? $this->shipping_method_id : 'NULL');
+		$sql .= ", ".(!empty($this->warehouse_id) && $this->warehouse_id > 0 ? $this->warehouse_id : 'NULL');
 		$sql .= ", ".($this->remise_absolue > 0 ? $this->db->escape($this->remise_absolue) : 'NULL');
 		$sql .= ", ".($this->remise_percent > 0 ? $this->db->escape($this->remise_percent) : 0);
 		$sql .= ", ".(int) $this->fk_incoterms;
@@ -1071,7 +1081,7 @@ class Commande extends CommonOrder
 					}
 
 					// Add object linked
-					if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects))
+					if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects))
 					{
 						foreach ($this->linked_objects as $origin => $tmp_origin_id)
 						{
@@ -1349,11 +1359,12 @@ class Commande extends CommonOrder
 		$this->fk_account           = $object->fk_account;
 		$this->availability_id      = $object->availability_id;
 		$this->demand_reason_id     = $object->demand_reason_id;
-		$this->date_livraison       = $object->date_livraison;
+		$this->date_livraison       = $object->date_livraison; // deprecated
+		$this->delivery_date        = $object->date_livraison;
 		$this->shipping_method_id   = $object->shipping_method_id;
 		$this->warehouse_id         = $object->warehouse_id;
 		$this->fk_delivery_address  = $object->fk_delivery_address;
-		$this->contact_id            = $object->contact_id;
+		$this->contact_id = $object->contact_id;
 		$this->ref_client           = $object->ref_client;
 
 		if (empty($conf->global->MAIN_DISABLE_PROPAGATE_NOTES_FROM_ORIGIN))
@@ -1594,8 +1605,8 @@ class Commande extends CommonOrder
 			$this->line->tva_tx = $txtva;
 			$this->line->localtax1_tx = ($total_localtax1 ? $localtaxes_type[1] : 0);
 			$this->line->localtax2_tx = ($total_localtax2 ? $localtaxes_type[3] : 0);
-			$this->line->localtax1_type = $localtaxes_type[0];
-			$this->line->localtax2_type = $localtaxes_type[2];
+			$this->line->localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
+			$this->line->localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
 			$this->line->fk_product = $fk_product;
 			$this->line->product_type = $product_type;
 			$this->line->fk_remise_except = $fk_remise_except;
@@ -1678,7 +1689,6 @@ class Commande extends CommonOrder
 	 * 	@return void
 	 *
 	 *	TODO	Remplacer les appels a cette fonction par generation objet Ligne
-	 *			insere dans tableau $this->products
 	 */
 	public function add_product($idproduct, $qty, $remise_percent = 0.0, $date_start = '', $date_end = '')
 	{
@@ -1740,15 +1750,13 @@ class Commande extends CommonOrder
 			 $prods_arbo = $prod->get_arbo_each_prod();
 			 if(count($prods_arbo) > 0)
 			 {
-			 foreach($prods_arbo as $key => $value)
-			 {
-			 // print "id : ".$value[1].' :qty: '.$value[0].'<br>';
-			 if(! in_array($value[1],$this->products))
-			 $this->add_product($value[1], $value[0]);
-
-			 }
-			 }
-
+				 foreach($prods_arbo as $key => $value)
+				 {
+					 // print "id : ".$value[1].' :qty: '.$value[0].'<br>';
+					 if not in lines {
+					 	$this->add_product($value[1], $value[0]);
+					 }
+				 }
 			 }
 			 **/
 		}
@@ -1773,7 +1781,7 @@ class Commande extends CommonOrder
 		$sql .= ', c.amount_ht, c.total_ht, c.total_ttc, c.tva as total_tva, c.localtax1 as total_localtax1, c.localtax2 as total_localtax2, c.fk_cond_reglement, c.fk_mode_reglement, c.fk_availability, c.fk_input_reason';
 		$sql .= ', c.fk_account';
 		$sql .= ', c.date_commande, c.date_valid, c.tms';
-		$sql .= ', c.date_livraison';
+		$sql .= ', c.date_livraison as delivery_date';
 		$sql .= ', c.fk_shipping_method';
 		$sql .= ', c.fk_warehouse';
 		$sql .= ', c.fk_projet as fk_project, c.remise_percent, c.remise, c.remise_absolue, c.source, c.facture as billed';
@@ -1844,7 +1852,7 @@ class Commande extends CommonOrder
 				$this->note_private = $obj->note_private;
 				$this->note_public = $obj->note_public;
 				$this->model_pdf = $obj->model_pdf;
-				$this->modelpdf = $obj->model_pdf;	// deprecated
+				$this->modelpdf = $obj->model_pdf; // deprecated
 				$this->last_main_doc = $obj->last_main_doc;
 				$this->mode_reglement_id	= $obj->fk_mode_reglement;
 				$this->mode_reglement_code	= $obj->mode_reglement_code;
@@ -1859,7 +1867,8 @@ class Commande extends CommonOrder
 				$this->availability	    	= $obj->availability_label;
 				$this->demand_reason_id		= $obj->fk_input_reason;
 				$this->demand_reason_code = $obj->demand_reason_code;
-				$this->date_livraison = $this->db->jdate($obj->date_livraison);
+				$this->date_livraison = $this->db->jdate($obj->delivery_date); // deprecated
+				$this->delivery_date = $this->db->jdate($obj->delivery_date);
 				$this->shipping_method_id   = ($obj->fk_shipping_method > 0) ? $obj->fk_shipping_method : null;
 				$this->warehouse_id         = ($obj->fk_warehouse > 0) ? $obj->fk_warehouse : null;
 				$this->fk_delivery_address = $obj->fk_delivery_address;
@@ -1885,7 +1894,7 @@ class Commande extends CommonOrder
 
 				if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1;
 
-				// Retreive all extrafield
+				// Retrieve all extrafield
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
 
@@ -2001,7 +2010,7 @@ class Commande extends CommonOrder
 		$sql .= ' l.total_ht, l.total_ttc, l.total_tva, l.total_localtax1, l.total_localtax2, l.date_start, l.date_end,';
 		$sql .= ' l.fk_unit,';
 		$sql .= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc,';
-		$sql .= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label, p.tobatch as product_tobatch,';
+		$sql .= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label, p.tosell as product_tosell, p.tobuy as product_tobuy, p.tobatch as product_tobatch, p.barcode as product_barcode,';
 		$sql .= ' p.weight, p.weight_units, p.volume, p.volume_units';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'commandedet as l';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (p.rowid = l.fk_product)';
@@ -2060,11 +2069,16 @@ class Commande extends CommonOrder
 				$line->fk_parent_line = $objp->fk_parent_line;
 
 				$line->ref = $objp->product_ref;
-				$line->product_ref = $objp->product_ref;
 				$line->libelle = $objp->product_label;
+
+				$line->product_ref = $objp->product_ref;
 				$line->product_label = $objp->product_label;
 				$line->product_desc     = $objp->product_desc;
+				$line->product_tosell   = $objp->product_tosell;
+				$line->product_tobuy    = $objp->product_tobuy;
 				$line->product_tobatch  = $objp->product_tobatch;
+				$line->product_barcode  = $objp->product_barcode;
+
 				$line->fk_product_type  = $objp->fk_product_type; // Produit ou service
 				$line->fk_unit          = $objp->fk_unit;
 
@@ -2544,17 +2558,31 @@ class Commande extends CommonOrder
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Set delivery date
+	 *
+	 *	@param      User 	$user        		Object user that modify
+	 *	@param      int		$delivery_date		Delivery date
+	 *  @param  	int		$notrigger			1=Does not execute triggers, 0= execute triggers
+	 *	@return     int         				<0 if ko, >0 if ok
+	 *	@deprecated Use  setDeliveryDate
+	 */
+	public function set_date_livraison($user, $delivery_date, $notrigger = 0)
+	{
+		// phpcs:enable
+		return $this->setDeliveryDate($user, $delivery_date, $notrigger);
+	}
+
 	/**
 	 *	Set the planned delivery date
 	 *
 	 *	@param      User	$user        		Objet utilisateur qui modifie
-	 *	@param      int		$date_livraison     Date de livraison
+	 *	@param      int		$delivery_date     Delivery date
 	 *  @param     	int		$notrigger			1=Does not execute triggers, 0= execute triggers
 	 *	@return     int         				<0 si ko, >0 si ok
 	 */
-	public function set_date_livraison($user, $date_livraison, $notrigger = 0)
+	public function setDeliveryDate($user, $delivery_date, $notrigger = 0)
 	{
-		// phpcs:enable
 		if ($user->rights->commande->creer)
 		{
 			$error = 0;
@@ -2562,7 +2590,7 @@ class Commande extends CommonOrder
 			$this->db->begin();
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."commande";
-			$sql .= " SET date_livraison = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
+			$sql .= " SET date_livraison = ".($delivery_date ? "'".$this->db->idate($delivery_date)."'" : 'null');
 			$sql .= " WHERE rowid = ".$this->id;
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
@@ -2576,7 +2604,8 @@ class Commande extends CommonOrder
 			if (!$error)
 			{
 				$this->oldcopy = clone $this;
-				$this->date_livraison = $date_livraison;
+				$this->date_livraison = $delivery_date;
+				$this->delivery_date = $delivery_date;
 			}
 
 			if (!$notrigger && empty($error))
@@ -2882,6 +2911,10 @@ class Commande extends CommonOrder
 		$error = 0;
 
 		$this->db->begin();
+		if ($this->billed)
+		{
+			return 0;
+		}
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande SET facture = 1';
 		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
@@ -3049,6 +3082,7 @@ class Commande extends CommonOrder
 
 			// Clean vat code
 			$vat_src_code = '';
+			$reg = array();
 			if (preg_match('/\((.*)\)/', $txtva, $reg))
 			{
 				$vat_src_code = $reg[1];
@@ -3239,6 +3273,7 @@ class Commande extends CommonOrder
 		$sql .= " fk_cond_reglement=".(isset($this->cond_reglement_id) ? $this->cond_reglement_id : "null").",";
 		$sql .= " fk_mode_reglement=".(isset($this->mode_reglement_id) ? $this->mode_reglement_id : "null").",";
 		$sql .= " fk_account=".($this->fk_account > 0 ? $this->fk_account : "null").",";
+		$sql .= " fk_input_reason=".($this->demand_reason_id > 0 ? $this->demand_reason_id : "null").",";
 		$sql .= " note_private=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
 		$sql .= " note_public=".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null").",";
 		$sql .= " model_pdf=".(isset($this->modelpdf) ? "'".$this->db->escape($this->modelpdf)."'" : "null").",";
@@ -3305,106 +3340,95 @@ class Commande extends CommonOrder
 
 		$this->db->begin();
 
-		if (!$error && !$notrigger)
-		{
+		if (!$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('ORDER_DELETE', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) { $error++; }
 			// End call triggers
 		}
 
+		// Test we can delete
 		if ($this->nb_expedition() != 0)
 		{
 			$this->errors[] = $langs->trans('SomeShipmentExists');
 			$error++;
 		}
 
-		if (!$error)
-		{
-			// Delete extrafields of order details
-						$main = MAIN_DB_PREFIX.'commandedet';
-						$ef = $main."_extrafields";
-						$sql = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_commande = ".$this->id.")";
-			if (!$this->db->query($sql))
-			{
+		// Delete extrafields of lines and lines
+		if (!$error && !empty($this->table_element_line)) {
+			$tabletodelete = $this->table_element_line;
+			$sqlef = "DELETE FROM ".MAIN_DB_PREFIX.$tabletodelete."_extrafields WHERE fk_object IN (SELECT rowid FROM ".MAIN_DB_PREFIX.$tabletodelete." WHERE ".$this->fk_element." = ".$this->id.")";
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$tabletodelete." WHERE ".$this->fk_element." = ".$this->id;
+			if (!$this->db->query($sqlef) || !$this->db->query($sql)) {
 				$error++;
-				$this->errors[] = $this->db->lasterror();
+				$this->error = $this->db->lasterror();
+				$this->errors[] = $this->error;
+				dol_syslog(get_class($this)."::delete error ".$this->error, LOG_ERR);
 			}
 		}
 
-		if (!$error)
-		{
-			// Delete order details
-			$sql = 'DELETE FROM '.MAIN_DB_PREFIX."commandedet WHERE fk_commande = ".$this->id;
-			if (!$this->db->query($sql))
-			{
-				$error++;
-				$this->errors[] = $this->db->lasterror();
-			}
-		}
-
-		if (!$error)
-		{
+		if (!$error) {
 			// Delete linked object
 			$res = $this->deleteObjectLinked();
 			if ($res < 0) $error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Delete linked contacts
 			$res = $this->delete_linked_contact();
 			if ($res < 0) $error++;
 		}
 
-		if (!$error)
-		{
-			// Remove extrafields
+		// Removed extrafields of object
+		if (!$error) {
 			$result = $this->deleteExtraFields();
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$error++;
-				dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
+				dol_syslog(get_class($this)."::delete error ".$this->error, LOG_ERR);
 			}
 		}
 
-		if (!$error)
-		{
-			// Delete object
-			$sql = 'DELETE FROM '.MAIN_DB_PREFIX."commande WHERE rowid = ".$this->id;
-			if (!$this->db->query($sql))
-			{
+		// Delete main record
+		if (!$error) {
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element." WHERE rowid = ".$this->id;
+			$res = $this->db->query($sql);
+			if (!$res) {
 				$error++;
-				$this->errors[] = $this->db->lasterror();
+				$this->error = $this->db->lasterror();
+				$this->errors[] = $this->error;
+				dol_syslog(get_class($this)."::delete error ".$this->error, LOG_ERR);
 			}
 		}
 
-		if (!$error)
-		{
-			// Delete record into ECM index (Note that delete is also done when deleting files with the dol_delete_dir_recursive
-			$this->deleteEcmFiles();
+		// Delete record into ECM index and physically
+		if (!$error) {
+			$res = $this->deleteEcmFiles(0); // Deleting files physically is done later with the dol_delete_dir_recursive
+			if (!$res) {
+				$error++;
+			}
+		}
 
-			// Remove directory with files
-			$comref = dol_sanitizeFileName($this->ref);
-			if ($conf->commande->multidir_output[$this->entity] && !empty($this->ref))
-			{
-				$dir = $conf->commande->multidir_output[$this->entity]."/".$comref;
-				$file = $conf->commande->multidir_output[$this->entity]."/".$comref."/".$comref.".pdf";
-				if (file_exists($file))	// We must delete all files before deleting directory
-				{
+		if (!$error) {
+			// We remove directory
+			$ref = dol_sanitizeFileName($this->ref);
+			if ($conf->commande->multidir_output[$this->entity] && !empty($this->ref)) {
+				$dir = $conf->commande->multidir_output[$this->entity]."/".$ref;
+				$file = $dir."/".$ref.".pdf";
+				if (file_exists($file)) {
 					dol_delete_preview($this);
 
-					if (!dol_delete_file($file, 0, 0, 0, $this)) // For triggers
-					{
+					if (!dol_delete_file($file, 0, 0, 0, $this)) {
+						$this->error = 'ErrorFailToDeleteFile';
+						$this->errors[] = $this->error;
 						$this->db->rollback();
 						return 0;
 					}
 				}
-				if (file_exists($dir))
-				{
-					if (!dol_delete_dir_recursive($dir))
-					{
-						$this->error = $langs->trans("ErrorCanNotDeleteDir", $dir);
+				if (file_exists($dir)) {
+					$res = @dol_delete_dir_recursive($dir);
+					if (!$res) {
+						$this->error = 'ErrorFailToDeleteDir';
+						$this->errors[] = $this->error;
 						$this->db->rollback();
 						return 0;
 					}
@@ -3412,17 +3436,13 @@ class Commande extends CommonOrder
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
+			dol_syslog(get_class($this)."::delete ".$this->id." by ".$user->id, LOG_DEBUG);
 			$this->db->commit();
 			return 1;
 		} else {
-			foreach ($this->errors as $errmsg)
-			{
-				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-			}
 			$this->db->rollback();
-			return -1 * $error;
+			return -1;
 		}
 	}
 
@@ -3473,7 +3493,9 @@ class Commande extends CommonOrder
 
 				$generic_commande->statut = $obj->fk_statut;
 				$generic_commande->date_commande = $this->db->jdate($obj->date_commande);
+				$generic_commande->date = $this->db->jdate($obj->date_commande);
 				$generic_commande->date_livraison = $this->db->jdate($obj->delivery_date);
+				$generic_commande->delivery_date = $this->db->jdate($obj->delivery_date);
 
 				if ($generic_commande->hasDelay()) {
 					$response->nbtodolate++;
@@ -3529,44 +3551,47 @@ class Commande extends CommonOrder
 		global $langs, $conf;
 
 		$billedtext = '';
-		if (empty($donotshowbilled)) $billedtext .= ($billed ? ' - '.$langs->trans("Billed") : '');
+		if (empty($donotshowbilled)) $billedtext .= ($billed ? ' - '.$langs->transnoentitiesnoconv("Billed") : '');
+
+		$labelTooltip = '';
 
 		if ($status == self::STATUS_CANCELED) {
-			$labelStatus = $langs->trans('StatusOrderCanceled');
-			$labelStatusShort = $langs->trans('StatusOrderCanceledShort');
+			$labelStatus = $langs->transnoentitiesnoconv('StatusOrderCanceled');
+			$labelStatusShort = $langs->transnoentitiesnoconv('StatusOrderCanceledShort');
 			$statusType = 'status9';
 		} elseif ($status == self::STATUS_DRAFT) {
-			$labelStatus = $langs->trans('StatusOrderDraft');
-			$labelStatusShort = $langs->trans('StatusOrderDraftShort');
+			$labelStatus = $langs->transnoentitiesnoconv('StatusOrderDraft');
+			$labelStatusShort = $langs->transnoentitiesnoconv('StatusOrderDraftShort');
 			$statusType = 'status0';
 		} elseif ($status == self::STATUS_VALIDATED) {
-			$labelStatus = $langs->trans('StatusOrderValidated').$billedtext;
-			$labelStatusShort = $langs->trans('StatusOrderValidatedShort').$billedtext;
+			$labelStatus = $langs->transnoentitiesnoconv('StatusOrderValidated').$billedtext;
+			$labelStatusShort = $langs->transnoentitiesnoconv('StatusOrderValidatedShort').$billedtext;
 			$statusType = 'status1';
 		} elseif ($status == self::STATUS_SHIPMENTONPROCESS) {
-			$labelStatus = $langs->trans('StatusOrderSentShort').$billedtext;
-			$labelStatusShort = $langs->trans('StatusOrderSentShort').$billedtext;
+			$labelStatus = $langs->transnoentitiesnoconv('StatusOrderSent').$billedtext;
+			$labelStatusShort = $langs->transnoentitiesnoconv('StatusOrderSentShort').$billedtext;
+			$labelTooltip = $langs->transnoentitiesnoconv("StatusOrderSent").' - '.$langs->transnoentitiesnoconv("DateDeliveryPlanned").dol_print_date($this->date_livraison).$billedtext;
 			$statusType = 'status4';
 		} elseif ($status == self::STATUS_CLOSED && (!$billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
-			$labelStatus = $langs->trans('StatusOrderToBill');
-			$labelStatusShort = $langs->trans('StatusOrderToBillShort');
+			$labelStatus = $langs->transnoentitiesnoconv('StatusOrderToBill');
+			$labelStatusShort = $langs->transnoentitiesnoconv('StatusOrderToBillShort');
 			$statusType = 'status4';
 		} elseif ($status == self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
-			$labelStatus = $langs->trans('StatusOrderProcessed').$billedtext;
-			$labelStatusShort = $langs->trans('StatusOrderProcessed').$billedtext;
+			$labelStatus = $langs->transnoentitiesnoconv('StatusOrderProcessed').$billedtext;
+			$labelStatusShort = $langs->transnoentitiesnoconv('StatusOrderProcessedShort').$billedtext;
 			$statusType = 'status6';
 		} elseif ($status == self::STATUS_CLOSED && (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
-			$labelStatus = $langs->trans('StatusOrderDelivered');
-			$labelStatusShort = $langs->trans('StatusOrderDelivered');
+			$labelStatus = $langs->transnoentitiesnoconv('StatusOrderDelivered');
+			$labelStatusShort = $langs->transnoentitiesnoconv('StatusOrderDeliveredShort');
 			$statusType = 'status6';
 		} else {
-			$labelStatus = $langs->trans('Unknown');
+			$labelStatus = $langs->transnoentitiesnoconv('Unknown');
 			$labelStatusShort = '';
 			$statusType = '';
 			$mode = 0;
 		}
 
-		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
+		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode, '', array('tooltip' => $labelTooltip));
 	}
 
 
@@ -3609,7 +3634,10 @@ class Commande extends CommonOrder
 		$label = '';
 
 		if ($user->rights->commande->lire) {
-			$label = img_picto('', $this->picto).' <u>'.$langs->trans("Order").'</u>';
+			$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Order").'</u>';
+			if (isset($this->statut)) {
+				$label .= ' '.$this->getLibStatut(5);
+			}
 			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 			$label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.($this->ref_customer ? $this->ref_customer : $this->ref_client);
 			if (!empty($this->total_ht)) {
@@ -3621,8 +3649,11 @@ class Commande extends CommonOrder
 			if (!empty($this->total_ttc)) {
 				$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
 			}
-			if (isset($this->statut)) {
-				$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
+			if (!empty($this->date)) {
+				$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->date, 'dayhour');
+			}
+			if (!empty($this->delivery_date)) {
+				$label .= '<br><b>'.$langs->trans('DeliveryDate').':</b> '.dol_print_date($this->delivery_date, 'dayhour');
 			}
 		}
 
@@ -3893,7 +3924,9 @@ class Commande extends CommonOrder
 		if (!dol_strlen($modele)) {
 			$modele = 'einstein';
 
-			if ($this->modelpdf) {
+			if (!empty($this->model_pdf)) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($this->modelpdf)) {	// dperecated
 				$modele = $this->modelpdf;
 			} elseif (!empty($conf->global->COMMANDE_ADDON_PDF)) {
 				$modele = $conf->global->COMMANDE_ADDON_PDF;
@@ -3987,18 +4020,23 @@ class OrderLine extends CommonOrderLine
 	 */
 	public $commande_id;
 
-	// From llx_commandedet
 	public $fk_parent_line;
+
+	/**
+	 * @var int Id of invoice
+	 */
 	public $fk_facture;
 
 	/**
-	 * @var string Order lines label
+	 * @var string External ref
 	 */
-	public $label;
-
 	public $ref_ext;
 
 	public $fk_remise_except;
+
+	/**
+	 * @var int line rank
+	 */
 	public $rang = 0;
 	public $fk_fournprice;
 
@@ -4046,7 +4084,7 @@ class OrderLine extends CommonOrderLine
 		$sql .= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_localtax1, cd.total_localtax2, cd.total_ttc, cd.fk_product_fournisseur_price as fk_fournprice, cd.buy_price_ht as pa_ht, cd.rang, cd.special_code,';
 		$sql .= ' cd.fk_unit,';
 		$sql .= ' cd.fk_multicurrency, cd.multicurrency_code, cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc,';
-		$sql .= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc, p.tobatch as product_tobatch,';
+		$sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc, p.tobatch as product_tobatch,';
 		$sql .= ' cd.date_start, cd.date_end';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'commandedet as cd';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid';
@@ -4090,9 +4128,9 @@ class OrderLine extends CommonOrderLine
 			$this->rang = $objp->rang;
 
 			$this->ref = $objp->product_ref; // deprecated
-			$this->product_ref = $objp->product_ref;
-			$this->libelle = $objp->product_libelle; // deprecated
-			$this->product_label = $objp->product_libelle;
+
+			$this->product_ref      = $objp->product_ref;
+			$this->product_label    = $objp->product_label;
 			$this->product_desc     = $objp->product_desc;
 			$this->product_tobatch  = $objp->product_tobatch;
 			$this->fk_unit          = $objp->fk_unit;
diff --git a/htdocs/commande/class/commandestats.class.php b/htdocs/commande/class/commandestats.class.php
index 5af5fb23060..57f8147cd57 100644
--- a/htdocs/commande/class/commandestats.class.php
+++ b/htdocs/commande/class/commandestats.class.php
@@ -35,18 +35,18 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
  */
 class CommandeStats extends Stats
 {
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element;
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element;
 
-    public $socid;
-    public $userid;
+	public $socid;
+	public $userid;
 
-    public $from;
-    public $field;
-    public $where;
-    public $join;
+	public $from;
+	public $field;
+	public $where;
+	public $join;
 
 
 	/**
@@ -56,8 +56,8 @@ class CommandeStats extends Stats
 	 * @param 	int		$socid	    Id third party for filter. This value must be forced during the new to external user company if user is an external user.
 	 * @param 	string	$mode	    Option ('customer', 'supplier')
 	 * @param   int		$userid     Id user for filter (creation user)
-     * @param	int		$typentid   Id typent of thirdpary for filter
-     * @param	int		$categid    Id category of thirdpary for filter
+	 * @param	int		$typentid   Id typent of thirdpary for filter
+	 * @param	int		$categid    Id category of thirdpary for filter
 	 */
 	public function __construct($db, $socid, $mode, $userid = 0, $typentid = 0, $categid = 0)
 	{
@@ -66,9 +66,9 @@ class CommandeStats extends Stats
 		$this->db = $db;
 
 		$this->socid = ($socid > 0 ? $socid : 0);
-        $this->userid = $userid;
+		$this->userid = $userid;
 		$this->cachefilesuffix = $mode;
-        $this->join = '';
+		$this->join = '';
 
 		if ($mode == 'customer')
 		{
@@ -77,7 +77,7 @@ class CommandeStats extends Stats
 			$this->from_line = MAIN_DB_PREFIX.$object->table_element_line." as tl";
 			$this->field = 'total_ht';
 			$this->field_line = 'total_ht';
-			$this->where .= " c.fk_statut > 0"; // Not draft and not cancelled
+			//$this->where .= " c.fk_statut > 0"; // Not draft and not cancelled
 		} elseif ($mode == 'supplier')
 		{
 			$object = new CommandeFournisseur($this->db);
@@ -85,37 +85,37 @@ class CommandeStats extends Stats
 			$this->from_line = MAIN_DB_PREFIX.$object->table_element_line." as tl";
 			$this->field = 'total_ht';
 			$this->field_line = 'total_ht';
-			$this->where .= " c.fk_statut > 2"; // Only approved & ordered
+			//$this->where .= " c.fk_statut > 2"; // Only approved & ordered
 		}
 		//$this->where.= " AND c.fk_soc = s.rowid AND c.entity = ".$conf->entity;
-		$this->where .= ' AND c.entity IN ('.getEntity('commande').')';
+		$this->where .= ($this->where ? ' AND ' : '').'c.entity IN ('.getEntity('commande').')';
 
 		if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		if ($this->socid)
 		{
 			$this->where .= " AND c.fk_soc = ".$this->socid;
 		}
-        if ($this->userid > 0) $this->where .= ' AND c.fk_user_author = '.$this->userid;
+		if ($this->userid > 0) $this->where .= ' AND c.fk_user_author = '.$this->userid;
 
-        if ($typentid)
-        {
-            $this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = c.fk_soc';
-            $this->where .= ' AND s.fk_typent = '.$typentid;
-        }
+		if ($typentid)
+		{
+			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = c.fk_soc';
+			$this->where .= ' AND s.fk_typent = '.$typentid;
+		}
 
-        if ($categid)
-        {
-            $this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cats ON cats.fk_soc = c.fk_soc';
-            $this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as cat ON cat.rowid = cats.fk_categorie';
-            $this->where .= ' AND cat.rowid = '.$categid;
-        }
+		if ($categid)
+		{
+			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cats ON cats.fk_soc = c.fk_soc';
+			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as cat ON cat.rowid = cats.fk_categorie';
+			$this->where .= ' AND cat.rowid = '.$categid;
+		}
 	}
 
 	/**
 	 * Return orders number by month for a year
 	 *
 	 * @param	int		$year		Year to scan
-     *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 * @return	array				Array with number by month
 	 */
 	public function getNbByMonth($year, $format = 0)
@@ -125,11 +125,11 @@ class CommandeStats extends Stats
 		$sql = "SELECT date_format(c.date_commande,'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE c.date_commande BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		$res = $this->_getNbByMonth($year, $sql, $format);
 		return $res;
@@ -148,10 +148,10 @@ class CommandeStats extends Stats
 		$sql = "SELECT date_format(c.date_commande,'%Y') as dm, COUNT(*) as nb, SUM(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getNbByYear($sql);
 	}
@@ -160,7 +160,7 @@ class CommandeStats extends Stats
 	 * Return the orders amount by month for a year
 	 *
 	 * @param	int		$year		Year to scan
-     * @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 * @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 * @return	array				Array with amount by month
 	 */
 	public function getAmountByMonth($year, $format = 0)
@@ -170,11 +170,11 @@ class CommandeStats extends Stats
 		$sql = "SELECT date_format(c.date_commande,'%m') as dm, SUM(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE c.date_commande BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		$res = $this->_getAmountByMonth($year, $sql, $format);
 		return $res;
@@ -193,11 +193,11 @@ class CommandeStats extends Stats
 		$sql = "SELECT date_format(c.date_commande,'%m') as dm, AVG(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE c.date_commande BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getAverageByMonth($year, $sql);
 	}
@@ -214,10 +214,10 @@ class CommandeStats extends Stats
 		$sql = "SELECT date_format(c.date_commande,'%Y') as year, COUNT(*) as nb, SUM(c.".$this->field.") as total, AVG(".$this->field.") as avg";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY year";
-        $sql .= $this->db->order('year', 'DESC');
+		$sql .= $this->db->order('year', 'DESC');
 
 		return $this->_getAllByYear($sql);
 	}
@@ -226,7 +226,7 @@ class CommandeStats extends Stats
 	 *	Return nb, amount of predefined product for year
 	 *
 	 *	@param	int		$year			Year to scan
-     *  @param  int     $limit      	Limit
+	 *  @param  int     $limit      	Limit
 	 *	@return	array					Array of values
 	 */
 	public function getAllByProduct($year, $limit = 10)
@@ -236,14 +236,14 @@ class CommandeStats extends Stats
 		$sql = "SELECT product.ref, COUNT(product.ref) as nb, SUM(tl.".$this->field_line.") as total, AVG(tl.".$this->field_line.") as avg";
 		$sql .= " FROM ".$this->from.", ".$this->from_line.", ".MAIN_DB_PREFIX."product as product";
 		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " AND c.rowid = tl.fk_commande AND tl.fk_product = product.rowid";
-    	$sql .= " AND c.date_commande BETWEEN '".$this->db->idate(dol_get_first_day($year, 1, false))."' AND '".$this->db->idate(dol_get_last_day($year, 12, false))."'";
+		$sql .= " AND c.date_commande BETWEEN '".$this->db->idate(dol_get_first_day($year, 1, false))."' AND '".$this->db->idate(dol_get_last_day($year, 12, false))."'";
 		$sql .= " GROUP BY product.ref";
-        $sql .= $this->db->order('nb', 'DESC');
-        //$sql.= $this->db->plimit(20);
+		$sql .= $this->db->order('nb', 'DESC');
+		//$sql.= $this->db->plimit(20);
 
-        return $this->_getAllByProduct($sql, $limit);
+		return $this->_getAllByProduct($sql, $limit);
 	}
 }
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index f44813a4994..7df7dbea130 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('orders', 'sendings', 'companies'));
+$langs->loadLangs(array('orders', 'sendings', 'companies', 'bills'));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
@@ -53,11 +53,12 @@ if ($action == 'addcontact' && $user->rights->commande->creer)
 {
 	$result = $object->fetch($id);
 
-    if ($result > 0 && $id > 0)
-    {
-    	$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
-  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
-    }
+	if ($result > 0 && $id > 0)
+	{
+		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
+	}
 
 	if ($result >= 0)
 	{
@@ -79,7 +80,7 @@ elseif ($action == 'swapstatut' && $user->rights->commande->creer)
 {
 	if ($object->fetch($id))
 	{
-	    $result = $object->swapContactStatus(GETPOST('ligne'));
+		$result = $object->swapContactStatus(GETPOST('ligne'));
 	} else {
 		dol_print_error($db);
 	}
@@ -133,10 +134,10 @@ if ($id > 0 || !empty($ref))
 
 	if ($object->fetch($id, $ref) > 0)
 	{
-	    $object->fetch_thirdparty();
+		$object->fetch_thirdparty();
 
 		$head = commande_prepare_head($object);
-		dol_fiche_head($head, 'contact', $langs->trans("CustomerOrder"), -1, 'order');
+		print dol_get_fiche_head($head, 'contact', $langs->trans("CustomerOrder"), -1, 'order');
 
 
 		// Order card
@@ -150,45 +151,45 @@ if ($id > 0 || !empty($ref))
 		$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-	    // Project
-	    if (!empty($conf->projet->enabled))
-	    {
-	        $langs->load("projects");
-	        $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	        if ($user->rights->commande->creer)
-	        {
-	            if ($action != 'classify') {
-	            	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+		// Project
+		if (!empty($conf->projet->enabled))
+		{
+			$langs->load("projects");
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+			if ($user->rights->commande->creer)
+			{
+				if ($action != 'classify') {
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
-                }
-	            if ($action == 'classify') {
-	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-	                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-	                $morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref .= '</form>';
-	            } else {
-	                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-	        } else {
-	            if (!empty($object->fk_project)) {
-	                $proj = new Project($db);
-	                $proj->fetch($object->fk_project);
-	                $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	                $morehtmlref .= $proj->ref;
-	                $morehtmlref .= '</a>';
-	            } else {
-	                $morehtmlref .= '';
-	            }
-	        }
-	    }
+				}
+				if ($action == 'classify') {
+					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				if (!empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
+				} else {
+					$morehtmlref .= '';
+				}
+			}
+		}
 		$morehtmlref .= '</div>';
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<br>';
 
@@ -196,8 +197,8 @@ if ($id > 0 || !empty($ref))
 		$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
 		foreach ($dirtpls as $reldir)
 		{
-		    $res = @include dol_buildpath($reldir.'/contacts.tpl.php');
-		    if ($res) break;
+			$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
+			if ($res) break;
 		}
 	} else {
 		// Contact not found
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 27d38378bcb..f95f61b6025 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -37,7 +37,7 @@ if (!empty($conf->projet->enabled)) {
 }
 
 // Load translation files required by the page
-$langs->loadLangs(array('companies', 'other'));
+$langs->loadLangs(array('companies', 'other', 'bills'));
 
 $action		= GETPOST('action', 'aZ09');
 $confirm	= GETPOST('confirm');
@@ -100,14 +100,14 @@ if ($id > 0 || !empty($ref))
 		$upload_dir = $conf->commande->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
 
 		$head = commande_prepare_head($object);
-		dol_fiche_head($head, 'documents', $langs->trans('CustomerOrder'), -1, 'order');
+		print dol_get_fiche_head($head, 'documents', $langs->trans('CustomerOrder'), -1, 'order');
 
 		// Build file list
 		$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 		$totalsize = 0;
 		foreach ($filearray as $key => $file)
 		{
-		    $totalsize += $file['size'];
+			$totalsize += $file['size'];
 		}
 
 		// Order card
@@ -124,36 +124,36 @@ if ($id > 0 || !empty($ref))
 		// Project
 		if (!empty($conf->projet->enabled))
 		{
-		    $langs->load("projects");
-		    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		    if ($user->rights->commande->creer)
-		    {
-		        if ($action != 'classify') {
-		        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			$langs->load("projects");
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+			if ($user->rights->commande->creer)
+			{
+				if ($action != 'classify') {
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
 				}
-	            if ($action == 'classify') {
-	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-	                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-	                $morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref .= '</form>';
-	            } else {
-	                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-		    } else {
-		        if (!empty($object->fk_project)) {
-		            $proj = new Project($db);
-		            $proj->fetch($object->fk_project);
-		            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-		            $morehtmlref .= $proj->ref;
-		            $morehtmlref .= '</a>';
-		        } else {
-		            $morehtmlref .= '';
-		        }
-		    }
+				if ($action == 'classify') {
+					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				if (!empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
+				} else {
+					$morehtmlref .= '';
+				}
+			}
 		}
 		$morehtmlref .= '</div>';
 
@@ -175,7 +175,7 @@ if ($id > 0 || !empty($ref))
 
 		print "</div>\n";
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		$modulepart = 'commande';
 		$permission = $user->rights->commande->creer;
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 96476caeeed..4a18f96ddde 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -71,15 +71,15 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-    // Search customer orders
-    print '<form method="post" action="'.DOL_URL_ROOT.'/commande/list.php">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder nohover centpercent">';
-    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    print '<tr class="oddeven"><td>';
-    print $langs->trans("CustomerOrder").':</td><td><input type="text" class="flat" name="sall" size=18></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-    print "</table></div></form><br>\n";
+	// Search customer orders
+	print '<form method="post" action="'.DOL_URL_ROOT.'/commande/list.php">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder nohover centpercent">';
+	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("CustomerOrder").':</td><td><input type="text" class="flat" name="sall" size=18></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+	print "</table></div></form><br>\n";
 }
 
 
@@ -100,81 +100,81 @@ $sql .= " GROUP BY c.fk_statut";
 $resql = $db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
-    $i = 0;
+	$num = $db->num_rows($resql);
+	$i = 0;
 
-    $total = 0;
-    $totalinprocess = 0;
-    $dataseries = array();
-    $colorseries = array();
-    $vals = array();
-    // -1=Canceled, 0=Draft, 1=Validated, 2=Accepted/On process, 3=Closed (Sent/Received, billed or not)
-    while ($i < $num)
-    {
-        $row = $db->fetch_row($resql);
-        if ($row)
-        {
-            //if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))
-            {
-                if (!isset($vals[$row[1]])) $vals[$row[1]] = 0;
-                $vals[$row[1]] += $row[0];
-                $totalinprocess += $row[0];
-            }
-            $total += $row[0];
-        }
-        $i++;
-    }
-    $db->free($resql);
+	$total = 0;
+	$totalinprocess = 0;
+	$dataseries = array();
+	$colorseries = array();
+	$vals = array();
+	// -1=Canceled, 0=Draft, 1=Validated, 2=Accepted/On process, 3=Closed (Sent/Received, billed or not)
+	while ($i < $num)
+	{
+		$row = $db->fetch_row($resql);
+		if ($row)
+		{
+			//if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))
+			{
+				if (!isset($vals[$row[1]])) $vals[$row[1]] = 0;
+				$vals[$row[1]] += $row[0];
+				$totalinprocess += $row[0];
+			}
+			$total += $row[0];
+		}
+		$i++;
+	}
+	$db->free($resql);
 
-    include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
+	include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
 
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder nohover centpercent">';
-    print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CustomersOrders").'</th></tr>'."\n";
-    $listofstatus = array(0, 1, 2, 3, -1);
-    foreach ($listofstatus as $status)
-    {
-    	$dataseries[] = array($commandestatic->LibStatut($status, 0, 1, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
-    	if ($status == Commande::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
-    	if ($status == Commande::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;
-    	if ($status == Commande::STATUS_SHIPMENTONPROCESS) $colorseries[$status] = $badgeStatus4;
-    	if ($status == Commande::STATUS_CLOSED && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) $colorseries[$status] = $badgeStatus6;
-    	if ($status == Commande::STATUS_CLOSED && (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) $colorseries[$status] = $badgeStatus6;
-    	if ($status == Commande::STATUS_CANCELED) $colorseries[$status] = $badgeStatus9;
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder nohover centpercent">';
+	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CustomersOrders").'</th></tr>'."\n";
+	$listofstatus = array(0, 1, 2, 3, -1);
+	foreach ($listofstatus as $status)
+	{
+		$dataseries[] = array($commandestatic->LibStatut($status, 0, 1, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
+		if ($status == Commande::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
+		if ($status == Commande::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;
+		if ($status == Commande::STATUS_SHIPMENTONPROCESS) $colorseries[$status] = $badgeStatus4;
+		if ($status == Commande::STATUS_CLOSED && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) $colorseries[$status] = $badgeStatus6;
+		if ($status == Commande::STATUS_CLOSED && (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) $colorseries[$status] = $badgeStatus6;
+		if ($status == Commande::STATUS_CANCELED) $colorseries[$status] = $badgeStatus9;
 
-    	if (empty($conf->use_javascript_ajax))
-    	{
-    		print '<tr class="oddeven">';
-    		print '<td>'.$commandestatic->LibStatut($status, 0, 0, 1).'</td>';
-    		print '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).' ';
-    		print $commandestatic->LibStatut($status, 0, 3, 1);
-    		print '</a></td>';
-    		print "</tr>\n";
-    	}
-    }
-    if ($conf->use_javascript_ajax)
-    {
-        print '<tr class="impair"><td align="center" colspan="2">';
+		if (empty($conf->use_javascript_ajax))
+		{
+			print '<tr class="oddeven">';
+			print '<td>'.$commandestatic->LibStatut($status, 0, 0, 1).'</td>';
+			print '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).' ';
+			print $commandestatic->LibStatut($status, 0, 3, 1);
+			print '</a></td>';
+			print "</tr>\n";
+		}
+	}
+	if ($conf->use_javascript_ajax)
+	{
+		print '<tr class="impair"><td align="center" colspan="2">';
 
-        include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
-        $dolgraph = new DolGraph();
-        $dolgraph->SetData($dataseries);
-        $dolgraph->SetDataColor(array_values($colorseries));
-        $dolgraph->setShowLegend(2);
-        $dolgraph->setShowPercent(1);
-        $dolgraph->SetType(array('pie'));
-        $dolgraph->setHeight('200');
-        $dolgraph->draw('idgraphstatus');
-        print $dolgraph->show($total ? 0 : 1);
+		include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+		$dolgraph = new DolGraph();
+		$dolgraph->SetData($dataseries);
+		$dolgraph->SetDataColor(array_values($colorseries));
+		$dolgraph->setShowLegend(2);
+		$dolgraph->setShowPercent(1);
+		$dolgraph->SetType(array('pie'));
+		$dolgraph->setHeight('200');
+		$dolgraph->draw('idgraphstatus');
+		print $dolgraph->show($total ? 0 : 1);
 
-        print '</td></tr>';
-    }
+		print '</td></tr>';
+	}
 
-    //if ($totalinprocess != $total)
-    print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
-    print "</table></div><br>";
+	//if ($totalinprocess != $total)
+	print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
+	print "</table></div><br>";
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
@@ -184,9 +184,9 @@ if ($resql)
 if (!empty($conf->commande->enabled))
 {
 	$sql = "SELECT c.rowid, c.ref, s.nom as name, s.rowid as socid";
-    $sql .= ", s.client";
-    $sql .= ", s.code_client";
-    $sql .= ", s.canvas";
+	$sql .= ", s.client";
+	$sql .= ", s.code_client";
+	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -199,7 +199,7 @@ if (!empty($conf->commande->enabled))
 	$resql = $db->query($sql);
 	if ($resql)
 	{
-        print '<div class="div-table-responsive-no-min">';
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print '<th colspan="2">'.$langs->trans("DraftOrders").'</th></tr>';
@@ -212,8 +212,8 @@ if (!empty($conf->commande->enabled))
 			{
 				$obj = $db->fetch_object($resql);
 
-                $commandestatic->id = $obj->rowid;
-                $commandestatic->ref = $obj->ref;
+				$commandestatic->id = $obj->rowid;
+				$commandestatic->ref = $obj->ref;
 
 				$companystatic->id = $obj->socid;
 				$companystatic->name = $obj->name;
@@ -224,10 +224,10 @@ if (!empty($conf->commande->enabled))
 				print '<tr class="oddeven">';
 				print '<td class="nowrap">';
 				print $commandestatic->getNomUrl(1);
-                print "</td>";
-                print '<td class="nowrap">';
+				print "</td>";
+				print '<td class="nowrap">';
 				print $companystatic->getNomUrl(1, 'company', 16);
-                print '</td></tr>';
+				print '</td></tr>';
 				$i++;
 			}
 		} else {
@@ -266,7 +266,7 @@ $sql .= $db->plimit($max, 0);
 $resql = $db->query($sql);
 if ($resql)
 {
-    print '<div class="div-table-responsive-no-min">';
+	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<th colspan="4">'.$langs->trans("LastModifiedOrders", $max).'</th></tr>';
@@ -310,8 +310,8 @@ if ($resql)
 			print '</td>';
 
 			print '<td class="nowrap">';
-            print $companystatic->getNomUrl(1, 'company', 16);
-            print '</td>';
+			print $companystatic->getNomUrl(1, 'company', 16);
+			print '</td>';
 			print '<td>'.dol_print_date($db->jdate($obj->datem), 'day').'</td>';
 			print '<td class="right">'.$commandestatic->LibStatut($obj->fk_statut, $obj->facture, 3).'</td>';
 			print '</tr>';
@@ -329,9 +329,9 @@ $max = 10;
 if (!empty($conf->commande->enabled))
 {
 	$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, c.facture, c.date_commande as date, s.nom as name, s.rowid as socid";
-    $sql .= ", s.client";
-    $sql .= ", s.code_client";
-    $sql .= ", s.canvas";
+	$sql .= ", s.client";
+	$sql .= ", s.code_client";
+	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -347,7 +347,7 @@ if (!empty($conf->commande->enabled))
 	{
 		$num = $db->num_rows($resql);
 
-        print '<div class="div-table-responsive-no-min">';
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print '<th colspan="4">'.$langs->trans("OrdersToProcess").' <a href="'.DOL_URL_ROOT.'/commande/list.php?search_status='.Commande::STATUS_VALIDATED.'"><span class="badge">'.$num.'</span></a></th></tr>';
@@ -389,10 +389,10 @@ if (!empty($conf->commande->enabled))
 				print '</td>';
 
 				print '<td class="nowrap">';
-                print $companystatic->getNomUrl(1, 'company', 24);
-                print '</td>';
+				print $companystatic->getNomUrl(1, 'company', 24);
+				print '</td>';
 
-                print '<td class="right">'.dol_print_date($db->jdate($obj->date), 'day').'</td>'."\n";
+				print '<td class="right">'.dol_print_date($db->jdate($obj->date), 'day').'</td>'."\n";
 
 				print '<td class="right">'.$commandestatic->LibStatut($obj->fk_statut, $obj->facture, 3).'</td>';
 
@@ -414,9 +414,9 @@ if (!empty($conf->commande->enabled))
 if (!empty($conf->commande->enabled))
 {
 	$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, c.facture, c.date_commande as date, s.nom as name, s.rowid as socid";
-    $sql .= ", s.client";
-    $sql .= ", s.code_client";
-    $sql .= ", s.canvas";
+	$sql .= ", s.client";
+	$sql .= ", s.code_client";
+	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -432,7 +432,7 @@ if (!empty($conf->commande->enabled))
 	{
 		$num = $db->num_rows($resql);
 
-        print '<div class="div-table-responsive-no-min">';
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print '<th colspan="4">'.$langs->trans("OnProcessOrders").' <a href="'.DOL_URL_ROOT.'/commande/list.php?search_status='.Commande::STATUS_ACCEPTED.'"><span class="badge">'.$num.'</span></a></th></tr>';
diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php
index 9b45bf66312..117afab2398 100644
--- a/htdocs/commande/info.php
+++ b/htdocs/commande/info.php
@@ -34,7 +34,7 @@ if (!empty($conf->projet->enabled)) {
 if (!$user->rights->commande->lire)	accessforbidden();
 
 // Load translation files required by the page
-$langs->loadLangs(array('orders', 'sendings'));
+$langs->loadLangs(array('orders', 'sendings', 'bills'));
 
 $socid = 0;
 $comid = GETPOST("id", 'int');
@@ -48,8 +48,8 @@ $result = restrictedArea($user, 'commande', $comid, '');
 $object = new Commande($db);
 if (!$object->fetch($id, $ref) > 0)
 {
-    dol_print_error($db);
-    exit;
+	dol_print_error($db);
+	exit;
 }
 
 
@@ -65,7 +65,7 @@ $object->fetch_thirdparty();
 $object->info($object->id);
 
 $head = commande_prepare_head($object);
-dol_fiche_head($head, 'info', $langs->trans("CustomerOrder"), -1, 'order');
+print dol_get_fiche_head($head, 'info', $langs->trans("CustomerOrder"), -1, 'order');
 
 // Order card
 
@@ -80,36 +80,36 @@ $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->ge
 // Project
 if (!empty($conf->projet->enabled))
 {
-    $langs->load("projects");
-    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-    if ($user->rights->commande->creer)
-    {
-        if ($action != 'classify') {
-            //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-            $morehtmlref .= ' : ';
-        }
-        if ($action == 'classify') {
-            //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-            $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-            $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-            $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-            $morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-            $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-            $morehtmlref .= '</form>';
-        } else {
-            $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
-        }
-    } else {
-        if (!empty($object->fk_project)) {
-            $proj = new Project($db);
-            $proj->fetch($object->fk_project);
-            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-            $morehtmlref .= $proj->ref;
-            $morehtmlref .= '</a>';
-        } else {
-            $morehtmlref .= '';
-        }
-    }
+	$langs->load("projects");
+	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+	if ($user->rights->commande->creer)
+	{
+		if ($action != 'classify') {
+			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			$morehtmlref .= ' : ';
+		}
+		if ($action == 'classify') {
+			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+			$morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			$morehtmlref .= '</form>';
+		} else {
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
+		}
+	} else {
+		if (!empty($object->fk_project)) {
+			$proj = new Project($db);
+			$proj->fetch($object->fk_project);
+			$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+			$morehtmlref .= $proj->ref;
+			$morehtmlref .= '</a>';
+		} else {
+			$morehtmlref .= '';
+		}
+	}
 }
 $morehtmlref .= '</div>';
 
@@ -127,7 +127,7 @@ print '</td></tr></table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index ad422a8b930..72a5e179f25 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -46,7 +46,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("orders", 'sendings', 'deliveries', 'companies', 'compta', 'bills'));
+$langs->loadLangs(array("orders", 'sendings', 'deliveries', 'companies', 'compta', 'bills', 'stocks'));
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
@@ -55,10 +55,14 @@ $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'orderlist';
 
-$search_dateorder_start = dol_mktime(0, 0, 0, GETPOST('search_dateorder_startmonth', 'int'), GETPOST('search_dateorder_startday', 'int'), GETPOST('search_dateorder_startyear', 'int'));
-$search_dateorder_end = dol_mktime(23, 59, 59, GETPOST('search_dateorder_endmonth', 'int'), GETPOST('search_dateorder_endday', 'int'), GETPOST('search_dateorder_endyear', 'int'));
-$search_datedelivery_start = dol_mktime(0, 0, 0, GETPOST('search_datedelivery_startmonth', 'int'), GETPOST('search_datedelivery_startday', 'int'), GETPOST('search_datedelivery_startyear', 'int'));
-$search_datedelivery_end = dol_mktime(23, 59, 59, GETPOST('search_datedelivery_endmonth', 'int'), GETPOST('search_datedelivery_endday', 'int'), GETPOST('search_datedelivery_endyear', 'int'));
+$search_datecloture_start = GETPOST('search_datecloture_start', 'int');
+if (empty($search_datecloture_start)) $search_datecloture_start = dol_mktime(0, 0, 0, GETPOST('search_datecloture_startmonth', 'int'), GETPOST('search_datecloture_startday', 'int'), GETPOST('search_datecloture_startyear', 'int'));
+$search_datecloture_end = GETPOST('search_datecloture_end', 'int');
+if (empty($search_datecloture_end)) $search_datecloture_end = dol_mktime(23, 59, 59, GETPOST('search_datecloture_endmonth', 'int'), GETPOST('search_datecloture_endday', 'int'), GETPOST('search_datecloture_endyear', 'int'));
+$search_dateorder_start = dol_mktime(0, 0, 0, GETPOST('search_dateorder_start_month', 'int'), GETPOST('search_dateorder_start_day', 'int'), GETPOST('search_dateorder_start_year', 'int'));
+$search_dateorder_end = dol_mktime(23, 59, 59, GETPOST('search_dateorder_end_month', 'int'), GETPOST('search_dateorder_end_day', 'int'), GETPOST('search_dateorder_end_year', 'int'));
+$search_datedelivery_start = dol_mktime(0, 0, 0, GETPOST('search_datedelivery_start_month', 'int'), GETPOST('search_datedelivery_start_day', 'int'), GETPOST('search_datedelivery_start_year', 'int'));
+$search_datedelivery_end = dol_mktime(23, 59, 59, GETPOST('search_datedelivery_end_month', 'int'), GETPOST('search_datedelivery_end_day', 'int'), GETPOST('search_datedelivery_end_year', 'int'));
 $search_product_category = GETPOST('search_product_category', 'int');
 $search_ref = GETPOST('search_ref', 'alpha') != '' ?GETPOST('search_ref', 'alpha') : GETPOST('sref', 'alpha');
 $search_ref_customer = GETPOST('search_ref_customer', 'alpha');
@@ -90,6 +94,8 @@ $search_btn = GETPOST('button_search', 'alpha');
 $search_remove_btn = GETPOST('button_removefilter', 'alpha');
 $search_project_ref = GETPOST('search_project_ref', 'alpha');
 $search_project = GETPOST('search_project', 'alpha');
+$search_shippable = GETPOST('search_shippable', 'aZ09');
+
 
 // Security check
 $id = (GETPOST('orderid') ?GETPOST('orderid', 'int') : GETPOST('id', 'int'));
@@ -103,13 +109,15 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1 || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortfield) $sortfield = 'c.ref';
 if (!$sortorder) $sortorder = 'DESC';
 
+$show_shippable_command = GETPOST('show_shippable_command', 'aZ09');
+
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new Commande($db);
 $hookmanager->initHooks(array('orderlist'));
@@ -134,44 +142,39 @@ if (empty($user->socid)) $fieldstosearchall["c.note_private"] = "NotePrivate";
 
 $checkedtypetiers = 0;
 $arrayfields = array(
-	'c.ref'=>array('label'=>"Ref", 'checked'=>1),
-	'c.ref_client'=>array('label'=>"RefCustomerOrder", 'checked'=>1),
-    'p.ref'=>array('label'=>"ProjectRef", 'checked'=>1, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1)),
-    'p.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1)),
-    's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),
-	's.town'=>array('label'=>"Town", 'checked'=>1),
-	's.zip'=>array('label'=>"Zip", 'checked'=>1),
-	'state.nom'=>array('label'=>"StateShort", 'checked'=>0),
-	'country.code_iso'=>array('label'=>"Country", 'checked'=>0),
-	'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers),
-	'c.date_commande'=>array('label'=>"OrderDateShort", 'checked'=>1),
-	'c.date_delivery'=>array('label'=>"DateDeliveryPlanned", 'checked'=>1, 'enabled'=>empty($conf->global->ORDER_DISABLE_DELIVERY_DATE)),
-	'c.total_ht'=>array('label'=>"AmountHT", 'checked'=>1),
-	'c.total_vat'=>array('label'=>"AmountVAT", 'checked'=>0),
-	'c.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0),
-	'c.multicurrency_code'=>array('label'=>'Currency', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
-	'c.multicurrency_tx'=>array('label'=>'CurrencyRate', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
-	'c.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
-	'c.multicurrency_total_vat'=>array('label'=>'MulticurrencyAmountVAT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
-	'c.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
-	'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>10),
-	'c.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
-	'c.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
-    'c.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>500),
-	'c.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'position'=>510, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PUBLIC_NOTES))),
-	'c.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'position'=>511, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PRIVATE_NOTES))),
-	'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
-	'c.facture'=>array('label'=>"Billed", 'checked'=>1, 'position'=>1000, 'enabled'=>(empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)))
+	'c.ref'=>array('label'=>"Ref", 'checked'=>1, 'position'=>5),
+	'c.ref_client'=>array('label'=>"RefCustomerOrder", 'checked'=>-1, 'position'=>10),
+	'p.ref'=>array('label'=>"ProjectRef", 'checked'=>1, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1), 'position'=>20),
+	'p.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1), 'position'=>25),
+	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1, 'position'=>30),
+	's.town'=>array('label'=>"Town", 'checked'=>1, 'position'=>35),
+	's.zip'=>array('label'=>"Zip", 'checked'=>1, 'position'=>40),
+	'state.nom'=>array('label'=>"StateShort", 'checked'=>0, 'position'=>45),
+	'country.code_iso'=>array('label'=>"Country", 'checked'=>0, 'position'=>50),
+	'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers, 'position'=>55),
+	'c.date_commande'=>array('label'=>"OrderDateShort", 'checked'=>1, 'position'=>60),
+	'c.date_delivery'=>array('label'=>"DateDeliveryPlanned", 'checked'=>1, 'enabled'=>empty($conf->global->ORDER_DISABLE_DELIVERY_DATE), 'position'=>65),
+	'c.total_ht'=>array('label'=>"AmountHT", 'checked'=>1, 'position'=>75),
+	'c.total_vat'=>array('label'=>"AmountVAT", 'checked'=>0, 'position'=>80),
+	'c.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0, 'position'=>85),
+	'c.multicurrency_code'=>array('label'=>'Currency', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>90),
+	'c.multicurrency_tx'=>array('label'=>'CurrencyRate', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>95),
+	'c.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>100),
+	'c.multicurrency_total_vat'=>array('label'=>'MulticurrencyAmountVAT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>105),
+	'c.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>110),
+	'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>10, 'position'=>115),
+	'c.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500, 'position'=>120),
+	'c.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500, 'position'=>125),
+	'c.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>500, 'position'=>130),
+	'c.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'position'=>510, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PUBLIC_NOTES)), 'position'=>135),
+	'c.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'position'=>511, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PRIVATE_NOTES)), 'position'=>140),
+	'c.facture'=>array('label'=>"Billed", 'checked'=>1, 'position'=>990, 'enabled'=>(empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)), 'position'=>145),
+	'shippable'=>array('label'=>"Shippable", 'checked'=>1, 'position'=>995, 'enabled'=>(!empty($conf->expedition->enabled)), 'position'=>150),
+	'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000, 'position'=>155)
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
@@ -230,6 +233,8 @@ if (empty($reshook))
 		$toselect = '';
 		$search_array_options = array();
 		$search_categ_cus = 0;
+		$search_datecloture_start = '';
+		$search_datecloture_end = '';
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
 	 || GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
@@ -336,6 +341,8 @@ if ($search_status <> '')
 	}
 }
 
+if ($search_datecloture_start)               $sql .= " AND c.date_cloture >= '".$db->idate($search_datecloture_start)."'";
+if ($search_datecloture_end)                 $sql .= " AND c.date_cloture <= '".$db->idate($search_datecloture_end)."'";
 if ($search_dateorder_start)                 $sql .= " AND c.date_commande >= '".$db->idate($search_dateorder_start)."'";
 if ($search_dateorder_end)                   $sql .= " AND c.date_commande <= '".$db->idate($search_dateorder_end)."'";
 if ($search_datedelivery_start)              $sql .= " AND c.date_livraison >= '".$db->idate($search_datedelivery_start)."'";
@@ -439,10 +446,12 @@ if ($resql)
 	if ($sall)						$param .= '&sall='.urlencode($sall);
 	if ($socid > 0)					$param .= '&socid='.urlencode($socid);
 	if ($search_status != '')		$param .= '&search_status='.urlencode($search_status);
-	if ($search_dateorder_start)    $param .= '&search_dateorder_start='.urlencode($search_dateorder_start);
-	if ($search_dateorder_end)      $param .= '&search_dateorder_end='.urlencode($search_dateorder_end);
-	if ($search_datedelivery_start) $param .= '&search_datedelivery_start='.urlencode($search_datedelivery_start);
-	if ($search_datedelivery_end)   $param .= '&search_datedelivery_end='.urlencode($search_datedelivery_end);
+	if ($search_datecloture_start)  $param .= '&search_datecloture_start='.urlencode($search_datecloture_start);
+	if ($search_datecloture_end)    $param .= '&search_datecloture_end='.urlencode($search_datecloture_end);
+	if ($search_dateorder_start) 	$param .= '&search_dateorder_start_day='.dol_print_date($search_dateorder_start, '%d').'&search_dateorder_start_month='.dol_print_date($search_dateorder_start, '%m').'&search_dateorder_start_year='.dol_print_date($search_dateorder_start, '%Y');
+	if ($search_dateorder_end) 		$param .= '&search_dateorder_end_day='.dol_print_date($search_dateorder_end, '%d').'&search_dateorder_end_month='.dol_print_date($search_dateorder_end, '%m').'&search_dateorder_end_year='.dol_print_date($search_dateorder_end, '%Y');
+	if ($search_datedelivery_start) $param .= '&search_datedelivery_start_day='.dol_print_date($search_datedelivery_start, '%d').'&search_datedelivery_start_month='.dol_print_date($search_datedelivery_start, '%m').'&search_datedelivery_start_year='.dol_print_date($search_datedelivery_start, '%Y');
+	if ($search_datedelivery_end) 	$param .= '&search_datedelivery_end_day='.dol_print_date($search_datedelivery_end, '%d').'&search_datedelivery_end_month='.dol_print_date($search_datedelivery_end, '%m').'&search_datedelivery_end_year='.dol_print_date($search_datedelivery_end, '%Y');
 	if ($search_ref)      			$param .= '&search_ref='.urlencode($search_ref);
 	if ($search_company)  			$param .= '&search_company='.urlencode($search_company);
 	if ($search_ref_customer)		$param .= '&search_ref_customer='.urlencode($search_ref_customer);
@@ -478,7 +487,7 @@ if ($resql)
 		'generate_doc'=>$langs->trans("ReGeneratePDF"),
 		'builddoc'=>$langs->trans("PDFMerge"),
 		'cancelorders'=>$langs->trans("Cancel"),
-	    'presend'=>$langs->trans("SendByMail"),
+		'presend'=>$langs->trans("SendByMail"),
 	);
 	if ($user->rights->facture->creer) $arrayofmassactions['createbills'] = $langs->trans("CreateInvoiceForThisCustomer");
 	if ($user->rights->commande->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
@@ -552,7 +561,7 @@ if ($resql)
 		print '<br>';
 		print '<div class="center">';
 		print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('CreateInvoiceForThisCustomer').'">  ';
-		print '<input type="submit" class="button" id="cancel" name="cancel" value="'.$langs->trans('Cancel').'">';
+		print '<input type="submit" class="button button-cancel" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 		print '<br>';
 	}
@@ -583,7 +592,7 @@ if ($resql)
 	 	$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -592,7 +601,7 @@ if ($resql)
 		$moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter .= '</div>';
 	}
-	if (!empty($conf->categorie->enabled))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -660,7 +669,7 @@ if ($resql)
 	// Project title
 	if (!empty($arrayfields['p.title']['checked']))
 	{
-	    print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_project" value="'.dol_escape_htmltag($search_project).'"></td>';
+		print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_project" value="'.dol_escape_htmltag($search_project).'"></td>';
 	}
 	// Thirpdarty
 	if (!empty($arrayfields['s.nom']['checked']))
@@ -670,9 +679,9 @@ if ($resql)
 		print '</td>';
 	}
 	// Town
-	if (!empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_town" value="'.$search_town.'"></td>';
+	if (!empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';
 	// Zip
-	if (!empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.$search_zip.'"></td>';
+	if (!empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.dol_escape_htmltag($search_zip).'"></td>';
 	// State
 	if (!empty($arrayfields['state.nom']['checked']))
 	{
@@ -699,10 +708,10 @@ if ($resql)
 	{
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
-		print $form->selectDate($search_dateorder_start ? $search_dateorder_start : -1, 'search_dateorder_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+		print $form->selectDate($search_dateorder_start ? $search_dateorder_start : -1, 'search_dateorder_start_', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 		print '</div>';
 		print '<div class="nowrap">';
-		print $form->selectDate($search_dateorder_end ? $search_dateorder_end : -1, 'search_dateorder_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+		print $form->selectDate($search_dateorder_end ? $search_dateorder_end : -1, 'search_dateorder_end_', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 		print '</div>';
 		print '</td>';
 	}
@@ -710,10 +719,10 @@ if ($resql)
 	{
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
-		print $form->selectDate($search_datedelivery_start ? $search_datedelivery_start : -1, 'search_datedelivery_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+		print $form->selectDate($search_datedelivery_start ? $search_datedelivery_start : -1, 'search_datedelivery_start_', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 		print '</div>';
 		print '<div class="nowrap">';
-		print $form->selectDate($search_datedelivery_end ? $search_datedelivery_end : -1, 'search_datedelivery_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+		print $form->selectDate($search_datedelivery_end ? $search_datedelivery_end : -1, 'search_datedelivery_end_', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 		print '</div>';
 		print '</td>';
 	}
@@ -801,7 +810,13 @@ if ($resql)
 	// Date cloture
 	if (!empty($arrayfields['c.date_cloture']['checked']))
 	{
-		print '<td class="liste_titre">';
+		print '<td class="liste_titre center">';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_datecloture_start ? $search_datecloture_start : -1, 'search_datecloture_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+		print '</div>';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_datecloture_end ? $search_datecloture_end : -1, 'search_datecloture_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+		print '</div>';
 		print '</td>';
 	}
 	// Note public
@@ -816,10 +831,30 @@ if ($resql)
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
+	// Shippable
+	if (!empty($arrayfields['shippable']['checked']))
+	{
+		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
+		//print $form->selectyesno('search_shippable', $search_shippable, 1, 0, 1, 1);
+		if (!empty($conf->global->ORDER_SHIPABLE_STATUS_DISABLED_BY_DEFAULT)) {
+			print '<input type="checkbox" name="show_shippable_command" value="1"'.($show_shippable_command ? ' checked' : '').'>';
+			print $langs->trans('ShowShippableStatus');
+		} else {
+			$show_shippable_command = 1;
+		}
+		print '</td>';
+	}
+	// Status billed
+	if (!empty($arrayfields['c.facture']['checked']))
+	{
+		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
+		print $form->selectyesno('search_billed', $search_billed, 1, 0, 1, 1);
+		print '</td>';
+	}
 	// Status
 	if (!empty($arrayfields['c.fk_statut']['checked']))
 	{
-		print '<td class="liste_titre maxwidthonsmartphone right">';
+		print '<td class="liste_titre maxwidthonsmartphone center">';
 		$liststatus = array(
 			Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraftShort"),
 			Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"),
@@ -828,14 +863,7 @@ if ($resql)
 			-3=>$langs->trans("StatusOrderValidatedShort").'+'.$langs->trans("StatusOrderSentShort").'+'.$langs->trans("StatusOrderDelivered"),
 			Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceledShort")
 		);
-		print $form->selectarray('search_status', $liststatus, $search_status, -4, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
-		print '</td>';
-	}
-	// Status billed
-	if (!empty($arrayfields['c.facture']['checked']))
-	{
-		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
-		print $form->selectyesno('search_billed', $search_billed, 1, 0, 1);
+		print $form->selectarray('search_status', $liststatus, $search_status, -4, 0, 0, '', 0, 0, 0, '', 'maxwidth100', 1);
 		print '</td>';
 	}
 	// Action column
@@ -850,8 +878,8 @@ if ($resql)
 	print '<tr class="liste_titre">';
 	if (!empty($arrayfields['c.ref']['checked']))            print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], 'c.ref', '', $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['c.ref_client']['checked']))     print_liste_field_titre($arrayfields['c.ref_client']['label'], $_SERVER["PHP_SELF"], 'c.ref_client', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.ref']['checked'])) 	          print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.title']['checked'])) 	      print_liste_field_titre($arrayfields['p.title']['label'], $_SERVER["PHP_SELF"], "p.title", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['p.ref']['checked'])) 	         print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['p.title']['checked'])) 	     print_liste_field_titre($arrayfields['p.title']['label'], $_SERVER["PHP_SELF"], "p.title", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['s.nom']['checked']))            print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], 's.nom', '', $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder);
@@ -881,14 +909,16 @@ if ($resql)
 	if (!empty($arrayfields['c.date_cloture']['checked']))       print_liste_field_titre($arrayfields['c.date_cloture']['label'], $_SERVER["PHP_SELF"], "c.date_cloture", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
 	if (!empty($arrayfields['c.note_public']['checked'])) print_liste_field_titre($arrayfields['c.note_public']['label'], $_SERVER["PHP_SELF"], "c.note_public", "", $param, '', $sortfield, $sortorder, 'right ');
 	if (!empty($arrayfields['c.note_private']['checked'])) print_liste_field_titre($arrayfields['c.note_private']['label'], $_SERVER["PHP_SELF"], "c.note_private", "", $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($arrayfields['c.fk_statut']['checked'])) print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
+	if (!empty($arrayfields['shippable']['checked']))   print_liste_field_titre($arrayfields['shippable']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($arrayfields['c.facture']['checked']))   print_liste_field_titre($arrayfields['c.facture']['label'], $_SERVER["PHP_SELF"], 'c.facture', '', $param, '', $sortfield, $sortorder, 'center ');
+	if (!empty($arrayfields['c.fk_statut']['checked'])) print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, '', $sortfield, $sortorder, 'center ');
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ');
 	print '</tr>'."\n";
 
 	$total = 0;
 	$subtotal = 0;
 	$productstat_cache = array();
+	$productstat_cachevirtual = array();
 	$getNomUrl_cache = array();
 
 	$generic_commande = new Commande($db);
@@ -906,13 +936,13 @@ if ($resql)
 		$text_warning = '';
 		$nbprod = 0;
 
-        $companystatic->id = $obj->socid;
+		$companystatic->id = $obj->socid;
 		$companystatic->code_client = $obj->code_client;
 		$companystatic->name = $obj->name;
 		$companystatic->client = $obj->client;
 		$companystatic->email = $obj->email;
 		if (!isset($getNomUrl_cache[$obj->socid])) {
-		    $getNomUrl_cache[$obj->socid] = $companystatic->getNomUrl(1, 'customer');
+			$getNomUrl_cache[$obj->socid] = $companystatic->getNomUrl(1, 'customer');
 		}
 
 		$generic_commande->id = $obj->rowid;
@@ -920,7 +950,8 @@ if ($resql)
 		$generic_commande->statut = $obj->fk_statut;
 		$generic_commande->billed = $obj->billed;
 		$generic_commande->date = $db->jdate($obj->date_commande);
-		$generic_commande->date_livraison = $db->jdate($obj->date_delivery);
+		$generic_commande->date_livraison = $db->jdate($obj->date_delivery); // deprecated
+		$generic_commande->delivery_date = $db->jdate($obj->date_delivery);
 		$generic_commande->ref_client = $obj->ref_client;
 		$generic_commande->total_ht = $obj->total_ht;
 		$generic_commande->total_tva = $obj->total_tva;
@@ -938,112 +969,8 @@ if ($resql)
 		if (!empty($arrayfields['c.ref']['checked']))
 		{
 			print '<td class="nowraponall">';
-
-			$generic_commande->getLinesArray(); // This set ->lines
-
 			print $generic_commande->getNomUrl(1, ($search_status != 2 ? 0 : $obj->fk_statut), 0, 0, 0, 1, 1);
 
-			// Show shippable Icon (create subloop, so may be slow)
-			if ($conf->stock->enabled)
-			{
-				$langs->load("stocks");
-				if (($obj->fk_statut > 0) && ($obj->fk_statut < 3))
-				{
-					$numlines = count($generic_commande->lines); // Loop on each line of order
-					for ($lig = 0; $lig < $numlines; $lig++)
-					{
-						if ($generic_commande->lines[$lig]->product_type == 0 && $generic_commande->lines[$lig]->fk_product > 0)  // If line is a product and not a service
-						{
-							$nbprod++; // order contains real products
-							$generic_product->id = $generic_commande->lines[$lig]->fk_product;
-
-							// Get local and virtual stock and store it into cache
-							if (empty($productstat_cache[$generic_commande->lines[$lig]->fk_product])) {
-								$generic_product->load_stock('nobatch');
-								//$generic_product->load_virtual_stock();   Already included into load_stock
-								$productstat_cache[$generic_commande->lines[$lig]->fk_product]['stock_reel'] = $generic_product->stock_reel;
-								$productstat_cachevirtual[$generic_commande->lines[$lig]->fk_product]['stock_reel'] = $generic_product->stock_theorique;
-							} else {
-								$generic_product->stock_reel = $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stock_reel'];
-								$generic_product->stock_theorique = $productstat_cachevirtual[$generic_commande->lines[$lig]->fk_product]['stock_reel'] = $generic_product->stock_theorique;
-							}
-
-							if (empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST))  // Default code. Default is when this option is not set, setting it create strange result
-							{
-								$text_info .= $generic_commande->lines[$lig]->qty.' X '.$generic_commande->lines[$lig]->ref.'&nbsp;'.dol_trunc($generic_commande->lines[$lig]->product_label, 25);
-								$text_info .= ' - '.$langs->trans("Stock").': '.$generic_product->stock_reel;
-								$text_info .= ' - '.$langs->trans("VirtualStock").': '.$generic_product->stock_theorique;
-								$text_info .= '<br>';
-
-								if ($generic_commande->lines[$lig]->qty > $generic_product->stock_reel)
-								{
-									$notshippable++;
-								}
-							} else {  // Detailed code, looks bugged
-								// stock order and stock order_supplier
-								$stock_order = 0;
-								$stock_order_supplier = 0;
-								if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE))    // What about other options ?
-								{
-									if (!empty($conf->commande->enabled))
-									{
-										if (empty($productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_customer'])) {
-											$generic_product->load_stats_commande(0, '1,2');
-											$productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_customer'] = $generic_product->stats_commande['qty'];
-										} else {
-											$generic_product->stats_commande['qty'] = $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_customer'];
-										}
-										$stock_order = $generic_product->stats_commande['qty'];
-									}
-									if (!empty($conf->fournisseur->enabled))
-									{
-										if (empty($productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_supplier'])) {
-											$generic_product->load_stats_commande_fournisseur(0, '3');
-											$productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_supplier'] = $generic_product->stats_commande_fournisseur['qty'];
-										} else {
-											$generic_product->stats_commande_fournisseur['qty'] = $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_supplier'];
-										}
-										$stock_order_supplier = $generic_product->stats_commande_fournisseur['qty'];
-									}
-								}
-								$text_info .= $generic_commande->lines[$lig]->qty.' X '.$generic_commande->lines[$lig]->ref.'&nbsp;'.dol_trunc($generic_commande->lines[$lig]->product_label, 25);
-								$text_stock_reel = $generic_product->stock_reel.'/'.$stock_order;
-								if ($stock_order > $generic_product->stock_reel && !($generic_product->stock_reel < $generic_commande->lines[$lig]->qty)) {
-									$warning++;
-									$text_warning .= '<span class="warning">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$text_stock_reel.'</span>';
-								}
-								if ($generic_product->stock_reel < $generic_commande->lines[$lig]->qty) {
-									$notshippable++;
-									$text_info .= '<span class="warning">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$text_stock_reel.'</span>';
-								} else {
-									$text_info .= '<span class="ok">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$text_stock_reel.'</span>';
-								}
-								if (!empty($conf->fournisseur->enabled)) {
-									$text_info .= '&nbsp;'.$langs->trans('SupplierOrder').'&nbsp;:&nbsp;'.$stock_order_supplier.'<br>';
-								} else {
-									$text_info .= '<br>';
-								}
-							}
-						}
-					}
-					if ($notshippable == 0) {
-						$text_icon = img_picto('', 'dolly', '', false, 0, 0, '', 'green paddingleft');
-						$text_info = $langs->trans('Shippable').'<br>'.$text_info;
-					} else {
-						$text_icon = img_picto('', 'dolly', '', false, 0, 0, '', 'error paddingleft');
-						$text_info = $langs->trans('NonShippable').'<br>'.$text_info;
-					}
-				}
-
-				if ($nbprod)
-				{
-					print $form->textwithtooltip('', $text_info, 2, 1, $text_icon, '', 2);
-				}
-				if ($warning) {     // Always false in default mode
-					print $form->textwithtooltip('', $langs->trans('NotEnoughForAllOrders').'<br>'.$text_warning, 2, 1, img_picto('', 'error'), '', 2);
-				}
-			}
-
 			// Warning late icon and note
 			if ($generic_commande->hasDelay()) {
 				print img_picto($langs->trans("Late").' : '.$generic_commande->showDelay(), "warning");
@@ -1071,7 +998,7 @@ if ($resql)
 			print '<td class="nowrap">';
 			if ($obj->project_id > 0)
 			{
-			    print $projectstatic->getNomUrl(1);
+				print $projectstatic->getNomUrl(1);
 			}
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
@@ -1080,13 +1007,13 @@ if ($resql)
 		// Project label
 		if (!empty($arrayfields['p.title']['checked']))
 		{
-		    print '<td class="nowrap">';
-		    if ($obj->project_id > 0)
-		    {
-		        print $projectstatic->title;
-		    }
-		    print '</td>';
-		    if (!$i) $totalarray['nbfield']++;
+			print '<td class="nowrap">';
+			if ($obj->project_id > 0)
+			{
+				print $projectstatic->title;
+			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Third party
@@ -1245,6 +1172,7 @@ if ($resql)
 		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
+
 		// Date creation
 		if (!empty($arrayfields['c.datec']['checked']))
 		{
@@ -1253,6 +1181,7 @@ if ($resql)
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
+
 		// Date modification
 		if (!empty($arrayfields['c.tms']['checked']))
 		{
@@ -1261,6 +1190,7 @@ if ($resql)
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
+
 		// Date cloture
 		if (!empty($arrayfields['c.date_cloture']['checked']))
 		{
@@ -1269,6 +1199,7 @@ if ($resql)
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
+
 		// Note public
 		if (!empty($arrayfields['c.note_public']['checked']))
 		{
@@ -1277,6 +1208,7 @@ if ($resql)
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
+
 		// Note private
 		if (!empty($arrayfields['c.note_private']['checked']))
 		{
@@ -1285,12 +1217,109 @@ if ($resql)
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
-		// Status
-		if (!empty($arrayfields['c.fk_statut']['checked']))
+
+		// Show shippable Icon (this creates subloops, so may be slow)
+		if (!empty($arrayfields['shippable']['checked']))
 		{
-			print '<td class="nowrap right">'.$generic_commande->LibStatut($obj->fk_statut, $obj->billed, 5, 1).'</td>';
-			if (!$i) $totalarray['nbfield']++;
+			print '<td class="center">';
+			if (!empty($show_shippable_command) && !empty($conf->stock->enabled)) {
+				if (($obj->fk_statut > $generic_commande::STATUS_DRAFT) && ($obj->fk_statut < $generic_commande::STATUS_CLOSED)) {
+					$generic_commande->getLinesArray(); // This set ->lines
+
+					$numlines = count($generic_commande->lines); // Loop on each line of order
+					for ($lig = 0; $lig < $numlines; $lig++) {
+						if ($generic_commande->lines[$lig]->product_type == 0 && $generic_commande->lines[$lig]->fk_product > 0)  // If line is a product and not a service
+						{
+							$nbprod++; // order contains real products
+							$generic_product->id = $generic_commande->lines[$lig]->fk_product;
+
+							// Get local and virtual stock and store it into cache
+							if (empty($productstat_cache[$generic_commande->lines[$lig]->fk_product])) {
+								$generic_product->load_stock('nobatch'); // ->load_virtual_stock() is already included into load_stock()
+								$productstat_cache[$generic_commande->lines[$lig]->fk_product]['stock_reel'] = $generic_product->stock_reel;
+								$productstat_cachevirtual[$generic_commande->lines[$lig]->fk_product]['stock_reel'] = $generic_product->stock_theorique;
+							} else {
+								$generic_product->stock_reel = $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stock_reel'];
+								$generic_product->stock_theorique = $productstat_cachevirtual[$generic_commande->lines[$lig]->fk_product]['stock_reel'] = $generic_product->stock_theorique;
+							}
+
+							if (empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST))  // Default code. Default should be this case.
+							{
+								$text_info .= $generic_commande->lines[$lig]->qty.' X '.$generic_commande->lines[$lig]->product_ref.'&nbsp;'.dol_trunc($generic_commande->lines[$lig]->product_label, 25);
+								$text_info .= ' - '.$langs->trans("Stock").': <span class="'.($generic_product->stock_reel > 0 ? 'ok' : 'error').'">'.$generic_product->stock_reel.'</span>';
+								$text_info .= ' - '.$langs->trans("VirtualStock").': <span class="'.($generic_product->stock_theorique > 0 ? 'ok' : 'error').'">'.$generic_product->stock_theorique.'</span>';
+								$text_info .= '<br>';
+
+								if ($generic_commande->lines[$lig]->qty > $generic_product->stock_reel) {
+									$notshippable++;
+								}
+							} else {  // BUGGED CODE.
+								// DOES NOT TAKE INTO ACCOUNT MANUFACTURING. THIS CODE SHOULD BE USELESS. PREVIOUS CODE SEEMS COMPLETE.
+								// COUNT STOCK WHEN WE SHOULD ALREADY HAVE VALUE
+								// Detailed virtual stock, looks bugged, uncomplete and need heavy load.
+								// stock order and stock order_supplier
+								$stock_order = 0;
+								$stock_order_supplier = 0;
+								if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE))    // What about other options ?
+								{
+									if (!empty($conf->commande->enabled)) {
+										if (empty($productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_customer'])) {
+											$generic_product->load_stats_commande(0, '1,2');
+											$productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_customer'] = $generic_product->stats_commande['qty'];
+										} else {
+											$generic_product->stats_commande['qty'] = $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_customer'];
+										}
+										$stock_order = $generic_product->stats_commande['qty'];
+									}
+									if (!empty($conf->fournisseur->enabled)) {
+										if (empty($productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_supplier'])) {
+											$generic_product->load_stats_commande_fournisseur(0, '3');
+											$productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_supplier'] = $generic_product->stats_commande_fournisseur['qty'];
+										} else {
+											$generic_product->stats_commande_fournisseur['qty'] = $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_supplier'];
+										}
+										$stock_order_supplier = $generic_product->stats_commande_fournisseur['qty'];
+									}
+								}
+								$text_info .= $generic_commande->lines[$lig]->qty.' X '.$generic_commande->lines[$lig]->ref.'&nbsp;'.dol_trunc($generic_commande->lines[$lig]->product_label, 25);
+								$text_stock_reel = $generic_product->stock_reel.'/'.$stock_order;
+								if ($stock_order > $generic_product->stock_reel && !($generic_product->stock_reel < $generic_commande->lines[$lig]->qty)) {
+									$warning++;
+									$text_warning .= '<span class="warning">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$text_stock_reel.'</span>';
+								}
+								if ($generic_product->stock_reel < $generic_commande->lines[$lig]->qty) {
+									$notshippable++;
+									$text_info .= '<span class="warning">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$text_stock_reel.'</span>';
+								} else {
+									$text_info .= '<span class="ok">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$text_stock_reel.'</span>';
+								}
+								if (!empty($conf->fournisseur->enabled)) {
+									$text_info .= '&nbsp;'.$langs->trans('SupplierOrder').'&nbsp;:&nbsp;'.$stock_order_supplier.'<br>';
+								} else {
+									$text_info .= '<br>';
+								}
+							}
+						}
+					}
+					if ($notshippable == 0) {
+						$text_icon = img_picto('', 'dolly', '', false, 0, 0, '', 'green paddingleft');
+						$text_info = $langs->trans('Shippable').'<br>'.$text_info;
+					} else {
+						$text_icon = img_picto('', 'dolly', '', false, 0, 0, '', 'error paddingleft');
+						$text_info = $langs->trans('NonShippable').'<br>'.$text_info;
+					}
+				}
+
+				if ($nbprod) {
+					print $form->textwithtooltip('', $text_info, 2, 1, $text_icon, '', 2);
+				}
+				if ($warning) {     // Always false in default mode
+					print $form->textwithtooltip('', $langs->trans('NotEnoughForAllOrders').'<br>'.$text_warning, 2, 1, img_picto('', 'error'), '', 2);
+				}
+			}
+			print '</td>';
 		}
+
 		// Billed
 		if (!empty($arrayfields['c.facture']['checked']))
 		{
@@ -1298,6 +1327,13 @@ if ($resql)
 			if (!$i) $totalarray['nbfield']++;
 		}
 
+		// Status
+		if (!empty($arrayfields['c.fk_statut']['checked']))
+		{
+			print '<td class="nowrap center">'.$generic_commande->LibStatut($obj->fk_statut, $obj->billed, 5, 1).'</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+
 		// Action column
 		print '<td class="nowrap center">';
 		if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index 9922d3b0e3e..0cf0da709da 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -77,7 +77,7 @@ if ($id > 0 || !empty($ref))
 
 	$head = commande_prepare_head($object);
 
-	dol_fiche_head($head, 'note', $langs->trans("CustomerOrder"), -1, 'order');
+	print dol_get_fiche_head($head, 'note', $langs->trans("CustomerOrder"), -1, 'order');
 
 	// Order card
 
@@ -93,36 +93,36 @@ if ($id > 0 || !empty($ref))
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    if ($user->rights->commande->creer)
-	    {
-	        if ($action != 'classify') {
-	            //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->commande->creer)
+		{
+			if ($action != 'classify') {
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
-            }
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	            $morehtmlref .= $proj->ref;
-	            $morehtmlref .= '</a>';
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+			}
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
@@ -139,7 +139,7 @@ if ($id > 0 || !empty($ref))
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
deleted file mode 100644
index a4d4ed07dee..00000000000
--- a/htdocs/commande/orderstoinvoice.php
+++ /dev/null
@@ -1,723 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2019  Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2005       Marc Barilley / Ocebo   <marc@ocebo.com>
- * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
- * Copyright (C) 2012       Andreu Bisquerra Gaya   <jove@bisquerra.com>
- * Copyright (C) 2012       David Rodriguez Martinez <davidrm146@gmail.com>
- * Copyright (C) 2012-2018  Juanjo Menent           <jmenent@2byte.es>
- * Copyright (C) 2015       Ferran Marcet           <fmarcet@2byte.es>
- * Copyright (C) 2018       Frédéric 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/commande/orderstoinvoice.php
- *	\ingroup    commande
- *	\brief      Page to invoice multiple orders
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
-if (!empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-}
-
-// Load translation files required by the page
-$langs->loadLangs(array("orders", "deliveries", "companies"));
-
-if (!$user->rights->facture->creer)
-	accessforbidden();
-
-$id				= (GETPOST('id') ?GETPOST('id', 'int') : GETPOST("facid", "int")); // For backward compatibility
-$ref			= GETPOST('ref', 'alpha');
-$action			= GETPOST('action', 'alpha');
-$confirm		= GETPOST('confirm', 'alpha');
-$sref			= GETPOST('sref', 'alpha');
-$sref_client = GETPOST('sref_client', 'alpha');
-$sall			= trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$socid = GETPOST('socid', 'int');
-$selected = GETPOST('orders_to_invoice');
-$sortfield		= GETPOST("sortfield", 'alpha');
-$sortorder		= GETPOST("sortorder", 'alpha');
-$search_status = GETPOST('search_status', 'alpha');
-
-$error = 0;
-
-if (!$sortfield) $sortfield = 'c.rowid';
-if (!$sortorder) $sortorder = 'DESC';
-
-$now = dol_now();
-$date_start = dol_mktime(0, 0, 0, $_REQUEST["date_startmonth"], $_REQUEST["date_startday"], $_REQUEST["date_startyear"]); // Date for local PHP server
-$date_end = dol_mktime(23, 59, 59, $_REQUEST["date_endmonth"], $_REQUEST["date_endday"], $_REQUEST["date_endyear"]);
-$date_starty = dol_mktime(0, 0, 0, $_REQUEST["date_start_delymonth"], $_REQUEST["date_start_delyday"], $_REQUEST["date_start_delyyear"]); // Date for local PHP server
-$date_endy = dol_mktime(23, 59, 59, $_REQUEST["date_end_delymonth"], $_REQUEST["date_end_delyday"], $_REQUEST["date_end_delyyear"]);
-
-$extrafields = new ExtraFields($db);
-
-$object = new Facture($db);
-
-// fetch optionals attributes and labels
-$extrafields->fetch_name_optionals_label($object->table_element);
-
-if ($action == 'create')
-{
-	if (!is_array($selected))
-	{
-		$error++;
-		setEventMessages($langs->trans('Error_OrderNotChecked'), null, 'errors');
-	} else {
-		$origin = GETPOST('origin');
-		$originid = GETPOST('originid');
-	}
-}
-
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager = new HookManager($db);
-$hookmanager->initHooks(array('orderstoinvoice'));
-
-
-/*
- * Actions
- */
-
-if (($action == 'create' || $action == 'add') && !$error)
-{
-	require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
-	require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
-	if (!empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-
-	$langs->load('bills');
-	$langs->load('products');
-	$langs->load('main');
-	if (isset($_GET['orders_to_invoice']))
-	{
-		$orders_id = GETPOST('orders_to_invoice', '', 1);
-		$n        = count($orders_id);
-		$i        = 0;
-
-		$originid = $orders_id[0];
-		$_GET['originid'] = $orders_id[0];
-	}
-	if (isset($_POST['orders_to_invoice']))
-	{
-		$orders_id = GETPOST('orders_to_invoice', '', 2);
-		$nn        = count($orders_id);
-		$ii        = 0;
-
-		$originid = $orders_id[0];
-		$_POST['originid'] = $orders_id[0];
-	}
-
-	$projectid = GETPOST('projectid', 'int') ?GETPOST('projectid', 'int') : 0;
-	$lineid			= GETPOST('lineid', 'int');
-	$userid			= GETPOST('userid', 'int');
-	$search_ref		= GETPOST('sf_ref') ?GETPOST('sf_ref') : GETPOST('search_ref');
-	$closeOrders	= GETPOST('autocloseorders') ? true : false;
-
-	// Security check
-	$fieldid = GETPOST('ref', 'alpha') ? 'ref' : 'rowid';
-	if ($user->socid) $socid = $user->socid;
-	$result = restrictedArea($user, 'facture', $id, '', '', 'fk_soc', $fieldid);
-
-	$usehm = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE;
-
-	// Insert new invoice in database
-	if ($action == 'add' && $user->rights->facture->creer)
-	{
-		$object->socid = GETPOST('socid');
-		$db->begin();
-		$error = 0;
-
-		// Standard or deposit or proforma invoice
-		if ($_POST['type'] == 0)
-		{
-			$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
-			if (empty($datefacture))
-			{
-				$datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
-			}
-			if (!$error)
-			{
-				// Si facture standard
-				$object->socid = $_POST['socid'];
-				$object->type				= $_POST['type'];
-				$object->number = $_POST['ref'];
-				$object->date				= $datefacture;
-				$object->note_public		= trim($_POST['note_public']);
-				$object->note				= trim($_POST['note']);
-				$object->ref_client			= $_POST['ref_client'];
-				$object->model_pdf = $_POST['model'];
-				$object->fk_project			= $_POST['projectid'];
-				$object->cond_reglement_id	= ($_POST['type'] == 3 ? 1 : $_POST['cond_reglement_id']);
-				$object->mode_reglement_id	= $_POST['mode_reglement_id'];
-				$object->amount = $_POST['amount'];
-				$object->remise_absolue		= $_POST['remise_absolue'];
-				$object->remise_percent		= $_POST['remise_percent'];
-
-				$ret = $extrafields->setOptionalsFromPost(null, $object);
-				if ($ret < 0) $error++;
-
-				if ($_POST['origin'] && $_POST['originid'])
-				{
-					$object->origin    = $_POST['origin'];
-					$object->origin_id = $orders_id[$ii];
-					$object->linked_objects = $orders_id;
-					$id = $object->create($user);
-					$object->fetch_thirdparty();
-
-					if ($id > 0)
-					{
-						foreach ($orders_id as $origin => $origin_id)
-						{
-							$origin_id = (!empty($origin_id) ? $origin_id : $object->origin_id);
-							$db->begin();
-							$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
-							$sql .= "fk_source";
-							$sql .= ", sourcetype";
-							$sql .= ", fk_target";
-							$sql .= ", targettype";
-							$sql .= ") VALUES (";
-							$sql .= $origin_id;
-							$sql .= ", '".$db->escape($object->origin)."'";
-							$sql .= ", ".$id;
-							$sql .= ", '".$db->escape($object->element)."'";
-							$sql .= ")";
-
-							if ($db->query($sql))
-							{
-								$db->commit();
-							} else {
-								$db->rollback();
-							}
-						}
-
-						while ($ii < $nn)
-						{
-							include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-							$objectsrc = new Commande($db);
-							dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
-							$result = $objectsrc->fetch($orders_id[$ii]);
-							if ($result > 0)
-							{
-								if ($closeOrders)
-								{
-									$objectsrc->classifyBilled($user);
-									$objectsrc->setStatut(3);
-								}
-								$lines = $objectsrc->lines;
-								if (empty($lines) && method_exists($objectsrc, 'fetch_lines'))
-								{
-									$objectsrc->fetch_lines();
-									$lines = $objectsrc->lines;
-								}
-								$fk_parent_line = 0;
-								$num = count($lines);
-								for ($i = 0; $i < $num; $i++)
-								{
-									$desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
-									if ($lines[$i]->subprice < 0)
-									{
-										// Negative line, we create a discount line
-										$discount = new DiscountAbsolute($db);
-										$discount->fk_soc = $object->socid;
-										$discount->amount_ht = abs($lines[$i]->total_ht);
-										$discount->amount_tva = abs($lines[$i]->total_tva);
-										$discount->amount_ttc = abs($lines[$i]->total_ttc);
-										$discount->tva_tx = $lines[$i]->tva_tx;
-										$discount->fk_user = $user->id;
-										$discount->description = $desc;
-										$discountid = $discount->create($user);
-										if ($discountid > 0)
-										{
-											$result = $object->insert_discount($discountid);
-											//$result=$discount->link_to_invoice($lineid,$id);
-										} else {
-											setEventMessages($discount->error, $discount->errors, 'errors');
-											$error++;
-											break;
-										}
-									} else {
-										// Positive line
-										$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
-										// Date start
-										$date_start = false;
-										if ($lines[$i]->date_debut_prevue) $date_start = $lines[$i]->date_debut_prevue;
-										if ($lines[$i]->date_debut_reel) $date_start = $lines[$i]->date_debut_reel;
-										if ($lines[$i]->date_start) $date_start = $lines[$i]->date_start;
-										//Date end
-										$date_end = false;
-										if ($lines[$i]->date_fin_prevue) $date_end = $lines[$i]->date_fin_prevue;
-										if ($lines[$i]->date_fin_reel) $date_end = $lines[$i]->date_fin_reel;
-										if ($lines[$i]->date_end) $date_end = $lines[$i]->date_end;
-										// Reset fk_parent_line for no child products and special product
-										if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9)
-										{
-											$fk_parent_line = 0;
-										}
-
-										// Extrafields
-										if (method_exists($lines[$i], 'fetch_optionals')) {
-											$lines[$i]->fetch_optionals();
-											$array_options = $lines[$i]->array_options;
-										}
-
-                                        $result = $object->addline(
-											$desc,
-											$lines[$i]->subprice,
-											$lines[$i]->qty,
-											$lines[$i]->tva_tx,
-											$lines[$i]->localtax1_tx,
-											$lines[$i]->localtax2_tx,
-											$lines[$i]->fk_product,
-											$lines[$i]->remise_percent,
-											$date_start,
-											$date_end,
-											0,
-											$lines[$i]->info_bits,
-											$lines[$i]->fk_remise_except,
-											'HT',
-											0,
-											$product_type,
-											$ii,
-											$lines[$i]->special_code,
-											$object->origin,
-											$lines[$i]->rowid,
-											$fk_parent_line,
-											$lines[$i]->fk_fournprice,
-											$lines[$i]->pa_ht,
-											$lines[$i]->label,
-                                            $array_options
-										);
-										if ($result > 0)
-										{
-											$lineid = $result;
-										} else {
-											$lineid = 0;
-											$error++;
-											break;
-										}
-										// Defined the new fk_parent_line
-										if ($result > 0 && $lines[$i]->product_type == 9)
-										{
-											$fk_parent_line = $result;
-										}
-									}
-								}
-							} else {
-								setEventMessages($objectsrc->error, $objectsrc->errors, 'errors');
-								$error++;
-							}
-							$ii++;
-						}
-					} else {
-						setEventMessages($object->error, $object->errors, 'errors');
-						$error++;
-					}
-				}
-			}
-		}
-
-		// End of object creation, we show it
-		if ($id > 0 && !$error)
-		{
-			$db->commit();
-			header('Location: '.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$id);
-			exit;
-		} else {
-			$db->rollback();
-			$action = 'create';
-			$_GET["origin"] = $_POST["origin"];
-			$_GET["originid"] = $_POST["originid"];
-			setEventMessages($object->error, $object->errors, 'errors');
-			$error++;
-		}
-	}
-}
-
-
-/*
- * View
- */
-
-$html = new Form($db);
-$htmlother = new FormOther($db);
-$formfile = new FormFile($db);
-$companystatic = new Societe($db);
-
-// Mode creation
-if ($action == 'create' && !$error)
-{
-	$facturestatic = new Facture($db);
-
-	llxHeader();
-	print load_fiche_titre($langs->trans('NewBill'));
-
-	$soc = new Societe($db);
-	if ($socid) $res = $soc->fetch($socid);
-	if ($res)
-	{
-		$cond_reglement_id 	= $soc->cond_reglement_id;
-		$mode_reglement_id 	= $soc->mode_reglement_id;
-		$remise_percent = $soc->remise_percent;
-	}
-	$remise_absolue = 0;
-	$dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '';
-
-	$absolute_discount = $soc->getAvailableDiscounts();
-	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="action" value="add">';
-	print '<input type="hidden" name="socid" value="'.$soc->id.'">'."\n";
-	print '<input name="ref" type="hidden" value="provisoire">';
-	print '<input type="hidden" name="origin" value="'.GETPOST('origin').'">';
-	print '<input type="hidden" name="originid" value="'.GETPOST('originid').'">';
-	print '<input type="hidden" name="autocloseorders" value="'.GETPOST('autocloseorders').'">';
-
-	dol_fiche_head();
-
-	print '<table class="border centpercent">';
-
-	// Ref
-	print '<tr><td class="fieldrequired">'.$langs->trans('Ref').'</td><td>'.$langs->trans('Draft').'</td></tr>';
-
-	// Third party
-	print '<tr><td class="fieldrequired">'.$langs->trans('Customer').'</td><td>';
-	print $soc->getNomUrl(1);
-	print '<input type="hidden" name="socid" value="'.$soc->id.'">';
-	print '</td>';
-	print '</tr>'."\n";
-
-	// Type
-	print '<tr><td class="tdtop fieldrequired">'.$langs->trans('Type').'</td><td>';
-	print '<table class="nobordernopadding">'."\n";
-
-	// Standard invoice
-	print '<tr height="18"><td width="16px" valign="middle">';
-	print '<input type="radio" name="type" value="0"'.(GETPOST('type') == 0 ? ' checked' : '').'>';
-	print '</td><td valign="middle">';
-	$desc = $html->textwithpicto($langs->trans("InvoiceStandardAsk"), $langs->transnoentities("InvoiceStandardDesc"), 1);
-	print $desc;
-	print '</td></tr>'."\n";
-	print '</table>';
-
-	// Date invoice
-	print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td>';
-	print $html->selectDate('', '', '', '', '', "add", 1, 1);
-	print '</td></tr>';
-	// Payment term
-	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
-	$html->select_conditions_paiements(isset($_POST['cond_reglement_id']) ? $_POST['cond_reglement_id'] : $cond_reglement_id, 'cond_reglement_id');
-	print '</td></tr>';
-	// Payment mode
-	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
-	$html->select_types_paiements(isset($_POST['mode_reglement_id']) ? $_POST['mode_reglement_id'] : $mode_reglement_id, 'mode_reglement_id');
-	print '</td></tr>';
-	// Project
-	if (!empty($conf->projet->enabled))
-	{
-		$formproject = new FormProjets($db);
-
-		$langs->load('projects');
-		print '<tr><td>'.$langs->trans('Project').'</td><td>';
-		$formproject->select_projects($soc->id, $projectid, 'projectid');
-		print '</td></tr>';
-	}
-
-	include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-	$objectsrc = new Commande($db);
-	$listoforders = array();
-	foreach ($selected as $sel)
-	{
-		$result = $objectsrc->fetch($sel);
-		if ($result > 0)
-		{
-			$listoforders[] = $objectsrc->ref;
-		}
-	}
-
-	// Other attributes
-	$parameters = array('objectsrc' => $objectsrc, 'idsrc' => $listoforders);
-	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-	if (empty($reshook))
-	{
-		$object = new Facture($db);
-		print $object->showOptionals($extrafields, 'edit');
-	}
-
-	// Modele PDF
-	print '<tr><td>'.$langs->trans('Model').'</td>';
-	print '<td>';
-	include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
-	$liste = ModelePDFFactures::liste_modeles($db);
-	print $html->selectarray('model', $liste, $conf->global->FACTURE_ADDON_PDF);
-	print "</td></tr>";
-
-	// Public note
-	print '<tr>';
-	print '<td class="border" valign="top">'.$langs->trans('NotePublic').'</td>';
-	print '<td valign="top">';
-	print '<textarea name="note_public" class="quatrevingtpercent" rows="'.ROWS_3.'">';
-
-	print $langs->trans("Orders").": ".implode(', ', $listoforders);
-
-	print '</textarea></td></tr>';
-	// Private note
-	if (empty($user->socid))
-	{
-		print '<tr>';
-		print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>';
-		print '<td valign="top">';
-		print '<textarea name="note" class="quatrevingtpercent" rows="'.ROWS_3.'">';
-
-		print '</textarea></td></tr>';
-	}
-
-	print '</table>';
-
-	while ($i < $n)
-	{
-		print '<input type="hidden" name="orders_to_invoice[]" value="'.$orders_id[$i].'">';
-
-		$i++;
-	}
-
-	dol_fiche_end();
-
-	// Button "Create Draft"
-	print '<div class="center"><input type="submit" class="button" name="bouton" value="'.$langs->trans('CreateDraft').'" /></div>';
-	print "</form>\n";
-
-	print '</td></tr>';
-	print "</table>\n";
-}
-
-// Mode liste
-if (($action != 'create' && $action != 'add') || ($action == 'create' && $error))
-{
-	llxHeader();
-	?>
-	<script type="text/javascript">
-		jQuery(document).ready(function() {
-		jQuery("#checkall").click(function() {
-			jQuery(".checkformerge").prop('checked', true);
-		});
-		jQuery("#checknone").click(function() {
-			jQuery(".checkformerge").prop('checked', false);
-		});
-	});
-	</script>
-	<?php
-
-	$sql = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.entity, c.ref, c.total_ht, c.ref_client,';
-	$sql .= ' c.date_valid, c.date_commande, c.date_livraison, c.fk_statut, c.facture as billed';
-	$sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
-	$sql .= ', '.MAIN_DB_PREFIX.'commande as c';
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql .= ' WHERE c.entity IN ('.getEntity('commande').')';
-	$sql .= ' AND c.fk_soc = s.rowid';
-
-	// Show orders with status validated, shipping started and delivered (well any order we can bill)
-	$sql .= " AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))";
-
-	if ($socid)	$sql .= ' AND s.rowid = '.$socid;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	if ($sref)
-	{
-		$sql .= " AND c.ref LIKE '%".$db->escape($sref)."%'";
-	}
-	if ($sall)
-	{
-		$sql .= " AND (c.ref LIKE '%".$db->escape($sall)."%' OR c.note LIKE '%".$db->escape($sall)."%')";
-	}
-
-	//Date filter
-	if ($date_start && $date_end) $sql .= " AND c.date_commande >= '".$db->idate($date_start)."' AND c.date_commande <= '".$db->idate($date_end)."'";
-	if ($date_starty && $date_endy) $sql .= " AND c.date_livraison >= '".$db->idate($date_starty)."' AND c.date_livraison <= '".$db->idate($date_endy)."'";
-
-	if (!empty($sref_client))
-	{
-		$sql .= ' AND c.ref_client LIKE \'%'.$db->escape($sref_client).'%\'';
-	}
-	$sql .= $db->order($sortfield, $sortorder);
-
-	$resql = $db->query($sql);
-	if ($resql)
-	{
-		if ($socid)
-		{
-			$soc = new Societe($db);
-			$soc->fetch($socid);
-		}
-		$title = $langs->trans('ListOfOrders');
-		$title .= ' - '.$langs->trans('StatusOrderValidated').', '.$langs->trans("StatusOrderSent").', '.$langs->trans('StatusOrderToBill');
-		$num = $db->num_rows($resql);
-		print load_fiche_titre($title);
-		$i = 0;
-		$period = $html->selectDate($date_start, 'date_start', 0, 0, 1, '', 1, 0).' - '.$html->selectDate($date_end, 'date_end', 0, 0, 1, '', 1, 0);
-		$periodely = $html->selectDate($date_starty, 'date_start_dely', 0, 0, 1, '', 1, 0).' - '.$html->selectDate($date_endy, 'date_end_dely', 0, 0, 1, '', 1, 0);
-
-		if (!empty($socid))
-		{
-			// Company
-			$companystatic->id = $socid;
-			$companystatic->name = $soc->name;
-			print '<h3>'.$companystatic->getNomUrl(1, 'customer').'</h3>';
-		}
-
-		print '<div class="div-table-responsive-no-min">';
-		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre">';
-		print_liste_field_titre('Ref', $_SERVER["PHP_SELF"], 'c.ref', '', '&amp;socid='.$socid, '', $sortfield, $sortorder);
-		print_liste_field_titre('RefCustomerOrder', $_SERVER["PHP_SELF"], 'c.ref_client', '', '&amp;socid='.$socid, '', $sortfield, $sortorder);
-		print_liste_field_titre('OrderDate', $_SERVER["PHP_SELF"], 'c.date_commande', '', '&amp;socid='.$socid, 'align="center"', $sortfield, $sortorder);
-		print_liste_field_titre('DeliveryDate', $_SERVER["PHP_SELF"], 'c.date_livraison', '', '&amp;socid='.$socid, 'align="center"', $sortfield, $sortorder);
-		print_liste_field_titre('Status', '', '', '', '', 'class="right"');
-		print_liste_field_titre('GenerateBill', '', '', '', '', 'align="center"');
-		print '</tr>';
-
-		// Fields title search
-		print '<form method="get" action="orderstoinvoice.php">';
-		print '<input type="hidden" name="socid" value="'.$socid.'">';
-		print '<tr class="liste_titre">';
-
-		//REF
-		print '<td class="liste_titre">';
-		print '<input class="flat" size="10" type="text" name="sref" value="'.$sref.'">';
-		print '</td>';
-
-		print '<td class="liste_titre" align="left">';
-		print '<input class="flat" type="text" size="10" name="sref_client" value="'.$sref_client.'">';
-        print '</td>';
-
-		//DATE ORDER
-		print '<td class="liste_titre" align="center">';
-		print $period;
-		print '</td>';
-
-		//DATE DELIVERY
-		print '<td class="liste_titre" align="center">';
-		print $periodely;
-		print '</td>';
-
-		//SEARCH BUTTON
-		print '<td class="liste_titre right">';
-		print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', '', 1).'"  value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-        print '</td>';
-
-		//ALL/NONE
-		print '<td align="center" class="liste_titre">';
-		if ($conf->use_javascript_ajax) print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a>';
-		print '</td>';
-
-		print '</tr>';
-		print '</form>';
-
-		print '<form name="orders2invoice" action="orderstoinvoice.php" method="GET">';
-
-		$generic_commande = new Commande($db);
-
-		while ($i < $num)
-		{
-			$objp = $db->fetch_object($resql);
-
-			print '<tr class="oddeven">';
-			print '<td class="nowrap">';
-
-			$generic_commande->id = $objp->rowid;
-			$generic_commande->ref = $objp->ref;
-			$generic_commande->statut = $objp->fk_statut;
-			$generic_commande->date_commande = $db->jdate($objp->date_commande);
-			$generic_commande->date_livraison = $db->jdate($objp->date_livraison);
-
-			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-			print '<td class="nobordernopadding nowraponall">';
-			print $generic_commande->getNomUrl(1, 0);
-			print '</td>';
-
-			print '<td width="20" class="nobordernopadding nowraponall">';
-			if ($generic_commande->hasDelay()) {
-				print img_picto($langs->trans("Late"), "warning");
-			}
-			print '</td>';
-
-			print '<td width="16" class="nobordernopadding hideonsmartphone right">';
-			$filename = dol_sanitizeFileName($objp->ref);
-			$filedir = $conf->commande->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref);
-			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objp->rowid;
-			print $formfile->getDocumentsLink($generic_commande->element, $filename, $filedir);
-			print '</td></tr></table>';
-			print '</td>';
-
-			print '<td>'.$objp->ref_client.'</td>';
-
-			// Order date
-			print '<td align="center" class="nowrap">';
-			print dol_print_date($db->jdate($objp->date_commande), 'day');
-			print '</td>';
-
-			//Delivery date
-			print '<td align="center" class="nowrap">';
-			print dol_print_date($db->jdate($objp->date_livraison), 'day');
-			print '</td>';
-
-			// Statut
-			print '<td class="nowrap right">'.$generic_commande->LibStatut($objp->fk_statut, $objp->billed, 5).'</td>';
-
-			// Checkbox
-			print '<td class="center">';
-			print '<input class="flat checkformerge" type="checkbox" name="orders_to_invoice[]" value="'.$objp->rowid.'">';
-			print '</td>';
-
-			print '</tr>';
-
-			$total = $total + $objp->price;
-			$subtotal = $subtotal + $objp->price;
-			$i++;
-		}
-		print '</table>';
-        print '</div>';
-
-		// Buttons actions
-		print '<br><div class="center"><input type="checkbox" '.(empty($conf->global->INVOICE_CLOSE_ORDERS_OFF_BY_DEFAULT_FORMASSINVOICE) ? ' checked="checked"' : '').' name="autocloseorders"> '.$langs->trans("CloseProcessedOrdersAutomatically");
-		print '<div class="right">';
-		print '<input type="hidden" name="socid" value="'.$socid.'">';
-		print '<input type="hidden" name="action" value="create">';
-		print '<input type="hidden" name="origin" value="commande"><br>';
-		//print '<a class="butAction" href="index.php">'.$langs->trans("GoBack").'</a>';
-		print '<input type="submit" class="butAction" value="'.$langs->trans("GenerateBill").'">';
-		print '</div>';
-		print '</div>';
-
-		print '</form>';
-
-		$db->free($resql);
-	} else {
-		dol_print_error($db);
-	}
-}
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 346b5549bfd..6e5e022c651 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -38,11 +38,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
 $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
-$mode = GETPOST("mode") ?GETPOST("mode") : 'customer';
+$mode = GETPOSTISSET("mode") ? GETPOST("mode", 'aZ09') : 'customer';
 if ($mode == 'customer' && !$user->rights->commande->lire) accessforbidden();
 if ($mode == 'supplier' && !$user->rights->fournisseur->commande->lire) accessforbidden();
 
-$object_status = GETPOST('object_status');
+$object_status = GETPOST('object_status', 'intcomma');
 $typent_id = GETPOST('typent_id', 'int');
 $categ_id = GETPOST('categ_id', 'categ_id');
 
@@ -51,8 +51,8 @@ $socid = GETPOST('socid', 'int');
 // Security check
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $nowyear = strftime("%Y", dol_now());
@@ -81,8 +81,8 @@ $dir = $conf->commande->dir_temp;
 if ($mode == 'supplier')
 {
 	$picto = 'supplier_order';
-    $title = $langs->trans("OrdersStatisticsSuppliers").' ('.$langs->trans("SentToSuppliers").")";
-    $dir = $conf->fournisseur->commande->dir_temp;
+	$title = $langs->trans("OrdersStatisticsSuppliers");
+	$dir = $conf->fournisseur->commande->dir_temp;
 }
 
 llxHeader('', $title);
@@ -111,38 +111,38 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filenamenb = $dir.'/ordersnbinyear-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersnbinyear-'.$user->id.'-'.$year.'.png';
+	$filenamenb = $dir.'/ordersnbinyear-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersnbinyear-'.$user->id.'-'.$year.'.png';
 } else {
-    $filenamenb = $dir.'/ordersnbinyear-'.$year.'.png';
-    if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$year.'.png';
-    if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersnbinyear-'.$year.'.png';
+	$filenamenb = $dir.'/ordersnbinyear-'.$year.'.png';
+	if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$year.'.png';
+	if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersnbinyear-'.$year.'.png';
 }
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
 if (!$mesg)
 {
-    $px1->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px1->SetLegend($legend);
-    $px1->SetMaxValue($px1->GetCeilMaxValue());
-    $px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
-    $px1->SetWidth($WIDTH);
-    $px1->SetHeight($HEIGHT);
-    $px1->SetYLabel($langs->trans("NbOfOrder"));
-    $px1->SetShading(3);
-    $px1->SetHorizTickIncrement(1);
-    $px1->mode = 'depth';
-    $px1->SetTitle($langs->trans("NumberOfOrdersByMonth"));
+	$px1->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px1->SetLegend($legend);
+	$px1->SetMaxValue($px1->GetCeilMaxValue());
+	$px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
+	$px1->SetWidth($WIDTH);
+	$px1->SetHeight($HEIGHT);
+	$px1->SetYLabel($langs->trans("NbOfOrder"));
+	$px1->SetShading(3);
+	$px1->SetHorizTickIncrement(1);
+	$px1->mode = 'depth';
+	$px1->SetTitle($langs->trans("NumberOfOrdersByMonth"));
 
-    $px1->draw($filenamenb, $fileurlnb);
+	$px1->draw($filenamenb, $fileurlnb);
 }
 
 // Build graphic amount of object
@@ -152,38 +152,38 @@ $data = $stats->getAmountByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filenameamount = $dir.'/ordersamountinyear-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'customer') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersamountinyear-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'supplier') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersamountinyear-'.$user->id.'-'.$year.'.png';
+	$filenameamount = $dir.'/ordersamountinyear-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'customer') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersamountinyear-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'supplier') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersamountinyear-'.$user->id.'-'.$year.'.png';
 } else {
-    $filenameamount = $dir.'/ordersamountinyear-'.$year.'.png';
-    if ($mode == 'customer') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersamountinyear-'.$year.'.png';
-    if ($mode == 'supplier') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersamountinyear-'.$year.'.png';
+	$filenameamount = $dir.'/ordersamountinyear-'.$year.'.png';
+	if ($mode == 'customer') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersamountinyear-'.$year.'.png';
+	if ($mode == 'supplier') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersamountinyear-'.$year.'.png';
 }
 
 $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
 if (!$mesg)
 {
-    $px2->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px2->SetLegend($legend);
-    $px2->SetMaxValue($px2->GetCeilMaxValue());
-    $px2->SetMinValue(min(0, $px2->GetFloorMinValue()));
-    $px2->SetWidth($WIDTH);
-    $px2->SetHeight($HEIGHT);
-    $px2->SetYLabel($langs->trans("AmountOfOrders"));
-    $px2->SetShading(3);
-    $px2->SetHorizTickIncrement(1);
-    $px2->mode = 'depth';
-    $px2->SetTitle($langs->trans("AmountOfOrdersByMonthHT"));
+	$px2->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px2->SetLegend($legend);
+	$px2->SetMaxValue($px2->GetCeilMaxValue());
+	$px2->SetMinValue(min(0, $px2->GetFloorMinValue()));
+	$px2->SetWidth($WIDTH);
+	$px2->SetHeight($HEIGHT);
+	$px2->SetYLabel($langs->trans("AmountOfOrders"));
+	$px2->SetShading(3);
+	$px2->SetHorizTickIncrement(1);
+	$px2->mode = 'depth';
+	$px2->SetTitle($langs->trans("AmountOfOrdersByMonthHT"));
 
-    $px2->draw($filenameamount, $fileurlamount);
+	$px2->draw($filenameamount, $fileurlamount);
 }
 
 
@@ -191,38 +191,38 @@ $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	$filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
 } else {
-    $filename_avg = $dir.'/ordersaverage-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
+	$filename_avg = $dir.'/ordersaverage-'.$year.'.png';
+	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
+	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
 }
 
 $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
 if (!$mesg)
 {
-    $px3->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px3->SetLegend($legend);
-    $px3->SetYLabel($langs->trans("AmountAverage"));
-    $px3->SetMaxValue($px3->GetCeilMaxValue());
-    $px3->SetMinValue($px3->GetFloorMinValue());
-    $px3->SetWidth($WIDTH);
-    $px3->SetHeight($HEIGHT);
-    $px3->SetShading(3);
-    $px3->SetHorizTickIncrement(1);
-    $px3->mode = 'depth';
-    $px3->SetTitle($langs->trans("AmountAverage"));
+	$px3->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px3->SetLegend($legend);
+	$px3->SetYLabel($langs->trans("AmountAverage"));
+	$px3->SetMaxValue($px3->GetCeilMaxValue());
+	$px3->SetMinValue($px3->GetFloorMinValue());
+	$px3->SetWidth($WIDTH);
+	$px3->SetHeight($HEIGHT);
+	$px3->SetShading(3);
+	$px3->SetHorizTickIncrement(1);
+	$px3->mode = 'depth';
+	$px3->SetTitle($langs->trans("AmountAverage"));
 
-    $px3->draw($filename_avg, $fileurl_avg);
+	$px3->draw($filename_avg, $fileurl_avg);
 }
 
 
@@ -249,7 +249,7 @@ if ($mode == 'supplier') $type = 'supplier_order_stats';
 
 complete_head_from_modules($conf, $langs, null, $head, $h, $type);
 
-dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
+print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
@@ -277,13 +277,13 @@ print '</td></tr>';
 // Category
 if ($mode == 'customer')
 {
-    $cat_type = Categorie::TYPE_CUSTOMER;
-    $cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Customer"));
+	$cat_type = Categorie::TYPE_CUSTOMER;
+	$cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Customer"));
 }
 if ($mode == 'supplier')
 {
-    $cat_type = Categorie::TYPE_SUPPLIER;
-    $cat_label = $langs->trans("Supplier").' '.lcfirst($langs->trans("Customer"));
+	$cat_type = Categorie::TYPE_SUPPLIER;
+	$cat_label = $langs->trans("Supplier").' '.lcfirst($langs->trans("Customer"));
 }
 print '<tr><td>'.$cat_label.'</td><td>';
 print $formother->select_categories($cat_type, $categ_id, 'categ_id', true);
@@ -295,18 +295,18 @@ print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0
 print '<tr><td class="left">'.$langs->trans("Status").'</td><td class="left">';
 if ($mode == 'customer')
 {
-    $liststatus = array(
-        Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraft"),
-        Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"),
-        Commande::STATUS_SHIPMENTONPROCESS=>$langs->trans("StatusOrderSent"),
-        Commande::STATUS_CLOSED=>$langs->trans("StatusOrderDelivered"),
-        Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceled")
-    );
-    print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'int'), -4);
+	$liststatus = array(
+		Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraft"),
+		Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"),
+		Commande::STATUS_SHIPMENTONPROCESS=>$langs->trans("StatusOrderSent"),
+		Commande::STATUS_CLOSED=>$langs->trans("StatusOrderDelivered"),
+		Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceled")
+	);
+	print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'intcomma'), -4);
 }
 if ($mode == 'supplier')
 {
-    $formorder->selectSupplierOrderStatus((strstr($object_status, ',') ?-1 : $object_status), 0, 'object_status');
+	$formorder->selectSupplierOrderStatus((strstr($object_status, ',') ? -1 : $object_status), 0, 'object_status');
 }
 print '</td></tr>';
 // Year
@@ -376,11 +376,11 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td align="center">';
 if ($mesg) { print $mesg; } else {
-    print $px1->show();
-    print "<br>\n";
-    print $px2->show();
-    print "<br>\n";
-    print $px3->show();
+	print $px1->show();
+	print "<br>\n";
+	print $px2->show();
+	print "<br>\n";
+	print $px3->show();
 }
 print '</td></tr></table>';
 
@@ -388,7 +388,7 @@ print '</td></tr></table>';
 print '</div></div></div>';
 print '<div style="clear:both"></div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
index a593e10adf4..a9c01386bf7 100644
--- a/htdocs/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php
@@ -40,44 +40,44 @@ $total = 0;
 $ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink)
 {
-    $ilink++;
+	$ilink++;
 
-    $trclass = 'oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
-    echo '<tr class="'.$trclass.'" >';
-    echo '<td class="linkedcol-element" >'.$langs->trans("CustomerOrder");
-    if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
-        print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
-    }
-    echo '</td>';
-    echo '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
-    echo '<td class="linkedcol-ref" align="center">'.$objectlink->ref_client.'</td>';
-    echo '<td class="linkedcol-date" align="center">'.dol_print_date($objectlink->date, 'day').'</td>';
-    echo '<td class="linkedcol-amount right">';
-    if ($user->rights->commande->lire) {
-        $total = $total + $objectlink->total_ht;
-        echo price($objectlink->total_ht);
-    }
-    echo '</td>';
-    echo '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
-    echo '<td class="linkedcol-action right">';
-    // For now, shipments must stay linked to order, so link is not deletable
-    if ($object->element != 'shipping') {
-        echo '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a>';
-    }
-    echo '</td>';
-    echo "</tr>\n";
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	echo '<tr class="'.$trclass.'" >';
+	echo '<td class="linkedcol-element" >'.$langs->trans("CustomerOrder");
+	if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
+		print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
+	}
+	echo '</td>';
+	echo '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
+	echo '<td class="linkedcol-ref" align="center">'.$objectlink->ref_client.'</td>';
+	echo '<td class="linkedcol-date" align="center">'.dol_print_date($objectlink->date, 'day').'</td>';
+	echo '<td class="linkedcol-amount right">';
+	if ($user->rights->commande->lire) {
+		$total = $total + $objectlink->total_ht;
+		echo price($objectlink->total_ht);
+	}
+	echo '</td>';
+	echo '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
+	echo '<td class="linkedcol-action right">';
+	// For now, shipments must stay linked to order, so link is not deletable
+	if ($object->element != 'shipping') {
+		echo '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a>';
+	}
+	echo '</td>';
+	echo "</tr>\n";
 }
 if (count($linkedObjectBlock) > 1) {
-    echo '<tr class="liste_total '.(empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : '').'">';
-    echo '<td>'.$langs->trans("Total").'</td>';
-    echo '<td></td>';
-    echo '<td class="center"></td>';
-    echo '<td class="center"></td>';
-    echo '<td class="right">'.price($total).'</td>';
-    echo '<td class="right"></td>';
-    echo '<td class="right"></td>';
-    echo "</tr>\n";
+	echo '<tr class="liste_total '.(empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : '').'">';
+	echo '<td>'.$langs->trans("Total").'</td>';
+	echo '<td></td>';
+	echo '<td class="center"></td>';
+	echo '<td class="center"></td>';
+	echo '<td class="right">'.price($total).'</td>';
+	echo '<td class="right"></td>';
+	echo '<td class="right"></td>';
+	echo "</tr>\n";
 }
 
 echo "<!-- END PHP TEMPLATE -->\n";
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 2a8a0358744..cc9abb8d594 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -19,10 +19,10 @@
  */
 
  /**
- *  \file       htdocs/compta/accounting-files.php
- *  \ingroup    compta
- *  \brief      Page to show portoflio and files of a thirdparty and download it
- */
+  *  \file       htdocs/compta/accounting-files.php
+  *  \ingroup    compta
+  *  \brief      Page to show portoflio and files of a thirdparty and download it
+  */
 
 if ((array_key_exists('action', $_GET) && $_GET['action'] == 'dl') || (array_key_exists('action', $_POST) && $_POST['action'] == 'dl')) {	// To not replace token when downloading file
 	if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
@@ -79,8 +79,8 @@ if (!$sortorder) $sortorder = "DESC";
 
 
 $arrayfields = array(
-    'type'=>array('label'=>"Type", 'checked'=>1),
-    'date'=>array('label'=>"Date", 'checked'=>1),
+	'type'=>array('label'=>"Type", 'checked'=>1),
+	'date'=>array('label'=>"Date", 'checked'=>1),
 	'date_due'=>array('label'=>"DateDue", 'checked'=>1),
 	'ref'=>array('label'=>"Ref", 'checked'=>1),
 	'documents'=>array('label'=>"Documents", 'checked'=>1),
@@ -93,10 +93,10 @@ $arrayfields = array(
 
 // Security check
 if (empty($conf->comptabilite->enabled) && empty($conf->accounting->enabled)) {
-    accessforbidden();
+	accessforbidden();
 }
 if ($user->socid > 0) {
-    accessforbidden();
+	accessforbidden();
 }
 
 // Define $arrayofentities if multientity is set.
@@ -149,243 +149,243 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 		// Customer invoices
 		if (GETPOST('selectinvoices')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= "SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total as total_ht, t.total_ttc, t.tva as total_vat, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'Invoice' as item, s.nom as thirdparty_name, s.code_client as thirdparty_code, c.code as country_code, s.tva_intra as vatnum, ".PAY_CREDIT." as sens";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."facture as t LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = t.fk_soc LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = s.fk_pays";
-		    $sql .= " WHERE datef between ".$wheretail;
-		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
-		    $sql .= " AND t.fk_statut <> ".Facture::STATUS_DRAFT;
+			$sql .= "SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total as total_ht, t.total_ttc, t.tva as total_vat, t.multicurrency_code as currency, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'Invoice' as item, s.nom as thirdparty_name, s.code_client as thirdparty_code, c.code as country_code, s.tva_intra as vatnum, ".PAY_CREDIT." as sens";
+			$sql .= " FROM ".MAIN_DB_PREFIX."facture as t LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = t.fk_soc LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = s.fk_pays";
+			$sql .= " WHERE datef between ".$wheretail;
+			$sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+			$sql .= " AND t.fk_statut <> ".Facture::STATUS_DRAFT;
 		}
-	    // Vendor invoices
+		// Vendor invoices
 		if (GETPOST('selectsupplierinvoices')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total_ht, t.total_ttc, t.total_tva as total_vat, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'SupplierInvoice' as item, s.nom as thirdparty_name, s.code_fournisseur as thirdparty_code, c.code as country_code, s.tva_intra as vatnum, ".PAY_DEBIT." as sens";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as t LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = t.fk_soc LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = s.fk_pays";
-		    $sql .= " WHERE datef between ".$wheretail;
-		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
-		    $sql .= " AND t.fk_statut <> ".FactureFournisseur::STATUS_DRAFT;
+			$sql .= " SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total_ht, t.total_ttc, t.total_tva as total_vat, t.multicurrency_code as currency, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'SupplierInvoice' as item, s.nom as thirdparty_name, s.code_fournisseur as thirdparty_code, c.code as country_code, s.tva_intra as vatnum, ".PAY_DEBIT." as sens";
+			$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as t LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = t.fk_soc LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = s.fk_pays";
+			$sql .= " WHERE datef between ".$wheretail;
+			$sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+			$sql .= " AND t.fk_statut <> ".FactureFournisseur::STATUS_DRAFT;
 		}
-	    // Expense reports
+		// Expense reports
 		if (GETPOST('selectexpensereports')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, t.entity, t.ref, t.paid, t.total_ht, t.total_ttc, t.total_tva as total_vat, t.fk_user_author as fk_soc, t.date_fin as date, t.date_fin as date_due, 'ExpenseReport' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname) as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as t LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = t.fk_user_author LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = u.fk_country";
-		    $sql .= " WHERE date_fin between  ".$wheretail;
-		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
-		    $sql .= " AND t.fk_statut <> ".ExpenseReport::STATUS_DRAFT;
+			$sql .= " SELECT t.rowid as id, t.entity, t.ref, t.paid, t.total_ht, t.total_ttc, t.total_tva as total_vat, t.multicurrency_code as currency, t.fk_user_author as fk_soc, t.date_fin as date, t.date_fin as date_due, 'ExpenseReport' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname) as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
+			$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as t LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = t.fk_user_author LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = u.fk_country";
+			$sql .= " WHERE date_fin between  ".$wheretail;
+			$sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+			$sql .= " AND t.fk_statut <> ".ExpenseReport::STATUS_DRAFT;
 		}
-	    // Donations
+		// Donations
 		if (GETPOST('selectdonations')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, t.entity, t.ref, paid, amount as total_ht, amount as total_ttc, 0 as total_vat, 0 as fk_soc, t.datedon as date, t.datedon as date_due, 'Donation' as item, t.societe as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_CREDIT." as sens";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."don as t LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = t.fk_country";
-		    $sql .= " WHERE datedon between ".$wheretail;
-		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
-		    $sql .= " AND t.fk_statut <> ".Don::STATUS_DRAFT;
+			$sql .= " SELECT t.rowid as id, t.entity, t.ref, paid, amount as total_ht, amount as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, 0 as fk_soc, t.datedon as date, t.datedon as date_due, 'Donation' as item, t.societe as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_CREDIT." as sens";
+			$sql .= " FROM ".MAIN_DB_PREFIX."don as t LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = t.fk_country";
+			$sql .= " WHERE datedon between ".$wheretail;
+			$sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+			$sql .= " AND t.fk_statut <> ".Don::STATUS_DRAFT;
 		}
-	    // Paiements of salaries
+		// Payments of salaries
 		if (GETPOST('selectpaymentsofsalaries')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, t.entity, t.label as ref, 1 as paid, amount as total_ht, amount as total_ttc, 0 as total_vat, t.fk_user as fk_soc, t.datep as date, t.dateep as date_due, 'SalaryPayment' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname)  as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."payment_salary as t LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = t.fk_user LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = u.fk_country";
-		    $sql .= " WHERE datep between ".$wheretail;
-		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
-		    //$sql.=" AND fk_statut <> ".PaymentSalary::STATUS_DRAFT;
+			$sql .= " SELECT t.rowid as id, t.entity, t.label as ref, 1 as paid, amount as total_ht, amount as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, t.fk_user as fk_soc, t.datep as date, t.dateep as date_due, 'SalaryPayment' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname)  as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
+			$sql .= " FROM ".MAIN_DB_PREFIX."payment_salary as t LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = t.fk_user LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = u.fk_country";
+			$sql .= " WHERE datep between ".$wheretail;
+			$sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+			//$sql.=" AND fk_statut <> ".PaymentSalary::STATUS_DRAFT;
 		}
-	    // Social contributions
+		// Social contributions
 		if (GETPOST('selectsocialcontributions')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, t.entity, t.libelle as ref, t.paye as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_tva, 0 as fk_soc, t.date_ech as date, t.periode as date_due, 'SocialContributions' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as t";
-		    $sql .= " WHERE t.date_ech between ".$wheretail;
-		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
-		    //$sql.=" AND fk_statut <> ".ChargeSociales::STATUS_DRAFT;
+			$sql .= " SELECT t.rowid as id, t.entity, t.libelle as ref, t.paye as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, 0 as fk_soc, t.date_ech as date, t.periode as date_due, 'SocialContributions' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
+			$sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as t";
+			$sql .= " WHERE t.date_ech between ".$wheretail;
+			$sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+			//$sql.=" AND fk_statut <> ".ChargeSociales::STATUS_DRAFT;
 		}
-	    // Various payments
+		// Various payments
 		if (GETPOST('selectvariouspayment')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, t.entity, t.label as ref, 1 as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_tva, 0 as fk_soc, t.datep as date, t.datep as date_due, 'VariousPayment' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, sens";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."payment_various as t";
-		    $sql .= " WHERE datep between ".$wheretail;
-		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+			$sql .= " SELECT t.rowid as id, t.entity, t.ref, 1 as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, 0 as fk_soc, t.datep as date, t.datep as date_due, 'VariousPayment' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, sens";
+			$sql .= " FROM ".MAIN_DB_PREFIX."payment_various as t";
+			$sql .= " WHERE datep between ".$wheretail;
+			$sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
 		}
-        // Loan payments
+		// Loan payments
 		if (GETPOST('selectloanspayment')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, l.entity, l.label as ref, 1 as paid, (t.amount_capital+t.amount_insurance+t.amount_interest) as total_ht, (t.amount_capital+t.amount_insurance+t.amount_interest) as total_ttc, 0 as total_tva, 0 as fk_soc, t.datep as date, t.datep as date_due, 'LoanPayment' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."payment_loan as t LEFT JOIN ".MAIN_DB_PREFIX."loan as l ON l.rowid = t.fk_loan";
-		    $sql .= " WHERE datep between ".$wheretail;
-		    $sql .= " AND l.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+			$sql .= " SELECT t.rowid as id, l.entity, l.label as ref, 1 as paid, (t.amount_capital+t.amount_insurance+t.amount_interest) as total_ht, (t.amount_capital+t.amount_insurance+t.amount_interest) as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, 0 as fk_soc, t.datep as date, t.datep as date_due, 'LoanPayment' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
+			$sql .= " FROM ".MAIN_DB_PREFIX."payment_loan as t LEFT JOIN ".MAIN_DB_PREFIX."loan as l ON l.rowid = t.fk_loan";
+			$sql .= " WHERE datep between ".$wheretail;
+			$sql .= " AND l.entity IN (".($entity == 1 ? '0,1' : $entity).')';
 		}
 
 		if ($sql) {
-		    $sql .= $db->order($sortfield, $sortorder);
+			$sql .= $db->order($sortfield, $sortorder);
 			//print $sql;
 
-		    $resd = $db->query($sql);
-		    $files = array();
-		    $link = '';
+			$resd = $db->query($sql);
+			$files = array();
+			$link = '';
 
-		    if ($resd)
-		    {
-		        $numd = $db->num_rows($resd);
+			if ($resd)
+			{
+				$numd = $db->num_rows($resd);
 
-		        $tmpinvoice = new Facture($db);
-		        $tmpinvoicesupplier = new FactureFournisseur($db);
-		        $tmpdonation = new Don($db);
+				$tmpinvoice = new Facture($db);
+				$tmpinvoicesupplier = new FactureFournisseur($db);
+				$tmpdonation = new Don($db);
 
-		        $upload_dir = '';
-		        $i = 0;
-		        while ($i < $numd)
-		        {
-		            $objd = $db->fetch_object($resd);
+				$upload_dir = '';
+				$i = 0;
+				while ($i < $numd)
+				{
+					$objd = $db->fetch_object($resd);
 
-		            switch ($objd->item)
-		            {
-		                case "Invoice":
-		                	$subdir = '';
-		                	$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->ref);
-		                	$upload_dir = $conf->facture->dir_output.'/'.$subdir;
-		                	$link = "document.php?modulepart=facture&file=".str_replace('/', '%2F', $subdir).'%2F';
-                            $modulepart = "facture";
-		                	break;
-		                case "SupplierInvoice":
-		                	$tmpinvoicesupplier->fetch($objd->id);
-		                	$subdir = get_exdir($tmpinvoicesupplier->id, 2, 0, 1, $tmpinvoicesupplier, 'invoice_supplier'); // TODO Use first file
-		                	$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->ref);
-		                	$upload_dir = $conf->fournisseur->facture->dir_output.'/'.$subdir;
-		                	$link = "document.php?modulepart=facture_fournisseur&file=".str_replace('/', '%2F', $subdir).'%2F';
-                            $modulepart = "facture_fournisseur";
-		                	break;
-		                case "ExpenseReport":
-		                	$subdir = '';
-		                	$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->ref);
-		                	$upload_dir = $conf->expensereport->dir_output.'/'.$subdir;
-		                	$link = "document.php?modulepart=expensereport&file=".str_replace('/', '%2F', $subdir).'%2F';
-                            $modulepart = "expensereport";
-		                	break;
-		                case "SalaryPayment":
-		                	$subdir = '';
-		                	$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
-		                	$upload_dir = $conf->salaries->dir_output.'/'.$subdir;
-		                	$link = "document.php?modulepart=salaries&file=".str_replace('/', '%2F', $subdir).'%2F';
-                            $modulepart = "salaries";
-		                	break;
-		                case "Donation":
-		                	$tmpdonation->fetch($objp->id);
-		                	$subdir = get_exdir(0, 0, 0, 0, $tmpdonation, 'donation');
-		                	$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
-		                	$upload_dir = $conf->don->dir_output.'/'.$subdir;
-		                	$link = "document.php?modulepart=don&file=".str_replace('/', '%2F', $subdir).'%2F';
-                            $modulepart = "don";
-		                	break;
-		                case "SocialContributions":
-		                	$subdir = '';
-		                	$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
-		                	$upload_dir = $conf->tax->dir_output.'/'.$subdir;
-		                	$link = "document.php?modulepart=tax&file=".str_replace('/', '%2F', $subdir).'%2F';
-                            $modulepart = "tax";
-		                	break;
-		                case "VariousPayment":
-		                	$subdir = '';
-		                	$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
-		                	$upload_dir = $conf->bank->dir_output.'/'.$subdir;
-                            $link = "document.php?modulepart=banque&file=".str_replace('/', '%2F', $subdir).'%2F';
-                            $modulepart = "banque";
-		                	break;
-		                case "LoanPayment":
-                            // Loan payment has no linked file
-		                	$subdir = '';
-		                	$upload_dir = $conf->loan->dir_output.'/'.$subdir;
-                            $link = "";
-                            $modulepart = "";
-		                	break;
-		                default:
-		                    $subdir = '';
-		                    $upload_dir = '';
-		                    $link = '';
-		                    break;
-		            }
+					switch ($objd->item)
+					{
+						case "Invoice":
+							$subdir = '';
+							$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->ref);
+							$upload_dir = $conf->facture->dir_output.'/'.$subdir;
+							$link = "document.php?modulepart=facture&file=".str_replace('/', '%2F', $subdir).'%2F';
+							$modulepart = "facture";
+							break;
+						case "SupplierInvoice":
+							$tmpinvoicesupplier->fetch($objd->id);
+							$subdir = get_exdir($tmpinvoicesupplier->id, 2, 0, 1, $tmpinvoicesupplier, 'invoice_supplier'); // TODO Use first file
+							$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->ref);
+							$upload_dir = $conf->fournisseur->facture->dir_output.'/'.$subdir;
+							$link = "document.php?modulepart=facture_fournisseur&file=".str_replace('/', '%2F', $subdir).'%2F';
+							$modulepart = "facture_fournisseur";
+							break;
+						case "ExpenseReport":
+							$subdir = '';
+							$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->ref);
+							$upload_dir = $conf->expensereport->dir_output.'/'.$subdir;
+							$link = "document.php?modulepart=expensereport&file=".str_replace('/', '%2F', $subdir).'%2F';
+							$modulepart = "expensereport";
+							break;
+						case "SalaryPayment":
+							$subdir = '';
+							$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
+							$upload_dir = $conf->salaries->dir_output.'/'.$subdir;
+							$link = "document.php?modulepart=salaries&file=".str_replace('/', '%2F', $subdir).'%2F';
+							$modulepart = "salaries";
+							break;
+						case "Donation":
+							$tmpdonation->fetch($objp->id);
+							$subdir = get_exdir(0, 0, 0, 0, $tmpdonation, 'donation');
+							$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
+							$upload_dir = $conf->don->dir_output.'/'.$subdir;
+							$link = "document.php?modulepart=don&file=".str_replace('/', '%2F', $subdir).'%2F';
+							$modulepart = "don";
+							break;
+						case "SocialContributions":
+							$subdir = '';
+							$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
+							$upload_dir = $conf->tax->dir_output.'/'.$subdir;
+							$link = "document.php?modulepart=tax&file=".str_replace('/', '%2F', $subdir).'%2F';
+							$modulepart = "tax";
+							break;
+						case "VariousPayment":
+							$subdir = '';
+							$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
+							$upload_dir = $conf->bank->dir_output.'/'.$subdir;
+							$link = "document.php?modulepart=banque&file=".str_replace('/', '%2F', $subdir).'%2F';
+							$modulepart = "banque";
+							break;
+						case "LoanPayment":
+							// Loan payment has no linked file
+							$subdir = '';
+							$upload_dir = $conf->loan->dir_output.'/'.$subdir;
+							$link = "";
+							$modulepart = "";
+							break;
+						default:
+							$subdir = '';
+							$upload_dir = '';
+							$link = '';
+							break;
+					}
 
-		            if (!empty($upload_dir))
-		            {
-		                $result = true;
+					if (!empty($upload_dir))
+					{
+						$result = true;
 
-		                $files = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', '', SORT_ASC, 1);
-		                //var_dump($upload_dir);
-		                //var_dump($files);
-		                if (count($files) < 1)
-		                {
-		                	$nofile = array();
-		                	$nofile['id'] = $objd->id;
-		                	$nofile['entity'] = $objd->entity;
-		                	$nofile['date'] = $db->idate($objd->date);
-		                	$nofile['date_due'] = $db->idate($objd->date_due);
-		                	$nofile['paid'] = $objd->paid;
-		                    $nofile['amount_ht'] = $objd->total_ht;
-		                    $nofile['amount_ttc'] = $objd->total_ttc;
-		                    $nofile['amount_vat'] = $objd->total_vat;
-		                    $nofile['ref'] = ($objd->ref ? $objd->ref : $objd->id);
-		                    $nofile['fk'] = $objd->fk_soc;
-		                    $nofile['item'] = $objd->item;
-		                    $nofile['thirdparty_name'] = $objd->thirdparty_name;
-		                    $nofile['thirdparty_code'] = $objd->thirdparty_code;
-		                    $nofile['country_code'] = $objd->country_code;
-		                    $nofile['vatnum'] = $objd->vatnum;
-		                    $nofile['sens'] = $objd->sens;
+						$files = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', '', SORT_ASC, 1);
+						//var_dump($upload_dir);
+						//var_dump($files);
+						if (count($files) < 1)
+						{
+							$nofile = array();
+							$nofile['id'] = $objd->id;
+							$nofile['entity'] = $objd->entity;
+							$nofile['date'] = $db->idate($objd->date);
+							$nofile['date_due'] = $db->idate($objd->date_due);
+							$nofile['paid'] = $objd->paid;
+							$nofile['amount_ht'] = $objd->total_ht;
+							$nofile['amount_ttc'] = $objd->total_ttc;
+							$nofile['amount_vat'] = $objd->total_vat;
+							$nofile['ref'] = ($objd->ref ? $objd->ref : $objd->id);
+							$nofile['fk'] = $objd->fk_soc;
+							$nofile['item'] = $objd->item;
+							$nofile['thirdparty_name'] = $objd->thirdparty_name;
+							$nofile['thirdparty_code'] = $objd->thirdparty_code;
+							$nofile['country_code'] = $objd->country_code;
+							$nofile['vatnum'] = $objd->vatnum;
+							$nofile['sens'] = $objd->sens;
 
-		                    $filesarray[$nofile['item'].'_'.$nofile['id']] = $nofile;
-		                } else {
-		                    foreach ($files as $key => $file)
-		                    {
-		                    	$file['id'] = $objd->id;
-		                    	$file['entity'] = $objd->entity;
-		                    	$file['date'] = $db->idate($objd->date);
-		                    	$file['date_due'] = $db->idate($objd->date_due);
-		                    	$file['paid'] = $objd->paid;
-		                        $file['amount_ht'] = $objd->total_ht;
-		                        $file['amount_ttc'] = $objd->total_ttc;
-		                        $file['amount_vat'] = $objd->total_vat;
-		                        $file['ref'] = ($objd->ref ? $objd->ref : $objd->id);
-		                        $file['fk'] = $objd->fk_soc;
-		                        $file['item'] = $objd->item;
-		                        $file['thirdparty_name'] = $objd->thirdparty_name;
-		                        $file['thirdparty_code'] = $objd->thirdparty_code;
-		                        $file['country_code'] = $objd->country_code;
-		                        $file['vatnum'] = $objd->vatnum;
-                                $file['sens'] = $objd->sens;
+							$filesarray[$nofile['item'].'_'.$nofile['id']] = $nofile;
+						} else {
+							foreach ($files as $key => $file)
+							{
+								$file['id'] = $objd->id;
+								$file['entity'] = $objd->entity;
+								$file['date'] = $db->idate($objd->date);
+								$file['date_due'] = $db->idate($objd->date_due);
+								$file['paid'] = $objd->paid;
+								$file['amount_ht'] = $objd->total_ht;
+								$file['amount_ttc'] = $objd->total_ttc;
+								$file['amount_vat'] = $objd->total_vat;
+								$file['ref'] = ($objd->ref ? $objd->ref : $objd->id);
+								$file['fk'] = $objd->fk_soc;
+								$file['item'] = $objd->item;
+								$file['thirdparty_name'] = $objd->thirdparty_name;
+								$file['thirdparty_code'] = $objd->thirdparty_code;
+								$file['country_code'] = $objd->country_code;
+								$file['vatnum'] = $objd->vatnum;
+								$file['sens'] = $objd->sens;
 
-		                        // Save record into array (only the first time it is found)
-		                        if (empty($filesarray[$file['item'].'_'.$file['id']])) {
-		                        	$filesarray[$file['item'].'_'.$file['id']] = $file;
-		                        }
+								// Save record into array (only the first time it is found)
+								if (empty($filesarray[$file['item'].'_'.$file['id']])) {
+									$filesarray[$file['item'].'_'.$file['id']] = $file;
+								}
 
-		                        // Add or concat file
-		                        if (empty($filesarray[$file['item'].'_'.$file['id']]['files'])) {
-		                        	$filesarray[$file['item'].'_'.$file['id']]['files'] = array();
-		                        }
-                                $filesarray[$file['item'].'_'.$file['id']]['files'][] = array(
-                                    'link' => $link.urlencode($file['name']),
-                                    'name'=>$file['name'],
-                                    'ref'=>$file['ref'],
-                                    'fullname' => $file['fullname'],
-                                    'relpath' => '/'.$file['name'],
-                                    'relpathnamelang' => $langs->trans($file['item']).'/'.$file['name'],
-                                    'modulepart' => $modulepart,
-                                    'subdir' => $subdir,
-                                );
-		                        //var_dump($file['item'].'_'.$file['id']);
-		                        //var_dump($filesarray[$file['item'].'_'.$file['id']]['files']);
-		                    }
-		                }
-		            }
+								// Add or concat file
+								if (empty($filesarray[$file['item'].'_'.$file['id']]['files'])) {
+									$filesarray[$file['item'].'_'.$file['id']]['files'] = array();
+								}
+								$filesarray[$file['item'].'_'.$file['id']]['files'][] = array(
+									'link' => $link.urlencode($file['name']),
+									'name'=>$file['name'],
+									'ref'=>$file['ref'],
+									'fullname' => $file['fullname'],
+									'relpath' => '/'.$file['name'],
+									'relpathnamelang' => $langs->trans($file['item']).'/'.$file['name'],
+									'modulepart' => $modulepart,
+									'subdir' => $subdir,
+								);
+								//var_dump($file['item'].'_'.$file['id']);
+								//var_dump($filesarray[$file['item'].'_'.$file['id']]['files']);
+							}
+						}
+					}
 
-		            $i++;
-		        }
-		    } else {
-		        dol_print_error($db);
-		    }
+					$i++;
+				}
+			} else {
+				dol_print_error($db);
+			}
 
-		    $db->free($resd);
+			$db->free($resd);
 		} else {
 			setEventMessages($langs->trans("ErrorSelectAtLeastOne"), null, 'errors');
 			$error++;
@@ -414,81 +414,81 @@ if ($result && $action == "dl" && !$error)
 		exit;
 	}
 
-    dol_mkdir($dirfortmpfile);
+	dol_mkdir($dirfortmpfile);
 
-    $log = $langs->transnoentitiesnoconv("Type");
-    if (!empty($conf->multicompany->enabled) && is_object($mc))
-    {
-    	$log .= ','.$langs->transnoentitiesnoconv("Entity");
-    }
-    $log .= ','.$langs->transnoentitiesnoconv("Date");
-    $log .= ','.$langs->transnoentitiesnoconv("DateDue");
-    $log .= ','.$langs->transnoentitiesnoconv("Ref");
-    $log .= ','.$langs->transnoentitiesnoconv("TotalHT");
-    $log .= ','.$langs->transnoentitiesnoconv("TotalTTC");
-    $log .= ','.$langs->transnoentitiesnoconv("TotalVAT");
-    $log .= ','.$langs->transnoentitiesnoconv("Paid");
-    $log .= ','.$langs->transnoentitiesnoconv("Document");
-    $log .= ','.$langs->transnoentitiesnoconv("ItemID");
-    $log .= ','.$langs->transnoentitiesnoconv("ThirdParty");
-    $log .= ','.$langs->transnoentitiesnoconv("Code");
-    $log .= ','.$langs->transnoentitiesnoconv("Country");
-    $log .= ','.$langs->transnoentitiesnoconv("VATIntra");
-    $log .= ','.$langs->transnoentitiesnoconv("Sens")."\n";
-    $zipname = $dirfortmpfile.'/'.dol_print_date($date_start, 'dayrfc')."-".dol_print_date($date_stop, 'dayrfc').'_export.zip';
+	$log = $langs->transnoentitiesnoconv("Type");
+	if (!empty($conf->multicompany->enabled) && is_object($mc))
+	{
+		$log .= ','.$langs->transnoentitiesnoconv("Entity");
+	}
+	$log .= ','.$langs->transnoentitiesnoconv("Date");
+	$log .= ','.$langs->transnoentitiesnoconv("DateDue");
+	$log .= ','.$langs->transnoentitiesnoconv("Ref");
+	$log .= ','.$langs->transnoentitiesnoconv("TotalHT");
+	$log .= ','.$langs->transnoentitiesnoconv("TotalTTC");
+	$log .= ','.$langs->transnoentitiesnoconv("TotalVAT");
+	$log .= ','.$langs->transnoentitiesnoconv("Paid");
+	$log .= ','.$langs->transnoentitiesnoconv("Document");
+	$log .= ','.$langs->transnoentitiesnoconv("ItemID");
+	$log .= ','.$langs->transnoentitiesnoconv("ThirdParty");
+	$log .= ','.$langs->transnoentitiesnoconv("Code");
+	$log .= ','.$langs->transnoentitiesnoconv("Country");
+	$log .= ','.$langs->transnoentitiesnoconv("VATIntra");
+	$log .= ','.$langs->transnoentitiesnoconv("Sens")."\n";
+	$zipname = $dirfortmpfile.'/'.dol_print_date($date_start, 'dayrfc')."-".dol_print_date($date_stop, 'dayrfc').'_export.zip';
 
-    dol_delete_file($zipname);
+	dol_delete_file($zipname);
 
-    $zip = new ZipArchive;
-    $res = $zip->open($zipname, ZipArchive::OVERWRITE | ZipArchive::CREATE);
-    if ($res)
-    {
-        foreach ($filesarray as $key => $file)
-        {
-            if (!empty($file['files'])) {
-                foreach ($file['files'] as $filecursor) {
-                    if (file_exists($filecursor["fullname"])) {
-                        $zip->addFile($filecursor["fullname"], $filecursor["relpathnamelang"]);
-                    }
-                }
-            }
+	$zip = new ZipArchive;
+	$res = $zip->open($zipname, ZipArchive::OVERWRITE | ZipArchive::CREATE);
+	if ($res)
+	{
+		foreach ($filesarray as $key => $file)
+		{
+			if (!empty($file['files'])) {
+				foreach ($file['files'] as $filecursor) {
+					if (file_exists($filecursor["fullname"])) {
+						$zip->addFile($filecursor["fullname"], $filecursor["relpathnamelang"]);
+					}
+				}
+			}
 
-            $log .= '"'.$langs->trans($file['item']).'"';
-            if (!empty($conf->multicompany->enabled) && is_object($mc))
-            {
-            	$log .= ',"'.(empty($arrayofentities[$file['entity']]) ? $file['entity'] : $arrayofentities[$file['entity']]).'"';
-            }
-            $log .= ','.dol_print_date($file['date'], 'dayrfc');
-            $log .= ','.dol_print_date($file['date_due'], 'dayrfc');
-            $log .= ',"'.$file['ref'].'"';
-            $log .= ','.$file['amount_ht'];
-            $log .= ','.$file['amount_ttc'];
-            $log .= ','.$file['amount_vat'];
-            $log .= ','.$file['paid'];
-            $log .= ',"'.$file["name"].'"';
-            $log .= ','.$file['fk'];
-            $log .= ',"'.$file['thirdparty_name'].'"';
-            $log .= ',"'.$file['thirdparty_code'].'"';
-            $log .= ',"'.$file['country_code'].'"';
-            $log .= ',"'.$file['vatnum'].'"';
-            $log .= ',"'.$file['sens'].'"';
-            $log .= "\n";
-        }
-        $zip->addFromString('transactions.csv', $log);
-        $zip->close();
+			$log .= '"'.$langs->trans($file['item']).'"';
+			if (!empty($conf->multicompany->enabled) && is_object($mc))
+			{
+				$log .= ',"'.(empty($arrayofentities[$file['entity']]) ? $file['entity'] : $arrayofentities[$file['entity']]).'"';
+			}
+			$log .= ','.dol_print_date($file['date'], 'dayrfc');
+			$log .= ','.dol_print_date($file['date_due'], 'dayrfc');
+			$log .= ',"'.$file['ref'].'"';
+			$log .= ','.$file['amount_ht'];
+			$log .= ','.$file['amount_ttc'];
+			$log .= ','.$file['amount_vat'];
+			$log .= ','.$file['paid'];
+			$log .= ',"'.$file["name"].'"';
+			$log .= ','.$file['fk'];
+			$log .= ',"'.$file['thirdparty_name'].'"';
+			$log .= ',"'.$file['thirdparty_code'].'"';
+			$log .= ',"'.$file['country_code'].'"';
+			$log .= ',"'.$file['vatnum'].'"';
+			$log .= ',"'.$file['sens'].'"';
+			$log .= "\n";
+		}
+		$zip->addFromString('transactions.csv', $log);
+		$zip->close();
 
-        ///Then download the zipped file.
-        header('Content-Type: application/zip');
-        header('Content-disposition: attachment; filename='.basename($zipname));
-        header('Content-Length: '.filesize($zipname));
-        readfile($zipname);
+		///Then download the zipped file.
+		header('Content-Type: application/zip');
+		header('Content-disposition: attachment; filename='.basename($zipname));
+		header('Content-Length: '.filesize($zipname));
+		readfile($zipname);
 
-        dol_delete_file($zipname);
+		dol_delete_file($zipname);
 
-        exit();
-    } else {
-    	setEventMessages($langs->trans("FailedToOpenFile", $zipname), null, 'errors');
-    }
+		exit();
+	} else {
+		setEventMessages($langs->trans("FailedToOpenFile", $zipname), null, 'errors');
+	}
 }
 
 
@@ -519,12 +519,15 @@ $head[$h][0] = $_SERVER["PHP_SELF"];
 $head[$h][1] = $langs->trans("AccountantFiles");
 $head[$h][2] = 'AccountancyFiles';
 
-dol_fiche_head($head, 'AccountancyFiles');
+print dol_get_fiche_head($head, 'AccountancyFiles');
 
 
 print '<form name="searchfiles" action="?action=searchfiles" method="POST">'."\n";
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
+print '<span class="opacitymedium">'.$langs->trans("ExportAccountingSourceDocHelp", $langs->transnoentitiesnoconv("Accounting"), $langs->transnoentitiesnoconv("Journals")).'</span><br>';
+print '<br>';
+
 print $langs->trans("ReportPeriod").': '.$form->selectDate($date_start, 'date_start', 0, 0, 0, "", 1, 1, 0);
 print ' - '.$form->selectDate($date_stop, 'date_stop', 0, 0, 0, "", 1, 1, 0)."\n</a>";
 
@@ -564,200 +567,226 @@ print '<input class="button" type="submit" name="search" value="'.$langs->trans(
 
 print '</form>'."\n";
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 if (!empty($date_start) && !empty($date_stop))
 {
-    $param = 'action=searchfiles';
-    $param .= '&date_startday='.GETPOST('date_startday', 'int');
-    $param .= '&date_startmonth='.GETPOST('date_startmonth', 'int');
-    $param .= '&date_startyear='.GETPOST('date_startyear', 'int');
-    $param .= '&date_stopday='.GETPOST('date_stopday', 'int');
-    $param .= '&date_stopmonth='.GETPOST('date_stopmonth', 'int');
-    $param .= '&date_stopyear='.GETPOST('date_stopyear', 'int');
-    foreach ($listofchoices as $choice => $val) {
-    	$param .= '&'.$choice.'='.(GETPOST($choice, 'int') ? 1 : 0);
-    }
-    print '<form name="dl" action="?action=dl" method="POST" >'."\n";
-    print '<input type="hidden" name="token" value="'.currentToken().'">';
+	$param = 'action=searchfiles';
+	$param .= '&date_startday='.GETPOST('date_startday', 'int');
+	$param .= '&date_startmonth='.GETPOST('date_startmonth', 'int');
+	$param .= '&date_startyear='.GETPOST('date_startyear', 'int');
+	$param .= '&date_stopday='.GETPOST('date_stopday', 'int');
+	$param .= '&date_stopmonth='.GETPOST('date_stopmonth', 'int');
+	$param .= '&date_stopyear='.GETPOST('date_stopyear', 'int');
+	foreach ($listofchoices as $choice => $val) {
+		$param .= '&'.$choice.'='.(GETPOST($choice, 'int') ? 1 : 0);
+	}
+	print '<form name="dl" action="'.$_SERVER["PHP_SELF"].'?action=dl" method="POST">'."\n";
+	print '<input type="hidden" name="token" value="'.currentToken().'">';
 
-    echo dol_print_date($date_start, 'day')." - ".dol_print_date($date_stop, 'day');
+	echo dol_print_date($date_start, 'day')." - ".dol_print_date($date_stop, 'day');
 
-    print '<input type="hidden" name="date_start" value="'.dol_print_date($date_start, 'dayxcard').'" />';
-    print '<input type="hidden" name="date_stop"  value="'.dol_print_date($date_stop, 'dayxcard').'" />';
-    foreach ($listofchoices as $choice => $val) {
-    	print '<input type="hidden" name="'.$choice.'" value="'.GETPOST($choice).'">';
-    }
+	print '<input type="hidden" name="date_start" value="'.dol_print_date($date_start, 'dayxcard').'" />';
+	print '<input type="hidden" name="date_stop"  value="'.dol_print_date($date_stop, 'dayxcard').'" />';
+	foreach ($listofchoices as $choice => $val) {
+		print '<input type="hidden" name="'.$choice.'" value="'.GETPOST($choice).'">';
+	}
 
-    print '<input class="butAction" type="submit" value="'.$langs->trans("Download").'" />';
-    print '</form>'."\n";
+	print '<input class="butAction butDownload" type="submit" value="'.$langs->trans("Download").'" />';
+	print '</form>'."\n";
 
-    print '<br>';
+	print '<br>';
 
-    print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre($arrayfields['type']['label'], $_SERVER["PHP_SELF"], "item", "", $param, '', $sortfield, $sortorder, 'nowrap ');
-    print_liste_field_titre($arrayfields['date']['label'], $_SERVER["PHP_SELF"], "date", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-    print_liste_field_titre($arrayfields['date_due']['label'], $_SERVER["PHP_SELF"], "date_due", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-    print_liste_field_titre($arrayfields['ref']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'nowraponall ');
-    print '<td>'.$langs->trans("Document").'</td>';
-    print '<td>'.$langs->trans("Paid").'</td>';
-    print '<td align="right">'.$langs->trans("TotalHT").'</td>';
-    print '<td align="right">'.$langs->trans("TotalTTC").'</td>';
-    print '<td align="right">'.$langs->trans("TotalVAT").'</td>';
+	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($arrayfields['type']['label'], $_SERVER["PHP_SELF"], "item", "", $param, '', $sortfield, $sortorder, 'nowrap ');
+	print_liste_field_titre($arrayfields['date']['label'], $_SERVER["PHP_SELF"], "date", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	print_liste_field_titre($arrayfields['date_due']['label'], $_SERVER["PHP_SELF"], "date_due", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	print_liste_field_titre($arrayfields['ref']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'nowraponall ');
+	print '<td>'.$langs->trans("Document").'</td>';
+	print '<td>'.$langs->trans("Paid").'</td>';
+	print '<td align="right">'.$langs->trans("TotalHT").($conf->multicurrency->enabled ? ' ('.$conf->currency.')' : '').'</td>';
+	print '<td align="right">'.$langs->trans("TotalTTC").($conf->multicurrency->enabled ? ' ('.$conf->currency.')' : '').'</td>';
+	print '<td align="right">'.$langs->trans("TotalVAT").($conf->multicurrency->enabled ? ' ('.$conf->currency.')' : '').'</td>';
 	print '<td>'.$langs->trans("ThirdParty").'</td>';
 	print '<td class="center">'.$langs->trans("Code").'</td>';
 	print '<td class="center">'.$langs->trans("Country").'</td>';
-    print '<td class="center">'.$langs->trans("VATIntra").'</td>';
-    print '</tr>';
-    if ($result)
-    {
-        $TData = dol_sort_array($filesarray, $sortfield, $sortorder);
+	print '<td class="center">'.$langs->trans("VATIntra").'</td>';
+	if (!empty($conf->multicurrency->enabled)) print '<td class="center">'.$langs->trans("Currency").'</td>';
+	print '</tr>';
+	if ($result)
+	{
+		$TData = dol_sort_array($filesarray, $sortfield, $sortorder);
 
-        if (empty($TData))
-        {
-            print '<tr class="oddeven"><td colspan="7">'.$langs->trans("NoItem").'</td></tr>';
-        } else {
-            // Sort array by date ASC to calculate balance
+		if (empty($TData))
+		{
+			print '<tr class="oddeven"><td colspan="7">'.$langs->trans("NoItem").'</td>';
+			if (!empty($conf->multicurrency->enabled)) {
+				print '<td></td>';
+			}
+			print '</tr>';
+		} else {
+			// Sort array by date ASC to calculate balance
 
-            $totalET_debit = 0;
-            $totalIT_debit = 0;
-            $totalVAT_debit = 0;
-            $totalET_credit = 0;
-            $totalIT_credit = 0;
-            $totalVAT_credit = 0;
+			$totalET_debit = 0;
+			$totalIT_debit = 0;
+			$totalVAT_debit = 0;
+			$totalET_credit = 0;
+			$totalIT_credit = 0;
+			$totalVAT_credit = 0;
 
-            // Display array
-            foreach ($TData as $data)
-            {
-                $html_class = '';
-                //if (!empty($data['fk_facture'])) $html_class = 'facid-'.$data['fk_facture'];
-                //elseif (!empty($data['fk_paiement'])) $html_class = 'payid-'.$data['fk_paiement'];
-                print '<tr class="oddeven '.$html_class.'">';
+			// Display array
+			foreach ($TData as $data)
+			{
+				$html_class = '';
+				//if (!empty($data['fk_facture'])) $html_class = 'facid-'.$data['fk_facture'];
+				//elseif (!empty($data['fk_paiement'])) $html_class = 'payid-'.$data['fk_paiement'];
+				print '<tr class="oddeven '.$html_class.'">';
 
-                // Type
-                print '<td>'.$langs->trans($data['item']).'</td>';
+				// Type
+				print '<td>'.$langs->trans($data['item']).'</td>';
 
-                // Date
-                print '<td class="center">';
-                print dol_print_date($data['date'], 'day');
-                print "</td>\n";
+				// Date
+				print '<td class="center">';
+				print dol_print_date($data['date'], 'day');
+				print "</td>\n";
 
-                // Date
-                print '<td class="center">';
-                print dol_print_date($data['date_due'], 'day');
-                print "</td>\n";
+				// Date due
+				print '<td class="center">';
+				print dol_print_date($data['date_due'], 'day');
+				print "</td>\n";
 
-                // Ref
-                print '<td class="nowraponall">';
+				// Ref
+				print '<td class="nowraponall">';
 
 				if ($data['item'] == 'Invoice') {
 					$invoice->id = $data['id'];
-                	$invoice->ref = $data['ref'];
-                	print $invoice->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+					$invoice->ref = $data['ref'];
+					$invoice->total_ht = $data['amount_ht'];
+					$invoice->total_ttc = $data['amount_ttc'];
+					$invoice->total_tva = $data['amount_vat'];
+					$invoice->multicurrency_code = $data['currency'];
+					print $invoice->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
 				} elseif ($data['item'] == 'SupplierInvoice') {
-                	$supplier_invoice->id = $data['id'];
-                	$supplier_invoice->ref = $data['ref'];
-                	print $supplier_invoice->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+					$supplier_invoice->id = $data['id'];
+					$supplier_invoice->ref = $data['ref'];
+					$supplier_invoice->total_ht = $data['amount_ht'];
+					$supplier_invoice->total_ttc = $data['amount_ttc'];
+					$supplier_invoice->total_tva = $data['amount_vat'];
+					$supplier_invoice->multicurrency_code = $data['currency'];
+					print $supplier_invoice->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
 				} elseif ($data['item'] == 'ExpenseReport') {
-                    $expensereport->id = $data['id'];
-                	$expensereport->ref = $data['ref'];
-                	print $expensereport->getNomUrl(1, 0, 0, '', 0, 0);
+					$expensereport->id = $data['id'];
+					$expensereport->ref = $data['ref'];
+					print $expensereport->getNomUrl(1, 0, 0, '', 0, 0);
 				} elseif ($data['item'] == 'SalaryPayment') {
-                    $salary_payment->id = $data['id'];
-                	$salary_payment->ref = $data['ref'];
-                	print $salary_payment->getNomUrl(1, '', 0, '', 0);
+					$salary_payment->id = $data['id'];
+					$salary_payment->ref = $data['ref'];
+					print $salary_payment->getNomUrl(1, '', 0, '', 0);
 				} elseif ($data['item'] == 'Donation') {
-                    $don->id = $data['id'];
-                	$don->ref = $data['ref'];
-                	print $don->getNomUrl(1, 0, '', 0);
+					$don->id = $data['id'];
+					$don->ref = $data['ref'];
+					print $don->getNomUrl(1, 0, '', 0);
 				} elseif ($data['item'] == 'SocialContributions') {
-                    $charge_sociales->id = $data['id'];
-                	$charge_sociales->ref = $data['ref'];
-                	print $charge_sociales->getNomUrl(1, 0, 0, 0, 0);
+					$charge_sociales->id = $data['id'];
+					$charge_sociales->ref = $data['ref'];
+					print $charge_sociales->getNomUrl(1, 0, 0, 0, 0);
 				} elseif ($data['item'] == 'VariousPayment') {
-                    $various_payment->id = $data['id'];
-                	$various_payment->ref = $data['ref'];
-                	print $various_payment->getNomUrl(1, '', 0, 0);
+					$various_payment->id = $data['id'];
+					$various_payment->ref = $data['ref'];
+					print $various_payment->getNomUrl(1, '', 0, 0);
 				} elseif ($data['item'] == 'LoanPayment') {
-                    $payment_loan->id = $data['id'];
-                	$payment_loan->ref = $data['ref'];
-                	print $payment_loan->getNomUrl(1, 0, 0, '', 0);
+					$payment_loan->id = $data['id'];
+					$payment_loan->ref = $data['ref'];
+					print $payment_loan->getNomUrl(1, 0, 0, '', 0);
 				} else {
-                	print $data['ref'];
+					print $data['ref'];
 				}
-                print '</td>';
+				print '</td>';
 
-                // File link
-                print '<td>';
-                if (!empty($data['files']))
-                {
-                	foreach ($data['files'] as $id=>$filecursor) {
-                        print '<a href='.DOL_URL_ROOT.'/'.$filecursor['link'].' target="_blank">'.($filecursor['name'] ? $filecursor['name'] : $filecursor['ref']).'</a>&nbsp;'.$formfile->showPreview($filecursor, $filecursor['modulepart'], $filecursor['subdir'].'/'.$filecursor['name']).'<br>';
-                	}
-                }
-                print "</td>\n";
+				// File link
+				print '<td>';
+				if (!empty($data['files']))
+				{
+					foreach ($data['files'] as $id=>$filecursor) {
+						print '<a href='.DOL_URL_ROOT.'/'.$filecursor['link'].' target="_blank">'.($filecursor['name'] ? $filecursor['name'] : $filecursor['ref']).'</a>&nbsp;'.$formfile->showPreview($filecursor, $filecursor['modulepart'], $filecursor['subdir'].'/'.$filecursor['name']).'<br>';
+					}
+				}
+				print "</td>\n";
 
-                // Paid
-                print '<td aling="left">'.$data['paid'].'</td>';
+				// Paid
+				print '<td aling="left">'.$data['paid'].'</td>';
 
-                // Total ET
-                print '<td align="right">'.price($data['sens'] ? $data['amount_ht'] : -$data['amount_ht'])."</td>\n";
-                // Total IT
-                print '<td align="right">'.price($data['sens'] ? $data['amount_ttc'] : -$data['amount_ttc'])."</td>\n";
-                // Total VAT
-                print '<td align="right">'.price($data['sens'] ? $data['amount_vat'] : -$data['amount_vat'])."</td>\n";
+				// Total ET
+				print '<td align="right">'.price($data['sens'] ? $data['amount_ht'] : -$data['amount_ht'])."</td>\n";
+				// Total IT
+				print '<td align="right">'.price($data['sens'] ? $data['amount_ttc'] : -$data['amount_ttc'])."</td>\n";
+				// Total VAT
+				print '<td align="right">'.price($data['sens'] ? $data['amount_vat'] : -$data['amount_vat'])."</td>\n";
 
-                print '<td>'.$data['thirdparty_name']."</td>\n";
+				print '<td class="tdoverflowmax150" title="'.$data['thirdparty_name'].'">'.$data['thirdparty_name']."</td>\n";
 
-                print '<td class="center">'.$data['thirdparty_code']."</td>\n";
+				print '<td class="center">'.$data['thirdparty_code']."</td>\n";
 
-                print '<td class="center">'.$data['country_code']."</td>\n";
+				print '<td class="center">'.$data['country_code']."</td>\n";
 
-                print '<td align="right">'.$data['vatnum']."</td>\n";
+				print '<td align="right">'.$data['vatnum']."</td>\n";
 
-                if ($data['sens']) {
-                    $totalET_credit += $data['amount_ht'];
-                    $totalIT_credit += $data['amount_ttc'];
-                    $totalVAT_credit += $data['amount_vat'];
-                } else {
-                    $totalET_debit -= $data['amount_ht'];
-                    $totalIT_debit -= $data['amount_ttc'];
-                    $totalVAT_debit -= $data['amount_vat'];
-                }
+				if ($data['sens']) {
+					$totalET_credit += $data['amount_ht'];
+					$totalIT_credit += $data['amount_ttc'];
+					$totalVAT_credit += $data['amount_vat'];
+				} else {
+					$totalET_debit -= $data['amount_ht'];
+					$totalIT_debit -= $data['amount_ttc'];
+					$totalVAT_debit -= $data['amount_vat'];
+				}
 
-                print "</tr>\n";
-            }
+				if (!empty($conf->multicurrency->enabled)) {
+					print '<td class="center">'.$data['currency']."</td>\n";
+				}
 
-            // Total credits
-            print '<tr class="liste_total">';
-            print '<td colspan="6" class="right">'.$langs->trans('Total').' '.$langs->trans('Income').'</td>';
-            print '<td align="right">'.price(price2num($totalET_credit, 'MT')).'</td>';
-            print '<td align="right">'.price(price2num($totalIT_credit, 'MT')).'</td>';
-            print '<td align="right">'.price(price2num($totalVAT_credit, 'MT')).'</td>';
-            print '<td colspan="4"></td>';
-            print "</tr>\n";
-            // Total debits
-            print '<tr class="liste_total">';
-            print '<td colspan="6" class="right">'.$langs->trans('Total').' '.$langs->trans('Outcome').'</td>';
-            print '<td align="right">'.price(price2num($totalET_debit, 'MT')).'</td>';
-            print '<td align="right">'.price(price2num($totalIT_debit, 'MT')).'</td>';
-            print '<td align="right">'.price(price2num($totalVAT_debit, 'MT')).'</td>';
-            print '<td colspan="4"></td>';
-            print "</tr>\n";
-            // Balance
-            print '<tr class="liste_total">';
-            print '<td colspan="6" class="right">'.$langs->trans('Total').'</td>';
-            print '<td align="right">'.price(price2num($totalET_credit + $totalET_debit, 'MT')).'</td>';
-            print '<td align="right">'.price(price2num($totalIT_credit + $totalIT_debit, 'MT')).'</td>';
-            print '<td align="right">'.price(price2num($totalVAT_credit + $totalVAT_debit, 'MT')).'</td>';
-            print '<td colspan="4"></td>';
-            print "</tr>\n";
-        }
-    }
-    print "</table>";
-    print '</div>';
+				print "</tr>\n";
+			}
+
+			// Total credits
+			print '<tr class="liste_total">';
+			print '<td colspan="6" class="right">'.$langs->trans('Total').' '.$langs->trans('Income').'</td>';
+			print '<td align="right">'.price(price2num($totalET_credit, 'MT')).'</td>';
+			print '<td align="right">'.price(price2num($totalIT_credit, 'MT')).'</td>';
+			print '<td align="right">'.price(price2num($totalVAT_credit, 'MT')).'</td>';
+			print '<td colspan="4"></td>';
+			if (!empty($conf->multicurrency->enabled)) {
+				print '<td></td>';
+			}
+			print "</tr>\n";
+			// Total debits
+			print '<tr class="liste_total">';
+			print '<td colspan="6" class="right">'.$langs->trans('Total').' '.$langs->trans('Outcome').'</td>';
+			print '<td align="right">'.price(price2num($totalET_debit, 'MT')).'</td>';
+			print '<td align="right">'.price(price2num($totalIT_debit, 'MT')).'</td>';
+			print '<td align="right">'.price(price2num($totalVAT_debit, 'MT')).'</td>';
+			print '<td colspan="4"></td>';
+			if (!empty($conf->multicurrency->enabled)) {
+				print '<td></td>';
+			}
+			print "</tr>\n";
+			// Balance
+			print '<tr class="liste_total">';
+			print '<td colspan="6" class="right">'.$langs->trans('Total').'</td>';
+			print '<td align="right">'.price(price2num($totalET_credit + $totalET_debit, 'MT')).'</td>';
+			print '<td align="right">'.price(price2num($totalIT_credit + $totalIT_debit, 'MT')).'</td>';
+			print '<td align="right">'.price(price2num($totalVAT_credit + $totalVAT_debit, 'MT')).'</td>';
+			print '<td colspan="4"></td>';
+			if (!empty($conf->multicurrency->enabled)) {
+				print '<td></td>';
+			}
+			print "</tr>\n";
+		}
+	}
+	print "</table>";
+	print '</div>';
 }
 
 
diff --git a/htdocs/compta/bank/account_statement_document.php b/htdocs/compta/bank/account_statement_document.php
index 3b8423b68dc..fd7c6b1d292 100644
--- a/htdocs/compta/bank/account_statement_document.php
+++ b/htdocs/compta/bank/account_statement_document.php
@@ -152,7 +152,7 @@ if ($id > 0 || !empty($ref)) {
 
 		// Onglets
 		$head = account_statement_prepare_head($object, $numref);
-		dol_fiche_head($head, 'document', $langs->trans("AccountStatement"), -1, 'account');
+		print dol_get_fiche_head($head, 'document', $langs->trans("AccountStatement"), -1, 'account');
 
 
 		// Build file list
@@ -182,7 +182,7 @@ if ($id > 0 || !empty($ref)) {
 
 		print '</div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		$modulepart = 'bank';
diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index cd82da0e1bd..a0650e9ffa4 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -138,7 +138,7 @@ if ($resql)
 
 // Onglets
 $head = bank_prepare_head($object);
-dol_fiche_head($head, 'annual', $langs->trans("FinancialAccount"), 0, 'account');
+print dol_get_fiche_head($head, 'annual', $langs->trans("FinancialAccount"), 0, 'account');
 
 $title = $langs->trans("FinancialAccount")." : ".$object->label;
 $link = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?account=".$object->id."&year_start=".($year_start - 1)."'>".img_previous('', 'class="valignbottom"')."</a> ".$langs->trans("Year")." <a href='".$_SERVER["PHP_SELF"]."?account=".$object->id."&year_start=".($year_start + 1)."'>".img_next('', 'class="valignbottom"')."</a>" : "");
@@ -148,25 +148,25 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php?restore_lastsearch_v
 
 if (!empty($id))
 {
-    if (!preg_match('/,/', $id))
-    {
-        dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
-    } else {
-        $bankaccount = new Account($db);
-        $listid = explode(',', $id);
-        foreach ($listid as $key => $aId)
-        {
-            $bankaccount->fetch($aId);
-            $bankaccount->label = $bankaccount->ref;
-            print $bankaccount->getNomUrl(1);
-            if ($key < (count($listid) - 1)) print ', ';
-        }
-    }
+	if (!preg_match('/,/', $id))
+	{
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
+	} else {
+		$bankaccount = new Account($db);
+		$listid = explode(',', $id);
+		foreach ($listid as $key => $aId)
+		{
+			$bankaccount->fetch($aId);
+			$bankaccount->label = $bankaccount->ref;
+			print $bankaccount->getNomUrl(1);
+			if ($key < (count($listid) - 1)) print ', ';
+		}
+	}
 } else {
 	print $langs->trans("AllAccounts");
 }
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Affiche tableau
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 974ba750dd1..902a96ec16c 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -42,11 +42,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/paymentsocialcontribution.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
+require_once DOL_DOCUMENT_ROOT.'/don/class/paymentdonation.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
@@ -109,15 +111,15 @@ if (!$sortfield) $sortfield = 'b.datev,b.dateo,b.rowid';
 $object = new Account($db);
 if ($id > 0 || !empty($ref))
 {
-    $result = $object->fetch($id, $ref);
-    $search_account = $object->id; // Force the search field on id of account
+	$result = $object->fetch($id, $ref);
+	$search_account = $object->id; // Force the search field on id of account
 
-    if (!($object->id > 0))
-    {
-    	$langs->load("errors");
-    	print($langs->trans('ErrorRecordNotFound'));
-    	exit;
-    }
+	if (!($object->id > 0))
+	{
+		$langs->load("errors");
+		print($langs->trans('ErrorRecordNotFound'));
+		exit;
+	}
 }
 
 $mode_balance_ok = false;
@@ -137,20 +139,20 @@ $extrafields->fetch_name_optionals_label('banktransaction');
 $search_array_options = $extrafields->getOptionalsFromPost('banktransaction', '', 'search_');
 
 $arrayfields = array(
-    'b.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-    'b.label'=>array('label'=>$langs->trans("Description"), 'checked'=>1),
-    'b.dateo'=>array('label'=>$langs->trans("DateOperationShort"), 'checked'=>1),
-    'b.datev'=>array('label'=>$langs->trans("DateValueShort"), 'checked'=>1),
-    'type'=>array('label'=>$langs->trans("Type"), 'checked'=>1),
-    'b.num_chq'=>array('label'=>$langs->trans("Numero"), 'checked'=>1),
-    'bu.label'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'position'=>500),
-    'ba.ref'=>array('label'=>$langs->trans("BankAccount"), 'checked'=>(($id > 0 || !empty($ref)) ? 0 : 1), 'position'=>1000),
-    'b.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1, 'position'=>600),
-    'b.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1, 'position'=>605),
+	'b.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+	'b.label'=>array('label'=>$langs->trans("Description"), 'checked'=>1),
+	'b.dateo'=>array('label'=>$langs->trans("DateOperationShort"), 'checked'=>1),
+	'b.datev'=>array('label'=>$langs->trans("DateValueShort"), 'checked'=>1),
+	'type'=>array('label'=>$langs->trans("Type"), 'checked'=>1),
+	'b.num_chq'=>array('label'=>$langs->trans("Numero"), 'checked'=>1),
+	'bu.label'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'position'=>500),
+	'ba.ref'=>array('label'=>$langs->trans("BankAccount"), 'checked'=>(($id > 0 || !empty($ref)) ? 0 : 1), 'position'=>1000),
+	'b.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1, 'position'=>600),
+	'b.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1, 'position'=>605),
 	'balancebefore'=>array('label'=>$langs->trans("BalanceBefore"), 'checked'=>0, 'position'=>1000),
 	'balance'=>array('label'=>$langs->trans("Balance"), 'checked'=>1, 'position'=>1001),
 	'b.num_releve'=>array('label'=>$langs->trans("AccountStatement"), 'checked'=>1, 'position'=>1010),
-    'b.conciliated'=>array('label'=>$langs->trans("Conciliated"), 'enabled'=> $object->rappro, 'checked'=>($action == 'reconcile' ? 1 : 0), 'position'=>1020),
+	'b.conciliated'=>array('label'=>$langs->trans("Conciliated"), 'enabled'=> $object->rappro, 'checked'=>($action == 'reconcile' ? 1 : 0), 'position'=>1020),
 );
 // Extra fields
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
@@ -181,10 +183,10 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-    $search_dt_start = '';
-    $search_dt_end = '';
-    $search_dv_start = '';
-    $search_dv_end = '';
+	$search_dt_start = '';
+	$search_dt_end = '';
+	$search_dv_start = '';
+	$search_dv_end = '';
 	$search_type = "";
 	$search_debit = "";
 	$search_credit = "";
@@ -203,56 +205,56 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 
 if (empty($reshook))
 {
-    $objectclass = 'Account';
-    $objectlabel = 'BankTransaction';
-    $permissiontoread = $user->rights->banque->lire;
-    $permissiontodelete = $user->rights->banque->supprimer;
-    $uploaddir = $conf->bank->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+	$objectclass = 'Account';
+	$objectlabel = 'BankTransaction';
+	$permissiontoread = $user->rights->banque->lire;
+	$permissiontodelete = $user->rights->banque->supprimer;
+	$uploaddir = $conf->bank->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 // Conciliation
-if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', 'alpha')) && $user->rights->banque->consolidate)
+if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', 'alpha')) && $user->rights->banque->consolidate
+	&& (!GETPOSTISSET('pageplusone') || (GETPOST('pageplusone') == GETPOST('pageplusoneold'))))
 {
-    $error = 0;
+	$error = 0;
 
-    // Definition, nettoyage parametres
-    $num_releve = GETPOST("num_releve", "alpha");
+	// Definition, nettoyage parametres
+	$num_releve = GETPOST("num_releve", "alpha");
 
-    if ($num_releve)
-    {
-        $bankline = new AccountLine($db);
-        if (isset($_POST['rowid']) && is_array($_POST['rowid']))
-        {
-            foreach ($_POST['rowid'] as $row)
-            {
-                if ($row > 0)
-                {
-                    $result = $bankline->fetch($row);
-                    $bankline->num_releve = $num_releve; //$_POST["num_releve"];
-                    $result = $bankline->update_conciliation($user, GETPOST("cat"), GETPOST('confirm_reconcile', 'alpha') ? 1 : 0); // If we confirm_reconcile, we set flag 'rappro' to 1.
-                    if ($result < 0)
-                    {
-                        setEventMessages($bankline->error, $bankline->errors, 'errors');
-                        $error++;
-                        break;
-                    }
-                }
-            }
-        } else {
-            $error++;
-            $langs->load("errors");
-            setEventMessages($langs->trans("NoRecordSelected"), null, 'errors');
-        }
-    } else {
-        $error++;
-        $langs->load("errors");
-        setEventMessages($langs->trans("ErrorPleaseTypeBankTransactionReportName"), null, 'errors');
-    }
+	if ($num_releve)
+	{
+		$bankline = new AccountLine($db);
 
-    if (!$error)
-    {
-    	$param = 'action=reconcile&contextpage=banktransactionlist&id='.$id.'&search_account='.$id;
+		$rowids = GETPOST('rowid', 'array');
+
+		if (!empty($rowids) && is_array($rowids)) {
+			foreach ($rowids as $row) {
+				if ($row > 0) {
+					$result = $bankline->fetch($row);
+					$bankline->num_releve = $num_releve; //$_POST["num_releve"];
+					$result = $bankline->update_conciliation($user, GETPOST("cat"), GETPOST('confirm_reconcile', 'alpha') ? 1 : 0); // If we confirm_reconcile, we set flag 'rappro' to 1.
+					if ($result < 0) {
+						setEventMessages($bankline->error, $bankline->errors, 'errors');
+						$error++;
+						break;
+					}
+				}
+			}
+		} else {
+			$error++;
+			$langs->load("errors");
+			setEventMessages($langs->trans("NoRecordSelected"), null, 'errors');
+		}
+	} else {
+		$error++;
+		$langs->load("errors");
+		setEventMessages($langs->trans("ErrorPleaseTypeBankTransactionReportName"), null, 'errors');
+	}
+
+	if (!$error)
+	{
+		$param = 'action=reconcile&contextpage=banktransactionlist&id='.$id.'&search_account='.$id;
 		$param .= '&search_conciliated='.urlencode($search_conciliated);
 		if ($page) $param .= '&page='.urlencode($page);
 		if ($offset) $param .= '&offset='.urlencode($offset);
@@ -268,85 +270,85 @@ if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', '
 		if ($search_credit) $param .= '&search_credit='.urlencode($search_credit);
 		$param .= '&sortfield='.urlencode($sortfield).'&sortorder='.urlencode($sortorder);
 		header('Location: '.$_SERVER["PHP_SELF"].'?'.$param); // To avoid to submit twice and allow the back button
-        exit;
-    }
+		exit;
+	}
 }
 
 
 if (GETPOST('save') && !$cancel && $user->rights->banque->modifier)
 {
-    $error = 0;
+	$error = 0;
 
-    if (price2num($_POST["addcredit"]) > 0)
-    {
-        $amount = price2num($_POST["addcredit"]);
-    } else {
-        $amount = - price2num($_POST["adddebit"]);
-    }
+	if (price2num(GETPOST("addcredit")) > 0)
+	{
+		$amount = price2num(GETPOST("addcredit"));
+	} else {
+		$amount = - price2num(GETPOST("adddebit"));
+	}
 
-    $operation = GETPOST("operation", 'alpha');
-    $num_chq   = GETPOST("num_chq", 'alpha');
-    $label     = GETPOST("label", 'alpha');
-    $cat1      = GETPOST("cat1", 'alpha');
+	$operation = GETPOST("operation", 'alpha');
+	$num_chq   = GETPOST("num_chq", 'alpha');
+	$label     = GETPOST("label", 'alpha');
+	$cat1      = GETPOST("cat1", 'alpha');
 
-    $bankaccountid = $id;
-    if (GETPOST('add_account', 'int') > 0) $bankaccountid = GETPOST('add_account', 'int');
+	$bankaccountid = $id;
+	if (GETPOST('add_account', 'int') > 0) $bankaccountid = GETPOST('add_account', 'int');
 
-    if (!$dateop) {
-        $error++;
-        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
-    }
-    if (!$operation) {
-        $error++;
-        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
-    }
-    if (!$label) {
-        $error++;
-        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-    }
-    if (!$amount) {
-        $error++;
-        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
-    }
-    if (!$bankaccountid > 0)
-    {
-    	$error++;
-    	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount")), null, 'errors');
-    }
-    /*if (! empty($conf->accounting->enabled) && (empty($search_accountancy_code) || $search_accountancy_code == '-1'))
+	if (!$dateop) {
+		$error++;
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
+	}
+	if (!$operation) {
+		$error++;
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
+	}
+	if (!$label) {
+		$error++;
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
+	}
+	if (!$amount) {
+		$error++;
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
+	}
+	if (!$bankaccountid > 0)
+	{
+		$error++;
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount")), null, 'errors');
+	}
+	/*if (! empty($conf->accounting->enabled) && (empty($search_accountancy_code) || $search_accountancy_code == '-1'))
     {
     	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountAccounting")), null, 'errors');
     	$error++;
     }*/
 
-    if (!$error && !empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT))
-    {
-    	$objecttmp = new Account($db);
-    	$objecttmp->fetch($bankaccountid);
-        $insertid = $objecttmp->addline($dateop, $operation, $label, $amount, $num_chq, ($cat1 > 0 ? $cat1 : 0), $user, '', '', $search_accountancy_code);
-        if ($insertid > 0)
-        {
-            setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-            header("Location: ".$_SERVER['PHP_SELF'].($id ? "?id=".$id : ''));
-            exit;
-        } else {
-            setEventMessages($object->error, $object->errors, 'errors');
-        }
-    } else {
-        $action = 'addline';
-    }
+	if (!$error && !empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT))
+	{
+		$objecttmp = new Account($db);
+		$objecttmp->fetch($bankaccountid);
+		$insertid = $objecttmp->addline($dateop, $operation, $label, $amount, $num_chq, ($cat1 > 0 ? $cat1 : 0), $user, '', '', $search_accountancy_code);
+		if ($insertid > 0)
+		{
+			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+			header("Location: ".$_SERVER['PHP_SELF'].($id ? "?id=".$id : ''));
+			exit;
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	} else {
+		$action = 'addline';
+	}
 }
 
 if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->banque->modifier)
 {
-    $accline = new AccountLine($db);
-    $result = $accline->fetch(GETPOST("rowid", "int"));
-    $result = $accline->delete($user);
-    if ($result <= 0) {
-    	setEventMessages($accline->error, $accline->errors, 'errors');
-    } else {
-    	setEventMessages('RecordDeleted', null, 'mesgs');
-    }
+	$accline = new AccountLine($db);
+	$result = $accline->fetch(GETPOST("rowid", "int"));
+	$result = $accline->delete($user);
+	if ($result <= 0) {
+		setEventMessages($accline->error, $accline->errors, 'errors');
+	} else {
+		setEventMessages('RecordDeleted', null, 'mesgs');
+	}
 }
 
 
@@ -368,12 +370,14 @@ $userstatic = new User($db);
 $chargestatic = new ChargeSociales($db);
 $loanstatic = new Loan($db);
 $memberstatic = new Adherent($db);
+$donstatic = new Don($db);
 $paymentstatic = new Paiement($db);
 $paymentsupplierstatic = new PaiementFourn($db);
+$paymentscstatic = new PaymentSocialContribution($db);
 $paymentvatstatic = new TVA($db);
 $paymentsalstatic = new PaymentSalary($db);
+$paymentdonationstatic = new PaymentDonation($db);
 $paymentvariousstatic = new PaymentVarious($db);
-$donstatic = new Don($db);
 $paymentexpensereportstatic = new PaymentExpenseReport($db);
 $bankstatic = new Account($db);
 $banklinestatic = new AccountLine($db);
@@ -419,43 +423,43 @@ if ($id > 0 || !empty($ref))
 	$helpurl = "";
 	llxHeader('', $title, $helpurl);
 
-    // Load bank groups
-    require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php';
-    $bankcateg = new BankCateg($db);
+	// Load bank groups
+	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php';
+	$bankcateg = new BankCateg($db);
 
-    foreach ($bankcateg->fetchAll() as $bankcategory) {
-        $options[$bankcategory->id] = $bankcategory->label;
-    }
+	foreach ($bankcateg->fetchAll() as $bankcategory) {
+		$options[$bankcategory->id] = $bankcategory->label;
+	}
 
-    // Bank card
-    $head = bank_prepare_head($object);
-    dol_fiche_head($head, 'journal', $langs->trans("FinancialAccount"), 0, 'account');
+	// Bank card
+	$head = bank_prepare_head($object);
+	print dol_get_fiche_head($head, 'journal', $langs->trans("FinancialAccount"), 0, 'account');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
 
-    /*
+	/*
      * Buttons actions
      */
 
-    if ($action != 'reconcile')
-    {
-        if ($object->canBeConciliated() > 0)
-        {
-            // If not cash account and can be reconciliate
-            if ($user->rights->banque->consolidate) {
-            	$newparam = $param;
-            	$newparam = preg_replace('/search_conciliated=\d+/i', '', $newparam);
-            	$buttonreconcile = '<a class="butAction" style="margin-bottom: 5px !important; margin-top: 5px !important" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&amp;sortorder=asc,asc,asc&search_conciliated=0'.$newparam.'">'.$langs->trans("Conciliate").'</a>';
-            } else {
-            	$buttonreconcile = '<a class="butActionRefused" style="margin-bottom: 5px !important; margin-top: 5px !important" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
-            }
-        }
-    }
+	if ($action != 'reconcile')
+	{
+		if ($object->canBeConciliated() > 0)
+		{
+			// If not cash account and can be reconciliate
+			if ($user->rights->banque->consolidate) {
+				$newparam = $param;
+				$newparam = preg_replace('/search_conciliated=\d+/i', '', $newparam);
+				$buttonreconcile = '<a class="butAction" style="margin-bottom: 5px !important; margin-top: 5px !important" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&amp;sortorder=asc,asc,asc&search_conciliated=0'.$newparam.'">'.$langs->trans("Conciliate").'</a>';
+			} else {
+				$buttonreconcile = '<a class="butActionRefused" style="margin-bottom: 5px !important; margin-top: 5px !important" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
+			}
+		}
+	}
 } else {
 	llxHeader('', $langs->trans("BankTransactions"), '', '', 0, 0, array(), array(), $param);
 }
@@ -538,25 +542,25 @@ $nbtotalofrecords = '';
 $nbtotalofpages = 0;
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    $nbtotalofpages = ceil($nbtotalofrecords / $limit);
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	$nbtotalofpages = ceil($nbtotalofrecords / $limit);
 }
 
 if (($id > 0 || !empty($ref)) && ((string) $page == ''))
 {
-    // We open a list of transaction of a dedicated account and no page was set by defaut
-    // We force on last page.
-    $page = ($nbtotalofpages - 1);
-    $offset = $limit * $page;
-    if ($page < 0) $page = 0;
+	// We open a list of transaction of a dedicated account and no page was set by defaut
+	// We force on last page.
+	$page = ($nbtotalofpages - 1);
+	$offset = $limit * $page;
+	if ($page < 0) $page = 0;
 }
 if ($page >= $nbtotalofpages)
 {
-    // If we made a search and result has low page than the page number we were on
-    $page = ($nbtotalofpages - 1);
-    $offset = $limit * $page;
-    if ($page < 0) $page = 0;
+	// If we made a search and result has low page than the page number we were on
+	$page = ($nbtotalofpages - 1);
+	$offset = $limit * $page;
+	if ($page < 0) $page = 0;
 }
 
 
@@ -582,23 +586,23 @@ if ($resql)
 
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
-    // List of mass actions available
-    $arrayofmassactions = array(
-        //'presend'=>$langs->trans("SendByMail"),
-        //'builddoc'=>$langs->trans("PDFMerge"),
-    );
-    //if ($user->rights->bank->supprimer) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-    if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
-    $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+	// List of mass actions available
+	$arrayofmassactions = array(
+		//'presend'=>$langs->trans("SendByMail"),
+		//'builddoc'=>$langs->trans("PDFMerge"),
+	);
+	//if ($user->rights->bank->supprimer) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-    // Confirmation delete
-    if ($action == 'delete')
-    {
-        $text = $langs->trans('ConfirmDeleteTransaction');
-        print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&rowid='.GETPOST("rowid"), $langs->trans('DeleteTransaction'), $text, 'confirm_delete', null, '', 1);
-    }
+	// Confirmation delete
+	if ($action == 'delete')
+	{
+		$text = $langs->trans('ConfirmDeleteTransaction');
+		print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&rowid='.GETPOST("rowid"), $langs->trans('DeleteTransaction'), $text, 'confirm_delete', null, '', 1);
+	}
 
-    // Lines of title fields
+	// Lines of title fields
 	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="search_form">'."\n";
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -607,7 +611,7 @@ if ($resql)
 	print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="id" value="'.$id.'">';
 	print '<input type="hidden" name="ref" value="'.$ref.'">';
 	if (GETPOST('bid')) print '<input type="hidden" name="bid" value="'.GETPOST("bid").'">';
@@ -615,54 +619,54 @@ if ($resql)
 	// Form to reconcile
 	if ($user->rights->banque->consolidate && $action == 'reconcile')
 	{
-	    print '<div class="valignmiddle inline-block" style="padding-right: 20px;">';
-	    print '<strong>'.$langs->trans("InputReceiptNumber").'</strong>: ';
-	    print '<input class="flat" id="num_releve" name="num_releve" type="text" value="'.(GETPOST('num_releve') ?GETPOST('num_releve') : '').'" size="10">'; // The only default value is value we just entered
-	    print '</div>';
-	    if (is_array($options) && count($options))
-	    {
-	        print $langs->trans("EventualyAddCategory").': ';
-	        print Form::selectarray('cat', $options, GETPOST('cat'), 1);
-	    }
-	    print '<br><div style="margin-top: 5px;"><span class="opacitymedium">'.$langs->trans("ThenCheckLinesAndConciliate").'</span> ';
-	    print '<input class="button" name="confirm_savestatement" type="submit" value="'.$langs->trans("SaveStatementOnly").'">';
-	    print ' '.$langs->trans("or").' ';
-	    print '<input class="button" name="confirm_reconcile" type="submit" value="'.$langs->trans("Conciliate").'">';
-	    print ' '.$langs->trans("or").' ';
-	    print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
+		print '<div class="valignmiddle inline-block" style="padding-right: 20px;">';
+		print '<strong>'.$langs->trans("InputReceiptNumber").'</strong>: ';
+		print '<input class="flat" id="num_releve" name="num_releve" type="text" value="'.(GETPOST('num_releve') ?GETPOST('num_releve') : '').'" size="10">'; // The only default value is value we just entered
+		print '</div>';
+		if (is_array($options) && count($options))
+		{
+			print $langs->trans("EventualyAddCategory").': ';
+			print Form::selectarray('cat', $options, GETPOST('cat'), 1);
+		}
+		print '<br><div style="margin-top: 5px;"><span class="opacitymedium">'.$langs->trans("ThenCheckLinesAndConciliate").'</span> ';
+		print '<input class="button" name="confirm_savestatement" type="submit" value="'.$langs->trans("SaveStatementOnly").'">';
+		print ' '.$langs->trans("or").' ';
+		print '<input class="button" name="confirm_reconcile" type="submit" value="'.$langs->trans("Conciliate").'">';
+		print ' '.$langs->trans("or").' ';
+		print '<input type="submit" name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 
-	    // Show last bank statements
-	    $nbmax = 15; // We accept to show last 15 receipts (so we can have more than one year)
-	    $liste = "";
-	    $sql = "SELECT DISTINCT num_releve FROM ".MAIN_DB_PREFIX."bank";
-	    $sql .= " WHERE fk_account=".$object->id." AND num_releve IS NOT NULL";
-	    $sql .= $db->order("num_releve", "DESC");
-	    $sql .= $db->plimit($nbmax + 1);
-	    print '<br>';
-	    print $langs->trans("LastAccountStatements").' : ';
-	    $resqlr = $db->query($sql);
-	    if ($resqlr)
-	    {
-	        $numr = $db->num_rows($resqlr);
-	        $i = 0;
-	        $last_ok = 0;
-	        while (($i < $numr) && ($i < $nbmax))
-	        {
-	            $objr = $db->fetch_object($resqlr);
-	            if (!$last_ok) {
-	                $last_releve = $objr->num_releve;
-	                $last_ok = 1;
-	            }
-	            $i++;
-	            $liste = '<a href="'.DOL_URL_ROOT.'/compta/bank/releve.php?account='.$id.'&amp;num='.$objr->num_releve.'">'.$objr->num_releve.'</a> &nbsp; '.$liste;
-	        }
-	        if ($numr >= $nbmax) $liste = "... &nbsp; ".$liste;
-	        print $liste;
-	        if ($numr <= 0) print '<b>'.$langs->trans("None").'</b>';
-	    } else {
-	        dol_print_error($db);
-	    }
+		// Show last bank statements
+		$nbmax = 12; // We show last 12 receipts (so we can have more than one year)
+		$liste = "";
+		$sql = "SELECT DISTINCT num_releve FROM ".MAIN_DB_PREFIX."bank";
+		$sql .= " WHERE fk_account=".$object->id." AND num_releve IS NOT NULL";
+		$sql .= $db->order("num_releve", "DESC");
+		$sql .= $db->plimit($nbmax + 1);
+		print '<br>';
+		print $langs->trans("LastAccountStatements").' : ';
+		$resqlr = $db->query($sql);
+		if ($resqlr)
+		{
+			$numr = $db->num_rows($resqlr);
+			$i = 0;
+			$last_ok = 0;
+			while (($i < $numr) && ($i < $nbmax))
+			{
+				$objr = $db->fetch_object($resqlr);
+				if (!$last_ok) {
+					$last_releve = $objr->num_releve;
+					$last_ok = 1;
+				}
+				$i++;
+				$liste = '<a href="'.DOL_URL_ROOT.'/compta/bank/releve.php?account='.$id.'&amp;num='.$objr->num_releve.'">'.$objr->num_releve.'</a> &nbsp; '.$liste;
+			}
+			if ($numr >= $nbmax) $liste = "... &nbsp; ".$liste;
+			print $liste;
+			if ($numr <= 0) print '<b>'.$langs->trans("None").'</b>';
+		} else {
+			dol_print_error($db);
+		}
 
 		// Using BANK_REPORT_LAST_NUM_RELEVE to automatically report last num (or not)
 		if (!empty($conf->global->BANK_REPORT_LAST_NUM_RELEVE))
@@ -736,7 +740,7 @@ if ($resql)
 		}*/
 		print '<td class="center">';
 		print '<input type="submit" name="save" class="button buttongen marginbottomonly" value="'.$langs->trans("Add").'"><br>';
-		print '<input type="submit" name="cancel" class="button buttongen marginbottomonly" value="'.$langs->trans("Cancel").'">';
+		print '<input type="submit" name="cancel" class="button buttongen marginbottomonly button-cancel" value="'.$langs->trans("Cancel").'">';
 		print '</td></tr>';
 
 		print '</table>';
@@ -773,23 +777,24 @@ if ($resql)
 	{
 		if (empty($conf->global->BANK_DISABLE_DIRECT_INPUT))
 		{
-			if (empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT))	// If direct entries is done using miscellaneous payments
+			if (empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT))	// Default is to record miscellaneous direct entries using miscellaneous payments
 			{
-			    $newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create&accountid='.$search_account.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.urlencode($search_account)), '', $user->rights->banque->modifier);
+				$newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create&accountid='.$search_account.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.urlencode($search_account)), '', $user->rights->banque->modifier);
 			} else // If direct entries is not done using miscellaneous payments
 			{
-                $newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=addline&page='.$page.$param, '', $user->rights->banque->modifier);
+				$newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=addline&page='.$page.$param, '', $user->rights->banque->modifier);
 			}
 		} else {
-            $newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=addline&page='.$page.$param, '', -1);
+			$newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=addline&page='.$page.$param, '', -1);
 		}
 	}
 
-	$morehtml = '<div class="inline-block '.(($buttonreconcile || $newcardbutton) ? 'marginrightonly' : '').'">';
+	/*$morehtml = '<div class="inline-block '.(($buttonreconcile || $newcardbutton) ? 'marginrightonly' : '').'">';
 	$morehtml .= '<label for="pageplusone">'.$langs->trans("Page")."</label> "; // ' Page ';
 	$morehtml .= '<input type="text" name="pageplusone" id="pageplusone" class="flat right width25 pageplusone" value="'.($page + 1).'">';
 	$morehtml .= '/'.$nbtotalofpages.' ';
 	$morehtml .= '</div>';
+	*/
 
 	if ($action != 'addline' && $action != 'reconcile')
 	{
@@ -801,7 +806,7 @@ if ($resql)
 	$picto = 'bank_account';
 	if ($id > 0 || !empty($ref)) $picto = '';
 
-	print_barre_liste($langs->trans("BankTransactions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $picto, 0, $morehtml, '', $limit);
+	print_barre_liste($langs->trans("BankTransactions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $picto, 0, $morehtml, '', $limit, 0, 0, 1);
 
 	// We can add page now to param
 	if ($page != '') $param .= '&page='.urlencode($page);
@@ -837,7 +842,7 @@ if ($resql)
 			$moreforfilter .= '<div class="divsearchfield">';
 			$moreforfilter .= $langs->trans('RubriquesTransactions').' : ';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_BANK_LINE, $search_bid, 'parent', null, null, 1);
-			$moreforfilter .= $form->selectarray('search_bid', $cate_arbo, $search_bid, 1);
+			$moreforfilter .= $form->selectarray('search_bid', $cate_arbo, $search_bid, 1, 0, 0, '', 0, 0, 0, '', '', 1);
 			$moreforfilter .= '</div>';
 		}
 	}
@@ -854,66 +859,66 @@ if ($resql)
 		print '</div>'."\n";
 	}
 
-    $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-    $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
 	print '<tr class="liste_titre_filter">';
 	if (!empty($arrayfields['b.rowid']['checked']))
 	{
-	    print '<td class="liste_titre">';
-    	print '<input type="text" class="flat" name="search_ref" size="2" value="'.dol_escape_htmltag($search_ref).'">';
-	    print '</td>';
+		print '<td class="liste_titre">';
+		print '<input type="text" class="flat" name="search_ref" size="2" value="'.dol_escape_htmltag($search_ref).'">';
+		print '</td>';
 	}
 	if (!empty($arrayfields['b.label']['checked']))
 	{
-	    print '<td class="liste_titre">';
-    	print '<input type="text" class="flat maxwidth100" name="search_description" value="'.dol_escape_htmltag($search_description).'">';
-    	print '</td>';
+		print '<td class="liste_titre">';
+		print '<input type="text" class="flat maxwidth100" name="search_description" value="'.dol_escape_htmltag($search_description).'">';
+		print '</td>';
 	}
 	if (!empty($arrayfields['b.dateo']['checked']))
 	{
-        print '<td class="liste_titre">&nbsp;</td>';
+		print '<td class="liste_titre">&nbsp;</td>';
 	}
 	if (!empty($arrayfields['b.datev']['checked']))
 	{
-        print '<td class="liste_titre">&nbsp;</td>';
+		print '<td class="liste_titre">&nbsp;</td>';
 	}
 	if (!empty($arrayfields['type']['checked']))
 	{
-        print '<td class="liste_titre" align="center">';
-        $form->select_types_paiements(empty($search_type) ? '' : $search_type, 'search_type', '', 2, 1, 1, 0, 1, 'maxwidth100');
-        print '</td>';
+		print '<td class="liste_titre" align="center">';
+		$form->select_types_paiements(empty($search_type) ? '' : $search_type, 'search_type', '', 2, 1, 1, 0, 1, 'maxwidth100');
+		print '</td>';
 	}
 	if (!empty($arrayfields['b.num_chq']['checked']))
 	{
-        // Numero
-        print '<td class="liste_titre" align="center"><input type="text" class="flat" name="req_nb" value="'.dol_escape_htmltag($search_req_nb).'" size="2"></td>';
+		// Numero
+		print '<td class="liste_titre" align="center"><input type="text" class="flat" name="req_nb" value="'.dol_escape_htmltag($search_req_nb).'" size="2"></td>';
 	}
 	if (!empty($arrayfields['bu.label']['checked']))
 	{
-	    print '<td class="liste_titre"><input type="text" class="flat maxwidth75" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>';
+		print '<td class="liste_titre"><input type="text" class="flat maxwidth75" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>';
 	}
 	if (!empty($arrayfields['ba.ref']['checked']))
 	{
-    	print '<td class="liste_titre">';
-    	$form->select_comptes($search_account, 'search_account', 0, '', 1, ($id > 0 || !empty($ref) ? ' disabled="disabled"' : ''), 0, 'maxwidth100');
-    	print '</td>';
+		print '<td class="liste_titre">';
+		$form->select_comptes($search_account, 'search_account', 0, '', 1, ($id > 0 || !empty($ref) ? ' disabled="disabled"' : ''), 0, 'maxwidth100');
+		print '</td>';
 	}
 	if (!empty($arrayfields['b.debit']['checked']))
 	{
-    	print '<td class="liste_titre right">';
-    	print '<input type="text" class="flat width50" name="search_debit" value="'.dol_escape_htmltag($search_debit).'">';
-    	print '</td>';
+		print '<td class="liste_titre right">';
+		print '<input type="text" class="flat width50" name="search_debit" value="'.dol_escape_htmltag($search_debit).'">';
+		print '</td>';
 	}
 	if (!empty($arrayfields['b.credit']['checked']))
 	{
-    	print '<td class="liste_titre right">';
-    	print '<input type="text" class="flat width50" name="search_credit" value="'.dol_escape_htmltag($search_credit).'">';
-    	print '</td>';
+		print '<td class="liste_titre right">';
+		print '<input type="text" class="flat width50" name="search_credit" value="'.dol_escape_htmltag($search_credit).'">';
+		print '</td>';
 	}
 	if (!empty($arrayfields['balancebefore']['checked']))
 	{
@@ -932,21 +937,21 @@ if ($resql)
 	// Numero statement
 	if (!empty($arrayfields['b.num_releve']['checked']))
 	{
-        print '<td class="liste_titre" align="center"><input type="text" class="flat" name="search_num_releve" value="'.dol_escape_htmltag($search_num_releve).'" size="3"></td>';
+		print '<td class="liste_titre" align="center"><input type="text" class="flat" name="search_num_releve" value="'.dol_escape_htmltag($search_num_releve).'" size="3"></td>';
 	}
 	// Conciliated
 	if (!empty($arrayfields['b.conciliated']['checked']))
 	{
-        print '<td class="liste_titre" align="center">';
-        print $form->selectyesno('search_conciliated', $search_conciliated, 1, false, 1);
-        print '</td>';
+		print '<td class="liste_titre" align="center">';
+		print $form->selectyesno('search_conciliated', $search_conciliated, 1, false, 1, 1);
+		print '</td>';
 	}
 	print '<td class="liste_titre" align="middle">';
 	print '</td>';
 	print '<td class="liste_titre" align="middle">';
 	$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
 	print $searchpicto;
-    print '</td>';
+	print '</td>';
 	print "</tr>\n";
 
 	// Fields title
@@ -984,110 +989,110 @@ if ($resql)
 	// Loop on each record
 	$sign = 1;
 
-    $totalarray = array();
-    while ($i < min($num, $limit))
-    {
-        $objp = $db->fetch_object($resql);
+	$totalarray = array();
+	while ($i < min($num, $limit))
+	{
+		$objp = $db->fetch_object($resql);
 
-        // If we are in a situation where we need/can show balance, we calculate the start of balance
-        if (!$balancecalculated && (!empty($arrayfields['balancebefore']['checked']) || !empty($arrayfields['balance']['checked'])) && $mode_balance_ok)
-        {
-            if (!$search_account)
-            {
-                dol_print_error('', 'account is not defined but $mode_balance_ok is true');
-                exit;
-            }
+		// If we are in a situation where we need/can show balance, we calculate the start of balance
+		if (!$balancecalculated && (!empty($arrayfields['balancebefore']['checked']) || !empty($arrayfields['balance']['checked'])) && $mode_balance_ok)
+		{
+			if (!$search_account)
+			{
+				dol_print_error('', 'account is not defined but $mode_balance_ok is true');
+				exit;
+			}
 
-            // Loop on each record before
-            $sign = 1;
-            $i = 0;
-            $sqlforbalance = 'SELECT SUM(b.amount) as previoustotal';
-            $sqlforbalance .= " FROM ";
-            $sqlforbalance .= " ".MAIN_DB_PREFIX."bank_account as ba,";
-            $sqlforbalance .= " ".MAIN_DB_PREFIX."bank as b";
-            $sqlforbalance .= " WHERE b.fk_account = ba.rowid";
-            $sqlforbalance .= " AND ba.entity IN (".getEntity('bank_account').")";
-            $sqlforbalance .= " AND b.fk_account = ".$search_account;
-            $sqlforbalance .= " AND (b.datev < '".$db->idate($db->jdate($objp->dv))."' OR (b.datev = '".$db->idate($db->jdate($objp->dv))."' AND (b.dateo < '".$db->idate($db->jdate($objp->do))."' OR (b.dateo = '".$db->idate($db->jdate($objp->do))."' AND b.rowid < ".$objp->rowid."))))";
-            $resqlforbalance = $db->query($sqlforbalance);
-            //print $sqlforbalance;
-            if ($resqlforbalance)
-            {
-                $objforbalance = $db->fetch_object($resqlforbalance);
-                if ($objforbalance)
-                {
-                	// If sort is desc,desc,desc then total of previous date + amount is the balancebefore of the previous line before the line to show
-                	if ($sortfield == 'b.datev,b.dateo,b.rowid' && $sortorder == 'desc,desc,desc')
-                	{
-                		$balancebefore = $objforbalance->previoustotal + ($sign * $objp->amount);
-                	} // If sort is asc,asc,asc then total of previous date is balance of line before the next line to show
-                	else {
-                		$balance = $objforbalance->previoustotal;
-                	}
-                }
-            } else dol_print_error($db);
+			// Loop on each record before
+			$sign = 1;
+			$i = 0;
+			$sqlforbalance = 'SELECT SUM(b.amount) as previoustotal';
+			$sqlforbalance .= " FROM ";
+			$sqlforbalance .= " ".MAIN_DB_PREFIX."bank_account as ba,";
+			$sqlforbalance .= " ".MAIN_DB_PREFIX."bank as b";
+			$sqlforbalance .= " WHERE b.fk_account = ba.rowid";
+			$sqlforbalance .= " AND ba.entity IN (".getEntity('bank_account').")";
+			$sqlforbalance .= " AND b.fk_account = ".$search_account;
+			$sqlforbalance .= " AND (b.datev < '".$db->idate($db->jdate($objp->dv))."' OR (b.datev = '".$db->idate($db->jdate($objp->dv))."' AND (b.dateo < '".$db->idate($db->jdate($objp->do))."' OR (b.dateo = '".$db->idate($db->jdate($objp->do))."' AND b.rowid < ".$objp->rowid."))))";
+			$resqlforbalance = $db->query($sqlforbalance);
+			//print $sqlforbalance;
+			if ($resqlforbalance)
+			{
+				$objforbalance = $db->fetch_object($resqlforbalance);
+				if ($objforbalance)
+				{
+					// If sort is desc,desc,desc then total of previous date + amount is the balancebefore of the previous line before the line to show
+					if ($sortfield == 'b.datev,b.dateo,b.rowid' && $sortorder == 'desc,desc,desc')
+					{
+						$balancebefore = $objforbalance->previoustotal + ($sign * $objp->amount);
+					} // If sort is asc,asc,asc then total of previous date is balance of line before the next line to show
+					else {
+						$balance = $objforbalance->previoustotal;
+					}
+				}
+			} else dol_print_error($db);
 
-            $balancecalculated = true;
+			$balancecalculated = true;
 
-            // Output a line with start balance
-            if ($user->rights->banque->consolidate && $action == 'reconcile')
-            {
-            	$tmpnbfieldbeforebalance = 0;
-            	$tmpnbfieldafterbalance = 0;
-            	$balancefieldfound = 0;
-            	foreach ($arrayfields as $key => $val)
-            	{
-            		if ($key == 'balancebefore' || $key == 'balance')
-            		{
-            			$balancefieldfound++;
-            			continue;
-            		}
-           			if (!empty($arrayfields[$key]['checked']))
-           			{
-           				if (!$balancefieldfound) $tmpnbfieldbeforebalance++;
-           				else $tmpnbfieldafterbalance++;
-           			}
-            	}
-            	// Extra fields
-            	$element = 'banktransaction';
-            	if (is_array($extrafields->attributes[$element]['label']) && count($extrafields->attributes[$element]['label']))
-            	{
-            		foreach ($extrafields->attributes[$element]['label'] as $key => $val)
-            		{
-            			if (!empty($arrayfields["ef.".$key]['checked']))
-            			{
-		           			if (!empty($arrayfields[$key]['checked']))
-		           			{
-		           				if (!$balancefieldfound) $tmpnbfieldbeforebalance++;
-		           				else $tmpnbfieldafterbalance++;
-		           			}
-            			}
-            		}
-            	}
+			// Output a line with start balance
+			if ($user->rights->banque->consolidate && $action == 'reconcile')
+			{
+				$tmpnbfieldbeforebalance = 0;
+				$tmpnbfieldafterbalance = 0;
+				$balancefieldfound = 0;
+				foreach ($arrayfields as $key => $val)
+				{
+					if ($key == 'balancebefore' || $key == 'balance')
+					{
+						$balancefieldfound++;
+						continue;
+					}
+		   			if (!empty($arrayfields[$key]['checked']))
+		   			{
+		   				if (!$balancefieldfound) $tmpnbfieldbeforebalance++;
+		   				else $tmpnbfieldafterbalance++;
+		   			}
+				}
+				// Extra fields
+				$element = 'banktransaction';
+				if (is_array($extrafields->attributes[$element]['label']) && count($extrafields->attributes[$element]['label']))
+				{
+					foreach ($extrafields->attributes[$element]['label'] as $key => $val)
+					{
+						if (!empty($arrayfields["ef.".$key]['checked']))
+						{
+				   			if (!empty($arrayfields[$key]['checked']))
+				   			{
+				   				if (!$balancefieldfound) $tmpnbfieldbeforebalance++;
+				   				else $tmpnbfieldafterbalance++;
+				   			}
+						}
+					}
+				}
 
-            	print '<tr class="oddeven trforbreak">';
-            	if ($tmpnbfieldbeforebalance)
-            	{
-            		print '<td colspan="'.$tmpnbfieldbeforebalance.'">';
-            		print '&nbsp;';
-            		print '</td>';
-            	}
+				print '<tr class="oddeven trforbreak">';
+				if ($tmpnbfieldbeforebalance)
+				{
+					print '<td colspan="'.$tmpnbfieldbeforebalance.'">';
+					print '&nbsp;';
+					print '</td>';
+				}
 
-            	if (!empty($arrayfields['balancebefore']['checked']))
-            	{
-	            	print '<td class="right">';
-	            	print price(price2num($balance, 'MT'), 1, $langs);
-	            	print '</td>';
-            	}
-            	if (!empty($arrayfields['balance']['checked']))
-            	{
-            		print '<td class="right">';
+				if (!empty($arrayfields['balancebefore']['checked']))
+				{
+					print '<td class="right">';
 					print price(price2num($balance, 'MT'), 1, $langs);
 					print '</td>';
-            	}
+				}
+				if (!empty($arrayfields['balance']['checked']))
+				{
+					print '<td class="right">';
+					print price(price2num($balance, 'MT'), 1, $langs);
+					print '</td>';
+				}
 
 				print '<td class="center">';
-				print '<input type="checkbox" id="selectAll" />';
+				print '<input type="checkbox" id="selectAll" title="'.dol_escape_htmltag($langs->trans("SelectAll")).'" />';
 				print ' <script type="text/javascript">
 						$("input#selectAll").change(function() {
 							$("input[type=checkbox][name^=rowid]").prop("checked", $(this).is(":checked"));
@@ -1097,249 +1102,250 @@ if ($resql)
 				print '<td colspan="'.($tmpnbfieldafterbalance + 2).'">';
 				print '&nbsp;';
 				print '</td>';
-            	print '</tr>';
-            }
-        }
+				print '</tr>';
+			}
+		}
 
 
-        if ($sortfield == 'b.datev,b.dateo,b.rowid' && $sortorder == 'desc,desc,desc')
-        {
-        	$balance = price2num($balancebefore, 'MT'); // balance = balancebefore of previous line (sort is desc)
-        	$balancebefore = price2num($balancebefore - ($sign * $objp->amount), 'MT');
-        } else {
+		if ($sortfield == 'b.datev,b.dateo,b.rowid' && $sortorder == 'desc,desc,desc')
+		{
+			$balance = price2num($balancebefore, 'MT'); // balance = balancebefore of previous line (sort is desc)
+			$balancebefore = price2num($balancebefore - ($sign * $objp->amount), 'MT');
+		} else {
 			$balancebefore = price2num($balance, 'MT'); // balancebefore = balance of previous line (sort is asc)
 			$balance = price2num($balance + ($sign * $objp->amount), 'MT');
 		}
 
-        if (empty($cachebankaccount[$objp->bankid]))
-        {
-            $bankaccounttmp = new Account($db);
-            $bankaccounttmp->fetch($objp->bankid);
-            $cachebankaccount[$objp->bankid] = $bankaccounttmp;
-            $bankaccount = $bankaccounttmp;
-        } else {
-            $bankaccount = $cachebankaccount[$objp->bankid];
-        }
+		if (empty($cachebankaccount[$objp->bankid]))
+		{
+			$bankaccounttmp = new Account($db);
+			$bankaccounttmp->fetch($objp->bankid);
+			$cachebankaccount[$objp->bankid] = $bankaccounttmp;
+			$bankaccount = $bankaccounttmp;
+		} else {
+			$bankaccount = $cachebankaccount[$objp->bankid];
+		}
 
-        if (empty($conf->global->BANK_COLORIZE_MOVEMENT)) {
-            $backgroundcolor = "class='oddeven'";
-        } else {
-            if ($objp->amount < 0)
-            {
-                if (empty($conf->global->BANK_COLORIZE_MOVEMENT_COLOR1)) {
-                    $color = '#fca955';
-                } else {
-                    $color = '#'.$conf->global->BANK_COLORIZE_MOVEMENT_COLOR1;
-                }
-                $backgroundcolor = 'style="background: '.$color.';"';
-            } else {
-                if (empty($conf->global->BANK_COLORIZE_MOVEMENT_COLOR2)) {
-                    $color = '#7fdb86';
-                } else {
-                    $color = '#'.$conf->global->BANK_COLORIZE_MOVEMENT_COLOR2;
-                }
-                $backgroundcolor = 'style="background: '.$color.';"';
-            }
-        }
+		if (empty($conf->global->BANK_COLORIZE_MOVEMENT)) {
+			$backgroundcolor = "class='oddeven'";
+		} else {
+			if ($objp->amount < 0)
+			{
+				if (empty($conf->global->BANK_COLORIZE_MOVEMENT_COLOR1)) {
+					$color = '#fca955';
+				} else {
+					$color = '#'.$conf->global->BANK_COLORIZE_MOVEMENT_COLOR1;
+				}
+				$backgroundcolor = 'style="background: '.$color.';"';
+			} else {
+				if (empty($conf->global->BANK_COLORIZE_MOVEMENT_COLOR2)) {
+					$color = '#7fdb86';
+				} else {
+					$color = '#'.$conf->global->BANK_COLORIZE_MOVEMENT_COLOR2;
+				}
+				$backgroundcolor = 'style="background: '.$color.';"';
+			}
+		}
 
-        $banklinestatic->id = $objp->rowid;
-        $banklinestatic->ref = $objp->rowid;
+		$banklinestatic->id = $objp->rowid;
+		$banklinestatic->ref = $objp->rowid;
 
-        print '<tr class="oddeven" '.$backgroundcolor.'>';
+		print '<tr class="oddeven" '.$backgroundcolor.'>';
 
-        // Ref
-    	if (!empty($arrayfields['b.rowid']['checked']))
-    	{
-                print '<td class="nowrap left">';
-                print $banklinestatic->getNomUrl(1);
-                print '</td>';
-                if (!$i) $totalarray['nbfield']++;
-    	}
+		// Ref
+		if (!empty($arrayfields['b.rowid']['checked']))
+		{
+				print '<td class="nowrap left">';
+				print $banklinestatic->getNomUrl(1);
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
+		}
 
-    	// Description
-    	if (!empty($arrayfields['b.label']['checked']))
-    	{
-    	    print "<td>";
+		// Description
+		if (!empty($arrayfields['b.label']['checked']))
+		{
+			print "<td>";
 
-    	    //print "<a href=\"line.php?rowid=".$objp->rowid."&amp;account=".$objp->fk_account."\">";
-    	    $reg = array();
-    	    preg_match('/\((.+)\)/i', $objp->label, $reg); // Si texte entoure de parenthee on tente recherche de traduction
-    	    if ($reg[1] && $langs->trans($reg[1]) != $reg[1]) print $langs->trans($reg[1]);
-    	    else {
-    	    	if ($objp->label == '(payment_salary)') {
-    	    		print dol_trunc($langs->trans("SalaryPayment", 40));
-    	    	} else {
-    	    		print dol_trunc($objp->label, 40);
-    	    	}
-    	    }
-    	    //print "</a>&nbsp;";
+			//print "<a href=\"line.php?rowid=".$objp->rowid."&amp;account=".$objp->fk_account."\">";
+			$reg = array();
+			preg_match('/\((.+)\)/i', $objp->label, $reg); // Si texte entoure de parenthee on tente recherche de traduction
+			if ($reg[1] && $langs->trans($reg[1]) != $reg[1]) print $langs->trans($reg[1]);
+			else {
+				if ($objp->label == '(payment_salary)') {
+					print dol_trunc($langs->trans("SalaryPayment", 40));
+				} else {
+					print dol_trunc($objp->label, 40);
+				}
+			}
+			//print "</a>&nbsp;";
 
-    	    // Add links after description
-    	    $links = $bankaccountstatic->get_url($objp->rowid);
-    	    $cachebankaccount = array();
-    	    foreach ($links as $key=>$val)
-    	    {
-    	    	print '<!-- '.$links[$key]['type'].' -->';
-    	    	if ($links[$key]['type'] == 'withdraw')
-    	    	{
-    	    		$banktransferstatic->id = $links[$key]['url_id'];
-    	    		$banktransferstatic->ref = $links[$key]['label'];
-    	    		print ' '.$banktransferstatic->getNomUrl(0);
-    	    	} elseif ($links[$key]['type'] == 'payment')
-    	        {
-    	            $paymentstatic->id = $links[$key]['url_id'];
-    	            $paymentstatic->ref = $links[$key]['url_id']; // FIXME This is id, not ref of payment
-    	            print ' '.$paymentstatic->getNomUrl(2);
-    	        } elseif ($links[$key]['type'] == 'payment_supplier')
-    	        {
-    	            $paymentsupplierstatic->id = $links[$key]['url_id'];
-    	            $paymentsupplierstatic->ref = $links[$key]['url_id']; // FIXME This is id, not ref of payment
-    	            print ' '.$paymentsupplierstatic->getNomUrl(2);
-    	        } elseif ($links[$key]['type'] == 'payment_sc')
-    	        {
-    	            print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$links[$key]['url_id'].'">';
-    	            print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
-    	            //print $langs->trans("SocialContributionPayment");
-    	            print '</a>';
-    	        } elseif ($links[$key]['type'] == 'payment_vat')
-    	        {
-    	            $paymentvatstatic->id = $links[$key]['url_id'];
-    	            $paymentvatstatic->ref = $links[$key]['url_id'];
-    	            print ' '.$paymentvatstatic->getNomUrl(2);
-    	        } elseif ($links[$key]['type'] == 'payment_salary')
-    	        {
-    	            $paymentsalstatic->id = $links[$key]['url_id'];
-    	            $paymentsalstatic->ref = $links[$key]['url_id'];
-    	            print ' '.$paymentsalstatic->getNomUrl(2);
-    	        } elseif ($links[$key]['type'] == 'payment_loan')
-    	        {
-    	            print '<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$links[$key]['url_id'].'">';
-    	            print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
-    	            print '</a>';
-    	        } elseif ($links[$key]['type'] == 'payment_donation')
-    	        {
-    	            print '<a href="'.DOL_URL_ROOT.'/don/payment/card.php?id='.$links[$key]['url_id'].'">';
-    	            print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
-    	            print '</a>';
-    	        } elseif ($links[$key]['type'] == 'payment_expensereport')
-    	        {
-    	            $paymentexpensereportstatic->id = $links[$key]['url_id'];
-    	            $paymentexpensereportstatic->ref = $links[$key]['url_id'];
-    	            print ' '.$paymentexpensereportstatic->getNomUrl(2);
-    	        } elseif ($links[$key]['type'] == 'payment_various')
-    	        {
-    	            $paymentvariousstatic->id = $links[$key]['url_id'];
-    	            $paymentvariousstatic->ref = $links[$key]['url_id'];
-    	            print ' '.$paymentvariousstatic->getNomUrl(2);
-    	        } elseif ($links[$key]['type'] == 'banktransfert')
-    	        {
-    	            // Do not show link to transfer since there is no transfer card (avoid confusion). Can already be accessed from transaction detail.
-    	            if ($objp->amount > 0)
-    	            {
-    	                $banklinestatic->fetch($links[$key]['url_id']);
-    	                $bankstatic->id = $banklinestatic->fk_account;
-    	                $bankstatic->label = $banklinestatic->bank_account_ref;
-    	                print ' ('.$langs->trans("TransferFrom").' ';
-    	                print $bankstatic->getNomUrl(1, 'transactions');
-    	                print ' '.$langs->trans("toward").' ';
-    	                $bankstatic->id = $objp->bankid;
-    	                $bankstatic->label = $objp->bankref;
-    	                print $bankstatic->getNomUrl(1, '');
-    	                print ')';
-    	            } else {
-    	                $bankstatic->id = $objp->bankid;
-    	                $bankstatic->label = $objp->bankref;
-    	                print ' ('.$langs->trans("TransferFrom").' ';
-    	                print $bankstatic->getNomUrl(1, '');
-    	                print ' '.$langs->trans("toward").' ';
-    	                $banklinestatic->fetch($links[$key]['url_id']);
-    	                $bankstatic->id = $banklinestatic->fk_account;
-    	                $bankstatic->label = $banklinestatic->bank_account_ref;
-    	                print $bankstatic->getNomUrl(1, 'transactions');
-    	                print ')';
-    	            }
-    	            //var_dump($links);
-    	        } elseif ($links[$key]['type'] == 'company')
-    	        {
-    	        } elseif ($links[$key]['type'] == 'user')
-    	        {
-    	        } elseif ($links[$key]['type'] == 'member')
-    	        {
-    	        } elseif ($links[$key]['type'] == 'sc')
-    	        {
-    	        } else {
-    	            // Show link with label $links[$key]['label']
-    	            if (!empty($objp->label) && !empty($links[$key]['label'])) print ' - ';
-    	            print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
-    	            if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg))
-    	            {
-    	                // Label generique car entre parentheses. On l'affiche en le traduisant
-    	                if ($reg[1] == 'paiement') $reg[1] = 'Payment';
-    	                print ' '.$langs->trans($reg[1]);
-    	            } else {
-    	                print ' '.$links[$key]['label'];
-    	            }
-    	            print '</a>';
-    	        }
-    	    }
-    	    print '</td>';
-    	    if (!$i) $totalarray['nbfield']++;
-    	}
+			// Add links after description
+			$links = $bankaccountstatic->get_url($objp->rowid);
+			$cachebankaccount = array();
+			foreach ($links as $key=>$val)
+			{
+				print '<!-- '.$links[$key]['type'].' -->';
+				if ($links[$key]['type'] == 'withdraw')
+				{
+					$banktransferstatic->id = $links[$key]['url_id'];
+					$banktransferstatic->ref = $links[$key]['label'];
+					print ' '.$banktransferstatic->getNomUrl(0);
+				} elseif ($links[$key]['type'] == 'payment')
+				{
+					$paymentstatic->id = $links[$key]['url_id'];
+					$paymentstatic->ref = $links[$key]['url_id']; // FIXME This is id, not ref of payment
+					print ' '.$paymentstatic->getNomUrl(2);
+				} elseif ($links[$key]['type'] == 'payment_supplier')
+				{
+					$paymentsupplierstatic->id = $links[$key]['url_id'];
+					$paymentsupplierstatic->ref = $links[$key]['url_id']; // FIXME This is id, not ref of payment
+					print ' '.$paymentsupplierstatic->getNomUrl(2);
+				} elseif ($links[$key]['type'] == 'payment_sc')
+				{
+					$paymentscstatic->id = $links[$key]['url_id'];
+					$paymentscstatic->ref = $links[$key]['url_id'];
+					$paymentscstatic->label = $links[$key]['label'];
+					print ' '.$paymentscstatic->getNomUrl(2);
+				} elseif ($links[$key]['type'] == 'payment_vat')
+				{
+					$paymentvatstatic->id = $links[$key]['url_id'];
+					$paymentvatstatic->ref = $links[$key]['url_id'];
+					print ' '.$paymentvatstatic->getNomUrl(2);
+				} elseif ($links[$key]['type'] == 'payment_salary')
+				{
+					$paymentsalstatic->id = $links[$key]['url_id'];
+					$paymentsalstatic->ref = $links[$key]['url_id'];
+					$paymentsalstatic->label = $links[$key]['label'];
+					print ' '.$paymentsalstatic->getNomUrl(2);
+				} elseif ($links[$key]['type'] == 'payment_loan')
+				{
+					print '<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$links[$key]['url_id'].'">';
+					print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
+					print '</a>';
+				} elseif ($links[$key]['type'] == 'payment_donation')
+				{
+					$paymentdonationstatic->id = $links[$key]['url_id'];
+					$paymentdonationstatic->ref = $links[$key]['url_id'];
+					print ' '.$paymentdonationstatic->getNomUrl(2);
+				} elseif ($links[$key]['type'] == 'payment_expensereport')
+				{
+					$paymentexpensereportstatic->id = $links[$key]['url_id'];
+					$paymentexpensereportstatic->ref = $links[$key]['url_id'];
+					print ' '.$paymentexpensereportstatic->getNomUrl(2);
+				} elseif ($links[$key]['type'] == 'payment_various')
+				{
+					$paymentvariousstatic->id = $links[$key]['url_id'];
+					$paymentvariousstatic->ref = $links[$key]['url_id'];
+					print ' '.$paymentvariousstatic->getNomUrl(2);
+				} elseif ($links[$key]['type'] == 'banktransfert')
+				{
+					// Do not show link to transfer since there is no transfer card (avoid confusion). Can already be accessed from transaction detail.
+					if ($objp->amount > 0)
+					{
+						$banklinestatic->fetch($links[$key]['url_id']);
+						$bankstatic->id = $banklinestatic->fk_account;
+						$bankstatic->label = $banklinestatic->bank_account_ref;
+						print ' ('.$langs->trans("TransferFrom").' ';
+						print $bankstatic->getNomUrl(1, 'transactions');
+						print ' '.$langs->trans("toward").' ';
+						$bankstatic->id = $objp->bankid;
+						$bankstatic->label = $objp->bankref;
+						print $bankstatic->getNomUrl(1, '');
+						print ')';
+					} else {
+						$bankstatic->id = $objp->bankid;
+						$bankstatic->label = $objp->bankref;
+						print ' ('.$langs->trans("TransferFrom").' ';
+						print $bankstatic->getNomUrl(1, '');
+						print ' '.$langs->trans("toward").' ';
+						$banklinestatic->fetch($links[$key]['url_id']);
+						$bankstatic->id = $banklinestatic->fk_account;
+						$bankstatic->label = $banklinestatic->bank_account_ref;
+						print $bankstatic->getNomUrl(1, 'transactions');
+						print ')';
+					}
+					//var_dump($links);
+				} elseif ($links[$key]['type'] == 'company')
+				{
+				} elseif ($links[$key]['type'] == 'user')
+				{
+				} elseif ($links[$key]['type'] == 'member')
+				{
+				} elseif ($links[$key]['type'] == 'sc')
+				{
+				} else {
+					// Show link with label $links[$key]['label']
+					if (!empty($objp->label) && !empty($links[$key]['label'])) print ' - ';
+					print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
+					if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg))
+					{
+						// Label generique car entre parentheses. On l'affiche en le traduisant
+						if ($reg[1] == 'paiement') $reg[1] = 'Payment';
+						print ' '.$langs->trans($reg[1]);
+					} else {
+						print ' '.$links[$key]['label'];
+					}
+					print '</a>';
+				}
+			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
 
-        // Date ope
-    	if (!empty($arrayfields['b.dateo']['checked']))
-    	{
-    	    print '<td align="center" class="nowrap">';
-    	    print '<span id="dateoperation_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->do), "day")."</span>";
-    	    print '&nbsp;';
-    	    print '<span class="inline-block">';
-    	    print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=doprev&amp;account='.$objp->bankid.'&amp;rowid='.$objp->rowid.'">';
-    	    print img_edit_remove()."</a> ";
-    	    print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=donext&amp;account='.$objp->bankid.'&amp;rowid='.$objp->rowid.'">';
-    	    print img_edit_add()."</a>";
-    	    print '</span>';
-    	    print "</td>\n";
-                if (!$i) $totalarray['nbfield']++;
-    	}
+		// Date ope
+		if (!empty($arrayfields['b.dateo']['checked']))
+		{
+			print '<td align="center" class="nowrap">';
+			print '<span id="dateoperation_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->do), "day")."</span>";
+			print '&nbsp;';
+			print '<span class="inline-block">';
+			print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=doprev&amp;account='.$objp->bankid.'&amp;rowid='.$objp->rowid.'">';
+			print img_edit_remove()."</a> ";
+			print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=donext&amp;account='.$objp->bankid.'&amp;rowid='.$objp->rowid.'">';
+			print img_edit_add()."</a>";
+			print '</span>';
+			print "</td>\n";
+				if (!$i) $totalarray['nbfield']++;
+		}
 
-        // Date value
-    	if (!empty($arrayfields['b.datev']['checked']))
-    	{
-    	    print '<td align="center" class="nowrap">';
-    	    print '<span id="datevalue_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->dv), "day")."</span>";
-    	    print '&nbsp;';
-    	    print '<span class="inline-block">';
-    	    print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=dvprev&amp;account='.$objp->bankid.'&amp;rowid='.$objp->rowid.'">';
-    	    print img_edit_remove()."</a> ";
-    	    print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=dvnext&amp;account='.$objp->bankid.'&amp;rowid='.$objp->rowid.'">';
-    	    print img_edit_add()."</a>";
-    	    print '</span>';
-    	    print "</td>\n";
-            if (!$i) $totalarray['nbfield']++;
-    	}
+		// Date value
+		if (!empty($arrayfields['b.datev']['checked']))
+		{
+			print '<td align="center" class="nowrap">';
+			print '<span id="datevalue_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->dv), "day")."</span>";
+			print '&nbsp;';
+			print '<span class="inline-block">';
+			print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=dvprev&amp;account='.$objp->bankid.'&amp;rowid='.$objp->rowid.'">';
+			print img_edit_remove()."</a> ";
+			print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=dvnext&amp;account='.$objp->bankid.'&amp;rowid='.$objp->rowid.'">';
+			print img_edit_add()."</a>";
+			print '</span>';
+			print "</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+		}
 
-        // Payment type
-    	if (!empty($arrayfields['type']['checked']))
-    	{
-        	print '<td align="center" class="nowrap">';
-	        $labeltype = ($langs->trans("PaymentTypeShort".$objp->fk_type) != "PaymentTypeShort".$objp->fk_type) ? $langs->trans("PaymentTypeShort".$objp->fk_type) : $langs->getLabelFromKey($db, $objp->fk_type, 'c_paiement', 'code', 'libelle', '', 1);
-	        if ($labeltype == 'SOLD') print '&nbsp;'; //$langs->trans("InitialBankBalance");
-	        else print $labeltype;
-	        print "</td>\n";
-            if (!$i) $totalarray['nbfield']++;
-    	}
+		// Payment type
+		if (!empty($arrayfields['type']['checked']))
+		{
+			print '<td align="center" class="nowrap">';
+			$labeltype = ($langs->trans("PaymentTypeShort".$objp->fk_type) != "PaymentTypeShort".$objp->fk_type) ? $langs->trans("PaymentTypeShort".$objp->fk_type) : $langs->getLabelFromKey($db, $objp->fk_type, 'c_paiement', 'code', 'libelle', '', 1);
+			if ($labeltype == 'SOLD') print '&nbsp;'; //$langs->trans("InitialBankBalance");
+			else print $labeltype;
+			print "</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+		}
 
-        // Num cheque
-    	if (!empty($arrayfields['b.num_chq']['checked']))
-    	{
-    	    print '<td class="nowrap" align="center">'.($objp->num_chq ? $objp->num_chq : "")."</td>\n";
-    	    if (!$i) $totalarray['nbfield']++;
-    	}
+		// Num cheque
+		if (!empty($arrayfields['b.num_chq']['checked']))
+		{
+			print '<td class="nowrap" align="center">'.($objp->num_chq ? $objp->num_chq : "")."</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+		}
 
 		// Third party
-    	if (!empty($arrayfields['bu.label']['checked']))
-    	{
-        	print '<td class="tdoverflowmax150">';
+		if (!empty($arrayfields['bu.label']['checked']))
+		{
+			print '<td class="tdoverflowmax150">';
 			if ($objp->url_id)
 			{
 				$companystatic->id = $objp->url_id;
@@ -1357,157 +1363,157 @@ if ($resql)
 				print '&nbsp;';
 			}
 			print '</td>';
-            if (!$i) $totalarray['nbfield']++;
-    	}
+			if (!$i) $totalarray['nbfield']++;
+		}
 
-    	// Bank account
-    	if (!empty($arrayfields['ba.ref']['checked']))
-    	{
-        	print '<td class="nowrap">';
+		// Bank account
+		if (!empty($arrayfields['ba.ref']['checked']))
+		{
+			print '<td class="nowrap">';
 			print $bankaccount->getNomUrl(1);
 			print "</td>\n";
-            if (!$i) $totalarray['nbfield']++;
-    	}
+			if (!$i) $totalarray['nbfield']++;
+		}
 
-    	// Debit
-    	if (!empty($arrayfields['b.debit']['checked']))
-    	{
-    	    print '<td class="nowrap right">';
-    	    if ($objp->amount < 0)
-    	    {
-    	    	print price($objp->amount * -1);
-    	        $totalarray['totaldeb'] += $objp->amount;
-    	    }
-    	    print "</td>\n";
-    	    if (!$i) $totalarray['nbfield']++;
-    	    if (!$i) $totalarray['totaldebfield'] = $totalarray['nbfield'];
-    	}
+		// Debit
+		if (!empty($arrayfields['b.debit']['checked']))
+		{
+			print '<td class="nowrap right">';
+			if ($objp->amount < 0)
+			{
+				print price($objp->amount * -1);
+				$totalarray['totaldeb'] += $objp->amount;
+			}
+			print "</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['totaldebfield'] = $totalarray['nbfield'];
+		}
 
-    	// Credit
-    	if (!empty($arrayfields['b.credit']['checked']))
-    	{
-    	    print '<td class="nowrap right">';
-    	    if ($objp->amount > 0)
-    	    {
+		// Credit
+		if (!empty($arrayfields['b.credit']['checked']))
+		{
+			print '<td class="nowrap right">';
+			if ($objp->amount > 0)
+			{
 				print price($objp->amount);
-    	        $totalarray['totalcred'] += $objp->amount;
-    	    }
-    	    print "</td>\n";
-    	    if (!$i) $totalarray['nbfield']++;
-    	    if (!$i) $totalarray['totalcredfield'] = $totalarray['nbfield'];
-    	}
+				$totalarray['totalcred'] += $objp->amount;
+			}
+			print "</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['totalcredfield'] = $totalarray['nbfield'];
+		}
 
-    	// Balance before
-    	if (!empty($arrayfields['balancebefore']['checked']))
-    	{
-    		if ($mode_balance_ok)
-    		{
-    			if ($balancebefore >= 0)
-    			{
-    				print '<td class="nowrap right">&nbsp;'.price($balancebefore).'</td>';
-    			} else {
-    				print '<td class="error nowrap right">&nbsp;'.price($balancebefore).'</td>';
-    			}
-    		} else {
-    			print '<td class="right">-</td>';
-    		}
-    		if (!$i) $totalarray['nbfield']++;
-    	}
-    	// Balance
-    	if (!empty($arrayfields['balance']['checked']))
-    	{
-    		if ($mode_balance_ok)
-    		{
-    			if ($balance >= 0)
-    			{
-    				print '<td class="nowrap right">&nbsp;'.price($balance).'</td>';
-    			} else {
-    				print '<td class="error nowrap right">&nbsp;'.price($balance).'</td>';
-    			}
-    		} else {
-    			print '<td class="right">-</td>';
-    		}
-    		if (!$i) $totalarray['nbfield']++;
-    	}
+		// Balance before
+		if (!empty($arrayfields['balancebefore']['checked']))
+		{
+			if ($mode_balance_ok)
+			{
+				if ($balancebefore >= 0)
+				{
+					print '<td class="nowrap right">&nbsp;'.price($balancebefore).'</td>';
+				} else {
+					print '<td class="error nowrap right">&nbsp;'.price($balancebefore).'</td>';
+				}
+			} else {
+				print '<td class="right">-</td>';
+			}
+			if (!$i) $totalarray['nbfield']++;
+		}
+		// Balance
+		if (!empty($arrayfields['balance']['checked']))
+		{
+			if ($mode_balance_ok)
+			{
+				if ($balance >= 0)
+				{
+					print '<td class="nowrap right">&nbsp;'.price($balance).'</td>';
+				} else {
+					print '<td class="error nowrap right">&nbsp;'.price($balance).'</td>';
+				}
+			} else {
+				print '<td class="right">-</td>';
+			}
+			if (!$i) $totalarray['nbfield']++;
+		}
 
-    	if (!empty($arrayfields['b.num_releve']['checked']))
-    	{
-            print '<td class="nowraponall" align="center">';
-        	// Transaction reconciliated or edit link
-        	if ($bankaccount->canBeConciliated() > 0)
-        	{
-        		if ($objp->num_releve)
-            	{
-            	    print '<a href="releve.php?num='.$objp->num_releve.'&account='.$objp->bankid.'&save_lastsearch_values=1">'.$objp->num_releve.'</a>';
-            	}
-            	if (!$objp->conciliated && $action == 'reconcile')
-            	{
-            		if ($objp->num_releve) print '&nbsp;';
-            	    print '<input class="flat" name="rowid['.$objp->rowid.']" type="checkbox" value="'.$objp->rowid.'" size="1"'.(!empty($_POST['rowid'][$objp->rowid]) ? ' checked' : '').'>';
-            	}
-        	}
-        	print '</td>';
-            if (!$i)
-            {
-            	$totalarray['nbfield']++;
-            	$posconciliatecol = $totalarray['nbfield'];
-            }
-    	}
+		if (!empty($arrayfields['b.num_releve']['checked']))
+		{
+			print '<td class="nowraponall" align="center">';
+			// Transaction reconciliated or edit link
+			if ($bankaccount->canBeConciliated() > 0)
+			{
+				if ($objp->num_releve)
+				{
+					print '<a href="releve.php?num='.$objp->num_releve.'&account='.$objp->bankid.'&save_lastsearch_values=1">'.$objp->num_releve.'</a>';
+				}
+				if (!$objp->conciliated && $action == 'reconcile')
+				{
+					if ($objp->num_releve) print '&nbsp;';
+					print '<input class="flat" name="rowid['.$objp->rowid.']" type="checkbox" value="'.$objp->rowid.'" size="1"'.(!empty($_POST['rowid'][$objp->rowid]) ? ' checked' : '').'>';
+				}
+			}
+			print '</td>';
+			if (!$i)
+			{
+				$totalarray['nbfield']++;
+				$posconciliatecol = $totalarray['nbfield'];
+			}
+		}
 
-        if (!empty($arrayfields['b.conciliated']['checked']))
-    	{
-            print '<td class="nowraponall" align="center">';
-            print $objp->conciliated ? $langs->trans("Yes") : $langs->trans("No");
-        	print '</td>';
-            if (!$i) $totalarray['nbfield']++;
-    	}
+		if (!empty($arrayfields['b.conciliated']['checked']))
+		{
+			print '<td class="nowraponall" align="center">';
+			print $objp->conciliated ? $langs->trans("Yes") : $langs->trans("No");
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
 
-    	// Action edit/delete
-    	print '<td class="nowraponall" align="center">';
-    	// Transaction reconciliated or edit link
-    	if ($objp->conciliated && $bankaccount->canBeConciliated() > 0)  // If line not conciliated and account can be conciliated
-    	{
-    	    print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
-    	    print img_edit();
-    	    print '</a>';
-    	} else {
-    	    if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
-    	    {
-    	        print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
-    	        print img_edit();
-    	        print '</a>';
-    	    } else {
-    	        print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
-    	        print img_view();
-    	        print '</a>';
-    	    }
-    	    if ($bankaccount->canBeConciliated() > 0 && empty($objp->conciliated))
-    	    {
-    	        if ($db->jdate($objp->dv) < ($now - $conf->bank->rappro->warning_delay))
-    	        {
-    	            print ' '.img_warning($langs->trans("ReconciliationLate"));
-    	        }
-    	    }
-    	    if ($user->rights->banque->modifier)
-    	    {
-    	        print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;token='.newToken().'&amp;rowid='.$objp->rowid.'&amp;id='.$objp->bankid.'&amp;page='.$page.'">';
-    	        print img_delete('', 'class="marginleftonly"');
-    	        print '</a>';
-    	    }
-    	}
-    	print '</td>';
-    	if (!$i) $totalarray['nbfield']++;
+		// Action edit/delete
+		print '<td class="nowraponall" align="center">';
+		// Transaction reconciliated or edit link
+		if ($objp->conciliated && $bankaccount->canBeConciliated() > 0)  // If line not conciliated and account can be conciliated
+		{
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
+			print img_edit();
+			print '</a>';
+		} else {
+			if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
+			{
+				print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
+				print img_edit();
+				print '</a>';
+			} else {
+				print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
+				print img_view();
+				print '</a>';
+			}
+			if ($bankaccount->canBeConciliated() > 0 && empty($objp->conciliated))
+			{
+				if ($db->jdate($objp->dv) < ($now - $conf->bank->rappro->warning_delay))
+				{
+					print ' '.img_warning($langs->trans("ReconciliationLate"));
+				}
+			}
+			if ($user->rights->banque->modifier)
+			{
+				print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;token='.newToken().'&amp;rowid='.$objp->rowid.'&amp;id='.$objp->bankid.'&amp;page='.$page.'">';
+				print img_delete('', 'class="marginleftonly"');
+				print '</a>';
+			}
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
 
-    	// Action column
-    	print '<td class="nowrap" align="center">';
-    	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-    	{
-    	    $selected = 0;
-    	    if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
-    	    print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
-    	}
-    	print '</td>';
-    	if (!$i) $totalarray['nbfield']++;
+		// Action column
+		print '<td class="nowrap" align="center">';
+		if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+		{
+			$selected = 0;
+			if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
 
 		print "</tr>";
 
@@ -1517,25 +1523,25 @@ if ($resql)
 	// Show total line
 	if (isset($totalarray['totaldebfield']) || isset($totalarray['totalcredfield']))
 	{
-	    print '<tr class="liste_total">';
-	    $i = 0;
-	    while ($i < $totalarray['nbfield'])
-	    {
-	        $i++;
-	        if ($i == 1)
-	        {
-	            if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
-	            else print '<td class="left tdoverflowmax50" title="'.$langs->trans("Totalforthispage").'">'.$langs->trans("Totalforthispage").'</td>';
-	        } elseif ($totalarray['totaldebfield'] == $i) print '<td class="right">'.price(-1 * $totalarray['totaldeb']).'</td>';
-	        elseif ($totalarray['totalcredfield'] == $i) print '<td class="right">'.price($totalarray['totalcred']).'</td>';
-	        elseif ($i == $posconciliatecol)
-	        {
-	        	print '<td class="center">';
-	        	if ($user->rights->banque->consolidate && $action == 'reconcile') print '<input class="button" name="confirm_reconcile" type="submit" value="'.$langs->trans("Conciliate").'">';
-	        	print '</td>';
-	        } else print '<td></td>';
-	    }
-	    print '</tr>';
+		print '<tr class="liste_total">';
+		$i = 0;
+		while ($i < $totalarray['nbfield'])
+		{
+			$i++;
+			if ($i == 1)
+			{
+				if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
+				else print '<td class="left tdoverflowmax50" title="'.$langs->trans("Totalforthispage").'">'.$langs->trans("Totalforthispage").'</td>';
+			} elseif ($totalarray['totaldebfield'] == $i) print '<td class="right">'.price(-1 * $totalarray['totaldeb']).'</td>';
+			elseif ($totalarray['totalcredfield'] == $i) print '<td class="right">'.price($totalarray['totalcred']).'</td>';
+			elseif ($i == $posconciliatecol)
+			{
+				print '<td class="center">';
+				if ($user->rights->banque->consolidate && $action == 'reconcile') print '<input class="button" name="confirm_reconcile" type="submit" value="'.$langs->trans("Conciliate").'">';
+				print '</td>';
+			} else print '<td></td>';
+		}
+		print '</tr>';
 	}
 
 	// If no record found
@@ -1549,7 +1555,7 @@ if ($resql)
 	print "</table>";
 	print "</div>";
 
-    print '</form>';
+	print '</form>';
 	$db->free($resql);
 } else {
 	dol_print_error($db);
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index bac2f974def..30e483fdfa9 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -331,7 +331,7 @@ if ($action == 'create')
 	print '<input type="hidden" name="action" value="add">';
 	print '<input type="hidden" name="clos" value="0">';
 
-	dol_fiche_head('');
+	print dol_get_fiche_head('');
 
 	print '<table class="border centpercent">';
 
@@ -346,7 +346,7 @@ if ($action == 'create')
 	// Type
 	print '<tr><td class="fieldrequired">'.$langs->trans("AccountType").'</td>';
 	print '<td>';
-	$formbank->selectTypeOfBankAccount(isset($_POST["type"]) ? $_POST["type"] : Account::TYPE_CURRENT, "type");
+	$formbank->selectTypeOfBankAccount(GETPOSTISSET("type") ? GETPOST("type") : Account::TYPE_CURRENT, "type");
 	print '</td></tr>';
 
 	// Currency
@@ -354,7 +354,7 @@ if ($action == 'create')
 	print '<td>';
 	$selectedcode = $object->currency_code;
 	if (!$selectedcode) $selectedcode = $conf->currency;
-	print $form->selectCurrency((isset($_POST["account_currency_code"]) ? $_POST["account_currency_code"] : $selectedcode), 'account_currency_code');
+	print $form->selectCurrency((GETPOSTISSET("account_currency_code") ? GETPOST("account_currency_code") : $selectedcode), 'account_currency_code');
 	//print $langs->trans("Currency".$conf->currency);
 	//print '<input type="hidden" name="account_currency_code" value="'.$conf->currency.'">';
 	print '</td></tr>';
@@ -367,9 +367,8 @@ if ($action == 'create')
 
 	// Country
 	$selectedcode = '';
-	if (isset($_POST["account_country_id"]))
-	{
-		$selectedcode = $_POST["account_country_id"] ? $_POST["account_country_id"] : $object->country_code;
+	if (GETPOSTISSET("account_country_id")) {
+		$selectedcode = GETPOST("account_country_id") ? GETPOST("account_country_id") : $object->country_code;
 	} elseif (empty($selectedcode)) $selectedcode = $mysoc->country_code;
 	$object->country_code = getCountry($selectedcode, 2); // Force country code on account to have following field on bank fields matching country rules
 
@@ -383,7 +382,7 @@ if ($action == 'create')
 	print '<tr><td>'.$langs->trans('State').'</td><td>';
 	if ($selectedcode)
 	{
-		$formcompany->select_departement(isset($_POST["account_state_id"]) ? $_POST["account_state_id"] : '', $selectedcode, 'account_state_id');
+		$formcompany->select_departement(GETPOSTISSET("account_state_id") ? GETPOST("account_state_id") : '', $selectedcode, 'account_state_id');
 	} else {
 		print $countrynotdefined;
 	}
@@ -408,7 +407,7 @@ if ($action == 'create')
 				$arrayselected[] = $cat->id;
 			}
 		}
-		print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
+		print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 		print "</td></tr>";
 	}
 
@@ -544,12 +543,12 @@ if ($action == 'create')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("CreateAccount").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+	print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 	print '</div>';
 
 	print '</form>';
@@ -574,7 +573,7 @@ if ($action == 'create')
 
 		// Show tabs
 		$head = bank_prepare_head($object);
-		dol_fiche_head($head, 'bankname', $langs->trans("FinancialAccount"), -1, 'account');
+		print dol_get_fiche_head($head, 'bankname', $langs->trans("FinancialAccount"), -1, 'account');
 
 		$formconfirm = '';
 
@@ -752,7 +751,7 @@ if ($action == 'create')
 
 		print '<div class="clearboth"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		/*
 		 * Barre d'actions
@@ -810,7 +809,7 @@ if ($action == 'create')
 		print '<input type="hidden" name="action" value="update">';
 		print '<input type="hidden" name="id" value="'.$_REQUEST["id"].'">'."\n\n";
 
-		dol_fiche_head(array(), 0, '', 0);
+		print dol_get_fiche_head(array(), 0, '', 0);
 
 		//print '<div class="underbanner clearboth"></div>';
 
@@ -818,16 +817,16 @@ if ($action == 'create')
 
 		// Ref
 		print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("Ref").'</td>';
-		print '<td><input type="text" class="flat maxwidth200" name="ref" value="'.dol_escape_htmltag(isset($_POST["ref"]) ?GETPOST("ref") : $object->ref).'"></td></tr>';
+		print '<td><input type="text" class="flat maxwidth200" name="ref" value="'.dol_escape_htmltag(GETPOSTISSET("ref") ? GETPOST("ref") : $object->ref).'"></td></tr>';
 
 		// Label
 		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td>';
-		print '<td><input type="text" class="flat minwidth300" name="label" value="'.dol_escape_htmltag(isset($_POST["label"]) ?GETPOST("label") : $object->label).'"></td></tr>';
+		print '<td><input type="text" class="flat minwidth300" name="label" value="'.dol_escape_htmltag(GETPOSTISSET("label") ? GETPOST("label") : $object->label).'"></td></tr>';
 
 		// Type
 		print '<tr><td class="fieldrequired">'.$langs->trans("AccountType").'</td>';
 		print '<td class="maxwidth200onsmartphone">';
-		$formbank->selectTypeOfBankAccount((isset($_POST["type"]) ? $_POST["type"] : $object->type), "type");
+		$formbank->selectTypeOfBankAccount((GETPOSTISSET("type") ? GETPOST("type") : $object->type), "type");
 		print '</td></tr>';
 
 		// Currency
@@ -837,7 +836,7 @@ if ($action == 'create')
 		print '<td class="maxwidth200onsmartphone">';
 		$selectedcode = $object->currency_code;
 		if (!$selectedcode) $selectedcode = $conf->currency;
-		print $form->selectCurrency((isset($_POST["account_currency_code"]) ? $_POST["account_currency_code"] : $selectedcode), 'account_currency_code');
+		print $form->selectCurrency((GETPOSTISSET("account_currency_code") ? GETPOST("account_currency_code") : $selectedcode), 'account_currency_code');
 		//print $langs->trans("Currency".$conf->currency);
 		//print '<input type="hidden" name="account_currency_code" value="'.$conf->currency.'">';
 		print '</td></tr>';
@@ -845,13 +844,13 @@ if ($action == 'create')
 		// Status
 		print '<tr><td class="fieldrequired">'.$langs->trans("Status").'</td>';
 		print '<td class="maxwidth200onsmartphone">';
-		print $form->selectarray("clos", $object->status, (isset($_POST["clos"]) ? $_POST["clos"] : $object->clos));
+		print $form->selectarray("clos", $object->status, (GETPOSTISSET("clos") ? GETPOST("clos") : $object->clos));
 		print '</td></tr>';
 
 		// Country
 		$object->country_id = $object->country_id ? $object->country_id : $mysoc->country_id;
 		$selectedcode = $object->country_code;
-		if (isset($_POST["account_country_id"])) $selectedcode = $_POST["account_country_id"];
+		if (GETPOSTISSET("account_country_id")) $selectedcode = GETPOST("account_country_id");
 		elseif (empty($selectedcode)) $selectedcode = $mysoc->country_code;
 		$object->country_code = getCountry($selectedcode, 2); // Force country code on account to have following field on bank fields matching country rules
 
@@ -865,7 +864,7 @@ if ($action == 'create')
 		print '<tr><td>'.$langs->trans('State').'</td><td class="maxwidth200onsmartphone">';
 		if ($selectedcode)
 		{
-			print $formcompany->select_state(isset($_POST["account_state_id"]) ? $_POST["account_state_id"] : $object->state_id, $selectedcode, 'account_state_id');
+			print $formcompany->select_state(GETPOSTISSET("account_state_id") ? GETPOST("account_state_id") : $object->state_id, $selectedcode, 'account_state_id');
 		} else {
 			print $countrynotdefined;
 		}
@@ -882,14 +881,14 @@ if ($action == 'create')
 
 		// Balance
 		print '<tr><td>'.$langs->trans("BalanceMinimalAllowed").'</td>';
-		print '<td><input size="12" type="text" class="flat" name="account_min_allowed" value="'.(isset($_POST["account_min_allowed"]) ?GETPOST("account_min_allowed") : $object->min_allowed).'"></td></tr>';
+		print '<td><input size="12" type="text" class="flat" name="account_min_allowed" value="'.(GETPOSTISSET("account_min_allowed") ? GETPOST("account_min_allowed") : $object->min_allowed).'"></td></tr>';
 
 		print '<tr><td>'.$langs->trans("BalanceMinimalDesired").'</td>';
-		print '<td ><input size="12" type="text" class="flat" name="account_min_desired" value="'.(isset($_POST["account_min_desired"]) ?GETPOST("account_min_desired") : $object->min_desired).'"></td></tr>';
+		print '<td><input size="12" type="text" class="flat" name="account_min_desired" value="'.(GETPOSTISSET("account_min_desired") ? GETPOST("account_min_desired") : $object->min_desired).'"></td></tr>';
 
 		// Web
 		print '<tr><td>'.$langs->trans("Web").'</td>';
-		print '<td><input class="maxwidth200onsmartphone" type="text" class="flat" name="url" value="'.(isset($_POST["url"]) ?GETPOST("url") : $object->url).'">';
+		print '<td><input class="maxwidth200onsmartphone" type="text" class="flat" name="url" value="'.(GETPOSTISSET("url") ? GETPOST("url") : $object->url).'">';
 		print '</td></tr>';
 
 		// Tags-Categories
@@ -905,7 +904,7 @@ if ($action == 'create')
 					$arrayselected[] = $cat->id;
 				}
 			}
-			print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
+			print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 			print "</td></tr>";
 		}
 
@@ -1028,12 +1027,12 @@ if ($action == 'create')
 			print '</table>';
 		}
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
 		print '<input value="'.$langs->trans("Modify").'" type="submit" class="button">';
 		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input name="cancel" value="'.$langs->trans("Cancel").'" type="submit" class="button">';
+		print '<input name="cancel" value="'.$langs->trans("Cancel").'" type="submit" class="button button-cancel">';
 		print '</div>';
 
 		print '</form>';
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index 18b75bdea9b..fd286266a21 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -43,9 +43,12 @@ $bankcateg = new BankCateg($db);
 $categid = GETPOST('categid');
 $label = GETPOST("label");
 
+
+
 /*
- * Add category
+ * Actions
  */
+
 if (GETPOST('add'))
 {
 	if ($label) {
@@ -95,14 +98,17 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Ref").'</td><td colspan="2">'.$langs->trans("Label").'</td>';
+print '<td>'.$langs->trans("Ref").'</td><td>'.$langs->trans("Label").'</td>';
+print '<td></td>';
+print '<td></td>';
 print "</tr>\n";
 
 // Line to add category
 if ($action != 'edit')
 {
 	print '<tr class="oddeven">';
-	print '<td>&nbsp;</td><td><input name="label" type="text" size="45"></td>';
+	print '<td>&nbsp;</td><td><input name="label" type="text" class="maxwidth100"></td>';
+	print '<td></td>';
 	print '<td class="center"><input type="submit" name="add" class="button" value="'.$langs->trans("Add").'"></td>';
 	print '</tr>';
 }
@@ -111,7 +117,7 @@ if ($action != 'edit')
 $sql = "SELECT rowid, label";
 $sql .= " FROM ".MAIN_DB_PREFIX."bank_categ";
 $sql .= " WHERE entity = ".$conf->entity;
-$sql .= " ORDER BY label";
+$sql .= " ORDER BY rowid";
 
 $result = $db->query($sql);
 if ($result)
@@ -124,16 +130,19 @@ if ($result)
 		$objp = $db->fetch_object($result);
 
 		print '<tr class="oddeven">';
-		print '<td><a href="'.DOL_URL_ROOT.'/compta/bank/budget.php?bid='.$objp->rowid.'">'.$objp->rowid.'</a></td>';
+		print '<td>'.$objp->rowid.'</td>';
 		if (GETPOST('action', 'aZ09') == 'edit' && GETPOST("categid") == $objp->rowid)
 		{
-			print "<td colspan=2>";
+			print '<td colspan="3">';
 			print '<input type="hidden" name="categid" value="'.$objp->rowid.'">';
 			print '<input name="label" type="text" size=45 value="'.$objp->label.'">';
 			print '<input type="submit" name="update" class="button" value="'.$langs->trans("Edit").'">';
 			print "</td>";
 		} else {
-			print "<td >".$objp->label."</td>";
+			print "<td>".$objp->label."</td>";
+			print '<td>';
+			//print '<a href="'.DOL_URL_ROOT.'/compta/bank/budget.php?bid='.$objp->rowid.'">'.$langs->trans("List").'</a>';
+			print '</td>';
 			print '<td class="center">';
 			print '<a class="editfielda reposition marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?categid='.$objp->rowid.'&amp;action=edit&amp;token='.newToken().'">'.img_edit().'</a>';
 			print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?categid='.$objp->rowid.'&amp;action=delete&amp;token='.newToken().'">'.img_delete().'</a>';
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index dffd62dc5a3..e93491ceee4 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -173,8 +173,8 @@ class Account extends CommonObject
 	public $account_number;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_accountancy_journal;
 
 	/**
@@ -305,7 +305,7 @@ class Account extends CommonObject
 	 *
 	 *  @param	DoliDB		$db		Database handler
 	 */
-    public function __construct(DoliDB $db)
+	public function __construct(DoliDB $db)
 	{
 		global $langs;
 
@@ -358,7 +358,7 @@ class Account extends CommonObject
 	 *
 	 *  @return     int         1 if need to be concialiated, < 0 otherwise.
 	 */
-    public function canBeConciliated()
+	public function canBeConciliated()
 	{
 		global $conf;
 
@@ -369,7 +369,7 @@ class Account extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Add a link between bank line record and its source
 	 *
@@ -380,9 +380,9 @@ class Account extends CommonObject
 	 *      @param  string	$type       Type of link ('payment', 'company', 'member', ...)
 	 *      @return int         		<0 if KO, id line if OK
 	 */
-    public function add_url_line($line_id, $url_id, $url, $label, $type)
+	public function add_url_line($line_id, $url_id, $url, $label, $type)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_url (";
 		$sql .= "fk_bank";
 		$sql .= ", url_id";
@@ -408,7 +408,7 @@ class Account extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 		TODO Move this into AccountLine
 	 *      Return array with links from llx_bank_url
@@ -418,9 +418,9 @@ class Account extends CommonObject
 	 *      @param  string      $type       To search using type
 	 *      @return array|int               Array of links array('url'=>, 'url_id'=>, 'label'=>, 'type'=> 'fk_bank'=> ) or -1 on error
 	 */
-    public function get_url($fk_bank = '', $url_id = '', $type = '')
+	public function get_url($fk_bank = '', $url_id = '', $type = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$lines = array();
 
 		// Check parameters
@@ -481,7 +481,7 @@ class Account extends CommonObject
 	 *  @param	int			$datev			Date value
 	 *  @return	int							Rowid of added entry, <0 if KO
 	 */
-    public function addline($date, $oper, $label, $amount, $num_chq, $categorie, User $user, $emetteur = '', $banque = '', $accountancycode = '', $datev = null)
+	public function addline($date, $oper, $label, $amount, $num_chq, $categorie, User $user, $emetteur = '', $banque = '', $accountancycode = '', $datev = null)
 	{
 		// Deprecation warning
 		if (is_numeric($oper)) {
@@ -589,7 +589,7 @@ class Account extends CommonObject
 	 *  @param  int     $notrigger  1=Disable triggers
 	 *  @return int        			< 0 if KO, > 0 if OK
 	 */
-    public function create(User $user, $notrigger = 0)
+	public function create(User $user, $notrigger = 0)
 	{
 		global $langs, $conf, $hookmanager;
 
@@ -747,7 +747,7 @@ class Account extends CommonObject
 	 *      @param  int     $notrigger  1=Disable triggers
 	 *		@return	int					<0 if KO, >0 if OK
 	 */
-    public function update(User $user, $notrigger = 0)
+	public function update(User $user, $notrigger = 0)
 	{
 		global $langs, $conf, $hookmanager;
 
@@ -842,16 +842,16 @@ class Account extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Update BBAN (RIB) account fields
 	 *
 	 *  @param	User	$user       Object user making update
 	 *	@return	int					<0 if KO, >0 if OK
 	 */
-    public function update_bban(User $user = null)
+	public function update_bban(User $user = null)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		// Clean parameters
@@ -907,7 +907,7 @@ class Account extends CommonObject
 	 *      @param  string	$ref     	Ref of bank account to get
 	 *      @return	int					<0 if KO, >0 if OK
 	 */
-    public function fetch($id, $ref = '')
+	public function fetch($id, $ref = '')
 	{
 		global $conf;
 
@@ -925,11 +925,11 @@ class Account extends CommonObject
 		$sql .= " ba.datec as date_creation, ba.tms as date_update,";
 		$sql .= ' c.code as country_code, c.label as country,';
 		$sql .= ' d.code_departement as state_code, d.nom as state';
-        $sql .= ' , aj.code as accountancy_journal';
+		$sql .= ' , aj.code as accountancy_journal';
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON ba.fk_pays = c.rowid';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON ba.state_id = d.rowid';
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'accounting_journal as aj ON aj.rowid=ba.fk_accountancy_journal';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'accounting_journal as aj ON aj.rowid=ba.fk_accountancy_journal';
 		$sql .= " WHERE ba.entity IN (".getEntity($this->element).")";
 		if ($id)  $sql .= " AND ba.rowid  = ".$id;
 		if ($ref) $sql .= " AND ba.ref = '".$this->db->escape($ref)."'";
@@ -984,7 +984,7 @@ class Account extends CommonObject
 				$this->date_creation  = $this->db->jdate($obj->date_creation);
 				$this->date_update    = $this->db->jdate($obj->date_update);
 
-				// Retreive all extrafield
+				// Retrieve all extrafield
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
 
@@ -1007,10 +1007,10 @@ class Account extends CommonObject
 	 * Existing categories are left untouch.
 	 *
 	 * @param int[]|int $categories Category or categories IDs
-     * @return void
+	 * @return void
 	 */
-    public function setCategories($categories)
-    {
+	public function setCategories($categories)
+	{
 		// Handle single category
 		if (!is_array($categories)) {
 			$categories = array($categories);
@@ -1051,7 +1051,7 @@ class Account extends CommonObject
 	 *	@param	User	$user	User deleting
 	 *  @return int             <0 if KO, >0 if OK
 	 */
-    public function delete(User $user = null)
+	public function delete(User $user = null)
 	{
 		global $conf;
 
@@ -1115,12 +1115,12 @@ class Account extends CommonObject
 	 *  @param      int		$mode			0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
 	 *  @return     string        		    Label
 	 */
-    public function getLibStatut($mode = 0)
+	public function getLibStatut($mode = 0)
 	{
 		return $this->LibStatut($this->clos, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return label of given object status
 	 *
@@ -1128,9 +1128,9 @@ class Account extends CommonObject
 	 *  @param   int		$mode			0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
 	 *  @return  string        			    Label
 	 */
-    public function LibStatut($status, $mode = 0)
+	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$langs->load('banks');
 
@@ -1148,15 +1148,15 @@ class Account extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Renvoi si un compte peut etre supprimer ou non (sans mouvements)
 	 *
 	 *    @return     boolean     vrai si peut etre supprime, faux sinon
 	 */
-    public function can_be_deleted()
+	public function can_be_deleted()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$can_be_deleted = false;
 
 		$sql = "SELECT COUNT(rowid) as nb";
@@ -1179,7 +1179,7 @@ class Account extends CommonObject
 	 *
 	 *   @return	string		Error string
 	 */
-    public function error()
+	public function error()
 	{
 		return $this->error;
 	}
@@ -1190,7 +1190,7 @@ class Account extends CommonObject
 	 * 	@param	int		$option		1=Exclude future operation date (this is to exclude input made in advance and have real account sold)
 	 *	@return	int					Current sold (value date <= today)
 	 */
-    public function solde($option = 0)
+	public function solde($option = 0)
 	{
 		$solde = 0;
 
@@ -1216,7 +1216,7 @@ class Account extends CommonObject
 		return price2num($solde, 'MU');
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
@@ -1224,9 +1224,9 @@ class Account extends CommonObject
 	 *		@param	int		$filteraccountid	To get info for a particular account id
 	 *      @return WorkboardResponse|int 		<0 if KO, WorkboardResponse if OK
 	 */
-    public function load_board(User $user, $filteraccountid = 0)
+	public function load_board(User $user, $filteraccountid = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
@@ -1272,15 +1272,15 @@ class Account extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Charge indicateurs this->nb de tableau de bord
 	 *		@param		int			$filteraccountid	To get info for a particular account id
 	 *      @return     int         <0 if ko, >0 if ok
 	 */
-    public function load_state_board($filteraccountid = 0)
+	public function load_state_board($filteraccountid = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user;
 
 		if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
@@ -1348,15 +1348,18 @@ class Account extends CommonObject
 	 *  @param  string	$mode           			''=Link to card, 'transactions'=Link to transactions card
 	 *  @param  string  $option         			''=Show ref, 'reflabel'=Show ref+label
 	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *  @param	int  	$notooltip		 			1=Disable tooltip
+	 *  @param	int  	$notooltip		 			1=Disable tooltip
 	 *	@return	string								Chaine avec URL
 	 */
-    public function getNomUrl($withpicto = 0, $mode = '', $option = '', $save_lastsearch_value = -1, $notooltip = 0)
+	public function getNomUrl($withpicto = 0, $mode = '', $option = '', $save_lastsearch_value = -1, $notooltip = 0)
 	{
 		global $conf, $langs, $user;
 
 		$result = '';
-		$label = img_picto('', $this->picto).' <u>'.$langs->trans("BankAccount").'</u>';
+		$label = img_picto('', $this->picto).' <u class="paddingrightnow">'.$langs->trans("BankAccount").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
 		$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
 		$label .= '<br><b>'.$langs->trans('AccountNumber').':</b> '.$this->number;
 		$label .= '<br><b>'.$langs->trans('IBAN').':</b> '.$this->iban;
@@ -1375,9 +1378,6 @@ class Account extends CommonObject
 			$label .= '<br><b>'.$langs->trans('AccountAccounting').':</b> '.length_accountg($this->account_number);
 			$label .= '<br><b>'.$langs->trans('AccountancyJournal').':</b> '.$this->accountancy_journal;
 		}
-		if (isset($this->status)) {
-			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
-		}
 
 		$linkclose = '" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 
@@ -1401,10 +1401,10 @@ class Account extends CommonObject
 		$linkstart = '<a href="'.$url.$linkclose;
 		$linkend = '</a>';
 
-        if ($option == 'nolink') {
-            $linkstart = '';
-            $linkend = '';
-        }
+		if ($option == 'nolink') {
+			$linkstart = '';
+			$linkend = '';
+		}
 
 		$result .= $linkstart;
 		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
@@ -1423,7 +1423,7 @@ class Account extends CommonObject
 	 *
 	 *     @return     int         1 if correct, <=0 if wrong
 	 */
-    public function verif()
+	public function verif()
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 
@@ -1455,7 +1455,7 @@ class Account extends CommonObject
 	 *
 	 *	@return		string		country code
 	 */
-    public function getCountryCode()
+	public function getCountryCode()
 	{
 		global $mysoc;
 
@@ -1493,7 +1493,7 @@ class Account extends CommonObject
 	 *                         1=Need 2 fields for bank code: Bank, Desk (France, Spain, ...) + Account number and key
 	 *                         2=Need 1 field for bank code:  Bank only (Sort code for Great Britain, BSB for Australia) + Account number
 	 */
-    public function useDetailedBBAN()
+	public function useDetailedBBAN()
 	{
 		$country_code = $this->getCountryCode();
 
@@ -1507,7 +1507,7 @@ class Account extends CommonObject
 	 *
 	 * @return		int        1 = mandatory / 0 = Not mandatory
 	 */
-    public function needIBAN()
+	public function needIBAN()
 	{
 		$country_code = $this->getCountryCode();
 
@@ -1557,7 +1557,7 @@ class Account extends CommonObject
 	 *	@param  int		$id		Id of object to load
 	 *	@return	void
 	 */
-    public function info($id)
+	public function info($id)
 	{
 	}
 
@@ -1640,7 +1640,7 @@ class Account extends CommonObject
 				//Replace the old AccountNumber key with the new BankAccountNumber key
 				$fieldlists = explode(
 					' ',
-                    preg_replace('/ ?[^Bank]AccountNumber ?/', 'BankAccountNumber', $conf->global->BANK_SHOW_ORDER_OPTION)
+					preg_replace('/ ?[^Bank]AccountNumber ?/', 'BankAccountNumber', $conf->global->BANK_SHOW_ORDER_OPTION)
 				);
 			}
 		}
@@ -1656,7 +1656,7 @@ class Account extends CommonObject
 	 *
 	 *  @return	void
 	 */
-    public function initAsSpecimen()
+	public function initAsSpecimen()
 	{
 		$this->specimen        = 1;
 		$this->ref             = 'MBA';
@@ -1688,10 +1688,10 @@ class AccountLine extends CommonObject
 	 */
 	public $error = '';
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string ID to identify managed object
@@ -1713,54 +1713,54 @@ class AccountLine extends CommonObject
 	 */
 	public $id;
 
-    /**
-     * @var string Ref
-     */
-    public $ref;
+	/**
+	 * @var string Ref
+	 */
+	public $ref;
 
 	/**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
-    /**
-     * Date (dateo)
-     *
-     * @var integer
-     */
+	/**
+	 * Date (dateo)
+	 *
+	 * @var integer
+	 */
 	public $dateo;
 
 	/**
-     * Date value (datev)
-     *
-     * @var integer
-     */
+	 * Date value (datev)
+	 *
+	 * @var integer
+	 */
 	public $datev;
 
 	public $amount;
 
-    /**
-     * @var string bank transaction lines label
-     */
-    public $label;
+	/**
+	 * @var string bank transaction lines label
+	 */
+	public $label;
 
-    public $note;
+	public $note;
 
-    /**
-     * @var int ID
-     */
+	/**
+	 * @var int ID
+	 */
 	public $fk_user_author;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_rappro;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_type;
 
 	public $rappro; // Is it conciliated
@@ -1769,13 +1769,13 @@ class AccountLine extends CommonObject
 	public $bank_chq; // Bank of cheque
 
 	/**
-     * @var int ID of cheque receipt
-     */
+	 * @var int ID of cheque receipt
+	 */
 	public $fk_bordereau;
 
 	/**
-     * @var int ID of bank account
-     */
+	 * @var int ID of bank account
+	 */
 	public $fk_account;
 
 	/**
@@ -1783,7 +1783,7 @@ class AccountLine extends CommonObject
 	 */
 	public $bank_account_label;
 
-    /**
+	/**
 	 * @var string		Name of check issuer
 	 */
 	public $emetteur;
@@ -1793,7 +1793,7 @@ class AccountLine extends CommonObject
 	 *
 	 *  @param	DoliDB	$db		Database handler
 	 */
-    public function __construct(DoliDB $db)
+	public function __construct(DoliDB $db)
 	{
 		$this->db = $db;
 	}
@@ -1806,7 +1806,7 @@ class AccountLine extends CommonObject
 	 *  @param      string	$num     	External num to load (ex: num of transaction for paypal fee)
 	 *	@return		int					<0 if KO, 0 if OK but not found, >0 if OK and found
 	 */
-    public function fetch($rowid, $ref = '', $num = '')
+	public function fetch($rowid, $ref = '', $num = '')
 	{
 		global $conf;
 
@@ -1926,9 +1926,9 @@ class AccountLine extends CommonObject
 	 *		@param	User	$user	User object that delete
 	 *      @return	int 			<0 if KO, >0 if OK
 	 */
-    public function delete(User $user = null)
+	public function delete(User $user = null)
 	{
-    	global $conf;
+		global $conf;
 
 		$nbko = 0;
 
@@ -1988,16 +1988,16 @@ class AccountLine extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Delete bank line records
 	 *
 	 *		@param	User	$user	User object that delete
 	 *      @return	int 			<0 if KO, >0 if OK
 	 */
-    public function delete_urls(User $user = null)
+	public function delete_urls(User $user = null)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$nbko = 0;
 
 		if ($this->rappro)
@@ -2032,7 +2032,7 @@ class AccountLine extends CommonObject
 	 *		@param 	int		$notrigger		0=Disable all triggers
 	 *		@return	int						<0 if KO, >0 if OK
 	 */
-    public function update(User $user, $notrigger = 0)
+	public function update(User $user, $notrigger = 0)
 	{
 		$this->db->begin();
 
@@ -2056,7 +2056,7 @@ class AccountLine extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Update conciliation field
 	 *
@@ -2065,9 +2065,9 @@ class AccountLine extends CommonObject
 	 *	@param	int		$conciliated	1=Set transaction to conciliated, 0=Keep transaction non conciliated
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-    public function update_conciliation(User $user, $cat, $conciliated = 1)
+	public function update_conciliation(User $user, $cat, $conciliated = 1)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		$this->db->begin();
@@ -2119,7 +2119,7 @@ class AccountLine extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Increase/decrease value date of a rowid
 	 *
@@ -2127,9 +2127,9 @@ class AccountLine extends CommonObject
 	 *	@param	int		$sign		1 or -1
 	 *	@return	int					>0 if OK, 0 if KO
 	 */
-    public function datev_change($rowid, $sign = 1)
+	public function datev_change($rowid, $sign = 1)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "SELECT datev FROM ".MAIN_DB_PREFIX."bank WHERE rowid = ".$rowid;
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -2156,34 +2156,34 @@ class AccountLine extends CommonObject
 		return 0;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Increase value date of a rowid
 	 *
 	 *	@param	int		$id		Id of line to change
 	 *	@return	int				>0 if OK, 0 if KO
 	 */
-    public function datev_next($id)
+	public function datev_next($id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return $this->datev_change($id, 1);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Decrease value date of a rowid
 	 *
 	 *	@param	int		$id		Id of line to change
 	 *	@return	int				>0 if OK, 0 if KO
 	 */
-    public function datev_previous($id)
+	public function datev_previous($id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return $this->datev_change($id, -1);
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Increase/decrease operation date of a rowid
 	 *
@@ -2191,9 +2191,9 @@ class AccountLine extends CommonObject
 	 *	@param	int		$sign		1 or -1
 	 *	@return	int					>0 if OK, 0 if KO
 	 */
-    public function dateo_change($rowid, $sign = 1)
+	public function dateo_change($rowid, $sign = 1)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "SELECT dateo FROM ".MAIN_DB_PREFIX."bank WHERE rowid = ".$rowid;
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -2220,29 +2220,29 @@ class AccountLine extends CommonObject
 		return 0;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Increase operation date of a rowid
 	 *
 	 *	@param	int		$id		Id of line to change
 	 *	@return	int				>0 if OK, 0 if KO
 	 */
-    public function dateo_next($id)
+	public function dateo_next($id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return $this->dateo_change($id, 1);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Decrease operation date of a rowid
 	 *
 	 *	@param	int		$id		Id of line to change
 	 *	@return	int				>0 if OK, 0 if KO
 	 */
-    public function dateo_previous($id)
+	public function dateo_previous($id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return $this->dateo_change($id, -1);
 	}
 
@@ -2253,7 +2253,7 @@ class AccountLine extends CommonObject
 	 *	@param  int		$id		Id of object to load
 	 *	@return	void
 	 */
-    public function info($id)
+	public function info($id)
 	{
 		$sql = 'SELECT b.rowid, b.datec, b.tms as datem,';
 		$sql .= ' b.fk_user_author, b.fk_user_rappro';
@@ -2301,7 +2301,7 @@ class AccountLine extends CommonObject
 	 * 		@param	int     $notooltip		1=Disable tooltip
 	 *		@return	string					Chaine avec URL
 	 */
-    public function getNomUrl($withpicto = 0, $maxlen = 0, $option = '', $notooltip = 0)
+	public function getNomUrl($withpicto = 0, $maxlen = 0, $option = '', $notooltip = 0)
 	{
 		global $langs;
 
@@ -2358,12 +2358,12 @@ class AccountLine extends CommonObject
 	 *    @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long
 	 *    @return   string        		Libelle
 	 */
-    public function getLibStatut($mode = 0)
+	public function getLibStatut($mode = 0)
 	{
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un statut donne
 	 *
@@ -2371,9 +2371,9 @@ class AccountLine extends CommonObject
 	 *  @param	int		$mode           0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *  @return	string          		Libelle du statut
 	 */
-    public function LibStatut($status, $mode = 0)
+	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		//$langs->load('companies');
 		/*
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index 3293f746033..35104e5ed25 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -30,407 +30,407 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 class BankAccounts extends DolibarrApi
 {
 
-    /**
-     * array $FIELDS Mandatory fields, checked when creating an object
-     */
-    static $FIELDS = array(
-        'ref',
-        'label',
-        'type',
-        'currency_code',
-        'country_id'
-    );
+	/**
+	 * array $FIELDS Mandatory fields, checked when creating an object
+	 */
+	static $FIELDS = array(
+		'ref',
+		'label',
+		'type',
+		'currency_code',
+		'country_id'
+	);
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db;
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db;
+		$this->db = $db;
+	}
 
-    /**
-     * Get the list of accounts.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Limit for list
-     * @param int       $page       Page number
+	/**
+	 * Get the list of accounts.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Limit for list
+	 * @param int       $page       Page number
 	 * @param  int    	$category   Use this param to filter list by category
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.import_key:<:'20160101')"
-     * @return array                List of account objects
-     *
-     * @throws RestException
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $category = 0, $sqlfilters = '')
-    {
-        $list = array();
-
-        if (!DolibarrApiAccess::$user->rights->banque->lire) {
-            throw new RestException(401);
-        }
-
-        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."bank_account as t";
-    	if ($category > 0) {
-            $sql .= ", ".MAIN_DB_PREFIX."categorie_account as c";
-		}
-        $sql .= ' WHERE t.entity IN ('.getEntity('bank_account').')';
-    	// Select accounts of given category
-    	if ($category > 0) {
-            $sql .= " AND c.fk_categorie = ".$this->db->escape($category)." AND c.fk_account = t.rowid ";
-		}
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
-
-        dol_syslog("API Rest request");
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $obj = $this->db->fetch_object($result);
-                $account = new Account($this->db);
-                if ($account->fetch($obj->rowid) > 0) {
-                    $list[] = $this->_cleanObjectDatas($account);
-                }
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of accounts: '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get account by ID.
-     *
-     * @param int    $id    ID of account
-     * @return array Account object
-     *
-     * @throws RestException
-     */
-    public function get($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->banque->lire) {
-            throw new RestException(401);
-        }
-
-        $account = new Account($this->db);
-        $result = $account->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'account not found');
-        }
-
-        return $this->_cleanObjectDatas($account);
-    }
-
-    /**
-     * Create account object
-     *
-     * @param array $request_data    Request data
-     * @return int ID of account
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->banque->configurer) {
-            throw new RestException(401);
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
-
-        $account = new Account($this->db);
-        foreach ($request_data as $field => $value) {
-            $account->$field = $value;
-        }
-        // Date of the initial balance (required to create an account).
-        $account->date_solde = time();
-        // courant and type are the same thing but the one used when
-        // creating an account is courant
-        $account->courant = $account->type;
-
-        if ($account->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, 'Error creating bank account', array_merge(array($account->error), $account->errors));
-        }
-        return $account->id;
-    }
-
-    /**
-     * Create an internal wire transfer between two bank accounts
-     *
-     * @param int     $bankaccount_from_id  BankAccount ID to use as the source of the internal wire transfer		{@from body}{@required true}
-     * @param int     $bankaccount_to_id    BankAccount ID to use as the destination of the internal wire transfer  {@from body}{@required true}
-     * @param string  $date					Date of the internal wire transfer (UNIX timestamp)						{@from body}{@required true}{@type timestamp}
-     * @param string  $description			Description of the internal wire transfer								{@from body}{@required true}
-     * @param float	  $amount				Amount to transfer from the source to the destination BankAccount		{@from body}{@required true}
-     * @param float	  $amount_to			Amount to transfer to the destination BankAccount (only when accounts does not share the same currency)		{@from body}{@required false}
-     *
-     * @url POST    /transfer
-     *
-     * @return array
-     *
-     * @status 201
-     *
-     * @throws RestException 401 Unauthorized: User does not have permission to configure bank accounts
-	 * @throws RestException 404 Not Found: Either the source or the destination bankaccount for the provided id does not exist
-     * @throws RestException 422 Unprocessable Entity: Refer to detailed exception message for the cause
-	 * @throws RestException 500 Internal Server Error: Error(s) returned by the RDBMS
-     */
-    public function transfer($bankaccount_from_id = 0, $bankaccount_to_id = 0, $date = null, $description = "", $amount = 0.0, $amount_to = 0.0)
-    {
-        if (!DolibarrApiAccess::$user->rights->banque->configurer) {
-            throw new RestException(401);
-        }
-
-        if ($bankaccount_from_id === $bankaccount_to_id) {
-            throw new RestException(422, 'bankaccount_from_id and bankaccount_to_id must be different !');
-        }
-
-        require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-        $accountfrom = new Account($this->db);
-        $resultAccountFrom = $accountfrom->fetch($bankaccount_from_id);
-
-        if ($resultAccountFrom === 0) {
-            throw new RestException(404, 'The BankAccount for bankaccount_from_id provided does not exist.');
-        }
-
-        $accountto = new Account($this->db);
-        $resultAccountTo = $accountto->fetch($bankaccount_to_id);
-
-        if ($resultAccountTo === 0) {
-            throw new RestException(404, 'The BankAccount for bankaccount_to_id provided does not exist.');
-        }
-
-        if ($accountto->currency_code == $accountfrom->currency_code)
-        {
-            $amount_to = $amount;
-        } else {
-            if (!$amount_to || empty($amount_to))
-            {
-                throw new RestException(422, 'You must provide amount_to value since bankaccount_from and bankaccount_to does not share the same currency.');
-            }
-        }
-
-        $this->db->begin();
-
-        $error = 0;
-        $bank_line_id_from = 0;
-        $bank_line_id_to = 0;
-        $result = 0;
-        $user = DolibarrApiAccess::$user;
-
-        // By default, electronic transfert from bank to bank
-        $typefrom = 'PRE';
-        $typeto = 'VIR';
-
-        if ($accountto->courant == Account::TYPE_CASH || $accountfrom->courant == Account::TYPE_CASH)
-        {
-            // This is transfer of change
-            $typefrom = 'LIQ';
-            $typeto = 'LIQ';
-        }
-
-        /**
-         * Creating bank line records
-         */
-
-        if (!$error) {
-            $bank_line_id_from = $accountfrom->addline($date, $typefrom, $description, -1 * price2num($amount), '', '', $user);
-        }
-        if (!($bank_line_id_from > 0)) {
-            $error++;
-        }
-
-        if (!$error) {
-            $bank_line_id_to = $accountto->addline($date, $typeto, $description, price2num($amount_to), '', '', $user);
-        }
-        if (!($bank_line_id_to > 0)) {
-            $error++;
-        }
-
-        /**
-         * Creating links between bank line record and its source
-         */
-
-        $url = DOL_URL_ROOT.'/compta/bank/line.php?rowid=';
-        $label = '(banktransfert)';
-        $type = 'banktransfert';
-
-        if (!$error) {
-            $result = $accountfrom->add_url_line($bank_line_id_from, $bank_line_id_to, $url, $label, $type);
-        }
-        if (!($result > 0)) {
-            $error++;
-        }
-
-        if (!$error) {
-            $result = $accountto->add_url_line($bank_line_id_to, $bank_line_id_from, $url, $label, $type);
-        }
-        if (!($result > 0)) {
-            $error++;
-        }
-
-        if (!$error)
-        {
-            $this->db->commit();
-
-            return array(
-                'success' => array(
-                    'code' => 201,
-                    'message' => 'Internal wire transfer created successfully.'
-                )
-            );
-        } else {
-            $this->db->rollback();
-            throw new RestException(500, $accountfrom->error.' '.$accountto->error);
-        }
-    }
-
-    /**
-     * Update account
-     *
-     * @param int    $id              ID of account
-     * @param array  $request_data    data
-     * @return int
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->banque->configurer) {
-            throw new RestException(401);
-        }
-
-        $account = new Account($this->db);
-        $result = $account->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'account not found');
-        }
-
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $account->$field = $value;
-        }
-
-        if ($account->update(DolibarrApiAccess::$user) > 0)
-        {
-            return $this->get($id);
-        } else {
-            throw new RestException(500, $account->error);
-        }
-    }
-
-    /**
-     * Delete account
-     *
-     * @param int    $id    ID of account
-     * @return array
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->banque->configurer) {
-            throw new RestException(401);
-        }
-        $account = new Account($this->db);
-        $result = $account->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'account not found');
-        }
-
-        if ($account->delete(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(401, 'error when deleting account');
-        }
-
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'account deleted'
-            )
-        );
-    }
-
-    /**
-     * Validate fields before creating an object
-     *
-     * @param array|null    $data    Data to validate
-     * @return array
-     *
-     * @throws RestException
-     */
-    private function _validate($data)
-    {
-        $account = array();
-        foreach (BankAccounts::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $account[$field] = $data[$field];
-        }
-        return $account;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param object    $object    Object to clean
-     * @return array Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
-
-        unset($object->rowid);
-
-        return $object;
-    }
-
-    /**
-     * Get the list of lines of the account.
-     *
-     * @param int $id ID of account
-     * @return array Array of AccountLine objects
-     *
-     * @throws RestException
-     *
-     * @url GET {id}/lines
 	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.import_key:<:'20160101')"
-     */
-    public function getLines($id, $sqlfilters = '')
-    {
-        $list = array();
+	 * @return array                List of account objects
+	 *
+	 * @throws RestException
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $category = 0, $sqlfilters = '')
+	{
+		$list = array();
 
-        if (!DolibarrApiAccess::$user->rights->banque->lire) {
-            throw new RestException(401);
-        }
+		if (!DolibarrApiAccess::$user->rights->banque->lire) {
+			throw new RestException(401);
+		}
 
-        $account = new Account($this->db);
-        $result = $account->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'account not found');
-        }
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."bank_account as t";
+		if ($category > 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."categorie_account as c";
+		}
+		$sql .= ' WHERE t.entity IN ('.getEntity('bank_account').')';
+		// Select accounts of given category
+		if ($category > 0) {
+			$sql .= " AND c.fk_categorie = ".$this->db->escape($category)." AND c.fk_account = t.rowid ";
+		}
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."bank ";
-        $sql .= " WHERE fk_account = ".$id;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
+
+		dol_syslog("API Rest request");
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$obj = $this->db->fetch_object($result);
+				$account = new Account($this->db);
+				if ($account->fetch($obj->rowid) > 0) {
+					$list[] = $this->_cleanObjectDatas($account);
+				}
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of accounts: '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get account by ID.
+	 *
+	 * @param int    $id    ID of account
+	 * @return array Account object
+	 *
+	 * @throws RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->banque->lire) {
+			throw new RestException(401);
+		}
+
+		$account = new Account($this->db);
+		$result = $account->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'account not found');
+		}
+
+		return $this->_cleanObjectDatas($account);
+	}
+
+	/**
+	 * Create account object
+	 *
+	 * @param array $request_data    Request data
+	 * @return int ID of account
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->banque->configurer) {
+			throw new RestException(401);
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
+
+		$account = new Account($this->db);
+		foreach ($request_data as $field => $value) {
+			$account->$field = $value;
+		}
+		// Date of the initial balance (required to create an account).
+		$account->date_solde = time();
+		// courant and type are the same thing but the one used when
+		// creating an account is courant
+		$account->courant = $account->type;
+
+		if ($account->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, 'Error creating bank account', array_merge(array($account->error), $account->errors));
+		}
+		return $account->id;
+	}
+
+	/**
+	 * Create an internal wire transfer between two bank accounts
+	 *
+	 * @param int     $bankaccount_from_id  BankAccount ID to use as the source of the internal wire transfer		{@from body}{@required true}
+	 * @param int     $bankaccount_to_id    BankAccount ID to use as the destination of the internal wire transfer  {@from body}{@required true}
+	 * @param string  $date					Date of the internal wire transfer (UNIX timestamp)						{@from body}{@required true}{@type timestamp}
+	 * @param string  $description			Description of the internal wire transfer								{@from body}{@required true}
+	 * @param float	  $amount				Amount to transfer from the source to the destination BankAccount		{@from body}{@required true}
+	 * @param float	  $amount_to			Amount to transfer to the destination BankAccount (only when accounts does not share the same currency)		{@from body}{@required false}
+	 *
+	 * @url POST    /transfer
+	 *
+	 * @return array
+	 *
+	 * @status 201
+	 *
+	 * @throws RestException 401 Unauthorized: User does not have permission to configure bank accounts
+	 * @throws RestException 404 Not Found: Either the source or the destination bankaccount for the provided id does not exist
+	 * @throws RestException 422 Unprocessable Entity: Refer to detailed exception message for the cause
+	 * @throws RestException 500 Internal Server Error: Error(s) returned by the RDBMS
+	 */
+	public function transfer($bankaccount_from_id = 0, $bankaccount_to_id = 0, $date = null, $description = "", $amount = 0.0, $amount_to = 0.0)
+	{
+		if (!DolibarrApiAccess::$user->rights->banque->configurer) {
+			throw new RestException(401);
+		}
+
+		if ($bankaccount_from_id === $bankaccount_to_id) {
+			throw new RestException(422, 'bankaccount_from_id and bankaccount_to_id must be different !');
+		}
+
+		require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+		$accountfrom = new Account($this->db);
+		$resultAccountFrom = $accountfrom->fetch($bankaccount_from_id);
+
+		if ($resultAccountFrom === 0) {
+			throw new RestException(404, 'The BankAccount for bankaccount_from_id provided does not exist.');
+		}
+
+		$accountto = new Account($this->db);
+		$resultAccountTo = $accountto->fetch($bankaccount_to_id);
+
+		if ($resultAccountTo === 0) {
+			throw new RestException(404, 'The BankAccount for bankaccount_to_id provided does not exist.');
+		}
+
+		if ($accountto->currency_code == $accountfrom->currency_code)
+		{
+			$amount_to = $amount;
+		} else {
+			if (!$amount_to || empty($amount_to))
+			{
+				throw new RestException(422, 'You must provide amount_to value since bankaccount_from and bankaccount_to does not share the same currency.');
+			}
+		}
+
+		$this->db->begin();
+
+		$error = 0;
+		$bank_line_id_from = 0;
+		$bank_line_id_to = 0;
+		$result = 0;
+		$user = DolibarrApiAccess::$user;
+
+		// By default, electronic transfert from bank to bank
+		$typefrom = 'PRE';
+		$typeto = 'VIR';
+
+		if ($accountto->courant == Account::TYPE_CASH || $accountfrom->courant == Account::TYPE_CASH)
+		{
+			// This is transfer of change
+			$typefrom = 'LIQ';
+			$typeto = 'LIQ';
+		}
+
+		/**
+		 * Creating bank line records
+		 */
+
+		if (!$error) {
+			$bank_line_id_from = $accountfrom->addline($date, $typefrom, $description, -1 * price2num($amount), '', '', $user);
+		}
+		if (!($bank_line_id_from > 0)) {
+			$error++;
+		}
+
+		if (!$error) {
+			$bank_line_id_to = $accountto->addline($date, $typeto, $description, price2num($amount_to), '', '', $user);
+		}
+		if (!($bank_line_id_to > 0)) {
+			$error++;
+		}
+
+		/**
+		 * Creating links between bank line record and its source
+		 */
+
+		$url = DOL_URL_ROOT.'/compta/bank/line.php?rowid=';
+		$label = '(banktransfert)';
+		$type = 'banktransfert';
+
+		if (!$error) {
+			$result = $accountfrom->add_url_line($bank_line_id_from, $bank_line_id_to, $url, $label, $type);
+		}
+		if (!($result > 0)) {
+			$error++;
+		}
+
+		if (!$error) {
+			$result = $accountto->add_url_line($bank_line_id_to, $bank_line_id_from, $url, $label, $type);
+		}
+		if (!($result > 0)) {
+			$error++;
+		}
+
+		if (!$error)
+		{
+			$this->db->commit();
+
+			return array(
+				'success' => array(
+					'code' => 201,
+					'message' => 'Internal wire transfer created successfully.'
+				)
+			);
+		} else {
+			$this->db->rollback();
+			throw new RestException(500, $accountfrom->error.' '.$accountto->error);
+		}
+	}
+
+	/**
+	 * Update account
+	 *
+	 * @param int    $id              ID of account
+	 * @param array  $request_data    data
+	 * @return int
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->banque->configurer) {
+			throw new RestException(401);
+		}
+
+		$account = new Account($this->db);
+		$result = $account->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'account not found');
+		}
+
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$account->$field = $value;
+		}
+
+		if ($account->update(DolibarrApiAccess::$user) > 0)
+		{
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $account->error);
+		}
+	}
+
+	/**
+	 * Delete account
+	 *
+	 * @param int    $id    ID of account
+	 * @return array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->banque->configurer) {
+			throw new RestException(401);
+		}
+		$account = new Account($this->db);
+		$result = $account->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'account not found');
+		}
+
+		if ($account->delete(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(401, 'error when deleting account');
+		}
+
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'account deleted'
+			)
+		);
+	}
+
+	/**
+	 * Validate fields before creating an object
+	 *
+	 * @param array|null    $data    Data to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	private function _validate($data)
+	{
+		$account = array();
+		foreach (BankAccounts::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$account[$field] = $data[$field];
+		}
+		return $account;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
+
+		unset($object->rowid);
+
+		return $object;
+	}
+
+	/**
+	 * Get the list of lines of the account.
+	 *
+	 * @param int $id ID of account
+	 * @return array Array of AccountLine objects
+	 *
+	 * @throws RestException
+	 *
+	 * @url GET {id}/lines
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.import_key:<:'20160101')"
+	 */
+	public function getLines($id, $sqlfilters = '')
+	{
+		$list = array();
+
+		if (!DolibarrApiAccess::$user->rights->banque->lire) {
+			throw new RestException(401);
+		}
+
+		$account = new Account($this->db);
+		$result = $account->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'account not found');
+		}
+
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."bank ";
+		$sql .= " WHERE fk_account = ".$id;
 
 		// Add sql filters
 		if ($sqlfilters)
@@ -443,105 +443,105 @@ class BankAccounts extends DolibarrApi
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
-        $sql .= " ORDER BY rowid";
+		$sql .= " ORDER BY rowid";
 
-        $result = $this->db->query($sql);
+		$result = $this->db->query($sql);
 
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            for ($i = 0; $i < $num; $i++) {
-                $obj = $this->db->fetch_object($result);
-                $accountLine = new AccountLine($this->db);
-                if ($accountLine->fetch($obj->rowid) > 0) {
-                    $list[] = $this->_cleanObjectDatas($accountLine);
-                }
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of account lines: '.$accountLine->error);
-        }
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			for ($i = 0; $i < $num; $i++) {
+				$obj = $this->db->fetch_object($result);
+				$accountLine = new AccountLine($this->db);
+				if ($accountLine->fetch($obj->rowid) > 0) {
+					$list[] = $this->_cleanObjectDatas($accountLine);
+				}
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of account lines: '.$accountLine->error);
+		}
 
-        return $list;
-    }
+		return $list;
+	}
 
-    /**
-     * Add a line to an account
-     *
-     * @param int    $id            ID of account
-     * @param int    $date          Payment date (timestamp) {@from body} {@type timestamp}
-     * @param string $type          Payment mode (TYP,VIR,PRE,LIQ,VAD,CB,CHQ...) {@from body}
-     * @param string $label         Label {@from body}
-     * @param float  $amount        Amount (may be 0) {@from body}
-     * @param int    $category      Category
-     * @param string $cheque_number Cheque numberl {@from body}
-     * @param string $cheque_writer Name of cheque writer {@from body}
-     * @param string $cheque_bank   Bank of cheque writer {@from body}
-     * @return int  ID of line
-     *
-     * @url POST {id}/lines
-     */
-    public function addLine($id, $date, $type, $label, $amount, $category = 0, $cheque_number = '', $cheque_writer = '', $cheque_bank = '')
-    {
-        if (!DolibarrApiAccess::$user->rights->banque->modifier) {
-            throw new RestException(401);
-        }
+	/**
+	 * Add a line to an account
+	 *
+	 * @param int    $id            ID of account
+	 * @param int    $date          Payment date (timestamp) {@from body} {@type timestamp}
+	 * @param string $type          Payment mode (TYP,VIR,PRE,LIQ,VAD,CB,CHQ...) {@from body}
+	 * @param string $label         Label {@from body}
+	 * @param float  $amount        Amount (may be 0) {@from body}
+	 * @param int    $category      Category
+	 * @param string $cheque_number Cheque numberl {@from body}
+	 * @param string $cheque_writer Name of cheque writer {@from body}
+	 * @param string $cheque_bank   Bank of cheque writer {@from body}
+	 * @return int  ID of line
+	 *
+	 * @url POST {id}/lines
+	 */
+	public function addLine($id, $date, $type, $label, $amount, $category = 0, $cheque_number = '', $cheque_writer = '', $cheque_bank = '')
+	{
+		if (!DolibarrApiAccess::$user->rights->banque->modifier) {
+			throw new RestException(401);
+		}
 
-        $account = new Account($this->db);
-        $result = $account->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'account not found');
-        }
+		$account = new Account($this->db);
+		$result = $account->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'account not found');
+		}
 
-        $result = $account->addline(
-            $date,
-            $type,
-            $label,
-            $amount,
-            $cheque_number,
-            $category,
-            DolibarrApiAccess::$user,
-            $cheque_writer, $cheque_bank
-        );
-        if ($result < 0) {
-            throw new RestException(503, 'Error when adding line to account: '.$account->error);
-        }
-        return $result;
-    }
+		$result = $account->addline(
+			$date,
+			$type,
+			$label,
+			$amount,
+			$cheque_number,
+			$category,
+			DolibarrApiAccess::$user,
+			$cheque_writer, $cheque_bank
+		);
+		if ($result < 0) {
+			throw new RestException(503, 'Error when adding line to account: '.$account->error);
+		}
+		return $result;
+	}
 
-    /**
-     * Add a link to an account line
-     *
-     * @param int    $id    		ID of account
-     * @param int    $line_id       ID of account line
-     * @param int    $url_id        ID to set in the URL {@from body}
-     * @param string $url           URL of the link {@from body}
-     * @param string $label         Label {@from body}
-     * @param string $type          Type of link ('payment', 'company', 'member', ...) {@from body}
-     * @return int  ID of link
-     *
-     * @url POST {id}/lines/{line_id}/links
-     */
-    public function addLink($id, $line_id, $url_id, $url, $label, $type)
-    {
-        if (!DolibarrApiAccess::$user->rights->banque->modifier) {
-            throw new RestException(401);
-        }
+	/**
+	 * Add a link to an account line
+	 *
+	 * @param int    $id    		ID of account
+	 * @param int    $line_id       ID of account line
+	 * @param int    $url_id        ID to set in the URL {@from body}
+	 * @param string $url           URL of the link {@from body}
+	 * @param string $label         Label {@from body}
+	 * @param string $type          Type of link ('payment', 'company', 'member', ...) {@from body}
+	 * @return int  ID of link
+	 *
+	 * @url POST {id}/lines/{line_id}/links
+	 */
+	public function addLink($id, $line_id, $url_id, $url, $label, $type)
+	{
+		if (!DolibarrApiAccess::$user->rights->banque->modifier) {
+			throw new RestException(401);
+		}
 
-        $account = new Account($this->db);
-        $result = $account->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'account not found');
-        }
+		$account = new Account($this->db);
+		$result = $account->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'account not found');
+		}
 
-        $accountLine = new AccountLine($this->db);
-        $result = $accountLine->fetch($line_id);
-        if (!$result) {
-            throw new RestException(404, 'account line not found');
-        }
+		$accountLine = new AccountLine($this->db);
+		$result = $accountLine->fetch($line_id);
+		if (!$result) {
+			throw new RestException(404, 'account line not found');
+		}
 
-        $result = $account->add_url_line($line_id, $url_id, $url, $label, $type);
-        if ($result < 0) {
-            throw new RestException(503, 'Error when adding link to account line: '.$account->error);
-        }
-        return $result;
-    }
+		$result = $account->add_url_line($line_id, $url_id, $url, $label, $type);
+		if ($result < 0) {
+			throw new RestException(503, 'Error when adding link to account line: '.$account->error);
+		}
+		return $result;
+	}
 }
diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php
index c7e86e51cfb..99a941b074d 100644
--- a/htdocs/compta/bank/class/bankcateg.class.php
+++ b/htdocs/compta/bank/class/bankcateg.class.php
@@ -30,20 +30,20 @@ class BankCateg // extends CommonObject
 {
 	//public $element='bank_categ';			//!< Id that identify managed objects
 	//public $table_element='bank_categ';	//!< Name of table without prefix where object is stored
-    /**
+	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
 	public $picto = 'generic';
 
 	/**
-     * @var int ID
-     */
-    public $id;
+	 * @var int ID
+	 */
+	public $id;
 
 	/**
-     * @var string bank categories label
-     */
-    public $label;
+	 * @var string bank categories label
+	 */
+	public $label;
 
 
 	/**
@@ -213,46 +213,46 @@ class BankCateg // extends CommonObject
 		// Delete link between tag and bank account
 		if (!$error)
 		{
-		    $sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_account";
-    		$sql .= " WHERE fk_categorie = ".$this->id;
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_account";
+			$sql .= " WHERE fk_categorie = ".$this->id;
 
-    		$resql = $this->db->query($sql);
-    		if (!$resql)
-    		{
-    		    $error++;
-    		    $this->errors[] = "Error ".$this->db->lasterror();
-    		}
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
+			}
 		}
 
 		// Delete link between tag and bank lines
 		if (!$error)
 		{
-		    $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class";
-		    $sql .= " WHERE fk_categ = ".$this->id;
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class";
+			$sql .= " WHERE fk_categ = ".$this->id;
 
-		    $resql = $this->db->query($sql);
-		    if (!$resql)
-		    {
-		        $error++;
-		        $this->errors[] = "Error ".$this->db->lasterror();
-		    }
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
+			}
 		}
 
 		// Delete bank categ
 		if (!$error)
 		{
-    		$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_categ";
-    		$sql .= " WHERE rowid=".$this->id;
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_categ";
+			$sql .= " WHERE rowid=".$this->id;
 
-    		$resql = $this->db->query($sql);
-    		if (!$resql)
-    		{
-    			$error++;
-    			$this->errors[] = "Error ".$this->db->lasterror();
-    		}
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
+			}
 		}
 
-    	// Commit or rollback
+		// Commit or rollback
 		if ($error) {
 			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index 14466915d76..5c8031f2702 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2017-2019  Alexandre Spangaro      <aspangaro@open-dsi.fr>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric 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
@@ -56,42 +56,65 @@ class PaymentVarious extends CommonObject
 	 */
 	public $ref;
 
+	/**
+	 * @var int timestamp
+	 */
 	public $tms;
 	public $datep;
 	public $datev;
+
+	/**
+	 * @var int sens of operation
+	 */
 	public $sens;
 	public $amount;
 	public $type_payment;
 	public $num_payment;
-    public $category_transaction;
+	public $category_transaction;
 
 	/**
-     * @var string various payments label
-     */
-    public $label;
+	 * @var string various payments label
+	 */
+	public $label;
 
+	/**
+	 * @var string accountancy code
+	 */
 	public $accountancy_code;
 
-    public $subledger_account;
+	/**
+	 * @var string subledger account
+	 */
+	public $subledger_account;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_project;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_bank;
 
 	/**
-     * @var int ID
-     */
+	 * @var int transaction category
+	 */
+	public $categorie_transaction;
+
+	/**
+	 * @var int Account ID
+	 */
+	public $accountid;
+
+	/**
+	 * @var int ID
+	 */
 	public $fk_user_author;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
 
@@ -121,6 +144,9 @@ class PaymentVarious extends CommonObject
 	 */
 
 	// BEGIN MODULEBUILDER PROPERTIES
+	/**
+	 * @var array fields definition
+	 */
 	public $fields = array(
 		// TODO: fill this array
 	);
@@ -131,7 +157,7 @@ class PaymentVarious extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		$this->db = $db;
 		$this->element = 'payment_various';
@@ -145,7 +171,7 @@ class PaymentVarious extends CommonObject
 	 * @param   int		$notrigger      0=no, 1=yes (no update trigger)
 	 * @return  int         			<0 if KO, >0 if OK
 	 */
-    public function update($user = null, $notrigger = 0)
+	public function update($user = null, $notrigger = 0)
 	{
 		global $conf, $langs;
 
@@ -173,7 +199,7 @@ class PaymentVarious extends CommonObject
 		$sql .= " label='".$this->db->escape($this->label)."',";
 		$sql .= " note='".$this->db->escape($this->note)."',";
 		$sql .= " accountancy_code='".$this->db->escape($this->accountancy_code)."',";
-        $sql .= " subledger_account='".$this->db->escape($this->subledger_account)."',";
+		$sql .= " subledger_account='".$this->db->escape($this->subledger_account)."',";
 		$sql .= " fk_projet='".$this->db->escape($this->fk_project)."',";
 		$sql .= " fk_bank=".($this->fk_bank > 0 ? $this->fk_bank : "null").",";
 		$sql .= " fk_user_author=".(int) $this->fk_user_author.",";
@@ -182,22 +208,19 @@ class PaymentVarious extends CommonObject
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 
-		if (!$notrigger)
-		{
+		if (!$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('PAYMENT_VARIOUS_MODIFY', $user);
 			if ($result < 0) $error++;
 			// End call triggers
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -214,7 +237,7 @@ class PaymentVarious extends CommonObject
 	 *  @param  User	$user       User that load
 	 *  @return int         		<0 if KO, >0 if OK
 	 */
-    public function fetch($id, $user = null)
+	public function fetch($id, $user = null)
 	{
 		global $langs;
 		$sql = "SELECT";
@@ -286,7 +309,7 @@ class PaymentVarious extends CommonObject
 	 *	@param	User	$user       User that delete
 	 *	@return	int					<0 if KO, >0 if OK
 	 */
-    public function delete($user)
+	public function delete($user)
 	{
 		global $conf, $langs;
 
@@ -303,8 +326,7 @@ class PaymentVarious extends CommonObject
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -320,7 +342,7 @@ class PaymentVarious extends CommonObject
 	 *
 	 *  @return	void
 	 */
-    public function initAsSpecimen()
+	public function initAsSpecimen()
 	{
 		$this->id = 0;
 
@@ -331,20 +353,37 @@ class PaymentVarious extends CommonObject
 		$this->amount = '';
 		$this->label = '';
 		$this->accountancy_code = '';
-        $this->subledger_account = '';
+		$this->subledger_account = '';
 		$this->note = '';
 		$this->fk_bank = '';
 		$this->fk_user_author = '';
 		$this->fk_user_modif = '';
 	}
 
+	/**
+	 * Check if a miscellaneous payment can be created into database
+	 *
+	 * @return	boolean		True or false
+	 */
+	public function check()
+	{
+		$newamount = price2num($this->amount, 'MT');
+
+		// Validation of parameters
+		if (!($newamount) > 0 || empty($this->datep)) {
+			return false;
+		}
+
+		return true;
+	}
+
 	/**
 	 *  Create in database
 	 *
 	 *  @param   User   $user   User that create
 	 *  @return  int            <0 if KO, >0 if OK
 	 */
-    public function create($user)
+	public function create($user)
 	{
 		global $conf, $langs;
 
@@ -442,13 +481,13 @@ class PaymentVarious extends CommonObject
 					$sign = 1;
 					if ($this->sens == '0') $sign = -1;
 
-                    $bank_line_id = $acc->addline(
+					$bank_line_id = $acc->addline(
 						$this->datep,
 						$this->type_payment,
 						$this->label,
 						$sign * abs($this->amount),
 						$this->num_payment,
-                        ($this->category_transaction > 0 ? $this->category_transaction : 0),
+						($this->category_transaction > 0 ? $this->category_transaction : 0),
 						$user,
 						'',
 						'',
@@ -458,8 +497,7 @@ class PaymentVarious extends CommonObject
 
 					// Update fk_bank into llx_paiement.
 					// So we know the payment which has generate the banking ecriture
-					if ($bank_line_id > 0)
-					{
+					if ($bank_line_id > 0) {
 						$this->update_fk_bank($bank_line_id);
 					} else {
 						$this->error = $acc->error;
@@ -507,16 +545,16 @@ class PaymentVarious extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Update link between payment various and line generate into llx_bank
 	 *
 	 *  @param  int     $id_bank    Id bank account
 	 *	@return int                 <0 if KO, >0 if OK
 	 */
-    public function update_fk_bank($id_bank)
+	public function update_fk_bank($id_bank)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'payment_various SET fk_bank = '.$id_bank;
 		$sql .= ' WHERE rowid = '.$this->id;
 		$result = $this->db->query($sql);
@@ -536,12 +574,12 @@ class PaymentVarious extends CommonObject
 	 * @param	int		$mode   	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
 	 * @return  string   		   	Libelle
 	 */
-    public function getLibStatut($mode = 0)
+	public function getLibStatut($mode = 0)
 	{
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un statut donne
 	 *
@@ -549,34 +587,28 @@ class PaymentVarious extends CommonObject
 	 *  @param  int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
 	 *  @return string      		Libelle
 	 */
-    public function LibStatut($status, $mode = 0)
+	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
-		if ($mode == 0)
-		{
+		if ($mode == 0) {
 			return $langs->trans($this->statuts[$status]);
-		} elseif ($mode == 1)
-		{
+		} elseif ($mode == 1) {
 			return $langs->trans($this->statuts_short[$status]);
-		} elseif ($mode == 2)
-		{
+		} elseif ($mode == 2) {
 			if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts_short[$status]);
 			elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts_short[$status]);
 			elseif ($status == 2) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
-		} elseif ($mode == 3)
-		{
+		} elseif ($mode == 3) {
 			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
 			elseif ($status == 2 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
-		} elseif ($mode == 4)
-		{
+		} elseif ($mode == 4) {
 			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
 			elseif ($status == 2 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
-		} elseif ($mode == 5)
-		{
+		} elseif ($mode == 5) {
 			if ($status == 0 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
 			elseif ($status == 2 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
@@ -590,10 +622,11 @@ class PaymentVarious extends CommonObject
 	 *	@param  int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
 	 *	@param  string	$option						link option
 	 *  @param  int     $save_lastsearch_value	 	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *  @param	int  	$notooltip		 			1=Disable tooltip
+	 *  @param	int  	$notooltip		 			1=Disable tooltip
+	 *  @param	string  $morecss                    morecss string
 	 *	@return string								String with URL
 	 */
-    public function getNomUrl($withpicto = 0, $option = '', $save_lastsearch_value = -1, $notooltip = 0)
+	public function getNomUrl($withpicto = 0, $option = '', $save_lastsearch_value = -1, $notooltip = 0, $morecss = '')
 	{
 		global $db, $conf, $langs, $hookmanager;
 		global $langs;
@@ -661,8 +694,8 @@ class PaymentVarious extends CommonObject
 	 * @param  int      $id      Id of record
 	 * @return void
 	 */
-    public function info($id)
-    {
+	public function info($id)
+	{
 		$sql = 'SELECT v.rowid, v.datec, v.fk_user_author';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'payment_various as v';
 		$sql .= ' WHERE v.rowid = '.$id;
diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php
index 2bd95409827..c67c0496727 100644
--- a/htdocs/compta/bank/document.php
+++ b/htdocs/compta/bank/document.php
@@ -41,11 +41,11 @@ $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
 if ($user->socid) {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 if ($user->socid)
-    $socid = $user->socid;
+	$socid = $user->socid;
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -57,9 +57,9 @@ $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder)
-    $sortorder = "ASC";
+	$sortorder = "ASC";
 if (!$sortfield)
-    $sortfield = "name";
+	$sortfield = "name";
 
 $object = new Account($db);
 if ($id > 0 || !empty($ref)) $object->fetch($id, $ref);
@@ -73,8 +73,8 @@ $result = restrictedArea($user, 'banque', $object->id, 'bank_account', '', '');
 
 if ($object->id > 0)
 {
-    $object->fetch_thirdparty();
-    $upload_dir = $conf->bank->dir_output."/".dol_sanitizeFileName($object->ref);
+	$object->fetch_thirdparty();
+	$upload_dir = $conf->bank->dir_output."/".dol_sanitizeFileName($object->ref);
 }
 
 include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
@@ -91,52 +91,52 @@ llxHeader('', $title, $helpurl);
 $form = new Form($db);
 
 if ($id > 0 || !empty($ref)) {
-    if ($object->fetch($id, $ref)) {
-        $upload_dir = $conf->bank->dir_output.'/'.$object->ref;
+	if ($object->fetch($id, $ref)) {
+		$upload_dir = $conf->bank->dir_output.'/'.$object->ref;
 
-        // Onglets
-        $head = bank_prepare_head($object);
-        dol_fiche_head($head, 'document', $langs->trans("FinancialAccount"), -1, 'account');
+		// Onglets
+		$head = bank_prepare_head($object);
+		print dol_get_fiche_head($head, 'document', $langs->trans("FinancialAccount"), -1, 'account');
 
 
-        // Build file list
-        $filearray = dol_dir_list($upload_dir, "files", 0, '', '\.meta$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);
-        $totalsize = 0;
-        foreach ($filearray as $key => $file) {
-            $totalsize += $file['size'];
-        }
+		// Build file list
+		$filearray = dol_dir_list($upload_dir, "files", 0, '', '\.meta$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);
+		$totalsize = 0;
+		foreach ($filearray as $key => $file) {
+			$totalsize += $file['size'];
+		}
 
-        $morehtmlref = '';
+		$morehtmlref = '';
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-        print '<div class="fichecenter">';
-        print '<div class="underbanner clearboth"></div>';
+		print '<div class="fichecenter">';
+		print '<div class="underbanner clearboth"></div>';
 
-        print '<table class="border tableforfield centpercent">';
-        print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-        print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-        print "</table>\n";
+		print '<table class="border tableforfield centpercent">';
+		print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+		print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+		print "</table>\n";
 
-        print '</div>';
+		print '</div>';
 
-        dol_fiche_end();
+		print dol_get_fiche_end();
 
 
-        $modulepart = 'bank';
-        $permission = $user->rights->banque->modifier;
-        $permtoedit = $user->rights->banque->modifier;
-        $param = '&id='.$object->id;
-        include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-    } else {
-        dol_print_error($db);
-    }
+		$modulepart = 'bank';
+		$permission = $user->rights->banque->modifier;
+		$permtoedit = $user->rights->banque->modifier;
+		$param = '&id='.$object->id;
+		include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	} else {
+		dol_print_error($db);
+	}
 } else {
-    Header('Location: index.php');
-    exit;
+	Header('Location: index.php');
+	exit;
 }
 
 // End of page
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index 686122f4d56..f4fa779fd7d 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -727,7 +727,7 @@ if ($result < 0)
 
 // Onglets
 $head = bank_prepare_head($object);
-dol_fiche_head($head, 'graph', $langs->trans("FinancialAccount"), 0, 'account');
+print dol_get_fiche_head($head, 'graph', $langs->trans("FinancialAccount"), 0, 'account');
 
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
@@ -741,14 +741,14 @@ if ($account)
 		if ($_GET["option"] != 'all')
 		{
 			$morehtml = '<a href="'.$_SERVER["PHP_SELF"].'?account='.$account.'&option=all'.$moreparam.'">'.$langs->trans("ShowAllAccounts").'</a>';
-    		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', '', $moreparam, 0, '', '', 1);
+			dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', '', $moreparam, 0, '', '', 1);
 		} else {
 			$morehtml = '<a href="'.$_SERVER["PHP_SELF"].'?account='.$account.$moreparam.'">'.$langs->trans("BackToAccount").'</a>';
 			print $langs->trans("AllAccounts");
 			//print $morehtml;
 		}
 	} else {
-	    $bankaccount = new Account($db);
+		$bankaccount = new Account($db);
 		$listid = explode(',', $account);
 		foreach ($listid as $key => $id)
 		{
@@ -762,7 +762,7 @@ if ($account)
 	print $langs->trans("AllAccounts");
 }
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 print '<table class="notopnoleftnoright" width="100%">';
@@ -771,11 +771,11 @@ print '<table class="notopnoleftnoright" width="100%">';
 print '<tr><td class="right">'.$morehtml.' &nbsp; &nbsp; ';
 if ($mode == 'showalltime')
 {
-	print '<a href="'.$_SERVER["PHP_SELF"].'?account='.$account.'">';
+	print '<a href="'.$_SERVER["PHP_SELF"].'?account='.$account.(GETPOST("option") != 'all' ? '' : '&option=all').'">';
 	print $langs->trans("GoBack");
 	print '</a>';
 } else {
-	print '<a href="'.$_SERVER["PHP_SELF"].'?mode=showalltime&account='.$account.'">';
+	print '<a href="'.$_SERVER["PHP_SELF"].'?mode=showalltime&account='.$account.(GETPOST("option") != 'all' ? '' : '&option=all').'">';
 	print $langs->trans("ShowAllTimeBalance");
 	print '</a>';
 }
@@ -793,7 +793,7 @@ if ($mode == 'standard')
 	if ($nextmonth > 12) { $nextmonth = 1; $nextyear++; }
 
 	// For month
-	$link = "<a href='".$_SERVER["PHP_SELF"]."?account=".$account.($_GET["option"] != 'all' ? '' : '&option=all')."&year=".$prevyear."&month=".$prevmonth."'>".img_previous('', 'class="valignbottom"')."</a> ".$langs->trans("Month")." <a href='".$_SERVER["PHP_SELF"]."?account=".$account."&year=".$nextyear."&month=".$nextmonth."'>".img_next('', 'class="valignbottom"')."</a>";
+	$link = "<a href='".$_SERVER["PHP_SELF"]."?account=".$account.(GETPOST("option") != 'all' ? '' : '&option=all')."&year=".$prevyear."&month=".$prevmonth."'>".img_previous('', 'class="valignbottom"')."</a> ".$langs->trans("Month")." <a href='".$_SERVER["PHP_SELF"]."?account=".$account.(GETPOST("option") != 'all' ? '' : '&option=all')."&year=".$nextyear."&month=".$nextmonth."'>".img_next('', 'class="valignbottom"')."</a>";
 	print '<div class="right clearboth">'.$link.'</div>';
 
 	print '<div class="center clearboth margintoponly">';
@@ -807,7 +807,7 @@ if ($mode == 'standard')
 
 	// For year
 	$prevyear = $year - 1; $nextyear = $year + 1;
-	$link = "<a href='".$_SERVER["PHP_SELF"]."?account=".$account.($_GET["option"] != 'all' ? '' : '&option=all')."&year=".($prevyear)."'>".img_previous('', 'class="valignbottom"')."</a> ".$langs->trans("Year")." <a href='".$_SERVER["PHP_SELF"]."?account=".$account."&year=".($nextyear)."'>".img_next('', 'class="valignbottom"')."</a>";
+	$link = "<a href='".$_SERVER["PHP_SELF"]."?account=".$account.(GETPOST("option") != 'all' ? '' : '&option=all')."&year=".($prevyear)."'>".img_previous('', 'class="valignbottom"')."</a> ".$langs->trans("Year")." <a href='".$_SERVER["PHP_SELF"]."?account=".$account.(GETPOST("option") != 'all' ? '' : '&option=all')."&year=".($nextyear)."'>".img_next('', 'class="valignbottom"')."</a>";
 
 	print '<div class="right clearboth margintoponly">'.$link.'</div>';
 
diff --git a/htdocs/compta/bank/info.php b/htdocs/compta/bank/info.php
index e1adb0b5e41..a2a3260775a 100644
--- a/htdocs/compta/bank/info.php
+++ b/htdocs/compta/bank/info.php
@@ -55,7 +55,7 @@ $hselected = $h;
 $h++;
 
 
-dol_fiche_head($head, $hselected, $langs->trans("LineRecord"), -1, 'accountline');
+print dol_get_fiche_head($head, $hselected, $langs->trans("LineRecord"), -1, 'accountline');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index 4e2998792d8..33f7f3a0352 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -65,30 +65,30 @@ if (!$user->rights->banque->lire && !$user->rights->banque->consolidate) accessf
 
 if ($cancel)
 {
-    if ($backtopage)
-    {
-        header("Location: ".$backtopage);
-        exit;
-    }
+	if ($backtopage)
+	{
+		header("Location: ".$backtopage);
+		exit;
+	}
 }
 
 
 if ($user->rights->banque->consolidate && $action == 'donext')
 {
-    $al = new AccountLine($db);
-    $al->dateo_next($_GET["rowid"]);
+	$al = new AccountLine($db);
+	$al->dateo_next($_GET["rowid"]);
 } elseif ($user->rights->banque->consolidate && $action == 'doprev')
 {
-    $al = new AccountLine($db);
-    $al->dateo_previous($_GET["rowid"]);
+	$al = new AccountLine($db);
+	$al->dateo_previous($_GET["rowid"]);
 } elseif ($user->rights->banque->consolidate && $action == 'dvnext')
 {
-    $al = new AccountLine($db);
-    $al->datev_next($_GET["rowid"]);
+	$al = new AccountLine($db);
+	$al->datev_next($_GET["rowid"]);
 } elseif ($user->rights->banque->consolidate && $action == 'dvprev')
 {
-    $al = new AccountLine($db);
-    $al->datev_previous($_GET["rowid"]);
+	$al = new AccountLine($db);
+	$al->datev_previous($_GET["rowid"]);
 }
 
 if ($action == 'confirm_delete_categ' && $confirm == "yes" && $user->rights->banque->modifier)
@@ -96,10 +96,10 @@ if ($action == 'confirm_delete_categ' && $confirm == "yes" && $user->rights->ban
 	$cat1 = GETPOST("cat1", 'int');
 	if (!empty($rowid) && !empty($cat1)) {
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid = ".$rowid." AND fk_categ = ".$cat1;
-    	if (!$db->query($sql))
-    	{
-        	dol_print_error($db);
-    	}
+		if (!$db->query($sql))
+		{
+			dol_print_error($db);
+		}
 	} else {
 		setEventMessages($langs->trans("MissingIds"), null, 'errors');
 	}
@@ -139,17 +139,17 @@ if ($user->rights->banque->modifier && $action == "update")
 		$sql = "UPDATE ".MAIN_DB_PREFIX."bank";
 		$sql .= " SET ";
 		// Always opened
-		if (isset($_POST['value']))      $sql .= " fk_type='".$db->escape(GETPOST('value'))."',";
-		if (isset($_POST['num_chq']))    $sql .= " num_chq='".$db->escape(GETPOST("num_chq"))."',";
-		if (isset($_POST['banque']))     $sql .= " banque='".$db->escape(GETPOST("banque"))."',";
-		if (isset($_POST['emetteur']))   $sql .= " emetteur='".$db->escape(GETPOST("emetteur"))."',";
+		if (GETPOSTISSET('value'))      $sql .= " fk_type='".$db->escape(GETPOST('value'))."',";
+		if (GETPOSTISSET('num_chq'))    $sql .= " num_chq='".$db->escape(GETPOST("num_chq"))."',";
+		if (GETPOSTISSET('banque'))     $sql .= " banque='".$db->escape(GETPOST("banque"))."',";
+		if (GETPOSTISSET('emetteur'))   $sql .= " emetteur='".$db->escape(GETPOST("emetteur"))."',";
 		// Blocked when conciliated
 		if (!$acline->rappro)
 		{
-			if (isset($_POST['label']))      $sql .= " label = '".$db->escape(GETPOST("label"))."',";
-			if (isset($_POST['amount']))     $sql .= " amount= '".$db->escape($amount)."',";
-			if (isset($_POST['dateomonth'])) $sql .= " dateo = '".$db->idate($dateop)."',";
-			if (isset($_POST['datevmonth'])) $sql .= " datev = '".$db->idate($dateval)."',";
+			if (GETPOSTISSET('label'))      $sql .= " label = '".$db->escape(GETPOST("label"))."',";
+			if (GETPOSTISSET('amount'))     $sql .= " amount= '".$db->escape($amount)."',";
+			if (GETPOSTISSET('dateomonth')) $sql .= " dateo = '".$db->idate($dateop)."',";
+			if (GETPOSTISSET('datevmonth')) $sql .= " datev = '".$db->idate($dateval)."',";
 		}
 		$sql .= " fk_account = ".$actarget->id;
 		$sql .= " WHERE rowid = ".$acline->id;
@@ -157,31 +157,31 @@ if ($user->rights->banque->modifier && $action == "update")
 		$result = $db->query($sql);
 		if (!$result)
 		{
-		    $error++;
+			$error++;
 		}
 
 		if (!$error)
 		{
-            $arrayofcategs = GETPOST('custcats', 'array');
-    		$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid = ".$rowid;
-    		if (!$db->query($sql))
-    		{
-    		    $error++;
-    		    dol_print_error($db);
-    		}
-    		if (count($arrayofcategs))
-    		{
-        		foreach ($arrayofcategs as $val)
-        		{
-            		$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_class (lineid, fk_categ) VALUES (".$rowid.", ".$val.")";
-            		if (!$db->query($sql))
-            		{
-            		    $error++;
-            		    dol_print_error($db);
-            		}
-        		}
-        		// $arrayselected will be loaded after in page output
-    		}
+			$arrayofcategs = GETPOST('custcats', 'array');
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid = ".$rowid;
+			if (!$db->query($sql))
+			{
+				$error++;
+				dol_print_error($db);
+			}
+			if (count($arrayofcategs))
+			{
+				foreach ($arrayofcategs as $val)
+				{
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_class (lineid, fk_categ) VALUES (".$rowid.", ".$val.")";
+					if (!$db->query($sql))
+					{
+						$error++;
+						dol_print_error($db);
+					}
+				}
+				// $arrayselected will be loaded after in page output
+			}
 		}
 
 		if (!$error)
@@ -198,37 +198,37 @@ if ($user->rights->banque->modifier && $action == "update")
 // Reconcile
 if ($user->rights->banque->consolidate && ($action == 'num_releve' || $action == 'setreconcile'))
 {
-    $num_rel = trim($_POST["num_rel"]);
-    $rappro = $_POST['reconciled'] ? 1 : 0;
+	$num_rel = trim($_POST["num_rel"]);
+	$rappro = $_POST['reconciled'] ? 1 : 0;
 
-    // Check parameters
-    if ($rappro && empty($num_rel))
-    {
-	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountStatement")), null, 'errors');
-        $error++;
-    }
+	// Check parameters
+	if ($rappro && empty($num_rel))
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountStatement")), null, 'errors');
+		$error++;
+	}
 
-    if (!$error)
-    {
-        $db->begin();
+	if (!$error)
+	{
+		$db->begin();
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."bank";
-        $sql .= " SET num_releve=".($num_rel ? "'".$db->escape($num_rel)."'" : "null");
-        if (empty($num_rel)) $sql .= ", rappro = 0";
-        else $sql .= ", rappro = ".$rappro;
-        $sql .= " WHERE rowid = ".$rowid;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."bank";
+		$sql .= " SET num_releve=".($num_rel ? "'".$db->escape($num_rel)."'" : "null");
+		if (empty($num_rel)) $sql .= ", rappro = 0";
+		else $sql .= ", rappro = ".$rappro;
+		$sql .= " WHERE rowid = ".$rowid;
 
-        dol_syslog("line.php", LOG_DEBUG);
-        $result = $db->query($sql);
-        if ($result)
-        {
-	        setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-            $db->commit();
-        } else {
-            $db->rollback();
-            dol_print_error($db);
-        }
-    }
+		dol_syslog("line.php", LOG_DEBUG);
+		$result = $db->query($sql);
+		if ($result)
+		{
+			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+			$db->commit();
+		} else {
+			$db->rollback();
+			dol_print_error($db);
+		}
+	}
 }
 
 
@@ -244,7 +244,7 @@ llxHeader('', $langs->trans("BankTransaction"));
 $c = new Categorie($db);
 $cats = $c->containing($rowid, Categorie::TYPE_BANK_LINE);
 foreach ($cats as $cat) {
-    $arrayselected[] = $cat->id;
+	$arrayselected[] = $cat->id;
 }
 
 $head = bankline_prepare_head($rowid);
@@ -259,385 +259,385 @@ $sql .= " ORDER BY dateo ASC";
 $result = $db->query($sql);
 if ($result)
 {
-    $i = 0; $total = 0;
-    if ($db->num_rows($result))
-    {
-        $objp = $db->fetch_object($result);
+	$i = 0; $total = 0;
+	if ($db->num_rows($result))
+	{
+		$objp = $db->fetch_object($result);
 
-        $total = $total + $objp->amount;
+		$total = $total + $objp->amount;
 
-        $acct = new Account($db);
-        $acct->fetch($objp->fk_account);
-        $account = $acct->id;
+		$acct = new Account($db);
+		$acct->fetch($objp->fk_account);
+		$account = $acct->id;
 
-        $bankline = new AccountLine($db);
-        $bankline->fetch($rowid, $ref);
+		$bankline = new AccountLine($db);
+		$bankline->fetch($rowid, $ref);
 
-        $links = $acct->get_url($rowid);
-        $bankline->load_previous_next_ref('', 'rowid');
+		$links = $acct->get_url($rowid);
+		$bankline->load_previous_next_ref('', 'rowid');
 
-        // Confirmations
-        if ($action == 'delete_categ')
-        {
-            print $form->formconfirm($_SERVER['PHP_SELF']."?rowid=".$rowid."&cat1=".GETPOST("fk_categ")."&orig_account=".$orig_account, $langs->trans("RemoveFromRubrique"), $langs->trans("RemoveFromRubriqueConfirm"), "confirm_delete_categ", '', 'yes', 1);
-        }
+		// Confirmations
+		if ($action == 'delete_categ')
+		{
+			print $form->formconfirm($_SERVER['PHP_SELF']."?rowid=".$rowid."&cat1=".GETPOST("fk_categ")."&orig_account=".$orig_account, $langs->trans("RemoveFromRubrique"), $langs->trans("RemoveFromRubriqueConfirm"), "confirm_delete_categ", '', 'yes', 1);
+		}
 
-        print '<form name="update" method="POST" action="'.$_SERVER['PHP_SELF'].'?rowid='.$rowid.'">';
-        print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<input type="hidden" name="action" value="update">';
-        print '<input type="hidden" name="orig_account" value="'.$orig_account.'">';
-        print '<input type="hidden" name="id" value="'.$acct->id.'">';
+		print '<form name="update" method="POST" action="'.$_SERVER['PHP_SELF'].'?rowid='.$rowid.'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="action" value="update">';
+		print '<input type="hidden" name="orig_account" value="'.$orig_account.'">';
+		print '<input type="hidden" name="id" value="'.$acct->id.'">';
 
-        dol_fiche_head($head, 'bankline', $langs->trans('LineRecord'), 0, 'accountline', 0);
+		print dol_get_fiche_head($head, 'bankline', $langs->trans('LineRecord'), 0, 'accountline', 0);
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 
-        dol_banner_tab($bankline, 'rowid', $linkback);
+		dol_banner_tab($bankline, 'rowid', $linkback);
 
 		print '<div class="fichecenter2">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border centpercent tableforfield">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border centpercent tableforfield">';
 
-        $i++;
+		$i++;
 
-        // Bank account
-        print '<tr><td class="titlefield">'.$langs->trans("Account").'</td>';
-        print '<td>';
-        if (!$objp->rappro && !$bankline->getVentilExportCompta())
-        {
-        	$form->select_comptes($acct->id, 'accountid', 0, '', 0);
-        } else {
-        	print $acct->getNomUrl(1, 'transactions', 'reflabel');
-        }
-        print '</td>';
-        print '</tr>';
+		// Bank account
+		print '<tr><td class="titlefield">'.$langs->trans("Account").'</td>';
+		print '<td>';
+		if (!$objp->rappro && !$bankline->getVentilExportCompta())
+		{
+			$form->select_comptes($acct->id, 'accountid', 0, '', 0);
+		} else {
+			print $acct->getNomUrl(1, 'transactions', 'reflabel');
+		}
+		print '</td>';
+		print '</tr>';
 
-        // Show links of bank transactions
-        if (count($links))
-        {
-            print '<tr><td class="tdtop">'.$langs->trans("Links").'</td>';
-            print '<td>';
-            foreach ($links as $key=>$val)
-            {
-                if ($key) print '<br>';
-                if ($links[$key]['type'] == 'payment') {
-                    require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-                    $paymenttmp = new Paiement($db);
-                    $paymenttmp->fetch($links[$key]['url_id']);
-                    $paymenttmp->ref = $langs->trans("Payment").' '.$paymenttmp->ref;
-                    /*print '<a href="'.DOL_URL_ROOT.'/compta/paiement/card.php?id='.$links[$key]['url_id'].'">';
+		// Show links of bank transactions
+		if (count($links))
+		{
+			print '<tr><td class="tdtop">'.$langs->trans("Links").'</td>';
+			print '<td>';
+			foreach ($links as $key=>$val)
+			{
+				if ($key) print '<br>';
+				if ($links[$key]['type'] == 'payment') {
+					require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+					$paymenttmp = new Paiement($db);
+					$paymenttmp->fetch($links[$key]['url_id']);
+					$paymenttmp->ref = $langs->trans("Payment").' '.$paymenttmp->ref;
+					/*print '<a href="'.DOL_URL_ROOT.'/compta/paiement/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('Payment'),'payment').' ';
                     print $langs->trans("Payment");
                     print '</a>';*/
-                    print $paymenttmp->getNomUrl(1);
-                } elseif ($links[$key]['type'] == 'payment_supplier') {
-                    require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
-                    $paymenttmp = new PaiementFourn($db);
-                    $paymenttmp->fetch($links[$key]['url_id']);
-                    $paymenttmp->ref = $langs->trans("Payment").' '.$paymenttmp->ref;
-                    /*print '<a href="'.DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$links[$key]['url_id'].'">';
+					print $paymenttmp->getNomUrl(1);
+				} elseif ($links[$key]['type'] == 'payment_supplier') {
+					require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+					$paymenttmp = new PaiementFourn($db);
+					$paymenttmp->fetch($links[$key]['url_id']);
+					$paymenttmp->ref = $langs->trans("Payment").' '.$paymenttmp->ref;
+					/*print '<a href="'.DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('Payment'),'payment').' ';
                     print $langs->trans("Payment");
                     print '</a>';*/
-                    print $paymenttmp->getNomUrl(1);
-                } elseif ($links[$key]['type'] == 'company') {
-                    $societe = new Societe($db);
-                    $societe->fetch($links[$key]['url_id']);
-                    print $societe->getNomUrl(1);
-                } elseif ($links[$key]['type'] == 'sc') {
-                    print '<a href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$links[$key]['url_id'].'">';
-                    print img_object($langs->trans('SocialContribution'), 'bill').' ';
-                    print $langs->trans("SocialContribution").($links[$key]['label'] ? ' - '.$links[$key]['label'] : '');
-                    print '</a>';
-                } elseif ($links[$key]['type'] == 'payment_sc') {
-                    print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$links[$key]['url_id'].'">';
-                    print img_object($langs->trans('Payment'), 'payment').' ';
-                    print $langs->trans("SocialContributionPayment");
-                    print '</a>';
-                } elseif ($links[$key]['type'] == 'payment_vat') {
-                    print '<a href="'.DOL_URL_ROOT.'/compta/tva/card.php?id='.$links[$key]['url_id'].'">';
-                    print img_object($langs->trans('VAT'), 'payment').' ';
-                    print $langs->trans("VATPayment");
-                    print '</a>';
-                } elseif ($links[$key]['type'] == 'payment_salary') {
-                    print '<a href="'.DOL_URL_ROOT.'/salaries/card.php?id='.$links[$key]['url_id'].'">';
-                    print img_object($langs->trans('PaymentSalary'), 'payment').' ';
-                    print $langs->trans("SalaryPayment");
-                    print '</a>';
-                } elseif ($links[$key]['type'] == 'payment_loan') {
-                    print '<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$links[$key]['url_id'].'">';
-                    print img_object($langs->trans('LoanPayment'), 'payment').' ';
-                    print $langs->trans("PaymentLoan");
-                    print '</a>';
-                } elseif ($links[$key]['type'] == 'loan') {
-                    print '<a href="'.DOL_URL_ROOT.'/loan/card.php?id='.$links[$key]['url_id'].'">';
-                    print img_object($langs->trans('Loan'), 'bill').' ';
-                    print $langs->trans("Loan");
-                    print '</a>';
-                } elseif ($links[$key]['type'] == 'member') {
-                    print '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$links[$key]['url_id'].'">';
-                    print img_object($langs->trans('Member'), 'user').' ';
-                    print $links[$key]['label'];
-                    print '</a>';
-                } elseif ($links[$key]['type'] == 'payment_donation') {
-                    print '<a href="'.DOL_URL_ROOT.'/don/payment/card.php?id='.$links[$key]['url_id'].'">';
-                    print img_object($langs->trans('Donation'), 'payment').' ';
-                    print $langs->trans("DonationPayment");
-                    print '</a>';
-                } elseif ($links[$key]['type'] == 'banktransfert') {
-                    print '<a href="'.DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$links[$key]['url_id'].'">';
-                    print img_object($langs->trans('Transaction'), 'payment').' ';
-                    print $langs->trans("TransactionOnTheOtherAccount");
-                    print '</a>';
-                } elseif ($links[$key]['type'] == 'user') {
-                    print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$links[$key]['url_id'].'">';
-                    print img_object($langs->trans('User'), 'user').' ';
-                    print $langs->trans("User");
-                    print '</a>';
-                } elseif ($links[$key]['type'] == 'payment_various') {
-                    print '<a href="'.DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id='.$links[$key]['url_id'].'">';
-                    print img_object($langs->trans('VariousPayment'), 'payment').' ';
-                    print $langs->trans("VariousPayment");
-                    print '</a>';
-                } else {
-                    print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
-                    print img_object('', 'generic').' ';
-                    print $links[$key]['label'];
-                    print '</a>';
-                }
-            }
-            print '</td></tr>';
-        }
+					print $paymenttmp->getNomUrl(1);
+				} elseif ($links[$key]['type'] == 'company') {
+					$societe = new Societe($db);
+					$societe->fetch($links[$key]['url_id']);
+					print $societe->getNomUrl(1);
+				} elseif ($links[$key]['type'] == 'sc') {
+					print '<a href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$links[$key]['url_id'].'">';
+					print img_object($langs->trans('SocialContribution'), 'bill').' ';
+					print $langs->trans("SocialContribution").($links[$key]['label'] ? ' - '.$links[$key]['label'] : '');
+					print '</a>';
+				} elseif ($links[$key]['type'] == 'payment_sc') {
+					print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$links[$key]['url_id'].'">';
+					print img_object($langs->trans('Payment'), 'payment').' ';
+					print $langs->trans("SocialContributionPayment");
+					print '</a>';
+				} elseif ($links[$key]['type'] == 'payment_vat') {
+					print '<a href="'.DOL_URL_ROOT.'/compta/tva/card.php?id='.$links[$key]['url_id'].'">';
+					print img_object($langs->trans('VAT'), 'payment').' ';
+					print $langs->trans("VATPayment");
+					print '</a>';
+				} elseif ($links[$key]['type'] == 'payment_salary') {
+					print '<a href="'.DOL_URL_ROOT.'/salaries/card.php?id='.$links[$key]['url_id'].'">';
+					print img_object($langs->trans('PaymentSalary'), 'payment').' ';
+					print $langs->trans("SalaryPayment");
+					print '</a>';
+				} elseif ($links[$key]['type'] == 'payment_loan') {
+					print '<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$links[$key]['url_id'].'">';
+					print img_object($langs->trans('LoanPayment'), 'payment').' ';
+					print $langs->trans("PaymentLoan");
+					print '</a>';
+				} elseif ($links[$key]['type'] == 'loan') {
+					print '<a href="'.DOL_URL_ROOT.'/loan/card.php?id='.$links[$key]['url_id'].'">';
+					print img_object($langs->trans('Loan'), 'bill').' ';
+					print $langs->trans("Loan");
+					print '</a>';
+				} elseif ($links[$key]['type'] == 'member') {
+					print '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$links[$key]['url_id'].'">';
+					print img_object($langs->trans('Member'), 'user').' ';
+					print $links[$key]['label'];
+					print '</a>';
+				} elseif ($links[$key]['type'] == 'payment_donation') {
+					print '<a href="'.DOL_URL_ROOT.'/don/payment/card.php?id='.$links[$key]['url_id'].'">';
+					print img_object($langs->trans('Donation'), 'payment').' ';
+					print $langs->trans("DonationPayment");
+					print '</a>';
+				} elseif ($links[$key]['type'] == 'banktransfert') {
+					print '<a href="'.DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$links[$key]['url_id'].'">';
+					print img_object($langs->trans('Transaction'), 'payment').' ';
+					print $langs->trans("TransactionOnTheOtherAccount");
+					print '</a>';
+				} elseif ($links[$key]['type'] == 'user') {
+					print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$links[$key]['url_id'].'">';
+					print img_object($langs->trans('User'), 'user').' ';
+					print $langs->trans("User");
+					print '</a>';
+				} elseif ($links[$key]['type'] == 'payment_various') {
+					print '<a href="'.DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id='.$links[$key]['url_id'].'">';
+					print img_object($langs->trans('VariousPayment'), 'payment').' ';
+					print $langs->trans("VariousPayment");
+					print '</a>';
+				} else {
+					print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
+					print img_object('', 'generic').' ';
+					print $links[$key]['label'];
+					print '</a>';
+				}
+			}
+			print '</td></tr>';
+		}
 
-        //$user->rights->banque->modifier=false;
-        //$user->rights->banque->consolidate=true;
+		//$user->rights->banque->modifier=false;
+		//$user->rights->banque->consolidate=true;
 
-        // Type of payment / Number
-        print "<tr><td>".$langs->trans("Type")." / ".$langs->trans("Numero");
-        print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
-        print "</td>";
-        if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
-        {
-            print '<td>';
-            $form->select_types_paiements($objp->fk_type, "value", '', 2);
-            print '<input type="text" class="flat" name="num_chq" value="'.(empty($objp->num_chq) ? '' : $objp->num_chq).'">';
-            if ($objp->receiptid)
-            {
-                include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
-                $receipt = new RemiseCheque($db);
-                $receipt->fetch($objp->receiptid);
-                print ' &nbsp; &nbsp; '.$langs->trans("CheckReceipt").': '.$receipt->getNomUrl(2);
-            }
-            print '</td>';
-        } else {
-            print '<td>'.$objp->fk_type.' '.$objp->num_chq.'</td>';
-        }
-        print "</tr>";
+		// Type of payment / Number
+		print "<tr><td>".$langs->trans("Type")." / ".$langs->trans("Numero");
+		print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
+		print "</td>";
+		if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
+		{
+			print '<td>';
+			$form->select_types_paiements($objp->fk_type, "value", '', 2);
+			print '<input type="text" class="flat" name="num_chq" value="'.(empty($objp->num_chq) ? '' : $objp->num_chq).'">';
+			if ($objp->receiptid)
+			{
+				include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
+				$receipt = new RemiseCheque($db);
+				$receipt->fetch($objp->receiptid);
+				print ' &nbsp; &nbsp; '.$langs->trans("CheckReceipt").': '.$receipt->getNomUrl(2);
+			}
+			print '</td>';
+		} else {
+			print '<td>'.$objp->fk_type.' '.$objp->num_chq.'</td>';
+		}
+		print "</tr>";
 
-        // Transmitter
-        print "<tr><td>".$langs->trans("CheckTransmitter");
-        print ' <em>('.$langs->trans("ChequeMaker").')</em>';
-        print "</td>";
-        if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
-        {
-            print '<td>';
-            print '<input type="text" class="flat minwidth200" name="emetteur" value="'.(empty($objp->emetteur) ? '' : stripslashes($objp->emetteur)).'">';
-            print '</td>';
-        } else {
-            print '<td>'.$objp->emetteur.'</td>';
-        }
-        print "</tr>";
+		// Transmitter
+		print "<tr><td>".$langs->trans("CheckTransmitter");
+		print ' <em>('.$langs->trans("ChequeMaker").')</em>';
+		print "</td>";
+		if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
+		{
+			print '<td>';
+			print '<input type="text" class="flat minwidth200" name="emetteur" value="'.(empty($objp->emetteur) ? '' : stripslashes($objp->emetteur)).'">';
+			print '</td>';
+		} else {
+			print '<td>'.$objp->emetteur.'</td>';
+		}
+		print "</tr>";
 
-        // Bank of cheque
-        print "<tr><td>".$langs->trans("Bank");
-        print ' <em>('.$langs->trans("ChequeBank").')</em>';
-        print "</td>";
-        if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
-        {
-        	print '<td>';
-        	print '<input type="text" class="flat minwidth200" name="banque" value="'.(empty($objp->banque) ? '' : $objp->banque).'">';
-        	print '</td>';
-        } else {
-        	print '<td>'.$objp->banque.'</td>';
-        }
-        print "</tr>";
+		// Bank of cheque
+		print "<tr><td>".$langs->trans("Bank");
+		print ' <em>('.$langs->trans("ChequeBank").')</em>';
+		print "</td>";
+		if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
+		{
+			print '<td>';
+			print '<input type="text" class="flat minwidth200" name="banque" value="'.(empty($objp->banque) ? '' : $objp->banque).'">';
+			print '</td>';
+		} else {
+			print '<td>'.$objp->banque.'</td>';
+		}
+		print "</tr>";
 
-        // Date ope
-        print '<tr><td>'.$langs->trans("DateOperation").'</td>';
-        if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
-        {
-            print '<td>';
-            print $form->selectDate($db->jdate($objp->do), 'dateo', '', '', '', 'update', 1, 0, $objp->rappro);
-            if (!$objp->rappro)
-            {
-                print ' &nbsp; ';
-                print '<a href="'.$_SERVER['PHP_SELF'].'?action=doprev&amp;id='.$id.'&amp;rowid='.$objp->rowid.'">';
-                print img_edit_remove()."</a> ";
-                print '<a href="'.$_SERVER['PHP_SELF'].'?action=donext&amp;id='.$id.'&amp;rowid='.$objp->rowid.'">';
-                print img_edit_add()."</a>";
-            }
-            print '</td>';
-        } else {
-            print '<td>';
-            print dol_print_date($db->jdate($objp->do), "day");
-            print '</td>';
-        }
-        print '</tr>';
+		// Date ope
+		print '<tr><td>'.$langs->trans("DateOperation").'</td>';
+		if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
+		{
+			print '<td>';
+			print $form->selectDate($db->jdate($objp->do), 'dateo', '', '', '', 'update', 1, 0, $objp->rappro);
+			if (!$objp->rappro)
+			{
+				print ' &nbsp; ';
+				print '<a href="'.$_SERVER['PHP_SELF'].'?action=doprev&amp;id='.$id.'&amp;rowid='.$objp->rowid.'">';
+				print img_edit_remove()."</a> ";
+				print '<a href="'.$_SERVER['PHP_SELF'].'?action=donext&amp;id='.$id.'&amp;rowid='.$objp->rowid.'">';
+				print img_edit_add()."</a>";
+			}
+			print '</td>';
+		} else {
+			print '<td>';
+			print dol_print_date($db->jdate($objp->do), "day");
+			print '</td>';
+		}
+		print '</tr>';
 
-        // Value date
-        print "<tr><td>".$langs->trans("DateValue")."</td>";
-        if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
-        {
-            print '<td>';
-            print $form->selectDate($db->jdate($objp->dv), 'datev', '', '', '', 'update', 1, 0, $objp->rappro);
-            if (!$objp->rappro)
-            {
-                print ' &nbsp; ';
-                print '<a href="'.$_SERVER['PHP_SELF'].'?action=dvprev&amp;id='.$id.'&amp;rowid='.$objp->rowid.'">';
-                print img_edit_remove()."</a> ";
-                print '<a href="'.$_SERVER['PHP_SELF'].'?action=dvnext&amp;id='.$id.'&amp;rowid='.$objp->rowid.'">';
-                print img_edit_add()."</a>";
-            }
-            print '</td>';
-        } else {
-            print '<td>';
-            print dol_print_date($db->jdate($objp->dv), "day");
-            print '</td>';
-        }
-        print "</tr>";
+		// Value date
+		print "<tr><td>".$langs->trans("DateValue")."</td>";
+		if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
+		{
+			print '<td>';
+			print $form->selectDate($db->jdate($objp->dv), 'datev', '', '', '', 'update', 1, 0, $objp->rappro);
+			if (!$objp->rappro)
+			{
+				print ' &nbsp; ';
+				print '<a href="'.$_SERVER['PHP_SELF'].'?action=dvprev&amp;id='.$id.'&amp;rowid='.$objp->rowid.'">';
+				print img_edit_remove()."</a> ";
+				print '<a href="'.$_SERVER['PHP_SELF'].'?action=dvnext&amp;id='.$id.'&amp;rowid='.$objp->rowid.'">';
+				print img_edit_add()."</a>";
+			}
+			print '</td>';
+		} else {
+			print '<td>';
+			print dol_print_date($db->jdate($objp->dv), "day");
+			print '</td>';
+		}
+		print "</tr>";
 
-        // Description
-        print "<tr><td>".$langs->trans("Label")."</td>";
-        if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
-        {
-            print '<td>';
-            print '<input name="label" class="flat minwidth300" '.($objp->rappro ? ' disabled' : '').' value="';
-            if (preg_match('/^\((.*)\)$/i', $objp->label, $reg))
-            {
-                // Label generique car entre parentheses. On l'affiche en le traduisant
-                print $langs->trans($reg[1]);
-            } else {
-                print $objp->label;
-            }
-            print '">';
-            print '</td>';
-        } else {
-            print '<td>';
-            if (preg_match('/^\((.*)\)$/i', $objp->label, $reg))
-            {
-                // Label generique car entre parentheses. On l'affiche en le traduisant
-                print $langs->trans($reg[1]);
-            } else {
-                print $objp->label;
-            }
-            print '</td>';
-        }
-        print '</tr>';
+		// Description
+		print "<tr><td>".$langs->trans("Label")."</td>";
+		if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
+		{
+			print '<td>';
+			print '<input name="label" class="flat minwidth300" '.($objp->rappro ? ' disabled' : '').' value="';
+			if (preg_match('/^\((.*)\)$/i', $objp->label, $reg))
+			{
+				// Label generique car entre parentheses. On l'affiche en le traduisant
+				print $langs->trans($reg[1]);
+			} else {
+				print $objp->label;
+			}
+			print '">';
+			print '</td>';
+		} else {
+			print '<td>';
+			if (preg_match('/^\((.*)\)$/i', $objp->label, $reg))
+			{
+				// Label generique car entre parentheses. On l'affiche en le traduisant
+				print $langs->trans($reg[1]);
+			} else {
+				print $objp->label;
+			}
+			print '</td>';
+		}
+		print '</tr>';
 
-        // Amount
-        print "<tr><td>".$langs->trans("Amount")."</td>";
-        if ($user->rights->banque->modifier)
-        {
-            print '<td>';
-            print '<input name="amount" class="flat maxwidth100" '.($objp->rappro ? ' disabled' : '').' value="'.price($objp->amount).'"> '.$langs->trans("Currency".$acct->currency_code);
-            print '</td>';
-        } else {
-            print '<td>';
-            print price($objp->amount);
-            print '</td>';
-        }
-        print "</tr>";
+		// Amount
+		print "<tr><td>".$langs->trans("Amount")."</td>";
+		if ($user->rights->banque->modifier)
+		{
+			print '<td>';
+			print '<input name="amount" class="flat maxwidth100" '.($objp->rappro ? ' disabled' : '').' value="'.price($objp->amount).'"> '.$langs->trans("Currency".$acct->currency_code);
+			print '</td>';
+		} else {
+			print '<td>';
+			print price($objp->amount);
+			print '</td>';
+		}
+		print "</tr>";
 
-        // Categories
-        if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
-        {
-            $langs->load('categories');
+		// Categories
+		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
+		{
+			$langs->load('categories');
 
-            // Bank line
-            print '<tr><td class="toptd">'.$form->editfieldkey('RubriquesTransactions', 'custcats', '', $object, 0).'</td><td>';
-            $cate_arbo = $form->select_all_categories(Categorie::TYPE_BANK_LINE, null, 'parent', null, null, 1);
-            print $form->multiselectarray('custcats', $cate_arbo, $arrayselected, null, null, null, null, "90%");
-            print "</td></tr>";
-        }
+			// Bank line
+			print '<tr><td class="toptd">'.$form->editfieldkey('RubriquesTransactions', 'custcats', '', $object, 0).'</td><td>';
+			$cate_arbo = $form->select_all_categories(Categorie::TYPE_BANK_LINE, null, 'parent', null, null, 1);
+			print $form->multiselectarray('custcats', $cate_arbo, $arrayselected, null, null, null, null, "90%");
+			print "</td></tr>";
+		}
 
-        print "</table>";
+		print "</table>";
 
-        print '</div>';
+		print '</div>';
 
-        dol_fiche_end();
+		print dol_get_fiche_end();
 
 
-        print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'"></div><br>';
+		print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'"></div><br>';
 
-        print "</form>";
+		print "</form>";
 
 
 
-        // Releve rappro
-        if ($acct->canBeConciliated() > 0)  // Si compte rapprochable
-        {
-            print load_fiche_titre($langs->trans("Reconciliation"), '', 'bank_account');
-            print '<hr>'."\n";
+		// Releve rappro
+		if ($acct->canBeConciliated() > 0)  // Si compte rapprochable
+		{
+			print load_fiche_titre($langs->trans("Reconciliation"), '', 'bank_account');
+			print '<hr>'."\n";
 
-            print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?rowid='.$objp->rowid.'">';
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            print '<input type="hidden" name="action" value="setreconcile">';
-            print '<input type="hidden" name="orig_account" value="'.$orig_account.'">';
-            print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+			print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?rowid='.$objp->rowid.'">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="action" value="setreconcile">';
+			print '<input type="hidden" name="orig_account" value="'.$orig_account.'">';
+			print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
-            print '<div class="fichecenter">';
+			print '<div class="fichecenter">';
 
-            print '<table class="border centpercent">';
+			print '<table class="border centpercent">';
 
-            print '<tr><td class="titlefield">'.$langs->trans("Conciliation")."</td>";
-            if ($user->rights->banque->consolidate)
-            {
-                print '<td>';
-                if ($objp->rappro)
-                {
-                    print $langs->trans("AccountStatement").' <input name="num_rel_bis" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro ? ' disabled' : '').'>';
-                    print '<input name="num_rel" type="hidden" value="'.$objp->num_releve.'">';
-                } else {
-                    print $langs->trans("AccountStatement").' <input name="num_rel" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro ? ' disabled' : '').'>';
-                }
-                if ($objp->num_releve) print ' &nbsp; (<a href="'.DOL_URL_ROOT.'/compta/bank/releve.php?num='.$objp->num_releve.'&account='.$acct->id.'">'.$langs->trans("AccountStatement").' '.$objp->num_releve.')</a>';
-                print '</td>';
-            } else {
-                print '<td>'.$objp->num_releve.'&nbsp;</td>';
-            }
-            print '</tr>';
+			print '<tr><td class="titlefield">'.$langs->trans("Conciliation")."</td>";
+			if ($user->rights->banque->consolidate)
+			{
+				print '<td>';
+				if ($objp->rappro)
+				{
+					print $langs->trans("AccountStatement").' <input name="num_rel_bis" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro ? ' disabled' : '').'>';
+					print '<input name="num_rel" type="hidden" value="'.$objp->num_releve.'">';
+				} else {
+					print $langs->trans("AccountStatement").' <input name="num_rel" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro ? ' disabled' : '').'>';
+				}
+				if ($objp->num_releve) print ' &nbsp; (<a href="'.DOL_URL_ROOT.'/compta/bank/releve.php?num='.$objp->num_releve.'&account='.$acct->id.'">'.$langs->trans("AccountStatement").' '.$objp->num_releve.')</a>';
+				print '</td>';
+			} else {
+				print '<td>'.$objp->num_releve.'&nbsp;</td>';
+			}
+			print '</tr>';
 
-            print "<tr><td>".$langs->trans("BankLineConciliated")."</td>";
-            if ($user->rights->banque->consolidate)
-            {
-                print '<td>';
-                print '<input type="checkbox" name="reconciled" class="flat" '.(isset($_POST["reconciled"]) ? ($_POST["reconciled"] ? ' checked="checked"' : '') : ($objp->rappro ? ' checked="checked"' : '')).'">';
-                print '</td>';
-            } else {
-                print '<td>'.yn($objp->rappro).'</td>';
-            }
-            print '</tr>';
-            print '</table>';
+			print "<tr><td>".$langs->trans("BankLineConciliated")."</td>";
+			if ($user->rights->banque->consolidate)
+			{
+				print '<td>';
+				print '<input type="checkbox" name="reconciled" class="flat" '.(GETPOSTISSET("reconciled") ? (GETPOST("reconciled") ? ' checked="checked"' : '') : ($objp->rappro ? ' checked="checked"' : '')).'">';
+				print '</td>';
+			} else {
+				print '<td>'.yn($objp->rappro).'</td>';
+			}
+			print '</tr>';
+			print '</table>';
 
-            print '</div>';
+			print '</div>';
 
-            print '<div class="center">';
+			print '<div class="center">';
 
-            print '<input type="submit" class="button" value="'.$langs->trans("Update").'">';
-            if ($backtopage)
-            {
-                print ' &nbsp; ';
-                print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
-            }
-            print '</div>';
+			print '<input type="submit" class="button" value="'.$langs->trans("Update").'">';
+			if ($backtopage)
+			{
+				print ' &nbsp; ';
+				print '<input type="submit" name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'">';
+			}
+			print '</div>';
 
 			print '</form>';
-        }
-    }
+		}
+	}
 
-    $db->free($result);
+	$db->free($result);
 } else dol_print_error($db);
 
 // End of page
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 5cdd4711871..87c8380ebda 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -86,24 +86,24 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-    'b.ref'=>'Ref',
-    'b.label'=>'Label',
+	'b.ref'=>'Ref',
+	'b.label'=>'Label',
 );
 
 $checkedtypetiers = 0;
 $arrayfields = array(
-    'b.ref'=>array('label'=>$langs->trans("BankAccounts"), 'checked'=>1),
-    'accountype'=>array('label'=>$langs->trans("Type"), 'checked'=>1),
-    'b.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
-    'b.number'=>array('label'=>$langs->trans("AccountIdShort"), 'checked'=>1),
-    'b.account_number'=>array('label'=>$langs->trans("AccountAccounting"), 'checked'=>(!empty($conf->accounting->enabled) || !empty($conf->accounting->enabled))),
-    'b.fk_accountancy_journal'=>array('label'=>$langs->trans("AccountancyJournal"), 'checked'=>(!empty($conf->accounting->enabled) || !empty($conf->accounting->enabled))),
-    'toreconcile'=>array('label'=>$langs->trans("TransactionsToConciliate"), 'checked'=>1),
-    'b.currency_code'=>array('label'=>$langs->trans("Currency"), 'checked'=>0),
+	'b.ref'=>array('label'=>$langs->trans("BankAccounts"), 'checked'=>1, 'position'=>10),
+	'b.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1, 'position'=>12),
+	'accountype'=>array('label'=>$langs->trans("Type"), 'checked'=>1, 'position'=>14),
+	'b.number'=>array('label'=>$langs->trans("AccountIdShort"), 'checked'=>1, 'position'=>16),
+	'b.account_number'=>array('label'=>$langs->trans("AccountAccounting"), 'checked'=>(!empty($conf->accounting->enabled) || !empty($conf->accounting->enabled)), 'position'=>18),
+	'b.fk_accountancy_journal'=>array('label'=>$langs->trans("AccountancyJournal"), 'checked'=>(!empty($conf->accounting->enabled) || !empty($conf->accounting->enabled)), 'position'=>20),
+	'toreconcile'=>array('label'=>$langs->trans("TransactionsToConciliate"), 'checked'=>1, 'position'=>50),
+	'b.currency_code'=>array('label'=>$langs->trans("Currency"), 'checked'=>0, 'position'=>22),
 	'b.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-    'b.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
-    'b.clos'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
-    'balance'=>array('label'=>$langs->trans("Balance"), 'checked'=>1, 'position'=>1010),
+	'b.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
+	'b.clos'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
+	'balance'=>array('label'=>$langs->trans("Balance"), 'checked'=>1, 'position'=>1010),
 );
 // Extra fields
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
@@ -134,10 +134,10 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 // Purge search criteria
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-    $search_ref = '';
-    $search_label = '';
-    $search_number = '';
-    $search_status = '';
+	$search_ref = '';
+	$search_label = '';
+	$search_number = '';
+	$search_status = '';
 }
 
 
@@ -194,8 +194,8 @@ $sql .= $db->order($sortfield, $sortorder);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -203,38 +203,35 @@ $sql .= $db->plimit($limit + 1, $offset);
 $resql = $db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
-    $i = 0;
-    while ($i < $num)
-    {
-        $objp = $db->fetch_object($resql);
-        $accounts[$objp->rowid] = $objp->courant;
-        $i++;
-    }
-    $db->free($resql);
+	$num = $db->num_rows($resql);
+	$i = 0;
+	while ($i < $num)
+	{
+		$objp = $db->fetch_object($resql);
+		$accounts[$objp->rowid] = $objp->courant;
+		$i++;
+	}
+	$db->free($resql);
 } else dol_print_error($db);
 
 
 
 $help_url = 'EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses|ES:M&oacute;dulo_Bancos_y_Cajas';
+
 llxHeader('', $title, $help_url);
 
-$link = '';
-
-
-$num_rows = count($accounts);
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
-if ($search_ref != '')      $param .= '&search_ref='.$search_ref;
-if ($search_label != '')    $param .= '&search_label='.$search_label;
-if ($search_number != '')   $param .= '&search_number='.$search_number;
-if ($search_status != '')   $param .= '&search_status='.$search_status;
-if ($show_files)            $param .= '&show_files='.$show_files;
-if ($optioncss != '')       $param .= '&optioncss='.$optioncss;
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+if ($search_ref != '')      $param .= '&search_ref='.urlencode($search_ref);
+if ($search_label != '')    $param .= '&search_label='.urlencode($search_label);
+if ($search_number != '')   $param .= '&search_number='.urlencode($search_number);
+if ($search_status != '')   $param .= '&search_status='.urlencode($search_status);
+if ($show_files)            $param .= '&show_files='.urlencode($show_files);
+if ($optioncss != '')       $param .= '&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -265,18 +262,18 @@ print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sort
 $topicmail = "Information";
 //$modelmail="subscription";
 $objecttmp = new Account($db);
-//$trackid='sub'.$object->id;
+$trackid = 'bank'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($sall)
 {
-    foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
-    print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 }
 
 $moreforfilter = '';
 
-if (!empty($conf->categorie->enabled))
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 {
 	$moreforfilter .= $form->getFilterBox(Categorie::TYPE_ACCOUNT, $search_category_list);
 }
@@ -305,53 +302,53 @@ print '<tr class="liste_titre_filter">';
 // Ref
 if (!empty($arrayfields['b.ref']['checked']))
 {
-    print '<td class="liste_titre">';
-    print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
-    print '</td>';
+	print '<td class="liste_titre">';
+	print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+	print '</td>';
 }
 // Label
 if (!empty($arrayfields['b.label']['checked']))
 {
-    print '<td class="liste_titre">';
-    print '<input class="flat" size="6" type="text" name="search_label" value="'.dol_escape_htmltag($search_label).'">';
-    print '</td>';
+	print '<td class="liste_titre">';
+	print '<input class="flat" size="6" type="text" name="search_label" value="'.dol_escape_htmltag($search_label).'">';
+	print '</td>';
 }
 // Account type
 if (!empty($arrayfields['accountype']['checked']))
 {
-    print '<td class="liste_titre">';
-    print '</td>';
+	print '<td class="liste_titre">';
+	print '</td>';
 }
 // Bank number
 if (!empty($arrayfields['b.number']['checked']))
 {
-    print '<td class="liste_titre">';
-    print '<input class="flat" size="6" type="text" name="search_number" value="'.dol_escape_htmltag($search_number).'">';
-    print '</td>';
+	print '<td class="liste_titre">';
+	print '<input class="flat" size="6" type="text" name="search_number" value="'.dol_escape_htmltag($search_number).'">';
+	print '</td>';
 }
 // Account number
 if (!empty($arrayfields['b.account_number']['checked']))
 {
-    print '<td class="liste_titre">';
-    print '</td>';
+	print '<td class="liste_titre">';
+	print '</td>';
 }
 // Accountancy journal
 if (!empty($arrayfields['b.fk_accountancy_journal']['checked']))
 {
-    print '<td class="liste_titre">';
-    print '</td>';
+	print '<td class="liste_titre">';
+	print '</td>';
 }
 // Transactions to reconcile
 if (!empty($arrayfields['toreconcile']['checked']))
 {
-    print '<td class="liste_titre">';
-    print '</td>';
+	print '<td class="liste_titre">';
+	print '</td>';
 }
 // Currency
 if (!empty($arrayfields['b.currency_code']['checked']))
 {
-    print '<td class="liste_titre">';
-    print '</td>';
+	print '<td class="liste_titre">';
+	print '</td>';
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -363,30 +360,30 @@ print $hookmanager->resPrint;
 // Date creation
 if (!empty($arrayfields['b.datec']['checked']))
 {
-    print '<td class="liste_titre">';
-    print '</td>';
+	print '<td class="liste_titre">';
+	print '</td>';
 }
 // Date modification
 if (!empty($arrayfields['b.tms']['checked']))
 {
-    print '<td class="liste_titre">';
-    print '</td>';
+	print '<td class="liste_titre">';
+	print '</td>';
 }
 // Status
 if (!empty($arrayfields['b.clos']['checked']))
 {
-    print '<td class="liste_titre center">';
-    $array = array(
-        'opened'=>$langs->trans("Opened"),
-        'closed'=>$langs->trans("Closed")
-    );
-    print $form->selectarray("search_status", $array, $search_status, 1);
-    print '</td>';
+	print '<td class="liste_titre center">';
+	$array = array(
+		'opened'=>$langs->trans("Opened"),
+		'closed'=>$langs->trans("Closed")
+	);
+	print $form->selectarray("search_status", $array, $search_status, 1, 0, 0, '', 0, 0, 0, '', '', 1);
+	print '</td>';
 }
 // Balance
 if (!empty($arrayfields['balance']['checked']))
 {
-    print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"></td>';
 }
 // Action column
 print '<td class="liste_titre valignmiddle">';
@@ -419,13 +416,13 @@ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $
 print "</tr>\n";
 
 
-$total = array(); $found = 0; $i = 0; $lastcurrencycode = '';
+$totalarray = array(); $found = 0; $i = 0; $lastcurrencycode = '';
 
 foreach ($accounts as $key=>$type)
 {
 	if ($i >= $limit) break;
 
-    $found++;
+	$found++;
 
 	$result = $objecttmp->fetch($key);
 
@@ -442,163 +439,163 @@ foreach ($accounts as $key=>$type)
 
 	print '<tr class="oddeven">';
 
-    // Ref
-    if (!empty($arrayfields['b.ref']['checked']))
-    {
-        print '<td class="nowrap">'.$objecttmp->getNomUrl(1).'</td>';
-	    if (!$i) $totalarray['nbfield']++;
-    }
+	// Ref
+	if (!empty($arrayfields['b.ref']['checked']))
+	{
+		print '<td class="nowrap">'.$objecttmp->getNomUrl(1).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
 
-    // Label
-    if (!empty($arrayfields['b.label']['checked']))
-    {
+	// Label
+	if (!empty($arrayfields['b.label']['checked']))
+	{
 		print '<td>'.$objecttmp->label.'</td>';
-        if (!$i) $totalarray['nbfield']++;
-    }
+		if (!$i) $totalarray['nbfield']++;
+	}
 
-    // Account type
-    if (!empty($arrayfields['accountype']['checked']))
-    {
-        print '<td>';
+	// Account type
+	if (!empty($arrayfields['accountype']['checked']))
+	{
+		print '<td>';
 		print $objecttmp->type_lib[$objecttmp->type];
 		print '</td>';
-        if (!$i) $totalarray['nbfield']++;
-    }
-
-    // Number
-    if (!empty($arrayfields['b.number']['checked']))
-    {
-        print '<td>'.$objecttmp->number.'</td>';
-	    if (!$i) $totalarray['nbfield']++;
-    }
-
-    // Account number
-    if (!empty($arrayfields['b.account_number']['checked']))
-    {
-    	print '<td>';
-    	if (!empty($conf->accounting->enabled) && !empty($objecttmp->account_number))
-    	{
-    		$accountingaccount = new AccountingAccount($db);
-    		$accountingaccount->fetch('', $objecttmp->account_number, 1);
-    		print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
-    	} else {
-    		print $objecttmp->account_number;
-    	}
-    	print '</td>';
-	    if (!$i) $totalarray['nbfield']++;
-    }
-
-    // Accountancy journal
-    if (!empty($arrayfields['b.fk_accountancy_journal']['checked']))
-    {
-    	print '<td>';
-    	if (!empty($conf->accounting->enabled) && !empty($objecttmp->fk_accountancy_journal))
-    	{
-    		$accountingjournal = new AccountingJournal($db);
-    		$accountingjournal->fetch($objecttmp->fk_accountancy_journal);
-    		print $accountingjournal->getNomUrl(0, 1, 1, '', 1);
-    	} else {
-    		print '';
-    	}
-    	print '</td>';
 		if (!$i) $totalarray['nbfield']++;
-    }
+	}
 
-    // Currency
-    if (!empty($arrayfields['b.currency_code']['checked']))
-    {
-    	print '<td class="center">';
+	// Number
+	if (!empty($arrayfields['b.number']['checked']))
+	{
+		print '<td>'.$objecttmp->number.'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Account number
+	if (!empty($arrayfields['b.account_number']['checked']))
+	{
+		print '<td>';
+		if (!empty($conf->accounting->enabled) && !empty($objecttmp->account_number))
+		{
+			$accountingaccount = new AccountingAccount($db);
+			$accountingaccount->fetch('', $objecttmp->account_number, 1);
+			print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
+		} else {
+			print $objecttmp->account_number;
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Accountancy journal
+	if (!empty($arrayfields['b.fk_accountancy_journal']['checked']))
+	{
+		print '<td>';
+		if (!empty($conf->accounting->enabled) && !empty($objecttmp->fk_accountancy_journal))
+		{
+			$accountingjournal = new AccountingJournal($db);
+			$accountingjournal->fetch($objecttmp->fk_accountancy_journal);
+			print $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+		} else {
+			print '';
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Currency
+	if (!empty($arrayfields['b.currency_code']['checked']))
+	{
+		print '<td class="center">';
    		print $objecttmp->currency_code;
-    	print '</td>';
-    	if (!$i) $totalarray['nbfield']++;
-    }
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
 
-    // Transactions to reconcile
-    if (!empty($arrayfields['toreconcile']['checked']))
-    {
-    	print '<td class="center">';
+	// Transactions to reconcile
+	if (!empty($arrayfields['toreconcile']['checked']))
+	{
+		print '<td class="center">';
 
-    	$conciliate = $objecttmp->canBeConciliated();
-    	if ($conciliate == -2) print '<span class="opacitymedium">'.$langs->trans("CashAccount").'</span>';
-    	elseif ($conciliate == -3) print '<span class="opacitymedium">'.$langs->trans("Closed").'</span>';
-    	elseif (empty($objecttmp->rappro)) {
-    		print '<span class="opacitymedium">'.$langs->trans("ConciliationDisabled").'</span>';
-    	} else {
-    		$result = $objecttmp->load_board($user, $objecttmp->id);
-    		if ($result < 0) {
-    			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-    		} else {
-    			print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?id='.$objecttmp->id.'&search_conciliated=0">';
-    			print '<span class="badge badge-info classfortooltip" title="'.dol_htmlentities($langs->trans("TransactionsToConciliate")).'">';
-    			print $result->nbtodo;
-    			print '</span>';
+		$conciliate = $objecttmp->canBeConciliated();
+		if ($conciliate == -2) print '<span class="opacitymedium">'.$langs->trans("CashAccount").'</span>';
+		elseif ($conciliate == -3) print '<span class="opacitymedium">'.$langs->trans("Closed").'</span>';
+		elseif (empty($objecttmp->rappro)) {
+			print '<span class="opacitymedium">'.$langs->trans("ConciliationDisabled").'</span>';
+		} else {
+			$result = $objecttmp->load_board($user, $objecttmp->id);
+			if ($result < 0) {
+				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+			} else {
+				print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&sortorder=asc,asc,asc&id='.$objecttmp->id.'&search_account='.$objecttmp->id.'&search_conciliated=0&contextpage=banktransactionlist">';
+				print '<span class="badge badge-info classfortooltip" title="'.dol_htmlentities($langs->trans("TransactionsToConciliate")).'">';
+				print $result->nbtodo;
+				print '</span>';
 				print '</a>';
-    			if ($result->nbtodolate) {
-    				print '<span title="'.dol_htmlentities($langs->trans("Late")).'" class="classfortooltip badge badge-danger marginleftonlyshort">';
-    				print '<i class="fa fa-exclamation-triangle"></i> '.$result->nbtodolate;
-    				print '</span>';
-    			}
-    		}
-    	}
+				if ($result->nbtodolate) {
+					print '<span title="'.dol_htmlentities($langs->trans("Late")).'" class="classfortooltip badge badge-danger marginleftonlyshort">';
+					print '<i class="fa fa-exclamation-triangle"></i> '.$result->nbtodolate;
+					print '</span>';
+				}
+			}
+		}
 
-    	print '</td>';
-	    if (!$i) $totalarray['nbfield']++;
-    }
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
 
-    // Extra fields
+	// Extra fields
 	if (is_array($objecttmp->array_options)) {
 		$obj = new stdClass();
 		foreach ($objecttmp->array_options as $k => $v) {
 			$obj->$k = $v;
 		}
 	}
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-    // Fields from hook
-    $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-    $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objecttmp); // Note that $action and $objecttmpect may have been modified by hook
-    print $hookmanager->resPrint;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+	// Fields from hook
+	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objecttmp); // Note that $action and $objecttmpect may have been modified by hook
+	print $hookmanager->resPrint;
 	// Date creation
-    if (!empty($arrayfields['b.datec']['checked']))
-    {
-        print '<td class="center">';
-        print dol_print_date($objecttmp->date_creation, 'dayhour');
-        print '</td>';
-	    if (!$i) $totalarray['nbfield']++;
-    }
-    // Date modification
-    if (!empty($arrayfields['b.tms']['checked']))
-    {
-        print '<td class="center">';
-        print dol_print_date($objecttmp->date_update, 'dayhour');
-        print '</td>';
-	    if (!$i) $totalarray['nbfield']++;
-    }
+	if (!empty($arrayfields['b.datec']['checked']))
+	{
+		print '<td class="center">';
+		print dol_print_date($objecttmp->date_creation, 'dayhour');
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+	// Date modification
+	if (!empty($arrayfields['b.tms']['checked']))
+	{
+		print '<td class="center">';
+		print dol_print_date($objecttmp->date_update, 'dayhour');
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
 
-    // Status
-    if (!empty($arrayfields['b.clos']['checked']))
-    {
+	// Status
+	if (!empty($arrayfields['b.clos']['checked']))
+	{
 		print '<td class="center">'.$objecttmp->getLibStatut(5).'</td>';
-	    if (!$i) $totalarray['nbfield']++;
-    }
+		if (!$i) $totalarray['nbfield']++;
+	}
 
-    // Balance
-    if (!empty($arrayfields['balance']['checked']))
-    {
+	// Balance
+	if (!empty($arrayfields['balance']['checked']))
+	{
 		print '<td class="nowraponall right">';
 		print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?id='.$objecttmp->id.'">'.price($solde, 0, $langs, 0, -1, -1, $objecttmp->currency_code).'</a>';
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'balance';
 		$totalarray['val']['balance'] += $solde;
-    }
+	}
 
 	// Action column
 	print '<td class="nowrap center">';
 	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 	{
-	    $selected = 0;
-	    if (in_array($objecttmp->id, $arrayofselected)) $selected = 1;
-	    print '<input id="cb'.$objecttmp->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$objecttmp->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		$selected = 0;
+		if (in_array($objecttmp->id, $arrayofselected)) $selected = 1;
+		print '<input id="cb'.$objecttmp->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$objecttmp->id.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
 	print '</td>';
 	if (!$i) $totalarray['nbfield']++;
@@ -613,9 +610,9 @@ foreach ($accounts as $key=>$type)
 // If no record found
 if (!$found)
 {
-    $colspan = 1;
-    foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
-    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+	$colspan = 1;
+	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
+	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 
 // Show total line
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index ba5e20c11c1..9a534b76320 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -93,8 +93,8 @@ if (!$sortfield) $sortfield = "s.nom";
 $object = new Account($db);
 if ($id > 0 || !empty($ref))
 {
-    $result = $object->fetch($id, $ref);
-    $account = $object->id; // Force the search field on id of account
+	$result = $object->fetch($id, $ref);
+	$account = $object->id; // Force the search field on id of account
 }
 
 
@@ -243,7 +243,7 @@ if (empty($numref))
 
 		// Onglets
 		$head = bank_prepare_head($object);
-		dol_fiche_head($head, 'statement', $langs->trans("FinancialAccount"), 0, 'account');
+		print dol_get_fiche_head($head, 'statement', $langs->trans("FinancialAccount"), 0, 'account');
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -251,7 +251,7 @@ if (empty($numref))
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		print '<div class="tabsAction">';
@@ -305,7 +305,7 @@ if (empty($numref))
 					print '<input type="hidden" name="oldbankreceipt" value="'.$objp->numr.'">';
 					print '<input type="text" name="newbankreceipt" value="'.$objp->numr.'">';
 					print '<input type="submit" class="button" name="actionnewbankreceipt" value="'.$langs->trans("Rename").'">';
-					print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+					print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 				}
 				print '</td>';
 
@@ -361,7 +361,7 @@ if (empty($numref))
 
 	// Onglets
 	$head = account_statement_prepare_head($object, $numref);
-	dol_fiche_head($head, 'statement', $langs->trans("AccountStatement"), -1, 'account');
+	print dol_get_fiche_head($head, 'statement', $langs->trans("AccountStatement"), -1, 'account');
 
 
 	$morehtmlright = '';
@@ -371,15 +371,15 @@ if (empty($numref))
 	$morehtmlright .= '<li class="pagination"><a class="paginationnext" href="'.$_SERVER["PHP_SELF"].'?rel=next&amp;num='.$numref.'&amp;ve='.$ve.'&amp;account='.$object->id.'"><i class="fa fa-chevron-right" title="'.dol_escape_htmltag($langs->trans("Next")).'"></i></a></li>';
 	$morehtmlright .= '</ul></div>';
 
-    $title = $langs->trans("AccountStatement").' '.$numref.' - '.$langs->trans("BankAccount").' '.$object->getNomUrl(1, 'receipts');
-    print load_fiche_titre($title, $morehtmlright, '');
+	$title = $langs->trans("AccountStatement").' '.$numref.' - '.$langs->trans("BankAccount").' '.$object->getNomUrl(1, 'receipts');
+	print load_fiche_titre($title, $morehtmlright, '');
 	//print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, 0, $nbtotalofrecords, 'bank_account', 0, '', '', 0, 1);
 
 	print "<form method=\"post\" action=\"releve.php\">";
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 
-    print '<div class="div-table-responsive">';
+	print '<div class="div-table-responsive">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td class="center">'.$langs->trans("DateOperationShort").'</td>';
@@ -407,7 +407,7 @@ if (empty($numref))
 	}
 
 	// Recherche les ecritures pour le releve
-    $sql = $sqlrequestforbankline;
+	$sql = $sqlrequestforbankline;
 
 	$result = $db->query($sql);
 	if ($result)
@@ -441,17 +441,17 @@ if (empty($numref))
 			print "</td>\n";
 
 			// Type and num
-            if ($objp->fk_type == 'SOLD') {
-                $type_label = '&nbsp;';
-            } else {
-                $type_label = ($langs->trans("PaymentTypeShort".$objp->fk_type) != "PaymentTypeShort".$objp->fk_type) ? $langs->trans("PaymentTypeShort".$objp->fk_type) : $objp->fk_type;
-            }
-            $link = '';
-            if ($objp->fk_bordereau > 0) {
-                $remisestatic->id = $objp->fk_bordereau;
-                $remisestatic->ref = $objp->ref;
-                $link = ' '.$remisestatic->getNomUrl(1);
-            }
+			if ($objp->fk_type == 'SOLD') {
+				$type_label = '&nbsp;';
+			} else {
+				$type_label = ($langs->trans("PaymentTypeShort".$objp->fk_type) != "PaymentTypeShort".$objp->fk_type) ? $langs->trans("PaymentTypeShort".$objp->fk_type) : $objp->fk_type;
+			}
+			$link = '';
+			if ($objp->fk_bordereau > 0) {
+				$remisestatic->id = $objp->fk_bordereau;
+				$remisestatic->ref = $objp->ref;
+				$link = ' '.$remisestatic->getNomUrl(1);
+			}
 			print '<td class="nowrap">'.$type_label.' '.($objp->num_chq ? $objp->num_chq : '').$link.'</td>';
 
 			// Description
@@ -548,9 +548,9 @@ if (empty($numref))
 						print ')';
 					}
 				} elseif ($links[$key]['type'] == 'company') {
-                    $societestatic->id = $links[$key]['url_id'];
-                    $societestatic->name = $links[$key]['label'];
-                    print $societestatic->getNomUrl(1, 'company', 24);
+					$societestatic->id = $links[$key]['url_id'];
+					$societestatic->name = $links[$key]['label'];
+					print $societestatic->getNomUrl(1, 'company', 24);
 					$newline = 0;
 				} elseif ($links[$key]['type'] == 'member') {
 					print '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$links[$key]['url_id'].'">';
diff --git a/htdocs/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php
index 70903f9120f..7e1b7fd0567 100644
--- a/htdocs/compta/bank/transfer.php
+++ b/htdocs/compta/bank/transfer.php
@@ -118,9 +118,9 @@ if ($action == 'add')
 			if (!$error) $bank_line_id_to = $accountto->addline($dateo, $typeto, $label, $amountto, '', '', $user);
 			if (!($bank_line_id_to > 0)) $error++;
 
-		    if (!$error) $result = $accountfrom->add_url_line($bank_line_id_from, $bank_line_id_to, DOL_URL_ROOT.'/compta/bank/line.php?rowid=', '(banktransfert)', 'banktransfert');
+			if (!$error) $result = $accountfrom->add_url_line($bank_line_id_from, $bank_line_id_to, DOL_URL_ROOT.'/compta/bank/line.php?rowid=', '(banktransfert)', 'banktransfert');
 			if (!($result > 0)) $error++;
-		    if (!$error) $result = $accountto->add_url_line($bank_line_id_to, $bank_line_id_from, DOL_URL_ROOT.'/compta/bank/line.php?rowid=', '(banktransfert)', 'banktransfert');
+			if (!$error) $result = $accountto->add_url_line($bank_line_id_to, $bank_line_id_from, DOL_URL_ROOT.'/compta/bank/line.php?rowid=', '(banktransfert)', 'banktransfert');
 			if (!($result > 0)) $error++;
 
 			if (!$error)
@@ -133,7 +133,7 @@ if ($action == 'add')
 				$db->rollback();
 			}
 		} else {
-		    $error++;
+			$error++;
 			setEventMessages($langs->trans("ErrorFromToAccountsMustDiffers"), null, 'errors');
 		}
 	}
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index cf494b77a90..6d811233b7a 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -90,23 +90,23 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 
 	// Onglets
 	$head = bank_prepare_head($object);
-	dol_fiche_head($head, 'cash', $langs->trans("FinancialAccount"), 0, 'account');
+	print dol_get_fiche_head($head, 'cash', $langs->trans("FinancialAccount"), 0, 'account');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '<br>';
+	print '<br>';
 
 	$solde = $object->solde(0);
 	if ($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED)$colspan = 6;
 	else $colspan = 5;
 
 	// Show next coming entries
-    print '<div class="div-table-responsive">';
-    print '<table class="noborder centpercent">';
+	print '<div class="div-table-responsive">';
+	print '<table class="noborder centpercent">';
 
 	// Ligne de titre tableau des ecritures
 	print '<tr class="liste_titre">';
@@ -277,13 +277,13 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 			// We discard lines with a remainder to pay to 0
 			if (price2num($total_ttc) != 0)
 			{
-    			// Show line
-    			print '<tr class="oddeven">';
-    			print '<td>';
-    			if ($obj->dlr) print dol_print_date($db->jdate($obj->dlr), "day");
-    			else print $langs->trans("NotDefined");
-    			print "</td>";
-    			print "<td>".$ref."</td>";
+				// Show line
+				print '<tr class="oddeven">';
+				print '<td>';
+				if ($obj->dlr) print dol_print_date($db->jdate($obj->dlr), "day");
+				else print $langs->trans("NotDefined");
+				print "</td>";
+				print "<td>".$ref."</td>";
 				if ($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED) {
 					if ($obj->family == 'invoice') {
 						$mc->getInfo($obj->entity);
@@ -292,11 +292,11 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 						print "<td></td>";
 					}
 				}
-    			print "<td>".$refcomp."</td>";
-    			if ($obj->total_ttc < 0) { print '<td class="nowrap right">'.price(abs($total_ttc))."</td><td>&nbsp;</td>"; };
-    			if ($obj->total_ttc >= 0) { print '<td>&nbsp;</td><td class="nowrap right">'.price($total_ttc)."</td>"; };
-    			print '<td class="nowrap right">'.price($solde).'</td>';
-    			print "</tr>";
+				print "<td>".$refcomp."</td>";
+				if ($obj->total_ttc < 0) { print '<td class="nowrap right">'.price(abs($total_ttc))."</td><td>&nbsp;</td>"; };
+				if ($obj->total_ttc >= 0) { print '<td>&nbsp;</td><td class="nowrap right">'.price($total_ttc)."</td>"; };
+				print '<td class="nowrap right">'.price($solde).'</td>';
+				print "</tr>";
 			}
 
 			$i++;
@@ -310,7 +310,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 	$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) {
 		print $hookmanager->resPrint;
-        $solde = isset($hookmanager->resArray['solde']) ? $hookmanager->resArray['solde'] : $solde;
+		$solde = isset($hookmanager->resArray['solde']) ? $hookmanager->resArray['solde'] : $solde;
 	}
 
 	// solde
@@ -320,7 +320,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 	print '</tr>';
 
 	print "</table>";
-    print "</div>";
+	print "</div>";
 } else {
 	print $langs->trans("ErrorBankAccountNotFound");
 }
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 371dbaa65e2..db539e060d2 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2017-2019  Alexandre Spangaro      <aspangaro@open-dsi.fr>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric 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
@@ -30,8 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
-if (!empty($conf->projet->enabled))
-{
+if (!empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -41,8 +40,9 @@ $langs->loadLangs(array("compta", "banks", "bills", "users", "accountancy", "cat
 
 // Get parameters
 $id = GETPOST('id', 'int');
-$action		= GETPOST('action', 'alpha');
-$cancel		= GETPOST('cancel', 'aZ09');
+$action = GETPOST('action', 'alpha');
+$confirm = GETPOST('confirm');
+$cancel = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 $accountid = GETPOST("accountid") > 0 ? GETPOST("accountid", "int") : 0;
@@ -51,8 +51,12 @@ $sens = GETPOST("sens", "int");
 $amount = price2num(GETPOST("amount", "alpha"));
 $paymenttype = GETPOST("paymenttype", "int");
 $accountancy_code = GETPOST("accountancy_code", "alpha");
-$subledger_account = GETPOST("subledger_account", "alpha");
 $projectid = (GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : GETPOST('fk_project', 'int'));
+if (!empty($conf->accounting->enabled) && !empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
+	$subledger_account = GETPOST("subledger_account", "alpha") > 0 ? GETPOST("subledger_account", "alpha") : '';
+} else {
+	$subledger_account = GETPOST("subledger_account", "alpha");
+}
 
 // Security check
 $socid = GETPOST("socid", "int");
@@ -115,10 +119,10 @@ if (empty($reshook))
 		$object->category_transaction = GETPOST("category_transaction", 'alpha');
 
 		$object->accountancy_code = GETPOST("accountancy_code") > 0 ? GETPOST("accountancy_code", "alpha") : "";
-        $object->subledger_account = GETPOST("subledger_account") > 0 ? GETPOST("subledger_account", "alpha") : "";
+		$object->subledger_account = $subledger_account;
 
-		$object->sens = GETPOST('sens');
-		$object->fk_project = GETPOST('fk_project', 'int');
+		$object->sens = GETPOSTINT('sens');
+		$object->fk_project = GETPOSTINT('fk_project');
 
 		if (empty($datep) || empty($datev))
 		{
@@ -126,12 +130,6 @@ if (empty($reshook))
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 			$error++;
 		}
-		if (empty($object->type_payment) || $object->type_payment < 0)
-		{
-			$langs->load('errors');
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PaymentMode")), null, 'errors');
-			$error++;
-		}
 		if (empty($object->amount))
 		{
 			$langs->load('errors');
@@ -144,13 +142,24 @@ if (empty($reshook))
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount")), null, 'errors');
 			$error++;
 		}
-		// TODO Remove this and allow instead to edit a various payment to enter accounting code
+		if (empty($object->type_payment) || $object->type_payment < 0)
+		{
+			$langs->load('errors');
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PaymentMode")), null, 'errors');
+			$error++;
+		}
 		if (!empty($conf->accounting->enabled) && !$object->accountancy_code)
 		{
 			$langs->load('errors');
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountAccounting")), null, 'errors');
 			$error++;
 		}
+		if ($object->sens < 0)
+		{
+			$langs->load('errors');
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Sens")), null, 'errors');
+			$error++;
+		}
 
 		if (!$error)
 		{
@@ -211,9 +220,11 @@ if (empty($reshook))
 	}
 
 	if ($action == 'setsubledger_account') {
+		$db->begin();
+
 		$result = $object->fetch($id);
 
-		$object->subledger_account = (GETPOST("subledger_account") > 0 ? GETPOST("subledger_account", "alpha") : "");
+		$object->subledger_account = $subledger_account;
 
 		$res = $object->update($user);
 		if ($res > 0) {
@@ -225,6 +236,64 @@ if (empty($reshook))
 	}
 }
 
+// Action clone object
+if ($action == 'confirm_clone' && $confirm != 'yes') { $action = ''; }
+
+if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->banque->modifier))
+{
+	$db->begin();
+
+	$originalId = $id;
+
+	$object->fetch($id);
+
+	if ($object->id > 0)
+	{
+		$object->id = $object->ref = null;
+
+		if (GETPOST('clone_label', 'alphanohtml')) {
+			$object->label = GETPOST('clone_label', 'alphanohtml');
+		} else {
+			$object->label = $langs->trans("CopyOf").' '.$object->label;
+		}
+
+		$newdatepayment = dol_mktime(0, 0, 0, GETPOST('clone_date_paymentmonth', 'int'), GETPOST('clone_date_paymentday', 'int'), GETPOST('clone_date_paymentyear', 'int'));
+		$newdatevalue = dol_mktime(0, 0, 0, GETPOST('clone_date_valuemonth', 'int'), GETPOST('clone_date_valueday', 'int'), GETPOST('clone_date_valueyear', 'int'));
+		if ($newdatepayment) $object->datep = $newdatepayment;
+		if (!empty($newdatevalue)) {
+			$object->datev = $newdatevalue;
+		} else {
+			$object->datev = $newdatepayment;
+		}
+
+		if ($object->check())
+		{
+			$id = $object->create($user);
+			if ($id > 0)
+			{
+				$db->commit();
+				$db->close();
+
+				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+				exit;
+			} else {
+				$id = $originalId;
+				$db->rollback();
+
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		} else {
+			$id = $originalId;
+			$db->rollback();
+
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	} else {
+		$db->rollback();
+		dol_print_error($db, $object->error);
+	}
+}
+
 
 /*
  *	View
@@ -254,7 +323,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php';
 $bankcateg = new BankCateg($db);
 
 foreach ($bankcateg->fetchAll() as $bankcategory) {
-    $options[$bankcategory->id] = $bankcategory->label;
+	$options[$bankcategory->id] = $bankcategory->label;
 }
 
 /* ************************************************************************** */
@@ -271,7 +340,7 @@ if ($action == 'create')
 
 	print load_fiche_titre($langs->trans("NewVariousPayment"), '', 'object_payment');
 
-	dol_fiche_head('', '');
+	print dol_get_fiche_head('', '');
 
 	print '<table class="border centpercent">';
 
@@ -293,13 +362,6 @@ if ($action == 'create')
 	print '<input name="label" id="label" class="minwidth300 maxwidth150onsmartphone" value="'.($label ? $label : $langs->trans("VariousPayment")).'">';
 	print '</td></tr>';
 
-	// Sens
-	print '<tr><td>';
-	print $form->editfieldkey('Sens', 'sens', '', $object, 0, 'string', '', 1).'</td><td>';
-    $sensarray = array('0' => $langs->trans("Debit"), '1' => $langs->trans("Credit"));
-    print $form->selectarray('sens', $sensarray, $sens);
-	print '</td></tr>';
-
 	// Amount
 	print '<tr><td>';
 	print $form->editfieldkey('Amount', 'amount', '', $object, 0, 'string', '', 1).'</td><td>';
@@ -311,7 +373,7 @@ if ($action == 'create')
 	{
 		print '<tr><td>';
 		print $form->editfieldkey('BankAccount', 'selectaccountid', '', $object, 0, 'string', '', 1).'</td><td>';
-		$form->select_comptes($accountid, "accountid", 0, '', 1); // Affiche liste des comptes courant
+		$form->select_comptes($accountid, "accountid", 0, '', 2); // Affiche liste des comptes courant
 		print '</td></tr>';
 	}
 
@@ -331,76 +393,78 @@ if ($action == 'create')
 		print '<td><input name="num_payment" class="maxwidth150onsmartphone" id="num_payment" type="text" value="'.GETPOST("num_payment").'"></td></tr>'."\n";
 	}
 
-    // Project
-    if (!empty($conf->projet->enabled))
-    {
-        $formproject = new FormProjets($db);
-
-        // Associated project
-        $langs->load("projects");
-
-        print '<tr><td>'.$langs->trans("Project").'</td><td>';
-
-        $numproject = $formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1);
-
-        print '</td></tr>';
-    }
-
-    // Other attributes
-    $parameters = array();
-    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-
-    // Category
-    if (is_array($options) && count($options) && $conf->categorie->enabled)
-    {
-    	print '<tr><td>'.$langs->trans("RubriquesTransactions").'</td><td>';
-    	print Form::selectarray('category_transaction', $options, GETPOST('category_transaction'), 1);
-    	print '</td></tr>';
-    }
-
 	// Accountancy account
-	if (!empty($conf->accounting->enabled))
-	{
+	if (!empty($conf->accounting->enabled)) {
 		// TODO Remove the fieldrequired and allow instead to edit a various payment to enter accounting code
 		print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("AccountAccounting").'</td>';
-        print '<td>';
+		print '<td>';
 		print $formaccounting->select_account($accountancy_code, 'accountancy_code', 1, null, 1, 1);
-        print '</td></tr>';
-	} else // For external software
-	{
+		print '</td></tr>';
+	} else { // For external software
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("AccountAccounting").'</td>';
 		print '<td><input class="minwidth100 maxwidthonsmartphone" name="accountancy_code" value="'.$accountancy_code.'">';
 		print '</td></tr>';
 	}
 
-    // Subledger account
-    if (!empty($conf->accounting->enabled))
-    {
-        print '<tr><td>'.$langs->trans("SubledgerAccount").'</td>';
-        print '<td>';
-        if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
-        {
-            print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1, '');
-        } else {
-            print '<input type="text" class="maxwidth200 maxwidthonsmartphone" name="subledger_account" value="'.$subledger_account.'">';
-        }
-        print '</td></tr>';
-    } else // For external software
-    {
-        print '<tr><td>'.$langs->trans("SubledgerAccount").'</td>';
-        print '<td><input class="minwidth100 maxwidthonsmartphone" name="subledger_account" value="'.$subledger_account.'">';
-        print '</td></tr>';
-    }
+	// Subledger account
+	if (!empty($conf->accounting->enabled)) {
+		print '<tr><td>'.$langs->trans("SubledgerAccount").'aaaa</td>';
+		print '<td>';
+		if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
+			print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1, '');
+		} else {
+			print '<input type="text" class="maxwidth200 maxwidthonsmartphone" name="subledger_account" value="'.$subledger_account.'">';
+		}
+		print '</td></tr>';
+	} else { // For external software
+		print '<tr><td>'.$langs->trans("SubledgerAccount").'</td>';
+		print '<td><input class="minwidth100 maxwidthonsmartphone" name="subledger_account" value="'.$subledger_account.'">';
+		print '</td></tr>';
+	}
+
+	// Sens
+	print '<tr><td>';
+	$labelsens = $form->textwithpicto('Sens', $langs->trans("AccountingDirectionHelp"));
+	print $form->editfieldkey($labelsens, 'sens', '', $object, 0, 'string', '', 1).'</td><td>';
+	$sensarray = array('0' => $langs->trans("Debit"), '1' => $langs->trans("Credit"));
+	print $form->selectarray('sens', $sensarray, $sens, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100', 1);
+	print '</td></tr>';
+
+	// Project
+	if (!empty($conf->projet->enabled))
+	{
+		$formproject = new FormProjets($db);
+
+		// Associated project
+		$langs->load("projects");
+
+		print '<tr><td>'.$langs->trans("Project").'</td><td>';
+
+		$numproject = $formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1);
+
+		print '</td></tr>';
+	}
+
+	// Other attributes
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
+	// Category
+	if (is_array($options) && count($options) && $conf->categorie->enabled) {
+		print '<tr><td>'.$langs->trans("RubriquesTransactions").'</td><td>';
+		print img_picto('', 'category').Form::selectarray('category_transaction', $options, GETPOST('category_transaction'), 1, 0, 0, '', 0, 0, 0, '', 'minwidth300', 1);
+		print '</td></tr>';
+	}
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+	print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 	print ' &nbsp; ';
-	print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onclick="javascript:history.go(-1)">';
+	print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onclick="javascript:history.go(-1)">';
 	print '</div>';
 
 	print '</form>';
@@ -419,7 +483,20 @@ if ($id)
 
 	$head = various_payment_prepare_head($object);
 
-	dol_fiche_head($head, 'card', $langs->trans("VariousPayment"), -1, $object->picto);
+	// Clone confirmation
+	if ($action === 'clone')
+	{
+		$formquestion = array(
+			array('type' => 'text', 'name' => 'clone_label', 'label' => $langs->trans("Label"), 'value' => $langs->trans("CopyOf").' '.$object->label),
+		);
+		$formquestion[] = array('type' => 'date', 'tdclass'=>'fieldrequired', 'name' => 'clone_date_payment', 'label' => $langs->trans("DatePayment"), 'value' => -1);
+		$formquestion[] = array('type' => 'date', 'name' => 'clone_date_value', 'label' => $langs->trans("DateValue"), 'value' => -1);
+		$formquestion[] = array('type' => 'other', 'tdclass'=>'fieldrequired', 'name' => 'accountid', 'label' => $langs->trans("BankAccount"), 'value' => $form->select_comptes($accountid, "accountid", 0, '', 1));
+
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneVariousPayment', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 300);
+	}
+
+	print dol_get_fiche_head($head, 'card', $langs->trans("VariousPayment"), -1, $object->picto);
 
 	$morehtmlref = '<div class="refidno">';
 	// Project
@@ -498,12 +575,12 @@ if ($id)
 	}
 	print '</td></tr>';
 
-    // Subledger account
-    print '<tr><td class="nowrap">';
-    print $form->editfieldkey('SubledgerAccount', 'subledger_account', $object->subledger_account, $object, (!$alreadyaccounted && $user->rights->banque->modifier), 'string', '', 0);
-    print '</td><td>';
-    print $form->editfieldval('SubledgerAccount', 'subledger_account', $object->subledger_account, $object, (!$alreadyaccounted && $user->rights->banque->modifier), 'string', '', 0);
-    print '</td></tr>';
+	// Subledger account
+	print '<tr><td class="nowrap">';
+	print $form->editfieldkey('SubledgerAccount', 'subledger_account', $object->subledger_account, $object, (!$alreadyaccounted && $user->rights->banque->modifier), 'string', '', 0);
+	print '</td><td>';
+	print $form->editfieldval('SubledgerAccount', 'subledger_account', $object->subledger_account, $object, (!$alreadyaccounted && $user->rights->banque->modifier), 'string', '', 0);
+	print '</td></tr>';
 
 	if (!empty($conf->banque->enabled))
 	{
@@ -531,7 +608,7 @@ if ($id)
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	/*
@@ -542,6 +619,12 @@ if ($id)
 	// TODO
 	// Add button modify
 
+	// Clone
+	if ($user->rights->banque->modifier)
+	{
+		print '<div class="inline-block divButAction"><a class="butAction" href="'.dol_buildpath("/compta/bank/various_payment/card.php", 1).'?id='.$object->id.'&amp;action=clone">'.$langs->trans("ToClone")."</a></div>";
+	}
+
 	// Delete
 	if (empty($object->rappro))
 	{
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index 744daa939d5..14187bf51e3 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -83,7 +83,7 @@ if ($object->id)
 {
 	$head = various_payment_prepare_head($object);
 
-	dol_fiche_head($head, 'documents', $langs->trans("VariousPayment"), -1, $object->picto);
+	print dol_get_fiche_head($head, 'documents', $langs->trans("VariousPayment"), -1, $object->picto);
 
 	$morehtmlref = '<div class="refidno">';
 	// Project
@@ -143,7 +143,7 @@ if ($object->id)
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$modulepart = 'banque';
 	$permission = $user->rights->banque->modifier;
diff --git a/htdocs/compta/bank/various_payment/info.php b/htdocs/compta/bank/various_payment/info.php
index 05a7d28c8c8..5d401ede3c1 100644
--- a/htdocs/compta/bank/various_payment/info.php
+++ b/htdocs/compta/bank/various_payment/info.php
@@ -50,7 +50,7 @@ $object->info($id);
 
 $head = various_payment_prepare_head($object);
 
-dol_fiche_head($head, 'info', $langs->trans("VariousPayment"), -1, $object->picto);
+print dol_get_fiche_head($head, 'info', $langs->trans("VariousPayment"), -1, $object->picto);
 
 
 $morehtmlref = '<div class="refidno">';
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 54216f06358..48da6483152 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -67,7 +67,7 @@ $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortfield) $sortfield = "v.datep,v.rowid";
-if (!$sortorder) $sortorder = "DESC";
+if (!$sortorder) $sortorder = "DESC,DESC";
 
 $filtre = GETPOST("filtre", 'alpha');
 
@@ -490,9 +490,9 @@ if ($result)
 				print $accountstatic->getNomUrl(1);
 			} else {
 				print '&nbsp;';
-				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
 			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Bank entry
diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index b14b77d5264..ad88e928b6b 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -28,6 +28,7 @@
  */
 
 require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/cashcontrol/class/cashcontrol.class.php';
 
@@ -58,7 +59,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'thi
 
 if ($contextpage == 'takepos')
 {
-    $_GET['optioncss'] = 'print';
+	$_GET['optioncss'] = 'print';
 }
 
 // Security check
@@ -163,8 +164,8 @@ if ($action == "start")
 		$object->month_close = GETPOST('closemonth', 'int');
 		$object->year_close = GETPOST('closeyear', 'int');
 
-	    $object->opening = price2num(GETPOST('opening', 'alpha'));
-	    $object->posmodule = GETPOST('posmodule', 'alpha');
+		$object->opening = price2num(GETPOST('opening', 'alpha'));
+		$object->posmodule = GETPOST('posmodule', 'alpha');
 		$object->posnumber = GETPOST('posnumber', 'alpha');
 
 		$db->begin();
@@ -225,32 +226,32 @@ if ($action == "valid")	// validate = close
 		</script>";
 		exit;
 	}
-    $action = "view";
+	$action = "view";
 }
 
 // Action to delete
 if ($action == 'confirm_delete' && !empty($permissiontodelete))
 {
-    $object->fetch($id);
+	$object->fetch($id);
 
-    if (!($object->id > 0))
-    {
-        dol_print_error('', 'Error, object must be fetched before being deleted');
-        exit;
-    }
+	if (!($object->id > 0))
+	{
+		dol_print_error('', 'Error, object must be fetched before being deleted');
+		exit;
+	}
 
-    $result = $object->delete($user);
-    //var_dump($result);
-    if ($result > 0)
-    {
-        // Delete OK
-        setEventMessages("RecordDeleted", null, 'mesgs');
-        header("Location: ".$backurlforlist);
-        exit;
-    } else {
-        if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-        else setEventMessages($object->error, null, 'errors');
-    }
+	$result = $object->delete($user);
+	//var_dump($result);
+	if ($result > 0)
+	{
+		// Delete OK
+		setEventMessages("RecordDeleted", null, 'mesgs');
+		header("Location: ".$backurlforlist);
+		exit;
+	} else {
+		if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+		else setEventMessages($object->error, null, 'errors');
+	}
 }
 
 
@@ -306,22 +307,22 @@ if ($action == "create" || $action == "start" || $action == 'close')
 
 			if ($bankid > 0)
 			{
-    			$sql = "SELECT SUM(amount) as total FROM ".MAIN_DB_PREFIX."bank";
-    			$sql .= " WHERE fk_account = ".$bankid;
-    			if ($syear && !$smonth)              $sql .= " AND dateo < '".$db->idate(dol_get_first_day($syear, 1))."'";
-    			elseif ($syear && $smonth && !$sday) $sql .= " AND dateo < '".$db->idate(dol_get_first_day($syear, $smonth))."'";
-    			elseif ($syear && $smonth && $sday)  $sql .= " AND dateo < '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."'";
-    			else dol_print_error('', 'Year not defined');
+				$sql = "SELECT SUM(amount) as total FROM ".MAIN_DB_PREFIX."bank";
+				$sql .= " WHERE fk_account = ".$bankid;
+				if ($syear && !$smonth)              $sql .= " AND dateo < '".$db->idate(dol_get_first_day($syear, 1))."'";
+				elseif ($syear && $smonth && !$sday) $sql .= " AND dateo < '".$db->idate(dol_get_first_day($syear, $smonth))."'";
+				elseif ($syear && $smonth && $sday)  $sql .= " AND dateo < '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."'";
+				else dol_print_error('', 'Year not defined');
 
-    			$resql = $db->query($sql);
-    			if ($resql)
-    			{
-    				$obj = $db->fetch_object($resql);
-    				if ($obj) $initialbalanceforterminal[$terminalid][$key] = $obj->total;
-    			} else dol_print_error($db);
+				$resql = $db->query($sql);
+				if ($resql)
+				{
+					$obj = $db->fetch_object($resql);
+					if ($obj) $initialbalanceforterminal[$terminalid][$key] = $obj->total;
+				} else dol_print_error($db);
 			} else {
 				setEventMessages($langs->trans("SetupOfTerminalNotComplete", $terminaltouse), null, 'errors');
-			    $error++;
+				$error++;
 			}
 		}
 
@@ -369,50 +370,50 @@ if ($action == "create" || $action == "start" || $action == 'close')
 		print load_fiche_titre($langs->trans("CashControl")." - ".$langs->trans("New"), '', 'cash-register');
 
 		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	    print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 		if ($contextpage == 'takepos') print '<input type="hidden" name="contextpage" value="takepos">';
-	    if ($action == 'start' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '-1')
-	    {
-		    print '<input type="hidden" name="action" value="add">';
-	    } elseif ($action == 'close')
-	    {
-	    	print '<input type="hidden" name="action" value="valid">';
+		if ($action == 'start' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '-1')
+		{
+			print '<input type="hidden" name="action" value="add">';
+		} elseif ($action == 'close')
+		{
+			print '<input type="hidden" name="action" value="valid">';
 			print '<input type="hidden" name="id" value="'.$id.'">';
-	    } else {
-	    	print '<input type="hidden" name="action" value="start">';
-	    }
+		} else {
+			print '<input type="hidden" name="action" value="start">';
+		}
 
-	    print '<div class="div-table-responsive-no-min">';
-	    print '<table class="noborder centpercent">';
-	    print '<tr class="liste_titre">';
-	    print '<td>'.$langs->trans("Module").'</td>';
-	    print '<td>'.$langs->trans("Terminal").'</td>';
-	    print '<td>'.$langs->trans("Year").'</td>';
-	    print '<td>'.$langs->trans("Month").'</td>';
-	    print '<td>'.$langs->trans("Day").'</td>';
-	    print '<td></td>';
-	    print "</tr>\n";
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("Module").'</td>';
+		print '<td>'.$langs->trans("Terminal").'</td>';
+		print '<td>'.$langs->trans("Year").'</td>';
+		print '<td>'.$langs->trans("Month").'</td>';
+		print '<td>'.$langs->trans("Day").'</td>';
+		print '<td></td>';
+		print "</tr>\n";
 
 		$disabled = 0;
 		$prefix = 'close';
 
-	    print '<tr class="oddeven">';
-	    print '<td>'.$form->selectarray('posmodule', $arrayofposavailable, GETPOST('posmodule', 'alpha'), (count($arrayofposavailable) > 1 ? 1 : 0)).'</td>';
-	    print '<td>';
+		print '<tr class="oddeven">';
+		print '<td>'.$form->selectarray('posmodule', $arrayofposavailable, GETPOST('posmodule', 'alpha'), (count($arrayofposavailable) > 1 ? 1 : 0)).'</td>';
+		print '<td>';
 
-	    $array = array();
-	    $numterminals = max(1, $conf->global->TAKEPOS_NUM_TERMINALS);
-	    for ($i = 1; $i <= $numterminals; $i++) {
-	    	$array[$i] = $i;
-	    }
-	    $selectedposnumber = 0; $showempty = 1;
-	    if ($conf->global->TAKEPOS_NUM_TERMINALS == '1')
-	    {
-	        $selectedposnumber = 1; $showempty = 0;
-	    }
-	    print $form->selectarray('posnumber', $array, GETPOSTISSET('posnumber') ?GETPOST('posnumber', 'int') : $selectedposnumber, $showempty);
-	    //print '<input name="posnumber" type="text" class="maxwidth50" value="'.(GETPOSTISSET('posnumber')?GETPOST('posnumber', 'alpha'):'0').'">';
-	    print '</td>';
+		$array = array();
+		$numterminals = max(1, $conf->global->TAKEPOS_NUM_TERMINALS);
+		for ($i = 1; $i <= $numterminals; $i++) {
+			$array[$i] = $i;
+		}
+		$selectedposnumber = 0; $showempty = 1;
+		if ($conf->global->TAKEPOS_NUM_TERMINALS == '1')
+		{
+			$selectedposnumber = 1; $showempty = 0;
+		}
+		print $form->selectarray('posnumber', $array, GETPOSTISSET('posnumber') ?GETPOST('posnumber', 'int') : $selectedposnumber, $showempty);
+		//print '<input name="posnumber" type="text" class="maxwidth50" value="'.(GETPOSTISSET('posnumber')?GETPOST('posnumber', 'alpha'):'0').'">';
+		print '</td>';
 		// Year
 		print '<td>';
 		$retstring = '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth75imp" id="'.$prefix.'year" name="'.$prefix.'year">';
@@ -566,8 +567,8 @@ if ($action == "create" || $action == "start" || $action == 'close')
 			}*/
 			// Save
 			print '<td class="center">';
-			print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
-			if ($action == 'start') print '<input type="submit" name="add" class="button" value="'.$langs->trans("Save").'">';
+			print '<input type="submit" name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'">';
+			if ($action == 'start') print '<input type="submit" name="add" class="button button-save" value="'.$langs->trans("Save").'">';
 			elseif ($action == 'close') print '<input type="submit" name="valid" class="button" value="'.$langs->trans("Validate").'">';
 			print '</td>';
 			print '</tr>';
@@ -576,36 +577,36 @@ if ($action == "create" || $action == "start" || $action == 'close')
 			print '</div>';
 		}
 
-	    print '</form>';
+		print '</form>';
 	}
 }
 
 if (empty($action) || $action == "view" || $action == "close")
 {
-    $result = $object->fetch($id);
+	$result = $object->fetch($id);
 
-    llxHeader('', $langs->trans("CashControl"));
+	llxHeader('', $langs->trans("CashControl"));
 
-    if ($result <= 0) {
-    	print $langs->trans("ErrorRecordNotFound");
-    } else {
-    	$head = array();
-    	$head[0][0] = DOL_URL_ROOT.'/compta/cashcontrol/cashcontrol_card.php?id='.$object->id;
-    	$head[0][1] = $langs->trans("CashControl");
-    	$head[0][2] = 'cashcontrol';
+	if ($result <= 0) {
+		print $langs->trans("ErrorRecordNotFound");
+	} else {
+		$head = array();
+		$head[0][0] = DOL_URL_ROOT.'/compta/cashcontrol/cashcontrol_card.php?id='.$object->id;
+		$head[0][1] = $langs->trans("CashControl");
+		$head[0][2] = 'cashcontrol';
 
-	    dol_fiche_head($head, 'cashcontrol', $langs->trans("CashControl"), -1, 'account');
+		print dol_get_fiche_head($head, 'cashcontrol', $langs->trans("CashControl"), -1, 'account');
 
-    	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/cashcontrol/cashcontrol_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/cashcontrol/cashcontrol_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-	    $morehtmlref = '<div class="refidno">';
-	    $morehtmlref .= '</div>';
+		$morehtmlref = '<div class="refidno">';
+		$morehtmlref .= '</div>';
 
 
-	    dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref);
+		dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref);
 
-	    print '<div class="fichecenter">';
-	    print '<div class="fichehalfleft">';
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
 		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border tableforfield" width="100%">';
 
@@ -632,36 +633,36 @@ if (empty($action) || $action == "view" || $action == "close")
 		print '</td></tr>';
 
 		print '</table>';
-	    print '</div>';
+		print '</div>';
 
-	    print '<div class="fichehalfright"><div class="ficheaddleft">';
+		print '<div class="fichehalfright"><div class="ficheaddleft">';
 		print '<div class="underbanner clearboth"></div>';
-	    print '<table class="border tableforfield" width="100%">';
+		print '<table class="border tableforfield" width="100%">';
 
-	    print '<tr><td class="titlefield nowrap">';
-	    print $langs->trans("DateCreationShort");
-	    print '</td><td>';
-	    print dol_print_date($object->date_creation, 'dayhour');
-	    print '</td></tr>';
+		print '<tr><td class="titlefield nowrap">';
+		print $langs->trans("DateCreationShort");
+		print '</td><td>';
+		print dol_print_date($object->date_creation, 'dayhour');
+		print '</td></tr>';
 
-	    print '<tr><td valign="middle">'.$langs->trans("InitialBankBalance").' - '.$langs->trans("Cash").'</td><td>';
-	    print price($object->opening, 0, $langs, 1, -1, -1, $conf->currency);
-	    print "</td></tr>";
-	    foreach ($arrayofpaymentmode as $key => $val)
-	    {
-	        print '<tr><td valign="middle">'.$langs->trans($val).'</td><td>';
-	    	print price($object->$key, 0, $langs, 1, -1, -1, $conf->currency);
-	    	print "</td></tr>";
-	    }
+		print '<tr><td valign="middle">'.$langs->trans("InitialBankBalance").' - '.$langs->trans("Cash").'</td><td>';
+		print price($object->opening, 0, $langs, 1, -1, -1, $conf->currency);
+		print "</td></tr>";
+		foreach ($arrayofpaymentmode as $key => $val)
+		{
+			print '<tr><td valign="middle">'.$langs->trans($val).'</td><td>';
+			print price($object->$key, 0, $langs, 1, -1, -1, $conf->currency);
+			print "</td></tr>";
+		}
 
 		print "</table>\n";
-	    print '</div>';
-	    print '</div></div>';
-	    print '<div style="clear:both"></div>';
+		print '</div>';
+		print '</div></div>';
+		print '<div style="clear:both"></div>';
 
-	    dol_fiche_end();
+		print dol_get_fiche_end();
 
-	    if ($action != 'close') {
+		if ($action != 'close') {
 			print '<div class="tabsAction">';
 
 			print '<div class="inline-block divButAction"><a target="_blank" class="butAction" href="report.php?id='.$id.'">'.$langs->trans('PrintTicket').'</a></div>';
@@ -678,22 +679,22 @@ if (empty($action) || $action == "view" || $action == "close")
 			print '</div>';
 
 			if ($contextpage != 'takepos') print '<center><iframe src="report.php?id='.$id.'" width="60%" height="800"></iframe></center>';
-	    } else {
-	    	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'" name="formclose">';
-	    	print '<input type="hidden" name="token" value="'.newToken().'">';
+		} else {
+			print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'" name="formclose">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
 			if ($contextpage == 'takepos') print '<input type="hidden" name="contextpage" value="takepos">';
-	    	if ($action == 'start' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '-1')
-	    	{
-	    		print '<input type="hidden" name="action" value="add">';
-	    	} elseif ($action == 'close')
-	    	{
-	    		print '<input type="hidden" name="action" value="valid">';
-	    		print '<input type="hidden" name="id" value="'.$id.'">';
-	    	} else {
-	    		print '<input type="hidden" name="action" value="start">';
-	    	}
+			if ($action == 'start' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '-1')
+			{
+				print '<input type="hidden" name="action" value="add">';
+			} elseif ($action == 'close')
+			{
+				print '<input type="hidden" name="action" value="valid">';
+				print '<input type="hidden" name="id" value="'.$id.'">';
+			} else {
+				print '<input type="hidden" name="action" value="start">';
+			}
 
-	    	/*
+			/*
 	    	print '<div class="div-table-responsive-no-min">';
 	    	print '<table class="noborder centpercent">';
 	    	print '<tr class="liste_titre">';
@@ -744,127 +745,127 @@ if (empty($action) || $action == "view" || $action == "close")
 	    	print '</div>';
 	    	*/
 
-	    	// Table to see/enter balance
-	    	if (($action == 'start' && GETPOST('posnumber') != '' && GETPOST('posnumber') != '' && GETPOST('posnumber') != '-1') || $action == 'close')
-	    	{
-	    		$posmodule = $object->posmodule;
-	    		$terminalid = $object->posnumber;
+			// Table to see/enter balance
+			if (($action == 'start' && GETPOST('posnumber') != '' && GETPOST('posnumber') != '' && GETPOST('posnumber') != '-1') || $action == 'close')
+			{
+				$posmodule = $object->posmodule;
+				$terminalid = $object->posnumber;
 
-	    		print '<br>';
+				print '<br>';
 
-	    		print '<div class="div-table-responsive-no-min">';
-	    		print '<table class="noborder centpercent">';
+				print '<div class="div-table-responsive-no-min">';
+				print '<table class="noborder centpercent">';
 
-	    		print '<tr class="liste_titre">';
-	    		print '<td></td>';
-	    		print '<td class="center">'.$langs->trans("InitialBankBalance");
-	    		//print '<br>'.$langs->trans("TheoricalAmount").'<br>'.$langs->trans("RealAmount");
-	    		print '</td>';
+				print '<tr class="liste_titre">';
+				print '<td></td>';
+				print '<td class="center">'.$langs->trans("InitialBankBalance");
+				//print '<br>'.$langs->trans("TheoricalAmount").'<br>'.$langs->trans("RealAmount");
+				print '</td>';
 
-	    		print '<td align="center" class="hide0" colspan="'.count($arrayofpaymentmode).'">';
-	    		print $langs->trans("AmountAtEndOfPeriod");
-	    		print '</td>';
-	    		print '<td></td>';
-	    		print '</tr>';
+				print '<td align="center" class="hide0" colspan="'.count($arrayofpaymentmode).'">';
+				print $langs->trans("AmountAtEndOfPeriod");
+				print '</td>';
+				print '<td></td>';
+				print '</tr>';
 
-	    		print '<tr class="liste_titre">';
-	    		print '<td></td>';
-	    		print '<td class="center">'.$langs->trans("Cash");
-	    		//print '<br>'.$langs->trans("TheoricalAmount").'<br>'.$langs->trans("RealAmount");
-	    		print '</td>';
-	    		$i = 0;
-	    		foreach ($arrayofpaymentmode as $key => $val)
-	    		{
-	    			print '<td align="center"'.($i == 0 ? ' class="hide0"' : '').'>'.$langs->trans($val);
-	    			//print '<br>'.$langs->trans("TheoricalAmount").'<br>'.$langs->trans("RealAmount");
-	    			print '</td>';
-	    			$i++;
-	    		}
-	    		print '<td></td>';
-	    		print '</tr>';
+				print '<tr class="liste_titre">';
+				print '<td></td>';
+				print '<td class="center">'.$langs->trans("Cash");
+				//print '<br>'.$langs->trans("TheoricalAmount").'<br>'.$langs->trans("RealAmount");
+				print '</td>';
+				$i = 0;
+				foreach ($arrayofpaymentmode as $key => $val)
+				{
+					print '<td align="center"'.($i == 0 ? ' class="hide0"' : '').'>'.$langs->trans($val);
+					//print '<br>'.$langs->trans("TheoricalAmount").'<br>'.$langs->trans("RealAmount");
+					print '</td>';
+					$i++;
+				}
+				print '<td></td>';
+				print '</tr>';
 
-	    		print '<tr>';
-	    		// Initial amount
-	    		print '<td>'.$langs->trans("NbOfInvoices").'</td>';
-	    		print '<td class="center">';
-	    		print '</td>';
-	    		// Amount per payment type
-	    		$i = 0;
-	    		foreach ($arrayofpaymentmode as $key => $val)
-	    		{
-	    			print '<td align="center"'.($i == 0 ? ' class="hide0"' : '').'>';
-	    			print $theoricalnbofinvoiceforterminal[$terminalid][$key];
-	    			print '</td>';
-	    			$i++;
-	    		}
-	    		// Save
-	    		print '<td align="center"></td>';
-	    		print '</tr>';
+				print '<tr>';
+				// Initial amount
+				print '<td>'.$langs->trans("NbOfInvoices").'</td>';
+				print '<td class="center">';
+				print '</td>';
+				// Amount per payment type
+				$i = 0;
+				foreach ($arrayofpaymentmode as $key => $val)
+				{
+					print '<td align="center"'.($i == 0 ? ' class="hide0"' : '').'>';
+					print $theoricalnbofinvoiceforterminal[$terminalid][$key];
+					print '</td>';
+					$i++;
+				}
+				// Save
+				print '<td align="center"></td>';
+				print '</tr>';
 
-	    		print '<tr>';
-	    		// Initial amount
-	    		print '<td>'.$langs->trans("TheoricalAmount").'</td>';
-	    		print '<td class="center">';
-	    		print price($initialbalanceforterminal[$terminalid]['cash']).'<br>';
-	    		print '</td>';
-	    		// Amount per payment type
-	    		$i = 0;
-	    		foreach ($arrayofpaymentmode as $key => $val)
-	    		{
-	    			print '<td align="center"'.($i == 0 ? ' class="hide0"' : '').'>';
-	    			if ($key == 'cash') {
-	    				$deltaforcash = ($object->opening - $initialbalanceforterminal[$terminalid]['cash']);
-	    				print price($theoricalamountforterminal[$terminalid][$key] + $deltaforcash).'<br>';
-	    			} else {
-	    				print price($theoricalamountforterminal[$terminalid][$key]).'<br>';
-	    			}
-	    			print '</td>';
-	    			$i++;
-	    		}
-	    		// Save
-	    		print '<td align="center"></td>';
-	    		print '</tr>';
+				print '<tr>';
+				// Initial amount
+				print '<td>'.$langs->trans("TheoricalAmount").'</td>';
+				print '<td class="center">';
+				print price($initialbalanceforterminal[$terminalid]['cash']).'<br>';
+				print '</td>';
+				// Amount per payment type
+				$i = 0;
+				foreach ($arrayofpaymentmode as $key => $val)
+				{
+					print '<td align="center"'.($i == 0 ? ' class="hide0"' : '').'>';
+					if ($key == 'cash') {
+						$deltaforcash = ($object->opening - $initialbalanceforterminal[$terminalid]['cash']);
+						print price($theoricalamountforterminal[$terminalid][$key] + $deltaforcash).'<br>';
+					} else {
+						print price($theoricalamountforterminal[$terminalid][$key]).'<br>';
+					}
+					print '</td>';
+					$i++;
+				}
+				// Save
+				print '<td align="center"></td>';
+				print '</tr>';
 
-	    		print '<tr>';
-	    		print '<td>'.$langs->trans("RealAmount").'</td>';
-	    		// Initial amount
-	    		print '<td class="center">';
-	    		print '<input ';
-	    		if ($action == 'close') print 'disabled '; // To close cash user can't set opening cash
-	    		print 'name="opening" type="text" class="maxwidth100 center" value="';
-	    		if ($action == 'close')
-	    		{
-	    			$object->fetch($id);
-	    			print $object->opening;
-	    		} else print (GETPOSTISSET('opening') ?price2num(GETPOST('opening', 'alpha')) : price($initialbalanceforterminal[$terminalid]['cash']));
-	    		print '">';
-	    		print '</td>';
-	    		// Amount per payment type
-	    		$i = 0;
-	    		foreach ($arrayofpaymentmode as $key => $val)
-	    		{
-	    			print '<td align="center"'.($i == 0 ? ' class="hide0"' : '').'>';
-	    			print '<input ';
-	    			if ($action == 'start') print 'disabled '; // To start cash user only can set opening cash
-	    			print 'name="'.$key.'_amount" type="text"'.($key == 'cash' ? ' autofocus' : '').' class="maxwidth100 center" value="'.GETPOST($key.'_amount', 'alpha').'">';
-	    			print '</td>';
-	    			$i++;
-	    		}
-	    		// Save
-	    		print '<td class="center">';
-	    		print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
-	    		if ($action == 'start') print '<input type="submit" name="add" class="button" value="'.$langs->trans("Save").'">';
-	    		elseif ($action == 'close') print '<input type="submit" name="valid" class="button" value="'.$langs->trans("Close").'">';
-	    		print '</td>';
-	    		print '</tr>';
+				print '<tr>';
+				print '<td>'.$langs->trans("RealAmount").'</td>';
+				// Initial amount
+				print '<td class="center">';
+				print '<input ';
+				if ($action == 'close') print 'disabled '; // To close cash user can't set opening cash
+				print 'name="opening" type="text" class="maxwidth100 center" value="';
+				if ($action == 'close')
+				{
+					$object->fetch($id);
+					print $object->opening;
+				} else print (GETPOSTISSET('opening') ?price2num(GETPOST('opening', 'alpha')) : price($initialbalanceforterminal[$terminalid]['cash']));
+				print '">';
+				print '</td>';
+				// Amount per payment type
+				$i = 0;
+				foreach ($arrayofpaymentmode as $key => $val)
+				{
+					print '<td align="center"'.($i == 0 ? ' class="hide0"' : '').'>';
+					print '<input ';
+					if ($action == 'start') print 'disabled '; // To start cash user only can set opening cash
+					print 'name="'.$key.'_amount" type="text"'.($key == 'cash' ? ' autofocus' : '').' class="maxwidth100 center" value="'.GETPOST($key.'_amount', 'alpha').'">';
+					print '</td>';
+					$i++;
+				}
+				// Save
+				print '<td class="center">';
+				print '<input type="submit" name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'">';
+				if ($action == 'start') print '<input type="submit" name="add" class="button button-save" value="'.$langs->trans("Save").'">';
+				elseif ($action == 'close') print '<input type="submit" name="valid" class="button" value="'.$langs->trans("Close").'">';
+				print '</td>';
+				print '</tr>';
 
-	    		print '</table>';
-	    		print '</div>';
-	    	}
+				print '</table>';
+				print '</div>';
+			}
 
-	    	print '</form>';
-	    }
-    }
+			print '</form>';
+		}
+	}
 }
 
 // End of page
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index 2adf3a01a83..fdc3e57bdba 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -343,7 +343,7 @@ print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sort
 $topicmail = "SendCashControlRef";
 $modelmail = "cashcontrol";
 $objecttmp = new CashControl($db);
-$trackid = 'xxxx'.$object->id;
+$trackid = 'cashfence'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($sall)
@@ -390,7 +390,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		else print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
index 0f60be3c3a8..842322f7f20 100644
--- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php
+++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file       cashcontrol/class/cashcontrol.class.php
+ * \file       htdocs/compta/cashcontrol/class/cashcontrol.class.php
  * \ingroup    cashdesk|takepos
  * \brief      This file is CRUD class file (Create/Read/Update/Delete) for cash fence table
  */
@@ -66,8 +66,8 @@ class CashControl extends CommonObject
 	'cash' =>array('type'=>'price', 'label'=>'Cash', 'enabled'=>1, 'visible'=>1, 'position'=>30),
 	'cheque' =>array('type'=>'price', 'label'=>'Cheque', 'enabled'=>1, 'visible'=>1, 'position'=>33),
 	'card' =>array('type'=>'price', 'label'=>'CreditCard', 'enabled'=>1, 'visible'=>1, 'position'=>36),
-    'year_close' =>array('type'=>'integer', 'label'=>'Year close', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>50, 'css'=>'center'),
-    'month_close' =>array('type'=>'integer', 'label'=>'Month close', 'enabled'=>1, 'visible'=>1, 'position'=>55, 'css'=>'center'),
+	'year_close' =>array('type'=>'integer', 'label'=>'Year close', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>50, 'css'=>'center'),
+	'month_close' =>array('type'=>'integer', 'label'=>'Month close', 'enabled'=>1, 'visible'=>1, 'position'=>55, 'css'=>'center'),
 	'day_close' =>array('type'=>'integer', 'label'=>'Day close', 'enabled'=>1, 'visible'=>1, 'position'=>60, 'css'=>'center'),
 	'date_valid' =>array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>490),
 	'date_creation' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>500),
@@ -76,6 +76,9 @@ class CashControl extends CommonObject
 	'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Brouillon', '1'=>'Validated')),
 	);
 
+	/**
+	 * @var int Object Id
+	 */
 	public $id;
 	public $opening;
 	public $status;
@@ -94,8 +97,8 @@ class CashControl extends CommonObject
 	public $date_valid;
 
 	/**
-     * @var integer|string date_creation
-     */
+	 * @var integer|string date_creation
+	 */
 	public $date_creation;
 
 	/**
@@ -286,7 +289,7 @@ class CashControl extends CommonObject
 	public function fetch($id, $ref = null)
 	{
 		$result = $this->fetchCommon($id, $ref);
-		if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
+		//if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
 		return $result;
 	}
 
@@ -311,8 +314,8 @@ class CashControl extends CommonObject
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
-	    return $this->deleteCommon($user, $notrigger);
-	    //return $this->deleteCommon($user, $notrigger, 1);
+		return $this->deleteCommon($user, $notrigger);
+		//return $this->deleteCommon($user, $notrigger, 1);
 	}
 
 	/**
@@ -357,10 +360,10 @@ class CashControl extends CommonObject
 	 *  Return clicable link of object (with eventually picto)
 	 *
 	 *  @param  int     $withpicto                  Add picto into link
-     *  @param  string  $option                     On what the link point to ('nolink', ...)
-     *  @param  int     $notooltip                  1=Disable tooltip
-     *  @param  string  $morecss                    Add more css on link
-     *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param  string  $option                     On what the link point to ('nolink', ...)
+	 *  @param  int     $notooltip                  1=Disable tooltip
+	 *  @param  string  $morecss                    Add more css on link
+	 *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *  @return string                              String with URL
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
@@ -381,24 +384,24 @@ class CashControl extends CommonObject
 
 		if ($option != 'nolink')
 		{
-		    // Add param to save lastsearch_values or not
-		    $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-		    if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-		    if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
 		}
 
 		$linkclose = '';
 		if (empty($notooltip))
 		{
-		    if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-		    {
-		        $label = $langs->trans("ShowMyObject");
-		        $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-		    }
-		    $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-		    $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowMyObject");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 
-		    /*
+			/*
 		     $hookmanager->initHooks(array('myobjectdao'));
 		     $parameters=array('id'=>$this->id);
 		     $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
@@ -420,8 +423,10 @@ class CashControl extends CommonObject
 		$hookmanager->initHooks(array('cashfencedao'));
 		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) { $result = $hookmanager->resPrint;
-		} else { $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
 		}
 
 		return $result;
diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index 02299788794..515067900e3 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2002  Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2016  Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2020  Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010  Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012       Vinícius Nogueira    <viniciusvgn@gmail.com>
  * Copyright (C) 2014       Florian Henry        <florian.henry@open-cooncept.pro>
@@ -29,13 +29,16 @@
  *	\brief      List of bank transactions
  */
 
+if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1'); // If there is no need to load and show top and left menu
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1'); // Disable browser notification
+
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/cashcontrol/class/cashcontrol.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/cashcontrol/class/cashcontrol.class.php';
 
-$langs->load("bills");
+$langs->loadLangs(array("bills", "banks"));
 
 $id = GETPOST('id', 'int');
 
@@ -49,13 +52,13 @@ $sortorder = 'ASC';
 $sortfield = 'b.datev,b.dateo,b.rowid';
 
 $arrayfields = array(
-    'b.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-    'b.dateo'=>array('label'=>$langs->trans("DateOperationShort"), 'checked'=>1),
-    'b.num_chq'=>array('label'=>$langs->trans("Number"), 'checked'=>1),
-    'ba.ref'=>array('label'=>$langs->trans("BankAccount"), 'checked'=>1),
-    'cp.code'=>array('label'=>$langs->trans("PaymentMode"), 'checked'=>1),
+	'b.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+	'b.dateo'=>array('label'=>$langs->trans("DateOperationShort"), 'checked'=>1),
+	'b.num_chq'=>array('label'=>$langs->trans("Number"), 'checked'=>1),
+	'ba.ref'=>array('label'=>$langs->trans("BankAccount"), 'checked'=>1),
+	'cp.code'=>array('label'=>$langs->trans("PaymentMode"), 'checked'=>1),
 	'b.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1, 'position'=>600),
-    'b.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1, 'position'=>605),
+	'b.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1, 'position'=>605),
 );
 
 $syear  = $cashcontrol->year_close;
@@ -122,13 +125,13 @@ elseif ($syear && $smonth && $sday)   $sql .= " AND datef BETWEEN '".$db->idate(
 else dol_print_error('', 'Year not defined');
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
+	print "<!-- title of cash fence -->\n";
 	print "<center><h2>";
-	if ($cashcontrol->status == 2) print $langs->trans("CashControl")." ".$cashcontrol->id;
+	if ($cashcontrol->status != $cashcontrol::STATUS_DRAFT) print $langs->trans("CashControl")." ".$cashcontrol->id;
 	else print $langs->trans("CashControl")." - ".$langs->trans("Draft");
 	print "<br>".$langs->trans("DateCreationShort").": ".dol_print_date($cashcontrol->date_creation, 'dayhour')."</h2></center>";
 
@@ -138,10 +141,10 @@ if ($resql)
 	print $langs->trans("InitialBankBalance").' - '.$langs->trans("Cash")." : ".price($cashcontrol->opening);
 	print "</h2></div>";
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste">'."\n";
 
-    $param = '';
+	$param = '';
 
 	// Fields title
 	print '<tr class="liste_titre">';
@@ -159,26 +162,24 @@ if ($resql)
 	$sign = 1;
 	$cash = $bank = $cheque = $other = 0;
 
-    $totalarray = array();
-    $cachebankaccount = array();
-    $amountpertype = array();
-    while ($i < $num)
-    {
-        $objp = $db->fetch_object($resql);
+	$totalarray = array();
+	$cachebankaccount = array();
+	$amountpertype = array();
+	while ($i < $num) {
+		$objp = $db->fetch_object($resql);
 
-        if (empty($cachebankaccount[$objp->bankid]))
-        {
-            $bankaccounttmp = new Account($db);
-            $bankaccounttmp->fetch($objp->bankid);
-            $cachebankaccount[$objp->bankid] = $bankaccounttmp;
-            $bankaccount = $bankaccounttmp;
-        } else {
-            $bankaccount = $cachebankaccount[$objp->bankid];
-        }
+		if (empty($cachebankaccount[$objp->bankid])) {
+			$bankaccounttmp = new Account($db);
+			$bankaccounttmp->fetch($objp->bankid);
+			$cachebankaccount[$objp->bankid] = $bankaccounttmp;
+			$bankaccount = $bankaccounttmp;
+		} else {
+			$bankaccount = $cachebankaccount[$objp->bankid];
+		}
 
-        $invoicetmp->fetch($objp->facid);
+		$invoicetmp->fetch($objp->facid);
 
-        /*if ($first == "yes")
+		/*if ($first == "yes")
 		{
 			print '<tr class="oddeven">';
 			print '<td>'.$langs->trans("InitialBankBalance").' - '.$langs->trans("Cash").'</td>';
@@ -190,19 +191,19 @@ if ($resql)
 		print '<tr class="oddeven">';
 
 		// Ref
-        print '<td class="nowrap left">';
-        print $invoicetmp->getNomUrl(1);
-        print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+		print '<td class="nowrap left">';
+		print $invoicetmp->getNomUrl(1);
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
 
-        // Date ope
-    	print '<td class="nowrap left">';
-    	print '<span id="dateoperation_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->do), "day")."</span>";
-    	print "</td>\n";
-        if (!$i) $totalarray['nbfield']++;
+		// Date ope
+		print '<td class="nowrap left">';
+		print '<span id="dateoperation_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->do), "day")."</span>";
+		print "</td>\n";
+		if (!$i) $totalarray['nbfield']++;
 
-    	// Bank account
-        print '<td class="nowrap right">';
+		// Bank account
+		print '<td class="nowrap right">';
 		print $bankaccount->getNomUrl(1);
 		if ($cashcontrol->posmodule == "takepos") {
 			$var1 = 'CASHDESK_ID_BANKACCOUNT_CASH'.$cashcontrol->posnumber;
@@ -220,38 +221,36 @@ if ($resql)
 			else $other += $objp->amount;
 		}
 		print "</td>\n";
-        if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 
-        // Type
-        print '<td class="right">';
-       	print $objp->code;
-       	if (empty($amountpertype[$objp->code])) $amountpertype[$objp->code] = 0;
-        print "</td>\n";
-        if (!$i) $totalarray['nbfield']++;
+		// Type
+		print '<td class="right">';
+	   	print $objp->code;
+	   	if (empty($amountpertype[$objp->code])) $amountpertype[$objp->code] = 0;
+		print "</td>\n";
+		if (!$i) $totalarray['nbfield']++;
 
-        // Debit
-    	print '<td class="right">';
-    	if ($objp->amount < 0)
-    	{
-    	    print price($objp->amount * -1);
-    	    $totalarray['val']['totaldebfield'] += $objp->amount;
-    	    $amountpertype[$objp->code] += $objp->amount;
-    	}
-    	print "</td>\n";
-    	if (!$i) $totalarray['nbfield']++;
-    	if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totaldebfield';
+		// Debit
+		print '<td class="right">';
+		if ($objp->amount < 0) {
+			print price($objp->amount * -1);
+			$totalarray['val']['totaldebfield'] += $objp->amount;
+			$amountpertype[$objp->code] += $objp->amount;
+		}
+		print "</td>\n";
+		if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totaldebfield';
 
-    	// Credit
-    	print '<td class="right">';
-    	if ($objp->amount > 0)
-    	{
+		// Credit
+		print '<td class="right">';
+		if ($objp->amount > 0) {
 			print price($objp->amount);
-    	    $totalarray['val']['totalcredfield'] += $objp->amount;
-    	    $amountpertype[$objp->code] -= $objp->amount;
-    	}
-    	print "</td>\n";
-    	if (!$i) $totalarray['nbfield']++;
-    	if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalcredfield';
+			$totalarray['val']['totalcredfield'] += $objp->amount;
+			$amountpertype[$objp->code] -= $objp->amount;
+		}
+		print "</td>\n";
+		if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalcredfield';
 
 		print "</tr>";
 
@@ -305,7 +304,7 @@ if ($resql)
 
 	print "</div>";
 
-    print '</form>';
+	print '</form>';
 
 	$db->free($resql);
 } else {
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index dae7ca358ac..3588dced3f4 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -51,7 +51,7 @@ $result = restrictedArea($user, 'tax|salaries', '', '', 'charges|');
 $mode = GETPOST("mode", 'alpha');
 $year = GETPOST("year", 'int');
 $filtre = GETPOST("filtre", 'alpha');
-if (!$year && $mode != 'sconly') { $year = date("Y", time()); }
+if (!$year) { $year = date("Y", time()); }
 
 $search_account = GETPOST('search_account', 'int');
 
@@ -80,12 +80,10 @@ $accountstatic = new Account($db);
 llxHeader('', $langs->trans("SpecialExpensesArea"));
 
 $title = $langs->trans("SpecialExpensesArea");
-if ($mode == 'sconly') $title = $langs->trans("SocialContributionsPayments");
 
 $param = '';
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
 if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
-if ($mode == 'sconly') $param = '&mode=sconly';
 if ($sortfield) $param .= '&sortfield='.$sortfield;
 if ($sortorder) $param .= '&sortorder='.$sortorder;
 
@@ -101,30 +99,18 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
-$nav = '';
-if ($mode != 'sconly')
-{
-    $nav = ($year ? '<a href="index.php?year='.($year - 1).$param.'">'.img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a> ".$langs->trans("Year").' '.$year.' <a href="index.php?year='.($year + 1).$param.'">'.img_next($langs->trans("Next"), 'class="valignbottom"')."</a>" : "");
-    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $nav, '', $limit, 1);
-} else {
-    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $nav, '', $limit, 0);
-}
+$nav = ($year ? '<a href="index.php?year='.($year - 1).$param.'">'.img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a> ".$langs->trans("Year").' '.$year.' <a href="index.php?year='.($year + 1).$param.'">'.img_next($langs->trans("Next"), 'class="valignbottom"')."</a>" : "");
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $nav, '', $limit, 1);
 
 if ($year) $param .= '&year='.$year;
 
-if ($mode != 'sconly')
-{
-	print '<span class="opacitymedium">'.$langs->trans("DescTaxAndDividendsArea").'</span><br>';
-	print "<br>";
-}
+print '<span class="opacitymedium">'.$langs->trans("DescTaxAndDividendsArea").'</span><br>';
+print "<br>";
 
 if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 {
 	// Social contributions only
-	if ($mode != 'sconly')
-	{
-		print load_fiche_titre($langs->trans("SocialContributionsPayments").($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');
-	}
+	print load_fiche_titre($langs->trans("SocialContributionsPayments").($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');
 
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
@@ -135,7 +121,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 	print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pc.rowid", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pc.datep", "", $param, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "pct.code", "", $param, '', $sortfield, $sortorder);
-    if (!empty($conf->banque->enabled)) print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
+	if (!empty($conf->banque->enabled)) print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
 	print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pc.amount", "", $param, 'class="right"', $sortfield, $sortorder);
 	print "</tr>\n";
 
@@ -200,27 +186,27 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 			print '<td>'.$payment_sc_static->getNomUrl(1)."</td>\n";
 			// Date payment
 			print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day').'</td>';
-	        // Type payment
-    	    print '<td>';
-    	    if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
-    	    print $obj->num_payment.'</td>';
+			// Type payment
+			print '<td>';
+			if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
+			print $obj->num_payment.'</td>';
 			// Account
-	    	if (!empty($conf->banque->enabled))
-		    {
-		        print '<td>';
-		        if ($obj->fk_bank > 0)
-		        {
-		        	//$accountstatic->fetch($obj->fk_bank);
-		            $accountstatic->id = $obj->bid;
-		            $accountstatic->ref = $obj->bref;
-		            $accountstatic->number = $obj->bnumber;
-		            $accountstatic->accountancy_number = $obj->account_number;
-		            $accountstatic->accountancy_journal = $obj->accountancy_journal;
-		            $accountstatic->label = $obj->blabel;
-		            print $accountstatic->getNomUrl(1);
-		        } else print '&nbsp;';
-		        print '</td>';
-		    }
+			if (!empty($conf->banque->enabled))
+			{
+				print '<td>';
+				if ($obj->fk_bank > 0)
+				{
+					//$accountstatic->fetch($obj->fk_bank);
+					$accountstatic->id = $obj->bid;
+					$accountstatic->ref = $obj->bref;
+					$accountstatic->number = $obj->bnumber;
+					$accountstatic->accountancy_number = $obj->account_number;
+					$accountstatic->accountancy_journal = $obj->accountancy_journal;
+					$accountstatic->label = $obj->blabel;
+					print $accountstatic->getNomUrl(1);
+				} else print '&nbsp;';
+				print '</td>';
+			}
 			// Paid
 			print '<td class="right">';
 			if ($obj->totalpaye) print price($obj->totalpaye);
@@ -232,13 +218,13 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 			$totalpaye = $totalpaye + $obj->totalpaye;
 			$i++;
 		}
-	    print '<tr class="liste_total"><td colspan="3" class="liste_total">'.$langs->trans("Total").'</td>';
-	    print '<td class="liste_total right"></td>'; // A total here has no sense
-	    print '<td align="center" class="liste_total">&nbsp;</td>';
-	    print '<td align="center" class="liste_total">&nbsp;</td>';
-	    print '<td align="center" class="liste_total">&nbsp;</td>';
-        if (!empty($conf->banque->enabled)) print '<td></td>';
-	    print '<td class="liste_total right">'.price($totalpaye)."</td>";
+		print '<tr class="liste_total"><td colspan="3" class="liste_total">'.$langs->trans("Total").'</td>';
+		print '<td class="liste_total right"></td>'; // A total here has no sense
+		print '<td align="center" class="liste_total">&nbsp;</td>';
+		print '<td align="center" class="liste_total">&nbsp;</td>';
+		print '<td align="center" class="liste_total">&nbsp;</td>';
+		if (!empty($conf->banque->enabled)) print '<td></td>';
+		print '<td class="liste_total right">'.price($totalpaye)."</td>";
 		print "</tr>";
 	} else {
 		dol_print_error($db);
@@ -249,113 +235,110 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 // VAT
 if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 {
-	if (!$mode || $mode != 'sconly')
+	print "<br>";
+
+	$tva = new Tva($db);
+
+	print load_fiche_titre($langs->trans("VATPayments").($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');
+
+	$sql = "SELECT pv.rowid, pv.amount, pv.label, pv.datev as dm, pv.fk_bank,";
+	$sql .= " pct.code as payment_code,";
+	$sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel";
+	$sql .= " FROM ".MAIN_DB_PREFIX."tva as pv";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON pv.fk_bank = b.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON pv.fk_typepayment = pct.id";
+	$sql .= " WHERE pv.entity IN (".getEntity("tax").")";
+	if ($year > 0)
 	{
-		print "<br>";
+		// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
+		// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
+		$sql .= " AND pv.datev between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";
+	}
+	if (preg_match('/^pv\./', $sortfield)) $sql .= $db->order($sortfield, $sortorder);
 
-		$tva = new Tva($db);
-
-		print load_fiche_titre($langs->trans("VATPayments").($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');
-
-		$sql = "SELECT pv.rowid, pv.amount, pv.label, pv.datev as dm, pv.fk_bank,";
-		$sql .= " pct.code as payment_code,";
-		$sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel";
-		$sql .= " FROM ".MAIN_DB_PREFIX."tva as pv";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON pv.fk_bank = b.rowid";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON pv.fk_typepayment = pct.id";
-		$sql .= " WHERE pv.entity IN (".getEntity("tax").")";
-		if ($year > 0)
+	$result = $db->query($sql);
+	if ($result)
+	{
+		$num = $db->num_rows($result);
+		$i = 0;
+		$total = 0;
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'width="140px"', $sortfield, $sortorder);
+		print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "pv.label", "", $param, '', $sortfield, $sortorder);
+		print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
+		print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pv.rowid", "", $param, '', $sortfield, $sortorder);
+		print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'align="center"', $sortfield, $sortorder);
+		print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "pct.code", "", $param, '', $sortfield, $sortorder);
+		if (!empty($conf->banque->enabled)) print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
+		print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
+		print "</tr>\n";
+		$var = 1;
+		while ($i < $num)
 		{
-			// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
-			// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
-			$sql .= " AND pv.datev between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";
+			$obj = $db->fetch_object($result);
+
+			$total = $total + $obj->amount;
+
+
+			print '<tr class="oddeven">';
+			print '<td class="left">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>'."\n";
+
+			print "<td>".$obj->label."</td>\n";
+
+			print '<td class="right">'.price($obj->amount)."</td>";
+
+			// Ref payment
+			$tva_static->id = $obj->rowid;
+			$tva_static->ref = $obj->rowid;
+			print '<td class="left">'.$tva_static->getNomUrl(1)."</td>\n";
+
+			// Date
+			print '<td class="center">'.dol_print_date($db->jdate($obj->dm), 'day')."</td>\n";
+
+			// Type payment
+			print '<td>';
+			if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
+			print $obj->num_payment.'</td>';
+
+			// Account
+			if (!empty($conf->banque->enabled))
+			{
+				print '<td>';
+				if ($obj->fk_bank > 0)
+				{
+					//$accountstatic->fetch($obj->fk_bank);
+					$accountstatic->id = $obj->bid;
+					$accountstatic->ref = $obj->bref;
+					$accountstatic->number = $obj->bnumber;
+					$accountstatic->accountancy_number = $obj->account_number;
+					$accountstatic->accountancy_journal = $obj->accountancy_journal;
+					$accountstatic->label = $obj->blabel;
+					print $accountstatic->getNomUrl(1);
+				} else print '&nbsp;';
+				print '</td>';
+			}
+
+			// Paid
+			print '<td class="right">'.price($obj->amount)."</td>";
+			print "</tr>\n";
+
+			$i++;
 		}
-		if (preg_match('/^pv\./', $sortfield)) $sql .= $db->order($sortfield, $sortorder);
+		print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").'</td>';
+		print '<td class="right">'.price($total).'</td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '<td class="right">'.price($total)."</td>";
+		print "</tr>";
 
-		$result = $db->query($sql);
-		if ($result)
-		{
-		    $num = $db->num_rows($result);
-		    $i = 0;
-		    $total = 0;
-		    print '<table class="noborder centpercent">';
-		    print '<tr class="liste_titre">';
-			print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'width="140px"', $sortfield, $sortorder);
-			print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "pv.label", "", $param, '', $sortfield, $sortorder);
-			print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-			print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pv.rowid", "", $param, '', $sortfield, $sortorder);
-			print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'align="center"', $sortfield, $sortorder);
-			print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "pct.code", "", $param, '', $sortfield, $sortorder);
-			if (!empty($conf->banque->enabled)) print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
-			print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-		    print "</tr>\n";
-		    $var = 1;
-		    while ($i < $num)
-		    {
-		        $obj = $db->fetch_object($result);
-
-		        $total = $total + $obj->amount;
-
-
-		        print '<tr class="oddeven">';
-		        print '<td class="left">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>'."\n";
-
-		        print "<td>".$obj->label."</td>\n";
-
-		        print '<td class="right">'.price($obj->amount)."</td>";
-
-		        // Ref payment
-				$tva_static->id = $obj->rowid;
-				$tva_static->ref = $obj->rowid;
-		        print '<td class="left">'.$tva_static->getNomUrl(1)."</td>\n";
-
-		        // Date
-		        print '<td class="center">'.dol_print_date($db->jdate($obj->dm), 'day')."</td>\n";
-
-		        // Type payment
-	    	    print '<td>';
-	    	    if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
-	    	    print $obj->num_payment.'</td>';
-
-		    	// Account
-		    	if (!empty($conf->banque->enabled))
-			    {
-			        print '<td>';
-			        if ($obj->fk_bank > 0)
-			        {
-			        	//$accountstatic->fetch($obj->fk_bank);
-			            $accountstatic->id = $obj->bid;
-			            $accountstatic->ref = $obj->bref;
-			            $accountstatic->number = $obj->bnumber;
-			            $accountstatic->accountancy_number = $obj->account_number;
-			            $accountstatic->accountancy_journal = $obj->accountancy_journal;
-			            $accountstatic->label = $obj->blabel;
-			            print $accountstatic->getNomUrl(1);
-			        } else print '&nbsp;';
-			        print '</td>';
-			    }
-
-	    	    // Paid
-		    	print '<td class="right">'.price($obj->amount)."</td>";
-		        print "</tr>\n";
-
-		        $i++;
-		    }
-		    print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").'</td>';
-		    print '<td class="right">'.price($total).'</td>';
-		    print '<td>&nbsp;</td>';
-		    print '<td>&nbsp;</td>';
-		    print '<td>&nbsp;</td>';
-		    print '<td>&nbsp;</td>';
-		    print '<td class="right">'.price($total)."</td>";
-		    print "</tr>";
-
-		    print "</table>";
-		    $db->free($result);
-		} else {
-		    dol_print_error($db);
-		}
+		print "</table>";
+		$db->free($result);
+	} else {
+		dol_print_error($db);
 	}
 }
 
@@ -379,73 +362,77 @@ if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
 
 while ($j < $numlt)
 {
-	if (!$mode || $mode != 'sconly')
+	print "<br>";
+
+	$tva = new Tva($db);
+
+	print load_fiche_titre($langs->transcountry(($j == 1 ? "LT1Payments" : "LT2Payments"), $mysoc->country_code).($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');
+
+
+	$sql = "SELECT pv.rowid, pv.amount, pv.label, pv.datev as dm, pv.datep as dp";
+	$sql .= " FROM ".MAIN_DB_PREFIX."localtax as pv";
+	$sql .= " WHERE pv.entity = ".$conf->entity." AND localtaxtype = ".$j;
+	if ($year > 0)
 	{
-		print "<br>";
+		// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
+		// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
+		$sql .= " AND pv.datev between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";
+	}
+	if (preg_match('/^pv/', $sortfield)) $sql .= $db->order($sortfield, $sortorder);
 
-		$tva = new Tva($db);
+	$result = $db->query($sql);
+	if ($result)
+	{
+		$num = $db->num_rows($result);
+		$i = 0;
+		$total = 0;
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'width="120"', $sortfield, $sortorder);
+		print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "pv.label", "", $param, '', $sortfield, $sortorder);
+		print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
+		print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pv.rowid", "", $param, '', $sortfield, $sortorder);
+		print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pv.datep", "", $param, 'align="center"', $sortfield, $sortorder);
+		print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
+		print "</tr>\n";
 
-		print load_fiche_titre($langs->transcountry(($j == 1 ? "LT1Payments" : "LT2Payments"), $mysoc->country_code).($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');
-
-
-		$sql = "SELECT pv.rowid, pv.amount, pv.label, pv.datev as dm, pv.datep as dp";
-		$sql .= " FROM ".MAIN_DB_PREFIX."localtax as pv";
-		$sql .= " WHERE pv.entity = ".$conf->entity." AND localtaxtype = ".$j;
-		if ($year > 0)
+		while ($i < $num)
 		{
-			// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
-			// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
-			$sql .= " AND pv.datev between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";
-		}
-		if (preg_match('/^pv/', $sortfield)) $sql .= $db->order($sortfield, $sortorder);
+			$obj = $db->fetch_object($result);
 
-		$result = $db->query($sql);
-		if ($result)
-		{
-			$num = $db->num_rows($result);
-			$i = 0;
-			$total = 0;
-			print '<table class="noborder centpercent">';
-			print '<tr class="liste_titre">';
-			print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'width="120"', $sortfield, $sortorder);
-			print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "pv.label", "", $param, '', $sortfield, $sortorder);
-			print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pv.rowid", "", $param, '', $sortfield, $sortorder);
-			print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pv.datep", "", $param, 'align="center"', $sortfield, $sortorder);
-			print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
+			$total = $total + $obj->amount;
+
+			print '<tr class="oddeven">';
+			print '<td class="left">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>'."\n";
+
+			print "<td>".$obj->label."</td>\n";
+
+			print '<td class="right">'.price($obj->amount)."</td>";
+
+			// Ref payment
+			$tva_static->id = $obj->rowid;
+			$tva_static->ref = $obj->rowid;
+			print '<td class="left">'.$tva_static->getNomUrl(1)."</td>\n";
+
+			print '<td class="center">'.dol_print_date($db->jdate($obj->dp), 'day')."</td>\n";
+			print '<td class="right">'.price($obj->amount)."</td>";
 			print "</tr>\n";
 
-			while ($i < $num)
-			{
-				$obj = $db->fetch_object($result);
-
-				$total = $total + $obj->amount;
-
-				print '<tr class="oddeven">';
-				print '<td class="left">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>'."\n";
-
-				print "<td>".$obj->label."</td>\n";
-
-				// Ref payment
-				$tva_static->id = $obj->rowid;
-				$tva_static->ref = $obj->rowid;
-				print '<td class="left">'.$tva_static->getNomUrl(1)."</td>\n";
-
-				print '<td class="center">'.dol_print_date($db->jdate($obj->dp), 'day')."</td>\n";
-				print '<td class="right">'.price($obj->amount)."</td>";
-				print "</tr>\n";
-
-				$i++;
-			}
-			print '<tr class="liste_total"><td class="right" colspan="4">'.$langs->trans("Total").'</td>';
-			print '<td class="right">'.price($total)."</td>";
-			print "</tr>";
-
-			print "</table>";
-			$db->free($result);
-		} else {
-			dol_print_error($db);
+			$i++;
 		}
+		print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("Total").'</td>';
+		print '<td class="right">'.price($total)."</td>";
+		print '<td align="center">&nbsp;</td>';
+		print '<td align="center">&nbsp;</td>';
+		print '<td class="right">'.price($total)."</td>";
+		print "</tr>";
+
+		print "</table>";
+		$db->free($result);
+	} else {
+		dol_print_error($db);
 	}
+
 	$j++;
 }
 
@@ -454,8 +441,6 @@ while ($j < $numlt)
 /*
 if (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
 {
-    if (!$mode || $mode != 'sconly')
-    {
         $sal = new PaymentSalary($db);
 
         print "<br>";
@@ -557,7 +542,6 @@ if (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
         } else {
             dol_print_error($db);
         }
-    }
 }
 */
 
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 5b8b98135a1..0a18d68b5db 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php'
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 if (!empty($conf->projet->enabled))
 {
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
@@ -62,138 +62,138 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include,
 
 if ($action == 'validate' && $user->rights->deplacement->creer)
 {
-    $object->fetch($id);
-    if ($object->statut == Deplacement::STATUS_DRAFT)
-    {
-        $result = $object->setStatut(1);
-        if ($result > 0)
-        {
-            header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-            exit;
-        } else {
-	        setEventMessages($object->error, $object->errors, 'errors');
-        }
-    }
+	$object->fetch($id);
+	if ($object->statut == Deplacement::STATUS_DRAFT)
+	{
+		$result = $object->setStatut(1);
+		if ($result > 0)
+		{
+			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+			exit;
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
 } elseif ($action == 'classifyrefunded' && $user->rights->deplacement->creer)
 {
-    $object->fetch($id);
-    if ($object->statut == Deplacement::STATUS_VALIDATED)
-    {
-        $result = $object->setStatut(Deplacement::STATUS_REFUNDED);
-        if ($result > 0)
-        {
-            header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-            exit;
-        } else {
-	        setEventMessages($object->error, $object->errors, 'errors');
-        }
-    }
+	$object->fetch($id);
+	if ($object->statut == Deplacement::STATUS_VALIDATED)
+	{
+		$result = $object->setStatut(Deplacement::STATUS_REFUNDED);
+		if ($result > 0)
+		{
+			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+			exit;
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
 } elseif ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->deplacement->supprimer)
 {
-    $result = $object->delete($id);
-    if ($result >= 0)
-    {
-        header("Location: index.php");
-        exit;
-    } else {
-	    setEventMessages($object->error, $object->errors, 'errors');
-    }
+	$result = $object->delete($id);
+	if ($result >= 0)
+	{
+		header("Location: index.php");
+		exit;
+	} else {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
 } elseif ($action == 'add' && $user->rights->deplacement->creer)
 {
-    if (!GETPOST('cancel', 'alpha'))
-    {
-        $error = 0;
+	if (!GETPOST('cancel', 'alpha'))
+	{
+		$error = 0;
 
-        $object->date = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-        $object->km = price2num(GETPOST('km', 'alpha'), 'MU'); // Not 'int', it may be a formated amount
-        $object->type = GETPOST('type', 'alpha');
-        $object->socid = (int) GETPOST('socid', 'int');
-        $object->fk_user = (int) GETPOST('fk_user', 'int');
-        $object->note_private = GETPOST('note_private', 'alpha');
-        $object->note_public = GETPOST('note_public', 'alpha');
-        $object->statut = Deplacement::STATUS_DRAFT;
+		$object->date = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$object->km = price2num(GETPOST('km', 'alpha'), 'MU'); // Not 'int', it may be a formated amount
+		$object->type = GETPOST('type', 'alpha');
+		$object->socid = (int) GETPOST('socid', 'int');
+		$object->fk_user = (int) GETPOST('fk_user', 'int');
+		$object->note_private = GETPOST('note_private', 'alpha');
+		$object->note_public = GETPOST('note_public', 'alpha');
+		$object->statut = Deplacement::STATUS_DRAFT;
 
-        if (!$object->date)
-        {
-	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
-            $error++;
-        }
-        if ($object->type == '-1')
-        {
-	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
-            $error++;
-        }
-        if (!($object->fk_user > 0))
-        {
-	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Person")), null, 'errors');
-            $error++;
-        }
+		if (!$object->date)
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
+			$error++;
+		}
+		if ($object->type == '-1')
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
+			$error++;
+		}
+		if (!($object->fk_user > 0))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Person")), null, 'errors');
+			$error++;
+		}
 
-        if (!$error)
-        {
-            $id = $object->create($user);
+		if (!$error)
+		{
+			$id = $object->create($user);
 
-            if ($id > 0)
-            {
-                header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-                exit;
-            } else {
-	            setEventMessages($object->error, $object->errors, 'errors');
-                $action = 'create';
-            }
-        } else {
-            $action = 'create';
-        }
-    } else {
-        header("Location: index.php");
-        exit;
-    }
+			if ($id > 0)
+			{
+				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+				exit;
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = 'create';
+			}
+		} else {
+			$action = 'create';
+		}
+	} else {
+		header("Location: index.php");
+		exit;
+	}
 } // Update record
 elseif ($action == 'update' && $user->rights->deplacement->creer)
 {
-    if (!GETPOST('cancel', 'alpha'))
-    {
-        $result = $object->fetch($id);
+	if (!GETPOST('cancel', 'alpha'))
+	{
+		$result = $object->fetch($id);
 
-        $object->date			= dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-        $object->km = price2num(GETPOST('km', 'alpha'), 'MU'); // Not 'int', it may be a formated amount
-        $object->type			= GETPOST('type', 'alpha');
-        $object->socid = (int) GETPOST('socid', 'int');
-        $object->fk_user = (int) GETPOST('fk_user', 'int');
-        $object->note_private = GETPOST('note_private', 'alpha');
-        $object->note_public = GETPOST('note_public', 'alpha');
+		$object->date			= dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$object->km = price2num(GETPOST('km', 'alpha'), 'MU'); // Not 'int', it may be a formated amount
+		$object->type			= GETPOST('type', 'alpha');
+		$object->socid = (int) GETPOST('socid', 'int');
+		$object->fk_user = (int) GETPOST('fk_user', 'int');
+		$object->note_private = GETPOST('note_private', 'alpha');
+		$object->note_public = GETPOST('note_public', 'alpha');
 
-        $result = $object->update($user);
+		$result = $object->update($user);
 
-        if ($result > 0)
-        {
-            header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-            exit;
-        } else {
-	        setEventMessages($object->error, $object->errors, 'errors');
-        }
-    } else {
-        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-        exit;
-    }
+		if ($result > 0)
+		{
+			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+			exit;
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	} else {
+		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+		exit;
+	}
 } // Set into a project
 elseif ($action == 'classin' && $user->rights->deplacement->creer)
 {
-    $object->fetch($id);
-    $result = $object->setProject(GETPOST('projectid', 'int'));
-    if ($result < 0) dol_print_error($db, $object->error);
+	$object->fetch($id);
+	$result = $object->setProject(GETPOST('projectid', 'int'));
+	if ($result < 0) dol_print_error($db, $object->error);
 } // Set fields
 elseif ($action == 'setdated' && $user->rights->deplacement->creer)
 {
-    $dated = dol_mktime(GETPOST('datedhour', 'int'), GETPOST('datedmin', 'int'), GETPOST('datedsec', 'int'), GETPOST('datedmonth', 'int'), GETPOST('datedday', 'int'), GETPOST('datedyear', 'int'));
-    $object->fetch($id);
-    $result = $object->setValueFrom('dated', $dated, '', '', 'date', '', $user, 'DEPLACEMENT_MODIFY');
-    if ($result < 0) dol_print_error($db, $object->error);
+	$dated = dol_mktime(GETPOST('datedhour', 'int'), GETPOST('datedmin', 'int'), GETPOST('datedsec', 'int'), GETPOST('datedmonth', 'int'), GETPOST('datedday', 'int'), GETPOST('datedyear', 'int'));
+	$object->fetch($id);
+	$result = $object->setValueFrom('dated', $dated, '', '', 'date', '', $user, 'DEPLACEMENT_MODIFY');
+	if ($result < 0) dol_print_error($db, $object->error);
 } elseif ($action == 'setkm' && $user->rights->deplacement->creer)
 {
-    $object->fetch($id);
-    $result = $object->setValueFrom('km', GETPOST('km', 'int'), '', null, 'text', '', $user, 'DEPLACEMENT_MODIFY');
-    if ($result < 0) dol_print_error($db, $object->error);
+	$object->fetch($id);
+	$result = $object->setValueFrom('km', GETPOST('km', 'int'), '', null, 'text', '', $user, 'DEPLACEMENT_MODIFY');
+	if ($result < 0) dol_print_error($db, $object->error);
 }
 
 
@@ -210,327 +210,327 @@ $form = new Form($db);
 */
 if ($action == 'create')
 {
-    //WYSIWYG Editor
-    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	//WYSIWYG Editor
+	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-    print load_fiche_titre($langs->trans("NewTrip"));
+	print load_fiche_titre($langs->trans("NewTrip"));
 
-    $datec = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+	$datec = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 
-    print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="add">';
+	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="add">';
 
-    print '<table class="border centpercent">';
+	print '<table class="border centpercent">';
 
-    print "<tr>";
-    print '<td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
-    $form->select_type_fees(GETPOST('type', 'int'), 'type', 1);
-    print '</td></tr>';
+	print "<tr>";
+	print '<td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
+	$form->select_type_fees(GETPOST('type', 'int'), 'type', 1);
+	print '</td></tr>';
 
-    print "<tr>";
-    print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>';
-    print $form->select_dolusers(GETPOST('fk_user', 'int'), 'fk_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
-    print '</td></tr>';
+	print "<tr>";
+	print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>';
+	print $form->select_dolusers(GETPOST('fk_user', 'int'), 'fk_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+	print '</td></tr>';
 
-    print "<tr>";
-    print '<td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
-    print $form->selectDate($datec ? $datec : -1, '', '', '', '', 'add', 1, 1);
-    print '</td></tr>';
+	print "<tr>";
+	print '<td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
+	print $form->selectDate($datec ? $datec : -1, '', '', '', '', 'add', 1, 1);
+	print '</td></tr>';
 
-    // Km
-    print '<tr><td class="fieldrequired">'.$langs->trans("FeesKilometersOrAmout").'</td><td><input name="km" size="10" value="'.GETPOST("km").'"></td></tr>';
+	// Km
+	print '<tr><td class="fieldrequired">'.$langs->trans("FeesKilometersOrAmout").'</td><td><input name="km" size="10" value="'.GETPOST("km").'"></td></tr>';
 
-    // Company
-    print "<tr>";
-    print '<td>'.$langs->trans("CompanyVisited").'</td><td>';
-    print $form->select_company(GETPOST('socid', 'int'), 'socid', '', 1);
-    print '</td></tr>';
+	// Company
+	print "<tr>";
+	print '<td>'.$langs->trans("CompanyVisited").'</td><td>';
+	print $form->select_company(GETPOST('socid', 'int'), 'socid', '', 1);
+	print '</td></tr>';
 
-    // Public note
-    print '<tr>';
-    print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
-    print '<td>';
+	// Public note
+	print '<tr>';
+	print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
+	print '<td>';
 
-    $doleditor = new DolEditor('note_public', GETPOST('note_public', 'restricthtml'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
-    print $doleditor->Create(1);
+	$doleditor = new DolEditor('note_public', GETPOST('note_public', 'restricthtml'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
+	print $doleditor->Create(1);
 
-    print '</td></tr>';
+	print '</td></tr>';
 
-    // Private note
-    if (empty($user->socid))
-    {
-        print '<tr>';
-        print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
-        print '<td>';
+	// Private note
+	if (empty($user->socid))
+	{
+		print '<tr>';
+		print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
+		print '<td>';
 
-        $doleditor = new DolEditor('note_private', GETPOST('note_private', 'restricthtml'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
-        print $doleditor->Create(1);
+		$doleditor = new DolEditor('note_private', GETPOST('note_private', 'restricthtml'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
+		print $doleditor->Create(1);
 
-        print '</td></tr>';
-    }
+		print '</td></tr>';
+	}
 
-    // Other attributes
-    $parameters = array();
-    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
+	// Other attributes
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 
-    print '</table>';
+	print '</table>';
 
-    print '<br><div class="center">';
-	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
+	print '<br><div class="center">';
+	print '<input class="button button-save" type="submit" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-    print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
-    print '</form>';
+	print '</form>';
 } elseif ($id)
 {
-    $result = $object->fetch($id);
-    if ($result > 0)
-    {
-        $head = trip_prepare_head($object);
+	$result = $object->fetch($id);
+	if ($result > 0)
+	{
+		$head = trip_prepare_head($object);
 
-        dol_fiche_head($head, 'card', $langs->trans("TripCard"), 0, 'trip');
+		print dol_get_fiche_head($head, 'card', $langs->trans("TripCard"), 0, 'trip');
 
-        if ($action == 'edit' && $user->rights->deplacement->creer)
-        {
-            //WYSIWYG Editor
-            require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+		if ($action == 'edit' && $user->rights->deplacement->creer)
+		{
+			//WYSIWYG Editor
+			require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-            $soc = new Societe($db);
-            if ($object->socid)
-            {
-                $soc->fetch($object->socid);
-            }
+			$soc = new Societe($db);
+			if ($object->socid)
+			{
+				$soc->fetch($object->socid);
+			}
 
-            print '<form name="update" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            print '<input type="hidden" name="action" value="update">';
-            print '<input type="hidden" name="id" value="'.$id.'">';
+			print '<form name="update" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="action" value="update">';
+			print '<input type="hidden" name="id" value="'.$id.'">';
 
-            print '<table class="border centpercent">';
+			print '<table class="border centpercent">';
 
-            // Ref
-            print "<tr>";
-            print '<td class="titlefield">'.$langs->trans("Ref").'</td><td>';
-            print $object->ref;
-            print '</td></tr>';
+			// Ref
+			print "<tr>";
+			print '<td class="titlefield">'.$langs->trans("Ref").'</td><td>';
+			print $object->ref;
+			print '</td></tr>';
 
-            // Type
-            print "<tr>";
-            print '<td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
-            $form->select_type_fees(GETPOST('type', 'int') ?GETPOST('type', 'int') : $object->type, 'type', 0);
-            print '</td></tr>';
+			// Type
+			print "<tr>";
+			print '<td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
+			$form->select_type_fees(GETPOST('type', 'int') ?GETPOST('type', 'int') : $object->type, 'type', 0);
+			print '</td></tr>';
 
-            // Who
-            print "<tr>";
-            print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>';
-            print $form->select_dolusers(GETPOST('fk_user', 'int') ?GETPOST('fk_user', 'int') : $object->fk_user, 'fk_user', 0, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
-            print '</td></tr>';
+			// Who
+			print "<tr>";
+			print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>';
+			print $form->select_dolusers(GETPOST('fk_user', 'int') ?GETPOST('fk_user', 'int') : $object->fk_user, 'fk_user', 0, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+			print '</td></tr>';
 
-            // Date
-            print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
-            print $form->selectDate($object->date, '', 0, 0, 0, 'update', 1, 0);
-            print '</td></tr>';
+			// Date
+			print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
+			print $form->selectDate($object->date, '', 0, 0, 0, 'update', 1, 0);
+			print '</td></tr>';
 
-            // Km
-            print '<tr><td class="fieldrequired">'.$langs->trans("FeesKilometersOrAmout").'</td><td>';
-            print '<input name="km" class="flat" size="10" value="'.$object->km.'">';
-            print '</td></tr>';
+			// Km
+			print '<tr><td class="fieldrequired">'.$langs->trans("FeesKilometersOrAmout").'</td><td>';
+			print '<input name="km" class="flat" size="10" value="'.$object->km.'">';
+			print '</td></tr>';
 
-            // Where
-            print "<tr>";
-            print '<td>'.$langs->trans("CompanyVisited").'</td><td>';
-            print $form->select_company($soc->id, 'socid', '', 1);
-            print '</td></tr>';
+			// Where
+			print "<tr>";
+			print '<td>'.$langs->trans("CompanyVisited").'</td><td>';
+			print $form->select_company($soc->id, 'socid', '', 1);
+			print '</td></tr>';
 
-            // Public note
-            print '<tr><td class="tdtop">'.$langs->trans("NotePublic").'</td>';
-            print '<td>';
+			// Public note
+			print '<tr><td class="tdtop">'.$langs->trans("NotePublic").'</td>';
+			print '<td>';
 
-            $doleditor = new DolEditor('note_public', $object->note_public, '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
-            print $doleditor->Create(1);
+			$doleditor = new DolEditor('note_public', $object->note_public, '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
+			print $doleditor->Create(1);
 
-            print "</td></tr>";
+			print "</td></tr>";
 
-            // Private note
-            if (empty($user->socid))
-            {
-                print '<tr><td class="tdtop">'.$langs->trans("NotePrivate").'</td>';
-                print '<td>';
+			// Private note
+			if (empty($user->socid))
+			{
+				print '<tr><td class="tdtop">'.$langs->trans("NotePrivate").'</td>';
+				print '<td>';
 
-                $doleditor = new DolEditor('note_private', $object->note_private, '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
-                print $doleditor->Create(1);
+				$doleditor = new DolEditor('note_private', $object->note_private, '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
+				print $doleditor->Create(1);
 
-                print "</td></tr>";
-            }
+				print "</td></tr>";
+			}
 
-            // Other attributes
-            $parameters = array();
-            $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-            print $hookmanager->resPrint;
+			// Other attributes
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
 
-            print '</table>';
+			print '</table>';
 
-            print '<br><div class="center">';
-			print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+			print '<br><div class="center">';
+			print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-            print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
-            print '</div>';
+			print '<input type="submit" name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'">';
+			print '</div>';
 
-            print '</form>';
+			print '</form>';
 
-            print '</div>';
-        } else {
-            /*
+			print '</div>';
+		} else {
+			/*
              * Confirm delete trip
              */
-            if ($action == 'delete')
-            {
-                print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("DeleteTrip"), $langs->trans("ConfirmDeleteTrip"), "confirm_delete");
-            }
+			if ($action == 'delete')
+			{
+				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("DeleteTrip"), $langs->trans("ConfirmDeleteTrip"), "confirm_delete");
+			}
 
-            $soc = new Societe($db);
-            if ($object->socid) $soc->fetch($object->socid);
+			$soc = new Societe($db);
+			if ($object->socid) $soc->fetch($object->socid);
 
-            print '<table class="border centpercent">';
+			print '<table class="border centpercent">';
 
-            $linkback = '<a href="'.DOL_URL_ROOT.'/compta/deplacement/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+			$linkback = '<a href="'.DOL_URL_ROOT.'/compta/deplacement/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-            // Ref
-            print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td>';
-            print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
-            print '</td></tr>';
+			// Ref
+			print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td>';
+			print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
+			print '</td></tr>';
 
-	        $form->load_cache_types_fees();
+			$form->load_cache_types_fees();
 
-	        // Type
-            print '<tr><td>';
-            print $form->editfieldkey("Type", 'type', $langs->trans($object->type), $object, $user->rights->deplacement->creer, 'select:types_fees');
-            print '</td><td>';
-            print $form->editfieldval("Type", 'type', $form->cache_types_fees[$object->type], $object, $user->rights->deplacement->creer, 'select:types_fees');
-            print '</td></tr>';
+			// Type
+			print '<tr><td>';
+			print $form->editfieldkey("Type", 'type', $langs->trans($object->type), $object, $user->rights->deplacement->creer, 'select:types_fees');
+			print '</td><td>';
+			print $form->editfieldval("Type", 'type', $form->cache_types_fees[$object->type], $object, $user->rights->deplacement->creer, 'select:types_fees');
+			print '</td></tr>';
 
-            // Who
-            print '<tr><td>'.$langs->trans("Person").'</td><td>';
-            $userfee = new User($db);
-            $userfee->fetch($object->fk_user);
-            print $userfee->getNomUrl(1);
-            print '</td></tr>';
+			// Who
+			print '<tr><td>'.$langs->trans("Person").'</td><td>';
+			$userfee = new User($db);
+			$userfee->fetch($object->fk_user);
+			print $userfee->getNomUrl(1);
+			print '</td></tr>';
 
-            // Date
-            print '<tr><td>';
-            print $form->editfieldkey("Date", 'dated', $object->date, $object, $user->rights->deplacement->creer, 'datepicker');
-            print '</td><td>';
-            print $form->editfieldval("Date", 'dated', $object->date, $object, $user->rights->deplacement->creer, 'datepicker');
-            print '</td></tr>';
+			// Date
+			print '<tr><td>';
+			print $form->editfieldkey("Date", 'dated', $object->date, $object, $user->rights->deplacement->creer, 'datepicker');
+			print '</td><td>';
+			print $form->editfieldval("Date", 'dated', $object->date, $object, $user->rights->deplacement->creer, 'datepicker');
+			print '</td></tr>';
 
-            // Km/Price
-            print '<tr><td class="tdtop">';
-            print $form->editfieldkey("FeesKilometersOrAmout", 'km', $object->km, $object, $user->rights->deplacement->creer, 'numeric:6');
-            print '</td><td>';
-            print $form->editfieldval("FeesKilometersOrAmout", 'km', $object->km, $object, $user->rights->deplacement->creer, 'numeric:6');
-            print "</td></tr>";
+			// Km/Price
+			print '<tr><td class="tdtop">';
+			print $form->editfieldkey("FeesKilometersOrAmout", 'km', $object->km, $object, $user->rights->deplacement->creer, 'numeric:6');
+			print '</td><td>';
+			print $form->editfieldval("FeesKilometersOrAmout", 'km', $object->km, $object, $user->rights->deplacement->creer, 'numeric:6');
+			print "</td></tr>";
 
-            // Where
-            print '<tr><td>'.$langs->trans("CompanyVisited").'</td>';
-            print '<td>';
-            if ($soc->id) print $soc->getNomUrl(1);
-            print '</td></tr>';
+			// Where
+			print '<tr><td>'.$langs->trans("CompanyVisited").'</td>';
+			print '<td>';
+			if ($soc->id) print $soc->getNomUrl(1);
+			print '</td></tr>';
 
-            // Project
-            if (!empty($conf->projet->enabled))
-            {
-                $langs->load('projects');
-                print '<tr>';
-                print '<td>';
+			// Project
+			if (!empty($conf->projet->enabled))
+			{
+				$langs->load('projects');
+				print '<tr>';
+				print '<td>';
 
-                print '<table class="nobordernopadding" width="100%"><tr><td>';
-                print $langs->trans('Project');
-                print '</td>';
-                if ($action != 'classify' && $user->rights->deplacement->creer)
-                {
-                    print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=classify&amp;id='.$object->id.'">';
-                    print img_edit($langs->trans('SetProject'), 1);
-                    print '</a></td>';
-                }
-                print '</tr></table>';
-                print '</td><td colspan="3">';
-                if ($action == 'classify')
-                {
-                    $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1);
-                } else {
-                    $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0);
-                }
-                print '</td>';
-                print '</tr>';
-            }
+				print '<table class="nobordernopadding" width="100%"><tr><td>';
+				print $langs->trans('Project');
+				print '</td>';
+				if ($action != 'classify' && $user->rights->deplacement->creer)
+				{
+					print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=classify&amp;id='.$object->id.'">';
+					print img_edit($langs->trans('SetProject'), 1);
+					print '</a></td>';
+				}
+				print '</tr></table>';
+				print '</td><td colspan="3">';
+				if ($action == 'classify')
+				{
+					$form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1);
+				} else {
+					$form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0);
+				}
+				print '</td>';
+				print '</tr>';
+			}
 
-            // Statut
-            print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
+			// Statut
+			print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
 
-        	// Other attributes
-        	$parameters = array('socid'=>$object->id);
-        	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+			// Other attributes
+			$parameters = array('socid'=>$object->id);
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
-            print "</table><br>";
+			print "</table><br>";
 
-            // Notes
-            $blocname = 'notes';
-            $title = $langs->trans('Notes');
-            include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
+			// Notes
+			$blocname = 'notes';
+			$title = $langs->trans('Notes');
+			include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
 
-            print '</div>';
+			print '</div>';
 
-            /*
+			/*
              * Barre d'actions
              */
 
-            print '<div class="tabsAction">';
+			print '<div class="tabsAction">';
 
-            if ($object->statut < Deplacement::STATUS_REFUNDED) 	// if not refunded
-            {
-	            if ($user->rights->deplacement->creer)
-	            {
-	                print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>';
-	            } else {
-	                print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Modify').'</a>';
-	            }
-            }
+			if ($object->statut < Deplacement::STATUS_REFUNDED) 	// if not refunded
+			{
+				if ($user->rights->deplacement->creer)
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>';
+				} else {
+					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Modify').'</a>';
+				}
+			}
 
-            if ($object->statut == Deplacement::STATUS_DRAFT) 	// if draft
-            {
-                if ($user->rights->deplacement->creer)
-                {
-                    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=validate&id='.$id.'">'.$langs->trans('Validate').'</a>';
-                } else {
-                    print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Validate').'</a>';
-                }
-            }
+			if ($object->statut == Deplacement::STATUS_DRAFT) 	// if draft
+			{
+				if ($user->rights->deplacement->creer)
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=validate&id='.$id.'">'.$langs->trans('Validate').'</a>';
+				} else {
+					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Validate').'</a>';
+				}
+			}
 
-            if ($object->statut == Deplacement::STATUS_VALIDATED) 	// if validated
-            {
-                if ($user->rights->deplacement->creer)
-                {
-                    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=classifyrefunded&id='.$id.'">'.$langs->trans('ClassifyRefunded').'</a>';
-                } else {
-                    print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('ClassifyRefunded').'</a>';
-                }
-            }
+			if ($object->statut == Deplacement::STATUS_VALIDATED) 	// if validated
+			{
+				if ($user->rights->deplacement->creer)
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=classifyrefunded&id='.$id.'">'.$langs->trans('ClassifyRefunded').'</a>';
+				} else {
+					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('ClassifyRefunded').'</a>';
+				}
+			}
 
-            if ($user->rights->deplacement->supprimer)
-            {
-                print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$id.'">'.$langs->trans('Delete').'</a>';
-            } else {
-                print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Delete').'</a>';
-            }
+			if ($user->rights->deplacement->supprimer)
+			{
+				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$id.'">'.$langs->trans('Delete').'</a>';
+			} else {
+				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Delete').'</a>';
+			}
 
-            print '</div>';
-        }
-    } else {
-        dol_print_error($db);
-    }
+			print '</div>';
+		}
+	} else {
+		dol_print_error($db);
+	}
 }
 
 // End of page
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index 69baf710b95..75d2f71284c 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -43,12 +43,12 @@ class Deplacement extends CommonObject
 	public $table_element = 'deplacement';
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	public $table_element_line = '';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Fieldname with ID of parent key if this field has a parent
 	 */
 	public $fk_element = '';
 
@@ -59,22 +59,22 @@ class Deplacement extends CommonObject
 	public $ismultientitymanaged = 0;
 
 	/**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
-    /**
-     * Date (dated)
-     *
-     * @var integer
-     */
+	/**
+	 * Date (dated)
+	 *
+	 * @var integer
+	 */
 	public $dated;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_author;
 
 	/**
@@ -82,20 +82,20 @@ class Deplacement extends CommonObject
 	 */
 	public $fk_user;
 
-    /**
-     * @var string km value formatted
-     */
-    public $km;
+	/**
+	 * @var string km value formatted
+	 */
+	public $km;
 
-    /**
-     * @var int Thirdparty id
-     */
+	/**
+	 * @var int Thirdparty id
+	 */
 	public $socid;
 
-    /**
-     * @var int Status 0=draft, 1=validated, 2=Refunded
-     */
-    public $statut;
+	/**
+	 * @var int Status 0=draft, 1=validated, 2=Refunded
+	 */
+	public $statut;
 	public $extraparams = array();
 
 	public $statuts = array();
@@ -116,7 +116,7 @@ class Deplacement extends CommonObject
 	 */
 	const STATUS_REFUNDED = 2;
 
-    /**
+	/**
 	 * Constructor
 	 *
 	 * @param	DoliDB		$db		Database handler
@@ -125,8 +125,8 @@ class Deplacement extends CommonObject
 	{
 		$this->db = $db;
 
-        $this->statuts_short = array(0 => 'Draft', 1 => 'Validated', 2 => 'Refunded');
-        $this->statuts = array(0 => 'Draft', 1 => 'Validated', 2 => 'Refunded');
+		$this->statuts_short = array(0 => 'Draft', 1 => 'Validated', 2 => 'Refunded');
+		$this->statuts = array(0 => 'Draft', 1 => 'Validated', 2 => 'Refunded');
 	}
 
 	/**
@@ -152,9 +152,9 @@ class Deplacement extends CommonObject
 			return -1;
 		}
 
-        $now = dol_now();
+		$now = dol_now();
 
-        $this->db->begin();
+		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."deplacement (";
 		$sql .= "datec";
@@ -185,14 +185,14 @@ class Deplacement extends CommonObject
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."deplacement");
 
-            // Call trigger
-            $result = $this->call_trigger('DEPLACEMENT_CREATE', $user);
-            if ($result < 0)
-            {
-            	$this->db->rollback();
-            	return -2;
-            }
-            // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('DEPLACEMENT_CREATE', $user);
+			if ($result < 0)
+			{
+				$this->db->rollback();
+				return -2;
+			}
+			// End call triggers
 
 			$result = $this->update($user);
 			if ($result > 0)
@@ -226,12 +226,12 @@ class Deplacement extends CommonObject
 
 		// Check parameters
 		if (!is_numeric($this->km)) $this->km = 0;
-        if (empty($this->date))
-        {
-            $this->error = 'ErrorBadParameter';
-            return -1;
-        }
-        if (empty($this->type) || $this->type < 0)
+		if (empty($this->date))
+		{
+			$this->error = 'ErrorBadParameter';
+			return -1;
+		}
+		if (empty($this->type) || $this->type < 0)
 		{
 			$this->error = 'ErrorBadParameter';
 			return -1;
@@ -270,7 +270,7 @@ class Deplacement extends CommonObject
 		}
 	}
 
-    /**
+	/**
 	 * Load an object from database
 	 *
 	 * @param	int		$id		Id of record to load
@@ -312,7 +312,7 @@ class Deplacement extends CommonObject
 		}
 	}
 
-    /**
+	/**
 	 *	Delete record
 	 *
 	 *	@param	int		$id		Id of record to delete
@@ -349,7 +349,7 @@ class Deplacement extends CommonObject
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un statut donne
 	 *
@@ -359,7 +359,7 @@ class Deplacement extends CommonObject
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if ($mode == 0)
@@ -402,15 +402,15 @@ class Deplacement extends CommonObject
 		global $langs;
 
 		$result = '';
-        $label = $langs->trans("Show").': '.$this->ref;
+		$label = $langs->trans("Show").': '.$this->ref;
 
-        $link = '<a href="'.DOL_URL_ROOT.'/compta/deplacement/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$link = '<a href="'.DOL_URL_ROOT.'/compta/deplacement/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend = '</a>';
 
 		$picto = 'trip';
 
 
-        if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+		if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
 		if ($withpicto && $withpicto != 2) $result .= ' ';
 		if ($withpicto != 2) $result .= $link.$this->ref.$linkend;
 		return $result;
@@ -425,31 +425,31 @@ class Deplacement extends CommonObject
 	 */
 	public function listOfTypes($active = 1)
 	{
-	    global $langs;
+		global $langs;
 
-	    $ret = array();
+		$ret = array();
 
-        $sql = "SELECT id, code, label";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_type_fees";
-        $sql .= " WHERE active = ".$active;
+		$sql = "SELECT id, code, label";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_fees";
+		$sql .= " WHERE active = ".$active;
 
-        dol_syslog(get_class($this)."::listOfTypes", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $num = $this->db->num_rows($result);
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($result);
-                $ret[$obj->code] = (($langs->trans($obj->code) != $obj->code) ? $langs->trans($obj->code) : $obj->label);
-                $i++;
-            }
-        } else {
-        	dol_print_error($this->db);
-        }
+		dol_syslog(get_class($this)."::listOfTypes", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($result);
+				$ret[$obj->code] = (($langs->trans($obj->code) != $obj->code) ? $langs->trans($obj->code) : $obj->label);
+				$i++;
+			}
+		} else {
+			dol_print_error($this->db);
+		}
 
-        return $ret;
+		return $ret;
 	}
 
 	/**
diff --git a/htdocs/compta/deplacement/class/deplacementstats.class.php b/htdocs/compta/deplacement/class/deplacementstats.class.php
index 953ee78a3d6..d6ad82a4cbe 100644
--- a/htdocs/compta/deplacement/class/deplacementstats.class.php
+++ b/htdocs/compta/deplacement/class/deplacementstats.class.php
@@ -30,24 +30,24 @@ include_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php'
  */
 class DeplacementStats extends Stats
 {
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element;
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element;
 
-    public $socid;
-    public $userid;
+	public $socid;
+	public $userid;
 
-    public $from;
-    public $field;
-    public $where;
+	public $from;
+	public $field;
+	public $where;
 
 	/**
 	 * Constructor
 	 *
 	 * @param 	DoliDB		$db		   Database handler
 	 * @param 	int			$socid	   Id third party
-     * @param   mixed		$userid    Id user for filter or array of user ids
+	 * @param   mixed		$userid    Id user for filter or array of user ids
 	 * @return 	void
 	 */
 	public function __construct($db, $socid = 0, $userid = 0)
@@ -55,8 +55,8 @@ class DeplacementStats extends Stats
 		global $conf;
 
 		$this->db = $db;
-        $this->socid = $socid;
-        $this->userid = $userid;
+		$this->socid = $socid;
+		$this->userid = $userid;
 
 		$object = new Deplacement($this->db);
 		$this->from = MAIN_DB_PREFIX.$object->table_element;
@@ -69,7 +69,7 @@ class DeplacementStats extends Stats
 			$this->where .= " AND fk_soc = ".$this->socid;
 		}
 		if (is_array($this->userid) && count($this->userid) > 0) $this->where .= ' AND fk_user IN ('.join(',', $this->userid).')';
-        elseif ($this->userid > 0) $this->where .= ' AND fk_user = '.$this->userid;
+		elseif ($this->userid > 0) $this->where .= ' AND fk_user = '.$this->userid;
 	}
 
 
@@ -93,7 +93,7 @@ class DeplacementStats extends Stats
 	 * 	Renvoie le nombre de facture par mois pour une annee donnee
 	 *
 	 *	@param	string	$year	Year to scan
-     *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 *	@return	array			Array of values
 	 */
 	public function getNbByMonth($year, $format = 0)
@@ -103,7 +103,7 @@ class DeplacementStats extends Stats
 		$sql .= " WHERE YEAR(dated) = ".$year;
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		$res = $this->_getNbByMonth($year, $sql, $format);
 		//var_dump($res);print '<br>';
@@ -115,7 +115,7 @@ class DeplacementStats extends Stats
 	 * 	Renvoie le montant de facture par mois pour une annee donnee
 	 *
 	 *	@param	int		$year		Year to scan
-     *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 *	@return	array				Array of values
 	 */
 	public function getAmountByMonth($year, $format = 0)
@@ -145,7 +145,7 @@ class DeplacementStats extends Stats
 		$sql .= " WHERE date_format(dated,'%Y') = '".$this->db->escape($year)."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getAverageByMonth($year, $sql);
 	}
@@ -155,14 +155,14 @@ class DeplacementStats extends Stats
 	 *
 	 *	@return	array				Array of values
 	 */
-    public function getAllByYear()
-    {
-        $sql = "SELECT date_format(dated,'%Y') as year, count(*) as nb, sum(".$this->field.") as total, avg(".$this->field.") as avg";
-        $sql .= " FROM ".$this->from;
-        $sql .= " WHERE ".$this->where;
-        $sql .= " GROUP BY year";
-        $sql .= $this->db->order('year', 'DESC');
+	public function getAllByYear()
+	{
+		$sql = "SELECT date_format(dated,'%Y') as year, count(*) as nb, sum(".$this->field.") as total, avg(".$this->field.") as avg";
+		$sql .= " FROM ".$this->from;
+		$sql .= " WHERE ".$this->where;
+		$sql .= " GROUP BY year";
+		$sql .= $this->db->order('year', 'DESC');
 
-        return $this->_getAllByYear($sql);
-    }
+		return $this->_getAllByYear($sql);
+	}
 }
diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php
index 47b1709ff60..86d0dd383f1 100644
--- a/htdocs/compta/deplacement/document.php
+++ b/htdocs/compta/deplacement/document.php
@@ -89,7 +89,7 @@ if ($object->id)
 
 	$head = trip_prepare_head($object);
 
-	dol_fiche_head($head, 'documents', $langs->trans("TripCard"), 0, 'trip');
+	print dol_get_fiche_head($head, 'documents', $langs->trans("TripCard"), 0, 'trip');
 
 
 	// Build file list
@@ -101,9 +101,9 @@ if ($object->id)
 	}
 
 
-    print '<table class="border tableforfield centpercent">';
+	print '<table class="border tableforfield centpercent">';
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/compta/deplacement/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/deplacement/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	// Ref
 	print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td>';
@@ -113,16 +113,16 @@ if ($object->id)
 	// Societe
 	//print "<tr><td>".$langs->trans("Company")."</td><td>".$object->client->getNomUrl(1)."</td></tr>";
 
-    print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-    print '</table>';
+	print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    $modulepart = 'deplacement';
-    $permission = $user->rights->deplacement->creer;
-    $param = '&id='.$object->id;
-    include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	$modulepart = 'deplacement';
+	$permission = $user->rights->deplacement->creer;
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
 	print $langs->trans("ErrorUnknown");
 }
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index 0cea847f9ce..bcebeb128d0 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -74,20 +74,20 @@ $sql .= " ORDER BY d.type";
 $result = $db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
-    $i = 0;
-    while ($i < $num)
-    {
-        $objp = $db->fetch_object($result);
+	$num = $db->num_rows($result);
+	$i = 0;
+	while ($i < $num)
+	{
+		$objp = $db->fetch_object($result);
 
-        $somme[$objp->type] = $objp->km;
-        $nb[$objp->type] = $objp->nb;
-        $totalnb += $objp->nb;
-        $i++;
-    }
-    $db->free($result);
+		$somme[$objp->type] = $objp->km;
+		$nb[$objp->type] = $objp->nb;
+		$totalnb += $objp->nb;
+		$i++;
+	}
+	$db->free($result);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
@@ -106,24 +106,24 @@ print "</tr>\n";
 $listoftype = $tripandexpense_static->listOfTypes();
 foreach ($listoftype as $code => $label)
 {
-    $dataseries[] = array($label, (isset($nb[$code]) ? (int) $nb[$code] : 0));
+	$dataseries[] = array($label, (isset($nb[$code]) ? (int) $nb[$code] : 0));
 }
 
 if ($conf->use_javascript_ajax)
 {
-    print '<tr><td align="center" colspan="4">';
+	print '<tr><td align="center" colspan="4">';
 
-    include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
-    $dolgraph = new DolGraph();
-    $dolgraph->SetData($dataseries);
-    $dolgraph->setShowLegend(2);
-    $dolgraph->setShowPercent(1);
-    $dolgraph->SetType(array('pie'));
-    $dolgraph->setHeight('200');
-    $dolgraph->draw('idgraphstatus');
-    print $dolgraph->show($totalnb ? 0 : 1);
+	include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+	$dolgraph = new DolGraph();
+	$dolgraph->SetData($dataseries);
+	$dolgraph->setShowLegend(2);
+	$dolgraph->setShowPercent(1);
+	$dolgraph->SetType(array('pie'));
+	$dolgraph->setHeight('200');
+	$dolgraph->draw('idgraphstatus');
+	print $dolgraph->show($totalnb ? 0 : 1);
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 print '<tr class="liste_total">';
@@ -156,46 +156,46 @@ $sql .= $db->plimit($max, 0);
 $result = $db->query($sql);
 if ($result)
 {
-    $var = false;
-    $num = $db->num_rows($result);
+	$var = false;
+	$num = $db->num_rows($result);
 
-    $i = 0;
+	$i = 0;
 
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses", min($max, $num)).'</td>';
-    print '<td class="right">'.$langs->trans("FeesKilometersOrAmout").'</td>';
-    print '<td class="right">'.$langs->trans("DateModificationShort").'</td>';
-    print '<td width="16">&nbsp;</td>';
-    print '</tr>';
-    if ($num)
-    {
-        $total_ttc = $totalam = $total = 0;
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses", min($max, $num)).'</td>';
+	print '<td class="right">'.$langs->trans("FeesKilometersOrAmout").'</td>';
+	print '<td class="right">'.$langs->trans("DateModificationShort").'</td>';
+	print '<td width="16">&nbsp;</td>';
+	print '</tr>';
+	if ($num)
+	{
+		$total_ttc = $totalam = $total = 0;
 
-        $deplacementstatic = new Deplacement($db);
-        $userstatic = new User($db);
-        while ($i < $num && $i < $max)
-        {
-            $obj = $db->fetch_object($result);
-            $deplacementstatic->ref = $obj->rowid;
-            $deplacementstatic->id = $obj->rowid;
-            $userstatic->id = $obj->uid;
-            $userstatic->lastname = $obj->lastname;
-            $userstatic->firstname = $obj->firstname;
-            print '<tr class="oddeven">';
-            print '<td>'.$deplacementstatic->getNomUrl(1).'</td>';
-            print '<td>'.$userstatic->getNomUrl(1).'</td>';
-            print '<td class="right">'.$obj->km.'</td>';
-            print '<td class="right">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>';
-            print '<td>'.$deplacementstatic->LibStatut($obj->fk_statut, 3).'</td>';
-            print '</tr>';
+		$deplacementstatic = new Deplacement($db);
+		$userstatic = new User($db);
+		while ($i < $num && $i < $max)
+		{
+			$obj = $db->fetch_object($result);
+			$deplacementstatic->ref = $obj->rowid;
+			$deplacementstatic->id = $obj->rowid;
+			$userstatic->id = $obj->uid;
+			$userstatic->lastname = $obj->lastname;
+			$userstatic->firstname = $obj->firstname;
+			print '<tr class="oddeven">';
+			print '<td>'.$deplacementstatic->getNomUrl(1).'</td>';
+			print '<td>'.$userstatic->getNomUrl(1).'</td>';
+			print '<td class="right">'.$obj->km.'</td>';
+			print '<td class="right">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>';
+			print '<td>'.$deplacementstatic->LibStatut($obj->fk_statut, 3).'</td>';
+			print '</tr>';
 
-            $i++;
-        }
-    } else {
-        print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-    }
-    print '</table><br>';
+			$i++;
+		}
+	} else {
+		print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+	}
+	print '</table><br>';
 } else dol_print_error($db);
 
 
diff --git a/htdocs/compta/deplacement/info.php b/htdocs/compta/deplacement/info.php
index a63494451cf..586eac52ee7 100644
--- a/htdocs/compta/deplacement/info.php
+++ b/htdocs/compta/deplacement/info.php
@@ -50,13 +50,13 @@ if ($id)
 
 	$head = trip_prepare_head($object);
 
-	dol_fiche_head($head, 'info', $langs->trans("TripCard"), 0, 'trip');
+	print dol_get_fiche_head($head, 'info', $langs->trans("TripCard"), 0, 'trip');
 
-    print '<table width="100%"><tr><td>';
-    dol_print_object_info($object);
-    print '</td></tr></table>';
+	print '<table width="100%"><tr><td>';
+	dol_print_object_info($object);
+	print '</td></tr></table>';
 
-    print '</div>';
+	print '</div>';
 }
 
 // End of page
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index 78c1f32556d..df18b09e2b4 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -99,11 +99,11 @@ if ($socid) $sql .= " AND s.rowid = ".$socid;
 if ($search_ref)		$sql .= " AND d.rowid=".$search_ref;
 if ($search_name)
 {
-    $sql .= natural_search('u.lastname', $search_name);
+	$sql .= natural_search('u.lastname', $search_name);
 }
 if ($search_company)
 {
-    $sql .= natural_search('s.nom', $search_company);
+	$sql .= natural_search('s.nom', $search_company);
 }
 $sql .= dolSqlDateFilter("d.dated", $day, $month, $year);
 
@@ -114,90 +114,90 @@ $sql .= $db->plimit($limit + 1, $offset);
 $resql = $db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
+	$num = $db->num_rows($resql);
 
-    print_barre_liste($langs->trans("ListOfFees"), $page, $_SERVER["PHP_SELF"], "&socid=$socid", $sortfield, $sortorder, '', $num);
+	print_barre_liste($langs->trans("ListOfFees"), $page, $_SERVER["PHP_SELF"], "&socid=$socid", $sortfield, $sortorder, '', $num);
 
-    $i = 0;
-    print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-    print '<table class="noborder centpercent">';
-    print "<tr class=\"liste_titre\">";
-    print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "d.rowid", "", "&socid=$socid", '', $sortfield, $sortorder);
-    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "d.type", "", "&socid=$socid", '', $sortfield, $sortorder);
-    print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "d.dated", "", "&socid=$socid", 'align="center"', $sortfield, $sortorder);
-    print_liste_field_titre("Person", $_SERVER["PHP_SELF"], "u.lastname", "", "&socid=$socid", '', $sortfield, $sortorder);
-    print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", "", "&socid=$socid", '', $sortfield, $sortorder);
-    print_liste_field_titre("FeesKilometersOrAmout", $_SERVER["PHP_SELF"], "d.km", "", "&socid=$socid", 'class="right"', $sortfield, $sortorder);
-    print_liste_field_titre('');
-    print "</tr>\n";
+	$i = 0;
+	print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+	print '<table class="noborder centpercent">';
+	print "<tr class=\"liste_titre\">";
+	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "d.rowid", "", "&socid=$socid", '', $sortfield, $sortorder);
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "d.type", "", "&socid=$socid", '', $sortfield, $sortorder);
+	print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "d.dated", "", "&socid=$socid", 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre("Person", $_SERVER["PHP_SELF"], "u.lastname", "", "&socid=$socid", '', $sortfield, $sortorder);
+	print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", "", "&socid=$socid", '', $sortfield, $sortorder);
+	print_liste_field_titre("FeesKilometersOrAmout", $_SERVER["PHP_SELF"], "d.km", "", "&socid=$socid", 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre('');
+	print "</tr>\n";
 
-    // Filters lines
-    print '<tr class="liste_titre">';
-    print '<td class="liste_titre">';
-    print '<input class="flat" size="4" type="text" name="search_ref" value="'.$search_ref.'">';
-    print '</td>';
-    print '<td class="liste_titre">';
-    print '&nbsp;';
-    print '</td>';
-    print '<td class="liste_titre" align="center">';
-    if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
-    print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
-    $formother->select_year($year ? $year : -1, 'year', 1, 20, 5);
-    print '</td>';
-    print '<td class="liste_titre">';
-    print '<input class="flat" size="10" type="text" name="search_name" value="'.$search_name.'">';
-    print '</td>';
-    print '<td class="liste_titre">';
-    print '<input class="flat" size="10" type="text" name="search_company" value="'.$search_company.'">';
-    print '</td>';
-    print '<td class="liste_titre right">';
-    // print '<input class="flat" size="10" type="text" name="search_amount" value="'.$search_amount.'">';
-    print '</td>';
-    print '<td class="liste_titre maxwidthsearch">';
-    $searchpicto = $form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
-    print "</tr>\n";
+	// Filters lines
+	print '<tr class="liste_titre">';
+	print '<td class="liste_titre">';
+	print '<input class="flat" size="4" type="text" name="search_ref" value="'.$search_ref.'">';
+	print '</td>';
+	print '<td class="liste_titre">';
+	print '&nbsp;';
+	print '</td>';
+	print '<td class="liste_titre" align="center">';
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
+	print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
+	$formother->select_year($year ? $year : -1, 'year', 1, 20, 5);
+	print '</td>';
+	print '<td class="liste_titre">';
+	print '<input class="flat" size="10" type="text" name="search_name" value="'.$search_name.'">';
+	print '</td>';
+	print '<td class="liste_titre">';
+	print '<input class="flat" size="10" type="text" name="search_company" value="'.$search_company.'">';
+	print '</td>';
+	print '<td class="liste_titre right">';
+	// print '<input class="flat" size="10" type="text" name="search_amount" value="'.$search_amount.'">';
+	print '</td>';
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
+	print '</td>';
+	print "</tr>\n";
 
-    while ($i < min($num, $limit))
-    {
-        $obj = $db->fetch_object($resql);
+	while ($i < min($num, $limit))
+	{
+		$obj = $db->fetch_object($resql);
 
-        $soc = new Societe($db);
-        if ($obj->socid) $soc->fetch($obj->socid);
+		$soc = new Societe($db);
+		if ($obj->socid) $soc->fetch($obj->socid);
 
-        print '<tr class="oddeven">';
-        // Id
-        print '<td><a href="card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowTrip"), "trip").' '.$obj->rowid.'</a></td>';
-        // Type
-        print '<td>'.$langs->trans($obj->type).'</td>';
-        // Date
-        print '<td class="center">'.dol_print_date($db->jdate($obj->dd), 'day').'</td>';
-        // User
-        print '<td>';
-        $userstatic->id = $obj->fk_user;
-        $userstatic->lastname = $obj->lastname;
-        $userstatic->firstname = $obj->firstname;
-        print $userstatic->getNomUrl(1);
-        print '</td>';
+		print '<tr class="oddeven">';
+		// Id
+		print '<td><a href="card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowTrip"), "trip").' '.$obj->rowid.'</a></td>';
+		// Type
+		print '<td>'.$langs->trans($obj->type).'</td>';
+		// Date
+		print '<td class="center">'.dol_print_date($db->jdate($obj->dd), 'day').'</td>';
+		// User
+		print '<td>';
+		$userstatic->id = $obj->fk_user;
+		$userstatic->lastname = $obj->lastname;
+		$userstatic->firstname = $obj->firstname;
+		print $userstatic->getNomUrl(1);
+		print '</td>';
 
-        if ($obj->socid) print '<td>'.$soc->getNomUrl(1).'</td>';
-        else print '<td>&nbsp;</td>';
+		if ($obj->socid) print '<td>'.$soc->getNomUrl(1).'</td>';
+		else print '<td>&nbsp;</td>';
 
-        print '<td class="right">'.$obj->km.'</td>';
+		print '<td class="right">'.$obj->km.'</td>';
 
-        $tripandexpense_static->statut = $obj->fk_statut;
-        print '<td class="right">'.$tripandexpense_static->getLibStatut(5).'</td>';
-        print "</tr>\n";
+		$tripandexpense_static->statut = $obj->fk_statut;
+		print '<td class="right">'.$tripandexpense_static->getLibStatut(5).'</td>';
+		print "</tr>\n";
 
-        $i++;
-    }
+		$i++;
+	}
 
-    print "</table>";
-    print "</form>\n";
-    $db->free($resql);
+	print "</table>";
+	print "</form>\n";
+	$db->free($resql);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // End of page
diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php
index 7707cb40786..389c8d9408f 100644
--- a/htdocs/compta/deplacement/stats/index.php
+++ b/htdocs/compta/deplacement/stats/index.php
@@ -164,38 +164,38 @@ $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	$filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
 } else {
-    $filename_avg = $dir.'/ordersaverage-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
+	$filename_avg = $dir.'/ordersaverage-'.$year.'.png';
+	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
+	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
 }
 
 $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
 if (!$mesg)
 {
-    $px3->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px3->SetLegend($legend);
-    $px3->SetYLabel($langs->trans("AmountAverage"));
-    $px3->SetMaxValue($px3->GetCeilMaxValue());
-    $px3->SetMinValue($px3->GetFloorMinValue());
-    $px3->SetWidth($WIDTH);
-    $px3->SetHeight($HEIGHT);
-    $px3->SetShading(3);
-    $px3->SetHorizTickIncrement(1);
-    $px3->mode = 'depth';
-    $px3->SetTitle($langs->trans("AmountAverage"));
+	$px3->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px3->SetLegend($legend);
+	$px3->SetYLabel($langs->trans("AmountAverage"));
+	$px3->SetMaxValue($px3->GetCeilMaxValue());
+	$px3->SetMinValue($px3->GetFloorMinValue());
+	$px3->SetWidth($WIDTH);
+	$px3->SetHeight($HEIGHT);
+	$px3->SetShading(3);
+	$px3->SetHorizTickIncrement(1);
+	$px3->mode = 'depth';
+	$px3->SetTitle($langs->trans("AmountAverage"));
 
-    $px3->draw($filename_avg, $fileurl_avg);
+	$px3->draw($filename_avg, $fileurl_avg);
 }
 
 
@@ -203,7 +203,7 @@ if (!$mesg)
 $data = $stats->getAllByYear();
 $arrayyears = array();
 foreach ($data as $val) {
-    $arrayyears[$val['year']] = $val['year'];
+	$arrayyears[$val['year']] = $val['year'];
 }
 if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;
 
@@ -217,7 +217,7 @@ $h++;
 
 complete_head_from_modules($conf, $langs, null, $head, $h, 'trip_stats');
 
-dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
+print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
@@ -293,11 +293,11 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td align="center">';
 if ($mesg) { print $mesg; } else {
-    print $px1->show();
+	print $px1->show();
 	print "<br>\n";
 	print $px2->show();
-    print "<br>\n";
-    print $px3->show();
+	print "<br>\n";
+	print $px3->show();
 }
 print '</td></tr></table>';
 
@@ -306,7 +306,7 @@ print '</div></div></div>';
 print '<div style="clear:both"></div>';
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/compta/facture/admin/facture_cust_extrafields.php b/htdocs/compta/facture/admin/facture_cust_extrafields.php
index df5cb39f9e4..0e971954d56 100644
--- a/htdocs/compta/facture/admin/facture_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facture_cust_extrafields.php
@@ -69,19 +69,19 @@ print load_fiche_titre($langs->trans("BillsSetup"), $linkback, 'title_setup');
 
 $head = invoice_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Invoices"), -1, 'invoice');
+print dol_get_fiche_head($head, 'attributes', $langs->trans("Invoices"), -1, 'invoice');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -94,9 +94,9 @@ if ($action != 'create' && $action != 'edit')
 if ($action == 'create')
 {
 	print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /*
@@ -109,9 +109,9 @@ if ($action == 'edit' && !empty($attrname))
 	$langs->load("members");
 
 	print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php b/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php
index a8d073958ad..dbc395e5d65 100644
--- a/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php
@@ -70,19 +70,19 @@ print load_fiche_titre($langs->trans("BillsSetup"), $linkback, 'title_setup');
 
 $head = invoice_admin_prepare_head();
 
-dol_fiche_head($head, 'attributesrec', $langs->trans("Invoices"), -1, 'invoice');
+print dol_get_fiche_head($head, 'attributesrec', $langs->trans("Invoices"), -1, 'invoice');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -95,9 +95,9 @@ if ($action != 'create' && $action != 'edit')
 if ($action == 'create')
 {
 	print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /*
@@ -110,9 +110,9 @@ if ($action == 'edit' && !empty($attrname))
 	$langs->load("members");
 
 	print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
index ebe2a437a92..c07eb3ac2aa 100644
--- a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
@@ -70,19 +70,19 @@ print load_fiche_titre($langs->trans("BillsSetup"), $linkback, 'title_setup');
 
 $head = invoice_admin_prepare_head();
 
-dol_fiche_head($head, 'attributeslines', $langs->trans("Invoices"), -1, 'invoice');
+print dol_get_fiche_head($head, 'attributeslines', $langs->trans("Invoices"), -1, 'invoice');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -95,9 +95,9 @@ if ($action != 'create' && $action != 'edit')
 if ($action == 'create')
 {
 	print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /*
@@ -107,10 +107,10 @@ if ($action == 'create')
  */
 if ($action == 'edit' && !empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php b/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php
index a09b0380f59..772a3aa680c 100644
--- a/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php
@@ -70,19 +70,19 @@ print load_fiche_titre($langs->trans("BillsSetup"), $linkback, 'title_setup');
 
 $head = invoice_admin_prepare_head();
 
-dol_fiche_head($head, 'attributeslinesrec', $langs->trans("Invoices"), -1, 'invoice');
+print dol_get_fiche_head($head, 'attributeslinesrec', $langs->trans("Invoices"), -1, 'invoice');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -95,9 +95,9 @@ if ($action != 'create' && $action != 'edit')
 if ($action == 'create')
 {
 	print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /*
@@ -107,10 +107,10 @@ if ($action == 'create')
  */
 if ($action == 'edit' && !empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index a11f0f7c800..11dec142a17 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -117,6 +117,8 @@ $usercancreatewithdrarequest = $user->rights->prelevement->bons->creer;
 
 $now = dol_now();
 
+$error = 0;
+
 
 /*
  * Actions
@@ -188,18 +190,18 @@ if (empty($reshook))
 
 		if (!$error)
 		{
-			$object->titre = GETPOST('titre', 'nohtml'); // deprecated
-			$object->title = GETPOST('titre', 'nohtml');
+			$object->titre = GETPOST('title', 'nohtml'); // deprecated
+			$object->title = GETPOST('title', 'nohtml');
 			$object->note_private = GETPOST('note_private', 'restricthtml');
-            $object->note_public = GETPOST('note_public', 'restricthtml');
-            $object->model_pdf = GETPOST('modelpdf', 'alpha');
+			$object->note_public = GETPOST('note_public', 'restricthtml');
+			$object->model_pdf = GETPOST('modelpdf', 'alpha');
 			$object->usenewprice = GETPOST('usenewprice', 'alpha');
 
 			$object->frequency = $frequency;
 			$object->unit_frequency = GETPOST('unit_frequency', 'alpha');
 			$object->nb_gen_max = $nb_gen_max;
 			$object->auto_validate = GETPOST('auto_validate', 'int');
-            $object->generate_pdf = GETPOST('generate_pdf', 'int');
+			$object->generate_pdf = GETPOST('generate_pdf', 'int');
 			$object->fk_project = $projectid;
 
 			$date_next_execution = dol_mktime($rehour, $remin, 0, $remonth, $reday, $reyear);
@@ -287,13 +289,21 @@ if (empty($reshook))
 	elseif ($action == 'setref' && $user->rights->facture->creer)
 	{
 		//var_dump(GETPOST('ref', 'alpha'));exit;
-		$result = $object->setValueFrom('titre', GETPOST('ref', 'alpha'), '', null, 'text', '', $user, 'BILLREC_MODIFY');
+		$result = $object->setValueFrom('titre', $ref, '', null, 'text', '', $user, 'BILLREC_MODIFY');
 		if ($result > 0)
 		{
 			$object->titre = GETPOST('ref', 'alpha'); // deprecated
 			$object->title = GETPOST('ref', 'alpha');
 			$object->ref = $object->title;
-		} else dol_print_error($db, $object->error, $object->errors);
+		} else {
+			$error++;
+			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				$langs->load("errors");
+				setEventMessages($langs->trans('ErrorRefAlreadyExists', $ref), null, 'errors');
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
 	} // Set bank account
 	elseif ($action == 'setbankaccount' && $user->rights->facture->creer)
 	{
@@ -315,7 +325,7 @@ if (empty($reshook))
 	elseif ($action == 'setauto_validate' && $user->rights->facture->creer)
 	{
 		$object->setAutoValidate(GETPOST('auto_validate', 'int'));
-    } // Set generate pdf
+	} // Set generate pdf
 	elseif ($action == 'setgenerate_pdf' && $user->rights->facture->creer)
 	{
 		$object->setGeneratepdf(GETPOST('generate_pdf', 'int'));
@@ -945,7 +955,7 @@ if ($action == 'create')
 		print '<input type="hidden" name="action" value="add">';
 		print '<input type="hidden" name="facid" value="'.$object->id.'">';
 
-		dol_fiche_head(null, '', '', 0);
+		print dol_get_fiche_head(null, '', '', 0);
 
 		$rowspan = 4;
 		if (!empty($conf->projet->enabled)) $rowspan++;
@@ -957,7 +967,7 @@ if ($action == 'create')
 
 		// Title
 		print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Title").'</td><td>';
-		print '<input class="flat quatrevingtpercent" type="text" name="titre" value="'.$_POST["titre"].'">';
+		print '<input class="flat quatrevingtpercent" type="text" name="titre" value="'.dol_escape_htmltag(GETPOST("titre", 'alphanohtml')).'">';
 		print '</td></tr>';
 
 		// Third party
@@ -1047,23 +1057,23 @@ if ($action == 'create')
 			print "</td></tr>";
 		}
 
-        // Model pdf
-        print "<tr><td>".$langs->trans('Model')."</td><td>";
-        include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
-        $list = ModelePDFFactures::liste_modeles($db);
-        print $form->selectarray('modelpdf', $list, $conf->global->FACTURE_ADDON_PDF);
-        print "</td></tr>";
+		// Model pdf
+		print "<tr><td>".$langs->trans('Model')."</td><td>";
+		include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
+		$list = ModelePDFFactures::liste_modeles($db);
+		print $form->selectarray('modelpdf', $list, $conf->global->FACTURE_ADDON_PDF);
+		print "</td></tr>";
 
 		print "</table>";
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		// Autogeneration
 		$title = $langs->trans("Recurrence");
 		print load_fiche_titre('<span class="fa fa-calendar"></span> '.$title, '', '');
 
-		dol_fiche_head(null, '', '', 0);
+		print dol_get_fiche_head(null, '', '', 0);
 
 		print '<table class="border centpercent">';
 
@@ -1102,7 +1112,7 @@ if ($action == 'create')
 
 		print "</table>";
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		$title = $langs->trans("ProductsAndServices");
@@ -1145,7 +1155,7 @@ if ($action == 'create')
 
 		print '<div align="center"><input type="submit" class="button" value="'.$langs->trans("Create").'">';
 		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+		print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 		print '</div>';
 		print "</form>\n";
 	} else {
@@ -1176,7 +1186,7 @@ if ($action == 'create')
 
 		$head = invoice_rec_prepare_head($object);
 
-		dol_fiche_head($head, 'card', $langs->trans("RepeatableInvoice"), -1, 'bill'); // Add a div
+		print dol_get_fiche_head($head, 'card', $langs->trans("RepeatableInvoice"), -1, 'bill'); // Add a div
 
 		// Recurring invoice content
 
@@ -1233,7 +1243,7 @@ if ($action == 'create')
 		print '<div class="fichehalfleft">';
 		print '<div class="underbanner clearboth"></div>';
 
-		print '<table class="border centpercent">';
+		print '<table class="border centpercent tableforfield">';
 
 		print '<tr><td class="titlefield">'.$langs->trans("Author").'</td><td>'.$author->getFullName($langs)."</td></tr>";
 
@@ -1262,7 +1272,7 @@ if ($action == 'create')
 
 		// Payment term
 		print '<tr><td>';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print '<table class="nobordernopadding centpercent"><tr><td>';
 		print $langs->trans('PaymentConditionsShort');
 		print '</td>';
 		if ($action != 'editconditions' && $user->rights->facture->creer)
@@ -1327,7 +1337,7 @@ if ($action == 'create')
 				print '</td>';
 				if ($usercancreate && $action != 'editmulticurrencyrate' && !empty($object->brouillon) && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
 					print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencyrate&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
-                }
+				}
 				print '</tr></table>';
 				print '</td><td>';
 				if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') {
@@ -1365,6 +1375,8 @@ if ($action == 'create')
 		// Only on template invoices
 		$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__'] = $langs->trans("DateNextInvoiceBeforeGen").' ('.$langs->trans("Example").': '.dol_print_date(($object->date_when ? $object->date_when : dol_now()), 'dayhour').')';
 		$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_AFTER_GEN__'] = $langs->trans("DateNextInvoiceAfterGen").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree(($object->date_when ? $object->date_when : dol_now()), $object->frequency, $object->unit_frequency), 'dayhour').')';
+		$substitutionarray['__INVOICE_COUNTER_CURRENT__'] = $object->nb_gen_done;
+		$substitutionarray['__INVOICE_COUNTER_MAX__'] = $object->nb_gen_max;
 
 		$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
 		foreach ($substitutionarray as $key => $val)
@@ -1407,30 +1419,30 @@ if ($action == 'create')
 		print "</td>";
 		print '</tr>';
 
-        // Model pdf
-        print '<tr><td class="nowrap">';
-        print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-        print $langs->trans('Model');
-        print '<td>';
-        if (($action != 'editmodelpdf') && $user->rights->facture->creer && $object->statut == FactureRec::STATUS_DRAFT)
-            print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmodelpdf&amp;id='.$object->id.'">'.img_edit($langs->trans('SetModel'), 1).'</a></td>';
-        print '</tr></table>';
-        print '</td><td>';
-        if ($action == 'editmodelpdf')
-        {
-            include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
-            $list = array();
-            $models = ModelePDFFactures::liste_modeles($db);
-            foreach ($models as $k => $model) {
-                $list[] = str_replace(':', '|', $k).':'.$model;
-            }
-            $select = 'select;'.implode(',', $list);
-            print $form->editfieldval($langs->trans("Model"), 'modelpdf', $object->model_pdf, $object, $user->rights->facture->creer, $select);
-        } else {
-            print $object->model_pdf;
-        }
-        print "</td>";
-        print '</tr>';
+		// Model pdf
+		print '<tr><td class="nowrap">';
+		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+		print $langs->trans('Model');
+		print '<td>';
+		if (($action != 'editmodelpdf') && $user->rights->facture->creer && $object->statut == FactureRec::STATUS_DRAFT)
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmodelpdf&amp;id='.$object->id.'">'.img_edit($langs->trans('SetModel'), 1).'</a></td>';
+		print '</tr></table>';
+		print '</td><td>';
+		if ($action == 'editmodelpdf')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
+			$list = array();
+			$models = ModelePDFFactures::liste_modeles($db);
+			foreach ($models as $k => $model) {
+				$list[] = str_replace(':', '|', $k).':'.$model;
+			}
+			$select = 'select;'.implode(',', $list);
+			print $form->editfieldval($langs->trans("Model"), 'modelpdf', $object->model_pdf, $object, $user->rights->facture->creer, $select);
+		} else {
+			print $object->model_pdf;
+		}
+		print "</td>";
+		print '</tr>';
 
 		// Other attributes
 		$cols = 2;
@@ -1450,7 +1462,7 @@ if ($action == 'create')
 		$title = $langs->trans("Recurrence");
 		//print load_fiche_titre($title, '', 'calendar');
 
-		print '<table class="border centpercent">';
+		print '<table class="border centpercent tableforfield">';
 
 		print '<tr><td colspan="2"><span class="fa fa-calendar"></span> '.$title.'</td></tr>';
 
@@ -1571,7 +1583,7 @@ if ($action == 'create')
 			}
 
 			print '<div class="underbanner clearboth"></div>';
-			print '<table class="border centpercent">';
+			print '<table class="border centpercent tableforfield">';
 
 			// Nb of generation already done
 			print '<tr><td style="width: 50%">'.$langs->trans("NbOfGenerationDone").'</td>';
@@ -1639,7 +1651,7 @@ if ($action == 'create')
 
 		print "</form>\n";
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		/**
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 7b0d7fcf869..4451f13bd77 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -175,19 +175,19 @@ if (empty($reshook))
 	// Action clone object
 	if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd)
 	{
-	    $objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone. We use native clone to keep this->db valid.
+		$objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone. We use native clone to keep this->db valid.
 
-	    $objectutil->date = dol_mktime(12, 0, 0, GETPOST('newdatemonth', 'int'), GETPOST('newdateday', 'int'), GETPOST('newdateyear', 'int'));
-	    $objectutil->socid = $socid;
-	    $result = $objectutil->createFromClone($user, $id);
-	    if ($result > 0) {
-       		header("Location: ".$_SERVER['PHP_SELF'].'?facid='.$result);
-       		exit();
-       	} else {
-       	    $langs->load("errors");
-       		setEventMessages($object->error, $object->errors, 'errors');
-       		$action = '';
-        }
+		$objectutil->date = dol_mktime(12, 0, 0, GETPOST('newdatemonth', 'int'), GETPOST('newdateday', 'int'), GETPOST('newdateyear', 'int'));
+		$objectutil->socid = $socid;
+		$result = $objectutil->createFromClone($user, $id);
+		if ($result > 0) {
+	   		header("Location: ".$_SERVER['PHP_SELF'].'?facid='.$result);
+	   		exit();
+	   	} else {
+	   		$langs->load("errors");
+	   		setEventMessages($object->error, $object->errors, 'errors');
+	   		$action = '';
+		}
 	} // Change status of invoice
 	elseif ($action == 'reopen' && $usercancreate) {
 		$result = $object->fetch($id);
@@ -333,14 +333,9 @@ if (empty($reshook))
 				}
 			}
 		}
-	} elseif ($action == 'set_thirdparty' && $usercancreate)
-	{
-		$object->fetch($id);
-		$object->setValueFrom('fk_soc', $socid, '', null, 'int', '', $user, 'BILL_MODIFY');
+	}
 
-		header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id);
-		exit();
-	} elseif ($action == 'classin' && $usercancreate)
+	elseif ($action == 'classin' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->setProject($_POST['projectid']);
@@ -352,37 +347,34 @@ if (empty($reshook))
 			dol_print_error($db, $object->error);
 	} elseif ($action == 'setretainedwarrantyconditions' && $user->rights->facture->creer)
 	{
-	    $object->fetch($id);
-	    $object->retained_warranty_fk_cond_reglement = 0; // To clean property
-	    $result = $object->setRetainedWarrantyPaymentTerms(GETPOST('retained_warranty_fk_cond_reglement', 'int'));
-	    if ($result < 0) dol_print_error($db, $object->error);
+		$object->fetch($id);
+		$object->retained_warranty_fk_cond_reglement = 0; // To clean property
+		$result = $object->setRetainedWarrantyPaymentTerms(GETPOST('retained_warranty_fk_cond_reglement', 'int'));
+		if ($result < 0) dol_print_error($db, $object->error);
 
-	    $old_rw_date_lim_reglement = $object->retained_warranty_date_limit;
-	    $new_rw_date_lim_reglement = $object->calculate_date_lim_reglement($object->retained_warranty_fk_cond_reglement);
-	    if ($new_rw_date_lim_reglement > $old_rw_date_lim_reglement) $object->retained_warranty_date_limit = $new_rw_date_lim_reglement;
-	    if ($object->retained_warranty_date_limit < $object->date) $object->retained_warranty_date_limit = $object->date;
-	    $result = $object->update($user);
-	    if ($result < 0) dol_print_error($db, $object->error);
-	} elseif ($action == 'setretainedwarranty' && $user->rights->facture->creer)
-	{
-	    $object->fetch($id);
-	    $result = $object->setRetainedWarranty(GETPOST('retained_warranty', 'float'));
-	    if ($result < 0)
-	        dol_print_error($db, $object->error);
-	} elseif ($action == 'setretainedwarrantydatelimit' && $user->rights->facture->creer)
-	{
-	    $object->fetch($id);
-	    $result = $object->setRetainedWarrantyDateLimit(GETPOST('retained_warranty_date_limit', 'float'));
-	    if ($result < 0)
-	        dol_print_error($db, $object->error);
-	} // Multicurrency Code
+		$old_rw_date_lim_reglement = $object->retained_warranty_date_limit;
+		$new_rw_date_lim_reglement = $object->calculate_date_lim_reglement($object->retained_warranty_fk_cond_reglement);
+		if ($new_rw_date_lim_reglement > $old_rw_date_lim_reglement) $object->retained_warranty_date_limit = $new_rw_date_lim_reglement;
+		if ($object->retained_warranty_date_limit < $object->date) $object->retained_warranty_date_limit = $object->date;
+		$result = $object->update($user);
+		if ($result < 0) dol_print_error($db, $object->error);
+	} elseif ($action == 'setretainedwarranty' && $user->rights->facture->creer) {
+		$object->fetch($id);
+		$result = $object->setRetainedWarranty(GETPOST('retained_warranty', 'float'));
+		if ($result < 0)
+			dol_print_error($db, $object->error);
+	} elseif ($action == 'setretainedwarrantydatelimit' && $user->rights->facture->creer) {
+		$object->fetch($id);
+		$result = $object->setRetainedWarrantyDateLimit(GETPOST('retained_warranty_date_limit', 'float'));
+		if ($result < 0)
+			dol_print_error($db, $object->error);
+	}  // Multicurrency Code
 	elseif ($action == 'setmulticurrencycode' && $usercancreate) {
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
 	} // Multicurrency rate
 	elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOST('calculation_mode', 'int'));
-	} elseif ($action == 'setinvoicedate' && $usercancreate)
-	{
+	} elseif ($action == 'setinvoicedate' && $usercancreate) {
 		$object->fetch($id);
 		$old_date_lim_reglement = $object->date_lim_reglement;
 		$date = dol_mktime(12, 0, 0, $_POST['invoicedatemonth'], $_POST['invoicedateday'], $_POST['invoicedateyear']);
@@ -400,8 +392,7 @@ if (empty($reshook))
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
-	} elseif ($action == 'setdate_pointoftax' && $usercancreate)
-	{
+	} elseif ($action == 'setdate_pointoftax' && $usercancreate) {
 		$object->fetch($id);
 		$date_pointoftax = dol_mktime(12, 0, 0, $_POST['date_pointoftaxmonth'], $_POST['date_pointoftaxday'], $_POST['date_pointoftaxyear']);
 		$object->date_pointoftax = $date_pointoftax;
@@ -414,16 +405,35 @@ if (empty($reshook))
 		$object->fetch($id);
 		$object->cond_reglement_code = 0; // To clean property
 		$object->cond_reglement_id = 0; // To clean property
-		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
-		if ($result < 0) dol_print_error($db, $object->error);
 
-		$old_date_lim_reglement = $object->date_lim_reglement;
-		$new_date_lim_reglement = $object->calculate_date_lim_reglement();
-		if ($new_date_lim_reglement > $old_date_lim_reglement) $object->date_lim_reglement = $new_date_lim_reglement;
-		if ($object->date_lim_reglement < $object->date) $object->date_lim_reglement = $object->date;
-		$result = $object->update($user);
-		if ($result < 0) {
-			dol_print_error($db, $object->error);
+		$error = 0;
+
+		$db->begin();
+
+		if (!$error) {
+			$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
+			if ($result < 0) {
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
+
+		if (!$error) {
+			$old_date_lim_reglement = $object->date_lim_reglement;
+			$new_date_lim_reglement = $object->calculate_date_lim_reglement();
+			if ($new_date_lim_reglement > $old_date_lim_reglement) $object->date_lim_reglement = $new_date_lim_reglement;
+			if ($object->date_lim_reglement < $object->date) $object->date_lim_reglement = $object->date;
+			$result = $object->update($user);
+			if ($result < 0) {
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
+
+		if ($error) {
+			$db->rollback();
+		} else {
+			$db->commit();
 		}
 	} elseif ($action == 'setpaymentterm' && $usercancreate)
 	{
@@ -645,6 +655,7 @@ if (empty($reshook))
 						$outputlangs->load('products');
 					}
 					$model = $object->model_pdf;
+
 					$ret = $object->fetch($id); // Reload to get new records
 
 					$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -856,16 +867,16 @@ if (empty($reshook))
 
 				// Total credit note and deposit
 				$total_creditnote_and_deposit = 0;
-                $sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
-                $sql .= " re.description, re.fk_facture_source";
-                $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re";
-                $sql .= " WHERE fk_facture = ".$object->id;
-                $resql = $db->query($sql);
-                if (!empty($resql)) {
-                    while ($obj = $db->fetch_object($resql)) {
-                        $total_creditnote_and_deposit += $obj->amount_ttc;
-                    }
-                } else dol_print_error($db);
+				$sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
+				$sql .= " re.description, re.fk_facture_source";
+				$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re";
+				$sql .= " WHERE fk_facture = ".$object->id;
+				$resql = $db->query($sql);
+				if (!empty($resql)) {
+					while ($obj = $db->fetch_object($resql)) {
+						$total_creditnote_and_deposit += $obj->amount_ttc;
+					}
+				} else dol_print_error($db);
 
 				$discount->amount_ht = $discount->amount_ttc = $total_paiements + $total_creditnote_and_deposit - $object->total_ttc;
 				$discount->amount_tva = 0;
@@ -952,6 +963,7 @@ if (empty($reshook))
 	elseif ($action == 'add' && $usercancreate)
 	{
 		if ($socid > 0) $object->socid = GETPOST('socid', 'int');
+		$selectedLines = GETPOST('toselect', 'array');
 
 		$db->begin();
 
@@ -1066,12 +1078,12 @@ if (empty($reshook))
 				$facture_source = new Facture($db); // fetch origin object
 				if ($facture_source->fetch($object->fk_facture_source) > 0)
 				{
-				    if ($facture_source->type == Facture::TYPE_SITUATION)
-				    {
-				        $object->situation_counter = $facture_source->situation_counter;
-				        $object->situation_cycle_ref = $facture_source->situation_cycle_ref;
-				        $facture_source->fetchPreviousNextSituationInvoice();
-				    }
+					if ($facture_source->type == Facture::TYPE_SITUATION)
+					{
+						$object->situation_counter = $facture_source->situation_counter;
+						$object->situation_cycle_ref = $facture_source->situation_cycle_ref;
+						$facture_source->fetchPreviousNextSituationInvoice();
+					}
 				}
 				$id = $object->create($user);
 
@@ -1102,84 +1114,84 @@ if (empty($reshook))
 
 							if ($facture_source->type == Facture::TYPE_SITUATION)
 							{
-							    $source_fk_prev_id = $line->fk_prev_id; // temporary storing situation invoice fk_prev_id
-							    $line->fk_prev_id  = $line->id; // The new line of the new credit note we are creating must be linked to the situation invoice line it is created from
+								$source_fk_prev_id = $line->fk_prev_id; // temporary storing situation invoice fk_prev_id
+								$line->fk_prev_id  = $line->id; // The new line of the new credit note we are creating must be linked to the situation invoice line it is created from
 
-							    if (!empty($facture_source->tab_previous_situation_invoice))
-							    {
-							        // search the last standard invoice in cycle and the possible credit note between this last and facture_source
-							    	// TODO Move this out of loop of $facture_source->lines
-							    	$tab_jumped_credit_notes = array();
-							    	$lineIndex = count($facture_source->tab_previous_situation_invoice) - 1;
-							        $searchPreviousInvoice = true;
-							        while ($searchPreviousInvoice)
-							        {
-							            if ($facture_source->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_SITUATION || $lineIndex < 1)
-							            {
-							                $searchPreviousInvoice = false; // find, exit;
-							                break;
-							            } else {
-							            	if ($facture_source->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_CREDIT_NOTE) {
-							            		$tab_jumped_credit_notes[$lineIndex] = $facture_source->tab_previous_situation_invoice[$lineIndex]->id;
-							            	}
-							                $lineIndex--; // go to previous invoice in cycle
-							            }
-							        }
+								if (!empty($facture_source->tab_previous_situation_invoice))
+								{
+									// search the last standard invoice in cycle and the possible credit note between this last and facture_source
+									// TODO Move this out of loop of $facture_source->lines
+									$tab_jumped_credit_notes = array();
+									$lineIndex = count($facture_source->tab_previous_situation_invoice) - 1;
+									$searchPreviousInvoice = true;
+									while ($searchPreviousInvoice)
+									{
+										if ($facture_source->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_SITUATION || $lineIndex < 1)
+										{
+											$searchPreviousInvoice = false; // find, exit;
+											break;
+										} else {
+											if ($facture_source->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_CREDIT_NOTE) {
+												$tab_jumped_credit_notes[$lineIndex] = $facture_source->tab_previous_situation_invoice[$lineIndex]->id;
+											}
+											$lineIndex--; // go to previous invoice in cycle
+										}
+									}
 
-							        $maxPrevSituationPercent = 0;
-							        foreach ($facture_source->tab_previous_situation_invoice[$lineIndex]->lines as $prevLine)
-							        {
-							            if ($prevLine->id == $source_fk_prev_id)
-							            {
-							                $maxPrevSituationPercent = max($maxPrevSituationPercent, $prevLine->situation_percent);
+									$maxPrevSituationPercent = 0;
+									foreach ($facture_source->tab_previous_situation_invoice[$lineIndex]->lines as $prevLine)
+									{
+										if ($prevLine->id == $source_fk_prev_id)
+										{
+											$maxPrevSituationPercent = max($maxPrevSituationPercent, $prevLine->situation_percent);
 
-							                //$line->subprice  = $line->subprice - $prevLine->subprice;
-							                $line->total_ht  = $line->total_ht - $prevLine->total_ht;
-							                $line->total_tva = $line->total_tva - $prevLine->total_tva;
-							                $line->total_ttc = $line->total_ttc - $prevLine->total_ttc;
-							                $line->total_localtax1 = $line->total_localtax1 - $prevLine->total_localtax1;
-							                $line->total_localtax2 = $line->total_localtax2 - $prevLine->total_localtax2;
+											//$line->subprice  = $line->subprice - $prevLine->subprice;
+											$line->total_ht  = $line->total_ht - $prevLine->total_ht;
+											$line->total_tva = $line->total_tva - $prevLine->total_tva;
+											$line->total_ttc = $line->total_ttc - $prevLine->total_ttc;
+											$line->total_localtax1 = $line->total_localtax1 - $prevLine->total_localtax1;
+											$line->total_localtax2 = $line->total_localtax2 - $prevLine->total_localtax2;
 
-							                $line->multicurrency_subprice  = $line->multicurrency_subprice - $prevLine->multicurrency_subprice;
-							                $line->multicurrency_total_ht  = $line->multicurrency_total_ht - $prevLine->multicurrency_total_ht;
-							                $line->multicurrency_total_tva = $line->multicurrency_total_tva - $prevLine->multicurrency_total_tva;
-							                $line->multicurrency_total_ttc = $line->multicurrency_total_ttc - $prevLine->multicurrency_total_ttc;
-							            }
-							        }
+											$line->multicurrency_subprice  = $line->multicurrency_subprice - $prevLine->multicurrency_subprice;
+											$line->multicurrency_total_ht  = $line->multicurrency_total_ht - $prevLine->multicurrency_total_ht;
+											$line->multicurrency_total_tva = $line->multicurrency_total_tva - $prevLine->multicurrency_total_tva;
+											$line->multicurrency_total_ttc = $line->multicurrency_total_ttc - $prevLine->multicurrency_total_ttc;
+										}
+									}
 
-							        // prorata
-							        $line->situation_percent = $maxPrevSituationPercent - $line->situation_percent;
+									// prorata
+									$line->situation_percent = $maxPrevSituationPercent - $line->situation_percent;
 
-							        //print 'New line based on invoice id '.$facture_source->tab_previous_situation_invoice[$lineIndex]->id.' fk_prev_id='.$source_fk_prev_id.' will be fk_prev_id='.$line->fk_prev_id.' '.$line->total_ht.' '.$line->situation_percent.'<br>';
+									//print 'New line based on invoice id '.$facture_source->tab_previous_situation_invoice[$lineIndex]->id.' fk_prev_id='.$source_fk_prev_id.' will be fk_prev_id='.$line->fk_prev_id.' '.$line->total_ht.' '.$line->situation_percent.'<br>';
 
-							        // If there is some credit note between last situation invoice and invoice used for credit note generation (note: credit notes are stored as delta)
-							        $maxPrevSituationPercent = 0;
-							        foreach ($tab_jumped_credit_notes as $index => $creditnoteid) {
-							        	foreach ($facture_source->tab_previous_situation_invoice[$index]->lines as $prevLine)
-							        	{
-							        		if ($prevLine->fk_prev_id == $source_fk_prev_id)
-							        		{
-							        			$maxPrevSituationPercent = $prevLine->situation_percent;
+									// If there is some credit note between last situation invoice and invoice used for credit note generation (note: credit notes are stored as delta)
+									$maxPrevSituationPercent = 0;
+									foreach ($tab_jumped_credit_notes as $index => $creditnoteid) {
+										foreach ($facture_source->tab_previous_situation_invoice[$index]->lines as $prevLine)
+										{
+											if ($prevLine->fk_prev_id == $source_fk_prev_id)
+											{
+												$maxPrevSituationPercent = $prevLine->situation_percent;
 
-							        			$line->total_ht  -= $prevLine->total_ht;
-							        			$line->total_tva -= $prevLine->total_tva;
-							        			$line->total_ttc -= $prevLine->total_ttc;
-							        			$line->total_localtax1 -= $prevLine->total_localtax1;
-							        			$line->total_localtax2 -= $prevLine->total_localtax2;
+												$line->total_ht  -= $prevLine->total_ht;
+												$line->total_tva -= $prevLine->total_tva;
+												$line->total_ttc -= $prevLine->total_ttc;
+												$line->total_localtax1 -= $prevLine->total_localtax1;
+												$line->total_localtax2 -= $prevLine->total_localtax2;
 
-							        			$line->multicurrency_subprice  -= $prevLine->multicurrency_subprice;
-							        			$line->multicurrency_total_ht  -= $prevLine->multicurrency_total_ht;
-							        			$line->multicurrency_total_tva -= $prevLine->multicurrency_total_tva;
-							        			$line->multicurrency_total_ttc -= $prevLine->multicurrency_total_ttc;
-							        		}
-							        	}
-							        }
+												$line->multicurrency_subprice  -= $prevLine->multicurrency_subprice;
+												$line->multicurrency_total_ht  -= $prevLine->multicurrency_total_ht;
+												$line->multicurrency_total_tva -= $prevLine->multicurrency_total_tva;
+												$line->multicurrency_total_ttc -= $prevLine->multicurrency_total_ttc;
+											}
+										}
+									}
 
-							        // prorata
-							        $line->situation_percent += $maxPrevSituationPercent;
+									// prorata
+									$line->situation_percent += $maxPrevSituationPercent;
 
-							        //print 'New line based on invoice id '.$facture_source->tab_previous_situation_invoice[$lineIndex]->id.' fk_prev_id='.$source_fk_prev_id.' will be fk_prev_id='.$line->fk_prev_id.' '.$line->total_ht.' '.$line->situation_percent.'<br>';
-							    }
+									//print 'New line based on invoice id '.$facture_source->tab_previous_situation_invoice[$lineIndex]->id.' fk_prev_id='.$source_fk_prev_id.' will be fk_prev_id='.$line->fk_prev_id.' '.$line->total_ht.' '.$line->situation_percent.'<br>';
+								}
 							}
 
 							$line->fk_facture = $object->id;
@@ -1262,7 +1274,7 @@ if (empty($reshook))
 				$object->note_public = trim(GETPOST('note_public', 'restricthtml'));
 				$object->note_private    = trim(GETPOST('note_private', 'restricthtml'));
 				$object->ref_client      = GETPOST('ref_client');
-				$object->model_pdf        = GETPOST('model');
+				$object->model_pdf = GETPOST('model');
 				$object->fk_project = GETPOST('projectid', 'int');
 				$object->cond_reglement_id	= (GETPOST('type') == 3 ? 1 : GETPOST('cond_reglement_id'));
 				$object->mode_reglement_id	= GETPOST('mode_reglement_id', 'int');
@@ -1341,11 +1353,11 @@ if (empty($reshook))
 					$object->retained_warranty_fk_cond_reglement = 0;
 				}
 
-			    $retained_warranty_date_limit = GETPOST('retained_warranty_date_limit');
-			    if (!empty($retained_warranty_date_limit) && $db->jdate($retained_warranty_date_limit)) {
-			        $object->retained_warranty_date_limit = $db->jdate($retained_warranty_date_limit);
-			    }
-			    $object->retained_warranty_date_limit = !empty($object->retained_warranty_date_limit) ? $object->retained_warranty_date_limit : $object->calculate_date_lim_reglement($object->retained_warranty_fk_cond_reglement);
+				$retained_warranty_date_limit = GETPOST('retained_warranty_date_limit');
+				if (!empty($retained_warranty_date_limit) && $db->jdate($retained_warranty_date_limit)) {
+					$object->retained_warranty_date_limit = $db->jdate($retained_warranty_date_limit);
+				}
+				$object->retained_warranty_date_limit = !empty($object->retained_warranty_date_limit) ? $object->retained_warranty_date_limit : $object->calculate_date_lim_reglement($object->retained_warranty_fk_cond_reglement);
 
 				$object->fetch_thirdparty();
 
@@ -1552,8 +1564,11 @@ if (empty($reshook))
 
 								$fk_parent_line = 0;
 								$num = count($lines);
+
 								for ($i = 0; $i < $num; $i++)
 								{
+									if (!in_array($lines[$i]->id, $selectedLines)) continue; // Skip unselected lines
+
 									// Don't add lines with qty 0 when coming from a shipment including all order lines
 									if ($srcobject->element == 'shipping' && $conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS && $lines[$i]->qty == 0) continue;
 									// Don't add closed lines when coming from a contract (Set constant to '0,5' to exclude also inactive lines)
@@ -1624,7 +1639,7 @@ if (empty($reshook))
 										$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty);
 										$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty);
 
-                                        $result = $object->addline(
+										$result = $object->addline(
 											$desc, $lines[$i]->subprice, $lines[$i]->qty, $tva_tx, $localtax1_tx, $localtax2_tx, $lines[$i]->fk_product,
 											$lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, $lines[$i]->fk_remise_except,
 											'HT', 0, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $object->origin, $lines[$i]->rowid,
@@ -1714,7 +1729,7 @@ if (empty($reshook))
 			if (empty($datefacture)) {
 				$error++;
 				$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date"));
-                setEventMessages($mesg, null, 'errors');
+				setEventMessages($mesg, null, 'errors');
 			}
 
 			$date_pointoftax = dol_mktime(12, 0, 0, $_POST['date_pointoftaxmonth'], $_POST['date_pointoftaxday'], $_POST['date_pointoftaxyear']);
@@ -1722,8 +1737,8 @@ if (empty($reshook))
 			if (!($_POST['situations'] > 0)) {
 				$error++;
 				$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("InvoiceSituation"));
-                setEventMessages($mesg, null, 'errors');
-                $action = 'create';
+				setEventMessages($mesg, null, 'errors');
+				$action = 'create';
 			}
 
 			if (!$error) {
@@ -1741,23 +1756,23 @@ if (empty($reshook))
 					// retained warranty
 					if (!empty($conf->global->INVOICE_USE_RETAINED_WARRANTY))
 					{
-					    $retained_warranty = GETPOST('retained_warranty', 'int');
-					    if (price2num($retained_warranty) > 0)
-					    {
-					        $object->retained_warranty = price2num($retained_warranty);
-					    }
+						$retained_warranty = GETPOST('retained_warranty', 'int');
+						if (price2num($retained_warranty) > 0)
+						{
+							$object->retained_warranty = price2num($retained_warranty);
+						}
 
-					    if (GETPOST('retained_warranty_fk_cond_reglement', 'int') > 0)
-					    {
-                			$object->retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
-					    }
+						if (GETPOST('retained_warranty_fk_cond_reglement', 'int') > 0)
+						{
+							$object->retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
+						}
 
-				        $retained_warranty_date_limit = GETPOST('retained_warranty_date_limit');
-				        if (!empty($retained_warranty_date_limit) && $db->jdate($retained_warranty_date_limit)) {
-				            $object->retained_warranty_date_limit = $db->jdate($retained_warranty_date_limit);
-				        }
-					    $object->retained_warranty_date_limit = !empty($object->retained_warranty_date_limit) ? $object->retained_warranty_date_limit : $object->calculate_date_lim_reglement($object->retained_warranty_fk_cond_reglement);
-                	}
+						$retained_warranty_date_limit = GETPOST('retained_warranty_date_limit');
+						if (!empty($retained_warranty_date_limit) && $db->jdate($retained_warranty_date_limit)) {
+							$object->retained_warranty_date_limit = $db->jdate($retained_warranty_date_limit);
+						}
+						$object->retained_warranty_date_limit = !empty($object->retained_warranty_date_limit) ? $object->retained_warranty_date_limit : $object->calculate_date_lim_reglement($object->retained_warranty_fk_cond_reglement);
+					}
 
 					foreach ($object->lines as $i => &$line)
 					{
@@ -1781,16 +1796,16 @@ if (empty($reshook))
 						// Si fk_remise_except defini on vérifie si la réduction à déjà été appliquée
 						if ($line->fk_remise_except)
 						{
-						    $discount = new DiscountAbsolute($line->db);
-						    $result = $discount->fetch($line->fk_remise_except);
-						    if ($result > 0)
-						    {
-						        // Check if discount not already affected to another invoice
-						        if ($discount->fk_facture_line > 0)
-						        {
-						            $line->fk_remise_except = 0;
-						        }
-						    }
+							$discount = new DiscountAbsolute($line->db);
+							$result = $discount->fetch($line->fk_remise_except);
+							if ($result > 0)
+							{
+								// Check if discount not already affected to another invoice
+								if ($discount->fk_facture_line > 0)
+								{
+									$line->fk_remise_except = 0;
+								}
+							}
 						}
 					}
 				}
@@ -2240,20 +2255,20 @@ if (empty($reshook))
 
 		if ($object->type == Facture::TYPE_CREDIT_NOTE && $object->situation_cycle_ref > 0)
 		{
-		    // in case of situation credit note
-		    if (GETPOST('progress') >= 0)
-		    {
-		        $mesg = $langs->trans("CantBeNullOrPositive");
-		        setEventMessages($mesg, null, 'warnings');
-		        $error++;
-		        $result = -1;
-		    } elseif (GETPOST('progress') < $line->situation_percent) // TODO : use a modified $line->get_prev_progress($object->id) result
-		    {
-		        $mesg = $langs->trans("CantBeLessThanMinPercent");
-		        setEventMessages($mesg, null, 'warnings');
-		        $error++;
-		        $result = -1;
-		    }
+			// in case of situation credit note
+			if (GETPOST('progress') >= 0)
+			{
+				$mesg = $langs->trans("CantBeNullOrPositive");
+				setEventMessages($mesg, null, 'warnings');
+				$error++;
+				$result = -1;
+			} elseif (GETPOST('progress') < $line->situation_percent) // TODO : use a modified $line->get_prev_progress($object->id) result
+			{
+				$mesg = $langs->trans("CantBeLessThanMinPercent");
+				setEventMessages($mesg, null, 'warnings');
+				$error++;
+				$result = -1;
+			}
 		} elseif (GETPOST('progress') < $percent)
 		{
 			$mesg = '<div class="warning">'.$langs->trans("CantBeLessThanMinPercent").'</div>';
@@ -2399,209 +2414,209 @@ if (empty($reshook))
 		if (!$object->fetch($id) > 0) dol_print_error($db);
 		if (GETPOST('all_progress') != "")
 		{
-            $all_progress = GETPOST('all_progress', 'int');
+			$all_progress = GETPOST('all_progress', 'int');
 			foreach ($object->lines as $line)
 			{
 				$percent = $line->get_prev_progress($object->id);
 				if (floatval($all_progress) < floatval($percent)) {
-                    $mesg = $langs->trans("Line").' '.$i.' : '.$langs->trans("CantBeLessThanMinPercent");
-                    setEventMessages($mesg, null, 'warnings');
+					$mesg = $langs->trans("Line").' '.$i.' : '.$langs->trans("CantBeLessThanMinPercent");
+					setEventMessages($mesg, null, 'warnings');
 					$result = -1;
 				} else $object->update_percent($line, $_POST['all_progress']);
 			}
 		}
-	} elseif ($action == 'updateline' && $usercancreate && $_POST['cancel'] == $langs->trans('Cancel')) {
+	} elseif ($action == 'updateline' && $usercancreate && $_POST['cancel'] == $langs->trans("Cancel")) {
 		header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id); // To show again edited page
 		exit();
 	} // Outing situation invoice from cycle
 	elseif ($action == 'confirm_situationout' && $confirm == 'yes' && $usercancreate)
 	{
-	    $object->fetch($id, '', '', '', true);
+		$object->fetch($id, '', '', '', true);
 
-	    if ($object->statut == Facture::STATUS_VALIDATED
-	        && $object->type == Facture::TYPE_SITUATION
-	        && $usercancreate
-	        && !$objectidnext
-	        && $object->is_last_in_cycle()
-	    	&& $usercanunvalidate
-	        )
-	    {
-	        $outingError = 0;
-	        $newCycle = $object->newCycle(); // we need to keep the "situation behavior" so we place it on a new situation cycle
-	        if ($newCycle > 1)
-	        {
-	            // Search credit notes
-	            $lastCycle = $object->situation_cycle_ref;
-	            $lastSituationCounter = $object->situation_counter;
-	            $linkedCreditNotesList = array();
+		if ($object->statut == Facture::STATUS_VALIDATED
+			&& $object->type == Facture::TYPE_SITUATION
+			&& $usercancreate
+			&& !$objectidnext
+			&& $object->is_last_in_cycle()
+			&& $usercanunvalidate
+			)
+		{
+			$outingError = 0;
+			$newCycle = $object->newCycle(); // we need to keep the "situation behavior" so we place it on a new situation cycle
+			if ($newCycle > 1)
+			{
+				// Search credit notes
+				$lastCycle = $object->situation_cycle_ref;
+				$lastSituationCounter = $object->situation_counter;
+				$linkedCreditNotesList = array();
 
-                if (count($object->tab_next_situation_invoice) > 0) {
-                    foreach ($object->tab_next_situation_invoice as $next_invoice) {
-                        if ($next_invoice->type == Facture::TYPE_CREDIT_NOTE
-                            && $next_invoice->situation_counter == $object->situation_counter
-                            && $next_invoice->fk_facture_source == $object->id
-                          )
-                        {
-                            $linkedCreditNotesList[] = $next_invoice->id;
-                        }
-                    }
-                }
+				if (count($object->tab_next_situation_invoice) > 0) {
+					foreach ($object->tab_next_situation_invoice as $next_invoice) {
+						if ($next_invoice->type == Facture::TYPE_CREDIT_NOTE
+							&& $next_invoice->situation_counter == $object->situation_counter
+							&& $next_invoice->fk_facture_source == $object->id
+						  )
+						{
+							$linkedCreditNotesList[] = $next_invoice->id;
+						}
+					}
+				}
 
-	            $object->situation_cycle_ref = $newCycle;
-	            $object->situation_counter = 1;
-	            $object->situation_final = 0;
-	            if ($object->update($user) > 0)
-	            {
-	                $errors = 0;
-	                if (count($linkedCreditNotesList) > 0)
-	                {
-	                    // now, credit note must follow
-	                    $sql = 'UPDATE '.MAIN_DB_PREFIX.'facture ';
-	                    $sql .= ' SET situation_cycle_ref='.$newCycle;
-	                    $sql .= ' , situation_final=0';
-	                    $sql .= ' , situation_counter='.$object->situation_counter;
-	                    $sql .= ' WHERE rowid IN ('.implode(',', $linkedCreditNotesList).')';
+				$object->situation_cycle_ref = $newCycle;
+				$object->situation_counter = 1;
+				$object->situation_final = 0;
+				if ($object->update($user) > 0)
+				{
+					$errors = 0;
+					if (count($linkedCreditNotesList) > 0)
+					{
+						// now, credit note must follow
+						$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture ';
+						$sql .= ' SET situation_cycle_ref='.$newCycle;
+						$sql .= ' , situation_final=0';
+						$sql .= ' , situation_counter='.$object->situation_counter;
+						$sql .= ' WHERE rowid IN ('.implode(',', $linkedCreditNotesList).')';
 
-	                    $resql = $db->query($sql);
-	                    if (!$resql) $errors++;
+						$resql = $db->query($sql);
+						if (!$resql) $errors++;
 
-	                    // Change each progression persent on each lines
-	                    foreach ($object->lines as $line)
-	                    {
-	                        // no traitement for special product
-	                        if ($line->product_type == 9)  continue;
+						// Change each progression persent on each lines
+						foreach ($object->lines as $line)
+						{
+							// no traitement for special product
+							if ($line->product_type == 9)  continue;
 
 
-	                        if (!empty($object->tab_previous_situation_invoice))
-	                        {
-                                // search the last invoice in cycle
-	                            $lineIndex = count($object->tab_previous_situation_invoice) - 1;
-                                $searchPreviousInvoice = true;
-                                while ($searchPreviousInvoice)
-                                {
-                                    if ($object->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_SITUATION || $lineIndex < 1)
-                                    {
-                                        $searchPreviousInvoice = false; // find, exit;
-                                        break;
-                                    } else {
-                                        $lineIndex--; // go to previous invoice in cycle
-                                    }
-                                }
+							if (!empty($object->tab_previous_situation_invoice))
+							{
+								// search the last invoice in cycle
+								$lineIndex = count($object->tab_previous_situation_invoice) - 1;
+								$searchPreviousInvoice = true;
+								while ($searchPreviousInvoice)
+								{
+									if ($object->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_SITUATION || $lineIndex < 1)
+									{
+										$searchPreviousInvoice = false; // find, exit;
+										break;
+									} else {
+										$lineIndex--; // go to previous invoice in cycle
+									}
+								}
 
 
-                                $maxPrevSituationPercent = 0;
-                                foreach ($object->tab_previous_situation_invoice[$lineIndex]->lines as $prevLine)
-                                {
-                                    if ($prevLine->id == $line->fk_prev_id)
-                                    {
-                                        $maxPrevSituationPercent = max($maxPrevSituationPercent, $prevLine->situation_percent);
-                                    }
-                                }
+								$maxPrevSituationPercent = 0;
+								foreach ($object->tab_previous_situation_invoice[$lineIndex]->lines as $prevLine)
+								{
+									if ($prevLine->id == $line->fk_prev_id)
+									{
+										$maxPrevSituationPercent = max($maxPrevSituationPercent, $prevLine->situation_percent);
+									}
+								}
 
 
-                                $line->situation_percent = $line->situation_percent - $maxPrevSituationPercent;
+								$line->situation_percent = $line->situation_percent - $maxPrevSituationPercent;
 
-                                if ($line->update() < 0) $errors++;
-	                        }
-	                    }
-	                }
+								if ($line->update() < 0) $errors++;
+							}
+						}
+					}
 
-                    if (!$errors)
-                    {
-                        setEventMessages($langs->trans('Updated'), '', 'mesgs');
-                        header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-                    } else {
-                        setEventMessages($langs->trans('ErrorOutingSituationInvoiceCreditNote'), array(), 'errors');
-                    }
-	            } else {
-	                setEventMessages($langs->trans('ErrorOutingSituationInvoiceOnUpdate'), array(), 'errors');
-	            }
-	        } else {
-	            setEventMessages($langs->trans('ErrorFindNextSituationInvoice'), array(), 'errors');
-	        }
-	    }
+					if (!$errors)
+					{
+						setEventMessages($langs->trans('Updated'), '', 'mesgs');
+						header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+					} else {
+						setEventMessages($langs->trans('ErrorOutingSituationInvoiceCreditNote'), array(), 'errors');
+					}
+				} else {
+					setEventMessages($langs->trans('ErrorOutingSituationInvoiceOnUpdate'), array(), 'errors');
+				}
+			} else {
+				setEventMessages($langs->trans('ErrorFindNextSituationInvoice'), array(), 'errors');
+			}
+		}
 	} // add lines from objectlinked
 	elseif ($action == 'import_lines_from_object'
-	    && $usercancreate
-	    && $object->statut == Facture::STATUS_DRAFT
-	    && ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA || $object->type == Facture::TYPE_SITUATION))
+		&& $usercancreate
+		&& $object->statut == Facture::STATUS_DRAFT
+		&& ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA || $object->type == Facture::TYPE_SITUATION))
 	{
-	    $fromElement = GETPOST('fromelement');
-	    $fromElementid = GETPOST('fromelementid');
-	    $importLines = GETPOST('line_checkbox');
+		$fromElement = GETPOST('fromelement');
+		$fromElementid = GETPOST('fromelementid');
+		$importLines = GETPOST('line_checkbox');
 
-	    if (!empty($importLines) && is_array($importLines) && !empty($fromElement) && ctype_alpha($fromElement) && !empty($fromElementid))
-	    {
-	        if ($fromElement == 'commande')
-	        {
-	            dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
-	            $lineClassName = 'OrderLine';
-	        } elseif ($fromElement == 'propal')
-	        {
-	            dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
-	            $lineClassName = 'PropaleLigne';
-	        }
-	        $nextRang = count($object->lines) + 1;
-	        $importCount = 0;
-	        $error = 0;
-	        foreach ($importLines as $lineId)
-	        {
-	            $lineId = intval($lineId);
-                $originLine = new $lineClassName($db);
-                if (intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0)
-                {
-                    $originLine->fetch_optionals();
-                    $desc = $originLine->desc;
-                    $pu_ht = $originLine->subprice;
-                    $qty = $originLine->qty;
-                    $txtva = $originLine->tva_tx;
-                    $txlocaltax1 = $originLine->localtax1_tx;
-                    $txlocaltax2 = $originLine->localtax2_tx;
-                    $fk_product = $originLine->fk_product;
-                    $remise_percent = $originLine->remise_percent;
-                    $date_start = $originLine->date_start;
-                    $date_end = $originLine->date_end;
-                    $ventil = 0;
-                    $info_bits = $originLine->info_bits;
-                    $fk_remise_except = $originLine->fk_remise_except;
-                    $price_base_type = 'HT';
-                    $pu_ttc = 0;
-                    $type = $originLine->product_type;
-                    $rang = $nextRang++;
-                    $special_code = $originLine->special_code;
-                    $origin = $originLine->element;
-                    $origin_id = $originLine->id;
-                    $fk_parent_line = 0;
-                    $fk_fournprice = $originLine->fk_fournprice;
-                    $pa_ht = $originLine->pa_ht;
-                    $label = $originLine->label;
-                    $array_options = $originLine->array_options;
-                    if ($object->type == Facture::TYPE_SITUATION) {
-                        $situation_percent = 0;
-                    } else {
-                        $situation_percent = 100;
-                    }
-                    $fk_prev_id = '';
-                    $fk_unit = $originLine->fk_unit;
-                    $pu_ht_devise = $originLine->multicurrency_subprice;
+		if (!empty($importLines) && is_array($importLines) && !empty($fromElement) && ctype_alpha($fromElement) && !empty($fromElementid))
+		{
+			if ($fromElement == 'commande')
+			{
+				dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
+				$lineClassName = 'OrderLine';
+			} elseif ($fromElement == 'propal')
+			{
+				dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
+				$lineClassName = 'PropaleLigne';
+			}
+			$nextRang = count($object->lines) + 1;
+			$importCount = 0;
+			$error = 0;
+			foreach ($importLines as $lineId)
+			{
+				$lineId = intval($lineId);
+				$originLine = new $lineClassName($db);
+				if (intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0)
+				{
+					$originLine->fetch_optionals();
+					$desc = $originLine->desc;
+					$pu_ht = $originLine->subprice;
+					$qty = $originLine->qty;
+					$txtva = $originLine->tva_tx;
+					$txlocaltax1 = $originLine->localtax1_tx;
+					$txlocaltax2 = $originLine->localtax2_tx;
+					$fk_product = $originLine->fk_product;
+					$remise_percent = $originLine->remise_percent;
+					$date_start = $originLine->date_start;
+					$date_end = $originLine->date_end;
+					$ventil = 0;
+					$info_bits = $originLine->info_bits;
+					$fk_remise_except = $originLine->fk_remise_except;
+					$price_base_type = 'HT';
+					$pu_ttc = 0;
+					$type = $originLine->product_type;
+					$rang = $nextRang++;
+					$special_code = $originLine->special_code;
+					$origin = $originLine->element;
+					$origin_id = $originLine->id;
+					$fk_parent_line = 0;
+					$fk_fournprice = $originLine->fk_fournprice;
+					$pa_ht = $originLine->pa_ht;
+					$label = $originLine->label;
+					$array_options = $originLine->array_options;
+					if ($object->type == Facture::TYPE_SITUATION) {
+						$situation_percent = 0;
+					} else {
+						$situation_percent = 100;
+					}
+					$fk_prev_id = '';
+					$fk_unit = $originLine->fk_unit;
+					$pu_ht_devise = $originLine->multicurrency_subprice;
 
-                    $res = $object->addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $ventil, $info_bits, $fk_remise_except, $price_base_type, $pu_ttc, $type, $rang, $special_code, $origin, $origin_id, $fk_parent_line, $fk_fournprice, $pa_ht, $label, $array_options, $situation_percent, $fk_prev_id, $fk_unit, $pu_ht_devise);
+					$res = $object->addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $ventil, $info_bits, $fk_remise_except, $price_base_type, $pu_ttc, $type, $rang, $special_code, $origin, $origin_id, $fk_parent_line, $fk_fournprice, $pa_ht, $label, $array_options, $situation_percent, $fk_prev_id, $fk_unit, $pu_ht_devise);
 
-                    if ($res > 0) {
-                        $importCount++;
-                    } else {
-                        $error++;
-                    }
-                } else {
-                    $error++;
-                }
-	        }
+					if ($res > 0) {
+						$importCount++;
+					} else {
+						$error++;
+					}
+				} else {
+					$error++;
+				}
+			}
 
-	        if ($error)
-	        {
-	            setEventMessages($langs->trans('ErrorsOnXLines', $error), null, 'errors');
-	        }
-	    }
+			if ($error)
+			{
+				setEventMessages($langs->trans('ErrorsOnXLines', $error), null, 'errors');
+			}
+		}
 	}
 
 	// Actions when printing a doc from card
@@ -2649,7 +2664,8 @@ if (empty($reshook))
 
 			if ($result > 0 && $id > 0) {
 				$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-				$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+				$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+				$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 			}
 
 			if ($result >= 0) {
@@ -2862,24 +2878,26 @@ if ($action == 'create')
 		$text .= ' '.$langs->trans("ToCreateARecurringInvoiceGene", $langs->transnoentitiesnoconv("MenuFinancial"), $langs->transnoentitiesnoconv("BillsCustomers"), $langs->transnoentitiesnoconv("ListOfTemplates"));
 		if (empty($conf->global->INVOICE_DISABLE_AUTOMATIC_RECURRING_INVOICE))
 		{
-		    $text .= ' '.$langs->trans("ToCreateARecurringInvoiceGeneAuto", $langs->transnoentitiesnoconv('Module2300Name'));
+			$text .= ' '.$langs->trans("ToCreateARecurringInvoiceGeneAuto", $langs->transnoentitiesnoconv('Module2300Name'));
 		}
 		print info_admin($text, 0, 0, 0).'<br>';
 	}
 
-	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="POST" id="formtocreate" name="formtocreate">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 	if ($soc->id > 0) print '<input type="hidden" name="socid" value="'.$soc->id.'">'."\n";
 	print '<input name="ref" type="hidden" value="provisoire">';
 	print '<input name="ref_client" type="hidden" value="'.$ref_client.'">';
-	print '<input name="ref_int" type="hidden" value="'.$ref_int.'">';
+	print '<input name="force_cond_reglement_id" type="hidden" value="0">';
+	print '<input name="force_mode_reglement_id" type="hidden" value="0">';
+	print '<input name="force_fk_account" type="hidden" value="0">';
 	print '<input type="hidden" name="origin" value="'.$origin.'">';
 	print '<input type="hidden" name="originid" value="'.$originid.'">';
 	print '<input type="hidden" name="originentity" value="'.GETPOST('originentity').'">';
 	if (!empty($currency_tx)) print '<input type="hidden" name="originmulticurrency_tx" value="'.$currency_tx.'">';
 
-	dol_fiche_head('');
+	print dol_get_fiche_head('');
 
 	print '<table class="border centpercent">';
 
@@ -2918,15 +2936,24 @@ if ($action == 'create')
 		print '<tr><td class="fieldrequired">'.$langs->trans('Customer').'</td>';
 		print '<td colspan="2">';
 		print $form->select_company($soc->id, 'socid', '((s.client = 1 OR s.client = 3) AND s.status=1)', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
-		// Option to reload page to retrieve customer informations. Note, this clear other input
-		if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
+		// Option to reload page to retrieve customer informations.
+		if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED))
 		{
 			print '<script type="text/javascript">
 			$(document).ready(function() {
 				$("#socid").change(function() {
+					/*
+					console.log("Submit page");
+					$(\'input[name="action"]\').val(\'create\');
+					$(\'input[name="force_cond_reglement_id"]\').val(\'1\');
+					$(\'input[name="force_mode_reglement_id"]\').val(\'1\');
+					$(\'input[name="force_fk_account"]\').val(\'1\');
+					$("#formtocreate").submit(); */
+
+   					// For company change, we must reuse data of comany, not input already done, so we call a GET with action=create, not a POST submit.
+					console.log("We have changed the company - Reload page");
 					var socid = $(this).val();
 			        var fac_rec = $(\'#fac_rec\').val();
-					// reload page
         			window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid+"&fac_rec="+fac_rec;
 				});
 			});
@@ -2983,15 +3010,15 @@ if ($action == 'create')
 				}
 				print '</select>';
 				// Option to reload page to retrieve customer informations. Note, this clear other input
-				if (!empty($conf->global->RELOAD_PAGE_ON_TEMPLATE_CHANGE))
+				if (empty($conf->global->RELOAD_PAGE_ON_TEMPLATE_CHANGE_DISABLED))
 				{
 					print '<script type="text/javascript">
         			$(document).ready(function() {
         				$("#fac_rec").change(function() {
-							console.log("We changed the template invoice");
+							console.log("We have changed the template invoice - Reload page");
         					var fac_rec = $(this).val();
         			        var socid = $(\'#socid\').val();
-        					// reload page
+        					// For template invoice change, we must reuse data of template, not input already done, so we call a GET with action=create, not a POST submit.
         					window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid+"&fac_rec="+fac_rec;
         				});
         			});
@@ -3138,26 +3165,26 @@ if ($action == 'create')
 			print '</div></div>';
 		}
 	} else {
-	    if (!empty($conf->global->INVOICE_USE_SITUATION))
-	    {
-    	    print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
-    	    $tmp = '<input type="radio" name="type" id="radio_situation" value="0" disabled> ';
-    	    $text = '<label>'.$tmp.$langs->trans("InvoiceFirstSituationAsk").'</label> ';
-    	    $text .= '<span class="opacitymedium">('.$langs->trans("YouMustCreateInvoiceFromThird").')</span> ';
-    	    $desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceFirstSituationDesc"), 1, 'help', '', 0, 3);
-    	    print $desc;
-    	    print '</div></div>';
+		if (!empty($conf->global->INVOICE_USE_SITUATION))
+		{
+			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
+			$tmp = '<input type="radio" name="type" id="radio_situation" value="0" disabled> ';
+			$text = '<label>'.$tmp.$langs->trans("InvoiceFirstSituationAsk").'</label> ';
+			$text .= '<span class="opacitymedium">('.$langs->trans("YouMustCreateInvoiceFromThird").')</span> ';
+			$desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceFirstSituationDesc"), 1, 'help', '', 0, 3);
+			print $desc;
+			print '</div></div>';
 
-    	    print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
-    	    $tmp = '<input type="radio" name="type" id="radio_situation" value="0" disabled> ';
-    	    $text = '<label>'.$tmp.$langs->trans("InvoiceSituationAsk").'</label> ';
-    	    $text .= '<span class="opacitymedium">('.$langs->trans("YouMustCreateInvoiceFromThird").')</span> ';
-    	    $desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceFirstSituationDesc"), 1, 'help', '', 0, 3);
-    	    print $desc;
-    	    print '</div></div>';
-	    }
+			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
+			$tmp = '<input type="radio" name="type" id="radio_situation" value="0" disabled> ';
+			$text = '<label>'.$tmp.$langs->trans("InvoiceSituationAsk").'</label> ';
+			$text .= '<span class="opacitymedium">('.$langs->trans("YouMustCreateInvoiceFromThird").')</span> ';
+			$desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceFirstSituationDesc"), 1, 'help', '', 0, 3);
+			print $desc;
+			print '</div></div>';
+		}
 
-	    print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
+		print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 		$tmp = '<input type="radio" name="type" id="radio_replacement" value="0" disabled> ';
 		$text = '<label>'.$tmp.$langs->trans("InvoiceReplacement").'</label> ';
 		$text .= '<span class="opacitymedium">('.$langs->trans("YouMustCreateInvoiceFromThird").')</span> ';
@@ -3240,8 +3267,8 @@ if ($action == 'create')
 				print '<br>&nbsp;&nbsp;&nbsp; <input type="checkbox" name="invoiceAvoirWithPaymentRestAmount" id="invoiceAvoirWithPaymentRestAmount" value="1" onclick="$(\'#credit_note_options input[type=checkbox]\').not(this).prop(\'checked\', false);" '.(GETPOST('invoiceAvoirWithPaymentRestAmount', 'int') > 0 ? 'checked' : '').' /> <label for="invoiceAvoirWithPaymentRestAmount">'.$langs->trans('invoiceAvoirWithPaymentRestAmount')."</label>";
 				print '</div>';
 
-    			print '</div></div>';
-    		}
+				print '</div></div>';
+			}
 		} else {
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 			if (empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) $tmp = '<input type="radio" name="type" id="radio_creditnote" value="0" disabled> ';
@@ -3268,17 +3295,17 @@ if ($action == 'create')
 
 	if (!empty($conf->global->INVOICE_USE_DEFAULT_DOCUMENT)) // Hidden conf
 	{
-    	// Add auto select default document model
-    	$listtType = array(Facture::TYPE_STANDARD, Facture::TYPE_REPLACEMENT, Facture::TYPE_CREDIT_NOTE, Facture::TYPE_DEPOSIT, Facture::TYPE_SITUATION);
-    	$jsListType = '';
-    	foreach ($listtType as $type)
-    	{
-    	    $thisTypeConfName = 'FACTURE_ADDON_PDF_'.$type;
-    	    $curent = !empty($conf->global->{$thisTypeConfName}) ? $conf->global->{$thisTypeConfName}:$conf->global->FACTURE_ADDON_PDF;
-    	    $jsListType .= (!empty($jsListType) ? ',' : '').'"'.$type.'":"'.$curent.'"';
-    	}
+		// Add auto select default document model
+		$listtType = array(Facture::TYPE_STANDARD, Facture::TYPE_REPLACEMENT, Facture::TYPE_CREDIT_NOTE, Facture::TYPE_DEPOSIT, Facture::TYPE_SITUATION);
+		$jsListType = '';
+		foreach ($listtType as $type)
+		{
+			$thisTypeConfName = 'FACTURE_ADDON_PDF_'.$type;
+			$curent = !empty($conf->global->{$thisTypeConfName}) ? $conf->global->{$thisTypeConfName}:$conf->global->FACTURE_ADDON_PDF;
+			$jsListType .= (!empty($jsListType) ? ',' : '').'"'.$type.'":"'.$curent.'"';
+		}
 
-    	print '<script type="text/javascript" language="javascript">
+		print '<script type="text/javascript" language="javascript">
         		$(document).ready(function() {
                     var listType = {'.$jsListType.'};
         			$("[name=\'type\'").change(function() {
@@ -3382,14 +3409,14 @@ if ($action == 'create')
 				}
 			});
 
-			$("[name=\'type\']").trigger("change");
+			$("[name=\'type\']:checked").trigger("change");
 		});
 		</script>';
 	}
 
 	// Payment mode
 	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td colspan="2">';
-	$form->select_types_paiements(isset($_POST['mode_reglement_id']) ? $_POST['mode_reglement_id'] : $mode_reglement_id, 'mode_reglement_id', 'CRDT');
+	$form->select_types_paiements(GETPOSTISSET('mode_reglement_id') ? GETPOST('mode_reglement_id') : $mode_reglement_id, 'mode_reglement_id', 'CRDT');
 	print '</td></tr>';
 
 	// Bank Account
@@ -3436,7 +3463,7 @@ if ($action == 'create')
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	if (empty($reshook)) {
-		if (!empty($conf->global->THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_INVOICE)) {
+		if (!empty($conf->global->THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_INVOICE) && !empty($soc->id)) {
 			// copy from thirdparty
 			$tpExtrafields = new Extrafields($db);
 			$tpExtrafieldLabels = $tpExtrafields->fetch_name_optionals_label($soc->table_element);
@@ -3455,10 +3482,10 @@ if ($action == 'create')
 	$liste = ModelePDFFactures::liste_modeles($db);
 	if (!empty($conf->global->INVOICE_USE_DEFAULT_DOCUMENT)) {
 		// Hidden conf
-	    $paramkey = 'FACTURE_ADDON_PDF_'.$object->type;
-	    $curent = !empty($conf->global->$paramkey) ? $conf->global->$paramkey : $conf->global->FACTURE_ADDON_PDF;
+		$paramkey = 'FACTURE_ADDON_PDF_'.$object->type;
+		$curent = !empty($conf->global->$paramkey) ? $conf->global->$paramkey : $conf->global->FACTURE_ADDON_PDF;
 	} else {
-	    $curent = $conf->global->FACTURE_ADDON_PDF;
+		$curent = $conf->global->FACTURE_ADDON_PDF;
 	}
 	print $form->selectarray('model', $liste, $curent);
 	print "</td></tr>";
@@ -3524,7 +3551,7 @@ if ($action == 'create')
 		print '</td></tr>';
 	}
 
-	// Lines from source (TODO Show them also when creating invoice from tempalte invoice)
+	// Lines from source (TODO Show them also when creating invoice from template invoice)
 	if (!empty($origin) && !empty($originid) && is_object($objectsrc))
 	{
 		// TODO for compatibility
@@ -3595,17 +3622,15 @@ if ($action == 'create')
 
 	print "</table>\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	// Button "Create Draft"
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="bouton" value="'.$langs->trans('CreateDraft').'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+	print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 	print '</div>';
 
-	print "</form>\n";
-
 	// Show origin lines
 	if (!empty($origin) && !empty($originid) && is_object($objectsrc)) {
 		print '<br>';
@@ -3615,14 +3640,13 @@ if ($action == 'create')
 
 		print '<table class="noborder centpercent">';
 
-		$objectsrc->printOriginLinesList();
+		$objectsrc->printOriginLinesList('', $selectedLines);
 
 		print '</table>';
 	}
 
-	print '<br>';
-} elseif ($id > 0 || !empty($ref))
-{
+	print '</form>';
+} elseif ($id > 0 || !empty($ref)) {
 	/*
 	 * Show object in view mode
 	 */
@@ -3687,7 +3711,7 @@ if ($action == 'create')
 
 	$head = facture_prepare_head($object);
 
-	dol_fiche_head($head, 'compta', $langs->trans('InvoiceCustomer'), -1, 'bill');
+	print dol_get_fiche_head($head, 'compta', $langs->trans('InvoiceCustomer'), -1, 'bill');
 
 	$formconfirm = '';
 
@@ -3740,18 +3764,18 @@ if ($action == 'create')
 
 	// Confirmation to remove invoice from cycle
 	if ($action == 'situationout') {
-	    $text = $langs->trans('ConfirmRemoveSituationFromCycle', $object->ref);
-	    $label = $langs->trans("ConfirmOuting");
-	    $formquestion = array();
-	    // remove situation from cycle
-	    if ($object->statut == Facture::STATUS_VALIDATED
-	        && $usercancreate
-	        && !$objectidnext
-	        && $object->is_last_in_cycle()
-	    	&& $usercanunvalidate
-	        )
-	    {
-	        $formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id, $label, $text, 'confirm_situationout', $formquestion, "yes", 1);
+		$text = $langs->trans('ConfirmRemoveSituationFromCycle', $object->ref);
+		$label = $langs->trans("ConfirmOuting");
+		$formquestion = array();
+		// remove situation from cycle
+		if ($object->statut == Facture::STATUS_VALIDATED
+			&& $usercancreate
+			&& !$objectidnext
+			&& $object->is_last_in_cycle()
+			&& $usercanunvalidate
+			)
+		{
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id, $label, $text, 'confirm_situationout', $formquestion, "yes", 1);
 		}
 	}
 
@@ -3868,6 +3892,7 @@ if ($action == 'create')
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id, $langs->trans('ClassifyPaid'), $langs->trans('ConfirmClassifyPaidBill', $object->ref), 'confirm_paid', '', "yes", 1);
 	}
 	if ($action == 'paid' && $resteapayer > 0) {
+		$close = array();
 		// Code
 		$i = 0;
 		$close[$i]['code'] = 'discount_vat'; // escompte
@@ -3894,7 +3919,7 @@ if ($action == 'create')
 		$i++;
 		// arrayreasons[code]=reason
 		foreach ($close as $key => $val) {
-			$arrayreasons[$close [$key]['code']] = $close[$key]['reason'];
+			$arrayreasons[$close[$key]['code']] = $close[$key]['reason'];
 		}
 
 		// Cree un tableau formulaire
@@ -3952,7 +3977,7 @@ if ($action == 'create')
 		// Create an array for form
 		$formquestion = array(
 			array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company($object->socid, 'socid', '(s.client=1 OR s.client=2 OR s.client=3)', 1)),
-		    array('type' => 'date', 'name' => 'newdate', 'label' => $langs->trans("Date"), 'value' => dol_now())
+			array('type' => 'date', 'name' => 'newdate', 'label' => $langs->trans("Date"), 'value' => dol_now())
 		);
 		// Ask confirmatio to clone
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneInvoice', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 250);
@@ -4045,24 +4070,26 @@ if ($action == 'create')
 
 	// Type
 	print '<tr><td class="titlefield fieldname_type">'.$langs->trans('Type').'</td><td class="valuefield fieldname_type">';
+	print '<span class="badgeneutral">';
 	print $object->getLibType();
+	print '</span>';
 	if ($object->module_source) {
-		print ' <span class="opacitymediumbycolor">('.$langs->trans("POS").' '.$object->module_source.' - '.$langs->trans("Terminal").' '.$object->pos_source.')</span>';
+		print ' <span class="opacitymediumbycolor paddingleft">('.$langs->trans("POS").' '.ucfirst($object->module_source).' - '.$langs->trans("Terminal").' '.$object->pos_source.')</span>';
 	}
 	if ($object->type == Facture::TYPE_REPLACEMENT) {
 		$facreplaced = new Facture($db);
 		$facreplaced->fetch($object->fk_facture_source);
-		print ' <span class="opacitymediumbycolor">('.$langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1)).')</span>';
+		print ' <span class="opacitymediumbycolor paddingleft">('.$langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1)).')</span>';
 	}
 	if ($object->type == Facture::TYPE_CREDIT_NOTE && !empty($object->fk_facture_source)) {
 		$facusing = new Facture($db);
 		$facusing->fetch($object->fk_facture_source);
-		print ' <span class="opacitymediumbycolor">('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')</span>';
+		print ' <span class="opacitymediumbycolor paddingleft">('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')</span>';
 	}
 
 	$facidavoir = $object->getListIdAvoirFromInvoice();
 	if (count($facidavoir) > 0) {
-		print ' <span class="opacitymediumbycolor">('.$langs->transnoentities("InvoiceHasAvoir");
+		print ' <span class="opacitymediumbycolor paddingleft">('.$langs->transnoentities("InvoiceHasAvoir");
 		$i = 0;
 		foreach ($facidavoir as $id) {
 			if ($i == 0)
@@ -4077,14 +4104,16 @@ if ($action == 'create')
 	if ($objectidnext > 0) {
 		$facthatreplace = new Facture($db);
 		$facthatreplace->fetch($objectidnext);
-		print ' <span class="opacitymediumbycolor">('.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)).')</span>';
+		print ' <span class="opacitymediumbycolor paddingleft">('.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)).')</span>';
 	}
 
 	if ($object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT) {
 		$discount = new DiscountAbsolute($db);
 		$result = $discount->fetch(0, $object->id);
 		if ($result > 0) {
-			print '. <span class="opacitymediumbycolor">'.$langs->trans("CreditNoteConvertedIntoDiscount", $object->getLibType(1), $discount->getNomUrl(1, 'discount')).'</span><br>';
+			print ' <span class="opacitymediumbycolor paddingleft">';
+			print $langs->transnoentities("CreditNoteConvertedIntoDiscount", $object->getLibType(1), $discount->getNomUrl(1, 'discount'));
+			print '</span><br>';
 		}
 	}
 
@@ -4093,10 +4122,9 @@ if ($action == 'create')
 		$tmptemplate = new FactureRec($db);
 		$result = $tmptemplate->fetch($object->fk_fac_rec_source);
 		if ($result > 0) {
-			print '. <span class="opacitymediumbycolor">'.$langs->trans(
-				"GeneratedFromTemplate",
-				'<a href="'.DOL_MAIN_URL_ROOT.'/compta/facture/card-rec.php?facid='.$tmptemplate->id.'">'.$tmptemplate->ref.'</a>'
-			).'</span>';
+			print ' <span class="opacitymediumbycolor paddingleft">';
+			print $langs->transnoentities("GeneratedFromTemplate", '<a href="'.DOL_MAIN_URL_ROOT.'/compta/facture/card-rec.php?facid='.$tmptemplate->id.'">'.dol_escape_htmltag($tmptemplate->ref).'</a>');
+			print '</span>';
 		}
 	}
 	print '</td></tr>';
@@ -4104,13 +4132,11 @@ if ($action == 'create')
 	// Relative and absolute discounts
 	print '<!-- Discounts -->'."\n";
 	print '<tr><td>'.$langs->trans('Discounts');
-
 	print '</td><td>';
 	$thirdparty = $soc;
 	$discount_type = 0;
 	$backtopage = urlencode($_SERVER["PHP_SELF"].'?facid='.$object->id);
 	include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
-
 	print '</td></tr>';
 
 	// Date invoice
@@ -4118,19 +4144,15 @@ if ($action == 'create')
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('DateInvoice');
 	print '</td>';
-	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editinvoicedate' && !empty($object->brouillon) && $usercancreate && empty($conf->global->FAC_FORCE_DATE_VALIDATION))
+	if ($action != 'editinvoicedate' && !empty($object->brouillon) && $usercancreate && empty($conf->global->FAC_FORCE_DATE_VALIDATION))
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editinvoicedate&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td>';
 
-	if ($object->type != Facture::TYPE_CREDIT_NOTE) {
-		if ($action == 'editinvoicedate') {
-			$form->form_date($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->date, 'invoicedate');
-		} else {
-			print dol_print_date($object->date, 'day');
-		}
+	if ($action == 'editinvoicedate') {
+		$form->form_date($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->date, 'invoicedate');
 	} else {
-		print dol_print_date($object->date, 'day');
+		print '<span class="valuedate">'.dol_print_date($object->date, 'day').'</span>';
 	}
 	print '</td>';
 
@@ -4149,7 +4171,7 @@ if ($action == 'create')
 		if ($action == 'editdate_pointoftax') {
 			$form->form_date($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->date_pointoftax, 'date_pointoftax');
 		} else {
-			print dol_print_date($object->date_pointoftax, 'day');
+			print '<span class="valuedate">'.dol_print_date($object->date_pointoftax, 'day').'</span>';
 		}
 		print '</td></tr>';
 	}
@@ -4189,7 +4211,7 @@ if ($action == 'create')
 		if ($action == 'editpaymentterm') {
 			$form->form_date($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->date_lim_reglement, 'paymentterm');
 		} else {
-			print dol_print_date($object->date_lim_reglement, 'day');
+			print '<span class="valuedate">'.dol_print_date($object->date_lim_reglement, 'day').'</span>';
 			if ($object->hasDelay()) {
 				print img_warning($langs->trans('Late'));
 			}
@@ -4307,7 +4329,7 @@ if ($action == 'create')
 
 
 	if (!empty($object->retained_warranty) || !empty($conf->global->INVOICE_USE_RETAINED_WARRANTY)) {
-        $displayWarranty = true;
+		$displayWarranty = true;
 		if (!in_array($object->type, $retainedWarrantyInvoiceAvailableType) && empty($object->retained_warranty)) {
 			$displayWarranty = false;
 		}
@@ -4319,90 +4341,90 @@ if ($action == 'create')
 			print $langs->trans('RetainedWarranty');
 			print '</td>';
 			if ($action != 'editretainedwarranty' && $user->rights->facture->creer) {
-			    print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarranty&amp;facid='.$object->id.'">'.img_edit($langs->trans('setretainedwarranty'), 1).'</a></td>';
+				print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarranty&amp;facid='.$object->id.'">'.img_edit($langs->trans('setretainedwarranty'), 1).'</a></td>';
 			}
 
-		    print '</tr></table>';
-		    print '</td><td>';
-		    if ($action == 'editretainedwarranty')
-		    {
-		        print '<form  id="retained-warranty-form"  method="POST" action="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'">';
-		        print '<input type="hidden" name="action" value="setretainedwarranty">';
-		        print '<input type="hidden" name="token" value="'.newToken().'">';
-		        print '<input name="retained_warranty" type="number" step="0.01" min="0" max="100" value="'.$object->retained_warranty.'" >';
-		        print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-		        print '</form>';
-		    } else {
-		        print price($object->retained_warranty).'%';
-		    }
-		    print '</td></tr>';
+			print '</tr></table>';
+			print '</td><td>';
+			if ($action == 'editretainedwarranty')
+			{
+				print '<form  id="retained-warranty-form"  method="POST" action="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'">';
+				print '<input type="hidden" name="action" value="setretainedwarranty">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input name="retained_warranty" type="number" step="0.01" min="0" max="100" value="'.$object->retained_warranty.'" >';
+				print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				print '</form>';
+			} else {
+				print price($object->retained_warranty).'%';
+			}
+			print '</td></tr>';
 
-		    // Retained warranty payment term
-		    print '<tr class="retained-warranty-lines"  ><td>';
-		    print '<table id="retained-warranty-cond-reglement-table"  class="nobordernopadding" width="100%"><tr><td>';
-		    print $langs->trans('PaymentConditionsShortRetainedWarranty');
-		    print '</td>';
-		    if ($action != 'editretainedwarrantypaymentterms' && $user->rights->facture->creer) {
-		        print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarrantypaymentterms&amp;facid='.$object->id.'">'.img_edit($langs->trans('setPaymentConditionsShortRetainedWarranty'), 1).'</a></td>';
-		    }
+			// Retained warranty payment term
+			print '<tr class="retained-warranty-lines"  ><td>';
+			print '<table id="retained-warranty-cond-reglement-table"  class="nobordernopadding" width="100%"><tr><td>';
+			print $langs->trans('PaymentConditionsShortRetainedWarranty');
+			print '</td>';
+			if ($action != 'editretainedwarrantypaymentterms' && $user->rights->facture->creer) {
+				print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarrantypaymentterms&amp;facid='.$object->id.'">'.img_edit($langs->trans('setPaymentConditionsShortRetainedWarranty'), 1).'</a></td>';
+			}
 
-		    print '</tr></table>';
-		    print '</td><td>';
-		    $defaultDate = !empty($object->retained_warranty_date_limit) ? $object->retained_warranty_date_limit : strtotime('-1 years', $object->date_lim_reglement);
-		    if ($object->date > $defaultDate) {
-		        $defaultDate = $object->date;
-		    }
+			print '</tr></table>';
+			print '</td><td>';
+			$defaultDate = !empty($object->retained_warranty_date_limit) ? $object->retained_warranty_date_limit : strtotime('-1 years', $object->date_lim_reglement);
+			if ($object->date > $defaultDate) {
+				$defaultDate = $object->date;
+			}
 
-		    if ($action == 'editretainedwarrantypaymentterms')
-		    {
-		        //date('Y-m-d',$object->date_lim_reglement)
-		        print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'">';
-		        print '<input type="hidden" name="action" value="setretainedwarrantyconditions">';
-		        print '<input type="hidden" name="token" value="'.newToken().'">';
-		        $retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
-		        $retained_warranty_fk_cond_reglement = !empty($retained_warranty_fk_cond_reglement) ? $retained_warranty_fk_cond_reglement : $object->retained_warranty_fk_cond_reglement;
-		        $retained_warranty_fk_cond_reglement = !empty($retained_warranty_fk_cond_reglement) ? $retained_warranty_fk_cond_reglement : $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
-		        $form->select_conditions_paiements($retained_warranty_fk_cond_reglement, 'retained_warranty_fk_cond_reglement', -1, 1);
-		        print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-		        print '</form>';
-		    } else {
-		        $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->retained_warranty_fk_cond_reglement, 'none');
-		        if (!$displayWarranty) {
-		            print img_picto($langs->trans('RetainedWarrantyNeed100Percent'), 'warning.png', 'class="pictowarning valignmiddle" ');
-		        }
-		    }
-		    print '</td></tr>';
+			if ($action == 'editretainedwarrantypaymentterms')
+			{
+				//date('Y-m-d',$object->date_lim_reglement)
+				print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'">';
+				print '<input type="hidden" name="action" value="setretainedwarrantyconditions">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				$retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
+				$retained_warranty_fk_cond_reglement = !empty($retained_warranty_fk_cond_reglement) ? $retained_warranty_fk_cond_reglement : $object->retained_warranty_fk_cond_reglement;
+				$retained_warranty_fk_cond_reglement = !empty($retained_warranty_fk_cond_reglement) ? $retained_warranty_fk_cond_reglement : $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
+				$form->select_conditions_paiements($retained_warranty_fk_cond_reglement, 'retained_warranty_fk_cond_reglement', -1, 1);
+				print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				print '</form>';
+			} else {
+				$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->retained_warranty_fk_cond_reglement, 'none');
+				if (!$displayWarranty) {
+					print img_picto($langs->trans('RetainedWarrantyNeed100Percent'), 'warning.png', 'class="pictowarning valignmiddle" ');
+				}
+			}
+			print '</td></tr>';
 
-            // Retained Warranty payment date limit
-            print '<tr class="retained-warranty-lines"  ><td>';
-            print '<table id="retained-warranty-date-limit-table"  class="nobordernopadding" width="100%"><tr><td>';
-            print $langs->trans('RetainedWarrantyDateLimit');
-            print '</td>';
-            if ($action != 'editretainedwarrantydatelimit' && $user->rights->facture->creer) {
-                print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarrantydatelimit&amp;facid='.$object->id.'">'.img_edit($langs->trans('setretainedwarrantyDateLimit'), 1).'</a></td>';
-            }
+			// Retained Warranty payment date limit
+			print '<tr class="retained-warranty-lines"  ><td>';
+			print '<table id="retained-warranty-date-limit-table"  class="nobordernopadding" width="100%"><tr><td>';
+			print $langs->trans('RetainedWarrantyDateLimit');
+			print '</td>';
+			if ($action != 'editretainedwarrantydatelimit' && $user->rights->facture->creer) {
+				print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarrantydatelimit&amp;facid='.$object->id.'">'.img_edit($langs->trans('setretainedwarrantyDateLimit'), 1).'</a></td>';
+			}
 
-            print '</tr></table>';
-            print '</td><td>';
-            $defaultDate = !empty($object->retained_warranty_date_limit) ? $object->retained_warranty_date_limit : strtotime('-1 years', $object->date_lim_reglement);
-            if ($object->date > $defaultDate) {
-                $defaultDate = $object->date;
-            }
+			print '</tr></table>';
+			print '</td><td>';
+			$defaultDate = !empty($object->retained_warranty_date_limit) ? $object->retained_warranty_date_limit : strtotime('-1 years', $object->date_lim_reglement);
+			if ($object->date > $defaultDate) {
+				$defaultDate = $object->date;
+			}
 
-            if ($action == 'editretainedwarrantydatelimit')
-            {
-                //date('Y-m-d',$object->date_lim_reglement)
-                print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'">';
-                print '<input type="hidden" name="action" value="setretainedwarrantydatelimit">';
-                print '<input type="hidden" name="token" value="'.newToken().'">';
-                print '<input name="retained_warranty_date_limit" type="date" step="1" min="'.dol_print_date($object->date, '%Y-%m-%d').'" value="'.dol_print_date($defaultDate, '%Y-%m-%d').'" >';
-                print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                print '</form>';
-            } else {
-                print dol_print_date($object->retained_warranty_date_limit, 'day');
-            }
-            print '</td></tr>';
-        }
+			if ($action == 'editretainedwarrantydatelimit')
+			{
+				//date('Y-m-d',$object->date_lim_reglement)
+				print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'">';
+				print '<input type="hidden" name="action" value="setretainedwarrantydatelimit">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input name="retained_warranty_date_limit" type="date" step="1" min="'.dol_print_date($object->date, '%Y-%m-%d').'" value="'.dol_print_date($defaultDate, '%Y-%m-%d').'" >';
+				print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				print '</form>';
+			} else {
+				print dol_print_date($object->retained_warranty_date_limit, 'day');
+			}
+			print '</td></tr>';
+		}
 	}
 
 
@@ -4421,7 +4443,7 @@ if ($action == 'create')
 
 	$sign = 1;
 	if (!empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE_SCREEN) && $object->type == $object::TYPE_CREDIT_NOTE) {
-		$sign = -1;	// We invert sign for output
+		$sign = -1; // We invert sign for output
 	}
 
 	if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
@@ -4544,84 +4566,84 @@ if ($action == 'create')
 	// List of previous situation invoices
 	if (($object->situation_cycle_ref > 0) && !empty($conf->global->INVOICE_USE_SITUATION))
 	{
-	    print '<table class="noborder situationstable" width="100%">';
+		print '<table class="noborder situationstable" width="100%">';
 
 
-	    print '<tr class="liste_titre">';
-	    print '<td>'.$langs->trans('ListOfSituationInvoices').'</td>';
-	    print '<td></td>';
-	    print '<td class="center">'.$langs->trans('Situation').'</td>';
-	    if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
-	    print '<td class="right">'.$langs->trans('AmountHT').'</td>';
-	    print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
-	    print '<td width="18">&nbsp;</td>';
-	    print '</tr>';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans('ListOfSituationInvoices').'</td>';
+		print '<td></td>';
+		print '<td class="center">'.$langs->trans('Situation').'</td>';
+		if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
+		print '<td class="right">'.$langs->trans('AmountHT').'</td>';
+		print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
+		print '<td width="18">&nbsp;</td>';
+		print '</tr>';
 
 
-	    $total_prev_ht = $total_prev_ttc = 0;
-	    $total_global_ht = $total_global_ttc = 0;
+		$total_prev_ht = $total_prev_ttc = 0;
+		$total_global_ht = $total_global_ttc = 0;
 
-	    if (count($object->tab_previous_situation_invoice) > 0) {
-	        // List of previous invoices
+		if (count($object->tab_previous_situation_invoice) > 0) {
+			// List of previous invoices
 
-	        $current_situation_counter = array();
-	        foreach ($object->tab_previous_situation_invoice as $prev_invoice) {
-	            $tmptotalpaidforthisinvoice = $prev_invoice->getSommePaiement();
-	            $total_prev_ht += $prev_invoice->total_ht;
-	            $total_prev_ttc += $prev_invoice->total_ttc;
-	            $current_situation_counter[] = (($prev_invoice->type == Facture::TYPE_CREDIT_NOTE) ?-1 : 1) * $prev_invoice->situation_counter;
-	            print '<tr class="oddeven">';
-	            print '<td>'.$prev_invoice->getNomUrl(1).'</td>';
-	            print '<td></td>';
-	            print '<td align="center" >'.(($prev_invoice->type == Facture::TYPE_CREDIT_NOTE) ? $langs->trans('situationInvoiceShortcode_AS') : $langs->trans('situationInvoiceShortcode_S')).$prev_invoice->situation_counter.'</td>';
-	            if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
-	            print '<td class="right">'.price($prev_invoice->total_ht).'</td>';
-	            print '<td class="right">'.price($prev_invoice->total_ttc).'</td>';
-	            print '<td class="right">'.$prev_invoice->getLibStatut(3, $tmptotalpaidforthisinvoice).'</td>';
-	            print '</tr>';
-	        }
-	    }
+			$current_situation_counter = array();
+			foreach ($object->tab_previous_situation_invoice as $prev_invoice) {
+				$tmptotalpaidforthisinvoice = $prev_invoice->getSommePaiement();
+				$total_prev_ht += $prev_invoice->total_ht;
+				$total_prev_ttc += $prev_invoice->total_ttc;
+				$current_situation_counter[] = (($prev_invoice->type == Facture::TYPE_CREDIT_NOTE) ?-1 : 1) * $prev_invoice->situation_counter;
+				print '<tr class="oddeven">';
+				print '<td>'.$prev_invoice->getNomUrl(1).'</td>';
+				print '<td></td>';
+				print '<td align="center" >'.(($prev_invoice->type == Facture::TYPE_CREDIT_NOTE) ? $langs->trans('situationInvoiceShortcode_AS') : $langs->trans('situationInvoiceShortcode_S')).$prev_invoice->situation_counter.'</td>';
+				if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
+				print '<td class="right">'.price($prev_invoice->total_ht).'</td>';
+				print '<td class="right">'.price($prev_invoice->total_ttc).'</td>';
+				print '<td class="right">'.$prev_invoice->getLibStatut(3, $tmptotalpaidforthisinvoice).'</td>';
+				print '</tr>';
+			}
+		}
 
 
-	    $total_global_ht += $total_prev_ht;
-	    $total_global_ttc += $total_prev_ttc;
-	    $total_global_ht += $object->total_ht;
-	    $total_global_ttc += $object->total_ttc;
-	    $current_situation_counter[] = (($object->type == Facture::TYPE_CREDIT_NOTE) ?-1 : 1) * $object->situation_counter;
-	    print '<tr class="oddeven">';
-	    print '<td>'.$object->getNomUrl(1).'</td>';
-	    print '<td></td>';
-	    print '<td class="center">'.(($object->type == Facture::TYPE_CREDIT_NOTE) ? $langs->trans('situationInvoiceShortcode_AS') : $langs->trans('situationInvoiceShortcode_S')).$object->situation_counter.'</td>';
-	    if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
-	    print '<td class="right">'.price($object->total_ht).'</td>';
-	    print '<td class="right">'.price($object->total_ttc).'</td>';
-	    print '<td class="right">'.$object->getLibStatut(3, $object->getSommePaiement()).'</td>';
-	    print '</tr>';
+		$total_global_ht += $total_prev_ht;
+		$total_global_ttc += $total_prev_ttc;
+		$total_global_ht += $object->total_ht;
+		$total_global_ttc += $object->total_ttc;
+		$current_situation_counter[] = (($object->type == Facture::TYPE_CREDIT_NOTE) ?-1 : 1) * $object->situation_counter;
+		print '<tr class="oddeven">';
+		print '<td>'.$object->getNomUrl(1).'</td>';
+		print '<td></td>';
+		print '<td class="center">'.(($object->type == Facture::TYPE_CREDIT_NOTE) ? $langs->trans('situationInvoiceShortcode_AS') : $langs->trans('situationInvoiceShortcode_S')).$object->situation_counter.'</td>';
+		if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
+		print '<td class="right">'.price($object->total_ht).'</td>';
+		print '<td class="right">'.price($object->total_ttc).'</td>';
+		print '<td class="right">'.$object->getLibStatut(3, $object->getSommePaiement()).'</td>';
+		print '</tr>';
 
 
-	    print '<tr class="oddeven">';
-	    print '<td colspan="2" class="left"><b>'.$langs->trans('CurrentSituationTotal').'</b></td>';
-	    print '<td>';
-	    $i = 0;
-	    foreach ($current_situation_counter as $sit)
-	    {
-	        $curSign = $sit > 0 ? '+' : '-';
-	        $curType = $sit > 0 ? $langs->trans('situationInvoiceShortcode_S') : $langs->trans('situationInvoiceShortcode_AS');
-	        if ($i > 0) print ' '.$curSign.' ';
-	        print $curType.abs($sit);
-	        $i++;
-	    }
-	    print '</td>';
-	    if (!empty($conf->banque->enabled)) print '<td></td>';
-	    print '<td class="right"><b>'.price($total_global_ht).'</b></td>';
-	    print '<td class="right"><b>'.price($total_global_ttc).'</b></td>';
-	    print '<td width="18">&nbsp;</td>';
-	    print '</tr>';
+		print '<tr class="oddeven">';
+		print '<td colspan="2" class="left"><b>'.$langs->trans('CurrentSituationTotal').'</b></td>';
+		print '<td>';
+		$i = 0;
+		foreach ($current_situation_counter as $sit)
+		{
+			$curSign = $sit > 0 ? '+' : '-';
+			$curType = $sit > 0 ? $langs->trans('situationInvoiceShortcode_S') : $langs->trans('situationInvoiceShortcode_AS');
+			if ($i > 0) print ' '.$curSign.' ';
+			print $curType.abs($sit);
+			$i++;
+		}
+		print '</td>';
+		if (!empty($conf->banque->enabled)) print '<td></td>';
+		print '<td class="right"><b>'.price($total_global_ht).'</b></td>';
+		print '<td class="right"><b>'.price($total_global_ttc).'</b></td>';
+		print '<td width="18">&nbsp;</td>';
+		print '</tr>';
 
 
-	    if (count($object->tab_next_situation_invoice) > 0) {
-	        // List of next invoices
-	        /*print '<tr class="liste_titre">';
+		if (count($object->tab_next_situation_invoice) > 0) {
+			// List of next invoices
+			/*print '<tr class="liste_titre">';
 	         print '<td>' . $langs->trans('ListOfNextSituationInvoices') . '</td>';
 	         print '<td></td>';
 	         print '<td></td>';
@@ -4631,37 +4653,37 @@ if ($action == 'create')
 	         print '<td width="18">&nbsp;</td>';
 	         print '</tr>';*/
 
-	        $total_next_ht = $total_next_ttc = 0;
+			$total_next_ht = $total_next_ttc = 0;
 
-	        foreach ($object->tab_next_situation_invoice as $next_invoice) {
-	            $totalpaye = $next_invoice->getSommePaiement();
-	            $total_next_ht += $next_invoice->total_ht;
-	            $total_next_ttc += $next_invoice->total_ttc;
+			foreach ($object->tab_next_situation_invoice as $next_invoice) {
+				$totalpaye = $next_invoice->getSommePaiement();
+				$total_next_ht += $next_invoice->total_ht;
+				$total_next_ttc += $next_invoice->total_ttc;
 
-	            print '<tr class="oddeven">';
-	            print '<td>'.$next_invoice->getNomUrl(1).'</td>';
-	            print '<td></td>';
-	            print '<td class="center">'.(($next_invoice->type == Facture::TYPE_CREDIT_NOTE) ? $langs->trans('situationInvoiceShortcode_AS') : $langs->trans('situationInvoiceShortcode_S')).$next_invoice->situation_counter.'</td>';
-	            if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
-	            print '<td class="right">'.price($next_invoice->total_ht).'</td>';
-	            print '<td class="right">'.price($next_invoice->total_ttc).'</td>';
-	            print '<td class="right">'.$next_invoice->getLibStatut(3, $totalpaye).'</td>';
-	            print '</tr>';
-	        }
+				print '<tr class="oddeven">';
+				print '<td>'.$next_invoice->getNomUrl(1).'</td>';
+				print '<td></td>';
+				print '<td class="center">'.(($next_invoice->type == Facture::TYPE_CREDIT_NOTE) ? $langs->trans('situationInvoiceShortcode_AS') : $langs->trans('situationInvoiceShortcode_S')).$next_invoice->situation_counter.'</td>';
+				if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
+				print '<td class="right">'.price($next_invoice->total_ht).'</td>';
+				print '<td class="right">'.price($next_invoice->total_ttc).'</td>';
+				print '<td class="right">'.$next_invoice->getLibStatut(3, $totalpaye).'</td>';
+				print '</tr>';
+			}
 
-	        $total_global_ht += $total_next_ht;
-	        $total_global_ttc += $total_next_ttc;
+			$total_global_ht += $total_next_ht;
+			$total_global_ttc += $total_next_ttc;
 
-	        print '<tr class="oddeven">';
-	        print '<td colspan="3" class="right"></td>';
-	        if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
-	        print '<td class="right"><b>'.price($total_global_ht).'</b></td>';
-	        print '<td class="right"><b>'.price($total_global_ttc).'</b></td>';
-	        print '<td width="18">&nbsp;</td>';
-	        print '</tr>';
-	    }
+			print '<tr class="oddeven">';
+			print '<td colspan="3" class="right"></td>';
+			if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
+			print '<td class="right"><b>'.price($total_global_ht).'</b></td>';
+			print '<td class="right"><b>'.price($total_global_ttc).'</b></td>';
+			print '<td width="18">&nbsp;</td>';
+			print '</tr>';
+		}
 
-	    print '</table>';
+		print '</table>';
 	}
 
 	$sign = 1;
@@ -4764,10 +4786,13 @@ if ($action == 'create')
 	if ($object->type != Facture::TYPE_CREDIT_NOTE) {
 		// Total already paid
 		print '<tr><td colspan="'.$nbcols.'" class="right">';
-		if ($object->type != Facture::TYPE_DEPOSIT)
+		print '<span class="opacitymedium">';
+		if ($object->type != Facture::TYPE_DEPOSIT) {
 			print $langs->trans('AlreadyPaidNoCreditNotesNoDeposits');
-		else print $langs->trans('AlreadyPaid');
-		print ' :</td><td class="right'.(($totalpaye > 0) ? ' amountalreadypaid' : '').'">'.price($totalpaye).'</td><td>&nbsp;</td></tr>';
+		} else {
+			print $langs->trans('AlreadyPaid');
+		}
+		print '</span></td><td class="right'.(($totalpaye > 0) ? ' amountalreadypaid' : '').'">'.price($totalpaye).'</td><td>&nbsp;</td></tr>';
 
 		$resteapayeraffiche = $resteapayer;
 		$cssforamountpaymentcomplete = 'amountpaymentcomplete';
@@ -4788,12 +4813,14 @@ if ($action == 'create')
 				$obj = $db->fetch_object($resql);
 				$invoice->fetch($obj->fk_facture_source);
 				print '<tr><td colspan="'.$nbcols.'" class="right">';
+				print '<span class="opacitymedium">';
 				if ($invoice->type == Facture::TYPE_CREDIT_NOTE)
 					print $langs->trans("CreditNote").' ';
 				if ($invoice->type == Facture::TYPE_DEPOSIT)
 					print $langs->trans("Deposit").' ';
 				print $invoice->getNomUrl(0);
-				print ' :</td>';
+				print '</span>';
+				print '</td>';
 				print '<td class="right">'.price($obj->amount_ttc).'</td>';
 				print '<td class="right">';
 				print '<a href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&action=unlinkdiscount&discountid='.$obj->rowid.'">'.img_delete().'</a>';
@@ -4811,7 +4838,9 @@ if ($action == 'create')
 		// Paye partiellement 'escompte'
 		if (($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED) && $object->close_code == 'discount_vat') {
 			print '<tr><td colspan="'.$nbcols.'" class="nowrap right">';
-			print $form->textwithpicto($langs->trans("Discount").':', $langs->trans("HelpEscompte"), - 1);
+			print '<span class="opacitymedium">';
+			print $form->textwithpicto($langs->trans("Discount"), $langs->trans("HelpEscompte"), - 1);
+			print '</span>';
 			print '</td><td class="right">'.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')).'</td><td>&nbsp;</td></tr>';
 			$resteapayeraffiche = 0;
 			$cssforamountpaymentcomplete = 'amountpaymentneutral';
@@ -4819,7 +4848,9 @@ if ($action == 'create')
 		// Paye partiellement ou Abandon 'badcustomer'
 		if (($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED) && $object->close_code == 'badcustomer') {
 			print '<tr><td colspan="'.$nbcols.'" class="nowrap right">';
-			print $form->textwithpicto($langs->trans("Abandoned").':', $langs->trans("HelpAbandonBadCustomer"), - 1);
+			print '<span class="opacitymedium">';
+			print $form->textwithpicto($langs->trans("Abandoned"), $langs->trans("HelpAbandonBadCustomer"), - 1);
+			print '</span>';
 			print '</td><td class="right">'.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')).'</td><td>&nbsp;</td></tr>';
 			// $resteapayeraffiche=0;
 			$cssforamountpaymentcomplete = 'amountpaymentneutral';
@@ -4827,7 +4858,9 @@ if ($action == 'create')
 		// Paye partiellement ou Abandon 'product_returned'
 		if (($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED) && $object->close_code == 'product_returned') {
 			print '<tr><td colspan="'.$nbcols.'" class="nowrap right">';
-			print $form->textwithpicto($langs->trans("ProductReturned").':', $langs->trans("HelpAbandonProductReturned"), - 1);
+			print '<span class="opacitymedium">';
+			print $form->textwithpicto($langs->trans("ProductReturned"), $langs->trans("HelpAbandonProductReturned"), - 1);
+			print '</span>';
 			print '</td><td class="right">'.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')).'</td><td>&nbsp;</td></tr>';
 			$resteapayeraffiche = 0;
 			$cssforamountpaymentcomplete = 'amountpaymentneutral';
@@ -4838,43 +4871,50 @@ if ($action == 'create')
 			$text = $langs->trans("HelpAbandonOther");
 			if ($object->close_note)
 				$text .= '<br><br><b>'.$langs->trans("Reason").'</b>:'.$object->close_note;
-			print $form->textwithpicto($langs->trans("Abandoned").':', $text, - 1);
+			print '<span class="opacitymedium">';
+			print $form->textwithpicto($langs->trans("Abandoned"), $text, - 1);
+			print '</span>';
 			print '</td><td class="right">'.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')).'</td><td>&nbsp;</td></tr>';
 			$resteapayeraffiche = 0;
 			$cssforamountpaymentcomplete = 'amountpaymentneutral';
 		}
 
 		// Billed
-		print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("Billed").' :</td><td class="right">'.price($object->total_ttc).'</td><td>&nbsp;</td></tr>';
+		print '<tr><td colspan="'.$nbcols.'" class="right">';
+		print '<span class="opacitymedium">';
+		print $langs->trans("Billed");
+		print '</td><td class="right">'.price($object->total_ttc).'</td><td>&nbsp;</td></tr>';
 		// Remainder to pay
 		print '<tr><td colspan="'.$nbcols.'" class="right">';
+		print '<span class="opacitymedium">';
 		print $langs->trans('RemainderToPay');
 		if ($resteapayeraffiche < 0)
-		    print ' ('.$langs->trans('ExcessReceived').')';
-		print ' :</td>';
+			print ' ('.$langs->trans('ExcessReceived').')';
+		print '</span>';
+		print '</td>';
 		print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td>';
 		print '<td class="nowrap">&nbsp;</td></tr>';
 
 		// Retained warranty : usualy use on construction industry
 		if (!empty($object->situation_final) && !empty($object->retained_warranty) && $displayWarranty) {
-		    // Billed - retained warranty
-		    if ($object->type == Facture::TYPE_SITUATION)
-		    {
-		        $retainedWarranty = $total_global_ttc * $object->retained_warranty / 100;
-		    } else {
-		        // Because one day retained warranty could be used on standard invoices
-		        $retainedWarranty = $object->total_ttc * $object->retained_warranty / 100;
-		    }
+			// Billed - retained warranty
+			if ($object->type == Facture::TYPE_SITUATION)
+			{
+				$retainedWarranty = $total_global_ttc * $object->retained_warranty / 100;
+			} else {
+				// Because one day retained warranty could be used on standard invoices
+				$retainedWarranty = $object->total_ttc * $object->retained_warranty / 100;
+			}
 
-		    $billedWithRetainedWarranty = $object->total_ttc - $retainedWarranty;
+			$billedWithRetainedWarranty = $object->total_ttc - $retainedWarranty;
 
-		    print '<tr><td colspan="'.$nbcols.'" align="right">'.$langs->trans("ToPayOn", dol_print_date($object->date_lim_reglement, 'day')).' :</td><td align="right">'.price($billedWithRetainedWarranty).'</td><td>&nbsp;</td></tr>';
+			print '<tr><td colspan="'.$nbcols.'" align="right">'.$langs->trans("ToPayOn", dol_print_date($object->date_lim_reglement, 'day')).' :</td><td align="right">'.price($billedWithRetainedWarranty).'</td><td>&nbsp;</td></tr>';
 
-		    // retained warranty
-		    print '<tr><td colspan="'.$nbcols.'" align="right">';
-		    print $langs->trans("RetainedWarranty").' ('.$object->retained_warranty.'%)';
-		    print !empty($object->retained_warranty_date_limit) ? ' '.$langs->trans("ToPayOn", dol_print_date($object->retained_warranty_date_limit, 'day')) : '';
-		    print ' :</td><td align="right">'.price($retainedWarranty).'</td><td>&nbsp;</td></tr>';
+			// retained warranty
+			print '<tr><td colspan="'.$nbcols.'" align="right">';
+			print $langs->trans("RetainedWarranty").' ('.$object->retained_warranty.'%)';
+			print !empty($object->retained_warranty_date_limit) ? ' '.$langs->trans("ToPayOn", dol_print_date($object->retained_warranty_date_limit, 'day')) : '';
+			print ' :</td><td align="right">'.price($retainedWarranty).'</td><td>&nbsp;</td></tr>';
 		}
 	} else // Credit note
 	{
@@ -4937,7 +4977,7 @@ if ($action == 'create')
 	{
 		if ($object->situation_cycle_ref && $object->statut == 0)
 		{
-		    print '<!-- Area to change globally the situation percent -->'."\n";
+			print '<!-- Area to change globally the situation percent -->'."\n";
 			print '<div class="div-table-responsive">';
 
 			print '<form name="updatealllines" id="updatealllines" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'#updatealllines" method="POST">';
@@ -4961,7 +5001,7 @@ if ($action == 'create')
 			print '<tr class="nodrag nodrop">';
 			// Adds a line numbering column
 			if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
-			    print '<td align="center" width="5">&nbsp;</td>';
+				print '<td align="center" width="5">&nbsp;</td>';
 			}
 			print '<td>&nbsp;</td>';
 			print '<td class="nowrap right"><input type="text" size="1" value="" name="all_progress">%</td>';
@@ -4998,7 +5038,7 @@ if ($action == 'create')
 	// Form to add new line
 	if ($object->statut == 0 && $usercancreate && $action != 'valid' && $action != 'editline')
 	{
-	    if ($action != 'editline' && $action != 'selectlines')
+		if ($action != 'editline' && $action != 'selectlines')
 		{
 			// Add free products/services
 			$object->formAddObjectLine(1, $mysoc, $soc);
@@ -5013,7 +5053,7 @@ if ($action == 'create')
 
 	print "</form>\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	// Actions buttons
@@ -5064,7 +5104,7 @@ if ($action == 'create')
 				&& ($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
+				if ($object->close_code != 'replaced' || (!$objectidnext)) 				// Not replaced by another invoice or replaced but the replacement invoice has been deleted
 				{
 					print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=reopen">'.$langs->trans('ReOpen').'</a>';
 				} else {
@@ -5117,9 +5157,9 @@ if ($action == 'create')
 			// POS Ticket
 			if (!empty($conf->takepos->enabled) && $object->module_source == 'takepos')
 			{
-			    $langs->load("cashdesk");
-			    $receipt_url = DOL_URL_ROOT."/takepos/receipt.php";
-			    print '<a target="_blank" class="butAction" href="'.$receipt_url.'?facid='.$object->id.'">'.$langs->trans('POSTicket').'</a>';
+				$langs->load("cashdesk");
+				$receipt_url = DOL_URL_ROOT."/takepos/receipt.php";
+				print '<a target="_blank" class="butAction" href="'.$receipt_url.'?facid='.$object->id.'">'.$langs->trans('POSTicket').'</a>';
 			}
 
 			// Create payment
@@ -5207,19 +5247,19 @@ if ($action == 'create')
 			// For situation invoice with excess received
 			if ($object->statut > Facture::STATUS_DRAFT
 				&& $object->type == Facture::TYPE_SITUATION
-			    && ($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits) > 0
-			    && $usercancreate
-			    && !$objectidnext
-			    && $object->is_last_in_cycle()
-			    && $conf->global->INVOICE_USE_SITUATION_CREDIT_NOTE
-			    )
+				&& ($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits) > 0
+				&& $usercancreate
+				&& !$objectidnext
+				&& $object->is_last_in_cycle()
+				&& $conf->global->INVOICE_USE_SITUATION_CREDIT_NOTE
+				)
 			{
 				if ($usercanunvalidate)
-			    {
-			        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->socid.'&amp;fac_avoir='.$object->id.'&amp;invoiceAvoirWithLines=1&amp;action=create&amp;type=2'.($object->fk_project > 0 ? '&amp;projectid='.$object->fk_project : '').'">'.$langs->trans("CreateCreditNote").'</a>';
-			    } else {
-			        print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateCreditNote").'</span>';
-			    }
+				{
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->socid.'&amp;fac_avoir='.$object->id.'&amp;invoiceAvoirWithLines=1&amp;action=create&amp;type=2'.($object->fk_project > 0 ? '&amp;projectid='.$object->fk_project : '').'">'.$langs->trans("CreateCreditNote").'</a>';
+				} else {
+					print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateCreditNote").'</span>';
+				}
 			}
 
 			// Clone
@@ -5239,20 +5279,20 @@ if ($action == 'create')
 
 			// Remove situation from cycle
 			if ($object->statut > Facture::STATUS_DRAFT
-			    && $object->type == Facture::TYPE_SITUATION
-			    && $usercancreate
-			    && !$objectidnext
-			    && $object->situation_counter > 1
-			    && $object->is_last_in_cycle()
+				&& $object->type == Facture::TYPE_SITUATION
+				&& $usercancreate
+				&& !$objectidnext
+				&& $object->situation_counter > 1
+				&& $object->is_last_in_cycle()
 				&& $usercanunvalidate
-			    )
+				)
 			{
-			    if (($object->total_ttc - $totalcreditnotes) == 0)
-			    {
-			        print '<a id="butSituationOut" class="butAction" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=situationout">'.$langs->trans("RemoveSituationFromCycle").'</a>';
-			    } else {
-			        print '<a id="butSituationOutRefused" class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotEnouthCreditNote").'" >'.$langs->trans("RemoveSituationFromCycle").'</a>';
-			    }
+				if (($object->total_ttc - $totalcreditnotes) == 0)
+				{
+					print '<a id="butSituationOut" class="butAction" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=situationout">'.$langs->trans("RemoveSituationFromCycle").'</a>';
+				} else {
+					print '<a id="butSituationOutRefused" class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotEnouthCreditNote").'" >'.$langs->trans("RemoveSituationFromCycle").'</a>';
+				}
 			}
 
 			// Create next situation invoice
@@ -5323,10 +5363,10 @@ if ($action == 'create')
 
 		$compatibleImportElementsList = false;
 		if ($usercancreate
-		    && $object->statut == Facture::STATUS_DRAFT
-		    && ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA || $object->type == Facture::TYPE_SITUATION))
+			&& $object->statut == Facture::STATUS_DRAFT
+			&& ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA || $object->type == Facture::TYPE_SITUATION))
 		{
-		    $compatibleImportElementsList = array('commande', 'propal'); // import from linked elements
+			$compatibleImportElementsList = array('commande', 'propal'); // import from linked elements
 		}
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, $compatibleImportElementsList);
 
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index cc1b7fe57ed..19a5c8c287b 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -476,1139 +476,1208 @@ class Invoices extends DolibarrApi
 	 * Delete a contact type of given invoice
 	 *
 	 * @param int    $id             Id of invoice to update
-	 * @param int    $rowid          Row key of the contact in the array contact_ids.
+	 * @param int    $contactid      Row key of the contact in the array contact_ids.
+	 * @param string $type           Type of the contact (BILLING, SHIPPING, CUSTOMER).
 	 *
-	 * @url	DELETE {id}/contact/{rowid}
+	 * @url	DELETE {id}/contact/{contactid}/{type}
 	 *
 	 * @return array
-  	 *
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 500
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 500
 	 */
-    public function deleteContact($id, $rowid)
-    {
-        if (!DolibarrApiAccess::$user->rights->facture->creer) {
-            throw new RestException(401);
-        }
+	public function deleteContact($id, $contactid, $type)
+	{
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->invoice->fetch($id);
+		$result = $this->invoice->fetch($id);
 
 		if (!$result) {
 			throw new RestException(404, 'Invoice not found');
 		}
 
-        if (!DolibarrApi::_checkAccessToResource('invoice', $this->invoice->id)) {
+		if (!DolibarrApi::_checkAccessToResource('invoice', $this->invoice->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        $result = $this->invoice->delete_contact($rowid);
-        if ($result < 0) {
-            throw new RestException(500, 'Error when deleted the contact');
-        }
+		$contacts = $this->invoice->liste_contact();
 
-        return $this->_cleanObjectDatas($this->invoice);
-    }
+		foreach ($contacts as $contact) {
+			if ($contact['id'] == $contactid && $contact['code'] == $type) {
+				$result = $this->invoice->delete_contact($contact['rowid']);
 
-    /**
-     * Deletes a line of a given invoice
-     *
-     * @param int   $id             Id of invoice
-     * @param int   $lineid 		Id of the line to delete
-     *
-     * @url     DELETE {id}/lines/{lineid}
-     *
-     * @return array
-     *
-     * @throws RestException 400
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 405
-     */
-    public function deleteLine($id, $lineid)
-    {
+				if (!$result) {
+					throw new RestException(500, 'Error when deleted the contact');
+				}
+			}
+		}
 
-    	if (!DolibarrApiAccess::$user->rights->facture->creer) {
-    		throw new RestException(401);
-    	}
-    	if (empty($lineid)) {
-    		throw new RestException(400, 'Line ID is mandatory');
-    	}
+		return $this->_cleanObjectDatas($this->invoice);
+	}
 
-    	if (!DolibarrApi::_checkAccessToResource('facture', $id)) {
-    		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-    	}
+	/**
+	 * Deletes a line of a given invoice
+	 *
+	 * @param int   $id             Id of invoice
+	 * @param int   $lineid 		Id of the line to delete
+	 *
+	 * @url     DELETE {id}/lines/{lineid}
+	 *
+	 * @return array
+	 *
+	 * @throws RestException 400
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 405
+	 */
+	public function deleteLine($id, $lineid)
+	{
 
-    	$result = $this->invoice->fetch($id);
-    	if (!$result) {
-    		throw new RestException(404, 'Invoice not found');
-    	}
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(401);
+		}
+		if (empty($lineid)) {
+			throw new RestException(400, 'Line ID is mandatory');
+		}
 
-    	// TODO Check the lineid $lineid is a line of ojbect
+		if (!DolibarrApi::_checkAccessToResource('facture', $id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-    	$updateRes = $this->invoice->deleteline($lineid);
-    	if ($updateRes > 0) {
-    		return $this->get($id);
-    	} else {
-    		throw new RestException(405, $this->invoice->error);
-    	}
-    }
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
-    /**
-     * Update invoice
-     *
-     * @param int   $id             Id of invoice to update
-     * @param array $request_data   Datas
-     * @return int
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->facture->creer) {
+		// TODO Check the lineid $lineid is a line of ojbect
+
+		$updateRes = $this->invoice->deleteline($lineid);
+		if ($updateRes > 0) {
+			return $this->get($id);
+		} else {
+			throw new RestException(405, $this->invoice->error);
+		}
+	}
+
+	/**
+	 * Update invoice
+	 *
+	 * @param int   $id             Id of invoice to update
+	 * @param array $request_data   Datas
+	 * @return int
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
 			throw new RestException(401);
 		}
 
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $this->invoice->$field = $value;
-        }
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$this->invoice->$field = $value;
+		}
 
-        // update bank account
-        if (!empty($this->invoice->fk_account))
-        {
-            if ($this->invoice->setBankAccount($this->invoice->fk_account) == 0) {
-                throw new RestException(400, $this->invoice->error);
-            }
-        }
+		// update bank account
+		if (!empty($this->invoice->fk_account))
+		{
+			if ($this->invoice->setBankAccount($this->invoice->fk_account) == 0) {
+				throw new RestException(400, $this->invoice->error);
+			}
+		}
 
-        if ($this->invoice->update(DolibarrApiAccess::$user))
-            return $this->get($id);
+		if ($this->invoice->update(DolibarrApiAccess::$user))
+			return $this->get($id);
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Delete invoice
-     *
-     * @param int   $id 	Invoice ID
-     * @return array
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->facture->supprimer) {
+	/**
+	 * Delete invoice
+	 *
+	 * @param int   $id 	Invoice ID
+	 * @return array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->facture->supprimer) {
 			throw new RestException(401);
 		}
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$result = $this->invoice->delete(DolibarrApiAccess::$user);
-        if ($result < 0)
-        {
-            throw new RestException(500);
-        }
+		if ($result < 0)
+		{
+			throw new RestException(500);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Invoice deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Invoice deleted'
+			)
+		);
+	}
 
-    /**
-     * Add a line to a given invoice
-     *
-     * Exemple of POST query :
-     * {
-     *     "desc": "Desc", "subprice": "1.00000000", "qty": "1", "tva_tx": "20.000", "localtax1_tx": "0.000", "localtax2_tx": "0.000",
-     *     "fk_product": "1", "remise_percent": "0", "date_start": "", "date_end": "", "fk_code_ventilation": 0,  "info_bits": "0",
-     *     "fk_remise_except": null,  "product_type": "1", "rang": "-1", "special_code": "0", "fk_parent_line": null, "fk_fournprice": null,
-     *     "pa_ht": "0.00000000", "label": "", "array_options": [], "situation_percent": "100", "fk_prev_id": null, "fk_unit": null
-     * }
-     *
-     * @param int   $id             Id of invoice
-     * @param array $request_data   InvoiceLine data
-     *
-     * @url     POST {id}/lines
-     *
-     * @return int
-     *
-     * @throws RestException 304
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 400
-     */
-    public function postLine($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->facture->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Add a line to a given invoice
+	 *
+	 * Exemple of POST query :
+	 * {
+	 *     "desc": "Desc", "subprice": "1.00000000", "qty": "1", "tva_tx": "20.000", "localtax1_tx": "0.000", "localtax2_tx": "0.000",
+	 *     "fk_product": "1", "remise_percent": "0", "date_start": "", "date_end": "", "fk_code_ventilation": 0,  "info_bits": "0",
+	 *     "fk_remise_except": null,  "product_type": "1", "rang": "-1", "special_code": "0", "fk_parent_line": null, "fk_fournprice": null,
+	 *     "pa_ht": "0.00000000", "label": "", "array_options": [], "situation_percent": "100", "fk_prev_id": null, "fk_unit": null
+	 * }
+	 *
+	 * @param int   $id             Id of invoice
+	 * @param array $request_data   InvoiceLine data
+	 *
+	 * @url     POST {id}/lines
+	 *
+	 * @return int
+	 *
+	 * @throws RestException 304
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 400
+	 */
+	public function postLine($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $request_data = (object) $request_data;
+		$request_data = (object) $request_data;
 
-        // Reset fk_parent_line for no child products and special product
-        if (($request_data->product_type != 9 && empty($request_data->fk_parent_line)) || $request_data->product_type == 9) {
-            $request_data->fk_parent_line = 0;
-        }
+		// Reset fk_parent_line for no child products and special product
+		if (($request_data->product_type != 9 && empty($request_data->fk_parent_line)) || $request_data->product_type == 9) {
+			$request_data->fk_parent_line = 0;
+		}
 
-        // calculate pa_ht
-        $marginInfos = getMarginInfos($request_data->subprice, $request_data->remise_percent, $request_data->tva_tx, $request_data->localtax1_tx, $request_data->localtax2_tx, $request_data->fk_fournprice, $request_data->pa_ht);
-        $pa_ht = $marginInfos[0];
+		// calculate pa_ht
+		$marginInfos = getMarginInfos($request_data->subprice, $request_data->remise_percent, $request_data->tva_tx, $request_data->localtax1_tx, $request_data->localtax2_tx, $request_data->fk_fournprice, $request_data->pa_ht);
+		$pa_ht = $marginInfos[0];
 
-        $updateRes = $this->invoice->addline(
-            $request_data->desc,
-            $request_data->subprice,
-            $request_data->qty,
-            $request_data->tva_tx,
-            $request_data->localtax1_tx,
-            $request_data->localtax2_tx,
-            $request_data->fk_product,
-            $request_data->remise_percent,
-            $request_data->date_start,
-            $request_data->date_end,
-            $request_data->fk_code_ventilation,
-            $request_data->info_bits,
-            $request_data->fk_remise_except,
-            'HT',
-            0,
-            $request_data->product_type,
-            $request_data->rang,
-            $request_data->special_code,
-            $request_data->origin,
-            $request_data->origin_id,
-            $request_data->fk_parent_line,
-            empty($request_data->fk_fournprice) ?null:$request_data->fk_fournprice,
-            $pa_ht,
-            $request_data->label,
-            $request_data->array_options,
-            $request_data->situation_percent,
-            $request_data->fk_prev_id,
-            $request_data->fk_unit,
-            0,
-            $request_data->ref_ext
-        );
+		$updateRes = $this->invoice->addline(
+			$request_data->desc,
+			$request_data->subprice,
+			$request_data->qty,
+			$request_data->tva_tx,
+			$request_data->localtax1_tx,
+			$request_data->localtax2_tx,
+			$request_data->fk_product,
+			$request_data->remise_percent,
+			$request_data->date_start,
+			$request_data->date_end,
+			$request_data->fk_code_ventilation,
+			$request_data->info_bits,
+			$request_data->fk_remise_except,
+			'HT',
+			0,
+			$request_data->product_type,
+			$request_data->rang,
+			$request_data->special_code,
+			$request_data->origin,
+			$request_data->origin_id,
+			$request_data->fk_parent_line,
+			empty($request_data->fk_fournprice) ?null:$request_data->fk_fournprice,
+			$pa_ht,
+			$request_data->label,
+			$request_data->array_options,
+			$request_data->situation_percent,
+			$request_data->fk_prev_id,
+			$request_data->fk_unit,
+			0,
+			$request_data->ref_ext
+		);
 
-        if ($updateRes < 0) {
-            throw new RestException(400, 'Unable to insert the new line. Check your inputs. '.$this->invoice->error);
-        }
+		if ($updateRes < 0) {
+			throw new RestException(400, 'Unable to insert the new line. Check your inputs. '.$this->invoice->error);
+		}
 
-        return $updateRes;
-    }
+		return $updateRes;
+	}
 
-    /**
-     * Adds a contact to an invoice
-     *
-     * @param   int 	$id             	Order ID
-     * @param   int 	$fk_socpeople       	Id of thirdparty contact (if source = 'external') or id of user (if souce = 'internal') to link
-     * @param   string 	$type_contact           Type of contact (code). Must a code found into table llx_c_type_contact. For example: BILLING
-     * @param   string  $source             	external=Contact extern (llx_socpeople), internal=Contact intern (llx_user)
-     * @param   int     $notrigger              Disable all triggers
-     *
-     * @url POST    {id}/contacts
-     *
-     * @return  array
-     *
-     * @throws RestException 304
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 500
-     *
-     */
-    public function addContact($id, $fk_socpeople, $type_contact, $source, $notrigger = 0)
-    {
-        if (!DolibarrApiAccess::$user->rights->facture->creer) {
-            throw new RestException(401);
-        }
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
+	/**
+	 * Adds a contact to an invoice
+	 *
+	 * @param   int 	$id             	Order ID
+	 * @param   int 	$fk_socpeople       	Id of thirdparty contact (if source = 'external') or id of user (if souce = 'internal') to link
+	 * @param   string 	$type_contact           Type of contact (code). Must a code found into table llx_c_type_contact. For example: BILLING
+	 * @param   string  $source             	external=Contact extern (llx_socpeople), internal=Contact intern (llx_user)
+	 * @param   int     $notrigger              Disable all triggers
+	 *
+	 * @url POST    {id}/contacts
+	 *
+	 * @return  array
+	 *
+	 * @throws RestException 304
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 500
+	 *
+	 */
+	public function addContact($id, $fk_socpeople, $type_contact, $source, $notrigger = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $result = $this->invoice->add_contact($fk_socpeople, $type_contact, $source, $notrigger);
-        if ($result < 0) {
-            throw new RestException(500, 'Error : '.$this->invoice->error);
-        }
+		$result = $this->invoice->add_contact($fk_socpeople, $type_contact, $source, $notrigger);
+		if ($result < 0) {
+			throw new RestException(500, 'Error : '.$this->invoice->error);
+		}
 
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        return $this->_cleanObjectDatas($this->invoice);
-    }
+		return $this->_cleanObjectDatas($this->invoice);
+	}
 
 
 
-    /**
-     * Sets an invoice as draft
-     *
-     * @param   int $id             Order ID
-     * @param   int $idwarehouse    Warehouse ID
-     *
-     * @url POST    {id}/settodraft
-     *
-     * @return  array
-     *
-     * @throws RestException 304
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 500
-     *
-     */
-    public function settodraft($id, $idwarehouse = -1)
-    {
-        if (!DolibarrApiAccess::$user->rights->facture->creer) {
-            throw new RestException(401);
-        }
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
+	/**
+	 * Sets an invoice as draft
+	 *
+	 * @param   int $id             Order ID
+	 * @param   int $idwarehouse    Warehouse ID
+	 *
+	 * @url POST    {id}/settodraft
+	 *
+	 * @return  array
+	 *
+	 * @throws RestException 304
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 500
+	 *
+	 */
+	public function settodraft($id, $idwarehouse = -1)
+	{
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $result = $this->invoice->setDraft(DolibarrApiAccess::$user, $idwarehouse);
-        if ($result == 0) {
-            throw new RestException(304, 'Nothing done.');
-        }
-        if ($result < 0) {
-            throw new RestException(500, 'Error : '.$this->invoice->error);
-        }
+		$result = $this->invoice->setDraft(DolibarrApiAccess::$user, $idwarehouse);
+		if ($result == 0) {
+			throw new RestException(304, 'Nothing done.');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error : '.$this->invoice->error);
+		}
 
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        return $this->_cleanObjectDatas($this->invoice);
-    }
+		return $this->_cleanObjectDatas($this->invoice);
+	}
 
 
-    /**
-     * Validate an invoice
-     *
+	/**
+	 * Validate an invoice
+	 *
 	 * If you get a bad value for param notrigger check that ou provide this in body
-     * {
-     *   "idwarehouse": 0,
-     *   "notrigger": 0
-     * }
-     *
-     * @param   int $id             Invoice ID
-     * @param   int $idwarehouse    Warehouse ID
-     * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
-     *
-     * @url POST    {id}/validate
-     *
-     * @return  array
-     */
-    public function validate($id, $idwarehouse = 0, $notrigger = 0)
-    {
-    	if (!DolibarrApiAccess::$user->rights->facture->creer) {
-    		throw new RestException(401);
-    	}
-    	$result = $this->invoice->fetch($id);
-    	if (!$result) {
-    		throw new RestException(404, 'Invoice not found');
-    	}
-
-    	if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
-    		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-    	}
-
-    	$result = $this->invoice->validate(DolibarrApiAccess::$user, '', $idwarehouse, $notrigger);
-    	if ($result == 0) {
-    		throw new RestException(304, 'Error nothing done. May be object is already validated');
-    	}
-    	if ($result < 0) {
-    		throw new RestException(500, 'Error when validating Invoice: '.$this->invoice->error);
-    	}
-
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        return $this->_cleanObjectDatas($this->invoice);
-    }
-
-    /**
-     * Sets an invoice as paid
-     *
-     * @param   int 	$id            Order ID
-     * @param   string 	$close_code    Code filled if we classify to 'Paid completely' when payment is not complete (for escompte for example)
-     * @param   string 	$close_note    Comment defined if we classify to 'Paid' when payment is not complete (for escompte for example)
-     *
-     * @url POST    {id}/settopaid
-     *
-     * @return  array 	An invoice object
-     *
-     * @throws RestException 304
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 500
-     */
-    public function settopaid($id, $close_code = '', $close_note = '')
-    {
-        if (!DolibarrApiAccess::$user->rights->facture->creer) {
-            throw new RestException(401);
-        }
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        $result = $this->invoice->set_paid(DolibarrApiAccess::$user, $close_code, $close_note);
-        if ($result == 0) {
-            throw new RestException(304, 'Error nothing done. May be object is already validated');
-        }
-        if ($result < 0) {
-            throw new RestException(500, 'Error : '.$this->invoice->error);
-        }
-
-
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        return $this->_cleanObjectDatas($this->invoice);
-    }
-
-
-    /**
-     * Sets an invoice as unpaid
-     *
-     * @param   int     $id            Order ID
-     *
-     * @url POST    {id}/settounpaid
-     *
-     * @return  array   An invoice object
-     *
-     * @throws RestException 304
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 500
-     */
-    public function settounpaid($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->facture->creer) {
-            throw new RestException(401);
-        }
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        $result = $this->invoice->set_unpaid(DolibarrApiAccess::$user);
-        if ($result == 0) {
-            throw new RestException(304, 'Nothing done');
-        }
-        if ($result < 0) {
-            throw new RestException(500, 'Error : '.$this->invoice->error);
-        }
-
-
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        return $this->_cleanObjectDatas($this->invoice);
-    }
-
-    /**
-     * Create a discount (credit available) for a credit note or a deposit.
-     *
-     * @param   int 	$id            Invoice ID
-     * @url POST    {id}/markAsCreditAvailable
-     *
-     * @return  array 	An invoice object
-     *
-     * @throws RestException 304
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 500
-     */
-    public function markAsCreditAvailable($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->facture->creer) {
-            throw new RestException(401);
-        }
-
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        if ($this->invoice->paye) {
-            throw new RestException(500, 'Alreay payed');
-        }
-
-        $this->invoice->fetch($id);
-        $this->invoice->fetch_thirdparty();
-
-        // Check if there is already a discount (protection to avoid duplicate creation when resubmit post)
-        $discountcheck = new DiscountAbsolute($this->db);
-        $result = $discountcheck->fetch(0, $this->invoice->id);
-
-        $canconvert = 0;
-        if ($this->invoice->type == Facture::TYPE_DEPOSIT && empty($discountcheck->id)) $canconvert = 1; // we can convert deposit into discount if deposit is payed (completely, partially or not at all) and not already converted (see real condition into condition used to show button converttoreduc)
-        if (($this->invoice->type == Facture::TYPE_CREDIT_NOTE || $this->invoice->type == Facture::TYPE_STANDARD) && $this->invoice->paye == 0 && empty($discountcheck->id)) $canconvert = 1; // we can convert credit note into discount if credit note is not payed back and not already converted and amount of payment is 0 (see real condition into condition used to show button converttoreduc)
-        if ($canconvert)
-        {
-            $this->db->begin();
-
-            $amount_ht = $amount_tva = $amount_ttc = array();
-            $multicurrency_amount_ht = $multicurrency_amount_tva = $multicurrency_amount_ttc = array();
-
-            // Loop on each vat rate
-            $i = 0;
-            foreach ($this->invoice->lines as $line)
-            {
-                if ($line->product_type < 9 && $line->total_ht != 0) // Remove lines with product_type greater than or equal to 9
-                { 	// no need to create discount if amount is null
-                    $amount_ht[$line->tva_tx] += $line->total_ht;
-                    $amount_tva[$line->tva_tx] += $line->total_tva;
-                    $amount_ttc[$line->tva_tx] += $line->total_ttc;
-                    $multicurrency_amount_ht[$line->tva_tx] += $line->multicurrency_total_ht;
-                    $multicurrency_amount_tva[$line->tva_tx] += $line->multicurrency_total_tva;
-                    $multicurrency_amount_ttc[$line->tva_tx] += $line->multicurrency_total_ttc;
-                    $i++;
-                }
-            }
-
-            // Insert one discount by VAT rate category
-            $discount = new DiscountAbsolute($this->db);
-            if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
-                $discount->description = '(CREDIT_NOTE)';
-            } elseif ($this->invoice->type == Facture::TYPE_DEPOSIT) {
-                $discount->description = '(DEPOSIT)';
-            } elseif ($this->invoice->type == Facture::TYPE_STANDARD || $this->invoice->type == Facture::TYPE_REPLACEMENT || $this->invoice->type == Facture::TYPE_SITUATION) {
-                $discount->description = '(EXCESS RECEIVED)';
-            } else {
-                throw new RestException(500, 'Cant convert to reduc an Invoice of this type');
-            }
-
-            $discount->fk_soc = $this->invoice->socid;
-            $discount->fk_facture_source = $this->invoice->id;
-
-            $error = 0;
-
-            if ($this->invoice->type == Facture::TYPE_STANDARD || $this->invoice->type == Facture::TYPE_REPLACEMENT || $this->invoice->type == Facture::TYPE_SITUATION)
-            {
-                // If we're on a standard invoice, we have to get excess received to create a discount in TTC without VAT
-
-                // Total payments
-                $sql = 'SELECT SUM(pf.amount) as total_payments';
-                $sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf, '.MAIN_DB_PREFIX.'paiement as p';
-                $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id';
-                $sql .= ' WHERE pf.fk_facture = '.$this->invoice->id;
-                $sql .= ' AND pf.fk_paiement = p.rowid';
-                $sql .= ' AND p.entity IN ('.getEntity('invoice').')';
-                $resql = $this->db->query($sql);
-                if (!$resql) dol_print_error($this->db);
-
-                $res = $this->db->fetch_object($resql);
-                $total_payments = $res->total_payments;
-
-                // Total credit note and deposit
-                $total_creditnote_and_deposit = 0;
-                $sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
-                $sql .= " re.description, re.fk_facture_source";
-                $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re";
-                $sql .= " WHERE fk_facture = ".$this->invoice->id;
-                $resql = $this->db->query($sql);
-                if (!empty($resql)) {
-                    while ($obj = $this->db->fetch_object($resql)) $total_creditnote_and_deposit += $obj->amount_ttc;
-                } else dol_print_error($this->db);
-
-                $discount->amount_ht = $discount->amount_ttc = $total_payments + $total_creditnote_and_deposit - $this->invoice->total_ttc;
-                $discount->amount_tva = 0;
-                $discount->tva_tx = 0;
-
-                $result = $discount->create(DolibarrApiAccess::$user);
-                if ($result < 0)
-                {
-                    $error++;
-                }
-            }
-            if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE || $this->invoice->type == Facture::TYPE_DEPOSIT)
-            {
-                foreach ($amount_ht as $tva_tx => $xxx)
-                {
-                    $discount->amount_ht = abs($amount_ht[$tva_tx]);
-                    $discount->amount_tva = abs($amount_tva[$tva_tx]);
-                    $discount->amount_ttc = abs($amount_ttc[$tva_tx]);
-                    $discount->multicurrency_amount_ht = abs($multicurrency_amount_ht[$tva_tx]);
-                    $discount->multicurrency_amount_tva = abs($multicurrency_amount_tva[$tva_tx]);
-                    $discount->multicurrency_amount_ttc = abs($multicurrency_amount_ttc[$tva_tx]);
-                    $discount->tva_tx = abs($tva_tx);
-
-                    $result = $discount->create(DolibarrApiAccess::$user);
-                    if ($result < 0)
-                    {
-                        $error++;
-                        break;
-                    }
-                }
-            }
-
-            if (empty($error))
-            {
-                if ($this->invoice->type != Facture::TYPE_DEPOSIT) {
-                    // Classe facture
-                    $result = $this->invoice->set_paid(DolibarrApiAccess::$user);
-                    if ($result >= 0)
-                    {
-                        $this->db->commit();
-                    } else {
-                        $this->db->rollback();
-                        throw new RestException(500, 'Could not set paid');
-                    }
-                } else {
-                    $this->db->commit();
-                }
-            } else {
-                $this->db->rollback();
-                throw new RestException(500, 'Discount creation error');
-            }
-        }
-
-        return $this->_cleanObjectDatas($this->invoice);
-    }
-
-     /**
-     * Add a discount line into an invoice (as an invoice line) using an existing absolute discount
-     *
-     * Note that this consume the discount.
-     *
-     * @param int   $id             Id of invoice
-     * @param int   $discountid     Id of discount
-     *
-     * @url     POST {id}/usediscount/{discountid}
-     *
-     * @return int
+	 * {
+	 *   "idwarehouse": 0,
+	 *   "notrigger": 0
+	 * }
 	 *
-     * @throws RestException 400
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 405
-     */
-    public function useDiscount($id, $discountid)
-    {
-
-        if (!DolibarrApiAccess::$user->rights->facture->creer) {
-            throw new RestException(401);
-        }
-        if (empty($id)) {
-            throw new RestException(400, 'Invoice ID is mandatory');
-        }
-        if (empty($discountid)) {
-            throw new RestException(400, 'Discount ID is mandatory');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('facture', $id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
-
-        $result = $this->invoice->insert_discount($discountid);
-        if ($result < 0) {
-            throw new RestException(405, $this->invoice->error);
-        }
-
-        return $result;
-    }
-
-     /**
-     * Add an available credit note discount to payments of an existing invoice.
-     *
-     *  Note that this consume the credit note.
-     *
-     * @param int   $id            Id of invoice
-     * @param int   $discountid    Id of a discount coming from a credit note
-     *
-     * @url     POST {id}/usecreditnote/{discountid}
-     *
-     * @return int
-     *
-     * @throws RestException 400
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 405
-     */
-    public function useCreditNote($id, $discountid)
-    {
-
-        require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
-
-        if (!DolibarrApiAccess::$user->rights->facture->creer) {
-            throw new RestException(401);
-        }
-        if (empty($id)) {
-            throw new RestException(400, 'Invoice ID is mandatory');
-        }
-        if (empty($discountid)) {
-            throw new RestException(400, 'Credit ID is mandatory');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('facture', $id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        $discount = new DiscountAbsolute($this->db);
-        $result = $discount->fetch($discountid);
-        if (!$result) {
-            throw new RestException(404, 'Credit not found');
-        }
-
-        $result = $discount->link_to_invoice(0, $id);
-        if ($result < 0) {
-            throw new RestException(405, $discount->error);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Get list of payments of a given invoice
-     *
-     * @param int   $id             Id of invoice
-     *
-     * @url     GET {id}/payments
-     *
-     * @return array
+	 * @param   int $id             Invoice ID
+	 * @param   int $idwarehouse    Warehouse ID
+	 * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
 	 *
-     * @throws RestException 400
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 405
-     */
-    public function getPayments($id)
-    {
-
-        if (!DolibarrApiAccess::$user->rights->facture->lire) {
-            throw new RestException(401);
-        }
-        if (empty($id)) {
-            throw new RestException(400, 'Invoice ID is mandatory');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('facture', $id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
-
-        $result = $this->invoice->getListOfPayments();
-        if ($result < 0) {
-            throw new RestException(405, $this->invoice->error);
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Add payment line to a specific invoice with the remain to pay as amount.
-     *
-     * @param int     $id                               Id of invoice
-     * @param string  $datepaye           {@from body}  Payment date        {@type timestamp}
-     * @param int     $paymentid          {@from body}  Payment mode Id {@min 1}
-     * @param string  $closepaidinvoices  {@from body}  Close paid invoices {@choice yes,no}
-     * @param int     $accountid          {@from body}  Account Id {@min 1}
-     * @param string  $num_payment        {@from body}  Payment number (optional)
-     * @param string  $comment            {@from body}  Note private (optional)
-     * @param string  $chqemetteur        {@from body}  Payment issuer (mandatory if paymentcode = 'CHQ')
-     * @param string  $chqbank            {@from body}  Issuer bank name (optional)
-     *
-     * @url     POST {id}/payments
-     *
-     * @return int  Payment ID
+	 * @url POST    {id}/validate
 	 *
-     * @throws RestException 400
-     * @throws RestException 401
-     * @throws RestException 404
-     */
-    public function addPayment($id, $datepaye, $paymentid, $closepaidinvoices, $accountid, $num_payment = '', $comment = '', $chqemetteur = '', $chqbank = '')
-    {
-        global $conf;
+	 * @return  array
+	 */
+	public function validate($id, $idwarehouse = 0, $notrigger = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
-    	require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-    	if (!DolibarrApiAccess::$user->rights->facture->creer) {
-    		throw new RestException(403);
-    	}
-    	if (empty($id)) {
-    		throw new RestException(400, 'Invoice ID is mandatory');
-    	}
+		$result = $this->invoice->validate(DolibarrApiAccess::$user, '', $idwarehouse, $notrigger);
+		if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already validated');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when validating Invoice: '.$this->invoice->error);
+		}
 
-    	if (!DolibarrApi::_checkAccessToResource('facture', $id)) {
-    		throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-    	}
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
-    	if (!empty($conf->banque->enabled)) {
-    		if (empty($accountid)) {
-    			throw new RestException(400, 'Account ID is mandatory');
-    		}
-    	}
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-    	if (empty($paymentid)) {
-    		throw new RestException(400, 'Payment ID or Payment Code is mandatory');
-    	}
+		return $this->_cleanObjectDatas($this->invoice);
+	}
 
-
-    	$result = $this->invoice->fetch($id);
-    	if (!$result) {
-    		throw new RestException(404, 'Invoice not found');
-    	}
-
-    	// Calculate amount to pay
-    	$totalpaye = $this->invoice->getSommePaiement();
-    	$totalcreditnotes = $this->invoice->getSumCreditNotesUsed();
-    	$totaldeposits = $this->invoice->getSumDepositsUsed();
-    	$resteapayer = price2num($this->invoice->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
-
-    	$this->db->begin();
-
-    	$amounts = array();
-    	$multicurrency_amounts = array();
-
-    	// Clean parameters amount if payment is for a credit note
-    	if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
-    		$resteapayer = price2num($resteapayer, 'MT');
-    		$amounts[$id] = -$resteapayer;
-    		// Multicurrency
-    		$newvalue = price2num($this->invoice->multicurrency_total_ttc, 'MT');
-    		$multicurrency_amounts[$id] = -$newvalue;
-    	} else {
-    		$resteapayer = price2num($resteapayer, 'MT');
-    		$amounts[$id] = $resteapayer;
-    		// Multicurrency
-    		$newvalue = price2num($this->invoice->multicurrency_total_ttc, 'MT');
-    		$multicurrency_amounts[$id] = $newvalue;
-    	}
-
-
-    	// Creation of payment line
-    	$paymentobj = new Paiement($this->db);
-    	$paymentobj->datepaye     = $datepaye;
-    	$paymentobj->amounts      = $amounts; // Array with all payments dispatching with invoice id
-    	$paymentobj->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
-    	$paymentobj->paiementid = $paymentid;
-    	$paymentobj->paiementcode = dol_getIdFromCode($this->db, $paymentid, 'c_paiement', 'id', 'code', 1);
-    	$paymentobj->num_payment = $num_payment;
-    	$paymentobj->note_private = $comment;
-
-    	$payment_id = $paymentobj->create(DolibarrApiAccess::$user, ($closepaidinvoices == 'yes' ? 1 : 0)); // This include closing invoices
-    	if ($payment_id < 0)
-    	{
-    		$this->db->rollback();
-    		throw new RestException(400, 'Payment error : '.$paymentobj->error);
-    	}
-
-    	if (!empty($conf->banque->enabled)) {
-    		$label = '(CustomerInvoicePayment)';
-
-    		if ($paymentobj->paiementcode == 'CHQ' && empty($chqemetteur)) {
-    			throw new RestException(400, 'Emetteur is mandatory when payment code is '.$paymentobj->paiementcode);
-    		}
-    		if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) $label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
-    		$result = $paymentobj->addPaymentToBank(DolibarrApiAccess::$user, 'payment', $label, $accountid, $chqemetteur, $chqbank);
-    		if ($result < 0)
-    		{
-    			$this->db->rollback();
-    			throw new RestException(400, 'Add payment to bank error : '.$paymentobj->error);
-    		}
-    	}
-
-    	$this->db->commit();
-
-    	return $payment_id;
-    }
-
-    /**
-     * Add a payment to pay partially or completely one or several invoices.
-     * Warning: Take care that all invoices are owned by the same customer.
-     * Example of value for parameter arrayofamounts: {"1": "99.99", "2": "10"}
-     *
-     * @param array   $arrayofamounts     {@from body}  Array with id of invoices with amount to pay for each invoice
-     * @param string  $datepaye           {@from body}  Payment date        {@type timestamp}
-     * @param int     $paymentid          {@from body}  Payment mode Id {@min 1}
-     * @param string  $closepaidinvoices  {@from body}  Close paid invoices {@choice yes,no}
-     * @param int     $accountid          {@from body}  Account Id {@min 1}
-     * @param string  $num_payment        {@from body}  Payment number (optional)
-     * @param string  $comment            {@from body}  Note private (optional)
-     * @param string  $chqemetteur        {@from body}  Payment issuer (mandatory if paiementcode = 'CHQ')
-     * @param string  $chqbank            {@from body}  Issuer bank name (optional)
-     *
-     * @url     POST /paymentsdistributed
-     *
-     * @return int  Payment ID
+	/**
+	 * Sets an invoice as paid
 	 *
-     * @throws RestException 400
-     * @throws RestException 401
-     * @throws RestException 403
-     * @throws RestException 404
-     */
-    public function addPaymentDistributed($arrayofamounts, $datepaye, $paymentid, $closepaidinvoices, $accountid, $num_payment = '', $comment = '', $chqemetteur = '', $chqbank = '')
-    {
-        global $conf;
+	 * @param   int 	$id            Order ID
+	 * @param   string 	$close_code    Code filled if we classify to 'Paid completely' when payment is not complete (for escompte for example)
+	 * @param   string 	$close_note    Comment defined if we classify to 'Paid' when payment is not complete (for escompte for example)
+	 *
+	 * @url POST    {id}/settopaid
+	 *
+	 * @return  array 	An invoice object
+	 *
+	 * @throws RestException 304
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 500
+	 */
+	public function settopaid($id, $close_code = '', $close_note = '')
+	{
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
-        require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if (!DolibarrApiAccess::$user->rights->facture->creer) {
-            throw new RestException(403);
-        }
-        foreach ($arrayofamounts as $id => $amount) {
-        	if (empty($id)) {
-        		throw new RestException(400, 'Invoice ID is mandatory. Fill the invoice id and amount into arrayofamounts parameter. For example: {"1": "99.99", "2": "10"}');
-        	}
-        	if (!DolibarrApi::_checkAccessToResource('facture', $id)) {
-        		throw new RestException(403, 'Access not allowed on invoice ID '.$id.' for login '.DolibarrApiAccess::$user->login);
-        	}
-        }
+		$result = $this->invoice->set_paid(DolibarrApiAccess::$user, $close_code, $close_note);
+		if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already validated');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error : '.$this->invoice->error);
+		}
 
-        if (!empty($conf->banque->enabled)) {
-        	if (empty($accountid)) {
-        		throw new RestException(400, 'Account ID is mandatory');
-        	}
-        }
-        if (empty($paymentid)) {
-        	throw new RestException(400, 'Payment ID or Payment Code is mandatory');
-        }
 
-        $this->db->begin();
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
-        $amounts = array();
-        $multicurrency_amounts = array();
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        // Loop on each invoice to pay
-        foreach ($arrayofamounts as $id => $amount)
-        {
-        	$result = $this->invoice->fetch($id);
-        	if (!$result) {
-        		$this->db->rollback();
-        		throw new RestException(404, 'Invoice ID '.$id.' not found');
-        	}
+		return $this->_cleanObjectDatas($this->invoice);
+	}
 
-        	// Calculate amount to pay
-        	$totalpaye = $this->invoice->getSommePaiement();
-        	$totalcreditnotes = $this->invoice->getSumCreditNotesUsed();
-        	$totaldeposits = $this->invoice->getSumDepositsUsed();
-        	$resteapayer = price2num($this->invoice->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
-        	if ($amount != 'remain')
-        	{
-        		if ($amount > $resteapayer)
-        		{
-        			$this->db->rollback();
-        			throw new RestException(400, 'Payment amount on invoice ID '.$id.' ('.$amount.') is higher than remain to pay ('.$resteapayer.')');
-        		}
-        		$resteapayer = $amount;
-        	}
-            // Clean parameters amount if payment is for a credit note
-            if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
-                $resteapayer = price2num($resteapayer, 'MT');
-                $amounts[$id] = -$resteapayer;
-                // Multicurrency
-                $newvalue = price2num($this->invoice->multicurrency_total_ttc, 'MT');
-                $multicurrency_amounts[$id] = -$newvalue;
-            } else {
-                $resteapayer = price2num($resteapayer, 'MT');
-                $amounts[$id] = $resteapayer;
-                // Multicurrency
-                $newvalue = price2num($this->invoice->multicurrency_total_ttc, 'MT');
-                $multicurrency_amounts[$id] = $newvalue;
-            }
-        }
 
-        // Creation of payment line
-        $paymentobj = new Paiement($this->db);
-        $paymentobj->datepaye     = $datepaye;
-        $paymentobj->amounts      = $amounts; // Array with all payments dispatching with invoice id
-        $paymentobj->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
-        $paymentobj->paiementid   = $paymentid;
-        $paymentobj->paiementcode = dol_getIdFromCode($this->db, $paymentid, 'c_paiement', 'id', 'code', 1);
-        $paymentobj->num_payment  = $num_payment;
-        $paymentobj->note_private = $comment;
+	/**
+	 * Sets an invoice as unpaid
+	 *
+	 * @param   int     $id            Order ID
+	 *
+	 * @url POST    {id}/settounpaid
+	 *
+	 * @return  array   An invoice object
+	 *
+	 * @throws RestException 304
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 500
+	 */
+	public function settounpaid($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
-        $payment_id = $paymentobj->create(DolibarrApiAccess::$user, ($closepaidinvoices == 'yes' ? 1 : 0)); // This include closing invoices
-        if ($payment_id < 0)
-        {
-            $this->db->rollback();
-            throw new RestException(400, 'Payment error : '.$paymentobj->error);
-        }
-        if (!empty($conf->banque->enabled)) {
-            $label = '(CustomerInvoicePayment)';
-            if ($paymentobj->paiementcode == 'CHQ' && empty($chqemetteur)) {
-                  throw new RestException(400, 'Emetteur is mandatory when payment code is '.$paymentobj->paiementcode);
-            }
-            if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) $label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
-            $result = $paymentobj->addPaymentToBank(DolibarrApiAccess::$user, 'payment', $label, $accountid, $chqemetteur, $chqbank);
-            if ($result < 0)
-            {
-                $this->db->rollback();
-                throw new RestException(400, 'Add payment to bank error : '.$paymentobj->error);
-            }
-        }
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $this->db->commit();
+		$result = $this->invoice->set_unpaid(DolibarrApiAccess::$user);
+		if ($result == 0) {
+			throw new RestException(304, 'Nothing done');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error : '.$this->invoice->error);
+		}
 
-        return $payment_id;
-    }
 
-    /**
-     * Update a payment
-     *
-     * @param int       $id             Id of payment
-     * @param string    $num_payment    Payment number
-     *
-     * @url     PUT payments/{id}
-     *
-     * @return array
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		return $this->_cleanObjectDatas($this->invoice);
+	}
+
+	/**
+	 * Get discount from invoice
+	 *
+	 * @param int   $id             Id of invoice
+	 *
+	 * @url	GET {id}/discount
+	 *
+	 * @return mixed
+	 */
+	public function getDiscount($id)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+
+		if (!DolibarrApiAccess::$user->rights->facture->lire) {
+			throw new RestException(401);
+		}
+
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$discountcheck = new DiscountAbsolute($this->db);
+		$result = $discountcheck->fetch(0, $this->invoice->id);
+
+		if ($result == 0) {
+			throw new RestException(404, 'Discount not found');
+		}
+		if ($result < 0) {
+			throw new RestException(500, $discountcheck->error);
+		}
+
+		return parent::_cleanObjectDatas($discountcheck);
+	}
+
+	/**
+	 * Create a discount (credit available) for a credit note or a deposit.
+	 *
+	 * @param   int 	$id            Invoice ID
+	 * @url POST    {id}/markAsCreditAvailable
+	 *
+	 * @return  array 	An invoice object
+	 *
+	 * @throws RestException 304
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 500
+	 */
+	public function markAsCreditAvailable($id)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(401);
+		}
+
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		if ($this->invoice->paye) {
+			throw new RestException(500, 'Alreay payed');
+		}
+
+		$this->invoice->fetch($id);
+		$this->invoice->fetch_thirdparty();
+
+		// Check if there is already a discount (protection to avoid duplicate creation when resubmit post)
+		$discountcheck = new DiscountAbsolute($this->db);
+		$result = $discountcheck->fetch(0, $this->invoice->id);
+
+		$canconvert = 0;
+		if ($this->invoice->type == Facture::TYPE_DEPOSIT && empty($discountcheck->id)) $canconvert = 1; // we can convert deposit into discount if deposit is payed (completely, partially or not at all) and not already converted (see real condition into condition used to show button converttoreduc)
+		if (($this->invoice->type == Facture::TYPE_CREDIT_NOTE || $this->invoice->type == Facture::TYPE_STANDARD) && $this->invoice->paye == 0 && empty($discountcheck->id)) $canconvert = 1; // we can convert credit note into discount if credit note is not payed back and not already converted and amount of payment is 0 (see real condition into condition used to show button converttoreduc)
+		if ($canconvert)
+		{
+			$this->db->begin();
+
+			$amount_ht = $amount_tva = $amount_ttc = array();
+			$multicurrency_amount_ht = $multicurrency_amount_tva = $multicurrency_amount_ttc = array();
+
+			// Loop on each vat rate
+			$i = 0;
+			foreach ($this->invoice->lines as $line)
+			{
+				if ($line->product_type < 9 && $line->total_ht != 0) // Remove lines with product_type greater than or equal to 9
+				{ 	// no need to create discount if amount is null
+					$amount_ht[$line->tva_tx] += $line->total_ht;
+					$amount_tva[$line->tva_tx] += $line->total_tva;
+					$amount_ttc[$line->tva_tx] += $line->total_ttc;
+					$multicurrency_amount_ht[$line->tva_tx] += $line->multicurrency_total_ht;
+					$multicurrency_amount_tva[$line->tva_tx] += $line->multicurrency_total_tva;
+					$multicurrency_amount_ttc[$line->tva_tx] += $line->multicurrency_total_ttc;
+					$i++;
+				}
+			}
+
+			// Insert one discount by VAT rate category
+			$discount = new DiscountAbsolute($this->db);
+			if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
+				$discount->description = '(CREDIT_NOTE)';
+			} elseif ($this->invoice->type == Facture::TYPE_DEPOSIT) {
+				$discount->description = '(DEPOSIT)';
+			} elseif ($this->invoice->type == Facture::TYPE_STANDARD || $this->invoice->type == Facture::TYPE_REPLACEMENT || $this->invoice->type == Facture::TYPE_SITUATION) {
+				$discount->description = '(EXCESS RECEIVED)';
+			} else {
+				throw new RestException(500, 'Cant convert to reduc an Invoice of this type');
+			}
+
+			$discount->fk_soc = $this->invoice->socid;
+			$discount->fk_facture_source = $this->invoice->id;
+
+			$error = 0;
+
+			if ($this->invoice->type == Facture::TYPE_STANDARD || $this->invoice->type == Facture::TYPE_REPLACEMENT || $this->invoice->type == Facture::TYPE_SITUATION)
+			{
+				// If we're on a standard invoice, we have to get excess received to create a discount in TTC without VAT
+
+				// Total payments
+				$sql = 'SELECT SUM(pf.amount) as total_payments';
+				$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf, '.MAIN_DB_PREFIX.'paiement as p';
+				$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id';
+				$sql .= ' WHERE pf.fk_facture = '.$this->invoice->id;
+				$sql .= ' AND pf.fk_paiement = p.rowid';
+				$sql .= ' AND p.entity IN ('.getEntity('invoice').')';
+				$resql = $this->db->query($sql);
+				if (!$resql) dol_print_error($this->db);
+
+				$res = $this->db->fetch_object($resql);
+				$total_payments = $res->total_payments;
+
+				// Total credit note and deposit
+				$total_creditnote_and_deposit = 0;
+				$sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
+				$sql .= " re.description, re.fk_facture_source";
+				$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re";
+				$sql .= " WHERE fk_facture = ".$this->invoice->id;
+				$resql = $this->db->query($sql);
+				if (!empty($resql)) {
+					while ($obj = $this->db->fetch_object($resql)) $total_creditnote_and_deposit += $obj->amount_ttc;
+				} else dol_print_error($this->db);
+
+				$discount->amount_ht = $discount->amount_ttc = $total_payments + $total_creditnote_and_deposit - $this->invoice->total_ttc;
+				$discount->amount_tva = 0;
+				$discount->tva_tx = 0;
+
+				$result = $discount->create(DolibarrApiAccess::$user);
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
+			if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE || $this->invoice->type == Facture::TYPE_DEPOSIT)
+			{
+				foreach ($amount_ht as $tva_tx => $xxx)
+				{
+					$discount->amount_ht = abs($amount_ht[$tva_tx]);
+					$discount->amount_tva = abs($amount_tva[$tva_tx]);
+					$discount->amount_ttc = abs($amount_ttc[$tva_tx]);
+					$discount->multicurrency_amount_ht = abs($multicurrency_amount_ht[$tva_tx]);
+					$discount->multicurrency_amount_tva = abs($multicurrency_amount_tva[$tva_tx]);
+					$discount->multicurrency_amount_ttc = abs($multicurrency_amount_ttc[$tva_tx]);
+					$discount->tva_tx = abs($tva_tx);
+
+					$result = $discount->create(DolibarrApiAccess::$user);
+					if ($result < 0)
+					{
+						$error++;
+						break;
+					}
+				}
+			}
+
+			if (empty($error))
+			{
+				if ($this->invoice->type != Facture::TYPE_DEPOSIT) {
+					// Classe facture
+					$result = $this->invoice->set_paid(DolibarrApiAccess::$user);
+					if ($result >= 0)
+					{
+						$this->db->commit();
+					} else {
+						$this->db->rollback();
+						throw new RestException(500, 'Could not set paid');
+					}
+				} else {
+					$this->db->commit();
+				}
+			} else {
+				$this->db->rollback();
+				throw new RestException(500, 'Discount creation error');
+			}
+		}
+
+		return $this->_cleanObjectDatas($this->invoice);
+	}
+
+	 /**
+	  * Add a discount line into an invoice (as an invoice line) using an existing absolute discount
+	  *
+	  * Note that this consume the discount.
+	  *
+	  * @param int   $id             Id of invoice
+	  * @param int   $discountid     Id of discount
+	  *
+	  * @url     POST {id}/usediscount/{discountid}
+	  *
+	  * @return int
+	  *
+	  * @throws RestException 400
+	  * @throws RestException 401
+	  * @throws RestException 404
+	  * @throws RestException 405
+	  */
+	public function useDiscount($id, $discountid)
+	{
+
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(401);
+		}
+		if (empty($id)) {
+			throw new RestException(400, 'Invoice ID is mandatory');
+		}
+		if (empty($discountid)) {
+			throw new RestException(400, 'Discount ID is mandatory');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('facture', $id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
+
+		$result = $this->invoice->insert_discount($discountid);
+		if ($result < 0) {
+			throw new RestException(405, $this->invoice->error);
+		}
+
+		return $result;
+	}
+
+	 /**
+	  * Add an available credit note discount to payments of an existing invoice.
+	  *
+	  *  Note that this consume the credit note.
+	  *
+	  * @param int   $id            Id of invoice
+	  * @param int   $discountid    Id of a discount coming from a credit note
+	  *
+	  * @url     POST {id}/usecreditnote/{discountid}
+	  *
+	  * @return int
+	  *
+	  * @throws RestException 400
+	  * @throws RestException 401
+	  * @throws RestException 404
+	  * @throws RestException 405
+	  */
+	public function useCreditNote($id, $discountid)
+	{
+
+		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(401);
+		}
+		if (empty($id)) {
+			throw new RestException(400, 'Invoice ID is mandatory');
+		}
+		if (empty($discountid)) {
+			throw new RestException(400, 'Credit ID is mandatory');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('facture', $id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$discount = new DiscountAbsolute($this->db);
+		$result = $discount->fetch($discountid);
+		if (!$result) {
+			throw new RestException(404, 'Credit not found');
+		}
+
+		$result = $discount->link_to_invoice(0, $id);
+		if ($result < 0) {
+			throw new RestException(405, $discount->error);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Get list of payments of a given invoice
+	 *
+	 * @param int   $id             Id of invoice
+	 *
+	 * @url     GET {id}/payments
+	 *
+	 * @return array
+	 *
+	 * @throws RestException 400
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 405
+	 */
+	public function getPayments($id)
+	{
+
+		if (!DolibarrApiAccess::$user->rights->facture->lire) {
+			throw new RestException(401);
+		}
+		if (empty($id)) {
+			throw new RestException(400, 'Invoice ID is mandatory');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('facture', $id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
+
+		$result = $this->invoice->getListOfPayments();
+		if ($result < 0) {
+			throw new RestException(405, $this->invoice->error);
+		}
+
+		return $result;
+	}
+
+
+	/**
+	 * Add payment line to a specific invoice with the remain to pay as amount.
+	 *
+	 * @param int     $id                               Id of invoice
+	 * @param string  $datepaye           {@from body}  Payment date        {@type timestamp}
+	 * @param int     $paymentid          {@from body}  Payment mode Id {@min 1}
+	 * @param string  $closepaidinvoices  {@from body}  Close paid invoices {@choice yes,no}
+	 * @param int     $accountid          {@from body}  Account Id {@min 1}
+	 * @param string  $num_payment        {@from body}  Payment number (optional)
+	 * @param string  $comment            {@from body}  Note private (optional)
+	 * @param string  $chqemetteur        {@from body}  Payment issuer (mandatory if paymentcode = 'CHQ')
+	 * @param string  $chqbank            {@from body}  Issuer bank name (optional)
+	 *
+	 * @url     POST {id}/payments
+	 *
+	 * @return int  Payment ID
+	 *
+	 * @throws RestException 400
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 */
+	public function addPayment($id, $datepaye, $paymentid, $closepaidinvoices, $accountid, $num_payment = '', $comment = '', $chqemetteur = '', $chqbank = '')
+	{
+		global $conf;
+
+		require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(403);
+		}
+		if (empty($id)) {
+			throw new RestException(400, 'Invoice ID is mandatory');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('facture', $id)) {
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		if (!empty($conf->banque->enabled)) {
+			if (empty($accountid)) {
+				throw new RestException(400, 'Account ID is mandatory');
+			}
+		}
+
+		if (empty($paymentid)) {
+			throw new RestException(400, 'Payment ID or Payment Code is mandatory');
+		}
+
+
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
+
+		// Calculate amount to pay
+		$totalpaye = $this->invoice->getSommePaiement();
+		$totalcreditnotes = $this->invoice->getSumCreditNotesUsed();
+		$totaldeposits = $this->invoice->getSumDepositsUsed();
+		$resteapayer = price2num($this->invoice->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+
+		$this->db->begin();
+
+		$amounts = array();
+		$multicurrency_amounts = array();
+
+		// Clean parameters amount if payment is for a credit note
+		if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
+			$resteapayer = price2num($resteapayer, 'MT');
+			$amounts[$id] = -$resteapayer;
+			// Multicurrency
+			$newvalue = price2num($this->invoice->multicurrency_total_ttc, 'MT');
+			$multicurrency_amounts[$id] = -$newvalue;
+		} else {
+			$resteapayer = price2num($resteapayer, 'MT');
+			$amounts[$id] = $resteapayer;
+			// Multicurrency
+			$newvalue = price2num($this->invoice->multicurrency_total_ttc, 'MT');
+			$multicurrency_amounts[$id] = $newvalue;
+		}
+
+
+		// Creation of payment line
+		$paymentobj = new Paiement($this->db);
+		$paymentobj->datepaye     = $datepaye;
+		$paymentobj->amounts      = $amounts; // Array with all payments dispatching with invoice id
+		$paymentobj->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
+		$paymentobj->paiementid = $paymentid;
+		$paymentobj->paiementcode = dol_getIdFromCode($this->db, $paymentid, 'c_paiement', 'id', 'code', 1);
+		$paymentobj->num_payment = $num_payment;
+		$paymentobj->note_private = $comment;
+
+		$payment_id = $paymentobj->create(DolibarrApiAccess::$user, ($closepaidinvoices == 'yes' ? 1 : 0)); // This include closing invoices
+		if ($payment_id < 0)
+		{
+			$this->db->rollback();
+			throw new RestException(400, 'Payment error : '.$paymentobj->error);
+		}
+
+		if (!empty($conf->banque->enabled)) {
+			$label = '(CustomerInvoicePayment)';
+
+			if ($paymentobj->paiementcode == 'CHQ' && empty($chqemetteur)) {
+				throw new RestException(400, 'Emetteur is mandatory when payment code is '.$paymentobj->paiementcode);
+			}
+			if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) $label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
+			$result = $paymentobj->addPaymentToBank(DolibarrApiAccess::$user, 'payment', $label, $accountid, $chqemetteur, $chqbank);
+			if ($result < 0)
+			{
+				$this->db->rollback();
+				throw new RestException(400, 'Add payment to bank error : '.$paymentobj->error);
+			}
+		}
+
+		$this->db->commit();
+
+		return $payment_id;
+	}
+
+	/**
+	 * Add a payment to pay partially or completely one or several invoices.
+	 * Warning: Take care that all invoices are owned by the same customer.
+	 * Example of value for parameter arrayofamounts: {"1": {"amount": "99.99", "multicurrency_amount": ""}, "2": {"amount": "", "multicurrency_amount": "10"}}
+	 *
+	 * @param array   $arrayofamounts     {@from body}  Array with id of invoices with amount to pay for each invoice
+	 * @param string  $datepaye           {@from body}  Payment date        {@type timestamp}
+	 * @param int     $paymentid           {@from body}  Payment mode Id {@min 1}
+	 * @param string  $closepaidinvoices   {@from body}  Close paid invoices {@choice yes,no}
+	 * @param int     $accountid           {@from body}  Account Id {@min 1}
+	 * @param string  $num_payment         {@from body}  Payment number (optional)
+	 * @param string  $comment             {@from body}  Note private (optional)
+	 * @param string  $chqemetteur         {@from body}  Payment issuer (mandatory if paiementcode = 'CHQ')
+	 * @param string  $chqbank             {@from body}  Issuer bank name (optional)
+	 * @param string  $ref_ext             {@from body}  External reference (optional)
+	 * @param bool    $accepthigherpayment {@from body}  Accept higher payments that it remains to be paid (optional)
+	 *
+	 * @url     POST /paymentsdistributed
+	 *
+	 * @return int  Payment ID
+	 * @throws RestException 400
+	 * @throws RestException 401
+	 * @throws RestException 403
+	 * @throws RestException 404
+	 */
+	public function addPaymentDistributed($arrayofamounts, $datepaye, $paymentid, $closepaidinvoices, $accountid, $num_payment = '', $comment = '', $chqemetteur = '', $chqbank = '', $ref_ext = '', $accepthigherpayment = false)
+	{
+		global $conf;
+
+		require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(403);
+		}
+		foreach ($arrayofamounts as $id => $amount) {
+			if (empty($id)) {
+				throw new RestException(400, 'Invoice ID is mandatory. Fill the invoice id and amount into arrayofamounts parameter. For example: {"1": "99.99", "2": "10"}');
+			}
+			if (!DolibarrApi::_checkAccessToResource('facture', $id)) {
+				throw new RestException(403, 'Access not allowed on invoice ID '.$id.' for login '.DolibarrApiAccess::$user->login);
+			}
+		}
+
+		if (!empty($conf->banque->enabled)) {
+			if (empty($accountid)) {
+				throw new RestException(400, 'Account ID is mandatory');
+			}
+		}
+		if (empty($paymentid)) {
+			throw new RestException(400, 'Payment ID or Payment Code is mandatory');
+		}
+
+		$this->db->begin();
+
+		$amounts = array();
+		$multicurrency_amounts = array();
+
+		// Loop on each invoice to pay
+		foreach ($arrayofamounts as $id => $amountarray)
+		{
+			$result = $this->invoice->fetch($id);
+			if (!$result) {
+				$this->db->rollback();
+				throw new RestException(404, 'Invoice ID '.$id.' not found');
+			}
+
+			if (($amountarray["amount"] == "remain" || $amountarray["amount"] > 0) && ($amountarray["multicurrency_amount"] == "remain" || $amountarray["multicurrency_amount"] > 0)) {
+				$this->db->rollback();
+				throw new RestException(400, 'Payment in both currency '.$id.' ( amount: '.$amountarray["amount"].', multicurrency_amount: '.$amountarray["multicurrency_amount"].')');
+			}
+
+			$is_multicurrency = 0;
+			$total_ttc = $this->invoice->total_ttc;
+
+			if ($amountarray["multicurrency_amount"] > 0 || $amountarray["multicurrency_amount"] == "remain") {
+				$is_multicurrency = 1;
+				$total_ttc = $this->invoice->multicurrency_total_ttc;
+			}
+
+			// Calculate amount to pay
+			$totalpaye = $this->invoice->getSommePaiement($is_multicurrency);
+			$totalcreditnotes = $this->invoice->getSumCreditNotesUsed($is_multicurrency);
+			$totaldeposits = $this->invoice->getSumDepositsUsed($is_multicurrency);
+			$remainstopay = $amount = price2num($total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+
+			if (!$is_multicurrency && $amountarray["amount"] != 'remain')
+			{
+				$amount = price2num($amountarray["amount"], 'MT');
+			}
+
+			if ($is_multicurrency && $amountarray["multicurrency_amount"] != 'remain')
+			{
+				$amount = price2num($amountarray["multicurrency_amount"], 'MT');
+			}
+
+			if ($amount > $remainstopay && !$accepthigherpayment) {
+				$this->db->rollback();
+				throw new RestException(400, 'Payment amount on invoice ID '.$id.' ('.$amount.') is higher than remain to pay ('.$remainstopay.')');
+			}
+
+			if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
+				$amount = -$amount;
+			}
+
+			if ($is_multicurrency) {
+				$amounts[$id] = null;
+				// Multicurrency
+				$multicurrency_amounts[$id] = $amount;
+			} else {
+				$amounts[$id] = $amount;
+				// Multicurrency
+				$multicurrency_amounts[$id] = null;
+			}
+		}
+
+		// Creation of payment line
+		$paymentobj = new Paiement($this->db);
+		$paymentobj->datepaye     = $datepaye;
+		$paymentobj->amounts      = $amounts; // Array with all payments dispatching with invoice id
+		$paymentobj->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
+		$paymentobj->paiementid   = $paymentid;
+		$paymentobj->paiementcode = dol_getIdFromCode($this->db, $paymentid, 'c_paiement', 'id', 'code', 1);
+		$paymentobj->num_payment  = $num_payment;
+		$paymentobj->note_private = $comment;
+		$paymentobj->ref_ext      = $ref_ext;
+		$payment_id = $paymentobj->create(DolibarrApiAccess::$user, ($closepaidinvoices == 'yes' ? 1 : 0)); // This include closing invoices
+		if ($payment_id < 0)
+		{
+			$this->db->rollback();
+			throw new RestException(400, 'Payment error : '.$paymentobj->error);
+		}
+		if (!empty($conf->banque->enabled)) {
+			$label = '(CustomerInvoicePayment)';
+			if ($paymentobj->paiementcode == 'CHQ' && empty($chqemetteur)) {
+				  throw new RestException(400, 'Emetteur is mandatory when payment code is '.$paymentobj->paiementcode);
+			}
+			if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) $label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
+			$result = $paymentobj->addPaymentToBank(DolibarrApiAccess::$user, 'payment', $label, $accountid, $chqemetteur, $chqbank);
+			if ($result < 0)
+			{
+				$this->db->rollback();
+				throw new RestException(400, 'Add payment to bank error : '.$paymentobj->error);
+			}
+		}
+
+		$this->db->commit();
+
+		return $payment_id;
+	}
+
+	/**
+	 * Update a payment
+	 *
+	 * @param int       $id             Id of payment
+	 * @param string    $num_payment    Payment number
+	 *
+	 * @url     PUT payments/{id}
+	 *
+	 * @return array
 	 * @throws RestException 400 Bad parameters
 	 * @throws RestException 401 Not allowed
 	 * @throws RestException 404 Not found
-     */
-    public function putPayment($id, $num_payment = '')
-    {
-        require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+	 */
+	public function putPayment($id, $num_payment = '')
+	{
+		require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 
-        if (!DolibarrApiAccess::$user->rights->facture->creer) {
-            throw new RestException(401);
-        }
-        if (empty($id)) {
-            throw new RestException(400, 'Payment ID is mandatory');
-        }
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(401);
+		}
+		if (empty($id)) {
+			throw new RestException(400, 'Payment ID is mandatory');
+		}
 
-        $paymentobj = new Paiement($this->db);
-        $result = $paymentobj->fetch($id);
+		$paymentobj = new Paiement($this->db);
+		$result = $paymentobj->fetch($id);
 
-        if (!$result) {
-            throw new RestException(404, 'Payment not found');
-        }
+		if (!$result) {
+			throw new RestException(404, 'Payment not found');
+		}
 
-        if (!empty($num_payment)) {
-            $result = $paymentobj->update_num($num_payment);
-            if ($result < 0) {
-                throw new RestException(500, 'Error when updating the payment num');
-            }
-        }
+		if (!empty($num_payment)) {
+			$result = $paymentobj->update_num($num_payment);
+			if ($result < 0) {
+				throw new RestException(500, 'Error when updating the payment num');
+			}
+		}
 
-        return [
-            'success' => [
-                'code' => 200,
-                'message' => 'Payment updated'
-            ]
-        ];
-    }
+		return [
+			'success' => [
+				'code' => 200,
+				'message' => 'Payment updated'
+			]
+		];
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->note);
-        unset($object->address);
-        unset($object->barcode_type);
-        unset($object->barcode_type_code);
-        unset($object->barcode_type_label);
-        unset($object->barcode_type_coder);
+		unset($object->note);
+		unset($object->address);
+		unset($object->barcode_type);
+		unset($object->barcode_type_code);
+		unset($object->barcode_type_label);
+		unset($object->barcode_type_coder);
 
-        return $object;
-    }
+		return $object;
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param array|null    $data       Datas to validate
-     * @return array
-     *
-     * @throws RestException
-     */
-    private function _validate($data)
-    {
-        $invoice = array();
-        foreach (Invoices::$FIELDS as $field) {
-            if (!isset($data[$field])) {
-                throw new RestException(400, "$field field missing");
-            }
-            $invoice[$field] = $data[$field];
-        }
-        return $invoice;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param array|null    $data       Datas to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	private function _validate($data)
+	{
+		$invoice = array();
+		foreach (Invoices::$FIELDS as $field) {
+			if (!isset($data[$field])) {
+				throw new RestException(400, "$field field missing");
+			}
+			$invoice[$field] = $data[$field];
+		}
+		return $invoice;
+	}
 }
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index c288251f56a..48e2ad574ed 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -50,12 +50,12 @@ class FactureRec extends CommonInvoice
 	public $table_element = 'facture_rec';
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	public $table_element_line = 'facturedet_rec';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_facture';
 
@@ -74,6 +74,11 @@ class FactureRec extends CommonInvoice
 	 */
 	protected $table_ref_field = 'titre';
 
+	/**
+	 * @var string The label of recurring invoice
+	 */
+	public $title;
+
 	public $number;
 	public $date;
 	public $remise;
@@ -92,7 +97,7 @@ class FactureRec extends CommonInvoice
 	 */
 	public $frequency;
 
-    /**
+	/**
 	 * @var string Unit frequency
 	 */
 	public $unit_frequency;
@@ -312,46 +317,46 @@ class FactureRec extends CommonInvoice
 					$tva_tx = $facsrc->lines[$i]->tva_tx;
 					if (!empty($facsrc->lines[$i]->vat_src_code) && !preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$facsrc->lines[$i]->vat_src_code.')';
 
-                    $result_insert = $this->addline(
-                        $facsrc->lines[$i]->desc,
-                        $facsrc->lines[$i]->subprice,
-                        $facsrc->lines[$i]->qty,
+					$result_insert = $this->addline(
+						$facsrc->lines[$i]->desc,
+						$facsrc->lines[$i]->subprice,
+						$facsrc->lines[$i]->qty,
 						$tva_tx,
-                        $facsrc->lines[$i]->localtax1_tx,
-                        $facsrc->lines[$i]->localtax2_tx,
-                        $facsrc->lines[$i]->fk_product,
-                        $facsrc->lines[$i]->remise_percent,
-                        'HT',
+						$facsrc->lines[$i]->localtax1_tx,
+						$facsrc->lines[$i]->localtax2_tx,
+						$facsrc->lines[$i]->fk_product,
+						$facsrc->lines[$i]->remise_percent,
+						'HT',
 						$facsrc->lines[$i]->info_bits,
-                        '',
-                        0,
-                        $facsrc->lines[$i]->product_type,
-                        $facsrc->lines[$i]->rang,
-                        $facsrc->lines[$i]->special_code,
-                    	$facsrc->lines[$i]->label,
+						'',
+						0,
+						$facsrc->lines[$i]->product_type,
+						$facsrc->lines[$i]->rang,
+						$facsrc->lines[$i]->special_code,
+						$facsrc->lines[$i]->label,
 						$facsrc->lines[$i]->fk_unit,
 						$facsrc->lines[$i]->multicurrency_subprice
-                    );
+					);
 
 					if ($result_insert < 0)
 					{
 						$error++;
 					} else {
-					    $objectline = new FactureLigneRec($this->db);
-					    if ($objectline->fetch($result_insert))
-					    {
-					        // Extrafields
-					        if (method_exists($facsrc->lines[$i], 'fetch_optionals')) {
-					            $facsrc->lines[$i]->fetch_optionals($facsrc->lines[$i]->rowid);
-					            $objectline->array_options = $facsrc->lines[$i]->array_options;
-					        }
+						$objectline = new FactureLigneRec($this->db);
+						if ($objectline->fetch($result_insert))
+						{
+							// Extrafields
+							if (method_exists($facsrc->lines[$i], 'fetch_optionals')) {
+								$facsrc->lines[$i]->fetch_optionals($facsrc->lines[$i]->rowid);
+								$objectline->array_options = $facsrc->lines[$i]->array_options;
+							}
 
-					        $result = $objectline->insertExtraFields();
-					        if ($result < 0)
-					        {
-					            $error++;
-					        }
-					    }
+							$result = $objectline->insertExtraFields();
+							if ($result < 0)
+							{
+								$error++;
+							}
+						}
 					}
 				}
 
@@ -365,27 +370,27 @@ class FactureRec extends CommonInvoice
 				{
 					foreach ($this->linked_objects as $origin => $tmp_origin_id)
 					{
-					    if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
-					    {
-					        foreach ($tmp_origin_id as $origin_id)
-					        {
-					            $ret = $this->add_object_linked($origin, $origin_id);
-					            if (!$ret)
-					            {
-					                $this->error = $this->db->lasterror();
-					                $error++;
-					            }
-					        }
-					    } else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
-					    {
-					        $origin_id = $tmp_origin_id;
-	    					$ret = $this->add_object_linked($origin, $origin_id);
-	    					if (!$ret)
-	    					{
-	    						$this->error = $this->db->lasterror();
-	    						$error++;
-	    					}
-					    }
+						if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+						{
+							foreach ($tmp_origin_id as $origin_id)
+							{
+								$ret = $this->add_object_linked($origin, $origin_id);
+								if (!$ret)
+								{
+									$this->error = $this->db->lasterror();
+									$error++;
+								}
+							}
+						} else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+						{
+							$origin_id = $tmp_origin_id;
+							$ret = $this->add_object_linked($origin, $origin_id);
+							if (!$ret)
+							{
+								$this->error = $this->db->lasterror();
+								$error++;
+							}
+						}
 					}
 				}
 
@@ -417,7 +422,7 @@ class FactureRec extends CommonInvoice
 					return $this->id;
 				}
 			} else {
-			    $this->error = $this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return -2;
 			}
@@ -437,46 +442,46 @@ class FactureRec extends CommonInvoice
 	 */
 	public function update(User $user, $notrigger = 0)
 	{
-	    global $conf;
+		global $conf;
 
-        $error = 0;
+		$error = 0;
 
-	    $sql = "UPDATE ".MAIN_DB_PREFIX."facture_rec SET";
-	    $sql .= " fk_soc = ".$this->fk_soc;
-        // TODO Add missing fields
-	    $sql .= " WHERE rowid = ".$this->id;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_rec SET";
+		$sql .= " fk_soc = ".$this->fk_soc;
+		// TODO Add missing fields
+		$sql .= " WHERE rowid = ".$this->id;
 
-	    dol_syslog(get_class($this)."::update", LOG_DEBUG);
-	    $resql = $this->db->query($sql);
-	    if ($resql)
-	    {
-	        if (!$error)
-	        {
-	            $result = $this->insertExtraFields();
-	            if ($result < 0)
-	            {
-	                $error++;
-	            }
-	        }
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if (!$error)
+			{
+				$result = $this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
 
-	        if (!$error && !$notrigger)
-	        {
-	            // Call trigger
-	            $result = $this->call_trigger('BILLREC_UPDATE', $user);
-	            if ($result < 0)
-	            {
-	                $this->db->rollback();
-	                return -2;
-	            }
-	            // End call triggers
-	        }
-	        $this->db->commit();
-	        return 1;
-	    } else {
-	        $this->error = $this->db->lasterror();
-	        $this->db->rollback();
-	        return -2;
-	    }
+			if (!$error && !$notrigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('BILLREC_UPDATE', $user);
+				if ($result < 0)
+				{
+					$this->db->rollback();
+					return -2;
+				}
+				// End call triggers
+			}
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->db->rollback();
+			return -2;
+		}
 	}
 
 	/**
@@ -493,13 +498,13 @@ class FactureRec extends CommonInvoice
 		$sql .= ', f.remise_percent, f.remise_absolue, f.remise';
 		$sql .= ', f.date_lim_reglement as dlr';
 		$sql .= ', f.note_private, f.note_public, f.fk_user_author';
-        $sql .= ', f.modelpdf';
+		$sql .= ', f.modelpdf as model_pdf';
 		$sql .= ', f.fk_mode_reglement, f.fk_cond_reglement, f.fk_projet as fk_project';
 		$sql .= ', f.fk_account';
 		$sql .= ', f.frequency, f.unit_frequency, f.date_when, f.date_last_gen, f.nb_gen_done, f.nb_gen_max, f.usenewprice, f.auto_validate';
-        $sql .= ', f.generate_pdf';
-        $sql .= ", f.fk_multicurrency, f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc";
-        $sql .= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
+		$sql .= ', f.generate_pdf';
+		$sql .= ", f.fk_multicurrency, f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc";
+		$sql .= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
 		$sql .= ', c.code as cond_reglement_code, c.libelle as cond_reglement_libelle, c.libelle_facture as cond_reglement_libelle_doc';
 		//$sql.= ', el.fk_source';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_rec as f';
@@ -557,7 +562,8 @@ class FactureRec extends CommonInvoice
 				$this->note_private           = $obj->note_private;
 				$this->note_public            = $obj->note_public;
 				$this->user_author            = $obj->fk_user_author;
-				$this->modelpdf               = $obj->modelpdf;
+				$this->modelpdf               = $obj->model_pdf; // deprecatd
+				$this->model_pdf              = $obj->model_pdf;
 				$this->rang = $obj->rang;
 				$this->special_code = $obj->special_code;
 				$this->frequency			  = $obj->frequency;
@@ -580,7 +586,7 @@ class FactureRec extends CommonInvoice
 
 				if ($this->statut == self::STATUS_DRAFT)	$this->brouillon = 1;
 
-				// Retreive all extrafield
+				// Retrieve all extrafield
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
 
@@ -613,24 +619,24 @@ class FactureRec extends CommonInvoice
 	 */
 	public function getLinesArray()
 	{
-	    return $this->fetch_lines();
+		return $this->fetch_lines();
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Get lines of template invoices into this->lines
 	 *
 	 *  @return     int         1 if OK, < 0 if KO
-     */
+	 */
 	public function fetch_lines()
 	{
 		global $extrafields;
 
-        // phpcs:enable
+		// phpcs:enable
 		$this->lines = array();
 
-		// Retreive all extrafield for line
+		// Retrieve all extrafield for line
 		// fetch optionals attributes and labels
 		if (!is_object($extrafields))
 		{
@@ -705,7 +711,7 @@ class FactureRec extends CommonInvoice
 				$line->rang = $objp->rang;
 				$line->special_code = $objp->special_code;
 				$line->fk_unit = $objp->fk_unit;
-                $line->fk_contract_line = $objp->fk_contract_line;
+				$line->fk_contract_line = $objp->fk_contract_line;
 
 				// Ne plus utiliser
 				$line->price            = $objp->price;
@@ -745,17 +751,17 @@ class FactureRec extends CommonInvoice
 	 */
 	public function delete(User $user, $notrigger = 0, $idwarehouse = -1)
 	{
-	    $rowid = $this->id;
+		$rowid = $this->id;
 
-	    dol_syslog(get_class($this)."::delete rowid=".$rowid, LOG_DEBUG);
+		dol_syslog(get_class($this)."::delete rowid=".$rowid, LOG_DEBUG);
 
-        $error = 0;
+		$error = 0;
 		$this->db->begin();
 
 		$main = MAIN_DB_PREFIX.'facturedet_rec';
-        $ef = $main."_extrafields";
-        $sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_facture = $rowid)";
-        dol_syslog($sqlef);
+		$ef = $main."_extrafields";
+		$sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_facture = $rowid)";
+		dol_syslog($sqlef);
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet_rec WHERE fk_facture = ".$rowid;
 		dol_syslog($sql);
 		if ($this->db->query($sqlef) && $this->db->query($sql))
@@ -768,8 +774,8 @@ class FactureRec extends CommonInvoice
 				$res = $this->deleteObjectLinked();
 				if ($res < 0) $error = -3;
 				// Delete extrafields
-                $res = $this->deleteExtraFields();
-                if ($res < 0) $error = -4;
+				$res = $this->deleteExtraFields();
+				if ($res < 0) $error = -4;
 			} else {
 				$this->error = $this->db->lasterror();
 				$error = -1;
@@ -781,11 +787,11 @@ class FactureRec extends CommonInvoice
 
 		if (!$error)
 		{
-		    $this->db->commit();
-		    return 1;
+			$this->db->commit();
+			return 1;
 		} else {
-	        $this->db->rollback();
-	        return $error;
+			$this->db->rollback();
+			return $error;
 		}
 	}
 
@@ -793,33 +799,33 @@ class FactureRec extends CommonInvoice
 	/**
 	 * 	Add a line to invoice
 	 *
-     *	@param    	string		$desc            	Description de la ligne
-     *	@param    	double		$pu_ht              Prix unitaire HT (> 0 even for credit note)
-     *	@param    	double		$qty             	Quantite
-     *	@param    	double		$txtva           	Taux de tva force, sinon -1
+	 *	@param    	string		$desc            	Description de la ligne
+	 *	@param    	double		$pu_ht              Prix unitaire HT (> 0 even for credit note)
+	 *	@param    	double		$qty             	Quantite
+	 *	@param    	double		$txtva           	Taux de tva force, sinon -1
 	 * 	@param		double		$txlocaltax1		Local tax 1 rate (deprecated)
 	 *  @param		double		$txlocaltax2		Local tax 2 rate (deprecated)
-     *	@param    	int			$fk_product      	Product/Service ID predefined
-     *	@param    	double		$remise_percent  	Percentage discount of the line
-     *	@param		string		$price_base_type	HT or TTC
-     *	@param    	int			$info_bits			VAT npr or not ?
-     *	@param    	int			$fk_remise_except	Id remise
-     *	@param    	double		$pu_ttc             Prix unitaire TTC (> 0 even for credit note)
-     *	@param		int			$type				Type of line (0=product, 1=service)
-     *	@param      int			$rang               Position of line
-     *	@param		int			$special_code		Special code
-     *	@param		string		$label				Label of the line
-     *	@param		string		$fk_unit			Unit
+	 *	@param    	int			$fk_product      	Product/Service ID predefined
+	 *	@param    	double		$remise_percent  	Percentage discount of the line
+	 *	@param		string		$price_base_type	HT or TTC
+	 *	@param    	int			$info_bits			VAT npr or not ?
+	 *	@param    	int			$fk_remise_except	Id remise
+	 *	@param    	double		$pu_ttc             Prix unitaire TTC (> 0 even for credit note)
+	 *	@param		int			$type				Type of line (0=product, 1=service)
+	 *	@param      int			$rang               Position of line
+	 *	@param		int			$special_code		Special code
+	 *	@param		string		$label				Label of the line
+	 *	@param		string		$fk_unit			Unit
 	 * 	@param		double		$pu_ht_devise		Unit price in currency
 	 *  @param		int			$date_start_fill	1=Flag to fill start date when generating invoice
 	 *  @param		int			$date_end_fill		1=Flag to fill end date when generating invoice
 	 * 	@param		int			$fk_fournprice		Supplier price id (to calculate margin) or ''
 	 * 	@param		int			$pa_ht				Buying price of line (to calculate margin) or ''
-     *	@return    	int             				<0 if KO, Id of line if OK
+	 *	@return    	int             				<0 if KO, Id of line if OK
 	 */
 	public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $fk_product = 0, $remise_percent = 0, $price_base_type = 'HT', $info_bits = 0, $fk_remise_except = '', $pu_ttc = 0, $type = 0, $rang = -1, $special_code = 0, $label = '', $fk_unit = null, $pu_ht_devise = 0, $date_start_fill = 0, $date_end_fill = 0, $fk_fournprice = null, $pa_ht = 0)
 	{
-	    global $mysoc;
+		global $mysoc;
 
 		$facid = $this->id;
 
@@ -1003,131 +1009,131 @@ class FactureRec extends CommonInvoice
 	 */
 	public function updateline($rowid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $fk_product = 0, $remise_percent = 0, $price_base_type = 'HT', $info_bits = 0, $fk_remise_except = '', $pu_ttc = 0, $type = 0, $rang = -1, $special_code = 0, $label = '', $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0, $date_start_fill = 0, $date_end_fill = 0, $fk_fournprice = null, $pa_ht = 0)
 	{
-	    global $mysoc;
+		global $mysoc;
 
-	    $facid = $this->id;
+		$facid = $this->id;
 
-	    dol_syslog(get_class($this)."::updateline facid=".$facid." rowid=$rowid, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, fk_product=$fk_product, remise_percent=$remise_percent, info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, type=$type, fk_unit=$fk_unit, pu_ht_devise=$pu_ht_devise", LOG_DEBUG);
-	    include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+		dol_syslog(get_class($this)."::updateline facid=".$facid." rowid=$rowid, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, fk_product=$fk_product, remise_percent=$remise_percent, info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, type=$type, fk_unit=$fk_unit, pu_ht_devise=$pu_ht_devise", LOG_DEBUG);
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-	    // Clean parameters
-	    if (empty($remise_percent)) $remise_percent = 0;
+		// Clean parameters
+		if (empty($remise_percent)) $remise_percent = 0;
 
-	    // Check parameters
-	    if ($type < 0) return -1;
+		// Check parameters
+		if ($type < 0) return -1;
 
-	    if ($this->brouillon)
-	    {
-	        // Clean parameters
-	        $remise_percent = price2num($remise_percent);
-	        $qty = price2num($qty);
-	        if (empty($info_bits)) $info_bits = 0;
-	        $pu_ht          = price2num($pu_ht);
-	        $pu_ttc         = price2num($pu_ttc);
-	        $pu_ht_devise = price2num($pu_ht_devise);
-	        $txtva = price2num($txtva);
-		    $txlocaltax1	= price2num($txlocaltax1);
-		    $txlocaltax2	= price2num($txlocaltax2);
-		    if (empty($txlocaltax1)) $txlocaltax1 = 0;
-		    if (empty($txlocaltax2)) $txlocaltax2 = 0;
+		if ($this->brouillon)
+		{
+			// Clean parameters
+			$remise_percent = price2num($remise_percent);
+			$qty = price2num($qty);
+			if (empty($info_bits)) $info_bits = 0;
+			$pu_ht          = price2num($pu_ht);
+			$pu_ttc         = price2num($pu_ttc);
+			$pu_ht_devise = price2num($pu_ht_devise);
+			$txtva = price2num($txtva);
+			$txlocaltax1	= price2num($txlocaltax1);
+			$txlocaltax2	= price2num($txlocaltax2);
+			if (empty($txlocaltax1)) $txlocaltax1 = 0;
+			if (empty($txlocaltax2)) $txlocaltax2 = 0;
 
-		    if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice = 0;
-		    if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht = 0;
-		    if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva = 0;
-		    if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc = 0;
+			if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice = 0;
+			if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht = 0;
+			if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva = 0;
+			if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc = 0;
 
-	        if ($price_base_type == 'HT')
-	        {
-	            $pu = $pu_ht;
-	        } else {
-	            $pu = $pu_ttc;
-	        }
+			if ($price_base_type == 'HT')
+			{
+				$pu = $pu_ht;
+			} else {
+				$pu = $pu_ttc;
+			}
 
-	        // Calculate total with, without tax and tax from qty, pu, remise_percent and txtva
-	        // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
-	        // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
+			// Calculate total with, without tax and tax from qty, pu, remise_percent and txtva
+			// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
+			// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 
-	        $localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
+			$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
 
-	        // Clean vat code
-	        $vat_src_code = '';
-	        if (preg_match('/\((.*)\)/', $txtva, $reg))
-	        {
-	        	$vat_src_code = $reg[1];
-	        	$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
-	        }
+			// Clean vat code
+			$vat_src_code = '';
+			if (preg_match('/\((.*)\)/', $txtva, $reg))
+			{
+				$vat_src_code = $reg[1];
+				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
+			}
 
-	        $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
+			$tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
 
-	        $total_ht  = $tabprice[0];
-	        $total_tva = $tabprice[1];
-	        $total_ttc = $tabprice[2];
-		    $total_localtax1 = $tabprice[9];
-		    $total_localtax2 = $tabprice[10];
-		    $pu_ht  = $tabprice[3];
-		    $pu_tva = $tabprice[4];
-		    $pu_ttc = $tabprice[5];
+			$total_ht  = $tabprice[0];
+			$total_tva = $tabprice[1];
+			$total_ttc = $tabprice[2];
+			$total_localtax1 = $tabprice[9];
+			$total_localtax2 = $tabprice[10];
+			$pu_ht  = $tabprice[3];
+			$pu_tva = $tabprice[4];
+			$pu_ttc = $tabprice[5];
 
-		    // MultiCurrency
-		    $multicurrency_total_ht  = $tabprice[16];
-		    $multicurrency_total_tva = $tabprice[17];
-		    $multicurrency_total_ttc = $tabprice[18];
-		    $pu_ht_devise = $tabprice[19];
+			// MultiCurrency
+			$multicurrency_total_ht  = $tabprice[16];
+			$multicurrency_total_tva = $tabprice[17];
+			$multicurrency_total_ttc = $tabprice[18];
+			$pu_ht_devise = $tabprice[19];
 
-	        $product_type = $type;
-	        if ($fk_product)
-	        {
-	            $product = new Product($this->db);
-	            $result = $product->fetch($fk_product);
-	            $product_type = $product->type;
-	        }
+			$product_type = $type;
+			if ($fk_product)
+			{
+				$product = new Product($this->db);
+				$result = $product->fetch($fk_product);
+				$product_type = $product->type;
+			}
 
-	        $sql = "UPDATE ".MAIN_DB_PREFIX."facturedet_rec SET ";
-	        $sql .= "fk_facture = ".((int) $facid);
-	        $sql .= ", label=".(!empty($label) ? "'".$this->db->escape($label)."'" : "null");
-	        $sql .= ", description='".$this->db->escape($desc)."'";
-	        $sql .= ", price=".price2num($pu_ht);
-	        $sql .= ", qty=".price2num($qty);
-	        $sql .= ", tva_tx=".price2num($txtva);
-	        $sql .= ", vat_src_code='".$this->db->escape($vat_src_code)."'";
-		    $sql .= ", localtax1_tx=".$txlocaltax1;
-		    $sql .= ", localtax1_type='".$this->db->escape($localtaxes_type[0])."'";
-		    $sql .= ", localtax2_tx=".$txlocaltax2;
-		    $sql .= ", localtax2_type='".$this->db->escape($localtaxes_type[2])."'";
-		    $sql .= ", fk_product=".(!empty($fk_product) ? "'".$this->db->escape($fk_product)."'" : "null");
-	        $sql .= ", product_type=".$product_type;
-	        $sql .= ", remise_percent='".price2num($remise_percent)."'";
-	        $sql .= ", subprice='".price2num($pu_ht)."'";
-	        $sql .= ", total_ht='".price2num($total_ht)."'";
-	        $sql .= ", total_tva='".price2num($total_tva)."'";
-	        $sql .= ", total_localtax1='".price2num($total_localtax1)."'";
-	        $sql .= ", total_localtax2='".price2num($total_localtax2)."'";
-	        $sql .= ", total_ttc='".price2num($total_ttc)."'";
-	        $sql .= ", date_start_fill=".((int) $date_start_fill);
-	        $sql .= ", date_end_fill=".((int) $date_end_fill);
-	        $sql .= ", fk_product_fournisseur_price=".($fk_fournprice > 0 ? $fk_fournprice : 'null');
-	        $sql .= ", buy_price_ht=".($pa_ht ? price2num($pa_ht) : 0);
-	        $sql .= ", info_bits=".$info_bits;
-	        $sql .= ", rang=".$rang;
-	        $sql .= ", special_code=".$special_code;
-	        $sql .= ", fk_unit=".($fk_unit ? "'".$this->db->escape($fk_unit)."'" : "null");
-	        $sql .= ', multicurrency_subprice = '.$pu_ht_devise;
-	        $sql .= ', multicurrency_total_ht = '.$multicurrency_total_ht;
-	        $sql .= ', multicurrency_total_tva = '.$multicurrency_total_tva;
-	        $sql .= ', multicurrency_total_ttc = '.$multicurrency_total_ttc;
-	        $sql .= " WHERE rowid = ".$rowid;
+			$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet_rec SET ";
+			$sql .= "fk_facture = ".((int) $facid);
+			$sql .= ", label=".(!empty($label) ? "'".$this->db->escape($label)."'" : "null");
+			$sql .= ", description='".$this->db->escape($desc)."'";
+			$sql .= ", price=".price2num($pu_ht);
+			$sql .= ", qty=".price2num($qty);
+			$sql .= ", tva_tx=".price2num($txtva);
+			$sql .= ", vat_src_code='".$this->db->escape($vat_src_code)."'";
+			$sql .= ", localtax1_tx=".$txlocaltax1;
+			$sql .= ", localtax1_type='".$this->db->escape($localtaxes_type[0])."'";
+			$sql .= ", localtax2_tx=".$txlocaltax2;
+			$sql .= ", localtax2_type='".$this->db->escape($localtaxes_type[2])."'";
+			$sql .= ", fk_product=".(!empty($fk_product) ? "'".$this->db->escape($fk_product)."'" : "null");
+			$sql .= ", product_type=".$product_type;
+			$sql .= ", remise_percent='".price2num($remise_percent)."'";
+			$sql .= ", subprice='".price2num($pu_ht)."'";
+			$sql .= ", total_ht='".price2num($total_ht)."'";
+			$sql .= ", total_tva='".price2num($total_tva)."'";
+			$sql .= ", total_localtax1='".price2num($total_localtax1)."'";
+			$sql .= ", total_localtax2='".price2num($total_localtax2)."'";
+			$sql .= ", total_ttc='".price2num($total_ttc)."'";
+			$sql .= ", date_start_fill=".((int) $date_start_fill);
+			$sql .= ", date_end_fill=".((int) $date_end_fill);
+			$sql .= ", fk_product_fournisseur_price=".($fk_fournprice > 0 ? $fk_fournprice : 'null');
+			$sql .= ", buy_price_ht=".($pa_ht ? price2num($pa_ht) : 0);
+			$sql .= ", info_bits=".$info_bits;
+			$sql .= ", rang=".$rang;
+			$sql .= ", special_code=".$special_code;
+			$sql .= ", fk_unit=".($fk_unit ? "'".$this->db->escape($fk_unit)."'" : "null");
+			$sql .= ', multicurrency_subprice = '.$pu_ht_devise;
+			$sql .= ', multicurrency_total_ht = '.$multicurrency_total_ht;
+			$sql .= ', multicurrency_total_tva = '.$multicurrency_total_tva;
+			$sql .= ', multicurrency_total_ttc = '.$multicurrency_total_ttc;
+			$sql .= " WHERE rowid = ".$rowid;
 
-	        dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
-	        if ($this->db->query($sql))
-	        {
-	            $this->id = $facid;
-	            $this->update_price();
-	            return 1;
-	        } else {
-	            $this->error = $this->db->lasterror();
-	            return -1;
-	        }
-	    }
+			dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
+			if ($this->db->query($sql))
+			{
+				$this->id = $facid;
+				$this->update_price();
+				return 1;
+			} else {
+				$this->error = $this->db->lasterror();
+				return -1;
+			}
+		}
 	}
 
 
@@ -1323,8 +1329,8 @@ class FactureRec extends CommonInvoice
 	 * @param  int		$max             			Maxlength of ref
 	 * @param  int		$short           			1=Return just URL
 	 * @param  string   $moretitle       			Add more text to title tooltip
-     * @param	int  	$notooltip		 			1=Disable tooltip
-     * @param  int		$save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 * @param	int  	$notooltip		 			1=Disable tooltip
+	 * @param  int		$save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 * @return string 			         			String with URL
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '', $notooltip = '', $save_lastsearch_value = -1)
@@ -1351,17 +1357,17 @@ class FactureRec extends CommonInvoice
 			}
 		}
 
-        $url = DOL_URL_ROOT.'/compta/facture/card-rec.php?facid='.$this->id;
+		$url = DOL_URL_ROOT.'/compta/facture/card-rec.php?facid='.$this->id;
 
-        if ($short) return $url;
+		if ($short) return $url;
 
-        if ($option != 'nolink')
-        {
-        	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-        	if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option != 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
 		$linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend = '</a>';
@@ -1386,7 +1392,7 @@ class FactureRec extends CommonInvoice
 		return $this->LibStatut($this->frequency ? 1 : 0, $this->suspended, $mode, $alreadypaid, empty($this->type) ? 0 : $this->type);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return label of a status
 	 *
@@ -1399,7 +1405,7 @@ class FactureRec extends CommonInvoice
 	 */
 	public function LibStatut($recur, $status, $mode = 0, $alreadypaid = -1, $type = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$langs->load('bills');
 
@@ -1548,7 +1554,7 @@ class FactureRec extends CommonInvoice
 		$arraynow = dol_getdate($now);
 		$nownotime = dol_mktime(0, 0, 0, $arraynow['mon'], $arraynow['mday'], $arraynow['year']);
 
-        // Load array of products prodids
+		// Load array of products prodids
 		$num_prods = 0;
 		$prodids = array();
 
@@ -1685,190 +1691,190 @@ class FactureRec extends CommonInvoice
 	}
 
 	/**
-     *	Update frequency and unit
-     *
-     *	@param     	int		$frequency		value of frequency
-     *	@param     	string	$unit 			unit of frequency  (d, m, y)
-     *	@return		int						<0 if KO, >0 if OK
-     */
-    public function setFrequencyAndUnit($frequency, $unit)
-    {
-        if (!$this->table_element) {
-            dol_syslog(get_class($this)."::setFrequencyAndUnit was called on objet with property table_element not defined", LOG_ERR);
-            return -1;
-        }
-
-        if (!empty($frequency) && empty($unit)) {
-            dol_syslog(get_class($this)."::setFrequencyAndUnit was called on objet with params frequency defined but unit not defined", LOG_ERR);
-            return -2;
-        }
-
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-        $sql .= ' SET frequency = '.($frequency ? $this->db->escape($frequency) : 'null');
-        if (!empty($unit)) {
-        	$sql .= ', unit_frequency = \''.$this->db->escape($unit).'\'';
+	 *	Update frequency and unit
+	 *
+	 *	@param     	int		$frequency		value of frequency
+	 *	@param     	string	$unit 			unit of frequency  (d, m, y)
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	public function setFrequencyAndUnit($frequency, $unit)
+	{
+		if (!$this->table_element) {
+			dol_syslog(get_class($this)."::setFrequencyAndUnit was called on objet with property table_element not defined", LOG_ERR);
+			return -1;
 		}
-        $sql .= ' WHERE rowid = '.$this->id;
 
-        dol_syslog(get_class($this)."::setFrequencyAndUnit", LOG_DEBUG);
-        if ($this->db->query($sql)) {
-            $this->frequency = $frequency;
-            if (!empty($unit)) $this->unit_frequency = $unit;
-            return 1;
-        } else {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+		if (!empty($frequency) && empty($unit)) {
+			dol_syslog(get_class($this)."::setFrequencyAndUnit was called on objet with params frequency defined but unit not defined", LOG_ERR);
+			return -2;
+		}
+
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+		$sql .= ' SET frequency = '.($frequency ? $this->db->escape($frequency) : 'null');
+		if (!empty($unit)) {
+			$sql .= ', unit_frequency = \''.$this->db->escape($unit).'\'';
+		}
+		$sql .= ' WHERE rowid = '.$this->id;
+
+		dol_syslog(get_class($this)."::setFrequencyAndUnit", LOG_DEBUG);
+		if ($this->db->query($sql)) {
+			$this->frequency = $frequency;
+			if (!empty($unit)) $this->unit_frequency = $unit;
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
 	/**
-     *	Update the next date of execution
-     *
-     *	@param     	datetime	$date					date of execution
-     *	@param     	int			$increment_nb_gen_done	0 do nothing more, >0 increment nb_gen_done
-     *	@return		int									<0 if KO, >0 if OK
-     */
-    public function setNextDate($date, $increment_nb_gen_done = 0)
-    {
-        if (!$this->table_element)
-        {
-            dol_syslog(get_class($this)."::setNextDate was called on objet with property table_element not defined", LOG_ERR);
-            return -1;
-        }
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-        $sql .= " SET date_when = ".($date ? "'".$this->db->idate($date)."'" : "null");
-        if ($increment_nb_gen_done > 0) $sql .= ', nb_gen_done = nb_gen_done + 1';
-        $sql .= ' WHERE rowid = '.$this->id;
+	 *	Update the next date of execution
+	 *
+	 *	@param     	datetime	$date					date of execution
+	 *	@param     	int			$increment_nb_gen_done	0 do nothing more, >0 increment nb_gen_done
+	 *	@return		int									<0 if KO, >0 if OK
+	 */
+	public function setNextDate($date, $increment_nb_gen_done = 0)
+	{
+		if (!$this->table_element)
+		{
+			dol_syslog(get_class($this)."::setNextDate was called on objet with property table_element not defined", LOG_ERR);
+			return -1;
+		}
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " SET date_when = ".($date ? "'".$this->db->idate($date)."'" : "null");
+		if ($increment_nb_gen_done > 0) $sql .= ', nb_gen_done = nb_gen_done + 1';
+		$sql .= ' WHERE rowid = '.$this->id;
 
-        dol_syslog(get_class($this)."::setNextDate", LOG_DEBUG);
-        if ($this->db->query($sql))
-        {
-            $this->date_when = $date;
-            if ($increment_nb_gen_done > 0) $this->nb_gen_done++;
-            return 1;
-        } else {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+		dol_syslog(get_class($this)."::setNextDate", LOG_DEBUG);
+		if ($this->db->query($sql))
+		{
+			$this->date_when = $date;
+			if ($increment_nb_gen_done > 0) $this->nb_gen_done++;
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
 	/**
-     *	Update the maximum period
-     *
-     *	@param     	int		$nb		number of maximum period
-     *	@return		int				<0 if KO, >0 if OK
-     */
-    public function setMaxPeriod($nb)
-    {
-        if (!$this->table_element)
-        {
-            dol_syslog(get_class($this)."::setMaxPeriod was called on objet with property table_element not defined", LOG_ERR);
-            return -1;
-        }
+	 *	Update the maximum period
+	 *
+	 *	@param     	int		$nb		number of maximum period
+	 *	@return		int				<0 if KO, >0 if OK
+	 */
+	public function setMaxPeriod($nb)
+	{
+		if (!$this->table_element)
+		{
+			dol_syslog(get_class($this)."::setMaxPeriod was called on objet with property table_element not defined", LOG_ERR);
+			return -1;
+		}
 
-        if (empty($nb)) $nb = 0;
+		if (empty($nb)) $nb = 0;
 
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-        $sql .= ' SET nb_gen_max = '.$nb;
-        $sql .= ' WHERE rowid = '.$this->id;
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+		$sql .= ' SET nb_gen_max = '.$nb;
+		$sql .= ' WHERE rowid = '.$this->id;
 
-        dol_syslog(get_class($this)."::setMaxPeriod", LOG_DEBUG);
-        if ($this->db->query($sql))
-        {
-            $this->nb_gen_max = $nb;
-            return 1;
-        } else {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+		dol_syslog(get_class($this)."::setMaxPeriod", LOG_DEBUG);
+		if ($this->db->query($sql))
+		{
+			$this->nb_gen_max = $nb;
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
 	/**
-     *	Update the auto validate flag of invoice
-     *
-     *	@param     	int		$validate		0 to create in draft, 1 to create and validate invoice
-     *	@return		int						<0 if KO, >0 if OK
-     */
-    public function setAutoValidate($validate)
-    {
-        if (!$this->table_element)
-        {
-            dol_syslog(get_class($this)."::setAutoValidate was called on objet with property table_element not defined", LOG_ERR);
-            return -1;
-        }
+	 *	Update the auto validate flag of invoice
+	 *
+	 *	@param     	int		$validate		0 to create in draft, 1 to create and validate invoice
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	public function setAutoValidate($validate)
+	{
+		if (!$this->table_element)
+		{
+			dol_syslog(get_class($this)."::setAutoValidate was called on objet with property table_element not defined", LOG_ERR);
+			return -1;
+		}
 
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-        $sql .= ' SET auto_validate = '.$validate;
-        $sql .= ' WHERE rowid = '.$this->id;
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+		$sql .= ' SET auto_validate = '.$validate;
+		$sql .= ' WHERE rowid = '.$this->id;
 
-        dol_syslog(get_class($this)."::setAutoValidate", LOG_DEBUG);
-        if ($this->db->query($sql))
-        {
-            $this->auto_validate = $validate;
-            return 1;
-        } else {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+		dol_syslog(get_class($this)."::setAutoValidate", LOG_DEBUG);
+		if ($this->db->query($sql))
+		{
+			$this->auto_validate = $validate;
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
-    /**
-     *	Update the auto generate documents
-     *
-     *	@param     	int		$validate		0 no document, 1 to generate document
-     *	@return		int						<0 if KO, >0 if OK
-     */
-    public function setGeneratePdf($validate)
-    {
-        if (!$this->table_element)
-        {
-            dol_syslog(get_class($this)."::setGeneratePdf was called on objet with property table_element not defined", LOG_ERR);
-            return -1;
-        }
+	/**
+	 *	Update the auto generate documents
+	 *
+	 *	@param     	int		$validate		0 no document, 1 to generate document
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	public function setGeneratePdf($validate)
+	{
+		if (!$this->table_element)
+		{
+			dol_syslog(get_class($this)."::setGeneratePdf was called on objet with property table_element not defined", LOG_ERR);
+			return -1;
+		}
 
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-        $sql .= ' SET generate_pdf = '.$validate;
-        $sql .= ' WHERE rowid = '.$this->id;
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+		$sql .= ' SET generate_pdf = '.$validate;
+		$sql .= ' WHERE rowid = '.$this->id;
 
-        dol_syslog(get_class($this)."::setGeneratePdf", LOG_DEBUG);
-        if ($this->db->query($sql))
-        {
-            $this->generate_pdf = $validate;
-            return 1;
-        } else {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+		dol_syslog(get_class($this)."::setGeneratePdf", LOG_DEBUG);
+		if ($this->db->query($sql))
+		{
+			$this->generate_pdf = $validate;
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
-    /**
-     *  Update the model for documents
-     *
-     *  @param     	string		$model		model of document generator
-     *  @return		int						<0 if KO, >0 if OK
-     */
-    public function setModelPdf($model)
-    {
-        if (!$this->table_element)
-        {
-            dol_syslog(get_class($this)."::setModelPdf was called on objet with property table_element not defined", LOG_ERR);
-            return -1;
-        }
+	/**
+	 *  Update the model for documents
+	 *
+	 *  @param     	string		$model		model of document generator
+	 *  @return		int						<0 if KO, >0 if OK
+	 */
+	public function setModelPdf($model)
+	{
+		if (!$this->table_element)
+		{
+			dol_syslog(get_class($this)."::setModelPdf was called on objet with property table_element not defined", LOG_ERR);
+			return -1;
+		}
 
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-        $sql .= ' SET modelpdf = "'.$model.'"';
-        $sql .= ' WHERE rowid = '.$this->id;
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+		$sql .= ' SET modelpdf = "'.$model.'"';
+		$sql .= ' WHERE rowid = '.$this->id;
 
-        dol_syslog(get_class($this)."::setModelPdf", LOG_DEBUG);
-        if ($this->db->query($sql))
-        {
-            $this->modelpdf = $model;
-            return 1;
-        } else {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+		dol_syslog(get_class($this)."::setModelPdf", LOG_DEBUG);
+		if ($this->db->query($sql))
+		{
+			$this->modelpdf = $model;
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 }
 
 
@@ -1889,210 +1895,208 @@ class FactureLigneRec extends CommonInvoiceLine
 	 */
 	public $table_element = 'facturedet_rec';
 
-	public $date_start_fill;
-	public $date_end_fill;
 
 
-    /**
-     * 	Delete line in database
-     *
-     *  @param		User	$user		Object user
-     *  @param		int		$notrigger	Disable triggers
-     *	@return		int					<0 if KO, >0 if OK
-     */
-    public function delete(User $user, $notrigger = false)
-    {
-    	$error = 0;
+	/**
+	 * 	Delete line in database
+	 *
+	 *  @param		User	$user		Object user
+	 *  @param		int		$notrigger	Disable triggers
+	 *	@return		int					<0 if KO, >0 if OK
+	 */
+	public function delete(User $user, $notrigger = false)
+	{
+		$error = 0;
 
-	    $this->db->begin();
+		$this->db->begin();
 
-	    if (!$error) {
-	        if (!$notrigger) {
-	            // Call triggers
-	            $result = $this->call_trigger('LINEBILLREC_DELETE', $user);
-	            if ($result < 0) { $error++; } // Do also here what you must do to rollback action if trigger fail
-	            // End call triggers
-	        }
-	    }
+		if (!$error) {
+			if (!$notrigger) {
+				// Call triggers
+				$result = $this->call_trigger('LINEBILLREC_DELETE', $user);
+				if ($result < 0) { $error++; } // Do also here what you must do to rollback action if trigger fail
+				// End call triggers
+			}
+		}
 
 		if (!$error)
-        {
-            $result = $this->deleteExtraFields();
-            if ($result < 0) {
-                $error++;
-            }
-        }
-
-	    if (!$error)
-	    {
-    		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.$this->id;
-
-    		$res = $this->db->query($sql);
-    		if ($res === false) {
-    		    $error++;
-    		    $this->errors[] = $this->db->lasterror();
-    		}
-	    }
-
-    	// Commit or rollback
-		if ($error) {
-		    $this->db->rollback();
-		    return -1;
-		} else {
-		    $this->db->commit();
-		    return 1;
+		{
+			$result = $this->deleteExtraFields();
+			if ($result < 0) {
+				$error++;
+			}
 		}
-    }
+
+		if (!$error)
+		{
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.$this->id;
+
+			$res = $this->db->query($sql);
+			if ($res === false) {
+				$error++;
+				$this->errors[] = $this->db->lasterror();
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+			return -1;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
 
 
-    /**
-     *	Get line of template invoice
-     *
-     *	@param		int 	$rowid		Id of invoice
-     *	@return     int         		1 if OK, < 0 if KO
-     */
-    public function fetch($rowid)
-    {
-    	$sql = 'SELECT l.rowid, l.fk_facture ,l.fk_product, l.product_type, l.label as custom_label, l.description, l.product_type, l.price, l.qty, l.vat_src_code, l.tva_tx,';
-    	$sql .= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.remise, l.remise_percent, l.subprice,';
-    	$sql .= ' l.date_start_fill, l.date_end_fill, l.info_bits, l.total_ht, l.total_tva, l.total_ttc,';
-    	$sql .= ' l.rang, l.special_code,';
-    	$sql .= ' l.fk_unit, l.fk_contract_line,';
-    	$sql .= ' p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc';
-    	$sql .= ' FROM '.MAIN_DB_PREFIX.'facturedet_rec as l';
-    	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
-    	$sql .= ' WHERE l.rowid = '.$rowid;
-    	$sql .= ' ORDER BY l.rang';
+	/**
+	 *	Get line of template invoice
+	 *
+	 *	@param		int 	$rowid		Id of invoice
+	 *	@return     int         		1 if OK, < 0 if KO
+	 */
+	public function fetch($rowid)
+	{
+		$sql = 'SELECT l.rowid, l.fk_facture ,l.fk_product, l.product_type, l.label as custom_label, l.description, l.product_type, l.price, l.qty, l.vat_src_code, l.tva_tx,';
+		$sql .= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.remise, l.remise_percent, l.subprice,';
+		$sql .= ' l.date_start_fill, l.date_end_fill, l.info_bits, l.total_ht, l.total_tva, l.total_ttc,';
+		$sql .= ' l.rang, l.special_code,';
+		$sql .= ' l.fk_unit, l.fk_contract_line,';
+		$sql .= ' p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'facturedet_rec as l';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
+		$sql .= ' WHERE l.rowid = '.$rowid;
+		$sql .= ' ORDER BY l.rang';
 
-    	dol_syslog('FactureRec::fetch', LOG_DEBUG);
-    	$result = $this->db->query($sql);
-    	if ($result)
-    	{
-    		$objp = $this->db->fetch_object($result);
+		dol_syslog('FactureRec::fetch', LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$objp = $this->db->fetch_object($result);
 
-    		$this->id = $objp->rowid;
-    		$this->label            = $objp->custom_label; // Label line
-    		$this->desc             = $objp->description; // Description line
-    		$this->description      = $objp->description; // Description line
-    		$this->product_type     = $objp->product_type; // Type of line
-    		$this->ref              = $objp->product_ref; // Ref product
-    		$this->product_ref      = $objp->product_ref; // Ref product
-    		$this->libelle          = $objp->product_label; // deprecated
-    		$this->product_label = $objp->product_label; // Label product
-    		$this->product_desc     = $objp->product_desc; // Description product
-    		$this->fk_product_type  = $objp->fk_product_type; // Type of product
-    		$this->qty              = $objp->qty;
-    		$this->price = $objp->price;
-    		$this->subprice         = $objp->subprice;
-    		$this->fk_facture = $objp->fk_facture;
-    		$this->vat_src_code     = $objp->vat_src_code;
-    		$this->tva_tx           = $objp->tva_tx;
-    		$this->localtax1_tx     = $objp->localtax1_tx;
-    		$this->localtax2_tx     = $objp->localtax2_tx;
-    		$this->localtax1_type   = $objp->localtax1_type;
-    		$this->localtax2_type   = $objp->localtax2_type;
-    		$this->remise_percent   = $objp->remise_percent;
-    		$this->fk_remise_except = $objp->fk_remise_except;
-    		$this->fk_product       = $objp->fk_product;
-    		$this->date_start_fill  = $objp->date_start_fill;
-    		$this->date_end_fill    = $objp->date_end_fill;
-    		$this->info_bits        = $objp->info_bits;
-    		$this->total_ht         = $objp->total_ht;
-    		$this->total_tva        = $objp->total_tva;
-    		$this->total_ttc        = $objp->total_ttc;
-    		$this->code_ventilation = $objp->fk_code_ventilation;
-    		$this->rang = $objp->rang;
-    		$this->special_code = $objp->special_code;
-    		$this->fk_unit          = $objp->fk_unit;
-    		$this->fk_contract_line = $objp->fk_contract_line;
+			$this->id = $objp->rowid;
+			$this->label            = $objp->custom_label; // Label line
+			$this->desc             = $objp->description; // Description line
+			$this->description      = $objp->description; // Description line
+			$this->product_type     = $objp->product_type; // Type of line
+			$this->ref              = $objp->product_ref; // Ref product
+			$this->product_ref      = $objp->product_ref; // Ref product
+			$this->libelle          = $objp->product_label; // deprecated
+			$this->product_label = $objp->product_label; // Label product
+			$this->product_desc     = $objp->product_desc; // Description product
+			$this->fk_product_type  = $objp->fk_product_type; // Type of product
+			$this->qty              = $objp->qty;
+			$this->price = $objp->price;
+			$this->subprice         = $objp->subprice;
+			$this->fk_facture = $objp->fk_facture;
+			$this->vat_src_code     = $objp->vat_src_code;
+			$this->tva_tx           = $objp->tva_tx;
+			$this->localtax1_tx     = $objp->localtax1_tx;
+			$this->localtax2_tx     = $objp->localtax2_tx;
+			$this->localtax1_type   = $objp->localtax1_type;
+			$this->localtax2_type   = $objp->localtax2_type;
+			$this->remise_percent   = $objp->remise_percent;
+			$this->fk_remise_except = $objp->fk_remise_except;
+			$this->fk_product       = $objp->fk_product;
+			$this->date_start_fill  = $objp->date_start_fill;
+			$this->date_end_fill    = $objp->date_end_fill;
+			$this->info_bits        = $objp->info_bits;
+			$this->total_ht         = $objp->total_ht;
+			$this->total_tva        = $objp->total_tva;
+			$this->total_ttc        = $objp->total_ttc;
+			$this->code_ventilation = $objp->fk_code_ventilation;
+			$this->rang = $objp->rang;
+			$this->special_code = $objp->special_code;
+			$this->fk_unit          = $objp->fk_unit;
+			$this->fk_contract_line = $objp->fk_contract_line;
 
 
-    		$this->db->free($result);
-    		return 1;
-    	} else {
-    		$this->error = $this->db->lasterror();
-    		return -3;
-    	}
-    }
+			$this->db->free($result);
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -3;
+		}
+	}
 
 
-    /**
-     * 	Update a line to invoice_rec.
-     *
-     *  @param		User	$user					User
-     *  @param		int		$notrigger				No trigger
-     *	@return    	int             				<0 if KO, Id of line if OK
-     */
-    public function update(User $user, $notrigger = 0)
-    {
-    	global $conf;
+	/**
+	 * 	Update a line to invoice_rec.
+	 *
+	 *  @param		User	$user					User
+	 *  @param		int		$notrigger				No trigger
+	 *	@return    	int             				<0 if KO, Id of line if OK
+	 */
+	public function update(User $user, $notrigger = 0)
+	{
+		global $conf;
 
-    	$error = 0;
+		$error = 0;
 
-    	include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-    	$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet_rec SET";
-    	$sql .= " fk_facture = ".$this->fk_facture;
-    	$sql .= ", label=".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
-    	$sql .= ", description='".$this->db->escape($this->desc)."'";
-    	$sql .= ", price=".price2num($this->price);
-    	$sql .= ", qty=".price2num($this->qty);
-    	$sql .= ", tva_tx=".price2num($this->tva_tx);
-    	$sql .= ", vat_src_code='".$this->db->escape($this->vat_src_code)."'";
-    	$sql .= ", localtax1_tx=".price2num($this->localtax1_tx);
-    	$sql .= ", localtax1_type='".$this->db->escape($this->localtax1_type)."'";
-    	$sql .= ", localtax2_tx=".price2num($this->localtax2_tx);
-    	$sql .= ", localtax2_type='".$this->db->escape($this->localtax2_type)."'";
-    	$sql .= ", fk_product=".($this->fk_product > 0 ? $this->fk_product : "null");
-    	$sql .= ", product_type=".$this->product_type;
-    	$sql .= ", remise_percent='".price2num($this->remise_percent)."'";
-    	$sql .= ", subprice='".price2num($this->subprice)."'";
-    	$sql .= ", info_bits='".price2num($this->info_bits)."'";
-    	$sql .= ", date_start_fill=".(int) $this->date_start_fill;
-    	$sql .= ", date_end_fill=".(int) $this->date_end_fill;
-    	if (empty($this->skip_update_total)) {
-    		$sql .= ", total_ht=".price2num($this->total_ht);
-	    	$sql .= ", total_tva=".price2num($this->total_tva);
-	    	$sql .= ", total_localtax1=".price2num($this->total_localtax1);
-	    	$sql .= ", total_localtax2=".price2num($this->total_localtax2);
-	    	$sql .= ", total_ttc=".price2num($this->total_ttc);
-    	}
-    	$sql .= ", rang=".$this->rang;
-    	$sql .= ", special_code=".$this->special_code;
-    	$sql .= ", fk_unit=".($this->fk_unit ? "'".$this->db->escape($this->fk_unit)."'" : "null");
-    	$sql .= ", fk_contract_line=".($this->fk_contract_line ? $this->fk_contract_line : "null");
-    	$sql .= " WHERE rowid = ".$this->id;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet_rec SET";
+		$sql .= " fk_facture = ".$this->fk_facture;
+		$sql .= ", label=".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
+		$sql .= ", description='".$this->db->escape($this->desc)."'";
+		$sql .= ", price=".price2num($this->price);
+		$sql .= ", qty=".price2num($this->qty);
+		$sql .= ", tva_tx=".price2num($this->tva_tx);
+		$sql .= ", vat_src_code='".$this->db->escape($this->vat_src_code)."'";
+		$sql .= ", localtax1_tx=".price2num($this->localtax1_tx);
+		$sql .= ", localtax1_type='".$this->db->escape($this->localtax1_type)."'";
+		$sql .= ", localtax2_tx=".price2num($this->localtax2_tx);
+		$sql .= ", localtax2_type='".$this->db->escape($this->localtax2_type)."'";
+		$sql .= ", fk_product=".($this->fk_product > 0 ? $this->fk_product : "null");
+		$sql .= ", product_type=".$this->product_type;
+		$sql .= ", remise_percent='".price2num($this->remise_percent)."'";
+		$sql .= ", subprice='".price2num($this->subprice)."'";
+		$sql .= ", info_bits='".price2num($this->info_bits)."'";
+		$sql .= ", date_start_fill=".(int) $this->date_start_fill;
+		$sql .= ", date_end_fill=".(int) $this->date_end_fill;
+		if (empty($this->skip_update_total)) {
+			$sql .= ", total_ht=".price2num($this->total_ht);
+			$sql .= ", total_tva=".price2num($this->total_tva);
+			$sql .= ", total_localtax1=".price2num($this->total_localtax1);
+			$sql .= ", total_localtax2=".price2num($this->total_localtax2);
+			$sql .= ", total_ttc=".price2num($this->total_ttc);
+		}
+		$sql .= ", rang=".$this->rang;
+		$sql .= ", special_code=".$this->special_code;
+		$sql .= ", fk_unit=".($this->fk_unit ? "'".$this->db->escape($this->fk_unit)."'" : "null");
+		$sql .= ", fk_contract_line=".($this->fk_contract_line ? $this->fk_contract_line : "null");
+		$sql .= " WHERE rowid = ".$this->id;
 
-    	dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
-    	$resql = $this->db->query($sql);
-        if ($resql)
-        {
-    		if (!$error)
-    		{
-    			$result = $this->insertExtraFields();
-    			if ($result < 0)
-    			{
-    				$error++;
-    			}
-    		}
+		dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if (!$error)
+			{
+				$result = $this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
 
-    		if (!$error && !$notrigger)
-    		{
-    			// Call trigger
-    			$result = $this->call_trigger('LINEBILLREC_UPDATE', $user);
-    			if ($result < 0)
-    			{
-    				$this->db->rollback();
-    				return -2;
-    			}
-    			// End call triggers
-    		}
-            $this->db->commit();
-            return 1;
-        } else {
-            $this->error = $this->db->lasterror();
-            $this->db->rollback();
-            return -2;
-        }
-    }
+			if (!$error && !$notrigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('LINEBILLREC_UPDATE', $user);
+				if ($result < 0)
+				{
+					$this->db->rollback();
+					return -2;
+				}
+				// End call triggers
+			}
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->db->rollback();
+			return -2;
+		}
+	}
 }
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 4110e5ad26d..5f7bf4fcf77 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -64,17 +64,17 @@ class Facture extends CommonInvoice
 	public $table_element = 'facture';
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	public $table_element_line = 'facturedet';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Fieldname with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_facture';
 
 	/**
-	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 * @var string String with name of icon for myobject.
 	 */
 	public $picto = 'bill';
 
@@ -95,6 +95,9 @@ class Facture extends CommonInvoice
 	 */
 	protected $table_ref_field = 'ref';
 
+	/**
+	 * @var int thirdparty ID
+	 */
 	public $socid;
 
 	public $author;
@@ -111,6 +114,18 @@ class Facture extends CommonInvoice
 
 	public $date; // Date invoice
 	public $datem;
+
+	/**
+	 * @var int	Date expected for delivery
+	 * @deprecated
+	 */
+	public $date_livraison; // deprecated; Use delivery_date instead.
+
+	public $delivery_date; // Date expected of shipment (date starting shipment, not the reception that occurs some days after)
+
+	/**
+	 * @var string customer ref
+	 */
 	public $ref_client;
 
 	/**
@@ -137,8 +152,12 @@ class Facture extends CommonInvoice
 	public $close_code;
 	//! Commentaire si mis a paye sans paiement complet
 	public $close_note;
-	//! 1 if invoice paid COMPLETELY, 0 otherwise (do not use it anymore, use statut and close_code)
+
+	/**
+	 * 1 if invoice paid COMPLETELY, 0 otherwise (do not use it anymore, use statut and close_code)
+	 */
 	public $paye;
+
 	//! key of module source when invoice generated from a dedicated module ('cashdesk', 'takepos', ...)
 	public $module_source;
 	//! key of pos source ('0', '1', ...)
@@ -157,11 +176,6 @@ class Facture extends CommonInvoice
 	 */
 	public $fk_bank;
 
-	/**
-	 * @deprecated
-	 */
-	public $products = array();
-
 	/**
 	 * @var FactureLigne[]
 	 */
@@ -169,10 +183,11 @@ class Facture extends CommonInvoice
 
 	public $line;
 	public $extraparams = array();
-	public $specimen;
 
 	public $fac_rec;
 
+	public $date_pointoftax;
+
 	// Multicurrency
 	/**
 	 * @var int ID
@@ -458,7 +473,7 @@ class Facture extends CommonInvoice
 		$nextdatewhen = null;
 		$previousdaynextdatewhen = null;
 
-		// Create invoice from a template invoice
+		// Create invoice from a template recurring invoice
 		if ($this->fac_rec > 0)
 		{
 			$this->fk_fac_rec_source = $this->fac_rec;
@@ -617,7 +632,7 @@ class Facture extends CommonInvoice
 		$sql .= ", ".($this->remise_absolue > 0 ? $this->remise_absolue : 'NULL');
 		$sql .= ", ".($this->remise_percent > 0 ? $this->remise_percent : 'NULL');
 		$sql .= ", '".$this->db->idate($this->date)."'";
-		$sql .= ", ".(strval($this->date_pointoftax) != '' ? "'".$this->db->idate($this->date_pointoftax)."'" : 'null');
+		$sql .= ", ".(empty($this->date_pointoftax) ? "null" : "'".$this->db->idate($this->date_pointoftax)."'");
 		$sql .= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : "null");
 		$sql .= ", ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : "null");
 		$sql .= ", ".($this->ref_client ? "'".$this->db->escape($this->ref_client)."'" : "null");
@@ -631,7 +646,8 @@ class Facture extends CommonInvoice
 		$sql .= ", ".($this->fk_project ? $this->fk_project : "null");
 		$sql .= ", ".$this->cond_reglement_id;
 		$sql .= ", ".$this->mode_reglement_id;
-		$sql .= ", '".$this->db->idate($this->date_lim_reglement)."', '".$this->db->escape($this->modelpdf)."'";
+		$sql .= ", '".$this->db->idate($this->date_lim_reglement)."'";
+		$sql .= ", ".(isset($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : "null");
 		$sql .= ", ".($this->situation_cycle_ref ? "'".$this->db->escape($this->situation_cycle_ref)."'" : "null");
 		$sql .= ", ".($this->situation_counter ? "'".$this->db->escape($this->situation_counter)."'" : "null");
 		$sql .= ", ".($this->situation_final ? $this->situation_final : 0);
@@ -663,7 +679,7 @@ class Facture extends CommonInvoice
 			}
 
 			// Add object linked
-			if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects))
+			if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects))
 			{
 				foreach ($this->linked_objects as $origin => $tmp_origin_id)
 				{
@@ -745,7 +761,7 @@ class Facture extends CommonInvoice
 					$newinvoiceline->origin_id = $this->lines[$i]->id;
 
 					// Auto set date of service ?
-					if ($this->lines[$i]->date_start_fill == 1 && $originaldatewhen)			// $originaldatewhen is defined when generating from recurring invoice only
+					if ($this->lines[$i]->date_start_fill == 1 && $originaldatewhen)		// $originaldatewhen is defined when generating from recurring invoice only
 					{
 						$newinvoiceline->date_start = $originaldatewhen;
 					}
@@ -1026,7 +1042,7 @@ class Facture extends CommonInvoice
 		// Charge facture source
 		$facture = new Facture($this->db);
 
-		// Retreive all extrafield
+		// Retrieve all extrafield
 		// fetch optionals attributes and labels
 		$this->fetch_optionals();
 
@@ -1046,7 +1062,8 @@ class Facture extends CommonInvoice
 		$facture->note_public       = $this->note_public;
 		$facture->note_private      = $this->note_private;
 		$facture->ref_client        = $this->ref_client;
-		$facture->modelpdf          = $this->modelpdf;
+		$facture->modelpdf          = $this->modelpdf; // deprecated
+		$facture->model_pdf         = $this->modelpdf;
 		$facture->fk_project        = $this->fk_project;
 		$facture->cond_reglement_id = $this->cond_reglement_id;
 		$facture->mode_reglement_id = $this->mode_reglement_id;
@@ -1057,7 +1074,6 @@ class Facture extends CommonInvoice
 		$facture->origin_id         = $this->origin_id;
 
 		$facture->lines = $this->lines; // Array of lines of invoice
-		$facture->products = $this->lines; // Tant que products encore utilise
 		$facture->situation_counter = $this->situation_counter;
 		$facture->situation_cycle_ref = $this->situation_cycle_ref;
 		$facture->situation_final = $this->situation_final;
@@ -1066,6 +1082,8 @@ class Facture extends CommonInvoice
 		$facture->retained_warranty_fk_cond_reglement = $this->retained_warranty_fk_cond_reglement;
 		$facture->retained_warranty_date_limit = $this->retained_warranty_date_limit;
 
+		$facture->fk_user_author = $user->id;
+
 
 		// Loop on each line of new invoice
 		foreach ($facture->lines as $i => $tmpline)
@@ -1150,8 +1168,10 @@ class Facture extends CommonInvoice
 
 		// Clear fields
 		$object->date               = (empty($this->date) ? dol_now() : $this->date);
-		$object->user_author        = $user->id;
-		$object->user_valid         = '';
+		$object->user_author        = $user->id;	// deprecated
+		$object->user_valid         = null;			// deprecated
+		$object->fk_user_author     = $user->id;
+		$object->fk_user_valid      = null;
 		$object->fk_facture_source  = 0;
 		$object->date_creation      = '';
 		$object->date_modification = '';
@@ -1159,7 +1179,6 @@ class Facture extends CommonInvoice
 		$object->ref_client         = '';
 		$object->close_code         = '';
 		$object->close_note         = '';
-		$object->products = $object->lines; // For backward compatibility
 		if ($conf->global->MAIN_DONT_KEEP_NOTE_ON_CLONING == 1) {
 			$object->note_private = '';
 			$object->note_public = '';
@@ -1171,7 +1190,6 @@ class Facture extends CommonInvoice
 			if (($object->lines[$i]->info_bits & 0x02) == 0x02)	// We do not clone line of discounts
 			{
 				unset($object->lines[$i]);
-				unset($object->products[$i]); // Tant que products encore utilise
 			}
 						// Bloc to update dates of service (month by month only if previously filled at 1d near start or end of month)
 			// If it's a service with start and end dates
@@ -1305,8 +1323,9 @@ class Facture extends CommonInvoice
 
 			// get extrafields from original line
 			$object->lines[$i]->fetch_optionals();
-			foreach ($object->lines[$i]->array_options as $options_key => $value)
+			foreach ($object->lines[$i]->array_options as $options_key => $value) {
 				$line->array_options[$options_key] = $value;
+			}
 
 			$this->lines[$i] = $line;
 		}
@@ -1318,7 +1337,8 @@ class Facture extends CommonInvoice
 		$this->mode_reglement_id    = $object->mode_reglement_id;
 		$this->availability_id      = $object->availability_id;
 		$this->demand_reason_id     = $object->demand_reason_id;
-		$this->date_livraison       = $object->date_livraison;
+		$this->delivery_date        = (empty($object->delivery_date) ? $object->date_livraison : $object->delivery_date);
+		$this->date_livraison       = $object->delivery_date; // deprecated
 		$this->fk_delivery_address  = $object->fk_delivery_address; // deprecated
 		$this->contact_id           = $object->contact_id;
 		$this->ref_client           = $object->ref_client;
@@ -1335,6 +1355,8 @@ class Facture extends CommonInvoice
 		$this->origin = $object->element;
 		$this->origin_id = $object->id;
 
+		$this->fk_user_author = $user->id;
+
 		// get extrafields from original line
 		$object->fetch_optionals();
 		foreach ($object->array_options as $options_key => $value)
@@ -1349,8 +1371,7 @@ class Facture extends CommonInvoice
 
 		$ret = $this->create($user);
 
-		if ($ret > 0)
-		{
+		if ($ret > 0) {
 			// Actions hooked (by external module)
 			$hookmanager->initHooks(array('invoicedao'));
 
@@ -1411,11 +1432,14 @@ class Facture extends CommonInvoice
 		$label = '';
 
 		if ($user->rights->facture->lire) {
-			$label = img_picto('', $this->picto).' <u>'.$langs->trans("Invoice").'</u>';
-			if ($this->type == self::TYPE_REPLACEMENT) $label = '<u>'.$langs->transnoentitiesnoconv("ReplacementInvoice").'</u>';
-			if ($this->type == self::TYPE_CREDIT_NOTE) $label = '<u>'.$langs->transnoentitiesnoconv("CreditNote").'</u>';
-			if ($this->type == self::TYPE_DEPOSIT)     $label = '<u>'.$langs->transnoentitiesnoconv("Deposit").'</u>';
-			if ($this->type == self::TYPE_SITUATION)   $label = '<u>'.$langs->transnoentitiesnoconv("InvoiceSituation").'</u>';
+			$label = img_picto('', $picto).' <u class="paddingrightonly">'.$langs->trans("Invoice").'</u>';
+			if ($this->type == self::TYPE_REPLACEMENT) $label = img_picto('', $picto).' <u class="paddingrightonly">'.$langs->transnoentitiesnoconv("ReplacementInvoice").'</u>';
+			if ($this->type == self::TYPE_CREDIT_NOTE) $label = img_picto('', $picto).' <u class="paddingrightonly">'.$langs->transnoentitiesnoconv("CreditNote").'</u>';
+			if ($this->type == self::TYPE_DEPOSIT)     $label = img_picto('', $picto).' <u class="paddingrightonly">'.$langs->transnoentitiesnoconv("Deposit").'</u>';
+			if ($this->type == self::TYPE_SITUATION)   $label = img_picto('', $picto).' <u class="paddingrightonly">'.$langs->transnoentitiesnoconv("InvoiceSituation").'</u>';
+			if (isset($this->statut) && isset($this->alreadypaid)) {
+				$label .= ' '.$this->getLibStatut(5, $this->alreadypaid);
+			}
 			if (!empty($this->ref))
 				$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 			if (!empty($this->ref_client))
@@ -1433,9 +1457,6 @@ class Facture extends CommonInvoice
 			if (!empty($this->total_ttc))
 				$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
 			if ($moretitle) $label .= ' - '.$moretitle;
-			if (isset($this->statut) && isset($this->alreadypaid)) {
-				$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5, $this->alreadypaid);
-			}
 		}
 
 		$linkclose = ($target ? ' target="'.$target.'"' : '');
@@ -1547,7 +1568,6 @@ class Facture extends CommonInvoice
 				$this->ref = $obj->ref;
 				$this->ref_client = $obj->ref_client;
 				$this->ref_ext				= $obj->ref_ext;
-				$this->ref_int				= $obj->ref_int;
 				$this->type					= $obj->type;
 				$this->date					= $this->db->jdate($obj->df);
 				$this->date_pointoftax		= $this->db->jdate($obj->date_pointoftax);
@@ -1588,10 +1608,12 @@ class Facture extends CommonInvoice
 				$this->note = $obj->note_private; // deprecated
 				$this->note_private = $obj->note_private;
 				$this->note_public			= $obj->note_public;
-				$this->user_author			= $obj->fk_user_author;
-				$this->user_valid = $obj->fk_user_valid;
+				$this->user_author			= $obj->fk_user_author;	// deprecated
+				$this->user_valid           = $obj->fk_user_valid;	// deprecated
+				$this->fk_user_author		= $obj->fk_user_author;
+				$this->fk_user_valid        = $obj->fk_user_valid;
 				$this->model_pdf = $obj->model_pdf;
-				$this->modelpdf = $obj->model_pdf;				// deprecated
+				$this->modelpdf = $obj->model_pdf; // deprecated
 				$this->last_main_doc = $obj->last_main_doc;
 				$this->situation_cycle_ref  = $obj->situation_cycle_ref;
 				$this->situation_counter    = $obj->situation_counter;
@@ -1625,7 +1647,7 @@ class Facture extends CommonInvoice
 
 				if ($this->statut == self::STATUS_DRAFT)	$this->brouillon = 1;
 
-				// Retreive all extrafield
+				// Retrieve all extrafield
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
 
@@ -1878,7 +1900,7 @@ class Facture extends CommonInvoice
 		$sql .= " date_lim_reglement=".(strval($this->date_lim_reglement) != '' ? "'".$this->db->idate($this->date_lim_reglement)."'" : 'null').",";
 		$sql .= " note_private=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
 		$sql .= " note_public=".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null").",";
-		$sql .= " model_pdf=".(isset($this->modelpdf) ? "'".$this->db->escape($this->modelpdf)."'" : "null").",";
+		$sql .= " model_pdf=".(isset($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : "null").",";
 		$sql .= " import_key=".(isset($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null").",";
 		$sql .= " situation_cycle_ref=".(empty($this->situation_cycle_ref) ? "null" : $this->db->escape($this->situation_cycle_ref)).",";
 		$sql .= " situation_counter=".(empty($this->situation_counter) ? "null" : $this->db->escape($this->situation_counter)).",";
@@ -2101,7 +2123,7 @@ class Facture extends CommonInvoice
 
 		$rowid = $this->id;
 
-		dol_syslog(get_class($this)."::delete rowid=".$rowid.", ref=".$this->ref.", thirdparty=".$this->thirdparty->name, LOG_DEBUG);
+		dol_syslog(get_class($this)."::delete rowid=".$rowid.", ref=".$this->ref.", thirdparty=".(empty($this->thirdparty) ? '' : $this->thirdparty->name), LOG_DEBUG);
 
 		// Test to avoid invoice deletion (allowed if draft)
 		$result = $this->is_erasable();
@@ -2164,6 +2186,7 @@ class Facture extends CommonInvoice
 				if (!$this->db->query($sql))
 				{
 					$this->error = $this->db->error()." sql=".$sql;
+					$this->errors[] = $this->error;
 					$this->db->rollback();
 					return -5;
 				}
@@ -2224,6 +2247,7 @@ class Facture extends CommonInvoice
 							{
 								$langs->load("errors");
 								$this->error = $langs->trans("ErrorFailToDeleteFile", $file);
+								$this->errors[] = $this->error;
 								$this->db->rollback();
 								return 0;
 							}
@@ -2234,6 +2258,7 @@ class Facture extends CommonInvoice
 							{
 								$langs->load("errors");
 								$this->error = $langs->trans("ErrorFailToDeleteDir", $dir);
+								$this->errors[] = $this->error;
 								$this->db->rollback();
 								return 0;
 							}
@@ -2244,11 +2269,13 @@ class Facture extends CommonInvoice
 					return 1;
 				} else {
 					$this->error = $this->db->lasterror()." sql=".$sql;
+					$this->errors[] = $this->error;
 					$this->db->rollback();
 					return -6;
 				}
 			} else {
 				$this->error = $this->db->lasterror()." sql=".$sql;
+				$this->errors[] = $this->error;
 				$this->db->rollback();
 				return -4;
 			}
@@ -2431,14 +2458,14 @@ class Facture extends CommonInvoice
 	 * @param   string	$force_number	Reference to force on invoice
 	 * @param	int		$idwarehouse	Id of warehouse to use for stock decrease if option to decreasenon stock is on (0=no decrease)
 	 * @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
-	 * @param	int		$batch_rule		0=do not decrement batch, else batch rule to use
-	 *                                 	1=take in batches ordered by sellby and eatby dates
+	 * @param	int		$batch_rule		0=do not decrement batch, else batch rule to use, 1=take in batches ordered by sellby and eatby dates
 	 * @return	int						<0 if KO, 0=Nothing done because invoice is not a draft, >0 if OK
 	 */
 	public function validate($user, $force_number = '', $idwarehouse = 0, $notrigger = 0, $batch_rule = 0)
 	{
 		global $conf, $langs;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
 		$productStatic = null;
 		$warehouseStatic = null;
 		if ($batch_rule > 0) {
@@ -2481,9 +2508,9 @@ class Facture extends CommonInvoice
 		$this->db->begin();
 
 		// Check parameters
-		if ($this->type == self::TYPE_REPLACEMENT)		// si facture de remplacement
+		if ($this->type == self::TYPE_REPLACEMENT)		// if this is a replacement invoice
 		{
-			// Controle que facture source connue
+			// Check that source invoice is known
 			if ($this->fk_facture_source <= 0)
 			{
 				$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("InvoiceReplacement"));
@@ -2491,7 +2518,7 @@ class Facture extends CommonInvoice
 				return -10;
 			}
 
-			// Charge la facture source a remplacer
+			// Load source invoice that has been replaced
 			$facreplaced = new Facture($this->db);
 			$result = $facreplaced->fetch($this->fk_facture_source);
 			if ($result <= 0)
@@ -2501,7 +2528,7 @@ class Facture extends CommonInvoice
 				return -11;
 			}
 
-			// Controle que facture source non deja remplacee par une autre
+			// Check that source invoice not already replaced by another one.
 			$idreplacement = $facreplaced->getIdReplacingInvoice('validated');
 			if ($idreplacement && $idreplacement != $this->id)
 			{
@@ -3109,8 +3136,8 @@ class Facture extends CommonInvoice
 			$this->line->tva_tx = $txtva;
 			$this->line->localtax1_tx = ($total_localtax1 ? $localtaxes_type[1] : 0);
 			$this->line->localtax2_tx = ($total_localtax2 ? $localtaxes_type[3] : 0);
-			$this->line->localtax1_type = $localtaxes_type[0];
-			$this->line->localtax2_type = $localtaxes_type[2];
+			$this->line->localtax1_type = isset($localtaxes_type[0]) ? $localtaxes_type[0] : '';
+			$this->line->localtax2_type = isset($localtaxes_type[2]) ? $localtaxes_type[2] : '';
 
 			$this->line->total_ht = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_ht) : $total_ht); // For credit note and if qty is negative, total is negative
 			$this->line->total_ttc = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_ttc) : $total_ttc); // For credit note and if qty is negative, total is negative
@@ -3270,6 +3297,7 @@ class Facture extends CommonInvoice
 			$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
 
 			// Clean vat code
+			$reg = array();
 			$vat_src_code = '';
 			if (preg_match('/\((.*)\)/', $txtva, $reg))
 			{
@@ -4100,7 +4128,7 @@ class Facture extends CommonInvoice
 	 */
 	public function initAsSpecimen($option = '')
 	{
-		global $conf, $langs;
+		global $conf, $langs, $user;
 
 		$now = dol_now();
 		$arraynow = dol_getdate($now);
@@ -4149,6 +4177,8 @@ class Facture extends CommonInvoice
 		$this->note_private = 'This is a comment (private)';
 		$this->note = 'This is a comment (private)';
 
+		$this->fk_user_author = $user->id;
+
 		$this->multicurrency_tx = 1;
 		$this->multicurrency_code = $conf->currency;
 
@@ -4308,27 +4338,28 @@ class Facture extends CommonInvoice
 	/**
 	 *  Create a document onto disk according to template module.
 	 *
-	 *	@param	string		$modele			Generator to use. Caller must set it to obj->modelpdf or GETPOST('modelpdf','alpha') for example.
-	 *	@param	Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *	@param	string		$modele			Generator to use. Caller must set it to obj->model_pdf or GETPOST('model','alpha') for example.
+	 *	@param	Translate	$outputlangs	Object lang to use for translation
 	 *  @param  int			$hidedetails    Hide details of lines
 	 *  @param  int			$hidedesc       Hide description
 	 *  @param  int			$hideref        Hide ref
-	 *  @param   null|array  $moreparams     Array to provide more information
+	 *  @param  null|array  $moreparams     Array to provide more information
 	 *	@return int        					<0 if KO, >0 if OK
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
 		global $conf, $langs;
 
-		$langs->load("bills");
-		$outputlangs->load("products");
+		$outputlangs->loadLangs(array("bills", "products"));
 
 		if (!dol_strlen($modele))
 		{
 			$modele = 'crabe';
 			$thisTypeConfName = 'FACTURE_ADDON_PDF_'.$this->type;
 
-			if ($this->modelpdf) {
+			if (!empty($this->model_pdf)) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($this->modelpdf)) {	// deprecated
 				$modele = $this->modelpdf;
 			} elseif (!empty($conf->global->$thisTypeConfName)) {
 				$modele = $conf->global->$thisTypeConfName;
@@ -4738,10 +4769,7 @@ class FactureLigne extends CommonInvoiceLine
 	public $fk_facture;
 	//! Id parent line
 	public $fk_parent_line;
-	/**
-	 * @deprecated
-	 */
-	public $label;
+
 	//! Description ligne
 	public $desc;
 	public $ref_ext; // External reference of the line
@@ -4771,21 +4799,6 @@ class FactureLigne extends CommonInvoiceLine
 	public $date_start;
 	public $date_end;
 
-	// From llx_product
-	/**
-	 * @deprecated
-	 * @see $product_ref
-	 */
-	public $ref; // Product ref (deprecated)
-	public $product_ref; // Product ref
-	/**
-	 * @deprecated
-	 * @see $product_label
-	 */
-	public $libelle; // Product label (deprecated)
-	public $product_label; // Product label
-	public $product_desc; // Description produit
-
 	public $skip_update_total; // Skip update price total for special lines
 
 	/**
@@ -4825,7 +4838,7 @@ class FactureLigne extends CommonInvoiceLine
 		$sql .= ' fd.multicurrency_total_ht,';
 		$sql .= ' fd.multicurrency_total_tva,';
 		$sql .= ' fd.multicurrency_total_ttc,';
-		$sql .= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc';
+		$sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facturedet as fd';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON fd.fk_product = p.rowid';
 		$sql .= ' WHERE fd.rowid = '.$rowid;
@@ -4871,11 +4884,12 @@ class FactureLigne extends CommonInvoiceLine
 			$this->marque_tx			= $marginInfos[2];
 
 			$this->ref = $objp->product_ref; // deprecated
+
 			$this->product_ref = $objp->product_ref;
-			$this->libelle				= $objp->product_libelle; // deprecated
-			$this->product_label		= $objp->product_libelle;
+			$this->product_label		= $objp->product_label;
 			$this->product_desc			= $objp->product_desc;
-			$this->fk_unit				= $objp->fk_unit;
+
+			$this->fk_unit = $objp->fk_unit;
 			$this->fk_user_modif		= $objp->fk_user_modif;
 			$this->fk_user_author = $objp->fk_user_author;
 
diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php
index 6b95c939e2a..e6c4a5a9c22 100644
--- a/htdocs/compta/facture/class/facturestats.class.php
+++ b/htdocs/compta/facture/class/facturestats.class.php
@@ -33,39 +33,39 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
  */
 class FactureStats extends Stats
 {
-    public $socid;
-    public $userid;
+	public $socid;
+	public $userid;
 
-    /**
+	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element;
 
-    public $from;
-    public $field;
-    public $where;
-    public $join;
+	public $from;
+	public $field;
+	public $where;
+	public $join;
 
 
 	/**
-     * 	Constructor
-     *
+	 * 	Constructor
+	 *
 	 * 	@param	DoliDB		$db			Database handler
 	 * 	@param 	int			$socid		Id third party for filter. This value must be forced during the new to external user company if user is an external user.
 	 * 	@param 	string		$mode	   	Option ('customer', 'supplier')
-     * 	@param	int			$userid    	Id user for filter (creation user)
-     * 	@param	int			$typentid   Id typent of thirdpary for filter
-     * 	@param	int			$categid    Id category of thirdpary for filter
+	 * 	@param	int			$userid    	Id user for filter (creation user)
+	 * 	@param	int			$typentid   Id typent of thirdpary for filter
+	 * 	@param	int			$categid    Id category of thirdpary for filter
 	 */
 	public function __construct($db, $socid, $mode, $userid = 0, $typentid = 0, $categid = 0)
 	{
 		global $user, $conf;
 
 		$this->db = $db;
-        $this->socid = ($socid > 0 ? $socid : 0);
-        $this->userid = $userid;
+		$this->socid = ($socid > 0 ? $socid : 0);
+		$this->userid = $userid;
 		$this->cachefilesuffix = $mode;
-        $this->join = '';
+		$this->join = '';
 
 		if ($mode == 'customer')
 		{
@@ -93,22 +93,22 @@ class FactureStats extends Stats
 		{
 			$this->where .= " AND f.fk_soc = ".$this->socid;
 		}
-        if ($this->userid > 0) $this->where .= ' AND f.fk_user_author = '.$this->userid;
+		if ($this->userid > 0) $this->where .= ' AND f.fk_user_author = '.$this->userid;
 		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $this->where .= " AND f.type IN (0,1,2,5)";
 		else $this->where .= " AND f.type IN (0,1,2,3,5)";
 
-        if ($typentid)
-        {
-            $this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = f.fk_soc';
-            $this->where .= ' AND s.fk_typent = '.$typentid;
-        }
+		if ($typentid)
+		{
+			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = f.fk_soc';
+			$this->where .= ' AND s.fk_typent = '.$typentid;
+		}
 
-        if ($categid)
-        {
-            $this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cs ON cs.fk_soc = f.fk_soc';
-            $this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as c ON c.rowid = cs.fk_categorie';
-            $this->where .= ' AND c.rowid = '.$categid;
-        }
+		if ($categid)
+		{
+			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cs ON cs.fk_soc = f.fk_soc';
+			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as c ON c.rowid = cs.fk_categorie';
+			$this->where .= ' AND c.rowid = '.$categid;
+		}
 	}
 
 
@@ -116,7 +116,7 @@ class FactureStats extends Stats
 	 * 	Return orders number by month for a year
 	 *
 	 *	@param	int		$year		Year to scan
-     *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 *	@return	array				Array of values
 	 */
 	public function getNbByMonth($year, $format = 0)
@@ -126,11 +126,11 @@ class FactureStats extends Stats
 		$sql = "SELECT date_format(f.datef,'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE f.datef BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		$res = $this->_getNbByMonth($year, $sql, $format);
 		//var_dump($res);print '<br>';
@@ -150,10 +150,10 @@ class FactureStats extends Stats
 		$sql = "SELECT date_format(f.datef,'%Y') as dm, COUNT(*), SUM(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getNbByYear($sql);
 	}
@@ -163,7 +163,7 @@ class FactureStats extends Stats
 	 * 	Return the invoices amount by month for a year
 	 *
 	 *	@param	int		$year		Year to scan
-     *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 *	@return	array				Array with amount by month
 	 */
 	public function getAmountByMonth($year, $format = 0)
@@ -173,11 +173,11 @@ class FactureStats extends Stats
 		$sql = "SELECT date_format(datef,'%m') as dm, SUM(f.".$this->field.")";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE f.datef BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
-        $sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
 
 		$res = $this->_getAmountByMonth($year, $sql, $format);
 		//var_dump($res);print '<br>';
@@ -197,11 +197,11 @@ class FactureStats extends Stats
 		$sql = "SELECT date_format(datef,'%m') as dm, AVG(f.".$this->field.")";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
-        $sql .= " WHERE f.datef BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
+		$sql .= $this->join;
+		$sql .= " WHERE f.datef BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
-        $sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getAverageByMonth($year, $sql);
 	}
@@ -218,10 +218,10 @@ class FactureStats extends Stats
 		$sql = "SELECT date_format(datef,'%Y') as year, COUNT(*) as nb, SUM(f.".$this->field.") as total, AVG(f.".$this->field.") as avg";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY year";
-        $sql .= $this->db->order('year', 'DESC');
+		$sql .= $this->db->order('year', 'DESC');
 
 		return $this->_getAllByYear($sql);
 	}
@@ -230,7 +230,7 @@ class FactureStats extends Stats
 	 *	Return nb, amount of predefined product for year
 	 *
 	 *	@param	int		$year		Year to scan
-     *  @param  int     $limit      Limit
+	 *  @param  int     $limit      Limit
 	 *	@return	array				Array of values
 	 */
 	public function getAllByProduct($year, $limit = 10)
@@ -240,14 +240,14 @@ class FactureStats extends Stats
 		$sql = "SELECT product.ref, COUNT(product.ref) as nb, SUM(tl.".$this->field_line.") as total, AVG(tl.".$this->field_line.") as avg";
 		$sql .= " FROM ".$this->from.", ".$this->from_line.", ".MAIN_DB_PREFIX."product as product";
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " AND f.rowid = tl.fk_facture AND tl.fk_product = product.rowid";
-    	$sql .= " AND f.datef BETWEEN '".$this->db->idate(dol_get_first_day($year, 1, false))."' AND '".$this->db->idate(dol_get_last_day($year, 12, false))."'";
+		$sql .= " AND f.datef BETWEEN '".$this->db->idate(dol_get_first_day($year, 1, false))."' AND '".$this->db->idate(dol_get_last_day($year, 12, false))."'";
 		$sql .= " GROUP BY product.ref";
-        $sql .= $this->db->order('nb', 'DESC');
-        //$sql.= $this->db->plimit(20);
+		$sql .= $this->db->order('nb', 'DESC');
+		//$sql.= $this->db->plimit(20);
 
-        return $this->_getAllByProduct($sql, $limit);
+		return $this->_getAllByProduct($sql, $limit);
 	}
 }
diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php
index 9888bd23d13..97297582081 100644
--- a/htdocs/compta/facture/class/paymentterm.class.php
+++ b/htdocs/compta/facture/class/paymentterm.class.php
@@ -28,9 +28,9 @@
 class PaymentTerm // extends CommonObject
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -46,7 +46,7 @@ class PaymentTerm // extends CommonObject
 	//public  $table_element='c_payment_term';	//!< Name of table without prefix where object is stored
 	public $context = array();
 
-    /**
+	/**
 	 * @var int ID
 	 */
 	public $id;
@@ -63,27 +63,27 @@ class PaymentTerm // extends CommonObject
 
 
 
-    /**
-     * 	Constructor
-     *
+	/**
+	 * 	Constructor
+	 *
 	 * 	@param	DoliDB		$db			Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *      Create in database
-     *
-     *      @param      User	$user        	User that create
-     *      @param      int		$notrigger	    0=launch triggers after, 1=disable triggers
-     *      @return     int       			  	<0 if KO, Id of created object if OK
-     */
-    public function create($user, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *      Create in database
+	 *
+	 *      @param      User	$user        	User that create
+	 *      @param      int		$notrigger	    0=launch triggers after, 1=disable triggers
+	 *      @return     int       			  	<0 if KO, Id of created object if OK
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -101,7 +101,7 @@ class PaymentTerm // extends CommonObject
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Insert request
+		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_payment_term(";
 		$sql .= "entity,";
 		$sql .= "code,";
@@ -112,7 +112,7 @@ class PaymentTerm // extends CommonObject
 		$sql .= "type_cdr,";
 		$sql .= "nbjour,";
 		$sql .= "decalage";
-        $sql .= ") VALUES (";
+		$sql .= ") VALUES (";
 		$sql .= " ".(!isset($this->entity) ?getEntity('c_payment_term') : "'".$this->db->escape($this->entity)."'").",";
 		$sql .= " ".(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").",";
 		$sql .= " ".(!isset($this->sortorder) ? 'NULL' : "'".$this->db->escape($this->sortorder)."'").",";
@@ -127,41 +127,41 @@ class PaymentTerm // extends CommonObject
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
 		if (!$error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_payment_term");
-        }
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_payment_term");
+		}
 
-        // Commit or rollback
-        if ($error)
+		// Commit or rollback
+		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
 		} else {
 			$this->db->commit();
-            return $this->id;
+			return $this->id;
 		}
-    }
+	}
 
 
-    /**
-     *    Load object in memory from database
-     *
-     *    @param      int		$id     Id object
-     *    @return     int         		<0 if KO, >0 if OK
-     */
-    public function fetch($id)
-    {
-    	global $langs;
-        $sql = "SELECT";
+	/**
+	 *    Load object in memory from database
+	 *
+	 *    @param      int		$id     Id object
+	 *    @return     int         		<0 if KO, >0 if OK
+	 */
+	public function fetch($id)
+	{
+		global $langs;
+		$sql = "SELECT";
 		$sql .= " t.rowid,";
 		$sql .= " t.entity,";
 
@@ -175,18 +175,18 @@ class PaymentTerm // extends CommonObject
 		$sql .= " t.decalage";
 
 
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
-        $sql .= " WHERE t.rowid = ".$id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
+		$sql .= " WHERE t.rowid = ".$id;
 
-    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->rowid;
+				$this->id = $obj->rowid;
 
 				$this->code = $obj->code;
 				$this->sortorder = $obj->sortorder;
@@ -196,22 +196,22 @@ class PaymentTerm // extends CommonObject
 				$this->type_cdr = $obj->type_cdr;
 				$this->nbjour = $obj->nbjour;
 				$this->decalage = $obj->decalage;
-            }
-            $this->db->free($resql);
+			}
+			$this->db->free($resql);
 
-            return 1;
-        } else {
-      	    $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+	  		$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    /**
-     *    Return id of default payment term
-     *
-     *    @return     int         <0 if KO, >0 if OK
-     */
+	/**
+	 *    Return id of default payment term
+	 *
+	 *    @return     int         <0 if KO, >0 if OK
+	 */
 	public function getDefaultId()
 	{
 		global $langs;
@@ -243,12 +243,12 @@ class PaymentTerm // extends CommonObject
 
 
 	/**
-     *  Update database
-     *
-     *  @param      User	$user        	User that modify
-     *  @param      int		$notrigger	    0=launch triggers after, 1=disable triggers
-     *  @return     int       			  	<0 if KO, >0 if OK
-     */
+	 *  Update database
+	 *
+	 *  @param      User	$user        	User that modify
+	 *  @param      int		$notrigger	    0=launch triggers after, 1=disable triggers
+	 *  @return     int       			  	<0 if KO, >0 if OK
+	 */
 	public function update($user = null, $notrigger = 0)
 	{
 		global $conf, $langs;
@@ -325,15 +325,15 @@ class PaymentTerm // extends CommonObject
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -393,15 +393,15 @@ class PaymentTerm // extends CommonObject
 	}
 
 
-    /**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
-     */
-    public function initAsSpecimen()
-    {
+	/**
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
+	 */
+	public function initAsSpecimen()
+	{
 		$this->id = 0;
 
 		$this->code = '';
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index 459543dfc74..6b8758bc472 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -59,11 +59,12 @@ if ($action == 'addcontact' && $user->rights->facture->creer)
 {
 	$result = $object->fetch($id);
 
-    if ($result > 0 && $id > 0)
-    {
-    	$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
-  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
-    }
+	if ($result > 0 && $id > 0)
+	{
+		$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
+	}
 
 	if ($result >= 0)
 	{
@@ -83,7 +84,7 @@ elseif ($action == 'swapstatut' && $user->rights->facture->creer)
 {
 	if ($object->fetch($id))
 	{
-	    $result = $object->swapContactStatus(GETPOST('ligne'));
+		$result = $object->swapContactStatus(GETPOST('ligne'));
 	} else {
 		dol_print_error($db);
 	}
@@ -133,7 +134,7 @@ if ($id > 0 || !empty($ref))
 
 		$totalpaye = $object->getSommePaiement();
 
-		dol_fiche_head($head, 'contact', $langs->trans('InvoiceCustomer'), -1, 'bill');
+		print dol_get_fiche_head($head, 'contact', $langs->trans('InvoiceCustomer'), -1, 'bill');
 
 		// Invoice content
 
@@ -148,36 +149,36 @@ if ($id > 0 || !empty($ref))
 		// Project
 		if (!empty($conf->projet->enabled))
 		{
-		    $langs->load("projects");
-		    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		    if ($user->rights->facture->creer)
-		    {
-		        if ($action != 'classify') {
-		        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			$langs->load("projects");
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+			if ($user->rights->facture->creer)
+			{
+				if ($action != 'classify') {
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
-                }
-	        	if ($action == 'classify') {
-	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-	                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-	                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref .= '</form>';
-	            } else {
-	                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-		    } else {
-		        if (!empty($object->fk_project)) {
-		            $proj = new Project($db);
-		            $proj->fetch($object->fk_project);
-		            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-		            $morehtmlref .= $proj->ref;
-		            $morehtmlref .= '</a>';
-		        } else {
-		            $morehtmlref .= '';
-		        }
-		    }
+				}
+				if ($action == 'classify') {
+					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				if (!empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
+				} else {
+					$morehtmlref .= '';
+				}
+			}
 		}
 		$morehtmlref .= '</div>';
 
@@ -185,7 +186,7 @@ if ($id > 0 || !empty($ref))
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<br>';
 
@@ -193,8 +194,8 @@ if ($id > 0 || !empty($ref))
 		$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
 		foreach ($dirtpls as $reldir)
 		{
-		    $res = @include dol_buildpath($reldir.'/contacts.tpl.php');
-		    if ($res) break;
+			$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
+			if ($res) break;
 		}
 	} else {
 		// Record not found
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 722286044cc..3922228c4fa 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -101,9 +101,9 @@ if ($id > 0 || !empty($ref))
 		$upload_dir = $conf->facture->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
 
 		$head = facture_prepare_head($object);
-		dol_fiche_head($head, 'documents', $langs->trans('InvoiceCustomer'), -1, 'bill');
+		print dol_get_fiche_head($head, 'documents', $langs->trans('InvoiceCustomer'), -1, 'bill');
 
-    	$totalpaye = $object->getSommePaiement();
+		$totalpaye = $object->getSommePaiement();
 
 		// Build file list
 		$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
@@ -114,54 +114,54 @@ if ($id > 0 || !empty($ref))
 		}
 
 
-	    // Invoice content
+		// Invoice content
 
-	    $linkback = '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-	    $morehtmlref = '<div class="refidno">';
-	    // Ref customer
-	    $morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-	    $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
-	    // Thirdparty
-	    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
-	    // Project
-	    if (!empty($conf->projet->enabled))
-	    {
-	    	$langs->load("projects");
-	    	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    	if ($user->rights->facture->creer)
-	    	{
-	    		if ($action != 'classify')
-	    			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-	    			$morehtmlref .= ' : ';
-	    		if ($action == 'classify') {
-	    			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	    			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	    			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
-	    			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-	    			$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	    			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	    			$morehtmlref .= '</form>';
-	    		} else {
-	    			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	    		}
-	    	} else {
-	    		if (!empty($object->fk_project)) {
-	    			$proj = new Project($db);
-	    			$proj->fetch($object->fk_project);
-	    			$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	    			$morehtmlref .= $proj->ref;
-	    			$morehtmlref .= '</a>';
-	    		} else {
-	    			$morehtmlref .= '';
-	    		}
-	    	}
-	    }
-	    $morehtmlref .= '</div>';
+		$morehtmlref = '<div class="refidno">';
+		// Ref customer
+		$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+		// Thirdparty
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
+		// Project
+		if (!empty($conf->projet->enabled))
+		{
+			$langs->load("projects");
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+			if ($user->rights->facture->creer)
+			{
+				if ($action != 'classify')
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+					$morehtmlref .= ' : ';
+				if ($action == 'classify') {
+					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				if (!empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
+				} else {
+					$morehtmlref .= '';
+				}
+			}
+		}
+		$morehtmlref .= '</div>';
 
-	    $object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+		$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
-	    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
 
 		print '<div class="fichecenter">';
 		print '<div class="underbanner clearboth"></div>';
@@ -174,7 +174,7 @@ if ($id > 0 || !empty($ref))
 
 		print "</div>\n";
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		$modulepart = 'facture';
 		$permission = $user->rights->facture->creer;
diff --git a/htdocs/compta/facture/index.php b/htdocs/compta/facture/index.php
index 5c0aacfdb35..e96371ad4f4 100644
--- a/htdocs/compta/facture/index.php
+++ b/htdocs/compta/facture/index.php
@@ -41,9 +41,9 @@ if (isset($user->socid) && $user->socid > 0)
 }
 
 // Maximum elements of the tables
-$maxDraftCount		= empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
-$maxLatestEditCount	= 5;
-$maxOpenCount		= empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
+$maxDraftCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
+$maxLatestEditCount = 5;
+$maxOpenCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
 
 /*
 * View
@@ -51,7 +51,7 @@ $maxOpenCount		= empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->glob
 
 llxHeader("", $langs->trans("CustomersInvoicesArea"), "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes");
 
-print load_fiche_titre($langs->trans("CustomersInvoicesArea"), '', 'invoicing');
+print load_fiche_titre($langs->trans("CustomersInvoicesArea"), '', 'bill');
 
 print '<div class="fichecenter">';
 
@@ -192,10 +192,10 @@ function getPieChart($socid = 0)
 	{
 		$dolgraph = new DolGraph();
 		$dolgraph->SetData($dataseries);
-		$dolgraph->setShowLegend(1);
+		$dolgraph->setShowLegend(2);
 		$dolgraph->setShowPercent(1);
 		$dolgraph->SetType(['pie']);
-		$dolgraph->setWidth('100%');
+		$dolgraph->setHeight('200');
 		$dolgraph->draw('idgraphthirdparties');
 
 		$result .= '<tr>';
@@ -263,21 +263,21 @@ function getDraftTable($maxCount = 500, $socid = 0)
 		return $result;
 	}
 
-	$objectstatic	= new Facture($db);
-	$companystatic	= new Societe($db);
-	$nbofloop		= min($num, $maxCount);
-	$total			= 0;
-	$i				= 0;
+	$objectstatic = new Facture($db);
+	$companystatic = new Societe($db);
+	$nbofloop = min($num, $maxCount);
+	$total = 0;
+	$i = 0;
 
 	while ($i < $nbofloop)
 	{
 		$obj = $db->fetch_object($resql);
 
-		$objectstatic->id	= $obj->rowid;
-		$objectstatic->ref	= $obj->ref;
+		$objectstatic->id = $obj->rowid;
+		$objectstatic->ref = $obj->ref;
 
-		$companystatic->id		= $obj->socid;
-		$companystatic->name	= $obj->socname;
+		$companystatic->id = $obj->socid;
+		$companystatic->name = $obj->socname;
 		$companystatic->client	= $obj->client;
 		$companystatic->canvas	= $obj->canvas;
 
@@ -344,9 +344,9 @@ function getLatestEditTable($maxCount = 5, $socid = 0)
 	$result = '<div class="div-table-responsive-no-min">';
 	$result .= '<table class="noborder centpercent">';
 
-	$result .=  '<tr class="liste_titre">';
-	$result .=  '<td colspan="4">'.$langs->trans("LastCustomersBills", $maxCount).'</td>';
-	$result .=  '</tr>';
+	$result .= '<tr class="liste_titre">';
+	$result .= '<td colspan="4">'.$langs->trans("LastCustomersBills", $maxCount).'</td>';
+	$result .= '</tr>';
 
 	if ($num < 1)
 	{
@@ -355,47 +355,47 @@ function getLatestEditTable($maxCount = 5, $socid = 0)
 		return $result;
 	}
 
-	$formfile		= new FormFile($db);
-	$objectstatic	= new Facture($db);
-	$companystatic	= new Societe($db);
-	$i				= 0;
+	$formfile = new FormFile($db);
+	$objectstatic = new Facture($db);
+	$companystatic = new Societe($db);
+	$i = 0;
 
 	while ($i < $num)
 	{
 		$obj = $db->fetch_object($resql);
 
-		$objectstatic->id		= $obj->rowid;
-		$objectstatic->ref		= $obj->ref;
-		$objectstatic->paye		= $obj->paye;
-		$objectstatic->statut	= $obj->status;
+		$objectstatic->id = $obj->rowid;
+		$objectstatic->ref = $obj->ref;
+		$objectstatic->paye = $obj->paye;
+		$objectstatic->statut = $obj->status;
 
-		$companystatic->id		= $obj->socid;
-		$companystatic->name	= $obj->socname;
+		$companystatic->id = $obj->socid;
+		$companystatic->name = $obj->socname;
 		$companystatic->client	= $obj->client;
 		$companystatic->canvas	= $obj->canvas;
 
 		$filename = dol_sanitizeFileName($obj->ref);
 		$filedir = $conf->propal->multidir_output[$obj->entity].'/'.$filename;
 
-		$result .=  '<tr width="20%" class="nowrap">';
+		$result .= '<tr width="20%" class="nowrap">';
 
-		$result .=  '<td class="oddeven">';
-		$result .=  '<table class="nobordernopadding">';
-		$result .=  '<tr class="nocellnopadd">';
+		$result .= '<td class="oddeven">';
+		$result .= '<table class="nobordernopadding">';
+		$result .= '<tr class="nocellnopadd">';
 
-		$result .=  '<td width="96" class="nobordernopadding nowrap">'.$objectstatic->getNomUrl(1).'</td>';
-		$result .=  '<td width="16" class="nobordernopadding nowrap">&nbsp;</td>';
-		$result .=  '<td width="16" class="nobordernopadding right">'.$formfile->getDocumentsLink($objectstatic->element, $filename, $filedir).'</td>';
+		$result .= '<td width="96" class="nobordernopadding nowrap">'.$objectstatic->getNomUrl(1).'</td>';
+		$result .= '<td width="16" class="nobordernopadding nowrap">&nbsp;</td>';
+		$result .= '<td width="16" class="nobordernopadding right">'.$formfile->getDocumentsLink($objectstatic->element, $filename, $filedir).'</td>';
 
-		$result .=  '</tr>';
-		$result .=  '</table>';
-		$result .=  '</td>';
+		$result .= '</tr>';
+		$result .= '</table>';
+		$result .= '</td>';
 
-		$result .=  '<td>'.$companystatic->getNomUrl(1, 'customer').'</td>';
-		$result .=  '<td>'.dol_print_date($db->jdate($obj->datec), 'day').'</td>';
-		$result .=  '<td class="right">'.$objectstatic->getLibStatut(5).'</td>';
+		$result .= '<td>'.$companystatic->getNomUrl(1, 'customer').'</td>';
+		$result .= '<td>'.dol_print_date($db->jdate($obj->datec), 'day').'</td>';
+		$result .= '<td class="right">'.$objectstatic->getLibStatut(5).'</td>';
 
-		$result .=  '</tr>';
+		$result .= '</tr>';
 
 		$i++;
 	}
@@ -457,23 +457,23 @@ function getOpenTable($maxCount = 500, $socid = 0)
 		return $result;
 	}
 
-	$objectstatic	= new Facture($db);
-	$companystatic	= new Societe($db);
+	$objectstatic = new Facture($db);
+	$companystatic = new Societe($db);
 	$formfile		= new FormFile($db);
 	$nbofloop		= min($num, $maxCount);
-	$now			= dol_now();
-	$total			= 0;
-	$i				= 0;
+	$now = dol_now();
+	$total = 0;
+	$i = 0;
 
 	while ($i < $nbofloop)
 	{
 		$obj = $db->fetch_object($resql);
 
-		$objectstatic->id= $obj->id;
-		$objectstatic->ref	= $obj->ref;
+		$objectstatic->id = $obj->id;
+		$objectstatic->ref = $obj->ref;
 
-		$companystatic->id		= $obj->socid;
-		$companystatic->name	= $obj->socname;
+		$companystatic->id = $obj->socid;
+		$companystatic->name = $obj->socname;
 		$companystatic->client	= $obj->client;
 		$companystatic->canvas	= $obj->canvas;
 
diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php
index bad63cf1f61..f26f4ea0255 100644
--- a/htdocs/compta/facture/info.php
+++ b/htdocs/compta/facture/info.php
@@ -56,7 +56,7 @@ $object->fetch_thirdparty();
 $object->info($object->id);
 
 $head = facture_prepare_head($object);
-dol_fiche_head($head, 'info', $langs->trans("InvoiceCustomer"), -1, 'bill');
+print dol_get_fiche_head($head, 'info', $langs->trans("InvoiceCustomer"), -1, 'bill');
 
 $totalpaye = $object->getSommePaiement();
 
@@ -120,7 +120,7 @@ print '</td></tr></table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 400fb3be7ed..c0abc5a6028 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -154,9 +154,9 @@ if ($socid > 0) {
 
 
 if ($socid > 0) {
-        $tmpthirdparty = new Societe($db);
-        $res = $tmpthirdparty->fetch($socid);
-        if ($res > 0) $search_societe = $tmpthirdparty->name;
+		$tmpthirdparty = new Societe($db);
+		$res = $tmpthirdparty->fetch($socid);
+		if ($res > 0) $search_societe = $tmpthirdparty->name;
 }
 
 /*
@@ -357,7 +357,7 @@ if ($resql)
 	if (!empty($arrayfields['f.titre']['checked']))
 	{
 		print '<td class="liste_titre left">';
-		print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+		print '<input class="flat maxwidth100" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
 		print '</td>';
 	}
 	// Thirpdarty
@@ -478,7 +478,7 @@ if ($resql)
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpicto = $form->showFilterAndCheckAddButtons(0, 'checkforselect', 1);
+	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
 	print "</tr>\n";
@@ -502,7 +502,7 @@ if ($resql)
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 	if (!empty($arrayfields['status']['checked']))          print_liste_field_titre($arrayfields['status']['label'], $_SERVER['PHP_SELF'], "f.suspended,f.frequency", "", $param, 'align="center"', $sortfield, $sortorder);
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'nomaxwidthsearch ');
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'center maxwidthsearch ');
 	print "</tr>\n";
 
 	if ($num > 0)
@@ -529,68 +529,68 @@ if ($resql)
 
 			if (!empty($arrayfields['f.titre']['checked']))
 			{
-			    print '<td>';
-			    print $invoicerectmp->getNomUrl(1);
-			    print "</a>";
-			    print "</td>\n";
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="nowrap tdoverflowmax200">';
+				print $invoicerectmp->getNomUrl(1);
+				print "</a>";
+				print "</td>\n";
+				if (!$i) $totalarray['nbfield']++;
 			}
 			if (!empty($arrayfields['s.nom']['checked']))
 			{
-			    print '<td class="tdoverflowmax200">'.$companystatic->getNomUrl(1, 'customer').'</td>';
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="tdoverflowmax200">'.$companystatic->getNomUrl(1, 'customer').'</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 			if (!empty($arrayfields['f.total']['checked']))
 			{
-			    print '<td class="nowrap right">'.price($objp->total).'</td>'."\n";
-			    if (!$i) $totalarray['nbfield']++;
-			    if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total';
-			    $totalarray['val']['f.total'] += $objp->total;
+				print '<td class="nowrap right">'.price($objp->total).'</td>'."\n";
+				if (!$i) $totalarray['nbfield']++;
+				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total';
+				$totalarray['val']['f.total'] += $objp->total;
 			}
 			if (!empty($arrayfields['f.tva']['checked']))
 			{
-			    print '<td class="nowrap right">'.price($objp->total_vat).'</td>'."\n";
-			    if (!$i) $totalarray['nbfield']++;
-			    if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.tva';
-			    $totalarray['val']['f.tva'] += $objp->total_vat;
+				print '<td class="nowrap right">'.price($objp->total_vat).'</td>'."\n";
+				if (!$i) $totalarray['nbfield']++;
+				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.tva';
+				$totalarray['val']['f.tva'] += $objp->total_vat;
 			}
 			if (!empty($arrayfields['f.total_ttc']['checked']))
 			{
-			    print '<td class="nowrap right">'.price($objp->total_ttc).'</td>'."\n";
-			    if (!$i) $totalarray['nbfield']++;
-			    if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_ttc';
-			    $totalarray['val']['f.total_ttc'] += $objp->total_ttc;
+				print '<td class="nowrap right">'.price($objp->total_ttc).'</td>'."\n";
+				if (!$i) $totalarray['nbfield']++;
+				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_ttc';
+				$totalarray['val']['f.total_ttc'] += $objp->total_ttc;
 			}
 			// Payment term
 			if (!empty($arrayfields['f.fk_cond_reglement']['checked']))
 			{
-			    print '<td class="right">';
-			    $form->form_conditions_reglement('', $objp->fk_cond_reglement, 'none');
-			    print '</td>'."\n";
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="right">';
+				$form->form_conditions_reglement('', $objp->fk_cond_reglement, 'none');
+				print '</td>'."\n";
+				if (!$i) $totalarray['nbfield']++;
 			}
 			// Payment mode
 			if (!empty($arrayfields['f.fk_mode_reglement']['checked']))
 			{
-			    print '<td class="right">';
-			    $form->form_modes_reglement('', $objp->fk_mode_reglement, 'none');
-			    print '</td>'."\n";
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="right">';
+				$form->form_modes_reglement('', $objp->fk_mode_reglement, 'none');
+				print '</td>'."\n";
+				if (!$i) $totalarray['nbfield']++;
 			}
 			if (!empty($arrayfields['recurring']['checked']))
 			{
-			    print '<td class="center">'.yn($objp->frequency ? 1 : 0).'</td>';
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="center">'.yn($objp->frequency ? 1 : 0).'</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 			if (!empty($arrayfields['f.frequency']['checked']))
 			{
-			    print '<td class="center">'.($objp->frequency > 0 ? $objp->frequency : '').'</td>';
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="center">'.($objp->frequency > 0 ? $objp->frequency : '').'</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 			if (!empty($arrayfields['f.unit_frequency']['checked']))
 			{
-			    print '<td class="center">'.($objp->frequency > 0 ? $objp->unit_frequency : '').'</td>';
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="center">'.($objp->frequency > 0 ? $objp->unit_frequency : '').'</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 			if (!empty($arrayfields['f.nb_gen_done']['checked']))
 			{
@@ -602,10 +602,10 @@ if ($resql)
 			// Date last generation
 			if (!empty($arrayfields['f.date_last_gen']['checked']))
 			{
-			    print '<td class="center">';
-			    print ($objp->frequency > 0 ? dol_print_date($db->jdate($objp->date_last_gen), 'day') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
-			    print '</td>';
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="center">';
+				print ($objp->frequency > 0 ? dol_print_date($db->jdate($objp->date_last_gen), 'day') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 			// Date next generation
 			if (!empty($arrayfields['f.date_when']['checked']))
@@ -625,17 +625,17 @@ if ($resql)
 			}
 			if (!empty($arrayfields['f.datec']['checked']))
 			{
-			    print '<td class="center">';
-			    print dol_print_date($db->jdate($objp->datec), 'dayhour');
-			    print '</td>';
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="center">';
+				print dol_print_date($db->jdate($objp->datec), 'dayhour');
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 			if (!empty($arrayfields['f.tms']['checked']))
 			{
-			    print '<td class="center">';
-			    print dol_print_date($db->jdate($objp->tms), 'dayhour');
-			    print '</td>';
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="center">';
+				print dol_print_date($db->jdate($objp->tms), 'dayhour');
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 
 			$obj = $objp;
@@ -647,10 +647,10 @@ if ($resql)
 			print $hookmanager->resPrint;
 			// Status
 			if (!empty($arrayfields['status']['checked'])) {
-			    print '<td class="center">';
-			    print $invoicerectmp->getLibStatut(3, 0);
-			    print '</td>';
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="center">';
+				print $invoicerectmp->getLibStatut(3, 0);
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 			// Action column
 			print '<td class="center">';
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 607afbc943f..c61bfdf6819 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -39,6 +39,9 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+if (!empty($conf->margin->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php';
+}
 require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -70,7 +73,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'inv
 
 if ($contextpage == 'poslist')
 {
-    $_GET['optioncss'] = 'print';
+	$_GET['optioncss'] = 'print';
 }
 
 $lineid = GETPOST('lineid', 'int');
@@ -125,7 +128,7 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1 || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters
 $offset = $limit * $page;
 if (!$sortorder && !empty($conf->global->INVOICE_DEFAULT_UNPAYED_SORT_ORDER) && $search_status == '1') $sortorder = $conf->global->INVOICE_DEFAULT_UNPAYED_SORT_ORDER;
 if (!$sortorder) $sortorder = 'DESC';
@@ -203,6 +206,10 @@ $arrayfields = array(
 	'f.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>200),
 	'multicurrency_dynamount_payed'=>array('label'=>'MulticurrencyAlreadyPaid', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>210),
 	'multicurrency_rtp'=>array('label'=>'MulticurrencyRemainderToPay', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>220), // Not enabled by default because slow
+	'total_pa' => array('label' => ($conf->global->MARGIN_TYPE == '1' ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous ? 0 : 1)),
+	'total_margin' => array('label' => 'Margin', 'checked' => 0, 'position' => 301, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous ? 0 : 1)),
+	'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous || empty($conf->global->DISPLAY_MARGIN_RATES) ? 0 : 1)),
+	'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous || empty($conf->global->DISPLAY_MARK_RATES) ? 0 : 1)),
 	'f.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
 	'f.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
 	'f.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'position'=>510, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PUBLIC_NOTES))),
@@ -216,14 +223,8 @@ if ($conf->global->INVOICE_USE_SITUATION && $conf->global->INVOICE_USE_RETAINED_
 }
 
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
@@ -299,19 +300,17 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
-if ($massaction == 'makepayment'){
-	$arrayofselected=is_array($toselect)?$toselect:array();
+if ($massaction == 'makepayment') {
+	$arrayofselected = is_array($toselect) ? $toselect : array();
 
 	$loc = dol_buildpath('/compta/paiement.php', 2).'?action=create&facids='.implode(',', $arrayofselected);
 
 	header('Location: '.$loc);
 	exit;
-} elseif ($massaction == 'withdrawrequest')
-{
+} elseif ($massaction == 'withdrawrequest') {
 	$langs->load("withdrawals");
 
-	if (!$user->rights->prelevement->bons->creer)
-	{
+	if (!$user->rights->prelevement->bons->creer) {
 		$error++;
 		setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
 	} else {
@@ -324,8 +323,7 @@ if ($massaction == 'makepayment'){
 		{
 			$objecttmp = new Facture($db);
 			$result = $objecttmp->fetch($toselectid);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$totalpaye = $objecttmp->getSommePaiement();
 				$totalcreditnotes = $objecttmp->getSumCreditNotesUsed();
 				$totaldeposits = $objecttmp->getSumDepositsUsed();
@@ -405,6 +403,10 @@ if ($massaction == 'makepayment'){
 $form = new Form($db);
 $formother = new FormOther($db);
 $formfile = new FormFile($db);
+$formmargin = null;
+if (!empty($conf->margin->enabled)) {
+	$formmargin = new FormMargin($db);
+}
 $bankaccountstatic = new Account($db);
 $facturestatic = new Facture($db);
 $formcompany = new FormCompany($db);
@@ -662,17 +664,17 @@ if ($resql)
 		'presend'=>$langs->trans("SendByMail"),
 		//'makepayment'=>$langs->trans("InvoicePaymentsLimits"),   TODO Blank page when using this
 	);
-	if ($conf->prelevement->enabled) {
-        	$langs->load("withdrawals");
-        	$arrayofmassactions['withdrawrequest'] = $langs->trans("MakeWithdrawRequest");
+	if ($conf->prelevement->enabled && !empty($user->rights->prelevement->bons->creer)) {
+			$langs->load("withdrawals");
+			$arrayofmassactions['withdrawrequest'] = $langs->trans("MakeWithdrawRequest");
 	}
 	if ($user->rights->facture->supprimer) {
 		if (!empty($conf->global->INVOICE_CAN_REMOVE_DRAFT_ONLY)) {
-        	$arrayofmassactions['predeletedraft'] = $langs->trans("Deletedraft");
+			$arrayofmassactions['predeletedraft'] = $langs->trans("Deletedraft");
 		} elseif (!empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED)) {	// mass deletion never possible on invoices on such situation
-            $arrayofmassactions['predelete'] = $langs->trans("Delete");
-        }
-    }
+			$arrayofmassactions['predelete'] = $langs->trans("Delete");
+		}
+	}
 	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
@@ -729,7 +731,7 @@ if ($resql)
 	 	$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -738,7 +740,7 @@ if ($resql)
 		$moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter .= '</div>';
 	}
-	if (!empty($conf->categorie->enabled))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -852,7 +854,7 @@ if ($resql)
 	// Project label
 	if (!empty($arrayfields['p.title']['checked']))
 	{
-	    print '<td class="liste_titre"><input class="flat maxwidth50imp" type="text" name="search_project" value="'.$search_project.'"></td>';
+		print '<td class="liste_titre"><input class="flat maxwidth50imp" type="text" name="search_project" value="'.$search_project.'"></td>';
 	}
 	// Thirdparty
 	if (!empty($arrayfields['s.nom']['checked']))
@@ -956,8 +958,8 @@ if ($resql)
 	}
 	if (!empty($arrayfields['f.retained_warranty']['checked']))
 	{
-	    print '<td class="liste_titre" align="right">';
-	    print '</td>';
+		print '<td class="liste_titre" align="right">';
+		print '</td>';
 	}
 	if (!empty($arrayfields['dynamount_payed']['checked']))
 	{
@@ -1019,6 +1021,26 @@ if ($resql)
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
+	if (!empty($arrayfields['total_pa']['checked']))
+	{
+		print '<td class="liste_titre right">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['total_margin']['checked']))
+	{
+		print '<td class="liste_titre right">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['total_margin_rate']['checked']))
+	{
+		print '<td class="liste_titre right">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['total_mark_rate']['checked']))
+	{
+		print '<td class="liste_titre right">';
+		print '</td>';
+	}
 
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -1056,7 +1078,7 @@ if ($resql)
 	{
 		print '<td class="liste_titre maxwidthonsmartphone right">';
 		$liststatus = array('0'=>$langs->trans("BillShortStatusDraft"), '1'=>$langs->trans("BillShortStatusNotPaid"), '2'=>$langs->trans("BillShortStatusPaid"), '1,2'=>$langs->trans("BillShortStatusNotPaid").'+'.$langs->trans("BillShortStatusPaid"), '3'=>$langs->trans("BillShortStatusCanceled"));
-		print $form->selectarray('search_status', $liststatus, $search_status, 1);
+		print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', '', 1);
 		print '</td>';
 	}
 	// Action column
@@ -1102,6 +1124,10 @@ if ($resql)
 	if (!empty($arrayfields['f.multicurrency_total_ttc']['checked']))     print_liste_field_titre($arrayfields['f.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
 	if (!empty($arrayfields['multicurrency_dynamount_payed']['checked'])) print_liste_field_titre($arrayfields['multicurrency_dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
 	if (!empty($arrayfields['multicurrency_rtp']['checked']))             print_liste_field_titre($arrayfields['multicurrency_rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	if (!empty($arrayfields['total_pa']['checked']))					  print_liste_field_titre($arrayfields['total_pa']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	if (!empty($arrayfields['total_margin']['checked']))                  print_liste_field_titre($arrayfields['total_margin']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	if (!empty($arrayfields['total_margin_rate']['checked']))             print_liste_field_titre($arrayfields['total_margin_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	if (!empty($arrayfields['total_mark_rate']['checked']))               print_liste_field_titre($arrayfields['total_mark_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 	// Hook fields
@@ -1135,9 +1161,9 @@ if ($resql)
 			$facturestatic->ref = $obj->ref;
 			$facturestatic->ref_client = $obj->ref_client;
 			$facturestatic->type = $obj->type;
-            $facturestatic->total_ht = $obj->total_ht;
-            $facturestatic->total_tva = $obj->total_vat;
-            $facturestatic->total_ttc = $obj->total_ttc;
+			$facturestatic->total_ht = $obj->total_ht;
+			$facturestatic->total_tva = $obj->total_vat;
+			$facturestatic->total_ttc = $obj->total_ttc;
 			$facturestatic->multicurrency_code = $obj->multicurrency_code;
 			$facturestatic->multicurrency_tx = $obj->multicurrency_tx;
 			$facturestatic->multicurrency_total_ht = $obj->multicurrency_total_ht;
@@ -1146,23 +1172,23 @@ if ($resql)
 			$facturestatic->statut = $obj->fk_statut;
 			$facturestatic->close_code = $obj->close_code;
 			$facturestatic->total_ttc = $obj->total_ttc;
-            $facturestatic->paye = $obj->paye;
-            $facturestatic->fk_soc = $obj->fk_soc;
+			$facturestatic->paye = $obj->paye;
+			$facturestatic->fk_soc = $obj->fk_soc;
 
-            $facturestatic->date = $db->jdate($obj->df);
-            $facturestatic->date_valid = $db->jdate($obj->date_valid);
-            $facturestatic->date_lim_reglement = $db->jdate($obj->datelimite);
+			$facturestatic->date = $db->jdate($obj->df);
+			$facturestatic->date_valid = $db->jdate($obj->date_valid);
+			$facturestatic->date_lim_reglement = $db->jdate($obj->datelimite);
 
-            $facturestatic->note_public = $obj->note_public;
+			$facturestatic->note_public = $obj->note_public;
 			$facturestatic->note_private = $obj->note_private;
 			if ($conf->global->INVOICE_USE_SITUATION && $conf->global->INVOICE_USE_RETAINED_WARRANTY)
 			{
-			     $facturestatic->retained_warranty = $obj->retained_warranty;
-			     $facturestatic->retained_warranty_date_limit = $obj->retained_warranty_date_limit;
-			     $facturestatic->situation_final = $obj->retained_warranty_date_limit;
-			     $facturestatic->situation_final = $obj->retained_warranty_date_limit;
-			     $facturestatic->situation_cycle_ref = $obj->situation_cycle_ref;
-			     $facturestatic->situation_counter = $obj->situation_counter;
+				 $facturestatic->retained_warranty = $obj->retained_warranty;
+				 $facturestatic->retained_warranty_date_limit = $obj->retained_warranty_date_limit;
+				 $facturestatic->situation_final = $obj->retained_warranty_date_limit;
+				 $facturestatic->situation_final = $obj->retained_warranty_date_limit;
+				 $facturestatic->situation_cycle_ref = $obj->situation_cycle_ref;
+				 $facturestatic->situation_counter = $obj->situation_counter;
 			}
 			$thirdpartystatic->id = $obj->socid;
 			$thirdpartystatic->name = $obj->name;
@@ -1205,19 +1231,25 @@ if ($resql)
 
 			$facturestatic->alreadypaid = $paiement;
 
-            print '<tr class="oddeven"';
-            if ($contextpage == 'poslist')
-            {
-                print ' onclick="parent.$(\'#poslines\').load(\'invoice.php?action=history&placeid='.$obj->id.'\', function() {parent.$.colorbox.close();});"';
-            }
-            print '>';
+			$marginInfo = array();
+			if (!empty($conf->margin->enabled)) {
+				$facturestatic->fetch_lines();
+				$marginInfo = $formmargin->getMarginInfosArray($facturestatic);
+			}
 
-            // No
-            if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
-            	print '<td>'.(($offset * $limit) + $i).'</td>';
-            }
+			print '<tr class="oddeven"';
+			if ($contextpage == 'poslist')
+			{
+				print ' onclick="parent.$(\'#poslines\').load(\'invoice.php?action=history&placeid='.$obj->id.'\', function() {parent.$.colorbox.close();});"';
+			}
+			print '>';
 
-            // Ref
+			// No
+			if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+				print '<td>'.(($offset * $limit) + $i).'</td>';
+			}
+
+			// Ref
 			if (!empty($arrayfields['f.ref']['checked']))
 			{
 				print '<td class="nowraponall">';
@@ -1225,12 +1257,12 @@ if ($resql)
 				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
 
 				print '<td class="nobordernopadding nowraponall">';
-                if ($contextpage == 'poslist')
-                {
-                    print $obj->ref;
-                } else {
-                    print $facturestatic->getNomUrl(1, '', 200, 0, '', 0, 1);
-                }
+				if ($contextpage == 'poslist')
+				{
+					print $obj->ref;
+				} else {
+					print $facturestatic->getNomUrl(1, '', 200, 0, '', 0, 1);
+				}
 
 				$filename = dol_sanitizeFileName($obj->ref);
 				$filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($obj->ref);
@@ -1286,7 +1318,7 @@ if ($resql)
 				print '<td align="center" class="nowraponall">'.dol_print_date($datelimit, 'day');
 				if ($facturestatic->hasDelay())
 				{
-				    print img_warning($langs->trans('Alert').' - '.$langs->trans('Late'));
+					print img_warning($langs->trans('Alert').' - '.$langs->trans('Late'));
 				}
 				print '</td>';
 				if (!$i) $totalarray['nbfield']++;
@@ -1307,24 +1339,24 @@ if ($resql)
 			// Project title
 			if (!empty($arrayfields['p.title']['checked']))
 			{
-			    print '<td class="nowraponall">';
-			    if ($obj->project_id > 0)
-			    {
-			        print $projectstatic->title;
-			    }
-			    print '</td>';
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="nowraponall">';
+				if ($obj->project_id > 0)
+				{
+					print $projectstatic->title;
+				}
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 
 			// Third party
 			if (!empty($arrayfields['s.nom']['checked']))
 			{
 				print '<td class="tdoverflowmax200">';
-		        if ($contextpage == 'poslist')
+				if ($contextpage == 'poslist')
 				{
-				    print $thirdpartystatic->name;
+					print $thirdpartystatic->name;
 				} else {
-				    print $thirdpartystatic->getNomUrl(1, 'customer');
+					print $thirdpartystatic->getNomUrl(1, 'customer');
 				}
 				print '</td>';
 				if (!$i) $totalarray['nbfield']++;
@@ -1470,7 +1502,7 @@ if ($resql)
 
 			if (!empty($arrayfields['f.retained_warranty']['checked']))
 			{
-			    print '<td align="right">'.(!empty($obj->retained_warranty) ?price($obj->retained_warranty).'%' : '&nbsp;').'</td>';
+				print '<td align="right">'.(!empty($obj->retained_warranty) ?price($obj->retained_warranty).'%' : '&nbsp;').'</td>';
 			}
 
 			if (!empty($arrayfields['dynamount_payed']['checked']))
@@ -1541,6 +1573,31 @@ if ($resql)
 				if (!$i) $totalarray['nbfield']++;
 			}
 
+			// Total buying or cost price
+			if (!empty($arrayfields['total_pa']['checked']))
+			{
+				print '<td class="right nowrap">'.price($marginInfo['pa_total']).'</td>';
+				if (!$i) $totalarray['nbfield']++;
+			}
+			// Total margin
+			if (!empty($arrayfields['total_margin']['checked']))
+			{
+				print '<td class="right nowrap">'.price($marginInfo['total_margin']).'</td>';
+				if (!$i) $totalarray['nbfield']++;
+			}
+			// Total margin rate
+			if (!empty($arrayfields['total_margin_rate']['checked']))
+			{
+				print '<td class="right nowrap">'.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%').'</td>';
+				if (!$i) $totalarray['nbfield']++;
+			}
+			// total mark rate
+			if (!empty($arrayfields['total_mark_rate']['checked']))
+			{
+				print '<td class="right nowrap">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').'</td>';
+				if (!$i) $totalarray['nbfield']++;
+			}
+
 			// Extra fields
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 			// Fields from hook
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index 249d2dd9b8c..aa3bd40c591 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -77,69 +77,69 @@ if ($id > 0 || !empty($ref))
 
 	$object->fetch_thirdparty();
 
-    $head = facture_prepare_head($object);
+	$head = facture_prepare_head($object);
 
-    $totalpaye = $object->getSommePaiement();
+	$totalpaye = $object->getSommePaiement();
 
-    dol_fiche_head($head, 'note', $langs->trans("InvoiceCustomer"), -1, 'bill');
+	print dol_get_fiche_head($head, 'note', $langs->trans("InvoiceCustomer"), -1, 'bill');
 
-    // Invoice content
+	// Invoice content
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-    $morehtmlref = '<div class="refidno">';
-    // Ref customer
-    $morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-    $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
-    // Thirdparty
-    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
-    // Project
-    if (!empty($conf->projet->enabled))
-    {
-    	$langs->load("projects");
-    	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-    	if ($user->rights->facture->creer)
-    	{
-    		if ($action != 'classify')
-    			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-    			$morehtmlref .= ' : ';
-    		if ($action == 'classify') {
-    			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-    			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-    			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
-    			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-    			$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-    			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-    			$morehtmlref .= '</form>';
-    		} else {
-    			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-    		}
-    	} else {
-    		if (!empty($object->fk_project)) {
-    			$proj = new Project($db);
-    			$proj->fetch($object->fk_project);
-    			$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-    			$morehtmlref .= $proj->ref;
-    			$morehtmlref .= '</a>';
-    		} else {
-    			$morehtmlref .= '';
-    		}
-    	}
-    }
-    $morehtmlref .= '</div>';
+	$morehtmlref = '<div class="refidno">';
+	// Ref customer
+	$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	// Thirdparty
+	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
+	// Project
+	if (!empty($conf->projet->enabled))
+	{
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->facture->creer)
+		{
+			if ($action != 'classify')
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				$morehtmlref .= ' : ';
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
+	$morehtmlref .= '</div>';
 
-    $object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+	$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
 
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
 
 	$cssclass = "titlefield";
-    include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index f69517c1037..7e852846d5c 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -88,45 +88,45 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    if ($action == "new")
-    {
-        if ($object->id > 0)
-        {
-            $db->begin();
+	if ($action == "new")
+	{
+		if ($object->id > 0)
+		{
+			$db->begin();
 
-            $newtype = $type;
-            $sourcetype = 'facture';
-            if ($type == 'bank-transfer') {
-            	$sourcetype = 'supplier_invoice';
-            	$newtype = 'bank-transfer';
-            }
+			$newtype = $type;
+			$sourcetype = 'facture';
+			if ($type == 'bank-transfer') {
+				$sourcetype = 'supplier_invoice';
+				$newtype = 'bank-transfer';
+			}
 
-            $result = $object->demande_prelevement($user, price2num(GETPOST('withdraw_request_amount', 'alpha')), $newtype, $sourcetype);
-            if ($result > 0)
-            {
-                $db->commit();
+			$result = $object->demande_prelevement($user, price2num(GETPOST('withdraw_request_amount', 'alpha')), $newtype, $sourcetype);
+			if ($result > 0)
+			{
+				$db->commit();
 
-                setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-            } else {
-                $db->rollback();
-                setEventMessages($object->error, $object->errors, 'errors');
-            }
-        }
-        $action = '';
-    }
+				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+			} else {
+				$db->rollback();
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
+		$action = '';
+	}
 
-    if ($action == "delete")
-    {
-    	if ($object->id > 0)
-        {
-            $result = $object->demande_prelevement_delete($user, GETPOST('did', 'int'));
-            if ($result == 0)
-            {
-                header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id.'&type='.$type);
-                exit;
-            }
-        }
-    }
+	if ($action == "delete")
+	{
+		if ($object->id > 0)
+		{
+			$result = $object->demande_prelevement_delete($user, GETPOST('did', 'int'));
+			if ($result == 0)
+			{
+				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id.'&type='.$type);
+				exit;
+			}
+		}
+	}
 }
 
 
@@ -213,7 +213,7 @@ if ($object->id > 0)
 		$head = facture_prepare_head($object);
 	}
 
-	dol_fiche_head($head, 'standingorders', $title, -1, 'bill');
+	print dol_get_fiche_head($head, 'standingorders', $title, -1, 'bill');
 
 	// Invoice content
 	if ($type == 'bank-transfer') {
@@ -241,37 +241,37 @@ if ($object->id > 0)
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    if ($user->rights->facture->creer)
-	    {
-	        if ($action != 'classify') {
-	        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->facture->creer)
+		{
+			if ($action != 'classify') {
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
 			}
-        	if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= '<input type="hidden" name="type" value="'.$type.'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	            $morehtmlref .= $proj->ref;
-	            $morehtmlref .= '</a>';
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= '<input type="hidden" name="type" value="'.$type.'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
@@ -462,14 +462,14 @@ if ($object->id > 0)
 	print $langs->trans('BankAccount');
 	print '<td>';
 	if (($action != 'editbankaccount') && $user->rights->commande->creer && !empty($object->brouillon))
-	    print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td colspan="3">';
 	if ($action == 'editbankaccount')
 	{
-	    $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
+		$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
 	} else {
-	    $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
+		$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
 	}
 	print "</td>";
 	print '</tr>';
@@ -503,20 +503,20 @@ if ($object->id > 0)
 
 	if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
 	{
-	    // Multicurrency Amount HT
-	    print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).'</td>';
-	    print '<td class="nowrap">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
-	    print '</tr>';
+		// Multicurrency Amount HT
+		print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).'</td>';
+		print '<td class="nowrap">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+		print '</tr>';
 
-	    // Multicurrency Amount VAT
-	    print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0).'</td>';
-	    print '<td class="nowrap">'.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
-	    print '</tr>';
+		// Multicurrency Amount VAT
+		print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0).'</td>';
+		print '<td class="nowrap">'.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+		print '</tr>';
 
-	    // Multicurrency Amount TTC
-	    print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0).'</td>';
-	    print '<td class="nowrap">'.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
-	    print '</tr>';
+		// Multicurrency Amount TTC
+		print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0).'</td>';
+		print '<td class="nowrap">'.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+		print '</tr>';
 	}
 
 	// Amount
@@ -530,39 +530,39 @@ if ($object->id > 0)
 	// Amount Local Taxes
 	if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) 	// Localtax1
 	{
-	    print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
-	    print '<td class="nowrap">'.price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
+		print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
+		print '<td class="nowrap">'.price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 	}
 	if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) 	// Localtax2
 	{
-	    print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
-	    print '<td class=nowrap">'.price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
+		print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
+		print '<td class=nowrap">'.price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 	}
 
 	// Revenue stamp
 	if ($selleruserevenustamp) 	// Test company use revenue stamp
 	{
-	    print '<tr><td>';
-	    print '<table class="nobordernopadding" width="100%"><tr><td>';
-	    print $langs->trans('RevenueStamp');
-	    print '</td>';
-	    if ($action != 'editrevenuestamp' && !empty($object->brouillon) && $user->rights->facture->creer)
-	    {
-	        print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editrevenuestamp&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetRevenuStamp'), 1).'</a></td>';
-	    }
-        print '</tr></table>';
-        print '</td><td>';
-       	print price($object->revenuestamp, 1, '', 1, - 1, - 1, $conf->currency);
-        print '</td></tr>';
+		print '<tr><td>';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('RevenueStamp');
+		print '</td>';
+		if ($action != 'editrevenuestamp' && !empty($object->brouillon) && $user->rights->facture->creer)
+		{
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editrevenuestamp&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetRevenuStamp'), 1).'</a></td>';
+		}
+		print '</tr></table>';
+		print '</td><td>';
+	   	print price($object->revenuestamp, 1, '', 1, - 1, - 1, $conf->currency);
+		print '</td></tr>';
 	}
 
 	// Total with tax
 	print '<tr><td>'.$langs->trans('AmountTTC').'</td><td class="nowrap">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 
-    $resteapayer = price2num($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+	$resteapayer = price2num($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
 
-    // TODO Replace this by an include with same code to show already done payment visible in invoice card
-    print '<tr><td>'.$langs->trans('RemainderToPay').'</td><td class="nowrap">'.price($resteapayer, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
+	// TODO Replace this by an include with same code to show already done payment visible in invoice card
+	print '<tr><td>'.$langs->trans('RemainderToPay').'</td><td class="nowrap">'.price($resteapayer, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 
 	print '</table>';
 
@@ -573,7 +573,7 @@ if ($object->id > 0)
 	print '<div class="clearboth"></div>';
 
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	$numopen = 0; $pending = 0; $numclosed = 0;
@@ -632,34 +632,36 @@ if ($object->id > 0)
 	print "\n<div class=\"tabsAction\">\n";
 
 	$buttonlabel = $langs->trans("MakeWithdrawRequest");
+	$user_perms = $user->rights->prelevement->bons->creer;
 	if ($type == 'bank-transfer') {
 		$buttonlabel = $langs->trans("MakeBankTransferOrder");
+		$user_perms = $user->rights->paymentbybanktransfer->create;
 	}
 
 	// Add a transfer request
 	if ($object->statut > $object::STATUS_DRAFT && $object->paye == 0 && $num == 0)
 	{
-	    if ($resteapayer > 0)
-	    {
-    		if ($user->rights->prelevement->bons->creer)
-    		{
-    			$remaintopaylesspendingdebit = $resteapayer - $pending;
+		if ($resteapayer > 0)
+		{
+			if ($user_perms)
+			{
+				$remaintopaylesspendingdebit = $resteapayer - $pending;
 
-    			print '<form method="POST" action="">';
-    			print '<input type="hidden" name="token" value="'.newToken().'" />';
-    			print '<input type="hidden" name="id" value="'.$object->id.'" />';
-    			print '<input type="hidden" name="type" value="'.$type.'" />';
-    			print '<input type="hidden" name="action" value="new" />';
-    			print '<label for="withdraw_request_amount">'.$langs->trans('BankTransferAmount').' </label>';
-    			print '<input type="text" id="withdraw_request_amount" name="withdraw_request_amount" value="'.$remaintopaylesspendingdebit.'" size="9" />';
-    			print '<input type="submit" class="butAction" value="'.$buttonlabel.'" />';
-    			print '</form>';
-    		} else {
-    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$buttonlabel.'</a>';
-    		}
-	    } else {
-        	print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("AmountMustBePositive")).'">'.$buttonlabel.'</a>';
-        }
+				print '<form method="POST" action="">';
+				print '<input type="hidden" name="token" value="'.newToken().'" />';
+				print '<input type="hidden" name="id" value="'.$object->id.'" />';
+				print '<input type="hidden" name="type" value="'.$type.'" />';
+				print '<input type="hidden" name="action" value="new" />';
+				print '<label for="withdraw_request_amount">'.$langs->trans('BankTransferAmount').' </label>';
+				print '<input type="text" id="withdraw_request_amount" name="withdraw_request_amount" value="'.$remaintopaylesspendingdebit.'" size="9" />';
+				print '<input type="submit" class="butAction" value="'.$buttonlabel.'" />';
+				print '</form>';
+			} else {
+				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$buttonlabel.'</a>';
+			}
+		} else {
+			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("AmountMustBePositive")).'">'.$buttonlabel.'</a>';
+		}
 	} else {
 		if ($num == 0)
 		{
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 81466651856..13378979932 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -44,7 +44,7 @@ $mode = GETPOST("mode") ?GETPOST("mode") : 'customer';
 if ($mode == 'customer' && !$user->rights->facture->lire) accessforbidden();
 if ($mode == 'supplier' && !$user->rights->fournisseur->facture->lire) accessforbidden();
 
-$object_status = GETPOST('object_status');
+$object_status = GETPOST('object_status', 'intcomma');
 $typent_id = GETPOST('typent_id', 'int');
 $categ_id = GETPOST('categ_id', 'categ_id');
 
@@ -54,14 +54,14 @@ $custcats = GETPOST('custcats', 'array');
 // Security check
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $nowyear = strftime("%Y", dol_now());
-$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
-if (!empty($conf->global->INVOICE_STATS_GRAPHS_SHOW_2_YEARS)) $startyear=$year-2;
-else $startyear=$year-1;
+$year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
+if (!empty($conf->global->INVOICE_STATS_GRAPHS_SHOW_2_YEARS)) $startyear = $year - 2;
+else $startyear = $year - 1;
 $endyear = $year;
 
 
@@ -95,10 +95,10 @@ $stats = new FactureStats($db, $socid, $mode, ($userid > 0 ? $userid : 0), ($typ
 if ($mode == 'customer')
 {
 	if ($object_status != '' && $object_status >= 0) $stats->where .= ' AND f.fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
-    if (is_array($custcats) && !empty($custcats)) {
-        $stats->from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cat ON (f.fk_soc = cat.fk_soc)';
-        $stats->where .= ' AND cat.fk_categorie IN ('.implode(',', $custcats).')';
-    }
+	if (is_array($custcats) && !empty($custcats)) {
+		$stats->from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cat ON (f.fk_soc = cat.fk_soc)';
+		$stats->where .= ' AND cat.fk_categorie IN ('.implode(',', $custcats).')';
+	}
 }
 if ($mode == 'supplier')
 {
@@ -177,38 +177,38 @@ $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	$filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
 } else {
-    $filename_avg = $dir.'/ordersaverage-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
+	$filename_avg = $dir.'/ordersaverage-'.$year.'.png';
+	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
+	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
 }
 
 $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
 if (!$mesg)
 {
-    $px3->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px3->SetLegend($legend);
-    $px3->SetYLabel($langs->trans("AmountAverage"));
-    $px3->SetMaxValue($px3->GetCeilMaxValue());
-    $px3->SetMinValue($px3->GetFloorMinValue());
-    $px3->SetWidth($WIDTH);
-    $px3->SetHeight($HEIGHT);
-    $px3->SetShading(3);
-    $px3->SetHorizTickIncrement(1);
-    $px3->mode = 'depth';
-    $px3->SetTitle($langs->trans("AmountAverage"));
+	$px3->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px3->SetLegend($legend);
+	$px3->SetYLabel($langs->trans("AmountAverage"));
+	$px3->SetMaxValue($px3->GetCeilMaxValue());
+	$px3->SetMinValue($px3->GetFloorMinValue());
+	$px3->SetWidth($WIDTH);
+	$px3->SetHeight($HEIGHT);
+	$px3->SetShading(3);
+	$px3->SetHorizTickIncrement(1);
+	$px3->mode = 'depth';
+	$px3->SetTitle($langs->trans("AmountAverage"));
 
-    $px3->draw($filename_avg, $fileurl_avg);
+	$px3->draw($filename_avg, $fileurl_avg);
 }
 
 
@@ -216,7 +216,7 @@ if (!$mesg)
 $data = $stats->getAllByYear();
 $arrayyears = array();
 foreach ($data as $val) {
-    $arrayyears[$val['year']] = $val['year'];
+	$arrayyears[$val['year']] = $val['year'];
 }
 if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;
 
@@ -233,7 +233,7 @@ if ($mode == 'supplier') $type = 'supplier_invoice_stats';
 
 complete_head_from_modules($conf, $langs, null, $head, $h, $type);
 
-dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
+print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 
 // We use select_thirdparty_list instead of select_company so we can use $filter and share same code for customer and supplier.
 $tmp_companies = $form->select_thirdparty_list($socid, 'socid', $filter, 1, 0, 0, array(), '', 1);
@@ -269,16 +269,16 @@ if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisL
 print '</td></tr>';
 
 // Category
-if (! empty($conf->category->enabled)) {
+if (!empty($conf->category->enabled)) {
 	if ($mode == 'customer')
 	{
-	    $cat_type = Categorie::TYPE_CUSTOMER;
-	    $cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Customer"));
+		$cat_type = Categorie::TYPE_CUSTOMER;
+		$cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Customer"));
 	}
 	if ($mode == 'supplier')
 	{
-	    $cat_type = Categorie::TYPE_SUPPLIER;
-	    $cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Supplier"));
+		$cat_type = Categorie::TYPE_SUPPLIER;
+		$cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Supplier"));
 	}
 	print '<tr><td>'.$cat_label.'</td><td>';
 	$cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, 'parent', null, null, 1);
@@ -295,13 +295,13 @@ print '</td></tr>';
 print '<tr><td class="left">'.$langs->trans("Status").'</td><td class="left">';
 if ($mode == 'customer')
 {
-    $liststatus = array('0'=>$langs->trans("BillStatusDraft"), '1'=>$langs->trans("BillStatusNotPaid"), '2'=>$langs->trans("BillStatusPaid"), '1,2'=>$langs->trans("BillStatusNotPaid").' / '.$langs->trans("BillStatusPaid"), '3'=>$langs->trans("BillStatusCanceled"));
-    print $form->selectarray('object_status', $liststatus, $object_status, 1);
+	$liststatus = array('0'=>$langs->trans("BillStatusDraft"), '1'=>$langs->trans("BillStatusNotPaid"), '2'=>$langs->trans("BillStatusPaid"), '1,2'=>$langs->trans("BillStatusNotPaid").' / '.$langs->trans("BillStatusPaid"), '3'=>$langs->trans("BillStatusCanceled"));
+	print $form->selectarray('object_status', $liststatus, $object_status, 1);
 }
 if ($mode == 'supplier')
 {
-    $liststatus = array('0'=>$langs->trans("BillStatusDraft"), '1'=>$langs->trans("BillStatusNotPaid"), '2'=>$langs->trans("BillStatusPaid"));
-    print $form->selectarray('object_status', $liststatus, $object_status, 1);
+	$liststatus = array('0'=>$langs->trans("BillStatusDraft"), '1'=>$langs->trans("BillStatusNotPaid"), '2'=>$langs->trans("BillStatusPaid"));
+	print $form->selectarray('object_status', $liststatus, $object_status, 1);
 }
 print '</td></tr>';
 // Year
@@ -371,8 +371,8 @@ if ($mesg) { print $mesg; } else {
 	print $px1->show();
 	print "<br>\n";
 	print $px2->show();
-    print "<br>\n";
-    print $px3->show();
+	print "<br>\n";
+	print $px3->show();
 }
 print '</td></tr></table>';
 
@@ -381,7 +381,7 @@ print '</div></div></div>';
 print '<div style="clear:both"></div>';
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index ef35c03eb54..92745a276e1 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -40,10 +40,10 @@ $total = 0;
 $ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink)
 {
-    $ilink++;
+	$ilink++;
 
-    $trclass = 'oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
 	print '<tr class="'.$trclass.'" data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'" >';
 	print '<td class="linkedcol-element">';
 	switch ($objectlink->type) {
@@ -67,37 +67,37 @@ foreach ($linkedObjectBlock as $key => $objectlink)
 			break;
 	}
 	print '</td>';
-    print '<td class="linkedcol-name nowraponall">'.$objectlink->getNomUrl(1).'</td>';
-    print '<td class="linkedcol-ref left">'.$objectlink->ref_client.'</td>';
-    print '<td class="linkedcol-date center">'.dol_print_date($objectlink->date, 'day').'</td>';
-    print '<td class="linkedcol-amount right">';
-    if ($user->rights->facture->lire) {
-    	$sign = 1;
-    	if ($object->type == Facture::TYPE_CREDIT_NOTE) $sign = -1;
-    	if ($objectlink->statut != 3) {
+	print '<td class="linkedcol-name nowraponall">'.$objectlink->getNomUrl(1).'</td>';
+	print '<td class="linkedcol-ref left">'.$objectlink->ref_client.'</td>';
+	print '<td class="linkedcol-date center">'.dol_print_date($objectlink->date, 'day').'</td>';
+	print '<td class="linkedcol-amount right">';
+	if ($user->rights->facture->lire) {
+		$sign = 1;
+		if ($object->type == Facture::TYPE_CREDIT_NOTE) $sign = -1;
+		if ($objectlink->statut != 3) {
 			// If not abandonned
-    		$total = $total + $sign * $objectlink->total_ht;
-    		echo price($objectlink->total_ht);
-    	} else {
-    		echo '<strike>'.price($objectlink->total_ht).'</strike>';
-    	}
+			$total = $total + $sign * $objectlink->total_ht;
+			echo price($objectlink->total_ht);
+		} else {
+			echo '<strike>'.price($objectlink->total_ht).'</strike>';
+		}
 	}
-    print '</td>';
-    print '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
-    print '<td class="linkedcol-action right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
-    print "</tr>\n";
+	print '</td>';
+	print '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
+	print '<td class="linkedcol-action right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
+	print "</tr>\n";
 }
 if (count($linkedObjectBlock) > 1)
 {
-    print '<tr class="liste_total '.(empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : '').'">';
-    print '<td>'.$langs->trans("Total").'</td>';
-    print '<td></td>';
-    print '<td class="center"></td>';
-    print '<td class="center"></td>';
-    print '<td class="right">'.price($total).'</td>';
-    print '<td class="right"></td>';
-    print '<td class="right"></td>';
-    print '</tr>';
+	print '<tr class="liste_total '.(empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : '').'">';
+	print '<td>'.$langs->trans("Total").'</td>';
+	print '<td></td>';
+	print '<td class="center"></td>';
+	print '<td class="center"></td>';
+	print '<td class="right">'.price($total).'</td>';
+	print '<td class="right"></td>';
+	print '<td class="right"></td>';
+	print '</tr>';
 }
 
 print "<!-- END PHP TEMPLATE -->\n";
diff --git a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
index 4e5a63e3a8a..1c8473637f3 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
@@ -40,10 +40,10 @@ $total = 0;
 $ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink)
 {
-    $ilink++;
+	$ilink++;
 
-    $trclass = 'oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
 	?>
 <tr class="<?php echo $trclass; ?>" >
     <td class="linkedcol-element"><?php echo $langs->trans("RepeatableInvoice"); ?></td>
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 8c144f6bd71..5614659eac0 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2016      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
  * Copyright (C) 2020      Tobias Sekan         <tobias.sekan@startmail.com>
+ * Copyright (C) 2020      Josep Lluís Amador   <joseplluis@lliuretic.cat>
  *
  * 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
@@ -76,9 +77,6 @@ $hookmanager->initHooks(array('invoiceindex'));
 
 $now = dol_now();
 
-$facturestatic = new Facture($db);
-$facturesupplierstatic = new FactureFournisseur($db);
-
 $form = new Form($db);
 $formfile = new FormFile($db);
 $thirdpartystatic = new Societe($db);
@@ -93,43 +91,43 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-    // Search customer invoices
-    if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
-    {
-    	$listofsearchfields['search_invoice'] = array('text'=>'CustomerInvoice');
-    }
-    // Search supplier invoices
-    if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->lire)
-    {
-    	$listofsearchfields['search_supplier_invoice'] = array('text'=>'SupplierInvoice');
-    }
-    if (!empty($conf->don->enabled) && $user->rights->don->lire)
-    {
-    	$langs->load("donations");
-    	$listofsearchfields['search_donation'] = array('text'=>'Donation');
-    }
+	// Search customer invoices
+	if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
+	{
+		$listofsearchfields['search_invoice'] = array('text'=>'CustomerInvoice');
+	}
+	// Search supplier invoices
+	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->lire)
+	{
+		$listofsearchfields['search_supplier_invoice'] = array('text'=>'SupplierInvoice');
+	}
+	if (!empty($conf->don->enabled) && $user->rights->don->lire)
+	{
+		$langs->load("donations");
+		$listofsearchfields['search_donation'] = array('text'=>'Donation');
+	}
 
-    if (count($listofsearchfields))
-    {
-    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-    	print '<input type="hidden" name="token" value="'.newToken().'">';
+	if (count($listofsearchfields))
+	{
+		print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<div class="div-table-responsive-no-min">';
-    	print '<table class="noborder nohover centpercent">';
-    	$i = 0;
-    	foreach ($listofsearchfields as $key => $value)
-    	{
-    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    		print '<tr '.$bc[false].'>';
-    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'"></td>';
-    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-    		print '</tr>';
-    		$i++;
-    	}
-    	print '</table>';
-        print '</div>';
-    	print '</form>';
-    	print '<br>';
-    }
+		print '<table class="noborder nohover centpercent">';
+		$i = 0;
+		foreach ($listofsearchfields as $key => $value)
+		{
+			if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+			print '<tr '.$bc[false].'>';
+			print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'"></td>';
+			if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+			print '</tr>';
+			$i++;
+		}
+		print '</table>';
+		print '</div>';
+		print '</form>';
+		print '<br>';
+	}
 }
 
 
@@ -138,13 +136,16 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useles
  */
 if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 {
-    $sql = "SELECT f.rowid, f.ref, f.datef as date, f.total as total_ht, f.tva as total_tva, f.total_ttc, f.ref_client";
-    $sql .= ", f.type";
-    $sql .= ", s.nom as name";
-    $sql .= ", s.rowid as socid, s.email";
-    $sql .= ", s.code_client, s.code_compta, s.code_fournisseur, s.code_compta_fournisseur";
+	$tmpinvoice = new Facture($db);
+
+	$sql = "SELECT f.rowid, f.ref, f.datef as date, f.total as total_ht, f.tva as total_tva, f.total_ttc, f.ref_client";
+	$sql .= ", f.type, f.fk_statut as status, f.paye";
+	$sql .= ", s.nom as name";
+	$sql .= ", s.rowid as socid, s.email";
+	$sql .= ", s.code_client, s.code_compta, s.code_fournisseur, s.code_compta_fournisseur";
+	$sql .= ", cc.rowid as country_id, cc.code as country_code";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
-	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
+	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql .= " WHERE s.rowid = f.fk_soc AND f.fk_statut = ".Facture::STATUS_DRAFT;
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
@@ -159,8 +160,9 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	$reshook = $hookmanager->executeHooks('printFieldListWhereCustomerDraft', $parameters);
 	$sql .= $hookmanager->resPrint;
 
-	$sql .= " GROUP BY f.rowid, f.ref, f.datef, f.total, f.tva, f.total_ttc, f.ref_client, f.type, ";
-	$sql .= "s.email, s.nom, s.rowid, s.code_client, s.code_compta, s.code_fournisseur, s.code_compta_fournisseur";
+	$sql .= " GROUP BY f.rowid, f.ref, f.datef, f.total, f.tva, f.total_ttc, f.ref_client, f.type, f.fk_statut, f.paye,";
+	$sql .= " s.email, s.nom, s.rowid, s.code_client, s.code_compta, s.code_fournisseur, s.code_compta_fournisseur,";
+	$sql .= " cc.rowid, cc.code";
 
 	// Add Group from hooks
 	$parameters = array();
@@ -195,29 +197,33 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 			{
 				$obj = $db->fetch_object($resql);
 
-				$facturestatic->id = $obj->rowid;
-				$facturestatic->ref = $obj->ref;
-				$facturestatic->date = $db->jdate($obj->date);
-				$facturestatic->type = $obj->type;
-				$facturestatic->total_ht = $obj->total_ht;
-				$facturestatic->total_tva = $obj->total_tva;
-				$facturestatic->total_ttc = $obj->total_ttc;
-				$facturestatic->ref_client = $obj->ref_client;
+				$tmpinvoice->id = $obj->rowid;
+				$tmpinvoice->ref = $obj->ref;
+				$tmpinvoice->date = $db->jdate($obj->date);
+				$tmpinvoice->type = $obj->type;
+				$tmpinvoice->total_ht = $obj->total_ht;
+				$tmpinvoice->total_tva = $obj->total_tva;
+				$tmpinvoice->total_ttc = $obj->total_ttc;
+				$tmpinvoice->ref_client = $obj->ref_client;
+				$tmpinvoice->statut = $obj->status;
+				$tmpinvoice->paye = $obj->paye;
 
 				$companystatic->id = $obj->socid;
 				$companystatic->name = $obj->name;
 				$companystatic->email = $obj->email;
+				$companystatic->country_id = $obj->country_id;
+				$companystatic->country_code = $obj->country_code;
 				$companystatic->client = 1;
 				$companystatic->code_client = $obj->code_client;
 				$companystatic->code_fournisseur = $obj->code_fournisseur;
 				$companystatic->code_compta = $obj->code_compta;
 				$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
 
-				print '<tr class="oddeven"><td class="nowrap">';
-				print $facturestatic->getNomUrl(1, '');
+				print '<tr class="oddeven"><td class="nowrap tdoverflowmax100">';
+				print $tmpinvoice->getNomUrl(1, '');
 				print '</td>';
-				print '<td class="nowrap">';
-				print $companystatic->getNomUrl(1, 'customer', 16);
+				print '<td class="nowrap tdoverflowmax100">';
+				print $companystatic->getNomUrl(1, 'customer');
 				print '</td>';
 				print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
 				print '</tr>';
@@ -243,12 +249,14 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
  */
 if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire)
 {
-	$sql = "SELECT f.ref, f.rowid, f.total_ht, f.total_tva, f.total_ttc, f.type, f.ref_supplier";
+	$facturesupplierstatic = new FactureFournisseur($db);
+
+	$sql = "SELECT f.ref, f.rowid, f.total_ht, f.total_tva, f.total_ttc, f.type, f.ref_supplier, f.fk_statut as status, f.paye";
 	$sql .= ", s.nom as name";
-    $sql .= ", s.rowid as socid, s.email";
-    $sql .= ", s.code_fournisseur, s.code_compta_fournisseur";
-    $sql .= ", cc.rowid as country_id, cc.code as country_code";
-    $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays";
+	$sql .= ", s.rowid as socid, s.email";
+	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur";
+	$sql .= ", cc.rowid as country_id, cc.code as country_code";
+	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql .= " WHERE s.rowid = f.fk_soc AND f.fk_statut = ".FactureFournisseur::STATUS_DRAFT;
 	$sql .= " AND f.entity IN (".getEntity('invoice').')';
@@ -293,6 +301,8 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				$facturesupplierstatic->total_ttc = $obj->total_ttc;
 				$facturesupplierstatic->ref_supplier = $obj->ref_supplier;
 				$facturesupplierstatic->type = $obj->type;
+				$facturesupplierstatic->statut = $obj->status;
+				$facturesupplierstatic->paye = $obj->paye;
 
 				$companystatic->id = $obj->socid;
 				$companystatic->name = $obj->name;
@@ -305,11 +315,11 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				$companystatic->code_compta = $obj->code_compta;
 				$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
 
-				print '<tr class="oddeven"><td class="nowrap">';
-				print $facturesupplierstatic->getNomUrl(1, '', 16);
+				print '<tr class="oddeven"><td class="nowrap tdoverflowmax100">';
+				print $facturesupplierstatic->getNomUrl(1, '');
 				print '</td>';
-				print '<td>';
-				print $companystatic->getNomUrl(1, 'supplier', 16);
+				print '<td class="nowrap tdoverflowmax100">';
+				print $companystatic->getNomUrl(1, 'supplier');
 				print '</td>';
 				print '<td class="right">'.price($obj->total_ttc).'</td>';
 				print '</tr>';
@@ -338,15 +348,15 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 {
 	$langs->load("boxes");
-	$facstatic = new Facture($db);
+	$tmpinvoice = new Facture($db);
 
-	$sql = "SELECT f.rowid, f.ref, f.fk_statut, f.type, f.total as total_ht, f.tva as total_tva, f.total_ttc, f.paye, f.tms";
+	$sql = "SELECT f.rowid, f.ref, f.fk_statut as status, f.type, f.total as total_ht, f.tva as total_tva, f.total_ttc, f.paye, f.tms";
 	$sql .= ", f.date_lim_reglement as datelimite";
 	$sql .= ", s.nom as name";
-    $sql .= ", s.rowid as socid";
-    $sql .= ", s.code_client, s.code_compta, s.email";
-    $sql .= ", cc.rowid as country_id, cc.code as country_code";
-    $sql .= ", sum(pf.amount) as am";
+	$sql .= ", s.rowid as socid";
+	$sql .= ", s.code_client, s.code_compta, s.email";
+	$sql .= ", cc.rowid as country_id, cc.code as country_code";
+	$sql .= ", sum(pf.amount) as am";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays, ".MAIN_DB_PREFIX."facture as f";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -372,7 +382,7 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 		$i = 0;
 		$othernb = 0;
 
-        print '<div class="div-table-responsive-no-min">';
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("BoxTitleLastCustomerBills", $max).'</th>';
 		if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<th class="right">'.$langs->trans("AmountHT").'</th>';
@@ -395,14 +405,15 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 					continue;
 				}
 
-				$facturestatic->ref = $obj->ref;
-				$facturestatic->id = $obj->rowid;
-				$facturestatic->total_ht = $obj->total_ht;
-				$facturestatic->total_tva = $obj->total_tva;
-				$facturestatic->total_ttc = $obj->total_ttc;
-				$facturestatic->statut = $obj->fk_statut;
-				$facturestatic->date_lim_reglement = $db->jdate($obj->datelimite);
-				$facturestatic->type = $obj->type;
+				$tmpinvoice->ref = $obj->ref;
+				$tmpinvoice->id = $obj->rowid;
+				$tmpinvoice->total_ht = $obj->total_ht;
+				$tmpinvoice->total_tva = $obj->total_tva;
+				$tmpinvoice->total_ttc = $obj->total_ttc;
+				$tmpinvoice->statut = $obj->status;
+				$tmpinvoice->paye = $obj->paye;
+				$tmpinvoice->date_lim_reglement = $db->jdate($obj->datelimite);
+				$tmpinvoice->type = $obj->type;
 
 				$thirdpartystatic->id = $obj->socid;
 				$thirdpartystatic->name = $obj->name;
@@ -421,10 +432,10 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 
 				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
 				print '<td class="nobordernopadding nowraponall">';
-				print $facturestatic->getNomUrl(1, '');
+				print $tmpinvoice->getNomUrl(1, '');
 				print '</td>';
 				print '<td width="20" class="nobordernopadding nowrap">';
-				if ($facturestatic->hasDelay()) {
+				if ($tmpinvoice->hasDelay()) {
 					print img_warning($langs->trans("Late"));
 				}
 				print '</td>';
@@ -432,17 +443,17 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 				$filename = dol_sanitizeFileName($obj->ref);
 				$filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($obj->ref);
 				$urlsource = $_SERVER['PHP_SELF'].'?facid='.$obj->rowid;
-				print $formfile->getDocumentsLink($facturestatic->element, $filename, $filedir);
+				print $formfile->getDocumentsLink($tmpinvoice->element, $filename, $filedir);
 				print '</td></tr></table>';
 
 				print '</td>';
 				print '<td class="left">';
-                print $thirdpartystatic->getNomUrl(1, 'customer', 44);
+				print $thirdpartystatic->getNomUrl(1, 'customer', 44);
 				print '</td>';
 				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="nowrap right">'.price($obj->total_ht).'</td>';
 				print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
 				print '<td class="right">'.dol_print_date($db->jdate($obj->tms), 'day').'</td>';
-				print '<td>'.$facstatic->LibStatut($obj->paye, $obj->fk_statut, 3, $obj->am).'</td>';
+				print '<td>'.$tmpinvoice->getLibStatut(3, $obj->am).'</td>';
 				print '</tr>';
 
 				$total_ttc += $obj->total_ttc;
@@ -479,10 +490,10 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 	$langs->load("boxes");
 	$facstatic = new FactureFournisseur($db);
 
-	$sql = "SELECT ff.rowid, ff.ref, ff.fk_statut, ff.libelle, ff.total_ht, ff.total_tva, ff.total_ttc, ff.tms, ff.paye";
+	$sql = "SELECT ff.rowid, ff.ref, ff.fk_statut as status, ff.libelle, ff.total_ht, ff.total_tva, ff.total_ttc, ff.tms, ff.paye";
 	$sql .= ", s.nom as name";
-    $sql .= ", s.rowid as socid";
-    $sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.email";
+	$sql .= ", s.rowid as socid";
+	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.email";
 	$sql .= ", SUM(pf.amount) as am";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf on ff.rowid=pf.fk_facturefourn";
@@ -506,7 +517,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 	{
 		$num = $db->num_rows($resql);
 
-        print '<div class="div-table-responsive-no-min">';
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("BoxTitleLastSupplierBills", $max).'</th>';
 		if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<th class="right">'.$langs->trans("AmountHT").'</th>';
@@ -537,6 +548,8 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				$facstatic->total_ht = $obj->total_ht;
 				$facstatic->total_tva = $obj->total_tva;
 				$facstatic->total_ttc = $obj->total_ttc;
+				$facstatic->statut = $obj->status;
+				$facstatic->paye = $obj->paye;
 
 				$thirdpartystatic->id = $obj->socid;
 				$thirdpartystatic->name = $obj->name;
@@ -550,16 +563,16 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				$thirdpartystatic->code_compta = '';
 				$thirdpartystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
 
-				print '<tr class="oddeven nowraponall"><td>';
+				print '<tr class="oddeven nowraponall tdoverflowmax100"><td>';
 				print $facstatic->getNomUrl(1, '');
 				print '</td>';
-				print '<td>';
-				print $thirdpartystatic->getNomUrl(1, 'supplier', 44);
+				print '<td class="nowrap tdoverflowmax100">';
+				print $thirdpartystatic->getNomUrl(1, 'supplier');
 				print '</td>';
 				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($obj->total_ht).'</td>';
 				print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
 				print '<td class="right">'.dol_print_date($db->jdate($obj->tms), 'day').'</td>';
-				print '<td>'.$facstatic->LibStatut($obj->paye, $obj->fk_statut, 3).'</td>';
+				print '<td>'.$facstatic->getLibStatut(3).'</td>';
 				print '</tr>';
 				$total += $obj->total_ht;
 				$total_ttc += $obj->total_ttc;
@@ -593,9 +606,9 @@ if (!empty($conf->don->enabled) && $user->rights->don->lire)
 	include_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 
 	$langs->load("boxes");
-    $donationstatic = new Don($db);
+	$donationstatic = new Don($db);
 
-	$sql = "SELECT d.rowid, d.lastname, d.firstname, d.societe, d.datedon as date, d.tms as dm, d.amount, d.fk_statut";
+	$sql = "SELECT d.rowid, d.lastname, d.firstname, d.societe, d.datedon as date, d.tms as dm, d.amount, d.fk_statut as status";
 	$sql .= " FROM ".MAIN_DB_PREFIX."don as d";
 	$sql .= " WHERE d.entity IN (".getEntity('donation').")";
 	// Add where from hooks
@@ -614,14 +627,14 @@ if (!empty($conf->don->enabled) && $user->rights->don->lire)
 		$i = 0;
 		$othernb = 0;
 
-        print '<div class="div-table-responsive-no-min">';
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print '<th>'.$langs->trans("BoxTitleLastModifiedDonations", $max).'</th>';
-        print '<th></th>';
-        print '<th class="right">'.$langs->trans("AmountTTC").'</th>';
-        print '<th class="right">'.$langs->trans("DateModificationShort").'</th>';
-        print '<th width="16">&nbsp;</th>';
+		print '<th></th>';
+		print '<th class="right">'.$langs->trans("AmountTTC").'</th>';
+		print '<th class="right">'.$langs->trans("DateModificationShort").'</th>';
+		print '<th width="16">&nbsp;</th>';
 		print '</tr>';
 		if ($num)
 		{
@@ -643,16 +656,19 @@ if (!empty($conf->don->enabled) && $user->rights->don->lire)
 				$donationstatic->ref = $objp->rowid;
 				$donationstatic->lastname = $objp->lastname;
 				$donationstatic->firstname = $objp->firstname;
+				$donationstatic->date = $objp->date;
+				$donationstatic->statut = $objp->status;
+				$donationstatic->status = $objp->status;
 
 				$label = $donationstatic->getFullName($langs);
 				if ($objp->societe) $label .= ($label ? ' - ' : '').$objp->societe;
 
-				print '<tr class="oddeven">';
+				print '<tr class="oddeven tdoverflowmax100">';
 				print '<td>'.$donationstatic->getNomUrl(1).'</td>';
 				print '<td>'.$label.'</td>';
 				print '<td class="nowrap right">'.price($objp->amount).'</td>';
 				print '<td class="right">'.dol_print_date($db->jdate($objp->dm), 'day').'</td>';
-                print '<td>'.$donationstatic->LibStatut($objp->fk_statut, 3).'</td>';
+				print '<td>'.$donationstatic->getLibStatut(3).'</td>';
 				print '</tr>';
 
 				$i++;
@@ -701,7 +717,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 		{
 			$num = $db->num_rows($resql);
 
-            print '<div class="div-table-responsive-no-min">';
+			print '<div class="div-table-responsive-no-min">';
 			print '<table class="noborder centpercent">';
 			print '<tr class="liste_titre">';
 			print '<th>'.$langs->trans("ContributionsToPay").($num ? ' <a href="'.DOL_URL_ROOT.'/compta/sociales/list.php?status=0"><span class="badge">'.$num.'</span></a>' : '').'</th>';
@@ -732,9 +748,10 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 					$chargestatic->ref = $obj->rowid;
 					$chargestatic->label = $obj->label;
 					$chargestatic->paye = $obj->paye;
+					$chargestatic->status = $obj->paye;
 
 					print '<tr class="oddeven">';
-					print '<td>'.$chargestatic->getNomUrl(1).'</td>';
+					print '<td class="nowraponall">'.$chargestatic->getNomUrl(1).'</td>';
 					print '<td class="center">'.dol_print_date($db->jdate($obj->date_ech), 'day').'</td>';
 					print '<td class="nowrap right">'.price($obj->amount).'</td>';
 					print '<td class="nowrap right">'.price($obj->sumpaid).'</td>';
@@ -779,9 +796,9 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 
 	$sql = "SELECT sum(f.total) as tot_fht, sum(f.total_ttc) as tot_fttc";
 	$sql .= ", s.nom as name, s.email";
-    $sql .= ", s.rowid as socid";
-    $sql .= ", s.code_client, s.code_compta";
-	$sql .= ", c.rowid, c.ref, c.facture, c.fk_statut, c.total_ht, c.tva as total_tva, c.total_ttc,";
+	$sql .= ", s.rowid as socid";
+	$sql .= ", s.code_client, s.code_compta";
+	$sql .= ", c.rowid, c.ref, c.facture, c.fk_statut as status, c.total_ht, c.tva as total_tva, c.total_ttc,";
 	$sql .= " cc.rowid as country_id, cc.code as country_code";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -811,7 +828,7 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 			$i = 0;
 			$othernb = 0;
 
-            print '<div class="div-table-responsive-no-min">';
+			print '<div class="div-table-responsive-no-min">';
 			print '<table class="noborder centpercent">';
 
 			print "<tr class=\"liste_titre\">";
@@ -855,6 +872,8 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 
 				$commandestatic->id = $obj->rowid;
 				$commandestatic->ref = $obj->ref;
+				$commandestatic->statut = $obj->status;
+				$commandestatic->billed = $obj->facture;
 
 				print '<tr class="oddeven">';
 				print '<td class="nowrap">';
@@ -875,13 +894,13 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 
 				print '</td>';
 
-				print '<td class="left">';
-                print $societestatic->getNomUrl(1, 'customer', 44);
+				print '<td class="nowrap tdoverflowmax100">';
+				print $societestatic->getNomUrl(1, 'customer');
 				print '</td>';
 				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($obj->total_ht).'</td>';
 				print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
 				print '<td class="nowrap right">'.price($obj->total_ttc - $obj->tot_fttc).'</td>';
-				print '<td>'.$commandestatic->LibStatut($obj->fk_statut, $obj->facture, 3).'</td>';
+				print '<td>'.$commandestatic->getLibStatut(3).'</td>';
 				print '</tr>';
 				$tot_ht += $obj->total_ht;
 				$tot_ttc += $obj->total_ttc;
@@ -917,15 +936,15 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
  */
 if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 {
-	$facstatic = new Facture($db);
+	$tmpinvoice = new Facture($db);
 
-	$sql = "SELECT f.rowid, f.ref, f.fk_statut, f.datef, f.type, f.total as total_ht, f.tva as total_tva, f.total_ttc, f.paye, f.tms";
+	$sql = "SELECT f.rowid, f.ref, f.fk_statut as status, f.datef, f.type, f.total as total_ht, f.tva as total_tva, f.total_ttc, f.paye, f.tms";
 	$sql .= ", f.date_lim_reglement as datelimite";
 	$sql .= ", s.nom as name";
-    $sql .= ", s.rowid as socid, s.email";
-    $sql .= ", s.code_client, s.code_compta";
-    $sql .= ", cc.rowid as country_id, cc.code as country_code";
-    $sql .= ", sum(pf.amount) as am";
+	$sql .= ", s.rowid as socid, s.email";
+	$sql .= ", s.code_client, s.code_compta";
+	$sql .= ", cc.rowid as country_id, cc.code as country_code";
+	$sql .= ", sum(pf.amount) as am";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays,".MAIN_DB_PREFIX."facture as f";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -982,14 +1001,15 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 					continue;
 				}
 
-				$facturestatic->ref = $obj->ref;
-				$facturestatic->id = $obj->rowid;
-				$facturestatic->total_ht = $obj->total_ht;
-				$facturestatic->total_tva = $obj->total_tva;
-				$facturestatic->total_ttc = $obj->total_ttc;
-				$facturestatic->type = $obj->type;
-				$facturestatic->statut = $obj->fk_statut;
-				$facturestatic->date_lim_reglement = $db->jdate($obj->datelimite);
+				$tmpinvoice->ref = $obj->ref;
+				$tmpinvoice->id = $obj->rowid;
+				$tmpinvoice->total_ht = $obj->total_ht;
+				$tmpinvoice->total_tva = $obj->total_tva;
+				$tmpinvoice->total_ttc = $obj->total_ttc;
+				$tmpinvoice->type = $obj->type;
+				$tmpinvoice->statut = $obj->status;
+				$tmpinvoice->paye = $obj->paye;
+				$tmpinvoice->date_lim_reglement = $db->jdate($obj->datelimite);
 
 				$societestatic->id = $obj->socid;
 				$societestatic->name = $obj->name;
@@ -1007,10 +1027,10 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 
 				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
 				print '<td width="110" class="nobordernopadding nowrap">';
-				print $facturestatic->getNomUrl(1, '');
+				print $tmpinvoice->getNomUrl(1, '');
 				print '</td>';
 				print '<td width="20" class="nobordernopadding nowrap">';
-				if ($facturestatic->hasDelay()) {
+				if ($tmpinvoice->hasDelay()) {
 					print img_warning($langs->trans("Late"));
 				}
 				print '</td>';
@@ -1018,18 +1038,18 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 				$filename = dol_sanitizeFileName($obj->ref);
 				$filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($obj->ref);
 				$urlsource = $_SERVER['PHP_SELF'].'?facid='.$obj->rowid;
-				print $formfile->getDocumentsLink($facturestatic->element, $filename, $filedir);
+				print $formfile->getDocumentsLink($tmpinvoice->element, $filename, $filedir);
 				print '</td></tr></table>';
 
 				print '</td>';
-				print '<td class="left">';
-				print $societestatic->getNomUrl(1, 'customer', 44);
+				print '<td class="nowrap tdoverflowmax100">';
+				print $societestatic->getNomUrl(1, 'customer');
 				print '</td>';
 				print '<td class="right">'.dol_print_date($db->jdate($obj->datelimite), 'day').'</td>';
 				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($obj->total_ht).'</td>';
 				print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
 				print '<td class="nowrap right">'.price($obj->am).'</td>';
-				print '<td>'.$facstatic->LibStatut($obj->paye, $obj->fk_statut, 3, $obj->am, $obj->type).'</td>';
+				print '<td>'.$tmpinvoice->getLibStatut(3, $obj->am).'</td>';
 				print '</tr>';
 
 				$total_ttc += $obj->total_ttc;
@@ -1040,8 +1060,10 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 			}
 
 			if ($othernb) {
+				$colspan = 6;
+				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
 				print '<tr class="oddeven">';
-				print '<td class="nowrap" colspan="5">';
+				print '<td class="nowrap" colspan="'.$colspan.'">';
 				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
 				print '</td>';
 				print "</tr>\n";
@@ -1073,12 +1095,12 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 {
 	$facstatic = new FactureFournisseur($db);
 
-	$sql = "SELECT ff.rowid, ff.ref, ff.fk_statut, ff.type, ff.libelle as label, ff.total_ht, ff.total_tva, ff.total_ttc, ff.paye";
+	$sql = "SELECT ff.rowid, ff.ref, ff.fk_statut as status, ff.type, ff.libelle as label, ff.total_ht, ff.total_tva, ff.total_ttc, ff.paye";
 	$sql .= ", ff.date_lim_reglement";
 	$sql .= ", s.nom as name";
-    $sql .= ", s.rowid as socid, s.email";
-    $sql .= ", s.code_client, s.code_compta";
-    $sql .= ", s.code_fournisseur, s.code_compta_fournisseur";
+	$sql .= ", s.rowid as socid, s.email";
+	$sql .= ", s.code_client, s.code_compta";
+	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur";
 	$sql .= ", sum(pf.amount) as am";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf on ff.rowid=pf.fk_facturefourn";
@@ -1146,6 +1168,8 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				$facstatic->total_ht = $obj->total_ht;
 				$facstatic->total_tva = $obj->total_tva;
 				$facstatic->total_ttc = $obj->total_ttc;
+				$facstatic->statut = $obj->status;
+				$facstatic->paye = $obj->paye;
 
 				$societestatic->id = $obj->socid;
 				$societestatic->name = $obj->name;
@@ -1157,15 +1181,15 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				$societestatic->code_compta = $obj->code_compta;
 				$societestatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
 
-				print '<tr class="oddeven"><td>';
+				print '<tr class="oddeven"><td class="nowrap tdoverflowmax100">';
 				print $facstatic->getNomUrl(1, '');
 				print '</td>';
-				print '<td>'.$societestatic->getNomUrl(1, 'supplier', 44).'</td>';
+				print '<td class="nowrap tdoverflowmax100">'.$societestatic->getNomUrl(1, 'supplier').'</td>';
 				print '<td class="right">'.dol_print_date($db->jdate($obj->date_lim_reglement), 'day').'</td>';
 				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($obj->total_ht).'</td>';
 				print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
 				print '<td class="nowrap right">'.price($obj->am).'</td>';
-				print '<td>'.$facstatic->LibStatut($obj->paye, $obj->fk_statut, 3, $obj->am, $obj->type).'</td>';
+				print '<td>'.$facstatic->getLibStatut(3, $obj->am).'</td>';
 				print '</tr>';
 				$total += $obj->total_ht;
 				$total_ttc += $obj->total_ttc;
@@ -1174,8 +1198,10 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 			}
 
 			if ($othernb) {
+				$colspan = 6;
+				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
 				print '<tr class="oddeven">';
-				print '<td class="nowrap" colspan="5">';
+				print '<td class="nowrap" colspan="'.$colspan.'">';
 				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
 				print '</td>';
 				print "</tr>\n";
@@ -1205,7 +1231,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 $resql = 0;
 if ($resql)
 {
-    print '<div class="div-table-responsive-no-min">';
+	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><thcolspan="2">'.$langs->trans("TasksToDo").'</th>';
 	print "</tr>\n";
diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php
index d754760dd57..45ffae7c1ff 100644
--- a/htdocs/compta/journal/purchasesjournal.php
+++ b/htdocs/compta/journal/purchasesjournal.php
@@ -81,8 +81,8 @@ $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 
 if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 {
-    $date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
-    $date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
+	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
+	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
 
 $name = $langs->trans("PurchasesJournal");
@@ -236,7 +236,7 @@ foreach ($tabfac as $key => $val)
 				if (isset($line['inv']))
 				{
 					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
-	    			print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
+					print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
 				} else {
 					print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
 					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php
index 62e8c77a133..ea6222dc63f 100644
--- a/htdocs/compta/journal/sellsjournal.php
+++ b/htdocs/compta/journal/sellsjournal.php
@@ -143,10 +143,10 @@ if ($result)
    	$resligne = array();
    	while ($i < $num)
    	{
-   	    $obj = $db->fetch_object($result);
-   	    // les variables
-   	    $cptcli = (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER != "") ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef"));
-   	    $compta_soc = (!empty($obj->code_compta) ? $obj->code_compta : $cptcli);
+   		$obj = $db->fetch_object($result);
+   		// les variables
+   		$cptcli = (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER != "") ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef"));
+   		$compta_soc = (!empty($obj->code_compta) ? $obj->code_compta : $cptcli);
 		$compta_prod = $obj->accountancy_code_sell;
 		if (empty($compta_prod))
 		{
@@ -170,14 +170,14 @@ if ($result)
 			if ($obj->situation_percent == 0) {
 				$situation_ratio = 0;
 			} else {
-		        $prev_progress = $line->get_prev_progress($obj->rowid); // id on invoice
-			    $situation_ratio = ($obj->situation_percent - $prev_progress) / $obj->situation_percent;
+				$prev_progress = $line->get_prev_progress($obj->rowid); // id on invoice
+				$situation_ratio = ($obj->situation_percent - $prev_progress) / $obj->situation_percent;
 			}
 		} else {
 			$situation_ratio = 1;
 		}
 
-    	//la ligne facture
+		//la ligne facture
    		$tabfac[$obj->rowid]["date"] = $obj->datef;
    		$tabfac[$obj->rowid]["ref"] = $obj->ref;
    		$tabfac[$obj->rowid]["type"] = $obj->type;
@@ -195,7 +195,7 @@ if ($result)
    		$i++;
    	}
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
@@ -268,7 +268,7 @@ foreach ($tabfac as $key => $val)
 					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
 				} else {
 					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
-	    			print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
+					print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
 				}
 
 				print "</tr>";
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index 6353d394f20..ec365ac68e7 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -61,44 +61,44 @@ if ($_POST["cancel"] == $langs->trans("Cancel") && !$id)
 
 if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 {
-    $db->begin();
+	$db->begin();
 
-    $datev = dol_mktime(12, 0, 0, $_POST["datevmonth"], $_POST["datevday"], $_POST["datevyear"]);
-    $datep = dol_mktime(12, 0, 0, $_POST["datepmonth"], $_POST["datepday"], $_POST["datepyear"]);
+	$datev = dol_mktime(12, 0, 0, $_POST["datevmonth"], $_POST["datevday"], $_POST["datevyear"]);
+	$datep = dol_mktime(12, 0, 0, $_POST["datepmonth"], $_POST["datepday"], $_POST["datepyear"]);
 
-    $object->accountid = GETPOST("accountid");
-    $object->paymenttype = GETPOST("paiementtype");
-    $object->datev = $datev;
-    $object->datep = $datep;
-    $object->amount = price2num(GETPOST("amount"));
+	$object->accountid = GETPOST("accountid");
+	$object->paymenttype = GETPOST("paiementtype");
+	$object->datev = $datev;
+	$object->datep = $datep;
+	$object->amount = price2num(GETPOST("amount"));
 	$object->label = GETPOST("label");
 	$object->ltt = $lttype;
 
-    $ret = $object->addPayment($user);
-    if ($ret > 0)
-    {
-        $db->commit();
-        header("Location: list.php?localTaxType=".$lttype);
-        exit;
-    } else {
-        $db->rollback();
-        setEventMessages($object->error, $object->errors, 'errors');
-        $_GET["action"] = "create";
-    }
+	$ret = $object->addPayment($user);
+	if ($ret > 0)
+	{
+		$db->commit();
+		header("Location: list.php?localTaxType=".$lttype);
+		exit;
+	} else {
+		$db->rollback();
+		setEventMessages($object->error, $object->errors, 'errors');
+		$_GET["action"] = "create";
+	}
 }
 
 //delete payment of localtax
 if ($action == 'delete')
 {
-    $result = $object->fetch($id);
+	$result = $object->fetch($id);
 
 	if ($object->rappro == 0)
 	{
-	    $db->begin();
+		$db->begin();
 
-	    $ret = $object->delete($user);
-	    if ($ret > 0)
-	    {
+		$ret = $object->delete($user);
+		if ($ret > 0)
+		{
 			if ($object->fk_bank)
 			{
 				$accountline = new AccountLine($db);
@@ -116,13 +116,13 @@ if ($action == 'delete')
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-	    } else {
-	        $db->rollback();
-	        setEventMessages($object->error, $object->errors, 'errors');
-	    }
+		} else {
+			$db->rollback();
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	} else {
-        $mesg = 'Error try do delete a line linked to a conciliated bank transaction';
-        setEventMessages($mesg, null, 'errors');
+		$mesg = 'Error try do delete a line linked to a conciliated bank transaction';
+		setEventMessages($mesg, null, 'errors');
 	}
 }
 
@@ -149,25 +149,25 @@ llxHeader("", $title, $helpurl);
 
 if ($action == 'create')
 {
-    print load_fiche_titre($langs->transcountry($lttype == 2 ? "newLT2Payment" : "newLT1Payment", $mysoc->country_code));
+	print load_fiche_titre($langs->transcountry($lttype == 2 ? "newLT2Payment" : "newLT1Payment", $mysoc->country_code));
 
-    print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" name="formlocaltax" method="post">'."\n";
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="localTaxType" value="'.$lttype.'">';
-    print '<input type="hidden" name="action" value="add">';
+	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" name="formlocaltax" method="post">'."\n";
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="localTaxType" value="'.$lttype.'">';
+	print '<input type="hidden" name="action" value="add">';
 
-    dol_fiche_head();
+	print dol_get_fiche_head();
 
-    print '<table class="border centpercent">';
+	print '<table class="border centpercent">';
 
-    print "<tr>";
-    print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
-    print $form->selectDate($datep, "datep", '', '', '', 'add', 1, 1);
-    print '</td></tr>';
+	print "<tr>";
+	print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
+	print $form->selectDate($datep, "datep", '', '', '', 'add', 1, 1);
+	print '</td></tr>';
 
-    print '<tr><td class="fieldrequired">'.$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")).'</td><td>';
-    print $form->selectDate($datev, "datev", '', '', '', 'add', 1, 1);
-    print '</td></tr>';
+	print '<tr><td class="fieldrequired">'.$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")).'</td><td>';
+	print $form->selectDate($datev, "datev", '', '', '', 'add', 1, 1);
+	print '</td></tr>';
 
 	// Label
 	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input name="label" class="minwidth200" value="'.($_POST["label"] ?GETPOST("label", '', 2) : $langs->transcountry(($lttype == 2 ? "LT2Payment" : "LT1Payment"), $mysoc->country_code)).'"></td></tr>';
@@ -175,38 +175,38 @@ if ($action == 'create')
 	// Amount
 	print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.GETPOST("amount").'"></td></tr>';
 
-    if (!empty($conf->banque->enabled))
-    {
+	if (!empty($conf->banque->enabled))
+	{
 		print '<tr><td class="fieldrequired">'.$langs->trans("Account").'</td><td>';
-        $form->select_comptes($_POST["accountid"], "accountid", 0, "courant=1", 1); // Affiche liste des comptes courant
-        print '</td></tr>';
+		$form->select_comptes($_POST["accountid"], "accountid", 0, "courant=1", 2); // Affiche liste des comptes courant
+		print '</td></tr>';
 
-	    print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
-	    $form->select_types_paiements(GETPOST("paiementtype"), "paiementtype");
-	    print "</td>\n";
-	    print "</tr>";
+		print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
+		$form->select_types_paiements(GETPOST("paiementtype"), "paiementtype");
+		print "</td>\n";
+		print "</tr>";
 
 		// Number
 		print '<tr><td>'.$langs->trans('Numero');
 		print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
 		print '<td><input name="num_payment" type="text" value="'.GETPOST("num_payment").'"></td></tr>'."\n";
-    }
-    // Other attributes
-    $parameters = array();
-    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
+	}
+	// Other attributes
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 
-    print '</table>';
+	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+	print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-    print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
-    print '</form>';
+	print '</form>';
 }
 
 
@@ -219,7 +219,7 @@ if ($id)
 	$head[$h][2] = 'card';
 	$h++;
 
-	dol_fiche_head($head, 'card', $langs->transcountry("LT".$object->ltt, $mysoc->country_code), -1, 'payment');
+	print dol_get_fiche_head($head, 'card', $langs->transcountry("LT".$object->ltt, $mysoc->country_code), -1, 'payment');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/localtax/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -251,27 +251,27 @@ if ($id)
 		if ($object->fk_account > 0)
 		{
  		   	$bankline = new AccountLine($db);
-    		$bankline->fetch($object->fk_bank);
+			$bankline->fetch($object->fk_bank);
 
-	    	print '<tr>';
-	    	print '<td>'.$langs->trans('BankTransactionLine').'</td>';
+			print '<tr>';
+			print '<td>'.$langs->trans('BankTransactionLine').'</td>';
 			print '<td>';
 			print $bankline->getNomUrl(1, 0, 'showall');
-	    	print '</td>';
-	    	print '</tr>';
+			print '</td>';
+			print '</tr>';
 		}
 	}
 
-    // Other attributes
-    $parameters = array();
-    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
+	// Other attributes
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 
-    print '</table>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	/*
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index 1dfeb0b8930..b14c567a01d 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -50,45 +50,45 @@ class Localtax extends CommonObject
 	public $amount;
 
 	/**
-     * @var string local tax
-     */
-    public $label;
+	 * @var string local tax
+	 */
+	public $label;
 
-    /**
-     * @var int ID
-     */
+	/**
+	 * @var int ID
+	 */
 	public $fk_bank;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_creat;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
-    /**
+	/**
 	 *	Constructor
 	 *
 	 *  @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *  Create in database
-     *
-     *  @param      User	$user       User that create
-     *  @return     int      			<0 if KO, >0 if OK
-     */
-    public function create($user)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Create in database
+	 *
+	 *  @param      User	$user       User that create
+	 *  @return     int      			<0 if KO, >0 if OK
+	 */
+	public function create($user)
+	{
+		global $conf, $langs;
 
 		$error = 0;
 
@@ -97,7 +97,7 @@ class Localtax extends CommonObject
 		$this->label = trim($this->label);
 		$this->note = trim($this->note);
 
-        // Insert request
+		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."localtax(";
 		$sql .= "localtaxtype,";
 		$sql .= "tms,";
@@ -109,8 +109,8 @@ class Localtax extends CommonObject
 		$sql .= "fk_bank,";
 		$sql .= "fk_user_creat,";
 		$sql .= "fk_user_modif";
-        $sql .= ") VALUES (";
-        $sql .= " ".$this->ltt.",";
+		$sql .= ") VALUES (";
+		$sql .= " ".$this->ltt.",";
 		$sql .= " '".$this->db->idate($this->tms)."',";
 		$sql .= " '".$this->db->idate($this->datep)."',";
 		$sql .= " '".$this->db->idate($this->datev)."',";
@@ -123,41 +123,41 @@ class Localtax extends CommonObject
 		$sql .= ")";
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."localtax");
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."localtax");
 
-            // Call trigger
-            $result = $this->call_trigger('LOCALTAX_CREATE', $user);
-            if ($result < 0) $error++;
-            // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('LOCALTAX_CREATE', $user);
+			if ($result < 0) $error++;
+			// End call triggers
 
-            if (!$error)
-            {
-            	$this->db->commit();
-            	return $this->id;
-            } else {
+			if (!$error)
+			{
+				$this->db->commit();
+				return $this->id;
+			} else {
 				$this->db->rollback();
 				return -1;
-            }
-        } else {
-            $this->error = "Error ".$this->db->lasterror();
-            $this->db->rollback();
-            return -1;
-        }
-    }
+			}
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
-    /**
-     *	Update database
-     *
-     *	@param		User	$user        	User that modify
-     *	@param		int		$notrigger		0=no, 1=yes (no update trigger)
-     *	@return		int						<0 if KO, >0 if OK
-     */
-    public function update(User $user, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *	Update database
+	 *
+	 *	@param		User	$user        	User that modify
+	 *	@param		int		$notrigger		0=no, 1=yes (no update trigger)
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	public function update(User $user, $notrigger = 0)
+	{
+		global $conf, $langs;
 
 		$error = 0;
 
@@ -182,43 +182,43 @@ class Localtax extends CommonObject
 		$sql .= " fk_user_modif=".(int) $this->fk_user_modif;
 		$sql .= " WHERE rowid=".$this->id;
 
-        dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql)
-        {
-            $this->error = "Error ".$this->db->lasterror();
-            $error++;
-        }
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql)
+		{
+			$this->error = "Error ".$this->db->lasterror();
+			$error++;
+		}
 
 		if (!$error && !$notrigger)
 		{
-            // Call trigger
-            $result = $this->call_trigger('LOCALTAX_MODIFY', $user);
-            if ($result < 0) $error++;
-            // End call triggers
-    	}
+			// Call trigger
+			$result = $this->call_trigger('LOCALTAX_MODIFY', $user);
+			if ($result < 0) $error++;
+			// End call triggers
+		}
 
-    	if (!$error)
-    	{
-    		$this->db->commit();
-    		return 1;
-    	} else {
-    		$this->db->rollback();
-    		return -1;
-    	}
-    }
+		if (!$error)
+		{
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
 
-    /**
-     *	Load object in memory from database
-     *
-     *	@param		int		$id		Object id
-     *	@return		int				<0 if KO, >0 if OK
-     */
-    public function fetch($id)
-    {
-    	global $langs;
-        $sql = "SELECT";
+	/**
+	 *	Load object in memory from database
+	 *
+	 *	@param		int		$id		Object id
+	 *	@return		int				<0 if KO, >0 if OK
+	 */
+	public function fetch($id)
+	{
+		global $langs;
+		$sql = "SELECT";
 		$sql .= " t.rowid,";
 		$sql .= " t.localtaxtype,";
 		$sql .= " t.tms,";
@@ -233,21 +233,21 @@ class Localtax extends CommonObject
 		$sql .= " b.fk_account,";
 		$sql .= " b.fk_type,";
 		$sql .= " b.rappro";
-        $sql .= " FROM ".MAIN_DB_PREFIX."localtax as t";
+		$sql .= " FROM ".MAIN_DB_PREFIX."localtax as t";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON t.fk_bank = b.rowid";
-        $sql .= " WHERE t.rowid = ".$id;
+		$sql .= " WHERE t.rowid = ".$id;
 
-    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id    = $obj->rowid;
-                $this->ref   = $obj->rowid;
-                $this->ltt   = $obj->localtaxtype;
+				$this->id    = $obj->rowid;
+				$this->ref   = $obj->rowid;
+				$this->ltt   = $obj->localtaxtype;
 				$this->tms   = $this->db->jdate($obj->tms);
 				$this->datep = $this->db->jdate($obj->datep);
 				$this->datev = $this->db->jdate($obj->datev);
@@ -260,15 +260,15 @@ class Localtax extends CommonObject
 				$this->fk_account = $obj->fk_account;
 				$this->fk_type = $obj->fk_type;
 				$this->rappro  = $obj->rappro;
-            }
-            $this->db->free($resql);
+			}
+			$this->db->free($resql);
 
-            return 1;
-        } else {
-      	    $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+	  		$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
 
 	/**
@@ -308,7 +308,7 @@ class Localtax extends CommonObject
 	 */
 	public function initAsSpecimen()
 	{
-	    global $user;
+		global $user;
 
 		$this->id = 0;
 
@@ -325,221 +325,221 @@ class Localtax extends CommonObject
 	}
 
 
-    /**
-     *	Hum la fonction s'appelle 'Solde' elle doit a mon avis calcluer le solde de localtax, non ?
-     *
-     *	@param	int		$year		Year
-     *	@return	int					???
-     */
-    public function solde($year = 0)
-    {
-        $reglee = $this->localtax_sum_reglee($year);
+	/**
+	 *	Hum la fonction s'appelle 'Solde' elle doit a mon avis calcluer le solde de localtax, non ?
+	 *
+	 *	@param	int		$year		Year
+	 *	@return	int					???
+	 */
+	public function solde($year = 0)
+	{
+		$reglee = $this->localtax_sum_reglee($year);
 
-        $payee = $this->localtax_sum_payee($year);
-        $collectee = $this->localtax_sum_collectee($year);
+		$payee = $this->localtax_sum_payee($year);
+		$collectee = $this->localtax_sum_collectee($year);
 
-        $solde = $reglee - ($collectee - $payee);
+		$solde = $reglee - ($collectee - $payee);
 
-        return $solde;
-    }
+		return $solde;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Total de la localtax des factures emises par la societe.
-     *
-     *	@param	int		$year		Year
-     *	@return	int					???
-     */
-    public function localtax_sum_collectee($year = 0)
-    {
-        // phpcs:enable
-        $sql = "SELECT sum(f.localtax) as amount";
-        $sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.paye = 1";
-        if ($year)
-        {
-            $sql .= " AND f.datef >= '$year-01-01' AND f.datef <= '$year-12-31' ";
-        }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Total de la localtax des factures emises par la societe.
+	 *
+	 *	@param	int		$year		Year
+	 *	@return	int					???
+	 */
+	public function localtax_sum_collectee($year = 0)
+	{
+		// phpcs:enable
+		$sql = "SELECT sum(f.localtax) as amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.paye = 1";
+		if ($year)
+		{
+			$sql .= " AND f.datef >= '$year-01-01' AND f.datef <= '$year-12-31' ";
+		}
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
-            	$ret = $obj->amount;
-                $this->db->free($result);
-                return $ret;
-            } else {
-            	$this->db->free($result);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$ret = $obj->amount;
+				$this->db->free($result);
+				return $ret;
+			} else {
+				$this->db->free($result);
 				return 0;
-            }
-        } else {
-            print $this->db->lasterror();
-            return -1;
-        }
-    }
+			}
+		} else {
+			print $this->db->lasterror();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	localtax payed
-     *
-     *	@param	int		$year		Year
-     *	@return	int					???
-     */
-    public function localtax_sum_payee($year = 0)
-    {
-        // phpcs:enable
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	localtax payed
+	 *
+	 *	@param	int		$year		Year
+	 *	@return	int					???
+	 */
+	public function localtax_sum_payee($year = 0)
+	{
+		// phpcs:enable
 
-        $sql = "SELECT sum(f.total_localtax) as total_localtax";
-        $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
-        if ($year)
-        {
-            $sql .= " WHERE f.datef >= '$year-01-01' AND f.datef <= '$year-12-31' ";
-        }
+		$sql = "SELECT sum(f.total_localtax) as total_localtax";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+		if ($year)
+		{
+			$sql .= " WHERE f.datef >= '$year-01-01' AND f.datef <= '$year-12-31' ";
+		}
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
-            	$ret = $obj->total_localtax;
-                $this->db->free($result);
-                return $ret;
-            } else {
-            	$this->db->free($result);
-            	return 0;
-            }
-        } else {
-            print $this->db->lasterror();
-            return -1;
-        }
-    }
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	localtax payed
-     *  Total de la localtax payed
-     *
-     *	@param	int		$year		Year
-     *	@return	int					???
-     */
-    public function localtax_sum_reglee($year = 0)
-    {
-        // phpcs:enable
-
-        $sql = "SELECT sum(f.amount) as amount";
-        $sql .= " FROM ".MAIN_DB_PREFIX."localtax as f";
-        if ($year)
-        {
-            $sql .= " WHERE f.datev >= '$year-01-01' AND f.datev <= '$year-12-31' ";
-        }
-
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
-                $ret = $obj->amount;
-            	$this->db->free($result);
-                return $ret;
-            } else {
-            	$this->db->free($result);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$ret = $obj->total_localtax;
+				$this->db->free($result);
+				return $ret;
+			} else {
+				$this->db->free($result);
 				return 0;
-            }
-        } else {
-            print $this->db->lasterror();
-            return -1;
-        }
-    }
+			}
+		} else {
+			print $this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    /**
-     *	Add a payment of localtax
-     *
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	localtax payed
+	 *  Total de la localtax payed
+	 *
+	 *	@param	int		$year		Year
+	 *	@return	int					???
+	 */
+	public function localtax_sum_reglee($year = 0)
+	{
+		// phpcs:enable
+
+		$sql = "SELECT sum(f.amount) as amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."localtax as f";
+		if ($year)
+		{
+			$sql .= " WHERE f.datev >= '$year-01-01' AND f.datev <= '$year-12-31' ";
+		}
+
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$ret = $obj->amount;
+				$this->db->free($result);
+				return $ret;
+			} else {
+				$this->db->free($result);
+				return 0;
+			}
+		} else {
+			print $this->db->lasterror();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *	Add a payment of localtax
+	 *
 	 *	@param		User	$user		Object user that insert
 	 *	@return		int					<0 if KO, rowid in localtax table if OK
-     */
-    public function addPayment($user)
-    {
-        global $conf, $langs;
+	 */
+	public function addPayment($user)
+	{
+		global $conf, $langs;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // Check parameters
-        $this->amount = price2num($this->amount);
+		// Check parameters
+		$this->amount = price2num($this->amount);
 		if (!$this->label)
 		{
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
 			return -3;
 		}
-        if ($this->amount <= 0)
-        {
-            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
-            return -4;
-        }
-        if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
-        {
-            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
-            return -5;
-        }
-        if (!empty($conf->banque->enabled) && (empty($this->paymenttype) || $this->paymenttype <= 0))
-        {
-            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
-            return -5;
-        }
+		if ($this->amount <= 0)
+		{
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
+			return -4;
+		}
+		if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
+		{
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
+			return -5;
+		}
+		if (!empty($conf->banque->enabled) && (empty($this->paymenttype) || $this->paymenttype <= 0))
+		{
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
+			return -5;
+		}
 
-        // Insertion dans table des paiement localtax
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."localtax (localtaxtype, datep, datev, amount";
-        if ($this->note)  $sql .= ", note";
-        if ($this->label) $sql .= ", label";
-        $sql .= ", fk_user_creat, fk_bank";
+		// Insertion dans table des paiement localtax
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."localtax (localtaxtype, datep, datev, amount";
+		if ($this->note)  $sql .= ", note";
+		if ($this->label) $sql .= ", label";
+		$sql .= ", fk_user_creat, fk_bank";
 		$sql .= ") ";
-        $sql .= " VALUES (".$this->ltt.", '".$this->db->idate($this->datep)."',";
-        $sql .= "'".$this->db->idate($this->datev)."',".$this->amount;
-        if ($this->note)  $sql .= ", '".$this->db->escape($this->note)."'";
-        if ($this->label) $sql .= ", '".$this->db->escape($this->label)."'";
-        $sql .= ", ".((int) $user->id).", NULL";
-        $sql .= ")";
+		$sql .= " VALUES (".$this->ltt.", '".$this->db->idate($this->datep)."',";
+		$sql .= "'".$this->db->idate($this->datev)."',".$this->amount;
+		if ($this->note)  $sql .= ", '".$this->db->escape($this->note)."'";
+		if ($this->label) $sql .= ", '".$this->db->escape($this->label)."'";
+		$sql .= ", ".((int) $user->id).", NULL";
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::addPayment", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."localtax"); // TODO devrait s'appeler paiementlocaltax
-            if ($this->id > 0)
-            {
-                $ok = 1;
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."localtax"); // TODO devrait s'appeler paiementlocaltax
+			if ($this->id > 0)
+			{
+				$ok = 1;
 				if (!empty($conf->banque->enabled))
-                {
-                    // Insertion dans llx_bank
-                    require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+				{
+					// Insertion dans llx_bank
+					require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-                    $acc = new Account($this->db);
+					$acc = new Account($this->db);
 					$result = $acc->fetch($this->accountid);
 					if ($result <= 0) dol_print_error($this->db);
 
-                    $bank_line_id = $acc->addline($this->datep, $this->paymenttype, $this->label, -abs($this->amount), '', '', $user);
+					$bank_line_id = $acc->addline($this->datep, $this->paymenttype, $this->label, -abs($this->amount), '', '', $user);
 
-                    // Mise a jour fk_bank dans llx_localtax. On connait ainsi la ligne de localtax qui a g�n�r� l'�criture bancaire
-                    if ($bank_line_id > 0)
+					// Mise a jour fk_bank dans llx_localtax. On connait ainsi la ligne de localtax qui a g�n�r� l'�criture bancaire
+					if ($bank_line_id > 0)
 					{
-                        $this->update_fk_bank($bank_line_id);
-                    } else {
+						$this->update_fk_bank($bank_line_id);
+					} else {
 						$this->error = $acc->error;
 						$ok = 0;
 					}
 
-                    // Mise a jour liens
-                    $result = $acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/compta/localtax/card.php?id=', "(VATPayment)", "payment_vat");
-                    if ($result < 0)
-                    {
-                    	$this->error = $acc->error;
-                    	$ok = 0;
-                    }
-	            }
+					// Mise a jour liens
+					$result = $acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/compta/localtax/card.php?id=', "(VATPayment)", "payment_vat");
+					if ($result < 0)
+					{
+						$this->error = $acc->error;
+						$ok = 0;
+					}
+				}
 
 				if ($ok)
 				{
@@ -549,28 +549,28 @@ class Localtax extends CommonObject
 					$this->db->rollback();
 					return -3;
 				}
-            } else {
-                $this->error = $this->db->lasterror();
-                $this->db->rollback();
-                return -2;
-            }
-        } else {
-            $this->error = $this->db->lasterror();
-            $this->db->rollback();
-            return -1;
-        }
-    }
+			} else {
+				$this->error = $this->db->lasterror();
+				$this->db->rollback();
+				return -2;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Update the link betwen localtax payment and the line into llx_bank
-     *
-     *	@param		int		$id		Id bank account
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Update the link betwen localtax payment and the line into llx_bank
+	 *
+	 *	@param		int		$id		Id bank account
 	 *	@return		int				<0 if KO, >0 if OK
-     */
+	 */
 	public function update_fk_bank($id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'localtax SET fk_bank = '.$id;
 		$sql .= ' WHERE rowid = '.$this->id;
 		$result = $this->db->query($sql);
@@ -597,12 +597,12 @@ class Localtax extends CommonObject
 		$result = '';
 		$label = $langs->trans("ShowVatPayment").': '.$this->ref;
 
-        $link = '<a href="'.DOL_URL_ROOT.'/compta/localtax/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$link = '<a href="'.DOL_URL_ROOT.'/compta/localtax/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend = '</a>';
 
 		$picto = 'payment';
 
-        if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+		if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
 		if ($withpicto && $withpicto != 2) $result .= ' ';
 		if ($withpicto != 2) $result .= $link.$this->ref.$linkend;
 		return $result;
@@ -619,7 +619,7 @@ class Localtax extends CommonObject
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Renvoi le libelle d'un statut donne
 	 *
@@ -627,11 +627,11 @@ class Localtax extends CommonObject
 	 * @param   int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 * @return	string              Libelle du statut
 	 */
-    public function LibStatut($status, $mode = 0)
-    {
-        // phpcs:enable
-        global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage
 
-        return '';
-    }
+		return '';
+	}
 }
diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php
index 1b1ad5351d3..fe605c2224d 100644
--- a/htdocs/compta/localtax/clients.php
+++ b/htdocs/compta/localtax/clients.php
@@ -50,8 +50,8 @@ $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endda
 // Quarter
 if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 {
-    $q = GETPOST("q");
-    if (empty($q))
+	$q = GETPOST("q");
+	if (empty($q))
 	{
 		if (GETPOST("month")) { $date_start = dol_get_first_day($year_start, GETPOST("month"), false); $date_end = dol_get_last_day($year_start, GETPOST("month"), false); } else {
 			$date_start = dol_get_first_day($year_start, empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START, false);
@@ -119,12 +119,12 @@ $calc = $conf->global->MAIN_INFO_LOCALTAX_CALC.$local;
 // Affiche en-tete du rapport
 if ($calc == 0 || $calc == 1)	// Calculate on invoice for goods and services
 {
-    $calcmode = $calc == 0 ? $langs->trans("CalcModeLT".$local) : $langs->trans("CalcModeLT".$local."Rec");
-    $calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
-    $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
-    if (!empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description .= '<br>'.$langs->trans("WarningDepositsNotIncluded");
-    $description .= $fsearch;
-    $description .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
+	$calcmode = $calc == 0 ? $langs->trans("CalcModeLT".$local) : $langs->trans("CalcModeLT".$local."Rec");
+	$calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
+	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
+	if (!empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description .= '<br>'.$langs->trans("WarningDepositsNotIncluded");
+	$description .= $fsearch;
+	$description .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
 	$builddate = dol_now();
 
 	$elementcust = $langs->trans("CustomersInvoices");
@@ -136,13 +136,13 @@ if ($calc == 0 || $calc == 1)	// Calculate on invoice for goods and services
 }
 if ($calc == 2) 	// Invoice for goods, payment for services
 {
-    $calcmode = $langs->trans("CalcModeLT2Debt");
-    $calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
-    $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
-    if (!empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description .= '<br>'.$langs->trans("WarningDepositsNotIncluded");
-    $description .= $fsearch;
-    $description .= '<span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
-    $builddate = dol_now();
+	$calcmode = $langs->trans("CalcModeLT2Debt");
+	$calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
+	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
+	if (!empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description .= '<br>'.$langs->trans("WarningDepositsNotIncluded");
+	$description .= $fsearch;
+	$description .= '<span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
+	$builddate = dol_now();
 
 	$elementcust = $langs->trans("CustomersInvoices");
 	$productcust = $langs->trans("Description");
@@ -213,16 +213,16 @@ if ($calc == 0 || $calc == 2)
 				print '<td class="nowrap">'.$intra.'</td>';
 				print '<td class="nowrap right">'.price($coll->amount).'</td>';
 				print '<td class="nowrap right">'.price($local == 1 ? $coll->localtax1 : $coll->localtax2).'</td>';
-	            $totalamount = $totalamount + $coll->amount;
+				$totalamount = $totalamount + $coll->amount;
 				$total = $total + ($local == 1 ? $coll->localtax1 : $coll->localtax2);
 				print "</tr>\n";
 				$i++;
 			}
 		}
-	    $x_coll_sum = $total;
+		$x_coll_sum = $total;
 
 		print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("Total").':</td>';
-	    print '<td class="nowrap right">'.price($totalamount).'</td>';
+		print '<td class="nowrap right">'.price($totalamount).'</td>';
 		print '<td class="nowrap right">'.price($total).'</td>';
 		print '</tr>';
 	} else {
@@ -280,16 +280,16 @@ if ($calc == 0 || $calc == 1) {
 				print '<td class="nowrap">'.$intra."</td>";
 				print '<td class="nowrap right">'.price($coll->amount).'</td>';
 				print '<td class="nowrap right">'.price($local == 1 ? $coll->localtax1 : $coll->localtax2).'</td>';
-	            $totalamount = $totalamount + $coll->amount;
+				$totalamount = $totalamount + $coll->amount;
 				$total = $total + ($local == 1 ? $coll->localtax1 : $coll->localtax2);
 				print "</tr>\n";
 				$i++;
 			}
 		}
-	    $x_paye_sum = $total;
+		$x_paye_sum = $total;
 
 		print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("Total").':</td>';
-	    print '<td class="nowrap right">'.price($totalamount).'</td>';
+		print '<td class="nowrap right">'.price($totalamount).'</td>';
 		print '<td class="nowrap right">'.price($total).'</td>';
 		print '</tr>';
 	} else {
diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php
index e8bcc89821b..7d48d6e1f2d 100644
--- a/htdocs/compta/localtax/index.php
+++ b/htdocs/compta/localtax/index.php
@@ -86,99 +86,99 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
  */
 function pt($db, $sql, $date)
 {
-    global $conf, $bc, $langs;
+	global $conf, $bc, $langs;
 
-    $result = $db->query($sql);
-    if ($result) {
-        $num = $db->num_rows($result);
-        $i = 0;
-        $total = 0;
-        print '<table class="noborder centpercent">';
+	$result = $db->query($sql);
+	if ($result) {
+		$num = $db->num_rows($result);
+		$i = 0;
+		$total = 0;
+		print '<table class="noborder centpercent">';
 
-        print '<tr class="liste_titre">';
-        print '<td class="nowrap">'.$date.'</td>';
-        print '<td class="right">'.$langs->trans("ClaimedForThisPeriod").'</td>';
-        print '<td class="right">'.$langs->trans("PaidDuringThisPeriod").'</td>';
-        print "</tr>\n";
+		print '<tr class="liste_titre">';
+		print '<td class="nowrap">'.$date.'</td>';
+		print '<td class="right">'.$langs->trans("ClaimedForThisPeriod").'</td>';
+		print '<td class="right">'.$langs->trans("PaidDuringThisPeriod").'</td>';
+		print "</tr>\n";
 
-        $totalclaimed = 0;
-        $totalpaid = 0;
-        $amountclaimed = 0;
-        $amountpaid = 0;
-        $previousmonth = '';
-        $previousmode = '';
-        $mode = '';
+		$totalclaimed = 0;
+		$totalpaid = 0;
+		$amountclaimed = 0;
+		$amountpaid = 0;
+		$previousmonth = '';
+		$previousmode = '';
+		$mode = '';
 
-        while ($i < $num) {
-            $obj = $db->fetch_object($result);
-            $mode = $obj->mode;
+		while ($i < $num) {
+			$obj = $db->fetch_object($result);
+			$mode = $obj->mode;
 
-            //print $obj->dm.' '.$obj->mode.' '.$previousmonth.' '.$previousmode;
-            if ($obj->mode == 'claimed' && !empty($previousmode))
-            {
-            	print '<tr class="oddeven">';
-            	print '<td class="nowrap">'.$previousmonth."</td>\n";
-            	print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
-            	print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
-            	print "</tr>\n";
+			//print $obj->dm.' '.$obj->mode.' '.$previousmonth.' '.$previousmode;
+			if ($obj->mode == 'claimed' && !empty($previousmode))
+			{
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">'.$previousmonth."</td>\n";
+				print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
+				print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
+				print "</tr>\n";
 
-            	$amountclaimed = 0;
-            	$amountpaid = 0;
-            }
+				$amountclaimed = 0;
+				$amountpaid = 0;
+			}
 
-            if ($obj->mode == 'claimed')
-            {
-            	$amountclaimed = $obj->mm;
-            	$totalclaimed = $totalclaimed + $amountclaimed;
-            }
-            if ($obj->mode == 'paid')
-            {
-            	$amountpaid = $obj->mm;
-            	$totalpaid = $totalpaid + $amountpaid;
-            }
+			if ($obj->mode == 'claimed')
+			{
+				$amountclaimed = $obj->mm;
+				$totalclaimed = $totalclaimed + $amountclaimed;
+			}
+			if ($obj->mode == 'paid')
+			{
+				$amountpaid = $obj->mm;
+				$totalpaid = $totalpaid + $amountpaid;
+			}
 
-            if ($obj->mode == 'paid')
-            {
-            	print '<tr class="oddeven">';
-            	print '<td class="nowrap">'.$obj->dm."</td>\n";
-            	print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
-            	print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
-            	print "</tr>\n";
-            	$amountclaimed = 0;
-            	$amountpaid = 0;
-            	$previousmode = '';
-            	$previousmonth = '';
-            } else {
-            	$previousmode = $obj->mode;
-            	$previousmonth = $obj->dm;
-            }
+			if ($obj->mode == 'paid')
+			{
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">'.$obj->dm."</td>\n";
+				print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
+				print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
+				print "</tr>\n";
+				$amountclaimed = 0;
+				$amountpaid = 0;
+				$previousmode = '';
+				$previousmonth = '';
+			} else {
+				$previousmode = $obj->mode;
+				$previousmonth = $obj->dm;
+			}
 
-            $i++;
-        }
+			$i++;
+		}
 
-        if ($mode == 'claimed' && !empty($previousmode))
-        {
-        	print '<tr class="oddeven">';
-        	print '<td class="nowrap">'.$previousmonth."</td>\n";
-        	print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
-        	print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
-        	print "</tr>\n";
+		if ($mode == 'claimed' && !empty($previousmode))
+		{
+			print '<tr class="oddeven">';
+			print '<td class="nowrap">'.$previousmonth."</td>\n";
+			print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
+			print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
+			print "</tr>\n";
 
-        	$amountclaimed = 0;
-        	$amountpaid = 0;
-        }
+			$amountclaimed = 0;
+			$amountpaid = 0;
+		}
 
-        print '<tr class="liste_total">';
-        print '<td class="right">'.$langs->trans("Total").'</td>';
-        print '<td class="nowrap right">'.price($totalclaimed).'</td>';
-        print '<td class="nowrap right">'.price($totalpaid).'</td>';
-        print "</tr>";
+		print '<tr class="liste_total">';
+		print '<td class="right">'.$langs->trans("Total").'</td>';
+		print '<td class="nowrap right">'.price($totalclaimed).'</td>';
+		print '<td class="nowrap right">'.price($totalpaid).'</td>';
+		print "</tr>";
 
-        print "</table>";
-        $db->free($result);
-    } else {
-        dol_print_error($db);
-    }
+		print "</table>";
+		$db->free($result);
+	} else {
+		dol_print_error($db);
+	}
 }
 
 if (empty($localTaxType))
@@ -259,14 +259,14 @@ print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td width="30%">'.$langs->trans("Year")." ".$y."</td>";
 if ($CalcLT == 0) {
-    print '<td class="right">'.$langs->transcountry($LTCustomer, $mysoc->country_code).'</td>';
-    print '<td class="right">'.$langs->transcountry($LTSupplier, $mysoc->country_code).'</td>';
+	print '<td class="right">'.$langs->transcountry($LTCustomer, $mysoc->country_code).'</td>';
+	print '<td class="right">'.$langs->transcountry($LTSupplier, $mysoc->country_code).'</td>';
 }
 if ($CalcLT == 1) {
-    print '<td class="right">'.$langs->transcountry($LTSupplier, $mysoc->country_code).'</td><td></td>';
+	print '<td class="right">'.$langs->transcountry($LTSupplier, $mysoc->country_code).'</td><td></td>';
 }
 if ($CalcLT == 2) {
-    print '<td class="right">'.$langs->transcountry($LTCustomer, $mysoc->country_code).'</td><td></td>';
+	print '<td class="right">'.$langs->transcountry($LTCustomer, $mysoc->country_code).'</td><td></td>';
 }
 print '<td class="right">'.$langs->trans("TotalToPay").'</td>';
 print "<td>&nbsp;</td>\n";
@@ -414,144 +414,144 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
 	}
 	//now we have an array (x_both) indexed by rates for coll and paye
 
-    $action = "tva";
-    $object = array(&$x_coll, &$x_paye, &$x_both);
-    $parameters["mode"] = $modetax;
-    $parameters["year"] = $y;
-    $parameters["month"] = $m;
-    $parameters["type"] = 'localtax'.$localTaxType;
+	$action = "tva";
+	$object = array(&$x_coll, &$x_paye, &$x_both);
+	$parameters["mode"] = $modetax;
+	$parameters["year"] = $y;
+	$parameters["month"] = $m;
+	$parameters["type"] = 'localtax'.$localTaxType;
 
-    // Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
-    $hookmanager->initHooks(array('externalbalance'));
-    $reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+	// Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
+	$hookmanager->initHooks(array('externalbalance'));
+	$reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-    if (!is_array($x_coll) && $coll_listbuy == -1)
-    {
-        $langs->load("errors");
-        print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
-        break;
-    }
-    if (!is_array($x_paye) && $coll_listbuy == -2)
-    {
-        print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
-        break;
-    }
+	if (!is_array($x_coll) && $coll_listbuy == -1)
+	{
+		$langs->load("errors");
+		print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
+		break;
+	}
+	if (!is_array($x_paye) && $coll_listbuy == -2)
+	{
+		print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
+		break;
+	}
 
 
-    print '<tr class="oddeven">';
-    print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/localtax/quadri_detail.php?leftmenu=tax_vat&month='.$m.'&year='.$y.'">'.dol_print_date(dol_mktime(0, 0, 0, $m, 1, $y), "%b %Y").'</a></td>';
+	print '<tr class="oddeven">';
+	print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/localtax/quadri_detail.php?leftmenu=tax_vat&month='.$m.'&year='.$y.'">'.dol_print_date(dol_mktime(0, 0, 0, $m, 1, $y), "%b %Y").'</a></td>';
 
-    $x_coll_sum = 0;
-    foreach (array_keys($x_coll) as $rate)
-    {
-    	$subtot_coll_total_ht = 0;
-    	$subtot_coll_vat = 0;
+	$x_coll_sum = 0;
+	foreach (array_keys($x_coll) as $rate)
+	{
+		$subtot_coll_total_ht = 0;
+		$subtot_coll_vat = 0;
 
-    	foreach ($x_both[$rate]['coll']['detail'] as $index => $fields)
-    	{
-    		// Payment
-    		$ratiopaymentinvoice = 1;
-    		if ($modetax != 1)
-    		{
-    			// Define type
-    			// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
-    			$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
-    			// Try to enhance type detection using date_start and date_end for free lines where type
-    			// was not saved.
-    			if (!empty($fields['ddate_start'])) {
-    				$type = 1;
-    			}
-    			if (!empty($fields['ddate_end'])) {
-    				$type = 1;
-    			}
+		foreach ($x_both[$rate]['coll']['detail'] as $index => $fields)
+		{
+			// Payment
+			$ratiopaymentinvoice = 1;
+			if ($modetax != 1)
+			{
+				// Define type
+				// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+				$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+				// Try to enhance type detection using date_start and date_end for free lines where type
+				// was not saved.
+				if (!empty($fields['ddate_start'])) {
+					$type = 1;
+				}
+				if (!empty($fields['ddate_end'])) {
+					$type = 1;
+				}
 
-    			if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-    				|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
-    			{
-    				//print $langs->trans("NA");
-    			} else {
-    				if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
-    					$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
-    				}
-    			}
-    		}
-    		//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
-    		$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
-    		$temp_vat = $fields['localtax'.$localTaxType] * $ratiopaymentinvoice;
-    		$subtot_coll_total_ht += $temp_ht;
-    		$subtot_coll_vat      += $temp_vat;
-    		$x_coll_sum           += $temp_vat;
-    	}
-    }
-    print '<td class="nowrap right">'.price(price2num($x_coll_sum, 'MT')).'</td>';
+				if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+					|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
+				{
+					//print $langs->trans("NA");
+				} else {
+					if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+						$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+					}
+				}
+			}
+			//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
+			$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+			$temp_vat = $fields['localtax'.$localTaxType] * $ratiopaymentinvoice;
+			$subtot_coll_total_ht += $temp_ht;
+			$subtot_coll_vat      += $temp_vat;
+			$x_coll_sum           += $temp_vat;
+		}
+	}
+	print '<td class="nowrap right">'.price(price2num($x_coll_sum, 'MT')).'</td>';
 
-    $x_paye_sum = 0;
-    foreach (array_keys($x_paye) as $rate)
-    {
-    	$subtot_paye_total_ht = 0;
-    	$subtot_paye_vat = 0;
+	$x_paye_sum = 0;
+	foreach (array_keys($x_paye) as $rate)
+	{
+		$subtot_paye_total_ht = 0;
+		$subtot_paye_vat = 0;
 
-    	foreach ($x_both[$rate]['paye']['detail'] as $index => $fields)
-    	{
-    		// Payment
-    		$ratiopaymentinvoice = 1;
-    		if ($modetax != 1)
-    		{
-    			// Define type
-    			// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
-    			$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
-    			// Try to enhance type detection using date_start and date_end for free lines where type
-    			// was not saved.
-    			if (!empty($fields['ddate_start'])) {
-    				$type = 1;
-    			}
-    			if (!empty($fields['ddate_end'])) {
-    				$type = 1;
-    			}
+		foreach ($x_both[$rate]['paye']['detail'] as $index => $fields)
+		{
+			// Payment
+			$ratiopaymentinvoice = 1;
+			if ($modetax != 1)
+			{
+				// Define type
+				// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+				$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+				// Try to enhance type detection using date_start and date_end for free lines where type
+				// was not saved.
+				if (!empty($fields['ddate_start'])) {
+					$type = 1;
+				}
+				if (!empty($fields['ddate_end'])) {
+					$type = 1;
+				}
 
-    			if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-    				|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
-    			{
-    				//print $langs->trans("NA");
-    			} else {
-    				if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
-    					$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
-    				}
-    			}
-    		}
-    		//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
-    		$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
-    		$temp_vat = $fields['localtax'.$localTaxType] * $ratiopaymentinvoice;
-    		$subtot_paye_total_ht += $temp_ht;
-    		$subtot_paye_vat      += $temp_vat;
-    		$x_paye_sum           += $temp_vat;
-    	}
-    }
-    print '<td class="nowrap right">'.price(price2num($x_paye_sum, 'MT')).'</td>';
+				if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+					|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
+				{
+					//print $langs->trans("NA");
+				} else {
+					if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+						$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+					}
+				}
+			}
+			//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
+			$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+			$temp_vat = $fields['localtax'.$localTaxType] * $ratiopaymentinvoice;
+			$subtot_paye_total_ht += $temp_ht;
+			$subtot_paye_vat      += $temp_vat;
+			$x_paye_sum           += $temp_vat;
+		}
+	}
+	print '<td class="nowrap right">'.price(price2num($x_paye_sum, 'MT')).'</td>';
 
-    $subtotalcoll = $subtotalcoll + $x_coll_sum;
-    $subtotalpaye = $subtotalpaye + $x_paye_sum;
+	$subtotalcoll = $subtotalcoll + $x_coll_sum;
+	$subtotalpaye = $subtotalpaye + $x_paye_sum;
 
-    $diff = $x_coll_sum - $x_paye_sum;
-    $total = $total + $diff;
-    $subtotal = price2num($subtotal + $diff, 'MT');
+	$diff = $x_coll_sum - $x_paye_sum;
+	$total = $total + $diff;
+	$subtotal = price2num($subtotal + $diff, 'MT');
 
-    print '<td class="nowrap right">'.price(price2num($diff, 'MT')).'</td>'."\n";
-    print "<td>&nbsp;</td>\n";
-    print "</tr>\n";
+	print '<td class="nowrap right">'.price(price2num($diff, 'MT')).'</td>'."\n";
+	print "<td>&nbsp;</td>\n";
+	print "</tr>\n";
 
-    $i++; $m++;
-    if ($i > 2)
-    {
-    	print '<tr class="liste_total">';
-    	print '<td class="right"><a href="quadri_detail.php?leftmenu=tax_vat&q='.round($m / 3).'&year='.$y.'">'.$langs->trans("SubTotal").'</a>:</td>';
-    	print '<td class="nowrap right">'.price(price2num($subtotalcoll, 'MT')).'</td>';
-    	print '<td class="nowrap right">'.price(price2num($subtotalpaye, 'MT')).'</td>';
-    	print '<td class="nowrap right">'.price(price2num($subtotal, 'MT')).'</td>';
-    	print '<td>&nbsp;</td></tr>';
-    	$i = 0;
-    	$subtotalcoll = 0; $subtotalpaye = 0; $subtotal = 0;
-    }
+	$i++; $m++;
+	if ($i > 2)
+	{
+		print '<tr class="liste_total">';
+		print '<td class="right"><a href="quadri_detail.php?leftmenu=tax_vat&q='.round($m / 3).'&year='.$y.'">'.$langs->trans("SubTotal").'</a>:</td>';
+		print '<td class="nowrap right">'.price(price2num($subtotalcoll, 'MT')).'</td>';
+		print '<td class="nowrap right">'.price(price2num($subtotalpaye, 'MT')).'</td>';
+		print '<td class="nowrap right">'.price(price2num($subtotal, 'MT')).'</td>';
+		print '<td>&nbsp;</td></tr>';
+		$i = 0;
+		$subtotalcoll = 0; $subtotalpaye = 0; $subtotal = 0;
+	}
 }
 print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("TotalToPay").':</td><td class="nowrap right">'.price(price2num($total, 'MT')).'</td>';
 print "<td>&nbsp;</td>\n";
diff --git a/htdocs/compta/localtax/list.php b/htdocs/compta/localtax/list.php
index 2702a962281..4d7e2bf0e54 100644
--- a/htdocs/compta/localtax/list.php
+++ b/htdocs/compta/localtax/list.php
@@ -56,45 +56,45 @@ $sql .= " ORDER BY datev DESC";
 $result = $db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
-    $i = 0;
-    $total = 0;
+	$num = $db->num_rows($result);
+	$i = 0;
+	$total = 0;
 
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td class="nowrap" align="left">'.$langs->trans("Ref").'</td>';
-    print "<td>".$langs->trans("Label")."</td>";
-    print "<td>".$langs->trans("PeriodEndDate")."</td>";
-    print '<td class="nowrap" align="left">'.$langs->trans("DatePayment").'</td>';
-    print "<td align=\"right\">".$langs->trans("PayedByThisPayment")."</td>";
-    print "</tr>\n";
-    $var = 1;
-    while ($i < $num)
-    {
-        $obj = $db->fetch_object($result);
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td class="nowrap" align="left">'.$langs->trans("Ref").'</td>';
+	print "<td>".$langs->trans("Label")."</td>";
+	print "<td>".$langs->trans("PeriodEndDate")."</td>";
+	print '<td class="nowrap" align="left">'.$langs->trans("DatePayment").'</td>';
+	print "<td align=\"right\">".$langs->trans("PayedByThisPayment")."</td>";
+	print "</tr>\n";
+	$var = 1;
+	while ($i < $num)
+	{
+		$obj = $db->fetch_object($result);
 
-        print '<tr class="oddeven">';
+		print '<tr class="oddeven">';
 
 		$localtax_static->id = $obj->rowid;
 		$localtax_static->ref = $obj->rowid;
 		print "<td>".$localtax_static->getNomUrl(1)."</td>\n";
-        print "<td>".dol_trunc($obj->label, 40)."</td>\n";
-        print '<td class="left">'.dol_print_date($db->jdate($obj->datev), 'day')."</td>\n";
-        print '<td class="left">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
-        $total = $total + $obj->amount;
+		print "<td>".dol_trunc($obj->label, 40)."</td>\n";
+		print '<td class="left">'.dol_print_date($db->jdate($obj->datev), 'day')."</td>\n";
+		print '<td class="left">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
+		$total = $total + $obj->amount;
 
-        print "<td align=\"right\">".price($obj->amount)."</td>";
-        print "</tr>\n";
+		print "<td align=\"right\">".price($obj->amount)."</td>";
+		print "</tr>\n";
 
-        $i++;
-    }
-    print '<tr class="liste_total"><td colspan="4">'.$langs->trans("Total").'</td>';
-    print '<td class="right">'.price($total).'</td></tr>';
+		$i++;
+	}
+	print '<tr class="liste_total"><td colspan="4">'.$langs->trans("Total").'</td>';
+	print '<td class="right">'.price($total).'</td></tr>';
 
-    print "</table>";
-    $db->free($result);
+	print "</table>";
+	$db->free($result);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // End of page
diff --git a/htdocs/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php
index ebb66778df7..2b0415800ac 100644
--- a/htdocs/compta/localtax/quadri_detail.php
+++ b/htdocs/compta/localtax/quadri_detail.php
@@ -142,16 +142,16 @@ $prevquarter = $q;
 if ($prevquarter > 1) {
 	$prevquarter--;
 } else {
-    $prevquarter = 4;
-    $prevyear--;
+	$prevquarter = 4;
+	$prevyear--;
 }
 $nextyear = $year_start;
 $nextquarter = $q;
 if ($nextquarter < 4) {
 	$nextquarter++;
 } else {
-    $nextquarter = 1;
-    $nextyear++;
+	$nextquarter = 1;
+	$nextyear++;
 }
 $description .= $fsearch;
 $builddate = dol_now();
@@ -370,12 +370,12 @@ if (!is_array($x_coll) || !is_array($x_paye))
 					} else {
 						if ($type) $text = img_object($langs->trans('Service'), 'service');
 						else $text = img_object($langs->trans('Product'), 'product');
-			            if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg))
-			            {
-			                if ($reg[1] == 'DEPOSIT') $fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
-			                elseif ($reg[1] == 'CREDIT_NOTE') $fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
-			                else $fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
-			            }
+						if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg))
+						{
+							if ($reg[1] == 'DEPOSIT') $fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
+							elseif ($reg[1] == 'CREDIT_NOTE') $fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
+							else $fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
+						}
 						print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']), 16);
 
 						// Show range
@@ -438,36 +438,36 @@ if (!is_array($x_coll) || !is_array($x_paye))
 			}
 		}
 
-	    // Total customers for this vat rate
-	    print '<tr class="liste_total">';
-	    print '<td></td>';
-	    print '<td class="right">'.$langs->trans("Total").':</td>';
-	    if ($modetax != 1)
-	    {
-	        print '<td class="nowrap right">&nbsp;</td>';
-	        print '<td class="right">&nbsp;</td>';
-	    }
-	    print '<td class="right">'.price(price2num($subtot_coll_total_ht, 'MT')).'</td>';
-	    print '<td class="nowrap right">'.price(price2num($subtot_coll_vat, 'MT')).'</td>';
-	    print '</tr>';
+		// Total customers for this vat rate
+		print '<tr class="liste_total">';
+		print '<td></td>';
+		print '<td class="right">'.$langs->trans("Total").':</td>';
+		if ($modetax != 1)
+		{
+			print '<td class="nowrap right">&nbsp;</td>';
+			print '<td class="right">&nbsp;</td>';
+		}
+		print '<td class="right">'.price(price2num($subtot_coll_total_ht, 'MT')).'</td>';
+		print '<td class="nowrap right">'.price(price2num($subtot_coll_vat, 'MT')).'</td>';
+		print '</tr>';
 	}
 
-    if (count($x_coll) == 0)   // Show a total ine if nothing shown
-    {
-        print '<tr class="liste_total">';
-        print '<td>&nbsp;</td>';
-        print '<td class="right">'.$langs->trans("Total").':</td>';
-        if ($modetax == 0)
-        {
-            print '<td class="nowrap right">&nbsp;</td>';
-            print '<td class="right">&nbsp;</td>';
-        }
-        print '<td class="right">'.price(price2num(0, 'MT')).'</td>';
-        print '<td class="nowrap right">'.price(price2num(0, 'MT')).'</td>';
-        print '</tr>';
-    }
+	if (count($x_coll) == 0)   // Show a total ine if nothing shown
+	{
+		print '<tr class="liste_total">';
+		print '<td>&nbsp;</td>';
+		print '<td class="right">'.$langs->trans("Total").':</td>';
+		if ($modetax == 0)
+		{
+			print '<td class="nowrap right">&nbsp;</td>';
+			print '<td class="right">&nbsp;</td>';
+		}
+		print '<td class="right">'.price(price2num(0, 'MT')).'</td>';
+		print '<td class="nowrap right">'.price(price2num(0, 'MT')).'</td>';
+		print '</tr>';
+	}
 
-    // Blank line
+	// Blank line
 	print '<tr><td colspan="'.($span + 1).'">&nbsp;</td></tr>';
 	//print '</table>';
 	$diff = $x_coll_sum;
@@ -592,18 +592,18 @@ if (!is_array($x_coll) || !is_array($x_paye))
 			}
 		}
 
-	    // Total suppliers for this vat rate
-	    print '<tr class="liste_total">';
-	    print '<td>&nbsp;</td>';
-	    print '<td class="right">'.$langs->trans("Total").':</td>';
-	    if ($modetax != 1)
-	    {
-	        print '<td class="nowrap right">&nbsp;</td>';
-	        print '<td class="right">&nbsp;</td>';
-	    }
-	    print '<td class="right">'.price(price2num($subtot_paye_total_ht, 'MT')).'</td>';
-	    print '<td class="nowrap right">'.price(price2num($subtot_paye_vat, 'MT')).'</td>';
-	    print '</tr>';
+		// Total suppliers for this vat rate
+		print '<tr class="liste_total">';
+		print '<td>&nbsp;</td>';
+		print '<td class="right">'.$langs->trans("Total").':</td>';
+		if ($modetax != 1)
+		{
+			print '<td class="nowrap right">&nbsp;</td>';
+			print '<td class="right">&nbsp;</td>';
+		}
+		print '<td class="right">'.price(price2num($subtot_paye_total_ht, 'MT')).'</td>';
+		print '<td class="nowrap right">'.price(price2num($subtot_paye_vat, 'MT')).'</td>';
+		print '</tr>';
 	}
 
 	if (count($x_paye) == 0) {  // Show a total line if nothing shown
@@ -620,7 +620,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 	}
 
 	// Total to pay
-    $diff = $x_coll_sum - $x_paye_sum;
+	$diff = $x_coll_sum - $x_paye_sum;
 	print '<tr class="liste_total">';
 	print '<td class="liste_total" colspan="'.$span.'">'.$langs->trans("TotalToPay").($q ? ', '.$langs->trans("Quadri").' '.$q : '').'</td>';
 	print '<td class="liste_total nowrap right"><b>'.price(price2num($diff, 'MT'))."</b></td>\n";
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 9d86cff65dd..a03fd03ffef 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -61,7 +61,7 @@ $multicurrency_amountsresttopay = array();
 // Security check
 if ($user->socid > 0)
 {
-    $socid = $user->socid;
+	$socid = $user->socid;
 }
 
 $object = new Facture($db);
@@ -90,111 +90,111 @@ if (empty($reshook))
 {
 	if ($action == 'add_paiement' || ($action == 'confirm_paiement' && $confirm == 'yes'))
 	{
-	    $error = 0;
+		$error = 0;
 
-	    $datepaye = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-	    $paiement_id = 0;
-	    $totalpayment = 0;
+		$datepaye = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$paiement_id = 0;
+		$totalpayment = 0;
 		$multicurrency_totalpayment = 0;
-	    $atleastonepaymentnotnull = 0;
+		$atleastonepaymentnotnull = 0;
 		$formquestion = array();
 		$i = 0;
 
-	    // Generate payment array and check if there is payment higher than invoice and payment date before invoice date
-	    $tmpinvoice = new Facture($db);
-	    foreach ($_POST as $key => $value)
-	    {
+		// Generate payment array and check if there is payment higher than invoice and payment date before invoice date
+		$tmpinvoice = new Facture($db);
+		foreach ($_POST as $key => $value)
+		{
 			if (substr($key, 0, 7) == 'amount_' && GETPOST($key) != '')
-	        {
-	            $cursorfacid = substr($key, 7);
-	            $amounts[$cursorfacid] = price2num(GETPOST($key));
-	            $totalpayment = $totalpayment + $amounts[$cursorfacid];
-	            if (!empty($amounts[$cursorfacid])) $atleastonepaymentnotnull++;
-	            $result = $tmpinvoice->fetch($cursorfacid);
-	            if ($result <= 0) dol_print_error($db);
-	            $amountsresttopay[$cursorfacid] = price2num($tmpinvoice->total_ttc - $tmpinvoice->getSommePaiement());
-	            if ($amounts[$cursorfacid])
-	            {
-		            // Check amount
-		            if ($amounts[$cursorfacid] && (abs($amounts[$cursorfacid]) > abs($amountsresttopay[$cursorfacid])))
-		            {
-		                $addwarning = 1;
-		                $formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPay")).' '.$langs->trans("HelpPaymentHigherThanReminderToPay");
-		            }
-		            // Check date
-		            if ($datepaye && ($datepaye < $tmpinvoice->date))
-		            {
-		            	$langs->load("errors");
-		                //$error++;
-		                setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye, 'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
-		            }
-	            }
+			{
+				$cursorfacid = substr($key, 7);
+				$amounts[$cursorfacid] = price2num(GETPOST($key));
+				$totalpayment = $totalpayment + $amounts[$cursorfacid];
+				if (!empty($amounts[$cursorfacid])) $atleastonepaymentnotnull++;
+				$result = $tmpinvoice->fetch($cursorfacid);
+				if ($result <= 0) dol_print_error($db);
+				$amountsresttopay[$cursorfacid] = price2num($tmpinvoice->total_ttc - $tmpinvoice->getSommePaiement());
+				if ($amounts[$cursorfacid])
+				{
+					// Check amount
+					if ($amounts[$cursorfacid] && (abs($amounts[$cursorfacid]) > abs($amountsresttopay[$cursorfacid])))
+					{
+						$addwarning = 1;
+						$formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPay")).' '.$langs->trans("HelpPaymentHigherThanReminderToPay");
+					}
+					// Check date
+					if ($datepaye && ($datepaye < $tmpinvoice->date))
+					{
+						$langs->load("errors");
+						//$error++;
+						setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye, 'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
+					}
+				}
 
-	            $formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => $_POST[$key]);
-	        } elseif (substr($key, 0, 21) == 'multicurrency_amount_')
+				$formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => $_POST[$key]);
+			} elseif (substr($key, 0, 21) == 'multicurrency_amount_')
 			{
 				$cursorfacid = substr($key, 21);
-	            $multicurrency_amounts[$cursorfacid] = price2num(GETPOST($key));
-	            $multicurrency_totalpayment += $multicurrency_amounts[$cursorfacid];
-	            if (!empty($multicurrency_amounts[$cursorfacid])) $atleastonepaymentnotnull++;
-	            $result = $tmpinvoice->fetch($cursorfacid);
-	            if ($result <= 0) dol_print_error($db);
-	            $multicurrency_amountsresttopay[$cursorfacid] = price2num($tmpinvoice->multicurrency_total_ttc - $tmpinvoice->getSommePaiement(1));
-	            if ($multicurrency_amounts[$cursorfacid])
-	            {
-		            // Check amount
-		            if ($multicurrency_amounts[$cursorfacid] && (abs($multicurrency_amounts[$cursorfacid]) > abs($multicurrency_amountsresttopay[$cursorfacid])))
-		            {
-		                $addwarning = 1;
-		                $formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPay")).' '.$langs->trans("HelpPaymentHigherThanReminderToPay");
-		            }
-		            // Check date
-		            if ($datepaye && ($datepaye < $tmpinvoice->date))
-		            {
-		            	$langs->load("errors");
-		                //$error++;
-		                setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye, 'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
-		            }
-	            }
+				$multicurrency_amounts[$cursorfacid] = price2num(GETPOST($key));
+				$multicurrency_totalpayment += $multicurrency_amounts[$cursorfacid];
+				if (!empty($multicurrency_amounts[$cursorfacid])) $atleastonepaymentnotnull++;
+				$result = $tmpinvoice->fetch($cursorfacid);
+				if ($result <= 0) dol_print_error($db);
+				$multicurrency_amountsresttopay[$cursorfacid] = price2num($tmpinvoice->multicurrency_total_ttc - $tmpinvoice->getSommePaiement(1));
+				if ($multicurrency_amounts[$cursorfacid])
+				{
+					// Check amount
+					if ($multicurrency_amounts[$cursorfacid] && (abs($multicurrency_amounts[$cursorfacid]) > abs($multicurrency_amountsresttopay[$cursorfacid])))
+					{
+						$addwarning = 1;
+						$formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPay")).' '.$langs->trans("HelpPaymentHigherThanReminderToPay");
+					}
+					// Check date
+					if ($datepaye && ($datepaye < $tmpinvoice->date))
+					{
+						$langs->load("errors");
+						//$error++;
+						setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye, 'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
+					}
+				}
 
-	            $formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => GETPOST($key, 'int'));
+				$formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => GETPOST($key, 'int'));
 			}
-	    }
+		}
 
-	    // Check parameters
-	    if (!GETPOST('paiementcode'))
-	    {
-	        setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('PaymentMode')), null, 'errors');
-	        $error++;
-	    }
+		// Check parameters
+		if (!GETPOST('paiementcode'))
+		{
+			setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('PaymentMode')), null, 'errors');
+			$error++;
+		}
 
-	    if (!empty($conf->banque->enabled))
-	    {
-	        // If bank module is on, account is required to enter a payment
-	        if (GETPOST('accountid') <= 0)
-	        {
-	            setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('AccountToCredit')), null, 'errors');
-	            $error++;
-	        }
-	    }
+		if (!empty($conf->banque->enabled))
+		{
+			// If bank module is on, account is required to enter a payment
+			if (GETPOST('accountid') <= 0)
+			{
+				setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('AccountToCredit')), null, 'errors');
+				$error++;
+			}
+		}
 
-	    if (empty($totalpayment) && empty($multicurrency_totalpayment) && empty($atleastonepaymentnotnull))
-	    {
-	        setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->trans('PaymentAmount')), null, 'errors');
-	        $error++;
-	    }
+		if (empty($totalpayment) && empty($multicurrency_totalpayment) && empty($atleastonepaymentnotnull))
+		{
+			setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->trans('PaymentAmount')), null, 'errors');
+			$error++;
+		}
 
-	    if (empty($datepaye))
-	    {
-	        setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('Date')), null, 'errors');
-	        $error++;
-	    }
+		if (empty($datepaye))
+		{
+			setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('Date')), null, 'errors');
+			$error++;
+		}
 
 		// Check if payments in both currency
 		if ($totalpayment > 0 && $multicurrency_totalpayment > 0)
 		{
 			setEventMessages($langs->transnoentities('ErrorPaymentInBothCurrency'), null, 'errors');
-	        $error++;
+			$error++;
 		}
 	}
 
@@ -203,11 +203,11 @@ if (empty($reshook))
 	 */
 	if ($action == 'add_paiement')
 	{
-	    if ($error)
-	    {
-	        $action = 'create';
-	    }
-	    // Le reste propre a cette action s'affiche en bas de page.
+		if ($error)
+		{
+			$action = 'create';
+		}
+		// The next of this action is displayed at the page's bottom.
 	}
 
 	/*
@@ -215,103 +215,103 @@ if (empty($reshook))
 	 */
 	if ($action == 'confirm_paiement' && $confirm == 'yes')
 	{
-	    $error = 0;
+		$error = 0;
 
-	    $datepaye = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$datepaye = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 
-	    $db->begin();
+		$db->begin();
 
-	    $thirdparty = new Societe($db);
-	    if ($socid > 0) $thirdparty->fetch($socid);
+		$thirdparty = new Societe($db);
+		if ($socid > 0) $thirdparty->fetch($socid);
 
-	    // Clean parameters amount if payment is for a credit note
-	    foreach ($amounts as $key => $value)	// How payment is dispatched
-	    {
-	        $tmpinvoice = new Facture($db);
-	        $tmpinvoice->fetch($key);
-	        if ($tmpinvoice->type == Facture::TYPE_CREDIT_NOTE)
-	        {
-	            $newvalue = price2num($value, 'MT');
-	            $amounts[$key] = - abs($newvalue);
-	        }
-	    }
+		// Clean parameters amount if payment is for a credit note
+		foreach ($amounts as $key => $value)	// How payment is dispatched
+		{
+			$tmpinvoice = new Facture($db);
+			$tmpinvoice->fetch($key);
+			if ($tmpinvoice->type == Facture::TYPE_CREDIT_NOTE)
+			{
+				$newvalue = price2num($value, 'MT');
+				$amounts[$key] = - abs($newvalue);
+			}
+		}
 
-	    foreach ($multicurrency_amounts as $key => $value)	// How payment is dispatched
-	    {
-	        $tmpinvoice = new Facture($db);
-	        $tmpinvoice->fetch($key);
-	        if ($tmpinvoice->type == Facture::TYPE_CREDIT_NOTE)
-	        {
-	            $newvalue = price2num($value, 'MT');
-	            $multicurrency_amounts[$key] = - abs($newvalue);
-	        }
-	    }
+		foreach ($multicurrency_amounts as $key => $value)	// How payment is dispatched
+		{
+			$tmpinvoice = new Facture($db);
+			$tmpinvoice->fetch($key);
+			if ($tmpinvoice->type == Facture::TYPE_CREDIT_NOTE)
+			{
+				$newvalue = price2num($value, 'MT');
+				$multicurrency_amounts[$key] = - abs($newvalue);
+			}
+		}
 
-	    if (!empty($conf->banque->enabled))
-	    {
-	    	// Si module bank actif, un compte est obligatoire lors de la saisie d'un paiement
-	    	if (GETPOST('accountid', 'int') <= 0)
-	    	{
-	    		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('AccountToCredit')), null, 'errors');
-	    		$error++;
-	    	}
-	    }
+		if (!empty($conf->banque->enabled))
+		{
+			// If the bank module is active, an account is required to input a payment
+			if (GETPOST('accountid', 'int') <= 0)
+			{
+				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('AccountToCredit')), null, 'errors');
+				$error++;
+			}
+		}
 
-	    // Creation of payment line
-	    $paiement = new Paiement($db);
-	    $paiement->datepaye     = $datepaye;
-	    $paiement->amounts      = $amounts; // Array with all payments dispatching with invoice id
-	    $paiement->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
-	    $paiement->paiementid   = dol_getIdFromCode($db, GETPOST('paiementcode'), 'c_paiement', 'code', 'id', 1);
-	    $paiement->num_payment  = GETPOST('num_paiement', 'alpha');
-	    $paiement->note_private = GETPOST('comment', 'alpha');
+		// Creation of payment line
+		$paiement = new Paiement($db);
+		$paiement->datepaye     = $datepaye;
+		$paiement->amounts      = $amounts; // Array with all payments dispatching with invoice id
+		$paiement->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
+		$paiement->paiementid   = dol_getIdFromCode($db, GETPOST('paiementcode'), 'c_paiement', 'code', 'id', 1);
+		$paiement->num_payment  = GETPOST('num_paiement', 'alpha');
+		$paiement->note_private = GETPOST('comment', 'alpha');
 
-	    if (!$error)
-	    {
-	        // Create payment and update this->multicurrency_amounts if this->amounts filled or
-	        // this->amounts if this->multicurrency_amounts filled.
-	        $paiement_id = $paiement->create($user, (GETPOST('closepaidinvoices') == 'on' ? 1 : 0), $thirdparty); // This include closing invoices and regenerating documents
-	    	if ($paiement_id < 0)
-	        {
-	            setEventMessages($paiement->error, $paiement->errors, 'errors');
-	            $error++;
-	        }
-	    }
+		if (!$error)
+		{
+			// Create payment and update this->multicurrency_amounts if this->amounts filled or
+			// this->amounts if this->multicurrency_amounts filled.
+			$paiement_id = $paiement->create($user, (GETPOST('closepaidinvoices') == 'on' ? 1 : 0), $thirdparty); // This include closing invoices and regenerating documents
+			if ($paiement_id < 0)
+			{
+				setEventMessages($paiement->error, $paiement->errors, 'errors');
+				$error++;
+			}
+		}
 
-	    if (!$error)
-	    {
-	    	$label = '(CustomerInvoicePayment)';
-	    	if (GETPOST('type') == Facture::TYPE_CREDIT_NOTE) $label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
-	        $result = $paiement->addPaymentToBank($user, 'payment', $label, GETPOST('accountid'), GETPOST('chqemetteur'), GETPOST('chqbank'));
-	        if ($result < 0)
-	        {
-	            setEventMessages($paiement->error, $paiement->errors, 'errors');
-	            $error++;
-	        }
-	    }
+		if (!$error)
+		{
+			$label = '(CustomerInvoicePayment)';
+			if (GETPOST('type') == Facture::TYPE_CREDIT_NOTE) $label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
+			$result = $paiement->addPaymentToBank($user, 'payment', $label, GETPOST('accountid'), GETPOST('chqemetteur'), GETPOST('chqbank'));
+			if ($result < 0)
+			{
+				setEventMessages($paiement->error, $paiement->errors, 'errors');
+				$error++;
+			}
+		}
 
-	    if (!$error)
-	    {
-	        $db->commit();
+		if (!$error)
+		{
+			$db->commit();
 
-	        // If payment dispatching on more than one invoice, we stay on summary page, otherwise jump on invoice card
-	        $invoiceid = 0;
-	        foreach ($paiement->amounts as $key => $amount)
-	        {
-	            $facid = $key;
-	            if (is_numeric($amount) && $amount <> 0)
-	            {
-	                if ($invoiceid != 0) $invoiceid = -1; // There is more than one invoice payed by this payment
-	                else $invoiceid = $facid;
-	            }
-	        }
-	        if ($invoiceid > 0) $loc = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$invoiceid;
-	        else $loc = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$paiement_id;
-	        header('Location: '.$loc);
-	        exit;
-	    } else {
-	        $db->rollback();
-	    }
+			// If payment dispatching on more than one invoice, we stay on summary page, otherwise jump on invoice card
+			$invoiceid = 0;
+			foreach ($paiement->amounts as $key => $amount)
+			{
+				$facid = $key;
+				if (is_numeric($amount) && $amount <> 0)
+				{
+					if ($invoiceid != 0) $invoiceid = -1; // There is more than one invoice payed by this payment
+					else $invoiceid = $facid;
+				}
+			}
+			if ($invoiceid > 0) $loc = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$invoiceid;
+			else $loc = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$paiement_id;
+			header('Location: '.$loc);
+			exit;
+		} else {
+			$db->rollback();
+		}
 	}
 }
 
@@ -469,77 +469,77 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 		print '<input type="hidden" name="type" id="invoice_type" value="'.$facture->type.'">';
 		print '<input type="hidden" name="thirdpartylabel" id="thirdpartylabel" value="'.dol_escape_htmltag($facture->thirdparty->name).'">';
 
-		dol_fiche_head();
+		print dol_get_fiche_head();
 
 		print '<table class="border centpercent">';
 
-        // Third party
-        print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans('Company').'</span></td><td>'.$facture->thirdparty->getNomUrl(4)."</td></tr>\n";
+		// Third party
+		print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans('Company').'</span></td><td>'.$facture->thirdparty->getNomUrl(4)."</td></tr>\n";
 
-        // Date payment
-        print '<tr><td><span class="fieldrequired">'.$langs->trans('Date').'</span></td><td>';
-        $datepayment = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
-        $datepayment = ($datepayment == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datepayment);
-        print $form->selectDate($datepayment, '', '', '', 0, "add_paiement", 1, 1, 0, '', '', $facture->date);
-        print '</td></tr>';
+		// Date payment
+		print '<tr><td><span class="fieldrequired">'.$langs->trans('Date').'</span></td><td>';
+		$datepayment = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+		$datepayment = ($datepayment == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datepayment);
+		print $form->selectDate($datepayment, '', '', '', 0, "add_paiement", 1, 1, 0, '', '', $facture->date);
+		print '</td></tr>';
 
-        // Payment mode
-        print '<tr><td><span class="fieldrequired">'.$langs->trans('PaymentMode').'</span></td><td>';
-        $form->select_types_paiements((GETPOST('paiementcode') ?GETPOST('paiementcode') : $facture->mode_reglement_code), 'paiementcode', '', 2);
-        print "</td>\n";
-        print '</tr>';
+		// Payment mode
+		print '<tr><td><span class="fieldrequired">'.$langs->trans('PaymentMode').'</span></td><td>';
+		$form->select_types_paiements((GETPOST('paiementcode') ?GETPOST('paiementcode') : $facture->mode_reglement_code), 'paiementcode', '', 2);
+		print "</td>\n";
+		print '</tr>';
 
-        // Bank account
-        print '<tr>';
-        if (!empty($conf->banque->enabled))
-        {
-            if ($facture->type != 2) print '<td><span class="fieldrequired">'.$langs->trans('AccountToCredit').'</span></td>';
-            if ($facture->type == 2) print '<td><span class="fieldrequired">'.$langs->trans('AccountToDebit').'</span></td>';
-            print '<td>';
-            $form->select_comptes($accountid, 'accountid', 0, '', 2);
-            print '</td>';
-        } else {
-            print '<td>&nbsp;</td>';
-        }
-        print "</tr>\n";
+		// Bank account
+		print '<tr>';
+		if (!empty($conf->banque->enabled))
+		{
+			if ($facture->type != 2) print '<td><span class="fieldrequired">'.$langs->trans('AccountToCredit').'</span></td>';
+			if ($facture->type == 2) print '<td><span class="fieldrequired">'.$langs->trans('AccountToDebit').'</span></td>';
+			print '<td>';
+			$form->select_comptes($accountid, 'accountid', 0, '', 2);
+			print '</td>';
+		} else {
+			print '<td>&nbsp;</td>';
+		}
+		print "</tr>\n";
 
-        // Cheque number
-        print '<tr><td>'.$langs->trans('Numero');
-        print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
-        print '</td>';
-        print '<td><input name="num_paiement" type="text" value="'.$paymentnum.'"></td></tr>';
+		// Bank check number
+		print '<tr><td>'.$langs->trans('Numero');
+		print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
+		print '</td>';
+		print '<td><input name="num_paiement" type="text" value="'.$paymentnum.'"></td></tr>';
 
-        // Check transmitter
-        print '<tr><td class="'.(GETPOST('paiementcode') == 'CHQ' ? 'fieldrequired ' : '').'fieldrequireddyn">'.$langs->trans('CheckTransmitter');
-        print ' <em>('.$langs->trans("ChequeMaker").')</em>';
-        print '</td>';
-        print '<td><input id="fieldchqemetteur" name="chqemetteur" size="30" type="text" value="'.GETPOST('chqemetteur', 'alphanohtml').'"></td></tr>';
+		// Check transmitter
+		print '<tr><td class="'.(GETPOST('paiementcode') == 'CHQ' ? 'fieldrequired ' : '').'fieldrequireddyn">'.$langs->trans('CheckTransmitter');
+		print ' <em>('.$langs->trans("ChequeMaker").')</em>';
+		print '</td>';
+		print '<td><input id="fieldchqemetteur" name="chqemetteur" size="30" type="text" value="'.GETPOST('chqemetteur', 'alphanohtml').'"></td></tr>';
 
-        // Bank name
-        print '<tr><td>'.$langs->trans('Bank');
-        print ' <em>('.$langs->trans("ChequeBank").')</em>';
-        print '</td>';
-        print '<td><input name="chqbank" size="30" type="text" value="'.GETPOST('chqbank', 'alphanohtml').'"></td></tr>';
+		// Bank name
+		print '<tr><td>'.$langs->trans('Bank');
+		print ' <em>('.$langs->trans("ChequeBank").')</em>';
+		print '</td>';
+		print '<td><input name="chqbank" size="30" type="text" value="'.GETPOST('chqbank', 'alphanohtml').'"></td></tr>';
 
 		// Comments
 		print '<tr><td>'.$langs->trans('Comments').'</td>';
 		print '<td class="tdtop">';
 		print '<textarea name="comment" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.GETPOST('comment', 'restricthtml').'</textarea></td></tr>';
 
-        print '</table>';
+		print '</table>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
-        /*
+		/*
          * List of unpaid invoices
          */
 
-        $sql = 'SELECT f.rowid as facid, f.ref, f.total_ttc, f.multicurrency_code, f.multicurrency_total_ttc, f.type,';
-        $sql .= ' f.datef as df, f.fk_soc as socid, f.date_lim_reglement as dlr';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'facture as f';
+		$sql = 'SELECT f.rowid as facid, f.ref, f.total_ttc, f.multicurrency_code, f.multicurrency_total_ttc, f.type,';
+		$sql .= ' f.datef as df, f.fk_soc as socid, f.date_lim_reglement as dlr';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture as f';
 		$sql .= ' WHERE f.entity IN ('.getEntity('facture').')';
-        $sql .= ' AND (f.fk_soc = '.$facture->socid;
+		$sql .= ' AND (f.fk_soc = '.$facture->socid;
 		// Can pay invoices of all child of parent company
 		if (!empty($conf->global->FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS) && !empty($facture->thirdparty->parent)) {
 			$sql .= ' OR f.fk_soc IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'societe WHERE parent = '.$facture->thirdparty->parent.')';
@@ -548,23 +548,23 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 		if (!empty($conf->global->FACTURE_PAYMENTS_ON_SUBSIDIARY_COMPANIES)) {
 			$sql .= ' OR f.fk_soc IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'societe WHERE parent = '.$facture->thirdparty->id.')';
 		}
-        $sql .= ') AND f.paye = 0';
-        $sql .= ' AND f.fk_statut = 1'; // Statut=0 => not validated, Statut=2 => canceled
-        if ($facture->type != Facture::TYPE_CREDIT_NOTE)
-        {
-            $sql .= ' AND type IN (0,1,3,5)'; // Standard invoice, replacement, deposit, situation
-        } else {
-            $sql .= ' AND type = 2'; // If paying back a credit note, we show all credit notes
-        }
-        // Sort invoices by date and serial number: the older one comes first
-        $sql .= ' ORDER BY f.datef ASC, f.ref ASC';
+		$sql .= ') AND f.paye = 0';
+		$sql .= ' AND f.fk_statut = 1'; // Statut=0 => not validated, Statut=2 => canceled
+		if ($facture->type != Facture::TYPE_CREDIT_NOTE)
+		{
+			$sql .= ' AND type IN (0,1,3,5)'; // Standard invoice, replacement, deposit, situation
+		} else {
+			$sql .= ' AND type = 2'; // If paying back a credit note, we show all credit notes
+		}
+		// Sort invoices by date and serial number: the older one comes first
+		$sql .= ' ORDER BY f.datef ASC, f.ref ASC';
 
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $num = $db->num_rows($resql);
-            if ($num > 0)
-            {
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$num = $db->num_rows($resql);
+			if ($num > 0)
+			{
 				$arraytitle = $langs->trans('Invoice');
 				if ($facture->type == 2) $arraytitle = $langs->trans("CreditNotes");
 				$alreadypayedlabel = $langs->trans('Received');
@@ -574,55 +574,55 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 				$multicurrencyremaindertopay = $langs->trans('MulticurrencyRemainderToTake');
 				if ($facture->type == 2) { $remaindertopay = $langs->trans("RemainderToPayBack"); $multicurrencyremaindertopay = $langs->trans("MulticurrencyRemainderToPayBack"); }
 
-                $i = 0;
-                //print '<tr><td colspan="3">';
-                print '<br>';
-                print '<table class="noborder centpercent">';
+				$i = 0;
+				//print '<tr><td colspan="3">';
+				print '<br>';
+				print '<table class="noborder centpercent">';
 
-                print '<tr class="liste_titre">';
-                print '<td>'.$arraytitle.'</td>';
-                print '<td class="center">'.$langs->trans('Date').'</td>';
-                print '<td class="center">'.$langs->trans('DateMaxPayment').'</td>';
-                if (!empty($conf->multicurrency->enabled)) {
-                	print '<td>'.$langs->trans('Currency').'</td>';
-                	print '<td class="right">'.$langs->trans('MulticurrencyAmountTTC').'</td>';
-                	print '<td class="right">'.$multicurrencyalreadypayedlabel.'</td>';
-                	print '<td class="right">'.$multicurrencyremaindertopay.'</td>';
-                	print '<td class="right">'.$langs->trans('MulticurrencyPaymentAmount').'</td>';
-                }
-                print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
-                print '<td class="right">'.$alreadypayedlabel.'</td>';
-                print '<td class="right">'.$remaindertopay.'</td>';
-                print '<td class="right">'.$langs->trans('PaymentAmount').'</td>';
+				print '<tr class="liste_titre">';
+				print '<td>'.$arraytitle.'</td>';
+				print '<td class="center">'.$langs->trans('Date').'</td>';
+				print '<td class="center">'.$langs->trans('DateMaxPayment').'</td>';
+				if (!empty($conf->multicurrency->enabled)) {
+					print '<td>'.$langs->trans('Currency').'</td>';
+					print '<td class="right">'.$langs->trans('MulticurrencyAmountTTC').'</td>';
+					print '<td class="right">'.$multicurrencyalreadypayedlabel.'</td>';
+					print '<td class="right">'.$multicurrencyremaindertopay.'</td>';
+					print '<td class="right">'.$langs->trans('MulticurrencyPaymentAmount').'</td>';
+				}
+				print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
+				print '<td class="right">'.$alreadypayedlabel.'</td>';
+				print '<td class="right">'.$remaindertopay.'</td>';
+				print '<td class="right">'.$langs->trans('PaymentAmount').'</td>';
 
-                $parameters = array();
-                $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $facture, $action); // Note that $action and $object may have been modified by hook
+				$parameters = array();
+				$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $facture, $action); // Note that $action and $object may have been modified by hook
 
-                print '<td align="right">&nbsp;</td>';
-                print "</tr>\n";
+				print '<td align="right">&nbsp;</td>';
+				print "</tr>\n";
 
-                $total = 0;
-                $totalrecu = 0;
-                $totalrecucreditnote = 0;
-                $totalrecudeposits = 0;
+				$total = 0;
+				$totalrecu = 0;
+				$totalrecucreditnote = 0;
+				$totalrecudeposits = 0;
 
-                while ($i < $num)
-                {
-                    $objp = $db->fetch_object($resql);
+				while ($i < $num)
+				{
+					$objp = $db->fetch_object($resql);
 
-                    $sign = 1;
-                    if ($facture->type == Facture::TYPE_CREDIT_NOTE) $sign = -1;
+					$sign = 1;
+					if ($facture->type == Facture::TYPE_CREDIT_NOTE) $sign = -1;
 
 					$soc = new Societe($db);
 					$soc->fetch($objp->socid);
 
-                    $invoice = new Facture($db);
-                    $invoice->fetch($objp->facid);
-                    $paiement = $invoice->getSommePaiement();
-                    $creditnotes = $invoice->getSumCreditNotesUsed();
-                    $deposits = $invoice->getSumDepositsUsed();
-                    $alreadypayed = price2num($paiement + $creditnotes + $deposits, 'MT');
-                    $remaintopay = price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits, 'MT');
+					$invoice = new Facture($db);
+					$invoice->fetch($objp->facid);
+					$paiement = $invoice->getSommePaiement();
+					$creditnotes = $invoice->getSumCreditNotesUsed();
+					$deposits = $invoice->getSumDepositsUsed();
+					$alreadypayed = price2num($paiement + $creditnotes + $deposits, 'MT');
+					$remaintopay = price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits, 'MT');
 
 					// Multicurrency Price
 					if (!empty($conf->multicurrency->enabled)) {
@@ -630,209 +630,209 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 						$multicurrency_creditnotes = $invoice->getSumCreditNotesUsed(1);
 						$multicurrency_deposits = $invoice->getSumDepositsUsed(1);
 						$multicurrency_alreadypayed = price2num($multicurrency_payment + $multicurrency_creditnotes + $multicurrency_deposits, 'MT');
-	                    $multicurrency_remaintopay = price2num($invoice->multicurrency_total_ttc - $multicurrency_payment - $multicurrency_creditnotes - $multicurrency_deposits, 'MT');
+						$multicurrency_remaintopay = price2num($invoice->multicurrency_total_ttc - $multicurrency_payment - $multicurrency_creditnotes - $multicurrency_deposits, 'MT');
 					}
 
 
 					print '<tr class="oddeven'.(($invoice->id == $facid) ? ' highlight' : '').'">';
 
 					print '<td class="nowraponall">';
-                    print $invoice->getNomUrl(1, '');
-                    if ($objp->socid != $facture->thirdparty->id) print ' - '.$soc->getNomUrl(1).' ';
-                    print "</td>\n";
+					print $invoice->getNomUrl(1, '');
+					if ($objp->socid != $facture->thirdparty->id) print ' - '.$soc->getNomUrl(1).' ';
+					print "</td>\n";
 
-                    // Date
-                   	print '<td class="center">'.dol_print_date($db->jdate($objp->df), 'day')."</td>\n";
+					// Date
+				   	print '<td class="center">'.dol_print_date($db->jdate($objp->df), 'day')."</td>\n";
 
-                    // Due date
-                    if ($objp->dlr > 0)
-                    {
-                        print '<td class="nowraponall center">';
-                        print dol_print_date($db->jdate($objp->dlr), 'day');
+					// Due date
+					if ($objp->dlr > 0)
+					{
+						print '<td class="nowraponall center">';
+						print dol_print_date($db->jdate($objp->dlr), 'day');
 
-                        if ($invoice->hasDelay())
-                        {
-                            print img_warning($langs->trans('Late'));
-                        }
+						if ($invoice->hasDelay())
+						{
+							print img_warning($langs->trans('Late'));
+						}
 
-                        print '</td>';
-                    } else {
-                        print '<td align="center"></td>';
-                    }
+						print '</td>';
+					} else {
+						print '<td align="center"></td>';
+					}
 
-                    // Currency
-                    if (!empty($conf->multicurrency->enabled)) print '<td class="center">'.$objp->multicurrency_code."</td>\n";
+					// Currency
+					if (!empty($conf->multicurrency->enabled)) print '<td class="center">'.$objp->multicurrency_code."</td>\n";
 
 					// Multicurrency Price
 					if (!empty($conf->multicurrency->enabled))
 					{
-					    print '<td class="right">';
-					    if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $objp->multicurrency_total_ttc);
-					    print '</td>';
+						print '<td class="right">';
+						if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $objp->multicurrency_total_ttc);
+						print '</td>';
 
-                    	// Multicurrency Price
+						// Multicurrency Price
 						print '<td class="right">';
 						if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
 						{
-						    print price($sign * $multicurrency_payment);
-    		                if ($multicurrency_creditnotes) print '+'.price($multicurrency_creditnotes);
-    		                if ($multicurrency_deposits) print '+'.price($multicurrency_deposits);
+							print price($sign * $multicurrency_payment);
+							if ($multicurrency_creditnotes) print '+'.price($multicurrency_creditnotes);
+							if ($multicurrency_deposits) print '+'.price($multicurrency_deposits);
 						}
-		                print '</td>';
+						print '</td>';
 
-    					// Multicurrency remain to pay
-    				    print '<td class="right">';
-    				    if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $multicurrency_remaintopay);
-    				    print '</td>';
+						// Multicurrency remain to pay
+						print '<td class="right">';
+						if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $multicurrency_remaintopay);
+						print '</td>';
 
-    				    print '<td class="right nowraponall">';
+						print '<td class="right nowraponall">';
 
-    				    // Add remind multicurrency amount
-    				    $namef = 'multicurrency_amount_'.$objp->facid;
-    				    $nameRemain = 'multicurrency_remain_'.$objp->facid;
+						// Add remind multicurrency amount
+						$namef = 'multicurrency_amount_'.$objp->facid;
+						$nameRemain = 'multicurrency_remain_'.$objp->facid;
 
-    				    if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
-    				    {
-    				    	if ($action != 'add_paiement')
-    				    	{
-    				    		if (!empty($conf->use_javascript_ajax))
-    				    			print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $multicurrency_remaintopay)."'");
-   				    			print '<input type="text" class="maxwidth75 multicurrency_amount" name="'.$namef.'" value="'.$_POST[$namef].'">';
-   				    			print '<input type="hidden" class="multicurrency_remain" name="'.$nameRemain.'" value="'.$multicurrency_remaintopay.'">';
-    				    	} else {
-    				    		print '<input type="text" class="maxwidth75" name="'.$namef.'_disabled" value="'.$_POST[$namef].'" disabled>';
-    				    		print '<input type="hidden" name="'.$namef.'" value="'.$_POST[$namef].'">';
-    				    	}
-    				    }
-    				    print "</td>";
+						if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
+						{
+							if ($action != 'add_paiement')
+							{
+								if (!empty($conf->use_javascript_ajax))
+									print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $multicurrency_remaintopay)."'");
+   								print '<input type="text" class="maxwidth75 multicurrency_amount" name="'.$namef.'" value="'.$_POST[$namef].'">';
+   								print '<input type="hidden" class="multicurrency_remain" name="'.$nameRemain.'" value="'.$multicurrency_remaintopay.'">';
+							} else {
+								print '<input type="text" class="maxwidth75" name="'.$namef.'_disabled" value="'.$_POST[$namef].'" disabled>';
+								print '<input type="hidden" name="'.$namef.'" value="'.$_POST[$namef].'">';
+							}
+						}
+						print "</td>";
 					}
 
 					// Price
-                    print '<td class="right">'.price($sign * $objp->total_ttc).'</td>';
+					print '<td class="right">'.price($sign * $objp->total_ttc).'</td>';
 
-                    // Received or paid back
-                    print '<td class="right">'.price($sign * $paiement);
-                    if ($creditnotes) print '+'.price($creditnotes);
-                    if ($deposits) print '+'.price($deposits);
-                    print '</td>';
+					// Received or paid back
+					print '<td class="right">'.price($sign * $paiement);
+					if ($creditnotes) print '+'.price($creditnotes);
+					if ($deposits) print '+'.price($deposits);
+					print '</td>';
 
-                    // Remain to take or to pay back
-                    print '<td class="right">'.price($sign * $remaintopay).'</td>';
-                    //$test= price(price2num($objp->total_ttc - $paiement - $creditnotes - $deposits));
+					// Remain to take or to pay back
+					print '<td class="right">'.price($sign * $remaintopay).'</td>';
+					//$test= price(price2num($objp->total_ttc - $paiement - $creditnotes - $deposits));
 
-                    // Amount
-                    print '<td class="right nowraponall">';
+					// Amount
+					print '<td class="right nowraponall">';
 
-                    // Add remind amount
-                    $namef = 'amount_'.$objp->facid;
-                    $nameRemain = 'remain_'.$objp->facid;
+					// Add remind amount
+					$namef = 'amount_'.$objp->facid;
+					$nameRemain = 'remain_'.$objp->facid;
 
-                    if ($action != 'add_paiement')
-                    {
-                        if (!empty($conf->use_javascript_ajax))
+					if ($action != 'add_paiement')
+					{
+						if (!empty($conf->use_javascript_ajax))
 							print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
-                        print '<input type="text" class="maxwidth75 amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
-                        print '<input type="hidden" class="remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
-                    } else {
-                        print '<input type="text" class="maxwidth75" name="'.$namef.'_disabled" value="'.dol_escape_htmltag(GETPOST($namef)).'" disabled>';
-                        print '<input type="hidden" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
-                    }
-                    print "</td>";
+						print '<input type="text" class="maxwidth75 amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
+						print '<input type="hidden" class="remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
+					} else {
+						print '<input type="text" class="maxwidth75" name="'.$namef.'_disabled" value="'.dol_escape_htmltag(GETPOST($namef)).'" disabled>';
+						print '<input type="hidden" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
+					}
+					print "</td>";
 
-                    $parameters = array();
-                    $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook
+					$parameters = array();
+					$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook
 
-                    // Warning
-                    print '<td align="center" width="16">';
-                    //print "xx".$amounts[$invoice->id]."-".$amountsresttopay[$invoice->id]."<br>";
-                    if ($amounts[$invoice->id] && (abs($amounts[$invoice->id]) > abs($amountsresttopay[$invoice->id]))
-                    	|| $multicurrency_amounts[$invoice->id] && (abs($multicurrency_amounts[$invoice->id]) > abs($multicurrency_amountsresttopay[$invoice->id])))
-                    {
-                        print ' '.img_warning($langs->trans("PaymentHigherThanReminderToPay"));
-                    }
-                    print '</td>';
+					// Warning
+					print '<td align="center" width="16">';
+					//print "xx".$amounts[$invoice->id]."-".$amountsresttopay[$invoice->id]."<br>";
+					if ($amounts[$invoice->id] && (abs($amounts[$invoice->id]) > abs($amountsresttopay[$invoice->id]))
+						|| $multicurrency_amounts[$invoice->id] && (abs($multicurrency_amounts[$invoice->id]) > abs($multicurrency_amountsresttopay[$invoice->id])))
+					{
+						print ' '.img_warning($langs->trans("PaymentHigherThanReminderToPay"));
+					}
+					print '</td>';
 
-                    print "</tr>\n";
+					print "</tr>\n";
 
-                    $total += $objp->total;
-                    $total_ttc += $objp->total_ttc;
-                    $totalrecu += $paiement;
-                    $totalrecucreditnote += $creditnotes;
-                    $totalrecudeposits += $deposits;
-                    $i++;
-                }
+					$total += $objp->total;
+					$total_ttc += $objp->total_ttc;
+					$totalrecu += $paiement;
+					$totalrecucreditnote += $creditnotes;
+					$totalrecudeposits += $deposits;
+					$i++;
+				}
 
-                if ($i > 1)
-                {
-                    // Print total
-                    print '<tr class="liste_total">';
-                    print '<td colspan="3" class="left">'.$langs->trans('TotalTTC').'</td>';
-                    if (!empty($conf->multicurrency->enabled)) {
-                    	print '<td></td>';
-                    	print '<td></td>';
-                    	print '<td></td>';
-                    	print '<td></td>';
-                    	print '<td class="right" id="multicurrency_result" style="font-weight: bold;"></td>';
-                    }
+				if ($i > 1)
+				{
+					// Print total
+					print '<tr class="liste_total">';
+					print '<td colspan="3" class="left">'.$langs->trans('TotalTTC').'</td>';
+					if (!empty($conf->multicurrency->enabled)) {
+						print '<td></td>';
+						print '<td></td>';
+						print '<td></td>';
+						print '<td></td>';
+						print '<td class="right" id="multicurrency_result" style="font-weight: bold;"></td>';
+					}
 					print '<td class="right"><b>'.price($sign * $total_ttc).'</b></td>';
-                    print '<td class="right"><b>'.price($sign * $totalrecu);
-                    if ($totalrecucreditnote) print '+'.price($totalrecucreditnote);
-                    if ($totalrecudeposits) print '+'.price($totalrecudeposits);
-                    print '</b></td>';
-                    print '<td class="right"><b>'.price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT')).'</b></td>';
-                    print '<td class="right" id="result" style="font-weight: bold;"></td>'; // Autofilled
-                    print '<td align="center">&nbsp;</td>';
-                    print "</tr>\n";
-                }
-                print "</table>";
-                //print "</td></tr>\n";
-            }
-            $db->free($resql);
-        } else {
-            dol_print_error($db);
-        }
+					print '<td class="right"><b>'.price($sign * $totalrecu);
+					if ($totalrecucreditnote) print '+'.price($totalrecucreditnote);
+					if ($totalrecudeposits) print '+'.price($totalrecudeposits);
+					print '</b></td>';
+					print '<td class="right"><b>'.price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT')).'</b></td>';
+					print '<td class="right" id="result" style="font-weight: bold;"></td>'; // Autofilled
+					print '<td align="center">&nbsp;</td>';
+					print "</tr>\n";
+				}
+				print "</table>";
+				//print "</td></tr>\n";
+			}
+			$db->free($resql);
+		} else {
+			dol_print_error($db);
+		}
 
 
-        // Bouton Enregistrer
-        if ($action != 'add_paiement')
-        {
-        	$checkboxlabel = $langs->trans("ClosePaidInvoicesAutomatically");
-        	if ($facture->type == Facture::TYPE_CREDIT_NOTE) $checkboxlabel = $langs->trans("ClosePaidCreditNotesAutomatically");
-        	$buttontitle = $langs->trans('ToMakePayment');
-        	if ($facture->type == Facture::TYPE_CREDIT_NOTE) $buttontitle = $langs->trans('ToMakePaymentBack');
+		// Save button
+		if ($action != 'add_paiement')
+		{
+			$checkboxlabel = $langs->trans("ClosePaidInvoicesAutomatically");
+			if ($facture->type == Facture::TYPE_CREDIT_NOTE) $checkboxlabel = $langs->trans("ClosePaidCreditNotesAutomatically");
+			$buttontitle = $langs->trans('ToMakePayment');
+			if ($facture->type == Facture::TYPE_CREDIT_NOTE) $buttontitle = $langs->trans('ToMakePaymentBack');
 
-        	print '<br><div class="center">';
-        	print '<input type="checkbox" checked name="closepaidinvoices"> '.$checkboxlabel;
-            /*if (! empty($conf->prelevement->enabled))
+			print '<br><div class="center">';
+			print '<input type="checkbox" checked name="closepaidinvoices"> '.$checkboxlabel;
+			/*if (! empty($conf->prelevement->enabled))
             {
                 $langs->load("withdrawals");
                 if (! empty($conf->global->WITHDRAW_DISABLE_AUTOCREATE_ONPAYMENTS)) print '<br>'.$langs->trans("IfInvoiceNeedOnWithdrawPaymentWontBeClosed");
             }*/
-            print '<br><input type="submit" class="button" value="'.dol_escape_htmltag($buttontitle).'"><br><br>';
-            print '</div>';
-        }
+			print '<br><input type="submit" class="button" value="'.dol_escape_htmltag($buttontitle).'"><br><br>';
+			print '</div>';
+		}
 
-        // Form to confirm payment
-        if ($action == 'add_paiement')
-        {
-            $preselectedchoice = $addwarning ? 'no' : 'yes';
+		// Form to confirm payment
+		if ($action == 'add_paiement')
+		{
+			$preselectedchoice = $addwarning ? 'no' : 'yes';
 
-            print '<br>';
-            if (!empty($totalpayment)) $text = $langs->trans('ConfirmCustomerPayment', $totalpayment, $langs->trans("Currency".$conf->currency));
+			print '<br>';
+			if (!empty($totalpayment)) $text = $langs->trans('ConfirmCustomerPayment', $totalpayment, $langs->trans("Currency".$conf->currency));
 			if (!empty($multicurrency_totalpayment))
 			{
 				$text .= '<br>'.$langs->trans('ConfirmCustomerPayment', $multicurrency_totalpayment, $langs->trans("paymentInInvoiceCurrency"));
 			}
-            if (GETPOST('closepaidinvoices'))
-            {
-                $text .= '<br>'.$langs->trans("AllCompletelyPayedInvoiceWillBeClosed");
-                print '<input type="hidden" name="closepaidinvoices" value="'.GETPOST('closepaidinvoices').'">';
-            }
-            print $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$facture->id.'&socid='.$facture->socid.'&type='.$facture->type, $langs->trans('ReceivedCustomersPayments'), $text, 'confirm_paiement', $formquestion, $preselectedchoice);
-        }
+			if (GETPOST('closepaidinvoices'))
+			{
+				$text .= '<br>'.$langs->trans("AllCompletelyPayedInvoiceWillBeClosed");
+				print '<input type="hidden" name="closepaidinvoices" value="'.GETPOST('closepaidinvoices').'">';
+			}
+			print $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$facture->id.'&socid='.$facture->socid.'&type='.$facture->type, $langs->trans('ReceivedCustomersPayments'), $text, 'confirm_paiement', $formquestion, $preselectedchoice);
+		}
 
-        print "</form>\n";
-    }
+		print "</form>\n";
+	}
 }
 
 
@@ -841,62 +841,62 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
  */
 if (!GETPOST('action', 'aZ09'))
 {
-    if (empty($page) || $page == -1) $page = 0;
-    $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-    $offset = $limit * $page;
+	if (empty($page) || $page == -1) $page = 0;
+	$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+	$offset = $limit * $page;
 
-    if (!$sortorder) $sortorder = 'DESC';
-    if (!$sortfield) $sortfield = 'p.datep';
+	if (!$sortorder) $sortorder = 'DESC';
+	if (!$sortfield) $sortfield = 'p.datep';
 
-    $sql = 'SELECT p.datep as dp, p.amount, f.total_ttc as fa_amount, f.ref';
-    $sql .= ', f.rowid as facid, c.libelle as paiement_type, p.num_paiement as num_payment';
-    $sql .= ' FROM '.MAIN_DB_PREFIX.'paiement as p LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id';
-    $sql .= ', '.MAIN_DB_PREFIX.'facture as f';
-    $sql .= ' WHERE p.fk_facture = f.rowid';
-    $sql .= ' AND f.entity IN ('.getEntity('invoice').')';
-    if ($socid)
-    {
-        $sql .= ' AND f.fk_soc = '.$socid;
-    }
+	$sql = 'SELECT p.datep as dp, p.amount, f.total_ttc as fa_amount, f.ref';
+	$sql .= ', f.rowid as facid, c.libelle as paiement_type, p.num_paiement as num_payment';
+	$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement as p LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id';
+	$sql .= ', '.MAIN_DB_PREFIX.'facture as f';
+	$sql .= ' WHERE p.fk_facture = f.rowid';
+	$sql .= ' AND f.entity IN ('.getEntity('invoice').')';
+	if ($socid)
+	{
+		$sql .= ' AND f.fk_soc = '.$socid;
+	}
 
-    $sql .= ' ORDER BY '.$sortfield.' '.$sortorder;
-    $sql .= $db->plimit($limit + 1, $offset);
-    $resql = $db->query($sql);
+	$sql .= ' ORDER BY '.$sortfield.' '.$sortorder;
+	$sql .= $db->plimit($limit + 1, $offset);
+	$resql = $db->query($sql);
 
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
 
-        print_barre_liste($langs->trans('Payments'), $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', $num);
-        print '<table class="noborder centpercent">';
-        print '<tr class="liste_titre">';
-        print_liste_field_titre('Invoice', $_SERVER["PHP_SELF"], 'f.ref', '', '', '', $sortfield, $sortorder);
-        print_liste_field_titre('Date', $_SERVER["PHP_SELF"], 'p.datep', '', '', '', $sortfield, $sortorder);
-        print_liste_field_titre('Type', $_SERVER["PHP_SELF"], 'c.libelle', '', '', '', $sortfield, $sortorder);
-        print_liste_field_titre('Amount', $_SERVER["PHP_SELF"], 'p.amount', '', '', '', $sortfield, $sortorder, 'right ');
+		print_barre_liste($langs->trans('Payments'), $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', $num);
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print_liste_field_titre('Invoice', $_SERVER["PHP_SELF"], 'f.ref', '', '', '', $sortfield, $sortorder);
+		print_liste_field_titre('Date', $_SERVER["PHP_SELF"], 'p.datep', '', '', '', $sortfield, $sortorder);
+		print_liste_field_titre('Type', $_SERVER["PHP_SELF"], 'c.libelle', '', '', '', $sortfield, $sortorder);
+		print_liste_field_titre('Amount', $_SERVER["PHP_SELF"], 'p.amount', '', '', '', $sortfield, $sortorder, 'right ');
 		print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
-        print "</tr>\n";
+		print "</tr>\n";
 
-        while ($i < min($num, $limit))
-        {
-            $objp = $db->fetch_object($resql);
+		while ($i < min($num, $limit))
+		{
+			$objp = $db->fetch_object($resql);
 
-            print '<tr class="oddeven">';
-            print '<td><a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$objp->facid.'">'.$objp->ref."</a></td>\n";
-            print '<td>'.dol_print_date($db->jdate($objp->dp))."</td>\n";
-            print '<td>'.$objp->paiement_type.' '.$objp->num_payment."</td>\n";
-            print '<td class="right">'.price($objp->amount).'</td>';
-            print '<td>&nbsp;</td>';
-            print '</tr>';
+			print '<tr class="oddeven">';
+			print '<td><a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$objp->facid.'">'.$objp->ref."</a></td>\n";
+			print '<td>'.dol_print_date($db->jdate($objp->dp))."</td>\n";
+			print '<td>'.$objp->paiement_type.' '.$objp->num_payment."</td>\n";
+			print '<td class="right">'.price($objp->amount).'</td>';
+			print '<td>&nbsp;</td>';
+			print '</tr>';
 
-            $parameters = array();
-            $reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook
 
-            $i++;
-        }
-        print '</table>';
-    }
+			$i++;
+		}
+		print '</table>';
+	}
 }
 
 llxFooter();
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index dd7651a6147..9d452ef52b3 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -57,18 +57,18 @@ $object = new Paiement($db);
 
 if ($action == 'setnote' && $user->rights->facture->paiement)
 {
-    $db->begin();
+	$db->begin();
 
-    $object->fetch($id);
-    $result = $object->update_note(GETPOST('note', 'restricthtml'));
-    if ($result > 0)
-    {
-        $db->commit();
-        $action = '';
-    } else {
-	    setEventMessages($object->error, $object->errors, 'errors');
-        $db->rollback();
-    }
+	$object->fetch($id);
+	$result = $object->update_note(GETPOST('note', 'restricthtml'));
+	if ($result > 0)
+	{
+		$db->commit();
+		$action = '';
+	} else {
+		setEventMessages($object->error, $object->errors, 'errors');
+		$db->rollback();
+	}
 }
 
 if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->facture->paiement)
@@ -79,29 +79,29 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->facture->
 	$result = $object->delete();
 	if ($result > 0)
 	{
-        $db->commit();
+		$db->commit();
 
-        if ($backtopage)
-        {
-        	header("Location: ".$backtopage);
-        	exit;
-        } else {
-        	header("Location: list.php");
-        	exit;
-        }
+		if ($backtopage)
+		{
+			header("Location: ".$backtopage);
+			exit;
+		} else {
+			header("Location: list.php");
+			exit;
+		}
 	} else {
-	    $langs->load("errors");
+		$langs->load("errors");
 		setEventMessages($object->error, $object->errors, 'errors');
-        $db->rollback();
+		$db->rollback();
 	}
 }
 
-if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->facture->paiement)
+if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->facture->paiement)
 {
 	$db->begin();
 
-    $object->fetch($id);
-	if ($object->valide($user) > 0)
+	$object->fetch($id);
+	if ($object->validate($user) > 0)
 	{
 		$db->commit();
 
@@ -126,7 +126,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->facture->
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id);
 		exit;
 	} else {
-	    $langs->load("errors");
+		$langs->load("errors");
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 	}
@@ -135,7 +135,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->facture->
 if ($action == 'setnum_paiement' && !empty($_POST['num_paiement']))
 {
 	$object->fetch($id);
-    $res = $object->update_num($_POST['num_paiement']);
+	$res = $object->update_num($_POST['num_paiement']);
 	if ($res === 0)
 	{
 		setEventMessages($langs->trans('PaymentNumberUpdateSucceeded'), null, 'mesgs');
@@ -177,19 +177,19 @@ $form = new Form($db);
 
 $head = payment_prepare_head($object);
 
-dol_fiche_head($head, 'payment', $langs->trans("PaymentCustomerInvoice"), -1, 'payment');
+print dol_get_fiche_head($head, 'payment', $langs->trans("PaymentCustomerInvoice"), -1, 'payment');
 
-// Confirmation de la suppression du paiement
+// Confirmation of payment delete
 if ($action == 'delete')
 {
 	print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete', '', 0, 2);
 }
 
-// Confirmation de la validation du paiement
+// Confirmation of payment validation
 if ($action == 'valide')
 {
 	$facid = $_GET['facid'];
-	print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide', '', 0, 2);
+	print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_validate', '', 0, 2);
 }
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
@@ -299,7 +299,7 @@ print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 /*
@@ -332,9 +332,9 @@ if ($resql)
 	print '<td>'.$langs->trans('Company').'</td>';
 	if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED)) print '<td>'.$langs->trans('Entity').'</td>';
 	print '<td class="right">'.$langs->trans('ExpectedToPay').'</td>';
-    print '<td class="right">'.$langs->trans('PayedByThisPayment').'</td>';
-    print '<td class="right">'.$langs->trans('RemainderToPay').'</td>';
-    print '<td class="right">'.$langs->trans('Status').'</td>';
+	print '<td class="right">'.$langs->trans('PayedByThisPayment').'</td>';
+	print '<td class="right">'.$langs->trans('RemainderToPay').'</td>';
+	print '<td class="right">'.$langs->trans('Status').'</td>';
 	print "</tr>\n";
 
 	if ($num > 0)
@@ -356,7 +356,7 @@ if ($resql)
 
 			print '<tr class="oddeven">';
 
-            // Invoice
+			// Invoice
 			print '<td>';
 			print $invoice->getNomUrl(1);
 			print "</td>\n";
@@ -376,11 +376,11 @@ if ($resql)
 			// Expected to pay
 			print '<td class="right">'.price($objp->total_ttc).'</td>';
 
-            // Amount payed
-            print '<td class="right">'.price($objp->amount).'</td>';
+			// Amount payed
+			print '<td class="right">'.price($objp->amount).'</td>';
 
-            // Remain to pay
-            print '<td class="right">'.price($remaintopay).'</td>';
+			// Remain to pay
+			print '<td class="right">'.price($remaintopay).'</td>';
 
 			// Status
 			print '<td class="right">'.$invoice->getLibStatut(5, $alreadypayed).'</td>';
@@ -408,7 +408,7 @@ if ($resql)
 
 
 /*
- * Boutons Actions
+ * Actions Buttons
  */
 
 print '<div class="tabsAction">';
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 71cd900f915..4b93cb4cca3 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2011-2016	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2013 		Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2015-2016	Alexandre Spangaro		<aspangaro@open-dsi.fr>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric 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
@@ -68,37 +68,37 @@ $object = new RemiseCheque($db);
 
 if ($action == 'setdate' && $user->rights->banque->cheque)
 {
-    $result = $object->fetch(GETPOST('id', 'int'));
-    if ($result > 0)
-    {
-        //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
-        $date = dol_mktime(0, 0, 0, $_POST['datecreate_month'], $_POST['datecreate_day'], $_POST['datecreate_year']);
+	$result = $object->fetch(GETPOST('id', 'int'));
+	if ($result > 0)
+	{
+		//print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
+		$date = dol_mktime(0, 0, 0, $_POST['datecreate_month'], $_POST['datecreate_day'], $_POST['datecreate_year']);
 
-        $result = $object->set_date($user, $date);
-        if ($result < 0)
-        {
+		$result = $object->set_date($user, $date);
+		if ($result < 0)
+		{
 			setEventMessages($object->error, $object->errors, 'errors');
-        }
-    } else {
-        setEventMessages($object->error, $object->errors, 'errors');
-    }
+		}
+	} else {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
 }
 
 if ($action == 'setrefext' && $user->rights->banque->cheque)
 {
-    $result = $object->fetch(GETPOST('id', 'int'));
-    if ($result > 0)
-    {
-        $ref_ext = GETPOST('ref_ext');
+	$result = $object->fetch(GETPOST('id', 'int'));
+	if ($result > 0)
+	{
+		$ref_ext = GETPOST('ref_ext');
 
-        $result = $object->setValueFrom('ref_ext', $ref_ext, '', null, 'text', '', $user, 'CHECKDEPOSIT_MODIFY');
-        if ($result < 0)
-        {
-            setEventMessages($object->error, $object->errors, 'errors');
-        }
-    } else {
-        setEventMessages($object->error, $object->errors, 'errors');
-    }
+		$result = $object->setValueFrom('ref_ext', $ref_ext, '', null, 'text', '', $user, 'CHECKDEPOSIT_MODIFY');
+		if ($result < 0)
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	} else {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
 }
 
 if ($action == 'setref' && $user->rights->banque->cheque)
@@ -125,30 +125,30 @@ if ($action == 'create' && $_POST["accountid"] > 0 && $user->rights->banque->che
 		$result = $object->create($user, $_POST["accountid"], 0, $_POST['toRemise']);
 		if ($result > 0)
 		{
-	        if ($object->statut == 1)     // If statut is validated, we build doc
-	        {
-	            $object->fetch($object->id); // To force to reload all properties in correct property name
-	    	    // Define output language
-	    	    $outputlangs = $langs;
-	            $newlang = '';
-	            if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id'])) $newlang = $_REQUEST['lang_id'];
-	            //if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-	            if (!empty($newlang))
-	            {
-	                $outputlangs = new Translate("", $conf);
-	                $outputlangs->setDefaultLang($newlang);
-	            }
-	            $result = $object->generatePdf($_POST["model"], $outputlangs);
-	        }
+			if ($object->statut == 1)     // If statut is validated, we build doc
+			{
+				$object->fetch($object->id); // To force to reload all properties in correct property name
+				// Define output language
+				$outputlangs = $langs;
+				$newlang = '';
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id'])) $newlang = $_REQUEST['lang_id'];
+				//if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+				if (!empty($newlang))
+				{
+					$outputlangs = new Translate("", $conf);
+					$outputlangs->setDefaultLang($newlang);
+				}
+				$result = $object->generatePdf($_POST["model"], $outputlangs);
+			}
 
-       		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
-        	exit;
+	   		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
+			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} else {
 		setEventMessages($langs->trans("ErrorSelectAtLeastOne"), null, 'mesgs');
-	    $action = 'new';
+		$action = 'new';
 	}
 }
 
@@ -178,25 +178,25 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->banque->c
 	}
 }
 
-if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->banque->cheque)
+if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->banque->cheque)
 {
 	$result = $object->fetch($id);
 	$result = $object->validate($user);
 	if ($result >= 0)
 	{
-        // Define output language
-        $outputlangs = $langs;
-        $newlang = '';
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id'])) $newlang = $_REQUEST['lang_id'];
-        //if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-        if (!empty($newlang))
-        {
-            $outputlangs = new Translate("", $conf);
-            $outputlangs->setDefaultLang($newlang);
-        }
-        $result = $object->generatePdf(GETPOST('model'), $outputlangs);
+		// Define output language
+		$outputlangs = $langs;
+		$newlang = '';
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id'])) $newlang = $_REQUEST['lang_id'];
+		//if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+		if (!empty($newlang))
+		{
+			$outputlangs = new Translate("", $conf);
+			$outputlangs->setDefaultLang($newlang);
+		}
+		$result = $object->generatePdf(GETPOST('model'), $outputlangs);
 
-        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
+		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 		exit;
 	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
@@ -229,15 +229,15 @@ if ($action == 'builddoc' && $user->rights->banque->cheque)
 	// Save last template used to generate document
 	//if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
 
-    $outputlangs = $langs;
-    $newlang = '';
-    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id'])) $newlang = $_REQUEST['lang_id'];
-    //if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-    if (!empty($newlang))
-    {
-        $outputlangs = new Translate("", $conf);
-        $outputlangs->setDefaultLang($newlang);
-    }
+	$outputlangs = $langs;
+	$newlang = '';
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id'])) $newlang = $_REQUEST['lang_id'];
+	//if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+	if (!empty($newlang))
+	{
+		$outputlangs = new Translate("", $conf);
+		$outputlangs->setDefaultLang($newlang);
+	}
 	$result = $object->generatePdf($_POST["model"], $outputlangs);
 	if ($result <= 0)
 	{
@@ -270,8 +270,8 @@ elseif ($action == 'remove_file' && $user->rights->banque->cheque)
 
 if (GETPOST('removefilter'))
 {
-    $filterdate = '';
-    $filteraccountid = 0;
+	$filterdate = '';
+	$filteraccountid = 0;
 }
 
 $title = $langs->trans("Cheques")." - ".$langs->trans("Card");
@@ -309,10 +309,10 @@ if ($action == 'new')
 	//  $head[$h][1] = $langs->trans("Info");
 	//  $h++;
 
-	dol_fiche_head($head, $hselected, $langs->trans("Cheques"), -1, 'payment');
+	print dol_get_fiche_head($head, $hselected, $langs->trans("Cheques"), -1, 'payment');
 
 	/*
-	 * Confirmation de la suppression du bordereau
+	 * Confirmation of slip's delete
 	 */
 	if ($action == 'delete')
 	{
@@ -320,11 +320,11 @@ if ($action == 'new')
 	}
 
 	/*
-	 * Confirmation de la validation du bordereau
+	 * Confirmation of slip's validation
 	 */
 	if ($action == 'valide')
 	{
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("ValidateCheckReceipt"), $langs->trans("ConfirmValidateCheckReceipt"), 'confirm_valide', '', '', 1);
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("ValidateCheckReceipt"), $langs->trans("ConfirmValidateCheckReceipt"), 'confirm_validate', '', '', 1);
 	}
 
 	/*
@@ -357,7 +357,7 @@ if ($action == 'new')
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="new">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">';
 	//print '<tr><td width="30%">'.$langs->trans('Date').'</td><td width="70%">'.dol_print_date($now,'day').'</td></tr>';
@@ -365,27 +365,27 @@ if ($action == 'new')
 	print '<tr><td class="titlefieldcreate">'.$langs->trans("DateChequeReceived").'</td><td>';
 	print $form->selectDate($filterdate, 'fd', 0, 0, 1, '', 1, 1);
 	print '</td></tr>';
-    print '<tr><td>'.$langs->trans("BankAccount").'</td><td>';
-    $form->select_comptes($filteraccountid, 'accountid', 0, 'courant <> 2', 1);
-    print '</td></tr>';
+	print '<tr><td>'.$langs->trans("BankAccount").'</td><td>';
+	$form->select_comptes($filteraccountid, 'accountid', 0, 'courant <> 2', 1);
+	print '</td></tr>';
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '<div class="center">';
+	print '<div class="center">';
 	print '<input type="submit" class="button" name="filter" value="'.dol_escape_htmltag($langs->trans("ToFilter")).'">';
-    if ($filterdate || $filteraccountid > 0)
-    {
-    	print ' &nbsp; ';
-    	print '<input type="submit" class="button" name="removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-    }
+	if ($filterdate || $filteraccountid > 0)
+	{
+		print ' &nbsp; ';
+		print '<input type="submit" class="button" name="removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+	}
 	print '</div>';
-    print '</form>';
+	print '</form>';
 	print '<br>';
 
 	$sql = "SELECT ba.rowid as bid, b.datec as datec, b.dateo as date, b.rowid as transactionid, ";
 	$sql .= " b.amount, ba.label, b.emetteur, b.num_chq, b.banque,";
-	$sql .= " p.rowid as paymentid";
+	$sql .= " p.rowid as paymentid, p.ref as paymentref";
 	$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement as p ON p.fk_bank = b.rowid";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON (b.fk_account = ba.rowid)";
@@ -394,7 +394,7 @@ if ($action == 'new')
 	$sql .= " AND b.fk_bordereau = 0";
 	$sql .= " AND b.amount > 0";
 	if ($filterdate)          $sql .= " AND b.dateo = '".$db->idate($filterdate)."'";
-    if ($filteraccountid > 0) $sql .= " AND ba.rowid = ".((int) $filteraccountid);
+	if ($filteraccountid > 0) $sql .= " AND ba.rowid = ".((int) $filteraccountid);
 	$sql .= $db->order("b.dateo,b.rowid", "ASC");
 
 	$resql = $db->query($sql);
@@ -411,6 +411,7 @@ if ($action == 'new')
 			$lines[$obj->bid][$i]["banque"] = $obj->banque;
 			$lines[$obj->bid][$i]["id"] = $obj->transactionid;
 			$lines[$obj->bid][$i]["paymentid"] = $obj->paymentid;
+			$lines[$obj->bid][$i]["paymentref"] = $obj->paymentref;
 			$i++;
 		}
 
@@ -422,7 +423,7 @@ if ($action == 'new')
 
 	foreach ($accounts as $bid => $account_label)
 	{
-        print '
+		print '
         <script language="javascript" type="text/javascript">
         jQuery(document).ready(function()
         {
@@ -445,8 +446,8 @@ if ($action == 'new')
 		print '<input type="hidden" name="accountid" value="'.$bid.'">';
 
 		$moreforfilter = '';
-        print '<div class="div-table-responsive-no-min">';
-        print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("DateChequeReceived").'</td>'."\n";
@@ -482,7 +483,7 @@ if ($action == 'new')
 				// Link to payment
 				print '<td class="center">';
 				$paymentstatic->id = $value["paymentid"];
-				$paymentstatic->ref = $value["paymentid"];
+				$paymentstatic->ref = $value["paymentref"];
 				if ($paymentstatic->id)
 				{
 					print $paymentstatic->getNomUrl(1);
@@ -510,7 +511,7 @@ if ($action == 'new')
 			}
 		}
 		print "</table>";
-        print '</div>';
+		print '</div>';
 
 		print '<div class="tabsAction">';
 		if ($user->rights->banque->cheque)
@@ -542,23 +543,23 @@ if ($action == 'new')
 
 	print '<tr><td class="titlefield">';
 
-    print '<table class="nobordernopadding" width="100%"><tr><td>';
-    print $langs->trans('Date');
-    print '</td>';
-    if ($action != 'editdate') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
-    print '</tr></table>';
-    print '</td><td colspan="2">';
-    if ($action == 'editdate')
-    {
-        print '<form name="setdate" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-        print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<input type="hidden" name="action" value="setdate">';
-        print $form->selectDate($object->date_bordereau, 'datecreate_', '', '', '', "setdate");
-        print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
-        print '</form>';
-    } else {
-        print $object->date_bordereau ? dol_print_date($object->date_bordereau, 'day') : '&nbsp;';
-    }
+	print '<table class="nobordernopadding" width="100%"><tr><td>';
+	print $langs->trans('Date');
+	print '</td>';
+	if ($action != 'editdate') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="2">';
+	if ($action == 'editdate')
+	{
+		print '<form name="setdate" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="action" value="setdate">';
+		print $form->selectDate($object->date_bordereau, 'datecreate_', '', '', '', "setdate");
+		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+		print '</form>';
+	} else {
+		print $object->date_bordereau ? dol_print_date($object->date_bordereau, 'day') : '&nbsp;';
+	}
 
 	print '</td>';
 	print '</tr>';
@@ -595,7 +596,7 @@ if ($action == 'new')
 	print $accountstatic->getNomUrl(1);
 	print '</td></tr>';
 
-	// Nb of cheques
+	// Number of bank checks
 	print '<tr><td>'.$langs->trans('NbOfCheques').'</td><td colspan="2">';
 	print $object->nbcheque;
 	print '</td></tr>';
@@ -613,10 +614,10 @@ if ($action == 'new')
 	print '</div>';
 
 
-	// List of cheques
+	// List of bank checks
 	$sql = "SELECT b.rowid, b.amount, b.num_chq, b.emetteur,";
 	$sql .= " b.dateo as date, b.datec as datec, b.banque,";
-	$sql .= " p.rowid as pid, ba.rowid as bid, p.statut";
+	$sql .= " p.rowid as pid, p.ref as pref, ba.rowid as bid, p.statut";
 	$sql .= " FROM ".MAIN_DB_PREFIX."bank_account as ba";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON (b.fk_account = ba.rowid)";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement as p ON p.fk_bank = b.rowid";
@@ -630,7 +631,7 @@ if ($action == 'new')
 	{
 		$num = $db->num_rows($resql);
 
-	    print '<div class="div-table-responsive">';
+		print '<div class="div-table-responsive">';
 		print '<table class="noborder centpercent">';
 
 		$param = "&amp;id=".$object->id;
@@ -648,66 +649,64 @@ if ($action == 'new')
 		print "</tr>\n";
 
 		$i = 1;
-        if ($num > 0)
-        {
-    		while ($objp = $db->fetch_object($resql))
-    		{
-    			print '<tr class="oddeven">';
-    			print '<td class="center">'.$i.'</td>';
-    			print '<td class="center">'.dol_print_date($db->jdate($objp->date), 'day').'</td>'; // Date operation
-    			print '<td class="center">'.($objp->num_chq ? $objp->num_chq : '&nbsp;').'</td>';
-    			print '<td>'.dol_trunc($objp->emetteur, 24).'</td>';
-    			print '<td>'.dol_trunc($objp->banque, 24).'</td>';
-    			print '<td class="right">'.price($objp->amount).'</td>';
-    			// Link to payment
-    			print '<td class="center">';
-    			$paymentstatic->id = $objp->pid;
-    			$paymentstatic->ref = $objp->pid;
-    			if ($paymentstatic->id)
-    			{
-    				print $paymentstatic->getNomUrl(1);
-    			} else {
-    				print '&nbsp;';
-    			}
-    			print '</td>';
-    			// Link to bank transaction
-    			print '<td class="center">';
-    			$accountlinestatic->rowid = $objp->rowid;
-    			if ($accountlinestatic->rowid)
-    			{
-    				print $accountlinestatic->getNomUrl(1);
-    			} else {
-    				print '&nbsp;';
-    			}
-    			print '</td>';
-    			// Action button
-    			print '<td class="right">';
-    			if ($object->statut == 0)
-    			{
-    				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=remove&amp;lineid='.$objp->rowid.'">'.img_delete().'</a>';
-    			}
-       			if ($object->statut == 1 && $objp->statut != 2)
-       			{
-       				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reject_check&amp;lineid='.$objp->rowid.'">'.img_picto($langs->trans("RejectCheck"), 'disable').'</a>';
-       			}
-    			if ($objp->statut == 2)
-    			{
-    				print ' &nbsp; '.img_picto($langs->trans('CheckRejected'), 'statut8').'</a>';
-    			}
-    		    print '</td>';
-    			print '</tr>';
+		if ($num > 0)
+		{
+			while ($objp = $db->fetch_object($resql))
+			{
+				print '<tr class="oddeven">';
+				print '<td class="center">'.$i.'</td>';
+				print '<td class="center">'.dol_print_date($db->jdate($objp->date), 'day').'</td>'; // Operation date
+				print '<td class="center">'.($objp->num_chq ? $objp->num_chq : '&nbsp;').'</td>';
+				print '<td>'.dol_trunc($objp->emetteur, 24).'</td>';
+				print '<td>'.dol_trunc($objp->banque, 24).'</td>';
+				print '<td class="right">'.price($objp->amount).'</td>';
+				// Link to payment
+				print '<td class="center">';
+				$paymentstatic->id = $objp->pid;
+				$paymentstatic->ref = $objp->pref;
+				if ($paymentstatic->id) {
+					print $paymentstatic->getNomUrl(1);
+				} else {
+					print '&nbsp;';
+				}
+				print '</td>';
+				// Link to bank transaction
+				print '<td class="center">';
+				$accountlinestatic->rowid = $objp->rowid;
+				if ($accountlinestatic->rowid) {
+					print $accountlinestatic->getNomUrl(1);
+				} else {
+					print '&nbsp;';
+				}
+				print '</td>';
+				// Action button
+				print '<td class="right">';
+				if ($object->statut == 0)
+				{
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=remove&amp;lineid='.$objp->rowid.'">'.img_delete().'</a>';
+				}
+	   			if ($object->statut == 1 && $objp->statut != 2)
+	   			{
+	   				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reject_check&amp;lineid='.$objp->rowid.'">'.img_picto($langs->trans("RejectCheck"), 'disable').'</a>';
+	   			}
+				if ($objp->statut == 2)
+				{
+					print ' &nbsp; '.img_picto($langs->trans('CheckRejected'), 'statut8').'</a>';
+				}
+				print '</td>';
+				print '</tr>';
 
-    			$i++;
-    		}
-        } else {
-            print '<td colspan="8" class="opacitymedium">';
-            print $langs->trans("None");
-            print '</td>';
-        }
+				$i++;
+			}
+		} else {
+			print '<td colspan="8" class="opacitymedium">';
+			print $langs->trans("None");
+			print '</td>';
+		}
 
 		print "</table>";
 
-		// Cheque denormalized data nbcheque is similar to real number of cheque
+		// Cheque denormalized data nbcheque is similar to real number of bank check
 		if ($num > 0 && $i < ($object->nbcheque + 1)) {
 			// Show warning that some records were removed.
 			$langs->load("errors");
@@ -720,14 +719,14 @@ if ($action == 'new')
 		dol_print_error($db);
 	}
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 
 
 
 /*
- * Boutons Actions
+ * Actions Buttons
  */
 
 print '<div class="tabsAction">';
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 00815c90f7d..4e22d8f141a 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -74,12 +74,12 @@ class RemiseCheque extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
-    {
+	public function __construct($db)
+	{
 		$this->db = $db;
 		$this->next_id = 0;
 		$this->previous_id = 0;
-    }
+	}
 
 	/**
 	 *	Load record
@@ -88,8 +88,8 @@ class RemiseCheque extends CommonObject
 	 *	@param 	string	$ref		 	Ref record
 	 * 	@return	int						<0 if KO, > 0 if OK
 	 */
-    public function fetch($id, $ref = '')
-    {
+	public function fetch($id, $ref = '')
+	{
 		global $conf;
 
 		$sql = "SELECT bc.rowid, bc.datec, bc.fk_user_author, bc.fk_bank_account, bc.amount, bc.ref, bc.statut, bc.nbcheque, bc.ref_ext";
@@ -98,7 +98,7 @@ class RemiseCheque extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON bc.fk_bank_account = ba.rowid";
 		$sql .= " WHERE bc.entity = ".$conf->entity;
-		if ($id)  $sql .= " AND bc.rowid = ".$id;
+		if ($id)  $sql .= " AND bc.rowid = ".((int) $id);
 		if ($ref) $sql .= " AND bc.ref = '".$this->db->escape($ref)."'";
 
 		dol_syslog("RemiseCheque::fetch", LOG_DEBUG);
@@ -128,10 +128,10 @@ class RemiseCheque extends CommonObject
 
 			return 1;
 		} else {
-		    $this->error = $this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
-    }
+	}
 
 	/**
 	 *	Create a receipt to send cheques
@@ -142,8 +142,8 @@ class RemiseCheque extends CommonObject
 	 *  @param	array	$toRemise		array with cheques to remise
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-    public function create($user, $account_id, $limit, $toRemise)
-    {
+	public function create($user, $account_id, $limit, $toRemise)
+	{
 		global $conf;
 
 		$this->errno = 0;
@@ -269,22 +269,22 @@ class RemiseCheque extends CommonObject
 			$this->errno = $this->db->lasterrno();
 		}
 
-	    if (!$this->errno && !empty($conf->global->MAIN_DISABLEDRAFTSTATUS))
-        {
-            $res = $this->validate($user);
-            //if ($res < 0) $error++;
-        }
+		if (!$this->errno && !empty($conf->global->MAIN_DISABLEDRAFTSTATUS))
+		{
+			$res = $this->validate($user);
+			//if ($res < 0) $error++;
+		}
 
-        if (!$this->errno)
-        {
-            $this->db->commit();
-            dol_syslog("RemiseCheque::Create end", LOG_DEBUG);
-            return $this->id;
-        } else {
-            $this->db->rollback();
-            dol_syslog("RemiseCheque::Create end", LOG_DEBUG);
-            return $this->errno;
-        }
+		if (!$this->errno)
+		{
+			$this->db->commit();
+			dol_syslog("RemiseCheque::Create end", LOG_DEBUG);
+			return $this->id;
+		} else {
+			$this->db->rollback();
+			dol_syslog("RemiseCheque::Create end", LOG_DEBUG);
+			return $this->errno;
+		}
 	}
 
 	/**
@@ -293,8 +293,8 @@ class RemiseCheque extends CommonObject
 	 *	@param  User	$user 		Utilisateur qui effectue l'operation
 	 *	@return	int
 	 */
-    public function delete($user = '')
-    {
+	public function delete($user = '')
+	{
 		global $conf;
 
 		$this->errno = 0;
@@ -315,15 +315,15 @@ class RemiseCheque extends CommonObject
 			}
 
 			if ($this->errno === 0) {
-			    $sql = "UPDATE ".MAIN_DB_PREFIX."bank";
-			    $sql .= " SET fk_bordereau = 0";
-			    $sql .= " WHERE fk_bordereau = ".$this->id;
+				$sql = "UPDATE ".MAIN_DB_PREFIX."bank";
+				$sql .= " SET fk_bordereau = 0";
+				$sql .= " WHERE fk_bordereau = ".$this->id;
 
-			    $resql = $this->db->query($sql);
-			    if (!$resql)
-			    {
-			        $this->errno = -1028;
-				    dol_syslog("RemiseCheque::Delete ERREUR UPDATE ($this->errno)");
+				$resql = $this->db->query($sql);
+				if (!$resql)
+				{
+					$this->errno = -1028;
+					dol_syslog("RemiseCheque::Delete ERREUR UPDATE ($this->errno)");
 				}
 			}
 		}
@@ -345,8 +345,8 @@ class RemiseCheque extends CommonObject
 	 *  @param	User	$user 		User
 	 *  @return int      			<0 if KO, >0 if OK
 	 */
-    public function validate($user)
-    {
+	public function validate($user)
+	{
 		global $langs, $conf;
 
 		$this->errno = 0;
@@ -371,7 +371,7 @@ class RemiseCheque extends CommonObject
 
 				if ($num == 1)
 				{
-				    $this->ref = $numref;
+					$this->ref = $numref;
 					$this->statut = 1;
 				} else {
 					$this->errno = -1029;
@@ -391,7 +391,7 @@ class RemiseCheque extends CommonObject
 		} else {
 			$this->db->rollback();
 			dol_syslog("RemiseCheque::Validate ".$this->errno, LOG_ERR);
-            return $this->errno;
+			return $this->errno;
 		}
 	}
 
@@ -402,8 +402,8 @@ class RemiseCheque extends CommonObject
 	 *      @param     string		$mode		'next' for next value or 'last' for last value
 	 *      @return    string					free ref or last ref
 	 */
-    public function getNextNumRef($mode = 'next')
-    {
+	public function getNextNumRef($mode = 'next')
+	{
 		global $conf, $db, $langs, $mysoc;
 		$langs->load("bills");
 
@@ -475,19 +475,19 @@ class RemiseCheque extends CommonObject
 			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Bank"));
 			return "";
 		}
-    }
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
 	 *      @param      User	$user       Objet user
 	 *      @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
 	 */
-    public function load_board($user)
-    {
-        // phpcs:enable
+	public function load_board($user)
+	{
+		// phpcs:enable
 		global $conf, $langs;
 
 		if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
@@ -529,18 +529,18 @@ class RemiseCheque extends CommonObject
 			$this->error = $this->db->error();
 			return -1;
 		}
-    }
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Charge indicateurs this->nb de tableau de bord
 	 *
 	 *      @return     int         <0 if ko, >0 if ok
 	 */
-    public function load_state_board()
-    {
-        // phpcs:enable
+	public function load_state_board()
+	{
+		// phpcs:enable
 		global $user;
 
 		if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
@@ -567,7 +567,7 @@ class RemiseCheque extends CommonObject
 			$this->error = $this->db->error();
 			return -1;
 		}
-    }
+	}
 
 
 	/**
@@ -577,8 +577,8 @@ class RemiseCheque extends CommonObject
 	 *	@param 	Translate	$outputlangs	Object langs
 	 * 	@return int        					<0 if KO, >0 if OK
 	 */
-    public function generatePdf($model, $outputlangs)
-    {
+	public function generatePdf($model, $outputlangs)
+	{
 		global $langs, $conf;
 
 		if (empty($model)) $model = 'blochet';
@@ -650,15 +650,15 @@ class RemiseCheque extends CommonObject
 			$this->error = $langs->trans("ErrorFileDoesNotExists", $dir.$file);
 			return -1;
 		}
-    }
+	}
 
 	/**
 	 *	Mets a jour le montant total
 	 *
 	 *	@return 	int		0 en cas de succes
 	 */
-    public function updateAmount()
-    {
+	public function updateAmount()
+	{
 		global $conf;
 
 		$this->errno = 0;
@@ -707,7 +707,7 @@ class RemiseCheque extends CommonObject
 		}
 
 		return $this->errno;
-    }
+	}
 
 	/**
 	 *	Insere la remise en base
@@ -715,8 +715,8 @@ class RemiseCheque extends CommonObject
 	 *	@param	int		$account_id 		Compte bancaire concerne
 	 * 	@return	int
 	 */
-    public function removeCheck($account_id)
-    {
+	public function removeCheck($account_id)
+	{
 		$this->errno = 0;
 
 		if ($this->id > 0)
@@ -736,7 +736,7 @@ class RemiseCheque extends CommonObject
 			}
 		}
 		return 0;
-    }
+	}
 
 	/**
 	 *	Check return management
@@ -746,8 +746,8 @@ class RemiseCheque extends CommonObject
 	 *	@param	integer	$rejection_date    Date to use on the negative payment
 	 * 	@return	int                        Id of negative payment line created
 	 */
-    public function rejectCheck($bank_id, $rejection_date)
-    {
+	public function rejectCheck($bank_id, $rejection_date)
+	{
 		global $db, $user;
 
 		$payment = new Paiement($db);
@@ -796,29 +796,29 @@ class RemiseCheque extends CommonObject
 			$result = $rejectedPayment->create($user);
 			if ($result > 0)
 			{
-                // We created a negative payment, we also add the line as bank transaction
-			    $result = $rejectedPayment->addPaymentToBank($user, 'payment', '(CheckRejected)', $bankaccount, '', '');
+				// We created a negative payment, we also add the line as bank transaction
+				$result = $rejectedPayment->addPaymentToBank($user, 'payment', '(CheckRejected)', $bankaccount, '', '');
 				if ($result > 0)
 				{
-				    $result = $payment->reject();
+					$result = $payment->reject();
 					if ($result > 0)
 					{
-    					$this->db->commit();
-    					return $rejectedPayment->id;
+						$this->db->commit();
+						return $rejectedPayment->id;
 					} else {
-                        $this->db->rollback();
-					    return -1;
+						$this->db->rollback();
+						return -1;
 					}
 				} else {
-				    $this->error = $rejectedPayment->error;
-				    $this->errors = $rejectedPayment->errors;
-				    $this->db->rollback();
+					$this->error = $rejectedPayment->error;
+					$this->errors = $rejectedPayment->errors;
+					$this->db->rollback();
 					return -1;
 				}
 			} else {
 				$this->error = $rejectedPayment->error;
 				$this->errors = $rejectedPayment->errors;
-			    $this->db->rollback();
+				$this->db->rollback();
 				return -1;
 			}
 		} else {
@@ -828,15 +828,15 @@ class RemiseCheque extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Charge les proprietes ref_previous et ref_next
 	 *
 	 *  @return     int   <0 if KO, 0 if OK
 	 */
-    public function load_previous_next_id()
-    {
-        // phpcs:enable
+	public function load_previous_next_id()
+	{
+		// phpcs:enable
 		global $conf;
 
 		$this->errno = 0;
@@ -871,39 +871,39 @@ class RemiseCheque extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *      Set the creation date
-     *
-     *      @param	User		$user           Object user
-     *      @param  int   $date           Date creation
-     *      @return int                 		<0 if KO, >0 if OK
-     */
-    public function set_date($user, $date)
-    {
-        // phpcs:enable
-        if ($user->rights->banque->cheque)
-        {
-            $sql = "UPDATE ".MAIN_DB_PREFIX."bordereau_cheque";
-            $sql .= " SET date_bordereau = ".($date ? "'".$this->db->idate($date)."'" : 'null');
-            $sql .= " WHERE rowid = ".$this->id;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *      Set the creation date
+	 *
+	 *      @param	User		$user           Object user
+	 *      @param  int   $date           Date creation
+	 *      @return int                 		<0 if KO, >0 if OK
+	 */
+	public function set_date($user, $date)
+	{
+		// phpcs:enable
+		if ($user->rights->banque->cheque)
+		{
+			$sql = "UPDATE ".MAIN_DB_PREFIX."bordereau_cheque";
+			$sql .= " SET date_bordereau = ".($date ? "'".$this->db->idate($date)."'" : 'null');
+			$sql .= " WHERE rowid = ".$this->id;
 
-            dol_syslog("RemiseCheque::set_date", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if ($resql)
-            {
-                $this->date_bordereau = $date;
-                return 1;
-            } else {
-                $this->error = $this->db->error();
-                return -1;
-            }
-        } else {
-            return -2;
-        }
-    }
+			dol_syslog("RemiseCheque::set_date", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				$this->date_bordereau = $date;
+				return 1;
+			} else {
+				$this->error = $this->db->error();
+				return -1;
+			}
+		} else {
+			return -2;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Set the ref of bordereau
 	 *
@@ -911,9 +911,9 @@ class RemiseCheque extends CommonObject
 	 *      @param  int   $ref         ref of bordereau
 	 *      @return int                 		<0 if KO, >0 if OK
 	 */
-    public function set_number($user, $ref)
-    {
-        // phpcs:enable
+	public function set_number($user, $ref)
+	{
+		// phpcs:enable
 		if ($user->rights->banque->cheque)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."bordereau_cheque";
@@ -942,8 +942,8 @@ class RemiseCheque extends CommonObject
 	 *	@param	string		$option		''=Create a specimen invoice with lines, 'nolines'=No lines
 	 *  @return	void
 	 */
-    public function initAsSpecimen($option = '')
-    {
+	public function initAsSpecimen($option = '')
+	{
 		global $user, $langs, $conf;
 
 		$now = dol_now();
@@ -955,20 +955,20 @@ class RemiseCheque extends CommonObject
 		$this->ref = 'SPECIMEN';
 		$this->specimen = 1;
 		$this->date_bordereau = $nownotime;
-    }
+	}
 
 	/**
 	 *	Return clicable name (with picto eventually)
 	 *
 	 *	@param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
 	 *	@param	string	$option						Sur quoi pointe le lien
-     *  @param	int  	$notooltip					1=Disable tooltip
-     *  @param  string  $morecss            		Add more css on link
-     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param	int  	$notooltip					1=Disable tooltip
+	 *  @param  string  $morecss            		Add more css on link
+	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string								Chaine avec URL
 	 */
-    public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
-    {
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
 		global $conf, $langs;
 
 		$result = '';
@@ -977,27 +977,27 @@ class RemiseCheque extends CommonObject
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-        $url = DOL_URL_ROOT.'/compta/paiement/cheque/card.php?id='.$this->id;
+		$url = DOL_URL_ROOT.'/compta/paiement/cheque/card.php?id='.$this->id;
 
-        if ($option != 'nolink')
-        {
-        	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-        	if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option != 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-        	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-        	{
-        		$label = $langs->trans("ShowCheckReceipt");
-        		$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-        	}
-        	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-        	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowCheckReceipt");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -1009,7 +1009,7 @@ class RemiseCheque extends CommonObject
 		$result .= $linkend;
 
 		return $result;
-    }
+	}
 
 	/**
 	 *  Retourne le libelle du statut d'une facture (brouillon, validee, abandonnee, payee)
@@ -1017,12 +1017,12 @@ class RemiseCheque extends CommonObject
 	 *  @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *  @return string				Libelle
 	 */
-    public function getLibStatut($mode = 0)
-    {
-        return $this->LibStatut($this->statut, $mode);
-    }
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut($this->statut, $mode);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return label of a status
 	 *
@@ -1030,22 +1030,22 @@ class RemiseCheque extends CommonObject
 	 *  @param  int		$mode		0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
 	 *  @return string      		Libelle du statut
 	 */
-    public function LibStatut($status, $mode = 0)
-    {
-    	// phpcs:enable
-    	if (empty($this->labelStatus) || empty($this->labelStatusShort))
-    	{
-    		global $langs;
-    		$langs->load('compta');
-    		$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('ToValidate');
-    		$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Validated');
-    		$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('ToValidate');
-    		$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Validated');
-    	}
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		if (empty($this->labelStatus) || empty($this->labelStatusShort))
+		{
+			global $langs;
+			$langs->load('compta');
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('ToValidate');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Validated');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('ToValidate');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Validated');
+		}
 
-    	$statusType = 'status'.$status;
-    	if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
+		$statusType = 'status'.$status;
+		if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
 
-    	return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
-    }
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
+	}
 }
diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
index 1ee79aeafd9..9de75a6e0c5 100644
--- a/htdocs/compta/paiement/cheque/index.php
+++ b/htdocs/compta/paiement/cheque/index.php
@@ -67,17 +67,17 @@ print '<th colspan="2">'.$langs->trans("BankChecks")."</th>\n";
 print "</tr>\n";
 
 if ($resql) {
-    if ($row = $db->fetch_row($resql)) {
-        $num = $row[0];
-    }
-    print '<tr class="oddeven">';
-    print '<td>'.$langs->trans("BankChecksToReceipt").'</td>';
-    print '<td class="right">';
-    print '<a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/card.php?leftmenu=customers_bills_checks&action=new">'.$num.'</a>';
-    print '</td></tr>';
-    print "</table>\n";
+	if ($row = $db->fetch_row($resql)) {
+		$num = $row[0];
+	}
+	print '<tr class="oddeven">';
+	print '<td>'.$langs->trans("BankChecksToReceipt").'</td>';
+	print '<td class="right">';
+	print '<a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/card.php?leftmenu=customers_bills_checks&action=new">'.$num.'</a>';
+	print '</td></tr>';
+	print "</table>\n";
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
@@ -99,6 +99,7 @@ $sql .= $db->plimit($max);
 $resql = $db->query($sql);
 if ($resql)
 {
+	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<th>'.$langs->trans("LastCheckReceiptShort", $max).'</th>';
@@ -111,9 +112,9 @@ if ($resql)
 
 	while ($objp = $db->fetch_object($resql))
 	{
-        $checkdepositstatic->id = $objp->rowid;
-        $checkdepositstatic->ref = ($objp->ref ? $objp->ref : $objp->rowid);
-	    $checkdepositstatic->statut = $objp->statut;
+		$checkdepositstatic->id = $objp->rowid;
+		$checkdepositstatic->ref = ($objp->ref ? $objp->ref : $objp->rowid);
+		$checkdepositstatic->statut = $objp->statut;
 
 		$accountstatic->id = $objp->bid;
 		$accountstatic->ref = $objp->bref;
@@ -126,9 +127,9 @@ if ($resql)
 
 		print '<tr class="oddeven">'."\n";
 
-		print '<td>'.$checkdepositstatic->getNomUrl(1).'</td>';
+		print '<td class="nowraponall">'.$checkdepositstatic->getNomUrl(1).'</td>';
 		print '<td>'.dol_print_date($db->jdate($objp->db), 'day').'</td>';
-		print '<td>'.$accountstatic->getNomUrl(1).'</td>';
+		print '<td class="nowraponall">'.$accountstatic->getNomUrl(1).'</td>';
 		print '<td class="right">'.$objp->nbcheque.'</td>';
 		print '<td class="right">'.price($objp->amount).'</td>';
 		print '<td class="right">'.$checkdepositstatic->LibStatut($objp->statut, 3).'</td>';
@@ -136,10 +137,11 @@ if ($resql)
 		print '</tr>';
 	}
 	print "</table>";
+	print '</div>';
 
 	$db->free($resql);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 3bb45c4e312..39a87653cba 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -69,11 +69,11 @@ $accountstatic = new Account($db);
 // If click on purge search criteria ?
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-    $search_ref = '';
-    $search_amount = '';
-    $search_account = '';
-    $year = '';
-    $month = '';
+	$search_ref = '';
+	$search_amount = '';
+	$search_account = '';
+	$year = '';
+	$month = '';
 }
 
 
@@ -121,7 +121,7 @@ if ($resql)
 	$num = $db->num_rows($resql);
 	$i = 0;
 	$param = '';
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
 	$url = DOL_URL_ROOT.'/compta/paiement/cheque/card.php?action=new';
@@ -141,34 +141,34 @@ if ($resql)
 
 	$moreforfilter = '';
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	// Fields title search
 	print '<tr class="liste_titre">';
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat" type="text" size="4" name="search_ref" value="'.$search_ref.'">';
-    print '</td>';
+	print '</td>';
 	print '<td class="liste_titre" align="center">';
-    if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
-    print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
-    $formother->select_year($year ? $year : -1, 'year', 1, 20, 5);
-    print '</td>';
-    print '<td class="liste_titre">';
-    $form->select_comptes($search_account, 'search_account', 0, '', 1);
-    print '</td>';
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
+	print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
+	$formother->select_year($year ? $year : -1, 'year', 1, 20, 5);
+	print '</td>';
+	print '<td class="liste_titre">';
+	$form->select_comptes($search_account, 'search_account', 0, '', 1);
+	print '</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre right">';
 	print '<input class="flat maxwidth50" type="text" name="search_amount" value="'.$search_amount.'">';
 	print '</td>';
 	print '<td class="liste_titre"></td>';
-    print '<td class="liste_titre maxwidthsearch">';
-    $searchpicto = $form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
-    print "</tr>\n";
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
+	print '</td>';
+	print "</tr>\n";
 
-    print '<tr class="liste_titre">';
+	print '<tr class="liste_titre">';
 	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "bc.ref", "", $param, "", $sortfield, $sortorder);
 	print_liste_field_titre("DateCreation", $_SERVER["PHP_SELF"], "dp", "", $param, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
@@ -178,52 +178,52 @@ if ($resql)
 	print_liste_field_titre('');
 	print "</tr>\n";
 
-    if ($num > 0)
-    {
-    	while ($i < min($num, $limit))
-    	{
-    		$objp = $db->fetch_object($resql);
+	if ($num > 0)
+	{
+		while ($i < min($num, $limit))
+		{
+			$objp = $db->fetch_object($resql);
 
-    		print '<tr class="oddeven">';
+			print '<tr class="oddeven">';
 
-    		// Num ref cheque
-    		print '<td>';
-    		$checkdepositstatic->id = $objp->rowid;
-    		$checkdepositstatic->ref = ($objp->ref ? $objp->ref : $objp->rowid);
-    		$checkdepositstatic->statut = $objp->statut;
-    		print $checkdepositstatic->getNomUrl(1);
-    		print '</td>';
+			// Num ref cheque
+			print '<td>';
+			$checkdepositstatic->id = $objp->rowid;
+			$checkdepositstatic->ref = ($objp->ref ? $objp->ref : $objp->rowid);
+			$checkdepositstatic->statut = $objp->statut;
+			print $checkdepositstatic->getNomUrl(1);
+			print '</td>';
 
-    		// Date
-    		print '<td class="center">'.dol_print_date($db->jdate($objp->dp), 'day').'</td>'; // TODO Use date hour
+			// Date
+			print '<td class="center">'.dol_print_date($db->jdate($objp->dp), 'day').'</td>'; // TODO Use date hour
 
-    		// Bank
-    		print '<td>';
-    		if ($objp->bid) print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"), 'account').' '.$objp->label.'</a>';
-    		else print '&nbsp;';
-    		print '</td>';
+			// Bank
+			print '<td>';
+			if ($objp->bid) print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"), 'account').' '.$objp->label.'</a>';
+			else print '&nbsp;';
+			print '</td>';
 
-    		// Number of cheques
-    		print '<td class="right">'.$objp->nbcheque.'</td>';
+			// Number of cheques
+			print '<td class="right">'.$objp->nbcheque.'</td>';
 
-    		// Amount
-    		print '<td class="right">'.price($objp->amount).'</td>';
+			// Amount
+			print '<td class="right">'.price($objp->amount).'</td>';
 
-    		// Statut
-    		print '<td class="right">';
-    		print $checkdepositstatic->LibStatut($objp->statut, 5);
-    		print '</td>';
+			// Statut
+			print '<td class="right">';
+			print $checkdepositstatic->LibStatut($objp->statut, 5);
+			print '</td>';
 
-    		print '<td></td>';
+			print '<td></td>';
 
-            print "</tr>\n";
-    		$i++;
-    	}
-    } else {
+			print "</tr>\n";
+			$i++;
+		}
+	} else {
    		print '<tr class="oddeven">';
    		print '<td colspan="7" class="opacitymedium">'.$langs->trans("None")."</td>";
    		print '</tr>';
-    }
+	}
 	print "</table>";
 	print "</div>";
 	print "</form>\n";
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 5cb16bdcbe3..863e841f716 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -39,17 +39,17 @@ require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
  */
 class Paiement extends CommonObject
 {
-    /**
+	/**
 	 * @var string ID to identify managed object
 	 */
 	public $element = 'payment';
 
-    /**
+	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element = 'paiement';
 
-    /**
+	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
 	public $picto = 'payment';
@@ -61,7 +61,7 @@ class Paiement extends CommonObject
 	 * @deprecated
 	 * @see $amount, $amounts
 	 */
-    public $total;
+	public $total;
 
 	/**
 	 * @deprecated
@@ -69,77 +69,77 @@ class Paiement extends CommonObject
 	 */
 	public $montant;
 
-	public $amount;                        // Total amount of payment (in the main currency)
-	public $multicurrency_amount;          // Total amount of payment (in the currency of the bank account)
-	public $amounts = array();               // array: invoice ID => amount for that invoice (in the main currency)>
+	public $amount; // Total amount of payment (in the main currency)
+	public $multicurrency_amount; // Total amount of payment (in the currency of the bank account)
+	public $amounts = array(); // array: invoice ID => amount for that invoice (in the main currency)>
 	public $multicurrency_amounts = array(); // array: invoice ID => amount for that invoice (in the invoice's currency)>
 
-	public $pos_change = 0;	// Excess received in TakePOS cash payment
+	public $pos_change = 0; // Excess received in TakePOS cash payment
 
 	public $author;
 	public $paiementid; // Type of payment. Id saved into fields fk_paiement on llx_paiement
 	public $paiementcode; // Code of payment.
 
-    /**
-     * @var string type libelle
-     */
-    public $type_label;
+	/**
+	 * @var string type libelle
+	 */
+	public $type_label;
 
-    /**
-     * @var string type code
-     */
-    public $type_code;
+	/**
+	 * @var string type code
+	 */
+	public $type_code;
 
-    /**
-     * @var string Numero du CHQ, VIR, etc...
-     * @deprecated
-     * @see $num_payment
-     */
-    public $num_paiement;
+	/**
+	 * @var string Numero du CHQ, VIR, etc...
+	 * @deprecated
+	 * @see $num_payment
+	 */
+	public $num_paiement;
 
-    /**
-     * @var string Numero du CHQ, VIR, etc...
-     */
-    public $num_payment;
+	/**
+	 * @var string Numero du CHQ, VIR, etc...
+	 */
+	public $num_payment;
 
-    /**
-     * @var string Id of external payment mode
-     */
-    public $ext_payment_id;
+	/**
+	 * @var string Id of external payment mode
+	 */
+	public $ext_payment_id;
 
-    /**
-     * @var string Name of external payment mode
-     */
-    public $ext_payment_site;
+	/**
+	 * @var string Name of external payment mode
+	 */
+	public $ext_payment_site;
 
-    /**
-     * @var int bank account id of payment
-     * @deprecated
-     * @see $fk_account
-     */
-    public $bank_account;
+	/**
+	 * @var int bank account id of payment
+	 * @deprecated
+	 * @see $fk_account
+	 */
+	public $bank_account;
 
-    /**
-     * @var int bank account id of payment
-     */
-    public $fk_account;
+	/**
+	 * @var int bank account id of payment
+	 */
+	public $fk_account;
 
-    /**
-     * @var int id of payment line in bank account
-     */
-    public $bank_line;
+	/**
+	 * @var int id of payment line in bank account
+	 */
+	public $bank_line;
 
 	// fk_paiement dans llx_paiement est l'id du type de paiement (7 pour CHQ, ...)
-    // fk_paiement dans llx_paiement_facture est le rowid du paiement
-    /**
-     * @var int payment id
-     */
-    public $fk_paiement; // Type of payment
+	// fk_paiement dans llx_paiement_facture est le rowid du paiement
+	/**
+	 * @var int payment id
+	 */
+	public $fk_paiement; // Type of payment
 
-    /**
-     * @var string payment external reference
-     */
-    public $ref_ext;
+	/**
+	 * @var string payment external reference
+	 */
+	public $ref_ext;
 
 	/**
 	 *	Constructor
@@ -195,8 +195,8 @@ class Paiement extends CommonObject
 				$this->type_label = $obj->type_label;
 				$this->type_code      = $obj->type_code;
 				$this->statut         = $obj->statut;
-                $this->ext_payment_id = $obj->ext_payment_id;
-                $this->ext_payment_site = $obj->ext_payment_site;
+				$this->ext_payment_id = $obj->ext_payment_id;
+				$this->ext_payment_site = $obj->ext_payment_site;
 
 				$this->bank_account   = $obj->fk_account; // deprecated
 				$this->fk_account     = $obj->fk_account;
@@ -224,7 +224,7 @@ class Paiement extends CommonObject
 	 *  @param  Societe   $thirdparty           Thirdparty
 	 *  @return int                 			id of created payment, < 0 if error
 	 */
-    public function create($user, $closepaidinvoices = 0, $thirdparty = null)
+	public function create($user, $closepaidinvoices = 0, $thirdparty = null)
 	{
 		global $conf, $langs;
 
@@ -233,10 +233,10 @@ class Paiement extends CommonObject
 
 		$now = dol_now();
 
-        // Clean parameters
-        $totalamount = 0;
+		// Clean parameters
+		$totalamount = 0;
 		$totalamount_converted = 0;
-        $atleastonepaymentnotnull = 0;
+		$atleastonepaymentnotnull = 0;
 
 		if ($way == 'dolibarr')
 		{
@@ -263,16 +263,16 @@ class Paiement extends CommonObject
 		$totalamount_converted = price2num($totalamount_converted);
 
 		// Check parameters
-        if (empty($totalamount) && empty($atleastonepaymentnotnull))	 // We accept negative amounts for withdraw reject but not empty arrays
-        {
-        	$this->errors[] = 'TotalAmountEmpty';
-        	$this->error = 'TotalAmountEmpty';
-        	return -1;
-        }
+		if (empty($totalamount) && empty($atleastonepaymentnotnull))	 // We accept negative amounts for withdraw reject but not empty arrays
+		{
+			$this->errors[] = 'TotalAmountEmpty';
+			$this->error = 'TotalAmountEmpty';
+			return -1;
+		}
 
-        dol_syslog(get_class($this)."::create insert paiement", LOG_DEBUG);
+		dol_syslog(get_class($this)."::create insert paiement", LOG_DEBUG);
 
-        $this->db->begin();
+		$this->db->begin();
 
 		$this->ref = $this->getNextNumRef(is_object($thirdparty) ? $thirdparty : '');
 
@@ -319,17 +319,17 @@ class Paiement extends CommonObject
 						$invoice->fetch($facid);
 
 						// If we want to closed payed invoices
-					    if ($closepaidinvoices)
-					    {
-                            $paiement = $invoice->getSommePaiement();
-                            $creditnotes = $invoice->getSumCreditNotesUsed();
-                            $deposits = $invoice->getSumDepositsUsed();
-                            $alreadypayed = price2num($paiement + $creditnotes + $deposits, 'MT');
-                            $remaintopay = price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits, 'MT');
+						if ($closepaidinvoices)
+						{
+							$paiement = $invoice->getSommePaiement();
+							$creditnotes = $invoice->getSumCreditNotesUsed();
+							$deposits = $invoice->getSumDepositsUsed();
+							$alreadypayed = price2num($paiement + $creditnotes + $deposits, 'MT');
+							$remaintopay = price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits, 'MT');
 
 							//var_dump($invoice->total_ttc.' - '.$paiement.' -'.$creditnotes.' - '.$deposits.' - '.$remaintopay);exit;
 
-                            //Invoice types that are eligible for changing status to paid
+							//Invoice types that are eligible for changing status to paid
 							$affected_types = array(
 								Facture::TYPE_STANDARD,
 								Facture::TYPE_REPLACEMENT,
@@ -338,15 +338,15 @@ class Paiement extends CommonObject
 								Facture::TYPE_SITUATION
 							);
 
-                            if (!in_array($invoice->type, $affected_types)) dol_syslog("Invoice ".$facid." is not a standard, nor replacement invoice, nor credit note, nor deposit invoice, nor situation invoice. We do nothing more.");
-                            elseif ($remaintopay) dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing more.");
-                            //else if ($mustwait) dol_syslog("There is ".$mustwait." differed payment to process, we do nothing more.");
-                            else {
-                                // If invoice is a down payment, we also convert down payment to discount
-                                if ($invoice->type == Facture::TYPE_DEPOSIT)
-                                {
-			                        $amount_ht = $amount_tva = $amount_ttc = array();
-			                        $multicurrency_amount_ht = $multicurrency_amount_tva = $multicurrency_amount_ttc = array();
+							if (!in_array($invoice->type, $affected_types)) dol_syslog("Invoice ".$facid." is not a standard, nor replacement invoice, nor credit note, nor deposit invoice, nor situation invoice. We do nothing more.");
+							elseif ($remaintopay) dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing more.");
+							//else if ($mustwait) dol_syslog("There is ".$mustwait." differed payment to process, we do nothing more.");
+							else {
+								// If invoice is a down payment, we also convert down payment to discount
+								if ($invoice->type == Facture::TYPE_DEPOSIT)
+								{
+									$amount_ht = $amount_tva = $amount_ttc = array();
+									$multicurrency_amount_ht = $multicurrency_amount_tva = $multicurrency_amount_ttc = array();
 
 									// Insert one discount by VAT rate category
 									$discount = new DiscountAbsolute($this->db);
@@ -387,48 +387,48 @@ class Paiement extends CommonObject
 										}
 									}
 
-                                    if ($error)
-                                    {
-                                        setEventMessages($discount->error, $discount->errors, 'errors');
-                                        $error++;
-                                    }
-                                }
+									if ($error)
+									{
+										setEventMessages($discount->error, $discount->errors, 'errors');
+										$error++;
+									}
+								}
 
-                                // Set invoice to paid
-                                if (!$error)
-                                {
-                                    $result = $invoice->set_paid($user, '', '');
-                                    if ($result < 0)
-                                    {
-                                        $this->error = $invoice->error;
-                                        $error++;
-                                    }
-                                }
-                            }
-					    }
+								// Set invoice to paid
+								if (!$error)
+								{
+									$result = $invoice->set_paid($user, '', '');
+									if ($result < 0)
+									{
+										$this->error = $invoice->error;
+										$error++;
+									}
+								}
+							}
+						}
 
-					    // Regenerate documents of invoices
-                        if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-                        {
-                        	dol_syslog(get_class($this).'::create Regenerate the document after inserting payment for thirdparty default_lang='.(is_object($invoice->thirdparty) ? $invoice->thirdparty->default_lang : 'null'), LOG_DEBUG);
+						// Regenerate documents of invoices
+						if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+						{
+							dol_syslog(get_class($this).'::create Regenerate the document after inserting payment for thirdparty default_lang='.(is_object($invoice->thirdparty) ? $invoice->thirdparty->default_lang : 'null'), LOG_DEBUG);
 
-                            $newlang = '';
-                            $outputlangs = $langs;
-                            if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
-                            	$invoice->fetch_thirdparty();
-                            	$newlang = $invoice->thirdparty->default_lang;
-                            }
-                            if (!empty($newlang)) {
-                            	$outputlangs = new Translate("", $conf);
-                            	$outputlangs->setDefaultLang($newlang);
-                            }
-                            $ret = $invoice->fetch($facid); // Reload to get new records
-                            $result = $invoice->generateDocument($invoice->modelpdf, $outputlangs);
-                            if ($result < 0) {
-                            	setEventMessages($invoice->error, $invoice->errors, 'errors');
-                            	$error++;
-                            }
-                        }
+							$newlang = '';
+							$outputlangs = $langs;
+							if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+								$invoice->fetch_thirdparty();
+								$newlang = $invoice->thirdparty->default_lang;
+							}
+							if (!empty($newlang)) {
+								$outputlangs = new Translate("", $conf);
+								$outputlangs->setDefaultLang($newlang);
+							}
+							$ret = $invoice->fetch($facid); // Reload to get new records
+							$result = $invoice->generateDocument($invoice->modelpdf, $outputlangs);
+							if ($result < 0) {
+								setEventMessages($invoice->error, $invoice->errors, 'errors');
+								$error++;
+							}
+						}
 					} else {
 						$this->error = $this->db->lasterror();
 						$error++;
@@ -452,9 +452,9 @@ class Paiement extends CommonObject
 
 		if (!$error)
 		{
-		    $this->amount = $total;
-		    $this->total = $total; // deprecated
-		    $this->multicurrency_amount = $mtotal;
+			$this->amount = $total;
+			$this->total = $total; // deprecated
+			$this->multicurrency_amount = $mtotal;
 			$this->db->commit();
 			return $this->id;
 		} else {
@@ -472,7 +472,7 @@ class Paiement extends CommonObject
 	 *  @param	int		$notrigger		No trigger
 	 *  @return int     				<0 si ko, >0 si ok
 	 */
-    public function delete($notrigger = 0)
+	public function delete($notrigger = 0)
 	{
 		global $conf, $user, $langs;
 
@@ -503,21 +503,21 @@ class Paiement extends CommonObject
 		{
 			$accline = new AccountLine($this->db);
 
-			$result=$accline->fetch($bank_line_id);
+			$result = $accline->fetch($bank_line_id);
 			if ($result == 0) {
-				$accline->id = $accline->rowid = $bank_line_id;    // If not found, we set artificially rowid to allow delete of llx_bank_url
+				$accline->id = $accline->rowid = $bank_line_id; // If not found, we set artificially rowid to allow delete of llx_bank_url
 			}
 
-            // Delete bank account url lines linked to payment
+			// Delete bank account url lines linked to payment
 			$result = $accline->delete_urls($user);
-            if ($result < 0)
-            {
-                $this->error = $accline->error;
+			if ($result < 0)
+			{
+				$this->error = $accline->error;
 				$this->db->rollback();
 				return -3;
-            }
+			}
 
-            // Delete bank account lines linked to payment
+			// Delete bank account lines linked to payment
 			$result = $accline->delete($user);
 			if ($result < 0)
 			{
@@ -533,10 +533,10 @@ class Paiement extends CommonObject
 			$result = $this->call_trigger('PAYMENT_CUSTOMER_DELETE', $user);
 			if ($result < 0)
 			{
-			    $this->db->rollback();
-			    return -1;
-            }
-            // End call triggers
+				$this->db->rollback();
+				return -1;
+			}
+			// End call triggers
 		}
 
 		// Delete payment (into paiement_facture and paiement)
@@ -548,7 +548,7 @@ class Paiement extends CommonObject
 		{
 			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'paiement';
 			$sql .= ' WHERE rowid = '.$this->id;
-		    dol_syslog($sql);
+			dol_syslog($sql);
 			$result = $this->db->query($sql);
 			if (!$result)
 			{
@@ -567,144 +567,144 @@ class Paiement extends CommonObject
 	}
 
 
-    /**
-     *      Add a record into bank for payment + links between this bank record and sources of payment.
-     *      All payment properties (this->amount, this->amounts, ...) must have been set first like after a call to create().
-     *
-     *      @param	User	$user               Object of user making payment
-     *      @param  string	$mode               'payment', 'payment_supplier'
-     *      @param  string	$label              Label to use in bank record. Note: If label is '(WithdrawalPayment)', a third entry 'widthdraw' is added into bank_url.
-     *      @param  int		$accountid          Id of bank account to do link with
-     *      @param  string	$emetteur_nom       Name of transmitter
-     *      @param  string	$emetteur_banque    Name of bank
-     *      @param	int		$notrigger			No trigger
-     *      @return int                 		<0 if KO, bank_line_id if OK
-     */
-    public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque, $notrigger = 0)
-    {
-        global $conf, $langs, $user;
+	/**
+	 *      Add a record into bank for payment + links between this bank record and sources of payment.
+	 *      All payment properties (this->amount, this->amounts, ...) must have been set first like after a call to create().
+	 *
+	 *      @param	User	$user               Object of user making payment
+	 *      @param  string	$mode               'payment', 'payment_supplier'
+	 *      @param  string	$label              Label to use in bank record. Note: If label is '(WithdrawalPayment)', a third entry 'widthdraw' is added into bank_url.
+	 *      @param  int		$accountid          Id of bank account to do link with
+	 *      @param  string	$emetteur_nom       Name of transmitter
+	 *      @param  string	$emetteur_banque    Name of bank
+	 *      @param	int		$notrigger			No trigger
+	 *      @return int                 		<0 if KO, bank_line_id if OK
+	 */
+	public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque, $notrigger = 0)
+	{
+		global $conf, $langs, $user;
 
-        $error = 0;
-        $bank_line_id = 0;
+		$error = 0;
+		$bank_line_id = 0;
 
-        if (!empty($conf->banque->enabled))
-        {
-        	if ($accountid <= 0)
-        	{
-        		$this->error = 'Bad value for parameter accountid='.$accountid;
-        		dol_syslog(get_class($this).'::addPaymentToBank '.$this->error, LOG_ERR);
-        		return -1;
-        	}
+		if (!empty($conf->banque->enabled))
+		{
+			if ($accountid <= 0)
+			{
+				$this->error = 'Bad value for parameter accountid='.$accountid;
+				dol_syslog(get_class($this).'::addPaymentToBank '.$this->error, LOG_ERR);
+				return -1;
+			}
 
-        	$this->db->begin();
+			$this->db->begin();
 
-        	$this->fk_account = $accountid;
+			$this->fk_account = $accountid;
 
-        	include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+			include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-            dol_syslog("$user->id, $mode, $label, $this->fk_account, $emetteur_nom, $emetteur_banque");
+			dol_syslog("$user->id, $mode, $label, $this->fk_account, $emetteur_nom, $emetteur_banque");
 
-            $acc = new Account($this->db);
-            $result = $acc->fetch($this->fk_account);
+			$acc = new Account($this->db);
+			$result = $acc->fetch($this->fk_account);
 
 			$totalamount = $this->amount;
-            if (empty($totalamount)) $totalamount = $this->total; // For backward compatibility
+			if (empty($totalamount)) $totalamount = $this->total; // For backward compatibility
 
-            // if dolibarr currency != bank currency then we received an amount in customer currency (currently I don't manage the case : my currency is USD, the customer currency is EUR and he paid me in GBP. Seems no sense for me)
-            if (!empty($conf->multicurrency->enabled) && $conf->currency != $acc->currency_code) $totalamount = $this->multicurrency_amount;
+			// if dolibarr currency != bank currency then we received an amount in customer currency (currently I don't manage the case : my currency is USD, the customer currency is EUR and he paid me in GBP. Seems no sense for me)
+			if (!empty($conf->multicurrency->enabled) && $conf->currency != $acc->currency_code) $totalamount = $this->multicurrency_amount;
 
-            if ($mode == 'payment_supplier') $totalamount = -$totalamount;
+			if ($mode == 'payment_supplier') $totalamount = -$totalamount;
 
-            // Insert payment into llx_bank
-            $bank_line_id = $acc->addline(
-                $this->datepaye,
-                $this->paiementid, // Payment mode id or code ("CHQ or VIR for example")
-                $label,
-                $totalamount, // Sign must be positive when we receive money (customer payment), negative when you give money (supplier invoice or credit note)
-                $this->num_payment,
-                '',
-                $user,
-                $emetteur_nom,
-                $emetteur_banque
-            );
+			// Insert payment into llx_bank
+			$bank_line_id = $acc->addline(
+				$this->datepaye,
+				$this->paiementid, // Payment mode id or code ("CHQ or VIR for example")
+				$label,
+				$totalamount, // Sign must be positive when we receive money (customer payment), negative when you give money (supplier invoice or credit note)
+				$this->num_payment,
+				'',
+				$user,
+				$emetteur_nom,
+				$emetteur_banque
+			);
 
-            // Mise a jour fk_bank dans llx_paiement
-            // On connait ainsi le paiement qui a genere l'ecriture bancaire
-            if ($bank_line_id > 0)
-            {
-                $result = $this->update_fk_bank($bank_line_id);
-                if ($result <= 0)
-                {
-                    $error++;
-                    dol_print_error($this->db);
-                }
+			// Mise a jour fk_bank dans llx_paiement
+			// On connait ainsi le paiement qui a genere l'ecriture bancaire
+			if ($bank_line_id > 0)
+			{
+				$result = $this->update_fk_bank($bank_line_id);
+				if ($result <= 0)
+				{
+					$error++;
+					dol_print_error($this->db);
+				}
 
-                // Add link 'payment', 'payment_supplier' in bank_url between payment and bank transaction
-                if (!$error)
-                {
-                    $url = '';
-                    if ($mode == 'payment') $url = DOL_URL_ROOT.'/compta/paiement/card.php?id=';
-                    if ($mode == 'payment_supplier') $url = DOL_URL_ROOT.'/fourn/paiement/card.php?id=';
-                    if ($url)
-                    {
-                        $result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
-                        if ($result <= 0)
-                        {
-                            $error++;
-                            dol_print_error($this->db);
-                        }
-                    }
-                }
+				// Add link 'payment', 'payment_supplier' in bank_url between payment and bank transaction
+				if (!$error)
+				{
+					$url = '';
+					if ($mode == 'payment') $url = DOL_URL_ROOT.'/compta/paiement/card.php?id=';
+					if ($mode == 'payment_supplier') $url = DOL_URL_ROOT.'/fourn/paiement/card.php?id=';
+					if ($url)
+					{
+						$result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
+						if ($result <= 0)
+						{
+							$error++;
+							dol_print_error($this->db);
+						}
+					}
+				}
 
-                // Add link 'company' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
-                //if (! $error && $label != '(WithdrawalPayment)')
-                if (!$error)
-                {
-                    $linkaddedforthirdparty = array();
-                    foreach ($this->amounts as $key => $value)  // We should have invoices always for same third party but we loop in case of.
-                    {
-                        if ($mode == 'payment')
-                        {
-                            $fac = new Facture($this->db);
-                            $fac->fetch($key);
-                            $fac->fetch_thirdparty();
-                            if (!in_array($fac->thirdparty->id, $linkaddedforthirdparty)) // Not yet done for this thirdparty
-                            {
-                                $result = $acc->add_url_line(
-                                    $bank_line_id,
-                                    $fac->thirdparty->id,
-                                    DOL_URL_ROOT.'/comm/card.php?socid=',
-                                    $fac->thirdparty->name,
-                                    'company'
-                                );
-                                if ($result <= 0) dol_syslog(get_class($this).'::addPaymentToBank '.$this->db->lasterror());
-                                $linkaddedforthirdparty[$fac->thirdparty->id] = $fac->thirdparty->id; // Mark as done for this thirdparty
-                            }
-                        }
-                        if ($mode == 'payment_supplier')
-                        {
-                            $fac = new FactureFournisseur($this->db);
-                            $fac->fetch($key);
-                            $fac->fetch_thirdparty();
-                            if (!in_array($fac->thirdparty->id, $linkaddedforthirdparty)) // Not yet done for this thirdparty
-                            {
-                                $result = $acc->add_url_line(
-                                    $bank_line_id,
-                                    $fac->thirdparty->id,
-                                    DOL_URL_ROOT.'/fourn/card.php?socid=',
-                                    $fac->thirdparty->name,
-                                    'company'
-                                );
-                                if ($result <= 0) dol_syslog(get_class($this).'::addPaymentToBank '.$this->db->lasterror());
-                                $linkaddedforthirdparty[$fac->thirdparty->id] = $fac->thirdparty->id; // Mark as done for this thirdparty
-                            }
-                        }
-                    }
-                }
+				// Add link 'company' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
+				//if (! $error && $label != '(WithdrawalPayment)')
+				if (!$error)
+				{
+					$linkaddedforthirdparty = array();
+					foreach ($this->amounts as $key => $value)  // We should have invoices always for same third party but we loop in case of.
+					{
+						if ($mode == 'payment')
+						{
+							$fac = new Facture($this->db);
+							$fac->fetch($key);
+							$fac->fetch_thirdparty();
+							if (!in_array($fac->thirdparty->id, $linkaddedforthirdparty)) // Not yet done for this thirdparty
+							{
+								$result = $acc->add_url_line(
+									$bank_line_id,
+									$fac->thirdparty->id,
+									DOL_URL_ROOT.'/comm/card.php?socid=',
+									$fac->thirdparty->name,
+									'company'
+								);
+								if ($result <= 0) dol_syslog(get_class($this).'::addPaymentToBank '.$this->db->lasterror());
+								$linkaddedforthirdparty[$fac->thirdparty->id] = $fac->thirdparty->id; // Mark as done for this thirdparty
+							}
+						}
+						if ($mode == 'payment_supplier')
+						{
+							$fac = new FactureFournisseur($this->db);
+							$fac->fetch($key);
+							$fac->fetch_thirdparty();
+							if (!in_array($fac->thirdparty->id, $linkaddedforthirdparty)) // Not yet done for this thirdparty
+							{
+								$result = $acc->add_url_line(
+									$bank_line_id,
+									$fac->thirdparty->id,
+									DOL_URL_ROOT.'/fourn/card.php?socid=',
+									$fac->thirdparty->name,
+									'company'
+								);
+								if ($result <= 0) dol_syslog(get_class($this).'::addPaymentToBank '.$this->db->lasterror());
+								$linkaddedforthirdparty[$fac->thirdparty->id] = $fac->thirdparty->id; // Mark as done for this thirdparty
+							}
+						}
+					}
+				}
 
 				// Add link 'WithdrawalPayment' in bank_url
 				if (!$error && $label == '(WithdrawalPayment)') {
-                    $result = $acc->add_url_line(
+					$result = $acc->add_url_line(
 						$bank_line_id,
 						$this->id_prelevement,
 						DOL_URL_ROOT.'/compta/prelevement/card.php?id=',
@@ -713,45 +713,45 @@ class Paiement extends CommonObject
 					);
 				}
 
-	            if (!$error && !$notrigger)
+				if (!$error && !$notrigger)
 				{
 					// Appel des triggers
 					$result = $this->call_trigger('PAYMENT_ADD_TO_BANK', $user);
-				    if ($result < 0) { $error++; }
-				    // Fin appel triggers
+					if ($result < 0) { $error++; }
+					// Fin appel triggers
 				}
-            } else {
-                $this->error = $acc->error;
-                $error++;
-            }
+			} else {
+				$this->error = $acc->error;
+				$error++;
+			}
 
-            if (!$error)
-            {
-            	$this->db->commit();
-            } else {
-            	$this->db->rollback();
-            }
-        }
+			if (!$error)
+			{
+				$this->db->commit();
+			} else {
+				$this->db->rollback();
+			}
+		}
 
-        if (!$error)
-        {
-            return $bank_line_id;
-        } else {
-            return -1;
-        }
-    }
+		if (!$error)
+		{
+			return $bank_line_id;
+		} else {
+			return -1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Mise a jour du lien entre le paiement et la ligne generee dans llx_bank
 	 *
 	 *      @param	int		$id_bank    Id compte bancaire
 	 *      @return	int					<0 if KO, >0 if OK
 	 */
-    public function update_fk_bank($id_bank)
+	public function update_fk_bank($id_bank)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' set fk_bank = '.$id_bank;
 		$sql .= ' WHERE rowid = '.$this->id;
 
@@ -761,102 +761,114 @@ class Paiement extends CommonObject
 		{
 			return 1;
 		} else {
-            $this->error = $this->db->lasterror();
-            dol_syslog(get_class($this).'::update_fk_bank '.$this->error);
+			$this->error = $this->db->lasterror();
+			dol_syslog(get_class($this).'::update_fk_bank '.$this->error);
 			return -1;
 		}
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Updates the payment date
-     *
-     *  @param	int	$date   New date
-     *  @return int					<0 if KO, 0 if OK
-     */
-    public function update_date($date)
-    {
-        // phpcs:enable
-        $error = 0;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Updates the payment date
+	 *
+	 *  @param	int	$date   New date
+	 *  @return int					<0 if KO, 0 if OK
+	 */
+	public function update_date($date)
+	{
+		// phpcs:enable
+		$error = 0;
 
-        if (!empty($date) && $this->statut != 1)
-        {
-            $this->db->begin();
+		if (!empty($date) && $this->statut != 1)
+		{
+			$this->db->begin();
 
-            dol_syslog(get_class($this)."::update_date with date = ".$date, LOG_DEBUG);
+			dol_syslog(get_class($this)."::update_date with date = ".$date, LOG_DEBUG);
 
-            $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-            $sql .= " SET datep = '".$this->db->idate($date)."'";
-            $sql .= " WHERE rowid = ".$this->id;
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " SET datep = '".$this->db->idate($date)."'";
+			$sql .= " WHERE rowid = ".$this->id;
 
-            $result = $this->db->query($sql);
-            if (!$result)
-            {
-                $error++;
-                $this->error = 'Error -1 '.$this->db->error();
-            }
+			$result = $this->db->query($sql);
+			if (!$result)
+			{
+				$error++;
+				$this->error = 'Error -1 '.$this->db->error();
+			}
 
-            $type = $this->element;
+			$type = $this->element;
 
-            $sql = "UPDATE ".MAIN_DB_PREFIX.'bank';
-            $sql .= " SET dateo = '".$this->db->idate($date)."', datev = '".$this->db->idate($date)."'";
-            $sql .= " WHERE rowid IN (SELECT fk_bank FROM ".MAIN_DB_PREFIX."bank_url WHERE type = '".$this->db->escape($type)."' AND url_id = ".$this->id.")";
-            $sql .= " AND rappro = 0";
+			$sql = "UPDATE ".MAIN_DB_PREFIX.'bank';
+			$sql .= " SET dateo = '".$this->db->idate($date)."', datev = '".$this->db->idate($date)."'";
+			$sql .= " WHERE rowid IN (SELECT fk_bank FROM ".MAIN_DB_PREFIX."bank_url WHERE type = '".$this->db->escape($type)."' AND url_id = ".$this->id.")";
+			$sql .= " AND rappro = 0";
 
-            $result = $this->db->query($sql);
-            if (!$result)
-            {
-                $error++;
-                $this->error = 'Error -1 '.$this->db->error();
-            }
+			$result = $this->db->query($sql);
+			if (!$result)
+			{
+				$error++;
+				$this->error = 'Error -1 '.$this->db->error();
+			}
 
-            if (!$error)
-            {
-            }
+			if (!$error)
+			{
+			}
 
-            if (!$error)
-            {
-                $this->datepaye = $date;
-                $this->date = $date;
+			if (!$error)
+			{
+				$this->datepaye = $date;
+				$this->date = $date;
 
-                $this->db->commit();
-                return 0;
-            } else {
-                $this->db->rollback();
-                return -2;
-            }
-        }
-        return -1; //no date given or already validated
-    }
+				$this->db->commit();
+				return 0;
+			} else {
+				$this->db->rollback();
+				return -2;
+			}
+		}
+		return -1; //no date given or already validated
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Updates the payment number
-     *
-     *  @param	string	$num		New num
-     *  @return int					<0 if KO, 0 if OK
-     */
-    public function update_num($num)
-    {
-        // phpcs:enable
-        if (!empty($num) && $this->statut != 1) {
-            $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-            $sql .= " SET num_paiement = '".$this->db->escape($num)."'";
-            $sql .= " WHERE rowid = ".$this->id;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Updates the payment number
+	 *
+	 *  @param	string	$num		New num
+	 *  @return int					<0 if KO, 0 if OK
+	 */
+	public function update_num($num)
+	{
+		// phpcs:enable
+		if (!empty($num) && $this->statut != 1) {
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " SET num_paiement = '".$this->db->escape($num)."'";
+			$sql .= " WHERE rowid = ".$this->id;
 
-            dol_syslog(get_class($this)."::update_num", LOG_DEBUG);
-            $result = $this->db->query($sql);
-            if ($result)
-            {
-            	$this->num_payment = $this->db->escape($num);
-                return 0;
-            } else {
-                $this->error = 'Error -1 '.$this->db->error();
-                return -2;
-            }
-        }
-        return -1; //no num given or already validated
-    }
+			dol_syslog(get_class($this)."::update_num", LOG_DEBUG);
+			$result = $this->db->query($sql);
+			if ($result)
+			{
+				$this->num_payment = $this->db->escape($num);
+				return 0;
+			} else {
+				$this->error = 'Error -1 '.$this->db->error();
+				return -2;
+			}
+		}
+		return -1; //no num given or already validated
+	}
+
+	/**
+	 *    Validate payment
+	 *
+	 *	  @param	User	$user		User making validation
+	 *    @return   int     			<0 if KO, >0 if OK
+	 *    @deprecated
+	 */
+	public function valide(User $user = null)
+	{
+		return $this->validate($user);
+	}
 
 	/**
 	 *    Validate payment
@@ -864,8 +876,8 @@ class Paiement extends CommonObject
 	 *	  @param	User	$user		User making validation
 	 *    @return   int     			<0 if KO, >0 if OK
 	 */
-    public function valide(User $user = null)
-    {
+	public function validate(User $user = null)
+	{
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET statut = 1 WHERE rowid = '.$this->id;
 
 		dol_syslog(get_class($this).'::valide', LOG_DEBUG);
@@ -878,7 +890,7 @@ class Paiement extends CommonObject
 			dol_syslog(get_class($this).'::valide '.$this->error);
 			return -1;
 		}
-    }
+	}
 
 	/**
 	 *    Reject payment
@@ -886,8 +898,8 @@ class Paiement extends CommonObject
 	 *	  @param	User	$user		User making reject
 	 *    @return   int     			<0 if KO, >0 if OK
 	 */
-    public function reject(User $user = null)
-    {
+	public function reject(User $user = null)
+	{
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET statut = 2 WHERE rowid = '.$this->id;
 
 		dol_syslog(get_class($this).'::reject', LOG_DEBUG);
@@ -900,7 +912,7 @@ class Paiement extends CommonObject
 			dol_syslog(get_class($this).'::reject '.$this->error);
 			return -1;
 		}
-    }
+	}
 
 	/**
 	 *    Information sur l'objet
@@ -908,8 +920,8 @@ class Paiement extends CommonObject
 	 *    @param   int     $id      id du paiement dont il faut afficher les infos
 	 *    @return  void
 	 */
-    public function info($id)
-    {
+	public function info($id)
+	{
 		$sql = 'SELECT p.rowid, p.datec, p.fk_user_creat, p.fk_user_modif, p.tms';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement as p';
 		$sql .= ' WHERE p.rowid = '.$id;
@@ -942,7 +954,7 @@ class Paiement extends CommonObject
 		} else {
 			dol_print_error($this->db);
 		}
-    }
+	}
 
 	/**
 	 *  Return list of invoices the payment is related to.
@@ -950,8 +962,8 @@ class Paiement extends CommonObject
 	 *  @param	string		$filter         Filter
 	 *  @return int|array					<0 if KO or array of invoice id
 	 */
-    public function getBillsArray($filter = '')
-    {
+	public function getBillsArray($filter = '')
+	{
 		$sql = 'SELECT pf.fk_facture';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf, '.MAIN_DB_PREFIX.'facture as f'; // We keep link on invoice to allow use of some filters on invoice
 		$sql .= ' WHERE pf.fk_facture = f.rowid AND pf.fk_paiement = '.$this->id;
@@ -976,39 +988,39 @@ class Paiement extends CommonObject
 			dol_syslog(get_class($this).'::getBillsArray Error '.$this->error.' -', LOG_DEBUG);
 			return -1;
 		}
-    }
+	}
 
-    /**
-     *  Return list of amounts of payments.
-     *
-     *  @return int|array					Array of amount of payments
-     */
-    public function getAmountsArray()
-    {
-    	$sql = 'SELECT pf.fk_facture, pf.amount';
-    	$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf';
-    	$sql .= ' WHERE pf.fk_paiement = '.$this->id;
-    	$resql = $this->db->query($sql);
-    	if ($resql)
-    	{
-    		$i = 0;
-    		$num = $this->db->num_rows($resql);
-    		$amounts = array();
+	/**
+	 *  Return list of amounts of payments.
+	 *
+	 *  @return int|array					Array of amount of payments
+	 */
+	public function getAmountsArray()
+	{
+		$sql = 'SELECT pf.fk_facture, pf.amount';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf';
+		$sql .= ' WHERE pf.fk_paiement = '.$this->id;
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$i = 0;
+			$num = $this->db->num_rows($resql);
+			$amounts = array();
 
-    		while ($i < $num)
-    		{
-    			$obj = $this->db->fetch_object($resql);
-    			$amounts[$obj->fk_facture] = $obj->amount;
-    			$i++;
-    		}
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
+				$amounts[$obj->fk_facture] = $obj->amount;
+				$i++;
+			}
 
-    		return $amounts;
-    	} else {
-    		$this->error = $this->db->error();
-    		dol_syslog(get_class($this).'::getAmountsArray Error '.$this->error.' -', LOG_DEBUG);
-    		return -1;
-    	}
-    }
+			return $amounts;
+		} else {
+			$this->error = $this->db->error();
+			dol_syslog(get_class($this).'::getAmountsArray Error '.$this->error.' -', LOG_DEBUG);
+			return -1;
+		}
+	}
 
 	/**
 	 *      Return next reference of customer invoice not already used (or last reference)
@@ -1018,7 +1030,7 @@ class Paiement extends CommonObject
 	 *      @param     string		$mode		'next' for next value or 'last' for last value
 	 *      @return    string					free ref or last ref
 	 */
-    public function getNextNumRef($soc, $mode = 'next')
+	public function getNextNumRef($soc, $mode = 'next')
 	{
 		global $conf, $db, $langs;
 		$langs->load("bills");
@@ -1098,7 +1110,7 @@ class Paiement extends CommonObject
 	 *
 	 * 	@return 	string 	'dolibarr' if standard comportment or paid in main currency, 'customer' if payment received from multicurrency inputs
 	 */
-    public function getWay()
+	public function getWay()
 	{
 		global $conf;
 
@@ -1126,7 +1138,7 @@ class Paiement extends CommonObject
 	 *	@param	string		$option		''=Create a specimen invoice with lines, 'nolines'=No lines
 	 *  @return	void
 	 */
-    public function initAsSpecimen($option = '')
+	public function initAsSpecimen($option = '')
 	{
 		global $user, $langs, $conf;
 
@@ -1149,50 +1161,50 @@ class Paiement extends CommonObject
 	 *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
 	 *	@param	string	$option			Sur quoi pointe le lien
 	 *  @param  string  $mode           'withlistofinvoices'=Include list of invoices into tooltip
-     *  @param	int  	$notooltip		1=Disable tooltip
+	 *  @param	int  	$notooltip		1=Disable tooltip
 	 *	@return	string					Chaine avec URL
 	 */
-    public function getNomUrl($withpicto = 0, $option = '', $mode = 'withlistofinvoices', $notooltip = 0)
+	public function getNomUrl($withpicto = 0, $option = '', $mode = 'withlistofinvoices', $notooltip = 0)
 	{
 		global $conf, $langs;
 
 		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
 		$result = '';
-        $label = img_picto('', $this->picto).' <u>'.$langs->trans("Payment").'</u><br>';
-        $label .= '<strong>'.$langs->trans("Ref").':</strong> '.$this->ref;
-        if ($this->datepaye ? $this->datepaye : $this->date) $label .= '<br><strong>'.$langs->trans("Date").':</strong> '.dol_print_date($this->datepaye ? $this->datepaye : $this->date, 'dayhour');
-        if ($mode == 'withlistofinvoices')
-        {
-            $arraybill = $this->getBillsArray();
-            if (is_array($arraybill) && count($arraybill) > 0)
-            {
-            	include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-            	$facturestatic = new Facture($this->db);
-            	foreach ($arraybill as $billid)
-            	{
-            		$facturestatic->fetch($billid);
-            		$label .= '<br> '.$facturestatic->getNomUrl(1, '', 0, 0, '', 1).' '.$facturestatic->getLibStatut(2, 1);
-            	}
-            }
-        }
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Payment").'</u><br>';
+		$label .= '<strong>'.$langs->trans("Ref").':</strong> '.$this->ref;
+		if ($this->datepaye ? $this->datepaye : $this->date) $label .= '<br><strong>'.$langs->trans("Date").':</strong> '.dol_print_date($this->datepaye ? $this->datepaye : $this->date, 'dayhour');
+		if ($mode == 'withlistofinvoices')
+		{
+			$arraybill = $this->getBillsArray();
+			if (is_array($arraybill) && count($arraybill) > 0)
+			{
+				include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+				$facturestatic = new Facture($this->db);
+				foreach ($arraybill as $billid)
+				{
+					$facturestatic->fetch($billid);
+					$label .= '<br> '.$facturestatic->getNomUrl(1, '', 0, 0, '', 1).' '.$facturestatic->getLibStatut(2, 1);
+				}
+			}
+		}
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-        	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-        	{
-        		$label = $langs->trans("ShowMyObject");
-        		$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-        	}
-        	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-        	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowMyObject");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
-        $url = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$this->id;
+		$url = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$this->id;
 
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart .= $linkclose.'>';
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
@@ -1209,12 +1221,12 @@ class Paiement extends CommonObject
 	 * @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 * @return  string				Libelle
 	 */
-    public function getLibStatut($mode = 0)
+	public function getLibStatut($mode = 0)
 	{
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Renvoi le libelle d'un statut donne
 	 *
@@ -1222,9 +1234,9 @@ class Paiement extends CommonObject
 	 * @param   int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 * @return	string  		    Libelle du statut
 	 */
-    public function LibStatut($status, $mode = 0)
+	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage
 
 		$langs->load('compta');
@@ -1266,16 +1278,16 @@ class Paiement extends CommonObject
 		return '';
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Load the third party of object, from id into this->thirdparty
 	 *
 	 *	@param		int		$force_thirdparty_id	Force thirdparty id
 	 *	@return		int								<0 if KO, >0 if OK
 	 */
-    public function fetch_thirdparty($force_thirdparty_id = 0)
+	public function fetch_thirdparty($force_thirdparty_id = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 		if (empty($force_thirdparty_id))
diff --git a/htdocs/compta/paiement/info.php b/htdocs/compta/paiement/info.php
index 68d987b06ff..208d74a316f 100644
--- a/htdocs/compta/paiement/info.php
+++ b/htdocs/compta/paiement/info.php
@@ -55,7 +55,7 @@ $object->info($object->id);
 
 $head = payment_prepare_head($object);
 
-dol_fiche_head($head, 'info', $langs->trans("PaymentCustomerInvoice"), -1, 'payment');
+print dol_get_fiche_head($head, 'info', $langs->trans("PaymentCustomerInvoice"), -1, 'payment');
 
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
@@ -74,7 +74,7 @@ print '</td></tr></table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index eb2523960f3..e1f6fb38dbc 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -1,13 +1,14 @@
 <?php
-/* Copyright (C) 2001-2006 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) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
- * Copyright (C) 2015      Jean-François Ferry  <jfefe@aternatik.fr>
- * Copyright (C) 2015      Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2017      Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2018      Ferran Marcet        <fmarcet@2byte.es>
- * Copyright (C) 2018      Charlene Benke       <charlie@patas-monkey.com>
+/* Copyright (C) 2001-2006	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) 2013		Cédric Salvador			<csalvador@gpcsolutions.fr>
+ * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
+ * Copyright (C) 2015		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2017		Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2018		Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2018		Charlene Benke			<charlie@patas-monkey.com>
+ * Copyright (C) 2020		Tobias Sekan			<tobias.sekan@startmail.com>
  *
  * 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
@@ -30,6 +31,11 @@
  */
 
 require '../../main.inc.php';
+
+// Security check
+if ($user->socid) $socid = $user->socid;
+$result = restrictedArea($user, 'facture', $facid, '');
+
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
@@ -39,136 +45,169 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'banks', 'compta', 'companies'));
 
-$action		= GETPOST('action', 'alpha');
-$confirm	= GETPOST('confirm', 'alpha');
+$action				= GETPOST('action', 'alpha');
+$massaction			= GETPOST('massaction', 'alpha');
+$confirm			= GETPOST('confirm', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
+$contextpage		= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'paymentlist';
 
-$facid	= GETPOST('facid', 'int');
-$socid	= GETPOST('socid', 'int');
+$facid				= GETPOST('facid', 'int');
+$socid				= GETPOST('socid', 'int');
 $userid = GETPOST('userid', 'int');
 $day = GETPOST('day', 'int');
-$month	= GETPOST('month', 'int');
+$month				= GETPOST('month', 'int');
 $year = GETPOST('year', 'int');
 
-// Security check
-if ($user->socid) $socid = $user->socid;
-$result = restrictedArea($user, 'facture', $facid, '');
-
-$paymentstatic = new Paiement($db);
-$accountstatic = new Account($db);
-$companystatic = new Societe($db);
-
 $search_ref = GETPOST("search_ref", "alpha");
-$search_account = GETPOST("search_account", "int");
-$search_paymenttype = GETPOST("search_paymenttype");
+$search_company		= GETPOST("search_company", 'alpha');
+$search_paymenttype	= GETPOST("search_paymenttype");
+$search_account		= GETPOST("search_account", "int");
+$search_payment_num	= GETPOST('search_payment_num', 'alpha');
 $search_amount = GETPOST("search_amount", 'alpha'); // alpha because we must be able to search on "< x"
-$search_company = GETPOST("search_company", 'alpha');
-$search_payment_num = GETPOST('search_payment_num', 'alpha');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield			= GETPOST("sortfield", 'alpha');
+$sortorder			= GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+
+if (empty($page) || $page == -1) $page = 0; // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
+
 if (!$sortorder) $sortorder = "DESC";
-if (!$sortfield) $sortfield = "p.rowid";
+if (!$sortfield) $sortfield = "p.ref";
+
+$search_all = trim(GETPOSTISSET("search_all") ? GETPOST("search_all", 'alpha') : GETPOST('sall'));
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array(
+	'p.ref'=>"RefPayment",
+	's.nom'=>"ThirdParty",
+	'p.num_paiement'=>"Numero",
+	'p.amount'=>"Amount",
+);
+
+$arrayfields = array(
+	'p.ref'				=> array('label'=>"RefPayment", 'checked'=>1, 'position'=>10),
+	'p.datep'			=> array('label'=>"Date", 'checked'=>1, 'position'=>20),
+	's.nom'				=> array('label'=>"ThirdParty", 'checked'=>1, 'position'=>30),
+	'c.libelle'			=> array('label'=>"Type", 'checked'=>1, 'position'=>40),
+	'transaction'		=> array('label'=>"BankTransactionLine", 'checked'=>1, 'position'=>50, 'enabled'=>(!empty($conf->banque->enabled))),
+	'ba.label'			=> array('label'=>"Account", 'checked'=>1, 'position'=>60, 'enabled'=>(!empty($conf->banque->enabled))),
+	'p.num_paiement'	=> array('label'=>"Numero", 'checked'=>1, 'position'=>70, 'tooltip'=>"ChequeOrTransferNumber"),
+	'p.amount'			=> array('label'=>"Amount", 'checked'=>1, 'position'=>80),
+	'p.statut'			=> array('label'=>"Status", 'checked'=>1, 'position'=>90, 'enabled'=>(!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))),
+);
+$arrayfields = dol_sort_array($arrayfields, 'position');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('paymentlist'));
-$extrafields = new ExtraFields($db);
-
-$arrayfields = array();
-
+$object = new Paiement($db);
 
 /*
  * Actions
  */
 
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-{
-	$search_ref = "";
-	$search_account = "";
-	$search_amount = "";
-    $search_paymenttype = "";
-    $search_payment_num = "";
-	$search_company = "";
-    $day = '';
-    $year = '';
-    $month = '';
-    $search_array_options = array();
+$parameters = array('socid'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+
+if (empty($reshook)) {
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	// All tests are required to be compatible with all browsers
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+		$search_ref = '';
+		$search_account = '';
+		$search_amount = '';
+		$search_paymenttype = '';
+		$search_payment_num = '';
+		$search_company = '';
+		$day = '';
+		$year = '';
+		$month = '';
+		$option = '';
+		$toselect = '';
+		$search_array_options = array();
+	}
 }
 
-
 /*
- * 	View
+ * View
  */
 
 $form = new Form($db);
 $formother = new FormOther($db);
+$accountstatic = new Account($db);
+$companystatic = new Societe($db);
+$bankline = new AccountLine($db);
 
 llxHeader('', $langs->trans('ListPayment'));
 
-if (GETPOST("orphelins", "alpha"))
-{
-    // Payments not linked to an invoice. Should not happend. For debug only.
-    $sql = "SELECT p.rowid, p.ref, p.datep as dp, p.amount,";
-    $sql .= " p.statut, p.num_paiement as num_payment,";
-    $sql .= " c.code as paiement_code";
+if (GETPOST("orphelins", "alpha")) {
+	// Payments not linked to an invoice. Should not happend. For debug only.
+	$sql = "SELECT p.ref, p.datep, p.amount, p.statut, p.num_paiement";
+	$sql .= ", c.code as paiement_code";
+
 	// Add fields from hooks
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
 	$sql .= $hookmanager->resPrint;
-    $sql .= " FROM ".MAIN_DB_PREFIX."paiement as p LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
-    $sql .= " WHERE p.entity IN (".getEntity('invoice').")";
-    $sql .= " AND pf.fk_facture IS NULL";
+	$sql .= " FROM ".MAIN_DB_PREFIX."paiement as p LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
+	$sql .= " WHERE p.entity IN (".getEntity('invoice').")";
+	$sql .= " AND pf.fk_facture IS NULL";
+
 	// Add where from hooks
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 	$sql .= $hookmanager->resPrint;
 } else {
-    $sql = "SELECT DISTINCT p.rowid, p.ref, p.datep as dp, p.amount,"; // DISTINCT is to avoid duplicate when there is a link to sales representatives
-    $sql .= " p.statut, p.num_paiement as num_payment,";
-    $sql .= " c.code as paiement_code,";
-    $sql .= " ba.rowid as bid, ba.ref as bref, ba.label as blabel, ba.number, ba.account_number as account_number, ba.fk_accountancy_journal as accountancy_journal,";
-    $sql .= " s.rowid as socid, s.nom as name, s.email";
+	// DISTINCT is to avoid duplicate when there is a link to sales representatives
+	$sql = "SELECT DISTINCT p.ref, p.datep, p.fk_bank, p.amount, p.statut, p.num_paiement";
+	$sql .= ", c.code as paiement_code";
+	$sql .= ", ba.rowid as bid, ba.ref as bref, ba.label as blabel, ba.number, ba.account_number as account_number, ba.fk_accountancy_journal as accountancy_journal";
+	$sql .= ", s.rowid as socid, s.nom as name, s.email";
+
 	// Add fields from hooks
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
 	$sql .= $hookmanager->resPrint;
-    $sql .= " FROM ".MAIN_DB_PREFIX."paiement as p";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON p.fk_bank = b.rowid";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON pf.fk_facture = f.rowid";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
-    if (!$user->rights->societe->client->voir && !$socid)
-    {
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
-    }
-    $sql .= " WHERE p.entity IN (".getEntity('invoice').")";
-    if (!$user->rights->societe->client->voir && !$socid)
-    {
-        $sql .= " AND sc.fk_user = ".$user->id;
-    }
-    if ($socid > 0) $sql .= " AND f.fk_soc = ".$socid;
-    if ($userid)
-    {
-        if ($userid == -1) $sql .= " AND f.fk_user_author IS NULL";
-        else $sql .= " AND f.fk_user_author = ".$userid;
-    }
-    // Search criteria
-    $sql .= dolSqlDateFilter("p.datep", $day, $month, $year);
-    if ($search_ref)       		    $sql .= natural_search('p.ref', $search_ref);
-    if ($search_account > 0)      	$sql .= " AND b.fk_account=".$search_account;
-    if ($search_paymenttype != "")  $sql .= " AND c.code='".$db->escape($search_paymenttype)."'";
-    if ($search_payment_num != '')  $sql .= natural_search('p.num_paiement', $search_payment_num);
-    if ($search_amount)      		$sql .= natural_search('p.amount', $search_amount, 1);
-    if ($search_company)     		$sql .= natural_search('s.nom', $search_company);
+	$sql .= " FROM ".MAIN_DB_PREFIX."paiement as p";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON p.fk_bank = b.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON pf.fk_facture = f.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+	}
+	$sql .= " WHERE p.entity IN (".getEntity('invoice').")";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND sc.fk_user = ".$user->id;
+	}
+	if ($socid > 0) {
+		$sql .= " AND f.fk_soc = ".$socid;
+	}
+	if ($userid) {
+		if ($userid == -1) $sql .= " AND f.fk_user_author IS NULL";
+		else $sql .= " AND f.fk_user_author = ".$userid;
+	}
+
+	// Search criteria
+	$sql .= dolSqlDateFilter("p.datep", $day, $month, $year);
+	if ($search_ref)       		    $sql .= natural_search('p.ref', $search_ref);
+	if ($search_account > 0)      	$sql .= " AND b.fk_account=".$search_account;
+	if ($search_paymenttype != '')  $sql .= " AND c.code='".$db->escape($search_paymenttype)."'";
+	if ($search_payment_num != '')  $sql .= natural_search('p.num_paiement', $search_payment_num);
+	if ($search_amount)      		$sql .= natural_search('p.amount', $search_amount, 1);
+	if ($search_company)     		$sql .= natural_search('s.nom', $search_company);
+
+	if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+
 	// Add where from hooks
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
@@ -177,209 +216,291 @@ if (GETPOST("orphelins", "alpha"))
 $sql .= $db->order($sortfield, $sortorder);
 
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-	{
+
+	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords) {
 		$page = 0;
 		$offset = 0;
 	}
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
-//print "$sql";
 
 $resql = $db->query($sql);
-if ($resql)
-{
-    $num = $db->num_rows($resql);
-
-    $param = '';
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-    $param .= (GETPOST("orphelins") ? "&orphelins=1" : "");
-    $param .= ($search_ref ? "&search_ref=".urlencode($search_ref) : "");
-    $param .= ($search_company ? "&search_company=".urlencode($search_company) : "");
-    $param .= ($search_amount ? "&search_amount=".urlencode($search_amount) : "");
-    $param .= ($search_payment_num ? "&search_payment_num=".urlencode($search_payment_num) : "");
-    if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
-
-    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="list">';
-    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="search_status" value="'.$search_status.'">';
-
-    print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'bill', 0, '', '', $limit, 0, 0, 1);
-
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
-
-    // Lines for filters fields
-    print '<tr class="liste_titre_filter">';
-    print '<td class="liste_titre left">';
-    print '<input class="flat" type="text" size="4" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
-    print '</td>';
-    print '<td class="liste_titre center">';
-    if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
-    print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month" value="'.dol_escape_htmltag($month).'">';
-    $formother->select_year($year ? $year : -1, 'year', 1, 20, 5);
-    print '</td>';
-    print '<td class="liste_titre">';
-    print '<input class="flat" type="text" size="6" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
-    print '</td>';
-    print '<td class="liste_titre">';
-    $form->select_types_paiements($search_paymenttype, 'search_paymenttype', '', 2, 1, 1);
-    print '</td>';
-    print '<td class="liste_titre">';
-    print '<input class="flat" type="text" size="4" name="search_payment_num" value="'.dol_escape_htmltag($search_payment_num).'">';
-    print '</td>';
-    if (!empty($conf->banque->enabled))
-    {
-	    print '<td class="liste_titre">';
-	    $form->select_comptes($search_account, 'search_account', 0, '', 1);
-	    print '</td>';
-    }
-    print '<td class="liste_titre right">';
-    print '<input class="flat" type="text" size="4" name="search_amount" value="'.dol_escape_htmltag($search_amount).'">';
-	print '</td>';
-    print '<td class="liste_titre maxwidthsearch">';
-    $searchpicto = $form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
-    if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
-    {
-        print '<td class="liste_titre right">';
-        print '</td>';
-    }
-    print "</tr>\n";
-
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "p.rowid", "", $param, "", $sortfield, $sortorder);
-    print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "dp", "", $param, '', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", "", $param, "", $sortfield, $sortorder);
-    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "c.libelle", "", $param, "", $sortfield, $sortorder);
-    print_liste_field_titre("Numero", $_SERVER["PHP_SELF"], "p.num_paiement", "", $param, "", $sortfield, $sortorder);
-    if (!empty($conf->banque->enabled))
-    {
-        print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
-    }
-    print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "p.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-    //print_liste_field_titre("Invoices"),"","","",$param,'class="left"',$sortfield,$sortorder);
-
-	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
-    $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-
-    if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "p.statut", "", $param, 'class="right"', $sortfield, $sortorder);
-    print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
-    print "</tr>\n";
-
-    $i = 0;
-    $totalarray = array();
-    while ($i < min($num, $limit))
-    {
-        $objp = $db->fetch_object($resql);
-
-        $paymentstatic->id = $objp->rowid;
-        $paymentstatic->ref = $objp->ref;
-
-        $companystatic->id = $objp->socid;
-        $companystatic->name = $objp->name;
-        $companystatic->email = $objp->email;
-
-        print '<tr class="oddeven">';
-
-        print '<td>';
-        print $paymentstatic->getNomUrl(1);
-        print '</td>';
-        if (!$i) $totalarray['nbfield']++;
-
-        // Date
-        $dateformatforpayment = 'day';
-        if (!empty($conf->global->INVOICE_USE_HOURS_FOR_PAYMENT)) $dateformatforpayment = 'dayhour';
-        print '<td class="center">'.dol_print_date($db->jdate($objp->dp), $dateformatforpayment).'</td>';
-        if (!$i) $totalarray['nbfield']++;
-
-        // Thirdparty
-        print '<td>';
-        if ($objp->socid > 0)
-        {
-            print $companystatic->getNomUrl(1, '', 24);
-        }
-        print '</td>';
-        if (!$i) $totalarray['nbfield']++;
-
-        // Type
-        print '<td>'.$langs->trans("PaymentTypeShort".$objp->paiement_code).'</td>';
-        if (!$i) $totalarray['nbfield']++;
-
-        // Payment number
-        print '<td>'.$objp->num_payment.'</td>';
-        if (!$i) $totalarray['nbfield']++;
-
-        // Account
-	    if (!empty($conf->banque->enabled))
-	    {
-	        print '<td>';
-	        if ($objp->bid > 0)
-	        {
-	            $accountstatic->id = $objp->bid;
-	            $accountstatic->ref = $objp->bref;
-	            $accountstatic->label = $objp->blabel;
-	            $accountstatic->number = $objp->number;
-	            $accountstatic->account_number = $objp->account_number;
-
-				$accountingjournal = new AccountingJournal($db);
-				$accountingjournal->fetch($objp->accountancy_journal);
-				$accountstatic->accountancy_journal = $accountingjournal->code;
-
-	            print $accountstatic->getNomUrl(1);
-	        }
-	        print '</td>';
-	        if (!$i) $totalarray['nbfield']++;
-	    }
-
-	    // Amount
-        print '<td class="right">'.price($objp->amount).'</td>';
-        if (!$i) $totalarray['nbfield']++;
-        $totalarray['pos'][7] = 'amount';
-        $totalarray['val']['amount'] += $objp->amount;
-
-        if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
-        {
-            print '<td class="right">';
-            if ($objp->statut == 0) print '<a href="card.php?id='.$objp->rowid.'&amp;action=valide">';
-            print $paymentstatic->LibStatut($objp->statut, 5);
-            if ($objp->statut == 0) print '</a>';
-            print '</td>';
-            if (!$i) $totalarray['nbfield']++;
-        }
-
-		print '<td></td>';
-		if (!$i) $totalarray['nbfield']++;
-
-		print '</tr>';
-
-        $i++;
-    }
-
-    // Show total line
-    include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
-
-
-    print "</table>\n";
-    print "</div>";
-    print "</form>\n";
-} else {
-    dol_print_error($db);
+if (!$resql) {
+	dol_print_error($db);
+	llxFooter();
+	$db->close();
+	exit;
 }
 
+$num = $db->num_rows($resql);
+
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+$param .= (GETPOST("orphelins") ? "&orphelins=1" : '');
+$param .= ($search_ref ? "&search_ref=".urlencode($search_ref) : '');
+$param .= ($search_company ? "&search_company=".urlencode($search_company) : '');
+$param .= ($search_amount ? "&search_amount=".urlencode($search_amount) : '');
+$param .= ($search_payment_num ? "&search_payment_num=".urlencode($search_payment_num) : '');
+if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
+
+print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="search_status" value="'.$search_status.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'bill', 0, '', '', $limit, 0, 0, 1);
+
+if ($search_all)
+{
+	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+}
+
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+
+print '<div class="div-table-responsive">';
+print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : '').'">';
+
+print '<tr class="liste_titre_filter">';
+
+// Filters: Lines (placeholder)
+print '<tr class="liste_titre_filter">';
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+
+// Filter: Ref
+if (!empty($arrayfields['p.ref']['checked'])) {
+	print '<td class="liste_titre left">';
+	print '<input class="flat" type="text" size="4" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+	print '</td>';
+}
+
+// Filter: Date
+if (!empty($arrayfields['p.datep']['checked'])) {
+	print '<td class="liste_titre center">';
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
+	print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month" value="'.dol_escape_htmltag($month).'">';
+	$formother->select_year($year ? $year : -1, 'year', 1, 20, 5);
+	print '</td>';
+}
+
+// Filter: Thirdparty
+if (!empty($arrayfields['s.nom']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input class="flat" type="text" size="6" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
+	print '</td>';
+}
+
+// Filter: Payment type
+if (!empty($arrayfields['c.libelle']['checked'])) {
+	print '<td class="liste_titre">';
+	$form->select_types_paiements($search_paymenttype, 'search_paymenttype', '', 2, 1, 1);
+	print '</td>';
+}
+
+// Filter: Bank transaction number
+if (!empty($arrayfields['transaction']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input class="flat" type="text" size="4" name="search_payment_num" value="'.dol_escape_htmltag($search_payment_num).'">';
+	print '</td>';
+}
+
+// Filter: Cheque number (fund transfer)
+if (!empty($arrayfields['p.num_paiement']['checked'])) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+
+// Filter: Bank account
+if (!empty($arrayfields['ba.label']['checked'])) {
+	print '<td class="liste_titre">';
+	$form->select_comptes($search_account, 'search_account', 0, '', 1);
+	print '</td>';
+}
+
+// Filter: Amount
+if (!empty($arrayfields['p.amount']['checked'])) {
+	print '<td class="liste_titre right">';
+	print '<input class="flat" type="text" size="4" name="search_amount" value="'.dol_escape_htmltag($search_amount).'">';
+	print '</td>';
+}
+
+// Filter: Status (only placeholder)
+if (!empty($arrayfields['p.statut']['checked'])) {
+	print '<td class="liste_titre right">';
+	print '</td>';
+}
+
+// Fields from hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print '<td class="liste_titre maxwidthsearch">';
+print $form->showFilterAndCheckAddButtons(0);
+print '</td>';
+
+print "</tr>";
+
+print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST))	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['p.ref']['checked']))				print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['p.datep']['checked']))				print_liste_field_titre($arrayfields['p.datep']['label'], $_SERVER["PHP_SELF"], "p.datep", '', $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['s.nom']['checked']))				print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['c.libelle']['checked']))			print_liste_field_titre($arrayfields['c.libelle']['label'], $_SERVER["PHP_SELF"], "c.libelle", '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['p.num_paiement']['checked']))		print_liste_field_titre($arrayfields['p.num_paiement']['label'], $_SERVER["PHP_SELF"], "p.num_paiement", '', $param, '', $sortfield, $sortorder, '', $arrayfields['p.num_paiement']['tooltip']);
+if (!empty($arrayfields['transaction']['checked']))			print_liste_field_titre($arrayfields['transaction']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['ba.label']['checked']))			print_liste_field_titre($arrayfields['ba.label']['label'], $_SERVER["PHP_SELF"], "ba.label", '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['p.amount']['checked']))			print_liste_field_titre($arrayfields['p.amount']['label'], $_SERVER["PHP_SELF"], "p.amount", '', $param, 'class="right"', $sortfield, $sortorder);
+if (!empty($arrayfields['p.statut']['checked']))			print_liste_field_titre($arrayfields['p.statut']['label'], $_SERVER["PHP_SELF"], "p.statut", '', $param, 'class="right"', $sortfield, $sortorder);
+
+// Hook fields
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+print "</tr>";
+
+$checkedCount = 0;
+foreach ($arrayfields as $column) {
+	if ($column['checked']) {
+		$checkedCount++;
+	}
+}
+
+$i = 0;
+$totalarray = array();
+while ($i < min($num, $limit)) {
+	$objp = $db->fetch_object($resql);
+
+	$object->id = $objp->rowid;
+	$object->ref = $objp->ref;
+
+	$companystatic->id = $objp->socid;
+	$companystatic->name = $objp->name;
+	$companystatic->email = $objp->email;
+
+	print '<tr class="oddeven">';
+
+	// No
+	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+		print '<td>'.(($offset * $limit) + $i).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Ref
+	if (!empty($arrayfields['p.ref']['checked'])) {
+		print '<td>'.$object->getNomUrl(1).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Date
+	if (!empty($arrayfields['p.datep']['checked'])) {
+		$dateformatforpayment = 'day';
+		if (!empty($conf->global->INVOICE_USE_HOURS_FOR_PAYMENT)) $dateformatforpayment = 'dayhour';
+		print '<td class="center">'.dol_print_date($db->jdate($objp->datep), $dateformatforpayment).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Thirdparty
+	if (!empty($arrayfields['s.nom']['checked'])) {
+		print '<td>';
+		if ($objp->socid > 0) {
+			print $companystatic->getNomUrl(1, '', 24);
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Payment type
+	if (!empty($arrayfields['c.libelle']['checked'])) {
+		print '<td>'.$langs->trans("PaymentTypeShort".$objp->paiement_code).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Filter: Cheque number (fund transfer)
+	if (!empty($arrayfields['p.num_paiement']['checked'])) {
+		print '<td>'.$objp->num_paiement.'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Bank transaction
+	if (!empty($arrayfields['transaction']['checked'])) {
+		$bankline->fetch($objp->fk_bank);
+		print '<td>'.$bankline->getNomUrl(1, 0).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Bank account
+	if (!empty($arrayfields['ba.label']['checked'])) {
+		print '<td>';
+		if ($objp->bid > 0) {
+			$accountstatic->id = $objp->bid;
+			$accountstatic->ref = $objp->bref;
+			$accountstatic->label = $objp->blabel;
+			$accountstatic->number = $objp->number;
+			$accountstatic->account_number = $objp->account_number;
+
+			$accountingjournal = new AccountingJournal($db);
+			$accountingjournal->fetch($objp->accountancy_journal);
+			$accountstatic->accountancy_journal = $accountingjournal->code;
+
+			print $accountstatic->getNomUrl(1);
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Amount
+	if (!empty($arrayfields['p.amount']['checked'])) {
+		print '<td class="right">'.price($objp->amount).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+		$totalarray['pos'][$checkedCount] = 'amount';
+		$totalarray['val']['amount'] += $objp->amount;
+	}
+
+	// Status
+	if (!empty($arrayfields['p.statut']['checked'])) {
+		print '<td class="right">';
+		if ($objp->statut == 0) print '<a href="card.php?id='.$objp->rowid.'&amp;action=valide">';
+		print $object->LibStatut($objp->statut, 5);
+		if ($objp->statut == 0) print '</a>';
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Buttons
+	print '<td></td>';
+	if (!$i) $totalarray['nbfield']++;
+
+	print '</tr>';
+
+	$i++;
+}
+
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+print "</table>";
+print "</div>";
+print "</form>";
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index 9d3bae3140d..47bb2ad2582 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -38,8 +38,8 @@ $action = GETPOST('action', 'aZ09');
 $socid = 0;
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $dir = $conf->facture->dir_output.'/payments';
@@ -55,27 +55,27 @@ if (!$year) { $year = date("Y"); }
 
 if ($action == 'builddoc')
 {
-    $rap = new pdf_paiement($db);
+	$rap = new pdf_paiement($db);
 
-    $outputlangs = $langs;
-    if (GETPOST('lang_id', 'aZ09'))
-    {
-        $outputlangs = new Translate("", $conf);
-        $outputlangs->setDefaultLang(GETPOST('lang_id', 'aZ09'));
-    }
+	$outputlangs = $langs;
+	if (GETPOST('lang_id', 'aZ09'))
+	{
+		$outputlangs = new Translate("", $conf);
+		$outputlangs->setDefaultLang(GETPOST('lang_id', 'aZ09'));
+	}
 
-    // We save charset_output to restore it because write_file can change it if needed for
-    // output format that does not support UTF8.
-    $sav_charset_output = $outputlangs->charset_output;
-    if ($rap->write_file($dir, $_POST["remonth"], $_POST["reyear"], $outputlangs) > 0)
-    {
-        $outputlangs->charset_output = $sav_charset_output;
-    } else {
-        $outputlangs->charset_output = $sav_charset_output;
-        dol_print_error($db, $obj->error);
-    }
+	// We save charset_output to restore it because write_file can change it if needed for
+	// output format that does not support UTF8.
+	$sav_charset_output = $outputlangs->charset_output;
+	if ($rap->write_file($dir, $_POST["remonth"], $_POST["reyear"], $outputlangs) > 0)
+	{
+		$outputlangs->charset_output = $sav_charset_output;
+	} else {
+		$outputlangs->charset_output = $sav_charset_output;
+		dol_print_error($db, $obj->error);
+	}
 
-    $year = $_POST["reyear"];
+	$year = $_POST["reyear"];
 }
 
 
@@ -113,59 +113,59 @@ $linkforyear = array();
 $found = 0;
 if (is_dir($dir))
 {
-    $handle = opendir($dir);
-    if (is_resource($handle))
-    {
-        while (($file = readdir($handle)) !== false)
-        {
-            if (is_dir($dir.'/'.$file) && !preg_match('/^\./', $file) && is_numeric($file))
-            {
-                $found = 1;
-                $linkforyear[] = $file;
-            }
-        }
-    }
+	$handle = opendir($dir);
+	if (is_resource($handle))
+	{
+		while (($file = readdir($handle)) !== false)
+		{
+			if (is_dir($dir.'/'.$file) && !preg_match('/^\./', $file) && is_numeric($file))
+			{
+				$found = 1;
+				$linkforyear[] = $file;
+			}
+		}
+	}
 }
 asort($linkforyear);
 foreach ($linkforyear as $cursoryear)
 {
-    print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$cursoryear.'">'.$cursoryear.'</a> &nbsp;';
+	print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$cursoryear.'">'.$cursoryear.'</a> &nbsp;';
 }
 
 if ($year)
 {
-    if (is_dir($dir.'/'.$year))
-    {
-        $handle = opendir($dir.'/'.$year);
+	if (is_dir($dir.'/'.$year))
+	{
+		$handle = opendir($dir.'/'.$year);
 
-        if ($found) print '<br>';
-        print '<br>';
-        print '<table width="100%" class="noborder">';
-        print '<tr class="liste_titre">';
-        print '<td>'.$langs->trans("Reporting").'</td>';
-        print '<td class="right">'.$langs->trans("Size").'</td>';
-        print '<td class="right">'.$langs->trans("Date").'</td>';
-        print '</tr>';
+		if ($found) print '<br>';
+		print '<br>';
+		print '<table width="100%" class="noborder">';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("Reporting").'</td>';
+		print '<td class="right">'.$langs->trans("Size").'</td>';
+		print '<td class="right">'.$langs->trans("Date").'</td>';
+		print '</tr>';
 
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (preg_match('/^payment/i', $file))
-                {
-                    $tfile = $dir.'/'.$year.'/'.$file;
-                    $relativepath = $year.'/'.$file;
-                    print '<tr class="oddeven">';
-                    print '<td><a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart=facture_paiement&amp;file='.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a>'.$formfile->showPreview($file, 'facture_paiement', $relativepath, 0).'</td>';
-                    print '<td class="right">'.dol_print_size(dol_filesize($tfile)).'</td>';
-                    print '<td class="right">'.dol_print_date(dol_filemtime($tfile), "dayhour").'</td>';
-                    print '</tr>';
-                }
-            }
-            closedir($handle);
-        }
-        print '</table>';
-    }
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (preg_match('/^payment/i', $file))
+				{
+					$tfile = $dir.'/'.$year.'/'.$file;
+					$relativepath = $year.'/'.$file;
+					print '<tr class="oddeven">';
+					print '<td><a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart=facture_paiement&amp;file='.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a>'.$formfile->showPreview($file, 'facture_paiement', $relativepath, 0).'</td>';
+					print '<td class="right">'.dol_print_size(dol_filesize($tfile)).'</td>';
+					print '<td class="right">'.dol_print_date(dol_filemtime($tfile), "dayhour").'</td>';
+					print '</tr>';
+				}
+			}
+			closedir($handle);
+		}
+		print '</table>';
+	}
 }
 
 // End of page
diff --git a/htdocs/compta/paiement/tovalidate.php b/htdocs/compta/paiement/tovalidate.php
index 00e9a0c4074..f6582a4ffb4 100644
--- a/htdocs/compta/paiement/tovalidate.php
+++ b/htdocs/compta/paiement/tovalidate.php
@@ -34,8 +34,8 @@ if (!$user->rights->facture->lire)
 $socid = 0;
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 
@@ -68,13 +68,13 @@ $sql .= ", c.libelle as paiement_type, p.num_paiement as num_payment";
 $sql .= " FROM ".MAIN_DB_PREFIX."paiement as p LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id";
 if ($socid)
 {
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON pf.fk_facture = f.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON pf.fk_facture = f.rowid";
 }
 $sql .= " WHERE p.entity IN (".getEntity('invoice').')';
 if ($socid)
 {
-    $sql .= " AND f.fk_soc = ".$socid;
+	$sql .= " AND f.fk_soc = ".$socid;
 }
 $sql .= " AND p.statut = 0";
 
@@ -84,13 +84,13 @@ $sql .= $db->order($sortfield, $sortorder);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-    	$page = 0;
-    	$offset = 0;
-    }
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -98,43 +98,43 @@ $sql .= $db->plimit($limit + 1, $offset);
 $resql = $db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
-    $i = 0;
+	$num = $db->num_rows($resql);
+	$i = 0;
 
-    print_barre_liste($langs->trans("ReceivedCustomersPaymentsToValid"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num);
+	print_barre_liste($langs->trans("ReceivedCustomersPaymentsToValid"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num);
 
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.rowid", "", "", 'width="60"', $sortfield, $sortorder);
-    print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "dp", "", "", 'width="80" align="center"', $sortfield, $sortorder);
-    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "c.libelle", "", "", "", $sortfield, $sortorder);
-    print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], "c.libelle", "", "", 'class="right"', $sortfield, $sortorder);
-    print_liste_field_titre('');
-    print "</tr>\n";
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.rowid", "", "", 'width="60"', $sortfield, $sortorder);
+	print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "dp", "", "", 'width="80" align="center"', $sortfield, $sortorder);
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "c.libelle", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], "c.libelle", "", "", 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre('');
+	print "</tr>\n";
 
-    while ($i < min($num, $limit))
-    {
-        $objp = $db->fetch_object($resql);
+	while ($i < min($num, $limit))
+	{
+		$objp = $db->fetch_object($resql);
 
-        print '<tr class="oddeven">';
-        print '<td><a href="'.DOL_URL_ROOT.'/compta/paiement/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowPayment"), "payment").' '.$objp->rowid.'</a></td>';
-        print '<td width="80" align="center">'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
-        print "<td>$objp->paiement_type $objp->num_payment</td>\n";
-        print '<td class="right">'.price($objp->amount).'</td>';
-        print '<td class="center">';
+		print '<tr class="oddeven">';
+		print '<td><a href="'.DOL_URL_ROOT.'/compta/paiement/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowPayment"), "payment").' '.$objp->rowid.'</a></td>';
+		print '<td width="80" align="center">'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
+		print "<td>$objp->paiement_type $objp->num_payment</td>\n";
+		print '<td class="right">'.price($objp->amount).'</td>';
+		print '<td class="center">';
 
-        if ($objp->statut == 0)
-        {
-            print '<a href="card.php?id='.$objp->rowid.'&amp;action=valide">'.$langs->trans("PaymentStatusToValidShort").'</a>';
-        } else {
-            print "-";
-        }
+		if ($objp->statut == 0)
+		{
+			print '<a href="card.php?id='.$objp->rowid.'&amp;action=valide">'.$langs->trans("PaymentStatusToValidShort").'</a>';
+		} else {
+			print "-";
+		}
 
-        print '</td>';
-        print "</tr>";
-        $i++;
-    }
-    print "</table>";
+		print '</td>';
+		print "</tr>";
+		$i++;
+	}
+	print "</table>";
 }
 
 // End of page
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index 5f442ab0b18..299cdf9a6c3 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -65,20 +65,20 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode")), null, 'errors');
 		$error++;
-        $action = 'create';
+		$action = 'create';
 	}
 	if ($datepaye == '')
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
 		$error++;
-        $action = 'create';
+		$action = 'create';
+	}
+	if (!empty($conf->banque->enabled) && !($_POST["accountid"] > 0))
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToCredit")), null, 'errors');
+		$error++;
+		$action = 'create';
 	}
-    if (!empty($conf->banque->enabled) && !($_POST["accountid"] > 0))
-    {
-        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToCredit")), null, 'errors');
-        $error++;
-        $action = 'create';
-    }
 
 	if (!$error)
 	{
@@ -94,59 +94,59 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
 			}
 		}
 
-        if (count($amounts) <= 0)
-        {
-            $error++;
-            setEventMessages($langs->trans("ErrorNoPaymentDefined"), null, 'errors');
-            $action = 'create';
-        }
+		if (count($amounts) <= 0)
+		{
+			$error++;
+			setEventMessages($langs->trans("ErrorNoPaymentDefined"), null, 'errors');
+			$action = 'create';
+		}
 
-        if (!$error)
-        {
-    		$db->begin();
+		if (!$error)
+		{
+			$db->begin();
 
-    		// Create a line of payments
-    		$paiement = new PaymentSocialContribution($db);
-    		$paiement->chid         = $chid;
-    		$paiement->datepaye     = $datepaye;
-    		$paiement->amounts      = $amounts; // Tableau de montant
-    		$paiement->paiementtype = GETPOST("paiementtype", 'alphanohtml');
-    		$paiement->num_payment  = GETPOST("num_payment", 'alphanohtml');
-    		$paiement->note         = GETPOST("note", 'restricthtml');
-    		$paiement->note_private = GETPOST("note", 'restricthtml');
+			// Create a line of payments
+			$paiement = new PaymentSocialContribution($db);
+			$paiement->chid         = $chid;
+			$paiement->datepaye     = $datepaye;
+			$paiement->amounts      = $amounts; // Amount list
+			$paiement->paiementtype = GETPOST("paiementtype", 'alphanohtml');
+			$paiement->num_payment  = GETPOST("num_payment", 'alphanohtml');
+			$paiement->note         = GETPOST("note", 'restricthtml');
+			$paiement->note_private = GETPOST("note", 'restricthtml');
 
-    		if (!$error)
-    		{
-    		    $paymentid = $paiement->create($user, (GETPOST('closepaidcontrib') == 'on' ? 1 : 0));
-                if ($paymentid < 0)
-                {
-                	$error++;
-                	setEventMessages($paiement->error, null, 'errors');
-                	$action = 'create';
-                }
-    		}
+			if (!$error)
+			{
+				$paymentid = $paiement->create($user, (GETPOST('closepaidcontrib') == 'on' ? 1 : 0));
+				if ($paymentid < 0)
+				{
+					$error++;
+					setEventMessages($paiement->error, null, 'errors');
+					$action = 'create';
+				}
+			}
 
-            if (!$error)
-            {
-                $result = $paiement->addPaymentToBank($user, 'payment_sc', '(SocialContributionPayment)', GETPOST('accountid', 'int'), '', '');
-                if (!($result > 0))
-                {
-                	$error++;
-                	setEventMessages($paiement->error, null, 'errors');
-                	$action = 'create';
-                }
-            }
+			if (!$error)
+			{
+				$result = $paiement->addPaymentToBank($user, 'payment_sc', '(SocialContributionPayment)', GETPOST('accountid', 'int'), '', '');
+				if (!($result > 0))
+				{
+					$error++;
+					setEventMessages($paiement->error, null, 'errors');
+					$action = 'create';
+				}
+			}
 
-    	    if (!$error)
-            {
-                $db->commit();
-                $loc = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$chid;
-                header('Location: '.$loc);
-                exit;
-            } else {
-                $db->rollback();
-            }
-        }
+			if (!$error)
+			{
+				$db->commit();
+				$loc = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$chid;
+				header('Location: '.$loc);
+				exit;
+			} else {
+				$db->rollback();
+			}
+		}
 	}
 }
 
@@ -160,12 +160,12 @@ llxHeader();
 $form = new Form($db);
 
 
-// Formulaire de creation d'un paiement de charge
+// Form of charge payment creation
 if ($action == 'create')
 {
 	$charge->fetch($chid);
-    $charge->accountid = $charge->fk_account ? $charge->fk_account : $charge->accountid;
-    $charge->paiementtype = $charge->mode_reglement_id ? $charge->mode_reglement_id : $charge->paiementtype;
+	$charge->accountid = $charge->fk_account ? $charge->fk_account : $charge->accountid;
+	$charge->paiementtype = $charge->mode_reglement_id ? $charge->mode_reglement_id : $charge->paiementtype;
 
 	$total = $charge->amount;
 	if (!empty($conf->use_javascript_ajax))
@@ -197,7 +197,7 @@ if ($action == 'create')
 	print '<input type="hidden" name="chid" value="'.$chid.'">';
 	print '<input type="hidden" name="action" value="add_payment">';
 
-	dol_fiche_head('', '');
+	print dol_get_fiche_head('', '');
 
 	print '<table class="border centpercent">';
 
@@ -222,21 +222,21 @@ if ($action == 'create')
 	print '<tr><td class="tdtop">'.$langs->trans("RemainderToPay").'</td><td>'.price($total-$sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';*/
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
-	$datepaye = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
-	$datepayment = empty($conf->global->MAIN_AUTOFILL_DATE) ? (empty($_POST["remonth"]) ?-1 : $datepaye) : 0;
+	$datepaye = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'));
+	$datepayment = empty($conf->global->MAIN_AUTOFILL_DATE) ? (GETPOSTISSET("remonth") ? $datepaye : -1) : 0;
 	print $form->selectDate($datepayment, '', '', '', 0, "add_payment", 1, 1, 0, '', '', $charge->date_ech, '', 1, $langs->trans("DateOfSocialContribution"));
 	print "</td>";
 	print '</tr>';
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
-	$form->select_types_paiements(isset($_POST["paiementtype"]) ? $_POST["paiementtype"] : $charge->paiementtype, "paiementtype");
+	$form->select_types_paiements(GETPOSTISSET("paiementtype") ? GETPOST("paiementtype") : $charge->paiementtype, "paiementtype");
 	print "</td>\n";
 	print '</tr>';
 
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
 	print '<td>';
-	$form->select_comptes(isset($_POST["accountid"]) ? $_POST["accountid"] : $charge->accountid, "accountid", 0, '', 1); // Show opend bank account list
+	$form->select_comptes(GETPOSTISSET("accountid") ? GETPOST("accountid") : $charge->accountid, "accountid", 0, '', 2); // Show opend bank account list
 	print '</td></tr>';
 
 	// Number
@@ -252,10 +252,10 @@ if ($action == 'create')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	/*
- 	 * Autres charges impayees
+ 	 * Other unpaid charges
 	 */
 	$num = 1;
 	$i = 0;
@@ -327,11 +327,11 @@ if ($action == 'create')
 
 	print "</table>";
 
-	// Bouton Save payment
+	// Save payment button
 	print '<br><div class="center"><input type="checkbox" checked name="closepaidcontrib"> '.$langs->trans("ClosePaidContributionsAutomatically");
 	print '<br><input type="submit" class="button" name="save" value="'.$langs->trans('ToMakePayment').'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print "</form>\n";
diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index 0e71c83f6cb..11c8512a265 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -20,9 +20,9 @@
 
 /**
  *	    \file       htdocs/compta/payment_sc/card.php
- *		\ingroup    facture
- *		\brief      Onglet payment of a social contribution
- *		\remarks	Fichier presque identique a fournisseur/paiement/card.php
+ *		\ingroup    tax
+ *		\brief      Tab with payment of a social contribution
+ *		\remarks	File similar to fourn/paiement/card.php
  */
 
 require '../../main.inc.php';
@@ -38,7 +38,7 @@ $langs->loadLangs(array('bills', 'banks', 'companies'));
 // Security check
 $id = GETPOST("id", 'int');
 $action = GETPOST('action', 'aZ09');
-$confirm = GETPOST('confirm');
+$confirm = GETPOST('confirm', 'aZ09');
 if ($user->socid) $socid = $user->socid;
 // TODO ajouter regle pour restreindre acces paiement
 //$result = restrictedArea($user, 'facture', $id,'');
@@ -61,56 +61,16 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->tax->char
 	$db->begin();
 
 	$result = $object->delete($user);
-	if ($result > 0)
-	{
-        $db->commit();
-        header("Location: ".DOL_URL_ROOT."/compta/sociales/payments.php?mode=sconly");
-        exit;
-	} else {
-		setEventMessages($object->error, $object->errors, 'errors');
-        $db->rollback();
-	}
-}
-
-// Validate social contribution
-/*
-if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->tax->charges->creer)
-{
-	$db->begin();
-
-	$result=$object->valide();
-
 	if ($result > 0)
 	{
 		$db->commit();
-
-		$factures=array();	// TODO Get all id of invoices linked to this payment
-		foreach($factures as $id)
-		{
-			$fac = new Facture($db);
-			$fac->fetch($id);
-
-			$outputlangs = $langs;
-			if (! empty($_REQUEST['lang_id']))
-			{
-				$outputlangs = new Translate("",$conf);
-				$outputlangs->setDefaultLang($_REQUEST['lang_id']);
-			}
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-				$fac->generateDocument($fac->modelpdf, $outputlangs);
-			}
-		}
-
-		header('Location: card.php?id='.$object->id);
+		header("Location: ".DOL_URL_ROOT."/compta/sociales/payments.php");
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 	}
 }
-*/
 
 
 /*
@@ -136,7 +96,7 @@ $h++;
 */
 
 
-dol_fiche_head($head, $hselected, $langs->trans("PaymentSocialContribution"), -1, 'payment');
+print dol_get_fiche_head($head, $hselected, $langs->trans("PaymentSocialContribution"), -1, 'payment');
 
 /*
  * Deletion confirmation of payment
@@ -146,19 +106,6 @@ if ($action == 'delete')
 	print $form->formconfirm('card.php?id='.$object->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete', '', 0, 2);
 }
 
-/*
- * Validation confirmation of payment
- */
-/*
-if ($action == 'valide')
-{
-	$facid = $_GET['facid'];
-	print $form->formconfirm('card.php?id='.$object->id.'&amp;facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide','',0,2);
-
-}
-*/
-
-
 $linkback = '<a href="'.DOL_URL_ROOT.'/compta/sociales/payments.php">'.$langs->trans("BackToList").'</a>';
 
 dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'id', '');
@@ -184,7 +131,7 @@ print '<tr><td>'.$langs->trans('Mode').'</td><td colspan="3">'.$langs->trans("Pa
 // Numero
 print '<tr><td>'.$langs->trans('Numero').'</td><td colspan="3">'.$object->num_payment.'</td></tr>';
 
-// Montant
+// Amount
 print '<tr><td>'.$langs->trans('Amount').'</td><td colspan="3">'.price($object->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
 
 // Note
@@ -193,25 +140,25 @@ print '<tr><td>'.$langs->trans('Note').'</td><td colspan="3">'.nl2br($object->no
 // Bank account
 if (!empty($conf->banque->enabled))
 {
-    if ($object->bank_account)
-    {
-    	$bankline = new AccountLine($db);
-    	$bankline->fetch($object->bank_line);
+	if ($object->bank_account)
+	{
+		$bankline = new AccountLine($db);
+		$bankline->fetch($object->bank_line);
 
-    	print '<tr>';
-    	print '<td>'.$langs->trans('BankTransactionLine').'</td>';
+		print '<tr>';
+		print '<td>'.$langs->trans('BankTransactionLine').'</td>';
 		print '<td colspan="3">';
 		print $bankline->getNomUrl(1, 0, 'showall');
-    	print '</td>';
-    	print '</tr>';
-    }
+		print '</td>';
+		print '</tr>';
+	}
 }
 
 print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 /*
@@ -236,7 +183,7 @@ if ($resql)
 	print '<br><table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans('SocialContribution').'</td>';
-    print '<td>'.$langs->trans('Type').'</td>';
+	print '<td>'.$langs->trans('Type').'</td>';
 	print '<td>'.$langs->trans('Label').'</td>';
 	print '<td class="right">'.$langs->trans('ExpectedToPay').'</td>';
 	print '<td class="center">'.$langs->trans('Status').'</td>';
@@ -256,10 +203,10 @@ if ($resql)
 			print $socialcontrib->getNomUrl(1);
 			print "</td>\n";
 			// Type
-            print '<td>';
-            print $socialcontrib->type_label;
-            /*print $socialcontrib->type;*/
-            print "</td>\n";
+			print '<td>';
+			print $socialcontrib->type_label;
+			/*print $socialcontrib->type;*/
+			print "</td>\n";
 			// Label
 			print '<td>'.$objp->label.'</td>';
 			// Expected to pay
@@ -288,7 +235,7 @@ if ($resql)
 
 
 /*
- * Boutons Actions
+ * Actions Buttons
  */
 print '<div class="tabsAction">';
 
diff --git a/htdocs/compta/paymentbybanktransfer/index.php b/htdocs/compta/paymentbybanktransfer/index.php
index e2477d86544..78425398017 100644
--- a/htdocs/compta/paymentbybanktransfer/index.php
+++ b/htdocs/compta/paymentbybanktransfer/index.php
@@ -115,59 +115,59 @@ if ($socid) $sql .= " AND f.fk_soc = ".$socid;
 $resql = $db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
-    $i = 0;
+	$num = $db->num_rows($resql);
+	$i = 0;
 
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<th colspan="5">'.$langs->trans("SupplierInvoiceWaitingWithdraw").' ('.$num.')</th></tr>';
-    if ($num)
-    {
-        while ($i < $num && $i < 20)
-        {
-            $obj = $db->fetch_object($resql);
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<th colspan="5">'.$langs->trans("SupplierInvoiceWaitingWithdraw").' ('.$num.')</th></tr>';
+	if ($num)
+	{
+		while ($i < $num && $i < 20)
+		{
+			$obj = $db->fetch_object($resql);
 
-            $invoicestatic->id = $obj->rowid;
-            $invoicestatic->ref = $obj->ref;
-            $invoicestatic->statut = $obj->fk_statut;
-            $invoicestatic->paye = $obj->paye;
-            $invoicestatic->type = $obj->type;
-            $alreadypayed = $invoicestatic->getSommePaiement();
+			$invoicestatic->id = $obj->rowid;
+			$invoicestatic->ref = $obj->ref;
+			$invoicestatic->statut = $obj->fk_statut;
+			$invoicestatic->paye = $obj->paye;
+			$invoicestatic->type = $obj->type;
+			$alreadypayed = $invoicestatic->getSommePaiement();
 
-            $thirdpartystatic->id = $obj->socid;
-            $thirdpartystatic->name = $obj->name;
-            $thirdpartystatic->email = $obj->email;
-            $thirdpartystatic->tva_intra = $obj->tva_intra;
+			$thirdpartystatic->id = $obj->socid;
+			$thirdpartystatic->name = $obj->name;
+			$thirdpartystatic->email = $obj->email;
+			$thirdpartystatic->tva_intra = $obj->tva_intra;
 
-            print '<tr class="oddeven"><td>';
-            print $invoicestatic->getNomUrl(1, 'withdraw');
-            print '</td>';
+			print '<tr class="oddeven"><td>';
+			print $invoicestatic->getNomUrl(1, 'withdraw');
+			print '</td>';
 
-            print '<td>';
-            print $thirdpartystatic->getNomUrl(1, 'supplier');
-            print '</td>';
+			print '<td>';
+			print $thirdpartystatic->getNomUrl(1, 'supplier');
+			print '</td>';
 
-            print '<td class="right">';
-            print price($obj->amount);
-            print '</td>';
+			print '<td class="right">';
+			print price($obj->amount);
+			print '</td>';
 
-            print '<td class="right">';
-            print dol_print_date($db->jdate($obj->date_demande), 'day');
-            print '</td>';
+			print '<td class="right">';
+			print dol_print_date($db->jdate($obj->date_demande), 'day');
+			print '</td>';
 
-            print '<td class="right">';
-            print $invoicestatic->getLibStatut(3, $alreadypayed);
-            print '</td>';
-            print '</tr>';
-            $i++;
-        }
-    } else {
-        print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("NoSupplierInvoiceToWithdraw", $langs->transnoentitiesnoconv("BankTransfer")).'</td></tr>';
-    }
-    print "</table></div><br>";
+			print '<td class="right">';
+			print $invoicestatic->getLibStatut(3, $alreadypayed);
+			print '</td>';
+			print '</tr>';
+			$i++;
+		}
+	} else {
+		print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("NoSupplierInvoiceToWithdraw", $langs->transnoentitiesnoconv("BankTransfer")).'</td></tr>';
+	}
+	print "</table></div><br>";
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
@@ -188,47 +188,47 @@ $sql .= $db->plimit($limit);
 $result = $db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
-    $i = 0;
+	$num = $db->num_rows($result);
+	$i = 0;
 
-    print"\n<!-- debut table -->\n";
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<th>'.$langs->trans("LatestBankTransferReceipts", $limit).'</th>';
-    print '<th>'.$langs->trans("Date").'</th>';
-    print '<th class="right">'.$langs->trans("Amount").'</th>';
-    print '<th class="right">'.$langs->trans("Status").'</th>';
-    print '</tr>';
+	print"\n<!-- debut table -->\n";
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<th>'.$langs->trans("LatestBankTransferReceipts", $limit).'</th>';
+	print '<th>'.$langs->trans("Date").'</th>';
+	print '<th class="right">'.$langs->trans("Amount").'</th>';
+	print '<th class="right">'.$langs->trans("Status").'</th>';
+	print '</tr>';
 
-    if ($num > 0) {
-	    while ($i < min($num, $limit))
-	    {
-	        $obj = $db->fetch_object($result);
+	if ($num > 0) {
+		while ($i < min($num, $limit))
+		{
+			$obj = $db->fetch_object($result);
 
-	        print '<tr class="oddeven">';
+			print '<tr class="oddeven">';
 
-	        print "<td>";
-	        $bprev->id = $obj->rowid;
-	        $bprev->ref = $obj->ref;
-	        $bprev->statut = $obj->statut;
-	        print $bprev->getNomUrl(1);
-	        print "</td>\n";
-	        print '<td>'.dol_print_date($db->jdate($obj->datec), "dayhour")."</td>\n";
-	        print '<td class="right">'.price($obj->amount)."</td>\n";
-	        print '<td class="right">'.$bprev->getLibStatut(3)."</td>\n";
+			print "<td>";
+			$bprev->id = $obj->rowid;
+			$bprev->ref = $obj->ref;
+			$bprev->statut = $obj->statut;
+			print $bprev->getNomUrl(1);
+			print "</td>\n";
+			print '<td>'.dol_print_date($db->jdate($obj->datec), "dayhour")."</td>\n";
+			print '<td class="right">'.price($obj->amount)."</td>\n";
+			print '<td class="right">'.$bprev->getLibStatut(3)."</td>\n";
 
-	        print "</tr>\n";
-	        $i++;
-	    }
-    } else {
-    	print '<tr><td class="opacitymedium" colspan="4">'.$langs->trans("None").'</td></tr>';
-    }
+			print "</tr>\n";
+			$i++;
+		}
+	} else {
+		print '<tr><td class="opacitymedium" colspan="4">'.$langs->trans("None").'</td></tr>';
+	}
 
-    print "</table></div><br>";
-    $db->free($result);
+	print "</table></div><br>";
+	$db->free($result);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 2691e14504d..5d87303236a 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -166,7 +166,7 @@ llxHeader('', $langs->trans("WithdrawalsReceipts"));
 if ($id > 0 || $ref)
 {
 	$head = prelevement_prepare_head($object);
-	dol_fiche_head($head, 'prelevement', $langs->trans("WithdrawalsReceipts"), -1, 'payment');
+	print dol_get_fiche_head($head, 'prelevement', $langs->trans("WithdrawalsReceipts"), -1, 'payment');
 
 	if (GETPOST('error', 'alpha') != '')
 	{
@@ -225,7 +225,7 @@ if ($id > 0 || $ref)
 	print '<table class="border centpercent tableforfield">';
 
 	$acc = new Account($db);
-	$result = $acc->fetch($conf->global->PRELEVEMENT_ID_BANKACCOUNT);
+	$result = $acc->fetch(($object->type == 'bank-transfer' ? $conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT : $conf->global->PRELEVEMENT_ID_BANKACCOUNT));
 
 	print '<tr><td class="titlefield">';
 	$labelofbankfield = "BankToReceiveWithdraw";
@@ -250,7 +250,7 @@ if ($id > 0 || $ref)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	$formconfirm = '';
@@ -404,7 +404,7 @@ if ($id > 0 || $ref)
 			print "<td>";
 			print $ligne->LibStatut($obj->statut, 2);
 			print "&nbsp;";
-			print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/line.php?id='.$obj->rowid.'">';
+			print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/line.php?id='.$obj->rowid.'&type='.$object->type.'">';
 			print sprintf("%06s", $obj->rowid);
 			print '</a></td>';
 
@@ -428,7 +428,7 @@ if ($id > 0 || $ref)
 						if ($user->rights->prelevement->bons->credit)
 						{
 							//print '<a class="butActionDelete" href="line.php?action=rejet&id='.$obj->rowid.'">'.$langs->trans("StandingOrderReject").'</a>';
-							print '<a href="line.php?action=rejet&id='.$obj->rowid.'">'.$langs->trans("StandingOrderReject").'</a>';
+							print '<a href="line.php?action=rejet&type='.$object->type.'&id='.$obj->rowid.'">'.$langs->trans("StandingOrderReject").'</a>';
 						} else {
 							//print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("StandingOrderReject").'</a>';
 						}
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 9d3c5bef7a8..fb2f114b579 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -164,10 +164,12 @@ class BonPrelevement extends CommonObject
 					$result = 0;
 				} else {
 					$result = -1;
+					$this->errors[] = get_class($this)."::AddFacture ".$this->db->lasterror;
 					dol_syslog(get_class($this)."::AddFacture Error $result");
 				}
 			} else {
 				$result = -2;
+				$this->errors[] = get_class($this)."::AddFacture linedid Empty";
 				dol_syslog(get_class($this)."::AddFacture Error $result");
 			}
 		} else {
@@ -245,6 +247,7 @@ class BonPrelevement extends CommonObject
 				$line_id = $this->db->last_insert_id(MAIN_DB_PREFIX."prelevement_lignes");
 				$result = 0;
 			} else {
+				$this->errors[] = get_class($this)."::addline Error -2 ".$this->db->lasterror;
 				dol_syslog(get_class($this)."::addline Error -2");
 				$result = -2;
 			}
@@ -449,7 +452,7 @@ class BonPrelevement extends CommonObject
 				$message = $langs->trans("InfoCreditMessage", $this->ref, dol_print_date($date, 'dayhour'));
 
 				//Add payment of withdrawal into bank
-				$bankaccount = $conf->global->PRELEVEMENT_ID_BANKACCOUNT;
+				$bankaccount = ($this->type == 'bank-transfer' ? $conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT : $conf->global->PRELEVEMENT_ID_BANKACCOUNT);
 				$facs = array();
 				$amounts = array();
 				$amountsperthirdparty = array();
@@ -1121,7 +1124,8 @@ class BonPrelevement extends CommonObject
 						if (!$resql)
 						{
 							$error++;
-							dol_syslog(__METHOD__."::Update Error=".$this->db->error(), LOG_ERR);
+							$this->errors[] = $this->db->lasterror();
+							dol_syslog(__METHOD__."::Update Error=".$this->db->lasterror(), LOG_ERR);
 						}
 					}
 				}
@@ -1316,7 +1320,7 @@ class BonPrelevement extends CommonObject
 
 		$url = DOL_URL_ROOT.'/compta/prelevement/card.php?id='.$this->id;
 		if ($this->type == 'bank-transfer') {
-			$url = DOL_URL_ROOT.'/compta/paymentbybanktransfer/card.php?id='.$this->id;
+			$url = DOL_URL_ROOT.'/compta/prelevement/card.php?id='.$this->id;
 		}
 
 		if ($option != 'nolink')
@@ -1699,7 +1703,7 @@ class BonPrelevement extends CommonObject
 				fputs($this->file, '				<Id>'.$CrLf);
 				fputs($this->file, '				    <PrvtId>'.$CrLf);
 				fputs($this->file, '					<Othr>'.$CrLf);
-				fputs($this->file, '						<Id>'.$conf->global->PRELEVEMENT_ICS.'</Id>'.$CrLf);
+				fputs($this->file, '						<Id>'.$conf->global->PAYMENTBYBANKTRANSFER_ICS.'</Id>'.$CrLf);
 				fputs($this->file, '					</Othr>'.$CrLf);
 				fputs($this->file, '				    </PrvtId>'.$CrLf);
 				fputs($this->file, '				</Id>'.$CrLf);
@@ -2114,7 +2118,8 @@ class BonPrelevement extends CommonObject
 		$dateTime_YMDHMS = dol_print_date($ladate, '%Y-%m-%dT%H:%M:%S');
 
 		// Get data of bank account
-		$id = $configuration->global->PRELEVEMENT_ID_BANKACCOUNT;
+		//$id = $configuration->global->PRELEVEMENT_ID_BANKACCOUNT;
+		$id = ($type == 'bank-transfer' ? $conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT : $conf->global->PRELEVEMENT_ID_BANKACCOUNT);
 		$account = new Account($this->db);
 		if ($account->fetch($id) > 0)
 		{
diff --git a/htdocs/compta/prelevement/class/ligneprelevement.class.php b/htdocs/compta/prelevement/class/ligneprelevement.class.php
index a645d2bb078..e3b0833f925 100644
--- a/htdocs/compta/prelevement/class/ligneprelevement.class.php
+++ b/htdocs/compta/prelevement/class/ligneprelevement.class.php
@@ -37,9 +37,9 @@ class LignePrelevement
 	public $id;
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	public $statuts = array();
 
@@ -111,7 +111,7 @@ class LignePrelevement
 		return $error;
 	}
 
-    /**
+	/**
 	 *    Return status label of object
 	 *
 	 *    @param	int		$mode       0=Label, 1=Picto + label, 2=Picto, 3=Label + Picto
@@ -122,7 +122,7 @@ class LignePrelevement
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Return status label for a status
 	 *
@@ -132,7 +132,7 @@ class LignePrelevement
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if ($mode == 0)
diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php
index 20d600bf9b4..8b7d21d221f 100644
--- a/htdocs/compta/prelevement/class/rejetprelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php
@@ -15,7 +15,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
- *
  */
 
 /**
@@ -36,9 +35,11 @@ class RejetPrelevement
 	public $id;
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
+
+	public $type; //prelevement or bank transfer
 
 
 	/**
@@ -46,28 +47,30 @@ class RejetPrelevement
 	 *
 	 *  @param	DoliDb	$db			Database handler
 	 *  @param 	User	$user       Objet user
+	 *  @param	string	$type		Type ('direct-debit' for direct debit or 'bank-transfer' for credit transfer)
 	 */
-	public function __construct($db, $user)
+	public function __construct($db, $user, $type)
 	{
 		global $langs;
 
 		$this->db = $db;
 		$this->user = $user;
+		$this->type = $type;
 
 		$this->motifs = array();
 		$this->facturer = array();
 
 		$this->motifs[0] = ""; //$langs->trans("StatusMotif0");
-    	$this->motifs[1] = $langs->trans("StatusMotif1");
-    	$this->motifs[2] = $langs->trans("StatusMotif2");
-    	$this->motifs[3] = $langs->trans("StatusMotif3");
-    	$this->motifs[4] = $langs->trans("StatusMotif4");
-    	$this->motifs[5] = $langs->trans("StatusMotif5");
-    	$this->motifs[6] = $langs->trans("StatusMotif6");
-    	$this->motifs[7] = $langs->trans("StatusMotif7");
-    	$this->motifs[8] = $langs->trans("StatusMotif8");
+		$this->motifs[1] = $langs->trans("StatusMotif1");
+		$this->motifs[2] = $langs->trans("StatusMotif2");
+		$this->motifs[3] = $langs->trans("StatusMotif3");
+		$this->motifs[4] = $langs->trans("StatusMotif4");
+		$this->motifs[5] = $langs->trans("StatusMotif5");
+		$this->motifs[6] = $langs->trans("StatusMotif6");
+		$this->motifs[7] = $langs->trans("StatusMotif7");
+		$this->motifs[8] = $langs->trans("StatusMotif8");
 
-    	$this->facturer[0] = $langs->trans("NoInvoiceRefused");
+		$this->facturer[0] = $langs->trans("NoInvoiceRefused");
 		$this->facturer[1] = $langs->trans("InvoiceRefused");
 	}
 
@@ -92,7 +95,7 @@ class RejetPrelevement
 		$now = dol_now();
 
 		dol_syslog("RejetPrelevement::Create id $id");
-		$bankaccount = $conf->global->PRELEVEMENT_ID_BANKACCOUNT;
+		$bankaccount = ($this->type == 'bank-transfer' ? $conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT : $conf->global->PRELEVEMENT_ID_BANKACCOUNT);
 		$facs = $this->getListInvoices(1);
 
 		$this->db->begin();
@@ -135,13 +138,19 @@ class RejetPrelevement
 		}
 
 		$num = count($facs);
-		for ($i = 0; $i < $num; $i++)
-		{
-			$fac = new Facture($this->db);
+		for ($i = 0; $i < $num; $i++) {
+			if ($this->type == 'bank-transfer') {
+				$fac = new FactureFournisseur($this->db);
+				$pai = new PaiementFourn($this->db);
+			} else {
+				$fac = new Facture($this->db);
+				$pai = new Paiement($this->db);
+			}
+
 			$fac->fetch($facs[$i][0]);
 
 			// Make a negative payment
-			$pai = new Paiement($this->db);
+			//$pai = new Paiement($this->db);
 
 			$pai->amounts = array();
 
@@ -150,26 +159,24 @@ class RejetPrelevement
 			 * PHP installs sends only the part integer negative
 			*/
 
-			$pai->amounts[$facs[$i][0]] = price2num($facs[$i][1] * -1);
+			$pai->amounts[$facs[$i][0]] = price2num($facs[$i][1] * ($this->type == 'bank-transfer' ? 1 : -1));
 			$pai->datepaye = $date_rejet;
 			$pai->paiementid = 3; // type of payment: withdrawal
 			$pai->num_payment = $fac->ref;
 
-			if ($pai->create($this->user) < 0)  // we call with no_commit
-			{
+			if ($pai->create($this->user) < 0) {
+				// we call with no_commit
 				$error++;
 				dol_syslog("RejetPrelevement::Create Error creation payment invoice ".$facs[$i][0]);
 			} else {
 				$result = $pai->addPaymentToBank($user, 'payment', '(InvoiceRefused)', $bankaccount, '', '');
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					dol_syslog("RejetPrelevement::Create AddPaymentToBan Error");
 					$error++;
 				}
 
 				// Payment validation
-				if ($pai->valide() < 0)
-				{
+				if ($pai->validate($user) < 0) {
 					$error++;
 					dol_syslog("RejetPrelevement::Create Error payment validation");
 				}
@@ -194,7 +201,7 @@ class RejetPrelevement
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Send email to all users that has asked the withdraw request
 	 *
@@ -203,7 +210,7 @@ class RejetPrelevement
 	 */
 	private function _send_email($fac)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$userid = 0;
@@ -211,7 +218,7 @@ class RejetPrelevement
 		$sql = "SELECT fk_user_demande";
 		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
 		$sql .= " WHERE pfd.fk_prelevement_bons = ".$this->bon_id;
-		$sql .= " AND pfd.fk_facture = ".$fac->id;
+		$sql .= " AND pfd.fk_facture".($this->type == 'bank-transfer' ? '_fourn=' : '=').$fac->id;
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -255,8 +262,7 @@ class RejetPrelevement
 			$mailfile = new CMailFile($subject, $sendto, $from, $message, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $this->user->email, '', $trackid);
 
 			$result = $mailfile->sendfile();
-			if ($result)
-			{
+			if ($result) {
 				dol_syslog("RejetPrelevement::_send_email email envoye");
 			} else {
 				dol_syslog("RejetPrelevement::_send_email Erreur envoi email");
@@ -282,7 +288,8 @@ class RejetPrelevement
 		 //Returns all invoices of a withdrawal
 		$sql = "SELECT f.rowid as facid, pl.amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture as pf";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON (pf.fk_facture = f.rowid)";
+		if ($this->type == 'bank-transfer')	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as f ON (pf.fk_facture_fourn = f.rowid)";
+		else $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON (pf.fk_facture = f.rowid)";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."prelevement_lignes as pl ON (pf.fk_prelevement_lignes = pl.rowid)";
 		$sql .= " WHERE pf.fk_prelevement_lignes = ".$this->id;
 		$sql .= " AND f.entity IN  (".getEntity('invoice').")";
@@ -298,8 +305,9 @@ class RejetPrelevement
 				while ($i < $num)
 				{
 					$row = $this->db->fetch_row($resql);
-					if (!$amounts) $arr[$i] = $row[0];
-					else {
+					if (!$amounts) {
+						$arr[$i] = $row[0];
+					} else {
 						$arr[$i] = array(
 							$row[0],
 							$row[1]
@@ -336,9 +344,9 @@ class RejetPrelevement
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				$this->id             = $rowid;
-				$this->date_rejet     = $this->db->jdate($obj->dr);
-				$this->motif          = $this->motifs[$obj->motif];
+				$this->id = $rowid;
+				$this->date_rejet = $this->db->jdate($obj->dr);
+				$this->motif = $this->motifs[$obj->motif];
 				$this->invoicing = $this->facturer[$obj->afacturer];
 
 				$this->db->free($resql);
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 8c8dc01a22c..e93b2a7472d 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -141,7 +141,7 @@ $head[$h][2] = 'payment';
 $hselected = 'payment';
 $h++;
 
-dol_fiche_head($head, $hselected, $langs->trans("StandingOrders"), 0, 'payment');
+print dol_get_fiche_head($head, $hselected, $langs->trans("StandingOrders"), 0, 'payment');
 */
 
 $title = $langs->trans("NewStandingOrder");
@@ -151,7 +151,7 @@ if ($type == 'bank-transfer') {
 
 print load_fiche_titre($title);
 
-dol_fiche_head();
+print dol_get_fiche_head();
 
 $nb = $bprev->nbOfInvoiceToPay($type);
 $pricetowithdraw = $bprev->SommeAPrelever($type);
@@ -271,7 +271,7 @@ if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS))
 	$sql .= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
 }
 //$sql .= " AND pfd.amount > 0";
-$sql .= " AND f.total_ttc > 0";		// Avoid credit notes
+$sql .= " AND f.total_ttc > 0"; // Avoid credit notes
 $sql .= " AND pfd.traite = 0";
 $sql .= " AND pfd.ext_payment_id IS NULL";
 if ($type == 'bank-transfer') {
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 4e3d191fdfa..1f8ecdaeced 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -84,7 +84,7 @@ if ($id > 0 || $ref)
   	if ($object->fetch($id, $ref) >= 0)
 	{
 		$head = prelevement_prepare_head($object);
-		dol_fiche_head($head, 'invoices', $langs->trans("WithdrawalsReceipts"), -1, 'payment');
+		print dol_get_fiche_head($head, 'invoices', $langs->trans("WithdrawalsReceipts"), -1, 'payment');
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/prelevement/orders_list.php?restore_lastsearch_values=1'.($object->type != 'bank-transfer' ? '' : '&type=bank-transfer').'">'.$langs->trans("BackToList").'</a>';
 
@@ -150,7 +150,7 @@ if ($id > 0 || $ref)
 
 		print '</div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 	} else {
 	  	dol_print_error($db);
 	}
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 7783edd4673..fb1a9451aed 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -78,7 +78,7 @@ if ($prev_id > 0 || $ref)
   	if ($object->fetch($prev_id, $ref) >= 0)
 	{
 		$head = prelevement_prepare_head($object);
-		dol_fiche_head($head, 'rejects', $langs->trans("WithdrawalsReceipts"), -1, 'payment');
+		print dol_get_fiche_head($head, 'rejects', $langs->trans("WithdrawalsReceipts"), -1, 'payment');
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/prelevement/orders_list.php?restore_lastsearch_values=1'.($object->type != 'bank-transfer' ? '' : '&type=bank-transfer').'">'.$langs->trans("BackToList").'</a>';
 
@@ -144,14 +144,14 @@ if ($prev_id > 0 || $ref)
 
 		print '</div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 	} else {
 	  	dol_print_error($db);
 	}
 }
 
 
-$rej = new RejetPrelevement($db, $user);
+$rej = new RejetPrelevement($db, $user, $type);
 
 /*
  * List errors
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index df5118df0cf..81e854ef5a0 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -77,7 +77,7 @@ if ($prev_id > 0 || $ref)
 	if ($object->fetch($prev_id, $ref) >= 0)
 	{
 		$head = prelevement_prepare_head($object);
-		dol_fiche_head($head, 'statistics', $langs->trans("WithdrawalsReceipts"), -1, 'payment');
+		print dol_get_fiche_head($head, 'statistics', $langs->trans("WithdrawalsReceipts"), -1, 'payment');
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/prelevement/orders_list.php?restore_lastsearch_values=1'.($object->type != 'bank-transfer' ? '' : '&type=bank-transfer').'">'.$langs->trans("BackToList").'</a>';
 
@@ -143,7 +143,7 @@ if ($prev_id > 0 || $ref)
 
 		print '</div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 	} else {
 		dol_print_error($db);
 	}
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 4104249df5c..2ce24d20d90 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -115,58 +115,58 @@ if ($socid) $sql .= " AND f.fk_soc = ".$socid;
 $resql = $db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
-    $i = 0;
+	$num = $db->num_rows($resql);
+	$i = 0;
 
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<th colspan="5">'.$langs->trans("InvoiceWaitingWithdraw").' ('.$num.')</th></tr>';
-    if ($num)
-    {
-        while ($i < $num && $i < 20)
-        {
-            $obj = $db->fetch_object($resql);
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<th colspan="5">'.$langs->trans("InvoiceWaitingWithdraw").' ('.$num.')</th></tr>';
+	if ($num)
+	{
+		while ($i < $num && $i < 20)
+		{
+			$obj = $db->fetch_object($resql);
 
-            $invoicestatic->id = $obj->rowid;
-            $invoicestatic->ref = $obj->ref;
-            $invoicestatic->statut = $obj->fk_statut;
-            $invoicestatic->paye = $obj->paye;
-            $invoicestatic->type = $obj->type;
-            $alreadypayed = $invoicestatic->getSommePaiement();
+			$invoicestatic->id = $obj->rowid;
+			$invoicestatic->ref = $obj->ref;
+			$invoicestatic->statut = $obj->fk_statut;
+			$invoicestatic->paye = $obj->paye;
+			$invoicestatic->type = $obj->type;
+			$alreadypayed = $invoicestatic->getSommePaiement();
 
-            $thirdpartystatic->id = $obj->socid;
-            $thirdpartystatic->name = $obj->name;
-            $thirdpartystatic->email = $obj->email;
+			$thirdpartystatic->id = $obj->socid;
+			$thirdpartystatic->name = $obj->name;
+			$thirdpartystatic->email = $obj->email;
 
-            print '<tr class="oddeven"><td>';
-            print $invoicestatic->getNomUrl(1, 'withdraw');
-            print '</td>';
+			print '<tr class="oddeven"><td>';
+			print $invoicestatic->getNomUrl(1, 'withdraw');
+			print '</td>';
 
-            print '<td>';
-            print $thirdpartystatic->getNomUrl(1, 'customer');
-            print '</td>';
+			print '<td>';
+			print $thirdpartystatic->getNomUrl(1, 'customer');
+			print '</td>';
 
-            print '<td class="right">';
-            print price($obj->amount);
-            print '</td>';
+			print '<td class="right">';
+			print price($obj->amount);
+			print '</td>';
 
-            print '<td class="right">';
-            print dol_print_date($db->jdate($obj->date_demande), 'day');
-            print '</td>';
+			print '<td class="right">';
+			print dol_print_date($db->jdate($obj->date_demande), 'day');
+			print '</td>';
 
-            print '<td class="right">';
-            print $invoicestatic->getLibStatut(3, $alreadypayed);
-            print '</td>';
-            print '</tr>';
-            $i++;
-        }
-    } else {
-        print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("NoInvoiceToWithdraw", $langs->transnoentitiesnoconv("StandingOrders")).'</td></tr>';
-    }
-    print "</table></div><br>";
+			print '<td class="right">';
+			print $invoicestatic->getLibStatut(3, $alreadypayed);
+			print '</td>';
+			print '</tr>';
+			$i++;
+		}
+	} else {
+		print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("NoInvoiceToWithdraw", $langs->transnoentitiesnoconv("StandingOrders")).'</td></tr>';
+	}
+	print "</table></div><br>";
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
@@ -181,55 +181,55 @@ $limit = 5;
 $sql = "SELECT p.rowid, p.ref, p.amount, p.datec, p.statut";
 $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
 $sql .= " WHERE p.type = 'debit-order'";
-$sql .= " AND entity IN (" . getEntity('prelevement') . ")";
+$sql .= " AND entity IN (".getEntity('prelevement').")";
 $sql .= " ORDER BY datec DESC";
 $sql .= $db->plimit($limit);
 
 $result = $db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
-    $i = 0;
+	$num = $db->num_rows($result);
+	$i = 0;
 
-    print"\n<!-- debut table -->\n";
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<th>'.$langs->trans("LastWithdrawalReceipt", $limit).'</th>';
-    print '<th>'.$langs->trans("Date").'</th>';
-    print '<th class="right">'.$langs->trans("Amount").'</th>';
-    print '<th class="right">'.$langs->trans("Status").'</th>';
-    print '</tr>';
+	print"\n<!-- debut table -->\n";
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<th>'.$langs->trans("LastWithdrawalReceipt", $limit).'</th>';
+	print '<th>'.$langs->trans("Date").'</th>';
+	print '<th class="right">'.$langs->trans("Amount").'</th>';
+	print '<th class="right">'.$langs->trans("Status").'</th>';
+	print '</tr>';
 
-    if ($num > 0) {
-    	while ($i < min($num, $limit))
-	    {
-	        $obj = $db->fetch_object($result);
+	if ($num > 0) {
+		while ($i < min($num, $limit))
+		{
+			$obj = $db->fetch_object($result);
 
 
-	        print '<tr class="oddeven">';
+			print '<tr class="oddeven">';
 
-	        print "<td>";
-	        $bprev->id = $obj->rowid;
-	        $bprev->ref = $obj->ref;
-	        $bprev->statut = $obj->statut;
-	        print $bprev->getNomUrl(1);
-	        print "</td>\n";
-	        print '<td>'.dol_print_date($db->jdate($obj->datec), "dayhour")."</td>\n";
-	        print '<td class="right">'.price($obj->amount)."</td>\n";
-	        print '<td class="right">'.$bprev->getLibStatut(3)."</td>\n";
+			print "<td>";
+			$bprev->id = $obj->rowid;
+			$bprev->ref = $obj->ref;
+			$bprev->statut = $obj->statut;
+			print $bprev->getNomUrl(1);
+			print "</td>\n";
+			print '<td>'.dol_print_date($db->jdate($obj->datec), "dayhour")."</td>\n";
+			print '<td class="right">'.price($obj->amount)."</td>\n";
+			print '<td class="right">'.$bprev->getLibStatut(3)."</td>\n";
 
-	        print "</tr>\n";
-	        $i++;
-	    }
-    } else {
-    	print '<tr><td class="opacitymedium" colspan="4">'.$langs->trans("None").'</td></tr>';
-    }
+			print "</tr>\n";
+			$i++;
+		}
+	} else {
+		print '<tr><td class="opacitymedium" colspan="4">'.$langs->trans("None").'</td></tr>';
+	}
 
-    print "</table></div><br>";
-    $db->free($result);
+	print "</table></div><br>";
+	$db->free($result);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php
index 3c8d80d4931..ccb60486c76 100644
--- a/htdocs/compta/prelevement/line.php
+++ b/htdocs/compta/prelevement/line.php
@@ -95,18 +95,18 @@ if ($action == 'confirm_rejet')
 			if ($lipre->fetch($id) == 0)
 
 			{
-				$rej = new RejetPrelevement($db, $user);
+				$rej = new RejetPrelevement($db, $user, $type);
 
 				$rej->create($user, $id, GETPOST('motif', 'alpha'), $daterej, $lipre->bon_rowid, GETPOST('facturer', 'int'));
 
-				header("Location: line.php?id=".$id);
+				header("Location: line.php?id=".urlencode($id).'&type='.urlencode($type));
 				exit;
 			}
 		} else {
 			$action = "rejet";
 		}
 	} else {
-		header("Location: line.php?id=".$id);
+		header("Location: line.php?id=".urlencode($id).'&type='.urlencode($type));
 		exit;
 	}
 }
@@ -128,7 +128,7 @@ llxHeader('', $title);
 $head = array();
 
 $h = 0;
-$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/line.php?id='.$id;
+$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/line.php?id='.$id.'&type='.$type;
 $head[$h][1] = $title;
 $hselected = $h;
 $h++;
@@ -142,7 +142,7 @@ if ($id)
 		$bon = new BonPrelevement($db);
 		$bon->fetch($lipre->bon_rowid);
 
-		dol_fiche_head($head, $hselected, $title);
+		print dol_get_fiche_head($head, $hselected, $title);
 
 		print '<table class="border centpercent tableforfield">';
 
@@ -158,7 +158,7 @@ if ($id)
 
 		if ($lipre->statut == 3)
 		{
-			$rej = new RejetPrelevement($db, $user);
+			$rej = new RejetPrelevement($db, $user, $type);
 			$resf = $rej->fetch($lipre->id);
 			if ($resf == 0)
 			{
@@ -179,7 +179,7 @@ if ($id)
 		}
 
 		print '</table>';
-		dol_fiche_end();
+		print dol_get_fiche_end();
 	} else {
 		dol_print_error($db);
 	}
@@ -191,11 +191,12 @@ if ($id)
 		$soc = new Societe($db);
 		$soc->fetch($lipre->socid);
 
-		$rej = new RejetPrelevement($db, $user);
+		$rej = new RejetPrelevement($db, $user, $type);
 
 		print '<form name="confirm_rejet" method="post" action="line.php?id='.$id.'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="confirm_rejet">';
+		print '<input type="hidden" name="type" value="'.$type.'">';
 		print '<table class="noborder centpercent">';
 
 		print '<tr class="liste_titre">';
@@ -246,7 +247,7 @@ if ($id)
 			if ($lipre->statut == 2) {
 				if ($user->rights->prelevement->bons->credit)
 				{
-					print '<a class="butActionDelete" href="line.php?action=rejet&id='.$lipre->id.'">'.$langs->trans("StandingOrderReject").'</a>';
+					print '<a class="butActionDelete" href="line.php?action=rejet&type='.$type.'&id='.$lipre->id.'">'.$langs->trans("StandingOrderReject").'</a>';
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("StandingOrderReject").'</a>';
 				}
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index 36aa4bb8e5c..f171857963c 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -44,12 +44,12 @@ $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'prelevement', '', '', 'bons');
 
 $type = GETPOST('type', 'aZ09');
 
-$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -82,7 +82,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_line = "";
 	$search_bon = "";
 	$search_code = "";
-    $search_company = "";
+	$search_company = "";
 	$statut = "";
 }
 
@@ -133,13 +133,13 @@ $sql .= $db->order($sortfield, $sortorder);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-    	$page = 0;
-    	$offset = 0;
-    }
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -147,124 +147,124 @@ $sql .= $db->plimit($limit + 1, $offset);
 $result = $db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
-    $i = 0;
+	$num = $db->num_rows($result);
+	$i = 0;
 
-    $param = "&amp;statut=".urlencode($statut);
-    $param .= "&amp;search_bon=".urlencode($search_bon);
+	$param = "&amp;statut=".urlencode($statut);
+	$param .= "&amp;search_bon=".urlencode($search_bon);
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 
-    print"\n<!-- debut table -->\n";
-    print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    print '<input type="hidden" name="action" value="list">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+	print"\n<!-- debut table -->\n";
+	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-    $title = $langs->trans("WithdrawalsLines");
-    if ($type == 'bank-transfer') {
-    	$title = $langs->trans("CreditTransferLines");
-    }
+	$title = $langs->trans("WithdrawalsLines");
+	if ($type == 'bank-transfer') {
+		$title = $langs->trans("CreditTransferLines");
+	}
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'generic', 0, '', '', $limit, 0, 0, 1);
 
 	$moreforfilter = '';
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
-    print '<tr class="liste_titre">';
-    print '<td class="liste_titre"><input type="text" class="flat" name="search_line" value="'.dol_escape_htmltag($search_line).'" size="6"></td>';
-    print '<td class="liste_titre"><input type="text" class="flat" name="search_bon" value="'.dol_escape_htmltag($search_bon).'" size="6"></td>';
-    print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre"><input type="text" class="flat" name="search_company" value="'.dol_escape_htmltag($search_company).'" size="6"></td>';
-    print '<td class="liste_titre" align="center"><input type="text" class="flat" name="search_code" value="'.dol_escape_htmltag($search_code).'" size="6"></td>';
-    print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre maxwidthsearch">';
-    $searchpicto = $form->showFilterButtons();
-    print $searchpicto;
-    print '</td>';
-    print '</tr>';
+	print '<tr class="liste_titre">';
+	print '<td class="liste_titre"><input type="text" class="flat" name="search_line" value="'.dol_escape_htmltag($search_line).'" size="6"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" name="search_bon" value="'.dol_escape_htmltag($search_bon).'" size="6"></td>';
+	print '<td class="liste_titre">&nbsp;</td>';
+	print '<td class="liste_titre"><input type="text" class="flat" name="search_company" value="'.dol_escape_htmltag($search_company).'" size="6"></td>';
+	print '<td class="liste_titre" align="center"><input type="text" class="flat" name="search_code" value="'.dol_escape_htmltag($search_code).'" size="6"></td>';
+	print '<td class="liste_titre">&nbsp;</td>';
+	print '<td class="liste_titre">&nbsp;</td>';
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+	print '</tr>';
 
-    $columntitle= "WithdrawalsReceipts";
-    if ($type == 'bank-transfer') {
-    	$columntitle= "BankTransferReceipts";
-    }
+	$columntitle = "WithdrawalsReceipts";
+	if ($type == 'bank-transfer') {
+		$columntitle = "BankTransferReceipts";
+	}
 
-    print '<tr class="liste_titre">';
-    print_liste_field_titre($columntitle, $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("Line", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("Bill", $_SERVER["PHP_SELF"], "f.ref", '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("CustomerCode", $_SERVER["PHP_SELF"], "s.code_client", '', $param, '', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "pl.amount", "", $param, '', $sortfield, $sortorder, 'right ');
-    print_liste_field_titre('');
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($columntitle, $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Line", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Bill", $_SERVER["PHP_SELF"], "f.ref", '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("CustomerCode", $_SERVER["PHP_SELF"], "s.code_client", '', $param, '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "pl.amount", "", $param, '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre('');
 	print "</tr>\n";
 
 	if ($num) {
-	    while ($i < min($num, $limit))
-	    {
-	        $obj = $db->fetch_object($result);
+		while ($i < min($num, $limit))
+		{
+			$obj = $db->fetch_object($result);
 
-	        $bon->id = $obj->rowid;
-	        $bon->ref = $obj->ref;
-	        $bon->statut = $obj->status;
+			$bon->id = $obj->rowid;
+			$bon->ref = $obj->ref;
+			$bon->statut = $obj->status;
 
-	        $company->id = $obj->socid;
-	        $company->name = $obj->name;
-	        $company->email = $obj->email;
-	        $company->code_client = $obj->code_client;
+			$company->id = $obj->socid;
+			$company->name = $obj->name;
+			$company->email = $obj->email;
+			$company->code_client = $obj->code_client;
 
-	        print '<tr class="oddeven">';
+			print '<tr class="oddeven">';
 
-	        print '<td>';
-	        print $bon->getNomUrl(1);
-	        print "</td>\n";
-
-	        print '<td>';
-	        print $line->LibStatut($obj->statut_ligne, 2);
-	        print "&nbsp;";
-	        print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/line.php?id='.$obj->rowid_ligne.'">';
-	        print substr('000000'.$obj->rowid_ligne, -6);
-	        print '</a></td>';
-
-	        print '<td>';
-	        print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->facid.'">';
-	        print img_object($langs->trans("ShowBill"), "bill");
-	        print '&nbsp;<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->facid.'">'.$obj->invoiceref."</a></td>\n";
-	        print '</a>';
-	        print '</td>';
-
-	        print '<td>';
-	        print $company->getNomUrl(1);
+			print '<td>';
+			print $bon->getNomUrl(1);
 			print "</td>\n";
 
-	        print '<td align="center"><a href="card.php?id='.$obj->rowid.'">'.$obj->code_client."</a></td>\n";
+			print '<td>';
+			print $line->LibStatut($obj->statut_ligne, 2);
+			print "&nbsp;";
+			print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/line.php?id='.$obj->rowid_ligne.'">';
+			print substr('000000'.$obj->rowid_ligne, -6);
+			print '</a></td>';
 
-	        print '<td class="center">'.dol_print_date($db->jdate($obj->datec), 'day')."</td>\n";
+			print '<td>';
+			print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->facid.'">';
+			print img_object($langs->trans("ShowBill"), "bill");
+			print '&nbsp;<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->facid.'">'.$obj->invoiceref."</a></td>\n";
+			print '</a>';
+			print '</td>';
 
-	        print '<td class="right">'.price($obj->amount)."</td>\n";
+			print '<td>';
+			print $company->getNomUrl(1);
+			print "</td>\n";
 
-	        print '<td>&nbsp;</td>';
+			print '<td align="center"><a href="card.php?id='.$obj->rowid.'">'.$obj->code_client."</a></td>\n";
 
-	        print "</tr>\n";
-	        $i++;
-	    }
+			print '<td class="center">'.dol_print_date($db->jdate($obj->datec), 'day')."</td>\n";
+
+			print '<td class="right">'.price($obj->amount)."</td>\n";
+
+			print '<td>&nbsp;</td>';
+
+			print "</tr>\n";
+			$i++;
+		}
 	} else {
 		print '<tr><td class="opacitymedium" colspan="8">'.$langs->trans("None").'</td></tr>';
 	}
-    print "</table>";
-    print '</div>';
+	print "</table>";
+	print '</div>';
 
-    print '</form>';
+	print '</form>';
 
-    $db->free($result);
+	$db->free($result);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // End of page
diff --git a/htdocs/compta/prelevement/orders_list.php b/htdocs/compta/prelevement/orders_list.php
index d4f16eab7f6..7b37238982b 100644
--- a/htdocs/compta/prelevement/orders_list.php
+++ b/htdocs/compta/prelevement/orders_list.php
@@ -71,8 +71,8 @@ if ($type == 'bank-transfer') {
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-    $search_ref = "";
-    $search_amount = "";
+	$search_ref = "";
+	$search_amount = "";
 }
 
 
@@ -99,13 +99,13 @@ $sql .= $db->order($sortfield, $sortorder);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-        $page = 0;
-        $offset = 0;
-    }
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -113,109 +113,109 @@ $sql .= $db->plimit($limit + 1, $offset);
 $result = $db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
-    $i = 0;
+	$num = $db->num_rows($result);
+	$i = 0;
 
-    $param = '';
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-    $param .= "&statut=".urlencode($statut);
+	$param = '';
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+	$param .= "&statut=".urlencode($statut);
 
-    $selectedfields = '';
+	$selectedfields = '';
 
-    $newcardbutton = '';
-    if ($usercancreate)
-    {
-        $newcardbutton .= dolGetButtonTitle($langs->trans('NewStandingOrder'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/prelevement/create.php');
-    }
+	$newcardbutton = '';
+	if ($usercancreate)
+	{
+		$newcardbutton .= dolGetButtonTitle($langs->trans('NewStandingOrder'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/prelevement/create.php');
+	}
 
-    // Lines of title fields
-    print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    print '<input type="hidden" name="action" value="list">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+	// Lines of title fields
+	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-    $titlekey = "WithdrawalsReceipts";
-    $title = $langs->trans("WithdrawalsReceipts");
-    if ($type == 'bank-transfer') {
-    	$titlekey = "BankTransferReceipts";
-    	$title = $langs->trans("BankTransferReceipts");
-    }
+	$titlekey = "WithdrawalsReceipts";
+	$title = $langs->trans("WithdrawalsReceipts");
+	if ($type == 'bank-transfer') {
+		$titlekey = "BankTransferReceipts";
+		$title = $langs->trans("BankTransferReceipts");
+	}
 
-    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit, 0, 0, 1);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
-    $moreforfilter = '';
+	$moreforfilter = '';
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
-    print '<tr class="liste_titre">';
-    print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
-    print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre right"><input type="text" class="flat maxwidth100" name="search_amount" value="'.dol_escape_htmltag($search_amount).'"></td>';
-    print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre maxwidthsearch">';
-    $searchpicto = $form->showFilterButtons();
-    print $searchpicto;
-    print '</td>';
-    print '</tr>';
+	print '<tr class="liste_titre">';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
+	print '<td class="liste_titre">&nbsp;</td>';
+	print '<td class="liste_titre right"><input type="text" class="flat maxwidth100" name="search_amount" value="'.dol_escape_htmltag($search_amount).'"></td>';
+	print '<td class="liste_titre">&nbsp;</td>';
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+	print '</tr>';
 
-    print '<tr class="liste_titre">';
-    print_liste_field_titre($titlekey, $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "p.amount", "", $param, '', $sortfield, $sortorder, 'right ');
-    print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
-    print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ')."\n";
-    print "</tr>\n";
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($titlekey, $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "p.amount", "", $param, '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ')."\n";
+	print "</tr>\n";
 
-    $directdebitorder = new BonPrelevement($db);
+	$directdebitorder = new BonPrelevement($db);
 
-    if ($num) {
-	    while ($i < min($num, $limit))
-	    {
-	        $obj = $db->fetch_object($result);
+	if ($num) {
+		while ($i < min($num, $limit))
+		{
+			$obj = $db->fetch_object($result);
 
-	        $directdebitorder->id = $obj->rowid;
-	        $directdebitorder->ref = $obj->ref;
-	        $directdebitorder->datec = $obj->datec;
-	        $directdebitorder->amount = $obj->amount;
-	        $directdebitorder->statut = $obj->statut;
+			$directdebitorder->id = $obj->rowid;
+			$directdebitorder->ref = $obj->ref;
+			$directdebitorder->datec = $obj->datec;
+			$directdebitorder->amount = $obj->amount;
+			$directdebitorder->statut = $obj->statut;
 
-	        print '<tr class="oddeven">';
+			print '<tr class="oddeven">';
 
-	        print '<td>';
-	        print $directdebitorder->getNomUrl(1);
-	        print "</td>\n";
+			print '<td>';
+			print $directdebitorder->getNomUrl(1);
+			print "</td>\n";
 
-	        print '<td class="center">'.dol_print_date($db->jdate($obj->datec), 'day')."</td>\n";
+			print '<td class="center">'.dol_print_date($db->jdate($obj->datec), 'day')."</td>\n";
 
-	        print '<td class="right">'.price($obj->amount)."</td>\n";
+			print '<td class="right">'.price($obj->amount)."</td>\n";
 
-	        print '<td class="right">';
-	        print $bon->LibStatut($obj->statut, 3);
-	        print '</td>';
+			print '<td class="right">';
+			print $bon->LibStatut($obj->statut, 3);
+			print '</td>';
 
-	        print '<td class="right"></td>'."\n";
+			print '<td class="right"></td>'."\n";
 
-	        print "</tr>\n";
-	        $i++;
-	    }
-    } else {
-    	print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("None").'</td></tr>';
-    }
+			print "</tr>\n";
+			$i++;
+		}
+	} else {
+		print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("None").'</td></tr>';
+	}
 
-    print "</table>";
-    print '</div>';
+	print "</table>";
+	print '</div>';
 
-    print '</form>';
+	print '</form>';
 
-    $db->free($result);
+	$db->free($result);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // End of page
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index da2420aed3f..8a16f4ecb76 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -65,7 +65,7 @@ llxHeader('', $title);
 if ($sortorder == "") $sortorder = "DESC";
 if ($sortfield == "") $sortfield = "p.datec";
 
-$rej = new RejetPrelevement($db, $user);
+$rej = new RejetPrelevement($db, $user, $type);
 $line = new LignePrelevement($db);
 
 $hookmanager->initHooks(array('withdrawalsreceiptsrejectedlist'));
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index 1d6e1c2a183..c046f2f278e 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -214,7 +214,7 @@ if ($resql)
 	print '<td class="right">%</td><td class="right">'.$langs->trans("Amount").'</td><td class="right">%</td></tr>';
 
 	require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
-	$Rejet = new RejetPrelevement($db, $user);
+	$Rejet = new RejetPrelevement($db, $user, $type);
 
 	while ($i < $num)
 	{
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 63368fa94e8..397db077515 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -58,8 +58,8 @@ if (!$sortorder) $sortorder = "DESC";
 
 
 $arrayfields = array(
-    'f.datef'=>array('label'=>"Date", 'checked'=>1),
-    //...
+	'f.datef'=>array('label'=>"Date", 'checked'=>1),
+	//...
 );
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -90,14 +90,14 @@ llxHeader('', $title, $help_url);
 
 if ($id > 0)
 {
-    $param = '';
-    if ($id > 0) $param .= '&socid='.$id;
+	$param = '';
+	if ($id > 0) $param .= '&socid='.$id;
 
-    $head = societe_prepare_head($object);
+	$head = societe_prepare_head($object);
 
-	dol_fiche_head($head, 'customer', $langs->trans("ThirdParty"), 0, 'company');
+	print dol_get_fiche_head($head, 'customer', $langs->trans("ThirdParty"), 0, 'company');
 	dol_banner_tab($object, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom', '', '', 0, '', '', 1);
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	{
@@ -106,7 +106,7 @@ if ($id > 0)
 
 		print '<table class="noborder tagtable liste centpercent">';
 		print '<tr class="liste_titre">';
-        if (!empty($arrayfields['f.datef']['checked']))  print_liste_field_titre($arrayfields['f.datef']['label'], $_SERVER["PHP_SELF"], "f.datef", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+		if (!empty($arrayfields['f.datef']['checked']))  print_liste_field_titre($arrayfields['f.datef']['label'], $_SERVER["PHP_SELF"], "f.datef", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
 		print '<td>'.$langs->trans("Element").'</td>';
 		print '<td>'.$langs->trans("Status").'</td>';
 		print '<td class="right">'.$langs->trans("Debit").'</td>';
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 671921506d5..8a1655cdefb 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -69,13 +69,13 @@ if (!$sortorder) $sortorder = 'ASC';
 // Date range
 $year = GETPOST('year', 'int');
 if (empty($year)) {
-    $year_current = strftime("%Y", dol_now());
-    $month_current = strftime("%m", dol_now());
-    $year_start = $year_current;
+	$year_current = strftime("%Y", dol_now());
+	$month_current = strftime("%m", dol_now());
+	$year_start = $year_current;
 } else {
-    $year_current = $year;
-    $month_current = strftime("%m", dol_now());
-    $year_start = $year;
+	$year_current = $year;
+	$month_current = strftime("%m", dol_now());
+	$year_start = $year;
 }
 $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
 $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
@@ -83,29 +83,29 @@ $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 // We define date_start and date_end
 if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 {
-    $q = GETPOST("q") ?GETPOST("q") : 0;
-    if ($q == 0)
-    {
-        // We define date_start and date_end
-        $year_end = $year_start;
-        $month_start = GETPOST("month") ?GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
-        if (!GETPOST('month'))
-        {
-            if (!GETPOST("year") && $month_start > $month_current)
-            {
-                $year_start--;
-                $year_end--;
-            }
-            $month_end = $month_start - 1;
-            if ($month_end < 1) $month_end = 12;
-            else $year_end++;
-        } else $month_end = $month_start;
-        $date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
-    }
-    if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
-    if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
-    if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
-    if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
+	$q = GETPOST("q") ?GETPOST("q") : 0;
+	if ($q == 0)
+	{
+		// We define date_start and date_end
+		$year_end = $year_start;
+		$month_start = GETPOST("month") ?GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
+		if (!GETPOST('month'))
+		{
+			if (!GETPOST("year") && $month_start > $month_current)
+			{
+				$year_start--;
+				$year_end--;
+			}
+			$month_end = $month_start - 1;
+			if ($month_end < 1) $month_end = 12;
+			else $year_end++;
+		} else $month_end = $month_start;
+		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
+	}
+	if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
+	if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
+	if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
+	if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
 }
 
 // $date_start and $date_end are defined. We force $year_start and $nbofyear
@@ -144,32 +144,42 @@ if ($modecompta == "CREANCES-DETTES")
 {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByPredefinedAccountGroups");
 	$calcmode = $langs->trans("CalcModeDebt");
-    $calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=RECETTES-DEPENSES">', '</a>').')';
-    if (!empty($conf->accounting->enabled)) $calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=BOOKKEEPING">', '</a>').')';
-    $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
+	$calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '{s1}', '{s2}').')';
+	$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=RECETTES-DEPENSES">', '</a>'), $calcmode);
+	if (!empty($conf->accounting->enabled)) {
+		$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '{s1}', '{s2}').')';
+		$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=BOOKKEEPING">', '</a>'), $calcmode);
+	}
+	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] - 1)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] + 1)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
-    $description = $langs->trans("RulesResultDue");
+	$description = $langs->trans("RulesResultDue");
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
 	else $description .= $langs->trans("DepositsAreIncluded");
-    $builddate = dol_now();
-    //$exportlink=$langs->trans("NotYetAvailable");
+	$builddate = dol_now();
+	//$exportlink=$langs->trans("NotYetAvailable");
 } elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByPredefinedAccountGroups");
 	$calcmode = $langs->trans("CalcModeEngagement");
-    $calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=CREANCES-DETTES">', '</a>').')';
-    if (!empty($conf->accounting->enabled)) $calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=BOOKKEEPING">', '</a>').')';
-    $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
-    $periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] - 1)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] + 1)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
-    $description = $langs->trans("RulesResultInOut");
-    $builddate = dol_now();
-    //$exportlink=$langs->trans("NotYetAvailable");
+	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '{s1}', '{s2}').')';
+	$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=CREANCES-DETTES">', '</a>'), $calcmode);
+	if (!empty($conf->accounting->enabled)) {
+		$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '{s1}', '{s2}').')';
+		$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=BOOKKEEPING">', '</a>'), $calcmode);
+	}
+	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
+	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] - 1)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] + 1)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
+	$description = $langs->trans("RulesResultInOut");
+	$builddate = dol_now();
+	//$exportlink=$langs->trans("NotYetAvailable");
 } elseif ($modecompta == "BOOKKEEPING")
 {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByPredefinedAccountGroups");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
-    $calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=RECETTES-DEPENSES">', '</a>').')';
-	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=CREANCES-DETTES">', '</a>').')';
+	$calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '{s1}', '{s2}').')';
+	$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=RECETTES-DEPENSES">', '</a>'), $calcmode);
+	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '{s1}', '{s2}').')';
+	$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=CREANCES-DETTES">', '</a>'), $calcmode);
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$arraylist = array('no'=>$langs->trans("No"), 'yes'=>$langs->trans("AccountWithNonZeroValues"), 'all'=>$langs->trans("All"));
 	$period .= ' &nbsp; &nbsp; '.$langs->trans("DetailByAccount").' '.$form->selectarray('showaccountdetail', $arraylist, $showaccountdetail, 0);
@@ -186,7 +196,7 @@ report_header($name, '', $period, $periodlink, $description, $builddate, $export
 
 if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
 {
-    print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
+	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
 // Show report array
@@ -319,32 +329,32 @@ if ($modecompta == 'BOOKKEEPING')
 
 	if ($modecompta == 'CREANCES-DETTES')
 	{
-	    $sql = "SELECT s.nom as name, s.rowid as socid, sum(f.total) as amount_ht, sum(f.total_ttc) as amount_ttc";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-	    $sql .= ", ".MAIN_DB_PREFIX."facture as f";
-	    $sql .= " WHERE f.fk_soc = s.rowid";
-	    $sql .= " AND f.fk_statut IN (1,2)";
-	    if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
-	    	$sql .= " AND f.type IN (0,1,2,5)";
+		$sql = "SELECT s.nom as name, s.rowid as socid, sum(f.total) as amount_ht, sum(f.total_ttc) as amount_ttc";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+		$sql .= ", ".MAIN_DB_PREFIX."facture as f";
+		$sql .= " WHERE f.fk_soc = s.rowid";
+		$sql .= " AND f.fk_statut IN (1,2)";
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
+			$sql .= " AND f.type IN (0,1,2,5)";
 		else $sql .= " AND f.type IN (0,1,2,3,5)";
-	    if (!empty($date_start) && !empty($date_end))
-	    	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 	} elseif ($modecompta == 'RECETTES-DEPENSES')
 	{
 		/*
 	     * Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les
 	     * vieilles versions, ils n'etaient pas lies via paiement_facture. On les ajoute plus loin)
 	     */
-	    $sql = "SELECT s.nom as name, s.rowid as socid, sum(pf.amount) as amount_ttc";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-	    $sql .= ", ".MAIN_DB_PREFIX."facture as f";
-	    $sql .= ", ".MAIN_DB_PREFIX."paiement_facture as pf";
-	    $sql .= ", ".MAIN_DB_PREFIX."paiement as p";
-	    $sql .= " WHERE p.rowid = pf.fk_paiement";
-	    $sql .= " AND pf.fk_facture = f.rowid";
-	    $sql .= " AND f.fk_soc = s.rowid";
-	    if (!empty($date_start) && !empty($date_end))
-	    	$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		$sql = "SELECT s.nom as name, s.rowid as socid, sum(pf.amount) as amount_ttc";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+		$sql .= ", ".MAIN_DB_PREFIX."facture as f";
+		$sql .= ", ".MAIN_DB_PREFIX."paiement_facture as pf";
+		$sql .= ", ".MAIN_DB_PREFIX."paiement as p";
+		$sql .= " WHERE p.rowid = pf.fk_paiement";
+		$sql .= " AND pf.fk_facture = f.rowid";
+		$sql .= " AND f.fk_soc = s.rowid";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
 	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
@@ -354,82 +364,82 @@ if ($modecompta == 'BOOKKEEPING')
 	dol_syslog("get customer invoices", LOG_DEBUG);
 	$result = $db->query($sql);
 	if ($result) {
-	    $num = $db->num_rows($result);
-	    $i = 0;
-	    while ($i < $num)
-	    {
-	        $objp = $db->fetch_object($result);
+		$num = $db->num_rows($result);
+		$i = 0;
+		while ($i < $num)
+		{
+			$objp = $db->fetch_object($result);
 
-	        print '<tr class="oddeven"><td>&nbsp;</td>';
-	        print "<td>".$langs->trans("Bills").' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$objp->socid.'">'.$objp->name."</td>\n";
+			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print "<td>".$langs->trans("Bills").' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$objp->socid.'">'.$objp->name."</td>\n";
 
-	        if ($modecompta == 'CREANCES-DETTES')
-	        	print '<td class="right">'.price($objp->amount_ht)."</td>\n";
-	        print '<td class="right">'.price($objp->amount_ttc)."</td>\n";
+			if ($modecompta == 'CREANCES-DETTES')
+				print '<td class="right">'.price($objp->amount_ht)."</td>\n";
+			print '<td class="right">'.price($objp->amount_ttc)."</td>\n";
 
-	        $total_ht += (isset($objp->amount_ht) ? $objp->amount_ht : 0);
-	        $total_ttc += $objp->amount_ttc;
-	        print "</tr>\n";
-	        $i++;
-	    }
-	    $db->free($result);
+			$total_ht += (isset($objp->amount_ht) ? $objp->amount_ht : 0);
+			$total_ttc += $objp->amount_ttc;
+			print "</tr>\n";
+			$i++;
+		}
+		$db->free($result);
 	} else {
-	    dol_print_error($db);
+		dol_print_error($db);
 	}
 
 	// On ajoute les paiements clients anciennes version, non lie par paiement_facture
 	if ($modecompta == 'RECETTES-DEPENSES')
 	{
-	    $sql = "SELECT 'Autres' as name, '0' as idp, sum(p.amount) as amount_ttc";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
-	    $sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
-	    $sql .= ", ".MAIN_DB_PREFIX."paiement as p";
-	    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
-	    $sql .= " WHERE pf.rowid IS NULL";
-	    $sql .= " AND p.fk_bank = b.rowid";
-	    $sql .= " AND b.fk_account = ba.rowid";
-	    $sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-	    if (!empty($date_start) && !empty($date_end))
-	    	$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
-	    $sql .= " GROUP BY name, idp";
-	    $sql .= " ORDER BY name";
+		$sql = "SELECT 'Autres' as name, '0' as idp, sum(p.amount) as amount_ttc";
+		$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
+		$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
+		$sql .= ", ".MAIN_DB_PREFIX."paiement as p";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
+		$sql .= " WHERE pf.rowid IS NULL";
+		$sql .= " AND p.fk_bank = b.rowid";
+		$sql .= " AND b.fk_account = ba.rowid";
+		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		$sql .= " GROUP BY name, idp";
+		$sql .= " ORDER BY name";
 
-	    dol_syslog("get old customer payments not linked to invoices", LOG_DEBUG);
-	    $result = $db->query($sql);
-	    if ($result) {
-	        $num = $db->num_rows($result);
-	        $i = 0;
-	        if ($num) {
-	            while ($i < $num)
-	            {
-	                $objp = $db->fetch_object($result);
+		dol_syslog("get old customer payments not linked to invoices", LOG_DEBUG);
+		$result = $db->query($sql);
+		if ($result) {
+			$num = $db->num_rows($result);
+			$i = 0;
+			if ($num) {
+				while ($i < $num)
+				{
+					$objp = $db->fetch_object($result);
 
 
-	                print '<tr class="oddeven"><td>&nbsp;</td>';
-	                print "<td>".$langs->trans("Bills")." ".$langs->trans("Other")." (".$langs->trans("PaymentsNotLinkedToInvoice").")\n";
+					print '<tr class="oddeven"><td>&nbsp;</td>';
+					print "<td>".$langs->trans("Bills")." ".$langs->trans("Other")." (".$langs->trans("PaymentsNotLinkedToInvoice").")\n";
 
-	                if ($modecompta == 'CREANCES-DETTES')
-	                	print '<td class="right">'.price($objp->amount_ht)."</td>\n";
-	                print '<td class="right">'.price($objp->amount_ttc)."</td>\n";
+					if ($modecompta == 'CREANCES-DETTES')
+						print '<td class="right">'.price($objp->amount_ht)."</td>\n";
+					print '<td class="right">'.price($objp->amount_ttc)."</td>\n";
 
-	                $total_ht += (isset($objp->amount_ht) ? $objp->amount_ht : 0);
-	                $total_ttc += $objp->amount_ttc;
+					$total_ht += (isset($objp->amount_ht) ? $objp->amount_ht : 0);
+					$total_ttc += $objp->amount_ttc;
 
-	                print "</tr>\n";
-	                $i++;
-	            }
-	        }
-	        $db->free($result);
-	    } else {
-	        dol_print_error($db);
-	    }
+					print "</tr>\n";
+					$i++;
+				}
+			}
+			$db->free($result);
+		} else {
+			dol_print_error($db);
+		}
 	}
 
 	if ($total_ttc == 0)
 	{
-	    print '<tr class="oddeven"><td>&nbsp;</td>';
-	    print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
-	    print '</tr>';
+		print '<tr class="oddeven"><td>&nbsp;</td>';
+		print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
+		print '</tr>';
 	}
 
 	print '<tr class="liste_total">';
@@ -444,28 +454,28 @@ if ($modecompta == 'BOOKKEEPING')
 	 */
 	if ($modecompta == 'CREANCES-DETTES')
 	{
-	    $sql = "SELECT s.nom as name, s.rowid as socid, sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-	    $sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
-	    $sql .= " WHERE f.fk_soc = s.rowid";
-	    $sql .= " AND f.fk_statut IN (1,2)";
-	    if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
-	    	$sql .= " AND f.type IN (0,1,2)";
+		$sql = "SELECT s.nom as name, s.rowid as socid, sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+		$sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
+		$sql .= " WHERE f.fk_soc = s.rowid";
+		$sql .= " AND f.fk_statut IN (1,2)";
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
+			$sql .= " AND f.type IN (0,1,2)";
 		else $sql .= " AND f.type IN (0,1,2,3)";
-	    if (!empty($date_start) && !empty($date_end))
-	    	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 	} elseif ($modecompta == 'RECETTES-DEPENSES')
 	{
-	    $sql = "SELECT s.nom as name, s.rowid as socid, sum(pf.amount) as amount_ttc";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p";
-	    $sql .= ", ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf";
-	    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as f";
-	    $sql .= " ON pf.fk_facturefourn = f.rowid";
-	    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s";
-	    $sql .= " ON f.fk_soc = s.rowid";
-	    $sql .= " WHERE p.rowid = pf.fk_paiementfourn ";
-	    if (!empty($date_start) && !empty($date_end))
-	    	$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		$sql = "SELECT s.nom as name, s.rowid as socid, sum(pf.amount) as amount_ttc";
+		$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p";
+		$sql .= ", ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as f";
+		$sql .= " ON pf.fk_facturefourn = f.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " ON f.fk_soc = s.rowid";
+		$sql .= " WHERE p.rowid = pf.fk_paiementfourn ";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
 
 	$sql .= " AND f.entity = ".$conf->entity;
@@ -480,38 +490,38 @@ if ($modecompta == 'BOOKKEEPING')
 	dol_syslog("get suppliers invoices", LOG_DEBUG);
 	$result = $db->query($sql);
 	if ($result) {
-	    $num = $db->num_rows($result);
-	    $i = 0;
-	    if ($num > 0)
-	    {
-	        while ($i < $num)
-	        {
-	            $objp = $db->fetch_object($result);
+		$num = $db->num_rows($result);
+		$i = 0;
+		if ($num > 0)
+		{
+			while ($i < $num)
+			{
+				$objp = $db->fetch_object($result);
 
-	            print '<tr class="oddeven"><td>&nbsp;</td>';
-	            print "<td>".$langs->trans("Bills")." <a href=\"".DOL_URL_ROOT."/fourn/facture/list.php?socid=".$objp->socid."\">".$objp->name."</a></td>\n";
+				print '<tr class="oddeven"><td>&nbsp;</td>';
+				print "<td>".$langs->trans("Bills")." <a href=\"".DOL_URL_ROOT."/fourn/facture/list.php?socid=".$objp->socid."\">".$objp->name."</a></td>\n";
 
-	            if ($modecompta == 'CREANCES-DETTES')
-	            	print '<td class="right">'.price(-$objp->amount_ht)."</td>\n";
-	            print '<td class="right">'.price(-$objp->amount_ttc)."</td>\n";
+				if ($modecompta == 'CREANCES-DETTES')
+					print '<td class="right">'.price(-$objp->amount_ht)."</td>\n";
+				print '<td class="right">'.price(-$objp->amount_ttc)."</td>\n";
 
-	            $total_ht -= (isset($objp->amount_ht) ? $objp->amount_ht : 0);
-	            $total_ttc -= $objp->amount_ttc;
-	            $subtotal_ht += (isset($objp->amount_ht) ? $objp->amount_ht : 0);
-	            $subtotal_ttc += $objp->amount_ttc;
+				$total_ht -= (isset($objp->amount_ht) ? $objp->amount_ht : 0);
+				$total_ttc -= $objp->amount_ttc;
+				$subtotal_ht += (isset($objp->amount_ht) ? $objp->amount_ht : 0);
+				$subtotal_ttc += $objp->amount_ttc;
 
-	            print "</tr>\n";
-	            $i++;
-	        }
-	    } else {
-	        print '<tr class="oddeven"><td>&nbsp;</td>';
-	        print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
-	        print '</tr>';
-	    }
+				print "</tr>\n";
+				$i++;
+			}
+		} else {
+			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
+			print '</tr>';
+		}
 
-	    $db->free($result);
+		$db->free($result);
 	} else {
-	    dol_print_error($db);
+		dol_print_error($db);
 	}
 	print '<tr class="liste_total">';
 	if ($modecompta == 'CREANCES-DETTES')
@@ -529,24 +539,24 @@ if ($modecompta == 'BOOKKEEPING')
 
 	if ($modecompta == 'CREANCES-DETTES')
 	{
-	    $sql = "SELECT c.id, c.libelle as label, sum(cs.amount) as amount";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
-	    $sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
-	    $sql .= " WHERE cs.fk_type = c.id";
-	    $sql .= " AND c.deductible = 0";
-	    if (!empty($date_start) && !empty($date_end))
-	    	$sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
+		$sql = "SELECT c.id, c.libelle as label, sum(cs.amount) as amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
+		$sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
+		$sql .= " WHERE cs.fk_type = c.id";
+		$sql .= " AND c.deductible = 0";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
 	} elseif ($modecompta == 'RECETTES-DEPENSES')
 	{
-	    $sql = "SELECT c.id, c.libelle as label, sum(p.amount) as amount";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
-	    $sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
-	    $sql .= ", ".MAIN_DB_PREFIX."paiementcharge as p";
-	    $sql .= " WHERE p.fk_charge = cs.rowid";
-	    $sql .= " AND cs.fk_type = c.id";
-	    $sql .= " AND c.deductible = 0";
-	    if (!empty($date_start) && !empty($date_end))
-	    	$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		$sql = "SELECT c.id, c.libelle as label, sum(p.amount) as amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
+		$sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
+		$sql .= ", ".MAIN_DB_PREFIX."paiementcharge as p";
+		$sql .= " WHERE p.fk_charge = cs.rowid";
+		$sql .= " AND cs.fk_type = c.id";
+		$sql .= " AND c.deductible = 0";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
 	$sql .= " AND cs.entity = ".$conf->entity;
 	$sql .= " GROUP BY c.libelle, c.id";
@@ -563,30 +573,30 @@ if ($modecompta == 'BOOKKEEPING')
 	$subtotal_ttc = 0;
 	if ($result) {
 		$num = $db->num_rows($result);
-	    $i = 0;
-	    if ($num) {
-	        while ($i < $num) {
-	            $obj = $db->fetch_object($result);
+		$i = 0;
+		if ($num) {
+			while ($i < $num) {
+				$obj = $db->fetch_object($result);
 
-	            $total_ht -= $obj->amount;
-	            $total_ttc -= $obj->amount;
-	            $subtotal_ht += $obj->amount;
-	            $subtotal_ttc += $obj->amount;
+				$total_ht -= $obj->amount;
+				$total_ttc -= $obj->amount;
+				$subtotal_ht += $obj->amount;
+				$subtotal_ttc += $obj->amount;
 
-	            print '<tr class="oddeven"><td>&nbsp;</td>';
-	            print '<td>'.$obj->label.'</td>';
-	            if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
-	            print '<td class="right">'.price(-$obj->amount).'</td>';
-	            print '</tr>';
-	            $i++;
-	        }
-	    } else {
-	        print '<tr class="oddeven"><td>&nbsp;</td>';
-	        print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
-	        print '</tr>';
-	    }
+				print '<tr class="oddeven"><td>&nbsp;</td>';
+				print '<td>'.$obj->label.'</td>';
+				if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
+				print '<td class="right">'.price(-$obj->amount).'</td>';
+				print '</tr>';
+				$i++;
+			}
+		} else {
+			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
+			print '</tr>';
+		}
 	} else {
-	    dol_print_error($db);
+		dol_print_error($db);
 	}
 	print '<tr class="liste_total">';
 	if ($modecompta == 'CREANCES-DETTES')
@@ -603,26 +613,26 @@ if ($modecompta == 'BOOKKEEPING')
 
 	if ($modecompta == 'CREANCES-DETTES')
 	{
-	    $sql = "SELECT c.id, c.libelle as label, sum(cs.amount) as amount";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
-	    $sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
-	    $sql .= " WHERE cs.fk_type = c.id";
-	    $sql .= " AND c.deductible = 1";
-	    if (!empty($date_start) && !empty($date_end))
-	    	$sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
-	    $sql .= " AND cs.entity = ".$conf->entity;
+		$sql = "SELECT c.id, c.libelle as label, sum(cs.amount) as amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
+		$sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
+		$sql .= " WHERE cs.fk_type = c.id";
+		$sql .= " AND c.deductible = 1";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
+		$sql .= " AND cs.entity = ".$conf->entity;
 	} elseif ($modecompta == 'RECETTES-DEPENSES')
 	{
-	    $sql = "SELECT c.id, c.libelle as label, sum(p.amount) as amount";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
-	    $sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
-	    $sql .= ", ".MAIN_DB_PREFIX."paiementcharge as p";
-	    $sql .= " WHERE p.fk_charge = cs.rowid";
-	    $sql .= " AND cs.fk_type = c.id";
-	    $sql .= " AND c.deductible = 1";
-	    if (!empty($date_start) && !empty($date_end))
-	    	$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
-	    $sql .= " AND cs.entity = ".$conf->entity;
+		$sql = "SELECT c.id, c.libelle as label, sum(p.amount) as amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
+		$sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
+		$sql .= ", ".MAIN_DB_PREFIX."paiementcharge as p";
+		$sql .= " WHERE p.fk_charge = cs.rowid";
+		$sql .= " AND cs.fk_type = c.id";
+		$sql .= " AND c.deductible = 1";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		$sql .= " AND cs.entity = ".$conf->entity;
 	}
 	$sql .= " GROUP BY c.libelle, c.id";
 	$newsortfield = $sortfield;
@@ -636,32 +646,32 @@ if ($modecompta == 'BOOKKEEPING')
 	$subtotal_ht = 0;
 	$subtotal_ttc = 0;
 	if ($result) {
-	    $num = $db->num_rows($result);
-	    $i = 0;
-	    if ($num) {
-	        while ($i < $num) {
-	            $obj = $db->fetch_object($result);
+		$num = $db->num_rows($result);
+		$i = 0;
+		if ($num) {
+			while ($i < $num) {
+				$obj = $db->fetch_object($result);
 
-	            $total_ht -= $obj->amount;
-	            $total_ttc -= $obj->amount;
-	            $subtotal_ht += $obj->amount;
-	            $subtotal_ttc += $obj->amount;
+				$total_ht -= $obj->amount;
+				$total_ttc -= $obj->amount;
+				$subtotal_ht += $obj->amount;
+				$subtotal_ttc += $obj->amount;
 
-	            print '<tr class="oddeven"><td>&nbsp;</td>';
-	            print '<td>'.$obj->label.'</td>';
-	            if ($modecompta == 'CREANCES-DETTES')
-	            	print '<td class="right">'.price(-$obj->amount).'</td>';
-	            print '<td class="right">'.price(-$obj->amount).'</td>';
-	            print '</tr>';
-	            $i++;
-	        }
-	    } else {
-	        print '<tr class="oddeven"><td>&nbsp;</td>';
-	        print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
-	        print '</tr>';
-	    }
+				print '<tr class="oddeven"><td>&nbsp;</td>';
+				print '<td>'.$obj->label.'</td>';
+				if ($modecompta == 'CREANCES-DETTES')
+					print '<td class="right">'.price(-$obj->amount).'</td>';
+				print '<td class="right">'.price(-$obj->amount).'</td>';
+				print '</tr>';
+				$i++;
+			}
+		} else {
+			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
+			print '</tr>';
+		}
 	} else {
-	    dol_print_error($db);
+		dol_print_error($db);
 	}
 	print '<tr class="liste_total">';
 	if ($modecompta == 'CREANCES-DETTES')
@@ -671,20 +681,20 @@ if ($modecompta == 'BOOKKEEPING')
 
 	if ($mysoc->tva_assuj == 'franchise')	// Non assujetti
 	{
-	    // Total
-	    print '<tr>';
-	    print '<td colspan="4">&nbsp;</td>';
-	    print '</tr>';
+		// Total
+		print '<tr>';
+		print '<td colspan="4">&nbsp;</td>';
+		print '</tr>';
 
-	    print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Profit").'</td>';
-	    if ($modecompta == 'CREANCES-DETTES')
-	    	print '<td class="border right">'.price($total_ht).'</td>';
-	    print '<td class="right">'.price($total_ttc).'</td>';
-	    print '</tr>';
+		print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Profit").'</td>';
+		if ($modecompta == 'CREANCES-DETTES')
+			print '<td class="border right">'.price($total_ht).'</td>';
+		print '<td class="right">'.price($total_ttc).'</td>';
+		print '</tr>';
 
-	    print '<tr>';
-	    print '<td colspan="4">&nbsp;</td>';
-	    print '</tr>';
+		print '<tr>';
+		print '<td colspan="4">&nbsp;</td>';
+		print '</tr>';
 	}
 
 
@@ -699,9 +709,9 @@ if ($modecompta == 'BOOKKEEPING')
 	 	if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES')
 		{
 			if ($modecompta == 'CREANCES-DETTES') {
-			    $column = 'p.datev';
+				$column = 'p.datev';
 			} else {
-			    $column = 'p.datep';
+				$column = 'p.datep';
 			}
 
 			$sql = "SELECT u.rowid, u.firstname, u.lastname, p.fk_user, p.label as label, date_format($column,'%Y-%m') as dm, sum(p.amount) as amount";
@@ -713,9 +723,9 @@ if ($modecompta == 'BOOKKEEPING')
 
 			$sql .= " GROUP BY u.rowid, u.firstname, u.lastname, p.fk_user, p.label, dm";
 			$newsortfield = $sortfield;
-		    if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'u.firstname, u.lastname';
-		    if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
-		    if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
+			if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'u.firstname, u.lastname';
+			if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
+			if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
 			$sql .= $db->order($newsortfield, $sortorder);
 		}
 
@@ -725,35 +735,35 @@ if ($modecompta == 'BOOKKEEPING')
 		$subtotal_ttc = 0;
 		if ($result)
 		{
-		    $num = $db->num_rows($result);
-		    $i = 0;
-		    if ($num)
-		    {
-		        while ($i < $num)
-		        {
-		            $obj = $db->fetch_object($result);
+			$num = $db->num_rows($result);
+			$i = 0;
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($result);
 
-		            $total_ht -= $obj->amount;
-		            $total_ttc -= $obj->amount;
-		            $subtotal_ht += $obj->amount;
-		            $subtotal_ttc += $obj->amount;
+					$total_ht -= $obj->amount;
+					$total_ttc -= $obj->amount;
+					$subtotal_ht += $obj->amount;
+					$subtotal_ttc += $obj->amount;
 
-		            print '<tr class="oddeven"><td>&nbsp;</td>';
+					print '<tr class="oddeven"><td>&nbsp;</td>';
 
-		            print "<td>".$langs->trans("Salary")." <a href=\"".DOL_URL_ROOT."/salaries/list.php?filtre=s.fk_user=".$obj->fk_user."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
+					print "<td>".$langs->trans("Salary")." <a href=\"".DOL_URL_ROOT."/salaries/list.php?filtre=s.fk_user=".$obj->fk_user."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
 
-		            if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
-		            print '<td class="right">'.price(-$obj->amount).'</td>';
-		            print '</tr>';
-		            $i++;
-		        }
-		    } else {
-		        print '<tr class="oddeven"><td>&nbsp;</td>';
-		        print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
-		        print '</tr>';
-		    }
+					if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
+					print '<td class="right">'.price(-$obj->amount).'</td>';
+					print '</tr>';
+					$i++;
+				}
+			} else {
+				print '<tr class="oddeven"><td>&nbsp;</td>';
+				print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
+				print '</tr>';
+			}
 		} else {
-		    dol_print_error($db);
+			dol_print_error($db);
 		}
 		print '<tr class="liste_total">';
 		if ($modecompta == 'CREANCES-DETTES')
@@ -798,9 +808,9 @@ if ($modecompta == 'BOOKKEEPING')
 			}
 
 			$sql .= " GROUP BY u.rowid, p.rowid, p.ref, u.firstname, u.lastname, dm";
-		    $newsortfield = $sortfield;
-		    if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'p.ref';
-		    $sql .= $db->order($newsortfield, $sortorder);
+			$newsortfield = $sortfield;
+			if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'p.ref';
+			$sql .= $db->order($newsortfield, $sortorder);
 		}
 
 		print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("ExpenseReport").'</td></tr>';
@@ -855,27 +865,27 @@ if ($modecompta == 'BOOKKEEPING')
 		{
 			if ($modecompta == 'CREANCES-DETTES')
 			{
-		    	$sql = "SELECT p.societe as name, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
-		    	$sql .= " FROM ".MAIN_DB_PREFIX."don as p";
-		    	$sql .= " WHERE p.entity IN (".getEntity('donation').")";
-		    	$sql .= " AND fk_statut in (1,2)";
+				$sql = "SELECT p.societe as name, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
+				$sql .= " FROM ".MAIN_DB_PREFIX."don as p";
+				$sql .= " WHERE p.entity IN (".getEntity('donation').")";
+				$sql .= " AND fk_statut in (1,2)";
 			} else {
-			    $sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
-			    $sql .= " FROM ".MAIN_DB_PREFIX."don as p";
-			    $sql .= " INNER JOIN ".MAIN_DB_PREFIX."payment_donation as pe ON pe.fk_donation = p.rowid";
-			    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
-			    $sql .= " WHERE p.entity IN (".getEntity('donation').")";
-			    $sql .= " AND fk_statut >= 2";
+				$sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
+				$sql .= " FROM ".MAIN_DB_PREFIX."don as p";
+				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."payment_donation as pe ON pe.fk_donation = p.rowid";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
+				$sql .= " WHERE p.entity IN (".getEntity('donation').")";
+				$sql .= " AND fk_statut >= 2";
 			}
 			if (!empty($date_start) && !empty($date_end))
 				$sql .= " AND p.datedon >= '".$db->idate($date_start)."' AND p.datedon <= '".$db->idate($date_end)."'";
 		}
 		$sql .= " GROUP BY p.societe, p.firstname, p.lastname, dm";
-	    $newsortfield = $sortfield;
-	    if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'p.societe, p.firstname, p.lastname, dm';
-	    if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
-	    if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
-	    $sql .= $db->order($newsortfield, $sortorder);
+		$newsortfield = $sortfield;
+		if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'p.societe, p.firstname, p.lastname, dm';
+		if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
+		if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
+		$sql .= $db->order($newsortfield, $sortorder);
 
 		dol_syslog("get dunning");
 		$result = $db->query($sql);
@@ -920,113 +930,113 @@ if ($modecompta == 'BOOKKEEPING')
 		print '</tr>';
 	}
 
-    /*
+	/*
      * Various Payments
      */
 
-    if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->banque->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
-    {
-        $subtotal_ht = 0;
-        $subtotal_ttc = 0;
+	if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->banque->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
+	{
+		$subtotal_ht = 0;
+		$subtotal_ttc = 0;
 
-        print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("VariousPayment").'</td></tr>';
+		print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("VariousPayment").'</td></tr>';
 
-        // Debit
-        $sql = "SELECT SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various as p";
-        $sql .= ' WHERE 1 = 1';
-        if (!empty($date_start) && !empty($date_end))
-            $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
-        $sql .= ' GROUP BY p.sens';
-        $sql .= ' ORDER BY p.sens';
+		// Debit
+		$sql = "SELECT SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various as p";
+		$sql .= ' WHERE 1 = 1';
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		$sql .= ' GROUP BY p.sens';
+		$sql .= ' ORDER BY p.sens';
 
-        dol_syslog('get various payments', LOG_DEBUG);
-        $result = $db->query($sql);
-        if ($result)
-        {
-            // Debit
-            $obj = $db->fetch_object($result);
-            if (isset($obj->amount))
-            {
-                $subtotal_ht += -$obj->amount;
-                $subtotal_ttc += -$obj->amount;
-            }
-            print '<tr class="oddeven"><td>&nbsp;</td>';
-            print "<td>".$langs->trans("Debit")."</td>\n";
-            if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
-            print '<td class="right">'.price(-$obj->amount)."</td>\n";
-            print "</tr>\n";
+		dol_syslog('get various payments', LOG_DEBUG);
+		$result = $db->query($sql);
+		if ($result)
+		{
+			// Debit
+			$obj = $db->fetch_object($result);
+			if (isset($obj->amount))
+			{
+				$subtotal_ht += -$obj->amount;
+				$subtotal_ttc += -$obj->amount;
+			}
+			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print "<td>".$langs->trans("Debit")."</td>\n";
+			if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
+			print '<td class="right">'.price(-$obj->amount)."</td>\n";
+			print "</tr>\n";
 
-            // Credit
-            $obj = $db->fetch_object($result);
-            if (isset($obj->amount))
-            {
-                $subtotal_ht += $obj->amount;
-                $subtotal_ttc += $obj->amount;
-            }
-            print '<tr class="oddeven"><td>&nbsp;</td>';
-            print "<td>".$langs->trans("Credit")."</td>\n";
-            if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price($obj->amount).'</td>';
-            print '<td class="right">'.price($obj->amount)."</td>\n";
-            print "</tr>\n";
+			// Credit
+			$obj = $db->fetch_object($result);
+			if (isset($obj->amount))
+			{
+				$subtotal_ht += $obj->amount;
+				$subtotal_ttc += $obj->amount;
+			}
+			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print "<td>".$langs->trans("Credit")."</td>\n";
+			if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price($obj->amount).'</td>';
+			print '<td class="right">'.price($obj->amount)."</td>\n";
+			print "</tr>\n";
 
-            // Total
-            $total_ht += $subtotal_ht;
-            $total_ttc += $subtotal_ttc;
-            print '<tr class="liste_total">';
-            if ($modecompta == 'CREANCES-DETTES')
-                print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
-            print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
-            print '</tr>';
-        } else dol_print_error($db);
-    }
+			// Total
+			$total_ht += $subtotal_ht;
+			$total_ttc += $subtotal_ttc;
+			print '<tr class="liste_total">';
+			if ($modecompta == 'CREANCES-DETTES')
+				print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
+			print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
+			print '</tr>';
+		} else dol_print_error($db);
+	}
 
-    /*
+	/*
      * Payement Loan
      */
 
-    if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
-    {
-        $subtotal_ht = 0;
-        $subtotal_ttc = 0;
+	if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
+	{
+		$subtotal_ht = 0;
+		$subtotal_ttc = 0;
 
-        print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("PaymentLoan").'</td></tr>';
+		print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("PaymentLoan").'</td></tr>';
 
-        $sql = 'SELECT l.rowid as id, l.label AS label, SUM(p.amount_capital + p.amount_insurance + p.amount_interest) as amount FROM '.MAIN_DB_PREFIX.'payment_loan as p';
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'loan AS l ON l.rowid = p.fk_loan';
-        $sql .= ' WHERE 1 = 1';
-        if (!empty($date_start) && !empty($date_end))
-            $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
-        $sql .= ' GROUP BY p.fk_loan';
-        $sql .= ' ORDER BY p.fk_loan';
+		$sql = 'SELECT l.rowid as id, l.label AS label, SUM(p.amount_capital + p.amount_insurance + p.amount_interest) as amount FROM '.MAIN_DB_PREFIX.'payment_loan as p';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'loan AS l ON l.rowid = p.fk_loan';
+		$sql .= ' WHERE 1 = 1';
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		$sql .= ' GROUP BY p.fk_loan';
+		$sql .= ' ORDER BY p.fk_loan';
 
-        dol_syslog('get loan payments', LOG_DEBUG);
-        $result = $db->query($sql);
-        if ($result)
-        {
-            require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
-            $loan_static = new Loan($db);
-            while ($obj = $db->fetch_object($result))
-            {
-                $loan_static->id = $obj->id;
-                $loan_static->ref = $obj->id;
-                $loan_static->label = $obj->label;
-                print '<tr class="oddeven"><td>&nbsp;</td>';
-                print "<td>".$loan_static->getNomUrl(1).' - '.$obj->label."</td>\n";
-                if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
-                print '<td class="right">'.price(-$obj->amount)."</td>\n";
-                print "</tr>\n";
-                $subtotal_ht -= $obj->amount;
-                $subtotal_ttc -= $obj->amount;
-            }
-            $total_ht += $subtotal_ht;
-            $total_ttc += $subtotal_ttc;
-            print '<tr class="liste_total">';
-            if ($modecompta == 'CREANCES-DETTES')
-                print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
-            print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
-            print '</tr>';
-        } else dol_print_error($db);
-    }
+		dol_syslog('get loan payments', LOG_DEBUG);
+		$result = $db->query($sql);
+		if ($result)
+		{
+			require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
+			$loan_static = new Loan($db);
+			while ($obj = $db->fetch_object($result))
+			{
+				$loan_static->id = $obj->id;
+				$loan_static->ref = $obj->id;
+				$loan_static->label = $obj->label;
+				print '<tr class="oddeven"><td>&nbsp;</td>';
+				print "<td>".$loan_static->getNomUrl(1).' - '.$obj->label."</td>\n";
+				if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
+				print '<td class="right">'.price(-$obj->amount)."</td>\n";
+				print "</tr>\n";
+				$subtotal_ht -= $obj->amount;
+				$subtotal_ttc -= $obj->amount;
+			}
+			$total_ht += $subtotal_ht;
+			$total_ttc += $subtotal_ttc;
+			print '<tr class="liste_total">';
+			if ($modecompta == 'CREANCES-DETTES')
+				print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
+			print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
+			print '</tr>';
+		} else dol_print_error($db);
+	}
 
 	/*
 	 * VAT
@@ -1040,198 +1050,198 @@ if ($modecompta == 'BOOKKEEPING')
 	{
 		if ($modecompta == 'CREANCES-DETTES')
 		{
-		    // TVA a payer
-		    $amount = 0;
-		    $sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.tva) as amount";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
-		    $sql .= " WHERE f.fk_statut IN (1,2)";
-		    if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
-		    	$sql .= " AND f.type IN (0,1,2,5)";
+			// TVA a payer
+			$amount = 0;
+			$sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.tva) as amount";
+			$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+			$sql .= " WHERE f.fk_statut IN (1,2)";
+			if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
+				$sql .= " AND f.type IN (0,1,2,5)";
 			else $sql .= " AND f.type IN (0,1,2,3,5)";
-		    if (!empty($date_start) && !empty($date_end))
-		    	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-		    $sql .= " AND f.entity IN (".getEntity('invoice').")";
-		    $sql .= " GROUP BY dm";
-		    $newsortfield = $sortfield;
-		    if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'dm';
-		    if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
-		    if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
-		    $sql .= $db->order($newsortfield, $sortorder);
+			if (!empty($date_start) && !empty($date_end))
+				$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+			$sql .= " AND f.entity IN (".getEntity('invoice').")";
+			$sql .= " GROUP BY dm";
+			$newsortfield = $sortfield;
+			if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'dm';
+			if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
+			if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
+			$sql .= $db->order($newsortfield, $sortorder);
 
-		    dol_syslog("get vat to pay", LOG_DEBUG);
-		    $result = $db->query($sql);
-		    if ($result)
-		    {
-		        $num = $db->num_rows($result);
-		        $i = 0;
-		        if ($num)
-		        {
-		            while ($i < $num)
-		            {
-		                $obj = $db->fetch_object($result);
+			dol_syslog("get vat to pay", LOG_DEBUG);
+			$result = $db->query($sql);
+			if ($result)
+			{
+				$num = $db->num_rows($result);
+				$i = 0;
+				if ($num)
+				{
+					while ($i < $num)
+					{
+						$obj = $db->fetch_object($result);
 
-		                $amount -= $obj->amount;
-		                //$total_ht -= $obj->amount;
-		                $total_ttc -= $obj->amount;
-		                //$subtotal_ht -= $obj->amount;
-		                $subtotal_ttc -= $obj->amount;
-		                $i++;
-		            }
-		        }
-		    } else {
-		        dol_print_error($db);
-		    }
-		    print '<tr class="oddeven"><td>&nbsp;</td>';
-		    print "<td>".$langs->trans("VATToPay")."</td>\n";
-		    print '<td class="right">&nbsp;</td>'."\n";
-		    print '<td class="right">'.price($amount)."</td>\n";
-		    print "</tr>\n";
+						$amount -= $obj->amount;
+						//$total_ht -= $obj->amount;
+						$total_ttc -= $obj->amount;
+						//$subtotal_ht -= $obj->amount;
+						$subtotal_ttc -= $obj->amount;
+						$i++;
+					}
+				}
+			} else {
+				dol_print_error($db);
+			}
+			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print "<td>".$langs->trans("VATToPay")."</td>\n";
+			print '<td class="right">&nbsp;</td>'."\n";
+			print '<td class="right">'.price($amount)."</td>\n";
+			print "</tr>\n";
 
-		    // TVA a recuperer
-		    $amount = 0;
-		    $sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.total_tva) as amount";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
-		    $sql .= " WHERE f.fk_statut IN (1,2)";
-		    if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
-		    	$sql .= " AND f.type IN (0,1,2)";
+			// TVA a recuperer
+			$amount = 0;
+			$sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.total_tva) as amount";
+			$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+			$sql .= " WHERE f.fk_statut IN (1,2)";
+			if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
+				$sql .= " AND f.type IN (0,1,2)";
 			else $sql .= " AND f.type IN (0,1,2,3)";
-		    if (!empty($date_start) && !empty($date_end))
-		    	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-		    $sql .= " AND f.entity = ".$conf->entity;
-		    $sql .= " GROUP BY dm";
-		    $newsortfield = $sortfield;
-		    if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'dm';
-		    if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
-		    if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
-		    $sql .= $db->order($newsortfield, $sortorder);
+			if (!empty($date_start) && !empty($date_end))
+				$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+			$sql .= " AND f.entity = ".$conf->entity;
+			$sql .= " GROUP BY dm";
+			$newsortfield = $sortfield;
+			if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'dm';
+			if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
+			if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
+			$sql .= $db->order($newsortfield, $sortorder);
 
-		    dol_syslog("get vat received back", LOG_DEBUG);
-		    $result = $db->query($sql);
-		    if ($result)
-		    {
-		        $num = $db->num_rows($result);
-		        $i = 0;
-		        if ($num)
-		        {
-		            while ($i < $num)
-		            {
-		                $obj = $db->fetch_object($result);
+			dol_syslog("get vat received back", LOG_DEBUG);
+			$result = $db->query($sql);
+			if ($result)
+			{
+				$num = $db->num_rows($result);
+				$i = 0;
+				if ($num)
+				{
+					while ($i < $num)
+					{
+						$obj = $db->fetch_object($result);
 
-		                $amount += $obj->amount;
-		                //$total_ht += $obj->amount;
-		                $total_ttc += $obj->amount;
-		                //$subtotal_ht += $obj->amount;
-		                $subtotal_ttc += $obj->amount;
+						$amount += $obj->amount;
+						//$total_ht += $obj->amount;
+						$total_ttc += $obj->amount;
+						//$subtotal_ht += $obj->amount;
+						$subtotal_ttc += $obj->amount;
 
-		                $i++;
-		            }
-		        }
-		    } else {
-		        dol_print_error($db);
-		    }
-		    print '<tr class="oddeven"><td>&nbsp;</td>';
-		    print '<td>'.$langs->trans("VATToCollect")."</td>\n";
-		    print '<td class="right">&nbsp;</td>'."\n";
-		    print '<td class="right">'.price($amount)."</td>\n";
-		    print "</tr>\n";
+						$i++;
+					}
+				}
+			} else {
+				dol_print_error($db);
+			}
+			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print '<td>'.$langs->trans("VATToCollect")."</td>\n";
+			print '<td class="right">&nbsp;</td>'."\n";
+			print '<td class="right">'.price($amount)."</td>\n";
+			print "</tr>\n";
 		} else {
-		    // VAT really already paid
-		    $amount = 0;
-		    $sql = "SELECT date_format(t.datev,'%Y-%m') as dm, sum(t.amount) as amount";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
-		    $sql .= " WHERE amount > 0";
-		    if (!empty($date_start) && !empty($date_end))
-		    	$sql .= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
-		    $sql .= " AND t.entity = ".$conf->entity;
-		    $sql .= " GROUP BY dm";
-		    $newsortfield = $sortfield;
-		    if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'dm';
-		    if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
-		    if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
-		    $sql .= $db->order($newsortfield, $sortorder);
+			// VAT really already paid
+			$amount = 0;
+			$sql = "SELECT date_format(t.datev,'%Y-%m') as dm, sum(t.amount) as amount";
+			$sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
+			$sql .= " WHERE amount > 0";
+			if (!empty($date_start) && !empty($date_end))
+				$sql .= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
+			$sql .= " AND t.entity = ".$conf->entity;
+			$sql .= " GROUP BY dm";
+			$newsortfield = $sortfield;
+			if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'dm';
+			if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
+			if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
+			$sql .= $db->order($newsortfield, $sortorder);
 
-		    dol_syslog("get vat really paid", LOG_DEBUG);
-		    $result = $db->query($sql);
-		    if ($result) {
-		        $num = $db->num_rows($result);
-		        $i = 0;
-		        if ($num) {
-		            while ($i < $num) {
-		                $obj = $db->fetch_object($result);
+			dol_syslog("get vat really paid", LOG_DEBUG);
+			$result = $db->query($sql);
+			if ($result) {
+				$num = $db->num_rows($result);
+				$i = 0;
+				if ($num) {
+					while ($i < $num) {
+						$obj = $db->fetch_object($result);
 
-		                $amount -= $obj->amount;
-		                $total_ht -= $obj->amount;
-		                $total_ttc -= $obj->amount;
-		                $subtotal_ht -= $obj->amount;
-		                $subtotal_ttc -= $obj->amount;
+						$amount -= $obj->amount;
+						$total_ht -= $obj->amount;
+						$total_ttc -= $obj->amount;
+						$subtotal_ht -= $obj->amount;
+						$subtotal_ttc -= $obj->amount;
 
-		                $i++;
-		            }
-		        }
-		        $db->free($result);
-		    } else {
-		        dol_print_error($db);
-		    }
-		    print '<tr class="oddeven"><td>&nbsp;</td>';
-		    print "<td>".$langs->trans("VATPaid")."</td>\n";
-		    if ($modecompta == 'CREANCES-DETTES')
-		    	print '<td <class="right">'.price($amount)."</td>\n";
-		    print '<td class="right">'.price($amount)."</td>\n";
-		    print "</tr>\n";
+						$i++;
+					}
+				}
+				$db->free($result);
+			} else {
+				dol_print_error($db);
+			}
+			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print "<td>".$langs->trans("VATPaid")."</td>\n";
+			if ($modecompta == 'CREANCES-DETTES')
+				print '<td <class="right">'.price($amount)."</td>\n";
+			print '<td class="right">'.price($amount)."</td>\n";
+			print "</tr>\n";
 
-		    // VAT really received
-		    $amount = 0;
-		    $sql = "SELECT date_format(t.datev,'%Y-%m') as dm, sum(t.amount) as amount";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
-		    $sql .= " WHERE amount < 0";
-		    if (!empty($date_start) && !empty($date_end))
-		    	$sql .= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
-		    $sql .= " AND t.entity = ".$conf->entity;
-		    $sql .= " GROUP BY dm";
-		    $newsortfield = $sortfield;
-		    if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'dm';
-		    if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
-		    if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
-		    $sql .= $db->order($newsortfield, $sortorder);
+			// VAT really received
+			$amount = 0;
+			$sql = "SELECT date_format(t.datev,'%Y-%m') as dm, sum(t.amount) as amount";
+			$sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
+			$sql .= " WHERE amount < 0";
+			if (!empty($date_start) && !empty($date_end))
+				$sql .= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
+			$sql .= " AND t.entity = ".$conf->entity;
+			$sql .= " GROUP BY dm";
+			$newsortfield = $sortfield;
+			if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'dm';
+			if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
+			if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
+			$sql .= $db->order($newsortfield, $sortorder);
 
-		    dol_syslog("get vat really received back", LOG_DEBUG);
-		    $result = $db->query($sql);
-		    if ($result) {
-		        $num = $db->num_rows($result);
-		        $i = 0;
-		        if ($num) {
-		            while ($i < $num) {
-		                $obj = $db->fetch_object($result);
+			dol_syslog("get vat really received back", LOG_DEBUG);
+			$result = $db->query($sql);
+			if ($result) {
+				$num = $db->num_rows($result);
+				$i = 0;
+				if ($num) {
+					while ($i < $num) {
+						$obj = $db->fetch_object($result);
 
-		                $amount += -$obj->amount;
-		                $total_ht += -$obj->amount;
-		                $total_ttc += -$obj->amount;
-		                $subtotal_ht += -$obj->amount;
-		                $subtotal_ttc += -$obj->amount;
+						$amount += -$obj->amount;
+						$total_ht += -$obj->amount;
+						$total_ttc += -$obj->amount;
+						$subtotal_ht += -$obj->amount;
+						$subtotal_ttc += -$obj->amount;
 
-		                $i++;
-		            }
-		        }
-		        $db->free($result);
-		    } else {
-		        dol_print_error($db);
-		    }
-		    print '<tr class="oddeven"><td>&nbsp;</td>';
-		    print "<td>".$langs->trans("VATCollected")."</td>\n";
-		    if ($modecompta == 'CREANCES-DETTES')
-		    	print '<td class="right">'.price($amount)."</td>\n";
-		    print '<td class="right">'.price($amount)."</td>\n";
-		    print "</tr>\n";
+						$i++;
+					}
+				}
+				$db->free($result);
+			} else {
+				dol_print_error($db);
+			}
+			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print "<td>".$langs->trans("VATCollected")."</td>\n";
+			if ($modecompta == 'CREANCES-DETTES')
+				print '<td class="right">'.price($amount)."</td>\n";
+			print '<td class="right">'.price($amount)."</td>\n";
+			print "</tr>\n";
 		}
 	}
 
 	if ($mysoc->tva_assuj != 'franchise')	// Assujetti
 	{
-	    print '<tr class="liste_total">';
-	    if ($modecompta == 'CREANCES-DETTES')
-	    	print '<td colspan="3" class="right">&nbsp;</td>';
-	    print '<td colspan="3" class="right">'.price(price2num($subtotal_ttc, 'MT')).'</td>';
-	    print '</tr>';
+		print '<tr class="liste_total">';
+		if ($modecompta == 'CREANCES-DETTES')
+			print '<td colspan="3" class="right">&nbsp;</td>';
+		print '<td colspan="3" class="right">'.price(price2num($subtotal_ttc, 'MT')).'</td>';
+		print '</tr>';
 	}
 }
 
@@ -1248,16 +1258,16 @@ print $hookmanager->resPrint;
 
 if ($mysoc->tva_assuj != 'franchise')	// Assujetti
 {
-    // Total
-    print '<tr>';
-    print '<td colspan="4">&nbsp;</td>';
-    print '</tr>';
+	// Total
+	print '<tr>';
+	print '<td colspan="4">&nbsp;</td>';
+	print '</tr>';
 
-    print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Profit").'</td>';
-    if ($modecompta == 'CREANCES-DETTES')
-    	print '<td class="liste_total right">'.price(price2num($total_ht, 'MT')).'</td>';
-    print '<td class="liste_total right">'.price(price2num($total_ttc, 'MT')).'</td>';
-    print '</tr>';
+	print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Profit").'</td>';
+	if ($modecompta == 'CREANCES-DETTES')
+		print '<td class="liste_total right">'.price(price2num($total_ht, 'MT')).'</td>';
+	print '<td class="liste_total right">'.price(price2num($total_ttc, 'MT')).'</td>';
+	print '</tr>';
 }
 
 print "</table>";
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index 9ae666cb01a..ec2a8bb2623 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -123,8 +123,12 @@ if ($modecompta == 'CREANCES-DETTES')
 {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByYear");
 	$calcmode = $langs->trans("CalcModeDebt");
-	$calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=RECETTES-DEPENSES">', '</a>').')';
-	if (!empty($conf->accounting->enabled)) $calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=BOOKKEEPING">', '</a>').')';
+	$calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '{s1}', '{s2}').')';
+	$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=RECETTES-DEPENSES">', '</a>'), $calcmode);
+	if (!empty($conf->accounting->enabled)) {
+		$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '{s1}', '{s2}').')';
+		$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=BOOKKEEPING">', '</a>'), $calcmode);
+	}
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesAmountWithTaxIncluded");
@@ -136,8 +140,12 @@ if ($modecompta == 'CREANCES-DETTES')
 } elseif ($modecompta == "RECETTES-DEPENSES") {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByYear");
 	$calcmode = $langs->trans("CalcModeEngagement");
-	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">', '</a>').')';
-	if (!empty($conf->accounting->enabled)) $calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=BOOKKEEPING">', '</a>').')';
+	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '{s1}', '{s2}').')';
+	$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">', '</a>'), $calcmode);
+	if (!empty($conf->accounting->enabled)) {
+		$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '{s1}', '{s2}').')';
+		$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=BOOKKEEPING">', '</a>'), $calcmode);
+	}
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesAmountWithTaxIncluded");
@@ -148,8 +156,10 @@ if ($modecompta == 'CREANCES-DETTES')
 {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByYear");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
-	$calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=RECETTES-DEPENSES">', '</a>').')';
-	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">', '</a>').')';
+	$calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '{s1}', '{s2}').')';
+	$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=RECETTES-DEPENSES">', '</a>'), $calcmode);
+	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '{s1}', '{s2}').')';
+	$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">', '</a>'), $calcmode);
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesAmountOnInOutBookkeepingRecord");
@@ -164,7 +174,7 @@ report_header($name, '', $period, $periodlink, $description, $builddate, $export
 
 if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
 {
-    print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
+	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
 
@@ -186,8 +196,8 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 		$sql .= " AND f.fk_statut IN (1,2)";
 		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
 		else $sql .= " AND f.type IN (0,1,2,3,5)";
-	    if (!empty($date_start) && !empty($date_end))
-	    	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 	} elseif ($modecompta == "RECETTES-DEPENSES")
 	{
 		/*
@@ -200,8 +210,8 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 		$sql .= ", ".MAIN_DB_PREFIX."paiement as p";
 		$sql .= " WHERE p.rowid = pf.fk_paiement";
 		$sql .= " AND pf.fk_facture = f.rowid";
-	    if (!empty($date_start) && !empty($date_end))
-	    	$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
 
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
@@ -246,8 +256,8 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 		$sql .= " AND p.fk_bank = b.rowid";
 		$sql .= " AND b.fk_account = ba.rowid";
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-    	if (!empty($date_start) && !empty($date_end))
-    		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 		$sql .= " GROUP BY dm";
 		$sql .= " ORDER BY dm";
 
@@ -296,8 +306,8 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 		$sql .= " WHERE f.fk_statut IN (1,2)";
 		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2)";
 		else $sql .= " AND f.type IN (0,1,2,3)";
-    	if (!empty($date_start) && !empty($date_end))
-    		$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 	} elseif ($modecompta == "RECETTES-DEPENSES")
 	{
 		$sql = "SELECT sum(pf.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm";
@@ -306,8 +316,8 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 		$sql .= ", ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf";
 		$sql .= " WHERE f.rowid = pf.fk_facturefourn";
 		$sql .= " AND p.rowid = pf.fk_paiementfourn";
-    	if (!empty($date_start) && !empty($date_end))
-    		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
 
 	$sql .= " AND f.entity = ".$conf->entity;
@@ -360,8 +370,8 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
 		else $sql .= " AND f.type IN (0,1,2,3,5)";
 		$sql .= " AND f.entity IN (".getEntity('invoice').")";
-    	if (!empty($date_start) && !empty($date_end))
-    		$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 		$sql .= " GROUP BY dm";
 
 		dol_syslog("get vat to pay", LOG_DEBUG);
@@ -392,8 +402,8 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2)";
 		else $sql .= " AND f.type IN (0,1,2,3)";
 		$sql .= " AND f.entity = ".$conf->entity;
-    	if (!empty($date_start) && !empty($date_end))
-    		$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 		$sql .= " GROUP BY dm";
 
 		dol_syslog("get vat to receive back", LOG_DEBUG);
@@ -424,8 +434,8 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		$sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
 		$sql .= " WHERE amount > 0";
 		$sql .= " AND t.entity = ".$conf->entity;
-    	if (!empty($date_start) && !empty($date_end))
-    		$sql .= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
 		$sql .= " GROUP BY dm";
 
 		dol_syslog("get vat really paid", LOG_DEBUG);
@@ -449,13 +459,13 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		} else {
 			dol_print_error($db);
 		}
-		// TVA retreived
+		// TVA retrieved
 		$sql = "SELECT sum(t.amount) as amount, date_format(t.datev,'%Y-%m') as dm";
 		$sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
 		$sql .= " WHERE amount < 0";
 		$sql .= " AND t.entity = ".$conf->entity;
-    	if (!empty($date_start) && !empty($date_end))
-    		$sql .= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
 		$sql .= " GROUP BY dm";
 
 		dol_syslog("get vat really received back", LOG_DEBUG);
@@ -499,8 +509,8 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
 		$sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
 		$sql .= " WHERE cs.fk_type = c.id";
-    	if (!empty($date_start) && !empty($date_end))
-    		$sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
 	} elseif ($modecompta == "RECETTES-DEPENSES")
 	{
 		$sql = "SELECT c.libelle as nom, date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount";
@@ -509,8 +519,8 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		$sql .= ", ".MAIN_DB_PREFIX."paiementcharge as p";
 		$sql .= " WHERE p.fk_charge = cs.rowid";
 		$sql .= " AND cs.fk_type = c.id";
-    	if (!empty($date_start) && !empty($date_end))
-    		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
 
 	$sql .= " AND cs.entity = ".$conf->entity;
@@ -656,54 +666,54 @@ if (!empty($conf->expensereport->enabled) && ($modecompta == 'CREANCES-DETTES' |
 
 if (!empty($conf->don->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
 {
-    $subtotal_ht = 0;
-    $subtotal_ttc = 0;
+	$subtotal_ht = 0;
+	$subtotal_ttc = 0;
 
-    if ($modecompta == 'CREANCES-DETTES') {
-        $sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
-        $sql .= " FROM ".MAIN_DB_PREFIX."don as p";
-        $sql .= " WHERE p.entity IN (".getEntity('donation').")";
-        $sql .= " AND fk_statut in (1,2)";
+	if ($modecompta == 'CREANCES-DETTES') {
+		$sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."don as p";
+		$sql .= " WHERE p.entity IN (".getEntity('donation').")";
+		$sql .= " AND fk_statut in (1,2)";
 		if (!empty($date_start) && !empty($date_end))
 			$sql .= " AND p.datedon >= '".$db->idate($date_start)."' AND p.datedon <= '".$db->idate($date_end)."'";
-    } elseif ($modecompta == 'RECETTES-DEPENSES') {
-        $sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(pe.datep,'%Y-%m') as dm, sum(p.amount) as amount";
-        $sql .= " FROM ".MAIN_DB_PREFIX."don as p";
+	} elseif ($modecompta == 'RECETTES-DEPENSES') {
+		$sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(pe.datep,'%Y-%m') as dm, sum(p.amount) as amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."don as p";
 		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."payment_donation as pe ON pe.fk_donation = p.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
 		$sql .= " WHERE p.entity IN (".getEntity('donation').")";
-   	    $sql .= " AND fk_statut >= 2";
-        if (!empty($date_start) && !empty($date_end)) {
-            $sql .= " AND pe.datep >= '".$db->idate($date_start)."' AND pe.datep <= '".$db->idate($date_end)."'";
-        }
-    }
+   		$sql .= " AND fk_statut >= 2";
+		if (!empty($date_start) && !empty($date_end)) {
+			$sql .= " AND pe.datep >= '".$db->idate($date_start)."' AND pe.datep <= '".$db->idate($date_end)."'";
+		}
+	}
 
-    $sql .= " GROUP BY p.societe, p.firstname, p.lastname, dm";
+	$sql .= " GROUP BY p.societe, p.firstname, p.lastname, dm";
 
-    dol_syslog("get donation payments");
-    $result = $db->query($sql);
-    if ($result)
-    {
-    	$num = $db->num_rows($result);
-    	$i = 0;
-    	if ($num)
-    	{
-    		while ($i < $num)
-    		{
-    			$obj = $db->fetch_object($result);
+	dol_syslog("get donation payments");
+	$result = $db->query($sql);
+	if ($result)
+	{
+		$num = $db->num_rows($result);
+		$i = 0;
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($result);
 
-    			if (!isset($encaiss[$obj->dm])) $encaiss[$obj->dm] = 0;
-    			$encaiss[$obj->dm] += $obj->amount;
+				if (!isset($encaiss[$obj->dm])) $encaiss[$obj->dm] = 0;
+				$encaiss[$obj->dm] += $obj->amount;
 
-    			if (!isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm] = 0;
-    			$encaiss_ttc[$obj->dm] += $obj->amount;
+				if (!isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm] = 0;
+				$encaiss_ttc[$obj->dm] += $obj->amount;
 
-    			$i++;
-    		}
-    	}
-    } else {
-    	dol_print_error($db);
-    }
+				$i++;
+			}
+		}
+	} else {
+		dol_print_error($db);
+	}
 } elseif ($modecompta == 'BOOKKEEPING') {
 	// Nothing from this table
 }
@@ -714,61 +724,61 @@ if (!empty($conf->don->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 
 if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->banque->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
 {
-    // decaiss
+	// decaiss
 
-    $sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various as p";
-    $sql .= ' WHERE p.sens = 0';
-    if (!empty($date_start) && !empty($date_end))
-        $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
-    $sql .= ' GROUP BY dm';
+	$sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various as p";
+	$sql .= ' WHERE p.sens = 0';
+	if (!empty($date_start) && !empty($date_end))
+		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+	$sql .= ' GROUP BY dm';
 
-    dol_syslog("get various payments");
-    $result = $db->query($sql);
-    if ($result)
-    {
-    	$num = $db->num_rows($result);
-    	$i = 0;
-    	if ($num)
-    	{
-    		while ($i < $num)
-    		{
-    			$obj = $db->fetch_object($result);
-    			if (!isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm] = 0;
-                if (isset($obj->amount)) $decaiss_ttc[$obj->dm] += $obj->amount;
-    			$i++;
-    		}
-    	}
-    } else {
-    	dol_print_error($db);
-    }
+	dol_syslog("get various payments");
+	$result = $db->query($sql);
+	if ($result)
+	{
+		$num = $db->num_rows($result);
+		$i = 0;
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($result);
+				if (!isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm] = 0;
+				if (isset($obj->amount)) $decaiss_ttc[$obj->dm] += $obj->amount;
+				$i++;
+			}
+		}
+	} else {
+		dol_print_error($db);
+	}
 
-    // encaiss
+	// encaiss
 
-    $sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various AS p";
-    $sql .= ' WHERE p.sens = 1';
-    if (!empty($date_start) && !empty($date_end))
-        $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
-    $sql .= ' GROUP BY dm';
+	$sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various AS p";
+	$sql .= ' WHERE p.sens = 1';
+	if (!empty($date_start) && !empty($date_end))
+		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+	$sql .= ' GROUP BY dm';
 
-    dol_syslog("get various payments");
-    $result = $db->query($sql);
-    if ($result)
-    {
-    	$num = $db->num_rows($result);
-    	$i = 0;
-    	if ($num)
-    	{
-    		while ($i < $num)
-    		{
-    			$obj = $db->fetch_object($result);
-    			if (!isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm] = 0;
-                if (isset($obj->amount)) $encaiss_ttc[$obj->dm] += $obj->amount;
-    			$i++;
-    		}
-    	}
-    } else {
-    	dol_print_error($db);
-    }
+	dol_syslog("get various payments");
+	$result = $db->query($sql);
+	if ($result)
+	{
+		$num = $db->num_rows($result);
+		$i = 0;
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($result);
+				if (!isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm] = 0;
+				if (isset($obj->amount)) $encaiss_ttc[$obj->dm] += $obj->amount;
+				$i++;
+			}
+		}
+	} else {
+		dol_print_error($db);
+	}
 }
 // Useless with BOOKKEEPING
 //elseif ($modecompta == 'BOOKKEEPING') {
@@ -780,31 +790,31 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->ba
 
 if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
 {
-    $sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount_capital + p.amount_insurance + p.amount_interest) AS amount FROM ".MAIN_DB_PREFIX."payment_loan AS p";
-    $sql .= ' WHERE 1 = 1';
-    if (!empty($date_start) && !empty($date_end))
-        $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
-    $sql .= ' GROUP BY dm';
+	$sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount_capital + p.amount_insurance + p.amount_interest) AS amount FROM ".MAIN_DB_PREFIX."payment_loan AS p";
+	$sql .= ' WHERE 1 = 1';
+	if (!empty($date_start) && !empty($date_end))
+		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+	$sql .= ' GROUP BY dm';
 
-    dol_syslog("get loan payments");
-    $result = $db->query($sql);
-    if ($result)
-    {
-    	$num = $db->num_rows($result);
-    	$i = 0;
-    	if ($num)
-    	{
-    		while ($i < $num)
-    		{
-    			$obj = $db->fetch_object($result);
-    			if (!isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm] = 0;
-                if (isset($obj->amount)) $decaiss_ttc[$obj->dm] += $obj->amount;
-    			$i++;
-    		}
-    	}
-    } else {
-    	dol_print_error($db);
-    }
+	dol_syslog("get loan payments");
+	$result = $db->query($sql);
+	if ($result)
+	{
+		$num = $db->num_rows($result);
+		$i = 0;
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($result);
+				if (!isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm] = 0;
+				if (isset($obj->amount)) $decaiss_ttc[$obj->dm] += $obj->amount;
+				$i++;
+			}
+		}
+	} else {
+		dol_print_error($db);
+	}
 }
 // Useless with BOOKKEEPING
 //elseif ($modecompta == 'BOOKKEEPING') {
@@ -818,17 +828,15 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan
 if (!empty($conf->accounting->enabled) && ($modecompta == 'BOOKKEEPING'))
 {
 	$predefinedgroupwhere = "(";
-	//$predefinedgroupwhere.= " (pcg_type = 'EXPENSE' and pcg_subtype in ('PRODUCT','SERVICE'))";
-	$predefinedgroupwhere .= " (pcg_type = 'EXPENSE')";
+	$predefinedgroupwhere .= " (aa.pcg_type = 'EXPENSE')";
 	$predefinedgroupwhere .= " OR ";
-	//$predefinedgroupwhere.= " (pcg_type = 'INCOME' and pcg_subtype in ('PRODUCT','SERVICE'))";
-	$predefinedgroupwhere .= " (pcg_type = 'INCOME')";
+	$predefinedgroupwhere .= " (aa.pcg_type = 'INCOME')";
 	$predefinedgroupwhere .= ")";
 
 	$charofaccountstring = $conf->global->CHARTOFACCOUNTS;
 	$charofaccountstring = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'accounting_system', 'rowid', 'pcg_version');
 
-	$sql = "SELECT b.doc_ref, b.numero_compte, b.subledger_account, b.subledger_label, pcg_type, date_format(b.doc_date,'%Y-%m') as dm, sum(b.debit) as debit, sum(b.credit) as credit, sum(b.montant) as amount";
+	$sql = "SELECT b.doc_ref, b.numero_compte, b.subledger_account, b.subledger_label, aa.pcg_type, date_format(b.doc_date,'%Y-%m') as dm, sum(b.debit) as debit, sum(b.credit) as credit, sum(b.montant) as amount";
 	$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b, ".MAIN_DB_PREFIX."accounting_account as aa";
 	$sql .= " WHERE b.entity = ".$conf->entity;
 	$sql .= " AND aa.entity = ".$conf->entity;
@@ -855,10 +863,18 @@ if (!empty($conf->accounting->enabled) && ($modecompta == 'BOOKKEEPING'))
 			{
 				$obj = $db->fetch_object($result);
 
-				if (!isset($encaiss[$obj->dm])) $encaiss[$obj->dm] = 0;
-				if (!isset($decaiss[$obj->dm])) $decaiss[$obj->dm] = 0;
-				$encaiss[$obj->dm] += $obj->credit;
-				$decaiss[$obj->dm] += $obj->debit;
+				if ($obj->pcg_type == 'INCOME') {
+					if (!isset($encaiss[$obj->dm])) $encaiss[$obj->dm] = 0;	// To avoid warning of var not defined
+					$encaiss[$obj->dm] += $obj->credit;
+					$encaiss[$obj->dm] -= $obj->credit;
+				}
+				if ($obj->pcg_type == 'INCOME') {
+					if (!isset($decaiss[$obj->dm])) $decaiss[$obj->dm] = 0;	// To avoid warning of var not defined
+					$decaiss[$obj->dm] += $obj->debit;
+					$decaiss[$obj->dm] -= $obj->credit;
+				}
+
+				// ???
 				if (!isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm] = 0;
 				if (!isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm] = 0;
 				$encaiss_ttc[$obj->dm] += 0;
@@ -915,7 +931,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 	print '</td>';
 	print '<td class="liste_titre" align="center" class="borderrightlight">';
 	$htmlhelp = '';
-	// if ($modecompta == 'RECETTES-DEPENSES') $htmlhelp=$langs->trans("SalesPlusVATToRetreive");
+	// if ($modecompta == 'RECETTES-DEPENSES') $htmlhelp=$langs->trans("SalesPlusVATToRetrieve");
 	print $form->textwithpicto($langs->trans("Income"), $htmlhelp);
 	print '</td>';
 }
diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index 48cb8b1154e..2a69f590449 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -213,7 +213,7 @@ report_header($name, '', $period, $periodlink, $description, $builddate, $export
 
 if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
 {
-    print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
+	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
 
@@ -286,9 +286,9 @@ if ($modecompta == 'CREANCES-DETTES')
 		setEventMessages(null, $AccCat->errors, 'errors');
 	} elseif (is_array($cats) && count($cats) > 0) {
 		foreach ($cats as $cat) {
-            // Loop on each group
+			// Loop on each group
 			if (!empty($cat['category_type'])) {
-                // category calculed
+				// category calculed
 				// When we enter here, $sommes was filled by group of accounts
 
 				$formula = $cat['formula'];
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index c744bcc90e8..bf28ceb0996 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -27,11 +27,11 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/paymentsocialcontribution.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsocialcontrib.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (!empty($conf->projet->enabled))
-{
+if (!empty($conf->projet->enabled)) {
 	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -124,8 +124,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')
 {
 	$object->fetch($id);
 	$result = $object->delete($user);
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		header("Location: list.php");
 		exit;
 	} else {
@@ -137,7 +136,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')
 // Add social contribution
 if ($action == 'add' && $user->rights->tax->charges->creer)
 {
-	$amount = price2num(GETPOST('amount'));
+	$amount = price2num(GETPOST('amount'), 'MT');
 
 	if (!$dateech)
 	{
@@ -155,23 +154,21 @@ if ($action == 'add' && $user->rights->tax->charges->creer)
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount")), null, 'errors');
 		$action = 'create';
-	} elseif (!is_numeric($amount))
-	{
+	} elseif (!is_numeric($amount)) {
 		setEventMessages($langs->trans("ErrorFieldMustBeANumeric", $langs->transnoentities("Amount")), null, 'errors');
 		$action = 'create';
 	} else {
 		$object->type = $actioncode;
 		$object->label = GETPOST('label', 'alpha');
 		$object->date_ech = $dateech;
-		$object->periode			= $dateperiod;
-		$object->amount				= $amount;
-		$object->mode_reglement_id = GETPOST('mode_reglement_id');
-		$object->fk_account			= GETPOST('fk_account', 'int');
-		$object->fk_project			= GETPOST('fk_project');
+		$object->periode = $dateperiod;
+		$object->amount = $amount;
+		$object->mode_reglement_id = (int) GETPOST('mode_reglement_id', 'int');
+		$object->fk_account = (int) GETPOST('fk_account', 'int');
+		$object->fk_project = (int) GETPOST('fk_project', 'int');
 
 		$id = $object->create($user);
-		if ($id <= 0)
-		{
+		if ($id <= 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'create';
 		}
@@ -181,11 +178,12 @@ if ($action == 'add' && $user->rights->tax->charges->creer)
 
 if ($action == 'update' && !$_POST["cancel"] && $user->rights->tax->charges->creer)
 {
-	$amount = price2num(GETPOST('amount'));
+	$amount = price2num(GETPOST('amount'), 'MT');
 
 	if (!$dateech)
 	{
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
+		setEventMessages($langs->trans("ErrorFieldReqrequire_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
+uired", $langs->transnoentities("Date")), null, 'errors');
 		$action = 'edit';
 	} elseif (!$dateperiod)
 	{
@@ -203,12 +201,11 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->tax->charges->cre
 		$result = $object->fetch($id);
 
 		$object->date_ech = $dateech;
-		$object->periode	= $dateperiod;
-		$object->amount		= price2num($amount);
+		$object->periode = $dateperiod;
+		$object->amount = $amount;
 
 		$result = $object->update($user);
-		if ($result <= 0)
-		{
+		if ($result <= 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -296,7 +293,7 @@ if ($action == 'create')
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">';
 
@@ -305,7 +302,7 @@ if ($action == 'create')
 	print '<td class="titlefieldcreate fieldrequired">';
 	print $langs->trans("Label");
 	print '</td>';
-	print '<td><input type="text" size="34" name="label" class="flat" value="'.dol_escape_htmltag(GETPOST('label', 'alpha')).'" autofocus></td>';
+	print '<td><input type="text" name="label" class="flat minwidth300" value="'.dol_escape_htmltag(GETPOST('label', 'alpha')).'" autofocus></td>';
 	print '</tr>';
 	print '<tr>';
 
@@ -370,18 +367,18 @@ if ($action == 'create')
 	if (!empty($conf->banque->enabled))
 	{
 		print '<tr><td>'.$langs->trans('BankAccount').'</td><td colspan="2">';
-		$form->select_comptes($fk_account, 'fk_account', 0, '', 1);
+		$form->select_comptes($fk_account, 'fk_account', 0, '', 2);
 		print '</td></tr>';
 	}
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+	print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 	print '</div>';
 
 	print '</form>';
@@ -440,7 +437,7 @@ if ($id > 0)
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 		}
 
-		dol_fiche_head($head, 'card', $langs->trans("SocialContribution"), -1, 'bill');
+		print dol_get_fiche_head($head, 'card', $langs->trans("SocialContribution"), -1, 'bill');
 
 		$morehtmlref = '<div class="refidno">';
 		// Ref customer
@@ -585,8 +582,8 @@ if ($id > 0)
 		$sql .= " c.code as type_code,c.libelle as paiement_type,";
 		$sql .= ' ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.currency_code as bacurrency_code, ba.fk_accountancy_journal';
 		$sql .= " FROM ".MAIN_DB_PREFIX."paiementcharge as p";
-    	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
-    	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_typepaiement = c.id";
 		$sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
 		$sql .= " WHERE p.fk_charge = ".$id;
@@ -609,20 +606,28 @@ if ($id > 0)
 			print '<td>'.$langs->trans("RefPayment").'</td>';
 			print '<td>'.$langs->trans("Date").'</td>';
 			print '<td>'.$langs->trans("Type").'</td>';
-		    if (!empty($conf->banque->enabled)) {
-        		print '<td class="liste_titre right">'.$langs->trans('BankAccount').'</td>';
-    		}
+			if (!empty($conf->banque->enabled)) {
+				print '<td class="liste_titre right">'.$langs->trans('BankAccount').'</td>';
+			}
 			print '<td class="right">'.$langs->trans("Amount").'</td>';
 			print '</tr>';
 
+			$paymentsocialcontributiontmp = new PaymentSocialContribution($db);
+
 			if ($num > 0)
 			{
 				while ($i < $num)
 				{
 					$objp = $db->fetch_object($resql);
 
+					$paymentsocialcontributiontmp->id = $objp->rowid;
+					$paymentsocialcontributiontmp->ref = $objp->rowid;
+					$paymentsocialcontributiontmp->datep = $db->jdate($objp->dp);
+
 					print '<tr class="oddeven"><td>';
-					print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"), "payment").' '.$objp->rowid.'</a></td>';
+					print $paymentsocialcontributiontmp->getNomUrl(1);
+					print '</td>';
+
 					print '<td>'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
 					$labeltype = $langs->trans("PaymentType".$objp->type_code) != ("PaymentType".$objp->type_code) ? $langs->trans("PaymentType".$objp->type_code) : $objp->paiement_type;
 					print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
@@ -681,14 +686,14 @@ if ($id > 0)
 
 		print '<div class="clearboth"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		if ($action == 'edit')
 		{
 			print '<div align="center">';
-			print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+			print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
 			print ' &nbsp; ';
-			print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+			print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 			print '</div>';
 		}
 
diff --git a/htdocs/compta/sociales/class/cchargesociales.class.php b/htdocs/compta/sociales/class/cchargesociales.class.php
index cc66b56aabd..ceace76bba9 100644
--- a/htdocs/compta/sociales/class/cchargesociales.class.php
+++ b/htdocs/compta/sociales/class/cchargesociales.class.php
@@ -44,16 +44,23 @@ class Cchargesociales
 	 */
 	public $table_element = 'c_chargesociales';
 
+	/**
+	 * @var string Label
+	 */
 	public $libelle;
+
 	public $deductible;
 	public $active;
 	public $code;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_pays;
 
+	/**
+	 * @var string module
+	 */
 	public $module;
 	public $accountancy_code;
 
@@ -82,18 +89,18 @@ class Cchargesociales
 
 		$error = 0;
 
-        // Clean parameters
-        $this->trimParameters(
-            array(
-                'libelle',
-                'deductible',
-                'active',
-                'code',
-                'fk_pays',
-                'module',
-                'accountancy_code',
-            )
-        );
+		// Clean parameters
+		$this->trimParameters(
+			array(
+				'libelle',
+				'deductible',
+				'active',
+				'code',
+				'fk_pays',
+				'module',
+				'accountancy_code',
+			)
+		);
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -233,17 +240,17 @@ class Cchargesociales
 
 		// Clean parameters
 
-        $this->trimParameters(
-            array(
-                'libelle',
-                'deductible',
-                'active',
-                'code',
-                'fk_pays',
-                'module',
-                'accountancy_code',
-            )
-        );
+		$this->trimParameters(
+			array(
+				'libelle',
+				'deductible',
+				'active',
+				'code',
+				'fk_pays',
+				'module',
+				'accountancy_code',
+			)
+		);
 
 
 		// Check parameters
@@ -398,34 +405,34 @@ class Cchargesociales
 	 *
 	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option				On what the link point to
-     *  @param	integer	$notooltip			1=Disable tooltip
-     *  @param	int		$maxlen				Max length of visible user name
-     *  @param  string  $morecss            Add more css on link
+	 *  @param	integer	$notooltip			1=Disable tooltip
+	 *  @param	int		$maxlen				Max length of visible user name
+	 *  @param  string  $morecss            Add more css on link
 	 *	@return	string						String with URL
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $maxlen = 24, $morecss = '')
 	{
 		global $langs, $conf, $db;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
+		global $dolibarr_main_authentication, $dolibarr_main_demo;
+		global $menumanager;
 
 
-        $result = '';
-        $companylink = '';
+		$result = '';
+		$companylink = '';
 
-        $label = '<u>'.$langs->trans("MyModule").'</u>';
-        $label .= '<div width="100%">';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label = '<u>'.$langs->trans("MyModule").'</u>';
+		$label .= '<div width="100%">';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-        $link = '<a href="'.DOL_URL_ROOT.'/tax/card.php?id='.$this->id.'"';
-        $link .= ($notooltip ? '' : ' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss ? ' '.$morecss : '').'"');
-        $link .= '>';
+		$link = '<a href="'.DOL_URL_ROOT.'/tax/card.php?id='.$this->id.'"';
+		$link .= ($notooltip ? '' : ' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss ? ' '.$morecss : '').'"');
+		$link .= '>';
 		$linkend = '</a>';
 
-        if ($withpicto)
-        {
-            $result .= ($link.img_object(($notooltip ? '' : $label), 'label', ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).$linkend);
-            if ($withpicto != 2) $result .= ' ';
+		if ($withpicto)
+		{
+			$result .= ($link.img_object(($notooltip ? '' : $label), 'label', ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).$linkend);
+			if ($withpicto != 2) $result .= ' ';
 		}
 		$result .= $link.$this->ref.$linkend;
 		return $result;
@@ -442,7 +449,7 @@ class Cchargesociales
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un status donne
 	 *
@@ -452,7 +459,7 @@ class Cchargesociales
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if ($mode == 0)
@@ -502,19 +509,18 @@ class Cchargesociales
 		$this->accountancy_code = '';
 	}
 
-    /**
-     * Trim object parameters
-     * @param string[] $parameters array of parameters to trim
-     *
-     * @return void
-     */
-    private function trimParameters($parameters)
-    {
-        if (!is_array($parameters)) return;
-        foreach ($parameters as $parameter) {
-            if (isset($this->$parameter)) {
-                $this->$parameter = trim($this->$parameter);
-            }
-        }
-    }
+	/**
+	 * Trim object parameters
+	 *
+	 * @param string[] $parameters array of parameters to trim
+	 * @return void
+	 */
+	private function trimParameters($parameters)
+	{
+		foreach ($parameters as $parameter) {
+			if (isset($this->$parameter)) {
+				$this->$parameter = trim($this->$parameter);
+			}
+		}
+	}
 }
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 81ae1e28f20..2ea2497efbb 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2016-2019 Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2016-2020 Frédéric France      <frederic.france@netlogic.fr>
  * Copyright (C) 2017      Alexandre Spangaro	<aspangaro@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -32,79 +32,79 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
  */
 class ChargeSociales extends CommonObject
 {
-    /**
+	/**
 	 * @var string ID to identify managed object
 	 */
 	public $element = 'chargesociales';
 
-    public $table = 'chargesociales';
+	public $table = 'chargesociales';
 
-    /**
+	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element = 'chargesociales';
 
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto = 'bill';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $table_ref_field = 'ref';
-
-    /**
-     * @var integer|string $date_ech
-     */
-    public $date_ech;
-
-
-    public $label;
-    public $type;
-    public $type_label;
-    public $amount;
-    public $paye;
-    public $periode;
-
-    /**
-     * @var integer|string date_creation
-     */
-    public $date_creation;
-
-    /**
-     * @var integer|string $date_modification
-     */
-    public $date_modification;
-
-    /**
-     * @var integer|string $date_validation
-     */
-    public $date_validation;
-
-    /**
-     * @deprecated Use label instead
-     */
-    public $lib;
-
-    /**
-     * @var int account ID
-     */
-    public $fk_account;
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'bill';
 
 	/**
-     * @var int account ID (identical to fk_account)
-     */
-    public $accountid;
+	 * {@inheritdoc}
+	 */
+	protected $table_ref_field = 'ref';
 
-    /**
-     * @var int payment type (identical to mode_reglement_id in commonobject class)
-     */
-    public $paiementtype;
+	/**
+	 * @var integer|string $date_ech
+	 */
+	public $date_ech;
 
-    /**
-     * @var int ID
-     */
+
+	public $label;
+	public $type;
+	public $type_label;
+	public $amount;
+	public $paye;
+	public $periode;
+
+	/**
+	 * @var integer|string date_creation
+	 */
+	public $date_creation;
+
+	/**
+	 * @var integer|string $date_modification
+	 */
+	public $date_modification;
+
+	/**
+	 * @var integer|string $date_validation
+	 */
+	public $date_validation;
+
+	/**
+	 * @deprecated Use label instead
+	 */
+	public $lib;
+
+	/**
+	 * @var int account ID
+	 */
+	public $fk_account;
+
+	/**
+	 * @var int account ID (identical to fk_account)
+	 */
+	public $accountid;
+
+	/**
+	 * @var int payment type (identical to mode_reglement_id in commonobject class)
+	 */
+	public $paiementtype;
+
+	/**
+	 * @var int ID
+	 */
 	public $fk_project;
 
 
@@ -112,73 +112,73 @@ class ChargeSociales extends CommonObject
 	const STATUS_PAID = 1;
 
 
-    /**
-     * Constructor
-     *
-     * @param	DoliDB		$db		Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param	DoliDB		$db		Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
-    /**
-     *  Retrouve et charge une charge sociale
-     *
-     *  @param	int     $id		Id
-     *  @param	string  $ref	Ref
-     *  @return	int <0 KO >0 OK
-     */
-    public function fetch($id, $ref = '')
-    {
-        $sql = "SELECT cs.rowid, cs.date_ech";
-        $sql .= ", cs.libelle as label, cs.fk_type, cs.amount, cs.fk_projet as fk_project, cs.paye, cs.periode, cs.import_key";
-        $sql .= ", cs.fk_account, cs.fk_mode_reglement";
-        $sql .= ", c.libelle";
-        $sql .= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
-        $sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as cs";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_chargesociales as c ON cs.fk_type = c.id";
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON cs.fk_mode_reglement = p.id';
-        $sql .= ' WHERE cs.entity IN ('.getEntity('tax').')';
-        if ($ref) $sql .= " AND cs.rowid = ".$ref;
-        else $sql .= " AND cs.rowid = ".$id;
+	/**
+	 *  Retrouve et charge une charge sociale
+	 *
+	 *  @param	int     $id		Id
+	 *  @param	string  $ref	Ref
+	 *  @return	int <0 KO >0 OK
+	 */
+	public function fetch($id, $ref = '')
+	{
+		$sql = "SELECT cs.rowid, cs.date_ech";
+		$sql .= ", cs.libelle as label, cs.fk_type, cs.amount, cs.fk_projet as fk_project, cs.paye, cs.periode, cs.import_key";
+		$sql .= ", cs.fk_account, cs.fk_mode_reglement";
+		$sql .= ", c.libelle";
+		$sql .= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
+		$sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as cs";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_chargesociales as c ON cs.fk_type = c.id";
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON cs.fk_mode_reglement = p.id';
+		$sql .= ' WHERE cs.entity IN ('.getEntity('tax').')';
+		if ($ref) $sql .= " AND cs.rowid = ".$ref;
+		else $sql .= " AND cs.rowid = ".$id;
 
-        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->rowid;
-                $this->ref					= $obj->rowid;
-                $this->date_ech = $this->db->jdate($obj->date_ech);
-                $this->lib					= $obj->label;
-                $this->label				= $obj->label;
-                $this->type					= $obj->fk_type;
-                $this->type_label			= $obj->libelle;
-                $this->fk_account			= $obj->fk_account;
-                $this->mode_reglement_id = $obj->fk_mode_reglement;
-                $this->mode_reglement_code = $obj->mode_reglement_code;
-                $this->mode_reglement = $obj->mode_reglement_libelle;
-                $this->amount = $obj->amount;
+				$this->id = $obj->rowid;
+				$this->ref					= $obj->rowid;
+				$this->date_ech = $this->db->jdate($obj->date_ech);
+				$this->lib					= $obj->label;
+				$this->label				= $obj->label;
+				$this->type					= $obj->fk_type;
+				$this->type_label			= $obj->libelle;
+				$this->fk_account			= $obj->fk_account;
+				$this->mode_reglement_id = $obj->fk_mode_reglement;
+				$this->mode_reglement_code = $obj->mode_reglement_code;
+				$this->mode_reglement = $obj->mode_reglement_libelle;
+				$this->amount = $obj->amount;
 				$this->fk_project = $obj->fk_project;
-                $this->paye = $obj->paye;
-                $this->periode = $this->db->jdate($obj->periode);
-                $this->import_key = $this->import_key;
+				$this->paye = $obj->paye;
+				$this->periode = $this->db->jdate($obj->periode);
+				$this->import_key = $this->import_key;
 
-                $this->db->free($resql);
+				$this->db->free($resql);
 
-                return 1;
-            } else {
-                return 0;
-            }
-        } else {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
 	/**
 	 * Check if a social contribution can be created into database
@@ -189,59 +189,59 @@ class ChargeSociales extends CommonObject
 	{
 		$newamount = price2num($this->amount, 'MT');
 
-        // Validation parametres
-        if (!$newamount > 0 || empty($this->date_ech) || empty($this->periode))
-        {
-            return false;
-        }
+		// Validation parametres
+		if (!$newamount > 0 || empty($this->date_ech) || empty($this->periode))
+		{
+			return false;
+		}
 
 
 		return true;
 	}
 
-    /**
-     *      Create a social contribution into database
-     *
-     *      @param	User	$user   User making creation
-     *      @return int     		<0 if KO, id if OK
-     */
-    public function create($user)
-    {
-    	global $conf;
+	/**
+	 *      Create a social contribution into database
+	 *
+	 *      @param	User	$user   User making creation
+	 *      @return int     		<0 if KO, id if OK
+	 */
+	public function create($user)
+	{
+		global $conf;
 		$error = 0;
 
-        $now = dol_now();
+		$now = dol_now();
 
-        // Nettoyage parametres
-        $newamount = price2num($this->amount, 'MT');
+		// Nettoyage parametres
+		$newamount = price2num($this->amount, 'MT');
 
 		if (!$this->check()) {
 			 $this->error = "ErrorBadParameter";
 			 return -2;
 		}
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, fk_account, fk_mode_reglement, libelle, date_ech, periode, amount, fk_projet, entity, fk_user_author, date_creation)";
-        $sql .= " VALUES (".$this->type;
-        $sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
-        $sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : "NULL");
-        $sql .= ", '".$this->db->escape($this->label ? $this->label : $this->lib)."'";
-        $sql .= ", '".$this->db->idate($this->date_ech)."'";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, fk_account, fk_mode_reglement, libelle, date_ech, periode, amount, fk_projet, entity, fk_user_author, date_creation)";
+		$sql .= " VALUES (".$this->type;
+		$sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
+		$sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : "NULL");
+		$sql .= ", '".$this->db->escape($this->label ? $this->label : $this->lib)."'";
+		$sql .= ", '".$this->db->idate($this->date_ech)."'";
 		$sql .= ", '".$this->db->idate($this->periode)."'";
-        $sql .= ", '".price2num($newamount)."'";
+		$sql .= ", '".price2num($newamount)."'";
 		$sql .= ", ".($this->fk_project > 0 ? $this->fk_project : 'NULL');
-        $sql .= ", ".$conf->entity;
-        $sql .= ", ".$user->id;
-        $sql .= ", '".$this->db->idate($now)."'";
-        $sql .= ")";
+		$sql .= ", ".$conf->entity;
+		$sql .= ", ".$user->id;
+		$sql .= ", '".$this->db->idate($now)."'";
+		$sql .= ")";
 
-        dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."chargesociales");
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."chargesociales");
 
-            //dol_syslog("ChargesSociales::create this->id=".$this->id);
+			//dol_syslog("ChargesSociales::create this->id=".$this->id);
 			$result = $this->call_trigger('SOCIALCONTRIBUTION_CREATE', $user);
 			if ($result < 0) $error++;
 
@@ -252,429 +252,431 @@ class ChargeSociales extends CommonObject
 				$this->db->rollback();
 				return -1 * $error;
 			}
-        } else {
-            $this->error = $this->db->error();
-            $this->db->rollback();
-            return -1;
-        }
-    }
+		} else {
+			$this->error = $this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
 
-    /**
-     *      Delete a social contribution
-     *
-     *      @param		User    $user   Object user making delete
-     *      @return     		int 	<0 if KO, >0 if OK
-     */
-    public function delete($user)
-    {
-        $error = 0;
+	/**
+	 *      Delete a social contribution
+	 *
+	 *      @param		User    $user   Object user making delete
+	 *      @return     		int 	<0 if KO, >0 if OK
+	 */
+	public function delete($user)
+	{
+		$error = 0;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // Get bank transaction lines for this social contributions
-        include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-        $account = new Account($this->db);
-        $lines_url = $account->get_url('', $this->id, 'sc');
+		// Get bank transaction lines for this social contributions
+		include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+		$account = new Account($this->db);
+		$lines_url = $account->get_url('', $this->id, 'sc');
 
-        // Delete bank urls
-        foreach ($lines_url as $line_url)
-        {
-            if (!$error)
-            {
-                $accountline = new AccountLine($this->db);
-                $accountline->fetch($line_url['fk_bank']);
-                $result = $accountline->delete_urls($user);
-                if ($result < 0)
-                {
-                    $error++;
-                }
-            }
-        }
+		// Delete bank urls
+		foreach ($lines_url as $line_url)
+		{
+			if (!$error)
+			{
+				$accountline = new AccountLine($this->db);
+				$accountline->fetch($line_url['fk_bank']);
+				$result = $accountline->delete_urls($user);
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
+		}
 
-        // Delete payments
-        if (!$error)
-        {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."paiementcharge WHERE fk_charge=".$this->id;
-            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if (!$resql)
-            {
-                $error++;
-                $this->error = $this->db->lasterror();
-            }
-        }
+		// Delete payments
+		if (!$error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."paiementcharge WHERE fk_charge=".$this->id;
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$error++;
+				$this->error = $this->db->lasterror();
+			}
+		}
 
-        if (!$error)
-        {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."chargesociales WHERE rowid=".$this->id;
-            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if (!$resql)
-            {
-                $error++;
-                $this->error = $this->db->lasterror();
-            }
-        }
+		if (!$error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."chargesociales WHERE rowid=".$this->id;
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$error++;
+				$this->error = $this->db->lasterror();
+			}
+		}
 
-        if (!$error)
-        {
-            $this->db->commit();
-            return 1;
-        } else {
-            $this->db->rollback();
-            return -1;
-        }
-    }
+		if (!$error)
+		{
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
 
-    /**
-     *      Update social or fiscal contribution
-     *
-     *      @param	User	$user           User that modify
-     *      @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-     *      @return int     		        <0 if KO, >0 if OK
-     */
-    public function update($user, $notrigger = 0)
-    {
-        $error = 0;
-        $this->db->begin();
+	/**
+	 *      Update social or fiscal contribution
+	 *
+	 *      @param	User	$user           User that modify
+	 *      @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
+	 *      @return int     		        <0 if KO, >0 if OK
+	 */
+	public function update($user, $notrigger = 0)
+	{
+		$error = 0;
+		$this->db->begin();
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales";
-        $sql .= " SET libelle='".$this->db->escape($this->label ? $this->label : $this->lib)."'";
-        $sql .= ", date_ech='".$this->db->idate($this->date_ech)."'";
-        $sql .= ", periode='".$this->db->idate($this->periode)."'";
-        $sql .= ", amount='".price2num($this->amount, 'MT')."'";
-        $sql .= ", fk_projet=".($this->fk_project > 0 ? $this->db->escape($this->fk_project) : "NULL");
-        $sql .= ", fk_user_modif=".$user->id;
-        $sql .= " WHERE rowid=".$this->id;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales";
+		$sql .= " SET libelle='".$this->db->escape($this->label ? $this->label : $this->lib)."'";
+		$sql .= ", date_ech='".$this->db->idate($this->date_ech)."'";
+		$sql .= ", periode='".$this->db->idate($this->periode)."'";
+		$sql .= ", amount='".price2num($this->amount, 'MT')."'";
+		$sql .= ", fk_projet=".($this->fk_project > 0 ? $this->db->escape($this->fk_project) : "NULL");
+		$sql .= ", fk_user_modif=".$user->id;
+		$sql .= " WHERE rowid=".$this->id;
 
-        dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
 
-        if (!$resql) {
-            $error++; $this->errors[] = "Error ".$this->db->lasterror();
-        }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
-        if (!$error)
-        {
-            if (!$notrigger)
-            {
-                // Call trigger
-                $result = $this->call_trigger('SOCIALCHARGES_MODIFY', $user);
-                if ($result < 0) $error++;
-                // End call triggers
-            }
-        }
+		if (!$error)
+		{
+			if (!$notrigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('SOCIALCHARGES_MODIFY', $user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+		}
 
-        // Commit or rollback
-        if ($error)
-        {
-            foreach ($this->errors as $errmsg)
-            {
-                dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-            }
-            $this->db->rollback();
-            return -1 * $error;
-        } else {
-            $this->db->commit();
-            return 1;
-        }
-    }
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
 
-    /**
-     * Calculate amount remaining to pay by year
-     *
-     * @param   int     $year       Year
-     * @return  number
-     */
-    public function solde($year = 0)
-    {
-    	global $conf;
+	/**
+	 * Calculate amount remaining to pay by year
+	 *
+	 * @param   int     $year       Year
+	 * @return  number
+	 */
+	public function solde($year = 0)
+	{
+		global $conf;
 
-        $sql = "SELECT SUM(f.amount) as amount";
-        $sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as f";
-        $sql .= " WHERE f.entity = ".$conf->entity;
-        $sql .= " AND paye = 0";
+		$sql = "SELECT SUM(f.amount) as amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as f";
+		$sql .= " WHERE f.entity = ".$conf->entity;
+		$sql .= " AND paye = 0";
 
-        if ($year) {
-            $sql .= " AND f.datev >= '$y-01-01' AND f.datev <= '$y-12-31' ";
-        }
+		if ($year) {
+			$sql .= " AND f.datev >= '".((int) $year)."-01-01' AND f.datev <= '".((int) $year)."-12-31' ";
+		}
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
-                $this->db->free($result);
-                return $obj->amount;
-            } else {
-                return 0;
-            }
-        } else {
-            print $this->db->error();
-            return -1;
-        }
-    }
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$this->db->free($result);
+				return $obj->amount;
+			} else {
+				return 0;
+			}
+		} else {
+			print $this->db->error();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Tag social contribution as payed completely
-     *
-     *    @param    User    $user       Object user making change
-     *    @return   int					<0 if KO, >0 if OK
-     */
-    public function set_paid($user)
-    {
-        // phpcs:enable
-        $sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales SET";
-        $sql .= " paye = 1";
-        $sql .= " WHERE rowid = ".$this->id;
-        $return = $this->db->query($sql);
-        if ($return) return 1;
-        else return -1;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Tag social contribution as payed completely
+	 *
+	 *    @param    User    $user       Object user making change
+	 *    @return   int					<0 if KO, >0 if OK
+	 */
+	public function set_paid($user)
+	{
+		// phpcs:enable
+		$sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales SET";
+		$sql .= " paye = 1";
+		$sql .= " WHERE rowid = ".$this->id;
+		$return = $this->db->query($sql);
+		if ($return) return 1;
+		else return -1;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Remove tag payed on social contribution
-     *
-     *    @param	User	$user       Object user making change
-     *    @return	int					<0 if KO, >0 if OK
-     */
-    public function set_unpaid($user)
-    {
-        // phpcs:enable
-        $sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales SET";
-        $sql .= " paye = 0";
-        $sql .= " WHERE rowid = ".$this->id;
-        $return = $this->db->query($sql);
-        if ($return) return 1;
-        else return -1;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Remove tag payed on social contribution
+	 *
+	 *    @param	User	$user       Object user making change
+	 *    @return	int					<0 if KO, >0 if OK
+	 */
+	public function set_unpaid($user)
+	{
+		// phpcs:enable
+		$sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales SET";
+		$sql .= " paye = 0";
+		$sql .= " WHERE rowid = ".$this->id;
+		$return = $this->db->query($sql);
+		if ($return) return 1;
+		else return -1;
+	}
 
-    /**
-     *  Retourne le libelle du statut d'une charge (impaye, payee)
-     *
-     *  @param	int		$mode       	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
+	/**
+	 *  Retourne le libelle du statut d'une charge (impaye, payee)
+	 *
+	 *  @param	int		$mode       	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
 	 *  @param  double	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
-     *  @return	string        			Label
-     */
-    public function getLibStatut($mode = 0, $alreadypaid = -1)
-    {
-        return $this->LibStatut($this->paye, $mode, $alreadypaid);
-    }
+	 *  @return	string        			Label
+	 */
+	public function getLibStatut($mode = 0, $alreadypaid = -1)
+	{
+		return $this->LibStatut($this->paye, $mode, $alreadypaid);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Renvoi le libelle d'un statut donne
-     *
-     *  @param	int		$status        	Id status
-     *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Renvoi le libelle d'un statut donne
+	 *
+	 *  @param	int		$status        	Id status
+	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
 	 *  @param  double	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
-     *  @return string        			Label
-     */
-    public function LibStatut($status, $mode = 0, $alreadypaid = -1)
-    {
-        // phpcs:enable
-        global $langs;
+	 *  @return string        			Label
+	 */
+	public function LibStatut($status, $mode = 0, $alreadypaid = -1)
+	{
+		// phpcs:enable
+		global $langs;
 
-        // Load translation files required by the page
-        $langs->loadLangs(array("customers", "bills"));
+		// Load translation files required by the page
+		$langs->loadLangs(array("customers", "bills"));
 
-        // We reinit status array to force to redefine them because label may change according to properties values.
-        $this->labelStatus = array();
-        $this->labelStatusShort = array();
+		// We reinit status array to force to redefine them because label may change according to properties values.
+		$this->labelStatus = array();
+		$this->labelStatusShort = array();
 
-        if (empty($this->labelStatus) || empty($this->labelStatusShort))
-        {
-        	global $langs;
-        	//$langs->load("mymodule");
-        	$this->labelStatus[self::STATUS_UNPAID] = $langs->trans('Unpaid');
-        	$this->labelStatus[self::STATUS_PAID] = $langs->trans('Paid');
-        	if ($status == self::STATUS_UNPAID && $alreadypaid > 0) $this->labelStatus[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
-        	$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans('Unpaid');
-        	$this->labelStatusShort[self::STATUS_PAID] = $langs->trans('Paid');
-        	if ($status == self::STATUS_UNPAID && $alreadypaid > 0) $this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
-        }
+		if (empty($this->labelStatus) || empty($this->labelStatusShort))
+		{
+			global $langs;
+			//$langs->load("mymodule");
+			$this->labelStatus[self::STATUS_UNPAID] = $langs->trans('Unpaid');
+			$this->labelStatus[self::STATUS_PAID] = $langs->trans('Paid');
+			if ($status == self::STATUS_UNPAID && $alreadypaid > 0) $this->labelStatus[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
+			$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans('Unpaid');
+			$this->labelStatusShort[self::STATUS_PAID] = $langs->trans('Paid');
+			if ($status == self::STATUS_UNPAID && $alreadypaid > 0) $this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
+		}
 
-        $statusType = 'status1';
-        if ($status == 0 && $alreadypaid > 0) $statusType = 'status3';
-        if ($status == 1) $statusType = 'status6';
+		$statusType = 'status1';
+		if ($status == 0 && $alreadypaid > 0) $statusType = 'status3';
+		if ($status == 1) $statusType = 'status6';
 
-        return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
-    }
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
+	}
 
 
-    /**
+	/**
 	 *  Return a link to the object card (with optionaly the picto)
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-     * 	@param	int		$maxlen						Max length of label
-     *  @param	int  	$notooltip					1=Disable tooltip
+	 * 	@param	int		$maxlen						Max length of label
+	 *  @param	int  	$notooltip					1=Disable tooltip
 	 *  @param  int		$short           			1=Return just URL
-     *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *	@return	string								String with link
-     */
-    public function getNomUrl($withpicto = 0, $maxlen = 0, $notooltip = 0, $short = 0, $save_lastsearch_value = -1)
-    {
-    	global $langs, $conf, $user, $form;
+	 *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return	string								String with link
+	 */
+	public function getNomUrl($withpicto = 0, $maxlen = 0, $notooltip = 0, $short = 0, $save_lastsearch_value = -1)
+	{
+		global $langs, $conf, $user, $form;
 
-        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-        $result = '';
+		$result = '';
 
-        $url = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$this->id;
+		$url = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$this->id;
 
-        if ($short) return $url;
+		if ($short) return $url;
 
-        if ($option !== 'nolink')
-        {
-        	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-        	if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option !== 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
+		if (empty($this->ref)) $this->ref = $this->label;
 
-        if (empty($this->ref)) $this->ref = $this->label;
+		$label = img_picto('', 'tax').'<u class="paddingrightonly">'.$langs->trans("SocialContribution").'</u>';
+		if (isset($this->paye)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
+		if (!empty($this->ref))
+			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		if (!empty($this->label))
+			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
+		if (!empty($this->type_label))
+			$label .= '<br><b>'.$langs->trans('Type').':</b> '.$this->type_label;
 
-        $label = '<u>'.$langs->trans("SocialContribution").'</u>';
-        if (!empty($this->ref))
-        	$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-        if (!empty($this->label))
-        	$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
-        if (!empty($this->type_label))
-        	$label .= '<br><b>'.$langs->trans('Type').':</b> '.$this->type_label;
+		$linkclose = '';
+		if (empty($notooltip) && $user->rights->facture->lire)
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("SocialContribution");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip"';
+		}
 
-        $linkclose = '';
-        if (empty($notooltip) && $user->rights->facture->lire)
-        {
-        	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-        	{
-        		$label = $langs->trans("SocialContribution");
-        		$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-        	}
-        	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-        	$linkclose .= ' class="classfortooltip"';
-        }
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart .= $linkclose.'>';
-        $linkend = '</a>';
+		$result .= $linkstart;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= ($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref);
+		$result .= $linkend;
 
-        $result .= $linkstart;
-        if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-        if ($withpicto != 2) $result .= ($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref);
-        $result .= $linkend;
+		return $result;
+	}
 
-        return $result;
-    }
+	/**
+	 * 	Return amount of payments already done
+	 *
+	 *	@return		int		Amount of payment already done, <0 if KO
+	 */
+	public function getSommePaiement()
+	{
+		$table = 'paiementcharge';
+		$field = 'fk_charge';
 
-    /**
-     * 	Return amount of payments already done
-     *
-     *	@return		int		Amount of payment already done, <0 if KO
-     */
-    public function getSommePaiement()
-    {
-        $table = 'paiementcharge';
-        $field = 'fk_charge';
+		$sql = 'SELECT sum(amount) as amount';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$table;
+		$sql .= ' WHERE '.$field.' = '.$this->id;
 
-        $sql = 'SELECT sum(amount) as amount';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.$table;
-        $sql .= ' WHERE '.$field.' = '.$this->id;
+		dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$amount = 0;
 
-        dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            $amount = 0;
+			$obj = $this->db->fetch_object($resql);
+			if ($obj) $amount = $obj->amount ? $obj->amount : 0;
 
-            $obj = $this->db->fetch_object($resql);
-            if ($obj) $amount = $obj->amount ? $obj->amount : 0;
+			$this->db->free($resql);
+			return $amount;
+		} else {
+			return -1;
+		}
+	}
 
-            $this->db->free($resql);
-            return $amount;
-        } else {
-            return -1;
-        }
-    }
-
-    /**
-     * 	Charge les informations d'ordre info dans l'objet entrepot
-     *
-     *  @param	int		$id     Id of social contribution
-     *  @return	int				<0 if KO, >0 if OK
-     */
-    public function info($id)
-    {
-        $sql = "SELECT e.rowid, e.tms as datem, e.date_creation as datec, e.date_valid as datev, e.import_key,";
-        $sql .= " e.fk_user_author, e.fk_user_modif, e.fk_user_valid";
+	/**
+	 * 	Charge les informations d'ordre info dans l'objet entrepot
+	 *
+	 *  @param	int		$id     Id of social contribution
+	 *  @return	int				<0 if KO, >0 if OK
+	 */
+	public function info($id)
+	{
+		$sql = "SELECT e.rowid, e.tms as datem, e.date_creation as datec, e.date_valid as datev, e.import_key,";
+		$sql .= " e.fk_user_author, e.fk_user_modif, e.fk_user_valid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as e";
-        $sql .= " WHERE e.rowid = ".$id;
+		$sql .= " WHERE e.rowid = ".$id;
 
-        dol_syslog(get_class($this)."::info", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
+		dol_syslog(get_class($this)."::info", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
 
-                $this->id = $obj->rowid;
+				$this->id = $obj->rowid;
 
-                if ($obj->fk_user_author) {
-                    $cuser = new User($this->db);
-                    $cuser->fetch($obj->fk_user_author);
-                    $this->user_creation = $cuser;
-                }
+				if ($obj->fk_user_author) {
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
 
-                if ($obj->fk_user_modif) {
-                    $muser = new User($this->db);
-                    $muser->fetch($obj->fk_user_modif);
-                    $this->user_modification = $muser;
-                }
+				if ($obj->fk_user_modif) {
+					$muser = new User($this->db);
+					$muser->fetch($obj->fk_user_modif);
+					$this->user_modification = $muser;
+				}
 
-                if ($obj->fk_user_valid) {
-                    $vuser = new User($this->db);
-                    $vuser->fetch($obj->fk_user_valid);
-                    $this->user_validation = $vuser;
-                }
+				if ($obj->fk_user_valid) {
+					$vuser = new User($this->db);
+					$vuser->fetch($obj->fk_user_valid);
+					$this->user_validation = $vuser;
+				}
 
-                $this->date_creation     = $this->db->jdate($obj->datec);
-                $this->date_modification = $this->db->jdate($obj->datem);
-                $this->date_validation   = $this->db->jdate($obj->datev);
-                $this->import_key        = $obj->import_key;
-            }
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->datem);
+				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->import_key        = $obj->import_key;
+			}
 
-            $this->db->free($result);
-        } else {
-            dol_print_error($this->db);
-        }
-    }
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 
-    /**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
-     */
-    public function initAsSpecimen()
-    {
-        // Initialize parameters
-        $this->id = 0;
-        $this->ref = 'SPECIMEN';
-        $this->specimen = 1;
-        $this->paye = 0;
-        $this->date = dol_now();
-        $this->date_ech = $this->date + 3600 * 24 * 30;
-        $this->periode = $this->date + 3600 * 24 * 30;
-        $this->amount = 100;
-        $this->label = 'Social contribution label';
-        $this->type = 1;
-        $this->type_label = 'Type of social contribution';
-    }
+	/**
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
+	 */
+	public function initAsSpecimen()
+	{
+		// Initialize parameters
+		$this->id = 0;
+		$this->ref = 'SPECIMEN';
+		$this->specimen = 1;
+		$this->paye = 0;
+		$this->date = dol_now();
+		$this->date_ech = $this->date + 3600 * 24 * 30;
+		$this->periode = $this->date + 3600 * 24 * 30;
+		$this->amount = 100;
+		$this->label = 'Social contribution label';
+		$this->type = 1;
+		$this->type_label = 'Type of social contribution';
+	}
 }
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 62b02860f08..2f4f772fca0 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -47,8 +47,8 @@ class PaymentSocialContribution extends CommonObject
 	public $picto = 'payment';
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_charge;
 
 	public $datec = '';
@@ -61,12 +61,12 @@ class PaymentSocialContribution extends CommonObject
 	 */
 	public $total;
 
-    public $amount; // Total amount of payment
-    public $amounts = array(); // Array of amounts
+	public $amount; // Total amount of payment
+	public $amounts = array(); // Array of amounts
 
-    /**
-     * @var int ID
-     */
+	/**
+	 * @var int ID
+	 */
 	public $fk_typepaiement;
 
 	/**
@@ -81,18 +81,18 @@ class PaymentSocialContribution extends CommonObject
 	public $num_payment;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_bank;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_creat;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
 	/**
@@ -107,8 +107,8 @@ class PaymentSocialContribution extends CommonObject
 
 	/**
 	 *  Create payment of social contribution into database.
-     *  Use this->amounts to have list of lines for the payment
-     *
+	 *  Use this->amounts to have list of lines for the payment
+	 *
 	 *  @param      User	$user   				User making payment
 	 *	@param		int		$closepaidcontrib   	1=Also close payed contributions to paid, 0=Do nothing more
 	 *  @return     int     						<0 if KO, id of payment if OK
@@ -119,7 +119,7 @@ class PaymentSocialContribution extends CommonObject
 
 		$error = 0;
 
-        $now = dol_now();
+		$now = dol_now();
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 
@@ -140,17 +140,17 @@ class PaymentSocialContribution extends CommonObject
 		if (isset($this->fk_user_creat)) $this->fk_user_creat = (int) $this->fk_user_creat;
 		if (isset($this->fk_user_modif)) $this->fk_user_modif = (int) $this->fk_user_modif;
 
-        $totalamount = 0;
-        foreach ($this->amounts as $key => $value)  // How payment is dispatch
-        {
-            $newvalue = price2num($value, 'MT');
-            $this->amounts[$key] = $newvalue;
-            $totalamount += $newvalue;
-        }
-        $totalamount = price2num($totalamount);
+		$totalamount = 0;
+		foreach ($this->amounts as $key => $value)  // How payment is dispatch
+		{
+			$newvalue = price2num($value, 'MT');
+			$this->amounts[$key] = $newvalue;
+			$totalamount += $newvalue;
+		}
+		$totalamount = price2num($totalamount);
 
-        // Check parameters
-        if ($totalamount == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
+		// Check parameters
+		if ($totalamount == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
 
 
 		$this->db->begin();
@@ -207,9 +207,9 @@ class PaymentSocialContribution extends CommonObject
 
 		if ($totalamount != 0 && !$error)
 		{
-		    $this->amount = $totalamount;
-            $this->total = $totalamount; // deprecated
-		    $this->db->commit();
+			$this->amount = $totalamount;
+			$this->total = $totalamount; // deprecated
+			$this->db->commit();
 			return $this->id;
 		} else {
 			$this->error = $this->db->error();
@@ -371,16 +371,16 @@ class PaymentSocialContribution extends CommonObject
 
 		$this->db->begin();
 
-	    if ($this->bank_line > 0)
-        {
-        	$accline = new AccountLine($this->db);
+		if ($this->bank_line > 0)
+		{
+			$accline = new AccountLine($this->db);
 			$accline->fetch($this->bank_line);
 			$result = $accline->delete();
 			if ($result < 0) {
 				$this->errors[] = $accline->error;
 				$error++;
 			}
-        }
+		}
 
 		if (!$error)
 		{
@@ -459,11 +459,11 @@ class PaymentSocialContribution extends CommonObject
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
 	 */
 	public function initAsSpecimen()
 	{
@@ -484,102 +484,102 @@ class PaymentSocialContribution extends CommonObject
 	}
 
 
-    /**
-     *      Add record into bank for payment with links between this bank record and invoices of payment.
-     *      All payment properties must have been set first like after a call to create().
-     *
-     *      @param	User	$user               Object of user making payment
-     *      @param  string	$mode               'payment_sc'
-     *      @param  string	$label              Label to use in bank record
-     *      @param  int		$accountid          Id of bank account to do link with
-     *      @param  string	$emetteur_nom       Name of transmitter
-     *      @param  string	$emetteur_banque    Name of bank
-     *      @return int                 		<0 if KO, >0 if OK
-     */
-    public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
-    {
-        global $conf;
+	/**
+	 *      Add record into bank for payment with links between this bank record and invoices of payment.
+	 *      All payment properties must have been set first like after a call to create().
+	 *
+	 *      @param	User	$user               Object of user making payment
+	 *      @param  string	$mode               'payment_sc'
+	 *      @param  string	$label              Label to use in bank record
+	 *      @param  int		$accountid          Id of bank account to do link with
+	 *      @param  string	$emetteur_nom       Name of transmitter
+	 *      @param  string	$emetteur_banque    Name of bank
+	 *      @return int                 		<0 if KO, >0 if OK
+	 */
+	public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
+	{
+		global $conf;
 
 		// Clean data
-        $this->num_payment = trim($this->num_payment);
+		$this->num_payment = trim($this->num_payment);
 
-        $error = 0;
+		$error = 0;
 
-        if (!empty($conf->banque->enabled))
-        {
-            include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+		if (!empty($conf->banque->enabled))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-            $acc = new Account($this->db);
-            $acc->fetch($accountid);
+			$acc = new Account($this->db);
+			$acc->fetch($accountid);
 
-            $total = $this->total;
-            if ($mode == 'payment_sc') $total = -$total;
+			$total = $this->total;
+			if ($mode == 'payment_sc') $total = -$total;
 
-            // Insert payment into llx_bank
-            $bank_line_id = $acc->addline(
-                $this->datepaye,
-                $this->paiementtype, // Payment mode id or code ("CHQ or VIR for example")
-                $label,
-                $total,
-                $this->num_payment,
-                '',
-                $user,
-                $emetteur_nom,
-                $emetteur_banque
-            );
+			// Insert payment into llx_bank
+			$bank_line_id = $acc->addline(
+				$this->datepaye,
+				$this->paiementtype, // Payment mode id or code ("CHQ or VIR for example")
+				$label,
+				$total,
+				$this->num_payment,
+				'',
+				$user,
+				$emetteur_nom,
+				$emetteur_banque
+			);
 
-            // Mise a jour fk_bank dans llx_paiement.
-            // On connait ainsi le paiement qui a genere l'ecriture bancaire
-            if ($bank_line_id > 0)
-            {
-                $result = $this->update_fk_bank($bank_line_id);
-                if ($result <= 0)
-                {
-                    $error++;
-                    dol_print_error($this->db);
-                }
+			// Mise a jour fk_bank dans llx_paiement.
+			// On connait ainsi le paiement qui a genere l'ecriture bancaire
+			if ($bank_line_id > 0)
+			{
+				$result = $this->update_fk_bank($bank_line_id);
+				if ($result <= 0)
+				{
+					$error++;
+					dol_print_error($this->db);
+				}
 
-                // Add link 'payment', 'payment_supplier', 'payment_sc' in bank_url between payment and bank transaction
-                $url = '';
-                if ($mode == 'payment_sc') $url = DOL_URL_ROOT.'/compta/payment_sc/card.php?id=';
-                if ($url)
-                {
-                    $result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
-                    if ($result <= 0)
-                    {
-                        $error++;
-                        dol_print_error($this->db);
-                    }
-                }
+				// Add link 'payment', 'payment_supplier', 'payment_sc' in bank_url between payment and bank transaction
+				$url = '';
+				if ($mode == 'payment_sc') $url = DOL_URL_ROOT.'/compta/payment_sc/card.php?id=';
+				if ($url)
+				{
+					$result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
+					if ($result <= 0)
+					{
+						$error++;
+						dol_print_error($this->db);
+					}
+				}
 
-                // Add link 'company' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
-                $linkaddedforthirdparty = array();
-                foreach ($this->amounts as $key => $value)
-                {
-                    if ($mode == 'payment_sc')
-                    {
-                        $socialcontrib = new ChargeSociales($this->db);
-                        $socialcontrib->fetch($key);
-                        $result = $acc->add_url_line($bank_line_id, $socialcontrib->id, DOL_URL_ROOT.'/compta/charges.php?id=', $socialcontrib->type_label.(($socialcontrib->lib && $socialcontrib->lib != $socialcontrib->type_label) ? ' ('.$socialcontrib->lib.')' : ''), 'sc');
-                        if ($result <= 0) dol_print_error($this->db);
-                    }
-                }
-            } else {
-                $this->error = $acc->error;
-                $error++;
-            }
-        }
+				// Add link 'company' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
+				$linkaddedforthirdparty = array();
+				foreach ($this->amounts as $key => $value)
+				{
+					if ($mode == 'payment_sc')
+					{
+						$socialcontrib = new ChargeSociales($this->db);
+						$socialcontrib->fetch($key);
+						$result = $acc->add_url_line($bank_line_id, $socialcontrib->id, DOL_URL_ROOT.'/compta/charges.php?id=', $socialcontrib->type_label.(($socialcontrib->lib && $socialcontrib->lib != $socialcontrib->type_label) ? ' ('.$socialcontrib->lib.')' : ''), 'sc');
+						if ($result <= 0) dol_print_error($this->db);
+					}
+				}
+			} else {
+				$this->error = $acc->error;
+				$error++;
+			}
+		}
 
-        if (!$error)
-        {
-            return 1;
-        } else {
-            return -1;
-        }
-    }
+		if (!$error)
+		{
+			return 1;
+		} else {
+			return -1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Mise a jour du lien entre le paiement de  charge et la ligne dans llx_bank generee
 	 *
@@ -588,7 +588,7 @@ class PaymentSocialContribution extends CommonObject
 	 */
 	public function update_fk_bank($id_bank)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."paiementcharge SET fk_bank = ".$id_bank." WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::update_fk_bank", LOG_DEBUG);
@@ -614,7 +614,7 @@ class PaymentSocialContribution extends CommonObject
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Renvoi le libelle d'un statut donne
 	 *
@@ -624,7 +624,7 @@ class PaymentSocialContribution extends CommonObject
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage
 
 		$langs->load('compta');
@@ -680,17 +680,64 @@ class PaymentSocialContribution extends CommonObject
 		$result = '';
 
 		if (empty($this->ref)) $this->ref = $this->lib;
-        $label = $langs->trans("Payment").': '.$this->ref;
 
-        if (!empty($this->id)) {
-            $link = '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-            $linkend = '</a>';
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("SocialContributionPayment").'</u>';
+		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		if (!empty($this->label)) {
+			$labeltoshow = $this->label;
+			$reg = array();
+			if (preg_match('/^\((.*)\)$/i', $this->label, $reg))
+			{
+				// Label generique car entre parentheses. On l'affiche en le traduisant
+				if ($reg[1] == 'paiement') $reg[1] = 'Payment';
+				$labeltoshow = $langs->trans($reg[1]);
+			}
+			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$labeltoshow;
+		}
+		if ($this->datep) $label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->datep, 'day');
 
-            if ($withpicto) $result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
-            if ($withpicto && $withpicto != 2) $result .= ' ';
-            if ($withpicto != 2) $result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
-        }
+		if (!empty($this->id)) {
+			$link = '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+			$linkend = '</a>';
 
-        return $result;
-    }
+			if ($withpicto) $result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
+			if ($withpicto && $withpicto != 2) $result .= ' ';
+			if ($withpicto != 2) $result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
+		}
+
+		return $result;
+	}
+
+
+	/**
+	 *	Return if object was dispatched into bookkeeping
+	 *
+	 *	@return     int         <0 if KO, 0=no, 1=yes
+	 */
+	public function getVentilExportCompta()
+	{
+		$alreadydispatched = 0;
+
+		$type = 'bank';
+
+		$sql = " SELECT COUNT(ab.rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='".$this->db->escape($type)."' AND ab.fk_doc = ".$this->bank_line;
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($obj)
+			{
+				$alreadydispatched = $obj->nb;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+
+		if ($alreadydispatched)
+		{
+			return 1;
+		}
+		return 0;
+	}
 }
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index e7d76b94a76..dbb01060a4d 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -35,8 +35,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 if (!empty($conf->projet->enabled))
 {
-    include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
 // Load translation files required by the page
@@ -57,7 +57,7 @@ $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
-    $page = 0;
+	$page = 0;
 }
 $offset = $limit * $page;
 $pageprev = $page - 1;
@@ -81,10 +81,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 if ($action == 'setlib' && $user->rights->tax->charges->creer)
 {
-    $object->fetch($id);
-    $result = $object->setValueFrom('libelle', GETPOST('lib'), '', '', 'text', '', $user, 'TAX_MODIFY');
-    if ($result < 0)
-        setEventMessages($object->error, $object->errors, 'errors');
+	$object->fetch($id);
+	$result = $object->setValueFrom('libelle', GETPOST('lib'), '', '', 'text', '', $user, 'TAX_MODIFY');
+	if ($result < 0)
+		setEventMessages($object->error, $object->errors, 'errors');
 }
 
 
@@ -103,28 +103,28 @@ if ($object->id)
 {
 	$alreadypayed = $object->getSommePaiement();
 
-    $head = tax_prepare_head($object);
+	$head = tax_prepare_head($object);
 
-    dol_fiche_head($head, 'documents', $langs->trans("SocialContribution"), -1, 'bill');
+	print dol_get_fiche_head($head, 'documents', $langs->trans("SocialContribution"), -1, 'bill');
 
 	$morehtmlref = '<div class="refidno">';
 	// Label of social contribution
 	$morehtmlref .= $form->editfieldkey("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
 	$morehtmlref .= $form->editfieldval("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
-    // Project
+	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' : ';
-        if (!empty($object->fk_project)) {
-            $proj = new Project($db);
-            $proj->fetch($object->fk_project);
-            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-            $morehtmlref .= $proj->ref;
-            $morehtmlref .= '</a>';
-        } else {
-            $morehtmlref .= '';
-        }
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' : ';
+		if (!empty($object->fk_project)) {
+			$proj = new Project($db);
+			$proj->fetch($object->fk_project);
+			$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+			$morehtmlref .= $proj->ref;
+			$morehtmlref .= '</a>';
+		} else {
+			$morehtmlref .= '';
+		}
 	}
 	$morehtmlref .= '</div>';
 
@@ -137,34 +137,34 @@ if ($object->id)
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
-    // Build file list
-    $filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
-    $totalsize = 0;
-    foreach ($filearray as $key => $file)
-    {
-        $totalsize += $file['size'];
-    }
+	// Build file list
+	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$totalsize = 0;
+	foreach ($filearray as $key => $file)
+	{
+		$totalsize += $file['size'];
+	}
 
 
-    print '<table class="border tableforfield centpercent">';
+	print '<table class="border tableforfield centpercent">';
 
-    print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-    print '</table>';
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    print '<div class="clearboth"></div>';
+	print '<div class="clearboth"></div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    $modulepart = 'tax';
-    $permission = $user->rights->tax->charges->creer;
-    $permtoedit = $user->rights->fournisseur->facture->creer;
-    $param = '&id='.$object->id;
-    include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	$modulepart = 'tax';
+	$permission = $user->rights->tax->charges->creer;
+	$permtoedit = $user->rights->fournisseur->facture->creer;
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
-    print $langs->trans("ErrorUnknown");
+	print $langs->trans("ErrorUnknown");
 }
 
 // End of page
diff --git a/htdocs/compta/sociales/info.php b/htdocs/compta/sociales/info.php
index d577792023c..71e49486888 100644
--- a/htdocs/compta/sociales/info.php
+++ b/htdocs/compta/sociales/info.php
@@ -75,7 +75,7 @@ $object->info($id);
 
 $head = tax_prepare_head($object);
 
-dol_fiche_head($head, 'info', $langs->trans("SocialContribution"), -1, 'bill');
+print dol_get_fiche_head($head, 'info', $langs->trans("SocialContribution"), -1, 'bill');
 
 $morehtmlref = '<div class="refidno">';
 // Label of social contribution
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 52d3b9b7fa3..746a8480453 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -4,7 +4,8 @@
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2016      Frédéric France      <frederic.france@free.fr>
  * Copyright (C) 2020      Pierre Ardoin     	<mapiolca@me.com>
- *
+ * Copyright (C) 2020		Tobias Sekan		<tobias.sekan@startmail.com>
+
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -20,12 +21,18 @@
  */
 
 /**
- *   	\file       htdocs/compta/sociales/list.php
- *		\ingroup    tax
- *		\brief      Page to list all social contributions
+ *	\file		htdocs/compta/sociales/list.php
+ *	\ingroup	tax
+ *	\brief		Page to list all social contributions
  */
 
 require '../../main.inc.php';
+
+// Security check
+$socid = isset($_GET["socid"]) ? $_GET["socid"] : '';
+if ($user->socid) $socid = $user->socid;
+$result = restrictedArea($user, 'tax', '', '', 'charges');
+
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsocialcontrib.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
@@ -35,36 +42,32 @@ if (!empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/clas
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'banks', 'bills'));
 
-$action = GETPOST('action', 'aZ09');
-$massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
-$confirm = GETPOST('confirm', 'alpha');
-$toselect = GETPOST('toselect', 'array');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'sclist';
+$action				= GETPOST('action', 'aZ09');
+$massaction			= GETPOST('massaction', 'alpha');
+$confirm			= GETPOST('confirm', 'alpha');
+$optioncss = GETPOST('optioncss', 'alpha');
+$contextpage		= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'sclist';
 
-// Security check
-$socid = isset($_GET["socid"]) ? $_GET["socid"] : '';
-if ($user->socid) $socid = $user->socid;
-$result = restrictedArea($user, 'tax', '', '', 'charges');
-
-$search_ref = GETPOST('search_ref', 'int');
+$search_ref			= GETPOST('search_ref', 'int');
 $search_label = GETPOST('search_label', 'alpha');
-$search_amount = GETPOST('search_amount', 'alpha');
-$search_status = GETPOST('search_status', 'int');
+$search_amount		= GETPOST('search_amount', 'alpha');
+$search_status		= GETPOST('search_status', 'int');
 $search_day_lim		= GETPOST('search_day_lim', 'int');
 $search_month_lim = GETPOST('search_month_lim', 'int');
 $search_year_lim	= GETPOST('search_year_lim', 'int');
 $search_project_ref = GETPOST('search_project_ref', 'alpha');
-$search_project = GETPOST('search_project', 'alpha');
+$search_project		= GETPOST('search_project', 'alpha');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield			= GETPOST("sortfield", 'alpha');
+$sortorder			= GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+
+if (empty($page) || $page == -1) $page = 0; // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
+
 if (!$sortfield) $sortfield = "cs.date_ech";
 if (!$sortorder) $sortorder = "DESC";
 
@@ -84,23 +87,50 @@ if (!GETPOSTISSET('search_typeid'))
 	$search_typeid = GETPOST('search_typeid', 'int');
 }
 
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-{
-	$search_ref = "";
-	$search_label = "";
-	$search_amount = "";
-	$search_status = '';
-	$search_typeid = "";
-	$year = "";
-	$search_day_lim = '';
-	$search_year_lim = '';
-	$search_month_lim = '';
-	$search_project_ref = '';
-	$search_project = '';
-	$toselect = '';
-	$search_array_options = array();
-}
+$arrayfields = array(
+	'cs.rowid'		=>array('label'=>"Ref", 'checked'=>1, 'position'=>10),
+	'cs.libelle'	=>array('label'=>"Label", 'checked'=>1, 'position'=>20),
+	'cs.fk_type'	=>array('label'=>"Type", 'checked'=>1, 'position'=>30),
+	'p.ref'			=>array('label'=>"ProjectRef", 'checked'=>1, 'position'=>40, 'enable'=>(!empty($conf->projet->enabled))),
+	'cs.date_ech'	=>array('label'=>"Date", 'checked'=>1, 'position'=>50),
+	'cs.periode'	=>array('label'=>"PeriodEndDate", 'checked'=>1, 'position'=>60),
+	'cs.amount'		=>array('label'=>"Amount", 'checked'=>1, 'position'=>70),
+	'cs.paye'		=>array('label'=>"Status", 'checked'=>1, 'position'=>80),
+);
+$arrayfields = dol_sort_array($arrayfields, 'position');
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('sclist'));
+$object = new ChargeSociales($db);
+
+/*
+ * Actions
+ */
+
+$parameters = array('socid'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+
+if (empty($reshook)) {
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	// All tests are required to be compatible with all browsers
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+		$search_ref = '';
+		$search_label = '';
+		$search_amount = '';
+		$search_status = '';
+		$search_typeid = '';
+		$year = '';
+		$search_day_lim = '';
+		$search_year_lim = '';
+		$search_month_lim = '';
+		$search_project_ref = '';
+		$search_project = '';
+		$search_array_options = array();
+	}
+}
 
 /*
  *	View
@@ -114,8 +144,8 @@ if (!empty($conf->projet->enabled)) $projectstatic = new Project($db);
 
 llxHeader('', $langs->trans("SocialContributions"));
 
-$sql = "SELECT cs.rowid as id, cs.fk_type as type, ";
-$sql .= " cs.amount, cs.date_ech, cs.libelle as label, cs.paye, cs.periode,";
+$sql = "SELECT cs.rowid, cs.fk_type as type, ";
+$sql .= " cs.amount, cs.date_ech, cs.libelle, cs.paye, cs.periode,";
 if (!empty($conf->projet->enabled)) $sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_label,";
 $sql .= " c.libelle as type_label,";
 $sql .= " SUM(pc.amount) as alreadypayed";
@@ -135,19 +165,19 @@ $sql .= dolSqlDateFilter("cs.periode", $search_day_lim, $search_month_lim, $sear
 //$sql.= dolSqlDateFilter("cs.periode", 0, 0, $year);
 if ($year > 0)
 {
-    $sql .= " AND (";
-    // Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
-    // ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
-    $sql .= "   (cs.periode IS NOT NULL AND date_format(cs.periode, '%Y') = '".$db->escape($year)."') ";
-    $sql .= "OR (cs.periode IS NULL AND date_format(cs.date_ech, '%Y') = '".$db->escape($year)."')";
-    $sql .= ")";
+	$sql .= " AND (";
+	// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
+	// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
+	$sql .= "   (cs.periode IS NOT NULL AND date_format(cs.periode, '%Y') = '".$db->escape($year)."') ";
+	$sql .= "OR (cs.periode IS NULL AND date_format(cs.date_ech, '%Y') = '".$db->escape($year)."')";
+	$sql .= ")";
 }
 if ($filtre) {
-    $filtre = str_replace(":", "=", $filtre);
-    $sql .= " AND ".$filtre;
+	$filtre = str_replace(":", "=", $filtre);
+	$sql .= " AND ".$filtre;
 }
 if ($search_typeid) {
-    $sql .= " AND cs.fk_type=".$db->escape($search_typeid);
+	$sql .= " AND cs.fk_type=".$db->escape($search_typeid);
 }
 $sql .= " GROUP BY cs.rowid, cs.fk_type, cs.amount, cs.date_ech, cs.libelle, cs.paye, cs.periode, c.libelle";
 if (!empty($conf->projet->enabled)) $sql .= ", p.rowid, p.ref, p.title";
@@ -157,193 +187,275 @@ $totalnboflines = 0;
 $result = $db->query($sql);
 if ($result)
 {
-    $totalnboflines = $db->num_rows($result);
+	$totalnboflines = $db->num_rows($result);
 }
 $sql .= $db->plimit($limit + 1, $offset);
 
 $resql = $db->query($sql);
-if ($resql)
+if (!$resql)
 {
-	$num = $db->num_rows($resql);
-	$i = 0;
-
-	$param = '';
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	if ($search_ref)    $param .= '&search_ref='.urlencode($search_ref);
-	if ($search_label)  $param .= '&search_label='.urlencode($search_label);
-	if ($search_project_ref >= 0) $param .= "&search_project_ref=".urlencode($search_project_ref);
-	if ($search_amount) $param .= '&search_amount='.urlencode($search_amount);
-	if ($search_typeid) $param .= '&search_typeid='.urlencode($search_typeid);
-	if ($search_status != '' && $search_status != '-1') $param .= '&search_status='.urlencode($search_status);
-	if ($year)          $param .= '&year='.urlencode($year);
-
-	$newcardbutton = '';
-	if ($user->rights->tax->charges->creer)
-	{
-		$newcardbutton .= dolGetButtonTitle($langs->trans('MenuNewSocialContribution'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/sociales/card.php?action=create');
-	}
-
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="action" value="list">';
-	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	print '<input type="hidden" name="search_status" value="'.$search_status.'">';
-
-	$center = '';
-	if ($year)
-	{
-	    $center = ($year ? "<a href='list.php?year=".($year - 1)."'>".img_previous()."</a> ".$langs->trans("Year")." $year <a href='list.php?year=".($year + 1)."'>".img_next()."</a>" : "");
-	}
-
-	print_barre_liste($langs->trans("SocialContributions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'bill', 0, $newcardbutton, '', $limit, 0, 0, 1);
-
-	if (empty($mysoc->country_id) && empty($mysoc->country_code))
-	{
-		print '<div class="error">';
-		$langs->load("errors");
-		$countrynotdefined = $langs->trans("ErrorSetACountryFirst");
-		print $countrynotdefined;
-		print '</div>';
-	} else {
-	    print '<div class="div-table-responsive">';
-	    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
-
-		print '<tr class="liste_titre_filter">';
-		// Ref
-		print '<td class="liste_titre" align="left">';
-		print '<input class="flat maxwidth75" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
-		print '</td>';
-		// Label
-		print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
-		// Type
-		print '<td class="liste_titre" align="left">';
-	    $formsocialcontrib->select_type_socialcontrib($search_typeid, 'search_typeid', 1, 0, 0, 'maxwidth100onsmartphone');
-	    print '</td>';
-		// Ref Project
-	   	if (!empty($conf->projet->enabled)) print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_project_ref" value="'.$search_project_ref.'"></td>';
-	    // Date
-	    print '<td class="liste_titre">&nbsp;</td>';
-	    // Period end date
-		print '<td class="liste_titre center">';
-		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day_lim" value="'.dol_escape_htmltag($search_day_lim).'">';
-		print '<input class="flat valignmiddle width25" type="text" size="1" maxlength="2" name="search_month_lim" value="'.dol_escape_htmltag($search_month_lim).'">';
-		$formother->select_year($search_year_lim ? $search_year_lim : -1, 'search_year_lim', 1, 20, 5, 0, 0, '', 'widthauto valignmiddle');
-		print '</td>';
-	    // Amount
-		print '<td class="liste_titre right">';
-		print '<input class="flat maxwidth75" type="text" name="search_amount" value="'.dol_escape_htmltag($search_amount).'">';
-		print '</td>';
-		// Status
-		print '<td class="liste_titre maxwidthonsmartphone right">';
-		$liststatus = array('0'=>$langs->trans("Unpaid"), '1'=>$langs->trans("Paid"));
-		print $form->selectarray('search_status', $liststatus, $search_status, 1);
-		print '</td>';
-
-        print '<td class="liste_titre maxwidthsearch">';
-        $searchpicto = $form->showFilterAndCheckAddButtons(0);
-        print $searchpicto;
-        print '</td>';
-		print "</tr>\n";
-
-		print '<tr class="liste_titre">';
-		print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "id", "", $param, "", $sortfield, $sortorder);
-		print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "cs.libelle", "", $param, 'class="left"', $sortfield, $sortorder);
-		print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "type", "", $param, 'class="left"', $sortfield, $sortorder);
-		if (!empty($conf->projet->enabled)) print_liste_field_titre('ProjectRef', $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
-		print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "cs.date_ech", "", $param, 'align="center"', $sortfield, $sortorder);
-		print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "periode", "", $param, 'align="center"', $sortfield, $sortorder);
-		print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "cs.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-		print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "cs.paye", "", $param, 'class="right"', $sortfield, $sortorder);
-		print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
-		print "</tr>\n";
-
-		$i = 0;
-		$totalarray = array();
-		while ($i < min($num, $limit))
-		{
-			$obj = $db->fetch_object($resql);
-
-			$chargesociale_static->id = $obj->id;
-			$chargesociale_static->ref = $obj->id;
-			$chargesociale_static->label = $obj->label;
-			$chargesociale_static->type_label = $obj->type_label;
-			if (!empty($conf->projet->enabled)) {
-				$projectstatic->id = $obj->project_id;
-				$projectstatic->ref = $obj->project_ref;
-				$projectstatic->title = $obj->project_label;
-			}
-
-			print '<tr class="oddeven">';
-
-			// Ref
-			print "<td>".$chargesociale_static->getNomUrl(1, '20')."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
-
-			// Label
-			print "<td>".dol_trunc($obj->label, 42)."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
-
-			// Type
-			print "<td>".$obj->type_label."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
-
-			// Project Ref
-			if (!empty($conf->projet->enabled)) {
-				print '<td class="nowrap">';
-				if ($obj->project_id > 0)
-				{
-				    print $projectstatic->getNomUrl(1);
-				}
-				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
-			}
-
-			// Date
-			print '<td width="110" align="center">'.dol_print_date($db->jdate($obj->date_ech), 'day').'</td>';
-			if (!$i) $totalarray['nbfield']++;
-
-			// Date end period
-			print '<td class="center">';
-			if ($obj->periode)
-			{
-				print '<a href="list.php?year='.strftime("%Y", $db->jdate($obj->periode)).'">'.dol_print_date($db->jdate($obj->periode), 'day').'</a>';
-			} else {
-				print '&nbsp;';
-			}
-			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
-
-			// Amount
-			print '<td class="nowrap right">'.price($obj->amount).'</td>';
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
-			$totalarray['val']['totalttcfield'] += $obj->amount;
-
-			print '<td class="nowrap right">'.$chargesociale_static->LibStatut($obj->paye, 5, $obj->alreadypayed).'</td>';
-			if (!$i) $totalarray['nbfield']++;
-
-			print '<td></td>';
-
-			if (!$i) $totalarray['nbfield']++;
-
-			print '</tr>';
-			$i++;
-		}
-
-		// Show total line
-		include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
-
-		print '</table>';
-		print '</div>';
-	}
-	print '</form>';
-} else {
 	dol_print_error($db);
+	llxFooter();
+	$db->close();
+	exit;
 }
 
+$num = $db->num_rows($resql);
+$i = 0;
+
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+if ($search_ref)    $param .= '&search_ref='.urlencode($search_ref);
+if ($search_label)  $param .= '&search_label='.urlencode($search_label);
+if ($search_project_ref >= 0) $param .= "&search_project_ref=".urlencode($search_project_ref);
+if ($search_amount) $param .= '&search_amount='.urlencode($search_amount);
+if ($search_typeid) $param .= '&search_typeid='.urlencode($search_typeid);
+if ($search_status != '' && $search_status != '-1') $param .= '&search_status='.urlencode($search_status);
+if ($year)          $param .= '&year='.urlencode($year);
+
+$newcardbutton = '';
+if ($user->rights->tax->charges->creer)
+{
+	$newcardbutton .= dolGetButtonTitle($langs->trans('MenuNewSocialContribution'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/sociales/card.php?action=create');
+}
+
+print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="search_status" value="'.$search_status.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+$center = '';
+if ($year)
+{
+	$center = '<a href="list.php?year='.($year - 1).'">'.img_previous().'</a>';
+	$center .= ' '.$langs->trans("Year").' '.$year;
+	$center .= ' <a href="list.php?year='.($year + 1).'">'.img_next().'</a>';
+}
+
+print_barre_liste($langs->trans("SocialContributions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'bill', 0, $newcardbutton, '', $limit, 0, 0, 1);
+
+if (empty($mysoc->country_id) && empty($mysoc->country_code))
+{
+	print '<div class="error">';
+	$langs->load("errors");
+	$countrynotdefined = $langs->trans("ErrorSetACountryFirst");
+	print $countrynotdefined;
+	print '</div>';
+
+	print '</form>';
+	llxFooter();
+	$db->close();
+}
+
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+
+print '<div class="div-table-responsive">';
+print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : '').'">'."\n";
+
+print '<tr class="liste_titre_filter">';
+
+// Filters: Line number (placeholder)
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+
+// Filter: Ref
+if (!empty($arrayfields['cs.rowid']['checked'])) {
+	print '<td class="liste_titre" align="left">';
+	print '<input class="flat maxwidth75" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+	print '</td>';
+}
+
+// Filter: Label
+if (!empty($arrayfields['cs.rowid']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat maxwidth100" name="search_label" value="'.dol_escape_htmltag($search_label).'">';
+	print '</td>';
+}
+
+// Filter: Type
+if (!empty($arrayfields['cs.fk_type']['checked'])) {
+	print '<td class="liste_titre" align="left">';
+	$formsocialcontrib->select_type_socialcontrib($search_typeid, 'search_typeid', 1, 0, 0, 'maxwidth100onsmartphone', 1);
+	print '</td>';
+}
+
+// Filter: Project ref
+if (!empty($arrayfields['p.ref']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" size="6" name="search_project_ref" value="'.$search_project_ref.'">';
+	print '</td>';
+}
+
+// Filter: Date (placeholder)
+if (!empty($arrayfields['cs.date_ech']['checked'])) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+
+// Filter: Period end date
+if (!empty($arrayfields['cs.periode']['checked'])) {
+	print '<td class="liste_titre center">';
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day_lim" value="'.dol_escape_htmltag($search_day_lim).'">';
+	print '<input class="flat valignmiddle width25" type="text" size="1" maxlength="2" name="search_month_lim" value="'.dol_escape_htmltag($search_month_lim).'">';
+	$formother->select_year($search_year_lim ? $search_year_lim : -1, 'search_year_lim', 1, 20, 5, 0, 0, '', 'widthauto valignmiddle');
+	print '</td>';
+}
+
+// Filter: Amount
+if (!empty($arrayfields['cs.amount']['checked'])) {
+	print '<td class="liste_titre right">';
+	print '<input class="flat maxwidth75" type="text" name="search_amount" value="'.dol_escape_htmltag($search_amount).'">';
+	print '</td>';
+}
+
+// Filter: Status
+if (!empty($arrayfields['cs.paye']['checked'])) {
+	print '<td class="liste_titre maxwidthonsmartphone right">';
+	$liststatus = array('0'=>$langs->trans("Unpaid"), '1'=>$langs->trans("Paid"));
+	print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100', 1);
+	print '</td>';
+}
+
+// Fields from hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+// Filter: Buttons
+print '<td class="liste_titre maxwidthsearch">';
+print $form->showFilterAndCheckAddButtons(0);
+print '</td>';
+
+print '</tr>';
+
+print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST))	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['cs.rowid']['checked']))			print_liste_field_titre($arrayfields['cs.rowid']['label'], $_SERVER["PHP_SELF"], "cs.rowid", '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['cs.libelle']['checked']))			print_liste_field_titre($arrayfields['cs.libelle']['label'], $_SERVER["PHP_SELF"], "cs.libelle", '', $param, 'class="left"', $sortfield, $sortorder);
+if (!empty($arrayfields['cs.fk_type']['checked']))			print_liste_field_titre($arrayfields['cs.fk_type']['label'], $_SERVER["PHP_SELF"], "cs.fk_type", '', $param, 'class="left"', $sortfield, $sortorder);
+if (!empty($arrayfields['p.ref']['checked']))				print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['cs.date_ech']['checked']))			print_liste_field_titre($arrayfields['cs.date_ech']['label'], $_SERVER["PHP_SELF"], "cs.date_ech", '', $param, 'align="center"', $sortfield, $sortorder);
+if (!empty($arrayfields['cs.periode']['checked']))			print_liste_field_titre($arrayfields['cs.periode']['label'], $_SERVER["PHP_SELF"], "cs.periode", '', $param, 'align="center"', $sortfield, $sortorder);
+if (!empty($arrayfields['cs.amount']['checked']))			print_liste_field_titre($arrayfields['cs.amount']['label'], $_SERVER["PHP_SELF"], "cs.amount", '', $param, 'class="right"', $sortfield, $sortorder);
+if (!empty($arrayfields['cs.paye']['checked']))				print_liste_field_titre($arrayfields['cs.paye']['label'], $_SERVER["PHP_SELF"], "cs.paye", '', $param, 'class="right"', $sortfield, $sortorder);
+
+// Hook fields
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
+print '</tr>';
+
+$i = 0;
+$totalarray = array();
+while ($i < min($num, $limit))
+{
+	$obj = $db->fetch_object($resql);
+
+	$chargesociale_static->id = $obj->rowid;
+	$chargesociale_static->ref = $obj->rowid;
+	$chargesociale_static->label = $obj->libelle;
+	$chargesociale_static->type_label = $obj->type_label;
+	if (!empty($conf->projet->enabled)) {
+		$projectstatic->id = $obj->project_id;
+		$projectstatic->ref = $obj->project_ref;
+		$projectstatic->title = $obj->project_label;
+	}
+
+	print '<tr class="oddeven">';
+
+	// Line number
+	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+		print '<td>'.(($offset * $limit) + $i).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Ref
+	if (!empty($arrayfields['cs.rowid']['checked'])) {
+		print '<td>'.$chargesociale_static->getNomUrl(1, '20').'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Label
+	if (!empty($arrayfields['cs.libelle']['checked'])) {
+		print '<td>'.dol_trunc($obj->libelle, 42).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Type
+	if (!empty($arrayfields['cs.fk_type']['checked'])) {
+		print '<td>'.$obj->type_label.'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Project ref
+	if (!empty($arrayfields['p.ref']['checked'])) {
+		print '<td class="nowrap">';
+		if ($obj->project_id > 0) {
+			print $projectstatic->getNomUrl(1);
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Date
+	if (!empty($arrayfields['cs.date_ech']['checked'])) {
+		print '<td width="110" align="center">'.dol_print_date($db->jdate($obj->date_ech), 'day').'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Date end period
+	if (!empty($arrayfields['cs.periode']['checked'])) {
+		print '<td class="center">';
+		if ($obj->periode) {
+			print '<a href="list.php?year='.strftime("%Y", $db->jdate($obj->periode)).'">';
+			print dol_print_date($db->jdate($obj->periode), 'day');
+			print '</a>';
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Amount
+	if (!empty($arrayfields['cs.amount']['checked'])) {
+		print '<td class="nowrap right">'.price($obj->amount).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
+		$totalarray['val']['totalttcfield'] += $obj->amount;
+	}
+
+	// Status
+	if (!empty($arrayfields['cs.paye']['checked'])) {
+		print '<td class="nowrap right">'.$chargesociale_static->LibStatut($obj->paye, 5, $obj->alreadypayed).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Buttons
+	print '<td></td>';
+	if (!$i) $totalarray['nbfield']++;
+
+	print '</tr>';
+	$i++;
+}
+
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+print '</table>';
+print '</div>';
+print '</form>';
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index fc1f66d5e2c..7432702bb34 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -1,10 +1,11 @@
 <?php
 /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011-2016 Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2011-2014 Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2011-2014 Juanjo Menent	<jmenent@2byte.es>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
  *
  * 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
@@ -21,7 +22,7 @@
  */
 
 /**
- *      \file       htdocs/compta/sociales/payments.php
+ *      \file       htdocs/compta/charges/index.php
  *      \ingroup    compta
  *		\brief      Page to list payments of special expenses
  */
@@ -32,6 +33,14 @@ require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/paymentsocialcontribution.class.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsocialcontrib.class.php';
+
+
+$hookmanager = new HookManager($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('specialexpensesindex'));
 
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'bills'));
@@ -40,10 +49,8 @@ $langs->loadLangs(array('compta', 'bills'));
 if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'tax|salaries', '', '', 'charges|');
 
-$mode = GETPOST("mode", 'alpha');
 $year = GETPOST("year", 'int');
-$filtre = GETPOST("filtre", 'alpha');
-if (!$year && $mode != 'sconly') { $year = date("Y", time()); }
+$search_sc_type = GETPOST('search_sc_type', 'int');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
@@ -53,9 +60,27 @@ if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined,
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = "pc.datep";
+if (!$sortfield) $sortfield = "cs.date_ech";
 if (!$sortorder) $sortorder = "DESC";
 
+if (empty($conf->tax->enabled) || empty($user->rights->tax->charges->lire))
+{
+	accessforbidden();
+}
+
+
+/*
+ * Actions
+ */
+
+// Purge search criteria
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+{
+	$search_sc_type = '';
+	//$toselect = '';
+	//$search_array_options = array();
+}
+
 
 /*
  * View
@@ -65,19 +90,22 @@ $tva_static = new Tva($db);
 $socialcontrib = new ChargeSociales($db);
 $payment_sc_static = new PaymentSocialContribution($db);
 $sal_static = new PaymentSalary($db);
+$accountstatic = new Account($db);
+$formsocialcontrib = new FormSocialContrib($db);
 
-llxHeader('', $langs->trans("SpecialExpensesArea"));
+$title = $langs->trans("SocialContributionsPayments");
+
+llxHeader('', $title);
 
-$title = $langs->trans("SpecialExpensesArea");
-if ($mode == 'sconly') $title = $langs->trans("SocialContributionsPayments");
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
-if ($mode == 'sconly') $param = '&mode=sconly';
-if ($sortfield) $param .= '&sortfield='.$sortfield;
-if ($sortorder) $param .= '&sortorder='.$sortorder;
-
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+if ($sortfield) $param .= '&sortfield='.urlencode($sortfield);
+if ($sortorder) $param .= '&sortorder='.urlencode($sortorder);
+if ($year) $param .= '&year='.urlencode($year);
+if ($search_sc_type) $param .= '&search_sc_type='.urlencode($search_sc_type);
+$num = 0;
 
 print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -86,388 +114,188 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
-print '<input type="hidden" name="mode" value="'.$mode.'">';
 
-if ($mode != 'sconly')
-{
-    $center = ($year ? '<a href="list.php?year='.($year - 1).$param.'">'.img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a> ".$langs->trans("Year").' '.$year.' <a href="list.php?year='.($year + 1).$param.'">'.img_next($langs->trans("Next"), 'class="valignbottom"')."</a>" : "");
-    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'title_accountancy', 0, '', '', $limit, 1);
-} else {
-    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'title_accountancy', 0, '', '', $limit);
+$sql = "SELECT c.id, c.libelle as label,";
+$sql .= " cs.rowid, cs.libelle, cs.fk_type as type, cs.periode, cs.date_ech, cs.amount as total,";
+$sql .= " pc.rowid as pid, pc.datep, pc.amount as totalpaye, pc.num_paiement as num_payment, pc.fk_bank,";
+$sql .= " pct.code as payment_code,";
+$sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel";
+$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c,";
+$sql .= " ".MAIN_DB_PREFIX."chargesociales as cs";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiementcharge as pc ON pc.fk_charge = cs.rowid";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON pc.fk_typepaiement = pct.id";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON pc.fk_bank = b.rowid";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
+$sql .= " WHERE cs.fk_type = c.id";
+$sql .= " AND cs.entity IN (".getEntity("tax").")";
+if ($search_sc_type > 0) {
+	$sql .= " AND cs.fk_type = ".((int) $search_sc_type);
+}
+if ($year > 0) {
+	$sql .= " AND (";
+	// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
+	// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
+	$sql .= "   (cs.periode IS NOT NULL AND cs.periode between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
+	$sql .= " OR (cs.periode IS NULL AND cs.date_ech between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
+	$sql .= ")";
+}
+if (preg_match('/^cs\./', $sortfield) || preg_match('/^c\./', $sortfield) || preg_match('/^pc\./', $sortfield) || preg_match('/^pct\./', $sortfield)) {
+		$sql .= $db->order($sortfield, $sortorder);
 }
 
-if ($year) $param .= '&year='.$year;
-
-if ($mode != 'sconly')
-{
-	print $langs->trans("DescTaxAndDividendsArea").'<br>';
-	print "<br>";
-}
-
-if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
-{
-	// Social contributions only
-	if ($mode != 'sconly')
-	{
-		print load_fiche_titre($langs->trans("SocialContributionsPayments").($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');
-	}
-
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre">';
-	print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pc.rowid", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pc.datep", "", $param, 'align="center"', $sortfield, $sortorder);
-	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "pct.code", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("LabelContrib", $_SERVER["PHP_SELF"], "c.libelle", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("TypeContrib", $_SERVER["PHP_SELF"], "cs.fk_type", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "cs.date_ech", "", $param, 'width="140px"', $sortfield, $sortorder);
-	print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "cs.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-	print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pc.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-	print "</tr>\n";
-
-	$sql = "SELECT c.id, c.libelle as type_label,";
-	$sql .= " cs.rowid, cs.libelle as label, cs.fk_type as type, cs.periode, cs.date_ech, cs.amount as total,";
-	$sql .= " pc.rowid as pid, pc.datep, pc.amount as totalpaye, pc.num_paiement as num_payment,";
-	$sql .= " pct.code as payment_code";
-	$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c,";
-	$sql .= " ".MAIN_DB_PREFIX."chargesociales as cs,";
-	$sql .= " ".MAIN_DB_PREFIX."paiementcharge as pc";
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON pc.fk_typepaiement = pct.id";
-	$sql .= " WHERE cs.fk_type = c.id AND pc.fk_charge = cs.rowid";
-	$sql .= " AND cs.entity = ".$conf->entity;
-	if ($year > 0)
-	{
-		$sql .= " AND (";
-		// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
-		// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
-		$sql .= "   (cs.periode IS NOT NULL AND cs.periode between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
-		$sql .= " OR (cs.periode IS NULL AND cs.date_ech between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
-		$sql .= ")";
-	}
-	if (preg_match('/^cs\./', $sortfield) || preg_match('/^c\./', $sortfield) || preg_match('/^pc\./', $sortfield) || preg_match('/^pct\./', $sortfield)) $sql .= $db->order($sortfield, $sortorder);
-	//$sql.= $db->plimit($limit+1,$offset);
-	//print $sql;
-
-	dol_syslog("compta/sociales/payments.php: select payment", LOG_DEBUG);
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$resql = $db->query($sql);
-	if ($resql)
-	{
-		$num = $db->num_rows($resql);
-		$i = 0;
-		$total = 0;
-		$totalnb = 0;
-		$totalpaye = 0;
-
-		while ($i < min($num, $limit))
-		{
-			$obj = $db->fetch_object($resql);
-
-			$payment_sc_static->id = $obj->pid;
-			$payment_sc_static->ref = $obj->pid;
-
-			print '<tr class="oddeven">';
-			// Ref payment
-			print '<td>'.$payment_sc_static->getNomUrl(1)."</td>\n";
-			// Date payment
-			print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day').'</td>';
-	        // Type payment
-    	    print '<td>';
-    	    if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
-    	    print $obj->num_payment.'</td>';
-			// Label
-			print '<td>';
-			$socialcontrib->id = $obj->rowid;
-			$socialcontrib->ref = $obj->rowid;
-			$socialcontrib->label = $obj->label;
-			print $socialcontrib->getNomUrl(1, '20');
-			print '</td>';
-			// Type
-			print '<td><a href="../sociales/list.php?filtre=cs.fk_type:'.$obj->type.'">'.$obj->type_label.'</a></td>';
-			// Date
-			$date = $obj->periode;
-			if (empty($date)) $date = $obj->date_ech;
-			print '<td>'.dol_print_date($date, 'day').'</td>';
-			// Expected to pay
-			print '<td class="right">'.price($obj->total).'</td>';
-			// Paid
-			print '<td class="right">';
-			if ($obj->totalpaye) print price($obj->totalpaye);
-			print '</td>';
-			print '</tr>';
-
-			$total = $total + $obj->total;
-			$totalnb = $totalnb + $obj->nb;
-			$totalpaye = $totalpaye + $obj->totalpaye;
-			$i++;
-		}
-	    print '<tr class="liste_total"><td colspan="3" class="liste_total">'.$langs->trans("Total").'</td>';
-	    print '<td class="liste_total right"></td>'; // A total here has no sense
-	    print '<td align="center" class="liste_total">&nbsp;</td>';
-	    print '<td align="center" class="liste_total">&nbsp;</td>';
-	    print '<td align="center" class="liste_total">&nbsp;</td>';
-	    print '<td class="liste_total right">'.price($totalpaye)."</td>";
-		print "</tr>";
-	} else {
-		dol_print_error($db);
-	}
-	print '</table>';
-}
-
-// VAT
-if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
-{
-	if (!$mode || $mode != 'sconly')
-	{
-		print "<br>";
-
-		$tva = new Tva($db);
-
-		print load_fiche_titre($langs->trans("VATPayments").($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');
-
-		$sql = "SELECT pv.rowid, pv.amount, pv.label, pv.datev as dm";
-		$sql .= " FROM ".MAIN_DB_PREFIX."tva as pv";
-		$sql .= " WHERE pv.entity = ".$conf->entity;
-		if ($year > 0)
-		{
-			// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
-			// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
-			$sql .= " AND pv.datev between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";
-		}
-		if (preg_match('/^pv\./', $sortfield)) $sql .= $db->order($sortfield, $sortorder);
-
-		$result = $db->query($sql);
-		if ($result)
-		{
-		    $num = $db->num_rows($result);
-		    $i = 0;
-		    $total = 0;
-		    print '<table class="noborder centpercent">';
-		    print '<tr class="liste_titre">';
-			print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'width="140px"', $sortfield, $sortorder);
-			print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "pv.label", "", $param, '', $sortfield, $sortorder);
-			print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-			print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pv.rowid", "", $param, '', $sortfield, $sortorder);
-			print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'align="center"', $sortfield, $sortorder);
-			print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-		    print "</tr>\n";
-
-		    while ($i < $num)
-		    {
-		        $obj = $db->fetch_object($result);
-
-		        $total = $total + $obj->amount;
-
-		        print '<tr class="oddeven">';
-		        print '<td class="left">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>'."\n";
-
-		        print "<td>".$obj->label."</td>\n";
-
-		        print '<td class="right">'.price($obj->amount)."</td>";
-
-		        // Ref payment
-				$tva_static->id = $obj->rowid;
-				$tva_static->ref = $obj->rowid;
-		        print '<td class="left">'.$tva_static->getNomUrl(1)."</td>\n";
-
-		        print '<td class="center">'.dol_print_date($db->jdate($obj->dm), 'day')."</td>\n";
-		        print '<td class="right">'.price($obj->amount)."</td>";
-		        print "</tr>\n";
-
-		        $i++;
-		    }
-		    print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").'</td>';
-		    print '<td class="right">'.price($total).'</td>';
-		    print '<td align="center">&nbsp;</td>';
-		    print '<td align="center">&nbsp;</td>';
-		    print '<td class="right">'.price($total)."</td>";
-		    print "</tr>";
-
-		    print "</table>";
-		    $db->free($result);
-		} else {
-		    dol_print_error($db);
-		}
+	$nbtotalofrecords = $db->num_rows($resql);
+	if (($page * $limit) > $nbtotalofrecords) {	// if total of record found is smaller than page * limit, goto and load page 0
+		$page = 0;
+		$offset = 0;
 	}
 }
-
-// Localtax
-if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
-{
-	$j = 1;
-	$numlt = 3;
-} elseif ($mysoc->localtax1_assuj == "1")
-{
-	$j = 1;
-	$numlt = 2;
-} elseif ($mysoc->localtax2_assuj == "1")
-{
-	$j = 2;
-	$numlt = 3;
+// if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
+if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) {
+	$num = $nbtotalofrecords;
 } else {
-	$j = 0;
-	$numlt = 0;
-}
+	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
-while ($j < $numlt)
-{
-	if (!$mode || $mode != 'sconly')
-	{
-		print "<br>";
-
-		$tva = new Tva($db);
-
-		print load_fiche_titre($langs->transcountry(($j == 1 ? "LT1Payments" : "LT2Payments"), $mysoc->country_code).($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');
-
-
-		$sql = "SELECT pv.rowid, pv.amount, pv.label, pv.datev as dm, pv.datep as dp";
-		$sql .= " FROM ".MAIN_DB_PREFIX."localtax as pv";
-		$sql .= " WHERE pv.entity = ".$conf->entity." AND localtaxtype = ".$j;
-		if ($year > 0)
-		{
-			// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
-			// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
-			$sql .= " AND pv.datev between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";
-		}
-		if (preg_match('/^pv/', $sortfield)) $sql .= $db->order($sortfield, $sortorder);
-
-		$result = $db->query($sql);
-		if ($result)
-		{
-			$num = $db->num_rows($result);
-			$i = 0;
-			$total = 0;
-			print '<table class="noborder centpercent">';
-			print '<tr class="liste_titre">';
-			print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'width="120"', $sortfield, $sortorder);
-			print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "pv.label", "", $param, '', $sortfield, $sortorder);
-			print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-			print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pv.rowid", "", $param, '', $sortfield, $sortorder);
-			print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pv.datep", "", $param, 'align="center"', $sortfield, $sortorder);
-			print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-			print "</tr>\n";
-
-			while ($i < $num)
-			{
-				$obj = $db->fetch_object($result);
-
-				$total = $total + $obj->amount;
-
-				print '<tr class="oddeven">';
-				print '<td class="left">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>'."\n";
-
-				print "<td>".$obj->label."</td>\n";
-
-				print '<td class="right">'.price($obj->amount)."</td>";
-
-				// Ref payment
-				$tva_static->id = $obj->rowid;
-				$tva_static->ref = $obj->rowid;
-				print '<td class="left">'.$tva_static->getNomUrl(1)."</td>\n";
-
-				print '<td class="center">'.dol_print_date($db->jdate($obj->dp), 'day')."</td>\n";
-				print '<td class="right">'.price($obj->amount)."</td>";
-				print "</tr>\n";
-
-				$i++;
-			}
-			print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("Total").'</td>';
-			print '<td class="right">'.price($total)."</td>";
-			print '<td align="center">&nbsp;</td>';
-			print '<td align="center">&nbsp;</td>';
-			print '<td class="right">'.price($total)."</td>";
-			print "</tr>";
-
-			print "</table>";
-			$db->free($result);
-		} else {
-			dol_print_error($db);
-		}
+	$resql = $db->query($sql);
+	if (!$resql) {
+		dol_print_error($db);
+		exit;
 	}
-	$j++;
+
+	$num = $db->num_rows($resql);
 }
+//$sql.= $db->plimit($limit+1,$offset);
+//print $sql;
 
+$nav = '';
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'object_payment', 0, $nav, '', $limit, 0);
 
-// Payment Salary
-if (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
+print '<table class="noborder centpercent">';
+
+print '<tr class="liste_titre">';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre">';
+$formsocialcontrib->select_type_socialcontrib(GETPOSTISSET("search_sc_type") ? $search_sc_type : '', 'search_sc_type', 1, 0, 0, 'minwidth200 maxwidth300');
+print '</td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+if (!empty($conf->banque->enabled)) print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre center">';
+$searchpicto = $form->showFilterButtons();
+print $searchpicto;
+print '</td>';
+print "</tr>\n";
+
+print '<tr class="liste_titre">';
+print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "cs.date_ech", "", $param, 'width="140px"', $sortfield, $sortorder);
+print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "c.libelle", "", $param, '', $sortfield, $sortorder);
+print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "cs.fk_type", "", $param, '', $sortfield, $sortorder);
+print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "cs.amount", "", $param, 'class="right"', $sortfield, $sortorder);
+print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pc.rowid", "", $param, '', $sortfield, $sortorder);
+print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pc.datep", "", $param, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "pct.code", "", $param, '', $sortfield, $sortorder);
+if (!empty($conf->banque->enabled)) print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pc.amount", "", $param, 'class="right"', $sortfield, $sortorder);
+print_liste_field_titre('');
+print "</tr>\n";
+
+if (!$resql)
 {
-    if (!$mode || $mode != 'sconly')
-    {
-        $sal = new PaymentSalary($db);
-
-        print "<br>";
-
-        print load_fiche_titre($langs->trans("SalariesPayments").($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');
-
-        $sql = "SELECT s.rowid, s.amount, s.label, s.datep as datep, s.datev as datev, s.datesp, s.dateep, s.salary, u.salary as current_salary";
-        $sql .= " FROM ".MAIN_DB_PREFIX."payment_salary as s, ".MAIN_DB_PREFIX."user as u";
-        $sql .= " WHERE s.entity IN (".getEntity('user').")";
-        $sql .= " AND u.rowid = s.fk_user";
-        if ($year > 0)
-        {
-            $sql .= " AND (s.datesp between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";
-            $sql .= " OR s.dateep between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."')";
-        }
-        if (preg_match('/^s\./', $sortfield)) $sql .= $db->order($sortfield, $sortorder);
-
-        $result = $db->query($sql);
-        if ($result)
-        {
-            $num = $db->num_rows($result);
-            $i = 0;
-            $total = 0;
-            print '<table class="noborder centpercent">';
-            print '<tr class="liste_titre">';
-            print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "s.dateep", "", $param, 'width="140px"', $sortfield, $sortorder);
-            print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "s.label", "", $param, '', $sortfield, $sortorder);
-            print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "s.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-            print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "s.rowid", "", $param, '', $sortfield, $sortorder);
-            print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "s.datep", "", $param, 'align="center"', $sortfield, $sortorder);
-            print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "s.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-            print "</tr>\n";
-
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($result);
-
-                $total = $total + $obj->amount;
-
-                print '<tr class="oddeven">';
-
-                print '<td class="left">'.dol_print_date($db->jdate($obj->dateep), 'day').'</td>'."\n";
-
-                print "<td>".$obj->label."</td>\n";
-
-                print '<td class="right">'.($obj->salary ?price($obj->salary) : '')."</td>";
-
-                // Ref payment
-                $sal_static->id = $obj->rowid;
-                $sal_static->ref = $obj->rowid;
-                print '<td class="left">'.$sal_static->getNomUrl(1)."</td>\n";
-
-                print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
-                print '<td class="right">'.price($obj->amount)."</td>";
-                print "</tr>\n";
-
-                $i++;
-            }
-            print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").'</td>';
-            print '<td class="right"></td>'; // A total here has no sense
-            print '<td align="center">&nbsp;</td>';
-            print '<td align="center">&nbsp;</td>';
-            print '<td class="right">'.price($total)."</td>";
-            print "</tr>";
-
-            print "</table>";
-            $db->free($result);
-
-            print "<br>";
-        } else {
-            dol_print_error($db);
-        }
-    }
+	dol_print_error($db);
+	exit;
 }
 
+$i = 0;
+$total = 0;
+$totalnb = 0;
+$totalpaye = 0;
+
+while ($i < min($num, $limit)) {
+	$obj = $db->fetch_object($resql);
+	print '<tr class="oddeven">';
+	// Date
+	$date = $obj->periode;
+	if (empty($date)) $date = $obj->date_ech;
+	print '<td>'.dol_print_date($date, 'day').'</td>';
+	// Label
+	print '<td>';
+	$socialcontrib->id = $obj->rowid;
+	$socialcontrib->ref = $obj->label;
+	$socialcontrib->label = $obj->label;
+	print $socialcontrib->getNomUrl(1, '20');
+	print '</td>';
+	// Type
+	print '<td title="'.dol_escape_htmltag($obj->label).'" class="tdmaxoverflow300">'.$obj->label.'</td>';
+	// Expected to pay
+	print '<td class="right">'.price($obj->total).'</td>';
+	// Ref payment
+	$payment_sc_static->id = $obj->pid;
+	$payment_sc_static->ref = $obj->pid;
+	print '<td>'.$payment_sc_static->getNomUrl(1)."</td>\n";
+	// Date payment
+	print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day').'</td>';
+	// Type payment
+	print '<td>';
+	if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
+	print $obj->num_payment.'</td>';
+	// Account
+	if (!empty($conf->banque->enabled))
+	{
+		print '<td>';
+		if ($obj->fk_bank > 0)
+		{
+			//$accountstatic->fetch($obj->fk_bank);
+			$accountstatic->id = $obj->bid;
+			$accountstatic->ref = $obj->bref;
+			$accountstatic->number = $obj->bnumber;
+			$accountstatic->accountancy_number = $obj->account_number;
+			$accountstatic->accountancy_journal = $obj->accountancy_journal;
+			$accountstatic->label = $obj->blabel;
+			print $accountstatic->getNomUrl(1);
+		} else print '&nbsp;';
+		print '</td>';
+	}
+	// Paid
+	print '<td class="right">';
+	if ($obj->totalpaye) print price($obj->totalpaye);
+	print '</td>';
+
+	print '<td></td>';
+
+	print '</tr>';
+
+	$total = $total + $obj->total;
+	$totalnb = $totalnb + $obj->nb;
+	$totalpaye = $totalpaye + $obj->totalpaye;
+	$i++;
+}
+
+// Total
+print '<tr class="liste_total"><td colspan="3" class="liste_total">'.$langs->trans("Total").'</td>';
+print '<td class="liste_total right"></td>'; // A total here has no sense
+print '<td align="center" class="liste_total">&nbsp;</td>';
+print '<td align="center" class="liste_total">&nbsp;</td>';
+print '<td align="center" class="liste_total">&nbsp;</td>';
+if (!empty($conf->banque->enabled)) print '<td></td>';
+print '<td class="liste_total right">'.price($totalpaye)."</td>";
+print '<td></td>';
+print "</tr>";
+
+print '</table>';
+
+
 print '</form>';
 
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardSpecialBills', $parameters, $object); // Note that $action and $object may have been modified by hook
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index fbecc1df335..485a6088338 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -56,6 +56,8 @@ $subcat = false;
 if (GETPOST('subcat', 'alpha') === 'yes') {
 	$subcat = true;
 }
+$categorie = new Categorie($db);
+
 // product/service
 $selected_type = GETPOST('search_type', 'int');
 if ($selected_type == '') $selected_type = -1;
@@ -224,14 +226,12 @@ if ($modecompta == 'CREANCES-DETTES')
 	$sql .= " SUM(l.total_ht) as amount, SUM(l.total_ttc) as amount_ttc,";
 	$sql .= " SUM(CASE WHEN f.type = 2 THEN -l.qty ELSE l.qty END) as qty";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
-    if ($selected_soc > 0) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as soc ON (soc.rowid = f.fk_soc)";
-    $sql .= ",".MAIN_DB_PREFIX."facturedet as l";
+	if ($selected_soc > 0) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as soc ON (soc.rowid = f.fk_soc)";
+	$sql .= ",".MAIN_DB_PREFIX."facturedet as l";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON l.fk_product = p.rowid";
-	if ($selected_cat === -2)	// Without any category
-	{
+	if ($selected_cat === -2) {	// Without any category
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product";
-	} elseif ($selected_cat) 	// Into a specific category
-	{
+	} elseif ($selected_cat) { 	// Into a specific category
 		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_product as cp";
 	}
 	$sql .= " WHERE l.fk_facture = f.rowid";
@@ -249,16 +249,27 @@ if ($modecompta == 'CREANCES-DETTES')
 	{
 		$sql .= " AND l.product_type = ".$selected_type;
 	}
-	if ($selected_cat === -2)	// Without any category
-	{
+	if ($selected_cat === -2) {	// Without any category
 		$sql .= " AND cp.fk_product is null";
 	} elseif ($selected_cat) {	// Into a specific category
-		$sql .= " AND (c.rowid = ".$selected_cat;
-		if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
-		$sql .= ")";
-		$sql .= " AND cp.fk_categorie = c.rowid AND cp.fk_product = p.rowid";
+		if ($subcat) {
+			$TListOfCats = $categorie->get_full_arbo('product', $selected_cat, 1);
+
+			$listofcatsql = "";
+			foreach ($TListOfCats as $key => $cat)
+			{
+				if ($key !== 0) $listofcatsql .= ",";
+				$listofcatsql .= $cat['rowid'];
+			}
+		}
+
+		$sql .= " AND (p.rowid IN ";
+		$sql .= " (SELECT fk_product FROM ".MAIN_DB_PREFIX."categorie_product cp WHERE ";
+		if ($subcat) $sql .= "cp.fk_categorie IN (".$listofcatsql.")";
+		else $sql .= "cp.fk_categorie = ".$selected_cat;
+		$sql .= "))";
 	}
-    if ($selected_soc > 0) $sql .= " AND soc.rowid=".$selected_soc;
+	if ($selected_soc > 0) $sql .= " AND soc.rowid=".$selected_soc;
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
 	$sql .= " GROUP BY p.rowid, p.ref, p.label, p.fk_product_type";
 	$sql .= $db->order($sortfield, $sortorder);
@@ -294,10 +305,10 @@ if ($modecompta == 'CREANCES-DETTES')
 		print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
 	}
 
-    $moreforfilter = '';
+	$moreforfilter = '';
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	// Category filter
 	print '<tr class="liste_titre">';
@@ -310,17 +321,17 @@ if ($modecompta == 'CREANCES-DETTES')
 		print ' checked';
 	}
 	print '>';
-    // type filter (produit/service)
-    print ' ';
-    print $langs->trans("Type").': ';
-    $form->select_type_of_lines(isset($selected_type) ? $selected_type : -1, 'search_type', 1, 1, 1);
+	// type filter (produit/service)
+	print ' ';
+	print $langs->trans("Type").': ';
+	$form->select_type_of_lines(isset($selected_type) ? $selected_type : -1, 'search_type', 1, 1, 1);
 
-    //select thirdparty
-    print '</br>';
-    print $langs->trans("ThirdParty").': '.$form->select_thirdparty_list($selected_soc, 'search_soc', '', 1);
-    print '</td>';
+	//select thirdparty
+	print '</br>';
+	print $langs->trans("ThirdParty").': '.$form->select_thirdparty_list($selected_soc, 'search_soc', '', 1);
+	print '</td>';
 
-    print '<td colspan="5" class="right">';
+	print '<td colspan="5" class="right">';
 	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', '', 1).'"  value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 	print '</td></tr>';
 
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index 8b6caa89a8f..2e46e306030 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -59,9 +59,9 @@ $date_endmonth = GETPOST("date_endmonth");
 $date_endday = GETPOST("date_endday");
 if (empty($year))
 {
-    $year_current = strftime("%Y", dol_now());
-    $month_current = strftime("%m", dol_now());
-    $year_start = $year_current;
+	$year_current = strftime("%Y", dol_now());
+	$month_current = strftime("%m", dol_now());
+	$year_start = $year_current;
 } else {
 	$year_current = $year;
 	$month_current = strftime("%m", dol_now());
@@ -130,7 +130,7 @@ $headerparams = array_merge($commonparams, $headerparams);
 $tableparams = array_merge($commonparams, $tableparams);
 
 foreach ($allparams as $key => $value) {
-    $paramslink .= '&'.$key.'='.$value;
+	$paramslink .= '&'.$key.'='.$value;
 }
 
 /*
@@ -147,23 +147,23 @@ if ($modecompta == "BOOKKEEPINGCOLLECTED") $modecompta = "RECETTES-DEPENSES";
 
 // Show report header
 if ($modecompta == "CREANCES-DETTES") {
-    $name = $langs->trans("Turnover").', '.$langs->trans("ByUserAuthorOfInvoice");
-    $calcmode = $langs->trans("CalcModeDebt");
-    //$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
-    $description = $langs->trans("RulesCADue");
+	$name = $langs->trans("Turnover").', '.$langs->trans("ByUserAuthorOfInvoice");
+	$calcmode = $langs->trans("CalcModeDebt");
+	//$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
+	$description = $langs->trans("RulesCADue");
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
 	else $description .= $langs->trans("DepositsAreIncluded");
-    $builddate = dol_now();
-    //$exportlink=$langs->trans("NotYetAvailable");
+	$builddate = dol_now();
+	//$exportlink=$langs->trans("NotYetAvailable");
 } elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("TurnoverCollected").', '.$langs->trans("ByUserAuthorOfInvoice");
 	$calcmode = $langs->trans("CalcModeEngagement");
 	//$calcmode.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=CREANCES-DETTES">','</a>').')';
-    $description = $langs->trans("RulesCAIn");
+	$description = $langs->trans("RulesCAIn");
 	$description .= $langs->trans("DepositsAreIncluded");
-    $builddate = dol_now();
-    //$exportlink=$langs->trans("NotYetAvailable");
+	$builddate = dol_now();
+	//$exportlink=$langs->trans("NotYetAvailable");
 } elseif ($modecompta == "BOOKKEEPING")
 {
 	// TODO
@@ -182,7 +182,7 @@ report_header($name, $namelink, $period, $periodlink, $description, $builddate,
 
 if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
 {
-    print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
+	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
 
@@ -194,25 +194,25 @@ print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
 // Extra parameters management
 foreach ($headerparams as $key => $value)
 {
-     print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
+	 print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
 }
 
 $catotal = 0;
 if ($modecompta == 'CREANCES-DETTES') {
-    $sql = "SELECT u.rowid as rowid, u.lastname as name, u.firstname as firstname, sum(f.total) as amount, sum(f.total_ttc) as amount_ttc";
-    $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON f.fk_user_author = u.rowid";
-    $sql .= " WHERE f.fk_statut in (1,2)";
+	$sql = "SELECT u.rowid as rowid, u.lastname as name, u.firstname as firstname, sum(f.total) as amount, sum(f.total_ttc) as amount_ttc";
+	$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON f.fk_user_author = u.rowid";
+	$sql .= " WHERE f.fk_statut in (1,2)";
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-	    $sql .= " AND f.type IN (0,1,2,5)";
-    } else {
-	    $sql .= " AND f.type IN (0,1,2,3,5)";
+		$sql .= " AND f.type IN (0,1,2,5)";
+	} else {
+		$sql .= " AND f.type IN (0,1,2,3,5)";
 	}
 	if ($date_start && $date_end) {
-	    $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 	}
 } else {
-    /*
+	/*
      * Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les
      * vieilles versions, ils n'etaient pas lies via paiement_facture. On les ajoute plus loin)
      */
@@ -223,7 +223,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement as p ON p.rowid = pf.fk_paiement";
 	$sql .= " WHERE 1=1";
 	if ($date_start && $date_end) {
-	    $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
 }
 $sql .= " AND f.entity IN (".getEntity('invoice').")";
@@ -231,57 +231,60 @@ if ($socid) $sql .= " AND f.fk_soc = ".$socid;
 $sql .= " GROUP BY u.rowid, u.lastname, u.firstname";
 $sql .= " ORDER BY u.rowid";
 
+$amount = array();
+
+dol_syslog("cabyuser", LOG_DEBUG);
 $result = $db->query($sql);
 if ($result) {
-    $num = $db->num_rows($result);
-    $i = 0;
-    while ($i < $num) {
-         $obj = $db->fetch_object($result);
-        $amount_ht[$obj->rowid] = $obj->amount;
-        $amount[$obj->rowid] = $obj->amount_ttc;
-        $name[$obj->rowid] = $obj->name.' '.$obj->firstname;
-        $catotal_ht += $obj->amount;
-        $catotal += $obj->amount_ttc;
-        $i++;
-    }
+	$num = $db->num_rows($result);
+	$i = 0;
+	while ($i < $num) {
+		 $obj = $db->fetch_object($result);
+		$amount_ht[$obj->rowid] = $obj->amount;
+		$amount[$obj->rowid] = $obj->amount_ttc;
+		$name[$obj->rowid] = $obj->name.' '.$obj->firstname;
+		$catotal_ht += $obj->amount;
+		$catotal += $obj->amount_ttc;
+		$i++;
+	}
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // Adding old-version payments, non-bound by "paiement_facture" then without User
 if ($modecompta != 'CREANCES-DETTES') {
-    $sql = "SELECT -1 as rowidx, '' as name, '' as firstname, sum(DISTINCT p.amount) as amount_ttc";
-    $sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
-    $sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
-    $sql .= ", ".MAIN_DB_PREFIX."paiement as p";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
-    $sql .= " WHERE pf.rowid IS NULL";
-    $sql .= " AND p.fk_bank = b.rowid";
-    $sql .= " AND b.fk_account = ba.rowid";
-    $sql .= " AND ba.entity IN (".getEntity('bank_account').")";
+	$sql = "SELECT -1 as rowidx, '' as name, '' as firstname, sum(DISTINCT p.amount) as amount_ttc";
+	$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
+	$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
+	$sql .= ", ".MAIN_DB_PREFIX."paiement as p";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
+	$sql .= " WHERE pf.rowid IS NULL";
+	$sql .= " AND p.fk_bank = b.rowid";
+	$sql .= " AND b.fk_account = ba.rowid";
+	$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
 	if ($date_start && $date_end) {
-	    $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
-    $sql .= " GROUP BY rowidx, name, firstname";
-    $sql .= " ORDER BY rowidx";
+	$sql .= " GROUP BY rowidx, name, firstname";
+	$sql .= " ORDER BY rowidx";
 
-    $result = $db->query($sql);
-    if ($result) {
-        $num = $db->num_rows($result);
-        $i = 0;
-        while ($i < $num) {
-            $obj = $db->fetch_object($result);
-            $amount[$obj->rowidx] = $obj->amount_ttc;
-            $name[$obj->rowidx] = $obj->name.' '.$obj->firstname;
-            $catotal += $obj->amount_ttc;
-            $i++;
-        }
-    } else {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if ($result) {
+		$num = $db->num_rows($result);
+		$i = 0;
+		while ($i < $num) {
+			$obj = $db->fetch_object($result);
+			$amount[$obj->rowidx] = $obj->amount_ttc;
+			$name[$obj->rowidx] = $obj->name.' '.$obj->firstname;
+			$catotal += $obj->amount_ttc;
+			$i++;
+		}
+	} else {
+		dol_print_error($db);
+	}
 }
 
-$morefilter = '';
+$moreforfilter = '';
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
@@ -298,15 +301,15 @@ print_liste_field_titre(
 	$sortorder
 );
 if ($modecompta == 'CREANCES-DETTES') {
-    print_liste_field_titre(
-           $langs->trans('AmountHT'),
-           $_SERVER["PHP_SELF"],
-           "amount_ht",
-           "",
-           $paramslink,
-           'class="right"',
-           $sortfield,
-           $sortorder
+	print_liste_field_titre(
+		   $langs->trans('AmountHT'),
+		   $_SERVER["PHP_SELF"],
+		   "amount_ht",
+		   "",
+		   $paramslink,
+		   'class="right"',
+		   $sortfield,
+		   $sortorder
 	);
 } else {
 	print_liste_field_titre('');
@@ -341,129 +344,129 @@ print_liste_field_titre(
 print "</tr>\n";
 
 if (count($amount)) {
-    $arrayforsort = $name;
+	$arrayforsort = $name;
 
-    // We define arrayforsort
-    if ($sortfield == 'name' && $sortorder == 'asc') {
-        asort($name);
-        $arrayforsort = $name;
-    }
-    if ($sortfield == 'name' && $sortorder == 'desc') {
-        arsort($name);
-        $arrayforsort = $name;
-    }
-    if ($sortfield == 'amount_ht' && $sortorder == 'asc') {
-        asort($amount_ht);
-        $arrayforsort = $amount_ht;
-    }
-    if ($sortfield == 'amount_ht' && $sortorder == 'desc') {
-        arsort($amount_ht);
-        $arrayforsort = $amount_ht;
-    }
-    if ($sortfield == 'amount_ttc' && $sortorder == 'asc') {
-        asort($amount);
-        $arrayforsort = $amount;
-    }
-    if ($sortfield == 'amount_ttc' && $sortorder == 'desc') {
-        arsort($amount);
-        $arrayforsort = $amount;
-    }
+	// We define arrayforsort
+	if ($sortfield == 'name' && $sortorder == 'asc') {
+		asort($name);
+		$arrayforsort = $name;
+	}
+	if ($sortfield == 'name' && $sortorder == 'desc') {
+		arsort($name);
+		$arrayforsort = $name;
+	}
+	if ($sortfield == 'amount_ht' && $sortorder == 'asc') {
+		asort($amount_ht);
+		$arrayforsort = $amount_ht;
+	}
+	if ($sortfield == 'amount_ht' && $sortorder == 'desc') {
+		arsort($amount_ht);
+		$arrayforsort = $amount_ht;
+	}
+	if ($sortfield == 'amount_ttc' && $sortorder == 'asc') {
+		asort($amount);
+		$arrayforsort = $amount;
+	}
+	if ($sortfield == 'amount_ttc' && $sortorder == 'desc') {
+		arsort($amount);
+		$arrayforsort = $amount;
+	}
 
-    $i = 0;
+	$i = 0;
 
-    foreach ($arrayforsort as $key => $value) {
-        print '<tr class="oddeven">';
+	foreach ($arrayforsort as $key => $value) {
+		print '<tr class="oddeven">';
 
-        // Third party
-        $fullname = $name[$key];
-        if ($key >= 0) {
-            $linkname = '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$key.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$fullname.'</a>';
-        } else {
-            $linkname = $langs->trans("PaymentsNotLinkedToUser");
-        }
-        print "<td>".$linkname."</td>\n";
+		// Third party
+		$fullname = $name[$key];
+		if ($key >= 0) {
+			$linkname = '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$key.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$fullname.'</a>';
+		} else {
+			$linkname = $langs->trans("PaymentsNotLinkedToUser");
+		}
+		print "<td>".$linkname."</td>\n";
 
-        // Amount w/o VAT
-        print '<td class="right">';
-        if ($modecompta == 'RECETTES-DEPENSES') {
-            if ($key > 0) {
-                //print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid='.$key.'">';
-            } else {
-                //print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid=-1">';
-            }
-        } elseif ($modecompta == 'CREANCES-DETTES') {
-            if ($key > 0) {
-                print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?userid='.$key.'">';
-            } else {
-                //print '<a href="#">';
-            }
-            print price($amount_ht[$key]);
-            if ($key > 0) print '</a>';
-        }
-        print '</td>';
+		// Amount w/o VAT
+		print '<td class="right">';
+		if ($modecompta == 'RECETTES-DEPENSES') {
+			if ($key > 0) {
+				//print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid='.$key.'">';
+			} else {
+				//print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid=-1">';
+			}
+		} elseif ($modecompta == 'CREANCES-DETTES') {
+			if ($key > 0) {
+				print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?userid='.$key.'">';
+			} else {
+				//print '<a href="#">';
+			}
+			print price($amount_ht[$key]);
+			if ($key > 0) print '</a>';
+		}
+		print '</td>';
 
-        // Amount with VAT
-        print '<td class="right">';
-        if ($modecompta == 'RECETTES-DEPENSES') {
-            if ($key > 0) {
-                //print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid='.$key.'">';
-            } else {
-                //print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid=-1">';
-            }
-        } elseif ($modecompta == 'CREANCES-DETTES') {
-            if ($key > 0) {
-                print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?userid='.$key.'">';
-            } else {
-                //print '<a href="#">';
-            }
-        }
-        print price($amount[$key]);
-        if ($modecompta == 'RECETTES-DEPENSES') {
-        	if ($key > 0) {
-        		//print '</a>';
-        	} else {
-        		//print '</a>';
-        	}
-        } elseif ($modecompta == 'CREANCES-DETTES') {
-        	if ($key > 0) {
-        		print '</a>';
-        	}
-        }
-        print '</td>';
+		// Amount with VAT
+		print '<td class="right">';
+		if ($modecompta == 'RECETTES-DEPENSES') {
+			if ($key > 0) {
+				//print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid='.$key.'">';
+			} else {
+				//print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid=-1">';
+			}
+		} elseif ($modecompta == 'CREANCES-DETTES') {
+			if ($key > 0) {
+				print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?userid='.$key.'">';
+			} else {
+				//print '<a href="#">';
+			}
+		}
+		print price($amount[$key]);
+		if ($modecompta == 'RECETTES-DEPENSES') {
+			if ($key > 0) {
+				//print '</a>';
+			} else {
+				//print '</a>';
+			}
+		} elseif ($modecompta == 'CREANCES-DETTES') {
+			if ($key > 0) {
+				print '</a>';
+			}
+		}
+		print '</td>';
 
-        // Percent
-        print '<td class="right">'.($catotal > 0 ? round(100 * $amount[$key] / $catotal, 2).'%' : '&nbsp;').'</td>';
+		// Percent
+		print '<td class="right">'.($catotal > 0 ? round(100 * $amount[$key] / $catotal, 2).'%' : '&nbsp;').'</td>';
 
-        // Other stats
-        print '<td class="center">';
-        if (!empty($conf->propal->enabled) && $key > 0) {
-            print '&nbsp;<a href="'.DOL_URL_ROOT.'/comm/propal/stats/index.php?userid='.$key.'">'.img_picto($langs->trans("ProposalStats"), "stats").'</a>&nbsp;';
-        }
-        if (!empty($conf->commande->enabled) && $key > 0) {
-            print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/stats/index.php?userid='.$key.'">'.img_picto($langs->trans("OrderStats"), "stats").'</a>&nbsp;';
-        }
-        if (!empty($conf->facture->enabled) && $key > 0) {
-            print '&nbsp;<a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?userid='.$key.'">'.img_picto($langs->trans("InvoiceStats"), "stats").'</a>&nbsp;';
-        }
-        print '</td>';
-        print "</tr>\n";
-        $i++;
-    }
+		// Other stats
+		print '<td class="center">';
+		if (!empty($conf->propal->enabled) && $key > 0) {
+			print '&nbsp;<a href="'.DOL_URL_ROOT.'/comm/propal/stats/index.php?userid='.$key.'">'.img_picto($langs->trans("ProposalStats"), "stats").'</a>&nbsp;';
+		}
+		if (!empty($conf->commande->enabled) && $key > 0) {
+			print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/stats/index.php?userid='.$key.'">'.img_picto($langs->trans("OrderStats"), "stats").'</a>&nbsp;';
+		}
+		if (!empty($conf->facture->enabled) && $key > 0) {
+			print '&nbsp;<a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?userid='.$key.'">'.img_picto($langs->trans("InvoiceStats"), "stats").'</a>&nbsp;';
+		}
+		print '</td>';
+		print "</tr>\n";
+		$i++;
+	}
 
-    // Total
-    print '<tr class="liste_total">';
-    print '<td>'.$langs->trans("Total").'</td>';
-    if ($modecompta != 'CREANCES-DETTES') {
-        print '<td></td>';
-    } else {
-        print '<td class="right">'.price($catotal_ht).'</td>';
-    }
-    print '<td class="right">'.price($catotal).'</td>';
-    print '<td>&nbsp;</td>';
-    print '<td>&nbsp;</td>';
-    print '</tr>';
+	// Total
+	print '<tr class="liste_total">';
+	print '<td>'.$langs->trans("Total").'</td>';
+	if ($modecompta != 'CREANCES-DETTES') {
+		print '<td></td>';
+	} else {
+		print '<td class="right">'.price($catotal_ht).'</td>';
+	}
+	print '<td class="right">'.price($catotal).'</td>';
+	print '<td>&nbsp;</td>';
+	print '<td>&nbsp;</td>';
+	print '</tr>';
 
-    $db->free($result);
+	$db->free($result);
 }
 
 print "</table>";
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index a02d87a8392..8fa06046076 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -53,7 +53,7 @@ $socid = GETPOST('socid', 'int');
 $selected_cat = (int) GETPOST('search_categ', 'int');
 $subcat = false;
 if (GETPOST('subcat', 'alpha') === 'yes') {
-    $subcat = true;
+	$subcat = true;
 }
 
 // Security check
@@ -155,7 +155,7 @@ $headerparams = array_merge($commonparams, $headerparams);
 $tableparams = array_merge($commonparams, $tableparams);
 
 foreach ($allparams as $key => $value) {
-    $paramslink .= '&'.$key.'='.$value;
+	$paramslink .= '&'.$key.'='.$value;
 }
 
 
@@ -206,7 +206,7 @@ report_header($name, $namelink, $period, $periodlink, $description, $builddate,
 
 if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
 {
-    print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
+	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
 
@@ -220,28 +220,28 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
 	if ($selected_cat === -2)	// Without any category
 	{
-	    $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
+		$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
 	} elseif ($selected_cat) 	// Into a specific category
 	{
-	    $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
+		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
 	}
 	$sql .= " WHERE f.fk_statut in (1,2)";
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-	    $sql .= " AND f.type IN (0,1,2,5)";
+		$sql .= " AND f.type IN (0,1,2,5)";
 	} else {
-	    $sql .= " AND f.type IN (0,1,2,3,5)";
+		$sql .= " AND f.type IN (0,1,2,3,5)";
 	}
 	$sql .= " AND f.fk_soc = s.rowid";
 	if ($date_start && $date_end) {
-	    $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 	}
 	if ($selected_cat === -2)	// Without any category
 	{
-	    $sql .= " AND cs.fk_soc is null";
+		$sql .= " AND cs.fk_soc is null";
 	} elseif ($selected_cat) {	// Into a specific category
-	    $sql .= " AND (c.rowid = ".$db->escape($selected_cat);
-	    if ($subcat) $sql .= " OR c.fk_parent = ".$db->escape($selected_cat);
-	    $sql .= ")";
+		$sql .= " AND (c.rowid = ".$db->escape($selected_cat);
+		if ($subcat) $sql .= " OR c.fk_parent = ".$db->escape($selected_cat);
+		$sql .= ")";
 		$sql .= " AND cs.fk_categorie = c.rowid AND cs.fk_soc = s.rowid";
 	}
 } else {
@@ -256,24 +256,24 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
 	if ($selected_cat === -2)	// Without any category
 	{
-	    $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
+		$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
 	} elseif ($selected_cat) 	// Into a specific category
 	{
-	    $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
+		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
 	}
 	$sql .= " WHERE p.rowid = pf.fk_paiement";
 	$sql .= " AND pf.fk_facture = f.rowid";
 	$sql .= " AND f.fk_soc = s.rowid";
 	if ($date_start && $date_end) {
-	    $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
 	if ($selected_cat === -2)	// Without any category
 	{
-	    $sql .= " AND cs.fk_soc is null";
+		$sql .= " AND cs.fk_soc is null";
 	} elseif ($selected_cat) {	// Into a specific category
-	    $sql .= " AND (c.rowid = ".$selected_cat;
-	    if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
-	    $sql .= ")";
+		$sql .= " AND (c.rowid = ".$selected_cat;
+		if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
+		$sql .= ")";
 		$sql .= " AND cs.fk_categorie = c.rowid AND cs.fk_soc = s.rowid";
 	}
 }
@@ -287,6 +287,8 @@ $sql .= " GROUP BY s.rowid, s.nom, s.zip, s.town, s.fk_pays";
 $sql .= " ORDER BY s.rowid";
 //echo $sql;
 
+$amount = array();
+
 dol_syslog("casoc", LOG_DEBUG);
 $result = $db->query($sql);
 if ($result) {
@@ -294,15 +296,15 @@ if ($result) {
 	$i = 0;
 	while ($i < $num) {
 		$obj = $db->fetch_object($result);
-	        $amount_ht[$obj->socid] = $obj->amount;
-	        $amount[$obj->socid] = $obj->amount_ttc;
-	        $name[$obj->socid] = $obj->name.' '.$obj->firstname;
+			$amount_ht[$obj->socid] = $obj->amount;
+			$amount[$obj->socid] = $obj->amount_ttc;
+			$name[$obj->socid] = $obj->name.' '.$obj->firstname;
 			$address_zip[$obj->socid] = $obj->zip;
 			$address_town[$obj->socid] = $obj->town;
 			$address_pays[$obj->socid] = getCountry($obj->fk_pays);
-	        $catotal_ht += $obj->amount;
-	        $catotal += $obj->amount_ttc;
-	        $i++;
+			$catotal_ht += $obj->amount;
+			$catotal += $obj->amount_ttc;
+			$i++;
 	}
 } else {
 	dol_print_error($db);
@@ -350,7 +352,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
 // Extra parameters management
 foreach ($headerparams as $key => $value)
 {
-     print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
+	 print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
 }
 
 $moreforfilter = '';
@@ -366,7 +368,7 @@ print ' ';
 print $langs->trans("SubCats").'? ';
 print '<input type="checkbox" name="subcat" value="yes"';
 if ($subcat) {
-    print ' checked';
+	print ' checked';
 }
 print'></td>';
 print '<td colspan="7" class="right">';
@@ -433,18 +435,18 @@ print_liste_field_titre(
 	$sortfield, $sortorder
 	);
 if ($modecompta == 'CREANCES-DETTES') {
-    print_liste_field_titre(
-           $langs->trans('AmountHT'),
-           $_SERVER["PHP_SELF"],
-           "amount_ht",
-           "",
-           $paramslink,
-           'class="right"',
-           $sortfield,
-           $sortorder
-    );
+	print_liste_field_titre(
+		   $langs->trans('AmountHT'),
+		   $_SERVER["PHP_SELF"],
+		   "amount_ht",
+		   "",
+		   $paramslink,
+		   'class="right"',
+		   $sortfield,
+		   $sortorder
+	);
 } else {
-    print_liste_field_titre('');
+	print_liste_field_titre('');
 }
 print_liste_field_titre(
 	$langs->trans("AmountTTC"),
@@ -489,12 +491,12 @@ if (count($amount)) {
 		$arrayforsort = $name;
 	}
 	if ($sortfield == 'amount_ht' && $sortorder == 'asc') {
-	    asort($amount_ht);
-	    $arrayforsort = $amount_ht;
+		asort($amount_ht);
+		$arrayforsort = $amount_ht;
 	}
 	if ($sortfield == 'amount_ht' && $sortorder == 'desc') {
-	    arsort($amount_ht);
-	    $arrayforsort = $amount_ht;
+		arsort($amount_ht);
+		$arrayforsort = $amount_ht;
 	}
 	if ($sortfield == 'amount_ttc' && $sortorder == 'asc') {
 		asort($amount);
@@ -535,10 +537,10 @@ if (count($amount)) {
 		// Third party
 		$fullname = $name[$key];
 		if ($key > 0) {
-		    $thirdparty_static->id = $key;
-		    $thirdparty_static->name = $fullname;
-		    $thirdparty_static->client = 1;
-		    $linkname = $thirdparty_static->getNomUrl(1, 'customer');
+			$thirdparty_static->id = $key;
+			$thirdparty_static->name = $fullname;
+			$thirdparty_static->client = 1;
+			$linkname = $thirdparty_static->getNomUrl(1, 'customer');
 		} else {
 			$linkname = $langs->trans("PaymentsNotLinkedToInvoice");
 		}
@@ -559,35 +561,35 @@ if (count($amount)) {
 		// Amount w/o VAT
 		print '<td class="right">';
 		if ($modecompta != 'CREANCES-DETTES') {
-            if ($key > 0) {
-                print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?socid='.$key.'">';
-		    } else {
-                print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?socid=-1">';
-            }
+			if ($key > 0) {
+				print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?socid='.$key.'">';
+			} else {
+				print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?socid=-1">';
+			}
 		} else {
-		    if ($key > 0) {
-                print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$key.'">';
-		    } else {
-                print '<a href="#">';
-		    }
-            print price($amount_ht[$key]);
+			if ($key > 0) {
+				print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$key.'">';
+			} else {
+				print '<a href="#">';
+			}
+			print price($amount_ht[$key]);
 		}
 		print '</td>';
 
 		// Amount with VAT
 		print '<td class="right">';
 		if ($modecompta != 'CREANCES-DETTES') {
-            if ($key > 0) {
-                print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?socid='.$key.'">';
-		    } else {
-                print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?orphelins=1">';
-		    }
+			if ($key > 0) {
+				print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?socid='.$key.'">';
+			} else {
+				print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?orphelins=1">';
+			}
 		} else {
-            if ($key > 0) {
-                print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$key.'">';
-		    } else {
-                print '<a href="#">';
-		    }
+			if ($key > 0) {
+				print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$key.'">';
+			} else {
+				print '<a href="#">';
+			}
 		}
 		print price($amount[$key]);
 		print '</a>';
@@ -596,21 +598,21 @@ if (count($amount)) {
 		// Percent;
 		print '<td class="right">'.($catotal > 0 ? round(100 * $amount[$key] / $catotal, 2).'%' : '&nbsp;').'</td>';
 
-        // Other stats
-        print '<td class="center">';
-        if (!empty($conf->propal->enabled) && $key > 0) {
-            print '&nbsp;<a href="'.DOL_URL_ROOT.'/comm/propal/stats/index.php?socid='.$key.'">'.img_picto($langs->trans("ProposalStats"), "stats").'</a>&nbsp;';
-        }
-        if (!empty($conf->commande->enabled) && $key > 0) {
-            print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/stats/index.php?socid='.$key.'">'.img_picto($langs->trans("OrderStats"), "stats").'</a>&nbsp;';
-        }
-        if (!empty($conf->facture->enabled) && $key > 0) {
-            print '&nbsp;<a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?socid='.$key.'">'.img_picto($langs->trans("InvoiceStats"), "stats").'</a>&nbsp;';
-        }
-        print '</td>';
-        print "</tr>\n";
-        $i++;
-    }
+		// Other stats
+		print '<td class="center">';
+		if (!empty($conf->propal->enabled) && $key > 0) {
+			print '&nbsp;<a href="'.DOL_URL_ROOT.'/comm/propal/stats/index.php?socid='.$key.'">'.img_picto($langs->trans("ProposalStats"), "stats").'</a>&nbsp;';
+		}
+		if (!empty($conf->commande->enabled) && $key > 0) {
+			print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/stats/index.php?socid='.$key.'">'.img_picto($langs->trans("OrderStats"), "stats").'</a>&nbsp;';
+		}
+		if (!empty($conf->facture->enabled) && $key > 0) {
+			print '&nbsp;<a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?socid='.$key.'">'.img_picto($langs->trans("InvoiceStats"), "stats").'</a>&nbsp;';
+		}
+		print '</td>';
+		print "</tr>\n";
+		$i++;
+	}
 
 	// Total
 	print '<tr class="liste_total">';
@@ -619,9 +621,9 @@ if (count($amount)) {
 	print '<td>&nbsp;</td>';
 	print '<td>&nbsp;</td>';
 	if ($modecompta != 'CREANCES-DETTES') {
-	    print '<td></td>';
+		print '<td></td>';
 	} else {
-	    print '<td class="right">'.price($catotal_ht).'</td>';
+		print '<td class="right">'.price($catotal_ht).'</td>';
 	}
 	print '<td class="right">'.price($catotal).'</td>';
 	print '<td>&nbsp;</td>';
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index 796ce2cc6a6..0be6659f7b4 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2012  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2017       Olivier Geffroy         <jeff@jeffinfo.com>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric 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
@@ -108,6 +108,10 @@ if (!empty($conf->accounting->enabled)) $result = restrictedArea($user, 'account
  * View
  */
 
+$param = '';
+if ($date_startday && $date_startmonth && $date_startyear) $param .= '&date_startday='.$date_startday.'&date_startmonth='.$date_startmonth.'&date_startyear='.$date_startyear;
+if ($date_endday && $date_endmonth && $date_endyear) $param .= '&date_endday='.$date_endday.'&date_endmonth='.$date_endmonth.'&date_endyear='.$date_endyear;
+
 llxHeader();
 
 $form = new Form($db);
@@ -118,7 +122,9 @@ if ($modecompta == "CREANCES-DETTES")
 	$name = $langs->trans("Turnover");
 	$calcmode = $langs->trans("CalcModeDebt");
 	//$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
-	$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=BOOKKEEPING">', '</a>').')';
+	$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '{link1}', '{link2}').')';
+	$calcmode = str_replace('{link1}', '<a class="bold" href="'.$_SERVER["PHP_SELF"].'?'.($param ? $param : 'year_start='.$year_start).'&modecompta=BOOKKEEPING">', $calcmode);
+	$calcmode = str_replace('{link2}', '</a>', $calcmode);
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesCADue");
@@ -142,7 +148,9 @@ if ($modecompta == "CREANCES-DETTES")
 {
 	$name = $langs->trans("Turnover");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
-	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">', '</a>').')';
+	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '{link1}', '{link2}').')';
+	$calcmode = str_replace('{link1}', '<a class="bold" href="'.$_SERVER["PHP_SELF"].'?'.($param ? $param : 'year_start='.$year_start).'&modecompta=CREANCES-DETTES">', $calcmode);
+	$calcmode = str_replace('{link2}', '</a>', $calcmode);
 	//$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
@@ -157,7 +165,7 @@ report_header($name, $namelink, $period, $periodlink, $description, $builddate,
 
 if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
 {
-    print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
+	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
 
@@ -271,9 +279,9 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 	else print '<td align="center" width="10%" colspan="2" class="borderrightlight">';
 	if ($modecompta != 'BOOKKEEPING') print '<a href="casoc.php?year='.$annee.'">';
 	print $annee;
-    if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) print '-'.($annee + 1);
-    if ($modecompta != 'BOOKKEEPING') print '</a>';
-    print '</td>';
+	if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) print '-'.($annee + 1);
+	if ($modecompta != 'BOOKKEEPING') print '</a>';
+	print '</td>';
 	if ($annee != $year_end) print '<td width="15">&nbsp;</td>';
 }
 print '</tr>';
@@ -305,6 +313,11 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 	if ($mois > 12) {$mois_modulo = $mois - 12; } // ajout
 
 	if ($year_start == $year_end) {
+		// If we show only one year or one month, we do not show month before the selected month
+		if ($mois < $date_startmonth && $year_start <= $date_startyear) {
+			continue;
+		}
+		// If we show only one year or one month, we do not show month after the selected month
 		if ($mois > $date_endmonth && $year_end >= $date_endyear) {
 			break;
 		}
diff --git a/htdocs/compta/stats/supplier_turnover.php b/htdocs/compta/stats/supplier_turnover.php
index c257d5d1f73..eeb1c142712 100644
--- a/htdocs/compta/stats/supplier_turnover.php
+++ b/htdocs/compta/stats/supplier_turnover.php
@@ -59,7 +59,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	{
 		// We define date_start and date_end
 		$year_end = $year_start + ($nbofyear - 1);
-		$month_start = GETPOST("month") ?GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
+		$month_start = GETPOST("month") ? GETPOST("month", 'int') : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 		if (!GETPOST('month'))
 		{
 			if (!GETPOST("year") && $month_start > $month_current)
@@ -113,8 +113,9 @@ if ($modecompta == "CREANCES-DETTES")
 {
 	$name = $langs->trans("PurchaseTurnover");
 	$calcmode = $langs->trans("CalcModeDebt");
-	//$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
-	$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=BOOKKEEPING">', '</a>').')';
+	$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '{link1}', '{link2}').')';
+	$calcmode = str_replace('{link1}', '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=BOOKKEEPING">', $calcmode);
+	$calcmode = str_replace('{link2}', '</a>', $calcmode);
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesPurchaseTurnoverDue");
@@ -124,8 +125,6 @@ if ($modecompta == "CREANCES-DETTES")
 {
 	$name = $langs->trans("PurchaseTurnoverCollected");
 	$calcmode = $langs->trans("CalcModeEngagement");
-	//$calcmode.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">','</a>').')';
-	//$calcmode.='<br>('.$langs->trans("SeeReportInBookkeepingMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=BOOKKEEPINGCOLLECTED">','</a>').')';
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesPurchaseTurnoverIn");
@@ -135,8 +134,9 @@ if ($modecompta == "CREANCES-DETTES")
 {
 	$name = $langs->trans("PurchaseTurnover");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
-	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">', '</a>').')';
-	//$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
+	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '{link1}', '{link2}').')';
+	$calcmode = str_replace('{link1}', '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">', $calcmode);
+	$calcmode = str_replace('{link2}', '</a>', $calcmode);
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesPurchaseTurnoverTotalPurchaseJournal");
@@ -150,7 +150,7 @@ report_header($name, $namelink, $period, $periodlink, $description, $builddate,
 
 if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
 {
-    print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
+	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
 
@@ -223,9 +223,9 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 	else print '<td align="center" width="10%" colspan="2" class="borderrightlight">';
 	if ($modecompta != 'BOOKKEEPING') print '<a href="supplier_turnover_by_thirdparty.php?year='.$annee.($modecompta ? '&modecompta='.$modecompta : '').'">';
 	print $annee;
-    if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) print '-'.($annee + 1);
-    if ($modecompta != 'BOOKKEEPING') print '</a>';
-    print '</td>';
+	if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) print '-'.($annee + 1);
+	if ($modecompta != 'BOOKKEEPING') print '</a>';
+	print '</td>';
 	if ($annee != $year_end) print '<td width="15">&nbsp;</td>';
 }
 print '</tr>';
diff --git a/htdocs/compta/stats/supplier_turnover_by_prodserv.php b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
index 83a3cb70a00..18e03d05f8f 100644
--- a/htdocs/compta/stats/supplier_turnover_by_prodserv.php
+++ b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
@@ -213,8 +213,8 @@ if ($modecompta == 'CREANCES-DETTES')
 	$sql .= " SUM(l.total_ht) as amount, SUM(l.total_ttc) as amount_ttc,";
 	$sql .= " SUM(CASE WHEN f.type = 2 THEN -l.qty ELSE l.qty END) as qty";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
-    if ($selected_soc > 0) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as soc ON (soc.rowid = f.fk_soc)";
-    $sql .= ",".MAIN_DB_PREFIX."facture_fourn_det as l";
+	if ($selected_soc > 0) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as soc ON (soc.rowid = f.fk_soc)";
+	$sql .= ",".MAIN_DB_PREFIX."facture_fourn_det as l";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON l.fk_product = p.rowid";
 	if ($selected_cat === -2)	// Without any category
 	{
@@ -243,7 +243,7 @@ if ($modecompta == 'CREANCES-DETTES')
 		$sql .= ")";
 		$sql .= " AND cp.fk_categorie = c.rowid AND cp.fk_product = p.rowid";
 	}
-    if ($selected_soc > 0) $sql .= " AND soc.rowid=".$selected_soc;
+	if ($selected_soc > 0) $sql .= " AND soc.rowid=".$selected_soc;
 	$sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
 	$sql .= " GROUP BY p.rowid, p.ref, p.label, p.fk_product_type";
 	$sql .= $db->order($sortfield, $sortorder);
@@ -279,10 +279,10 @@ if ($modecompta == 'CREANCES-DETTES')
 		print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
 	}
 
-    $moreforfilter = '';
+	$moreforfilter = '';
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	// Category filter
 	print '<tr class="liste_titre">';
@@ -295,17 +295,17 @@ if ($modecompta == 'CREANCES-DETTES')
 		print ' checked';
 	}
 	print '>';
-    // type filter (produit/service)
-    print ' ';
-    print $langs->trans("Type").': ';
-    $form->select_type_of_lines(isset($selected_type) ? $selected_type : -1, 'search_type', 1, 1, 1);
+	// type filter (produit/service)
+	print ' ';
+	print $langs->trans("Type").': ';
+	$form->select_type_of_lines(isset($selected_type) ? $selected_type : -1, 'search_type', 1, 1, 1);
 
-    //select thirdparty
-    print '</br>';
-    print $langs->trans("ThirdParty").': '.$form->select_thirdparty_list($selected_soc, 'search_soc', '', 1);
-    print '</td>';
+	//select thirdparty
+	print '</br>';
+	print $langs->trans("ThirdParty").': '.$form->select_thirdparty_list($selected_soc, 'search_soc', '', 1);
+	print '</td>';
 
-    print '<td colspan="5" class="right">';
+	print '<td colspan="5" class="right">';
 	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', '', 1).'"  value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 	print '</td></tr>';
 
diff --git a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
index 7a624284cdf..a7f68644f7b 100644
--- a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
+++ b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
@@ -47,7 +47,7 @@ $socid = GETPOST('socid', 'int');
 $selected_cat = (int) GETPOST('search_categ', 'int');
 $subcat = false;
 if (GETPOST('subcat', 'alpha') === 'yes') {
-    $subcat = true;
+	$subcat = true;
 }
 
 // Hook
@@ -149,7 +149,7 @@ $headerparams = array_merge($commonparams, $headerparams);
 $tableparams = array_merge($commonparams, $tableparams);
 
 foreach ($allparams as $key => $value) {
-    $paramslink .= '&'.$key.'='.$value;
+	$paramslink .= '&'.$key.'='.$value;
 }
 
 
@@ -197,7 +197,7 @@ report_header($name, '', $period, $periodlink, $description, $builddate, $export
 
 if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
 {
-    print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
+	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
 // Show Array
@@ -212,24 +212,24 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s";
 	if ($selected_cat === -2)	// Without any category
 	{
-	    $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
+		$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
 	} elseif ($selected_cat) 	// Into a specific category
 	{
-	    $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
+		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
 	}
 	$sql .= " WHERE f.fk_statut in (1,2)";
 	$sql .= " AND f.type IN (0,2)";
 	$sql .= " AND f.fk_soc = s.rowid";
 	if ($date_start && $date_end) {
-	    $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 	}
 	if ($selected_cat === -2)	// Without any category
 	{
-	    $sql .= " AND cs.fk_soc is null";
+		$sql .= " AND cs.fk_soc is null";
 	} elseif ($selected_cat) {	// Into a specific category
-	    $sql .= " AND (c.rowid = ".$db->escape($selected_cat);
-	    if ($subcat) $sql .= " OR c.fk_parent = ".$db->escape($selected_cat);
-	    $sql .= ")";
+		$sql .= " AND (c.rowid = ".$db->escape($selected_cat);
+		if ($subcat) $sql .= " OR c.fk_parent = ".$db->escape($selected_cat);
+		$sql .= ")";
 		$sql .= " AND cs.fk_categorie = c.rowid AND cs.fk_soc = s.rowid";
 	}
 } else {
@@ -240,24 +240,24 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
 	if ($selected_cat === -2)	// Without any category
 	{
-	    $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
+		$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
 	} elseif ($selected_cat) 	// Into a specific category
 	{
-	    $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
+		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
 	}
 	$sql .= " WHERE p.rowid = pf.fk_paiementfourn";
 	$sql .= " AND pf.fk_facturefourn = f.rowid";
 	$sql .= " AND f.fk_soc = s.rowid";
 	if ($date_start && $date_end) {
-	    $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
 	if ($selected_cat === -2)	// Without any category
 	{
-	    $sql .= " AND cs.fk_soc is null";
+		$sql .= " AND cs.fk_soc is null";
 	} elseif ($selected_cat) {	// Into a specific category
-	    $sql .= " AND (c.rowid = ".$selected_cat;
-	    if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
-	    $sql .= ")";
+		$sql .= " AND (c.rowid = ".$selected_cat;
+		if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
+		$sql .= ")";
 		$sql .= " AND cs.fk_categorie = c.rowid AND cs.fk_soc = s.rowid";
 	}
 }
@@ -278,15 +278,15 @@ if ($result) {
 	$i = 0;
 	while ($i < $num) {
 		$obj = $db->fetch_object($result);
-	        $amount_ht[$obj->socid] = $obj->amount;
-	        $amount[$obj->socid] = $obj->amount_ttc;
-	        $name[$obj->socid] = $obj->name.' '.$obj->firstname;
+			$amount_ht[$obj->socid] = $obj->amount;
+			$amount[$obj->socid] = $obj->amount_ttc;
+			$name[$obj->socid] = $obj->name.' '.$obj->firstname;
 			$address_zip[$obj->socid] = $obj->zip;
 			$address_town[$obj->socid] = $obj->town;
 			$address_pays[$obj->socid] = getCountry($obj->fk_pays);
-	        $catotal_ht += $obj->amount;
-	        $catotal += $obj->amount_ttc;
-	        $i++;
+			$catotal_ht += $obj->amount;
+			$catotal += $obj->amount_ttc;
+			$i++;
 	}
 } else {
 	dol_print_error($db);
@@ -299,7 +299,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
 // Extra parameters management
 foreach ($headerparams as $key => $value)
 {
-     print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
+	 print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
 }
 
 $moreforfilter = '';
@@ -315,7 +315,7 @@ print ' ';
 print $langs->trans("SubCats").'? ';
 print '<input type="checkbox" name="subcat" value="yes"';
 if ($subcat) {
-    print ' checked';
+	print ' checked';
 }
 print'></td>';
 print '<td colspan="7" class="right">';
@@ -382,18 +382,18 @@ print_liste_field_titre(
 	$sortfield, $sortorder
 	);
 if ($modecompta == 'CREANCES-DETTES') {
-    print_liste_field_titre(
-           $langs->trans('AmountHT'),
-           $_SERVER["PHP_SELF"],
-           "amount_ht",
-           "",
-           $paramslink,
-           'class="right"',
-           $sortfield,
-           $sortorder
-    );
+	print_liste_field_titre(
+		   $langs->trans('AmountHT'),
+		   $_SERVER["PHP_SELF"],
+		   "amount_ht",
+		   "",
+		   $paramslink,
+		   'class="right"',
+		   $sortfield,
+		   $sortorder
+	);
 } else {
-    print_liste_field_titre('');
+	print_liste_field_titre('');
 }
 print_liste_field_titre(
 	$langs->trans("AmountTTC"),
@@ -438,12 +438,12 @@ if (count($amount)) {
 		$arrayforsort = $name;
 	}
 	if ($sortfield == 'amount_ht' && $sortorder == 'asc') {
-	    asort($amount_ht);
-	    $arrayforsort = $amount_ht;
+		asort($amount_ht);
+		$arrayforsort = $amount_ht;
 	}
 	if ($sortfield == 'amount_ht' && $sortorder == 'desc') {
-	    arsort($amount_ht);
-	    $arrayforsort = $amount_ht;
+		arsort($amount_ht);
+		$arrayforsort = $amount_ht;
 	}
 	if ($sortfield == 'amount_ttc' && $sortorder == 'asc') {
 		asort($amount);
@@ -484,10 +484,10 @@ if (count($amount)) {
 		// Third party
 		$fullname = $name[$key];
 		if ($key > 0) {
-		    $thirdparty_static->id = $key;
-		    $thirdparty_static->name = $fullname;
-		    $thirdparty_static->client = 1;
-		    $linkname = $thirdparty_static->getNomUrl(1, 'supplier');
+			$thirdparty_static->id = $key;
+			$thirdparty_static->name = $fullname;
+			$thirdparty_static->client = 1;
+			$linkname = $thirdparty_static->getNomUrl(1, 'supplier');
 		} else {
 			$linkname = $langs->trans("PaymentsNotLinkedToInvoice");
 		}
@@ -508,35 +508,35 @@ if (count($amount)) {
 		// Amount w/o VAT
 		print '<td class="right">';
 		if ($modecompta != 'CREANCES-DETTES') {
-            if ($key > 0) {
-                print '<a href="'.DOL_URL_ROOT.'/fourn/facture/paiement/list.php?socid='.$key.'">';
-		    } else {
-                print '<a href="'.DOL_URL_ROOT.'/fourn/facture/paiement/list.php?socid=-1">';
-            }
+			if ($key > 0) {
+				print '<a href="'.DOL_URL_ROOT.'/fourn/facture/paiement/list.php?socid='.$key.'">';
+			} else {
+				print '<a href="'.DOL_URL_ROOT.'/fourn/facture/paiement/list.php?socid=-1">';
+			}
 		} else {
-		    if ($key > 0) {
-                print '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$key.'">';
-		    } else {
-                print '<a href="#">';
-		    }
-            print price($amount_ht[$key]);
+			if ($key > 0) {
+				print '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$key.'">';
+			} else {
+				print '<a href="#">';
+			}
+			print price($amount_ht[$key]);
 		}
 		print '</td>';
 
 		// Amount with VAT
 		print '<td class="right">';
 		if ($modecompta != 'CREANCES-DETTES') {
-            if ($key > 0) {
-                print '<a href="'.DOL_URL_ROOT.'/fourn/facture/paiement/list.php?socid='.$key.'">';
-		    } else {
-                print '<a href="'.DOL_URL_ROOT.'/fourn/facture/paiement/list.php?orphelins=1">';
-		    }
+			if ($key > 0) {
+				print '<a href="'.DOL_URL_ROOT.'/fourn/facture/paiement/list.php?socid='.$key.'">';
+			} else {
+				print '<a href="'.DOL_URL_ROOT.'/fourn/facture/paiement/list.php?orphelins=1">';
+			}
 		} else {
-            if ($key > 0) {
-                print '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$key.'">';
-		    } else {
-                print '<a href="#">';
-		    }
+			if ($key > 0) {
+				print '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$key.'">';
+			} else {
+				print '<a href="#">';
+			}
 		}
 		print price($amount[$key]);
 		print '</a>';
@@ -545,21 +545,21 @@ if (count($amount)) {
 		// Percent;
 		print '<td class="right">'.($catotal > 0 ? round(100 * $amount[$key] / $catotal, 2).'%' : '&nbsp;').'</td>';
 
-        // Other stats
-        print '<td class="center">';
-        if (!empty($conf->supplier_proposal->enabled) && $key > 0) {
-            print '&nbsp;<a href="'.DOL_URL_ROOT.'/comm/propal/stats/index.php?socid='.$key.'">'.img_picto($langs->trans("ProposalStats"), "stats").'</a>&nbsp;';
-        }
-        if (!empty($conf->fournisseur->enabled) && $key > 0) {
-            print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/stats/index.php?mode=supplier&socid='.$key.'">'.img_picto($langs->trans("OrderStats"), "stats").'</a>&nbsp;';
-        }
-        if (!empty($conf->fournisseur->enabled) && $key > 0) {
-            print '&nbsp;<a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?mode=supplier&socid='.$key.'">'.img_picto($langs->trans("InvoiceStats"), "stats").'</a>&nbsp;';
-        }
-        print '</td>';
-        print "</tr>\n";
-        $i++;
-    }
+		// Other stats
+		print '<td class="center">';
+		if (!empty($conf->supplier_proposal->enabled) && $key > 0) {
+			print '&nbsp;<a href="'.DOL_URL_ROOT.'/comm/propal/stats/index.php?socid='.$key.'">'.img_picto($langs->trans("ProposalStats"), "stats").'</a>&nbsp;';
+		}
+		if (!empty($conf->fournisseur->enabled) && $key > 0) {
+			print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/stats/index.php?mode=supplier&socid='.$key.'">'.img_picto($langs->trans("OrderStats"), "stats").'</a>&nbsp;';
+		}
+		if (!empty($conf->fournisseur->enabled) && $key > 0) {
+			print '&nbsp;<a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?mode=supplier&socid='.$key.'">'.img_picto($langs->trans("InvoiceStats"), "stats").'</a>&nbsp;';
+		}
+		print '</td>';
+		print "</tr>\n";
+		$i++;
+	}
 
 	// Total
 	print '<tr class="liste_total">';
@@ -568,9 +568,9 @@ if (count($amount)) {
 	print '<td>&nbsp;</td>';
 	print '<td>&nbsp;</td>';
 	if ($modecompta != 'CREANCES-DETTES') {
-	    print '<td></td>';
+		print '<td></td>';
 	} else {
-	    print '<td class="right">'.price($catotal_ht).'</td>';
+		print '<td class="right">'.price($catotal_ht).'</td>';
 	}
 	print '<td class="right">'.price($catotal).'</td>';
 	print '<td>&nbsp;</td>';
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index 010fd112646..493f01ee53c 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -73,32 +73,32 @@ if ($action == 'setlib' && $user->rights->tax->charges->creer)
 
 if ($action == 'setdatev' && $user->rights->tax->charges->creer)
 {
-    $object->fetch($id);
-    $object->datev = $datev;
-    $result = $object->update($user);
-    if ($result < 0) dol_print_error($db, $object->error);
+	$object->fetch($id);
+	$object->datev = $datev;
+	$result = $object->update($user);
+	if ($result < 0) dol_print_error($db, $object->error);
 
-    $action = '';
+	$action = '';
 }
 
 if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 {
-    $error = 0;
+	$error = 0;
 
-    $object->accountid = GETPOST("accountid", 'int');
-    $object->type_payment = GETPOST("type_payment", 'alphanohtml');
+	$object->accountid = GETPOST("accountid", 'int');
+	$object->type_payment = GETPOST("type_payment", 'alphanohtml');
 	$object->num_payment = GETPOST("num_payment", 'alphanohtml');
 
 	$object->datev = $datev;
-    $object->datep = $datep;
+	$object->datep = $datep;
 
 	$amount = price2num(GETPOST("amount", 'alpha'));
 	if ($refund == 1) {
 		$amount = -$amount;
 	}
-    $object->amount = $amount;
+	$object->amount = $amount;
 	$object->label = GETPOST("label", 'alpha');
-	$object->note = GETPOST("note", 'restricthtml');
+	$object->note_private = GETPOST("note", 'restricthtml');
 
 	if (empty($object->datep))
 	{
@@ -125,7 +125,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 	{
 		$db->begin();
 
-    	$ret = $object->addPayment($user);
+		$ret = $object->addPayment($user);
 		if ($ret > 0)
 		{
 			$db->commit();
@@ -143,15 +143,15 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 
 if ($action == 'delete')
 {
-    $result = $object->fetch($id);
+	$result = $object->fetch($id);
 
 	if ($object->rappro == 0)
 	{
-	    $db->begin();
+		$db->begin();
 
-	    $ret = $object->delete($user);
-	    if ($ret > 0)
-	    {
+		$ret = $object->delete($user);
+		if ($ret > 0)
+		{
 			if ($object->fk_bank)
 			{
 				$accountline = new AccountLine($db);
@@ -169,10 +169,10 @@ if ($action == 'delete')
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-	    } else {
-	        $db->rollback();
-	        setEventMessages($object->error, $object->errors, 'errors');
-	    }
+		} else {
+			$db->rollback();
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	} else {
 		$mesg = 'Error try do delete a line linked to a conciliated bank transaction';
 		setEventMessages($mesg, null, 'errors');
@@ -207,9 +207,9 @@ if ($action == 'create')
 	print load_fiche_titre($langs->trans("VAT").' - '.$langs->trans("New"));
 
 	if (!empty($conf->use_javascript_ajax))
-    {
-        print "\n".'<script type="text/javascript" language="javascript">';
-        print '$(document).ready(function () {
+	{
+		print "\n".'<script type="text/javascript" language="javascript">';
+		print '$(document).ready(function () {
                 $("#radiopayment").click(function() {
                     $("#label").val($(this).data("label"));
 
@@ -222,40 +222,40 @@ if ($action == 'create')
 		print '</script>'."\n";
 	}
 
-    print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" name="formvat" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="add">';
+	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" name="formvat" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="add">';
 
-    print '<div id="selectmethod">';
-    print '<div class="hideonsmartphone float">';
-    print $langs->trans("Type").':&nbsp;&nbsp;&nbsp;';
-    print '</div>';
-    print '<label for="radiopayment">';
-    print '<input type="radio" id="radiopayment" data-label="'.$langs->trans('VATPayment').'" class="flat" name="refund" value="0"'.($refund ? '' : ' checked="checked"').'>';
-    print '&nbsp;';
-    print $langs->trans("Payment");
-    print '</label>';
-    print '&nbsp;&nbsp;&nbsp;';
-    print '<label for="radiorefund">';
-    print '<input type="radio" id="radiorefund" data-label="'.$langs->trans('VATRefund').'" class="flat" name="refund" value="1"'.($refund ? ' checked="checked"' : '').'>';
-    print '&nbsp;';
-    print $langs->trans("Refund");
-    print '</label>';
-    print '</div>';
-    print "<br>\n";
+	print '<div id="selectmethod">';
+	print '<div class="hideonsmartphone float">';
+	print $langs->trans("Type").':&nbsp;&nbsp;&nbsp;';
+	print '</div>';
+	print '<label for="radiopayment">';
+	print '<input type="radio" id="radiopayment" data-label="'.$langs->trans('VATPayment').'" class="flat" name="refund" value="0"'.($refund ? '' : ' checked="checked"').'>';
+	print '&nbsp;';
+	print $langs->trans("Payment");
+	print '</label>';
+	print '&nbsp;&nbsp;&nbsp;';
+	print '<label for="radiorefund">';
+	print '<input type="radio" id="radiorefund" data-label="'.$langs->trans('VATRefund').'" class="flat" name="refund" value="1"'.($refund ? ' checked="checked"' : '').'>';
+	print '&nbsp;';
+	print $langs->trans("PaymentBack");
+	print '</label>';
+	print '</div>';
+	print "<br>\n";
 
-    dol_fiche_head();
+	print dol_get_fiche_head();
 
-    print '<table class="border centpercent">';
+	print '<table class="border centpercent">';
 
-    print "<tr>";
-    print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
-    print $form->selectDate($datep, "datep", '', '', '', 'add', 1, 1);
-    print '</td></tr>';
+	print "<tr>";
+	print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
+	print $form->selectDate($datep, "datep", '', '', '', 'add', 1, 1);
+	print '</td></tr>';
 
-    print '<tr><td class="fieldrequired">'.$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")).'</td><td>';
-    print $form->selectDate((GETPOST("datevmonth", 'int') ? $datev : -1), "datev", '', '', '', 'add', 1, 1);
-    print '</td></tr>';
+	print '<tr><td class="fieldrequired">'.$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")).'</td><td>';
+	print $form->selectDate((GETPOST("datevmonth", 'int') ? $datev : -1), "datev", '', '', '', 'add', 1, 1);
+	print '</td></tr>';
 
 	// Label
 	if ($refund == 1) {
@@ -268,14 +268,14 @@ if ($action == 'create')
 	// Amount
 	print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.GETPOST("amount", "alpha").'"></td></tr>';
 
-    if (!empty($conf->banque->enabled))
-    {
+	if (!empty($conf->banque->enabled))
+	{
 		print '<tr><td class="fieldrequired">'.$langs->trans("BankAccount").'</td><td>';
 		$form->select_comptes(GETPOST("accountid", 'int'), "accountid", 0, "courant=1", 2); // List of bank account available
-        print '</td></tr>';
-    }
+		print '</td></tr>';
+	}
 
-    // Type payment
+	// Type payment
 	print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
 	$form->select_types_paiements(GETPOST("type_payment"), "type_payment");
 	print "</td>\n";
@@ -286,22 +286,22 @@ if ($action == 'create')
 	print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
 	print '<td><input name="num_payment" type="text" value="'.GETPOST("num_payment").'"></td></tr>'."\n";
 
-    // Other attributes
-    $parameters = array();
-    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
+	// Other attributes
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 
-    print '</table>';
+	print '</table>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+	print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-    print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
-    print '</form>';
+	print '</form>';
 }
 
 // View mode
@@ -309,7 +309,7 @@ if ($id)
 {
 	$head = vat_prepare_head($object);
 
-	dol_fiche_head($head, 'card', $langs->trans("VATPayment"), -1, 'payment');
+	print dol_get_fiche_head($head, 'card', $langs->trans("VATPayment"), -1, 'payment');
 
 	$morehtmlref = '<div class="refidno">';
 	// Label of social contribution
@@ -369,7 +369,7 @@ if ($id)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	/*
 	 * Action buttons
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index 5f661609e52..51cac4c7394 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -56,45 +56,50 @@ class Tva extends CommonObject
 	public $num_payment;
 
 	/**
-     * @var string label
-     */
-    public $label;
+	 * @var string label
+	 */
+	public $label;
 
-    /**
-     * @var int ID
-     */
+	/**
+	 * @var int ID
+	 */
 	public $fk_bank;
 
 	/**
-     * @var int ID
-     */
+	 * @var int accountid
+	 */
+	public $accountid;
+
+	/**
+	 * @var int ID
+	 */
 	public $fk_user_creat;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
-    /**
+	/**
 	 *	Constructor
 	 *
 	 *  @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *  Create in database
-     *
-     *  @param      User	$user       User that create
-     *  @return     int      			<0 if KO, >0 if OK
-     */
-    public function create($user)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Create in database
+	 *
+	 *  @param      User	$user       User that create
+	 *  @return     int      			<0 if KO, >0 if OK
+	 */
+	public function create($user)
+	{
+		global $conf, $langs;
 
 		$error = 0;
 		$now = dol_now();
@@ -123,7 +128,7 @@ class Tva extends CommonObject
 		$sql .= "fk_bank,";
 		$sql .= "fk_user_creat,";
 		$sql .= "fk_user_modif";
-        $sql .= ") VALUES (";
+		$sql .= ") VALUES (";
 		$sql .= " '".$this->db->idate($now)."',";
 		$sql .= " '".$this->db->idate($this->datep)."',";
 		$sql .= " '".$this->db->idate($this->datev)."',";
@@ -136,41 +141,41 @@ class Tva extends CommonObject
 		$sql .= ")";
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva");
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva");
 
-            // Call trigger
-            $result = $this->call_trigger('TVA_CREATE', $user);
-            if ($result < 0) $error++;
-            // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('TVA_CREATE', $user);
+			if ($result < 0) $error++;
+			// End call triggers
 
-            if (!$error)
-            {
-            	$this->db->commit();
-            	return $this->id;
-            } else {
+			if (!$error)
+			{
+				$this->db->commit();
+				return $this->id;
+			} else {
 				$this->db->rollback();
 				return -1;
-            }
-        } else {
+			}
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			$this->db->rollback();
 			return -1;
-        }
-    }
+		}
+	}
 
-    /**
-     * Update database
-     *
-     * @param   User	$user        	User that modify
-     * @param	int		$notrigger	    0=no, 1=yes (no update trigger)
-     * @return  int         			<0 if KO, >0 if OK
-     */
-    public function update($user, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 * Update database
+	 *
+	 * @param   User	$user        	User that modify
+	 * @param	int		$notrigger	    0=no, 1=yes (no update trigger)
+	 * @return  int         			<0 if KO, >0 if OK
+	 */
+	public function update($user, $notrigger = 0)
+	{
+		global $conf, $langs;
 
 		$error = 0;
 
@@ -188,7 +193,7 @@ class Tva extends CommonObject
 		$this->db->begin();
 
 		// Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."tva SET";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."tva SET";
 		$sql .= " tms='".$this->db->idate($this->tms)."',";
 		$sql .= " datep='".$this->db->idate($this->datep)."',";
 		$sql .= " datev='".$this->db->idate($this->datev)."',";
@@ -198,46 +203,46 @@ class Tva extends CommonObject
 		$sql .= " fk_bank=".$this->fk_bank.",";
 		$sql .= " fk_user_creat=".$this->fk_user_creat.",";
 		$sql .= " fk_user_modif=".($this->fk_user_modif > 0 ? $this->fk_user_modif : $user->id)."";
-        $sql .= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
-        dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql)
-        {
-            $this->error = "Error ".$this->db->lasterror();
-            $error++;
-        }
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql)
+		{
+			$this->error = "Error ".$this->db->lasterror();
+			$error++;
+		}
 
 		if (!$error && !$notrigger)
 		{
-            // Call trigger
-            $result = $this->call_trigger('TVA_MODIFY', $user);
-            if ($result < 0) $error++;
-            // End call triggers
-    	}
+			// Call trigger
+			$result = $this->call_trigger('TVA_MODIFY', $user);
+			if ($result < 0) $error++;
+			// End call triggers
+		}
 
-        if (!$error)
-    	{
-    		$this->db->commit();
-    		return 1;
-    	} else {
-    		$this->db->rollback();
-    		return -1;
-    	}
-    }
+		if (!$error)
+		{
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Load object in memory from database
-     *
-     *  @param	int		$id         id object
-     *  @param  User	$user       User that load
-     *  @return int         		<0 if KO, >0 if OK
-     */
-    public function fetch($id, $user = null)
-    {
-    	global $langs;
-        $sql = "SELECT";
+	/**
+	 *  Load object in memory from database
+	 *
+	 *  @param	int		$id         id object
+	 *  @param  User	$user       User that load
+	 *  @return int         		<0 if KO, >0 if OK
+	 */
+	public function fetch($id, $user = null)
+	{
+		global $langs;
+		$sql = "SELECT";
 		$sql .= " t.rowid,";
 
 		$sql .= " t.tms,";
@@ -255,20 +260,20 @@ class Tva extends CommonObject
 		$sql .= " b.fk_type,";
 		$sql .= " b.rappro";
 
-        $sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
+		$sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON t.fk_bank = b.rowid";
-        $sql .= " WHERE t.rowid = ".$id;
+		$sql .= " WHERE t.rowid = ".$id;
 
-    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id    = $obj->rowid;
-                $this->ref   = $obj->rowid;
+				$this->id    = $obj->rowid;
+				$this->ref   = $obj->rowid;
 				$this->tms   = $this->db->jdate($obj->tms);
 				$this->datep = $this->db->jdate($obj->datep);
 				$this->datev = $this->db->jdate($obj->datev);
@@ -283,23 +288,23 @@ class Tva extends CommonObject
 				$this->fk_account = $obj->fk_account;
 				$this->fk_type = $obj->fk_type;
 				$this->rappro  = $obj->rappro;
-            }
-            $this->db->free($resql);
+			}
+			$this->db->free($resql);
 
-            return 1;
-        } else {
-      	    $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+	  		$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
 
  	/**
-	 *  Delete object in database
-	 *
-     *	@param	User	$user       User that delete
-	 *	@return	int					<0 if KO, >0 if OK
-	 */
+ 	 *  Delete object in database
+ 	 *
+ 	 *	@param	User	$user       User that delete
+ 	 *	@return	int					<0 if KO, >0 if OK
+ 	 */
 	public function delete($user)
 	{
 		global $conf, $langs;
@@ -328,11 +333,11 @@ class Tva extends CommonObject
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
 	 */
 	public function initAsSpecimen()
 	{
@@ -350,154 +355,154 @@ class Tva extends CommonObject
 	}
 
 
-    /**
-     *  Balance of VAT
-     *
-     *	@param	int		$year		Year
-     *	@return	double				Amount
-     */
-    public function solde($year = 0)
-    {
+	/**
+	 *  Balance of VAT
+	 *
+	 *	@param	int		$year		Year
+	 *	@return	double				Amount
+	 */
+	public function solde($year = 0)
+	{
 
-        $reglee = $this->tva_sum_reglee($year);
+		$reglee = $this->tva_sum_reglee($year);
 
-        $payee = $this->tva_sum_payee($year);
-        $collectee = $this->tva_sum_collectee($year);
+		$payee = $this->tva_sum_payee($year);
+		$collectee = $this->tva_sum_collectee($year);
 
-        $solde = $reglee - ($collectee - $payee);
+		$solde = $reglee - ($collectee - $payee);
 
-        return $solde;
-    }
+		return $solde;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * 	Total of the VAT from invoices emitted by the thirdparty.
-     *
-     *	@param	int		$year		Year
-     *  @return	double				Amount
-     */
-    public function tva_sum_collectee($year = 0)
-    {
-        // phpcs:enable
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * 	Total of the VAT from invoices emitted by the thirdparty.
+	 *
+	 *	@param	int		$year		Year
+	 *  @return	double				Amount
+	 */
+	public function tva_sum_collectee($year = 0)
+	{
+		// phpcs:enable
 
-        $sql = "SELECT sum(f.tva) as amount";
-        $sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.paye = 1";
-        if ($year)
-        {
-        	$sql .= " AND f.datef >= '".$this->db->escape($year)."-01-01' AND f.datef <= '".$this->db->escape($year)."-12-31' ";
-        }
+		$sql = "SELECT sum(f.tva) as amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.paye = 1";
+		if ($year)
+		{
+			$sql .= " AND f.datef >= '".$this->db->escape($year)."-01-01' AND f.datef <= '".$this->db->escape($year)."-12-31' ";
+		}
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
 				$ret = $obj->amount;
-                $this->db->free($result);
-                return $ret;
-            } else {
-                $this->db->free($result);
+				$this->db->free($result);
+				return $ret;
+			} else {
+				$this->db->free($result);
 				return 0;
-            }
-        } else {
-            print $this->db->lasterror();
-            return -1;
-        }
-    }
+			}
+		} else {
+			print $this->db->lasterror();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * 	VAT payed
-     *
-     *	@param	int		$year		Year
-     *	@return	double				Amount
-     */
-    public function tva_sum_payee($year = 0)
-    {
-        // phpcs:enable
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * 	VAT payed
+	 *
+	 *	@param	int		$year		Year
+	 *	@return	double				Amount
+	 */
+	public function tva_sum_payee($year = 0)
+	{
+		// phpcs:enable
 
-        $sql = "SELECT sum(f.total_tva) as total_tva";
-        $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
-        if ($year)
-        {
-        	$sql .= " WHERE f.datef >= '".$this->db->escape($year)."-01-01' AND f.datef <= '".$this->db->escape($year)."-12-31' ";
-        }
+		$sql = "SELECT sum(f.total_tva) as total_tva";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+		if ($year)
+		{
+			$sql .= " WHERE f.datef >= '".$this->db->escape($year)."-01-01' AND f.datef <= '".$this->db->escape($year)."-12-31' ";
+		}
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
-                $ret = $obj->total_tva;
-            	$this->db->free($result);
-                return $ret;
-            } else {
-            	$this->db->free($result);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$ret = $obj->total_tva;
+				$this->db->free($result);
+				return $ret;
+			} else {
+				$this->db->free($result);
 				return 0;
-            }
-        } else {
-            print $this->db->lasterror();
-            return -1;
-        }
-    }
+			}
+		} else {
+			print $this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * 	Total of the VAT payed
-     *
-     *	@param	int		$year		Year
-     *	@return	double				Amount
-     */
-    public function tva_sum_reglee($year = 0)
-    {
-        // phpcs:enable
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * 	Total of the VAT payed
+	 *
+	 *	@param	int		$year		Year
+	 *	@return	double				Amount
+	 */
+	public function tva_sum_reglee($year = 0)
+	{
+		// phpcs:enable
 
-        $sql = "SELECT sum(f.amount) as amount";
-        $sql .= " FROM ".MAIN_DB_PREFIX."tva as f";
+		$sql = "SELECT sum(f.amount) as amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."tva as f";
 
-        if ($year)
-        {
-        	$sql .= " WHERE f.datev >= '".$this->db->escape($year)."-01-01' AND f.datev <= '".$this->db->escape($year)."-12-31' ";
-        }
+		if ($year)
+		{
+			$sql .= " WHERE f.datev >= '".$this->db->escape($year)."-01-01' AND f.datev <= '".$this->db->escape($year)."-12-31' ";
+		}
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
-                $ret = $obj->amount;
-            	$this->db->free($result);
-                return $ret;
-            } else {
-            	$this->db->free($result);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$ret = $obj->amount;
+				$this->db->free($result);
+				return $ret;
+			} else {
+				$this->db->free($result);
 				return 0;
-            }
-        } else {
-            print $this->db->lasterror();
-            return -1;
-        }
-    }
+			}
+		} else {
+			print $this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Create in database
-     *
+	/**
+	 *  Create in database
+	 *
 	 *	@param	User	$user		Object user that insert
 	 *	@return	int					<0 if KO, rowid in tva table if OK
-     */
-    public function addPayment($user)
-    {
-        global $conf, $langs;
+	 */
+	public function addPayment($user)
+	{
+		global $conf, $langs;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // Clean parameters
-        $this->amount = price2num(trim($this->amount));
-        $this->label = trim($this->label);
+		// Clean parameters
+		$this->amount = price2num(trim($this->amount));
+		$this->label = trim($this->label);
 		$this->note = trim($this->note);
 		$this->num_payment = trim($this->num_payment);
 		$this->fk_bank = (int) $this->fk_bank;
@@ -505,81 +510,81 @@ class Tva extends CommonObject
 		$this->fk_user_modif = (int) $this->fk_user_modif;
 		if (empty($this->datec)) $this->datec = dol_now();
 
-        // Check parameters
+		// Check parameters
 		if (!$this->label)
 		{
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
 			return -3;
 		}
-        if ($this->amount == '')
-        {
-            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
-            return -4;
-        }
-        if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
-        {
-            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
-            return -5;
-        }
-        if (!empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0))
-        {
-            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
-            return -5;
-        }
+		if ($this->amount == '')
+		{
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
+			return -4;
+		}
+		if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
+		{
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
+			return -5;
+		}
+		if (!empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0))
+		{
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
+			return -5;
+		}
 
-        // Insert into llx_tva
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."tva (";
-        $sql .= "datec";
-        $sql .= ", datep";
-        $sql .= ", datev";
+		// Insert into llx_tva
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."tva (";
+		$sql .= "datec";
+		$sql .= ", datep";
+		$sql .= ", datev";
 		$sql .= ", amount";
 		$sql .= ", fk_typepayment";
 		$sql .= ", num_payment";
 		if ($this->note)  $sql .= ", note";
-        if ($this->label) $sql .= ", label";
-        $sql .= ", fk_user_creat";
+		if ($this->label) $sql .= ", label";
+		$sql .= ", fk_user_creat";
 		$sql .= ", fk_bank";
 		$sql .= ", entity";
 		$sql .= ") ";
-        $sql .= " VALUES (";
-        $sql .= " '".$this->db->idate($this->datec)."'";
-        $sql .= ", '".$this->db->idate($this->datep)."'";
-        $sql .= ", '".$this->db->idate($this->datev)."'";
+		$sql .= " VALUES (";
+		$sql .= " '".$this->db->idate($this->datec)."'";
+		$sql .= ", '".$this->db->idate($this->datep)."'";
+		$sql .= ", '".$this->db->idate($this->datev)."'";
 		$sql .= ", ".$this->amount;
-        $sql .= ", '".$this->db->escape($this->type_payment)."'";
+		$sql .= ", '".$this->db->escape($this->type_payment)."'";
 		$sql .= ", '".$this->db->escape($this->num_payment)."'";
 		if ($this->note)  $sql .= ", '".$this->db->escape($this->note)."'";
-        if ($this->label) $sql .= ", '".$this->db->escape($this->label)."'";
-        $sql .= ", '".$this->db->escape($user->id)."'";
+		if ($this->label) $sql .= ", '".$this->db->escape($this->label)."'";
+		$sql .= ", '".$this->db->escape($user->id)."'";
 		$sql .= ", NULL";
 		$sql .= ", ".$conf->entity;
-        $sql .= ")";
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::addPayment", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva"); // TODO should be called 'payment_vat'
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva"); // TODO should be called 'payment_vat'
 
-            // Call trigger
-            //XXX: Should be done just befor commit no ?
-            $result = $this->call_trigger('TVA_ADDPAYMENT', $user);
-            if ($result < 0)
-            {
-            	$this->id = 0;
-            	$ok = 0;
-            }
-            // End call triggers
+			// Call trigger
+			//XXX: Should be done just befor commit no ?
+			$result = $this->call_trigger('TVA_ADDPAYMENT', $user);
+			if ($result < 0)
+			{
+				$this->id = 0;
+				$ok = 0;
+			}
+			// End call triggers
 
-            if ($this->id > 0)
-            {
-                $ok = 1;
+			if ($this->id > 0)
+			{
+				$ok = 1;
 				if (!empty($conf->banque->enabled) && !empty($this->amount))
-                {
-                    // Insert into llx_bank
-                    require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+				{
+					// Insert into llx_bank
+					require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-                    $acc = new Account($this->db);
+					$acc = new Account($this->db);
 					$result = $acc->fetch($this->accountid);
 					if ($result <= 0) dol_print_error($this->db);
 
@@ -589,23 +594,23 @@ class Tva extends CommonObject
 						$bank_line_id = $acc->addline($this->datep, $this->type_payment, $this->label, abs($this->amount), $this->num_payment, '', $user);
 					}
 
-                    // Update fk_bank into llx_tva. So we know vat line used to generate bank transaction
-                    if ($bank_line_id > 0)
+					// Update fk_bank into llx_tva. So we know vat line used to generate bank transaction
+					if ($bank_line_id > 0)
 					{
-                        $this->update_fk_bank($bank_line_id);
-                    } else {
+						$this->update_fk_bank($bank_line_id);
+					} else {
 						$this->error = $acc->error;
 						$ok = 0;
 					}
 
-                    // Update links
-                    $result = $acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/compta/tva/card.php?id=', "(VATPayment)", "payment_vat");
-                    if ($result < 0)
-                    {
-                    	$this->error = $acc->error;
-                    	$ok = 0;
-                    }
-	            }
+					// Update links
+					$result = $acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/compta/tva/card.php?id=', "(VATPayment)", "payment_vat");
+					if ($result < 0)
+					{
+						$this->error = $acc->error;
+						$ok = 0;
+					}
+				}
 
 				if ($ok)
 				{
@@ -615,27 +620,27 @@ class Tva extends CommonObject
 					$this->db->rollback();
 					return -3;
 				}
-            } else {
-                $this->db->rollback();
-                return -2;
-            }
-        } else {
-            $this->error = $this->db->error();
-            $this->db->rollback();
-            return -1;
-        }
-    }
+			} else {
+				$this->db->rollback();
+				return -2;
+			}
+		} else {
+			$this->error = $this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *  Update link between payment tva and line generate into llx_bank
-     *
-     *  @param	int		$id_bank    Id bank account
+	 *
+	 *  @param	int		$id_bank    Id bank account
 	 *	@return	int					<0 if KO, >0 if OK
-     */
+	 */
 	public function update_fk_bank($id_bank)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'tva SET fk_bank = '.(int) $id_bank;
 		$sql .= ' WHERE rowid = '.(int) $this->id;
 		$result = $this->db->query($sql);
@@ -653,8 +658,8 @@ class Tva extends CommonObject
 	 *
 	 *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
 	 *	@param	string	$option			link option
-     *  @param	int  	$notooltip		1=Disable tooltip
-     *  @param	string	$morecss			More CSS
+	 *  @param	int  	$notooltip		1=Disable tooltip
+	 *  @param	string	$morecss			More CSS
 	 *	@return	string					Chaine with URL
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '')
@@ -669,23 +674,23 @@ class Tva extends CommonObject
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-        $url = DOL_URL_ROOT.'/compta/tva/card.php?id='.$this->id;
+		$url = DOL_URL_ROOT.'/compta/tva/card.php?id='.$this->id;
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-        	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-        	{
-        		$label = $langs->trans("ShowMyObject");
-        		$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-        	}
-        	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-        	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowMyObject");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart .= $linkclose.'>';
-        $linkend = '</a>';
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
 		$picto = 'payment';
 
@@ -698,34 +703,34 @@ class Tva extends CommonObject
 	}
 
 	/**
-     * 	Return amount of payments already done
-     *
-     *	@return		int		Amount of payment already done, <0 if KO
-     */
-    public function getSommePaiement()
-    {
-        $table = 'paiementcharge';
-        $field = 'fk_charge';
+	 * 	Return amount of payments already done
+	 *
+	 *	@return		int		Amount of payment already done, <0 if KO
+	 */
+	public function getSommePaiement()
+	{
+		$table = 'paiementcharge';
+		$field = 'fk_charge';
 
-        $sql = 'SELECT sum(amount) as amount';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.$table;
-        $sql .= ' WHERE '.$field.' = '.$this->id;
+		$sql = 'SELECT sum(amount) as amount';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$table;
+		$sql .= ' WHERE '.$field.' = '.$this->id;
 
-        dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $amount = 0;
+		dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$amount = 0;
 
-            $obj = $this->db->fetch_object($resql);
-            if ($obj) $amount = $obj->amount ? $obj->amount : 0;
+			$obj = $this->db->fetch_object($resql);
+			if ($obj) $amount = $obj->amount ? $obj->amount : 0;
 
-            $this->db->free($resql);
-            return $amount;
-        } else {
-            return -1;
-        }
-    }
+			$this->db->free($resql);
+			return $amount;
+		} else {
+			return -1;
+		}
+	}
 
 	/**
 	 *	Informations of vat payment object
@@ -780,10 +785,10 @@ class Tva extends CommonObject
 	 */
 	public function getLibStatut($mode = 0)
 	{
-	    return $this->LibStatut($this->statut, $mode);
+		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Renvoi le libelle d'un statut donne
 	 *
@@ -791,11 +796,11 @@ class Tva extends CommonObject
 	 * @param   int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 * @return	string  		    Libelle du statut
 	 */
-    public function LibStatut($status, $mode = 0)
-    {
-        // phpcs:enable
-        global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage
 
-        return '';
-    }
+		return '';
+	}
 }
diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index a91d637c39d..d4acecf063d 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -53,10 +53,10 @@ $year = GETPOST("year", "int");
 if (empty($year))
 {
 	$year_current = $current_date['year'];
-    $year_start = $year_current;
+	$year_start = $year_current;
 } else {
-    $year_current = $year;
-    $year_start = $year;
+	$year_current = $year;
+	$year_start = $year;
 }
 $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
 $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
@@ -64,35 +64,35 @@ $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endda
 if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 {
 	$q = GETPOST("q", "int");
-    if (empty($q))
-    {
-        if (GETPOST("month", 'int')) { $date_start = dol_get_first_day($year_start, GETPOST("month", 'int'), false); $date_end = dol_get_last_day($year_start, GETPOST("month", 'int'), false); } else {
-            if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) { // quaterly vat, we take last past complete quarter
-            	$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -3 - (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) % 3), 'm');
-            	$date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
-            } elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
-            	if ($current_date['mon'] < $conf->global->SOCIETE_FISCAL_MONTH_START) {
-            		if (($conf->global->SOCIETE_FISCAL_MONTH_START - $current_date['mon']) > 6) {	// If period started from less than 6 years, we show past year
-            			$year_start--;
-            		}
-            	} else {
-            		if (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) < 6) {	// If perdio started from less than 6 years, we show past year
-            			$year_start--;
-            		}
-            	}
-            	$date_start = dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START, false);
-            	$date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
-            } elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) {	// monthly vat, we take last past complete month
-            	$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -1, 'm');
-            	$date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
-            }
-        }
-    } else {
-        if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
-        if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
-        if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
-        if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
-    }
+	if (empty($q))
+	{
+		if (GETPOST("month", 'int')) { $date_start = dol_get_first_day($year_start, GETPOST("month", 'int'), false); $date_end = dol_get_last_day($year_start, GETPOST("month", 'int'), false); } else {
+			if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) { // quaterly vat, we take last past complete quarter
+				$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -3 - (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) % 3), 'm');
+				$date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
+			} elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
+				if ($current_date['mon'] < $conf->global->SOCIETE_FISCAL_MONTH_START) {
+					if (($conf->global->SOCIETE_FISCAL_MONTH_START - $current_date['mon']) > 6) {	// If period started from less than 6 years, we show past year
+						$year_start--;
+					}
+				} else {
+					if (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) < 6) {	// If perdio started from less than 6 years, we show past year
+						$year_start--;
+					}
+				}
+				$date_start = dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START, false);
+				$date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
+			} elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) {	// monthly vat, we take last past complete month
+				$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -1, 'm');
+				$date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
+			}
+		}
+	} else {
+		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
+		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
+		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
+		if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
+	}
 }
 
 $min = price2num(GETPOST("min", "alpha"));
@@ -130,12 +130,12 @@ $morequerystring = '';
 $listofparams = array('date_startmonth', 'date_startyear', 'date_startday', 'date_endmonth', 'date_endyear', 'date_endday');
 foreach ($listofparams as $param)
 {
-    if (GETPOST($param) != '') $morequerystring .= ($morequerystring ? '&' : '').$param.'='.GETPOST($param);
+	if (GETPOST($param) != '') $morequerystring .= ($morequerystring ? '&' : '').$param.'='.GETPOST($param);
 }
 
 $special_report = false;
 if (isset($_REQUEST['extra_report']) && $_REQUEST['extra_report'] == 1) {
-    $special_report = true;
+	$special_report = true;
 }
 
 llxHeader('', $langs->trans("VATReport"), '', '', 0, 0, '', '', $morequerystring);
@@ -158,18 +158,18 @@ $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.
 $prevyear = $year_start;
 $prevquarter = $q;
 if ($prevquarter > 1) {
-    $prevquarter--;
+	$prevquarter--;
 } else {
-    $prevquarter = 4;
-    $prevyear--;
+	$prevquarter = 4;
+	$prevyear--;
 }
 $nextyear = $year_start;
 $nextquarter = $q;
 if ($nextquarter < 4) {
-    $nextquarter++;
+	$nextquarter++;
 } else {
-    $nextquarter = 1;
-    $nextyear++;
+	$nextquarter = 1;
+	$nextyear++;
 }
 $builddate = dol_now();
 
@@ -178,7 +178,7 @@ if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment') $description .= $langs->t
 if ($conf->global->TAX_MODE_SELL_SERVICE == 'invoice') $description .= '<br>'.$langs->trans("RulesVATDueServices");
 if ($conf->global->TAX_MODE_SELL_SERVICE == 'payment') $description .= '<br>'.$langs->trans("RulesVATInServices");
 if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-    $description .= '<br>'.$langs->trans("DepositsAreNotIncluded");
+	$description .= '<br>'.$langs->trans("DepositsAreNotIncluded");
 }
 if (!empty($conf->global->MAIN_MODULE_ACCOUNTING)) $description .= '<br>'.$langs->trans("ThisIsAnEstimatedValue");
 
@@ -186,15 +186,15 @@ if (!empty($conf->global->MAIN_MODULE_ACCOUNTING)) $description .= '<br>'.$langs
 $description .= ($description ? '<br>' : '').$fsearch;
 if (!empty($conf->global->TAX_REPORT_EXTRA_REPORT))
 {
-    $description .= '<br>';
-    $description .= '<input type="radio" name="extra_report" value="0" '.($special_report ? '' : 'checked="checked"').'> ';
-    $description .= $langs->trans('SimpleReport');
-    $description .= '</input>';
-    $description .= '<br>';
-    $description .= '<input type="radio" name="extra_report" value="1" '.($special_report ? 'checked="checked"' : '').'> ';
-    $description .= $langs->trans('AddExtraReport');
-    $description .= '</input>';
-    $description .= '<br>';
+	$description .= '<br>';
+	$description .= '<input type="radio" name="extra_report" value="0" '.($special_report ? '' : 'checked="checked"').'> ';
+	$description .= $langs->trans('SimpleReport');
+	$description .= '</input>';
+	$description .= '<br>';
+	$description .= '<input type="radio" name="extra_report" value="1" '.($special_report ? 'checked="checked"' : '').'> ';
+	$description .= $langs->trans('AddExtraReport');
+	$description .= '</input>';
+	$description .= '<br>';
 }
 
 $elementcust = $langs->trans("CustomersInvoices");
@@ -202,13 +202,13 @@ $productcust = $langs->trans("Description");
 $namerate = $langs->trans("VATRate");
 $amountcust = $langs->trans("AmountHT");
 if ($mysoc->tva_assuj) {
-    $vatcust .= ' ('.$langs->trans("StatusToPay").')';
+	$vatcust .= ' ('.$langs->trans("StatusToPay").')';
 }
 $elementsup = $langs->trans("SuppliersInvoices");
 $productsup = $langs->trans("Description");
 $amountsup = $langs->trans("AmountHT");
 if ($mysoc->tva_assuj) {
-    $vatsup .= ' ('.$langs->trans("ToGetBack").')';
+	$vatsup .= ' ('.$langs->trans("ToGetBack").')';
 }
 report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink, array(), $calcmode);
 
@@ -231,529 +231,529 @@ $x_paye = tax_by_thirdparty('vat', $db, 0, $date_start, $date_end, $modetax, 'bu
 
 if (!is_array($x_coll) || !is_array($x_paye))
 {
-    $langs->load("errors");
-    if ($x_coll == -1) {
-        print '<tr><td colspan="'.$columns.'">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
-    } elseif ($x_coll == -2) {
-        print '<tr><td colspan="'.$columns.'">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
-    } else {
-        print '<tr><td colspan="'.$columns.'">'.$langs->trans("Error").'</td></tr>';
-    }
+	$langs->load("errors");
+	if ($x_coll == -1) {
+		print '<tr><td colspan="'.$columns.'">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
+	} elseif ($x_coll == -2) {
+		print '<tr><td colspan="'.$columns.'">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
+	} else {
+		print '<tr><td colspan="'.$columns.'">'.$langs->trans("Error").'</td></tr>';
+	}
 } else {
-    $x_both = array();
-    //now, from these two arrays, get another array with one rate per line
-    foreach (array_keys($x_coll) as $my_coll_thirdpartyid)
-    {
-        $x_both[$my_coll_thirdpartyid]['coll']['totalht'] = $x_coll[$my_coll_thirdpartyid]['totalht'];
-        $x_both[$my_coll_thirdpartyid]['coll']['vat'] = $x_coll[$my_coll_thirdpartyid]['vat'];
-        $x_both[$my_coll_thirdpartyid]['paye']['totalht'] = 0;
-        $x_both[$my_coll_thirdpartyid]['paye']['vat'] = 0;
-        $x_both[$my_coll_thirdpartyid]['coll']['links'] = '';
-        $x_both[$my_coll_thirdpartyid]['coll']['detail'] = array();
-        foreach ($x_coll[$my_coll_thirdpartyid]['facid'] as $id=>$dummy) {
-            $invoice_customer->id = $x_coll[$my_coll_thirdpartyid]['facid'][$id];
-            $invoice_customer->ref = $x_coll[$my_coll_thirdpartyid]['facnum'][$id];
-            $invoice_customer->type = $x_coll[$my_coll_thirdpartyid]['type'][$id];
-            $company_static->fetch($x_coll[$my_coll_thirdpartyid]['company_id'][$id]);
-            $x_both[$my_coll_thirdpartyid]['coll']['detail'][] = array(
-                'id'        =>$x_coll[$my_coll_thirdpartyid]['facid'][$id],
-                'descr'     =>$x_coll[$my_coll_thirdpartyid]['descr'][$id],
-                'pid'       =>$x_coll[$my_coll_thirdpartyid]['pid'][$id],
-                'pref'      =>$x_coll[$my_coll_thirdpartyid]['pref'][$id],
-                'ptype'     =>$x_coll[$my_coll_thirdpartyid]['ptype'][$id],
-                'payment_id'=>$x_coll[$my_coll_thirdpartyid]['payment_id'][$id],
-                'payment_amount'=>$x_coll[$my_coll_thirdpartyid]['payment_amount'][$id],
-                'ftotal_ttc'=>$x_coll[$my_coll_thirdpartyid]['ftotal_ttc'][$id],
-                'dtotal_ttc'=>$x_coll[$my_coll_thirdpartyid]['dtotal_ttc'][$id],
-                'dtype'     =>$x_coll[$my_coll_thirdpartyid]['dtype'][$id],
-                'drate'     =>$x_coll[$my_coll_thirdpartyid]['drate'][$id],
-                'datef'     =>$x_coll[$my_coll_thirdpartyid]['datef'][$id],
-                'datep'     =>$x_coll[$my_coll_thirdpartyid]['datep'][$id],
-                'company_link'=>$company_static->getNomUrl(1, '', 20),
-                'ddate_start'=>$x_coll[$my_coll_thirdpartyid]['ddate_start'][$id],
-                'ddate_end'  =>$x_coll[$my_coll_thirdpartyid]['ddate_end'][$id],
-                'totalht'   =>$x_coll[$my_coll_thirdpartyid]['totalht_list'][$id],
-                'vat'       =>$x_coll[$my_coll_thirdpartyid]['vat_list'][$id],
-                'link'      =>$invoice_customer->getNomUrl(1, '', 12)
-            );
-        }
-    }
-    // tva paid
-    foreach (array_keys($x_paye) as $my_paye_thirdpartyid) {
-        $x_both[$my_paye_thirdpartyid]['paye']['totalht'] = $x_paye[$my_paye_thirdpartyid]['totalht'];
-        $x_both[$my_paye_thirdpartyid]['paye']['vat'] = $x_paye[$my_paye_thirdpartyid]['vat'];
-        if (!isset($x_both[$my_paye_thirdpartyid]['coll']['totalht'])) {
-            $x_both[$my_paye_thirdpartyid]['coll']['totalht'] = 0;
-            $x_both[$my_paye_thirdpartyid]['coll']['vat'] = 0;
-        }
-        $x_both[$my_paye_thirdpartyid]['paye']['links'] = '';
-        $x_both[$my_paye_thirdpartyid]['paye']['detail'] = array();
+	$x_both = array();
+	//now, from these two arrays, get another array with one rate per line
+	foreach (array_keys($x_coll) as $my_coll_thirdpartyid)
+	{
+		$x_both[$my_coll_thirdpartyid]['coll']['totalht'] = $x_coll[$my_coll_thirdpartyid]['totalht'];
+		$x_both[$my_coll_thirdpartyid]['coll']['vat'] = $x_coll[$my_coll_thirdpartyid]['vat'];
+		$x_both[$my_coll_thirdpartyid]['paye']['totalht'] = 0;
+		$x_both[$my_coll_thirdpartyid]['paye']['vat'] = 0;
+		$x_both[$my_coll_thirdpartyid]['coll']['links'] = '';
+		$x_both[$my_coll_thirdpartyid]['coll']['detail'] = array();
+		foreach ($x_coll[$my_coll_thirdpartyid]['facid'] as $id=>$dummy) {
+			$invoice_customer->id = $x_coll[$my_coll_thirdpartyid]['facid'][$id];
+			$invoice_customer->ref = $x_coll[$my_coll_thirdpartyid]['facnum'][$id];
+			$invoice_customer->type = $x_coll[$my_coll_thirdpartyid]['type'][$id];
+			$company_static->fetch($x_coll[$my_coll_thirdpartyid]['company_id'][$id]);
+			$x_both[$my_coll_thirdpartyid]['coll']['detail'][] = array(
+				'id'        =>$x_coll[$my_coll_thirdpartyid]['facid'][$id],
+				'descr'     =>$x_coll[$my_coll_thirdpartyid]['descr'][$id],
+				'pid'       =>$x_coll[$my_coll_thirdpartyid]['pid'][$id],
+				'pref'      =>$x_coll[$my_coll_thirdpartyid]['pref'][$id],
+				'ptype'     =>$x_coll[$my_coll_thirdpartyid]['ptype'][$id],
+				'payment_id'=>$x_coll[$my_coll_thirdpartyid]['payment_id'][$id],
+				'payment_amount'=>$x_coll[$my_coll_thirdpartyid]['payment_amount'][$id],
+				'ftotal_ttc'=>$x_coll[$my_coll_thirdpartyid]['ftotal_ttc'][$id],
+				'dtotal_ttc'=>$x_coll[$my_coll_thirdpartyid]['dtotal_ttc'][$id],
+				'dtype'     =>$x_coll[$my_coll_thirdpartyid]['dtype'][$id],
+				'drate'     =>$x_coll[$my_coll_thirdpartyid]['drate'][$id],
+				'datef'     =>$x_coll[$my_coll_thirdpartyid]['datef'][$id],
+				'datep'     =>$x_coll[$my_coll_thirdpartyid]['datep'][$id],
+				'company_link'=>$company_static->getNomUrl(1, '', 20),
+				'ddate_start'=>$x_coll[$my_coll_thirdpartyid]['ddate_start'][$id],
+				'ddate_end'  =>$x_coll[$my_coll_thirdpartyid]['ddate_end'][$id],
+				'totalht'   =>$x_coll[$my_coll_thirdpartyid]['totalht_list'][$id],
+				'vat'       =>$x_coll[$my_coll_thirdpartyid]['vat_list'][$id],
+				'link'      =>$invoice_customer->getNomUrl(1, '', 12)
+			);
+		}
+	}
+	// tva paid
+	foreach (array_keys($x_paye) as $my_paye_thirdpartyid) {
+		$x_both[$my_paye_thirdpartyid]['paye']['totalht'] = $x_paye[$my_paye_thirdpartyid]['totalht'];
+		$x_both[$my_paye_thirdpartyid]['paye']['vat'] = $x_paye[$my_paye_thirdpartyid]['vat'];
+		if (!isset($x_both[$my_paye_thirdpartyid]['coll']['totalht'])) {
+			$x_both[$my_paye_thirdpartyid]['coll']['totalht'] = 0;
+			$x_both[$my_paye_thirdpartyid]['coll']['vat'] = 0;
+		}
+		$x_both[$my_paye_thirdpartyid]['paye']['links'] = '';
+		$x_both[$my_paye_thirdpartyid]['paye']['detail'] = array();
 
-        foreach ($x_paye[$my_paye_thirdpartyid]['facid'] as $id=>$dummy)
-        {
-            // ExpenseReport
-            if ($x_paye[$my_paye_thirdpartyid]['ptype'][$id] == 'ExpenseReportPayment')
-            {
-                $expensereport->id = $x_paye[$my_paye_thirdpartyid]['facid'][$id];
-                $expensereport->ref = $x_paye[$my_paye_thirdpartyid]['facnum'][$id];
-                $expensereport->type = $x_paye[$my_paye_thirdpartyid]['type'][$id];
+		foreach ($x_paye[$my_paye_thirdpartyid]['facid'] as $id=>$dummy)
+		{
+			// ExpenseReport
+			if ($x_paye[$my_paye_thirdpartyid]['ptype'][$id] == 'ExpenseReportPayment')
+			{
+				$expensereport->id = $x_paye[$my_paye_thirdpartyid]['facid'][$id];
+				$expensereport->ref = $x_paye[$my_paye_thirdpartyid]['facnum'][$id];
+				$expensereport->type = $x_paye[$my_paye_thirdpartyid]['type'][$id];
 
-                $x_both[$my_paye_thirdpartyid]['paye']['detail'][] = array(
-                    'id'				=>$x_paye[$my_paye_thirdpartyid]['facid'][$id],
-                    'descr'				=>$x_paye[$my_paye_thirdpartyid]['descr'][$id],
-                    'pid'				=>$x_paye[$my_paye_thirdpartyid]['pid'][$id],
-                    'pref'				=>$x_paye[$my_paye_thirdpartyid]['pref'][$id],
-                    'ptype'				=>$x_paye[$my_paye_thirdpartyid]['ptype'][$id],
-                    'payment_id'		=>$x_paye[$my_paye_thirdpartyid]['payment_id'][$id],
-                    'payment_amount'	=>$x_paye[$my_paye_thirdpartyid]['payment_amount'][$id],
-                    'ftotal_ttc'		=>price2num($x_paye[$my_paye_thirdpartyid]['ftotal_ttc'][$id]),
-                    'dtotal_ttc'		=>price2num($x_paye[$my_paye_thirdpartyid]['dtotal_ttc'][$id]),
-                    'dtype'				=>$x_paye[$my_paye_thirdpartyid]['dtype'][$id],
-                    'drate'             =>$x_paye[$my_coll_thirdpartyid]['drate'][$id],
-                    'ddate_start'		=>$x_paye[$my_paye_thirdpartyid]['ddate_start'][$id],
-                    'ddate_end'			=>$x_paye[$my_paye_thirdpartyid]['ddate_end'][$id],
-                    'totalht'			=>price2num($x_paye[$my_paye_thirdpartyid]['totalht_list'][$id]),
-                    'vat'				=>$x_paye[$my_paye_thirdpartyid]['vat_list'][$id],
-                    'link'				=>$expensereport->getNomUrl(1)
-                );
-            } else {
-                $invoice_supplier->id = $x_paye[$my_paye_thirdpartyid]['facid'][$id];
-                $invoice_supplier->ref = $x_paye[$my_paye_thirdpartyid]['facnum'][$id];
-                $invoice_supplier->type = $x_paye[$my_paye_thirdpartyid]['type'][$id];
-                $company_static->fetch($x_paye[$my_paye_thirdpartyid]['company_id'][$id]);
-                $x_both[$my_paye_thirdpartyid]['paye']['detail'][] = array(
-                    'id'        =>$x_paye[$my_paye_thirdpartyid]['facid'][$id],
-                    'descr'     =>$x_paye[$my_paye_thirdpartyid]['descr'][$id],
-                    'pid'       =>$x_paye[$my_paye_thirdpartyid]['pid'][$id],
-                    'pref'      =>$x_paye[$my_paye_thirdpartyid]['pref'][$id],
-                    'ptype'     =>$x_paye[$my_paye_thirdpartyid]['ptype'][$id],
-                    'payment_id'=>$x_paye[$my_paye_thirdpartyid]['payment_id'][$id],
-                    'payment_amount'=>$x_paye[$my_paye_thirdpartyid]['payment_amount'][$id],
-                    'ftotal_ttc'=>price2num($x_paye[$my_paye_thirdpartyid]['ftotal_ttc'][$id]),
-                    'dtotal_ttc'=>price2num($x_paye[$my_paye_thirdpartyid]['dtotal_ttc'][$id]),
-                    'dtype'     =>$x_paye[$my_paye_thirdpartyid]['dtype'][$id],
-                    'drate'     =>$x_paye[$my_coll_thirdpartyid]['drate'][$id],
-                    'datef'     =>$x_paye[$my_paye_thirdpartyid]['datef'][$id],
-                    'datep'     =>$x_paye[$my_paye_thirdpartyid]['datep'][$id],
-                    'company_link'=>$company_static->getNomUrl(1, '', 20),
-                    'ddate_start'=>$x_paye[$my_paye_thirdpartyid]['ddate_start'][$id],
-                    'ddate_end'  =>$x_paye[$my_paye_thirdpartyid]['ddate_end'][$id],
-                    'totalht'   =>price2num($x_paye[$my_paye_thirdpartyid]['totalht_list'][$id]),
-                    'vat'       =>$x_paye[$my_paye_thirdpartyid]['vat_list'][$id],
-                    'link'      =>$invoice_supplier->getNomUrl(1, '', 12)
-                );
-            }
-        }
-    }
-    //now we have an array (x_both) indexed by rates for coll and paye
+				$x_both[$my_paye_thirdpartyid]['paye']['detail'][] = array(
+					'id'				=>$x_paye[$my_paye_thirdpartyid]['facid'][$id],
+					'descr'				=>$x_paye[$my_paye_thirdpartyid]['descr'][$id],
+					'pid'				=>$x_paye[$my_paye_thirdpartyid]['pid'][$id],
+					'pref'				=>$x_paye[$my_paye_thirdpartyid]['pref'][$id],
+					'ptype'				=>$x_paye[$my_paye_thirdpartyid]['ptype'][$id],
+					'payment_id'		=>$x_paye[$my_paye_thirdpartyid]['payment_id'][$id],
+					'payment_amount'	=>$x_paye[$my_paye_thirdpartyid]['payment_amount'][$id],
+					'ftotal_ttc'		=>price2num($x_paye[$my_paye_thirdpartyid]['ftotal_ttc'][$id]),
+					'dtotal_ttc'		=>price2num($x_paye[$my_paye_thirdpartyid]['dtotal_ttc'][$id]),
+					'dtype'				=>$x_paye[$my_paye_thirdpartyid]['dtype'][$id],
+					'drate'             =>$x_paye[$my_coll_thirdpartyid]['drate'][$id],
+					'ddate_start'		=>$x_paye[$my_paye_thirdpartyid]['ddate_start'][$id],
+					'ddate_end'			=>$x_paye[$my_paye_thirdpartyid]['ddate_end'][$id],
+					'totalht'			=>price2num($x_paye[$my_paye_thirdpartyid]['totalht_list'][$id]),
+					'vat'				=>$x_paye[$my_paye_thirdpartyid]['vat_list'][$id],
+					'link'				=>$expensereport->getNomUrl(1)
+				);
+			} else {
+				$invoice_supplier->id = $x_paye[$my_paye_thirdpartyid]['facid'][$id];
+				$invoice_supplier->ref = $x_paye[$my_paye_thirdpartyid]['facnum'][$id];
+				$invoice_supplier->type = $x_paye[$my_paye_thirdpartyid]['type'][$id];
+				$company_static->fetch($x_paye[$my_paye_thirdpartyid]['company_id'][$id]);
+				$x_both[$my_paye_thirdpartyid]['paye']['detail'][] = array(
+					'id'        =>$x_paye[$my_paye_thirdpartyid]['facid'][$id],
+					'descr'     =>$x_paye[$my_paye_thirdpartyid]['descr'][$id],
+					'pid'       =>$x_paye[$my_paye_thirdpartyid]['pid'][$id],
+					'pref'      =>$x_paye[$my_paye_thirdpartyid]['pref'][$id],
+					'ptype'     =>$x_paye[$my_paye_thirdpartyid]['ptype'][$id],
+					'payment_id'=>$x_paye[$my_paye_thirdpartyid]['payment_id'][$id],
+					'payment_amount'=>$x_paye[$my_paye_thirdpartyid]['payment_amount'][$id],
+					'ftotal_ttc'=>price2num($x_paye[$my_paye_thirdpartyid]['ftotal_ttc'][$id]),
+					'dtotal_ttc'=>price2num($x_paye[$my_paye_thirdpartyid]['dtotal_ttc'][$id]),
+					'dtype'     =>$x_paye[$my_paye_thirdpartyid]['dtype'][$id],
+					'drate'     =>$x_paye[$my_coll_thirdpartyid]['drate'][$id],
+					'datef'     =>$x_paye[$my_paye_thirdpartyid]['datef'][$id],
+					'datep'     =>$x_paye[$my_paye_thirdpartyid]['datep'][$id],
+					'company_link'=>$company_static->getNomUrl(1, '', 20),
+					'ddate_start'=>$x_paye[$my_paye_thirdpartyid]['ddate_start'][$id],
+					'ddate_end'  =>$x_paye[$my_paye_thirdpartyid]['ddate_end'][$id],
+					'totalht'   =>price2num($x_paye[$my_paye_thirdpartyid]['totalht_list'][$id]),
+					'vat'       =>$x_paye[$my_paye_thirdpartyid]['vat_list'][$id],
+					'link'      =>$invoice_supplier->getNomUrl(1, '', 12)
+				);
+			}
+		}
+	}
+	//now we have an array (x_both) indexed by rates for coll and paye
 
 
-    //print table headers for this quadri - incomes first
+	//print table headers for this quadri - incomes first
 
-    $x_coll_sum = 0;
-    $x_coll_ht = 0;
-    $x_paye_sum = 0;
-    $x_paye_ht = 0;
+	$x_coll_sum = 0;
+	$x_coll_ht = 0;
+	$x_paye_sum = 0;
+	$x_paye_ht = 0;
 
-    $span = $columns;
-    if ($modetax != 1) $span += 2;
+	$span = $columns;
+	if ($modetax != 1) $span += 2;
 
-    //print '<tr><td colspan="'.($span+1).'">'..')</td></tr>';
+	//print '<tr><td colspan="'.($span+1).'">'..')</td></tr>';
 
-    // Customers invoices
-    print '<tr class="liste_titre">';
-    print '<td class="left">'.$elementcust.'</td>';
-    print '<td class="left">'.$langs->trans("DateInvoice").'</td>';
-    if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td class="left">'.$langs->trans("DatePayment").'</td>';
-    else print '<td></td>';
-    print '<td class="right">'.$namerate.'</td>';
-    print '<td class="left">'.$productcust.'</td>';
-    if ($modetax != 1)
-    {
-        print '<td class="right">'.$amountcust.'</td>';
-        print '<td class="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
-    }
-    print '<td class="right">'.$langs->trans("AmountHTVATRealReceived").'</td>';
-    print '<td class="right">'.$vatcust.'</td>';
-    print '</tr>';
+	// Customers invoices
+	print '<tr class="liste_titre">';
+	print '<td class="left">'.$elementcust.'</td>';
+	print '<td class="left">'.$langs->trans("DateInvoice").'</td>';
+	if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td class="left">'.$langs->trans("DatePayment").'</td>';
+	else print '<td></td>';
+	print '<td class="right">'.$namerate.'</td>';
+	print '<td class="left">'.$productcust.'</td>';
+	if ($modetax != 1)
+	{
+		print '<td class="right">'.$amountcust.'</td>';
+		print '<td class="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
+	}
+	print '<td class="right">'.$langs->trans("AmountHTVATRealReceived").'</td>';
+	print '<td class="right">'.$vatcust.'</td>';
+	print '</tr>';
 
-    $action = "tvadetail";
-    $parameters["mode"] = $modetax;
-    $parameters["start"] = $date_start;
-    $parameters["end"] = $date_end;
-    $parameters["type"] = 'vat';
+	$action = "tvadetail";
+	$parameters["mode"] = $modetax;
+	$parameters["start"] = $date_start;
+	$parameters["end"] = $date_end;
+	$parameters["type"] = 'vat';
 
-    $object = array(&$x_coll, &$x_paye, &$x_both);
-    // Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
-    $hookmanager->initHooks(array('externalbalance'));
-    $reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+	$object = array(&$x_coll, &$x_paye, &$x_both);
+	// Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
+	$hookmanager->initHooks(array('externalbalance'));
+	$reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-    foreach (array_keys($x_coll) as $thirdparty_id) {
-        $subtot_coll_total_ht = 0;
-        $subtot_coll_vat = 0;
+	foreach (array_keys($x_coll) as $thirdparty_id) {
+		$subtot_coll_total_ht = 0;
+		$subtot_coll_vat = 0;
 
-        if ($min == 0 || ($min > 0 && $x_both[$thirdparty_id]['coll']['totalht'] > $min))
-        {
-            if (is_array($x_both[$thirdparty_id]['coll']['detail']))
-            {
-                // VAT Rate
-                print "<tr>";
-                print '<td class="tax_rate">';
-                if (is_numeric($thirdparty_id)) {
-                    $company_static->fetch($thirdparty_id);
-                    print $langs->trans("ThirdParty").': '.$company_static->getNomUrl(1);
-                } else {
-                    $tmpid = preg_replace('/userid_/', '', $thirdparty_id);
-                    $user_static->fetch($tmpid);
-                    print $langs->trans("User").': '.$user_static->getNomUrl(1);
-                }
-                print '</td><td colspan="'.($span + 1).'"></td>';
-                print '</tr>'."\n";
+		if ($min == 0 || ($min > 0 && $x_both[$thirdparty_id]['coll']['totalht'] > $min))
+		{
+			if (is_array($x_both[$thirdparty_id]['coll']['detail']))
+			{
+				// VAT Rate
+				print "<tr>";
+				print '<td class="tax_rate">';
+				if (is_numeric($thirdparty_id)) {
+					$company_static->fetch($thirdparty_id);
+					print $langs->trans("ThirdParty").': '.$company_static->getNomUrl(1);
+				} else {
+					$tmpid = preg_replace('/userid_/', '', $thirdparty_id);
+					$user_static->fetch($tmpid);
+					print $langs->trans("User").': '.$user_static->getNomUrl(1);
+				}
+				print '</td><td colspan="'.($span + 1).'"></td>';
+				print '</tr>'."\n";
 
-                foreach ($x_both[$thirdparty_id]['coll']['detail'] as $index => $fields) {
-                    // Define type
-                    // We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
-                    $type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
-                    // Try to enhance type detection using date_start and date_end for free lines where type
-                    // was not saved.
-                    if (!empty($fields['ddate_start'])) {
-                        $type = 1;
-                    }
-                    if (!empty($fields['ddate_end'])) {
-                        $type = 1;
-                    }
+				foreach ($x_both[$thirdparty_id]['coll']['detail'] as $index => $fields) {
+					// Define type
+					// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+					$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+					// Try to enhance type detection using date_start and date_end for free lines where type
+					// was not saved.
+					if (!empty($fields['ddate_start'])) {
+						$type = 1;
+					}
+					if (!empty($fields['ddate_end'])) {
+						$type = 1;
+					}
 
-                    print '<tr class="oddeven">';
+					print '<tr class="oddeven">';
 
-                    // Ref
-                    print '<td class="nowrap left">'.$fields['link'].'</td>';
+					// Ref
+					print '<td class="nowrap left">'.$fields['link'].'</td>';
 
-                    // Invoice date
-                    print '<td class="left">'.dol_print_date($fields['datef'], 'day').'</td>';
+					// Invoice date
+					print '<td class="left">'.dol_print_date($fields['datef'], 'day').'</td>';
 
-                    // Payment date
-                    if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') {
-                        print '<td class="left">'.dol_print_date($fields['datep'], 'day').'</td>';
-                    } else {
-                        print '<td></td>';
-                    }
+					// Payment date
+					if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') {
+						print '<td class="left">'.dol_print_date($fields['datep'], 'day').'</td>';
+					} else {
+						print '<td></td>';
+					}
 
-                    // Rate
-                    print '<td class="right">'.$fields['drate'].'</td>';
+					// Rate
+					print '<td class="right">'.$fields['drate'].'</td>';
 
-                    // Description
-                    print '<td class="left">';
-                    if ($fields['pid']) {
-                        $product_static->id = $fields['pid'];
-                        $product_static->ref = $fields['pref'];
-                        $product_static->type = $fields['dtype']; // We force with the type of line to have type how line is registered
-                        print $product_static->getNomUrl(1);
-                        if (dol_string_nohtmltag($fields['descr'])) {
-                            print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
-                        }
-                    } else {
-                        if ($type) {
-                            $text = img_object($langs->trans('Service'), 'service');
-                        } else {
-                            $text = img_object($langs->trans('Product'), 'product');
-                        }
-                        if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg)) {
-                            if ($reg[1] == 'DEPOSIT') {
-                                $fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
-                            } elseif ($reg[1] == 'CREDIT_NOTE') {
-                                $fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
-                            } else {
-                                $fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
-                            }
-                        }
-                        print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+					// Description
+					print '<td class="left">';
+					if ($fields['pid']) {
+						$product_static->id = $fields['pid'];
+						$product_static->ref = $fields['pref'];
+						$product_static->type = $fields['dtype']; // We force with the type of line to have type how line is registered
+						print $product_static->getNomUrl(1);
+						if (dol_string_nohtmltag($fields['descr'])) {
+							print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+						}
+					} else {
+						if ($type) {
+							$text = img_object($langs->trans('Service'), 'service');
+						} else {
+							$text = img_object($langs->trans('Product'), 'product');
+						}
+						if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg)) {
+							if ($reg[1] == 'DEPOSIT') {
+								$fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
+							} elseif ($reg[1] == 'CREDIT_NOTE') {
+								$fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
+							} else {
+								$fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
+							}
+						}
+						print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
 
-                        // Show range
-                        print_date_range($fields['ddate_start'], $fields['ddate_end']);
-                    }
-                    print '</td>';
+						// Show range
+						print_date_range($fields['ddate_start'], $fields['ddate_end']);
+					}
+					print '</td>';
 
-                    // Total HT
-                    if ($modetax != 1) {
-                        print '<td class="nowrap right">';
-                        print price($fields['totalht']);
-                        if (price2num($fields['ftotal_ttc'])) {
-                            //print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
-                            $ratiolineinvoice = ($fields['dtotal_ttc'] / $fields['ftotal_ttc']);
-                            //print ' ('.round($ratiolineinvoice*100,2).'%)';
-                        }
-                        print '</td>';
-                    }
+					// Total HT
+					if ($modetax != 1) {
+						print '<td class="nowrap right">';
+						print price($fields['totalht']);
+						if (price2num($fields['ftotal_ttc'])) {
+							//print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
+							$ratiolineinvoice = ($fields['dtotal_ttc'] / $fields['ftotal_ttc']);
+							//print ' ('.round($ratiolineinvoice*100,2).'%)';
+						}
+						print '</td>';
+					}
 
-                    // Payment
-                    $ratiopaymentinvoice = 1;
-                    if ($modetax != 1) {
-                        print '<td class="nowrap right">';
-                        //print $fields['totalht']."-".$fields['payment_amount']."-".$fields['ftotal_ttc'];
-                        if ($fields['payment_amount'] && $fields['ftotal_ttc']) {
-                            $payment_static->id = $fields['payment_id'];
-                            print $payment_static->getNomUrl(2);
-                        }
-                        if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-                            || ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')) {
-                                print $langs->trans("NA");
-                        } else {
-                            if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
-                                $ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
-                            }
-                            print price(price2num($fields['payment_amount'], 'MT'));
-                            if (isset($fields['payment_amount'])) {
-                                print ' ('.round($ratiopaymentinvoice * 100, 2).'%)';
-                            }
-                        }
-                        print '</td>';
-                    }
+					// Payment
+					$ratiopaymentinvoice = 1;
+					if ($modetax != 1) {
+						print '<td class="nowrap right">';
+						//print $fields['totalht']."-".$fields['payment_amount']."-".$fields['ftotal_ttc'];
+						if ($fields['payment_amount'] && $fields['ftotal_ttc']) {
+							$payment_static->id = $fields['payment_id'];
+							print $payment_static->getNomUrl(2);
+						}
+						if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+							|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')) {
+								print $langs->trans("NA");
+						} else {
+							if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+								$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+							}
+							print price(price2num($fields['payment_amount'], 'MT'));
+							if (isset($fields['payment_amount'])) {
+								print ' ('.round($ratiopaymentinvoice * 100, 2).'%)';
+							}
+						}
+						print '</td>';
+					}
 
-                    // Total collected
-                    print '<td class="nowrap right">';
-                    $temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
-                    print price(price2num($temp_ht, 'MT'), 1);
-                    print '</td>';
+					// Total collected
+					print '<td class="nowrap right">';
+					$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+					print price(price2num($temp_ht, 'MT'), 1);
+					print '</td>';
 
-                    // VAT
-                    print '<td class="nowrap right">';
-                    $temp_vat = $fields['vat'] * $ratiopaymentinvoice;
-                    print price(price2num($temp_vat, 'MT'), 1);
-                    //print price($fields['vat']);
-                    print '</td>';
-                    print '</tr>';
+					// VAT
+					print '<td class="nowrap right">';
+					$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
+					print price(price2num($temp_vat, 'MT'), 1);
+					//print price($fields['vat']);
+					print '</td>';
+					print '</tr>';
 
-                    $subtot_coll_total_ht += $temp_ht;
-                    $subtot_coll_vat += $temp_vat;
-                    $x_coll_sum += $temp_vat;
-                }
-            }
-            // Total customers for this vat rate
-            print '<tr class="liste_total">';
-            print '<td colspan="4"></td>';
-            print '<td class="right">'.$langs->trans("Total").':</td>';
-            if ($modetax != 1) {
-                print '<td class="nowrap right">&nbsp;</td>';
-                print '<td class="right">&nbsp;</td>';
-            }
-            print '<td class="right">'.price(price2num($subtot_coll_total_ht, 'MT')).'</td>';
-            print '<td class="nowrap right">'.price(price2num($subtot_coll_vat, 'MT')).'</td>';
-            print '</tr>';
-        }
-    }
+					$subtot_coll_total_ht += $temp_ht;
+					$subtot_coll_vat += $temp_vat;
+					$x_coll_sum += $temp_vat;
+				}
+			}
+			// Total customers for this vat rate
+			print '<tr class="liste_total">';
+			print '<td colspan="4"></td>';
+			print '<td class="right">'.$langs->trans("Total").':</td>';
+			if ($modetax != 1) {
+				print '<td class="nowrap right">&nbsp;</td>';
+				print '<td class="right">&nbsp;</td>';
+			}
+			print '<td class="right">'.price(price2num($subtot_coll_total_ht, 'MT')).'</td>';
+			print '<td class="nowrap right">'.price(price2num($subtot_coll_vat, 'MT')).'</td>';
+			print '</tr>';
+		}
+	}
 
-    if (count($x_coll) == 0)   // Show a total ine if nothing shown
-    {
-        print '<tr class="liste_total">';
-        print '<td colspan="4"></td>';
-        print '<td class="right">'.$langs->trans("Total").':</td>';
-        if ($modetax != 1) {
-            print '<td class="nowrap right">&nbsp;</td>';
-            print '<td class="right">&nbsp;</td>';
-        }
-        print '<td class="right">'.price(price2num(0, 'MT')).'</td>';
-        print '<td class="nowrap right">'.price(price2num(0, 'MT')).'</td>';
-        print '</tr>';
-    }
+	if (count($x_coll) == 0)   // Show a total ine if nothing shown
+	{
+		print '<tr class="liste_total">';
+		print '<td colspan="4"></td>';
+		print '<td class="right">'.$langs->trans("Total").':</td>';
+		if ($modetax != 1) {
+			print '<td class="nowrap right">&nbsp;</td>';
+			print '<td class="right">&nbsp;</td>';
+		}
+		print '<td class="right">'.price(price2num(0, 'MT')).'</td>';
+		print '<td class="nowrap right">'.price(price2num(0, 'MT')).'</td>';
+		print '</tr>';
+	}
 
-    // Blank line
-    print '<tr><td colspan="'.($span + 1).'">&nbsp;</td></tr>';
+	// Blank line
+	print '<tr><td colspan="'.($span + 1).'">&nbsp;</td></tr>';
 
-    // Print table headers for this quadri - expenses now
-    print '<tr class="liste_titre liste_titre_topborder">';
-    print '<td class="left">'.$elementsup.'</td>';
-    print '<td class="left">'.$langs->trans("DateInvoice").'</td>';
-    if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td class="left">'.$langs->trans("DatePayment").'</td>';
-    else print '<td></td>';
-    print '<td class="left">'.$namesup.'</td>';
-    print '<td class="left">'.$productsup.'</td>';
-    if ($modetax != 1) {
-        print '<td class="right">'.$amountsup.'</td>';
-        print '<td class="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
-    }
-    print '<td class="right">'.$langs->trans("AmountHTVATRealPaid").'</td>';
-    print '<td class="right">'.$vatsup.'</td>';
-    print '</tr>'."\n";
+	// Print table headers for this quadri - expenses now
+	print '<tr class="liste_titre liste_titre_topborder">';
+	print '<td class="left">'.$elementsup.'</td>';
+	print '<td class="left">'.$langs->trans("DateInvoice").'</td>';
+	if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td class="left">'.$langs->trans("DatePayment").'</td>';
+	else print '<td></td>';
+	print '<td class="left">'.$namesup.'</td>';
+	print '<td class="left">'.$productsup.'</td>';
+	if ($modetax != 1) {
+		print '<td class="right">'.$amountsup.'</td>';
+		print '<td class="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
+	}
+	print '<td class="right">'.$langs->trans("AmountHTVATRealPaid").'</td>';
+	print '<td class="right">'.$vatsup.'</td>';
+	print '</tr>'."\n";
 
-    foreach (array_keys($x_paye) as $thirdparty_id)
-    {
-        $subtot_paye_total_ht = 0;
-        $subtot_paye_vat = 0;
+	foreach (array_keys($x_paye) as $thirdparty_id)
+	{
+		$subtot_paye_total_ht = 0;
+		$subtot_paye_vat = 0;
 
-        if ($min == 0 || ($min > 0 && $x_both[$thirdparty_id]['paye']['totalht'] > $min)) {
-            if (is_array($x_both[$thirdparty_id]['paye']['detail'])) {
-                print "<tr>";
-                print '<td class="tax_rate">';
-                if (is_numeric($thirdparty_id)) {
-                    $company_static->fetch($thirdparty_id);
-                    print $langs->trans("ThirdParty").': '.$company_static->getNomUrl(1);
-                } else {
-                    $tmpid = preg_replace('/userid_/', '', $thirdparty_id);
-                    $user_static->fetch($tmpid);
-                    print $langs->trans("User").': '.$user_static->getNomUrl(1);
-                }
-                print '<td colspan="'.($span + 1).'"></td>';
-                print '</tr>'."\n";
+		if ($min == 0 || ($min > 0 && $x_both[$thirdparty_id]['paye']['totalht'] > $min)) {
+			if (is_array($x_both[$thirdparty_id]['paye']['detail'])) {
+				print "<tr>";
+				print '<td class="tax_rate">';
+				if (is_numeric($thirdparty_id)) {
+					$company_static->fetch($thirdparty_id);
+					print $langs->trans("ThirdParty").': '.$company_static->getNomUrl(1);
+				} else {
+					$tmpid = preg_replace('/userid_/', '', $thirdparty_id);
+					$user_static->fetch($tmpid);
+					print $langs->trans("User").': '.$user_static->getNomUrl(1);
+				}
+				print '<td colspan="'.($span + 1).'"></td>';
+				print '</tr>'."\n";
 
-                foreach ($x_both[$thirdparty_id]['paye']['detail'] as $index => $fields) {
-                    // Define type
-                    // We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
-                    $type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
-                    // Try to enhance type detection using date_start and date_end for free lines where type
-                    // was not saved.
-                    if (!empty($fields['ddate_start'])) {
-                        $type = 1;
-                    }
-                    if (!empty($fields['ddate_end'])) {
-                        $type = 1;
-                    }
+				foreach ($x_both[$thirdparty_id]['paye']['detail'] as $index => $fields) {
+					// Define type
+					// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+					$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+					// Try to enhance type detection using date_start and date_end for free lines where type
+					// was not saved.
+					if (!empty($fields['ddate_start'])) {
+						$type = 1;
+					}
+					if (!empty($fields['ddate_end'])) {
+						$type = 1;
+					}
 
 
-                    print '<tr class="oddeven">';
+					print '<tr class="oddeven">';
 
-                    // Ref
-                    print '<td class="nowrap left">'.$fields['link'].'</td>';
+					// Ref
+					print '<td class="nowrap left">'.$fields['link'].'</td>';
 
-                    // Invoice date
-                    print '<td class="left">'.dol_print_date($fields['datef'], 'day').'</td>';
+					// Invoice date
+					print '<td class="left">'.dol_print_date($fields['datef'], 'day').'</td>';
 
-                    // Payment date
-                    if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') {
-                        print '<td class="left">'.dol_print_date($fields['datep'], 'day').'</td>';
-                    } else {
-                        print '<td></td>';
-                    }
+					// Payment date
+					if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') {
+						print '<td class="left">'.dol_print_date($fields['datep'], 'day').'</td>';
+					} else {
+						print '<td></td>';
+					}
 
-                    // Company name
-                    print '<td class="left">'.$fields['company_link'].'</td>';
+					// Company name
+					print '<td class="left">'.$fields['company_link'].'</td>';
 
-                    // Description
-                    print '<td class="left">';
-                    if ($fields['pid']) {
-                        $product_static->id = $fields['pid'];
-                        $product_static->ref = $fields['pref'];
-                        $product_static->type = $fields['dtype']; // We force with the type of line to have type how line is registered
-                        print $product_static->getNomUrl(1);
-                        if (dol_string_nohtmltag($fields['descr'])) {
-                            print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
-                        }
-                    } else {
-                        if ($type) {
-                            $text = img_object($langs->trans('Service'), 'service');
-                        } else {
-                            $text = img_object($langs->trans('Product'), 'product');
-                        }
-                        if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg)) {
-                            if ($reg[1] == 'DEPOSIT') {
-                                $fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
-                            } elseif ($reg[1] == 'CREDIT_NOTE') {
-                                $fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
-                            } else {
-                                $fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
-                            }
-                        }
-                        print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+					// Description
+					print '<td class="left">';
+					if ($fields['pid']) {
+						$product_static->id = $fields['pid'];
+						$product_static->ref = $fields['pref'];
+						$product_static->type = $fields['dtype']; // We force with the type of line to have type how line is registered
+						print $product_static->getNomUrl(1);
+						if (dol_string_nohtmltag($fields['descr'])) {
+							print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+						}
+					} else {
+						if ($type) {
+							$text = img_object($langs->trans('Service'), 'service');
+						} else {
+							$text = img_object($langs->trans('Product'), 'product');
+						}
+						if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg)) {
+							if ($reg[1] == 'DEPOSIT') {
+								$fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
+							} elseif ($reg[1] == 'CREDIT_NOTE') {
+								$fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
+							} else {
+								$fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
+							}
+						}
+						print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
 
-                        // Show range
-                        print_date_range($fields['ddate_start'], $fields['ddate_end']);
-                    }
-                    print '</td>';
+						// Show range
+						print_date_range($fields['ddate_start'], $fields['ddate_end']);
+					}
+					print '</td>';
 
-                    // Total HT
-                    if ($modetax != 1) {
-                        print '<td class="nowrap right">';
-                        print price($fields['totalht']);
-                        if (price2num($fields['ftotal_ttc'])) {
-                            //print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
-                            $ratiolineinvoice = ($fields['dtotal_ttc'] / $fields['ftotal_ttc']);
-                            //print ' ('.round($ratiolineinvoice*100,2).'%)';
-                        }
-                        print '</td>';
-                    }
+					// Total HT
+					if ($modetax != 1) {
+						print '<td class="nowrap right">';
+						print price($fields['totalht']);
+						if (price2num($fields['ftotal_ttc'])) {
+							//print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
+							$ratiolineinvoice = ($fields['dtotal_ttc'] / $fields['ftotal_ttc']);
+							//print ' ('.round($ratiolineinvoice*100,2).'%)';
+						}
+						print '</td>';
+					}
 
-                    // Payment
-                    $ratiopaymentinvoice = 1;
-                    if ($modetax != 1)
-                    {
-                        print '<td class="nowrap right">';
-                        if ($fields['payment_amount'] && $fields['ftotal_ttc'])
-                        {
-                            $paymentfourn_static->id = $fields['payment_id'];
-                            print $paymentfourn_static->getNomUrl(2);
-                        }
+					// Payment
+					$ratiopaymentinvoice = 1;
+					if ($modetax != 1)
+					{
+						print '<td class="nowrap right">';
+						if ($fields['payment_amount'] && $fields['ftotal_ttc'])
+						{
+							$paymentfourn_static->id = $fields['payment_id'];
+							print $paymentfourn_static->getNomUrl(2);
+						}
 
-                        if (($type == 0 && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice')
-                            || ($type == 1 && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
-                        {
-                            print $langs->trans("NA");
-                        } else {
-                            if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
-                                $ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
-                            }
-                            print price(price2num($fields['payment_amount'], 'MT'));
-                            if (isset($fields['payment_amount'])) {
-                                print ' ('.round($ratiopaymentinvoice * 100, 2).'%)';
-                            }
-                        }
-                        print '</td>';
-                    }
+						if (($type == 0 && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice')
+							|| ($type == 1 && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
+						{
+							print $langs->trans("NA");
+						} else {
+							if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
+								$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+							}
+							print price(price2num($fields['payment_amount'], 'MT'));
+							if (isset($fields['payment_amount'])) {
+								print ' ('.round($ratiopaymentinvoice * 100, 2).'%)';
+							}
+						}
+						print '</td>';
+					}
 
-                    // VAT paid
-                    print '<td class="nowrap right">';
-                    $temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
-                    print price(price2num($temp_ht, 'MT'), 1);
-                    print '</td>';
+					// VAT paid
+					print '<td class="nowrap right">';
+					$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+					print price(price2num($temp_ht, 'MT'), 1);
+					print '</td>';
 
-                    // VAT
-                    print '<td class="nowrap right">';
-                    $temp_vat = $fields['vat'] * $ratiopaymentinvoice;
-                    print price(price2num($temp_vat, 'MT'), 1);
-                    //print price($fields['vat']);
-                    print '</td>';
-                    print '</tr>';
+					// VAT
+					print '<td class="nowrap right">';
+					$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
+					print price(price2num($temp_vat, 'MT'), 1);
+					//print price($fields['vat']);
+					print '</td>';
+					print '</tr>';
 
-                    $subtot_paye_total_ht += $temp_ht;
-                    $subtot_paye_vat += $temp_vat;
-                    $x_paye_sum += $temp_vat;
-                }
-            }
-            // Total suppliers for this vat rate
-            print '<tr class="liste_total">';
-            print '<td colspan="4"></td>';
-            print '<td class="right">'.$langs->trans("Total").':</td>';
-            if ($modetax != 1) {
-                print '<td class="nowrap right">&nbsp;</td>';
-                print '<td class="right">&nbsp;</td>';
-            }
-            print '<td class="right">'.price(price2num($subtot_paye_total_ht, 'MT')).'</td>';
-            print '<td class="nowrap right">'.price(price2num($subtot_paye_vat, 'MT')).'</td>';
-            print '</tr>';
-        }
-    }
+					$subtot_paye_total_ht += $temp_ht;
+					$subtot_paye_vat += $temp_vat;
+					$x_paye_sum += $temp_vat;
+				}
+			}
+			// Total suppliers for this vat rate
+			print '<tr class="liste_total">';
+			print '<td colspan="4"></td>';
+			print '<td class="right">'.$langs->trans("Total").':</td>';
+			if ($modetax != 1) {
+				print '<td class="nowrap right">&nbsp;</td>';
+				print '<td class="right">&nbsp;</td>';
+			}
+			print '<td class="right">'.price(price2num($subtot_paye_total_ht, 'MT')).'</td>';
+			print '<td class="nowrap right">'.price(price2num($subtot_paye_vat, 'MT')).'</td>';
+			print '</tr>';
+		}
+	}
 
-    if (count($x_paye) == 0) {  // Show a total line if nothing shown
-        print '<tr class="liste_total">';
-        print '<td colspan="4"></td>';
-        print '<td class="right">'.$langs->trans("Total").':</td>';
-        if ($modetax != 1) {
-            print '<td class="nowrap right">&nbsp;</td>';
-            print '<td class="right">&nbsp;</td>';
-        }
-        print '<td class="right">'.price(price2num(0, 'MT')).'</td>';
-        print '<td class="nowrap right">'.price(price2num(0, 'MT')).'</td>';
-        print '</tr>';
-    }
+	if (count($x_paye) == 0) {  // Show a total line if nothing shown
+		print '<tr class="liste_total">';
+		print '<td colspan="4"></td>';
+		print '<td class="right">'.$langs->trans("Total").':</td>';
+		if ($modetax != 1) {
+			print '<td class="nowrap right">&nbsp;</td>';
+			print '<td class="right">&nbsp;</td>';
+		}
+		print '<td class="right">'.price(price2num(0, 'MT')).'</td>';
+		print '<td class="nowrap right">'.price(price2num(0, 'MT')).'</td>';
+		print '</tr>';
+	}
 
-    // Total to pay
-    print '<tr><td colspan="'.($span+2).'"></td></tr>';
+	// Total to pay
+	print '<tr><td colspan="'.($span + 2).'"></td></tr>';
 
-    $diff = $x_coll_sum - $x_paye_sum;
-    print '<tr class="liste_total">';
-    print '<td class="liste_total" colspan="'.($span+1).'">'.$langs->trans("TotalToPay").($q ? ', '.$langs->trans("Quadri").' '.$q : '').'</td>';
-    print '<td class="liste_total nowrap right"><b>'.price(price2num($diff, 'MT'))."</b></td>\n";
-    print "</tr>\n";
+	$diff = $x_coll_sum - $x_paye_sum;
+	print '<tr class="liste_total">';
+	print '<td class="liste_total" colspan="'.($span + 1).'">'.$langs->trans("TotalToPay").($q ? ', '.$langs->trans("Quadri").' '.$q : '').'</td>';
+	print '<td class="liste_total nowrap right"><b>'.price(price2num($diff, 'MT'))."</b></td>\n";
+	print "</tr>\n";
 
-    $i++;
+	$i++;
 }
 
 print '</table>';
diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php
index 830dfb78d3a..e310e61fcb8 100644
--- a/htdocs/compta/tva/document.php
+++ b/htdocs/compta/tva/document.php
@@ -36,8 +36,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/vat.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 if (!empty($conf->projet->enabled))
 {
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
 // Load translation files required by the page
@@ -58,7 +58,7 @@ $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
-    $page = 0;
+	$page = 0;
 }
 $offset = $limit * $page;
 $pageprev = $page - 1;
@@ -82,10 +82,10 @@ include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 if ($action == 'setlib' && $user->rights->tax->charges->creer)
 {
-    $object->fetch($id);
-    $result = $object->setValueFrom('label', GETPOST('lib', 'alpha'), '', '', 'text', '', $user, 'TAX_MODIFY');
-    if ($result < 0)
-        setEventMessages($object->error, $object->errors, 'errors');
+	$object->fetch($id);
+	$result = $object->setValueFrom('label', GETPOST('lib', 'alpha'), '', '', 'text', '', $user, 'TAX_MODIFY');
+	if ($result < 0)
+		setEventMessages($object->error, $object->errors, 'errors');
 }
 
 
@@ -104,9 +104,9 @@ if ($object->id)
 {
 	$alreadypayed = $object->getSommePaiement();
 
-    $head = vat_prepare_head($object);
+	$head = vat_prepare_head($object);
 
-    dol_fiche_head($head, 'documents', $langs->trans("VATPayment"), -1, 'payment');
+	print dol_get_fiche_head($head, 'documents', $langs->trans("VATPayment"), -1, 'payment');
 
 	$morehtmlref = '<div class="refidno">';
 	// Label of social contribution
@@ -123,33 +123,33 @@ if ($object->id)
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
-    // Build file list
-    $filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
-    $totalsize = 0;
-    foreach ($filearray as $key => $file)
-    {
-        $totalsize += $file['size'];
-    }
+	// Build file list
+	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$totalsize = 0;
+	foreach ($filearray as $key => $file)
+	{
+		$totalsize += $file['size'];
+	}
 
 
-    print '<table class="border tableforfield centpercent">';
+	print '<table class="border tableforfield centpercent">';
 
-    print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-    print '</table>';
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    print '<div class="clearboth"></div>';
+	print '<div class="clearboth"></div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    $permission = $user->rights->tax->charges->creer;
-    $permtoedit = $user->rights->fournisseur->facture->creer;
-    $param = '&id='.$object->id;
-    include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	$permission = $user->rights->tax->charges->creer;
+	$permtoedit = $user->rights->fournisseur->facture->creer;
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
-    print $langs->trans("ErrorUnknown");
+	print $langs->trans("ErrorUnknown");
 }
 
 
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index a4fd1293b4d..4a16d996ab8 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -108,100 +108,100 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
  */
 function pt($db, $sql, $date)
 {
-    global $conf, $bc, $langs;
+	global $conf, $bc, $langs;
 
-    $result = $db->query($sql);
-    if ($result) {
-        $num = $db->num_rows($result);
-        $i = 0;
-        $total = 0;
-        print '<table class="noborder centpercent">';
+	$result = $db->query($sql);
+	if ($result) {
+		$num = $db->num_rows($result);
+		$i = 0;
+		$total = 0;
+		print '<table class="noborder centpercent">';
 
-        print '<tr class="liste_titre">';
-        print '<td class="nowrap">'.$date.'</td>';
-        print '<td class="right">'.$langs->trans("ClaimedForThisPeriod").'</td>';
-        print '<td class="right">'.$langs->trans("PaidDuringThisPeriod").'</td>';
-        print "</tr>\n";
+		print '<tr class="liste_titre">';
+		print '<td class="nowrap">'.$date.'</td>';
+		print '<td class="right">'.$langs->trans("ClaimedForThisPeriod").'</td>';
+		print '<td class="right">'.$langs->trans("PaidDuringThisPeriod").'</td>';
+		print "</tr>\n";
 
-        $totalclaimed = 0;
-        $totalpaid = 0;
-        $amountclaimed = 0;
-        $amountpaid = 0;
-        $previousmonth = '';
-        $previousmode = '';
-        $mode = '';
+		$totalclaimed = 0;
+		$totalpaid = 0;
+		$amountclaimed = 0;
+		$amountpaid = 0;
+		$previousmonth = '';
+		$previousmode = '';
+		$mode = '';
 
-        while ($i < $num) {
-            $obj = $db->fetch_object($result);
-            $mode = $obj->mode;
+		while ($i < $num) {
+			$obj = $db->fetch_object($result);
+			$mode = $obj->mode;
 
-            //print $obj->dm.' '.$obj->mode.' '.$previousmonth.' '.$previousmode;
-            if ($obj->mode == 'claimed' && !empty($previousmode))
-            {
-            	print '<tr class="oddeven">';
-            	print '<td class="nowrap">'.$previousmonth."</td>\n";
-            	print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
-            	print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
-            	print "</tr>\n";
+			//print $obj->dm.' '.$obj->mode.' '.$previousmonth.' '.$previousmode;
+			if ($obj->mode == 'claimed' && !empty($previousmode))
+			{
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">'.$previousmonth."</td>\n";
+				print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
+				print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
+				print "</tr>\n";
 
-            	$amountclaimed = 0;
-            	$amountpaid = 0;
-            }
+				$amountclaimed = 0;
+				$amountpaid = 0;
+			}
 
-            if ($obj->mode == 'claimed')
-            {
-            	$amountclaimed = $obj->mm;
-            	$totalclaimed = $totalclaimed + $amountclaimed;
-            }
-            if ($obj->mode == 'paid')
-            {
-            	$amountpaid = $obj->mm;
-            	$totalpaid = $totalpaid + $amountpaid;
-            }
+			if ($obj->mode == 'claimed')
+			{
+				$amountclaimed = $obj->mm;
+				$totalclaimed = $totalclaimed + $amountclaimed;
+			}
+			if ($obj->mode == 'paid')
+			{
+				$amountpaid = $obj->mm;
+				$totalpaid = $totalpaid + $amountpaid;
+			}
 
-            if ($obj->mode == 'paid')
-            {
-            	print '<tr class="oddeven">';
-            	print '<td class="nowrap">'.$obj->dm."</td>\n";
-            	print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
-            	print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
-            	print "</tr>\n";
-            	$amountclaimed = 0;
-            	$amountpaid = 0;
-            	$previousmode = '';
-            	$previousmonth = '';
-            } else {
-            	$previousmode = $obj->mode;
-            	$previousmonth = $obj->dm;
-            }
+			if ($obj->mode == 'paid')
+			{
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">'.$obj->dm."</td>\n";
+				print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
+				print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
+				print "</tr>\n";
+				$amountclaimed = 0;
+				$amountpaid = 0;
+				$previousmode = '';
+				$previousmonth = '';
+			} else {
+				$previousmode = $obj->mode;
+				$previousmonth = $obj->dm;
+			}
 
-            $i++;
-        }
+			$i++;
+		}
 
-        if ($mode == 'claimed' && !empty($previousmode))
-        {
-        	print '<tr class="oddeven">';
-        	print '<td class="nowrap">'.$previousmonth."</td>\n";
-        	print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
-        	print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
-        	print "</tr>\n";
+		if ($mode == 'claimed' && !empty($previousmode))
+		{
+			print '<tr class="oddeven">';
+			print '<td class="nowrap">'.$previousmonth."</td>\n";
+			print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
+			print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
+			print "</tr>\n";
 
-        	$amountclaimed = 0;
-        	$amountpaid = 0;
-        }
+			$amountclaimed = 0;
+			$amountpaid = 0;
+		}
 
-        print '<tr class="liste_total">';
-        print '<td class="right">'.$langs->trans("Total").'</td>';
-        print '<td class="nowrap right">'.price($totalclaimed).'</td>';
-        print '<td class="nowrap right">'.price($totalpaid).'</td>';
-        print "</tr>";
+		print '<tr class="liste_total">';
+		print '<td class="right">'.$langs->trans("Total").'</td>';
+		print '<td class="nowrap right">'.price($totalclaimed).'</td>';
+		print '<td class="nowrap right">'.price($totalpaid).'</td>';
+		print "</tr>";
 
-        print "</table>";
+		print "</table>";
 
-        $db->free($result);
-    } else {
-        dol_print_error($db);
-    }
+		$db->free($result);
+	} else {
+		dol_print_error($db);
+	}
 }
 
 
@@ -392,144 +392,144 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
 	}
 	//now we have an array (x_both) indexed by rates for coll and paye
 
-    $action = "tva";
-    $object = array(&$x_coll, &$x_paye, &$x_both);
-    $parameters["mode"] = $modetax;
-    $parameters["year"] = $y;
-    $parameters["month"] = $m;
-    $parameters["type"] = 'vat';
+	$action = "tva";
+	$object = array(&$x_coll, &$x_paye, &$x_both);
+	$parameters["mode"] = $modetax;
+	$parameters["year"] = $y;
+	$parameters["month"] = $m;
+	$parameters["type"] = 'vat';
 
-    // Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
-    $hookmanager->initHooks(array('externalbalance'));
-    $reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+	// Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
+	$hookmanager->initHooks(array('externalbalance'));
+	$reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-    if (!is_array($x_coll) && $coll_listbuy == -1)
-    {
-        $langs->load("errors");
-        print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
-        break;
-    }
-    if (!is_array($x_paye) && $coll_listbuy == -2)
-    {
-        print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
-        break;
-    }
+	if (!is_array($x_coll) && $coll_listbuy == -1)
+	{
+		$langs->load("errors");
+		print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
+		break;
+	}
+	if (!is_array($x_paye) && $coll_listbuy == -2)
+	{
+		print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
+		break;
+	}
 
 
-    print '<tr class="oddeven">';
-    print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/tva/quadri_detail.php?leftmenu=tax_vat&month='.$m.'&year='.$y.'">'.dol_print_date(dol_mktime(0, 0, 0, $m, 1, $y), "%b %Y").'</a></td>';
+	print '<tr class="oddeven">';
+	print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/tva/quadri_detail.php?leftmenu=tax_vat&month='.$m.'&year='.$y.'">'.dol_print_date(dol_mktime(0, 0, 0, $m, 1, $y), "%b %Y").'</a></td>';
 
-    $x_coll_sum = 0;
-    foreach (array_keys($x_coll) as $rate)
-    {
-    	$subtot_coll_total_ht = 0;
-    	$subtot_coll_vat = 0;
+	$x_coll_sum = 0;
+	foreach (array_keys($x_coll) as $rate)
+	{
+		$subtot_coll_total_ht = 0;
+		$subtot_coll_vat = 0;
 
-    	foreach ($x_both[$rate]['coll']['detail'] as $index => $fields)
-	    {
-	    	// Payment
-	    	$ratiopaymentinvoice = 1;
-	    	if ($modetax != 1)
-	    	{
-	    		// Define type
-	    		// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
-	    		$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
-	    		// Try to enhance type detection using date_start and date_end for free lines where type
-	    		// was not saved.
-	    		if (!empty($fields['ddate_start'])) {
-	    			$type = 1;
-	    		}
-	    		if (!empty($fields['ddate_end'])) {
-	    			$type = 1;
-	    		}
+		foreach ($x_both[$rate]['coll']['detail'] as $index => $fields)
+		{
+			// Payment
+			$ratiopaymentinvoice = 1;
+			if ($modetax != 1)
+			{
+				// Define type
+				// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+				$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+				// Try to enhance type detection using date_start and date_end for free lines where type
+				// was not saved.
+				if (!empty($fields['ddate_start'])) {
+					$type = 1;
+				}
+				if (!empty($fields['ddate_end'])) {
+					$type = 1;
+				}
 
-	    		if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-	    			|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
-	    		{
-	    			//print $langs->trans("NA");
-	    		} else {
-	    			if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
-	    				$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
-	    			}
-	    		}
-	    	}
-	    	//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
-	    	$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
-	    	$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
-	    	$subtot_coll_total_ht += $temp_ht;
-	    	$subtot_coll_vat      += $temp_vat;
-	    	$x_coll_sum           += $temp_vat;
-	    }
-    }
-    print '<td class="nowrap right">'.price(price2num($x_coll_sum, 'MT')).'</td>';
+				if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+					|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
+				{
+					//print $langs->trans("NA");
+				} else {
+					if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+						$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+					}
+				}
+			}
+			//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
+			$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+			$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
+			$subtot_coll_total_ht += $temp_ht;
+			$subtot_coll_vat      += $temp_vat;
+			$x_coll_sum           += $temp_vat;
+		}
+	}
+	print '<td class="nowrap right">'.price(price2num($x_coll_sum, 'MT')).'</td>';
 
-    $x_paye_sum = 0;
-    foreach (array_keys($x_paye) as $rate)
-    {
-    	$subtot_paye_total_ht = 0;
-    	$subtot_paye_vat = 0;
+	$x_paye_sum = 0;
+	foreach (array_keys($x_paye) as $rate)
+	{
+		$subtot_paye_total_ht = 0;
+		$subtot_paye_vat = 0;
 
-	    foreach ($x_both[$rate]['paye']['detail'] as $index => $fields)
-	    {
-	    	// Payment
-	    	$ratiopaymentinvoice = 1;
-	    	if ($modetax != 1)
-	    	{
-	    		// Define type
-	    		// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
-	    		$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
-	    		// Try to enhance type detection using date_start and date_end for free lines where type
-	    		// was not saved.
-	    		if (!empty($fields['ddate_start'])) {
-	    			$type = 1;
-	    		}
-	    		if (!empty($fields['ddate_end'])) {
-	    			$type = 1;
-	    		}
+		foreach ($x_both[$rate]['paye']['detail'] as $index => $fields)
+		{
+			// Payment
+			$ratiopaymentinvoice = 1;
+			if ($modetax != 1)
+			{
+				// Define type
+				// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+				$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+				// Try to enhance type detection using date_start and date_end for free lines where type
+				// was not saved.
+				if (!empty($fields['ddate_start'])) {
+					$type = 1;
+				}
+				if (!empty($fields['ddate_end'])) {
+					$type = 1;
+				}
 
-	    		if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-	    			|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
-	    		{
-	    			//print $langs->trans("NA");
-	    		} else {
-	    			if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
-	    				$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
-	    			}
-	    		}
-	    	}
-	    	//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
-	    	$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
-	    	$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
-	    	$subtot_paye_total_ht += $temp_ht;
-	    	$subtot_paye_vat      += $temp_vat;
-	    	$x_paye_sum           += $temp_vat;
-	    }
-    }
-    print '<td class="nowrap right">'.price(price2num($x_paye_sum, 'MT')).'</td>';
+				if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+					|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
+				{
+					//print $langs->trans("NA");
+				} else {
+					if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+						$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+					}
+				}
+			}
+			//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
+			$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+			$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
+			$subtot_paye_total_ht += $temp_ht;
+			$subtot_paye_vat      += $temp_vat;
+			$x_paye_sum           += $temp_vat;
+		}
+	}
+	print '<td class="nowrap right">'.price(price2num($x_paye_sum, 'MT')).'</td>';
 
-    $subtotalcoll = $subtotalcoll + $x_coll_sum;
-    $subtotalpaye = $subtotalpaye + $x_paye_sum;
+	$subtotalcoll = $subtotalcoll + $x_coll_sum;
+	$subtotalpaye = $subtotalpaye + $x_paye_sum;
 
-    $diff = $x_coll_sum - $x_paye_sum;
-    $total = $total + $diff;
-    $subtotal = price2num($subtotal + $diff, 'MT');
+	$diff = $x_coll_sum - $x_paye_sum;
+	$total = $total + $diff;
+	$subtotal = price2num($subtotal + $diff, 'MT');
 
-    print '<td class="nowrap right">'.price(price2num($diff, 'MT')).'</td>'."\n";
-    print "<td>&nbsp;</td>\n";
-    print "</tr>\n";
+	print '<td class="nowrap right">'.price(price2num($diff, 'MT')).'</td>'."\n";
+	print "<td>&nbsp;</td>\n";
+	print "</tr>\n";
 
-    $i++; $m++;
-    if ($i > 2)
-    {
-        print '<tr class="liste_total">';
-        print '<td class="right"><a href="quadri_detail.php?leftmenu=tax_vat&q='.round($m / 3).'&year='.$y.'">'.$langs->trans("SubTotal").'</a>:</td>';
-        print '<td class="nowrap right">'.price(price2num($subtotalcoll, 'MT')).'</td>';
-        print '<td class="nowrap right">'.price(price2num($subtotalpaye, 'MT')).'</td>';
-        print '<td class="nowrap right">'.price(price2num($subtotal, 'MT')).'</td>';
-        print '<td>&nbsp;</td></tr>';
-        $i = 0;
-        $subtotalcoll = 0; $subtotalpaye = 0; $subtotal = 0;
-    }
+	$i++; $m++;
+	if ($i > 2)
+	{
+		print '<tr class="liste_total">';
+		print '<td class="right"><a href="quadri_detail.php?leftmenu=tax_vat&q='.round($m / 3).'&year='.$y.'">'.$langs->trans("SubTotal").'</a>:</td>';
+		print '<td class="nowrap right">'.price(price2num($subtotalcoll, 'MT')).'</td>';
+		print '<td class="nowrap right">'.price(price2num($subtotalpaye, 'MT')).'</td>';
+		print '<td class="nowrap right">'.price(price2num($subtotal, 'MT')).'</td>';
+		print '<td>&nbsp;</td></tr>';
+		$i = 0;
+		$subtotalcoll = 0; $subtotalpaye = 0; $subtotal = 0;
+	}
 }
 print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("TotalToPay").':</td><td class="nowrap right">'.price(price2num($total, 'MT')).'</td>';
 print "<td>&nbsp;</td>\n";
@@ -578,37 +578,37 @@ if (!empty($conf->global->MAIN_FEATURES_LEVEL))
      * Recap
      */
 
-    print load_fiche_titre($langs->trans("VATBalance"), '', ''); // need to add translation
+	print load_fiche_titre($langs->trans("VATBalance"), '', ''); // need to add translation
 
-    $sql1 = "SELECT SUM(amount) as mm";
-    $sql1 .= " FROM ".MAIN_DB_PREFIX."tva as f";
-    $sql1 .= " WHERE f.entity = ".$conf->entity;
-    $sql1 .= " AND f.datev >= '".$db->idate($date_start)."'";
-    $sql1 .= " AND f.datev <= '".$db->idate($date_end)."'";
+	$sql1 = "SELECT SUM(amount) as mm";
+	$sql1 .= " FROM ".MAIN_DB_PREFIX."tva as f";
+	$sql1 .= " WHERE f.entity = ".$conf->entity;
+	$sql1 .= " AND f.datev >= '".$db->idate($date_start)."'";
+	$sql1 .= " AND f.datev <= '".$db->idate($date_end)."'";
 
-    $result = $db->query($sql1);
-    if ($result) {
-        $obj = $db->fetch_object($result);
-        print '<table class="noborder centpercent">';
+	$result = $db->query($sql1);
+	if ($result) {
+		$obj = $db->fetch_object($result);
+		print '<table class="noborder centpercent">';
 
-        print "<tr>";
-        print '<td class="right">'.$langs->trans("VATDue").'</td>';
-        print '<td class="nowrap right">'.price(price2num($total, 'MT')).'</td>';
-        print "</tr>\n";
+		print "<tr>";
+		print '<td class="right">'.$langs->trans("VATDue").'</td>';
+		print '<td class="nowrap right">'.price(price2num($total, 'MT')).'</td>';
+		print "</tr>\n";
 
-        print "<tr>";
-        print '<td class="right">'.$langs->trans("VATPaid").'</td>';
-        print '<td class="nowrap right">'.price(price2num($obj->mm, 'MT'))."</td>\n";
-        print "</tr>\n";
+		print "<tr>";
+		print '<td class="right">'.$langs->trans("VATPaid").'</td>';
+		print '<td class="nowrap right">'.price(price2num($obj->mm, 'MT'))."</td>\n";
+		print "</tr>\n";
 
-        $restopay = $total - $obj->mm;
-        print "<tr>";
-        print '<td class="right">'.$langs->trans("RemainToPay").'</td>';
-        print '<td class="nowrap right">'.price(price2num($restopay, 'MT')).'</td>';
-        print "</tr>\n";
+		$restopay = $total - $obj->mm;
+		print "<tr>";
+		print '<td class="right">'.$langs->trans("RemainToPay").'</td>';
+		print '<td class="nowrap right">'.price(price2num($restopay, 'MT')).'</td>';
+		print "</tr>\n";
 
-        print '</table>';
-    }
+		print '</table>';
+	}
 }
 
 print '</div></div>';
diff --git a/htdocs/compta/tva/info.php b/htdocs/compta/tva/info.php
index 5ef3956bd35..ddabf6e2b49 100644
--- a/htdocs/compta/tva/info.php
+++ b/htdocs/compta/tva/info.php
@@ -68,7 +68,7 @@ $object->info($id);
 
 $head = vat_prepare_head($object);
 
-dol_fiche_head($head, 'info', $langs->trans("VATPayment"), -1, 'payment');
+print dol_get_fiche_head($head, 'info', $langs->trans("VATPayment"), -1, 'payment');
 
 $morehtmlref = '<div class="refidno">';
 // Label of social contribution
@@ -89,7 +89,7 @@ print '</td></tr></table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 llxFooter();
 
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 82829fca12e..a142518279f 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -1,8 +1,9 @@
 <?php
-/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2011-2019 Alexandre Spangaro   <aspangaro@open-dsi.fr>
+/* Copyright (C) 2001-2003	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2020	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2011-2019	Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2020		Tobias Sekan			<tobias.sekan@startmail.com>
  *
  * 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
@@ -19,12 +20,18 @@
  */
 
 /**
- *	    \file       htdocs/compta/tva/list.php
- *      \ingroup    tax
- *		\brief      List of VAT payments
+ *	\file		htdocs/compta/tva/list.php
+ *	\ingroup	tax
+ *	\brief		List of VAT payments
  */
 
 require '../../main.inc.php';
+
+// Security check
+$socid = GETPOST('socid', 'int');
+if ($user->socid) $socid = $user->socid;
+$result = restrictedArea($user, 'tax', '', '', 'charges');
+
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
@@ -34,61 +41,79 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'bills'));
 
-// Security check
-$socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
-$result = restrictedArea($user, 'tax', '', '', 'charges');
+$action						= GETPOST('action', 'alpha');
+$massaction					= GETPOST('massaction', 'alpha');
+$confirm					= GETPOST('confirm', 'alpha');
+$optioncss = GETPOST('optioncss', 'alpha');
+$contextpage				= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'salestaxeslist';
 
-$search_ref = GETPOST('search_ref', 'int');
+$search_ref					= GETPOST('search_ref', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
-$search_account = GETPOST('search_account', 'int');
 $search_dateend_start = dol_mktime(0, 0, 0, GETPOST('search_dateend_startmonth', 'int'), GETPOST('search_dateend_startday', 'int'), GETPOST('search_dateend_startyear', 'int'));
 $search_dateend_end = dol_mktime(23, 59, 59, GETPOST('search_dateend_endmonth', 'int'), GETPOST('search_dateend_endday', 'int'), GETPOST('search_dateend_endyear', 'int'));
 $search_datepayment_start = dol_mktime(0, 0, 0, GETPOST('search_datepayment_startmonth', 'int'), GETPOST('search_datepayment_startday', 'int'), GETPOST('search_datepayment_startyear', 'int'));
 $search_datepayment_end = dol_mktime(23, 59, 59, GETPOST('search_datepayment_endmonth', 'int'), GETPOST('search_datepayment_endday', 'int'), GETPOST('search_datepayment_endyear', 'int'));
-$search_amount = GETPOST('search_amount', 'alpha');
-$month = GETPOST("month", "int");
-$year = GETPOST("year", "int");
+$search_type = GETPOST('search_type', 'int');
+$search_cheque = GETPOST('search_cheque', 'alpha');
+$search_account				= GETPOST('search_account', 'int');
+$search_amount 				= GETPOST('search_amount', 'alpha');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield					= GETPOST('sortfield', 'alpha');
+$sortorder					= GETPOST('sortorder', 'alpha');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST('page', 'int');
+
+if (empty($page) || $page == -1) $page = 0; // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = "t.datev";
-if (!$sortorder) $sortorder = "DESC";
 
-$filtre = $_GET["filtre"];
+if (!$sortfield) $sortfield = 't.datev';
+if (!$sortorder) $sortorder = 'DESC';
 
-if (empty($_REQUEST['typeid']))
-{
-	$newfiltre = str_replace('filtre=', '', $filtre);
-	$filterarray = explode('-', $newfiltre);
-	foreach ($filterarray as $val)
+$arrayfields = array(
+	't.rowid'			=>array('checked'=>1, 'position'=>10, 'label'=>"Ref",),
+	't.label'			=>array('checked'=>1, 'position'=>20, 'label'=>"Label"),
+	't.datev'			=>array('checked'=>1, 'position'=>30, 'label'=>"PeriodEndDate"),
+	't.datep'			=>array('checked'=>1, 'position'=>40, 'label'=>"DatePayment"),
+	't.fk_typepayment'	=>array('checked'=>1, 'position'=>50, 'label'=>"Type"),
+	't.num_payment'		=>array('checked'=>1, 'position'=>60, 'label'=>"Numero", 'tooltip'=>"ChequeOrTransferNumber"),
+	'transaction'		=>array('checked'=>1, 'position'=>70, 'label'=>"BankTransactionLine", 'enabled'=>(!empty($conf->banque->enabled))),
+	'ba.label'			=>array('checked'=>1, 'position'=>80, 'label'=>"Account", 'enable'=>(!empty($conf->banque->enabled))),
+	't.amount'			=>array('checked'=>1, 'position'=>90, 'label'=>"PayedByThisPayment"),
+);
+$arrayfields = dol_sort_array($arrayfields, 'position');
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('salestaxeslist'));
+$object = new Tva($db);
+
+
+/*
+ * Actions
+ */
+
+$parameters = array('socid'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+
+if (empty($reshook)) {
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
 	{
-		$part = explode(':', $val);
-		if ($part[0] == 't.fk_typepayment') $typeid = $part[1];
+		$search_ref = '';
+		$search_label = '';
+		$search_dateend_start = '';
+		$search_dateend_end = '';
+		$search_datepayment_start = '';
+		$search_datepayment_end = '';
+		$search_type = '';
+		$search_cheque = '';
+		$search_account = '';
+		$search_amount = '';
 	}
-} else {
-	$typeid = $_REQUEST['typeid'];
-}
-
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
-{
-	$search_ref = "";
-	$search_label = "";
-	$search_dateend_start = '';
-	$search_dateend_end = '';
-	$search_datepayment_start = '';
-	$search_datepayment_end = '';
-	$search_account = '';
-	$search_amount = "";
-	$year = "";
-	$month = "";
-    $typeid = "";
 }
 
 
@@ -96,194 +121,325 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
  * View
  */
 
-llxHeader('', $langs->trans("VATPayments"));
-
 $form = new Form($db);
 $formother = new FormOther($db);
 $tva_static = new Tva($db);
 $bankstatic = new Account($db);
+$accountingjournal = new AccountingJournal($db);
+$bankline = new AccountLine($db);
+
+llxHeader('', $langs->trans("VATPayments"));
+
+$sql = 'SELECT t.rowid, t.amount, t.label, t.datev, t.datep, t.fk_typepayment as type, t.num_payment, t.fk_bank';
+$sql .= ', ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel';
+$sql .= ', pst.code as payment_code';
+$sql .= ' FROM '.MAIN_DB_PREFIX.'tva as t';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as pst ON t.fk_typepayment = pst.id';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON t.fk_bank = b.rowid';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
+$sql .= ' WHERE t.entity IN ('.getEntity($object->element).')';
+
+if (!empty($search_ref))							$sql .= natural_search('t.rowid', $search_ref);
+if (!empty($search_label))							$sql .= natural_search('t.label', $search_label);
+if (!empty($search_dateend_start))					$sql .= ' AND t.datev >= "'.$db->idate($search_dateend_start).'"';
+if (!empty($search_dateend_end))					$sql .= ' AND t.datev <= "'.$db->idate($search_dateend_end).'"';
+if (!empty($search_datepayment_start))  			$sql .= ' AND t.datep >= "'.$db->idate($search_datepayment_start).'"';
+if (!empty($search_datepayment_end))				$sql .= ' AND t.datep <= "'.$db->idate($search_datepayment_end).'"';
+if (!empty($search_type) && $search_type > 0)		$sql .= ' AND t.fk_typepayment='.$search_type;
+if (!empty($search_cheque))							$sql .= natural_search('t.num_payment', $search_cheque);
+if (!empty($search_account) && $search_account > 0)	$sql .= ' AND b.fk_account='.$search_account;
+if (!empty($search_amount))							$sql .= natural_search('t.amount', price2num(trim($search_amount)), 1);
 
-$sql = "SELECT t.rowid, t.amount, t.label, t.datev, t.datep, t.fk_typepayment as type, t.num_payment, t.fk_bank, pst.code as payment_code,";
-$sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel";
-$sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON t.fk_typepayment = pst.id";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON t.fk_bank = b.rowid";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
-$sql .= " WHERE t.entity IN (".getEntity('tax').")";
-if ($search_ref)				$sql .= natural_search("t.rowid", $search_ref);
-if ($search_label)				$sql .= natural_search("t.label", $search_label);
-if ($search_account > 0)		$sql .= " AND b.fk_account=".$search_account;
-if ($search_amount)				$sql .= natural_search("t.amount", price2num(trim($search_amount)), 1);
-if ($search_dateend_start)		$sql .= " AND t.datev >= '".$db->idate($search_dateend_start)."'";
-if ($search_dateend_end)		$sql .= " AND t.datev <= '".$db->idate($search_dateend_end)."'";
-if ($search_datepayment_start)  $sql .= " AND t.datep >= '".$db->idate($search_datepayment_start)."'";
-if ($search_datepayment_end)	$sql .= " AND t.datep <= '".$db->idate($search_datepayment_end)."'";
-if ($filtre) {
-    $filtre = str_replace(":", "=", $filtre);
-    $sql .= " AND ".$filtre;
-}
-if ($typeid) {
-    $sql .= " AND t.fk_typepayment=".$typeid;
-}
 $sql .= $db->order($sortfield, $sortorder);
-$totalnboflines = 0;
-$result = $db->query($sql);
-if ($result)
-{
-    $totalnboflines = $db->num_rows($result);
+
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+
+	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords) {
+		$page = 0;
+		$offset = 0;
+	}
 }
+
 $sql .= $db->plimit($limit + 1, $offset);
 
 $result = $db->query($sql);
-if ($result)
+if (!$result)
 {
-    $num = $db->num_rows($result);
-    $i = 0;
-    $total = 0;
-
-	$param = '';
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
-	if ($typeid) $param .= '&amp;typeid='.$typeid;
-
-	$url = DOL_URL_ROOT.'/compta/tva/card.php?action=create';
-	if (!empty($socid)) $url .= '&socid='.$socid;
-	$newcardbutton = dolGetButtonTitle($langs->trans('NewVATPayment', ($ltt + 1)), '', 'fa fa-plus-circle', $url, '', $user->rights->tax->charges->creer);
-
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
-	print_barre_liste($langs->trans("VATPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
-
-	print '<div class="div-table-responsive">';
-	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
-
-	print '<tr class="liste_titre_filter">';
-	// Ref
-	print '<td class="liste_titre"><input type="text" class="flat" size="4" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
-	// Label
-	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
-	// Date end period
-	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
-	print $form->selectDate($search_dateend_start ? $search_dateend_start : -1, 'search_dateend_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
-	print '</div>';
-	print '<div class="nowrap">';
-	print $form->selectDate($search_dateend_end ? $search_dateend_end : -1, 'search_dateend_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
-	print '</div>';
-	// Date payment
-	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
-	print $form->selectDate($search_datepayment_start ? $search_datepayment_start : -1, 'search_datepayment_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
-	print '</div>';
-	print '<div class="nowrap">';
-	print $form->selectDate($search_datepayment_end ? $search_datepayment_end : -1, 'search_datepayment_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
-	print '</div>';
-	// Type
-	print '<td class="liste_titre left">';
-	$form->select_types_paiements($typeid, 'typeid', '', 0, 1, 1, 16);
-	print '</td>';
-	// Account
-	if (!empty($conf->banque->enabled))
-    {
-	    print '<td class="liste_titre">';
-	    $form->select_comptes($search_account, 'search_account', 0, '', 1);
-	    print '</td>';
-    }
-	// Amount
-	print '<td class="liste_titre right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
-    print '<td class="liste_titre maxwidthsearch">';
-    $searchpicto = $form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
-	print "</tr>\n";
-
-	print '<tr class="liste_titre">';
-	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "t.rowid", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "t.label", "", $param, 'align="left"', $sortfield, $sortorder);
-	print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "t.datev", "", $param, 'align="center"', $sortfield, $sortorder);
-	print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "t.datep", "", $param, 'align="center"', $sortfield, $sortorder);
-	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "type", "", $param, '', $sortfield, $sortorder, 'left ');
-	if (!empty($conf->banque->enabled)) print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "t.amount", "", $param, '', $sortfield, $sortorder, 'right ');
-	print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
-	print "</tr>\n";
-
-	while ($i < min($num, $limit))
-    {
-        $obj = $db->fetch_object($result);
-
-		if ($obj->payment_code <> '')
-		{
-			$type = '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
-		} else {
-			$type = '<td>&nbsp;</td>';
-		}
-
-        print '<tr class="oddeven">';
-
-		$tva_static->id = $obj->rowid;
-		$tva_static->ref = $obj->rowid;
-
-		// Ref
-		print "<td>".$tva_static->getNomUrl(1)."</td>\n";
-        // Label
-		print "<td>".dol_trunc($obj->label, 40)."</td>\n";
-		// Date end period
-        print '<td class="center">'.dol_print_date($db->jdate($obj->datev), 'day')."</td>\n";
-        // Date payment
-        print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
-        // Type
-		print $type;
-		// Account
-    	if (!empty($conf->banque->enabled))
-	    {
-	        print '<td>';
-	        if ($obj->fk_bank > 0)
-			{
-				$bankstatic->id = $obj->bid;
-				$bankstatic->ref = $obj->bref;
-				$bankstatic->number = $obj->bnumber;
-				$bankstatic->account_number = $obj->account_number;
-
-				$accountingjournal = new AccountingJournal($db);
-				$accountingjournal->fetch($obj->fk_accountancy_journal);
-				$bankstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
-
-				$bankstatic->label = $obj->blabel;
-				print $bankstatic->getNomUrl(1);
-			} else print '&nbsp;';
-			print '</td>';
-		}
-		// Amount
-        $total = $total + $obj->amount;
-		print '<td class="nowrap right">'.price($obj->amount)."</td>";
-	    print "<td>&nbsp;</td>";
-        print "</tr>\n";
-
-        $i++;
-    }
-
-    $colspan = 5;
-    if (!empty($conf->banque->enabled)) $colspan++;
-    print '<tr class="liste_total"><td colspan="'.$colspan.'">'.$langs->trans("Total").'</td>';
-    print '<td class="right">'.price($total).'</td>';
-	print "<td>&nbsp;</td></tr>";
-
-    print "</table>";
-    print '</div>';
-
-	print '</form>';
-
-    $db->free($result);
-} else {
-    dol_print_error($db);
+	dol_print_error($db);
+	llxFooter();
+	$db->close();
+	exit;
 }
 
+$num = $db->num_rows($result);
+
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER['PHP_SELF']) $param .= '&contextpage='.$contextpage;
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
+
+if (!empty($search_ref))							$param .= '&search_ref="'.$search_ref.'"';
+if (!empty($search_label))							$param .= '&search_label="'.$search_label.'"';
+if (!empty($search_dateend_start))					$param .= '&search_dateend_startyear='.GETPOST('search_dateend_startyear', 'int');
+if (!empty($search_dateend_start))					$param .= '&search_dateend_startmonth='.GETPOST('search_dateend_startmonth', 'int');
+if (!empty($search_dateend_start))					$param .= '&search_dateend_startday='.GETPOST('search_dateend_startday', 'int');
+if (!empty($search_dateend_end))					$param .= '&search_dateend_endyear='.GETPOST('search_dateend_endyear', 'int');
+if (!empty($search_dateend_end))					$param .= '&search_dateend_endmonth='.GETPOST('search_dateend_endmonth', 'int');
+if (!empty($search_dateend_end))					$param .= '&search_dateend_endday='.GETPOST('search_dateend_endday', 'int');
+if (!empty($search_datepayment_start))				$param .= '&search_datepayment_startyear='.GETPOST('search_datepayment_startyear', 'int');
+if (!empty($search_datepayment_start))				$param .= '&search_datepayment_startmonth='.GETPOST('search_datepayment_startmonth', 'int');
+if (!empty($search_datepayment_start))				$param .= '&search_datepayment_startday='.GETPOST('search_datepayment_startday', 'int');
+if (!empty($search_datepayment_end))				$param .= '&search_datepayment_endyear='.GETPOST('search_datepayment_endyear', 'int');
+if (!empty($search_datepayment_end))				$param .= '&search_datepayment_endmonth='.GETPOST('search_datepayment_endmonth', 'int');
+if (!empty($search_datepayment_end))				$param .= '&search_datepayment_endday='.GETPOST('search_datepayment_endday', 'int');
+if (!empty($search_type) && $search_type > 0)		$param .= '&search_type='.$search_type;
+if (!empty($search_cheque))							$param .= '&search_cheque="'.$search_cheque.'"';
+if (!empty($search_account) && $search_account > 0)	$param .= '&search_account='.$search_account;
+if (!empty($search_amount))							$param .= '&search_amount="'.$search_amount.'"';
+
+print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+$url = DOL_URL_ROOT.'/compta/tva/card.php?action=create';
+if (!empty($socid)) $url .= '&socid='.$socid;
+$newcardbutton = dolGetButtonTitle($langs->trans('NewVATPayment', ($ltt + 1)), '', 'fa fa-plus-circle', $url, '', $user->rights->tax->charges->creer);
+print_barre_liste($langs->trans("VATPayments"), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
+
+$varpage = empty($contextpage) ? $_SERVER['PHP_SELF'] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+
+print '<div class="div-table-responsive">';
+print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : '').'">';
+
+print '<tr class="liste_titre_filter">';
+
+// Filters: Lines (placeholder)
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+
+// Filter: Ref
+if (!empty($arrayfields['t.rowid']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" size="4" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+	print '</td>';
+}
+
+// Filter: Label
+if (!empty($arrayfields['t.label']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" size="10" name="search_label" value="'.dol_escape_htmltag($search_label).'">';
+	print '</td>';
+}
+
+// Filter: Date end period
+if (!empty($arrayfields['t.datev']['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_dateend_start ? $search_dateend_start : -1, 'search_dateend_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
+	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_dateend_end ? $search_dateend_end : -1, 'search_dateend_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
+	print '</div>';
+	print '</td>';
+}
+
+// Filter: Date payment
+if (!empty($arrayfields['t.datep']['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_datepayment_start ? $search_datepayment_start : -1, 'search_datepayment_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
+	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_datepayment_end ? $search_datepayment_end : -1, 'search_datepayment_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
+	print '</div>';
+	print '</td>';
+}
+
+// Filter: Type
+if (!empty($arrayfields['t.fk_typepayment']['checked'])) {
+	print '<td class="liste_titre left">';
+	$form->select_types_paiements($search_type, 'search_type', '', 0, 1, 1, 16);
+	print '</td>';
+}
+
+// Filter: Cheque number
+if (!empty($arrayfields['t.num_payment']['checked'])) {
+	print '<td class="liste_titre left">';
+	print '<input name="search_cheque" class="flat" type="text" size="8" value="'.$search_cheque.'">';
+	print '</td>';
+}
+
+// Filter: Bank transaction number (placeholder)
+if (!empty($arrayfields['transaction']['checked'])) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+
+// Filter: Bank account
+if (!empty($arrayfields['ba.label']['checked'])) {
+	print '<td class="liste_titre">';
+	$form->select_comptes($search_account, 'search_account', 0, '', 1);
+	print '</td>';
+}
+
+// Filter: Amount
+if (!empty($arrayfields['t.amount']['checked'])) {
+	print '<td class="liste_titre right">';
+	print '<input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'">';
+	print '</td>';
+}
+
+// Fields from hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+// Filter: Buttons
+print '<td class="liste_titre maxwidthsearch">';
+print $form->showFilterAndCheckAddButtons(0);
+print '</td>';
+
+print '</tr>';
+
+print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST))	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['t.rowid']['checked']))				print_liste_field_titre($arrayfields['t.rowid']['label'], $_SERVER['PHP_SELF'], 't.rowid', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['t.label']['checked']))				print_liste_field_titre($arrayfields['t.label']['label'], $_SERVER['PHP_SELF'], 't.label', '', $param, 'align="left"', $sortfield, $sortorder);
+if (!empty($arrayfields['t.datev']['checked']))				print_liste_field_titre($arrayfields['t.datev']['label'], $_SERVER['PHP_SELF'], 't.datev', '', $param, 'align="center"', $sortfield, $sortorder);
+if (!empty($arrayfields['t.datep']['checked']))				print_liste_field_titre($arrayfields['t.datep']['label'], $_SERVER['PHP_SELF'], 't.datep', '', $param, 'align="center"', $sortfield, $sortorder);
+if (!empty($arrayfields['t.fk_typepayment']['checked']))	print_liste_field_titre($arrayfields['t.fk_typepayment']['label'], $_SERVER['PHP_SELF'], 't.fk_typepayment', '', $param, '', $sortfield, $sortorder, 'left ');
+if (!empty($arrayfields['t.num_payment']['checked']))		print_liste_field_titre($arrayfields['t.num_payment']['label'], $_SERVER['PHP_SELF'], 't.num_payment', '', $param, '', $sortfield, $sortorder, '', $arrayfields['t.num_payment']['tooltip']);
+if (!empty($arrayfields['transaction']['checked']))			print_liste_field_titre($arrayfields['transaction']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['ba.label']['checked']))			print_liste_field_titre($arrayfields['ba.label']['label'], $_SERVER['PHP_SELF'], 'ba.label', '', $param, '', $sortfield, $sortorder, 'left ');
+if (!empty($arrayfields['t.amount']['checked']))			print_liste_field_titre($arrayfields['t.amount']['label'], $_SERVER['PHP_SELF'], 't.amount', '', $param, '', $sortfield, $sortorder, 'right ');
+
+// Hook fields
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print_liste_field_titre($selectedfields, $_SERVER['PHP_SELF'], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+print '</tr>';
+
+$i = 0;
+$totalarray = array();
+while ($i < min($num, $limit)) {
+	$obj = $db->fetch_object($result);
+
+	$tva_static->id = $obj->rowid;
+	$tva_static->ref = $obj->rowid;
+
+	print '<tr class="oddeven">';
+
+	// No
+	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+		print '<td>'.(($offset * $limit) + $i).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Ref
+	if (!empty($arrayfields['t.rowid']['checked'])) {
+		print '<td>'.$tva_static->getNomUrl(1).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Label
+	if (!empty($arrayfields['t.label']['checked'])) {
+		print '<td>'.dol_trunc($obj->label, 40).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Date end period
+	if (!empty($arrayfields['t.datev']['checked'])) {
+		print '<td class="center">'.dol_print_date($db->jdate($obj->datev), 'day').'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Date payment
+	if (!empty($arrayfields['t.datep']['checked'])) {
+		print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day').'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Type
+	if (!empty($arrayfields['t.fk_typepayment']['checked']))
+	{
+		print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Cheque number
+	if (!empty($arrayfields['t.num_payment']['checked'])) {
+		print '<td>'.$obj->num_payment.'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Bank transaction
+	if (!empty($arrayfields['transaction']['checked'])) {
+		$bankline->fetch($obj->fk_bank);
+		print '<td>'.$bankline->getNomUrl(1, 0).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Account
+	if (!empty($arrayfields['ba.label']['checked'])) {
+		print '<td>';
+		if ($obj->fk_bank > 0) {
+			$bankstatic->id = $obj->bid;
+			$bankstatic->ref = $obj->bref;
+			$bankstatic->number = $obj->bnumber;
+			$bankstatic->account_number = $obj->account_number;
+
+			$accountingjournal->fetch($obj->fk_accountancy_journal);
+			$bankstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+
+			$bankstatic->label = $obj->blabel;
+			print $bankstatic->getNomUrl(1);
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Amount
+	$total = $total + $obj->amount;
+	print '<td class="nowrap right">'.price($obj->amount).'</td>';
+	if (!$i) $totalarray['nbfield']++;
+	$totalarray['pos'][$totalarray['nbfield']] = 'amount';
+	$totalarray['val']['amount'] += $objp->amount;
+
+	// Buttons
+	print '<td></td>';
+
+	print '</tr>';
+
+	$i++;
+}
+
+// Add a buttons placeholder for the total line
+$totalarray['nbfield']++;
+
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+print '</table>';
+print '</div>';
+print '</form>';
+
+$db->free($result);
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index 8fb4c32bf72..ba12b08b3b0 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -159,16 +159,16 @@ $prevyear = $year_start; $prevquarter = $q;
 if ($prevquarter > 1) {
 	$prevquarter--;
 } else {
-    $prevquarter = 4;
-    $prevyear--;
+	$prevquarter = 4;
+	$prevyear--;
 }
 $nextyear = $year_start;
 $nextquarter = $q;
 if ($nextquarter < 4) {
 	$nextquarter++;
 } else {
-    $nextquarter = 1;
-    $nextyear++;
+	$nextquarter = 1;
+	$nextyear++;
 }
 $description .= $fsearch;
 $builddate = dol_now();
diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example
index 6b1b5e0ea0a..2d14e0e56fb 100644
--- a/htdocs/conf/conf.php.example
+++ b/htdocs/conf/conf.php.example
@@ -287,6 +287,18 @@ $dolibarr_cron_allow_cli='0';
 // Examples: '-1' (sending by cli is forbidden)
 // $dolibarr_mailing_limit_sendbycli='0';
 
+// MAIN_ANTIVIRUS_COMMAND (as a constant)
+// Force a value for the antivirus command line tool so setup for admin user interface has no effect.
+// Default value: ''
+// Example: '/usr/bin/clamdscan';
+// define('MAIN_ANTIVIRUS_COMMAND', '/usr/bin/clamdscan');
+
+// MAIN_ANTIVIRUS_PARAM (as a constant)
+// Force a value for the antivirus parameters on command line so setup for admin user interface has no effect.
+// Default value: ''
+// Example: '--fdpass';
+// define('MAIN_ANTIVIRUS_PARAM', '--fdpass');
+
 
 //##################
 // Other
@@ -323,7 +335,6 @@ $dolibarr_cron_allow_cli='0';
 //$dolibarr_lib_FPDF_PATH='/usr/share/php/fpdf';
 //$dolibarr_lib_GEOIP_PATH='';
 //$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
-//$dolibarr_lib_PHPEXCEL_PATH='';
 //$dolibarr_lib_ODTPHP_PATH='';
 //$dolibarr_lib_ODTPHP_PATHTOPCLZIP="/usr/share/php/libphp-pclzip";
 // Value to overwrite path to use shared javascript instead of embedded one
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index 23a6042fbf9..2aeb2e4e2a1 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -67,17 +67,17 @@ $objcanvas = null;
 $canvas = (!empty($object->canvas) ? $object->canvas : GETPOST("canvas"));
 if (!empty($canvas))
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
-    $objcanvas = new Canvas($db, $action);
-    $objcanvas->getCanvas('contact', 'contactcard', $canvas);
+	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
+	$objcanvas = new Canvas($db, $action);
+	$objcanvas->getCanvas('contact', 'contactcard', $canvas);
 }
 
 if (GETPOST('actioncode', 'array'))
 {
-    $actioncode = GETPOST('actioncode', 'array', 3);
-    if (!count($actioncode)) $actioncode = '0';
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) $actioncode = '0';
 } else {
-    $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
@@ -110,19 +110,19 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Cancel
-    if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-    {
-        header("Location: ".$backtopage);
-        exit;
-    }
+	// Cancel
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage))
+	{
+		header("Location: ".$backtopage);
+		exit;
+	}
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-    {
-        $actioncode = '';
-        $search_agenda_label = '';
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
+	{
+		$actioncode = '';
+		$search_agenda_label = '';
+	}
 }
 
 
@@ -140,138 +140,138 @@ llxHeader('', $title, $help_url);
 
 if ($socid > 0)
 {
-    $objsoc = new Societe($db);
-    $objsoc->fetch($socid);
+	$objsoc = new Societe($db);
+	$objsoc->fetch($socid);
 }
 
 if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 {
-    // -----------------------------------------
-    // When used with CANVAS
-    // -----------------------------------------
-    if (empty($object->error) && $id)
+	// -----------------------------------------
+	// When used with CANVAS
+	// -----------------------------------------
+	if (empty($object->error) && $id)
  	{
  		$object = new Contact($db);
  		$result = $object->fetch($id);
 		if ($result <= 0) dol_print_error('', $object->error);
  	}
    	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
-    $objcanvas->display_canvas($action); // Show template
+	$objcanvas->display_canvas($action); // Show template
 } else {
-    // -----------------------------------------
-    // When used in standard mode
-    // -----------------------------------------
+	// -----------------------------------------
+	// When used in standard mode
+	// -----------------------------------------
 
-    // Confirm deleting contact
-    if ($user->rights->societe->contact->supprimer)
-    {
-        if ($action == 'delete')
-        {
-            print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id.($backtopage ? '&backtopage='.$backtopage : ''), $langs->trans("DeleteContact"), $langs->trans("ConfirmDeleteContact"), "confirm_delete", '', 0, 1);
-        }
-    }
+	// Confirm deleting contact
+	if ($user->rights->societe->contact->supprimer)
+	{
+		if ($action == 'delete')
+		{
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id.($backtopage ? '&backtopage='.$backtopage : ''), $langs->trans("DeleteContact"), $langs->trans("ConfirmDeleteContact"), "confirm_delete", '', 0, 1);
+		}
+	}
 
-    /*
+	/*
      * Onglets
      */
-    $head = array();
-    if ($id > 0)
-    {
-        // Si edition contact deja existant
-        $object = new Contact($db);
-        $res = $object->fetch($id, $user);
-        if ($res < 0) { dol_print_error($db, $object->error); exit; }
-        $res = $object->fetch_optionals();
-        if ($res < 0) { dol_print_error($db, $object->error); exit; }
+	$head = array();
+	if ($id > 0)
+	{
+		// Si edition contact deja existant
+		$object = new Contact($db);
+		$res = $object->fetch($id, $user);
+		if ($res < 0) { dol_print_error($db, $object->error); exit; }
+		$res = $object->fetch_optionals();
+		if ($res < 0) { dol_print_error($db, $object->error); exit; }
 
-        // Show tabs
-        $head = contact_prepare_head($object);
+		// Show tabs
+		$head = contact_prepare_head($object);
 
-        $title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
-    }
+		$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
+	}
 
-    if (!empty($id) && $action != 'edit' && $action != 'create')
-    {
-        $objsoc = new Societe($db);
+	if (!empty($id) && $action != 'edit' && $action != 'create')
+	{
+		$objsoc = new Societe($db);
 
-        /*
+		/*
          * Fiche en mode visualisation
          */
 
-        dol_htmloutput_errors($error, $errors);
+		dol_htmloutput_errors($error, $errors);
 
-        dol_fiche_head($head, 'agenda', $title, -1, 'contact');
+		print dol_get_fiche_head($head, 'agenda', $title, -1, 'contact');
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        $morehtmlref = '<div class="refidno">';
-        if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-        {
-            $objsoc = new Societe($db);
-            $objsoc->fetch($object->socid);
-            // Thirdparty
-            $morehtmlref .= $langs->trans('ThirdParty').' : ';
-            if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1);
-            else $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
-        }
-        $morehtmlref .= '</div>';
+		$morehtmlref = '<div class="refidno">';
+		if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+		{
+			$objsoc = new Societe($db);
+			$objsoc->fetch($object->socid);
+			// Thirdparty
+			$morehtmlref .= $langs->trans('ThirdParty').' : ';
+			if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1);
+			else $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+		}
+		$morehtmlref .= '</div>';
 
-        dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+		dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
 
-        print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
+		print '<div class="underbanner clearboth"></div>';
 
-        $object->info($id);
-        dol_print_object_info($object, 1);
+		$object->info($id);
+		dol_print_object_info($object, 1);
 
-        print '</div>';
+		print '</div>';
 
-        dol_fiche_end();
+		print dol_get_fiche_end();
 
 
-    	// Actions buttons
+		// Actions buttons
 
-        $objcon = $object;
-        $object->fetch_thirdparty();
-        $objthirdparty = $object->thirdparty;
+		$objcon = $object;
+		$object->fetch_thirdparty();
+		$objthirdparty = $object->thirdparty;
 
-        $out = '';
-        $permok = $user->rights->agenda->myactions->create;
-        if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
-        {
+		$out = '';
+		$permok = $user->rights->agenda->myactions->create;
+		if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
+		{
 			if (is_object($objthirdparty) && get_class($objthirdparty) == 'Societe') $out .= '&amp;originid='.$objthirdparty->id.($objthirdparty->id > 0 ? '&amp;socid='.$objthirdparty->id : '');
 			$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;origin=contact&amp;originid='.$object->id.'&amp;percentage=-1&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].($objcon->id > 0 ? '?id='.$objcon->id : ''));
 			$out .= '&amp;datep='.urlencode(dol_print_date(dol_now(), 'dayhourlog'));
-    	}
+		}
 
-    	$newcardbutton = '';
-    	if (!empty($conf->agenda->enabled))
-    	{
-    		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
-    		{
-                $newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out);
-    		}
-    	}
+		$newcardbutton = '';
+		if (!empty($conf->agenda->enabled))
+		{
+			if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
+			{
+				$newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out);
+			}
+		}
 
-        if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-       	{
-       		print '<br>';
+		if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
+	   	{
+	   		print '<br>';
 
-            $param = '&id='.$id;
-            if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-            if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+			$param = '&id='.$id;
+			if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+			if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
-            print load_fiche_titre($langs->trans("ActionsOnContact"), $newcardbutton, '');
-            //print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $morehtmlcenter, 0, -1, '', '', '', '', 0, 1, 1);
+			print load_fiche_titre($langs->trans("ActionsOnContact"), $newcardbutton, '');
+			//print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $morehtmlcenter, 0, -1, '', '', '', '', 0, 1, 1);
 
-            // List of all actions
-    		$filters = array();
-        	$filters['search_agenda_label'] = $search_agenda_label;
+			// List of all actions
+			$filters = array();
+			$filters['search_agenda_label'] = $search_agenda_label;
 
-            show_actions_done($conf, $langs, $db, $objthirdparty, $object, 0, $actioncode, '', $filters, $sortfield, $sortorder);
-        }
-    }
+			show_actions_done($conf, $langs, $db, $objthirdparty, $object, 0, $actioncode, '', $filters, $sortfield, $sortorder);
+		}
+	}
 }
 
 
diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index 415d9e47790..f6f6fa0b45e 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -27,15 +27,15 @@
  */
 abstract class ActionsContactCardCommon
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $dirmodule;
-    public $targetmodule;
-    public $canvas;
-    public $card;
+	public $dirmodule;
+	public $targetmodule;
+	public $canvas;
+	public $card;
 
 	//! Template container
 	public $tpl = array();
@@ -55,14 +55,14 @@ abstract class ActionsContactCardCommon
 
 
 	/**
-     *  Get object
+	 *  Get object
 	 *
-     *  @param	int		$id		Object id
-     *  @return	object			Object loaded
-     */
-    public function getObject($id)
-    {
-    	/*$ret = $this->getInstanceDao();
+	 *  @param	int		$id		Object id
+	 *  @return	object			Object loaded
+	 */
+	public function getObject($id)
+	{
+		/*$ret = $this->getInstanceDao();
 
     	if (is_object($this->object) && method_exists($this->object,'fetch'))
     	{
@@ -70,39 +70,39 @@ abstract class ActionsContactCardCommon
     	}
     	else
     	{*/
-    		$object = new Contact($this->db);
-    		if (!empty($id)) $object->fetch($id);
-            $this->object = $object;
-    	//}
-    }
+			$object = new Contact($this->db);
+			if (!empty($id)) $object->fetch($id);
+			$this->object = $object;
+		//}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Set content of ->tpl array, to use into template
-     *
-     *  @param	string		$action    Type of action
-     *  @param	int			$id			Id
-     *  @return	string					HTML output
-     */
-    public function assign_values(&$action, $id)
-    {
-        // phpcs:enable
-        global $conf, $langs, $user, $canvas;
-        global $form, $formcompany, $objsoc;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Set content of ->tpl array, to use into template
+	 *
+	 *  @param	string		$action    Type of action
+	 *  @param	int			$id			Id
+	 *  @return	string					HTML output
+	 */
+	public function assign_values(&$action, $id)
+	{
+		// phpcs:enable
+		global $conf, $langs, $user, $canvas;
+		global $form, $formcompany, $objsoc;
 
-        if ($action == 'add' || $action == 'update') $this->assign_post();
+		if ($action == 'add' || $action == 'update') $this->assign_post();
 
-        foreach ($this->object as $key => $value)
-        {
-            $this->tpl[$key] = $value;
-        }
+		foreach ($this->object as $key => $value)
+		{
+			$this->tpl[$key] = $value;
+		}
 
-        $this->tpl['error'] = $this->error;
-        $this->tpl['errors'] = $this->errors;
+		$this->tpl['error'] = $this->error;
+		$this->tpl['errors'] = $this->errors;
 
-        if ($action == 'create' || $action == 'edit')
-        {
-        	if ($conf->use_javascript_ajax)
+		if ($action == 'create' || $action == 'edit')
+		{
+			if ($conf->use_javascript_ajax)
 			{
 				$this->tpl['ajax_selectcountry'] = "\n".'<script type="text/javascript" language="javascript">
 				jQuery(document).ready(function () {
@@ -115,201 +115,201 @@ abstract class ActionsContactCardCommon
 				</script>'."\n";
 			}
 
-        	if (is_object($objsoc) && $objsoc->id > 0)
-        	{
-        		$this->tpl['company'] = $objsoc->getNomUrl(1);
-        		$this->tpl['company_id'] = $objsoc->id;
-        	} else {
-        		$this->tpl['company'] = $form->select_company($this->object->socid, 'socid', '', 1);
-        	}
+			if (is_object($objsoc) && $objsoc->id > 0)
+			{
+				$this->tpl['company'] = $objsoc->getNomUrl(1);
+				$this->tpl['company_id'] = $objsoc->id;
+			} else {
+				$this->tpl['company'] = $form->select_company($this->object->socid, 'socid', '', 1);
+			}
 
-        	// Civility
-        	$this->tpl['select_civility'] = $formcompany->select_civility($this->object->civility_id);
+			// Civility
+			$this->tpl['select_civility'] = $formcompany->select_civility($this->object->civility_id);
 
-        	// Predefined with third party
-        	if ((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE') || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS))
-        	{
-        		if (dol_strlen(trim($this->object->address)) == 0) $this->tpl['address'] = $objsoc->address;
-        		if (dol_strlen(trim($this->object->zip)) == 0) $this->object->zip = $objsoc->zip;
-        		if (dol_strlen(trim($this->object->town)) == 0) $this->object->town = $objsoc->town;
-        		if (dol_strlen(trim($this->object->phone_pro)) == 0) $this->object->phone_pro = $objsoc->phone;
-        		if (dol_strlen(trim($this->object->fax)) == 0) $this->object->fax = $objsoc->fax;
-        		if (dol_strlen(trim($this->object->email)) == 0) $this->object->email = $objsoc->email;
-        	}
+			// Predefined with third party
+			if ((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE') || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS))
+			{
+				if (dol_strlen(trim($this->object->address)) == 0) $this->tpl['address'] = $objsoc->address;
+				if (dol_strlen(trim($this->object->zip)) == 0) $this->object->zip = $objsoc->zip;
+				if (dol_strlen(trim($this->object->town)) == 0) $this->object->town = $objsoc->town;
+				if (dol_strlen(trim($this->object->phone_pro)) == 0) $this->object->phone_pro = $objsoc->phone;
+				if (dol_strlen(trim($this->object->fax)) == 0) $this->object->fax = $objsoc->fax;
+				if (dol_strlen(trim($this->object->email)) == 0) $this->object->email = $objsoc->email;
+			}
 
-            // Zip
-            $this->tpl['select_zip'] = $formcompany->select_ziptown($this->object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
+			// Zip
+			$this->tpl['select_zip'] = $formcompany->select_ziptown($this->object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
 
-            // Town
-            $this->tpl['select_town'] = $formcompany->select_ziptown($this->object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
+			// Town
+			$this->tpl['select_town'] = $formcompany->select_ziptown($this->object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
 
-            if (dol_strlen(trim($this->object->country_id)) == 0) $this->object->country_id = $objsoc->country_id;
+			if (dol_strlen(trim($this->object->country_id)) == 0) $this->object->country_id = $objsoc->country_id;
 
-            // Country
-            $this->tpl['select_country'] = $form->select_country($this->object->country_id, 'country_id');
-            $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
+			// Country
+			$this->tpl['select_country'] = $form->select_country($this->object->country_id, 'country_id');
+			$countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
-            if ($user->admin) $this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			if ($user->admin) $this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 
-            // State
-            if ($this->object->country_id) $this->tpl['select_state'] = $formcompany->select_state($this->object->state_id, $this->object->country_code);
-            else $this->tpl['select_state'] = $countrynotdefined;
+			// State
+			if ($this->object->country_id) $this->tpl['select_state'] = $formcompany->select_state($this->object->state_id, $this->object->country_code);
+			else $this->tpl['select_state'] = $countrynotdefined;
 
-            // Public or private
-            $selectarray = array('0'=>$langs->trans("ContactPublic"), '1'=>$langs->trans("ContactPrivate"));
-            $this->tpl['select_visibility'] = $form->selectarray('priv', $selectarray, $this->object->priv, 0);
-        }
+			// Public or private
+			$selectarray = array('0'=>$langs->trans("ContactPublic"), '1'=>$langs->trans("ContactPrivate"));
+			$this->tpl['select_visibility'] = $form->selectarray('priv', $selectarray, $this->object->priv, 0);
+		}
 
-        if ($action == 'view' || $action == 'edit' || $action == 'delete')
-        {
-        	// Emailing
-        	if (!empty($conf->mailing->enabled))
+		if ($action == 'view' || $action == 'edit' || $action == 'delete')
+		{
+			// Emailing
+			if (!empty($conf->mailing->enabled))
 			{
 				$langs->load("mails");
 				$this->tpl['nb_emailing'] = $this->object->getNbOfEMailings();
 			}
 
-        	// Linked element
-        	$this->tpl['contact_element'] = array();
-        	$i = 0;
+			// Linked element
+			$this->tpl['contact_element'] = array();
+			$i = 0;
 
-        	$this->object->load_ref_elements();
+			$this->object->load_ref_elements();
 
-        	if (!empty($conf->commande->enabled))
-        	{
-        		$this->tpl['contact_element'][$i]['linked_element_label'] = $langs->trans("ContactForOrders");
-        		$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_commande ? $this->object->ref_commande : $langs->trans("NoContactForAnyOrder");
-        		$i++;
-        	}
-        	if (!empty($conf->propal->enabled))
-        	{
-        		$this->tpl['contact_element'][$i]['linked_element_label'] = $langs->trans("ContactForProposals");
-        		$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_propal ? $this->object->ref_propal : $langs->trans("NoContactForAnyProposal");
-        		$i++;
-        	}
-        	if (!empty($conf->contrat->enabled))
-        	{
-        		$this->tpl['contact_element'][$i]['linked_element_label'] = $langs->trans("ContactForContracts");
-        		$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_contrat ? $this->object->ref_contrat : $langs->trans("NoContactForAnyContract");
-        		$i++;
-        	}
-        	if (!empty($conf->facture->enabled))
-        	{
-        		$this->tpl['contact_element'][$i]['linked_element_label'] = $langs->trans("ContactForInvoices");
-        		$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_facturation ? $this->object->ref_facturation : $langs->trans("NoContactForAnyInvoice");
-        		$i++;
-        	}
+			if (!empty($conf->commande->enabled))
+			{
+				$this->tpl['contact_element'][$i]['linked_element_label'] = $langs->trans("ContactForOrders");
+				$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_commande ? $this->object->ref_commande : $langs->trans("NoContactForAnyOrder");
+				$i++;
+			}
+			if (!empty($conf->propal->enabled))
+			{
+				$this->tpl['contact_element'][$i]['linked_element_label'] = $langs->trans("ContactForProposals");
+				$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_propal ? $this->object->ref_propal : $langs->trans("NoContactForAnyProposal");
+				$i++;
+			}
+			if (!empty($conf->contrat->enabled))
+			{
+				$this->tpl['contact_element'][$i]['linked_element_label'] = $langs->trans("ContactForContracts");
+				$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_contrat ? $this->object->ref_contrat : $langs->trans("NoContactForAnyContract");
+				$i++;
+			}
+			if (!empty($conf->facture->enabled))
+			{
+				$this->tpl['contact_element'][$i]['linked_element_label'] = $langs->trans("ContactForInvoices");
+				$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_facturation ? $this->object->ref_facturation : $langs->trans("NoContactForAnyInvoice");
+				$i++;
+			}
 
-        	// Dolibarr user
-        	if ($this->object->user_id)
+			// Dolibarr user
+			if ($this->object->user_id)
 			{
 				$dolibarr_user = new User($this->db);
 				$result = $dolibarr_user->fetch($this->object->user_id);
 				$this->tpl['dolibarr_user'] = $dolibarr_user->getLoginUrl(1);
 			} else $this->tpl['dolibarr_user'] = $langs->trans("NoDolibarrAccess");
-        }
+		}
 
-        if ($action == 'view' || $action == 'delete')
-        {
-        	$this->tpl['showrefnav'] = $form->showrefnav($this->object, 'id');
+		if ($action == 'view' || $action == 'delete')
+		{
+			$this->tpl['showrefnav'] = $form->showrefnav($this->object, 'id');
 
-        	if ($this->object->socid > 0)
-        	{
-        		$objsoc = new Societe($this->db);
+			if ($this->object->socid > 0)
+			{
+				$objsoc = new Societe($this->db);
 
-        		$objsoc->fetch($this->object->socid);
-        		$this->tpl['company'] = $objsoc->getNomUrl(1);
-        	} else {
-        		$this->tpl['company'] = $langs->trans("ContactNotLinkedToCompany");
-        	}
+				$objsoc->fetch($this->object->socid);
+				$this->tpl['company'] = $objsoc->getNomUrl(1);
+			} else {
+				$this->tpl['company'] = $langs->trans("ContactNotLinkedToCompany");
+			}
 
-        	$this->tpl['civility'] = $this->object->getCivilityLabel();
+			$this->tpl['civility'] = $this->object->getCivilityLabel();
 
-            $this->tpl['address'] = dol_nl2br($this->object->address);
+			$this->tpl['address'] = dol_nl2br($this->object->address);
 
-            $this->tpl['zip'] = ($this->object->zip ? $this->object->zip.'&nbsp;' : '');
+			$this->tpl['zip'] = ($this->object->zip ? $this->object->zip.'&nbsp;' : '');
 
-            $img = picto_from_langcode($this->object->country_code);
-            $this->tpl['country'] = ($img ? $img.' ' : '').$this->object->country;
+			$img = picto_from_langcode($this->object->country_code);
+			$this->tpl['country'] = ($img ? $img.' ' : '').$this->object->country;
 
-            $this->tpl['phone_pro'] = dol_print_phone($this->object->phone_pro, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
-            $this->tpl['phone_perso'] = dol_print_phone($this->object->phone_perso, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
-            $this->tpl['phone_mobile'] = dol_print_phone($this->object->phone_mobile, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
-            $this->tpl['fax'] = dol_print_phone($this->object->fax, $this->object->country_code, 0, $this->object->id, 'AC_FAX');
-            $this->tpl['email'] = dol_print_email($this->object->email, 0, $this->object->id, 'AC_EMAIL');
+			$this->tpl['phone_pro'] = dol_print_phone($this->object->phone_pro, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
+			$this->tpl['phone_perso'] = dol_print_phone($this->object->phone_perso, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
+			$this->tpl['phone_mobile'] = dol_print_phone($this->object->phone_mobile, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
+			$this->tpl['fax'] = dol_print_phone($this->object->fax, $this->object->country_code, 0, $this->object->id, 'AC_FAX');
+			$this->tpl['email'] = dol_print_email($this->object->email, 0, $this->object->id, 'AC_EMAIL');
 
-            $this->tpl['visibility'] = $this->object->LibPubPriv($this->object->priv);
+			$this->tpl['visibility'] = $this->object->LibPubPriv($this->object->priv);
 
-            $this->tpl['note'] = nl2br($this->object->note);
-        }
+			$this->tpl['note'] = nl2br($this->object->note);
+		}
 
-        if ($action == 'create_user')
-        {
-        	// Full firstname and lastname separated with a dot : firstname.lastname
-        	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-            require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-        	$login = dol_buildlogin($this->object->lastname, $this->object->firstname);
+		if ($action == 'create_user')
+		{
+			// Full firstname and lastname separated with a dot : firstname.lastname
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+			$login = dol_buildlogin($this->object->lastname, $this->object->firstname);
 
-       		$generated_password = getRandomPassword(false);
-        	$password = $generated_password;
+	   		$generated_password = getRandomPassword(false);
+			$password = $generated_password;
 
-        	// Create a form array
-        	$formquestion = array(
-        	array('label' => $langs->trans("LoginToCreate"), 'type' => 'text', 'name' => 'login', 'value' => $login),
-        	array('label' => $langs->trans("Password"), 'type' => 'text', 'name' => 'password', 'value' => $password));
+			// Create a form array
+			$formquestion = array(
+			array('label' => $langs->trans("LoginToCreate"), 'type' => 'text', 'name' => 'login', 'value' => $login),
+			array('label' => $langs->trans("Password"), 'type' => 'text', 'name' => 'password', 'value' => $password));
 
-        	$this->tpl['action_create_user'] = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$this->object->id, $langs->trans("CreateDolibarrLogin"), $langs->trans("ConfirmCreateContact"), "confirm_create_user", $formquestion, 'no');
-        }
-    }
+			$this->tpl['action_create_user'] = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$this->object->id, $langs->trans("CreateDolibarrLogin"), $langs->trans("ConfirmCreateContact"), "confirm_create_user", $formquestion, 'no');
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Assign POST values into object
-     *
-     *  @return		string					HTML output
-     */
-    private function assign_post()
-    {
-        // phpcs:enable
-        global $langs, $mysoc;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Assign POST values into object
+	 *
+	 *  @return		string					HTML output
+	 */
+	private function assign_post()
+	{
+		// phpcs:enable
+		global $langs, $mysoc;
 
-        $this->object->old_name = $_POST["old_name"];
-        $this->object->old_firstname = $_POST["old_firstname"];
+		$this->object->old_name = $_POST["old_name"];
+		$this->object->old_firstname = $_POST["old_firstname"];
 
-        $this->object->socid = $_POST["socid"];
-        $this->object->lastname			= $_POST["name"];
-        $this->object->firstname		= $_POST["firstname"];
-        $this->object->civility_id = $_POST["civility_id"];
-        $this->object->poste			= $_POST["poste"];
-        $this->object->address = $_POST["address"];
-        $this->object->zip = $_POST["zipcode"];
-        $this->object->town				= $_POST["town"];
-        $this->object->country_id = $_POST["country_id"] ? $_POST["country_id"] : $mysoc->country_id;
-        $this->object->state_id = $_POST["state_id"];
-        $this->object->phone_pro = $_POST["phone_pro"];
-        $this->object->phone_perso = $_POST["phone_perso"];
-        $this->object->phone_mobile = $_POST["phone_mobile"];
-        $this->object->fax = $_POST["fax"];
-        $this->object->email			= $_POST["email"];
-        $this->object->jabberid = $_POST["jabberid"];
-        $this->object->priv				= $_POST["priv"];
-        $this->object->note				= $_POST["note"];
-        $this->object->canvas = $_POST["canvas"];
+		$this->object->socid = $_POST["socid"];
+		$this->object->lastname			= $_POST["name"];
+		$this->object->firstname		= $_POST["firstname"];
+		$this->object->civility_id = $_POST["civility_id"];
+		$this->object->poste			= $_POST["poste"];
+		$this->object->address = $_POST["address"];
+		$this->object->zip = $_POST["zipcode"];
+		$this->object->town				= $_POST["town"];
+		$this->object->country_id = $_POST["country_id"] ? $_POST["country_id"] : $mysoc->country_id;
+		$this->object->state_id = $_POST["state_id"];
+		$this->object->phone_pro = $_POST["phone_pro"];
+		$this->object->phone_perso = $_POST["phone_perso"];
+		$this->object->phone_mobile = $_POST["phone_mobile"];
+		$this->object->fax = $_POST["fax"];
+		$this->object->email			= $_POST["email"];
+		$this->object->jabberid = $_POST["jabberid"];
+		$this->object->priv				= $_POST["priv"];
+		$this->object->note				= $_POST["note"];
+		$this->object->canvas = $_POST["canvas"];
 
-        // We set country_id, and country_code label of the chosen country
-        if ($this->object->country_id)
-        {
-            $sql = "SELECT code, label FROM ".MAIN_DB_PREFIX."c_country WHERE rowid = ".$this->object->country_id;
-            $resql = $this->db->query($sql);
-            if ($resql)
-            {
-                $obj = $this->db->fetch_object($resql);
-            } else {
-                dol_print_error($this->db);
-            }
-            $this->object->country_id = $langs->trans("Country".$obj->code) ? $langs->trans("Country".$obj->code) : $obj->label;
-            $this->object->country_code = $obj->code;
-            $this->object->country = $langs->trans("Country".$obj->code) ? $langs->trans("Country".$obj->code) : $obj->label;
-        }
-    }
+		// We set country_id, and country_code label of the chosen country
+		if ($this->object->country_id)
+		{
+			$sql = "SELECT code, label FROM ".MAIN_DB_PREFIX."c_country WHERE rowid = ".$this->object->country_id;
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				$obj = $this->db->fetch_object($resql);
+			} else {
+				dol_print_error($this->db);
+			}
+			$this->object->country_id = $langs->trans("Country".$obj->code) ? $langs->trans("Country".$obj->code) : $obj->label;
+			$this->object->country_code = $obj->code;
+			$this->object->country = $langs->trans("Country".$obj->code) ? $langs->trans("Country".$obj->code) : $obj->label;
+		}
+	}
 }
diff --git a/htdocs/contact/canvas/default/actions_contactcard_default.class.php b/htdocs/contact/canvas/default/actions_contactcard_default.class.php
index 099c973b0a4..d399584b48d 100644
--- a/htdocs/contact/canvas/default/actions_contactcard_default.class.php
+++ b/htdocs/contact/canvas/default/actions_contactcard_default.class.php
@@ -29,22 +29,22 @@ include_once DOL_DOCUMENT_ROOT.'/contact/canvas/actions_contactcard_common.class
  */
 class ActionsContactCardDefault extends ActionsContactCardCommon
 {
-    /**
-     *  Constructor
-     *
-     *	@param	DoliDB	$db				Handler acces base de donnees
-     *	@param	string	$dirmodule		Name of directory of module
-     *	@param	string	$targetmodule	Name of directory of module where canvas is stored
-     *	@param	string	$canvas			Name of canvas
-     *	@param	string	$card			Name of tab (sub-canvas)
-     */
-    public function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
-    {
-        $this->db               = $db;
-        $this->dirmodule = $dirmodule;
-        $this->targetmodule     = $targetmodule;
-        $this->canvas           = $canvas;
-        $this->card             = $card;
+	/**
+	 *  Constructor
+	 *
+	 *	@param	DoliDB	$db				Handler acces base de donnees
+	 *	@param	string	$dirmodule		Name of directory of module
+	 *	@param	string	$targetmodule	Name of directory of module where canvas is stored
+	 *	@param	string	$canvas			Name of canvas
+	 *	@param	string	$card			Name of tab (sub-canvas)
+	 */
+	public function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
+	{
+		$this->db               = $db;
+		$this->dirmodule = $dirmodule;
+		$this->targetmodule     = $targetmodule;
+		$this->canvas           = $canvas;
+		$this->card             = $card;
 	}
 
 	/**
@@ -66,7 +66,7 @@ class ActionsContactCardDefault extends ActionsContactCardCommon
 		return $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Assign custom values for canvas
 	 *
@@ -76,50 +76,50 @@ class ActionsContactCardDefault extends ActionsContactCardCommon
 	 */
 	public function assign_values(&$action, $id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $limit, $offset, $sortfield, $sortorder;
 		global $conf, $db, $langs, $user;
 		global $form;
 
 		$ret = $this->getObject($id);
 
-        parent::assign_values($action, $id);
+		parent::assign_values($action, $id);
 
-        $this->tpl['title'] = $this->getTitle($action);
-        $this->tpl['error'] = $this->error;
-        $this->tpl['errors'] = $this->errors;
+		$this->tpl['title'] = $this->getTitle($action);
+		$this->tpl['error'] = $this->error;
+		$this->tpl['errors'] = $this->errors;
 
 		if ($action == 'view')
 		{
-            // Card header
-            $head = contact_prepare_head($this->object);
-            $title = $this->getTitle($action);
+			// Card header
+			$head = contact_prepare_head($this->object);
+			$title = $this->getTitle($action);
 
-		    $this->tpl['showhead'] = dol_get_fiche_head($head, 'card', $title, 0, 'contact');
-		    $this->tpl['showend'] = dol_get_fiche_end();
+			$this->tpl['showhead'] = dol_get_fiche_head($head, 'card', $title, 0, 'contact');
+			$this->tpl['showend'] = dol_get_fiche_end();
 
-        	$objsoc = new Societe($db);
-            $objsoc->fetch($this->object->socid);
+			$objsoc = new Societe($db);
+			$objsoc->fetch($this->object->socid);
 
-            $this->tpl['actionstodo'] = show_actions_todo($conf, $langs, $db, $objsoc, $this->object, 1);
+			$this->tpl['actionstodo'] = show_actions_todo($conf, $langs, $db, $objsoc, $this->object, 1);
 
-            $this->tpl['actionsdone'] = show_actions_done($conf, $langs, $db, $objsoc, $this->object, 1);
+			$this->tpl['actionsdone'] = show_actions_done($conf, $langs, $db, $objsoc, $this->object, 1);
 		} else {
 			// Confirm delete contact
-        	if ($action == 'delete' && $user->rights->societe->contact->supprimer)
-        	{
-        		$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$this->object->id, $langs->trans("DeleteContact"), $langs->trans("ConfirmDeleteContact"), "confirm_delete", '', 0, 1);
-        	}
+			if ($action == 'delete' && $user->rights->societe->contact->supprimer)
+			{
+				$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$this->object->id, $langs->trans("DeleteContact"), $langs->trans("ConfirmDeleteContact"), "confirm_delete", '', 0, 1);
+			}
 		}
 
 		if ($action == 'list')
 		{
-	        $this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
+			$this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
 		}
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Fetch datas list and save into ->list_datas
 	 *
@@ -129,13 +129,13 @@ class ActionsContactCardDefault extends ActionsContactCardCommon
 	 *  @param	string	$sortorder	Sort order ('ASC' or 'DESC')
 	 *  @return	void
 	 */
-    public function LoadListDatas($limit, $offset, $sortfield, $sortorder)
-    {
-        // phpcs:enable
-        global $conf, $langs;
+	public function LoadListDatas($limit, $offset, $sortfield, $sortorder)
+	{
+		// phpcs:enable
+		global $conf, $langs;
 
-        //$this->getFieldList();
+		//$this->getFieldList();
 
-        $this->list_datas = array();
-    }
+		$this->list_datas = array();
+	}
 }
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
index eba58a52f02..2c82a868ed4 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
@@ -152,8 +152,8 @@ if (!empty($this->control->tpl['contact_element'])) {
 
 <tr>
 	<td colspan="4" class="center">
-	<input type="submit" class="button" name="save" value="<?php echo $langs->trans("Save"); ?>">&nbsp;
-	<input type="submit" class="button" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>">
+	<input type="submit" class="button button-save" name="save" value="<?php echo $langs->trans("Save"); ?>">&nbsp;
+	<input type="submit" class="button button-cancel" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>">
 	</td>
 </tr>
 
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index e4e7ecaf5fb..752bdc4d642 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2013-2016  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2014       Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
- * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2019       Josep Lluís Amador      <joseplluis@lliuretic.cat>
  * Copyright (C) 2020       Open-Dsi     			<support@open-dsi.fr>
  *
@@ -55,7 +55,7 @@ $action = (GETPOST('action', 'alpha') ? GETPOST('action', 'alpha') : 'view');
 $confirm = GETPOST('confirm', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 $id = GETPOST('id', 'int');
-$socid		= GETPOST('socid', 'int');
+$socid = GETPOST('socid', 'int');
 
 $object = new Contact($db);
 $extrafields = new ExtraFields($db);
@@ -178,15 +178,15 @@ if (empty($reshook))
 
 		$object->entity = (GETPOSTISSET('entity') ?GETPOST('entity', 'int') : $conf->entity);
 		$object->socid = GETPOST("socid", 'int');
-		$object->lastname = GETPOST("lastname", 'alpha');
-		$object->firstname = GETPOST("firstname", 'alpha');
-		$object->civility_code = GETPOST("civility_code", 'alpha');
-		$object->poste			= GETPOST("poste", 'alpha');
-		$object->address = GETPOST("address", 'alpha');
-		$object->zip = GETPOST("zipcode", 'alpha');
-		$object->town = GETPOST("town", 'alpha');
-		$object->country_id = GETPOST("country_id", 'int');
-		$object->state_id = GETPOST("state_id", 'int');
+		$object->lastname = (string) GETPOST("lastname", 'alpha');
+		$object->firstname = (string) GETPOST("firstname", 'alpha');
+		$object->civility_code = (string) GETPOST("civility_code", 'alpha');
+		$object->poste = (string) GETPOST("poste", 'alpha');
+		$object->address = (string) GETPOST("address", 'alpha');
+		$object->zip = (string) GETPOST("zipcode", 'alpha');
+		$object->town = (string) GETPOST("town", 'alpha');
+		$object->country_id = (int) GETPOST("country_id", 'int');
+		$object->state_id = (int) GETPOST("state_id", 'int');
 		//$object->jabberid		= GETPOST("jabberid", 'alpha');
 		//$object->skype		= GETPOST("skype", 'alpha');
 		//$object->twitter		= GETPOST("twitter", 'alpha');
@@ -196,22 +196,22 @@ if (empty($reshook))
 		if (!empty($conf->socialnetworks->enabled)) {
 			foreach ($socialnetworks as $key => $value) {
 				if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') {
-					$object->socialnetworks[$key] = GETPOST($key, 'alphanohtml');
+					$object->socialnetworks[$key] = (string) GETPOST($key, 'alphanohtml');
 				}
 			}
 		}
-		$object->email = GETPOST("email", 'alpha');
+		$object->email = (string) GETPOST("email", 'alpha');
 		$object->no_email = GETPOST("no_email", "int");
-		$object->phone_pro = GETPOST("phone_pro", 'alpha');
-		$object->phone_perso = GETPOST("phone_perso", 'alpha');
-		$object->phone_mobile = GETPOST("phone_mobile", 'alpha');
-		$object->fax = GETPOST("fax", 'alpha');
+		$object->phone_pro = (string) GETPOST("phone_pro", 'alpha');
+		$object->phone_perso = (string) GETPOST("phone_perso", 'alpha');
+		$object->phone_mobile = (string) GETPOST("phone_mobile", 'alpha');
+		$object->fax = (string) GETPOST("fax", 'alpha');
 		$object->priv = GETPOST("priv", 'int');
-		$object->note_public = GETPOST("note_public", 'restricthtml');
-		$object->note_private = GETPOST("note_private", 'restricthtml');
+		$object->note_public = (string) GETPOST("note_public", 'restricthtml');
+		$object->note_private = (string) GETPOST("note_private", 'restricthtml');
 		$object->roles = GETPOST("roles", 'array');
 
-		$object->statut			= 1; //Defult status to Actif
+		$object->statut = 1; //Default status to Actif
 
 		// Note: Correct date should be completed with location to have exact GM time of birth.
 		$object->birthday = dol_mktime(0, 0, 0, GETPOST("birthdaymonth", 'int'), GETPOST("birthdayday", 'int'), GETPOST("birthdayyear", 'int'));
@@ -225,9 +225,9 @@ if (empty($reshook))
 			$action = 'create';
 		}
 
-		if (!GETPOST("lastname"))
-		{
-			$error++; $errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Lastname").' / '.$langs->transnoentities("Label"));
+		if (!GETPOST("lastname")) {
+			$error++;
+			$errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Lastname").' / '.$langs->transnoentities("Label"));
 			$action = 'create';
 		}
 
@@ -236,7 +236,8 @@ if (empty($reshook))
 			$id = $object->create($user);
 			if ($id <= 0)
 			{
-				$error++; $errors = array_merge($errors, ($object->error ? array($object->error) : $object->errors));
+				$error++;
+				$errors = array_merge($errors, ($object->error ? array($object->error) : $object->errors));
 				$action = 'create';
 			} else {
 				// Categories association
@@ -278,14 +279,12 @@ if (empty($reshook))
 		$result = $object->fetch($id);
 		$object->oldcopy = clone $object;
 
-		$object->old_lastname = GETPOST("old_lastname");
-		$object->old_firstname = GETPOST("old_firstname");
+		$object->old_lastname = (string) GETPOST("old_lastname", 'alpha');
+		$object->old_firstname = (string) GETPOST("old_firstname", 'alpha');
 
 		$result = $object->delete();
-		if ($result > 0)
-		{
-			if ($backtopage)
-			{
+		if ($result > 0) {
+			if ($backtopage) {
 				header("Location: ".$backtopage);
 				exit;
 			} else {
@@ -360,22 +359,22 @@ if (empty($reshook))
 
 			$object->oldcopy = clone $object;
 
-			$object->old_lastname = GETPOST("old_lastname", 'alpha');
-			$object->old_firstname = GETPOST("old_firstname", 'alpha');
+			$object->old_lastname = (string) GETPOST("old_lastname", 'alpha');
+			$object->old_firstname = (string) GETPOST("old_firstname", 'alpha');
 
 			$object->socid = GETPOST("socid", 'int');
-			$object->lastname = GETPOST("lastname", 'alpha');
-			$object->firstname = GETPOST("firstname", 'alpha');
-			$object->civility_code = GETPOST("civility_code", 'alpha');
-			$object->poste = GETPOST("poste", 'alpha');
+			$object->lastname = (string) GETPOST("lastname", 'alpha');
+			$object->firstname = (string) GETPOST("firstname", 'alpha');
+			$object->civility_code = (string) GETPOST("civility_code", 'alpha');
+			$object->poste = (string) GETPOST("poste", 'alpha');
 
-			$object->address = GETPOST("address", 'alpha');
-			$object->zip = GETPOST("zipcode", 'alpha');
-			$object->town = GETPOST("town", 'alpha');
-			$object->state_id   	= GETPOST("state_id", 'int');
-			$object->country_id		= GETPOST("country_id", 'int');
+			$object->address = (string) GETPOST("address", 'alpha');
+			$object->zip = (string) GETPOST("zipcode", 'alpha');
+			$object->town = (string) GETPOST("town", 'alpha');
+			$object->state_id = GETPOST("state_id", 'int');
+			$object->country_id = GETPOST("country_id", 'int');
 
-			$object->email = GETPOST("email", 'alpha');
+			$object->email = (string) GETPOST("email", 'alpha');
 			$object->no_email = GETPOST("no_email", "int");
 			//$object->jabberid		= GETPOST("jabberid", 'alpha');
 			//$object->skype		= GETPOST("skype", 'alpha');
@@ -386,17 +385,17 @@ if (empty($reshook))
 			if (!empty($conf->socialnetworks->enabled)) {
 				foreach ($socialnetworks as $key => $value) {
 					if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') {
-						$object->socialnetworks[$key] = GETPOST($key, 'alphanohtml');
+						$object->socialnetworks[$key] = (string) GETPOST($key, 'alphanohtml');
 					}
 				}
 			}
-			$object->phone_pro = GETPOST("phone_pro", 'alpha');
-			$object->phone_perso = GETPOST("phone_perso", 'alpha');
-			$object->phone_mobile = GETPOST("phone_mobile", 'alpha');
-			$object->fax = GETPOST("fax", 'alpha');
-			$object->priv = GETPOST("priv", 'int');
-			$object->note_public = GETPOST("note_public", 'restricthtml');
-			$object->note_private = GETPOST("note_private", 'restricthtml');
+			$object->phone_pro = (string) GETPOST("phone_pro", 'alpha');
+			$object->phone_perso = (string) GETPOST("phone_perso", 'alpha');
+			$object->phone_mobile = (string) GETPOST("phone_mobile", 'alpha');
+			$object->fax = (string) GETPOST("fax", 'alpha');
+			$object->priv = (string) GETPOST("priv", 'int');
+			$object->note_public = (string) GETPOST("note_public", 'restricthtml');
+			$object->note_private = (string) GETPOST("note_private", 'restricthtml');
 			$object->roles = GETPOST("roles", 'array');
 
 			// Fill array 'array_options' with data from add form
@@ -611,7 +610,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				print '<input type="hidden" name="entity" value="'.$objsoc->entity.'">';
 			}
 
-			dol_fiche_head($head, 'card', '', 0, '');
+			print dol_get_fiche_head($head, 'card', '', 0, '');
 
 			print '<table class="border centpercent">';
 
@@ -873,29 +872,28 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 			print "</table>";
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
 			print '<input type="submit" class="button" name="add" value="'.$langs->trans("Add").'">';
 			if (!empty($backtopage))
 			{
 				print ' &nbsp; &nbsp; ';
-				print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+				print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 			} else {
 				print ' &nbsp; &nbsp; ';
-				print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+				print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 			}
 			print '</div>';
 
 			print "</form>";
-		} elseif ($action == 'edit' && !empty($id))
-		{
+		} elseif ($action == 'edit' && !empty($id)) {
 			/*
              * Fiche en mode edition
              */
 
 			// We set country_id, and country_code label of the chosen country
-			if (isset($_POST["country_id"]) || $object->country_id)
+			if (GETPOSTISSET("country_id") || $object->country_id)
 			{
 				$tmparray = getCountry($object->country_id, 'all');
 				$object->country_code = $tmparray['code'];
@@ -940,7 +938,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '<input type="hidden" name="old_firstname" value="'.$object->firstname.'">';
 			if (!empty($backtopage)) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
-			dol_fiche_head($head, 'card', $title, 0, 'contact');
+			print dol_get_fiche_head($head, 'card', $title, 0, 'contact');
 
 			print '<table class="border centpercent">';
 
@@ -1237,33 +1235,33 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 			print '</table>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
-			print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+			print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
 			print ' &nbsp; &nbsp; ';
-			print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+			print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 			print '</div>';
 
 			print "</form>";
 		}
 	}
 
-    // Select mail models is same action as presend
-    if (GETPOST('modelselected', 'alpha')) {
-        $action = 'presend';
-    }
+	// Select mail models is same action as presend
+	if (GETPOST('modelselected', 'alpha')) {
+		$action = 'presend';
+	}
 
-    if (!empty($id) && $action != 'edit' && $action != 'create')
-    {
-        $objsoc = new Societe($db);
+	if (!empty($id) && $action != 'edit' && $action != 'create')
+	{
+		$objsoc = new Societe($db);
 
 		// View mode
 
 		// Show errors
 		dol_htmloutput_errors(is_numeric($error) ? '' : $error, $errors);
 
-		dol_fiche_head($head, 'card', $title, -1, 'contact');
+		print dol_get_fiche_head($head, 'card', $title, -1, 'contact');
 
 		if ($action == 'create_user')
 		{
@@ -1482,7 +1480,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '</div></div></div>';
 		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		// Barre d'actions
 		print '<div class="tabsAction">';
@@ -1559,7 +1557,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		$modelmail = 'contact';
 		$defaulttopic = 'Information';
 		$diroutput = $conf->contact->dir_output;
-		$trackid = 'con'.$object->id;
+		$trackid = 'ctc'.$object->id;
 
 		include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 	}
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 8ea6ebea0d4..367a2e7cd62 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -131,80 +131,106 @@ class Contact extends CommonObject
 	public $civility;
 
 	/**
-	 * Address
-	 * @var string
+	 * @var string Address
 	 */
 	public $address;
+
+	/**
+	 * @var string zip code
+	 */
 	public $zip;
+
+	/**
+	 * @var string Town
+	 */
 	public $town;
 
 	public $state_id; // Id of department
 	public $state_code; // Code of department
 	public $state; // Label of department
 
-    public $poste; // Position
+	public $poste; // Position
 
 	public $socid; // fk_soc
 	public $statut; // 0=inactif, 1=actif
 
 	public $code;
 
-    /**
-     * Email
-     * @var string
-     */
+	/**
+	 * Email
+	 * @var string
+	 */
 	public $email;
 
-    /**
-     * Unsuscribe all : 1 = contact has globaly unsubscribe of all mass emailings
+	/**
+	 * Unsuscribe all : 1 = contact has globaly unsubscribe of all mass emailings
 	 * @var int
-     */
+	 */
 	public $no_email;
 
-    /**
-     * @var array array of socialnetworks
-     */
-    public $socialnetworks;
+	/**
+	 * @var array array of socialnetworks
+	 */
+	public $socialnetworks;
 
-    /**
-     * Skype username
-     * @var string
-     * @deprecated
-     */
+	/**
+	 * Skype username
+	 * @var string
+	 * @deprecated
+	 */
 	public $skype;
 
 	/**
-     * Twitter username
-     * @var string
-     * @deprecated
-     */
+	 * Twitter username
+	 * @var string
+	 * @deprecated
+	 */
 	public $twitter;
 
 	 /**
-     * Facebook username
-     * @var string
-     * @deprecated
-     */
+	  * Facebook username
+	  * @var string
+	  * @deprecated
+	  */
 	public $facebook;
 
 	 /**
-     * Linkedin username
-     * @var string
-     * @deprecated
-     */
-    public $linkedin;
+	  * Linkedin username
+	  * @var string
+	  * @deprecated
+	  */
+	public $linkedin;
 
-    /**
-     * Jabber username
-     * @var string
-     * @deprecated
-     */
+	/**
+	 * Jabber username
+	 * @var string
+	 * @deprecated
+	 */
 	public $jabberid;
 
+	/**
+	 * @var string filename for photo
+	 */
 	public $photo;
+
+	/**
+	 * @var string phone pro
+	 */
 	public $phone_pro;
+
+	/**
+	 * @var string phone perso
+	 */
 	public $phone_perso;
+
+	/**
+	 * @var string phone mobile
+	 */
 	public $phone_mobile;
+
+	/**
+	 * @var string fax
+	 */
 	public $fax;
 
 	/**
@@ -227,10 +253,10 @@ class Contact extends CommonObject
 	// END MODULEBUILDER PROPERTIES
 
 
-    /**
-     * Old copy
-     * @var Contact
-     */
+	/**
+	 * Old copy
+	 * @var Contact
+	 */
 	public $oldcopy; // To contains a clone of this when we need to save old properties of object
 
 	public $roles = array();
@@ -253,9 +279,12 @@ class Contact extends CommonObject
 		$this->db = $db;
 		$this->statut = 1; // By default, status is enabled
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID))		$this->fields['rowid']['visible'] = 0;
-		if (empty($conf->mailing->enabled))						$this->fields['no_email']['enabled'] = 0;
-
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
+			$this->fields['rowid']['visible'] = 0;
+		}
+		if (empty($conf->mailing->enabled)) {
+			$this->fields['no_email']['enabled'] = 0;
+		}
 		// typical ['s.nom'] is used for third-parties
 		if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
 			$this->fields['fk_soc']['enabled'] = 0;
@@ -268,10 +297,8 @@ class Contact extends CommonObject
 		}
 
 		// Unset fields that are disabled
-		foreach ($this->fields as $key => $val)
-		{
-			if (isset($val['enabled']) && empty($val['enabled']))
-			{
+		foreach ($this->fields as $key => $val) {
+			if (isset($val['enabled']) && empty($val['enabled'])) {
 				unset($this->fields[$key]);
 			}
 		}
@@ -281,7 +308,7 @@ class Contact extends CommonObject
 		{
 			foreach($this->fields as $key => $val)
 			{
-				if (is_array($val['arrayofkeyval']))
+				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
 				{
 					foreach($val['arrayofkeyval'] as $key2 => $val2)
 					{
@@ -292,7 +319,7 @@ class Contact extends CommonObject
 		}*/
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Load indicators into this->nb for board
 	 *
@@ -300,7 +327,7 @@ class Contact extends CommonObject
 	 */
 	public function load_state_board()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user;
 
 		$this->nb = array();
@@ -310,14 +337,14 @@ class Contact extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
 		if (!$user->rights->societe->client->voir && !$user->socid)
 		{
-		    $sql .= ", ".MAIN_DB_PREFIX."societe as s";
-		    $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			$sql .= " WHERE sp.fk_soc = s.rowid AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 			$clause = "AND";
 		}
 		$sql .= ' '.$clause.' sp.entity IN ('.getEntity($this->element).')';
 		$sql .= " AND (sp.priv='0' OR (sp.priv='1' AND sp.fk_user_creat=".$user->id."))";
-        if ($user->socid > 0) $sql .= " AND sp.fk_soc = ".$user->socid;
+		if ($user->socid > 0) $sql .= " AND sp.fk_soc = ".$user->socid;
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -352,11 +379,9 @@ class Contact extends CommonObject
 
 		// Clean parameters
 		$this->lastname = $this->lastname ?trim($this->lastname) : trim($this->name);
-        $this->firstname = trim($this->firstname);
-        if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname = ucwords(strtolower($this->lastname));
-		if (!empty($conf->global->MAIN_ALL_TO_UPPER)) $this->lastname = strtoupper($this->lastname);
-        if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname = ucwords(strtolower($this->firstname));
-        if (empty($this->socid)) $this->socid = 0;
+		$this->firstname = trim($this->firstname);
+		$this->setUpperOrLowerCase();
+		if (empty($this->socid)) $this->socid = 0;
 		if (empty($this->priv)) $this->priv = 0;
 		if (empty($this->statut)) $this->statut = 0; // This is to convert '' into '0' to avoid bad sql request
 
@@ -365,11 +390,11 @@ class Contact extends CommonObject
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."socpeople (";
 		$sql .= " datec";
 		$sql .= ", fk_soc";
-        $sql .= ", lastname";
-        $sql .= ", firstname";
-        $sql .= ", fk_user_creat";
+		$sql .= ", lastname";
+		$sql .= ", firstname";
+		$sql .= ", fk_user_creat";
 		$sql .= ", priv";
-		$sql.= ", fk_stcommcontact";
+		$sql .= ", fk_stcommcontact";
 		$sql .= ", statut";
 		$sql .= ", canvas";
 		$sql .= ", entity";
@@ -380,15 +405,15 @@ class Contact extends CommonObject
 		if ($this->socid > 0) $sql .= " ".$this->db->escape($this->socid).",";
 		else $sql .= "null,";
 		$sql .= "'".$this->db->escape($this->lastname)."',";
-        $sql .= "'".$this->db->escape($this->firstname)."',";
-        $sql .= " ".($user->id > 0 ? "'".$this->db->escape($user->id)."'" : "null").",";
+		$sql .= "'".$this->db->escape($this->firstname)."',";
+		$sql .= " ".($user->id > 0 ? "'".$this->db->escape($user->id)."'" : "null").",";
 		$sql .= " ".$this->db->escape($this->priv).",";
-		$sql.= " 0,";
+		$sql .= " 0,";
 		$sql .= " ".$this->db->escape($this->statut).",";
-        $sql .= " ".(!empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'" : "null").",";
-        $sql .= " ".$this->db->escape($this->entity).",";
-        $sql .= "'".$this->db->escape($this->ref_ext)."',";
-        $sql .= " ".(!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
+		$sql .= " ".(!empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'" : "null").",";
+		$sql .= " ".$this->db->escape($this->entity).",";
+		$sql .= "'".$this->db->escape($this->ref_ext)."',";
+		$sql .= " ".(!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -399,41 +424,41 @@ class Contact extends CommonObject
 
 			if (!$error)
 			{
-                $result = $this->update($this->id, $user, 1, 'add'); // This include updateRoles(), ...
-                if ($result < 0)
-                {
-                    $error++;
-				    $this->error = $this->db->lasterror();
-                }
+				$result = $this->update($this->id, $user, 1, 'add'); // This include updateRoles(), ...
+				if ($result < 0)
+				{
+					$error++;
+					$this->error = $this->db->lasterror();
+				}
 			}
 
 			if (!$error)
-            {
-                $result = $this->update_perso($this->id, $user, 1); // TODO Remove function update_perso, should be same than update
-                if ($result < 0)
-                {
-                    $error++;
-                    $this->error = $this->db->lasterror();
-                }
-            }
+			{
+				$result = $this->update_perso($this->id, $user, 1); // TODO Remove function update_perso, should be same than update
+				if ($result < 0)
+				{
+					$error++;
+					$this->error = $this->db->lasterror();
+				}
+			}
 
-            if (!$error)
-            {
-                // Call trigger
-                $result = $this->call_trigger('CONTACT_CREATE', $user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-            }
+			if (!$error)
+			{
+				// Call trigger
+				$result = $this->call_trigger('CONTACT_CREATE', $user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
 
-            if (!$error)
-            {
-                $this->db->commit();
-                return $this->id;
-            } else {
-                $this->db->rollback();
-                dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
-                return -2;
-            }
+			if (!$error)
+			{
+				$this->db->commit();
+				return $this->id;
+			} else {
+				$this->db->rollback();
+				dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
+				return -2;
+			}
 		} else {
 			$this->error = $this->db->lasterror();
 
@@ -464,10 +489,6 @@ class Contact extends CommonObject
 		$this->entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
 
 		// Clean parameters
-		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname = ucwords(strtolower($this->lastname));
-		if (!empty($conf->global->MAIN_ALL_TO_UPPER)) $this->lastname = strtoupper($this->lastname);
-        if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname = ucwords(strtolower($this->firstname));
-
 		$this->lastname = trim($this->lastname) ?trim($this->lastname) : trim($this->lastname);
 		$this->firstname = trim($this->firstname);
 		$this->email = trim($this->email);
@@ -478,8 +499,9 @@ class Contact extends CommonObject
 		$this->skype = trim($this->skype);
 		$this->photo = trim($this->photo);
 		$this->fax = trim($this->fax);
-		$this->zip = (empty($this->zip) ? '' : $this->zip);
-		$this->town = (empty($this->town) ? '' : $this->town);
+		$this->zip = (empty($this->zip) ? '' : trim($this->zip));
+		$this->town = (empty($this->town) ? '' : trim($this->town));
+		$this->setUpperOrLowerCase();
 		$this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
 		if (empty($this->statut)) $this->statut = 0;
 		if (empty($this->civility_code) && !is_numeric($this->civility_id)) $this->civility_code = $this->civility_id; // For backward compatibility
@@ -499,7 +521,7 @@ class Contact extends CommonObject
 		$sql .= ", poste='".$this->db->escape($this->poste)."'";
 		$sql .= ", fax='".$this->db->escape($this->fax)."'";
 		$sql .= ", email='".$this->db->escape($this->email)."'";
-        $sql .= ", socialnetworks = '".$this->db->escape(json_encode($this->socialnetworks))."'";
+		$sql .= ", socialnetworks = '".$this->db->escape(json_encode($this->socialnetworks))."'";
 		$sql .= ", photo='".$this->db->escape($this->photo)."'";
 		$sql .= ", birthday=".($this->birthday ? "'".$this->db->idate($this->birthday)."'" : "null");
 		$sql .= ", note_private = ".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null");
@@ -523,22 +545,22 @@ class Contact extends CommonObject
 		$result = $this->db->query($sql);
 		if ($result)
 		{
-		    unset($this->country_code);
-		    unset($this->country);
-		    unset($this->state_code);
-		    unset($this->state);
+			unset($this->country_code);
+			unset($this->country);
+			unset($this->state_code);
+			unset($this->state);
 
-		    $action = 'update';
+			$action = 'update';
 
-		    // Actions on extra fields
-		    if (!$error)
-		    {
-		    	$result = $this->insertExtraFields();
-		    	if ($result < 0)
-		    	{
-		    		$error++;
-		    	}
-		    }
+			// Actions on extra fields
+			if (!$error)
+			{
+				$result = $this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
 
 			if (!$error) {
 				$result = $this->updateRoles();
@@ -645,14 +667,14 @@ class Contact extends CommonObject
 			}
 		} else {
 			$this->error = $this->db->lasterror().' sql='.$sql;
-            $this->db->rollback();
+			$this->db->rollback();
 			return -1;
 		}
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *	Retourne chaine DN complete dans l'annuaire LDAP pour l'objet
 	 *
@@ -664,7 +686,7 @@ class Contact extends CommonObject
 	 */
 	public function _load_ldap_dn($info, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		$dn = '';
 		if ($mode == 0) $dn = $conf->global->LDAP_KEY_CONTACTS."=".$info[$conf->global->LDAP_KEY_CONTACTS].",".$conf->global->LDAP_CONTACT_DN;
@@ -674,8 +696,8 @@ class Contact extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *	Initialise tableau info (tableau des attributs LDAP)
 	 *
@@ -683,12 +705,12 @@ class Contact extends CommonObject
 	 */
 	public function _load_ldap_info()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
-        $info = array();
+		$info = array();
 
-        // Object classes
+		// Object classes
 		$info["objectclass"] = explode(',', $conf->global->LDAP_CONTACT_OBJECT_CLASS);
 
 		$this->fullname = $this->getFullName($langs);
@@ -717,8 +739,8 @@ class Contact extends CommonObject
 		if ($this->phone_perso && !empty($conf->global->LDAP_CONTACT_FIELD_HOMEPHONE)) $info[$conf->global->LDAP_CONTACT_FIELD_HOMEPHONE] = $this->phone_perso;
 		if ($this->phone_mobile && !empty($conf->global->LDAP_CONTACT_FIELD_MOBILE)) $info[$conf->global->LDAP_CONTACT_FIELD_MOBILE] = $this->phone_mobile;
 		if ($this->fax && !empty($conf->global->LDAP_CONTACT_FIELD_FAX))	    $info[$conf->global->LDAP_CONTACT_FIELD_FAX] = $this->fax;
-        if ($this->skype && !empty($conf->global->LDAP_CONTACT_FIELD_SKYPE))	    $info[$conf->global->LDAP_CONTACT_FIELD_SKYPE] = $this->skype;
-        if ($this->note_private && !empty($conf->global->LDAP_CONTACT_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_CONTACT_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note_private, 2);
+		if ($this->skype && !empty($conf->global->LDAP_CONTACT_FIELD_SKYPE))	    $info[$conf->global->LDAP_CONTACT_FIELD_SKYPE] = $this->skype;
+		if ($this->note_private && !empty($conf->global->LDAP_CONTACT_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_CONTACT_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note_private, 2);
 		if ($this->email && !empty($conf->global->LDAP_CONTACT_FIELD_MAIL))     $info[$conf->global->LDAP_CONTACT_FIELD_MAIL] = $this->email;
 
 		if ($conf->global->LDAP_SERVER_TYPE == 'egroupware')
@@ -750,22 +772,22 @@ class Contact extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Update field alert birthday
 	 *
 	 *  @param      int			$id         Id of contact
 	 *  @param      User		$user		User asking to change alert or birthday
 	 *  @param      int		    $notrigger	0=no, 1=yes
-     *  @return     int         			<0 if KO, >=0 if OK
+	 *  @return     int         			<0 if KO, >=0 if OK
 	 */
 	public function update_perso($id, $user = null, $notrigger = 0)
 	{
-        // phpcs:enable
-	    $error = 0;
-	    $result = false;
+		// phpcs:enable
+		$error = 0;
+		$result = false;
 
-	    $this->db->begin();
+		$this->db->begin();
 
 		// Mis a jour contact
 		$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET";
@@ -783,21 +805,18 @@ class Contact extends CommonObject
 		}
 
 		// Mis a jour alerte birthday
-		if ($this->birthday_alert)
-		{
+		if (!empty($this->birthday_alert)) {
 			//check existing
 			$sql_check = "SELECT rowid FROM ".MAIN_DB_PREFIX."user_alert WHERE type=1 AND fk_contact=".$this->db->escape($id)." AND fk_user=".$user->id;
 			$result_check = $this->db->query($sql_check);
-			if (!$result_check || ($this->db->num_rows($result_check) < 1))
-			{
+			if (!$result_check || ($this->db->num_rows($result_check) < 1)) {
 				//insert
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_alert(type,fk_contact,fk_user) ";
 				$sql .= "VALUES (1,".$this->db->escape($id).",".$user->id.")";
 				$result = $this->db->query($sql);
-				if (!$result)
-				{
-                    $error++;
-                    $this->error = $this->db->lasterror();
+				if (!$result) {
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 			} else {
 				$result = true;
@@ -806,29 +825,26 @@ class Contact extends CommonObject
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_alert ";
 			$sql .= "WHERE type=1 AND fk_contact=".$this->db->escape($id)." AND fk_user=".$user->id;
 			$result = $this->db->query($sql);
-			if (!$result)
-			{
-                $error++;
-                $this->error = $this->db->lasterror();
+			if (!$result) {
+				$error++;
+				$this->error = $this->db->lasterror();
 			}
 		}
 
-		if (!$error && !$notrigger)
-		{
-		    // Call trigger
-		    $result = $this->call_trigger('CONTACT_MODIFY', $user);
-		    if ($result < 0) { $error++; }
-		    // End call triggers
+		if (!$error && !$notrigger) {
+			// Call trigger
+			$result = $this->call_trigger('CONTACT_MODIFY', $user);
+			if ($result < 0) { $error++; }
+			// End call triggers
 		}
 
-		if (!$error)
-		{
-		    $this->db->commit();
-		    return 1;
+		if (!$error) {
+			$this->db->commit();
+			return 1;
 		} else {
-		    dol_syslog(get_class($this)."::update Error ".$this->error, LOG_ERR);
-		    $this->db->rollback();
-		    return -$error;
+			dol_syslog(get_class($this)."::update Error ".$this->error, LOG_ERR);
+			$this->db->rollback();
+			return -$error;
 		}
 	}
 
@@ -838,9 +854,9 @@ class Contact extends CommonObject
 	 *
 	 *  @param      int		$id         	Id of contact
 	 *  @param      User	$user       	Load also alerts of this user (subscribing to alerts) that want alerts about this contact
-     *  @param      string  $ref_ext    	External reference, not given by Dolibarr
-     *  @param		string	$email			Email
-     *  @param		int		$loadalsoroles	Load also roles
+	 *  @param      string  $ref_ext    	External reference, not given by Dolibarr
+	 *  @param		string	$email			Email
+	 *  @param		int		$loadalsoroles	Load also roles
 	 *  @return     int     		    	>0 if OK, <0 if KO or if two records found for same ref or idprof, 0 if not found.
 	 */
 	public function fetch($id, $user = null, $ref_ext = '', $email = '', $loadalsoroles = 0)
@@ -864,9 +880,9 @@ class Contact extends CommonObject
 		$sql .= " c.birthday,";
 		$sql .= " c.poste, c.phone, c.phone_perso, c.phone_mobile, c.fax, c.email,";
 		$sql .= " c.socialnetworks,";
-        $sql .= " c.photo,";
+		$sql .= " c.photo,";
 		$sql .= " c.priv, c.note_private, c.note_public, c.default_lang, c.canvas,";
-		$sql.= " c.fk_prospectcontactlevel, c.fk_stcommcontact, st.libelle as stcomm, st.picto as stcomm_picto,";
+		$sql .= " c.fk_prospectcontactlevel, c.fk_stcommcontact, st.libelle as stcomm, st.picto as stcomm_picto,";
 		$sql .= " c.import_key,";
 		$sql .= " c.datec as date_creation, c.tms as date_modification,";
 		$sql .= " co.label as country, co.code as country_code,";
@@ -878,8 +894,8 @@ class Contact extends CommonObject
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON c.fk_departement = d.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON c.rowid = u.fk_socpeople";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_stcommcontact as st ON c.fk_stcommcontact = st.id';
-		if ($id) $sql .= " WHERE c.rowid = ".$id;
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_stcommcontact as st ON c.fk_stcommcontact = st.id';
+		if ($id) $sql .= " WHERE c.rowid = ".((int) $id);
 		else {
 			$sql .= " WHERE c.entity IN (".getEntity($this->element).")";
 			if ($ref_ext) {
@@ -912,7 +928,7 @@ class Contact extends CommonObject
 				$this->civility_code    = $obj->civility_code;
 				$this->civility	        = $obj->civility_code ? ($langs->trans("Civility".$obj->civility_code) != ("Civility".$obj->civility_code) ? $langs->trans("Civility".$obj->civility_code) : $obj->civility_code) : '';
 
-                $this->lastname = $obj->lastname;
+				$this->lastname = $obj->lastname;
 				$this->firstname = $obj->firstname;
 				$this->address = $obj->address;
 				$this->zip = $obj->zip;
@@ -936,11 +952,11 @@ class Contact extends CommonObject
 
 				$this->fk_prospectlevel = $obj->fk_prospectcontactlevel;
 
-				$transcode=$langs->trans('StatusProspect'.$obj->fk_stcommcontact);
-				$libelle=($transcode!='StatusProspect'.$obj->fk_stcommcontact?$transcode:$obj->stcomm);
-				$this->stcomm_id = $obj->fk_stcommcontact;  // id statut commercial
-				$this->statut_commercial = $libelle;    	// libelle statut commercial
-				$this->stcomm_picto = $obj->stcomm_picto; 	// Picto statut commercial
+				$transcode = $langs->trans('StatusProspect'.$obj->fk_stcommcontact);
+				$libelle = ($transcode != 'StatusProspect'.$obj->fk_stcommcontact ? $transcode : $obj->stcomm);
+				$this->stcomm_id = $obj->fk_stcommcontact; // id statut commercial
+				$this->statut_commercial = $libelle; // libelle statut commercial
+				$this->stcomm_picto = $obj->stcomm_picto; // Picto statut commercial
 
 				$this->phone_pro = trim($obj->phone);
 				$this->fax = trim($obj->fax);
@@ -987,7 +1003,7 @@ class Contact extends CommonObject
 					return -1;
 				}
 
-				// Retreive all extrafield
+				// Retrieve all extrafield
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
 
@@ -1054,7 +1070,7 @@ class Contact extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Load number of elements the contact is used as a link for
 	 *  ref_facturation
@@ -1062,11 +1078,11 @@ class Contact extends CommonObject
 	 *  ref_commande (for order and/or shipments)
 	 *  ref_propale
 	 *
-     *  @return     int             					<0 if KO, >=0 if OK
+	 *  @return     int             					<0 if KO, >=0 if OK
 	 */
 	public function load_ref_elements()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// Compte les elements pour lesquels il est contact
 		$sql = "SELECT tc.element, count(ec.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc";
@@ -1192,18 +1208,18 @@ class Contact extends CommonObject
 		}
 
 		// Removed extrafields
-        if (!$error) {
-            // For avoid conflicts if trigger used
+		if (!$error) {
+			// For avoid conflicts if trigger used
 			$result = $this->deleteExtraFields();
 			if ($result < 0) $error++;
 		}
 
 		if (!$error && !$notrigger)
 		{
-            // Call trigger
-            $result = $this->call_trigger('CONTACT_DELETE', $user);
-            if ($result < 0) { $error++; }
-            // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('CONTACT_DELETE', $user);
+			if ($result < 0) { $error++; }
+			// End call triggers
 		}
 
 		if (!$error)
@@ -1296,7 +1312,7 @@ class Contact extends CommonObject
 	 *	@param		string		$option						Where the link point to
 	 *	@param		int			$maxlen						Max length of
 	 *  @param		string		$moreparam					Add more param into URL
-     *  @param      int     	$save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param      int     	$save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@param		int			$notooltip					1=Disable tooltip
 	 *	@return		string									String with URL
 	 */
@@ -1313,41 +1329,43 @@ class Contact extends CommonObject
 			$label .= '</div><div style="clear: both;"></div>';
 		}
 
-		$label .= img_picto('', $this->picto).' <u>'.$langs->trans("Contact").'</u>';
-        $label .= '<br><b>'.$langs->trans("Name").':</b> '.$this->getFullName($langs);
-        //if ($this->civility_id) $label.= '<br><b>' . $langs->trans("Civility") . ':</b> '.$this->civility_id;		// TODO Translate cibilty_id code
-        if (!empty($this->poste)) $label .= '<br><b>'.$langs->trans("Poste").':</b> '.$this->poste;
-        $label .= '<br><b>'.$langs->trans("EMail").':</b> '.$this->email;
-        $phonelist = array();
-        if ($this->phone_pro) $phonelist[] = dol_print_phone($this->phone_pro, $this->country_code, $this->id, 0, '', '&nbsp;', 'phone');
-        if ($this->phone_mobile) $phonelist[] = dol_print_phone($this->phone_mobile, $this->country_code, $this->id, 0, '', '&nbsp;', 'mobile');
-        if ($this->phone_perso) $phonelist[] = dol_print_phone($this->phone_perso, $this->country_code, $this->id, 0, '', '&nbsp;', 'phone');
-        $label .= '<br><b>'.$langs->trans("Phone").':</b> '.implode('&nbsp;', $phonelist);
-        $label .= '<br><b>'.$langs->trans("Address").':</b> '.dol_format_address($this, 1, ' ', $langs);
+		$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Contact").'</u>';
+		$label .= ' '.$this->getLibStatut(4);
+		$label .= '<br><b>'.$langs->trans("Name").':</b> '.$this->getFullName($langs);
+		//if ($this->civility_id) $label.= '<br><b>' . $langs->trans("Civility") . ':</b> '.$this->civility_id;		// TODO Translate cibilty_id code
+		if (!empty($this->poste)) $label .= '<br><b>'.$langs->trans("Poste").':</b> '.$this->poste;
+		$label .= '<br><b>'.$langs->trans("EMail").':</b> '.$this->email;
+		$phonelist = array();
+		$country_code = empty($this->country_code) ? '': $this->country_code;
+		if ($this->phone_pro) $phonelist[] = dol_print_phone($this->phone_pro, $country_code, $this->id, 0, '', '&nbsp;', 'phone');
+		if ($this->phone_mobile) $phonelist[] = dol_print_phone($this->phone_mobile, $country_code, $this->id, 0, '', '&nbsp;', 'mobile');
+		if ($this->phone_perso) $phonelist[] = dol_print_phone($this->phone_perso, $country_code, $this->id, 0, '', '&nbsp;', 'phone');
+		$label .= '<br><b>'.$langs->trans("Phone").':</b> '.implode('&nbsp;', $phonelist);
+		$label .= '<br><b>'.$langs->trans("Address").':</b> '.dol_format_address($this, 1, ' ', $langs);
 
-        $url = DOL_URL_ROOT.'/contact/card.php?id='.$this->id;
+		$url = DOL_URL_ROOT.'/contact/card.php?id='.$this->id;
 
-        if ($option !== 'nolink')
-        {
-        	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-        	if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option !== 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
-        $url .= $moreparam;
+		$url .= $moreparam;
 
-        $linkclose = "";
+		$linkclose = "";
 		if (empty($notooltip)) {
-	    	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-    	    {
-        	    $label = $langs->trans("ShowContact");
-            	$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-        	}
-	       	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-    	   	$linkclose .= ' class="classfortooltip"';
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowContact");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+		   	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+		   	$linkclose .= ' class="classfortooltip"';
 
-    	   	/*
+		   	/*
     	   	 $hookmanager->initHooks(array('contactdao'));
     	   	 $parameters=array('id'=>$this->id);
     	   	 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
@@ -1407,7 +1425,7 @@ class Contact extends CommonObject
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Renvoi le libelle d'un statut donne
 	 *
@@ -1417,7 +1435,7 @@ class Contact extends CommonObject
 	 */
 	public function LibStatut($status, $mode)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$labelStatus = array(
@@ -1443,7 +1461,7 @@ class Contact extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return translated label of Public or Private
 	 *
@@ -1452,7 +1470,7 @@ class Contact extends CommonObject
 	 */
 	public function LibPubPriv($status)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		if ($status == '1') return $langs->trans('ContactPrivate');
 		else return $langs->trans('ContactPublic');
@@ -1460,11 +1478,11 @@ class Contact extends CommonObject
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	int >0 if ok
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	int >0 if ok
 	 */
 	public function initAsSpecimen()
 	{
@@ -1479,6 +1497,7 @@ class Contact extends CommonObject
 
 		// Initialise parameters
 		$this->id = 0;
+		$this->entity = 1;
 		$this->specimen = 1;
 		$this->lastname = 'DOLIBARR';
 		$this->firstname = 'SPECIMEN';
@@ -1489,7 +1508,6 @@ class Contact extends CommonObject
 		$this->country_code = 'FR';
 		$this->country = 'France';
 		$this->email = 'specimen@specimen.com';
-		$this->skype = 'tom.hanson';
 		$this->socialnetworks = array(
 			'skype' => 'tom.hanson',
 		);
@@ -1533,10 +1551,10 @@ class Contact extends CommonObject
 		dol_syslog(get_class($this)."::setstatus", LOG_DEBUG);
 		if ($result)
 		{
-            // Call trigger
-            $result = $this->call_trigger('CONTACT_ENABLEDISABLE', $user);
-            if ($result < 0) { $error++; }
-            // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('CONTACT_ENABLEDISABLE', $user);
+			if ($result < 0) { $error++; }
+			// End call triggers
 		}
 
 		if ($error)
@@ -1557,7 +1575,7 @@ class Contact extends CommonObject
 	 * Existing categories are left untouch.
 	 *
 	 * @param int[]|int $categories Category or categories IDs
-     * @return void
+	 * @return void
 	 */
 	public function setCategories($categories)
 	{
@@ -1770,15 +1788,15 @@ class Contact extends CommonObject
 	{
 		global $langs;
 
-		$sql = "SELECT id, code, libelle as label, picto FROM " . MAIN_DB_PREFIX . "c_stcommcontact";
-		if ($active >= 0) $sql .= " WHERE active = " . $active;
+		$sql = "SELECT id, code, libelle as label, picto FROM ".MAIN_DB_PREFIX."c_stcommcontact";
+		if ($active >= 0) $sql .= " WHERE active = ".$active;
 		$resql = $this->db->query($sql);
 		$num = $this->db->num_rows($resql);
 		$i = 0;
 		while ($i < $num)
 		{
 			$obj = $this->db->fetch_object($resql);
-			$this->cacheprospectstatus[$obj->id] = array('id' => $obj->id, 'code' => $obj->code, 'label' => ($langs->trans("ST_" . strtoupper($obj->code)) == "ST_" . strtoupper($obj->code)) ? $obj->label : $langs->trans("ST_" . strtoupper($obj->code)), 'picto' => $obj->picto);
+			$this->cacheprospectstatus[$obj->id] = array('id' => $obj->id, 'code' => $obj->code, 'label' => ($langs->trans("ST_".strtoupper($obj->code)) == "ST_".strtoupper($obj->code)) ? $obj->label : $langs->trans("ST_".strtoupper($obj->code)), 'picto' => $obj->picto);
 			$i++;
 		}
 		return 1;
@@ -1804,9 +1822,9 @@ class Contact extends CommonObject
 	{
 		global $langs;
 
-		$lib = $langs->trans("ProspectLevel" . $fk_prospectlevel);
+		$lib = $langs->trans("ProspectLevel".$fk_prospectlevel);
 		// If lib not found in language file, we get label from cache/databse
-		if ($lib == $langs->trans("ProspectLevel" . $fk_prospectlevel))
+		if ($lib == $langs->trans("ProspectLevel".$fk_prospectlevel))
 		{
 			$lib = $langs->getLabelFromKey($this->db, $fk_prospectlevel, 'c_prospectlevel', 'code', 'label');
 		}
@@ -1858,13 +1876,13 @@ class Contact extends CommonObject
 
 		if ($mode == 2)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO') return img_action($langs->trans("StatusProspect-1"), -1, $picto) . ' ' . $langs->trans("StatusProspect-1");
-			elseif ($statut == '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0, $picto) . ' ' . $langs->trans("StatusProspect0");
-			elseif ($statut == '1' || $statut == 'ST_TODO') return img_action($langs->trans("StatusProspect1"), 1, $picto) . ' ' . $langs->trans("StatusProspect1");
-			elseif ($statut == '2' || $statut == 'ST_PEND') return img_action($langs->trans("StatusProspect2"), 2, $picto) . ' ' . $langs->trans("StatusProspect2");
-			elseif ($statut == '3' || $statut == 'ST_DONE') return img_action($langs->trans("StatusProspect3"), 3, $picto) . ' ' . $langs->trans("StatusProspect3");
+			if ($statut == '-1' || $statut == 'ST_NO') return img_action($langs->trans("StatusProspect-1"), -1, $picto).' '.$langs->trans("StatusProspect-1");
+			elseif ($statut == '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0, $picto).' '.$langs->trans("StatusProspect0");
+			elseif ($statut == '1' || $statut == 'ST_TODO') return img_action($langs->trans("StatusProspect1"), 1, $picto).' '.$langs->trans("StatusProspect1");
+			elseif ($statut == '2' || $statut == 'ST_PEND') return img_action($langs->trans("StatusProspect2"), 2, $picto).' '.$langs->trans("StatusProspect2");
+			elseif ($statut == '3' || $statut == 'ST_DONE') return img_action($langs->trans("StatusProspect3"), 3, $picto).' '.$langs->trans("StatusProspect3");
 			else {
-				return img_action(($langs->trans("StatusProspect" . $statut) != "StatusProspect" . $statut) ? $langs->trans("StatusProspect" . $statut) : $label, 0, $picto) . ' ' . (($langs->trans("StatusProspect" . $statut) != "StatusProspect" . $statut) ? $langs->trans("StatusProspect" . $statut) : $label);
+				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0, $picto).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
 			}
 		}
 		if ($mode == 3)
@@ -1875,18 +1893,18 @@ class Contact extends CommonObject
 			elseif ($statut == '2' || $statut == 'ST_PEND') return img_action($langs->trans("StatusProspect2"), 2, $picto);
 			elseif ($statut == '3' || $statut == 'ST_DONE') return img_action($langs->trans("StatusProspect3"), 3, $picto);
 			else {
-				return img_action(($langs->trans("StatusProspect" . $statut) != "StatusProspect" . $statut) ? $langs->trans("StatusProspect" . $statut) : $label, 0, $picto);
+				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0, $picto);
 			}
 		}
 		if ($mode == 4)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO') return img_action($langs->trans("StatusProspect-1"), -1, $picto) . ' ' . $langs->trans("StatusProspect-1");
-			elseif ($statut == '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0, $picto) . ' ' . $langs->trans("StatusProspect0");
-			elseif ($statut == '1' || $statut == 'ST_TODO') return img_action($langs->trans("StatusProspect1"), 1, $picto) . ' ' . $langs->trans("StatusProspect1");
-			elseif ($statut == '2' || $statut == 'ST_PEND') return img_action($langs->trans("StatusProspect2"), 2, $picto) . ' ' . $langs->trans("StatusProspect2");
-			elseif ($statut == '3' || $statut == 'ST_DONE') return img_action($langs->trans("StatusProspect3"), 3, $picto) . ' ' . $langs->trans("StatusProspect3");
+			if ($statut == '-1' || $statut == 'ST_NO') return img_action($langs->trans("StatusProspect-1"), -1, $picto).' '.$langs->trans("StatusProspect-1");
+			elseif ($statut == '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0, $picto).' '.$langs->trans("StatusProspect0");
+			elseif ($statut == '1' || $statut == 'ST_TODO') return img_action($langs->trans("StatusProspect1"), 1, $picto).' '.$langs->trans("StatusProspect1");
+			elseif ($statut == '2' || $statut == 'ST_PEND') return img_action($langs->trans("StatusProspect2"), 2, $picto).' '.$langs->trans("StatusProspect2");
+			elseif ($statut == '3' || $statut == 'ST_DONE') return img_action($langs->trans("StatusProspect3"), 3, $picto).' '.$langs->trans("StatusProspect3");
 			else {
-				return img_action(($langs->trans("StatusProspect" . $statut) != "StatusProspect" . $statut) ? $langs->trans("StatusProspect" . $statut) : $label, 0, $picto) . ' ' . (($langs->trans("StatusProspect" . $statut) != "StatusProspect" . $statut) ? $langs->trans("StatusProspect" . $statut) : $label);
+				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0, $picto).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
 			}
 		}
 
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index 7655e00ea3f..da00374cc2a 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -62,10 +62,10 @@ $year = GETPOST('year', 'int');
 // Clean up on purge search criteria ?
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
 {
-    $sref = '';
-    $sprod_fulldescr = '';
-    $year = '';
-    $month = '';
+	$sref = '';
+	$sprod_fulldescr = '';
+	$year = '';
+	$month = '';
 }
 // Customer or supplier selected in drop box
 $thirdTypeSelect = GETPOST("third_select_id");
@@ -106,18 +106,18 @@ if (empty($id))
 }
 
 $head = contact_prepare_head($object);
-dol_fiche_head($head, 'consumption', $langs->trans("ContactsAddresses"), -1, 'contact');
+print dol_get_fiche_head($head, 'consumption', $langs->trans("ContactsAddresses"), -1, 'contact');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 $morehtmlref = '<div class="refidno">';
 if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
 {
-    $objsoc->fetch($socid);
-    // Thirdparty
-    $morehtmlref .= $langs->trans('ThirdParty').' : ';
-    if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1, 'contact');
-    else $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+	$objsoc->fetch($socid);
+	// Thirdparty
+	$morehtmlref .= $langs->trans('ThirdParty').' : ';
+	if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1, 'contact');
+	else $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
 }
 $morehtmlref .= '</div>';
 
@@ -148,7 +148,7 @@ if ($object->thirdparty->fournisseur)
 {
 	$thirdTypeArray['supplier'] = $langs->trans("supplier");
 	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire) $elementTypeArray['supplier_invoice'] = $langs->transnoentitiesnoconv('SuppliersInvoices');
-	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)) && $user->rights->fournisseur->commande->lire) $elementTypeArray['supplier_order']=  $langs->transnoentitiesnoconv('SuppliersOrders');
+	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)) && $user->rights->fournisseur->commande->lire) $elementTypeArray['supplier_order'] = $langs->transnoentitiesnoconv('SuppliersOrders');
 
 	// There no contact type for supplier proposals
 	// if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->supplier_proposal->lire) $elementTypeArray['supplier_proposal']=$langs->transnoentitiesnoconv('SupplierProposals');
@@ -158,7 +158,7 @@ print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 print '<br>';
 
 
@@ -172,9 +172,9 @@ if ($type_element == 'fichinter')
 	$documentstatic = new Fichinter($db);
 	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datec as dateprint, f.fk_statut as status, tc.libelle as type_contact_label, ';
 	$tables_from = MAIN_DB_PREFIX.'fichinterdet d';
-    $tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'fichinter as f ON d.fk_fichinter=f.rowid';
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople='.$object->id;
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='fichinter' and tc.source='external' and tc.active=1)";
+	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'fichinter as f ON d.fk_fichinter=f.rowid';
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople='.$object->id;
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='fichinter' and tc.source='external' and tc.active=1)";
 	$where = ' WHERE f.entity IN ('.getEntity('ficheinter').')';
 	$dateprint = 'f.datec';
 	$doc_number = 'f.ref';
@@ -184,10 +184,10 @@ if ($type_element == 'fichinter')
 	$documentstatic = new Facture($db);
 	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, f.type as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, tc.libelle as type_contact_label, ';
 	$tables_from = MAIN_DB_PREFIX.'facturedet d';
-    $tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture as f ON d.fk_facture=f.rowid';
-    $tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople='.$object->id;
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='facture' and tc.source='external' and tc.active=1)";
+	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture as f ON d.fk_facture=f.rowid';
+	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople='.$object->id;
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='facture' and tc.source='external' and tc.active=1)";
 	$where = " WHERE f.entity IN (".getEntity('invoice').")";
 	$dateprint = 'f.datef';
 	$doc_number = 'f.ref';
@@ -198,10 +198,10 @@ if ($type_element == 'fichinter')
 	$documentstatic = new Propal($db);
 	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.datep as dateprint, c.fk_statut as status, tc.libelle as type_contact_label, ';
 	$tables_from = MAIN_DB_PREFIX.'propaldet d';
-    $tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'propal as c ON d.fk_propal=c.rowid';
-    $tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople='.$object->id;
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='propal' and tc.source='external' and tc.active=1)";
+	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'propal as c ON d.fk_propal=c.rowid';
+	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople='.$object->id;
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='propal' and tc.source='external' and tc.active=1)";
 	$where = ' WHERE c.entity IN ('.getEntity('propal').')';
 	$datePrint = 'c.datep';
 	$doc_number = 'c.ref';
@@ -212,10 +212,10 @@ if ($type_element == 'fichinter')
 	$documentstatic = new Commande($db);
 	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_commande as dateprint, c.fk_statut as status, tc.libelle as type_contact_label, ';
 	$tables_from = MAIN_DB_PREFIX.'commandedet d';
-    $tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commande as c ON d.fk_commande=c.rowid';
-    $tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople='.$object->id;
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='commande' and tc.source='external' and tc.active=1)";
+	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commande as c ON d.fk_commande=c.rowid';
+	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople='.$object->id;
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='commande' and tc.source='external' and tc.active=1)";
 	$where = ' WHERE c.entity IN ('.getEntity('order').')';
 	$dateprint = 'c.date_commande';
 	$doc_number = 'c.ref';
@@ -226,10 +226,10 @@ if ($type_element == 'fichinter')
 	$documentstatic = new FactureFournisseur($db);
 	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, tc.libelle as type_contact_label, ';
 	$tables_from = MAIN_DB_PREFIX.'facture_fourn_det d';
-    $tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn as f ON d.fk_facture_fourn=f.rowid';
-    $tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople='.$object->id;
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='invoice_supplier' and tc.source='external' and tc.active=1)";
+	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn as f ON d.fk_facture_fourn=f.rowid';
+	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople='.$object->id;
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='invoice_supplier' and tc.source='external' and tc.active=1)";
 	$where = ' WHERE f.entity IN ('.getEntity($documentstatic->element).')';
 	$dateprint = 'f.datef';
 	$doc_number = 'f.ref';
@@ -254,10 +254,10 @@ elseif ($type_element == 'supplier_order')
 	$documentstatic = new CommandeFournisseur($db);
 	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, tc.libelle as type_contact_label, ';
 	$tables_from = MAIN_DB_PREFIX.'commande_fournisseurdet d';
-    $tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commande_fournisseur as c ON d.fk_commande=c.rowid';
-    $tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople='.$object->id;
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='order_supplier' and tc.source='external' and tc.active=1)";
+	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commande_fournisseur as c ON d.fk_commande=c.rowid';
+	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople='.$object->id;
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='order_supplier' and tc.source='external' and tc.active=1)";
 	$where = ' WHERE c.entity IN ('.getEntity($documentstatic->element).')';
 	$dateprint = 'c.date_valid';
 	$doc_number = 'c.ref';
@@ -269,10 +269,10 @@ elseif ($type_element == 'supplier_order')
 	$documentstaticline = new ContratLigne($db);
 	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_contrat as dateprint, d.statut as status, tc.libelle as type_contact_label, ';
 	$tables_from = MAIN_DB_PREFIX.'contratdet d';
-    $tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'contrat as c ON d.fk_contrat=c.rowid';
-    $tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople='.$object->id;
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='contrat' and tc.source='external' and tc.active=1)";
+	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'contrat as c ON d.fk_contrat=c.rowid';
+	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople='.$object->id;
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='contrat' and tc.source='external' and tc.active=1)";
 	$where = ' WHERE c.entity IN ('.getEntity('contrat').')';
 	$dateprint = 'c.date_valid';
 	$doc_number = 'c.ref';
@@ -293,16 +293,16 @@ if (!empty($sql_select))
 	$sql .= " ";
 	if ($type_element != 'fichinter') $sql .= ", p.ref as prod_ref, p.label as product_label";
 	$sql .= " FROM "/*.MAIN_DB_PREFIX."societe as s, "*/.$tables_from;
-    // if ($type_element != 'fichinter') $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON d.fk_product = p.rowid ';
+	// if ($type_element != 'fichinter') $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON d.fk_product = p.rowid ';
 	$sql .= $where;
 	$sql .= dolSqlDateFilter($dateprint, 0, $month, $year);
 	if ($sref) $sql .= " AND ".$doc_number." LIKE '%".$db->escape($sref)."%'";
 	if ($sprod_fulldescr)
 	{
-	    $sql .= " AND (d.description LIKE '%".$db->escape($sprod_fulldescr)."%'";
-	    if (GETPOST('type_element') != 'fichinter') $sql .= " OR p.ref LIKE '%".$db->escape($sprod_fulldescr)."%'";
-	    if (GETPOST('type_element') != 'fichinter') $sql .= " OR p.label LIKE '%".$db->escape($sprod_fulldescr)."%'";
-	    $sql .= ")";
+		$sql .= " AND (d.description LIKE '%".$db->escape($sprod_fulldescr)."%'";
+		if (GETPOST('type_element') != 'fichinter') $sql .= " OR p.ref LIKE '%".$db->escape($sprod_fulldescr)."%'";
+		if (GETPOST('type_element') != 'fichinter') $sql .= " OR p.label LIKE '%".$db->escape($sprod_fulldescr)."%'";
+		$sql .= ")";
 	}
 	$sql .= $db->order($sortfield, $sortorder);
 	$resql = $db->query($sql);
@@ -314,8 +314,8 @@ if (!empty($sql_select))
 $disabled = 0;
 $showempty = 2;
 if (empty($elementTypeArray) && !$object->thirdparty->client && !$object->thirdparty->fournisseur) {
-    $showempty = $langs->trans("ThirdpartyNotCustomerNotSupplierSoNoRef");
-    $disabled = 1;
+	$showempty = $langs->trans("ThirdpartyNotCustomerNotSupplierSoNoRef");
+	$disabled = 1;
 }
 
 // Define type of elements
@@ -340,7 +340,7 @@ if ($sql_select)
 	$num = $db->num_rows($resql);
 
 	$param = "&socid=".urlencode($socid)."&type_element=".urlencode($type_element);
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 	if ($sprod_fulldescr) $param .= "&sprod_fulldescr=".urlencode($sprod_fulldescr);
 	if ($sref) $param .= "&sref=".urlencode($sref);
@@ -348,48 +348,48 @@ if ($sql_select)
 	if ($year) $param .= "&year=".urlencode($year);
 	if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
 
-    print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, '', 0, '', '', $limit);
+	print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, '', 0, '', '', $limit);
 
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="liste centpercent">'."\n";
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="liste centpercent">'."\n";
 
-    // Filters
-    print '<tr class="liste_titre">';
-    print '<td class="liste_titre left">';
-    print '<input class="flat" type="text" name="sref" size="8" value="'.$sref.'">';
-    print '</td>';
-    print '<td class="liste_titre nowrap center">'; // date
-    print $formother->select_month($month ? $month : -1, 'month', 1, 0, 'valignmiddle');
-    $formother->select_year($year ? $year : -1, 'year', 1, 20, 1);
-    print '</td>';
-    print '<td class="liste_titre center">';
-    print '</td>';
-    print '<td class="liste_titre left">';
-    print '<input class="flat" type="text" name="sprod_fulldescr" size="15" value="'.dol_escape_htmltag($sprod_fulldescr).'">';
-    print '</td>';
-    print '<td class="liste_titre center">'; // TODO: Add filters !
-    print '</td>';
-    print '<td class="liste_titre center">';
-    print '</td>';
-    print '<td class="liste_titre center">';
-    print '</td>';
-    print '<td class="liste_titre maxwidthsearch">';
-    $searchpicto = $form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
-    print '</tr>';
+	// Filters
+	print '<tr class="liste_titre">';
+	print '<td class="liste_titre left">';
+	print '<input class="flat" type="text" name="sref" size="8" value="'.$sref.'">';
+	print '</td>';
+	print '<td class="liste_titre nowrap center">'; // date
+	print $formother->select_month($month ? $month : -1, 'month', 1, 0, 'valignmiddle');
+	$formother->select_year($year ? $year : -1, 'year', 1, 20, 1);
+	print '</td>';
+	print '<td class="liste_titre center">';
+	print '</td>';
+	print '<td class="liste_titre left">';
+	print '<input class="flat" type="text" name="sprod_fulldescr" size="15" value="'.dol_escape_htmltag($sprod_fulldescr).'">';
+	print '</td>';
+	print '<td class="liste_titre center">'; // TODO: Add filters !
+	print '</td>';
+	print '<td class="liste_titre center">';
+	print '</td>';
+	print '<td class="liste_titre center">';
+	print '</td>';
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
+	print '</td>';
+	print '</tr>';
 
-    // Titles with sort buttons
-    print '<tr class="liste_titre">';
-    print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left ');
-    print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'width="150"', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_statut', '', $param, '', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
-    print_liste_field_titre('ContactType', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
-    print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, '', $sortfield, $sortorder, 'right ');
-    print_liste_field_titre('TotalHT', $_SERVER['PHP_SELF'], 'total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
-    print_liste_field_titre('UnitPrice', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
-    print "</tr>\n";
+	// Titles with sort buttons
+	print '<tr class="liste_titre">';
+	print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left ');
+	print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'width="150"', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_statut', '', $param, '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
+	print_liste_field_titre('ContactType', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
+	print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre('TotalHT', $_SERVER['PHP_SELF'], 'total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre('UnitPrice', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
+	print "</tr>\n";
 
 
 	$i = 0;
@@ -478,7 +478,7 @@ if ($sql_select)
 			elseif ($objp->description == '(EXCESS PAID)') $txt = $langs->trans("ExcessPaid");
 			//else $txt=$langs->trans("Discount");
 			print $txt;
-            print '</a>';
+			print '</a>';
 			if ($objp->description)
 			{
 				if ($objp->description == '(CREDIT_NOTE)' && $objp->fk_remise_except > 0)
@@ -576,7 +576,7 @@ if ($sql_select)
 	print '<tr class="liste_total">';
 	print '<td>'.$langs->trans('Total').'</td>';
 	print '<td colspan="3"></td>';
-    print '<td></td>';
+	print '<td></td>';
 	print '<td class="right">'.$total_qty.'</td>';
 	print '<td class="right">'.price($total_ht).'</td>';
 	print '<td class="right">'.price($total_ht / (empty($total_qty) ? 1 : $total_qty)).'</td>';
@@ -588,25 +588,25 @@ if ($sql_select)
 	}
 	$db->free($resql);
 } elseif (empty($type_element) || $type_element == -1) {
-    print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
+	print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
 
-    print '<table class="liste centpercent">'."\n";
-    // Titles with sort buttons
-    print '<tr class="liste_titre">';
-    print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left ');
-    print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'width="150"', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_status', '', $param, '', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
-    print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, '', $sortfield, $sortorder, 'right ');
-    print "</tr>\n";
+	print '<table class="liste centpercent">'."\n";
+	// Titles with sort buttons
+	print '<tr class="liste_titre">';
+	print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left ');
+	print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'width="150"', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_status', '', $param, '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
+	print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, '', $sortfield, $sortorder, 'right ');
+	print "</tr>\n";
 
 	print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).'</td></tr>';
 
 	print "</table>";
 } else {
-    print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
+	print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
 
-    print '<table class="liste centpercent">'."\n";
+	print '<table class="liste centpercent">'."\n";
 
 	print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
 
diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index f8498ddae9a..2065ab772e6 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -45,9 +45,9 @@ $objcanvas = null;
 $canvas = (!empty($object->canvas) ? $object->canvas : GETPOST("canvas"));
 if (!empty($canvas))
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
-    $objcanvas = new Canvas($db, $action);
-    $objcanvas->getCanvas('contact', 'contactcard', $canvas);
+	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
+	$objcanvas = new Canvas($db, $action);
+	$objcanvas->getCanvas('contact', 'contactcard', $canvas);
 }
 
 // Security check
@@ -96,43 +96,43 @@ llxHeader('', $title, $helpurl);
 
 if ($object->id)
 {
-    $head = contact_prepare_head($object);
+	$head = contact_prepare_head($object);
 	$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
 
-    dol_fiche_head($head, 'documents', $title, -1, 'contact');
+	print dol_get_fiche_head($head, 'documents', $title, -1, 'contact');
 
 
-    // Build file list
-    $filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
-    $totalsize = 0;
-    foreach ($filearray as $key => $file)
-    {
-        $totalsize += $file['size'];
-    }
+	// Build file list
+	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$totalsize = 0;
+	foreach ($filearray as $key => $file)
+	{
+		$totalsize += $file['size'];
+	}
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    $morehtmlref = '<div class="refidno">';
-    if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-    {
-        $objsoc = new Societe($db);
-        $objsoc->fetch($object->socid);
-        // Thirdparty
-        $morehtmlref .= $langs->trans('ThirdParty').' : ';
-        if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1);
-        else $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
-    }
-    $morehtmlref .= '</div>';
+	$morehtmlref = '<div class="refidno">';
+	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+	{
+		$objsoc = new Societe($db);
+		$objsoc->fetch($object->socid);
+		// Thirdparty
+		$morehtmlref .= $langs->trans('ThirdParty').' : ';
+		if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1);
+		else $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+	}
+	$morehtmlref .= '</div>';
 
-    dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
-    print '<table class="border tableforfield centpercent">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border tableforfield centpercent">';
 
-    // Company
-    /*
+	// Company
+	/*
     if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
     {
     	if ($object->socid > 0)
@@ -151,26 +151,26 @@ if ($object->id)
     	}
     }*/
 
-    // Civility
-    print '<tr><td class="titlefield">'.$langs->trans("UserTitle").'</td><td colspan="3">';
-    print $object->getCivilityLabel();
-    print '</td></tr>';
+	// Civility
+	print '<tr><td class="titlefield">'.$langs->trans("UserTitle").'</td><td colspan="3">';
+	print $object->getCivilityLabel();
+	print '</td></tr>';
 
-    print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-    print '</table>';
+	print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    $modulepart = 'contact';
-    $permission = $user->rights->societe->contact->creer;
-    $permtoedit = $user->rights->societe->contact->creer;
-    $param = '&id='.$object->id;
-    include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	$modulepart = 'contact';
+	$permission = $user->rights->societe->contact->creer;
+	$permtoedit = $user->rights->societe->contact->creer;
+	$param = '&id='.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
-    print $langs->trans("ErrorUnknown");
+	print $langs->trans("ErrorUnknown");
 }
 
 
diff --git a/htdocs/contact/info.php b/htdocs/contact/info.php
index 68fe24d0044..c39c20d3d25 100644
--- a/htdocs/contact/info.php
+++ b/htdocs/contact/info.php
@@ -60,7 +60,7 @@ if ($id > 0)
 
 	$head = contact_prepare_head($object);
 
-	dol_fiche_head($head, 'info', $title, -1, 'contact');
+	print dol_get_fiche_head($head, 'info', $title, -1, 'contact');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -77,7 +77,7 @@ if ($id > 0)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 llxFooter();
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index f601086ad05..78934c5857e 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -86,7 +86,7 @@ llxHeader('', $title, 'EN:Module_Third_Parties|FR:Module_Tiers|ES:M&oacute;dulo_
 
 $head = contact_prepare_head($object);
 
-dol_fiche_head($head, 'ldap', $title, -1, 'contact');
+print dol_get_fiche_head($head, 'ldap', $title, -1, 'contact');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -130,7 +130,7 @@ print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 /*
@@ -174,7 +174,7 @@ if ($result > 0)
 	//var_dump($records);
 
 	// Show tree
-    if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0))
+	if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0))
 	{
 		if (!is_array($records))
 		{
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 531fb885f63..00c74544d17 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -165,7 +165,7 @@ foreach ($object->fields as $key => $val)
 }
 
 // Add none object fields for "search in all"
-if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))	{
+if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
 	$fieldstosearchall['s.nom'] = "ThirdParty";
 }
 
@@ -186,7 +186,7 @@ foreach ($object->fields as $key => $val) {
 
 // Add none object fields to fields for list
 $arrayfields['country.code_iso'] = array('label'=>"Country", 'position'=>22, 'checked'=>0);
-if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))	{
+if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
 	$arrayfields['s.nom'] = array('label'=>"ThirdParty", 'position'=>25, 'checked'=>1);
 }
 
@@ -203,20 +203,8 @@ if (!empty($conf->socialnetworks->enabled)) {
 }
 
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array(
-				'label'=>$extrafields->attributes[$object->table_element]['label'][$key],
-				'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1),
-				'position'=>$extrafields->attributes[$object->table_element]['pos'][$key],
-				'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]),
-				'langfile'=>$extrafields->attributes[$object->table_element]['langfile'][$key],
-			);
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
@@ -571,7 +559,7 @@ if ($search_firstlast_only)
 }
 
 $moreforfilter = '';
-if (!empty($conf->categorie->enabled))
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
@@ -594,21 +582,20 @@ if (!empty($conf->categorie->enabled))
 		$moreforfilter .= $formother->select_categories(Categorie::TYPE_SUPPLIER, $search_categ_supplier, 'search_categ_supplier', 1);
 		$moreforfilter .= '</div>';
 	}
-	$moreforfilter .= '<div class="divsearchfield">';
-	$moreforfilter .= $langs->trans('Roles').': ';
-	$moreforfilter .= $formcompany->showRoles("search_roles", $objecttmp, 'edit', $search_roles);
-	$moreforfilter .= '</div>';
-}
-if ($moreforfilter)
-{
-	print '<div class="liste_titre liste_titre_bydiv centpercent">';
-	print $moreforfilter;
-	$parameters = array('type'=>$type);
-	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	print '</div>';
 }
 
+$moreforfilter .= '<div class="divsearchfield">';
+$moreforfilter .= $langs->trans('Roles').': ';
+$moreforfilter .= $formcompany->showRoles("search_roles", $objecttmp, 'edit', $search_roles);
+$moreforfilter .= '</div>';
+
+print '<div class="liste_titre liste_titre_bydiv centpercent">';
+print $moreforfilter;
+$parameters = array('type'=>$type);
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+print '</div>';
+
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
@@ -892,7 +879,7 @@ while ($i < min($num, $limit))
 	if (!empty($arrayfields['p.lastname']['checked']))
 	{
 		print '<td class="middle tdoverflowmax200">';
-		print $contactstatic->getNomUrl(1, '', 0);
+		print $contactstatic->getNomUrl(1);
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
@@ -980,7 +967,7 @@ while ($i < min($num, $limit))
 	if (!empty($conf->socialnetworks->enabled)) {
 		foreach ($socialnetworks as $key => $value) {
 			if ($value['active'] && !empty($arrayfields['p.'.$key]['checked'])) {
-				print '<td>'.dol_print_socialnetworks($arraysocialnetworks[$key], $obj->rowid, $obj->socid, $key).'</td>';
+				print '<td>'.dol_print_socialnetworks($arraysocialnetworks[$key], $obj->rowid, $obj->socid, $key, $socialnetworks).'</td>';
 				if (!$i) $totalarray['nbfield']++;
 			}
 		}
diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php
index 572664890e1..ae32ef5c95e 100644
--- a/htdocs/contact/note.php
+++ b/htdocs/contact/note.php
@@ -67,46 +67,46 @@ llxHeader('', $title, $help_url);
 
 if ($id > 0)
 {
-    /*
+	/*
      * Affichage onglets
      */
-    if (!empty($conf->notification->enabled)) $langs->load("mails");
+	if (!empty($conf->notification->enabled)) $langs->load("mails");
 
-    $head = contact_prepare_head($object);
+	$head = contact_prepare_head($object);
 
-    dol_fiche_head($head, 'note', $title, -1, 'contact');
+	print dol_get_fiche_head($head, 'note', $title, -1, 'contact');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    $morehtmlref = '<div class="refidno">';
-    if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-    {
-        $objsoc = new Societe($db);
-        $objsoc->fetch($object->socid);
-        // Thirdparty
-        $morehtmlref .= $langs->trans('ThirdParty').' : ';
-        if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1);
-        else $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
-    }
-    $morehtmlref .= '</div>';
+	$morehtmlref = '<div class="refidno">';
+	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+	{
+		$objsoc = new Societe($db);
+		$objsoc->fetch($object->socid);
+		// Thirdparty
+		$morehtmlref .= $langs->trans('ThirdParty').' : ';
+		if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1);
+		else $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+	}
+	$morehtmlref .= '</div>';
 
-    dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
 
-    $cssclass = 'titlefield';
-    //if ($action == 'editnote_public') $cssclass='titlefieldcreate';
-    //if ($action == 'editnote_private') $cssclass='titlefieldcreate';
+	$cssclass = 'titlefield';
+	//if ($action == 'editnote_public') $cssclass='titlefieldcreate';
+	//if ($action == 'editnote_private') $cssclass='titlefieldcreate';
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
 	print '<table class="border centpercent tableforfield">';
 
-    // Civility
-    print '<tr><td class="'.$cssclass.'">'.$langs->trans("UserTitle").'</td><td>';
-    print $object->getCivilityLabel();
-    print '</td></tr>';
+	// Civility
+	print '<tr><td class="'.$cssclass.'">'.$langs->trans("UserTitle").'</td><td>';
+	print $object->getCivilityLabel();
+	print '</td></tr>';
 
-    print "</table>";
+	print "</table>";
 
 
 	$cssclass = "titlefield";
@@ -114,7 +114,7 @@ if ($id > 0)
 
 	print '</div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 llxFooter();
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index 1710b4dda6a..0555eb84719 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2004       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2011  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric 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
@@ -66,9 +66,9 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->societe->contact-
 		if ($file_OK)
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 			if (GETPOST('deletephoto'))
 			{
-				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 				$fileimg = $conf->societe->dir_output.'/contact/'.get_exdir($object->id, 0, 0, 1, $object, 'contact').'/photos/'.$object->photo;
 				$dirthumbs = $conf->societe->dir_output.'/contact/'.get_exdir($object->id, 0, 0, 1, $object, 'contact').'/photos/thumbs';
 				dol_delete_file($fileimg);
@@ -86,8 +86,8 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->societe->contact-
 					{
 						setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 					} else {
-					    // Create thumbs
-					    $object->addThumbs($newfile);
+						// Create thumbs
+						$object->addThumbs($newfile);
 					}
 				}
 			} else {
@@ -130,119 +130,119 @@ $head = contact_prepare_head($object);
 
 if ($action == 'edit')
 {
-    /*
+	/*
 	 * Fiche en mode edition
 	 */
 
-    print '<form name="perso" method="POST" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="update">';
-    print '<input type="hidden" name="id" value="'.$object->id.'">';
+	print '<form name="perso" method="POST" enctype="multipart/form-data" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="update">';
+	print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-    dol_fiche_head($head, 'perso', $title, 0, 'contact');
+	print dol_get_fiche_head($head, 'perso', $title, 0, 'contact');
 
-    print '<table class="border centpercent">';
+	print '<table class="border centpercent">';
 
-    // Ref
-    print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td colspan="3">';
-    print $object->id;
-    print '</td>';
+	// Ref
+	print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td colspan="3">';
+	print $object->id;
+	print '</td>';
 
-    // Photo
-    print '<td class="center hideonsmartphone valignmiddle" rowspan="6">';
-    print $form->showphoto('contact', $object)."\n";
-    if ($object->photo) print "<br>\n";
+	// Photo
+	print '<td class="center hideonsmartphone valignmiddle" rowspan="6">';
+	print $form->showphoto('contact', $object)."\n";
+	if ($object->photo) print "<br>\n";
 
-    print '<table class="nobordernopadding">';
+	print '<table class="nobordernopadding">';
 
-    if ($object->photo) print '<tr><td class="center"><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
-    print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
-    print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
-    print '</table>';
+	if ($object->photo) print '<tr><td class="center"><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
+	print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
+	print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
+	print '</table>';
 
-    print '</td></tr>';
+	print '</td></tr>';
 
-    // Name
-    print '<tr><td>'.$langs->trans("Lastname").' / '.$langs->trans("Label").'</td><td colspan="3">'.$object->lastname.'</td></tr>';
-    print '<tr><td>'.$langs->trans("Firstname").'</td><td colspan="3">'.$object->firstname.'</td>';
+	// Name
+	print '<tr><td>'.$langs->trans("Lastname").' / '.$langs->trans("Label").'</td><td colspan="3">'.$object->lastname.'</td></tr>';
+	print '<tr><td>'.$langs->trans("Firstname").'</td><td colspan="3">'.$object->firstname.'</td>';
 
-    // Company
-    if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-    {
-        if ($object->socid > 0)
-        {
-            $objsoc = new Societe($db);
-            $objsoc->fetch($object->socid);
+	// Company
+	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+	{
+		if ($object->socid > 0)
+		{
+			$objsoc = new Societe($db);
+			$objsoc->fetch($object->socid);
 
-            print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td>';
-        } else {
-            print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
-            print $langs->trans("ContactNotLinkedToCompany");
-            print '</td></tr>';
-        }
-    }
+			print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td>';
+		} else {
+			print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
+			print $langs->trans("ContactNotLinkedToCompany");
+			print '</td></tr>';
+		}
+	}
 
-    // Civility
-    print '<tr><td>'.$langs->trans("UserTitle").'</td><td colspan="3">';
-    print $object->getCivilityLabel();
-    print '</td></tr>';
+	// Civility
+	print '<tr><td>'.$langs->trans("UserTitle").'</td><td colspan="3">';
+	print $object->getCivilityLabel();
+	print '</td></tr>';
 
-    // Date To Birth
-    print '<tr><td>'.$langs->trans("DateOfBirth").'</td><td>';
-    $form = new Form($db);
-    print $form->selectDate($object->birthday, 'birthday', 0, 0, 1, "perso", 1, 0);
-    print '</td>';
+	// Date To Birth
+	print '<tr><td>'.$langs->trans("DateOfBirth").'</td><td>';
+	$form = new Form($db);
+	print $form->selectDate($object->birthday, 'birthday', 0, 0, 1, "perso", 1, 0);
+	print '</td>';
 
-    print '<td colspan="2">'.$langs->trans("Alert").': ';
-    if (!empty($object->birthday_alert))
-    {
-        print '<input type="checkbox" name="birthday_alert" checked></td>';
-    } else {
-        print '<input type="checkbox" name="birthday_alert"></td>';
-    }
-    print '</tr>';
+	print '<td colspan="2">'.$langs->trans("Alert").': ';
+	if (!empty($object->birthday_alert))
+	{
+		print '<input type="checkbox" name="birthday_alert" checked></td>';
+	} else {
+		print '<input type="checkbox" name="birthday_alert"></td>';
+	}
+	print '</tr>';
 
-    print "</table>";
+	print "</table>";
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '<div class="center">';
-    print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-    print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-    print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-    print '</div>';
+	print '<div class="center">';
+	print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
 
-    print "</form>";
+	print "</form>";
 } else {
-    // View mode
+	// View mode
 
-    dol_fiche_head($head, 'perso', $title, -1, 'contact');
+	print dol_get_fiche_head($head, 'perso', $title, -1, 'contact');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    $morehtmlref = '<div class="refidno">';
-    if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-    {
-        $objsoc = new Societe($db);
-        $objsoc->fetch($object->socid);
-        // Thirdparty
-        $morehtmlref .= $langs->trans('ThirdParty').' : ';
-        if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1);
-        else $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
-    }
-    $morehtmlref .= '</div>';
+	$morehtmlref = '<div class="refidno">';
+	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+	{
+		$objsoc = new Societe($db);
+		$objsoc->fetch($object->socid);
+		// Thirdparty
+		$morehtmlref .= $langs->trans('ThirdParty').' : ';
+		if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1);
+		else $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+	}
+	$morehtmlref .= '</div>';
 
 
-    dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
 
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
-    print '<table class="border centpercent tableforfield">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">';
 
-    // Company
-    /*
+	// Company
+	/*
     if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
     {
         if ($object->socid > 0)
@@ -261,59 +261,59 @@ if ($action == 'edit')
         }
     }*/
 
-    // Civility
-    print '<tr><td class="titlefield">'.$langs->trans("UserTitle").'</td><td colspan="3">';
-    print $object->getCivilityLabel();
-    print '</td></tr>';
+	// Civility
+	print '<tr><td class="titlefield">'.$langs->trans("UserTitle").'</td><td colspan="3">';
+	print $object->getCivilityLabel();
+	print '</td></tr>';
 
-    // Date To Birth
-    print '<tr>';
-    if (!empty($object->birthday))
-    {
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+	// Date To Birth
+	print '<tr>';
+	if (!empty($object->birthday))
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-        print '<td>'.$langs->trans("DateOfBirth").'</td><td colspan="3">'.dol_print_date($object->birthday, "day");
+		print '<td>'.$langs->trans("DateOfBirth").'</td><td colspan="3">'.dol_print_date($object->birthday, "day");
 
-        print ' &nbsp; ';
-        //var_dump($birthdatearray);
-        $ageyear = convertSecondToTime($now - $object->birthday, 'year') - 1970;
-        $agemonth = convertSecondToTime($now - $object->birthday, 'month') - 1;
-        if ($ageyear >= 2) print '('.$ageyear.' '.$langs->trans("DurationYears").')';
-        elseif ($agemonth >= 2) print '('.$agemonth.' '.$langs->trans("DurationMonths").')';
-        else print '('.$agemonth.' '.$langs->trans("DurationMonth").')';
+		print ' &nbsp; ';
+		//var_dump($birthdatearray);
+		$ageyear = convertSecondToTime($now - $object->birthday, 'year') - 1970;
+		$agemonth = convertSecondToTime($now - $object->birthday, 'month') - 1;
+		if ($ageyear >= 2) print '('.$ageyear.' '.$langs->trans("DurationYears").')';
+		elseif ($agemonth >= 2) print '('.$agemonth.' '.$langs->trans("DurationMonths").')';
+		else print '('.$agemonth.' '.$langs->trans("DurationMonth").')';
 
 
-        print ' &nbsp; - &nbsp; ';
-        if ($object->birthday_alert) print $langs->trans("BirthdayAlertOn");
-        else print $langs->trans("BirthdayAlertOff");
-        print '</td>';
-    } else {
-        print '<td>'.$langs->trans("DateOfBirth").'</td><td colspan="3"></td>';
-    }
-    print "</tr>";
+		print ' &nbsp; - &nbsp; ';
+		if ($object->birthday_alert) print $langs->trans("BirthdayAlertOn");
+		else print $langs->trans("BirthdayAlertOff");
+		print '</td>';
+	} else {
+		print '<td>'.$langs->trans("DateOfBirth").'</td><td colspan="3"></td>';
+	}
+	print "</tr>";
 
-    print "</table>";
+	print "</table>";
 
-    print '</div>';
+	print '</div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 
 if ($action != 'edit')
 {
-    // Barre d'actions
-    if ($user->socid == 0)
-    {
-        print '<div class="tabsAction">';
+	// Barre d'actions
+	if ($user->socid == 0)
+	{
+		print '<div class="tabsAction">';
 
-        if ($user->rights->societe->contact->creer)
-        {
-            print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans('Modify').'</a>';
-        }
+		if ($user->rights->societe->contact->creer)
+		{
+			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans('Modify').'</a>';
+		}
 
-        print "</div>";
-    }
+		print "</div>";
+	}
 }
 
 
diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php
index ee325317033..05426db19a6 100644
--- a/htdocs/contact/vcard.php
+++ b/htdocs/contact/vcard.php
@@ -66,7 +66,7 @@ $v->setPhoneNumber($contact->phone_pro, "TYPE=WORK;VOICE");
 $v->setPhoneNumber($contact->phone_mobile, "TYPE=CELL;VOICE");
 $v->setPhoneNumber($contact->fax, "TYPE=WORK;FAX");
 
-$country = $contact->country_code ? $contact->country : '' ;
+$country = $contact->country_code ? $contact->country : '';
 
 $v->setAddress("", "", $contact->address, $contact->town, $contact->state, $contact->zip, $country, "TYPE=WORK;POSTAL");
 $v->setLabel("", "", $contact->address, $contact->town, $contact->state, $contact->zip, $country, "TYPE=WORK");
@@ -79,9 +79,9 @@ $v->setTitle($contact->poste);
 if ($company->id)
 {
 	$v->setURL($company->url, "TYPE=WORK");
-	if (! $contact->phone_pro) $v->setPhoneNumber($company->phone, "TYPE=WORK;VOICE");
-	if (! $contact->fax)       $v->setPhoneNumber($company->fax, "TYPE=WORK;FAX");
-	if (! $contact->zip)       $v->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "TYPE=WORK;POSTAL");
+	if (!$contact->phone_pro) $v->setPhoneNumber($company->phone, "TYPE=WORK;VOICE");
+	if (!$contact->fax)       $v->setPhoneNumber($company->fax, "TYPE=WORK;FAX");
+	if (!$contact->zip)       $v->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "TYPE=WORK;POSTAL");
 
 	// when company e-mail is empty, use only contact e-mail
 	if (empty(trim($company->email)))
@@ -124,7 +124,7 @@ $db->close();
 
 $output = $v->getVCard();
 
-$filename = trim(urldecode($v->getFileName()));      // "Nom prenom.vcf"
+$filename = trim(urldecode($v->getFileName())); // "Nom prenom.vcf"
 $filenameurlencoded = dol_sanitizeFileName(urlencode($filename));
 //$filename = dol_sanitizeFileName($filename);
 
diff --git a/htdocs/contrat/admin/contract_extrafields.php b/htdocs/contrat/admin/contract_extrafields.php
index 5343ab8f349..8571856362a 100644
--- a/htdocs/contrat/admin/contract_extrafields.php
+++ b/htdocs/contrat/admin/contract_extrafields.php
@@ -70,11 +70,11 @@ print load_fiche_titre($langs->trans("ContractsSetup"), $linkback, 'title_setup'
 
 $head = contract_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Contracts"), -1, 'contract');
+print dol_get_fiche_head($head, 'attributes', $langs->trans("Contracts"), -1, 'contract');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/contrat/admin/contractdet_extrafields.php b/htdocs/contrat/admin/contractdet_extrafields.php
index bd0c7b132d0..4b3f03ffedf 100644
--- a/htdocs/contrat/admin/contractdet_extrafields.php
+++ b/htdocs/contrat/admin/contractdet_extrafields.php
@@ -70,11 +70,11 @@ print load_fiche_titre($langs->trans("ContractsSetup"), $linkback, 'title_setup'
 
 $head = contract_admin_prepare_head();
 
-dol_fiche_head($head, 'attributeslines', $langs->trans("Contracts"), -1, 'contract');
+print dol_get_fiche_head($head, 'attributeslines', $langs->trans("Contracts"), -1, 'contract');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/contrat/agenda.php b/htdocs/contrat/agenda.php
index d016cb23d75..f88b470215c 100644
--- a/htdocs/contrat/agenda.php
+++ b/htdocs/contrat/agenda.php
@@ -132,7 +132,7 @@ if ($id > 0)
 	if (!empty($conf->notification->enabled)) $langs->load("mails");
 	$head = contract_prepare_head($object);
 
-	dol_fiche_head($head, 'agenda', $langs->trans("Contract"), -1, 'contract');
+	print dol_get_fiche_head($head, 'agenda', $langs->trans("Contract"), -1, 'contract');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -204,7 +204,7 @@ if ($id > 0)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index dd06d9fed4b..2e692dc25c4 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -6,10 +6,10 @@
  * Copyright (C) 2010-2017  Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2013       Christophe Battarel     <christophe.battarel@altairis.fr>
  * Copyright (C) 2013-2014  Florian Henry		  	<florian.henry@open-concept.pro>
- * Copyright (C) 2014-2018	Ferran Marcet		  	<fmarcet@2byte.es>
+ * Copyright (C) 2014-2020	Ferran Marcet		  	<fmarcet@2byte.es>
  * Copyright (C) 2014-2016  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric 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
@@ -409,13 +409,13 @@ if (empty($reshook))
 			$error++;
 		}
 
-	    $date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
-	    $date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
-	    if (!empty($date_start) && !empty($date_end) && $date_start > $date_end)
-	    {
-		    setEventMessages($langs->trans("Error").': '.$langs->trans("DateStartPlanned").' > '.$langs->trans("DateEndPlanned"), null, 'errors');
-		    $error++;
-	    }
+		$date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
+		$date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
+		if (!empty($date_start) && !empty($date_end) && $date_start > $date_end)
+		{
+			setEventMessages($langs->trans("Error").': '.$langs->trans("DateStartPlanned").' > '.$langs->trans("DateEndPlanned"), null, 'errors');
+			$error++;
+		}
 
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -684,9 +684,9 @@ if (empty($reshook))
 			$objectline->pa_ht = $pa_ht;
 
 			if ($fk_unit > 0) {
-			    $objectline->fk_unit = GETPOST('unit');
+				$objectline->fk_unit = GETPOST('unit');
 			} else {
-			    $objectline->fk_unit = null;
+				$objectline->fk_unit = null;
 			}
 
 			// Extrafields
@@ -877,11 +877,11 @@ if (empty($reshook))
 
 			$old_ref = $object->ref;
 
-	        $result = $object->setValueFrom('ref', GETPOST('ref', 'alpha'), '', null, 'text', '', $user, 'CONTRACT_MODIFY');
-	        if ($result < 0) {
-	            setEventMessages($object->error, $object->errors, 'errors');
-	            $action = 'editref';
-	        } else {
+			$result = $object->setValueFrom('ref', GETPOST('ref', 'alpha'), '', null, 'text', '', $user, 'CONTRACT_MODIFY');
+			if ($result < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = 'editref';
+			} else {
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 				$old_filedir = $conf->contrat->dir_output.'/'.dol_sanitizeFileName($old_ref);
 				$new_filedir = $conf->contrat->dir_output.'/'.dol_sanitizeFileName($object->ref);
@@ -896,13 +896,13 @@ if (empty($reshook))
 					}
 				}
 
-	            header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-	            exit;
-	        }
-	    } else {
-	        header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-	        exit;
-	    }
+				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+				exit;
+			}
+		} else {
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+			exit;
+		}
 	} elseif ($action == 'setdate_contrat')
 	{
 		$cancelbutton = GETPOST('cancel', 'alpha');
@@ -946,7 +946,8 @@ if (empty($reshook))
 		if ($action == 'addcontact')
 		{
 			$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-			$result = $object->add_contact($contactid, GETPOST('type'), GETPOST('source'));
+			$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+			$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 
 			if ($result >= 0)
 			{
@@ -1092,7 +1093,7 @@ if ($action == 'create')
 	print '<input type="hidden" name="socid" value="'.$soc->id.'">'."\n";
 	print '<input type="hidden" name="remise_percent" value="0">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">';
 
@@ -1192,17 +1193,17 @@ if ($action == 'create')
 
 	// Other attributes
 	if (empty($reshook)) {
-		print $object->showOptionals($extrafields, 'edit', $parameters);
+		print $object->showOptionals($extrafields, 'create', $parameters);
 	}
 
 	print "</table>\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Create").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+	print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 	print '</div>';
 
 	if (is_object($objectsrc))
@@ -1233,8 +1234,8 @@ if ($action == 'create')
 
 		$result = $object->fetch_lines(); // This also init $this->nbofserviceswait, $this->nbofservicesopened, $this->nbofservicesexpired=, $this->nbofservicesclosed
 		if ($result < 0) {
-            dol_print_error($db, $object->error);
-        }
+			dol_print_error($db, $object->error);
+		}
 
 		$nbofservices = count($object->lines);
 
@@ -1249,55 +1250,55 @@ if ($action == 'create')
 
 		$head = contract_prepare_head($object);
 
-        $hselected = 0;
-        $formconfirm = '';
+		$hselected = 0;
+		$formconfirm = '';
 
-        dol_fiche_head($head, $hselected, $langs->trans("Contract"), -1, 'contract');
+		print dol_get_fiche_head($head, $hselected, $langs->trans("Contract"), -1, 'contract');
 
 
-        if ($action == 'delete') {
-            //Confirmation de la suppression du contrat
-            $formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("DeleteAContract"), $langs->trans("ConfirmDeleteAContract"), "confirm_delete", '', 0, 1);
-        } elseif ($action == 'valid') {
-            //Confirmation de la validation
-            $ref = substr($object->ref, 1, 4);
-            if ($ref == 'PROV' && !empty($modCodeContract->code_auto)) {
-                $numref = $object->getNextNumRef($object->thirdparty);
-            } else {
-                $numref = $object->ref;
-            }
-            $text = $langs->trans('ConfirmValidateContract', $numref);
-            $formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("ValidateAContract"), $text, "confirm_valid", '', 0, 1);
-        } elseif ($action == 'close') {
-            // Confirmation de la fermeture
-            $formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("CloseAContract"), $langs->trans("ConfirmCloseContract"), "confirm_close", '', 0, 1);
-        } elseif ($action == 'activate') {
-            $formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("ActivateAllOnContract"), $langs->trans("ConfirmActivateAllOnContract"), "confirm_activate", '', 0, 1);
-        } elseif ($action == 'clone') {
-            // Clone confirmation
-            $formquestion = array(array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '(s.client=1 OR s.client=2 OR s.client=3)')));
-            $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneContract', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
-        }
+		if ($action == 'delete') {
+			//Confirmation de la suppression du contrat
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("DeleteAContract"), $langs->trans("ConfirmDeleteAContract"), "confirm_delete", '', 0, 1);
+		} elseif ($action == 'valid') {
+			//Confirmation de la validation
+			$ref = substr($object->ref, 1, 4);
+			if ($ref == 'PROV' && !empty($modCodeContract->code_auto)) {
+				$numref = $object->getNextNumRef($object->thirdparty);
+			} else {
+				$numref = $object->ref;
+			}
+			$text = $langs->trans('ConfirmValidateContract', $numref);
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("ValidateAContract"), $text, "confirm_valid", '', 0, 1);
+		} elseif ($action == 'close') {
+			// Confirmation de la fermeture
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("CloseAContract"), $langs->trans("ConfirmCloseContract"), "confirm_close", '', 0, 1);
+		} elseif ($action == 'activate') {
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("ActivateAllOnContract"), $langs->trans("ConfirmActivateAllOnContract"), "confirm_activate", '', 0, 1);
+		} elseif ($action == 'clone') {
+			// Clone confirmation
+			$formquestion = array(array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '(s.client=1 OR s.client=2 OR s.client=3)')));
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneContract', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
+		}
 
 
-        // Call Hook formConfirm
-        $parameters = array(
-        	'formConfirm' => $formconfirm,
-            'id' => $id,
-            //'lineid' => $lineid,
-        );
-        // Note that $action and $object may have been modified by hook
-        $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action);
-        if (empty($reshook)) {
-            $formconfirm .= $hookmanager->resPrint;
-        } elseif ($reshook > 0) {
-            $formconfirm = $hookmanager->resPrint;
-        }
+		// Call Hook formConfirm
+		$parameters = array(
+			'formConfirm' => $formconfirm,
+			'id' => $id,
+			//'lineid' => $lineid,
+		);
+		// Note that $action and $object may have been modified by hook
+		$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action);
+		if (empty($reshook)) {
+			$formconfirm .= $hookmanager->resPrint;
+		} elseif ($reshook > 0) {
+			$formconfirm = $hookmanager->resPrint;
+		}
 
-        // Print form confirm
-        print $formconfirm;
+		// Print form confirm
+		print $formconfirm;
 
-        /*
+		/*
          *   Contrat
          */
 		if (!empty($object->brouillon) && $user->rights->contrat->creer)
@@ -1477,7 +1478,7 @@ if ($action == 'create')
 				//	print '<td width="80" class="right">'.$langs->trans("PriceUHTCurrency").'</td>';
 				//}
 				print '<td width="30" class="center">'.$langs->trans("Qty").'</td>';
-				if ($conf->global->PRODUCT_USE_UNITS) print '<td width="30" class="left">'.$langs->trans("Unit").'</td>';
+				if (!empty($conf->global->PRODUCT_USE_UNITS)) print '<td width="30" class="left">'.$langs->trans("Unit").'</td>';
 				print '<td width="50" class="right">'.$langs->trans("ReductionShort").'</td>';
 				if (!empty($conf->margin->enabled) && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) print '<td width="50" class="right">'.$langs->trans("BuyingPrice").'</td>';
 				print '<td width="30">&nbsp;</td>';
@@ -1488,8 +1489,8 @@ if ($action == 'create')
 				// Line in view mode
 				if ($action != 'editline' || GETPOST('rowid') != $objp->rowid)
 				{
-				    $moreparam = '';
-				    if (! empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $objp->statut == ContratLigne::STATUS_CLOSED && $action != 'showclosedlines') $moreparam = 'style="display: none;"';
+					$moreparam = '';
+					if (!empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $objp->statut == ContratLigne::STATUS_CLOSED && $action != 'showclosedlines') $moreparam = 'style="display: none;"';
 					print '<tr class="tdtop oddeven" '.$moreparam.'>';
 					// Label
 					if ($objp->fk_product > 0)
@@ -1538,7 +1539,7 @@ if ($action == 'create')
 					// Quantity
 					print '<td class="center">'.$objp->qty.'</td>';
 					// Unit
-					if ($conf->global->PRODUCT_USE_UNITS) print '<td class="left">'.$langs->trans($object->lines[$cursorline - 1]->getLabelOfUnit()).'</td>';
+					if (!empty($conf->global->PRODUCT_USE_UNITS)) print '<td class="left">'.$langs->trans($object->lines[$cursorline - 1]->getLabelOfUnit()).'</td>';
 					// Discount
 					if ($objp->remise_percent > 0)
 					{
@@ -1622,7 +1623,7 @@ if ($action == 'create')
 						$line = new ContratLigne($db);
 						$line->id = $objp->rowid;
 						$line->fetch_optionals();
-						print $line->showOptionals($extrafields, 'view', array('class'=>'oddeven','style'=>$moreparam, 'colspan'=>$colspan), '', '', 1);
+						print $line->showOptionals($extrafields, 'view', array('class'=>'oddeven', 'style'=>$moreparam, 'colspan'=>$colspan), '', '', 1);
 					}
 				}
 				// Line in mode update
@@ -1682,7 +1683,7 @@ if ($action == 'create')
 					print '<td class="center"><input size="2" type="text" name="elqty" value="'.$objp->qty.'"></td>';
 
 					// Unit
-					if ($conf->global->PRODUCT_USE_UNITS)
+					if (!empty($conf->global->PRODUCT_USE_UNITS))
 					{
 						print '<td class="left">';
 						print $form->selectUnits($objp->fk_unit, "unit");
@@ -1700,13 +1701,13 @@ if ($action == 'create')
 					}
 					print '<td class="center">';
 					print '<input type="submit" class="button margintoponly marginbottomonly" name="save" value="'.$langs->trans("Modify").'">';
-					print '<br><input type="submit" class="button margintoponly marginbottomonly" name="cancel" value="'.$langs->trans("Cancel").'">';
+					print '<br><input type="submit" class="button margintoponly marginbottomonly button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 					print '</td>';
 					print '</tr>';
 
 					$colspan = 6;
 					if (!empty($conf->margin->enabled) && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) $colspan++;
-					if ($conf->global->PRODUCT_USE_UNITS) $colspan++;
+					if (!empty($conf->global->PRODUCT_USE_UNITS)) $colspan++;
 
 					// Ligne dates prevues
 					print '<tr class="oddeven">';
@@ -1733,8 +1734,8 @@ if ($action == 'create')
 
 			if ($object->statut > 0)
 			{
-                $moreparam = '';
-                if (! empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $object->lines[$cursorline-1]->statut == ContratLigne::STATUS_CLOSED && $action != 'showclosedlines') $moreparam = 'style="display: none;"';
+				$moreparam = '';
+				if (!empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $object->lines[$cursorline - 1]->statut == ContratLigne::STATUS_CLOSED && $action != 'showclosedlines') $moreparam = 'style="display: none;"';
 				print '<tr class="oddeven" '.$moreparam.'>';
 				print '<td class="tdhrthin" colspan="'.($conf->margin->enabled ? 7 : 6).'"><hr class="opacitymedium tdhrthin"></td>';
 				print "</tr>\n";
@@ -1850,12 +1851,12 @@ if ($action == 'create')
 				// Si active et en cours
 				if ($objp->date_debut_reelle && !$objp->date_fin_reelle) {
 					print $langs->trans("DateStartReal").': ';
-                    print dol_print_date($db->jdate($objp->date_debut_reelle), 'day');
+					print dol_print_date($db->jdate($objp->date_debut_reelle), 'day');
 				}
 				// Si desactive
 				if ($objp->date_debut_reelle && $objp->date_fin_reelle) {
 					print $langs->trans("DateStartReal").': ';
-                    print dol_print_date($db->jdate($objp->date_debut_reelle), 'day');
+					print dol_print_date($db->jdate($objp->date_debut_reelle), 'day');
 					print ' &nbsp;-&nbsp; ';
 					print $langs->trans("DateEndReal").': ';
 					print dol_print_date($db->jdate($objp->date_fin_reelle), 'day');
@@ -1907,10 +1908,10 @@ if ($action == 'create')
 				print '</tr>';
 
 				print '<tr class="oddeven">';
-				print '<td class="nohover">'.$langs->trans("Comment").'</td><td colspan="3" class="nohover" colspan="'.($conf->margin->enabled ? 4 : 3).'"><input type="text" class="minwidth300" name="comment" value="'.GETPOST("comment", 'alphanohtml').'"></td>';
+				print '<td class="nohover">'.$langs->trans("Comment").'</td><td colspan="3" class="nohover" colspan="'.($conf->margin->enabled ? 4 : 3).'"><input type="text" class="minwidth300" name="comment" value="'.dol_escape_htmltag(GETPOST("comment", 'alphanohtml')).'"></td>';
 				print '<td class="nohover right">';
 				print '<input type="submit" class="button" name="activate" value="'.$langs->trans("Activate").'"> &nbsp; ';
-				print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+				print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 				print '</td>';
 				print '</tr>';
 
@@ -1968,7 +1969,7 @@ if ($action == 'create')
 				print '<td class="nohover">'.$langs->trans("Comment").'</td><td class="nohover"><input size="70" type="text" class="flat" name="comment" value="'.dol_escape_htmltag(GETPOST('comment', 'alpha')).'"></td>';
 				print '<td class="nohover right">';
 				print '<input type="submit" class="button" name="close" value="'.$langs->trans("Disable").'"> &nbsp; ';
-				print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+				print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 				print '</td>';
 				print '</tr>';
 
@@ -2015,7 +2016,7 @@ if ($action == 'create')
 			print '</form>';
 		}
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		/*
@@ -2034,7 +2035,7 @@ if ($action == 'create')
 				// Send
 				if (empty($user->socid)) {
 					if ($object->statut == 1) {
-						if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send)) {
+						if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->contrat->creer)) {
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
 						} else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
 					}
@@ -2092,16 +2093,16 @@ if ($action == 'create')
 					//}
 				}
 
-                if (! empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $object->nbofservicesclosed > 0)
-                {
-                    if ($action == 'showclosedlines') print '<div class="inline-block divButAction"><a class="butAction" id="btnhideclosedlines" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=hideclosedlines">'.$langs->trans("HideClosedServices").'</a></div>';
-                    else print '<div class="inline-block divButAction"><a class="butAction" id="btnshowclosedlines" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=showclosedlines">'.$langs->trans("ShowClosedServices").'</a></div>';
-                }
+				if (!empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $object->nbofservicesclosed > 0)
+				{
+					if ($action == 'showclosedlines') print '<div class="inline-block divButAction"><a class="butAction" id="btnhideclosedlines" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=hideclosedlines">'.$langs->trans("HideClosedServices").'</a></div>';
+					else print '<div class="inline-block divButAction"><a class="butAction" id="btnshowclosedlines" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=showclosedlines">'.$langs->trans("ShowClosedServices").'</a></div>';
+				}
 
-                // Clone
-                if ($user->rights->contrat->creer) {
-                	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object='.$object->element.'">'.$langs->trans("ToClone").'</a></div>';
-                }
+				// Clone
+				if ($user->rights->contrat->creer) {
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object='.$object->element.'">'.$langs->trans("ToClone").'</a></div>';
+				}
 
 				// On peut supprimer entite si
 				// - Droit de creer + mode brouillon (erreur creation)
@@ -2183,7 +2184,7 @@ if (!empty($conf->margin->enabled) && $action == 'editline')
 $(document).ready(function() {
   var idprod = $("input[name='idprod']").val();
   var fournprice = $("input[name='fournprice']").val();
-  var token = '<?php echo $_SESSION["token"]; ?>';		// For AJAX Call we use old 'token' and not 'newtoken'
+  var token = '<?php echo currentToken(); ?>';		// For AJAX Call we use old 'token' and not 'newtoken'
   if (idprod > 0) {
 	  $.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', {
 		  'idprod': idprod,
diff --git a/htdocs/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php
index 671ac1177f6..e4479a0a857 100644
--- a/htdocs/contrat/class/api_contracts.class.php
+++ b/htdocs/contrat/class/api_contracts.class.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
- * Copyright (C) 2016	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+/* Copyright (C) 2015   	Jean-François Ferry     <jfefe@aternatik.fr>
+ * Copyright (C) 2016		Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2018-2020  Frédéric 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
@@ -30,648 +30,647 @@
 class Contracts extends DolibarrApi
 {
 
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'socid',
-        'date_contrat',
-        'commercial_signature_id',
-        'commercial_suivi_id'
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'socid',
+		'date_contrat',
+		'commercial_signature_id',
+		'commercial_suivi_id'
+	);
 
-    /**
-     * @var Contrat $contract {@type Contrat}
-     */
-    public $contract;
+	/**
+	 * @var Contrat $contract {@type Contrat}
+	 */
+	public $contract;
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-        $this->contract = new Contrat($this->db);
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->contract = new Contrat($this->db);
+	}
 
-    /**
-     * Get properties of a contract object
-     *
-     * Return an array with contract informations
-     *
-     * @param       int         $id         ID of contract
-     * @return 	array|mixed data without useless information
-     *
-     * @throws 	RestException
-     */
-    public function get($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->contrat->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a contract object
+	 *
+	 * Return an array with contract informations
+	 *
+	 * @param       int         $id         ID of contract
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->contrat->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->contract->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Contract not found');
-        }
+		$result = $this->contract->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Contract not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $this->contract->fetchObjectLinked();
-        return $this->_cleanObjectDatas($this->contract);
-    }
+		$this->contract->fetchObjectLinked();
+		return $this->_cleanObjectDatas($this->contract);
+	}
 
 
 
-    /**
-     * List contracts
-     *
-     * Get a list of contracts
-     *
-     * @param string	       $sortfield	        Sort field
-     * @param string	       $sortorder	        Sort order
-     * @param int		       $limit		        Limit for list
-     * @param int		       $page		        Page number
-     * @param string   	       $thirdparty_ids	    Thirdparty ids to filter contracts of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
-     * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-     * @return  array                               Array of contract objects
-     *
-     * @throws RestException 404 Not found
-     * @throws RestException 503 Error
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
-    {
-        global $db, $conf;
+	/**
+	 * List contracts
+	 *
+	 * Get a list of contracts
+	 *
+	 * @param string	       $sortfield	        Sort field
+	 * @param string	       $sortorder	        Sort order
+	 * @param int		       $limit		        Limit for list
+	 * @param int		       $page		        Page number
+	 * @param string   	       $thirdparty_ids	    Thirdparty ids to filter contracts of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
+	 * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+	 * @return  array                               Array of contract objects
+	 *
+	 * @throws RestException 404 Not found
+	 * @throws RestException 503 Error
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        // case of external user, $thirdparty_ids param is ignored and replaced by user's socid
-        $socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
+		// case of external user, $thirdparty_ids param is ignored and replaced by user's socid
+		$socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
 
-        // If the internal user must only see his customers, force searching by him
-        $search_sale = 0;
-        if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+		// If the internal user must only see his customers, force searching by him
+		$search_sale = 0;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
 
-        $sql = "SELECT t.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql .= " FROM ".MAIN_DB_PREFIX."contrat as t";
+		$sql = "SELECT t.rowid";
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		$sql .= " FROM ".MAIN_DB_PREFIX."contrat as t";
 
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql .= ' WHERE t.entity IN ('.getEntity('contrat').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-        if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
-        if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
-        // Insert sale filter
-        if ($search_sale > 0)
-        {
-            $sql .= " AND sc.fk_user = ".$search_sale;
-        }
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		$sql .= ' WHERE t.entity IN ('.getEntity('contrat').')';
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
+		if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
+		if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		// Insert sale filter
+		if ($search_sale > 0)
+		{
+			$sql .= " AND sc.fk_user = ".$search_sale;
+		}
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        dol_syslog("API Rest request");
-        $result = $this->db->query($sql);
+		dol_syslog("API Rest request");
+		$result = $this->db->query($sql);
 
-        if ($result)
-        {
-        	$num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            $i = 0;
-            while ($i < $min)
-            {
-            	$obj = $this->db->fetch_object($result);
-            	$contrat_static = new Contrat($this->db);
-                if ($contrat_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($contrat_static);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve contrat list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No contract found');
-        }
-        return $obj_ret;
-    }
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			$i = 0;
+			while ($i < $min)
+			{
+				$obj = $this->db->fetch_object($result);
+				$contrat_static = new Contrat($this->db);
+				if ($contrat_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($contrat_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve contrat list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No contract found');
+		}
+		return $obj_ret;
+	}
 
-    /**
-     * Create contract object
-     *
-     * @param   array   $request_data   Request data
-     * @return  int     ID of contrat
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->contrat->creer) {
-            throw new RestException(401, "Insufficient rights");
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+	/**
+	 * Create contract object
+	 *
+	 * @param   array   $request_data   Request data
+	 * @return  int     ID of contrat
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->contrat->creer) {
+			throw new RestException(401, "Insufficient rights");
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        foreach ($request_data as $field => $value) {
-            $this->contract->$field = $value;
-        }
-        /*if (isset($request_data["lines"])) {
+		foreach ($request_data as $field => $value) {
+			$this->contract->$field = $value;
+		}
+		/*if (isset($request_data["lines"])) {
           $lines = array();
           foreach ($request_data["lines"] as $line) {
             array_push($lines, (object) $line);
           }
           $this->contract->lines = $lines;
         }*/
-        if ($this->contract->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, "Error creating contract", array_merge(array($this->contract->error), $this->contract->errors));
-        }
+		if ($this->contract->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, "Error creating contract", array_merge(array($this->contract->error), $this->contract->errors));
+		}
 
-        return $this->contract->id;
-    }
+		return $this->contract->id;
+	}
 
-    /**
-     * Get lines of a contract
-     *
-     * @param int   $id             Id of contract
-     *
-     * @url	GET {id}/lines
-     *
-     * @return array
-     */
-    public function getLines($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->contrat->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get lines of a contract
+	 *
+	 * @param int   $id             Id of contract
+	 *
+	 * @url	GET {id}/lines
+	 *
+	 * @return array
+	 */
+	public function getLines($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->contrat->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->contract->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Contract not found');
-        }
+		$result = $this->contract->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Contract not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        $this->contract->getLinesArray();
-        $result = array();
-        foreach ($this->contract->lines as $line) {
-            array_push($result, $this->_cleanObjectDatas($line));
-        }
-        return $result;
-    }
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$this->contract->getLinesArray();
+		$result = array();
+		foreach ($this->contract->lines as $line) {
+			array_push($result, $this->_cleanObjectDatas($line));
+		}
+		return $result;
+	}
 
-    /**
-     * Add a line to given contract
-     *
-     * @param int   $id             Id of contrat to update
-     * @param array $request_data   Contractline data
-     *
-     * @url	POST {id}/lines
-     *
-     * @return int|bool
-     */
-    public function postLine($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->contrat->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Add a line to given contract
+	 *
+	 * @param int   $id             Id of contrat to update
+	 * @param array $request_data   Contractline data
+	 *
+	 * @url	POST {id}/lines
+	 *
+	 * @return int|bool
+	 */
+	public function postLine($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->contrat->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->contract->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Contract not found');
-        }
+		$result = $this->contract->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Contract not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        $request_data = (object) $request_data;
-        $updateRes = $this->contract->addline(
-            $request_data->desc,
-            $request_data->subprice,
-            $request_data->qty,
-            $request_data->tva_tx,
-            $request_data->localtax1_tx,
-            $request_data->localtax2_tx,
-            $request_data->fk_product,
-            $request_data->remise_percent,
-            $request_data->date_start, // date_start = date planned start, date ouverture = date_start_real
-            $request_data->date_end, // date_end = date planned end, date_cloture = date_end_real
-            $request_data->HT,
-            $request_data->subprice_excl_tax,
-            $request_data->info_bits,
-            $request_data->fk_fournprice,
-            $request_data->pa_ht,
-            $request_data->array_options,
-            $request_data->fk_unit,
-            $request_data->rang
-        );
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$request_data = (object) $request_data;
+		$updateRes = $this->contract->addline(
+			$request_data->desc,
+			$request_data->subprice,
+			$request_data->qty,
+			$request_data->tva_tx,
+			$request_data->localtax1_tx,
+			$request_data->localtax2_tx,
+			$request_data->fk_product,
+			$request_data->remise_percent,
+			$request_data->date_start, // date_start = date planned start, date ouverture = date_start_real
+			$request_data->date_end, // date_end = date planned end, date_cloture = date_end_real
+			$request_data->HT,
+			$request_data->subprice_excl_tax,
+			$request_data->info_bits,
+			$request_data->fk_fournprice,
+			$request_data->pa_ht,
+			$request_data->array_options,
+			$request_data->fk_unit,
+			$request_data->rang
+		);
 
-        if ($updateRes > 0) {
-            return $updateRes;
-        }
-        return false;
-    }
+		if ($updateRes > 0) {
+			return $updateRes;
+		}
+		return false;
+	}
 
-    /**
-     * Update a line to given contract
-     *
-     * @param int   $id             Id of contrat to update
-     * @param int   $lineid         Id of line to update
-     * @param array $request_data   Contractline data
-     *
-     * @url	PUT {id}/lines/{lineid}
-     *
-     * @return array|bool
-     */
-    public function putLine($id, $lineid, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->contrat->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Update a line to given contract
+	 *
+	 * @param int   $id             Id of contrat to update
+	 * @param int   $lineid         Id of line to update
+	 * @param array $request_data   Contractline data
+	 *
+	 * @url	PUT {id}/lines/{lineid}
+	 *
+	 * @return Object|bool
+	 */
+	public function putLine($id, $lineid, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->contrat->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->contract->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Contrat not found');
-        }
+		$result = $this->contract->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Contrat not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $request_data = (object) $request_data;
+		$request_data = (object) $request_data;
 
-        $updateRes = $this->contract->updateline(
-            $lineid,
-            $request_data->desc,
-            $request_data->subprice,
-            $request_data->qty,
-            $request_data->remise_percent,
-            $request_data->date_ouveture_prevue,
-            $request_data->date_fin_validite,
-            $request_data->tva_tx,
-            $request_data->localtax1_tx,
-            $request_data->localtax2_tx,
-            $request_data->date_ouverture,
-            $request_data->date_cloture,
-            'HT',
-            $request_data->info_bits,
-            $request_data->fk_fourn_price,
-            $request_data->pa_ht,
-            $request_data->array_options,
-            $request_data->fk_unit
-        );
+		$updateRes = $this->contract->updateline(
+			$lineid,
+			$request_data->desc,
+			$request_data->subprice,
+			$request_data->qty,
+			$request_data->remise_percent,
+			$request_data->date_ouveture_prevue,
+			$request_data->date_fin_validite,
+			$request_data->tva_tx,
+			$request_data->localtax1_tx,
+			$request_data->localtax2_tx,
+			$request_data->date_ouverture,
+			$request_data->date_cloture,
+			'HT',
+			$request_data->info_bits,
+			$request_data->fk_fourn_price,
+			$request_data->pa_ht,
+			$request_data->array_options,
+			$request_data->fk_unit
+		);
 
-        if ($updateRes > 0) {
-            $result = $this->get($id);
-            unset($result->line);
-            return $this->_cleanObjectDatas($result);
-        }
+		if ($updateRes > 0) {
+			$result = $this->get($id);
+			unset($result->line);
+			return $this->_cleanObjectDatas($result);
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Activate a service line of a given contract
-     *
-     * @param int   	$id             Id of contract to activate
-     * @param int   	$lineid         Id of line to activate
-     * @param string  	$datestart		{@from body}  Date start        {@type timestamp}
-     * @param string    $dateend		{@from body}  Date end          {@type timestamp}
-     * @param string    $comment  		{@from body}  Comment
-     *
-     * @url	PUT {id}/lines/{lineid}/activate
-     *
-     * @return array|bool
-     */
-    public function activateLine($id, $lineid, $datestart, $dateend = null, $comment = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->contrat->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Activate a service line of a given contract
+	 *
+	 * @param int   	$id             Id of contract to activate
+	 * @param int   	$lineid         Id of line to activate
+	 * @param string  	$datestart		{@from body}  Date start        {@type timestamp}
+	 * @param string    $dateend		{@from body}  Date end          {@type timestamp}
+	 * @param string    $comment  		{@from body}  Comment
+	 *
+	 * @url	PUT {id}/lines/{lineid}/activate
+	 *
+	 * @return Object|bool
+	 */
+	public function activateLine($id, $lineid, $datestart, $dateend = null, $comment = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->contrat->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->contract->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Contrat not found');
-        }
+		$result = $this->contract->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Contrat not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $updateRes = $this->contract->active_line(DolibarrApiAccess::$user, $lineid, $datestart, $dateend, $comment);
+		$updateRes = $this->contract->active_line(DolibarrApiAccess::$user, $lineid, $datestart, $dateend, $comment);
 
-        if ($updateRes > 0) {
-            $result = $this->get($id);
-            unset($result->line);
-            return $this->_cleanObjectDatas($result);
-        }
+		if ($updateRes > 0) {
+			$result = $this->get($id);
+			unset($result->line);
+			return $this->_cleanObjectDatas($result);
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Unactivate a service line of a given contract
-     *
-     * @param int   	$id             Id of contract to activate
-     * @param int   	$lineid         Id of line to activate
-     * @param string  	$datestart		{@from body}  Date start        {@type timestamp}
-     * @param string    $comment  		{@from body}  Comment
-     *
-     * @url	PUT {id}/lines/{lineid}/unactivate
-     *
-     * @return array|bool
-     */
-    public function unactivateLine($id, $lineid, $datestart, $comment = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->contrat->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Unactivate a service line of a given contract
+	 *
+	 * @param int   	$id             Id of contract to activate
+	 * @param int   	$lineid         Id of line to activate
+	 * @param string  	$datestart		{@from body}  Date start        {@type timestamp}
+	 * @param string    $comment  		{@from body}  Comment
+	 *
+	 * @url	PUT {id}/lines/{lineid}/unactivate
+	 *
+	 * @return Object|bool
+	 */
+	public function unactivateLine($id, $lineid, $datestart, $comment = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->contrat->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->contract->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Contrat not found');
-        }
+		$result = $this->contract->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Contrat not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $request_data = (object) $request_data;
+		// $request_data = (object) $request_data;
 
-        $updateRes = $this->contract->close_line(DolibarrApiAccess::$user, $lineid, $datestart, $comment);
+		$updateRes = $this->contract->close_line(DolibarrApiAccess::$user, $lineid, $datestart, $comment);
 
-        if ($updateRes > 0) {
-            $result = $this->get($id);
-            unset($result->line);
-            return $this->_cleanObjectDatas($result);
-        }
+		if ($updateRes > 0) {
+			$result = $this->get($id);
+			unset($result->line);
+			return $this->_cleanObjectDatas($result);
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Delete a line to given contract
-     *
-     *
-     * @param int   $id             Id of contract to update
-     * @param int   $lineid         Id of line to delete
-     *
-     * @url	DELETE {id}/lines/{lineid}
-     *
-     * @return int
-     *
-     * @throws RestException 401
-     * @throws RestException 404
-     */
-    public function deleteLine($id, $lineid)
-    {
-        if (!DolibarrApiAccess::$user->rights->contrat->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Delete a line to given contract
+	 *
+	 *
+	 * @param int   $id             Id of contract to update
+	 * @param int   $lineid         Id of line to delete
+	 *
+	 * @url	DELETE {id}/lines/{lineid}
+	 *
+	 * @return array|mixed
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 */
+	public function deleteLine($id, $lineid)
+	{
+		if (!DolibarrApiAccess::$user->rights->contrat->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->contract->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Contrat not found');
-        }
+		$result = $this->contract->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Contrat not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        // TODO Check the lineid $lineid is a line of object
+		// TODO Check the lineid $lineid is a line of object
 
-        $updateRes = $this->contract->deleteline($lineid, DolibarrApiAccess::$user);
-        if ($updateRes > 0) {
-            return $this->get($id);
-        } else {
-              throw new RestException(405, $this->contract->error);
-        }
-    }
+		$updateRes = $this->contract->deleteline($lineid, DolibarrApiAccess::$user);
+		if ($updateRes > 0) {
+			return $this->get($id);
+		} else {
+			  throw new RestException(405, $this->contract->error);
+		}
+	}
 
-    /**
-     * Update contract general fields (won't touch lines of contract)
-     *
-     * @param int   $id             Id of contract to update
-     * @param array $request_data   Datas
-     *
-     * @return int
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->contrat->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Update contract general fields (won't touch lines of contract)
+	 *
+	 * @param int   $id             Id of contract to update
+	 * @param array $request_data   Datas
+	 *
+	 * @return array|mixed
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->contrat->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->contract->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Contrat not found');
-        }
+		$result = $this->contract->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Contrat not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $this->contract->$field = $value;
-        }
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$this->contract->$field = $value;
+		}
 
-        if ($this->contract->update(DolibarrApiAccess::$user) > 0)
-        {
-            return $this->get($id);
-        } else {
-            throw new RestException(500, $this->contract->error);
-        }
-    }
+		if ($this->contract->update(DolibarrApiAccess::$user) > 0) {
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $this->contract->error);
+		}
+	}
 
-    /**
-     * Delete contract
-     *
-     * @param   int     $id         Contract ID
-     *
-     * @return  array
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->contrat->supprimer) {
-            throw new RestException(401);
-        }
-        $result = $this->contract->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Contract not found');
-        }
+	/**
+	 * Delete contract
+	 *
+	 * @param   int     $id         Contract ID
+	 *
+	 * @return  array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->contrat->supprimer) {
+			throw new RestException(401);
+		}
+		$result = $this->contract->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Contract not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if (!$this->contract->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(500, 'Error when delete contract : '.$this->contract->error);
-        }
+		if (!$this->contract->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(500, 'Error when delete contract : '.$this->contract->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Contract deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Contract deleted'
+			)
+		);
+	}
 
-    /**
-     * Validate a contract
-     *
-     * @param   int $id             Contract ID
-     * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
-     *
-     * @url POST    {id}/validate
-     *
-     * @return  array
-     * FIXME An error 403 is returned if the request has an empty body.
-     * Error message: "Forbidden: Content type `text/plain` is not supported."
-     * Workaround: send this in the body
-     * {
-     *   "notrigger": 0
-     * }
-     */
-    public function validate($id, $notrigger = 0)
-    {
-        if (!DolibarrApiAccess::$user->rights->contrat->creer) {
-            throw new RestException(401);
-        }
-        $result = $this->contract->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Contract not found');
-        }
+	/**
+	 * Validate a contract
+	 *
+	 * @param   int $id             Contract ID
+	 * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
+	 *
+	 * @url POST    {id}/validate
+	 *
+	 * @return  array
+	 * FIXME An error 403 is returned if the request has an empty body.
+	 * Error message: "Forbidden: Content type `text/plain` is not supported."
+	 * Workaround: send this in the body
+	 * {
+	 *   "notrigger": 0
+	 * }
+	 */
+	public function validate($id, $notrigger = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->contrat->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->contract->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Contract not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $result = $this->contract->validate(DolibarrApiAccess::$user, '', $notrigger);
-        if ($result == 0) {
-            throw new RestException(304, 'Error nothing done. May be object is already validated');
-        }
-        if ($result < 0) {
-            throw new RestException(500, 'Error when validating Contract: '.$this->contract->error);
-        }
+		$result = $this->contract->validate(DolibarrApiAccess::$user, '', $notrigger);
+		if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already validated');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when validating Contract: '.$this->contract->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Contract validated (Ref='.$this->contract->ref.')'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Contract validated (Ref='.$this->contract->ref.')'
+			)
+		);
+	}
 
-    /**
-     * Close all services of a contract
-     *
-     * @param   int $id             Contract ID
-     * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
-     *
-     * @url POST    {id}/close
-     *
-     * @return  array
-     * FIXME An error 403 is returned if the request has an empty body.
-     * Error message: "Forbidden: Content type `text/plain` is not supported."
-     * Workaround: send this in the body
-     * {
-     *   "notrigger": 0
-     * }
-     */
-    public function close($id, $notrigger = 0)
-    {
-        if (!DolibarrApiAccess::$user->rights->contrat->creer) {
-            throw new RestException(401);
-        }
-        $result = $this->contract->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Contract not found');
-        }
+	/**
+	 * Close all services of a contract
+	 *
+	 * @param   int $id             Contract ID
+	 * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
+	 *
+	 * @url POST    {id}/close
+	 *
+	 * @return  array
+	 * FIXME An error 403 is returned if the request has an empty body.
+	 * Error message: "Forbidden: Content type `text/plain` is not supported."
+	 * Workaround: send this in the body
+	 * {
+	 *   "notrigger": 0
+	 * }
+	 */
+	public function close($id, $notrigger = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->contrat->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->contract->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Contract not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $result = $this->contract->closeAll(DolibarrApiAccess::$user, $notrigger);
-        if ($result == 0) {
-            throw new RestException(304, 'Error nothing done. May be object is already close');
-        }
-        if ($result < 0) {
-            throw new RestException(500, 'Error when closing Contract: '.$this->contract->error);
-        }
+		$result = $this->contract->closeAll(DolibarrApiAccess::$user, $notrigger);
+		if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already close');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when closing Contract: '.$this->contract->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Contract closed (Ref='.$this->contract->ref.'). All services were closed.'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Contract closed (Ref='.$this->contract->ref.'). All services were closed.'
+			)
+		);
+	}
 
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->address);
+		unset($object->address);
 
-        unset($object->date_ouverture_prevue);
-        unset($object->date_ouverture);
-        unset($object->date_fin_validite);
-        unset($object->date_cloture);
-        unset($object->date_debut_prevue);
-        unset($object->date_debut_reel);
-        unset($object->date_fin_prevue);
-        unset($object->date_fin_reel);
-        unset($object->civility_id);
+		unset($object->date_ouverture_prevue);
+		unset($object->date_ouverture);
+		unset($object->date_fin_validite);
+		unset($object->date_cloture);
+		unset($object->date_debut_prevue);
+		unset($object->date_debut_reel);
+		unset($object->date_fin_prevue);
+		unset($object->date_fin_reel);
+		unset($object->civility_id);
 
-        return $object;
-    }
+		return $object;
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param   array           $data   Array with data to verify
-     * @return  array
-     * @throws  RestException
-     */
-    private function _validate($data)
-    {
-        $contrat = array();
-        foreach (Contracts::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $contrat[$field] = $data[$field];
-        }
-        return $contrat;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param   array           $data   Array with data to verify
+	 * @return  array
+	 * @throws  RestException
+	 */
+	private function _validate($data)
+	{
+		$contrat = array();
+		foreach (Contracts::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$contrat[$field] = $data[$field];
+		}
+		return $contrat;
+	}
 }
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index e179bd50797..9bdb1d5a846 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -53,36 +53,36 @@ class Contrat extends CommonObject
 	public $table_element = 'contrat';
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	public $table_element_line = 'contratdet';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Fieldname with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_contrat';
 
-    /**
+	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
 	public $picto = 'contract';
 
-    /**
-     * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-     * @var int
-     */
-    public $ismultientitymanaged = 1;
+	/**
+	 * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	 * @var int
+	 */
+	public $ismultientitymanaged = 1;
 
-    /**
-     * @var int  Does object support extrafields ? 0=No, 1=Yes
-     */
-    public $isextrafieldmanaged = 1;
+	/**
+	 * @var int  Does object support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 1;
 
-    /**
-     * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
-     * @var integer
-     */
-    public $restrictiononfksoc = 1;
+	/**
+	 * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
+	 * @var integer
+	 */
+	public $restrictiononfksoc = 1;
 
 	/**
 	 * {@inheritdoc}
@@ -101,11 +101,11 @@ class Contrat extends CommonObject
 	 */
 	public $ref_supplier;
 
-    /**
-     * Entity of the contract
-     * @var int
-     */
-    public $entity;
+	/**
+	 * Entity of the contract
+	 * @var int
+	 */
+	public $entity;
 
 	/**
 	 * Client id linked to the contract
@@ -310,7 +310,7 @@ class Contrat extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Activate a contract line
 	 *
@@ -323,7 +323,7 @@ class Contrat extends CommonObject
 	 */
 	public function active_line($user, $line_id, $date, $date_end = '', $comment = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$result = $this->lines[$this->lines_id_index_mapper[$line_id]]->active_line($user, $date, $date_end, $comment);
 		if ($result < 0)
 		{
@@ -334,7 +334,7 @@ class Contrat extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Close a contract line
 	 *
@@ -346,7 +346,7 @@ class Contrat extends CommonObject
 	 */
 	public function close_line($user, $line_id, $date_end, $comment = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$result = $this->lines[$this->lines_id_index_mapper[$line_id]]->close_line($user, $date_end, $comment);
 		if ($result < 0)
 		{
@@ -362,8 +362,8 @@ class Contrat extends CommonObject
 	 *
 	 *  @param	User		$user      		Object User making action
 	 *  @param	int|string	$date_start		Date start (now if empty)
-     *  @param	int			$notrigger		1=Does not execute triggers, 0=Execute triggers
-     *  @param	string		$comment		Comment
+	 *  @param	int			$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *  @param	string		$comment		Comment
 	 *	@return	int							<0 if KO, >0 if OK
 	 *  @see ()
 	 */
@@ -416,8 +416,8 @@ class Contrat extends CommonObject
 	 * Close all lines of a contract
 	 *
 	 * @param	User		$user      		Object User making action
-     * @param	int			$notrigger		1=Does not execute triggers, 0=Execute triggers
-     * @param	string		$comment		Comment
+	 * @param	int			$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 * @param	string		$comment		Comment
 	 * @return	int							<0 if KO, >0 if OK
 	 * @see activateAll()
 	 */
@@ -436,7 +436,7 @@ class Contrat extends CommonObject
 		{
 			// Close lines not already closed
 			if ($contratline->statut != ContratLigne::STATUS_CLOSED)
-	        {
+			{
 				$contratline->date_cloture = $now;
 				$contratline->fk_user_cloture = $user->id;
 				$contratline->statut = ContratLigne::STATUS_CLOSED;
@@ -448,7 +448,7 @@ class Contrat extends CommonObject
 					$this->errors = $contratline->errors;
 					break;
 				}
-	        }
+			}
 		}
 
 		if (!$error && $this->statut == 0)
@@ -457,14 +457,14 @@ class Contrat extends CommonObject
 			if ($result < 0) $error++;
 		}
 
-        if (!$error)
-        {
-            $this->db->commit();
-            return 1;
-        } else {
-            $this->db->rollback();
-            return -1;
-        }
+		if (!$error)
+		{
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
 	}
 
 	/**
@@ -472,7 +472,7 @@ class Contrat extends CommonObject
 	 *
 	 * @param	User	$user      		Objet User
 	 * @param   string	$force_number	Reference to force on contract (not implemented yet)
-     * @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
+	 * @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
 	 * @return	int						<0 if KO, >0 if OK
 	 */
 	public function validate(User $user, $force_number = '', $notrigger = 0)
@@ -506,7 +506,7 @@ class Contrat extends CommonObject
 		} else {
 			$num = $this->ref;
 		}
-        $this->newref = dol_sanitizeFileName($num);
+		$this->newref = dol_sanitizeFileName($num);
 
 		if ($num)
 		{
@@ -526,15 +526,15 @@ class Contrat extends CommonObject
 			// Trigger calls
 			if (!$error && !$notrigger)
 			{
-                // Call trigger
-                $result = $this->call_trigger('CONTRACT_VALIDATE', $user);
-                if ($result < 0) { $error++; }
-                // End call triggers
+				// Call trigger
+				$result = $this->call_trigger('CONTRACT_VALIDATE', $user);
+				if ($result < 0) { $error++; }
+				// End call triggers
 			}
 
 			if (!$error)
 			{
-            	$this->oldref = $this->ref;
+				$this->oldref = $this->ref;
 
 				// Rename directory if dir was a temporary ref
 				if (preg_match('/^[\(]?PROV/i', $this->ref))
@@ -557,16 +557,16 @@ class Contrat extends CommonObject
 						if (@rename($dirsource, $dirdest))
 						{
 							dol_syslog("Rename ok");
-						    // Rename docs starting with $oldref with $newref
-            				$listoffiles = dol_dir_list($conf->contract->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
-            				foreach ($listoffiles as $fileentry)
-            				{
-            					$dirsource = $fileentry['name'];
-            					$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
-            					$dirsource = $fileentry['path'].'/'.$dirsource;
-            					$dirdest = $fileentry['path'].'/'.$dirdest;
-            					@rename($dirsource, $dirdest);
-            				}
+							// Rename docs starting with $oldref with $newref
+							$listoffiles = dol_dir_list($conf->contract->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+							foreach ($listoffiles as $fileentry)
+							{
+								$dirsource = $fileentry['name'];
+								$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+								$dirsource = $fileentry['path'].'/'.$dirsource;
+								$dirdest = $fileentry['path'].'/'.$dirdest;
+								@rename($dirsource, $dirdest);
+							}
 						}
 					}
 				}
@@ -598,7 +598,7 @@ class Contrat extends CommonObject
 	 * Unvalidate a contract
 	 *
 	 * @param	User	$user      		Object User
-     * @param	int		$notrigger		1=Does not execute triggers, 0=execute triggers
+	 * @param	int		$notrigger		1=Does not execute triggers, 0=execute triggers
 	 * @return	int						<0 if KO, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
@@ -671,7 +671,7 @@ class Contrat extends CommonObject
 		$sql = "SELECT rowid, statut, ref, fk_soc,";
 		$sql .= " ref_supplier, ref_customer,";
 		$sql .= " ref_ext,";
-        $sql .= " entity,";
+		$sql .= " entity,";
 		$sql .= " date_contrat as datecontrat,";
 		$sql .= " fk_user_author,";
 		$sql .= " fk_projet as fk_project,";
@@ -713,7 +713,7 @@ class Contrat extends CommonObject
 					$this->ref_customer = $obj->ref_customer;
 					$this->ref_supplier = $obj->ref_supplier;
 					$this->ref_ext = $obj->ref_ext;
-	                $this->entity = $obj->entity;
+					$this->entity = $obj->entity;
 					$this->statut = $obj->statut;
 
 					$this->date_contrat = $this->db->jdate($obj->datecontrat);
@@ -727,7 +727,7 @@ class Contrat extends CommonObject
 					$this->note_private = $obj->note_private;
 					$this->note_public = $obj->note_public;
 					$this->model_pdf = $obj->model_pdf;
-					$this->modelpdf = $obj->model_pdf;
+					$this->modelpdf = $obj->model_pdf; // deprecated
 
 					$this->fk_projet = $obj->fk_project; // deprecated
 					$this->fk_project = $obj->fk_project;
@@ -765,7 +765,7 @@ class Contrat extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Load lines array into this->lines.
 	 *  This set also nbofserviceswait, nbofservicesopened, nbofservicesexpired and nbofservicesclosed
@@ -801,10 +801,10 @@ class Contrat extends CommonObject
 		$extrafields->fetch_name_optionals_label($line->table_element, true);
 
 		$this->lines = array();
-        $pos = 0;
+		$pos = 0;
 
 		// Selects contract lines related to a product
-		$sql = "SELECT p.label as product_label, p.description as product_desc, p.ref as product_ref,";
+		$sql = "SELECT p.label as product_label, p.description as product_desc, p.ref as product_ref, p.fk_product_type as product_type,";
 		$sql .= " d.rowid, d.fk_contrat, d.statut, d.description, d.price_ht, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.remise_percent, d.subprice, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht,";
 		$sql .= " d.total_ht,";
 		$sql .= " d.total_tva,";
@@ -817,7 +817,8 @@ class Contrat extends CommonObject
 		$sql .= " d.fk_user_author,";
 		$sql .= " d.fk_user_ouverture,";
 		$sql .= " d.fk_user_cloture,";
-		$sql .= " d.fk_unit";
+		$sql .= " d.fk_unit,";
+		$sql .= " d.product_type as type";
 		$sql .= " FROM ".MAIN_DB_PREFIX."contratdet as d LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid";
 		$sql .= " WHERE d.fk_contrat = ".$this->id;
 		$sql .= " ORDER by d.rowid ASC";
@@ -857,6 +858,7 @@ class Contrat extends CommonObject
 				$line->total_ttc		= $objp->total_ttc;
 				$line->fk_product = (($objp->fk_product > 0) ? $objp->fk_product : 0);
 				$line->info_bits		= $objp->info_bits;
+				$line->type = $objp->type;
 
 				$line->fk_fournprice = $objp->fk_fournprice;
 				$marginInfos = getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $line->fk_fournprice, $objp->pa_ht);
@@ -869,6 +871,7 @@ class Contrat extends CommonObject
 
 				$line->ref = $objp->product_ref; // deprecated
 				$line->product_ref = $objp->product_ref; // Product Ref
+				$line->product_type		= $objp->product_type; // Product Type
 				$line->product_desc		= $objp->product_desc; // Product Description
 				$line->product_label	= $objp->product_label; // Product Label
 
@@ -888,16 +891,16 @@ class Contrat extends CommonObject
 				$line->date_fin_prevue   = $this->db->jdate($objp->date_fin_validite);
 				$line->date_fin_reel     = $this->db->jdate($objp->date_cloture);
 
-				// Retreive all extrafields for contract
+				// Retrieve all extrafields for contract
 				// fetch optionals attributes and labels
 				$line->fetch_optionals();
 
 				// multilangs
-        		if (!empty($conf->global->MAIN_MULTILANGS) && !empty($objp->fk_product) && !empty($loadalsotranslation)) {
-                    $line = new Product($this->db);
-                    $line->fetch($objp->fk_product);
-                    $line->getMultiLangs();
-        		}
+				if (!empty($conf->global->MAIN_MULTILANGS) && !empty($objp->fk_product) && !empty($loadalsotranslation)) {
+					$line = new Product($this->db);
+					$line->fetch($objp->fk_product);
+					$line->getMultiLangs();
+				}
 
 				$this->lines[$pos] = $line;
 				$this->lines_id_index_mapper[$line->id] = $pos;
@@ -911,8 +914,8 @@ class Contrat extends CommonObject
 				if ($line->statut == ContratLigne::STATUS_CLOSED) $this->nbofservicesclosed++;
 
 				$total_ttc += $objp->total_ttc; // TODO Not saved into database
-                $total_vat += $objp->total_tva;
-                $total_ht += $objp->total_ht;
+				$total_vat += $objp->total_tva;
+				$total_ht += $objp->total_ht;
 
 				$i++;
 				$pos++;
@@ -924,9 +927,9 @@ class Contrat extends CommonObject
 		}
 
 		$this->nbofservices = count($this->lines);
-        $this->total_ttc = price2num($total_ttc); // TODO For the moment value is false as value is not stored in database for line linked to products
-        $this->total_vat = price2num($total_vat); // TODO For the moment value is false as value is not stored in database for line linked to products
-        $this->total_ht = price2num($total_ht); // TODO For the moment value is false as value is not stored in database for line linked to products
+		$this->total_ttc = price2num($total_ttc); // TODO For the moment value is false as value is not stored in database for line linked to products
+		$this->total_tva = price2num($total_vat); // TODO For the moment value is false as value is not stored in database for line linked to products
+		$this->total_ht = price2num($total_ht); // TODO For the moment value is false as value is not stored in database for line linked to products
 
 		return $this->lines;
 	}
@@ -1024,97 +1027,95 @@ class Contrat extends CommonObject
 			// Insert business contacts ('SALESREPSIGN','contrat')
 			if (!$error)
 			{
-    			$result = $this->add_contact($this->commercial_signature_id, 'SALESREPSIGN', 'internal');
-    			if ($result < 0) $error++;
+				$result = $this->add_contact($this->commercial_signature_id, 'SALESREPSIGN', 'internal');
+				if ($result < 0) $error++;
 			}
 
 			// Insert business contacts ('SALESREPFOLL','contrat')
-			if (!$error)
-			{
-                $result = $this->add_contact($this->commercial_suivi_id, 'SALESREPFOLL', 'internal');
-			    if ($result < 0) $error++;
+			if (!$error) {
+				$result = $this->add_contact($this->commercial_suivi_id, 'SALESREPFOLL', 'internal');
+				if ($result < 0) $error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				if (!empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
 				{
 					$this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
 				}
 
 				// Add object linked
-    			if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects))
-    			{
-    			    foreach ($this->linked_objects as $origin => $tmp_origin_id)
-    			    {
-    			        if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
-    			        {
-    			            foreach ($tmp_origin_id as $origin_id)
-    			            {
-    			                $ret = $this->add_object_linked($origin, $origin_id);
-    			                if (!$ret)
-    			                {
-    			                    $this->error = $this->db->lasterror();
-    			                    $error++;
-    			                }
-    			            }
-    			        } else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
-    			        {
-    			            $origin_id = $tmp_origin_id;
-    			            $ret = $this->add_object_linked($origin, $origin_id);
-    			            if (!$ret)
-    			            {
-    			                $this->error = $this->db->lasterror();
-    			                $error++;
-    			            }
-    			        }
-    			    }
-    			}
+				if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects))
+				{
+					foreach ($this->linked_objects as $origin => $tmp_origin_id)
+					{
+						if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+						{
+							foreach ($tmp_origin_id as $origin_id)
+							{
+								$ret = $this->add_object_linked($origin, $origin_id);
+								if (!$ret)
+								{
+									$this->error = $this->db->lasterror();
+									$error++;
+								}
+							}
+						} else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+						{
+							$origin_id = $tmp_origin_id;
+							$ret = $this->add_object_linked($origin, $origin_id);
+							if (!$ret)
+							{
+								$this->error = $this->db->lasterror();
+								$error++;
+							}
+						}
+					}
+				}
 
-    			if (!$error && $this->id && !empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && !empty($this->origin) && !empty($this->origin_id))   // Get contact from origin object
-    			{
-    			    $originforcontact = $this->origin;
-    			    $originidforcontact = $this->origin_id;
-    			    if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
-    			    {
-    			        require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
-    			        $exp = new Expedition($this->db);
-    			        $exp->fetch($this->origin_id);
-    			        $exp->fetchObjectLinked();
-    			        if (count($exp->linkedObjectsIds['commande']) > 0)
-    			        {
-    			            foreach ($exp->linkedObjectsIds['commande'] as $key => $value)
-    			            {
-    			                $originforcontact = 'commande';
-    			                $originidforcontact = $value->id;
-    			                break; // We take first one
-    			            }
-    			        }
-    			    }
+				if (!$error && $this->id && !empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && !empty($this->origin) && !empty($this->origin_id))   // Get contact from origin object
+				{
+					$originforcontact = $this->origin;
+					$originidforcontact = $this->origin_id;
+					if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
+					{
+						require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+						$exp = new Expedition($this->db);
+						$exp->fetch($this->origin_id);
+						$exp->fetchObjectLinked();
+						if (count($exp->linkedObjectsIds['commande']) > 0)
+						{
+							foreach ($exp->linkedObjectsIds['commande'] as $key => $value)
+							{
+								$originforcontact = 'commande';
+								$originidforcontact = $value->id;
+								break; // We take first one
+							}
+						}
+					}
 
-    			    $sqlcontact = "SELECT ctc.code, ctc.source, ec.fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
-    			    $sqlcontact .= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$this->db->escape($originforcontact)."'";
+					$sqlcontact = "SELECT ctc.code, ctc.source, ec.fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
+					$sqlcontact .= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$this->db->escape($originforcontact)."'";
 
-    			    $resqlcontact = $this->db->query($sqlcontact);
-    			    if ($resqlcontact)
-    			    {
-    			        while ($objcontact = $this->db->fetch_object($resqlcontact))
-    			        {
-    			            if ($objcontact->source == 'internal' && in_array($objcontact->code, array('SALESREPSIGN', 'SALESREPFOLL'))) continue; // ignore this, already forced previously
+					$resqlcontact = $this->db->query($sqlcontact);
+					if ($resqlcontact)
+					{
+						while ($objcontact = $this->db->fetch_object($resqlcontact))
+						{
+							if ($objcontact->source == 'internal' && in_array($objcontact->code, array('SALESREPSIGN', 'SALESREPFOLL'))) continue; // ignore this, already forced previously
 
-    			            //print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
-    			            $this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source); // May failed because of duplicate key or because code of contact type does not exists for new object
-    			        }
-    			    } else dol_print_error($resqlcontact);
-    			}
+							//print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
+							$this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source); // May failed because of duplicate key or because code of contact type does not exists for new object
+						}
+					} else dol_print_error($resqlcontact);
+				}
 			}
 
 			if (!$error)
 			{
-                // Call trigger
-                $result = $this->call_trigger('CONTRACT_CREATE', $user);
-                if ($result < 0) { $error++; }
-                // End call triggers
+				// Call trigger
+				$result = $this->call_trigger('CONTRACT_CREATE', $user);
+				if ($result < 0) { $error++; }
+				// End call triggers
 
 				if (!$error)
 				{
@@ -1141,10 +1142,10 @@ class Contrat extends CommonObject
 
 
 	/**
-	 *  Supprime l'objet de la base
+	 *  Delete object
 	 *
-	 *  @param	User		$user       Utilisateur qui supprime
-	 *  @return int         			< 0 si erreur, > 0 si ok
+	 *  @param	User		$user       User that deletes
+	 *  @return int         			< 0 if KO, > 0 if OK
 	 */
 	public function delete($user)
 	{
@@ -1155,10 +1156,10 @@ class Contrat extends CommonObject
 
 		$this->db->begin();
 
-	    // Call trigger
-	    $result = $this->call_trigger('CONTRACT_DELETE', $user);
-	    if ($result < 0) { $error++; }
-	    // End call triggers
+		// Call trigger
+		$result = $this->call_trigger('CONTRACT_DELETE', $user);
+		if ($result < 0) { $error++; }
+		// End call triggers
 
 		if (!$error)
 		{
@@ -1221,8 +1222,8 @@ class Contrat extends CommonObject
 			}
 		}
 
-		if (!$error)
-                {
+		// Delete lines
+		if (!$error) {
 				// Delete contratdet extrafields
 				$main = MAIN_DB_PREFIX.'contratdet';
 				$ef = $main."_extrafields";
@@ -1252,9 +1253,21 @@ class Contrat extends CommonObject
 			}
 		}
 
+		// Delete llx_ecm_files
+		if (!$error) {
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX."ecm_files WHERE src_object_type = '".$this->db->escape($this->table_element.(empty($this->module) ? '' : '@'.$this->module))."' AND src_object_id = ".$this->id;
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$this->error = $this->db->lasterror();
+				$this->errors[] = $this->error;
+				$error++;
+			}
+		}
+
+		// Delete contract
 		if (!$error)
 		{
-			// Delete contrat
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."contrat";
 			$sql .= " WHERE rowid=".$this->id;
 
@@ -1343,7 +1356,7 @@ class Contrat extends CommonObject
 		// Put here code to add a control on parameters values
 
 		// Update request
-    	$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET";
 		$sql .= " ref=".(isset($this->ref) ? "'".$this->db->escape($this->ref)."'" : "null").",";
 		$sql .= " ref_customer=".(isset($this->ref_customer) ? "'".$this->db->escape($this->ref_customer)."'" : "null").",";
 		$sql .= " ref_supplier=".(isset($this->ref_supplier) ? "'".$this->db->escape($this->ref_supplier)."'" : "null").",";
@@ -1454,9 +1467,9 @@ class Contrat extends CommonObject
 			}
 
 			$txtva = price2num($txtva);
-
 			$txlocaltax1 = price2num($txlocaltax1);
 			$txlocaltax2 = price2num($txlocaltax2);
+
 			$remise_percent = price2num($remise_percent);
 			$qty = price2num($qty);
 			if (empty($qty)) $qty = 1;
@@ -1465,7 +1478,7 @@ class Contrat extends CommonObject
 			if (empty($pu_ttc)) $pu_ttc = 0;
 			if (empty($txtva) || !is_numeric($txtva)) $txtva = 0;
 			if (empty($txlocaltax1) || !is_numeric($txlocaltax1)) $txlocaltax1 = 0;
-            if (empty($txlocaltax2) || !is_numeric($txlocaltax2)) $txlocaltax2 = 0;
+			if (empty($txlocaltax2) || !is_numeric($txlocaltax2)) $txlocaltax2 = 0;
 
 			if ($price_base_type == 'HT')
 			{
@@ -1512,7 +1525,7 @@ class Contrat extends CommonObject
 				$price = $pu_ht - $remise;
 			}
 
-		    if (empty($pa_ht)) $pa_ht = 0;
+			if (empty($pa_ht)) $pa_ht = 0;
 
 
 			// if buy price not defined, define buyprice as configured in margin admin
@@ -1579,13 +1592,13 @@ class Contrat extends CommonObject
 				}
 
 				if (empty($error)) {
-				    // Call trigger
-				    $result = $this->call_trigger('LINECONTRACT_INSERT', $user);
-				    if ($result < 0)
-				    {
-				    	$error++;
-				    }
-				    // End call triggers
+					// Call trigger
+					$result = $this->call_trigger('LINECONTRACT_INSERT', $user);
+					if ($result < 0)
+					{
+						$error++;
+					}
+					// End call triggers
 				}
 
 				if ($error)
@@ -1691,11 +1704,11 @@ class Contrat extends CommonObject
 		$price = price2num(round($pu, 2));
 		if (dol_strlen($remise_percent) > 0)
 		{
-		    $remise = round(($pu * $remise_percent / 100), 2);
-		    $price = $pu - $remise;
+			$remise = round(($pu * $remise_percent / 100), 2);
+			$price = $pu - $remise;
 		}
 
-	    if (empty($pa_ht)) $pa_ht = 0;
+		if (empty($pa_ht)) $pa_ht = 0;
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0)
@@ -1760,14 +1773,14 @@ class Contrat extends CommonObject
 				}
 
 				if (empty($error)) {
-			        // Call trigger
-			        $result = $this->call_trigger('LINECONTRACT_UPDATE', $user);
-			        if ($result < 0)
-			        {
-			            $this->db->rollback();
-			            return -3;
-			        }
-			        // End call triggers
+					// Call trigger
+					$result = $this->call_trigger('LINECONTRACT_UPDATE', $user);
+					if ($result < 0)
+					{
+						$this->db->rollback();
+						return -3;
+					}
+					// End call triggers
 
 					$this->db->commit();
 					return 1;
@@ -1800,14 +1813,14 @@ class Contrat extends CommonObject
 
 		if ($this->statut >= 0)
 		{
-		    // Call trigger
-		    $result = $this->call_trigger('LINECONTRACT_DELETE', $user);
-		    if ($result < 0) return -1;
-		    // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('LINECONTRACT_DELETE', $user);
+			if ($result < 0) return -1;
+			// End call triggers
 
-		    $this->db->begin();
+			$this->db->begin();
 
-		    $sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element_line;
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element_line;
 			$sql .= " WHERE rowid=".$idline;
 
 			dol_syslog(get_class($this)."::deleteline", LOG_DEBUG);
@@ -1845,7 +1858,7 @@ class Contrat extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Update statut of contract according to services
 	 *
@@ -1855,7 +1868,7 @@ class Contrat extends CommonObject
 	 */
 	public function update_statut($user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		dol_syslog(__METHOD__." is deprecated", LOG_WARNING);
 
 		// If draft, we keep it (should not happen)
@@ -1864,11 +1877,11 @@ class Contrat extends CommonObject
 		// Load $this->lines array
 		//		$this->fetch_lines();
 
-        //		$newstatut=1;
-        //		foreach($this->lines as $key => $contractline)
-        //		{
-        //			//			if ($contractline)         // Loop on each service
-        //		}
+		//		$newstatut=1;
+		//		foreach($this->lines as $key => $contractline)
+		//		{
+		//			//			if ($contractline)         // Loop on each service
+		//		}
 
 		return 1;
 	}
@@ -1885,7 +1898,7 @@ class Contrat extends CommonObject
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi label of a given contrat status
 	 *
@@ -1895,19 +1908,19 @@ class Contrat extends CommonObject
 	 */
 	public function LibStatut($status, $mode)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if (empty($this->labelStatus) || empty($this->labelStatusShort))
 		{
 			global $langs;
 			$langs->load("contracts");
-			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('ContractStatusDraft');
-			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('ContractStatusValidated');
-			$this->labelStatus[self::STATUS_CLOSED] = $langs->trans('ContractStatusClosed');
-			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('ContractStatusDraft');
-			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('ContractStatusValidated');
-			$this->labelStatusShort[self::STATUS_CLOSED] = $langs->trans('ContractStatusClosed');
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('ContractStatusDraft');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('ContractStatusValidated');
+			$this->labelStatus[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('ContractStatusClosed');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('ContractStatusDraft');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('ContractStatusValidated');
+			$this->labelStatusShort[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('ContractStatusClosed');
 		}
 
 		$statusType = 'status'.$status;
@@ -1944,11 +1957,11 @@ class Contrat extends CommonObject
 	 *
 	 *	@param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
 	 *	@param	int		$maxlength					Max length of ref
-     *  @param	int     $notooltip					1=Disable tooltip
-     *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param	int     $notooltip					1=Disable tooltip
+	 *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string								Chaine avec URL
 	 */
-    public function getNomUrl($withpicto = 0, $maxlength = 0, $notooltip = 0, $save_lastsearch_value = -1)
+	public function getNomUrl($withpicto = 0, $maxlength = 0, $notooltip = 0, $save_lastsearch_value = -1)
 	{
 		global $conf, $langs, $user, $hookmanager;
 
@@ -1964,35 +1977,39 @@ class Contrat extends CommonObject
 			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
 		//}
 
-        $label = '';
+		$label = '';
 
-        if ($user->rights->contrat->lire) {
-        	$label = img_picto('', $this->picto).' <u>'.$langs->trans("Contract").'</u>';
-            $label .= '<br><b>'.$langs->trans('Ref').':</b> '.($this->ref ? $this->ref : $this->id);
-            $label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.($this->ref_customer ? $this->ref_customer : $this->ref_client);
-            $label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_supplier;
-            if (!empty($this->total_ht)) {
-                $label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
-            }
-            if (!empty($this->total_tva)) {
-                $label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
-            }
-            if (!empty($this->total_ttc)) {
-                $label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
-            }
-        }
+		if ($user->rights->contrat->lire) {
+			$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Contract").'</u>';
+			/* Status of a contract is status of all services, so disabled
+			if (isset($this->statut)) {
+				$label .= ' '.$this->getLibStatut(5);
+			}*/
+			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.($this->ref ? $this->ref : $this->id);
+			$label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.($this->ref_customer ? $this->ref_customer : $this->ref_client);
+			$label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_supplier;
+			if (!empty($this->total_ht)) {
+				$label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
+			}
+			if (!empty($this->total_tva)) {
+				$label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+			}
+			if (!empty($this->total_ttc)) {
+				$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+			}
+		}
 
-        $linkclose = '';
-        if (empty($notooltip) && $user->rights->contrat->lire)
-        {
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label = $langs->trans("ShowOrder");
-                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose .= ' class="classfortooltip"';
-        }
+		$linkclose = '';
+		if (empty($notooltip) && $user->rights->contrat->lire)
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowOrder");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip"';
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -2028,7 +2045,7 @@ class Contrat extends CommonObject
 		$sql .= " c.tms as date_modification,";
 		$sql .= " fk_user_author";
 		$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c";
-		$sql .= " WHERE c.rowid = ".$id;
+		$sql .= " WHERE c.rowid = ".((int) $id);
 
 		$result = $this->db->query($sql);
 		if ($result)
@@ -2056,7 +2073,7 @@ class Contrat extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of line rowid
 	 *
@@ -2065,7 +2082,7 @@ class Contrat extends CommonObject
 	 */
 	public function array_detail($status = -1)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$tab = array();
 
 		$sql = "SELECT cd.rowid";
@@ -2129,17 +2146,17 @@ class Contrat extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-     *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
-     *
-     *      @param	User	$user           Objet user
-     *      @param  string	$mode           "inactive" pour services a activer, "expired" pour services expires
-     *      @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
+	 *
+	 *      @param	User	$user           Objet user
+	 *      @param  string	$mode           "inactive" pour services a activer, "expired" pour services expires
+	 *      @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
 	 */
-    public function load_board($user, $mode)
+	public function load_board($user, $mode)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		$this->from = " FROM ".MAIN_DB_PREFIX."contrat as c";
@@ -2164,13 +2181,13 @@ class Contrat extends CommonObject
 			$sql .= " AND cd.date_fin_validite < '".$this->db->idate(dol_now())."'";
 		} elseif ($mode == 'active')
 		{
-		    $sql = "SELECT cd.rowid, cd.date_fin_validite as datefin";
-		    $sql .= $this->from;
-		    $sql .= " WHERE c.statut = 1";
-		    $sql .= " AND c.rowid = cd.fk_contrat";
-		    $sql .= " AND cd.statut = 4";
-		    //$datetouse = dol_now();
-		    //$sql.= " AND cd.date_fin_validite < '".$this->db->idate($datetouse)."'";
+			$sql = "SELECT cd.rowid, cd.date_fin_validite as datefin";
+			$sql .= $this->from;
+			$sql .= " WHERE c.statut = 1";
+			$sql .= " AND c.rowid = cd.fk_contrat";
+			$sql .= " AND cd.statut = 4";
+			//$datetouse = dol_now();
+			//$sql.= " AND cd.date_fin_validite < '".$this->db->idate($datetouse)."'";
 		}
 		$sql .= " AND c.fk_soc = s.rowid";
 		$sql .= " AND c.entity = ".$conf->entity;
@@ -2189,10 +2206,10 @@ class Contrat extends CommonObject
 				$labelShort = $langs->trans("BoardNotActivatedServicesShort");
 				$url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&mode=0&sortfield=cd.date_fin_validite&sortorder=asc';
 			} elseif ($mode == 'expired') {
-			    $warning_delay = $conf->contrat->services->expires->warning_delay;
-			    $url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&mode=4&filter=expired&sortfield=cd.date_fin_validite&sortorder=asc';
-			    $label = $langs->trans("BoardExpiredServices");
-			    $labelShort = $langs->trans("BoardExpiredServicesShort");
+				$warning_delay = $conf->contrat->services->expires->warning_delay;
+				$url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&mode=4&filter=expired&sortfield=cd.date_fin_validite&sortorder=asc';
+				$label = $langs->trans("BoardExpiredServices");
+				$labelShort = $langs->trans("BoardExpiredServicesShort");
 			} else {
 				$warning_delay = $conf->contrat->services->expires->warning_delay;
 				$url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&mode=4&sortfield=cd.date_fin_validite&sortorder=asc';
@@ -2226,7 +2243,7 @@ class Contrat extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *   Charge indicateurs this->nb de tableau de bord
 	 *
@@ -2234,7 +2251,7 @@ class Contrat extends CommonObject
 	 */
 	public function load_state_board()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $user;
 
 		$this->nb = array();
@@ -2258,7 +2275,7 @@ class Contrat extends CommonObject
 			{
 				$this->nb["contracts"] = $obj->nb;
 			}
-            $this->db->free($resql);
+			$this->db->free($resql);
 			return 1;
 		} else {
 			dol_print_error($this->db);
@@ -2292,17 +2309,17 @@ class Contrat extends CommonObject
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
-     */
-    public function initAsSpecimen()
-    {
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
+	 */
+	public function initAsSpecimen()
+	{
 		global $user, $langs, $conf;
 
-        // Load array of products prodids
+		// Load array of products prodids
 		$num_prods = 0;
 		$prodids = array();
 		$sql = "SELECT rowid";
@@ -2359,10 +2376,10 @@ class Contrat extends CommonObject
 			$line->date_end = dol_now() + 500000;
 			$line->date_end_real = dol_now() - 100000;
 			if ($num_prods > 0)
-            {
+			{
 				$prodid = mt_rand(1, $num_prods);
 				$line->fk_product = $prodids[$prodid];
-            }
+			}
 			$this->lines[$xnbp] = $line;
 			$xnbp++;
 		}
@@ -2387,7 +2404,7 @@ class Contrat extends CommonObject
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
-         *  @param   null|array  $moreparams     Array to provide more information
+	 *  @param   null|array  $moreparams     Array to provide more information
 	 * 	@return     int         				0 if KO, 1 if OK
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
@@ -2400,7 +2417,9 @@ class Contrat extends CommonObject
 		if (!dol_strlen($modele)) {
 			$modele = 'strato';
 
-			if ($this->modelpdf) {
+			if (!empty($this->model_pdf)) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($this->modelpdf)) {	// deprecated
 				$modele = $this->modelpdf;
 			} elseif (!empty($conf->global->CONTRACT_ADDON_PDF)) {
 				$modele = $conf->global->CONTRACT_ADDON_PDF;
@@ -2437,8 +2456,8 @@ class Contrat extends CommonObject
 	 * @param   int     $notrigger	  1=Does not execute triggers, 0= execute triggers
 	 * @return  int                   New id of clone
 	 */
-    public function createFromClone(User $user, $socid = 0, $notrigger = 0)
-    {
+	public function createFromClone(User $user, $socid = 0, $notrigger = 0)
+	{
 		global $db, $langs, $conf, $hookmanager, $extrafields;
 
 		dol_include_once('/projet/class/project.class.php');
@@ -2449,7 +2468,7 @@ class Contrat extends CommonObject
 
 		// Load dest object
 		$clonedObj = clone $this;
-        $clonedObj->socid = $socid;
+		$clonedObj->socid = $socid;
 
 		$this->db->begin();
 
@@ -2500,13 +2519,13 @@ class Contrat extends CommonObject
 			$this->error = $clonedObj->error;
 			$this->errors[] = $clonedObj->error;
 		} else {
-            // copy external contacts if same company
-            if ($this->socid == $clonedObj->socid) {
-                if ($clonedObj->copy_linked_contact($this, 'external') < 0) {
-                    $error++;
-                }
-            }
-        }
+			// copy external contacts if same company
+			if ($this->socid == $clonedObj->socid) {
+				if ($clonedObj->copy_linked_contact($this, 'external') < 0) {
+					$error++;
+				}
+			}
+		}
 
 		if (!$error) {
 			foreach ($this->lines as $line) {
@@ -2552,12 +2571,12 @@ class Contrat extends CommonObject
  */
 class ContratLigne extends CommonObjectLine
 {
-    /**
+	/**
 	 * @var string ID to identify managed object
 	 */
 	public $element = 'contratdet';
 
-    /**
+	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element = 'contratdet';
@@ -2575,13 +2594,13 @@ class ContratLigne extends CommonObjectLine
 	public $tms;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_contrat;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_product;
 
 	public $statut; // 0 inactive, 4 active, 5 closed
@@ -2604,6 +2623,7 @@ class ContratLigne extends CommonObjectLine
 	 */
 	public $description;
 
+	public $product_type; // 0 for product, 1 for service
 	public $product_ref;
 	public $product_label;
 
@@ -2628,8 +2648,8 @@ class ContratLigne extends CommonObjectLine
 	public $remise;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_remise_except;
 
 	public $subprice; // Unit price HT
@@ -2650,8 +2670,8 @@ class ContratLigne extends CommonObjectLine
 	public $total_ttc;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_fournprice;
 
 	public $pa_ht;
@@ -2659,18 +2679,18 @@ class ContratLigne extends CommonObjectLine
 	public $info_bits;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_author;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_ouverture;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_cloture;
 
 	public $commentaire;
@@ -2682,9 +2702,9 @@ class ContratLigne extends CommonObjectLine
 
 
 	/**
-     *  Constructor
-     *
-     *  @param      DoliDb		$db      Database handler
+	 *  Constructor
+	 *
+	 *  @param      DoliDb		$db      Database handler
 	 */
 	public function __construct($db)
 	{
@@ -2703,7 +2723,7 @@ class ContratLigne extends CommonObjectLine
 		return $this->LibStatut($this->statut, $mode, ((!empty($this->date_fin_validite)) ? ($this->date_fin_validite < dol_now() ? 1 : 0) : -1));
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return label of a contract line status
 	 *
@@ -2715,26 +2735,26 @@ class ContratLigne extends CommonObjectLine
 	 */
 	public static function LibStatut($status, $mode, $expired = -1, $moreatt = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$langs->load("contracts");
 
-        if ($status == self::STATUS_INITIAL) {
-            $labelStatus = $langs->trans("ServiceStatusInitial");
-            $labelStatusShort = $langs->trans("ServiceStatusInitial");
-        } elseif ($status == self::STATUS_OPEN && $expired == -1) {
-            $labelStatus = $langs->trans("ServiceStatusRunning");
-            $labelStatusShort = $langs->trans("ServiceStatusRunning");
-        } elseif ($status == self::STATUS_OPEN && $expired == 0) {
-            $labelStatus = $langs->trans("ServiceStatusNotLate");
-            $labelStatusShort = $langs->trans("ServiceStatusNotLateShort");
-        } elseif ($status == self::STATUS_OPEN && $expired == 1) {
-            $labelStatus = $langs->trans("ServiceStatusLate");
-            $labelStatusShort = $langs->trans("ServiceStatusLateShort");
-        } elseif ($status == self::STATUS_CLOSED) {
-            $labelStatus = $langs->trans("ServiceStatusClosed");
-            $labelStatusShort = $langs->trans("ServiceStatusClosed");
-        }
+		if ($status == self::STATUS_INITIAL) {
+			$labelStatus = $langs->trans("ServiceStatusInitial");
+			$labelStatusShort = $langs->trans("ServiceStatusInitial");
+		} elseif ($status == self::STATUS_OPEN && $expired == -1) {
+			$labelStatus = $langs->trans("ServiceStatusRunning");
+			$labelStatusShort = $langs->trans("ServiceStatusRunning");
+		} elseif ($status == self::STATUS_OPEN && $expired == 0) {
+			$labelStatus = $langs->trans("ServiceStatusNotLate");
+			$labelStatusShort = $langs->trans("ServiceStatusNotLateShort");
+		} elseif ($status == self::STATUS_OPEN && $expired == 1) {
+			$labelStatus = $langs->trans("ServiceStatusLate");
+			$labelStatusShort = $langs->trans("ServiceStatusLateShort");
+		} elseif ($status == self::STATUS_CLOSED) {
+			$labelStatus = $langs->trans("ServiceStatusClosed");
+			$labelStatusShort = $langs->trans("ServiceStatusClosed");
+		}
 
 		$statusType = 'status'.$status;
 		if ($status == self::STATUS_OPEN && $expired == 1) $statusType = 'status1';
@@ -2754,22 +2774,22 @@ class ContratLigne extends CommonObjectLine
 	 *  @param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
 	 *  @param	int		$maxlength		Max length
 	 *  @return	string					Chaine avec URL
- 	 */
-    public function getNomUrl($withpicto = 0, $maxlength = 0)
+	 */
+	public function getNomUrl($withpicto = 0, $maxlength = 0)
 	{
 		global $langs;
 
 		$result = '';
-        $label = $langs->trans("ShowContractOfService").': '.$this->label;
-        if (empty($label)) $label = $this->description;
+		$label = $langs->trans("ShowContractOfService").': '.$this->label;
+		if (empty($label)) $label = $this->description;
 
-        $link = '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$this->fk_contrat.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$link = '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$this->fk_contrat.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend = '</a>';
 
 		$picto = 'service';
 		if ($this->type == 0) $picto = 'product';
 
-        if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+		if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
 		if ($withpicto && $withpicto != 2) $result .= ' ';
 		if ($withpicto != 2) $result .= $link.($this->product_ref ? $this->product_ref.' ' : '').($this->label ? $this->label : $this->description).$linkend;
 		return $result;
@@ -2782,7 +2802,7 @@ class ContratLigne extends CommonObjectLine
 	 *  @param	string	$ref		Ref of contract line
 	 *  @return int         		<0 if KO, >0 if OK
 	 */
-    public function fetch($id, $ref = '')
+	public function fetch($id, $ref = '')
 	{
 		// Check parameters
 		if (empty($id) && empty($ref)) return -1;
@@ -2977,7 +2997,7 @@ class ContratLigne extends CommonObjectLine
 		$this->total_localtax1 = $tabprice[9];
 		$this->total_localtax2 = $tabprice[10];
 
-	    if (empty($this->pa_ht)) $this->pa_ht = 0;
+		if (empty($this->pa_ht)) $this->pa_ht = 0;
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0)
@@ -2995,7 +3015,7 @@ class ContratLigne extends CommonObjectLine
 
 		$this->oldcopy = new ContratLigne($this->db);
 		$this->oldcopy->fetch($this->id);
-        $this->oldcopy->fetch_optionals();
+		$this->oldcopy->fetch_optionals();
 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET";
@@ -3083,18 +3103,18 @@ class ContratLigne extends CommonObjectLine
 		}
 
 		if (!$error && !$notrigger) {
-	        // Call trigger
-	        $result = $this->call_trigger('LINECONTRACT_UPDATE', $user);
-	        if ($result < 0) {
-                $error++;
-                $this->db->rollback();
-            }
-	        // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('LINECONTRACT_UPDATE', $user);
+			if ($result < 0) {
+				$error++;
+				$this->db->rollback();
+			}
+			// End call triggers
 		}
 
 		if (!$error)
 		{
-        	$this->db->commit();
+			$this->db->commit();
 			return 1;
 		} else {
 			$this->db->rollback();
@@ -3104,7 +3124,7 @@ class ContratLigne extends CommonObjectLine
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Mise a jour en base des champs total_xxx de ligne
 	 *		Used by migration process
@@ -3113,7 +3133,7 @@ class ContratLigne extends CommonObjectLine
 	 */
 	public function update_total()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->db->begin();
 
 		// Mise a jour ligne en base
@@ -3220,7 +3240,7 @@ class ContratLigne extends CommonObjectLine
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Activate a contract line
 	 *
@@ -3232,7 +3252,7 @@ class ContratLigne extends CommonObjectLine
 	 */
 	public function active_line($user, $date, $date_end = '', $comment = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf;
 
 		$error = 0;
@@ -3277,19 +3297,19 @@ class ContratLigne extends CommonObjectLine
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Close a contract line
 	 *
 	 * @param    User 	$user 			Objet User who close contract
 	 * @param  	 int 	$date_end 		Date end
 	 * @param    string $comment 		A comment typed by user
-     * @param    int	$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 * @param    int	$notrigger		1=Does not execute triggers, 0=Execute triggers
 	 * @return int                    	<0 if KO, >0 if OK
 	 */
 	public function close_line($user, $date_end, $comment = '', $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf;
 
 		// Update object
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index 38a97d0aaa8..c837769819a 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -60,11 +60,12 @@ if ($action == 'addcontact' && $user->rights->contrat->creer)
 {
 	$result = $object->fetch($id);
 
-    if ($result > 0 && $id > 0)
-    {
-    	$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
-    }
+	if ($result > 0 && $id > 0)
+	{
+		$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
+		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
+	}
 
 	if ($result >= 0)
 	{
@@ -87,7 +88,7 @@ if ($action == 'swapstatut' && $user->rights->contrat->creer)
 {
 	if ($object->fetch($id))
 	{
-	    $result = $object->swapContactStatus(GETPOST('ligne'));
+		$result = $object->swapContactStatus(GETPOST('ligne'));
 	} else {
 		dol_print_error($db, $object->error);
 	}
@@ -130,21 +131,21 @@ if ($id > 0 || !empty($ref))
 	{
 		$object->fetch_thirdparty();
 
-	    $head = contract_prepare_head($object);
+		$head = contract_prepare_head($object);
 
 		$hselected = 1;
 
-		dol_fiche_head($head, $hselected, $langs->trans("Contract"), -1, 'contract');
+		print dol_get_fiche_head($head, $hselected, $langs->trans("Contract"), -1, 'contract');
 
 		// Contract card
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 
-        $morehtmlref = '';
-        //if (! empty($modCodeContract->code_auto)) {
-            $morehtmlref .= $object->ref;
-        /*} else {
+		$morehtmlref = '';
+		//if (! empty($modCodeContract->code_auto)) {
+			$morehtmlref .= $object->ref;
+		/*} else {
             $morehtmlref.=$form->editfieldkey("",'ref',$object->ref,0,'string','',0,3);
             $morehtmlref.=$form->editfieldval("",'ref',$object->ref,0,'string','',0,2);
         }*/
@@ -158,67 +159,67 @@ if ($id > 0 || !empty($ref))
 		$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
 		$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1, 'getFormatedSupplierRef');
 		// Thirdparty
-	    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-        // Project
-        if (!empty($conf->projet->enabled)) {
-            $langs->load("projects");
-            $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-            if ($user->rights->contrat->creer) {
-                if ($action != 'classify') {
-                	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-                    $morehtmlref .= ' : ';
-                }
-                if ($action == 'classify') {
-	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-	                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-	                $morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref .= '</form>';
-	            } else {
-	                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-	        } else {
-	            if (!empty($object->fk_project)) {
-	                $proj = new Project($db);
-	                $proj->fetch($object->fk_project);
-	                $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	                $morehtmlref .= $proj->ref;
-	                $morehtmlref .= '</a>';
-	            } else {
-	                $morehtmlref .= '';
-	            }
-	        }
-	    }
-	    $morehtmlref .= '</div>';
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+		// Project
+		if (!empty($conf->projet->enabled)) {
+			$langs->load("projects");
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+			if ($user->rights->contrat->creer) {
+				if ($action != 'classify') {
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+					$morehtmlref .= ' : ';
+				}
+				if ($action == 'classify') {
+					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				if (!empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
+				} else {
+					$morehtmlref .= '';
+				}
+			}
+		}
+		$morehtmlref .= '</div>';
 
 
-	    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'none', $morehtmlref);
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'none', $morehtmlref);
 
 
-	    print '<div class="fichecenter">';
-	    print '<div class="underbanner clearboth"></div>';
+		print '<div class="fichecenter">';
+		print '<div class="underbanner clearboth"></div>';
 
 		print '<table class="border tableforfield" width="100%">';
 
 
-        // Ligne info remises tiers
-        print '<tr><td class="titlefield">'.$langs->trans('Discount').'</td><td colspan="3">';
-        if ($object->thirdparty->remise_percent) {
-            print $langs->trans("CompanyHasRelativeDiscount", $object->thirdparty->remise_percent);
-        } else {
-            print $langs->trans("CompanyHasNoRelativeDiscount");
-        }
-        $absolute_discount = $object->thirdparty->getAvailableDiscounts();
-        print '. ';
-        if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->trans("Currency".$conf->currency));
-        else print $langs->trans("CompanyHasNoAbsoluteDiscount");
-        print '.';
-        print '</td></tr>';
+		// Ligne info remises tiers
+		print '<tr><td class="titlefield">'.$langs->trans('Discount').'</td><td colspan="3">';
+		if ($object->thirdparty->remise_percent) {
+			print $langs->trans("CompanyHasRelativeDiscount", $object->thirdparty->remise_percent);
+		} else {
+			print $langs->trans("CompanyHasNoRelativeDiscount");
+		}
+		$absolute_discount = $object->thirdparty->getAvailableDiscounts();
+		print '. ';
+		if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->trans("Currency".$conf->currency));
+		else print $langs->trans("CompanyHasNoAbsoluteDiscount");
+		print '.';
+		print '</td></tr>';
 
-        // Date
-        print '<tr>';
+		// Date
+		print '<tr>';
 		print '<td class="titlefield">';
 		print $form->editfieldkey("Date", 'date_contrat', $object->date_contrat, $object, 0);
 		print '</td><td>';
@@ -230,7 +231,7 @@ if ($id > 0 || !empty($ref))
 
 		print '</div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<br>';
 
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index d60d54258bb..b68da3170ed 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -101,7 +101,7 @@ if ($object->id)
 {
 	$head = contract_prepare_head($object);
 
-	dol_fiche_head($head, 'documents', $langs->trans("Contract"), -1, 'contract');
+	print dol_get_fiche_head($head, 'documents', $langs->trans("Contract"), -1, 'contract');
 
 
 	// Build file list
@@ -179,20 +179,20 @@ if ($object->id)
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border tableforfield centpercent">';
-    print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-    print '</table>';
+	print '<table class="border tableforfield centpercent">';
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    $modulepart = 'contract';
-    $permission = $user->rights->contrat->creer;
-    $permtoedit = $user->rights->contrat->creer;
-    $param = '&id='.$object->id;
-    include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	$modulepart = 'contract';
+	$permission = $user->rights->contrat->creer;
+	$permtoedit = $user->rights->contrat->creer;
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
 	print $langs->trans("ErrorUnknown");
 }
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 7fe88d03c3d..5ea558c9689 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -80,21 +80,21 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-    // Search contract
-    if (!empty($conf->contrat->enabled))
-    {
-    	print '<form method="post" action="'.DOL_URL_ROOT.'/contrat/list.php">';
-    	print '<input type="hidden" name="token" value="'.newToken().'">';
+	// Search contract
+	if (!empty($conf->contrat->enabled))
+	{
+		print '<form method="post" action="'.DOL_URL_ROOT.'/contrat/list.php">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 
 		print '<div class="div-table-responsive-no-min">';
-    	print '<table class="noborder nohover centpercent">';
-    	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    	print '<tr class="oddeven">';
-    	print '<td class="nowrap">'.$langs->trans("Contract").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
-    	print '<td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-    	print "</table></div></form>\n";
-    	print "<br>";
-    }
+		print '<table class="noborder nohover centpercent">';
+		print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+		print '<tr class="oddeven">';
+		print '<td class="nowrap">'.$langs->trans("Contract").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
+		print '<td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+		print "</table></div></form>\n";
+		print "<br>";
+	}
 }
 
 
@@ -131,11 +131,11 @@ if ($resql)
 		{
 			$nb[$obj->status] = $obj->nb;
 			if ($obj->status != 5)
-            {
-            	$vals[$obj->status] = $obj->nb;
-            	$totalinprocess += $obj->nb;
-            }
-            $total += $obj->nb;
+			{
+				$vals[$obj->status] = $obj->nb;
+				$totalinprocess += $obj->nb;
+			}
+			$total += $obj->nb;
 		}
 		$i++;
 	}
@@ -159,24 +159,24 @@ if ($resql)
 {
 	$num = $db->num_rows($resql);
 
-    // 0 inactive, 4 active, 5 closed
-    $i = 0;
-    while ($i < $num)
-    {
-        $obj = $db->fetch_object($resql);
-        if ($obj)
-        {
-        	$nb[$obj->status.true] = $obj->nb;
-            if ($obj->status != 5)
-            {
-            	$vals[$obj->status.true] = $obj->nb;
-            	$totalinprocess += $obj->nb;
-            }
-            $total += $obj->nb;
-        }
-        $i++;
-    }
-    $db->free($resql);
+	// 0 inactive, 4 active, 5 closed
+	$i = 0;
+	while ($i < $num)
+	{
+		$obj = $db->fetch_object($resql);
+		if ($obj)
+		{
+			$nb[$obj->status.true] = $obj->nb;
+			if ($obj->status != 5)
+			{
+				$vals[$obj->status.true] = $obj->nb;
+				$totalinprocess += $obj->nb;
+			}
+			$total += $obj->nb;
+		}
+		$i++;
+	}
+	$db->free($resql);
 } else {
 	dol_print_error($db);
 }
@@ -191,51 +191,51 @@ print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' -
 $listofstatus = array(0, 4, 4, 5); $bool = false;
 foreach ($listofstatus as $status)
 {
-    $dataseries[] = array($staticcontratligne->LibStatut($status, 1, ($bool ? 1 : 0)), (isset($nb[$status.$bool]) ? (int) $nb[$status.$bool] : 0));
-    if ($status == ContratLigne::STATUS_INITIAL) $colorseries[$status.$bool] = '-'.$badgeStatus0;
-    if ($status == ContratLigne::STATUS_OPEN && !$bool) $colorseries[$status.$bool] = $badgeStatus4;
-    if ($status == ContratLigne::STATUS_OPEN && $bool) $colorseries[$status.$bool] = $badgeStatus1;
-    if ($status == ContratLigne::STATUS_CLOSED) $colorseries[$status.$bool] = $badgeStatus6;
+	$dataseries[] = array($staticcontratligne->LibStatut($status, 1, ($bool ? 1 : 0)), (isset($nb[$status.$bool]) ? (int) $nb[$status.$bool] : 0));
+	if ($status == ContratLigne::STATUS_INITIAL) $colorseries[$status.$bool] = '-'.$badgeStatus0;
+	if ($status == ContratLigne::STATUS_OPEN && !$bool) $colorseries[$status.$bool] = $badgeStatus4;
+	if ($status == ContratLigne::STATUS_OPEN && $bool) $colorseries[$status.$bool] = $badgeStatus1;
+	if ($status == ContratLigne::STATUS_CLOSED) $colorseries[$status.$bool] = $badgeStatus6;
 
-    if (empty($conf->use_javascript_ajax))
-    {
-        print '<tr class="oddeven">';
-        print '<td>'.$staticcontratligne->LibStatut($status, 0, ($bool ? 1 : 0)).'</td>';
-        print '<td class="right"><a href="services_list.php?mode='.$status.($bool ? '&filter=expired' : '').'">'.($nb[$status.$bool] ? $nb[$status.$bool] : 0).' '.$staticcontratligne->LibStatut($status, 3, ($bool ? 1 : 0)).'</a></td>';
-        print "</tr>\n";
-    }
-    if ($status == 4 && !$bool) $bool = true;
-    else $bool = false;
+	if (empty($conf->use_javascript_ajax))
+	{
+		print '<tr class="oddeven">';
+		print '<td>'.$staticcontratligne->LibStatut($status, 0, ($bool ? 1 : 0)).'</td>';
+		print '<td class="right"><a href="services_list.php?mode='.$status.($bool ? '&filter=expired' : '').'">'.($nb[$status.$bool] ? $nb[$status.$bool] : 0).' '.$staticcontratligne->LibStatut($status, 3, ($bool ? 1 : 0)).'</a></td>';
+		print "</tr>\n";
+	}
+	if ($status == 4 && !$bool) $bool = true;
+	else $bool = false;
 }
 if (!empty($conf->use_javascript_ajax))
 {
-    print '<tr class="impair"><td class="center" colspan="2">';
+	print '<tr class="impair"><td class="center" colspan="2">';
 
-    include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
-    $dolgraph = new DolGraph();
-    $dolgraph->SetData($dataseries);
-    $dolgraph->SetDataColor(array_values($colorseries));
-    $dolgraph->setShowLegend(2);
-    $dolgraph->setShowPercent(1);
-    $dolgraph->SetType(array('pie'));
-    $dolgraph->setHeight('200');
-    $dolgraph->draw('idgraphstatus');
-    print $dolgraph->show($total ? 0 : 1);
+	include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+	$dolgraph = new DolGraph();
+	$dolgraph->SetData($dataseries);
+	$dolgraph->SetDataColor(array_values($colorseries));
+	$dolgraph->setShowLegend(2);
+	$dolgraph->setShowPercent(1);
+	$dolgraph->SetType(array('pie'));
+	$dolgraph->setHeight('200');
+	$dolgraph->draw('idgraphstatus');
+	print $dolgraph->show($total ? 0 : 1);
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 $listofstatus = array(0, 4, 4, 5); $bool = false;
 foreach ($listofstatus as $status)
 {
-    if (empty($conf->use_javascript_ajax))
-    {
-    	print '<tr class="oddeven">';
-    	print '<td>'.$staticcontratligne->LibStatut($status, 0, ($bool ? 1 : 0)).'</td>';
-    	print '<td class="right"><a href="services_list.php?mode='.$status.($bool ? '&filter=expired' : '').'">'.($nb[$status.$bool] ? $nb[$status.$bool] : 0).' '.$staticcontratligne->LibStatut($status, 3, ($bool ? 1 : 0)).'</a></td>';
-    	if ($status == 4 && !$bool) $bool = true;
-    	else $bool = false;
-        print "</tr>\n";
-    }
+	if (empty($conf->use_javascript_ajax))
+	{
+		print '<tr class="oddeven">';
+		print '<td>'.$staticcontratligne->LibStatut($status, 0, ($bool ? 1 : 0)).'</td>';
+		print '<td class="right"><a href="services_list.php?mode='.$status.($bool ? '&filter=expired' : '').'">'.($nb[$status.$bool] ? $nb[$status.$bool] : 0).' '.$staticcontratligne->LibStatut($status, 3, ($bool ? 1 : 0)).'</a></td>';
+		if ($status == 4 && !$bool) $bool = true;
+		else $bool = false;
+		print "</tr>\n";
+	}
 }
 //if ($totalinprocess != $total)
 //print '<tr class="liste_total"><td>'.$langs->trans("Total").' ('.$langs->trans("ServicesRunning").')</td><td class="right">'.$totalinprocess.'</td></tr>';
@@ -424,15 +424,15 @@ if ($resql)
 		print '<td>';
 		if ($obj->fk_product > 0)
 		{
-    		$productstatic->id = $obj->fk_product;
-            $productstatic->type = $obj->ptype;
-            $productstatic->ref = $obj->pref;
+			$productstatic->id = $obj->fk_product;
+			$productstatic->type = $obj->ptype;
+			$productstatic->ref = $obj->pref;
 			$productstatic->entity = $obj->pentity;
-            print $productstatic->getNomUrl(1, '', 20);
+			print $productstatic->getNomUrl(1, '', 20);
 		} else {
-		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"), "service");
-            if ($obj->label) print ' '.dol_trunc($obj->label, 20).'</a>';
-            else print '</a> '.dol_trunc($obj->note, 20);
+			print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"), "service");
+			if ($obj->label) print ' '.dol_trunc($obj->label, 20).'</a>';
+			else print '</a> '.dol_trunc($obj->note, 20);
 		}
 		print '</td>';
 		print '<td>';
@@ -500,17 +500,17 @@ if ($resql)
 		print '<td class="nowrap">';
 		if ($obj->fk_product > 0)
 		{
-    		$productstatic->id = $obj->fk_product;
-            $productstatic->type = $obj->ptype;
-            $productstatic->ref = $obj->pref;
+			$productstatic->id = $obj->fk_product;
+			$productstatic->type = $obj->ptype;
+			$productstatic->ref = $obj->pref;
 			$productstatic->entity = $obj->pentity;
-            print $productstatic->getNomUrl(1, '', 20);
+			print $productstatic->getNomUrl(1, '', 20);
 		} else {
-		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"), "service");
-            if ($obj->label) print ' '.dol_trunc($obj->label, 20).'</a>';
-            else print '</a> '.dol_trunc($obj->note, 20);
+			print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"), "service");
+			if ($obj->label) print ' '.dol_trunc($obj->label, 20).'</a>';
+			else print '</a> '.dol_trunc($obj->note, 20);
 		}
-        print '</td>';
+		print '</td>';
 		print '<td>';
 		$staticcompany->id = $obj->fk_soc;
 		$staticcompany->name = $obj->name;
@@ -576,15 +576,15 @@ if ($resql)
 		print '<td class="nowrap">';
 		if ($obj->fk_product > 0)
 		{
-    		$productstatic->id = $obj->fk_product;
-            $productstatic->type = $obj->ptype;
-            $productstatic->ref = $obj->pref;
+			$productstatic->id = $obj->fk_product;
+			$productstatic->type = $obj->ptype;
+			$productstatic->ref = $obj->pref;
 			$productstatic->entity = $obj->pentity;
-            print $productstatic->getNomUrl(1, '', 20);
+			print $productstatic->getNomUrl(1, '', 20);
 		} else {
-		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"), "service");
-            if ($obj->label) print ' '.dol_trunc($obj->label, 20).'</a>';
-            else print '</a> '.dol_trunc($obj->note, 20);
+			print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"), "service");
+			if ($obj->label) print ' '.dol_trunc($obj->label, 20).'</a>';
+			else print '</a> '.dol_trunc($obj->note, 20);
 		}
 		print '</td>';
 		print '<td>';
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 608fc6c0d81..bd5b39f717b 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -114,17 +114,17 @@ $fieldstosearchall = array(
 if (empty($user->socid)) $fieldstosearchall["c.note_private"] = "NotePrivate";
 
 $arrayfields = array(
-	'c.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-	'c.ref_customer'=>array('label'=>$langs->trans("RefCustomer"), 'checked'=>1),
-	'c.ref_supplier'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1),
-	's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
-	's.email'=>array('label'=>$langs->trans("ThirdPartyEmail"), 'checked'=>0),
-	's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>0),
-	's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>0),
-	'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0),
-	'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0),
-	'sale_representative'=>array('label'=>$langs->trans("SaleRepresentativesOfThirdParty"), 'checked'=>1),
-	'c.date_contrat'=>array('label'=>$langs->trans("DateContract"), 'checked'=>1),
+	'c.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1, 'position'=>10),
+	'c.ref_customer'=>array('label'=>$langs->trans("RefCustomer"), 'checked'=>1, 'position'=>12),
+	'c.ref_supplier'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1, 'position'=>14),
+	's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'position'=>30),
+	's.email'=>array('label'=>$langs->trans("ThirdPartyEmail"), 'checked'=>0, 'position'=>30),
+	's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>0, 'position'=>31),
+	's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>0, 'position'=>32),
+	'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0, 'position'=>33),
+	'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0, 'position'=>34),
+	'sale_representative'=>array('label'=>$langs->trans("SaleRepresentativesOfThirdParty"), 'checked'=>1, 'position'=>80),
+	'c.date_contrat'=>array('label'=>$langs->trans("DateContract"), 'checked'=>1, 'position'=>45),
 	'c.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
 	'c.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
 	'lower_planned_end_date'=>array('label'=>$langs->trans("LowerDateEndPlannedShort"), 'checked'=>1, 'position'=>900, 'help'=>$langs->trans("LowerDateEndPlannedShort")),
@@ -363,7 +363,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 $arrayofmassactions = array(
 	'generate_doc'=>$langs->trans("ReGeneratePDF"),
 	'builddoc'=>$langs->trans("PDFMerge"),
-    'presend'=>$langs->trans("SendByMail"),
+	'presend'=>$langs->trans("SendByMail"),
 );
 if ($user->rights->contrat->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
@@ -416,7 +416,7 @@ if ($user->rights->user->user->lire)
  	$moreforfilter .= '</div>';
 }
 // If the user can view categories of products
-if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
 {
 	include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
@@ -579,13 +579,13 @@ $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['c.datec']['checked'])) {
-    print_liste_field_titre($arrayfields['c.datec']['label'], $_SERVER["PHP_SELF"], "c.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	print_liste_field_titre($arrayfields['c.datec']['label'], $_SERVER["PHP_SELF"], "c.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
 }
 if (!empty($arrayfields['c.tms']['checked'])) {
-    print_liste_field_titre($arrayfields['c.tms']['label'], $_SERVER["PHP_SELF"], "c.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	print_liste_field_titre($arrayfields['c.tms']['label'], $_SERVER["PHP_SELF"], "c.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
 }
 if (!empty($arrayfields['lower_planned_end_date']['checked'])) {
-    print_liste_field_titre($arrayfields['lower_planned_end_date']['label'], $_SERVER["PHP_SELF"], "lower_planned_end_date", "", $param, '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre($arrayfields['lower_planned_end_date']['label'], $_SERVER["PHP_SELF"], "lower_planned_end_date", "", $param, '', $sortfield, $sortorder, 'center ');
 }
 if (!empty($arrayfields['status']['checked'])) {
 	print_liste_field_titre($staticcontratligne->LibStatut(0, 3, -1, 'class="nochangebackground"'), '', '', '', '', 'width="16"');
@@ -634,7 +634,7 @@ while ($i < min($num, $limit))
 
 	if (!empty($arrayfields['c.ref_customer']['checked']))
 	{
-	    print '<td>'.$contracttmp->getFormatedCustomerRef($obj->ref_customer).'</td>';
+		print '<td>'.$contracttmp->getFormatedCustomerRef($obj->ref_customer).'</td>';
 	}
 	if (!empty($arrayfields['c.ref_supplier']['checked']))
 	{
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index d9eb8e3ccdc..c9000c4fb0d 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -72,101 +72,101 @@ $form = new Form($db);
 
 if ($id > 0 || !empty($ref))
 {
-    $object->fetch_thirdparty();
+	$object->fetch_thirdparty();
 
-    $head = contract_prepare_head($object);
+	$head = contract_prepare_head($object);
 
-    $hselected = 2;
+	$hselected = 2;
 
-    dol_fiche_head($head, 'note', $langs->trans("Contract"), -1, 'contract');
+	print dol_get_fiche_head($head, 'note', $langs->trans("Contract"), -1, 'contract');
 
-    // Contract card
+	// Contract card
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 
-    $morehtmlref = '';
-    //if (! empty($modCodeContract->code_auto)) {
-    $morehtmlref .= $object->ref;
-    /*} else {
+	$morehtmlref = '';
+	//if (! empty($modCodeContract->code_auto)) {
+	$morehtmlref .= $object->ref;
+	/*} else {
      $morehtmlref.=$form->editfieldkey("",'ref',$object->ref,0,'string','',0,3);
     $morehtmlref.=$form->editfieldval("",'ref',$object->ref,0,'string','',0,2);
     }*/
 
-    $morehtmlref .= '<div class="refidno">';
-    // Ref customer
-    $morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', 0, 1);
-    $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', null, null, '', 1, 'getFormatedCustomerRef');
-    // Ref supplier
-    $morehtmlref .= '<br>';
-    $morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
-    $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1, 'getFormatedSupplierRef');
-    // Thirdparty
-    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-    // Project
-    if (!empty($conf->projet->enabled))
-    {
-    	$langs->load("projects");
-    	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-    	if ($user->rights->contrat->creer)
-    	{
-    		if ($action != 'classify')
-    			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-    			$morehtmlref .= ' : ';
-    		if ($action == 'classify') {
-    			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-    			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-    			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
-    			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-    			$morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-    			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-    			$morehtmlref .= '</form>';
-    		} else {
-    			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
-    		}
-    	} else {
-    		if (!empty($object->fk_project)) {
-    			$proj = new Project($db);
-    			$proj->fetch($object->fk_project);
-    			$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-    			$morehtmlref .= $proj->ref;
-    			$morehtmlref .= '</a>';
-    		} else {
-    			$morehtmlref .= '';
-    		}
-    	}
-    }
-    $morehtmlref .= '</div>';
+	$morehtmlref .= '<div class="refidno">';
+	// Ref customer
+	$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', null, null, '', 1, 'getFormatedCustomerRef');
+	// Ref supplier
+	$morehtmlref .= '<br>';
+	$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1, 'getFormatedSupplierRef');
+	// Thirdparty
+	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+	// Project
+	if (!empty($conf->projet->enabled))
+	{
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->contrat->creer)
+		{
+			if ($action != 'classify')
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				$morehtmlref .= ' : ';
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
+	$morehtmlref .= '</div>';
 
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'none', $morehtmlref);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'none', $morehtmlref);
 
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border centpercent tableforfield">';
+	print '<table class="border centpercent tableforfield">';
 
 
-    // Ligne info remises tiers
-    print '<tr><td class="titlefield">'.$langs->trans('Discount').'</td><td colspan="3">';
-    if ($object->thirdparty->remise_percent) print $langs->trans("CompanyHasRelativeDiscount", $object->thirdparty->remise_percent);
-    else print $langs->trans("CompanyHasNoRelativeDiscount");
-    $absolute_discount = $object->thirdparty->getAvailableDiscounts();
-    print '. ';
-    if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->trans("Currency".$conf->currency));
-    else print $langs->trans("CompanyHasNoAbsoluteDiscount");
-    print '.';
-    print '</td></tr>';
+	// Ligne info remises tiers
+	print '<tr><td class="titlefield">'.$langs->trans('Discount').'</td><td colspan="3">';
+	if ($object->thirdparty->remise_percent) print $langs->trans("CompanyHasRelativeDiscount", $object->thirdparty->remise_percent);
+	else print $langs->trans("CompanyHasNoRelativeDiscount");
+	$absolute_discount = $object->thirdparty->getAvailableDiscounts();
+	print '. ';
+	if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->trans("Currency".$conf->currency));
+	else print $langs->trans("CompanyHasNoAbsoluteDiscount");
+	print '.';
+	print '</td></tr>';
 
-    // Date
-    print '<tr>';
-    print '<td class="titlefield">';
-    print $form->editfieldkey("Date", 'date_contrat', $object->date_contrat, $object, 0);
-    print '</td><td>';
-    print $form->editfieldval("Date", 'date_contrat', $object->date_contrat, $object, 0, 'datehourpicker');
-    print '</td>';
-    print '</tr>';
+	// Date
+	print '<tr>';
+	print '<td class="titlefield">';
+	print $form->editfieldkey("Date", 'date_contrat', $object->date_contrat, $object, 0);
+	print '</td><td>';
+	print $form->editfieldval("Date", 'date_contrat', $object->date_contrat, $object, 0, 'datehourpicker');
+	print '</td>';
+	print '</tr>';
 
 	print "</table>";
 
@@ -176,7 +176,7 @@ if ($id > 0 || !empty($ref))
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 7279ab98781..67b605d657f 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -245,30 +245,30 @@ if ($search_contract) $sql .= " AND c.ref LIKE '%".$db->escape($search_contract)
 if ($search_service)  $sql .= " AND (p.ref LIKE '%".$db->escape($search_service)."%' OR p.description LIKE '%".$db->escape($search_service)."%' OR cd.description LIKE '%".$db->escape($search_service)."%')";
 if ($socid > 0)       $sql .= " AND s.rowid = ".$socid;
 
-$filter_dateouvertureprevue_start=dol_mktime(0, 0, 0, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear);
-$filter_dateouvertureprevue_end=dol_mktime(23, 59, 59, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear);
+$filter_dateouvertureprevue_start = dol_mktime(0, 0, 0, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear);
+$filter_dateouvertureprevue_end = dol_mktime(23, 59, 59, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear);
 if ($filter_dateouvertureprevue_start != '' && $filter_opouvertureprevue == -1) $filter_opouvertureprevue = ' BETWEEN ';
 
-$filter_date1_start =dol_mktime(0, 0, 0, $op1month, $op1day, $op1year);
-$filter_date1_end =dol_mktime(23, 59, 59, $op1month, $op1day, $op1year);
+$filter_date1_start = dol_mktime(0, 0, 0, $op1month, $op1day, $op1year);
+$filter_date1_end = dol_mktime(23, 59, 59, $op1month, $op1day, $op1year);
 if ($filter_date1_start != '' && $filter_op1 == -1) $filter_op1 = ' BETWEEN ';
 
-$filter_date2_start=dol_mktime(0, 0, 0, $op2month, $op2day, $op2year);
-$filter_date2_end=dol_mktime(23, 59, 59, $op2month, $op2day, $op2year);
+$filter_date2_start = dol_mktime(0, 0, 0, $op2month, $op2day, $op2year);
+$filter_date2_end = dol_mktime(23, 59, 59, $op2month, $op2day, $op2year);
 if ($filter_date2_start != '' && $filter_op2 == -1) $filter_op2 = ' BETWEEN ';
 
-$filter_datecloture_start=dol_mktime(0, 0, 0, $opcloturemonth, $opclotureday, $opclotureyear);
-$filter_datecloture_end=dol_mktime(23, 59, 59, $opcloturemonth, $opclotureday, $opclotureyear);
+$filter_datecloture_start = dol_mktime(0, 0, 0, $opcloturemonth, $opclotureday, $opclotureyear);
+$filter_datecloture_end = dol_mktime(23, 59, 59, $opcloturemonth, $opclotureday, $opclotureyear);
 if ($filter_datecloture_start != '' && $filter_opcloture == -1) $filter_opcloture = ' BETWEEN ';
 
-if (! empty($filter_opouvertureprevue) && $filter_opouvertureprevue != -1 && $filter_opouvertureprevue != ' BETWEEN ' && $filter_dateouvertureprevue_start != '') $sql.= " AND cd.date_ouverture_prevue ".$filter_opouvertureprevue." '".$db->idate($filter_dateouvertureprevue_start)."'";
-if (! empty($filter_opouvertureprevue) && $filter_opouvertureprevue == ' BETWEEN ') $sql.= " AND '".$db->idate($filter_dateouvertureprevue_end)."'";
-if (! empty($filter_op1) && $filter_op1 != -1 && $filter_op1 != ' BETWEEN ' && $filter_date1_start != '') $sql.= " AND cd.date_ouverture ".$filter_op1." '".$db->idate($filter_date1_start)."'";
-if (! empty($filter_op1) && $filter_op1==' BETWEEN ')  $sql.= " AND '".$db->idate($filter_date1_end)."'";
-if (! empty($filter_op2) && $filter_op2 != -1 && $filter_op2 != ' BETWEEN ' && $filter_date2_start != '') $sql.= " AND cd.date_fin_validite ".$filter_op2." '".$db->idate($filter_date2_start)."'";
-if (! empty($filter_op2) && $filter_op2==' BETWEEN ')  $sql.= " AND '".$db->idate($filter_date2_end)."'";
-if (! empty($filter_opcloture) && $filter_opcloture != ' BETWEEN ' && $filter_opcloture != -1 && $filter_datecloture_start != '') $sql.= " AND cd.date_cloture ".$filter_opcloture." '".$db->idate($filter_datecloture_start)."'";
-if (! empty($filter_opcloture) && $filter_opcloture==' BETWEEN ')  $sql.= " AND '".$db->idate($filter_datecloture_end)."'";
+if (!empty($filter_opouvertureprevue) && $filter_opouvertureprevue != -1 && $filter_opouvertureprevue != ' BETWEEN ' && $filter_dateouvertureprevue_start != '') $sql .= " AND cd.date_ouverture_prevue ".$filter_opouvertureprevue." '".$db->idate($filter_dateouvertureprevue_start)."'";
+if (!empty($filter_opouvertureprevue) && $filter_opouvertureprevue == ' BETWEEN ') $sql .= " AND '".$db->idate($filter_dateouvertureprevue_end)."'";
+if (!empty($filter_op1) && $filter_op1 != -1 && $filter_op1 != ' BETWEEN ' && $filter_date1_start != '') $sql .= " AND cd.date_ouverture ".$filter_op1." '".$db->idate($filter_date1_start)."'";
+if (!empty($filter_op1) && $filter_op1 == ' BETWEEN ')  $sql .= " AND '".$db->idate($filter_date1_end)."'";
+if (!empty($filter_op2) && $filter_op2 != -1 && $filter_op2 != ' BETWEEN ' && $filter_date2_start != '') $sql .= " AND cd.date_fin_validite ".$filter_op2." '".$db->idate($filter_date2_start)."'";
+if (!empty($filter_op2) && $filter_op2 == ' BETWEEN ')  $sql .= " AND '".$db->idate($filter_date2_end)."'";
+if (!empty($filter_opcloture) && $filter_opcloture != ' BETWEEN ' && $filter_opcloture != -1 && $filter_datecloture_start != '') $sql .= " AND cd.date_cloture ".$filter_opcloture." '".$db->idate($filter_datecloture_start)."'";
+if (!empty($filter_opcloture) && $filter_opcloture == ' BETWEEN ')  $sql .= " AND '".$db->idate($filter_datecloture_end)."'";
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 $sql .= $db->order($sortfield, $sortorder);
@@ -581,7 +581,7 @@ while ($i < min($num, $limit))
 		print '<td class="nowraponall">';
 		print $contractstatic->getNomUrl(1, 16);
 		print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Service
 	if (!empty($arrayfields['p.description']['checked']))
@@ -601,7 +601,7 @@ while ($i < min($num, $limit))
 			if ($obj->type == 1) print img_object($obj->description, 'service').' '.dol_trunc($obj->description, 24);
 		}
 		print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 
 	if (!empty($arrayfields['cd.qty']['checked']))
@@ -609,39 +609,39 @@ while ($i < min($num, $limit))
 		print '<td>';
 		print $obj->qty;
 		print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['cd.total_ht']['checked']))
 	{
 		print '<td class="right">';
 		print price($obj->total_ht);
 		print '</td>';
-        if (!$i) $totalarray['nbfield']++;
-        if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'cd.total_ht';
-        $totalarray['val']['cd.total_ht'] += $obj->total_ht;
-    }
+		if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'cd.total_ht';
+		$totalarray['val']['cd.total_ht'] += $obj->total_ht;
+	}
 	if (!empty($arrayfields['cd.total_tva']['checked']))
 	{
 		print '<td class="right">';
 		print price($obj->total_tva);
 		print '</td>';
-        if (!$i) $totalarray['nbfield']++;
-        if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'cd.total_tva';
-        $totalarray['val']['cd.total_tva'] += $obj->total_tva;
-    }
+		if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'cd.total_tva';
+		$totalarray['val']['cd.total_tva'] += $obj->total_tva;
+	}
 	if (!empty($arrayfields['cd.tva_tx']['checked']))
 	{
 		print '<td class="right">';
 		print price2num($obj->tva_tx).'%';
 		print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['cd.subprice']['checked']))
 	{
 		print '<td class="right">';
 		print price($obj->subprice);
 		print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 
 
@@ -651,7 +651,7 @@ while ($i < min($num, $limit))
 		print '<td>';
 		print $companystatic->getNomUrl(1, 'customer', 28);
 		print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 
 	// Start date
@@ -663,12 +663,12 @@ while ($i < min($num, $limit))
 		print ' '.img_picto($langs->trans("Late"), "warning");
 		else print '&nbsp;&nbsp;&nbsp;&nbsp;';
 		print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['cd.date_ouverture']['checked']))
 	{
 		print '<td class="center">'.($obj->date_ouverture ?dol_print_date($db->jdate($obj->date_ouverture), 'dayhour') : '&nbsp;').'</td>';
-        if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// End date
 	if (!empty($arrayfields['cd.date_fin_validite']['checked']))
@@ -681,13 +681,13 @@ while ($i < min($num, $limit))
 			print img_warning($textlate);
 		} else print '&nbsp;&nbsp;&nbsp;&nbsp;';
 		print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Close date (real end date)
 	if (!empty($arrayfields['cd.date_cloture']['checked']))
 	{
 		print '<td class="center">'.dol_print_date($db->jdate($obj->date_cloture), 'dayhour').'</td>';
-        if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 
 	// Extra fields
@@ -715,16 +715,16 @@ while ($i < min($num, $limit))
 	// Status
 	if (!empty($arrayfields['status']['checked']))
 	{
-	    print '<td class="right">';
-	    if ($obj->cstatut == 0)
-	    {
+		print '<td class="right">';
+		if ($obj->cstatut == 0)
+		{
 			// If contract is draft, we say line is also draft
-		    print $contractstatic->LibStatut(0, 5);
-	    } else {
-		    print $staticcontratligne->LibStatut($obj->statut, 5, ($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < $now) ? 1 : 0);
-	    }
-	    print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+			print $contractstatic->LibStatut(0, 5);
+		} else {
+			print $staticcontratligne->LibStatut($obj->statut, 5, ($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < $now) ? 1 : 0);
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Action column
 	print '<td class="nowrap center">';
diff --git a/htdocs/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
index 57b885f24d2..339f51db22c 100644
--- a/htdocs/contrat/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
@@ -39,10 +39,10 @@ $langs->load("contracts");
 $total = 0; $ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink)
 {
-    $ilink++;
+	$ilink++;
 
-    $trclass = 'oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
 	?>
 <tr class="<?php echo $trclass; ?>">
     <td><?php echo $langs->trans("Contract"); ?></td>
@@ -58,7 +58,7 @@ foreach ($linkedObjectBlock as $key => $objectlink)
 		$totalcontrat = 0;
 		foreach ($objectlink->lines as $linecontrat) {
 			$totalcontrat = $totalcontrat + $linecontrat->total_ht;
-		    $total = $total + $linecontrat->total_ht;
+			$total = $total + $linecontrat->total_ht;
 		}
 		echo price($totalcontrat);
 	} ?></td>
diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index cee75415eee..5a93a6ded0b 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -60,7 +60,10 @@ if ($action == 'add' && !empty($permissiontoadd))
 			if (!GETPOSTISSET($key)) continue; // The field was not submited to be edited
 		}
 		// Ignore special fields
-		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;
+		if (in_array($key, array('rowid', 'entity', 'import_key'))) continue;
+		if (in_array($key, array('date_creation', 'tms', 'fk_user_creat', 'fk_user_modif'))) {
+			if (!in_array(abs($val['visible']), array(1, 3))) continue; // Only 1 and 3 that are case to create
+		}
 
 		// Set value to insert
 		if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
@@ -74,7 +77,10 @@ if ($action == 'add' && !empty($permissiontoadd))
 		} elseif (preg_match('/^(integer|price|real|double)/', $object->fields[$key]['type'])) {
 			$value = price2num(GETPOST($key, 'alphanohtml')); // To fix decimal separator according to lang setup
 		} elseif ($object->fields[$key]['type'] == 'boolean') {
-			$value = (GETPOST($key) == 'on' ? 1 : 0);
+			$value = ((GETPOST($key) == '1' || GETPOST($key) == 'on') ? 1 : 0);
+		} elseif ($object->fields[$key]['type'] == 'reference') {
+			$tmparraykey = array_keys($object->param_list);
+			$value = $tmparraykey[GETPOST($key)].','.GETPOST($key.'2');
 		} else {
 			$value = GETPOST($key, 'alphanohtml');
 		}
@@ -138,7 +144,10 @@ if ($action == 'update' && !empty($permissiontoadd))
 			if (!GETPOSTISSET($key)) continue; // The field was not submited to be edited
 		}
 		// Ignore special fields
-		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;
+		if (in_array($key, array('rowid', 'entity', 'import_key'))) continue;
+		if (in_array($key, array('date_creation', 'tms', 'fk_user_creat', 'fk_user_modif'))) {
+			if (!in_array(abs($val['visible']), array(1, 3, 4))) continue; // Only 1 and 3 and 4 that are case to update
+		}
 
 		// Set value to update
 		if (preg_match('/^(text|html)/', $object->fields[$key]['type'])) {
@@ -162,6 +171,8 @@ if ($action == 'update' && !empty($permissiontoadd))
 			$value = price2num(GETPOST($key, 'alphanohtml')); // To fix decimal separator according to lang setup
 		} elseif ($object->fields[$key]['type'] == 'boolean') {
 			$value = ((GETPOST($key, 'aZ09') == 'on' || GETPOST($key, 'aZ09') == '1') ? 1 : 0);
+		} elseif ($object->fields[$key]['type'] == 'reference') {
+			$value = array_keys($object->param_list)[GETPOST($key)].','.GETPOST($key.'2');
 		} else {
 			$value = GETPOST($key, 'alpha');
 		}
@@ -304,10 +315,15 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $permissiontoadd)
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
-				$model = $object->model_pdf;
+
 				$ret = $object->fetch($id); // Reload to get new records
 
-				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				$model = $object->model_pdf;
+
+				$retgen = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				if ($retgen < 0) {
+					setEventMessages($object->error, $object->errors, 'warnings');
+				}
 			}
 		}
 	} else {
diff --git a/htdocs/core/actions_builddoc.inc.php b/htdocs/core/actions_builddoc.inc.php
index 20bd19625cc..4ae83829fa4 100644
--- a/htdocs/core/actions_builddoc.inc.php
+++ b/htdocs/core/actions_builddoc.inc.php
@@ -34,102 +34,102 @@ if (!empty($permissioncreate) && empty($permissiontoadd)) $permissiontoadd = $pe
 // Build doc
 if ($action == 'builddoc' && $permissiontoadd)
 {
-    if (is_numeric(GETPOST('model', 'alpha')))
-    {
-        $error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Model"));
-    } else {
+	if (is_numeric(GETPOST('model', 'alpha')))
+	{
+		$error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Model"));
+	} else {
    		// Reload to get all modified line records and be ready for hooks
-        $ret = $object->fetch($id);
-        $ret = $object->fetch_thirdparty();
-        /*if (empty($object->id) || ! $object->id > 0)
+		$ret = $object->fetch($id);
+		$ret = $object->fetch_thirdparty();
+		/*if (empty($object->id) || ! $object->id > 0)
         {
             dol_print_error('Object must have been loaded by a fetch');
             exit;
         }*/
 
-        // Save last template used to generate document
-    	if (GETPOST('model', 'alpha'))
-    	{
-    	    $object->setDocModel($user, GETPOST('model', 'alpha'));
-    	}
+		// Save last template used to generate document
+		if (GETPOST('model', 'alpha'))
+		{
+			$object->setDocModel($user, GETPOST('model', 'alpha'));
+		}
 
-        // Special case to force bank account
-        //if (property_exists($object, 'fk_bank'))
-        //{
-        if (GETPOST('fk_bank', 'int')) {
-            // this field may come from an external module
-            $object->fk_bank = GETPOST('fk_bank', 'int');
-        } elseif (!empty($object->fk_account)) {
-            $object->fk_bank = $object->fk_account;
-        }
-        //}
+		// Special case to force bank account
+		//if (property_exists($object, 'fk_bank'))
+		//{
+		if (GETPOST('fk_bank', 'int')) {
+			// this field may come from an external module
+			$object->fk_bank = GETPOST('fk_bank', 'int');
+		} elseif (!empty($object->fk_account)) {
+			$object->fk_bank = $object->fk_account;
+		}
+		//}
 
-        $outputlangs = $langs;
-        $newlang = '';
+		$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) && isset($object->thirdparty->default_lang)) $newlang = $object->thirdparty->default_lang; // for proposal, order, invoice, ...
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) $newlang = $object->default_lang; // for thirdparty
-        if (!empty($newlang))
-        {
-            $outputlangs = new Translate("", $conf);
-            $outputlangs->setDefaultLang($newlang);
-        }
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->thirdparty->default_lang)) $newlang = $object->thirdparty->default_lang; // for proposal, order, invoice, ...
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) $newlang = $object->default_lang; // for thirdparty
+		if (!empty($newlang))
+		{
+			$outputlangs = new Translate("", $conf);
+			$outputlangs->setDefaultLang($newlang);
+		}
 
-        // To be sure vars is defined
-        if (empty($hidedetails)) $hidedetails = 0;
-        if (empty($hidedesc)) $hidedesc = 0;
-        if (empty($hideref)) $hideref = 0;
-        if (empty($moreparams)) $moreparams = null;
+		// To be sure vars is defined
+		if (empty($hidedetails)) $hidedetails = 0;
+		if (empty($hidedesc)) $hidedesc = 0;
+		if (empty($hideref)) $hideref = 0;
+		if (empty($moreparams)) $moreparams = null;
 
-        $result = $object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
-        if ($result <= 0)
-        {
-            setEventMessages($object->error, $object->errors, 'errors');
-            $action = '';
-        } else {
-        	if (empty($donotredirect))	// This is set when include is done by bulk action "Bill Orders"
-        	{
-	            setEventMessages($langs->trans("FileGenerated"), null);
+		$result = $object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+		if ($result <= 0)
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action = '';
+		} else {
+			if (empty($donotredirect))	// This is set when include is done by bulk action "Bill Orders"
+			{
+				setEventMessages($langs->trans("FileGenerated"), null);
 
-	            $urltoredirect = $_SERVER['REQUEST_URI'];
-	            $urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect);
-	            $urltoredirect = preg_replace('/action=builddoc&?/', '', $urltoredirect); // To avoid infinite loop
+				$urltoredirect = $_SERVER['REQUEST_URI'];
+				$urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect);
+				$urltoredirect = preg_replace('/action=builddoc&?/', '', $urltoredirect); // To avoid infinite loop
 
-	            header('Location: '.$urltoredirect.'#builddoc');
-	            exit;
-        	}
-        }
-    }
+				header('Location: '.$urltoredirect.'#builddoc');
+				exit;
+			}
+		}
+	}
 }
 
 // Delete file in doc form
 if ($action == 'remove_file' && $permissiontoadd)
 {
 	if (!empty($upload_dir)) {
-	    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	    if (empty($object->id) || !$object->id > 0)
-	    {
-	        // Reload to get all modified line records and be ready for hooks
-	        $ret = $object->fetch($id);
-	        $ret = $object->fetch_thirdparty();
-	    }
+		if (empty($object->id) || !$object->id > 0)
+		{
+			// Reload to get all modified line records and be ready for hooks
+			$ret = $object->fetch($id);
+			$ret = $object->fetch_thirdparty();
+		}
 
-	    $langs->load("other");
-	    $filetodelete = GETPOST('file', 'alpha');
-	    $file = $upload_dir.'/'.$filetodelete;
-	    $ret = dol_delete_file($file, 0, 0, 0, $object);
-	    if ($ret) setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
-	    else setEventMessages($langs->trans("ErrorFailToDeleteFile", $filetodelete), null, 'errors');
+		$langs->load("other");
+		$filetodelete = GETPOST('file', 'alpha');
+		$file = $upload_dir.'/'.$filetodelete;
+		$ret = dol_delete_file($file, 0, 0, 0, $object);
+		if ($ret) setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
+		else setEventMessages($langs->trans("ErrorFailToDeleteFile", $filetodelete), null, 'errors');
 
-	    // Make a redirect to avoid to keep the remove_file into the url that create side effects
-	    $urltoredirect = $_SERVER['REQUEST_URI'];
-	    $urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect);
-	    $urltoredirect = preg_replace('/action=remove_file&?/', '', $urltoredirect);
+		// Make a redirect to avoid to keep the remove_file into the url that create side effects
+		$urltoredirect = $_SERVER['REQUEST_URI'];
+		$urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect);
+		$urltoredirect = preg_replace('/action=remove_file&?/', '', $urltoredirect);
 
-	    header('Location: '.$urltoredirect);
-	    exit;
+		header('Location: '.$urltoredirect);
+		exit;
 	} else {
 		setEventMessages('BugFoundVarUploaddirnotDefined', null, 'errors');
 	}
diff --git a/htdocs/core/actions_changeselectedfields.inc.php b/htdocs/core/actions_changeselectedfields.inc.php
index f4e7f01d234..4daf53891cf 100644
--- a/htdocs/core/actions_changeselectedfields.inc.php
+++ b/htdocs/core/actions_changeselectedfields.inc.php
@@ -30,17 +30,17 @@
 // Save selection
 if (GETPOST('formfilteraction', 'alphanohtml') == 'listafterchangingselectedfields')
 {
-    $tabparam = array();
+	$tabparam = array();
 
-    $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 
-    if (GETPOST("selectedfields")) $tabparam["MAIN_SELECTEDFIELDS_".$varpage] = GETPOST("selectedfields");
-    else $tabparam["MAIN_SELECTEDFIELDS_".$varpage] = '';
+	if (GETPOST("selectedfields")) $tabparam["MAIN_SELECTEDFIELDS_".$varpage] = GETPOST("selectedfields");
+	else $tabparam["MAIN_SELECTEDFIELDS_".$varpage] = '';
 
-    include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-    $result = dol_set_user_param($db, $conf, $user, $tabparam);
+	$result = dol_set_user_param($db, $conf, $user, $tabparam);
 
-    //$action='list';
-    //var_dump($tabparam);exit;
+	//$action='list';
+	//var_dump($tabparam);exit;
 }
diff --git a/htdocs/core/actions_comments.inc.php b/htdocs/core/actions_comments.inc.php
index 079f207b4a4..f590adee197 100644
--- a/htdocs/core/actions_comments.inc.php
+++ b/htdocs/core/actions_comments.inc.php
@@ -57,19 +57,19 @@ if ($action == 'addcomment')
 }
 if ($action === 'updatecomment')
 {
-    if ($comment->fetch($idcomment) >= 0)
-    {
-        $comment->description = GETPOST('comment_description', 'restricthtml');
-        if ($comment->update($user) > 0)
-        {
-            setEventMessages($langs->trans("CommentAdded"), null, 'mesgs');
-            header('Location: '.$varpage.'?id='.$id.($withproject ? '&withproject=1#comment' : ''));
-            exit;
-        } else {
-            setEventMessages($comment->error, $comment->errors, 'errors');
-            $action = '';
-        }
-    }
+	if ($comment->fetch($idcomment) >= 0)
+	{
+		$comment->description = GETPOST('comment_description', 'restricthtml');
+		if ($comment->update($user) > 0)
+		{
+			setEventMessages($langs->trans("CommentAdded"), null, 'mesgs');
+			header('Location: '.$varpage.'?id='.$id.($withproject ? '&withproject=1#comment' : ''));
+			exit;
+		} else {
+			setEventMessages($comment->error, $comment->errors, 'errors');
+			$action = '';
+		}
+	}
 }
 if ($action == 'deletecomment')
 {
diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
index 46a6a31c202..7ba4d7d64b9 100644
--- a/htdocs/core/actions_extrafields.inc.php
+++ b/htdocs/core/actions_extrafields.inc.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2011-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2011-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,9 +40,9 @@ if ($type == 'select')   $extrasize = '';
 // Add attribute
 if ($action == 'add')
 {
-	if ($_POST["button"] != $langs->trans("Cancel"))
+	if (GETPOST("button") != $langs->trans("Cancel"))
 	{
-	    // Check values
+		// Check values
 		if (!$type)
 		{
 			$error++;
@@ -52,165 +52,182 @@ if ($action == 'add')
 		}
 		if ($type == 'varchar' && $extrasize <= 0)
 		{
-		    $error++;
-		    $langs->load("errors");
-		    $mesg[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Size"));
-		    $action = 'edit';
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Size"));
+			$action = 'edit';
+		}
+		if ($type == 'varchar' && $extrasize > $maxsizestring)
+		{
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorSizeTooLongForVarcharType", $maxsizestring);
+			$action = 'create';
+		}
+		if ($type == 'int' && $extrasize > $maxsizeint)
+		{
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorSizeTooLongForIntType", $maxsizeint);
+			$action = 'create';
+		}
+		if ($type == 'select' && !$param)
+		{
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorNoValueForSelectType");
+			$action = 'create';
+		}
+		if ($type == 'sellist' && !$param)
+		{
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorNoValueForSelectListType");
+			$action = 'create';
+		}
+		if ($type == 'checkbox' && !$param)
+		{
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorNoValueForCheckBoxType");
+			$action = 'create';
+		}
+		if ($type == 'link' && !$param)
+		{
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorNoValueForLinkType");
+			$action = 'create';
+		}
+		if ($type == 'radio' && !$param)
+		{
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorNoValueForRadioType");
+			$action = 'create';
+		}
+		if ((($type == 'radio') || ($type == 'checkbox')) && $param)
+		{
+			// Construct array for parameter (value of select list)
+			$parameters = $param;
+			$parameters_array = explode("\r\n", $parameters);
+			foreach ($parameters_array as $param_ligne)
+			{
+				if (!empty($param_ligne)) {
+					if (preg_match_all('/,/', $param_ligne, $matches))
+					{
+						if (count($matches[0]) > 1) {
+							$error++;
+							$langs->load("errors");
+							$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
+							$action = 'create';
+						}
+					} else {
+						$error++;
+						$langs->load("errors");
+						$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
+						$action = 'create';
+					}
+				}
+			}
 		}
-        if ($type == 'varchar' && $extrasize > $maxsizestring)
-        {
-            $error++;
-            $langs->load("errors");
-            $mesg[] = $langs->trans("ErrorSizeTooLongForVarcharType", $maxsizestring);
-            $action = 'create';
-        }
-        if ($type == 'int' && $extrasize > $maxsizeint)
-        {
-            $error++;
-            $langs->load("errors");
-            $mesg[] = $langs->trans("ErrorSizeTooLongForIntType", $maxsizeint);
-            $action = 'create';
-        }
-        if ($type == 'select' && !$param)
-        {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[] = $langs->trans("ErrorNoValueForSelectType");
-        	$action = 'create';
-        }
-        if ($type == 'sellist' && !$param)
-        {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[] = $langs->trans("ErrorNoValueForSelectListType");
-        	$action = 'create';
-        }
-        if ($type == 'checkbox' && !$param)
-        {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[] = $langs->trans("ErrorNoValueForCheckBoxType");
-        	$action = 'create';
-        }
-        if ($type == 'link' && !$param)
-        {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[] = $langs->trans("ErrorNoValueForLinkType");
-        	$action = 'create';
-        }
-        if ($type == 'radio' && !$param)
-        {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[] = $langs->trans("ErrorNoValueForRadioType");
-        	$action = 'create';
-        }
-        if ((($type == 'radio') || ($type == 'checkbox')) && $param)
-        {
-        	// Construct array for parameter (value of select list)
-    		$parameters = $param;
-    		$parameters_array = explode("\r\n", $parameters);
-    		foreach ($parameters_array as $param_ligne)
-    		{
-    			if (!empty($param_ligne)) {
-	    			if (preg_match_all('/,/', $param_ligne, $matches))
-	    			{
-	    				if (count($matches[0]) > 1) {
-	    					$error++;
-	    					$langs->load("errors");
-	    					$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
-	    					$action = 'create';
-	    				}
-	    			} else {
-	    				$error++;
-	    				$langs->load("errors");
-	    				$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
-	    				$action = 'create';
-	    			}
-    			}
-    		}
-        }
 
-	    if (!$error)
-	    {
-    		// attrname must be alphabetical and lower case only
-    		if (isset($_POST["attrname"]) && preg_match("/^[a-z0-9-_]+$/", $_POST['attrname']) && !is_numeric($_POST["attrname"]))
-    		{
-    			// Construct array for parameter (value of select list)
-        		$default_value = GETPOST('default_value', 'alpha');
-    			$parameters = $param;
-    			$parameters_array = explode("\r\n", $parameters);
-    			//In sellist we have only one line and it can have come to do SQL expression
-    			if ($type == 'sellist') {
-    				foreach ($parameters_array as $param_ligne)
-    				{
-    					$params['options'] = array($parameters=>null);
-    				}
-    			} else {
-    				//Esle it's separated key/value and coma list
-    				foreach ($parameters_array as $param_ligne)
-    				{
-    					list($key, $value) = explode(',', $param_ligne);
-    					$params['options'][$key] = $value;
-    				}
-    			}
+		if (!$error) {
+			if (strlen(GETPOST('attrname', 'aZ09')) < 3) {
+				$error++;
+				$langs->load("errors");
+				$mesg[] = $langs->trans("ErrorValueLength", $langs->transnoentitiesnoconv("AttributeCode"), 3);
+				$action = 'create';
+			}
+		}
 
-    			// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
-    			$visibility = GETPOST('list', 'alpha');
+		// Check reserved keyword with more than 3 characters
+		if (!$error) {
+			if (in_array(GETPOST('attrname', 'aZ09'), array('and', 'keyword', 'table', 'index', 'integer', 'float', 'double', 'position'))) {
+				$error++;
+				$langs->load("errors");
+				$mesg[] = $langs->trans("ErrorReservedKeyword", GETPOST('attrname', 'aZ09'));
+				$action = 'create';
+			}
+		}
+
+		if (!$error) {
+			// attrname must be alphabetical and lower case only
+			if (GETPOSTISSET("attrname") && preg_match("/^[a-z0-9-_]+$/", GETPOST('attrname', 'aZ09')) && !is_numeric(GETPOST('attrname', 'aZ09'))) {
+				// Construct array for parameter (value of select list)
+				$default_value = GETPOST('default_value', 'alpha');
+				$parameters = $param;
+				$parameters_array = explode("\r\n", $parameters);
+				//In sellist we have only one line and it can have come to do SQL expression
+				if ($type == 'sellist' || $type == 'chkbxlst') {
+					foreach ($parameters_array as $param_ligne)
+					{
+						$params['options'] = array($parameters=>null);
+					}
+				} else {
+					// Else it's separated key/value and coma list
+					foreach ($parameters_array as $param_ligne)
+					{
+						list($key, $value) = explode(',', $param_ligne);
+						$params['options'][$key] = $value;
+					}
+				}
+
+				// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
+				$visibility = GETPOST('list', 'alpha');
 				if ($type == 'separate') $visibility = 3;
 
-                $result = $extrafields->addExtraField(
-                	GETPOST('attrname', 'alpha'),
-                	GETPOST('label', 'alpha'),
-                	$type,
-                	GETPOST('pos', 'int'),
-                	$extrasize,
-                	$elementtype,
-                	(GETPOST('unique', 'alpha') ? 1 : 0),
-                	(GETPOST('required', 'alpha') ? 1 : 0),
-                	$default_value,
-                	$params,
-                	(GETPOST('alwayseditable', 'alpha') ? 1 : 0),
-                	(GETPOST('perms', 'alpha') ?GETPOST('perms', 'alpha') : ''),
-                	$visibility,
+				$result = $extrafields->addExtraField(
+					GETPOST('attrname', 'aZ09'),
+					GETPOST('label', 'alpha'),
+					$type,
+					GETPOST('pos', 'int'),
+					$extrasize,
+					$elementtype,
+					(GETPOST('unique', 'alpha') ? 1 : 0),
+					(GETPOST('required', 'alpha') ? 1 : 0),
+					$default_value,
+					$params,
+					(GETPOST('alwayseditable', 'alpha') ? 1 : 0),
+					(GETPOST('perms', 'alpha') ?GETPOST('perms', 'alpha') : ''),
+					$visibility,
 					GETPOST('help', 'alpha'),
-                    GETPOST('computed_value', 'alpha'),
-                	(GETPOST('entitycurrentorall', 'alpha') ? 0 : ''),
-                    GETPOST('langfile', 'alpha'),
-                    1,
-                    (GETPOST('totalizable', 'alpha') ? 1 : 0),
-                    GETPOST('printable', 'alpha')
-                );
-    			if ($result > 0)
-    			{
-    				setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
-    				header("Location: ".$_SERVER["PHP_SELF"]);
-    				exit;
-    			} else {
-                    $error++;
-    			    $mesg = $extrafields->error;
-                    setEventMessages($mesg, null, 'errors');
-    			}
-    		} else {
-                $error++;
-    		    $langs->load("errors");
-    			$mesg = $langs->trans("ErrorFieldCanNotContainSpecialNorUpperCharacters", $langs->transnoentities("AttributeCode"));
-    			setEventMessages($mesg, null, 'errors');
-    			$action = 'create';
-    		}
-	    } else {
-	    	setEventMessages($mesg, null, 'errors');
-	    }
+					GETPOST('computed_value', 'alpha'),
+					(GETPOST('entitycurrentorall', 'alpha') ? 0 : ''),
+					GETPOST('langfile', 'alpha'),
+					1,
+					(GETPOST('totalizable', 'alpha') ? 1 : 0),
+					GETPOST('printable', 'alpha')
+				);
+				if ($result > 0)
+				{
+					setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
+					header("Location: ".$_SERVER["PHP_SELF"]);
+					exit;
+				} else {
+					$error++;
+					$mesg = $extrafields->error;
+					setEventMessages($mesg, null, 'errors');
+				}
+			} else {
+				$error++;
+				$langs->load("errors");
+				$mesg = $langs->trans("ErrorFieldCanNotContainSpecialNorUpperCharacters", $langs->transnoentities("AttributeCode"));
+				setEventMessages($mesg, null, 'errors');
+				$action = 'create';
+			}
+		} else {
+			setEventMessages($mesg, null, 'errors');
+		}
 	}
 }
 
 // Rename field
 if ($action == 'update')
 {
-	if ($_POST["button"] != $langs->trans("Cancel"))
+	if (GETPOST("button") != $langs->trans("Cancel"))
 	{
-        // Check values
+		// Check values
 		if (!$type)
 		{
 			$error++;
@@ -220,163 +237,181 @@ if ($action == 'update')
 		}
 		if ($type == 'varchar' && $extrasize <= 0)
 		{
-		    $error++;
-		    $langs->load("errors");
-		    $mesg[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Size"));
-		    $action = 'edit';
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Size"));
+			$action = 'edit';
 		}
 		if ($type == 'varchar' && $extrasize > $maxsizestring)
-        {
-            $error++;
-            $langs->load("errors");
-            $mesg[] = $langs->trans("ErrorSizeTooLongForVarcharType", $maxsizestring);
-            $action = 'edit';
-        }
-        if ($type == 'int' && $extrasize > $maxsizeint)
-        {
-            $error++;
-            $langs->load("errors");
-            $mesg[] = $langs->trans("ErrorSizeTooLongForIntType", $maxsizeint);
-            $action = 'edit';
-        }
-        if ($type == 'select' && !$param)
-        {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[] = $langs->trans("ErrorNoValueForSelectType");
-        	$action = 'edit';
-        }
-        if ($type == 'sellist' && !$param)
-        {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[] = $langs->trans("ErrorNoValueForSelectListType");
-        	$action = 'edit';
-        }
-        if ($type == 'checkbox' && !$param)
-        {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[] = $langs->trans("ErrorNoValueForCheckBoxType");
-        	$action = 'edit';
-        }
-        if ($type == 'radio' && !$param)
-        {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[] = $langs->trans("ErrorNoValueForRadioType");
-        	$action = 'edit';
-        }
-        if ((($type == 'radio') || ($type == 'checkbox')) && $param)
-        {
-        	// Construct array for parameter (value of select list)
-        	$parameters = $param;
-        	$parameters_array = explode("\r\n", $parameters);
-        	foreach ($parameters_array as $param_ligne)
-        	{
-        		if (!empty($param_ligne)) {
-	        		if (preg_match_all('/,/', $param_ligne, $matches))
-	        		{
-	        			if (count($matches[0]) > 1) {
-	        				$error++;
-	        				$langs->load("errors");
-	        				$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
-	        				$action = 'edit';
-	        			}
-	        		} else {
-	        			$error++;
-	        			$langs->load("errors");
-	        			$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
-	        			$action = 'edit';
-	        		}
-        		}
-        	}
-        }
+		{
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorSizeTooLongForVarcharType", $maxsizestring);
+			$action = 'edit';
+		}
+		if ($type == 'int' && $extrasize > $maxsizeint)
+		{
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorSizeTooLongForIntType", $maxsizeint);
+			$action = 'edit';
+		}
+		if ($type == 'select' && !$param)
+		{
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorNoValueForSelectType");
+			$action = 'edit';
+		}
+		if ($type == 'sellist' && !$param)
+		{
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorNoValueForSelectListType");
+			$action = 'edit';
+		}
+		if ($type == 'checkbox' && !$param)
+		{
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorNoValueForCheckBoxType");
+			$action = 'edit';
+		}
+		if ($type == 'radio' && !$param)
+		{
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorNoValueForRadioType");
+			$action = 'edit';
+		}
+		if ((($type == 'radio') || ($type == 'checkbox')) && $param)
+		{
+			// Construct array for parameter (value of select list)
+			$parameters = $param;
+			$parameters_array = explode("\r\n", $parameters);
+			foreach ($parameters_array as $param_ligne)
+			{
+				if (!empty($param_ligne)) {
+					if (preg_match_all('/,/', $param_ligne, $matches))
+					{
+						if (count($matches[0]) > 1) {
+							$error++;
+							$langs->load("errors");
+							$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
+							$action = 'edit';
+						}
+					} else {
+						$error++;
+						$langs->load("errors");
+						$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
+						$action = 'edit';
+					}
+				}
+			}
+		}
 
-	    if (!$error)
-	    {
-            if (isset($_POST["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $_POST['attrname']))
-    		{
-    			$pos = GETPOST('pos', 'int');
-    			// Construct array for parameter (value of select list)
-    			$parameters = $param;
-    			$parameters_array = explode("\r\n", $parameters);
-    			//In sellist we have only one line and it can have come to do SQL expression
-    			if ($type == 'sellist') {
-    				foreach ($parameters_array as $param_ligne)
-    				{
-    					$params['options'] = array($parameters=>null);
-    				}
-    			} else {
-    				//Esle it's separated key/value and coma list
-    				foreach ($parameters_array as $param_ligne)
-    				{
-    					list($key, $value) = explode(',', $param_ligne);
-    					$params['options'][$key] = $value;
-    				}
-    			}
+		if (!$error) {
+			if (strlen(GETPOST('attrname', 'aZ09')) < 3 && empty($conf->global->MAIN_DISABLE_EXTRAFIELDS_CHECK_FOR_UPDATE)) {
+				$error++;
+				$langs->load("errors");
+				$mesg[] = $langs->trans("ErrorValueLength", $langs->transnoentitiesnoconv("AttributeCode"), 3);
+				$action = 'edit';
+			}
+		}
 
-    			// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
-    			$visibility = GETPOST('list', 'alpha');
-    			if ($type == 'separate') $visibility = 3;
+		// Check reserved keyword with more than 3 characters
+		if (!$error) {
+			if (in_array(GETPOST('attrname', 'aZ09'), array('and', 'keyword', 'table', 'index', 'integer', 'float', 'double', 'position')) && empty($conf->global->MAIN_DISABLE_EXTRAFIELDS_CHECK_FOR_UPDATE)) {
+				$error++;
+				$langs->load("errors");
+				$mesg[] = $langs->trans("ErrorReservedKeyword", GETPOST('attrname', 'aZ09'));
+				$action = 'edit';
+			}
+		}
 
-                $result = $extrafields->update(
-    				GETPOST('attrname', 'alpha'),
-    				GETPOST('label', 'alpha'),
-    				$type,
-    				$extrasize,
-    				$elementtype,
-    				(GETPOST('unique', 'alpha') ? 1 : 0),
-    				(GETPOST('required', 'alpha') ? 1 : 0),
-    				$pos,
-    				$params,
-    				(GETPOST('alwayseditable', 'alpha') ? 1 : 0),
-    				(GETPOST('perms', 'alpha') ?GETPOST('perms', 'alpha') : ''),
-                	$visibility,
+		if (!$error)
+		{
+			if (GETPOSTISSET("attrname") && preg_match("/^\w[a-zA-Z0-9-_]*$/", GETPOST('attrname', 'aZ09')) && !is_numeric(GETPOST('attrname', 'aZ09')))
+			{
+				$pos = GETPOST('pos', 'int');
+				// Construct array for parameter (value of select list)
+				$parameters = $param;
+				$parameters_array = explode("\r\n", $parameters);
+				//In sellist we have only one line and it can have come to do SQL expression
+				if ($type == 'sellist' || $type == 'chkbxlst') {
+					foreach ($parameters_array as $param_ligne)
+					{
+						$params['options'] = array($parameters=>null);
+					}
+				} else {
+					//Esle it's separated key/value and coma list
+					foreach ($parameters_array as $param_ligne)
+					{
+						list($key, $value) = explode(',', $param_ligne);
+						$params['options'][$key] = $value;
+					}
+				}
+
+				// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
+				$visibility = GETPOST('list', 'alpha');
+				if ($type == 'separate') $visibility = 3;
+
+				// Example: is_object($object) ? ($object->id < 10 ? round($object->id / 2, 2) : (2 * $user->id) * (int) substr($mysoc->zip, 1, 2)) : 'objnotdefined'
+				$computedvalue = GETPOST('computed_value', 'nohtml');
+
+				$result = $extrafields->update(
+					GETPOST('attrname', 'aZ09'),
+					GETPOST('label', 'alpha'),
+					$type,
+					$extrasize,
+					$elementtype,
+					(GETPOST('unique', 'alpha') ? 1 : 0),
+					(GETPOST('required', 'alpha') ? 1 : 0),
+					$pos,
+					$params,
+					(GETPOST('alwayseditable', 'alpha') ? 1 : 0),
+					(GETPOST('perms', 'alpha') ?GETPOST('perms', 'alpha') : ''),
+					$visibility,
 					GETPOST('help', 'alpha'),
-    			    GETPOST('default_value', 'alpha'),
-    				GETPOST('computed_value', 'alpha'),
-    				(GETPOST('entitycurrentorall', 'alpha') ? 0 : ''),
-                    GETPOST('langfile'),
-                    1,
-                    (GETPOST('totalizable', 'alpha') ? 1 : 0),
-                    GETPOST('printable', 'alpha')
-    			);
-    			if ($result > 0)
-    			{
-    				setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
-    				header("Location: ".$_SERVER["PHP_SELF"]);
-    				exit;
-    			} else {
-                    $error++;
-    			    $mesg = $extrafields->error;
-    			    setEventMessages($mesg, null, 'errors');
-    			}
-    		} else {
-    		    $error++;
-    			$langs->load("errors");
-    			$mesg = $langs->trans("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities("AttributeCode"));
-    			setEventMessages($mesg, null, 'errors');
-    		}
-	    } else {
-	    	setEventMessages($mesg, null, 'errors');
-	    }
+					GETPOST('default_value', 'alpha'),
+					$computedvalue,
+					(GETPOST('entitycurrentorall', 'alpha') ? 0 : ''),
+					GETPOST('langfile'),
+					GETPOST('enabled', 'alpha'),
+					(GETPOST('totalizable', 'alpha') ? 1 : 0),
+					GETPOST('printable', 'alpha')
+				);
+				if ($result > 0) {
+					setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
+					header("Location: ".$_SERVER["PHP_SELF"]);
+					exit;
+				} else {
+					$error++;
+					$mesg = $extrafields->error;
+					setEventMessages($mesg, null, 'errors');
+				}
+			} else {
+				$error++;
+				$langs->load("errors");
+				$mesg = $langs->trans("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities("AttributeCode"));
+				setEventMessages($mesg, null, 'errors');
+			}
+		} else {
+			setEventMessages($mesg, null, 'errors');
+		}
 	}
 }
 
 // Delete attribute
-if ($action == 'delete')
-{
-	if (isset($_GET["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $_GET["attrname"]))
-	{
-        $result = $extrafields->delete($_GET["attrname"], $elementtype);
-        if ($result >= 0)
-        {
-            header("Location: ".$_SERVER["PHP_SELF"]);
-            exit;
-        } else $mesg = $extrafields->error;
+if ($action == 'delete') {
+	if (GETPOSTISSET("attrname") && preg_match("/^\w[a-zA-Z0-9-_]*$/", GETPOST("attrname", 'aZ09'))) {
+		$result = $extrafields->delete(GETPOST("attrname", 'aZ09'), $elementtype);
+		if ($result >= 0) {
+			header("Location: ".$_SERVER["PHP_SELF"]);
+			exit;
+		} else $mesg = $extrafields->error;
 	} else {
-	    $error++;
+		$error++;
 		$langs->load("errors");
 		$mesg = $langs->trans("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities("AttributeCode"));
 	}
diff --git a/htdocs/core/actions_fetchobject.inc.php b/htdocs/core/actions_fetchobject.inc.php
index d4cdbb66a21..c881b335f18 100644
--- a/htdocs/core/actions_fetchobject.inc.php
+++ b/htdocs/core/actions_fetchobject.inc.php
@@ -34,20 +34,20 @@ if (($id > 0 || (!empty($ref) && !in_array($action, array('create', 'createtask'
 	{
 		$ret = $object->fetch($id, $ref);
 		if ($ret > 0)
-	    {
-	        $object->fetch_thirdparty();
-	        $id = $object->id;
-	    } else {
-	    	if (empty($object->error) && !count($object->errors))
-	    	{
-	    		if ($ret < 0)	// if $ret == 0, it means not found.
-	    		{
-	    			setEventMessages('Fetch on object (type '.get_class($object).') return an error without filling $object->error nor $object->errors', null, 'errors');
-	    		}
-	    	} else {
-	    		setEventMessages($object->error, $object->errors, 'errors');
-	    	}
-        	$action = '';
-	    }
+		{
+			$object->fetch_thirdparty();
+			$id = $object->id;
+		} else {
+			if (empty($object->error) && !count($object->errors))
+			{
+				if ($ret < 0)	// if $ret == 0, it means not found.
+				{
+					setEventMessages('Fetch on object (type '.get_class($object).') return an error without filling $object->error nor $object->errors', null, 'errors');
+				}
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+			$action = '';
+		}
 	}
 }
diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index 3caeeed6678..b0671bbf555 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -29,7 +29,7 @@
 // Submit file/link
 if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC))
 {
-    if (!empty($_FILES))
+	if (!empty($_FILES))
 	{
 		if (is_array($_FILES['userfile']['tmp_name'])) $userfiles = $_FILES['userfile']['tmp_name'];
 		else $userfiles = array($_FILES['userfile']['tmp_name']);
@@ -56,121 +56,121 @@ if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC))
 
 			if (!empty($upload_dirold) && !empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
 			{
-				$result = dol_add_file_process($upload_dirold, $allowoverwrite, 1, 'userfile', GETPOST('savingdocmask', 'alpha'), null, '', $generatethumbs);
+				$result = dol_add_file_process($upload_dirold, $allowoverwrite, 1, 'userfile', GETPOST('savingdocmask', 'alpha'), null, '', $generatethumbs, $object);
 			} elseif (!empty($upload_dir))
 			{
-				$result = dol_add_file_process($upload_dir, $allowoverwrite, 1, 'userfile', GETPOST('savingdocmask', 'alpha'), null, '', $generatethumbs);
+				$result = dol_add_file_process($upload_dir, $allowoverwrite, 1, 'userfile', GETPOST('savingdocmask', 'alpha'), null, '', $generatethumbs, $object);
 			}
 		}
 	}
 } elseif (GETPOST('linkit', 'restricthtml') && !empty($conf->global->MAIN_UPLOAD_DOC))
 {
-    $link = GETPOST('link', 'alpha');
-    if ($link)
-    {
-        if (substr($link, 0, 7) != 'http://' && substr($link, 0, 8) != 'https://' && substr($link, 0, 7) != 'file://') {
-            $link = 'http://'.$link;
-        }
-        dol_add_file_process($upload_dir, 0, 1, 'userfile', null, $link, '', 0);
-    }
+	$link = GETPOST('link', 'alpha');
+	if ($link)
+	{
+		if (substr($link, 0, 7) != 'http://' && substr($link, 0, 8) != 'https://' && substr($link, 0, 7) != 'file://') {
+			$link = 'http://'.$link;
+		}
+		dol_add_file_process($upload_dir, 0, 1, 'userfile', null, $link, '', 0);
+	}
 }
 
 
 // Delete file/link
 if ($action == 'confirm_deletefile' && $confirm == 'yes')
 {
-    $urlfile = GETPOST('urlfile', 'alpha', 0, null, null, 1); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
-    if (GETPOST('section', 'alpha')) {
-        // For a delete from the ECM module, upload_dir is ECM root dir and urlfile contains relative path from upload_dir
-        $file = $upload_dir.(preg_match('/\/$/', $upload_dir) ? '' : '/').$urlfile;
-    } else // For a delete from the file manager into another module, or from documents pages, upload_dir contains already path to file from module dir, so we clean path into urlfile.
+	$urlfile = GETPOST('urlfile', 'alpha', 0, null, null, 1); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
+	if (GETPOST('section', 'alpha')) {
+		// For a delete from the ECM module, upload_dir is ECM root dir and urlfile contains relative path from upload_dir
+		$file = $upload_dir.(preg_match('/\/$/', $upload_dir) ? '' : '/').$urlfile;
+	} else // For a delete from the file manager into another module, or from documents pages, upload_dir contains already path to file from module dir, so we clean path into urlfile.
 	{
-       	$urlfile = basename($urlfile);
-       	$file = $upload_dir.(preg_match('/\/$/', $upload_dir) ? '' : '/').$urlfile;
+	   	$urlfile = basename($urlfile);
+	   	$file = $upload_dir.(preg_match('/\/$/', $upload_dir) ? '' : '/').$urlfile;
 		if (!empty($upload_dirold)) $fileold = $upload_dirold."/".$urlfile;
 	}
-    $linkid = GETPOST('linkid', 'int');
+	$linkid = GETPOST('linkid', 'int');
 
-    if ($urlfile) {
-        // delete of a file
-	    $dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine
-        $dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette (if file is an image)
+	if ($urlfile) {
+		// delete of a file
+		$dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine
+		$dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette (if file is an image)
 
-        $ret = dol_delete_file($file, 0, 0, 0, (is_object($object) ? $object : null));
-        if (!empty($fileold)) dol_delete_file($fileold, 0, 0, 0, (is_object($object) ? $object : null)); // Delete file using old path
+		$ret = dol_delete_file($file, 0, 0, 0, (is_object($object) ? $object : null));
+		if (!empty($fileold)) dol_delete_file($fileold, 0, 0, 0, (is_object($object) ? $object : null)); // Delete file using old path
 
-        // Si elle existe, on efface la vignette
-        if (preg_match('/(\.jpg|\.jpeg|\.bmp|\.gif|\.png|\.tiff)$/i', $file, $regs))
-        {
-	        $photo_vignette = basename(preg_replace('/'.$regs[0].'/i', '', $file).'_small'.$regs[0]);
-	        if (file_exists(dol_osencode($dirthumb.$photo_vignette)))
-	        {
-		        dol_delete_file($dirthumb.$photo_vignette);
-	        }
+		// If it exists, remove thumb.
+		$regs = array();
+		if (preg_match('/(\.jpg|\.jpeg|\.bmp|\.gif|\.png|\.tiff)$/i', $file, $regs))
+		{
+			$photo_vignette = basename(preg_replace('/'.$regs[0].'/i', '', $file).'_small'.$regs[0]);
+			if (file_exists(dol_osencode($dirthumb.$photo_vignette)))
+			{
+				dol_delete_file($dirthumb.$photo_vignette);
+			}
 
-	        $photo_vignette = basename(preg_replace('/'.$regs[0].'/i', '', $file).'_mini'.$regs[0]);
-	        if (file_exists(dol_osencode($dirthumb.$photo_vignette)))
-	        {
-		        dol_delete_file($dirthumb.$photo_vignette);
-	        }
-        }
+			$photo_vignette = basename(preg_replace('/'.$regs[0].'/i', '', $file).'_mini'.$regs[0]);
+			if (file_exists(dol_osencode($dirthumb.$photo_vignette)))
+			{
+				dol_delete_file($dirthumb.$photo_vignette);
+			}
+		}
 
-        if ($ret) {
-            setEventMessages($langs->trans("FileWasRemoved", $urlfile), null, 'mesgs');
-        } else {
-            setEventMessages($langs->trans("ErrorFailToDeleteFile", $urlfile), null, 'errors');
-        }
-    } elseif ($linkid)	// delete of external link
-    {
-        require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-        $link = new Link($db);
-        $link->fetch($linkid);
-        $res = $link->delete($user);
+		if ($ret) {
+			setEventMessages($langs->trans("FileWasRemoved", $urlfile), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("ErrorFailToDeleteFile", $urlfile), null, 'errors');
+		}
+	} elseif ($linkid) {	// delete of external link
+		require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+		$link = new Link($db);
+		$link->fetch($linkid);
+		$res = $link->delete($user);
 
-        $langs->load('link');
-        if ($res > 0) {
-            setEventMessages($langs->trans("LinkRemoved", $link->label), null, 'mesgs');
-        } else {
-            if (count($link->errors)) {
-                setEventMessages('', $link->errors, 'errors');
-            } else {
-                setEventMessages($langs->trans("ErrorFailedToDeleteLink", $link->label), null, 'errors');
-            }
-        }
-    }
+		$langs->load('link');
+		if ($res > 0) {
+			setEventMessages($langs->trans("LinkRemoved", $link->label), null, 'mesgs');
+		} else {
+			if (count($link->errors)) {
+				setEventMessages('', $link->errors, 'errors');
+			} else {
+				setEventMessages($langs->trans("ErrorFailedToDeleteLink", $link->label), null, 'errors');
+			}
+		}
+	}
 
-    if (is_object($object) && $object->id > 0) {
-        if ($backtopage) {
-        	header('Location: '.$backtopage);
-            exit;
-        } else {
-        	$tmpurl = $_SERVER["PHP_SELF"].'?id='.$object->id.(GETPOST('section_dir', 'alpha') ? '&section_dir='.urlencode(GETPOST('section_dir', 'alpha')) : '').(!empty($withproject) ? '&withproject=1' : '');
-        	header('Location: '.$tmpurl);
-            exit;
-        }
-    }
+	if (is_object($object) && $object->id > 0) {
+		if ($backtopage) {
+			header('Location: '.$backtopage);
+			exit;
+		} else {
+			$tmpurl = $_SERVER["PHP_SELF"].'?id='.$object->id.(GETPOST('section_dir', 'alpha') ? '&section_dir='.urlencode(GETPOST('section_dir', 'alpha')) : '').(!empty($withproject) ? '&withproject=1' : '');
+			header('Location: '.$tmpurl);
+			exit;
+		}
+	}
 } elseif ($action == 'confirm_updateline' && GETPOST('save', 'alpha') && GETPOST('link', 'alpha'))
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    $langs->load('link');
-    $link = new Link($db);
-    $f = $link->fetch(GETPOST('linkid', 'int'));
-    if ($f)
-    {
-        $link->url = GETPOST('link', 'alpha');
-        if (substr($link->url, 0, 7) != 'http://' && substr($link->url, 0, 8) != 'https://' && substr($link->url, 0, 7) != 'file://')
-        {
-            $link->url = 'http://'.$link->url;
-        }
-        $link->label = GETPOST('label', 'alphanohtml');
-        $res = $link->update($user);
-        if (!$res)
-        {
-            setEventMessages($langs->trans("ErrorFailedToUpdateLink", $link->label), null, 'mesgs');
-        }
-    } else {
-        //error fetching
-    }
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$langs->load('link');
+	$link = new Link($db);
+	$f = $link->fetch(GETPOST('linkid', 'int'));
+	if ($f)
+	{
+		$link->url = GETPOST('link', 'alpha');
+		if (substr($link->url, 0, 7) != 'http://' && substr($link->url, 0, 8) != 'https://' && substr($link->url, 0, 7) != 'file://')
+		{
+			$link->url = 'http://'.$link->url;
+		}
+		$link->label = GETPOST('label', 'alphanohtml');
+		$res = $link->update($user);
+		if (!$res)
+		{
+			setEventMessages($langs->trans("ErrorFailedToUpdateLink", $link->label), null, 'mesgs');
+		}
+	} else {
+		//error fetching
+	}
 } elseif ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha'))
 {
 	// For documents pages, upload_dir contains already path to file from module dir, so we clean path into urlfile.
@@ -179,97 +179,101 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
 		$filenamefrom = dol_sanitizeFileName(GETPOST('renamefilefrom', 'alpha'), '_', 0); // Do not remove accents
 		$filenameto = dol_sanitizeFileName(GETPOST('renamefileto', 'alpha'), '_', 0); // Do not remove accents
 
-        if ($filenamefrom != $filenameto)
-        {
-	        // Security:
-	        // Disallow file with some extensions. We rename them.
-	        // Because if we put the documents directory into a directory inside web root (very bad), this allows to execute on demand arbitrary code.
-	        if (isAFileWithExecutableContent($filenameto) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
-	        {
-	        	// $upload_dir ends with a slash, so be must be sure the medias dir to compare to ends with slash too.
-	        	$publicmediasdirwithslash = $conf->medias->multidir_output[$conf->entity];
-	        	if (! preg_match('/\/$/', $publicmediasdirwithslash)) $publicmediasdirwithslash.='/';
+		// We apply dol_string_nohtmltag also to clean file names (this remove duplicate spaces) because
+		// this function is also applied when we upload and when we make try to download file (by the GETPOST(filename, 'alphanohtml') call).
+		$filenameto = dol_string_nohtmltag($filenameto);
 
-	        	if (strpos($upload_dir, $publicmediasdirwithslash) !== 0) {	// We never add .noexe on files into media directory
-		            $filenameto .= '.noexe';
-	        	}
-	        }
+		if ($filenamefrom != $filenameto)
+		{
+			// Security:
+			// Disallow file with some extensions. We rename them.
+			// Because if we put the documents directory into a directory inside web root (very bad), this allows to execute on demand arbitrary code.
+			if (isAFileWithExecutableContent($filenameto) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
+			{
+				// $upload_dir ends with a slash, so be must be sure the medias dir to compare to ends with slash too.
+				$publicmediasdirwithslash = $conf->medias->multidir_output[$conf->entity];
+				if (!preg_match('/\/$/', $publicmediasdirwithslash)) $publicmediasdirwithslash .= '/';
 
-	        if ($filenamefrom && $filenameto)
-	        {
-	            $srcpath = $upload_dir.'/'.$filenamefrom;
-	            $destpath = $upload_dir.'/'.$filenameto;
+				if (strpos($upload_dir, $publicmediasdirwithslash) !== 0) {	// We never add .noexe on files into media directory
+					$filenameto .= '.noexe';
+				}
+			}
 
-	            $reshook = $hookmanager->initHooks(array('actionlinkedfiles'));
-	            $parameters = array('filenamefrom' => $filenamefrom, 'filenameto' => $filenameto, 'upload_dir' => $upload_dir);
-	            $reshook = $hookmanager->executeHooks('renameUploadedFile', $parameters, $object);
+			if ($filenamefrom && $filenameto)
+			{
+				$srcpath = $upload_dir.'/'.$filenamefrom;
+				$destpath = $upload_dir.'/'.$filenameto;
 
-	            if (empty($reshook))
-	            {
-	            	if (preg_match('/^\./', $filenameto)) {
-	            		$langs->load("errors"); // lang must be loaded because we can't rely on loading during output, we need var substitution to be done now.
-	            		setEventMessages($langs->trans("ErrorFilenameCantStartWithDot", $filenameto), null, 'errors');
-	            	} elseif (!file_exists($destpath)) {
-	            		$result = dol_move($srcpath, $destpath);
-			            if ($result)
-			            {
-			            	// Define if we have to generate thumbs or not
-			            	$generatethumbs = 1;
-			            	// When we rename a file from the file manager in ecm, we must not regenerate thumbs (not a problem, we do pass here)
-			            	// When we rename a file from the website module, we must not regenerate thumbs (module = medias in such a case)
-			            	// but when we rename from a tab "Documents", we must regenerate thumbs
-			            	if (GETPOST('modulepart') == 'medias') $generatethumbs = 0;
+				$reshook = $hookmanager->initHooks(array('actionlinkedfiles'));
+				$parameters = array('filenamefrom' => $filenamefrom, 'filenameto' => $filenameto, 'upload_dir' => $upload_dir);
+				$reshook = $hookmanager->executeHooks('renameUploadedFile', $parameters, $object);
 
-			            	if ($generatethumbs)
-			            	{
-			            		if ($object->id)
-				            	{
-				                	$object->addThumbs($destpath);
-				            	}
+				if (empty($reshook))
+				{
+					if (preg_match('/^\./', $filenameto)) {
+						$langs->load("errors"); // lang must be loaded because we can't rely on loading during output, we need var substitution to be done now.
+						setEventMessages($langs->trans("ErrorFilenameCantStartWithDot", $filenameto), null, 'errors');
+					} elseif (!file_exists($destpath)) {
+						$result = dol_move($srcpath, $destpath);
+						if ($result)
+						{
+							// Define if we have to generate thumbs or not
+							$generatethumbs = 1;
+							// When we rename a file from the file manager in ecm, we must not regenerate thumbs (not a problem, we do pass here)
+							// When we rename a file from the website module, we must not regenerate thumbs (module = medias in such a case)
+							// but when we rename from a tab "Documents", we must regenerate thumbs
+							if (GETPOST('modulepart') == 'medias') $generatethumbs = 0;
 
-				                // TODO Add revert function of addThumbs to remove thumbs with old name
-				                //$object->delThumbs($srcpath);
-			            	}
+							if ($generatethumbs)
+							{
+								if ($object->id)
+								{
+									$object->addThumbs($destpath);
+								}
 
-			                setEventMessages($langs->trans("FileRenamed"), null);
-			            } else {
-			                $langs->load("errors"); // lang must be loaded because we can't rely on loading during output, we need var substitution to be done now.
-			                setEventMessages($langs->trans("ErrorFailToRenameFile", $filenamefrom, $filenameto), null, 'errors');
-			            }
-	            	} else {
-	            		$langs->load("errors"); // lang must be loaded because we can't rely on loading during output, we need var substitution to be done now.
-	            		setEventMessages($langs->trans("ErrorDestinationAlreadyExists", $filenameto), null, 'errors');
-	            	}
-	            }
-	        }
-        }
-    }
+								// TODO Add revert function of addThumbs to remove thumbs with old name
+								//$object->delThumbs($srcpath);
+							}
 
-    // Update properties in ECM table
-    if (GETPOST('ecmfileid', 'int') > 0)
-    {
-    	$shareenabled = GETPOST('shareenabled', 'alpha');
+							setEventMessages($langs->trans("FileRenamed"), null);
+						} else {
+							$langs->load("errors"); // lang must be loaded because we can't rely on loading during output, we need var substitution to be done now.
+							setEventMessages($langs->trans("ErrorFailToRenameFile", $filenamefrom, $filenameto), null, 'errors');
+						}
+					} else {
+						$langs->load("errors"); // lang must be loaded because we can't rely on loading during output, we need var substitution to be done now.
+						setEventMessages($langs->trans("ErrorDestinationAlreadyExists", $filenameto), null, 'errors');
+					}
+				}
+			}
+		}
+	}
 
-    	include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-	    $ecmfile = new EcmFiles($db);
-	    $result = $ecmfile->fetch(GETPOST('ecmfileid', 'int'));
-	    if ($result > 0)
-	    {
-	    	if ($shareenabled)
-		    {
-		    	if (empty($ecmfile->share))
-		    	{
-		    		require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-		    		$ecmfile->share = getRandomPassword(true);
-		    	}
-		    } else {
-		    	$ecmfile->share = '';
-		    }
-		    $result = $ecmfile->update($user);
-		    if ($result < 0)
-		    {
-		    	setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-		    }
-	    }
-    }
+	// Update properties in ECM table
+	if (GETPOST('ecmfileid', 'int') > 0)
+	{
+		$shareenabled = GETPOST('shareenabled', 'alpha');
+
+		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+		$ecmfile = new EcmFiles($db);
+		$result = $ecmfile->fetch(GETPOST('ecmfileid', 'int'));
+		if ($result > 0)
+		{
+			if ($shareenabled)
+			{
+				if (empty($ecmfile->share))
+				{
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+					$ecmfile->share = getRandomPassword(true);
+				}
+			} else {
+				$ecmfile->share = '';
+			}
+			$result = $ecmfile->update($user);
+			if ($result < 0)
+			{
+				setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+			}
+		}
+	}
 }
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index c2f0a314445..356eb36a04b 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -114,11 +114,11 @@ if (!$error && $massaction == 'confirm_presend')
 					}
 				}
 
-                $listofobjectthirdparties[$thirdpartyid] = $thirdpartyid;
-                $listofobjectref[$thirdpartyid][$toselectid] = $objecttmp;
-            }
-        }
-    }
+				$listofobjectthirdparties[$thirdpartyid] = $thirdpartyid;
+				$listofobjectref[$thirdpartyid][$toselectid] = $objecttmp;
+			}
+		}
+	}
 
 	// Check mandatory parameters
 	if (GETPOST('fromtype', 'alpha') === 'user' && empty($user->email))
@@ -261,9 +261,9 @@ if (!$error && $massaction == 'confirm_presend')
 						$sendto = $fuser->email;
 					} elseif ($objectobj->element == 'holiday')
 					{
-					    $fuser = new User($db);
-					    $fuser->fetch($objectobj->fk_user);
-					    $sendto = $fuser->email;
+						$fuser = new User($db);
+						$fuser->fetch($objectobj->fk_user);
+						$sendto = $fuser->email;
 					} elseif ($objectobj->element == 'facture' && !empty($listofobjectcontacts[$objectid]))
 					{
 						$emails_to_sends = array();
@@ -396,7 +396,7 @@ if (!$error && $massaction == 'confirm_presend')
 					$looparray = $listofqualifiedobj;
 					foreach ($looparray as $key => $objecttmp)
 					{
-					    $looparray[$key]->thirdparty = $thirdparty; // Force thirdparty on object
+						$looparray[$key]->thirdparty = $thirdparty; // Force thirdparty on object
 					}
 				} else {
 					$objectforloop = new $objectclass($db);
@@ -404,9 +404,9 @@ if (!$error && $massaction == 'confirm_presend')
 					$looparray[0] = $objectforloop;
 				}
 				//var_dump($looparray);exit;
-                dol_syslog("We have set an array of ".count($looparray)." emails to send. oneemailperrecipient=".$oneemailperrecipient);
-                //var_dump($oneemailperrecipient); var_dump($listofqualifiedobj); var_dump($listofqualifiedref);
-                foreach ($looparray as $objectid => $objecttmp)		// $objecttmp is a real object or an empty object if we choose to send one email per thirdparty instead of one per object
+				dol_syslog("We have set an array of ".count($looparray)." emails to send. oneemailperrecipient=".$oneemailperrecipient);
+				//var_dump($oneemailperrecipient); var_dump($listofqualifiedobj); var_dump($listofqualifiedref);
+				foreach ($looparray as $objectid => $objecttmp)		// $objecttmp is a real object or an empty object if we choose to send one email per thirdparty instead of one per object
 				{
 					// Make substitution in email content
 					if (!empty($conf->projet->enabled) && method_exists($objecttmp, 'fetch_projet') && is_null($objecttmp->project))
@@ -430,10 +430,10 @@ if (!$error && $massaction == 'confirm_presend')
 
 					complete_substitutions_array($substitutionarray, $langs, $objecttmp, $parameters);
 
-                    $subjectreplaced = make_substitutions($subject, $substitutionarray);
-                    $messagereplaced = make_substitutions($message, $substitutionarray);
+					$subjectreplaced = make_substitutions($subject, $substitutionarray);
+					$messagereplaced = make_substitutions($message, $substitutionarray);
 
-                    $attachedfiles = array('paths'=>array(), 'names'=>array(), 'mimes'=>array());
+					$attachedfiles = array('paths'=>array(), 'names'=>array(), 'mimes'=>array());
 					if ($oneemailperrecipient)
 					{
 						// if "one email per recipient" is check we must collate $attachedfiles by thirdparty
@@ -461,20 +461,20 @@ if (!$error && $massaction == 'confirm_presend')
 					// Define the trackid when emails sent from the mass action
 					if ($oneemailperrecipient)
 					{
-					    $trackid = 'thi'.$thirdparty->id;
-					    if ($objecttmp->element == 'expensereport') $trackid = 'use'.$thirdparty->id;
-					    if ($objecttmp->element == 'holiday') $trackid = 'use'.$thirdparty->id;
+						$trackid = 'thi'.$thirdparty->id;
+						if ($objecttmp->element == 'expensereport') $trackid = 'use'.$thirdparty->id;
+						if ($objecttmp->element == 'holiday') $trackid = 'use'.$thirdparty->id;
 					} else {
-					    $trackid = strtolower(get_class($objecttmp));
-					    if (get_class($objecttmp) == 'Contrat')  $trackid = 'con';
-					    if (get_class($objecttmp) == 'Propal')   $trackid = 'pro';
-					    if (get_class($objecttmp) == 'Commande') $trackid = 'ord';
-					    if (get_class($objecttmp) == 'Facture')  $trackid = 'inv';
-					    if (get_class($objecttmp) == 'Supplier_Proposal')   $trackid = 'spr';
-					    if (get_class($objecttmp) == 'CommandeFournisseur') $trackid = 'sor';
-					    if (get_class($objecttmp) == 'FactureFournisseur')  $trackid = 'sin';
+						$trackid = strtolower(get_class($objecttmp));
+						if (get_class($objecttmp) == 'Contrat')  $trackid = 'con';
+						if (get_class($objecttmp) == 'Propal')   $trackid = 'pro';
+						if (get_class($objecttmp) == 'Commande') $trackid = 'ord';
+						if (get_class($objecttmp) == 'Facture')  $trackid = 'inv';
+						if (get_class($objecttmp) == 'Supplier_Proposal')   $trackid = 'spr';
+						if (get_class($objecttmp) == 'CommandeFournisseur') $trackid = 'sor';
+						if (get_class($objecttmp) == 'FactureFournisseur')  $trackid = 'sin';
 
-					    $trackid .= $objecttmp->id;
+						$trackid .= $objecttmp->id;
 					}
 					//var_dump($filepath);
 					//var_dump($trackid);exit;
@@ -483,8 +483,8 @@ if (!$error && $massaction == 'confirm_presend')
 					if (empty($sendcontext)) $sendcontext = 'standard';
 
 					// Send mail (substitutionarray must be done just before this)
-                    require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-                    $mailfile = new CMailFile($subjectreplaced, $sendto, $from, $messagereplaced, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1, '', '', $trackid, '', $sendcontext);
+					require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+					$mailfile = new CMailFile($subjectreplaced, $sendto, $from, $messagereplaced, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1, '', '', $trackid, '', $sendcontext);
 					if ($mailfile->error)
 					{
 						$resaction .= '<div class="error">'.$mailfile->error.'</div>';
@@ -497,11 +497,11 @@ if (!$error && $massaction == 'confirm_presend')
 							$error = 0;
 
 							// Insert logs into agenda
-                            foreach ($listofqualifiedobj as $objid2 => $objectobj2)
+							foreach ($listofqualifiedobj as $objid2 => $objectobj2)
 							{
-                                if ((!$oneemailperrecipient) && $objid2 != $objectid) continue; // We discard this pass to avoid duplicate with other pass in looparray at higher level
+								if ((!$oneemailperrecipient) && $objid2 != $objectid) continue; // We discard this pass to avoid duplicate with other pass in looparray at higher level
 
-                                dol_syslog("Try to insert email event into agenda for objid=".$objid2." => objectobj=".get_class($objectobj2));
+								dol_syslog("Try to insert email event into agenda for objid=".$objid2." => objectobj=".get_class($objectobj2));
 
 								/*if ($objectclass == 'Propale') $actiontypecode='AC_PROP';
 	                            if ($objectclass == 'Commande') $actiontypecode='AC_COM';
@@ -514,18 +514,18 @@ if (!$error && $massaction == 'confirm_presend')
 								if ($message)
 								{
 									if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
-                                    $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subjectreplaced);
+									$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subjectreplaced);
 									$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
-                                    $actionmsg = dol_concatdesc($actionmsg, $messagereplaced);
+									$actionmsg = dol_concatdesc($actionmsg, $messagereplaced);
 								}
 								$actionmsg2 = '';
 
-                                // Initialisation donnees
-                                $objectobj2->sendtoid = (empty($contactidtosend) ? 0 : $contactidtosend);
-                                $objectobj2->actionmsg = $actionmsg; // Long text
-                                $objectobj2->actionmsg2		= $actionmsg2; // Short text
-                                $objectobj2->fk_element		= $objid2;
-                                $objectobj2->elementtype	= $objectobj2->element;
+								// Initialisation donnees
+								$objectobj2->sendtoid = (empty($contactidtosend) ? 0 : $contactidtosend);
+								$objectobj2->actionmsg = $actionmsg; // Long text
+								$objectobj2->actionmsg2		= $actionmsg2; // Short text
+								$objectobj2->fk_element		= $objid2;
+								$objectobj2->elementtype	= $objectobj2->element;
 
 								$triggername = strtoupper(get_class($objectobj2)).'_SENTBYMAIL';
 								if ($triggername == 'SOCIETE_SENTBYMAIL')    $triggername = 'COMPANY_SENTBYMAIL';
@@ -619,13 +619,13 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 			$objecttmp->cond_reglement_id	= $cmd->cond_reglement_id;
 			$objecttmp->mode_reglement_id	= $cmd->mode_reglement_id;
 			$objecttmp->fk_project = $cmd->fk_project;
-            $objecttmp->multicurrency_code = $cmd->multicurrency_code;
-            if (empty($createbills_onebythird)) $objecttmp->ref_client = $cmd->ref_client;
+			$objecttmp->multicurrency_code = $cmd->multicurrency_code;
+			if (empty($createbills_onebythird)) $objecttmp->ref_client = $cmd->ref_client;
 
-            $datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-            if (empty($datefacture))
+			$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+			if (empty($datefacture))
 			{
-			    $datefacture = dol_now();
+				$datefacture = dol_now();
 			}
 
 			$objecttmp->date = $datefacture;
@@ -676,7 +676,7 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 					// If we build one invoice for several order, we must put the invoice of order on the line
 					if (!empty($createbills_onebythird))
 					{
-					    $desc = dol_concatdesc($desc, $langs->trans("Order").' '.$cmd->ref.' - '.dol_print_date($cmd->date, 'day'));
+						$desc = dol_concatdesc($desc, $langs->trans("Order").' '.$cmd->ref.' - '.dol_print_date($cmd->date, 'day'));
 					}
 
 					if ($lines[$i]->subprice < 0)
@@ -807,7 +807,7 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 
 			// Call action to build doc
 			$savobject = $object;
-      			$object = $objecttmp;
+	  			$object = $objecttmp;
 			include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 			$object = $savobject;
 		}
@@ -818,7 +818,7 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 	if (!$error)
 	{
 		$db->commit();
-        setEventMessages($langs->trans('BillCreated', $nb_bills_created), null, 'mesgs');
+		setEventMessages($langs->trans('BillCreated', $nb_bills_created), null, 'mesgs');
 
 		// Make a redirect to avoid to bill twice if we make a refresh or back
 		$param = '';
@@ -1063,7 +1063,7 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
 			$langs->load("exports");
 			setEventMessages($langs->trans('FileSuccessfullyBuilt', $filename.'_'.dol_print_date($now, 'dayhourlog')), null, 'mesgs');
 		} else {
-            setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
+			setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
 		}
 	}
 }
@@ -1143,34 +1143,34 @@ if (!$error && $massaction == 'validate' && $permissiontoadd)
 
 // Closed records
 if (!$error && $massaction == 'closed' && $objectclass == "Propal" && $permissiontoclose) {
-    $db->begin();
+	$db->begin();
 
-    $objecttmp = new $objectclass($db);
-    $nbok = 0;
-    foreach ($toselect as $toselectid) {
-        $result = $objecttmp->fetch($toselectid);
-        if ($result > 0) {
-            $result = $objecttmp->cloture($user, 3);
-            if ($result <= 0) {
-                setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-                $error++;
-                break;
-            } else $nbok++;
-        } else {
-            setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-            $error++;
-            break;
-        }
-    }
+	$objecttmp = new $objectclass($db);
+	$nbok = 0;
+	foreach ($toselect as $toselectid) {
+		$result = $objecttmp->fetch($toselectid);
+		if ($result > 0) {
+			$result = $objecttmp->cloture($user, 3);
+			if ($result <= 0) {
+				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+				$error++;
+				break;
+			} else $nbok++;
+		} else {
+			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+			$error++;
+			break;
+		}
+	}
 
-    if (!$error) {
-        if ($nbok > 1)
-            setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-        else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-        $db->commit();
-    } else {
-        $db->rollback();
-    }
+	if (!$error) {
+		if ($nbok > 1)
+			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+		else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+		$db->commit();
+	} else {
+		$db->rollback();
+	}
 }
 
 //var_dump($_POST);var_dump($massaction);exit;
@@ -1213,9 +1213,9 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 
 			if ($result <= 0)
 			{
-			    setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-			    $error++;
-			    break;
+				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+				$error++;
+				break;
 			} else $nbok++;
 		} else {
 			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
@@ -1239,56 +1239,56 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 // @todo : propose model selection
 if (!$error && $massaction == 'generate_doc' && $permissiontoread)
 {
-    $db->begin();
+	$db->begin();
 
-    $objecttmp = new $objectclass($db);
-    $nbok = 0;
-    foreach ($toselect as $toselectid)
-    {
-        $result = $objecttmp->fetch($toselectid);
-        if ($result > 0)
-        {
-            $outputlangs = $langs;
-            $newlang = '';
+	$objecttmp = new $objectclass($db);
+	$nbok = 0;
+	foreach ($toselect as $toselectid)
+	{
+		$result = $objecttmp->fetch($toselectid);
+		if ($result > 0)
+		{
+			$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) && isset($objecttmp->thirdparty->default_lang)) $newlang = $objecttmp->thirdparty->default_lang; // for proposal, order, invoice, ...
-            if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($objecttmp->default_lang)) $newlang = $objecttmp->default_lang; // for thirdparty
-            if (!empty($newlang))
-            {
-                $outputlangs = new Translate("", $conf);
-                $outputlangs->setDefaultLang($newlang);
-            }
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($objecttmp->thirdparty->default_lang)) $newlang = $objecttmp->thirdparty->default_lang; // for proposal, order, invoice, ...
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($objecttmp->default_lang)) $newlang = $objecttmp->default_lang; // for thirdparty
+			if (!empty($newlang))
+			{
+				$outputlangs = new Translate("", $conf);
+				$outputlangs->setDefaultLang($newlang);
+			}
 
-            // To be sure vars is defined
-            if (empty($hidedetails)) $hidedetails = 0;
-            if (empty($hidedesc)) $hidedesc = 0;
-            if (empty($hideref)) $hideref = 0;
-            if (empty($moreparams)) $moreparams = null;
+			// To be sure vars is defined
+			if (empty($hidedetails)) $hidedetails = 0;
+			if (empty($hidedesc)) $hidedesc = 0;
+			if (empty($hideref)) $hideref = 0;
+			if (empty($moreparams)) $moreparams = null;
 
-            $result = $objecttmp->generateDocument($objecttmp->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+			$result = $objecttmp->generateDocument($objecttmp->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 
-            if ($result <= 0)
-            {
-                setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-                $error++;
-                break;
-            } else $nbok++;
-        } else {
-            setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-            $error++;
-            break;
-        }
-    }
+			if ($result <= 0)
+			{
+				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+				$error++;
+				break;
+			} else $nbok++;
+		} else {
+			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+			$error++;
+			break;
+		}
+	}
 
-    if (!$error)
-    {
-        if ($nbok > 1) setEventMessages($langs->trans("RecordsGenerated", $nbok), null, 'mesgs');
-        else setEventMessages($langs->trans("RecordGenerated", $nbok), null, 'mesgs');
-        $db->commit();
-    } else {
-        $db->rollback();
-    }
+	if (!$error)
+	{
+		if ($nbok > 1) setEventMessages($langs->trans("RecordsGenerated", $nbok), null, 'mesgs');
+		else setEventMessages($langs->trans("RecordGenerated", $nbok), null, 'mesgs');
+		$db->commit();
+	} else {
+		$db->rollback();
+	}
 }
 
 $parameters['toselect'] = $toselect;
diff --git a/htdocs/core/actions_printing.inc.php b/htdocs/core/actions_printing.inc.php
index e88fc937e38..3838e6963ab 100644
--- a/htdocs/core/actions_printing.inc.php
+++ b/htdocs/core/actions_printing.inc.php
@@ -33,18 +33,24 @@ if ($action == 'print_file' && $user->rights->printing->read) {
 	require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/modules_printing.php';
 	$objectprint = new PrintingDriver($db);
 	$list = $objectprint->listDrivers($db, 10);
+	$dirmodels = array_merge(array('/core/modules/printing/'), (array) $conf->modules_parts['printing']);
 	if (!empty($list)) {
 		$errorprint = 0;
 		$printerfound = 0;
 		foreach ($list as $driver) {
-			require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php';
-			$langs->load($driver);
+			foreach ($dirmodels as $dir) {
+				if (file_exists(dol_buildpath($dir, 0).$driver.'.modules.php')) {
+					$classfile = dol_buildpath($dir, 0).$driver.'.modules.php';
+					break;
+				}
+			}
+			require_once $classfile;
 			$classname = 'printing_'.$driver;
 			$printer = new $classname($db);
+			$langs->load($printer::LANGFILE);
 			//print '<pre>'.print_r($printer, true).'</pre>';
 
-			if (!empty($conf->global->{$printer->active}))
-			{
+			if (!empty($conf->global->{$printer->active})) {
 				$printerfound++;
 
 				$subdir = '';
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index 5be25002079..0be919de0dd 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -321,7 +321,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 
 			if ($action == 'send' || $action == 'relance')
 			{
-				$actionmsg2 = $langs->transnoentities('MailSentBy').' '.CMailFile::getValidAddress($from, 4, 0, 1).' '.$langs->transnoentities('To').' '.CMailFile::getValidAddress($sendto, 4, 0, 1);
+				$actionmsg2 = $langs->transnoentities('MailSentBy').' '.CMailFile::getValidAddress($from, 4, 0, 1).' '.$langs->transnoentities('at').' '.CMailFile::getValidAddress($sendto, 4, 0, 1);
 				if ($message)
 				{
 					$actionmsg = $langs->transnoentities('MailFrom').': '.dol_escape_htmltag($from);
@@ -473,12 +473,16 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 				} else {
 					$langs->load("other");
 					$mesg = '<div class="error">';
-					if ($mailfile->error)
-					{
+					if ($mailfile->error) {
 						$mesg .= $langs->transnoentities('ErrorFailedToSendMail', dol_escape_htmltag($from), dol_escape_htmltag($sendto));
 						$mesg .= '<br>'.$mailfile->error;
 					} else {
-						$mesg .= 'No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
+						$mesg .= $langs->transnoentities('ErrorFailedToSendMail', dol_escape_htmltag($from), dol_escape_htmltag($sendto));
+						if (!empty($conf->global->MAIN_DISABLE_ALL_MAILS)) {
+							$mesg .= '<br>Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
+						} else {
+							$mesg .= '<br>Unkown Error, please refers to your administrator';
+						}
 					}
 					$mesg .= '</div>';
 
diff --git a/htdocs/core/actions_setmoduleoptions.inc.php b/htdocs/core/actions_setmoduleoptions.inc.php
index 05be4a31d18..24220f79f8c 100644
--- a/htdocs/core/actions_setmoduleoptions.inc.php
+++ b/htdocs/core/actions_setmoduleoptions.inc.php
@@ -38,11 +38,11 @@ if ($action == 'update' && is_array($arrayofparameters))
 		if (GETPOSTISSET($key))
 		{
 			$result = dolibarr_set_const($db, $key, GETPOST($key, 'alpha'), 'chaine', 0, '', $conf->entity);
-		    if ($result < 0)
-		    {
-			    $ok = false;
-			    break;
-		    }
+			if ($result < 0)
+			{
+				$ok = false;
+				break;
+			}
 		}
 	}
 
@@ -59,58 +59,58 @@ if ($action == 'update' && is_array($arrayofparameters))
 // Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
 if ($action == 'setModuleOptions')
 {
-    $db->begin();
+	$db->begin();
 
-    // Process common param fields
-    if (is_array($_POST))
-    {
-        foreach ($_POST as $key => $val)
-        {
-        	$reg = array();
-            if (preg_match('/^param(\d*)$/', $key, $reg))    // Works for POST['param'], POST['param1'], POST['param2'], ...
-            {
-                $param = GETPOST("param".$reg[1], 'alpha');
-                $value = GETPOST("value".$reg[1], 'alpha');
-                if ($param)
-                {
-                    $res = dolibarr_set_const($db, $param, $value, 'chaine', 0, '', $conf->entity);
-                    if (!$res > 0) $error++;
-                }
-            }
-        }
-    }
+	// Process common param fields
+	if (is_array($_POST))
+	{
+		foreach ($_POST as $key => $val)
+		{
+			$reg = array();
+			if (preg_match('/^param(\d*)$/', $key, $reg))    // Works for POST['param'], POST['param1'], POST['param2'], ...
+			{
+				$param = GETPOST("param".$reg[1], 'alpha');
+				$value = GETPOST("value".$reg[1], 'alpha');
+				if ($param)
+				{
+					$res = dolibarr_set_const($db, $param, $value, 'chaine', 0, '', $conf->entity);
+					if (!$res > 0) $error++;
+				}
+			}
+		}
+	}
 
-    // Process upload fields
-    if (GETPOST('upload', 'alpha') && GETPOST('keyforuploaddir', 'aZ09'))
-    {
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-        $keyforuploaddir = GETPOST('keyforuploaddir', 'aZ09');
-        $listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->$keyforuploaddir)));
-        foreach ($listofdir as $key=>$tmpdir)
-        {
-            $tmpdir = trim($tmpdir);
-            $tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
-            if (!$tmpdir) {
-                unset($listofdir[$key]); continue;
-            }
-            if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-            else {
-                $upload_dir = $tmpdir;
-            }
-        }
-        if ($upload_dir)
-        {
-            $result = dol_add_file_process($upload_dir, 0, 1, 'uploadfile', '');
-            if ($result <= 0) $error++;
-        }
-    }
+	// Process upload fields
+	if (GETPOST('upload', 'alpha') && GETPOST('keyforuploaddir', 'aZ09'))
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		$keyforuploaddir = GETPOST('keyforuploaddir', 'aZ09');
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->$keyforuploaddir)));
+		foreach ($listofdir as $key=>$tmpdir)
+		{
+			$tmpdir = trim($tmpdir);
+			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
+			if (!$tmpdir) {
+				unset($listofdir[$key]); continue;
+			}
+			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			else {
+				$upload_dir = $tmpdir;
+			}
+		}
+		if ($upload_dir)
+		{
+			$result = dol_add_file_process($upload_dir, 1, 1, 'uploadfile', '');
+			if ($result <= 0) $error++;
+		}
+	}
 
-    if (!$error)
-    {
-        $db->commit();
-        if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        $db->rollback();
-        if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
-    }
+	if (!$error)
+	{
+		$db->commit();
+		if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		$db->rollback();
+		if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
+	}
 }
diff --git a/htdocs/core/actions_setnotes.inc.php b/htdocs/core/actions_setnotes.inc.php
index 61db9b9fc55..b9dd4194268 100644
--- a/htdocs/core/actions_setnotes.inc.php
+++ b/htdocs/core/actions_setnotes.inc.php
@@ -33,7 +33,7 @@ if ($action == 'setnote_public' && !empty($permissionnote) && !GETPOST('cancel',
 	if (empty($action) || !is_object($object) || empty($id)) dol_print_error('', 'Include of actions_setnotes.inc.php was done but required variable was not set before');
 	if (empty($object->id)) $object->fetch($id); // Fetch may not be already done
 
-	$result_update = $object->update_note(dol_html_entity_decode(GETPOST('note_public', 'restricthtml'), ENT_QUOTES, 'UTF-8', 1), '_public');
+	$result_update = $object->update_note(dol_html_entity_decode(GETPOST('note_public', 'restricthtml'), ENT_QUOTES | ENT_HTML5, 'UTF-8', 1), '_public');
 
 	if ($result_update < 0) setEventMessages($object->error, $object->errors, 'errors');
 	elseif (in_array($object->table_element, array('supplier_proposal', 'propal', 'commande_fournisseur', 'commande', 'facture_fourn', 'facture')))
@@ -63,6 +63,6 @@ if ($action == 'setnote_public' && !empty($permissionnote) && !GETPOST('cancel',
 	// Set public note
 	if (empty($action) || !is_object($object) || empty($id)) dol_print_error('', 'Include of actions_setnotes.inc.php was done but required variable was not set before');
 	if (empty($object->id)) $object->fetch($id); // Fetch may not be already done
-	$result = $object->update_note(dol_html_entity_decode(GETPOST('note_private', 'restricthtml'), ENT_QUOTES), '_private');
+	$result = $object->update_note(dol_html_entity_decode(GETPOST('note_private', 'restricthtml'), ENT_QUOTES | ENT_HTML5), '_private');
 	if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 }
diff --git a/htdocs/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php
index 620643da8f2..e6fd1e000cb 100644
--- a/htdocs/core/ajax/ajaxdirtree.php
+++ b/htdocs/core/ajax/ajaxdirtree.php
@@ -83,10 +83,10 @@ if ($modulepart == 'ecm')
 // On interdit les remontees de repertoire ainsi que les pipe dans les noms de fichiers.
 if (preg_match('/\.\./', $fullpathselecteddir) || preg_match('/[<>|]/', $fullpathselecteddir))
 {
-    dol_syslog("Refused to deliver file ".$original_file);
-    // Do no show plain path in shown error message
-    dol_print_error(0, $langs->trans("ErrorFileNameInvalid", GETPOST("file")));
-    exit;
+	dol_syslog("Refused to deliver file ".$original_file);
+	// Do no show plain path in shown error message
+	dol_print_error(0, $langs->trans("ErrorFileNameInvalid", GETPOST("file")));
+	exit;
 }
 
 // Check permissions
@@ -120,11 +120,11 @@ if (empty($sqltree)) $sqltree = $ecmdirstatic->get_full_arbo(0);
 $current_ecmdir_id = -1;
 foreach ($sqltree as $keycursor => $val)
 {
-    //print $val['fullrelativename']." == ".$selecteddir;
-    if ($val['fullrelativename'] == $selecteddir)
-    {
-        $current_ecmdir_id = $keycursor;
-    }
+	//print $val['fullrelativename']." == ".$selecteddir;
+	if ($val['fullrelativename'] == $selecteddir)
+	{
+		$current_ecmdir_id = $keycursor;
+	}
 }
 
 if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))
diff --git a/htdocs/core/ajax/box.php b/htdocs/core/ajax/box.php
index 2b03eb858e1..cc27ca11844 100644
--- a/htdocs/core/ajax/box.php
+++ b/htdocs/core/ajax/box.php
@@ -58,7 +58,7 @@ if ($boxid > 0 && $zone != '' && $userid > 0)
 	$nbboxonright = substr_count($tmp[1], ',');
 	print $nbboxonleft.'-'.$nbboxonright;
 	if ($nbboxonleft > $nbboxonright) $boxorder = preg_replace('/B:/', 'B:'.$boxid.',', $boxorder); // Insert id of new box into list
-    else $boxorder = preg_replace('/^A:/', 'A:'.$boxid.',', $boxorder); // Insert id of new box into list
+	else $boxorder = preg_replace('/^A:/', 'A:'.$boxid.',', $boxorder); // Insert id of new box into list
 }
 
 // Registering the location of boxes after a move
@@ -70,10 +70,10 @@ if ($boxorder && $zone != '' && $userid > 0)
 	$result = InfoBox::saveboxorder($db, $zone, $boxorder, $userid);
 	if ($result > 0)
 	{
-	    $langs->load("boxes");
-	    if (!GETPOST('closing'))
-	    {
-	        setEventMessages($langs->trans("BoxAdded"), null);
-	    }
+		$langs->load("boxes");
+		if (!GETPOST('closing'))
+		{
+			setEventMessages($langs->trans("BoxAdded"), null);
+		}
 	}
 }
diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php
index 01cb85008bd..a6134b05bdc 100644
--- a/htdocs/core/ajax/check_notifications.php
+++ b/htdocs/core/ajax/check_notifications.php
@@ -18,7 +18,7 @@
  */
 
 if (!defined('NOCSRFCHECK')) define('NOCSRFCHECK', '1');
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');		// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
 if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
 if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
 if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
@@ -47,7 +47,7 @@ if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
 require '../../main.inc.php';
 
 //$time = (int) GETPOST('time', 'int'); // Use the time parameter that is always increased by time_update, even if call is late
-$time=dol_now();
+$time = dol_now();
 $action = GETPOST('action', 'aZ09');
 $listofreminderids = GETPOST('listofreminderids', 'aZ09');
 
@@ -105,7 +105,7 @@ $eventfound = array();
 // This need to extend period to be sure to not miss and save in session what we notified to avoid duplicate.
 if (empty($_SESSION['auto_check_events_not_before']) || $time >= $_SESSION['auto_check_events_not_before'] || GETPOST('forcechecknow', 'int'))
 {
-    /*$time_update = (int) $conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY; // Always defined
+	/*$time_update = (int) $conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY; // Always defined
     if (!empty($_SESSION['auto_check_events_not_before']))
     {
         // We start scan from the not before so if two tabs were opend at differents seconds and we close one (so the js timer),
@@ -124,51 +124,51 @@ if (empty($_SESSION['auto_check_events_not_before']) || $time >= $_SESSION['auto
     $_SESSION['auto_check_events_not_before'] = $time + $time_update;
 	*/
 
-    // Force save of the session change we did.
-    // WARNING: Any change in sessions after that will not be saved !
-    session_write_close();
+	// Force save of the session change we did.
+	// WARNING: Any change in sessions after that will not be saved !
+	session_write_close();
 
-    require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
 
-    dol_syslog('NEW $_SESSION[auto_check_events_not_before]='.$_SESSION['auto_check_events_not_before']);
+	dol_syslog('NEW $_SESSION[auto_check_events_not_before]='.(empty($_SESSION['auto_check_events_not_before']) ? '' : $_SESSION['auto_check_events_not_before']));
 
-    $sql = 'SELECT a.id as id_agenda, a.code, a.datep, a.label, a.location, ar.rowid as id_reminder, ar.dateremind, ar.fk_user as id_user_reminder';
-    $sql .= ' FROM '.MAIN_DB_PREFIX.'actioncomm as a';
-    if (!empty($user->conf->MAIN_USER_WANT_ALL_EVENTS_NOTIFICATIONS)) {
-    	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_reminder as ar ON a.id = ar.fk_actioncomm AND ar.fk_user = '.$user->id;
-    	$sql .= ' WHERE a.code <> "AC_OTH_AUTO"';
-    	$sql .= ' AND (';
-    	$sql .= " (ar.typeremind = 'browser' AND ar.dateremind < '".$db->idate(dol_now())."' AND ar.status = 0 AND ar.entity = ".$conf->entity;
-    	$sql .= ' )';
-    } else {
-    	$sql .= ' JOIN '.MAIN_DB_PREFIX.'actioncomm_reminder as ar ON a.id = ar.fk_actioncomm AND ar.fk_user = '.$user->id;
-    	$sql .= " AND ar.typeremind = 'browser' AND ar.dateremind < '".$db->idate(dol_now())."' AND ar.status = 0 AND ar.entity = ".$conf->entity;
-    }
-    $sql .= $db->order('datep', 'ASC');
-    $sql .= ' LIMIT 10'; // Avoid too many notification at once
+	$sql = 'SELECT a.id as id_agenda, a.code, a.datep, a.label, a.location, ar.rowid as id_reminder, ar.dateremind, ar.fk_user as id_user_reminder';
+	$sql .= ' FROM '.MAIN_DB_PREFIX.'actioncomm as a';
+	if (!empty($user->conf->MAIN_USER_WANT_ALL_EVENTS_NOTIFICATIONS)) {
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_reminder as ar ON a.id = ar.fk_actioncomm AND ar.fk_user = '.$user->id;
+		$sql .= ' WHERE a.code <> "AC_OTH_AUTO"';
+		$sql .= ' AND (';
+		$sql .= " (ar.typeremind = 'browser' AND ar.dateremind < '".$db->idate(dol_now())."' AND ar.status = 0 AND ar.entity = ".$conf->entity;
+		$sql .= ' )';
+	} else {
+		$sql .= ' JOIN '.MAIN_DB_PREFIX.'actioncomm_reminder as ar ON a.id = ar.fk_actioncomm AND ar.fk_user = '.$user->id;
+		$sql .= " AND ar.typeremind = 'browser' AND ar.dateremind < '".$db->idate(dol_now())."' AND ar.status = 0 AND ar.entity = ".$conf->entity;
+	}
+	$sql .= $db->order('datep', 'ASC');
+	$sql .= ' LIMIT 10'; // Avoid too many notification at once
 
-    $resql = $db->query($sql);
-    if ($resql) {
-        while ($obj = $db->fetch_object($resql))
-        {
-            // Message must be formated and translated to be used with javascript directly
-            $event = array();
-            $event['type'] = 'agenda';
-            $event['id_reminder'] = $obj->id_reminder;
-            $event['id_agenda'] = $obj->id_agenda;
-            $event['id_user'] = $obj->id_user_reminder;
-            $event['code'] = $obj->code;
-            $event['label'] = $obj->label;
-            $event['location'] = $obj->location;
-            $event['reminder_date_formated'] = dol_print_date($db->jdate($obj->dateremind), 'standard');
-            $event['event_date_start_formated'] = dol_print_date($db->jdate($obj->datep), 'standard');
+	$resql = $db->query($sql);
+	if ($resql) {
+		while ($obj = $db->fetch_object($resql))
+		{
+			// Message must be formated and translated to be used with javascript directly
+			$event = array();
+			$event['type'] = 'agenda';
+			$event['id_reminder'] = $obj->id_reminder;
+			$event['id_agenda'] = $obj->id_agenda;
+			$event['id_user'] = $obj->id_user_reminder;
+			$event['code'] = $obj->code;
+			$event['label'] = $obj->label;
+			$event['location'] = $obj->location;
+			$event['reminder_date_formated'] = dol_print_date($db->jdate($obj->dateremind), 'standard');
+			$event['event_date_start_formated'] = dol_print_date($db->jdate($obj->datep), 'standard');
 
-            $eventfound[$obj->id_agenda] = $event;
-        }
-    } else {
-        dol_syslog("Error sql = ".$db->lasterror(), LOG_ERR);
-    }
+			$eventfound[$obj->id_agenda] = $event;
+		}
+	} else {
+		dol_syslog("Error sql = ".$db->lasterror(), LOG_ERR);
+	}
 }
 
 print json_encode(array('pastreminders'=>$eventfound, 'nextreminder'=>''));
diff --git a/htdocs/core/ajax/constantonoff.php b/htdocs/core/ajax/constantonoff.php
index 710759e10bb..a530bea092f 100644
--- a/htdocs/core/ajax/constantonoff.php
+++ b/htdocs/core/ajax/constantonoff.php
@@ -31,7 +31,7 @@ if (!defined('CSRFCHECK_WITH_TOKEN'))  define('CSRFCHECK_WITH_TOKEN', '1'); // T
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
-$action = GETPOST('action', 'aZ09');	// set or del
+$action = GETPOST('action', 'aZ09'); // set or del
 $name = GETPOST('name', 'alpha');
 
 
diff --git a/htdocs/core/ajax/contacts.php b/htdocs/core/ajax/contacts.php
index 6b476a8f59a..e56b8689e0d 100644
--- a/htdocs/core/ajax/contacts.php
+++ b/htdocs/core/ajax/contacts.php
@@ -27,7 +27,7 @@ if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
 
 require '../../main.inc.php';
 
-$id = GETPOST('id', 'int');	// id of thirdparty
+$id = GETPOST('id', 'int'); // id of thirdparty
 $action = GETPOST('action', 'aZ09');
 $htmlname = GETPOST('htmlname', 'alpha');
 $showempty = GETPOST('showempty', 'int');
diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index 29aeb9cc7eb..877379b54ad 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -26,21 +26,21 @@
 
 if (!isset($usedbyinclude) || empty($usedbyinclude))
 {
-    if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
-    if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-    if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
-    if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-    if (!defined('NOREDIRECTBYMAINTOLOGIN')) define('NOREDIRECTBYMAINTOLOGIN', '1');
+	if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
+	if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+	if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
+	if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+	if (!defined('NOREDIRECTBYMAINTOLOGIN')) define('NOREDIRECTBYMAINTOLOGIN', '1');
 
-    $res = @include '../../main.inc.php';
-    if ($res == 'ERROR_NOT_LOGGED')
-    {
-    	$langs->load("other");
-    	$arrayresult['jumptologin'] = array('img'=>'object_generic', 'label'=>$langs->trans("JumpToLogin"), 'text'=>'<span class="fa fa-sign-in"></span> '.$langs->trans("JumpToLogin"), 'url'=>DOL_URL_ROOT.'/index.php');
-    	print json_encode($arrayresult);
-    	if (is_object($db)) $db->close();
-    	exit;
-    }
+	$res = @include '../../main.inc.php';
+	if ($res == 'ERROR_NOT_LOGGED')
+	{
+		$langs->load("other");
+		$arrayresult['jumptologin'] = array('img'=>'object_generic', 'label'=>$langs->trans("JumpToLogin"), 'text'=>'<span class="fa fa-sign-in"></span> '.$langs->trans("JumpToLogin"), 'url'=>DOL_URL_ROOT.'/index.php');
+		print json_encode($arrayresult);
+		if (is_object($db)) $db->close();
+		exit;
+	}
 }
 
 include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
@@ -82,7 +82,7 @@ if (!empty($conf->mrp->enabled) && $user->rights->mrp->read && empty($conf->glob
 
 if (!empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_PROJECT_DISABLED) && $user->rights->projet->lire)
 {
-	$arrayresult['searchintoprojects'] = array('position'=>40, 'shortcut'=>'Q', 'img'=>'object_projectpub', 'label'=>$langs->trans("SearchIntoProjects", $search_boxvalue), 'text'=>img_picto('', 'object_project').' '.$langs->trans("SearchIntoProjects", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
+	$arrayresult['searchintoprojects'] = array('position'=>40, 'shortcut'=>'Q', 'img'=>'object_project', 'label'=>$langs->trans("SearchIntoProjects", $search_boxvalue), 'text'=>img_picto('', 'object_project').' '.$langs->trans("SearchIntoProjects", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 if (!empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_TASK_DISABLED) && $user->rights->projet->lire)
 {
@@ -110,15 +110,37 @@ if (!empty($conf->supplier_proposal->enabled) && empty($conf->global->MAIN_SEARC
 {
 	$arrayresult['searchintosupplierpropal'] = array('position'=>100, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_proposal').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/supplier_proposal/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if ((! empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED) || ! empty($conf->supplier_order->enabled)) && $user->rights->fournisseur->commande->lire)
+if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED) || !empty($conf->supplier_order->enabled)) && $user->rights->fournisseur->commande->lire)
 {
 	$arrayresult['searchintosupplierorder'] = array('position'=>110, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_order').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
-if ((! empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED) || ! empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire)
+if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire)
 {
 	$arrayresult['searchintosupplierinvoice'] = array('position'=>120, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_invoice').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/facture/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
+// Customer payments
+if (!empty($conf->facture->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED) && $user->rights->facture->lire)
+{
+	$arrayresult['searchintocustomerpayments'] = array(
+		'position'=>170,
+		'img'=>'object_payment',
+		'label'=>$langs->trans("SearchIntoCustomerPayments", $search_boxvalue),
+		'text'=>img_picto('', 'object_payment').' '.$langs->trans("SearchIntoCustomerPayments", $search_boxvalue),
+		'url'=>DOL_URL_ROOT.'/compta/paiement/list.php?leftmenu=customers_bills_payment'.($search_boxvalue ? '&sall='.urlencode($search_boxvalue) : ''));
+}
+
+// Vendor payments
+if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire)
+{
+	$arrayresult['searchintovendorpayments'] = array(
+		'position'=>175,
+		'img'=>'object_payment',
+		'label'=>$langs->trans("SearchIntoVendorPayments", $search_boxvalue),
+		'text'=>img_picto('', 'object_payment').' '.$langs->trans("SearchIntoVendorPayments", $search_boxvalue),
+		'url'=>DOL_URL_ROOT.'/fourn/paiement/list.php?leftmenu=suppliers_bills_payment'.($search_boxvalue ? '&sall='.urlencode($search_boxvalue) : ''));
+}
+
 // Miscellaneous payments
 if (!empty($conf->banque->enabled) && empty($conf->global->MAIN_SEARCHFORM_MISC_PAYMENTS_DISABLED) && $user->rights->banque->lire)
 {
@@ -167,8 +189,8 @@ if (empty($reshook))
 
 // This pushes a search entry to the top
 if (!empty($conf->global->DEFAULT_SEARCH_INTO_MODULE)) {
-    $key = 'searchinto'.$conf->global->DEFAULT_SEARCH_INTO_MODULE;
-    if (array_key_exists($key, $arrayresult)) $arrayresult[$key]['position'] = -1000;
+	$key = 'searchinto'.$conf->global->DEFAULT_SEARCH_INTO_MODULE;
+	if (array_key_exists($key, $arrayresult)) $arrayresult[$key]['position'] = -1000;
 }
 
 // Sort on position
@@ -177,6 +199,6 @@ $arrayresult = dol_sort_array($arrayresult, 'position');
 // Print output if called by ajax or do nothing (var $arrayresult will be used) if called by an include
 if (!isset($usedbyinclude) || empty($usedbyinclude))
 {
-    print json_encode($arrayresult);
-    if (is_object($db)) $db->close();
+	print json_encode($arrayresult);
+	if (is_object($db)) $db->close();
 }
diff --git a/htdocs/core/boxes/box_accountancy_last_manual_entries.php b/htdocs/core/boxes/box_accountancy_last_manual_entries.php
index 76c3fa5eb47..e9b2fe0cd2d 100644
--- a/htdocs/core/boxes/box_accountancy_last_manual_entries.php
+++ b/htdocs/core/boxes/box_accountancy_last_manual_entries.php
@@ -32,77 +32,77 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_accountancy_last_manual_entries extends ModeleBoxes
 {
-    public $boxcode = "accountancy_last_manual_entries";
-    public $boximg = "object_invoice";
-    public $boxlabel = "BoxLastManualEntries";
-    public $depends = array("accounting");
+	public $boxcode = "accountancy_last_manual_entries";
+	public $boximg = "object_invoice";
+	public $boxlabel = "BoxLastManualEntries";
+	public $depends = array("accounting");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->hidden = !($user->rights->accounting->mouvements->lire);
-    }
+		$this->hidden = !($user->rights->accounting->mouvements->lire);
+	}
 
-    /**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    public function loadBox($max = 5)
-    {
-        global $user, $langs, $conf;
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $user, $langs, $conf;
 
-        include_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
 
-        $bookkeepingstatic = new BookKeeping($this->db);
+		$bookkeepingstatic = new BookKeeping($this->db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLastManualEntries", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastManualEntries", $max));
 
-        if ($user->rights->accounting->mouvements->lire)
-        {
-            $sql = "SELECT DISTINCT b.piece_num";
-            $sql .= ", b.doc_date as date_movement";
-            $sql .= ", b.label_operation";
-            $sql .= ", b.montant as amount";
-            $sql .= ", b.code_journal";
-            $sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b";
-            $sql .= " WHERE b.fk_doc = 0";
-            $sql .= " AND b.entity = ".$conf->entity;
-            $sql .= " ORDER BY b.piece_num DESC ";
-            $sql .= $this->db->plimit($max, 0);
+		if ($user->rights->accounting->mouvements->lire)
+		{
+			$sql = "SELECT DISTINCT b.piece_num";
+			$sql .= ", b.doc_date as date_movement";
+			$sql .= ", b.label_operation";
+			$sql .= ", b.montant as amount";
+			$sql .= ", b.code_journal";
+			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b";
+			$sql .= " WHERE b.fk_doc = 0";
+			$sql .= " AND b.entity = ".$conf->entity;
+			$sql .= " ORDER BY b.piece_num DESC ";
+			$sql .= $this->db->plimit($max, 0);
 
-            $result = $this->db->query($sql);
-            if ($result) {
-                $num = $this->db->num_rows($result);
+			$result = $this->db->query($sql);
+			if ($result) {
+				$num = $this->db->num_rows($result);
 
-                $line = 0;
+				$line = 0;
 
-                while ($line < $num) {
-                    $objp		= $this->db->fetch_object($result);
-                    $date		= $this->db->jdate($objp->date_movement);
+				while ($line < $num) {
+					$objp		= $this->db->fetch_object($result);
+					$date		= $this->db->jdate($objp->date_movement);
 					$journal	= $objp->code_journal;
-                    $label		= $objp->label_operation;
+					$label = $objp->label_operation;
 					$amount		= $objp->amount;
 
 					$bookkeepingstatic->id = $objp->id;
@@ -114,11 +114,11 @@ class box_accountancy_last_manual_entries extends ModeleBoxes
 						'asis' => 1,
 					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($date, 'day'),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($date, 'day'),
+						'asis' => 1,
+					);
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="center"',
@@ -132,34 +132,34 @@ class box_accountancy_last_manual_entries extends ModeleBoxes
 						'asis' => 1,
 					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall right"',
-                        'text' => price($amount, 0, $langs, 0, -1, -1, $conf->currency),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall right"',
+						'text' => price($amount, 0, $langs, 0, -1, -1, $conf->currency),
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0) $this->info_box_contents[$line][0] = array(
-                	'td' => 'class="center opacitymedium"',
-                	'text'=>$langs->trans("NoRecordedManualEntries")
-                );
+				if ($num == 0) $this->info_box_contents[$line][0] = array(
+					'td' => 'class="center"',
+					'text'=> '<span class="opacitymedium">'.$langs->trans("NoRecordedManualEntries").'</span>'
+				);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -169,8 +169,8 @@ class box_accountancy_last_manual_entries extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_accountancy_suspense_account.php b/htdocs/core/boxes/box_accountancy_suspense_account.php
index 639ce1ebc23..653f49d2bd9 100644
--- a/htdocs/core/boxes/box_accountancy_suspense_account.php
+++ b/htdocs/core/boxes/box_accountancy_suspense_account.php
@@ -32,57 +32,57 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_accountancy_suspense_account extends ModeleBoxes
 {
-    public $boxcode = "accountancy_suspense_account";
-    public $boximg = "object_invoice";
-    public $boxlabel = "BoxSuspenseAccount";
-    public $depends = array("accounting");
+	public $boxcode = "accountancy_suspense_account";
+	public $boximg = "object_invoice";
+	public $boxlabel = "BoxSuspenseAccount";
+	public $depends = array("accounting");
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->hidden = !($user->rights->accounting->mouvements->lire);
-    }
+		$this->hidden = !($user->rights->accounting->mouvements->lire);
+	}
 
-    /**
-     *  Load data for box to show them later
-     *
-     *  @return	void
-     */
-    public function loadBox()
-    {
-        global $user, $langs, $conf;
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @return	void
+	 */
+	public function loadBox()
+	{
+		global $user, $langs, $conf;
 
-        include_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
 
-        //$bookkeepingstatic = new BookKeeping($this->db);
+		//$bookkeepingstatic = new BookKeeping($this->db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleSuspenseAccount"));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleSuspenseAccount"));
 
-        if ($user->rights->accounting->mouvements->lire)
-        {
+		if ($user->rights->accounting->mouvements->lire)
+		{
 			$suspenseAccount = $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE;
-        	if (!empty($suspenseAccount) && $suspenseAccount > 0)
-        	{
+			if (!empty($suspenseAccount) && $suspenseAccount > 0)
+			{
 				$sql = "SELECT COUNT(*) as nb_suspense_account";
 				$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b";
 				$sql .= " WHERE b.numero_compte = ".$suspenseAccount;
@@ -112,13 +112,13 @@ class box_accountancy_suspense_account extends ModeleBoxes
 					'text' => '<span class="opacitymedium">'.$langs->trans("SuspenseAccountNotDefined").'</span>'
 				);
 			}
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover"',
-            	'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
-            );
-        }
-    }
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -128,8 +128,8 @@ class box_accountancy_suspense_account extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index a951402fd7b..a86ee5a609a 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -32,20 +32,20 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_actions extends ModeleBoxes
 {
-    public $boxcode = "lastactions";
-    public $boximg = "object_action";
-    public $boxlabel = "BoxLastActions";
-    public $depends = array("agenda");
+	public $boxcode = "lastactions";
+	public $boximg = "object_action";
+	public $boxlabel = "BoxLastActions";
+	public $depends = array("agenda");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $enabled = 1;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -54,20 +54,22 @@ class box_actions extends ModeleBoxes
 	 *  @param  DoliDB	$db      	Database handler
 	 *  @param	string	$param		More parameters
 	 */
-	public function __construct($db, $param = '')
+	public function __construct($db, $param)
 	{
-	    global $user;
+		global $conf, $user;
 
-	    $this->db = $db;
+		$this->db = $db;
 
-	    $this->hidden = !($user->rights->agenda->myactions->read);
+		$this->enabled = $conf->agenda->enabled;
+
+		$this->hidden = !($user->rights->agenda->myactions->read);
 	}
 
 	/**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -75,25 +77,25 @@ class box_actions extends ModeleBoxes
 
 		$this->max = $max;
 
-        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-        $societestatic = new Societe($this->db);
-        $actionstatic = new ActionComm($this->db);
+		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+		$societestatic = new Societe($this->db);
+		$actionstatic = new ActionComm($this->db);
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastActionsToDo", $max));
 
-        if ($user->rights->agenda->myactions->read) {
+		if ($user->rights->agenda->myactions->read) {
 			$sql = "SELECT a.id, a.label, a.datep as dp, a.percent as percentage";
-            $sql .= ", ta.code";
-            $sql .= ", ta.libelle as type_label";
-            $sql .= ", s.nom as name";
-            $sql .= ", s.rowid as socid";
-            $sql .= ", s.code_client";
+			$sql .= ", ta.code";
+			$sql .= ", ta.libelle as type_label";
+			$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_client, s.code_compta, s.client";
+			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm AS ta, ".MAIN_DB_PREFIX."actioncomm AS a";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
 			$sql .= " WHERE a.fk_action = ta.id";
-			$sql .= " AND a.entity = ".$conf->entity;
+			$sql .= " AND a.entity IN (".getEntity('actioncomm').")";
 			$sql .= " AND a.percent >= 0 AND a.percent < 100";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".$user->id.")";
 			if ($user->socid)   $sql .= " AND s.rowid = ".$user->socid;
@@ -101,82 +103,94 @@ class box_actions extends ModeleBoxes
 			$sql .= " ORDER BY a.datec DESC";
 			$sql .= $this->db->plimit($max, 0);
 
-			dol_syslog("Box_actions::loadBox", LOG_DEBUG);
+			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
 			$result = $this->db->query($sql);
-            if ($result) {
+			if ($result) {
 				$now = dol_now();
 				$delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;
 
 				$num = $this->db->num_rows($result);
+
 				$line = 0;
-                while ($line < $num) {
+				while ($line < $num) {
 					$late = '';
 					$objp = $this->db->fetch_object($result);
 					$datelimite = $this->db->jdate($objp->dp);
-                    $actionstatic->id = $objp->id;
-                    $actionstatic->label = $objp->label;
-                    $actionstatic->type_label = $objp->type_label;
-                    $actionstatic->code = $objp->code;
-                    $societestatic->id = $objp->socid;
-                    $societestatic->name = $objp->name;
-                    $societestatic->code_client = $objp->code_client;
 
-                    if ($objp->percentage >= 0 && $objp->percentage < 100 && $datelimite < ($now - $delay_warning))
-                        $late = img_warning($langs->trans("Late"));
+					$actionstatic->id = $objp->id;
+					$actionstatic->label = $objp->label;
+					$actionstatic->type_label = $objp->type_label;
+					$actionstatic->code = $objp->code;
+
+					$societestatic->id = $objp->socid;
+					$societestatic->name = $objp->name;
+					//$societestatic->name_alias = $objp->name_alias;
+					$societestatic->code_client = $objp->code_client;
+					$societestatic->code_compta = $objp->code_compta;
+					$societestatic->client = $objp->client;
+					$societestatic->logo = $objp->logo;
+					$societestatic->email = $objp->email;
+					$societestatic->entity = $objp->entity;
+
+					if ($objp->percentage >= 0 && $objp->percentage < 100 && $datelimite < ($now - $delay_warning))
+						$late = img_warning($langs->trans("Late"));
 
 					//($langs->transnoentities("Action".$objp->code)!=("Action".$objp->code) ? $langs->transnoentities("Action".$objp->code) : $objp->label)
 					$label = empty($objp->label) ? $objp->type_label : $objp->label;
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $actionstatic->getNomUrl(1),
-                        'text2'=> $late,
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][0] = array(
+						'td' => '',
+						'text' => $actionstatic->getNomUrl(1),
+						'text2'=> $late,
+						'asis' => 1
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => ($societestatic->id > 0 ? $societestatic->getNomUrl(1) : ''),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][1] = array(
+						'td' => '',
+						'text' => ($societestatic->id > 0 ? $societestatic->getNomUrl(1) : ''),
+						'asis' => 1
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowrap left"',
-                        'text' => dol_print_date($datelimite, "dayhour"),
-                    );
+					$this->info_box_contents[$line][2] = array(
+						'td' => 'class="nowrap left"',
+						'text' => dol_print_date($datelimite, "dayhour"),
+						'asis' => 1
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => ($objp->percentage >= 0 ? $objp->percentage.'%' : ''),
-                    );
+					$this->info_box_contents[$line][3] = array(
+						'td' => 'class="right"',
+						'text' => ($objp->percentage >= 0 ? $objp->percentage.'%' : ''),
+						'asis' => 1
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $actionstatic->LibStatut($objp->percentage, 3),
-                    );
+					$this->info_box_contents[$line][4] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $actionstatic->LibStatut($objp->percentage, 3),
+						'asis' => 1
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center"',
-                        'text'=>$langs->trans("NoActionsToDo"),
-                    );
+				if ($num == 0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center opacitymedium"',
+						'text'=>$langs->trans("NoActionsToDo")
+					);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql)
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 	}
 
@@ -188,13 +202,13 @@ class box_actions extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		global $langs, $conf;
-		$out = parent::showBox($this->info_box_head, $this->info_box_contents);
+		$out = parent::showBox($this->info_box_head, $this->info_box_contents, 1);
 
-        if (!empty($conf->global->SHOW_DIALOG_HOMEPAGE))
-        {
+		if (!empty($conf->global->SHOW_DIALOG_HOMEPAGE))
+		{
 			$actioncejour = false;
 			$contents = $this->info_box_contents;
 			$nblines = count($contents);
@@ -255,5 +269,5 @@ class box_actions extends ModeleBoxes
 		else print $out;
 
 		return '';
-    }
+	}
 }
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index a59edbbf337..1585241b843 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -30,413 +30,413 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_activity extends ModeleBoxes
 {
-    public $boxcode = "activity";
-    public $boximg = "object_bill";
-    public $boxlabel = 'BoxGlobalActivity';
-    public $depends = array("facture");
+	public $boxcode = "activity";
+	public $boximg = "object_bill";
+	public $boxlabel = 'BoxGlobalActivity';
+	public $depends = array("facture");
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
-    public $enabled = 1;
+	public $param;
+	public $enabled = 1;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $conf, $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $conf, $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        // FIXME: Pb into some status
-        $this->enabled = ($conf->global->MAIN_FEATURES_LEVEL); // Not enabled by default due to bugs (see previous comments)
+		// FIXME: Pb into some status
+		$this->enabled = ($conf->global->MAIN_FEATURES_LEVEL); // Not enabled by default due to bugs (see previous comments)
 
-        $this->hidden = !((!empty($conf->facture->enabled) && $user->rights->facture->lire)
-            || (!empty($conf->commande->enabled) && $user->rights->commande->lire)
-            || (!empty($conf->propal->enabled) && $user->rights->propale->lire)
-            );
-    }
+		$this->hidden = !((!empty($conf->facture->enabled) && $user->rights->facture->lire)
+			|| (!empty($conf->commande->enabled) && $user->rights->commande->lire)
+			|| (!empty($conf->propal->enabled) && $user->rights->propale->lire)
+			);
+	}
 
-    /**
-     *  Charge les donnees en memoire pour affichage ulterieur
-     *
-     *  @param  int     $max        Maximum number of records to load
-     *  @return void
-     */
-    public function loadBox($max = 5)
-    {
-        global $conf, $user, $langs;
+	/**
+	 *  Charge les donnees en memoire pour affichage ulterieur
+	 *
+	 *  @param  int     $max        Maximum number of records to load
+	 *  @return void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf, $user, $langs;
 
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        $totalnb = 0;
-        $line = 0;
-        $cachetime = 3600;
-        $fileid = '-e'.$conf->entity.'-u'.$user->id.'-s'.$user->socid.'-r'.($user->rights->societe->client->voir ? '1' : '0').'.cache';
-        $now = dol_now();
-        $nbofperiod = 3;
+		$totalnb = 0;
+		$line = 0;
+		$cachetime = 3600;
+		$fileid = '-e'.$conf->entity.'-u'.$user->id.'-s'.$user->socid.'-r'.($user->rights->societe->client->voir ? '1' : '0').'.cache';
+		$now = dol_now();
+		$nbofperiod = 3;
 
-        if (!empty($conf->global->MAIN_BOX_ACTIVITY_DURATION)) $nbofperiod = $conf->global->MAIN_BOX_ACTIVITY_DURATION;
-        $textHead = $langs->trans("Activity").' - '.$langs->trans("LastXMonthRolling", $nbofperiod);
-        $this->info_box_head = array(
-            'text' => $textHead,
-            'limit'=> dol_strlen($textHead),
-        );
+		if (!empty($conf->global->MAIN_BOX_ACTIVITY_DURATION)) $nbofperiod = $conf->global->MAIN_BOX_ACTIVITY_DURATION;
+		$textHead = $langs->trans("Activity").' - '.$langs->trans("LastXMonthRolling", $nbofperiod);
+		$this->info_box_head = array(
+			'text' => $textHead,
+			'limit'=> dol_strlen($textHead),
+		);
 
-        // compute the year limit to show
-        $tmpdate = dol_time_plus_duree(dol_now(), -1 * $nbofperiod, "m");
+		// compute the year limit to show
+		$tmpdate = dol_time_plus_duree(dol_now(), -1 * $nbofperiod, "m");
 
 
-        // list the summary of the propals
-        if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
-        {
-        	include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-        	$propalstatic = new Propal($this->db);
+		// list the summary of the propals
+		if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
+		{
+			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+			$propalstatic = new Propal($this->db);
 
-        	$cachedir = DOL_DATA_ROOT.'/propale/temp';
-        	$filename = '/boxactivity-propal'.$fileid;
-        	$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
-        	$data = array();
-        	if ($refresh)
-        	{
-        		$sql = "SELECT p.fk_statut, SUM(p.total) as Mnttot, COUNT(*) as nb";
-        		$sql .= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
-        		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        		$sql .= ")";
-        		$sql .= " WHERE p.entity IN (".getEntity('propal').")";
-        		$sql .= " AND p.fk_soc = s.rowid";
-        		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-        		if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-        		$sql .= " AND p.datep >= '".$this->db->idate($tmpdate)."'";
-        		$sql .= " AND p.date_cloture IS NULL"; // just unclosed
-        		$sql .= " GROUP BY p.fk_statut";
-        		$sql .= " ORDER BY p.fk_statut DESC";
+			$cachedir = DOL_DATA_ROOT.'/propale/temp';
+			$filename = '/boxactivity-propal'.$fileid;
+			$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
+			$data = array();
+			if ($refresh)
+			{
+				$sql = "SELECT p.fk_statut, SUM(p.total) as Mnttot, COUNT(*) as nb";
+				$sql .= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
+				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+				$sql .= ")";
+				$sql .= " WHERE p.entity IN (".getEntity('propal').")";
+				$sql .= " AND p.fk_soc = s.rowid";
+				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+				if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+				$sql .= " AND p.datep >= '".$this->db->idate($tmpdate)."'";
+				$sql .= " AND p.date_cloture IS NULL"; // just unclosed
+				$sql .= " GROUP BY p.fk_statut";
+				$sql .= " ORDER BY p.fk_statut DESC";
 
-        		$result = $this->db->query($sql);
-        		if ($result)
-        		{
-        			$num = $this->db->num_rows($result);
+				$result = $this->db->query($sql);
+				if ($result)
+				{
+					$num = $this->db->num_rows($result);
 
-        			$j = 0;
-        			while ($j < $num) {
-        				$data[$j] = $this->db->fetch_object($result);
-        				$j++;
-        			}
-        			if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
-        				dol_filecache($cachedir, $filename, $data);
-        			}
-        			$this->db->free($result);
-        		} else {
-        			dol_print_error($this->db);
-        		}
-        	} else {
-        		$data = dol_readcachefile($cachedir, $filename);
-        	}
+					$j = 0;
+					while ($j < $num) {
+						$data[$j] = $this->db->fetch_object($result);
+						$j++;
+					}
+					if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+						dol_filecache($cachedir, $filename, $data);
+					}
+					$this->db->free($result);
+				} else {
+					dol_print_error($this->db);
+				}
+			} else {
+				$data = dol_readcachefile($cachedir, $filename);
+			}
 
-        	if (!empty($data))
-        	{
-        		$j = 0;
-        		while ($j < count($data))
-        		{
-        			$this->info_box_contents[$line][0] = array(
-                        'td' => 'class="left" width="16"',
-                        'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;search_status=".$data[$j]->fk_statut,
-                        'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
-                        'logo' => 'object_propal'
-        			);
+			if (!empty($data))
+			{
+				$j = 0;
+				while ($j < count($data))
+				{
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="left" width="16"',
+						'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;search_status=".$data[$j]->fk_statut,
+						'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
+						'logo' => 'object_propal'
+					);
 
-        			$this->info_box_contents[$line][1] = array(
-                        'td' => '',
-                        'text' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
-        			);
+					$this->info_box_contents[$line][1] = array(
+						'td' => '',
+						'text' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
+					);
 
-        			$this->info_box_contents[$line][2] = array(
-                        'td' => 'class="right"',
-                        'text' => $data[$j]->nb,
-                        'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
-                        'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;search_status=".$data[$j]->fk_statut,
-        			);
-        			$totalnb += $data[$j]->nb;
+					$this->info_box_contents[$line][2] = array(
+						'td' => 'class="right"',
+						'text' => $data[$j]->nb,
+						'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
+						'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;search_status=".$data[$j]->fk_statut,
+					);
+					$totalnb += $data[$j]->nb;
 
-        			$this->info_box_contents[$line][3] = array(
-                        'td' => 'class="nowraponall right"',
-                        'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
-        			);
-        			$this->info_box_contents[$line][4] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $propalstatic->LibStatut($data[$j]->fk_statut, 3),
-        			);
+					$this->info_box_contents[$line][3] = array(
+						'td' => 'class="nowraponall right"',
+						'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
+					);
+					$this->info_box_contents[$line][4] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $propalstatic->LibStatut($data[$j]->fk_statut, 3),
+					);
 
-        			$line++;
-        			$j++;
-        		}
-        	}
-        }
+					$line++;
+					$j++;
+				}
+			}
+		}
 
-        // list the summary of the orders
-        if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
-            include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-            $commandestatic = new Commande($this->db);
+		// list the summary of the orders
+		if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
+			include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+			$commandestatic = new Commande($this->db);
 
-            $langs->load("orders");
+			$langs->load("orders");
 
-            $cachedir = DOL_DATA_ROOT.'/commande/temp';
-            $filename = '/boxactivity-order'.$fileid;
-            $refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
-            $data = array();
+			$cachedir = DOL_DATA_ROOT.'/commande/temp';
+			$filename = '/boxactivity-order'.$fileid;
+			$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
+			$data = array();
 
-            if ($refresh) {
-                $sql = "SELECT c.fk_statut, sum(c.total_ttc) as Mnttot, count(*) as nb";
-                $sql .= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
-                if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-                $sql .= ")";
-                $sql .= " WHERE c.entity = ".$conf->entity;
-                $sql .= " AND c.fk_soc = s.rowid";
-                if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-                if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-                $sql .= " AND c.date_commande >= '".$this->db->idate($tmpdate)."'";
-                $sql .= " GROUP BY c.fk_statut";
-                $sql .= " ORDER BY c.fk_statut DESC";
+			if ($refresh) {
+				$sql = "SELECT c.fk_statut, sum(c.total_ttc) as Mnttot, count(*) as nb";
+				$sql .= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
+				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+				$sql .= ")";
+				$sql .= " WHERE c.entity IN (".getEntity('commande').")";
+				$sql .= " AND c.fk_soc = s.rowid";
+				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+				if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+				$sql .= " AND c.date_commande >= '".$this->db->idate($tmpdate)."'";
+				$sql .= " GROUP BY c.fk_statut";
+				$sql .= " ORDER BY c.fk_statut DESC";
 
-                $result = $this->db->query($sql);
-                if ($result) {
-                    $num = $this->db->num_rows($result);
-                    $j = 0;
-                    while ($j < $num) {
-                        $data[$j] = $this->db->fetch_object($result);
-                        $j++;
-                    }
-                    if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
-                        dol_filecache($cachedir, $filename, $data);
-                    }
-                    $this->db->free($result);
-                } else {
-                    dol_print_error($this->db);
-                }
-            } else {
-                $data = dol_readcachefile($cachedir, $filename);
-            }
+				$result = $this->db->query($sql);
+				if ($result) {
+					$num = $this->db->num_rows($result);
+					$j = 0;
+					while ($j < $num) {
+						$data[$j] = $this->db->fetch_object($result);
+						$j++;
+					}
+					if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+						dol_filecache($cachedir, $filename, $data);
+					}
+					$this->db->free($result);
+				} else {
+					dol_print_error($this->db);
+				}
+			} else {
+				$data = dol_readcachefile($cachedir, $filename);
+			}
 
-            if (!empty($data)) {
-                $j = 0;
-                while ($j < count($data)) {
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="left" width="16"',
-                        'url' => DOL_URL_ROOT."/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;search_status=".$data[$j]->fk_statut,
-                        'tooltip' => $langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut, 0, 0),
-                        'logo' => 'object_order',
-                    );
+			if (!empty($data)) {
+				$j = 0;
+				while ($j < count($data)) {
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="left" width="16"',
+						'url' => DOL_URL_ROOT."/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;search_status=".$data[$j]->fk_statut,
+						'tooltip' => $langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut, 0, 0),
+						'logo' => 'object_order',
+					);
 
-                    $this->info_box_contents[$line][1] = array(
-                        'td' => '',
-                        'text' =>$langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut, 0, 0),
-                    );
+					$this->info_box_contents[$line][1] = array(
+						'td' => '',
+						'text' =>$langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut, 0, 0),
+					);
 
-                    $this->info_box_contents[$line][2] = array(
-                        'td' => 'class="right"',
-                        'text' => $data[$j]->nb,
-                        'tooltip' => $langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut, 0, 0),
-                        'url' => DOL_URL_ROOT."/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;search_status=".$data[$j]->fk_statut,
-                    );
-                    $totalnb += $data[$j]->nb;
+					$this->info_box_contents[$line][2] = array(
+						'td' => 'class="right"',
+						'text' => $data[$j]->nb,
+						'tooltip' => $langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut, 0, 0),
+						'url' => DOL_URL_ROOT."/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;search_status=".$data[$j]->fk_statut,
+					);
+					$totalnb += $data[$j]->nb;
 
-                    $this->info_box_contents[$line][3] = array(
-                        'td' => 'class="nowraponall right"',
-                        'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
-                    );
-                    $this->info_box_contents[$line][4] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $commandestatic->LibStatut($data[$j]->fk_statut, 0, 3),
-                    );
+					$this->info_box_contents[$line][3] = array(
+						'td' => 'class="nowraponall right"',
+						'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
+					);
+					$this->info_box_contents[$line][4] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $commandestatic->LibStatut($data[$j]->fk_statut, 0, 3),
+					);
 
-                    $line++;
-                    $j++;
-                }
-            }
-        }
+					$line++;
+					$j++;
+				}
+			}
+		}
 
 
-        // list the summary of the bills
-        if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
-        {
-        	include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-        	$facturestatic = new Facture($this->db);
+		// list the summary of the bills
+		if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
+		{
+			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+			$facturestatic = new Facture($this->db);
 
-        	// part 1
-        	$cachedir = DOL_DATA_ROOT.'/facture/temp';
-        	$filename = '/boxactivity-invoice'.$fileid;
+			// part 1
+			$cachedir = DOL_DATA_ROOT.'/facture/temp';
+			$filename = '/boxactivity-invoice'.$fileid;
 
-        	$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
-        	$data = array();
-        	if ($refresh)
-        	{
-        		$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
-        		$sql .= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-        		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        		$sql .= ")";
-        		$sql .= " WHERE f.entity IN (".getEntity('invoice').')';
-        		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-        		if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-        		$sql .= " AND f.fk_soc = s.rowid";
-        		$sql .= " AND f.datef >= '".$this->db->idate($tmpdate)."' AND f.paye=1";
-        		$sql .= " GROUP BY f.fk_statut";
-        		$sql .= " ORDER BY f.fk_statut DESC";
+			$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
+			$data = array();
+			if ($refresh)
+			{
+				$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
+				$sql .= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
+				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+				$sql .= ")";
+				$sql .= " WHERE f.entity IN (".getEntity('invoice').')';
+				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+				if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+				$sql .= " AND f.fk_soc = s.rowid";
+				$sql .= " AND f.datef >= '".$this->db->idate($tmpdate)."' AND f.paye=1";
+				$sql .= " GROUP BY f.fk_statut";
+				$sql .= " ORDER BY f.fk_statut DESC";
 
-        		$result = $this->db->query($sql);
-        		if ($result) {
-        			$num = $this->db->num_rows($result);
-        			$j = 0;
-        			while ($j < $num) {
-        				$data[$j] = $this->db->fetch_object($result);
-        				$j++;
-        			}
-        			if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
-        				dol_filecache($cachedir, $filename, $data);
-        			}
-        			$this->db->free($result);
-        		} else {
-        			dol_print_error($this->db);
-        		}
-        	} else {
-        		$data = dol_readcachefile($cachedir, $filename);
-        	}
+				$result = $this->db->query($sql);
+				if ($result) {
+					$num = $this->db->num_rows($result);
+					$j = 0;
+					while ($j < $num) {
+						$data[$j] = $this->db->fetch_object($result);
+						$j++;
+					}
+					if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+						dol_filecache($cachedir, $filename, $data);
+					}
+					$this->db->free($result);
+				} else {
+					dol_print_error($this->db);
+				}
+			} else {
+				$data = dol_readcachefile($cachedir, $filename);
+			}
 
-        	if (!empty($data)) {
-        		$j = 0;
-        		while ($j < count($data)) {
-        			$billurl = "search_status=2&amp;paye=1&amp;year=".$data[$j]->annee;
-        			$this->info_box_contents[$line][0] = array(
-                        'td' => 'class="left" width="16"',
-                        'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
-                        'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
-                        'logo' => 'bill',
-        			);
+			if (!empty($data)) {
+				$j = 0;
+				while ($j < count($data)) {
+					$billurl = "search_status=2&amp;paye=1&amp;year=".$data[$j]->annee;
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="left" width="16"',
+						'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
+						'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
+						'logo' => 'bill',
+					);
 
-        			$this->info_box_contents[$line][1] = array(
-                        'td' => '',
-                        'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0)." ".$data[$j]->annee,
-        			);
+					$this->info_box_contents[$line][1] = array(
+						'td' => '',
+						'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0)." ".$data[$j]->annee,
+					);
 
-        			$this->info_box_contents[$line][2] = array(
-                        'td' => 'class="right"',
-                        'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
-                        'text' => $data[$j]->nb,
-                        'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
-        			);
+					$this->info_box_contents[$line][2] = array(
+						'td' => 'class="right"',
+						'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
+						'text' => $data[$j]->nb,
+						'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
+					);
 
-        			$this->info_box_contents[$line][3] = array(
-                        'td' => 'class="nowraponall right"',
-                        'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency)
-        			);
+					$this->info_box_contents[$line][3] = array(
+						'td' => 'class="nowraponall right"',
+						'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency)
+					);
 
-        			// We add only for the current year
-       				$totalnb += $data[$j]->nb;
+					// We add only for the current year
+	   				$totalnb += $data[$j]->nb;
 
-        			$this->info_box_contents[$line][4] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $facturestatic->LibStatut(1, $data[$j]->fk_statut, 3),
-        			);
-        			$line++;
-        			$j++;
-        		}
-        		if (count($data) == 0)
-        			$this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center"',
-                        'text'=>$langs->trans("NoRecordedInvoices"),
-        			);
-        	}
+					$this->info_box_contents[$line][4] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $facturestatic->LibStatut(1, $data[$j]->fk_statut, 3),
+					);
+					$line++;
+					$j++;
+				}
+				if (count($data) == 0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center"',
+						'text'=>$langs->trans("NoRecordedInvoices"),
+					);
+			}
 
-        	// part 2
-        	$cachedir = DOL_DATA_ROOT.'/facture/temp';
-        	$filename = '/boxactivity-invoice2'.$fileid;
+			// part 2
+			$cachedir = DOL_DATA_ROOT.'/facture/temp';
+			$filename = '/boxactivity-invoice2'.$fileid;
 
-        	$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
+			$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
 
-        	$data = array();
-        	if ($refresh) {
-        		$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
-        		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-        		$sql .= " WHERE f.entity IN (".getEntity('invoice').')';
-        		$sql .= " AND f.fk_soc = s.rowid";
-        		$sql .= " AND f.datef >= '".$this->db->idate($tmpdate)."' AND f.paye=0";
-        		$sql .= " GROUP BY f.fk_statut";
-        		$sql .= " ORDER BY f.fk_statut DESC";
+			$data = array();
+			if ($refresh) {
+				$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
+				$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
+				$sql .= " WHERE f.entity IN (".getEntity('invoice').')';
+				$sql .= " AND f.fk_soc = s.rowid";
+				$sql .= " AND f.datef >= '".$this->db->idate($tmpdate)."' AND f.paye=0";
+				$sql .= " GROUP BY f.fk_statut";
+				$sql .= " ORDER BY f.fk_statut DESC";
 
-        		$result = $this->db->query($sql);
-        		if ($result) {
-        			$num = $this->db->num_rows($result);
-        			$j = 0;
-        			while ($j < $num) {
-        				$data[$j] = $this->db->fetch_object($result);
-        				$j++;
-        			}
-        			if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
-        				dol_filecache($cachedir, $filename, $data);
-        			}
-        			$this->db->free($result);
-        		} else {
-        			dol_print_error($this->db);
-        		}
-        	} else {
-        		$data = dol_readcachefile($cachedir, $filename);
-        	}
+				$result = $this->db->query($sql);
+				if ($result) {
+					$num = $this->db->num_rows($result);
+					$j = 0;
+					while ($j < $num) {
+						$data[$j] = $this->db->fetch_object($result);
+						$j++;
+					}
+					if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+						dol_filecache($cachedir, $filename, $data);
+					}
+					$this->db->free($result);
+				} else {
+					dol_print_error($this->db);
+				}
+			} else {
+				$data = dol_readcachefile($cachedir, $filename);
+			}
 
-        	if (!empty($data)) {
-        		$alreadypaid = -1;
+			if (!empty($data)) {
+				$alreadypaid = -1;
 
-        		$j = 0;
-        		while ($j < count($data)) {
-        			$billurl = "search_status=".$data[$j]->fk_statut."&amp;paye=0";
-        			$this->info_box_contents[$line][0] = array(
-                        'td' => 'class="left" width="16"',
-                        'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
-                        'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
-                        'logo' => 'bill',
-        			);
+				$j = 0;
+				while ($j < count($data)) {
+					$billurl = "search_status=".$data[$j]->fk_statut."&amp;paye=0";
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="left" width="16"',
+						'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
+						'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
+						'logo' => 'bill',
+					);
 
-        			$this->info_box_contents[$line][1] = array(
-                        'td' => '',
-                        'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
-        			);
+					$this->info_box_contents[$line][1] = array(
+						'td' => '',
+						'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
+					);
 
-        			$this->info_box_contents[$line][2] = array(
-                        'td' => 'class="right"',
-                        'text' => $data[$j]->nb,
-                        'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
-                        'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
-        			);
-        			$totalnb += $data[$j]->nb;
-        			$this->info_box_contents[$line][3] = array(
-                        'td' => 'class="nowraponall right"',
-                        'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
-        			);
-        			$this->info_box_contents[$line][4] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $facturestatic->LibStatut(0, $data[$j]->fk_statut, 3, $alreadypaid),
-        			);
-        			$line++;
-        			$j++;
-        		}
-        		if (count($data) == 0) {
-        			$this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center"',
-                        'text'=>$langs->trans("NoRecordedInvoices"),
-                    );
-                }
-        	}
-        }
+					$this->info_box_contents[$line][2] = array(
+						'td' => 'class="right"',
+						'text' => $data[$j]->nb,
+						'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
+						'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
+					);
+					$totalnb += $data[$j]->nb;
+					$this->info_box_contents[$line][3] = array(
+						'td' => 'class="nowraponall right"',
+						'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
+					);
+					$this->info_box_contents[$line][4] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $facturestatic->LibStatut(0, $data[$j]->fk_statut, 3, $alreadypaid),
+					);
+					$line++;
+					$j++;
+				}
+				if (count($data) == 0) {
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center"',
+						'text'=>$langs->trans("NoRecordedInvoices"),
+					);
+				}
+			}
+		}
 
 		// Add the sum in the bottom of the boxes
 		$this->info_box_contents[$line][0] = array('tr' => 'class="liste_total_wrap"');
@@ -444,19 +444,19 @@ class box_activity extends ModeleBoxes
 		$this->info_box_contents[$line][2] = array('td' => 'class="liste_total right" ', 'text' => $totalnb);
 		$this->info_box_contents[$line][3] = array('td' => 'class="liste_total right" ', 'text' => '');
 		$this->info_box_contents[$line][4] = array('td' => 'class="liste_total right" ', 'text' => "");
-    }
+	}
 
 
-    /**
-     *  Method to show box
-     *
-     *  @param	array	$head       Array with properties of box title
-     *  @param  array	$contents   Array with properties of box lines
-     *  @param	int		$nooutput	No print, only return string
-     *  @return	string
-     */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	/**
+	 *  Method to show box
+	 *
+	 *  @param	array	$head       Array with properties of box title
+	 *  @param  array	$contents   Array with properties of box lines
+	 *  @param	int		$nooutput	No print, only return string
+	 *  @return	string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_birthdays.php b/htdocs/core/boxes/box_birthdays.php
index e6d032d41f8..9a2ccd33cf7 100644
--- a/htdocs/core/boxes/box_birthdays.php
+++ b/htdocs/core/boxes/box_birthdays.php
@@ -32,27 +32,27 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_birthdays extends ModeleBoxes
 {
-    public $boxcode = "birthdays";
-    public $boximg = "object_user";
-    public $boxlabel = "BoxTitleUserBirthdaysOfMonth";
-    public $depends = array("user");
+	public $boxcode = "birthdays";
+	public $boximg = "object_user";
+	public $boxlabel = "BoxTitleUserBirthdaysOfMonth";
+	public $depends = array("user");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $enabled = 1;
+	public $enabled = 1;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
 	 *  Constructor
 	 *
 	 *  @param  DoliDB	$db      	Database handler
-     *  @param	string	$param		More parameters
+	 *  @param	string	$param		More parameters
 	 */
 	public function __construct($db, $param = '')
 	{
@@ -64,10 +64,10 @@ class box_birthdays extends ModeleBoxes
 	}
 
 	/**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
 	 */
 	public function loadBox($max = 20)
 	{
@@ -78,17 +78,18 @@ class box_birthdays extends ModeleBoxes
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 		include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-        $userstatic = new User($this->db);
+		$userstatic = new User($this->db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleUserBirthdaysOfMonth"));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleUserBirthdaysOfMonth"));
 
 		if ($user->rights->user->user->lire)
 		{
 			$tmparray = dol_getdate(dol_now(), true);
 
-			$sql = "SELECT u.rowid, u.firstname, u.lastname, u.birth";
+			$sql = "SELECT u.rowid, u.firstname, u.lastname, u.birth, u.email, u.statut as status";
 			$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 			$sql .= " WHERE u.entity IN (".getEntity('user').")";
+			$sql .= " AND u.statut = 1";
 			$sql .= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0);
 			$sql .= " ORDER BY u.birth ASC";
 			$sql .= $this->db->plimit($max, 0);
@@ -103,25 +104,28 @@ class box_birthdays extends ModeleBoxes
 				while ($line < $num)
 				{
 					$objp = $this->db->fetch_object($result);
-                    $userstatic->id = $objp->rowid;
-                    $userstatic->firstname = $objp->firstname;
-                    $userstatic->lastname = $objp->lastname;
-                    $userstatic->email = $objp->email;
-                    $dateb = $this->db->jdate($objp->birth);
-                    $age = date('Y', dol_now()) - date('Y', $dateb);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $userstatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$userstatic->id = $objp->rowid;
+					$userstatic->firstname = $objp->firstname;
+					$userstatic->lastname = $objp->lastname;
+					$userstatic->email = $objp->email;
+					$userstatic->statut = $objp->status;
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($dateb, "day").' - '.$age.' '.$langs->trans('DurationYears')
-                    );
+					$dateb = $this->db->jdate($objp->birth);
+					$age = date('Y', dol_now()) - date('Y', $dateb);
 
-                    /*$this->info_box_contents[$line][] = array(
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $userstatic->getNomUrl(1),
+						'asis' => 1,
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($dateb, "day").' - '.$age.' '.$langs->trans('DurationYears')
+					);
+
+					/*$this->info_box_contents[$line][] = array(
                         'td' => 'class="right" width="18"',
                         'text' => $userstatic->LibStatut($objp->status, 3)
                     );*/
@@ -134,15 +138,15 @@ class box_birthdays extends ModeleBoxes
 				$this->db->free($result);
 			} else {
 				$this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql)
-                );
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql)
+				);
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
 	}
@@ -155,8 +159,8 @@ class box_birthdays extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_birthdays_members.php b/htdocs/core/boxes/box_birthdays_members.php
index e49d21ba387..02a315ea836 100644
--- a/htdocs/core/boxes/box_birthdays_members.php
+++ b/htdocs/core/boxes/box_birthdays_members.php
@@ -32,27 +32,27 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_birthdays_members extends ModeleBoxes
 {
-    public $boxcode = "birthdays_members";
-    public $boximg = "object_user";
-    public $boxlabel = "BoxTitleMemberNextBirthdays";
-    public $depends = array("adherent");
+	public $boxcode = "birthdays_members";
+	public $boximg = "object_user";
+	public $boxlabel = "BoxTitleMemberNextBirthdays";
+	public $depends = array("adherent");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $enabled = 1;
+	public $enabled = 1;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
 	 *  Constructor
 	 *
 	 *  @param  DoliDB	$db      	Database handler
-     *  @param	string	$param		More parameters
+	 *  @param	string	$param		More parameters
 	 */
 	public function __construct($db, $param = '')
 	{
@@ -64,10 +64,10 @@ class box_birthdays_members extends ModeleBoxes
 	}
 
 	/**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
 	 */
 	public function loadBox($max = 20)
 	{
@@ -78,9 +78,9 @@ class box_birthdays_members extends ModeleBoxes
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 		include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-        $memberstatic = new Adherent($this->db);
+		$memberstatic = new Adherent($this->db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleMemberNextBirthdays"));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleMemberNextBirthdays"));
 
 		if ($user->rights->adherent->lire)
 		{
@@ -89,8 +89,8 @@ class box_birthdays_members extends ModeleBoxes
 			$sql = "SELECT u.rowid, u.firstname, u.lastname, u.birth";
 			$sql .= " FROM ".MAIN_DB_PREFIX."adherent as u";
 			$sql .= " WHERE u.entity IN (".getEntity('adherent').")";
-      		$sql .= " AND u.statut = 1";
-      		$sql .= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0);
+	  		$sql .= " AND u.statut = 1";
+	  		$sql .= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0);
 			$sql .= " ORDER BY u.birth ASC";
 			$sql .= $this->db->plimit($max, 0);
 
@@ -104,25 +104,25 @@ class box_birthdays_members extends ModeleBoxes
 				while ($line < $num)
 				{
 					$objp = $this->db->fetch_object($result);
-                    $memberstatic->id = $objp->rowid;
-                    $memberstatic->firstname = $objp->firstname;
-                    $memberstatic->lastname = $objp->lastname;
-                    $memberstatic->email = $objp->email;
-                    $dateb = $this->db->jdate($objp->birth);
-                    $age = date('Y', dol_now()) - date('Y', $dateb);
+					$memberstatic->id = $objp->rowid;
+					$memberstatic->firstname = $objp->firstname;
+					$memberstatic->lastname = $objp->lastname;
+					$memberstatic->email = $objp->email;
+					$dateb = $this->db->jdate($objp->birth);
+					$age = date('Y', dol_now()) - date('Y', $dateb);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $memberstatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $memberstatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($dateb, "day").' - '.$age.' '.$langs->trans('DurationYears')
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($dateb, "day").' - '.$age.' '.$langs->trans('DurationYears')
+					);
 
-                    /*$this->info_box_contents[$line][] = array(
+					/*$this->info_box_contents[$line][] = array(
                         'td' => 'class="right" width="18"',
                         'text' => $memberstatic->LibStatut($objp->status, 3)
                     );*/
@@ -135,15 +135,15 @@ class box_birthdays_members extends ModeleBoxes
 				$this->db->free($result);
 			} else {
 				$this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql)
-                );
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql)
+				);
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
 	}
@@ -156,8 +156,8 @@ class box_birthdays_members extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_boms.php b/htdocs/core/boxes/box_boms.php
index c75c4c24e8f..6a2554bcde0 100644
--- a/htdocs/core/boxes/box_boms.php
+++ b/htdocs/core/boxes/box_boms.php
@@ -32,147 +32,147 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_boms extends ModeleBoxes
 {
-    public $boxcode = "lastboms";
-    public $boximg = "object_bom";
-    public $boxlabel = "BoxTitleLatestModifiedBoms";
-    public $depends = array("bom");
+	public $boxcode = "lastboms";
+	public $boximg = "object_bom";
+	public $boxlabel = "BoxTitleLatestModifiedBoms";
+	public $depends = array("bom");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->hidden = !($user->rights->bom->read);
-    }
+		$this->hidden = !($user->rights->bom->read);
+	}
 
-    /**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    public function loadBox($max = 5)
-    {
-        global $user, $langs, $conf;
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $user, $langs, $conf;
 
-        $this->max = $max;
+		$this->max = $max;
 
-        include_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
-        $bomstatic = new Bom($this->db);
-        $productstatic = new Product($this->db);
-        $userstatic = new User($this->db);
+		$bomstatic = new Bom($this->db);
+		$productstatic = new Product($this->db);
+		$userstatic = new User($this->db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLatestModifiedBoms", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLatestModifiedBoms", $max));
 
-        if ($user->rights->bom->read)
-        {
-            $sql = "SELECT p.ref as product_ref, p.tobuy, p.tosell";
-            $sql .= ", c.rowid";
-            $sql .= ", c.date_creation";
-            $sql .= ", c.tms";
-            $sql .= ", c.ref";
-            $sql .= ", c.status";
-            $sql .= ", c.fk_user_valid";
-            $sql .= " FROM ".MAIN_DB_PREFIX."product as p";
-            $sql .= ", ".MAIN_DB_PREFIX."bom_bom as c";
-            $sql .= " WHERE c.fk_product = p.rowid";
-            $sql .= " AND c.entity = ".$conf->entity;
-            $sql .= " ORDER BY c.tms DESC, c.ref DESC";
-            $sql .= " ".$this->db->plimit($max, 0);
+		if ($user->rights->bom->read)
+		{
+			$sql = "SELECT p.ref as product_ref, p.tobuy, p.tosell";
+			$sql .= ", c.rowid";
+			$sql .= ", c.date_creation";
+			$sql .= ", c.tms";
+			$sql .= ", c.ref";
+			$sql .= ", c.status";
+			$sql .= ", c.fk_user_valid";
+			$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
+			$sql .= ", ".MAIN_DB_PREFIX."bom_bom as c";
+			$sql .= " WHERE c.fk_product = p.rowid";
+			$sql .= " AND c.entity = ".$conf->entity;
+			$sql .= " ORDER BY c.tms DESC, c.ref DESC";
+			$sql .= " ".$this->db->plimit($max, 0);
 
-            $result = $this->db->query($sql);
-            if ($result) {
-                $num = $this->db->num_rows($result);
+			$result = $this->db->query($sql);
+			if ($result) {
+				$num = $this->db->num_rows($result);
 
-                $line = 0;
+				$line = 0;
 
-                while ($line < $num) {
-                    $objp = $this->db->fetch_object($result);
-                    $datem = $this->db->jdate($objp->tms);
+				while ($line < $num) {
+					$objp = $this->db->fetch_object($result);
+					$datem = $this->db->jdate($objp->tms);
 
-                    $bomstatic->id = $objp->rowid;
-                    $bomstatic->ref = $objp->ref;
-                    $bomstatic->id = $objp->socid;
-                    $bomstatic->status = $objp->status;
+					$bomstatic->id = $objp->rowid;
+					$bomstatic->ref = $objp->ref;
+					$bomstatic->id = $objp->socid;
+					$bomstatic->status = $objp->status;
 
-                    $productstatic->ref = $objp->product_ref;
-                    $productstatic->status = $objp->tobuy;
-                    $productstatic->status_buy = $objp->tosell;
+					$productstatic->ref = $objp->product_ref;
+					$productstatic->status = $objp->tobuy;
+					$productstatic->status_buy = $objp->tosell;
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $bomstatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $bomstatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $productstatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $productstatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    if (!empty($conf->global->BOM_BOX_LAST_BOMS_SHOW_VALIDATE_USER)) {
-                        if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid);
-                        $this->info_box_contents[$line][] = array(
-                            'td' => 'class="right"',
-                            'text' => (($objp->fk_user_valid > 0) ? $userstatic->getNomUrl(1) : ''),
-                            'asis' => 1,
-                        );
-                    }
+					if (!empty($conf->global->BOM_BOX_LAST_BOMS_SHOW_VALIDATE_USER)) {
+						if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid);
+						$this->info_box_contents[$line][] = array(
+							'td' => 'class="right"',
+							'text' => (($objp->fk_user_valid > 0) ? $userstatic->getNomUrl(1) : ''),
+							'asis' => 1,
+						);
+					}
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datem, 'day'),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datem, 'day'),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $bomstatic->LibStatut($objp->status, 3),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $bomstatic->LibStatut($objp->status, 3),
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0) $this->info_box_contents[$line][0] = array(
-                	'td' => 'class="center opacitymedium"',
-                	'text'=>$langs->trans("NoRecordedOrders")
-                );
+				if ($num == 0) $this->info_box_contents[$line][0] = array(
+					'td' => 'class="center opacitymedium"',
+					'text'=>$langs->trans("NoRecordedOrders")
+				);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -182,8 +182,8 @@ class box_boms extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php
index c81e226decb..795eaeccf36 100644
--- a/htdocs/core/boxes/box_bookmarks.php
+++ b/htdocs/core/boxes/box_bookmarks.php
@@ -28,20 +28,20 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_bookmarks extends ModeleBoxes
 {
-    public $boxcode = "bookmarks";
-    public $boximg = "bookmark";
-    public $boxlabel = "BoxMyLastBookmarks";
-    public $depends = array("bookmark");
+	public $boxcode = "bookmarks";
+	public $boximg = "bookmark";
+	public $boxlabel = "BoxMyLastBookmarks";
+	public $depends = array("bookmark");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -52,18 +52,18 @@ class box_bookmarks extends ModeleBoxes
 	 */
 	public function __construct($db, $param)
 	{
-	    global $user;
+		global $user;
 
-	    $this->db = $db;
+		$this->db = $db;
 
-	    $this->hidden = !($user->rights->bookmark->lire);
+		$this->hidden = !($user->rights->bookmark->lire);
 	}
 
 	/**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -73,10 +73,10 @@ class box_bookmarks extends ModeleBoxes
 		$this->max = $max;
 
 		$this->info_box_head = array(
-            'text' => $langs->trans("BoxMyLastBookmarks", $max),
-            'sublink' => DOL_URL_ROOT.'/bookmarks/list.php',
-        );
-        if ($user->rights->bookmark->creer) {
+			'text' => $langs->trans("BoxMyLastBookmarks", $max),
+			'sublink' => DOL_URL_ROOT.'/bookmarks/list.php',
+		);
+		if ($user->rights->bookmark->creer) {
 			$this->info_box_head['subpicto'] = 'bookmark';
 			$this->info_box_head['subtext'] = $langs->trans("BookmarksManagement");
 		} else {
@@ -89,7 +89,7 @@ class box_bookmarks extends ModeleBoxes
 			$sql = "SELECT b.title, b.url, b.target, b.favicon";
 			$sql .= " FROM ".MAIN_DB_PREFIX."bookmark as b";
 			$sql .= " WHERE fk_user = ".$user->id;
-            $sql .= " AND b.entity = ".$conf->entity;
+			$sql .= " AND b.entity = ".$conf->entity;
 			$sql .= $this->db->order("position", "ASC");
 			$sql .= $this->db->plimit($max, 0);
 
@@ -100,63 +100,63 @@ class box_bookmarks extends ModeleBoxes
 
 				$line = 0;
 
-                while ($line < $num) {
-                    $objp = $this->db->fetch_object($result);
+				while ($line < $num) {
+					$objp = $this->db->fetch_object($result);
 
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="left" width="16"',
-                        'logo' => $this->boximg,
-                        'url' => $objp->url,
-                        'tooltip' => $objp->title,
-                        'target' => $objp->target ? 'newtab' : '',
-                    );
-                    $this->info_box_contents[$line][1] = array(
-                        'td' => '',
-                        'text' => $objp->title,
-                        'url' => $objp->url,
-                        'tooltip' => $objp->title,
-                        'target' => $objp->target ? 'newtab' : '',
-                    );
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="left" width="16"',
+						'logo' => $this->boximg,
+						'url' => $objp->url,
+						'tooltip' => $objp->title,
+						'target' => $objp->target ? 'newtab' : '',
+					);
+					$this->info_box_contents[$line][1] = array(
+						'td' => '',
+						'text' => $objp->title,
+						'url' => $objp->url,
+						'tooltip' => $objp->title,
+						'target' => $objp->target ? 'newtab' : '',
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0) {
-                    $mytxt = $langs->trans("NoRecordedBookmarks");
-                    if ($user->rights->bookmark->creer) $mytxt .= ' '.$langs->trans("ClickToAdd");
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center" colspan="2"',
-                        'tooltip' => $mytxt,
-                        'url'=> DOL_URL_ROOT.'/bookmarks/list.php', 'text'=>$mytxt,
-                    );
-                }
+				if ($num == 0) {
+					$mytxt = $langs->trans("NoRecordedBookmarks");
+					if ($user->rights->bookmark->creer) $mytxt .= ' '.$langs->trans("ClickToAdd");
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center" colspan="2"',
+						'tooltip' => $mytxt,
+						'url'=> DOL_URL_ROOT.'/bookmarks/list.php', 'text'=>$mytxt,
+					);
+				}
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
-    /**
-     *  Method to show box
-     *
-     *  @param	array	$head       Array with properties of box title
-     *  @param  array	$contents   Array with properties of box lines
-     *  @param	int		$nooutput	No print, only return string
-     *  @return	string
-     */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	/**
+	 *  Method to show box
+	 *
+	 *  @param	array	$head       Array with properties of box title
+	 *  @param  array	$contents   Array with properties of box lines
+	 *  @param	int		$nooutput	No print, only return string
+	 *  @return	string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index 00cad787e0b..11e8b6a8f29 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -32,27 +32,27 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_clients extends ModeleBoxes
 {
-    public $boxcode = "lastcustomers";
-    public $boximg = "object_company";
-    public $boxlabel = "BoxLastCustomers";
-    public $depends = array("societe");
+	public $boxcode = "lastcustomers";
+	public $boximg = "object_company";
+	public $boxlabel = "BoxLastCustomers";
+	public $depends = array("societe");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $enabled = 1;
+	public $enabled = 1;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
 	 *  Constructor
 	 *
 	 *  @param  DoliDB	$db      	Database handler
-     *  @param	string	$param		More parameters
+	 *  @param	string	$param		More parameters
 	 */
 	public function __construct($db, $param = '')
 	{
@@ -67,10 +67,10 @@ class box_clients extends ModeleBoxes
 	}
 
 	/**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -79,29 +79,23 @@ class box_clients extends ModeleBoxes
 
 		$this->max = $max;
 
-        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-        $thirdpartystatic = new Societe($this->db);
+		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		$thirdpartystatic = new Client($this->db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedCustomers", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedCustomers", $max));
 
 		if ($user->rights->societe->lire)
 		{
-			$sql = "SELECT s.nom as name, s.rowid as socid";
-            $sql .= ", s.code_client";
-            $sql .= ", s.client";
-            $sql .= ", s.code_fournisseur";
-            $sql .= ", s.fournisseur";
-            $sql .= ", s.code_compta";
-            $sql .= ", s.code_compta_fournisseur";
-            $sql .= ", s.logo";
-            $sql .= ", s.email";
-            $sql .= ", s.datec, s.tms, s.status, s.entity";
+			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_client, s.code_compta, s.client";
+			$sql .= ", s.logo, s.email, s.entity";
+			$sql .= ", s.datec, s.tms, s.status";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			$sql .= " WHERE s.client IN (1, 3)";
 			$sql .= " AND s.entity IN (".getEntity('societe').")";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-			if ($user->socid) $sql .= " AND s.rowid = $user->socid";
+			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
 			$sql .= " ORDER BY s.tms DESC";
 			$sql .= $this->db->plimit($max, 0);
 
@@ -117,33 +111,32 @@ class box_clients extends ModeleBoxes
 					$objp = $this->db->fetch_object($result);
 					$datec = $this->db->jdate($objp->datec);
 					$datem = $this->db->jdate($objp->tms);
-                    $thirdpartystatic->id = $objp->socid;
-                    $thirdpartystatic->name = $objp->name;
-                    $thirdpartystatic->code_client = $objp->code_client;
-                    $thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
-                    $thirdpartystatic->code_compta = $objp->code_compta;
-                    $thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
-                    $thirdpartystatic->client = $objp->client;
-                    $thirdpartystatic->fournisseur = $objp->fournisseur;
-                    $thirdpartystatic->logo = $objp->logo;
-                    $thirdpartystatic->email = $objp->email;
+
+					$thirdpartystatic->id = $objp->socid;
+					$thirdpartystatic->name = $objp->name;
+					$thirdpartystatic->name_alias = $objp->name_alias;
+					$thirdpartystatic->code_client = $objp->code_client;
+					$thirdpartystatic->code_compta = $objp->code_compta;
+					$thirdpartystatic->client = $objp->client;
+					$thirdpartystatic->logo = $objp->logo;
+					$thirdpartystatic->email = $objp->email;
 					$thirdpartystatic->entity = $objp->entity;
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $thirdpartystatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $thirdpartystatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datem, "day")
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datem, "day")
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $thirdpartystatic->LibStatut($objp->status, 3)
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $thirdpartystatic->LibStatut($objp->status, 3)
+					);
 
 					$line++;
 				}
@@ -156,15 +149,15 @@ class box_clients extends ModeleBoxes
 				$this->db->free($result);
 			} else {
 				$this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql)
-                );
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql)
+				);
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
 	}
@@ -177,8 +170,8 @@ class box_clients extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index 7ec5071b6e3..3f7875ce7d4 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -32,168 +32,173 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_commandes extends ModeleBoxes
 {
-    public $boxcode = "lastcustomerorders";
-    public $boximg = "object_order";
-    public $boxlabel = "BoxLastCustomerOrders";
-    public $depends = array("commande");
+	public $boxcode = "lastcustomerorders";
+	public $boximg = "object_order";
+	public $boxlabel = "BoxLastCustomerOrders";
+	public $depends = array("commande");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->hidden = !($user->rights->commande->lire);
-    }
+		$this->hidden = !($user->rights->commande->lire);
+	}
 
-    /**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    public function loadBox($max = 5)
-    {
-        global $user, $langs, $conf;
-        $langs->load('orders');
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $user, $langs, $conf;
+		$langs->load('orders');
 
-        $this->max = $max;
+		$this->max = $max;
 
-        include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
-        $commandestatic = new Commande($this->db);
-        $societestatic = new Societe($this->db);
-        $userstatic = new User($this->db);
+		$commandestatic = new Commande($this->db);
+		$societestatic = new Societe($this->db);
+		$userstatic = new User($this->db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."CustomerOrders", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."CustomerOrders", $max));
 
-        if ($user->rights->commande->lire)
-        {
-            $sql = "SELECT s.nom as name";
-            $sql .= ", s.rowid as socid";
-            $sql .= ", s.code_client";
-            $sql .= ", s.logo, s.email";
-            $sql .= ", c.ref, c.tms";
-            $sql .= ", c.rowid";
-            $sql .= ", c.date_commande";
-            $sql .= ", c.ref_client";
-            $sql .= ", c.fk_statut";
-            $sql .= ", c.fk_user_valid";
-            $sql .= ", c.facture";
-            $sql .= ", c.total_ht";
-            $sql .= ", c.tva as total_tva";
-            $sql .= ", c.total_ttc";
-            $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-            $sql .= ", ".MAIN_DB_PREFIX."commande as c";
-            if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql .= " WHERE c.fk_soc = s.rowid";
-            $sql .= " AND c.entity = ".$conf->entity;
-            if (!empty($conf->global->ORDER_BOX_LAST_ORDERS_VALIDATED_ONLY)) $sql .= " AND c.fk_statut = 1";
-            if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-            if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
-            else $sql .= " ORDER BY c.tms DESC, c.ref DESC ";
-            $sql .= $this->db->plimit($max, 0);
+		if ($user->rights->commande->lire)
+		{
+			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_client, s.code_compta, s.client";
+			$sql .= ", s.logo, s.email, s.entity";
+			$sql .= ", c.ref, c.tms";
+			$sql .= ", c.rowid";
+			$sql .= ", c.date_commande";
+			$sql .= ", c.ref_client";
+			$sql .= ", c.fk_statut";
+			$sql .= ", c.fk_user_valid";
+			$sql .= ", c.facture";
+			$sql .= ", c.total_ht";
+			$sql .= ", c.tva as total_tva";
+			$sql .= ", c.total_ttc";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			$sql .= ", ".MAIN_DB_PREFIX."commande as c";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE c.fk_soc = s.rowid";
+			$sql .= " AND c.entity IN (".getEntity('commande').")";
+			if (!empty($conf->global->ORDER_BOX_LAST_ORDERS_VALIDATED_ONLY)) $sql .= " AND c.fk_statut = 1";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
+			else $sql .= " ORDER BY c.tms DESC, c.ref DESC ";
+			$sql .= $this->db->plimit($max, 0);
 
-            $result = $this->db->query($sql);
-            if ($result) {
-                $num = $this->db->num_rows($result);
+			$result = $this->db->query($sql);
+			if ($result) {
+				$num = $this->db->num_rows($result);
 
-                $line = 0;
+				$line = 0;
 
-                while ($line < $num) {
-                    $objp = $this->db->fetch_object($result);
-                    $date = $this->db->jdate($objp->date_commande);
-                    $datem = $this->db->jdate($objp->tms);
-                    $commandestatic->id = $objp->rowid;
-                    $commandestatic->ref = $objp->ref;
-                    $commandestatic->ref_client = $objp->ref_client;
-                    $commandestatic->total_ht = $objp->total_ht;
-                    $commandestatic->total_tva = $objp->total_tva;
-                    $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;
+				while ($line < $num) {
+					$objp = $this->db->fetch_object($result);
+					$date = $this->db->jdate($objp->date_commande);
+					$datem = $this->db->jdate($objp->tms);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $commandestatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$commandestatic->id = $objp->rowid;
+					$commandestatic->ref = $objp->ref;
+					$commandestatic->ref_client = $objp->ref_client;
+					$commandestatic->total_ht = $objp->total_ht;
+					$commandestatic->total_tva = $objp->total_tva;
+					$commandestatic->total_ttc = $objp->total_ttc;
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $societestatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$societestatic->id = $objp->socid;
+					$societestatic->name = $objp->name;
+					//$societestatic->name_alias = $objp->name_alias;
+					$societestatic->code_client = $objp->code_client;
+					$societestatic->code_compta = $objp->code_compta;
+					$societestatic->client = $objp->client;
+					$societestatic->logo = $objp->logo;
+					$societestatic->email = $objp->email;
+					$societestatic->entity = $objp->entity;
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall right"',
-                        'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $commandestatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    if (!empty($conf->global->ORDER_BOX_LAST_ORDERS_SHOW_VALIDATE_USER)) {
-                        if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid);
-                        $this->info_box_contents[$line][] = array(
-                            'td' => 'class="right"',
-                            'text' => (($objp->fk_user_valid > 0) ? $userstatic->getNomUrl(1) : ''),
-                            'asis' => 1,
-                        );
-                    }
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $societestatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($date, 'day'),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall right"',
+						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $commandestatic->LibStatut($objp->fk_statut, $objp->facture, 3),
-                    );
+					if (!empty($conf->global->ORDER_BOX_LAST_ORDERS_SHOW_VALIDATE_USER)) {
+						if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid);
+						$this->info_box_contents[$line][] = array(
+							'td' => 'class="right"',
+							'text' => (($objp->fk_user_valid > 0) ? $userstatic->getNomUrl(1) : ''),
+							'asis' => 1,
+						);
+					}
 
-                    $line++;
-                }
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($date, 'day'),
+					);
 
-                if ($num == 0) $this->info_box_contents[$line][0] = array(
-                	'td' => 'class="center opacitymedium"',
-                	'text'=>$langs->trans("NoRecordedOrders")
-                );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $commandestatic->LibStatut($objp->fk_statut, $objp->facture, 3),
+					);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+					$line++;
+				}
+
+				if ($num == 0) $this->info_box_contents[$line][0] = array(
+					'td' => 'class="center opacitymedium"',
+					'text'=>$langs->trans("NoRecordedOrders")
+				);
+
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -203,8 +208,8 @@ class box_commandes extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php
index b3f23817712..53be2725680 100644
--- a/htdocs/core/boxes/box_comptes.php
+++ b/htdocs/core/boxes/box_comptes.php
@@ -33,28 +33,28 @@ include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
  */
 class box_comptes extends ModeleBoxes
 {
-    public $boxcode = "currentaccounts";
-    public $boximg = "object_bill";
-    public $boxlabel = "BoxCurrentAccounts";
-    public $depends = array("banque"); // Box active if module banque active
+	public $boxcode = "currentaccounts";
+	public $boximg = "object_bill";
+	public $boxlabel = "BoxCurrentAccounts";
+	public $depends = array("banque"); // Box active if module banque active
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
-    public $enabled = 1;
+	public $param;
+	public $enabled = 1;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
 	 *  Constructor
 	 *
 	 *  @param  DoliDB	$db      	Database handler
-     *  @param	string	$param		More parameters
+	 *  @param	string	$param		More parameters
 	 */
 	public function __construct($db, $param = '')
 	{
@@ -73,7 +73,7 @@ class box_comptes extends ModeleBoxes
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -83,109 +83,109 @@ class box_comptes extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleCurrentAccounts"));
 
-        if ($user->rights->banque->lire) {
+		if ($user->rights->banque->lire) {
 			$sql = "SELECT b.rowid, b.ref, b.label, b.bank,b.number, b.courant, b.clos, b.rappro, b.url";
 			$sql .= ", b.code_banque, b.code_guichet, b.cle_rib, b.bic, b.iban_prefix as iban";
 			$sql .= ", b.domiciliation, b.proprio, b.owner_address";
 			$sql .= ", b.account_number, b.currency_code";
 			$sql .= ", b.min_allowed, b.min_desired, comment";
-            $sql .= ', b.fk_accountancy_journal';
-            $sql .= ', aj.code as accountancy_journal';
-            $sql .= " FROM ".MAIN_DB_PREFIX."bank_account as b";
-            $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'accounting_journal as aj ON aj.rowid=b.fk_accountancy_journal';
-            $sql .= " WHERE b.entity = ".$conf->entity;
+			$sql .= ', b.fk_accountancy_journal';
+			$sql .= ', aj.code as accountancy_journal';
+			$sql .= " FROM ".MAIN_DB_PREFIX."bank_account as b";
+			$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'accounting_journal as aj ON aj.rowid=b.fk_accountancy_journal';
+			$sql .= " WHERE b.entity = ".$conf->entity;
 			$sql .= " AND clos = 0";
 			//$sql.= " AND courant = 1";
 			$sql .= " ORDER BY label";
 			$sql .= $this->db->plimit($max, 0);
 
-            dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
-            $result = $this->db->query($sql);
-            if ($result) {
-                $num = $this->db->num_rows($result);
+			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
+			$result = $this->db->query($sql);
+			if ($result) {
+				$num = $this->db->num_rows($result);
 
-                $line = 0;
-                $solde_total = array();
+				$line = 0;
+				$solde_total = array();
 
-                $account_static = new Account($this->db);
-                while ($line < $num) {
-                    $objp = $this->db->fetch_object($result);
+				$account_static = new Account($this->db);
+				while ($line < $num) {
+					$objp = $this->db->fetch_object($result);
 
-                    $account_static->id = $objp->rowid;
+					$account_static->id = $objp->rowid;
 					$account_static->ref = $objp->ref;
-                    $account_static->label = $objp->label;
-                    $account_static->number = $objp->number;
-                    $account_static->account_number = $objp->account_number;
-                    $account_static->currency_code = $objp->currency_code;
-                    $account_static->accountancy_journal = $objp->accountancy_journal;
-                    $solde = $account_static->solde(0);
+					$account_static->label = $objp->label;
+					$account_static->number = $objp->number;
+					$account_static->account_number = $objp->account_number;
+					$account_static->currency_code = $objp->currency_code;
+					$account_static->accountancy_journal = $objp->accountancy_journal;
+					$solde = $account_static->solde(0);
 
-                    $solde_total[$objp->currency_code] += $solde;
+					$solde_total[$objp->currency_code] += $solde;
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $account_static->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $account_static->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $objp->number,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $objp->number,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right nowraponall"',
-                        'text' => price($solde, 0, $langs, 0, -1, -1, $objp->currency_code)
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right nowraponall"',
+						'text' => price($solde, 0, $langs, 0, -1, -1, $objp->currency_code)
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                // Total
-                foreach ($solde_total as $key=>$solde) {
-                    $this->info_box_contents[$line][] = array(
-                        'tr' => 'class="liste_total"',
-                        'td' => 'class="liste_total left"',
-                        'text' => $langs->trans('Total').' '.$key,
-                    );
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="liste_total right"',
-                        'text' => '&nbsp;'
-                    );
+				// Total
+				foreach ($solde_total as $key=>$solde) {
+					$this->info_box_contents[$line][] = array(
+						'tr' => 'class="liste_total"',
+						'td' => 'class="liste_total left"',
+						'text' => $langs->trans('Total').' '.$key,
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="liste_total right"',
+						'text' => '&nbsp;'
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="liste_total right nowraponall"',
-                        'text' => price($solde, 0, $langs, 0, -1, -1, $key)
-                    );
-                    $line++;
-                }
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="liste_total right nowraponall"',
+						'text' => price($solde, 0, $langs, 0, -1, -1, $key)
+					);
+					$line++;
+				}
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
 	}
 
-    /**
-     *  Method to show box
-     *
-     *  @param  array   $head       Array with properties of box title
-     *  @param  array   $contents   Array with properties of box lines
-     *  @param  int     $nooutput   No print, only return string
-     *  @return string
-     */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	/**
+	 *  Method to show box
+	 *
+	 *  @param  array   $head       Array with properties of box title
+	 *  @param  array   $contents   Array with properties of box lines
+	 *  @param  int     $nooutput   No print, only return string
+	 *  @return string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index 7141728c23d..16041a63607 100644
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -35,20 +35,20 @@ include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
  */
 class box_contacts extends ModeleBoxes
 {
-    public $boxcode = "lastcontacts";
-    public $boximg = "object_contact";
-    public $boxlabel = "BoxLastContacts";
-    public $depends = array("societe");
+	public $boxcode = "lastcontacts";
+	public $boximg = "object_contact";
+	public $boxlabel = "BoxLastContacts";
+	public $depends = array("societe");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -59,18 +59,18 @@ class box_contacts extends ModeleBoxes
 	 */
 	public function __construct($db, $param)
 	{
-	    global $user;
+		global $user;
 
-	    $this->db = $db;
+		$this->db = $db;
 
-	    $this->hidden = !($user->rights->societe->lire && $user->rights->societe->contact->lire);
+		$this->hidden = !($user->rights->societe->lire && $user->rights->societe->contact->lire);
 	}
 
 	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -86,8 +86,10 @@ class box_contacts extends ModeleBoxes
 			$sql = "SELECT sp.rowid as id, sp.lastname, sp.firstname, sp.civility as civility_id, sp.datec, sp.tms, sp.fk_soc, sp.statut as status";
 
 			$sql .= ", sp.address, sp.zip, sp.town, sp.phone, sp.phone_perso, sp.phone_mobile, sp.email as spemail";
-			$sql .= ", s.nom as socname, s.name_alias, s.email as semail";
-			$sql .= ", s.client, s.fournisseur, s.code_client, s.code_fournisseur";
+			$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_client, s.code_compta, s.client";
+			$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= ", co.label as country, co.code as country_code";
 			$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON sp.fk_pays = co.rowid";
@@ -121,21 +123,25 @@ class box_contacts extends ModeleBoxes
 					$contactstatic->phone_pro = $objp->phone;
 					$contactstatic->phone_perso = $objp->phone_perso;
 					$contactstatic->phone_mobile = $objp->phone_mobile;
-                    $contactstatic->email = $objp->spemail;
+					$contactstatic->email = $objp->spemail;
 					$contactstatic->address = $objp->address;
 					$contactstatic->zip = $objp->zip;
 					$contactstatic->town = $objp->town;
 					$contactstatic->country = $objp->country;
 					$contactstatic->country_code = $objp->country_code;
 
-					$societestatic->id = $objp->fk_soc;
-					$societestatic->name = $objp->socname;
-                    $societestatic->email = $objp->semail;
-					$societestatic->name_alias = $objp->name_alias;
+					$societestatic->id = $objp->socid;
+					$societestatic->name = $objp->name;
+					//$societestatic->name_alias = $objp->name_alias;
 					$societestatic->code_client = $objp->code_client;
-					$societestatic->code_fournisseur = $objp->code_fournisseur;
+					$societestatic->code_compta = $objp->code_compta;
 					$societestatic->client = $objp->client;
+					$societestatic->code_fournisseur = $objp->code_fournisseur;
+					$societestatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
 					$societestatic->fournisseur = $objp->fournisseur;
+					$societestatic->logo = $objp->logo;
+					$societestatic->email = $objp->email;
+					$societestatic->entity = $objp->entity;
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
@@ -145,7 +151,7 @@ class box_contacts extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-						'text' => ($objp->fk_soc > 0 ? $societestatic->getNomUrl(1) : ''),
+						'text' => ($societestatic->id > 0 ? $societestatic->getNomUrl(1) : ''),
 						'asis' => 1,
 					);
 
@@ -180,8 +186,8 @@ class box_contacts extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php
index 75fbc207134..9350bae2da9 100644
--- a/htdocs/core/boxes/box_contracts.php
+++ b/htdocs/core/boxes/box_contracts.php
@@ -31,158 +31,158 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_contracts extends ModeleBoxes
 {
-    public $boxcode = "lastcontracts";
-    public $boximg = "object_contract";
-    public $boxlabel = "BoxLastContracts";
-    public $depends = array("contrat"); // conf->contrat->enabled
+	public $boxcode = "lastcontracts";
+	public $boximg = "object_contract";
+	public $boxlabel = "BoxLastContracts";
+	public $depends = array("contrat"); // conf->contrat->enabled
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->hidden = !($user->rights->contrat->lire);
-    }
+		$this->hidden = !($user->rights->contrat->lire);
+	}
 
-    /**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    public function loadBox($max = 5)
-    {
-    	global $user, $langs, $conf;
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $user, $langs, $conf;
 
-    	$this->max = $max;
+		$this->max = $max;
 
-    	include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 
-    	$this->info_box_head = array('text' => $langs->trans("BoxTitleLastContracts", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastContracts", $max));
 
-    	if ($user->rights->contrat->lire)
-    	{
-        	$contractstatic = new Contrat($this->db);
-        	$thirdpartytmp = new Societe($this->db);
+		if ($user->rights->contrat->lire)
+		{
+			$contractstatic = new Contrat($this->db);
+			$thirdpartytmp = new Societe($this->db);
 
-    	    $sql = "SELECT s.nom as name, s.rowid as socid, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
-            $sql .= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.datec, c.fin_validite, c.date_cloture";
-            $sql .= ", c.ref_customer, c.ref_supplier";
-    		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
-    		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-    		$sql .= " WHERE c.fk_soc = s.rowid";
-    		$sql .= " AND c.entity = ".$conf->entity;
-    		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-    		if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-    		if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_contrat DESC, c.ref DESC ";
-    		else $sql .= " ORDER BY c.tms DESC, c.ref DESC ";
-    		$sql .= $this->db->plimit($max, 0);
+			$sql = "SELECT s.nom as name, s.rowid as socid, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
+			$sql .= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.datec, c.fin_validite, c.date_cloture";
+			$sql .= ", c.ref_customer, c.ref_supplier";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE c.fk_soc = s.rowid";
+			$sql .= " AND c.entity = ".$conf->entity;
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_contrat DESC, c.ref DESC ";
+			else $sql .= " ORDER BY c.tms DESC, c.ref DESC ";
+			$sql .= $this->db->plimit($max, 0);
 
-    		$resql = $this->db->query($sql);
-    		if ($resql)
-    		{
-    			$num = $this->db->num_rows($resql);
-    			$now = dol_now();
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				$num = $this->db->num_rows($resql);
+				$now = dol_now();
 
-    			$line = 0;
+				$line = 0;
 
-    			$langs->load("contracts");
+				$langs->load("contracts");
 
-                while ($line < $num)
-                {
-    				$objp = $this->db->fetch_object($resql);
+				while ($line < $num)
+				{
+					$objp = $this->db->fetch_object($resql);
 
-    				$datec = $this->db->jdate($objp->datec);
-    				$dateterm = $this->db->jdate($objp->fin_validite);
-    				$dateclose = $this->db->jdate($objp->date_cloture);
-    				$late = '';
+					$datec = $this->db->jdate($objp->datec);
+					$dateterm = $this->db->jdate($objp->fin_validite);
+					$dateclose = $this->db->jdate($objp->date_cloture);
+					$late = '';
 
-    				$contractstatic->statut = $objp->fk_statut;
-    				$contractstatic->id = $objp->rowid;
-    				$contractstatic->ref = $objp->ref;
-    				$contractstatic->ref_customer = $objp->ref_customer;
-    				$contractstatic->ref_supplier = $objp->ref_supplier;
-    				$result = $contractstatic->fetch_lines();
+					$contractstatic->statut = $objp->fk_statut;
+					$contractstatic->id = $objp->rowid;
+					$contractstatic->ref = $objp->ref;
+					$contractstatic->ref_customer = $objp->ref_customer;
+					$contractstatic->ref_supplier = $objp->ref_supplier;
+					$result = $contractstatic->fetch_lines();
 
-    				$thirdpartytmp->name = $objp->name;
-    				$thirdpartytmp->id = $objp->socid;
-    				$thirdpartytmp->email = $objp->email;
-    				$thirdpartytmp->client = $objp->client;
-    				$thirdpartytmp->fournisseur = $objp->fournisseur;
-    				$thirdpartytmp->code_client = $objp->code_client;
-    				$thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
-    				$thirdpartytmp->code_compta = $objp->code_compta;
-    				$thirdpartytmp->code_compta_fournisseur = $objp->code_compta_fournisseur;
+					$thirdpartytmp->name = $objp->name;
+					$thirdpartytmp->id = $objp->socid;
+					$thirdpartytmp->email = $objp->email;
+					$thirdpartytmp->client = $objp->client;
+					$thirdpartytmp->fournisseur = $objp->fournisseur;
+					$thirdpartytmp->code_client = $objp->code_client;
+					$thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartytmp->code_compta = $objp->code_compta;
+					$thirdpartytmp->code_compta_fournisseur = $objp->code_compta_fournisseur;
 
-    				// fin_validite is no more on contract but on services
-    				// if ($objp->fk_statut == 1 && $dateterm < ($now - $conf->contrat->cloture->warning_delay)) { $late = img_warning($langs->trans("Late")); }
+					// fin_validite is no more on contract but on services
+					// if ($objp->fk_statut == 1 && $dateterm < ($now - $conf->contrat->cloture->warning_delay)) { $late = img_warning($langs->trans("Late")); }
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $contractstatic->getNomUrl(1),
-                        'text2'=> $late,
-                        'asis'=>1
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $contractstatic->getNomUrl(1),
+						'text2'=> $late,
+						'asis'=>1
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $thirdpartytmp->getNomUrl(1),
-                        'asis'=>1
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $thirdpartytmp->getNomUrl(1),
+						'asis'=>1
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datec, 'day'),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datec, 'day'),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall right"',
-                        'text' => $contractstatic->getLibStatut(7),
-                        'asis'=>1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall right"',
+						'text' => $contractstatic->getLibStatut(7),
+						'asis'=>1,
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center opacitymedium"',
-                        'text'=>$langs->trans("NoRecordedContracts"),
-                    );
+				if ($num == 0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center opacitymedium"',
+						'text'=>$langs->trans("NoRecordedContracts"),
+					);
 
-                $this->db->free($resql);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($resql);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -192,8 +192,8 @@ class box_contracts extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
new file mode 100644
index 00000000000..407e4459834
--- /dev/null
+++ b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
@@ -0,0 +1,185 @@
+<?php
+/* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2010 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>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/core/boxes/box_clients.php
+ *	\ingroup    Facture
+ *	\brief      Module d'affichage pour les encours dépassés
+ */
+
+include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
+
+
+/**
+ * Class to manage the box to show last thirdparties
+ */
+class box_customers_outstanding_bill_reached extends ModeleBoxes
+{
+	public $boxcode = "customersoutstandingbillreached";
+	public $boximg = "object_company";
+	public $boxlabel = "BoxCustomersOutstandingBillReached";
+	public $depends = array("facture","societe");
+
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
+
+	public $enabled = 1;
+
+	public $info_box_head = array();
+	public $info_box_contents = array();
+
+
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB	$db      	Database handler
+	 *  @param	string	$param		More parameters
+	 */
+	public function __construct($db, $param = '')
+	{
+		global $conf, $user;
+
+		$this->db = $db;
+
+		// disable box for such cases
+		if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled = 0; // disabled by this option
+
+		$this->hidden = !($user->rights->societe->lire && empty($user->socid));
+	}
+
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $user, $langs, $conf;
+		$langs->load("boxes");
+
+		$this->max = $max;
+
+		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		$thirdpartystatic = new Societe($this->db);
+
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastOutstandingBillReached", $max));
+
+		if ($user->rights->societe->lire)
+		{
+			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_client, s.code_compta, s.client";
+			$sql .= ", s.logo, s.email, s.entity";
+			$sql .= ", s.outstanding_limit";
+			$sql .= ", s.datec, s.tms, s.status";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE s.client IN (1, 3)";
+			$sql .= " AND s.entity IN (".getEntity('societe').")";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($user->socid) $sql .= " AND s.rowid = $user->socid";
+			$sql .= " AND s.outstanding_limit > 0";
+			$sql .= " AND s.rowid IN (SELECT fk_soc from ".MAIN_DB_PREFIX."facture as f WHERE f.fk_statut = 1 and f.fk_soc = s.rowid)";
+			$sql .= " ORDER BY s.tms DESC";
+			//$sql .= $this->db->plimit($max, 0);
+
+			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
+			$result = $this->db->query($sql);
+			if ($result)
+			{
+				$num = $this->db->num_rows($result);
+
+				$nboutstandingbillreachedcustomers = 0;
+
+				$line = 0;
+				while ($line < $num)
+				{
+					$objp = $this->db->fetch_object($result);
+					$datec = $this->db->jdate($objp->datec);
+					$datem = $this->db->jdate($objp->tms);
+
+					$thirdpartystatic->id = $objp->socid;
+					$thirdpartystatic->name = $objp->name;
+					//$thirdpartystatic->name_alias = $objp->name_alias;
+					$thirdpartystatic->code_client = $objp->code_client;
+					$thirdpartystatic->code_compta = $objp->code_compta;
+					$thirdpartystatic->client = $objp->client;
+					$thirdpartystatic->logo = $objp->logo;
+					$thirdpartystatic->email = $objp->email;
+					$thirdpartystatic->entity = $objp->entity;
+					$thirdpartystatic->outstanding_limit = $objp->outstanding_limit;
+
+					$outstandingtotal = $thirdpartystatic->getOutstandingBills()['opened'];
+					$outstandinglimit = $thirdpartystatic->outstanding_limit;
+
+					if ($outstandingtotal >= $outstandinglimit)
+					{
+						$this->info_box_contents[$nboutstandingbillreachedcustomers][] = array(
+							'td' => '',
+							'text' => $thirdpartystatic->getNomUrl(1, 'customer'),
+							'asis' => 1,
+						);
+
+						$this->info_box_contents[$nboutstandingbillreachedcustomers][] = array(
+							'td' => 'class="right" width="18"',
+							'text' => $thirdpartystatic->LibStatut($objp->status, 3)
+						);
+						$nboutstandingbillreachedcustomers++;
+					}
+
+					$line++;
+				}
+
+				if ($num == 0 || $nboutstandingbillreachedcustomers == 0) $this->info_box_contents[$line][0] = array(
+					'td' => 'class="center"',
+					'text'=> '<span class="opacitymedium">'.$langs->trans("None").'</span>'
+				);
+
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql)
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
+			);
+		}
+	}
+
+	/**
+	 *	Method to show box
+	 *
+	 *	@param	array	$head       Array with properties of box title
+	 *	@param  array	$contents   Array with properties of box lines
+	 *  @param	int		$nooutput	No print, only return string
+	 *	@return	string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
+}
diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php
index d5cc859eaa7..949f6ac1382 100644
--- a/htdocs/core/boxes/box_external_rss.php
+++ b/htdocs/core/boxes/box_external_rss.php
@@ -34,45 +34,45 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_external_rss extends ModeleBoxes
 {
-    public $boxcode = "lastrssinfos";
-    public $boximg = "object_rss";
-    public $boxlabel = "BoxLastRssInfos";
-    public $depends = array("externalrss");
+	public $boxcode = "lastrssinfos";
+	public $boximg = "object_rss";
+	public $boxlabel = "BoxLastRssInfos";
+	public $depends = array("externalrss");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $paramdef; // Params of box definition (not user params)
+	public $paramdef; // Params of box definition (not user params)
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     * 	@param	DoliDB	$db			Database handler
-     *  @param	string	$param		More parameters
-     */
-    public function __construct($db, $param)
-    {
+	/**
+	 *  Constructor
+	 *
+	 * 	@param	DoliDB	$db			Database handler
+	 *  @param	string	$param		More parameters
+	 */
+	public function __construct($db, $param)
+	{
 		$this->db = $db;
 		$this->paramdef = $param;
-    }
+	}
 
-    /**
+	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        	Maximum number of records to load
-     *  @param	int		$cachedelay		Delay we accept for cache file
-     *  @return	void
-     */
-    public function loadBox($max = 5, $cachedelay = 3600)
-    {
-        global $user, $langs, $conf;
-        $langs->load("boxes");
+	 *  @param	int		$cachedelay		Delay we accept for cache file
+	 *  @return	void
+	 */
+	public function loadBox($max = 5, $cachedelay = 3600)
+	{
+		global $user, $langs, $conf;
+		$langs->load("boxes");
 
 		$this->max = $max;
 
@@ -90,42 +90,42 @@ class box_external_rss extends ModeleBoxes
 		// Get RSS feed
 		$url = $conf->global->$keyforparamurl;
 
-        $rssparser = new RssParser($this->db);
+		$rssparser = new RssParser($this->db);
 		$result = $rssparser->parser($url, $this->max, $cachedelay, $conf->externalrss->dir_temp);
 
 		// INFO on channel
 		$description = $rssparser->getDescription();
 		$link = $rssparser->getLink();
 
-        $title = $langs->trans("BoxTitleLastRssInfos", $max, $conf->global->$keyforparamtitle);
-        if ($result < 0 || !empty($rssparser->error))
-        {
-            // Show warning
-        	$errormessage = $langs->trans("FailedToRefreshDataInfoNotUpToDate", ($rssparser->getLastFetchDate() ? dol_print_date($rssparser->getLastFetchDate(), "dayhourtext") : $langs->trans("Unknown")));
-        	if ($rssparser->error) $errormessage .= " - ".$rssparser->error;
-        	$title .= " ".img_error($errormessage);
-            $this->info_box_head = array('text' => $title, 'limit' => 0);
-        } else {
-            $this->info_box_head = array(
-                'text' => $title,
-                'sublink' => $link,
-                'subtext'=>$langs->trans("LastRefreshDate").': '.($rssparser->getLastFetchDate() ? dol_print_date($rssparser->getLastFetchDate(), "dayhourtext") : $langs->trans("Unknown")),
-                'subpicto'=>'globe',
-                'target'=>'_blank',
-            );
+		$title = $langs->trans("BoxTitleLastRssInfos", $max, $conf->global->$keyforparamtitle);
+		if ($result < 0 || !empty($rssparser->error))
+		{
+			// Show warning
+			$errormessage = $langs->trans("FailedToRefreshDataInfoNotUpToDate", ($rssparser->getLastFetchDate() ? dol_print_date($rssparser->getLastFetchDate(), "dayhourtext") : $langs->trans("Unknown")));
+			if ($rssparser->error) $errormessage .= " - ".$rssparser->error;
+			$title .= " ".img_error($errormessage);
+			$this->info_box_head = array('text' => $title, 'limit' => 0);
+		} else {
+			$this->info_box_head = array(
+				'text' => $title,
+				'sublink' => $link,
+				'subtext'=>$langs->trans("LastRefreshDate").': '.($rssparser->getLastFetchDate() ? dol_print_date($rssparser->getLastFetchDate(), "dayhourtext") : $langs->trans("Unknown")),
+				'subpicto'=>'globe',
+				'target'=>'_blank',
+			);
 		}
 
 		// INFO on items
 		$items = $rssparser->getItems();
-        //print '<pre>'.print_r($items,true).'</pre>';
+		//print '<pre>'.print_r($items,true).'</pre>';
 		$nbitems = count($items);
-        for ($line = 0; $line < $max && $line < $nbitems; $line++)
-        {
-            $item = $items[$line];
+		for ($line = 0; $line < $max && $line < $nbitems; $line++)
+		{
+			$item = $items[$line];
 
 			// Feed common fields
-            $href = $item['link'];
-        	$title = urldecode($item['title']);
+			$href = $item['link'];
+			$title = urldecode($item['title']);
 			$date = $item['date_timestamp']; // date will be empty if conversion into timestamp failed
 			if ($rssparser->getFormat() == 'rss')   // If RSS
 			{
@@ -145,46 +145,46 @@ class box_external_rss extends ModeleBoxes
 			if (is_numeric($date)) $date = dol_print_date($date, "dayhour");
 
 			$isutf8 = utf8_check($title);
-	        if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') $title = utf8_encode($title);
-	        elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') $title = utf8_decode($title);
+			if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') $title = utf8_encode($title);
+			elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') $title = utf8_decode($title);
 
-            $title = preg_replace("/([[:alnum:]])\?([[:alnum:]])/", "\\1'\\2", $title); // Gere probleme des apostrophes mal codee/decodee par utf8
-            $title = preg_replace("/^\s+/", "", $title); // Supprime espaces de debut
-            $this->info_box_contents["$href"] = "$title";
+			$title = preg_replace("/([[:alnum:]])\?([[:alnum:]])/", "\\1'\\2", $title); // Gere probleme des apostrophes mal codee/decodee par utf8
+			$title = preg_replace("/^\s+/", "", $title); // Supprime espaces de debut
+			$this->info_box_contents["$href"] = "$title";
 
-            $tooltip = $title;
-            $description = !empty($item['description']) ? $item['description'] : '';
-            $isutf8 = utf8_check($description);
-            if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') $description = utf8_encode($description);
-            elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') $description = utf8_decode($description);
-            $description = preg_replace("/([[:alnum:]])\?([[:alnum:]])/", "\\1'\\2", $description);
-            $description = preg_replace("/^\s+/", "", $description);
-            $description = str_replace("\r\n", "", $description);
-            $tooltip .= '<br>'.$description;
+			$tooltip = $title;
+			$description = !empty($item['description']) ? $item['description'] : '';
+			$isutf8 = utf8_check($description);
+			if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') $description = utf8_encode($description);
+			elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') $description = utf8_decode($description);
+			$description = preg_replace("/([[:alnum:]])\?([[:alnum:]])/", "\\1'\\2", $description);
+			$description = preg_replace("/^\s+/", "", $description);
+			$description = str_replace("\r\n", "", $description);
+			$tooltip .= '<br>'.$description;
 
-            $this->info_box_contents[$line][0] = array(
-                'td' => 'class="left" width="16"',
-                'logo' => $this->boximg,
-                'url' => $href,
-                'tooltip' => $tooltip,
-                'target' => 'newrss',
-            );
+			$this->info_box_contents[$line][0] = array(
+				'td' => 'class="left" width="16"',
+				'logo' => $this->boximg,
+				'url' => $href,
+				'tooltip' => $tooltip,
+				'target' => 'newrss',
+			);
 
-            $this->info_box_contents[$line][1] = array(
-                'td' => '',
-                'text' => $title,
-                'url' => $href,
-                'tooltip' => $tooltip,
-                'maxlength' => 64,
-                'target' => 'newrss',
-            );
+			$this->info_box_contents[$line][1] = array(
+				'td' => '',
+				'text' => $title,
+				'url' => $href,
+				'tooltip' => $tooltip,
+				'maxlength' => 64,
+				'target' => 'newrss',
+			);
 
-            $this->info_box_contents[$line][2] = array(
-                'td' => 'class="right nowrap"',
-                'text' => $date,
-            );
-        }
-    }
+			$this->info_box_contents[$line][2] = array(
+				'td' => 'class="right nowrap"',
+				'text' => $date,
+			);
+		}
+	}
 
 
 	/**
@@ -195,8 +195,8 @@ class box_external_rss extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index ebaff31268d..011342d8a30 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -30,20 +30,20 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_factures extends ModeleBoxes
 {
-    public $boxcode = "lastcustomerbills";
-    public $boximg = "object_bill";
-    public $boxlabel = "BoxLastCustomerBills";
-    public $depends = array("facture");
+	public $boxcode = "lastcustomerbills";
+	public $boximg = "object_bill";
+	public $boxlabel = "BoxLastCustomerBills";
+	public $depends = array("facture");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -54,18 +54,18 @@ class box_factures extends ModeleBoxes
 	 */
 	public function __construct($db, $param)
 	{
-	    global $user;
+		global $user;
 
-	    $this->db = $db;
+		$this->db = $db;
 
-	    $this->hidden = !($user->rights->facture->lire);
+		$this->hidden = !($user->rights->facture->lire);
 	}
 
 	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -73,13 +73,13 @@ class box_factures extends ModeleBoxes
 
 		$this->max = $max;
 
-        include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
-        $facturestatic = new Facture($this->db);
-        $societestatic = new Societe($this->db);
+		$facturestatic = new Facture($this->db);
+		$societestatic = new Societe($this->db);
 
-        $langs->load("bills");
+		$langs->load("bills");
 
 		$text = $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."CustomerBills", $max);
 		$this->info_box_head = array(
@@ -87,15 +87,18 @@ class box_factures extends ModeleBoxes
 			'limit'=> dol_strlen($text)
 		);
 
-        if ($user->rights->facture->lire) {
-            $sql = "SELECT f.rowid as facid";
-            $sql .= ", f.ref, f.type, f.total as total_ht";
-            $sql .= ", f.tva as total_tva";
-            $sql .= ", f.total_ttc";
-            $sql .= ", f.datef as df";
+		if ($user->rights->facture->lire) {
+			$sql = "SELECT f.rowid as facid";
+			$sql .= ", f.ref, f.type, f.total as total_ht";
+			$sql .= ", f.tva as total_tva";
+			$sql .= ", f.total_ttc";
+			$sql .= ", f.datef as df";
 			$sql .= ", f.paye, f.fk_statut, f.datec, f.tms";
-            $sql .= ", s.rowid as socid, s.nom as name, s.code_client, s.email, s.tva_intra, s.code_compta, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6";
 			$sql .= ", f.date_lim_reglement as datelimite";
+			$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_client, s.code_compta, s.client";
+			$sql .= ", s.logo, s.email, s.entity";
+			$sql .= ", s.tva_intra, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6";
 			$sql .= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			$sql .= ")";
@@ -103,8 +106,8 @@ class box_factures extends ModeleBoxes
 			$sql .= " AND f.entity IN (".getEntity('invoice').")";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 			if ($user->socid)	$sql .= " AND s.rowid = ".$user->socid;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY f.datef DESC, f.ref DESC ";
-            else $sql .= " ORDER BY f.tms DESC, f.ref DESC ";
+			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY f.datef DESC, f.ref DESC ";
+			else $sql .= " ORDER BY f.tms DESC, f.ref DESC ";
 			$sql .= $this->db->plimit($max, 0);
 
 			$result = $this->db->query($sql);
@@ -116,90 +119,95 @@ class box_factures extends ModeleBoxes
 				$line = 0;
 				$l_due_date = $langs->trans('Late').' ('.$langs->trans('DateDue').': %s)';
 
-                while ($line < $num) {
-                    $objp = $this->db->fetch_object($result);
-                    $datelimite = $this->db->jdate($objp->datelimite);
-                    $date = $this->db->jdate($objp->df);
-                    $datem = $this->db->jdate($objp->tms);
+				while ($line < $num) {
+					$objp = $this->db->fetch_object($result);
+					$datelimite = $this->db->jdate($objp->datelimite);
+					$date = $this->db->jdate($objp->df);
+					$datem = $this->db->jdate($objp->tms);
 
-                    $facturestatic->id = $objp->facid;
-                    $facturestatic->ref = $objp->ref;
-                    $facturestatic->type = $objp->type;
-                    $facturestatic->total_ht = $objp->total_ht;
-                    $facturestatic->total_tva = $objp->total_tva;
-                    $facturestatic->total_ttc = $objp->total_ttc;
-                    $facturestatic->statut = $objp->fk_statut;
-                    $facturestatic->date_lim_reglement = $this->db->jdate($objp->datelimite);
+					$facturestatic->id = $objp->facid;
+					$facturestatic->ref = $objp->ref;
+					$facturestatic->type = $objp->type;
+					$facturestatic->total_ht = $objp->total_ht;
+					$facturestatic->total_tva = $objp->total_tva;
+					$facturestatic->total_ttc = $objp->total_ttc;
+					$facturestatic->statut = $objp->fk_statut;
+					$facturestatic->date_lim_reglement = $this->db->jdate($objp->datelimite);
 
-                    $societestatic->id = $objp->socid;
-                    $societestatic->name = $objp->name;
-                    $societestatic->code_client = $objp->code_client;
-                    $societestatic->tva_intra = $objp->tva_intra;
-                    $societestatic->email = $objp->email;
-                    $societestatic->idprof1 = $objp->idprof1;
-                    $societestatic->idprof2 = $objp->idprof2;
-                    $societestatic->idprof3 = $objp->idprof3;
-                    $societestatic->idprof4 = $objp->idprof4;
-                    $societestatic->idprof5 = $objp->idprof5;
-                    $societestatic->idprof6 = $objp->idprof6;
+					$societestatic->id = $objp->socid;
+					$societestatic->name = $objp->name;
+					//$societestatic->name_alias = $objp->name_alias;
+					$societestatic->code_client = $objp->code_client;
+					$societestatic->code_compta = $objp->code_compta;
+					$societestatic->client = $objp->client;
+					$societestatic->logo = $objp->logo;
+					$societestatic->email = $objp->email;
+					$societestatic->entity = $objp->entity;
+					$societestatic->tva_intra = $objp->tva_intra;
+					$societestatic->idprof1 = $objp->idprof1;
+					$societestatic->idprof2 = $objp->idprof2;
+					$societestatic->idprof3 = $objp->idprof3;
+					$societestatic->idprof4 = $objp->idprof4;
+					$societestatic->idprof5 = $objp->idprof5;
+					$societestatic->idprof6 = $objp->idprof6;
 
 					$late = '';
 					if ($facturestatic->hasDelay()) {
-                        $late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
-                    }
+						$late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
+					}
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $facturestatic->getNomUrl(1),
-                        'text2'=> $late,
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $facturestatic->getNomUrl(1),
+						'text2'=> $late,
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax200"',
-                        'text' => $societestatic->getNomUrl(1, '', 40),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax200"',
+						'text' => $societestatic->getNomUrl(1, '', 40),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right nowraponall"',
-                        'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right nowraponall"',
+						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($date, 'day'),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($date, 'day'),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3),
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center"',
-                        'text'=>$langs->trans("NoRecordedInvoices"),
-                    );
+				if ($num == 0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center"',
+						'text'=>$langs->trans("NoRecordedInvoices"),
+					);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *  Method to show box
@@ -209,8 +217,8 @@ class box_factures extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index 30f3cd503c2..d3c1ccd9017 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -31,20 +31,20 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_factures_fourn extends ModeleBoxes
 {
-    public $boxcode = "lastsupplierbills";
-    public $boximg = "object_bill";
-    public $boxlabel = "BoxLastSupplierBills";
-    public $depends = array("facture", "fournisseur");
+	public $boxcode = "lastsupplierbills";
+	public $boximg = "object_bill";
+	public $boxlabel = "BoxLastSupplierBills";
+	public $depends = array("facture", "fournisseur");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -55,18 +55,18 @@ class box_factures_fourn extends ModeleBoxes
 	 */
 	public function __construct($db, $param)
 	{
-	    global $user;
+		global $user;
 
-	    $this->db = $db;
+		$this->db = $db;
 
-	    $this->hidden = !($user->rights->fournisseur->facture->lire);
+		$this->hidden = !($user->rights->fournisseur->facture->lire);
 	}
 
 	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -75,10 +75,10 @@ class box_factures_fourn extends ModeleBoxes
 		$this->max = $max;
 
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 
-        $facturestatic = new FactureFournisseur($this->db);
-        $thirdpartytmp = new Fournisseur($this->db);
+		$facturestatic = new FactureFournisseur($this->db);
+		$thirdpartystatic = new Fournisseur($this->db);
 
 		$this->info_box_head = array(
 			'text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."SupplierBills", $max)
@@ -86,17 +86,17 @@ class box_factures_fourn extends ModeleBoxes
 
 		if ($user->rights->fournisseur->facture->lire)
 		{
-			$sql = "SELECT s.nom as name, s.rowid as socid,";
-            $sql .= " s.code_fournisseur, s.email,";
-            $sql .= " s.logo,";
-			$sql .= " f.rowid as facid, f.ref, f.ref_supplier,";
-            $sql .= " f.total_ht,";
-            $sql .= " f.total_tva,";
-            $sql .= " f.total_ttc,";
-			$sql .= " f.paye, f.fk_statut,";
-			$sql .= ' f.datef as df,';
-			$sql .= ' f.datec as datec,';
-			$sql .= ' f.date_lim_reglement as datelimite, f.tms, f.type';
+			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+			$sql .= ", s.logo, s.email, s.entity";
+			$sql .= ", f.rowid as facid, f.ref, f.ref_supplier";
+			$sql .= ", f.total_ht";
+			$sql .= ", f.total_tva";
+			$sql .= ", f.total_ttc";
+			$sql .= ", f.paye, f.fk_statut";
+			$sql .= ', f.datef as df';
+			$sql .= ', f.datec as datec';
+			$sql .= ', f.date_lim_reglement as datelimite, f.tms, f.type';
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -104,8 +104,8 @@ class box_factures_fourn extends ModeleBoxes
 			$sql .= " AND f.entity = ".$conf->entity;
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY f.datef DESC, f.ref DESC ";
-            else $sql .= " ORDER BY f.tms DESC, f.ref DESC ";
+			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY f.datef DESC, f.ref DESC ";
+			else $sql .= " ORDER BY f.tms DESC, f.ref DESC ";
 			$sql .= $this->db->plimit($max, 0);
 
 			$result = $this->db->query($sql);
@@ -116,96 +116,99 @@ class box_factures_fourn extends ModeleBoxes
 				$line = 0;
 				$l_due_date = $langs->trans('Late').' ('.$langs->trans('DateDue').': %s)';
 
-                while ($line < $num) {
+				while ($line < $num) {
 					$objp = $this->db->fetch_object($result);
 					$datelimite = $this->db->jdate($objp->datelimite);
 					$date = $this->db->jdate($objp->df);
 					$datem = $this->db->jdate($objp->tms);
 
-                    $facturestatic->id = $objp->facid;
-                    $facturestatic->ref = $objp->ref;
-                    $facturestatic->total_ht = $objp->total_ht;
-                    $facturestatic->total_tva = $objp->total_tva;
-                    $facturestatic->total_ttc = $objp->total_ttc;
-                    $facturestatic->date_echeance = $datelimite;
-                    $facturestatic->statut = $objp->fk_statut;
-                    $facturestatic->ref_supplier = $objp->ref_supplier;
+					$facturestatic->id = $objp->facid;
+					$facturestatic->ref = $objp->ref;
+					$facturestatic->total_ht = $objp->total_ht;
+					$facturestatic->total_tva = $objp->total_tva;
+					$facturestatic->total_ttc = $objp->total_ttc;
+					$facturestatic->date_echeance = $datelimite;
+					$facturestatic->statut = $objp->fk_statut;
+					$facturestatic->ref_supplier = $objp->ref_supplier;
 
-                    $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;
+					$thirdpartystatic->id = $objp->socid;
+					$thirdpartystatic->name = $objp->name;
+					//$thirdpartystatic->name_alias = $objp->name_alias;
+					$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
+					$thirdpartystatic->fournisseur = $objp->fournisseur;
+					$thirdpartystatic->logo = $objp->logo;
+					$thirdpartystatic->email = $objp->email;
+					$thirdpartystatic->entity = $objp->entity;
 
 					$late = '';
 
 					if ($facturestatic->hasDelay()) {
-                        $late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
-                    }
+						$late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
+					}
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $facturestatic->getNomUrl(1),
-                        'text2'=> $late,
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $facturestatic->getNomUrl(1),
+						'text2'=> $late,
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150"',
-                        'text' => $objp->ref_supplier,
-                        'tooltip' => $langs->trans('SupplierInvoice').': '.($objp->ref ? $objp->ref : $objp->facid).'<br>'.$langs->trans('RefSupplier').': '.$objp->ref_supplier,
-                        'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150"',
+						'text' => $objp->ref_supplier,
+						'tooltip' => $langs->trans('SupplierInvoice').': '.($objp->ref ? $objp->ref : $objp->facid).'<br>'.$langs->trans('RefSupplier').': '.$objp->ref_supplier,
+						'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150"',
-                        'text' => $thirdpartytmp->getNomUrl(1, 'supplier'),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150"',
+						'text' => $thirdpartystatic->getNomUrl(1, 'supplier'),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right nowraponall"',
-                        'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right nowraponall"',
+						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($date, 'day'),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($date, 'day'),
+					);
 
-                    $fac = new FactureFournisseur($this->db);
-                    $fac->fetch($objp->facid);
-                    $alreadypaid = $fac->getSommePaiement();
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3, $alreadypaid, $objp->type),
-                    );
+					$fac = new FactureFournisseur($this->db);
+					$fac->fetch($objp->facid);
+					$alreadypaid = $fac->getSommePaiement();
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3, $alreadypaid, $objp->type),
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center"',
-                        'text'=>$langs->trans("NoModifiedSupplierBills"),
-                    );
+				if ($num == 0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center"',
+						'text'=>$langs->trans("NoModifiedSupplierBills"),
+					);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->transnoentities("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->transnoentities("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -215,8 +218,8 @@ class box_factures_fourn extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
index c2b5e7c705e..b957e5bf0c1 100644
--- a/htdocs/core/boxes/box_factures_fourn_imp.php
+++ b/htdocs/core/boxes/box_factures_fourn_imp.php
@@ -30,20 +30,20 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_factures_fourn_imp extends ModeleBoxes
 {
-    public $boxcode = "oldestunpaidsupplierbills";
-    public $boximg = "object_bill";
-    public $boxlabel = "BoxOldestUnpaidSupplierBills";
-    public $depends = array("facture", "fournisseur");
+	public $boxcode = "oldestunpaidsupplierbills";
+	public $boximg = "object_bill";
+	public $boxlabel = "BoxOldestUnpaidSupplierBills";
+	public $depends = array("facture", "fournisseur");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -54,18 +54,18 @@ class box_factures_fourn_imp extends ModeleBoxes
 	 */
 	public function __construct($db, $param)
 	{
-	    global $user;
+		global $user;
 
-	    $this->db = $db;
+		$this->db = $db;
 
-	    $this->hidden = !($user->rights->fournisseur->facture->lire);
+		$this->hidden = !($user->rights->fournisseur->facture->lire);
 	}
 
 	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -76,19 +76,21 @@ class box_factures_fourn_imp extends ModeleBoxes
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 		$facturestatic = new FactureFournisseur($this->db);
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
-		$thirdpartytmp = new Fournisseur($this->db);
+		$thirdpartystatic = new Fournisseur($this->db);
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpaidSupplierBills", $max));
 
 		if ($user->rights->fournisseur->facture->lire)
 		{
-			$sql = "SELECT s.nom as name, s.rowid as socid,";
-			$sql .= " f.rowid as facid, f.ref, f.ref_supplier, f.date_lim_reglement as datelimite,";
-			$sql .= " f.datef as df,";
-            $sql .= " f.total_ht as total_ht,";
-            $sql .= " f.tva as total_tva,";
-            $sql .= " f.total_ttc,";
-			$sql .= " f.paye, f.fk_statut, f.type";
+			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+			$sql .= ", s.logo, s.email, s.entity";
+			$sql .= ", f.rowid as facid, f.ref, f.ref_supplier, f.date_lim_reglement as datelimite";
+			$sql .= ", f.datef as df";
+			$sql .= ", f.total_ht as total_ht";
+			$sql .= ", f.tva as total_tva";
+			$sql .= ", f.total_ttc";
+			$sql .= ", f.paye, f.fk_statut, f.type";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= ",".MAIN_DB_PREFIX."facture_fourn as f";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -109,7 +111,7 @@ class box_factures_fourn_imp extends ModeleBoxes
 				$line = 0;
 				$l_due_date = $langs->trans('Late').' ('.$langs->trans('DateDue').': %s)';
 
-                $facturestatic = new FactureFournisseur($this->db);
+				$facturestatic = new FactureFournisseur($this->db);
 
 				while ($line < $num)
 				{
@@ -117,6 +119,7 @@ class box_factures_fourn_imp extends ModeleBoxes
 					$datelimite = $this->db->jdate($objp->datelimite);
 					$date = $this->db->jdate($objp->df);
 					$datem = $this->db->jdate($objp->tms);
+
 					$facturestatic->id = $objp->facid;
 					$facturestatic->ref = $objp->ref;
 					$facturestatic->total_ht = $objp->total_ht;
@@ -124,74 +127,79 @@ class box_factures_fourn_imp extends ModeleBoxes
 					$facturestatic->total_ttc = $objp->total_ttc;
 					$facturestatic->date_echeance = $datelimite;
 					$facturestatic->statut = $objp->fk_statut;
-					$thirdpartytmp->id = $objp->socid;
-					$thirdpartytmp->name = $objp->name;
-					$thirdpartytmp->fournisseur = 1;
-                    $thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
-                    $thirdpartytmp->logo = $objp->logo;
+
+					$thirdpartystatic->id = $objp->socid;
+					$thirdpartystatic->name = $objp->name;
+					//$thirdpartystatic->name_alias = $objp->name_alias;
+					$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
+					$thirdpartystatic->fournisseur = $objp->fournisseur;
+					$thirdpartystatic->logo = $objp->logo;
+					$thirdpartystatic->email = $objp->email;
+					$thirdpartystatic->entity = $objp->entity;
 
 					$late = '';
 					if ($facturestatic->hasDelay()) {
-                        $late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
-                    }
+						$late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
+					}
 
-                    $tooltip = $langs->trans('SupplierInvoice').': '.($objp->ref ? $objp->ref : $objp->facid).'<br>'.$langs->trans('RefSupplier').': '.$objp->ref_supplier;
+					$tooltip = $langs->trans('SupplierInvoice').': '.($objp->ref ? $objp->ref : $objp->facid).'<br>'.$langs->trans('RefSupplier').': '.$objp->ref_supplier;
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $facturestatic->getNomUrl(1),
-                        'text2'=> $late,
-                        'asis' => 1
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $facturestatic->getNomUrl(1),
+						'text2'=> $late,
+						'asis' => 1
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $thirdpartytmp->getNomUrl(1, '', 40),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $thirdpartystatic->getNomUrl(1, '', 40),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall right"',
-                        'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall right"',
+						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datelimite, 'day'),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datelimite, 'day'),
+					);
 
 					$fac = new FactureFournisseur($this->db);
 					$fac->fetch($objp->facid);
 					$alreadypaid = $fac->getSommePaiement();
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3, $alreadypaid, $objp->type),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3, $alreadypaid, $objp->type),
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center"',
-                        'text'=>$langs->trans("NoUnpaidSupplierBills"),
-                    );
+				if ($num == 0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center"',
+						'text'=>$langs->trans("NoUnpaidSupplierBills"),
+					);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -201,8 +209,8 @@ class box_factures_fourn_imp extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index f5fe3e76dde..08233ff754c 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -33,20 +33,20 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
  */
 class box_factures_imp extends ModeleBoxes
 {
-    public $boxcode = "oldestunpaidcustomerbills";
-    public $boximg = "object_bill";
-    public $boxlabel = "BoxOldestUnpaidCustomerBills";
-    public $depends = array("facture");
+	public $boxcode = "oldestunpaidcustomerbills";
+	public $boximg = "object_bill";
+	public $boxlabel = "BoxOldestUnpaidCustomerBills";
+	public $depends = array("facture");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -57,18 +57,18 @@ class box_factures_imp extends ModeleBoxes
 	 */
 	public function __construct($db, $param)
 	{
-	    global $user;
+		global $user;
 
-	    $this->db = $db;
+		$this->db = $db;
 
-	    $this->hidden = !($user->rights->facture->lire);
+		$this->hidden = !($user->rights->facture->lire);
 	}
 
 	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -77,10 +77,10 @@ class box_factures_imp extends ModeleBoxes
 		$this->max = $max;
 
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
-        $facturestatic = new Facture($this->db);
-        $societestatic = new Societe($this->db);
+		$facturestatic = new Facture($this->db);
+		$societestatic = new Societe($this->db);
 
 		$langs->load("bills");
 
@@ -88,16 +88,17 @@ class box_factures_imp extends ModeleBoxes
 
 		if ($user->rights->facture->lire)
 		{
-			$sql = "SELECT s.nom as name, s.rowid as socid, s.email,";
-            $sql .= " s.code_client,";
-            $sql .= " s.logo,";
-			$sql .= " f.ref, f.date_lim_reglement as datelimite,";
-            $sql .= " f.type,";
-			$sql .= " f.datef as df,";
-            $sql .= " f.total as total_ht,";
-            $sql .= " f.tva as total_tva,";
-            $sql .= " f.total_ttc,";
-			$sql .= " f.paye, f.fk_statut, f.rowid as facid";
+			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_client, s.code_compta, s.client";
+			$sql .= ", s.logo, s.email, s.entity";
+			$sql .= ", s.tva_intra, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6";
+			$sql .= ", f.ref, f.date_lim_reglement as datelimite";
+			$sql .= ", f.type";
+			$sql .= ", f.datef as df";
+			$sql .= ", f.total as total_ht";
+			$sql .= ", f.tva as total_tva";
+			$sql .= ", f.total_ttc";
+			$sql .= ", f.paye, f.fk_statut, f.rowid as facid";
 			$sql .= ", sum(pf.amount) as am";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -128,54 +129,64 @@ class box_factures_imp extends ModeleBoxes
 				{
 					$objp = $this->db->fetch_object($result);
 					$datelimite = $this->db->jdate($objp->datelimite);
-                    $facturestatic->id = $objp->facid;
-                    $facturestatic->ref = $objp->ref;
-                    $facturestatic->type = $objp->type;
-                    $facturestatic->total_ht = $objp->total_ht;
-                    $facturestatic->total_tva = $objp->total_tva;
-                    $facturestatic->total_ttc = $objp->total_ttc;
+					$facturestatic->id = $objp->facid;
+					$facturestatic->ref = $objp->ref;
+					$facturestatic->type = $objp->type;
+					$facturestatic->total_ht = $objp->total_ht;
+					$facturestatic->total_tva = $objp->total_tva;
+					$facturestatic->total_ttc = $objp->total_ttc;
 					$facturestatic->statut = $objp->fk_statut;
 					$facturestatic->date_lim_reglement = $this->db->jdate($objp->datelimite);
 
-                    $societestatic->id = $objp->socid;
-                    $societestatic->name = $objp->name;
-                    $societestatic->client = 1;
-                    $societestatic->email = $objp->email;
-                    $societestatic->code_client = $objp->code_client;
-                    $societestatic->logo = $objp->logo;
+					$societestatic->id = $objp->socid;
+					$societestatic->name = $objp->name;
+					//$societestatic->name_alias = $objp->name_alias;
+					$societestatic->code_client = $objp->code_client;
+					$societestatic->code_compta = $objp->code_compta;
+					$societestatic->client = $objp->client;
+					$societestatic->logo = $objp->logo;
+					$societestatic->email = $objp->email;
+					$societestatic->entity = $objp->entity;
+					$societestatic->tva_intra = $objp->tva_intra;
+					$societestatic->idprof1 = $objp->idprof1;
+					$societestatic->idprof2 = $objp->idprof2;
+					$societestatic->idprof3 = $objp->idprof3;
+					$societestatic->idprof4 = $objp->idprof4;
+					$societestatic->idprof5 = $objp->idprof5;
+					$societestatic->idprof6 = $objp->idprof6;
 
 					$late = '';
 					if ($facturestatic->hasDelay()) {
 						$late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
 					}
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $facturestatic->getNomUrl(1),
-                        'text2'=> $late,
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $facturestatic->getNomUrl(1),
+						'text2'=> $late,
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $societestatic->getNomUrl(1, '', 44),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $societestatic->getNomUrl(1, '', 44),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall right"',
-                        'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall right"',
+						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datelimite, 'day'),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datelimite, 'day'),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3, $objp->am),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3, $objp->am),
+					);
 
 					$line++;
 				}
@@ -187,17 +198,17 @@ class box_factures_imp extends ModeleBoxes
 
 				$this->db->free($result);
 			} else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
 			}
 		} else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 	}
 
@@ -209,8 +220,8 @@ class box_factures_imp extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index 2c104bea729..6cc213f98cb 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -31,20 +31,20 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_ficheinter extends ModeleBoxes
 {
-    public $boxcode = "ficheinter";
-    public $boximg = "object_intervention";
-    public $boxlabel = "BoxFicheInter";
-    public $depends = array("ficheinter"); // conf->contrat->enabled
+	public $boxcode = "ficheinter";
+	public $boximg = "object_intervention";
+	public $boxlabel = "BoxFicheInter";
+	public $depends = array("ficheinter"); // conf->contrat->enabled
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -55,11 +55,11 @@ class box_ficheinter extends ModeleBoxes
 	 */
 	public function __construct($db, $param)
 	{
-	    global $user;
+		global $user;
 
-	    $this->db = $db;
+		$this->db = $db;
 
-	    $this->hidden = !($user->rights->ficheinter->lire);
+		$this->hidden = !($user->rights->ficheinter->lire);
 	}
 
 	/**
@@ -67,7 +67,7 @@ class box_ficheinter extends ModeleBoxes
 	 *
 	 *  @param	int		$max        Maximum number of records to load
 	 *  @return	void
-	*/
+	 */
 	public function loadBox($max = 10)
 	{
 		global $user, $langs, $conf;
@@ -76,17 +76,19 @@ class box_ficheinter extends ModeleBoxes
 
 		include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 		$ficheinterstatic = new Fichinter($this->db);
-		$companystatic = new Societe($this->db);
+		$thirdpartystatic = new Societe($this->db);
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastFicheInter", $max));
 
 		if (!empty($user->rights->ficheinter->lire))
 		{
-			$sql = "SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut,";
-			$sql .= " f.datec,";
-			$sql .= " f.date_valid as datev,";
-			$sql .= " f.tms as datem,";
-			$sql .= " s.nom as name, s.rowid as socid, s.client, s.email as semail";
+			$sql = "SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut";
+			$sql .= ", f.datec";
+			$sql .= ", f.date_valid as datev";
+			$sql .= ", f.tms as datem";
+			$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_client, s.code_compta, s.client";
+			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			if (!$user->rights->societe->client->voir) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			$sql .= ", ".MAIN_DB_PREFIX."fichinter as f";
@@ -115,31 +117,37 @@ class box_ficheinter extends ModeleBoxes
 					$ficheinterstatic->id = $objp->rowid;
 					$ficheinterstatic->ref = $objp->ref;
 
-					$companystatic->id = $objp->socid;
-					$companystatic->name = $objp->name;
-					$companystatic->email = $objp->semail;
+					$thirdpartystatic->id = $objp->socid;
+					$thirdpartystatic->name = $objp->name;
+					//$thirdpartystatic->name_alias = $objp->name_alias;
+					$thirdpartystatic->code_client = $objp->code_client;
+					$thirdpartystatic->code_compta = $objp->code_compta;
+					$thirdpartystatic->client = $objp->client;
+					$thirdpartystatic->logo = $objp->logo;
+					$thirdpartystatic->email = $objp->email;
+					$thirdpartystatic->entity = $objp->entity;
 
 					$this->info_box_contents[$i][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $ficheinterstatic->getNomUrl(1),
-                        'asis' => 1,
+						'td' => 'class="nowraponall"',
+						'text' => $ficheinterstatic->getNomUrl(1),
+						'asis' => 1,
 					);
 
 					$this->info_box_contents[$i][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $companystatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $thirdpartystatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
 					$this->info_box_contents[$i][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datec, 'day'),
-                    );
+						'td' => 'class="right"',
+						'text' => dol_print_date($datec, 'day'),
+					);
 
 					$this->info_box_contents[$i][] = array(
-                        'td' => 'class="nowrap right"',
-                        'text' => $ficheinterstatic->getLibStatut(3),
-                        'asis' => 1,
+						'td' => 'class="nowrap right"',
+						'text' => $ficheinterstatic->getLibStatut(3),
+						'asis' => 1,
 					);
 
 					$i++;
@@ -153,15 +161,15 @@ class box_ficheinter extends ModeleBoxes
 				$this->db->free($resql);
 			} else {
 				$this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'class="nohover opacitymedium left"',
-			    'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
 	}
@@ -174,8 +182,8 @@ class box_ficheinter extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index 44dd891bfb8..44e2682585e 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -32,129 +32,131 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_fournisseurs extends ModeleBoxes
 {
-    public $boxcode = "lastsuppliers";
-    public $boximg = "object_company";
-    public $boxlabel = "BoxLastSuppliers";
-    public $depends = array("fournisseur");
+	public $boxcode = "lastsuppliers";
+	public $boximg = "object_company";
+	public $boxlabel = "BoxLastSuppliers";
+	public $depends = array("fournisseur");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->hidden = !($user->rights->societe->lire && empty($user->socid));
-    }
+		$this->hidden = !($user->rights->societe->lire && empty($user->socid));
+	}
 
-    /**
+	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    public function loadBox($max = 5)
-    {
-        global $conf, $user, $langs;
-        $langs->load("boxes");
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf, $user, $langs;
+		$langs->load("boxes");
 
 		$this->max = $max;
 
-        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-        $thirdpartystatic = new Societe($this->db);
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
-		$thirdpartytmp = new Fournisseur($this->db);
+		$thirdpartystatic = new Fournisseur($this->db);
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedSuppliers", $max));
 
-        if ($user->rights->societe->lire)
-        {
-            $sql = "SELECT s.nom as name, s.rowid as socid, s.datec, s.tms, s.status,";
-            $sql .= " s.code_fournisseur, s.email as semail,";
-            $sql .= " s.logo, s.code_compta_fournisseur, s.entity";
-            $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-            if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql .= " WHERE s.fournisseur = 1";
-            $sql .= " AND s.entity IN (".getEntity('societe').")";
-            if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-            if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-            $sql .= " ORDER BY s.tms DESC ";
-            $sql .= $this->db->plimit($max, 0);
+		if ($user->rights->societe->lire)
+		{
+			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+			$sql .= ", s.logo, s.email, s.entity";
+			$sql .= ", s.datec, s.tms, s.status";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE s.fournisseur = 1";
+			$sql .= " AND s.entity IN (".getEntity('societe').")";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+			$sql .= " ORDER BY s.tms DESC ";
+			$sql .= $this->db->plimit($max, 0);
 
-            $result = $this->db->query($sql);
-            if ($result)
-            {
-                $num = $this->db->num_rows($result);
+			$result = $this->db->query($sql);
+			if ($result)
+			{
+				$num = $this->db->num_rows($result);
 
-                $line = 0;
-                while ($line < $num)
-                {
-                    $objp = $this->db->fetch_object($result);
-    				$datec = $this->db->jdate($objp->datec);
-    				$datem = $this->db->jdate($objp->tms);
-					$thirdpartytmp->id = $objp->socid;
-                    $thirdpartytmp->name = $objp->name;
-                    $thirdpartytmp->email = $objp->semail;
-                    $thirdpartytmp->code_client = $objp->code_client;
-                    $thirdpartytmp->logo = $objp->logo;
-                    $thirdpartytmp->code_compta_fournisseur = $objp->code_compta_fournisseur;
-                    $thirdpartytmp->entity = $objp->entity;
+				$line = 0;
+				while ($line < $num)
+				{
+					$objp = $this->db->fetch_object($result);
+					$datec = $this->db->jdate($objp->datec);
+					$datem = $this->db->jdate($objp->tms);
 
-                   	$this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $thirdpartytmp->getNomUrl(1, '', 40),
-                        'asis' => 1,
-                    );
+					$thirdpartystatic->id = $objp->socid;
+					$thirdpartystatic->name = $objp->name;
+					$thirdpartystatic->name_alias = $objp->name_alias;
+					$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
+					$thirdpartystatic->fournisseur = $objp->fournisseur;
+					$thirdpartystatic->logo = $objp->logo;
+					$thirdpartystatic->email = $objp->email;
+					$thirdpartystatic->entity = $objp->entity;
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datem, "day"),
-                    );
+				   	$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $thirdpartystatic->getNomUrl(1, '', 40),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $thirdpartystatic->LibStatut($objp->status, 3),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datem, "day"),
+					);
 
-                    $line++;
-                }
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $thirdpartystatic->LibStatut($objp->status, 3),
+					);
 
-                if ($num == 0) $this->info_box_contents[$line][0] = array(
-                    'td' => 'class="center opacitymedium"',
-                    'text'=>$langs->trans("NoRecordedSuppliers"),
-                );
+					$line++;
+				}
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				if ($num == 0) $this->info_box_contents[$line][0] = array(
+					'td' => 'class="center opacitymedium"',
+					'text'=>$langs->trans("NoRecordedSuppliers"),
+				);
+
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -164,8 +166,8 @@ class box_fournisseurs extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_funnel_of_prospection.php b/htdocs/core/boxes/box_funnel_of_prospection.php
new file mode 100644
index 00000000000..a50426e1b29
--- /dev/null
+++ b/htdocs/core/boxes/box_funnel_of_prospection.php
@@ -0,0 +1,300 @@
+<?php
+/* Copyright (C) 2012-2014 Charles-François BENKE <charles.fr@benke.fr>
+ * Copyright (C) 2014      Marcos García          <marcosgdf@gmail.com>
+ * Copyright (C) 2015      Frederic France        <frederic.france@free.fr>
+ * Copyright (C) 2016      Juan José Menent       <jmenent@2byte.es>
+ * Copyright (C) 2020      Pierre Ardoin          <mapiolca@me.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/core/boxes/box_funnel_of_prospection.php
+ *  \ingroup    projet
+ *  \brief      Module to show the funnel of prospection
+ */
+include_once DOL_DOCUMENT_ROOT . "/core/boxes/modules_boxes.php";
+
+/**
+ * Class to manage the box to show last projet
+ */
+class box_funnel_of_prospection extends ModeleBoxes
+{
+	public $boxcode = "FunnelOfProspection";
+	public $boximg = "object_projectpub";
+	public $boxlabel = "BoxTitleFunnelOfProspection";
+	public $depends = array("projet");
+
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
+
+	public $param;
+
+	public $info_box_head = array();
+	public $info_box_contents = array();
+
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param = '')
+	{
+		global $user, $langs, $conf;
+
+		// Load translation files required by the page
+		$langs->loadLangs(array('boxes', 'projects'));
+
+		$this->db = $db;
+
+		$this->hidden = !($user->rights->projet->lire);
+	}
+
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @param   int		$max        Maximum number of records to load
+	 *  @return  void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf;
+
+		// default values
+		$badgeStatus0 = '#cbd3d3'; // draft
+		$badgeStatus1 = '#bc9526'; // validated
+		$badgeStatus1b = '#bc9526'; // validated
+		$badgeStatus2 = '#9c9c26'; // approved
+		$badgeStatus3 = '#bca52b';
+		$badgeStatus4 = '#25a580'; // Color ok
+		$badgeStatus4b = '#25a580'; // Color ok
+		$badgeStatus5 = '#cad2d2';
+		$badgeStatus6 = '#cad2d2';
+		$badgeStatus7 = '#baa32b';
+		$badgeStatus8 = '#993013';
+		$badgeStatus9 = '#e7f0f0';
+		if (file_exists(DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php')) {
+			include DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php';
+		}
+		$listofoppstatus = array();
+		$listofopplabel = array();
+		$listofoppcode = array();
+		$colorseriesstat = array();
+		$sql = "SELECT cls.rowid, cls.code, cls.percent, cls.label";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "c_lead_status as cls";
+		$sql .= " WHERE active=1";
+		$sql .= " AND cls.code <> 'LOST'";
+		$sql .= $this->db->order('cls.rowid', 'ASC');
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+
+			while ($i < $num) {
+				$objp = $this->db->fetch_object($resql);
+				$listofoppstatus[$objp->rowid] = $objp->percent;
+				$listofopplabel[$objp->rowid] = $objp->label;
+				$listofoppcode[$objp->rowid] = $objp->code;
+				switch ($objp->code) {
+					case 'PROSP':
+						$colorseriesstat[$objp->rowid] = "-" . $badgeStatus0;
+						break;
+					case 'QUAL':
+						$colorseriesstat[$objp->rowid] = "-" . $badgeStatus1;
+						break;
+					case 'PROPO':
+						$colorseriesstat[$objp->rowid] = $badgeStatus1;
+						break;
+					case 'NEGO':
+						$colorseriesstat[$objp->rowid] = $badgeStatus4;
+						break;
+					case 'WON':
+						$colorseriesstat[$objp->rowid] = $badgeStatus6;
+						break;
+					default:
+						break;
+				}
+				$i++;
+			}
+		} else {
+			dol_print_error($this->db);
+		}
+
+		global $conf, $user, $langs;
+		$this->max = $max;
+
+		$this->info_box_head = array(
+			'text' => $langs->trans("Statistics") . ' - ' . $langs->trans("BoxTitleFunnelOfProspection"),
+			'graph' => '1'
+		);
+
+		if ($user->rights->projet->lire || !empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+			$sql = "SELECT p.fk_opp_status as opp_status, cls.code, COUNT(p.rowid) as nb, SUM(p.opp_amount) as opp_amount, SUM(p.opp_amount * p.opp_percent) as ponderated_opp_amount";
+			$sql .= " FROM " . MAIN_DB_PREFIX . "projet as p, " . MAIN_DB_PREFIX . "c_lead_status as cls";
+			$sql .= " WHERE p.entity IN (" . getEntity('project') . ")";
+			$sql .= " AND p.fk_opp_status = cls.rowid";
+			$sql .= " AND p.fk_statut = 1"; // Opend projects only
+			$sql .= " AND cls.code NOT IN ('LOST')";
+			$sql .= " GROUP BY p.fk_opp_status, cls.code";
+			$resql = $this->db->query($sql);
+
+			$form = new Form($this->db);
+			if ($resql) {
+				$num = $this->db->num_rows($resql);
+				$i = 0;
+
+				$totalnb = 0;
+				$totaloppnb = 0;
+				$totalamount = 0;
+				$ponderated_opp_amount = 0;
+				$valsnb = array();
+				$valsamount = array();
+				$dataseries = array();
+
+				while ($i < $num) {
+					$obj = $this->db->fetch_object($resql);
+					if ($obj) {
+						$valsnb[$obj->opp_status] = $obj->nb;
+						$valsamount[$obj->opp_status] = $obj->opp_amount;
+						$totalnb += $obj->nb;
+						if ($obj->opp_status) {
+							$totaloppnb += $obj->nb;
+						}
+						if (!in_array($obj->code, array('WON', 'LOST'))) {
+							$totalamount += $obj->opp_amount;
+							$ponderated_opp_amount += $obj->ponderated_opp_amount;
+						}
+					}
+					$i++;
+				}
+				$this->db->free($resql);
+				$ponderated_opp_amount = $ponderated_opp_amount / 100;
+
+				$stringtoprint = '';
+				$stringtoprint .= '<div class="div-table-responsive-no-min ">';
+				$listofstatus = array_keys($listofoppstatus);
+				$liststatus = array();
+				$data = array('');
+				foreach ($listofstatus as $status) {
+					$labelStatus = '';
+					if ($status != 7) {
+						$code = dol_getIdFromCode($this->db, $status, 'c_lead_status', 'rowid', 'code');
+						if ($code) {
+							$labelStatus = $langs->transnoentitiesnoconv("OppStatus" . $code);
+						}
+						if (empty($labelStatus)) {
+							$labelStatus = $listofopplabel[$status];
+						}
+
+						$data[] = (isset($valsamount[$status]) ? (float) $valsamount[$status] : 0);
+						$liststatus[] = $labelStatus;
+						if (!$conf->use_javascript_ajax) {
+							$stringtoprint .= '<tr class="oddeven">';
+							$stringtoprint .= '<td>' . $labelStatus . '</td>';
+							$stringtoprint .= '<td class="right"><a href="list.php?statut=' . $status . '">' . price((isset($valsamount[$status]) ? (float) $valsamount[$status] : 0), 0, '', 1, -1, -1, $conf->currency) . '</a></td>';
+							$stringtoprint .= "</tr>\n";
+						}
+					}
+				}
+				$dataseries[] = $data;
+				if ($conf->use_javascript_ajax) {
+					include_once DOL_DOCUMENT_ROOT . '/core/class/dolgraph.class.php';
+					$dolgraph = new DolGraph();
+					$dolgraph->SetMinValue(0);
+					$dolgraph->SetData($dataseries);
+					$dolgraph->SetLegend($liststatus);
+					$dolgraph->SetDataColor(array_values($colorseriesstat));
+					$dolgraph->setShowLegend(2);
+					$dolgraph->setShowPercent(1);
+					$dolgraph->setTitle('');
+					$dolgraph->SetType(array('horizontalbars'));
+					$dolgraph->SetHeight('200');
+					$dolgraph->SetWidth('600');
+					$dolgraph->mode = 'depth';
+					$dolgraph->draw('idgraphleadfunnel');
+					$stringtoprint .= $dolgraph->show($totaloppnb ? 0 : 1);
+				}
+				$stringtoprint .= '</div>';
+
+				$line = 0;
+				$this->info_box_contents[$line][] = array(
+					'tr' => 'class="nohover left "',
+					'text' => ''
+				);
+				$this->info_box_contents[$line][] = array(
+					'tr' => 'class="nohover left "',
+					'text' => ''
+				);
+				$line++;
+				$this->info_box_contents[$line][] = array(
+					'tr' => '',
+					'td' => 'class="center nopaddingleftimp nopaddingrightimp" colspan="2"',
+					'text' => $stringtoprint
+				);
+				$line++;
+				$this->info_box_contents[$line][] = array(
+					'tr' => 'class="oddeven"',
+					'td' => 'class="left "',
+					'maxlength' => 500,
+					'text' => $langs->trans("OpportunityTotalAmount") . ' (' . $langs->trans("WonLostExcluded") . ')'
+				);
+				$this->info_box_contents[$line][] = array(
+					'tr' => 'class="oddeven"',
+					'td' => 'class="right "',
+					'maxlength' => 500,
+					'text' => price($totalamount, 0, '', 1, -1, -1, $conf->currency)
+				);
+				$line++;
+				$this->info_box_contents[$line][] = array(
+					'tr' => 'class="oddeven"',
+					'td' => 'class="left "',
+					'maxlength' => 500,
+					'text' => $form->textwithpicto($langs->trans("OpportunityPonderatedAmount") . ' (' . $langs->trans("WonLostExcluded") . ')', $langs->trans("OpportunityPonderatedAmountDesc"), 1)
+
+				);
+				$this->info_box_contents[$line][] = array(
+					'td' => 'class="right "',
+					'maxlength' => 500,
+					'text' => price(price2num($ponderated_opp_amount, 'MT'), 0, '', 1, -1, -1, $conf->currency)
+				);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => 'class="center opacitymedium"',
+					'text' => $langs->trans("NoRecordedCustomers")
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => '',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
+
+	/**
+	 *	Method to show box
+	 *
+	 *	@param	array	$head       Array with properties of box title
+	 *	@param  array	$contents   Array with properties of box lines
+	 *  @param	int		$nooutput	No $stringtoprint .=, only return string
+	 *	@return	string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
+}
diff --git a/htdocs/core/boxes/box_goodcustomers.php b/htdocs/core/boxes/box_goodcustomers.php
index 66497c2e94f..7efecc4001c 100644
--- a/htdocs/core/boxes/box_goodcustomers.php
+++ b/htdocs/core/boxes/box_goodcustomers.php
@@ -33,27 +33,27 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_goodcustomers extends ModeleBoxes
 {
-    public $boxcode = "goodcustomers";
-    public $boximg = "object_company";
-    public $boxlabel = "BoxGoodCustomers";
-    public $depends = array("societe");
+	public $boxcode = "goodcustomers";
+	public $boximg = "object_company";
+	public $boxlabel = "BoxGoodCustomers";
+	public $depends = array("societe");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $enabled = 1;
+	public $enabled = 1;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
 	 *  Constructor
 	 *
 	 *  @param  DoliDB	$db      	Database handler
-     *  @param	string	$param		More parameters
+	 *  @param	string	$param		More parameters
 	 */
 	public function __construct($db, $param = '')
 	{
@@ -69,10 +69,10 @@ class box_goodcustomers extends ModeleBoxes
 	}
 
 	/**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -81,10 +81,10 @@ class box_goodcustomers extends ModeleBoxes
 
 		$this->max = $max;
 
-        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-        $thirdpartystatic = new Societe($this->db);
+		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		$thirdpartystatic = new Societe($this->db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleGoodCustomers", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleGoodCustomers", $max));
 
 		if ($user->rights->societe->lire)
 		{
@@ -119,24 +119,24 @@ class box_goodcustomers extends ModeleBoxes
 					$nbimpaye = $objp->nbfact - $objp->nbfactpaye;
 
 					$this->info_box_contents[$line][] = array(
-					    'td' => '',
-					    'text' => $thirdpartystatic->getNomUrl(1),
-					    'asis' => 1,
+						'td' => '',
+						'text' => $thirdpartystatic->getNomUrl(1),
+						'asis' => 1,
 					);
 
 					$this->info_box_contents[$line][] = array(
-					    'td' => 'class="right"',
-					    'text' => dol_print_date($datem, "day")
+						'td' => 'class="right"',
+						'text' => dol_print_date($datem, "day")
 					);
 
 					$this->info_box_contents[$line][] = array(
-					    'td' => 'class="right"',
-					    'text' => $nbfact.($nbimpaye != 0 ? ' ('.$nbimpaye.')' : '')
+						'td' => 'class="right"',
+						'text' => $nbfact.($nbimpaye != 0 ? ' ('.$nbimpaye.')' : '')
 					);
 
 					$this->info_box_contents[$line][] = array(
-					    'td' => 'class="right" width="18"',
-					    'text' => $thirdpartystatic->LibStatut($objp->status, 3)
+						'td' => 'class="right" width="18"',
+						'text' => $thirdpartystatic->LibStatut($objp->status, 3)
 					);
 
 					$line++;
@@ -150,14 +150,14 @@ class box_goodcustomers extends ModeleBoxes
 				$this->db->free($result);
 			} else {
 				$this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'class="nohover opacitymedium left"',
+				'td' => 'class="nohover opacitymedium left"',
 				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
@@ -171,8 +171,8 @@ class box_goodcustomers extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index 9d5aeda7b36..983bb75cbc3 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -28,18 +28,18 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_graph_invoices_permonth extends ModeleBoxes
 {
-    public $boxcode = "invoicespermonth";
-    public $boximg = "object_bill";
-    public $boxlabel = "BoxCustomersInvoicesPerMonth";
-    public $depends = array("facture");
+	public $boxcode = "invoicespermonth";
+	public $boximg = "object_bill";
+	public $boxlabel = "BoxCustomersInvoicesPerMonth";
+	public $depends = array("facture");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -61,7 +61,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -141,9 +141,9 @@ class box_graph_invoices_permonth extends ModeleBoxes
 				$mesg = $px1->isGraphKo();
 				if (!$mesg)
 				{
-				    $langs->load("bills");
+					$langs->load("bills");
 
-				    $px1->SetData($data1);
+					$px1->SetData($data1);
 					unset($data1);
 					$i = $startyear; $legend = array();
 					while ($i <= $endyear)
@@ -186,7 +186,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 				$mesg = $px2->isGraphKo();
 				if (!$mesg)
 				{
-				    $langs->load("bills");
+					$langs->load("bills");
 
 					$px2->SetData($data2);
 					unset($data2);
@@ -269,8 +269,8 @@ class box_graph_invoices_permonth extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
@@ -283,8 +283,8 @@ class box_graph_invoices_permonth extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index b9fde24b759..1490f5ea6e9 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -28,18 +28,18 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_graph_invoices_supplier_permonth extends ModeleBoxes
 {
-    public $boxcode = "invoicessupplierpermonth";
-    public $boximg = "object_bill";
-    public $boxlabel = "BoxSuppliersInvoicesPerMonth";
-    public $depends = array("fournisseur");
+	public $boxcode = "invoicessupplierpermonth";
+	public $boximg = "object_bill";
+	public $boxlabel = "BoxSuppliersInvoicesPerMonth";
+	public $depends = array("fournisseur");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -61,7 +61,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -130,7 +130,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."invoicessuppliernbinyear-".$year.".png";
-                // default value for customer mode
+				// default value for customer mode
 				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesnbinyear-'.$year.'.png';
 				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessuppliernbinyear-'.$year.'.png';
 
@@ -138,12 +138,12 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 				$mesg = $px1->isGraphKo();
 				if (!$mesg)
 				{
-				    $langs->load("bills");
+					$langs->load("bills");
 
-				    $px1->SetData($data1);
+					$px1->SetData($data1);
 					unset($data1);
 					$i = $startyear;
-                    $legend = array();
+					$legend = array();
 					while ($i <= $endyear)
 					{
 						if ($startmonth != 1)
@@ -183,7 +183,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 				$mesg = $px2->isGraphKo();
 				if (!$mesg)
 				{
-				    $langs->load("bills");
+					$langs->load("bills");
 
 					$px2->SetData($data2);
 					unset($data2);
@@ -263,16 +263,16 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'class="nohover center"', 'textnoformat'=>$stringtoshow);
 			} else {
 				$this->info_box_contents[0][0] = array(
-                    'tr'=>'class="oddeven nohover"',
-                    'td' => 'class="nohover left"',
-                    'maxlength'=>500,
-                    'text' => $mesg,
-                );
+					'tr'=>'class="oddeven nohover"',
+					'td' => 'class="nohover left"',
+					'maxlength'=>500,
+					'text' => $mesg,
+				);
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
 	}
@@ -285,8 +285,8 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index 2ff1a579798..d9c26620553 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -28,18 +28,18 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_graph_orders_permonth extends ModeleBoxes
 {
-    public $boxcode = "orderspermonth";
-    public $boximg = "object_order";
-    public $boxlabel = "BoxCustomersOrdersPerMonth";
-    public $depends = array("commande");
+	public $boxcode = "orderspermonth";
+	public $boximg = "object_order";
+	public $boxlabel = "BoxCustomersOrdersPerMonth";
+	public $depends = array("commande");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -61,7 +61,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -97,9 +97,9 @@ class box_graph_orders_permonth extends ModeleBoxes
 
 		if ($user->rights->commande->lire)
 		{
-		    $langs->load("orders");
+			$langs->load("orders");
 
-		    $param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
+			$param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
 			$param_shownb = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
 			$param_showtot = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
 
@@ -133,7 +133,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."ordersnbinyear-".$endyear.".png";
-                // default value for customer mode
+				// default value for customer mode
 				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersnbinyear-'.$endyear.'.png';
 				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&amp;file=ordersnbinyear-'.$endyear.'.png';
 
@@ -144,7 +144,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 					$px1->SetData($data1);
 					unset($data1);
 					$i = $startyear;
-                    $legend = array();
+					$legend = array();
 					while ($i <= $endyear)
 					{
 						if ($startmonth != 1)
@@ -176,7 +176,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."ordersamountinyear-".$endyear.".png";
-                // default value for customer mode
+				// default value for customer mode
 				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersamountinyear-'.$endyear.'.png';
 				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&amp;file=ordersamountinyear-'.$endyear.'.png';
 
@@ -260,22 +260,22 @@ class box_graph_orders_permonth extends ModeleBoxes
 					$stringtoshow .= '</div>';
 				}
 				$this->info_box_contents[0][0] = array(
-                    'tr'=>'class="oddeven nohover"',
-                    'td' => 'class="nohover center"',
-                    'textnoformat'=>$stringtoshow,
-                );
+					'tr'=>'class="oddeven nohover"',
+					'td' => 'class="nohover center"',
+					'textnoformat'=>$stringtoshow,
+				);
 			} else {
 				$this->info_box_contents[0][0] = array(
-                    'tr'=>'class="oddeven nohover"',
-                    'td' => 'class="nohover left"',
-                    'maxlength'=>500,
-                    'text' => $mesg,
-                );
+					'tr'=>'class="oddeven nohover"',
+					'td' => 'class="nohover left"',
+					'maxlength'=>500,
+					'text' => $mesg,
+				);
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
 	}
@@ -288,8 +288,8 @@ class box_graph_orders_permonth extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *  @return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index fb40ee1f68f..765c6324516 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -28,18 +28,18 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_graph_orders_supplier_permonth extends ModeleBoxes
 {
-    public $boxcode = "orderssupplierpermonth";
-    public $boximg = "object_order";
-    public $boxlabel = "BoxSuppliersOrdersPerMonth";
-    public $depends = array("fournisseur");
+	public $boxcode = "orderssupplierpermonth";
+	public $boximg = "object_order";
+	public $boxlabel = "BoxSuppliersOrdersPerMonth";
+	public $depends = array("fournisseur");
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -61,7 +61,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -96,9 +96,9 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 
 		if ($user->rights->fournisseur->commande->lire)
 		{
-		    $langs->load("orders");
+			$langs->load("orders");
 
-		    $param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
+			$param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
 			$param_shownb = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
 			$param_showtot = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
 
@@ -259,22 +259,22 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 					$stringtoshow .= '</div>';
 				}
 				$this->info_box_contents[0][0] = array(
-                    'tr'=>'class="oddeven nohover"',
-                    'td' => 'class="nohover center"',
-                    'textnoformat'=>$stringtoshow,
-                );
+					'tr'=>'class="oddeven nohover"',
+					'td' => 'class="nohover center"',
+					'textnoformat'=>$stringtoshow,
+				);
 			} else {
 				$this->info_box_contents[0][0] = array(
-                    'tr'=>'class="oddeven nohover"',
-                    'td' => 'class="nohover left"',
-                    'maxlength'=>500,
-                    'text' => $mesg,
-                );
+					'tr'=>'class="oddeven nohover"',
+					'td' => 'class="nohover left"',
+					'maxlength'=>500,
+					'text' => $mesg,
+				);
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
 	}
@@ -287,8 +287,8 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index 957277005e7..407c66177b5 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -29,20 +29,20 @@ include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
  */
 class box_graph_product_distribution extends ModeleBoxes
 {
-    public $boxcode = "productdistribution";
-    public $boximg = "object_product";
-    public $boxlabel = "BoxProductDistribution";
-    public $depends = array("product|service", "facture|propal|commande");
+	public $boxcode = "productdistribution";
+	public $boximg = "object_product";
+	public $boxlabel = "BoxProductDistribution";
+	public $depends = array("product|service", "facture|propal|commande");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -58,7 +58,7 @@ class box_graph_product_distribution extends ModeleBoxes
 		$this->db = $db;
 
 		$this->hidden = !(
-		    (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire))
+			(!empty($conf->facture->enabled) && !empty($user->rights->facture->lire))
 		 || (!empty($conf->commande->enabled) && !empty($user->rights->commande->lire))
 		 || (!empty($conf->propal->enabled) && !empty($user->rights->propale->lire))
 		);
@@ -68,7 +68,7 @@ class box_graph_product_distribution extends ModeleBoxes
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -138,7 +138,7 @@ class box_graph_product_distribution extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showpropalnb)
 			{
-                $langs->load("propal");
+				$langs->load("propal");
 				include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propalestats.class.php';
 
 				$showpointvalue = 1; $nocolor = 0;
@@ -197,7 +197,7 @@ class box_graph_product_distribution extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showordernb)
 			{
-			    $langs->load("orders");
+				$langs->load("orders");
 				include_once DOL_DOCUMENT_ROOT.'/commande/class/commandestats.class.php';
 
 				$showpointvalue = 1; $nocolor = 0;
@@ -315,8 +315,8 @@ class box_graph_product_distribution extends ModeleBoxes
 
 		if (empty($nbofgraph))
 		{
-		    $langs->load("errors");
-		    $mesg = $langs->trans("ReadPermissionNotAllowed");
+			$langs->load("errors");
+			$mesg = $langs->trans("ReadPermissionNotAllowed");
 		}
 		if (empty($conf->use_javascript_ajax))
 		{
@@ -388,13 +388,13 @@ class box_graph_product_distribution extends ModeleBoxes
 				$stringtoshow .= '</div></div>';
 			}
 			$this->info_box_contents[0][0] = array(
-                'tr'=>'class="oddeven nohover"',
-                'td' => 'class="nohover center"',
-                'textnoformat'=>$stringtoshow,
-            );
+				'tr'=>'class="oddeven nohover"',
+				'td' => 'class="nohover center"',
+				'textnoformat'=>$stringtoshow,
+			);
 		} else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'class="nohover opacitymedium left"',
+				'td' => 'class="nohover opacitymedium left"',
 				'maxlength'=>500,
 				'text' => $mesg
 			);
@@ -409,8 +409,8 @@ class box_graph_product_distribution extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index 4231638948a..de1a1f8de83 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -28,18 +28,18 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_graph_propales_permonth extends ModeleBoxes
 {
-    public $boxcode = "propalpermonth";
-    public $boximg = "object_propal";
-    public $boxlabel = "BoxProposalsPerMonth";
-    public $depends = array("propal");
+	public $boxcode = "propalpermonth";
+	public $boximg = "object_propal";
+	public $boxlabel = "BoxProposalsPerMonth";
+	public $depends = array("propal");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -61,7 +61,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -191,7 +191,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 					{
 						if ($startmonth != 1)
 						{
-                            $legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
+							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
 						} else {
 							$legend[] = $i;
 						}
@@ -260,22 +260,22 @@ class box_graph_propales_permonth extends ModeleBoxes
 					$stringtoshow .= '</div>';
 				}
 				$this->info_box_contents[0][0] = array(
-                    'tr'=>'class="oddeven nohover"',
-                    'td' => 'class="nohover center"',
-                    'textnoformat'=>$stringtoshow,
-                );
+					'tr'=>'class="oddeven nohover"',
+					'td' => 'class="nohover center"',
+					'textnoformat'=>$stringtoshow,
+				);
 			} else {
 				$this->info_box_contents[0][0] = array(
-                    'tr'=>'class="oddeven nohover"',
-                    'td' => 'class="nohover left"',
-                    'maxlength' => 500,
-                    'text' => $mesg,
-                );
+					'tr'=>'class="oddeven nohover"',
+					'td' => 'class="nohover left"',
+					'maxlength' => 500,
+					'text' => $mesg,
+				);
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
 	}
@@ -288,8 +288,8 @@ class box_graph_propales_permonth extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_last_modified_ticket.php b/htdocs/core/boxes/box_last_modified_ticket.php
index f6bbbb76854..94734894ad7 100644
--- a/htdocs/core/boxes/box_last_modified_ticket.php
+++ b/htdocs/core/boxes/box_last_modified_ticket.php
@@ -31,179 +31,179 @@ require_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
 class box_last_modified_ticket extends ModeleBoxes
 {
 
-    public $boxcode = "box_last_modified_ticket";
-    public $boximg = "ticket";
-    public $boxlabel;
-    public $depends = array("ticket");
+	public $boxcode = "box_last_modified_ticket";
+	public $boximg = "ticket";
+	public $boxlabel;
+	public $depends = array("ticket");
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $param;
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
-    /**
-     * Constructor
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param = '')
-    {
-        global $langs;
+	/**
+	 * Constructor
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param = '')
+	{
+		global $langs;
 		$langs->load("boxes");
 		$this->db = $db;
 
-        $this->boxlabel = $langs->transnoentitiesnoconv("BoxLastModifiedTicket");
-    }
+		$this->boxlabel = $langs->transnoentitiesnoconv("BoxLastModifiedTicket");
+	}
 
-    /**
-     * Load data into info_box_contents array to show array later.
-     *
-     *     @param  int $max Maximum number of records to load
-     *     @return void
-     */
-    public function loadBox($max = 5)
-    {
-        global $conf, $user, $langs;
+	/**
+	 * Load data into info_box_contents array to show array later.
+	 *
+	 *     @param  int $max Maximum number of records to load
+	 *     @return void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf, $user, $langs;
 
-        $this->max = $max;
+		$this->max = $max;
 
-        require_once DOL_DOCUMENT_ROOT."/ticket/class/ticket.class.php";
+		require_once DOL_DOCUMENT_ROOT."/ticket/class/ticket.class.php";
 
-        $text = $langs->trans("BoxLastModifiedTicketDescription", $max);
-        $this->info_box_head = array(
-         	'text' => $text,
-         	'limit' => dol_strlen($text)
-        );
+		$text = $langs->trans("BoxLastModifiedTicketDescription", $max);
+		$this->info_box_head = array(
+		 	'text' => $text,
+		 	'limit' => dol_strlen($text)
+		);
 
-        $this->info_box_contents[0][0] = array(
-            'td' => 'class="left"',
-            'text' => $langs->trans("BoxLastModifiedTicketContent"),
-        );
+		$this->info_box_contents[0][0] = array(
+			'td' => 'class="left"',
+			'text' => $langs->trans("BoxLastModifiedTicketContent"),
+		);
 
-        if ($user->rights->ticket->read) {
-            $sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut, t.type_code, t.category_code, t.severity_code, t.datec, t.date_read, t.date_close, t.origin_email ";
-            $sql .= ", type.label as type_label, category.label as category_label, severity.label as severity_label";
-            $sql .= ", s.nom as company_name, s.email as socemail, s.client, s.fournisseur";
-            $sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code=t.severity_code";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=t.fk_soc";
+		if ($user->rights->ticket->read) {
+			$sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut, t.type_code, t.category_code, t.severity_code, t.datec, t.date_read, t.date_close, t.origin_email ";
+			$sql .= ", type.label as type_label, category.label as category_label, severity.label as severity_label";
+			$sql .= ", s.nom as company_name, s.email as socemail, s.client, s.fournisseur";
+			$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code=t.severity_code";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=t.fk_soc";
 
-            $sql .= " WHERE t.entity = ".$conf->entity;
-            //  		$sql.= " AND e.rowid = er.fk_event";
-            //if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " WHERE s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-            if ($user->socid) {
-                $sql .= " AND t.fk_soc= ".$user->socid;
-            }
+			$sql .= " WHERE t.entity = ".$conf->entity;
+			//  		$sql.= " AND e.rowid = er.fk_event";
+			//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " WHERE s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			if ($user->socid) {
+				$sql .= " AND t.fk_soc= ".$user->socid;
+			}
 
-            $sql .= " ORDER BY t.tms DESC, t.rowid DESC ";
-            $sql .= $this->db->plimit($max, 0);
+			$sql .= " ORDER BY t.tms DESC, t.rowid DESC ";
+			$sql .= $this->db->plimit($max, 0);
 
-            $resql = $this->db->query($sql);
-            if ($resql) {
-                $num = $this->db->num_rows($resql);
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$num = $this->db->num_rows($resql);
 
-                $i = 0;
+				$i = 0;
 
-                while ($i < $num) {
-                    $objp = $this->db->fetch_object($resql);
-                    $datec = $this->db->jdate($objp->datec);
-                    $dateterm = $this->db->jdate($objp->fin_validite);
-                    $dateclose = $this->db->jdate($objp->date_cloture);
-                    $late = '';
+				while ($i < $num) {
+					$objp = $this->db->fetch_object($resql);
+					$datec = $this->db->jdate($objp->datec);
+					$dateterm = $this->db->jdate($objp->fin_validite);
+					$dateclose = $this->db->jdate($objp->date_cloture);
+					$late = '';
 
-                    $ticket = new Ticket($this->db);
-                    $ticket->id = $objp->id;
-                    $ticket->track_id = $objp->track_id;
-                    $ticket->ref = $objp->ref;
-                    $ticket->fk_statut = $objp->fk_statut;
-                    $ticket->subject = $objp->subject;
-                    if ($objp->fk_soc > 0) {
-                        $thirdparty = new Societe($this->db);
-                        $thirdparty->id = $objp->fk_soc;
-                        $thirdparty->email = $objp->socemail;
-                        $thirdparty->client = $objp->client;
-                        $thirdparty->fournisseur = $objp->fournisseur;
-                        $thirdparty->name = $objp->company_name;
-                        $link = $thirdparty->getNomUrl(1);
-                    } else {
-                        $link = dol_print_email($objp->origin_email);
-                    }
+					$ticket = new Ticket($this->db);
+					$ticket->id = $objp->id;
+					$ticket->track_id = $objp->track_id;
+					$ticket->ref = $objp->ref;
+					$ticket->fk_statut = $objp->fk_statut;
+					$ticket->subject = $objp->subject;
+					if ($objp->fk_soc > 0) {
+						$thirdparty = new Societe($this->db);
+						$thirdparty->id = $objp->fk_soc;
+						$thirdparty->email = $objp->socemail;
+						$thirdparty->client = $objp->client;
+						$thirdparty->fournisseur = $objp->fournisseur;
+						$thirdparty->name = $objp->company_name;
+						$link = $thirdparty->getNomUrl(1);
+					} else {
+						$link = dol_print_email($objp->origin_email);
+					}
 
 
-                    $r = 0;
+					$r = 0;
 
-                    // Ticket
-                    $this->info_box_contents[$i][0] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $ticket->getNomUrl(1),
-                        'asis' => 1,
-                    );
-                    $r++;
+					// Ticket
+					$this->info_box_contents[$i][0] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $ticket->getNomUrl(1),
+						'asis' => 1,
+					);
+					$r++;
 
-                    // Subject
-                    $this->info_box_contents[$i][$r] = array(
-                        'td' => 'class="nowrap"',
-                        'text' => $objp->subject, // Some event have no ref
-                        'url' => DOL_URL_ROOT."/ticket/card.php?track_id=".$objp->track_id,
-                    );
-                    $r++;
+					// Subject
+					$this->info_box_contents[$i][$r] = array(
+						'td' => 'class="nowrap"',
+						'text' => $objp->subject, // Some event have no ref
+						'url' => DOL_URL_ROOT."/ticket/card.php?track_id=".$objp->track_id,
+					);
+					$r++;
 
-                    // Customer
-                    $this->info_box_contents[$i][$r] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth300onsmartphone"',
-                        'text' => $link,
-                        'asis' => 1,
-                    );
-                    $r++;
+					// Customer
+					$this->info_box_contents[$i][$r] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth300onsmartphone"',
+						'text' => $link,
+						'asis' => 1,
+					);
+					$r++;
 
 
-                    // Date creation
-                    $this->info_box_contents[$i][$r] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datec, 'dayhour')
-                    );
-                    $r++;
+					// Date creation
+					$this->info_box_contents[$i][$r] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datec, 'dayhour')
+					);
+					$r++;
 
-                    // Statut
-                    $this->info_box_contents[$i][$r] = array(
-                        'td' => 'class="right nowraponall"',
-                        'text' => $ticket->getLibStatut(3)
-                    );
-                    $r++;
+					// Statut
+					$this->info_box_contents[$i][$r] = array(
+						'td' => 'class="right nowraponall"',
+						'text' => $ticket->getLibStatut(3)
+					);
+					$r++;
 
-                    $i++;
-                }
+					$i++;
+				}
 
-                if ($num == 0) {
-                    $this->info_box_contents[$i][0] = array('td' => 'class="center"', 'text'=>$langs->trans("BoxLastModifiedTicketNoRecordedTickets"));
-                }
-            } else {
-                dol_print_error($this->db);
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
-            );
-        }
-    }
+				if ($num == 0) {
+					$this->info_box_contents[$i][0] = array('td' => 'class="center"', 'text'=>$langs->trans("BoxLastModifiedTicketNoRecordedTickets"));
+				}
+			} else {
+				dol_print_error($this->db);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed"),
+			);
+		}
+	}
 
-    /**
-     *     Method to show box
-     *
-     *     @param  array $head     Array with properties of box title
-     *     @param  array $contents Array with properties of box lines
-     *     @param  int   $nooutput No print, only return string
-     *     @return string
-     */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	/**
+	 *     Method to show box
+	 *
+	 *     @param  array $head     Array with properties of box title
+	 *     @param  array $contents Array with properties of box lines
+	 *     @param  int   $nooutput No print, only return string
+	 *     @return string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_last_ticket.php b/htdocs/core/boxes/box_last_ticket.php
index 252141db9eb..268a6861524 100644
--- a/htdocs/core/boxes/box_last_ticket.php
+++ b/htdocs/core/boxes/box_last_ticket.php
@@ -31,177 +31,177 @@ require_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
 class box_last_ticket extends ModeleBoxes
 {
 
-    public $boxcode = "box_last_ticket";
-    public $boximg = "ticket";
-    public $boxlabel;
-    public $depends = array("ticket");
+	public $boxcode = "box_last_ticket";
+	public $boximg = "ticket";
+	public $boxlabel;
+	public $depends = array("ticket");
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $param;
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
-    /**
-     * Constructor
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param = '')
-    {
-        global $langs;
-        $langs->load("boxes");
-        $this->db = $db;
+	/**
+	 * Constructor
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param = '')
+	{
+		global $langs;
+		$langs->load("boxes");
+		$this->db = $db;
 
-        $this->boxlabel = $langs->transnoentitiesnoconv("BoxLastTicket");
-    }
+		$this->boxlabel = $langs->transnoentitiesnoconv("BoxLastTicket");
+	}
 
-    /**
-     * Load data into info_box_contents array to show array later.
-     *
-     *     @param  int $max Maximum number of records to load
-     *     @return void
-     */
-    public function loadBox($max = 5)
-    {
-        global $conf, $user, $langs;
+	/**
+	 * Load data into info_box_contents array to show array later.
+	 *
+	 *     @param  int $max Maximum number of records to load
+	 *     @return void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf, $user, $langs;
 
-        $this->max = $max;
+		$this->max = $max;
 
-        require_once DOL_DOCUMENT_ROOT."/ticket/class/ticket.class.php";
+		require_once DOL_DOCUMENT_ROOT."/ticket/class/ticket.class.php";
 
-        $text = $langs->trans("BoxLastTicketDescription", $max);
-        $this->info_box_head = array(
-            'text' => $text,
-            'limit' => dol_strlen($text),
-        );
+		$text = $langs->trans("BoxLastTicketDescription", $max);
+		$this->info_box_head = array(
+			'text' => $text,
+			'limit' => dol_strlen($text),
+		);
 
-        $this->info_box_contents[0][0] = array(
-            'td' => 'class="left"',
-            'text' => $langs->trans("BoxLastTicketContent"),
-        );
+		$this->info_box_contents[0][0] = array(
+			'td' => 'class="left"',
+			'text' => $langs->trans("BoxLastTicketContent"),
+		);
 
-        if ($user->rights->ticket->read) {
-            $sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut, t.type_code, t.category_code, t.severity_code, t.datec, t.date_read, t.date_close, t.origin_email ";
-            $sql .= ", type.label as type_label, category.label as category_label, severity.label as severity_label";
-            $sql .= ", s.nom as company_name, s.email as socemail, s.client, s.fournisseur";
-            $sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code=t.severity_code";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=t.fk_soc";
+		if ($user->rights->ticket->read) {
+			$sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut, t.type_code, t.category_code, t.severity_code, t.datec, t.date_read, t.date_close, t.origin_email ";
+			$sql .= ", type.label as type_label, category.label as category_label, severity.label as severity_label";
+			$sql .= ", s.nom as company_name, s.email as socemail, s.client, s.fournisseur";
+			$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code=t.severity_code";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=t.fk_soc";
 
-            $sql .= " WHERE t.entity = ".$conf->entity;
-            //          $sql.= " AND e.rowid = er.fk_event";
-            //if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " WHERE s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-            if ($user->socid) {
-                $sql .= " AND t.fk_soc= ".$user->socid;
-            }
+			$sql .= " WHERE t.entity = ".$conf->entity;
+			//          $sql.= " AND e.rowid = er.fk_event";
+			//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " WHERE s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			if ($user->socid) {
+				$sql .= " AND t.fk_soc= ".$user->socid;
+			}
 
-            //$sql.= " AND t.fk_statut > 9";
+			//$sql.= " AND t.fk_statut > 9";
 
-            $sql .= " ORDER BY t.datec DESC, t.rowid DESC ";
-            $sql .= $this->db->plimit($max, 0);
+			$sql .= " ORDER BY t.datec DESC, t.rowid DESC ";
+			$sql .= $this->db->plimit($max, 0);
 
-            $resql = $this->db->query($sql);
-            if ($resql) {
-                $num = $this->db->num_rows($resql);
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$num = $this->db->num_rows($resql);
 
-                $i = 0;
+				$i = 0;
 
-                while ($i < $num) {
-                    $objp = $this->db->fetch_object($resql);
-                    $datec = $this->db->jdate($objp->datec);
-                    $dateterm = $this->db->jdate($objp->fin_validite);
-                    $dateclose = $this->db->jdate($objp->date_cloture);
-                    $late = '';
+				while ($i < $num) {
+					$objp = $this->db->fetch_object($resql);
+					$datec = $this->db->jdate($objp->datec);
+					$dateterm = $this->db->jdate($objp->fin_validite);
+					$dateclose = $this->db->jdate($objp->date_cloture);
+					$late = '';
 
-                    $ticket = new Ticket($this->db);
-                    $ticket->id = $objp->id;
-                    $ticket->track_id = $objp->track_id;
-                    $ticket->ref = $objp->ref;
-                    $ticket->fk_statut = $objp->fk_statut;
-                    $ticket->subject = $objp->subject;
-                    if ($objp->fk_soc > 0) {
-                        $thirdparty = new Societe($this->db);
-                        $thirdparty->id = $objp->fk_soc;
-                        $thirdparty->email = $objp->socemail;
-                        $thirdparty->client = $objp->client;
-                        $thirdparty->fournisseur = $objp->fournisseur;
-                        $thirdparty->name = $objp->company_name;
-                        $link = $thirdparty->getNomUrl(1);
-                    } else {
-                        $link = dol_print_email($objp->origin_email);
-                    }
+					$ticket = new Ticket($this->db);
+					$ticket->id = $objp->id;
+					$ticket->track_id = $objp->track_id;
+					$ticket->ref = $objp->ref;
+					$ticket->fk_statut = $objp->fk_statut;
+					$ticket->subject = $objp->subject;
+					if ($objp->fk_soc > 0) {
+						$thirdparty = new Societe($this->db);
+						$thirdparty->id = $objp->fk_soc;
+						$thirdparty->email = $objp->socemail;
+						$thirdparty->client = $objp->client;
+						$thirdparty->fournisseur = $objp->fournisseur;
+						$thirdparty->name = $objp->company_name;
+						$link = $thirdparty->getNomUrl(1);
+					} else {
+						$link = dol_print_email($objp->origin_email);
+					}
 
-                    $r = 0;
+					$r = 0;
 
-                    // Ticket
-                    $this->info_box_contents[$i][$r] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $ticket->getNomUrl(1),
-                        'asis' => 1
-                    );
-                    $r++;
+					// Ticket
+					$this->info_box_contents[$i][$r] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $ticket->getNomUrl(1),
+						'asis' => 1
+					);
+					$r++;
 
-                    // Subject
-                    $this->info_box_contents[$i][$r] = array(
-                        'td' => '',
-                        'text' => $objp->subject, // Some event have no ref
-                        'url' => DOL_URL_ROOT."/ticket/card.php?track_id=".$objp->track_id,
-                    );
-                    $r++;
+					// Subject
+					$this->info_box_contents[$i][$r] = array(
+						'td' => '',
+						'text' => $objp->subject, // Some event have no ref
+						'url' => DOL_URL_ROOT."/ticket/card.php?track_id=".$objp->track_id,
+					);
+					$r++;
 
-                    // Customer
-                    $this->info_box_contents[$i][$r] = array(
-                        'td' => '',
-                        'text' => $link,
-                        'asis' => 1,
-                    );
-                    $r++;
+					// Customer
+					$this->info_box_contents[$i][$r] = array(
+						'td' => '',
+						'text' => $link,
+						'asis' => 1,
+					);
+					$r++;
 
-                    // Date creation
-                    $this->info_box_contents[$i][$r] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datec, 'dayhour'),
-                    );
-                    $r++;
+					// Date creation
+					$this->info_box_contents[$i][$r] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datec, 'dayhour'),
+					);
+					$r++;
 
-                    // Statut
-                    $this->info_box_contents[$i][$r] = array(
-                        'td' => 'class="right nowraponall"',
-                        'text' => $ticket->getLibStatut(3),
-                    );
-                    $r++;
+					// Statut
+					$this->info_box_contents[$i][$r] = array(
+						'td' => 'class="right nowraponall"',
+						'text' => $ticket->getLibStatut(3),
+					);
+					$r++;
 
-                    $i++;
-                }
+					$i++;
+				}
 
-                if ($num == 0) {
-                    $this->info_box_contents[$i][0] = array('td' => 'class="center"', 'text' => $langs->trans("BoxLastTicketNoRecordedTickets"));
-                }
-            } else {
-                dol_print_error($this->db);
-            }
-        } else {
-            $this->info_box_contents[0][0] = array('td' => 'class="left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed"));
-        }
-    }
+				if ($num == 0) {
+					$this->info_box_contents[$i][0] = array('td' => 'class="center"', 'text' => $langs->trans("BoxLastTicketNoRecordedTickets"));
+				}
+			} else {
+				dol_print_error($this->db);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array('td' => 'class="left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed"));
+		}
+	}
 
-    /**
-     *     Method to show box
-     *
-     *     @param  array $head     Array with properties of box title
-     *     @param  array $contents Array with properties of box lines
-     *     @param  int   $nooutput No print, only return string
-     *     @return string
-     */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	/**
+	 *     Method to show box
+	 *
+	 *     @param  array $head     Array with properties of box title
+	 *     @param  array $contents Array with properties of box lines
+	 *     @param  int   $nooutput No print, only return string
+	 *     @return string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_lastlogin.php b/htdocs/core/boxes/box_lastlogin.php
index 6af4468c669..aa7b5ca2ea5 100644
--- a/htdocs/core/boxes/box_lastlogin.php
+++ b/htdocs/core/boxes/box_lastlogin.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2012      Charles-François BENKE <charles.fr@benke.fr>
  * Copyright (C) 2005-2017 Laurent Destailleur    <eldy@users.sourceforge.net>
- * Copyright (C) 2014-2015 Frederic France        <frederic.france@free.fr>
+ * Copyright (C) 2014-2020 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
@@ -30,75 +30,75 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_lastlogin extends ModeleBoxes
 {
-    public $boxcode = "lastlogin";
-    public $boximg = "object_user";
-    public $boxlabel = 'BoxLoginInformation';
-    public $depends = array("user");
+	public $boxcode = "lastlogin";
+	public $boximg = "object_user";
+	public $boxlabel = 'BoxLoginInformation';
+	public $depends = array("user");
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
-    public $enabled = 1;
+	public $param;
+	public $enabled = 1;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $conf;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $conf;
 
-        $this->db = $db;
-    }
+		$this->db = $db;
+	}
 
-    /**
-     *  Charge les donnees en memoire pour affichage ulterieur
-     *
-     *  @param  int     $max        Maximum number of records to load
-     *  @return void
-     */
-    public function loadBox($max = 5)
-    {
-        global $conf, $user, $langs;
+	/**
+	 *  Charge les donnees en memoire pour affichage ulterieur
+	 *
+	 *  @param  int     $max        Maximum number of records to load
+	 *  @return void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf, $user, $langs;
 
-        $textHead = $langs->trans("BoxLoginInformation");
-        $this->info_box_head = array(
-            'text' => $textHead,
-            'limit'=> dol_strlen($textHead),
-        );
+		$textHead = $langs->trans("BoxLoginInformation");
+		$this->info_box_head = array(
+			'text' => $textHead,
+			'limit'=> dol_strlen($textHead),
+		);
 
-        $line = 0;
-        $this->info_box_contents[$line][0] = array(
-            'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-            'text' => $langs->trans("User"),
-        );
-        $this->info_box_contents[$line][1] = array(
-            'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-            'text' => $user->getNomUrl(-1),
-            'asis' => 1
-        );
+		$line = 0;
+		$this->info_box_contents[$line][0] = array(
+			'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+			'text' => $langs->trans("User"),
+		);
+		$this->info_box_contents[$line][1] = array(
+			'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+			'text' => $user->getNomUrl(-1),
+			'asis' => 1
+		);
 
-        $line = 1;
-        $this->info_box_contents[$line][0] = array(
-            'td' => '',
-            'text' => $langs->trans("PreviousConnexion"),
-        );
-        if ($user->datepreviouslogin) $tmp = dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser');
-        else $tmp = $langs->trans("Unknown");
-        $this->info_box_contents[$line][1] = array(
-            'td' => '',
-            'text' => $tmp,
-        );
-    }
+		$line = 1;
+		$this->info_box_contents[$line][0] = array(
+			'td' => '',
+			'text' => $langs->trans("PreviousConnexion"),
+		);
+		if ($user->datepreviouslogin) $tmp = dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser');
+		else $tmp = $langs->trans("Unknown");
+		$this->info_box_contents[$line][1] = array(
+			'td' => '',
+			'text' => $tmp,
+		);
+	}
 
 
 	/**
@@ -107,10 +107,10 @@ class box_lastlogin extends ModeleBoxes
 	 *  @param	array	$head       Array with properties of box title
 	 *  @param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *  @return	void
+	 *  @return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php
index 2b2d8418e47..2d0ad45a266 100644
--- a/htdocs/core/boxes/box_members.php
+++ b/htdocs/core/boxes/box_members.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2015      Frederic France      <frederic.france@free.fr>
+ * Copyright (C) 2015-2020 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
@@ -32,28 +32,28 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_members extends ModeleBoxes
 {
-    public $boxcode = "lastmembers";
-    public $boximg = "object_user";
-    public $boxlabel = "BoxLastMembers";
-    public $depends = array("adherent");
+	public $boxcode = "lastmembers";
+	public $boximg = "object_user";
+	public $boxlabel = "BoxLastMembers";
+	public $depends = array("adherent");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
-    public $enabled = 1;
+	public $param;
+	public $enabled = 1;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
 	 *  Constructor
 	 *
 	 *  @param  DoliDB	$db      	Database handler
-     *  @param	string	$param		More parameters
+	 *  @param	string	$param		More parameters
 	 */
 	public function __construct($db, $param = '')
 	{
@@ -72,7 +72,7 @@ class box_members extends ModeleBoxes
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -81,15 +81,15 @@ class box_members extends ModeleBoxes
 
 		$this->max = $max;
 
-        include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-        $memberstatic = new Adherent($this->db);
+		include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+		$memberstatic = new Adherent($this->db);
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedMembers", $max));
 
-		if ($user->rights->adherent->lire)
-		{
+		if ($user->rights->adherent->lire) {
 			$sql = "SELECT a.rowid, a.lastname, a.firstname, a.societe as company, a.fk_soc,";
 			$sql .= " a.datec, a.tms, a.statut as status, a.datefin as date_end_subscription,";
+			$sql .= ' a.photo, a.email, a.gender, a.morphy,';
 			$sql .= " t.subscription";
 			$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."adherent_type as t";
 			$sql .= " WHERE a.entity IN (".getEntity('member').")";
@@ -98,13 +98,11 @@ class box_members extends ModeleBoxes
 			$sql .= $this->db->plimit($max, 0);
 
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$num = $this->db->num_rows($result);
 
 				$line = 0;
-				while ($line < $num)
-				{
+				while ($line < $num) {
 					$objp = $this->db->fetch_object($result);
 					$datec = $this->db->jdate($objp->datec);
 					$datem = $this->db->jdate($objp->tms);
@@ -112,8 +110,13 @@ class box_members extends ModeleBoxes
 					$memberstatic->lastname = $objp->lastname;
 					$memberstatic->firstname = $objp->firstname;
 					$memberstatic->id = $objp->rowid;
-                    $memberstatic->ref = $objp->rowid;
-                    $memberstatic->company = $objp->company;
+					$memberstatic->ref = $objp->rowid;
+					$memberstatic->photo = $objp->photo;
+					$memberstatic->gender = $objp->gender;
+					$memberstatic->email = $objp->email;
+					$memberstatic->morphy = $objp->morphy;
+					$memberstatic->company = $objp->company;
+					$memberstatic->statut = $objp->status;
 
 					if (!empty($objp->fk_soc)) {
 						$memberstatic->socid = $objp->fk_soc;
@@ -123,52 +126,52 @@ class box_members extends ModeleBoxes
 						$memberstatic->name = $objp->company;
 					}
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $memberstatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $memberstatic->getNomUrl(-1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $memberstatic->company,
-                        'url' => DOL_URL_ROOT."/adherents/card.php?rowid=".$objp->rowid,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $memberstatic->company,
+						'url' => DOL_URL_ROOT."/adherents/card.php?rowid=".$objp->rowid,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datem, "day"),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datem, "day"),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $memberstatic->LibStatut($objp->status, $objp->subscription, $this->db->jdate($objp->date_end_subscription), 3),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $memberstatic->LibStatut($objp->status, $objp->subscription, $this->db->jdate($objp->date_end_subscription), 3),
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center"',
-                        'text'=>$langs->trans("NoRecordedCustomers"),
-                    );
+				if ($num == 0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center"',
+						'text'=>$langs->trans("NoRecordedCustomers"),
+					);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -178,8 +181,8 @@ class box_members extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_mos.php b/htdocs/core/boxes/box_mos.php
index ec21d5d00cf..acbb1e5cd3b 100644
--- a/htdocs/core/boxes/box_mos.php
+++ b/htdocs/core/boxes/box_mos.php
@@ -32,143 +32,143 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_mos extends ModeleBoxes
 {
-    public $boxcode = "lastmos";
-    public $boximg = "object_mrp";
-    public $boxlabel = "BoxTitleLatestModifiedMos";
-    public $depends = array("mrp");
+	public $boxcode = "lastmos";
+	public $boximg = "object_mrp";
+	public $boxlabel = "BoxTitleLatestModifiedMos";
+	public $depends = array("mrp");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->hidden = !($user->rights->bom->read);
-    }
+		$this->hidden = !($user->rights->bom->read);
+	}
 
-    /**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    public function loadBox($max = 5)
-    {
-        global $user, $langs, $conf;
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $user, $langs, $conf;
 
-        $this->max = $max;
+		$this->max = $max;
 
-        include_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
-        $mostatic = new Mo($this->db);
-        $productstatic = new Product($this->db);
-        $userstatic = new User($this->db);
+		$mostatic = new Mo($this->db);
+		$productstatic = new Product($this->db);
+		$userstatic = new User($this->db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLatestModifiedMos", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLatestModifiedMos", $max));
 
-        if ($user->rights->mrp->read)
-        {
-            $sql = "SELECT p.ref as product_ref";
-            $sql .= ", c.rowid";
-            $sql .= ", c.date_creation";
-            $sql .= ", c.tms";
-            $sql .= ", c.ref";
-            $sql .= ", c.status";
-            //$sql.= ", c.fk_user_valid";
-            $sql .= " FROM ".MAIN_DB_PREFIX."product as p";
-            $sql .= ", ".MAIN_DB_PREFIX."mrp_mo as c";
-            $sql .= " WHERE c.fk_product = p.rowid";
-            $sql .= " AND c.entity = ".$conf->entity;
-            $sql .= " ORDER BY c.tms DESC, c.ref DESC";
-            $sql .= " ".$this->db->plimit($max, 0);
+		if ($user->rights->mrp->read)
+		{
+			$sql = "SELECT p.ref as product_ref";
+			$sql .= ", c.rowid";
+			$sql .= ", c.date_creation";
+			$sql .= ", c.tms";
+			$sql .= ", c.ref";
+			$sql .= ", c.status";
+			//$sql.= ", c.fk_user_valid";
+			$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
+			$sql .= ", ".MAIN_DB_PREFIX."mrp_mo as c";
+			$sql .= " WHERE c.fk_product = p.rowid";
+			$sql .= " AND c.entity = ".$conf->entity;
+			$sql .= " ORDER BY c.tms DESC, c.ref DESC";
+			$sql .= " ".$this->db->plimit($max, 0);
 
-            $result = $this->db->query($sql);
-            if ($result) {
-                $num = $this->db->num_rows($result);
+			$result = $this->db->query($sql);
+			if ($result) {
+				$num = $this->db->num_rows($result);
 
-                $line = 0;
+				$line = 0;
 
-                while ($line < $num) {
-                    $objp = $this->db->fetch_object($result);
-                    $datem = $this->db->jdate($objp->tms);
-                    $mostatic->id = $objp->rowid;
-                    $mostatic->ref = $objp->ref;
-                    $mostatic->id = $objp->socid;
-                    $mostatic->status = $objp->status;
-                    $productstatic->ref = $objp->product_ref;
+				while ($line < $num) {
+					$objp = $this->db->fetch_object($result);
+					$datem = $this->db->jdate($objp->tms);
+					$mostatic->id = $objp->rowid;
+					$mostatic->ref = $objp->ref;
+					$mostatic->id = $objp->socid;
+					$mostatic->status = $objp->status;
+					$productstatic->ref = $objp->product_ref;
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $mostatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $mostatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $productstatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $productstatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    if (!empty($conf->global->MRP_BOX_LAST_MOS_SHOW_VALIDATE_USER)) {
-                        if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid);
-                        $this->info_box_contents[$line][] = array(
-                            'td' => 'class="right"',
-                            'text' => (($objp->fk_user_valid > 0) ? $userstatic->getNomUrl(1) : ''),
-                            'asis' => 1,
-                        );
-                    }
+					if (!empty($conf->global->MRP_BOX_LAST_MOS_SHOW_VALIDATE_USER)) {
+						if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid);
+						$this->info_box_contents[$line][] = array(
+							'td' => 'class="right"',
+							'text' => (($objp->fk_user_valid > 0) ? $userstatic->getNomUrl(1) : ''),
+							'asis' => 1,
+						);
+					}
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datem, 'day'),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datem, 'day'),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $mostatic->LibStatut($objp->status, 3),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $mostatic->LibStatut($objp->status, 3),
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0) $this->info_box_contents[$line][0] = array(
-                	'td' => 'class="center opacitymedium"',
-                	'text'=>$langs->trans("NoRecordedOrders")
-                );
+				if ($num == 0) $this->info_box_contents[$line][0] = array(
+					'td' => 'class="center"',
+					'text'=> '<span class="opacitymedium">'.$langs->trans("NoRecordedOrders").'</span>'
+				);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -178,8 +178,8 @@ class box_mos extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 52591fa5292..f36b0500655 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -33,20 +33,20 @@ include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
  */
 class box_produits extends ModeleBoxes
 {
-    public $boxcode = "lastproducts";
-    public $boximg = "object_product";
-    public $boxlabel = "BoxLastProducts";
-    public $depends = array("produit");
+	public $boxcode = "lastproducts";
+	public $boximg = "object_product";
+	public $boxlabel = "BoxLastProducts";
+	public $depends = array("produit");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -57,21 +57,21 @@ class box_produits extends ModeleBoxes
 	 */
 	public function __construct($db, $param)
 	{
-	    global $conf, $user;
+		global $conf, $user;
 
-	    $this->db = $db;
+		$this->db = $db;
 
-	    $listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
-	    $tmpentry = array('enabled'=>(!empty($conf->product->enabled) || !empty($conf->service->enabled)), 'perms'=>(!empty($user->rights->produit->lire) || !empty($user->rights->service->lire)), 'module'=>'product|service');
-	    $showmode = isVisibleToUserType(($user->socid > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
-	    $this->hidden = ($showmode != 1);
+		$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+		$tmpentry = array('enabled'=>(!empty($conf->product->enabled) || !empty($conf->service->enabled)), 'perms'=>(!empty($user->rights->produit->lire) || !empty($user->rights->service->lire)), 'module'=>'product|service');
+		$showmode = isVisibleToUserType(($user->socid > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
+		$this->hidden = ($showmode != 1);
 	}
 
 	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -84,36 +84,42 @@ class box_produits extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastProducts", $max));
 
-		if ($user->rights->produit->lire || $user->rights->service->lire)
-		{
+		if ($user->rights->produit->lire || $user->rights->service->lire) {
 			$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.fk_price_expression, p.entity";
+			$sql .= ", p.accountancy_code_sell";
+			$sql .= ", p.accountancy_code_sell_intra";
+			$sql .= ", p.accountancy_code_sell_export";
+			$sql .= ", p.accountancy_code_buy";
+			$sql .= ", p.accountancy_code_buy_intra";
+			$sql .= ", p.accountancy_code_buy_export";
+			$sql .= ', p.barcode';
 			$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 			$sql .= ' WHERE p.entity IN ('.getEntity($productstatic->element).')';
-			if (empty($user->rights->produit->lire)) $sql .= ' AND p.fk_product_type != 0';
-			if (empty($user->rights->service->lire)) $sql .= ' AND p.fk_product_type != 1';
+			if (empty($user->rights->produit->lire)) {
+				$sql .= ' AND p.fk_product_type != 0';
+			}
+			if (empty($user->rights->service->lire)) {
+				$sql .= ' AND p.fk_product_type != 1';
+			}
 			// Add where from hooks
-			if (is_object($hookmanager))
-			{
-			    $parameters = array('boxproductlist'=>1);
-			    $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
-			    $sql .= $hookmanager->resPrint;
+			if (is_object($hookmanager)) {
+				$parameters = array('boxproductlist'=>1);
+				$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+				$sql .= $hookmanager->resPrint;
 			}
 			$sql .= $this->db->order('p.datec', 'DESC');
 			$sql .= $this->db->plimit($max, 0);
 
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$num = $this->db->num_rows($result);
 				$line = 0;
-				while ($line < $num)
-				{
+				while ($line < $num) {
 					$objp = $this->db->fetch_object($result);
 					$datem = $this->db->jdate($objp->tms);
 
 					// Multilangs
-					if (!empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
-					{
+					if (!empty($conf->global->MAIN_MULTILANGS)) { // si l'option est active
 						$sqld = "SELECT label";
 						$sqld .= " FROM ".MAIN_DB_PREFIX."product_lang";
 						$sqld .= " WHERE fk_product=".$objp->rowid;
@@ -121,111 +127,120 @@ class box_produits extends ModeleBoxes
 						$sqld .= " LIMIT 1";
 
 						$resultd = $this->db->query($sqld);
-						if ($resultd)
-						{
+						if ($resultd) {
 							$objtp = $this->db->fetch_object($resultd);
-							if (isset($objtp->label) && $objtp->label != '')
+							if (isset($objtp->label) && $objtp->label != '') {
 								$objp->label = $objtp->label;
+							}
 						}
 					}
-                    $productstatic->id = $objp->rowid;
-                    $productstatic->ref = $objp->ref;
-                    $productstatic->type = $objp->fk_product_type;
-                    $productstatic->label = $objp->label;
+					$productstatic->id = $objp->rowid;
+					$productstatic->ref = $objp->ref;
+					$productstatic->type = $objp->fk_product_type;
+					$productstatic->label = $objp->label;
 					$productstatic->entity = $objp->entity;
+					$productstatic->status = $objp->tosell;
+					$productstatic->status_buy = $objp->tobuy;
+					$productstatic->barcode = $objp->barcode;
+					$productstatic->accountancy_code_sell = $objp->accountancy_code_sell;
+					$productstatic->accountancy_code_sell_intra = $objp->accountancy_code_sell_intra;
+					$productstatic->accountancy_code_sell_export = $objp->accountancy_code_sell_export;
+					$productstatic->accountancy_code_buy = $objp->accountancy_code_buy;
+					$productstatic->accountancy_code_buy_intra = $objp->accountancy_code_buy_intra;
+					$productstatic->accountancy_code_buy_export = $objp->accountancy_code_buy_export;
 
 					$this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
-                        'text' => $productstatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+						'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
+						'text' => $productstatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
-                        'text' => $objp->label,
-                    );
-                    $price = '';
-                    $price_base_type = '';
-                    if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression)) {
-                        $price_base_type = $langs->trans($objp->price_base_type);
-                        $price = ($objp->price_base_type == 'HT') ?price($objp->price) : $price = price($objp->price_ttc);
-	                } else //Parse the dynamic price
-	               	{
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
+						'text' => $objp->label,
+					);
+					$price = '';
+					$price_base_type = '';
+					if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression)) {
+						$price_base_type = $langs->trans($objp->price_base_type);
+						$price = ($objp->price_base_type == 'HT') ?price($objp->price) : $price = price($objp->price_ttc);
+					} else {
+						//Parse the dynamic price
 						$productstatic->fetch($objp->rowid, '', '', 1);
-	                    $priceparser = new PriceParser($this->db);
-	                    $price_result = $priceparser->parseProduct($productstatic);
-	                    if ($price_result >= 0) {
-							if ($objp->price_base_type == 'HT')
-							{
+						$priceparser = new PriceParser($this->db);
+						$price_result = $priceparser->parseProduct($productstatic);
+						if ($price_result >= 0) {
+							if ($objp->price_base_type == 'HT') {
 								$price_base_type = $langs->trans("HT");
 							} else {
 								$price_result = $price_result * (1 + ($productstatic->tva_tx / 100));
 								$price_base_type = $langs->trans("TTC");
 							}
 							$price = price($price_result);
-	                    }
-	               	}
+						}
+					}
 					$this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => $price,
-                    );
+						'td' => 'class="right"',
+						'text' => $price,
+					);
 
 					$this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowrap"',
-                        'text' => $price_base_type,
-                    );
+						'td' => 'class="nowrap"',
+						'text' => $price_base_type,
+					);
 
 					$this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datem, 'day'),
-                    );
+						'td' => 'class="right"',
+						'text' => dol_print_date($datem, 'day'),
+					);
 
 					$this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell, 3, 0).'<span>',
-					    'asis' => 1
-                    );
+						'td' => 'class="right" width="18"',
+						'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell, 3, 0).'<span>',
+						'asis' => 1
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy, 3, 1).'</span>',
-					    'asis' => 1
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy, 3, 1).'</span>',
+						'asis' => 1
+					);
 
-                    $line++;
-                }
-                if ($num == 0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center"',
-                        'text'=>$langs->trans("NoRecordedProducts"),
-                    );
+					$line++;
+				}
+				if ($num == 0) {
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center"',
+						'text'=>$langs->trans("NoRecordedProducts"),
+					);
+				}
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
-    /**
-     *  Method to show box
-     *
-     *  @param	array	$head       Array with properties of box title
-     *  @param  array	$contents   Array with properties of box lines
-     *  @param	int		$nooutput	No print, only return string
-     *  @return	string
-     */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	/**
+	 *  Method to show box
+	 *
+	 *  @param	array	$head       Array with properties of box title
+	 *  @param  array	$contents   Array with properties of box lines
+	 *  @param	int		$nooutput	No print, only return string
+	 *  @return	string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index 6845cb2db5f..893bb2273ab 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -35,20 +35,20 @@ include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
  */
 class box_produits_alerte_stock extends ModeleBoxes
 {
-    public $boxcode = "productsalertstock";
-    public $boximg = "object_product";
-    public $boxlabel = "BoxProductsAlertStock";
-    public $depends = array("produit");
+	public $boxcode = "productsalertstock";
+	public $boximg = "object_product";
+	public $boxlabel = "BoxProductsAlertStock";
+	public $depends = array("produit");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -59,21 +59,21 @@ class box_produits_alerte_stock extends ModeleBoxes
 	 */
 	public function __construct($db, $param = '')
 	{
-	    global $conf, $user;
+		global $conf, $user;
 
-	    $this->db = $db;
+		$this->db = $db;
 
-	    $listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
-	    $tmpentry = array('enabled'=>((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && !empty($conf->stock->enabled)), 'perms'=>($user->rights->stock->lire), 'module'=>'product|service|stock');
-	    $showmode = isVisibleToUserType(($user->socid > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
-	    $this->hidden = ($showmode != 1);
+		$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+		$tmpentry = array('enabled'=>((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && !empty($conf->stock->enabled)), 'perms'=>($user->rights->stock->lire), 'module'=>'product|service|stock');
+		$showmode = isVisibleToUserType(($user->socid > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
+		$this->hidden = ($showmode != 1);
 	}
 
 	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -99,16 +99,16 @@ class box_produits_alerte_stock extends ModeleBoxes
 			if (empty($user->rights->produit->lire)) $sql .= ' AND p.fk_product_type != 0';
 			if (empty($user->rights->service->lire)) $sql .= ' AND p.fk_product_type != 1';
 			// Add where from hooks
-    		if (is_object($hookmanager))
-    		{
-			    $parameters = array('boxproductalertstocklist'=>1);
-    		    $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
-    		    $sql .= $hookmanager->resPrint;
-    		}
-		    $sql .= " GROUP BY p.rowid, p.ref, p.label, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.barcode, p.seuil_stock_alerte, p.entity,";
-		    $sql .= " p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export,";
-		    $sql .= " p.accountancy_code_buy, p.accountancy_code_buy_intra, p.accountancy_code_buy_export";
-		    $sql .= " HAVING SUM(".$this->db->ifsql("s.reel IS NULL", "0", "s.reel").") < p.seuil_stock_alerte";
+			if (is_object($hookmanager))
+			{
+				$parameters = array('boxproductalertstocklist'=>1);
+				$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+				$sql .= $hookmanager->resPrint;
+			}
+			$sql .= " GROUP BY p.rowid, p.ref, p.label, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.barcode, p.seuil_stock_alerte, p.entity,";
+			$sql .= " p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export,";
+			$sql .= " p.accountancy_code_buy, p.accountancy_code_buy_intra, p.accountancy_code_buy_export";
+			$sql .= " HAVING SUM(".$this->db->ifsql("s.reel IS NULL", "0", "s.reel").") < p.seuil_stock_alerte";
 			$sql .= $this->db->order('p.seuil_stock_alerte', 'DESC');
 			$sql .= $this->db->plimit($max, 0);
 
@@ -118,11 +118,11 @@ class box_produits_alerte_stock extends ModeleBoxes
 				$langs->load("stocks");
 				$num = $this->db->num_rows($result);
 				$line = 0;
-                while ($line < $num) {
+				while ($line < $num) {
 					$objp = $this->db->fetch_object($result);
 					$datem = $this->db->jdate($objp->tms);
-                    $price = '';
-                    $price_base_type = '';
+					$price = '';
+					$price_base_type = '';
 
 					// Multilangs
 					if (!empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
@@ -141,10 +141,10 @@ class box_produits_alerte_stock extends ModeleBoxes
 								$objp->label = $objtp->label;
 						}
 					}
-                    $productstatic->id = $objp->rowid;
-                    $productstatic->ref = $objp->ref;
-                    $productstatic->type = $objp->fk_product_type;
-                    $productstatic->label = $objp->label;
+					$productstatic->id = $objp->rowid;
+					$productstatic->ref = $objp->ref;
+					$productstatic->type = $objp->fk_product_type;
+					$productstatic->label = $objp->label;
 					$productstatic->entity = $objp->entity;
 					$productstatic->barcode = $objp->barcode;
 					$productstatic->status = $objp->tosell;
@@ -156,27 +156,27 @@ class box_produits_alerte_stock extends ModeleBoxes
 					$productstatic->accountancy_code_buy_intra = $objp->accountancy_code_buy_intra;
 					$productstatic->accountancy_code_buy_export = $objp->accountancy_code_buy_export;
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $productstatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $productstatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $objp->label,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $objp->label,
+					);
 
-                    if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression))
-                    {
-                        $price_base_type = $langs->trans($objp->price_base_type);
-                        $price = ($objp->price_base_type == 'HT') ?price($objp->price) : $price = price($objp->price_ttc);
-	                } else //Parse the dynamic price
-	               	{
+					if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression))
+					{
+						$price_base_type = $langs->trans($objp->price_base_type);
+						$price = ($objp->price_base_type == 'HT') ?price($objp->price) : $price = price($objp->price_ttc);
+					} else //Parse the dynamic price
+				   	{
 						$productstatic->fetch($objp->rowid, '', '', 1);
-	                    $priceparser = new PriceParser($this->db);
-	                    $price_result = $priceparser->parseProduct($productstatic);
-	                    if ($price_result >= 0) {
+						$priceparser = new PriceParser($this->db);
+						$price_result = $priceparser->parseProduct($productstatic);
+						if ($price_result >= 0) {
 							if ($objp->price_base_type == 'HT')
 							{
 								$price_base_type = $langs->trans("HT");
@@ -185,58 +185,58 @@ class box_produits_alerte_stock extends ModeleBoxes
 								$price_base_type = $langs->trans("TTC");
 							}
 							$price = price($price_result);
-	                    }
-	               	}
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right nowraponall"',
-                        'text' => $price,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => $price_base_type,
-                    );
+						}
+				   	}
 
 					$this->info_box_contents[$line][] = array(
-					    'td' => 'class="center"',
-                        'text' => $objp->total_stock.' / '.$objp->seuil_stock_alerte,
-                        'text2'=>img_warning($langs->transnoentitiesnoconv("StockLowerThanLimit", $objp->seuil_stock_alerte)),
-                    );
-
-					$this->info_box_contents[$line][] = array(
-					    'td' => 'class="right" width="18"',
-                        'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell, 3, 0).'<span>',
-					    'asis' => 1
+						'td' => 'class="right nowraponall"',
+						'text' => $price,
 					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy, 3, 0).'<span>',
-                        'asis' => 1
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => $price_base_type,
+					);
 
-                    $line++;
-                }
-                if ($num == 0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center"',
-                        'text'=>$langs->trans("NoTooLowStockProducts"),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="center"',
+						'text' => $objp->total_stock.' / '.$objp->seuil_stock_alerte,
+						'text2'=>img_warning($langs->transnoentitiesnoconv("StockLowerThanLimit", $objp->seuil_stock_alerte)),
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell, 3, 0).'<span>',
+						'asis' => 1
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy, 3, 0).'<span>',
+						'asis' => 1
+					);
+
+					$line++;
+				}
+				if ($num == 0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center"',
+						'text'=>$langs->trans("NoTooLowStockProducts"),
+					);
 
 				$this->db->free($result);
 			} else {
 				$this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
 			}
 		} else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 	}
 
@@ -248,8 +248,8 @@ class box_produits_alerte_stock extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index e8b056322da..1afbdfc6837 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -31,174 +31,174 @@ include_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
  */
 class box_project extends ModeleBoxes
 {
-    public $boxcode = "project";
-    public $boximg = "object_projectpub";
-    public $boxlabel;
-    //var $depends = array("projet");
+	public $boxcode = "project";
+	public $boximg = "object_projectpub";
+	public $boxlabel;
+	//var $depends = array("projet");
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param = '')
-    {
-        global $user, $langs;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param = '')
+	{
+		global $user, $langs;
 
-        // Load translation files required by the page
-        $langs->loadLangs(array('boxes', 'projects'));
+		// Load translation files required by the page
+		$langs->loadLangs(array('boxes', 'projects'));
 
-        $this->db = $db;
-        $this->boxlabel = "OpenedProjects";
+		$this->db = $db;
+		$this->boxlabel = "OpenedProjects";
 
-        $this->hidden = !($user->rights->projet->lire);
-    }
+		$this->hidden = !($user->rights->projet->lire);
+	}
 
-    /**
-    *  Load data for box to show them later
-    *
-    *  @param   int		$max        Maximum number of records to load
-    *  @return  void
-    */
-    public function loadBox($max = 5)
-    {
-        global $conf, $user, $langs;
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @param   int		$max        Maximum number of records to load
+	 *  @return  void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf, $user, $langs;
 
-        $this->max = $max;
+		$this->max = $max;
 
-        $totalMnt = 0;
-        $totalnb = 0;
-        $totalnbTask = 0;
+		$totalMnt = 0;
+		$totalnb = 0;
+		$totalnbTask = 0;
 
-        $textHead = $langs->trans("OpenedProjects");
-        $this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
+		$textHead = $langs->trans("OpenedProjects");
+		$this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
 
-        // list the summary of the orders
-        if ($user->rights->projet->lire) {
-            include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-            $projectstatic = new Project($this->db);
+		// list the summary of the orders
+		if ($user->rights->projet->lire) {
+			include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+			$projectstatic = new Project($this->db);
 
-            $socid = 0;
-            //if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+			$socid = 0;
+			//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
 
-            // Get list of project id allowed to user (in a string list separated by coma)
-            $projectsListId = '';
-            if (!$user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
+			// Get list of project id allowed to user (in a string list separated by coma)
+			$projectsListId = '';
+			if (!$user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
 
-            $sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut as status, p.public";
-            $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
-            $sql .= " WHERE p.entity IN (".getEntity('project').")"; // Only current entity or severals if permission ok
+			$sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut as status, p.public";
+			$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
+			$sql .= " WHERE p.entity IN (".getEntity('project').")"; // Only current entity or severals if permission ok
 			$sql .= " AND p.fk_statut = 1"; // Only open projects
-            if (!$user->rights->projet->all->lire) $sql .= " AND p.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
+			if (!$user->rights->projet->all->lire) $sql .= " AND p.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
 
-            $sql .= " ORDER BY p.datec DESC";
-            //$sql.= $this->db->plimit($max, 0);
+			$sql .= " ORDER BY p.datec DESC";
+			//$sql.= $this->db->plimit($max, 0);
 
-            $result = $this->db->query($sql);
+			$result = $this->db->query($sql);
 
-            if ($result) {
-                $num = $this->db->num_rows($result);
-                $i = 0;
-                while ($i < min($num, $max)) {
-                    $objp = $this->db->fetch_object($result);
+			if ($result) {
+				$num = $this->db->num_rows($result);
+				$i = 0;
+				while ($i < min($num, $max)) {
+					$objp = $this->db->fetch_object($result);
 
-                    $projectstatic->id = $objp->rowid;
-                    $projectstatic->ref = $objp->ref;
-                    $projectstatic->title = $objp->title;
-                    $projectstatic->public = $objp->public;
-                    $projectstatic->statut = $objp->status;
+					$projectstatic->id = $objp->rowid;
+					$projectstatic->ref = $objp->ref;
+					$projectstatic->title = $objp->title;
+					$projectstatic->public = $objp->public;
+					$projectstatic->statut = $objp->status;
 
-                    $this->info_box_contents[$i][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $projectstatic->getNomUrl(1),
-                        'asis' => 1
-                    );
+					$this->info_box_contents[$i][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $projectstatic->getNomUrl(1),
+						'asis' => 1
+					);
 
-                    $this->info_box_contents[$i][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth200onsmartphone"',
-                        'text' => $objp->title,
-                    );
+					$this->info_box_contents[$i][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth200onsmartphone"',
+						'text' => $objp->title,
+					);
 
-                    $sql = "SELECT count(*) as nb, sum(progress) as totprogress";
-                    $sql .= " FROM ".MAIN_DB_PREFIX."projet as p LEFT JOIN ".MAIN_DB_PREFIX."projet_task as pt on pt.fk_projet = p.rowid";
-                       $sql .= " WHERE p.entity IN (".getEntity('project').')';
-                    $sql .= " AND p.rowid = ".$objp->rowid;
-                    $resultTask = $this->db->query($sql);
-                    if ($resultTask) {
-                        $objTask = $this->db->fetch_object($resultTask);
-                        $this->info_box_contents[$i][] = array(
-                            'td' => 'class="right"',
-                            'text' => $objTask->nb."&nbsp;".$langs->trans("Tasks"),
-                        );
-                        if ($objTask->nb > 0)
-                            $this->info_box_contents[$i][] = array(
-                                'td' => 'class="right"',
-                                'text' => round($objTask->totprogress / $objTask->nb, 0)."%",
-                            );
-                        else $this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
-                        $totalnbTask += $objTask->nb;
-                    } else {
-                        $this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => round(0));
-                        $this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
-                    }
-                    $this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => $projectstatic->getLibStatut(3));
+					$sql = "SELECT count(*) as nb, sum(progress) as totprogress";
+					$sql .= " FROM ".MAIN_DB_PREFIX."projet as p LEFT JOIN ".MAIN_DB_PREFIX."projet_task as pt on pt.fk_projet = p.rowid";
+					   $sql .= " WHERE p.entity IN (".getEntity('project').')';
+					$sql .= " AND p.rowid = ".$objp->rowid;
+					$resultTask = $this->db->query($sql);
+					if ($resultTask) {
+						$objTask = $this->db->fetch_object($resultTask);
+						$this->info_box_contents[$i][] = array(
+							'td' => 'class="right"',
+							'text' => $objTask->nb."&nbsp;".$langs->trans("Tasks"),
+						);
+						if ($objTask->nb > 0)
+							$this->info_box_contents[$i][] = array(
+								'td' => 'class="right"',
+								'text' => round($objTask->totprogress / $objTask->nb, 0)."%",
+							);
+						else $this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
+						$totalnbTask += $objTask->nb;
+					} else {
+						$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => round(0));
+						$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
+					}
+					$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => $projectstatic->getLibStatut(3));
 
-                    $i++;
-                }
-                if ($max < $num)
-                {
-                    $this->info_box_contents[$i][] = array('td' => 'colspan="5"', 'text' => '...');
-                    $i++;
-                }
-            }
-        }
+					$i++;
+				}
+				if ($max < $num)
+				{
+					$this->info_box_contents[$i][] = array('td' => 'colspan="5"', 'text' => '...');
+					$i++;
+				}
+			}
+		}
 
 
-        // Add the sum à the bottom of the boxes
-        $this->info_box_contents[$i][] = array(
-            'td' => 'class="liste_total"',
-            'text' => $langs->trans("Total")."&nbsp;".$textHead,
-             'text' => "&nbsp;",
-        );
-        $this->info_box_contents[$i][] = array(
-            'td' => 'class="right liste_total" ',
-            'text' => round($num, 0)."&nbsp;".$langs->trans("Projects"),
-        );
-        $this->info_box_contents[$i][] = array(
-            'td' => 'class="right liste_total" ',
-            'text' => (($max < $num) ? '' : (round($totalnbTask, 0)."&nbsp;".$langs->trans("Tasks"))),
-        );
-        $this->info_box_contents[$i][] = array(
-            'td' => 'class="liste_total"',
-            'text' => "&nbsp;",
-        );
-        $this->info_box_contents[$i][] = array(
-        	'td' => 'class="liste_total"',
-        	'text' => "&nbsp;",
-        );
-    }
+		// Add the sum à the bottom of the boxes
+		$this->info_box_contents[$i][] = array(
+			'td' => 'class="liste_total"',
+			'text' => $langs->trans("Total")."&nbsp;".$textHead,
+			 'text' => "&nbsp;",
+		);
+		$this->info_box_contents[$i][] = array(
+			'td' => 'class="right liste_total" ',
+			'text' => round($num, 0)."&nbsp;".$langs->trans("Projects"),
+		);
+		$this->info_box_contents[$i][] = array(
+			'td' => 'class="right liste_total" ',
+			'text' => (($max < $num) ? '' : (round($totalnbTask, 0)."&nbsp;".$langs->trans("Tasks"))),
+		);
+		$this->info_box_contents[$i][] = array(
+			'td' => 'class="liste_total"',
+			'text' => "&nbsp;",
+		);
+		$this->info_box_contents[$i][] = array(
+			'td' => 'class="liste_total"',
+			'text' => "&nbsp;",
+		);
+	}
 
-    /**
-     *	Method to show box
-     *
-     *	@param	array	$head       Array with properties of box title
-     *	@param  array	$contents   Array with properties of box lines
-     *  @param	int		$nooutput	No print, only return string
-     *	@return	string
-     */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	/**
+	 *	Method to show box
+	 *
+	 *	@param	array	$head       Array with properties of box title
+	 *	@param  array	$contents   Array with properties of box lines
+	 *  @param	int		$nooutput	No print, only return string
+	 *	@return	string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php
index 979723753a0..f98e0f1e347 100644
--- a/htdocs/core/boxes/box_propales.php
+++ b/htdocs/core/boxes/box_propales.php
@@ -33,155 +33,162 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_propales extends ModeleBoxes
 {
-    public $boxcode = "lastpropals";
-    public $boximg = "object_propal";
-    public $boxlabel = "BoxLastProposals";
-    public $depends = array("propal"); // conf->propal->enabled
+	public $boxcode = "lastpropals";
+	public $boximg = "object_propal";
+	public $boxlabel = "BoxLastProposals";
+	public $depends = array("propal"); // conf->propal->enabled
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->hidden = !($user->rights->propale->lire);
-    }
+		$this->hidden = !($user->rights->propale->lire);
+	}
 
-    /**
+	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    public function loadBox($max = 5)
-    {
-    	global $user, $langs, $conf;
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $user, $langs, $conf;
 
-    	$this->max = $max;
+		$this->max = $max;
 
-    	include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-    	$propalstatic = new Propal($this->db);
-        $societestatic = new Societe($this->db);
+		include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		$propalstatic = new Propal($this->db);
+		$societestatic = new Societe($this->db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."Propals", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."Propals", $max));
 
-    	if ($user->rights->propale->lire)
-    	{
-    		$sql = "SELECT s.nom as name, s.rowid as socid, s.code_client, s.logo, s.entity, s.email,";
-    		$sql .= " p.rowid, p.ref, p.fk_statut, p.datep as dp, p.datec, p.fin_validite, p.date_cloture, p.total_ht, p.tva as total_tva, p.total as total_ttc, p.tms";
-    		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-    		$sql .= ", ".MAIN_DB_PREFIX."propal as p";
-    		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-    		$sql .= " WHERE p.fk_soc = s.rowid";
-    		$sql .= " AND p.entity = ".$conf->entity;
-    		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-    		if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY p.datep DESC, p.ref DESC ";
-            else $sql .= " ORDER BY p.tms DESC, p.ref DESC ";
-    		$sql .= $this->db->plimit($max, 0);
+		if ($user->rights->propale->lire)
+		{
+			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_client, s.code_compta, s.client";
+			$sql .= ", s.logo, s.email, s.entity";
+			$sql .= ", p.rowid, p.ref, p.fk_statut, p.datep as dp, p.datec, p.fin_validite, p.date_cloture, p.total_ht, p.tva as total_tva, p.total as total_ttc, p.tms";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			$sql .= ", ".MAIN_DB_PREFIX."propal as p";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE p.fk_soc = s.rowid";
+			$sql .= " AND p.entity IN (".getEntity('propal').")";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY p.datep DESC, p.ref DESC ";
+			else $sql .= " ORDER BY p.tms DESC, p.ref DESC ";
+			$sql .= $this->db->plimit($max, 0);
 
-    		$result = $this->db->query($sql);
-    		if ($result)
-    		{
-    			$num = $this->db->num_rows($result);
-    			$now = dol_now();
+			$result = $this->db->query($sql);
+			if ($result)
+			{
+				$num = $this->db->num_rows($result);
+				$now = dol_now();
 
-    			$line = 0;
+				$line = 0;
 
-                while ($line < $num) {
-    				$objp = $this->db->fetch_object($result);
-    				$date = $this->db->jdate($objp->dp);
-    				$datec = $this->db->jdate($objp->datec);
-    				$datem = $this->db->jdate($objp->tms);
-    				$dateterm = $this->db->jdate($objp->fin_validite);
-    				$dateclose = $this->db->jdate($objp->date_cloture);
-                    $propalstatic->id = $objp->rowid;
-                    $propalstatic->ref = $objp->ref;
-                    $propalstatic->total_ht = $objp->total_ht;
-                    $propalstatic->total_tva = $objp->total_tva;
-                    $propalstatic->total_ttc = $objp->total_ttc;
-                    $societestatic->id = $objp->socid;
-                    $societestatic->name = $objp->name;
-                    $societestatic->code_client = $objp->code_client;
-                    $societestatic->logo = $objp->logo;
-                    $societestatic->email = $objp->email;
+				while ($line < $num) {
+					$objp = $this->db->fetch_object($result);
+					$date = $this->db->jdate($objp->dp);
+					$datec = $this->db->jdate($objp->datec);
+					$datem = $this->db->jdate($objp->tms);
+					$dateterm = $this->db->jdate($objp->fin_validite);
+					$dateclose = $this->db->jdate($objp->date_cloture);
+
+					$propalstatic->id = $objp->rowid;
+					$propalstatic->ref = $objp->ref;
+					$propalstatic->total_ht = $objp->total_ht;
+					$propalstatic->total_tva = $objp->total_tva;
+					$propalstatic->total_ttc = $objp->total_ttc;
+
+					$societestatic->id = $objp->socid;
+					$societestatic->name = $objp->name;
+					//$societestatic->name_alias = $objp->name_alias;
+					$societestatic->code_client = $objp->code_client;
+					$societestatic->code_compta = $objp->code_compta;
+					$societestatic->client = $objp->client;
+					$societestatic->logo = $objp->logo;
+					$societestatic->email = $objp->email;
 					$societestatic->entity = $objp->entity;
 
-    				$late = '';
-    				if ($objp->fk_statut == 1 && $dateterm < ($now - $conf->propal->cloture->warning_delay)) {
-    					$late = img_warning($langs->trans("Late"));
-    				}
+					$late = '';
+					if ($objp->fk_statut == 1 && $dateterm < ($now - $conf->propal->cloture->warning_delay)) {
+						$late = img_warning($langs->trans("Late"));
+					}
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $propalstatic->getNomUrl(1),
-                        'text2'=> $late,
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $propalstatic->getNomUrl(1),
+						'text2'=> $late,
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $societestatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $societestatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right nowraponall"',
-                        'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right nowraponall"',
+						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($date, 'day'),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($date, 'day'),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $propalstatic->LibStatut($objp->fk_statut, 3),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $propalstatic->LibStatut($objp->fk_statut, 3),
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center"',
-                        'text'=>$langs->trans("NoRecordedProposals"),
-                    );
+				if ($num == 0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center"',
+						'text'=>$langs->trans("NoRecordedProposals"),
+					);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *  Method to show box
@@ -191,8 +198,8 @@ class box_propales extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index 1024ef1d4ec..2492c095ad9 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -34,27 +34,27 @@ include_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
  */
 class box_prospect extends ModeleBoxes
 {
-    public $boxcode = "lastprospects";
-    public $boximg = "object_company";
-    public $boxlabel = "BoxLastProspects";
-    public $depends = array("societe");
+	public $boxcode = "lastprospects";
+	public $boximg = "object_company";
+	public $boxlabel = "BoxLastProspects";
+	public $depends = array("societe");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $enabled = 1;
+	public $enabled = 1;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
 	 *  Constructor
 	 *
 	 *  @param  DoliDB	$db      	Database handler
-     *  @param	string	$param		More parameters
+	 *  @param	string	$param		More parameters
 	 */
 	public function __construct($db, $param = '')
 	{
@@ -72,7 +72,7 @@ class box_prospect extends ModeleBoxes
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -86,13 +86,11 @@ class box_prospect extends ModeleBoxes
 
 		if ($user->rights->societe->lire)
 		{
-			$sql = "SELECT s.nom as name, s.rowid as socid";
-			$sql .= ", s.code_client";
-            $sql .= ", s.client, s.email";
-            $sql .= ", s.code_fournisseur";
-            $sql .= ", s.fournisseur";
-            $sql .= ", s.logo";
-			$sql .= ", s.fk_stcomm, s.datec, s.tms, s.status";
+			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_client, s.code_compta, s.client";
+			$sql .= ", s.logo, s.email, s.entity";
+			$sql .= ", s.fk_stcomm";
+			$sql .= ", s.datec, s.tms, s.status";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			$sql .= " WHERE s.client IN (2, 3)";
@@ -114,59 +112,61 @@ class box_prospect extends ModeleBoxes
 					$objp = $this->db->fetch_object($resql);
 					$datec = $this->db->jdate($objp->datec);
 					$datem = $this->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;
-                    $thirdpartystatic->fournisseur = $objp->fournisseur;
-                    $thirdpartystatic->logo = $objp->logo;
+					$thirdpartystatic->name = $objp->name;
+					$thirdpartystatic->name_alias = $objp->name_alias;
+					$thirdpartystatic->code_client = $objp->code_client;
+					$thirdpartystatic->code_compta = $objp->code_compta;
+					$thirdpartystatic->client = $objp->client;
+					$thirdpartystatic->logo = $objp->logo;
+					$thirdpartystatic->email = $objp->email;
+					$thirdpartystatic->entity = $objp->entity;
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $thirdpartystatic->getNomUrl(1),
-                    	'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $thirdpartystatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datem, "day"),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datem, "day"),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => str_replace('img ', 'img height="14" ', $thirdpartystatic->LibProspCommStatut($objp->fk_stcomm, 3)),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => str_replace('img ', 'img height="14" ', $thirdpartystatic->LibProspCommStatut($objp->fk_stcomm, 3)),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $thirdpartystatic->LibStatut($objp->status, 3),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $thirdpartystatic->LibStatut($objp->status, 3),
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0) {
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center opacitymedium"',
-                        'text'=> $langs->trans("NoRecordedProspects"),
-                    );
-                }
+				if ($num == 0) {
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center opacitymedium"',
+						'text'=> $langs->trans("NoRecordedProspects"),
+					);
+				}
 
-                $this->db->free($resql);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength' => 500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
+				$this->db->free($resql);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength' => 500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 	}
 
@@ -178,8 +178,8 @@ class box_prospect extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_scheduled_jobs.php b/htdocs/core/boxes/box_scheduled_jobs.php
new file mode 100644
index 00000000000..81e73f4e0c1
--- /dev/null
+++ b/htdocs/core/boxes/box_scheduled_jobs.php
@@ -0,0 +1,197 @@
+<?php
+/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2011 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2017 	   Nicolas Zabouri      <info@inovea-conseil.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/core/boxes/box_scheduled_jobs.php
+ *		\ingroup    task
+ *      \brief      Widget of scheduled jobs
+ */
+
+include_once DOL_DOCUMENT_ROOT . '/core/boxes/modules_boxes.php';
+
+
+/**
+ * Class to manage the box to show last contracted products/services lines
+ */
+class box_scheduled_jobs extends ModeleBoxes
+{
+	public $boxcode = "scheduledjobs";
+	public $boximg = "object_cron";
+	public $boxlabel = "BoxScheduledJobs";
+	public $depends = array("cron");
+
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
+
+	public $param;
+
+	public $info_box_head = array();
+	public $info_box_contents = array();
+
+
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $user;
+
+		$this->db = $db;
+
+		$this->hidden = !($user->rights->service->lire && $user->rights->contrat->lire);
+	}
+
+	/**
+	 *  Load data into info_box_contents array to show array later.
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $user, $langs, $conf;
+
+		$langs->load("cron");
+		$this->info_box_head = array('text' => $langs->trans("BoxScheduledJobs", $max));
+
+		if ($user->rights->cron->read) {
+			include_once DOL_DOCUMENT_ROOT . '/cron/class/cronjob.class.php';
+			$cronstatic = new Cronjob($this->db);
+			$resultarray = array();
+
+			$result = 0;
+			$sql = "SELECT t.rowid, t.datelastrun, t.datenextrun,";
+			$sql .= " t.label, t.status, t.test, t.lastresult";
+			$sql .= " FROM " . MAIN_DB_PREFIX . "cronjob as t";
+			$sql .= " WHERE status <> ".$cronstatic::STATUS_DISABLED;
+			$sql .= " AND entity IN (0, ".$conf->entity.")";
+			$sql .= $this->db->order("t.datelastrun", "DESC");
+
+			$result = $this->db->query($sql);
+			$line = 0;
+			$nbjobsinerror = 0;
+			if ($result) {
+				$num = $this->db->num_rows($result);
+
+				$i = 0;
+				while ($i < $num) {
+					$objp = $this->db->fetch_object($result);
+
+					if (dol_eval($objp->test, 1, 1)) {
+						$nextrun = $this->db->jdate($objp->datenextrun);
+						if (empty($nextrun)) $nextrun = $this->db->jdate($objp->datestart);
+
+						if ($line == 0 || ($nextrun < $cronstatic->datenextrun && (empty($objp->nbrun) || empty($objp->maxrun) || $objp->nbrun < $obj->maxrun))) {
+							$cronstatic->id = $objp->rowid;
+							$cronstatic->ref = $objp->rowid;
+							$cronstatic->label = $langs->trans($objp->label);
+							$cronstatic->status = $objp->status;
+							$cronstatic->datenextrun = $this->db->jdate($objp->datenextrun);
+							$cronstatic->datelastrun = $this->db->jdate($objp->datelastrun);
+						}
+						if ($line == 0) {
+							$resultarray[$line] = array(
+								$langs->trans("LastExecutedScheduledJob"),
+								$cronstatic->getNomUrl(1),
+								$cronstatic->datelastrun,
+								$cronstatic->status,
+								$cronstatic->getLibStatut(2)
+							);
+							$line++;
+						}
+
+						if (!empty($objp->lastresult)) {
+							$nbjobsinerror++;
+						}
+					}
+					$i++;
+				}
+
+				if ($line) {
+					$resultarray[$line] = array(
+						$langs->trans("NextScheduledJobExecute"),
+						$cronstatic->getNomUrl(1),
+						$cronstatic->datenextrun,
+						$cronstatic->status,
+						$cronstatic->getLibStatut(2)
+					);
+				}
+
+				foreach ($resultarray as $line => $value) {
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="left"',
+						'text' => $resultarray[$line][0]
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="left"',
+						'textnoformat' => $resultarray[$line][1]
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'textnoformat' => dol_print_date($resultarray[$line][2], "dayhoursec")
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" ',
+						'textnoformat' => $resultarray[$line][4]
+					);
+					$line++;
+				}
+				$this->info_box_contents[$line][] = array(
+					'td' => 'class="left" colspan="2"',
+					'text' => $langs->trans("NumberScheduledJobError")
+				);
+				$this->info_box_contents[$line][] = array(
+					'td' => 'class="right" colspan="2"',
+					'textnoformat' => ($nbjobsinerror ? '<span class="error"><a href="'.DOL_URL_ROOT.'/cron/list.php?search_lastresult='.urlencode('<>0').'">'.$nbjobsinerror.'</a></span>'.img_error() : '<span class="opacitymedium">'.$langs->trans("None").'<span>')
+				);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength' => 500,
+					'text' => ($this->db->lasterror() . ' sql=' . $sql)
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
+
+	/**
+	 *	Method to show box
+	 *
+	 *	@param	array	$head       Array with properties of box title
+	 *	@param  array	$contents   Array with properties of box lines
+	 *  @param	int		$nooutput	No print, only return string
+	 *	@return	string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
+}
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index d528a4d68ca..c4a713a03b5 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -32,20 +32,20 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_services_contracts extends ModeleBoxes
 {
-    public $boxcode = "lastproductsincontract";
-    public $boximg = "object_product";
-    public $boxlabel = "BoxLastProductsInContract";
-    public $depends = array("service", "contrat");
+	public $boxcode = "lastproductsincontract";
+	public $boximg = "object_product";
+	public $boxlabel = "BoxLastProductsInContract";
+	public $depends = array("service", "contrat");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -56,18 +56,18 @@ class box_services_contracts extends ModeleBoxes
 	 */
 	public function __construct($db, $param)
 	{
-	    global $user;
+		global $user;
 
-	    $this->db = $db;
+		$this->db = $db;
 
-	    $this->hidden = !($user->rights->service->lire && $user->rights->contrat->lire);
+		$this->hidden = !($user->rights->service->lire && $user->rights->contrat->lire);
 	}
 
 	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -83,15 +83,15 @@ class box_services_contracts extends ModeleBoxes
 
 		if ($user->rights->service->lire && $user->rights->contrat->lire)
 		{
-		    $contractstatic = new Contrat($this->db);
-		    $contractlinestatic = new ContratLigne($this->db);
-		    $thirdpartytmp = new Societe($this->db);
-		    $productstatic = new Product($this->db);
+			$contractstatic = new Contrat($this->db);
+			$contractlinestatic = new ContratLigne($this->db);
+			$thirdpartytmp = new Societe($this->db);
+			$productstatic = new Product($this->db);
 
 			$sql = "SELECT s.nom as name, s.rowid as socid, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
 			$sql .= " c.rowid, c.ref, c.statut as contract_status, c.ref_customer, c.ref_supplier,";
 			$sql .= " cd.rowid as cdid, cd.label, cd.description, cd.tms as datem, cd.statut as contractline_status, cd.product_type as type, cd.date_fin_validite as date_line,";
-			$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as plabel, p.fk_product_type as ptype, p.entity, p.tobuy, p.tosell";
+			$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as product_type, p.entity, p.tobuy, p.tosell";
 			$sql .= " FROM (".MAIN_DB_PREFIX."societe as s";
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."contrat as c ON s.rowid = c.fk_soc";
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
@@ -125,6 +125,7 @@ class box_services_contracts extends ModeleBoxes
 					$contractlinestatic->type = $objp->type;
 					$contractlinestatic->product_id = $objp->product_id;
 					$contractlinestatic->product_ref = $objp->product_ref;
+					$contractlinestatic->product_type = $objp->product_type;
 					$contractlinestatic->statut = $objp->contractline_status;
 
 					$contractstatic->id = $objp->rowid;
@@ -150,27 +151,27 @@ class box_services_contracts extends ModeleBoxes
 					if ($objp->product_id > 0)
 					{
 						$productstatic->id = $objp->product_id;
-						$productstatic->type = $objp->ptype;
+						$productstatic->type = $objp->product_type;
 						$productstatic->ref = $objp->product_ref;
 						$productstatic->entity = $objp->pentity;
-						$productstatic->label = $objp->plabel;
+						$productstatic->label = $objp->product_label;
 						$productstatic->status = $objp->tosell;
 						$productstatic->status_buy = $objp->tobuy;
 
 						$text = $productstatic->getNomUrl(1, '', 20);
-						if ($objp->plabel)
+						if ($objp->product_label)
 						{
 							$text .= ' - ';
 							//$productstatic->ref=$objp->label;
 							//$text .= $productstatic->getNomUrl(0,'',16);
-							$text .= $objp->plabel;
+							$text .= $objp->product_label;
 						}
 						$description = $objp->description;
 
 						// Add description in form
 						if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
 						{
-							//$text .= (! empty($objp->description) && $objp->description!=$objp->plabel)?'<br>'.dol_htmlentitiesbr($objp->description):'';
+							//$text .= (! empty($objp->description) && $objp->description!=$objp->product_label)?'<br>'.dol_htmlentitiesbr($objp->description):'';
 							$description = ''; // Already added into main visible desc
 						}
 
@@ -181,31 +182,31 @@ class box_services_contracts extends ModeleBoxes
 
 
 					$this->info_box_contents[$i][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $s,
-                        'asis' => 1
-                    );
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $s,
+						'asis' => 1
+					);
 
 					$this->info_box_contents[$i][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $contractstatic->getNomUrl(1),
-                        'asis' => 1
-                    );
+						'td' => 'class="nowraponall"',
+						'text' => $contractstatic->getNomUrl(1),
+						'asis' => 1
+					);
 
 					$this->info_box_contents[$i][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $thirdpartytmp->getNomUrl(1),
-                        'asis' => 1
-                    );
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $thirdpartytmp->getNomUrl(1),
+						'asis' => 1
+					);
 
 					$this->info_box_contents[$i][] = array(
-                        'td' => '',
-                        'text' => dol_print_date($datem, 'day'),
+						'td' => '',
+						'text' => dol_print_date($datem, 'day'),
 						'text2'=> $late,
-                    );
+					);
 
 					$this->info_box_contents[$i][] = array(
-                        'td' => 'class="right" width="18"',
+						'td' => 'class="right" width="18"',
 						'text' => $contractlinestatic->getLibStatut(3)
 					);
 
@@ -219,15 +220,15 @@ class box_services_contracts extends ModeleBoxes
 				$this->db->free($result);
 			} else {
 				$this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength' => 500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
+					'td' => '',
+					'maxlength' => 500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
 	}
@@ -240,8 +241,8 @@ class box_services_contracts extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
index d7b3433f6d2..7a65fd0a9d2 100644
--- a/htdocs/core/boxes/box_services_expired.php
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -30,160 +30,160 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
 class box_services_expired extends ModeleBoxes
 {
 
-    public $boxcode = "expiredservices"; // id of box
-    public $boximg = "object_contract";
-    public $boxlabel = "BoxOldestExpiredServices";
-    public $depends = array("contrat"); // conf->propal->enabled
+	public $boxcode = "expiredservices"; // id of box
+	public $boximg = "object_contract";
+	public $boxlabel = "BoxOldestExpiredServices";
+	public $depends = array("contrat"); // conf->propal->enabled
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->hidden = !($user->rights->contrat->lire);
-    }
+		$this->hidden = !($user->rights->contrat->lire);
+	}
 
-    /**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    public function loadBox($max = 5)
-    {
-    	global $user, $langs, $conf;
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $user, $langs, $conf;
 
-    	$this->max = $max;
+		$this->max = $max;
 
-    	include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 
-    	$now = dol_now();
+		$now = dol_now();
 
-    	$this->info_box_head = array('text' => $langs->trans("BoxLastExpiredServices", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxLastExpiredServices", $max));
 
-    	if ($user->rights->contrat->lire)
-    	{
-    	    // Select contracts with at least one expired service
+		if ($user->rights->contrat->lire)
+		{
+			// Select contracts with at least one expired service
 			$sql = "SELECT ";
-    		$sql .= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.ref_customer, c.ref_supplier,";
+			$sql .= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.ref_customer, c.ref_supplier,";
 			$sql .= " s.nom as name, s.rowid as socid, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
 			$sql .= " MIN(cd.date_fin_validite) as date_line, COUNT(cd.rowid) as nb_services";
-    		$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe s, ".MAIN_DB_PREFIX."contratdet as cd";
-            if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-    		$sql .= " WHERE cd.statut = 4 AND cd.date_fin_validite <= '".$this->db->idate($now)."'";
-    		$sql .= " AND c.entity = ".$conf->entity;
-    		$sql .= " AND c.fk_soc=s.rowid AND cd.fk_contrat=c.rowid AND c.statut > 0";
-            if ($user->socid) $sql .= ' AND c.fk_soc = '.$user->socid;
-            if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-    		$sql .= " GROUP BY c.rowid, c.ref, c.statut, c.date_contrat, c.ref_customer, c.ref_supplier, s.nom, s.rowid";
-    		$sql .= ", s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur";
-    		$sql .= " ORDER BY date_line ASC";
-    		$sql .= $this->db->plimit($max, 0);
+			$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe s, ".MAIN_DB_PREFIX."contratdet as cd";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE cd.statut = 4 AND cd.date_fin_validite <= '".$this->db->idate($now)."'";
+			$sql .= " AND c.entity = ".$conf->entity;
+			$sql .= " AND c.fk_soc=s.rowid AND cd.fk_contrat=c.rowid AND c.statut > 0";
+			if ($user->socid) $sql .= ' AND c.fk_soc = '.$user->socid;
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			$sql .= " GROUP BY c.rowid, c.ref, c.statut, c.date_contrat, c.ref_customer, c.ref_supplier, s.nom, s.rowid";
+			$sql .= ", s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur";
+			$sql .= " ORDER BY date_line ASC";
+			$sql .= $this->db->plimit($max, 0);
 
-    		$resql = $this->db->query($sql);
-    		if ($resql)
-    		{
-    			$num = $this->db->num_rows($resql);
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				$num = $this->db->num_rows($resql);
 
-    			$i = 0;
+				$i = 0;
 
-    			$thirdpartytmp = new Societe($this->db);
-    			$contract = new Contrat($this->db);
+				$thirdpartytmp = new Societe($this->db);
+				$contract = new Contrat($this->db);
 
-    			while ($i < $num)
-    			{
-    			    $late = '';
+				while ($i < $num)
+				{
+					$late = '';
 
-    				$objp = $this->db->fetch_object($resql);
+					$objp = $this->db->fetch_object($resql);
 
-    				$thirdpartytmp->name = $objp->name;
-    				$thirdpartytmp->id = $objp->socid;
-    				$thirdpartytmp->email = $objp->email;
-    				$thirdpartytmp->client = $objp->client;
-    				$thirdpartytmp->fournisseur = $objp->fournisseur;
-    				$thirdpartytmp->code_client = $objp->code_client;
-    				$thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
-    				$thirdpartytmp->code_compta = $objp->code_compta;
-    				$thirdpartytmp->code_compta_fournisseur = $objp->code_compta_fournisseur;
+					$thirdpartytmp->name = $objp->name;
+					$thirdpartytmp->id = $objp->socid;
+					$thirdpartytmp->email = $objp->email;
+					$thirdpartytmp->client = $objp->client;
+					$thirdpartytmp->fournisseur = $objp->fournisseur;
+					$thirdpartytmp->code_client = $objp->code_client;
+					$thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartytmp->code_compta = $objp->code_compta;
+					$thirdpartytmp->code_compta_fournisseur = $objp->code_compta_fournisseur;
 
-    				$contract->id = $objp->rowid;
-    				$contract->ref = $objp->ref;
-    				$contract->statut = $objp->fk_statut;
-    				$contract->ref_customer = $objp->ref_customer;
-    				$contract->ref_supplier = $objp->ref_supplier;
+					$contract->id = $objp->rowid;
+					$contract->ref = $objp->ref;
+					$contract->statut = $objp->fk_statut;
+					$contract->ref_customer = $objp->ref_customer;
+					$contract->ref_supplier = $objp->ref_supplier;
 
 					$dateline = $this->db->jdate($objp->date_line);
 					if (($dateline + $conf->contrat->services->expires->warning_delay) < $now) $late = img_warning($langs->trans("Late"));
 
-    				$this->info_box_contents[$i][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $contract->getNomUrl(1),
-                        'asis' => 1
-    				);
+					$this->info_box_contents[$i][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $contract->getNomUrl(1),
+						'asis' => 1
+					);
 
-    				$this->info_box_contents[$i][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone left"',
-                        'text' => $thirdpartytmp->getNomUrl(1, 'customer'),
-                        'asis' => 1
-    				);
+					$this->info_box_contents[$i][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone left"',
+						'text' => $thirdpartytmp->getNomUrl(1, 'customer'),
+						'asis' => 1
+					);
 
-    				$this->info_box_contents[$i][] = array(
-                        'td' => 'class="center nowraponall"',
-                        'text' => dol_print_date($dateline, 'day'),
-                        'text2'=> $late,
-                    );
+					$this->info_box_contents[$i][] = array(
+						'td' => 'class="center nowraponall"',
+						'text' => dol_print_date($dateline, 'day'),
+						'text2'=> $late,
+					);
 
-    				$this->info_box_contents[$i][] = array(
-                        'td' => 'class="right"',
-                        'text' => $objp->nb_services,
-                    );
+					$this->info_box_contents[$i][] = array(
+						'td' => 'class="right"',
+						'text' => $objp->nb_services,
+					);
 
 
-    				$i++;
-    			}
+					$i++;
+				}
 
-    			if ($num == 0)
-    			{
-    			    $langs->load("contracts");
-    			    $this->info_box_contents[$i][] = array(
-                        'td' => 'class="nohover opacitymedium center"',
-                        'text' => $langs->trans("NoExpiredServices"),
-                    );
-    			}
+				if ($num == 0)
+				{
+					$langs->load("contracts");
+					$this->info_box_contents[$i][] = array(
+						'td' => 'class="nohover opacitymedium center"',
+						'text' => $langs->trans("NoExpiredServices"),
+					);
+				}
 
 				$this->db->free($resql);
-    		} else {
-    			$this->info_box_contents[0][] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-    		}
-    	} else {
-    		$this->info_box_contents[0][0] = array(
-    		    'td' => 'class="nohover opacitymedium left"',
-    		    'text' => $langs->trans("ReadPermissionNotAllowed")
-    		);
-    	}
-    }
+			} else {
+				$this->info_box_contents[0][] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *  Method to show box
@@ -193,8 +193,8 @@ class box_services_expired extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *  @return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_shipments.php b/htdocs/core/boxes/box_shipments.php
index 61942d03f45..5a1f093ce87 100644
--- a/htdocs/core/boxes/box_shipments.php
+++ b/htdocs/core/boxes/box_shipments.php
@@ -32,152 +32,155 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_shipments extends ModeleBoxes
 {
-    public $boxcode = "lastcustomershipments";
-    public $boximg = "sending";
-    public $boxlabel = "BoxLastCustomerShipments";
-    public $depends = array("expedition");
+	public $boxcode = "lastcustomershipments";
+	public $boximg = "sending";
+	public $boxlabel = "BoxLastCustomerShipments";
+	public $depends = array("expedition");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->hidden = !($user->rights->expedition->lire);
-    }
+		$this->hidden = !($user->rights->expedition->lire);
+	}
 
-    /**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    public function loadBox($max = 5)
-    {
-        global $user, $langs, $conf;
-        $langs->loadLangs(array('orders', 'sendings'));
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $user, $langs, $conf;
+		$langs->loadLangs(array('orders', 'sendings'));
 
-        $this->max = $max;
+		$this->max = $max;
 
-        include_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
-        $shipmentstatic = new Expedition($this->db);
-        $orderstatic = new Commande($this->db);
-        $societestatic = new Societe($this->db);
+		$shipmentstatic = new Expedition($this->db);
+		$orderstatic = new Commande($this->db);
+		$societestatic = new Societe($this->db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLastCustomerShipments", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastCustomerShipments", $max));
 
-        if ($user->rights->expedition->lire)
-        {
-            $sql = "SELECT s.nom as name";
-            $sql .= ", s.rowid as socid";
-            $sql .= ", s.code_client";
-            $sql .= ", s.logo, s.email";
-            $sql .= ", e.ref, e.tms";
-            $sql .= ", e.rowid";
-            $sql .= ", e.ref_customer";
-            $sql .= ", e.fk_statut";
-            $sql .= ", e.fk_user_valid";
-            $sql .= ", c.ref as commande_ref";
-            $sql .= ", c.rowid as commande_id";
-            $sql .= " FROM ".MAIN_DB_PREFIX."expedition as e";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping' AND el.sourcetype IN ('commande')";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid AND el.sourcetype IN ('commande') AND el.targettype = 'shipping'";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
-            if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
-            $sql .= " WHERE e.entity = ".$conf->entity;
-            if (!empty($conf->global->ORDER_BOX_LAST_SHIPMENTS_VALIDATED_ONLY)) $sql .= " AND e.fk_statut = 1";
-            if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND sc.fk_user = ".$user->id;
-            else $sql .= " ORDER BY e.date_delivery, e.ref DESC ";
-            $sql .= $this->db->plimit($max, 0);
+		if ($user->rights->expedition->lire)
+		{
+			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_client, s.code_compta, s.client";
+			$sql .= ", s.logo, s.email, s.entity";
+			$sql .= ", e.ref, e.tms";
+			$sql .= ", e.rowid";
+			$sql .= ", e.ref_customer";
+			$sql .= ", e.fk_statut";
+			$sql .= ", e.fk_user_valid";
+			$sql .= ", c.ref as commande_ref";
+			$sql .= ", c.rowid as commande_id";
+			$sql .= " FROM ".MAIN_DB_PREFIX."expedition as e";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping' AND el.sourcetype IN ('commande')";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid AND el.sourcetype IN ('commande') AND el.targettype = 'shipping'";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
+			$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
+			if (!empty($conf->global->ORDER_BOX_LAST_SHIPMENTS_VALIDATED_ONLY)) $sql .= " AND e.fk_statut = 1";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND sc.fk_user = ".$user->id;
+			else $sql .= " ORDER BY e.date_delivery, e.ref DESC ";
+			$sql .= $this->db->plimit($max, 0);
 
-            $result = $this->db->query($sql);
-            if ($result) {
-                $num = $this->db->num_rows($result);
+			$result = $this->db->query($sql);
+			if ($result) {
+				$num = $this->db->num_rows($result);
 
-                $line = 0;
+				$line = 0;
 
-                while ($line < $num) {
-                    $objp = $this->db->fetch_object($result);
+				while ($line < $num) {
+					$objp = $this->db->fetch_object($result);
 
-                    $shipmentstatic->id = $objp->rowid;
-                    $shipmentstatic->ref = $objp->ref;
-                    $shipmentstatic->ref_customer = $objp->ref_customer;
+					$shipmentstatic->id = $objp->rowid;
+					$shipmentstatic->ref = $objp->ref;
+					$shipmentstatic->ref_customer = $objp->ref_customer;
 
-                    $orderstatic->id = $objp->commande_id;
-                    $orderstatic->ref = $objp->commande_ref;
+					$orderstatic->id = $objp->commande_id;
+					$orderstatic->ref = $objp->commande_ref;
 
-                    $societestatic->id = $objp->socid;
-                    $societestatic->name = $objp->name;
-                    $societestatic->email = $objp->email;
-                    $societestatic->code_client = $objp->code_client;
-                    $societestatic->logo = $objp->logo;
+					$societestatic->id = $objp->socid;
+					$societestatic->name = $objp->name;
+					//$societestatic->name_alias = $objp->name_alias;
+					$societestatic->code_client = $objp->code_client;
+					$societestatic->code_compta = $objp->code_compta;
+					$societestatic->client = $objp->client;
+					$societestatic->logo = $objp->logo;
+					$societestatic->email = $objp->email;
+					$societestatic->entity = $objp->entity;
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $shipmentstatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $shipmentstatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $societestatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $societestatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $orderstatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $orderstatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $shipmentstatic->LibStatut($objp->fk_statut, 3),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $shipmentstatic->LibStatut($objp->fk_statut, 3),
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0) $this->info_box_contents[$line][0] = array(
-                	'td' => 'class="center opacitymedium"',
-                	'text'=>$langs->trans("NoRecordedShipments")
-                );
+				if ($num == 0) $this->info_box_contents[$line][0] = array(
+					'td' => 'class="center opacitymedium"',
+					'text'=>$langs->trans("NoRecordedShipments")
+				);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -187,8 +190,8 @@ class box_shipments extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index 5ba940f2af2..151c1df6bcb 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -31,160 +31,163 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
 class box_supplier_orders extends ModeleBoxes
 {
 
-    public $boxcode = "latestsupplierorders";
-    public $boximg = "object_order";
-    public $boxlabel = "BoxLatestSupplierOrders";
-    public $depends = array("fournisseur");
+	public $boxcode = "latestsupplierorders";
+	public $boximg = "object_order";
+	public $boxlabel = "BoxLatestSupplierOrders";
+	public $depends = array("fournisseur");
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $param;
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->hidden = !($user->rights->fournisseur->commande->lire);
-    }
+		$this->hidden = !($user->rights->fournisseur->commande->lire);
+	}
 
-    /**
-     *  Load data into info_box_contents array to show array later.
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    public function loadBox($max = 5)
-    {
-        global $conf, $user, $langs;
-        $langs->load("boxes");
+	/**
+	 *  Load data into info_box_contents array to show array later.
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf, $user, $langs;
+		$langs->load("boxes");
 
-        $this->max = $max;
+		$this->max = $max;
 
-        include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-        $supplierorderstatic = new CommandeFournisseur($this->db);
-        include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
-        $thirdpartytmp = new Fournisseur($this->db);
+		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+		$supplierorderstatic = new CommandeFournisseur($this->db);
+		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
+		$thirdpartystatic = new Fournisseur($this->db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLatest".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."SupplierOrders", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLatest".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."SupplierOrders", $max));
 
-        if ($user->rights->fournisseur->commande->lire)
-        {
-            $sql = "SELECT s.nom as name, s.rowid as socid,";
-            $sql .= " s.code_client, s.code_fournisseur,";
-            $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,";
-            $sql .= " c.total_ttc,";
-            $sql .= " c.fk_statut";
-            $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-            $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
-            if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql .= " WHERE c.fk_soc = s.rowid";
-            $sql .= " AND c.entity = ".$conf->entity;
-            if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-            if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
-            else $sql .= " ORDER BY c.tms DESC, c.ref DESC ";
-            $sql .= $this->db->plimit($max, 0);
+		if ($user->rights->fournisseur->commande->lire)
+		{
+			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+			$sql .= ", s.logo, s.email, s.entity";
+			$sql .= ", c.rowid, c.ref, c.tms, c.date_commande";
+			$sql .= ", c.total_ht";
+			$sql .= ", c.tva as total_tva";
+			$sql .= ", c.total_ttc";
+			$sql .= ", c.fk_statut";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE c.fk_soc = s.rowid";
+			$sql .= " AND c.entity IN (".getEntity('supplier_order').")";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
+			else $sql .= " ORDER BY c.tms DESC, c.ref DESC ";
+			$sql .= $this->db->plimit($max, 0);
 
-            $result = $this->db->query($sql);
-            if ($result)
-            {
-                $num = $this->db->num_rows($result);
+			$result = $this->db->query($sql);
+			if ($result)
+			{
+				$num = $this->db->num_rows($result);
 
-                $line = 0;
-                while ($line < $num) {
-                    $objp = $this->db->fetch_object($result);
-                    $date = $this->db->jdate($objp->date_commande);
+				$line = 0;
+				while ($line < $num) {
+					$objp = $this->db->fetch_object($result);
+					$date = $this->db->jdate($objp->date_commande);
 					$datem = $this->db->jdate($objp->tms);
 
 					$supplierorderstatic->id = $objp->rowid;
 					$supplierorderstatic->ref = $objp->ref;
 
-					$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;
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $supplierorderstatic->getNomUrl(1),
-                    	'asis' => 1
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $thirdpartytmp->getNomUrl(1, 'supplier'),
-                        'asis' => 1,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right nowraponall"',
-                        'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
-                    );
+					$thirdpartystatic->id = $objp->socid;
+					$thirdpartystatic->name = $objp->name;
+					//$thirdpartystatic->name_alias = $objp->name_alias;
+					$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
+					$thirdpartystatic->fournisseur = $objp->fournisseur;
+					$thirdpartystatic->logo = $objp->logo;
+					$thirdpartystatic->email = $objp->email;
+					$thirdpartystatic->entity = $objp->entity;
 
 					$this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($date, 'day'),
-                    );
+						'td' => 'class="nowraponall"',
+						'text' => $supplierorderstatic->getNomUrl(1),
+						'asis' => 1
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $supplierorderstatic->LibStatut($objp->fk_statut, 3),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $thirdpartystatic->getNomUrl(1, 'supplier'),
+						'asis' => 1,
+					);
 
-                    $line++;
-                }
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right nowraponall"',
+						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
+					);
 
-                if ($num == 0)
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="center"',
-                        'text' => $langs->trans("NoSupplierOrder"),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($date, 'day'),
+					);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $supplierorderstatic->LibStatut($objp->fk_statut, 3),
+					);
 
-    /**
-     *  Method to show box
-     *
-     *  @param  array   $head       Array with properties of box title
-     *  @param  array   $contents   Array with properties of box lines
-     *  @param  int     $nooutput   No print, only return string
-     *  @return string
-     */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+					$line++;
+				}
+
+				if ($num == 0)
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="center"',
+						'text' => $langs->trans("NoSupplierOrder"),
+					);
+
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][] = array(
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
+			);
+		}
+	}
+
+	/**
+	 *  Method to show box
+	 *
+	 *  @param  array   $head       Array with properties of box title
+	 *  @param  array   $contents   Array with properties of box lines
+	 *  @param  int     $nooutput   No print, only return string
+	 *  @return string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
index 952e0b78d92..80fdbc2f4a2 100644
--- a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
+++ b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
@@ -31,167 +31,169 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
 class box_supplier_orders_awaiting_reception extends ModeleBoxes
 {
 
-    public $boxcode = "supplierordersawaitingreception";
-    public $boximg = "object_order";
-    public $boxlabel = "BoxLatestSupplierOrdersAwaitingReception";
-    public $depends = array("fournisseur");
+	public $boxcode = "supplierordersawaitingreception";
+	public $boximg = "object_order";
+	public $boxlabel = "BoxLatestSupplierOrdersAwaitingReception";
+	public $depends = array("fournisseur");
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $param;
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->hidden = !($user->rights->fournisseur->commande->lire);
-    }
+		$this->hidden = !($user->rights->fournisseur->commande->lire);
+	}
 
-    /**
-     *  Load data into info_box_contents array to show array later.
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    public function loadBox($max = 5)
-    {
-        global $conf, $user, $langs;
-        $langs->loadLangs(array("boxes", "sendings", "orders"));
+	/**
+	 *  Load data into info_box_contents array to show array later.
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf, $user, $langs;
+		$langs->loadLangs(array("boxes", "sendings", "orders"));
 
-        $this->max = $max;
+		$this->max = $max;
 
-        include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-        $supplierorderstatic = new CommandeFournisseur($this->db);
-        include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
-        $thirdpartytmp = new Fournisseur($this->db);
+		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+		$supplierorderstatic = new CommandeFournisseur($this->db);
+		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
+		$thirdpartystatic = new Fournisseur($this->db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleSupplierOrdersAwaitingReception", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleSupplierOrdersAwaitingReception", $max));
 
-        if ($user->rights->fournisseur->commande->lire)
-        {
-            $sql = "SELECT s.nom as name, s.rowid as socid,";
-            $sql .= " s.code_client, s.code_fournisseur, s.email,";
-            $sql .= " s.logo,";
-            $sql .= " c.rowid, c.ref, c.tms, c.date_commande, c.date_livraison, ";
-            $sql .= " c.total_ht,";
-            $sql .= " c.tva as total_tva,";
-            $sql .= " c.total_ttc,";
-            $sql .= " c.fk_statut";
-            $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-            $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
-            if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql .= " WHERE c.fk_soc = s.rowid";
-            $sql .= " AND c.entity = ".$conf->entity;
+		if ($user->rights->fournisseur->commande->lire)
+		{
+			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+			$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+			$sql .= ", s.logo, s.email, s.entity";
+			$sql .= ", c.rowid, c.ref, c.tms, c.date_commande, c.date_livraison as delivery_date";
+			$sql .= ", c.total_ht";
+			$sql .= ", c.tva as total_tva";
+			$sql .= ", c.total_ttc";
+			$sql .= ", c.fk_statut";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE c.fk_soc = s.rowid";
+			$sql .= " AND c.entity IN (".getEntity('supplier_order').")";
+			$sql .= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.")";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC";
+			else $sql .= " ORDER BY c.date_livraison ASC, c.fk_statut ASC";
+			$sql .= $this->db->plimit($max, 0);
 
-            $sql .= " AND c.fk_statut = ".CommandeFournisseur::STATUS_ORDERSENT;
-            if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-            if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
-            else $sql .= " ORDER BY c.date_livraison ASC, c.fk_statut ASC ";
-            $sql .= $this->db->plimit($max, 0);
+			$result = $this->db->query($sql);
+			if ($result)
+			{
+				$num = $this->db->num_rows($result);
 
-            $result = $this->db->query($sql);
-            if ($result)
-            {
-                $num = $this->db->num_rows($result);
-
-                $line = 0;
-                while ($line < $num) {
-                    $objp = $this->db->fetch_object($result);
-                    $date = $this->db->jdate($objp->date_commande);
-                    $date_livraison = $this->db->jdate($objp->date_livraison);
+				$line = 0;
+				while ($line < $num) {
+					$objp = $this->db->fetch_object($result);
+					$date = $this->db->jdate($objp->date_commande);
+					$delivery_date = $this->db->jdate($objp->delivery_date);
 					$datem = $this->db->jdate($objp->tms);
 
-                    $supplierorderstatic->date_livraison = $date_livraison;
-                    $supplierorderstatic->statut = $objp->fk_statut;
+					$supplierorderstatic->delivery_date = $delivery_date;
+					$supplierorderstatic->statut = $objp->fk_statut;
 
 					$supplierorderstatic->id = $objp->rowid;
 					$supplierorderstatic->ref = $objp->ref;
 
-					$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;
+					$thirdpartystatic->id = $objp->socid;
+					$thirdpartystatic->name = $objp->name;
+					//$thirdpartystatic->name_alias = $objp->name_alias;
+					$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
+					$thirdpartystatic->fournisseur = $objp->fournisseur;
+					$thirdpartystatic->logo = $objp->logo;
+					$thirdpartystatic->email = $objp->email;
+					$thirdpartystatic->entity = $objp->entity;
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $supplierorderstatic->getNomUrl(1),
-                    	'asis' => 1
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $supplierorderstatic->getNomUrl(1),
+						'asis' => 1
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $thirdpartytmp->getNomUrl(1, 'supplier'),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $thirdpartystatic->getNomUrl(1, 'supplier'),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right nowraponall"',
-                        'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right nowraponall"',
+						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
+					);
 
-                    $delayIcon = '';
-                    if ($supplierorderstatic->hasDelay()) {
-                        $delayIcon = img_warning($langs->trans("Late"));
-                    }
+					$delayIcon = '';
+					if ($supplierorderstatic->hasDelay()) {
+						$delayIcon = img_warning($langs->trans("Late"));
+					}
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => $delayIcon.'<span class="classfortooltip" title="'.$langs->trans('DateDeliveryPlanned').'"><i class="fa fa-dolly" ></i> '.dol_print_date($date_livraison, 'day').'</span>',
-                        'asis' => 1
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => $delayIcon.'<span class="classfortooltip" title="'.$langs->trans('DateDeliveryPlanned').'"><i class="fa fa-dolly" ></i> '.dol_print_date($delivery_date, 'day').'</span>',
+						'asis' => 1
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0)
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="center"',
-                        'text' => $langs->trans("NoSupplierOrder"),
-                    );
+				if ($num == 0)
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="center"',
+						'text' => $langs->trans("NoSupplierOrder"),
+					);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
-    /**
-     *  Method to show box
-     *
-     *  @param  array   $head       Array with properties of box title
-     *  @param  array   $contents   Array with properties of box lines
-     *  @param  int     $nooutput   No print, only return string
-     *  @return string
-     */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	/**
+	 *  Method to show box
+	 *
+	 *  @param  array   $head       Array with properties of box title
+	 *  @param  array   $contents   Array with properties of box lines
+	 *  @param  int     $nooutput   No print, only return string
+	 *  @return string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index c1d728eb667..16b96e23466 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2012-2018 Charlene BENKE 	<charlie@patas-monkey.com>
- * Copyright (C) 2015-2019  Frederic France      <frederic.france@netlogic.fr>
+/* Copyright (C) 2012-2018  Charlene BENKE 	<charlie@patas-monkey.com>
+ * Copyright (C) 2015-2020  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
@@ -31,41 +31,41 @@ require_once DOL_DOCUMENT_ROOT."/core/lib/date.lib.php";
  */
 class box_task extends ModeleBoxes
 {
-    public $boxcode = "projettask";
-    public $boximg = "object_projecttask";
-    public $boxlabel;
-    public $depends = array("projet");
+	public $boxcode = "projettask";
+	public $boximg = "object_projecttask";
+	public $boxlabel;
+	public $depends = array("projet");
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
-    public $enabled = 1; // enable because fixed ;-).
+	public $param;
+	public $enabled = 1; // enable because fixed ;-).
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param = '')
-    {
-        global $conf, $user, $langs;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param = '')
+	{
+		global $conf, $user, $langs;
 
-        // Load translation files required by the page
-        $langs->loadLangs(array('boxes', 'projects'));
+		// Load translation files required by the page
+		$langs->loadLangs(array('boxes', 'projects'));
 
-        $this->boxlabel = "Tasks";
-        $this->db = $db;
+		$this->boxlabel = "Tasks";
+		$this->db = $db;
 
-        $this->hidden = (!empty($conf->global->PROJECT_HIDE_TASKS) || !($user->rights->projet->lire));
-    }
+		$this->hidden = (!empty($conf->global->PROJECT_HIDE_TASKS) || !($user->rights->projet->lire));
+	}
 
 	/**
 	 *  Load data for box to show them later
@@ -80,93 +80,93 @@ class box_task extends ModeleBoxes
 		$this->max = $max;
 		include_once DOL_DOCUMENT_ROOT."/projet/class/task.class.php";
 		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-        require_once DOL_DOCUMENT_ROOT."/core/lib/project.lib.php";
-        $projectstatic = new Project($this->db);
+		require_once DOL_DOCUMENT_ROOT."/core/lib/project.lib.php";
+		$projectstatic = new Project($this->db);
 		$taskstatic = new Task($this->db);
 		$form = new Form($this->db);
-        $cookie_name = 'DOLUSERCOOKIE_boxfilter_task';
-        $boxcontent = '';
-        $socid = $user->socid;
+		$cookie_name = 'DOLUSERCOOKIE_boxfilter_task';
+		$boxcontent = '';
+		$socid = $user->socid;
 
-        $textHead = $langs->trans("CurentlyOpenedTasks");
+		$textHead = $langs->trans("CurentlyOpenedTasks");
 
-        $filterValue = 'all';
-        if (in_array(GETPOST($cookie_name), array('all', 'im_project_contact', 'im_task_contact'))) {
-            $filterValue = GETPOST($cookie_name);
-        } elseif (!empty($_COOKIE[$cookie_name])) {
-            $filterValue = preg_replace('/[^a-z_]/', '', $_COOKIE[$cookie_name]);	// Clean cookie from evil data
-        }
+		$filterValue = 'all';
+		if (in_array(GETPOST($cookie_name), array('all', 'im_project_contact', 'im_task_contact'))) {
+			$filterValue = GETPOST($cookie_name);
+		} elseif (!empty($_COOKIE[$cookie_name])) {
+			$filterValue = preg_replace('/[^a-z_]/', '', $_COOKIE[$cookie_name]); // Clean cookie from evil data
+		}
 
-        if ($filterValue == 'im_task_contact') {
-            $textHead .= ' : '.$langs->trans("WhichIamLinkedTo");
-        } elseif ($filterValue == 'im_project_contact') {
-            $textHead .= ' : '.$langs->trans("WhichIamLinkedToProject");
-        }
+		if ($filterValue == 'im_task_contact') {
+			$textHead .= ' : '.$langs->trans("WhichIamLinkedTo");
+		} elseif ($filterValue == 'im_project_contact') {
+			$textHead .= ' : '.$langs->trans("WhichIamLinkedToProject");
+		}
 
 
 		$this->info_box_head = array(
-		    'text' => $textHead,
-            'limit'=> dol_strlen($textHead),
-            'sublink'=>'',
-            'subtext'=>$langs->trans("Filter"),
-            'subpicto'=>'filter.png',
-            'subclass'=>'linkobject boxfilter',
-            'target'=>'none'	// Set '' to get target="_blank"
-        );
+			'text' => $textHead,
+			'limit'=> dol_strlen($textHead),
+			'sublink'=>'',
+			'subtext'=>$langs->trans("Filter"),
+			'subpicto'=>'filter.png',
+			'subclass'=>'linkobject boxfilter',
+			'target'=>'none'	// Set '' to get target="_blank"
+		);
 
 		// list the summary of the orders
 		if ($user->rights->projet->lire) {
-            $boxcontent .= '<div id="ancor-idfilter'.$this->boxcode.'" style="display: block; position: absolute; margin-top: -100px"></div>'."\n";
-            $boxcontent .= '<div id="idfilter'.$this->boxcode.'" class="center" >'."\n";
-            $boxcontent .= '<form class="flat " method="POST" action="'.$_SERVER["PHP_SELF"].'#ancor-idfilter'.$this->boxcode.'">'."\n";
-            $boxcontent .= '<input type="hidden" name="token" value="'.newToken().'">'."\n";
-            $selectArray = array('all' => $langs->trans("NoFilter"), 'im_task_contact' => $langs->trans("WhichIamLinkedTo"), 'im_project_contact' => $langs->trans("WhichIamLinkedToProject"));
-            $boxcontent .= $form->selectArray($cookie_name, $selectArray, $filterValue);
-            $boxcontent .= '<button type="submit" class="button buttongen">'.$langs->trans("Refresh").'</button>';
-            $boxcontent .= '</form>'."\n";
-            $boxcontent .= '</div>'."\n";
-            if (!empty($conf->use_javascript_ajax)) {
-	            $boxcontent .= '<script type="text/javascript" language="javascript">
+			$boxcontent .= '<div id="ancor-idfilter'.$this->boxcode.'" style="display: block; position: absolute; margin-top: -100px"></div>'."\n";
+			$boxcontent .= '<div id="idfilter'.$this->boxcode.'" class="center" >'."\n";
+			$boxcontent .= '<form class="flat " method="POST" action="'.$_SERVER["PHP_SELF"].'#ancor-idfilter'.$this->boxcode.'">'."\n";
+			$boxcontent .= '<input type="hidden" name="token" value="'.newToken().'">'."\n";
+			$selectArray = array('all' => $langs->trans("NoFilter"), 'im_task_contact' => $langs->trans("WhichIamLinkedTo"), 'im_project_contact' => $langs->trans("WhichIamLinkedToProject"));
+			$boxcontent .= $form->selectArray($cookie_name, $selectArray, $filterValue);
+			$boxcontent .= '<button type="submit" class="button buttongen">'.$langs->trans("Refresh").'</button>';
+			$boxcontent .= '</form>'."\n";
+			$boxcontent .= '</div>'."\n";
+			if (!empty($conf->use_javascript_ajax)) {
+				$boxcontent .= '<script type="text/javascript" language="javascript">
 						jQuery(document).ready(function() {
 							jQuery("#idsubimg'.$this->boxcode.'").click(function() {
 								jQuery(".showiffilter'.$this->boxcode.'").toggle();
 							});
 						});
 						</script>';
-	            // set cookie by js
-	            $boxcontent .= '<script>date = new Date(); date.setTime(date.getTime()+(30*86400000)); document.cookie = "'.$cookie_name.'='.$filterValue.'; expires= " + date.toGMTString() + "; path=/ "; </script>';
-            }
-            $this->info_box_contents[0][] = array(
-                'tr'=>'class="nohover showiffilter'.$this->boxcode.' hideobject"',
-                'td' => 'class="nohover"',
-                'textnoformat' => $boxcontent,
-            );
+				// set cookie by js
+				$boxcontent .= '<script>date = new Date(); date.setTime(date.getTime()+(30*86400000)); document.cookie = "'.$cookie_name.'='.$filterValue.'; expires= " + date.toGMTString() + "; path=/ "; </script>';
+			}
+			$this->info_box_contents[0][] = array(
+				'tr' => 'class="nohover showiffilter'.$this->boxcode.' hideobject"',
+				'td' => 'class="nohover"',
+				'textnoformat' => $boxcontent,
+			);
 
 
-            // Get list of project id allowed to user (in a string list separated by coma)
-            $projectsListId = '';
-            if (!$user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
+			// Get list of project id allowed to user (in a string list separated by coma)
+			$projectsListId = '';
+			if (!$user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
 
-            $sql = "SELECT pt.rowid, pt.ref, pt.fk_projet, pt.fk_task_parent, pt.datec, pt.dateo, pt.datee, pt.datev, pt.label, pt.description, pt.duration_effective, pt.planned_workload, pt.progress";
+			$sql = "SELECT pt.rowid, pt.ref, pt.fk_projet, pt.fk_task_parent, pt.datec, pt.dateo, pt.datee, pt.datev, pt.label, pt.description, pt.duration_effective, pt.planned_workload, pt.progress";
 			$sql .= ", p.rowid project_id, p.ref project_ref, p.title project_title";
 
 			$sql .= " FROM ".MAIN_DB_PREFIX."projet_task as pt";
 			$sql .= " JOIN ".MAIN_DB_PREFIX."projet as p ON (pt.fk_projet = p.rowid)";
 
-            if ($filterValue === 'im_task_contact') {
-                $sql .= " JOIN ".MAIN_DB_PREFIX."element_contact as ec ON (ec.element_id = pt.rowid AND ec.fk_socpeople = ".((int) $user->id).")";
-                $sql .= " JOIN ".MAIN_DB_PREFIX."c_type_contact  as tc ON (ec.fk_c_type_contact = tc.rowid AND tc.element = 'project_task' AND tc.source = 'internal' )";
-            } elseif ($filterValue === 'im_project_contact') {
-                $sql .= " JOIN ".MAIN_DB_PREFIX."element_contact as ec ON (ec.element_id = p.rowid AND ec.fk_socpeople = ".((int) $user->id).")";
-                $sql .= " JOIN ".MAIN_DB_PREFIX."c_type_contact  as tc ON (ec.fk_c_type_contact = tc.rowid AND tc.element = 'project' AND tc.source = 'internal' )";
-            }
+			if ($filterValue === 'im_task_contact') {
+				$sql .= " JOIN ".MAIN_DB_PREFIX."element_contact as ec ON (ec.element_id = pt.rowid AND ec.fk_socpeople = ".((int) $user->id).")";
+				$sql .= " JOIN ".MAIN_DB_PREFIX."c_type_contact  as tc ON (ec.fk_c_type_contact = tc.rowid AND tc.element = 'project_task' AND tc.source = 'internal' )";
+			} elseif ($filterValue === 'im_project_contact') {
+				$sql .= " JOIN ".MAIN_DB_PREFIX."element_contact as ec ON (ec.element_id = p.rowid AND ec.fk_socpeople = ".((int) $user->id).")";
+				$sql .= " JOIN ".MAIN_DB_PREFIX."c_type_contact  as tc ON (ec.fk_c_type_contact = tc.rowid AND tc.element = 'project' AND tc.source = 'internal' )";
+			}
 
 			$sql .= " WHERE ";
 			$sql .= " pt.entity = ".$conf->entity;
 			$sql .= " AND p.fk_statut = ".Project::STATUS_VALIDATED;
 			$sql .= " AND (pt.progress < 100 OR pt.progress IS NULL ) "; // 100% is done and not displayed
-            $sql .= " AND p.usage_task = 1 ";
-            if (!$user->rights->projet->all->lire) $sql .= " AND p.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
+			$sql .= " AND p.usage_task = 1 ";
+			if (!$user->rights->projet->all->lire) $sql .= " AND p.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
 
 			$sql .= " ORDER BY pt.datee ASC, pt.dateo ASC";
 			$sql .= $this->db->plimit($max, 0);
@@ -175,33 +175,33 @@ class box_task extends ModeleBoxes
 			$i = 1;
 			if ($result) {
 				$num = $this->db->num_rows($result);
-                while ($objp = $this->db->fetch_object($result)) {
-                    $taskstatic->id = $objp->rowid;
-                    $taskstatic->ref = $objp->ref;
-                    $taskstatic->label = $objp->label;
-                    $taskstatic->progress = $objp->progress;
-                    $taskstatic->fk_statut = $objp->fk_statut;
-                    $taskstatic->date_end = $objp->datee;
-                    $taskstatic->planned_workload = $objp->planned_workload;
-                    $taskstatic->duration_effective = $objp->duration_effective;
+				while ($objp = $this->db->fetch_object($result)) {
+					$taskstatic->id = $objp->rowid;
+					$taskstatic->ref = $objp->ref;
+					$taskstatic->label = $objp->label;
+					$taskstatic->progress = $objp->progress;
+					$taskstatic->fk_statut = $objp->fk_statut;
+					$taskstatic->date_end = $this->db->jdate($objp->datee);
+					$taskstatic->planned_workload = $objp->planned_workload;
+					$taskstatic->duration_effective = $objp->duration_effective;
 
-                    $projectstatic->id = $objp->project_id;
-                    $projectstatic->ref = $objp->project_ref;
-                    $projectstatic->title = $objp->project_title;
+					$projectstatic->id = $objp->project_id;
+					$projectstatic->ref = $objp->project_ref;
+					$projectstatic->title = $objp->project_title;
 
-                    $label = $projectstatic->getNomUrl(1).' &nbsp; '.$taskstatic->getNomUrl(1).' '.dol_htmlentities($taskstatic->label);
+					$label = $projectstatic->getNomUrl(1).' &nbsp; '.$taskstatic->getNomUrl(1).' '.dol_htmlentities($taskstatic->label);
 
-                    $boxcontent = getTaskProgressView($taskstatic, $label, true, false, false);
+					$boxcontent = getTaskProgressView($taskstatic, $label, true, false, false);
 
-                    $this->info_box_contents[$i][] = array(
-                        'td' => '',
-                        'text' => $boxcontent,
-                    );
+					$this->info_box_contents[$i][] = array(
+						'td' => '',
+						'text' => $boxcontent,
+					);
 					$i++;
 				}
 			} else {
-                dol_print_error($this->db);
-            }
+				dol_print_error($this->db);
+			}
 		}
 	}
 
diff --git a/htdocs/core/boxes/box_validated_projects.php b/htdocs/core/boxes/box_validated_projects.php
index 378aea61df5..537e88b9bdf 100644
--- a/htdocs/core/boxes/box_validated_projects.php
+++ b/htdocs/core/boxes/box_validated_projects.php
@@ -31,88 +31,95 @@ include_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
  */
 class box_validated_projects extends ModeleBoxes
 {
-    public $boxcode="validated_project";
-    public $boximg="object_projectpub";
-    public $boxlabel;
-    //var $depends = array("projet");
+	public $boxcode = "validated_project";
+	public $boximg = "object_projectpub";
+	public $boxlabel;
+	//var $depends = array("projet");
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param = '')
-    {
-        global $user, $langs;
+	public $enabled = 1;
 
-        // Load translation files required by the page
-        $langs->loadLangs(array('boxes', 'projects'));
 
-        $this->db = $db;
-        $this->boxlabel = "ValidatedProjects";
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param = '')
+	{
+		global $conf, $user, $langs;
 
-        $this->hidden = ! ($user->rights->projet->lire);
-    }
+		// Load translation files required by the page
+		$langs->loadLangs(array('boxes', 'projects'));
 
-    /**
-    *  Load data for box to show them later
-    *
-    *  @param   int		$max        Maximum number of records to load
-    *  @return  void
-    */
-    public function loadBox($max = 5)
-    {
-        global $conf, $user, $langs;
+		$this->db = $db;
+		$this->boxlabel = "ProjectsWithTask";
 
-        $this->max=$max;
+		$this->hidden = !($user->rights->projet->lire);
 
-        $totalMnt = 0;
-        $totalnb = 0;
-        $totalnbTask=0;
+		if ($conf->global->MAIN_FEATURES_LEVEL < 2) $this->enabled = 0;
+	}
 
-        $textHead = $langs->trans("ValidatedProjects");
-        $this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @param   int		$max        Maximum number of records to load
+	 *  @return  void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf, $user, $langs;
 
-        // list the summary of the orders
-        if ($user->rights->projet->lire) {
-            include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-            $projectstatic = new Project($this->db);
+		$this->max = $max;
 
-            $socid=0;
-            //if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+		$totalMnt = 0;
+		$totalnb = 0;
+		$totalnbTask = 0;
 
-            // Get list of project id allowed to user (in a string list separated by coma)
-            $projectsListId='';
-            if (! $user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
+		$textHead = $langs->trans("ProjectTasksWithoutTimeSpent");
+		$this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
 
-            $sql = "SELECT p.rowid, p.ref as Ref, p.fk_soc as Client, p.dateo as startDate,";
-            $sql.= " (SELECT COUNT(t.rowid) FROM ".MAIN_DB_PREFIX."projet_task AS t";
-            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact AS c ON t.rowid = c.element_id";
-            $sql.= " WHERE t.fk_projet = p.rowid AND c.fk_c_type_contact != 160 AND c.fk_socpeople = ".$user->id." AND t.rowid NOT IN (SELECT fk_task FROM ".MAIN_DB_PREFIX."projet_task_time WHERE fk_user =".$user->id.")) AS 'taskNumber'";
-            $sql.= " FROM ".MAIN_DB_PREFIX."projet AS p";
-            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task AS t ON p.rowid = t.fk_projet";
-            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact AS c ON t.rowid = c.element_id";
-            $sql.= " WHERE p.fk_statut = 1"; // Only open projects
-			$sql.= " AND t.rowid NOT IN (SELECT fk_task FROM ".MAIN_DB_PREFIX."projet_task_time WHERE fk_user =".$user->id.")";
-			$sql.= " AND c.fk_socpeople = ".$user->id;
-			$sql.= " GROUP BY p.ref";
-            $sql.= " ORDER BY p.dateo ASC";
+		// list the summary of the orders
+		if ($user->rights->projet->lire) {
+			include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+			$projectstatic = new Project($this->db);
 
-            $result = $this->db->query($sql);
-            if ($result) {
-                $num = $this->db->num_rows($result);
-                $i = 0;
+			$socid = 0;
+			//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+
+			// Get list of project id allowed to user (in a string list separated by coma)
+			$projectsListId = '';
+			if (!$user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
+
+			// I tried to solve sql error and performance problem, rewriting sql request but it is not clear what we want.
+			// Count of tasks without time spent for tasks we are assigned too or
+			// Count of tasks without time spent for all tasks of projects we are allowed to read (what it does) ?
+			$sql = "SELECT p.rowid, p.ref, p.fk_soc, p.dateo as startdate,";
+			$sql .= " COUNT(DISTINCT t.rowid) as tasknumber";
+			$sql .= " FROM ".MAIN_DB_PREFIX."projet AS p";
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."projet_task AS t ON p.rowid = t.fk_projet";
+			// TODO Replace -1, -2, -3 with ID used for type of contat project_task into llx_c_type_contact. Once done, we can switch widget as stable.
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_contact as ec ON ec.element_id = t.rowid AND fk_c_type_contact IN (-1, -2, -3)";
+			$sql .= " WHERE p.fk_statut = 1"; // Only open projects
+			if ($projectsListId) $sql .= ' AND p.rowid IN ('.$this->db->sanitize($projectsListId).')'; // Only project we ara allowed
+			$sql .= " AND t.rowid NOT IN (SELECT fk_task FROM ".MAIN_DB_PREFIX."projet_task_time WHERE fk_user =".$user->id.")";
+			$sql .= " GROUP BY p.rowid, p.ref, p.fk_soc, p.dateo";
+			$sql .= " ORDER BY p.dateo ASC";
+
+			$result = $this->db->query($sql);
+			if ($result) {
+				$num = $this->db->num_rows($result);
+				$i = 0;
 				$this->info_box_contents[$i][] = array(
 					'td' => 'class="nowraponall"',
 					'text' => "Reference projet",
@@ -131,65 +138,67 @@ class box_validated_projects extends ModeleBoxes
 				);
 				$i++;
 
-                while ($i < min($num+1, $max+1)) {
-                    $objp = $this->db->fetch_object($result);
+				while ($i < min($num + 1, $max + 1)) {
+					$objp = $this->db->fetch_object($result);
 
-                    $projectstatic->id = $objp->rowid;
-                    $projectstatic->ref = $objp->Ref;
-                    $projectstatic->customer = $objp->Client;
-                    $projectstatic->startDate = $objp->startDate;
-                    $projectstatic->taskNumber = $objp->taskNumber;
+					$projectstatic->id = $objp->rowid;
+					$projectstatic->ref = $objp->ref;
 
-                    $this->info_box_contents[$i][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $projectstatic->getNomUrl(1),
-                        'asis' => 1
-                    );
+					$this->info_box_contents[$i][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $projectstatic->getNomUrl(1),
+						'asis' => 1
+					);
 
-                    $sql = 'SELECT rowid, nom FROM '.MAIN_DB_PREFIX.'societe WHERE rowid ='.$objp->Client;
-					$resql = $this->db->query($sql);
-					if ($resql){
-						$socstatic = new Societe($this->db);
-						$obj = $this->db->fetch_object($resql);
+					if ($objp->fk_soc > 0) {
+						$sql = 'SELECT rowid, nom as name FROM '.MAIN_DB_PREFIX.'societe WHERE rowid ='.$objp->fk_soc;
+						$resql = $this->db->query($sql);
+						//$socstatic = new Societe($this->db);
+						$obj2 = $this->db->fetch_object($resql);
 						$this->info_box_contents[$i][] = array(
 							'td' => 'class="tdoverflowmax150 maxwidth200onsmartphone"',
-							'text' => $obj->nom,
+							'text' => $obj2->name,
 							'asis' => 1,
-							'url' => DOL_URL_ROOT.'/societe/card.php?socid='.$obj->rowid
+							'url' => DOL_URL_ROOT.'/societe/card.php?socid='.$obj2->rowid
 						);
 					}
 					else {
-						dol_print_error($this->db);
+						$this->info_box_contents[$i][] = array(
+							'td' => 'class="tdoverflowmax150 maxwidth200onsmartphone"',
+							'text' => '',
+							'asis' => 1,
+							'url' => ''
+						);
 					}
 
-                    $this->info_box_contents[$i][] = array(
-                        'td' => 'class="center"',
-                        'text' => $objp->startDate,
-                    );
+					$this->info_box_contents[$i][] = array(
+						'td' => 'class="center"',
+						'text' => $objp->startDate,
+					);
 
-                    $this->info_box_contents[$i][] = array(
-                        'td' => 'class="center"',
-                        'text' => $objp->taskNumber."&nbsp;".$langs->trans("Tasks"),
+					$this->info_box_contents[$i][] = array(
+						'td' => 'class="center"',
+						'text' => $objp->tasknumber."&nbsp;".$langs->trans("Tasks"),
 						'asis' => 1,
-                    );
-                    $i++;
-                }
-            }else {
-            	dol_print_error($this->db);
+					);
+					$i++;
+				}
+			} else {
+				dol_print_error($this->db);
 			}
-        }
-    }
+		}
+	}
 
-    /**
-     *	Method to show box
-     *
-     *	@param	array	$head       Array with properties of box title
-     *	@param  array	$contents   Array with properties of box lines
-     *  @param	int		$nooutput	No print, only return string
-     *	@return	string
-     */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	/**
+	 *	Method to show box
+	 *
+	 *	@param	array	$head       Array with properties of box title
+	 *	@param  array	$contents   Array with properties of box lines
+	 *  @param	int		$nooutput	No print, only return string
+	 *	@return	string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 80589e4c4f3..1e32a28f25c 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -113,7 +113,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 	 * Constructor
 	 *
 	 * @param   DoliDB  $db     Database handler
-     * @param   string  $param  More parameters
+	 * @param   string  $param  More parameters
 	 */
 	public function __construct($db, $param = '')
 	{
@@ -156,7 +156,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 			if ($obj)
 			{
 				$this->id = $obj->id;
-				$this->rowid = $obj->id;	// For backward compatibility
+				$this->rowid = $obj->id; // For backward compatibility
 				$this->box_id = $obj->box_id;
 				$this->position = $obj->position;
 				$this->box_order = $obj->box_order;
@@ -170,29 +170,6 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 		}
 	}
 
-
-	/**
-	 * Standard method to get content of a box
-	 *
-	 * @param   array   $head       Array with properties of box title
-	 * @param   array   $contents   Array with properties of box lines
-	 *
-	 * @return  string
-	 */
-	public function outputBox($head = null, $contents = null)
-	{
-		global $langs, $user, $conf;
-
-		// Trick to get result into a var from a function that makes print instead of return
-		// TODO Replace ob_start with param nooutput=1 into showBox
-		ob_start();
-		$result = $this->showBox($head, $contents);
-		$output = ob_get_contents();
-		ob_end_clean();
-
-		return $output;
-	}
-
 	/**
 	 * Standard method to show a box (usage by boxes not mandatory, a box can still use its own showBox function)
 	 *
@@ -207,180 +184,180 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 
 		if (!empty($this->hidden)) return '\n<!-- Box ".get_class($this)." hidden -->\n'; // Nothing done if hidden (for example when user has no permission)
 
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$MAXLENGTHBOX = 60; // Mettre 0 pour pas de limite
 
-        $cachetime = 900; // 900 : 15mn
-        $cachedir = DOL_DATA_ROOT.'/boxes/temp';
-        $fileid = get_class($this).'id-'.$this->box_id.'-e'.$conf->entity.'-u'.$user->id.'-s'.$user->socid.'.cache';
-        $filename = '/box-'.$fileid;
-        $refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
-        $out = '';
+		$cachetime = 900; // 900 : 15mn
+		$cachedir = DOL_DATA_ROOT.'/boxes/temp';
+		$fileid = get_class($this).'id-'.$this->box_id.'-e'.$conf->entity.'-u'.$user->id.'-s'.$user->socid.'.cache';
+		$filename = '/box-'.$fileid;
+		$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
+		$out = '';
 
-        if ($refresh) {
-            dol_syslog(get_class($this).'::showBox');
+		if ($refresh) {
+			dol_syslog(get_class($this).'::showBox');
 
-            // Define nbcol and nblines of the box to show
-            $nbcol = 0;
-            if (isset($contents[0])) $nbcol = count($contents[0]);
-            $nblines = count($contents);
+			// Define nbcol and nblines of the box to show
+			$nbcol = 0;
+			if (isset($contents[0])) $nbcol = count($contents[0]);
+			$nblines = count($contents);
 
-            $out .= "\n<!-- Box ".get_class($this)." start -->\n";
+			$out .= "\n<!-- Box ".get_class($this)." start -->\n";
 
-            $out .= '<div class="box boxdraggable" id="boxto_'.$this->box_id.'">'."\n";
+			$out .= '<div class="box boxdraggable" id="boxto_'.$this->box_id.'">'."\n";
 
-            if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto']) || $nblines)
-            {
-                $out .= '<table summary="boxtable'.$this->box_id.'" width="100%" class="noborder boxtable">'."\n";
-            }
+			if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto']) || $nblines)
+			{
+				$out .= '<table summary="boxtable'.$this->box_id.'" width="100%" class="noborder boxtable">'."\n";
+			}
 
-            // Show box title
-            if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto']))
-            {
-                $out .= '<tr class="liste_titre box_titre">';
-                $out .= '<td';
-                if ($nbcol > 0) { $out .= ' colspan="'.$nbcol.'"'; }
-                $out .= '>';
-                if (!empty($conf->use_javascript_ajax))
-                {
-                    //$out.= '<table summary="" class="nobordernopadding" width="100%"><tr><td class="tdoverflowmax150 maxwidth150onsmartphone">';
-                	$out .= '<div class="tdoverflowmax250 maxwidth150onsmartphone float">';
-                }
-                if (!empty($head['text']))
-                {
-                    $s = dol_trunc($head['text'], isset($head['limit']) ? $head['limit'] : $MAXLENGTHBOX);
-                    $out .= $s;
-                }
-                if (!empty($conf->use_javascript_ajax))
-                {
-                	$out .= '</div>';
-                }
-                //$out.= '</td>';
+			// Show box title
+			if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto']))
+			{
+				$out .= '<tr class="liste_titre box_titre">';
+				$out .= '<td';
+				if ($nbcol > 0) { $out .= ' colspan="'.$nbcol.'"'; }
+				$out .= '>';
+				if (!empty($conf->use_javascript_ajax))
+				{
+					//$out.= '<table summary="" class="nobordernopadding" width="100%"><tr><td class="tdoverflowmax150 maxwidth150onsmartphone">';
+					$out .= '<div class="tdoverflowmax250 maxwidth150onsmartphone float">';
+				}
+				if (!empty($head['text']))
+				{
+					$s = dol_trunc($head['text'], isset($head['limit']) ? $head['limit'] : $MAXLENGTHBOX);
+					$out .= $s;
+				}
+				if (!empty($conf->use_javascript_ajax))
+				{
+					$out .= '</div>';
+				}
+				//$out.= '</td>';
 
-                if (!empty($conf->use_javascript_ajax))
-                {
-                    $sublink = '';
-                    if (!empty($head['sublink']))  $sublink .= '<a href="'.$head['sublink'].'"'.(empty($head['target']) ? '' : ' target="'.$head['target'].'"').'>';
-                    if (!empty($head['subpicto'])) $sublink .= img_picto($head['subtext'], $head['subpicto'], 'class="opacitymedium marginleftonly '.(empty($head['subclass']) ? '' : $head['subclass']).'" id="idsubimg'.$this->boxcode.'"');
-                    if (!empty($head['sublink']))  $sublink .= '</a>';
+				if (!empty($conf->use_javascript_ajax))
+				{
+					$sublink = '';
+					if (!empty($head['sublink']))  $sublink .= '<a href="'.$head['sublink'].'"'.(empty($head['target']) ? '' : ' target="'.$head['target'].'"').'>';
+					if (!empty($head['subpicto'])) $sublink .= img_picto($head['subtext'], $head['subpicto'], 'class="opacitymedium marginleftonly '.(empty($head['subclass']) ? '' : $head['subclass']).'" id="idsubimg'.$this->boxcode.'"');
+					if (!empty($head['sublink']))  $sublink .= '</a>';
 
-                    //$out.= '<td class="nocellnopadd boxclose right nowraponall">';
-                    $out .= '<div class="nocellnopadd boxclose floatright nowraponall">';
-                    $out .= $sublink;
-                    // The image must have the class 'boxhandle' beause it's value used in DOM draggable objects to define the area used to catch the full object
-                    $out .= img_picto($langs->trans("MoveBox", $this->box_id), 'grip_title', 'class="opacitymedium boxhandle hideonsmartphone cursormove marginleftonly"');
-                    $out .= img_picto($langs->trans("CloseBox", $this->box_id), 'close_title', 'class="opacitymedium boxclose cursorpointer marginleftonly" rel="x:y" id="imgclose'.$this->box_id.'"');
-                    $label = $head['text'];
-                    //if (! empty($head['graph'])) $label.=' ('.$langs->trans("Graph").')';
-                    if (!empty($head['graph'])) $label .= ' <span class="opacitymedium fa fa-bar-chart"></span>';
-                    $out .= '<input type="hidden" id="boxlabelentry'.$this->box_id.'" value="'.dol_escape_htmltag($label).'">';
-                    //$out.= '</td></tr></table>';
-                    $out .= '</div>';
-                }
+					//$out.= '<td class="nocellnopadd boxclose right nowraponall">';
+					$out .= '<div class="nocellnopadd boxclose floatright nowraponall">';
+					$out .= $sublink;
+					// The image must have the class 'boxhandle' beause it's value used in DOM draggable objects to define the area used to catch the full object
+					$out .= img_picto($langs->trans("MoveBox", $this->box_id), 'grip_title', 'class="opacitymedium boxhandle hideonsmartphone cursormove marginleftonly"');
+					$out .= img_picto($langs->trans("CloseBox", $this->box_id), 'close_title', 'class="opacitymedium boxclose cursorpointer marginleftonly" rel="x:y" id="imgclose'.$this->box_id.'"');
+					$label = $head['text'];
+					//if (! empty($head['graph'])) $label.=' ('.$langs->trans("Graph").')';
+					if (!empty($head['graph'])) $label .= ' <span class="opacitymedium fa fa-bar-chart"></span>';
+					$out .= '<input type="hidden" id="boxlabelentry'.$this->box_id.'" value="'.dol_escape_htmltag($label).'">';
+					//$out.= '</td></tr></table>';
+					$out .= '</div>';
+				}
 
-                $out .= "</td>";
-                $out .= "</tr>\n";
-            }
+				$out .= "</td>";
+				$out .= "</tr>\n";
+			}
 
-            // Show box lines
-            if ($nblines)
-            {
-                // Loop on each record
-                for ($i = 0, $n = $nblines; $i < $n; $i++)
-                {
-                    if (isset($contents[$i]))
-                    {
-                        // TR
-                        if (isset($contents[$i][0]['tr'])) $out .= '<tr '.$contents[$i][0]['tr'].'>';
-                        else $out .= '<tr class="oddeven">';
+			// Show box lines
+			if ($nblines)
+			{
+				// Loop on each record
+				for ($i = 0, $n = $nblines; $i < $n; $i++)
+				{
+					if (isset($contents[$i]))
+					{
+						// TR
+						if (isset($contents[$i][0]['tr'])) $out .= '<tr '.$contents[$i][0]['tr'].'>';
+						else $out .= '<tr class="oddeven">';
 
-                        // Loop on each TD
-                        $nbcolthisline = count($contents[$i]);
-                        for ($j = 0; $j < $nbcolthisline; $j++) {
-                            // Define tdparam
-                            $tdparam = '';
-                            if (isset($contents[$i][$j]['td'])) $tdparam .= ' '.$contents[$i][$j]['td'];
+						// Loop on each TD
+						$nbcolthisline = count($contents[$i]);
+						for ($j = 0; $j < $nbcolthisline; $j++) {
+							// Define tdparam
+							$tdparam = '';
+							if (!empty($contents[$i][$j]['td'])) $tdparam .= ' '.$contents[$i][$j]['td'];
 
-                            $text = isset($contents[$i][$j]['text']) ? $contents[$i][$j]['text'] : '';
-                            $textwithnotags = preg_replace('/<([^>]+)>/i', '', $text);
-                            $text2 = isset($contents[$i][$j]['text2']) ? $contents[$i][$j]['text2'] : '';
-                            $text2withnotags = preg_replace('/<([^>]+)>/i', '', $text2);
+							$text = isset($contents[$i][$j]['text']) ? $contents[$i][$j]['text'] : '';
+							$textwithnotags = preg_replace('/<([^>]+)>/i', '', $text);
+							$text2 = isset($contents[$i][$j]['text2']) ? $contents[$i][$j]['text2'] : '';
+							$text2withnotags = preg_replace('/<([^>]+)>/i', '', $text2);
 
-                            $textnoformat = isset($contents[$i][$j]['textnoformat']) ? $contents[$i][$j]['textnoformat'] : '';
-                            //$out.= "xxx $textwithnotags y";
-                            if (empty($contents[$i][$j]['tooltip'])) $contents[$i][$j]['tooltip'] = "";
-                            $tooltip = isset($contents[$i][$j]['tooltip']) ? $contents[$i][$j]['tooltip'] : '';
+							$textnoformat = isset($contents[$i][$j]['textnoformat']) ? $contents[$i][$j]['textnoformat'] : '';
+							//$out.= "xxx $textwithnotags y";
+							if (empty($contents[$i][$j]['tooltip'])) $contents[$i][$j]['tooltip'] = "";
+							$tooltip = isset($contents[$i][$j]['tooltip']) ? $contents[$i][$j]['tooltip'] : '';
 
-                            $out .= '<td'.$tdparam.'>'."\n";
+							$out .= '<td'.$tdparam.'>'."\n";
 
-                            // Url
-                            if (!empty($contents[$i][$j]['url']) && empty($contents[$i][$j]['logo']))
-                            {
-                                $out .= '<a href="'.$contents[$i][$j]['url'].'"';
-                                if (!empty($tooltip)) {
-                                    $out .= ' title="'.dol_escape_htmltag($langs->trans("Show").' '.$tooltip, 1).'" class="classfortooltip"';
-                                }
-                                //$out.= ' alt="'.$textwithnotags.'"';      // Pas de alt sur un "<a href>"
-                                $out .= isset($contents[$i][$j]['target']) ? ' target="'.$contents[$i][$j]['target'].'"' : '';
-                                $out .= '>';
-                            }
+							// Url
+							if (!empty($contents[$i][$j]['url']) && empty($contents[$i][$j]['logo']))
+							{
+								$out .= '<a href="'.$contents[$i][$j]['url'].'"';
+								if (!empty($tooltip)) {
+									$out .= ' title="'.dol_escape_htmltag($langs->trans("Show").' '.$tooltip, 1).'" class="classfortooltip"';
+								}
+								//$out.= ' alt="'.$textwithnotags.'"';      // Pas de alt sur un "<a href>"
+								$out .= isset($contents[$i][$j]['target']) ? ' target="'.$contents[$i][$j]['target'].'"' : '';
+								$out .= '>';
+							}
 
-                            // Logo
-                            if (!empty($contents[$i][$j]['logo']))
-                            {
-                                $logo = preg_replace("/^object_/i", "", $contents[$i][$j]['logo']);
-                                $out .= '<a href="'.$contents[$i][$j]['url'].'">';
-                                $out .= img_object($langs->trans("Show").' '.$tooltip, $logo, 'class="classfortooltip"');
-                            }
+							// Logo
+							if (!empty($contents[$i][$j]['logo']))
+							{
+								$logo = preg_replace("/^object_/i", "", $contents[$i][$j]['logo']);
+								$out .= '<a href="'.$contents[$i][$j]['url'].'">';
+								$out .= img_object($langs->trans("Show").' '.$tooltip, $logo, 'class="classfortooltip"');
+							}
 
-                            $maxlength = $MAXLENGTHBOX;
-                            if (!empty($contents[$i][$j]['maxlength'])) $maxlength = $contents[$i][$j]['maxlength'];
+							$maxlength = $MAXLENGTHBOX;
+							if (!empty($contents[$i][$j]['maxlength'])) $maxlength = $contents[$i][$j]['maxlength'];
 
-                            if ($maxlength) $textwithnotags = dol_trunc($textwithnotags, $maxlength);
-                            if (preg_match('/^<(img|div|span)/i', $text) || !empty($contents[$i][$j]['asis'])) $out .= $text; // show text with no html cleaning
-                            else $out .= $textwithnotags; // show text with html cleaning
+							if ($maxlength) $textwithnotags = dol_trunc($textwithnotags, $maxlength);
+							if (preg_match('/^<(img|div|span)/i', $text) || !empty($contents[$i][$j]['asis'])) $out .= $text; // show text with no html cleaning
+							else $out .= $textwithnotags; // show text with html cleaning
 
-                            // End Url
-                            if (!empty($contents[$i][$j]['url'])) $out .= '</a>';
+							// End Url
+							if (!empty($contents[$i][$j]['url'])) $out .= '</a>';
 
-                            if (preg_match('/^<(img|div|span)/i', $text2) || !empty($contents[$i][$j]['asis2'])) $out .= $text2; // show text with no html cleaning
-                            else $out .= $text2withnotags; // show text with html cleaning
+							if (preg_match('/^<(img|div|span)/i', $text2) || !empty($contents[$i][$j]['asis2'])) $out .= $text2; // show text with no html cleaning
+							else $out .= $text2withnotags; // show text with html cleaning
 
-                            if (!empty($textnoformat)) $out .= "\n".$textnoformat."\n";
+							if (!empty($textnoformat)) $out .= "\n".$textnoformat."\n";
 
-                            $out .= "</td>\n";
-                        }
+							$out .= "</td>\n";
+						}
 
-                        $out .= "</tr>\n";
-                    }
-                }
-            }
+						$out .= "</tr>\n";
+					}
+				}
+			}
 
-            if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto']) || $nblines)
-            {
-                $out .= "</table>\n";
-            }
+			if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto']) || $nblines)
+			{
+				$out .= "</table>\n";
+			}
 
-            // If invisible box with no contents
-            if (empty($head['text']) && empty($head['sublink']) && empty($head['subpicto']) && !$nblines) $out .= "<br>\n";
+			// If invisible box with no contents
+			if (empty($head['text']) && empty($head['sublink']) && empty($head['subpicto']) && !$nblines) $out .= "<br>\n";
 
-            $out .= "</div>\n";
+			$out .= "</div>\n";
 
-            $out .= "<!-- Box ".get_class($this)." end -->\n\n";
-            if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
-                dol_filecache($cachedir, $filename, $out);
-            }
-        } else {
-            dol_syslog(get_class($this).'::showBoxCached');
-            $out = "<!-- Box ".get_class($this)." from cache -->";
-            $out .= dol_readcachefile($cachedir, $filename);
-        }
+			$out .= "<!-- Box ".get_class($this)." end -->\n\n";
+			if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+				dol_filecache($cachedir, $filename, $out);
+			}
+		} else {
+			dol_syslog(get_class($this).'::showBoxCached');
+			$out = "<!-- Box ".get_class($this)." from cache -->";
+			$out .= dol_readcachefile($cachedir, $filename);
+		}
 
-        if ($nooutput) return $out;
-        else print $out;
+		if ($nooutput) return $out;
+		else print $out;
 
-        return '';
+		return '';
 	}
 
 
@@ -481,6 +458,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 			{
 				// Define disabledbyname and disabledbymodule
 				$disabledbyname = 0;
+				$disabledbymodule = 0; // TODO Set to 2 if module is not enabled
 				$module = '';
 
 				// Check if widget file is disabled by name
@@ -499,7 +477,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 				$text = '<b>'.$langs->trans("Description").':</b><br>';
 				$text .= $objMod->boxlabel.'<br>';
 				$text .= '<br><b>'.$langs->trans("Status").':</b><br>';
-				if ($disabledbymodule == 2) $text .= $langs->trans("HooksDisabledAsModuleDisabled", $module).'<br>';
+				if ($disabledbymodule == 2) $text .= $langs->trans("WidgetDisabledAsModuleDisabled", $module).'<br>';
 
 				$widget[$j]['info'] = $text;
 			}
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index bb8086f9b90..c942127aab3 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -58,6 +58,8 @@ class CMailFile
 	public $alternative_boundary;
 	public $deliveryreceipt;
 
+	public $atleastonefile;
+
 	public $eol;
 	public $eol2;
 
@@ -144,8 +146,10 @@ class CMailFile
 			}
 		}
 
-		// Add autocopy to (Note: Adding bcc for specific modules are also done from pages)
-		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) $addr_bcc .= ($addr_bcc ? ', ' : '').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
+		// Add autocopy to if not already in $to (Note: Adding bcc for specific modules are also done from pages)
+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO) && !preg_match('/'.preg_quote($conf->global->MAIN_MAIL_AUTOCOPY_TO, '/').'/i', $to)) {
+		    $addr_bcc .= ($addr_bcc ? ', ' : '').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
+		}
 
 		$this->subject = $subject;
 		$this->addr_to = $to;
@@ -171,7 +175,7 @@ class CMailFile
 		if (!empty($this->sendcontext)) {
 			$smtpContextKey = strtoupper($this->sendcontext);
 			$keyForSMTPSendMode = 'MAIN_MAIL_SENDMODE_'.$smtpContextKey;
-			$smtpContextSendMode = $conf->global->{$keyForSMTPSendMode};
+			$smtpContextSendMode = empty($conf->global->{$keyForSMTPSendMode}) ? '' : $conf->global->{$keyForSMTPSendMode};
 			if (!empty($smtpContextSendMode) && $smtpContextSendMode != 'default') {
 				$this->sendmode = $smtpContextSendMode;
 			}
@@ -240,6 +244,7 @@ class CMailFile
 		{
 			$this->html = $msg;
 
+			$findimg = 0;
 			if (!empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS))
 			{
 				$findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias');
@@ -272,6 +277,11 @@ class CMailFile
 			}
 		}
 
+		// Add autocopy to if not already in $to (Note: Adding bcc for specific modules are also done from pages)
+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO) && !preg_match('/'.preg_quote($conf->global->MAIN_MAIL_AUTOCOPY_TO, '/').'/i', $to)) {
+		    $addr_bcc .= ($addr_bcc ? ', ' : '').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
+		}
+
 		$this->addr_to = $to;
 		$this->addr_cc = $addr_cc;
 		$this->addr_bcc = $addr_bcc;
@@ -289,18 +299,13 @@ class CMailFile
 			$this->addr_bcc = '';
 		}
 
-		// Add autocopy to (Note: Adding bcc for specific modules are also done from pages)
-		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) {
-			$addr_bcc .= ($addr_bcc ? ', ' : '').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
-		}
-
-		$keyforsslseflsigned  ='MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED';
+		$keyforsslseflsigned = 'MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED';
 		if (!empty($this->sendcontext)) {
 			$smtpContextKey = strtoupper($this->sendcontext);
-			$keyForSMTPSendMode = 'MAIN_MAIL_SENDMODE_' . $smtpContextKey;
-			$smtpContextSendMode = $conf->global->{$keyForSMTPSendMode};
+			$keyForSMTPSendMode = 'MAIN_MAIL_SENDMODE_'.$smtpContextKey;
+			$smtpContextSendMode = empty($conf->global->{$keyForSMTPSendMode}) ? '' : $conf->global->{$keyForSMTPSendMode};
 			if (!empty($smtpContextSendMode) && $smtpContextSendMode != 'default') {
-				$keyforsslseflsigned  ='MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_' . $smtpContextKey;
+				$keyforsslseflsigned = 'MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_'.$smtpContextKey;
 			}
 		}
 
@@ -338,8 +343,7 @@ class CMailFile
 			$text_body = $this->write_body($msg);
 
 			// Add attachments to text_encoded
-			if ($this->atleastonefile)
-			{
+			if (!empty($this->atleastonefile)) {
 				$files_encoded = $this->write_files($filename_list, $mimetype_list, $mimefilename_list);
 			}
 
@@ -401,7 +405,7 @@ class CMailFile
 				}
 			}
 
-			if ($this->atleastonefile)
+			if (!empty($this->atleastonefile))
 			{
 				foreach ($filename_list as $i => $val)
 				{
@@ -530,7 +534,7 @@ class CMailFile
 				$this->message->addPart(dol_nl2br($msg), 'text/html');
 			}
 
-			if ($this->atleastonefile)
+			if (!empty($this->atleastonefile))
 			{
 				foreach ($filename_list as $i => $val)
 				{
@@ -653,19 +657,19 @@ class CMailFile
 			$keyforsmtppw    = 'MAIN_MAIL_SMTPS_PW';
 			$keyfortls       = 'MAIN_MAIL_EMAIL_TLS';
 			$keyforstarttls  = 'MAIN_MAIL_EMAIL_STARTTLS';
-			$keyforsslseflsigned  ='MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED';
+			$keyforsslseflsigned = 'MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED';
 			if (!empty($this->sendcontext)) {
 				$smtpContextKey = strtoupper($this->sendcontext);
 				$keyForSMTPSendMode = 'MAIN_MAIL_SENDMODE_'.$smtpContextKey;
-				$smtpContextSendMode = $conf->global->{$keyForSMTPSendMode};
+				$smtpContextSendMode = empty($conf->global->{$keyForSMTPSendMode}) ? '' : $conf->global->{$keyForSMTPSendMode};
 				if (!empty($smtpContextSendMode) && $smtpContextSendMode != 'default') {
-					$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER_' . $smtpContextKey;
-					$keyforsmtpport   = 'MAIN_MAIL_SMTP_PORT_' . $smtpContextKey;
-					$keyforsmtpid     = 'MAIN_MAIL_SMTPS_ID_' . $smtpContextKey;
-					$keyforsmtppw     = 'MAIN_MAIL_SMTPS_PW_' . $smtpContextKey;
-					$keyfortls        = 'MAIN_MAIL_EMAIL_TLS_' . $smtpContextKey;
-					$keyforstarttls   = 'MAIN_MAIL_EMAIL_STARTTLS_' . $smtpContextKey;
-					$keyforsslseflsigned  ='MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_' . $smtpContextKey;
+					$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER_'.$smtpContextKey;
+					$keyforsmtpport   = 'MAIN_MAIL_SMTP_PORT_'.$smtpContextKey;
+					$keyforsmtpid     = 'MAIN_MAIL_SMTPS_ID_'.$smtpContextKey;
+					$keyforsmtppw     = 'MAIN_MAIL_SMTPS_PW_'.$smtpContextKey;
+					$keyfortls        = 'MAIN_MAIL_EMAIL_TLS_'.$smtpContextKey;
+					$keyforstarttls   = 'MAIN_MAIL_EMAIL_STARTTLS_'.$smtpContextKey;
+					$keyforsslseflsigned = 'MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_'.$smtpContextKey;
 				}
 			}
 
@@ -723,7 +727,11 @@ class CMailFile
 
 					if (!empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM)) $additionnalparam .= ($additionnalparam ? ' ' : '').'-U '.$additionnalparam; // Use -U to add additionnal params
 
-					dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port').", additionnal_parameters=".$additionnalparam, LOG_DEBUG);
+					$linuxlike = 1;
+					if (preg_match('/^win/i', PHP_OS)) $linuxlike = 0;
+					if (preg_match('/^mac/i', PHP_OS)) $linuxlike = 0;
+
+					dol_syslog("CMailFile::sendfile: mail start".($linuxlike ? '' : " HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')).", additionnal_parameters=".$additionnalparam, LOG_DEBUG);
 
 					$this->message = stripslashes($this->message);
 
@@ -742,11 +750,7 @@ class CMailFile
 					{
 						$langs->load("errors");
 						$this->error = "Failed to send mail with php mail";
-						$linuxlike = 1;
-						if (preg_match('/^win/i', PHP_OS)) $linuxlike = 0;
-						if (preg_match('/^mac/i', PHP_OS)) $linuxlike = 0;
-						if (!$linuxlike)
-						{
+						if (!$linuxlike) {
 							$this->error .= " to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'); // This values are value used only for non linuxlike systems
 						}
 						$this->error .= ".<br>";
@@ -862,7 +866,7 @@ class CMailFile
 
 				if (!empty($conf->global->$keyforsmtpid)) $this->transport->setUsername($conf->global->$keyforsmtpid);
 				if (!empty($conf->global->$keyforsmtppw)) $this->transport->setPassword($conf->global->$keyforsmtppw);
-				if (! empty($conf->global->$keyforsslseflsigned)) $this->transport->setStreamOptions(array('ssl' => array('allow_self_signed' => true, 'verify_peer' => false)));;
+				if (!empty($conf->global->$keyforsslseflsigned)) $this->transport->setStreamOptions(array('ssl' => array('allow_self_signed' => true, 'verify_peer' => false)));
 				//$smtps->_msgReplyTo  = 'reply@web.com';
 
 				// Switch content encoding to base64 - avoid the doubledot issue with quoted-printable
diff --git a/htdocs/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php
index 4f1959d2707..62257e79447 100644
--- a/htdocs/core/class/CSMSFile.class.php
+++ b/htdocs/core/class/CSMSFile.class.php
@@ -34,7 +34,7 @@
  */
 class CSMSFile
 {
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
@@ -76,21 +76,21 @@ class CSMSFile
 		// If ending method not defined
 		if (empty($conf->global->MAIN_SMS_SENDMODE))
 		{
-		    $this->error = 'No SMS Engine defined';
-		    return -1;
+			$this->error = 'No SMS Engine defined';
+			return -1;
 		}
 
 		dol_syslog("CSMSFile::CSMSFile: MAIN_SMS_SENDMODE=".$conf->global->MAIN_SMS_SENDMODE." charset=".$conf->file->character_set_client." from=".$from.", to=".$to.", msg length=".count($msg), LOG_DEBUG);
 		dol_syslog("CSMSFile::CSMSFile: deferred=".$deferred." priority=".$priority." class=".$class, LOG_DEBUG);
 
 		// Action according to choosed sending method
-	    $this->addr_from = $from;
-	    $this->addr_to = $to;
-        $this->deferred = $deferred;
-        $this->priority = $priority;
-        $this->class = $class;
-        $this->message = $msg;
-        $this->nostop = false;
+		$this->addr_from = $from;
+		$this->addr_to = $to;
+		$this->deferred = $deferred;
+		$this->priority = $priority;
+		$this->class = $class;
+		$this->message = $msg;
+		$this->nostop = false;
 	}
 
 
@@ -108,17 +108,17 @@ class CSMSFile
 
 		$res = false;
 
-        dol_syslog("CSMSFile::sendfile addr_to=".$this->addr_to, LOG_DEBUG);
-        dol_syslog("CSMSFile::sendfile message=\n".$this->message);
+		dol_syslog("CSMSFile::sendfile addr_to=".$this->addr_to, LOG_DEBUG);
+		dol_syslog("CSMSFile::sendfile message=\n".$this->message);
 
-        $this->message = stripslashes($this->message);
+		$this->message = stripslashes($this->message);
 
-        if (!empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms();
+		if (!empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms();
 
 		if (empty($conf->global->MAIN_DISABLE_ALL_SMS))
 		{
-		    // Action according to choosed sending method
-		    if ($conf->global->MAIN_SMS_SENDMODE == 'ovh')    // Backward compatibility    @deprecated
+			// Action according to choosed sending method
+			if ($conf->global->MAIN_SMS_SENDMODE == 'ovh')    // Backward compatibility    @deprecated
 			{
 				dol_include_once('/ovh/class/ovhsms.class.php');
 				$sms = new OvhSms($this->db);
@@ -127,14 +127,14 @@ class CSMSFile
 				$sms->message = $this->message;
 				$sms->deferred = $this->deferred;
 				$sms->priority = $this->priority;
-                $sms->class = $this->class;
-                $sms->nostop = $this->nostop;
+				$sms->class = $this->class;
+				$sms->nostop = $this->nostop;
 
-                $sms->socid = $this->socid;
-                $sms->contact_id = $this->contact_id;
-                $sms->project = $this->fk_project;
+				$sms->socid = $this->socid;
+				$sms->contact_id = $this->contact_id;
+				$sms->project = $this->fk_project;
 
-                $res = $sms->SmsSend();
+				$res = $sms->SmsSend();
 
 				if ($res <= 0)
 				{
@@ -146,42 +146,42 @@ class CSMSFile
 					if (!empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);
 				}
 			} elseif (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
-		    {
-		        $tmp = explode('@', $conf->global->MAIN_SMS_SENDMODE);
-		        $classfile = $tmp[0]; $module = (empty($tmp[1]) ? $tmp[0] : $tmp[1]);
-		        dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
-		        try {
-		            $classname = ucfirst($classfile);
-		            $sms = new $classname($this->db);
-		            $sms->expe = $this->addr_from;
-		            $sms->dest = $this->addr_to;
-		            $sms->deferred = $this->deferred;
-		            $sms->priority = $this->priority;
-		            $sms->class = $this->class;
-		            $sms->message = $this->message;
-		            $sms->nostop = $this->nostop;
+			{
+				$tmp = explode('@', $conf->global->MAIN_SMS_SENDMODE);
+				$classfile = $tmp[0]; $module = (empty($tmp[1]) ? $tmp[0] : $tmp[1]);
+				dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
+				try {
+					$classname = ucfirst($classfile);
+					$sms = new $classname($this->db);
+					$sms->expe = $this->addr_from;
+					$sms->dest = $this->addr_to;
+					$sms->deferred = $this->deferred;
+					$sms->priority = $this->priority;
+					$sms->class = $this->class;
+					$sms->message = $this->message;
+					$sms->nostop = $this->nostop;
 
-		            $sms->socid = $this->socid;
-		            $sms->contact_id = $this->contact_id;
-		            $sms->fk_project = $this->fk_project;
+					$sms->socid = $this->socid;
+					$sms->contact_id = $this->contact_id;
+					$sms->fk_project = $this->fk_project;
 
-                    $res = $sms->SmsSend();
+					$res = $sms->SmsSend();
 
-                    $this->error = $sms->error;
-                    $this->errors = $sms->errors;
-    				if ($res <= 0)
-    				{
-    					dol_syslog("CSMSFile::sendfile: sms send error=".$this->error, LOG_ERR);
-    				} else {
-    					dol_syslog("CSMSFile::sendfile: sms send success with id=".$res, LOG_DEBUG);
-    					//var_dump($res);        // 1973128
-    					if (!empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);
-    				}
-		        } catch (Exception $e)
-		        {
-		            dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
-		        }
-		    } else {
+					$this->error = $sms->error;
+					$this->errors = $sms->errors;
+					if ($res <= 0)
+					{
+						dol_syslog("CSMSFile::sendfile: sms send error=".$this->error, LOG_ERR);
+					} else {
+						dol_syslog("CSMSFile::sendfile: sms send success with id=".$res, LOG_DEBUG);
+						//var_dump($res);        // 1973128
+						if (!empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);
+					}
+				} catch (Exception $e)
+				{
+					dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
+				}
+			} else {
 				// Send sms method not correctly defined
 				// --------------------------------------
 
@@ -198,17 +198,17 @@ class CSMSFile
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Write content of a SendSms request into a dump file (mode = all)
-     *  Used for debugging.
-     *
-     *  @return	void
-     */
-    public function dump_sms()
-    {
-        // phpcs:enable
-        global $conf, $dolibarr_main_data_root;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Write content of a SendSms request into a dump file (mode = all)
+	 *  Used for debugging.
+	 *
+	 *  @return	void
+	 */
+	public function dump_sms()
+	{
+		// phpcs:enable
+		global $conf, $dolibarr_main_data_root;
 
 		if (@is_writeable($dolibarr_main_data_root))	// Avoid fatal error on fopen with open_basedir
 		{
@@ -229,29 +229,29 @@ class CSMSFile
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Write content of a SendSms result into a dump file (mode = all)
-     *  Used for debugging.
-     *
-     *  @param	int		$result		Result of sms sending
-     *  @return	void
-     */
-    public function dump_sms_result($result)
-    {
-        // phpcs:enable
-        global $conf, $dolibarr_main_data_root;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Write content of a SendSms result into a dump file (mode = all)
+	 *  Used for debugging.
+	 *
+	 *  @param	int		$result		Result of sms sending
+	 *  @return	void
+	 */
+	public function dump_sms_result($result)
+	{
+		// phpcs:enable
+		global $conf, $dolibarr_main_data_root;
 
-        if (@is_writeable($dolibarr_main_data_root))    // Avoid fatal error on fopen with open_basedir
-        {
-        	$outputfile = $dolibarr_main_data_root."/dolibarr_sms.log";
-            $fp = fopen($outputfile, "a+");
+		if (@is_writeable($dolibarr_main_data_root))    // Avoid fatal error on fopen with open_basedir
+		{
+			$outputfile = $dolibarr_main_data_root."/dolibarr_sms.log";
+			$fp = fopen($outputfile, "a+");
 
-            fputs($fp, "\nResult id=".$result);
+			fputs($fp, "\nResult id=".$result);
 
-            fclose($fp);
-            if (!empty($conf->global->MAIN_UMASK))
-            @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
-        }
-    }
+			fclose($fp);
+			if (!empty($conf->global->MAIN_UMASK))
+			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+		}
+	}
 }
diff --git a/htdocs/core/class/antivir.class.php b/htdocs/core/class/antivir.class.php
index f897ae46a62..e6bd24ad016 100644
--- a/htdocs/core/class/antivir.class.php
+++ b/htdocs/core/class/antivir.class.php
@@ -45,9 +45,9 @@ class AntiVir
 	public $output;
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 *  Constructor
@@ -59,7 +59,7 @@ class AntiVir
 		$this->db = $db;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Scan a file with antivirus.
 	 *  This function runs the command defined in setup. This antivirus command must return 0 if OK.
@@ -70,24 +70,24 @@ class AntiVir
 	 */
 	public function dol_avscan_file($file)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$return = 0;
 
 		if (preg_match('/\.virus$/i', $file))
 		{
-		    $this->errors[] = 'File has an extension saying file is a virus';
-		    return -97;
+			$this->errors[] = 'File has an extension saying file is a virus';
+			return -97;
 		}
 
 		$fullcommand = $this->getCliCommand($file);
 		//$fullcommand='"c:\Program Files (x86)\ClamWin\bin\clamscan.exe" --database="C:\Program Files (x86)\ClamWin\lib" "c:\temp\aaa.txt"';
-        $fullcommand .= ' 2>&1'; // This is to get error output
+		$fullcommand .= ' 2>&1'; // This is to get error output
 
 		$output = array();
 		$return_var = 0;
-        $safemode = ini_get("safe_mode");
+		$safemode = ini_get("safe_mode");
 		// Create a clean fullcommand
 		dol_syslog("AntiVir::dol_avscan_file Run command=".$fullcommand." with safe_mode ".($safemode ? "on" : "off"));
 		// Run CLI command. If run of Windows, you can get return with echo %ERRORLEVEL%
@@ -95,7 +95,7 @@ class AntiVir
 
 		if (is_null($output)) $output = array();
 
-        //print "x".$lastline." - ".join(',',$output)." - ".$return_var."y";exit;
+		//print "x".$lastline." - ".join(',',$output)." - ".$return_var."y";exit;
 
 		/*
         $outputfile=$conf->admin->dir_temp.'/dol_avscan_file.out.'.session_id();
@@ -181,7 +181,7 @@ class AntiVir
 
 		$ret = $command.' '.$param;
 		//$ret=$command.' '.$param.' 2>&1';
-        //print "xx".$ret."xx";exit;
+		//print "xx".$ret."xx";exit;
 
 		return $ret;
 	}
diff --git a/htdocs/core/class/canvas.class.php b/htdocs/core/class/canvas.class.php
index 80c6ff1b7a6..91157f52ba0 100644
--- a/htdocs/core/class/canvas.class.php
+++ b/htdocs/core/class/canvas.class.php
@@ -29,9 +29,9 @@
 class Canvas
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -45,16 +45,16 @@ class Canvas
 
 	public $actiontype;
 
-    public $dirmodule; // Module directory
-    public $targetmodule; // Module concerned by canvas (ex: thirdparty, contact, ...)
-    public $canvas; // Name of canvas (ex: company, individual, product, service, ...)
-    public $card; // Tab (sub-canvas)
+	public $dirmodule; // Module directory
+	public $targetmodule; // Module concerned by canvas (ex: thirdparty, contact, ...)
+	public $canvas; // Name of canvas (ex: company, individual, product, service, ...)
+	public $card; // Tab (sub-canvas)
 
-    public $template_dir; // Initialized by getCanvas with templates directory
-    public $control; // Initialized by getCanvas with controller instance
+	public $template_dir; // Initialized by getCanvas with templates directory
+	public $control; // Initialized by getCanvas with controller instance
 
 
-    /**
+	/**
 	 *   Constructor
 	 *
 	 *   @param     DoliDB	$db          	Database handler
@@ -75,11 +75,11 @@ class Canvas
 	 */
 	private function _cleanaction($action)
 	{
-	    $newaction = $action;
-	    if ($newaction == 'add')    $newaction = 'create';
-	    if ($newaction == 'update') $newaction = 'edit';
-	    if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') $newaction = 'view';
-	    return $newaction;
+		$newaction = $action;
+		if ($newaction == 'add')    $newaction = 'create';
+		if ($newaction == 'update') $newaction = 'edit';
+		if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') $newaction = 'view';
+		return $newaction;
 	}
 
 
@@ -96,45 +96,45 @@ class Canvas
 		global $conf, $langs;
 
 		// Set properties with value specific to dolibarr core: this->targetmodule, this->card, this->canvas
-        $this->targetmodule = $module;
-        $this->canvas = $canvas;
-        $this->card = $card;
-        $this->dirmodule = $module;
-        // Correct values if canvas is into an external module
+		$this->targetmodule = $module;
+		$this->canvas = $canvas;
+		$this->card = $card;
+		$this->dirmodule = $module;
+		// Correct values if canvas is into an external module
 		if (preg_match('/^([^@]+)@([^@]+)$/i', $canvas, $regs))
 		{
-            $this->canvas = $regs[1];
-		    $this->dirmodule = $regs[2];
+			$this->canvas = $regs[1];
+			$this->dirmodule = $regs[2];
 		}
 		// For compatibility
-        if ($this->dirmodule == 'thirdparty') { $this->dirmodule = 'societe'; }
+		if ($this->dirmodule == 'thirdparty') { $this->dirmodule = 'societe'; }
 
-        // Control file
+		// Control file
 		$controlclassfile = dol_buildpath('/'.$this->dirmodule.'/canvas/'.$this->canvas.'/actions_'.$this->card.'_'.$this->canvas.'.class.php');
 		if (file_exists($controlclassfile))
 		{
-            // Include actions class (controller)
-            $this->control_file = $controlclassfile;
-            require_once $controlclassfile;
+			// Include actions class (controller)
+			$this->control_file = $controlclassfile;
+			require_once $controlclassfile;
 
-            // Instantiate actions class (controller)
-            $controlclassname = 'Actions'.ucfirst($this->card).ucfirst($this->canvas);
-            $this->control = new $controlclassname($this->db, $this->dirmodule, $this->targetmodule, $this->canvas, $this->card);
+			// Instantiate actions class (controller)
+			$controlclassname = 'Actions'.ucfirst($this->card).ucfirst($this->canvas);
+			$this->control = new $controlclassname($this->db, $this->dirmodule, $this->targetmodule, $this->canvas, $this->card);
 		}
 
 		// Template dir
 		$this->template_dir = dol_buildpath('/'.$this->dirmodule.'/canvas/'.$this->canvas.'/tpl/');
-        if (!is_dir($this->template_dir))
-        {
-            $this->template_dir = '';
-        }
+		if (!is_dir($this->template_dir))
+		{
+			$this->template_dir = '';
+		}
 
-        //print 'dimodule='.$dirmodule.' canvas='.$this->canvas.'<br>';
-        //print ' => template_dir='.$this->template_dir.'<br>';
+		//print 'dimodule='.$dirmodule.' canvas='.$this->canvas.'<br>';
+		//print ' => template_dir='.$this->template_dir.'<br>';
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 * 	Shared method for canvas to assign values for templates
 	 *
 	 * 	@param		string		$action	Action string
@@ -144,25 +144,25 @@ class Canvas
 	 */
 	public function assign_values(&$action = 'view', $id = 0, $ref = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if (method_exists($this->control, 'assign_values')) $this->control->assign_values($action, $id, $ref);
 	}
 
-    /**
-     *	Return the template to display canvas (if it exists)
+	/**
+	 *	Return the template to display canvas (if it exists)
 	 *
 	 *	@param	string	$action		Action code
-     *	@return	int		0=Canvas template file does not exist, 1=Canvas template file exists
-     */
-    public function displayCanvasExists($action)
-    {
-        if (empty($this->template_dir)) return 0;
+	 *	@return	int		0=Canvas template file does not exist, 1=Canvas template file exists
+	 */
+	public function displayCanvasExists($action)
+	{
+		if (empty($this->template_dir)) return 0;
 
-        if (file_exists($this->template_dir.(!empty($this->card) ? $this->card.'_' : '').$this->_cleanaction($action).'.tpl.php')) return 1;
-        else return 0;
-    }
+		if (file_exists($this->template_dir.(!empty($this->card) ? $this->card.'_' : '').$this->_cleanaction($action).'.tpl.php')) return 1;
+		else return 0;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Display a canvas page. This will include the template for output.
 	 *	Variables used by templates may have been defined or loaded before into the assign_values function.
@@ -172,7 +172,7 @@ class Canvas
 	 */
 	public function display_canvas($action)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $db, $conf, $langs, $user, $canvas;
 		global $form, $formfile;
 
@@ -191,12 +191,12 @@ class Canvas
 	 */
 	public function hasActions()
 	{
-        return (is_object($this->control));
+		return (is_object($this->control));
 	}
 
 	/**
 	 * 	Shared method for canvas to execute actions.
-     *  @deprecated Use the doActions of hooks instead of this.
+	 *  @deprecated Use the doActions of hooks instead of this.
 	 * 	            This function is called if you add a doActions class inside your canvas. Try to not
 	 * 				do that and add action code into a hook instead.
 	 *
diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php
index cf671eb57ca..d19e6d00a36 100644
--- a/htdocs/core/class/ccountry.class.php
+++ b/htdocs/core/class/ccountry.class.php
@@ -33,9 +33,9 @@
 class Ccountry // extends CommonObject
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -50,7 +50,7 @@ class Ccountry // extends CommonObject
 	public $element = 'ccountry'; //!< Id that identify managed objects
 	public $table_element = 'c_country'; //!< Name of table without prefix where object is stored
 
-    /**
+	/**
 	 * @var int ID
 	 */
 	public $id;
@@ -59,9 +59,9 @@ class Ccountry // extends CommonObject
 	public $code_iso;
 
 	/**
-     * @var string Countries label
-     */
-    public $label;
+	 * @var string Countries label
+	 */
+	public $label;
 
 	public $active;
 
@@ -70,27 +70,27 @@ class Ccountry // extends CommonObject
 	);
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDb		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDb		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *  Create object into database
-     *
-     *  @param      User	$user        User that create
-     *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
-     *  @return     int      		   	 <0 if KO, Id of created object if OK
-     */
-    public function create($user, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Create object into database
+	 *
+	 *  @param      User	$user        User that create
+	 *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
+	 *  @return     int      		   	 <0 if KO, Id of created object if OK
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -102,14 +102,14 @@ class Ccountry // extends CommonObject
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Insert request
+		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_country(";
 		$sql .= "rowid,";
 		$sql .= "code,";
 		$sql .= "code_iso,";
 		$sql .= "label,";
 		$sql .= "active";
-        $sql .= ") VALUES (";
+		$sql .= ") VALUES (";
 		$sql .= " ".(!isset($this->rowid) ? 'NULL' : "'".$this->db->escape($this->rowid)."'").",";
 		$sql .= " ".(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").",";
 		$sql .= " ".(!isset($this->code_iso) ? 'NULL' : "'".$this->db->escape($this->code_iso)."'").",";
@@ -120,88 +120,88 @@ class Ccountry // extends CommonObject
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
 		if (!$error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_country");
-        }
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_country");
+		}
 
-        // Commit or rollback
-        if ($error)
+		// Commit or rollback
+		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
 		} else {
 			$this->db->commit();
-            return $this->id;
+			return $this->id;
 		}
-    }
+	}
 
 
-    /**
-     *  Load object in memory from database
-     *
-     *  @param      int		$id    	  Id object
-     *  @param		string	$code	    Code
-     *  @param		string	$code_iso	Code ISO
-     *  @return     int          	>0 if OK, 0 if not found, <0 if KO
-     */
-    public function fetch($id, $code = '', $code_iso = '')
-    {
-        $sql = "SELECT";
+	/**
+	 *  Load object in memory from database
+	 *
+	 *  @param      int		$id    	  Id object
+	 *  @param		string	$code	    Code
+	 *  @param		string	$code_iso	Code ISO
+	 *  @return     int          	>0 if OK, 0 if not found, <0 if KO
+	 */
+	public function fetch($id, $code = '', $code_iso = '')
+	{
+		$sql = "SELECT";
   		$sql .= " t.rowid,";
   		$sql .= " t.code,";
   		$sql .= " t.code_iso,";
   		$sql .= " t.label,";
   		$sql .= " t.active";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_country as t";
-        if ($id) $sql .= " WHERE t.rowid = ".$id;
-        elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape($code)."'";
-        elseif ($code_iso) $sql .= " WHERE t.code_iso = '".$this->db->escape($code_iso)."'";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_country as t";
+		if ($id) $sql .= " WHERE t.rowid = ".$id;
+		elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape($code)."'";
+		elseif ($code_iso) $sql .= " WHERE t.code_iso = '".$this->db->escape($code_iso)."'";
 
-    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->rowid;
+				$this->id = $obj->rowid;
 				$this->code = $obj->code;
 				$this->code_iso = $obj->code_iso;
 				$this->label = $obj->label;
 				$this->active = $obj->active;
 
-                $this->db->free($resql);
-                return 1;
-            } else {
-                return 0;
-            }
-        } else {
-      	    $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
+				$this->db->free($resql);
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+	  		$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Update object into database
-     *
-     *  @param      User	$user        User that modify
-     *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return     int     		   	 <0 if KO, >0 if OK
-     */
-    public function update($user = null, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Update object into database
+	 *
+	 *  @param      User	$user        User that modify
+	 *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return     int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update($user = null, $notrigger = 0)
+	{
+		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -214,27 +214,27 @@ class Ccountry // extends CommonObject
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."c_country SET";
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."c_country SET";
 		$sql .= " code=".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").",";
 		$sql .= " code_iso=".(isset($this->code_iso) ? "'".$this->db->escape($this->code_iso)."'" : "null").",";
 		$sql .= " label=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
 		$sql .= " active=".(isset($this->active) ? $this->active : "null")."";
-        $sql .= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -242,16 +242,16 @@ class Ccountry // extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-    }
+	}
 
 
  	/**
  	 *  Delete object in database
-	 *
-     *	@param  User	$user        User that delete
-     *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
-	 */
+ 	 *
+ 	 *	@param  User	$user        User that delete
+ 	 *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
+ 	 *  @return	int					 <0 if KO, >0 if OK
+ 	 */
 	public function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
@@ -264,15 +264,15 @@ class Ccountry // extends CommonObject
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -282,19 +282,19 @@ class Ccountry // extends CommonObject
 		}
 	}
 
-    /**
-     *  Return a link to the object card (with optionaly the picto)
-     *
-     *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-     *	@param	string	$option						On what the link point to ('nolink', ...)
-     *  @param	int  	$notooltip					1=Disable tooltip
-     *  @param  string  $morecss            		Add more css on link
-     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *	@return	string								String with URL
-     */
-    public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
-    {
-    	global $langs;
-        return $langs->trans($this->label);
-    }
+	/**
+	 *  Return a link to the object card (with optionaly the picto)
+	 *
+	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+	 *	@param	string	$option						On what the link point to ('nolink', ...)
+	 *  @param	int  	$notooltip					1=Disable tooltip
+	 *  @param  string  $morecss            		Add more css on link
+	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return	string								String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
+		global $langs;
+		return $langs->trans($this->label);
+	}
 }
diff --git a/htdocs/core/class/comment.class.php b/htdocs/core/class/comment.class.php
index a083576aacb..3f9ca42e136 100644
--- a/htdocs/core/class/comment.class.php
+++ b/htdocs/core/class/comment.class.php
@@ -32,10 +32,13 @@ class Comment extends CommonObject
 	public $table_element = 'comment';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var int ID of parent key (it's not the name of a field)
 	 */
-	public $fk_element = '';
+	public $fk_element;
 
+	/**
+	 * @var string element type
+	 */
 	public $element_type;
 
 	/**
@@ -44,27 +47,27 @@ class Comment extends CommonObject
 	public $description;
 
 	/**
-     * Date modification record (tms)
-     *
-     * @var integer
-     */
+	 * Date modification record (tms)
+	 *
+	 * @var integer
+	 */
 	public $tms;
 
 	/**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_author;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
 	/**
@@ -72,10 +75,16 @@ class Comment extends CommonObject
 	 */
 	public $entity;
 
+	/**
+	 * @var string import key
+	 */
 	public $import_key;
 
 	public $comments = array();
 
+	/**
+	 * @var Comment Object oldcopy
+	 */
 	public $oldcopy;
 
 
@@ -131,26 +140,26 @@ class Comment extends CommonObject
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 
-			if (!$notrigger)
-			{
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('TASK_COMMENT_CREATE', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -186,16 +195,14 @@ class Comment extends CommonObject
 		$sql .= " c.entity,";
 		$sql .= " c.import_key";
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as c";
-		$sql .= " WHERE c.rowid = ".$id;
+		$sql .= " WHERE c.rowid = ".((int) $id);
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num_rows = $this->db->num_rows($resql);
 
-			if ($num_rows)
-			{
+			if ($num_rows) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
@@ -212,8 +219,11 @@ class Comment extends CommonObject
 
 			$this->db->free($resql);
 
-			if ($num_rows) return 1;
-			else return 0;
+			if ($num_rows) {
+				return 1;
+			} else {
+				return 0;
+			}
 		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
@@ -234,8 +244,12 @@ class Comment extends CommonObject
 		$error = 0;
 
 		// Clean parameters
-		if (isset($this->fk_element)) $this->fk_project = (int) trim($this->fk_element);
-		if (isset($this->description)) $this->description = trim($this->description);
+		if (isset($this->fk_element)) {
+			$this->fk_project = (int) trim($this->fk_element);
+		}
+		if (isset($this->description)) {
+			$this->description = trim($this->description);
+		}
 
 
 		// Update request
@@ -253,24 +267,24 @@ class Comment extends CommonObject
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
-		if (!$error)
-		{
-			if (!$notrigger)
-			{
+		if (!$error) {
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('TASK_COMMENT_MODIFY', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -303,24 +317,24 @@ class Comment extends CommonObject
 		$sql .= " WHERE rowid=".$this->id;
 
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
-		if (!$error)
-		{
-			if (!$notrigger)
-			{
+		if (!$error) {
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('TASK_COMMENT_DELETE', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -355,13 +369,10 @@ class Comment extends CommonObject
 
 			dol_syslog(get_class($this).'::'.__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$num_rows = $this->db->num_rows($resql);
-				if ($num_rows > 0)
-				{
-					while ($obj = $this->db->fetch_object($resql))
-					{
+				if ($num_rows > 0) {
+					while ($obj = $this->db->fetch_object($resql)) {
 						$comment = new self($db);
 						$comment->fetch($obj->rowid);
 						$this->comments[] = $comment;
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 54f14c25cab..03a5154f23f 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2005-2012	Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2016       Charlie Benke           <charlie@patas-monkey.com>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2020       Josep Lluís Amador      <joseplluis@lliuretic.cat>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -40,199 +40,250 @@ abstract class CommonDocGenerator
 	 */
 	public $error = '';
 
-    /**
-     * @var string[]    Array of error strings
-     */
-    public $errors = array();
+	/**
+	 * @var string[]    Array of error strings
+	 */
+	public $errors = array();
 
 	/**
-     * @var DoliDB Database handler.
-     */
+	 * @var DoliDB Database handler.
+	 */
 	protected $db;
 
-    /**
-     * @var Extrafields object
-     */
+	/**
+	 * @var Extrafields object
+	 */
 	public $extrafieldsCache;
 
 	/**
 	 *	Constructor
 	 *
 	 *  @param		DoliDB		$db      Database handler
-	*/
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Define array with couple substitution key => substitution value
-     *
-     * @param   User		$user           User
-     * @param   Translate	$outputlangs    Language object for output
-     * @return	array						Array of substitution key->code
-     */
-    public function get_substitutionarray_user($user, $outputlangs)
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Define array with couple substitution key => substitution value
+	 *
+	 * @param   User		$user           User
+	 * @param   Translate	$outputlangs    Language object for output
+	 * @return	array						Array of substitution key->code
+	 */
+	public function get_substitutionarray_user($user, $outputlangs)
+	{
+		// phpcs:enable
+		global $conf, $extrafields;
 
-        $logotouse = $conf->user->dir_output.'/'.get_exdir($user->id, 2, 0, 1, $user, 'user').'/'.$user->photo;
+		$logotouse = $conf->user->dir_output.'/'.get_exdir($user->id, 2, 0, 1, $user, 'user').'/'.$user->photo;
 
-        return array(
-            'myuser_lastname'=>$user->lastname,
-            'myuser_firstname'=>$user->firstname,
-            'myuser_fullname'=>$user->getFullName($outputlangs, 1),
-            'myuser_login'=>$user->login,
-            'myuser_phone'=>$user->office_phone,
-       		'myuser_address'=>$user->address,
-       		'myuser_zip'=>$user->zip,
-       		'myuser_town'=>$user->town,
-       		'myuser_country'=>$user->country,
-        	'myuser_country_code'=>$user->country_code,
-       		'myuser_state'=>$user->state,
-        	'myuser_state_code'=>$user->state_code,
-        	'myuser_fax'=>$user->office_fax,
-            'myuser_mobile'=>$user->user_mobile,
-            'myuser_email'=>$user->email,
-        	'myuser_logo'=>$logotouse,
-        	'myuser_job'=>$user->job,
-            'myuser_web'=>''	// url not exist in $user object
-        );
-    }
+		$array_user = array(
+			'myuser_lastname'=>$user->lastname,
+			'myuser_firstname'=>$user->firstname,
+			'myuser_fullname'=>$user->getFullName($outputlangs, 1),
+			'myuser_login'=>$user->login,
+			'myuser_phone'=>$user->office_phone,
+	   		'myuser_address'=>$user->address,
+	   		'myuser_zip'=>$user->zip,
+	   		'myuser_town'=>$user->town,
+	   		'myuser_country'=>$user->country,
+			'myuser_country_code'=>$user->country_code,
+	   		'myuser_state'=>$user->state,
+			'myuser_state_code'=>$user->state_code,
+			'myuser_fax'=>$user->office_fax,
+			'myuser_mobile'=>$user->user_mobile,
+			'myuser_email'=>$user->email,
+			'myuser_logo'=>$logotouse,
+			'myuser_job'=>$user->job,
+			'myuser_web'=>''	// url not exist in $user object
+		);
+		// Retrieve extrafields
+		if (is_array($user->array_options) && count($user->array_options)) {
+			$array_user = $this->fill_substitutionarray_with_extrafields($user, $array_user, $extrafields, 'myuser', $outputlangs);
+		}
+		return $array_user;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Define array with couple substitution key => substitution value
-     *
-     * @param   Societe		$mysoc			Object thirdparty
-     * @param   Translate	$outputlangs    Language object for output
-     * @return	array						Array of substitution key->code
-     */
-    public function get_substitutionarray_mysoc($mysoc, $outputlangs)
-    {
-        // phpcs:enable
-        global $conf;
+	/**
+	 * Define array with couple substitution key => substitution value
+	 *
+	 * @param   Adherent	$member         Member
+	 * @param   Translate	$outputlangs    Language object for output
+	 * @return	array						Array of substitution key->code
+	 */
+	public function getSubstitutionarrayMember($member, $outputlangs)
+	{
+		global $conf, $extrafields;
 
-        if (empty($mysoc->forme_juridique) && !empty($mysoc->forme_juridique_code))
-        {
-            $mysoc->forme_juridique = getFormeJuridiqueLabel($mysoc->forme_juridique_code);
-        }
-        if (empty($mysoc->country) && !empty($mysoc->country_code))
-        {
-        	$mysoc->country = $outputlangs->transnoentitiesnoconv("Country".$mysoc->country_code);
-        }
-        if (empty($mysoc->state) && !empty($mysoc->state_code))
-        {
-        	$mysoc->state = getState($mysoc->state_code, 0);
-        }
+		if ($member->photo) {
+			$logotouse = $conf->adherent->dir_output.'/'.get_exdir(0, 0, 0, 1, $member, 'user').'/photos/'.$member->photo;
+		} else {
+			$logotouse = DOL_DOCUMENT_ROOT.'/public/theme/common/nophoto.png';
+		}
 
-        $logotouse = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
+		$array_member = array(
+			'mymember_lastname' => $member->lastname,
+			'mymember_firstname' => $member->firstname,
+			'mymember_fullname' => $member->getFullName($outputlangs, 1),
+			'mymember_login' => $member->login,
+			'mymember_address' => $member->address,
+			'mymember_zip' => $member->zip,
+			'mymember_town' => $member->town,
+			'mymember_country_code' => $member->country_code,
+			'mymember_country' => $member->country,
+			'mymember_state_code' => $member->state_code,
+			'mymember_state' => $member->state,
+			'mymember_phone_perso' => $member->phone_perso,
+			'mymember_phone_pro' => $member->phone,
+			'mymember_phone_mobile' => $member->phone_mobile,
+			'mymember_email' => $member->email,
+			'mymember_logo' => $logotouse,
+			'mymember_gender' => $member->gender,
+			'mymember_birth_locale' => dol_print_date($member->birth, 'day', 'tzuser', $outputlangs),
+			'mymember_birth' => dol_print_date($member->birth, 'day', 'tzuser'),
+		);
+		// Retrieve extrafields
+		if (is_array($member->array_options) && count($member->array_options)) {
+			$array_member = $this->fill_substitutionarray_with_extrafields($member, $array_member, $extrafields, 'mymember', $outputlangs);
+		}
+		return $array_member;
+	}
 
-        return array(
-            'mycompany_logo'=>$logotouse,
-            'mycompany_name'=>$mysoc->name,
-            'mycompany_email'=>$mysoc->email,
-            'mycompany_phone'=>$mysoc->phone,
-            'mycompany_fax'=>$mysoc->fax,
-            'mycompany_address'=>$mysoc->address,
-            'mycompany_zip'=>$mysoc->zip,
-            'mycompany_town'=>$mysoc->town,
-            'mycompany_country'=>$mysoc->country,
-            'mycompany_country_code'=>$mysoc->country_code,
-            'mycompany_state'=>$mysoc->state,
-            'mycompany_state_code'=>$mysoc->state_code,
-        	'mycompany_web'=>$mysoc->url,
-            'mycompany_juridicalstatus'=>$mysoc->forme_juridique,
-            'mycompany_managers'=>$mysoc->managers,
-            'mycompany_capital'=>$mysoc->capital,
-            'mycompany_barcode'=>$mysoc->barcode,
-            'mycompany_idprof1'=>$mysoc->idprof1,
-            'mycompany_idprof2'=>$mysoc->idprof2,
-            'mycompany_idprof3'=>$mysoc->idprof3,
-            'mycompany_idprof4'=>$mysoc->idprof4,
-            'mycompany_idprof5'=>$mysoc->idprof5,
-            'mycompany_idprof6'=>$mysoc->idprof6,
-        	'mycompany_vatnumber'=>$mysoc->tva_intra,
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Define array with couple substitution key => substitution value
+	 *
+	 * @param   Societe		$mysoc			Object thirdparty
+	 * @param   Translate	$outputlangs    Language object for output
+	 * @return	array						Array of substitution key->code
+	 */
+	public function get_substitutionarray_mysoc($mysoc, $outputlangs)
+	{
+		// phpcs:enable
+		global $conf;
+
+		if (empty($mysoc->forme_juridique) && !empty($mysoc->forme_juridique_code))
+		{
+			$mysoc->forme_juridique = getFormeJuridiqueLabel($mysoc->forme_juridique_code);
+		}
+		if (empty($mysoc->country) && !empty($mysoc->country_code))
+		{
+			$mysoc->country = $outputlangs->transnoentitiesnoconv("Country".$mysoc->country_code);
+		}
+		if (empty($mysoc->state) && !empty($mysoc->state_code))
+		{
+			$mysoc->state = getState($mysoc->state_code, 0);
+		}
+
+		$logotouse = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
+
+		return array(
+			'mycompany_logo'=>$logotouse,
+			'mycompany_name'=>$mysoc->name,
+			'mycompany_email'=>$mysoc->email,
+			'mycompany_phone'=>$mysoc->phone,
+			'mycompany_fax'=>$mysoc->fax,
+			'mycompany_address'=>$mysoc->address,
+			'mycompany_zip'=>$mysoc->zip,
+			'mycompany_town'=>$mysoc->town,
+			'mycompany_country'=>$mysoc->country,
+			'mycompany_country_code'=>$mysoc->country_code,
+			'mycompany_state'=>$mysoc->state,
+			'mycompany_state_code'=>$mysoc->state_code,
+			'mycompany_web'=>$mysoc->url,
+			'mycompany_juridicalstatus'=>$mysoc->forme_juridique,
+			'mycompany_managers'=>$mysoc->managers,
+			'mycompany_capital'=>$mysoc->capital,
+			'mycompany_barcode'=>$mysoc->barcode,
+			'mycompany_idprof1'=>$mysoc->idprof1,
+			'mycompany_idprof2'=>$mysoc->idprof2,
+			'mycompany_idprof3'=>$mysoc->idprof3,
+			'mycompany_idprof4'=>$mysoc->idprof4,
+			'mycompany_idprof5'=>$mysoc->idprof5,
+			'mycompany_idprof6'=>$mysoc->idprof6,
+			'mycompany_vatnumber'=>$mysoc->tva_intra,
 			'mycompany_object'=>$mysoc->object,
-            'mycompany_note_private'=>$mysoc->note_private,
-            //'mycompany_note_public'=>$mysoc->note_public,        // Only private not exists for "mysoc" but both for thirdparties
-        );
-    }
+			'mycompany_note_private'=>$mysoc->note_private,
+			//'mycompany_note_public'=>$mysoc->note_public,        // Only private not exists for "mysoc" but both for thirdparties
+		);
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Define array with couple substitution key => substitution value
-     *
-     * @param	Societe		$object			Object
-     * @param   Translate	$outputlangs    Language object for output
-     * @param   string		$array_key	    Name of the key for return array
-     * @return	array						Array of substitution key->code
-     */
-    public function get_substitutionarray_thirdparty($object, $outputlangs, $array_key = 'company')
-    {
-        // phpcs:enable
-        global $conf, $extrafields;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Define array with couple substitution key => substitution value
+	 *
+	 * @param	Societe		$object			Object
+	 * @param   Translate	$outputlangs    Language object for output
+	 * @param   string		$array_key	    Name of the key for return array
+	 * @return	array						Array of substitution key->code
+	 */
+	public function get_substitutionarray_thirdparty($object, $outputlangs, $array_key = 'company')
+	{
+		// phpcs:enable
+		global $conf, $extrafields;
 
-        if (empty($object->country) && !empty($object->country_code))
-        {
-        	$object->country = $outputlangs->transnoentitiesnoconv("Country".$object->country_code);
-        }
-        if (empty($object->state) && !empty($object->state_code))
-        {
-        	$object->state = getState($object->state_code, 0);
-        }
+		if (empty($object->country) && !empty($object->country_code))
+		{
+			$object->country = $outputlangs->transnoentitiesnoconv("Country".$object->country_code);
+		}
+		if (empty($object->state) && !empty($object->state_code))
+		{
+			$object->state = getState($object->state_code, 0);
+		}
 
-        $array_thirdparty = array(
-            'company_name'=>$object->name,
-	        'company_name_alias' => $object->name_alias,
-            'company_email'=>$object->email,
-            'company_phone'=>$object->phone,
-            'company_fax'=>$object->fax,
-            'company_address'=>$object->address,
-            'company_zip'=>$object->zip,
-            'company_town'=>$object->town,
-            'company_country'=>$object->country,
-        	'company_country_code'=>$object->country_code,
-            'company_state'=>$object->state,
-        	'company_state_code'=>$object->state_code,
-        	'company_web'=>$object->url,
-            'company_barcode'=>$object->barcode,
-            'company_vatnumber'=>$object->tva_intra,
-            'company_customercode'=>$object->code_client,
-            'company_suppliercode'=>$object->code_fournisseur,
-            'company_customeraccountancycode'=>$object->code_compta,
-            'company_supplieraccountancycode'=>$object->code_compta_fournisseur,
-            'company_juridicalstatus'=>$object->forme_juridique,
-            'company_outstanding_limit'=>$object->outstanding_limit,
-            'company_capital'=>$object->capital,
-            'company_idprof1'=>$object->idprof1,
-            'company_idprof2'=>$object->idprof2,
-            'company_idprof3'=>$object->idprof3,
-            'company_idprof4'=>$object->idprof4,
-            'company_idprof5'=>$object->idprof5,
-            'company_idprof6'=>$object->idprof6,
-            'company_note_public'=>$object->note_public,
-            'company_note_private'=>$object->note_private,
-        	'company_default_bank_iban'=>(is_object($object->bank_account) ? $object->bank_account->iban : ''),
-        	'company_default_bank_bic'=>(is_object($object->bank_account) ? $object->bank_account->bic : '')
-        );
+		$array_thirdparty = array(
+			'company_name'=>$object->name,
+			'company_name_alias' => $object->name_alias,
+			'company_email'=>$object->email,
+			'company_phone'=>$object->phone,
+			'company_fax'=>$object->fax,
+			'company_address'=>$object->address,
+			'company_zip'=>$object->zip,
+			'company_town'=>$object->town,
+			'company_country'=>$object->country,
+			'company_country_code'=>$object->country_code,
+			'company_state'=>$object->state,
+			'company_state_code'=>$object->state_code,
+			'company_web'=>$object->url,
+			'company_barcode'=>$object->barcode,
+			'company_vatnumber'=>$object->tva_intra,
+			'company_customercode'=>$object->code_client,
+			'company_suppliercode'=>$object->code_fournisseur,
+			'company_customeraccountancycode'=>$object->code_compta,
+			'company_supplieraccountancycode'=>$object->code_compta_fournisseur,
+			'company_juridicalstatus'=>$object->forme_juridique,
+			'company_outstanding_limit'=>$object->outstanding_limit,
+			'company_capital'=>$object->capital,
+			'company_idprof1'=>$object->idprof1,
+			'company_idprof2'=>$object->idprof2,
+			'company_idprof3'=>$object->idprof3,
+			'company_idprof4'=>$object->idprof4,
+			'company_idprof5'=>$object->idprof5,
+			'company_idprof6'=>$object->idprof6,
+			'company_note_public'=>$object->note_public,
+			'company_note_private'=>$object->note_private,
+			'company_default_bank_iban'=>(is_object($object->bank_account) ? $object->bank_account->iban : ''),
+			'company_default_bank_bic'=>(is_object($object->bank_account) ? $object->bank_account->bic : '')
+		);
 
-	    // Retrieve extrafields
-	    if (is_array($object->array_options) && count($object->array_options))
-	    {
-		    $object->fetch_optionals();
+		// Retrieve extrafields
+		if (is_array($object->array_options) && count($object->array_options))
+		{
+			$object->fetch_optionals();
 
-		    $array_thirdparty = $this->fill_substitutionarray_with_extrafields($object, $array_thirdparty, $extrafields, $array_key, $outputlangs);
-	    }
+			$array_thirdparty = $this->fill_substitutionarray_with_extrafields($object, $array_thirdparty, $extrafields, $array_key, $outputlangs);
+		}
 		return $array_thirdparty;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Define array with couple substitution key => substitution value
 	 *
@@ -241,9 +292,9 @@ abstract class CommonDocGenerator
 	 * @param   string		$array_key	    Name of the key for return array
 	 * @return	array 						Array of substitution key->code
 	 */
-    public function get_substitutionarray_contact($object, $outputlangs, $array_key = 'object')
-    {
-        // phpcs:enable
+	public function get_substitutionarray_contact($object, $outputlangs, $array_key = 'object')
+	{
+		// phpcs:enable
 		global $conf, $extrafields;
 
 		if (empty($object->country) && !empty($object->country_code))
@@ -285,67 +336,67 @@ abstract class CommonDocGenerator
 			$array_key.'_civility' => $object->civility,
 		);
 
-	    // Retrieve extrafields
-	    if (is_array($object->array_options) && count($object->array_options))
-	    {
-		    $object->fetch_optionals();
+		// Retrieve extrafields
+		if (is_array($object->array_options) && count($object->array_options))
+		{
+			$object->fetch_optionals();
 
-		    $array_contact = $this->fill_substitutionarray_with_extrafields($object, $array_contact, $extrafields, $array_key, $outputlangs);
-	    }
+			$array_contact = $this->fill_substitutionarray_with_extrafields($object, $array_contact, $extrafields, $array_key, $outputlangs);
+		}
 		return $array_contact;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Define array with couple substitution key => substitution value
-     *
-     * @param   Translate	$outputlangs    Language object for output
-     * @return	array						Array of substitution key->code
-     */
-    public function get_substitutionarray_other($outputlangs)
-    {
-        // phpcs:enable
-    	global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Define array with couple substitution key => substitution value
+	 *
+	 * @param   Translate	$outputlangs    Language object for output
+	 * @return	array						Array of substitution key->code
+	 */
+	public function get_substitutionarray_other($outputlangs)
+	{
+		// phpcs:enable
+		global $conf;
 
-    	$now = dol_now('gmt'); // gmt
-    	$array_other = array(
-    	    // Date in default language
-    	    'current_date'=>dol_print_date($now, 'day', 'tzuser'),
-    	    'current_datehour'=>dol_print_date($now, 'dayhour', 'tzuser'),
+		$now = dol_now('gmt'); // gmt
+		$array_other = array(
+			// Date in default language
+			'current_date'=>dol_print_date($now, 'day', 'tzuser'),
+			'current_datehour'=>dol_print_date($now, 'dayhour', 'tzuser'),
    			'current_server_date'=>dol_print_date($now, 'day', 'tzserver'),
    			'current_server_datehour'=>dol_print_date($now, 'dayhour', 'tzserver'),
-    	    // Date in requested output language
-    	    'current_date_locale'=>dol_print_date($now, 'day', 'tzuser', $outputlangs),
+			// Date in requested output language
+			'current_date_locale'=>dol_print_date($now, 'day', 'tzuser', $outputlangs),
    			'current_datehour_locale'=>dol_print_date($now, 'dayhour', 'tzuser', $outputlangs),
    			'current_server_date_locale'=>dol_print_date($now, 'day', 'tzserver', $outputlangs),
    			'current_server_datehour_locale'=>dol_print_date($now, 'dayhour', 'tzserver', $outputlangs),
-    	);
+		);
 
 
-    	foreach ($conf->global as $key => $val)
-    	{
-    		if (preg_match('/(_pass|_pw|password|secret|_key|key$)/i', $key)) $newval = '*****forbidden*****';
-    		else $newval = $val;
-    		$array_other['__['.$key.']__'] = $newval;
-    	}
+		foreach ($conf->global as $key => $val)
+		{
+			if (isASecretKey($key)) $newval = '*****forbidden*****';
+			else $newval = $val;
+			$array_other['__['.$key.']__'] = $newval;
+		}
 
-    	return $array_other;
-    }
+		return $array_other;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Define array with couple substitution key => substitution value
 	 *
 	 * @param   Object			$object             Main object to use as data source
 	 * @param   Translate		$outputlangs        Lang object to use for output
-     * @param   string		    $array_key	        Name of the key for return array
+	 * @param   string		    $array_key	        Name of the key for return array
 	 * @return	array								Array of substitution
 	 */
 	public function get_substitutionarray_object($object, $outputlangs, $array_key = 'object')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $extrafields;
 
 		$sumpayed = $sumdeposit = $sumcreditnote = '';
@@ -381,11 +432,11 @@ abstract class CommonDocGenerator
 		$array_key.'_ref_supplier'=>(!empty($object->ref_fournisseur) ? $object->ref_fournisseur : (empty($object->ref_supplier) ? '' : $object->ref_supplier)),
 		$array_key.'_source_invoice_ref'=>$invoice_source->ref,
 		// Dates
-        $array_key.'_hour'=>dol_print_date($date, 'hour'),
+		$array_key.'_hour'=>dol_print_date($date, 'hour'),
 		$array_key.'_date'=>dol_print_date($date, 'day'),
 		$array_key.'_date_rfc'=>dol_print_date($date, 'dayrfc'),
 		$array_key.'_date_limit'=>(!empty($object->date_lim_reglement) ?dol_print_date($object->date_lim_reglement, 'day') : ''),
-	    $array_key.'_date_end'=>(!empty($object->fin_validite) ?dol_print_date($object->fin_validite, 'day') : ''),
+		$array_key.'_date_end'=>(!empty($object->fin_validite) ?dol_print_date($object->fin_validite, 'day') : ''),
 		$array_key.'_date_creation'=>dol_print_date($object->date_creation, 'day'),
 		$array_key.'_date_modification'=>(!empty($object->date_modification) ?dol_print_date($object->date_modification, 'day') : ''),
 		$array_key.'_date_validation'=>(!empty($object->date_validation) ?dol_print_date($object->date_validation, 'dayhour') : ''),
@@ -397,7 +448,7 @@ abstract class CommonDocGenerator
 		$array_key.'_payment_term_code'=>$object->cond_reglement_code,
 		$array_key.'_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code) != 'PaymentCondition'.$object->cond_reglement_code ? $outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code) : ($object->cond_reglement_doc ? $object->cond_reglement_doc : $object->cond_reglement)),
 
-        $array_key.'_incoterms'=>(method_exists($object, 'display_incoterms') ? $object->display_incoterms() : ''),
+		$array_key.'_incoterms'=>(method_exists($object, 'display_incoterms') ? $object->display_incoterms() : ''),
 
 		$array_key.'_bank_iban'=>$bank_account->iban,
 		$array_key.'_bank_bic'=>$bank_account->bic,
@@ -416,8 +467,8 @@ abstract class CommonDocGenerator
 
 		$array_key.'_multicurrency_code' => price2num($object->multicurrency_code),
 		$array_key.'_multicurrency_tx' => price2num($object->multicurrency_tx),
-	    $array_key.'_multicurrency_total_ht' => price2num($object->multicurrency_total_ht),
-	    $array_key.'_multicurrency_total_tva' => price2num($object->multicurrency_total_tva),
+		$array_key.'_multicurrency_total_ht' => price2num($object->multicurrency_total_ht),
+		$array_key.'_multicurrency_total_tva' => price2num($object->multicurrency_total_tva),
 		$array_key.'_multicurrency_total_ttc' => price2num($object->multicurrency_total_ttc),
 		$array_key.'_multicurrency_total_ht_locale' => price($object->multicurrency_total_ht, 0, $outputlangs),
 		$array_key.'_multicurrency_total_tva_locale' => price($object->multicurrency_total_tva, 0, $outputlangs),
@@ -472,11 +523,11 @@ abstract class CommonDocGenerator
 			$totalUp = 0;
 			foreach ($object->lines as $line)
 			{
-			    // $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward compatibility
+				// $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward compatibility
 				if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) $resarray[$array_key.'_total_vat_'.$line->tva_tx] = 0;
 				$resarray[$array_key.'_total_vat_'.$line->tva_tx] += $line->total_tva;
 				$resarray[$array_key.'_total_vat_locale_'.$line->tva_tx] = price($resarray[$array_key.'_total_vat_'.$line->tva_tx]);
-			    // $vatformated is vat without not expected chars (so 20, or 8.5 or 5.99 for example)
+				// $vatformated is vat without not expected chars (so 20, or 8.5 or 5.99 for example)
 				$vatformated = vatrate($line->tva_tx);
 				if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) $resarray[$array_key.'_total_vat_'.$vatformated] = 0;
 				$resarray[$array_key.'_total_vat_'.$vatformated] += $line->total_tva;
@@ -514,7 +565,7 @@ abstract class CommonDocGenerator
 		return $resarray;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -525,21 +576,24 @@ abstract class CommonDocGenerator
 	 */
 	public function get_substitutionarray_lines($line, $outputlangs, $linenumber = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$resarray = array(
 			'line_pos' => $linenumber,
 			'line_fulldesc'=>doc_getlinedesc($line, $outputlangs),
-			'line_product_ref'=>$line->product_ref,
-			'line_product_ref_fourn'=>$line->ref_fourn, // for supplier doc lines
-			'line_product_label'=>$line->product_label,
-			'line_product_type'=>$line->product_type,
+
+			'line_product_ref'=>(empty($line->product_ref) ? '' : $line->product_ref),
+			'line_product_ref_fourn'=>(empty($line->ref_fourn) ? '' : $line->ref_fourn), // for supplier doc lines
+			'line_product_label'=>(empty($line->product_label) ? '' : $line->product_label),
+			'line_product_type'=>(empty($line->product_type) ? '' : $line->product_type),
+			'line_product_barcode'=>(empty($line->product_barcode) ? '' : $line->product_barcode),
+
 			'line_desc'=>$line->desc,
 			'line_vatrate'=>vatrate($line->tva_tx, true, $line->info_bits),
-		    'line_localtax1_rate'=>vatrate($line->localtax1_tx),
-		    'line_localtax2_rate'=>vatrate($line->localtax1_tx),
-		    'line_up'=>price2num($line->subprice),
+			'line_localtax1_rate'=>vatrate($line->localtax1_tx),
+			'line_localtax2_rate'=>vatrate($line->localtax1_tx),
+			'line_up'=>price2num($line->subprice),
 			'line_up_locale'=>price($line->subprice, 0, $outputlangs),
 			'line_total_up'=>price2num($line->subprice * $line->qty),
 			'line_total_up_locale'=>price($line->subprice * $line->qty, 0, $outputlangs),
@@ -551,31 +605,31 @@ abstract class CommonDocGenerator
 			'line_price_ht_locale'=>price($line->total_ht, 0, $outputlangs),
 			'line_price_ttc_locale'=>price($line->total_ttc, 0, $outputlangs),
 			'line_price_vat_locale'=>price($line->total_tva, 0, $outputlangs),
-		    // Dates
+			// Dates
 			'line_date_start'=>dol_print_date($line->date_start, 'day'),
 			'line_date_start_locale'=>dol_print_date($line->date_start, 'day', 'tzserver', $outputlangs),
-		    'line_date_start_rfc'=>dol_print_date($line->date_start, 'dayrfc'),
-		    'line_date_end'=>dol_print_date($line->date_end, 'day'),
-		    'line_date_end_locale'=>dol_print_date($line->date_end, 'day', 'tzserver', $outputlangs),
-		    'line_date_end_rfc'=>dol_print_date($line->date_end, 'dayrfc'),
+			'line_date_start_rfc'=>dol_print_date($line->date_start, 'dayrfc'),
+			'line_date_end'=>dol_print_date($line->date_end, 'day'),
+			'line_date_end_locale'=>dol_print_date($line->date_end, 'day', 'tzserver', $outputlangs),
+			'line_date_end_rfc'=>dol_print_date($line->date_end, 'dayrfc'),
 
-		    'line_multicurrency_code' => price2num($line->multicurrency_code),
-		    'line_multicurrency_subprice' => price2num($line->multicurrency_subprice),
-		    'line_multicurrency_total_ht' => price2num($line->multicurrency_total_ht),
-		    'line_multicurrency_total_tva' => price2num($line->multicurrency_total_tva),
-		    'line_multicurrency_total_ttc' => price2num($line->multicurrency_total_ttc),
-		    'line_multicurrency_subprice_locale' => price($line->multicurrency_subprice, 0, $outputlangs),
-		    'line_multicurrency_total_ht_locale' => price($line->multicurrency_total_ht, 0, $outputlangs),
-		    'line_multicurrency_total_tva_locale' => price($line->multicurrency_total_tva, 0, $outputlangs),
-		    'line_multicurrency_total_ttc_locale' => price($line->multicurrency_total_ttc, 0, $outputlangs),
+			'line_multicurrency_code' => price2num($line->multicurrency_code),
+			'line_multicurrency_subprice' => price2num($line->multicurrency_subprice),
+			'line_multicurrency_total_ht' => price2num($line->multicurrency_total_ht),
+			'line_multicurrency_total_tva' => price2num($line->multicurrency_total_tva),
+			'line_multicurrency_total_ttc' => price2num($line->multicurrency_total_ttc),
+			'line_multicurrency_subprice_locale' => price($line->multicurrency_subprice, 0, $outputlangs),
+			'line_multicurrency_total_ht_locale' => price($line->multicurrency_total_ht, 0, $outputlangs),
+			'line_multicurrency_total_tva_locale' => price($line->multicurrency_total_tva, 0, $outputlangs),
+			'line_multicurrency_total_ttc_locale' => price($line->multicurrency_total_ttc, 0, $outputlangs),
 		);
 
-        // Units
-		if ($conf->global->PRODUCT_USE_UNITS)
+		// Units
+		if (!empty($conf->global->PRODUCT_USE_UNITS))
 		{
-		      $resarray['line_unit'] = $outputlangs->trans($line->getLabelOfUnit('long'));
-		      $resarray['line_unit_short'] = $outputlangs->trans($line->getLabelOfUnit('short'));
-        }
+			  $resarray['line_unit'] = $outputlangs->trans($line->getLabelOfUnit('long'));
+			  $resarray['line_unit_short'] = $outputlangs->trans($line->getLabelOfUnit('short'));
+		}
 
 		// Retrieve extrafields
 		$extrafieldkey = $line->table_element;
@@ -585,20 +639,20 @@ abstract class CommonDocGenerator
 		$extrafields->fetch_name_optionals_label($extrafieldkey, true);
 		$line->fetch_optionals();
 
-        $resarray = $this->fill_substitutionarray_with_extrafields($line, $resarray, $extrafields, $array_key, $outputlangs);
+		$resarray = $this->fill_substitutionarray_with_extrafields($line, $resarray, $extrafields, $array_key, $outputlangs);
 
-        // Check if the current line belongs to a supplier order
-        if (get_class($line) == 'CommandeFournisseurLigne')
-        {
-            // Add the product supplier extrafields to the substitutions
-            $extrafields->fetch_name_optionals_label("product_fournisseur_price");
-            $extralabels = $extrafields->attributes["product_fournisseur_price"]['label'];
+		// Check if the current line belongs to a supplier order
+		if (get_class($line) == 'CommandeFournisseurLigne')
+		{
+			// Add the product supplier extrafields to the substitutions
+			$extrafields->fetch_name_optionals_label("product_fournisseur_price");
+			$extralabels = $extrafields->attributes["product_fournisseur_price"]['label'];
 
 			if (!empty($extralabels) && is_array($extralabels))
 			{
 				$columns = "";
 
-				foreach ($extralabels as $key)
+				foreach ($extralabels as $key => $label)
 				{
 					$columns .= "$key, ";
 				}
@@ -612,14 +666,14 @@ abstract class CommonDocGenerator
 					{
 						$resql = $this->db->fetch_object($resql);
 
-						foreach ($extralabels as $key)
+						foreach ($extralabels as $key => $label)
 						{
 							$resarray['line_product_supplier_'.$key] = $resql->{$key};
 						}
 					}
 				}
 			}
-        }
+		}
 
 		// Load product data optional fields to the line -> enables to use "line_options_{extrafield}"
 		if (isset($line->fk_product) && $line->fk_product > 0)
@@ -633,158 +687,164 @@ abstract class CommonDocGenerator
 		return $resarray;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Define array with couple substitution key => substitution value
-     *
-     * @param   Expedition		$object             Main object to use as data source
-     * @param   Translate		$outputlangs        Lang object to use for output
-     * @param   array			$array_key	        Name of the key for return array
-     * @return	array								Array of substitution
-     */
-    public function get_substitutionarray_shipment($object, $outputlangs, $array_key = 'object')
-    {
-        // phpcs:enable
-    	global $conf, $extrafields;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Define array with couple substitution key => substitution value
+	 *
+	 * @param   Expedition		$object             Main object to use as data source
+	 * @param   Translate		$outputlangs        Lang object to use for output
+	 * @param   array			$array_key	        Name of the key for return array
+	 * @return	array								Array of substitution
+	 */
+	public function get_substitutionarray_shipment($object, $outputlangs, $array_key = 'object')
+	{
+		// phpcs:enable
+		global $conf, $extrafields;
 		dol_include_once('/core/lib/product.lib.php');
 		$object->list_delivery_methods($object->shipping_method_id);
 		$calculatedVolume = ($object->trueWidth * $object->trueHeight * $object->trueDepth);
 
-    	$array_shipment = array(
-	    	$array_key.'_id'=>$object->id,
-	    	$array_key.'_ref'=>$object->ref,
-	    	$array_key.'_ref_ext'=>$object->ref_ext,
-	    	$array_key.'_ref_customer'=>$object->ref_customer,
-	    	$array_key.'_date_delivery'=>dol_print_date($object->date_delivery, 'day'),
-	    	$array_key.'_hour_delivery'=>dol_print_date($object->date_delivery, 'hour'),
-	    	$array_key.'_date_creation'=>dol_print_date($object->date_creation, 'day'),
-	    	$array_key.'_total_ht'=>price($object->total_ht),
-	    	$array_key.'_total_vat'=>price($object->total_tva),
-	    	$array_key.'_total_ttc'=>price($object->total_ttc),
-	    	$array_key.'_total_discount_ht' => price($object->getTotalDiscount()),
-	    	$array_key.'_note_private'=>$object->note_private,
-	    	$array_key.'_note'=>$object->note_public,
-	    	$array_key.'_tracking_number'=>$object->tracking_number,
-	    	$array_key.'_tracking_url'=>$object->tracking_url,
-	    	$array_key.'_shipping_method'=>$object->listmeths[0]['libelle'],
-    		$array_key.'_weight'=>$object->trueWeight.' '.measuringUnitString(0, 'weight', $object->weight_units),
-    		$array_key.'_width'=>$object->trueWidth.' '.measuringUnitString(0, 'size', $object->width_units),
-    		$array_key.'_height'=>$object->trueHeight.' '.measuringUnitString(0, 'size', $object->height_units),
-    		$array_key.'_depth'=>$object->trueDepth.' '.measuringUnitString(0, 'size', $object->depth_units),
-	    	$array_key.'_size'=>$calculatedVolume.' '.measuringUnitString(0, 'volume'),
-    	);
+		$array_shipment = array(
+			$array_key.'_id'=>$object->id,
+			$array_key.'_ref'=>$object->ref,
+			$array_key.'_ref_ext'=>$object->ref_ext,
+			$array_key.'_ref_customer'=>$object->ref_customer,
+			$array_key.'_date_delivery'=>dol_print_date($object->date_delivery, 'day'),
+			$array_key.'_hour_delivery'=>dol_print_date($object->date_delivery, 'hour'),
+			$array_key.'_date_creation'=>dol_print_date($object->date_creation, 'day'),
+			$array_key.'_total_ht'=>price($object->total_ht),
+			$array_key.'_total_vat'=>price($object->total_tva),
+			$array_key.'_total_ttc'=>price($object->total_ttc),
+			$array_key.'_total_discount_ht' => price($object->getTotalDiscount()),
+			$array_key.'_note_private'=>$object->note_private,
+			$array_key.'_note'=>$object->note_public,
+			$array_key.'_tracking_number'=>$object->tracking_number,
+			$array_key.'_tracking_url'=>$object->tracking_url,
+			$array_key.'_shipping_method'=>$object->listmeths[0]['libelle'],
+			$array_key.'_weight'=>$object->trueWeight.' '.measuringUnitString(0, 'weight', $object->weight_units),
+			$array_key.'_width'=>$object->trueWidth.' '.measuringUnitString(0, 'size', $object->width_units),
+			$array_key.'_height'=>$object->trueHeight.' '.measuringUnitString(0, 'size', $object->height_units),
+			$array_key.'_depth'=>$object->trueDepth.' '.measuringUnitString(0, 'size', $object->depth_units),
+			$array_key.'_size'=>$calculatedVolume.' '.measuringUnitString(0, 'volume'),
+		);
 
-    	// Add vat by rates
-    	foreach ($object->lines as $line)
-    	{
-    		if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) $array_shipment[$array_key.'_total_vat_'.$line->tva_tx] = 0;
-    		$array_shipment[$array_key.'_total_vat_'.$line->tva_tx] += $line->total_tva;
-    	}
+		// Add vat by rates
+		foreach ($object->lines as $line)
+		{
+			if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) $array_shipment[$array_key.'_total_vat_'.$line->tva_tx] = 0;
+			$array_shipment[$array_key.'_total_vat_'.$line->tva_tx] += $line->total_tva;
+		}
 
-	    // Retrieve extrafields
-	    if (is_array($object->array_options) && count($object->array_options))
-	    {
-		    $object->fetch_optionals();
+		// Retrieve extrafields
+		if (is_array($object->array_options) && count($object->array_options))
+		{
+			$object->fetch_optionals();
 
-		    $array_shipment = $this->fill_substitutionarray_with_extrafields($object, $array_shipment, $extrafields, $array_key, $outputlangs);
-	    }
+			$array_shipment = $this->fill_substitutionarray_with_extrafields($object, $array_shipment, $extrafields, $array_key, $outputlangs);
+		}
 
-    	return $array_shipment;
-    }
+		// Add infor from $object->xxx where xxx has been loaded by fetch_origin() of shipment
+		if (!empty($object->commande) && is_object($object->commande)) {
+			$array_shipment['order_ref'] = $object->commande->ref;
+			$array_shipment['order_ref_customer'] = $object->commande->ref_customer;
+		}
+
+		return $array_shipment;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Define array with couple substitution key => substitution value
-     *
-     *	@param  ExpeditionLigne	$line				Object line
-     *	@param  Translate		$outputlangs        Lang object to use for output
-     *	@return	array								Substitution array
-     */
-    public function get_substitutionarray_shipment_lines($line, $outputlangs)
-    {
-        // phpcs:enable
-        global $conf;
-        dol_include_once('/core/lib/product.lib.php');
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Define array with couple substitution key => substitution value
+	 *
+	 *	@param  ExpeditionLigne	$line				Object line
+	 *	@param  Translate		$outputlangs        Lang object to use for output
+	 *	@return	array								Substitution array
+	 */
+	public function get_substitutionarray_shipment_lines($line, $outputlangs)
+	{
+		// phpcs:enable
+		global $conf;
+		dol_include_once('/core/lib/product.lib.php');
 
-        $resarray = array(
-	    	'line_fulldesc'=>doc_getlinedesc($line, $outputlangs),
-	    	'line_product_ref'=>$line->product_ref,
-	    	'line_product_label'=>$line->product_label,
-	    	'line_desc'=>$line->desc,
-	    	'line_vatrate'=>vatrate($line->tva_tx, true, $line->info_bits),
-	    	'line_up'=>price($line->subprice),
-            'line_total_up'=>price($line->subprice * $line->qty),
-	    	'line_qty'=>$line->qty,
-	    	'line_qty_shipped'=>$line->qty_shipped,
-	    	'line_qty_asked'=>$line->qty_asked,
-	    	'line_discount_percent'=>($line->remise_percent ? $line->remise_percent.'%' : ''),
-	    	'line_price_ht'=>price($line->total_ht),
-	    	'line_price_ttc'=>price($line->total_ttc),
-	    	'line_price_vat'=>price($line->total_tva),
-        	'line_weight'=>empty($line->weight) ? '' : $line->weight * $line->qty_shipped.' '.measuringUnitString(0, 'weight', $line->weight_units),
-        	'line_length'=>empty($line->length) ? '' : $line->length * $line->qty_shipped.' '.measuringUnitString(0, 'size', $line->length_units),
-        	'line_surface'=>empty($line->surface) ? '' : $line->surface * $line->qty_shipped.' '.measuringUnitString(0, 'surface', $line->surface_units),
-        	'line_volume'=>empty($line->volume) ? '' : $line->volume * $line->qty_shipped.' '.measuringUnitString(0, 'volume', $line->volume_units),
-    	);
+		$resarray = array(
+			'line_fulldesc'=>doc_getlinedesc($line, $outputlangs),
+			'line_product_ref'=>$line->product_ref,
+			'line_product_label'=>$line->product_label,
+			'line_desc'=>$line->desc,
+			'line_vatrate'=>vatrate($line->tva_tx, true, $line->info_bits),
+			'line_up'=>price($line->subprice),
+			'line_total_up'=>price($line->subprice * $line->qty),
+			'line_qty'=>$line->qty,
+			'line_qty_shipped'=>$line->qty_shipped,
+			'line_qty_asked'=>$line->qty_asked,
+			'line_discount_percent'=>($line->remise_percent ? $line->remise_percent.'%' : ''),
+			'line_price_ht'=>price($line->total_ht),
+			'line_price_ttc'=>price($line->total_ttc),
+			'line_price_vat'=>price($line->total_tva),
+			'line_weight'=>empty($line->weight) ? '' : $line->weight * $line->qty_shipped.' '.measuringUnitString(0, 'weight', $line->weight_units),
+			'line_length'=>empty($line->length) ? '' : $line->length * $line->qty_shipped.' '.measuringUnitString(0, 'size', $line->length_units),
+			'line_surface'=>empty($line->surface) ? '' : $line->surface * $line->qty_shipped.' '.measuringUnitString(0, 'surface', $line->surface_units),
+			'line_volume'=>empty($line->volume) ? '' : $line->volume * $line->qty_shipped.' '.measuringUnitString(0, 'volume', $line->volume_units),
+		);
 
-        // Retrieve extrafields
-        $extrafieldkey = $line->element;
-        $array_key = "line";
-        require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-        $extrafields = new ExtraFields($this->db);
-        $extrafields->fetch_name_optionals_label($extrafieldkey, true);
-        $line->fetch_optionals();
+		// Retrieve extrafields
+		$extrafieldkey = $line->element;
+		$array_key = "line";
+		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+		$extrafields = new ExtraFields($this->db);
+		$extrafields->fetch_name_optionals_label($extrafieldkey, true);
+		$line->fetch_optionals();
 
-        $resarray = $this->fill_substitutionarray_with_extrafields($line, $resarray, $extrafields, $array_key, $outputlangs);
+		$resarray = $this->fill_substitutionarray_with_extrafields($line, $resarray, $extrafields, $array_key, $outputlangs);
 
-        return $resarray;
-    }
+		return $resarray;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Define array with couple substitution key => substitution value
-     *
-     * @param   Object		$object    		Dolibarr Object
-     * @param   Translate	$outputlangs    Language object for output
-     * @param   boolean		$recursive    	Want to fetch child array or child object
-     * @return	array						Array of substitution key->code
-     */
-    public function get_substitutionarray_each_var_object(&$object, $outputlangs, $recursive = true)
-    {
-        // phpcs:enable
-        $array_other = array();
-        if (!empty($object)) {
-            foreach ($object as $key => $value) {
-                if (!empty($value)) {
-                    if (!is_array($value) && !is_object($value)) {
-                        $array_other['object_'.$key] = $value;
-                    }
-                    if (is_array($value) && $recursive) {
-                        $array_other['object_'.$key] = $this->get_substitutionarray_each_var_object($value, $outputlangs, false);
-                    }
-                }
-            }
-        }
-        return $array_other;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Define array with couple substitution key => substitution value
+	 *
+	 * @param   Object		$object    		Dolibarr Object
+	 * @param   Translate	$outputlangs    Language object for output
+	 * @param   boolean		$recursive    	Want to fetch child array or child object
+	 * @return	array						Array of substitution key->code
+	 */
+	public function get_substitutionarray_each_var_object(&$object, $outputlangs, $recursive = true)
+	{
+		// phpcs:enable
+		$array_other = array();
+		if (!empty($object)) {
+			foreach ($object as $key => $value) {
+				if (!empty($value)) {
+					if (!is_array($value) && !is_object($value)) {
+						$array_other['object_'.$key] = $value;
+					}
+					if (is_array($value) && $recursive) {
+						$array_other['object_'.$key] = $this->get_substitutionarray_each_var_object($value, $outputlangs, false);
+					}
+				}
+			}
+		}
+		return $array_other;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Fill array with couple extrafield key => extrafield value
-     *
-     *	@param  Object			$object				Object with extrafields (must have $object->array_options filled)
-     *	@param  array			$array_to_fill      Substitution array
-     *  @param  Extrafields		$extrafields        Extrafields object
-     *  @param  string			$array_key	        Prefix for name of the keys into returned array
-     *  @param  Translate		$outputlangs        Lang object to use for output
-     *	@return	array								Substitution array
-     */
-    public function fill_substitutionarray_with_extrafields($object, $array_to_fill, $extrafields, $array_key, $outputlangs)
-    {
-        // phpcs:enable
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Fill array with couple extrafield key => extrafield value
+	 *
+	 *	@param  Object			$object				Object with extrafields (must have $object->array_options filled)
+	 *	@param  array			$array_to_fill      Substitution array
+	 *  @param  Extrafields		$extrafields        Extrafields object
+	 *  @param  string			$array_key	        Prefix for name of the keys into returned array
+	 *  @param  Translate		$outputlangs        Lang object to use for output
+	 *	@return	array								Substitution array
+	 */
+	public function fill_substitutionarray_with_extrafields($object, $array_to_fill, $extrafields, $array_key, $outputlangs)
+	{
+		// phpcs:enable
 		global $conf;
 
 		if (is_array($extrafields->attributes[$object->table_element]['label'])) {
@@ -875,671 +935,671 @@ abstract class CommonDocGenerator
 	 * @param	int		$hidebottom		Hide bottom
 	 * @return	void
 	 */
-    public function printRect($pdf, $x, $y, $l, $h, $hidetop = 0, $hidebottom = 0)
-    {
-        if (empty($hidetop) || $hidetop == -1) $pdf->line($x, $y, $x + $l, $y);
-        $pdf->line($x + $l, $y, $x + $l, $y + $h);
-        if (empty($hidebottom)) $pdf->line($x + $l, $y + $h, $x, $y + $h);
-        $pdf->line($x, $y + $h, $x, $y);
-    }
-
-
-    /**
-     *  uasort callback function to Sort columns fields
-     *
-     *  @param	array			$a    			PDF lines array fields configs
-     *  @param	array			$b    			PDF lines array fields configs
-     *  @return	int								Return compare result
-     */
-    public function columnSort($a, $b)
-    {
-        if (empty($a['rank'])) { $a['rank'] = 0; }
-        if (empty($b['rank'])) { $b['rank'] = 0; }
-        if ($a['rank'] == $b['rank']) {
-            return 0;
-        }
-        return ($a['rank'] > $b['rank']) ? -1 : 1;
-    }
-
-    /**
-     *   	Prepare Array Column Field
-     *
-     *   	@param	object			$object				common object
-     *   	@param	Translate		$outputlangs		langs
-     *      @param	int				$hidedetails		Do not show line details
-     *      @param	int				$hidedesc			Do not show desc
-     *      @param	int				$hideref			Do not show ref
-     *      @return	null
-     */
-    public function prepareArrayColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
-    {
-        global $conf;
-
-        $this->defineColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
-
-
-        // Sorting
-        uasort($this->cols, array($this, 'columnSort'));
-
-        // Positionning
-        $curX = $this->page_largeur - $this->marge_droite; // start from right
-
-        // Array width
-        $arrayWidth = $this->page_largeur - $this->marge_droite - $this->marge_gauche;
-
-        // Count flexible column
-        $totalDefinedColWidth = 0;
-        $countFlexCol = 0;
-        foreach ($this->cols as $colKey =>& $colDef)
-        {
-            if (!$this->getColumnStatus($colKey)) continue; // continue if disabled
-
-            if (!empty($colDef['scale'])) {
-                // In case of column width is defined by percentage
-                $colDef['width'] = abs($arrayWidth * $colDef['scale'] / 100);
-            }
-
-            if (empty($colDef['width'])) {
-                $countFlexCol++;
-            } else {
-                $totalDefinedColWidth += $colDef['width'];
-            }
-        }
-
-        foreach ($this->cols as $colKey =>& $colDef)
-        {
-            // setting empty conf with default
-            if (!empty($colDef['title'])) {
-                $colDef['title'] = array_replace($this->defaultTitlesFieldsStyle, $colDef['title']);
-            } else {
-                $colDef['title'] = $this->defaultTitlesFieldsStyle;
-            }
-
-            // setting empty conf with default
-            if (!empty($colDef['content'])) {
-                $colDef['content'] = array_replace($this->defaultContentsFieldsStyle, $colDef['content']);
-            } else {
-                $colDef['content'] = $this->defaultContentsFieldsStyle;
-            }
-
-            if ($this->getColumnStatus($colKey))
-            {
-                // In case of flexible column
-                if (empty($colDef['width'])) {
-                    $colDef['width'] = abs(($arrayWidth - $totalDefinedColWidth)) / $countFlexCol;
-                }
-
-                // Set positions
-                $lastX = $curX;
-                $curX = $lastX - $colDef['width'];
-                $colDef['xStartPos'] = $curX;
-                $colDef['xEndPos']   = $lastX;
-            }
-        }
-    }
-
-    /**
-     *  get column content width from column key
-     *
-     *  @param	string      $colKey     the column key
-     *  @return	float                   width in mm
-     */
-    public function getColumnContentWidth($colKey)
-    {
-        $colDef = $this->cols[$colKey];
-        return  $colDef['width'] - $colDef['content']['padding'][3] - $colDef['content']['padding'][1];
-    }
-
-
-    /**
-     *  get column content X (abscissa) left position from column key
-     *
-     *  @param	string    $colKey    		the column key
-     *  @return	float      X position in mm
-     */
-    public function getColumnContentXStart($colKey)
-    {
-        $colDef = $this->cols[$colKey];
-        return  $colDef['xStartPos'] + $colDef['content']['padding'][3];
-    }
-
-    /**
-     *   	get column position rank from column key
-     *
-     *   	@param	string		$colKey    		the column key
-     *      @return	int         rank on success and -1 on error
-     */
-    public function getColumnRank($colKey)
-    {
-        if (!isset($this->cols[$colKey]['rank'])) return -1;
-        return  $this->cols[$colKey]['rank'];
-    }
-
-    /**
-     *  get column position rank from column key
-     *
-     *  @param	string		$newColKey    	the new column key
-     *  @param	array		$defArray    	a single column definition array
-     *  @param	string		$targetCol    	target column used to place the new column beside
-     *  @param	bool		$insertAfterTarget    	insert before or after target column ?
-     *  @return	int         new rank on success and -1 on error
-     */
-    public function insertNewColumnDef($newColKey, $defArray, $targetCol = false, $insertAfterTarget = false)
-    {
-        // prepare wanted rank
-        $rank = -1;
-
-        // try to get rank from target column
-        if (!empty($targetCol)) {
-            $rank = $this->getColumnRank($targetCol);
-            if ($rank >= 0 && $insertAfterTarget) { $rank++; }
-        }
-
-        // get rank from new column definition
-        if ($rank < 0 && !empty($defArray['rank'])) {
-            $rank = $defArray['rank'];
-        }
-
-        // error: no rank
-        if ($rank < 0) { return -1; }
-
-        foreach ($this->cols as $colKey =>& $colDef)
-        {
-            if ($rank <= $colDef['rank'])
-            {
-                $colDef['rank'] = $colDef['rank'] + 1;
-            }
-        }
-
-        $defArray['rank'] = $rank;
-        $this->cols[$newColKey] = $defArray; // array_replace is used to preserve keys
-
-        return $rank;
-    }
-
-
-    /**
-     *  print standard column content
-     *
-     *  @param	TCPDF		    $pdf    	pdf object
-     *  @param	float		$curY    	curent Y position
-     *  @param	string		$colKey    	the column key
-     *  @param	string		$columnText   column text
-     *  @return	null
-     */
-    public function printStdColumnContent($pdf, &$curY, $colKey, $columnText = '')
-    {
-        global $hookmanager;
-
-        $parameters = array(
-            'curY' => &$curY,
-            'columnText' => $columnText,
-            'colKey' => $colKey,
-            'pdf' => &$pdf,
-        );
-        $reshook = $hookmanager->executeHooks('printStdColumnContent', $parameters, $this); // Note that $action and $object may have been modified by hook
-        if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-        if (!$reshook)
-        {
-            if (empty($columnText)) return;
-            $pdf->SetXY($this->getColumnContentXStart($colKey), $curY); // Set curent position
-            $colDef = $this->cols[$colKey];
-            // save curent cell padding
-			$curentCellPaddinds = $pdf->getCellPaddings();
-            // set cell padding with column content definition
-			$pdf->setCellPaddings($colDef['content']['padding'][3], $colDef['content']['padding'][0], $colDef['content']['padding'][1], $colDef['content']['padding'][2]);
-            $pdf->writeHTMLCell($colDef['width'], 2, $colDef['xStartPos'], $curY, $columnText, 0, 1, 0, true, $colDef['content']['align']);
-
-            // restore cell padding
-			$pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);
-        }
-    }
-
-
-    /**
-     *  print description column content
-     *
-     *  @param	TCPDF		$pdf    	pdf object
-     *  @param	float		$curY    	curent Y position
-     *  @param	string		$colKey    	the column key
-     *  @param  object      $object CommonObject
-     *  @param  int         $i  the $object->lines array key
-     *  @param  Translate $outputlangs    Output language
-     *  @param  int $hideref hide ref
-     *  @param  int $hidedesc hide desc
-     *  @param  int $issupplierline if object need supplier product
-     *  @return null
-     */
-    public function printColDescContent($pdf, &$curY, $colKey, $object, $i, $outputlangs, $hideref = 0, $hidedesc = 0, $issupplierline = 0)
+	public function printRect($pdf, $x, $y, $l, $h, $hidetop = 0, $hidebottom = 0)
 	{
-        // load desc col params
-        $colDef = $this->cols[$colKey];
-        // save curent cell padding
-        $curentCellPaddinds = $pdf->getCellPaddings();
-        // set cell padding with column content definition
-        $pdf->setCellPaddings($colDef['content']['padding'][3], $colDef['content']['padding'][0], $colDef['content']['padding'][1], $colDef['content']['padding'][2]);
-
-        // line description
-        pdf_writelinedesc($pdf, $object, $i, $outputlangs, $colDef['width'], 3, $colDef['xStartPos'], $curY, $hideref, $hidedesc, $issupplierline);
-        $posYAfterDescription = $pdf->GetY() - $colDef['content']['padding'][0];
-
-        // restore cell padding
-        $pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);
-
-        // Display extrafield if needed
-        $params = array(
-            'display'         => 'list',
-            'printableEnable' => array(3),
-            'printableEnableNotEmpty' => array(4)
-        );
-        $extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);
-        if (!empty($extrafieldDesc)) {
-            $this->printStdColumnContent($pdf, $posYAfterDescription, $colKey, $extrafieldDesc);
-        }
-    }
-
-    /**
-     *  get extrafield content for pdf writeHtmlCell compatibility
-     *  usage for PDF line columns and object note block
-     *
-     *  @param	object		$object     common object
-     *  @param	string		$extrafieldKey    	the extrafield key
-     *  @return	string
-     */
-    public function getExtrafieldContent($object, $extrafieldKey)
-    {
-        global $hookmanager;
-
-        if (empty($object->table_element)) { return; }
-
-        $extrafieldsKeyPrefix = "options_";
-
-        // Cleanup extrafield key to remove prefix if present
-        $pos = strpos($extrafieldKey, $extrafieldsKeyPrefix);
-        if ($pos === 0) {
-            $extrafieldKey = substr($extrafieldKey, strlen($extrafieldsKeyPrefix));
-        }
-
-        $extrafieldOptionsKey = $extrafieldsKeyPrefix.$extrafieldKey;
+		if (empty($hidetop) || $hidetop == -1) $pdf->line($x, $y, $x + $l, $y);
+		$pdf->line($x + $l, $y, $x + $l, $y + $h);
+		if (empty($hidebottom)) $pdf->line($x + $l, $y + $h, $x, $y + $h);
+		$pdf->line($x, $y + $h, $x, $y);
+	}
 
 
-        // Load extrafiels if not allready does
-        if (empty($this->extrafieldsCache)) { $this->extrafieldsCache = new ExtraFields($this->db); }
-        if (empty($this->extrafieldsCache->attributes[$object->table_element])) { $this->extrafieldsCache->fetch_name_optionals_label($object->table_element); }
-        $extrafields = $this->extrafieldsCache;
+	/**
+	 *  uasort callback function to Sort columns fields
+	 *
+	 *  @param	array			$a    			PDF lines array fields configs
+	 *  @param	array			$b    			PDF lines array fields configs
+	 *  @return	int								Return compare result
+	 */
+	public function columnSort($a, $b)
+	{
+		if (empty($a['rank'])) { $a['rank'] = 0; }
+		if (empty($b['rank'])) { $b['rank'] = 0; }
+		if ($a['rank'] == $b['rank']) {
+			return 0;
+		}
+		return ($a['rank'] > $b['rank']) ? -1 : 1;
+	}
 
-        $extrafieldOutputContent = $extrafields->showOutputField($extrafieldKey, $object->array_options[$extrafieldOptionsKey], '', $object->table_element);
+	/**
+	 *   	Prepare Array Column Field
+	 *
+	 *   	@param	object			$object				common object
+	 *   	@param	Translate		$outputlangs		langs
+	 *      @param	int				$hidedetails		Do not show line details
+	 *      @param	int				$hidedesc			Do not show desc
+	 *      @param	int				$hideref			Do not show ref
+	 *      @return	null
+	 */
+	public function prepareArrayColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		global $conf;
 
-        // TODO : allow showOutputField to be pdf public friendly, ex: in a link to object, clean getNomUrl to remove link and images... like a getName methode ...
-        if ($extrafields->attributes[$object->table_element]['type'][$extrafieldKey] == 'link') {
-            // for lack of anything better we cleanup all html tags
-            $extrafieldOutputContent = dol_string_nohtmltag($extrafieldOutputContent);
-        }
-
-        $parameters = array(
-            'object' => $object,
-            'extrafields' => $extrafields,
-            'extrafieldKey' => $extrafieldKey,
-            'extrafieldOutputContent' =>& $extrafieldOutputContent
-        );
-        $reshook = $hookmanager->executeHooks('getPDFExtrafieldContent', $parameters, $this); // Note that $action and $object may have been modified by hook
-        if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-        if ($reshook)
-        {
-            $extrafieldOutputContent = $hookmanager->resPrint;
-        }
-
-        return $extrafieldOutputContent;
-    }
+		$this->defineColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
 
-    /**
-     *  display extrafields columns content
-     *
-     *  @param	object		$object    	line of common object
-     *  @param Translate $outputlangs    Output language
-     *  @param array $params    array of additionals parameters
-     *  @return	double  max y value
-     */
-    public function getExtrafieldsInHtml($object, $outputlangs, $params = array())
-    {
-        global $hookmanager;
+		// Sorting
+		uasort($this->cols, array($this, 'columnSort'));
 
-        if (empty($object->table_element)) {
-            return;
-        }
+		// Positionning
+		$curX = $this->page_largeur - $this->marge_droite; // start from right
 
-        // Load extrafiels if not allready does
-        if (empty($this->extrafieldsCache)) { $this->extrafieldsCache = new ExtraFields($this->db); }
-        if (empty($this->extrafieldsCache->attributes[$object->table_element])) { $this->extrafieldsCache->fetch_name_optionals_label($object->table_element); }
-        $extrafields = $this->extrafieldsCache;
+		// Array width
+		$arrayWidth = $this->page_largeur - $this->marge_droite - $this->marge_gauche;
 
-        $defaultParams = array(
-            'style'         => '',
-            'display'         => 'auto', // auto, table, list
-            'printableEnable' => array(1),
-            'printableEnableNotEmpty' => array(2),
+		// Count flexible column
+		$totalDefinedColWidth = 0;
+		$countFlexCol = 0;
+		foreach ($this->cols as $colKey =>& $colDef)
+		{
+			if (!$this->getColumnStatus($colKey)) continue; // continue if disabled
 
-            'table'         => array(
-                'maxItemsInRow' => 2,
-                'cellspacing'   => 0,
-                'cellpadding'   => 0,
-                'border'        => 0,
-                'labelcolwidth' => '25%',
-                'arrayOfLineBreakType' => array('text', 'html')
-            ),
+			if (!empty($colDef['scale'])) {
+				// In case of column width is defined by percentage
+				$colDef['width'] = abs($arrayWidth * $colDef['scale'] / 100);
+			}
 
-            'list'         => array(
-                'separator' => '<br/>'
-            ),
+			if (empty($colDef['width'])) {
+				$countFlexCol++;
+			} else {
+				$totalDefinedColWidth += $colDef['width'];
+			}
+		}
 
-            'auto'         => array(
-                'list' => 0, // 0 for default
-                'table' => 4 // if there more than x extrafield to display
-            ),
-        );
+		foreach ($this->cols as $colKey =>& $colDef)
+		{
+			// setting empty conf with default
+			if (!empty($colDef['title'])) {
+				$colDef['title'] = array_replace($this->defaultTitlesFieldsStyle, $colDef['title']);
+			} else {
+				$colDef['title'] = $this->defaultTitlesFieldsStyle;
+			}
 
-        $params = $params + $defaultParams;
+			// setting empty conf with default
+			if (!empty($colDef['content'])) {
+				$colDef['content'] = array_replace($this->defaultContentsFieldsStyle, $colDef['content']);
+			} else {
+				$colDef['content'] = $this->defaultContentsFieldsStyle;
+			}
+
+			if ($this->getColumnStatus($colKey))
+			{
+				// In case of flexible column
+				if (empty($colDef['width'])) {
+					$colDef['width'] = abs(($arrayWidth - $totalDefinedColWidth)) / $countFlexCol;
+				}
+
+				// Set positions
+				$lastX = $curX;
+				$curX = $lastX - $colDef['width'];
+				$colDef['xStartPos'] = $curX;
+				$colDef['xEndPos']   = $lastX;
+			}
+		}
+	}
+
+	/**
+	 *  get column content width from column key
+	 *
+	 *  @param	string      $colKey     the column key
+	 *  @return	float                   width in mm
+	 */
+	public function getColumnContentWidth($colKey)
+	{
+		$colDef = $this->cols[$colKey];
+		return  $colDef['width'] - $colDef['content']['padding'][3] - $colDef['content']['padding'][1];
+	}
 
 
-        /**
-         * @var $extrafields ExtraFields
-         */
+	/**
+	 *  get column content X (abscissa) left position from column key
+	 *
+	 *  @param	string    $colKey    		the column key
+	 *  @return	float      X position in mm
+	 */
+	public function getColumnContentXStart($colKey)
+	{
+		$colDef = $this->cols[$colKey];
+		return  $colDef['xStartPos'] + $colDef['content']['padding'][3];
+	}
 
-        $html = '';
-        $fields = array();
+	/**
+	 *   	get column position rank from column key
+	 *
+	 *   	@param	string		$colKey    		the column key
+	 *      @return	int         rank on success and -1 on error
+	 */
+	public function getColumnRank($colKey)
+	{
+		if (!isset($this->cols[$colKey]['rank'])) return -1;
+		return  $this->cols[$colKey]['rank'];
+	}
 
-        if (is_array($extrafields->attributes[$object->table_element]['label'])) {
-            foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)
-            {
-                // Enable extrafield ?
-                $enabled = 0;
-                $disableOnEmpty = 0;
-                if (!empty($extrafields->attributes[$object->table_element]['printable'][$key])) {
-                    $printable = intval($extrafields->attributes[$object->table_element]['printable'][$key]);
-                    if (in_array($printable, $params['printableEnable']) || in_array($printable, $params['printableEnableNotEmpty'])) {
-                        $enabled = 1;
-                    }
+	/**
+	 *  get column position rank from column key
+	 *
+	 *  @param	string		$newColKey    	the new column key
+	 *  @param	array		$defArray    	a single column definition array
+	 *  @param	string		$targetCol    	target column used to place the new column beside
+	 *  @param	bool		$insertAfterTarget    	insert before or after target column ?
+	 *  @return	int         new rank on success and -1 on error
+	 */
+	public function insertNewColumnDef($newColKey, $defArray, $targetCol = false, $insertAfterTarget = false)
+	{
+		// prepare wanted rank
+		$rank = -1;
 
-                    if (in_array($printable, $params['printableEnableNotEmpty'])) {
-                        $disableOnEmpty = 1;
-                    }
-                }
+		// try to get rank from target column
+		if (!empty($targetCol)) {
+			$rank = $this->getColumnRank($targetCol);
+			if ($rank >= 0 && $insertAfterTarget) { $rank++; }
+		}
 
-                if (empty($enabled)) {
-                    continue;
-                }
+		// get rank from new column definition
+		if ($rank < 0 && !empty($defArray['rank'])) {
+			$rank = $defArray['rank'];
+		}
 
-                $field = new stdClass();
-                $field->rank = intval($extrafields->attributes[$object->table_element]['pos'][$key]);
-                $field->content = $this->getExtrafieldContent($object, $key);
-                $field->label = $outputlangs->transnoentities($label);
-                $field->type = $extrafields->attributes[$object->table_element]['type'][$key];
+		// error: no rank
+		if ($rank < 0) { return -1; }
 
-                // dont display if empty
-                if ($disableOnEmpty && empty($field->content)) {
-                    continue;
-                }
+		foreach ($this->cols as $colKey =>& $colDef)
+		{
+			if ($rank <= $colDef['rank'])
+			{
+				$colDef['rank'] = $colDef['rank'] + 1;
+			}
+		}
 
-                $fields[] = $field;
-            }
-        }
+		$defArray['rank'] = $rank;
+		$this->cols[$newColKey] = $defArray; // array_replace is used to preserve keys
 
-        if (!empty($fields))
-        {
-            // Sort extrafields by rank
-            uasort($fields, function ($a, $b) {
-                return  ($a->rank > $b->rank) ? 1 : -1;
+		return $rank;
+	}
+
+
+	/**
+	 *  print standard column content
+	 *
+	 *  @param	TCPDF		    $pdf    	pdf object
+	 *  @param	float		$curY    	curent Y position
+	 *  @param	string		$colKey    	the column key
+	 *  @param	string		$columnText   column text
+	 *  @return	null
+	 */
+	public function printStdColumnContent($pdf, &$curY, $colKey, $columnText = '')
+	{
+		global $hookmanager;
+
+		$parameters = array(
+			'curY' => &$curY,
+			'columnText' => $columnText,
+			'colKey' => $colKey,
+			'pdf' => &$pdf,
+		);
+		$reshook = $hookmanager->executeHooks('printStdColumnContent', $parameters, $this); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		if (!$reshook)
+		{
+			if (empty($columnText)) return;
+			$pdf->SetXY($this->getColumnContentXStart($colKey), $curY); // Set curent position
+			$colDef = $this->cols[$colKey];
+			// save curent cell padding
+			$curentCellPaddinds = $pdf->getCellPaddings();
+			// set cell padding with column content definition
+			$pdf->setCellPaddings($colDef['content']['padding'][3], $colDef['content']['padding'][0], $colDef['content']['padding'][1], $colDef['content']['padding'][2]);
+			$pdf->writeHTMLCell($colDef['width'], 2, $colDef['xStartPos'], $curY, $columnText, 0, 1, 0, true, $colDef['content']['align']);
+
+			// restore cell padding
+			$pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);
+		}
+	}
+
+
+	/**
+	 *  print description column content
+	 *
+	 *  @param	TCPDF		$pdf    	pdf object
+	 *  @param	float		$curY    	curent Y position
+	 *  @param	string		$colKey    	the column key
+	 *  @param  object      $object CommonObject
+	 *  @param  int         $i  the $object->lines array key
+	 *  @param  Translate $outputlangs    Output language
+	 *  @param  int $hideref hide ref
+	 *  @param  int $hidedesc hide desc
+	 *  @param  int $issupplierline if object need supplier product
+	 *  @return null
+	 */
+	public function printColDescContent($pdf, &$curY, $colKey, $object, $i, $outputlangs, $hideref = 0, $hidedesc = 0, $issupplierline = 0)
+	{
+		// load desc col params
+		$colDef = $this->cols[$colKey];
+		// save curent cell padding
+		$curentCellPaddinds = $pdf->getCellPaddings();
+		// set cell padding with column content definition
+		$pdf->setCellPaddings($colDef['content']['padding'][3], $colDef['content']['padding'][0], $colDef['content']['padding'][1], $colDef['content']['padding'][2]);
+
+		// line description
+		pdf_writelinedesc($pdf, $object, $i, $outputlangs, $colDef['width'], 3, $colDef['xStartPos'], $curY, $hideref, $hidedesc, $issupplierline);
+		$posYAfterDescription = $pdf->GetY() - $colDef['content']['padding'][0];
+
+		// restore cell padding
+		$pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);
+
+		// Display extrafield if needed
+		$params = array(
+			'display'         => 'list',
+			'printableEnable' => array(3),
+			'printableEnableNotEmpty' => array(4)
+		);
+		$extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);
+		if (!empty($extrafieldDesc)) {
+			$this->printStdColumnContent($pdf, $posYAfterDescription, $colKey, $extrafieldDesc);
+		}
+	}
+
+	/**
+	 *  get extrafield content for pdf writeHtmlCell compatibility
+	 *  usage for PDF line columns and object note block
+	 *
+	 *  @param	object		$object     common object
+	 *  @param	string		$extrafieldKey    	the extrafield key
+	 *  @return	string
+	 */
+	public function getExtrafieldContent($object, $extrafieldKey)
+	{
+		global $hookmanager;
+
+		if (empty($object->table_element)) { return; }
+
+		$extrafieldsKeyPrefix = "options_";
+
+		// Cleanup extrafield key to remove prefix if present
+		$pos = strpos($extrafieldKey, $extrafieldsKeyPrefix);
+		if ($pos === 0) {
+			$extrafieldKey = substr($extrafieldKey, strlen($extrafieldsKeyPrefix));
+		}
+
+		$extrafieldOptionsKey = $extrafieldsKeyPrefix.$extrafieldKey;
+
+
+		// Load extrafiels if not allready does
+		if (empty($this->extrafieldsCache)) { $this->extrafieldsCache = new ExtraFields($this->db); }
+		if (empty($this->extrafieldsCache->attributes[$object->table_element])) { $this->extrafieldsCache->fetch_name_optionals_label($object->table_element); }
+		$extrafields = $this->extrafieldsCache;
+
+		$extrafieldOutputContent = $extrafields->showOutputField($extrafieldKey, $object->array_options[$extrafieldOptionsKey], '', $object->table_element);
+
+		// TODO : allow showOutputField to be pdf public friendly, ex: in a link to object, clean getNomUrl to remove link and images... like a getName methode ...
+		if ($extrafields->attributes[$object->table_element]['type'][$extrafieldKey] == 'link') {
+			// for lack of anything better we cleanup all html tags
+			$extrafieldOutputContent = dol_string_nohtmltag($extrafieldOutputContent);
+		}
+
+		$parameters = array(
+			'object' => $object,
+			'extrafields' => $extrafields,
+			'extrafieldKey' => $extrafieldKey,
+			'extrafieldOutputContent' =>& $extrafieldOutputContent
+		);
+		$reshook = $hookmanager->executeHooks('getPDFExtrafieldContent', $parameters, $this); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		if ($reshook)
+		{
+			$extrafieldOutputContent = $hookmanager->resPrint;
+		}
+
+		return $extrafieldOutputContent;
+	}
+
+
+	/**
+	 *  display extrafields columns content
+	 *
+	 *  @param	object		$object    	line of common object
+	 *  @param Translate $outputlangs    Output language
+	 *  @param array $params    array of additionals parameters
+	 *  @return	double  max y value
+	 */
+	public function getExtrafieldsInHtml($object, $outputlangs, $params = array())
+	{
+		global $hookmanager;
+
+		if (empty($object->table_element)) {
+			return;
+		}
+
+		// Load extrafiels if not allready does
+		if (empty($this->extrafieldsCache)) { $this->extrafieldsCache = new ExtraFields($this->db); }
+		if (empty($this->extrafieldsCache->attributes[$object->table_element])) { $this->extrafieldsCache->fetch_name_optionals_label($object->table_element); }
+		$extrafields = $this->extrafieldsCache;
+
+		$defaultParams = array(
+			'style'         => '',
+			'display'         => 'auto', // auto, table, list
+			'printableEnable' => array(1),
+			'printableEnableNotEmpty' => array(2),
+
+			'table'         => array(
+				'maxItemsInRow' => 2,
+				'cellspacing'   => 0,
+				'cellpadding'   => 0,
+				'border'        => 0,
+				'labelcolwidth' => '25%',
+				'arrayOfLineBreakType' => array('text', 'html')
+			),
+
+			'list'         => array(
+				'separator' => '<br/>'
+			),
+
+			'auto'         => array(
+				'list' => 0, // 0 for default
+				'table' => 4 // if there more than x extrafield to display
+			),
+		);
+
+		$params = $params + $defaultParams;
+
+
+		/**
+		 * @var $extrafields ExtraFields
+		 */
+
+		$html = '';
+		$fields = array();
+
+		if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label'])) {
+			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)
+			{
+				// Enable extrafield ?
+				$enabled = 0;
+				$disableOnEmpty = 0;
+				if (!empty($extrafields->attributes[$object->table_element]['printable'][$key])) {
+					$printable = intval($extrafields->attributes[$object->table_element]['printable'][$key]);
+					if (in_array($printable, $params['printableEnable']) || in_array($printable, $params['printableEnableNotEmpty'])) {
+						$enabled = 1;
+					}
+
+					if (in_array($printable, $params['printableEnableNotEmpty'])) {
+						$disableOnEmpty = 1;
+					}
+				}
+
+				if (empty($enabled)) {
+					continue;
+				}
+
+				$field = new stdClass();
+				$field->rank = intval($extrafields->attributes[$object->table_element]['pos'][$key]);
+				$field->content = $this->getExtrafieldContent($object, $key);
+				$field->label = $outputlangs->transnoentities($label);
+				$field->type = $extrafields->attributes[$object->table_element]['type'][$key];
+
+				// dont display if empty
+				if ($disableOnEmpty && empty($field->content)) {
+					continue;
+				}
+
+				$fields[] = $field;
+			}
+		}
+
+		if (!empty($fields))
+		{
+			// Sort extrafields by rank
+			uasort($fields, function ($a, $b) {
+				return  ($a->rank > $b->rank) ? 1 : -1;
 			});
 
-            // define some HTML content with style
-            $html .= !empty($params['style']) ? '<style>'.$params['style'].'</style>' : '';
+			// define some HTML content with style
+			$html .= !empty($params['style']) ? '<style>'.$params['style'].'</style>' : '';
 
-            // auto select display format
-            if ($params['display'] == 'auto') {
-                $lastNnumbItems = 0;
-                foreach ($params['auto'] as $display => $numbItems) {
-                    if ($lastNnumbItems <= $numbItems && count($fields) > $numbItems) {
-                        $lastNnumbItems = $numbItems;
-                        $params['display'] = $display;
-                    }
-                }
-            }
+			// auto select display format
+			if ($params['display'] == 'auto') {
+				$lastNnumbItems = 0;
+				foreach ($params['auto'] as $display => $numbItems) {
+					if ($lastNnumbItems <= $numbItems && count($fields) > $numbItems) {
+						$lastNnumbItems = $numbItems;
+						$params['display'] = $display;
+					}
+				}
+			}
 
-            if ($params['display'] == 'list') {
-                // Display in list format
-                $i = 0;
-                foreach ($fields as $field) {
-                    $html .= !empty($i) ? $params['list']['separator'] : '';
-                    $html .= '<strong>'.$field->label.' : </strong>';
-                    $html .= $field->content;
-                    $i++;
-                }
-            } elseif ($params['display'] == 'table') {
-                // Display in table format
-                $html .= '<table class="extrafield-table" cellspacing="'.$params['table']['cellspacing'].'" cellpadding="'.$params['table']['cellpadding'].'" border="'.$params['table']['border'].'">';
+			if ($params['display'] == 'list') {
+				// Display in list format
+				$i = 0;
+				foreach ($fields as $field) {
+					$html .= !empty($i) ? $params['list']['separator'] : '';
+					$html .= '<strong>'.$field->label.' : </strong>';
+					$html .= $field->content;
+					$i++;
+				}
+			} elseif ($params['display'] == 'table') {
+				// Display in table format
+				$html .= '<table class="extrafield-table" cellspacing="'.$params['table']['cellspacing'].'" cellpadding="'.$params['table']['cellpadding'].'" border="'.$params['table']['border'].'">';
 
-                $html .= "<tr>";
-                $itemsInRow = 0;
-                $maxItemsInRow = $params['table']['maxItemsInRow'];
-                foreach ($fields as $field) {
-                    //$html.= !empty($html)?'<br/>':'';
-                    if ($itemsInRow >= $maxItemsInRow) {
-                        // start a new line
-                        $html .= "</tr><tr>";
-                        $itemsInRow = 0;
-                    }
+				$html .= "<tr>";
+				$itemsInRow = 0;
+				$maxItemsInRow = $params['table']['maxItemsInRow'];
+				foreach ($fields as $field) {
+					//$html.= !empty($html)?'<br/>':'';
+					if ($itemsInRow >= $maxItemsInRow) {
+						// start a new line
+						$html .= "</tr><tr>";
+						$itemsInRow = 0;
+					}
 
-                    // for some type we need line break
-                    if (in_array($field->type, $params['table']['arrayOfLineBreakType'])) {
-                        if ($itemsInRow > 0) {
-                            // close table row and empty cols
-                            for ($i = $itemsInRow; $i <= $maxItemsInRow; $i++) {
-                                $html .= "<td ></td><td></td>";
-                            }
-                            $html .= "</tr>";
+					// for some type we need line break
+					if (in_array($field->type, $params['table']['arrayOfLineBreakType'])) {
+						if ($itemsInRow > 0) {
+							// close table row and empty cols
+							for ($i = $itemsInRow; $i <= $maxItemsInRow; $i++) {
+								$html .= "<td></td><td></td>";
+							}
+							$html .= "</tr>";
 
-                            // start a new line
-                            $html .= "<tr>";
-                        }
+							// start a new line
+							$html .= "<tr>";
+						}
 
-                        $itemsInRow = $maxItemsInRow;
-                        $html .= '<td colspan="'.($maxItemsInRow * 2 - 1).'">';
-                        $html .= '<strong>'.$field->label.' :</strong> ';
-                        $html .= $field->content;
-                        $html .= "</td>";
-                    } else {
-                        $itemsInRow++;
-                        $html .= '<td width="'.$params['table']['labelcolwidth'].'" class="extrafield-label">';
-                        $html .= '<strong>'.$field->label.' :</strong>';
-                        $html .= "</td>";
+						$itemsInRow = $maxItemsInRow;
+						$html .= '<td colspan="'.($maxItemsInRow * 2 - 1).'">';
+						$html .= '<strong>'.$field->label.' :</strong> ';
+						$html .= $field->content;
+						$html .= "</td>";
+					} else {
+						$itemsInRow++;
+						$html .= '<td width="'.$params['table']['labelcolwidth'].'" class="extrafield-label">';
+						$html .= '<strong>'.$field->label.' :</strong>';
+						$html .= "</td>";
 
 
-                        $html .= '<td  class="extrafield-content">';
-                        $html .= $field->content;
-                        $html .= "</td>";
-                    }
-                }
-                $html .= "</tr>";
+						$html .= '<td  class="extrafield-content">';
+						$html .= $field->content;
+						$html .= "</td>";
+					}
+				}
+				$html .= "</tr>";
 
-                $html .= '</table>';
-            }
-        }
+				$html .= '</table>';
+			}
+		}
 
-        return $html;
-    }
+		return $html;
+	}
 
 
-    /**
-     *  get column status from column key
-     *
-     *  @param	string			$colKey    		the column key
-     *  @return	float      width in mm
-     */
-    public function getColumnStatus($colKey)
-    {
-        if (!empty($this->cols[$colKey]['status'])) {
-            return true;
-        } else return  false;
-    }
+	/**
+	 *  get column status from column key
+	 *
+	 *  @param	string			$colKey    		the column key
+	 *  @return	float      width in mm
+	 */
+	public function getColumnStatus($colKey)
+	{
+		if (!empty($this->cols[$colKey]['status'])) {
+			return true;
+		} else return  false;
+	}
 
-    /**
-     * Print standard column content
-     *
-     * @param TCPDI	    $pdf            Pdf object
-     * @param float     $tab_top        Tab top position
-     * @param float     $tab_height     Default tab height
-     * @param Translate $outputlangs    Output language
-     * @param int       $hidetop        Hide top
-     * @return float                    Height of col tab titles
-     */
-    public function pdfTabTitles(&$pdf, $tab_top, $tab_height, $outputlangs, $hidetop = 0)
-    {
-        global $hookmanager, $conf;
+	/**
+	 * Print standard column content
+	 *
+	 * @param TCPDI	    $pdf            Pdf object
+	 * @param float     $tab_top        Tab top position
+	 * @param float     $tab_height     Default tab height
+	 * @param Translate $outputlangs    Output language
+	 * @param int       $hidetop        Hide top
+	 * @return float                    Height of col tab titles
+	 */
+	public function pdfTabTitles(&$pdf, $tab_top, $tab_height, $outputlangs, $hidetop = 0)
+	{
+		global $hookmanager, $conf;
 
-        foreach ($this->cols as $colKey => $colDef) {
-            $parameters = array(
-                'colKey' => $colKey,
-                'pdf' => $pdf,
-                'outputlangs' => $outputlangs,
-                'tab_top' => $tab_top,
-                'tab_height' => $tab_height,
-                'hidetop' => $hidetop
-            );
+		foreach ($this->cols as $colKey => $colDef) {
+			$parameters = array(
+				'colKey' => $colKey,
+				'pdf' => $pdf,
+				'outputlangs' => $outputlangs,
+				'tab_top' => $tab_top,
+				'tab_height' => $tab_height,
+				'hidetop' => $hidetop
+			);
 
-            $reshook = $hookmanager->executeHooks('pdfTabTitles', $parameters, $this); // Note that $object may have been modified by hook
-            if ($reshook < 0) {
-                setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-            } elseif (empty($reshook)) {
-                if (!$this->getColumnStatus($colKey)) continue;
+			$reshook = $hookmanager->executeHooks('pdfTabTitles', $parameters, $this); // Note that $object may have been modified by hook
+			if ($reshook < 0) {
+				setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+			} elseif (empty($reshook)) {
+				if (!$this->getColumnStatus($colKey)) continue;
 
-                // get title label
-                $colDef['title']['label'] = !empty($colDef['title']['label']) ? $colDef['title']['label'] : $outputlangs->transnoentities($colDef['title']['textkey']);
+				// get title label
+				$colDef['title']['label'] = !empty($colDef['title']['label']) ? $colDef['title']['label'] : $outputlangs->transnoentities($colDef['title']['textkey']);
 
-                // Add column separator
-                if (!empty($colDef['border-left'])) {
-                    $pdf->line($colDef['xStartPos'], $tab_top, $colDef['xStartPos'], $tab_top + $tab_height);
-                }
+				// Add column separator
+				if (!empty($colDef['border-left'])) {
+					$pdf->line($colDef['xStartPos'], $tab_top, $colDef['xStartPos'], $tab_top + $tab_height);
+				}
 
-                if (empty($hidetop)) {
-                    // save curent cell padding
-                    $curentCellPaddinds = $pdf->getCellPaddings();
+				if (empty($hidetop)) {
+					// save curent cell padding
+					$curentCellPaddinds = $pdf->getCellPaddings();
 
-                    // Add space for lines (more if we need to show a second alternative language)
-                    global $outputlangsbis;
-                    if (is_object($outputlangsbis)) {
-                        // set cell padding with column title definition
-                        $pdf->setCellPaddings($colDef['title']['padding'][3], $colDef['title']['padding'][0], $colDef['title']['padding'][1], 0.5);
-                    } else {
-                        // set cell padding with column title definition
-                        $pdf->setCellPaddings($colDef['title']['padding'][3], $colDef['title']['padding'][0], $colDef['title']['padding'][1], $colDef['title']['padding'][2]);
-                    }
+					// Add space for lines (more if we need to show a second alternative language)
+					global $outputlangsbis;
+					if (is_object($outputlangsbis)) {
+						// set cell padding with column title definition
+						$pdf->setCellPaddings($colDef['title']['padding'][3], $colDef['title']['padding'][0], $colDef['title']['padding'][1], 0.5);
+					} else {
+						// set cell padding with column title definition
+						$pdf->setCellPaddings($colDef['title']['padding'][3], $colDef['title']['padding'][0], $colDef['title']['padding'][1], $colDef['title']['padding'][2]);
+					}
 
-                    $pdf->SetXY($colDef['xStartPos'], $tab_top);
-                    $textWidth = $colDef['width'];
-                    $pdf->MultiCell($textWidth, 2, $colDef['title']['label'], '', $colDef['title']['align']);
+					$pdf->SetXY($colDef['xStartPos'], $tab_top);
+					$textWidth = $colDef['width'];
+					$pdf->MultiCell($textWidth, 2, $colDef['title']['label'], '', $colDef['title']['align']);
 
-                    // Add variant of translation if $outputlangsbis is an object
-                    if (is_object($outputlangsbis) && trim($colDef['title']['label'])) {
-                        $pdf->setCellPaddings($colDef['title']['padding'][3], 0, $colDef['title']['padding'][1], $colDef['title']['padding'][2]);
-                    	$pdf->SetXY($colDef['xStartPos'], $pdf->GetY());
-                    	$textbis = $outputlangsbis->transnoentities($colDef['title']['textkey']);
-                    	$pdf->MultiCell($textWidth, 2, $textbis, '', $colDef['title']['align']);
-                    }
+					// Add variant of translation if $outputlangsbis is an object
+					if (is_object($outputlangsbis) && trim($colDef['title']['label'])) {
+						$pdf->setCellPaddings($colDef['title']['padding'][3], 0, $colDef['title']['padding'][1], $colDef['title']['padding'][2]);
+						$pdf->SetXY($colDef['xStartPos'], $pdf->GetY());
+						$textbis = $outputlangsbis->transnoentities($colDef['title']['textkey']);
+						$pdf->MultiCell($textWidth, 2, $textbis, '', $colDef['title']['align']);
+					}
 
-                    $this->tabTitleHeight = max($pdf->GetY() - $tab_top, $this->tabTitleHeight);
+					$this->tabTitleHeight = max($pdf->GetY() - $tab_top, $this->tabTitleHeight);
 
-                    // restore cell padding
-                    $pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);
-                }
-            }
-        }
+					// restore cell padding
+					$pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);
+				}
+			}
+		}
 
-        return $this->tabTitleHeight;
-    }
+		return $this->tabTitleHeight;
+	}
 
 
 
-    /**
-     *  Define Array Column Field for extrafields
-     *
-     *  @param	object			$object    		common object det
-     *  @param	Translate		$outputlangs    langs
-     *  @param	int			   $hidedetails		Do not show line details
-     *  @return	null
-     */
-    public function defineColumnExtrafield($object, $outputlangs, $hidedetails = 0)
-    {
-        global $conf;
+	/**
+	 *  Define Array Column Field for extrafields
+	 *
+	 *  @param	object			$object    		common object det
+	 *  @param	Translate		$outputlangs    langs
+	 *  @param	int			   $hidedetails		Do not show line details
+	 *  @return	null
+	 */
+	public function defineColumnExtrafield($object, $outputlangs, $hidedetails = 0)
+	{
+		global $conf;
 
-        if (!empty($hidedetails)) {
-            return;
-        }
+		if (!empty($hidedetails)) {
+			return;
+		}
 
-        if (empty($object->table_element)) {
-            return;
-        }
+		if (empty($object->table_element)) {
+			return;
+		}
 
-        // Load extrafiels if not allready does
-        if (empty($this->extrafieldsCache)) { $this->extrafieldsCache = new ExtraFields($this->db); }
-        if (empty($this->extrafieldsCache->attributes[$object->table_element])) { $this->extrafieldsCache->fetch_name_optionals_label($object->table_element); }
-        $extrafields = $this->extrafieldsCache;
+		// Load extrafiels if not allready does
+		if (empty($this->extrafieldsCache)) { $this->extrafieldsCache = new ExtraFields($this->db); }
+		if (empty($this->extrafieldsCache->attributes[$object->table_element])) { $this->extrafieldsCache->fetch_name_optionals_label($object->table_element); }
+		$extrafields = $this->extrafieldsCache;
 
 
-        if (!empty($extrafields->attributes[$object->table_element]) && is_array($extrafields->attributes[$object->table_element]['label'])) {
-            foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)
-            {
-                // Dont display separator yet even is set to be displayed (not compatible yet)
-                if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate')
-                {
-                    continue;
-                }
+		if (!empty($extrafields->attributes[$object->table_element]) && is_array($extrafields->attributes[$object->table_element]['label'])) {
+			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)
+			{
+				// Dont display separator yet even is set to be displayed (not compatible yet)
+				if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate')
+				{
+					continue;
+				}
 
-                // Enable extrafield ?
-                $enabled = 0;
-                if (!empty($extrafields->attributes[$object->table_element]['printable'][$key])) {
-                    $printable = intval($extrafields->attributes[$object->table_element]['printable'][$key]);
-                    if ($printable === 1 || $printable === 2) {
-                        $enabled = 1;
-                    }
-                    // Note : if $printable === 3 or 4 so, it's displayed after line description not in cols
-                }
+				// Enable extrafield ?
+				$enabled = 0;
+				if (!empty($extrafields->attributes[$object->table_element]['printable'][$key])) {
+					$printable = intval($extrafields->attributes[$object->table_element]['printable'][$key]);
+					if ($printable === 1 || $printable === 2) {
+						$enabled = 1;
+					}
+					// Note : if $printable === 3 or 4 so, it's displayed after line description not in cols
+				}
 
-                if (!$enabled) { continue; } // don't wast resourses if we don't need them...
+				if (!$enabled) { continue; } // don't wast resourses if we don't need them...
 
-                // Load language if required
-                if (!empty($extrafields->attributes[$object->table_element]['langfile'][$key])) $outputlangs->load($extrafields->attributes[$object->table_element]['langfile'][$key]);
+				// Load language if required
+				if (!empty($extrafields->attributes[$object->table_element]['langfile'][$key])) $outputlangs->load($extrafields->attributes[$object->table_element]['langfile'][$key]);
 
-                // TODO : add more extrafield customisation capacities for PDF like width, rank...
+				// TODO : add more extrafield customisation capacities for PDF like width, rank...
 
-                // set column definition
-                $def = array(
-                    'rank' => intval($extrafields->attributes[$object->table_element]['pos'][$key]),
-                    'width' => 25, // in mm
-                    'status' => boolval($enabled),
-                    'title' => array(
-                        'label' => $outputlangs->transnoentities($label)
-                    ),
-                    'content' => array(
-                        'align' => 'C'
-                    ),
-                    'border-left' => true, // add left line separator
-                );
+				// set column definition
+				$def = array(
+					'rank' => intval($extrafields->attributes[$object->table_element]['pos'][$key]),
+					'width' => 25, // in mm
+					'status' => boolval($enabled),
+					'title' => array(
+						'label' => $outputlangs->transnoentities($label)
+					),
+					'content' => array(
+						'align' => 'C'
+					),
+					'border-left' => true, // add left line separator
+				);
 
-                $alignTypeRight = array('double', 'int', 'price');
-                if (in_array($extrafields->attributes[$object->table_element]['type'][$key], $alignTypeRight)) {
-                    $def['content']['align'] = 'R';
-                }
+				$alignTypeRight = array('double', 'int', 'price');
+				if (in_array($extrafields->attributes[$object->table_element]['type'][$key], $alignTypeRight)) {
+					$def['content']['align'] = 'R';
+				}
 
-                $alignTypeLeft = array('text', 'html');
-                if (in_array($extrafields->attributes[$object->table_element]['type'][$key], $alignTypeLeft)) {
-                    $def['content']['align'] = 'L';
-                }
+				$alignTypeLeft = array('text', 'html');
+				if (in_array($extrafields->attributes[$object->table_element]['type'][$key], $alignTypeLeft)) {
+					$def['content']['align'] = 'L';
+				}
 
 
-                // for extrafields we use rank of extrafield to place it on PDF
-                $this->insertNewColumnDef("options_".$key, $def);
-            }
-        }
-    }
+				// for extrafields we use rank of extrafield to place it on PDF
+				$this->insertNewColumnDef("options_".$key, $def);
+			}
+		}
+	}
 }
diff --git a/htdocs/core/class/commonincoterm.class.php b/htdocs/core/class/commonincoterm.class.php
index b2d5491684e..f98f3aaabad 100644
--- a/htdocs/core/class/commonincoterm.class.php
+++ b/htdocs/core/class/commonincoterm.class.php
@@ -105,7 +105,7 @@ trait CommonIncoterm
 	 *
 	 *    @param	int		$id_incoterm     Id of incoterm to set or '' to remove
 	 * 	  @param 	string  $location		 location of incoterm
-	 *    @return	int     		<0 if KO, >0 if OK
+	 *    @return	int     				<0 if KO, >0 if OK
 	 */
 	public function setIncoterms($id_incoterm, $location)
 	{
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 98890744701..5c679848354 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -33,36 +33,36 @@ abstract class CommonInvoice extends CommonObject
 {
 	use CommonIncoterm;
 
-    /**
-     * Standard invoice
-     */
-    const TYPE_STANDARD = 0;
+	/**
+	 * Standard invoice
+	 */
+	const TYPE_STANDARD = 0;
 
-    /**
-     * Replacement invoice
-     */
-    const TYPE_REPLACEMENT = 1;
+	/**
+	 * Replacement invoice
+	 */
+	const TYPE_REPLACEMENT = 1;
 
-    /**
-     * Credit note invoice
-     */
-    const TYPE_CREDIT_NOTE = 2;
+	/**
+	 * Credit note invoice
+	 */
+	const TYPE_CREDIT_NOTE = 2;
 
-    /**
-     * Deposit invoice
-     */
-    const TYPE_DEPOSIT = 3;
+	/**
+	 * Deposit invoice
+	 */
+	const TYPE_DEPOSIT = 3;
 
-    /**
-     * Proforma invoice.
-     * @deprectad Remove this. A "proforma invoice" is an order with a look of invoice, not an invoice !
-     */
-    const TYPE_PROFORMA = 4;
+	/**
+	 * Proforma invoice.
+	 * @deprectad Remove this. A "proforma invoice" is an order with a look of invoice, not an invoice !
+	 */
+	const TYPE_PROFORMA = 4;
 
-    /**
-     * Situation invoice
-     */
-    const TYPE_SITUATION = 5;
+	/**
+	 * Situation invoice
+	 */
+	const TYPE_SITUATION = 5;
 
 	/**
 	 * Draft status
@@ -98,20 +98,20 @@ abstract class CommonInvoice extends CommonObject
 	 *  This does not include open direct debit requests.
 	 *
 	 *  @param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
-	 *	@return		double					Remain of amount to pay
+	 *	@return		float					Remain of amount to pay
 	 */
 	public function getRemainToPay($multicurrency = 0)
 	{
-	    $alreadypaid = 0;
-	    $alreadypaid += $this->getSommePaiement($multicurrency);
-	    $alreadypaid += $this->getSumDepositsUsed($multicurrency);
-	    $alreadypaid += $this->getSumCreditNotesUsed($multicurrency);
+		$alreadypaid = 0.0;
+		$alreadypaid += $this->getSommePaiement($multicurrency);
+		$alreadypaid += $this->getSumDepositsUsed($multicurrency);
+		$alreadypaid += $this->getSumCreditNotesUsed($multicurrency);
 
-	    $remaintopay = price2num($this->total_ttc - $alreadypaid, 'MT');
-	    if ($this->statut == self::STATUS_CLOSED && $this->close_code == 'discount_vat') {		// If invoice closed with discount for anticipated payment
-	    	$remaintopay = 0;
-	    }
-	    return $remaintopay;
+		$remaintopay = price2num($this->total_ttc - $alreadypaid, 'MT');
+		if ($this->statut == self::STATUS_CLOSED && $this->close_code == 'discount_vat') {		// If invoice closed with discount for anticipated payment
+			$remaintopay = 0.0;
+		}
+		return $remaintopay;
 	}
 
 	/**
@@ -119,7 +119,7 @@ abstract class CommonInvoice extends CommonObject
 	 *  Payments dones using discounts, credit notes, etc are not included.
 	 *
 	 *  @param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
-	 *	@return		int						Amount of payment already done, <0 if KO
+	 *	@return		float						Amount of payment already done, <0 if KO
 	 */
 	public function getSommePaiement($multicurrency = 0)
 	{
@@ -151,72 +151,69 @@ abstract class CommonInvoice extends CommonObject
 
 	/**
 	 *    	Return amount (with tax) of all deposits invoices used by invoice.
-     *      Should always be empty, except if option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is on (not recommended).
+	 *      Should always be empty, except if option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is on (not recommended).
 	 *
 	 * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
-	 *		@return		int						<0 if KO, Sum of deposits amount otherwise
+	 *		@return		float						<0 if KO, Sum of deposits amount otherwise
 	 */
 	public function getSumDepositsUsed($multicurrency = 0)
 	{
 		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
-	    {
-	        // TODO
-	        return 0;
-	    }
+		{
+			// TODO
+			return 0.0;
+		}
 
-	    require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
-	    $discountstatic = new DiscountAbsolute($this->db);
-	    $result = $discountstatic->getSumDepositsUsed($this, $multicurrency);
-	    if ($result >= 0)
-	    {
-	        return $result;
-	    } else {
-	        $this->error = $discountstatic->error;
-	        return -1;
-	    }
+		$discountstatic = new DiscountAbsolute($this->db);
+		$result = $discountstatic->getSumDepositsUsed($this, $multicurrency);
+		if ($result >= 0) {
+			return $result;
+		} else {
+			$this->error = $discountstatic->error;
+			return -1;
+		}
 	}
 
 	/**
 	 *    	Return amount (with tax) of all credit notes invoices + excess received used by invoice
 	 *
 	 * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
-	 *		@return		int						<0 if KO, Sum of credit notes and deposits amount otherwise
+	 *		@return		float						<0 if KO, Sum of credit notes and deposits amount otherwise
 	 */
 	public function getSumCreditNotesUsed($multicurrency = 0)
 	{
-	    require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
-	    $discountstatic = new DiscountAbsolute($this->db);
-	    $result = $discountstatic->getSumCreditNotesUsed($this, $multicurrency);
-	    if ($result >= 0)
-	    {
-	        return $result;
-	    } else {
-	        $this->error = $discountstatic->error;
-	        return -1;
-	    }
+		$discountstatic = new DiscountAbsolute($this->db);
+		$result = $discountstatic->getSumCreditNotesUsed($this, $multicurrency);
+		if ($result >= 0) {
+			return $result;
+		} else {
+			$this->error = $discountstatic->error;
+			return -1;
+		}
 	}
 
 	/**
 	 *    	Return amount (with tax) of all converted amount for this credit note
 	 *
 	 * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
-	 *		@return		int						<0 if KO, Sum of credit notes and deposits amount otherwise
+	 *		@return		float						<0 if KO, Sum of credit notes and deposits amount otherwise
 	 */
 	public function getSumFromThisCreditNotesNotUsed($multicurrency = 0)
 	{
-	    require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
-	    $discountstatic = new DiscountAbsolute($this->db);
-	    $result = $discountstatic->getSumFromThisCreditNotesNotUsed($this, $multicurrency);
-	    if ($result >= 0)
-	    {
-	        return $result;
-	    } else {
-	        $this->error = $discountstatic->error;
-	        return -1;
-	    }
+		$discountstatic = new DiscountAbsolute($this->db);
+		$result = $discountstatic->getSumFromThisCreditNotesNotUsed($this, $multicurrency);
+		if ($result >= 0) {
+			return $result;
+		} else {
+			$this->error = $discountstatic->error;
+			return -1;
+		}
 	}
 
 	/**
@@ -300,7 +297,7 @@ abstract class CommonInvoice extends CommonObject
 		$table2 = 'paiement';
 		$field = 'fk_facture';
 		$field2 = 'fk_paiement';
-		$field3=', p.ref_ext';
+		$field3 = ', p.ref_ext';
 		$sharedentity = 'facture';
 		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
 		{
@@ -308,7 +305,7 @@ abstract class CommonInvoice extends CommonObject
 			$table2 = 'paiementfourn';
 			$field = 'fk_facturefourn';
 			$field2 = 'fk_paiementfourn';
-			$field3='';
+			$field3 = '';
 			$sharedentity = 'facture_fourn';
 		}
 
@@ -330,11 +327,11 @@ abstract class CommonInvoice extends CommonObject
 			while ($i < $num)
 			{
 				$obj = $this->db->fetch_object($resql);
-				$tmp = array('amount'=>$obj->amount,'type'=>$obj->code, 'date'=>$obj->datep, 'num'=>$obj->num, 'ref'=>$obj->ref);
+				$tmp = array('amount'=>$obj->amount, 'type'=>$obj->code, 'date'=>$obj->datep, 'num'=>$obj->num, 'ref'=>$obj->ref);
 				if (!empty($field3)) {
-				    $tmp['ref_ext'] = $obj->ref_ext;
+					$tmp['ref_ext'] = $obj->ref_ext;
 				}
-				$retarray[]=$tmp;
+				$retarray[] = $tmp;
 				$i++;
 			}
 			$this->db->free($resql);
@@ -388,7 +385,7 @@ abstract class CommonInvoice extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return if an invoice can be deleted
 	 *	Rule is:
@@ -402,9 +399,9 @@ abstract class CommonInvoice extends CommonObject
 	 *
 	 *  @return    int         <=0 if no, >0 if yes
 	 */
-    public function is_erasable()
-    {
-        // phpcs:enable
+	public function is_erasable()
+	{
+		// phpcs:enable
 		global $conf;
 
 		// We check if invoice is a temporary number (PROVxxxx)
@@ -489,15 +486,15 @@ abstract class CommonInvoice extends CommonObject
 	 *
 	 *	@return     string        Label of type of invoice
 	 */
-    public function getLibType()
+	public function getLibType()
 	{
 		global $langs;
-        if ($this->type == CommonInvoice::TYPE_STANDARD) return $langs->trans("InvoiceStandard");
-        elseif ($this->type == CommonInvoice::TYPE_REPLACEMENT) return $langs->trans("InvoiceReplacement");
-        elseif ($this->type == CommonInvoice::TYPE_CREDIT_NOTE) return $langs->trans("InvoiceAvoir");
-        elseif ($this->type == CommonInvoice::TYPE_DEPOSIT) return $langs->trans("InvoiceDeposit");
-        elseif ($this->type == CommonInvoice::TYPE_PROFORMA) return $langs->trans("InvoiceProForma"); // Not used.
-        elseif ($this->type == CommonInvoice::TYPE_SITUATION) return $langs->trans("InvoiceSituation");
+		if ($this->type == CommonInvoice::TYPE_STANDARD) return $langs->trans("InvoiceStandard");
+		elseif ($this->type == CommonInvoice::TYPE_REPLACEMENT) return $langs->trans("InvoiceReplacement");
+		elseif ($this->type == CommonInvoice::TYPE_CREDIT_NOTE) return $langs->trans("InvoiceAvoir");
+		elseif ($this->type == CommonInvoice::TYPE_DEPOSIT) return $langs->trans("InvoiceDeposit");
+		elseif ($this->type == CommonInvoice::TYPE_PROFORMA) return $langs->trans("InvoiceProForma"); // Not used.
+		elseif ($this->type == CommonInvoice::TYPE_SITUATION) return $langs->trans("InvoiceSituation");
 		return $langs->trans("Unknown");
 	}
 
@@ -513,7 +510,7 @@ abstract class CommonInvoice extends CommonObject
 		return $this->LibStatut($this->paye, $this->statut, $mode, $alreadypaid, $this->type);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return label of a status
 	 *
@@ -521,57 +518,59 @@ abstract class CommonInvoice extends CommonObject
 	 *	@param      int		$status        	Id status
 	 *	@param      int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=long label + picto
 	 *	@param		integer	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, -1 otherwise)
-	 *	@param		int		$type			Type invoice
+	 *	@param		int		$type			Type invoice. If -1, we use $this->type
 	 *	@return     string        			Label of status
 	 */
-	public function LibStatut($paye, $status, $mode = 0, $alreadypaid = -1, $type = 0)
+	public function LibStatut($paye, $status, $mode = 0, $alreadypaid = -1, $type = -1)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$langs->load('bills');
 
+		if ($type == -1) $type = $this->type;
+
 		$statusType = 'status0';
 		$prefix = 'Short';
 		if (!$paye) {
-		    if ($status == 0) {
-		        $labelStatus = $langs->trans('BillStatusDraft');
-		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusDraft');
-		    } elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) {
-		        $labelStatus = $langs->trans('BillStatusClosedUnpaid');
-		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusClosedUnpaid');
-		        $statusType = 'status5';
-		    } elseif (($status == 3 || $status == 2) && $alreadypaid > 0) {
-		        $labelStatus = $langs->trans('BillStatusClosedPaidPartially');
-		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
-		        $statusType = 'status9';
-		    } elseif ($alreadypaid == 0) {
-		        $labelStatus = $langs->trans('BillStatusNotPaid');
-		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusNotPaid');
-		        $statusType = 'status1';
-		    } else {
-		        $labelStatus = $langs->trans('BillStatusStarted');
-		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusStarted');
-		        $statusType = 'status3';
-		    }
+			if ($status == 0) {
+				$labelStatus = $langs->transnoentitiesnoconv('BillStatusDraft');
+				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusDraft');
+			} elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) {
+				$labelStatus = $langs->transnoentitiesnoconv('BillStatusClosedUnpaid');
+				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusClosedUnpaid');
+				$statusType = 'status5';
+			} elseif (($status == 3 || $status == 2) && $alreadypaid > 0) {
+				$labelStatus = $langs->transnoentitiesnoconv('BillStatusClosedPaidPartially');
+				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusClosedPaidPartially');
+				$statusType = 'status9';
+			} elseif ($alreadypaid == 0) {
+				$labelStatus = $langs->transnoentitiesnoconv('BillStatusNotPaid');
+				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusNotPaid');
+				$statusType = 'status1';
+			} else {
+				$labelStatus = $langs->transnoentitiesnoconv('BillStatusStarted');
+				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusStarted');
+				$statusType = 'status3';
+			}
 		} else {
-		    $statusType = 'status6';
+			$statusType = 'status6';
 
-		    if ($type == self::TYPE_CREDIT_NOTE) {
-		        $labelStatus = $langs->trans('BillStatusPaidBackOrConverted'); // credit note
-		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted'); // credit note
-		    } elseif ($type == self::TYPE_DEPOSIT) {
-		        $labelStatus = $langs->trans('BillStatusConverted'); // deposit invoice
-		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusConverted'); // deposit invoice
-		    } else {
-		        $labelStatus = $langs->trans('BillStatusPaid');
-		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusPaid');
-		    }
+			if ($type == self::TYPE_CREDIT_NOTE) {
+				$labelStatus = $langs->transnoentitiesnoconv('BillStatusPaidBackOrConverted'); // credit note
+				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusPaidBackOrConverted'); // credit note
+			} elseif ($type == self::TYPE_DEPOSIT) {
+				$labelStatus = $langs->transnoentitiesnoconv('BillStatusConverted'); // deposit invoice
+				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusConverted'); // deposit invoice
+			} else {
+				$labelStatus = $langs->transnoentitiesnoconv('BillStatusPaid');
+				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusPaid');
+			}
 		}
 
 		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Returns an invoice payment deadline based on the invoice settlement
 	 *  conditions and billing date.
@@ -579,15 +578,15 @@ abstract class CommonInvoice extends CommonObject
 	 *	@param      integer	$cond_reglement   	Condition of payment (code or id) to use. If 0, we use current condition.
 	 *  @return     integer    			       	Date limite de reglement si ok, <0 si ko
 	 */
-    public function calculate_date_lim_reglement($cond_reglement = 0)
+	public function calculate_date_lim_reglement($cond_reglement = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if (!$cond_reglement) $cond_reglement = $this->cond_reglement_code;
 		if (!$cond_reglement) $cond_reglement = $this->cond_reglement_id;
 
 		$cdr_nbjour = 0;
-        $cdr_type = 0;
-        $cdr_decalage = 0;
+		$cdr_type = 0;
+		$cdr_decalage = 0;
 
 		$sqltemp = 'SELECT c.type_cdr, c.nbjour, c.decalage';
 		$sqltemp .= ' FROM '.MAIN_DB_PREFIX.'c_payment_term as c';
@@ -646,7 +645,7 @@ abstract class CommonInvoice extends CommonObject
 		// 2 : application of the rule, the N of the current or next month
 		elseif ($cdr_type == 2 && !empty($cdr_decalage))
 		{
-		    include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 			$datelim = $this->date + ($cdr_nbjour * 3600 * 24);
 
 			$date_piece = dol_mktime(0, 0, 0, date('m', $datelim), date('d', $datelim), date('Y', $datelim)); // Sans les heures minutes et secondes
@@ -697,7 +696,7 @@ abstract class CommonInvoice extends CommonObject
 			} else {
 				$sql .= ' WHERE fk_facture = '.$this->id;
 			}
-			$sql .= ' AND ext_payment_id IS NULL';			// To exclude record done for some online payments
+			$sql .= ' AND ext_payment_id IS NULL'; // To exclude record done for some online payments
 			$sql .= ' AND traite = 0';
 
 			dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG);
@@ -756,7 +755,7 @@ abstract class CommonInvoice extends CommonObject
 
 					if (!$error) {
 						// Force payment mode of invoice to withdraw
-						$payment_mode_id = dol_getIdFromCode($this->db, 'PRE', 'c_paiement', 'code', 'id', 1);
+						$payment_mode_id = dol_getIdFromCode($this->db, ($type == 'bank-transfer' ? 'VIR' : 'PRE'), 'c_paiement', 'code', 'id', 1);
 						if ($payment_mode_id > 0) {
 							$result = $this->setPaymentMethods($payment_mode_id);
 						}
@@ -815,6 +814,47 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
  */
 abstract class CommonInvoiceLine extends CommonObjectLine
 {
+	/**
+	 * Custom label of line. Not used by default.
+	 * @deprecated
+	 */
+	public $label;
+
+	/**
+	 * @deprecated
+	 * @see $product_ref
+	 */
+	public $ref; // Product ref (deprecated)
+	/**
+	 * @deprecated
+	 * @see $product_label
+	 */
+	public $libelle; // Product label (deprecated)
+
+	/**
+	 * Type of the product. 0 for product 1 for service
+	 * @var int
+	 */
+	public $product_type = 0;
+
+	/**
+	 * Product ref
+	 * @var string
+	 */
+	public $product_ref;
+
+	/**
+	 * Product label
+	 * @var string
+	 */
+	public $product_label;
+
+	/**
+	 * Product description
+	 * @var string
+	 */
+	public $product_desc;
+
 	/**
 	 * Quantity
 	 * @var double
@@ -827,12 +867,6 @@ abstract class CommonInvoiceLine extends CommonObjectLine
 	 */
 	public $subprice;
 
-	/**
-	 * Type of the product. 0 for product 1 for service
-	 * @var int
-	 */
-	public $product_type = 0;
-
 	/**
 	 * Id of corresponding product
 	 * @var int
@@ -899,21 +933,23 @@ abstract class CommonInvoiceLine extends CommonObjectLine
 	 */
 	public $total_ttc;
 
+	public $date_start_fill; // If set to 1, when invoice is created from a template invoice, it will also auto set the field date_start at creation
+	public $date_end_fill; // If set to 1, when invoice is created from a template invoice, it will also auto set the field date_end at creation
+
 	/**
 	 * List of cumulative options:
-	 * Bit 0:	0 si TVA normal - 1 si TVA NPR
+	 * Bit 0:	0 for common VAT - 1 if VAT french NPR
 	 * Bit 1:	0 si ligne normal - 1 si bit discount (link to line into llx_remise_except)
 	 * @var int
 	 */
 	public $info_bits = 0;
 
-	/**
-	 *  Constructor
-	 *
-	 *  @param	DoliDB		$db		Database handler
-	 */
-	public function __construct(DoliDB $db)
-	{
-		$this->db = $db;
-	}
+	public $special_code = 0;
+
+	public $fk_multicurrency;
+	public $multicurrency_code;
+	public $multicurrency_subprice;
+	public $multicurrency_total_ht;
+	public $multicurrency_total_tva;
+	public $multicurrency_total_ttc;
 }
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 3ea4bba4a7f..b095712d972 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2017      ATM Consulting       <support@atm-consulting.fr>
  * Copyright (C) 2017-2019 Nicolas ZABOURI      <info@inovea-conseil.com>
  * Copyright (C) 2017      Rui Strecht		    <rui.strecht@aliartalentos.com>
- * Copyright (C) 2018-2019 Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020 Frédéric France      <frederic.france@netlogic.fr>
  * Copyright (C) 2018      Josep Lluís Amador   <joseplluis@lliuretic.cat>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -51,12 +51,22 @@ abstract class CommonObject
 	 */
 	public $id;
 
+	/**
+	 * @var int The environment ID when using a multicompany module
+	 */
+	public $entity;
+
 	/**
 	 * @var string 		Error string
 	 * @see             $errors
 	 */
 	public $error;
 
+	/**
+	 * @var string 		Error string that is hidden but can be used to store complementatry technical code.
+	 */
+	public $errorhidden;
+
 	/**
 	 * @var string[]	Array of error strings
 	 */
@@ -185,6 +195,11 @@ abstract class CommonObject
 	 */
 	public $ref;
 
+	/**
+	 * @var string An external reference for the object
+	 */
+	public $ref_ext;
+
 	/**
 	 * @var string The object's previous reference
 	 */
@@ -195,11 +210,6 @@ abstract class CommonObject
 	 */
 	public $ref_next;
 
-	/**
-	 * @var string An external reference for the object
-	 */
-	public $ref_ext;
-
 	/**
 	 * @var int The object's status
 	 * @see setStatut()
@@ -296,6 +306,17 @@ abstract class CommonObject
 	 */
 	public $cond_reglement_id;
 
+	/**
+	 * @var int Demand reason ID
+	 */
+	public $demand_reason_id;
+
+	/**
+	 * @var int Transport mode ID (For module intracomm report)
+	 * @see setTransportMode()
+	 */
+	public $transport_mode_id;
+
 	/**
 	 * @var int Payment terms ID
 	 * @deprecated Kept for compatibility
@@ -328,12 +349,24 @@ abstract class CommonObject
 	 */
 	public $last_main_doc;
 
+	/**
+	 * @var int Bank account ID
+	 * @deprecated
+	 * @see $fk_account
+	 */
+	public $fk_bank;
+
 	/**
 	 * @var int Bank account ID
 	 * @see SetBankAccount()
 	 */
 	public $fk_account;
 
+	/**
+	 * @var string	Open ID
+	 */
+	public $openid;
+
 	/**
 	 * @var string Public note
 	 * @see update_note()
@@ -431,6 +464,17 @@ abstract class CommonObject
 
 	public $next_prev_filter;
 
+	/**
+	 * @var int 1 if object is specimen
+	 */
+	public $specimen = 0;
+
+	/**
+	 * @var	int	Id of contact to send object (used by the trigger of module Agenda)
+	 */
+	public $sendtoid;
+
+
 	/**
 	 * @var array	List of child tables. To test if we can delete object.
 	 */
@@ -540,7 +584,7 @@ abstract class CommonObject
 	 *
 	 *	@param	Translate	$langs			Language object for translation of civility (used only if option is 1)
 	 *	@param	int			$option			0=No option, 1=Add civility
-	 * 	@param	int			$nameorder		-1=Auto, 0=Lastname+Firstname, 1=Firstname+Lastname, 2=Firstname, 3=Firstname if defined else lastname
+	 * 	@param	int			$nameorder		-1=Auto, 0=Lastname+Firstname, 1=Firstname+Lastname, 2=Firstname, 3=Firstname if defined else lastname, 4=Lastname, 5=Lastname if defined else firstname
 	 * 	@param	int			$maxlen			Maximum length
 	 * 	@return	string						String with full name
 	 */
@@ -563,6 +607,28 @@ abstract class CommonObject
 		return dol_trunc($ret, $maxlen);
 	}
 
+	/**
+	 * Set to upper or ucwords/lower if needed
+	 *
+	 * @return void;
+	 */
+	public function setUpperOrLowerCase()
+	{
+		global $conf;
+		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) {
+			$this->lastname = dol_ucwords(dol_strtolower($this->lastname));
+			$this->firstname = dol_ucwords(dol_strtolower($this->firstname));
+			$this->name = dol_ucwords(dol_strtolower($this->name));
+		}
+		if (!empty($conf->global->MAIN_ALL_TO_UPPER)) {
+			$this->lastname = dol_strtoupper($this->lastname);
+			$this->name = dol_strtoupper($this->name);
+		}
+		if (!empty($conf->global->MAIN_ALL_TOWN_TO_UPPER)) {
+			$this->town = dol_strtoupper($this->town);
+		}
+	}
+
 	/**
 	 *	Return clicable link of object (with eventually picto)
 	 *
@@ -634,17 +700,14 @@ abstract class CommonObject
 		$contactid = 0;
 		$thirdpartyid = 0;
 		$elementforaltlanguage = $this->element;
-		if ($this->element == 'societe')
-		{
+		if ($this->element == 'societe') {
 			$thirdpartyid = $this->id;
 		}
-		if ($this->element == 'contact')
-		{
+		if ($this->element == 'contact') {
 			$contactid = $this->id;
 			$thirdpartyid = $object->fk_soc;
 		}
-		if ($this->element == 'user')
-		{
+		if ($this->element == 'user') {
 			$contactid = $this->contact_id;
 			$thirdpartyid = $object->fk_soc;
 		}
@@ -713,54 +776,62 @@ abstract class CommonObject
 
 		if (!empty($this->phone) || !empty($this->phone_pro) || !empty($this->phone_mobile) || !empty($this->phone_perso) || !empty($this->fax) || !empty($this->office_phone) || !empty($this->user_mobile) || !empty($this->office_fax)) $out .= ($outdone ? '<br>' : '');
 		if (!empty($this->phone) && empty($this->phone_pro)) {		// For objects that store pro phone into ->phone
-			$out .= dol_print_phone($this->phone, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;
+			$out .= dol_print_phone($this->phone, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro"));
+			$outdone++;
 		}
 		if (!empty($this->phone_pro)) {
-			$out .= dol_print_phone($this->phone_pro, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;
+			$out .= dol_print_phone($this->phone_pro, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro"));
+			$outdone++;
 		}
 		if (!empty($this->phone_mobile)) {
-			$out .= dol_print_phone($this->phone_mobile, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'mobile', $langs->trans("PhoneMobile")); $outdone++;
+			$out .= dol_print_phone($this->phone_mobile, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'mobile', $langs->trans("PhoneMobile"));
+			$outdone++;
 		}
 		if (!empty($this->phone_perso)) {
-			$out .= dol_print_phone($this->phone_perso, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePerso")); $outdone++;
+			$out .= dol_print_phone($this->phone_perso, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePerso"));
+			$outdone++;
 		}
 		if (!empty($this->office_phone)) {
-			$out .= dol_print_phone($this->office_phone, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;
+			$out .= dol_print_phone($this->office_phone, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro"));
+			$outdone++;
 		}
 		if (!empty($this->user_mobile)) {
-			$out .= dol_print_phone($this->user_mobile, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'mobile', $langs->trans("PhoneMobile")); $outdone++;
+			$out .= dol_print_phone($this->user_mobile, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'mobile', $langs->trans("PhoneMobile"));
+			$outdone++;
 		}
 		if (!empty($this->fax)) {
-			$out .= dol_print_phone($this->fax, $this->country_code, $contactid, $thirdpartyid, 'AC_FAX', '&nbsp;', 'fax', $langs->trans("Fax")); $outdone++;
+			$out .= dol_print_phone($this->fax, $this->country_code, $contactid, $thirdpartyid, 'AC_FAX', '&nbsp;', 'fax', $langs->trans("Fax"));
+			$outdone++;
 		}
 		if (!empty($this->office_fax)) {
-			$out .= dol_print_phone($this->office_fax, $this->country_code, $contactid, $thirdpartyid, 'AC_FAX', '&nbsp;', 'fax', $langs->trans("Fax")); $outdone++;
+			$out .= dol_print_phone($this->office_fax, $this->country_code, $contactid, $thirdpartyid, 'AC_FAX', '&nbsp;', 'fax', $langs->trans("Fax"));
+			$outdone++;
 		}
 
 		if ($out) $out .= '<div style="clear: both;"></div>';
 		$outdone = 0;
-		if (!empty($this->email))
-		{
+		if (!empty($this->email)) {
 			$out .= dol_print_email($this->email, $this->id, $object->id, 'AC_EMAIL', 0, 0, 1);
 			$outdone++;
 		}
-		if (!empty($this->url))
-		{
+		if (!empty($this->url)) {
 			//$out.=dol_print_url($this->url,'_goout',0,1);//steve changed to blank
 			$out .= dol_print_url($this->url, '_blank', 0, 1);
 			$outdone++;
 		}
 
-		if (!empty($conf->socialnetworks->enabled))
-		{
+		if (!empty($conf->socialnetworks->enabled)) {
 			$outsocialnetwork = '';
 
 			if (is_array($this->socialnetworks) && count($this->socialnetworks) > 0) {
+				$socialnetworksdict = getArrayOfSocialNetworks();
 				foreach ($this->socialnetworks as $key => $value) {
-					$outsocialnetwork .= dol_print_socialnetworks($value, $this->id, $object->id, $key);
+					if ($value) {
+						$outsocialnetwork .= dol_print_socialnetworks($value, $this->id, $object->id, $key, $socialnetworksdict);
+					}
 					$outdone++;
 				}
-			} else {
+			} else {	// Old code to remove
 				if ($this->skype) $outsocialnetwork .= dol_print_socialnetworks($this->skype, $this->id, $object->id, 'skype');
 				$outdone++;
 				if ($this->jabberid) $outsocialnetwork .= dol_print_socialnetworks($this->jabberid, $this->id, $object->id, 'jabber');
@@ -876,11 +947,11 @@ abstract class CommonObject
 	/**
 	 *  Add a link between element $this->element and a contact
 	 *
-	 *  @param	int		$fk_socpeople       Id of thirdparty contact (if source = 'external') or id of user (if souce = 'internal') to link
-	 *  @param 	int		$type_contact 		Type of contact (code or id). Must be id or code found into table llx_c_type_contact. For example: SALESREPFOLL
-	 *  @param  string	$source             external=Contact extern (llx_socpeople), internal=Contact intern (llx_user)
-	 *  @param  int		$notrigger			Disable all triggers
-	 *  @return int                 		<0 if KO, >0 if OK
+	 *  @param	int			$fk_socpeople       Id of thirdparty contact (if source = 'external') or id of user (if souce = 'internal') to link
+	 *  @param 	int|string	$type_contact 		Type of contact (code or id). Must be id or code found into table llx_c_type_contact. For example: SALESREPFOLL
+	 *  @param  string		$source             external=Contact extern (llx_socpeople), internal=Contact intern (llx_user)
+	 *  @param  int			$notrigger			Disable all triggers
+	 *  @return int         	        		<0 if KO, >0 if OK
 	 */
 	public function add_contact($fk_socpeople, $type_contact, $source = 'external', $notrigger = 0)
 	{
@@ -1193,9 +1264,7 @@ abstract class CommonObject
 	{
 		$sql = "SELECT ec.datecreate, ec.statut, ec.fk_socpeople, ec.fk_c_type_contact,";
 		$sql .= " tc.code, tc.libelle";
-		//$sql.= ", s.fk_soc";
 		$sql .= " FROM (".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc)";
-		//$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as s ON ec.fk_socpeople=s.rowid";	// Si contact de type external, alors il est lie a une societe
 		$sql .= " WHERE ec.rowid =".$rowid;
 		$sql .= " AND ec.fk_c_type_contact=tc.rowid";
 		$sql .= " AND tc.element = '".$this->db->escape($this->element)."'";
@@ -1759,7 +1828,11 @@ abstract class CommonObject
 				return -2;
 			}
 		} else {
-			$this->error = $this->db->lasterror();
+			if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				$this->error = 'DB_ERROR_RECORD_ALREADY_EXISTS';
+			} else {
+				$this->error = $this->db->lasterror();
+			}
 			$this->db->rollback();
 			return -1;
 		}
@@ -1999,7 +2072,7 @@ abstract class CommonObject
 				if (get_class($this) == 'Fournisseur') $this->mode_reglement_supplier_id = $id;
 				return 1;
 			} else {
-				dol_syslog(get_class($this).'::setPaymentMethods Erreur '.$sql.' - '.$this->db->error());
+				dol_syslog(get_class($this).'::setPaymentMethods Error '.$sql.' - '.$this->db->error());
 				$this->error = $this->db->error();
 				return -1;
 			}
@@ -2036,7 +2109,7 @@ abstract class CommonObject
 
 				return 1;
 			} else {
-				dol_syslog(get_class($this).'::setMulticurrencyCode Erreur '.$sql.' - '.$this->db->error());
+				dol_syslog(get_class($this).'::setMulticurrencyCode Error '.$sql.' - '.$this->db->error());
 				$this->error = $this->db->error();
 				return -1;
 			}
@@ -2140,7 +2213,7 @@ abstract class CommonObject
 
 				return 1;
 			} else {
-				dol_syslog(get_class($this).'::setMulticurrencyRate Erreur '.$sql.' - '.$this->db->error());
+				dol_syslog(get_class($this).'::setMulticurrencyRate Error '.$sql.' - '.$this->db->error());
 				$this->error = $this->db->error();
 				return -1;
 			}
@@ -2179,7 +2252,7 @@ abstract class CommonObject
 				$this->cond_reglement = $id; // for compatibility
 				return 1;
 			} else {
-				dol_syslog(get_class($this).'::setPaymentTerms Erreur '.$sql.' - '.$this->db->error());
+				dol_syslog(get_class($this).'::setPaymentTerms Error '.$sql.' - '.$this->db->error());
 				$this->error = $this->db->error();
 				return -1;
 			}
@@ -2190,6 +2263,42 @@ abstract class CommonObject
 		}
 	}
 
+	/**
+	 *  Change the transport mode methods
+	 *
+	 *  @param		int		$id		Id of new payment method
+	 *  @return		int				>0 if OK, <0 if KO
+	 */
+	public function setTransportMode($id)
+	{
+		dol_syslog(get_class($this).'::setTransportMode('.$id.')');
+		if ($this->statut >= 0 || $this->element == 'societe')
+		{
+			$fieldname = 'fk_transport_mode';
+			if ($this->element == 'societe') $fieldname = 'transport_mode';
+			if (get_class($this) == 'Fournisseur') $fieldname = 'transport_mode_supplier';
+
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+			$sql .= ' SET '.$fieldname.' = '.(($id > 0 || $id == '0') ? $id : 'NULL');
+			$sql .= ' WHERE rowid='.$this->id;
+
+			if ($this->db->query($sql))
+			{
+				$this->transport_mode_id = $id;
+				// for supplier
+				if (get_class($this) == 'Fournisseur') $this->transport_mode_supplier_id = $id;
+				return 1;
+			} else {
+				dol_syslog(get_class($this).'::setTransportMode Error '.$sql.' - '.$this->db->error());
+				$this->error = $this->db->error();
+				return -1;
+			}
+		} else {
+			dol_syslog(get_class($this).'::setTransportMode, status of the object is incompatible');
+			$this->error = 'Status of the object is incompatible '.$this->statut;
+			return -2;
+		}
+	}
 
 	/**
 	 *  Change the retained warranty payments terms
@@ -2213,7 +2322,7 @@ abstract class CommonObject
 				$this->retained_warranty_fk_cond_reglement = $id;
 				return 1;
 			} else {
-				dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms Erreur '.$sql.' - '.$this->db->error());
+				dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms Error '.$sql.' - '.$this->db->error());
 				$this->error = $this->db->error();
 				return -1;
 			}
@@ -2245,7 +2354,7 @@ abstract class CommonObject
 			return 1;
 		} else {
 			$this->error = $this->db->error();
-			dol_syslog(get_class($this).'::setDeliveryAddress Erreur '.$sql.' - '.$this->error);
+			dol_syslog(get_class($this).'::setDeliveryAddress Error '.$sql.' - '.$this->error);
 			return -1;
 		}
 	}
@@ -2358,8 +2467,6 @@ abstract class CommonObject
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
 		$sql .= " SET model_pdf = '".$this->db->escape($newmodelpdf)."'";
 		$sql .= " WHERE rowid = ".$this->id;
-		// if ($this->element == 'facture') $sql.= " AND fk_statut < 2";
-		// if ($this->element == 'propal')  $sql.= " AND fk_statut = 0";
 
 		dol_syslog(get_class($this)."::setDocModel", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2474,8 +2581,7 @@ abstract class CommonObject
 		} else dol_print_error($this->db);
 		if ($nl > 0)
 		{
-			// The goal of this part is to reorder all lines, with all children lines sharing the same
-			// counter that parents.
+			// The goal of this part is to reorder all lines, with all children lines sharing the same counter that parents.
 			$rows = array();
 
 			// We first search all lines that are parent lines (for multilevel details lines)
@@ -2745,7 +2851,7 @@ abstract class CommonObject
 	{
 		// phpcs:enable
 		$positionfield = 'rang';
-		if ($this->table_element == 'bom') $positionfield = 'position';
+		if ($this->table_element == 'bom_bom') $positionfield = 'position';
 
 		// Search the last rang with fk_parent_line
 		if ($fk_parent_line)
@@ -3066,7 +3172,7 @@ abstract class CommonObject
 			$this->multicurrency_total_ttc += isset($this->revenuestamp) ? ($this->revenuestamp * $multicurrency_tx) : 0;
 
 			// Situations totals
-			if ($this->situation_cycle_ref && $this->situation_counter > 1 && method_exists($this, 'get_prev_sits') && $this->type != $this::TYPE_CREDIT_NOTE)
+			if (!empty($this->situation_cycle_ref) && $this->situation_counter > 1 && method_exists($this, 'get_prev_sits') && $this->type != $this::TYPE_CREDIT_NOTE)
 			{
 				$prev_sits = $this->get_prev_sits();
 
@@ -3314,7 +3420,7 @@ abstract class CommonObject
 					} elseif ($objecttype == 'shipping') {
 						$classpath = 'expedition/class'; $subelement = 'expedition'; $module = 'expedition_bon';
 					} elseif ($objecttype == 'delivery') {
-						$classpath = 'livraison/class'; $subelement = 'livraison'; $module = 'livraison_bon';
+						$classpath = 'delivery/class'; $subelement = 'delivery'; $module = 'delivery_note';
 					} elseif ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier') {
 						$classpath = 'fourn/class'; $module = 'fournisseur';
 					} elseif ($objecttype == 'fichinter') {
@@ -4161,7 +4267,7 @@ abstract class CommonObject
 		print '<td class="right">'.$langs->trans('PriceUHT').'</td>';
 		if (!empty($conf->multicurrency->enabled)) print '<td class="right">'.$langs->trans('PriceUHTCurrency').'</td>';
 		print '<td class="right">'.$langs->trans('Qty').'</td>';
-		if ($conf->global->PRODUCT_USE_UNITS)
+		if (!empty($conf->global->PRODUCT_USE_UNITS))
 		{
 			print '<td class="left">'.$langs->trans('Unit').'</td>';
 		}
@@ -4304,7 +4410,7 @@ abstract class CommonObject
 		$this->tpl['price'] = price($line->subprice);
 		$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);
 		$this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : '&nbsp;';
-		if ($conf->global->PRODUCT_USE_UNITS) $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));
 		$this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : '&nbsp;';
 
 		// Is the line strike or not
@@ -4460,6 +4566,11 @@ abstract class CommonObject
 		{
 			dol_syslog("commonGenerateDocument modele=".$modele." outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));
 
+			if (empty($modele)) {
+				$this->error = 'BadValueForParameterModele';
+				return -1;
+			}
+
 			// Increase limit for PDF build
 			$err = error_reporting();
 			error_reporting(0);
@@ -4484,13 +4595,17 @@ abstract class CommonObject
 			{
 				foreach (array('doc', 'pdf') as $prefix)
 				{
-					if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php"; // Member module use prefix_module.class.php
-					else $file = $prefix."_".$modele.".modules.php";
+					if (in_array(get_class($this), array('Adherent'))) {
+						// Member module use prefix_modele.class.php
+						$file = $prefix."_".$modele.".class.php";
+					} else {
+						// Other module use prefix_modele.modules.php
+						$file = $prefix."_".$modele.".modules.php";
+					}
 
 					// On verifie l'emplacement du modele
 					$file = dol_buildpath($reldir.$modelspath.$file, 0);
-					if (file_exists($file))
-					{
+					if (file_exists($file)) {
 						$filefound = $file;
 						$classname = $prefix.'_'.$modele;
 						break;
@@ -4933,7 +5048,7 @@ abstract class CommonObject
 			{
 				$value_arr = GETPOST($postfieldkey, 'array'); // check if an array
 				if (!empty($value_arr)) {
-					$value_key = implode($value_arr, ',');
+					$value_key = implode(',', $value_arr);
 				} else {
 					$value_key = '';
 				}
@@ -4997,7 +5112,7 @@ abstract class CommonObject
 		global $conf, $extrafields;
 
 		if (empty($rowid)) $rowid = $this->id;
-		if (empty($rowid)) $rowid = $this->rowid;
+		if (empty($rowid) && isset($this->rowid)) $rowid = $this->rowid; // deprecated
 
 		// To avoid SQL errors. Probably not the better solution though
 		if (!$this->table_element) {
@@ -5153,7 +5268,7 @@ abstract class CommonObject
 			$extrafields = new ExtraFields($this->db);
 			$target_extrafields = $extrafields->fetch_name_optionals_label($this->table_element);
 
-			//Eliminate copied source object extra_fields that do not exist in target object
+			// Eliminate copied source object extra fields that do not exist in target object
 			$new_array_options = array();
 			foreach ($this->array_options as $key => $value) {
 				if (in_array(substr($key, 8), array_keys($target_extrafields)))	// We remove the 'options_' from $key for test
@@ -5171,7 +5286,8 @@ abstract class CommonObject
 			   	$attributeRequired = $extrafields->attributes[$this->table_element]['required'][$attributeKey];
 				$attrfieldcomputed = $extrafields->attributes[$this->table_element]['computed'][$attributeKey];
 
-			   	if ($attributeRequired)
+				// Similar code than into insertExtraFields
+				if ($attributeRequired)
 			   	{
 			   		$mandatorypb = false;
 			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb = true;
@@ -5199,7 +5315,7 @@ abstract class CommonObject
 					}
 				}
 
-			   	switch ($attributeType)
+				switch ($attributeType)
 			   	{
 			   		case 'int':
 			  			if (!is_numeric($value) && $value != '')
@@ -5283,11 +5399,10 @@ abstract class CommonObject
 							if ($value == '-1')	// -1 is key for no defined in combo list of objects
 							{
 								$new_array_options[$key] = '';
-							} elseif ($value)
-							{
+							} elseif ($value) {
 								$object = new $InfoFieldList[0]($this->db);
-								if (is_numeric($value)) $res = $object->fetch($value);
-								else $res = $object->fetch('', $value);
+								if (is_numeric($value)) $res = $object->fetch($value); // Common case
+								else $res = $object->fetch('', $value); // For compatibility
 
 								if ($res > 0) $new_array_options[$key] = $object->id;
 								else {
@@ -5322,26 +5437,20 @@ abstract class CommonObject
 					$sql .= ",".$attributeKey;
 			}
 			// We must insert a default value for fields for other entities that are mandatory to avoid not null error
-			if (is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']))
-			{
-				foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
-				{
-					if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey]))    // If field not already added previously
-					{
+			if (!empty($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']) && is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'])) {
+				foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval) {
+					if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) {    // If field not already added previously
 						$sql .= ",".$tmpkey;
 					}
 				}
 			}
 			$sql .= ") VALUES (".$this->id;
 
-			foreach ($new_array_options as $key => $value)
-			{
+			foreach ($new_array_options as $key => $value) {
 				$attributeKey = substr($key, 8); // Remove 'options_' prefix
 				// Add field of attribute
-				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator)
-				{
-					if ($new_array_options[$key] != '' || $new_array_options[$key] == '0')
-					{
+				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') { // Only for other type than separator)
+					if ($new_array_options[$key] != '' || $new_array_options[$key] == '0') {
 						$sql .= ",'".$this->db->escape($new_array_options[$key])."'";
 					} else {
 						$sql .= ",null";
@@ -5349,12 +5458,9 @@ abstract class CommonObject
 				}
 			}
 			// We must insert a default value for fields for other entities that are mandatory to avoid not null error
-			if (is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']))
-			{
-				foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
-				{
-					if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey]))    // If field not already added previously
-					{
+			if (!empty($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']) && is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'])) {
+				foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval) {
+					if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) {   // If field not already added previously
 						if (in_array($tmpval, array('int', 'double', 'price'))) $sql .= ", 0";
 						else $sql .= ", ''";
 					}
@@ -5364,7 +5470,6 @@ abstract class CommonObject
 			$sql .= ")";
 
 			$resql = $this->db->query($sql);
-
 			if (!$resql)
 			{
 				$this->error = $this->db->lasterror();
@@ -5510,7 +5615,7 @@ abstract class CommonObject
 	}
 
 	/**
-	 *	Update an extra field value for the current object.
+	 *	Update 1 extra field value for the current object. Keep other fields unchanged.
 	 *  Data to describe values to update are stored into $this->array_options=array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...)
 	 *
 	 *  @param  string      $key    		Key of the extrafield to update (without starting 'options_')
@@ -5543,10 +5648,37 @@ abstract class CommonObject
 			$attributeLabel    = $extrafields->attributes[$this->table_element]['label'][$key];
 			$attributeParam    = $extrafields->attributes[$this->table_element]['param'][$key];
 			$attributeRequired = $extrafields->attributes[$this->table_element]['required'][$key];
+			$attrfieldcomputed = $extrafields->attributes[$this->table_element]['computed'][$key];
+
+			// Similar code than into insertExtraFields
+			if ($attributeRequired)
+			{
+				$mandatorypb = false;
+				if ($attributeType == 'link' && $this->array_options["options_".$key] == '-1') $mandatorypb = true;
+				if ($this->array_options["options_".$key] === '') $mandatorypb = true;
+				if ($mandatorypb)
+				{
+					dol_syslog("Mandatory extra field options_".$key." is empty");
+					$this->errors[] = $langs->trans('ErrorFieldRequired', $attributeLabel);
+					return -1;
+				}
+			}
 
 			//dol_syslog("attributeLabel=".$attributeLabel, LOG_DEBUG);
 			//dol_syslog("attributeType=".$attributeType, LOG_DEBUG);
 
+			if (!empty($attrfieldcomputed))
+			{
+				if (!empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS))
+				{
+					$value = dol_eval($attrfieldcomputed, 1, 0);
+					dol_syslog($langs->trans("Extrafieldcomputed")." sur ".$attributeLabel."(".$value.")", LOG_DEBUG);
+					$this->array_options["options_".$key] = $value;
+				} else {
+					$this->array_options["options_".$key] = null;
+				}
+			}
+
 			switch ($attributeType)
 			{
 				case 'int':
@@ -5588,31 +5720,65 @@ abstract class CommonObject
 				case 'datetime':
 					$this->array_options["options_".$key] = $this->db->idate($this->array_options["options_".$key]);
 					break;
+				/*
 				case 'link':
 					$param_list = array_keys($attributeParam['options']);
 					// 0 : ObjectName
 					// 1 : classPath
 					$InfoFieldList = explode(":", $param_list[0]);
 					dol_include_once($InfoFieldList[1]);
-					if ($value)
+					if ($InfoFieldList[0] && class_exists($InfoFieldList[0]))
 					{
-						$object = new $InfoFieldList[0]($this->db);
-						$object->fetch(0, $value);
-						$this->array_options["options_".$key] = $object->id;
+						if ($value == '-1')	// -1 is key for no defined in combo list of objects
+						{
+							$new_array_options[$key] = '';
+						} elseif ($value) {
+							$object = new $InfoFieldList[0]($this->db);
+							if (is_numeric($value)) $res = $object->fetch($value);	// Common case
+							else $res = $object->fetch('', $value);					// For compatibility
+
+							if ($res > 0) $new_array_options[$key] = $object->id;
+							else {
+								$this->error = "Id/Ref '".$value."' for object '".$object->element."' not found";
+								$this->db->rollback();
+								return -1;
+							}
+						}
+					} else {
+						dol_syslog('Error bad setup of extrafield', LOG_WARNING);
 					}
 					break;
+				*/
 			}
 
 			$this->db->begin();
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET ".$key."='".$this->db->escape($this->array_options["options_".$key])."'";
-			$sql .= " WHERE fk_object = ".$this->id;
+
+			$linealreadyfound = 0;
+
+			// Check if there is already a line for this object (in most cases, it is, but sometimes it is not, for example when extra field has been created after), so we must keep this overload)
+			$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields WHERE fk_object = ".$this->id;
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$tmpobj = $this->db->fetch_object($resql);
+				if ($tmpobj) {
+					$linealreadyfound = $tmpobj->nb;
+				}
+			}
+
+			if ($linealreadyfound) {
+				$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET ".$key." = '".$this->db->escape($this->array_options["options_".$key])."'";
+				$sql .= " WHERE fk_object = ".$this->id;
+			} else {
+				$result = $this->insertExtraFields('', $user);
+				if ($result < 0) $error++;
+			}
+
 			$resql = $this->db->query($sql);
 			if (!$resql)
 			{
 				$error++;
 				$this->error = $this->db->lasterror();
 			}
-
 			if (!$error && $trigger)
 			{
 				// Call trigger
@@ -5664,7 +5830,7 @@ abstract class CommonObject
 	 *
 	 * @param  array   		$val	       Array of properties for field to show (used only if ->fields not defined)
 	 * @param  string  		$key           Key of attribute
-	 * @param  string  		$value         Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
+	 * @param  string|array	$value         Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value, for array type must be array)
 	 * @param  string  		$moreparam     To add more parameters on html input tag
 	 * @param  string  		$keysuffix     Prefix string to add into name and id of field (can be used to avoid duplicate names)
 	 * @param  string  		$keyprefix     Suffix string to add into name and id of field (can be used to avoid duplicate names)
@@ -5771,8 +5937,7 @@ abstract class CommonObject
 			}
 		}
 
-		if (in_array($type, array('date', 'datetime')))
-		{
+		if (in_array($type, array('date', 'datetime'))) {
 			$tmp = explode(',', $size);
 			$newsize = $tmp[0];
 
@@ -5783,25 +5948,19 @@ abstract class CommonObject
 
 			// TODO Must also support $moreparam
 			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
-		} elseif (in_array($type, array('duration')))
-		{
+		} elseif (in_array($type, array('duration'))) {
 			$out = $form->select_duration($keyprefix.$key.$keysuffix, $value, 0, 'text', 0, 1);
-		} elseif (in_array($type, array('int', 'integer')))
-		{
+		} elseif (in_array($type, array('int', 'integer'))) {
 			$tmp = explode(',', $size);
 			$newsize = $tmp[0];
 			$out = '<input type="text" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
-		} elseif (in_array($type, array('real')))
-		{
+		} elseif (in_array($type, array('real'))) {
 			$out = '<input type="text" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
-		} elseif (preg_match('/varchar/', $type))
-		{
+		} elseif (preg_match('/varchar/', $type)) {
 			$out = '<input type="text" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
-		} elseif (in_array($type, array('mail', 'phone', 'url')))
-		{
+		} elseif (in_array($type, array('mail', 'phone', 'url'))) {
 			$out = '<input type="text" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
-		} elseif (preg_match('/^text/', $type))
-		{
+		} elseif (preg_match('/^text/', $type)) {
 			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@@ -5810,18 +5969,15 @@ abstract class CommonObject
 			} else {
 				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
-		} elseif (preg_match('/^html/', $type))
-		{
-			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
-			{
+		} elseif (preg_match('/^html/', $type)) {
+			if (!preg_match('/search_/', $keyprefix)) {		// If keyprefix is search_ or search_options_, we must just use a simple text field
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
 			} else {
 				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
-		} elseif ($type == 'boolean')
-		{
+		} elseif ($type == 'boolean') {
 			$checked = '';
 			if (!empty($value)) {
 				$checked = ' checked value="1" ';
@@ -5829,20 +5985,17 @@ abstract class CommonObject
 				$checked = ' value="1" ';
 			}
 			$out = '<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam ? $moreparam : '').'>';
-		} elseif ($type == 'price')
-		{
+		} elseif ($type == 'price') {
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value = price($value);
 			}
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> '.$langs->getCurrencySymbol($conf->currency);
-		} elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
-		{
+		} elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type)) {
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value = price($value);
 			}
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';
-		} elseif ($type == 'select')
-		{
+		} elseif ($type == 'select') {
 			$out = '';
 			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
 			{
@@ -5862,18 +6015,15 @@ abstract class CommonObject
 				$out .= '>'.$val.'</option>';
 			}
 			$out .= '</select>';
-		} elseif ($type == 'sellist')
-		{
+		} elseif ($type == 'sellist') {
 			$out = '';
-			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
-			{
+			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
 			}
 
 			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
-			if (is_array($param['options']))
-			{
+			if (is_array($param['options'])) {
 				$param_list = array_keys($param['options']);
 				$InfoFieldList = explode(":", $param_list[0]);
 				$parentName = '';
@@ -6019,12 +6169,10 @@ abstract class CommonObject
 				}
 			}
 			$out .= '</select>';
-		} elseif ($type == 'checkbox')
-		{
+		} elseif ($type == 'checkbox') {
 			$value_arr = explode(',', $value);
 			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
-		} elseif ($type == 'radio')
-		{
+		} elseif ($type == 'radio') {
 			$out = '';
 			foreach ($param['options'] as $keyopt => $val)
 			{
@@ -6034,8 +6182,7 @@ abstract class CommonObject
 				$out .= ($value == $keyopt ? 'checked' : '');
 				$out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
 			}
-		} elseif ($type == 'chkbxlst')
-		{
+		} elseif ($type == 'chkbxlst') {
 			if (is_array($value)) {
 				$value_arr = $value;
 			} else {
@@ -6176,13 +6323,23 @@ abstract class CommonObject
 					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
 				}
 			}
-		} elseif ($type == 'link')
-		{
+		} elseif ($type == 'link') {
 			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath[:AddCreateButtonOrNot[:Filter]]'
 			$param_list_array = explode(':', $param_list[0]);
 			$showempty = (($required && $default != '') ? 0 : 1);
-			if (!empty($param_list_array[2])) {		// If the entry into $fields is set to add a create button
-				$morecss .= ' widthcentpercentminusx';
+
+			if (!preg_match('/search_/', $keyprefix)) {
+				if (!empty($param_list_array[2])) {		// If the entry into $fields is set to add a create button
+					if ($this->fields[$key]['picto']) {
+						$morecss .= ' widthcentpercentminusxx';
+					} else {
+						$morecss .= ' widthcentpercentminusx';
+					}
+				} else {
+					if ($this->fields[$key]['picto']) {
+						$morecss .= ' widthcentpercentminusx';
+					}
+				}
 			}
 
 			$out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, $moreparam, 0, empty($val['disabled']) ? 0 : 1);
@@ -6201,25 +6358,20 @@ abstract class CommonObject
 		   			$out .= '<a class="butActionNew" title="'.$langs->trans("New").'" href="'.$url_path.'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF'].($paramforthenewlink ? '?'.$paramforthenewlink : '')).'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
 				}
 			}
-		} elseif ($type == 'password')
-		{
+		} elseif ($type == 'password') {
 			// If prefix is 'search_', field is used as a filter, we use a common text field.
 			$out = '<input type="'.($keyprefix == 'search_' ? 'text' : 'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'>';
-		} elseif ($type == 'array')
-		{
+		} elseif ($type == 'array') {
 			$newval = $val;
 			$newval['type'] = 'varchar(256)';
 
 			$out = '';
-
-			$inputs = array();
 			if (!empty($value)) {
 				foreach ($value as $option) {
 					$out .= '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';
 					$out .= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', $option, $moreparam, '', '', $morecss).'<br></span>';
 				}
 			}
-
 			$out .= '<a id="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_add" href="javascript:;"><span class="fa fa-plus-circle valignmiddle"></span></a>';
 
 			$newInput = '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';
@@ -6285,7 +6437,7 @@ abstract class CommonObject
 			$type = 'varchar'; // convert varchar(xx) int varchar
 			$size = $reg[1];
 		} elseif (preg_match('/varchar/', $type)) $type = 'varchar'; // convert varchar(xx) int varchar
-		if (is_array($val['arrayofkeyval'])) $type = 'select';
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) $type = 'select';
 		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type = 'link';
 
 		$default = $val['default'];
@@ -6295,7 +6447,7 @@ abstract class CommonObject
 		$param = array();
 		$param['options'] = array();
 
-		if (is_array($val['arrayofkeyval'])) $param['options'] = $val['arrayofkeyval'];
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) $param['options'] = $val['arrayofkeyval'];
 		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg))
 		{
 			$type = 'link';
@@ -6322,27 +6474,20 @@ abstract class CommonObject
 
 		if (empty($morecss))
 		{
-			if ($type == 'date')
-			{
+			if ($type == 'date') {
 				$morecss = 'minwidth100imp';
-			} elseif ($type == 'datetime' || $type == 'timestamp')
-			{
+			} elseif ($type == 'datetime' || $type == 'timestamp') {
 				$morecss = 'minwidth200imp';
-			} elseif (in_array($type, array('int', 'double', 'price')))
-			{
+			} elseif (in_array($type, array('int', 'double', 'price'))) {
 				$morecss = 'maxwidth75';
-			} elseif ($type == 'url')
-			{
+			} elseif ($type == 'url') {
 				$morecss = 'minwidth400';
-			} elseif ($type == 'boolean')
-			{
+			} elseif ($type == 'boolean') {
 				$morecss = '';
 			} else {
-				if (round($size) < 12)
-				{
+				if (round($size) < 12) {
 					$morecss = 'minwidth100';
-				} elseif (round($size) <= 48)
-				{
+				} elseif (round($size) <= 48) {
 					$morecss = 'minwidth200';
 				} else {
 					$morecss = 'minwidth400';
@@ -6353,57 +6498,47 @@ abstract class CommonObject
 		// Format output value differently according to properties of field
 		if ($key == 'ref' && method_exists($this, 'getNomUrl')) $value = $this->getNomUrl(1, '', 0, '', 1);
 		elseif ($key == 'status' && method_exists($this, 'getLibStatut')) $value = $this->getLibStatut(3);
-		elseif ($type == 'date')
-		{
+		elseif ($type == 'date') {
 			if (!empty($value)) {
 				$value = dol_print_date($value, 'day');
 			} else {
 				$value = '';
 			}
-		} elseif ($type == 'datetime' || $type == 'timestamp')
-		{
+		} elseif ($type == 'datetime' || $type == 'timestamp') {
 			if (!empty($value)) {
 				$value = dol_print_date($value, 'dayhour');
 			} else {
 				$value = '';
 			}
-		} elseif ($type == 'duration')
-		{
+		} elseif ($type == 'duration') {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 			if (!is_null($value) && $value !== '') {
 				$value = convertSecondToTime($value, 'allhourmin');
 			}
-		} elseif ($type == 'double' || $type == 'real')
-		{
+		} elseif ($type == 'double' || $type == 'real') {
 			if (!is_null($value) && $value !== '') {
 				$value = price($value);
 			}
-		} elseif ($type == 'boolean')
-		{
+		} elseif ($type == 'boolean') {
 			$checked = '';
 			if (!empty($value)) {
 				$checked = ' checked ';
 			}
 			$value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';
-		} elseif ($type == 'mail')
-		{
+		} elseif ($type == 'mail') {
 			$value = dol_print_email($value, 0, 0, 0, 64, 1, 1);
-		} elseif ($type == 'url')
-		{
+		} elseif ($type == 'url') {
 			$value = dol_print_url($value, '_blank', 32, 1);
-		} elseif ($type == 'phone')
-		{
+		} elseif ($type == 'phone') {
 			$value = dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
 		} elseif ($type == 'price')
 		{
 			if (!is_null($value) && $value !== '') {
 				$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
 			}
-		} elseif ($type == 'select')
-		{
+		} elseif ($type == 'select') {
 			$value = $param['options'][$value];
-		} elseif ($type == 'sellist')
-		{
+		} elseif ($type == 'sellist') {
 			$param_list = array_keys($param['options']);
 			$InfoFieldList = explode(":", $param_list[0]);
 
@@ -6475,23 +6610,20 @@ abstract class CommonObject
 					}
 				}
 			} else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
-		} elseif ($type == 'radio')
-		{
+		} elseif ($type == 'radio') {
 			$value = $param['options'][$value];
-		} elseif ($type == 'checkbox')
-		{
+		} elseif ($type == 'checkbox') {
 			$value_arr = explode(',', $value);
 			$value = '';
 			if (is_array($value_arr) && count($value_arr) > 0)
 			{
 				$toprint = array();
 				foreach ($value_arr as $keyval=>$valueval) {
-					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';
+					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.$param['options'][$valueval].'</li>';
 				}
 				$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 			}
-		} elseif ($type == 'chkbxlst')
-		{
+		} elseif ($type == 'chkbxlst') {
 			$value_arr = explode(',', $value);
 
 			$param_list = array_keys($param['options']);
@@ -6535,9 +6667,9 @@ abstract class CommonObject
 									$translabel = $langs->trans($obj->$field_toshow);
 								}
 								if ($translabel != $field_toshow) {
-									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
+									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.dol_trunc($translabel, 18).'</li>';
 								} else {
-									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';
+									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.$obj->$field_toshow.'</li>';
 								}
 							}
 						} else {
@@ -6546,9 +6678,9 @@ abstract class CommonObject
 								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 							}
 							if ($translabel != $obj->{$InfoFieldList[1]}) {
-								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
+								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.dol_trunc($translabel, 18).'</li>';
 							} else {
-								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';
+								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.$obj->{$InfoFieldList[1]}.'</li>';
 							}
 						}
 					}
@@ -6557,8 +6689,7 @@ abstract class CommonObject
 			} else {
 				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
 			}
-		} elseif ($type == 'link')
-		{
+		} elseif ($type == 'link') {
 			$out = '';
 
 			// only if something to display (perf)
@@ -6584,14 +6715,11 @@ abstract class CommonObject
 					return 'Error bad setup of extrafield';
 				}
 			} else $value = '';
-		} elseif (preg_match('/^(text|html)/', $type))
-		{
+		} elseif (preg_match('/^(text|html)/', $type)) {
 			$value = dol_htmlentitiesbr($value);
-		} elseif ($type == 'password')
-		{
+		} elseif ($type == 'password') {
 			$value = preg_replace('/./i', '*', $value);
-		} elseif ($type == 'array')
-		{
+		} elseif ($type == 'array') {
 			$value = implode('<br>', $value);
 		}
 
@@ -6611,7 +6739,7 @@ abstract class CommonObject
 	 * @param 	array       $params         Optional parameters. Example: array('style'=>'class="oddeven"', 'colspan'=>$colspan)
 	 * @param 	string      $keysuffix      Suffix string to add after name and id of field (can be used to avoid duplicate names)
 	 * @param 	string      $keyprefix      Prefix string to add before name and id of field (can be used to avoid duplicate names)
-	 * @param	string		$onetrtd		All fields in same tr td (TODO field not used ?)
+	 * @param	string		$onetrtd		All fields in same tr td. Used by objectline_create.tpl.php for example.
 	 * @return 	string
 	 */
 	public function showOptionals($extrafields, $mode = 'view', $params = null, $keysuffix = '', $keyprefix = '', $onetrtd = 0)
@@ -6684,7 +6812,7 @@ abstract class CommonObject
 
 					switch ($mode) {
 						case "view":
-							$value = $this->array_options["options_".$key.$keysuffix];	// Value may be clean or formated later
+							$value = $this->array_options["options_".$key.$keysuffix]; // Value may be clean or formated later
 							break;
 						case "create":
 						case "edit":
@@ -6759,7 +6887,7 @@ abstract class CommonObject
 							{
 								$datenotinstring = $this->db->jdate($datenotinstring);
 							}
-							$value = (GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) || $value) ? dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min", 'int', 3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year", 'int', 3)) : $datenotinstring;
+							$value = (GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)) ? dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min", 'int', 3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year", 'int', 3)) : $datenotinstring;
 						}
 						// Convert float submited string into real php numeric (value in memory must be a php numeric)
 						if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('price', 'double')))
@@ -6777,7 +6905,10 @@ abstract class CommonObject
 						$helptoshow = $langs->trans($extrafields->attributes[$this->table_element]['help'][$key]);
 
 						$out .= '<tr '.($html_id ? 'id="'.$html_id.'" ' : '').$csstyle.' class="'.$class.$this->element.'_extras_'.$key.' trextrafields_collapse'.$extrafields_collapse_num.'" '.$domData.' >';
-						$out .= '<td class="';
+						if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER) && $action == 'view') {
+							$out .= '<td></td>';
+						}
+						$out .= '<td class="wordbreak';
 						//$out .= "titlefield";
 						//if (GETPOST('action', 'restricthtml') == 'create') $out.='create';
 						// BUG #11554 : For public page, use red dot for required fields, instead of bold label
@@ -6828,32 +6959,37 @@ abstract class CommonObject
 				if (!empty($conf->use_javascript_ajax)) {
 					$out .= '
 					<script>
-					    jQuery(document).ready(function() {
-					    	function showOptions(child_list, parent_list)
-					    	{
-					    		var val = $("select[name=\""+parent_list+"\"]").val();
-					    		var parentVal = parent_list + ":" + val;
-								if(val > 0) {
-						    		$("select[name=\""+child_list+"\"] option[parent]").hide();
-						    		$("select[name=\""+child_list+"\"] option[parent=\""+parentVal+"\"]").show();
-								} else {
-									$("select[name=\""+child_list+"\"] option").show();
-								}
-					    	}
-							function setListDependencies() {
-						    	jQuery("select option[parent]").parent().each(function() {
-						    		var child_list = $(this).attr("name");
-									var parent = $(this).find("option[parent]:first").attr("parent");
-									var infos = parent.split(":");
-									var parent_list = infos[0];
-									$("select[name=\""+parent_list+"\"]").change(function() {
-										showOptions(child_list, parent_list);
-									});
-						    	});
+					jQuery(document).ready(function() {
+						function showOptions(child_list, parent_list, orig_select)
+						{
+							var val = $("select[name=\""+parent_list+"\"]").val();
+							var parentVal = parent_list + ":" + val;
+							if(val > 0) {
+								var options = orig_select.find("option[parent=\""+parentVal+"\"]").clone();
+								$("select[name=\""+child_list+"\"] option[parent]").remove();
+								$("select[name=\""+child_list+"\"]").append(options);
+							} else {
+								var options = orig_select.find("option[parent]").clone();
+								$("select[name=\""+child_list+"\"] option[parent]").remove();
+								$("select[name=\""+child_list+"\"]").append(options);
 							}
+						}
+						function setListDependencies() {
+							jQuery("select option[parent]").parent().each(function() {
+								var orig_select = {};
+								var child_list = $(this).attr("name");
+								orig_select[child_list] = $(this).clone();
+								var parent = $(this).find("option[parent]:first").attr("parent");
+								var infos = parent.split(":");
+								var parent_list = infos[0];
+								$("select[name=\""+parent_list+"\"]").change(function() {
+									showOptions(child_list, parent_list, orig_select[child_list]);
+								});
+							});
+						}
 
-							setListDependencies();
-					    });
+						setListDependencies();
+					});
 					</script>'."\n";
 				}
 
@@ -7219,8 +7355,7 @@ abstract class CommonObject
 	 */
 	protected function isArray($info)
 	{
-		if (is_array($info))
-		{
+		if (is_array($info)) {
 			if (isset($info['type']) && $info['type'] == 'array') return true;
 			else return false;
 		}
@@ -7247,8 +7382,7 @@ abstract class CommonObject
 	 */
 	public function isDuration($info)
 	{
-		if (is_array($info))
-		{
+		if (is_array($info)) {
 			if (isset($info['type']) && ($info['type'] == 'duration')) return true;
 			else return false;
 		} else return false;
@@ -7262,8 +7396,7 @@ abstract class CommonObject
 	 */
 	public function isInt($info)
 	{
-		if (is_array($info))
-		{
+		if (is_array($info)) {
 			if (isset($info['type']) && ($info['type'] == 'int' || preg_match('/^integer/i', $info['type']))) return true;
 			else return false;
 		} else return false;
@@ -7277,8 +7410,7 @@ abstract class CommonObject
 	 */
 	public function isFloat($info)
 	{
-		if (is_array($info))
-		{
+		if (is_array($info)) {
 			if (isset($info['type']) && (preg_match('/^(double|real|price)/i', $info['type']))) return true;
 			else return false;
 		}
@@ -7293,8 +7425,7 @@ abstract class CommonObject
 	 */
 	public function isText($info)
 	{
-		if (is_array($info))
-		{
+		if (is_array($info)) {
 			if (isset($info['type']) && $info['type'] == 'text') return true;
 			else return false;
 		}
@@ -7309,8 +7440,7 @@ abstract class CommonObject
 	 */
 	protected function canBeNull($info)
 	{
-		if (is_array($info))
-		{
+		if (is_array($info)) {
 			if (isset($info['notnull']) && $info['notnull'] != '1') return true;
 			else return false;
 		}
@@ -7325,8 +7455,7 @@ abstract class CommonObject
 	 */
 	protected function isForcedToNullIfZero($info)
 	{
-		if (is_array($info))
-		{
+		if (is_array($info)) {
 			if (isset($info['notnull']) && $info['notnull'] == '-1') return true;
 			else return false;
 		}
@@ -7341,8 +7470,7 @@ abstract class CommonObject
 	 */
 	protected function isIndex($info)
 	{
-		if (is_array($info))
-		{
+		if (is_array($info)) {
 			if (isset($info['index']) && $info['index'] == true) return true;
 			else return false;
 		}
@@ -7367,8 +7495,7 @@ abstract class CommonObject
 			// Depending on field type ('datetime', ...)
 			if ($this->isDate($info))
 			{
-				if (empty($this->{$field}))
-				{
+				if (empty($this->{$field})) {
 					$queryarray[$field] = null;
 				} else {
 					$queryarray[$field] = $this->db->idate($this->{$field});
@@ -7386,16 +7513,27 @@ abstract class CommonObject
 			} elseif ($this->isDuration($info))
 			{
 				// $this->{$field} may be null, '', 0, '0', 123, '123'
-				if ($this->{$field} != '' || !empty($info['notnull'])) $queryarray[$field] = (int) $this->{$field};		// If '0', it may be set to null later if $info['notnull'] == -1
+				if ((isset($this->{$field}) && $this->{$field} != '') || !empty($info['notnull'])) {
+					if (!isset($this->{$field})) {
+						$queryarray[$field] = 0;
+					} else {
+						$queryarray[$field] = (int) $this->{$field};		// If '0', it may be set to null later if $info['notnull'] == -1
+					}
+				}
 				else $queryarray[$field] = null;
 			} elseif ($this->isInt($info) || $this->isFloat($info))
 			{
 				if ($field == 'entity' && is_null($this->{$field})) $queryarray[$field] = $conf->entity;
 				else {
 					// $this->{$field} may be null, '', 0, '0', 123, '123'
-					if ($this->{$field} != '' || !empty($info['notnull'])) {
-						if ($this->isInt($info)) $queryarray[$field] = (int) $this->{$field};	// If '0', it may be set to null later if $info['notnull'] == -1
-						if ($this->isFloat($info)) $queryarray[$field] = (double) $this->{$field};	// If '0', it may be set to null later if $info['notnull'] == -1
+					if ((isset($this->{$field}) && $this->{$field} != '') || !empty($info['notnull'])) {
+						if (!isset($this->{$field})) {
+							$queryarray[$field] = 0;
+						} elseif ($this->isInt($info)) {
+							$queryarray[$field] = (int) $this->{$field};	// If '0', it may be set to null later if $info['notnull'] == -1
+						} elseif ($this->isFloat($info)) {
+							$queryarray[$field] = (double) $this->{$field};	// If '0', it may be set to null later if $info['notnull'] == -1
+						}
 					} else $queryarray[$field] = null;
 				}
 			} else {
@@ -7419,8 +7557,7 @@ abstract class CommonObject
 	{
 		foreach ($this->fields as $field => $info)
 		{
-			if ($this->isDate($info))
-			{
+			if ($this->isDate($info)) {
 				if (empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;
 				else $this->{$field} = strtotime($obj->{$field});
 			} elseif ($this->isArray($info))
@@ -7432,12 +7569,10 @@ abstract class CommonObject
 				} else {
 					$this->{$field} = array();
 				}
-			} elseif ($this->isInt($info))
-			{
+			} elseif ($this->isInt($info)) {
 				if ($field == 'rowid') $this->id = (int) $obj->{$field};
 				else {
-					if ($this->isForcedToNullIfZero($info))
-					{
+					if ($this->isForcedToNullIfZero($info)) {
 						if (empty($obj->{$field})) $this->{$field} = null;
 						else $this->{$field} = (double) $obj->{$field};
 					} else {
@@ -7448,10 +7583,8 @@ abstract class CommonObject
 						}
 					}
 				}
-			} elseif ($this->isFloat($info))
-			{
-				if ($this->isForcedToNullIfZero($info))
-				{
+			} elseif ($this->isFloat($info)) {
+				if ($this->isForcedToNullIfZero($info)) {
 					if (empty($obj->{$field})) $this->{$field} = null;
 					else $this->{$field} = (double) $obj->{$field};
 				} else {
@@ -7683,7 +7816,7 @@ abstract class CommonObject
 			{
 				$this->setVarsFromFetchObj($obj);
 
-				// Retreive all extrafield
+				// Retrieve all extrafield
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
 
@@ -7772,6 +7905,7 @@ abstract class CommonObject
 		unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.
 		if (array_key_exists('ref', $fieldvalues)) $fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']); // If field is a ref, we sanitize data
 
+		// Add quotes and escape on fields with type string
 		$keys = array();
 		$values = array();
 		$tmp = array();
@@ -7782,7 +7916,7 @@ abstract class CommonObject
 			$tmp[] = $k.'='.$this->quote($v, $this->fields[$k]);
 		}
 
-		// Clean and check mandatory
+		// Clean and check mandatory fields
 		foreach ($keys as $key)
 		{
 			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key] = ''; // This is an implicit foreign key field
@@ -7797,7 +7931,7 @@ abstract class CommonObject
 			}*/
 		}
 
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET '.implode(',', $tmp).' WHERE rowid='.$this->id;
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET '.implode(', ', $tmp).' WHERE rowid='.$this->id;
 
 		$this->db->begin();
 		if (!$error)
@@ -7934,6 +8068,14 @@ abstract class CommonObject
 			}
 		}
 
+		// Delete llx_ecm_files
+		if (!$error) {
+			$res = $this->deleteEcmFiles(1); // Deleting files physically is done later with the dol_delete_dir_recursive
+			if (!$res) {
+				$error++;
+			}
+		}
+
 		if (!$error && !empty($this->isextrafieldmanaged))
 		{
 			$result = $this->deleteExtraFields();
@@ -8096,8 +8238,11 @@ abstract class CommonObject
 
 		$this->db->begin();
 
+		$statusfield = 'status';
+		if ($this->element == 'don' || $this->element == 'donation') $statusfield = 'fk_statut';
+
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql .= " SET status = ".$status;
+		$sql .= " SET ".$statusfield." = ".((int) $status);
 		$sql .= " WHERE rowid = ".$this->id;
 
 		if ($this->db->query($sql))
@@ -8133,22 +8278,31 @@ abstract class CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimenCommon()
 	{
 		global $user;
 
 		$this->id = 0;
-		if (array_key_exists('label', $this->fields)) $this->label = 'This is label';
-		if (array_key_exists('note_public', $this->fields)) $this->note_public = 'Public note';
-		if (array_key_exists('note_private', $this->fields)) $this->note_private = 'Private note';
-		if (array_key_exists('date_creation', $this->fields)) $this->date_creation = (dol_now() - 3600 * 24);
-		if (array_key_exists('date_modification', $this->fields)) $this->date_modification = (dol_now() - 3600 * 24);
-		if (array_key_exists('fk_user_creat', $this->fields)) $this->fk_user_creat = $user->id;
-		if (array_key_exists('fk_user_modif', $this->fields)) $this->fk_user_modif = $user->id;
-		if (array_key_exists('date', $this->fields)) $this->date = dol_now();
-		// ...
+		$this->specimen = 1;
+		$fields = array(
+			'label' => 'This is label',
+			'ref' => 'ABCD1234',
+			'description' => 'This is a description',
+			'qty' => 123.12,
+			'note_public' => 'Public note',
+			'note_private' => 'Private note',
+			'date_creation' => (dol_now() - 3600 * 48),
+			'date_modification' => (dol_now() - 3600 * 24),
+			'fk_user_creat' => $user->id,
+			'fk_user_modif' => $user->id,
+			'date' => dol_now(),
+		);
+		foreach ($fields as $key => $value) {
+			if (array_key_exists($key, $this->fields)) $this->{$key} = $value;
+		}
+		return 1;
 	}
 
 
@@ -8185,8 +8339,8 @@ abstract class CommonObject
 
 	/**
 	 * Trim object parameters
-	 * @param string[] $parameters array of parameters to trim
 	 *
+	 * @param string[] $parameters array of parameters to trim
 	 * @return void
 	 */
 	public function trimParameters($parameters)
@@ -8286,7 +8440,7 @@ abstract class CommonObject
 	 * @param  int		$fromId	Id object source
 	 * @param  int		$toId	Id object cible
 	 * @param  string	$type	Type of category ('product', ...)
-	 * @return int      < 0 si erreur, > 0 si ok
+	 * @return int      < 0 if error, > 0 if ok
 	 */
 	public function cloneCategories($fromId, $toId, $type = '')
 	{
@@ -8315,42 +8469,80 @@ abstract class CommonObject
 	/**
 	 * Delete related files of object in database
 	 *
-	 * @return bool
+	 * @param	integer		$mode		0=Use path to find record, 1=Use src_object_xxx fields (Mode 1 is recommanded for new objects)
+	 * @return 	bool					True if OK, False if KO
 	 */
-	public function deleteEcmFiles()
+	public function deleteEcmFiles($mode = 0)
 	{
 		global $conf;
 
 		$this->db->begin();
 
-		switch ($this->element){
-			case 'propal':
-				$element = 'propale';
-				break;
-			case 'product':
-				$element = 'produit';
-				break;
-			case 'order_supplier':
-				$element ='fournisseur/commande';
-				break;
-			case 'invoice_supplier':
-				$element = 'fournisseur/facture/' . get_exdir($this->id, 2, 0, 1, $this, 'invoice_supplier');
-				break;
-			case 'shipping':
-				$element = 'expedition/sending';
-				break;
-			default:
-				$element = $this->element;
+		// Delete in database with mode 0
+		if ($mode == 0) {
+			switch ($this->element) {
+				case 'propal':
+					$element = 'propale';
+					break;
+				case 'product':
+					$element = 'produit';
+					break;
+				case 'order_supplier':
+					$element = 'fournisseur/commande';
+					break;
+				case 'invoice_supplier':
+					$element = 'fournisseur/facture/'.get_exdir($this->id, 2, 0, 1, $this, 'invoice_supplier');
+					break;
+				case 'shipping':
+					$element = 'expedition/sending';
+					break;
+				default:
+					$element = $this->element;
+			}
+
+			// Delete ecm_files extrafields
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."ecm_files_extrafields WHERE fk_object IN (";
+			$sql .= " SELECT rowid FROM ".MAIN_DB_PREFIX."ecm_files WHERE filename LIKE '".$this->db->escape($this->ref)."%'";
+			$sql .= " AND filepath = '".$this->db->escape($element)."/".$this->db->escape($this->ref)."' AND entity = ".$conf->entity; // No need of getEntity here
+			$sql .= ")";
+
+			if (!$this->db->query($sql)) {
+				$this->error = $this->db->lasterror();
+				$this->db->rollback();
+				return false;
+			}
+
+			// Delete ecm_files
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."ecm_files";
+			$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%'";
+			$sql .= " AND filepath = '".$this->db->escape($element)."/".$this->db->escape($this->ref)."' AND entity = ".$conf->entity; // No need of getEntity here
+
+			if (!$this->db->query($sql)) {
+				$this->error = $this->db->lasterror();
+				$this->db->rollback();
+				return false;
+			}
 		}
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."ecm_files";
-		$sql.= " WHERE filename LIKE '".$this->db->escape($this->ref)."%'";
-		$sql.= " AND filepath = '".$this->db->escape($element)."/".$this->db->escape($this->ref)."' AND entity = ".$conf->entity;
+		// Delete in database with mode 1
+		if ($mode == 1) {
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX."ecm_files_extrafields";
+			$sql .= " WHERE fk_object IN (SELECT rowid FROM ".MAIN_DB_PREFIX."ecm_files WHERE src_object_type = '".$this->db->escape($this->table_element.(empty($this->module) ? '' : '@'.$this->module))."' AND src_object_id = ".$this->id.")";
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$this->error = $this->db->lasterror();
+				$this->db->rollback();
+				return false;
+			}
 
-		if (!$this->db->query($sql)) {
-			$this->error = $this->db->lasterror();
-			$this->db->rollback();
-			return false;
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX."ecm_files";
+			$sql .= " WHERE src_object_type = '".$this->db->escape($this->table_element.(empty($this->module) ? '' : '@'.$this->module))."' AND src_object_id = ".$this->id;
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$this->error = $this->db->lasterror();
+				$this->db->rollback();
+				return false;
+			}
 		}
 
 		$this->db->commit();
diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
index c7e95aa1fbc..0d4cfbe4f34 100644
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -19,7 +19,7 @@
 /**
  *	\file       htdocs/core/class/commonobjectline.class.php
  *  \ingroup    core
- *  \brief      File of the superclass of classes of lines of business objects (invoice, contract, PROPAL, commands, etc. ...)
+ *  \brief      File of the superclass of classes of lines of business objects (invoice, contract, proposal, orders, etc. ...)
  */
 
 
diff --git a/htdocs/core/class/commonorder.class.php b/htdocs/core/class/commonorder.class.php
index 83d20e99b95..410bf41a601 100644
--- a/htdocs/core/class/commonorder.class.php
+++ b/htdocs/core/class/commonorder.class.php
@@ -38,6 +38,12 @@ abstract class CommonOrder extends CommonObject
  */
 abstract class CommonOrderLine extends CommonObjectLine
 {
+	/**
+	 * Custom label of line. Not used by default.
+	 * @deprecated
+	 */
+	public $label;
+
 	/**
 	 * Product ref
 	 * @var string
@@ -46,12 +52,6 @@ abstract class CommonOrderLine extends CommonObjectLine
 	 */
 	public $ref;
 
-	/**
-	 * Product ref
-	 * @var string
-	 */
-	public $product_ref;
-
 	/**
 	 * Product label
 	 * @var string
@@ -60,6 +60,12 @@ abstract class CommonOrderLine extends CommonObjectLine
 	 */
 	public $libelle;
 
+	/**
+	 * Product ref
+	 * @var string
+	 */
+	public $product_ref;
+
 	/**
 	 * Product label
 	 * @var string
@@ -72,6 +78,18 @@ abstract class CommonOrderLine extends CommonObjectLine
 	 */
 	public $product_desc;
 
+	/**
+	 * Product use lot
+	 * @var string
+	 */
+	public $product_tobatch;
+
+	/**
+	 * Product barcode
+	 * @var string
+	 */
+	public $product_barcode;
+
 	/**
 	 * Quantity
 	 * @var float
@@ -83,7 +101,7 @@ abstract class CommonOrderLine extends CommonObjectLine
 	 * @deprecated
 	 * @see $subprice
 	 */
-    public $price;
+	public $price;
 
 	/**
 	 * Unit price before taxes
@@ -115,6 +133,12 @@ abstract class CommonOrderLine extends CommonObjectLine
 	 */
 	public $remise_percent;
 
+	/**
+	 * VAT code
+	 * @var string
+	 */
+	public $vat_src_code;
+
 	/**
 	 * VAT %
 	 * @var float
@@ -145,4 +169,11 @@ abstract class CommonOrderLine extends CommonObjectLine
 	public $info_bits = 0;
 
 	public $special_code = 0;
+
+	public $fk_multicurrency;
+	public $multicurrency_code;
+	public $multicurrency_subprice;
+	public $multicurrency_total_ht;
+	public $multicurrency_total_tva;
+	public $multicurrency_total_ttc;
 }
diff --git a/htdocs/core/class/commonstickergenerator.class.php b/htdocs/core/class/commonstickergenerator.class.php
index c3d6e7de299..3a8712ad67d 100644
--- a/htdocs/core/class/commonstickergenerator.class.php
+++ b/htdocs/core/class/commonstickergenerator.class.php
@@ -61,46 +61,46 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';
  */
 abstract class CommonStickerGenerator
 {
-    public $code; // Code of format
+	public $code; // Code of format
 
-    /**
-     * @var array format Array with informations
-     */
-    public $format;
+	/**
+	 * @var array format Array with informations
+	 */
+	public $format;
 
-    // phpcs:disable PEAR.NamingConventions.ValidVariableName.PublicUnderscore
-    // protected
-    // Nom du format de l'etiquette
-    protected $_Avery_Name = '';
-    // Marge de gauche de l'etiquette
-    protected $_Margin_Left = 0;
-    // marge en haut de la page avant la premiere etiquette
-    protected $_Margin_Top = 0;
-    // Espace horizontal entre 2 bandes d'etiquettes
-    protected $_X_Space = 0;
-    // Espace vertical entre 2 bandes d'etiquettes
-    protected $_Y_Space = 0;
-    // NX Nombre d'etiquettes sur la largeur de la page
-    protected $_X_Number = 0;
-    // NY Nombre d'etiquettes sur la hauteur de la page
-    protected $_Y_Number = 0;
-    // Largeur de chaque etiquette
-    protected $_Width = 0;
-    // Hauteur de chaque etiquette
-    protected $_Height = 0;
-    // Hauteur des caracteres
-    protected $_Char_Size = 10;
-    // Hauteur par defaut d'une ligne
-    protected $_Line_Height = 10;
-    // Type of metric.. Will help to calculate good values
-    protected $_Metric = 'mm';
-    // Type of metric for the doc..
-    protected $_Metric_Doc = 'mm';
-    protected $_COUNTX = 1;
-    protected $_COUNTY = 1;
-    protected $_First = 1;
-    public $Tformat;
-    // phpcs:enable
+	// phpcs:disable PEAR.NamingConventions.ValidVariableName.PublicUnderscore
+	// protected
+	// Nom du format de l'etiquette
+	protected $_Avery_Name = '';
+	// Marge de gauche de l'etiquette
+	protected $_Margin_Left = 0;
+	// marge en haut de la page avant la premiere etiquette
+	protected $_Margin_Top = 0;
+	// Espace horizontal entre 2 bandes d'etiquettes
+	protected $_X_Space = 0;
+	// Espace vertical entre 2 bandes d'etiquettes
+	protected $_Y_Space = 0;
+	// NX Nombre d'etiquettes sur la largeur de la page
+	protected $_X_Number = 0;
+	// NY Nombre d'etiquettes sur la hauteur de la page
+	protected $_Y_Number = 0;
+	// Largeur de chaque etiquette
+	protected $_Width = 0;
+	// Hauteur de chaque etiquette
+	protected $_Height = 0;
+	// Hauteur des caracteres
+	protected $_Char_Size = 10;
+	// Hauteur par defaut d'une ligne
+	protected $_Line_Height = 10;
+	// Type of metric.. Will help to calculate good values
+	protected $_Metric = 'mm';
+	// Type of metric for the doc..
+	protected $_Metric_Doc = 'mm';
+	protected $_COUNTX = 1;
+	protected $_COUNTY = 1;
+	protected $_First = 1;
+	public $Tformat;
+	// phpcs:enable
 	/**
 	 *	Constructor
 	 *
@@ -111,7 +111,7 @@ abstract class CommonStickerGenerator
 		$this->db = $db;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Function to build PDF on disk, then output on HTTP strem.
 	 *
@@ -122,7 +122,7 @@ abstract class CommonStickerGenerator
 	 *  @return int             				1=OK, 0=KO
 	 */
 	public abstract function write_file($arrayofrecords, $outputlangs, $srctemplatepath, $outputdir = '');
-    // phpcs:enable
+	// phpcs:enable
 
 	/**
 	 * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0)
@@ -134,7 +134,7 @@ abstract class CommonStickerGenerator
 	 */
 	public abstract function addSticker(&$pdf, $outputlangs, $param);
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Methode qui permet de modifier la taille des caracteres
 	 * Cela modiera aussi l'espace entre chaque ligne
@@ -145,7 +145,7 @@ abstract class CommonStickerGenerator
 	 */
 	public function Set_Char_Size(&$pdf, $pt)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if ($pt > 3) {
 			$this->_Char_Size = $pt;
 			$this->_Line_Height = $this->_Get_Height_Chars($pt);
@@ -153,8 +153,8 @@ abstract class CommonStickerGenerator
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * protected Print dot line
 	 *
@@ -167,9 +167,9 @@ abstract class CommonStickerGenerator
 	 * @param 	int		$nbPointilles		Nb pointilles
 	 * @return	void
 	 */
-    protected function _Pointille(&$pdf, $x1 = 0, $y1 = 0, $x2 = 210, $y2 = 297, $epaisseur = 1, $nbPointilles = 15)
-    {
-        // phpcs:enable
+	protected function _Pointille(&$pdf, $x1 = 0, $y1 = 0, $x2 = 210, $y2 = 297, $epaisseur = 1, $nbPointilles = 15)
+	{
+		// phpcs:enable
 		$pdf->SetLineWidth($epaisseur);
 		$length = abs($x1 - $x2);
 		$hauteur = abs($y1 - $y2);
@@ -181,23 +181,23 @@ abstract class CommonStickerGenerator
 		for ($i = $x1; $i <= $x2; $i += $Pointilles + $Pointilles) {
 			for ($j = $i; $j <= ($i + $Pointilles); $j++) {
 				if ($j <= ($x2 - 1)) {
-		            $pdf->Line($j, $y1, $j + 1, $y1); // on trace le pointill? du haut, point par point
-		            $pdf->Line($j, $y2, $j + 1, $y2); // on trace le pointill? du bas, point par point
+					$pdf->Line($j, $y1, $j + 1, $y1); // on trace le pointill? du haut, point par point
+					$pdf->Line($j, $y2, $j + 1, $y2); // on trace le pointill? du bas, point par point
 				}
 			}
 		}
 		for ($i = $y1; $i <= $y2; $i += $Pointilles + $Pointilles) {
 			for ($j = $i; $j <= ($i + $Pointilles); $j++) {
 				if ($j <= ($y2 - 1)) {
-		            $pdf->Line($x1, $j, $x1, $j + 1); // on trace le pointill? du haut, point par point
-		            $pdf->Line($x2, $j, $x2, $j + 1); // on trace le pointill? du bas, point par point
+					$pdf->Line($x1, $j, $x1, $j + 1); // on trace le pointill? du haut, point par point
+					$pdf->Line($x2, $j, $x2, $j + 1); // on trace le pointill? du bas, point par point
 				}
 			}
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * protected Function realisant une croix aux 4 coins des cartes
 	 *
@@ -212,7 +212,7 @@ abstract class CommonStickerGenerator
 	 */
 	protected function _Croix(&$pdf, $x1 = 0, $y1 = 0, $x2 = 210, $y2 = 297, $epaisseur = 1, $taille = 4)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$pdf->SetDrawColor(192, 192, 192);
 
 		$pdf->SetLineWidth($epaisseur);
@@ -255,8 +255,8 @@ abstract class CommonStickerGenerator
 		return $value;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * protected Give the height for a char size given.
 	 *
@@ -265,7 +265,7 @@ abstract class CommonStickerGenerator
 	 */
 	protected function _Get_Height_Chars($pt)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// Array for link between height of characters and space between lines
 		$_Table_Hauteur_Chars = array(6=>2, 7=>2.5, 8=>3, 9=>3.5, 10=>4, 11=>6, 12=>7, 13=>8, 14=>9, 15=>10);
 		if (in_array($pt, array_keys($_Table_Hauteur_Chars))) {
@@ -275,8 +275,8 @@ abstract class CommonStickerGenerator
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * protected Set format
 	 *
@@ -286,7 +286,7 @@ abstract class CommonStickerGenerator
 	 */
 	protected function _Set_Format(&$pdf, $format)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->_Metric = $format['metric'];
 		$this->_Avery_Name = $format['name'];
 		$this->_Avery_Code = $format['code'];
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 8cfeea86d95..09f2b0a44ae 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -32,61 +32,61 @@
  */
 class Conf
 {
-    /** \public */
-    //! To store properties found in conf file
-    public $file;
+	/** \public */
+	//! To store properties found in conf file
+	public $file;
 
-    /**
-     * @var Object 	Associative array with some properties ->type, ->db, ...
-     */
-    public $db;
+	/**
+	 * @var Object 	Associative array with some properties ->type, ->db, ...
+	 */
+	public $db;
 
-    //! To store properties found into database
-    public $global;
-    //! To store browser info
-    public $browser;
+	//! To store properties found into database
+	public $global;
+	//! To store browser info
+	public $browser;
 
-    //! To store if javascript/ajax is enabked
-    public $use_javascript_ajax;
-    //! To store if javascript/ajax is enabked
-    public $disable_compute;
+	//! To store if javascript/ajax is enabked
+	public $use_javascript_ajax;
+	//! To store if javascript/ajax is enabked
+	public $disable_compute;
 	//! Used to store current currency (ISO code like 'USD', 'EUR', ...)
 	public $currency;
 	//! Used to store current css (from theme)
 	public $theme; // Contains current theme ("eldy", "auguria", ...)
 	public $css; // Contains full path of css page ("/theme/eldy/style.css.php", ...)
-    //! Used to store current menu handler
+	//! Used to store current menu handler
 	public $standard_menu;
-    // List of activated modules
-    public $modules = array();
-    public $modules_parts = array(
-        'css' => array(),
-        'js' => array(),
-        'tabs' => array(),
-        'triggers' => array(),
-        'login' => array(),
-        'substitutions' => array(),
-        'menus' => array(),
-        'theme' => array(),
-        'sms' => array(),
-        'tpl' => array(),
-        'barcode' => array(),
-        'models' => array(),
-        'societe' => array(),
-        'hooks' => array(),
-        'dir' => array(),
-        'syslog' => array(),
-    );
+	// List of activated modules
+	public $modules = array();
+	public $modules_parts = array(
+		'css' => array(),
+		'js' => array(),
+		'tabs' => array(),
+		'triggers' => array(),
+		'login' => array(),
+		'substitutions' => array(),
+		'menus' => array(),
+		'theme' => array(),
+		'sms' => array(),
+		'tpl' => array(),
+		'barcode' => array(),
+		'models' => array(),
+		'societe' => array(),
+		'hooks' => array(),
+		'dir' => array(),
+		'syslog' => array(),
+	);
 
-    public $logbuffer = array();
+	public $logbuffer = array();
 
-    /**
-     * @var LogHandlerInterface[]
-     */
-    public $loghandlers = array();
+	/**
+	 * @var LogHandlerInterface[]
+	 */
+	public $loghandlers = array();
 
-    //! To store properties of multi-company
-    public $multicompany;
+	//! To store properties of multi-company
+	public $multicompany;
 	//! Used to store running instance for multi-company (default 1)
 	public $entity = 1;
 	//! Used to store list of entities to use for each element
@@ -122,7 +122,7 @@ class Conf
 		// First level object
 		// TODO Remove this part.
 		$this->expedition_bon = new stdClass();
-		$this->livraison_bon = new stdClass();
+		$this->delivery_note = new stdClass();
 		$this->fournisseur = new stdClass();
 		$this->product			= new stdClass();
 		$this->service			= new stdClass();
@@ -203,7 +203,7 @@ class Conf
 						{
 							$modulename = strtolower($reg[1]);
 							$partname = strtolower($reg[2]);
-							if (!is_array($this->modules_parts[$partname])) { $this->modules_parts[$partname] = array(); }
+							if (!isset($this->modules_parts[$partname]) || !is_array($this->modules_parts[$partname])) { $this->modules_parts[$partname] = array(); }
 							$arrValue = json_decode($value, true);
 							if (is_array($arrValue) && !empty($arrValue)) $value = $arrValue;
 							elseif (in_array($partname, array('login', 'menus', 'substitutions', 'triggers', 'tpl'))) $value = '/'.$modulename.'/core/'.$partname.'/';
@@ -212,7 +212,7 @@ class Conf
 							elseif ($value == 1) $value = '/'.$modulename.'/core/modules/'.$partname.'/'; // ex: partname = societe
 							$this->modules_parts[$partname] = array_merge($this->modules_parts[$partname], array($modulename => $value)); // $value may be a string or an array
 						}
-                        // If this is a module constant (must be at end)
+						// If this is a module constant (must be at end)
 						elseif (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)$/i', $key, $reg))
 						{
 							$modulename = strtolower($reg[1]);
@@ -227,20 +227,20 @@ class Conf
 				$i++;
 			}
 
-            $db->free($resql);
-        }
+			$db->free($resql);
+		}
 
-        // Include other local consts.php files and fetch their values to the corresponding database constants.
-        if (!empty($this->global->LOCAL_CONSTS_FILES)) {
-            $filesList = explode(":", $this->global->LOCAL_CONSTS_FILES);
-            foreach ($filesList as $file) {
-                $file = dol_sanitizeFileName($file);
-                include_once DOL_DOCUMENT_ROOT."/".$file."/".$file."_consts.php"; // This file can run code like setting $this->global->XXX vars.
-            }
-        }
+		// Include other local consts.php files and fetch their values to the corresponding database constants.
+		if (!empty($this->global->LOCAL_CONSTS_FILES)) {
+			$filesList = explode(":", $this->global->LOCAL_CONSTS_FILES);
+			foreach ($filesList as $file) {
+				$file = dol_sanitizeFileName($file);
+				dol_include_once($file."/".$file."_consts.php"); // This file can run code like setting $this->global->XXX vars.
+			}
+		}
 
-        //var_dump($this->modules);
-        //var_dump($this->modules_parts['theme']);
+		//var_dump($this->modules);
+		//var_dump($this->modules_parts['theme']);
 
 		// If you can't set timezone of your PHP, set this constant. Better is to set it to UTC.
 		// In future, this constant will be forced to 'UTC' so PHP server timezone will not have effect anymore.
@@ -296,7 +296,7 @@ class Conf
 		// Define default dir_output and dir_temp for directories of modules
 		foreach ($this->modules as $module)
 		{
-		    //var_dump($module);
+			//var_dump($module);
 			// For multicompany sharings
 			$this->$module->multidir_output = array($this->entity => $rootfordata."/".$module);
 			$this->$module->multidir_temp = array($this->entity => $rootfortemp."/".$module."/temp");
@@ -370,8 +370,8 @@ class Conf
 
 		// Sous module bons d'expedition
 		$this->expedition_bon->enabled = (!empty($this->global->MAIN_SUBMODULE_EXPEDITION) ? $this->global->MAIN_SUBMODULE_EXPEDITION : 0);
-		// Sous module bons de livraison
-		$this->livraison_bon->enabled = (!empty($this->global->MAIN_SUBMODULE_LIVRAISON) ? $this->global->MAIN_SUBMODULE_LIVRAISON : 0);
+		// Sub module delivery note  Sous module bons de livraison
+		$this->delivery_note->enabled = (!empty($this->global->MAIN_SUBMODULE_DELIVERY) ? $this->global->MAIN_SUBMODULE_DELIVERY : 0);
 
 		// Module fournisseur
 		if (!empty($this->fournisseur))
@@ -450,7 +450,7 @@ class Conf
 
 		// Set some default values
 		//$this->global->MAIN_LIST_FILTER_ON_DAY=1;		// On filter that show date, we must show input field for day before or after month
-        $this->global->MAIN_MAIL_USE_MULTI_PART = 1;
+		$this->global->MAIN_MAIL_USE_MULTI_PART = 1;
 
 		// societe
 		if (empty($this->global->SOCIETE_CODECLIENT_ADDON))		$this->global->SOCIETE_CODECLIENT_ADDON = "mod_codeclient_leopard";
@@ -459,9 +459,9 @@ class Conf
 		if (empty($this->global->CHEQUERECEIPTS_ADDON))			$this->global->CHEQUERECEIPTS_ADDON = 'mod_chequereceipt_mint';
 		if (empty($this->global->TICKET_ADDON))				    $this->global->TICKET_ADDON = 'mod_ticket_simple';
 
-        // Security
+		// Security
 		if (empty($this->global->USER_PASSWORD_GENERATED)) $this->global->USER_PASSWORD_GENERATED = 'standard'; // Default password generator
-        if (empty($this->global->MAIN_UMASK)) $this->global->MAIN_UMASK = '0664'; // Default mask
+		if (empty($this->global->MAIN_UMASK)) $this->global->MAIN_UMASK = '0664'; // Default mask
 
 		// conf->use_javascript_ajax
 		$this->use_javascript_ajax = 1;
@@ -499,16 +499,16 @@ class Conf
 		if (empty($this->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY)) $this->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY = 30; // Less than 1 minutes to be sure
 
 		// conf->global->ACCOUNTING_MODE = Option des modules Comptabilites (simple ou expert). Defini le mode de calcul des etats comptables (CA,...)
-        if (empty($this->global->ACCOUNTING_MODE)) $this->global->ACCOUNTING_MODE = 'RECETTES-DEPENSES'; // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'
+		if (empty($this->global->ACCOUNTING_MODE)) $this->global->ACCOUNTING_MODE = 'RECETTES-DEPENSES'; // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'
 
-        // By default, suppliers objects can be linked to all projects
-        if (!isset($this->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)) $this->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS = 1;
+		// By default, suppliers objects can be linked to all projects
+		if (!isset($this->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)) $this->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS = 1;
 
-        // By default we enable feature to bill time spent
-        if (!isset($this->global->PROJECT_BILL_TIME_SPENT)) $this->global->PROJECT_BILL_TIME_SPENT = 1;
+		// By default we enable feature to bill time spent
+		if (!isset($this->global->PROJECT_BILL_TIME_SPENT)) $this->global->PROJECT_BILL_TIME_SPENT = 1;
 
-        // MAIN_HTML_TITLE
-        if (!isset($this->global->MAIN_HTML_TITLE)) $this->global->MAIN_HTML_TITLE = 'noapp,thirdpartynameonly,contactnameonly,projectnameonly';
+		// MAIN_HTML_TITLE
+		if (!isset($this->global->MAIN_HTML_TITLE)) $this->global->MAIN_HTML_TITLE = 'noapp,thirdpartynameonly,contactnameonly,projectnameonly';
 
 		// conf->liste_limit = constante de taille maximale des listes
 		if (empty($this->global->MAIN_SIZE_LISTE_LIMIT)) $this->global->MAIN_SIZE_LISTE_LIMIT = 25;
@@ -520,7 +520,7 @@ class Conf
 
 		// conf->theme et $this->css
 		if (empty($this->global->MAIN_THEME)) $this->global->MAIN_THEME = "eldy";
-        if (!empty($this->global->MAIN_FORCETHEME)) $this->global->MAIN_THEME = $this->global->MAIN_FORCETHEME;
+		if (!empty($this->global->MAIN_FORCETHEME)) $this->global->MAIN_THEME = $this->global->MAIN_FORCETHEME;
 		$this->theme = $this->global->MAIN_THEME;
 		$this->css = "/theme/".$this->theme."/style.css.php";
 
@@ -537,20 +537,22 @@ class Conf
 		if (!empty($this->global->MAILING_EMAIL_FROM))	$this->mailing->email_from = $this->global->MAILING_EMAIL_FROM;
 		if (!isset($this->global->MAIN_EMAIL_ADD_TRACK_ID)) $this->global->MAIN_EMAIL_ADD_TRACK_ID = 1;
 
-        // Format for date (used by default when not found or not searched in lang)
-        $this->format_date_short = "%d/%m/%Y"; // Format of day with PHP/C tags (strftime functions)
-        $this->format_date_short_java = "dd/MM/yyyy"; // Format of day with Java tags
-        $this->format_hour_short = "%H:%M";
-        $this->format_hour_short_duration = "%H:%M";
-        $this->format_date_text_short = "%d %b %Y";
-        $this->format_date_text = "%d %B %Y";
-        $this->format_date_hour_short = "%d/%m/%Y %H:%M";
-        $this->format_date_hour_sec_short = "%d/%m/%Y %H:%M:%S";
-        $this->format_date_hour_text_short = "%d %b %Y %H:%M";
-        $this->format_date_hour_text = "%d %B %Y %H:%M";
+		if (!isset($this->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP)) $this->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP = 1;
 
-        // Duration of workday
-        if (!isset($this->global->MAIN_DURATION_OF_WORKDAY)) $this->global->MAIN_DURATION_OF_WORKDAY = 86400;
+		// Format for date (used by default when not found or not searched in lang)
+		$this->format_date_short = "%d/%m/%Y"; // Format of day with PHP/C tags (strftime functions)
+		$this->format_date_short_java = "dd/MM/yyyy"; // Format of day with Java tags
+		$this->format_hour_short = "%H:%M";
+		$this->format_hour_short_duration = "%H:%M";
+		$this->format_date_text_short = "%d %b %Y";
+		$this->format_date_text = "%d %B %Y";
+		$this->format_date_hour_short = "%d/%m/%Y %H:%M";
+		$this->format_date_hour_sec_short = "%d/%m/%Y %H:%M:%S";
+		$this->format_date_hour_text_short = "%d %b %Y %H:%M";
+		$this->format_date_hour_text = "%d %B %Y %H:%M";
+
+		// Duration of workday
+		if (!isset($this->global->MAIN_DURATION_OF_WORKDAY)) $this->global->MAIN_DURATION_OF_WORKDAY = 86400;
 
 		// Limites decimales si non definie (peuvent etre egale a 0)
 		if (!isset($this->global->MAIN_MAX_DECIMALS_UNIT))  $this->global->MAIN_MAX_DECIMALS_UNIT = 5;
@@ -590,76 +592,76 @@ class Conf
 		if (empty($this->global->MAIN_USE_JQUERY_MULTISELECT) || $this->global->MAIN_USE_JQUERY_MULTISELECT == '1') $this->global->MAIN_USE_JQUERY_MULTISELECT = 'select2';
 
 		// Timeouts
-        if (empty($this->global->MAIN_USE_CONNECT_TIMEOUT)) $this->global->MAIN_USE_CONNECT_TIMEOUT = 10;
-        if (empty($this->global->MAIN_USE_RESPONSE_TIMEOUT)) $this->global->MAIN_USE_RESPONSE_TIMEOUT = 30;
+		if (empty($this->global->MAIN_USE_CONNECT_TIMEOUT)) $this->global->MAIN_USE_CONNECT_TIMEOUT = 10;
+		if (empty($this->global->MAIN_USE_RESPONSE_TIMEOUT)) $this->global->MAIN_USE_RESPONSE_TIMEOUT = 30;
 
 		// Set default variable to calculate VAT as if option tax_mode was 0 (standard)
-        if (empty($this->global->TAX_MODE_SELL_PRODUCT)) $this->global->TAX_MODE_SELL_PRODUCT = 'invoice';
-        if (empty($this->global->TAX_MODE_BUY_PRODUCT))  $this->global->TAX_MODE_BUY_PRODUCT = 'invoice';
-        if (empty($this->global->TAX_MODE_SELL_SERVICE)) $this->global->TAX_MODE_SELL_SERVICE = 'payment';
-        if (empty($this->global->TAX_MODE_BUY_SERVICE))  $this->global->TAX_MODE_BUY_SERVICE = 'payment';
+		if (empty($this->global->TAX_MODE_SELL_PRODUCT)) $this->global->TAX_MODE_SELL_PRODUCT = 'invoice';
+		if (empty($this->global->TAX_MODE_BUY_PRODUCT))  $this->global->TAX_MODE_BUY_PRODUCT = 'invoice';
+		if (empty($this->global->TAX_MODE_SELL_SERVICE)) $this->global->TAX_MODE_SELL_SERVICE = 'payment';
+		if (empty($this->global->TAX_MODE_BUY_SERVICE))  $this->global->TAX_MODE_BUY_SERVICE = 'payment';
 
 		// Delay before warnings
 		// Avoid strict errors. TODO: Replace xxx->warning_delay with a property ->warning_delay_xxx
 		if (isset($this->agenda)) {
-		    $this->adherent->subscription = new stdClass();
-            $this->adherent->subscription->warning_delay = (isset($this->global->MAIN_DELAY_MEMBERS) ? $this->global->MAIN_DELAY_MEMBERS : 0) * 86400;
+			$this->adherent->subscription = new stdClass();
+			$this->adherent->subscription->warning_delay = (isset($this->global->MAIN_DELAY_MEMBERS) ? $this->global->MAIN_DELAY_MEMBERS : 0) * 86400;
 		}
 		if (isset($this->agenda)) {
 			$this->agenda->warning_delay = (isset($this->global->MAIN_DELAY_ACTIONS_TODO) ? $this->global->MAIN_DELAY_ACTIONS_TODO : 7) * 86400;
-        }
+		}
 		if (isset($this->projet))
 		{
 			$this->projet->warning_delay = (isset($this->global->MAIN_DELAY_PROJECT_TO_CLOSE) ? $this->global->MAIN_DELAY_PROJECT_TO_CLOSE : 7) * 86400;
-		    $this->projet->task = new StdClass();
-		    $this->projet->task->warning_delay = (isset($this->global->MAIN_DELAY_TASKS_TODO) ? $this->global->MAIN_DELAY_TASKS_TODO : 7) * 86400;
+			$this->projet->task = new StdClass();
+			$this->projet->task->warning_delay = (isset($this->global->MAIN_DELAY_TASKS_TODO) ? $this->global->MAIN_DELAY_TASKS_TODO : 7) * 86400;
 		}
 
-        if (isset($this->commande)) {
-            $this->commande->client = new stdClass();
-    		$this->commande->fournisseur = new stdClass();
-    		$this->commande->client->warning_delay = (isset($this->global->MAIN_DELAY_ORDERS_TO_PROCESS) ? $this->global->MAIN_DELAY_ORDERS_TO_PROCESS : 2) * 86400;
-    		$this->commande->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS) ? $this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS : 7) * 86400;
+		if (isset($this->commande)) {
+			$this->commande->client = new stdClass();
+			$this->commande->fournisseur = new stdClass();
+			$this->commande->client->warning_delay = (isset($this->global->MAIN_DELAY_ORDERS_TO_PROCESS) ? $this->global->MAIN_DELAY_ORDERS_TO_PROCESS : 2) * 86400;
+			$this->commande->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS) ? $this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS : 7) * 86400;
 		}
 		if (isset($this->propal)) {
-		    $this->propal->cloture = new stdClass();
-    		$this->propal->facturation = new stdClass();
-    		$this->propal->cloture->warning_delay = (isset($this->global->MAIN_DELAY_PROPALS_TO_CLOSE) ? $this->global->MAIN_DELAY_PROPALS_TO_CLOSE : 0) * 86400;
-    		$this->propal->facturation->warning_delay = (isset($this->global->MAIN_DELAY_PROPALS_TO_BILL) ? $this->global->MAIN_DELAY_PROPALS_TO_BILL : 0) * 86400;
+			$this->propal->cloture = new stdClass();
+			$this->propal->facturation = new stdClass();
+			$this->propal->cloture->warning_delay = (isset($this->global->MAIN_DELAY_PROPALS_TO_CLOSE) ? $this->global->MAIN_DELAY_PROPALS_TO_CLOSE : 0) * 86400;
+			$this->propal->facturation->warning_delay = (isset($this->global->MAIN_DELAY_PROPALS_TO_BILL) ? $this->global->MAIN_DELAY_PROPALS_TO_BILL : 0) * 86400;
 		}
 		if (isset($this->facture)) {
-		    $this->facture->client = new stdClass();
-    		$this->facture->fournisseur = new stdClass();
-    		$this->facture->client->warning_delay = (isset($this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED) ? $this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED : 0) * 86400;
-    		$this->facture->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY) ? $this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY : 0) * 86400;
+			$this->facture->client = new stdClass();
+			$this->facture->fournisseur = new stdClass();
+			$this->facture->client->warning_delay = (isset($this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED) ? $this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED : 0) * 86400;
+			$this->facture->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY) ? $this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY : 0) * 86400;
 		}
 		if (isset($this->contrat)) {
-		    $this->contrat->services = new stdClass();
-    		$this->contrat->services->inactifs = new stdClass();
-	   	    $this->contrat->services->expires = new stdClass();
-	   	    $this->contrat->services->inactifs->warning_delay = (isset($this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES) ? $this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES : 0) * 86400;
-	   	    $this->contrat->services->expires->warning_delay = (isset($this->global->MAIN_DELAY_RUNNING_SERVICES) ? $this->global->MAIN_DELAY_RUNNING_SERVICES : 0) * 86400;
+			$this->contrat->services = new stdClass();
+			$this->contrat->services->inactifs = new stdClass();
+	   		$this->contrat->services->expires = new stdClass();
+	   		$this->contrat->services->inactifs->warning_delay = (isset($this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES) ? $this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES : 0) * 86400;
+	   		$this->contrat->services->expires->warning_delay = (isset($this->global->MAIN_DELAY_RUNNING_SERVICES) ? $this->global->MAIN_DELAY_RUNNING_SERVICES : 0) * 86400;
 		}
 		if (isset($this->commande)) {
-		    $this->bank->rappro					= new stdClass();
-    		$this->bank->cheque					= new stdClass();
-    		$this->bank->rappro->warning_delay = (isset($this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE) ? $this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE : 0) * 86400;
-    		$this->bank->cheque->warning_delay = (isset($this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT) ? $this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT : 0) * 86400;
+			$this->bank->rappro					= new stdClass();
+			$this->bank->cheque					= new stdClass();
+			$this->bank->rappro->warning_delay = (isset($this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE) ? $this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE : 0) * 86400;
+			$this->bank->cheque->warning_delay = (isset($this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT) ? $this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT : 0) * 86400;
 		}
 		if (isset($this->expensereport)) {
-		    $this->expensereport->approve = new stdClass();
-		    $this->expensereport->approve->warning_delay = (isset($this->global->MAIN_DELAY_EXPENSEREPORTS) ? $this->global->MAIN_DELAY_EXPENSEREPORTS : 0) * 86400;
-		    $this->expensereport->payment = new stdClass();
-		    $this->expensereport->payment->warning_delay = (isset($this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY) ? $this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY : 0) * 86400;
+			$this->expensereport->approve = new stdClass();
+			$this->expensereport->approve->warning_delay = (isset($this->global->MAIN_DELAY_EXPENSEREPORTS) ? $this->global->MAIN_DELAY_EXPENSEREPORTS : 0) * 86400;
+			$this->expensereport->payment = new stdClass();
+			$this->expensereport->payment->warning_delay = (isset($this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY) ? $this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY : 0) * 86400;
+		}
+		if (isset($this->holiday)) {
+			$this->holiday->approve = new stdClass();
+			$this->holiday->approve->warning_delay = (isset($this->global->MAIN_DELAY_HOLIDAYS) ? $this->global->MAIN_DELAY_HOLIDAYS : 0) * 86400;
 		}
-        if (isset($this->holiday)) {
-            $this->holiday->approve = new stdClass();
-            $this->holiday->approve->warning_delay = (isset($this->global->MAIN_DELAY_HOLIDAYS) ? $this->global->MAIN_DELAY_HOLIDAYS : 0) * 86400;
-        }
 
 		if (!empty($this->global->PRODUIT_MULTIPRICES) && empty($this->global->PRODUIT_MULTIPRICES_LIMIT))
 		{
-		    $this->global->PRODUIT_MULTIPRICES_LIMIT = 5;
+			$this->global->PRODUIT_MULTIPRICES_LIMIT = 5;
 		}
 
 		// For modules that want to disable top or left menu
@@ -684,6 +686,9 @@ class Conf
 		// If we are in develop mode, we activate the option MAIN_SECURITY_CSRF_WITH_TOKEN to 1 if not already defined.
 		if (!isset($this->global->MAIN_SECURITY_CSRF_WITH_TOKEN) && $this->global->MAIN_FEATURES_LEVEL >= 2) $this->global->MAIN_SECURITY_CSRF_WITH_TOKEN = 1;
 
+		if (defined('MAIN_ANTIVIRUS_COMMAND')) $this->global->MAIN_ANTIVIRUS_COMMAND = constant('MAIN_ANTIVIRUS_COMMAND');
+		if (defined('MAIN_ANTIVIRUS_PARAM')) $this->global->MAIN_ANTIVIRUS_PARAM = constant('MAIN_ANTIVIRUS_PARAM');
+
 		// For backward compatibility
 		if (isset($this->product))   $this->produit = $this->product;
 		if (isset($this->facture))   $this->invoice = $this->facture;
@@ -692,13 +697,13 @@ class Conf
 		if (isset($this->categorie)) $this->category = $this->categorie;
 		if (isset($this->project))   $this->project = $this->projet;
 
-        // Object $mc
-        if (!defined('NOREQUIREMC') && !empty($this->multicompany->enabled))
-        {
-        	if (is_object($mc)) $mc->setValues($this);
-        }
+		// Object $mc
+		if (!defined('NOREQUIREMC') && !empty($this->multicompany->enabled))
+		{
+			if (is_object($mc)) $mc->setValues($this);
+		}
 
-        if (!empty($this->syslog->enabled)) {
+		if (!empty($this->syslog->enabled)) {
 			// We init log handlers
 			if (!empty($this->global->SYSLOG_HANDLERS)) {
 				$handlers = json_decode($this->global->SYSLOG_HANDLERS);
@@ -734,6 +739,8 @@ class Conf
 					$this->loghandlers[$handler] = $loghandlerinstance;
 				}
 			}
-        }
+		}
+
+		return 0;
 	}
 }
diff --git a/htdocs/core/class/cproductnature.class.php b/htdocs/core/class/cproductnature.class.php
new file mode 100644
index 00000000000..eb16cff53ea
--- /dev/null
+++ b/htdocs/core/class/cproductnature.class.php
@@ -0,0 +1,340 @@
+<?php
+/* Copyright (C) 2007-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2020 Florian HENRY <florian.henry@scopen.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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/core/class/cproductnature.class.php
+ *      \ingroup    core
+ *      \brief      This file is CRUD class file (Create/Read/Update/Delete) for c_units dictionary
+ */
+
+
+/**
+ *	Class of dictionary of nature of product (used by imports)
+ */
+class CProductNature // extends CommonObject
+{
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
+
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
+
+	/**
+	 * @var string[] Error codes (or messages)
+	 */
+	public $errors = array();
+
+	/**
+	 * @var array record
+	 */
+	public $records = array();
+
+	/**
+	 * @var string element
+	 */
+	public $element = 'cproductnbature';
+
+	/**
+	 * @var string table element
+	 */
+	public $table_element = 'c_product_nature';
+
+	/**
+	 * @var int ID
+	 */
+	public $id;
+
+	/**
+	 * @var int code
+	 */
+	public $code;
+
+	/**
+	 * @var string label
+	 */
+	public $label;
+
+	/**
+	 * @var int active
+	 */
+	public $active;
+
+
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDb		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
+
+
+	/**
+	 *  Create object into database
+	 *
+	 *  @param      User	$user        User that create
+	 *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
+	 *  @return     int      		   	 <0 if KO, Id of created object if OK
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		global $conf, $langs;
+
+		// Insert request
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element."(";
+		$sql .= "rowid,";
+		$sql .= "code,";
+		$sql .= "label,";
+		$sql .= "active";
+		$sql .= ") VALUES (";
+		$sql .= " ".(!isset($this->id) ? 'NULL' : ((int) $this->id)).",";
+		$sql .= " ".(!isset($this->code) ? 'NULL' : ((int) $this->code)).",";
+		$sql .= " ".(!isset($this->label) ? 'NULL' : "'".$this->db->escape(trim($this->label))."'").",";
+		$sql .= " ".(!isset($this->active) ? 'NULL' : ((int) $this->active)).",";
+		$sql .= ")";
+
+		$this->db->begin();
+
+	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		// Commit or rollback
+		if (!$resql) {
+			dol_syslog(get_class($this)."::create ".$this->db->lasterror(), LOG_ERR);
+			$this->error = "Error ".$this->db->lasterror();
+			$this->db->rollback();
+			return -1;
+		} else {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+			$this->db->commit();
+			return $this->id;
+		}
+	}
+
+
+	/**
+	 *  Load object in memory from database
+	 *
+	 *  @param      int		$id    			Id of CUnit object to fetch (rowid)
+	 *  @param		string	$code			Code
+	 *  @return     int						<0 if KO, >0 if OK
+	 */
+	public function fetch($id, $code = '')
+	{
+		global $langs;
+
+		$sql = "SELECT";
+		$sql .= " t.rowid,";
+		$sql .= " t.code,";
+		$sql .= " t.label,";
+		$sql .= " t.active";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+		$sql_where = array();
+		if ($id)   $sql_where[] = " t.rowid = ".$id;
+		if ($code >= 0) $sql_where[] = " t.code = ".((int) $code);
+		if (count($sql_where) > 0) {
+			$sql .= ' WHERE '.implode(' AND ', $sql_where);
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id = $obj->rowid;
+				$this->code = $obj->code;
+				$this->label = $obj->label;
+				$this->active = $obj->active;
+			}
+			$this->db->free($resql);
+
+			return 1;
+		} else {
+	  		$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+
+	/**
+	 * Load list of objects in memory from the database.
+	 *
+	 * @param  string      $sortorder    Sort Order
+	 * @param  string      $sortfield    Sort field
+	 * @param  int         $limit        limit
+	 * @param  int         $offset       Offset
+	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
+	 * @param  string      $filtermode   Filter mode (AND or OR)
+	 * @return array|int                 int <0 if KO, array of pages if OK
+	 */
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	{
+		global $conf;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$sql = 'SELECT';
+		$sql .= " t.rowid,";
+		$sql .= " t.code,";
+		$sql .= " t.label,";
+		$sql .= " t.active";
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		// Manage filter
+		$sqlwhere = array();
+		if (count($filter) > 0) {
+			foreach ($filter as $key => $value) {
+				if ($key == 't.rowid' || $key == 't.active' || $key == 't.code') {
+					$sqlwhere[] = $key.'='.(int) $value;
+				} elseif (strpos($key, 'date') !== false) {
+					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+				} elseif ($key == 't.label') {
+					$sqlwhere[] = $key.' = \''.$this->db->escape($value).'\'';
+				} else {
+					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+				}
+			}
+		}
+		if (count($sqlwhere) > 0) {
+			$sql .= ' WHERE ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+		}
+
+		if (!empty($sortfield)) {
+			$sql .= $this->db->order($sortfield, $sortorder);
+		}
+		if (!empty($limit)) {
+			$sql .= ' '.$this->db->plimit($limit, $offset);
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$this->records = array();
+			$num = $this->db->num_rows($resql);
+			if ($num > 0) {
+				while ($obj = $this->db->fetch_object($resql))
+				{
+					$record = new self($this->db);
+
+					$record->id    = $obj->rowid;
+					$record->code = $obj->code;
+					$record->label = $obj->label;
+					$this->records[$record->id] = $record;
+				}
+			}
+			$this->db->free($resql);
+
+			return $this->records;
+		} else {
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+
+			return -1;
+		}
+	}
+
+
+	/**
+	 *  Update object into database
+	 *
+	 *  @param      User	$user        User that modify
+	 *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return     int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update($user = null, $notrigger = 0)
+	{
+		global $conf, $langs;
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql .= " code=".(isset($this->code) ? ((int) $this->code) : "null").",";
+		$sql .= " label=".(isset($this->label) ? "'".$this->db->escape(trim($this->label))."'" : "null").",";
+		$sql .= " active=".(isset($this->active) ? ((int) $this->active) : "null");
+		$sql .= " WHERE rowid=".(int) $this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		// Commit or rollback
+		if (!$resql) {
+			dol_syslog(get_class($this)."::update Error ".$this->db->lasterror(), LOG_ERR);
+			$this->error = "Error ".$this->db->lasterror();
+			$this->db->rollback();
+			return -1;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+
+ 	/**
+ 	 *  Delete object in database
+ 	 *
+ 	 *	@param  User	$user        User that delete
+ 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+ 	 *  @return	int					 <0 if KO, >0 if OK
+ 	 */
+	public function delete($user, $notrigger = 0)
+	{
+		global $conf, $langs;
+		$error = 0;
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE rowid=".(int) $this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		// Commit or rollback
+		if (!$resql) {
+			dol_syslog(get_class($this)."::delete Error ".$this->db->lasterror(), LOG_ERR);
+			$this->error = "Error ".$this->db->lasterror();
+			$this->db->rollback();
+			return -1;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+
+	/**
+	 * Get unit from code
+	 * @param int $code code of unit
+	 * @param string $mode 0= id , short_label=Use short label as value, code=use code
+	 * @return int            <0 if KO, Id of code if OK
+	 */
+	public function getProductNatureFromCode($code, $mode = 'code')
+	{
+		if ($mode == 'label') {
+			return dol_getIdFromCode($this->db, $code, $this->table_element, 'label', 'code');
+		} elseif ($mode == 'code') {
+			return dol_getIdFromCode($this->db, $code, $this->table_element, 'code', 'code');
+		}
+
+		return $code;
+	}
+}
diff --git a/htdocs/core/class/cstate.class.php b/htdocs/core/class/cstate.class.php
index 80c47591fbb..75ef9cc7f77 100644
--- a/htdocs/core/class/cstate.class.php
+++ b/htdocs/core/class/cstate.class.php
@@ -27,9 +27,9 @@
 class Cstate // extends CommonObject
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -44,7 +44,7 @@ class Cstate // extends CommonObject
 	//var $element='cstate';			//!< Id that identify managed objects
 	//var $table_element='cstate';	    //!< Name of table without prefix where object is stored
 
-    /**
+	/**
 	 * @var int ID
 	 */
 	public $id;
@@ -68,27 +68,27 @@ class Cstate // extends CommonObject
 
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDb		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDb		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *  Create object into database
-     *
-     *  @param      User	$user        User that create
-     *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
-     *  @return     int      		   	 <0 if KO, Id of created object if OK
-     */
-    public function create($user, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Create object into database
+	 *
+	 *  @param      User	$user        User that create
+	 *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
+	 *  @return     int      		   	 <0 if KO, Id of created object if OK
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -99,13 +99,13 @@ class Cstate // extends CommonObject
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Insert request
+		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_departements(";
 		$sql .= "rowid,";
 		$sql .= "code_departement,";
 		$sql .= "nom,";
 		$sql .= "active";
-        $sql .= ") VALUES (";
+		$sql .= ") VALUES (";
 		$sql .= " ".(!isset($this->rowid) ? 'NULL' : "'".$this->db->escape($this->rowid)."'").",";
 		$sql .= " ".(!isset($this->code_departement) ? 'NULL' : "'".$this->db->escape($this->code_departement)."'").",";
 		$sql .= " ".(!isset($this->nom) ? 'NULL' : "'".$this->db->escape($this->nom)."'").",";
@@ -115,84 +115,84 @@ class Cstate // extends CommonObject
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        if (!$error) {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_departements");
-        }
+		if (!$error) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_departements");
+		}
 
-        // Commit or rollback
-        if ($error)
+		// Commit or rollback
+		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
 		} else {
 			$this->db->commit();
-            return $this->id;
+			return $this->id;
 		}
-    }
+	}
 
 
-    /**
-     *  Load object in memory from database
-     *
-     *  @param      int		$id    	Id object
-     *  @param		string	$code	Code
-     *  @return     int          	<0 if KO, >0 if OK
-     */
-    public function fetch($id, $code = '')
-    {
-    	global $langs;
-        $sql = "SELECT";
+	/**
+	 *  Load object in memory from database
+	 *
+	 *  @param      int		$id    	Id object
+	 *  @param		string	$code	Code
+	 *  @return     int          	<0 if KO, >0 if OK
+	 */
+	public function fetch($id, $code = '')
+	{
+		global $langs;
+		$sql = "SELECT";
 		$sql .= " t.rowid,";
 		$sql .= " t.code_departement,";
 		$sql .= " t.nom,";
 		$sql .= " t.active";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_departements as t";
-        if ($id)   $sql .= " WHERE t.rowid = ".$id;
-        elseif ($code) $sql .= " WHERE t.code_departement = '".$this->db->escape($code)."'";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_departements as t";
+		if ($id)   $sql .= " WHERE t.rowid = ".$id;
+		elseif ($code) $sql .= " WHERE t.code_departement = '".$this->db->escape($code)."'";
 
-    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->rowid;
-				$this->code_departement = $obj->code_departement;    //deprecated
+				$this->id = $obj->rowid;
+				$this->code_departement = $obj->code_departement; //deprecated
 				$this->code = $obj->code_departement;
-				$this->nom = $obj->nom;   //deprecated
+				$this->nom = $obj->nom; //deprecated
 				$this->name = $obj->nom;
 				$this->active = $obj->active;
-            }
-            $this->db->free($resql);
+			}
+			$this->db->free($resql);
 
-            return 1;
-        } else {
-      	    $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+	  		$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Update object into database
-     *
-     *  @param      User	$user        User that modify
-     *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return     int     		   	 <0 if KO, >0 if OK
-     */
-    public function update($user = null, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Update object into database
+	 *
+	 *  @param      User	$user        User that modify
+	 *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return     int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update($user = null, $notrigger = 0)
+	{
+		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -204,40 +204,40 @@ class Cstate // extends CommonObject
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."c_departements SET";
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."c_departements SET";
 		$sql .= " code_departement=".(isset($this->code_departement) ? "'".$this->db->escape($this->code_departement)."'" : "null").",";
 		$sql .= " nom=".(isset($this->nom) ? "'".$this->db->escape($this->nom)."'" : "null").",";
 		$sql .= " active=".(isset($this->active) ? $this->active : "null")."";
-        $sql .= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-	    // Commit or rollback
-	    if ($error) {
-		    foreach ($this->errors as $errmsg) {
-			    dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-			    $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-		    }
-		    $this->db->rollback();
-		    return -1 * $error;
-	    } else {
-		    $this->db->commit();
-		    return 1;
-	    }
-    }
+		// Commit or rollback
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
 
  	/**
  	 *  Delete object in database
-	 *
-     *	@param  User	$user        User that delete
-     *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
-	 */
+ 	 *
+ 	 *	@param  User	$user        User that delete
+ 	 *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
+ 	 *  @return	int					 <0 if KO, >0 if OK
+ 	 */
 	public function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
@@ -250,15 +250,15 @@ class Cstate // extends CommonObject
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
diff --git a/htdocs/core/class/ctypent.class.php b/htdocs/core/class/ctypent.class.php
index 07d3563088e..fccdec72ab6 100644
--- a/htdocs/core/class/ctypent.class.php
+++ b/htdocs/core/class/ctypent.class.php
@@ -28,9 +28,9 @@
 class Ctypent // extends CommonObject
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -45,7 +45,7 @@ class Ctypent // extends CommonObject
 	//var $element='ctypent';			//!< Id that identify managed objects
 	//var $table_element='ctypent';	//!< Name of table without prefix where object is stored
 
-    /**
+	/**
 	 * @var int ID
 	 */
 	public $id;
@@ -58,27 +58,27 @@ class Ctypent // extends CommonObject
 
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDb		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDb		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *  Create object into database
-     *
-     *  @param      User	$user        User that create
-     *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
-     *  @return     int      		   	 <0 if KO, Id of created object if OK
-     */
-    public function create($user, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Create object into database
+	 *
+	 *  @param      User	$user        User that create
+	 *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
+	 *  @return     int      		   	 <0 if KO, Id of created object if OK
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -94,7 +94,7 @@ class Ctypent // extends CommonObject
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Insert request
+		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_typent(";
 
 		$sql .= "id,";
@@ -104,7 +104,7 @@ class Ctypent // extends CommonObject
 		$sql .= "module";
 
 
-        $sql .= ") VALUES (";
+		$sql .= ") VALUES (";
 
 		$sql .= " ".(!isset($this->id) ? 'NULL' : "'".$this->db->escape($this->id)."'").",";
 		$sql .= " ".(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").",";
@@ -118,88 +118,88 @@ class Ctypent // extends CommonObject
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
 		if (!$error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_typent");
-        }
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_typent");
+		}
 
-        // Commit or rollback
-        if ($error)
+		// Commit or rollback
+		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
 		} else {
 			$this->db->commit();
-            return $this->id;
+			return $this->id;
 		}
-    }
+	}
 
 
-    /**
-     *  Load object in memory from database
-     *
-     *  @param      int		$id    	Id object
-     *  @param		string	$code	Code
-     *  @param		string	$label	Label
-     *  @return     int          	<0 if KO, >0 if OK
-     */
-    public function fetch($id, $code = '', $label = '')
-    {
-    	global $langs;
-        $sql = "SELECT";
+	/**
+	 *  Load object in memory from database
+	 *
+	 *  @param      int		$id    	Id object
+	 *  @param		string	$code	Code
+	 *  @param		string	$label	Label
+	 *  @return     int          	<0 if KO, >0 if OK
+	 */
+	public function fetch($id, $code = '', $label = '')
+	{
+		global $langs;
+		$sql = "SELECT";
 		$sql .= " t.id,";
 		$sql .= " t.code,";
 		$sql .= " t.libelle as label,";
 		$sql .= " t.fk_country as country_id,";
 		$sql .= " t.active,";
 		$sql .= " t.module";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_typent as t";
-        if ($id)   $sql .= " WHERE t.id = ".$id;
-        elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape($code)."'";
-        elseif ($label) $sql .= " WHERE t.libelle = '".$this->db->escape($label)."'";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_typent as t";
+		if ($id)   $sql .= " WHERE t.id = ".$id;
+		elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape($code)."'";
+		elseif ($label) $sql .= " WHERE t.libelle = '".$this->db->escape($label)."'";
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->id;
+				$this->id = $obj->id;
 				$this->code = $obj->code;
 				$this->libelle = $obj->label;
 				$this->country_id = $obj->country_id;
 				$this->active = $obj->active;
 				$this->module = $obj->module;
-            }
-            $this->db->free($resql);
+			}
+			$this->db->free($resql);
 
-            return 1;
-        } else {
-      	    $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+	  		$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Update object into database
-     *
-     *  @param      User	$user        User that modify
-     *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return     int     		   	 <0 if KO, >0 if OK
-     */
-    public function update($user = null, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Update object into database
+	 *
+	 *  @param      User	$user        User that modify
+	 *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return     int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update($user = null, $notrigger = 0)
+	{
+		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -212,27 +212,27 @@ class Ctypent // extends CommonObject
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."c_typent SET";
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."c_typent SET";
 		$sql .= " code=".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").",";
 		$sql .= " libelle=".(isset($this->libelle) ? "'".$this->db->escape($this->libelle)."'" : "null").",";
 		$sql .= " active=".(isset($this->active) ? $this->active : "null").",";
 		$sql .= " module=".(isset($this->module) ? "'".$this->db->escape($this->module)."'" : "null")."";
-        $sql .= " WHERE id=".$this->id;
+		$sql .= " WHERE id=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -240,16 +240,16 @@ class Ctypent // extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-    }
+	}
 
 
  	/**
-	 *  Delete object in database
-	 *
-     *	@param  User	$user        User that delete
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
-	 */
+ 	 *  Delete object in database
+ 	 *
+ 	 *	@param  User	$user        User that delete
+ 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+ 	 *  @return	int					 <0 if KO, >0 if OK
+ 	 */
 	public function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
@@ -262,21 +262,21 @@ class Ctypent // extends CommonObject
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        // Commit or rollback
-        if ($error)
-        {
+		// Commit or rollback
+		if ($error)
+		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
-        } else {
-            $this->db->commit();
-            return 1;
-        }
-    }
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
 }
diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php
index 410c3ae3f21..9d1e5c53de1 100644
--- a/htdocs/core/class/ctyperesource.class.php
+++ b/htdocs/core/class/ctyperesource.class.php
@@ -50,9 +50,9 @@ class Ctyperesource
 	public $code;
 
 	/**
-     * @var string Type resource label
-     */
-    public $label;
+	 * @var string Type resource label
+	 */
+	public $label;
 
 	public $active;
 
@@ -252,7 +252,7 @@ class Ctyperesource
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-		    $sql .= ' '.$this->db->plimit($limit, $offset);
+			$sql .= ' '.$this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -482,9 +482,9 @@ class CtyperesourceLine
 	public $code;
 
 	/**
-     * @var string Type resource line label
-     */
-    public $label;
+	 * @var string Type resource line label
+	 */
+	public $label;
 
 	public $active;
 
diff --git a/htdocs/core/class/cunits.class.php b/htdocs/core/class/cunits.class.php
index ac7b07ea5a9..c94919eb1dc 100644
--- a/htdocs/core/class/cunits.class.php
+++ b/htdocs/core/class/cunits.class.php
@@ -28,9 +28,9 @@
 class CUnits // extends CommonObject
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -46,7 +46,7 @@ class CUnits // extends CommonObject
 	//var $element='ctypent';			//!< Id that identify managed objects
 	//var $table_element='ctypent';	//!< Name of table without prefix where object is stored
 
-    /**
+	/**
 	 * @var int ID
 	 */
 	public $id;
@@ -61,27 +61,27 @@ class CUnits // extends CommonObject
 
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDb		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDb		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *  Create object into database
-     *
-     *  @param      User	$user        User that create
-     *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
-     *  @return     int      		   	 <0 if KO, Id of created object if OK
-     */
-    public function create($user, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Create object into database
+	 *
+	 *  @param      User	$user        User that create
+	 *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
+	 *  @return     int      		   	 <0 if KO, Id of created object if OK
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -97,7 +97,7 @@ class CUnits // extends CommonObject
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Insert request
+		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_units(";
 		$sql .= "rowid,";
 		$sql .= "code,";
@@ -105,7 +105,7 @@ class CUnits // extends CommonObject
 		$sql .= "short_label,";
 		$sql .= "unit_type";
 		$sql .= "scale";
-        $sql .= ") VALUES (";
+		$sql .= ") VALUES (";
 		$sql .= " ".(!isset($this->id) ? 'NULL' : "'".$this->db->escape($this->id)."'").",";
 		$sql .= " ".(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").",";
 		$sql .= " ".(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").",";
@@ -117,45 +117,45 @@ class CUnits // extends CommonObject
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
 		if (!$error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_units");
-        }
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_units");
+		}
 
-        // Commit or rollback
-        if ($error)
+		// Commit or rollback
+		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
 		} else {
 			$this->db->commit();
-            return $this->id;
+			return $this->id;
 		}
-    }
+	}
 
 
-    /**
-     *  Load object in memory from database
-     *
-     *  @param      int		$id    			Id of CUnit object to fetch (rowid)
-     *  @param		string	$code			Code
-     *  @param		string	$short_label	Short Label ('g', 'kg', ...)
-     *  @param		string	$unit_type		Unit type ('size', 'surface', 'volume', 'weight', ...)
-     *  @return     int						<0 if KO, >0 if OK
-     */
-    public function fetch($id, $code = '', $short_label = '', $unit_type = '')
-    {
-    	global $langs;
+	/**
+	 *  Load object in memory from database
+	 *
+	 *  @param      int		$id    			Id of CUnit object to fetch (rowid)
+	 *  @param		string	$code			Code
+	 *  @param		string	$short_label	Short Label ('g', 'kg', ...)
+	 *  @param		string	$unit_type		Unit type ('size', 'surface', 'volume', 'weight', ...)
+	 *  @return     int						<0 if KO, >0 if OK
+	 */
+	public function fetch($id, $code = '', $short_label = '', $unit_type = '')
+	{
+		global $langs;
 
-        $sql = "SELECT";
+		$sql = "SELECT";
 		$sql .= " t.rowid,";
 		$sql .= " t.code,";
 		$sql .= " t.label,";
@@ -164,24 +164,24 @@ class CUnits // extends CommonObject
 		$sql .= " t.unit_type,";
 		$sql .= " t.scale,";
 		$sql .= " t.active";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_units as t";
-        $sql_where = array();
-        if ($id)   $sql_where[] = " t.rowid = ".$id;
-        if ($unit_type)   $sql_where[] = " t.unit_type = '".$this->db->escape($unit_type)."'";
-        if ($code) $sql_where[] = " t.code = '".$this->db->escape($code)."'";
-        if ($short_label) $sql_where[] = " t.short_label = '".$this->db->escape($short_label)."'";
-        if (count($sql_where) > 0) {
-        	$sql .= ' WHERE '.implode(' AND ', $sql_where);
-        }
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_units as t";
+		$sql_where = array();
+		if ($id)   $sql_where[] = " t.rowid = ".$id;
+		if ($unit_type)   $sql_where[] = " t.unit_type = '".$this->db->escape($unit_type)."'";
+		if ($code) $sql_where[] = " t.code = '".$this->db->escape($code)."'";
+		if ($short_label) $sql_where[] = " t.short_label = '".$this->db->escape($short_label)."'";
+		if (count($sql_where) > 0) {
+			$sql .= ' WHERE '.implode(' AND ', $sql_where);
+		}
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->rowid;
+				$this->id = $obj->rowid;
 				$this->code = $obj->code;
 				$this->label = $obj->label;
 				$this->short_label = $obj->short_label;
@@ -189,110 +189,109 @@ class CUnits // extends CommonObject
 				$this->unit_type = $obj->unit_type;
 				$this->scale = $obj->scale;
 				$this->active = $obj->active;
-            }
-            $this->db->free($resql);
+			}
+			$this->db->free($resql);
 
-            return 1;
-        } else {
-      	    $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+	  		$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    /**
-     * Load list of objects in memory from the database.
-     *
-     * @param  string      $sortorder    Sort Order
-     * @param  string      $sortfield    Sort field
-     * @param  int         $limit        limit
-     * @param  int         $offset       Offset
-     * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-     * @param  string      $filtermode   Filter mode (AND or OR)
-     * @return array|int                 int <0 if KO, array of pages if OK
-     */
-    public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
-    {
-    	global $conf;
+	/**
+	 * Load list of objects in memory from the database.
+	 *
+	 * @param  string      $sortorder    Sort Order
+	 * @param  string      $sortfield    Sort field
+	 * @param  int         $limit        limit
+	 * @param  int         $offset       Offset
+	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
+	 * @param  string      $filtermode   Filter mode (AND or OR)
+	 * @return array|int                 int <0 if KO, array of pages if OK
+	 */
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	{
+		global $conf;
 
-    	dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
-    	$sql = 'SELECT';
-    	$sql .= " t.rowid,";
-    	$sql .= " t.code,";
-    	$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
-    	$sqlwhere = array();
-    	if (count($filter) > 0) {
-    		foreach ($filter as $key => $value) {
-    			if ($key == 't.rowid' || $key == 't.active' || $key == 't.scale') {
-    				$sqlwhere[] = $key.'='.(int) $value;
-    			} elseif (strpos($key, 'date') !== false) {
-    				$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-    			} elseif ($key == 't.unit_type' || $key == 't.code' || $key == 't.short_label') {
-    				$sqlwhere[] = $key.' = \''.$this->db->escape($value).'\'';
-    			} else {
-    				$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
-    			}
-    		}
-    	}
-    	if (count($sqlwhere) > 0) {
-    		$sql .= ' WHERE ('.implode(' '.$filtermode.' ', $sqlwhere).')';
-    	}
+		$sql = 'SELECT';
+		$sql .= " t.rowid,";
+		$sql .= " t.code,";
+		$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
+		$sqlwhere = array();
+		if (count($filter) > 0) {
+			foreach ($filter as $key => $value) {
+				if ($key == 't.rowid' || $key == 't.active' || $key == 't.scale') {
+					$sqlwhere[] = $key.'='.(int) $value;
+				} elseif (strpos($key, 'date') !== false) {
+					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+				} elseif ($key == 't.unit_type' || $key == 't.code' || $key == 't.short_label') {
+					$sqlwhere[] = $key.' = \''.$this->db->escape($value).'\'';
+				} else {
+					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+				}
+			}
+		}
+		if (count($sqlwhere) > 0) {
+			$sql .= ' WHERE ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+		}
 
-    	if (!empty($sortfield)) {
-    		$sql .= $this->db->order($sortfield, $sortorder);
-    	}
-    	if (!empty($limit)) {
-    		$sql .= ' '.$this->db->plimit($limit, $offset);
-    	}
+		if (!empty($sortfield)) {
+			$sql .= $this->db->order($sortfield, $sortorder);
+		}
+		if (!empty($limit)) {
+			$sql .= ' '.$this->db->plimit($limit, $offset);
+		}
 
-    	$resql = $this->db->query($sql);
-    	if ($resql) {
-    		$this->records = array();
-    		$num = $this->db->num_rows($resql);
-    		if ($num > 0) {
-	    		while ($obj = $this->db->fetch_object($resql))
-	    		{
-	    			$record = new self($this->db);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$this->records = array();
+			$num = $this->db->num_rows($resql);
+			if ($num > 0) {
+				while ($obj = $this->db->fetch_object($resql)) {
+					$record = new self($this->db);
 
-	    			$record->id    = $obj->rowid;
-	    			$record->code = $obj->code;
-	    			$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;
-	    		}
-    		}
-    		$this->db->free($resql);
+					$record->id    = $obj->rowid;
+					$record->code = $obj->code;
+					$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;
+				}
+			}
+			$this->db->free($resql);
 
-    		return $this->records;
-    	} else {
-    		$this->errors[] = 'Error '.$this->db->lasterror();
-    		dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return $this->records;
+		} else {
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 
-    		return -1;
-    	}
-    }
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Update object into database
-     *
-     *  @param      User	$user        User that modify
-     *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return     int     		   	 <0 if KO, >0 if OK
-     */
-    public function update($user = null, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Update object into database
+	 *
+	 *  @param      User	$user        User that modify
+	 *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return     int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update($user = null, $notrigger = 0)
+	{
+		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -306,29 +305,29 @@ class CUnits // extends CommonObject
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."c_units SET";
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."c_units SET";
 		$sql .= " code=".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").",";
 		$sql .= " label=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
 		$sql .= " short_label=".(isset($this->short_label) ? "'".$this->db->escape($this->short_label)."'" : "null").",";
 		$sql .= " unit_type=".(isset($this->unit_type) ? "'".$this->db->escape($this->unit_type)."'" : "null").",";
 		$sql .= " scale=".(isset($this->scale) ? "'".$this->db->escape($this->scale)."'" : "null").",";
 		$sql .= " active=".(isset($this->active) ? $this->active : "null");
-        $sql .= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -336,16 +335,16 @@ class CUnits // extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-    }
+	}
 
 
  	/**
-	 *  Delete object in database
-	 *
-     *	@param  User	$user        User that delete
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
-	 */
+ 	 *  Delete object in database
+ 	 *
+ 	 *	@param  User	$user        User that delete
+ 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+ 	 *  @return	int					 <0 if KO, >0 if OK
+ 	 */
 	public function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
@@ -358,15 +357,15 @@ class CUnits // extends CommonObject
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -386,9 +385,9 @@ class CUnits // extends CommonObject
 	public function getUnitFromCode($code, $mode = 'code')
 	{
 
-		if ($mode == 'short_label'){
+		if ($mode == 'short_label') {
 			return dol_getIdFromCode($this->db, $code, 'c_units', 'short_label', 'rowid');
-		} elseif ($mode == 'code'){
+		} elseif ($mode == 'code') {
 			return dol_getIdFromCode($this->db, $code, 'c_units', 'code', 'rowid');
 		}
 
@@ -404,21 +403,21 @@ class CUnits // extends CommonObject
 	 */
 	public function unitConverter($value, $fk_unit, $fk_new_unit = 0)
 	{
-		$value  = doubleval(price2num($value));
+		$value = doubleval(price2num($value));
 		$fk_unit = intval($fk_unit);
 
 		// Calcul en unité de base
 		$scaleUnitPow = $this->scaleOfUnitPow($fk_unit);
 
 		// convert to standard unit
-		$value  = $value * $scaleUnitPow;
-		if ($fk_new_unit !=0 ){
+		$value = $value * $scaleUnitPow;
+		if ($fk_new_unit != 0) {
 			// Calcul en unité de base
 			$scaleUnitPow = $this->scaleOfUnitPow($fk_new_unit);
 			if (!empty($scaleUnitPow))
 			{
 				// convert to new unit
-				$value  = $value / $scaleUnitPow;
+				$value = $value / $scaleUnitPow;
 			}
 		}
 		return round($value, 2);
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index 4cddc65d636..9f901ed3452 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -28,12 +28,12 @@
  */
 class DiscountAbsolute
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error;
@@ -48,190 +48,190 @@ class DiscountAbsolute
 	 */
 	public $id;
 
-    /**
+	/**
 	 * @var int Thirdparty ID
 	 */
-    public $fk_soc;
+	public $fk_soc;
 
-    public $discount_type; // 0 => customer discount, 1 => supplier discount
-    public $amount_ht; //
-    public $amount_tva; //
-    public $amount_ttc; //
-    public $multicurrency_amount_ht;
-    public $multicurrency_amount_tva;
-    public $multicurrency_amount_ttc;
-    // Vat rate
-    public $tva_tx;
-    public $vat_src_code;
+	public $discount_type; // 0 => customer discount, 1 => supplier discount
+	public $amount_ht; //
+	public $amount_tva; //
+	public $amount_ttc; //
+	public $multicurrency_amount_ht;
+	public $multicurrency_amount_tva;
+	public $multicurrency_amount_ttc;
+	// Vat rate
+	public $tva_tx;
+	public $vat_src_code;
 
-    /**
+	/**
 	 * @var int User ID Id utilisateur qui accorde la remise
 	 */
 	public $fk_user;
 
-    /**
+	/**
 	 * @var string description
 	 */
 	public $description;
 
-    /**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	/**
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
-    /**
-     * @var int ID invoice line when a discount is used into an invoice line (for absolute discounts)
-     */
-    public $fk_facture_line;
+	/**
+	 * @var int ID invoice line when a discount is used into an invoice line (for absolute discounts)
+	 */
+	public $fk_facture_line;
 
-    /**
-     * @var int ID invoice when a discount line is used into an invoice (for credit note)
-     */
-    public $fk_facture;
+	/**
+	 * @var int ID invoice when a discount line is used into an invoice (for credit note)
+	 */
+	public $fk_facture;
 
-    /**
-     * @var int ID credit note or deposit used to create the discount
-     */
-    public $fk_facture_source;
-    public $ref_facture_source; // Ref credit note or deposit used to create the discount
+	/**
+	 * @var int ID credit note or deposit used to create the discount
+	 */
+	public $fk_facture_source;
+	public $ref_facture_source; // Ref credit note or deposit used to create the discount
 	public $type_facture_source;
 
-    public $fk_invoice_supplier_source;
-    public $ref_invoice_supplier_source; // Ref credit note or deposit used to create the discount
-    public $type_invoice_supplier_source;
+	public $fk_invoice_supplier_source;
+	public $ref_invoice_supplier_source; // Ref credit note or deposit used to create the discount
+	public $type_invoice_supplier_source;
 
-    /**
-     *	Constructor
-     *
-     *  @param  	DoliDB		$db		Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *	Constructor
+	 *
+	 *  @param  	DoliDB		$db		Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *	Load object from database into memory
-     *
-     *  @param      int		$rowid       					id discount to load
-     *  @param      int		$fk_facture_source				fk_facture_source
-     *  @param		int		$fk_invoice_supplier_source		fk_invoice_supplier_source
-     *	@return		int										<0 if KO, =0 if not found, >0 if OK
-     */
-    public function fetch($rowid, $fk_facture_source = 0, $fk_invoice_supplier_source = 0)
-    {
-    	global $conf;
+	/**
+	 *	Load object from database into memory
+	 *
+	 *  @param      int		$rowid       					id discount to load
+	 *  @param      int		$fk_facture_source				fk_facture_source
+	 *  @param		int		$fk_invoice_supplier_source		fk_invoice_supplier_source
+	 *	@return		int										<0 if KO, =0 if not found, >0 if OK
+	 */
+	public function fetch($rowid, $fk_facture_source = 0, $fk_invoice_supplier_source = 0)
+	{
+		global $conf;
 
-        // Check parameters
-        if (!$rowid && !$fk_facture_source && !$fk_invoice_supplier_source)
-        {
-            $this->error = 'ErrorBadParameters';
-            return -1;
-        }
+		// Check parameters
+		if (!$rowid && !$fk_facture_source && !$fk_invoice_supplier_source)
+		{
+			$this->error = 'ErrorBadParameters';
+			return -1;
+		}
 
-        $sql = "SELECT sr.rowid, sr.fk_soc, sr.discount_type,";
-        $sql .= " sr.fk_user,";
-        $sql .= " sr.amount_ht, sr.amount_tva, sr.amount_ttc, sr.tva_tx, sr.vat_src_code,";
-        $sql .= " sr.multicurrency_amount_ht, sr.multicurrency_amount_tva, sr.multicurrency_amount_ttc,";
-        $sql .= " sr.fk_facture_line, sr.fk_facture, sr.fk_facture_source, sr.fk_invoice_supplier_line, sr.fk_invoice_supplier, sr.fk_invoice_supplier_source, sr.description,";
-        $sql .= " sr.datec,";
-        $sql .= " f.ref as ref_facture_source, f.type as type_facture_source,";
-        $sql .= " fsup.ref as ref_invoice_supplier_source, fsup.type as type_invoice_supplier_source";
-        $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 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;
+		$sql = "SELECT sr.rowid, sr.fk_soc, sr.discount_type,";
+		$sql .= " sr.fk_user,";
+		$sql .= " sr.amount_ht, sr.amount_tva, sr.amount_ttc, sr.tva_tx, sr.vat_src_code,";
+		$sql .= " sr.multicurrency_amount_ht, sr.multicurrency_amount_tva, sr.multicurrency_amount_ttc,";
+		$sql .= " sr.fk_facture_line, sr.fk_facture, sr.fk_facture_source, sr.fk_invoice_supplier_line, sr.fk_invoice_supplier, sr.fk_invoice_supplier_source, sr.description,";
+		$sql .= " sr.datec,";
+		$sql .= " f.ref as ref_facture_source, f.type as type_facture_source,";
+		$sql .= " fsup.ref as ref_invoice_supplier_source, fsup.type as type_invoice_supplier_source";
+		$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 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;
 
-        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->rowid;
-                $this->fk_soc = $obj->fk_soc;
-                $this->discount_type = $obj->discount_type;
+				$this->id = $obj->rowid;
+				$this->fk_soc = $obj->fk_soc;
+				$this->discount_type = $obj->discount_type;
 
-                $this->amount_ht = $obj->amount_ht;
-                $this->amount_tva = $obj->amount_tva;
-                $this->amount_ttc = $obj->amount_ttc;
+				$this->amount_ht = $obj->amount_ht;
+				$this->amount_tva = $obj->amount_tva;
+				$this->amount_ttc = $obj->amount_ttc;
 
-                $this->multicurrency_amount_ht = $this->multicurrency_subprice = $obj->multicurrency_amount_ht;
-                $this->multicurrency_amount_tva = $obj->multicurrency_amount_tva;
-                $this->multicurrency_amount_ttc = $obj->multicurrency_amount_ttc;
+				$this->multicurrency_amount_ht = $this->multicurrency_subprice = $obj->multicurrency_amount_ht;
+				$this->multicurrency_amount_tva = $obj->multicurrency_amount_tva;
+				$this->multicurrency_amount_ttc = $obj->multicurrency_amount_ttc;
 
-                $this->tva_tx = $obj->tva_tx;
-                $this->vat_src_code = $obj->vat_src_code;
+				$this->tva_tx = $obj->tva_tx;
+				$this->vat_src_code = $obj->vat_src_code;
 
-                $this->fk_user = $obj->fk_user;
-                $this->fk_facture_line = $obj->fk_facture_line;
-                $this->fk_facture = $obj->fk_facture;
-                $this->fk_facture_source = $obj->fk_facture_source; // Id credit note or deposit source
-                $this->ref_facture_source = $obj->ref_facture_source; // Ref credit note or deposit  source
-                $this->type_facture_source = $obj->type_facture_source; // Type credit note or deposit  source
-                $this->fk_invoice_supplier_line = $obj->fk_invoice_supplier_line;
-                $this->fk_invoice_supplier = $obj->fk_invoice_supplier;
-                $this->fk_invoice_supplier_source = $obj->fk_invoice_supplier_source; // Id credit note or deposit source
-                $this->ref_invoice_supplier_source = $obj->ref_invoice_supplier_source; // Ref credit note or deposit  source
-                $this->type_invoice_supplier_source = $obj->type_invoice_supplier_source; // Type credit note or deposit  source
-                $this->description = $obj->description;
-                $this->datec = $this->db->jdate($obj->datec);
+				$this->fk_user = $obj->fk_user;
+				$this->fk_facture_line = $obj->fk_facture_line;
+				$this->fk_facture = $obj->fk_facture;
+				$this->fk_facture_source = $obj->fk_facture_source; // Id credit note or deposit source
+				$this->ref_facture_source = $obj->ref_facture_source; // Ref credit note or deposit  source
+				$this->type_facture_source = $obj->type_facture_source; // Type credit note or deposit  source
+				$this->fk_invoice_supplier_line = $obj->fk_invoice_supplier_line;
+				$this->fk_invoice_supplier = $obj->fk_invoice_supplier;
+				$this->fk_invoice_supplier_source = $obj->fk_invoice_supplier_source; // Id credit note or deposit source
+				$this->ref_invoice_supplier_source = $obj->ref_invoice_supplier_source; // Ref credit note or deposit  source
+				$this->type_invoice_supplier_source = $obj->type_invoice_supplier_source; // Type credit note or deposit  source
+				$this->description = $obj->description;
+				$this->datec = $this->db->jdate($obj->datec);
 
-                $this->db->free($resql);
-                return 1;
-            } else {
-                $this->db->free($resql);
-                return 0;
-            }
-        } else {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+				$this->db->free($resql);
+				return 1;
+			} else {
+				$this->db->free($resql);
+				return 0;
+			}
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
 
-    /**
-     *      Create a discount into database
-     *
-     *      @param      User	$user       User that create
-     *      @return     int         		<0 if KO, >0 if OK
-     */
-    public function create($user)
-    {
-        global $conf, $langs;
+	/**
+	 *      Create a discount into database
+	 *
+	 *      @param      User	$user       User that create
+	 *      @return     int         		<0 if KO, >0 if OK
+	 */
+	public function create($user)
+	{
+		global $conf, $langs;
 
-        // Clean parameters
-        $this->amount_ht = price2num($this->amount_ht);
-        $this->amount_tva = price2num($this->amount_tva);
-        $this->amount_ttc = price2num($this->amount_ttc);
+		// Clean parameters
+		$this->amount_ht = price2num($this->amount_ht);
+		$this->amount_tva = price2num($this->amount_tva);
+		$this->amount_ttc = price2num($this->amount_ttc);
 
-        $this->tva_tx = price2num($this->tva_tx);
+		$this->tva_tx = price2num($this->tva_tx);
 
-        $this->multicurrency_amount_ht = price2num($this->multicurrency_amount_ht);
-        $this->multicurrency_amount_tva = price2num($this->multicurrency_amount_tva);
-        $this->multicurrency_amount_ttc = price2num($this->multicurrency_amount_ttc);
+		$this->multicurrency_amount_ht = price2num($this->multicurrency_amount_ht);
+		$this->multicurrency_amount_tva = price2num($this->multicurrency_amount_tva);
+		$this->multicurrency_amount_ttc = price2num($this->multicurrency_amount_ttc);
 
-        if (empty($this->multicurrency_amount_ht)) $this->multicurrency_amount_ht = 0;
-        if (empty($this->multicurrency_amount_tva)) $this->multicurrency_amount_tva = 0;
-        if (empty($this->multicurrency_amount_ttc)) $this->multicurrency_amount_ttc = 0;
+		if (empty($this->multicurrency_amount_ht)) $this->multicurrency_amount_ht = 0;
+		if (empty($this->multicurrency_amount_tva)) $this->multicurrency_amount_tva = 0;
+		if (empty($this->multicurrency_amount_ttc)) $this->multicurrency_amount_ttc = 0;
 
-        // Check parameters
-        if (empty($this->description))
-        {
-            $this->error = 'BadValueForPropertyDescription';
-            dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
-            return -1;
-        }
+		// Check parameters
+		if (empty($this->description))
+		{
+			$this->error = 'BadValueForPropertyDescription';
+			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
+			return -1;
+		}
 
-        $userid = $user->id;
+		$userid = $user->id;
 		if (!($userid > 0))		// For example when record is saved into an anonymous context with a not loaded object $user.
 		{
 			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -240,463 +240,463 @@ class DiscountAbsolute
 			$userid = $tmpinvoice->fk_user_author; // We use the author of invoice
 		}
 
-        // Insert request
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise_except";
-        $sql .= " (entity, datec, fk_soc, discount_type, fk_user, description,";
-        $sql .= " amount_ht, amount_tva, amount_ttc, tva_tx, vat_src_code,";
-        $sql .= " multicurrency_amount_ht, multicurrency_amount_tva, multicurrency_amount_ttc,";
-        $sql .= " fk_facture_source, fk_invoice_supplier_source";
-        $sql .= ")";
-        $sql .= " VALUES (".$conf->entity.", '".$this->db->idate($this->datec != '' ? $this->datec : dol_now())."', ".$this->fk_soc.", ".(empty($this->discount_type) ? 0 : intval($this->discount_type)).", ".$userid.", '".$this->db->escape($this->description)."',";
-        $sql .= " ".$this->amount_ht.", ".$this->amount_tva.", ".$this->amount_ttc.", ".$this->tva_tx.", '".$this->db->escape($this->vat_src_code)."',";
-        $sql .= " ".$this->multicurrency_amount_ht.", ".$this->multicurrency_amount_tva.", ".$this->multicurrency_amount_ttc.", ";
-        $sql .= " ".($this->fk_facture_source ? "'".$this->db->escape($this->fk_facture_source)."'" : "null").",";
-        $sql .= " ".($this->fk_invoice_supplier_source ? "'".$this->db->escape($this->fk_invoice_supplier_source)."'" : "null");
-        $sql .= ")";
+		// Insert request
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise_except";
+		$sql .= " (entity, datec, fk_soc, discount_type, fk_user, description,";
+		$sql .= " amount_ht, amount_tva, amount_ttc, tva_tx, vat_src_code,";
+		$sql .= " multicurrency_amount_ht, multicurrency_amount_tva, multicurrency_amount_ttc,";
+		$sql .= " fk_facture_source, fk_invoice_supplier_source";
+		$sql .= ")";
+		$sql .= " VALUES (".$conf->entity.", '".$this->db->idate($this->datec != '' ? $this->datec : dol_now())."', ".$this->fk_soc.", ".(empty($this->discount_type) ? 0 : intval($this->discount_type)).", ".$userid.", '".$this->db->escape($this->description)."',";
+		$sql .= " ".$this->amount_ht.", ".$this->amount_tva.", ".$this->amount_ttc.", ".$this->tva_tx.", '".$this->db->escape($this->vat_src_code)."',";
+		$sql .= " ".$this->multicurrency_amount_ht.", ".$this->multicurrency_amount_tva.", ".$this->multicurrency_amount_ttc.", ";
+		$sql .= " ".($this->fk_facture_source ? "'".$this->db->escape($this->fk_facture_source)."'" : "null").",";
+		$sql .= " ".($this->fk_invoice_supplier_source ? "'".$this->db->escape($this->fk_invoice_supplier_source)."'" : "null");
+		$sql .= ")";
 
-        dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_remise_except");
-            return $this->id;
-        } else {
-            $this->error = $this->db->lasterror().' - sql='.$sql;
-            return -1;
-        }
-    }
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_remise_except");
+			return $this->id;
+		} else {
+			$this->error = $this->db->lasterror().' - sql='.$sql;
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Delete object in database. If fk_facture_source is defined, we delete all familiy with same fk_facture_source. If not, only with id is removed
-     *
-     *  @param      User    $user       Object of user asking to delete
-     *  @return     int                 <0 if KO, >0 if OK
-     */
-    public function delete($user)
-    {
-        global $conf, $langs;
+	/**
+	 *  Delete object in database. If fk_facture_source is defined, we delete all familiy with same fk_facture_source. If not, only with id is removed
+	 *
+	 *  @param      User    $user       Object of user asking to delete
+	 *  @return     int                 <0 if KO, >0 if OK
+	 */
+	public function delete($user)
+	{
+		global $conf, $langs;
 
-        // Check if we can remove the discount
-        if ($this->fk_facture_source)
-        {
-            $sql = "SELECT COUNT(rowid) as nb";
-            $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except";
-            $sql .= " WHERE (fk_facture_line IS NOT NULL"; // Not used as absolute simple discount
-            $sql .= " OR fk_facture IS NOT NULL)"; // Not used as credit note and not used as deposit
-            $sql .= " AND fk_facture_source = ".$this->fk_facture_source;
-            //$sql.=" AND rowid != ".$this->id;
+		// Check if we can remove the discount
+		if ($this->fk_facture_source)
+		{
+			$sql = "SELECT COUNT(rowid) as nb";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except";
+			$sql .= " WHERE (fk_facture_line IS NOT NULL"; // Not used as absolute simple discount
+			$sql .= " OR fk_facture IS NOT NULL)"; // Not used as credit note and not used as deposit
+			$sql .= " AND fk_facture_source = ".$this->fk_facture_source;
+			//$sql.=" AND rowid != ".$this->id;
 
-            dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if ($resql)
-            {
-                $obj = $this->db->fetch_object($resql);
-                if ($obj->nb > 0)
-                {
-                    $this->error = 'ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
-                    return -2;
-                }
-            } else {
-                dol_print_error($this->db);
-                return -1;
-            }
-        }
+			dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				$obj = $this->db->fetch_object($resql);
+				if ($obj->nb > 0)
+				{
+					$this->error = 'ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
+					return -2;
+				}
+			} else {
+				dol_print_error($this->db);
+				return -1;
+			}
+		}
 
-        // Check if we can remove the discount
-        if ($this->fk_invoice_supplier_source)
-        {
-            $sql = "SELECT COUNT(rowid) as nb";
-            $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except";
-        	$sql .= " WHERE (fk_invoice_supplier_line IS NOT NULL"; // Not used as absolute simple discount
-        	$sql .= " OR fk_invoice_supplier IS NOT NULL)"; // Not used as credit note and not used as deposit
-        	$sql .= " AND fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source;
-        	//$sql.=" AND rowid != ".$this->id;
+		// Check if we can remove the discount
+		if ($this->fk_invoice_supplier_source)
+		{
+			$sql = "SELECT COUNT(rowid) as nb";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except";
+			$sql .= " WHERE (fk_invoice_supplier_line IS NOT NULL"; // Not used as absolute simple discount
+			$sql .= " OR fk_invoice_supplier IS NOT NULL)"; // Not used as credit note and not used as deposit
+			$sql .= " AND fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source;
+			//$sql.=" AND rowid != ".$this->id;
 
-        	dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);
-        	$resql = $this->db->query($sql);
-        	if ($resql)
-        	{
-        		$obj = $this->db->fetch_object($resql);
-        		if ($obj->nb > 0)
-        		{
-        			$this->error = 'ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
-        			return -2;
-        		}
-        	} else {
-        		dol_print_error($this->db);
-        		return -1;
-        	}
-        }
+			dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				$obj = $this->db->fetch_object($resql);
+				if ($obj->nb > 0)
+				{
+					$this->error = 'ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
+					return -2;
+				}
+			} else {
+				dol_print_error($this->db);
+				return -1;
+			}
+		}
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // Delete but only if not used
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_remise_except ";
-        if ($this->fk_facture_source) $sql .= " WHERE fk_facture_source = ".$this->fk_facture_source; // Delete all lines of same serie
-        elseif ($this->fk_invoice_supplier_source) $sql .= " WHERE fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source; // Delete all lines of same serie
-        else $sql .= " WHERE rowid = ".$this->id; // Delete only line
-        $sql .= " AND (fk_facture_line IS NULL"; // Not used as absolute simple discount
-        $sql .= " AND fk_facture IS NULL)"; // Not used as credit note and not used as deposit
-        $sql .= " AND (fk_invoice_supplier_line IS NULL"; // Not used as absolute simple discount
-        $sql .= " AND fk_invoice_supplier IS NULL)"; // Not used as credit note and not used as deposit
+		// Delete but only if not used
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_remise_except ";
+		if ($this->fk_facture_source) $sql .= " WHERE fk_facture_source = ".$this->fk_facture_source; // Delete all lines of same serie
+		elseif ($this->fk_invoice_supplier_source) $sql .= " WHERE fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source; // Delete all lines of same serie
+		else $sql .= " WHERE rowid = ".$this->id; // Delete only line
+		$sql .= " AND (fk_facture_line IS NULL"; // Not used as absolute simple discount
+		$sql .= " AND fk_facture IS NULL)"; // Not used as credit note and not used as deposit
+		$sql .= " AND (fk_invoice_supplier_line IS NULL"; // Not used as absolute simple discount
+		$sql .= " AND fk_invoice_supplier IS NULL)"; // Not used as credit note and not used as deposit
 
-        dol_syslog(get_class($this)."::delete Delete discount", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            // If source of discount was a credit note or deposit, we change source statut.
-            if ($this->fk_facture_source)
-            {
-                $sql = "UPDATE ".MAIN_DB_PREFIX."facture";
-                $sql .= " set paye=0, fk_statut=1";
-                $sql .= " WHERE (type = 2 or type = 3) AND rowid=".$this->fk_facture_source;
+		dol_syslog(get_class($this)."::delete Delete discount", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			// If source of discount was a credit note or deposit, we change source statut.
+			if ($this->fk_facture_source)
+			{
+				$sql = "UPDATE ".MAIN_DB_PREFIX."facture";
+				$sql .= " set paye=0, fk_statut=1";
+				$sql .= " WHERE (type = 2 or type = 3) AND rowid=".$this->fk_facture_source;
 
-                dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);
-                $result = $this->db->query($sql);
-                if ($result)
-                {
-                    $this->db->commit();
-                    return 1;
-                } else {
-                    $this->error = $this->db->lasterror();
-                    $this->db->rollback();
-                    return -1;
-                }
-            } elseif ($this->fk_invoice_supplier_source) {
-            	$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
-            	$sql .= " set paye=0, fk_statut=1";
-            	$sql .= " WHERE (type = 2 or type = 3) AND rowid=".$this->fk_invoice_supplier_source;
+				dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);
+				$result = $this->db->query($sql);
+				if ($result)
+				{
+					$this->db->commit();
+					return 1;
+				} else {
+					$this->error = $this->db->lasterror();
+					$this->db->rollback();
+					return -1;
+				}
+			} elseif ($this->fk_invoice_supplier_source) {
+				$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
+				$sql .= " set paye=0, fk_statut=1";
+				$sql .= " WHERE (type = 2 or type = 3) AND rowid=".$this->fk_invoice_supplier_source;
 
-            	dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);
-            	$result = $this->db->query($sql);
-            	if ($result)
-            	{
-            		$this->db->commit();
-            		return 1;
-            	} else {
-            		$this->error = $this->db->lasterror();
-            		$this->db->rollback();
-            		return -1;
-            	}
-            } else {
-                $this->db->commit();
-                return 1;
-            }
-        } else {
-            $this->error = $this->db->lasterror();
-            $this->db->rollback();
-            return -1;
-        }
-    }
+				dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);
+				$result = $this->db->query($sql);
+				if ($result)
+				{
+					$this->db->commit();
+					return 1;
+				} else {
+					$this->error = $this->db->lasterror();
+					$this->db->rollback();
+					return -1;
+				}
+			} else {
+				$this->db->commit();
+				return 1;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Link the discount to a particular invoice line or a particular invoice.
-     *	When discount is a global discount used as an invoice line, we link using rowidline.
-     *	When discount is from a credit note used to reduce payment of an invoice, we link using rowidinvoice
-     *
-     *	@param		int		$rowidline		Invoice line id (To use discount into invoice lines)
-     *	@param		int		$rowidinvoice	Invoice id (To use discount as a credit note to reduc payment of invoice)
-     *	@return		int						<0 if KO, >0 if OK
-     */
-    public function link_to_invoice($rowidline, $rowidinvoice)
-    {
-        // phpcs:enable
-        // Check parameters
-        if (!$rowidline && !$rowidinvoice)
-        {
-            $this->error = 'ErrorBadParameters';
-            return -1;
-        }
-        if ($rowidline && $rowidinvoice)
-        {
-            $this->error = 'ErrorBadParameters';
-            return -2;
-        }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Link the discount to a particular invoice line or a particular invoice.
+	 *	When discount is a global discount used as an invoice line, we link using rowidline.
+	 *	When discount is from a credit note used to reduce payment of an invoice, we link using rowidinvoice
+	 *
+	 *	@param		int		$rowidline		Invoice line id (To use discount into invoice lines)
+	 *	@param		int		$rowidinvoice	Invoice id (To use discount as a credit note to reduc payment of invoice)
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	public function link_to_invoice($rowidline, $rowidinvoice)
+	{
+		// phpcs:enable
+		// Check parameters
+		if (!$rowidline && !$rowidinvoice)
+		{
+			$this->error = 'ErrorBadParameters';
+			return -1;
+		}
+		if ($rowidline && $rowidinvoice)
+		{
+			$this->error = 'ErrorBadParameters';
+			return -2;
+		}
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
-        if (!empty($this->discount_type)) {
-        	if ($rowidline)    $sql .= " SET fk_invoice_supplier_line = ".$rowidline;
-        	if ($rowidinvoice) $sql .= " SET fk_invoice_supplier = ".$rowidinvoice;
-        } else {
-        	if ($rowidline)    $sql .= " SET fk_facture_line = ".$rowidline;
-        	if ($rowidinvoice) $sql .= " SET fk_facture = ".$rowidinvoice;
-        }
-        $sql .= " WHERE rowid = ".$this->id;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
+		if (!empty($this->discount_type)) {
+			if ($rowidline)    $sql .= " SET fk_invoice_supplier_line = ".$rowidline;
+			if ($rowidinvoice) $sql .= " SET fk_invoice_supplier = ".$rowidinvoice;
+		} else {
+			if ($rowidline)    $sql .= " SET fk_facture_line = ".$rowidline;
+			if ($rowidinvoice) $sql .= " SET fk_facture = ".$rowidinvoice;
+		}
+		$sql .= " WHERE rowid = ".$this->id;
 
-        dol_syslog(get_class($this)."::link_to_invoice", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-        	if (!empty($this->discount_type)) {
-        		$this->fk_invoice_supplier_line = $rowidline;
-        		$this->fk_invoice_supplier = $rowidinvoice;
-        	} else {
-        		$this->fk_facture_line = $rowidline;
-        		$this->fk_facture = $rowidinvoice;
-        	}
-            return 1;
-        } else {
-            $this->error = $this->db->error();
-            return -3;
-        }
-    }
+		dol_syslog(get_class($this)."::link_to_invoice", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if (!empty($this->discount_type)) {
+				$this->fk_invoice_supplier_line = $rowidline;
+				$this->fk_invoice_supplier = $rowidinvoice;
+			} else {
+				$this->fk_facture_line = $rowidline;
+				$this->fk_facture = $rowidinvoice;
+			}
+			return 1;
+		} else {
+			$this->error = $this->db->error();
+			return -3;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Link the discount to a particular invoice line or a particular invoice.
-     *	Do not call this if discount is linked to a reconcialiated invoice
-     *
-     *	@return		int							<0 if KO, >0 if OK
-     */
-    public function unlink_invoice()
-    {
-        // phpcs:enable
-        $sql = "UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
-        if (!empty($this->discount_type)) {
-            $sql .= " SET fk_invoice_supplier_line = NULL, fk_invoice_supplier = NULL";
-        } else {
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Link the discount to a particular invoice line or a particular invoice.
+	 *	Do not call this if discount is linked to a reconcialiated invoice
+	 *
+	 *	@return		int							<0 if KO, >0 if OK
+	 */
+	public function unlink_invoice()
+	{
+		// phpcs:enable
+		$sql = "UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
+		if (!empty($this->discount_type)) {
+			$sql .= " SET fk_invoice_supplier_line = NULL, fk_invoice_supplier = NULL";
+		} else {
 			$sql .= " SET fk_facture_line = NULL, fk_facture = NULL";
 		}
-        $sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".$this->id;
 
-        dol_syslog(get_class($this)."::unlink_invoice", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            return 1;
-        } else {
-            $this->error = $this->db->error();
-            return -3;
-        }
-    }
+		dol_syslog(get_class($this)."::unlink_invoice", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			return 1;
+		} else {
+			$this->error = $this->db->error();
+			return -3;
+		}
+	}
 
 
-    /**
-     *  Return amount (with tax) of discounts currently available for a company, user or other criteria
-     *
-     *	@param		Societe		$company		Object third party for filter
-     *	@param		User		$user			Filtre sur un user auteur des remises
-     * 	@param		string		$filter			Filtre autre
-     * 	@param		int			$maxvalue		Filter on max value for discount
-     *  @param      int			$discount_type  0 => customer discount, 1 => supplier discount
+	/**
+	 *  Return amount (with tax) of discounts currently available for a company, user or other criteria
+	 *
+	 *	@param		Societe		$company		Object third party for filter
+	 *	@param		User		$user			Filtre sur un user auteur des remises
+	 * 	@param		string		$filter			Filtre autre
+	 * 	@param		int			$maxvalue		Filter on max value for discount
+	 *  @param      int			$discount_type  0 => customer discount, 1 => supplier discount
 	 *  @param      int			$multicurrency  Return multicurrency_amount instead of amount
-     * 	@return		int						<0 if KO, amount otherwise
-     */
-    public function getAvailableDiscounts($company = '', $user = '', $filter = '', $maxvalue = 0, $discount_type = 0, $multicurrency = 0)
-    {
-        global $conf;
+	 * 	@return		int						<0 if KO, amount otherwise
+	 */
+	public function getAvailableDiscounts($company = '', $user = '', $filter = '', $maxvalue = 0, $discount_type = 0, $multicurrency = 0)
+	{
+		global $conf;
 
-        dol_syslog(get_class($this)."::getAvailableDiscounts discount_type=".$discount_type, LOG_DEBUG);
+		dol_syslog(get_class($this)."::getAvailableDiscounts discount_type=".$discount_type, LOG_DEBUG);
 
-        $sql = "SELECT SUM(rc.amount_ttc) as amount, SUM(rc.multicurrency_amount_ttc) as multicurrency_amount";
-        $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
-        $sql .= " WHERE rc.entity = ".$conf->entity;
-        $sql .= " AND rc.discount_type=".intval($discount_type);
-        if (!empty($discount_type)) {
-        	$sql .= " AND (rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_line IS NULL)"; // Available from supplier
-        } else {
-        	$sql .= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)"; // Available to customer
-        }
-        if (is_object($company)) $sql .= " AND rc.fk_soc = ".$company->id;
-        if (is_object($user))    $sql .= " AND rc.fk_user = ".$user->id;
-        if ($filter)   $sql .= ' AND ('.$filter.')';
-        if ($maxvalue) $sql .= ' AND rc.amount_ttc <= '.price2num($maxvalue);
+		$sql = "SELECT SUM(rc.amount_ttc) as amount, SUM(rc.multicurrency_amount_ttc) as multicurrency_amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
+		$sql .= " WHERE rc.entity = ".$conf->entity;
+		$sql .= " AND rc.discount_type=".intval($discount_type);
+		if (!empty($discount_type)) {
+			$sql .= " AND (rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_line IS NULL)"; // Available from supplier
+		} else {
+			$sql .= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)"; // Available to customer
+		}
+		if (is_object($company)) $sql .= " AND rc.fk_soc = ".$company->id;
+		if (is_object($user))    $sql .= " AND rc.fk_user = ".$user->id;
+		if ($filter)   $sql .= ' AND ('.$filter.')';
+		if ($maxvalue) $sql .= ' AND rc.amount_ttc <= '.price2num($maxvalue);
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            //while ($obj)
-            //{
-            //print 'zz'.$obj->amount;
-            //$obj = $this->db->fetch_object($resql);
-            //}
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			//while ($obj)
+			//{
+			//print 'zz'.$obj->amount;
+			//$obj = $this->db->fetch_object($resql);
+			//}
 			if ($multicurrency)
 			{
 				return $obj->amount_multicurrency;
 			}
 
-            return $obj->amount;
-        }
-        return -1;
-    }
-
-
-    /**
-     *  Return amount (with tax) of all deposits invoices used by invoice as a payment.
-     *  Should always be empty, except if option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is on (not recommended).
-     *
-     *	@param		CommonInvoice	$invoice		Object invoice (customer of supplier)
-     *  @param 		int 		    $multicurrency 	1=Return multicurrency_amount instead of amount
-     *	@return		int				     			<0 if KO, Sum of credit notes and deposits amount otherwise
-     */
-    public function getSumDepositsUsed($invoice, $multicurrency = 0)
-    {
-        dol_syslog(get_class($this)."::getSumDepositsUsed", LOG_DEBUG);
-
-        if ($invoice->element == 'facture' || $invoice->element == 'invoice')
-        {
-            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
-            $sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
-            $sql .= ' AND f.type = 3';
-        } elseif ($invoice->element == 'invoice_supplier')
-        {
-            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
-            $sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
-            $sql .= ' AND f.type = 3';
-        } else {
-            $this->error = get_class($this)."::getSumDepositsUsed was called with a bad object as a first parameter";
-            dol_print_error($this->error);
-            return -1;
-        }
-
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            if ($multicurrency == 1) return $obj->multicurrency_amount;
-			else return $obj->amount;
-        } else {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
-
-    /**
-     *  Return amount (with tax) of all credit notes invoices + excess received used by invoice as a payment
-     *
-     *	@param      CommonInvoice	  $invoice	    	Object invoice
-     *	@param      int			      $multicurrency	1=Return multicurrency_amount instead of amount
-     *	@return     int					        		<0 if KO, Sum of credit notes and excess received amount otherwise
-     */
-    public function getSumCreditNotesUsed($invoice, $multicurrency = 0)
-    {
-        dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);
-
-        if ($invoice->element == 'facture' || $invoice->element == 'invoice')
-        {
-            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
-            $sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
-            $sql .= ' AND f.type IN ('.$invoice::TYPE_STANDARD.', '.$invoice::TYPE_CREDIT_NOTE.', '.$invoice::TYPE_SITUATION.')'; // Find discount coming from credit note or excess received
-        } elseif ($invoice->element == 'invoice_supplier')
-        {
-            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
-            $sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
-            $sql .= ' AND f.type IN ('.$invoice::TYPE_STANDARD.', '.$invoice::TYPE_CREDIT_NOTE.')'; // Find discount coming from credit note or excess paid
-        } else {
-            $this->error = get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
-            dol_print_error($this->error);
-            return -1;
-        }
-
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            if ($multicurrency == 1) return $obj->multicurrency_amount;
-			else return $obj->amount;
-        } else {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
-    /**
-     *    	Return amount (with tax) of all converted amount for this credit note
-     *
-     *	@param		CommonInvoice	  $invoice	    	Object invoice
-	 *	@param		int			      $multicurrency	Return multicurrency_amount instead of amount
-     *	@return		int					        		<0 if KO, Sum of credit notes and deposits amount otherwise
-     */
-    public function getSumFromThisCreditNotesNotUsed($invoice, $multicurrency = 0)
-    {
-        dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);
-
-        if ($invoice->element == 'facture' || $invoice->element == 'invoice')
-        {
-            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc';
-            $sql .= ' WHERE rc.fk_facture IS NULL AND rc.fk_facture_source = '.$invoice->id;
-        } elseif ($invoice->element == 'invoice_supplier')
-        {
-            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc';
-            $sql .= ' WHERE rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_source = '.$invoice->id;
-        } else {
-            $this->error = get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
-            dol_print_error($this->error);
-            return -1;
-        }
-
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            if ($multicurrency) return $obj->multicurrency_amount;
-			else return $obj->amount;
-        } else {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
-
-    /**
-     *  Return clickable ref of object (with picto or not)
-     *
-     *  @param		int		$withpicto		0=No picto, 1=Include picto into link, 2=Picto only
-     *  @param		string	$option			Where to link to ('invoice' or 'discount')
-     *  @return		string					String with URL
-     */
-    public function getNomUrl($withpicto, $option = 'invoice')
-    {
-        global $langs;
-
-        $result = '';
-        $link = '';
-        $linkend = '';
-        $label = '';
-        $picto = '';
-        $ref = '';
-
-        if ($option == 'invoice') {
-            $facid = !empty($this->discount_type) ? $this->fk_invoice_supplier_source : $this->fk_facture_source;
-            $link = !empty($this->discount_type) ? '/fourn/facture/card.php' : '/compta/facture/card.php';
-            $label = $langs->trans("ShowSourceInvoice").': '.$this->ref_facture_source;
-            $link = '<a href="'.DOL_URL_ROOT.$link.'?facid='.$facid.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-            $linkend = '</a>';
-            $ref = !empty($this->discount_type) ? $this->ref_invoice_supplier_source : $this->ref_facture_source;
-            $picto = 'bill';
-        }
-        if ($option == 'discount') {
-            $label = $langs->trans("Discount");
-            $link = '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$this->fk_soc.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-            $linkend = '</a>';
-            $ref = $langs->trans("Discount");
-            $picto = 'generic';
-        }
-
-
-        if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-        if ($withpicto && $withpicto != 2) $result .= ' ';
-        $result .= $link.$ref.$linkend;
-        return $result;
-    }
+			return $obj->amount;
+		}
+		return -1;
+	}
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
+	 *  Return amount (with tax) of all deposits invoices used by invoice as a payment.
+	 *  Should always be empty, except if option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is on (not recommended).
+	 *
+	 *	@param		CommonInvoice	$invoice		Object invoice (customer of supplier)
+	 *  @param 		int 		    $multicurrency 	1=Return multicurrency_amount instead of amount
+	 *	@return		int				     			<0 if KO, Sum of credit notes and deposits amount otherwise
+	 */
+	public function getSumDepositsUsed($invoice, $multicurrency = 0)
+	{
+		dol_syslog(get_class($this)."::getSumDepositsUsed", LOG_DEBUG);
+
+		if ($invoice->element == 'facture' || $invoice->element == 'invoice')
+		{
+			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
+			$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
+			$sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
+			$sql .= ' AND f.type = 3';
+		} elseif ($invoice->element == 'invoice_supplier')
+		{
+			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
+			$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
+			$sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
+			$sql .= ' AND f.type = 3';
+		} else {
+			$this->error = get_class($this)."::getSumDepositsUsed was called with a bad object as a first parameter";
+			dol_print_error($this->error);
+			return -1;
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($multicurrency == 1) return $obj->multicurrency_amount;
+			else return $obj->amount;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
+
+	/**
+	 *  Return amount (with tax) of all credit notes invoices + excess received used by invoice as a payment
+	 *
+	 *	@param      CommonInvoice	  $invoice	    	Object invoice
+	 *	@param      int			      $multicurrency	1=Return multicurrency_amount instead of amount
+	 *	@return     int					        		<0 if KO, Sum of credit notes and excess received amount otherwise
+	 */
+	public function getSumCreditNotesUsed($invoice, $multicurrency = 0)
+	{
+		dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);
+
+		if ($invoice->element == 'facture' || $invoice->element == 'invoice')
+		{
+			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
+			$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
+			$sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
+			$sql .= ' AND f.type IN ('.$invoice::TYPE_STANDARD.', '.$invoice::TYPE_CREDIT_NOTE.', '.$invoice::TYPE_SITUATION.')'; // Find discount coming from credit note or excess received
+		} elseif ($invoice->element == 'invoice_supplier')
+		{
+			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
+			$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
+			$sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
+			$sql .= ' AND f.type IN ('.$invoice::TYPE_STANDARD.', '.$invoice::TYPE_CREDIT_NOTE.')'; // Find discount coming from credit note or excess paid
+		} else {
+			$this->error = get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
+			dol_print_error($this->error);
+			return -1;
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($multicurrency == 1) return $obj->multicurrency_amount;
+			else return $obj->amount;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
+	/**
+	 *    	Return amount (with tax) of all converted amount for this credit note
+	 *
+	 *	@param		CommonInvoice	  $invoice	    	Object invoice
+	 *	@param		int			      $multicurrency	Return multicurrency_amount instead of amount
+	 *	@return		int					        		<0 if KO, Sum of credit notes and deposits amount otherwise
+	 */
+	public function getSumFromThisCreditNotesNotUsed($invoice, $multicurrency = 0)
+	{
+		dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);
+
+		if ($invoice->element == 'facture' || $invoice->element == 'invoice')
+		{
+			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
+			$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc';
+			$sql .= ' WHERE rc.fk_facture IS NULL AND rc.fk_facture_source = '.$invoice->id;
+		} elseif ($invoice->element == 'invoice_supplier')
+		{
+			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
+			$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc';
+			$sql .= ' WHERE rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_source = '.$invoice->id;
+		} else {
+			$this->error = get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
+			dol_print_error($this->error);
+			return -1;
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($multicurrency) return $obj->multicurrency_amount;
+			else return $obj->amount;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
+
+	/**
+	 *  Return clickable ref of object (with picto or not)
+	 *
+	 *  @param		int		$withpicto		0=No picto, 1=Include picto into link, 2=Picto only
+	 *  @param		string	$option			Where to link to ('invoice' or 'discount')
+	 *  @return		string					String with URL
+	 */
+	public function getNomUrl($withpicto, $option = 'invoice')
+	{
+		global $langs;
+
+		$result = '';
+		$link = '';
+		$linkend = '';
+		$label = '';
+		$picto = '';
+		$ref = '';
+
+		if ($option == 'invoice') {
+			$facid = !empty($this->discount_type) ? $this->fk_invoice_supplier_source : $this->fk_facture_source;
+			$link = !empty($this->discount_type) ? '/fourn/facture/card.php' : '/compta/facture/card.php';
+			$label = $langs->trans("ShowSourceInvoice").': '.$this->ref_facture_source;
+			$link = '<a href="'.DOL_URL_ROOT.$link.'?facid='.$facid.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+			$linkend = '</a>';
+			$ref = !empty($this->discount_type) ? $this->ref_invoice_supplier_source : $this->ref_facture_source;
+			$picto = 'bill';
+		}
+		if ($option == 'discount') {
+			$label = $langs->trans("Discount");
+			$link = '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$this->fk_soc.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+			$linkend = '</a>';
+			$ref = $langs->trans("Discount");
+			$picto = 'generic';
+		}
+
+
+		if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+		if ($withpicto && $withpicto != 2) $result .= ' ';
+		$result .= $link.$ref.$linkend;
+		return $result;
+	}
+
+
+	/**
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
 	 */
 	public function initAsSpecimen()
 	{
diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index 55474850b8e..a5405fd7158 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -28,132 +28,132 @@
  */
 class DolEditor
 {
-    public $tool; // Store the selected tool
+	public $tool; // Store the selected tool
 
-    // If using fckeditor
-    public $editor;
+	// If using fckeditor
+	public $editor;
 
-    // If not using fckeditor
-    public $content;
-    public $htmlname;
-    public $toolbarname;
-    public $toolbarstartexpanded;
-    public $rows;
-    public $cols;
-    public $height;
-    public $width;
-    public $readonly;
+	// If not using fckeditor
+	public $content;
+	public $htmlname;
+	public $toolbarname;
+	public $toolbarstartexpanded;
+	public $rows;
+	public $cols;
+	public $height;
+	public $width;
+	public $readonly;
 
 
-    /**
-     *  Create an object to build an HTML area to edit a large string content
-     *
-     *  @param 	string	$htmlname		        		HTML name of WYSIWIG field
-     *  @param 	string	$content		        		Content of WYSIWIG field
-     *  @param	int		$width							Width in pixel of edit area (auto by default)
-     *  @param 	int		$height			       		 	Height in pixel of edit area (200px by default)
-     *  @param 	string	$toolbarname	       		 	Name of bar set to use ('Full', 'dolibarr_notes[_encoded]', 'dolibarr_details[_encoded]'=the less featured, 'dolibarr_mailings[_encoded]', 'dolibarr_readonly').
-     *  @param  string	$toolbarlocation       			Where bar is stored :
-     *                       		                    'In' each window has its own toolbar
-     *                              		            'Out:name' share toolbar into the div called 'name'
-     *  @param  boolean	$toolbarstartexpanded  			Bar is visible or not at start
+	/**
+	 *  Create an object to build an HTML area to edit a large string content
+	 *
+	 *  @param 	string	$htmlname		        		HTML name of WYSIWIG field
+	 *  @param 	string	$content		        		Content of WYSIWIG field
+	 *  @param	int		$width							Width in pixel of edit area (auto by default)
+	 *  @param 	int		$height			       		 	Height in pixel of edit area (200px by default)
+	 *  @param 	string	$toolbarname	       		 	Name of bar set to use ('Full', 'dolibarr_notes[_encoded]', 'dolibarr_details[_encoded]'=the less featured, 'dolibarr_mailings[_encoded]', 'dolibarr_readonly').
+	 *  @param  string	$toolbarlocation       			Where bar is stored :
+	 *                       		                    'In' each window has its own toolbar
+	 *                              		            'Out:name' share toolbar into the div called 'name'
+	 *  @param  boolean	$toolbarstartexpanded  			Bar is visible or not at start
 	 *  @param	int		$uselocalbrowser				Enabled to add links to local object with local browser. If false, only external images can be added in content.
 	 *  @param  boolean|string	$okforextendededitor    True=Allow usage of extended editor tool if qualified (like ckeditor). If 'textarea', force use of simple textarea. If 'ace', force use of Ace.
 	 *                                                  Warning: If you use 'ace', don't forget to also include ace.js in page header. Also, the button "save" must have class="buttonforacesave".
-     *  @param  int		$rows                   		Size of rows for textarea tool
+	 *  @param  int		$rows                   		Size of rows for textarea tool
 	 *  @param  string	$cols                   		Size of cols for textarea tool (textarea number of cols '70' or percent 'x%')
 	 *  @param	int		$readonly						0=Read/Edit, 1=Read only
 	 */
-    public function __construct($htmlname, $content, $width = '', $height = 200, $toolbarname = 'Basic', $toolbarlocation = 'In', $toolbarstartexpanded = false, $uselocalbrowser = true, $okforextendededitor = true, $rows = 0, $cols = 0, $readonly = 0)
-    {
-    	global $conf, $langs;
+	public function __construct($htmlname, $content, $width = '', $height = 200, $toolbarname = 'Basic', $toolbarlocation = 'In', $toolbarstartexpanded = false, $uselocalbrowser = true, $okforextendededitor = true, $rows = 0, $cols = 0, $readonly = 0)
+	{
+		global $conf, $langs;
 
-    	dol_syslog(get_class($this)."::DolEditor htmlname=".$htmlname." width=".$width." height=".$height." toolbarname=".$toolbarname);
+		dol_syslog(get_class($this)."::DolEditor htmlname=".$htmlname." width=".$width." height=".$height." toolbarname=".$toolbarname);
 
-    	if (!$rows) $rows = round($height / 20);
-    	if (!$cols) $cols = ($width ?round($width / 6) : 80);
+		if (!$rows) $rows = round($height / 20);
+		if (!$cols) $cols = ($width ?round($width / 6) : 80);
 		$shorttoolbarname = preg_replace('/_encoded$/', '', $toolbarname);
 
-        // Name of extended editor to use (FCKEDITOR_EDITORNAME can be 'ckeditor' or 'fckeditor')
-        $defaulteditor = 'ckeditor';
-        $this->tool = empty($conf->global->FCKEDITOR_EDITORNAME) ? $defaulteditor : $conf->global->FCKEDITOR_EDITORNAME;
-        $this->uselocalbrowser = $uselocalbrowser;
-        $this->readonly = $readonly;
+		// Name of extended editor to use (FCKEDITOR_EDITORNAME can be 'ckeditor' or 'fckeditor')
+		$defaulteditor = 'ckeditor';
+		$this->tool = empty($conf->global->FCKEDITOR_EDITORNAME) ? $defaulteditor : $conf->global->FCKEDITOR_EDITORNAME;
+		$this->uselocalbrowser = $uselocalbrowser;
+		$this->readonly = $readonly;
 
-        // Check if extended editor is ok. If not we force textarea
-        if ((empty($conf->fckeditor->enabled) && $okforextendededitor != 'ace') || empty($okforextendededitor)) $this->tool = 'textarea';
+		// Check if extended editor is ok. If not we force textarea
+		if ((empty($conf->fckeditor->enabled) && $okforextendededitor != 'ace') || empty($okforextendededitor)) $this->tool = 'textarea';
 		if ($okforextendededitor === 'ace') $this->tool = 'ace';
-        //if ($conf->dol_use_jmobile) $this->tool = 'textarea';       // ckeditor and ace seems ok with mobile
+		//if ($conf->dol_use_jmobile) $this->tool = 'textarea';       // ckeditor and ace seems ok with mobile
 
-    	// Define some properties
-        if (in_array($this->tool, array('textarea', 'ckeditor', 'ace')))
-        {
-        	if ($this->tool == 'ckeditor' && ! dol_textishtml($content)) {	// We force content to be into HTML if we are using an advanced editor if content is not HTML.
-        		$this->content = dol_nl2br($content);
-        	}
-        	else {
-    	    	$this->content = $content;
-        	}
-    	    $this->htmlname 			= $htmlname;
-    	    $this->toolbarname = $shorttoolbarname;
-    	    $this->toolbarstartexpanded = $toolbarstartexpanded;
-            $this->rows					= max(ROWS_3, $rows);
-            $this->cols					= (preg_match('/%/', $cols) ? $cols : max(40, $cols)); // If $cols is a percent, we keep it, otherwise, we take max
-            $this->height = $height;
-            $this->width				= $width;
-        }
-    }
+		// Define some properties
+		if (in_array($this->tool, array('textarea', 'ckeditor', 'ace')))
+		{
+			if ($this->tool == 'ckeditor' && !dol_textishtml($content)) {	// We force content to be into HTML if we are using an advanced editor if content is not HTML.
+				$this->content = dol_nl2br($content);
+			}
+			else {
+				$this->content = $content;
+			}
+			$this->htmlname 			= $htmlname;
+			$this->toolbarname = $shorttoolbarname;
+			$this->toolbarstartexpanded = $toolbarstartexpanded;
+			$this->rows					= max(ROWS_3, $rows);
+			$this->cols					= (preg_match('/%/', $cols) ? $cols : max(40, $cols)); // If $cols is a percent, we keep it, otherwise, we take max
+			$this->height = $height;
+			$this->width				= $width;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Output edit area inside the HTML stream.
-     *	Output depends on this->tool (fckeditor, ckeditor, textarea, ...)
-     *
-     *  @param	int		$noprint             1=Return HTML string instead of printing it to output
-     *  @param	string	$morejs		         Add more js. For example: ".on( \'saveSnapshot\', function(e) { alert(\'ee\'); });". Used by CKEditor only.
-     *  @param  boolean $disallowAnyContent  Disallow to use any content. true=restrict to a predefined list of allowed elements. Used by CKEditor only.
-     *  @param	string	$titlecontent		 Show title content before editor area. Used by ACE editor only.
-     *  @param	string	$option				 For ACE editor, set the source language ('html', 'php', 'javascript', ...)
-     *  @return	void|string
-     */
-    public function Create($noprint = 0, $morejs = '', $disallowAnyContent = true, $titlecontent = '', $option = '')
-    {
-        // phpcs:enable
-    	global $conf, $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Output edit area inside the HTML stream.
+	 *	Output depends on this->tool (fckeditor, ckeditor, textarea, ...)
+	 *
+	 *  @param	int		$noprint             1=Return HTML string instead of printing it to output
+	 *  @param	string	$morejs		         Add more js. For example: ".on( \'saveSnapshot\', function(e) { alert(\'ee\'); });". Used by CKEditor only.
+	 *  @param  boolean $disallowAnyContent  Disallow to use any content. true=restrict to a predefined list of allowed elements. Used by CKEditor only.
+	 *  @param	string	$titlecontent		 Show title content before editor area. Used by ACE editor only.
+	 *  @param	string	$option				 For ACE editor, set the source language ('html', 'php', 'javascript', ...)
+	 *  @return	void|string
+	 */
+	public function Create($noprint = 0, $morejs = '', $disallowAnyContent = true, $titlecontent = '', $option = '')
+	{
+		// phpcs:enable
+		global $conf, $langs;
 
-    	$fullpage = false;
-    	if (isset($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT))
-    	{
-            $disallowAnyContent = empty($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT); // Only predefined list of html tags are allowed or all
-    	}
+		$fullpage = false;
+		if (isset($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT))
+		{
+			$disallowAnyContent = empty($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT); // Only predefined list of html tags are allowed or all
+		}
 
-    	$found = 0;
+		$found = 0;
 		$out = '';
 
-        if (in_array($this->tool, array('textarea', 'ckeditor')))
-        {
-            $found = 1;
-            //$out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" '.($this->readonly?' disabled':'').' rows="'.$this->rows.'"'.(preg_match('/%/',$this->cols)?' style="margin-top: 5px; width: '.$this->cols.'"':' cols="'.$this->cols.'"').' class="flat">';
-            // TODO We do not put the 'disabled' tag because on a read form, it change style with grey.
-            //print $this->content;
-            $out .= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" rows="'.$this->rows.'"'.(preg_match('/%/', $this->cols) ? ' style="margin-top: 5px; width: '.$this->cols.'"' : ' cols="'.$this->cols.'"').' class="flat">';
-            $out .= htmlspecialchars($this->content);
-            $out .= '</textarea>';
+		if (in_array($this->tool, array('textarea', 'ckeditor')))
+		{
+			$found = 1;
+			//$out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" '.($this->readonly?' disabled':'').' rows="'.$this->rows.'"'.(preg_match('/%/',$this->cols)?' style="margin-top: 5px; width: '.$this->cols.'"':' cols="'.$this->cols.'"').' class="flat">';
+			// TODO We do not put the 'disabled' tag because on a read form, it change style with grey.
+			//print $this->content;
+			$out .= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" rows="'.$this->rows.'"'.(preg_match('/%/', $this->cols) ? ' style="margin-top: 5px; width: '.$this->cols.'"' : ' cols="'.$this->cols.'"').' class="flat">';
+			$out .= htmlspecialchars($this->content);
+			$out .= '</textarea>';
 
-            if ($this->tool == 'ckeditor' && !empty($conf->use_javascript_ajax) && !empty($conf->fckeditor->enabled))
-            {
-            	if (!defined('REQUIRE_CKEDITOR')) define('REQUIRE_CKEDITOR', '1');
+			if ($this->tool == 'ckeditor' && !empty($conf->use_javascript_ajax) && !empty($conf->fckeditor->enabled))
+			{
+				if (!defined('REQUIRE_CKEDITOR')) define('REQUIRE_CKEDITOR', '1');
 
-            	if (!empty($conf->global->FCKEDITOR_SKIN)) {
+				if (!empty($conf->global->FCKEDITOR_SKIN)) {
 					$skin = $conf->global->FCKEDITOR_SKIN;
 				} else {
 					$skin = 'moono-lisa'; // default with ckeditor 4.6 : moono-lisa
 				}
 
-            	$htmlencode_force = preg_match('/_encoded$/', $this->toolbarname) ? 'true' : 'false';
+				$htmlencode_force = preg_match('/_encoded$/', $this->toolbarname) ? 'true' : 'false';
 
-            	$out .= '<!-- Output ckeditor $disallowAnyContent='.$disallowAnyContent.' toolbarname='.$this->toolbarname.' -->'."\n";
-            	$out .= '<script type="text/javascript">
+				$out .= '<!-- Output ckeditor $disallowAnyContent='.$disallowAnyContent.' toolbarname='.$this->toolbarname.' -->'."\n";
+				$out .= '<script type="text/javascript">
             			$(document).ready(function () {
 							/* console.log("Run ckeditor"); */
                             /* if (CKEDITOR.loadFullCore) CKEDITOR.loadFullCore(); */
@@ -191,16 +191,16 @@ class DolEditor
                                             },
 											disableNativeSpellChecker: '.(empty($conf->global->CKEDITOR_NATIVE_SPELLCHECKER) ? 'true' : 'false');
 
-            	if ($this->uselocalbrowser)
-            	{
-                    $out .= ','."\n";
-                    // To use filemanager with old fckeditor (GPL)
-                    $out .= '    filebrowserBrowseUrl : ckeditorFilebrowserBrowseUrl,';
-                    $out .= '    filebrowserImageBrowseUrl : ckeditorFilebrowserImageBrowseUrl,';
-                    //$out.= '    filebrowserUploadUrl : \''.DOL_URL_ROOT.'/includes/fckeditor/editor/filemanagerdol/connectors/php/upload.php?Type=File\',';
-                    //$out.= '    filebrowserImageUploadUrl : \''.DOL_URL_ROOT.'/includes/fckeditor/editor/filemanagerdol/connectors/php/upload.php?Type=Image\',';
-                    $out .= "\n";
-                    // To use filemanager with ckfinder (Non free) and ckfinder directory is inside htdocs/includes
+				if ($this->uselocalbrowser)
+				{
+					$out .= ','."\n";
+					// To use filemanager with old fckeditor (GPL)
+					$out .= '    filebrowserBrowseUrl : ckeditorFilebrowserBrowseUrl,';
+					$out .= '    filebrowserImageBrowseUrl : ckeditorFilebrowserImageBrowseUrl,';
+					//$out.= '    filebrowserUploadUrl : \''.DOL_URL_ROOT.'/includes/fckeditor/editor/filemanagerdol/connectors/php/upload.php?Type=File\',';
+					//$out.= '    filebrowserImageUploadUrl : \''.DOL_URL_ROOT.'/includes/fckeditor/editor/filemanagerdol/connectors/php/upload.php?Type=Image\',';
+					$out .= "\n";
+					// To use filemanager with ckfinder (Non free) and ckfinder directory is inside htdocs/includes
 					/* $out.= '    filebrowserBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html\',
                                filebrowserImageBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html?Type=Images\',
                                filebrowserFlashBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html?Type=Flash\',
@@ -208,34 +208,34 @@ class DolEditor
                                filebrowserImageUploadUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Images\',
                                filebrowserFlashUploadUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Flash\','."\n";
 					*/
-                    $out .= '    filebrowserWindowWidth : \'900\',
+					$out .= '    filebrowserWindowWidth : \'900\',
                                filebrowserWindowHeight : \'500\',
                                filebrowserImageWindowWidth : \'900\',
                                filebrowserImageWindowHeight : \'500\'';
-            	}
-            	$out .= '	})'.$morejs;
-            	$out .= '});'."\n";
-            	$out .= '</script>'."\n";
-            }
-        }
+				}
+				$out .= '	})'.$morejs;
+				$out .= '});'."\n";
+				$out .= '</script>'."\n";
+			}
+		}
 
-        // Output editor ACE
-        // Warning: ace.js and ext-statusbar.js must be loaded by the parent page.
-        if (preg_match('/^ace/', $this->tool))
-        {
-        	$found = 1;
+		// Output editor ACE
+		// Warning: ace.js and ext-statusbar.js must be loaded by the parent page.
+		if (preg_match('/^ace/', $this->tool))
+		{
+			$found = 1;
 			$format = $option;
 
-            $out .= "\n".'<!-- Output Ace editor -->'."\n";
+			$out .= "\n".'<!-- Output Ace editor -->'."\n";
 
 			if ($titlecontent)
 			{
-	            $out .= '<div class="aceeditorstatusbar" id="statusBar'.$this->htmlname.'">'.$titlecontent;
-	            $out .= ' &nbsp; - &nbsp; <a id="morelines" href="#" class="right morelines'.$this->htmlname.' reposition">'.dol_escape_htmltag($langs->trans("ShowMoreLines")).'</a> &nbsp; &nbsp; ';
-	            $out .= '</div>';
-	            $out .= '<script type="text/javascript" language="javascript">'."\n";
-	            $out .= 'jQuery(document).ready(function() {'."\n";
-	            $out .= '	var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
+				$out .= '<div class="aceeditorstatusbar" id="statusBar'.$this->htmlname.'">'.$titlecontent;
+				$out .= ' &nbsp; - &nbsp; <a id="morelines" href="#" class="right morelines'.$this->htmlname.' reposition">'.dol_escape_htmltag($langs->trans("ShowMoreLines")).'</a> &nbsp; &nbsp; ';
+				$out .= '</div>';
+				$out .= '<script type="text/javascript" language="javascript">'."\n";
+				$out .= 'jQuery(document).ready(function() {'."\n";
+				$out .= '	var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
 	    	    		   	var StatusBar = window.ace.require("ace/ext/statusbar").StatusBar;									// Init status bar. Need lib ext-statusbar
 	        			   	var statusBar = new StatusBar(aceEditor, document.getElementById("statusBar'.$this->htmlname.'"));	// Init status bar. Need lib ext-statusbar
 	            			var oldNbOfLines = 0
@@ -257,21 +257,21 @@ class DolEditor
 									}
 							});
 						})';
-	            $out .= '</script>'."\n";
+				$out .= '</script>'."\n";
 			}
 
-            $out .= '<pre id="'.$this->htmlname.'aceeditorid" style="'.($this->width ? 'width: '.$this->width.'px; ' : '');
-            $out .= ($this->height ? ' height: '.$this->height.'px; ' : '');
-            //$out.=" min-height: 100px;";
-            $out .= '">';
-        	$out .= htmlspecialchars($this->content);
-        	$out .= '</pre>';
-        	$out .= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" style="width:0px; height: 0px; display: none;">';
-        	$out .= htmlspecialchars($this->content);
-        	$out .= '</textarea>';
+			$out .= '<pre id="'.$this->htmlname.'aceeditorid" style="'.($this->width ? 'width: '.$this->width.'px; ' : '');
+			$out .= ($this->height ? ' height: '.$this->height.'px; ' : '');
+			//$out.=" min-height: 100px;";
+			$out .= '">';
+			$out .= htmlspecialchars($this->content);
+			$out .= '</pre>';
+			$out .= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" style="width:0px; height: 0px; display: none;">';
+			$out .= htmlspecialchars($this->content);
+			$out .= '</textarea>';
 
-        	$out .= '<script type="text/javascript" language="javascript">'."\n";
-        	$out .= 'var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
+			$out .= '<script type="text/javascript" language="javascript">'."\n";
+			$out .= 'var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
 
 				    aceEditor.session.setMode("ace/mode/'.$format.'");
 					aceEditor.setOptions({
@@ -291,7 +291,7 @@ class DolEditor
 					//aceEditor.getSession().setMode("ace/mode/javascript_expression");
 					'."\n";
 
-        	$out .= 'jQuery(document).ready(function() {
+			$out .= 'jQuery(document).ready(function() {
 						jQuery(".buttonforacesave").click(function() {
         					console.log("We click on savefile button for component '.$this->htmlname.'");
         					var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid")
@@ -301,15 +301,15 @@ class DolEditor
 							else return false;*/
 	        			});
 					})';
-        	$out .= '</script>'."\n";
-        }
+			$out .= '</script>'."\n";
+		}
 
-        if (empty($found))
-        {
-            $out .= 'Error, unknown value for tool '.$this->tool.' in DolEditor Create function.';
-        }
+		if (empty($found))
+		{
+			$out .= 'Error, unknown value for tool '.$this->tool.' in DolEditor Create function.';
+		}
 
-        if ($noprint) return $out;
-        else print $out;
-    }
+		if ($noprint) return $out;
+		else print $out;
+	}
 }
diff --git a/htdocs/core/class/dolexception.class.php b/htdocs/core/class/dolexception.class.php
index 2c43a43127c..e083a47d5f7 100644
--- a/htdocs/core/class/dolexception.class.php
+++ b/htdocs/core/class/dolexception.class.php
@@ -27,10 +27,10 @@
  */
 class DolException extends Exception
 {
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+	}
 }
diff --git a/htdocs/core/class/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php
index 2b148a96e8a..98fbe62e4c5 100644
--- a/htdocs/core/class/dolgeoip.class.php
+++ b/htdocs/core/class/dolgeoip.class.php
@@ -33,7 +33,7 @@
  */
 class DolGeoIP
 {
-    public $gi;
+	public $gi;
 
 	/**
 	 * Constructor
@@ -50,18 +50,18 @@ class DolGeoIP
 
 		if ($type == 'country')
 		{
-		    // geoip may have been already included with PEAR
+			// geoip may have been already included with PEAR
 			if ($geoipversion == '2' || ($geoipversion != 'php' && !function_exists('geoip_country_code_by_name')))
-		    {
-		    	require_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar';
-		    }
+			{
+				require_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar';
+			}
 		} elseif ($type == 'city')
 		{
-		    // geoip may have been already included with PEAR
+			// geoip may have been already included with PEAR
 			if ($geoipversion == '2' || ($geoipversion != 'php' && !function_exists('geoip_country_code_by_name')))
-		    {
-		    	require_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar';
-		    }
+			{
+				require_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar';
+			}
 		} else { print 'ErrorBadParameterInConstructor'; return 0; }
 
 		// Here, function exists (embedded into PHP or exists because we made include)
@@ -92,10 +92,13 @@ class DolGeoIP
 		} elseif (function_exists('geoip_open'))
 		{
 			$this->gi = geoip_open($datfile, GEOIP_STANDARD);
+		}
+		elseif (function_exists('geoip_country_code_by_name')) {
+			$this->gi = 'NOGI'; // We are using embedded php geoip functions
+			//print 'function_exists(geoip_country_code_by_name))='.function_exists('geoip_country_code_by_name');
+			//print geoip_database_info();
 		} else {
-		    $this->gi = 'NOGI'; // We are using embedded php geoip functions
-		    //print 'function_exists(geoip_country_code_by_name))='.function_exists('geoip_country_code_by_name');
-		    //print geoip_database_info();
+			$this->gi = ''; // For avoid error
 		}
 	}
 
@@ -118,8 +121,8 @@ class DolGeoIP
 		}
 		if ($this->gi == 'NOGI')
 		{
-		    // geoip_country_code_by_addr does not exists
-    		return strtolower(geoip_country_code_by_name($ip));
+			// geoip_country_code_by_addr does not exists
+			return strtolower(geoip_country_code_by_name($ip));
 		} else {
 			if (preg_match('/^[0-9]+.[0-9]+\.[0-9]+\.[0-9]+/', $ip))
 			{
@@ -133,8 +136,8 @@ class DolGeoIP
 						return '';
 					}
 				} else {
-			    	if (!function_exists('geoip_country_code_by_addr')) return strtolower(geoip_country_code_by_name($this->gi, $ip));
-			    	return strtolower(geoip_country_code_by_addr($this->gi, $ip));
+					if (!function_exists('geoip_country_code_by_addr')) return strtolower(geoip_country_code_by_name($this->gi, $ip));
+					return strtolower(geoip_country_code_by_addr($this->gi, $ip));
 				}
 			} else {
 				if ($geoipversion == '2')
@@ -186,37 +189,37 @@ class DolGeoIP
 		}
 	}
 
-    /**
-     * Return verion of data file
-     *
-     * @return  string      Version of datafile
-     */
-    public function getVersion()
-    {
-    	global $conf;
+	/**
+	 * Return verion of data file
+	 *
+	 * @return  string      Version of datafile
+	 */
+	public function getVersion()
+	{
+		global $conf;
 
-    	$geoipversion = '2'; // 'php', or '2'
-    	if (!empty($conf->global->GEOIP_VERSION)) $geoipversion = $conf->global->GEOIP_VERSION;
+		$geoipversion = '2'; // 'php', or '2'
+		if (!empty($conf->global->GEOIP_VERSION)) $geoipversion = $conf->global->GEOIP_VERSION;
 
-    	if ($geoipversion == 'php')
-    	{
-        	if ($this->gi == 'NOGI') return geoip_database_info();
-        	else return 'geoip_database_info() function not available';
-    	}
+		if ($geoipversion == 'php')
+		{
+			if ($this->gi == 'NOGI') return geoip_database_info();
+			else return 'geoip_database_info() function not available';
+		}
 
-    	return 'Not available (not using PHP internal geo functions - We are using embedded Geoip v'.$geoipversion.')';
-    }
+		return 'Not available (not using PHP internal geo functions - We are using embedded Geoip v'.$geoipversion.')';
+	}
 
-    /**
-     * Close geoip object
-     *
-     * @return	void
-     */
-    public function close()
-    {
-        if (function_exists('geoip_close')) {
-            // With some geoip with PEAR, geoip_close function may not exists
-            geoip_close($this->gi);
-        }
-    }
+	/**
+	 * Close geoip object
+	 *
+	 * @return	void
+	 */
+	public function close()
+	{
+		if (function_exists('geoip_close')) {
+			// With some geoip with PEAR, geoip_close function may not exists
+			geoip_close($this->gi);
+		}
+	}
 }
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 0a1686c3585..36638be33c1 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -39,9 +39,9 @@
  */
 class DolGraph
 {
-	public $type = array(); // Array with type of each series. Example: array('bars', 'lines', ...)
+	public $type = array(); // Array with type of each series. Example: array('bars', 'horizontalbars', 'lines', 'pies', 'piesemicircle', 'polar'...)
 	public $mode = 'side'; // Mode bars graph: side, depth
-	private $_library = 'jflot'; // Graphic library to use (jflot, artichow)
+	private $_library = 'chart'; // Graphic library to use (jflot, chart, artichow)
 
 	//! Array of data
 	public $data; // Data of graph: array(array('abs1',valA1,valB1), array('abs2',valA2,valB2), ...)
@@ -103,9 +103,8 @@ class DolGraph
 		$this->datacolor = array(array(120, 130, 150), array(160, 160, 180), array(190, 190, 220));
 		$this->bgcolor = array(235, 235, 224);
 
-		$color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
-		if (is_readable($color_file))
-		{
+		$color_file = DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php';
+		if (is_readable($color_file)) {
 			include_once $color_file;
 			if (isset($theme_bordercolor)) $this->bordercolor = $theme_bordercolor;
 			if (isset($theme_datacolor))   $this->datacolor   = $theme_datacolor;
@@ -115,12 +114,12 @@ class DolGraph
 
 		$this->_library = $library;
 		if ($this->_library == 'auto') {
-			$this->_library = (empty($conf->global->MAIN_JS_GRAPH) ? 'jflot' : $conf->global->MAIN_JS_GRAPH);
+			$this->_library = (empty($conf->global->MAIN_JS_GRAPH) ? 'chart' : $conf->global->MAIN_JS_GRAPH);
 		}
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Utiliser SetNumTicks ou SetHorizTickIncrement mais pas les 2
 	 *
@@ -129,12 +128,12 @@ class DolGraph
 	 */
 	public function SetHorizTickIncrement($xi)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->horizTickIncrement = $xi;
 		return true;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Utiliser SetNumTicks ou SetHorizTickIncrement mais pas les 2
 	 *
@@ -143,12 +142,12 @@ class DolGraph
 	 */
 	public function SetNumXTicks($xt)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->SetNumXTicks = $xt;
 		return true;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set label interval to reduce number of labels
 	 *
@@ -157,12 +156,12 @@ class DolGraph
 	 */
 	public function SetLabelInterval($x)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->labelInterval = $x;
 		return true;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Hide X grid
 	 *
@@ -171,12 +170,12 @@ class DolGraph
 	 */
 	public function SetHideXGrid($bool)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->hideXGrid = $bool;
 		return true;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Hide Y grid
 	 *
@@ -185,12 +184,12 @@ class DolGraph
 	 */
 	public function SetHideYGrid($bool)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->hideYGrid = $bool;
 		return true;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set y label
 	 *
@@ -199,11 +198,11 @@ class DolGraph
 	 */
 	public function SetYLabel($label)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->YLabel = $label;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set width
 	 *
@@ -212,11 +211,11 @@ class DolGraph
 	 */
 	public function SetWidth($w)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->width = $w;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set title
 	 *
@@ -225,11 +224,11 @@ class DolGraph
 	 */
 	public function SetTitle($title)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->title = $title;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set data
 	 *
@@ -239,11 +238,11 @@ class DolGraph
 	 */
 	public function SetData($data)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->data = $data;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set data
 	 *
@@ -252,25 +251,25 @@ class DolGraph
 	 */
 	public function SetDataColor($datacolor)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->datacolor = $datacolor;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set type
 	 *
 	 * @param 	array	$type		Array with type for each serie. Example: array('type1', 'type2', ...) where type can be:
-	 * 								'pie', 'piesemicircle', 'polar', 'lines', 'linesnopoint', 'bars', ...
+	 * 								'pie', 'piesemicircle', 'polar', 'lines', 'linesnopoint', 'bars', 'horizontalbars'...
 	 * @return	void
 	 */
 	public function SetType($type)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->type = $type;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set legend
 	 *
@@ -279,11 +278,11 @@ class DolGraph
 	 */
 	public function SetLegend($legend)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->Legend = $legend;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set min width
 	 *
@@ -292,120 +291,120 @@ class DolGraph
 	 */
 	public function SetLegendWidthMin($legendwidthmin)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->LegendWidthMin = $legendwidthmin;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set max value
 	 *
 	 * @param 	int		$max			Max value
 	 * @return	void
 	 */
-    public function SetMaxValue($max)
+	public function SetMaxValue($max)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->MaxValue = $max;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Get max value
 	 *
 	 * @return	int		Max value
 	 */
-    public function GetMaxValue()
+	public function GetMaxValue()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return $this->MaxValue;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set min value
 	 *
 	 * @param 	int		$min			Min value
 	 * @return	void
 	 */
-    public function SetMinValue($min)
+	public function SetMinValue($min)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->MinValue = $min;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Get min value
 	 *
 	 * @return	int		Max value
 	 */
-    public function GetMinValue()
+	public function GetMinValue()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return $this->MinValue;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set height
 	 *
 	 * @param 	int		$h				Height
 	 * @return	void
 	 */
-    public function SetHeight($h)
+	public function SetHeight($h)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->height = $h;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set shading
 	 *
 	 * @param 	string	$s				Shading
 	 * @return	void
 	 */
-    public function SetShading($s)
+	public function SetShading($s)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->SetShading = $s;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set shading
 	 *
 	 * @param 	string	$s				Shading
 	 * @return	void
 	 */
-    public function SetCssPrefix($s)
+	public function SetCssPrefix($s)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->cssprefix = $s;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Reset bg color
 	 *
 	 * @return	void
 	 */
-    public function ResetBgColor()
+	public function ResetBgColor()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		unset($this->bgcolor);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Reset bgcolorgrid
 	 *
 	 * @return	void
 	 */
-    public function ResetBgColorGrid()
+	public function ResetBgColorGrid()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		unset($this->bgcolorgrid);
 	}
 
@@ -414,7 +413,7 @@ class DolGraph
 	 *
 	 * @return	string		Error
 	 */
-    public function isGraphKo()
+	public function isGraphKo()
 	{
 		return $this->error;
 	}
@@ -425,7 +424,7 @@ class DolGraph
 	 * @param	int		$showlegend		1=Show legend (default), 0=Hide legend, 2=Show legend on right
 	 * @return	void
 	 */
-    public function setShowLegend($showlegend)
+	public function setShowLegend($showlegend)
 	{
 		$this->showlegend = $showlegend;
 	}
@@ -436,7 +435,7 @@ class DolGraph
 	 * @param	int		$showpointvalue		1=Show value for each point, as tooltip or inline (default), 0=Hide value
 	 * @return	void
 	 */
-    public function setShowPointValue($showpointvalue)
+	public function setShowPointValue($showpointvalue)
 	{
 		$this->showpointvalue = $showpointvalue;
 	}
@@ -447,29 +446,27 @@ class DolGraph
 	 * @param	int		$showpercent		1=Show percent for each point, as tooltip or inline, 0=Hide percent (default)
 	 * @return	void
 	 */
-    public function setShowPercent($showpercent)
+	public function setShowPercent($showpercent)
 	{
 		$this->showpercent = $showpercent;
 	}
 
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Define background color of complete image
 	 *
 	 * @param	array	$bg_color		array(R,G,B) ou 'onglet' ou 'default'
 	 * @return	void
 	 */
-    public function SetBgColor($bg_color = array(255, 255, 255))
+	public function SetBgColor($bg_color = array(255, 255, 255))
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $theme_bgcolor, $theme_bgcoloronglet;
 
-		if (!is_array($bg_color))
-		{
-			if ($bg_color == 'onglet')
-			{
+		if (!is_array($bg_color)) {
+			if ($bg_color == 'onglet') {
 				//print 'ee'.join(',',$theme_bgcoloronglet);
 				$this->bgcolor = $theme_bgcoloronglet;
 			} else {
@@ -480,22 +477,20 @@ class DolGraph
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Define background color of grid
 	 *
 	 * @param	array	$bg_colorgrid		array(R,G,B) ou 'onglet' ou 'default'
 	 * @return	void
 	 */
-    public function SetBgColorGrid($bg_colorgrid = array(255, 255, 255))
+	public function SetBgColorGrid($bg_colorgrid = array(255, 255, 255))
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $theme_bgcolor, $theme_bgcoloronglet;
 
-		if (!is_array($bg_colorgrid))
-		{
-			if ($bg_colorgrid == 'onglet')
-			{
+		if (!is_array($bg_colorgrid)) {
+			if ($bg_colorgrid == 'onglet') {
 				//print 'ee'.join(',',$theme_bgcoloronglet);
 				$this->bgcolorgrid = $theme_bgcoloronglet;
 			} else {
@@ -506,39 +501,37 @@ class DolGraph
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Reset data color
 	 *
 	 * @return	void
 	 */
-    public function ResetDataColor()
-    {
-        // phpcs:enable
-        unset($this->datacolor);
-    }
+	public function ResetDataColor()
+	{
+		// phpcs:enable
+		unset($this->datacolor);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 * Get max value
 	 *
 	 * @return	int		Max value
 	 */
-    public function GetMaxValueInData()
+	public function GetMaxValueInData()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if (!is_array($this->data)) return 0;
 
 		$k = 0;
 		$vals = array();
 
 		$nblines = count($this->data);
-		$nbvalues = count($this->data[0]) - 1;
+		$nbvalues = (empty($this->data[0]) ? 0 : count($this->data[0]) - 1);
 
-		for ($j = 0; $j < $nblines; $j++)
-		{
-			for ($i = 0; $i < $nbvalues; $i++)
-			{
+		for ($j = 0; $j < $nblines; $j++) {
+			for ($i = 0; $i < $nbvalues; $i++) {
 				$vals[$k] = $this->data[$j][$i + 1];
 				$k++;
 			}
@@ -547,27 +540,25 @@ class DolGraph
 		return $vals[0];
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return min value of all data
 	 *
 	 * @return	int		Min value of all data
 	 */
-    public function GetMinValueInData()
+	public function GetMinValueInData()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if (!is_array($this->data)) return 0;
 
 		$k = 0;
 		$vals = array();
 
 		$nblines = count($this->data);
-		$nbvalues = count($this->data[0]) - 1;
+		$nbvalues = (empty($this->data[0]) ? 0 : count($this->data[0]) - 1);
 
-		for ($j = 0; $j < $nblines; $j++)
-		{
-			for ($i = 0; $i < $nbvalues; $i++)
-			{
+		for ($j = 0; $j < $nblines; $j++) {
+			for ($i = 0; $i < $nbvalues; $i++) {
 				$vals[$k] = $this->data[$j][$i + 1];
 				$k++;
 			}
@@ -576,21 +567,20 @@ class DolGraph
 		return $vals[0];
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return max value of all data
 	 *
 	 * @return 	int		Max value of all data
 	 */
-    public function GetCeilMaxValue()
+	public function GetCeilMaxValue()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$max = $this->GetMaxValueInData();
 		if ($max != 0) $max++;
 		$size = dol_strlen(abs(ceil($max)));
 		$factor = 1;
-		for ($i = 0; $i < ($size - 1); $i++)
-		{
+		for ($i = 0; $i < ($size - 1); $i++) {
 			$factor *= 10;
 		}
 
@@ -601,22 +591,21 @@ class DolGraph
 		return $res;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return min value of all data
 	 *
 	 * @return 	double		Max value of all data
 	 */
-    public function GetFloorMinValue()
+	public function GetFloorMinValue()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$min = $this->GetMinValueInData();
 		if ($min == '') $min = 0;
 		if ($min != 0) $min--;
 		$size = dol_strlen(abs(floor($min)));
 		$factor = 1;
-		for ($i = 0; $i < ($size - 1); $i++)
-		{
+		for ($i = 0; $i < ($size - 1); $i++) {
 			$factor *= 10;
 		}
 
@@ -633,30 +622,27 @@ class DolGraph
 	 * @param	string	$fileurl	Url path to show image if saved onto disk
 	 * @return	integer|null
 	 */
-    public function draw($file, $fileurl = '')
+	public function draw($file, $fileurl = '')
 	{
-		if (empty($file))
-		{
+		if (empty($file)) {
 			$this->error = "Call to draw method was made with empty value for parameter file.";
-			dol_syslog(get_class($this)."::draw ".$this->error, LOG_ERR);
+			dol_syslog(get_class($this) . "::draw " . $this->error, LOG_ERR);
 			return -2;
 		}
-		if (!is_array($this->data))
-		{
+		if (!is_array($this->data)) {
 			$this->error = "Call to draw method was made but SetData was not called or called with an empty dataset for parameters";
-			dol_syslog(get_class($this)."::draw ".$this->error, LOG_ERR);
+			dol_syslog(get_class($this) . "::draw " . $this->error, LOG_ERR);
 			return -1;
 		}
-		if (count($this->data) < 1)
-		{
+		if (count($this->data) < 1) {
 			$this->error = "Call to draw method was made but SetData was is an empty dataset";
-			dol_syslog(get_class($this)."::draw ".$this->error, LOG_WARNING);
+			dol_syslog(get_class($this) . "::draw " . $this->error, LOG_WARNING);
 		}
-		$call = "draw_".$this->_library;
+		$call = "draw_" . $this->_library;
 		call_user_func_array(array($this, $call), array($file, $fileurl));
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Build a graph using JFlot library. Input when calling this method should be:
 	 *	$this->data  = array(array(0=>'labelxA',1=>yA),  array('labelxB',yB));
@@ -675,13 +661,12 @@ class DolGraph
 	 */
 	private function draw_jflot($file, $fileurl)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
-		dol_syslog(get_class($this)."::draw_jflot this->type=".join(',', $this->type)." this->MaxValue=".$this->MaxValue);
+		dol_syslog(get_class($this) . "::draw_jflot this->type=" . join(',', $this->type) . " this->MaxValue=" . $this->MaxValue);
 
-		if (empty($this->width) && empty($this->height))
-		{
+		if (empty($this->width) && empty($this->height)) {
 			print 'Error width or height not set';
 			return;
 		}
@@ -701,7 +686,7 @@ class DolGraph
 		while ($i < $nblot)	// Loop on each serie
 		{
 			$values = array(); // Array with horizontal y values (specific values of a serie) for each abscisse x
-			$serie[$i] = "var d".$i." = [];\n";
+			$serie[$i] = "var d" . $i . " = [];\n";
 
 			// Fill array $values
 			$x = 0;
@@ -712,14 +697,13 @@ class DolGraph
 				$x++;
 			}
 
-			if (isset($this->type[$firstlot]) && in_array($this->type[$firstlot], array('pie', 'piesemicircle', 'polar')))
-			{
+			if (isset($this->type[$firstlot]) && in_array($this->type[$firstlot], array('pie', 'piesemicircle', 'polar'))) {
 				foreach ($values as $x => $y) {
-					if (isset($y)) $serie[$i] .= 'd'.$i.'.push({"label":"'.dol_escape_js($legends[$x]).'", "data":'.$y.'});'."\n";
+					if (isset($y)) $serie[$i] .= 'd' . $i . '.push({"label":"' . dol_escape_js($legends[$x]) . '", "data":' . $y . '});' . "\n";
 				}
 			} else {
 				foreach ($values as $x => $y) {
-					if (isset($y)) $serie[$i] .= 'd'.$i.'.push(['.$x.', '.$y.']);'."\n";
+					if (isset($y)) $serie[$i] .= 'd' . $i . '.push([' . $x . ', ' . $y . ']);' . "\n";
 				}
 			}
 
@@ -728,43 +712,39 @@ class DolGraph
 		}
 		$tag = dol_escape_htmltag(dol_string_unaccent(dol_string_nospecial(basename($file), '_', array('-', '.'))));
 
-		$this->stringtoshow = '<!-- Build using jflot -->'."\n";
-		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>';
-		    $this->stringtoshow .= '<div class="nographyettext margintoponly">'.$langs->trans("NotEnoughDataYet").'...</div>';
-		    return;
+		$this->stringtoshow = '<!-- Build using jflot -->' . "\n";
+		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>';
+			$this->stringtoshow .= '<div class="nographyettext margintoponly">' . $langs->trans("NotEnoughDataYet") . '...</div>';
+			return;
 		}
 
 		// Start the div that will contains all the graph
 		$dolxaxisvertical = '';
 		if (count($this->data) > 20) $dolxaxisvertical = 'dol-xaxis-vertical';
-		$this->stringtoshow .= '<div id="placeholder_'.$tag.'" style="width:'.$this->width.'px;height:'.$this->height.'px;" class="dolgraph'.(empty($dolxaxisvertical) ? '' : ' '.$dolxaxisvertical).(empty($this->cssprefix) ? '' : ' dolgraph'.$this->cssprefix).' center"></div>'."\n";
+		$this->stringtoshow .= '<div id="placeholder_' . $tag . '" style="width:' . $this->width . 'px;height:' . $this->height . 'px;" class="dolgraph' . (empty($dolxaxisvertical) ? '' : ' ' . $dolxaxisvertical) . (empty($this->cssprefix) ? '' : ' dolgraph' . $this->cssprefix) . ' center"></div>' . "\n";
 
-		$this->stringtoshow .= '<script id="'.$tag.'">'."\n";
-		$this->stringtoshow .= '$(function () {'."\n";
+		$this->stringtoshow .= '<script id="' . $tag . '">' . "\n";
+		$this->stringtoshow .= '$(function () {' . "\n";
 		$i = $firstlot;
-		if ($nblot < 0)
-		{
-			$this->stringtoshow .= '<!-- No series of data -->'."\n";
+		if ($nblot < 0) {
+			$this->stringtoshow .= '<!-- No series of data -->' . "\n";
 		} else {
-			while ($i < $nblot)
-			{
-				$this->stringtoshow .= '<!-- Serie '.$i.' -->'."\n";
-				$this->stringtoshow .= $serie[$i]."\n";
+			while ($i < $nblot) {
+				$this->stringtoshow .= '<!-- Serie ' . $i . ' -->' . "\n";
+				$this->stringtoshow .= $serie[$i] . "\n";
 				$i++;
 			}
 		}
 		$this->stringtoshow .= "\n";
 
 		// Special case for Graph of type 'pie'
-		if (isset($this->type[$firstlot]) && in_array($this->type[$firstlot], array('pie', 'piesemicircle', 'polar')))
-		{
+		if (isset($this->type[$firstlot]) && in_array($this->type[$firstlot], array('pie', 'piesemicircle', 'polar'))) {
 			$datacolor = array();
 			foreach ($this->datacolor as $val) {
-				if (is_array($val)) $datacolor[] = "#".sprintf("%02x%02x%02x", $val[0], $val[1], $val[2]); // If datacolor is array(R, G, B)
-				else $datacolor[] = "#".str_replace(array('#', '-'), '', $val); // If $val is '124' or '#124'
+				if (is_array($val)) $datacolor[] = "#" . sprintf("%02x%02x%02x", $val[0], $val[1], $val[2]); // If datacolor is array(R, G, B)
+				else $datacolor[] = "#" . str_replace(array('#', '-'), '', $val); // If $val is '124' or '#124'
 			}
 
 			$urltemp = ''; // TODO Add support for url link into labels
@@ -773,17 +753,17 @@ class DolGraph
 			$showpercent = $this->showpercent;
 
 			$this->stringtoshow .= '
-			function plotWithOptions_'.$tag.'() {
-			$.plot($("#placeholder_'.$tag.'"), d0,
+			function plotWithOptions_' . $tag . '() {
+			$.plot($("#placeholder_' . $tag . '"), d0,
 			{
 				series: {
 					pie: {
 						show: true,
 						radius: 0.8,
-						'.($this->combine ? '
+						' . ($this->combine ? '
 						combine: {
-						 	threshold: '.$this->combine.'
-						},' : '').'
+						 	threshold: ' . $this->combine . '
+						},' : '') . '
 						label: {
 							show: true,
 							radius: 0.9,
@@ -791,15 +771,15 @@ class DolGraph
 								var percent=Math.round(series.percent);
 								var number=series.data[0][1];
 								return \'';
-								$this->stringtoshow .= '<span style="font-size:8pt;text-align:center;padding:2px;color:black;">';
-								if ($urltemp) $this->stringtoshow .= '<a style="color: #FFFFFF;" border="0" href="'.$urltemp.'">';
-								$this->stringtoshow .= '\'+';
-								$this->stringtoshow .= ($showlegend ? '' : 'label+\' \'+'); // Hide label if already shown in legend
-								$this->stringtoshow .= ($showpointvalue ? 'number+' : '');
-								$this->stringtoshow .= ($showpercent ? '\'<br/>\'+percent+\'%\'+' : '');
-								$this->stringtoshow .= '\'';
-								if ($urltemp) $this->stringtoshow .= '</a>';
-								$this->stringtoshow .= '</span>\';
+			$this->stringtoshow .= '<span style="font-size:8pt;text-align:center;padding:2px;color:black;">';
+			if ($urltemp) $this->stringtoshow .= '<a style="color: #FFFFFF;" border="0" href="' . $urltemp . '">';
+			$this->stringtoshow .= '\'+';
+			$this->stringtoshow .= ($showlegend ? '' : 'label+\' \'+'); // Hide label if already shown in legend
+			$this->stringtoshow .= ($showpointvalue ? 'number+' : '');
+			$this->stringtoshow .= ($showpercent ? '\'<br/>\'+percent+\'%\'+' : '');
+			$this->stringtoshow .= '\'';
+			if ($urltemp) $this->stringtoshow .= '</a>';
+			$this->stringtoshow .= '</span>\';
 							},
 							background: {
 							opacity: 0.0,
@@ -814,21 +794,20 @@ class DolGraph
 			pan: {
 				interactive: true
 			},';
-			if (count($datacolor))
-			{
-				$this->stringtoshow .= 'colors: '.(!empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor)).',';
+			if (count($datacolor)) {
+				$this->stringtoshow .= 'colors: ' . (!empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor)) . ',';
 			}
-			$this->stringtoshow .= 'legend: {show: '.($showlegend ? 'true' : 'false').', position: \'ne\' }
+			$this->stringtoshow .= 'legend: {show: ' . ($showlegend ? 'true' : 'false') . ', position: \'ne\' }
 		});
-		}'."\n";
+		}' . "\n";
 		}
 		// Other cases, graph of type 'bars', 'lines'
 		else {
 			// Add code to support tooltips
-		    // TODO: remove js css and use graph-tooltip-inner class instead by adding css in each themes
+			// TODO: remove js css and use graph-tooltip-inner class instead by adding css in each themes
 			$this->stringtoshow .= '
-			function showTooltip_'.$tag.'(x, y, contents) {
-				$(\'<div class="graph-tooltip-inner" id="tooltip_'.$tag.'">\' + contents + \'</div>\').css({
+			function showTooltip_' . $tag . '(x, y, contents) {
+				$(\'<div class="graph-tooltip-inner" id="tooltip_' . $tag . '">\' + contents + \'</div>\').css({
 					position: \'absolute\',
 					display: \'none\',
 					top: y + 10,
@@ -844,7 +823,7 @@ class DolGraph
 			}
 
 			var previousPoint = null;
-			$("#placeholder_'.$tag.'").bind("plothover", function (event, pos, item) {
+			$("#placeholder_' . $tag . '").bind("plothover", function (event, pos, item) {
 				$("#x").text(pos.x.toFixed(2));
 				$("#y").text(pos.y.toFixed(2));
 
@@ -858,70 +837,68 @@ class DolGraph
 						var y = item.datapoint[1].toFixed(2);
 						var z = item.series.xaxis.ticks[item.dataIndex].label;
 						';
-						if ($this->showpointvalue > 0) $this->stringtoshow .= '
-							showTooltip_'.$tag.'(item.pageX, item.pageY, item.series.label + "<br>" + z + " => " + y);
+			if ($this->showpointvalue > 0) $this->stringtoshow .= '
+							showTooltip_' . $tag . '(item.pageX, item.pageY, item.series.label + "<br>" + z + " => " + y);
 						';
-						$this->stringtoshow .= '
+			$this->stringtoshow .= '
 					}
 				}
 				else {
-					$("#tooltip_'.$tag.'").remove();
+					$("#tooltip_' . $tag . '").remove();
 					previousPoint = null;
 				}
 			});
 			';
 
-			$this->stringtoshow .= 'var stack = null, steps = false;'."\n";
+			$this->stringtoshow .= 'var stack = null, steps = false;' . "\n";
 
-			$this->stringtoshow .= 'function plotWithOptions_'.$tag.'() {'."\n";
-			$this->stringtoshow .= '$.plot($("#placeholder_'.$tag.'"), [ '."\n";
+			$this->stringtoshow .= 'function plotWithOptions_' . $tag . '() {' . "\n";
+			$this->stringtoshow .= '$.plot($("#placeholder_' . $tag . '"), [ ' . "\n";
 			$i = $firstlot;
-			while ($i < $nblot)
-			{
-				if ($i > $firstlot) $this->stringtoshow .= ', '."\n";
+			while ($i < $nblot) {
+				if ($i > $firstlot) $this->stringtoshow .= ', ' . "\n";
 				$color = sprintf("%02x%02x%02x", $this->datacolor[$i][0], $this->datacolor[$i][1], $this->datacolor[$i][2]);
 				$this->stringtoshow .= '{ ';
-				if (! isset($this->type[$i]) || $this->type[$i] == 'bars') {
-                    if ($nblot == 3) {
-                        if ($i == $firstlot) $align = 'right';
-                        elseif ($i == $firstlot + 1) $align = 'center';
-                        else $align = 'left';
-                        $this->stringtoshow .= 'bars: { lineWidth: 1, show: true, align: "'.$align.'", barWidth: 0.45 }, ';
-                    } else $this->stringtoshow.='bars: { lineWidth: 1, show: true, align: "'.($i==$firstlot?'center':'left').'", barWidth: 0.5 }, ';
-                }
-				if (isset($this->type[$i]) && ($this->type[$i] == 'lines' || $this->type[$i] == 'linesnopoint')) $this->stringtoshow .= 'lines: { show: true, fill: false }, points: { show: '.($this->type[$i] == 'linesnopoint' ? 'false' : 'true').' }, ';
-				$this->stringtoshow .= 'color: "#'.$color.'", label: "'.(isset($this->Legend[$i]) ? dol_escape_js($this->Legend[$i]) : '').'", data: d'.$i.' }';
+				if (!isset($this->type[$i]) || $this->type[$i] == 'bars') {
+					if ($nblot == 3) {
+						if ($i == $firstlot) $align = 'right';
+						elseif ($i == $firstlot + 1) $align = 'center';
+						else $align = 'left';
+						$this->stringtoshow .= 'bars: { lineWidth: 1, show: true, align: "' . $align . '", barWidth: 0.45 }, ';
+					} else $this->stringtoshow .= 'bars: { lineWidth: 1, show: true, align: "' . ($i == $firstlot ? 'center' : 'left') . '", barWidth: 0.5 }, ';
+				}
+				if (isset($this->type[$i]) && ($this->type[$i] == 'lines' || $this->type[$i] == 'linesnopoint')) $this->stringtoshow .= 'lines: { show: true, fill: false }, points: { show: ' . ($this->type[$i] == 'linesnopoint' ? 'false' : 'true') . ' }, ';
+				$this->stringtoshow .= 'color: "#' . $color . '", label: "' . (isset($this->Legend[$i]) ? dol_escape_js($this->Legend[$i]) : '') . '", data: d' . $i . ' }';
 				$i++;
 			}
 			// shadowSize: 0 -> Drawing is faster without shadows
-			$this->stringtoshow .= "\n".' ], { series: { shadowSize: 0, stack: stack, lines: { fill: false, steps: steps }, bars: { barWidth: 0.6,  fillColor: { colors: [{opacity: 0.9 }, {opacity: 0.85}] }} }'."\n";
+			$this->stringtoshow .= "\n" . ' ], { series: { shadowSize: 0, stack: stack, lines: { fill: false, steps: steps }, bars: { barWidth: 0.6,  fillColor: { colors: [{opacity: 0.9 }, {opacity: 0.85}] }} }' . "\n";
 
 			// Xaxis
-			$this->stringtoshow .= ', xaxis: { ticks: ['."\n";
+			$this->stringtoshow .= ', xaxis: { ticks: [' . "\n";
 			$x = 0;
-			foreach ($this->data as $key => $valarray)
-			{
-				if ($x > 0) $this->stringtoshow .= ', '."\n";
-				$this->stringtoshow .= ' ['.$x.', "'.$valarray[0].'"]';
+			foreach ($this->data as $key => $valarray) {
+				if ($x > 0) $this->stringtoshow .= ', ' . "\n";
+				$this->stringtoshow .= ' [' . $x . ', "' . $valarray[0] . '"]';
 				$x++;
 			}
-			$this->stringtoshow .= '] }'."\n";
+			$this->stringtoshow .= '] }' . "\n";
 
 			// Yaxis
-			$this->stringtoshow .= ', yaxis: { min: '.$this->MinValue.', max: '.($this->MaxValue).' }'."\n";
+			$this->stringtoshow .= ', yaxis: { min: ' . $this->MinValue . ', max: ' . ($this->MaxValue) . ' }' . "\n";
 
 			// Background color
 			$color1 = sprintf("%02x%02x%02x", $this->bgcolorgrid[0], $this->bgcolorgrid[0], $this->bgcolorgrid[2]);
 			$color2 = sprintf("%02x%02x%02x", $this->bgcolorgrid[0], $this->bgcolorgrid[1], $this->bgcolorgrid[2]);
-			$this->stringtoshow .= ', grid: { hoverable: true, backgroundColor: { colors: ["#'.$color1.'", "#'.$color2.'"] }, borderWidth: 1, borderColor: \'#e6e6e6\', tickColor  : \'#e6e6e6\' }'."\n";
+			$this->stringtoshow .= ', grid: { hoverable: true, backgroundColor: { colors: ["#' . $color1 . '", "#' . $color2 . '"] }, borderWidth: 1, borderColor: \'#e6e6e6\', tickColor  : \'#e6e6e6\' }' . "\n";
 			//$this->stringtoshow.=', shadowSize: 20'."\n";    TODO Uncommet this
-			$this->stringtoshow .= '});'."\n";
-			$this->stringtoshow .= '}'."\n";
+			$this->stringtoshow .= '});' . "\n";
+			$this->stringtoshow .= '}' . "\n";
 		}
 
-		$this->stringtoshow .= 'plotWithOptions_'.$tag.'();'."\n";
-		$this->stringtoshow .= '});'."\n";
-		$this->stringtoshow .= '</script>'."\n";
+		$this->stringtoshow .= 'plotWithOptions_' . $tag . '();' . "\n";
+		$this->stringtoshow .= '});' . "\n";
+		$this->stringtoshow .= '</script>' . "\n";
 	}
 
 
@@ -947,10 +924,9 @@ class DolGraph
 		// phpcs:enable
 		global $conf, $langs;
 
-		dol_syslog(get_class($this)."::draw_chart this->type=".join(',', $this->type)." this->MaxValue=".$this->MaxValue);
+		dol_syslog(get_class($this) . "::draw_chart this->type=" . join(',', $this->type) . " this->MaxValue=" . $this->MaxValue);
 
-		if (empty($this->width) && empty($this->height))
-		{
+		if (empty($this->width) && empty($this->height)) {
 			print 'Error width or height not set';
 			return;
 		}
@@ -971,7 +947,8 @@ class DolGraph
 		// Works with line but not with bars
 		//if ($nblot > 2) $firstlot = ($nblot - 2);        // We limit nblot to 2 because jflot can't manage more than 2 bars on same x
 
-		$serie = array(); $arrayofgroupslegend = array();
+		$serie = array();
+		$arrayofgroupslegend = array();
 		//var_dump($this->data);
 
 		$i = $firstlot;
@@ -989,15 +966,15 @@ class DolGraph
 				$alabelexists = 1;
 				$tmpykey = explode('_', ($array_of_ykeys[$i + ($alabelexists ? 1 : 0)]), 3);
 				if (!empty($tmpykey[2]) || $tmpykey[2] == '0') {		// This is a 'Group by' array
-					$tmpvalue = (array_key_exists('y_'.$tmpykey[1].'_'.$tmpykey[2], $valarray) ? $valarray['y_'.$tmpykey[1].'_'.$tmpykey[2]] : $valarray[$i + 1]);
+					$tmpvalue = (array_key_exists('y_' . $tmpykey[1] . '_' . $tmpykey[2], $valarray) ? $valarray['y_' . $tmpykey[1] . '_' . $tmpykey[2]] : $valarray[$i + 1]);
 					$values[$x] = (is_numeric($tmpvalue) ? $tmpvalue : null);
 					$arrayofgroupslegend[$i] = array(
-						'stacknum'=> $tmpykey[1],
+						'stacknum' => $tmpykey[1],
 						'legend' => $this->Legend[$tmpykey[1]],
-						'legendwithgroup' => $this->Legend[$tmpykey[1]].' - '.$tmpykey[2]
+						'legendwithgroup' => $this->Legend[$tmpykey[1]] . ' - ' . $tmpykey[2]
 					);
 				} else {
-					$tmpvalue = (array_key_exists('y_'.$i, $valarray) ? $valarray['y_'.$i] : $valarray[$i + 1]);
+					$tmpvalue = (array_key_exists('y_' . $i, $valarray) ? $valarray['y_' . $i] : $valarray[$i + 1]);
 					//var_dump($i.'_'.$x.'_'.$tmpvalue);
 					$values[$x] = (is_numeric($tmpvalue) ? $tmpvalue : null);
 				}
@@ -1007,9 +984,9 @@ class DolGraph
 			$j = 0;
 			foreach ($values as $x => $y) {
 				if (isset($y)) {
-					$serie[$i] .= ($j > 0 ? ", " : "").$y;
+					$serie[$i] .= ($j > 0 ? ", " : "") . $y;
 				} else {
-					$serie[$i] .= ($j > 0 ? ", " : "").'null';
+					$serie[$i] .= ($j > 0 ? ", " : "") . 'null';
 				}
 				$j++;
 			}
@@ -1022,12 +999,11 @@ class DolGraph
 
 		$tag = dol_escape_htmltag(dol_string_unaccent(dol_string_nospecial(basename($file), '_', array('-', '.'))));
 
-		$this->stringtoshow = '<!-- Build using chart -->'."\n";
-		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.(strpos($this->width, '%') > 0 ? '' : 'px').'; height:'.$this->height.'px;" class="nographyet"></div>';
-			$this->stringtoshow .= '<div class="nographyettext margintoponly">'.$langs->trans("NotEnoughDataYet").'...</div>';
+		$this->stringtoshow = '<!-- Build using chart -->' . "\n";
+		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 . (strpos($this->width, '%') > 0 ? '' : 'px') . '; height:' . $this->height . 'px;" class="nographyet"></div>';
+			$this->stringtoshow .= '<div class="nographyettext margintoponly">' . $langs->trans("NotEnoughDataYet") . '...</div>';
 			return;
 		}
 
@@ -1036,17 +1012,15 @@ class DolGraph
 		if (count($this->data) > 20) $dolxaxisvertical = 'dol-xaxis-vertical';
 		// No height for the pie grah
 		$cssfordiv = 'dolgraphchart';
-		if (isset($this->type[$firstlot])) $cssfordiv .= ' dolgraphchar'.$this->type[$firstlot];
-		$this->stringtoshow .= '<div id="placeholder_'.$tag.'" style="min-height: '.$this->height.(strpos($this->height, '%') > 0 ? '' : 'px').'; width:'.$this->width.(strpos($this->width, '%') > 0 ? '' : 'px').';" class="'.$cssfordiv.' dolgraph'.(empty($dolxaxisvertical) ? '' : ' '.$dolxaxisvertical).(empty($this->cssprefix) ? '' : ' dolgraph'.$this->cssprefix).' center"><canvas id="canvas_'.$tag.'"></canvas></div>'."\n";
+		if (isset($this->type[$firstlot])) $cssfordiv .= ' dolgraphchar' . $this->type[$firstlot];
+		$this->stringtoshow .= '<div id="placeholder_' . $tag . '" style="min-height: ' . $this->height . (strpos($this->height, '%') > 0 ? '' : 'px') . '; width:' . $this->width . (strpos($this->width, '%') > 0 ? '' : 'px') . ';" class="' . $cssfordiv . ' dolgraph' . (empty($dolxaxisvertical) ? '' : ' ' . $dolxaxisvertical) . (empty($this->cssprefix) ? '' : ' dolgraph' . $this->cssprefix) . ' center"><canvas id="canvas_' . $tag . '"></canvas></div>' . "\n";
 
-		$this->stringtoshow .= '<script id="'.$tag.'">'."\n";
+		$this->stringtoshow .= '<script id="' . $tag . '">' . "\n";
 		$i = $firstlot;
-		if ($nblot < 0)
-		{
+		if ($nblot < 0) {
 			$this->stringtoshow .= '<!-- No series of data -->';
 		} else {
-			while ($i < $nblot)
-			{
+			while ($i < $nblot) {
 				//$this->stringtoshow .= '<!-- Series '.$i.' -->'."\n";
 				//$this->stringtoshow .= $serie[$i]."\n";
 				$i++;
@@ -1055,69 +1029,69 @@ class DolGraph
 		$this->stringtoshow .= "\n";
 
 		// Special case for Graph of type 'pie', 'piesemicircle', or 'polar'
-		if (isset($this->type[$firstlot]) && (in_array($this->type[$firstlot], array('pie', 'polar', 'piesemicircle'))))
-		{
+		if (isset($this->type[$firstlot]) && (in_array($this->type[$firstlot], array('pie', 'polar', 'piesemicircle')))) {
 			$type = $this->type[$firstlot]; // pie or polar
-			$this->stringtoshow .= 'var options = {'."\n";
+			$this->stringtoshow .= 'var options = {' . "\n";
 			$legendMaxLines = 0; // Does not work
 			if (empty($showlegend)) {
 				$this->stringtoshow .= 'legend: { display: false }, ';
 			} else {
-				$this->stringtoshow .= 'legend: { position: \''.($showlegend == 2 ? 'right' : 'top').'\'';
+				$this->stringtoshow .= 'legend: { position: \'' . ($showlegend == 2 ? 'right' : 'top') . '\'';
 				if (!empty($legendMaxLines)) {
-					$this->stringtoshow .= ', maxLines: '.$legendMaxLines.'';
+					$this->stringtoshow .= ', maxLines: ' . $legendMaxLines . '';
 				}
-				$this->stringtoshow .= ' }, '."\n";
+				$this->stringtoshow .= ' }, ' . "\n";
 			}
 
 			if ($this->type[$firstlot] == 'piesemicircle') {
-				$this->stringtoshow .= 'circumference: Math.PI,'."\n";
-				$this->stringtoshow .= 'rotation: -Math.PI,'."\n";
+				$this->stringtoshow .= 'circumference: Math.PI,' . "\n";
+				$this->stringtoshow .= 'rotation: -Math.PI,' . "\n";
 			}
-			$this->stringtoshow .= 'elements: { arc: {'."\n";
+			$this->stringtoshow .= 'elements: { arc: {' . "\n";
 			// Color of earch arc
 			$this->stringtoshow .= 'backgroundColor: [';
-			$i = 0; $foundnegativecolor = 0;
+			$i = 0;
+			$foundnegativecolor = 0;
 			foreach ($legends as $val)	// Loop on each serie
 			{
-				if ($i > 0) $this->stringtoshow .= ', '."\n";
-				if (is_array($this->datacolor[$i])) $color = 'rgb('.$this->datacolor[$i][0].', '.$this->datacolor[$i][1].', '.$this->datacolor[$i][2].')'; // If datacolor is array(R, G, B)
+				if ($i > 0) $this->stringtoshow .= ', ' . "\n";
+				if (is_array($this->datacolor[$i])) $color = 'rgb(' . $this->datacolor[$i][0] . ', ' . $this->datacolor[$i][1] . ', ' . $this->datacolor[$i][2] . ')'; // If datacolor is array(R, G, B)
 				else {
 					$tmp = str_replace('#', '', $this->datacolor[$i]);
 					if (strpos($tmp, '-') !== false) {
 						$foundnegativecolor++;
 						$color = '#FFFFFF'; // If $val is '-123'
-					} else $color = "#".$tmp; // If $val is '123' or '#123'
+					} else $color = "#" . $tmp; // If $val is '123' or '#123'
 				}
-				$this->stringtoshow .= "'".$color."'";
+				$this->stringtoshow .= "'" . $color . "'";
 				$i++;
 			}
-			$this->stringtoshow .= '], '."\n";
+			$this->stringtoshow .= '], ' . "\n";
 			// Border color
 			if ($foundnegativecolor) {
 				$this->stringtoshow .= 'borderColor: [';
 				$i = 0;
 				foreach ($legends as $val)	// Loop on each serie
 				{
-					if ($i > 0) $this->stringtoshow .= ', '."\n";
+					if ($i > 0) $this->stringtoshow .= ', ' . "\n";
 					if (is_array($this->datacolor[$i])) $color = 'null'; // If datacolor is array(R, G, B)
 					else {
 						$tmp = str_replace('#', '', $this->datacolor[$i]);
-						if (strpos($tmp, '-') !== false) $color = '#'.str_replace('-', '', $tmp); // If $val is '-123'
+						if (strpos($tmp, '-') !== false) $color = '#' . str_replace('-', '', $tmp); // If $val is '-123'
 						else $color = 'null'; // If $val is '123' or '#123'
 					}
-					$this->stringtoshow .= ($color == 'null' ? "'rgba(0,0,0,0.2)'" : "'".$color."'");
+					$this->stringtoshow .= ($color == 'null' ? "'rgba(0,0,0,0.2)'" : "'" . $color . "'");
 					$i++;
 				}
 				$this->stringtoshow .= ']';
 			}
-			$this->stringtoshow .= '} } };'."\n";
+			$this->stringtoshow .= '} } };' . "\n";
 
 			$this->stringtoshow .= '
-				var ctx = document.getElementById("canvas_'.$tag.'").getContext("2d");
+				var ctx = document.getElementById("canvas_' . $tag . '").getContext("2d");
 				var chart = new Chart(ctx, {
 			    // The type of chart we want to create
-    			type: \''.(in_array($type, array('pie', 'piesemicircle')) ? 'doughnut' : 'polarArea').'\',
+    			type: \'' . (in_array($type, array('pie', 'piesemicircle')) ? 'doughnut' : 'polarArea') . '\',
 				// Configuration options go here
     			options: options,
 				data: {
@@ -1127,7 +1101,7 @@ class DolGraph
 			foreach ($legends as $val)	// Loop on each serie
 			{
 				if ($i > 0) $this->stringtoshow .= ', ';
-				$this->stringtoshow .= "'".dol_escape_js(dol_trunc($val, 32))."'";
+				$this->stringtoshow .= "'" . dol_escape_js(dol_trunc($val, 32)) . "'";
 				$i++;
 			}
 
@@ -1137,25 +1111,30 @@ class DolGraph
 			$i = 0;
 			while ($i < $nblot)	// Loop on each serie
 			{
-				$color = 'rgb('.$this->datacolor[$i][0].', '.$this->datacolor[$i][1].', '.$this->datacolor[$i][2].')';
+				$color = 'rgb(' . $this->datacolor[$i][0] . ', ' . $this->datacolor[$i][1] . ', ' . $this->datacolor[$i][2] . ')';
 				//$color = (!empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor));
 
-				if ($i > 0) $this->stringtoshow .= ', '."\n";
-				$this->stringtoshow .= '{'."\n";
+				if ($i > 0) $this->stringtoshow .= ', ' . "\n";
+				$this->stringtoshow .= '{' . "\n";
 				//$this->stringtoshow .= 'borderColor: \''.$color.'\', ';
 				//$this->stringtoshow .= 'backgroundColor: \''.$color.'\', ';
-				$this->stringtoshow .= '  data: ['.$serie[$i].']';
-				$this->stringtoshow .= '}'."\n";
+				$this->stringtoshow .= '  data: [' . $serie[$i] . ']';
+				$this->stringtoshow .= '}' . "\n";
 				$i++;
 			}
-			$this->stringtoshow .= ']'."\n";
-			$this->stringtoshow .= '}'."\n";
-			$this->stringtoshow .= '});'."\n";
+			$this->stringtoshow .= ']' . "\n";
+			$this->stringtoshow .= '}' . "\n";
+			$this->stringtoshow .= '});' . "\n";
 		}
 		// Other cases, graph of type 'bars', 'lines', 'linesnopoint'
 		else {
 			$type = 'bar';
+
+			$isfunnel = false;
+			if ($file == 'idgraphleadfunnel') $isfunnel = true;
+
 			if (!isset($this->type[$firstlot]) || $this->type[$firstlot] == 'bars') $type = 'bar';
+			if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'horizontalbars') $type = 'horizontalBar';
 			if (isset($this->type[$firstlot]) && ($this->type[$firstlot] == 'lines' || $this->type[$firstlot] == 'linesnopoint')) $type = 'line';
 
 			$this->stringtoshow .= 'var options = { maintainAspectRatio: false, aspectRatio: 2.5, ';
@@ -1163,34 +1142,52 @@ class DolGraph
 				$this->stringtoshow .= 'legend: { display: false }, ';
 			}
 			$this->stringtoshow .= 'scales: { xAxes: [{ ';
+			if ($isfunnel) {	// FIXME Remove isfunnel by introducing a method hideXValues() on dolgraph
+				$this->stringtoshow .= ' ticks: { display: false }, display: true,';
+			}
 			//$this->stringtoshow .= 'type: \'time\', ';		// Need Moment.js
 			$this->stringtoshow .= 'distribution: \'linear\'';
 			if ($type == 'bar' && count($arrayofgroupslegend) > 0) {
 				$this->stringtoshow .= ', stacked: true';
 			}
 			$this->stringtoshow .= ' }]';
+			$this->stringtoshow .= ', yAxes: [{ ticks: { beginAtZero: true }';
 			if ($type == 'bar' && count($arrayofgroupslegend) > 0) {
-				$this->stringtoshow .= ', yAxes: [{ stacked: true }]';
+				$this->stringtoshow .= ', stacked: true';
+			}
+			$this->stringtoshow .= ' }] }';
+			// Add a callback to change label to show only positive value
+			if ($isfunnel) {
+				$this->stringtoshow .= ', tooltips: { mode: \'nearest\',
+					callbacks: {
+						title: function(tooltipItem, data) {
+							return data.datasets[tooltipItem[0].datasetIndex].label;
+						},
+						label: function(tooltipItem, data) {
+							return data.datasets[tooltipItem.datasetIndex].data[0][1];
+						}
+					}
+				},';
 			}
-			$this->stringtoshow .= ' }';
 			$this->stringtoshow .= '};';
-
 			$this->stringtoshow .= '
-				var ctx = document.getElementById("canvas_'.$tag.'").getContext("2d");
+				var ctx = document.getElementById("canvas_' . $tag . '").getContext("2d");
 				var chart = new Chart(ctx, {
 			    // The type of chart we want to create
-    			type: \''.$type.'\',
+    			type: \'' . $type . '\',
 				// Configuration options go here
     			options: options,
 				data: {
 					labels: [';
 
 			$i = 0;
-			foreach ($legends as $val)	// Loop on each serie
-			{
-				if ($i > 0) $this->stringtoshow .= ', ';
-				$this->stringtoshow .= "'".dol_escape_js(dol_trunc($val, 32))."'";
-				$i++;
+			if (!$isfunnel) {
+				foreach ($legends as $val)	// Loop on each serie
+					{
+					if ($i > 0) $this->stringtoshow .= ', ';
+					$this->stringtoshow .= "'".dol_escape_js(dol_trunc($val, 32))."'";
+					$i++;
+				}
 			}
 
 			//var_dump($arrayofgroupslegend);
@@ -1204,6 +1201,7 @@ class DolGraph
 			$oldstacknum = -1;
 			while ($i < $nblot)	// Loop on each serie
 			{
+				$foundnegativecolor = 0;
 				$usecolorvariantforgroupby = 0;
 				// We used a 'group by' and we have too many colors so we generated color variants per
 				if (is_array($arrayofgroupslegend[$i]) && count($arrayofgroupslegend[$i]) > 0) {	// If we used a group by.
@@ -1232,7 +1230,7 @@ class DolGraph
 							$ratio = min(95, 10 + 10 * $iinstack); // step of 20
 							$brightnessratio = min(90, 5 + 5 * $iinstack); // step of 10
 						} else {				// We decrease agressiveness of reference color for color 3, 5, 7, ..
-							$ratio = max(-100, - 15 * $iinstack + 10); // step of -20
+							$ratio = max(-100, -15 * $iinstack + 10); // step of -20
 							$brightnessratio = min(90, 10 * $iinstack); // step of 20
 						}
 						//var_dump('Color '.($iinstack+1).' : '.$ratio.' '.$brightnessratio);
@@ -1241,37 +1239,72 @@ class DolGraph
 					}
 					$oldstacknum = $arrayofgroupslegend[$i]['stacknum'];
 
-					$color = 'rgb('.$newcolor[0].', '.$newcolor[1].', '.$newcolor[2].', 0.9)';
-					$bordercolor = 'rgb('.$newcolor[0].', '.$newcolor[1].', '.$newcolor[2].')';
-				} else {																			// We do not use a 'group by'
-					$color = 'rgb('.$this->datacolor[$i][0].', '.$this->datacolor[$i][1].', '.$this->datacolor[$i][2].', 0.9)';
-					$bordercolor = $color;
-					//$color = (!empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor));
+					$color = 'rgb(' . $newcolor[0] . ', ' . $newcolor[1] . ', ' . $newcolor[2] . ', 0.9)';
+					$bordercolor = 'rgb(' . $newcolor[0] . ', ' . $newcolor[1] . ', ' . $newcolor[2] . ')';
+				} else { // We do not use a 'group by'
+					if ($isfunnel) {
+						if (is_array($this->datacolor[$i])) {
+							$color = 'rgb(' . $this->datacolor[$i][0] . ', ' . $this->datacolor[$i][1] . ', ' . $this->datacolor[$i][2] . ', 0.9)'; // If datacolor is array(R, G, B)
+						} else {
+							// TODO FIXME This logic must be in the caller that set $this->datacolor
+							$tmp = str_replace('#', '', $this->datacolor[$i]);
+							if (strpos($tmp, '-') !== false) {
+								$foundnegativecolor++;
+								$color = '#FFFFFF'; // If $val is '-123'
+							} else {
+								$color = "#" . $tmp; // If $val is '123' or '#123'
+								$bordercolor = $color;
+							}
+							if ($foundnegativecolor) {
+								if (is_array($this->datacolor[$i])) $color = 'null'; // If datacolor is array(R, G, B)
+								else {
+									$tmp = str_replace('#', '', $this->datacolor[$i]);
+									if (strpos($tmp, '-') !== false) $bordercolor = '#' . str_replace('-', '', $tmp); // If $val is '-123'
+									else $bordercolor = 'null'; // If $val is '123' or '#123'
+								}
+								$bordercolor == 'null' ? "'rgba(0,0,0,0.2)'" : "'" . $bordercolor . "'";
+							}
+						}
+					} else {
+						$color = 'rgb('.$this->datacolor[$i][0].', '.$this->datacolor[$i][1].', '.$this->datacolor[$i][2].', 0.9)';
+						$bordercolor = $color;
+						//$color = (!empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor));
+					}
 				}
 
 				if ($i > 0) $this->stringtoshow .= ', ';
 				$this->stringtoshow .= "\n";
 				$this->stringtoshow .= '{';
-				$this->stringtoshow .= 'dolibarrinfo: \'y_'.$i.'\', ';
-				$this->stringtoshow .= 'label: \''.dol_escape_js(dol_string_nohtmltag($textoflegend)).'\', ';
-				$this->stringtoshow .= 'pointStyle: \''.($this->type[$i] == 'linesnopoint' ? 'line' : 'circle').'\', ';
-				$this->stringtoshow .= 'fill: '.($type == 'bar' ? 'true' : 'false').', ';
-				if ($type == 'bar') { $this->stringtoshow .= 'borderWidth: \'1\', '; }
-				$this->stringtoshow .= 'borderColor: \''.$bordercolor.'\', ';
-				$this->stringtoshow .= 'backgroundColor: \''.$color.'\', ';
-				if ($arrayofgroupslegend[$i]) $this->stringtoshow .= 'stack: \''.$arrayofgroupslegend[$i]['stacknum'].'\', ';
-				$this->stringtoshow .= 'data: ['.$serie[$i].']';
-				$this->stringtoshow .= '}'."\n";
+				$this->stringtoshow .= 'dolibarrinfo: \'y_' . $i . '\', ';
+				$this->stringtoshow .= 'label: \'' . dol_escape_js(dol_string_nohtmltag($textoflegend)) . '\', ';
+				$this->stringtoshow .= 'pointStyle: \'' . ($this->type[$i] == 'linesnopoint' ? 'line' : 'circle') . '\', ';
+				$this->stringtoshow .= 'fill: ' . ($type == 'bar' ? 'true' : 'false') . ', ';
+				if ($isfunnel) {
+					$this->stringtoshow .= 'borderWidth: \'2\', ';
+				} elseif ($type == 'bar' || $type == 'horizontalBar') {
+					$this->stringtoshow .= 'borderWidth: \'1\', ';
+				}
+				$this->stringtoshow .= 'borderColor: \'' . $bordercolor . '\', ';
+				$this->stringtoshow .= 'backgroundColor: \'' . $color . '\', ';
+				if ($arrayofgroupslegend[$i]) $this->stringtoshow .= 'stack: \'' . $arrayofgroupslegend[$i]['stacknum'] . '\', ';
+				$this->stringtoshow .='data: [';
+				if ($isfunnel) {
+					$this->stringtoshow .= '['.-$serie[$i].','.$serie[$i].']';
+				} else {
+					$this->stringtoshow .= $serie[$i];
+				}
+				$this->stringtoshow .=']';
+				$this->stringtoshow .= '}' . "\n";
 
 				$i++;
 				$iinstack++;
 			}
-			$this->stringtoshow .= ']'."\n";
-			$this->stringtoshow .= '}'."\n";
-			$this->stringtoshow .= '});'."\n";
+			$this->stringtoshow .= ']' . "\n";
+			$this->stringtoshow .= '}' . "\n";
+			$this->stringtoshow .= '});' . "\n";
 		}
 
-		$this->stringtoshow .= '</script>'."\n";
+		$this->stringtoshow .= '</script>' . "\n";
 	}
 
 
@@ -1280,7 +1313,7 @@ class DolGraph
 	 *
 	 * @return	string							HTML string to total value
 	 */
-    public function total()
+	public function total()
 	{
 		$value = 0;
 		foreach ($this->data as $valarray)	// Loop on each x
@@ -1296,18 +1329,17 @@ class DolGraph
 	 * @param	int|string		$shownographyet    Show graph to say there is not enough data or the message in $shownographyet if it is a string.
 	 * @return	string							   HTML string to show graph
 	 */
-    public function show($shownographyet = 0)
+	public function show($shownographyet = 0)
 	{
 		global $langs;
 
-		if ($shownographyet)
-		{
-			$s = '<div class="nographyet" style="width:'.(preg_match('/%/', $this->width) ? $this->width : $this->width.'px').'; height:'.(preg_match('/%/', $this->height) ? $this->height : $this->height.'px').';"></div>';
+		if ($shownographyet) {
+			$s = '<div class="nographyet" style="width:' . (preg_match('/%/', $this->width) ? $this->width : $this->width . 'px') . '; height:' . (preg_match('/%/', $this->height) ? $this->height : $this->height . 'px') . ';"></div>';
 			$s .= '<div class="nographyettext margintoponly">';
 			if (is_numeric($shownographyet)) {
-                $s .= $langs->trans("NotEnoughDataYet").'...';
+				$s .= $langs->trans("NotEnoughDataYet") . '...';
 			} else {
-			    $s .= $shownographyet.'...';
+				$s .= $shownographyet . '...';
 			}
 			$s .= '</div>';
 			return $s;
diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index b7929e6a159..e075005b437 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -25,32 +25,32 @@
 /*
  * Tags for ticket template
  *
- * <dol_align_left>                                 Left align text
- * <dol_align_center>                               Center text
- * <dol_align_right>                                Right align text
- * <dol_use_font_a>                                 Use font A of printer
- * <dol_use_font_b>                                 Use font B of printer
- * <dol_use_font_c>                                 Use font C of printer
- * <dol_bold>                                       Text Bold
- * <dol_bold_disabled>                              Disable Text Bold
- * <dol_double_height>                              Text double height
- * <dol_double_width>                               Text double width
- * <dol_default_height_width>                       Text default height and width
- * <dol_underline>                                  Underline text
- * <dol_underline_disabled>                         Disable underline text
- * <dol_cut_paper_full>                             Cut ticket completely
- * <dol_cut_paper_partial>                          Cut ticket partially
- * <dol_open_drawer>                                Open cash drawer
- * <dol_beep>                                       Activate buzzer
- * <dol_print_barcode>                              Print barcode
- * <dol_print_logo>                                 Print logo stored on printer. Example : <print_logo>32|32
- * <dol_print_logo_old>                             Print logo stored on printer. Must be followed by logo code. For old printers.
- * <dol_print_object_lines>                         Print object lines
- * <dol_print_object_tax>                           Print object total tax
- * <dol_print_object_local_tax>                     Print object local tax
- * <dol_print_object_total>                         Print object total
- * <dol_print_order_lines>                          Print order lines for Printer
- * <dol_print_payment>                              Print payment method
+ * {dol_align_left}                                 Left align text
+ * {dol_align_center}                               Center text
+ * {dol_align_right}                                Right align text
+ * {dol_use_font_a}                                 Use font A of printer
+ * {dol_use_font_b}                                 Use font B of printer
+ * {dol_use_font_c}                                 Use font C of printer
+ * {dol_bold}                                       Text Bold
+ * {dol_bold_disabled}                              Disable Text Bold
+ * {dol_double_height}                              Text double height
+ * {dol_double_width}                               Text double width
+ * {dol_default_height_width}                       Text default height and width
+ * {dol_underline}                                  Underline text
+ * {dol_underline_disabled}                         Disable underline text
+ * {dol_cut_paper_full}                             Cut ticket completely
+ * {dol_cut_paper_partial}                          Cut ticket partially
+ * {dol_open_drawer}                                Open cash drawer
+ * {dol_beep}                                       Activate buzzer
+ * {dol_print_barcode}                              Print barcode
+ * {dol_print_logo}                                 Print logo stored on printer. Example : <print_logo>32|32
+ * {dol_print_logo_old}                             Print logo stored on printer. Must be followed by logo code. For old printers.
+ * {dol_print_object_lines}                         Print object lines
+ * {dol_print_object_tax}                           Print object total tax
+ * {dol_print_object_local_tax}                     Print object local tax
+ * {dol_print_object_total}                         Print object total
+ * {dol_print_order_lines}                          Print order lines for Printer
+ * {dol_print_payment}                              Print payment method
  *
  * Code which can be placed everywhere
  * <dol_value_date>                                 Replaced by date AAAA-MM-DD
@@ -115,429 +115,429 @@ use Mike42\Escpos\EscposImage;
  */
 class dolReceiptPrinter extends Printer
 {
-    const CONNECTOR_DUMMY = 1;
-    const CONNECTOR_FILE_PRINT = 2;
-    const CONNECTOR_NETWORK_PRINT = 3;
-    const CONNECTOR_WINDOWS_PRINT = 4;
-    const CONNECTOR_CUPS_PRINT = 5;
+	const CONNECTOR_DUMMY = 1;
+	const CONNECTOR_FILE_PRINT = 2;
+	const CONNECTOR_NETWORK_PRINT = 3;
+	const CONNECTOR_WINDOWS_PRINT = 4;
+	const CONNECTOR_CUPS_PRINT = 5;
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /*
+	/*
      * @var string[] array of tags
      */
-    public $tags;
-    public $printer;
-    public $template;
+	public $tags;
+	public $printer;
+	public $template;
 
-    /**
-     * Number of order printer
-     * @var int
-     */
-    public $orderprinter;
+	/**
+	 * Number of order printer
+	 * @var int
+	 */
+	public $orderprinter;
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
-    /**
-     * @var string[] Error codes (or messages)
-     */
-    public $errors = array();
+	/**
+	 * @var string[] Error codes (or messages)
+	 */
+	public $errors = array();
 
-    /**
-     * Constructor
-     *
-     * @param   DoliDB      $db         database
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-        $this->tags = array(
-            'dol_line_feed' => 'DOL_LINE_FEED',
-        	'dol_line_feed_reverse' => 'DOL_LINE_FEED_REVERSE',
-            'dol_align_left' => 'DOL_ALIGN_LEFT',
-            'dol_align_center' => 'DOL_ALIGN_CENTER',
-            'dol_align_right' => 'DOL_ALIGN_RIGHT',
-            'dol_use_font_a' => 'DOL_USE_FONT_A',
-            'dol_use_font_b' => 'DOL_USE_FONT_B',
-        	'dol_use_font_c' => 'DOL_USE_FONT_C',
-        	'dol_bold' => 'DOL_BOLD',
-        	'dol_bold_disabled' => 'DOL_BOLD_DISABLED',
-        	'dol_double_height' => 'DOL_DOUBLE_HEIGHT',
-        	'dol_double_width' => 'DOL_DOUBLE_WIDTH',
-        	'dol_default_height_width' => 'DOL_DEFAULT_HEIGHT_WIDTH',
-        	'dol_underline' => 'DOL_UNDERLINE',
-        	'dol_underline_disabled' => 'DOL_UNDERLINE_DISABLED',
-        	'dol_cut_paper_full' => 'DOL_CUT_PAPER_FULL',
-        	'dol_cut_paper_partial' => 'DOL_CUT_PAPER_PARTIAL',
-        	'dol_open_drawer' => 'DOL_OPEN_DRAWER',
-        	'dol_beep' => 'DOL_BEEP',
-        	'dol_print_text' => 'DOL_PRINT_TEXT',
-        	'dol_print_barcode' => 'DOL_PRINT_BARCODE',
-        	'dol_value_date' => 'DateInvoice',
-        	'dol_value_date_time' => 'DateInvoiceWithTime',
-        	'dol_value_year' => 'YearInvoice',
-        	'dol_value_month_letters' => 'DOL_VALUE_MONTH_LETTERS',
-        	'dol_value_month' => 'DOL_VALUE_MONTH',
-        	'dol_value_day' => 'DOL_VALUE_DAY',
-        	'dol_value_day_letters' => 'DOL_VALUE_DAY',
-            'dol_print_payment' => 'DOL_PRINT_PAYMENT',
-        	'dol_print_logo' => 'DOL_PRINT_LOGO',
-        	'dol_print_logo_old' => 'DOL_PRINT_LOGO_OLD',
-        	'dol_value_object_id' => 'InvoiceID',
-        	'dol_value_object_ref' => 'InvoiceRef',
-        	'dol_print_object_lines' => 'DOL_PRINT_OBJECT_LINES',
-        	'dol_print_object_tax' => 'TotalVAT',
-        	'dol_print_object_local_tax1' => 'TotalLT1',
-        	'dol_print_object_local_tax2' => 'TotalLT2',
-        	'dol_print_object_total' => 'Total',
-        	'dol_print_object_number' => 'DOL_PRINT_OBJECT_NUMBER',
-        	//'dol_value_object_points' => 'DOL_VALUE_OBJECT_POINTS',
-        	'dol_print_order_lines' => 'DOL_PRINT_ORDER_LINES',
-        	'dol_value_customer_firstname' => 'DOL_VALUE_CUSTOMER_FIRSTNAME',
-        	'dol_value_customer_lastname' => 'DOL_VALUE_CUSTOMER_LASTNAME',
-        	'dol_value_customer_mail' => 'DOL_VALUE_CUSTOMER_MAIL',
-        	'dol_value_customer_phone' => 'DOL_VALUE_CUSTOMER_PHONE',
-        	'dol_value_customer_skype' => 'DOL_VALUE_CUSTOMER_SKYPE',
-        	'dol_value_customer_tax_number' => 'DOL_VALUE_CUSTOMER_TAX_NUMBER',
-        	//'dol_value_customer_account_balance' => 'DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE',
-        	//'dol_value_customer_points' => 'DOL_VALUE_CUSTOMER_POINTS',
-        	'dol_value_mysoc_name' => 'DOL_VALUE_MYSOC_NAME',
-        	'dol_value_mysoc_address' => 'Address',
-        	'dol_value_mysoc_zip' => 'Zip',
-        	'dol_value_mysoc_town' => 'Town',
-        	'dol_value_mysoc_country' => 'Country',
-        	'dol_value_mysoc_idprof1' => 'ProfId1',
-        	'dol_value_mysoc_idprof2' => 'ProfId2',
-        	'dol_value_mysoc_idprof3' => 'ProfId3',
-        	'dol_value_mysoc_idprof4' => 'ProfId4',
-        	'dol_value_mysoc_idprof5' => 'ProfId5',
-        	'dol_value_mysoc_idprof6' => 'ProfId6',
-        	'dol_value_mysoc_tva_intra' => 'VATIntra',
-        	'dol_value_mysoc_capital' => 'Capital',
-        	'dol_value_vendor_lastname' => 'VendorLastname',
-        	'dol_value_vendor_firstname' => 'VendorFirstname',
-        	'dol_value_vendor_mail' => 'VendorEmail',
-        );
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param   DoliDB      $db         database
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+		$this->tags = array(
+			'dol_line_feed' => 'DOL_LINE_FEED',
+			'dol_line_feed_reverse' => 'DOL_LINE_FEED_REVERSE',
+			'dol_align_left' => 'DOL_ALIGN_LEFT',
+			'dol_align_center' => 'DOL_ALIGN_CENTER',
+			'dol_align_right' => 'DOL_ALIGN_RIGHT',
+			'dol_use_font_a' => 'DOL_USE_FONT_A',
+			'dol_use_font_b' => 'DOL_USE_FONT_B',
+			'dol_use_font_c' => 'DOL_USE_FONT_C',
+			'dol_bold' => 'DOL_BOLD',
+			'dol_bold_disabled' => 'DOL_BOLD_DISABLED',
+			'dol_double_height' => 'DOL_DOUBLE_HEIGHT',
+			'dol_double_width' => 'DOL_DOUBLE_WIDTH',
+			'dol_default_height_width' => 'DOL_DEFAULT_HEIGHT_WIDTH',
+			'dol_underline' => 'DOL_UNDERLINE',
+			'dol_underline_disabled' => 'DOL_UNDERLINE_DISABLED',
+			'dol_cut_paper_full' => 'DOL_CUT_PAPER_FULL',
+			'dol_cut_paper_partial' => 'DOL_CUT_PAPER_PARTIAL',
+			'dol_open_drawer' => 'DOL_OPEN_DRAWER',
+			'dol_beep' => 'DOL_BEEP',
+			'dol_print_text' => 'DOL_PRINT_TEXT',
+			'dol_print_barcode' => 'DOL_PRINT_BARCODE',
+			'dol_value_date' => 'DateInvoice',
+			'dol_value_date_time' => 'DateInvoiceWithTime',
+			'dol_value_year' => 'YearInvoice',
+			'dol_value_month_letters' => 'DOL_VALUE_MONTH_LETTERS',
+			'dol_value_month' => 'DOL_VALUE_MONTH',
+			'dol_value_day' => 'DOL_VALUE_DAY',
+			'dol_value_day_letters' => 'DOL_VALUE_DAY',
+			'dol_print_payment' => 'DOL_PRINT_PAYMENT',
+			'dol_print_logo' => 'DOL_PRINT_LOGO',
+			'dol_print_logo_old' => 'DOL_PRINT_LOGO_OLD',
+			'dol_value_object_id' => 'InvoiceID',
+			'dol_value_object_ref' => 'InvoiceRef',
+			'dol_print_object_lines' => 'DOL_PRINT_OBJECT_LINES',
+			'dol_print_object_tax' => 'TotalVAT',
+			'dol_print_object_local_tax1' => 'TotalLT1',
+			'dol_print_object_local_tax2' => 'TotalLT2',
+			'dol_print_object_total' => 'Total',
+			'dol_print_object_number' => 'DOL_PRINT_OBJECT_NUMBER',
+			//'dol_value_object_points' => 'DOL_VALUE_OBJECT_POINTS',
+			'dol_print_order_lines' => 'DOL_PRINT_ORDER_LINES',
+			'dol_value_customer_firstname' => 'DOL_VALUE_CUSTOMER_FIRSTNAME',
+			'dol_value_customer_lastname' => 'DOL_VALUE_CUSTOMER_LASTNAME',
+			'dol_value_customer_mail' => 'DOL_VALUE_CUSTOMER_MAIL',
+			'dol_value_customer_phone' => 'DOL_VALUE_CUSTOMER_PHONE',
+			'dol_value_customer_skype' => 'DOL_VALUE_CUSTOMER_SKYPE',
+			'dol_value_customer_tax_number' => 'DOL_VALUE_CUSTOMER_TAX_NUMBER',
+			//'dol_value_customer_account_balance' => 'DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE',
+			//'dol_value_customer_points' => 'DOL_VALUE_CUSTOMER_POINTS',
+			'dol_value_mysoc_name' => 'DOL_VALUE_MYSOC_NAME',
+			'dol_value_mysoc_address' => 'Address',
+			'dol_value_mysoc_zip' => 'Zip',
+			'dol_value_mysoc_town' => 'Town',
+			'dol_value_mysoc_country' => 'Country',
+			'dol_value_mysoc_idprof1' => 'ProfId1',
+			'dol_value_mysoc_idprof2' => 'ProfId2',
+			'dol_value_mysoc_idprof3' => 'ProfId3',
+			'dol_value_mysoc_idprof4' => 'ProfId4',
+			'dol_value_mysoc_idprof5' => 'ProfId5',
+			'dol_value_mysoc_idprof6' => 'ProfId6',
+			'dol_value_mysoc_tva_intra' => 'VATIntra',
+			'dol_value_mysoc_capital' => 'Capital',
+			'dol_value_vendor_lastname' => 'VendorLastname',
+			'dol_value_vendor_firstname' => 'VendorFirstname',
+			'dol_value_vendor_mail' => 'VendorEmail',
+		);
+	}
 
-    /**
-     * list printers
-     *
-     * @return  int                     0 if OK; >0 if KO
-     */
-    public function listPrinters()
-    {
-        global $conf;
-        $error = 0;
-        $line = 0;
-        $obj = array();
-        $sql = 'SELECT rowid, name, fk_type, fk_profile, parameter';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql .= ' WHERE entity = '.$conf->entity;
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            $num = $this->db->num_rows($resql);
-            while ($line < $num) {
-                $row = $this->db->fetch_array($resql);
-                switch ($row['fk_type']) {
-                    case 1:
-                        $row['fk_type_name'] = 'CONNECTOR_DUMMY';
-                        break;
-                    case 2:
-                        $row['fk_type_name'] = 'CONNECTOR_FILE_PRINT';
-                        break;
-                    case 3:
-                        $row['fk_type_name'] = 'CONNECTOR_NETWORK_PRINT';
-                        break;
-                    case 4:
-                        $row['fk_type_name'] = 'CONNECTOR_WINDOWS_PRINT';
-                        break;
-                    case 5:
-                        $row['fk_type_name'] = 'CONNECTOR_CUPS_PRINT';
-                        break;
-                    default:
-                        $row['fk_type_name'] = 'CONNECTOR_UNKNOWN';
-                        break;
-                }
-                switch ($row['fk_profile']) {
-                    case 0:
-                        $row['fk_profile_name'] = 'PROFILE_DEFAULT';
-                        break;
-                    case 1:
-                        $row['fk_profile_name'] = 'PROFILE_SIMPLE';
-                        break;
-                    case 2:
-                        $row['fk_profile_name'] = 'PROFILE_EPOSTEP';
-                        break;
-                    case 3:
-                        $row['fk_profile_name'] = 'PROFILE_P822D';
-                        break;
-                    default:
-                        $row['fk_profile_name'] = 'PROFILE_STAR';
-                        break;
-                }
-                $obj[] = $row;
-                $line++;
-            }
-        } else {
-            $error++;
-            $this->errors[] = $this->db->lasterror;
-        }
-        $this->listprinters = $obj;
-        return $error;
-    }
+	/**
+	 * list printers
+	 *
+	 * @return  int                     0 if OK; >0 if KO
+	 */
+	public function listPrinters()
+	{
+		global $conf;
+		$error = 0;
+		$line = 0;
+		$obj = array();
+		$sql = 'SELECT rowid, name, fk_type, fk_profile, parameter';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
+		$sql .= ' WHERE entity = '.$conf->entity;
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			while ($line < $num) {
+				$row = $this->db->fetch_array($resql);
+				switch ($row['fk_type']) {
+					case 1:
+						$row['fk_type_name'] = 'CONNECTOR_DUMMY';
+						break;
+					case 2:
+						$row['fk_type_name'] = 'CONNECTOR_FILE_PRINT';
+						break;
+					case 3:
+						$row['fk_type_name'] = 'CONNECTOR_NETWORK_PRINT';
+						break;
+					case 4:
+						$row['fk_type_name'] = 'CONNECTOR_WINDOWS_PRINT';
+						break;
+					case 5:
+						$row['fk_type_name'] = 'CONNECTOR_CUPS_PRINT';
+						break;
+					default:
+						$row['fk_type_name'] = 'CONNECTOR_UNKNOWN';
+						break;
+				}
+				switch ($row['fk_profile']) {
+					case 0:
+						$row['fk_profile_name'] = 'PROFILE_DEFAULT';
+						break;
+					case 1:
+						$row['fk_profile_name'] = 'PROFILE_SIMPLE';
+						break;
+					case 2:
+						$row['fk_profile_name'] = 'PROFILE_EPOSTEP';
+						break;
+					case 3:
+						$row['fk_profile_name'] = 'PROFILE_P822D';
+						break;
+					default:
+						$row['fk_profile_name'] = 'PROFILE_STAR';
+						break;
+				}
+				$obj[] = $row;
+				$line++;
+			}
+		} else {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		$this->listprinters = $obj;
+		return $error;
+	}
 
 
-    /**
-     * List printers templates
-     *
-     * @return  int                     0 if OK; >0 if KO
-     */
-    public function listPrintersTemplates()
-    {
-        global $conf;
-        $error = 0;
-        $line = 0;
-        $obj = array();
-        $sql = 'SELECT rowid, name, template';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
-        $sql .= ' WHERE entity = '.$conf->entity;
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            $num = $this->db->num_rows($resql);
-            while ($line < $num) {
-                $obj[] = $this->db->fetch_array($resql);
-                $line++;
-            }
-        } else {
-            $error++;
-            $this->errors[] = $this->db->lasterror;
-        }
-        $this->listprinterstemplates = $obj;
-        return $error;
-    }
+	/**
+	 * List printers templates
+	 *
+	 * @return  int                     0 if OK; >0 if KO
+	 */
+	public function listPrintersTemplates()
+	{
+		global $conf;
+		$error = 0;
+		$line = 0;
+		$obj = array();
+		$sql = 'SELECT rowid, name, template';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
+		$sql .= ' WHERE entity = '.$conf->entity;
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			while ($line < $num) {
+				$obj[] = $this->db->fetch_array($resql);
+				$line++;
+			}
+		} else {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		$this->listprinterstemplates = $obj;
+		return $error;
+	}
 
 
-    /**
-     *  Form to Select type printer
-     *
-     *  @param    string    $selected       Id printer type pre-selected
-     *  @param    string    $htmlname       select html name
-     *  @return  int                        0 if OK; >0 if KO
-     */
-    public function selectTypePrinter($selected = '', $htmlname = 'printertypeid')
-    {
-        global $langs;
+	/**
+	 *  Form to Select type printer
+	 *
+	 *  @param    string    $selected       Id printer type pre-selected
+	 *  @param    string    $htmlname       select html name
+	 *  @return  int                        0 if OK; >0 if KO
+	 */
+	public function selectTypePrinter($selected = '', $htmlname = 'printertypeid')
+	{
+		global $langs;
 
-        $options = array(
-            1 => $langs->trans('CONNECTOR_DUMMY'),
-            2 => $langs->trans('CONNECTOR_FILE_PRINT'),
-            3 => $langs->trans('CONNECTOR_NETWORK_PRINT'),
-            4 => $langs->trans('CONNECTOR_WINDOWS_PRINT'),
+		$options = array(
+			1 => $langs->trans('CONNECTOR_DUMMY'),
+			2 => $langs->trans('CONNECTOR_FILE_PRINT'),
+			3 => $langs->trans('CONNECTOR_NETWORK_PRINT'),
+			4 => $langs->trans('CONNECTOR_WINDOWS_PRINT'),
 			5 => $langs->trans('CONNECTOR_CUPS_PRINT'),
-        );
+		);
 
-        $this->resprint = Form::selectarray($htmlname, $options, $selected);
+		$this->resprint = Form::selectarray($htmlname, $options, $selected);
 
-        return 0;
-    }
+		return 0;
+	}
 
 
-    /**
-     *  Form to Select Profile printer
-     *
-     *  @param    string    $selected       Id printer profile pre-selected
-     *  @param    string    $htmlname       select html name
-     *  @return  int                        0 if OK; >0 if KO
-     */
-    public function selectProfilePrinter($selected = '', $htmlname = 'printerprofileid')
-    {
-        global $langs;
+	/**
+	 *  Form to Select Profile printer
+	 *
+	 *  @param    string    $selected       Id printer profile pre-selected
+	 *  @param    string    $htmlname       select html name
+	 *  @return  int                        0 if OK; >0 if KO
+	 */
+	public function selectProfilePrinter($selected = '', $htmlname = 'printerprofileid')
+	{
+		global $langs;
 
-        $options = array(
-            0 => $langs->trans('PROFILE_DEFAULT'),
-            1 => $langs->trans('PROFILE_SIMPLE'),
-            2 => $langs->trans('PROFILE_EPOSTEP'),
-            3 => $langs->trans('PROFILE_P822D'),
-            4 => $langs->trans('PROFILE_STAR'),
-        );
+		$options = array(
+			0 => $langs->trans('PROFILE_DEFAULT'),
+			1 => $langs->trans('PROFILE_SIMPLE'),
+			2 => $langs->trans('PROFILE_EPOSTEP'),
+			3 => $langs->trans('PROFILE_P822D'),
+			4 => $langs->trans('PROFILE_STAR'),
+		);
 
-        $this->profileresprint = Form::selectarray($htmlname, $options, $selected);
-        return 0;
-    }
+		$this->profileresprint = Form::selectarray($htmlname, $options, $selected);
+		return 0;
+	}
 
 
-    /**
-     *  Function to Add a printer in db
-     *
-     *  @param    string    $name           Printer name
-     *  @param    int       $type           Printer type
-     *  @param    int       $profile        Printer profile
-     *  @param    string    $parameter      Printer parameter
-     *  @return  int                        0 if OK; >0 if KO
-     */
-    public function addPrinter($name, $type, $profile, $parameter)
-    {
-        global $conf;
-        $error = 0;
-        $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql .= ' (name, fk_type, fk_profile, parameter, entity)';
-        $sql .= ' VALUES ("'.$this->db->escape($name).'", '.$type.', '.$profile.', "'.$this->db->escape($parameter).'", '.$conf->entity.')';
-        $resql = $this->db->query($sql);
-        if (!$resql) {
-            $error++;
-            $this->errors[] = $this->db->lasterror;
-        }
-        return $error;
-    }
+	/**
+	 *  Function to Add a printer in db
+	 *
+	 *  @param    string    $name           Printer name
+	 *  @param    int       $type           Printer type
+	 *  @param    int       $profile        Printer profile
+	 *  @param    string    $parameter      Printer parameter
+	 *  @return  int                        0 if OK; >0 if KO
+	 */
+	public function addPrinter($name, $type, $profile, $parameter)
+	{
+		global $conf;
+		$error = 0;
+		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'printer_receipt';
+		$sql .= ' (name, fk_type, fk_profile, parameter, entity)';
+		$sql .= ' VALUES ("'.$this->db->escape($name).'", '.$type.', '.$profile.', "'.$this->db->escape($parameter).'", '.$conf->entity.')';
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		return $error;
+	}
 
-    /**
-     *  Function to Update a printer in db
-     *
-     *  @param    string    $name           Printer name
-     *  @param    int       $type           Printer type
-     *  @param    int       $profile        Printer profile
-     *  @param    string    $parameter      Printer parameter
-     *  @param    int       $printerid      Printer id
-     *  @return  int                        0 if OK; >0 if KO
-     */
-    public function updatePrinter($name, $type, $profile, $parameter, $printerid)
-    {
-        global $conf;
-        $error = 0;
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql .= ' SET name="'.$this->db->escape($name).'"';
-        $sql .= ', fk_type='.$type;
-        $sql .= ', fk_profile='.$profile;
-        $sql .= ', parameter="'.$this->db->escape($parameter).'"';
-        $sql .= ' WHERE rowid='.$printerid;
-        $resql = $this->db->query($sql);
-        if (!$resql) {
-            $error++;
-            $this->errors[] = $this->db->lasterror;
-        }
-        return $error;
-    }
+	/**
+	 *  Function to Update a printer in db
+	 *
+	 *  @param    string    $name           Printer name
+	 *  @param    int       $type           Printer type
+	 *  @param    int       $profile        Printer profile
+	 *  @param    string    $parameter      Printer parameter
+	 *  @param    int       $printerid      Printer id
+	 *  @return  int                        0 if OK; >0 if KO
+	 */
+	public function updatePrinter($name, $type, $profile, $parameter, $printerid)
+	{
+		global $conf;
+		$error = 0;
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'printer_receipt';
+		$sql .= ' SET name="'.$this->db->escape($name).'"';
+		$sql .= ', fk_type='.$type;
+		$sql .= ', fk_profile='.$profile;
+		$sql .= ', parameter="'.$this->db->escape($parameter).'"';
+		$sql .= ' WHERE rowid='.$printerid;
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		return $error;
+	}
 
-    /**
-     *  Function to Delete a printer from db
-     *
-     *  @param    int       $printerid      Printer id
-     *  @return  int                        0 if OK; >0 if KO
-     */
-    public function deletePrinter($printerid)
-    {
-        global $conf;
-        $error = 0;
-        $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql .= ' WHERE rowid='.$printerid;
-        $resql = $this->db->query($sql);
-        if (!$resql) {
-            $error++;
-            $this->errors[] = $this->db->lasterror;
-        }
-        return $error;
-    }
+	/**
+	 *  Function to Delete a printer from db
+	 *
+	 *  @param    int       $printerid      Printer id
+	 *  @return  int                        0 if OK; >0 if KO
+	 */
+	public function deletePrinter($printerid)
+	{
+		global $conf;
+		$error = 0;
+		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'printer_receipt';
+		$sql .= ' WHERE rowid='.$printerid;
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		return $error;
+	}
 
-    /**
-     *  Function to add a printer template in db
-     *
-     *  @param    string    $name           Template name
-     *  @param    int       $template       Template
-     *  @return   int                       0 if OK; >0 if KO
-     */
-    public function addTemplate($name, $template)
-    {
-        global $conf;
-        $error = 0;
-        $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'printer_receipt_template';
-        $sql .= ' (name, template, entity) VALUES ("'.$this->db->escape($name).'"';
-        $sql .= ', "'.$this->db->escape($template).'", '.$conf->entity.')';
-        $resql = $this->db->query($sql);
-        if (!$resql) {
-            $error++;
-            $this->errors[] = $this->db->lasterror;
-        }
-        return $error;
-    }
+	/**
+	 *  Function to add a printer template in db
+	 *
+	 *  @param    string    $name           Template name
+	 *  @param    int       $template       Template
+	 *  @return   int                       0 if OK; >0 if KO
+	 */
+	public function addTemplate($name, $template)
+	{
+		global $conf;
+		$error = 0;
+		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'printer_receipt_template';
+		$sql .= ' (name, template, entity) VALUES ("'.$this->db->escape($name).'"';
+		$sql .= ', "'.$this->db->escape($template).'", '.$conf->entity.')';
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		return $error;
+	}
 
-    /**
-     *  Function to delete a printer template in db
-     *
-     *  @param    int       $templateid     Template ID
-     *  @return   int                       0 if OK; >0 if KO
-     */
-    public function deleteTemplate($templateid)
-    {
-    	global $conf;
-    	$error = 0;
-    	$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
-    	$sql .= " WHERE rowid = ".((int) $this->db->escape($templateid));
-    	$sql .= " AND entity = ".$conf->entity;
-    	$resql = $this->db->query($sql);
-    	if (!$resql) {
-    		$error++;
-    		$this->errors[] = $this->db->lasterror;
-    	}
-    	return $error;
-    }
+	/**
+	 *  Function to delete a printer template in db
+	 *
+	 *  @param    int       $templateid     Template ID
+	 *  @return   int                       0 if OK; >0 if KO
+	 */
+	public function deleteTemplate($templateid)
+	{
+		global $conf;
+		$error = 0;
+		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
+		$sql .= " WHERE rowid = ".((int) $this->db->escape($templateid));
+		$sql .= " AND entity = ".$conf->entity;
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		return $error;
+	}
 
-    /**
-     *  Function to Update a printer template in db
-     *
-     *  @param    string    $name           Template name
-     *  @param    int       $template       Template
-     *  @param    int       $templateid     Template id
-     *  @return   int                       0 if OK; >0 if KO
-     */
-    public function updateTemplate($name, $template, $templateid)
-    {
-        global $conf;
-        $error = 0;
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.'printer_receipt_template';
-        $sql .= ' SET name="'.$this->db->escape($name).'"';
-        $sql .= ', template="'.$this->db->escape($template).'"';
-        $sql .= ' WHERE rowid='.$templateid;
-        $resql = $this->db->query($sql);
-        if (!$resql) {
-            $error++;
-            $this->errors[] = $this->db->lasterror;
-        }
-        return $error;
-    }
+	/**
+	 *  Function to Update a printer template in db
+	 *
+	 *  @param    string    $name           Template name
+	 *  @param    int       $template       Template
+	 *  @param    int       $templateid     Template id
+	 *  @return   int                       0 if OK; >0 if KO
+	 */
+	public function updateTemplate($name, $template, $templateid)
+	{
+		global $conf;
+		$error = 0;
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'printer_receipt_template';
+		$sql .= ' SET name="'.$this->db->escape($name).'"';
+		$sql .= ', template="'.$this->db->escape($template).'"';
+		$sql .= ' WHERE rowid='.$templateid;
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		return $error;
+	}
 
 
-    /**
-     *  Function to Send Test page to Printer
-     *
-     *  @param    int       $printerid      Printer id
-     *  @return  int                        0 if OK; >0 if KO
-     */
-    public function sendTestToPrinter($printerid)
-    {
-        global $conf;
-        $error = 0;
-        $img = EscposImage::load(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo_bw.png');
-        //$this->profile = CapabilityProfile::load("TM-T88IV");
-        $ret = $this->initPrinter($printerid);
-        if ($ret > 0) {
-            setEventMessages($this->error, $this->errors, 'errors');
-        } else {
-            try {
-                $this->printer->bitImage($img);
-                $this->printer->text("Hello World!\n");
-                $testStr = "1234567890";
-                $this->printer->barcode($testStr);
-                //$this->printer->qrcode($testStr, Printer::QR_ECLEVEL_M, 5, Printer::QR_MODEL_1);
-                $this->printer->text("Most simple example\n");
-                $this->printer->feed();
-                $this->printer->cut();
+	/**
+	 *  Function to Send Test page to Printer
+	 *
+	 *  @param    int       $printerid      Printer id
+	 *  @return  int                        0 if OK; >0 if KO
+	 */
+	public function sendTestToPrinter($printerid)
+	{
+		global $conf;
+		$error = 0;
+		$img = EscposImage::load(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo_bw.png');
+		//$this->profile = CapabilityProfile::load("TM-T88IV");
+		$ret = $this->initPrinter($printerid);
+		if ($ret > 0) {
+			setEventMessages($this->error, $this->errors, 'errors');
+		} else {
+			try {
+				$this->printer->bitImage($img);
+				$this->printer->text("Hello World!\n");
+				$testStr = "1234567890";
+				$this->printer->barcode($testStr);
+				//$this->printer->qrcode($testStr, Printer::QR_ECLEVEL_M, 5, Printer::QR_MODEL_1);
+				$this->printer->text("Most simple example\n");
+				$this->printer->feed();
+				$this->printer->cut();
 
 				// If is DummyPrintConnector send to log to debugging
 				if ($this->printer->connector instanceof DummyPrintConnector)
@@ -545,225 +545,234 @@ class dolReceiptPrinter extends Printer
 					$data = $this->printer->connector-> getData();
 					dol_syslog($data);
 				}
-                $this->printer->close();
-            } catch (Exception $e) {
-                $this->errors[] = $e->getMessage();
-                $error++;
-            }
-        }
-        return $error;
-    }
+				$this->printer->close();
+			} catch (Exception $e) {
+				$this->errors[] = $e->getMessage();
+				$error++;
+			}
+		}
+		return $error;
+	}
 
-    /**
-     *  Function to Print Receipt Ticket
-     *
-     *  @param   Facture|Commande   $object         Order or invoice object
-     *  @param   int       			$templateid     Template id
-     *  @param   int       			$printerid      Printer id
-     *  @return  int                				0 if OK; >0 if KO
-     */
-    public function sendToPrinter($object, $templateid, $printerid)
-    {
-        global $conf, $mysoc, $langs, $user;
-        $error = 0;
-        $ret = $this->loadTemplate($templateid);
+	/**
+	 *  Function to Print Receipt Ticket
+	 *
+	 *  @param   Facture|Commande   $object         Order or invoice object
+	 *  @param   int       			$templateid     Template id
+	 *  @param   int       			$printerid      Printer id
+	 *  @return  int                				0 if OK; >0 if KO
+	 */
+	public function sendToPrinter($object, $templateid, $printerid)
+	{
+		global $conf, $mysoc, $langs, $user;
+		$error = 0;
+		$ret = $this->loadTemplate($templateid);
 
-        // tags a remplacer par leur valeur avant de parser (dol_value_xxx)
-        $this->template = str_replace('<dol_value_object_id>', $object->id, $this->template);
-        $this->template = str_replace('<dol_value_object_ref>', $object->ref, $this->template);
-        //$this->template = str_replace('<dol_value_object_points>', $object->points, $this->template);
-        $this->template = str_replace('<dol_value_date>', dol_print_date($object->date, 'day'), $this->template);
-        $this->template = str_replace('<dol_value_date_time>', dol_print_date($object->date, 'dayhour'), $this->template);
-        $this->template = str_replace('<dol_value_year>', dol_print_date($object->date, '%Y'), $this->template);
-        $this->template = str_replace('<dol_value_month_letters>', $langs->trans("Month".dol_print_date($object->date, '%m')), $this->template);
-        $this->template = str_replace('<dol_value_month>', dol_print_date($object->date, '%m'), $this->template);
-        $this->template = str_replace('<dol_value_day>', dol_print_date($object->date, '%d'), $this->template);
-        $this->template = str_replace('<dol_value_day_letters>', $langs->trans("Day".dol_print_date($object->date, '%m')[1]), $this->template);
+		// tags a remplacer par leur valeur avant de parser (dol_value_xxx)
+		$this->template = str_replace('{dol_value_object_id}', $object->id, $this->template);
+		$this->template = str_replace('{dol_value_object_ref}', $object->ref, $this->template);
+		//$this->template = str_replace('<dol_value_object_points>', $object->points, $this->template);
+		$this->template = str_replace('{dol_value_date}', dol_print_date($object->date, 'day'), $this->template);
+		$this->template = str_replace('{dol_value_date_time}', dol_print_date($object->date, 'dayhour'), $this->template);
+		$this->template = str_replace('{dol_value_year}', dol_print_date($object->date, '%Y'), $this->template);
+		$this->template = str_replace('{dol_value_month_letters}', $langs->trans("Month".dol_print_date($object->date, '%m')), $this->template);
+		$this->template = str_replace('{dol_value_month}', dol_print_date($object->date, '%m'), $this->template);
+		$this->template = str_replace('{dol_value_day}', dol_print_date($object->date, '%d'), $this->template);
+		$this->template = str_replace('{dol_value_day_letters}', $langs->trans("Day".dol_print_date($object->date, '%m')[1]), $this->template);
 
-        $this->template = str_replace('<dol_value_customer_firstname>', $object->thirdparty->firstname, $this->template);
-        $this->template = str_replace('<dol_value_customer_lastname>', $object->thirdparty->lastname, $this->template);
-        $this->template = str_replace('<dol_value_customer_mail>', $object->thirdparty->email, $this->template);
-        $this->template = str_replace('<dol_value_customer_phone>', $object->thirdparty->phone, $this->template);
-        //$this->template = str_replace('<dol_value_customer_mobile>', $object->thirdparty->mobile, $this->template);
-        $this->template = str_replace('<dol_value_customer_tax_number>', $object->thirdparty->tva_intra, $this->template);
-        //$this->template = str_replace('<dol_value_customer_account_balance>', $object->customer_account_balance, $this->template);
-        //$this->template = str_replace('<dol_value_customer_points>', $object->customer_points, $this->template);
+		$this->template = str_replace('{dol_value_customer_firstname}', $object->thirdparty->firstname, $this->template);
+		$this->template = str_replace('{dol_value_customer_lastname}', $object->thirdparty->lastname, $this->template);
+		$this->template = str_replace('{dol_value_customer_mail}', $object->thirdparty->email, $this->template);
+		$this->template = str_replace('{dol_value_customer_phone}', $object->thirdparty->phone, $this->template);
+		//$this->template = str_replace('<dol_value_customer_mobile>', $object->thirdparty->mobile, $this->template);
+		$this->template = str_replace('{dol_value_customer_tax_number}', $object->thirdparty->tva_intra, $this->template);
+		//$this->template = str_replace('<dol_value_customer_account_balance>', $object->customer_account_balance, $this->template);
+		//$this->template = str_replace('<dol_value_customer_points>', $object->customer_points, $this->template);
 
-        $this->template = str_replace('<dol_value_mysoc_name>', $mysoc->name, $this->template);
-        $this->template = str_replace('<dol_value_mysoc_address>', $mysoc->address, $this->template);
-        $this->template = str_replace('<dol_value_mysoc_zip>', $mysoc->zip, $this->template);
-        $this->template = str_replace('<dol_value_mysoc_town>', $mysoc->town, $this->template);
-        $this->template = str_replace('<dol_value_mysoc_country>', $mysoc->country, $this->template);
-        $this->template = str_replace('<dol_value_mysoc_idprof1>', $mysoc->idprof1, $this->template);
-        $this->template = str_replace('<dol_value_mysoc_idprof2>', $mysoc->idprof2, $this->template);
-        $this->template = str_replace('<dol_value_mysoc_idprof3>', $mysoc->idprof3, $this->template);
-        $this->template = str_replace('<dol_value_mysoc_idprof4>', $mysoc->idprof4, $this->template);
-        $this->template = str_replace('<dol_value_mysoc_idprof5>', $mysoc->idprof5, $this->template);
-        $this->template = str_replace('<dol_value_mysoc_idprof6>', $mysoc->idprof6, $this->template);
-        $this->template = str_replace('<dol_value_mysoc_tva_intra>', $mysoc->tva_intra, $this->template);
-        $this->template = str_replace('<dol_value_mysoc_capital>', $mysoc->capital, $this->template);
+		$this->template = str_replace('{dol_value_mysoc_name}', $mysoc->name, $this->template);
+		$this->template = str_replace('{dol_value_mysoc_address}', $mysoc->address, $this->template);
+		$this->template = str_replace('{dol_value_mysoc_zip}', $mysoc->zip, $this->template);
+		$this->template = str_replace('{dol_value_mysoc_town}', $mysoc->town, $this->template);
+		$this->template = str_replace('{dol_value_mysoc_country}', $mysoc->country, $this->template);
+		$this->template = str_replace('{dol_value_mysoc_idprof1}', $mysoc->idprof1, $this->template);
+		$this->template = str_replace('{dol_value_mysoc_idprof2}', $mysoc->idprof2, $this->template);
+		$this->template = str_replace('{dol_value_mysoc_idprof3}', $mysoc->idprof3, $this->template);
+		$this->template = str_replace('{dol_value_mysoc_idprof4}', $mysoc->idprof4, $this->template);
+		$this->template = str_replace('{dol_value_mysoc_idprof5}', $mysoc->idprof5, $this->template);
+		$this->template = str_replace('{dol_value_mysoc_idprof6}', $mysoc->idprof6, $this->template);
+		$this->template = str_replace('{dol_value_mysoc_tva_intra}', $mysoc->tva_intra, $this->template);
+		$this->template = str_replace('{dol_value_mysoc_capital}', $mysoc->capital, $this->template);
 
-        $this->template = str_replace('<dol_value_vendor_firstname>', $user->firstname, $this->template);
-        $this->template = str_replace('<dol_value_vendor_lastname>', $user->lastname, $this->template);
-        $this->template = str_replace('<dol_value_vendor_mail>', $user->email, $this->template);
+		$this->template = str_replace('{dol_value_vendor_firstname}', $user->firstname, $this->template);
+		$this->template = str_replace('{dol_value_vendor_lastname}', $user->lastname, $this->template);
+		$this->template = str_replace('{dol_value_vendor_mail}', $user->email, $this->template);
 
-        // parse template
-        $p = xml_parser_create();
-        xml_parse_into_struct($p, $this->template, $vals, $index);
-        xml_parser_free($p);
-        //print '<pre>'.print_r($index, true).'</pre>';
-        //print '<pre>'.print_r($vals, true).'</pre>';
-        // print ticket
-        $level = 0;
-        $nbcharactbyline = (!empty($conf->global->RECEIPT_PRINTER_NB_CHARACT_BY_LINE) ? $conf->global->RECEIPT_PRINTER_NB_CHARACT_BY_LINE : 48);
-        $ret = $this->initPrinter($printerid);
-        if ($ret > 0) {
-            setEventMessages($this->error, $this->errors, 'errors');
-        } else {
-            $nboflines = count($vals);
-            for ($tplline = 0; $tplline < $nboflines; $tplline++) {
-                //var_dump($vals[$tplline]['value']);
-                switch ($vals[$tplline]['tag']) {
-                    case 'DOL_PRINT_TEXT':
-                        $this->printer->text($vals[$tplline]['value']);
-                        break;
-                    case 'DOL_PRINT_OBJECT_LINES':
-                        foreach ($object->lines as $line) {
-                            //var_dump($line);
-                            $spacestoadd = $nbcharactbyline - strlen($line->ref) - strlen($line->qty) - 10 - 1;
-                            $spaces = str_repeat(' ', $spacestoadd);
-                            $this->printer->text($line->ref.$spaces.$line->qty.' '.str_pad(price($line->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");
-                            $this->printer->text(strip_tags(htmlspecialchars_decode($line->product_label))."\n");
-                        }
-                        break;
-                    case 'DOL_PRINT_OBJECT_TAX':
-                        //var_dump($object);
-                        $vatarray = array();
-                        foreach ($object->lines as $line) {
-                            $vatarray[$line->tva_tx] += $line->total_tva;
-                        }
-                        foreach ($vatarray as $vatkey => $vatvalue) {
-                             $spacestoadd = $nbcharactbyline - strlen($vatkey) - 12;
-                             $spaces = str_repeat(' ', $spacestoadd);
-                             $this->printer->text($spaces.$vatkey.'% '.str_pad(price($vatvalue), 10, ' ', STR_PAD_LEFT)."\n");
-                        }
-                        break;
-                    case 'DOL_PRINT_OBJECT_TAX1':
-                    	//var_dump($object);
-                    	$total_localtax1 = 0;
-                    	foreach ($object->lines as $line) {
-                    		$total_localtax1 += $line->total_localtax1;
-                    	}
-                    	foreach ($vatarray as $vatkey => $vatvalue) {
-                    		$this->printer->text(str_pad(price($total_localtax1), 10, ' ', STR_PAD_LEFT)."\n");
-                    	}
-                    	break;
-                    case 'DOL_PRINT_OBJECT_TAX2':
-                    	//var_dump($object);
-                    	$total_localtax2 = 0;
-                    	foreach ($object->lines as $line) {
-                    		$total_localtax2 += $line->total_localtax2;
-                    	}
-                    	foreach ($vatarray as $vatkey => $vatvalue) {
-                    		$this->printer->text(str_pad(price($total_localtax2), 10, ' ', STR_PAD_LEFT)."\n");
-                    	}
-                    	break;
-                    case 'DOL_PRINT_OBJECT_TOTAL':
-                        $title = $langs->trans('TotalHT');
-                        $spacestoadd = $nbcharactbyline - strlen($title) - 10;
-                        $spaces = str_repeat(' ', $spacestoadd);
-                        $this->printer->text($title.$spaces.str_pad(price($object->total_ht), 10, ' ', STR_PAD_LEFT)."\n");
-                        $title = $langs->trans('TotalVAT');
-                        $spacestoadd = $nbcharactbyline - strlen($title) - 10;
-                        $spaces = str_repeat(' ', $spacestoadd);
-                        $this->printer->text($title.$spaces.str_pad(price($object->total_tva), 10, ' ', STR_PAD_LEFT)."\n");
-                        $title = $langs->trans('TotalTTC');
-                        $spacestoadd = $nbcharactbyline - strlen($title) - 10;
-                        $spaces = str_repeat(' ', $spacestoadd);
-                        $this->printer->text($title.$spaces.str_pad(price($object->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");
-                        break;
-                    case 'DOL_LINE_FEED':
-                        $this->printer->feed();
-                        break;
-                    case 'DOL_LINE_FEED_REVERSE':
-                        $this->printer->feedReverse();
-                        break;
-                    case 'DOL_ALIGN_CENTER':
-                        $this->printer->setJustification(Printer::JUSTIFY_CENTER);
-                        break;
-                    case 'DOL_ALIGN_RIGHT':
-                        $this->printer->setJustification(Printer::JUSTIFY_RIGHT);
-                        break;
-                    case 'DOL_ALIGN_LEFT':
-                        $this->printer->setJustification(Printer::JUSTIFY_LEFT);
-                        break;
-                    case 'DOL_OPEN_DRAWER':
-                        $this->printer->pulse();
-                        break;
-                    case 'DOL_ACTIVATE_BUZZER':
-                        //$this->printer->buzzer();
-                        break;
-                    case 'DOL_PRINT_BARCODE':
-                        // $vals[$tplline]['value'] -> barcode($content, $type)
-                        // var_dump($vals[$tplline]['value']);
-                        try {
-                            $this->printer->barcode($vals[$tplline]['value']);
-                        } catch (Exception $e) {
-                            $this->errors[] = 'Invalid Barcode value: '.$vals[$tplline]['value'];
-                            $error++;
-                        }
-                        break;
-                    case 'DOL_PRINT_LOGO':
-                        $img = EscposImage::load(DOL_DATA_ROOT.'/mycompany/logos/'.$mysoc->logo);
-                        $this->printer->graphics($img);
-                        break;
-                    case 'DOL_PRINT_LOGO_OLD':
-                        $img = EscposImage::load(DOL_DATA_ROOT.'/mycompany/logos/'.$mysoc->logo);
-                        $this->printer->bitImage($img);
-                        break;
-                    case 'DOL_PRINT_QRCODE':
-                        // $vals[$tplline]['value'] -> qrCode($content, $ec, $size, $model)
-                        $this->printer->qrcode($vals[$tplline]['value']);
-                        break;
-                    case 'DOL_CUT_PAPER_FULL':
-                        $this->printer->cut(Printer::CUT_FULL);
-                        break;
-                    case 'DOL_CUT_PAPER_PARTIAL':
-                        $this->printer->cut(Printer::CUT_PARTIAL);
-                        break;
-                    case 'DOL_USE_FONT_A':
-                        $this->printer->setFont(Printer::FONT_A);
-                        break;
-                    case 'DOL_USE_FONT_B':
-                        $this->printer->setFont(Printer::FONT_B);
-                        break;
-                    case 'DOL_USE_FONT_C':
-                        $this->printer->setFont(Printer::FONT_C);
-                        break;
+		// parse template
+		$this->template = str_replace("{", "<", $this->template);
+		$this->template = str_replace("}", ">", $this->template);
+		$p = xml_parser_create();
+		xml_parse_into_struct($p, $this->template, $vals, $index);
+		xml_parser_free($p);
+		//print '<pre>'.print_r($index, true).'</pre>';
+		//print '<pre>'.print_r($vals, true).'</pre>';
+		// print ticket
+		$level = 0;
+		$nbcharactbyline = (!empty($conf->global->RECEIPT_PRINTER_NB_CHARACT_BY_LINE) ? $conf->global->RECEIPT_PRINTER_NB_CHARACT_BY_LINE : 48);
+		$ret = $this->initPrinter($printerid);
+		if ($ret > 0) {
+			setEventMessages($this->error, $this->errors, 'errors');
+		} else {
+			$nboflines = count($vals);
+			for ($tplline = 0; $tplline < $nboflines; $tplline++) {
+				//var_dump($vals[$tplline]['value']);
+				switch ($vals[$tplline]['tag']) {
+					case 'DOL_PRINT_TEXT':
+						$this->printer->text($vals[$tplline]['value']);
+						break;
+					case 'DOL_PRINT_OBJECT_LINES':
+						foreach ($object->lines as $line) {
+							if ($line->fk_product)
+							{
+								$spacestoadd = $nbcharactbyline - strlen($line->ref) - strlen($line->qty) - 10 - 1;
+								$spaces = str_repeat(' ', $spacestoadd);
+								$this->printer->text($line->ref.$spaces.$line->qty.' '.str_pad(price($line->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");
+								$this->printer->text(strip_tags(htmlspecialchars_decode($line->product_label))."\n");
+							}
+							else {
+								$spacestoadd = $nbcharactbyline - strlen($line->description) - strlen($line->qty) - 10 - 1;
+								$spaces = str_repeat(' ', $spacestoadd);
+								$this->printer->text($line->description.$spaces.$line->qty.' '.str_pad(price($line->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");
+							}
+						}
+						break;
+					case 'DOL_PRINT_OBJECT_TAX':
+						//var_dump($object);
+						$vatarray = array();
+						foreach ($object->lines as $line) {
+							$vatarray[$line->tva_tx] += $line->total_tva;
+						}
+						foreach ($vatarray as $vatkey => $vatvalue) {
+							 $spacestoadd = $nbcharactbyline - strlen($vatkey) - 12;
+							 $spaces = str_repeat(' ', $spacestoadd);
+							 $this->printer->text($spaces.$vatkey.'% '.str_pad(price($vatvalue), 10, ' ', STR_PAD_LEFT)."\n");
+						}
+						break;
+					case 'DOL_PRINT_OBJECT_TAX1':
+						//var_dump($object);
+						$total_localtax1 = 0;
+						foreach ($object->lines as $line) {
+							$total_localtax1 += $line->total_localtax1;
+						}
+						foreach ($vatarray as $vatkey => $vatvalue) {
+							$this->printer->text(str_pad(price($total_localtax1), 10, ' ', STR_PAD_LEFT)."\n");
+						}
+						break;
+					case 'DOL_PRINT_OBJECT_TAX2':
+						//var_dump($object);
+						$total_localtax2 = 0;
+						foreach ($object->lines as $line) {
+							$total_localtax2 += $line->total_localtax2;
+						}
+						foreach ($vatarray as $vatkey => $vatvalue) {
+							$this->printer->text(str_pad(price($total_localtax2), 10, ' ', STR_PAD_LEFT)."\n");
+						}
+						break;
+					case 'DOL_PRINT_OBJECT_TOTAL':
+						$title = $langs->trans('TotalHT');
+						$spacestoadd = $nbcharactbyline - strlen($title) - 10;
+						$spaces = str_repeat(' ', $spacestoadd);
+						$this->printer->text($title.$spaces.str_pad(price($object->total_ht), 10, ' ', STR_PAD_LEFT)."\n");
+						$title = $langs->trans('TotalVAT');
+						$spacestoadd = $nbcharactbyline - strlen($title) - 10;
+						$spaces = str_repeat(' ', $spacestoadd);
+						$this->printer->text($title.$spaces.str_pad(price($object->total_tva), 10, ' ', STR_PAD_LEFT)."\n");
+						$title = $langs->trans('TotalTTC');
+						$spacestoadd = $nbcharactbyline - strlen($title) - 10;
+						$spaces = str_repeat(' ', $spacestoadd);
+						$this->printer->text($title.$spaces.str_pad(price($object->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");
+						break;
+					case 'DOL_LINE_FEED':
+						$this->printer->feed();
+						break;
+					case 'DOL_LINE_FEED_REVERSE':
+						$this->printer->feedReverse();
+						break;
+					case 'DOL_ALIGN_CENTER':
+						$this->printer->setJustification(Printer::JUSTIFY_CENTER);
+						break;
+					case 'DOL_ALIGN_RIGHT':
+						$this->printer->setJustification(Printer::JUSTIFY_RIGHT);
+						break;
+					case 'DOL_ALIGN_LEFT':
+						$this->printer->setJustification(Printer::JUSTIFY_LEFT);
+						break;
+					case 'DOL_OPEN_DRAWER':
+						$this->printer->pulse();
+						break;
+					case 'DOL_ACTIVATE_BUZZER':
+						//$this->printer->buzzer();
+						break;
+					case 'DOL_PRINT_BARCODE':
+						// $vals[$tplline]['value'] -> barcode($content, $type)
+						// var_dump($vals[$tplline]['value']);
+						try {
+							$this->printer->barcode($vals[$tplline]['value']);
+						} catch (Exception $e) {
+							$this->errors[] = 'Invalid Barcode value: '.$vals[$tplline]['value'];
+							$error++;
+						}
+						break;
+					case 'DOL_PRINT_LOGO':
+						$img = EscposImage::load(DOL_DATA_ROOT.'/mycompany/logos/'.$mysoc->logo);
+						$this->printer->graphics($img);
+						break;
+					case 'DOL_PRINT_LOGO_OLD':
+						$img = EscposImage::load(DOL_DATA_ROOT.'/mycompany/logos/'.$mysoc->logo);
+						$this->printer->bitImage($img);
+						break;
+					case 'DOL_PRINT_QRCODE':
+						// $vals[$tplline]['value'] -> qrCode($content, $ec, $size, $model)
+						$this->printer->qrcode($vals[$tplline]['value']);
+						break;
+					case 'DOL_CUT_PAPER_FULL':
+						$this->printer->cut(Printer::CUT_FULL);
+						break;
+					case 'DOL_CUT_PAPER_PARTIAL':
+						$this->printer->cut(Printer::CUT_PARTIAL);
+						break;
+					case 'DOL_USE_FONT_A':
+						$this->printer->setFont(Printer::FONT_A);
+						break;
+					case 'DOL_USE_FONT_B':
+						$this->printer->setFont(Printer::FONT_B);
+						break;
+					case 'DOL_USE_FONT_C':
+						$this->printer->setFont(Printer::FONT_C);
+						break;
 					case 'DOL_BOLD':
-                        $this->printer->setEmphasis(true);
-                        break;
+						$this->printer->setEmphasis(true);
+						break;
 					case 'DOL_BOLD_DISABLED':
-                        $this->printer->setEmphasis(false);
-                        break;
+						$this->printer->setEmphasis(false);
+						break;
 					case 'DOL_DOUBLE_HEIGHT':
-                        $this->printer->setTextSize(1, 2);
-                        break;
+						$this->printer->setTextSize(1, 2);
+						break;
 					case 'DOL_DOUBLE_WIDTH':
-                        $this->printer->setTextSize(2, 1);
-                        break;
+						$this->printer->setTextSize(2, 1);
+						break;
 					case 'DOL_DEFAULT_HEIGHT_WIDTH':
-                        $this->printer->setTextSize(1, 1);
-                        break;
+						$this->printer->setTextSize(1, 1);
+						break;
 					case 'DOL_UNDERLINE':
-                        $this->printer->setUnderline(true);
-                        break;
+						$this->printer->setUnderline(true);
+						break;
 					case 'DOL_UNDERLINE_DISABLED':
-                        $this->printer->setUnderline(false);
-                        break;
+						$this->printer->setUnderline(false);
+						break;
 					case 'DOL_BEEP':
-                        $this->printer->getPrintConnector() -> write("\x1e");
-                        break;
+						$this->printer->getPrintConnector() -> write("\x1e");
+						break;
 					case 'DOL_PRINT_ORDER_LINES':
 						foreach ($object->lines as $line) {
 							if ($line->special_code == $this->orderprinter)
@@ -773,7 +782,7 @@ class dolReceiptPrinter extends Printer
 								$this->printer->text($line->ref.$spaces.$line->qty.' '.str_pad(price($line->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");
 								$this->printer->text(strip_tags(htmlspecialchars_decode($line->desc))."\n");
 							}
-                        }
+						}
 						break;
 					case 'DOL_PRINT_PAYMENT':
 						$sql = "SELECT p.pos_change as pos_change, p.datep as date, p.fk_paiement, p.num_paiement as num, pf.amount as amount, pf.multicurrency_amount,";
@@ -791,10 +800,10 @@ class dolReceiptPrinter extends Printer
 								$row = $this->db->fetch_object($resql);
 								$spacestoadd = $nbcharactbyline - strlen($langs->transnoentitiesnoconv("PaymentTypeShort".$row->code)) - 12;
 								$spaces = str_repeat(' ', $spacestoadd);
-								$amount_payment=($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount;
+								$amount_payment = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount;
 								if ($row->code == "LIQ") $amount_payment = $amount_payment + $row->pos_change; // Show amount with excess received if is cash payment
 								$this->printer->text($spaces.$langs->transnoentitiesnoconv("PaymentTypeShort".$row->code).' '.str_pad(price($amount_payment), 10, ' ', STR_PAD_LEFT)."\n");
-								if ($row->code == "LIQ" && $row->pos_change>0) // Print change only in cash payments
+								if ($row->code == "LIQ" && $row->pos_change > 0) // Print change only in cash payments
 								{
 									$spacestoadd = $nbcharactbyline - strlen($langs->trans("Change")) - 12;
 									$spaces = str_repeat(' ', $spacestoadd);
@@ -804,113 +813,119 @@ class dolReceiptPrinter extends Printer
 							}
 						}
 						break;
-                    default:
-                        $this->printer->text($vals[$tplline]['tag']);
-                        $this->printer->text($vals[$tplline]['value']);
-                        $this->errors[] = 'UnknowTag: &lt;'.strtolower($vals[$tplline]['tag']).'&gt;';
-                        $error++;
-                        break;
-                }
-            }
-            // If is DummyPrintConnector send to log to debugging
-			if ($this->printer->connector instanceof DummyPrintConnector)
+					default:
+						$this->printer->text($vals[$tplline]['tag']);
+						$this->printer->text($vals[$tplline]['value']);
+						$this->errors[] = 'UnknowTag: &lt;'.strtolower($vals[$tplline]['tag']).'&gt;';
+						$error++;
+						break;
+				}
+			}
+			// If is DummyPrintConnector send to log to debugging
+			if ($this->printer->connector instanceof DummyPrintConnector || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector")
 			{
 				$data = $this->printer->connector->getData();
+				if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") echo base64_encode($data);
 				dol_syslog($data);
 			}
 			// Close and print
-            $this->printer->close();
-        }
-        return $error;
-    }
+			$this->printer->close();
+		}
+		return $error;
+	}
 
-    /**
-     *  Function to load Template
-     *
-     *  @param   int       $templateid          Template id
-     *  @return  int                            0 if OK; >0 if KO
-     */
-    public function loadTemplate($templateid)
-    {
-        global $conf;
-        $error = 0;
-        $sql = 'SELECT template';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
-        $sql .= ' WHERE rowid='.$templateid;
-        $sql .= ' AND entity = '.$conf->entity;
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            $obj = $this->db->fetch_array($resql);
-        } else {
-            $error++;
-            $this->errors[] = $this->db->lasterror;
-        }
-        if (empty($obj)) {
-            $error++;
-            $this->errors[] = 'TemplateDontExist';
-        } else {
-            $this->template = $obj['0'];
-        }
+	/**
+	 *  Function to load Template
+	 *
+	 *  @param   int       $templateid          Template id
+	 *  @return  int                            0 if OK; >0 if KO
+	 */
+	public function loadTemplate($templateid)
+	{
+		global $conf;
+		$error = 0;
+		$sql = 'SELECT template';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
+		$sql .= ' WHERE rowid='.$templateid;
+		$sql .= ' AND entity = '.$conf->entity;
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$obj = $this->db->fetch_array($resql);
+		} else {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		if (empty($obj)) {
+			$error++;
+			$this->errors[] = 'TemplateDontExist';
+		} else {
+			$this->template = $obj['0'];
+		}
 
-        return $error;
-    }
+		return $error;
+	}
 
 
-    /**
-     *  Function Init Printer
-     *
-     *  @param   int       $printerid       Printer id
-     *  @return  int                        0 if OK; >0 if KO
-     */
-    public function initPrinter($printerid)
-    {
-        global $conf;
-        $error = 0;
-        $sql = 'SELECT rowid, name, fk_type, fk_profile, parameter';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql .= ' WHERE rowid = '.$printerid;
-        $sql .= ' AND entity = '.$conf->entity;
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            $obj = $this->db->fetch_array($resql);
-        } else {
-            $error++;
-            $this->errors[] = $this->db->lasterror;
-        }
-        if (empty($obj)) {
-            $error++;
-            $this->errors[] = 'PrinterDontExist';
-        }
-        if (!$error) {
-            $parameter = $obj['parameter'];
-            try {
-                switch ($obj['fk_type']) {
-                    case 1:
-                        $this->connector = new DummyPrintConnector();
-                        break;
-                    case 2:
-                        $this->connector = new FilePrintConnector($parameter);
-                        break;
-                    case 3:
-                        $parameters = explode(':', $parameter);
-                        $this->connector = new NetworkPrintConnector($parameters[0], $parameters[1]);
-                        break;
-                    case 4:
-                        $this->connector = new WindowsPrintConnector($parameter);
-                        break;
+	/**
+	 *  Function Init Printer
+	 *
+	 *  @param   int       $printerid       Printer id
+	 *  @return  int                        0 if OK; >0 if KO
+	 */
+	public function initPrinter($printerid)
+	{
+		global $conf;
+		if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
+			$this->connector = new DummyPrintConnector();
+			$this->printer = new Printer($this->connector, $this->profile);
+			return;
+		}
+		$error = 0;
+		$sql = 'SELECT rowid, name, fk_type, fk_profile, parameter';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
+		$sql .= ' WHERE rowid = '.$printerid;
+		$sql .= ' AND entity = '.$conf->entity;
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$obj = $this->db->fetch_array($resql);
+		} else {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		if (empty($obj)) {
+			$error++;
+			$this->errors[] = 'PrinterDontExist';
+		}
+		if (!$error) {
+			$parameter = $obj['parameter'];
+			try {
+				switch ($obj['fk_type']) {
+					case 1:
+						$this->connector = new DummyPrintConnector();
+						break;
+					case 2:
+						$this->connector = new FilePrintConnector($parameter);
+						break;
+					case 3:
+						$parameters = explode(':', $parameter);
+						$this->connector = new NetworkPrintConnector($parameters[0], $parameters[1]);
+						break;
+					case 4:
+						$this->connector = new WindowsPrintConnector($parameter);
+						break;
 					case 5:
-                        $this->connector = new CupsPrintConnector($parameter);
-                        break;
-                    default:
-                        $this->connector = 'CONNECTOR_UNKNOWN';
-                        break;
-                }
-                $this->printer = new Printer($this->connector, $this->profile);
-            } catch (Exception $e) {
-                $this->errors[] = $e->getMessage();
-                $error++;
-            }
-        }
-        return $error;
-    }
+						$this->connector = new CupsPrintConnector($parameter);
+						break;
+					default:
+						$this->connector = 'CONNECTOR_UNKNOWN';
+						break;
+				}
+				$this->printer = new Printer($this->connector, $this->profile);
+			} catch (Exception $e) {
+				$this->errors[] = $e->getMessage();
+				$error++;
+			}
+		}
+		return $error;
+	}
 }
diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index 7cf18ae4801..0d9ddd72e24 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -114,53 +114,25 @@ class EmailSenderProfile extends CommonObject
 	public $entity;
 
 	/**
-     * @var string Email Sender Profile label
-     */
-    public $label;
+	 * @var string Email Sender Profile label
+	 */
+	public $label;
 
 	public $email;
 
 	/**
-     * @var integer|string date_creation
-     */
+	 * @var integer|string date_creation
+	 */
 	public $date_creation;
 
-
 	public $tms;
-	//public $fk_user_creat;
-	//public $fk_user_modif;
+	public $private;
 	public $signature;
 	public $position;
 	public $active;
 	// END MODULEBUILDER PROPERTIES
 
 
-
-	// If this object has a subtable with lines
-
-	/**
-	 * @var int    Name of subtable line
-	 */
-	//public $table_element_line = 'emailsenderprofiledet';
-	/**
-	 * @var int    Field with ID of parent key if this field has a parent
-	 */
-	//public $fk_element = 'fk_emailsenderprofile';
-	/**
-	 * @var int    Name of subtable class that manage subtable lines
-	 */
-	//public $class_element_line = 'EmailSenderProfileline';
-	/**
-	 * @var array	List of child tables. To test if we can delete object.
-	 */
-	//protected $childtables=array();
-	/**
-	 * @var EmailSenderProfileLine[]     Array of subtable lines
-	 */
-	//public $lines = array();
-
-
-
 	/**
 	 * Constructor
 	 *
@@ -306,9 +278,9 @@ class EmailSenderProfile extends CommonObject
 		$result = '';
 		$companylink = '';
 
-        $label = $this->label;
+		$label = $this->label;
 
-        $url = '';
+		$url = '';
 		//$url = dol_buildpath('/monmodule/emailsenderprofile_card.php',1).'?id='.$this->id;
 
 		$linkstart = '';
@@ -333,7 +305,7 @@ class EmailSenderProfile extends CommonObject
 		return $this->LibStatut($this->active, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return the status
 	 *
@@ -357,8 +329,8 @@ class EmailSenderProfile extends CommonObject
 		return dolGetStatus($label, $labelshort, '', $statusType, $mode);
 	}
 
-    /**
-     *  Charge les informations d'ordre info dans l'objet commande
+	/**
+	 *  Charge les informations d'ordre info dans l'objet commande
 	 *
 	 *  @param  int     $id       Id of order
 	 *  @return	void
diff --git a/htdocs/core/class/evalmath.class.php b/htdocs/core/class/evalmath.class.php
index 7e02aa57032..c30c37266c1 100644
--- a/htdocs/core/class/evalmath.class.php
+++ b/htdocs/core/class/evalmath.class.php
@@ -149,8 +149,8 @@ class EvalMath
 		$expr = trim($expr);
 		if (substr($expr, - 1, 1) == ';')
 			$expr = substr($expr, 0, strlen($expr) - 1); // strip semicolons at the end
-			                                             // ===============
-			                                             // is it a variable assignment?
+														 // ===============
+														 // is it a variable assignment?
 		$matches = array();
 		if (preg_match('/^\s*([a-z]\w*)\s*=\s*(.+)$/', $expr, $matches)) {
 			if (in_array($matches[1], $this->vb)) { // make sure we're not assigning to a constant
@@ -160,8 +160,8 @@ class EvalMath
 				return false; // get the result and make sure it's good
 			$this->v[$matches[1]] = $tmp; // if so, stick it in the variable array
 			return $this->v[$matches[1]]; // and return the resulting value
-			                              // ===============
-			                              // is it a function assignment?
+										  // ===============
+										  // is it a function assignment?
 		} elseif (preg_match('/^\s*([a-z]\w*)\s*\(\s*([a-z]\w*(?:\s*,\s*[a-z]\w*)*)\s*\)\s*=\s*(.+)$/', $expr, $matches)) {
 			$fnn = $matches[1]; // get the function name
 			if (in_array($matches[1], $this->fb)) { // make sure it isn't built in
@@ -235,7 +235,7 @@ class EvalMath
 		$ops_p = array('+' => 0, '-' => 0, '*' => 1, '/' => 1, '_' => 1, '^' => 2); // operator precedence
 
 		$expecting_op = false; // we use this in syntax-checking the expression
-		                       // and determining when a - is a negation
+							   // and determining when a - is a negation
 
 		$matches = array();
 		if (preg_match("/[^\w\s+*^\/()\.,-]/", $expr, $matches)) { // make sure the characters are all good
@@ -244,7 +244,7 @@ class EvalMath
 
 		while (1) { // 1 Infinite Loop ;)
 			$op = substr($expr, $index, 1); // get the first character at the current index
-			                                // find out if we're currently at the beginning of a number/variable/function/parenthesis/operand
+											// find out if we're currently at the beginning of a number/variable/function/parenthesis/operand
 			$match = array();
 			$ex = preg_match('/^([a-z]\w*\(?|\d+(?:\.\d*)?|\.\d+|\()/', substr($expr, $index), $match);
 			// ===============
@@ -253,7 +253,7 @@ class EvalMath
 				$index++;
 			} elseif ($op == '_') { // we have to explicitly deny this, because it's legal on the stack
 				return $this->trigger(4, "illegal character '_'", "_"); // but not in the input expression
-				                                                        // ===============
+																		// ===============
 			} elseif ((in_array($op, $ops) or $ex) and $expecting_op) { // are we putting an operator on the stack?
 				if ($ex) { // are we expecting an operator but have a number/variable/function/opening parethesis?
 					$op = '*';
@@ -372,7 +372,7 @@ class EvalMath
 		$stack = new EvalMathStack();
 
 		foreach ($tokens as $token) { // nice and easy
-		                              // if the token is a binary operator, pop two values off the stack, do the operation, and push the result back on
+									  // if the token is a binary operator, pop two values off the stack, do the operation, and push the result back on
 			$matches = array();
 			if (in_array($token, array('+', '-', '*', '/', '^'))) {
 				if (is_null($op2 = $stack->pop()))
@@ -412,7 +412,7 @@ class EvalMath
 						$fnn = 'log';
 					eval('$stack->push('.$fnn.'($op1));'); // perfectly safe eval()
 				} elseif (array_key_exists($fnn, $this->f)) { // user function
-				                                              // get args
+															  // get args
 					$args = array();
 					for ($i = count($this->f[$fnn]['args']) - 1; $i >= 0; $i--) {
 						if (is_null($args[$this->f[$fnn]['args'][$i]] = $stack->pop()))
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index bffd23f05d2..16c133f9dab 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -43,10 +43,10 @@ class Events // extends CommonObject
 	 */
 	public $id;
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -58,7 +58,7 @@ class Events // extends CommonObject
 	 */
 	public $tms;
 
-    /**
+	/**
 	 * @var string Type
 	 */
 	public $type;
@@ -94,7 +94,7 @@ class Events // extends CommonObject
 	public $eventstolog = array(
 		array('id'=>'USER_LOGIN', 'test'=>1),
 		array('id'=>'USER_LOGIN_FAILED', 'test'=>1),
-	    array('id'=>'USER_LOGOUT', 'test'=>1),
+		array('id'=>'USER_LOGOUT', 'test'=>1),
 		array('id'=>'USER_CREATE', 'test'=>1),
 		array('id'=>'USER_MODIFY', 'test'=>1),
 		array('id'=>'USER_NEW_PASSWORD', 'test'=>1),
@@ -141,7 +141,7 @@ class Events // extends CommonObject
 
 		// Clean parameters
 		$this->description = trim($this->description);
-		if (empty($this->user_agent) && !empty($_SERVER['HTTP_USER_AGENT'])) $this->user_agent = $_SERVER['HTTP_USER_AGENT'];
+		if (empty($this->user_agent)) $this->user_agent = (empty($_SERVER['HTTP_USER_AGENT']) ? '' : $_SERVER['HTTP_USER_AGENT']);
 
 		// Check parameters
 		if (empty($this->description)) { $this->error = 'ErrorBadValueForParameterCreateEventDesc'; return -1; }
@@ -187,7 +187,7 @@ class Events // extends CommonObject
 	 * @param   int		$notrigger	    0=no, 1=yes (no update trigger)
 	 * @return  int         			<0 if KO, >0 if OK
 	 */
-    public function update($user = null, $notrigger = 0)
+	public function update($user = null, $notrigger = 0)
 	{
 		// Clean parameters
 		$this->id = (int) $this->id;
@@ -222,7 +222,7 @@ class Events // extends CommonObject
 	 *  @param  User	$user       User that load
 	 *  @return int         		<0 if KO, >0 if OK
 	 */
-    public function fetch($id, $user = null)
+	public function fetch($id, $user = null)
 	{
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
@@ -271,7 +271,7 @@ class Events // extends CommonObject
 	 *	@param	User	$user       User that delete
 	 *	@return	int					<0 if KO, >0 if OK
 	 */
-    public function delete($user)
+	public function delete($user)
 	{
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."events";
 		$sql .= " WHERE rowid=".$this->id;
@@ -289,13 +289,13 @@ class Events // extends CommonObject
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
-     */
-    public function initAsSpecimen()
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
+	 */
+	public function initAsSpecimen()
 	{
 		$this->id = 0;
 
@@ -306,5 +306,5 @@ class Events // extends CommonObject
 		$this->ip = '1.2.3.4';
 		$this->user_agent = 'Mozilla specimen User Agent X.Y';
 		$this->prefix_session = dol_getprefix();
-    }
+	}
 }
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index e17bfbc55d4..d041aba45f4 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1702,7 +1702,7 @@ class ExtraFields
 					$c->fetch($obj->rowid);
 					$ways = $c->print_all_ways(); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formatted text
 					foreach ($ways as $way) {
-						$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color ? ' style="background: #'.$c->color.';"' : ' style="background: #aaa"').'>'.img_object('', 'category').' '.$way.'</li>';
+						$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color ? ' style="background: #'.$c->color.';"' : ' style="background: #bbb"').'>'.img_object('', 'category').' '.$way.'</li>';
 					}
 					$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 				}
@@ -1718,7 +1718,7 @@ class ExtraFields
 			if (is_array($value_arr))
 			{
 				foreach ($value_arr as $keyval=>$valueval) {
-					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';
+					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.$param['options'][$valueval].'</li>';
 				}
 			}
 			$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
@@ -1775,9 +1775,9 @@ class ExtraFields
 										$translabel = $langs->trans($obj->$field_toshow);
 									}
 									if ($translabel != $field_toshow) {
-										$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
+										$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.dol_trunc($translabel, 18).'</li>';
 									} else {
-										$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';
+										$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.$obj->$field_toshow.'</li>';
 									}
 								}
 							} else {
@@ -1786,9 +1786,9 @@ class ExtraFields
 									$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 								}
 								if ($translabel != $obj->{$InfoFieldList[1]}) {
-									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
+									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.dol_trunc($translabel, 18).'</li>';
 								} else {
-									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';
+									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.$obj->{$InfoFieldList[1]}.'</li>';
 								}
 							}
 						}
@@ -1803,7 +1803,7 @@ class ExtraFields
 							$c->fetch($obj->rowid);
 							$ways = $c->print_all_ways(); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formatted text
 							foreach ($ways as $way) {
-								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color ? ' style="background: #'.$c->color.';"' : ' style="background: #aaa"').'>'.img_object('', 'category').' '.$way.'</li>';
+								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color ? ' style="background: #'.$c->color.';"' : ' style="background: #bbb"').'>'.img_object('', 'category').' '.$way.'</li>';
 							}
 						}
 					}
@@ -1937,10 +1937,10 @@ class ExtraFields
 					$out .= '<script type="text/javascript">';
 					$out .= 'jQuery(document).ready(function(){';
 					if ($collapse_display === false) {
-						$out .= '   jQuery("#trextrafieldseparator'.$key.' td").prepend("<span class=\"cursorpointer fa fa-plus-square\"></span>&nbsp;");'."\n";
+						$out .= '   jQuery("#trextrafieldseparator'.$key.' td").prepend("<span class=\"cursorpointer far fa-plus-square\"></span>&nbsp;");'."\n";
 						$out .= '   jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").hide();'."\n";
 					} else {
-						$out .= '   jQuery("#trextrafieldseparator'.$key.' td").prepend("<span class=\"cursorpointer fa fa-minus-square\"></span>&nbsp;");'."\n";
+						$out .= '   jQuery("#trextrafieldseparator'.$key.' td").prepend("<span class=\"cursorpointer far fa-minus-square\"></span>&nbsp;");'."\n";
 						$out .= '   document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=1; path='.$_SERVER["PHP_SELF"].'"'."\n";
 					}
 					$out .= '   jQuery("#trextrafieldseparator'.$key.'").click(function(){'."\n";
@@ -2038,7 +2038,7 @@ class ExtraFields
 					$value_arr = GETPOST("options_".$key, 'alpha');
 					$value_key = price2num($value_arr);
 				} elseif (in_array($key_type, array('html'))) {
-					$value_key = GETPOST("options_".$key, 'alpha');
+					$value_key = GETPOST("options_".$key, 'restricthtml');
 				} elseif (in_array($key_type, array('text'))) {
 					$value_key = GETPOST("options_".$key, 'alphanohtml');
 				} else {
diff --git a/htdocs/core/class/extralanguages.class.php b/htdocs/core/class/extralanguages.class.php
index a57fa20f510..34c2e34dc82 100644
--- a/htdocs/core/class/extralanguages.class.php
+++ b/htdocs/core/class/extralanguages.class.php
@@ -28,13 +28,13 @@
 class ExtraLanguages
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
-     * @var array New array to store extralanguages definition
-     */
+	 * @var array New array to store extralanguages definition
+	 */
 	public $attributes;
 
 	/**
@@ -47,7 +47,7 @@ class ExtraLanguages
 	 */
 	public $errors = array();
 
-    /**
+	/**
 	 * @var string DB Error number
 	 */
 	public $errno;
@@ -57,7 +57,7 @@ class ExtraLanguages
 	 *	Constructor
 	 *
 	 *  @param		DoliDB		$db      Database handler
-	*/
+	 */
 	public function __construct($db)
 	{
 		$this->db = $db;
@@ -67,7 +67,7 @@ class ExtraLanguages
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Load array this->attributes with list of fields per object that need an alternate translation. The object and field must be managed with
 	 *  the widgetForTranslation() method.
@@ -80,7 +80,7 @@ class ExtraLanguages
 	 */
 	public function fetch_name_extralanguages($elementtype, $forceload = false)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		if (empty($elementtype)) return array();
diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
index c941a3a0745..b601994536e 100644
--- a/htdocs/core/class/fileupload.class.php
+++ b/htdocs/core/class/fileupload.class.php
@@ -176,16 +176,16 @@ class FileUpload
 				)
 		);
 
-        $hookmanager->executeHooks(
-            'overrideUploadOptions',
-            array(
-                'options' => &$options,
-                'element' => $element
-            ),
-            $object,
-            $action,
-            $hookmanager
-        );
+		$hookmanager->executeHooks(
+			'overrideUploadOptions',
+			array(
+				'options' => &$options,
+				'element' => $element
+			),
+			$object,
+			$action,
+			$hookmanager
+		);
 
 		if ($options) {
 			$this->options = array_replace_recursive($this->options, $options);
@@ -504,26 +504,26 @@ class FileUpload
 			// param_name is an array identifier like "files[]",
 			// $_FILES is a multi-dimensional array:
 			foreach ($upload['tmp_name'] as $index => $value) {
-                $info[] = $this->handleFileUpload(
-                    $upload['tmp_name'][$index],
-                    isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : $upload['name'][$index],
-                    isset($_SERVER['HTTP_X_FILE_SIZE']) ? $_SERVER['HTTP_X_FILE_SIZE'] : $upload['size'][$index],
-                    isset($_SERVER['HTTP_X_FILE_TYPE']) ? $_SERVER['HTTP_X_FILE_TYPE'] : $upload['type'][$index],
-                    $upload['error'][$index],
-                    $index
-                );
+				$info[] = $this->handleFileUpload(
+					$upload['tmp_name'][$index],
+					isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : $upload['name'][$index],
+					isset($_SERVER['HTTP_X_FILE_SIZE']) ? $_SERVER['HTTP_X_FILE_SIZE'] : $upload['size'][$index],
+					isset($_SERVER['HTTP_X_FILE_TYPE']) ? $_SERVER['HTTP_X_FILE_TYPE'] : $upload['type'][$index],
+					$upload['error'][$index],
+					$index
+				);
 			}
 		} elseif ($upload || isset($_SERVER['HTTP_X_FILE_NAME'])) {
 			// param_name is a single object identifier like "file",
 			// $_FILES is a one-dimensional array:
-            $info[] = $this->handleFileUpload(
-                isset($upload['tmp_name']) ? $upload['tmp_name'] : null,
-                isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : (isset($upload['name']) ? $upload['name'] : null),
-                isset($_SERVER['HTTP_X_FILE_SIZE']) ? $_SERVER['HTTP_X_FILE_SIZE'] : (isset($upload['size']) ? $upload['size'] : null),
-                isset($_SERVER['HTTP_X_FILE_TYPE']) ? $_SERVER['HTTP_X_FILE_TYPE'] : (isset($upload['type']) ? $upload['type'] : null),
-                isset($upload['error']) ? $upload['error'] : null,
-                0
-            );
+			$info[] = $this->handleFileUpload(
+				isset($upload['tmp_name']) ? $upload['tmp_name'] : null,
+				isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : (isset($upload['name']) ? $upload['name'] : null),
+				isset($_SERVER['HTTP_X_FILE_SIZE']) ? $_SERVER['HTTP_X_FILE_SIZE'] : (isset($upload['size']) ? $upload['size'] : null),
+				isset($_SERVER['HTTP_X_FILE_TYPE']) ? $_SERVER['HTTP_X_FILE_TYPE'] : (isset($upload['type']) ? $upload['type'] : null),
+				isset($upload['error']) ? $upload['error'] : null,
+				0
+			);
 		}
 		header('Vary: Accept');
 		$json = json_encode($info);
diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index c0216f16a19..ebbdb2c3274 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -35,6 +35,9 @@ class Fiscalyear extends CommonObject
 	 */
 	public $element = 'fiscalyear';
 
+	/**
+	 * @var string picto
+	 */
 	public $picto = 'technic';
 
 	/**
@@ -43,12 +46,12 @@ class Fiscalyear extends CommonObject
 	public $table_element = 'accounting_fiscalyear';
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	public $table_element_line = '';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = '';
 
@@ -69,25 +72,25 @@ class Fiscalyear extends CommonObject
 	public $label;
 
 	/**
-     * Date start (date_start)
-     *
-     * @var integer
-     */
+	 * Date start (date_start)
+	 *
+	 * @var integer
+	 */
 	public $date_start;
 
 	/**
-     * Date end (date_end)
-     *
-     * @var integer
-     */
+	 * Date end (date_end)
+	 *
+	 * @var integer
+	 */
 	public $date_end;
 
 	/**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
 	public $statut; // 0=open, 1=closed
 
@@ -214,11 +217,11 @@ class Fiscalyear extends CommonObject
 	}
 
 	/**
-	* Load an object from database
-	*
-	* @param	int		$id		Id of record to load
-	* @return	int				<0 if KO, >0 if OK
-	*/
+	 * Load an object from database
+	 *
+	 * @param	int		$id		Id of record to load
+	 * @return	int				<0 if KO, >0 if OK
+	 */
 	public function fetch($id)
 	{
 		$sql = "SELECT rowid, label, date_start, date_end, statut";
@@ -245,7 +248,7 @@ class Fiscalyear extends CommonObject
 		}
 	}
 
-    /**
+	/**
 	 *	Delete record
 	 *
 	 *	@param	int		$id		Id of record to delete
diff --git a/htdocs/core/class/genericobject.class.php b/htdocs/core/class/genericobject.class.php
index 25f3dc6af11..e27e45de954 100644
--- a/htdocs/core/class/genericobject.class.php
+++ b/htdocs/core/class/genericobject.class.php
@@ -29,13 +29,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 class GenericObject extends CommonObject
 {
-    /**
-     * Constructor
-     *
-     * @param       DoliDB      $db     Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param       DoliDB      $db     Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 }
diff --git a/htdocs/core/class/google.class.php b/htdocs/core/class/google.class.php
index 117b8e30e02..ee122ff7cb5 100644
--- a/htdocs/core/class/google.class.php
+++ b/htdocs/core/class/google.class.php
@@ -26,63 +26,63 @@
  */
 class GoogleAPI
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
-    public $key;
+	public $key;
 
-    /**
-     * Constructor
-     *
-     * @param 	DoliDB		$db			Database handler
-     * @param	string		$key		Google key
-     */
-    public function __construct($db, $key)
-    {
-        $this->db = $db;
-        $this->key = $key;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param 	DoliDB		$db			Database handler
+	 * @param	string		$key		Google key
+	 */
+	public function __construct($db, $key)
+	{
+		$this->db = $db;
+		$this->key = $key;
+	}
 
 
-    /**
-     *  Return geo coordinates of an address
-     *
-     *  @param	string	$address	Address
-     * 								Example: 68 Grande rue Charles de Gaulle,+94130,+Nogent sur Marne,+France
-     *								Example: 188, rue de Fontenay,+94300,+Vincennes,+France
-     *	@return	string				Coordinates
-     */
-    public function getGeoCoordinatesOfAddress($address)
-    {
-        global $conf;
+	/**
+	 *  Return geo coordinates of an address
+	 *
+	 *  @param	string	$address	Address
+	 * 								Example: 68 Grande rue Charles de Gaulle,+94130,+Nogent sur Marne,+France
+	 *								Example: 188, rue de Fontenay,+94300,+Vincennes,+France
+	 *	@return	string				Coordinates
+	 */
+	public function getGeoCoordinatesOfAddress($address)
+	{
+		global $conf;
 
-        $i = 0;
+		$i = 0;
 
-        // Desired address
-        $urladdress = "https://maps.google.com/maps/geo?q=".urlencode($address)."&output=xml&key=".$this->key;
+		// Desired address
+		$urladdress = "https://maps.google.com/maps/geo?q=".urlencode($address)."&output=xml&key=".$this->key;
 
-        // Retrieve the URL contents
-        $page = file_get_contents($urladdress);
+		// Retrieve the URL contents
+		$page = file_get_contents($urladdress);
 
-        $code = strstr($page, '<coordinates>');
-        $code = strstr($code, '>');
-        $val = strpos($code, "<");
-        $code = substr($code, 1, $val - 1);
-        //print $code;
-        //print "<br>";
-        $latitude = substr($code, 0, strpos($code, ","));
-        $longitude = substr($code, strpos($code, ",") + 1, dol_strlen(strpos($code, ",")) - 3);
+		$code = strstr($page, '<coordinates>');
+		$code = strstr($code, '>');
+		$val = strpos($code, "<");
+		$code = substr($code, 1, $val - 1);
+		//print $code;
+		//print "<br>";
+		$latitude = substr($code, 0, strpos($code, ","));
+		$longitude = substr($code, strpos($code, ",") + 1, dol_strlen(strpos($code, ",")) - 3);
 
-        // Output the coordinates
-        //echo "Longitude: $longitude ',' Latitude: $latitude";
+		// Output the coordinates
+		//echo "Longitude: $longitude ',' Latitude: $latitude";
 
-        $i++;
-    }
+		$i++;
+	}
 }
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index c1d11c9290b..89b5a79df4b 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -30,9 +30,9 @@
 class HookManager
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -44,18 +44,18 @@ class HookManager
 	 */
 	public $errors = array();
 
-    // Context hookmanager was created for ('thirdpartycard', 'thirdpartydao', ...)
-    public $contextarray = array();
+	// Context hookmanager was created for ('thirdpartycard', 'thirdpartydao', ...)
+	public $contextarray = array();
 
 	// Array with instantiated classes
-    public $hooks = array();
+	public $hooks = array();
 
 	// Array result
-    public $resArray = array();
+	public $resArray = array();
 	// Printable result
-    public $resPrint = '';
+	public $resPrint = '';
 	// Nb of qualified hook ran
-    public $resNbOfHooks = 0;
+	public $resNbOfHooks = 0;
 
 	/**
 	 * Constructor
@@ -84,9 +84,9 @@ class HookManager
 		global $conf;
 
 		// Test if there is hooks to manage
-        if (!is_array($conf->modules_parts['hooks']) || empty($conf->modules_parts['hooks'])) return;
+		if (!is_array($conf->modules_parts['hooks']) || empty($conf->modules_parts['hooks'])) return;
 
-        // For backward compatibility
+		// For backward compatibility
 		if (!is_array($arraycontext)) $arraycontext = array($arraycontext);
 
 		$this->contextarray = array_unique(array_merge($arraycontext, $this->contextarray)); // All contexts are concatenated
@@ -105,7 +105,7 @@ class HookManager
 				if (in_array($context, $arrayhooks) || in_array('all', $arrayhooks))    // We instantiate action class only if initialized hook is handled by module
 				{
 					// Include actions class overwriting hooks
-					if (!is_object($this->hooks[$context][$module]))	// If set, class was already loaded
+					if (empty($this->hooks[$context][$module]) || !is_object($this->hooks[$context][$module]))	// If set to an object value, class was already loaded
 					{
 						$path = '/'.$module.'/class/';
 						$actionfile = 'actions_'.$module.'.class.php';
@@ -130,28 +130,29 @@ class HookManager
 		return 1;
 	}
 
-    /**
-     *  Execute hooks (if they were initialized) for the given method
-     *
-     *  @param		string	$method			Name of method hooked ('doActions', 'printSearchForm', 'showInputField', ...)
-     *  @param		array	$parameters		Array of parameters
-     *  @param		Object	$object			Object to use hooks on
-     *  @param		string	$action			Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...)
-     *  @return		mixed					For 'addreplace' hooks (doActions,formObjectOptions,pdf_xxx,...):  					Return 0 if we want to keep standard actions, >0 if we want to stop/replace standard actions, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.
-     *                                      For 'output' hooks (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...):	Return 0, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.
-     *                                      All types can also return some values into an array ->results that will be finaly merged into this->resArray for caller.
-     *                                      $this->error or this->errors are also defined by class called by this function if error.
-     */
+	/**
+	 *  Execute hooks (if they were initialized) for the given method
+	 *
+	 *  @param		string	$method			Name of method hooked ('doActions', 'printSearchForm', 'showInputField', ...)
+	 *  @param		array	$parameters		Array of parameters
+	 *  @param		Object	$object			Object to use hooks on
+	 *  @param		string	$action			Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...)
+	 *  @return		mixed					For 'addreplace' hooks (doActions, formConfirm, formObjectOptions, pdf_xxx,...): 	Return 0 if we want to keep standard actions, >0 if we want to stop/replace standard actions, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.
+	 *                                      For 'output' hooks (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...):	Return 0, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.
+	 *                                      All types can also return some values into an array ->results that will be finaly merged into this->resArray for caller.
+	 *                                      $this->error or this->errors are also defined by class called by this function if error.
+	 */
 	public function executeHooks($method, $parameters = array(), &$object = '', &$action = '')
 	{
-        if (!is_array($this->hooks) || empty($this->hooks)) return 0;	// No hook available, do nothing.
+		if (!is_array($this->hooks) || empty($this->hooks)) return 0; // No hook available, do nothing.
 
-        $parameters['context'] = join(':', $this->contextarray);
-        //dol_syslog(get_class($this).'::executeHooks method='.$method." action=".$action." context=".$parameters['context']);
+		$parameters['context'] = join(':', $this->contextarray);
+		//dol_syslog(get_class($this).'::executeHooks method='.$method." action=".$action." context=".$parameters['context']);
 
-        // Define type of hook ('output' or 'addreplace'). Type 'returnvalue' is deprecated because a 'addreplace' hook can also return resPrint and resArray).
-        $hooktype = 'output';
-        if (in_array(
+		// Define type of hook ('output' or 'addreplace').
+		// TODO Remove hooks with type 'output'. All hooks must be converted into 'addreplace' hooks.
+		$hooktype = 'output';
+		if (in_array(
 			$method,
 			array(
 				'addCalendarChoice',
@@ -166,37 +167,39 @@ class HookManager
 				'doActions',
 				'doMassActions',
 				'formatEvent',
+				'formConfirm',
 				'formCreateThirdpartyOptions',
 				'formObjectOptions',
 				'formattachOptions',
 				'formBuilddocLineOptions',
 				'formatNotificationMessage',
+				'formConfirm',
 				'getAccessForbiddenMessage',
 				'getDirList',
 				'getFormMail',
 				'getFormatedCustomerRef',
-			    'getFormatedSupplierRef',
+				'getFormatedSupplierRef',
 				'getIdProfUrl',
 				'getInputIdProf',
 				'moveUploadedFile',
 				'moreHtmlStatus',
 				'pdf_build_address',
 				'pdf_writelinedesc',
-			    'pdf_getlinenum',
-			    'pdf_getlineref',
-			    'pdf_getlineref_supplier',
-			    'pdf_getlinevatrate',
-			    'pdf_getlineupexcltax',
-			    'pdf_getlineupwithtax',
-			    'pdf_getlineqty',
-			    'pdf_getlineqty_asked',
-			    'pdf_getlineqty_shipped',
-			    'pdf_getlineqty_keeptoship',
-			    'pdf_getlineunit',
-			    'pdf_getlineremisepercent',
-			    'pdf_getlineprogress',
-			    'pdf_getlinetotalexcltax',
-			    'pdf_getlinetotalwithtax',
+				'pdf_getlinenum',
+				'pdf_getlineref',
+				'pdf_getlineref_supplier',
+				'pdf_getlinevatrate',
+				'pdf_getlineupexcltax',
+				'pdf_getlineupwithtax',
+				'pdf_getlineqty',
+				'pdf_getlineqty_asked',
+				'pdf_getlineqty_shipped',
+				'pdf_getlineqty_keeptoship',
+				'pdf_getlineunit',
+				'pdf_getlineremisepercent',
+				'pdf_getlineprogress',
+				'pdf_getlinetotalexcltax',
+				'pdf_getlinetotalwithtax',
 				'paymentsupplierinvoices',
 				'printAddress',
 				'printEmail',
@@ -211,93 +214,88 @@ class HookManager
 				'showLinkToObjectBlock',
 				'setContentSecurityPolicy',
 				'setHtmlTitle',
-                'completeTabsHead'
+				'completeTabsHead'
 				)
 			)) $hooktype = 'addreplace';
 
-        if ($method == 'insertExtraFields') {
-            $hooktype = 'returnvalue'; // @deprecated. TODO Remove all code with "executeHooks('insertExtraFields'" as soon as there is a trigger available.
-            dol_syslog("Warning: The hook 'insertExtraFields' is deprecated and must not be used. Use instead trigger on CRUD event (ask it to dev team if not implemented)", LOG_WARNING);
-        }
+		// Init return properties
+		$this->resPrint = ''; $this->resArray = array(); $this->resNbOfHooks = 0;
 
-        // Init return properties
-        $this->resPrint = ''; $this->resArray = array(); $this->resNbOfHooks = 0;
+		// Loop on each hook to qualify modules that have declared context
+		$modulealreadyexecuted = array();
+		$resaction = 0; $error = 0;
+		foreach ($this->hooks as $context => $modules)    // $this->hooks is an array with context as key and value is an array of modules that handle this context
+		{
+			if (!empty($modules))
+			{
+				foreach ($modules as $module => $actionclassinstance)
+				{
+					//print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction."<br>\n";
 
-        // Loop on each hook to qualify modules that have declared context
-        $modulealreadyexecuted = array();
-        $resaction = 0; $error = 0;
-        foreach ($this->hooks as $context => $modules)    // $this->hooks is an array with context as key and value is an array of modules that handle this context
-        {
-            if (!empty($modules))
-            {
-                foreach ($modules as $module => $actionclassinstance)
-                {
-                	//print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction."<br>\n";
+					// test to avoid running twice a hook, when a module implements several active contexts
+					if (in_array($module, $modulealreadyexecuted)) continue;
 
-                    // test to avoid running twice a hook, when a module implements several active contexts
-                    if (in_array($module, $modulealreadyexecuted)) continue;
+					// jump to next module/class if method does not exist
+					if (!method_exists($actionclassinstance, $method)) continue;
 
-                	// jump to next module/class if method does not exist
-                    if (!method_exists($actionclassinstance, $method)) continue;
+					$this->resNbOfHooks++;
 
-                    $this->resNbOfHooks++;
+					$modulealreadyexecuted[$module] = $module; // Use the $currentcontext in method to avoid running twice
 
-                    $modulealreadyexecuted[$module] = $module; // Use the $currentcontext in method to avoid running twice
+					// Clean class (an error may have been set from a previous call of another method for same module/hook)
+					$actionclassinstance->error = 0;
+					$actionclassinstance->errors = array();
 
-                    // Clean class (an error may have been set from a previous call of another method for same module/hook)
-                    $actionclassinstance->error = 0;
-                    $actionclassinstance->errors = array();
+					dol_syslog(get_class($this)."::executeHooks Qualified hook found (hooktype=".$hooktype."). We call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", action=".$action." context=".$context, LOG_DEBUG);
 
-                    dol_syslog(get_class($this)."::executeHooks Qualified hook found (hooktype=".$hooktype."). We call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", action=".$action." context=".$context, LOG_DEBUG);
+					// Add current context to avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return;
+					$parameters['currentcontext'] = $context;
+					// Hooks that must return int (hooks with type 'addreplace')
+					if ($hooktype == 'addreplace')
+					{
+						$resaction += $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
+						if ($resaction < 0 || !empty($actionclassinstance->error) || (!empty($actionclassinstance->errors) && count($actionclassinstance->errors) > 0))
+						{
+							$error++;
+							$this->error = $actionclassinstance->error; $this->errors = array_merge($this->errors, (array) $actionclassinstance->errors);
+							dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error) ? '' : " ".$this->error).(empty($this->errors) ? '' : " ".join(",", $this->errors)), LOG_ERR);
+						}
 
-                    // Add current context to avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return;
-                    $parameters['currentcontext'] = $context;
-                    // Hooks that must return int (hooks with type 'addreplace')
-                    if ($hooktype == 'addreplace')
-                    {
-                    	$resaction += $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
-                    	if ($resaction < 0 || !empty($actionclassinstance->error) || (!empty($actionclassinstance->errors) && count($actionclassinstance->errors) > 0))
-                    	{
-                    		$error++;
-                    		$this->error = $actionclassinstance->error; $this->errors = array_merge($this->errors, (array) $actionclassinstance->errors);
-                    		dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error) ? '' : " ".$this->error).(empty($this->errors) ? '' : " ".join(",", $this->errors)), LOG_ERR);
-                    	}
+						if (isset($actionclassinstance->results) && is_array($actionclassinstance->results))  $this->resArray = array_merge($this->resArray, $actionclassinstance->results);
+						if (!empty($actionclassinstance->resprints)) $this->resPrint .= $actionclassinstance->resprints;
+					}
+					// Generic hooks that return a string or array (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)
+					else {
+						// TODO. this test should be done into the method of hook by returning nothing
+						if (is_array($parameters) && !empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue;
 
-                    	if (isset($actionclassinstance->results) && is_array($actionclassinstance->results))  $this->resArray = array_merge($this->resArray, $actionclassinstance->results);
-                    	if (!empty($actionclassinstance->resprints)) $this->resPrint .= $actionclassinstance->resprints;
-                    }
-                    // Generic hooks that return a string or array (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)
-                    else {
-                    	// TODO. this test should be done into the method of hook by returning nothing
-                    	if (is_array($parameters) && !empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue;
+						//dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);
+						$resaction = $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
 
-                    	//dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);
-                    	$resaction = $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
+						if (!empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray = array_merge($this->resArray, $actionclassinstance->results);
+						if (!empty($actionclassinstance->resprints)) $this->resPrint .= $actionclassinstance->resprints;
+						if (is_numeric($resaction) && $resaction < 0)
+						{
+							$error++;
+							$this->error = $actionclassinstance->error; $this->errors = array_merge($this->errors, (array) $actionclassinstance->errors);
+							dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error) ? '' : " ".$this->error).(empty($this->errors) ? '' : " ".join(",", $this->errors)), LOG_ERR);
+						}
+						// TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string but an int. you must use $actionclassinstance->resprints to return a string
+						if (!is_array($resaction) && !is_numeric($resaction))
+						{
+							dol_syslog('Error: Bug into hook '.$method.' of module class '.get_class($actionclassinstance).'. Method must not return a string but an int (0=OK, 1=Replace, -1=KO) and set string into ->resprints', LOG_ERR);
+							if (empty($actionclassinstance->resprints)) { $this->resPrint .= $resaction; $resaction = 0; }
+						}
+					}
 
-                    	if (!empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray = array_merge($this->resArray, $actionclassinstance->results);
-                    	if (!empty($actionclassinstance->resprints)) $this->resPrint .= $actionclassinstance->resprints;
-                    	if (is_numeric($resaction) && $resaction < 0)
-                    	{
-                    	    $error++;
-                    	    $this->error = $actionclassinstance->error; $this->errors = array_merge($this->errors, (array) $actionclassinstance->errors);
-                    	    dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error) ? '' : " ".$this->error).(empty($this->errors) ? '' : " ".join(",", $this->errors)), LOG_ERR);
-                    	}
-                    	// TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string but an int. you must use $actionclassinstance->resprints to return a string
-                    	if (!is_array($resaction) && !is_numeric($resaction))
-                    	{
-                    		dol_syslog('Error: Bug into hook '.$method.' of module class '.get_class($actionclassinstance).'. Method must not return a string but an int (0=OK, 1=Replace, -1=KO) and set string into ->resprints', LOG_ERR);
-                    		if (empty($actionclassinstance->resprints)) { $this->resPrint .= $resaction; $resaction = 0; }
-                    	}
-                    }
+					//print "After hook  ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction."<br>\n";
 
-                    //print "After hook  ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction."<br>\n";
+					unset($actionclassinstance->results);
+					unset($actionclassinstance->resprints);
+				}
+			}
+		}
 
-                    unset($actionclassinstance->results);
-                    unset($actionclassinstance->resprints);
-                }
-            }
-        }
-
-        return ($error ? -1 : $resaction);
+		return ($error ? -1 : $resaction);
 	}
 }
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 0a186c02d92..fdcdc89e53e 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -71,6 +71,7 @@ class Form
 	// Cache arrays
 	public $cache_types_paiements = array();
 	public $cache_conditions_paiements = array();
+	public $cache_transport_mode = array();
 	public $cache_availability = array();
 	public $cache_demand_reason = array();
 	public $cache_types_fees = array();
@@ -187,7 +188,8 @@ class Form
 		{
 			$ret .= $this->editInPlace($object, $value, $htmlname, $perm, $typeofdata, $editvalue, $extObject, $custommsg);
 		} else {
-			if (GETPOST('action', 'aZ09') == 'edit'.$htmlname)
+			$editmode = (GETPOST('action', 'aZ09') == 'edit'.$htmlname);
+			if ($editmode)
 			{
 				$ret .= "\n";
 				$ret .= '<form method="post" action="'.$_SERVER["PHP_SELF"].($moreparam ? '?'.$moreparam : '').'">';
@@ -253,7 +255,7 @@ class Form
 				//else $ret.='<div class="clearboth"></div>';
 				$ret .= '<input type="submit" class="button'.(empty($notabletag) ? '' : ' ').'" name="modify" value="'.$langs->trans("Modify").'">';
 				if (preg_match('/ckeditor|textarea/', $typeofdata) && empty($notabletag)) $ret .= '<br>'."\n";
-				$ret .= '<input type="submit" class="button'.(empty($notabletag) ? '' : ' ').'" name="cancel" value="'.$langs->trans("Cancel").'">';
+				$ret .= '<input type="submit" class="button button-cancel'.(empty($notabletag) ? '' : ' ').'" name="cancel" value="'.$langs->trans("Cancel").'">';
 				if (empty($notabletag)) $ret .= '</td>';
 
 				if (empty($notabletag)) $ret .= '</tr></table>'."\n";
@@ -263,8 +265,9 @@ class Form
 				elseif (preg_match('/^(amount|numeric)/', $typeofdata)) $ret .= ($value != '' ? price($value, '', $langs, 0, -1, -1, $conf->currency) : '');
 				elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata))  $ret .= dol_htmlentitiesbr($value);
 				elseif (preg_match('/^safehtmlstring/', $typeofdata)) $ret .= dol_string_onlythesehtmltags($value);
-				elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') $ret .= dol_print_date($value, 'day');
-				elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') $ret .= dol_print_date($value, 'dayhour');
+				elseif (preg_match('/^restricthtml/', $typeofdata)) $ret .= dol_string_onlythesehtmltags($value);
+				elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') $ret .= '<span class="valuedate">'.dol_print_date($value, 'day').'</span>';
+				elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') $ret .= '<span class="valuedate">'.dol_print_date($value, 'dayhour').'</span>';
 				elseif (preg_match('/^select;/', $typeofdata))
 				{
 					$arraydata = explode(',', preg_replace('/^select;/', '', $typeofdata));
@@ -507,7 +510,6 @@ class Form
 	 *  @param	int			$forcenowrap		Force no wrap between text and picto (works with notabs=2 only)
 	 *	@return	string							Code html du tooltip (texte+picto)
 	 *	@see	textwithpicto() Use thisfunction if you can.
-	 *  TODO Move this as static as soon as everybody use textwithpicto or @Form::textwithtooltip
 	 */
 	public function textwithtooltip($text, $htmltext, $tooltipon = 1, $direction = 0, $img = '', $extracss = '', $notabs = 3, $incbefore = '', $noencodehtmltext = 0, $tooltiptrigger = '', $forcenowrap = 0)
 	{
@@ -634,11 +636,11 @@ class Form
 	 * Generate select HTML to choose massaction
 	 *
 	 * @param	string	$selected		Value auto selected when at least one record is selected. Not a preselected value. Use '0' by default.
-	 * @param	array		$arrayofaction	array('code'=>'label', ...). The code is the key stored into the GETPOST('massaction') when submitting action.
+	 * @param	array	$arrayofaction	array('code'=>'label', ...). The code is the key stored into the GETPOST('massaction') when submitting action.
 	 * @param   int     $alwaysvisible  1=select button always visible
-	 * @param       string  $name     Name for massaction
-	 * @param       string  $cssclass CSS class used to check for select
-	 * @return	string|void					Select list
+	 * @param   string  $name     		Name for massaction
+	 * @param   string  $cssclass 		CSS class used to check for select
+	 * @return	string|void				Select list
 	 */
 	public function selectMassAction($selected, $arrayofaction, $alwaysvisible = 0, $name = 'massaction', $cssclass = 'checkforselect')
 	{
@@ -778,8 +780,6 @@ class Form
 			$i = 0;
 			if ($num)
 			{
-				$foundselected = false;
-
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
@@ -809,7 +809,7 @@ class Form
 					$out .= '<option value="special_eec"'.($selected == 'special_eec' ? ' selected' : '').'>'.$langs->trans("CountriesInEEC").'</option>';
 					if ($mysoc->isInEEC()) $out .= '<option value="special_eecnotme"'.($selected == 'special_eecnotme' ? ' selected' : '').'>'.$langs->trans("CountriesInEECExceptMe", $langs->transnoentitiesnoconv("Country".$mysoc->country_code)).'</option>';
 					$out .= '<option value="special_noteec"'.($selected == 'special_noteec' ? ' selected' : '').'>'.$langs->trans("CountriesNotInEEC").'</option>';
-					$out .= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';
+					$out .= '<option value="" disabled class="selectoptiondisabledwhite">------------</option>';
 				}
 
 				foreach ($countryArray as $row)
@@ -822,18 +822,24 @@ class Form
 					if (empty($row['favorite']) && $atleastonefavorite)
 					{
 						$atleastonefavorite = 0;
-						$out .= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';
+						$out .= '<option value="" disabled class="selectoptiondisabledwhite">------------</option>';
 					}
-					if ($selected && $selected != '-1' && ($selected == $row['rowid'] || $selected == $row['code_iso'] || $selected == $row['code_iso3'] || $selected == $row['label']))
-					{
-						$foundselected = true;
-						$out .= '<option value="'.($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']).'" selected>';
+
+					$labeltoshow = '';
+					if ($row['label']) $labeltoshow .= dol_trunc($row['label'], $maxlength, 'middle');
+					else $labeltoshow .= '&nbsp;';
+					if ($row['code_iso']) {
+						$labeltoshow .= ' <span class="opacitymedium">('.$row['code_iso'].')</span>';
+						$tmpflag = picto_from_langcode($row['code_iso'], 'class="saturatemedium marginrightonly"');
+						$labeltoshow = $tmpflag.' '.$labeltoshow;
+					}
+
+					if ($selected && $selected != '-1' && ($selected == $row['rowid'] || $selected == $row['code_iso'] || $selected == $row['code_iso3'] || $selected == $row['label'])) {
+						$out .= '<option value="'.($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']).'" selected data-html="'.dol_escape_htmltag($labeltoshow).'">';
 					} else {
-						$out .= '<option value="'.($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']).'">';
+						$out .= '<option value="'.($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']).'" data-html="'.dol_escape_htmltag($labeltoshow).'">';
 					}
-					if ($row['label']) $out .= dol_trunc($row['label'], $maxlength, 'middle');
-					else $out .= '&nbsp;';
-					if ($row['code_iso']) $out .= ' ('.$row['code_iso'].')';
+					$out .= $labeltoshow;
 					$out .= '</option>';
 				}
 			}
@@ -1083,25 +1089,6 @@ class Form
 	}
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Return HTML code to select a company.
-	 *
-	 *  @param		int			$selected				Preselected products
-	 *  @param		string		$htmlname				Name of HTML select field (must be unique in page)
-	 *  @param		int			$filter					Filter on thirdparty
-	 *  @param		int			$limit					Limit on number of returned lines
-	 *  @param		array		$ajaxoptions			Options for ajax_autocompleter
-	 * 	@param		int			$forcecombo				Force to load all values and output a standard combobox (with no beautification)
-	 *  @return		string								Return select box for thirdparty.
-	 *  @deprecated	3.8 Use select_company instead. For exemple $form->select_thirdparty(GETPOST('socid'),'socid','',0) => $form->select_company(GETPOST('socid'),'socid','',1,0,0,array(),0)
-	 */
-	public function select_thirdparty($selected = '', $htmlname = 'socid', $filter = '', $limit = 20, $ajaxoptions = array(), $forcecombo = 0)
-	{
-		// phpcs:enable
-		return $this->select_thirdparty_list($selected, $htmlname, $filter, 1, 0, $forcecombo, array(), '', 0, $limit);
-	}
-
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Output html form to select a third party
@@ -1203,19 +1190,17 @@ class Form
 			}
 		}
 
-		// On recherche les societes
+		// We search companies
 		$sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.client, s.fournisseur, s.code_client, s.code_fournisseur";
-
-		if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {
+		if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
 			$sql .= ", s.address, s.zip, s.town";
 			$sql .= ", dictp.code as country_code";
 		}
-
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {
-			$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."c_country as dictp ON dictp.rowid=s.fk_pays";
+		if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as dictp ON dictp.rowid = s.fk_pays";
 		}
+		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql .= " WHERE s.entity IN (".getEntity('societe').")";
 		if (!empty($user->socid)) $sql .= " AND s.rowid = ".$user->socid;
 		if ($filter) $sql .= " AND (".$filter.")";
@@ -1268,7 +1253,7 @@ class Form
 				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
 				else $textifempty .= $langs->trans("All");
 			}
-			if ($showempty) $out .= '<option value="-1">'.$textifempty.'</option>'."\n";
+			if ($showempty) $out .= '<option value="-1" data-html="'.dol_escape_htmltag('<span class="opacitymedium">'.$textifempty.'</span>').'">'.$textifempty.'</option>'."\n";
 
 			$num = $this->db->num_rows($resql);
 			$i = 0;
@@ -1303,10 +1288,10 @@ class Form
 						if ($obj->client || $obj->fournisseur) $label .= ')';
 					}
 
-					if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {
-						$label .= '-'.$obj->address.'-'.$obj->zip.' '.$obj->town;
+					if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
+						$label .= ($obj->address ? ' - '.$obj->address : '').($obj->zip ? ' - '.$obj->zip : '').($obj->town ? ' '.$obj->town : '');
 						if (!empty($obj->country_code)) {
-							$label .= ' '.$langs->trans('Country'.$obj->country_code);
+							$label .= ', '.$langs->trans('Country'.$obj->country_code);
 						}
 					}
 
@@ -1432,7 +1417,7 @@ class Form
 	 *  @param	string	$moreparam		Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container
 	 *  @param	string	$htmlid			Html id to use instead of htmlname
 	 *  @return	int						<0 if KO, Nb of contact in list if OK
-	 *  @deprected						You can use selectcontacts directly (warning order of param was changed)
+	 *  @deprecated						You can use selectcontacts directly (warning order of param was changed)
 	 */
 	public function select_contacts($socid, $selected = '', $htmlname = 'contactid', $showempty = 0, $exclude = '', $limitto = '', $showfunction = 0, $moreclass = '', $showsoc = 0, $forcecombo = 0, $events = array(), $options_only = false, $moreparam = '', $htmlid = '')
 	{
@@ -1462,15 +1447,17 @@ class Form
 	 *  @param	string		$moreparam		Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container
 	 *  @param	string		$htmlid			Html id to use instead of htmlname
 	 *  @param	bool		$multiple		add [] in the name of element and add 'multiple' attribut
+	 *  @param	integer		$disableifempty Set tag 'disabled' on select if there is no choice
 	 *	@return	 int						<0 if KO, Nb of contact in list if OK
 	 */
-	public function selectcontacts($socid, $selected = '', $htmlname = 'contactid', $showempty = 0, $exclude = '', $limitto = '', $showfunction = 0, $moreclass = '', $options_only = false, $showsoc = 0, $forcecombo = 0, $events = array(), $moreparam = '', $htmlid = '', $multiple = false)
+	public function selectcontacts($socid, $selected = '', $htmlname = 'contactid', $showempty = 0, $exclude = '', $limitto = '', $showfunction = 0, $moreclass = '', $options_only = false, $showsoc = 0, $forcecombo = 0, $events = array(), $moreparam = '', $htmlid = '', $multiple = false, $disableifempty = 0)
 	{
 		global $conf, $langs, $hookmanager, $action;
 
 		$langs->load('companies');
 
 		if (empty($htmlid)) $htmlid = $htmlname;
+		$num = 0;
 
 		if ($selected === '') $selected = array();
 		elseif (!is_array($selected)) $selected = array($selected);
@@ -1483,10 +1470,10 @@ class Form
 		}
 
 		// We search third parties
-		$sql = "SELECT sp.rowid, sp.lastname, sp.statut, sp.firstname, sp.poste";
-		if ($showsoc > 0) $sql .= " , s.nom as company";
+		$sql = "SELECT sp.rowid, sp.lastname, sp.statut, sp.firstname, sp.poste, sp.email, sp.phone, sp.phone_perso, sp.phone_mobile, sp.town AS contact_town";
+		if ($showsoc > 0 || !empty($conf->global->CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST)) $sql .= ", s.nom as company, s.town AS company_town";
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
-		if ($showsoc > 0) $sql .= " LEFT OUTER JOIN  ".MAIN_DB_PREFIX."societe as s ON s.rowid=sp.fk_soc";
+		if ($showsoc > 0 || !empty($conf->global->CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST)) $sql .= " LEFT OUTER JOIN  ".MAIN_DB_PREFIX."societe as s ON s.rowid=sp.fk_soc";
 		$sql .= " WHERE sp.entity IN (".getEntity('socpeople').")";
 		if ($socid > 0 || $socid == -1) $sql .= " AND sp.fk_soc=".$socid;
 		if (!empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) $sql .= " AND sp.statut <> 0";
@@ -1504,11 +1491,13 @@ class Form
 				$out .= ajax_combobox($htmlid, $events, $conf->global->CONTACT_USE_SEARCH_TO_SELECT);
 			}
 
-			if ($htmlname != 'none' && !$options_only) $out .= '<select class="flat'.($moreclass ? ' '.$moreclass : '').'" id="'.$htmlid.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.(!empty($moreparam) ? $moreparam : '').'>';
+			if ($htmlname != 'none' && !$options_only) {
+				$out .= '<select class="flat'.($moreclass ? ' '.$moreclass : '').'" id="'.$htmlid.'" name="'.$htmlname.(($num || empty($disableifempty)) ? '' : ' disabled').($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.(!empty($moreparam) ? $moreparam : '').'>';
+			}
+
 			if (($showempty == 1 || ($showempty == 3 && $num > 1)) && !$multiple) $out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>&nbsp;</option>';
 			if ($showempty == 2) $out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>-- '.$langs->trans("Internal").' --</option>';
 
-			$num = $this->db->num_rows($resql);
 			$i = 0;
 			if ($num)
 			{
@@ -1519,6 +1508,28 @@ class Form
 				{
 					$obj = $this->db->fetch_object($resql);
 
+					// Set email (or phones) and town extended infos
+					$extendedInfos = '';
+					if (!empty($conf->global->CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST)) {
+						$extendedInfos = array();
+						$email = trim($obj->email);
+						if (!empty($email)) $extendedInfos[] = $email;
+						else {
+							$phone = trim($obj->phone);
+							$phone_perso = trim($obj->phone_perso);
+							$phone_mobile = trim($obj->phone_mobile);
+							if (!empty($phone)) $extendedInfos[] = $phone;
+							if (!empty($phone_perso)) $extendedInfos[] = $phone_perso;
+							if (!empty($phone_mobile)) $extendedInfos[] = $phone_mobile;
+						}
+						$contact_town = trim($obj->contact_town);
+						$company_town = trim($obj->company_town);
+						if (!empty($contact_town)) $extendedInfos[] = $contact_town;
+						elseif (!empty($company_town)) $extendedInfos[] = $company_town;
+						$extendedInfos = implode(' - ', $extendedInfos);
+						if (!empty($extendedInfos)) $extendedInfos = ' - '.$extendedInfos;
+					}
+
 					$contactstatic->id = $obj->rowid;
 					$contactstatic->lastname = $obj->lastname;
 					$contactstatic->firstname = $obj->firstname;
@@ -1533,7 +1544,7 @@ class Form
 								$out .= '<option value="'.$obj->rowid.'"';
 								if ($disabled) $out .= ' disabled';
 								$out .= ' selected>';
-								$out .= $contactstatic->getFullName($langs);
+								$out .= $contactstatic->getFullName($langs).$extendedInfos;
 								if ($showfunction && $obj->poste) $out .= ' ('.$obj->poste.')';
 								if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';
 								$out .= '</option>';
@@ -1541,7 +1552,7 @@ class Form
 								$out .= '<option value="'.$obj->rowid.'"';
 								if ($disabled) $out .= ' disabled';
 								$out .= '>';
-								$out .= $contactstatic->getFullName($langs);
+								$out .= $contactstatic->getFullName($langs).$extendedInfos;
 								if ($showfunction && $obj->poste) $out .= ' ('.$obj->poste.')';
 								if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';
 								$out .= '</option>';
@@ -1549,7 +1560,7 @@ class Form
 						} else {
 							if (in_array($obj->rowid, $selected))
 							{
-								$out .= $contactstatic->getFullName($langs);
+								$out .= $contactstatic->getFullName($langs).$extendedInfos;
 								if ($showfunction && $obj->poste) $out .= ' ('.$obj->poste.')';
 								if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';
 							}
@@ -1558,8 +1569,9 @@ class Form
 					$i++;
 				}
 			} else {
-				$out .= '<option value="-1"'.(($showempty == 2 || $multiple) ? '' : ' selected').' disabled>';
-				$out .= ($socid != -1) ? ($langs->trans($socid ? "NoContactDefinedForThirdParty" : "NoContactDefined")) : $langs->trans('SelectAThirdPartyFirst');
+				$labeltoshow = ($socid != -1) ? ($langs->trans($socid ? "NoContactDefinedForThirdParty" : "NoContactDefined")) : $langs->trans('SelectAThirdPartyFirst');
+				$out .= '<option class="disabled" value="-1"'.(($showempty == 2 || $multiple) ? '' : ' selected').' disabled="disabled">';
+				$out .= $labeltoshow;
 				$out .= '</option>';
 			}
 
@@ -1665,7 +1677,7 @@ class Form
 		$outarray = array();
 
 		// Forge request to select users
-		$sql = "SELECT DISTINCT u.rowid, u.lastname as lastname, u.firstname, u.statut, u.login, u.admin, u.entity";
+		$sql = "SELECT DISTINCT u.rowid, u.lastname as lastname, u.firstname, u.statut as status, u.login, u.admin, u.entity, u.photo";
 		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity)
 		{
 			$sql .= ", e.label";
@@ -1716,7 +1728,7 @@ class Form
 				$out .= ajax_combobox($htmlname);
 
 				// do not use maxwidthonsmartphone by default. Set it by caller so auto size to 100% will work when not defined
-				$out .= '<select class="flat'.($morecss ? ' minwidth100imp '.$morecss : ' minwidth200').'" id="'.$htmlname.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.($disabled ? ' disabled' : '').'>';
+				$out .= '<select class="flat'.($morecss ? ' '.$morecss : ' minwidth200').'" id="'.$htmlname.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.($disabled ? ' disabled' : '').'>';
 				if ($show_empty && !$multiple) $out .= '<option value="-1"'.((empty($selected) || in_array(-1, $selected)) ? ' selected' : '').'>&nbsp;</option>'."\n";
 				if ($show_every) $out .= '<option value="-2"'.((in_array(-2, $selected)) ? ' selected' : '').'>-- '.$langs->trans("Everybody").' --</option>'."\n";
 
@@ -1729,20 +1741,15 @@ class Form
 					$userstatic->id = $obj->rowid;
 					$userstatic->lastname = $obj->lastname;
 					$userstatic->firstname = $obj->firstname;
+					$userstatic->photo = $obj->photo;
+					$userstatic->statut = $obj->status;
+					$userstatic->entity = $obj->entity;
+					$userstatic->admin = $obj->admin;
 
 					$disableline = '';
 					if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly)) $disableline = ($enableonlytext ? $enableonlytext : '1');
 
-					if ((is_object($selected) && $selected->id == $obj->rowid) || (!is_object($selected) && in_array($obj->rowid, $selected)))
-					{
-						$out .= '<option value="'.$obj->rowid.'"';
-						if ($disableline) $out .= ' disabled';
-						$out .= ' selected>';
-					} else {
-						$out .= '<option value="'.$obj->rowid.'"';
-						if ($disableline) $out .= ' disabled';
-						$out .= '>';
-					}
+					$labeltoshow = '';
 
 					// $fullNameMode is 0=Lastname+Firstname (MAIN_FIRSTNAME_NAME_POSITION=1), 1=Firstname+Lastname (MAIN_FIRSTNAME_NAME_POSITION=0)
 					$fullNameMode = 0;
@@ -1750,7 +1757,8 @@ class Form
 					{
 						$fullNameMode = 1; //Firstname+lastname
 					}
-					$out .= $userstatic->getFullName($langs, $fullNameMode, -1, $maxlength);
+					$labeltoshow .= $userstatic->getFullName($langs, $fullNameMode, -1, $maxlength);
+					if (empty($obj->firstname) && empty($obj->lastname)) $labeltoshow .= $obj->login;
 
 					// Complete name with more info
 					$moreinfo = '';
@@ -1760,11 +1768,11 @@ class Form
 					}
 					if ($showstatus >= 0)
 					{
-						if ($obj->statut == 1 && $showstatus == 1)
+						if ($obj->status == 1 && $showstatus == 1)
 						{
 							$moreinfo .= ($moreinfo ? ' - ' : ' (').$langs->trans('Enabled');
 						}
-						if ($obj->statut == 0)
+						if ($obj->status == 0 && $showstatus == 1)
 						{
 							$moreinfo .= ($moreinfo ? ' - ' : ' (').$langs->trans('Disabled');
 						}
@@ -1783,8 +1791,27 @@ class Form
 					{
 						$moreinfo .= ' - '.$disableline; // This is text from $enableonlytext parameter
 					}
-					$out .= $moreinfo;
+					$labeltoshow .= $moreinfo;
+
+					$out .= '<option value="'.$obj->rowid.'"';
+					if ($disableline) $out .= ' disabled';
+					if ((is_object($selected) && $selected->id == $obj->rowid) || (!is_object($selected) && in_array($obj->rowid, $selected))) {
+						$out .= ' selected';
+					}
+					$out .= ' data-html="';
+					$outhtml = '';
+					if (!empty($obj->photo))
+					{
+						$outhtml .= $userstatic->getNomUrl(-3, '', 0, 1, 24, 1, 'login', '', 1).' ';
+					}
+					if ($showstatus >= 0 && $obj->status == 0) $outhtml .= '<strike class="opacitymediumxxx">';
+					$outhtml .= $labeltoshow;
+					if ($showstatus >= 0 && $obj->status == 0) $outhtml .= '</strike>';
+					$out .= dol_escape_htmltag($outhtml);
+					$out .= '">';
+					$out .= $labeltoshow;
 					$out .= '</option>';
+
 					$outarray[$userstatic->id] = $userstatic->getFullName($langs, $fullNameMode, -1, $maxlength).$moreinfo;
 
 					$i++;
@@ -1863,7 +1890,7 @@ class Form
 				if ($ownerid == $value['id'] && is_array($listofuserid) && count($listofuserid) && in_array($ownerid, array_keys($listofuserid)))
 				{
 					$out .= '<div class="myavailability inline-block">';
-					$out .= '&nbsp;-&nbsp;<span class="opacitymedium">'.$langs->trans("Availability").':</span>  <input id="transparency" class="marginleftonly marginrightonly" '.($action == 'view' ? 'disabled' : '').' type="checkbox" name="transparency"'.($listofuserid[$ownerid]['transparency'] ? ' checked' : '').'>'.$langs->trans("Busy");
+					$out .= '<span class="hideonsmartphone">&nbsp;-&nbsp;<span class="opacitymedium">'.$langs->trans("Availability").':</span>  </span><input id="transparency" class="paddingrightonly" '.($action == 'view' ? 'disabled' : '').' type="checkbox" name="transparency"'.($listofuserid[$ownerid]['transparency'] ? ' checked' : '').'><label for="transparency">'.$langs->trans("Busy").'</label>';
 					$out .= '</div>';
 				}
 			}
@@ -1879,9 +1906,15 @@ class Form
 		if ($action != 'view')
 		{
 			$out .= '<input type="hidden" class="removedassignedhidden" name="removedassigned" value="">';
-			$out .= '<script type="text/javascript" language="javascript">jQuery(document).ready(function () {    jQuery(".removedassigned").click(function() {        jQuery(".removedassignedhidden").val(jQuery(this).val());    });})</script>';
+			$out .= '<script type="text/javascript" language="javascript">jQuery(document).ready(function () {';
+			$out .= 'jQuery(".removedassigned").click(function() { jQuery(".removedassignedhidden").val(jQuery(this).val()); });';
+			$out .= 'jQuery(".assignedtouser").change(function() { console.log(jQuery(".assignedtouser option:selected").val());';
+			$out .= ' if (jQuery(".assignedtouser option:selected").val() > 0) { jQuery("#'.$action.'assignedtouser").attr("disabled", false); }';
+			$out .= ' else { jQuery("#'.$action.'assignedtouser").attr("disabled", true); }';
+			$out .= '});';
+			$out .= '})</script>';
 			$out .= $this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter);
-			$out .= ' <input type="submit" class="button valignmiddle" name="'.$action.'assignedtouser" value="'.dol_escape_htmltag($langs->trans("Add")).'">';
+			$out .= ' <input type="submit" disabled class="button valignmiddle smallpaddingimp" id="'.$action.'assignedtouser" name="'.$action.'assignedtouser" value="'.dol_escape_htmltag($langs->trans("Add")).'">';
 			$out .= '<br>';
 		}
 
@@ -1913,13 +1946,16 @@ class Form
 	 *										            'warehouseclosed' = count products from closed warehouses,
 	 *										            'warehouseinternal' = count products from warehouses for internal correct/transfer only
 	 *  @param 		array 		$selected_combinations 	Selected combinations. Format: array([attrid] => attrval, [...])
-	 *  @return		void
+	 *  @param		string		$nooutput				No print, return the output into a string
+	 *  @return		void|string
 	 */
-	public function select_produits($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 20, $price_level = 0, $status = 1, $finished = 2, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '', $selected_combinations = array())
+	public function select_produits($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 20, $price_level = 0, $status = 1, $finished = 2, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '', $selected_combinations = array(), $nooutput = 0)
 	{
 		// phpcs:enable
 		global $langs, $conf;
 
+		$out = '';
+
 		// check parameters
 		$price_level = (!empty($price_level) ? $price_level : 0);
 		if (is_null($ajaxoptions)) $ajaxoptions = array();
@@ -1959,100 +1995,103 @@ class Form
 			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {
 				$urloption .= '&socid='.$socid;
 			}
-			print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
+			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 1, $ajaxoptions);
 
 			if (!empty($conf->variants->enabled)) {
-				?>
+				$out .= '
 				<script>
 
-					selected = <?php echo json_encode($selected_combinations) ?>;
+					selected = '.json_encode($selected_combinations).';
 					combvalues = {};
 
 					jQuery(document).ready(function () {
 
-						jQuery("input[name='prod_entry_mode']").change(function () {
-							if (jQuery(this).val() == 'free') {
-								jQuery('div#attributes_box').empty();
+						jQuery("input[name=\'prod_entry_mode\']").change(function () {
+							if (jQuery(this).val() == \'free\') {
+								jQuery(\'div#attributes_box\').empty();
 							}
 						});
 
-						jQuery("input#<?php echo $htmlname ?>").change(function () {
+						jQuery("input#'.$htmlname.'").change(function () {
 
 							if (!jQuery(this).val()) {
-								jQuery('div#attributes_box').empty();
+								jQuery(\'div#attributes_box\').empty();
 								return;
 							}
 
-							jQuery.getJSON("<?php echo dol_buildpath('/variants/ajax/getCombinations.php', 2) ?>", {
+							jQuery.getJSON("'.DOL_URL_ROOT.'/variants/ajax/getCombinations.php", {
 								id: jQuery(this).val()
 							}, function (data) {
-								jQuery('div#attributes_box').empty();
+								jQuery(\'div#attributes_box\').empty();
 
 								jQuery.each(data, function (key, val) {
 
 									combvalues[val.id] = val.values;
 
-									var span = jQuery(document.createElement('div')).css({
-										'display': 'table-row'
+									var span = jQuery(document.createElement(\'div\')).css({
+										\'display\': \'table-row\'
 									});
 
 									span.append(
-										jQuery(document.createElement('div')).text(val.label).css({
-											'font-weight': 'bold',
-											'display': 'table-cell',
-											'text-align': 'right'
+										jQuery(document.createElement(\'div\')).text(val.label).css({
+											\'font-weight\': \'bold\',
+											\'display\': \'table-cell\',
+											\'text-align\': \'right\'
 										})
 									);
 
-									var html = jQuery(document.createElement('select')).attr('name', 'combinations[' + val.id + ']').css({
-										'margin-left': '15px',
-										'white-space': 'pre'
+									var html = jQuery(document.createElement(\'select\')).attr(\'name\', \'combinations[\' + val.id + \']\').css({
+										\'margin-left\': \'15px\',
+										\'white-space\': \'pre\'
 									}).append(
-										jQuery(document.createElement('option')).val('')
+										jQuery(document.createElement(\'option\')).val(\'\')
 									);
 
 									jQuery.each(combvalues[val.id], function (key, val) {
-										var tag = jQuery(document.createElement('option')).val(val.id).html(val.value);
+										var tag = jQuery(document.createElement(\'option\')).val(val.id).html(val.value);
 
 										if (selected[val.fk_product_attribute] == val.id) {
-											tag.attr('selected', 'selected');
+											tag.attr(\'selected\', \'selected\');
 										}
 
 										html.append(tag);
 									});
 
 									span.append(html);
-									jQuery('div#attributes_box').append(span);
+									jQuery(\'div#attributes_box\').append(span);
 								});
 							})
 						});
 
-						<?php if ($selected): ?>
-						jQuery("input#<?php echo $htmlname ?>").change();
-						<?php endif ?>
+						'.($selected ? 'jQuery("input#'.$htmlname.'").change();' : '').'
 					});
 				</script>
-                <?php
+                ';
 			}
-			if (empty($hidelabel)) print $langs->trans("RefOrLabel").' : ';
+
+			if (empty($hidelabel)) $out .= $langs->trans("RefOrLabel").' : ';
 			elseif ($hidelabel > 1) {
 				$placeholder = ' placeholder="'.$langs->trans("RefOrLabel").'"';
 				if ($hidelabel == 2) {
-					print img_picto($langs->trans("Search"), 'search');
+					$out .= img_picto($langs->trans("Search"), 'search');
 				}
 			}
-			print '<input type="text" class="minwidth100" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->PRODUCT_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';
+			$out .= '<input type="text" class="minwidth100" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->PRODUCT_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';
 			if ($hidelabel == 3) {
-				print img_picto($langs->trans("Search"), 'search');
+				$out .= img_picto($langs->trans("Search"), 'search');
 			}
 		} else {
-			print $this->select_produits_list($selected, $htmlname, $filtertype, $limit, $price_level, '', $status, $finished, 0, $socid, $showempty, $forcecombo, $morecss, $hidepriceinlabel, $warehouseStatus);
+			$out .= $this->select_produits_list($selected, $htmlname, $filtertype, $limit, $price_level, '', $status, $finished, 0, $socid, $showempty, $forcecombo, $morecss, $hidepriceinlabel, $warehouseStatus);
 		}
+
+		if (empty($nooutput)) print $out;
+		else return $out;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *	Return list of products for a customer
+	 *	Return list of products for a customer.
+	 *  Called by select_produits.
 	 *
 	 *	@param      int		$selected           Preselected product
 	 *	@param      string	$htmlname           Name of select html
@@ -2083,7 +2122,7 @@ class Form
 		$outarray = array();
 
 		// Units
-		if ($conf->global->PRODUCT_USE_UNITS) {
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			$langs->load('other');
 		}
 
@@ -2259,7 +2298,7 @@ class Form
 		$sql .= $this->db->plimit($limit, 0);
 
 		// Build output string
-		dol_syslog(get_class($this)."::select_produits_list search product", LOG_DEBUG);
+		dol_syslog(get_class($this)."::select_produits_list search products", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -2305,7 +2344,7 @@ class Form
 					$sql .= " WHERE fk_product_price=".$objp->price_rowid;
 					$sql .= " ORDER BY quantity ASC";
 
-					dol_syslog(get_class($this)."::select_produits_list search price by qty", LOG_DEBUG);
+					dol_syslog(get_class($this)."::select_produits_list search prices by qty", LOG_DEBUG);
 					$result2 = $this->db->query($sql);
 					if ($result2)
 					{
@@ -2708,12 +2747,13 @@ class Form
 	 *  @param  int     $limit          Limit of line number
 	 *  @param  int     $alsoproductwithnosupplierprice    1=Add also product without supplier prices
 	 *  @param	string	$morecss		Add more CSS
+	 *  @param	int		$showstockinlist	Show stock information (slower).
 	 *  @return array           		Array of keys for json
 	 */
-	public function select_produits_fournisseurs_list($socid, $selected = '', $htmlname = 'productid', $filtertype = '', $filtre = '', $filterkey = '', $statut = -1, $outputmode = 0, $limit = 100, $alsoproductwithnosupplierprice = 0, $morecss = '')
+	public function select_produits_fournisseurs_list($socid, $selected = '', $htmlname = 'productid', $filtertype = '', $filtre = '', $filterkey = '', $statut = -1, $outputmode = 0, $limit = 100, $alsoproductwithnosupplierprice = 0, $morecss = '', $showstockinlist = 0)
 	{
 		// phpcs:enable
-		global $langs, $conf, $db;
+		global $langs, $conf, $db, $user;
 
 		$out = '';
 		$outarray = array();
@@ -2722,16 +2762,16 @@ class Form
 
 		$langs->load('stocks');
 		// Units
-		if ($conf->global->PRODUCT_USE_UNITS) {
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			$langs->load('other');
 		}
 
-		$sql = "SELECT p.rowid, p.ref, p.label, p.price, p.duration, p.fk_product_type,";
+		$sql = "SELECT p.rowid, p.ref, p.label, p.price, p.duration, p.fk_product_type, p.stock,";
 		$sql .= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.remise_percent, pfp.remise, pfp.unitprice,";
 		$sql .= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, pfp.fk_soc, s.nom as name,";
 		$sql .= " pfp.supplier_reputation";
 		// Units
-		if ($conf->global->PRODUCT_USE_UNITS) {
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			$sql .= ", u.label as unit_long, u.short_label as unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units";
 		}
 		if (!empty($conf->barcode->enabled)) $sql .= ", pfp.barcode";
@@ -2740,7 +2780,7 @@ class Form
 		if ($socid) $sql .= " AND pfp.fk_soc = ".$socid;
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
 		// Units
-		if ($conf->global->PRODUCT_USE_UNITS) {
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_units u ON u.rowid = p.fk_unit";
 		}
 		$sql .= " WHERE p.entity IN (".getEntity('product').")";
@@ -2807,7 +2847,7 @@ class Form
 
 				// Units
 				$outvalUnits = '';
-				if ($conf->global->PRODUCT_USE_UNITS) {
+				if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 					if (!empty($objp->unit_short)) {
 						$outvalUnits .= ' - '.$objp->unit_short;
 					}
@@ -2944,6 +2984,45 @@ class Form
 					}
 				}
 
+				if (!empty($conf->stock->enabled) && $showstockinlist && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)))
+				{
+					$novirtualstock = ($showstockinlist == 2);
+
+					if (!empty($user->rights->stock->lire)) {
+						$outvallabel .= ' - '.$langs->trans("Stock").':'.$objp->stock;
+
+						if ($objp->stock > 0) {
+							$optlabel .= ' - <span class="product_line_stock_ok">';
+						} elseif ($objp->stock <= 0) {
+							$optlabel .= ' - <span class="product_line_stock_too_low">';
+						}
+						$optlabel .= $langs->transnoentities("Stock").':'.$objp->stock;
+						$optlabel .= '</span>';
+						if (empty($novirtualstock) && !empty($conf->global->STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO))  // Warning, this option may slow down combo list generation
+						{
+							$langs->load("stocks");
+
+							$tmpproduct = new Product($this->db);
+							$tmpproduct->fetch($objp->rowid, '', '', '', 1, 1, 1); // Load product without lang and prices arrays (we just need to make ->virtual_stock() after)
+							$tmpproduct->load_virtual_stock();
+							$virtualstock = $tmpproduct->stock_theorique;
+
+							$outvallabel .= ' - '.$langs->trans("VirtualStock").':'.$virtualstock;
+
+							$optlabel .= ' - '.$langs->transnoentities("VirtualStock").':';
+							if ($virtualstock > 0) {
+								$optlabel .= '<span class="product_line_stock_ok">';
+							} elseif ($virtualstock <= 0) {
+								$optlabel .= '<span class="product_line_stock_too_low">';
+							}
+							$optlabel .= $virtualstock;
+							$optlabel .= '</span>';
+
+							unset($tmpproduct);
+						}
+					}
+				}
+
 				$opt = '<option value="'.$outkey.'"';
 				if ($selected && $selected == $objp->idprodfournprice) $opt .= ' selected';
 				if (empty($objp->idprodfournprice) && empty($alsoproductwithnosupplierprice)) $opt .= ' disabled';
@@ -3273,6 +3352,7 @@ class Form
 		}
 		print '</select>';
 		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		print ajax_combobox($htmlname);
 	}
 
 	/**
@@ -3356,6 +3436,7 @@ class Form
 		}
 		print '</select>';
 		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		print ajax_combobox('select_'.$htmlname);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -3451,6 +3532,7 @@ class Form
 		}
 		print '</select>';
 		if ($user->admin && empty($noinfoadmin)) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		print ajax_combobox($htmlname);
 	}
 
 
@@ -3520,6 +3602,7 @@ class Form
 		}
 		print '</select>';
 		if ($user->admin && !$noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		print ajax_combobox('select'.$htmlname);
 	}
 
 
@@ -3556,6 +3639,107 @@ class Form
 		return $return;
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *      Load in cache list of transport mode
+	 *
+	 *      @return     int                 Nb of lines loaded, <0 if KO
+	 */
+	public function load_cache_transport_mode()
+	{
+		// phpcs:enable
+		global $langs;
+
+		$num = count($this->cache_transport_mode);
+		if ($num > 0) return $num; // Cache already loaded
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$this->cache_transport_mode = array();
+
+		$sql = "SELECT rowid, code, label, active";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_transport_mode";
+		$sql .= " WHERE entity IN (".getEntity('c_transport_mode').")";
+		//if ($active >= 0) $sql.= " AND active = ".$active;
+
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				// If traduction exist, we use it else we take the default label
+				$label = ($langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code) != ("PaymentTypeShort".$obj->code) ? $langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
+				$this->cache_transport_mode[$obj->rowid]['rowid'] = $obj->rowid;
+				$this->cache_transport_mode[$obj->rowid]['code'] = $obj->code;
+				$this->cache_transport_mode[$obj->rowid]['label'] = $label;
+				$this->cache_transport_mode[$obj->rowid]['active'] = $obj->active;
+				$i++;
+			}
+
+			$this->cache_transport_mode = dol_sort_array($this->cache_transport_mode, 'label', 'asc', 0, 0, 1);
+
+			return $num;
+		}
+		else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
+
+	/**
+	 *      Return list of transport mode for intracomm report
+	 *
+	 *      @param	string	$selected       Id of the transport mode pre-selected
+	 *      @param  string	$htmlname       Name of the select field
+	 *      @param  int		$format         0=id+label, 1=code+code, 2=code+label, 3=id+code
+	 *      @param  int		$empty			1=can be empty, 0 else
+	 *      @param	int		$noadmininfo	0=Add admin info, 1=Disable admin info
+	 *      @param  int		$maxlength      Max length of label
+	 *      @param  int     $active         Active or not, -1 = all
+	 *      @param  string  $morecss        Add more CSS on select tag
+	 * 		@return	void
+	 */
+	public function selectTransportMode($selected = '', $htmlname = 'transportmode', $format = 0, $empty = 1, $noadmininfo = 0, $maxlength = 0, $active = 1, $morecss = '')
+	{
+		global $langs, $user;
+
+		dol_syslog(__METHOD__." ".$selected.", ".$htmlname.", ".$format, LOG_DEBUG);
+
+		$this->load_cache_transport_mode();
+
+		print '<select id="select'.$htmlname.'" class="flat selectmodetransport'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
+		if ($empty) print '<option value="">&nbsp;</option>';
+		foreach ($this->cache_transport_mode as $id => $arraytypes)
+		{
+			// If not good status
+			if ($active >= 0 && $arraytypes['active'] != $active) continue;
+
+			// We discard empty line if showempty is on because an empty line has already been output.
+			if ($empty && empty($arraytypes['code'])) continue;
+
+			if ($format == 0) print '<option value="'.$id.'"';
+			elseif ($format == 1) print '<option value="'.$arraytypes['code'].'"';
+			elseif ($format == 2) print '<option value="'.$arraytypes['code'].'"';
+			elseif ($format == 3) print '<option value="'.$id.'"';
+			// If text is selected, we compare with code, else with id
+			if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code']) print ' selected';
+			elseif ($selected == $id) print ' selected';
+			print '>';
+			if ($format == 0) $value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
+			elseif ($format == 1) $value = $arraytypes['code'];
+			elseif ($format == 2) $value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
+			elseif ($format == 3) $value = $arraytypes['code'];
+			print $value ? $value : '&nbsp;';
+			print '</option>';
+		}
+		print '</select>';
+		if ($user->admin && !$noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+	}
+
 	/**
 	 *  Return a HTML select list of shipping mode
 	 *
@@ -3602,6 +3786,8 @@ class Form
 				}
 				print "</select>";
 				if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+
+				print ajax_combobox('select'.$htmlname);
 			} else {
 				print $langs->trans("NoShippingMethodDefined");
 			}
@@ -3787,7 +3973,7 @@ class Form
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($result);
-					if ($selected == $obj->rowid)
+					if ($selected == $obj->rowid || ($useempty == 2 && $num == 1 && empty($selected)))
 					{
 						print '<option value="'.$obj->rowid.'" selected>';
 					} else {
@@ -3800,6 +3986,7 @@ class Form
 					$i++;
 				}
 				print "</select>";
+				print ajax_combobox('select'.$htmlname);
 			} else {
 				if ($status == 0) print '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';
 				else print '<span class="opacitymedium">'.$langs->trans("NoBankAccountFound").'</span>';
@@ -4034,7 +4221,7 @@ class Form
 	 *     @param	string			$title       	   	Title
 	 *     @param	string			$question    	   	Question
 	 *     @param 	string			$action      	   	Action
-	 *	   @param  	array|string	$formquestion	   	An array with complementary inputs to add into forms: array(array('label'=> ,'type'=> , ))
+	 *	   @param  	array|string	$formquestion	   	An array with complementary inputs to add into forms: array(array('label'=> ,'type'=> , 'size'=>, 'morecss'=>, 'moreattr'=>))
 	 *													type can be 'hidden', 'text', 'password', 'checkbox', 'radio', 'date', 'morecss', ...
 	 * 	   @param  	string			$selectedchoice  	'' or 'no', or 'yes' or '1' or '0'
 	 * 	   @param  	int|string		$useajax		   	0=No, 1=Yes, 2=Yes but submit page with &confirm=no if choice is No, 'xxx'=Yes and preoutput confirm box with div id=dialog-confirm-xxx
@@ -4119,10 +4306,11 @@ class Form
 							$more .= '<div class="tagtr">';
 							if ($i == 0) $more .= '<div class="tagtd'.(empty($input['tdclass']) ? ' tdtop' : (' tdtop '.$input['tdclass'])).'">'.$input['label'].'</div>';
 							else $more .= '<div clas="tagtd'.(empty($input['tdclass']) ? '' : (' "'.$input['tdclass'])).'">&nbsp;</div>';
-							$more .= '<div class="tagtd"><input type="radio" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'" value="'.$selkey.'"'.$moreattr;
+							$more .= '<div class="tagtd'.($i == 0 ? ' tdtop' : '').'"><input type="radio" class="flat'.$morecss.'" id="'.$input['name'].$selkey.'" name="'.$input['name'].'" value="'.$selkey.'"'.$moreattr;
 							if ($input['disabled']) $more .= ' disabled';
+							if (isset($input['default']) && $input['default'] === $selkey) $more .= ' checked="checked"';
 							$more .= ' /> ';
-							$more .= $selval;
+							$more .= '<label for="'.$input['name'].$selkey.'">'.$selval.'</label>';
 							$more .= '</div></div>'."\n";
 							$i++;
 						}
@@ -4268,7 +4456,7 @@ class Form
             </script>';
 			$formconfirm .= "<!-- end ajax formconfirm -->\n";
 		} else {
-			$formconfirm .= "\n<!-- begin formconfirm page=".$page." -->\n";
+			$formconfirm .= "\n<!-- begin formconfirm page=".dol_escape_htmltag($page)." -->\n";
 
 			if (empty($disableformtag)) $formconfirm .= '<form method="POST" action="'.$page.'" class="notoptoleftroright">'."\n";
 
@@ -4299,7 +4487,7 @@ class Form
 			$formconfirm .= '<td class="valid">';
 			$formconfirm .= $this->selectyesno("confirm", $newselectedchoice);
 			$formconfirm .= '</td>';
-			$formconfirm .= '<td class="valid center"><input class="button valignmiddle" type="submit" value="'.$langs->trans("Validate").'"></td>';
+			$formconfirm .= '<td class="valid center"><input class="button valignmiddle confirmvalidatebutton" type="submit" value="'.$langs->trans("Validate").'"></td>';
 			$formconfirm .= '</tr>'."\n";
 
 			$formconfirm .= '</table>'."\n";
@@ -4307,6 +4495,23 @@ class Form
 			if (empty($disableformtag)) $formconfirm .= "</form>\n";
 			$formconfirm .= '<br>';
 
+			if (empty($conf->use_javascript_ajax)) {
+				$formconfirm .= '<!-- code to disable button to avoid double clic -->';
+				$formconfirm .= '<script type="text/javascript">'."\n";
+				$formconfirm .= '
+				$(document).ready(function () {
+					$(".confirmvalidatebutton").on("click", function() {
+						console.log("We click on button");
+						$(this).attr("disabled", "disabled");
+						setTimeout(\'$(".confirmvalidatebutton").removeAttr("disabled")\', 3000);
+						//console.log($(this).closest("form"));
+						$(this).closest("form").submit();
+					});
+				});
+				';
+				$formconfirm .= '</script>'."\n";
+			}
+
 			$formconfirm .= "<!-- end formconfirm -->\n";
 		}
 
@@ -4348,7 +4553,7 @@ class Form
 			$out .= '<input type="hidden" name="action" value="classin">';
 			$out .= '<input type="hidden" name="token" value="'.newToken().'">';
 			$out .= $formproject->select_projects($socid, $selected, $htmlname, $maxlength, 0, 1, $discard_closed, $forcefocus, 0, 0, '', 1);
-			$out .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+			$out .= '<input type="submit" class="button smallpaddingimp" value="'.$langs->trans("Modify").'">';
 			$out .= '</form>';
 		} else {
 			if ($selected)
@@ -4390,7 +4595,7 @@ class Form
 			print '<input type="hidden" name="action" value="setconditions">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			$this->select_conditions_paiements($selected, $htmlname, -1, $addempty);
-			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			print '<input type="submit" class="button valignmiddle smallpaddingimp" value="'.$langs->trans("Modify").'">';
 			print '</form>';
 		} else {
 			if ($selected)
@@ -4423,7 +4628,7 @@ class Form
 			print '<input type="hidden" name="action" value="setavailability">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			$this->selectAvailabilityDelay($selected, $htmlname, -1, $addempty);
-			print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+			print '<input type="submit" class="button smallpaddingimp" value="'.$langs->trans("Modify").'">';
 			print '</form>';
 		} else {
 			if ($selected)
@@ -4455,7 +4660,7 @@ class Form
 			print '<input type="hidden" name="action" value="setdemandreason">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			$this->selectInputReason($selected, $htmlname, -1, $addempty);
-			print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+			print '<input type="submit" class="button smallpaddingimp" value="'.$langs->trans("Modify").'">';
 			print '</form>';
 		} else {
 			if ($selected)
@@ -4504,7 +4709,7 @@ class Form
 			$ret .= '<tr><td>';
 			$ret .= $this->selectDate($selected, $htmlname, $displayhour, $displaymin, 1, 'form'.$htmlname, 1, 0);
 			$ret .= '</td>';
-			$ret .= '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+			$ret .= '<td class="left"><input type="submit smallpaddingimp" class="button" value="'.$langs->trans("Modify").'"></td>';
 			$ret .= '</tr></table></form>';
 		} else {
 			if ($displayhour) $ret .= dol_print_date($selected, 'dayhour');
@@ -4538,7 +4743,7 @@ class Form
 			print '<input type="hidden" name="action" value="set'.$htmlname.'">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print $this->select_dolusers($selected, $htmlname, 1, $exclude, 0, $include);
-			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			print '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
 		} else {
 			if ($selected)
@@ -4576,7 +4781,7 @@ class Form
 			print '<input type="hidden" name="action" value="setmode">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			$this->select_types_paiements($selected, $htmlname, $filtertype, 0, $addempty, 0, 0, $active);
-			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			print '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
 		} else {
 			if ($selected)
@@ -4589,6 +4794,39 @@ class Form
 		}
 	}
 
+	/**
+	 *    Show form with transport mode
+	 *
+	 *    @param	string	$page        	Page
+	 *    @param    int		$selected    	Id mode pre-select
+	 *    @param    string	$htmlname    	Name of select html field
+	 *    @param    int     $active         Active or not, -1 = all
+	 *    @param    int     $addempty       1=Add empty entry
+	 *    @return	void
+	 */
+	public function formSelectTransportMode($page, $selected = '', $htmlname = 'transport_mode_id', $active = 1, $addempty = 0)
+	{
+		global $langs;
+		if ($htmlname != "none")
+		{
+			print '<form method="POST" action="'.$page.'">';
+			print '<input type="hidden" name="action" value="setmode">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			$this->selectTransportMode($selected, $htmlname, 2, $addempty, 0, 0, $active);
+			print '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Modify").'">';
+			print '</form>';
+		}
+		else {
+			if ($selected)
+			{
+				$this->load_cache_transport_mode();
+				print $this->cache_transport_mode[$selected]['label'];
+			} else {
+				print "&nbsp;";
+			}
+		}
+	}
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Show form with multicurrency code
@@ -4608,7 +4846,7 @@ class Form
 			print '<input type="hidden" name="action" value="setmulticurrencycode">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print $this->selectMultiCurrency($selected, $htmlname, 0);
-			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			print '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
 		} else {
 			dol_include_once('/core/lib/company.lib.php');
@@ -4641,7 +4879,7 @@ class Form
 			print '<option value="1">'.$currency.' > '.$conf->currency.'</option>';
 			print '<option value="2">'.$conf->currency.' > '.$currency.'</option>';
 			print '</select> ';
-			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			print '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
 		} else {
 			if (!empty($rate))
@@ -4716,7 +4954,7 @@ class Form
 				$nbqualifiedlines = $this->select_remises($selected, $htmlname, $newfilter, $socid, $maxvalue);
 				if ($nbqualifiedlines > 0)
 				{
-					print ' &nbsp; <input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("UseLine")).'"';
+					print ' &nbsp; <input type="submit" class="button smallpaddingimp" value="'.dol_escape_htmltag($langs->trans("UseLine")).'"';
 					if (!empty($discount_type) && $filter && $filter != "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')")
 						print ' title="'.$langs->trans("UseCreditNoteInInvoicePayment").'"';
 					if (empty($discount_type) && $filter && $filter != "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')")
@@ -4766,14 +5004,15 @@ class Form
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
 			print '<tr><td>';
-			$num = $this->select_contacts($societe->id, $selected, $htmlname);
+			print $this->selectcontacts($societe->id, $selected, $htmlname);
+			$num = $this->num;
 			if ($num == 0)
 			{
 				$addcontact = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));
 				print '<a href="'.DOL_URL_ROOT.'/contact/card.php?socid='.$societe->id.'&amp;action=create&amp;backtoreferer=1">'.$addcontact.'</a>';
 			}
 			print '</td>';
-			print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+			print '<td class="left"><input type="submit" class="button smallpaddingimp" value="'.$langs->trans("Modify").'"></td>';
 			print '</tr></table></form>';
 		} else {
 			if ($selected)
@@ -4815,7 +5054,7 @@ class Form
 			$out .= '<input type="hidden" name="action" value="set_thirdparty">';
 			$out .= '<input type="hidden" name="token" value="'.newToken().'">';
 			$out .= $this->select_company($selected, $htmlname, $filter, $showempty, $showtype, $forcecombo, $events);
-			$out .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			$out .= '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Modify").'">';
 			$out .= '</form>';
 		} else {
 			if ($selected)
@@ -4869,19 +5108,21 @@ class Form
 		$out .= '<select class="flat maxwidth200onsmartphone minwidth300" name="'.$htmlname.'" id="'.$htmlname.'">';
 		foreach ($langs->cache_currencies as $code_iso => $currency)
 		{
-			if ($selected && $selected == $code_iso)
-			{
-				$out .= '<option value="'.$code_iso.'" selected>';
-			} else {
-				$out .= '<option value="'.$code_iso.'">';
-			}
-			$out .= $currency['label'];
+			$labeltoshow = $currency['label'];
 			if ($mode == 1)
 			{
-				$out .= ' ('.$code_iso.')';
+				$labeltoshow .= ' <span class="opacitymedium">('.$code_iso.')</span>';
 			} else {
-				$out .= ' ('.$langs->getCurrencySymbol($code_iso).')';
+				$labeltoshow .= ' <span class="opacitymedium">('.$langs->getCurrencySymbol($code_iso).')</span>';
 			}
+
+			if ($selected && $selected == $code_iso)
+			{
+				$out .= '<option value="'.$code_iso.'" selected data-html="'.dol_escape_htmltag($labeltoshow).'">';
+			} else {
+				$out .= '<option value="'.$code_iso.'" data-html="'.dol_escape_htmltag($labeltoshow).'">';
+			}
+			$out .= $labeltoshow;
 			$out .= '</option>';
 		}
 		$out .= '</select>';
@@ -4900,9 +5141,11 @@ class Form
 	 *  @param	string	$selected    preselected currency code
 	 *  @param  string	$htmlname    name of HTML select list
 	 *  @param  integer	$useempty    1=Add empty line
+	 *  @param string $filter Optional filters criteras (example: 'code <> x', ' in (1,3)')
+	 *  @param bool $excludeConfCurrency false  = If company current currency not in table, we add it into list. Should always be available.  true = we are in currency_rate update , we don't want to see conf->currency in select
 	 * 	@return	string
 	 */
-	public function selectMultiCurrency($selected = '', $htmlname = 'multicurrency_code', $useempty = 0)
+	public function selectMultiCurrency($selected = '', $htmlname = 'multicurrency_code', $useempty = 0, $filter = '', $excludeConfCurrency = false)
 	{
 		global $db, $conf, $langs, $user;
 
@@ -4912,6 +5155,7 @@ class Form
 
 		$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'multicurrency';
 		$sql .= " WHERE entity IN ('".getEntity('mutlicurrency')."')";
+		if ($filter) $sql .= " AND ".$filter;
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -4922,7 +5166,7 @@ class Form
 		$out .= '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
 		if ($useempty) $out .= '<option value="">&nbsp;</option>';
 		// If company current currency not in table, we add it into list. Should always be available.
-		if (!in_array($conf->currency, $TCurrency))
+		if (!in_array($conf->currency, $TCurrency) && !$excludeConfCurrency)
 		{
 			$TCurrency[$conf->currency] = $conf->currency;
 		}
@@ -5306,6 +5550,7 @@ class Form
 		}
 
 		// Analysis of the pre-selection date
+		$reg = array();
 		if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/', $set_time, $reg))	// deprecated usage
 		{
 			// Date format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS'
@@ -5450,7 +5695,6 @@ class Form
 			}
 			// Show date with combo selects
 			else {
-				//$retstring.='<div class="inline-block">';
 				// Day
 				$retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth50imp" id="'.$prefix.'day" name="'.$prefix.'day">';
 
@@ -5494,11 +5738,13 @@ class Form
 					}
 					$retstring .= "</select>\n";
 				}
-				//$retstring.='</div>';
 			}
 		}
 
-		if ($d && $h) $retstring .= ($h == 2 ? '<br>' : ' ');
+		if ($d && $h) {
+			$retstring .= ($h == 2 ? '<br>' : ' ');
+			$retstring .= '<span class="nowraponall">';
+		}
 
 		if ($h)
 		{
@@ -5516,10 +5762,13 @@ class Form
 			for ($hour = $hourstart; $hour < $hourend; $hour++)
 			{
 				if (strlen($hour) < 2) $hour = "0".$hour;
-				$retstring .= '<option value="'.$hour.'"'.(($hour == $shour) ? ' selected' : '').'>'.$hour.(empty($conf->dol_optimize_smallscreen) ? '' : 'H').'</option>';
+				$retstring .= '<option value="'.$hour.'"'.(($hour == $shour) ? ' selected' : '').'>'.$hour;
+				//$retstring .= (empty($conf->dol_optimize_smallscreen) ? '' : 'H');
+				$retstring .= '</option>';
 			}
 			$retstring .= '</select>';
-			if ($m && empty($conf->dol_optimize_smallscreen)) $retstring .= ":";
+			//if ($m && empty($conf->dol_optimize_smallscreen)) $retstring .= ":";
+			if ($m) $retstring .= ":";
 		}
 
 		if ($m)
@@ -5537,6 +5786,10 @@ class Form
 			$retstring .= '<input type="hidden" name="'.$prefix.'sec" value="'.$ssec.'">';
 		}
 
+		if ($d && $h) {
+			$retstring .= '</span>';
+		}
+
 		// Add a "Now" link
 		if ($conf->use_javascript_ajax && $addnowlink)
 		{
@@ -5675,18 +5928,31 @@ class Form
 	/**
 	 * selectTypeDuration
 	 *
-	 * @param   string   $prefix     Prefix
-	 * @param   string   $selected   Selected type
-	 * @return  string               HTML select string
+	 * @param   string   	$prefix     	Prefix
+	 * @param   string   	$selected   	Selected duration type
+	 * @param	array		$excludetypes	Array of duration types to exclude. Example array('y', 'm')
+	 * @return  string      	         	HTML select string
 	 */
-	public function selectTypeDuration($prefix, $selected = 'i')
+	public function selectTypeDuration($prefix, $selected = 'i', $excludetypes = array())
 	{
 		global $langs;
 
-		$TDurationTypes = array('y'=>$langs->trans('Years'), 'm'=>$langs->trans('Month'), 'w'=>$langs->trans('Weeks'), 'd'=>$langs->trans('Days'), 'h'=>$langs->trans('Hours'), 'i'=>$langs->trans('Minutes'));
+		$TDurationTypes = array(
+			'y'=>$langs->trans('Years'),
+			'm'=>$langs->trans('Month'),
+			'w'=>$langs->trans('Weeks'),
+			'd'=>$langs->trans('Days'),
+			'h'=>$langs->trans('Hours'),
+			'i'=>$langs->trans('Minutes')
+		);
+
+		// Removed undesired duration types
+		foreach ($excludetypes as $value) {
+			unset($TDurationTypes[$value]);
+		}
 
 		$retstring = '<select class="flat" id="select_'.$prefix.'type_duration" name="'.$prefix.'type_duration">';
-		foreach ($TDurationTypes as $key=>$typeduration) {
+		foreach ($TDurationTypes as $key => $typeduration) {
 			$retstring .= '<option value="'.$key.'"';
 			if ($key == $selected) {
 				$retstring .= " selected";
@@ -5695,6 +5961,8 @@ class Form
 		}
 		$retstring .= "</select>";
 
+		$retstring .= ajax_combobox('select_'.$prefix.'type_duration');
+
 		return $retstring;
 	}
 
@@ -5798,7 +6066,7 @@ class Form
 	 * @param	int				$disabled			1=Html component is disabled
 	 * @param	string	        $selected_input_value	Value of preselected input text (for use with ajax)
 	 * @return	string								Return HTML string
-	 * @see selectForFormsList() select_thirdparty()
+	 * @see selectForFormsList() select_thirdparty_list()
 	 */
 	public function selectForForms($objectdesc, $htmlname, $preselectedvalue, $showempty = '', $searchkey = '', $placeholder = '', $morecss = '', $moreparams = '', $forcecombo = 0, $disabled = 0, $selected_input_value = '')
 	{
@@ -5929,6 +6197,7 @@ class Form
 			$tmpfieldstoshow = '';
 			foreach ($objecttmp->fields as $key => $val)
 			{
+				if (!dol_eval($val['enabled'], 1, 1)) continue;
 				if ($val['showoncombobox']) $tmpfieldstoshow .= ($tmpfieldstoshow ? ',' : '').'t.'.$key;
 			}
 			if ($tmpfieldstoshow) $fieldstoshow = $tmpfieldstoshow;
@@ -6026,8 +6295,7 @@ class Form
 					}
 					if (empty($outputmode))
 					{
-						if ($preselectedvalue > 0 && $preselectedvalue == $obj->rowid)
-						{
+						if ($preselectedvalue > 0 && $preselectedvalue == $obj->rowid) {
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';
 						} else {
 							$out .= '<option value="'.$obj->rowid.'">'.$label.'</option>';
@@ -6058,7 +6326,7 @@ class Form
 	 *  Note: Do not apply langs->trans function on returned content, content may be entity encoded twice.
 	 *
 	 *	@param	string			$htmlname			Name of html select area. Must start with "multi" if this is a multiselect
-	 *	@param	array			$array				Array like array(key => value) or array(key=>array('label'=>..., 'data-...'=>...))
+	 *	@param	array			$array				Array like array(key => value) or array(key=>array('label'=>..., 'data-...'=>..., 'disabled'=>..., 'css'=>...))
 	 *	@param	string|string[]	$id					Preselected key or preselected keys for multiselect
 	 *	@param	int|string		$show_empty			0 no empty value allowed, 1 or string to add an empty value into list (key is -1 and value is '' or '&nbsp;' if 1, key is -1 and value is text if string), <0 to add an empty value with key that is this value.
 	 *	@param	int				$key_in_label		1 to show key into label with format "[key] value"
@@ -6130,10 +6398,14 @@ class Form
 
 			foreach ($array as $key => $tmpvalue)
 			{
-				if (is_array($tmpvalue)) $value = $tmpvalue['label'];
-				else $value = $tmpvalue;
-
-				$disabled = ''; $style = '';
+				if (is_array($tmpvalue)) {
+					$value = $tmpvalue['label'];
+					$disabled = empty($tmpvalue['disabled']) ? '' : ' disabled';
+					$style = empty($tmpvalue['css']) ? ' class="'.$tmpvalue['css'].'"' : '';
+				} else {
+					$value = $tmpvalue;
+					$disabled = ''; $style = '';
+				}
 				if (!empty($disablebademail))
 				{
 					if (($disablebademail == 1 && !preg_match('/&lt;.+@.+&gt;/', $value))
@@ -6287,7 +6559,7 @@ class Form
 	 *  Note: Do not apply langs->trans function on returned content of Ajax service, content may be entity encoded twice.
 	 *
 	 *  @param  string	$htmlname               Name of html select area
-	 *	@param	string	$array					Array (key=>array('text'=>'A text', 'url'=>'An url'), ...)
+	 *	@param	array	$array					Array (key=>array('text'=>'A text', 'url'=>'An url'), ...)
 	 *	@param	string	$id             		Preselected key
 	 *	@param  string	$moreparam      		Add more parameters onto the select tag
 	 *	@param	int		$disableFiltering		If set to 1, results are not filtered with searched string
@@ -6349,7 +6621,7 @@ class Form
 						var separ = urlBase.indexOf("?") >= 0 ? "&" : "?";
 						/* console.log("params.term="+params.term); */
 						/* console.log("params.term encoded="+encodeURIComponent(params.term)); */
-						saveRemoteData[data.id].url = urlBase + separ + "sall=" + encodeURIComponent(params.term);';
+						saveRemoteData[data.id].url = urlBase + separ + "sall=" + encodeURIComponent(params.term.replace(/\"/g, ""));';
 		}
 
 		if (!$disableFiltering) {
@@ -6380,7 +6652,7 @@ class Form
 					$.each( saveRemoteData, function( key, value ) {
 						if (key == selected)
 						{
-							console.log("selectArrayAjax - Do a redirect to "+value.url)
+							console.log("selectArrayFilter - Do a redirect to "+value.url)
 							location.assign(value.url);
 						}
 					});
@@ -6462,7 +6734,7 @@ class Form
 							 	templateSelection: formatSelection		/* For 4.0 */
 							});
 						});'."\n";
-			} elseif ($addjscombo == 2 && ! defined('DISABLE_MULTISELECT'))
+			} elseif ($addjscombo == 2 && !defined('DISABLE_MULTISELECT'))
 			{
 				// Add other js lib
 				// TODO external lib multiselect/jquery.multi-select.js must have been loaded to use this multiselect plugin
@@ -6500,7 +6772,7 @@ class Form
 					{
 						$out .= ' selected';
 					}
-					$out .= ' data-html="'.$newval.'"';
+					$out .= ' data-html="'.dol_escape_htmltag($newval).'"';
 					$out .= '>';
 					$out .= dol_htmlentitiesbr($newval);
 					$out .= '</option>'."\n";
@@ -6635,7 +6907,7 @@ class Form
 				$ways = $c->print_all_ways(' &gt;&gt; ', ($nolink ? 'none' : ''), 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text
 				foreach ($ways as $way)
 				{
-					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color ? ' style="background: #'.$c->color.';"' : ' style="background: #aaa"').'>'.$way.'</li>';
+					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color ? ' style="background: #'.$c->color.';"' : ' style="background: #bbb"').'>'.$way.'</li>';
 				}
 			}
 			return '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
@@ -6740,7 +7012,7 @@ class Form
 					$tplpath = 'reception';
 					if (empty($conf->reception->enabled)) continue; // Do not show if module disabled
 				} elseif ($objecttype == 'delivery') {
-					$tplpath = 'livraison';
+					$tplpath = 'delivery';
 					if (empty($conf->expedition->enabled)) continue; // Do not show if module disabled
 				} elseif ($objecttype == 'invoice_supplier') {
 					$tplpath = 'fourn/facture';
@@ -6912,7 +7184,7 @@ class Form
 						$i++;
 					}
 					print '</table>';
-					print '<div class="center"><input type="submit" class="button valignmiddle" value="'.$langs->trans('ToLink').'">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></div>';
+					print '<div class="center"><input type="submit" class="button valignmiddle" value="'.$langs->trans('ToLink').'">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
 
 					print '</form>';
 					$this->db->free($resqllist);
@@ -6973,9 +7245,10 @@ class Form
 	 *	@param	int			$option			0 return yes/no, 1 return 1/0
 	 *	@param	bool		$disabled		true or false
 	 *  @param	int      	$useempty		1=Add empty line
+	 *  @param	int			$addjscombo		1=Add js beautifier on combo box
 	 *	@return	string						See option
 	 */
-	public function selectyesno($htmlname, $value = '', $option = 0, $disabled = false, $useempty = 0)
+	public function selectyesno($htmlname, $value = '', $option = 0, $disabled = false, $useempty = 0, $addjscombo = 0)
 	{
 		global $langs;
 
@@ -7000,6 +7273,11 @@ class Form
 			$resultyesno .= '<option value="'.$no.'"'.$selected.'>'.$langs->trans("No").'</option>'."\n";
 		}
 		$resultyesno .= '</select>'."\n";
+
+		if ($addjscombo) {
+			$resultyesno .= ajax_combobox($htmlname);
+		}
+
 		return $resultyesno;
 	}
 
@@ -7129,7 +7407,7 @@ class Form
 		}
 		if ($morehtml)
 		{
-			$ret .= '<li class="noborder litext">'.$morehtml.'</li>';
+			$ret .= '<li class="noborder litext'.(($shownav && $previous_ref && $next_ref) ? ' clearbothonsmartphone' : '').'">'.$morehtml.'</li>';
 		}
 		if ($shownav && ($previous_ref || $next_ref))
 		{
@@ -7282,10 +7560,11 @@ class Form
 	 * 		@param	string		$imagesize		    'mini', 'small' or '' (original)
 	 *      @param  int         $addlinktofullsize  Add link to fullsize image
 	 *      @param  int         $cache              1=Accept to use image in cache
-	 *      @param	string		$forcecapture		Force parameter capture on HTML input file element to ask a smartphone to allow to open camera to take photo. Auto if empty.
+	 *      @param	string		$forcecapture		'', 'user' or 'environment'. Force parameter capture on HTML input file element to ask a smartphone to allow to open camera to take photo. Auto if ''.
+	 *      @param	int			$noexternsourceoverwrite	No overwrite image with extern source (like 'gravatar' or other module)
 	 * 	  	@return string    						HTML code to output photo
 	 */
-	public static function showphoto($modulepart, $object, $width = 100, $height = 0, $caneditfield = 0, $cssclass = 'photowithmargin', $imagesize = '', $addlinktofullsize = 1, $cache = 0, $forcecapture = '')
+	public static function showphoto($modulepart, $object, $width = 100, $height = 0, $caneditfield = 0, $cssclass = 'photowithmargin', $imagesize = '', $addlinktofullsize = 1, $cache = 0, $forcecapture = '', $noexternsourceoverwrite = 0)
 	{
 		global $conf, $langs;
 
@@ -7296,41 +7575,37 @@ class Form
 		if ($modulepart == 'societe')
 		{
 			$dir = $conf->societe->multidir_output[$entity];
-			if (!empty($object->logo))
-			{
-				if ((string) $imagesize == 'mini') $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.getImageFileNameForSize($object->logo, '_mini'); // getImageFileNameForSize include the thumbs
-				elseif ((string) $imagesize == 'small') $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.getImageFileNameForSize($object->logo, '_small');
-				else $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.$object->logo;
-				$originalfile = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.$object->logo;
+			if (!empty($object->logo)) {
+				if ((string) $imagesize == 'mini') $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'logos/'.getImageFileNameForSize($object->logo, '_mini'); // getImageFileNameForSize include the thumbs
+				elseif ((string) $imagesize == 'small') $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'logos/'.getImageFileNameForSize($object->logo, '_small');
+				else $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'logos/'.$object->logo;
+				$originalfile = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'logos/'.$object->logo;
 			}
 			$email = $object->email;
-		} elseif ($modulepart == 'contact')
-		{
+		} elseif ($modulepart == 'contact')	{
 			$dir = $conf->societe->multidir_output[$entity].'/contact';
 			if (!empty($object->photo))
 			{
-				if ((string) $imagesize == 'mini') $file = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.getImageFileNameForSize($object->photo, '_mini');
-				elseif ((string) $imagesize == 'small') $file = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.getImageFileNameForSize($object->photo, '_small');
-				else $file = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.$object->photo;
-				$originalfile = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.$object->photo;
+				if ((string) $imagesize == 'mini') $file = get_exdir(0, 0, 0, 0, $object, 'contact').'photos/'.getImageFileNameForSize($object->photo, '_mini');
+				elseif ((string) $imagesize == 'small') $file = get_exdir(0, 0, 0, 0, $object, 'contact').'photos/'.getImageFileNameForSize($object->photo, '_small');
+				else $file = get_exdir(0, 0, 0, 0, $object, 'contact').'photos/'.$object->photo;
+				$originalfile = get_exdir(0, 0, 0, 0, $object, 'contact').'photos/'.$object->photo;
 			}
 			$email = $object->email;
 			$capture = 'user';
-		} elseif ($modulepart == 'userphoto')
-		{
+		} elseif ($modulepart == 'userphoto') {
 			$dir = $conf->user->dir_output;
 			if (!empty($object->photo))
 			{
-				if ((string) $imagesize == 'mini') $file = get_exdir(0, 0, 0, 0, $object, 'user').$object->id.'/'.getImageFileNameForSize($object->photo, '_mini');
-				elseif ((string) $imagesize == 'small') $file = get_exdir(0, 0, 0, 0, $object, 'user').$object->id.'/'.getImageFileNameForSize($object->photo, '_small');
-				else $file = get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/'.$object->photo;
-				$originalfile = get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/'.$object->photo;
+				if ((string) $imagesize == 'mini') $file = get_exdir(0, 0, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_mini');
+				elseif ((string) $imagesize == 'small') $file = get_exdir(0, 0, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_small');
+				else $file = get_exdir(0, 0, 0, 0, $object, 'user').$object->photo;
+				$originalfile = get_exdir(0, 0, 0, 0, $object, 'user').$object->photo;
 			}
 			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile = $object->id.".jpg"; // For backward compatibility
 			$email = $object->email;
 			$capture = 'user';
-		} elseif ($modulepart == 'memberphoto')
-		{
+		} elseif ($modulepart == 'memberphoto')	{
 			$dir = $conf->adherent->dir_output;
 			if (!empty($object->photo))
 			{
@@ -7362,18 +7637,15 @@ class Form
 		{
 			if ($file && file_exists($dir."/".$file))
 			{
-				if ($addlinktofullsize)
-				{
+				if ($addlinktofullsize) {
 					$urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity='.$entity);
 					if ($urladvanced) $ret .= '<a href="'.$urladvanced.'">';
 					else $ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
 				}
 				$ret .= '<img alt="Photo" class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').' photologo'.(preg_replace('/[^a-z]/i', '_', $file)).'" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
 				if ($addlinktofullsize) $ret .= '</a>';
-			} elseif ($altfile && file_exists($dir."/".$altfile))
-			{
-				if ($addlinktofullsize)
-				{
+			} elseif ($altfile && file_exists($dir."/".$altfile)) {
+				if ($addlinktofullsize) {
 					$urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity='.$entity);
 					if ($urladvanced) $ret .= '<a href="'.$urladvanced.'">';
 					else $ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
@@ -7382,8 +7654,7 @@ class Form
 				if ($addlinktofullsize) $ret .= '</a>';
 			} else {
 				$nophoto = '/public/theme/common/nophoto.png';
-				if (in_array($modulepart, array('userphoto', 'contact', 'memberphoto')))	// For module that are "physical" users
-				{
+				if (in_array($modulepart, array('userphoto', 'contact', 'memberphoto'))) {	// For module that are "physical" users
 					if ($modulepart == 'memberphoto' && strpos($object->morphy, 'mor') !== false) {
 						$nophoto = '/public/theme/common/company.png';
 					} else {
@@ -7393,11 +7664,8 @@ class Form
 					}
 				}
 
-				if (!empty($conf->gravatar->enabled) && $email)
-				{
-					/**
-					 * @see https://gravatar.com/site/implement/images/php/
-					 */
+				if (!empty($conf->gravatar->enabled) && $email && empty($noexternsourceoverwrite)) {
+					// see https://gravatar.com/site/implement/images/php/
 					global $dolibarr_main_url_root;
 					$ret .= '<!-- Put link to gravatar -->';
 					//$defaultimg=urlencode(dol_buildpath($nophoto,3));
@@ -7557,7 +7825,7 @@ class Form
             $(document).ready(function() {
                 $("#' . $cssclass.'s").click(function() {
                     if($(this).is(\':checked\')){
-                        console.log("We check all '.$cssclass.'");
+                        console.log("We check all '.$cssclass.' and trigger the change method");
                 		$(".'.$cssclass.'").prop(\'checked\', true).trigger(\'change\');
                     }
                     else
@@ -7977,12 +8245,13 @@ class Form
 	/**
 	 * selectModelMail
 	 *
-	 * @param   string   $prefix     Prefix
-	 * @param   string   $modelType  Model type
-	 * @param	int		 $default	 1=Show also Default mail template
-	 * @return  string               HTML select string
+	 * @param   string   $prefix     	Prefix
+	 * @param   string   $modelType  	Model type
+	 * @param	int		 $default	 	1=Show also Default mail template
+	 * @param	int		 $addjscombo	Add js combobox
+	 * @return  string               	HTML select string
 	 */
-	public function selectModelMail($prefix, $modelType = '', $default = 0)
+	public function selectModelMail($prefix, $modelType = '', $default = 0, $addjscombo = 0)
 	{
 		global $langs, $db, $user;
 
@@ -8010,6 +8279,8 @@ class Form
 
 		$retstring .= "</select>";
 
+		if ($addjscombo) $retstring .= ajax_combobox('select_'.$prefix.'model_mail');
+
 		return $retstring;
 	}
 }
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index f48e9b8eb74..d6f7b269da1 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -36,26 +36,26 @@ class FormAccounting extends Form
 	private $options_cache = array();
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
-    /**
+	/**
 	 * Constructor
 	 *
 	 * @param		DoliDB		$db      Database handler
 	 */
 	public function __construct($db)
 	{
-	    $this->db = $db;
+		$this->db = $db;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return list of journals with label by nature
 	 *
@@ -72,16 +72,16 @@ class FormAccounting extends Form
 	 */
 	public function select_journal($selectid, $htmlname = 'journal', $nature = 0, $showempty = 0, $select_in = 0, $select_out = 0, $morecss = 'maxwidth300 maxwidthonsmartphone', $usecache = '', $disabledajaxcombo = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		$out = '';
 
-    	$options = array();
+		$options = array();
 		if ($usecache && !empty($this->options_cache[$usecache]))
 		{
-		    $options = $this->options_cache[$usecache];
-		    $selected = $selectid;
+			$options = $this->options_cache[$usecache];
+			$selected = $selectid;
 		} else {
 			$sql = "SELECT rowid, code, label, nature, entity, active";
 			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_journal";
@@ -99,27 +99,27 @@ class FormAccounting extends Form
 				return -1;
 			}
 
-    		$selected = 0;
+			$selected = 0;
 			$langs->load('accountancy');
 			while ($obj = $this->db->fetch_object($resql))
 			{
 				$label = $obj->code.' - '.$langs->trans($obj->label);
 
-    			$select_value_in = $obj->rowid;
+				$select_value_in = $obj->rowid;
 				$select_value_out = $obj->rowid;
 
 				// Try to guess if we have found default value
-    			if ($select_in == 1) {
-    				$select_value_in = $obj->code;
-    			}
-    			if ($select_out == 1) {
-    				$select_value_out = $obj->code;
-    			}
-    			// Remember guy's we store in database llx_accounting_bookkeeping the code of accounting_journal and not the rowid
-    			if ($selectid != '' && $selectid == $select_value_in) {
-    			    //var_dump("Found ".$selectid." ".$select_value_in);
-    				$selected = $select_value_out;
-    			}
+				if ($select_in == 1) {
+					$select_value_in = $obj->code;
+				}
+				if ($select_out == 1) {
+					$select_value_out = $obj->code;
+				}
+				// Remember guy's we store in database llx_accounting_bookkeeping the code of accounting_journal and not the rowid
+				if ($selectid != '' && $selectid == $select_value_in) {
+					//var_dump("Found ".$selectid." ".$select_value_in);
+					$selected = $select_value_out;
+				}
 
 				$options[$select_value_out] = $label;
 			}
@@ -136,83 +136,83 @@ class FormAccounting extends Form
 		return $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Return list of accounting category.
-     * 	Use mysoc->country_id or mysoc->country_code so they must be defined.
-     *
-     *	@param	string	$selected       Preselected type
-     *	@param  string	$htmlname       Name of field in form
-     * 	@param	int		$useempty		Set to 1 if we want an empty value
-     * 	@param	int		$maxlen			Max length of text in combo box
-     * 	@param	int		$help			Add or not the admin help picto
-     *  @param  int     $allcountries   All countries
-     * 	@return	void
-     */
-    public function select_accounting_category($selected = '', $htmlname = 'account_category', $useempty = 0, $maxlen = 0, $help = 1, $allcountries = 0)
-    {
-        // phpcs:enable
-        global $db, $langs, $user, $mysoc;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return list of accounting category.
+	 * 	Use mysoc->country_id or mysoc->country_code so they must be defined.
+	 *
+	 *	@param	string	$selected       Preselected type
+	 *	@param  string	$htmlname       Name of field in form
+	 * 	@param	int		$useempty		Set to 1 if we want an empty value
+	 * 	@param	int		$maxlen			Max length of text in combo box
+	 * 	@param	int		$help			Add or not the admin help picto
+	 *  @param  int     $allcountries   All countries
+	 * 	@return	void
+	 */
+	public function select_accounting_category($selected = '', $htmlname = 'account_category', $useempty = 0, $maxlen = 0, $help = 1, $allcountries = 0)
+	{
+		// phpcs:enable
+		global $db, $langs, $user, $mysoc;
 
-        if (empty($mysoc->country_id) && empty($mysoc->country_code) && empty($allcountries))
-        {
-            dol_print_error('', 'Call to select_accounting_account with mysoc country not yet defined');
-            exit;
-        }
+		if (empty($mysoc->country_id) && empty($mysoc->country_code) && empty($allcountries))
+		{
+			dol_print_error('', 'Call to select_accounting_account with mysoc country not yet defined');
+			exit;
+		}
 
-        if (!empty($mysoc->country_id))
-        {
-            $sql = "SELECT c.rowid, c.label as type, c.range_account";
-            $sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
-            $sql .= " WHERE c.active = 1";
+		if (!empty($mysoc->country_id))
+		{
+			$sql = "SELECT c.rowid, c.label as type, c.range_account";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
+			$sql .= " WHERE c.active = 1";
 			$sql .= " AND c.category_type = 0";
-            if (empty($allcountries)) $sql .= " AND c.fk_country = ".$mysoc->country_id;
-            $sql .= " ORDER BY c.label ASC";
-        } else {
-            $sql = "SELECT c.rowid, c.label as type, c.range_account";
-            $sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c, ".MAIN_DB_PREFIX."c_country as co";
-            $sql .= " WHERE c.active = 1";
+			if (empty($allcountries)) $sql .= " AND c.fk_country = ".$mysoc->country_id;
+			$sql .= " ORDER BY c.label ASC";
+		} else {
+			$sql = "SELECT c.rowid, c.label as type, c.range_account";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c, ".MAIN_DB_PREFIX."c_country as co";
+			$sql .= " WHERE c.active = 1";
 			$sql .= " AND c.category_type = 0";
 			$sql .= " AND c.fk_country = co.rowid";
-            if (empty($allcountries)) $sql .= " AND co.code = '".$this->db->escape($mysoc->country_code)."'";
-            $sql .= " ORDER BY c.label ASC";
-        }
+			if (empty($allcountries)) $sql .= " AND co.code = '".$this->db->escape($mysoc->country_code)."'";
+			$sql .= " ORDER BY c.label ASC";
+		}
 
-        dol_syslog(get_class($this).'::'.__METHOD__, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-        	$num = $this->db->num_rows($resql);
-            if ($num)
-            {
-                $out = '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.'">';
-                $i = 0;
+		dol_syslog(get_class($this).'::'.__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			if ($num)
+			{
+				$out = '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.'">';
+				$i = 0;
 
-                if ($useempty) $out .= '<option value="0">&nbsp;</option>';
-                while ($i < $num)
-                {
-                	$obj = $this->db->fetch_object($resql);
-                    $out .= '<option value="'.$obj->rowid.'"';
-                    if ($obj->rowid == $selected) $out .= ' selected';
-                    $out .= '>'.($maxlen ? dol_trunc($obj->type, $maxlen) : $obj->type);
+				if ($useempty) $out .= '<option value="0">&nbsp;</option>';
+				while ($i < $num)
+				{
+					$obj = $this->db->fetch_object($resql);
+					$out .= '<option value="'.$obj->rowid.'"';
+					if ($obj->rowid == $selected) $out .= ' selected';
+					$out .= '>'.($maxlen ? dol_trunc($obj->type, $maxlen) : $obj->type);
 					$out .= ' ('.$obj->range_account.')';
-                    $i++;
-                }
-                $out .= '</select>';
-                //if ($user->admin && $help) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-            } else {
-                $out .= $langs->trans("ErrorNoAccountingCategoryForThisCountry", $mysoc->country_code);
-            }
-        } else {
-        	dol_print_error($this->db);
-        }
+					$i++;
+				}
+				$out .= '</select>';
+				//if ($user->admin && $help) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			} else {
+				$out .= $langs->trans("ErrorNoAccountingCategoryForThisCountry", $mysoc->country_code);
+			}
+		} else {
+			dol_print_error($this->db);
+		}
 
-        $out .= ajax_combobox($htmlname, array());
+		$out .= ajax_combobox($htmlname, array());
 
-        print $out;
-    }
+		print $out;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return select filter with date of transaction
 	 *
@@ -220,13 +220,13 @@ class FormAccounting extends Form
 	 * @param string $selectedkey      Value
 	 * @return string                  HTML edit field
 	 */
-    public function select_bookkeeping_importkey($htmlname = 'importkey', $selectedkey = '')
-    {
-        // phpcs:enable
+	public function select_bookkeeping_importkey($htmlname = 'importkey', $selectedkey = '')
+	{
+		// phpcs:enable
 		$options = array();
 
 		$sql = 'SELECT DISTINCT import_key from '.MAIN_DB_PREFIX.'accounting_bookkeeping';
-	    $sql .= " WHERE entity IN (".getEntity('accountancy').")";
+		$sql .= " WHERE entity IN (".getEntity('accountancy').")";
 		$sql .= ' ORDER BY import_key DESC';
 
 		dol_syslog(get_class($this)."::select_bookkeeping_importkey", LOG_DEBUG);
@@ -245,7 +245,7 @@ class FormAccounting extends Form
 		return Form::selectarray($htmlname, $options, $selectedkey);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return list of accounts with label by chart of accounts
 	 *
@@ -261,47 +261,47 @@ class FormAccounting extends Form
 	 */
 	public function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $morecss = 'maxwidth300 maxwidthonsmartphone', $usecache = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 
 		$out = '';
 
-    	$options = array();
+		$options = array();
 
-    	if ($showempty == 2)
-    	{
-    		$options['0'] = '--- '.$langs->trans("None").' ---';
-    	}
+		if ($showempty == 2)
+		{
+			$options['0'] = '--- '.$langs->trans("None").' ---';
+		}
 
 		if ($usecache && !empty($this->options_cache[$usecache]))
 		{
-		    $options = $options + $this->options_cache[$usecache]; // We use + instead of array_merge because we don't want to reindex key from 0
-		    $selected = $selectid;
+			$options = $options + $this->options_cache[$usecache]; // We use + instead of array_merge because we don't want to reindex key from 0
+			$selected = $selectid;
 		} else {
-    		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT) ? 50 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT;
+			$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT) ? 50 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT;
 
-    		$sql = "SELECT DISTINCT aa.account_number, aa.label, aa.labelshort, aa.rowid, aa.fk_pcg_version";
-    		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as aa";
-    		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
-    		$sql .= " AND asy.rowid = ".$conf->global->CHARTOFACCOUNTS;
-    		$sql .= " AND aa.active = 1";
-    		$sql .= " AND aa.entity=".$conf->entity;
-    		$sql .= " ORDER BY aa.account_number";
+			$sql = "SELECT DISTINCT aa.account_number, aa.label, aa.labelshort, aa.rowid, aa.fk_pcg_version";
+			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as aa";
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+			$sql .= " AND asy.rowid = ".$conf->global->CHARTOFACCOUNTS;
+			$sql .= " AND aa.active = 1";
+			$sql .= " AND aa.entity=".$conf->entity;
+			$sql .= " ORDER BY aa.account_number";
 
-    		dol_syslog(get_class($this)."::select_account", LOG_DEBUG);
-    		$resql = $this->db->query($sql);
+			dol_syslog(get_class($this)."::select_account", LOG_DEBUG);
+			$resql = $this->db->query($sql);
 
-    		if (!$resql) {
-    			$this->error = "Error ".$this->db->lasterror();
-    			dol_syslog(get_class($this)."::select_account ".$this->error, LOG_ERR);
-    			return -1;
-    		}
+			if (!$resql) {
+				$this->error = "Error ".$this->db->lasterror();
+				dol_syslog(get_class($this)."::select_account ".$this->error, LOG_ERR);
+				return -1;
+			}
 
-    		$selected = $selectid; // selectid can be -1, 0, 123
-    		while ($obj = $this->db->fetch_object($resql))
-    		{
+			$selected = $selectid; // selectid can be -1, 0, 123
+			while ($obj = $this->db->fetch_object($resql))
+			{
 				if (empty($obj->labelshort))
 				{
 					$labeltoshow = $obj->label;
@@ -312,32 +312,32 @@ class FormAccounting extends Form
 				$label = length_accountg($obj->account_number).' - '.$labeltoshow;
 				$label = dol_trunc($label, $trunclength);
 
-    			$select_value_in = $obj->rowid;
-    			$select_value_out = $obj->rowid;
+				$select_value_in = $obj->rowid;
+				$select_value_out = $obj->rowid;
 
-    			// Try to guess if we have found default value
-    			if ($select_in == 1) {
-    				$select_value_in = $obj->account_number;
-    			}
-    			if ($select_out == 1) {
-    				$select_value_out = $obj->account_number;
-    			}
-    			// Remember guy's we store in database llx_facturedet the rowid of accounting_account and not the account_number
-    			// Because same account_number can be share between different accounting_system and do have the same meaning
-    			if ($selectid != '' && $selectid == $select_value_in) {
-    			    //var_dump("Found ".$selectid." ".$select_value_in);
-    				$selected = $select_value_out;
-    			}
+				// Try to guess if we have found default value
+				if ($select_in == 1) {
+					$select_value_in = $obj->account_number;
+				}
+				if ($select_out == 1) {
+					$select_value_out = $obj->account_number;
+				}
+				// Remember guy's we store in database llx_facturedet the rowid of accounting_account and not the account_number
+				// Because same account_number can be share between different accounting_system and do have the same meaning
+				if ($selectid != '' && $selectid == $select_value_in) {
+					//var_dump("Found ".$selectid." ".$select_value_in);
+					$selected = $select_value_out;
+				}
 
-    			$options[$select_value_out] = $label;
-    		}
-    		$this->db->free($resql);
+				$options[$select_value_out] = $label;
+			}
+			$this->db->free($resql);
 
-    		if ($usecache)
-    		{
-                $this->options_cache[$usecache] = $options;
-                unset($this->options_cache[$usecache]['0']);
-    		}
+			if ($usecache)
+			{
+				$this->options_cache[$usecache] = $options;
+				unset($this->options_cache[$usecache]['0']);
+			}
 		}
 
 		$out .= Form::selectarray($htmlname, $options, $selected, ($showempty > 0 ? 1 : 0), 0, 0, '', 0, 0, 0, '', $morecss, 1);
@@ -345,7 +345,7 @@ class FormAccounting extends Form
 		return $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return list of auxilary thirdparty accounts
 	 *
@@ -355,16 +355,16 @@ class FormAccounting extends Form
 	 * @param string   $morecss        More css
 	 * @return string                  String with HTML select
 	 */
-    public function select_auxaccount($selectid, $htmlname = 'account_num_aux', $showempty = 0, $morecss = 'maxwidth200')
-    {
-        // phpcs:enable
+	public function select_auxaccount($selectid, $htmlname = 'account_num_aux', $showempty = 0, $morecss = 'maxwidth200')
+	{
+		// phpcs:enable
 
 		$aux_account = array();
 
 		// Auxiliary customer account
 		$sql = "SELECT DISTINCT code_compta, nom ";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
-	    $sql .= " WHERE entity IN (".getEntity('societe').")";
+		$sql .= " WHERE entity IN (".getEntity('societe').")";
 		$sql .= " ORDER BY code_compta";
 
 		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
@@ -402,25 +402,25 @@ class FormAccounting extends Form
 		}
 		$this->db->free($resql);
 
-        // Auxiliary user account
-        $sql = "SELECT DISTINCT accountancy_code, lastname, firstname ";
-        $sql .= " FROM ".MAIN_DB_PREFIX."user";
-        $sql .= " WHERE entity IN (".getEntity('user').")";
-        $sql .= " ORDER BY accountancy_code";
-        dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            while ($obj = $this->db->fetch_object($resql)) {
-                if (!empty($obj->accountancy_code)) {
-                    $aux_account[$obj->accountancy_code] = $obj->accountancy_code.' ('.dolGetFirstLastname($obj->firstname, $obj->lastname).')';
-                }
-            }
-        } else {
-            $this->error = "Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::select_auxaccount ".$this->error, LOG_ERR);
-            return -1;
-        }
-        $this->db->free($resql);
+		// Auxiliary user account
+		$sql = "SELECT DISTINCT accountancy_code, lastname, firstname ";
+		$sql .= " FROM ".MAIN_DB_PREFIX."user";
+		$sql .= " WHERE entity IN (".getEntity('user').")";
+		$sql .= " ORDER BY accountancy_code";
+		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				if (!empty($obj->accountancy_code)) {
+					$aux_account[$obj->accountancy_code] = $obj->accountancy_code.' ('.dolGetFirstLastname($obj->firstname, $obj->lastname).')';
+				}
+			}
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::select_auxaccount ".$this->error, LOG_ERR);
+			return -1;
+		}
+		$this->db->free($resql);
 
 		// Build select
 		$out .= Form::selectarray($htmlname, $aux_account, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
@@ -428,7 +428,7 @@ class FormAccounting extends Form
 		return $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return HTML combo list of years existing into book keepping
 	 *
@@ -440,14 +440,14 @@ class FormAccounting extends Form
 	 */
 	public function selectyear_accountancy_bookkepping($selected = '', $htmlname = 'yearid', $useempty = 0, $output_format = 'html')
 	{
-        // phpcs:enable
-	    global $conf;
+		// phpcs:enable
+		global $conf;
 
 		$out_array = array();
 
 		$sql = "SELECT DISTINCT date_format(doc_date, '%Y') as dtyear";
 		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
-	    $sql .= " WHERE entity IN (".getEntity('accountancy').")";
+		$sql .= " WHERE entity IN (".getEntity('accountancy').")";
 		$sql .= " ORDER BY date_format(doc_date, '%Y')";
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 54406b1075b..843c9ec759f 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -233,13 +233,15 @@ class FormActions
 					if ($max && $cursorevent >= $max) break;
 
 					$ref = $actioncomm->getNomUrl(1, -1);
-					$label = $actioncomm->getNomUrl(0, 38);
+					$label = $actioncomm->getNomUrl(0, 36);
 
 					print '<tr class="oddeven">';
+
 					// Ref
 					print '<td class="nowraponall">'.$ref.'</td>';
+
 					// Onwer
-					print '<td class="tdoverflowmax150">';
+					print '<td class="nowraponall tdoverflowmax125">';
 					if (!empty($actioncomm->userownerid))
 					{
 						if (is_object($cacheusers[$actioncomm->userownerid]))
@@ -266,13 +268,13 @@ class FormActions
 						if ($actioncomm->type_picto) {
 							$imgpicto = img_picto('', $actioncomm->type_picto);
 						} else {
-							if ($actioncomm->type_code == 'AC_RDV')         $imgpicto = img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($actioncomm->type_code == 'AC_TEL')     $imgpicto = img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($actioncomm->type_code == 'AC_FAX')     $imgpicto = img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($actioncomm->type_code == 'AC_EMAIL')   $imgpicto = img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($actioncomm->type_code == 'AC_INT')     $imgpicto = img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($actioncomm->type_code == 'AC_OTH' && $actioncomm->code == 'TICKET_MSG') $imgpicto = img_picto('', 'object_conversation', '', false, 0, 0, '', 'paddingright').' ';
-							elseif (!preg_match('/_AUTO/', $actioncomm->type_code)) $imgpicto = img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';
+							if ($actioncomm->type_code == 'AC_RDV')         $imgpicto = img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright');
+							elseif ($actioncomm->type_code == 'AC_TEL')     $imgpicto = img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright');
+							elseif ($actioncomm->type_code == 'AC_FAX')     $imgpicto = img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright');
+							elseif ($actioncomm->type_code == 'AC_EMAIL')   $imgpicto = img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright');
+							elseif ($actioncomm->type_code == 'AC_INT')     $imgpicto = img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright');
+							elseif ($actioncomm->type_code == 'AC_OTH' && $actioncomm->code == 'TICKET_MSG') $imgpicto = img_picto('', 'object_conversation', '', false, 0, 0, '', 'paddingright');
+							elseif (!preg_match('/_AUTO/', $actioncomm->type_code)) $imgpicto = img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright');
 						}
 					}
 					print $imgpicto;
@@ -282,8 +284,10 @@ class FormActions
 						print $actioncomm->type_short ? $actioncomm->type_short : $actioncomm->type;
 					}
 					print '</td>';
+
 					// Label
 					print '<td>'.$label.'</td>';
+
 					// Date
 					print '<td class="center">'.dol_print_date($actioncomm->datep, 'dayhour', 'tzuserrel');
 					if ($actioncomm->datef)
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index b53d73bc757..3e8eb04c430 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -29,40 +29,40 @@
  */
 class FormAdmin
 {
-    public $db;
-    public $error;
+	public $db;
+	public $error;
 
 
 	/**
 	 *  Constructor
-     *
-     *  @param      DoliDB      $db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	 *
+	 *  @param      DoliDB      $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return html select list with available languages (key='en_US', value='United States' for example)
-     *
-     *  @param      string		$selected       Language pre-selected
-     *  @param      string		$htmlname       Name of HTML select
-     *  @param      int			$showauto       Show 'auto' choice
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return html select list with available languages (key='en_US', value='United States' for example)
+	 *
+	 *  @param      string		$selected       Language pre-selected
+	 *  @param      string		$htmlname       Name of HTML select
+	 *  @param      int			$showauto       Show 'auto' choice
 	 *  @param      array		$filter         Array of keys to exclude in list (opposite of $onlykeys)
-	 *  @param		string		$showempty		'1'=Add empty value or string to show
+	 *  @param		string		$showempty		'1'=Add empty value or 'string to show'
 	 *  @param      int			$showwarning    Show a warning if language is not complete
 	 *  @param		int			$disabled		Disable edit of select
 	 *  @param		string		$morecss		Add more css styles
 	 *  @param      int         $showcode       1=Add language code into label at begining, 2=Add language code into label at end
-     *  @param		int			$forcecombo		Force to use combo box (so no ajax beautify effect)
-     *  @param		int			$multiselect	Make the combo a multiselect
-     *  @param		array		$onlykeys		Show only the following keys (opposite of $filter). Example array('fr', 'es', ...)
-     *  @param		int			$mainlangonly	1=Show only main languages ('fr_FR' no' fr_BE', 'es_ES' not 'es_MX', ...)
-     *  @return		string						Return HTML select string with list of languages
-     */
-    public function select_language($selected = '', $htmlname = 'lang_id', $showauto = 0, $filter = null, $showempty = '', $showwarning = 0, $disabled = 0, $morecss = '', $showcode = 0, $forcecombo = 0, $multiselect = 0, $onlykeys = null, $mainlangonly = 0)
+	 *  @param		int			$forcecombo		Force to use combo box (so no ajax beautify effect)
+	 *  @param		int			$multiselect	Make the combo a multiselect
+	 *  @param		array		$onlykeys		Array of language keys to restrict list with the following keys (opposite of $filter). Example array('fr', 'es', ...)
+	 *  @param		int			$mainlangonly	1=Show only main languages ('fr_FR' no' fr_BE', 'es_ES' not 'es_MX', ...)
+	 *  @return		string						Return HTML select string with list of languages
+	 */
+	public function select_language($selected = '', $htmlname = 'lang_id', $showauto = 0, $filter = null, $showempty = '', $showwarning = 0, $disabled = 0, $morecss = '', $showcode = 0, $forcecombo = 0, $multiselect = 0, $onlykeys = null, $mainlangonly = 0)
 	{
 		// phpcs:enable
 		global $conf, $langs;
@@ -95,10 +95,13 @@ class FormAdmin
 		foreach ($langs_available as $key => $value)
 		{
 			$valuetoshow = $value;
-			if ($showcode == 1) $valuetoshow = $key.' - '.$value;
+			if ($showcode == 1) {
+				if ($mainlangonly) $valuetoshow = '<span class="opacitymedium">'.preg_replace('/[_-].*$/', '', $key).'</span> - '.$value;
+				else $valuetoshow = '<span class="opacitymedium">'.$key.'</span> - '.$value;
+			}
 			if ($showcode == 2) {
-				if ($mainlangonly) $valuetoshow = $value.' ('.preg_replace('/[_-].*$/', '', $key).')';
-				else $valuetoshow = $value.' ('.$key.')';
+				if ($mainlangonly) $valuetoshow = $value.' <span class="opacitymedium">('.preg_replace('/[_-].*$/', '', $key).')</span>';
+				else $valuetoshow = $value.' <span class="opacitymedium">('.$key.')</span>';
 			}
 
 			$keytouse = $key;
@@ -111,11 +114,11 @@ class FormAdmin
 				continue;
 			}
 
-			if ($selected == $keytouse)
-			{
-				$out .= '<option value="'.$keytouse.'" selected>'.$valuetoshow.'</option>';
+			$valuetoshow .= ' '.picto_from_langcode($key, 'class="saturatemedium"');
+			if ($selected == $keytouse) {
+				$out .= '<option value="'.$keytouse.'" selected data-html="'.dol_escape_htmltag($valuetoshow).'">'.$valuetoshow.'</option>';
 			} else {
-				$out .= '<option value="'.$keytouse.'">'.$valuetoshow.'</option>';
+				$out .= '<option value="'.$keytouse.'" data-html="'.dol_escape_htmltag($valuetoshow).'">'.$valuetoshow.'</option>';
 			}
 		}
 		$out .= '</select>';
@@ -130,73 +133,73 @@ class FormAdmin
 		return $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Return list of available menus (eldy_backoffice, ...)
-     *
-     *    @param	string		$selected        Preselected menu value
-     *    @param    string		$htmlname        Name of html select
-     *    @param    array		$dirmenuarray    Array of directories to scan
-     *    @param    string		$moreattrib      More attributes on html select tag
-     *    @return	integer|null
-     */
-    public function select_menu($selected, $htmlname, $dirmenuarray, $moreattrib = '')
-    {
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Return list of available menus (eldy_backoffice, ...)
+	 *
+	 *    @param	string		$selected        Preselected menu value
+	 *    @param    string		$htmlname        Name of html select
+	 *    @param    array		$dirmenuarray    Array of directories to scan
+	 *    @param    string		$moreattrib      More attributes on html select tag
+	 *    @return	integer|null
+	 */
+	public function select_menu($selected, $htmlname, $dirmenuarray, $moreattrib = '')
+	{
 		// phpcs:enable
-        global $langs, $conf;
+		global $langs, $conf;
 
-        // Clean parameters
+		// Clean parameters
 
 
-        // Check parameters
-        if (!is_array($dirmenuarray)) return -1;
+		// Check parameters
+		if (!is_array($dirmenuarray)) return -1;
 
 		$menuarray = array();
-        foreach ($conf->file->dol_document_root as $dirroot)
-        {
-            foreach ($dirmenuarray as $dirtoscan)
-            {
-                $dir = $dirroot.$dirtoscan;
-                //print $dir.'<br>';
-                if (is_dir($dir))
-                {
-    	            $handle = opendir($dir);
-    	            if (is_resource($handle))
-    	            {
-    	                while (($file = readdir($handle)) !== false)
-    	                {
-    	                    if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && substr($file, 0, 5) != 'index')
-    	                    {
-    	                        if (preg_match('/lib\.php$/i', $file)) continue; // We exclude library files
-    	                        if (preg_match('/eldy_(backoffice|frontoffice)\.php$/i', $file)) continue; // We exclude all menu manager files
-    	                        if (preg_match('/auguria_(backoffice|frontoffice)\.php$/i', $file)) continue; // We exclude all menu manager files
-    	                        if (preg_match('/smartphone_(backoffice|frontoffice)\.php$/i', $file)) continue; // We exclude all menu manager files
+		foreach ($conf->file->dol_document_root as $dirroot)
+		{
+			foreach ($dirmenuarray as $dirtoscan)
+			{
+				$dir = $dirroot.$dirtoscan;
+				//print $dir.'<br>';
+				if (is_dir($dir))
+				{
+					$handle = opendir($dir);
+					if (is_resource($handle))
+					{
+						while (($file = readdir($handle)) !== false)
+						{
+							if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && substr($file, 0, 5) != 'index')
+							{
+								if (preg_match('/lib\.php$/i', $file)) continue; // We exclude library files
+								if (preg_match('/eldy_(backoffice|frontoffice)\.php$/i', $file)) continue; // We exclude all menu manager files
+								if (preg_match('/auguria_(backoffice|frontoffice)\.php$/i', $file)) continue; // We exclude all menu manager files
+								if (preg_match('/smartphone_(backoffice|frontoffice)\.php$/i', $file)) continue; // We exclude all menu manager files
 
-    	                        $filelib = preg_replace('/\.php$/i', '', $file);
-    	        				$prefix = '';
-    	        				// 0=Recommanded, 1=Experimental, 2=Developpement, 3=Other
-    	        				if (preg_match('/^eldy/i', $file)) $prefix = '0';
-                                elseif (preg_match('/^smartphone/i', $file)) $prefix = '2';
-    	        				else $prefix = '3';
+								$filelib = preg_replace('/\.php$/i', '', $file);
+								$prefix = '';
+								// 0=Recommanded, 1=Experimental, 2=Developpement, 3=Other
+								if (preg_match('/^eldy/i', $file)) $prefix = '0';
+								elseif (preg_match('/^smartphone/i', $file)) $prefix = '2';
+								else $prefix = '3';
 
-    	                        if ($file == $selected)
-    	                        {
-    	        					$menuarray[$prefix.'_'.$file] = '<option value="'.$file.'" selected>'.$filelib.'</option>';
-    	                        } else {
-    	                            $menuarray[$prefix.'_'.$file] = '<option value="'.$file.'">'.$filelib.'</option>';
-    	                        }
-    	                    }
-    	                }
-    	                closedir($handle);
-    	            }
-                }
-            }
-        }
+								if ($file == $selected)
+								{
+									$menuarray[$prefix.'_'.$file] = '<option value="'.$file.'" selected>'.$filelib.'</option>';
+								} else {
+									$menuarray[$prefix.'_'.$file] = '<option value="'.$file.'">'.$filelib.'</option>';
+								}
+							}
+						}
+						closedir($handle);
+					}
+				}
+			}
+		}
 		ksort($menuarray);
 
 		// Output combo list of menus
-        print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
-        $oldprefix = '';
+		print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
+		$oldprefix = '';
 		foreach ($menuarray as $key => $val)
 		{
 			$tab = explode('_', $key);
@@ -208,7 +211,7 @@ class FormAdmin
 				// Affiche titre
 				print '<option value="-1" disabled>';
 				if ($newprefix == '0') print '-- '.$langs->trans("VersionRecommanded").' --';
-                if ($newprefix == '1') print '-- '.$langs->trans("VersionExperimental").' --';
+				if ($newprefix == '1') print '-- '.$langs->trans("VersionExperimental").' --';
 				if ($newprefix == '2') print '-- '.$langs->trans("VersionDevelopment").' --';
 				if ($newprefix == '3') print '-- '.$langs->trans("Other").' --';
 				print '</option>';
@@ -217,69 +220,69 @@ class FormAdmin
 			print $val."\n"; // Show menu entry
 		}
 		print '</select>';
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return combo list of available menu families
-     *
-     *  @param	string		$selected        Menu pre-selected
-     *  @param	string		$htmlname        Name of html select
-     *  @param	string[]	$dirmenuarray    Directories to scan
-     *  @return	void
-     */
-    public function select_menu_families($selected, $htmlname, $dirmenuarray)
-    {
-        // phpcs:enable
-        global $langs, $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return combo list of available menu families
+	 *
+	 *  @param	string		$selected        Menu pre-selected
+	 *  @param	string		$htmlname        Name of html select
+	 *  @param	string[]	$dirmenuarray    Directories to scan
+	 *  @return	void
+	 */
+	public function select_menu_families($selected, $htmlname, $dirmenuarray)
+	{
+		// phpcs:enable
+		global $langs, $conf;
 
-        //$expdevmenu=array('smartphone_backoffice.php','smartphone_frontoffice.php');  // Menu to disable if $conf->global->MAIN_FEATURES_LEVEL is not set
-        $expdevmenu = array();
+		//$expdevmenu=array('smartphone_backoffice.php','smartphone_frontoffice.php');  // Menu to disable if $conf->global->MAIN_FEATURES_LEVEL is not set
+		$expdevmenu = array();
 
 		$menuarray = array();
 
 		foreach ($dirmenuarray as $dirmenu)
 		{
-            foreach ($conf->file->dol_document_root as $dirroot)
-            {
-                $dir = $dirroot.$dirmenu;
-                if (is_dir($dir))
-                {
-	                $handle = opendir($dir);
-	                if (is_resource($handle))
-	                {
-	        			while (($file = readdir($handle)) !== false)
-	        			{
-	        				if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
-	        				{
-	        					$filelib = preg_replace('/(_backoffice|_frontoffice)?\.php$/i', '', $file);
-	        					if (preg_match('/^index/i', $filelib)) continue;
-	        					if (preg_match('/^default/i', $filelib)) continue;
-	        					if (preg_match('/^empty/i', $filelib)) continue;
-	        					if (preg_match('/\.lib/i', $filelib)) continue;
-	        					if (empty($conf->global->MAIN_FEATURES_LEVEL) && in_array($file, $expdevmenu)) continue;
+			foreach ($conf->file->dol_document_root as $dirroot)
+			{
+				$dir = $dirroot.$dirmenu;
+				if (is_dir($dir))
+				{
+					$handle = opendir($dir);
+					if (is_resource($handle))
+					{
+						while (($file = readdir($handle)) !== false)
+						{
+							if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
+							{
+								$filelib = preg_replace('/(_backoffice|_frontoffice)?\.php$/i', '', $file);
+								if (preg_match('/^index/i', $filelib)) continue;
+								if (preg_match('/^default/i', $filelib)) continue;
+								if (preg_match('/^empty/i', $filelib)) continue;
+								if (preg_match('/\.lib/i', $filelib)) continue;
+								if (empty($conf->global->MAIN_FEATURES_LEVEL) && in_array($file, $expdevmenu)) continue;
 
-	        					$menuarray[$filelib] = 1;
-	        				}
-	        				$menuarray['all'] = 1;
-	        			}
-	        			closedir($handle);
-	                }
-                }
-            }
+								$menuarray[$filelib] = 1;
+							}
+							$menuarray['all'] = 1;
+						}
+						closedir($handle);
+					}
+				}
+			}
 		}
 
 		ksort($menuarray);
 
 		// Affichage liste deroulante des menus
-        print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
-        $oldprefix = '';
+		print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
+		$oldprefix = '';
 		foreach ($menuarray as $key => $val)
 		{
 			$tab = explode('_', $key);
 			$newprefix = $tab[0];
 			print '<option value="'.$key.'"';
-            if ($key == $selected)
+			if ($key == $selected)
 			{
 				print '	selected';
 			}
@@ -289,26 +292,26 @@ class FormAdmin
 			print '</option>'."\n";
 		}
 		print '</select>';
-    }
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return a HTML select list of timezones
-     *
-     *  @param	string		$selected        Menu pre-selectionnee
-     *  @param  string		$htmlname        Nom de la zone select
-     *  @return	void
-     */
-    public function select_timezone($selected, $htmlname)
-    {
-        // phpcs:enable
-        global $langs, $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return a HTML select list of timezones
+	 *
+	 *  @param	string		$selected        Menu pre-selectionnee
+	 *  @param  string		$htmlname        Nom de la zone select
+	 *  @return	void
+	 */
+	public function select_timezone($selected, $htmlname)
+	{
+		// phpcs:enable
+		global $langs, $conf;
 
-        print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
-        print '<option value="-1">&nbsp;</option>';
+		print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
+		print '<option value="-1">&nbsp;</option>';
 
-        $arraytz = array(
+		$arraytz = array(
 			"Pacific/Midway"=>"GMT-11:00",
 			"Pacific/Fakaofo"=>"GMT-10:00",
 			"America/Anchorage"=>"GMT-09:00",
@@ -335,17 +338,17 @@ class FormAdmin
 			"Pacific/Auckland"=>"GMT+12:00",
 			"Pacific/Enderbury"=>"GMT+13:00"
 		);
-        foreach ($arraytz as $lib => $gmt) {
-            print '<option value="'.$lib.'"';
-            if ($selected == $lib || $selected == $gmt) print ' selected';
-            print '>'.$gmt.'</option>'."\n";
-        }
-        print '</select>';
-    }
+		foreach ($arraytz as $lib => $gmt) {
+			print '<option value="'.$lib.'"';
+			if ($selected == $lib || $selected == $gmt) print ' selected';
+			print '>'.$gmt.'</option>'."\n";
+		}
+		print '</select>';
+	}
 
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return html select list with available languages (key='en_US', value='United States' for example)
 	 *
@@ -365,23 +368,23 @@ class FormAdmin
 		$sql = "SELECT code, label, width, height, unit";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_paper_format";
 		$sql .= " WHERE active=1";
-        if ($filter) $sql .= " AND code LIKE '%".$this->db->escape($filter)."%'";
+		if ($filter) $sql .= " AND code LIKE '%".$this->db->escape($filter)."%'";
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $num = $this->db->num_rows($resql);
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($resql);
-                $unitKey = $langs->trans('SizeUnit'.$obj->unit);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
+				$unitKey = $langs->trans('SizeUnit'.$obj->unit);
 
-                $paperformat[$obj->code] = $langs->trans('PaperFormat'.strtoupper($obj->code)).' - '.round($obj->width).'x'.round($obj->height).' '.($unitKey == 'SizeUnit'.$obj->unit ? $obj->unit : $unitKey);
+				$paperformat[$obj->code] = $langs->trans('PaperFormat'.strtoupper($obj->code)).' - '.round($obj->width).'x'.round($obj->height).' '.($unitKey == 'SizeUnit'.$obj->unit ? $obj->unit : $unitKey);
 
-                $i++;
-            }
-        } else {
+				$i++;
+			}
+		} else {
 			dol_print_error($this->db);
 			return '';
 		}
@@ -396,7 +399,7 @@ class FormAdmin
 		}
 		foreach ($paperformat as $key => $value)
 		{
-            if ($selected == $key)
+			if ($selected == $key)
 			{
 				$out .= '<option value="'.$key.'" selected>'.$value.'</option>';
 			} else {
diff --git a/htdocs/core/class/html.formbank.class.php b/htdocs/core/class/html.formbank.class.php
index a359bd194f7..9d50a0bb60b 100644
--- a/htdocs/core/class/html.formbank.class.php
+++ b/htdocs/core/class/html.formbank.class.php
@@ -31,40 +31,40 @@ include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
  */
 class FormBank
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
 
-    /**
-     * Constructor
-     *
-     * @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
-    /**
-     *  Retourne la liste des types de comptes financiers
-     *
-     *  @param	integer	$selected        Type pre-selectionne
-     *  @param  string	$htmlname        Nom champ formulaire
-     *  @return	void
-     */
-    public function selectTypeOfBankAccount($selected = Account::TYPE_CURRENT, $htmlname = 'type')
-    {
-        $account = new Account($this->db);
+	/**
+	 *  Retourne la liste des types de comptes financiers
+	 *
+	 *  @param	integer	$selected        Type pre-selectionne
+	 *  @param  string	$htmlname        Nom champ formulaire
+	 *  @return	void
+	 */
+	public function selectTypeOfBankAccount($selected = Account::TYPE_CURRENT, $htmlname = 'type')
+	{
+		$account = new Account($this->db);
 
-        print Form::selectarray($htmlname, $account->type_lib, $selected);
-    }
+		print Form::selectarray($htmlname, $account->type_lib, $selected);
+	}
 
 	/**
 	 * Returns the name of the Iban label. India uses 'IFSC' and the rest of the world 'IBAN' name.
diff --git a/htdocs/core/class/html.formbarcode.class.php b/htdocs/core/class/html.formbarcode.class.php
index 104daf6de0e..52d4c795c85 100644
--- a/htdocs/core/class/html.formbarcode.class.php
+++ b/htdocs/core/class/html.formbarcode.class.php
@@ -29,198 +29,198 @@
  */
 class FormBarCode
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB		$db		Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB		$db		Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *	Return HTML select with list of bar code generators
-     *
-     *  @param	int		$selected       Id code pre-selected
-     *  @param 	array	$barcodelist	Array of barcodes generators
-     *  @param  int		$code_id        Id du code barre
-     *  @param  int		$idForm			Id du formulaire
-     * 	@return	string					HTML select string
-     */
-    public function setBarcodeEncoder($selected, $barcodelist, $code_id, $idForm = 'formbarcode')
-    {
-        global $conf, $langs;
+	/**
+	 *	Return HTML select with list of bar code generators
+	 *
+	 *  @param	int		$selected       Id code pre-selected
+	 *  @param 	array	$barcodelist	Array of barcodes generators
+	 *  @param  int		$code_id        Id du code barre
+	 *  @param  int		$idForm			Id du formulaire
+	 * 	@return	string					HTML select string
+	 */
+	public function setBarcodeEncoder($selected, $barcodelist, $code_id, $idForm = 'formbarcode')
+	{
+		global $conf, $langs;
 
-        $disable = '';
+		$disable = '';
 
-        if (!empty($conf->use_javascript_ajax))
-        {
-            print "\n".'<script type="text/javascript" language="javascript">';
-            print 'jQuery(document).ready(function () {
+		if (!empty($conf->use_javascript_ajax))
+		{
+			print "\n".'<script type="text/javascript" language="javascript">';
+			print 'jQuery(document).ready(function () {
                         jQuery("#select'.$idForm.'").change(function() {
                             var formName = document.getElementById("form'.$idForm.'");
                             formName.action.value="setcoder";
                             formName.submit();
                         });
                });';
-            print '</script>'."\n";
-            //onChange="barcode_coder_save(\''.$idForm.'\')
-        }
+			print '</script>'."\n";
+			//onChange="barcode_coder_save(\''.$idForm.'\')
+		}
 
-        // We check if barcode is already selected by default
-        if (((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE == $code_id) ||
-        (!empty($conf->societe->enabled) && $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY == $code_id))
-        {
-            $disable = 'disabled';
-        }
+		// We check if barcode is already selected by default
+		if (((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE == $code_id) ||
+		(!empty($conf->societe->enabled) && $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY == $code_id))
+		{
+			$disable = 'disabled';
+		}
 
-        if (!empty($conf->use_javascript_ajax))
-        {
-            $select_encoder = '<form action="'.DOL_URL_ROOT.'/admin/barcode.php" method="POST" id="form'.$idForm.'">';
-            $select_encoder .= '<input type="hidden" name="token" value="'.newToken().'">';
-            $select_encoder .= '<input type="hidden" name="action" value="update">';
-            $select_encoder .= '<input type="hidden" name="code_id" value="'.$code_id.'">';
-        }
+		if (!empty($conf->use_javascript_ajax))
+		{
+			$select_encoder = '<form action="'.DOL_URL_ROOT.'/admin/barcode.php" method="POST" id="form'.$idForm.'">';
+			$select_encoder .= '<input type="hidden" name="token" value="'.newToken().'">';
+			$select_encoder .= '<input type="hidden" name="action" value="update">';
+			$select_encoder .= '<input type="hidden" name="code_id" value="'.$code_id.'">';
+		}
 
-        $selectname = (!empty($conf->use_javascript_ajax) ? 'coder' : 'coder'.$code_id);
-        $select_encoder .= '<select id="select'.$idForm.'" class="flat" name="'.$selectname.'">';
-        $select_encoder .= '<option value="0"'.($selected == 0 ? ' selected' : '').' '.$disable.'>'.$langs->trans('Disable').'</option>';
-        $select_encoder .= '<option value="-1" disabled>--------------------</option>';
-        foreach ($barcodelist as $key => $value)
-        {
-            $select_encoder .= '<option value="'.$key.'"'.($selected == $key ? ' selected' : '').'>'.$value.'</option>';
-        }
-        $select_encoder .= '</select>';
+		$selectname = (!empty($conf->use_javascript_ajax) ? 'coder' : 'coder'.$code_id);
+		$select_encoder .= '<select id="select'.$idForm.'" class="flat" name="'.$selectname.'">';
+		$select_encoder .= '<option value="0"'.($selected == 0 ? ' selected' : '').' '.$disable.'>'.$langs->trans('Disable').'</option>';
+		$select_encoder .= '<option value="-1" disabled>--------------------</option>';
+		foreach ($barcodelist as $key => $value)
+		{
+			$select_encoder .= '<option value="'.$key.'"'.($selected == $key ? ' selected' : '').'>'.$value.'</option>';
+		}
+		$select_encoder .= '</select>';
 
-        if (!empty($conf->use_javascript_ajax))
-        {
-            $select_encoder .= '</form>';
-        }
+		if (!empty($conf->use_javascript_ajax))
+		{
+			$select_encoder .= '</form>';
+		}
 
-        return $select_encoder;
-    }
+		return $select_encoder;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Print form to select type of barcode
-     *
-     *  @param  int     $selected          Id code pre-selected
-     *  @param  string  $htmlname          Name of HTML select field
-     *  @param  int     $useempty          Affiche valeur vide dans liste
-     *  @return void
-     *  @deprecated
-     */
-    public function select_barcode_type($selected = '', $htmlname = 'barcodetype_id', $useempty = 0)
-    {
-        // phpcs:enable
-        print $this->selectBarcodeType($selected, $htmlname, $useempty);
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Print form to select type of barcode
+	 *
+	 *  @param  int     $selected          Id code pre-selected
+	 *  @param  string  $htmlname          Name of HTML select field
+	 *  @param  int     $useempty          Affiche valeur vide dans liste
+	 *  @return void
+	 *  @deprecated
+	 */
+	public function select_barcode_type($selected = '', $htmlname = 'barcodetype_id', $useempty = 0)
+	{
+		// phpcs:enable
+		print $this->selectBarcodeType($selected, $htmlname, $useempty);
+	}
 
-    /**
-     *  Return html form to select type of barcode
-     *
-     *  @param  int     $selected          Id code pre-selected
-     *  @param  string  $htmlname          Name of HTML select field
-     *  @param  int     $useempty          Display empty value in select
-     *  @return string
-     */
-    public function selectBarcodeType($selected = '', $htmlname = 'barcodetype_id', $useempty = 0)
-    {
-        global $langs, $conf;
+	/**
+	 *  Return html form to select type of barcode
+	 *
+	 *  @param  int     $selected          Id code pre-selected
+	 *  @param  string  $htmlname          Name of HTML select field
+	 *  @param  int     $useempty          Display empty value in select
+	 *  @return string
+	 */
+	public function selectBarcodeType($selected = '', $htmlname = 'barcodetype_id', $useempty = 0)
+	{
+		global $langs, $conf;
 
-        $out = '';
+		$out = '';
 
-        $sql = "SELECT rowid, code, libelle";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
-        $sql .= " WHERE coder <> '0'";
-        $sql .= " AND entity = ".$conf->entity;
-        $sql .= " ORDER BY code";
+		$sql = "SELECT rowid, code, libelle";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
+		$sql .= " WHERE coder <> '0'";
+		$sql .= " AND entity = ".$conf->entity;
+		$sql .= " ORDER BY code";
 
-        $result = $this->db->query($sql);
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $i = 0;
+		$result = $this->db->query($sql);
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$i = 0;
 
-            if ($useempty && $num > 0) {
-                $out .= '<select class="flat minwidth75imp" name="'.$htmlname.'" id="select_'.$htmlname.'">';
-                $out .= '<option value="0">&nbsp;</option>';
-            } else {
-                $langs->load("errors");
-                $out .= '<select disabled class="flat minwidth75imp" name="'.$htmlname.'" id="select_'.$htmlname.'">';
-                $out .= '<option value="0" selected>'.$langs->trans('ErrorNoActivatedBarcode').'</option>';
-            }
+			if ($useempty && $num > 0) {
+				$out .= '<select class="flat minwidth75imp" name="'.$htmlname.'" id="select_'.$htmlname.'">';
+				$out .= '<option value="0">&nbsp;</option>';
+			} else {
+				$langs->load("errors");
+				$out .= '<select disabled class="flat minwidth75imp" name="'.$htmlname.'" id="select_'.$htmlname.'">';
+				$out .= '<option value="0" selected>'.$langs->trans('ErrorNoActivatedBarcode').'</option>';
+			}
 
-            while ($i < $num) {
-                $obj = $this->db->fetch_object($result);
-                if ($selected == $obj->rowid) {
-                    $out .= '<option value="'.$obj->rowid.'" selected>';
-                } else {
-                    $out .= '<option value="'.$obj->rowid.'">';
-                }
-                $out .= $obj->libelle;
-                $out .= '</option>';
-                $i++;
-            }
-            $out .= "</select>";
-            $out .= ajax_combobox("select_".$htmlname);
-        } else {
-            dol_print_error($this->db);
-        }
-        return $out;
-    }
+			while ($i < $num) {
+				$obj = $this->db->fetch_object($result);
+				if ($selected == $obj->rowid) {
+					$out .= '<option value="'.$obj->rowid.'" selected>';
+				} else {
+					$out .= '<option value="'.$obj->rowid.'">';
+				}
+				$out .= $obj->libelle;
+				$out .= '</option>';
+				$i++;
+			}
+			$out .= "</select>";
+			$out .= ajax_combobox("select_".$htmlname);
+		} else {
+			dol_print_error($this->db);
+		}
+		return $out;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Show form to select type of barcode
-     *
-     *  @param  string		$page        	Page
-     *  @param  int			$selected    	Id condition preselected
-     *  @param  string		$htmlname    	Nom du formulaire select
-     *  @return	void
-     *  @deprecated
-     */
-    public function form_barcode_type($page, $selected = '', $htmlname = 'barcodetype_id')
-    {
-        // phpcs:enable
-        print $this->formBarcodeType($page, $selected, $htmlname);
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Show form to select type of barcode
+	 *
+	 *  @param  string		$page        	Page
+	 *  @param  int			$selected    	Id condition preselected
+	 *  @param  string		$htmlname    	Nom du formulaire select
+	 *  @return	void
+	 *  @deprecated
+	 */
+	public function form_barcode_type($page, $selected = '', $htmlname = 'barcodetype_id')
+	{
+		// phpcs:enable
+		print $this->formBarcodeType($page, $selected, $htmlname);
+	}
 
-    /**
-     *  Return html form to select type of barcode
-     *
-     *  @param  string      $page           Page
-     *  @param  int         $selected       Id condition preselected
-     *  @param  string      $htmlname       Nom du formulaire select
-     *  @return string
-     */
-    public function formBarcodeType($page, $selected = '', $htmlname = 'barcodetype_id')
-    {
-        global $langs, $conf;
-        $out = '';
-        if ($htmlname != "none") {
-            $out .= '<form method="post" action="'.$page.'">';
-            $out .= '<input type="hidden" name="token" value="'.newToken().'">';
-            $out .= '<input type="hidden" name="action" value="set'.$htmlname.'">';
-            $out .= '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
-            $out .= '<tr><td>';
-            $out .= $this->selectBarcodeType($selected, $htmlname, 1);
-            $out .= '</td>';
-            $out .= '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-            $out .= '</td></tr></table></form>';
-        }
-        return $out;
-    }
+	/**
+	 *  Return html form to select type of barcode
+	 *
+	 *  @param  string      $page           Page
+	 *  @param  int         $selected       Id condition preselected
+	 *  @param  string      $htmlname       Nom du formulaire select
+	 *  @return string
+	 */
+	public function formBarcodeType($page, $selected = '', $htmlname = 'barcodetype_id')
+	{
+		global $langs, $conf;
+		$out = '';
+		if ($htmlname != "none") {
+			$out .= '<form method="post" action="'.$page.'">';
+			$out .= '<input type="hidden" name="token" value="'.newToken().'">';
+			$out .= '<input type="hidden" name="action" value="set'.$htmlname.'">';
+			$out .= '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+			$out .= '<tr><td>';
+			$out .= $this->selectBarcodeType($selected, $htmlname, 1);
+			$out .= '</td>';
+			$out .= '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+			$out .= '</td></tr></table></form>';
+		}
+		return $out;
+	}
 }
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index b43df3753dc..0b4c4e499e3 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -186,13 +186,13 @@ class FormCompany extends Form
 	{
 		global $user, $langs;
 
-		print '<form method="post" action="' . $page . '">';
+		print '<form method="post" action="'.$page.'">';
 		print '<input type="hidden" name="action" value="setprospectcontactlevel">';
-		print '<input type="hidden" name="token" value="' . newToken() . '">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$sql = "SELECT code, label";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "c_prospectcontactlevel";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_prospectcontactlevel";
 		$sql .= " WHERE active > 0";
 		$sql .= " ORDER BY sortorder";
 		$resql = $this->db->query($sql);
@@ -220,8 +220,8 @@ class FormCompany extends Form
 			print Form::selectarray($htmlname, $options, $selected);
 		}
 		else dol_print_error($this->db);
-		if (!empty($htmlname) && $user->admin) print ' ' . info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-		print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';
+		if (!empty($htmlname) && $user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 		print '</form>';
 	}
 
@@ -375,7 +375,7 @@ class FormCompany extends Form
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			print '<select class="flat" name="'.$htmlname.'">';
+			print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			if ($num)
@@ -407,6 +407,7 @@ class FormCompany extends Form
 				}
 			}
 			print '</select>';
+			print ajax_combobox($htmlname);
 		} else {
 			dol_print_error($this->db);
 		}
@@ -797,7 +798,7 @@ class FormCompany extends Form
 		if ($rendermode === 'view') {
 			$toprint = array();
 			foreach ($contact->roles as $key => $val) {
-				$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa;">'.$val['label'].'</li>';
+				$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb;">'.$val['label'].'</li>';
 			}
 			return '<div class="select2-container-multi-dolibarr" style="width: 90%;" id="'.$htmlname.'"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 		}
@@ -1003,6 +1004,7 @@ class FormCompany extends Form
 			}
 		}
 		$out .= '</select>';
+		$out .= ajax_combobox($htmlidname);
 
 		return $out;
 	}
diff --git a/htdocs/core/class/html.formcontract.class.php b/htdocs/core/class/html.formcontract.class.php
index b2e32b8c063..7c91c1a4148 100644
--- a/htdocs/core/class/html.formcontract.class.php
+++ b/htdocs/core/class/html.formcontract.class.php
@@ -27,29 +27,29 @@
  */
 class FormContract
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
 
-    /**
-     * Constructor
-     *
-     * @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Show a combo list with contracts qualified for a third party
 	 *
@@ -61,9 +61,9 @@ class FormContract
 	 *	@param	int		$showRef	Show customer and supplier reference on each contract (when found)
 	 *	@return int         		Nbr of project if OK, <0 if KO
 	 */
-    public function select_contract($socid = -1, $selected = '', $htmlname = 'contrattid', $maxlength = 16, $showempty = 1, $showRef = 0)
-    {
-        // phpcs:enable
+	public function select_contract($socid = -1, $selected = '', $htmlname = 'contrattid', $maxlength = 16, $showempty = 1, $showRef = 0)
+	{
+		// phpcs:enable
 		global $db, $user, $conf, $langs;
 
 		$hideunselectables = false;
@@ -78,12 +78,12 @@ class FormContract
 		if ($socid > 0)
 		{
 			// CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
-		    if (empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY)) {
-		        $sql .= " AND (c.fk_soc=".$socid." OR c.fk_soc IS NULL)";
+			if (empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY)) {
+				$sql .= " AND (c.fk_soc=".$socid." OR c.fk_soc IS NULL)";
 			} elseif ($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all') {
-		        $sql .= " AND (c.fk_soc IN (".$socid.", ".$conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") ";
+				$sql .= " AND (c.fk_soc IN (".$socid.", ".$conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") ";
 				$sql .= " OR c.fk_soc IS NULL)";
-		    }
+			}
 		}
 		if ($socid == 0) $sql .= " AND (c.fk_soc = 0 OR c.fk_soc IS NULL)";
 		$sql .= " ORDER BY c.ref ";
@@ -164,30 +164,30 @@ class FormContract
 			dol_print_error($this->db);
 			return -1;
 		}
-    }
+	}
 
-    /**
-     *  Show a form to select a contract
-     *
-     *  @param  int     $page       Page
-     *  @param  int     $socid      Id third party (-1=all, 0=only contracts not linked to a third party, id=contracts not linked or linked to third party id)
-     *  @param  int     $selected   Id contract preselected
-     *  @param  string  $htmlname   Nom de la zone html
-     *  @param  int     $maxlength	Maximum length of label
-     *  @param  int     $showempty	Show empty line
-     *  @param  int     $showRef    Show customer and supplier reference on each contract (when found)
-     *  @return int                 Nbr of project if OK, <0 if KO
-     */
-    public function formSelectContract($page, $socid = -1, $selected = '', $htmlname = 'contrattid', $maxlength = 16, $showempty = 1, $showRef = 0)
-    {
-        global $langs;
+	/**
+	 *  Show a form to select a contract
+	 *
+	 *  @param  int     $page       Page
+	 *  @param  int     $socid      Id third party (-1=all, 0=only contracts not linked to a third party, id=contracts not linked or linked to third party id)
+	 *  @param  int     $selected   Id contract preselected
+	 *  @param  string  $htmlname   Nom de la zone html
+	 *  @param  int     $maxlength	Maximum length of label
+	 *  @param  int     $showempty	Show empty line
+	 *  @param  int     $showRef    Show customer and supplier reference on each contract (when found)
+	 *  @return int                 Nbr of project if OK, <0 if KO
+	 */
+	public function formSelectContract($page, $socid = -1, $selected = '', $htmlname = 'contrattid', $maxlength = 16, $showempty = 1, $showRef = 0)
+	{
+		global $langs;
 
-        print "\n";
-        print '<form method="post" action="'.$page.'">';
-        print '<input type="hidden" name="action" value="setcontract">';
-        print '<input type="hidden" name="token" value="'.newToken().'">';
-        $this->select_contract($socid, $selected, $htmlname, $maxlength, $showempty, $showRef);
-        print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-        print '</form>';
-    }
+		print "\n";
+		print '<form method="post" action="'.$page.'">';
+		print '<input type="hidden" name="action" value="setcontract">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		$this->select_contract($socid, $selected, $htmlname, $maxlength, $showempty, $showRef);
+		print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+		print '</form>';
+	}
 }
diff --git a/htdocs/core/class/html.formcron.class.php b/htdocs/core/class/html.formcron.class.php
index 2701d126331..b6a9140cf58 100644
--- a/htdocs/core/class/html.formcron.class.php
+++ b/htdocs/core/class/html.formcron.class.php
@@ -28,75 +28,75 @@
  */
 class FormCron extends Form
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB      $db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB      $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Display On Off selector
-     *
-     *  @param  string      $htmlname       Html control name
-     *  @param  integer     $selected       selected value
-     *  @param  integer     $readonly       Select is read only or not
-     *  @return string                      HTML select field
-     */
-    public function select_typejob($htmlname, $selected = 0, $readonly = 0)
-    {
-        // phpcs:enable
-        global $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Display On Off selector
+	 *
+	 *  @param  string      $htmlname       Html control name
+	 *  @param  integer     $selected       selected value
+	 *  @param  integer     $readonly       Select is read only or not
+	 *  @return string                      HTML select field
+	 */
+	public function select_typejob($htmlname, $selected = 0, $readonly = 0)
+	{
+		// phpcs:enable
+		global $langs;
 
-        $langs->load('cron@cron');
-        $out = '';
-        if (!empty($readonly)) {
-            if ($selected == 'command') {
-                $out = $langs->trans('CronType_command');
-                $out .= '<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';
-                $out .= '<OPTION value="command" selected>'.$langs->trans('CronType_command').'</OPTION>';
-                $out .= '</SELECT>';
-            } elseif ($selected == 'method') {
-                $out = $langs->trans('CronType_method');
-                $out .= '<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';
-                $out .= '<OPTION value="method" selected>'.$langs->trans('CronType_method').'</OPTION>';
-                $out .= '</SELECT>';
-            }
-        } else {
-            $out = '<SELECT class="flat" name="'.$htmlname.'" id="'.$htmlname.'" />';
+		$langs->load('cron@cron');
+		$out = '';
+		if (!empty($readonly)) {
+			if ($selected == 'command') {
+				$out = $langs->trans('CronType_command');
+				$out .= '<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';
+				$out .= '<OPTION value="command" selected>'.$langs->trans('CronType_command').'</OPTION>';
+				$out .= '</SELECT>';
+			} elseif ($selected == 'method') {
+				$out = $langs->trans('CronType_method');
+				$out .= '<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';
+				$out .= '<OPTION value="method" selected>'.$langs->trans('CronType_method').'</OPTION>';
+				$out .= '</SELECT>';
+			}
+		} else {
+			$out = '<SELECT class="flat" name="'.$htmlname.'" id="'.$htmlname.'" />';
 
-            if ($selected == 'command') {
-                $selected_attr = ' selected ';
-            } else {
-                $selected_attr = '';
-            }
-            $out .= '<OPTION value="command" '.$selected_attr.'>'.$langs->trans('CronType_command').'</OPTION>';
+			if ($selected == 'command') {
+				$selected_attr = ' selected ';
+			} else {
+				$selected_attr = '';
+			}
+			$out .= '<OPTION value="command" '.$selected_attr.'>'.$langs->trans('CronType_command').'</OPTION>';
 
-            if ($selected == 'method') {
-                $selected_attr = ' selected ';
-            } else {
-                $selected_attr = '';
-            }
-            $out .= '<OPTION value="method" '.$selected_attr.'>'.$langs->trans('CronType_method').'</OPTION>';
+			if ($selected == 'method') {
+				$selected_attr = ' selected ';
+			} else {
+				$selected_attr = '';
+			}
+			$out .= '<OPTION value="method" '.$selected_attr.'>'.$langs->trans('CronType_method').'</OPTION>';
 
-            $out .= '</SELECT>';
-        }
+			$out .= '</SELECT>';
+		}
 
-        return $out;
-    }
+		return $out;
+	}
 }
diff --git a/htdocs/core/class/html.formexpensereport.class.php b/htdocs/core/class/html.formexpensereport.class.php
index e8079b77ed6..d65f68423b2 100644
--- a/htdocs/core/class/html.formexpensereport.class.php
+++ b/htdocs/core/class/html.formexpensereport.class.php
@@ -27,110 +27,111 @@
  */
 class FormExpenseReport
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
 
-    /**
-     * Constructor
-     *
-     * @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *    Retourne la liste deroulante des differents etats d'une note de frais.
-     *    Les valeurs de la liste sont les id de la table c_expensereport_statuts
-     *
-     *    @param    int     $selected       preselect status
-     *    @param    string  $htmlname       Name of HTML select
-     *    @param    int     $useempty       1=Add empty line
-     *    @param    int     $useshortlabel  Use short labels
-     *    @return   string                  HTML select with status
-     */
-    public function selectExpensereportStatus($selected = '', $htmlname = 'fk_statut', $useempty = 1, $useshortlabel = 0)
-    {
-    	global $langs;
+	/**
+	 *    Retourne la liste deroulante des differents etats d'une note de frais.
+	 *    Les valeurs de la liste sont les id de la table c_expensereport_statuts
+	 *
+	 *    @param    int     $selected       preselect status
+	 *    @param    string  $htmlname       Name of HTML select
+	 *    @param    int     $useempty       1=Add empty line
+	 *    @param    int     $useshortlabel  Use short labels
+	 *    @return   string                  HTML select with status
+	 */
+	public function selectExpensereportStatus($selected = '', $htmlname = 'fk_statut', $useempty = 1, $useshortlabel = 0)
+	{
+		global $langs;
 
-    	$tmpep = new ExpenseReport($this->db);
+		$tmpep = new ExpenseReport($this->db);
 
-    	print '<select class="flat" name="'.$htmlname.'">';
-    	if ($useempty) print '<option value="-1">&nbsp;</option>';
-    	$arrayoflabels = $tmpep->statuts;
-    	if ($useshortlabel) $arrayoflabels = $tmpep->statuts_short;
-    	foreach ($arrayoflabels as $key => $val)
-    	{
-    		if ($selected != '' && $selected == $key)
-    		{
-    			print '<option value="'.$key.'" selected>';
-    		} else {
-    			print '<option value="'.$key.'">';
-    		}
-    		print $langs->trans($val);
-    		print '</option>';
-    	}
-    	print '</select>';
-    }
+		print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
+		if ($useempty) print '<option value="-1">&nbsp;</option>';
+		$arrayoflabels = $tmpep->statuts;
+		if ($useshortlabel) $arrayoflabels = $tmpep->statuts_short;
+		foreach ($arrayoflabels as $key => $val)
+		{
+			if ($selected != '' && $selected == $key)
+			{
+				print '<option value="'.$key.'" selected>';
+			} else {
+				print '<option value="'.$key.'">';
+			}
+			print $langs->trans($val);
+			print '</option>';
+		}
+		print '</select>';
+		print ajax_combobox($htmlname);
+	}
 
-    /**
-     *  Return list of types of notes with select value = id
-     *
-     *  @param      int     $selected       Preselected type
-     *  @param      string  $htmlname       Name of field in form
-     *  @param      int     $showempty      Add an empty field
-     *  @param      int     $active         1=Active only, 0=Unactive only, -1=All
-     *  @return     string                  Select html
-     */
-    public function selectTypeExpenseReport($selected = '', $htmlname = 'type', $showempty = 0, $active = 1)
-    {
-    	// phpcs:enable
-    	global $langs, $user;
-    	$langs->load("trips");
+	/**
+	 *  Return list of types of notes with select value = id
+	 *
+	 *  @param      int     $selected       Preselected type
+	 *  @param      string  $htmlname       Name of field in form
+	 *  @param      int     $showempty      Add an empty field
+	 *  @param      int     $active         1=Active only, 0=Unactive only, -1=All
+	 *  @return     string                  Select html
+	 */
+	public function selectTypeExpenseReport($selected = '', $htmlname = 'type', $showempty = 0, $active = 1)
+	{
+		// phpcs:enable
+		global $langs, $user;
+		$langs->load("trips");
 
-    	$out = '';
+		$out = '';
 
-    	$out .= '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
-    	if ($showempty)
-    	{
-    		$out .= '<option value="-1"';
-    		if ($selected == -1) $out .= ' selected';
-    		$out .= '>&nbsp;</option>';
-    	}
+		$out .= '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
+		if ($showempty)
+		{
+			$out .= '<option value="-1"';
+			if ($selected == -1) $out .= ' selected';
+			$out .= '>&nbsp;</option>';
+		}
 
-    	$sql = "SELECT c.id, c.code, c.label as type FROM ".MAIN_DB_PREFIX."c_type_fees as c";
-    	if ($active >= 0) $sql .= " WHERE c.active = ".$active;
-    	$sql .= " ORDER BY c.label ASC";
-    	$resql = $this->db->query($sql);
-    	if ($resql)
-    	{
-    		$num = $this->db->num_rows($resql);
-    		$i = 0;
+		$sql = "SELECT c.id, c.code, c.label as type FROM ".MAIN_DB_PREFIX."c_type_fees as c";
+		if ($active >= 0) $sql .= " WHERE c.active = ".$active;
+		$sql .= " ORDER BY c.label ASC";
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			$i = 0;
 
-    		while ($i < $num)
-    		{
-    			$obj = $this->db->fetch_object($resql);
-    			$out .= '<option value="'.$obj->id.'"';
-    			if ($obj->code == $selected || $obj->id == $selected) $out .= ' selected';
-    			$out .= '>';
-    			if ($obj->code != $langs->trans($obj->code)) $out .= $langs->trans($obj->code);
-    			else $out .= $langs->trans($obj->type);
-    			$i++;
-    		}
-    	}
-    	$out .= '</select>';
-    	$out .= ajax_combobox($htmlname);
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
+				$out .= '<option value="'.$obj->id.'"';
+				if ($obj->code == $selected || $obj->id == $selected) $out .= ' selected';
+				$out .= '>';
+				if ($obj->code != $langs->trans($obj->code)) $out .= $langs->trans($obj->code);
+				else $out .= $langs->trans($obj->type);
+				$i++;
+			}
+		}
+		$out .= '</select>';
+		$out .= ajax_combobox($htmlname);
 
-    	return $out;
-    }
+		return $out;
+	}
 }
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 7264c83b152..437cef27afc 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -79,9 +79,10 @@ class FormFile
 	 *	@param	string		$sectiondir		If upload must be done inside a particular directory (if sectiondir defined, sectionid must not be)
 	 *  @param  int         $usewithoutform 0=Default, 1=Disable <form> and style to use in existing area
 	 *  @param	int			$capture		1=Add tag capture="capture" to force use of micro or video recording to generate file. When setting this to 1, you must also provide a value for $accept.
+	 *  @param	int			$disablemulti	0=Default, 1=Disable multiple file upload
 	 * 	@return	int							<0 if KO, >0 if OK
 	 */
-	public function form_attach_new_file($url, $title = '', $addcancel = 0, $sectionid = 0, $perm = 1, $size = 50, $object = '', $options = '', $useajax = 1, $savingdocmask = '', $linkfiles = 1, $htmlname = 'formuserfile', $accept = '', $sectiondir = '', $usewithoutform = 0, $capture = 0)
+	public function form_attach_new_file($url, $title = '', $addcancel = 0, $sectionid = 0, $perm = 1, $size = 50, $object = '', $options = '', $useajax = 1, $savingdocmask = '', $linkfiles = 1, $htmlname = 'formuserfile', $accept = '', $sectiondir = '', $usewithoutform = 0, $capture = 0, $disablemulti = 0)
 	{
 		// phpcs:enable
 		global $conf, $langs, $hookmanager;
@@ -114,6 +115,9 @@ class FormFile
 
 			if (empty($usewithoutform))		// Try to avoid this and set instead the form by the caller.
 			{
+				// Add a param as GET parameter to detect when POST were cleaned by PHP because a file larger than post_max_size
+				$url .= (strpos($url, '?') === false ? '?' : '&').'uploadform=1';
+
 				$out .= '<form name="'.$htmlname.'" id="'.$htmlname.'" action="'.$url.'" enctype="multipart/form-data" method="POST">';
 				$out .= '<input type="hidden" name="token" value="'.newToken().'">';
 				$out .= '<input type="hidden" id="'.$htmlname.'_section_dir" name="section_dir" value="'.$sectiondir.'">';
@@ -167,7 +171,7 @@ class FormFile
 
 			$out .= '<input class="flat minwidth400 maxwidth200onsmartphone" type="file"';
 			//$out .= ((!empty($conf->global->MAIN_DISABLE_MULTIPLE_FILEUPLOAD) || $conf->browser->layout != 'classic') ? ' name="userfile"' : ' name="userfile[]" multiple');
-			$out .= ((!empty($conf->global->MAIN_DISABLE_MULTIPLE_FILEUPLOAD)) ? ' name="userfile"' : ' name="userfile[]" multiple');
+			$out .= ((!empty($conf->global->MAIN_DISABLE_MULTIPLE_FILEUPLOAD) || $disablemulti) ? ' name="userfile"' : ' name="userfile[]" multiple');
 			$out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm) ? ' disabled' : '');
 			$out .= (!empty($accept) ? ' accept="'.$accept.'"' : ' accept=""');
 			$out .= (!empty($capture) ? ' capture="capture"' : '');
@@ -184,7 +188,7 @@ class FormFile
 			if ($addcancel)
 			{
 				$out .= ' &nbsp; ';
-				$out .= '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+				$out .= '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 			}
 
 			if (!empty($conf->global->MAIN_UPLOAD_DOC))
@@ -363,7 +367,7 @@ class FormFile
 		}
 
 		$printer = 0;
-		if (in_array($modulepart, array('facture', 'supplier_proposal', 'propal', 'proposal', 'order', 'commande', 'expedition', 'commande_fournisseur', 'expensereport', 'livraison', 'ticket')))	// The direct print feature is implemented only for such elements
+		if (in_array($modulepart, array('facture', 'supplier_proposal', 'propal', 'proposal', 'order', 'commande', 'expedition', 'commande_fournisseur', 'expensereport', 'delivery', 'ticket')))	// The direct print feature is implemented only for such elements
 		{
 			$printer = (!empty($user->rights->printing->read) && !empty($conf->printing->enabled)) ?true:false;
 		}
@@ -463,11 +467,11 @@ class FormFile
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/reception/modules_reception.php';
 					$modellist = ModelePdfReception::liste_modeles($this->db);
 				}
-			} elseif ($modulepart == 'livraison')
+			} elseif ($modulepart == 'delivery')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
+					include_once DOL_DOCUMENT_ROOT.'/core/modules/delivery/modules_delivery.php';
 					$modellist = ModelePDFDeliveryOrder::liste_modeles($this->db);
 				}
 			} elseif ($modulepart == 'ficheinter')
@@ -1031,10 +1035,9 @@ class FormFile
 	public function list_of_documents($filearray, $object, $modulepart, $param = '', $forcedownload = 0, $relativepath = '', $permonobject = 1, $useinecm = 0, $textifempty = '', $maxlength = 0, $title = '', $url = '', $showrelpart = 0, $permtoeditline = -1, $upload_dir = '', $sortfield = '', $sortorder = 'ASC', $disablemove = 1, $addfilterfields = 0, $disablecrop = -1)
 	{
 		// phpcs:enable
-		global $user, $conf, $langs, $hookmanager;
+		global $user, $conf, $langs, $hookmanager, $form;
 		global $sortfield, $sortorder, $maxheightmini;
 		global $dolibarr_main_url_root;
-		global $form;
 
 		if ($disablecrop == -1)
 		{
@@ -1200,7 +1203,7 @@ class FormFile
 					{
 						print '</a>';
 						$section_dir = dirname(GETPOST('urlfile', 'alpha'));
-						if (! preg_match('/\/$/', $section_dir)) $section_dir.='/';
+						if (!preg_match('/\/$/', $section_dir)) $section_dir .= '/';
 						print '<input type="hidden" name="section_dir" value="'.$section_dir.'">';
 						print '<input type="hidden" name="renamefilefrom" value="'.dol_escape_htmltag($file['name']).'">';
 						print '<input type="text" name="renamefileto" class="quatrevingtpercent" value="'.dol_escape_htmltag($file['name']).'">';
@@ -1218,7 +1221,6 @@ class FormFile
 					// Size
 					$sizetoshow = dol_print_size($file['size'], 1, 1);
 					$sizetoshowbytes = dol_print_size($file['size'], 0, 1);
-
 					print '<td class="right nowraponall">';
 					if ($sizetoshow == $sizetoshowbytes) print $sizetoshow;
 					else {
@@ -1300,7 +1302,7 @@ class FormFile
 						if ($useinecm == 1 || $useinecm == 5)	// ECM manual tree only
 						{
 							// $section is inside $param
-							$newparam.=preg_replace('/&file=.*$/', '', $param);		// We don't need param file=
+							$newparam .= preg_replace('/&file=.*$/', '', $param); // We don't need param file=
 							$backtopage = DOL_URL_ROOT.'/ecm/index.php?&section_dir='.urlencode($relativepath).$newparam;
 							print '<a class="editfielda" href="'.DOL_URL_ROOT.'/ecm/file_card.php?urlfile='.urlencode($file['name']).$param.'&backtopage='.urlencode($backtopage).'" class="editfilelink" rel="'.urlencode($file['name']).'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';
 						}
@@ -1360,8 +1362,8 @@ class FormFile
 					} else {
 						print '<td class="right">';
 						print '<input type="hidden" name="ecmfileid" value="'.$filearray[$key]['rowid'].'">';
-						print '<input type="submit" class="button" name="renamefilesave" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
-						print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+						print '<input type="submit" class="button button-save" name="renamefilesave" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+						print '<input type="submit" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 						print '</td>';
 						if (empty($disablemove)) print '<td class="right"></td>';
 					}
@@ -1403,9 +1405,9 @@ class FormFile
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *	Show list of documents in a directory
+	 *	Show list of documents in a directory of ECM module.
 	 *
-	 *  @param	string	$upload_dir         Directory that was scanned
+	 *  @param	string	$upload_dir         Directory that was scanned. This directory will contains files into subdirs REF/files
 	 *  @param  array	$filearray          Array of files loaded by dol_dir_list function before calling this function
 	 *  @param  string	$modulepart         Value for modulepart used by download wrapper
 	 *  @param  string	$param              Parameters on sort links
@@ -1423,9 +1425,10 @@ class FormFile
 	public function list_of_autoecmfiles($upload_dir, $filearray, $modulepart, $param, $forcedownload = 0, $relativepath = '', $permissiontodelete = 1, $useinecm = 0, $textifempty = '', $maxlength = 0, $url = '', $addfilterfields = 0)
 	{
 		// phpcs:enable
-		global $user, $conf, $langs, $form;
+		global $user, $conf, $langs, $hookmanager, $form;
 		global $sortfield, $sortorder;
 		global $search_doc_ref;
+		global $dolibarr_main_url_root;
 
 		dol_syslog(get_class($this).'::list_of_autoecmfiles upload_dir='.$upload_dir.' modulepart='.$modulepart);
 
@@ -1543,6 +1546,23 @@ class FormFile
 			$object_instance = new Mo($this->db);
 		}
 
+		//var_dump($filearray);
+
+		// Get list of files stored into database for same relative directory
+		$relativepathfromroot = preg_replace('/'.preg_quote(DOL_DATA_ROOT.'/', '/').'/', '', $upload_dir);
+		if ($relativepathfromroot)
+		{
+			completeFileArrayWithDatabaseInfo($filearray, $relativepathfromroot.'/%');
+
+			//var_dump($sortfield.' - '.$sortorder);
+			if ($sortfield && $sortorder)	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)
+			{
+				$filearray = dol_sort_array($filearray, $sortfield, $sortorder);
+			}
+		}
+
+		//var_dump($filearray);
+
 		foreach ($filearray as $key => $file)
 		{
 			if (!is_dir($file['name'])
@@ -1554,7 +1574,7 @@ class FormFile
 				// Define relative path used to store the file
 				$relativefile = preg_replace('/'.preg_quote($upload_dir.'/', '/').'/', '', $file['fullname']);
 
-				$id = 0; $ref = ''; $label = '';
+				$id = 0; $ref = '';
 
 				// To show ref or specific information according to view to show (defined by $module)
 				$reg = array();
@@ -1586,7 +1606,7 @@ class FormFile
 				{
 					$found = 1;
 				} else {
-					//print 'Fetch '.$id." - ".$ref.'<br>';
+					//print 'Fetch '.$id." - ".$ref.' class='.get_class($object_instance).'<br>';
 
 					if ($id) {
 						$result = $object_instance->fetch($id);
@@ -1615,13 +1635,12 @@ class FormFile
 				else print $langs->trans("ObjectDeleted", ($id ? $id : $ref));
 
 				//$modulesubdir=dol_sanitizeFileName($ref);
-				$modulesubdir = dirname($relativefile);
+				//$modulesubdir = dirname($relativefile);
 
 				//$filedir=$conf->$modulepart->dir_output . '/' . dol_sanitizeFileName($obj->ref);
-				$filedir = $file['path'];
+				//$filedir = $file['path'];
 				//$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
 				//print $formfile->getDocumentsLink($modulepart, $filename, $filedir);
-
 				print '</td>';
 
 				// File
@@ -1635,12 +1654,43 @@ class FormFile
 				print '</a>';
 
 				//print $this->getDocumentsLink($modulepart, $modulesubdir, $filedir, '^'.preg_quote($file['name'],'/').'$');
+
 				print $this->showPreview($file, $modulepart, $file['relativename']);
 
 				print "</td>\n";
-				print '<td class="right">'.dol_print_size($file['size'], 1, 1).'</td>';
+
+				// Size
+				$sizetoshow = dol_print_size($file['size'], 1, 1);
+				$sizetoshowbytes = dol_print_size($file['size'], 0, 1);
+				print '<td class="right nowraponall">';
+				if ($sizetoshow == $sizetoshowbytes) print $sizetoshow;
+				else {
+					print $form->textwithpicto($sizetoshow, $sizetoshowbytes, -1);
+				}
+				print '</td>';
+
+				// Date
 				print '<td class="center">'.dol_print_date($file['date'], "dayhour").'</td>';
+
+				// Share link
 				print '<td class="right">';
+				if ($file['share']) {
+					// Define $urlwithroot
+					$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+					$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+					//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+					//print '<span class="opacitymedium">'.$langs->trans("Hash").' : '.$file['share'].'</span>';
+					$forcedownload = 0;
+					$paramlink = '';
+					if (!empty($file['share'])) $paramlink .= ($paramlink ? '&' : '').'hashp='.$file['share']; // Hash for public share
+					if ($forcedownload) $paramlink .= ($paramlink ? '&' : '').'attachment=1';
+
+					$fulllink = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');
+
+					print img_picto($langs->trans("FileSharedViaALink"), 'globe').' ';
+					print '<input type="text" class="quatrevingtpercent width100" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
+				}
 				//if (! empty($useinecm) && $useinecm != 6)  print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
 				//if ($forcedownload) print '&attachment=1';
 				//print '&file='.urlencode($relativefile).'">';
@@ -1803,8 +1853,8 @@ class FormFile
 				print '<td class="center">'.dol_print_date(dol_now(), "dayhour", "tzuser").'</td>';
 				print '<td class="right"></td>';
 				print '<td class="right">';
-				print '<input type="submit" name="save" class="button" value="'.dol_escape_htmltag($langs->trans('Save')).'">';
-				print '<input type="submit" name="cancel" class="button" value="'.dol_escape_htmltag($langs->trans('Cancel')).'">';
+				print '<input type="submit" name="save" class="button button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+				print '<input type="submit" name="cancel" class="button button-cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 				print '</td>';
 			} else {
 				print '<td>';
diff --git a/htdocs/core/class/html.formintervention.class.php b/htdocs/core/class/html.formintervention.class.php
index dccbe50333a..81c857e2683 100644
--- a/htdocs/core/class/html.formintervention.class.php
+++ b/htdocs/core/class/html.formintervention.class.php
@@ -27,29 +27,29 @@
  */
 class FormIntervention
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
 
-    /**
-     * Constructor
-     *
-     * @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Show a combo list with contracts qualified for a third party
 	 *
@@ -62,7 +62,7 @@ class FormIntervention
 	 */
 	public function select_interventions($socid = -1, $selected = '', $htmlname = 'interventionid', $maxlength = 16, $showempty = 1)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $db, $user, $conf, $langs;
 
 		$out = '';
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index e2749c5e183..a4f936cfca0 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -296,6 +296,7 @@ class FormMail extends Form
 	 *	@param	string	$addfileaction		Name of action when posting file attachments
 	 *	@param	string	$removefileaction	Name of action when removing file attachments
 	 *	@return	void
+	 *  @deprecated
 	 */
 	public function show_form($addfileaction = 'addfile', $removefileaction = 'removefile')
 	{
@@ -434,18 +435,20 @@ class FormMail extends Form
 				{
 					setEventMessages($this->error, $this->errors, 'errors');
 				}
+				$langs->trans("members");
 				foreach ($this->lines_model as $line)
 				{
-					$langs->trans("members");
-					if (preg_match('/\((.*)\)/', $line->label, $reg))
-					{
-						$modelmail_array[$line->id] = $langs->trans($reg[1]); // langs->trans when label is __(xxx)__
+					$reg = array();
+					if (preg_match('/\((.*)\)/', $line->label, $reg)) {
+						$labeltouse = $langs->trans($reg[1]); // langs->trans when label is __(xxx)__
 					} else {
-						$modelmail_array[$line->id] = $line->label;
+						$labeltouse = $line->label;
 					}
-					if ($line->lang) $modelmail_array[$line->id] .= ' ('.$line->lang.')';
-					if ($line->private) $modelmail_array[$line->id] .= ' - '.$langs->trans("Private");
-					//if ($line->fk_user != $user->id) $modelmail_array[$line->id].=' - '.$langs->trans("By").' ';
+
+					// We escape the $labeltouse to store it into $modelmail_array.
+					$modelmail_array[$line->id] = dol_escape_htmltag($labeltouse);
+					if ($line->lang) $modelmail_array[$line->id] .= ' '.picto_from_langcode($line->lang);
+					if ($line->private) $modelmail_array[$line->id] .= ' - <span class="opacitymedium">'.dol_escape_htmltag($langs->trans("Private")).'</span>';
 				}
 			}
 
@@ -454,7 +457,8 @@ class FormMail extends Form
 			{
 				// If list of template is filled
 				$out .= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
-				$out .= '<span class="opacitymedium">'.$langs->trans('SelectMailModel').':</span> '.$this->selectarray('modelmailselected', $modelmail_array, 0, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100');
+				$out .= '<span class="opacitymedium">'.$langs->trans('SelectMailModel').':</span> ';
+				$out .= $this->selectarray('modelmailselected', $modelmail_array, 0, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100', 1, '', 0, 1);
 				if ($user->admin) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')), 1);
 				$out .= ' &nbsp; ';
 				$out .= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';
@@ -1018,7 +1022,7 @@ class FormMail extends Form
 				if ($this->withcancel)
 				{
 					$out .= ' &nbsp; &nbsp; ';
-					$out .= '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'" />';
+					$out .= '<input class="button button-cancel" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'" />';
 				}
 				$out .= '</div>'."\n";
 			}
@@ -1129,7 +1133,7 @@ class FormMail extends Form
 			if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_SUPPLIER_PROPOSAL) && !empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') $defaultvaluefordeliveryreceipt = 1;
 			if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_ORDER) && !empty($this->param['models']) && $this->param['models'] == 'order_send') $defaultvaluefordeliveryreceipt = 1;
 			if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_INVOICE) && !empty($this->param['models']) && $this->param['models'] == 'facture_send') $defaultvaluefordeliveryreceipt = 1;
-			$out .= $form->selectyesno('deliveryreceipt', (isset($_POST["deliveryreceipt"]) ? $_POST["deliveryreceipt"] : $defaultvaluefordeliveryreceipt), 1);
+			$out .= $form->selectyesno('deliveryreceipt', (GETPOSTISSET("deliveryreceipt") ? GETPOST("deliveryreceipt") : $defaultvaluefordeliveryreceipt), 1);
 		}
 		$out .= "</td></tr>\n";
 		return $out;
@@ -1166,7 +1170,7 @@ class FormMail extends Form
 			$out .= $defaulttopic;
 			$out .= '<input type="hidden" class="quatrevingtpercent" id="subject" name="subject" value="'.$defaulttopic.'" />';
 		} else {
-			$out .= '<input type="text" class="quatrevingtpercent" id="subject" name="subject" value="'.((isset($_POST["subject"]) && !$_POST['modelselected']) ? $_POST["subject"] : ($defaulttopic ? $defaulttopic : '')).'" />';
+			$out .= '<input type="text" class="quatrevingtpercent" id="subject" name="subject" value="'.((GETPOSTISSET("subject") && !GETPOST('modelselected')) ? GETPOST("subject") : ($defaulttopic ? $defaulttopic : '')).'" />';
 		}
 		$out .= "</td></tr>\n";
 		return $out;
@@ -1260,8 +1264,8 @@ class FormMail extends Form
 					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendActionComm");
 				} elseif ($type_template == 'thirdparty') {
 					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentThirdparty");
-			    } elseif ($type_template == 'user') {
-			    	$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentUser");
+				} elseif ($type_template == 'user') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentUser");
 				} elseif (!empty($type_template)) {
 					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentGeneric");
 				}
diff --git a/htdocs/core/class/html.formmailing.class.php b/htdocs/core/class/html.formmailing.class.php
index 1681d3e8439..9c74cb1203a 100644
--- a/htdocs/core/class/html.formmailing.class.php
+++ b/htdocs/core/class/html.formmailing.class.php
@@ -27,36 +27,36 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
  */
 class FormMailing extends Form
 {
-    /**
-     * @var string[] Error codes (or messages)
-     */
-    public $errors = array();
+	/**
+	 * @var string[] Error codes (or messages)
+	 */
+	public $errors = array();
 
-    /**
-     * Output a select with destinaries status
-     *
-     * @param string   $selectedid     The selected id
-     * @param string   $htmlname       Name of controm
-     * @param integer  $show_empty     Show empty option
-     * @return string HTML select
-     */
-    public function selectDestinariesStatus($selectedid = '', $htmlname = 'dest_status', $show_empty = 0)
-    {
+	/**
+	 * Output a select with destinaries status
+	 *
+	 * @param string   $selectedid     The selected id
+	 * @param string   $htmlname       Name of controm
+	 * @param integer  $show_empty     Show empty option
+	 * @return string HTML select
+	 */
+	public function selectDestinariesStatus($selectedid = '', $htmlname = 'dest_status', $show_empty = 0)
+	{
 
-        global $langs;
-        $langs->load("mails");
+		global $langs;
+		$langs->load("mails");
 
-        require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
-        $mailing = new Mailing($this->db);
+		require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
+		$mailing = new Mailing($this->db);
 
-        $options = array();
+		$options = array();
 
-        if ($show_empty) {
-            $options[-2] = ''; // Note -1 is used for error
-        }
+		if ($show_empty) {
+			$options[-2] = ''; // Note -1 is used for error
+		}
 
-        $options = $options + $mailing->statut_dest;
+		$options = $options + $mailing->statut_dest;
 
-        return Form::selectarray($htmlname, $options, $selectedid, 0, 0, 0, '', 1);
-    }
+		return Form::selectarray($htmlname, $options, $selectedid, 0, 0, 0, '', 1);
+	}
 }
diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
index cf159819764..233f98df662 100644
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -28,26 +28,26 @@
  */
 class FormMargin
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
 
-    /**
-     *	Constructor
-     *
-     *	@param	DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *	Constructor
+	 *
+	 *	@param	DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
 
@@ -146,7 +146,7 @@ class FormMargin
 					//}
 					//else
 					//{
-					    $marginInfos['margin_on_products'] += $pv - $pa;
+						$marginInfos['margin_on_products'] += $pv - $pa;
 					//}
 				} elseif ($type == 1) {  // service
 					$marginInfos['pa_services'] += $pa;
@@ -195,24 +195,24 @@ class FormMargin
 	{
 		global $langs, $conf, $user;
 
-    	if (!empty($user->socid)) return;
+		if (!empty($user->socid)) return;
 
-    	if (!$user->rights->margins->liretous) return;
+		if (!$user->rights->margins->liretous) return;
 
 		$marginInfo = $this->getMarginInfosArray($object, $force_price);
 
 		if (!empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON))	// TODO Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better
 		{
 			print $langs->trans('ShowMarginInfos').' : ';
-	        $hidemargininfos = preg_replace('/[^a-zA-Z0-9_\-]/', '', $_COOKIE['DOLUSER_MARGININFO_HIDE_SHOW']);	// Clean cookie
-	    	print '<span id="showMarginInfos" class="linkobject '.(!empty($hidemargininfos) ? '' : 'hideobject').'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</span>';
-	    	print '<span id="hideMarginInfos" class="linkobject '.(!empty($hidemargininfos) ? 'hideobject' : '').'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</span>';
+			$hidemargininfos = preg_replace('/[^a-zA-Z0-9_\-]/', '', $_COOKIE['DOLUSER_MARGININFO_HIDE_SHOW']); // Clean cookie
+			print '<span id="showMarginInfos" class="linkobject '.(!empty($hidemargininfos) ? '' : 'hideobject').'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</span>';
+			print '<span id="hideMarginInfos" class="linkobject '.(!empty($hidemargininfos) ? 'hideobject' : '').'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</span>';
 
-    	    print '<script>$(document).ready(function() {
+			print '<script>$(document).ready(function() {
         	    $("span#showMarginInfos").click(function() { $.getScript( "'.dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1).'", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 0); $(".margininfos").show(); $("span#showMarginInfos").addClass("hideobject"); $("span#hideMarginInfos").removeClass("hideobject");})});
         	    $("span#hideMarginInfos").click(function() { $.getScript( "'.dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1).'", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 1); $(".margininfos").hide(); $("span#hideMarginInfos").addClass("hideobject"); $("span#showMarginInfos").removeClass("hideobject");})});
       	        });</script>';
-    	    if (!empty($hidemargininfos)) print '<script>$(document).ready(function() {$(".margininfos").hide();});</script>';
+			if (!empty($hidemargininfos)) print '<script>$(document).ready(function() {$(".margininfos").hide();});</script>';
 		}
 
 		print '<div class="div-table-responsive-no-min">';
diff --git a/htdocs/core/class/html.formorder.class.php b/htdocs/core/class/html.formorder.class.php
index d3dbe27ceac..be169106621 100644
--- a/htdocs/core/class/html.formorder.class.php
+++ b/htdocs/core/class/html.formorder.class.php
@@ -31,39 +31,42 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 class FormOrder extends Form
 {
 
-    /**
-     *  Return combo list of differents status of a orders
-     *
-     *  @param	string	$selected   Preselected value
-     *  @param	int		$short		Use short labels
-     *  @param	string	$hmlname	Name of HTML select element
-     *  @return	void
-     */
-    public function selectSupplierOrderStatus($selected = '', $short = 0, $hmlname = 'order_status')
-    {
-	    $options = array();
+	/**
+	 *  Return combo list of differents status of a orders
+	 *
+	 *  @param	string	$selected   Preselected value
+	 *  @param	int		$short		Use short labels
+	 *  @param	string	$hmlname	Name of HTML select element
+	 *  @return	void
+	 */
+	public function selectSupplierOrderStatus($selected = '', $short = 0, $hmlname = 'order_status')
+	{
+		$options = array();
 
-	    // 7 is same label than 6. 8 does not exists (billed is another field)
-	    $statustohow = array(
-		    '0' => '0',
-		    '1' => '1',
-		    '2' => '2',
-		    '3' => '3',
-		    '4' => '4',
-		    '5' => '5',
-		    '6' => '6,7',
-		    '9' => '9'
-	    );
+		// 7 is same label than 6. 8 does not exists (billed is another field)
+		$statustohow = array(
+			'0' => '0',
+			'1' => '1',
+			'2' => '2',
+			'3' => '3',
+			'4' => '4',
+			'5' => '5',
+			'6' => '6,7',
+			'9' => '9'
+		);
 
-	    $tmpsupplierorder = new CommandeFournisseur($this->db);
+		$tmpsupplierorder = new CommandeFournisseur($this->db);
 
-	    foreach ($statustohow as $key => $value) {
-		    $tmpsupplierorder->statut = $key;
-		    $options[$value] = $tmpsupplierorder->getLibStatut($short);
-	    }
+		foreach ($statustohow as $key => $value) {
+			$tmpsupplierorder->statut = $key;
+			$options[$value] = $tmpsupplierorder->getLibStatut($short);
+		}
 
-	    print Form::selectarray($hmlname, $options, $selected, 1);
-    }
+		if (is_array($selected)) $selectedarray = $selected;
+		else $selectedarray = explode(',', $selected);
+
+		print Form::multiselectarray($hmlname, $options, $selectedarray, 0);
+	}
 
 	/**
 	 *	Return list of input method (mode used to receive order, like order received by email, fax, online)
@@ -78,7 +81,7 @@ class FormOrder extends Form
 	{
 		global $langs;
 
-        $listofmethods = array();
+		$listofmethods = array();
 
 		$sql = "SELECT rowid, code, libelle as label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_input_method";
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index dc55d0931f7..c71029769f2 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -38,738 +38,776 @@
  */
 class FormOther
 {
-    private $db;
+	private $db;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error;
 
 
-    /**
-     *	Constructor
-     *
-     *	@param	DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *	Constructor
+	 *
+	 *	@param	DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Return HTML select list of export models
-     *
-     *    @param    string	$selected          Id modele pre-selectionne
-     *    @param    string	$htmlname          Nom de la zone select
-     *    @param    string	$type              Type des modeles recherches
-     *    @param    int		$useempty          Show an empty value in list
-     *    @param    int		$fk_user           User that has created the template (this is set to null to get all export model when EXPORTS_SHARE_MODELS is on)
-     *    @return	void
-     */
-    public function select_export_model($selected = '', $htmlname = 'exportmodelid', $type = '', $useempty = 0, $fk_user = null)
-    {
-        // phpcs:enable
-        global $conf, $langs, $user;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Return HTML select list of export models
+	 *
+	 *    @param    string	$selected          Id modele pre-selectionne
+	 *    @param    string	$htmlname          Nom de la zone select
+	 *    @param    string	$type              Type des modeles recherches
+	 *    @param    int		$useempty          Show an empty value in list
+	 *    @param    int		$fk_user           User that has created the template (this is set to null to get all export model when EXPORTS_SHARE_MODELS is on)
+	 *    @return	void
+	 */
+	public function select_export_model($selected = '', $htmlname = 'exportmodelid', $type = '', $useempty = 0, $fk_user = null)
+	{
+		// phpcs:enable
+		global $conf, $langs, $user;
 
-    	$sql = "SELECT rowid, label, fk_user";
-        $sql .= " FROM ".MAIN_DB_PREFIX."export_model";
-        $sql .= " WHERE type = '".$this->db->escape($type)."'";
+		$sql = "SELECT rowid, label, fk_user";
+		$sql .= " FROM ".MAIN_DB_PREFIX."export_model";
+		$sql .= " WHERE type = '".$this->db->escape($type)."'";
 		if (!empty($fk_user)) $sql .= " AND fk_user IN (0, ".$fk_user.")"; // An export model
-        $sql .= " ORDER BY label";
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            print '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';
-            if ($useempty)
-            {
-                print '<option value="-1">&nbsp;</option>';
-            }
+		$sql .= " ORDER BY label";
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			print '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';
+			if ($useempty)
+			{
+				print '<option value="-1">&nbsp;</option>';
+			}
 
-            $num = $this->db->num_rows($result);
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($result);
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($result);
 
-                $label = $obj->label;
-                if ($obj->fk_user == 0) {
-                	$label .= ' <span class="opacitymedium">('.$langs->trans("Everybody").')</span>';
-                } elseif (!empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {
-                	$tmpuser = new User($this->db);
-                	$tmpuser->fetch($obj->fk_user);
-                	$label .= ' <span class="opacitymedium">('.$tmpuser->getFullName($langs).')</span>';
-                }
+				$label = $obj->label;
+				if ($obj->fk_user == 0) {
+					$label .= ' <span class="opacitymedium">('.$langs->trans("Everybody").')</span>';
+				} elseif (!empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {
+					$tmpuser = new User($this->db);
+					$tmpuser->fetch($obj->fk_user);
+					$label .= ' <span class="opacitymedium">('.$tmpuser->getFullName($langs).')</span>';
+				}
 
-                if ($selected == $obj->rowid)
-                {
-                    print '<option value="'.$obj->rowid.'" selected data-html="'.dol_escape_htmltag($label).'">';
-                } else {
-                    print '<option value="'.$obj->rowid.'" data-html="'.dol_escape_htmltag($label).'">';
-                }
-                print $label;
-                print '</option>';
-                $i++;
-            }
-            print "</select>";
-            print ajax_combobox($htmlname);
-        } else {
-            dol_print_error($this->db);
-        }
-    }
+				if ($selected == $obj->rowid)
+				{
+					print '<option value="'.$obj->rowid.'" selected data-html="'.dol_escape_htmltag($label).'">';
+				} else {
+					print '<option value="'.$obj->rowid.'" data-html="'.dol_escape_htmltag($label).'">';
+				}
+				print $label;
+				print '</option>';
+				$i++;
+			}
+			print "</select>";
+			print ajax_combobox($htmlname);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Return list of export models
-     *
-     *    @param    string	$selected          Id modele pre-selectionne
-     *    @param    string	$htmlname          Nom de la zone select
-     *    @param    string	$type              Type des modeles recherches
-     *    @param    int		$useempty          Affiche valeur vide dans liste
-     *    @param    int		$fk_user           User that has created the template (this is set to null to get all export model when EXPORTS_SHARE_MODELS is on)
-     *    @return	void
-     */
-    public function select_import_model($selected = '', $htmlname = 'importmodelid', $type = '', $useempty = 0, $fk_user = null)
-    {
-        // phpcs:enable
-    	global $conf, $langs, $user;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Return list of export models
+	 *
+	 *    @param    string	$selected          Id modele pre-selectionne
+	 *    @param    string	$htmlname          Nom de la zone select
+	 *    @param    string	$type              Type des modeles recherches
+	 *    @param    int		$useempty          Affiche valeur vide dans liste
+	 *    @param    int		$fk_user           User that has created the template (this is set to null to get all export model when EXPORTS_SHARE_MODELS is on)
+	 *    @return	void
+	 */
+	public function select_import_model($selected = '', $htmlname = 'importmodelid', $type = '', $useempty = 0, $fk_user = null)
+	{
+		// phpcs:enable
+		global $conf, $langs, $user;
 
-        $sql = "SELECT rowid, label, fk_user";
-        $sql .= " FROM ".MAIN_DB_PREFIX."import_model";
-        $sql .= " WHERE type = '".$this->db->escape($type)."'";
-        if (!empty($fk_user)) $sql .= " AND fk_user IN (0, ".$fk_user.")"; // An export model
-        $sql .= " ORDER BY rowid";
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            print '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';
-            if ($useempty)
-            {
-                print '<option value="-1">&nbsp;</option>';
-            }
+		$sql = "SELECT rowid, label, fk_user";
+		$sql .= " FROM ".MAIN_DB_PREFIX."import_model";
+		$sql .= " WHERE type = '".$this->db->escape($type)."'";
+		if (!empty($fk_user)) $sql .= " AND fk_user IN (0, ".$fk_user.")"; // An export model
+		$sql .= " ORDER BY rowid";
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			print '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';
+			if ($useempty)
+			{
+				print '<option value="-1">&nbsp;</option>';
+			}
 
-            $num = $this->db->num_rows($result);
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($result);
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($result);
 
-                $label = $obj->label;
-                if ($obj->fk_user == 0) {
-                	$label .= ' <span class="opacitymedium">('.$langs->trans("Everybody").')</span>';
-                } elseif (!empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {
-                	$tmpuser = new User($this->db);
-                	$tmpuser->fetch($obj->fk_user);
-                	$label .= ' <span class="opacitymedium">('.$tmpuser->getFullName($langs).')</span>';
-                }
+				$label = $obj->label;
+				if ($obj->fk_user == 0) {
+					$label .= ' <span class="opacitymedium">('.$langs->trans("Everybody").')</span>';
+				} elseif (!empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {
+					$tmpuser = new User($this->db);
+					$tmpuser->fetch($obj->fk_user);
+					$label .= ' <span class="opacitymedium">('.$tmpuser->getFullName($langs).')</span>';
+				}
 
-                if ($selected == $obj->rowid)
-                {
-                    print '<option value="'.$obj->rowid.'" selected data-html="'.dol_escape_htmltag($label).'">';
-                } else {
-                    print '<option value="'.$obj->rowid.'" data-html="'.dol_escape_htmltag($label).'">';
-                }
-                print $label;
-                print '</option>';
-                $i++;
-            }
-            print "</select>";
-            print ajax_combobox($htmlname);
-        } else {
-            dol_print_error($this->db);
-        }
-    }
+				if ($selected == $obj->rowid)
+				{
+					print '<option value="'.$obj->rowid.'" selected data-html="'.dol_escape_htmltag($label).'">';
+				} else {
+					print '<option value="'.$obj->rowid.'" data-html="'.dol_escape_htmltag($label).'">';
+				}
+				print $label;
+				print '</option>';
+				$i++;
+			}
+			print "</select>";
+			print ajax_combobox($htmlname);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Return list of ecotaxes with label
-     *
-     *    @param	string	$selected   Preselected ecotaxes
-     *    @param    string	$htmlname	Name of combo list
-     *    @return	integer
-     */
-    public function select_ecotaxes($selected = '', $htmlname = 'ecotaxe_id')
-    {
-        // phpcs:enable
-        global $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Return list of ecotaxes with label
+	 *
+	 *    @param	string	$selected   Preselected ecotaxes
+	 *    @param    string	$htmlname	Name of combo list
+	 *    @return	integer
+	 */
+	public function select_ecotaxes($selected = '', $htmlname = 'ecotaxe_id')
+	{
+		// phpcs:enable
+		global $langs;
 
-        $sql = "SELECT e.rowid, e.code, e.label, e.price, e.organization,";
-        $sql .= " c.label as country";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_ecotaxe as e,".MAIN_DB_PREFIX."c_country as c";
-        $sql .= " WHERE e.active = 1 AND e.fk_pays = c.rowid";
-        $sql .= " ORDER BY country, e.organization ASC, e.code ASC";
+		$sql = "SELECT e.rowid, e.code, e.label, e.price, e.organization,";
+		$sql .= " c.label as country";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_ecotaxe as e,".MAIN_DB_PREFIX."c_country as c";
+		$sql .= " WHERE e.active = 1 AND e.fk_pays = c.rowid";
+		$sql .= " ORDER BY country, e.organization ASC, e.code ASC";
 
-    	dol_syslog(get_class($this).'::select_ecotaxes', LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            print '<select class="flat" name="'.$htmlname.'">';
-            $num = $this->db->num_rows($resql);
-            $i = 0;
-            print '<option value="-1">&nbsp;</option>'."\n";
-            if ($num)
-            {
-                while ($i < $num)
-                {
-                    $obj = $this->db->fetch_object($resql);
-                    if ($selected && $selected == $obj->rowid)
-                    {
-                        print '<option value="'.$obj->rowid.'" selected>';
-                    } else {
-                        print '<option value="'.$obj->rowid.'">';
-                        //print '<option onmouseover="showtip(\''.$obj->label.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';
-                    }
-                    $selectOptionValue = $obj->code.' - '.$obj->label.' : '.price($obj->price).' '.$langs->trans("HT").' ('.$obj->organization.')';
-                    print $selectOptionValue;
-                    print '</option>';
-                    $i++;
-                }
-            }
-            print '</select>';
-            return 0;
-        } else {
-            dol_print_error($this->db);
-            return 1;
-        }
-    }
+		dol_syslog(get_class($this).'::select_ecotaxes', LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			print '<select class="flat" name="'.$htmlname.'">';
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			print '<option value="-1">&nbsp;</option>'."\n";
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $this->db->fetch_object($resql);
+					if ($selected && $selected == $obj->rowid)
+					{
+						print '<option value="'.$obj->rowid.'" selected>';
+					} else {
+						print '<option value="'.$obj->rowid.'">';
+						//print '<option onmouseover="showtip(\''.$obj->label.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';
+					}
+					$selectOptionValue = $obj->code.' - '.$obj->label.' : '.price($obj->price).' '.$langs->trans("HT").' ('.$obj->organization.')';
+					print $selectOptionValue;
+					print '</option>';
+					$i++;
+				}
+			}
+			print '</select>';
+			return 0;
+		} else {
+			dol_print_error($this->db);
+			return 1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Return list of revenue stamp for country
-     *
-     *    @param	string	$selected   	Value of preselected revenue stamp
-     *    @param    string	$htmlname   	Name of combo list
-     *    @param    string	$country_code   Country Code
-     *    @return	string					HTML select list
-     */
-    public function select_revenue_stamp($selected = '', $htmlname = 'revenuestamp', $country_code = '')
-    {
-        // phpcs:enable
-    	global $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Return list of revenue stamp for country
+	 *
+	 *    @param	string	$selected   	Value of preselected revenue stamp
+	 *    @param    string	$htmlname   	Name of combo list
+	 *    @param    string	$country_code   Country Code
+	 *    @return	string					HTML select list
+	 */
+	public function select_revenue_stamp($selected = '', $htmlname = 'revenuestamp', $country_code = '')
+	{
+		// phpcs:enable
+		global $langs;
 
-    	$out = '';
+		$out = '';
 
-    	$sql = "SELECT r.taux, r.revenuestamp_type";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r,".MAIN_DB_PREFIX."c_country as c";
-    	$sql .= " WHERE r.active = 1 AND r.fk_pays = c.rowid";
-    	$sql .= " AND c.code = '".$this->db->escape($country_code)."'";
+		$sql = "SELECT r.taux, r.revenuestamp_type";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r,".MAIN_DB_PREFIX."c_country as c";
+		$sql .= " WHERE r.active = 1 AND r.fk_pays = c.rowid";
+		$sql .= " AND c.code = '".$this->db->escape($country_code)."'";
 
-    	dol_syslog(get_class($this).'::select_revenue_stamp', LOG_DEBUG);
-    	$resql = $this->db->query($sql);
-    	if ($resql)
-    	{
-    		$out .= '<select class="flat" name="'.$htmlname.'">';
-    		$num = $this->db->num_rows($resql);
-    		$i = 0;
-    		$out .= '<option value="0">&nbsp;</option>'."\n";
-    		if ($num)
-    		{
-    			while ($i < $num)
-    			{
-    				$obj = $this->db->fetch_object($resql);
-    				if (($selected && $selected == $obj->taux) || $num == 1)
-    				{
-    					$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').' selected>';
-    				} else {
-    					$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').'>';
-    					//print '<option onmouseover="showtip(\''.$obj->libelle.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';
-    				}
-    				$out .= $obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '');
-    				$out .= '</option>';
-    				$i++;
-    			}
-    		}
-    		$out .= '</select>';
-    		return $out;
-    	} else {
-    		dol_print_error($this->db);
-    		return '';
-    	}
-    }
+		dol_syslog(get_class($this).'::select_revenue_stamp', LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$out .= '<select class="flat" name="'.$htmlname.'">';
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			$out .= '<option value="0">&nbsp;</option>'."\n";
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $this->db->fetch_object($resql);
+					if (($selected && $selected == $obj->taux) || $num == 1)
+					{
+						$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').' selected>';
+					} else {
+						$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').'>';
+						//print '<option onmouseover="showtip(\''.$obj->libelle.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';
+					}
+					$out .= $obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '');
+					$out .= '</option>';
+					$i++;
+				}
+			}
+			$out .= '</select>';
+			return $out;
+		} else {
+			dol_print_error($this->db);
+			return '';
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Return a HTML select list to select a percent
-     *
-     *    @param	integer	$selected      	pourcentage pre-selectionne
-     *    @param    string	$htmlname      	nom de la liste deroulante
-     *    @param	int		$disabled		Disabled or not
-     *    @param    int		$increment     	increment value
-     *    @param    int		$start         	start value
-     *    @param    int		$end           	end value
-     *    @param    int     $showempty      Add also an empty line
-     *    @return   string					HTML select string
-     */
-    public function select_percent($selected = 0, $htmlname = 'percent', $disabled = 0, $increment = 5, $start = 0, $end = 100, $showempty = 0)
-    {
-        // phpcs:enable
-        $return = '<select class="flat" name="'.$htmlname.'" '.($disabled ? 'disabled' : '').'>';
-        if ($showempty) $return .= '<option value="-1"'.(($selected == -1 || $selected == '') ? ' selected' : '').'>&nbsp;</option>';
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Return a HTML select list to select a percent
+	 *
+	 *    @param	integer	$selected      	pourcentage pre-selectionne
+	 *    @param    string	$htmlname      	nom de la liste deroulante
+	 *    @param	int		$disabled		Disabled or not
+	 *    @param    int		$increment     	increment value
+	 *    @param    int		$start         	start value
+	 *    @param    int		$end           	end value
+	 *    @param    int     $showempty      Add also an empty line
+	 *    @return   string					HTML select string
+	 */
+	public function select_percent($selected = 0, $htmlname = 'percent', $disabled = 0, $increment = 5, $start = 0, $end = 100, $showempty = 0)
+	{
+		// phpcs:enable
+		$return = '<select class="flat" name="'.$htmlname.'" '.($disabled ? 'disabled' : '').'>';
+		if ($showempty) $return .= '<option value="-1"'.(($selected == -1 || $selected == '') ? ' selected' : '').'>&nbsp;</option>';
 
-        for ($i = $start; $i <= $end; $i += $increment)
-        {
-            if ($selected != '' && (int) $selected == $i)
-            {
-                $return .= '<option value="'.$i.'" selected>';
-            } else {
-                $return .= '<option value="'.$i.'">';
-            }
-            $return .= $i.' % ';
-            $return .= '</option>';
-        }
+		for ($i = $start; $i <= $end; $i += $increment)
+		{
+			if ($selected != '' && (int) $selected == $i)
+			{
+				$return .= '<option value="'.$i.'" selected>';
+			} else {
+				$return .= '<option value="'.$i.'">';
+			}
+			$return .= $i.' % ';
+			$return .= '</option>';
+		}
 
-        $return .= '</select>';
+		$return .= '</select>';
 
-        return $return;
-    }
+		return $return;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Return select list for categories (to use in form search selectors)
-     *
-     * @param	int		$type			Type of category ('customer', 'supplier', 'contact', 'product', 'member'). Old mode (0, 1, 2, ...) is deprecated.
-     * @param   integer	$selected     	Preselected value
-     * @param   string	$htmlname      	Name of combo list
-     * @param	int		$nocateg		Show also an entry "Not categorized"
-     * @param   int     $showempty      Add also an empty line
-     * @param   string  $morecss        More CSS
-     * @return  string		        	Html combo list code
-     * @see	select_all_categories()
-     */
-    public function select_categories($type, $selected = 0, $htmlname = 'search_categ', $nocateg = 0, $showempty = 1, $morecss = '')
-    {
-        // phpcs:enable
-        global $conf, $langs;
-        require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return select list for categories (to use in form search selectors)
+	 *
+	 * @param	int		$type			Type of category ('customer', 'supplier', 'contact', 'product', 'member'). Old mode (0, 1, 2, ...) is deprecated.
+	 * @param   integer	$selected     	Preselected value
+	 * @param   string	$htmlname      	Name of combo list
+	 * @param	int		$nocateg		Show also an entry "Not categorized"
+	 * @param   int     $showempty      Add also an empty line
+	 * @param   string  $morecss        More CSS
+	 * @return  string		        	Html combo list code
+	 * @see	select_all_categories()
+	 */
+	public function select_categories($type, $selected = 0, $htmlname = 'search_categ', $nocateg = 0, $showempty = 1, $morecss = '')
+	{
+		// phpcs:enable
+		global $conf, $langs;
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
-        // For backward compatibility
-        if (is_numeric($type))
-        {
-            dol_syslog(__METHOD__.': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);
-        }
+		// For backward compatibility
+		if (is_numeric($type))
+		{
+			dol_syslog(__METHOD__.': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);
+		}
 
-        // Load list of "categories"
-        $static_categs = new Categorie($this->db);
-        $tab_categs = $static_categs->get_full_arbo($type);
+		// Load list of "categories"
+		$static_categs = new Categorie($this->db);
+		$tab_categs = $static_categs->get_full_arbo($type);
 
-        $moreforfilter = '';
-        // Enhance with select2
-        if ($conf->use_javascript_ajax)
-        {
-            include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-            $comboenhancement = ajax_combobox('select_categ_'.$htmlname);
-            $moreforfilter .= $comboenhancement;
-        }
+		$moreforfilter = '';
+		// Enhance with select2
+		if ($conf->use_javascript_ajax)
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+			$comboenhancement = ajax_combobox('select_categ_'.$htmlname);
+			$moreforfilter .= $comboenhancement;
+		}
 
-        // Print a select with each of them
-        $moreforfilter .= '<select class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" id="select_categ_'.$htmlname.'" name="'.$htmlname.'">';
-        if ($showempty) $moreforfilter .= '<option value="0">&nbsp;</option>'; // Should use -1 to say nothing
+		// Print a select with each of them
+		$moreforfilter .= '<select class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" id="select_categ_'.$htmlname.'" name="'.$htmlname.'">';
+		if ($showempty) $moreforfilter .= '<option value="0">&nbsp;</option>'; // Should use -1 to say nothing
 
-        if (is_array($tab_categs))
-        {
-            foreach ($tab_categs as $categ)
-            {
-                $moreforfilter .= '<option value="'.$categ['id'].'"';
-                if ($categ['id'] == $selected) $moreforfilter .= ' selected';
-                $moreforfilter .= '>'.dol_trunc($categ['fulllabel'], 50, 'middle').'</option>';
-            }
-        }
-        if ($nocateg)
-        {
-        	$langs->load("categories");
-        	$moreforfilter .= '<option value="-2"'.($selected == -2 ? ' selected' : '').'>- '.$langs->trans("NotCategorized").' -</option>';
-        }
-        $moreforfilter .= '</select>';
+		if (is_array($tab_categs))
+		{
+			foreach ($tab_categs as $categ)
+			{
+				$moreforfilter .= '<option value="'.$categ['id'].'"';
+				if ($categ['id'] == $selected) $moreforfilter .= ' selected';
+				$moreforfilter .= '>'.dol_trunc($categ['fulllabel'], 50, 'middle').'</option>';
+			}
+		}
+		if ($nocateg)
+		{
+			$langs->load("categories");
+			$moreforfilter .= '<option value="-2"'.($selected == -2 ? ' selected' : '').'>- '.$langs->trans("NotCategorized").' -</option>';
+		}
+		$moreforfilter .= '</select>';
 
-        return $moreforfilter;
-    }
+		return $moreforfilter;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return select list for categories (to use in form search selectors)
-     *
-     *  @param	string	$selected     		Preselected value
-     *  @param  string	$htmlname      		Name of combo list (example: 'search_sale')
-     *  @param  User	$user           	Object user
-     *  @param	int		$showstatus			0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status
-     *  @param	int		$showempty			1=show also an empty value
-     *  @param	string	$morecss			More CSS
-     *  @param	int		$norepresentative	Show also an entry "Not categorized"
-     *  @return string						Html combo list code
-     */
-    public function select_salesrepresentatives($selected, $htmlname, $user, $showstatus = 0, $showempty = 1, $morecss = '', $norepresentative = 0)
-    {
-        // phpcs:enable
-        global $conf, $langs, $hookmanager;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return select list for categories (to use in form search selectors)
+	 *
+	 *  @param	string	$selected     		Preselected value
+	 *  @param  string	$htmlname      		Name of combo list (example: 'search_sale')
+	 *  @param  User	$user           	Object user
+	 *  @param	int		$showstatus			0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status
+	 *  @param	int		$showempty			1=show also an empty value
+	 *  @param	string	$morecss			More CSS
+	 *  @param	int		$norepresentative	Show also an entry "Not categorized"
+	 *  @return string						Html combo list code
+	 */
+	public function select_salesrepresentatives($selected, $htmlname, $user, $showstatus = 0, $showempty = 1, $morecss = '', $norepresentative = 0)
+	{
+		// phpcs:enable
+		global $conf, $langs, $hookmanager;
 
-        $langs->load('users');
+		$langs->load('users');
 
-        $out = '';
-        // Enhance with select2
-        if ($conf->use_javascript_ajax)
-        {
-            include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+		$out = '';
+		// Enhance with select2
+		if ($conf->use_javascript_ajax)
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 
-            $comboenhancement = ajax_combobox($htmlname);
-            if ($comboenhancement)
-            {
-            	$out .= $comboenhancement;
-            }
-        }
+			$comboenhancement = ajax_combobox($htmlname);
+			if ($comboenhancement)
+			{
+				$out .= $comboenhancement;
+			}
+		}
 
-	    $reshook = $hookmanager->executeHooks('addSQLWhereFilterOnSelectSalesRep', array(), $this, $action);
+		$reshook = $hookmanager->executeHooks('addSQLWhereFilterOnSelectSalesRep', array(), $this, $action);
 
-        // Select each sales and print them in a select input
-        $out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';
-        if ($showempty) $out .= '<option value="0">&nbsp;</option>';
+		// Select each sales and print them in a select input
+		$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';
+		if ($showempty) $out .= '<option value="0">&nbsp;</option>';
 
-        // Get list of users allowed to be viewed
-        $sql_usr = "SELECT u.rowid, u.lastname, u.firstname, u.statut, u.login";
-        $sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u";
+		// Get list of users allowed to be viewed
+		$sql_usr = "SELECT u.rowid, u.lastname, u.firstname, u.statut as status, u.login, u.photo, u.gender, u.entity, u.admin";
+		$sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u";
 
-        if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
-        {
-        	if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
-        		$sql_usr .= " WHERE u.entity IS NOT NULL"; // Show all users
-        	} else {
-        		$sql_usr .= " WHERE EXISTS (SELECT ug.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug WHERE u.rowid = ug.fk_user AND ug.entity IN (".getEntity('usergroup')."))";
-        		$sql_usr .= " OR u.entity = 0"; // Show always superadmin
-        	}
-        } else {
-        	$sql_usr .= " WHERE u.entity IN (".getEntity('user').")";
-        }
+		if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+		{
+			if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
+				$sql_usr .= " WHERE u.entity IS NOT NULL"; // Show all users
+			} else {
+				$sql_usr .= " WHERE EXISTS (SELECT ug.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug WHERE u.rowid = ug.fk_user AND ug.entity IN (".getEntity('usergroup')."))";
+				$sql_usr .= " OR u.entity = 0"; // Show always superadmin
+			}
+		} else {
+			$sql_usr .= " WHERE u.entity IN (".getEntity('user').")";
+		}
 
-        if (empty($user->rights->user->user->lire)) $sql_usr .= " AND u.rowid = ".$user->id;
-        if (!empty($user->socid)) $sql_usr .= " AND u.fk_soc = ".$user->socid;
+		if (empty($user->rights->user->user->lire)) $sql_usr .= " AND u.rowid = ".$user->id;
+		if (!empty($user->socid)) $sql_usr .= " AND u.fk_soc = ".$user->socid;
 
-	    //Add hook to filter on user (for exemple on usergroup define in custom modules)
-	    if (!empty($reshook)) $sql_usr .= $hookmanager->resArray[0];
+		//Add hook to filter on user (for exemple on usergroup define in custom modules)
+		if (!empty($reshook)) $sql_usr .= $hookmanager->resArray[0];
 
-        // Add existing sales representatives of thirdparty of external user
-        if (empty($user->rights->user->user->lire) && $user->socid)
-        {
-            $sql_usr .= " UNION ";
-            $sql_usr .= "SELECT u2.rowid, u2.lastname, u2.firstname, u2.statut, u2.login";
-            $sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u2, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		// Add existing sales representatives of thirdparty of external user
+		if (empty($user->rights->user->user->lire) && $user->socid)
+		{
+			$sql_usr .= " UNION ";
+			$sql_usr .= "SELECT u2.rowid, u2.lastname, u2.firstname, u2.statut as status, u2.login, u2.photo, u2.gender, u2.entity, u2.admin";
+			$sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u2, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 
-            if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
-            {
-            	if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
-            		$sql_usr .= " WHERE u2.entity IS NOT NULL"; // Show all users
-            	} else {
-            		$sql_usr .= " WHERE EXISTS (SELECT ug2.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug2 WHERE u2.rowid = ug2.fk_user AND ug2.entity IN (".getEntity('usergroup')."))";
-            	}
-            } else {
-            	$sql_usr .= " WHERE u2.entity IN (".getEntity('user').")";
-            }
+			if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+			{
+				if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
+					$sql_usr .= " WHERE u2.entity IS NOT NULL"; // Show all users
+				} else {
+					$sql_usr .= " WHERE EXISTS (SELECT ug2.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug2 WHERE u2.rowid = ug2.fk_user AND ug2.entity IN (".getEntity('usergroup')."))";
+				}
+			} else {
+				$sql_usr .= " WHERE u2.entity IN (".getEntity('user').")";
+			}
 
-            $sql_usr .= " AND u2.rowid = sc.fk_user AND sc.fk_soc=".$user->socid;
+			$sql_usr .= " AND u2.rowid = sc.fk_user AND sc.fk_soc=".$user->socid;
 
-	        //Add hook to filter on user (for exemple on usergroup define in custom modules)
-	        if (!empty($reshook)) $sql_usr .= $hookmanager->resArray[1];
-        }
-	    $sql_usr .= " ORDER BY statut DESC, lastname ASC"; // Do not use 'ORDER BY u.statut' here, not compatible with the UNION.
-        //print $sql_usr;exit;
+			//Add hook to filter on user (for exemple on usergroup define in custom modules)
+			if (!empty($reshook)) $sql_usr .= $hookmanager->resArray[1];
+		}
+		$sql_usr .= " ORDER BY statut DESC, lastname ASC"; // Do not use 'ORDER BY u.statut' here, not compatible with the UNION.
+		//print $sql_usr;exit;
 
-        $resql_usr = $this->db->query($sql_usr);
-        if ($resql_usr)
-        {
-            while ($obj_usr = $this->db->fetch_object($resql_usr))
-            {
-                $out .= '<option value="'.$obj_usr->rowid.'"';
+		$resql_usr = $this->db->query($sql_usr);
+		if ($resql_usr)
+		{
+			$userstatic = new User($this->db);
+			$showstatus = 1;
 
-                if ($obj_usr->rowid == $selected) $out .= ' selected';
+			while ($obj_usr = $this->db->fetch_object($resql_usr))
+			{
+				$userstatic->id = $obj_usr->rowid;
+				$userstatic->lastname = $obj_usr->lastname;
+				$userstatic->firstname = $obj_usr->firstname;
+				$userstatic->photo = $obj_usr->photo;
+				$userstatic->statut = $obj_usr->status;
+				$userstatic->entity = $obj_usr->entity;
+				$userstatic->admin = $obj_usr->admin;
 
-                $out .= '>';
-                $out .= dolGetFirstLastname($obj_usr->firstname, $obj_usr->lastname);
-                // Complete name with more info
-                $moreinfo = 0;
-                if (!empty($conf->global->MAIN_SHOW_LOGIN))
-                {
-                    $out .= ($moreinfo ? ' - ' : ' (').$obj_usr->login;
-                    $moreinfo++;
-                }
-                if ($showstatus >= 0)
-                {
-					if ($obj_usr->statut == 1 && $showstatus == 1)
+				$labeltoshow = dolGetFirstLastname($obj_usr->firstname, $obj_usr->lastname);
+				if (empty($obj_usr->firstname) && empty($obj_usr->lastname)) $labeltoshow = $obj_usr->login;
+
+				$out .= '<option value="'.$obj_usr->rowid.'"';
+				if ($obj_usr->rowid == $selected) $out .= ' selected';
+				$out .= ' data-html="';
+				$outhtml = '';
+				if (!empty($obj_usr->photo))
+				{
+					$outhtml .= $userstatic->getNomUrl(-3, '', 0, 1, 24, 1, 'login', '', 1).' ';
+				}
+				if ($showstatus >= 0 && $obj_usr->status == 0) $outhtml .= '<strike class="opacitymediumxxx">';
+				$outhtml .= $labeltoshow;
+				if ($showstatus >= 0 && $obj_usr->status == 0) $outhtml .= '</strike>';
+				$out .= dol_escape_htmltag($outhtml);
+				$out .= '">';
+
+				$out .= $labeltoshow;
+				// Complete name with more info
+				$moreinfo = 0;
+				if (!empty($conf->global->MAIN_SHOW_LOGIN))
+				{
+					$out .= ($moreinfo ? ' - ' : ' (').$obj_usr->login;
+					$moreinfo++;
+				}
+				if ($showstatus >= 0)
+				{
+					if ($obj_usr->status == 1 && $showstatus == 1)
 					{
 						$out .= ($moreinfo ? ' - ' : ' (').$langs->trans('Enabled');
-	                	$moreinfo++;
+						$moreinfo++;
 					}
-					if ($obj_usr->statut == 0)
+					if ($obj_usr->status == 0)
 					{
 						$out .= ($moreinfo ? ' - ' : ' (').$langs->trans('Disabled');
-                		$moreinfo++;
+						$moreinfo++;
 					}
 				}
 				$out .= ($moreinfo ? ')' : '');
-                $out .= '</option>';
-            }
-            $this->db->free($resql_usr);
-        } else {
-            dol_print_error($this->db);
-        }
+				$out .= '</option>';
+			}
+			$this->db->free($resql_usr);
+		} else {
+			dol_print_error($this->db);
+		}
 
-        if ($norepresentative)
-        {
-        	$langs->load("companies");
-        	$out .= '<option value="-2"'.($selected == -2 ? ' selected' : '').'>- '.$langs->trans("NoSalesRepresentativeAffected").' -</option>';
-        }
+		if ($norepresentative)
+		{
+			$langs->load("companies");
+			$out .= '<option value="-2"'.($selected == -2 ? ' selected' : '').'>- '.$langs->trans("NoSalesRepresentativeAffected").' -</option>';
+		}
 
-        $out .= '</select>';
+		$out .= '</select>';
 
-        return $out;
-    }
+		return $out;
+	}
 
-    /**
-     *	Return list of project and tasks
-     *
-     *	@param  int		$selectedtask   		Pre-selected task
-     *  @param  int		$projectid				Project id
-     * 	@param  string	$htmlname    			Name of html select
-     * 	@param	int		$modeproject			1 to restrict on projects owned by user
-     * 	@param	int		$modetask				1 to restrict on tasks associated to user
-     * 	@param	int		$mode					0=Return list of tasks and their projects, 1=Return projects and tasks if exists
-     *  @param  int		$useempty       		0=Allow empty values
-     *  @param	int		$disablechildoftaskid	1=Disable task that are child of the provided task id
+	/**
+	 *	Return list of project and tasks
+	 *
+	 *	@param  int		$selectedtask   		Pre-selected task
+	 *  @param  int		$projectid				Project id
+	 * 	@param  string	$htmlname    			Name of html select
+	 * 	@param	int		$modeproject			1 to restrict on projects owned by user
+	 * 	@param	int		$modetask				1 to restrict on tasks associated to user
+	 * 	@param	int		$mode					0=Return list of tasks and their projects, 1=Return projects and tasks if exists
+	 *  @param  int		$useempty       		0=Allow empty values
+	 *  @param	int		$disablechildoftaskid	1=Disable task that are child of the provided task id
 	 *  @param	string	$filteronprojstatus		Filter on project status ('-1'=no filter, '0,1'=Draft+Validated status)
-     *  @param	string	$morecss				More css
-     *  @return	void
-     */
-    public function selectProjectTasks($selectedtask = '', $projectid = 0, $htmlname = 'task_parent', $modeproject = 0, $modetask = 0, $mode = 0, $useempty = 0, $disablechildoftaskid = 0, $filteronprojstatus = '', $morecss = '')
-    {
-        global $user, $langs;
+	 *  @param	string	$morecss				More css
+	 *  @return	void
+	 */
+	public function selectProjectTasks($selectedtask = '', $projectid = 0, $htmlname = 'task_parent', $modeproject = 0, $modetask = 0, $mode = 0, $useempty = 0, $disablechildoftaskid = 0, $filteronprojstatus = '', $morecss = '')
+	{
+		global $user, $langs;
 
-        require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 
-        //print $modeproject.'-'.$modetask;
-        $task = new Task($this->db);
-        $tasksarray = $task->getTasksArray($modetask ? $user : 0, $modeproject ? $user : 0, $projectid, 0, $mode, '', $filteronprojstatus);
-        if ($tasksarray)
-        {
-        	print '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
-            if ($useempty) print '<option value="0">&nbsp;</option>';
-            $j = 0;
-            $level = 0;
-            $this->_pLineSelect($j, 0, $tasksarray, $level, $selectedtask, $projectid, $disablechildoftaskid);
-            print '</select>';
+		//print $modeproject.'-'.$modetask;
+		$task = new Task($this->db);
+		$tasksarray = $task->getTasksArray($modetask ? $user : 0, $modeproject ? $user : 0, $projectid, 0, $mode, '', $filteronprojstatus);
+		if ($tasksarray)
+		{
+			print '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
+			if ($useempty) print '<option value="0">&nbsp;</option>';
+			$j = 0;
+			$level = 0;
+			$this->_pLineSelect($j, 0, $tasksarray, $level, $selectedtask, $projectid, $disablechildoftaskid);
+			print '</select>';
 
-            print ajax_combobox($htmlname);
-        } else {
-            print '<div class="warning">'.$langs->trans("NoProject").'</div>';
-        }
-    }
+			print ajax_combobox($htmlname);
+		} else {
+			print '<div class="warning">'.$langs->trans("NoProject").'</div>';
+		}
+	}
 
-    /**
-     * Write lines of a project (all lines of a project if parent = 0)
-     *
-     * @param 	int		$inc					Cursor counter
-     * @param 	int		$parent					Id of parent task we want to see
-     * @param 	array	$lines					Array of task lines
-     * @param 	int		$level					Level
-     * @param 	int		$selectedtask			Id selected task
-     * @param 	int		$selectedproject		Id selected project
-     * @param	int		$disablechildoftaskid	1=Disable task that are child of the provided task id
-     * @return	void
-     */
-    private function _pLineSelect(&$inc, $parent, $lines, $level = 0, $selectedtask = 0, $selectedproject = 0, $disablechildoftaskid = 0)
-    {
-        global $langs, $user, $conf;
+	/**
+	 * Write lines of a project (all lines of a project if parent = 0)
+	 *
+	 * @param 	int		$inc					Cursor counter
+	 * @param 	int		$parent					Id of parent task we want to see
+	 * @param 	array	$lines					Array of task lines
+	 * @param 	int		$level					Level
+	 * @param 	int		$selectedtask			Id selected task
+	 * @param 	int		$selectedproject		Id selected project
+	 * @param	int		$disablechildoftaskid	1=Disable task that are child of the provided task id
+	 * @return	void
+	 */
+	private function _pLineSelect(&$inc, $parent, $lines, $level = 0, $selectedtask = 0, $selectedproject = 0, $disablechildoftaskid = 0)
+	{
+		global $langs, $user, $conf;
 
-        $lastprojectid = 0;
+		$lastprojectid = 0;
 
-        $numlines = count($lines);
-        for ($i = 0; $i < $numlines; $i++) {
-            if ($lines[$i]->fk_parent == $parent) {
-                //var_dump($selectedproject."--".$selectedtask."--".$lines[$i]->fk_project."_".$lines[$i]->id);		// $lines[$i]->id may be empty if project has no lines
+		$numlines = count($lines);
+		for ($i = 0; $i < $numlines; $i++) {
+			if ($lines[$i]->fk_parent == $parent) {
+				//var_dump($selectedproject."--".$selectedtask."--".$lines[$i]->fk_project."_".$lines[$i]->id);		// $lines[$i]->id may be empty if project has no lines
 
-                // Break on a new project
-                if ($parent == 0)	// We are on a task at first level
-                {
-                    if ($lines[$i]->fk_project != $lastprojectid)	// Break found on project
-                    {
-                        if ($i > 0) print '<option value="0" disabled>----------</option>';
-                        print '<option value="'.$lines[$i]->fk_project.'_0"';
-                        if ($selectedproject == $lines[$i]->fk_project) print ' selected';
-                        print '>'; // Project -> Task
-                        print $langs->trans("Project").' '.$lines[$i]->projectref;
-                        if (empty($lines[$i]->public))
-                        {
-                            print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';
-                        } else {
-                            print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';
-                        }
-                        //print '-'.$parent.'-'.$lines[$i]->fk_project.'-'.$lastprojectid;
-                        print "</option>\n";
+				// Break on a new project
+				if ($parent == 0)	// We are on a task at first level
+				{
+					if ($lines[$i]->fk_project != $lastprojectid)	// Break found on project
+					{
+						if ($i > 0) print '<option value="0" disabled>----------</option>';
+						print '<option value="'.$lines[$i]->fk_project.'_0"';
+						if ($selectedproject == $lines[$i]->fk_project) print ' selected';
 
-                        $lastprojectid = $lines[$i]->fk_project;
-                        $inc++;
-                    }
-                }
+						$labeltoshow = $langs->trans("Project").' '.$lines[$i]->projectref;
+						if (empty($lines[$i]->public)) {
+							$labeltoshow .= ' <span class="opacitymedium">('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')</span>';
+						} else {
+							$labeltoshow .= ' <span class="opacitymedium">('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')</span>';
+						}
 
-                $newdisablechildoftaskid = $disablechildoftaskid;
+						print ' data-html="'.dol_escape_htmltag($labeltoshow).'"';
+						print '>'; // Project -> Task
+						print $labeltoshow;
+						print "</option>\n";
 
-                // Print task
-                if (isset($lines[$i]->id))		// We use isset because $lines[$i]->id may be null if project has no task and are on root project (tasks may be caught by a left join). We enter here only if '0' or >0
-                {
-                	// Check if we must disable entry
-                	$disabled = 0;
-                	if ($disablechildoftaskid && (($lines[$i]->id == $disablechildoftaskid || $lines[$i]->fk_parent == $disablechildoftaskid)))
-                	{
-               			$disabled++;
-               			if ($lines[$i]->fk_parent == $disablechildoftaskid) $newdisablechildoftaskid = $lines[$i]->id; // If task is child of a disabled parent, we will propagate id to disable next child too
-                	}
+						$lastprojectid = $lines[$i]->fk_project;
+						$inc++;
+					}
+				}
 
-                    print '<option value="'.$lines[$i]->fk_project.'_'.$lines[$i]->id.'"';
-                    if (($lines[$i]->id == $selectedtask) || ($lines[$i]->fk_project.'_'.$lines[$i]->id == $selectedtask)) print ' selected';
-                    if ($disabled) print ' disabled';
-                    print '>';
-                    print $langs->trans("Project").' '.$lines[$i]->projectref;
-                    print ' '.$lines[$i]->projectlabel;
-                    if (empty($lines[$i]->public))
-                    {
-                        print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';
-                    } else {
-                        print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';
-                    }
-                    if ($lines[$i]->id) print ' > ';
-                    for ($k = 0; $k < $level; $k++)
-                    {
-                        print "&nbsp;&nbsp;&nbsp;";
-                    }
-                    print $lines[$i]->ref.' '.$lines[$i]->label."</option>\n";
-                    $inc++;
-                }
+				$newdisablechildoftaskid = $disablechildoftaskid;
 
-                $level++;
-                if ($lines[$i]->id) $this->_pLineSelect($inc, $lines[$i]->id, $lines, $level, $selectedtask, $selectedproject, $newdisablechildoftaskid);
-                $level--;
-            }
-        }
-    }
+				// Print task
+				if (isset($lines[$i]->id))		// We use isset because $lines[$i]->id may be null if project has no task and are on root project (tasks may be caught by a left join). We enter here only if '0' or >0
+				{
+					// Check if we must disable entry
+					$disabled = 0;
+					if ($disablechildoftaskid && (($lines[$i]->id == $disablechildoftaskid || $lines[$i]->fk_parent == $disablechildoftaskid)))
+					{
+			   			$disabled++;
+			   			if ($lines[$i]->fk_parent == $disablechildoftaskid) $newdisablechildoftaskid = $lines[$i]->id; // If task is child of a disabled parent, we will propagate id to disable next child too
+					}
+
+					print '<option value="'.$lines[$i]->fk_project.'_'.$lines[$i]->id.'"';
+					if (($lines[$i]->id == $selectedtask) || ($lines[$i]->fk_project.'_'.$lines[$i]->id == $selectedtask)) print ' selected';
+					if ($disabled) print ' disabled';
+
+					$labeltoshow = $langs->trans("Project").' '.$lines[$i]->projectref;
+					$labeltoshow .= ' '.$lines[$i]->projectlabel;
+					if (empty($lines[$i]->public))
+					{
+						$labeltoshow .= ' <span class="opacitymedium">('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')</span>';
+					} else {
+						$labeltoshow .= ' <span class="opacitymedium">('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')</span>';
+					}
+					if ($lines[$i]->id) $labeltoshow .= ' > ';
+					for ($k = 0; $k < $level; $k++)
+					{
+						$labeltoshow .= "&nbsp;&nbsp;&nbsp;";
+					}
+					$labeltoshow .= $lines[$i]->ref.' '.$lines[$i]->label;
+
+					print ' data-html="'.dol_escape_htmltag($labeltoshow).'"';
+					print '>';
+					print $labeltoshow;
+					print "</option>\n";
+					$inc++;
+				}
+
+				$level++;
+				if ($lines[$i]->id) $this->_pLineSelect($inc, $lines[$i]->id, $lines, $level, $selectedtask, $selectedproject, $newdisablechildoftaskid);
+				$level--;
+			}
+		}
+	}
 
 
-    /**
-     *  Output a HTML thumb of color or a text if not defined.
-     *
-     *  @param	string		$color				String with hex (FFFFFF) or comma RGB ('255,255,255')
-     *  @param	string		$textifnotdefined	Text to show if color not defined
-     *  @return	string							HTML code for color thumb
-     *  @see selectColor()
-     */
-    public static function showColor($color, $textifnotdefined = '')
-    {
-    	$textcolor = 'FFF';
-    	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-    	if (colorIsLight($color)) $textcolor = '000';
+	/**
+	 *  Output a HTML thumb of color or a text if not defined.
+	 *
+	 *  @param	string		$color				String with hex (FFFFFF) or comma RGB ('255,255,255')
+	 *  @param	string		$textifnotdefined	Text to show if color not defined
+	 *  @return	string							HTML code for color thumb
+	 *  @see selectColor()
+	 */
+	public static function showColor($color, $textifnotdefined = '')
+	{
+		$textcolor = 'FFF';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		if (colorIsLight($color)) $textcolor = '000';
 
-    	$color = colorArrayToHex(colorStringToArray($color, array()), '');
+		$color = colorArrayToHex(colorStringToArray($color, array()), '');
 
 		if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; color: #'.$textcolor.'; background-color: #'.$color.'" value="'.$color.'">';
 		else print $textifnotdefined;
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Output a HTML code to select a color
-     *
-     *  @param	string		$set_color		Pre-selected color
-     *  @param	string		$prefix			Name of HTML field
-     *  @param	string		$form_name		Deprecated. Not used.
-     *  @param	int			$showcolorbox	1=Show color code and color box, 0=Show only color code
-     *  @param 	array		$arrayofcolors	Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
-     *  @return	void
-     *  @deprecated Use instead selectColor
-     *  @see selectColor()
-     */
-    public function select_color($set_color = '', $prefix = 'f_color', $form_name = '', $showcolorbox = 1, $arrayofcolors = '')
-    {
-        // phpcs:enable
-    	print $this->selectColor($set_color, $prefix, $form_name, $showcolorbox, $arrayofcolors);
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Output a HTML code to select a color
+	 *
+	 *  @param	string		$set_color		Pre-selected color
+	 *  @param	string		$prefix			Name of HTML field
+	 *  @param	string		$form_name		Deprecated. Not used.
+	 *  @param	int			$showcolorbox	1=Show color code and color box, 0=Show only color code
+	 *  @param 	array		$arrayofcolors	Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
+	 *  @return	void
+	 *  @deprecated Use instead selectColor
+	 *  @see selectColor()
+	 */
+	public function select_color($set_color = '', $prefix = 'f_color', $form_name = '', $showcolorbox = 1, $arrayofcolors = '')
+	{
+		// phpcs:enable
+		print $this->selectColor($set_color, $prefix, $form_name, $showcolorbox, $arrayofcolors);
+	}
 
-    /**
-     *  Output a HTML code to select a color. Field will return an hexa color like '334455'.
-     *
-     *  @param	string		$set_color		Pre-selected color
-     *  @param	string		$prefix			Name of HTML field
-     *  @param	string		$form_name		Deprecated. Not used.
-     *  @param	int			$showcolorbox	1=Show color code and color box, 0=Show only color code
-     *  @param 	array		$arrayofcolors	Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
-     *  @param	string		$morecss		Add css style into input field
-     *  @return	string
-     *  @see showColor()
-     */
-    public static function selectColor($set_color = '', $prefix = 'f_color', $form_name = '', $showcolorbox = 1, $arrayofcolors = '', $morecss = '')
-    {
-        // Deprecation warning
-        if ($form_name) {
-            dol_syslog(__METHOD__.": form_name parameter is deprecated", LOG_WARNING);
-        }
+	/**
+	 *  Output a HTML code to select a color. Field will return an hexa color like '334455'.
+	 *
+	 *  @param	string		$set_color		Pre-selected color
+	 *  @param	string		$prefix			Name of HTML field
+	 *  @param	string		$form_name		Deprecated. Not used.
+	 *  @param	int			$showcolorbox	1=Show color code and color box, 0=Show only color code
+	 *  @param 	array		$arrayofcolors	Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
+	 *  @param	string		$morecss		Add css style into input field
+	 *  @param	string		$setpropertyonselect	Set this property after selecting a color
+	 *  @return	string
+	 *  @see showColor()
+	 */
+	public static function selectColor($set_color = '', $prefix = 'f_color', $form_name = '', $showcolorbox = 1, $arrayofcolors = '', $morecss = '', $setpropertyonselect = '')
+	{
+		// Deprecation warning
+		if ($form_name) {
+			dol_syslog(__METHOD__.": form_name parameter is deprecated", LOG_WARNING);
+		}
 
-        global $langs, $conf;
+		global $langs, $conf;
 
-        $out = '';
+		$out = '';
 
-        if (!is_array($arrayofcolors) || count($arrayofcolors) < 1)
-        {
-            $langs->load("other");
-            if (empty($conf->dol_use_jmobile) && !empty($conf->use_javascript_ajax))
-            {
-	            $out .= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />';
-	            $out .= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';
-	            $out .= '<script type="text/javascript">
+		if (!is_array($arrayofcolors) || count($arrayofcolors) < 1)
+		{
+			$langs->load("other");
+			if (empty($conf->dol_use_jmobile) && !empty($conf->use_javascript_ajax))
+			{
+				$out .= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />';
+				$out .= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';
+				$out .= '<script type="text/javascript">
 	             jQuery(document).ready(function(){
 	                $(\'#colorpicker'.$prefix.'\').jPicker( {
-	                window: {
-	                  title: \''.dol_escape_js($langs->trans("SelectAColor")).'\', /* any title for the jPicker window itself - displays "Drag Markers To Pick A Color" if left null */
-	                  effects:
-	                    {
-	                    type: \'show\', /* effect used to show/hide an expandable picker. Acceptable values "slide", "show", "fade" */
-	                    speed:
-	                    {
-	                      show: \'fast\', /* duration of "show" effect. Acceptable values are "fast", "slow", or time in ms */
-	                      hide: \'fast\' /* duration of "hide" effect. Acceptable values are "fast", "slow", or time in ms */
-	                    }
-	                    },
-	                  position:
-	                    {
-	                    x: \'screenCenter\', /* acceptable values "left", "center", "right", "screenCenter", or relative px value */
-	                    y: \'center\' /* acceptable values "top", "bottom", "center", or relative px value */
-	                    },
-	                },
-	                images: {
-	                    clientPath: \''.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/images/\',
-	                    picker: { file: \'../../../../../theme/common/colorpicker.png\', width: 14, height: 14 }
-	          		},
-	                localization: // alter these to change the text presented by the picker (e.g. different language)
-	                  {
-	                    text:
-	                    {
-	                      title: \''.dol_escape_js($langs->trans("SelectAColor")).'\',
-	                      newColor: \''.dol_escape_js($langs->trans("New")).'\',
-	                      currentColor: \''.dol_escape_js($langs->trans("Current")).'\',
-	                      ok: \''.dol_escape_js($langs->trans("Save")).'\',
-	                      cancel: \''.dol_escape_js($langs->trans("Cancel")).'\'
-	                    }
-	                  }
-			        } ); });
+		                window: {
+		                  title: \''.dol_escape_js($langs->trans("SelectAColor")).'\', /* any title for the jPicker window itself - displays "Drag Markers To Pick A Color" if left null */
+		                  effects:
+		                    {
+		                    type: \'show\', /* effect used to show/hide an expandable picker. Acceptable values "slide", "show", "fade" */
+		                    speed:
+		                    {
+		                      show: \'fast\', /* duration of "show" effect. Acceptable values are "fast", "slow", or time in ms */
+		                      hide: \'fast\' /* duration of "hide" effect. Acceptable values are "fast", "slow", or time in ms */
+		                    }
+		                    },
+		                  position:
+		                    {
+		                    x: \'screenCenter\', /* acceptable values "left", "center", "right", "screenCenter", or relative px value */
+		                    y: \'center\' /* acceptable values "top", "bottom", "center", or relative px value */
+		                    },
+		                },
+		                images: {
+		                    clientPath: \''.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/images/\',
+		                    picker: { file: \'../../../../../theme/common/colorpicker.png\', width: 14, height: 14 }
+		          		},
+		                localization: // alter these to change the text presented by the picker (e.g. different language)
+		                  {
+		                    text:
+		                    {
+		                      title: \''.dol_escape_js($langs->trans("SelectAColor")).'\',
+		                      newColor: \''.dol_escape_js($langs->trans("New")).'\',
+		                      currentColor: \''.dol_escape_js($langs->trans("Current")).'\',
+		                      ok: \''.dol_escape_js($langs->trans("Save")).'\',
+		                      cancel: \''.dol_escape_js($langs->trans("Cancel")).'\'
+		                    }
+		                  }
+				        },
+						function(color, context) { console.log("close"); },
+						function(color, context) { var hex = color.val(\'hex\'); console.log("new color selected in jpicker "+hex);';
+				if ($setpropertyonselect) { $out .= ' if (hex != null) document.documentElement.style.setProperty(\'--'.$setpropertyonselect.'\', \'#\'+hex);'; }
+						$out .= '},
+						function(color, context) { console.log("cancel"); }
+					);
+				 });
 	             </script>';
-            }
-            $out .= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat'.($morecss ? ' '.$morecss : '').'" type="text" value="'.dol_escape_htmltag($set_color).'" />';
-        } else // In most cases, this is not used. We used instead function with no specific list of colors
-        {
-        	if (empty($conf->dol_use_jmobile) && !empty($conf->use_javascript_ajax))
-            {
-	        	$out .= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';
-	            $out .= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';
-	            $out .= '<script type="text/javascript">
+			}
+			$out .= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat'.($morecss ? ' '.$morecss : '').'" type="text" value="'.dol_escape_htmltag($set_color).'" />';
+		} else // In most cases, this is not used. We used instead function with no specific list of colors
+		{
+			if (empty($conf->dol_use_jmobile) && !empty($conf->use_javascript_ajax))
+			{
+				$out .= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';
+				$out .= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';
+				$out .= '<script type="text/javascript">
 	             jQuery(document).ready(function(){
 	                 jQuery(\'#colorpicker'.$prefix.'\').colorpicker({
 	                     size: 14,
@@ -778,275 +816,294 @@ class FormOther
 	                 });
 	             });
 	             </script>';
-            }
-            $out .= '<select id="colorpicker'.$prefix.'" class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$prefix.'">';
-            //print '<option value="-1">&nbsp;</option>';
-            foreach ($arrayofcolors as $val)
-            {
-                $out .= '<option value="'.$val.'"';
-                if ($set_color == $val) $out .= ' selected';
-                $out .= '>'.$val.'</option>';
-            }
-            $out .= '</select>';
-        }
+			}
+			$out .= '<select id="colorpicker'.$prefix.'" class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$prefix.'">';
+			//print '<option value="-1">&nbsp;</option>';
+			foreach ($arrayofcolors as $val)
+			{
+				$out .= '<option value="'.$val.'"';
+				if ($set_color == $val) $out .= ' selected';
+				$out .= '>'.$val.'</option>';
+			}
+			$out .= '</select>';
+		}
 
-        return $out;
-    }
+		return $out;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Creation d'un icone de couleur
-     *
-     *	@param	string	$color		Couleur de l'image
-     *	@param	string	$module 	Nom du module
-     *	@param	string	$name		Nom de l'image
-     *	@param	int		$x 			Largeur de l'image en pixels
-     *	@param	int		$y      	Hauteur de l'image en pixels
-     *	@return	void
-     */
-    public function CreateColorIcon($color, $module, $name, $x = '12', $y = '12')
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Creation d'un icone de couleur
+	 *
+	 *	@param	string	$color		Couleur de l'image
+	 *	@param	string	$module 	Nom du module
+	 *	@param	string	$name		Nom de l'image
+	 *	@param	int		$x 			Largeur de l'image en pixels
+	 *	@param	int		$y      	Hauteur de l'image en pixels
+	 *	@return	void
+	 */
+	public function CreateColorIcon($color, $module, $name, $x = '12', $y = '12')
+	{
+		// phpcs:enable
+		global $conf;
 
-        $file = $conf->$module->dir_temp.'/'.$name.'.png';
+		$file = $conf->$module->dir_temp.'/'.$name.'.png';
 
-        // On cree le repertoire contenant les icones
-        if (!file_exists($conf->$module->dir_temp))
-        {
-            dol_mkdir($conf->$module->dir_temp);
-        }
+		// On cree le repertoire contenant les icones
+		if (!file_exists($conf->$module->dir_temp))
+		{
+			dol_mkdir($conf->$module->dir_temp);
+		}
 
-        // On cree l'image en vraies couleurs
-        $image = imagecreatetruecolor($x, $y);
+		// On cree l'image en vraies couleurs
+		$image = imagecreatetruecolor($x, $y);
 
-        $color = substr($color, 1, 6);
+		$color = substr($color, 1, 6);
 
-        $rouge = hexdec(substr($color, 0, 2)); //conversion du canal rouge
-        $vert  = hexdec(substr($color, 2, 2)); //conversion du canal vert
-        $bleu  = hexdec(substr($color, 4, 2)); //conversion du canal bleu
+		$rouge = hexdec(substr($color, 0, 2)); //conversion du canal rouge
+		$vert  = hexdec(substr($color, 2, 2)); //conversion du canal vert
+		$bleu  = hexdec(substr($color, 4, 2)); //conversion du canal bleu
 
-        $couleur = imagecolorallocate($image, $rouge, $vert, $bleu);
-        //print $rouge.$vert.$bleu;
-        imagefill($image, 0, 0, $couleur); //on remplit l'image
-        // On cree la couleur et on l'attribue a une variable pour ne pas la perdre
-        ImagePng($image, $file); //renvoie une image sous format png
-        ImageDestroy($image);
-    }
+		$couleur = imagecolorallocate($image, $rouge, $vert, $bleu);
+		//print $rouge.$vert.$bleu;
+		imagefill($image, 0, 0, $couleur); //on remplit l'image
+		// On cree la couleur et on l'attribue a une variable pour ne pas la perdre
+		ImagePng($image, $file); //renvoie une image sous format png
+		ImageDestroy($image);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    	Return HTML combo list of week
-     *
-     *    	@param	string		$selected          Preselected value
-     *    	@param  string		$htmlname          Nom de la zone select
-     *    	@param  int			$useempty          Affiche valeur vide dans liste
-     *    	@return	string
-     */
-    public function select_dayofweek($selected = '', $htmlname = 'weekid', $useempty = 0)
-    {
-        // phpcs:enable
-        global $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    	Return HTML combo list of week
+	 *
+	 *    	@param	string		$selected          Preselected value
+	 *    	@param  string		$htmlname          Nom de la zone select
+	 *    	@param  int			$useempty          Affiche valeur vide dans liste
+	 *    	@return	string
+	 */
+	public function select_dayofweek($selected = '', $htmlname = 'weekid', $useempty = 0)
+	{
+		// phpcs:enable
+		global $langs;
 
-        $week = array(
-            0=>$langs->trans("Day0"),
-            1=>$langs->trans("Day1"),
-            2=>$langs->trans("Day2"),
-            3=>$langs->trans("Day3"),
-            4=>$langs->trans("Day4"),
-            5=>$langs->trans("Day5"),
-            6=>$langs->trans("Day6")
-        );
+		$week = array(
+			0=>$langs->trans("Day0"),
+			1=>$langs->trans("Day1"),
+			2=>$langs->trans("Day2"),
+			3=>$langs->trans("Day3"),
+			4=>$langs->trans("Day4"),
+			5=>$langs->trans("Day5"),
+			6=>$langs->trans("Day6")
+		);
 
-        $select_week = '<select class="flat" name="'.$htmlname.'">';
-        if ($useempty)
-        {
-            $select_week .= '<option value="-1">&nbsp;</option>';
-        }
-        foreach ($week as $key => $val)
-        {
-            if ($selected == $key)
-            {
-                $select_week .= '<option value="'.$key.'" selected>';
-            } else {
-                $select_week .= '<option value="'.$key.'">';
-            }
-            $select_week .= $val;
-            $select_week .= '</option>';
-        }
-        $select_week .= '</select>';
-        return $select_week;
-    }
+		$select_week = '<select class="flat" name="'.$htmlname.'">';
+		if ($useempty)
+		{
+			$select_week .= '<option value="-1">&nbsp;</option>';
+		}
+		foreach ($week as $key => $val)
+		{
+			if ($selected == $key)
+			{
+				$select_week .= '<option value="'.$key.'" selected>';
+			} else {
+				$select_week .= '<option value="'.$key.'">';
+			}
+			$select_week .= $val;
+			$select_week .= '</option>';
+		}
+		$select_week .= '</select>';
+		return $select_week;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *      Return HTML combo list of month
-     *
-     *      @param  string      $selected          	Preselected value
-     *      @param  string      $htmlname          	Name of HTML select object
-     *      @param  int         $useempty          	Show empty in list
-     *      @param  int         $longlabel         	Show long label
-     *      @param	string		$morecss			More Css
-     *      @return string
-     */
-    public function select_month($selected = '', $htmlname = 'monthid', $useempty = 0, $longlabel = 0, $morecss = 'maxwidth50imp valignmiddle')
-    {
-        // phpcs:enable
-        global $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *      Return HTML combo list of month
+	 *
+	 *      @param  string      $selected          	Preselected value
+	 *      @param  string      $htmlname          	Name of HTML select object
+	 *      @param  int         $useempty          	Show empty in list
+	 *      @param  int         $longlabel         	Show long label
+	 *      @param	string		$morecss			More Css
+	 *  	@param  bool		$addjscombo			Add js combo
+	 *      @return string
+	 */
+	public function select_month($selected = '', $htmlname = 'monthid', $useempty = 0, $longlabel = 0, $morecss = 'minwidth50 maxwidth75imp valignmiddle', $addjscombo = false)
+	{
+		// phpcs:enable
+		global $langs;
 
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-        if ($longlabel) $montharray = monthArray($langs, 0); // Get array
-        else $montharray = monthArray($langs, 1);
+		if ($longlabel) $montharray = monthArray($langs, 0); // Get array
+		else $montharray = monthArray($langs, 1);
 
-        $select_month = '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
-        if ($useempty)
-        {
-            $select_month .= '<option value="0">&nbsp;</option>';
-        }
-        foreach ($montharray as $key => $val)
-        {
-            if ($selected == $key)
-            {
-                $select_month .= '<option value="'.$key.'" selected>';
-            } else {
-                $select_month .= '<option value="'.$key.'">';
-            }
-            $select_month .= $val;
-            $select_month .= '</option>';
-        }
-        $select_month .= '</select>';
-        return $select_month;
-    }
+		$select_month = '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
+		if ($useempty)
+		{
+			$select_month .= '<option value="0">&nbsp;</option>';
+		}
+		foreach ($montharray as $key => $val)
+		{
+			if ($selected == $key)
+			{
+				$select_month .= '<option value="'.$key.'" selected>';
+			} else {
+				$select_month .= '<option value="'.$key.'">';
+			}
+			$select_month .= $val;
+			$select_month .= '</option>';
+		}
+		$select_month .= '</select>';
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Return HTML combo list of years
-     *
-     *  @param  string		$selected       Preselected value (''=current year, -1=none, year otherwise)
-     *  @param  string		$htmlname       Name of HTML select object
-     *  @param  int			$useempty       Affiche valeur vide dans liste
-     *  @param  int			$min_year       Offset of minimum year into list (by default current year -10)
-     *  @param  int		    $max_year		Offset of maximum year into list (by default current year + 5)
-     *  @param	int			$offset			Offset
-     *  @param	int			$invert			Invert
-     *  @param	string		$option			Option
-     *  @param	string		$morecss		More CSS
-     *  @return	string
-     */
-    public function select_year($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle maxwidth75imp')
-    {
-        // phpcs:enable
-        print $this->selectyear($selected, $htmlname, $useempty, $min_year, $max_year, $offset, $invert, $option, $morecss);
-    }
+		// Add code for jquery to use multiselect
+		if ($addjscombo)
+		{
+			// Enhance with select2
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+			$select_month .= ajax_combobox($htmlname);
+		}
 
-    /**
-     *	Return HTML combo list of years
-     *
-     *  @param  string	$selected       Preselected value (''=current year, -1=none, year otherwise)
-     *  @param  string	$htmlname       Name of HTML select object
-     *  @param  int	    $useempty       Affiche valeur vide dans liste
-     *  @param  int	    $min_year		Offset of minimum year into list (by default current year -10)
-     *  @param  int	    $max_year       Offset of maximum year into list (by default current year + 5)
-     *  @param	int		$offset			Offset
-     *  @param	int		$invert			Invert
-     *  @param	string	$option			Option
-     *  @param	string	$morecss		More css
-     *  @return	string
-     */
-    public function selectyear($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle maxwidth75imp')
-    {
-        $out = '';
+		return $select_month;
+	}
 
-        $currentyear = date("Y") + $offset;
-        $max_year = $currentyear + $max_year;
-        $min_year = $currentyear - $min_year;
-        if (empty($selected) && empty($useempty)) $selected = $currentyear;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return HTML combo list of years
+	 *
+	 *  @param  string		$selected       Preselected value (''=current year, -1=none, year otherwise)
+	 *  @param  string		$htmlname       Name of HTML select object
+	 *  @param  int			$useempty       Affiche valeur vide dans liste
+	 *  @param  int			$min_year       Offset of minimum year into list (by default current year -10)
+	 *  @param  int		    $max_year		Offset of maximum year into list (by default current year + 5)
+	 *  @param	int			$offset			Offset
+	 *  @param	int			$invert			Invert
+	 *  @param	string		$option			Option
+	 *  @param	string		$morecss		More CSS
+	 *  @return	string
+	 */
+	public function select_year($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle maxwidth75imp')
+	{
+		// phpcs:enable
+		print $this->selectyear($selected, $htmlname, $useempty, $min_year, $max_year, $offset, $invert, $option, $morecss);
+	}
 
-        $out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'"'.$option.' >';
-        if ($useempty)
-        {
-        	$selected_html = '';
-            if ($selected == '') $selected_html = ' selected';
-            $out .= '<option value=""'.$selected_html.'>&nbsp;</option>';
-        }
-        if (!$invert)
-        {
-            for ($y = $max_year; $y >= $min_year; $y--)
-            {
-                $selected_html = '';
-                if ($selected > 0 && $y == $selected) $selected_html = ' selected';
-                $out .= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
-            }
-        } else {
-            for ($y = $min_year; $y <= $max_year; $y++)
-            {
-                $selected_html = '';
-                if ($selected > 0 && $y == $selected) $selected_html = ' selected';
-                $out .= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
-            }
-        }
-        $out .= "</select>\n";
+	/**
+	 *	Return HTML combo list of years
+	 *
+	 *  @param  string	$selected       Preselected value (''=current year, -1=none, year otherwise)
+	 *  @param  string	$htmlname       Name of HTML select object
+	 *  @param  int	    $useempty       Affiche valeur vide dans liste
+	 *  @param  int	    $min_year		Offset of minimum year into list (by default current year -10)
+	 *  @param  int	    $max_year       Offset of maximum year into list (by default current year + 5)
+	 *  @param	int		$offset			Offset
+	 *  @param	int		$invert			Invert
+	 *  @param	string	$option			Option
+	 *  @param	string	$morecss		More css
+	 *  @param  bool	$addjscombo		Add js combo
+	 *  @return	string
+	 */
+	public function selectyear($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle width75', $addjscombo = false)
+	{
+		$out = '';
 
-        return $out;
-    }
+		$currentyear = date("Y") + $offset;
+		$max_year = $currentyear + $max_year;
+		$min_year = $currentyear - $min_year;
+		if (empty($selected) && empty($useempty)) $selected = $currentyear;
+
+		$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'"'.$option.' >';
+		if ($useempty)
+		{
+			$selected_html = '';
+			if ($selected == '') $selected_html = ' selected';
+			$out .= '<option value=""'.$selected_html.'>&nbsp;</option>';
+		}
+		if (!$invert)
+		{
+			for ($y = $max_year; $y >= $min_year; $y--)
+			{
+				$selected_html = '';
+				if ($selected > 0 && $y == $selected) $selected_html = ' selected';
+				$out .= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
+			}
+		} else {
+			for ($y = $min_year; $y <= $max_year; $y++)
+			{
+				$selected_html = '';
+				if ($selected > 0 && $y == $selected) $selected_html = ' selected';
+				$out .= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
+			}
+		}
+		$out .= "</select>\n";
+
+		// Add code for jquery to use multiselect
+		if ($addjscombo)
+		{
+			// Enhance with select2
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+			$out .= ajax_combobox($htmlname);
+		}
+
+		return $out;
+	}
 
 
-    /**
-     * 	Get array with HTML tabs with boxes of a particular area including personalized choices of user.
-     *  Class 'Form' must be known.
-     *
-     * 	@param	   User         $user		 Object User
-     * 	@param	   String       $areacode    Code of area for pages - 0 = Home page ... See getListOfPagesForBoxes()
+	/**
+	 * 	Get array with HTML tabs with boxes of a particular area including personalized choices of user.
+	 *  Class 'Form' must be known.
+	 *
+	 * 	@param	   User         $user		 Object User
+	 * 	@param	   String       $areacode    Code of area for pages - 0 = Home page ... See getListOfPagesForBoxes()
 	 *	@return    array                     array('selectboxlist'=>, 'boxactivated'=>, 'boxlista'=>, 'boxlistb'=>)
-     */
-    public static function getBoxesArea($user, $areacode)
-    {
-        global $conf, $langs, $db;
+	 */
+	public static function getBoxesArea($user, $areacode)
+	{
+		global $conf, $langs, $db;
 
-        include_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
 
-        $confuserzone = 'MAIN_BOXES_'.$areacode;
+		$confuserzone = 'MAIN_BOXES_'.$areacode;
 
-        // $boxactivated will be array of boxes enabled into global setup
-        // $boxidactivatedforuser will be array of boxes choosed by user
+		// $boxactivated will be array of boxes enabled into global setup
+		// $boxidactivatedforuser will be array of boxes choosed by user
 
-        $selectboxlist = '';
-        $boxactivated = InfoBox::listBoxes($db, 'activated', $areacode, (empty($user->conf->$confuserzone) ?null:$user), array(), 0); // Search boxes of common+user (or common only if user has no specific setup)
+		$selectboxlist = '';
+		$boxactivated = InfoBox::listBoxes($db, 'activated', $areacode, (empty($user->conf->$confuserzone) ?null:$user), array(), 0); // Search boxes of common+user (or common only if user has no specific setup)
 
-        $boxidactivatedforuser = array();
-        foreach ($boxactivated as $box)
-        {
-        	if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) $boxidactivatedforuser[$box->id] = $box->id; // We keep only boxes to show for user
-        }
+		$boxidactivatedforuser = array();
+		foreach ($boxactivated as $box)
+		{
+			if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) $boxidactivatedforuser[$box->id] = $box->id; // We keep only boxes to show for user
+		}
 
-        // Define selectboxlist
-        $arrayboxtoactivatelabel = array();
-        if (!empty($user->conf->$confuserzone))
-        {
-        	$boxorder = '';
-        	$langs->load("boxes"); // Load label of boxes
-        	foreach ($boxactivated as $box)
-        	{
-        		if (!empty($boxidactivatedforuser[$box->id])) continue; // Already visible for user
-        		$label = $langs->transnoentitiesnoconv($box->boxlabel);
-        		//if (preg_match('/graph/',$box->class)) $label.=' ('.$langs->trans("Graph").')';
-        		if (preg_match('/graph/', $box->class) && $conf->browser->layout != 'phone')
-        		{
-        			$label = $label.' <span class="fa fa-bar-chart"></span>';
-        		}
-        		$arrayboxtoactivatelabel[$box->id] = $label; // We keep only boxes not shown for user, to show into combo list
-        	}
-            foreach ($boxidactivatedforuser as $boxid)
-        	{
-       			if (empty($boxorder)) $boxorder .= 'A:';
+		// Define selectboxlist
+		$arrayboxtoactivatelabel = array();
+		if (!empty($user->conf->$confuserzone))
+		{
+			$boxorder = '';
+			$langs->load("boxes"); // Load label of boxes
+			foreach ($boxactivated as $box)
+			{
+				if (!empty($boxidactivatedforuser[$box->id])) continue; // Already visible for user
+				$label = $langs->transnoentitiesnoconv($box->boxlabel);
+				//if (preg_match('/graph/',$box->class)) $label.=' ('.$langs->trans("Graph").')';
+				if (preg_match('/graph/', $box->class) && $conf->browser->layout != 'phone')
+				{
+					$label = $label.' <span class="fa fa-bar-chart"></span>';
+				}
+				$arrayboxtoactivatelabel[$box->id] = $label; // We keep only boxes not shown for user, to show into combo list
+			}
+			foreach ($boxidactivatedforuser as $boxid)
+			{
+	   			if (empty($boxorder)) $boxorder .= 'A:';
   				$boxorder .= $boxid.',';
-        	}
+			}
 
-        	//var_dump($boxidactivatedforuser);
+			//var_dump($boxidactivatedforuser);
 
-        	// Class Form must have been already loaded
-        	$selectboxlist .= '<!-- Form with select box list -->'."\n";
+			// Class Form must have been already loaded
+			$selectboxlist .= '<!-- Form with select box list -->'."\n";
 			$selectboxlist .= '<form id="addbox" name="addbox" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 			$selectboxlist .= '<input type="hidden" name="token" value="'.newToken().'">';
 			$selectboxlist .= '<input type="hidden" name="addbox" value="addbox">';
@@ -1054,19 +1111,19 @@ class FormOther
 			$selectboxlist .= '<input type="hidden" name="areacode" value="'.$areacode.'">';
 			$selectboxlist .= '<input type="hidden" name="boxorder" value="'.$boxorder.'">';
 			$selectboxlist .= Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone', 0, 'hidden selected', 0, 1);
-            if (empty($conf->use_javascript_ajax)) $selectboxlist .= ' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';
-            $selectboxlist .= '</form>';
-            if (!empty($conf->use_javascript_ajax))
-            {
-            	include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-            	$selectboxlist .= ajax_combobox("boxcombo");
-            }
-        }
+			if (empty($conf->use_javascript_ajax)) $selectboxlist .= ' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';
+			$selectboxlist .= '</form>';
+			if (!empty($conf->use_javascript_ajax))
+			{
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+				$selectboxlist .= ajax_combobox("boxcombo");
+			}
+		}
 
-        // Javascript code for dynamic actions
-        if (!empty($conf->use_javascript_ajax))
-        {
-	        $selectboxlist .= '<script type="text/javascript" language="javascript">
+		// Javascript code for dynamic actions
+		if (!empty($conf->use_javascript_ajax))
+		{
+			$selectboxlist .= '<script type="text/javascript" language="javascript">
 
 	        // To update list of activated boxes
 	        function updateBoxOrder(closing) {
@@ -1105,8 +1162,8 @@ class FormOther
 	        			window.location.search=\'mainmenu='.GETPOST("mainmenu", "aZ09").'&leftmenu='.GETPOST('leftmenu', "aZ09").'&action=addbox&boxid=\'+boxid;
 	                }
 	        	});';
-	        	if (!count($arrayboxtoactivatelabel)) $selectboxlist .= 'jQuery("#boxcombo").hide();';
-	        	$selectboxlist .= '
+				if (!count($arrayboxtoactivatelabel)) $selectboxlist .= 'jQuery("#boxcombo").hide();';
+				$selectboxlist .= '
 
 	        	jQuery("#boxhalfleft, #boxhalfright").sortable({
 	    	    	handle: \'.boxhandle\',
@@ -1131,144 +1188,145 @@ class FormOther
 
         	});'."\n";
 
-	        $selectboxlist .= '</script>'."\n";
-        }
+			$selectboxlist .= '</script>'."\n";
+		}
 
-        // Define boxlista and boxlistb
-        $nbboxactivated = count($boxidactivatedforuser);
+		// Define boxlista and boxlistb
+		$boxlista = ''; $boxlistb = '';
+		$nbboxactivated = count($boxidactivatedforuser);
 
-        if ($nbboxactivated)
-        {
-        	// Load translation files required by the page
-            $langs->loadLangs(array("boxes", "projects"));
+		if ($nbboxactivated)
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("boxes", "projects"));
 
-            $emptybox = new ModeleBoxes($db);
+			$emptybox = new ModeleBoxes($db);
 
-            $boxlista .= "\n<!-- Box left container -->\n";
+			$boxlista .= "\n<!-- Box left container -->\n";
 
-            // Define $box_max_lines
-            $box_max_lines = 5;
-            if (!empty($conf->global->MAIN_BOXES_MAXLINES)) $box_max_lines = $conf->global->MAIN_BOXES_MAXLINES;
+			// Define $box_max_lines
+			$box_max_lines = 5;
+			if (!empty($conf->global->MAIN_BOXES_MAXLINES)) $box_max_lines = $conf->global->MAIN_BOXES_MAXLINES;
 
-            $ii = 0;
-            foreach ($boxactivated as $key => $box)
-            {
-            	if ((!empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
+			$ii = 0;
+			foreach ($boxactivated as $key => $box)
+			{
+				if ((!empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
 				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order = 'A'.sprintf("%02d", ($ii + 1)); // When box_order was not yet set to Axx or Bxx and is still 0
-            	if (preg_match('/^A/i', $box->box_order)) // column A
-                {
-                    $ii++;
-                    //print 'box_id '.$boxactivated[$ii]->box_id.' ';
-                    //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';
-                    // Show box
-                    $box->loadBox($box_max_lines);
-                    $boxlista .= $box->outputBox();
-                }
-            }
+				if (preg_match('/^A/i', $box->box_order)) // column A
+				{
+					$ii++;
+					//print 'box_id '.$boxactivated[$ii]->box_id.' ';
+					//print 'box_order '.$boxactivated[$ii]->box_order.'<br>';
+					// Show box
+					$box->loadBox($box_max_lines);
+					$boxlista .= $box->showBox(null, null, 1);
+				}
+			}
 
-            if ($conf->browser->layout != 'phone')
-            {
-            	$emptybox->box_id = 'A';
-            	$emptybox->info_box_head = array();
-            	$emptybox->info_box_contents = array();
-            	$boxlista .= $emptybox->outputBox(array(), array());
-            }
-            $boxlista .= "<!-- End box left container -->\n";
+			if ($conf->browser->layout != 'phone')
+			{
+				$emptybox->box_id = 'A';
+				$emptybox->info_box_head = array();
+				$emptybox->info_box_contents = array();
+				$boxlista .= $emptybox->showBox(array(), array(), 1);
+			}
+			$boxlista .= "<!-- End box left container -->\n";
 
-            $boxlistb .= "\n<!-- Box right container -->\n";
+			$boxlistb .= "\n<!-- Box right container -->\n";
 
-            $ii = 0;
-            foreach ($boxactivated as $key => $box)
-            {
-            	if ((!empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
-            	if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order = 'B'.sprintf("%02d", ($ii + 1)); // When box_order was not yet set to Axx or Bxx and is still 0
-            	if (preg_match('/^B/i', $box->box_order)) // colonne B
-                {
-                    $ii++;
-                    //print 'box_id '.$boxactivated[$ii]->box_id.' ';
-                    //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';
-                    // Show box
-                    $box->loadBox($box_max_lines);
-                    $boxlistb .= $box->outputBox();
-                }
-            }
+			$ii = 0;
+			foreach ($boxactivated as $key => $box)
+			{
+				if ((!empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
+				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order = 'B'.sprintf("%02d", ($ii + 1)); // When box_order was not yet set to Axx or Bxx and is still 0
+				if (preg_match('/^B/i', $box->box_order)) // colonne B
+				{
+					$ii++;
+					//print 'box_id '.$boxactivated[$ii]->box_id.' ';
+					//print 'box_order '.$boxactivated[$ii]->box_order.'<br>';
+					// Show box
+					$box->loadBox($box_max_lines);
+					$boxlistb .= $box->showBox(null, null, 1);
+				}
+			}
 
-            if ($conf->browser->layout != 'phone')
-            {
-            	$emptybox->box_id = 'B';
-            	$emptybox->info_box_head = array();
-            	$emptybox->info_box_contents = array();
-            	$boxlistb .= $emptybox->outputBox(array(), array());
-            }
+			if ($conf->browser->layout != 'phone')
+			{
+				$emptybox->box_id = 'B';
+				$emptybox->info_box_head = array();
+				$emptybox->info_box_contents = array();
+				$boxlistb .= $emptybox->showBox(array(), array(), 1);
+			}
 
-            $boxlistb .= "<!-- End box right container -->\n";
-        }
+			$boxlistb .= "<!-- End box right container -->\n";
+		}
 
-        return array('selectboxlist'=>count($boxactivated) ? $selectboxlist : '', 'boxactivated'=>$boxactivated, 'boxlista'=>$boxlista, 'boxlistb'=>$boxlistb);
-    }
+		return array('selectboxlist'=>count($boxactivated) ? $selectboxlist : '', 'boxactivated'=>$boxactivated, 'boxlista'=>$boxlista, 'boxlistb'=>$boxlistb);
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return a HTML select list of a dictionary
-     *
-     *  @param  string	$htmlname          	Name of select zone
-     *  @param	string	$dictionarytable	Dictionary table
-     *  @param	string	$keyfield			Field for key
-     *  @param	string	$labelfield			Label field
-     *  @param	string	$selected			Selected value
-     *  @param  int		$useempty          	1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
-     *  @param  string  $moreattrib         More attributes on HTML select tag
-     * 	@return	void
-     */
-    public function select_dictionary($htmlname, $dictionarytable, $keyfield = 'code', $labelfield = 'label', $selected = '', $useempty = 0, $moreattrib = '')
-    {
-        // phpcs:enable
-        global $langs, $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return a HTML select list of a dictionary
+	 *
+	 *  @param  string	$htmlname          	Name of select zone
+	 *  @param	string	$dictionarytable	Dictionary table
+	 *  @param	string	$keyfield			Field for key
+	 *  @param	string	$labelfield			Label field
+	 *  @param	string	$selected			Selected value
+	 *  @param  int		$useempty          	1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
+	 *  @param  string  $moreattrib         More attributes on HTML select tag
+	 * 	@return	void
+	 */
+	public function select_dictionary($htmlname, $dictionarytable, $keyfield = 'code', $labelfield = 'label', $selected = '', $useempty = 0, $moreattrib = '')
+	{
+		// phpcs:enable
+		global $langs, $conf;
 
-        $langs->load("admin");
+		$langs->load("admin");
 
-        $sql = "SELECT rowid, ".$keyfield.", ".$labelfield;
-        $sql .= " FROM ".MAIN_DB_PREFIX.$dictionarytable;
-        $sql .= " ORDER BY ".$labelfield;
+		$sql = "SELECT rowid, ".$keyfield.", ".$labelfield;
+		$sql .= " FROM ".MAIN_DB_PREFIX.$dictionarytable;
+		$sql .= " ORDER BY ".$labelfield;
 
-        dol_syslog(get_class($this)."::select_dictionary", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $num = $this->db->num_rows($result);
-            $i = 0;
-            if ($num)
-            {
-                print '<select id="select'.$htmlname.'" class="flat selectdictionary" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
-                if ($useempty == 1 || ($useempty == 2 && $num > 1))
-                {
-                    print '<option value="-1">&nbsp;</option>';
-                }
+		dol_syslog(get_class($this)."::select_dictionary", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			if ($num)
+			{
+				print '<select id="select'.$htmlname.'" class="flat selectdictionary" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
+				if ($useempty == 1 || ($useempty == 2 && $num > 1))
+				{
+					print '<option value="-1">&nbsp;</option>';
+				}
 
-                while ($i < $num)
-                {
-                    $obj = $this->db->fetch_object($result);
-                    if ($selected == $obj->rowid || $selected == $obj->$keyfield)
-                    {
-                        print '<option value="'.$obj->$keyfield.'" selected>';
-                    } else {
-                        print '<option value="'.$obj->$keyfield.'">';
-                    }
-                    print $obj->$labelfield;
-                    print '</option>';
-                    $i++;
-                }
-                print "</select>";
-            } else {
-                print $langs->trans("DictionaryEmpty");
-            }
-        } else {
-            dol_print_error($this->db);
-        }
-    }
+				while ($i < $num)
+				{
+					$obj = $this->db->fetch_object($result);
+					if ($selected == $obj->rowid || $selected == $obj->$keyfield)
+					{
+						print '<option value="'.$obj->$keyfield.'" selected>';
+					} else {
+						print '<option value="'.$obj->$keyfield.'">';
+					}
+					print $obj->$labelfield;
+					print '</option>';
+					$i++;
+				}
+				print "</select>";
+			} else {
+				print $langs->trans("DictionaryEmpty");
+			}
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 
-    /**
+	/**
 	 *	Return an html string with a select combo box to choose yes or no
 	 *
 	 *	@param	string		$htmlname		Name of html select field
@@ -1278,7 +1336,7 @@ class FormOther
 	 *  @param	int      	$useempty		1=Add empty line
 	 *	@return	string						See option
 	 */
-    public function selectAutoManual($htmlname, $value = '', $option = 0, $disabled = false, $useempty = 0)
+	public function selectAutoManual($htmlname, $value = '', $option = 0, $disabled = false, $useempty = 0)
 	{
 		global $langs;
 
@@ -1313,9 +1371,10 @@ class FormOther
 	 * @param 	mixed	$object				Object analyzed
 	 * @param	array	$search_groupby		Array of preselected fields
 	 * @param	array	$arrayofgroupby		Array of groupby to fill
+	 * @param	string	$morecss			More CSS
 	 * @return string						HTML string component
 	 */
-	public function selectGroupByField($object, $search_groupby, &$arrayofgroupby)
+	public function selectGroupByField($object, $search_groupby, &$arrayofgroupby, $morecss = 'minwidth200 maxwidth250')
 	{
 		global $langs, $extrafields, $form;
 
@@ -1337,9 +1396,9 @@ class FormOther
 				if (preg_match('/^pass/', $key)) continue;
 				if (in_array($val['type'], array('html', 'text'))) continue;
 				if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
-					$arrayofgroupby['t.'.$key.'-year'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.')', 'position' => $val['position'].'-y');
-					$arrayofgroupby['t.'.$key.'-month'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.')', 'position' => $val['position'].'-m');
-					$arrayofgroupby['t.'.$key.'-day'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.'-'.$DD.')', 'position' => $val['position'].'-d');
+					$arrayofgroupby['t.'.$key.'-year'] = array('label' => $langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.')</span>', 'position' => $val['position'].'-y');
+					$arrayofgroupby['t.'.$key.'-month'] = array('label' => $langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.')</span>', 'position' => $val['position'].'-m');
+					$arrayofgroupby['t.'.$key.'-day'] = array('label' => $langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.'-'.$DD.')</span>', 'position' => $val['position'].'-d');
 				} else {
 					$arrayofgroupby['t.'.$key] = array('label' => $langs->trans($val['label']), 'position' => (int) $val['position']);
 				}
@@ -1359,7 +1418,7 @@ class FormOther
 		foreach ($arrayofgroupby as $key => $val) {
 			$arrayofgroupbylabel[$key] = $val['label'];
 		}
-		$result = $form->selectarray('search_groupby', $arrayofgroupbylabel, $search_groupby, 1, 0, 0, '', 0, 0, 0, '', 'minwidth250', 1);
+		$result = $form->selectarray('search_groupby', $arrayofgroupbylabel, $search_groupby, 1, 0, 0, '', 0, 0, 0, '', $morecss, 1);
 
 		return $result;
 	}
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 6fad72862c7..9ebc3a4c307 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -170,7 +170,7 @@ class FormProjets
 			if (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY))  $sql .= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
 			elseif ($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all')    // PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
 			{
-				$sql .= " AND (p.fk_soc IN (".$socid.", ".$conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") OR p.fk_soc IS NULL)";
+				$sql .= " AND (p.fk_soc IN (".$socid.", ".((int) $conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY).") OR p.fk_soc IS NULL)";
 			}
 		}
 		if (!empty($filterkey)) $sql .= natural_search(array('p.title', 'p.ref'), $filterkey);
@@ -261,7 +261,8 @@ class FormProjets
 								'key' => (int) $obj->rowid,
 								'value' => $obj->ref,
 								'ref' => $obj->ref,
-								'label' => $labeltoshow,
+								'labelx' => $labeltoshow,
+								'label' => ((bool) $disabled) ? '<span class="opacitymedium">'.$labeltoshow.'</span>' : $labeltoshow,
 								'disabled' => (bool) $disabled
 							);
 						}
@@ -297,7 +298,7 @@ class FormProjets
 	 *	@param	int		$maxlength		Maximum length of label
 	 *	@param	int		$option_only	Return only html options lines without the select tag
 	 *	@param	string	$show_empty		Add an empty line ('1' or string to show for empty line)
-	 *  @param	int		$discard_closed Discard closed projects (0=Keep,1=hide completely,2=Disable)
+	 *  @param	int		$discard_closed Discard closed projects (0=Keep, 1=hide completely, 2=Disable)
 	 *  @param	int		$forcefocus		Force focus on field (works with javascript only)
 	 *  @param	int		$disabled		Disabled
 	 *  @param	string	$morecss        More css added to the select component
@@ -348,12 +349,12 @@ class FormProjets
 		if ($resql)
 		{
 			// Use select2 selector
-			if (!empty($conf->use_javascript_ajax))
+			if (empty($option_only) && !empty($conf->use_javascript_ajax))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 			   	$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
 				$out .= $comboenhancement;
-				$morecss = 'minwidth200imp maxwidth500';
+				$morecss = 'minwidth200 maxwidth500';
 			}
 
 			if (empty($option_only)) {
@@ -368,6 +369,7 @@ class FormProjets
 				} else $out .= '&nbsp;';
 				$out .= '</option>';
 			}
+
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			if ($num)
@@ -388,6 +390,18 @@ class FormProjets
 
 						$labeltoshow = '';
 
+						$disabled = 0;
+						if ($obj->fk_statut == Project::STATUS_DRAFT)
+						{
+							$disabled = 1;
+						} elseif ($obj->fk_statut == Project::STATUS_CLOSED)
+						{
+							if ($discard_closed == 2) $disabled = 1;
+						} elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
+						{
+							$disabled = 1;
+						}
+
 						if ($showproject == 'all')
 						{
 							$labeltoshow .= dol_trunc($obj->ref, 18); // Project ref
@@ -594,9 +608,10 @@ class FormProjets
 	 *    @param   int         $showpercent        Show default probability for status
 	 *    @param   string      $morecss            Add more css
 	 * 	  @param   int	       $noadmininfo        0=Add admin info, 1=Disable admin info
+	 *    @param   int		   $addcombojs         1=Add a js combo
 	 *    @return  int|string                      The HTML select list of element or '' if nothing or -1 if KO
 	 */
-	public function selectOpportunityStatus($htmlname, $preselected = '-1', $showempty = 1, $useshortlabel = 0, $showallnone = 0, $showpercent = 0, $morecss = '', $noadmininfo = 0)
+	public function selectOpportunityStatus($htmlname, $preselected = '-1', $showempty = 1, $useshortlabel = 0, $showallnone = 0, $showpercent = 0, $morecss = '', $noadmininfo = 0, $addcombojs = 0)
 	{
 		global $conf, $langs, $user;
 
@@ -642,7 +657,10 @@ class FormProjets
 					$i++;
 				}
 				$sellist .= '</select>';
+
 				if ($user->admin && !$noadmininfo) $sellist .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+
+				if ($addcombojs) $sellist .= ajax_combobox($htmlname);
 			}
 			/*else
 			{
diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
index e1653444960..78a35a5dd50 100644
--- a/htdocs/core/class/html.formpropal.class.php
+++ b/htdocs/core/class/html.formpropal.class.php
@@ -27,113 +27,115 @@
  */
 class FormPropal
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 
-    /**
-     * Constructor
-     *
-     * @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
-    /**
-     *    Return combo list of differents status of a proposal
-     *    Values are id of table c_propalst
-     *
-     *    @param	string	$selected   	Preselected value
-     *    @param	int		$short			Use short labels
-     *    @param	int		$excludedraft	0=All status, 1=Exclude draft status
-     *    @param	int 	$showempty		1=Add empty line
-     *    @param    string  $mode           'customer', 'supplier'
-     *    @param    string  $htmlname       Name of select field
-     *    @return	void
-     */
-    public function selectProposalStatus($selected = '', $short = 0, $excludedraft = 0, $showempty = 1, $mode = 'customer', $htmlname = 'propal_statut')
-    {
-        global $langs;
+	/**
+	 *    Return combo list of differents status of a proposal
+	 *    Values are id of table c_propalst
+	 *
+	 *    @param	string	$selected   	Preselected value
+	 *    @param	int		$short			Use short labels
+	 *    @param	int		$excludedraft	0=All status, 1=Exclude draft status
+	 *    @param	int 	$showempty		1=Add empty line
+	 *    @param    string  $mode           'customer', 'supplier'
+	 *    @param    string  $htmlname       Name of select field
+	 *    @return	void
+	 */
+	public function selectProposalStatus($selected = '', $short = 0, $excludedraft = 0, $showempty = 1, $mode = 'customer', $htmlname = 'propal_statut')
+	{
+		global $langs;
 
-        $prefix = '';
-        $listofstatus = array();
-        if ($mode == 'supplier') {
-            $prefix = 'SupplierProposalStatus';
+		$prefix = '';
+		$listofstatus = array();
+		if ($mode == 'supplier') {
+			$prefix = 'SupplierProposalStatus';
 
-            $langs->load("supplier_proposal");
-            $listofstatus = array(
-                0=>array('id'=>0, 'code'=>'PR_DRAFT'),
-                1=>array('id'=>1, 'code'=>'PR_OPEN'),
-                2=>array('id'=>2, 'code'=>'PR_SIGNED'),
-                3=>array('id'=>3, 'code'=>'PR_NOTSIGNED'),
-                4=>array('id'=>4, 'code'=>'PR_CLOSED')
-            );
-        } else {
-            $prefix = "PropalStatus";
+			$langs->load("supplier_proposal");
+			$listofstatus = array(
+				0=>array('id'=>0, 'code'=>'PR_DRAFT'),
+				1=>array('id'=>1, 'code'=>'PR_OPEN'),
+				2=>array('id'=>2, 'code'=>'PR_SIGNED'),
+				3=>array('id'=>3, 'code'=>'PR_NOTSIGNED'),
+				4=>array('id'=>4, 'code'=>'PR_CLOSED')
+			);
+		} else {
+			$prefix = "PropalStatus";
 
-            $sql = "SELECT id, code, label, active FROM ".MAIN_DB_PREFIX."c_propalst";
-            $sql .= " WHERE active = 1";
-            dol_syslog(get_class($this)."::selectProposalStatus", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if ($resql)
-            {
-                $num = $this->db->num_rows($resql);
-                $i = 0;
-                if ($num)
-                {
-                    while ($i < $num)
-                    {
-                        $obj = $this->db->fetch_object($resql);
-                        $listofstatus[$obj->id] = array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>$obj->label);
-                        $i++;
-                    }
-                }
-            } else {
-                dol_print_error($this->db);
-            }
-        }
+			$sql = "SELECT id, code, label, active FROM ".MAIN_DB_PREFIX."c_propalst";
+			$sql .= " WHERE active = 1";
+			dol_syslog(get_class($this)."::selectProposalStatus", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				$num = $this->db->num_rows($resql);
+				$i = 0;
+				if ($num)
+				{
+					while ($i < $num)
+					{
+						$obj = $this->db->fetch_object($resql);
+						$listofstatus[$obj->id] = array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>$obj->label);
+						$i++;
+					}
+				}
+			} else {
+				dol_print_error($this->db);
+			}
+		}
 
-        print '<select class="flat" name="'.$htmlname.'">';
-        if ($showempty) print '<option value="-1">&nbsp;</option>';
+		print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
+		if ($showempty) print '<option value="-1">&nbsp;</option>';
 
-        foreach ($listofstatus as $key => $obj)
-        {
-            if ($excludedraft)
-            {
-                if ($obj['code'] == 'Draft' || $obj['code'] == 'PR_DRAFT')
-                {
-                    $i++;
-                    continue;
-                }
-            }
-            if ($selected != '' && $selected == $obj['id'])
-            {
-                print '<option value="'.$obj['id'].'" selected>';
-            } else {
-                print '<option value="'.$obj['id'].'">';
-            }
-            $key = $obj['code'];
-            if ($langs->trans($prefix.$key.($short ? 'Short' : '')) != $prefix.$key.($short ? 'Short' : ''))
-            {
-                print $langs->trans($prefix.$key.($short ? 'Short' : ''));
-            } else {
-                $conv_to_new_code = array('PR_DRAFT'=>'Draft', 'PR_OPEN'=>'Validated', 'PR_CLOSED'=>'Closed', 'PR_SIGNED'=>'Signed', 'PR_NOTSIGNED'=>'NotSigned', 'PR_FAC'=>'Billed');
-                if (!empty($conv_to_new_code[$obj['code']])) $key = $conv_to_new_code[$obj['code']];
+		foreach ($listofstatus as $key => $obj)
+		{
+			if ($excludedraft)
+			{
+				if ($obj['code'] == 'Draft' || $obj['code'] == 'PR_DRAFT')
+				{
+					$i++;
+					continue;
+				}
+			}
+			if ($selected != '' && $selected == $obj['id'])
+			{
+				print '<option value="'.$obj['id'].'" selected>';
+			} else {
+				print '<option value="'.$obj['id'].'">';
+			}
+			$key = $obj['code'];
+			if ($langs->trans($prefix.$key.($short ? 'Short' : '')) != $prefix.$key.($short ? 'Short' : ''))
+			{
+				print $langs->trans($prefix.$key.($short ? 'Short' : ''));
+			} else {
+				$conv_to_new_code = array('PR_DRAFT'=>'Draft', 'PR_OPEN'=>'Validated', 'PR_CLOSED'=>'Closed', 'PR_SIGNED'=>'Signed', 'PR_NOTSIGNED'=>'NotSigned', 'PR_FAC'=>'Billed');
+				if (!empty($conv_to_new_code[$obj['code']])) $key = $conv_to_new_code[$obj['code']];
 
-                print ($langs->trans($prefix.$key.($short ? 'Short' : '')) != $prefix.$key.($short ? 'Short' : '')) ? $langs->trans($prefix.$key.($short ? 'Short' : '')) : ($obj['label'] ? $obj['label'] : $obj['code']);
-            }
-            print '</option>';
-            $i++;
-        }
-        print '</select>';
-    }
+				print ($langs->trans($prefix.$key.($short ? 'Short' : '')) != $prefix.$key.($short ? 'Short' : '')) ? $langs->trans($prefix.$key.($short ? 'Short' : '')) : ($obj['label'] ? $obj['label'] : $obj['code']);
+			}
+			print '</option>';
+			$i++;
+		}
+		print '</select>';
+
+		print ajax_combobox($htmlname);
+	}
 }
diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php
index 55d214fbbd6..96156ef3fd2 100644
--- a/htdocs/core/class/html.formsms.class.php
+++ b/htdocs/core/class/html.formsms.class.php
@@ -33,99 +33,99 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
  */
 class FormSms
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $fromid;
-    public $fromname;
-    public $fromsms;
-    public $fromtype;
-    public $replytoname;
-    public $replytomail;
-    public $toname;
-    public $tomail;
+	public $fromid;
+	public $fromname;
+	public $fromsms;
+	public $fromtype;
+	public $replytoname;
+	public $replytomail;
+	public $toname;
+	public $tomail;
 
-    public $withsubstit; // Show substitution array
-    public $withfrom;
-    public $withto;
-    public $withtopic;
-    public $withbody;
+	public $withsubstit; // Show substitution array
+	public $withfrom;
+	public $withto;
+	public $withtopic;
+	public $withbody;
 
-    /**
-     * @var int 	Id of company
-     */
-    public $withtosocid;
+	/**
+	 * @var int 	Id of company
+	 */
+	public $withtosocid;
 
-    public $withfromreadonly;
-    public $withreplytoreadonly;
-    public $withtoreadonly;
-    public $withtopicreadonly;
-    public $withcancel;
+	public $withfromreadonly;
+	public $withreplytoreadonly;
+	public $withtoreadonly;
+	public $withtopicreadonly;
+	public $withcancel;
 
-    public $substit = array();
-    public $param = array();
+	public $substit = array();
+	public $param = array();
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
-    /**
-     * @var string[]	Array of error strings
-     */
-    public $errors = array();
+	/**
+	 * @var string[]	Array of error strings
+	 */
+	public $errors = array();
 
 
-    /**
-     *	Constructor
-     *
-     *  @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-        $this->withfrom = 1;
-        $this->withto = 1;
-        $this->withtopic = 1;
-        $this->withbody = 1;
+		$this->withfrom = 1;
+		$this->withto = 1;
+		$this->withtopic = 1;
+		$this->withbody = 1;
 
-        $this->withfromreadonly = 1;
-        $this->withreplytoreadonly = 1;
-        $this->withtoreadonly = 0;
-        $this->withtopicreadonly = 0;
-        $this->withbodyreadonly = 0;
-    }
+		$this->withfromreadonly = 1;
+		$this->withreplytoreadonly = 1;
+		$this->withtoreadonly = 0;
+		$this->withtopicreadonly = 0;
+		$this->withbodyreadonly = 0;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Show the form to input an sms.
-     *
-     *	@param	string	$morecss Class on first column td
-     *  @param int $showform Show form tags and submit button (recommanded is to use with value 0)
-     *	@return	void
-     */
-    public function show_form($morecss = 'titlefield', $showform = 1)
-    {
-     // phpcs:enable
-        global $conf, $langs, $user, $form;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Show the form to input an sms.
+	 *
+	 *	@param	string	$morecss Class on first column td
+	 *  @param int $showform Show form tags and submit button (recommanded is to use with value 0)
+	 *	@return	void
+	 */
+	public function show_form($morecss = 'titlefield', $showform = 1)
+	{
+	 // phpcs:enable
+		global $conf, $langs, $user, $form;
 
-        if (!is_object($form)) $form = new Form($this->db);
+		if (!is_object($form)) $form = new Form($this->db);
 
-        // Load translation files required by the page
-        $langs->loadLangs(array('other', 'mails', 'sms'));
+		// Load translation files required by the page
+		$langs->loadLangs(array('other', 'mails', 'sms'));
 
-        $soc = new Societe($this->db);
-        if (!empty($this->withtosocid) && $this->withtosocid > 0)
-        {
-            $soc->fetch($this->withtosocid);
-        }
+		$soc = new Societe($this->db);
+		if (!empty($this->withtosocid) && $this->withtosocid > 0)
+		{
+			$soc->fetch($this->withtosocid);
+		}
 
-        print "\n<!-- Begin form SMS -->\n";
+		print "\n<!-- Begin form SMS -->\n";
 
-        print '
+		print '
 <script language="javascript">
 function limitChars(textarea, limit, infodiv)
 {
@@ -138,174 +138,174 @@ function limitChars(textarea, limit, infodiv)
 }
 </script>';
 
-        if ($showform) print "<form method=\"POST\" name=\"smsform\" enctype=\"multipart/form-data\" action=\"".$this->param["returnurl"]."\">\n";
+		if ($showform) print "<form method=\"POST\" name=\"smsform\" enctype=\"multipart/form-data\" action=\"".$this->param["returnurl"]."\">\n";
 
-        print '<input type="hidden" name="token" value="'.newToken().'">';
-        foreach ($this->param as $key=>$value)
-        {
-            print "<input type=\"hidden\" name=\"$key\" value=\"$value\">\n";
-        }
-        print "<table class=\"border centpercent\">\n";
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		foreach ($this->param as $key=>$value)
+		{
+			print "<input type=\"hidden\" name=\"$key\" value=\"$value\">\n";
+		}
+		print "<table class=\"border centpercent\">\n";
 
-        // Substitution array
-        if (!empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
-        {
-            print "<tr><td colspan=\"2\">";
-            $help = "";
-            foreach ($this->substit as $key => $val)
-            {
-                $help .= $key.' -> '.$langs->trans($val).'<br>';
-            }
-            print $form->textwithpicto($langs->trans("SmsTestSubstitutionReplacedByGenericValues"), $help);
-            print "</td></tr>\n";
-        }
+		// Substitution array
+		if (!empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
+		{
+			print "<tr><td colspan=\"2\">";
+			$help = "";
+			foreach ($this->substit as $key => $val)
+			{
+				$help .= $key.' -> '.$langs->trans($val).'<br>';
+			}
+			print $form->textwithpicto($langs->trans("SmsTestSubstitutionReplacedByGenericValues"), $help);
+			print "</td></tr>\n";
+		}
 
-        // From
-        if ($this->withfrom)
-        {
-            if ($this->withfromreadonly)
-            {
-                print '<tr><td class="titlefield '.$morecss.'">'.$langs->trans("SmsFrom");
-                print '<input type="hidden" name="fromsms" value="'.$this->fromsms.'">';
-                print "</td><td>";
-                if ($this->fromtype == 'user')
-                {
-                    $langs->load("users");
-                    $fuser = new User($this->db);
-                    $fuser->fetch($this->fromid);
-                    print $fuser->getNomUrl(1);
-                    print ' &nbsp; ';
-                }
-                if ($this->fromsms)
-                {
-                    print $this->fromsms;
-                } else {
-                    if ($this->fromtype)
-                    {
-                        $langs->load("errors");
-                        print '<font class="warning"> &lt;'.$langs->trans("ErrorNoPhoneDefinedForThisUser").'&gt; </font>';
-                    }
-                }
-                print "</td></tr>\n";
-                print "</td></tr>\n";
-            } else {
-                print '<tr><td class="'.$morecss.'">'.$langs->trans("SmsFrom")."</td><td>";
-                //print '<input type="text" name="fromname" size="30" value="'.$this->fromsms.'">';
-                if ($conf->global->MAIN_SMS_SENDMODE == 'ovh')        // For backward compatibility        @deprecated
-                {
-                    dol_include_once('/ovh/class/ovhsms.class.php');
-                    try {
-                        $sms = new OvhSms($this->db);
-                        if (empty($conf->global->OVHSMS_ACCOUNT))
-                        {
-                            $resultsender = 'ErrorOVHSMS_ACCOUNT not defined';
-                        } else {
-                            $resultsender = $sms->SmsSenderList();
-                        }
-                    } catch (Exception $e)
-                    {
-                        dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
-                    }
-                } elseif (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
-                {
-                    $tmp = explode('@', $conf->global->MAIN_SMS_SENDMODE);
-                    $classfile = $tmp[0]; $module = (empty($tmp[1]) ? $tmp[0] : $tmp[1]);
-                    dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
-                    try {
-                        $classname = ucfirst($classfile);
-                        if (class_exists($classname))
-                        {
-                        	$sms = new $classname($this->db);
-                        	$resultsender = $sms->SmsSenderList();
-                        } else {
-                        	$sms = new stdClass();
-                        	$sms->error = 'The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
-                        }
-                    } catch (Exception $e)
-                    {
-                        dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
-                        exit;
-                    }
-                } else {
-                    dol_syslog("Warning: The SMS sending method has not been defined into MAIN_SMS_SENDMODE", LOG_WARNING);
-	                $resultsender = array();
-                    $resultsender[0]->number = $this->fromsms;
-                }
+		// From
+		if ($this->withfrom)
+		{
+			if ($this->withfromreadonly)
+			{
+				print '<tr><td class="titlefield '.$morecss.'">'.$langs->trans("SmsFrom");
+				print '<input type="hidden" name="fromsms" value="'.$this->fromsms.'">';
+				print "</td><td>";
+				if ($this->fromtype == 'user')
+				{
+					$langs->load("users");
+					$fuser = new User($this->db);
+					$fuser->fetch($this->fromid);
+					print $fuser->getNomUrl(1);
+					print ' &nbsp; ';
+				}
+				if ($this->fromsms)
+				{
+					print $this->fromsms;
+				} else {
+					if ($this->fromtype)
+					{
+						$langs->load("errors");
+						print '<font class="warning"> &lt;'.$langs->trans("ErrorNoPhoneDefinedForThisUser").'&gt; </font>';
+					}
+				}
+				print "</td></tr>\n";
+				print "</td></tr>\n";
+			} else {
+				print '<tr><td class="'.$morecss.'">'.$langs->trans("SmsFrom")."</td><td>";
+				//print '<input type="text" name="fromname" size="30" value="'.$this->fromsms.'">';
+				if ($conf->global->MAIN_SMS_SENDMODE == 'ovh')        // For backward compatibility        @deprecated
+				{
+					dol_include_once('/ovh/class/ovhsms.class.php');
+					try {
+						$sms = new OvhSms($this->db);
+						if (empty($conf->global->OVHSMS_ACCOUNT))
+						{
+							$resultsender = 'ErrorOVHSMS_ACCOUNT not defined';
+						} else {
+							$resultsender = $sms->SmsSenderList();
+						}
+					} catch (Exception $e)
+					{
+						dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
+					}
+				} elseif (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
+				{
+					$tmp = explode('@', $conf->global->MAIN_SMS_SENDMODE);
+					$classfile = $tmp[0]; $module = (empty($tmp[1]) ? $tmp[0] : $tmp[1]);
+					dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
+					try {
+						$classname = ucfirst($classfile);
+						if (class_exists($classname))
+						{
+							$sms = new $classname($this->db);
+							$resultsender = $sms->SmsSenderList();
+						} else {
+							$sms = new stdClass();
+							$sms->error = 'The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
+						}
+					} catch (Exception $e)
+					{
+						dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
+						exit;
+					}
+				} else {
+					dol_syslog("Warning: The SMS sending method has not been defined into MAIN_SMS_SENDMODE", LOG_WARNING);
+					$resultsender = array();
+					$resultsender[0]->number = $this->fromsms;
+				}
 
-                if (is_array($resultsender) && count($resultsender) > 0)
-                {
-                    print '<select name="fromsms" id="fromsms" class="flat">';
-                    foreach ($resultsender as $obj)
-                    {
-                        print '<option value="'.$obj->number.'">'.$obj->number.'</option>';
-                    }
-                    print '</select>';
-                } else {
-                    print '<span class="error">'.$langs->trans("SmsNoPossibleSenderFound");
-                    if (is_object($sms) && !empty($sms->error)) print ' '.$sms->error;
-                    print '</span>';
-                }
-                print '</td>';
-                print "</tr>\n";
-            }
-        }
+				if (is_array($resultsender) && count($resultsender) > 0)
+				{
+					print '<select name="fromsms" id="fromsms" class="flat">';
+					foreach ($resultsender as $obj)
+					{
+						print '<option value="'.$obj->number.'">'.$obj->number.'</option>';
+					}
+					print '</select>';
+				} else {
+					print '<span class="error">'.$langs->trans("SmsNoPossibleSenderFound");
+					if (is_object($sms) && !empty($sms->error)) print ' '.$sms->error;
+					print '</span>';
+				}
+				print '</td>';
+				print "</tr>\n";
+			}
+		}
 
-        // To (target)
-        if ($this->withto || is_array($this->withto))
-        {
-            print '<tr><td>';
-            //$moretext=$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients");
-            $moretext = '';
-            print $form->textwithpicto($langs->trans("SmsTo"), $moretext);
-            print '</td><td>';
-            if ($this->withtoreadonly)
-            {
-                print (!is_array($this->withto) && !is_numeric($this->withto)) ? $this->withto : "";
-            } else {
-                print "<input size=\"16\" id=\"sendto\" name=\"sendto\" value=\"".dol_escape_htmltag(!is_array($this->withto) && $this->withto != '1' ? (isset($_REQUEST["sendto"]) ?GETPOST("sendto") : $this->withto) : "+")."\">";
-                if (!empty($this->withtosocid) && $this->withtosocid > 0)
-                {
-                    $liste = array();
-                    foreach ($soc->thirdparty_and_contact_phone_array() as $key => $value)
-                    {
-                        $liste[$key] = $value;
-                    }
-                    print " ".$langs->trans("or")." ";
-                    //var_dump($_REQUEST);exit;
-                    print $form->selectarray("receiver", $liste, GETPOST("receiver"), 1);
-                }
-                print ' <span class="opacitymedium">'.$langs->trans("SmsInfoNumero").'</span>';
-            }
-            print "</td></tr>\n";
-        }
+		// To (target)
+		if ($this->withto || is_array($this->withto))
+		{
+			print '<tr><td>';
+			//$moretext=$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients");
+			$moretext = '';
+			print $form->textwithpicto($langs->trans("SmsTo"), $moretext);
+			print '</td><td>';
+			if ($this->withtoreadonly)
+			{
+				print (!is_array($this->withto) && !is_numeric($this->withto)) ? $this->withto : "";
+			} else {
+				print "<input size=\"16\" id=\"sendto\" name=\"sendto\" value=\"".dol_escape_htmltag(!is_array($this->withto) && $this->withto != '1' ? (isset($_REQUEST["sendto"]) ?GETPOST("sendto") : $this->withto) : "+")."\">";
+				if (!empty($this->withtosocid) && $this->withtosocid > 0)
+				{
+					$liste = array();
+					foreach ($soc->thirdparty_and_contact_phone_array() as $key => $value)
+					{
+						$liste[$key] = $value;
+					}
+					print " ".$langs->trans("or")." ";
+					//var_dump($_REQUEST);exit;
+					print $form->selectarray("receiver", $liste, GETPOST("receiver"), 1);
+				}
+				print ' <span class="opacitymedium">'.$langs->trans("SmsInfoNumero").'</span>';
+			}
+			print "</td></tr>\n";
+		}
 
-        // Message
-        if ($this->withbody)
-        {
-            $defaultmessage = '';
-            if ($this->param["models"] == 'body')
-            {
-                $defaultmessage = $this->withbody;
-            }
-            $defaultmessage = make_substitutions($defaultmessage, $this->substit);
-            if (isset($_POST["message"])) $defaultmessage = $_POST["message"];
-            $defaultmessage = str_replace('\n', "\n", $defaultmessage);
+		// Message
+		if ($this->withbody)
+		{
+			$defaultmessage = '';
+			if ($this->param["models"] == 'body')
+			{
+				$defaultmessage = $this->withbody;
+			}
+			$defaultmessage = make_substitutions($defaultmessage, $this->substit);
+			if (GETPOSTISSET("message")) $defaultmessage = GETPOST("message", 'restricthtml');
+			$defaultmessage = str_replace('\n', "\n", $defaultmessage);
 
-            print "<tr>";
-            print '<td class="tdtop">'.$langs->trans("SmsText")."</td>";
-            print "<td>";
-            if ($this->withbodyreadonly)
-            {
-                print nl2br($defaultmessage);
-                print '<input type="hidden" name="message" value="'.dol_escape_htmltag($defaultmessage).'">';
-            } else {
-                print '<textarea class="quatrevingtpercent" name="message" id="message" rows="'.ROWS_4.'" onkeyup="limitChars(this, 160, \'charlimitinfospan\')">'.$defaultmessage.'</textarea>';
-                print '<div id="charlimitinfo">'.$langs->trans("SmsInfoCharRemain").': <span id="charlimitinfospan">'.(160 - dol_strlen($defaultmessage)).'</span></div></td>';
-            }
-            print "</td></tr>\n";
-        }
+			print "<tr>";
+			print '<td class="tdtop">'.$langs->trans("SmsText")."</td>";
+			print "<td>";
+			if ($this->withbodyreadonly)
+			{
+				print nl2br($defaultmessage);
+				print '<input type="hidden" name="message" value="'.dol_escape_htmltag($defaultmessage).'">';
+			} else {
+				print '<textarea class="quatrevingtpercent" name="message" id="message" rows="'.ROWS_4.'" onkeyup="limitChars(this, 160, \'charlimitinfospan\')">'.$defaultmessage.'</textarea>';
+				print '<div id="charlimitinfo">'.$langs->trans("SmsInfoCharRemain").': <span id="charlimitinfospan">'.(160 - dol_strlen($defaultmessage)).'</span></div></td>';
+			}
+			print "</td></tr>\n";
+		}
 
-        print '
+		print '
            <tr>
             <td>'.$langs->trans("DelayBeforeSending").':</td>
             <td> <input name="deferred" id="deferred" size="4" value="0"></td></tr>
@@ -332,23 +332,23 @@ function limitChars(textarea, limit, infodiv)
            <option value="1" selected>Yes</option>
            </select></td></tr>';
 
-        print "</table>\n";
+		print "</table>\n";
 
 
-        if ($showform)
-        {
-            print '<div class="center">';
-            print '<input class="button" type="submit" name="sendmail" value="'.dol_escape_htmltag($langs->trans("SendSms")).'">';
-            if ($this->withcancel)
-            {
-                print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-                print '<input class="button" type="submit" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
-            }
-            print '</div>';
+		if ($showform)
+		{
+			print '<div class="center">';
+			print '<input class="button" type="submit" name="sendmail" value="'.dol_escape_htmltag($langs->trans("SendSms")).'">';
+			if ($this->withcancel)
+			{
+				print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+				print '<input class="button button-cancel" type="submit" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+			}
+			print '</div>';
 
-            print "</form>\n";
-        }
+			print "</form>\n";
+		}
 
-        print "<!-- End form SMS -->\n";
-    }
+		print "<!-- End form SMS -->\n";
+	}
 }
diff --git a/htdocs/core/class/html.formsocialcontrib.class.php b/htdocs/core/class/html.formsocialcontrib.class.php
index b5adfdba82f..ea96f393525 100644
--- a/htdocs/core/class/html.formsocialcontrib.class.php
+++ b/htdocs/core/class/html.formsocialcontrib.class.php
@@ -28,9 +28,9 @@
 class FormSocialContrib
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -39,81 +39,82 @@ class FormSocialContrib
 
 
 	/**
-	* Constructor
-	*
-	* @param		DoliDB		$db      Database handler
-	*/
+	 * Constructor
+	 *
+	 * @param		DoliDB		$db      Database handler
+	 */
 	public function __construct($db)
 	{
-	    $this->db = $db;
+		$this->db = $db;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return list of social contributions.
-     *  Use mysoc->country_id or mysoc->country_code so they must be defined.
-     *
-     *	@param	string	$selected       Preselected type
-     *	@param  string	$htmlname       Name of field in form
-     * 	@param	int		$useempty		Set to 1 if we want an empty value
-     * 	@param	int		$maxlen			Max length of text in combo box
-     * 	@param	int		$help			Add or not the admin help picto
-     *  @param	string	$morecss		Add more CSS on select
-     * 	@return	void
-     */
-    public function select_type_socialcontrib($selected = '', $htmlname = 'actioncode', $useempty = 0, $maxlen = 40, $help = 1, $morecss = 'minwidth300')
-    {
-        // phpcs:enable
-        global $conf, $db, $langs, $user, $mysoc;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return list of social contributions.
+	 *  Use mysoc->country_id or mysoc->country_code so they must be defined.
+	 *
+	 *	@param	string	$selected       Preselected type
+	 *	@param  string	$htmlname       Name of field in form
+	 * 	@param	int		$useempty		Set to 1 if we want an empty value
+	 * 	@param	int		$maxlen			Max length of text in combo box
+	 * 	@param	int		$help			Add or not the admin help picto
+	 *  @param	string	$morecss		Add more CSS on select
+	 *  @param	int		$noerrorifempty	No print error if list is empty for the country
+	 * 	@return	void
+	 */
+	public function select_type_socialcontrib($selected = '', $htmlname = 'actioncode', $useempty = 0, $maxlen = 40, $help = 1, $morecss = 'minwidth300', $noerrorifempty = 0)
+	{
+		// phpcs:enable
+		global $conf, $db, $langs, $user, $mysoc;
 
-        if (empty($mysoc->country_id) && empty($mysoc->country_code))
-        {
-            dol_print_error('', 'Call to select_type_socialcontrib with mysoc country not yet defined');
-            exit;
-        }
+		if (empty($mysoc->country_id) && empty($mysoc->country_code))
+		{
+			print $langs->trans("ErrorSetupOfCountryMustBeDone");
+			return;
+		}
 
-        if (!empty($mysoc->country_id))
-        {
-            $sql = "SELECT c.id, c.libelle as type";
-            $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
-            $sql .= " WHERE c.active = 1";
-            $sql .= " AND c.fk_pays = ".$mysoc->country_id;
-            $sql .= " ORDER BY c.libelle ASC";
-        } else {
-            $sql = "SELECT c.id, c.libelle as type";
-            $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."c_country as co";
-            $sql .= " WHERE c.active = 1 AND c.fk_pays = co.rowid";
-            $sql .= " AND co.code = '".$this->db->escape($mysoc->country_code)."'";
-            $sql .= " ORDER BY c.libelle ASC";
-        }
+		if (!empty($mysoc->country_id))
+		{
+			$sql = "SELECT c.id, c.libelle as type";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
+			$sql .= " WHERE c.active = 1";
+			$sql .= " AND c.fk_pays = ".$mysoc->country_id;
+			$sql .= " ORDER BY c.libelle ASC";
+		} else {
+			$sql = "SELECT c.id, c.libelle as type";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."c_country as co";
+			$sql .= " WHERE c.active = 1 AND c.fk_pays = co.rowid";
+			$sql .= " AND co.code = '".$this->db->escape($mysoc->country_code)."'";
+			$sql .= " ORDER BY c.libelle ASC";
+		}
 
-        dol_syslog("Form::select_type_socialcontrib", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-        	$num = $this->db->num_rows($resql);
-            if ($num)
-            {
-            	print '<select class="'.($morecss ? $morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';
-                $i = 0;
+		dol_syslog("Form::select_type_socialcontrib", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			if ($num)
+			{
+				print '<select class="'.($morecss ? $morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';
+				$i = 0;
 
-                if ($useempty) print '<option value="0">&nbsp;</option>';
-                while ($i < $num)
-                {
-                	$obj = $this->db->fetch_object($resql);
-                    print '<option value="'.$obj->id.'"';
-                    if ($obj->id == $selected) print ' selected';
-                    print '>'.dol_trunc($obj->type, $maxlen);
-                    $i++;
-                }
-                print '</select>';
-                if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-                if (!empty($conf->use_javascript_ajax)) print ajax_combobox($htmlname);
-            } else {
-                print $langs->trans("ErrorNoSocialContributionForSellerCountry", $mysoc->country_code);
-            }
-        } else {
-        	dol_print_error($this->db);
-        }
-    }
+				if ($useempty) print '<option value="0">&nbsp;</option>';
+				while ($i < $num)
+				{
+					$obj = $this->db->fetch_object($resql);
+					print '<option value="'.$obj->id.'"';
+					if ($obj->id == $selected) print ' selected';
+					print '>'.dol_trunc($obj->type, $maxlen);
+					$i++;
+				}
+				print '</select>';
+				if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+				if (!empty($conf->use_javascript_ajax)) print ajax_combobox($htmlname);
+			} else {
+				if (empty($noerrorifempty)) print $langs->trans("ErrorNoSocialContributionForSellerCountry", $mysoc->country_code);
+			}
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 }
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 35ad4b83a7f..60debed9f2d 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -150,7 +150,7 @@ class FormTicket
 
 		print "\n<!-- Begin form TICKET -->\n";
 
-		if ($withdolfichehead) dol_fiche_head(null, 'card', '', 0, '');
+		if ($withdolfichehead) print dol_get_fiche_head(null, 'card', '', 0, '');
 
 		print '<form method="POST" '.($withdolfichehead ? '' : 'style="margin-bottom: 30px;" ').'name="ticket" id="form_create_ticket" enctype="multipart/form-data" action="'.$this->param["returnurl"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -385,7 +385,7 @@ class FormTicket
 				// If no socid, set to -1 to avoid full contacts list
 				$selectedCompany = ($this->withfromsocid > 0) ? $this->withfromsocid : -1;
 				print img_picto('', 'contact', 'class="paddingright"');
-				$nbofcontacts = $form->select_contacts($selectedCompany, $this->withfromcontactid, 'contactid', 3, '', '', 0, 'minwidth200');
+				print $form->selectcontacts($selectedCompany, $this->withfromcontactid, 'contactid', 3, '', '', 0, 'minwidth200');
 				print ' ';
 				$formcompany->selectTypeContact($ticketstatic, '', 'type', 'external', '', 0, 'maginleftonly');
 				print '</td></tr>';
@@ -422,13 +422,13 @@ class FormTicket
 
 		print '</table>';
 
-		if ($withdolfichehead) dol_fiche_end();
+		if ($withdolfichehead) print dol_get_fiche_end();
 
 		print '<div class="center">';
 		print '<input class="button" type="submit" name="add" value="'.$langs->trans(($this->withthreadid > 0 ? "SendResponse" : "NewTicket")).'" />';
 		if ($this->withcancel) {
 			print " &nbsp; &nbsp; &nbsp;";
-			print "<input class=\"button\" type=\"submit\" name=\"cancel\" value=\"".$langs->trans("Cancel")."\">";
+			print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
 		}
 		print '</div>';
 
@@ -999,8 +999,8 @@ class FormTicket
 		} elseif (!dol_textishtml($defaultmessage) && dol_textishtml($this->substit['__USER_SIGNATURE__'])) {
 			$defaultmessage = dol_nl2br($defaultmessage);
 		}
-		if (isset($_POST["message"]) && !$_POST['modelselected']) {
-			$defaultmessage = GETPOST('message');
+		if (GETPOSTISSET("message") && !$_POST['modelselected']) {
+			$defaultmessage = GETPOST('message', 'restricthtml');
 		} else {
 			$defaultmessage = make_substitutions($defaultmessage, $this->substit);
 			// Clean first \n and br (to avoid empty line when CONTACTCIVNAME is empty)
@@ -1075,7 +1075,7 @@ class FormTicket
 		print '<input class="button" type="submit" name="btn_add_message" value="'.$langs->trans("AddMessage").'" />';
 		if ($this->withcancel) {
 			print " &nbsp; &nbsp; ";
-			print "<input class=\"button\" type=\"submit\" name=\"cancel\" value=\"".$langs->trans("Cancel")."\">";
+			print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
 		}
 		print "</center>\n";
 
diff --git a/htdocs/core/class/html.formwebsite.class.php b/htdocs/core/class/html.formwebsite.class.php
index c656f5e39ee..0f3e9a357b8 100644
--- a/htdocs/core/class/html.formwebsite.class.php
+++ b/htdocs/core/class/html.formwebsite.class.php
@@ -27,263 +27,270 @@
  */
 class FormWebsite
 {
-    private $db;
+	private $db;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error;
 
-
-    /**
-     *	Constructor
-     *
-     *	@param	DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 * var int		A number of lines
+	 */
+	public $num;
 
 
-    /**
-     *    Return HTML select list of websites
-     *
-     *    @param    string	$selected          Id modele pre-selectionne
-     *    @param    string	$htmlname          Name of HTML select
-     *    @param    int		$useempty          Show empty value or not
-     *    @return	string					   Html component
-     */
-    public function selectWebsite($selected = '', $htmlname = 'exportmodelid', $useempty = 0)
-    {
-        $out = '';
-
-        $sql = "SELECT rowid, ref";
-        $sql .= " FROM ".MAIN_DB_PREFIX."website";
-        $sql .= " WHERE 1 = 1";
-        $sql .= " ORDER BY rowid";
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $out .= '<select class="flat minwidth100" name="'.$htmlname.'" id="'.$htmlname.'">';
-            if ($useempty)
-            {
-                $out .= '<option value="-1">&nbsp;</option>';
-            }
-
-            $num = $this->db->num_rows($result);
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($result);
-                if ($selected == $obj->rowid)
-                {
-                    $out .= '<option value="'.$obj->rowid.'" selected>';
-                } else {
-                    $out .= '<option value="'.$obj->rowid.'">';
-                }
-                $out .= $obj->ref;
-                $out .= '</option>';
-                $i++;
-            }
-            $out .= "</select>";
-        } else {
-            dol_print_error($this->db);
-        }
-
-        return $out;
-    }
+	/**
+	 *	Constructor
+	 *
+	 *	@param	DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *  Return a HTML select list of type of containers from the dictionary
-     *
-     *  @param  string	$htmlname          	Name of select zone
-     *  @param	string	$selected			Selected value
-     *  @param  int		$useempty          	1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
-     *  @param  string  $moreattrib         More attributes on HTML select tag
-     * 	@return	void
-     */
-    public function selectTypeOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '')
-    {
-        global $langs, $conf, $user;
+	/**
+	 *    Return HTML select list of websites
+	 *
+	 *    @param    string	$selected          Id modele pre-selectionne
+	 *    @param    string	$htmlname          Name of HTML select
+	 *    @param    int		$useempty          Show empty value or not
+	 *    @return	string					   Html component
+	 */
+	public function selectWebsite($selected = '', $htmlname = 'exportmodelid', $useempty = 0)
+	{
+		$out = '';
 
-        $langs->load("admin");
+		$sql = "SELECT rowid, ref";
+		$sql .= " FROM ".MAIN_DB_PREFIX."website";
+		$sql .= " WHERE 1 = 1";
+		$sql .= " ORDER BY rowid";
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$out .= '<select class="flat minwidth100" name="'.$htmlname.'" id="'.$htmlname.'">';
+			if ($useempty)
+			{
+				$out .= '<option value="-1">&nbsp;</option>';
+			}
 
-        $sql = "SELECT rowid, code, label, entity";
-        $sql .= " FROM ".MAIN_DB_PREFIX.'c_type_container';
-        $sql .= " WHERE active = 1 AND entity IN (".getEntity('c_type_container').")";
-        $sql .= " ORDER BY label";
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($result);
+				if ($selected == $obj->rowid)
+				{
+					$out .= '<option value="'.$obj->rowid.'" selected>';
+				} else {
+					$out .= '<option value="'.$obj->rowid.'">';
+				}
+				$out .= $obj->ref;
+				$out .= '</option>';
+				$i++;
+			}
+			$out .= "</select>";
+		} else {
+			dol_print_error($this->db);
+		}
 
-    	dol_syslog(get_class($this)."::selectTypeOfContainer", LOG_DEBUG);
-    	$result = $this->db->query($sql);
-    	if ($result)
-    	{
-    		$num = $this->db->num_rows($result);
-    		$i = 0;
-    		if ($num)
-    		{
-    			print '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
-    			if ($useempty == 1 || ($useempty == 2 && $num > 1))
-    			{
-    				print '<option value="-1">&nbsp;</option>';
-    			}
-
-    			while ($i < $num)
-    			{
-    				$obj = $this->db->fetch_object($result);
-    				if ($selected == $obj->rowid || $selected == $obj->code)
-    				{
-    					print '<option value="'.$obj->code.'" selected>';
-    				} else {
-    					print '<option value="'.$obj->code.'">';
-    				}
-    				print $obj->label;
-    				print '</option>';
-    				$i++;
-    			}
-    			print "</select>";
-    			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-    		} else {
-    			print $langs->trans("NoTypeOfPagePleaseEditDictionary");
-    		}
-    	} else {
-    		dol_print_error($this->db);
-    	}
-    }
+		return $out;
+	}
 
 
-    /**
-     *  Return a HTML select list of samples of containers content
-     *
-     *  @param  string	$htmlname          	Name of select zone
-     *  @param	string	$selected			Selected value
-     *  @param  int		$useempty          	1=Add an empty value in list
-     *  @param  string  $moreattrib         More attributes on HTML select tag
-     * 	@return	string						HTML select component with list of type of containers
-     */
-    public function selectSampleOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '')
-    {
-    	global $langs, $conf, $user;
+	/**
+	 *  Return a HTML select list of type of containers from the dictionary
+	 *
+	 *  @param  string	$htmlname          	Name of select zone
+	 *  @param	string	$selected			Selected value
+	 *  @param  int		$useempty          	1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
+	 *  @param  string  $moreattrib         More attributes on HTML select tag
+	 * 	@return	void
+	 */
+	public function selectTypeOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '')
+	{
+		global $langs, $conf, $user;
 
-    	$langs->load("admin");
+		$langs->load("admin");
 
-    	$listofsamples = dol_dir_list(DOL_DOCUMENT_ROOT.'/website/samples', 'files', 0, '^page-sample-.*\.html$');
+		$sql = "SELECT rowid, code, label, entity";
+		$sql .= " FROM ".MAIN_DB_PREFIX.'c_type_container';
+		$sql .= " WHERE active = 1 AND entity IN (".getEntity('c_type_container').")";
+		$sql .= " ORDER BY label";
 
-    	$arrayofsamples = array();
-    	$arrayofsamples['empty'] = 'EmptyPage'; // Always this one first
-    	foreach ($listofsamples as $sample)
-    	{
-    		$reg = array();
-    		if (preg_match('/^page-sample-(.*)\.html$/', $sample['name'], $reg))
-    		{
-    			$key = $reg[1];
-	    		$labelkey = ucfirst($key);
-    			if ($key == 'empty') $labelkey = 'EmptyPage';
-    			$arrayofsamples[$key] = $labelkey;
-    		}
-    	}
+		dol_syslog(get_class($this)."::selectTypeOfContainer", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			if ($num)
+			{
+				print '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
+				if ($useempty == 1 || ($useempty == 2 && $num > 1))
+				{
+					print '<option value="-1">&nbsp;</option>';
+				}
 
-    	$out = '';
-    	$out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
-
-    	if ($useempty == 1 || $useempty == 2)
-    	{
-    		$out .= '<option value="-1">&nbsp;</option>';
-    	}
-
-    	foreach ($arrayofsamples as $key => $val)
-    	{
-    		if ($selected == $key)
-    		{
-    			$out .= '<option value="'.$key.'" selected>';
-    		} else {
-    			$out .= '<option value="'.$key.'">';
-    		}
-    		$out .= $langs->trans($val);
-    		$out .= '</option>';
-    	}
-    	$out .= "</select>";
-
-    	return $out;
-    }
+				while ($i < $num)
+				{
+					$obj = $this->db->fetch_object($result);
+					if ($selected == $obj->rowid || $selected == $obj->code)
+					{
+						print '<option value="'.$obj->code.'" selected>';
+					} else {
+						print '<option value="'.$obj->code.'">';
+					}
+					print $obj->label;
+					print '</option>';
+					$i++;
+				}
+				print "</select>";
+				if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			} else {
+				print $langs->trans("NoTypeOfPagePleaseEditDictionary");
+			}
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 
 
-    /**
-     *  Return a HTML select list of containers of a website.
-     *  Note: $website->lines must have been loaded.
-     *
-     *  @param  Website		$website       	Object Website
-     *  @param	string		$htmlname		Name of select zone
-     *  @param	int			$pageid			Preselected container ID
-     *  @param	int			$showempty		Show empty record
-     *  @param	string		$action			Action on page that use this select list
-     *  @param	string		$morecss		More CSS
-     *  @param	array		$excludeids		Exclude some ID in list
-     * 	@return	string						HTML select component with list of type of containers
-     */
-    public function selectContainer($website, $htmlname = 'pageid', $pageid = 0, $showempty = 0, $action = '', $morecss = 'minwidth200', $excludeids = null)
-    {
-    	global $langs;
+	/**
+	 *  Return a HTML select list of samples of containers content
+	 *
+	 *  @param  string	$htmlname          	Name of select zone
+	 *  @param	string	$selected			Selected value
+	 *  @param  int		$useempty          	1=Add an empty value in list
+	 *  @param  string  $moreattrib         More attributes on HTML select tag
+	 * 	@return	string						HTML select component with list of type of containers
+	 */
+	public function selectSampleOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '')
+	{
+		global $langs, $conf, $user;
 
-    	$atleastonepage = (is_array($website->lines) && count($website->lines) > 0);
+		$langs->load("admin");
 
-	    $out = '';
-	    if ($atleastonepage && $action != 'editsource')
-	    {
-	    	$out .= '<select name="'.$htmlname.'" id="'.$htmlname.'" class="maxwidth300'.($morecss ? ' '.$morecss : '').'">';
-	    } else {
-	    	$out .= '<select name="pageidbis" id="pageid" class="maxwidth300'.($morecss ? ' '.$morecss : '').'" disabled="disabled">';
-	    }
+		$listofsamples = dol_dir_list(DOL_DOCUMENT_ROOT.'/website/samples', 'files', 0, '^page-sample-.*\.html$');
 
-	    if ($showempty || !$atleastonepage) $out .= '<option value="-1">&nbsp;</option>';
+		$arrayofsamples = array();
+		$arrayofsamples['empty'] = 'EmptyPage'; // Always this one first
+		foreach ($listofsamples as $sample)
+		{
+			$reg = array();
+			if (preg_match('/^page-sample-(.*)\.html$/', $sample['name'], $reg))
+			{
+				$key = $reg[1];
+				$labelkey = ucfirst($key);
+				if ($key == 'empty') $labelkey = 'EmptyPage';
+				$arrayofsamples[$key] = $labelkey;
+			}
+		}
 
-	    if ($atleastonepage)
-	    {
-	    	if (empty($pageid) && $action != 'createcontainer')      // Page id is not defined, we try to take one
-	    	{
-	    		$firstpageid = 0; $homepageid = 0;
-	    		foreach ($website->lines as $key => $valpage)
-	    		{
-	    			if (empty($firstpageid)) $firstpageid = $valpage->id;
-	    			if ($website->fk_default_home && $key == $website->fk_default_home) $homepageid = $valpage->id;
-	    		}
-	    		$pageid = $homepageid ? $homepageid : $firstpageid; // We choose home page and if not defined yet, we take first page
-	    	}
+		$out = '';
+		$out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
 
-	    	foreach ($website->lines as $key => $valpage)
-	    	{
-	    		if (is_array($excludeids) && count($excludeids) && in_array($valpage->id, $excludeids)) continue;
+		if ($useempty == 1 || $useempty == 2)
+		{
+			$out .= '<option value="-1">&nbsp;</option>';
+		}
 
-	    		$valueforoption = '<span class="opacitymedium">['.$valpage->type_container.' '.sprintf("%03d", $valpage->id).']</span> ';
-	    		$valueforoption .= $valpage->pageurl.' - '.$valpage->title;
-	    		if ($website->otherlang) {	// If there is alternative lang for this web site, we show the language code
-	    			if ($valpage->lang) {
-	    				$valueforoption .= ' <span class="opacitymedium">('.$valpage->lang.')</span>';
-	    			}
-	    		}
-	    		if ($website->fk_default_home && $key == $website->fk_default_home) {
-	    			//$valueforoption .= ' <span class="opacitymedium">('.$langs->trans("HomePage").')</span>';
-	    			$valueforoption .= ' <span class="opacitymedium fa fa-home"></span>';
-	    		}
+		foreach ($arrayofsamples as $key => $val)
+		{
+			if ($selected == $key)
+			{
+				$out .= '<option value="'.$key.'" selected>';
+			} else {
+				$out .= '<option value="'.$key.'">';
+			}
+			$out .= $langs->trans($val);
+			$out .= '</option>';
+		}
+		$out .= "</select>";
 
-	    		$out .= '<option value="'.$key.'"';
-	    		if ($pageid > 0 && $pageid == $key) $out .= ' selected'; // To preselect a value
-	    		$out .= ' data-html="'.dol_escape_htmltag($valueforoption).'"';
-	    		$out .= '>';
-	    		$out .= $valueforoption;
-	    		$out .= '</option>';
-	    	}
-	    }
-	    $out .= '</select>';
+		return $out;
+	}
 
-	    if ($atleastonepage && $action != 'editsource')
-	    {
-	    	$out .= ajax_combobox($htmlname);
-	    } else {
-	    	$out .= '<input type="hidden" name="'.$htmlname.'" value="'.$pageid.'">';
-	    	$out .= ajax_combobox($htmlname);
-	    }
-	    return $out;
+
+	/**
+	 *  Return a HTML select list of containers of a website.
+	 *  Note: $website->lines must have been loaded.
+	 *
+	 *  @param  Website		$website       	Object Website
+	 *  @param	string		$htmlname		Name of select zone
+	 *  @param	int			$pageid			Preselected container ID
+	 *  @param	int			$showempty		Show empty record
+	 *  @param	string		$action			Action on page that use this select list
+	 *  @param	string		$morecss		More CSS
+	 *  @param	array		$excludeids		Exclude some ID in list
+	 * 	@return	string						HTML select component with list of block containers
+	 */
+	public function selectContainer($website, $htmlname = 'pageid', $pageid = 0, $showempty = 0, $action = '', $morecss = 'minwidth200', $excludeids = null)
+	{
+		$this->num = 0;
+
+		$atleastonepage = (is_array($website->lines) && count($website->lines) > 0);
+
+		$out = '';
+		if ($atleastonepage && $action != 'editsource')
+		{
+			$out .= '<select name="'.$htmlname.'" id="'.$htmlname.'" class="maxwidth300'.($morecss ? ' '.$morecss : '').'">';
+		} else {
+			$out .= '<select name="pageidbis" id="pageid" class="maxwidth300'.($morecss ? ' '.$morecss : '').'" disabled="disabled">';
+		}
+
+		if ($showempty || !$atleastonepage) $out .= '<option value="-1">&nbsp;</option>';
+
+		if ($atleastonepage)
+		{
+			if (empty($pageid) && $action != 'createcontainer')      // Page id is not defined, we try to take one
+			{
+				$firstpageid = 0; $homepageid = 0;
+				foreach ($website->lines as $key => $valpage)
+				{
+					if (empty($firstpageid)) $firstpageid = $valpage->id;
+					if ($website->fk_default_home && $key == $website->fk_default_home) $homepageid = $valpage->id;
+				}
+				$pageid = $homepageid ? $homepageid : $firstpageid; // We choose home page and if not defined yet, we take first page
+			}
+
+			foreach ($website->lines as $key => $valpage)
+			{
+				if (is_array($excludeids) && count($excludeids) && in_array($valpage->id, $excludeids)) continue;
+
+				$valueforoption = '<span class="opacitymedium">['.$valpage->type_container.' '.sprintf("%03d", $valpage->id).']</span> ';
+				$valueforoption .= $valpage->pageurl.' - '.$valpage->title;
+				if ($website->otherlang) {	// If there is alternative lang for this web site, we show the language code
+					if ($valpage->lang) {
+						$valueforoption .= ' <span class="opacitymedium">('.$valpage->lang.')</span>';
+					}
+				}
+				if ($website->fk_default_home && $key == $website->fk_default_home) {
+					//$valueforoption .= ' <span class="opacitymedium">('.$langs->trans("HomePage").')</span>';
+					$valueforoption .= ' <span class="opacitymedium fa fa-home"></span>';
+				}
+
+				$out .= '<option value="'.$key.'"';
+				if ($pageid > 0 && $pageid == $key) $out .= ' selected'; // To preselect a value
+				$out .= ' data-html="'.dol_escape_htmltag($valueforoption).'"';
+				$out .= '>';
+				$out .= $valueforoption;
+				$out .= '</option>';
+
+				++$this->num;
+			}
+		}
+		$out .= '</select>';
+
+		if ($atleastonepage && $action != 'editsource')
+		{
+			$out .= ajax_combobox($htmlname);
+		} else {
+			$out .= '<input type="hidden" name="'.$htmlname.'" value="'.$pageid.'">';
+			$out .= ajax_combobox($htmlname);
+		}
+		return $out;
 	}
 }
diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index 26edc402880..a4cb7a603dd 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -28,21 +28,21 @@
  */
 class InfoBox
 {
-    /**
-     * Name of positions (See below)
-     *
-     * @return	string[]		Array with list of zones
-     */
-    public static function getListOfPagesForBoxes()
-    {
+	/**
+	 * Name of positions (See below)
+	 *
+	 * @return	string[]		Array with list of zones
+	 */
+	public static function getListOfPagesForBoxes()
+	{
 		global $conf;
 
 		if (empty($conf->global->MAIN_FEATURES_LEVEL) || $conf->global->MAIN_FEATURES_LEVEL < 2)
 		{
-        	return array(
-        		0 => 'Home',
-        		27 => 'AccountancyHome'
-        	);
+			return array(
+				0 => 'Home',
+				27 => 'AccountancyHome'
+			);
 		} else {
 			return array(
 				0 => 'Home',
@@ -75,237 +75,237 @@ class InfoBox
 				27 => 'AccountancyHome'
 			);
 		}
-    }
+	}
 
-    /**
-     *  Return array of boxes qualified for area and user
-     *
-     *  @param	DoliDB		$db				Database handler
-     *  @param	string		$mode			'available' or 'activated'
-     *  @param	string		$zone			Name or area (-1 for all, 0 for Homepage, 1 for Accountancy, 2 for xxx, ...)
-     *  @param  User|null   $user	  		Object user to filter
-     *  @param	array		$excludelist	Array of box id (box.box_id = boxes_def.rowid) to exclude
-     *  @param  int         $includehidden  Include also hidden boxes
-     *  @return array       	        	Array of boxes
-     */
-    public static function listBoxes($db, $mode, $zone, $user = null, $excludelist = array(), $includehidden = 1)
-    {
-        global $conf;
+	/**
+	 *  Return array of boxes qualified for area and user
+	 *
+	 *  @param	DoliDB		$db				Database handler
+	 *  @param	string		$mode			'available' or 'activated'
+	 *  @param	string		$zone			Name or area (-1 for all, 0 for Homepage, 1 for Accountancy, 2 for xxx, ...)
+	 *  @param  User|null   $user	  		Object user to filter
+	 *  @param	array		$excludelist	Array of box id (box.box_id = boxes_def.rowid) to exclude
+	 *  @param  int         $includehidden  Include also hidden boxes
+	 *  @return array       	        	Array of boxes
+	 */
+	public static function listBoxes($db, $mode, $zone, $user = null, $excludelist = array(), $includehidden = 1)
+	{
+		global $conf;
 
-        $boxes = array();
+		$boxes = array();
 
-        $confuserzone = 'MAIN_BOXES_'.$zone;
-        if ($mode == 'activated')	// activated
-        {
-            $sql = "SELECT b.rowid, b.position, b.box_order, b.fk_user,";
-            $sql .= " d.rowid as box_id, d.file, d.note, d.tms";
-            $sql .= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as d";
-            $sql .= " WHERE b.box_id = d.rowid";
-            $sql .= " AND b.entity IN (0,".$conf->entity.")";
-            if ($zone >= 0) $sql .= " AND b.position = ".$zone;
-            if (is_object($user)) $sql .= " AND b.fk_user IN (0,".$user->id.")";
-            else $sql .= " AND b.fk_user = 0";
-            $sql .= " ORDER BY b.box_order";
-        } else // available
-        {
-            $sql = "SELECT d.rowid as box_id, d.file, d.note, d.tms";
-            $sql .= " FROM ".MAIN_DB_PREFIX."boxes_def as d";
-            $sql .= " WHERE d.entity IN (0,".$conf->entity.")";
-        }
+		$confuserzone = 'MAIN_BOXES_'.$zone;
+		if ($mode == 'activated')	// activated
+		{
+			$sql = "SELECT b.rowid, b.position, b.box_order, b.fk_user,";
+			$sql .= " d.rowid as box_id, d.file, d.note, d.tms";
+			$sql .= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as d";
+			$sql .= " WHERE b.box_id = d.rowid";
+			$sql .= " AND b.entity IN (0,".$conf->entity.")";
+			if ($zone >= 0) $sql .= " AND b.position = ".$zone;
+			if (is_object($user)) $sql .= " AND b.fk_user IN (0,".$user->id.")";
+			else $sql .= " AND b.fk_user = 0";
+			$sql .= " ORDER BY b.box_order";
+		} else // available
+		{
+			$sql = "SELECT d.rowid as box_id, d.file, d.note, d.tms";
+			$sql .= " FROM ".MAIN_DB_PREFIX."boxes_def as d";
+			$sql .= " WHERE d.entity IN (0,".$conf->entity.")";
+		}
 
-        dol_syslog(get_class()."::listBoxes get default box list for mode=".$mode." userid=".(is_object($user) ? $user->id : '')."", LOG_DEBUG);
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $num = $db->num_rows($resql);
-            $j = 0;
-            while ($j < $num)
-            {
-                $obj = $db->fetch_object($resql);
+		dol_syslog(get_class()."::listBoxes get default box list for mode=".$mode." userid=".(is_object($user) ? $user->id : '')."", LOG_DEBUG);
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$num = $db->num_rows($resql);
+			$j = 0;
+			while ($j < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                if (!in_array($obj->box_id, $excludelist))
-                {
-                	$regs = array();
-                    if (preg_match('/^([^@]+)@([^@]+)$/i', $obj->file, $regs))
-                    {
-                        $boxname = preg_replace('/\.php$/i', '', $regs[1]);
-                        $module = $regs[2];
-                        $relsourcefile = "/".$module."/core/boxes/".$boxname.".php";
-                    } else {
-                        $boxname = preg_replace('/\.php$/i', '', $obj->file);
-                        $relsourcefile = "/core/boxes/".$boxname.".php";
-                    }
+				if (!in_array($obj->box_id, $excludelist))
+				{
+					$regs = array();
+					if (preg_match('/^([^@]+)@([^@]+)$/i', $obj->file, $regs))
+					{
+						$boxname = preg_replace('/\.php$/i', '', $regs[1]);
+						$module = $regs[2];
+						$relsourcefile = "/".$module."/core/boxes/".$boxname.".php";
+					} else {
+						$boxname = preg_replace('/\.php$/i', '', $obj->file);
+						$relsourcefile = "/core/boxes/".$boxname.".php";
+					}
 
-                    //print $obj->box_id.'-'.$boxname.'-'.$relsourcefile.'<br>';
+					//print $obj->box_id.'-'.$boxname.'-'.$relsourcefile.'<br>';
 
-                    // TODO PERF Do not make "dol_include_once" here, nor "new" later. This means, we must store a 'depends' field to store modules list, then
-                    // the "enabled" condition for modules forbidden for external users and the depends condition can be done.
-                    // Goal is to avoid making a "new" done for each boxes returned by select.
-                    dol_include_once($relsourcefile);
-                    if (class_exists($boxname))
-                    {
-                        $box = new $boxname($db, $obj->note); // Constructor may set properties like box->enabled. obj->note is note into box def, not user params.
-                        //$box=new stdClass();
+					// TODO PERF Do not make "dol_include_once" here, nor "new" later. This means, we must store a 'depends' field to store modules list, then
+					// the "enabled" condition for modules forbidden for external users and the depends condition can be done.
+					// Goal is to avoid making a "new" done for each boxes returned by select.
+					dol_include_once($relsourcefile);
+					if (class_exists($boxname))
+					{
+						$box = new $boxname($db, $obj->note); // Constructor may set properties like box->enabled. obj->note is note into box def, not user params.
+						//$box=new stdClass();
 
-                        // box properties
-                        $box->rowid = (empty($obj->rowid) ? '' : $obj->rowid);
-                        $box->id = (empty($obj->box_id) ? '' : $obj->box_id);
-                        $box->position = ($obj->position == '' ? '' : $obj->position); // '0' must stay '0'
-                        $box->box_order	= (empty($obj->box_order) ? '' : $obj->box_order);
-                        $box->fk_user = (empty($obj->fk_user) ? 0 : $obj->fk_user);
-                        $box->sourcefile = $relsourcefile;
-                        $box->class     = $boxname;
+						// box properties
+						$box->rowid = (empty($obj->rowid) ? '' : $obj->rowid);
+						$box->id = (empty($obj->box_id) ? '' : $obj->box_id);
+						$box->position = ($obj->position == '' ? '' : $obj->position); // '0' must stay '0'
+						$box->box_order	= (empty($obj->box_order) ? '' : $obj->box_order);
+						$box->fk_user = (empty($obj->fk_user) ? 0 : $obj->fk_user);
+						$box->sourcefile = $relsourcefile;
+						$box->class     = $boxname;
 
-                        if ($mode == 'activated' && !is_object($user))	// List of activated box was not yet personalized into database
-                        {
-                            if (is_numeric($box->box_order))
-                            {
-                                if ($box->box_order % 2 == 1) $box->box_order = 'A'.$box->box_order;
-                                elseif ($box->box_order % 2 == 0) $box->box_order = 'B'.$box->box_order;
-                            }
-                        }
-                        // box_def properties
-                        $box->box_id = (empty($obj->box_id) ? '' : $obj->box_id);
-                        $box->note = (empty($obj->note) ? '' : $obj->note);
+						if ($mode == 'activated' && !is_object($user))	// List of activated box was not yet personalized into database
+						{
+							if (is_numeric($box->box_order))
+							{
+								if ($box->box_order % 2 == 1) $box->box_order = 'A'.$box->box_order;
+								elseif ($box->box_order % 2 == 0) $box->box_order = 'B'.$box->box_order;
+							}
+						}
+						// box_def properties
+						$box->box_id = (empty($obj->box_id) ? '' : $obj->box_id);
+						$box->note = (empty($obj->note) ? '' : $obj->note);
 
-                        // Filter on box->enabled (used for example by box_comptes)
-                        // Filter also on box->depends. Example: array("product|service") or array("contrat", "service")
-                        $enabled = $box->enabled;
-                        if (isset($box->depends) && count($box->depends) > 0)
-                        {
-                            foreach ($box->depends as $moduleelem)
-                            {
-                                $arrayelem = explode('|', $moduleelem);
-                                $tmpenabled = 0; // $tmpenabled is used for the '|' test (OR)
-                                foreach ($arrayelem as $module)
-                                {
-                                    $tmpmodule = preg_replace('/@[^@]+/', '', $module);
-                                    if (!empty($conf->$tmpmodule->enabled)) $tmpenabled = 1;
-                                    //print $boxname.'-'.$module.'-module enabled='.(empty($conf->$tmpmodule->enabled)?0:1).'<br>';
-                                }
-                                if (empty($tmpenabled))	// We found at least one module required that is disabled
-                                {
-                                    $enabled = 0;
-                                    break;
-                                }
-                            }
-                        }
-                        //print '=>'.$boxname.'-enabled='.$enabled.'<br>';
+						// Filter on box->enabled (used for example by box_comptes)
+						// Filter also on box->depends. Example: array("product|service") or array("contrat", "service")
+						$enabled = $box->enabled;
+						if (isset($box->depends) && count($box->depends) > 0)
+						{
+							foreach ($box->depends as $moduleelem)
+							{
+								$arrayelem = explode('|', $moduleelem);
+								$tmpenabled = 0; // $tmpenabled is used for the '|' test (OR)
+								foreach ($arrayelem as $module)
+								{
+									$tmpmodule = preg_replace('/@[^@]+/', '', $module);
+									if (!empty($conf->$tmpmodule->enabled)) $tmpenabled = 1;
+									//print $boxname.'-'.$module.'-module enabled='.(empty($conf->$tmpmodule->enabled)?0:1).'<br>';
+								}
+								if (empty($tmpenabled))	// We found at least one module required that is disabled
+								{
+									$enabled = 0;
+									break;
+								}
+							}
+						}
+						//print '=>'.$boxname.'-enabled='.$enabled.'<br>';
 
-                        //print 'xx module='.$module.' enabled='.$enabled;
-                        if ($enabled && ($includehidden || empty($box->hidden))) $boxes[] = $box;
-                        else unset($box);
-                    } else {
-                        dol_syslog("Failed to load box '".$boxname."' into file '".$relsourcefile."'", LOG_WARNING);
-                    }
-                }
-                $j++;
-            }
-        } else {
-            dol_syslog($db->lasterror(), LOG_ERR);
-            return array('error'=>$db->lasterror());
-        }
+						//print 'xx module='.$module.' enabled='.$enabled;
+						if ($enabled && ($includehidden || empty($box->hidden))) $boxes[] = $box;
+						else unset($box);
+					} else {
+						dol_syslog("Failed to load box '".$boxname."' into file '".$relsourcefile."'", LOG_WARNING);
+					}
+				}
+				$j++;
+			}
+		} else {
+			dol_syslog($db->lasterror(), LOG_ERR);
+			return array('error'=>$db->lasterror());
+		}
 
-        return $boxes;
-    }
+		return $boxes;
+	}
 
 
-    /**
-     *  Save order of boxes for area and user
-     *
-     *  @param	DoliDB	$db				Database handler
-     *  @param	string	$zone       	Name of area (0 for Homepage, ...)
-     *  @param  string  $boxorder   	List of boxes with correct order 'A:123,456,...-B:789,321...'
-     *  @param  int     $userid     	Id of user
-     *  @return int                   	<0 if KO, 0=Nothing done, > 0 if OK
-     */
-    public static function saveboxorder($db, $zone, $boxorder, $userid = 0)
-    {
-        global $conf;
+	/**
+	 *  Save order of boxes for area and user
+	 *
+	 *  @param	DoliDB	$db				Database handler
+	 *  @param	string	$zone       	Name of area (0 for Homepage, ...)
+	 *  @param  string  $boxorder   	List of boxes with correct order 'A:123,456,...-B:789,321...'
+	 *  @param  int     $userid     	Id of user
+	 *  @return int                   	<0 if KO, 0=Nothing done, > 0 if OK
+	 */
+	public static function saveboxorder($db, $zone, $boxorder, $userid = 0)
+	{
+		global $conf;
 
-        $error = 0;
+		$error = 0;
 
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-        dol_syslog(get_class()."::saveboxorder zone=".$zone." userid=".$userid);
+		dol_syslog(get_class()."::saveboxorder zone=".$zone." userid=".$userid);
 
-        if (!$userid || $userid == 0) return 0;
+		if (!$userid || $userid == 0) return 0;
 
-        $user = new User($db);
-        $user->id = $userid;
+		$user = new User($db);
+		$user->id = $userid;
 
-        $db->begin();
+		$db->begin();
 
-        // Save parameters to say user has a dedicated setup
-        $tab = array();
-        $confuserzone = 'MAIN_BOXES_'.$zone;
-        $tab[$confuserzone] = 1;
-        if (dol_set_user_param($db, $conf, $user, $tab) < 0)
-        {
-            $error = $db->lasterror();
-            $db->rollback();
-            return -3;
-        }
+		// Save parameters to say user has a dedicated setup
+		$tab = array();
+		$confuserzone = 'MAIN_BOXES_'.$zone;
+		$tab[$confuserzone] = 1;
+		if (dol_set_user_param($db, $conf, $user, $tab) < 0)
+		{
+			$error = $db->lasterror();
+			$db->rollback();
+			return -3;
+		}
 
-        // Delete all lines
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
-        $sql .= " WHERE entity = ".$conf->entity;
-        $sql .= " AND fk_user = ".$userid;
-        $sql .= " AND position = ".$zone;
+		// Delete all lines
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
+		$sql .= " WHERE entity = ".$conf->entity;
+		$sql .= " AND fk_user = ".$userid;
+		$sql .= " AND position = ".$zone;
 
-        dol_syslog(get_class()."::saveboxorder", LOG_DEBUG);
-        $result = $db->query($sql);
-        if ($result)
-        {
-            $colonnes = explode('-', $boxorder);
-            foreach ($colonnes as $collist)
-            {
-                $part = explode(':', $collist);
-                $colonne = $part[0];
-                $list = $part[1];
-                dol_syslog(get_class()."::saveboxorder column=".$colonne.' list='.$list);
+		dol_syslog(get_class()."::saveboxorder", LOG_DEBUG);
+		$result = $db->query($sql);
+		if ($result)
+		{
+			$colonnes = explode('-', $boxorder);
+			foreach ($colonnes as $collist)
+			{
+				$part = explode(':', $collist);
+				$colonne = $part[0];
+				$list = $part[1];
+				dol_syslog(get_class()."::saveboxorder column=".$colonne.' list='.$list);
 
-                $i = 0;
-                $listarray = explode(',', $list);
-                foreach ($listarray as $id)
-                {
-                    if (is_numeric($id))
-                    {
-                        //dol_syslog("aaaaa".count($listarray));
-                        $i++;
-                        $ii = sprintf('%02d', $i);
+				$i = 0;
+				$listarray = explode(',', $list);
+				foreach ($listarray as $id)
+				{
+					if (is_numeric($id))
+					{
+						//dol_syslog("aaaaa".count($listarray));
+						$i++;
+						$ii = sprintf('%02d', $i);
 
-                        $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes";
-                        $sql .= "(box_id, position, box_order, fk_user, entity)";
-                        $sql .= " values (";
-                        $sql .= " ".$id.",";
-                        $sql .= " ".$zone.",";
-                        $sql .= " '".$db->escape($colonne.$ii)."',";
-                        $sql .= " ".$userid.",";
-                        $sql .= " ".$conf->entity;
-                        $sql .= ")";
+						$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes";
+						$sql .= "(box_id, position, box_order, fk_user, entity)";
+						$sql .= " values (";
+						$sql .= " ".$id.",";
+						$sql .= " ".$zone.",";
+						$sql .= " '".$db->escape($colonne.$ii)."',";
+						$sql .= " ".$userid.",";
+						$sql .= " ".$conf->entity;
+						$sql .= ")";
 
-                        dol_syslog(get_class()."::saveboxorder", LOG_DEBUG);
-                        $result = $db->query($sql);
-                        if ($result < 0)
-                        {
-                            $error++;
-                            break;
-                        }
-                    }
-                }
-            }
-        } else {
-        	$error++;
-        }
+						dol_syslog(get_class()."::saveboxorder", LOG_DEBUG);
+						$result = $db->query($sql);
+						if ($result < 0)
+						{
+							$error++;
+							break;
+						}
+					}
+				}
+			}
+		} else {
+			$error++;
+		}
 
-        if ($error)
-        {
-        	$db->rollback();
-        	return -2;
-        } else {
-        	$db->commit();
-        	return 1;
-        }
-    }
+		if ($error)
+		{
+			$db->rollback();
+			return -2;
+		} else {
+			$db->commit();
+			return 1;
+		}
+	}
 }
diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index c7004eea8b4..19965250727 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -31,348 +31,348 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
  */
 class Interfaces
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $dir; // Directory with all core and external triggers files
+	public $dir; // Directory with all core and external triggers files
 
-    /**
-     * @var string[] Error codes (or messages)
-     */
-    public $errors = array();
+	/**
+	 * @var string[] Error codes (or messages)
+	 */
+	public $errors = array();
 
-    /**
-     *	Constructor
-     *
-     *  @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *   Function called when a Dolibarr business event occurs
-     *   This function call all qualified triggers.
-     *
-     *   @param		string		$action     Trigger event code
-     *   @param     object		$object     Objet concerned. Some context information may also be provided into array property object->context.
-     *   @param     User		$user       Objet user
-     *   @param     Translate	$langs      Objet lang
-     *   @param     Conf		$conf       Objet conf
-     *   @return    int         			Nb of triggers ran if no error, -Nb of triggers with errors otherwise.
-     */
-    public function run_triggers($action, $object, $user, $langs, $conf)
-    {
-        // phpcs:enable
-        // Check parameters
-        if (!is_object($object) || !is_object($conf))	// Error
-        {
-            $this->error = 'function run_triggers called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf);
-            dol_syslog(get_class($this).'::run_triggers '.$this->error, LOG_ERR);
-            $this->errors[] = $this->error;
-            return -1;
-        }
-        if (!is_object($langs))	// Warning
-        {
-            dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);
-        }
-        if (!is_object($user))	    // Warning
-        {
-            dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);
-            $user = new User($this->db);
-        }
-        //dol_syslog(get_class($this)."::run_triggers action=".$action." Launch run_triggers", LOG_DEBUG);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *   Function called when a Dolibarr business event occurs
+	 *   This function call all qualified triggers.
+	 *
+	 *   @param		string		$action     Trigger event code
+	 *   @param     object		$object     Objet concerned. Some context information may also be provided into array property object->context.
+	 *   @param     User		$user       Objet user
+	 *   @param     Translate	$langs      Objet lang
+	 *   @param     Conf		$conf       Objet conf
+	 *   @return    int         			Nb of triggers ran if no error, -Nb of triggers with errors otherwise.
+	 */
+	public function run_triggers($action, $object, $user, $langs, $conf)
+	{
+		// phpcs:enable
+		// Check parameters
+		if (!is_object($object) || !is_object($conf))	// Error
+		{
+			$this->error = 'function run_triggers called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf);
+			dol_syslog(get_class($this).'::run_triggers '.$this->error, LOG_ERR);
+			$this->errors[] = $this->error;
+			return -1;
+		}
+		if (!is_object($langs))	// Warning
+		{
+			dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);
+		}
+		if (!is_object($user))	    // Warning
+		{
+			dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);
+			$user = new User($this->db);
+		}
+		//dol_syslog(get_class($this)."::run_triggers action=".$action." Launch run_triggers", LOG_DEBUG);
 
-        $nbfile = $nbtotal = $nbok = $nbko = 0;
+		$nbfile = $nbtotal = $nbok = $nbko = 0;
 
-        $files = array();
-        $modules = array();
-        $orders = array();
-        $i = 0;
+		$files = array();
+		$modules = array();
+		$orders = array();
+		$i = 0;
 
 
-        $dirtriggers = array_merge(array('/core/triggers'), $conf->modules_parts['triggers']);
-        foreach ($dirtriggers as $reldir)
-        {
-            $dir = dol_buildpath($reldir, 0);
-            $newdir = dol_osencode($dir);
-            //print "xx".$dir;exit;
+		$dirtriggers = array_merge(array('/core/triggers'), $conf->modules_parts['triggers']);
+		foreach ($dirtriggers as $reldir)
+		{
+			$dir = dol_buildpath($reldir, 0);
+			$newdir = dol_osencode($dir);
+			//print "xx".$dir;exit;
 
-            // Check if directory exists (we do not use dol_is_dir to avoir loading files.lib.php at each call)
-            if (!is_dir($newdir)) continue;
+			// Check if directory exists (we do not use dol_is_dir to avoir loading files.lib.php at each call)
+			if (!is_dir($newdir)) continue;
 
-            $handle = opendir($newdir);
-            if (is_resource($handle))
-            {
-            	$fullpathfiles = array();
-                while (($file = readdir($handle)) !== false)
-                {
-                	$reg = array();
-                    if (is_readable($newdir."/".$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php$/i', $file, $reg))
-                    {
-                        $part1 = $reg[1];
-                        $part2 = $reg[2];
-                        $part3 = $reg[3];
+			$handle = opendir($newdir);
+			if (is_resource($handle))
+			{
+				$fullpathfiles = array();
+				while (($file = readdir($handle)) !== false)
+				{
+					$reg = array();
+					if (is_readable($newdir."/".$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php$/i', $file, $reg))
+					{
+						$part1 = $reg[1];
+						$part2 = $reg[2];
+						$part3 = $reg[3];
 
-                        $nbfile++;
+						$nbfile++;
 
-                        // Check if trigger file is disabled by name
-                        if (preg_match('/NORUN$/i', $file)) continue;
-                        // Check if trigger file is for a particular module
-                        $qualified = true;
-                        if (strtolower($reg[2]) != 'all')
-                        {
-                            $module = preg_replace('/^mod/i', '', $reg[2]);
-                            $constparam = 'MAIN_MODULE_'.strtoupper($module);
-                            if (empty($conf->global->$constparam)) $qualified = false;
-                        }
+						// Check if trigger file is disabled by name
+						if (preg_match('/NORUN$/i', $file)) continue;
+						// Check if trigger file is for a particular module
+						$qualified = true;
+						if (strtolower($reg[2]) != 'all')
+						{
+							$module = preg_replace('/^mod/i', '', $reg[2]);
+							$constparam = 'MAIN_MODULE_'.strtoupper($module);
+							if (empty($conf->global->$constparam)) $qualified = false;
+						}
 
-                        if (!$qualified)
-                        {
-                            //dol_syslog(get_class($this)."::run_triggers action=".$action." Triggers for file '".$file."' need module to be enabled", LOG_DEBUG);
-                            continue;
-                        }
+						if (!$qualified)
+						{
+							//dol_syslog(get_class($this)."::run_triggers action=".$action." Triggers for file '".$file."' need module to be enabled", LOG_DEBUG);
+							continue;
+						}
 
-                        $modName = "Interface".ucfirst($reg[3]);
-                        //print "file=$file - modName=$modName\n";
-                        if (in_array($modName, $modules))    // $modules = list of modName already loaded
-                        {
-                            $langs->load("errors");
-                            dol_syslog(get_class($this)."::run_triggers action=".$action." ".$langs->trans("ErrorDuplicateTrigger", $newdir."/".$file, $fullpathfiles[$modName]), LOG_WARNING);
-                            continue;
-                        }
+						$modName = "Interface".ucfirst($reg[3]);
+						//print "file=$file - modName=$modName\n";
+						if (in_array($modName, $modules))    // $modules = list of modName already loaded
+						{
+							$langs->load("errors");
+							dol_syslog(get_class($this)."::run_triggers action=".$action." ".$langs->trans("ErrorDuplicateTrigger", $newdir."/".$file, $fullpathfiles[$modName]), LOG_WARNING);
+							continue;
+						}
 
-                        try {
-                            //print 'Todo for '.$modName." : ".$newdir.'/'.$file."\n";
-                            include_once $newdir.'/'.$file;
-                            //print 'Done for '.$modName."\n";
-                        } catch (Exception $e)
-                        {
-                            dol_syslog('ko for '.$modName." ".$e->getMessage()."\n", LOG_ERR);
-                        }
+						try {
+							//print 'Todo for '.$modName." : ".$newdir.'/'.$file."\n";
+							include_once $newdir.'/'.$file;
+							//print 'Done for '.$modName."\n";
+						} catch (Exception $e)
+						{
+							dol_syslog('ko for '.$modName." ".$e->getMessage()."\n", LOG_ERR);
+						}
 
-                        $modules[$i] = $modName;
-                        $files[$i] = $file;
-                        $fullpathfiles[$modName] = $newdir.'/'.$file;
-                        $orders[$i] = $part1.'_'.$part2.'_'.$part3; // Set sort criteria value
+						$modules[$i] = $modName;
+						$files[$i] = $file;
+						$fullpathfiles[$modName] = $newdir.'/'.$file;
+						$orders[$i] = $part1.'_'.$part2.'_'.$part3; // Set sort criteria value
 
-                        $i++;
-                    }
-                }
+						$i++;
+					}
+				}
 
 				closedir($handle);
-            }
-        }
+			}
+		}
 
-        asort($orders);
+		asort($orders);
 
-        // Loop on each trigger
-        foreach ($orders as $key => $value)
-        {
-            $modName = $modules[$key];
-            if (empty($modName)) continue;
+		// Loop on each trigger
+		foreach ($orders as $key => $value)
+		{
+			$modName = $modules[$key];
+			if (empty($modName)) continue;
 
-            $objMod = new $modName($this->db);
-            if ($objMod)
-            {
-                $result = 0;
+			$objMod = new $modName($this->db);
+			if ($objMod)
+			{
+				$result = 0;
 
-                if (method_exists($objMod, 'runTrigger'))	// New method to implement
-                {
-                    //dol_syslog(get_class($this)."::run_triggers action=".$action." Launch runTrigger for file '".$files[$key]."'", LOG_DEBUG);
-                    $result = $objMod->runTrigger($action, $object, $user, $langs, $conf);
-                } elseif (method_exists($objMod, 'run_trigger'))	// Deprecated method
-                {
-                    dol_syslog(get_class($this)."::run_triggers action=".$action." Launch old method run_trigger (rename your trigger into runTrigger) for file '".$files[$key]."'", LOG_WARNING);
-                    $result = $objMod->run_trigger($action, $object, $user, $langs, $conf);
-                } else {
-                    dol_syslog(get_class($this)."::run_triggers action=".$action." A trigger was declared for class ".get_class($objMod)." but method runTrigger was not found", LOG_ERR);
-                }
+				if (method_exists($objMod, 'runTrigger'))	// New method to implement
+				{
+					//dol_syslog(get_class($this)."::run_triggers action=".$action." Launch runTrigger for file '".$files[$key]."'", LOG_DEBUG);
+					$result = $objMod->runTrigger($action, $object, $user, $langs, $conf);
+				} elseif (method_exists($objMod, 'run_trigger'))	// Deprecated method
+				{
+					dol_syslog(get_class($this)."::run_triggers action=".$action." Launch old method run_trigger (rename your trigger into runTrigger) for file '".$files[$key]."'", LOG_WARNING);
+					$result = $objMod->run_trigger($action, $object, $user, $langs, $conf);
+				} else {
+					dol_syslog(get_class($this)."::run_triggers action=".$action." A trigger was declared for class ".get_class($objMod)." but method runTrigger was not found", LOG_ERR);
+				}
 
-                if ($result > 0)
-                {
-                    // Action OK
-                    $nbtotal++;
-                    $nbok++;
-                }
-                if ($result == 0)
-                {
-                    // Aucune action faite
-                    $nbtotal++;
-                }
-                if ($result < 0)
-                {
-                    // Action KO
-                    //dol_syslog("Error in trigger ".$action." - Nb of error string returned = ".count($objMod->errors), LOG_ERR);
-                    $nbtotal++;
-                    $nbko++;
-                    if (!empty($objMod->errors)) $this->errors = array_merge($this->errors, $objMod->errors);
-                    elseif (!empty($objMod->error))  $this->errors[] = $objMod->error;
-                    //dol_syslog("Error in trigger ".$action." - Nb of error string returned = ".count($this->errors), LOG_ERR);
-                }
-            } else {
-                dol_syslog(get_class($this)."::run_triggers action=".$action." Failed to instantiate trigger for file '".$files[$key]."'", LOG_ERR);
-            }
-        }
+				if ($result > 0)
+				{
+					// Action OK
+					$nbtotal++;
+					$nbok++;
+				}
+				if ($result == 0)
+				{
+					// Aucune action faite
+					$nbtotal++;
+				}
+				if ($result < 0)
+				{
+					// Action KO
+					//dol_syslog("Error in trigger ".$action." - result = ".$result." - Nb of error string returned = ".count($objMod->errors), LOG_ERR);
+					$nbtotal++;
+					$nbko++;
+					if (!empty($objMod->errors)) $this->errors = array_merge($this->errors, $objMod->errors);
+					elseif (!empty($objMod->error))  $this->errors[] = $objMod->error;
+					//dol_syslog("Error in trigger ".$action." - Nb of error string returned = ".count($this->errors), LOG_ERR);
+				}
+			} else {
+				dol_syslog(get_class($this)."::run_triggers action=".$action." Failed to instantiate trigger for file '".$files[$key]."'", LOG_ERR);
+			}
+		}
 
-        if ($nbko)
-        {
-            dol_syslog(get_class($this)."::run_triggers action=".$action." Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko." - Nb of error string returned in this->errors = ".count($this->errors), LOG_ERR);
-            return -$nbko;
-        } else {
-            //dol_syslog(get_class($this)."::run_triggers Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko, LOG_DEBUG);
-            return $nbok;
-        }
-    }
+		if ($nbko)
+		{
+			dol_syslog(get_class($this)."::run_triggers action=".$action." Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko." - Nb of error string returned in this->errors = ".count($this->errors), LOG_ERR);
+			return -$nbko;
+		} else {
+			//dol_syslog(get_class($this)."::run_triggers Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko, LOG_DEBUG);
+			return $nbok;
+		}
+	}
 
-    /**
-     *  Return list of triggers. Function used by admin page htdoc/admin/triggers.
-     *  List is sorted by trigger filename so by priority to run.
-     *
-     *  @param	array		$forcedirtriggers		null=All default directories. This parameter is used by modulebuilder module only.
-     * 	@return	array								Array list of triggers
-     */
-    public function getTriggersList($forcedirtriggers = null)
-    {
-        global $conf, $langs, $db;
+	/**
+	 *  Return list of triggers. Function used by admin page htdoc/admin/triggers.
+	 *  List is sorted by trigger filename so by priority to run.
+	 *
+	 *  @param	array		$forcedirtriggers		null=All default directories. This parameter is used by modulebuilder module only.
+	 * 	@return	array								Array list of triggers
+	 */
+	public function getTriggersList($forcedirtriggers = null)
+	{
+		global $conf, $langs, $db;
 
-        $files = array();
-        $fullpath = array();
-        $relpath = array();
-        $iscoreorexternal = array();
-        $modules = array();
-        $orders = array();
-        $i = 0;
+		$files = array();
+		$fullpath = array();
+		$relpath = array();
+		$iscoreorexternal = array();
+		$modules = array();
+		$orders = array();
+		$i = 0;
 
-        $dirtriggers = array_merge(array('/core/triggers/'), $conf->modules_parts['triggers']);
-        if (is_array($forcedirtriggers))
-        {
-            $dirtriggers = $forcedirtriggers;
-        }
+		$dirtriggers = array_merge(array('/core/triggers/'), $conf->modules_parts['triggers']);
+		if (is_array($forcedirtriggers))
+		{
+			$dirtriggers = $forcedirtriggers;
+		}
 
-        foreach ($dirtriggers as $reldir)
-        {
-            $dir = dol_buildpath($reldir, 0);
-            $newdir = dol_osencode($dir);
+		foreach ($dirtriggers as $reldir)
+		{
+			$dir = dol_buildpath($reldir, 0);
+			$newdir = dol_osencode($dir);
 
-            // Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php at each call)
-            if (!is_dir($newdir)) continue;
+			// Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php at each call)
+			if (!is_dir($newdir)) continue;
 
-            $handle = opendir($newdir);
-            if (is_resource($handle))
-            {
-                while (($file = readdir($handle)) !== false)
-                {
-                	$reg = array();
-                    if (is_readable($newdir.'/'.$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/', $file, $reg))
-                    {
-                        if (preg_match('/\.back$/', $file)) continue;
+			$handle = opendir($newdir);
+			if (is_resource($handle))
+			{
+				while (($file = readdir($handle)) !== false)
+				{
+					$reg = array();
+					if (is_readable($newdir.'/'.$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/', $file, $reg))
+					{
+						if (preg_match('/\.back$/', $file)) continue;
 
-                        $part1 = $reg[1];
-                        $part2 = $reg[2];
-                        $part3 = $reg[3];
+						$part1 = $reg[1];
+						$part2 = $reg[2];
+						$part3 = $reg[3];
 
-                        $modName = 'Interface'.ucfirst($reg[3]);
-                        //print "file=$file"; print "modName=$modName"; exit;
-                        if (in_array($modName, $modules))
-                        {
-                            $langs->load("errors");
-                            print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateTrigger", $modName, "/htdocs/core/triggers/").'</div>';
-                        } else {
-                            include_once $newdir.'/'.$file;
-                        }
+						$modName = 'Interface'.ucfirst($reg[3]);
+						//print "file=$file"; print "modName=$modName"; exit;
+						if (in_array($modName, $modules))
+						{
+							$langs->load("errors");
+							print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateTrigger", $modName, "/htdocs/core/triggers/").'</div>';
+						} else {
+							include_once $newdir.'/'.$file;
+						}
 
-                        $files[$i] = $file;
-                        $fullpath[$i] = $dir.'/'.$file;
-                        $relpath[$i] = preg_replace('/^\//', '', $reldir).'/'.$file;
-                        $iscoreorexternal[$i] = ($reldir == '/core/triggers/' ? 'internal' : 'external');
-                        $modules[$i] = $modName;
-                        $orders[$i] = $part1.'_'.$part2.'_'.$part3; // Set sort criteria value
+						$files[$i] = $file;
+						$fullpath[$i] = $dir.'/'.$file;
+						$relpath[$i] = preg_replace('/^\//', '', $reldir).'/'.$file;
+						$iscoreorexternal[$i] = ($reldir == '/core/triggers/' ? 'internal' : 'external');
+						$modules[$i] = $modName;
+						$orders[$i] = $part1.'_'.$part2.'_'.$part3; // Set sort criteria value
 
-                        $i++;
-                    }
-                }
-                closedir($handle);
-            }
-        }
+						$i++;
+					}
+				}
+				closedir($handle);
+			}
+		}
 
-        asort($orders);
+		asort($orders);
 
-        $triggers = array();
-        $j = 0;
+		$triggers = array();
+		$j = 0;
 
-        // Loop on each trigger
-        foreach ($orders as $key => $value)
-        {
-            $modName = $modules[$key];
-            if (empty($modName)) continue;
+		// Loop on each trigger
+		foreach ($orders as $key => $value)
+		{
+			$modName = $modules[$key];
+			if (empty($modName)) continue;
 
-            if (!class_exists($modName))
-            {
-                print 'Error: A trigger file was found but its class "'.$modName.'" was not found.'."<br>\n";
-                continue;
-            }
+			if (!class_exists($modName))
+			{
+				print 'Error: A trigger file was found but its class "'.$modName.'" was not found.'."<br>\n";
+				continue;
+			}
 
-            $text = '';
+			$text = '';
 
-            try {
-	            $objMod = new $modName($db);
+			try {
+				$objMod = new $modName($db);
 
-	            if (is_subclass_of($objMod, 'DolibarrTriggers'))
-	            {
-		            // Define disabledbyname and disabledbymodule
-		            $disabledbyname = 0;
-		            $disabledbymodule = 1;
-		            $module = '';
+				if (is_subclass_of($objMod, 'DolibarrTriggers'))
+				{
+					// Define disabledbyname and disabledbymodule
+					$disabledbyname = 0;
+					$disabledbymodule = 1;
+					$module = '';
 
-		            // Check if trigger file is disabled by name
-		            if (preg_match('/NORUN$/i', $files[$key])) $disabledbyname = 1;
-		            // Check if trigger file is for a particular module
-		            if (preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/i', $files[$key], $reg))
-		            {
-		                $module = preg_replace('/^mod/i', '', $reg[2]);
-		                $constparam = 'MAIN_MODULE_'.strtoupper($module);
-		                if (strtolower($module) == 'all') $disabledbymodule = 0;
-		                elseif (empty($conf->global->$constparam)) $disabledbymodule = 2;
-		                $triggers[$j]['module'] = strtolower($module);
-		            }
+					// Check if trigger file is disabled by name
+					if (preg_match('/NORUN$/i', $files[$key])) $disabledbyname = 1;
+					// Check if trigger file is for a particular module
+					if (preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/i', $files[$key], $reg))
+					{
+						$module = preg_replace('/^mod/i', '', $reg[2]);
+						$constparam = 'MAIN_MODULE_'.strtoupper($module);
+						if (strtolower($module) == 'all') $disabledbymodule = 0;
+						elseif (empty($conf->global->$constparam)) $disabledbymodule = 2;
+						$triggers[$j]['module'] = strtolower($module);
+					}
 
-		            // We set info of modules
-		            $triggers[$j]['picto'] = $objMod->picto ?img_object('', $objMod->picto, 'class="valignmiddle pictomodule "') : img_object('', 'generic', 'class="valignmiddle pictomodule "');
-		            $triggers[$j]['file'] = $files[$key];
-		            $triggers[$j]['fullpath'] = $fullpath[$key];
-		            $triggers[$j]['relpath'] = $relpath[$key];
-		            $triggers[$j]['iscoreorexternal'] = $iscoreorexternal[$key];
-		            $triggers[$j]['version'] = $objMod->getVersion();
-		            $triggers[$j]['status'] = img_picto($langs->trans("Active"), 'tick');
-		            if ($disabledbyname > 0 || $disabledbymodule > 1) $triggers[$j]['status'] = '';
+					// We set info of modules
+					$triggers[$j]['picto'] = $objMod->picto ?img_object('', $objMod->picto, 'class="valignmiddle pictomodule "') : img_object('', 'generic', 'class="valignmiddle pictomodule "');
+					$triggers[$j]['file'] = $files[$key];
+					$triggers[$j]['fullpath'] = $fullpath[$key];
+					$triggers[$j]['relpath'] = $relpath[$key];
+					$triggers[$j]['iscoreorexternal'] = $iscoreorexternal[$key];
+					$triggers[$j]['version'] = $objMod->getVersion();
+					$triggers[$j]['status'] = img_picto($langs->trans("Active"), 'tick');
+					if ($disabledbyname > 0 || $disabledbymodule > 1) $triggers[$j]['status'] = '';
 
-		            $text = '<b>'.$langs->trans("Description").':</b><br>';
-		            $text .= $objMod->getDesc().'<br>';
-		            $text .= '<br><b>'.$langs->trans("Status").':</b><br>';
-		            if ($disabledbyname == 1)
-		            {
-		                $text .= $langs->trans("TriggerDisabledByName").'<br>';
-		                if ($disabledbymodule == 2) $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';
-		            } else {
-		                if ($disabledbymodule == 0) $text .= $langs->trans("TriggerAlwaysActive").'<br>';
-		                if ($disabledbymodule == 1) $text .= $langs->trans("TriggerActiveAsModuleActive", $module).'<br>';
-		                if ($disabledbymodule == 2) $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';
-		            }
-	            } else {
-	            	print 'Error: Trigger '.$modName.' does not extends DolibarrTriggers<br>';
-	            }
-            } catch (Exception $e) {
-            	print $e->getMessage();
-            }
+					$text = '<b>'.$langs->trans("Description").':</b><br>';
+					$text .= $objMod->getDesc().'<br>';
+					$text .= '<br><b>'.$langs->trans("Status").':</b><br>';
+					if ($disabledbyname == 1)
+					{
+						$text .= $langs->trans("TriggerDisabledByName").'<br>';
+						if ($disabledbymodule == 2) $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';
+					} else {
+						if ($disabledbymodule == 0) $text .= $langs->trans("TriggerAlwaysActive").'<br>';
+						if ($disabledbymodule == 1) $text .= $langs->trans("TriggerActiveAsModuleActive", $module).'<br>';
+						if ($disabledbymodule == 2) $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';
+					}
+				} else {
+					print 'Error: Trigger '.$modName.' does not extends DolibarrTriggers<br>';
+				}
+			} catch (Exception $e) {
+				print $e->getMessage();
+			}
 
-            $triggers[$j]['info'] = $text;
-            $j++;
-        }
-        return $triggers;
-    }
+			$triggers[$j]['info'] = $text;
+			$j++;
+		}
+		return $triggers;
+	}
 }
diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index a1de5813b46..1bd25e123a3 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -42,82 +42,82 @@ class Ldap
 	/**
 	 * Tableau des serveurs (IP addresses ou nom d'hotes)
 	 */
-    public $server = array();
+	public $server = array();
 
 	/**
 	 * Base DN (e.g. "dc=foo,dc=com")
 	 */
-    public $dn;
+	public $dn;
 	/**
 	 * type de serveur, actuellement OpenLdap et Active Directory
 	 */
-    public $serverType;
+	public $serverType;
 	/**
 	 * Version du protocole ldap
 	 */
-    public $ldapProtocolVersion;
-    /**
-     * Server DN
-     */
-    public $domain;
+	public $ldapProtocolVersion;
+	/**
+	 * Server DN
+	 */
+	public $domain;
 	/**
 	 * User administrateur Ldap
 	 * Active Directory ne supporte pas les connexions anonymes
 	 */
-    public $searchUser;
+	public $searchUser;
 	/**
 	 * Mot de passe de l'administrateur
 	 * Active Directory ne supporte pas les connexions anonymes
 	 */
-    public $searchPassword;
+	public $searchPassword;
 	/**
 	 *  DN des utilisateurs
 	 */
-    public $people;
+	public $people;
 	/**
 	 * DN des groupes
 	 */
-    public $groups;
+	public $groups;
 	/**
 	 * Code erreur retourne par le serveur Ldap
 	 */
-    public $ldapErrorCode;
+	public $ldapErrorCode;
 	/**
 	 * Message texte de l'erreur
 	 */
-    public $ldapErrorText;
+	public $ldapErrorText;
 
 
 	//Fetch user
-    public $name;
-    public $firstname;
-    public $login;
-    public $phone;
-    public $skype;
-    public $fax;
-    public $mail;
-    public $mobile;
+	public $name;
+	public $firstname;
+	public $login;
+	public $phone;
+	public $skype;
+	public $fax;
+	public $mail;
+	public $mobile;
 
-    public $uacf;
-    public $pwdlastset;
+	public $uacf;
+	public $pwdlastset;
 
-    public $ldapcharset = 'UTF-8'; // LDAP should be UTF-8 encoded
+	public $ldapcharset = 'UTF-8'; // LDAP should be UTF-8 encoded
 
 
 	/**
 	 * The internal LDAP connection handle
 	 */
-    public $connection;
+	public $connection;
 	/**
 	 * Result of any connections etc.
 	 */
-    public $result;
+	public $result;
 
 
 	/**
 	 *  Constructor
 	 */
-    public function __construct()
+	public function __construct()
 	{
 		global $conf;
 
@@ -153,7 +153,7 @@ class Ldap
 
 	// Connection handling methods -------------------------------------------
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Connect and bind
 	 * 	Use this->server, this->serverPort, this->ldapProtocolVersion, this->serverType, this->searchUser, this->searchPassword
@@ -161,9 +161,9 @@ class Ldap
 	 *
 	 *	@return		int		<0 if KO, 1 if bind anonymous, 2 if bind auth
 	 */
-    public function connect_bind()
+	public function connect_bind()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$connected = 0;
@@ -283,7 +283,7 @@ class Ldap
 	 *
 	 * @return	boolean			true or false
 	 */
-    public function close()
+	public function close()
 	{
 		if ($this->connection && !@ldap_close($this->connection))
 		{
@@ -299,7 +299,7 @@ class Ldap
 	 *
 	 * @return	boolean			true or false
 	 */
-    public function bind()
+	public function bind()
 	{
 		if (!$this->result = @ldap_bind($this->connection))
 		{
@@ -322,7 +322,7 @@ class Ldap
 	 * @param	string	$pass			Password
 	 * @return	boolean					true or false
 	 */
-    public function bindauth($bindDn, $pass)
+	public function bindauth($bindDn, $pass)
 	{
 		if (!$this->result = @ldap_bind($this->connection, $bindDn, $pass))
 		{
@@ -340,7 +340,7 @@ class Ldap
 	 *
 	 * @return	boolean					true or false
 	 */
-    public function unbind()
+	public function unbind()
 	{
 		if (!$this->result = @ldap_unbind($this->connection))
 		{
@@ -356,7 +356,7 @@ class Ldap
 	 *
 	 * @return	string					version
 	 */
-    public function getVersion()
+	public function getVersion()
 	{
 		$version = 0;
 		$version = @ldap_get_option($this->connection, LDAP_OPT_PROTOCOL_VERSION, $version);
@@ -368,8 +368,8 @@ class Ldap
 	 *
 	 * @return	boolean                 version
 	 */
-    public function setVersion()
-    {
+	public function setVersion()
+	{
 		// LDAP_OPT_PROTOCOL_VERSION est une constante qui vaut 17
 		$ldapsetversion = ldap_set_option($this->connection, LDAP_OPT_PROTOCOL_VERSION, $this->ldapProtocolVersion);
 		return $ldapsetversion;
@@ -380,8 +380,8 @@ class Ldap
 	 *
 	 * @return	boolean                 referrals
 	 */
-    public function setReferrals()
-    {
+	public function setReferrals()
+	{
 		// LDAP_OPT_REFERRALS est une constante qui vaut ?
 		$ldapreferrals = ldap_set_option($this->connection, LDAP_OPT_REFERRALS, 0);
 		return $ldapreferrals;
@@ -397,7 +397,7 @@ class Ldap
 	 *	@param	User		$user		Objet user that create
 	 *	@return	int					<0 if KO, >0 if OK
 	 */
-    public function add($dn, $info, $user)
+	public function add($dn, $info, $user)
 	{
 		dol_syslog(get_class($this)."::add dn=".$dn." info=".join(',', $info));
 
@@ -447,7 +447,7 @@ class Ldap
 	 *	@param	User		$user		Objet user that modify
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-    public function modify($dn, $info, $user)
+	public function modify($dn, $info, $user)
 	{
 		dol_syslog(get_class($this)."::modify dn=".$dn." info=".join(',', $info));
 
@@ -474,7 +474,7 @@ class Ldap
 
 		//print_r($info);
 
-    	// For better compatibility with Samba4 AD
+		// For better compatibility with Samba4 AD
 		if ($this->serverType == "activedirectory") {
 			unset($info['cn']); // To avoid error : Operation not allowed on RDN (Code 67)
 		}
@@ -502,7 +502,7 @@ class Ldap
 	 *	@param	bool			$deleteoldrdn	If true the old RDN value(s) is removed, else the old RDN value(s) is retained as non-distinguished values of the entry.
 	 *	@return	int							<0 if KO, >0 if OK
 	 */
-    public function rename($dn, $newrdn, $newparent, $user, $deleteoldrdn = true)
+	public function rename($dn, $newrdn, $newparent, $user, $deleteoldrdn = true)
 	{
 		dol_syslog(get_class($this)."::modify dn=".$dn." newrdn=".$newrdn." newparent=".$newparent." deleteoldrdn=".($deleteoldrdn ? 1 : 0));
 
@@ -549,7 +549,7 @@ class Ldap
 	 *	@param	string	$newparent	New parent (ou=xxx,dc=aaa,dc=bbb) (for ldap_rename)
 	 *	@return	int					<0 if KO, >0 if OK
 	 */
-    public function update($dn, $info, $user, $olddn, $newrdn = false, $newparent = false)
+	public function update($dn, $info, $user, $olddn, $newrdn = false, $newparent = false)
 	{
 		dol_syslog(get_class($this)."::update dn=".$dn." olddn=".$olddn);
 
@@ -567,12 +567,12 @@ class Ldap
 
 		if (!$olddn || $olddn != $dn)
 		{
-			if (! empty($olddn) && ! empty($newrdn) && ! empty($newparent) && $this->ldapProtocolVersion === '3')
+			if (!empty($olddn) && !empty($newrdn) && !empty($newparent) && $this->ldapProtocolVersion === '3')
 			{
 				// This function currently only works with LDAPv3
 				$result = $this->rename($olddn, $newrdn, $newparent, $user, true);
-				$result = $this->modify($dn, $info, $user);	// We force "modify" for avoid some fields not modify
-			}	else {
+				$result = $this->modify($dn, $info, $user); // We force "modify" for avoid some fields not modify
+			} else {
 				// If change we make is rename the key of LDAP record, we create new one and if ok, we delete old one.
 				$result = $this->add($dn, $info, $user);
 				if ($result > 0 && $olddn && $olddn != $dn) $result = $this->delete($olddn); // If add fails, we do not try to delete old one
@@ -602,7 +602,7 @@ class Ldap
 	 *	@param	string	$dn			DN entry key
 	 *	@return	int					<0 if KO, >0 if OK
 	 */
-    public function delete($dn)
+	public function delete($dn)
 	{
 		dol_syslog(get_class($this)."::delete Delete LDAP entry dn=".$dn);
 
@@ -627,7 +627,7 @@ class Ldap
 		return -1;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Build a LDAP message
 	 *
@@ -635,9 +635,9 @@ class Ldap
 	 *	@param	array		$info		Attributes array
 	 *	@return	string					Content of file
 	 */
-    public function dump_content($dn, $info)
+	public function dump_content($dn, $info)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$content = '';
 
 		// Create file content
@@ -674,7 +674,7 @@ class Ldap
 	 *	@param	array		$info		Attributes array
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-    public function dump($dn, $info)
+	public function dump($dn, $info)
 	{
 		global $conf;
 
@@ -706,7 +706,7 @@ class Ldap
 	 * @param int		$timeout		Timeout in second (default 1s)
 	 * @return boolean				true or false
 	 */
-    public function serverPing($host, $port = 389, $timeout = 1)
+	public function serverPing($host, $port = 389, $timeout = 1)
 	{
 		// Replace ldaps:// by ssl://
 		if (preg_match('/^ldaps:\/\/([^\/]+)\/?$/', $host, $regs)) {
@@ -736,7 +736,7 @@ class Ldap
 	 *	@param	User		$user		Objet user that create
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-    public function addAttribute($dn, $info, $user)
+	public function addAttribute($dn, $info, $user)
 	{
 		dol_syslog(get_class($this)."::addAttribute dn=".$dn." info=".join(',', $info));
 
@@ -784,7 +784,7 @@ class Ldap
 	 *	@param	User		$user		Objet user that create
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-    public function updateAttribute($dn, $info, $user)
+	public function updateAttribute($dn, $info, $user)
 	{
 		dol_syslog(get_class($this)."::updateAttribute dn=".$dn." info=".join(',', $info));
 
@@ -832,7 +832,7 @@ class Ldap
 	 *	@param	User		$user		Objet user that create
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-    public function deleteAttribute($dn, $info, $user)
+	public function deleteAttribute($dn, $info, $user)
 	{
 		dol_syslog(get_class($this)."::deleteAttribute dn=".$dn." info=".join(',', $info));
 
@@ -878,7 +878,7 @@ class Ldap
 	 *	@param	string	$filter		Filter
 	 *	@return	int|array			<0 or false if KO, array if OK
 	 */
-    public function getAttribute($dn, $filter)
+	public function getAttribute($dn, $filter)
 	{
 		// Check parameters
 		if (!$this->connection)
@@ -923,7 +923,7 @@ class Ldap
 	 * 	@param	string	$attribute			Attributes
 	 * 	@return void
 	 */
-    public function getAttributeValues($filterrecord, $attribute)
+	public function getAttributeValues($filterrecord, $attribute)
 	{
 		$attributes = array();
 		$attributes[0] = $attribute;
@@ -968,7 +968,7 @@ class Ldap
 	 *	@param	array	$attributeAsArray 	Array of fields wanted as an array not a string
 	 *	@return	array						Array of [id_record][ldap_field]=value
 	 */
-    public function getRecords($search, $userDn, $useridentifier, $attributeArray, $activefilter = 0, $attributeAsArray = array())
+	public function getRecords($search, $userDn, $useridentifier, $attributeArray, $activefilter = 0, $attributeAsArray = array())
 	{
 		$fulllist = array();
 
@@ -984,14 +984,12 @@ class Ldap
 		// Define filter
 		if (!empty($activefilter))
 		{
-			if (((string) $activefilter == '1' || (string) $activefilter == 'user') && $this->filter)
-			{
+			if (((string) $activefilter == '1' || (string) $activefilter == 'user') && $this->filter) {
 				$filter = '('.$this->filter.')';
-			} elseif (((string) $activefilter == 'member') && $this->filter)
-			{
+			} elseif (((string) $activefilter == 'member') && $this->filter) {
 				$filter = '('.$this->filtermember.')';
-			} else // If this->filter is empty, make fiter on * (all)
-			{
+			} else {
+				// If this->filter is empty, make fiter on * (all)
 				$filter = '('.$useridentifier.'=*)';
 			}
 		} else {
@@ -1068,8 +1066,9 @@ class Ldap
 	 *	@param	string		$hex			Hex value
 	 *	@return	string						Little endian
 	 */
-    public function littleEndian($hex)
+	public function littleEndian($hex)
 	{
+		$result = '';
 		for ($x = dol_strlen($hex) - 2; $x >= 0; $x = $x - 2) {
 			$result .= substr($hex, $x, 2);
 		}
@@ -1084,7 +1083,7 @@ class Ldap
 	 * 	@param	string		$ldapUser		Login de l'utilisateur
 	 * 	@return	string						Sid
 	 */
-    public function getObjectSid($ldapUser)
+	public function getObjectSid($ldapUser)
 	{
 		$criteria = '('.$this->getUserIdentifier().'='.$ldapUser.')';
 		$justthese = array("objectsid");
@@ -1139,7 +1138,7 @@ class Ldap
 	 * @param	string	$binsid		Binary SID
 	 * @return	string				Textual SID
 	 */
-    public function binSIDtoText($binsid)
+	public function binSIDtoText($binsid)
 	{
 		$hex_sid = bin2hex($binsid);
 		$rev = hexdec(substr($hex_sid, 0, 2)); // Get revision-part of SID
@@ -1165,7 +1164,7 @@ class Ldap
 	 * 	@param 	string		$filter			Search filter (ex: (sn=nom_personne) )
 	 *	@return	array|int					Array with answers (key lowercased - value)
 	 */
-    public function search($checkDn, $filter)
+	public function search($checkDn, $filter)
 	{
 		dol_syslog(get_class($this)."::search checkDn=".$checkDn." filter=".$filter);
 
@@ -1199,7 +1198,7 @@ class Ldap
 	 *                       	       	Examples: &(objectClass=inetOrgPerson) &(objectClass=user)(objectCategory=person) &(isMemberOf=cn=Sales,ou=Groups,dc=opencsi,dc=com)
 	 *		@return	int					>0 if OK, <0 if KO
 	 */
-    public function fetch($user, $filter)
+	public function fetch($user, $filter)
 	{
 		// Perform the search and get the entry handles
 
@@ -1284,7 +1283,7 @@ class Ldap
 	 *
 	 *	@return	string 				Login
 	 */
-    public function getUserIdentifier()
+	public function getUserIdentifier()
 	{
 		if ($this->serverType == "activedirectory") {
 			return $this->attr_sambalogin;
@@ -1293,13 +1292,13 @@ class Ldap
 		}
 	}
 
-    /**
-     * 	UserAccountControl Flgs to more human understandable form...
-     *
-     *	@param	string		$uacf		UACF
-     *	@return	void
-     */
-    public function parseUACF($uacf)
+	/**
+	 * 	UserAccountControl Flgs to more human understandable form...
+	 *
+	 *	@param	string		$uacf		UACF
+	 *	@return	void
+	 */
+	public function parseUACF($uacf)
 	{
 		//All flags array
 		$flags = array(
@@ -1340,13 +1339,13 @@ class Ldap
 		return($retval);
 	}
 
-    /**
-     * 	SamAccountType value to text
-     *
-     *	@param	string	$samtype	SamType
-     *	@return	string				Sam string
-     */
-    public function parseSAT($samtype)
+	/**
+	 * 	SamAccountType value to text
+	 *
+	 *	@param	string	$samtype	SamType
+	 *	@return	string				Sam string
+	 */
+	public function parseSAT($samtype)
 	{
 		$stypes = array(
 			805306368    =>    "NORMAL_ACCOUNT",
@@ -1370,16 +1369,16 @@ class Ldap
 		return($retval);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Convertit le temps ActiveDirectory en Unix timestamp
 	 *
 	 *	@param	string	$value		AD time to convert
 	 *	@return	integer				Unix timestamp
 	 */
-    public function convert_time($value)
+	public function convert_time($value)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$dateLargeInt = $value; // nano secondes depuis 1601 !!!!
 		$secsAfterADEpoch = $dateLargeInt / (10000000); // secondes depuis le 1 jan 1601
 		$ADToUnixConvertor = ((1970 - 1601) * 365.242190) * 86400; // UNIX start date - AD start date * jours * secondes
@@ -1410,7 +1409,7 @@ class Ldap
 	 *  @param	string	$pagecodeto		Page code for result string
 	 *  @return string         			Converted string
 	 */
-    public function convFromOutputCharset($str, $pagecodeto = 'UTF-8')
+	public function convFromOutputCharset($str, $pagecodeto = 'UTF-8')
 	{
 		global $conf;
 		if ($pagecodeto == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8') $str = utf8_decode($str);
@@ -1425,7 +1424,7 @@ class Ldap
 	 *	@param	string	$keygroup	Key of group
 	 *	@return	int					gid number
 	 */
-    public function getNextGroupGid($keygroup = 'LDAP_KEY_GROUPS')
+	public function getNextGroupGid($keygroup = 'LDAP_KEY_GROUPS')
 	{
 		global $conf;
 
diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php
index 9d70458a198..2c08d2709ca 100644
--- a/htdocs/core/class/link.class.php
+++ b/htdocs/core/class/link.class.php
@@ -28,359 +28,359 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
  */
 class Link extends CommonObject
 {
-    /**
+	/**
 	 * @var string ID to identify managed object
 	 */
 	public $element = 'link';
 
-    /**
+	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element = 'links';
 
-    /**
+	/**
 	 * @var int Entity
 	 */
 	public $entity;
 
-    public $datea;
-    public $url;
+	public $datea;
+	public $url;
 
-    /**
-     * @var string Links label
-     */
-    public $label;
+	/**
+	 * @var string Links label
+	 */
+	public $label;
 
-    public $objecttype;
-    public $objectid;
+	public $objecttype;
+	public $objectid;
 
 
-    /**
-     *    Constructor
-     *
-     *    @param	DoliDB		$db		Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *    Constructor
+	 *
+	 *    @param	DoliDB		$db		Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *    Create link in database
-     *
-     *    @param	User	$user       Object of user that ask creation
-     *    @return   int         		>= 0 if OK, < 0 if KO
-     */
-    public function create($user = '')
-    {
-        global $langs, $conf;
+	/**
+	 *    Create link in database
+	 *
+	 *    @param	User	$user       Object of user that ask creation
+	 *    @return   int         		>= 0 if OK, < 0 if KO
+	 */
+	public function create($user = '')
+	{
+		global $langs, $conf;
 
-        $error = 0;
-        $langs->load("errors");
-        // Clean parameters
-        if (empty($this->label)) {
-            $this->label = trim(basename($this->url));
-        }
-        if (empty($this->datea)) {
-            $this->datea = dol_now();
-        }
-        $this->url = trim($this->url);
+		$error = 0;
+		$langs->load("errors");
+		// Clean parameters
+		if (empty($this->label)) {
+			$this->label = trim(basename($this->url));
+		}
+		if (empty($this->datea)) {
+			$this->datea = dol_now();
+		}
+		$this->url = trim($this->url);
 
-        dol_syslog(get_class($this)."::create ".$this->url);
+		dol_syslog(get_class($this)."::create ".$this->url);
 
-        // Check parameters
-        if (empty($this->url)) {
-            $this->error = $langs->trans("NoUrl");
-            return -1;
-        }
+		// Check parameters
+		if (empty($this->url)) {
+			$this->error = $langs->trans("NoUrl");
+			return -1;
+		}
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."links (entity, datea, url, label, objecttype, objectid)";
-        $sql .= " VALUES (".$conf->entity.", '".$this->db->idate($this->datea)."'";
-        $sql .= ", '".$this->db->escape($this->url)."'";
-        $sql .= ", '".$this->db->escape($this->label)."'";
-        $sql .= ", '".$this->db->escape($this->objecttype)."'";
-        $sql .= ", ".$this->objectid.")";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."links (entity, datea, url, label, objecttype, objectid)";
+		$sql .= " VALUES (".$conf->entity.", '".$this->db->idate($this->datea)."'";
+		$sql .= ", '".$this->db->escape($this->url)."'";
+		$sql .= ", '".$this->db->escape($this->label)."'";
+		$sql .= ", '".$this->db->escape($this->objecttype)."'";
+		$sql .= ", ".$this->objectid.")";
 
-        dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result) {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."links");
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."links");
 
-            if ($this->id > 0) {
-                // Call trigger
-                $result = $this->call_trigger('LINK_CREATE', $user);
-                if ($result < 0) $error++;
-                // End call triggers
-            } else {
-                $error++;
-            }
+			if ($this->id > 0) {
+				// Call trigger
+				$result = $this->call_trigger('LINK_CREATE', $user);
+				if ($result < 0) $error++;
+				// End call triggers
+			} else {
+				$error++;
+			}
 
-            if (!$error)
-            {
-                dol_syslog(get_class($this)."::Create success id=".$this->id);
-                $this->db->commit();
-                return $this->id;
-            } else {
-                dol_syslog(get_class($this)."::Create echec update ".$this->error, LOG_ERR);
-                $this->db->rollback();
-                return -3;
-            }
-        } else {
-            if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-            {
-                $this->error = $langs->trans("ErrorCompanyNameAlreadyExists", $this->name);
-                $result = -1;
-            } else {
-                $this->error = $this->db->lasterror();
-                $result = -2;
-            }
-            $this->db->rollback();
-            return $result;
-        }
-    }
+			if (!$error)
+			{
+				dol_syslog(get_class($this)."::Create success id=".$this->id);
+				$this->db->commit();
+				return $this->id;
+			} else {
+				dol_syslog(get_class($this)."::Create echec update ".$this->error, LOG_ERR);
+				$this->db->rollback();
+				return -3;
+			}
+		} else {
+			if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+			{
+				$this->error = $langs->trans("ErrorCompanyNameAlreadyExists", $this->name);
+				$result = -1;
+			} else {
+				$this->error = $this->db->lasterror();
+				$result = -2;
+			}
+			$this->db->rollback();
+			return $result;
+		}
+	}
 
-    /**
-     *  Update parameters of third party
-     *
-     *  @param  User	$user            			User executing update
-     *  @param  int		$call_trigger    			0=no, 1=yes
-     *  @return int  			           			<0 if KO, >=0 if OK
-     */
-    public function update($user = '', $call_trigger = 1)
-    {
-        global $langs, $conf;
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+	/**
+	 *  Update parameters of third party
+	 *
+	 *  @param  User	$user            			User executing update
+	 *  @param  int		$call_trigger    			0=no, 1=yes
+	 *  @return int  			           			<0 if KO, >=0 if OK
+	 */
+	public function update($user = '', $call_trigger = 1)
+	{
+		global $langs, $conf;
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-        $langs->load("errors");
-        $error = 0;
+		$langs->load("errors");
+		$error = 0;
 
-        dol_syslog(get_class($this)."::Update id = ".$this->id." call_trigger = ".$call_trigger);
+		dol_syslog(get_class($this)."::Update id = ".$this->id." call_trigger = ".$call_trigger);
 
-        // Check parameters
-        if (empty($this->url))
-        {
-            $this->error = $langs->trans("NoURL");
-            return -1;
-        }
+		// Check parameters
+		if (empty($this->url))
+		{
+			$this->error = $langs->trans("NoURL");
+			return -1;
+		}
 
-        // Clean parameters
-        $this->url       = clean_url($this->url, 1);
-        if (empty($this->label)) $this->label = basename($this->url);
-        $this->label     = trim($this->label);
+		// Clean parameters
+		$this->url       = clean_url($this->url, 1);
+		if (empty($this->label)) $this->label = basename($this->url);
+		$this->label     = trim($this->label);
 
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $sql  = "UPDATE ".MAIN_DB_PREFIX."links SET ";
-        $sql .= "entity = ".$conf->entity;
-        $sql .= ", datea = '".$this->db->idate(dol_now())."'";
-        $sql .= ", url = '".$this->db->escape($this->url)."'";
-        $sql .= ", label = '".$this->db->escape($this->label)."'";
-        $sql .= ", objecttype = '".$this->db->escape($this->objecttype)."'";
-        $sql .= ", objectid = ".$this->objectid;
-        $sql .= " WHERE rowid = ".$this->id;
+		$sql  = "UPDATE ".MAIN_DB_PREFIX."links SET ";
+		$sql .= "entity = ".$conf->entity;
+		$sql .= ", datea = '".$this->db->idate(dol_now())."'";
+		$sql .= ", url = '".$this->db->escape($this->url)."'";
+		$sql .= ", label = '".$this->db->escape($this->label)."'";
+		$sql .= ", objecttype = '".$this->db->escape($this->objecttype)."'";
+		$sql .= ", objectid = ".$this->objectid;
+		$sql .= " WHERE rowid = ".$this->id;
 
-        dol_syslog(get_class($this)."::update sql = ".$sql);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($call_trigger)
-            {
-                // Call trigger
-                $result = $this->call_trigger('LINK_MODIFY', $user);
-                if ($result < 0) $error++;
-                // End call triggers
-            }
+		dol_syslog(get_class($this)."::update sql = ".$sql);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($call_trigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('LINK_MODIFY', $user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
 
-            if (!$error)
-            {
-                dol_syslog(get_class($this)."::Update success");
-                $this->db->commit();
-                return 1;
-            } else {
-                setEventMessages('', $this->errors, 'errors');
-                $this->db->rollback();
-                return -1;
-            }
-        } else {
-            if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-            {
-                // Doublon
-                $this->error = $langs->trans("ErrorDuplicateField");
-                $result = -1;
-            } else {
-                $this->error = $langs->trans("Error sql = ".$sql);
-                $result = -2;
-            }
-            $this->db->rollback();
-            return $result;
-        }
-    }
+			if (!$error)
+			{
+				dol_syslog(get_class($this)."::Update success");
+				$this->db->commit();
+				return 1;
+			} else {
+				setEventMessages('', $this->errors, 'errors');
+				$this->db->rollback();
+				return -1;
+			}
+		} else {
+			if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+			{
+				// Doublon
+				$this->error = $langs->trans("ErrorDuplicateField");
+				$result = -1;
+			} else {
+				$this->error = $langs->trans("Error sql = ".$sql);
+				$result = -2;
+			}
+			$this->db->rollback();
+			return $result;
+		}
+	}
 
-    /**
-     *  Loads all links from database
-     *
-     *  @param  array   $links      array of Link objects to fill
-     *  @param  string  $objecttype type of the associated object in dolibarr
-     *  @param  int     $objectid   id of the associated object in dolibarr
-     *  @param  string  $sortfield  field used to sort
-     *  @param  string  $sortorder  sort order
-     *  @return int                 1 if ok, 0 if no records, -1 if error
-     **/
-    public function fetchAll(&$links, $objecttype, $objectid, $sortfield = null, $sortorder = null)
-    {
-        global $conf;
+	/**
+	 *  Loads all links from database
+	 *
+	 *  @param  array   $links      array of Link objects to fill
+	 *  @param  string  $objecttype type of the associated object in dolibarr
+	 *  @param  int     $objectid   id of the associated object in dolibarr
+	 *  @param  string  $sortfield  field used to sort
+	 *  @param  string  $sortorder  sort order
+	 *  @return int                 1 if ok, 0 if no records, -1 if error
+	 **/
+	public function fetchAll(&$links, $objecttype, $objectid, $sortfield = null, $sortorder = null)
+	{
+		global $conf;
 
-        $sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM ".MAIN_DB_PREFIX."links";
-        $sql .= " WHERE objecttype = '".$this->db->escape($objecttype)."' AND objectid = ".$objectid;
-        if ($conf->entity != 0) $sql .= " AND entity = ".$conf->entity;
-        if ($sortfield) {
-            if (empty($sortorder)) {
-                $sortorder = "ASC";
-            }
-            $sql .= " ORDER BY ".$sortfield." ".$sortorder;
-        }
+		$sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM ".MAIN_DB_PREFIX."links";
+		$sql .= " WHERE objecttype = '".$this->db->escape($objecttype)."' AND objectid = ".$objectid;
+		if ($conf->entity != 0) $sql .= " AND entity = ".$conf->entity;
+		if ($sortfield) {
+			if (empty($sortorder)) {
+				$sortorder = "ASC";
+			}
+			$sql .= " ORDER BY ".$sortfield." ".$sortorder;
+		}
 
-        dol_syslog(get_class($this)."::fetchAll", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $num = $this->db->num_rows($resql);
-            dol_syslog(get_class($this)."::fetchAll ".$num."records", LOG_DEBUG);
-            if ($num > 0)
-            {
-                while ($obj = $this->db->fetch_object($resql))
-                {
-                    $link = new Link($this->db);
-                    $link->id = $obj->rowid;
-                    $link->entity = $obj->entity;
-                    $link->datea = $this->db->jdate($obj->datea);
-                    $link->url = $obj->url;
-                    $link->label = $obj->label;
-                    $link->objecttype = $obj->objecttype;
-                    $link->objectid = $obj->objectid;
-                    $links[] = $link;
-                }
-                return 1;
-            } else {
-                return 0;
-            }
-        } else {
-            return -1;
-        }
-    }
+		dol_syslog(get_class($this)."::fetchAll", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			dol_syslog(get_class($this)."::fetchAll ".$num."records", LOG_DEBUG);
+			if ($num > 0)
+			{
+				while ($obj = $this->db->fetch_object($resql))
+				{
+					$link = new Link($this->db);
+					$link->id = $obj->rowid;
+					$link->entity = $obj->entity;
+					$link->datea = $this->db->jdate($obj->datea);
+					$link->url = $obj->url;
+					$link->label = $obj->label;
+					$link->objecttype = $obj->objecttype;
+					$link->objectid = $obj->objectid;
+					$links[] = $link;
+				}
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			return -1;
+		}
+	}
 
-    /**
-     *  Return nb of links
-     *
-     *  @param  DoliDb  $db         Database handler
-     *  @param  string  $objecttype Type of the associated object in dolibarr
-     *  @param  int     $objectid   Id of the associated object in dolibarr
-     *  @return int                 Nb of links, -1 if error
-     **/
-    public static function count($db, $objecttype, $objectid)
-    {
-        global $conf;
+	/**
+	 *  Return nb of links
+	 *
+	 *  @param  DoliDb  $db         Database handler
+	 *  @param  string  $objecttype Type of the associated object in dolibarr
+	 *  @param  int     $objectid   Id of the associated object in dolibarr
+	 *  @return int                 Nb of links, -1 if error
+	 **/
+	public static function count($db, $objecttype, $objectid)
+	{
+		global $conf;
 
-        $sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."links";
-        $sql .= " WHERE objecttype = '".$db->escape($objecttype)."' AND objectid = ".$objectid;
-        if ($conf->entity != 0) $sql .= " AND entity = ".$conf->entity;
+		$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."links";
+		$sql .= " WHERE objecttype = '".$db->escape($objecttype)."' AND objectid = ".$objectid;
+		if ($conf->entity != 0) $sql .= " AND entity = ".$conf->entity;
 
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $obj = $db->fetch_object($resql);
-            if ($obj) return $obj->nb;
-        }
-        return -1;
-    }
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$obj = $db->fetch_object($resql);
+			if ($obj) return $obj->nb;
+		}
+		return -1;
+	}
 
-    /**
-     *  Loads a link from database
-     *
-     *  @param 	int		$rowid 		Id of link to load
-     *  @return int 				1 if ok, 0 if no record found, -1 if error
-     **/
-    public function fetch($rowid = null)
-    {
-        global $conf;
+	/**
+	 *  Loads a link from database
+	 *
+	 *  @param 	int		$rowid 		Id of link to load
+	 *  @return int 				1 if ok, 0 if no record found, -1 if error
+	 **/
+	public function fetch($rowid = null)
+	{
+		global $conf;
 
-        if (empty($rowid)) {
-            $rowid = $this->id;
-        }
+		if (empty($rowid)) {
+			$rowid = $this->id;
+		}
 
-        $sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM ".MAIN_DB_PREFIX."links";
-        $sql .= " WHERE rowid = ".$rowid;
-        if ($conf->entity != 0) $sql .= " AND entity = ".$conf->entity;
+		$sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM ".MAIN_DB_PREFIX."links";
+		$sql .= " WHERE rowid = ".$rowid;
+		if ($conf->entity != 0) $sql .= " AND entity = ".$conf->entity;
 
-        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql) > 0)
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql) > 0)
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->rowid;
-                $this->entity = $obj->entity;
-                $this->datea = $this->db->jdate($obj->datea);
-                $this->url = $obj->url;
-                $this->label = $obj->label;
-                $this->objecttype = $obj->objecttype;
-                $this->objectid = $obj->objectid;
-                return 1;
-            } else {
-                return 0;
-            }
-        } else {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+				$this->id = $obj->rowid;
+				$this->entity = $obj->entity;
+				$this->datea = $this->db->jdate($obj->datea);
+				$this->url = $obj->url;
+				$this->label = $obj->label;
+				$this->objecttype = $obj->objecttype;
+				$this->objectid = $obj->objectid;
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
-    /**
-     *    Delete a link from database
-     *
-     *	  @param	User		$user		Object suer
-     *    @return	int						<0 if KO, 0 if nothing done, >0 if OK
-     */
-    public function delete($user)
-    {
-        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-        $error = 0;
+	/**
+	 *    Delete a link from database
+	 *
+	 *	  @param	User		$user		Object suer
+	 *    @return	int						<0 if KO, 0 if nothing done, >0 if OK
+	 */
+	public function delete($user)
+	{
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		$error = 0;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // Call trigger
-        $result = $this->call_trigger('LINK_DELETE', $user);
-        if ($result < 0)
-        {
-        	$this->db->rollback();
-        	return -1;
-        }
-        // End call triggers
+		// Call trigger
+		$result = $this->call_trigger('LINK_DELETE', $user);
+		if ($result < 0)
+		{
+			$this->db->rollback();
+			return -1;
+		}
+		// End call triggers
 
-        // Remove link
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."links";
-        $sql .= " WHERE rowid = ".$this->id;
+		// Remove link
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."links";
+		$sql .= " WHERE rowid = ".$this->id;
 
-        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-        if (!$this->db->query($sql))
-        {
-            $error++;
-            $this->error = $this->db->lasterror();
-        }
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		if (!$this->db->query($sql))
+		{
+			$error++;
+			$this->error = $this->db->lasterror();
+		}
 
-        if (!$error) {
-            $this->db->commit();
+		if (!$error) {
+			$this->db->commit();
 
-            return 1;
-        } else {
-            $this->db->rollback();
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
 }
diff --git a/htdocs/core/class/menu.class.php b/htdocs/core/class/menu.class.php
index 06bc79804bf..52bd1ebddad 100644
--- a/htdocs/core/class/menu.class.php
+++ b/htdocs/core/class/menu.class.php
@@ -28,101 +28,101 @@
  */
 class Menu
 {
-    public $liste;
+	public $liste;
 
-    /**
-     *	Constructor
-     */
-    public function __construct()
-    {
-          $this->liste = array();
-    }
+	/**
+	 *	Constructor
+	 */
+	public function __construct()
+	{
+		  $this->liste = array();
+	}
 
-    /**
-     * Clear property ->liste
-     *
-     * @return	void
-     */
-    public function clear()
-    {
-        $this->liste = array();
-    }
+	/**
+	 * Clear property ->liste
+	 *
+	 * @return	void
+	 */
+	public function clear()
+	{
+		$this->liste = array();
+	}
 
-    /**
-     * Add a menu entry into this->liste (at end)
-     *
-     * @param	string	$url        Url to follow on click (does not include DOL_URL_ROOT)
-     * @param   string	$titre      Label of menu to add. The value must already be translated.
-     * @param   integer	$level      Level of menu to add
-     * @param   int		$enabled    Menu active or not (0=Not active, 1=Active, 2=Active but grey)
-     * @param   string	$target		Target link
-     * @param	string	$mainmenu	Main menu ('home', 'companies', 'products', ...)
-     * @param	string	$leftmenu	Left menu ('setup', 'system', 'admintools', ...)
-     * @param	int		$position	Position (not used yet)
-     * @param	string	$id			Id
-     * @param	string	$idsel		Id sel
-     * @param	string	$classname	Class name
-     * @param	string	$prefix		Prefix to title (image or picto)
-     * @return	void
-     */
-    public function add($url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '', $prefix = '')
-    {
-        $this->liste[] = array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);
-    }
+	/**
+	 * Add a menu entry into this->liste (at end)
+	 *
+	 * @param	string	$url        Url to follow on click (does not include DOL_URL_ROOT)
+	 * @param   string	$titre      Label of menu to add. The value must already be translated.
+	 * @param   integer	$level      Level of menu to add
+	 * @param   int		$enabled    Menu active or not (0=Not active, 1=Active, 2=Active but grey)
+	 * @param   string	$target		Target link
+	 * @param	string	$mainmenu	Main menu ('home', 'companies', 'products', ...)
+	 * @param	string	$leftmenu	Left menu ('setup', 'system', 'admintools', ...)
+	 * @param	int		$position	Position (not used yet)
+	 * @param	string	$id			Id
+	 * @param	string	$idsel		Id sel
+	 * @param	string	$classname	Class name
+	 * @param	string	$prefix		Prefix to title (image or picto)
+	 * @return	void
+	 */
+	public function add($url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '', $prefix = '')
+	{
+		$this->liste[] = array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);
+	}
 
-    /**
-     * Insert a menu entry into this->liste
-     *
-     * @param   int     $idafter    Array key after which inserting new entry
-     * @param	string	$url        Url to follow on click
-     * @param   string	$titre      Label of menu to add. The value must already be translated.
-     * @param   integer	$level      Level of menu to add
-     * @param   int		$enabled    Menu active or not
-     * @param   string	$target		Target link
-     * @param	string	$mainmenu	Main menu ('home', 'companies', 'products', ...)
-     * @param	string	$leftmenu	Left menu ('setup', 'system', 'admintools', ...)
-     * @param	int		$position	Position (not used yet)
-     * @param	string	$id			Id
-     * @param	string	$idsel		Id sel
-     * @param	string	$classname	Class name
-     * @param	string	$prefix		Prefix to title (image or picto)
-     * @return	void
-     */
-    public function insert($idafter, $url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '', $prefix = '')
-    {
-        $array_start = array_slice($this->liste, 0, ($idafter + 1));
-        $array_new   = array(0=>array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix));
-        $array_end   = array_slice($this->liste, ($idafter + 1));
-        $this->liste = array_merge($array_start, $array_new, $array_end);
-    }
+	/**
+	 * Insert a menu entry into this->liste
+	 *
+	 * @param   int     $idafter    Array key after which inserting new entry
+	 * @param	string	$url        Url to follow on click
+	 * @param   string	$titre      Label of menu to add. The value must already be translated.
+	 * @param   integer	$level      Level of menu to add
+	 * @param   int		$enabled    Menu active or not
+	 * @param   string	$target		Target link
+	 * @param	string	$mainmenu	Main menu ('home', 'companies', 'products', ...)
+	 * @param	string	$leftmenu	Left menu ('setup', 'system', 'admintools', ...)
+	 * @param	int		$position	Position (not used yet)
+	 * @param	string	$id			Id
+	 * @param	string	$idsel		Id sel
+	 * @param	string	$classname	Class name
+	 * @param	string	$prefix		Prefix to title (image or picto)
+	 * @return	void
+	 */
+	public function insert($idafter, $url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '', $prefix = '')
+	{
+		$array_start = array_slice($this->liste, 0, ($idafter + 1));
+		$array_new   = array(0=>array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix));
+		$array_end   = array_slice($this->liste, ($idafter + 1));
+		$this->liste = array_merge($array_start, $array_new, $array_end);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Remove a menu entry from this->liste
-     *
-     * @return	void
-     */
-    public function remove_last()
-    {
-        // phpcs:enable
-    	if (count($this->liste) > 1) {
-            array_pop($this->liste);
-        }
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Remove a menu entry from this->liste
+	 *
+	 * @return	void
+	 */
+	public function remove_last()
+	{
+		// phpcs:enable
+		if (count($this->liste) > 1) {
+			array_pop($this->liste);
+		}
+	}
 
-    /**
-     * Return number of visible entries (gray or not)
-     *
-     *  @return int     Number of visible (gray or not) menu entries
-     */
-    public function getNbOfVisibleMenuEntries()
-    {
-        $nb = 0;
-        foreach ($this->liste as $val)
-        {
-        	//if (dol_eval($val['enabled'], 1)) $nb++;
-        	if (!empty($val['enabled'])) $nb++;			// $val['enabled'] is already evaluated to 0 or 1, no need for dol_eval()
-        }
-        return $nb;
-    }
+	/**
+	 * Return number of visible entries (gray or not)
+	 *
+	 *  @return int     Number of visible (gray or not) menu entries
+	 */
+	public function getNbOfVisibleMenuEntries()
+	{
+		$nb = 0;
+		foreach ($this->liste as $val)
+		{
+			//if (dol_eval($val['enabled'], 1)) $nb++;
+			if (!empty($val['enabled'])) $nb++; // $val['enabled'] is already evaluated to 0 or 1, no need for dol_eval()
+		}
+		return $nb;
+	}
 }
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 3c0c6bd9389..8695ef88ef4 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -173,6 +173,7 @@ class Menubase
 		global $conf, $langs;
 
 		// Clean parameters
+		if (!isset($this->enabled)) $this->enabled = '1';
 		$this->menu_handler = trim($this->menu_handler);
 		$this->module = trim($this->module);
 		$this->type = trim($this->type);
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 82b6c8859bc..7cc51bfecb9 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -37,9 +37,9 @@ class Notify
 	public $id;
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -58,9 +58,9 @@ class Notify
 	public $note;
 
 	/**
-     * @var int Project ID
-     */
-    public $fk_project;
+	 * @var int Project ID
+	 */
+	public $fk_project;
 
 	// Les codes actions sont definis dans la table llx_notify_def
 
@@ -335,7 +335,7 @@ class Notify
 		$object_type = '';
 		$link = '';
 		$num = 0;
-        $error = 0;
+		$error = 0;
 
 		$oldref = (empty($object->oldref) ? $object->ref : $object->oldref);
 		$newref = (empty($object->newref) ? $object->ref : $object->newref);
@@ -343,7 +343,7 @@ class Notify
 		$sql = '';
 
 		// Check notification per third party
-		if ($object->socid > 0)
+		if (!empty($object->socid) && $object->socid > 0)
 		{
 			$sql .= "SELECT 'tocontactid' as type_target, c.email, c.rowid as cid, c.lastname, c.firstname, c.default_lang,";
 			$sql .= " a.rowid as adid, a.label, a.code, n.rowid, n.type";
@@ -413,31 +413,31 @@ class Notify
 
 						switch ($notifcode) {
 							case 'BILL_VALIDATE':
-								$link = '<a href="' . $urlwithroot . '/compta/facture/card.php?facid=' . $object->id . '">' . $newref . '</a>';
+								$link = '<a href="'.$urlwithroot.'/compta/facture/card.php?facid='.$object->id.'">'.$newref.'</a>';
 								$dir_output = $conf->facture->dir_output;
 								$object_type = 'facture';
 								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInvoiceValidated", $link);
 								break;
 							case 'BILL_PAYED':
-								$link ='<a href="' . $urlwithroot . '/compta/facture/card.php?facid='.$object->id . '">' . $newref . '</a>';
+								$link = '<a href="'.$urlwithroot.'/compta/facture/card.php?facid='.$object->id.'">'.$newref.'</a>';
 								$dir_output = $conf->facture->dir_output;
 								$object_type = 'facture';
 								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInvoicePayed", $link);
 								break;
 							case 'ORDER_VALIDATE':
-								$link = '<a href="' . $urlwithroot . '/commande/card.php?id='.$object->id . '">' . $newref . '</a>';
+								$link = '<a href="'.$urlwithroot.'/commande/card.php?id='.$object->id.'">'.$newref.'</a>';
 								$dir_output = $conf->commande->dir_output;
 								$object_type = 'order';
 								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextOrderValidated", $link);
 								break;
 							case 'PROPAL_VALIDATE':
-								$link = '<a href="' . $urlwithroot . '/comm/propal/card.php?id='.$object->id . '">' . $newref . '</a>';
+								$link = '<a href="'.$urlwithroot.'/comm/propal/card.php?id='.$object->id.'">'.$newref.'</a>';
 								$dir_output = $conf->propal->multidir_output[$object->entity];
 								$object_type = 'propal';
 								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextProposalValidated", $link);
 								break;
 							case 'PROPAL_CLOSE_SIGNED':
-								$link = '<a href="' . $urlwithroot . '/comm/propal/card.php?id='.$object->id . '">' . $newref . '</a>';
+								$link = '<a href="'.$urlwithroot.'/comm/propal/card.php?id='.$object->id.'">'.$newref.'</a>';
 								$dir_output = $conf->propal->multidir_output[$object->entity];
 								$object_type = 'propal';
 								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextProposalClosedSigned", $link);
@@ -471,7 +471,7 @@ class Notify
 								$mesg .= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n";
 								break;
 							case 'ORDER_SUPPLIER_REFUSE':
-								$link = '<a href="' . $urlwithroot . '/fourn/commande/card.php?id='.$object->id . '">' . $newref . '</a>';
+								$link = '<a href="'.$urlwithroot.'/fourn/commande/card.php?id='.$object->id.'">'.$newref.'</a>';
 								$dir_output = $conf->fournisseur->commande->dir_output;
 								$object_type = 'order_supplier';
 								$mesg = $outputlangs->transnoentitiesnoconv("Hello").",\n\n";
@@ -534,7 +534,7 @@ class Notify
 							if (!empty($hookmanager->resArray['message'])) $message .= $hookmanager->resArray['message'];
 						}
 
-                        $mailfile = new CMailFile(
+						$mailfile = new CMailFile(
 							$subject,
 							$sendto,
 							$replyto,
@@ -546,12 +546,12 @@ class Notify
 							'',
 							0,
 							-1,
-                            '',
-                            '',
-                            $trackid,
-                            '',
-                            'notification'
-                        );
+							'',
+							'',
+							$trackid,
+							'',
+							'notification'
+						);
 
 						if ($mailfile->sendfile())
 						{
@@ -576,7 +576,7 @@ class Notify
 					$i++;
 				}
 			} else {
-				dol_syslog("No notification to thirdparty sent, nothing into notification setup for the thirdparty socid = ".$object->socid);
+				dol_syslog("No notification to thirdparty sent, nothing into notification setup for the thirdparty socid = ".(empty($object->socid) ? '' : $object->socid));
 			}
 		} else {
 	   		$error++;
@@ -761,7 +761,7 @@ class Notify
 						if (!empty($hookmanager->resArray['subject'])) $subject .= $hookmanager->resArray['subject'];
 						if (!empty($hookmanager->resArray['message'])) $message .= $hookmanager->resArray['message'];
 					}
-                    $mailfile = new CMailFile(
+					$mailfile = new CMailFile(
 						$subject,
 						$sendto,
 						$replyto,
@@ -773,11 +773,11 @@ class Notify
 						'',
 						0,
 						1,
-                        '',
-                        $trackid,
-                        '',
-                        '',
-                        'notification'
+						'',
+						$trackid,
+						'',
+						'',
+						'notification'
 					);
 
 					if ($mailfile->sendfile())
diff --git a/htdocs/core/class/openid.class.php b/htdocs/core/class/openid.class.php
index 19a94bca9f6..b2a265c47d5 100644
--- a/htdocs/core/class/openid.class.php
+++ b/htdocs/core/class/openid.class.php
@@ -26,127 +26,127 @@
  */
 class SimpleOpenID
 {
-    public $openid_url_identity;
-    public $URLs = array();
-    public $error = array();
-    public $fields = array(
-        'required' => array(),
-        'optional' => array(),
-    );
+	public $openid_url_identity;
+	public $URLs = array();
+	public $error = array();
+	public $fields = array(
+		'required' => array(),
+		'optional' => array(),
+	);
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        if (!function_exists('curl_exec'))
-        {
-            die('Error: Class SimpleOpenID requires curl extension to work');
-        }
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		if (!function_exists('curl_exec'))
+		{
+			die('Error: Class SimpleOpenID requires curl extension to work');
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * SetOpenIDServer
-     *
-     * @param	string	$a		Server
-     * @return	void
-     */
-    public function SetOpenIDServer($a)
-    {
-        // phpcs:enable
-        $this->URLs['openid_server'] = $a;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * SetOpenIDServer
+	 *
+	 * @param	string	$a		Server
+	 * @return	void
+	 */
+	public function SetOpenIDServer($a)
+	{
+		// phpcs:enable
+		$this->URLs['openid_server'] = $a;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * SetOpenIDServer
-     *
-     * @param	string	$a		Server
-     * @return	void
-     */
-    public function SetTrustRoot($a)
-    {
-        // phpcs:enable
-        $this->URLs['trust_root'] = $a;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * SetOpenIDServer
+	 *
+	 * @param	string	$a		Server
+	 * @return	void
+	 */
+	public function SetTrustRoot($a)
+	{
+		// phpcs:enable
+		$this->URLs['trust_root'] = $a;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * SetOpenIDServer
-     *
-     * @param	string	$a		Server
-     * @return	void
-     */
-    public function SetCancelURL($a)
-    {
-        // phpcs:enable
-        $this->URLs['cancel'] = $a;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * SetOpenIDServer
+	 *
+	 * @param	string	$a		Server
+	 * @return	void
+	 */
+	public function SetCancelURL($a)
+	{
+		// phpcs:enable
+		$this->URLs['cancel'] = $a;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * SetApprovedURL
-     *
-     * @param	string	$a		Server
-     * @return	void
-     */
-    public function SetApprovedURL($a)
-    {
-        // phpcs:enable
-        $this->URLs['approved'] = $a;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * SetApprovedURL
+	 *
+	 * @param	string	$a		Server
+	 * @return	void
+	 */
+	public function SetApprovedURL($a)
+	{
+		// phpcs:enable
+		$this->URLs['approved'] = $a;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * SetRequiredFields
-     *
-     * @param	string	$a		Server
-     * @return	void
-     */
-    public function SetRequiredFields($a)
-    {
-        // phpcs:enable
-        if (is_array($a)) {
-            $this->fields['required'] = $a;
-        } else {
-            $this->fields['required'][] = $a;
-        }
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * SetRequiredFields
+	 *
+	 * @param	string|array	$a		Server
+	 * @return	void
+	 */
+	public function SetRequiredFields($a)
+	{
+		// phpcs:enable
+		if (is_array($a)) {
+			$this->fields['required'] = $a;
+		} else {
+			$this->fields['required'][] = $a;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * SetOptionalFields
-     *
-     * @param	string	$a		Server
-     * @return	void
-     */
-    public function SetOptionalFields($a)
-    {
-        // phpcs:enable
-        if (is_array($a)) {
-            $this->fields['optional'] = $a;
-        } else {
-            $this->fields['optional'][] = $a;
-        }
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * SetOptionalFields
+	 *
+	 * @param	string|array	$a		Server
+	 * @return	void
+	 */
+	public function SetOptionalFields($a)
+	{
+		// phpcs:enable
+		if (is_array($a)) {
+			$this->fields['optional'] = $a;
+		} else {
+			$this->fields['optional'][] = $a;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * SetIdentity
-     *
-     * @param	string  $a		Server
-     * @return	void
-     */
-    public function SetIdentity($a)
-    {
-        // phpcs:enable
-        // Set Identity URL
-        if ((stripos($a, 'http://') === false)
-        && (stripos($a, 'https://') === false)) {
-            $a = 'http://'.$a;
-        }
-        /*
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * SetIdentity
+	 *
+	 * @param	string  $a		Server
+	 * @return	void
+	 */
+	public function SetIdentity($a)
+	{
+		// phpcs:enable
+		// Set Identity URL
+		if ((stripos($a, 'http://') === false)
+		&& (stripos($a, 'https://') === false)) {
+			$a = 'http://'.$a;
+		}
+		/*
          $u = parse_url(trim($a));
          if (!isset($u['path'])){
          $u['path'] = '/';
@@ -159,371 +159,371 @@ class SimpleOpenID
          $identity = $u['scheme'] . '://' . $u['host'] . $u['path'];
          }
         */
-        $this->openid_url_identity = $a;
-    }
+		$this->openid_url_identity = $a;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * GetIdentity
-     *
-     * @return	string
-     */
-    public function GetIdentity()
-    {
-        // phpcs:enable
-        // Get Identity
-        return $this->openid_url_identity;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * GetIdentity
+	 *
+	 * @return	string
+	 */
+	public function GetIdentity()
+	{
+		// phpcs:enable
+		// Get Identity
+		return $this->openid_url_identity;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * SetOpenIDServer
-     *
-     * @return	void
-     */
-    public function GetError()
-    {
-        // phpcs:enable
-        $e = $this->error;
-        return array('code'=>$e[0], 'description'=>$e[1]);
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * SetOpenIDServer
+	 *
+	 * @return	void
+	 */
+	public function GetError()
+	{
+		// phpcs:enable
+		$e = $this->error;
+		return array('code'=>$e[0], 'description'=>$e[1]);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * ErrorStore
-     *
-     * @param	string	$code		Code
-     * @param	string	$desc		Description
-     * @return	void
-     */
-    public function ErrorStore($code, $desc = null)
-    {
-        // phpcs:enable
-        $errs['OPENID_NOSERVERSFOUND'] = 'Cannot find OpenID Server TAG on Identity page.';
-        if ($desc == null) {
-            $desc = $errs[$code];
-        }
-        $this->error = array($code, $desc);
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * ErrorStore
+	 *
+	 * @param	string	$code		Code
+	 * @param	string	$desc		Description
+	 * @return	void
+	 */
+	public function ErrorStore($code, $desc = null)
+	{
+		// phpcs:enable
+		$errs['OPENID_NOSERVERSFOUND'] = 'Cannot find OpenID Server TAG on Identity page.';
+		if ($desc == null) {
+			$desc = $errs[$code];
+		}
+		$this->error = array($code, $desc);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * IsError
-     *
-     * @return	boolean
-     */
-    public function IsError()
-    {
-        // phpcs:enable
-        if (count($this->error) > 0)
-        {
-            return true;
-        } else {
-            return false;
-        }
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * IsError
+	 *
+	 * @return	boolean
+	 */
+	public function IsError()
+	{
+		// phpcs:enable
+		if (count($this->error) > 0)
+		{
+			return true;
+		} else {
+			return false;
+		}
+	}
 
-    /**
-     * splitResponse
-     *
-     * @param	string	$response		Server
-     * @return	void
-     */
-    public function splitResponse($response)
-    {
-        $r = array();
-        $response = explode("\n", $response);
-        foreach ($response as $line) {
-            $line = trim($line);
-            if ($line != "") {
-                list($key, $value) = explode(":", $line, 2);
-                $r[trim($key)] = trim($value);
-            }
-        }
-        return $r;
-    }
+	/**
+	 * splitResponse
+	 *
+	 * @param	string	$response		Server
+	 * @return	void
+	 */
+	public function splitResponse($response)
+	{
+		$r = array();
+		$response = explode("\n", $response);
+		foreach ($response as $line) {
+			$line = trim($line);
+			if ($line != "") {
+				list($key, $value) = explode(":", $line, 2);
+				$r[trim($key)] = trim($value);
+			}
+		}
+		return $r;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * OpenID_Standarize
-     *
-     * @param	string	$openid_identity		Server
-     * @return	string
-     */
-    public function OpenID_Standarize($openid_identity = null)
-    {
-        // phpcs:enable
-        if ($openid_identity === null)
-        $openid_identity = $this->openid_url_identity;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * OpenID_Standarize
+	 *
+	 * @param	string	$openid_identity		Server
+	 * @return	string
+	 */
+	public function OpenID_Standarize($openid_identity = null)
+	{
+		// phpcs:enable
+		if ($openid_identity === null)
+		$openid_identity = $this->openid_url_identity;
 
-        $u = parse_url(strtolower(trim($openid_identity)));
+		$u = parse_url(strtolower(trim($openid_identity)));
 
-        if (!isset($u['path']) || ($u['path'] == '/')) {
-            $u['path'] = '';
-        }
-        if (substr($u['path'], -1, 1) == '/') {
-            $u['path'] = substr($u['path'], 0, strlen($u['path']) - 1);
-        }
-        if (isset($u['query'])) { // If there is a query string, then use identity as is
-            return $u['host'].$u['path'].'?'.$u['query'];
-        } else {
-            return $u['host'].$u['path'];
-        }
-    }
+		if (!isset($u['path']) || ($u['path'] == '/')) {
+			$u['path'] = '';
+		}
+		if (substr($u['path'], -1, 1) == '/') {
+			$u['path'] = substr($u['path'], 0, strlen($u['path']) - 1);
+		}
+		if (isset($u['query'])) { // If there is a query string, then use identity as is
+			return $u['host'].$u['path'].'?'.$u['query'];
+		} else {
+			return $u['host'].$u['path'];
+		}
+	}
 
-    /**
-     * array2url
-     *
-     * @param 	array	$arr		An array
-     * @return false|string		false if KO, string of url if OK
-     */
-    public function array2url($arr)
-    {
-        // converts associated array to URL Query String
-        if (!is_array($arr)) {
-            return false;
-        }
-        $query = '';
-        foreach ($arr as $key => $value) {
-            $query .= $key."=".$value."&";
-        }
-        return $query;
-    }
+	/**
+	 * array2url
+	 *
+	 * @param 	array	$arr		An array
+	 * @return false|string		false if KO, string of url if OK
+	 */
+	public function array2url($arr)
+	{
+		// converts associated array to URL Query String
+		if (!is_array($arr)) {
+			return false;
+		}
+		$query = '';
+		foreach ($arr as $key => $value) {
+			$query .= $key."=".$value."&";
+		}
+		return $query;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * FSOCK_Request
-     *
-     * @param string 	$url		URL
-     * @param string	$method		Method
-     * @param string	$params		Params
-     * @return boolean|void			True if success, False if error
-     */
-    public function FSOCK_Request($url, $method = "GET", $params = "")
-    {
-        // phpcs:enable
-        $fp = fsockopen("ssl://www.myopenid.com", 443, $errno, $errstr, 3); // Connection timeout is 3 seconds
-        if (!$fp) {
-            $this->ErrorStore('OPENID_SOCKETERROR', $errstr);
-            return false;
-        } else {
-            $request = $method." /server HTTP/1.0\r\n";
-            $request .= "User-Agent: Dolibarr\r\n";
-            $request .= "Connection: close\r\n\r\n";
-            fwrite($fp, $request);
-            stream_set_timeout($fp, 4); // Connection response timeout is 4 seconds
-            $res = fread($fp, 2000);
-            $info = stream_get_meta_data($fp);
-            fclose($fp);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * FSOCK_Request
+	 *
+	 * @param string 	$url		URL
+	 * @param string	$method		Method
+	 * @param string	$params		Params
+	 * @return boolean|void			True if success, False if error
+	 */
+	public function FSOCK_Request($url, $method = "GET", $params = "")
+	{
+		// phpcs:enable
+		$fp = fsockopen("ssl://www.myopenid.com", 443, $errno, $errstr, 3); // Connection timeout is 3 seconds
+		if (!$fp) {
+			$this->ErrorStore('OPENID_SOCKETERROR', $errstr);
+			return false;
+		} else {
+			$request = $method." /server HTTP/1.0\r\n";
+			$request .= "User-Agent: Dolibarr\r\n";
+			$request .= "Connection: close\r\n\r\n";
+			fwrite($fp, $request);
+			stream_set_timeout($fp, 4); // Connection response timeout is 4 seconds
+			$res = fread($fp, 2000);
+			$info = stream_get_meta_data($fp);
+			fclose($fp);
 
-            if ($info['timed_out']) {
-                $this->ErrorStore('OPENID_SOCKETTIMEOUT');
-            } else {
-                return $res;
-            }
-        }
-    }
+			if ($info['timed_out']) {
+				$this->ErrorStore('OPENID_SOCKETTIMEOUT');
+			} else {
+				return $res;
+			}
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * CURL_Request
-     *
-     * @param 	string	$url		URL
-     * @param 	string	$method		Method
-     * @param 	string	$params		Params
-     * @return string
-     */
-    public function CURL_Request($url, $method = "GET", $params = "")
-    {
-        // phpcs:enable
-        // Remember, SSL MUST BE SUPPORTED
-        if (is_array($params)) $params = $this->array2url($params);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * CURL_Request
+	 *
+	 * @param 	string	$url		URL
+	 * @param 	string	$method		Method
+	 * @param 	string	$params		Params
+	 * @return string
+	 */
+	public function CURL_Request($url, $method = "GET", $params = "")
+	{
+		// phpcs:enable
+		// Remember, SSL MUST BE SUPPORTED
+		if (is_array($params)) $params = $this->array2url($params);
 
-        $curl = curl_init($url.($method == "GET" && $params != "" ? "?".$params : ""));
-        @curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
-        curl_setopt($curl, CURLOPT_HEADER, false);
-        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
-        curl_setopt($curl, CURLOPT_HTTPGET, ($method == "GET"));
-        curl_setopt($curl, CURLOPT_POST, ($method == "POST"));
-        if ($method == "POST") curl_setopt($curl, CURLOPT_POSTFIELDS, $params);
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-        $response = curl_exec($curl);
+		$curl = curl_init($url.($method == "GET" && $params != "" ? "?".$params : ""));
+		@curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
+		curl_setopt($curl, CURLOPT_HEADER, false);
+		curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
+		curl_setopt($curl, CURLOPT_HTTPGET, ($method == "GET"));
+		curl_setopt($curl, CURLOPT_POST, ($method == "POST"));
+		if ($method == "POST") curl_setopt($curl, CURLOPT_POSTFIELDS, $params);
+		curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+		$response = curl_exec($curl);
 
-        if (curl_errno($curl) == 0) {
-            $response;
-        } else {
-            $this->ErrorStore('OPENID_CURL', curl_error($curl));
-        }
-        return $response;
-    }
+		if (curl_errno($curl) == 0) {
+			$response;
+		} else {
+			$this->ErrorStore('OPENID_CURL', curl_error($curl));
+		}
+		return $response;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * HTML2OpenIDServer
-     *
-     * @param string	$content	Content
-     * @return array				Array of servers
-     */
-    public function HTML2OpenIDServer($content)
-    {
-        // phpcs:enable
-        $get = array();
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * HTML2OpenIDServer
+	 *
+	 * @param string	$content	Content
+	 * @return array				Array of servers
+	 */
+	public function HTML2OpenIDServer($content)
+	{
+		// phpcs:enable
+		$get = array();
 
-        // Get details of their OpenID server and (optional) delegate
-        preg_match_all('/<link[^>]*rel=[\'"]openid.server[\'"][^>]*href=[\'"]([^\'"]+)[\'"][^>]*\/?>/i', $content, $matches1);
-        preg_match_all('/<link[^>]*href=\'"([^\'"]+)[\'"][^>]*rel=[\'"]openid.server[\'"][^>]*\/?>/i', $content, $matches2);
-        $servers = array_merge($matches1[1], $matches2[1]);
+		// Get details of their OpenID server and (optional) delegate
+		preg_match_all('/<link[^>]*rel=[\'"]openid.server[\'"][^>]*href=[\'"]([^\'"]+)[\'"][^>]*\/?>/i', $content, $matches1);
+		preg_match_all('/<link[^>]*href=\'"([^\'"]+)[\'"][^>]*rel=[\'"]openid.server[\'"][^>]*\/?>/i', $content, $matches2);
+		$servers = array_merge($matches1[1], $matches2[1]);
 
-        preg_match_all('/<link[^>]*rel=[\'"]openid.delegate[\'"][^>]*href=[\'"]([^\'"]+)[\'"][^>]*\/?>/i', $content, $matches1);
+		preg_match_all('/<link[^>]*rel=[\'"]openid.delegate[\'"][^>]*href=[\'"]([^\'"]+)[\'"][^>]*\/?>/i', $content, $matches1);
 
-        preg_match_all('/<link[^>]*href=[\'"]([^\'"]+)[\'"][^>]*rel=[\'"]openid.delegate[\'"][^>]*\/?>/i', $content, $matches2);
+		preg_match_all('/<link[^>]*href=[\'"]([^\'"]+)[\'"][^>]*rel=[\'"]openid.delegate[\'"][^>]*\/?>/i', $content, $matches2);
 
-        $delegates = array_merge($matches1[1], $matches2[1]);
+		$delegates = array_merge($matches1[1], $matches2[1]);
 
-        $ret = array($servers, $delegates);
-        return $ret;
-    }
+		$ret = array($servers, $delegates);
+		return $ret;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Get openid server
-     *
-     * @param	string	$url	Url to found endpoint
-     * @return 	string			Endpoint
-     */
-    public function GetOpenIDServer($url = '')
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Get openid server
+	 *
+	 * @param	string	$url	Url to found endpoint
+	 * @return 	string			Endpoint
+	 */
+	public function GetOpenIDServer($url = '')
+	{
+		// phpcs:enable
+		global $conf;
 
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-        if (empty($url)) $url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+		if (empty($url)) $url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
 
-        $response = getURLContent($url);
+		$response = getURLContent($url);
 
-        list($servers, $delegates) = $this->HTML2OpenIDServer($response);
-        if (count($servers) == 0) {
-            $this->ErrorStore('OPENID_NOSERVERSFOUND');
-            return false;
-        }
-        if (isset($delegates[0])
-        && ($delegates[0] != "")) {
-            $this->SetIdentity($delegates[0]);
-        }
-        $this->SetOpenIDServer($servers[0]);
-        return $servers[0];
-    }
+		list($servers, $delegates) = $this->HTML2OpenIDServer($response);
+		if (count($servers) == 0) {
+			$this->ErrorStore('OPENID_NOSERVERSFOUND');
+			return false;
+		}
+		if (isset($delegates[0])
+		&& ($delegates[0] != "")) {
+			$this->SetIdentity($delegates[0]);
+		}
+		$this->SetOpenIDServer($servers[0]);
+		return $servers[0];
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * GetRedirectURL
-     *
-     * @return	string
-     */
-    public function GetRedirectURL()
-    {
-        // phpcs:enable
-        $params = array();
-        $params['openid.return_to'] = urlencode($this->URLs['approved']);
-        $params['openid.mode'] = 'checkid_setup';
-        $params['openid.identity'] = urlencode($this->openid_url_identity);
-        $params['openid.trust_root'] = urlencode($this->URLs['trust_root']);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * GetRedirectURL
+	 *
+	 * @return	string
+	 */
+	public function GetRedirectURL()
+	{
+		// phpcs:enable
+		$params = array();
+		$params['openid.return_to'] = urlencode($this->URLs['approved']);
+		$params['openid.mode'] = 'checkid_setup';
+		$params['openid.identity'] = urlencode($this->openid_url_identity);
+		$params['openid.trust_root'] = urlencode($this->URLs['trust_root']);
 
-        if (isset($this->fields['required'])
-        && (count($this->fields['required']) > 0)) {
-            $params['openid.sreg.required'] = implode(',', $this->fields['required']);
-        }
-        if (isset($this->fields['optional'])
-        && (count($this->fields['optional']) > 0)) {
-            $params['openid.sreg.optional'] = implode(',', $this->fields['optional']);
-        }
-        return $this->URLs['openid_server']."?".$this->array2url($params);
-    }
+		if (isset($this->fields['required'])
+		&& (count($this->fields['required']) > 0)) {
+			$params['openid.sreg.required'] = implode(',', $this->fields['required']);
+		}
+		if (isset($this->fields['optional'])
+		&& (count($this->fields['optional']) > 0)) {
+			$params['openid.sreg.optional'] = implode(',', $this->fields['optional']);
+		}
+		return $this->URLs['openid_server']."?".$this->array2url($params);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Redirect
-     *
-     * @return	void
-     */
-    public function Redirect()
-    {
-        // phpcs:enable
-        $redirect_to = $this->GetRedirectURL();
-        if (headers_sent())
-        { // Use JavaScript to redirect if content has been previously sent (not recommended, but safe)
-            echo '<script language="JavaScript" type="text/javascript">window.location=\'';
-            echo $redirect_to;
-            echo '\';</script>';
-        } else {	// Default Header Redirect
-            header('Location: '.$redirect_to);
-        }
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Redirect
+	 *
+	 * @return	void
+	 */
+	public function Redirect()
+	{
+		// phpcs:enable
+		$redirect_to = $this->GetRedirectURL();
+		if (headers_sent())
+		{ // Use JavaScript to redirect if content has been previously sent (not recommended, but safe)
+			echo '<script language="JavaScript" type="text/javascript">window.location=\'';
+			echo $redirect_to;
+			echo '\';</script>';
+		} else {	// Default Header Redirect
+			header('Location: '.$redirect_to);
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * ValidateWithServer
-     *
-     * @return	boolean
-     */
-    public function ValidateWithServer()
-    {
-        // phpcs:enable
-        $params = array(
-            'openid.assoc_handle' => urlencode($_GET['openid_assoc_handle']),
-            'openid.signed' => urlencode($_GET['openid_signed']),
-            'openid.sig' => urlencode($_GET['openid_sig'])
-        );
-        // Send only required parameters to confirm validity
-        $arr_signed = explode(",", str_replace('sreg.', 'sreg_', $_GET['openid_signed']));
-        $num = count($arr_signed);
-        for ($i = 0; $i < $num; $i++)
-        {
-            $s = str_replace('sreg_', 'sreg.', $arr_signed[$i]);
-            $c = $_GET['openid_'.$arr_signed[$i]];
-            // if ($c != ""){
-            $params['openid.'.$s] = urlencode($c);
-            // }
-        }
-        $params['openid.mode'] = "check_authentication";
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * ValidateWithServer
+	 *
+	 * @return	boolean
+	 */
+	public function ValidateWithServer()
+	{
+		// phpcs:enable
+		$params = array(
+			'openid.assoc_handle' => urlencode($_GET['openid_assoc_handle']),
+			'openid.signed' => urlencode($_GET['openid_signed']),
+			'openid.sig' => urlencode($_GET['openid_sig'])
+		);
+		// Send only required parameters to confirm validity
+		$arr_signed = explode(",", str_replace('sreg.', 'sreg_', $_GET['openid_signed']));
+		$num = count($arr_signed);
+		for ($i = 0; $i < $num; $i++)
+		{
+			$s = str_replace('sreg_', 'sreg.', $arr_signed[$i]);
+			$c = $_GET['openid_'.$arr_signed[$i]];
+			// if ($c != ""){
+			$params['openid.'.$s] = urlencode($c);
+			// }
+		}
+		$params['openid.mode'] = "check_authentication";
 
-        $openid_server = $this->GetOpenIDServer();
-        if ($openid_server == false)
-        {
-            return false;
-        }
-        $response = $this->CURL_Request($openid_server, 'POST', $params);
-        $data = $this->splitResponse($response);
-        if ($data['is_valid'] == "true")
-        {
-            return true;
-        } else {
-            return false;
-        }
-    }
+		$openid_server = $this->GetOpenIDServer();
+		if ($openid_server == false)
+		{
+			return false;
+		}
+		$response = $this->CURL_Request($openid_server, 'POST', $params);
+		$data = $this->splitResponse($response);
+		if ($data['is_valid'] == "true")
+		{
+			return true;
+		} else {
+			return false;
+		}
+	}
 
 
 
 
-    /**
-     * Get XRDS response and set possible servers.
-     *
-     * @param	string	$url	Url of endpoint to request
-     * @return 	string			First endpoint OpenID server found. False if it failed to found.
-     */
-    public function sendDiscoveryRequestToGetXRDS($url = '')
-    {
-        global $conf;
+	/**
+	 * Get XRDS response and set possible servers.
+	 *
+	 * @param	string	$url	Url of endpoint to request
+	 * @return 	string			First endpoint OpenID server found. False if it failed to found.
+	 */
+	public function sendDiscoveryRequestToGetXRDS($url = '')
+	{
+		global $conf;
 
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-        if (empty($url)) $url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+		if (empty($url)) $url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
 
-        dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS get XRDS');
+		dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS get XRDS');
 
-        $addheaders = array('Accept: application/xrds+xml');
-        $response = getURLContent($url, 'GET', '', 1, $addheaders);
-        /* response should like this:
+		$addheaders = array('Accept: application/xrds+xml');
+		$response = getURLContent($url, 'GET', '', 1, $addheaders);
+		/* response should like this:
         <?xml version="1.0" encoding="UTF-8"?>
         <xrds:XRDS xmlns:xrds="xri://$xrds" xmlns="xri://$xrd*($v*2.0)">
         <XRD>
@@ -536,22 +536,22 @@ class SimpleOpenID
         </XRD>
         </xrds:XRDS>
         */
-        $content = $response['content'];
+		$content = $response['content'];
 
-        $server = '';
-        if (preg_match('/'.preg_quote('<URI>', '/').'(.*)'.preg_quote('</URI>', '/').'/is', $content, $reg))
-        {
-            $server = $reg[1];
-        }
+		$server = '';
+		if (preg_match('/'.preg_quote('<URI>', '/').'(.*)'.preg_quote('</URI>', '/').'/is', $content, $reg))
+		{
+			$server = $reg[1];
+		}
 
-        if (empty($server))
-        {
-            $this->ErrorStore('OPENID_NOSERVERSFOUND');
-            return false;
-        } else {
-            dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS found endpoint = '.$server);
-            $this->SetOpenIDServer($server);
-            return $server;
-        }
-    }
+		if (empty($server))
+		{
+			$this->ErrorStore('OPENID_NOSERVERSFOUND');
+			return false;
+		} else {
+			dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS found endpoint = '.$server);
+			$this->SetOpenIDServer($server);
+			return $server;
+		}
+	}
 }
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index c18bfd1d263..578e180edff 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -254,7 +254,7 @@ class RssParser
 				libxml_use_internal_errors(false);
 				$rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA);
 			} else {
-				if (! function_exists('xml_parser_create')) {
+				if (!function_exists('xml_parser_create')) {
 					$this->error = 'Function xml_parser_create are not supported by your PHP';
 					return -1;
 				}
@@ -308,11 +308,9 @@ class RssParser
 			$items = array();
 
 			// Save description entries
-			if ($rss->_format == 'rss')
-			{
+			if ($rss->_format == 'rss') {
 				//var_dump($rss);
-				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
-				{
+				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
 					if (!empty($rss->channel->language))      $this->_language = (string) $rss->channel->language;
 					if (!empty($rss->channel->generator))     $this->_generator = (string) $rss->channel->generator;
 					if (!empty($rss->channel->copyright))     $this->_copyright = (string) $rss->channel->copyright;
@@ -336,8 +334,7 @@ class RssParser
 				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) $items = $rss->channel->item; // With simplexml
 				else $items = $rss->items; // With xmlparse
 				//var_dump($items);exit;
-			} elseif ($rss->_format == 'atom')
-			{
+			} elseif ($rss->_format == 'atom') {
 				//var_dump($rss);
 				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
 				{
@@ -370,15 +367,11 @@ class RssParser
 			$i = 0;
 
 			// Loop on each record
-			if (is_array($items))
-			{
-				foreach ($items as $item)
-				{
+			if (is_array($items)) {
+				foreach ($items as $item) {
 					//var_dump($item);exit;
-					if ($rss->_format == 'rss')
-					{
-						if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
-						{
+					if ($rss->_format == 'rss') {
+						if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
 							$itemLink = (string) $item->link;
 							$itemTitle = (string) $item->title;
 							$itemDescription = (string) $item->description;
@@ -396,17 +389,13 @@ class RssParser
 
 						// Loop on each category
 						$itemCategory = array();
-						if (is_array($item->category))
-						{
-							foreach ($item->category as $cat)
-							{
+						if (is_array($item->category)) {
+							foreach ($item->category as $cat) {
 								$itemCategory[] = (string) $cat;
 							}
 						}
-					} elseif ($rss->_format == 'atom')
-					{
-						if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
-						{
+					} elseif ($rss->_format == 'atom') {
+						if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
 							$itemLink = (isset($item['link']) ? (string) $item['link'] : '');
 							$itemTitle = (string) $item['title'];
 							$itemDescription = $this->getAtomItemDescription($item);
@@ -421,7 +410,17 @@ class RssParser
 							$itemId = (string) $item['id'];
 							$itemAuthor = (string) ($item['author'] ? $item['author'] : $item['author_name']);
 						}
-					} else print 'ErrorBadFeedFormat';
+						$itemCategory = array();
+					} else {
+						$itemCategory = array();
+						$itemLink = '';
+						$itemTitle = '';
+						$itemDescription = '';
+						$itemPubDate = '';
+						$itemId = '';
+						$itemAuthor = '';
+						print 'ErrorBadFeedFormat';
+					}
 
 					// Add record to result array
 					$this->_rssarray[$i] = array(
@@ -431,7 +430,8 @@ class RssParser
 						'pubDate'=>$itemPubDate,
 						'category'=>$itemCategory,
 						'id'=>$itemId,
-						'author'=>$itemAuthor);
+						'author'=>$itemAuthor
+					);
 					//var_dump($this->_rssarray);
 
 					$i++;
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index 3adbf4af4d5..8254cc56ed2 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -45,435 +45,435 @@
  */
 class SMTPs
 {
-    /**
-     * Host Name or IP of SMTP Server to use
-     */
-    private $_smtpsHost = 'localhost';
+	/**
+	 * Host Name or IP of SMTP Server to use
+	 */
+	private $_smtpsHost = 'localhost';
 
-    /**
-     * SMTP Server Port definition. 25 is default value
-     * This can be defined via a INI file or via a setter method
-     */
-    private $_smtpsPort = '25';
+	/**
+	 * SMTP Server Port definition. 25 is default value
+	 * This can be defined via a INI file or via a setter method
+	 */
+	private $_smtpsPort = '25';
 
-    /**
-     * Secure SMTP Server access ID
-     * This can be defined via a INI file or via a setter method
-     */
-    private $_smtpsID = null;
+	/**
+	 * Secure SMTP Server access ID
+	 * This can be defined via a INI file or via a setter method
+	 */
+	private $_smtpsID = null;
 
-    /**
-     * Secure SMTP Server access Password
-     * This can be defined via a INI file or via a setter method
-     */
-    private $_smtpsPW = null;
+	/**
+	 * Secure SMTP Server access Password
+	 * This can be defined via a INI file or via a setter method
+	 */
+	private $_smtpsPW = null;
 
-    /**
-     * Who sent the Message
-     * This can be defined via a INI file or via a setter method
-     */
-    private $_msgFrom = null;
+	/**
+	 * Who sent the Message
+	 * This can be defined via a INI file or via a setter method
+	 */
+	private $_msgFrom = null;
 
-    /**
-     * Where are replies and errors to be sent to
-     * This can be defined via a INI file or via a setter method
-     */
-    private $_msgReplyTo = null;
+	/**
+	 * Where are replies and errors to be sent to
+	 * This can be defined via a INI file or via a setter method
+	 */
+	private $_msgReplyTo = null;
 
-    /**
-     * Who will the Message be sent to; TO, CC, BCC
-     * Multi-diminsional array containg addresses the message will
-     * be sent TO, CC or BCC
-     */
-    private $_msgRecipients = null;
+	/**
+	 * Who will the Message be sent to; TO, CC, BCC
+	 * Multi-diminsional array containg addresses the message will
+	 * be sent TO, CC or BCC
+	 */
+	private $_msgRecipients = null;
 
-    /**
-     * Message Subject
-     */
-    private $_msgSubject = null;
+	/**
+	 * Message Subject
+	 */
+	private $_msgSubject = null;
 
-    /**
-     * Message Content
-     */
-    private $_msgContent = null;
+	/**
+	 * Message Content
+	 */
+	private $_msgContent = null;
 
-    /**
-     * Custom X-Headers
-     */
-    private $_msgXheader = null;
+	/**
+	 * Custom X-Headers
+	 */
+	private $_msgXheader = null;
 
-    /**
-     * Character set
-     * Defaulted to 'iso-8859-1'
-     */
-    private $_smtpsCharSet = 'iso-8859-1';
+	/**
+	 * Character set
+	 * Defaulted to 'iso-8859-1'
+	 */
+	private $_smtpsCharSet = 'iso-8859-1';
 
-    /**
-     * Message Sensitivity
-     * Defaults to ZERO - None
-     */
-    private $_msgSensitivity = 0;
+	/**
+	 * Message Sensitivity
+	 * Defaults to ZERO - None
+	 */
+	private $_msgSensitivity = 0;
 
-    /**
-     * Message Sensitivity
-     */
-    private $_arySensitivity = array(false,
-                                  'Personal',
-                                  'Private',
-                                  'Company Confidential');
+	/**
+	 * Message Sensitivity
+	 */
+	private $_arySensitivity = array(false,
+								  'Personal',
+								  'Private',
+								  'Company Confidential');
 
-    /**
-     * Message Sensitivity
-     * Defaults to 3 - Normal
-     */
-    private $_msgPriority = 3;
+	/**
+	 * Message Sensitivity
+	 * Defaults to 3 - Normal
+	 */
+	private $_msgPriority = 3;
 
-    /**
-     * Message Priority
-     */
-    private $_aryPriority = array('Bulk',
-                                'Highest',
-                                'High',
-                                'Normal',
-                                'Low',
-                                'Lowest');
+	/**
+	 * Message Priority
+	 */
+	private $_aryPriority = array('Bulk',
+								'Highest',
+								'High',
+								'Normal',
+								'Low',
+								'Lowest');
 
-    /**
-     * Content-Transfer-Encoding
-     * Defaulted to 0 - 7bit
-     */
-    private $_smtpsTransEncodeType = 0;
+	/**
+	 * Content-Transfer-Encoding
+	 * Defaulted to 0 - 7bit
+	 */
+	private $_smtpsTransEncodeType = 0;
 
-    /**
-     * Content-Transfer-Encoding
-     */
-    private $_smtpsTransEncodeTypes = array('7bit', // Simple 7-bit ASCII
-                                         '8bit', // 8-bit coding with line termination characters
-                                         'base64', // 3 octets encoded into 4 sextets with offset
-                                         'binary', // Arbitrary binary stream
-                                         'mac-binhex40', // Macintosh binary to hex encoding
-                                         'quoted-printable', // Mostly 7-bit, with 8-bit characters encoded as "=HH"
-                                         'uuencode'); // UUENCODE encoding
+	/**
+	 * Content-Transfer-Encoding
+	 */
+	private $_smtpsTransEncodeTypes = array('7bit', // Simple 7-bit ASCII
+										 '8bit', // 8-bit coding with line termination characters
+										 'base64', // 3 octets encoded into 4 sextets with offset
+										 'binary', // Arbitrary binary stream
+										 'mac-binhex40', // Macintosh binary to hex encoding
+										 'quoted-printable', // Mostly 7-bit, with 8-bit characters encoded as "=HH"
+										 'uuencode'); // UUENCODE encoding
 
-    /**
-     * Content-Transfer-Encoding
-     * Defaulted to '7bit'
-     */
-    private $_smtpsTransEncode = '7bit';
+	/**
+	 * Content-Transfer-Encoding
+	 * Defaulted to '7bit'
+	 */
+	private $_smtpsTransEncode = '7bit';
 
-    /**
-     * Boundary String for MIME seperation
-     */
-    private $_smtpsBoundary = null;
+	/**
+	 * Boundary String for MIME seperation
+	 */
+	private $_smtpsBoundary = null;
 
-    /**
-     * Related Boundary
-     */
-    private $_smtpsRelatedBoundary = null;
+	/**
+	 * Related Boundary
+	 */
+	private $_smtpsRelatedBoundary = null;
 
-    /**
-     * Alternative Boundary
-     */
-    private $_smtpsAlternativeBoundary = null;
+	/**
+	 * Alternative Boundary
+	 */
+	private $_smtpsAlternativeBoundary = null;
 
-    /**
-     * Determines the method inwhich the message are to be sent.
-     * - 'sockets' [0] - conect via network to SMTP server - default
-     * - 'pipe     [1] - use UNIX path to EXE
-     * - 'phpmail  [2] - use the PHP built-in mail function
-     * NOTE: Only 'sockets' is implemented
-     */
-    private $_transportType = 0;
+	/**
+	 * Determines the method inwhich the message are to be sent.
+	 * - 'sockets' [0] - conect via network to SMTP server - default
+	 * - 'pipe     [1] - use UNIX path to EXE
+	 * - 'phpmail  [2] - use the PHP built-in mail function
+	 * NOTE: Only 'sockets' is implemented
+	 */
+	private $_transportType = 0;
 
-    /**
-     * If '$_transportType' is set to '1', then this variable is used
-     * to define the UNIX file system path to the sendmail execuable
-     */
-    private $_mailPath = '/usr/lib/sendmail';
+	/**
+	 * If '$_transportType' is set to '1', then this variable is used
+	 * to define the UNIX file system path to the sendmail execuable
+	 */
+	private $_mailPath = '/usr/lib/sendmail';
 
-    /**
-     * Sets the SMTP server timeout in seconds.
-     */
-    private $_smtpTimeout = 10;
+	/**
+	 * Sets the SMTP server timeout in seconds.
+	 */
+	private $_smtpTimeout = 10;
 
-    /**
-     * Determines whether to calculate message MD5 checksum.
-     */
-    private $_smtpMD5 = false;
+	/**
+	 * Determines whether to calculate message MD5 checksum.
+	 */
+	private $_smtpMD5 = false;
 
-    /**
-     * Class error codes and messages
-     */
-    private $_smtpsErrors = null;
+	/**
+	 * Class error codes and messages
+	 */
+	private $_smtpsErrors = null;
 
-    /**
-     * Defines log level
-     *  0 - no logging
-     *  1 - connectivity logging
-     *  2 - message generation logging
-     *  3 - detail logging
-     */
-    private $_log_level = 0;
+	/**
+	 * Defines log level
+	 *  0 - no logging
+	 *  1 - connectivity logging
+	 *  2 - message generation logging
+	 *  3 - detail logging
+	 */
+	private $_log_level = 0;
 
-    /**
-     * Place Class in" debug" mode
-     */
-    private $_debug = false;
+	/**
+	 * Place Class in" debug" mode
+	 */
+	private $_debug = false;
 
 
-    // @CHANGE LDR
-    public $log = '';
-    private $_errorsTo = '';
-    private $_deliveryReceipt = 0;
-    private $_trackId = '';
-    private $_moreInHeader = '';
+	// @CHANGE LDR
+	public $log = '';
+	private $_errorsTo = '';
+	private $_deliveryReceipt = 0;
+	private $_trackId = '';
+	private $_moreInHeader = '';
 
-    /**
-     * An array of options for stream_context_create()
-     */
+	/**
+	 * An array of options for stream_context_create()
+	 */
 	private $_options = [];
 
-    /**
-     * Set delivery receipt
-     *
-     * @param	array		$_options		An array of options for stream_context_create()
-     * @return	void
-     */
+	/**
+	 * Set delivery receipt
+	 *
+	 * @param	array		$_options		An array of options for stream_context_create()
+	 * @return	void
+	 */
 	public function setOptions($_options = [])
-    {
-        $this->_options = $_options;
-    }
+	{
+		$this->_options = $_options;
+	}
 
-    /**
-     * Set delivery receipt
-     *
-     * @param	int		$_val		Value
-     * @return	void
-     */
-    public function setDeliveryReceipt($_val = 0)
-    {
-        $this->_deliveryReceipt = $_val;
-    }
+	/**
+	 * Set delivery receipt
+	 *
+	 * @param	int		$_val		Value
+	 * @return	void
+	 */
+	public function setDeliveryReceipt($_val = 0)
+	{
+		$this->_deliveryReceipt = $_val;
+	}
 
-    /**
-     * get delivery receipt
-     *
-     * @return	int		Delivery receipt
-     */
-    public function getDeliveryReceipt()
-    {
-        return $this->_deliveryReceipt;
-    }
+	/**
+	 * get delivery receipt
+	 *
+	 * @return	int		Delivery receipt
+	 */
+	public function getDeliveryReceipt()
+	{
+		return $this->_deliveryReceipt;
+	}
 
-    /**
-     * Set trackid
-     *
-     * @param	string		$_val		Value
-     * @return	void
-     */
-    public function setTrackId($_val = '')
-    {
-        $this->_trackId = $_val;
-    }
+	/**
+	 * Set trackid
+	 *
+	 * @param	string		$_val		Value
+	 * @return	void
+	 */
+	public function setTrackId($_val = '')
+	{
+		$this->_trackId = $_val;
+	}
 
-    /**
-     * Set moreInHeader
-     *
-     * @param	string		$_val		Value
-     * @return	void
-     */
-    public function setMoreInHeader($_val = '')
-    {
-        $this->_moreinheader = $_val;
-    }
+	/**
+	 * Set moreInHeader
+	 *
+	 * @param	string		$_val		Value
+	 * @return	void
+	 */
+	public function setMoreInHeader($_val = '')
+	{
+		$this->_moreinheader = $_val;
+	}
 
-    /**
-     * get trackid
-     *
-     * @return	string		Track id
-     */
-    public function getTrackId()
-    {
-        return $this->_trackId;
-    }
+	/**
+	 * get trackid
+	 *
+	 * @return	string		Track id
+	 */
+	public function getTrackId()
+	{
+		return $this->_trackId;
+	}
 
-    /**
-     * get moreInHeader
-     *
-     * @return	string		moreInHeader
-     */
-    public function getMoreInHeader()
-    {
-        return $this->_moreinheader;
-    }
+	/**
+	 * get moreInHeader
+	 *
+	 * @return	string		moreInHeader
+	 */
+	public function getMoreInHeader()
+	{
+		return $this->_moreinheader;
+	}
 
-    /**
-     * Set errors to
-     *
-     * @param	string		$_strErrorsTo		Errors to
-     * @return	void
-     */
-    public function setErrorsTo($_strErrorsTo)
-    {
-        if ($_strErrorsTo)
-        $this->_errorsTo = $this->_strip_email($_strErrorsTo);
-    }
+	/**
+	 * Set errors to
+	 *
+	 * @param	string		$_strErrorsTo		Errors to
+	 * @return	void
+	 */
+	public function setErrorsTo($_strErrorsTo)
+	{
+		if ($_strErrorsTo)
+		$this->_errorsTo = $this->_strip_email($_strErrorsTo);
+	}
 
-    /**
-     * Get errors to
-     *
-     * @param	boolean		$_part		Variant
-     * @return	string					Errors to
-     */
-    public function getErrorsTo($_part = true)
-    {
-        $_retValue = '';
+	/**
+	 * Get errors to
+	 *
+	 * @param	boolean		$_part		Variant
+	 * @return	string					Errors to
+	 */
+	public function getErrorsTo($_part = true)
+	{
+		$_retValue = '';
 
-        if ($_part === true)
-        $_retValue = $this->_errorsTo;
-        else $_retValue = $this->_errorsTo[$_part];
+		if ($_part === true)
+		$_retValue = $this->_errorsTo;
+		else $_retValue = $this->_errorsTo[$_part];
 
-        return $_retValue;
-    }
+		return $_retValue;
+	}
 
-    /**
-     * Set debug
-     *
-     * @param	boolean		$_vDebug		Value for debug
-     * @return 	void
-     */
-    public function setDebug($_vDebug = false)
-    {
-        $this->_debug = $_vDebug;
-    }
+	/**
+	 * Set debug
+	 *
+	 * @param	boolean		$_vDebug		Value for debug
+	 * @return 	void
+	 */
+	public function setDebug($_vDebug = false)
+	{
+		$this->_debug = $_vDebug;
+	}
 
-    /**
-     * build RECIPIENT List, all addresses who will recieve this message
-     *
-     * @return void
-     */
-    public function buildRCPTlist()
-    {
-        // Pull TO list
-        $_aryToList = $this->getTO();
-    }
+	/**
+	 * build RECIPIENT List, all addresses who will recieve this message
+	 *
+	 * @return void
+	 */
+	public function buildRCPTlist()
+	{
+		// Pull TO list
+		$_aryToList = $this->getTO();
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Attempt a connection to mail server
-     *
-     * @return mixed  $_retVal   Boolean indicating success or failure on connection
-     */
-    private function _server_connect()
-    {
-        // phpcs:enable
-        // Default return value
-        $_retVal = true;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Attempt a connection to mail server
+	 *
+	 * @return mixed  $_retVal   Boolean indicating success or failure on connection
+	 */
+	private function _server_connect()
+	{
+		// phpcs:enable
+		// Default return value
+		$_retVal = true;
 
-        // We have to make sure the HOST given is valid
-        // This is done here because '@fsockopen' will not give me this
-        // information if it failes to connect because it can't find the HOST
-        $host = $this->getHost();
-        $usetls = preg_match('@tls://@i', $host);
+		// We have to make sure the HOST given is valid
+		// This is done here because '@fsockopen' will not give me this
+		// information if it failes to connect because it can't find the HOST
+		$host = $this->getHost();
+		$usetls = preg_match('@tls://@i', $host);
 
-        $host = preg_replace('@tcp://@i', '', $host); // Remove prefix
-        $host = preg_replace('@ssl://@i', '', $host); // Remove prefix
-        $host = preg_replace('@tls://@i', '', $host); // Remove prefix
+		$host = preg_replace('@tcp://@i', '', $host); // Remove prefix
+		$host = preg_replace('@ssl://@i', '', $host); // Remove prefix
+		$host = preg_replace('@tls://@i', '', $host); // Remove prefix
 
-        // @CHANGE LDR
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		// @CHANGE LDR
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-        if ((!is_ip($host)) && ((gethostbyname($host)) == $host))
-        {
-            $this->_setErr(99, $host.' is either offline or is an invalid host name.');
-            $_retVal = false;
-        } else {
-            if (function_exists('stream_socket_client') && !empty($this->_options)) {
-                $socket_context = stream_context_create($this->_options); // An array of options for stream_context_create()
-                set_error_handler([$this, 'errorHandler']);
-                $this->socket = @stream_socket_client(
-					preg_replace('@tls://@i', '', $this->getHost()) .    // Host to 'hit', IP or domain
-                    ':' . $this->getPort(),             // which Port number to use
-                    $this->errno,                       // actual system level error
-                    $this->errstr,                      // and any text that goes with the error
-                    $this->_smtpTimeout,                // timeout for reading/writing data over the socket
-                    STREAM_CLIENT_CONNECT,
-                    $socket_context                     // Options for connection
-                );
-        	} else {
-                $this->socket = @fsockopen(
-					preg_replace('@tls://@i', '', $this->getHost()),       // Host to 'hit', IP or domain
-                $this->getPort(), // which Port number to use
-                $this->errno, // actual system level error
-                $this->errstr, // and any text that goes with the error
-                $this->_smtpTimeout     // timeout for reading/writing data over the socket
-                );
-            }
+		if ((!is_ip($host)) && ((gethostbyname($host)) == $host))
+		{
+			$this->_setErr(99, $host.' is either offline or is an invalid host name.');
+			$_retVal = false;
+		} else {
+			if (function_exists('stream_socket_client') && !empty($this->_options)) {
+				$socket_context = stream_context_create($this->_options); // An array of options for stream_context_create()
+				set_error_handler([$this, 'errorHandler']);
+				$this->socket = @stream_socket_client(
+					preg_replace('@tls://@i', '', $this->getHost()).// Host to 'hit', IP or domain
+					':'.$this->getPort(), // which Port number to use
+					$this->errno, // actual system level error
+					$this->errstr, // and any text that goes with the error
+					$this->_smtpTimeout, // timeout for reading/writing data over the socket
+					STREAM_CLIENT_CONNECT,
+					$socket_context                     // Options for connection
+				);
+			} else {
+				$this->socket = @fsockopen(
+					preg_replace('@tls://@i', '', $this->getHost()), // Host to 'hit', IP or domain
+				$this->getPort(), // which Port number to use
+				$this->errno, // actual system level error
+				$this->errstr, // and any text that goes with the error
+				$this->_smtpTimeout     // timeout for reading/writing data over the socket
+				);
+			}
 
-            //See if we can connect to the SMTP server
-            if (is_resource($this->socket))
-            {
-                // Fix from PHP SMTP class by 'Chris Ryan'
-                // Sometimes the SMTP server takes a little longer to respond
-                // so we will give it a longer timeout for the first read
-                // Windows still does not have support for this timeout function
-                if (function_exists('stream_set_timeout')) stream_set_timeout($this->socket, $this->_smtpTimeout, 0);
+			//See if we can connect to the SMTP server
+			if (is_resource($this->socket))
+			{
+				// Fix from PHP SMTP class by 'Chris Ryan'
+				// Sometimes the SMTP server takes a little longer to respond
+				// so we will give it a longer timeout for the first read
+				// Windows still does not have support for this timeout function
+				if (function_exists('stream_set_timeout')) stream_set_timeout($this->socket, $this->_smtpTimeout, 0);
 
-                // Check response from Server
-                if ($_retVal = $this->server_parse($this->socket, "220"))
-                $_retVal = $this->socket;
-            }
-            // This connection attempt failed.
-            else {
-                // @CHANGE LDR
-                if (empty($this->errstr)) $this->errstr = 'Failed to connect with fsockopen host='.$this->getHost().' port='.$this->getPort();
-                $this->_setErr($this->errno, $this->errstr);
-                $_retVal = false;
-            }
-        }
+				// Check response from Server
+				if ($_retVal = $this->server_parse($this->socket, "220"))
+				$_retVal = $this->socket;
+			}
+			// This connection attempt failed.
+			else {
+				// @CHANGE LDR
+				if (empty($this->errstr)) $this->errstr = 'Failed to connect with fsockopen host='.$this->getHost().' port='.$this->getPort();
+				$this->_setErr($this->errno, $this->errstr);
+				$_retVal = false;
+			}
+		}
 
-        return $_retVal;
-    }
+		return $_retVal;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Attempt mail server authentication for a secure connection
-     *
-     * @return boolean|null  $_retVal   Boolean indicating success or failure of authentication
-     */
-    private function _server_authenticate()
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Attempt mail server authentication for a secure connection
+	 *
+	 * @return boolean|null  $_retVal   Boolean indicating success or failure of authentication
+	 */
+	private function _server_authenticate()
+	{
+		// phpcs:enable
+		global $conf;
 
-        // Send the RFC2554 specified EHLO.
-        // This improvment as provided by 'SirSir' to
-        // accomodate both SMTP AND ESMTP capable servers
-        $host = $this->getHost();
-        $usetls = preg_match('@tls://@i', $host);
+		// Send the RFC2554 specified EHLO.
+		// This improvment as provided by 'SirSir' to
+		// accomodate both SMTP AND ESMTP capable servers
+		$host = $this->getHost();
+		$usetls = preg_match('@tls://@i', $host);
 
-        $host = preg_replace('@tcp://@i', '', $host); // Remove prefix
-        $host = preg_replace('@ssl://@i', '', $host); // Remove prefix
-        $host = preg_replace('@tls://@i', '', $host); // Remove prefix
+		$host = preg_replace('@tcp://@i', '', $host); // Remove prefix
+		$host = preg_replace('@ssl://@i', '', $host); // Remove prefix
+		$host = preg_replace('@tls://@i', '', $host); // Remove prefix
 
-		if ($usetls && ! empty($conf->global->MAIN_SMTPS_ADD_TLS_TO_HOST_FOR_HELO)) $host = 'tls://'.$host;
+		if ($usetls && !empty($conf->global->MAIN_SMTPS_ADD_TLS_TO_HOST_FOR_HELO)) $host = 'tls://'.$host;
 
-        $hosth = $host;
+		$hosth = $host;
 
-        if (!empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
-        {
-            // If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
-            $hosth = $this->getFrom('addr');
-            $hosth = preg_replace('/^.*</', '', $hosth);
-            $hosth = preg_replace('/>.*$/', '', $hosth);
-            $hosth = preg_replace('/.*@/', '', $hosth);
-        }
+		if (!empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
+		{
+			// If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
+			$hosth = $this->getFrom('addr');
+			$hosth = preg_replace('/^.*</', '', $hosth);
+			$hosth = preg_replace('/>.*$/', '', $hosth);
+			$hosth = preg_replace('/.*@/', '', $hosth);
+		}
 
-        if ($_retVal = $this->socket_send_str('EHLO '.$hosth, '250'))
-        {
-            if ($usetls)
-            {
-                /*
+		if ($_retVal = $this->socket_send_str('EHLO '.$hosth, '250'))
+		{
+			if ($usetls)
+			{
+				/*
                 The following dialog illustrates how a client and server can start a TLS STARTTLS session
                 S: <waits for connection on TCP port 25>
                 C: <opens connection>
@@ -492,144 +492,144 @@ class SMTPs
                 S: 250 AUTH LOGIN
                 C: <continues by sending an SMTP command
                 */
-                if (!$_retVal = $this->socket_send_str('STARTTLS', 220))
-                {
-                    $this->_setErr(131, 'STARTTLS connection is not supported.');
-                    return $_retVal;
-                }
+				if (!$_retVal = $this->socket_send_str('STARTTLS', 220))
+				{
+					$this->_setErr(131, 'STARTTLS connection is not supported.');
+					return $_retVal;
+				}
 
-                // Before 5.6.7:
-                // STREAM_CRYPTO_METHOD_SSLv23_CLIENT = STREAM_CRYPTO_METHOD_SSLv2_CLIENT|STREAM_CRYPTO_METHOD_SSLv3_CLIENT
-                // STREAM_CRYPTO_METHOD_TLS_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT
-                // PHP >= 5.6.7:
-                // STREAM_CRYPTO_METHOD_SSLv23_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT
-                // STREAM_CRYPTO_METHOD_TLS_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT
+				// Before 5.6.7:
+				// STREAM_CRYPTO_METHOD_SSLv23_CLIENT = STREAM_CRYPTO_METHOD_SSLv2_CLIENT|STREAM_CRYPTO_METHOD_SSLv3_CLIENT
+				// STREAM_CRYPTO_METHOD_TLS_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT
+				// PHP >= 5.6.7:
+				// STREAM_CRYPTO_METHOD_SSLv23_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT
+				// STREAM_CRYPTO_METHOD_TLS_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT
 
-                $crypto_method = STREAM_CRYPTO_METHOD_TLS_CLIENT;
-                if (defined('STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT')) {
-                    $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
-                    $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
-                }
+				$crypto_method = STREAM_CRYPTO_METHOD_TLS_CLIENT;
+				if (defined('STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT')) {
+					$crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
+					$crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
+				}
 
-                if (!stream_socket_enable_crypto($this->socket, true, $crypto_method))
-                {
-                    $this->_setErr(132, 'STARTTLS connection failed.');
-                    return $_retVal;
-                }
-                // Most server servers expect a 2nd pass of EHLO after TLS is established to get another time
-                // the answer with list of supported AUTH methods. They may differs between non STARTTLS and with STARTTLS.
-                if (!$_retVal = $this->socket_send_str('EHLO '.$hosth, '250'))
-                {
-                    $this->_setErr(126, '"'.$hosth.'" does not support authenticated connections.');
-                    return $_retVal;
-                }
-            }
+				if (!stream_socket_enable_crypto($this->socket, true, $crypto_method))
+				{
+					$this->_setErr(132, 'STARTTLS connection failed.');
+					return $_retVal;
+				}
+				// Most server servers expect a 2nd pass of EHLO after TLS is established to get another time
+				// the answer with list of supported AUTH methods. They may differs between non STARTTLS and with STARTTLS.
+				if (!$_retVal = $this->socket_send_str('EHLO '.$hosth, '250'))
+				{
+					$this->_setErr(126, '"'.$hosth.'" does not support authenticated connections.');
+					return $_retVal;
+				}
+			}
 
 			// Default authentication method is LOGIN
 			if (empty($conf->global->MAIL_SMTP_AUTH_TYPE)) $conf->global->MAIL_SMTP_AUTH_TYPE = 'LOGIN';
 
-            // Send Authentication to Server
-            // Check for errors along the way
-            switch ($conf->global->MAIL_SMTP_AUTH_TYPE) {
-                case 'PLAIN':
-                    $this->socket_send_str('AUTH PLAIN', '334');
-                    // The error here just means the ID/password combo doesn't work.
-                    $_retVal = $this->socket_send_str(base64_encode("\0".$this->_smtpsID."\0".$this->_smtpsPW), '235');
-                    break;
-                case 'LOGIN':	// most common case
-                default:
-                    $this->socket_send_str('AUTH LOGIN', '334');
-                    // User name will not return any error, server will take anything we give it.
-                    $this->socket_send_str(base64_encode($this->_smtpsID), '334');
-                    // The error here just means the ID/password combo doesn't work.
-                    // There is not a method to determine which is the problem, ID or password
-                    $_retVal = $this->socket_send_str(base64_encode($this->_smtpsPW), '235');
-                    break;
-            }
-            if (!$_retVal) {
-                $this->_setErr(130, 'Invalid Authentication Credentials.');
+			// Send Authentication to Server
+			// Check for errors along the way
+			switch ($conf->global->MAIL_SMTP_AUTH_TYPE) {
+				case 'PLAIN':
+					$this->socket_send_str('AUTH PLAIN', '334');
+					// The error here just means the ID/password combo doesn't work.
+					$_retVal = $this->socket_send_str(base64_encode("\0".$this->_smtpsID."\0".$this->_smtpsPW), '235');
+					break;
+				case 'LOGIN':	// most common case
+				default:
+					$this->socket_send_str('AUTH LOGIN', '334');
+					// User name will not return any error, server will take anything we give it.
+					$this->socket_send_str(base64_encode($this->_smtpsID), '334');
+					// The error here just means the ID/password combo doesn't work.
+					// There is not a method to determine which is the problem, ID or password
+					$_retVal = $this->socket_send_str(base64_encode($this->_smtpsPW), '235');
+					break;
 			}
-        } else {
-            $this->_setErr(126, '"'.$host.'" does not support authenticated connections.');
-        }
+			if (!$_retVal) {
+				$this->_setErr(130, 'Invalid Authentication Credentials.');
+			}
+		} else {
+			$this->_setErr(126, '"'.$host.'" does not support authenticated connections.');
+		}
 
-        return $_retVal;
-    }
+		return $_retVal;
+	}
 
-    /**
-     * Now send the message
-     *
-     * @return boolean|null   Result
-     */
-    public function sendMsg()
-    {
-        global $conf;
+	/**
+	 * Now send the message
+	 *
+	 * @return boolean|null   Result
+	 */
+	public function sendMsg()
+	{
+		global $conf;
 
-        /**
-         * Default return value
-         */
-        $_retVal = false;
+		/**
+		 * Default return value
+		 */
+		$_retVal = false;
 
-        // Connect to Server
-        if ($this->socket = $this->_server_connect())
-        {
-            // If a User ID *and* a password is given, assume Authentication is desired
-            if (!empty($this->_smtpsID) && !empty($this->_smtpsPW))
-            {
-                // Send the RFC2554 specified EHLO.
-                $_retVal = $this->_server_authenticate();
-            }
+		// Connect to Server
+		if ($this->socket = $this->_server_connect())
+		{
+			// If a User ID *and* a password is given, assume Authentication is desired
+			if (!empty($this->_smtpsID) && !empty($this->_smtpsPW))
+			{
+				// Send the RFC2554 specified EHLO.
+				$_retVal = $this->_server_authenticate();
+			}
 
-            // This is a "normal" SMTP Server "handshack"
-            else {
-                // Send the RFC821 specified HELO.
-                $host = $this->getHost();
-                $usetls = preg_match('@tls://@i', $host);
+			// This is a "normal" SMTP Server "handshack"
+			else {
+				// Send the RFC821 specified HELO.
+				$host = $this->getHost();
+				$usetls = preg_match('@tls://@i', $host);
 
-                $host = preg_replace('@tcp://@i', '', $host); // Remove prefix
-                $host = preg_replace('@ssl://@i', '', $host); // Remove prefix
-                $host = preg_replace('@tls://@i', '', $host); // Remove prefix
+				$host = preg_replace('@tcp://@i', '', $host); // Remove prefix
+				$host = preg_replace('@ssl://@i', '', $host); // Remove prefix
+				$host = preg_replace('@tls://@i', '', $host); // Remove prefix
 
-                if ($usetls && ! empty($conf->global->MAIN_SMTPS_ADD_TLS_TO_HOST_FOR_HELO)) $host = 'tls://'.$host;
+				if ($usetls && !empty($conf->global->MAIN_SMTPS_ADD_TLS_TO_HOST_FOR_HELO)) $host = 'tls://'.$host;
 
-                $hosth = $host;
+				$hosth = $host;
 
-                if (!empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
-                {
-                    // If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
-                    $hosth = $this->getFrom('addr');
-                    $hosth = preg_replace('/^.*</', '', $hosth);
-                    $hosth = preg_replace('/>.*$/', '', $hosth);
-                    $hosth = preg_replace('/.*@/', '', $hosth);
-                }
+				if (!empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
+				{
+					// If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
+					$hosth = $this->getFrom('addr');
+					$hosth = preg_replace('/^.*</', '', $hosth);
+					$hosth = preg_replace('/>.*$/', '', $hosth);
+					$hosth = preg_replace('/.*@/', '', $hosth);
+				}
 
-                $_retVal = $this->socket_send_str('HELO '.$hosth, '250');
-            }
+				$_retVal = $this->socket_send_str('HELO '.$hosth, '250');
+			}
 
-            // Well, did we get to the server?
-            if ($_retVal)
-            {
-                // From this point onward most server response codes should be 250
-                // Specify who the mail is from....
-                // This has to be the raw email address, strip the "name" off
-                $resultmailfrom = $this->socket_send_str('MAIL FROM: '.$this->getFrom('addr'), '250');
-			    if (!$resultmailfrom) {
-			        fclose($this->socket);
-			        return false;
-			    }
+			// Well, did we get to the server?
+			if ($_retVal)
+			{
+				// From this point onward most server response codes should be 250
+				// Specify who the mail is from....
+				// This has to be the raw email address, strip the "name" off
+				$resultmailfrom = $this->socket_send_str('MAIL FROM: '.$this->getFrom('addr'), '250');
+				if (!$resultmailfrom) {
+					fclose($this->socket);
+					return false;
+				}
 
-                // 'RCPT TO:' must be given a single address, so this has to loop
-                // through the list of addresses, regardless of TO, CC or BCC
-                // and send it out "single file"
-                foreach ($this->get_RCPT_list() as $_address)
-                {
-                    /* Note:
+				// 'RCPT TO:' must be given a single address, so this has to loop
+				// through the list of addresses, regardless of TO, CC or BCC
+				// and send it out "single file"
+				foreach ($this->get_RCPT_list() as $_address)
+				{
+					/* Note:
                      * BCC email addresses must be listed in the RCPT TO command list,
                      * but the BCC header should not be printed under the DATA command.
                      * http://stackoverflow.com/questions/2750211/sending-bcc-emails-using-a-smtp-server
                      */
 
-                    /*
+					/*
                      * TODO
                      * After each 'RCPT TO:' is sent, we need to make sure it was kosher,
                      * if not, the whole message will fail
@@ -637,1233 +637,1233 @@ class SMTPs
                      * mark the last address as "bad" and start the address loop over again.
                      * If any address fails, the entire message fails.
                      */
-                    $this->socket_send_str('RCPT TO: <'.$_address.'>', '250');
-                }
-
-                // Tell the server we are ready to start sending data
-                // with any custom headers...
-                // This is the last response code we look for until the end of the message.
-                $this->socket_send_str('DATA', '354');
-
-                // Now we are ready for the message...
-                // Ok, all the ingredients are mixed in let's cook this puppy...
-                $this->socket_send_str($this->getHeader().$this->getBodyContent()."\r\n".'.', '250');
-
-                // Now tell the server we are done and close the socket...
-                fputs($this->socket, 'QUIT');
-                fclose($this->socket);
-            }
-        }
-
-        return $_retVal;
-    }
-
-    // =============================================================
-    // ** Setter & Getter methods
-
-    // ** Basic System configuration
-
-    /**
-     * setConfig() is used to populate select class properties from either
-     * a user defined INI file or the systems 'php.ini' file
-     *
-     * If a user defined INI is to be used, the files complete path is passed
-     * as the method single parameter. The INI can define any class and/or
-     * user properties. Only properties defined within this file will be setter
-     * and/or orverwritten
-     *
-     * If the systems 'php.ini' file is to be used, the method is called without
-     * parameters. In this case, only HOST, PORT and FROM properties will be set
-     * as they are the only properties that are defined within the 'php.ini'.
-     *
-     * If secure SMTP is to be used, the user ID and Password can be defined with
-     * the user INI file, but the properties are not defined with the systems
-     * 'php.ini'file, they must be defined via their setter methods
-     *
-     * This method can be called twice, if desired. Once without a parameter to
-     * load the properties as defined within the systems 'php.ini' file, and a
-     * second time, with a path to a user INI file for other properties to be
-     * defined.
-     *
-     * @param mixed $_strConfigPath path to config file or VOID
-     * @return boolean
-     */
-    public function setConfig($_strConfigPath = null)
-    {
-        /**
-         * Returns constructed SELECT Object string or boolean upon failure
-         * Default value is set at true
-         */
-        $_retVal = true;
-
-        // if we have a path...
-        if (!empty($_strConfigPath))
-        {
-            // If the path is not valid, this will NOT generate an error,
-            // it will simply return false.
-            if (!@include $_strConfigPath)
-            {
-                $this->_setErr(110, '"'.$_strConfigPath.'" is not a valid path.');
-                $_retVal = false;
-            }
-        }
-
-        // Read the Systems php.ini file
-        else {
-            // Set these properties ONLY if they are set in the php.ini file.
-            // Otherwise the default values will be used.
-            if ($_host = ini_get('SMTPs'))
-            $this->setHost($_host);
-
-            if ($_port = ini_get('smtp_port'))
-            $this->setPort($_port);
-
-            if ($_from = ini_get('sendmail_from'))
-            $this->setFrom($_from);
-        }
-
-        // Send back what we have
-        return $_retVal;
-    }
-
-    /**
-     * Determines the method inwhich the messages are to be sent.
-     * - 'sockets' [0] - conect via network to SMTP server
-     * - 'pipe     [1] - use UNIX path to EXE
-     * - 'phpmail  [2] - use the PHP built-in mail function
-     *
-     * @param int $_type  Interger value representing Mail Transport Type
-     * @return void
-     */
-    public function setTransportType($_type = 0)
-    {
-        if ((is_numeric($_type)) && (($_type >= 0) && ($_type <= 3))) {
-            $this->_transportType = $_type;
-        }
-    }
-
-    /**
-     * Return the method inwhich the message is to be sent.
-     * - 'sockets' [0] - conect via network to SMTP server
-     * - 'pipe     [1] - use UNIX path to EXE
-     * - 'phpmail  [2] - use the PHP built-in mail function
-     *
-     * @return int $_strHost Host Name or IP of the Mail Server to use
-     */
-    public function getTransportType()
-    {
-        return $this->_transportType;
-    }
-
-    /**
-     * Path to the sendmail execuable
-     *
-     * @param string $_path Path to the sendmail execuable
-     * @return boolean
-     *
-     */
-    public function setMailPath($_path)
-    {
-        // This feature is not yet implemented
-        return true;
-
-        //if ( $_path ) $this->_mailPath = $_path;
-    }
-
-    /**
-     * Defines the Host Name or IP of the Mail Server to use.
-     * This is defaulted to 'localhost'
-     * This is  used only with 'socket' based mail transmission
-     *
-     * @param 	string 	$_strHost 		Host Name or IP of the Mail Server to use
-     * @return 	void
-     */
-    public function setHost($_strHost)
-    {
-        if ($_strHost)
-        $this->_smtpsHost = $_strHost;
-    }
-
-    /**
-     * Retrieves the Host Name or IP of the Mail Server to use
-     * This is  used only with 'socket' based mail transmission
-     *
-     * @return 	string 	$_strHost 		Host Name or IP of the Mail Server to use
-     */
-    public function getHost()
-    {
-        return $this->_smtpsHost;
-    }
-
-    /**
-     * Defines the Port Number of the Mail Server to use
-     * This is defaulted to '25'
-     * This is  used only with 'socket' based mail transmission
-     *
-     * @param 	int 	$_intPort 		Port Number of the Mail Server to use
-     * @return 	void
-     */
-    public function setPort($_intPort)
-    {
-        if ((is_numeric($_intPort)) &&
-        (($_intPort >= 1) && ($_intPort <= 65536)))
-        $this->_smtpsPort = $_intPort;
-    }
-
-    /**
-     * Retrieves the Port Number of the Mail Server to use
-     * This is  used only with 'socket' based mail transmission
-     *
-     * @return 	string 		Port Number of the Mail Server to use
-     */
-    public function getPort()
-    {
-        return $this->_smtpsPort;
-    }
-
-    /**
-     * User Name for authentication on Mail Server
-     *
-     * @param 	string 	$_strID 	User Name for authentication on Mail Server
-     * @return 	void
-     */
-    public function setID($_strID)
-    {
-        $this->_smtpsID = $_strID;
-    }
-
-    /**
-     * Retrieves the User Name for authentication on Mail Server
-     *
-     * @return string 	User Name for authentication on Mail Server
-     */
-    public function getID()
-    {
-        return $this->_smtpsID;
-    }
-
-    /**
-     * User Password for authentication on Mail Server
-     *
-     * @param 	string 	$_strPW 	User Password for authentication on Mail Server
-     * @return 	void
-     */
-    public function setPW($_strPW)
-    {
-        $this->_smtpsPW = $_strPW;
-    }
-
-    /**
-     * Retrieves the User Password for authentication on Mail Server
-     *
-     * @return 	string 		User Password for authentication on Mail Server
-     */
-    public function getPW()
-    {
-        return $this->_smtpsPW;
-    }
-
-    /**
-     * Character set used for current message
-     * Character set is defaulted to 'iso-8859-1';
-     *
-     * @param string $_strCharSet Character set used for current message
-     * @return void
-     */
-    public function setCharSet($_strCharSet)
-    {
-        if ($_strCharSet)
-        $this->_smtpsCharSet = $_strCharSet;
-    }
-
-    /**
-     * Retrieves the Character set used for current message
-     *
-     * @return string $_smtpsCharSet Character set used for current message
-     */
-    public function getCharSet()
-    {
-        return $this->_smtpsCharSet;
-    }
-
-    /**
-     * Content-Transfer-Encoding, Defaulted to '7bit'
-     * This can be changed for 2byte characers sets
-     * Known Encode Types
-     *  - 7bit               Simple 7-bit ASCII
-     *  - 8bit               8-bit coding with line termination characters
-     *  - base64             3 octets encoded into 4 sextets with offset
-     *  - binary             Arbitrary binary stream
-     *  - mac-binhex40       Macintosh binary to hex encoding
-     *  - quoted-printable   Mostly 7-bit, with 8-bit characters encoded as "=HH"
-     *  - uuencode           UUENCODE encoding
-     *
-     * @param string $_strTransEncode Content-Transfer-Encoding
-     * @return void
-     */
-    public function setTransEncode($_strTransEncode)
-    {
-        if (array_search($_strTransEncode, $this->_smtpsTransEncodeTypes))
-        $this->_smtpsTransEncode = $_strTransEncode;
-    }
-
-    /**
-     * Retrieves the Content-Transfer-Encoding
-     *
-     * @return string $_smtpsTransEncode Content-Transfer-Encoding
-     */
-    public function getTransEncode()
-    {
-        return $this->_smtpsTransEncode;
-    }
-
-    /**
-     * Content-Transfer-Encoding, Defaulted to '0' [ZERO]
-     * This can be changed for 2byte characers sets
-     * Known Encode Types
-     *  - [0] 7bit               Simple 7-bit ASCII
-     *  - [1] 8bit               8-bit coding with line termination characters
-     *  - [2] base64             3 octets encoded into 4 sextets with offset
-     *  - [3] binary             Arbitrary binary stream
-     *  - [4] mac-binhex40       Macintosh binary to hex encoding
-     *  - [5] quoted-printable   Mostly 7-bit, with 8-bit characters encoded as "=HH"
-     *  - [6] uuencode           UUENCODE encoding
-     *
-     * @param string $_strTransEncodeType Content-Transfer-Encoding
-     * @return void
-     *
-     */
-    public function setTransEncodeType($_strTransEncodeType)
-    {
-        if (array_search($_strTransEncodeType, $this->_smtpsTransEncodeTypes))
-        $this->_smtpsTransEncodeType = $_strTransEncodeType;
-    }
-
-    /**
-     * Retrieves the Content-Transfer-Encoding
-     *
-     * @return 	string 		Content-Transfer-Encoding
-     */
-    public function getTransEncodeType()
-    {
-        return $this->_smtpsTransEncodeTypes[$this->_smtpsTransEncodeType];
-    }
-
-
-    // ** Message Construction
-
-    /**
-     * FROM Address from which mail will be sent
-     *
-     * @param 	string 	$_strFrom 	Address from which mail will be sent
-     * @return 	void
-     */
-    public function setFrom($_strFrom)
-    {
-        if ($_strFrom)
-        $this->_msgFrom = $this->_strip_email($_strFrom);
-    }
-
-    /**
-     * Retrieves the Address from which mail will be sent
-     *
-     * @param  	boolean $_part		To "strip" 'Real name' from address
-     * @return 	string 				Address from which mail will be sent
-     */
-    public function getFrom($_part = true)
-    {
-        $_retValue = '';
-
-        if ($_part === true)
-        $_retValue = $this->_msgFrom;
-        else $_retValue = $this->_msgFrom[$_part];
-
-        return $_retValue;
-    }
-
-    /**
-     * Reply-To Address from which mail will be the reply-to
-     *
-     * @param 	string 	$_strReplyTo 	Address from which mail will be the reply-to
-     * @return 	void
-     */
-    public function setReplyTo($_strReplyTo)
-    {
-        if ($_strReplyTo)
-            $this->_msgReplyTo = $this->_strip_email($_strReplyTo);
-    }
-
-    /**
-     * Retrieves the Address from which mail will be the reply-to
-     *
-     * @param  	boolean $_part		To "strip" 'Real name' from address
-     * @return 	string 				Address from which mail will be the reply-to
-     */
-    public function getReplyTo($_part = true)
-    {
-        $_retValue = '';
-
-        if ($_part === true)
-            $_retValue = $this->_msgReplyTo;
-        else $_retValue = $this->_msgReplyTo[$_part];
-
-        return $_retValue;
-    }
-
-    /**
-     * Inserts given addresses into structured format.
-     * This method takes a list of given addresses, via an array
-     * or a COMMA delimted string, and inserts them into a highly
-     * structured array. This array is designed to remove duplicate
-     * addresses and to sort them by Domain.
-     *
-     * @param 	string 	$_type 			TO, CC, or BCC lists to add addrresses into
-     * @param 	mixed 	$_addrList 		Array or COMMA delimited string of addresses
-     * @return void
-     *
-     */
-    private function _buildAddrList($_type, $_addrList)
-    {
-        // Pull existing list
-        $aryHost = $this->_msgRecipients;
-
-        // Only run this if we have something
-        if (!empty($_addrList))
-        {
-            // $_addrList can be a STRING or an array
-            if (is_string($_addrList))
-            {
-                // This could be a COMMA delimited string
-                if (strstr($_addrList, ','))
-                // "explode "list" into an array
-                $_addrList = explode(',', $_addrList);
-
-                // Stick it in an array
-                else $_addrList = array($_addrList);
-            }
-
-            // take the array of addresses and split them further
-            foreach ($_addrList as $_strAddr)
-            {
-                // Strip off the end '>'
-                $_strAddr = str_replace('>', '', $_strAddr);
-
-                // Seperate "Real Name" from eMail address
-                $_tmpaddr = null;
-                $_tmpaddr = explode('<', $_strAddr);
-
-                // We have a "Real Name" and eMail address
-                if (count($_tmpaddr) == 2)
-                {
-                    $_tmpHost = explode('@', $_tmpaddr[1]);
-                    $_tmpaddr[0] = trim($_tmpaddr[0], ' ">');
-                    $aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = $_tmpaddr[0];
-                }
-                // We only have an eMail address
-                else {
-                    // Strip off the beggining '<'
-                    $_strAddr = str_replace('<', '', $_strAddr);
-
-                    $_tmpHost = explode('@', $_strAddr);
-                    $_tmpHost[0] = trim($_tmpHost[0]);
-                    $_tmpHost[1] = trim($_tmpHost[1]);
-
-                    $aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = '';
-                }
-            }
-        }
-        // replace list
-        $this->_msgRecipients = $aryHost;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Returns an array of the various parts of an email address
-     * This assumes a well formed address:
-     * - "Real name" <username@domain.tld>
-     * - "Real Name" is optional
-     * - if "Real Name" does not exist, the angle brackets are optional
-     * This will split an email address into 4 or 5 parts.
-     * - $_aryEmail[org]  = orignal string
-     * - $_aryEmail[real] = "real name" - if there is one
-     * - $_aryEmail[addr] = address part "username@domain.tld"
-     * - $_aryEmail[host] = "domain.tld"
-     * - $_aryEmail[user] = "userName"
-     *
-     *	@param		string		$_strAddr		Email address
-     * 	@return 	array	 					An array of the various parts of an email address
-     */
-    private function _strip_email($_strAddr)
-    {
-        // phpcs:enable
-        // Keep the orginal
-        $_aryEmail['org'] = $_strAddr;
-
-        // Set entire string to Lower Case
-        $_strAddr = strtolower($_strAddr);
-
-        // Drop "stuff' off the end
-        $_strAddr = trim($_strAddr, ' ">');
-
-        // Seperate "Real Name" from eMail address, if we have one
-        $_tmpAry = explode('<', $_strAddr);
-
-        // Do we have a "Real name"
-        if (count($_tmpAry) == 2)
-        {
-            // We may not really have a "Real Name"
-            if ($_tmpAry[0])
-            $_aryEmail['real'] = trim($_tmpAry[0], ' ">');
-
-            $_aryEmail['addr'] = $_tmpAry[1];
-        } else $_aryEmail['addr'] = $_tmpAry[0];
-
-        // Pull User Name and Host.tld apart
-        list($_aryEmail['user'], $_aryEmail['host']) = explode('@', $_aryEmail['addr']);
-
-        // Put the brackets back around the address
-        $_aryEmail['addr'] = '<'.$_aryEmail['addr'].'>';
-
-        return $_aryEmail;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Returns an array of bares addresses for use with 'RCPT TO:'
-     * This is a "build as you go" method. Each time this method is called
-     * the underlaying array is destroyed and reconstructed.
-     *
-     * @return 		array		Returns an array of bares addresses
-     */
-    public function get_RCPT_list()
-    {
-        // phpcs:enable
-        /**
-         * An array of bares addresses for use with 'RCPT TO:'
-         */
-        $_RCPT_list = array();
-
-        // walk down Recipients array and pull just email addresses
-        foreach ($this->_msgRecipients as $_host => $_list)
-        {
-            foreach ($_list as $_subList)
-            {
-                foreach ($_subList as $_name => $_addr)
-                {
-                    // build RCPT list
-                    $_RCPT_list[] = $_name.'@'.$_host;
-                }
-            }
-        }
-
-        return $_RCPT_list;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Returns an array of addresses for a specific type; TO, CC or BCC
-     *
-     * @param 		string 	       $_which 	    Which collection of addresses to return ('to', 'cc', 'bcc')
-     * @return 		string|false 				Array of emaill address
-     */
-    public function get_email_list($_which = null)
-    {
-        // phpcs:enable
-        // We need to know which address segment to pull
-        if ($_which)
-        {
-            // Make sure we have addresses to process
-            if ($this->_msgRecipients)
-            {
-                $_RCPT_list = array();
-                // walk down Recipients array and pull just email addresses
-                foreach ($this->_msgRecipients as $_host => $_list)
-                {
-                    if ($this->_msgRecipients[$_host][$_which])
-                    {
-                        foreach ($this->_msgRecipients[$_host][$_which] as $_addr => $_realName)
-                        {
-                            if ($_realName)	// @CHANGE LDR
-                            {
-                                $_realName = '"'.$_realName.'"';
-                                $_RCPT_list[] = $_realName.' <'.$_addr.'@'.$_host.'>';
-                            } else {
-                                $_RCPT_list[] = $_addr.'@'.$_host;
-                            }
-                        }
-                    }
-                }
-
-                return implode(', ', $_RCPT_list);
-            } else {
-                $this->_setErr(101, 'No eMail Address for message to be sent to.');
-                return false;
-            }
-        } else {
-            $this->_setErr(102, 'eMail type not defined.');
-            return false;
-        }
-    }
-
-    /**
-     * TO Address[es] inwhich to send mail to
-     *
-     * @param 	string 	$_addrTo 	TO Address[es] inwhich to send mail to
-     * @return 	void
-     */
-    public function setTO($_addrTo)
-    {
-        if ($_addrTo)
-        $this->_buildAddrList('to', $_addrTo);
-    }
-
-    /**
-     * Retrieves the TO Address[es] inwhich to send mail to
-     *
-     * @return 	string 	TO Address[es] inwhich to send mail to
-     */
-    public function getTo()
-    {
-        return $this->get_email_list('to');
-    }
-
-    /**
-     * CC Address[es] inwhich to send mail to
-     *
-     * @param 	string	$_strCC		CC Address[es] inwhich to send mail to
-     * @return 	void
-     */
-    public function setCC($_strCC)
-    {
-        if ($_strCC)
-        $this->_buildAddrList('cc', $_strCC);
-    }
-
-    /**
-     * Retrieves the CC Address[es] inwhich to send mail to
-     *
-     * @return 	string 		CC Address[es] inwhich to send mail to
-     */
-    public function getCC()
-    {
-        return $this->get_email_list('cc');
-    }
-
-    /**
-     * BCC Address[es] inwhich to send mail to
-     *
-     * @param 	string		$_strBCC	Recipients BCC Address[es] inwhich to send mail to
-     * @return 	void
-     */
-    public function setBCC($_strBCC)
-    {
-        if ($_strBCC)
-        $this->_buildAddrList('bcc', $_strBCC);
-    }
-
-    /**
-     * Retrieves the BCC Address[es] inwhich to send mail to
-     *
-     * @return 	string		BCC Address[es] inwhich to send mail to
-     */
-    public function getBCC()
-    {
-        return $this->get_email_list('bcc');
-    }
-
-    /**
-     * Message Subject
-     *
-     * @param 	string 	$_strSubject	Message Subject
-     * @return 	void
-     */
-    public function setSubject($_strSubject = '')
-    {
-        if ($_strSubject)
-        $this->_msgSubject = $_strSubject;
-    }
-
-    /**
-     * Retrieves the Message Subject
-     *
-     * @return 	string 		Message Subject
-     */
-    public function getSubject()
-    {
-        return $this->_msgSubject;
-    }
-
-    /**
-     * Constructes and returns message header
-     *
-     * @return string Complete message header
-     */
-    public function getHeader()
-    {
-        global $conf;
-
-        $_header = 'From: '.$this->getFrom('org')."\r\n"
-        . 'To: '.$this->getTO()."\r\n";
-
-        if ($this->getCC())
-        $_header .= 'Cc: '.$this->getCC()."\r\n";
-
-        /* Note:
+					$this->socket_send_str('RCPT TO: <'.$_address.'>', '250');
+				}
+
+				// Tell the server we are ready to start sending data
+				// with any custom headers...
+				// This is the last response code we look for until the end of the message.
+				$this->socket_send_str('DATA', '354');
+
+				// Now we are ready for the message...
+				// Ok, all the ingredients are mixed in let's cook this puppy...
+				$this->socket_send_str($this->getHeader().$this->getBodyContent()."\r\n".'.', '250');
+
+				// Now tell the server we are done and close the socket...
+				fputs($this->socket, 'QUIT');
+				fclose($this->socket);
+			}
+		}
+
+		return $_retVal;
+	}
+
+	// =============================================================
+	// ** Setter & Getter methods
+
+	// ** Basic System configuration
+
+	/**
+	 * setConfig() is used to populate select class properties from either
+	 * a user defined INI file or the systems 'php.ini' file
+	 *
+	 * If a user defined INI is to be used, the files complete path is passed
+	 * as the method single parameter. The INI can define any class and/or
+	 * user properties. Only properties defined within this file will be setter
+	 * and/or orverwritten
+	 *
+	 * If the systems 'php.ini' file is to be used, the method is called without
+	 * parameters. In this case, only HOST, PORT and FROM properties will be set
+	 * as they are the only properties that are defined within the 'php.ini'.
+	 *
+	 * If secure SMTP is to be used, the user ID and Password can be defined with
+	 * the user INI file, but the properties are not defined with the systems
+	 * 'php.ini'file, they must be defined via their setter methods
+	 *
+	 * This method can be called twice, if desired. Once without a parameter to
+	 * load the properties as defined within the systems 'php.ini' file, and a
+	 * second time, with a path to a user INI file for other properties to be
+	 * defined.
+	 *
+	 * @param mixed $_strConfigPath path to config file or VOID
+	 * @return boolean
+	 */
+	public function setConfig($_strConfigPath = null)
+	{
+		/**
+		 * Returns constructed SELECT Object string or boolean upon failure
+		 * Default value is set at true
+		 */
+		$_retVal = true;
+
+		// if we have a path...
+		if (!empty($_strConfigPath))
+		{
+			// If the path is not valid, this will NOT generate an error,
+			// it will simply return false.
+			if (!@include $_strConfigPath)
+			{
+				$this->_setErr(110, '"'.$_strConfigPath.'" is not a valid path.');
+				$_retVal = false;
+			}
+		}
+
+		// Read the Systems php.ini file
+		else {
+			// Set these properties ONLY if they are set in the php.ini file.
+			// Otherwise the default values will be used.
+			if ($_host = ini_get('SMTPs'))
+			$this->setHost($_host);
+
+			if ($_port = ini_get('smtp_port'))
+			$this->setPort($_port);
+
+			if ($_from = ini_get('sendmail_from'))
+			$this->setFrom($_from);
+		}
+
+		// Send back what we have
+		return $_retVal;
+	}
+
+	/**
+	 * Determines the method inwhich the messages are to be sent.
+	 * - 'sockets' [0] - conect via network to SMTP server
+	 * - 'pipe     [1] - use UNIX path to EXE
+	 * - 'phpmail  [2] - use the PHP built-in mail function
+	 *
+	 * @param int $_type  Interger value representing Mail Transport Type
+	 * @return void
+	 */
+	public function setTransportType($_type = 0)
+	{
+		if ((is_numeric($_type)) && (($_type >= 0) && ($_type <= 3))) {
+			$this->_transportType = $_type;
+		}
+	}
+
+	/**
+	 * Return the method inwhich the message is to be sent.
+	 * - 'sockets' [0] - conect via network to SMTP server
+	 * - 'pipe     [1] - use UNIX path to EXE
+	 * - 'phpmail  [2] - use the PHP built-in mail function
+	 *
+	 * @return int $_strHost Host Name or IP of the Mail Server to use
+	 */
+	public function getTransportType()
+	{
+		return $this->_transportType;
+	}
+
+	/**
+	 * Path to the sendmail execuable
+	 *
+	 * @param string $_path Path to the sendmail execuable
+	 * @return boolean
+	 *
+	 */
+	public function setMailPath($_path)
+	{
+		// This feature is not yet implemented
+		return true;
+
+		//if ( $_path ) $this->_mailPath = $_path;
+	}
+
+	/**
+	 * Defines the Host Name or IP of the Mail Server to use.
+	 * This is defaulted to 'localhost'
+	 * This is  used only with 'socket' based mail transmission
+	 *
+	 * @param 	string 	$_strHost 		Host Name or IP of the Mail Server to use
+	 * @return 	void
+	 */
+	public function setHost($_strHost)
+	{
+		if ($_strHost)
+		$this->_smtpsHost = $_strHost;
+	}
+
+	/**
+	 * Retrieves the Host Name or IP of the Mail Server to use
+	 * This is  used only with 'socket' based mail transmission
+	 *
+	 * @return 	string 	$_strHost 		Host Name or IP of the Mail Server to use
+	 */
+	public function getHost()
+	{
+		return $this->_smtpsHost;
+	}
+
+	/**
+	 * Defines the Port Number of the Mail Server to use
+	 * This is defaulted to '25'
+	 * This is  used only with 'socket' based mail transmission
+	 *
+	 * @param 	int 	$_intPort 		Port Number of the Mail Server to use
+	 * @return 	void
+	 */
+	public function setPort($_intPort)
+	{
+		if ((is_numeric($_intPort)) &&
+		(($_intPort >= 1) && ($_intPort <= 65536)))
+		$this->_smtpsPort = $_intPort;
+	}
+
+	/**
+	 * Retrieves the Port Number of the Mail Server to use
+	 * This is  used only with 'socket' based mail transmission
+	 *
+	 * @return 	string 		Port Number of the Mail Server to use
+	 */
+	public function getPort()
+	{
+		return $this->_smtpsPort;
+	}
+
+	/**
+	 * User Name for authentication on Mail Server
+	 *
+	 * @param 	string 	$_strID 	User Name for authentication on Mail Server
+	 * @return 	void
+	 */
+	public function setID($_strID)
+	{
+		$this->_smtpsID = $_strID;
+	}
+
+	/**
+	 * Retrieves the User Name for authentication on Mail Server
+	 *
+	 * @return string 	User Name for authentication on Mail Server
+	 */
+	public function getID()
+	{
+		return $this->_smtpsID;
+	}
+
+	/**
+	 * User Password for authentication on Mail Server
+	 *
+	 * @param 	string 	$_strPW 	User Password for authentication on Mail Server
+	 * @return 	void
+	 */
+	public function setPW($_strPW)
+	{
+		$this->_smtpsPW = $_strPW;
+	}
+
+	/**
+	 * Retrieves the User Password for authentication on Mail Server
+	 *
+	 * @return 	string 		User Password for authentication on Mail Server
+	 */
+	public function getPW()
+	{
+		return $this->_smtpsPW;
+	}
+
+	/**
+	 * Character set used for current message
+	 * Character set is defaulted to 'iso-8859-1';
+	 *
+	 * @param string $_strCharSet Character set used for current message
+	 * @return void
+	 */
+	public function setCharSet($_strCharSet)
+	{
+		if ($_strCharSet)
+		$this->_smtpsCharSet = $_strCharSet;
+	}
+
+	/**
+	 * Retrieves the Character set used for current message
+	 *
+	 * @return string $_smtpsCharSet Character set used for current message
+	 */
+	public function getCharSet()
+	{
+		return $this->_smtpsCharSet;
+	}
+
+	/**
+	 * Content-Transfer-Encoding, Defaulted to '7bit'
+	 * This can be changed for 2byte characers sets
+	 * Known Encode Types
+	 *  - 7bit               Simple 7-bit ASCII
+	 *  - 8bit               8-bit coding with line termination characters
+	 *  - base64             3 octets encoded into 4 sextets with offset
+	 *  - binary             Arbitrary binary stream
+	 *  - mac-binhex40       Macintosh binary to hex encoding
+	 *  - quoted-printable   Mostly 7-bit, with 8-bit characters encoded as "=HH"
+	 *  - uuencode           UUENCODE encoding
+	 *
+	 * @param string $_strTransEncode Content-Transfer-Encoding
+	 * @return void
+	 */
+	public function setTransEncode($_strTransEncode)
+	{
+		if (array_search($_strTransEncode, $this->_smtpsTransEncodeTypes))
+		$this->_smtpsTransEncode = $_strTransEncode;
+	}
+
+	/**
+	 * Retrieves the Content-Transfer-Encoding
+	 *
+	 * @return string $_smtpsTransEncode Content-Transfer-Encoding
+	 */
+	public function getTransEncode()
+	{
+		return $this->_smtpsTransEncode;
+	}
+
+	/**
+	 * Content-Transfer-Encoding, Defaulted to '0' [ZERO]
+	 * This can be changed for 2byte characers sets
+	 * Known Encode Types
+	 *  - [0] 7bit               Simple 7-bit ASCII
+	 *  - [1] 8bit               8-bit coding with line termination characters
+	 *  - [2] base64             3 octets encoded into 4 sextets with offset
+	 *  - [3] binary             Arbitrary binary stream
+	 *  - [4] mac-binhex40       Macintosh binary to hex encoding
+	 *  - [5] quoted-printable   Mostly 7-bit, with 8-bit characters encoded as "=HH"
+	 *  - [6] uuencode           UUENCODE encoding
+	 *
+	 * @param string $_strTransEncodeType Content-Transfer-Encoding
+	 * @return void
+	 *
+	 */
+	public function setTransEncodeType($_strTransEncodeType)
+	{
+		if (array_search($_strTransEncodeType, $this->_smtpsTransEncodeTypes))
+		$this->_smtpsTransEncodeType = $_strTransEncodeType;
+	}
+
+	/**
+	 * Retrieves the Content-Transfer-Encoding
+	 *
+	 * @return 	string 		Content-Transfer-Encoding
+	 */
+	public function getTransEncodeType()
+	{
+		return $this->_smtpsTransEncodeTypes[$this->_smtpsTransEncodeType];
+	}
+
+
+	// ** Message Construction
+
+	/**
+	 * FROM Address from which mail will be sent
+	 *
+	 * @param 	string 	$_strFrom 	Address from which mail will be sent
+	 * @return 	void
+	 */
+	public function setFrom($_strFrom)
+	{
+		if ($_strFrom)
+		$this->_msgFrom = $this->_strip_email($_strFrom);
+	}
+
+	/**
+	 * Retrieves the Address from which mail will be sent
+	 *
+	 * @param  	boolean $_part		To "strip" 'Real name' from address
+	 * @return 	string 				Address from which mail will be sent
+	 */
+	public function getFrom($_part = true)
+	{
+		$_retValue = '';
+
+		if ($_part === true)
+		$_retValue = $this->_msgFrom;
+		else $_retValue = $this->_msgFrom[$_part];
+
+		return $_retValue;
+	}
+
+	/**
+	 * Reply-To Address from which mail will be the reply-to
+	 *
+	 * @param 	string 	$_strReplyTo 	Address from which mail will be the reply-to
+	 * @return 	void
+	 */
+	public function setReplyTo($_strReplyTo)
+	{
+		if ($_strReplyTo)
+			$this->_msgReplyTo = $this->_strip_email($_strReplyTo);
+	}
+
+	/**
+	 * Retrieves the Address from which mail will be the reply-to
+	 *
+	 * @param  	boolean $_part		To "strip" 'Real name' from address
+	 * @return 	string 				Address from which mail will be the reply-to
+	 */
+	public function getReplyTo($_part = true)
+	{
+		$_retValue = '';
+
+		if ($_part === true)
+			$_retValue = $this->_msgReplyTo;
+		else $_retValue = $this->_msgReplyTo[$_part];
+
+		return $_retValue;
+	}
+
+	/**
+	 * Inserts given addresses into structured format.
+	 * This method takes a list of given addresses, via an array
+	 * or a COMMA delimted string, and inserts them into a highly
+	 * structured array. This array is designed to remove duplicate
+	 * addresses and to sort them by Domain.
+	 *
+	 * @param 	string 	$_type 			TO, CC, or BCC lists to add addrresses into
+	 * @param 	mixed 	$_addrList 		Array or COMMA delimited string of addresses
+	 * @return void
+	 *
+	 */
+	private function _buildAddrList($_type, $_addrList)
+	{
+		// Pull existing list
+		$aryHost = $this->_msgRecipients;
+
+		// Only run this if we have something
+		if (!empty($_addrList))
+		{
+			// $_addrList can be a STRING or an array
+			if (is_string($_addrList))
+			{
+				// This could be a COMMA delimited string
+				if (strstr($_addrList, ','))
+				// "explode "list" into an array
+				$_addrList = explode(',', $_addrList);
+
+				// Stick it in an array
+				else $_addrList = array($_addrList);
+			}
+
+			// take the array of addresses and split them further
+			foreach ($_addrList as $_strAddr)
+			{
+				// Strip off the end '>'
+				$_strAddr = str_replace('>', '', $_strAddr);
+
+				// Seperate "Real Name" from eMail address
+				$_tmpaddr = null;
+				$_tmpaddr = explode('<', $_strAddr);
+
+				// We have a "Real Name" and eMail address
+				if (count($_tmpaddr) == 2)
+				{
+					$_tmpHost = explode('@', $_tmpaddr[1]);
+					$_tmpaddr[0] = trim($_tmpaddr[0], ' ">');
+					$aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = $_tmpaddr[0];
+				}
+				// We only have an eMail address
+				else {
+					// Strip off the beggining '<'
+					$_strAddr = str_replace('<', '', $_strAddr);
+
+					$_tmpHost = explode('@', $_strAddr);
+					$_tmpHost[0] = trim($_tmpHost[0]);
+					$_tmpHost[1] = trim($_tmpHost[1]);
+
+					$aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = '';
+				}
+			}
+		}
+		// replace list
+		$this->_msgRecipients = $aryHost;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Returns an array of the various parts of an email address
+	 * This assumes a well formed address:
+	 * - "Real name" <username@domain.tld>
+	 * - "Real Name" is optional
+	 * - if "Real Name" does not exist, the angle brackets are optional
+	 * This will split an email address into 4 or 5 parts.
+	 * - $_aryEmail[org]  = orignal string
+	 * - $_aryEmail[real] = "real name" - if there is one
+	 * - $_aryEmail[addr] = address part "username@domain.tld"
+	 * - $_aryEmail[host] = "domain.tld"
+	 * - $_aryEmail[user] = "userName"
+	 *
+	 *	@param		string		$_strAddr		Email address
+	 * 	@return 	array	 					An array of the various parts of an email address
+	 */
+	private function _strip_email($_strAddr)
+	{
+		// phpcs:enable
+		// Keep the orginal
+		$_aryEmail['org'] = $_strAddr;
+
+		// Set entire string to Lower Case
+		$_strAddr = strtolower($_strAddr);
+
+		// Drop "stuff' off the end
+		$_strAddr = trim($_strAddr, ' ">');
+
+		// Seperate "Real Name" from eMail address, if we have one
+		$_tmpAry = explode('<', $_strAddr);
+
+		// Do we have a "Real name"
+		if (count($_tmpAry) == 2)
+		{
+			// We may not really have a "Real Name"
+			if ($_tmpAry[0])
+			$_aryEmail['real'] = trim($_tmpAry[0], ' ">');
+
+			$_aryEmail['addr'] = $_tmpAry[1];
+		} else $_aryEmail['addr'] = $_tmpAry[0];
+
+		// Pull User Name and Host.tld apart
+		list($_aryEmail['user'], $_aryEmail['host']) = explode('@', $_aryEmail['addr']);
+
+		// Put the brackets back around the address
+		$_aryEmail['addr'] = '<'.$_aryEmail['addr'].'>';
+
+		return $_aryEmail;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Returns an array of bares addresses for use with 'RCPT TO:'
+	 * This is a "build as you go" method. Each time this method is called
+	 * the underlaying array is destroyed and reconstructed.
+	 *
+	 * @return 		array		Returns an array of bares addresses
+	 */
+	public function get_RCPT_list()
+	{
+		// phpcs:enable
+		/**
+		 * An array of bares addresses for use with 'RCPT TO:'
+		 */
+		$_RCPT_list = array();
+
+		// walk down Recipients array and pull just email addresses
+		foreach ($this->_msgRecipients as $_host => $_list)
+		{
+			foreach ($_list as $_subList)
+			{
+				foreach ($_subList as $_name => $_addr)
+				{
+					// build RCPT list
+					$_RCPT_list[] = $_name.'@'.$_host;
+				}
+			}
+		}
+
+		return $_RCPT_list;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Returns an array of addresses for a specific type; TO, CC or BCC
+	 *
+	 * @param 		string 	       $_which 	    Which collection of addresses to return ('to', 'cc', 'bcc')
+	 * @return 		string|false 				Array of emaill address
+	 */
+	public function get_email_list($_which = null)
+	{
+		// phpcs:enable
+		// We need to know which address segment to pull
+		if ($_which)
+		{
+			// Make sure we have addresses to process
+			if ($this->_msgRecipients)
+			{
+				$_RCPT_list = array();
+				// walk down Recipients array and pull just email addresses
+				foreach ($this->_msgRecipients as $_host => $_list)
+				{
+					if ($this->_msgRecipients[$_host][$_which])
+					{
+						foreach ($this->_msgRecipients[$_host][$_which] as $_addr => $_realName)
+						{
+							if ($_realName)	// @CHANGE LDR
+							{
+								$_realName = '"'.$_realName.'"';
+								$_RCPT_list[] = $_realName.' <'.$_addr.'@'.$_host.'>';
+							} else {
+								$_RCPT_list[] = $_addr.'@'.$_host;
+							}
+						}
+					}
+				}
+
+				return implode(', ', $_RCPT_list);
+			} else {
+				$this->_setErr(101, 'No eMail Address for message to be sent to.');
+				return false;
+			}
+		} else {
+			$this->_setErr(102, 'eMail type not defined.');
+			return false;
+		}
+	}
+
+	/**
+	 * TO Address[es] inwhich to send mail to
+	 *
+	 * @param 	string 	$_addrTo 	TO Address[es] inwhich to send mail to
+	 * @return 	void
+	 */
+	public function setTO($_addrTo)
+	{
+		if ($_addrTo)
+		$this->_buildAddrList('to', $_addrTo);
+	}
+
+	/**
+	 * Retrieves the TO Address[es] inwhich to send mail to
+	 *
+	 * @return 	string 	TO Address[es] inwhich to send mail to
+	 */
+	public function getTo()
+	{
+		return $this->get_email_list('to');
+	}
+
+	/**
+	 * CC Address[es] inwhich to send mail to
+	 *
+	 * @param 	string	$_strCC		CC Address[es] inwhich to send mail to
+	 * @return 	void
+	 */
+	public function setCC($_strCC)
+	{
+		if ($_strCC)
+		$this->_buildAddrList('cc', $_strCC);
+	}
+
+	/**
+	 * Retrieves the CC Address[es] inwhich to send mail to
+	 *
+	 * @return 	string 		CC Address[es] inwhich to send mail to
+	 */
+	public function getCC()
+	{
+		return $this->get_email_list('cc');
+	}
+
+	/**
+	 * BCC Address[es] inwhich to send mail to
+	 *
+	 * @param 	string		$_strBCC	Recipients BCC Address[es] inwhich to send mail to
+	 * @return 	void
+	 */
+	public function setBCC($_strBCC)
+	{
+		if ($_strBCC)
+		$this->_buildAddrList('bcc', $_strBCC);
+	}
+
+	/**
+	 * Retrieves the BCC Address[es] inwhich to send mail to
+	 *
+	 * @return 	string		BCC Address[es] inwhich to send mail to
+	 */
+	public function getBCC()
+	{
+		return $this->get_email_list('bcc');
+	}
+
+	/**
+	 * Message Subject
+	 *
+	 * @param 	string 	$_strSubject	Message Subject
+	 * @return 	void
+	 */
+	public function setSubject($_strSubject = '')
+	{
+		if ($_strSubject)
+		$this->_msgSubject = $_strSubject;
+	}
+
+	/**
+	 * Retrieves the Message Subject
+	 *
+	 * @return 	string 		Message Subject
+	 */
+	public function getSubject()
+	{
+		return $this->_msgSubject;
+	}
+
+	/**
+	 * Constructes and returns message header
+	 *
+	 * @return string Complete message header
+	 */
+	public function getHeader()
+	{
+		global $conf;
+
+		$_header = 'From: '.$this->getFrom('org')."\r\n"
+		. 'To: '.$this->getTO()."\r\n";
+
+		if ($this->getCC())
+		$_header .= 'Cc: '.$this->getCC()."\r\n";
+
+		/* Note:
          * BCC email addresses must be listed in the RCPT TO command list,
          * but the BCC header should not be printed under the DATA command.
          * So it is included into the function sendMsg() but not here.
          * http://stackoverflow.com/questions/2750211/sending-bcc-emails-using-a-smtp-server
          */
-        /*
+		/*
         if ( $this->getBCC() )
         $_header .= 'Bcc: ' . $this->getBCC()  . "\r\n";
         */
 
-        $host = dol_getprefix('email');
-
-        //NOTE: Message-ID should probably contain the username of the user who sent the msg
-        $_header .= 'Subject: '.$this->getSubject()."\r\n";
-        $_header .= 'Date: '.date("r")."\r\n";
-
-        $trackid = $this->getTrackId();
-        if ($trackid)
-        {
-            // References is kept in response and Message-ID is returned into In-Reply-To:
-            $_header .= 'Message-ID: <'.time().'.SMTPs-dolibarr-'.$trackid.'@'.$host.">\r\n";
-            $_header .= 'References: <'.time().'.SMTPs-dolibarr-'.$trackid.'@'.$host.">\r\n";
-            $_header .= 'X-Dolibarr-TRACKID: '.$trackid.'@'.$host."\r\n";
-        } else {
-            $_header .= 'Message-ID: <'.time().'.SMTPs@'.$host.">\r\n";
-        }
-        if (!empty($_SERVER['REMOTE_ADDR'])) $_header .= "X-RemoteAddr: ".$_SERVER['REMOTE_ADDR']."\r\n";
-        if ($this->getMoreInHeader())
-            $_header .= $this->getMoreInHeader(); // Value must include the "\r\n";
-
-        //$_header .=
-        //                 'Read-Receipt-To: '   . $this->getFrom( 'org' ) . "\r\n"
-        //                 'Return-Receipt-To: ' . $this->getFrom( 'org' ) . "\r\n";
-
-        if ($this->getSensitivity())
-        $_header .= 'Sensitivity: '.$this->getSensitivity()."\r\n";
-
-        if ($this->_msgPriority != 3)
-        $_header .= $this->getPriority();
-
-
-        // @CHANGE LDR
-        if ($this->getDeliveryReceipt())
-            $_header .= 'Disposition-Notification-To: '.$this->getFrom('addr')."\r\n";
-        if ($this->getErrorsTo())
-            $_header .= 'Errors-To: '.$this->getErrorsTo('addr')."\r\n";
-        if ($this->getReplyTo())
-            $_header .= "Reply-To: ".$this->getReplyTo('addr')."\r\n";
-
-        $_header .= 'X-Mailer: Dolibarr version '.DOL_VERSION.' (using SMTPs Mailer)'."\r\n";
-        $_header .= 'X-Dolibarr-Option: '.($conf->global->MAIN_MAIL_USE_MULTI_PART ? 'MAIN_MAIL_USE_MULTI_PART' : 'No MAIN_MAIL_USE_MULTI_PART')."\r\n";
-        $_header .= 'Mime-Version: 1.0'."\r\n";
-
-
-        return $_header;
-    }
-
-    /**
-     * Message Content
-     *
-     * @param 	string 	$strContent		Message Content
-     * @param	string	$strType		Type
-     * @return 	void
-     */
-    public function setBodyContent($strContent, $strType = 'plain')
-    {
-        //if ( $strContent )
-        //{
-        if ($strType == 'html')
-        $strMimeType = 'text/html';
-        else $strMimeType = 'text/plain';
-
-        // Make RFC821 Compliant, replace bare linefeeds
-        $strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $strContent);
-
-        $strContentAltText = '';
-        if ($strType == 'html')
-        {
-        	// Similar code to forge a text from html is also in CMailFile.class.php
-        	$strContentAltText = preg_replace('/<head><title>.*<\/style><\/head>/', '', $strContent);
-        	$strContentAltText = preg_replace("/<br\s*[^>]*>/", " ", $strContentAltText);
-        	$strContentAltText = html_entity_decode(strip_tags($strContentAltText));
-            $strContentAltText = trim(wordwrap($strContentAltText, 75, "\r\n"));
-        }
-
-        // Make RFC2045 Compliant
-        //$strContent = rtrim(chunk_split($strContent));    // Function chunck_split seems ko if not used on a base64 content
-        $strContent = rtrim(wordwrap($strContent, 75, "\r\n")); // TODO Using this method creates unexpected line break on text/plain content.
-
-        $this->_msgContent[$strType] = array();
-
-        $this->_msgContent[$strType]['mimeType'] = $strMimeType;
-        $this->_msgContent[$strType]['data']     = $strContent;
-        $this->_msgContent[$strType]['dataText'] = $strContentAltText;
-
-        if ($this->getMD5flag())
-        $this->_msgContent[$strType]['md5']      = dol_hash($strContent, 3);
-        //}
-    }
-
-    /**
-     * Retrieves the Message Content
-     *
-     * @return 	string			Message Content
-     */
-    public function getBodyContent()
-    {
-        global $conf;
-
-        // Generate a new Boundary string
-        $this->_setBoundary();
-
-        // What type[s] of content do we have
-        $_types = array_keys($this->_msgContent);
-
-        // How many content types do we have
-        $keyCount = count($_types);
-
-        // If we have ZERO, we have a problem
-        if ($keyCount === 0)
-        die("Sorry, no content");
-
-        // If we have ONE, we can use the simple format
-        elseif ($keyCount === 1 && empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
-        {
-            $_msgData = $this->_msgContent;
-            $_msgData = $_msgData[$_types[0]];
-
-            $content = 'Content-Type: '.$_msgData['mimeType'].'; charset="'.$this->getCharSet().'"'."\r\n"
-            . 'Content-Transfer-Encoding: '.$this->getTransEncodeType()."\r\n"
-            . 'Content-Disposition: inline'."\r\n"
-            . 'Content-Description: Message'."\r\n";
-
-            if ($this->getMD5flag())
-            $content .= 'Content-MD5: '.$_msgData['md5']."\r\n";
-
-            $content .= "\r\n"
-            .  $_msgData['data']."\r\n";
-        }
-
-        // If we have more than ONE, we use the multi-part format
-        elseif ($keyCount >= 1 || !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
-        {
-            // Since this is an actual multi-part message
-            // We need to define a content message Boundary
-            // NOTE: This was 'multipart/alternative', but Windows based mail servers have issues with this.
-
-            //$content = 'Content-Type: multipart/related; boundary="' . $this->_getBoundary() . '"'   . "\r\n";
-            $content = 'Content-Type: multipart/mixed; boundary="'.$this->_getBoundary('mixed').'"'."\r\n";
-
-            //                     . "\r\n"
-            //                     . 'This is a multi-part message in MIME format.' . "\r\n";
-            $content .= "Content-Transfer-Encoding: 8bit\r\n";
-            $content .= "\r\n";
-
-            $content .= "--".$this->_getBoundary('mixed')."\r\n";
-
-            if (key_exists('image', $this->_msgContent))     // If inline image found
-            {
-                $content .= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"'."\r\n";
-                $content .= "\r\n";
-                $content .= "--".$this->_getBoundary('alternative')."\r\n";
-            }
-
-
-            // $this->_msgContent must be sorted with key 'text' or 'html' first then 'image' then 'attachment'
-
-
-            // Loop through message content array
-            foreach ($this->_msgContent as $type => $_content)
-            {
-                if ($type == 'attachment')
-                {
-                    // loop through all attachments
-                    foreach ($_content as $_file => $_data)
-                    {
-                        $content .= "--".$this->_getBoundary('mixed')."\r\n"
-                        .  'Content-Disposition: attachment; filename="'.$_data['fileName'].'"'."\r\n"
-                        .  'Content-Type: '.$_data['mimeType'].'; name="'.$_data['fileName'].'"'."\r\n"
-                        .  'Content-Transfer-Encoding: base64'."\r\n"
-                        .  'Content-Description: '.$_data['fileName']."\r\n";
-
-                        if ($this->getMD5flag())
-                        $content .= 'Content-MD5: '.$_data['md5']."\r\n";
-
-                        $content .= "\r\n".$_data['data']."\r\n\r\n";
-                    }
-                }
-                // @CHANGE LDR
-                elseif ($type == 'image')
-                {
-                    // loop through all images
-                    foreach ($_content as $_image => $_data)
-                    {
-                        $content .= "--".$this->_getBoundary('related')."\r\n"; // always related for an inline image
-
-                        $content .= 'Content-Type: '.$_data['mimeType'].'; name="'.$_data['imageName'].'"'."\r\n"
-                        .  'Content-Transfer-Encoding: base64'."\r\n"
-                        .  'Content-Disposition: inline; filename="'.$_data['imageName'].'"'."\r\n"
-                        .  'Content-ID: <'.$_data['cid'].'> '."\r\n";
-
-                        if ($this->getMD5flag())
-                        $content .= 'Content-MD5: '.$_data['md5']."\r\n";
-
-                        $content .= "\r\n"
-                        . $_data['data']."\r\n";
-                    }
-
-                    // always end related and end alternative after inline images
-                    $content .= "--".$this->_getBoundary('related')."--\r\n";
-                    $content .= "\r\n--".$this->_getBoundary('alternative')."--\r\n";
-                    $content .= "\r\n";
-                } else {
-                    if (key_exists('image', $this->_msgContent))
-                    {
-                        $content .= "Content-Type: text/plain; charset=".$this->getCharSet()."\r\n";
-                        $content .= "\r\n".($_content['dataText'] ? $_content['dataText'] : strip_tags($_content['data']))."\r\n"; // Add plain text message
-                        $content .= "--".$this->_getBoundary('alternative')."\r\n";
-                        $content .= 'Content-Type: multipart/related; boundary="'.$this->_getBoundary('related').'"'."\r\n";
-                        $content .= "\r\n";
-                        $content .= "--".$this->_getBoundary('related')."\r\n";
-                    }
-
-                    if (!key_exists('image', $this->_msgContent) && $_content['dataText'] && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part before html part
-                    {
-                        $content .= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"'."\r\n";
-                        $content .= "\r\n";
-                           $content .= "--".$this->_getBoundary('alternative')."\r\n";
-
-                           $content .= "Content-Type: text/plain; charset=".$this->getCharSet()."\r\n";
-                           $content .= "\r\n".$_content['dataText']."\r\n";
-                           $content .= "--".$this->_getBoundary('alternative')."\r\n";
-                    }
-
-                    $content .= 'Content-Type: '.$_content['mimeType'].'; charset='.$this->getCharSet();
-
-                    $content .= "\r\n";
-
-                    if ($this->getMD5flag()) {
-                    	$content .= 'Content-MD5: '.$_content['md5']."\r\n";
-                    }
-
-                    $content .= "\r\n".$_content['data']."\r\n";
-
-                    if (!key_exists('image', $this->_msgContent) && $_content['dataText'] && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part after html part
-                    {
-                        $content .= "--".$this->_getBoundary('alternative')."--\r\n";
-                    }
-
-                    $content .= "\r\n";
-                }
-            }
-
-            $content .= "--".$this->_getBoundary('mixed').'--'."\r\n";
-        }
-
-        return $content;
-    }
-
-    /**
-     * File attachments are added to the content array as sub-arrays,
-     * allowing for multiple attachments for each outbound email
-     *
-     * @param string $strContent  File data to attach to message
-     * @param string $strFileName File Name to give to attachment
-     * @param string $strMimeType File Mime Type of attachment
-     * @return void
-     */
-    public function setAttachment($strContent, $strFileName = 'unknown', $strMimeType = 'unknown')
-    {
-        if ($strContent)
-        {
-            $strContent = rtrim(chunk_split(base64_encode($strContent), 76, "\r\n")); // 76 max is defined into http://tools.ietf.org/html/rfc2047
-
-            $this->_msgContent['attachment'][$strFileName]['mimeType'] = $strMimeType;
-            $this->_msgContent['attachment'][$strFileName]['fileName'] = $strFileName;
-            $this->_msgContent['attachment'][$strFileName]['data']     = $strContent;
-
-            if ($this->getMD5flag())
-            $this->_msgContent['attachment'][$strFileName]['md5']      = dol_hash($strContent, 3);
-        }
-    }
-
-
-    // @CHANGE LDR
-
-    /**
-     * Image attachments are added to the content array as sub-arrays,
-     * allowing for multiple images for each outbound email
-     *
-     * @param 	string $strContent  	Image data to attach to message
-     * @param 	string $strImageName 	Image Name to give to attachment
-     * @param 	string $strMimeType 	Image Mime Type of attachment
-     * @param 	string $strImageCid		CID
-     * @return 	void
-     */
-    public function setImageInline($strContent, $strImageName = 'unknown', $strMimeType = 'unknown', $strImageCid = 'unknown')
-    {
-        if ($strContent)
-        {
-            $this->_msgContent['image'][$strImageName]['mimeType'] = $strMimeType;
-            $this->_msgContent['image'][$strImageName]['imageName'] = $strImageName;
-            $this->_msgContent['image'][$strImageName]['cid']      = $strImageCid;
-            $this->_msgContent['image'][$strImageName]['data']     = $strContent;
-
-            if ($this->getMD5flag())
-            $this->_msgContent['image'][$strImageName]['md5']      = dol_hash($strContent, 3);
-        }
-    }
-    // END @CHANGE LDR
-
-
-    /**
-     * Message Content Sensitivity
-     * Message Sensitivity values:
-     *   - [0] None - default
-     *   - [1] Personal
-     *   - [2] Private
-     *   - [3] Company Confidential
-     *
-     * @param 	integer	$_value		Message Sensitivity
-     * @return 	void
-     */
-    public function setSensitivity($_value = 0)
-    {
-        if ((is_numeric($_value)) &&
-        (($_value >= 0) && ($_value <= 3)))
-        $this->_msgSensitivity = $_value;
-    }
-
-    /**
-     * Returns Message Content Sensitivity string
-     * Message Sensitivity values:
-     *   - [0] None - default
-     *   - [1] Personal
-     *   - [2] Private
-     *   - [3] Company Confidential
-     *
-     * @return 	void
-     */
-    public function getSensitivity()
-    {
-        return $this->_arySensitivity[$this->_msgSensitivity];
-    }
-
-    /**
-     * Message Content Priority
-     * Message Priority values:
-     *  - [0] 'Bulk'
-     *  - [1] 'Highest'
-     *  - [2] 'High'
-     *  - [3] 'Normal' - default
-     *  - [4] 'Low'
-     *  - [5] 'Lowest'
-     *
-     * @param 	integer 	$_value 	Message Priority
-     * @return 	void
-     */
-    public function setPriority($_value = 3)
-    {
-        if ((is_numeric($_value)) &&
-        (($_value >= 0) && ($_value <= 5)))
-        $this->_msgPriority = $_value;
-    }
-
-    /**
-     * Message Content Priority
-     * Message Priority values:
-     *  - [0] 'Bulk'
-     *  - [1] 'Highest'
-     *  - [2] 'High'
-     *  - [3] 'Normal' - default
-     *  - [4] 'Low'
-     *  - [5] 'Lowest'
-     *
-     * @return string
-     */
-    public function getPriority()
-    {
-        return 'Importance: '.$this->_aryPriority[$this->_msgPriority]."\r\n"
-        . 'Priority: '.$this->_aryPriority[$this->_msgPriority]."\r\n"
-        . 'X-Priority: '.$this->_msgPriority.' ('.$this->_aryPriority[$this->_msgPriority].')'."\r\n";
-    }
-
-    /**
-     * Set flag which determines whether to calculate message MD5 checksum.
-     *
-     * @param 	string 	$_flag		Message Priority
-     * @return 	void
-     */
-    public function setMD5flag($_flag = false)
-    {
-        $this->_smtpMD5 = $_flag;
-    }
-
-    /**
-     * Gets flag which determines whether to calculate message MD5 checksum.
-     *
-     * @return 	boolean 				Message Priority
-     */
-    public function getMD5flag()
-    {
-        return $this->_smtpMD5;
-    }
-
-    /**
-     * Message X-Header Content
-     * This is a simple "insert". Whatever is given will be placed
-     * "as is" into the Xheader array.
-     *
-     * @param string $strXdata Message X-Header Content
-     * @return void
-     */
-    public function setXheader($strXdata)
-    {
-        if ($strXdata)
-        $this->_msgXheader[] = $strXdata;
-    }
-
-    /**
-     * Retrieves the Message X-Header Content
-     *
-     * @return string[] $_msgContent Message X-Header Content
-     */
-    public function getXheader()
-    {
-        return $this->_msgXheader;
-    }
-
-    /**
-     * Generates Random string for MIME message Boundary
-     *
-     * @return void
-     */
-    private function _setBoundary()
-    {
-        $this->_smtpsBoundary = "multipart_x.".time().".x_boundary";
-        $this->_smtpsRelatedBoundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3);
-        $this->_smtpsAlternativeBoundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3);
-    }
-
-    /**
-     * Retrieves the MIME message Boundary
-     *
-     * @param  string $type				Type of boundary
-     * @return string $_smtpsBoundary 	MIME message Boundary
-     */
-    private function _getBoundary($type = 'mixed')
-    {
-        if ($type == 'mixed') return $this->_smtpsBoundary;
-        elseif ($type == 'related') return $this->_smtpsRelatedBoundary;
-        elseif ($type == 'alternative') return $this->_smtpsAlternativeBoundary;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * This function has been modified as provided by SirSir to allow multiline responses when
-     * using SMTP Extensions
-     *
-     * @param	resource    $socket			Socket handler
-     * @param	string		$response		Response. Example: "550 5.7.1  https://support.google.com/a/answer/6140680#invalidcred j21sm814390wre.3"
-     * @return	boolean						True or false
-     */
-    public function server_parse($socket, $response)
-    {
-        // phpcs:enable
-        /**
-         * Returns constructed SELECT Object string or boolean upon failure
-         * Default value is set at true
-         */
-        $_retVal = true;
-
-        $server_response = '';
-
-        // avoid infinite loop
-        $limit = 0;
-
-        while (substr($server_response, 3, 1) != ' ' && $limit < 100)
-        {
-            if (!($server_response = fgets($socket, 256)))
-            {
-                $this->_setErr(121, "Couldn't get mail server response codes");
-                $_retVal = false;
-                break;
-            }
+		$host = dol_getprefix('email');
+
+		//NOTE: Message-ID should probably contain the username of the user who sent the msg
+		$_header .= 'Subject: '.$this->getSubject()."\r\n";
+		$_header .= 'Date: '.date("r")."\r\n";
+
+		$trackid = $this->getTrackId();
+		if ($trackid)
+		{
+			// References is kept in response and Message-ID is returned into In-Reply-To:
+			$_header .= 'Message-ID: <'.time().'.SMTPs-dolibarr-'.$trackid.'@'.$host.">\r\n";
+			$_header .= 'References: <'.time().'.SMTPs-dolibarr-'.$trackid.'@'.$host.">\r\n";
+			$_header .= 'X-Dolibarr-TRACKID: '.$trackid.'@'.$host."\r\n";
+		} else {
+			$_header .= 'Message-ID: <'.time().'.SMTPs@'.$host.">\r\n";
+		}
+		if (!empty($_SERVER['REMOTE_ADDR'])) $_header .= "X-RemoteAddr: ".$_SERVER['REMOTE_ADDR']."\r\n";
+		if ($this->getMoreInHeader())
+			$_header .= $this->getMoreInHeader(); // Value must include the "\r\n";
+
+		//$_header .=
+		//                 'Read-Receipt-To: '   . $this->getFrom( 'org' ) . "\r\n"
+		//                 'Return-Receipt-To: ' . $this->getFrom( 'org' ) . "\r\n";
+
+		if ($this->getSensitivity())
+		$_header .= 'Sensitivity: '.$this->getSensitivity()."\r\n";
+
+		if ($this->_msgPriority != 3)
+		$_header .= $this->getPriority();
+
+
+		// @CHANGE LDR
+		if ($this->getDeliveryReceipt())
+			$_header .= 'Disposition-Notification-To: '.$this->getFrom('addr')."\r\n";
+		if ($this->getErrorsTo())
+			$_header .= 'Errors-To: '.$this->getErrorsTo('addr')."\r\n";
+		if ($this->getReplyTo())
+			$_header .= "Reply-To: ".$this->getReplyTo('addr')."\r\n";
+
+		$_header .= 'X-Mailer: Dolibarr version '.DOL_VERSION.' (using SMTPs Mailer)'."\r\n";
+		$_header .= 'X-Dolibarr-Option: '.($conf->global->MAIN_MAIL_USE_MULTI_PART ? 'MAIN_MAIL_USE_MULTI_PART' : 'No MAIN_MAIL_USE_MULTI_PART')."\r\n";
+		$_header .= 'Mime-Version: 1.0'."\r\n";
+
+
+		return $_header;
+	}
+
+	/**
+	 * Message Content
+	 *
+	 * @param 	string 	$strContent		Message Content
+	 * @param	string	$strType		Type
+	 * @return 	void
+	 */
+	public function setBodyContent($strContent, $strType = 'plain')
+	{
+		//if ( $strContent )
+		//{
+		if ($strType == 'html')
+		$strMimeType = 'text/html';
+		else $strMimeType = 'text/plain';
+
+		// Make RFC821 Compliant, replace bare linefeeds
+		$strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $strContent);
+
+		$strContentAltText = '';
+		if ($strType == 'html')
+		{
+			// Similar code to forge a text from html is also in CMailFile.class.php
+			$strContentAltText = preg_replace('/<head><title>.*<\/style><\/head>/', '', $strContent);
+			$strContentAltText = preg_replace("/<br\s*[^>]*>/", " ", $strContentAltText);
+			$strContentAltText = html_entity_decode(strip_tags($strContentAltText));
+			$strContentAltText = trim(wordwrap($strContentAltText, 75, "\r\n"));
+		}
+
+		// Make RFC2045 Compliant
+		//$strContent = rtrim(chunk_split($strContent));    // Function chunck_split seems ko if not used on a base64 content
+		$strContent = rtrim(wordwrap($strContent, 75, "\r\n")); // TODO Using this method creates unexpected line break on text/plain content.
+
+		$this->_msgContent[$strType] = array();
+
+		$this->_msgContent[$strType]['mimeType'] = $strMimeType;
+		$this->_msgContent[$strType]['data']     = $strContent;
+		$this->_msgContent[$strType]['dataText'] = $strContentAltText;
+
+		if ($this->getMD5flag())
+		$this->_msgContent[$strType]['md5']      = dol_hash($strContent, 3);
+		//}
+	}
+
+	/**
+	 * Retrieves the Message Content
+	 *
+	 * @return 	string			Message Content
+	 */
+	public function getBodyContent()
+	{
+		global $conf;
+
+		// Generate a new Boundary string
+		$this->_setBoundary();
+
+		// What type[s] of content do we have
+		$_types = array_keys($this->_msgContent);
+
+		// How many content types do we have
+		$keyCount = count($_types);
+
+		// If we have ZERO, we have a problem
+		if ($keyCount === 0)
+		die("Sorry, no content");
+
+		// If we have ONE, we can use the simple format
+		elseif ($keyCount === 1 && empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
+		{
+			$_msgData = $this->_msgContent;
+			$_msgData = $_msgData[$_types[0]];
+
+			$content = 'Content-Type: '.$_msgData['mimeType'].'; charset="'.$this->getCharSet().'"'."\r\n"
+			. 'Content-Transfer-Encoding: '.$this->getTransEncodeType()."\r\n"
+			. 'Content-Disposition: inline'."\r\n"
+			. 'Content-Description: Message'."\r\n";
+
+			if ($this->getMD5flag())
+			$content .= 'Content-MD5: '.$_msgData['md5']."\r\n";
+
+			$content .= "\r\n"
+			.  $_msgData['data']."\r\n";
+		}
+
+		// If we have more than ONE, we use the multi-part format
+		elseif ($keyCount >= 1 || !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
+		{
+			// Since this is an actual multi-part message
+			// We need to define a content message Boundary
+			// NOTE: This was 'multipart/alternative', but Windows based mail servers have issues with this.
+
+			//$content = 'Content-Type: multipart/related; boundary="' . $this->_getBoundary() . '"'   . "\r\n";
+			$content = 'Content-Type: multipart/mixed; boundary="'.$this->_getBoundary('mixed').'"'."\r\n";
+
+			//                     . "\r\n"
+			//                     . 'This is a multi-part message in MIME format.' . "\r\n";
+			$content .= "Content-Transfer-Encoding: 8bit\r\n";
+			$content .= "\r\n";
+
+			$content .= "--".$this->_getBoundary('mixed')."\r\n";
+
+			if (key_exists('image', $this->_msgContent))     // If inline image found
+			{
+				$content .= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"'."\r\n";
+				$content .= "\r\n";
+				$content .= "--".$this->_getBoundary('alternative')."\r\n";
+			}
+
+
+			// $this->_msgContent must be sorted with key 'text' or 'html' first then 'image' then 'attachment'
+
+
+			// Loop through message content array
+			foreach ($this->_msgContent as $type => $_content)
+			{
+				if ($type == 'attachment')
+				{
+					// loop through all attachments
+					foreach ($_content as $_file => $_data)
+					{
+						$content .= "--".$this->_getBoundary('mixed')."\r\n"
+						.  'Content-Disposition: attachment; filename="'.$_data['fileName'].'"'."\r\n"
+						.  'Content-Type: '.$_data['mimeType'].'; name="'.$_data['fileName'].'"'."\r\n"
+						.  'Content-Transfer-Encoding: base64'."\r\n"
+						.  'Content-Description: '.$_data['fileName']."\r\n";
+
+						if ($this->getMD5flag())
+						$content .= 'Content-MD5: '.$_data['md5']."\r\n";
+
+						$content .= "\r\n".$_data['data']."\r\n\r\n";
+					}
+				}
+				// @CHANGE LDR
+				elseif ($type == 'image')
+				{
+					// loop through all images
+					foreach ($_content as $_image => $_data)
+					{
+						$content .= "--".$this->_getBoundary('related')."\r\n"; // always related for an inline image
+
+						$content .= 'Content-Type: '.$_data['mimeType'].'; name="'.$_data['imageName'].'"'."\r\n"
+						.  'Content-Transfer-Encoding: base64'."\r\n"
+						.  'Content-Disposition: inline; filename="'.$_data['imageName'].'"'."\r\n"
+						.  'Content-ID: <'.$_data['cid'].'> '."\r\n";
+
+						if ($this->getMD5flag())
+						$content .= 'Content-MD5: '.$_data['md5']."\r\n";
+
+						$content .= "\r\n"
+						. $_data['data']."\r\n";
+					}
+
+					// always end related and end alternative after inline images
+					$content .= "--".$this->_getBoundary('related')."--\r\n";
+					$content .= "\r\n--".$this->_getBoundary('alternative')."--\r\n";
+					$content .= "\r\n";
+				} else {
+					if (key_exists('image', $this->_msgContent))
+					{
+						$content .= "Content-Type: text/plain; charset=".$this->getCharSet()."\r\n";
+						$content .= "\r\n".($_content['dataText'] ? $_content['dataText'] : strip_tags($_content['data']))."\r\n"; // Add plain text message
+						$content .= "--".$this->_getBoundary('alternative')."\r\n";
+						$content .= 'Content-Type: multipart/related; boundary="'.$this->_getBoundary('related').'"'."\r\n";
+						$content .= "\r\n";
+						$content .= "--".$this->_getBoundary('related')."\r\n";
+					}
+
+					if (!key_exists('image', $this->_msgContent) && $_content['dataText'] && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part before html part
+					{
+						$content .= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"'."\r\n";
+						$content .= "\r\n";
+						   $content .= "--".$this->_getBoundary('alternative')."\r\n";
+
+						   $content .= "Content-Type: text/plain; charset=".$this->getCharSet()."\r\n";
+						   $content .= "\r\n".$_content['dataText']."\r\n";
+						   $content .= "--".$this->_getBoundary('alternative')."\r\n";
+					}
+
+					$content .= 'Content-Type: '.$_content['mimeType'].'; charset='.$this->getCharSet();
+
+					$content .= "\r\n";
+
+					if ($this->getMD5flag()) {
+						$content .= 'Content-MD5: '.$_content['md5']."\r\n";
+					}
+
+					$content .= "\r\n".$_content['data']."\r\n";
+
+					if (!key_exists('image', $this->_msgContent) && $_content['dataText'] && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part after html part
+					{
+						$content .= "--".$this->_getBoundary('alternative')."--\r\n";
+					}
+
+					$content .= "\r\n";
+				}
+			}
+
+			$content .= "--".$this->_getBoundary('mixed').'--'."\r\n";
+		}
+
+		return $content;
+	}
+
+	/**
+	 * File attachments are added to the content array as sub-arrays,
+	 * allowing for multiple attachments for each outbound email
+	 *
+	 * @param string $strContent  File data to attach to message
+	 * @param string $strFileName File Name to give to attachment
+	 * @param string $strMimeType File Mime Type of attachment
+	 * @return void
+	 */
+	public function setAttachment($strContent, $strFileName = 'unknown', $strMimeType = 'unknown')
+	{
+		if ($strContent)
+		{
+			$strContent = rtrim(chunk_split(base64_encode($strContent), 76, "\r\n")); // 76 max is defined into http://tools.ietf.org/html/rfc2047
+
+			$this->_msgContent['attachment'][$strFileName]['mimeType'] = $strMimeType;
+			$this->_msgContent['attachment'][$strFileName]['fileName'] = $strFileName;
+			$this->_msgContent['attachment'][$strFileName]['data']     = $strContent;
+
+			if ($this->getMD5flag())
+			$this->_msgContent['attachment'][$strFileName]['md5']      = dol_hash($strContent, 3);
+		}
+	}
+
+
+	// @CHANGE LDR
+
+	/**
+	 * Image attachments are added to the content array as sub-arrays,
+	 * allowing for multiple images for each outbound email
+	 *
+	 * @param 	string $strContent  	Image data to attach to message
+	 * @param 	string $strImageName 	Image Name to give to attachment
+	 * @param 	string $strMimeType 	Image Mime Type of attachment
+	 * @param 	string $strImageCid		CID
+	 * @return 	void
+	 */
+	public function setImageInline($strContent, $strImageName = 'unknown', $strMimeType = 'unknown', $strImageCid = 'unknown')
+	{
+		if ($strContent)
+		{
+			$this->_msgContent['image'][$strImageName]['mimeType'] = $strMimeType;
+			$this->_msgContent['image'][$strImageName]['imageName'] = $strImageName;
+			$this->_msgContent['image'][$strImageName]['cid']      = $strImageCid;
+			$this->_msgContent['image'][$strImageName]['data']     = $strContent;
+
+			if ($this->getMD5flag())
+			$this->_msgContent['image'][$strImageName]['md5']      = dol_hash($strContent, 3);
+		}
+	}
+	// END @CHANGE LDR
+
+
+	/**
+	 * Message Content Sensitivity
+	 * Message Sensitivity values:
+	 *   - [0] None - default
+	 *   - [1] Personal
+	 *   - [2] Private
+	 *   - [3] Company Confidential
+	 *
+	 * @param 	integer	$_value		Message Sensitivity
+	 * @return 	void
+	 */
+	public function setSensitivity($_value = 0)
+	{
+		if ((is_numeric($_value)) &&
+		(($_value >= 0) && ($_value <= 3)))
+		$this->_msgSensitivity = $_value;
+	}
+
+	/**
+	 * Returns Message Content Sensitivity string
+	 * Message Sensitivity values:
+	 *   - [0] None - default
+	 *   - [1] Personal
+	 *   - [2] Private
+	 *   - [3] Company Confidential
+	 *
+	 * @return 	string|boolean
+	 */
+	public function getSensitivity()
+	{
+		return $this->_arySensitivity[$this->_msgSensitivity];
+	}
+
+	/**
+	 * Message Content Priority
+	 * Message Priority values:
+	 *  - [0] 'Bulk'
+	 *  - [1] 'Highest'
+	 *  - [2] 'High'
+	 *  - [3] 'Normal' - default
+	 *  - [4] 'Low'
+	 *  - [5] 'Lowest'
+	 *
+	 * @param 	integer 	$_value 	Message Priority
+	 * @return 	void
+	 */
+	public function setPriority($_value = 3)
+	{
+		if ((is_numeric($_value)) &&
+		(($_value >= 0) && ($_value <= 5)))
+		$this->_msgPriority = $_value;
+	}
+
+	/**
+	 * Message Content Priority
+	 * Message Priority values:
+	 *  - [0] 'Bulk'
+	 *  - [1] 'Highest'
+	 *  - [2] 'High'
+	 *  - [3] 'Normal' - default
+	 *  - [4] 'Low'
+	 *  - [5] 'Lowest'
+	 *
+	 * @return string
+	 */
+	public function getPriority()
+	{
+		return 'Importance: '.$this->_aryPriority[$this->_msgPriority]."\r\n"
+		. 'Priority: '.$this->_aryPriority[$this->_msgPriority]."\r\n"
+		. 'X-Priority: '.$this->_msgPriority.' ('.$this->_aryPriority[$this->_msgPriority].')'."\r\n";
+	}
+
+	/**
+	 * Set flag which determines whether to calculate message MD5 checksum.
+	 *
+	 * @param 	string 	$_flag		Message Priority
+	 * @return 	void
+	 */
+	public function setMD5flag($_flag = false)
+	{
+		$this->_smtpMD5 = $_flag;
+	}
+
+	/**
+	 * Gets flag which determines whether to calculate message MD5 checksum.
+	 *
+	 * @return 	boolean 				Message Priority
+	 */
+	public function getMD5flag()
+	{
+		return $this->_smtpMD5;
+	}
+
+	/**
+	 * Message X-Header Content
+	 * This is a simple "insert". Whatever is given will be placed
+	 * "as is" into the Xheader array.
+	 *
+	 * @param string $strXdata Message X-Header Content
+	 * @return void
+	 */
+	public function setXheader($strXdata)
+	{
+		if ($strXdata)
+		$this->_msgXheader[] = $strXdata;
+	}
+
+	/**
+	 * Retrieves the Message X-Header Content
+	 *
+	 * @return string[] $_msgContent Message X-Header Content
+	 */
+	public function getXheader()
+	{
+		return $this->_msgXheader;
+	}
+
+	/**
+	 * Generates Random string for MIME message Boundary
+	 *
+	 * @return void
+	 */
+	private function _setBoundary()
+	{
+		$this->_smtpsBoundary = "multipart_x.".time().".x_boundary";
+		$this->_smtpsRelatedBoundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3);
+		$this->_smtpsAlternativeBoundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3);
+	}
+
+	/**
+	 * Retrieves the MIME message Boundary
+	 *
+	 * @param  string $type				Type of boundary
+	 * @return string $_smtpsBoundary 	MIME message Boundary
+	 */
+	private function _getBoundary($type = 'mixed')
+	{
+		if ($type == 'mixed') return $this->_smtpsBoundary;
+		elseif ($type == 'related') return $this->_smtpsRelatedBoundary;
+		elseif ($type == 'alternative') return $this->_smtpsAlternativeBoundary;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * This function has been modified as provided by SirSir to allow multiline responses when
+	 * using SMTP Extensions
+	 *
+	 * @param	resource    $socket			Socket handler
+	 * @param	string		$response		Response. Example: "550 5.7.1  https://support.google.com/a/answer/6140680#invalidcred j21sm814390wre.3"
+	 * @return	boolean						True or false
+	 */
+	public function server_parse($socket, $response)
+	{
+		// phpcs:enable
+		/**
+		 * Returns constructed SELECT Object string or boolean upon failure
+		 * Default value is set at true
+		 */
+		$_retVal = true;
+
+		$server_response = '';
+
+		// avoid infinite loop
+		$limit = 0;
+
+		while (substr($server_response, 3, 1) != ' ' && $limit < 100)
+		{
+			if (!($server_response = fgets($socket, 256)))
+			{
+				$this->_setErr(121, "Couldn't get mail server response codes");
+				$_retVal = false;
+				break;
+			}
 			$this->log .= $server_response;
-            $limit++;
-        }
+			$limit++;
+		}
 
-        if (!(substr($server_response, 0, 3) == $response))
-        {
-            $this->_setErr(120, "Ran into problems sending Mail.\r\nResponse: $server_response");
-            $_retVal = false;
-        }
+		if (!(substr($server_response, 0, 3) == $response))
+		{
+			$this->_setErr(120, "Ran into problems sending Mail.\r\nResponse: $server_response");
+			$_retVal = false;
+		}
 
-        return $_retVal;
-    }
+		return $_retVal;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Send str
-     *
-     * @param	string		$_strSend		String to send
-     * @param 	string		$_returnCode	Return code
-     * @param 	string		$CRLF			CRLF
-     * @return 	boolean|null						True or false
-     */
-    public function socket_send_str($_strSend, $_returnCode = null, $CRLF = "\r\n")
-    {
-        // phpcs:enable
-        if ($this->_debug) $this->log .= $_strSend; // @CHANGE LDR for log
-        fputs($this->socket, $_strSend.$CRLF);
-        if ($this->_debug) $this->log .= ' ('.$_returnCode.')'.$CRLF;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Send str
+	 *
+	 * @param	string		$_strSend		String to send
+	 * @param 	string		$_returnCode	Return code
+	 * @param 	string		$CRLF			CRLF
+	 * @return 	boolean|null						True or false
+	 */
+	public function socket_send_str($_strSend, $_returnCode = null, $CRLF = "\r\n")
+	{
+		// phpcs:enable
+		if ($this->_debug) $this->log .= $_strSend; // @CHANGE LDR for log
+		fputs($this->socket, $_strSend.$CRLF);
+		if ($this->_debug) $this->log .= ' ('.$_returnCode.')'.$CRLF;
 
-        if ($_returnCode)
-        return $this->server_parse($this->socket, $_returnCode);
-    }
+		if ($_returnCode)
+		return $this->server_parse($this->socket, $_returnCode);
+	}
 
-    // =============================================================
-    // ** Error handling methods
+	// =============================================================
+	// ** Error handling methods
 
-    /**
-     * Defines errors codes and messages for Class
-     *
-     * @param  int    $_errNum  Error Code Number
-     * @param  string $_errMsg  Error Message
-     * @return void
-     */
-    private function _setErr($_errNum, $_errMsg)
-    {
-        $this->_smtpsErrors[] = array(
-            'num' => $_errNum,
-            'msg' => $_errMsg,
-        );
-    }
+	/**
+	 * Defines errors codes and messages for Class
+	 *
+	 * @param  int    $_errNum  Error Code Number
+	 * @param  string $_errMsg  Error Message
+	 * @return void
+	 */
+	private function _setErr($_errNum, $_errMsg)
+	{
+		$this->_smtpsErrors[] = array(
+			'num' => $_errNum,
+			'msg' => $_errMsg,
+		);
+	}
 
-    /**
-     * Returns errors codes and messages for Class
-     *
-     * @return string $_errMsg  Error Message
-     */
-    public function getErrors()
-    {
-        $_errMsg = array();
+	/**
+	 * Returns errors codes and messages for Class
+	 *
+	 * @return string $_errMsg  Error Message
+	 */
+	public function getErrors()
+	{
+		$_errMsg = array();
 
-        if (is_array($this->_smtpsErrors))
-        {
-            foreach ($this->_smtpsErrors as $_err => $_info)
-            {
-                $_errMsg[] = 'Error ['.$_info['num'].']: '.$_info['msg'];
-            }
-        }
+		if (is_array($this->_smtpsErrors))
+		{
+			foreach ($this->_smtpsErrors as $_err => $_info)
+			{
+				$_errMsg[] = 'Error ['.$_info['num'].']: '.$_info['msg'];
+			}
+		}
 
-        return implode("\n", $_errMsg);
-    }
+		return implode("\n", $_errMsg);
+	}
 }
 
 
diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php
index a18bad625e6..b1d569eae45 100644
--- a/htdocs/core/class/stats.class.php
+++ b/htdocs/core/class/stats.class.php
@@ -29,9 +29,9 @@
  */
 abstract class Stats
 {
-    protected $db;
-    protected $lastfetchdate = array(); // Dates of cache file read by methods
-    public $cachefilesuffix = ''; // Suffix to add to name of cache file (to avoid file name conflicts)
+	protected $db;
+	protected $lastfetchdate = array(); // Dates of cache file read by methods
+	public $cachefilesuffix = ''; // Suffix to add to name of cache file (to avoid file name conflicts)
 
 	/**
 	 * Return nb of elements by month for several years
@@ -39,25 +39,24 @@ abstract class Stats
 	 * @param 	int		$endyear		Start year
 	 * @param 	int		$startyear		End year
 	 * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
-     * @param	int		$format			0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 * @param	int		$format			0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 * @param   int 	$startmonth		month of the fiscal year start min 1 max 12 ; if 1 = january
-     * @return 	array					Array of values
-
+	 * @return 	array					Array of values
 	 */
 	public function getNbByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0, $format = 0, $startmonth = 1)
 	{
 		global $conf, $user, $langs;
 
-	    if ($startyear > $endyear) return -1;
+		if ($startyear > $endyear) return -1;
 
 		$datay = array();
 
 		// Search into cache
 		if (!empty($cachedelay))
-	    {
-	    	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	    	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
-	    }
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
+		}
 
 		$newpathofdestfile = $conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
 		$newmask = '0644';
@@ -133,7 +132,7 @@ abstract class Stats
 	 * @param	int		$endyear		Start year
 	 * @param	int		$startyear		End year
 	 * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
-     * @param	int		$format			0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 * @param	int		$format			0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 * @param   int 	$startmonth		month of the fiscal year start min 1 max 12 ; if 1 = january
 	 * @return 	array					Array of values
 	 */
@@ -141,42 +140,42 @@ abstract class Stats
 	{
 		global $conf, $user, $langs;
 
-        if ($startyear > $endyear) return -1;
+		if ($startyear > $endyear) return -1;
 
-        $datay = array();
+		$datay = array();
 
-        // Search into cache
-        if (!empty($cachedelay))
-        {
-        	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-        	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
-        }
+		// Search into cache
+		if (!empty($cachedelay))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
+		}
 
-        $newpathofdestfile = $conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
-        $newmask = '0644';
+		$newpathofdestfile = $conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
+		$newmask = '0644';
 
-        $nowgmt = dol_now();
+		$nowgmt = dol_now();
 
-        $foundintocache = 0;
-        if ($cachedelay > 0)
-        {
-        	$filedate = dol_filemtime($newpathofdestfile);
-        	if ($filedate >= ($nowgmt - $cachedelay))
-        	{
-        		$foundintocache = 1;
+		$foundintocache = 0;
+		if ($cachedelay > 0)
+		{
+			$filedate = dol_filemtime($newpathofdestfile);
+			if ($filedate >= ($nowgmt - $cachedelay))
+			{
+				$foundintocache = 1;
 
-        		$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
-        	} else {
-        		dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
-        	}
-        }
+				$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
+			} else {
+				dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
+			}
+		}
 
-        // Load file into $data
-        if ($foundintocache)    // Cache file found and is not too old
-        {
-        	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
-        	$data = json_decode(file_get_contents($newpathofdestfile), true);
-        } else {
+		// Load file into $data
+		if ($foundintocache)    // Cache file found and is not too old
+		{
+			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
+			$data = json_decode(file_get_contents($newpathofdestfile), true);
+		} else {
 			$year = $startyear;
 			$sm = $startmonth - 1;
 			if ($sm != 0) $year = $year - 1;
@@ -226,11 +225,11 @@ abstract class Stats
 	 * @param	int		$startyear		End year
 	 * @return 	array					Array of values
 	 */
-    public function getAverageByMonthWithPrevYear($endyear, $startyear)
-    {
-        if ($startyear > $endyear) return -1;
+	public function getAverageByMonthWithPrevYear($endyear, $startyear)
+	{
+		if ($startyear > $endyear) return -1;
 
-        $datay = array();
+		$datay = array();
 
 		$year = $startyear;
 		while ($year <= $endyear)
@@ -260,47 +259,47 @@ abstract class Stats
 	 *
 	 * @param	int		$year			Year
 	 * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
-     * @param  	int     $limit      	Limit
+	 * @param  	int     $limit      	Limit
 	 * @return 	array					Array of values
 	 */
-    public function getAllByProductEntry($year, $cachedelay = 0, $limit = 10)
-    {
-        global $conf, $user, $langs;
+	public function getAllByProductEntry($year, $cachedelay = 0, $limit = 10)
+	{
+		global $conf, $user, $langs;
 
-        $data = array();
+		$data = array();
 
-        // Search into cache
-        if (!empty($cachedelay))
-        {
-        	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-        	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
-        }
+		// Search into cache
+		if (!empty($cachedelay))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
+		}
 
-        $newpathofdestfile = $conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
-        $newmask = '0644';
+		$newpathofdestfile = $conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
+		$newmask = '0644';
 
-        $nowgmt = dol_now();
+		$nowgmt = dol_now();
 
-        $foundintocache = 0;
-        if ($cachedelay > 0)
-        {
-        	$filedate = dol_filemtime($newpathofdestfile);
-        	if ($filedate >= ($nowgmt - $cachedelay))
-        	{
-        		$foundintocache = 1;
+		$foundintocache = 0;
+		if ($cachedelay > 0)
+		{
+			$filedate = dol_filemtime($newpathofdestfile);
+			if ($filedate >= ($nowgmt - $cachedelay))
+			{
+				$foundintocache = 1;
 
-        		$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
-        	} else {
-        		dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
-        	}
-        }
+				$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
+			} else {
+				dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
+			}
+		}
 
-        // Load file into $data
-        if ($foundintocache)    // Cache file found and is not too old
-        {
-        	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
-        	$data = json_decode(file_get_contents($newpathofdestfile), true);
-        } else {
+		// Load file into $data
+		if ($foundintocache)    // Cache file found and is not too old
+		{
+			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
+			$data = json_decode(file_get_contents($newpathofdestfile), true);
+		} else {
 			$data = $this->getAllByProduct($year, $limit);
 			//					$data[$i][]=$datay[$year][$i][1];	// set yval for x=i
 		}
@@ -328,16 +327,16 @@ abstract class Stats
 	// Here we have low level of shared code called by XxxStats.class.php
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
 	 * 	Return nb of elements by year
 	 *
 	 *	@param	string	$sql		SQL request
 	 * 	@return	array
 	 */
-    protected function _getNbByYear($sql)
-    {
-        // phpcs:enable
+	protected function _getNbByYear($sql)
+	{
+		// phpcs:enable
 		$result = array();
 
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
@@ -359,7 +358,7 @@ abstract class Stats
 		return $result;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * 	Return nb of elements, total amount and avg amount each year
 	 *
@@ -368,7 +367,7 @@ abstract class Stats
 	 */
 	protected function _getAllByYear($sql)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$result = array();
 
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
@@ -390,8 +389,8 @@ abstract class Stats
 				// For some $sql only
 				if (isset($row->weighted))
 				{
-				    $result[$i]['weighted'] = $row->weighted;
-				    if ($i > 0 && $row->weighted > 0) $result[$i - 1]['avg_weighted'] = ($result[$i - 1]['weighted'] - $row->weighted) / $row->weighted * 100;
+					$result[$i]['weighted'] = $row->weighted;
+					if ($i > 0 && $row->weighted > 0) $result[$i - 1]['avg_weighted'] = ($result[$i - 1]['weighted'] - $row->weighted) / $row->weighted * 100;
 				}
 				$i++;
 			}
@@ -402,19 +401,19 @@ abstract class Stats
 		return $result;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *     Renvoie le nombre de documents par mois pour une annee donnee
 	 *     Return number of documents per month for a given year
 	 *
-     *     @param   int		$year       Year
-     *     @param   string	$sql        SQL
-     *     @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
-     *     @return	array				Array of nb each month
-     */
-    protected function _getNbByMonth($year, $sql, $format = 0)
-    {
-        // phpcs:enable
+	 *     @param   int		$year       Year
+	 *     @param   string	$sql        SQL
+	 *     @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *     @return	array				Array of nb each month
+	 */
+	protected function _getNbByMonth($year, $sql, $format = 0)
+	{
+		// phpcs:enable
 		global $langs;
 
 		$result = array();
@@ -460,18 +459,18 @@ abstract class Stats
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
-     *     Return the amount per month for a given year
+	 *     Return the amount per month for a given year
 	 *
 	 *     @param	int		$year       Year
 	 *     @param   string	$sql		SQL
-     *     @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *     @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 *     @return	array
 	 */
-    protected function _getAmountByMonth($year, $sql, $format = 0)
-    {
-        // phpcs:enable
+	protected function _getAmountByMonth($year, $sql, $format = 0)
+	{
+		// phpcs:enable
 		global $langs;
 
 		$result = array();
@@ -513,21 +512,21 @@ abstract class Stats
 		}
 
 		return $data;
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     *  Renvoie le montant moyen par mois pour une annee donnee
-     *  Return the amount average par month for a given year
-     *
-     *  @param  int     $year       Year
-     *  @param  string  $sql        SQL
-     *  @param  int     $format     0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
-     *  @return array
-     */
-    protected function _getAverageByMonth($year, $sql, $format = 0)
-    {
-        // phpcs:enable
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 *  Renvoie le montant moyen par mois pour une annee donnee
+	 *  Return the amount average par month for a given year
+	 *
+	 *  @param  int     $year       Year
+	 *  @param  string  $sql        SQL
+	 *  @param  int     $format     0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *  @return array
+	 */
+	protected function _getAverageByMonth($year, $sql, $format = 0)
+	{
+		// phpcs:enable
 		global $langs;
 
 		$result = array();
@@ -568,20 +567,20 @@ abstract class Stats
 		}
 
 		return $data;
-    }
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     *  Return number or total of product refs
-     *
-     *  @param  string  $sql        SQL
-     *  @param  int     $limit      Limit
-     *  @return array
-     */
-    protected function _getAllByProduct($sql, $limit = 10)
-    {
-        // phpcs:enable
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 *  Return number or total of product refs
+	 *
+	 *  @param  string  $sql        SQL
+	 *  @param  int     $limit      Limit
+	 *  @return array
+	 */
+	protected function _getAllByProduct($sql, $limit = 10)
+	{
+		// phpcs:enable
 		global $langs;
 
 		$result = array();
@@ -594,15 +593,15 @@ abstract class Stats
 			$i = 0; $other = 0;
 			while ($i < $num)
 			{
-                $row = $this->db->fetch_row($resql);
+				$row = $this->db->fetch_row($resql);
 		  		if ($i < $limit || $num == $limit) $result[$i] = array($row[0], $row[1]); // Ref of product, nb
 		  		else $other += $row[1];
 		  		$i++;
-            }
+			}
 		  	if ($num > $limit) $result[$i] = array($langs->transnoentitiesnoconv("Other"), $other);
 		  	$this->db->free($resql);
 		} else dol_print_error($this->db);
 
 		return $result;
-    }
+	}
 }
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 184724c0319..11e67104f9a 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -40,7 +40,7 @@ class Translate
 
 	public $cache_labels = array(); // Cache for labels return by getLabelFromKey method
 	public $cache_currencies = array(); // Cache to store currency symbols
-    private $cache_currencies_all_loaded = false;
+	private $cache_currencies_all_loaded = false;
 
 
 	/**
@@ -79,7 +79,7 @@ class Translate
 				$newdir = $dir.$conf->global->MAIN_FORCELANGDIR; // For example $conf->global->MAIN_FORCELANGDIR is '/mymodule' meaning we search files into '/mymodule/langs/xx_XX'
 				if (!in_array($newdir, $this->dir))
 				{
-				    $more['module_'.$i] = $newdir; $i++; // We add the forced dir into the array $more. Just after, we add entries into $more to list of lang dir $this->dir.
+					$more['module_'.$i] = $newdir; $i++; // We add the forced dir into the array $more. Just after, we add entries into $more to list of lang dir $this->dir.
 				}
 			}
 			$this->dir = array_merge($more, $this->dir); // Forced dir ($more) are before standard dirs ($this->dir)
@@ -112,8 +112,8 @@ class Translate
 				if (isset($longforlong[strtolower($srclang)])) $srclang = $longforlong[strtolower($srclang)];
 			} else $srclang = strtolower($langpart[0])."_".strtoupper($langpart[0]);
 		} else {						// If it's for a codetouse that is a short code xx
-    	    // Array to convert short lang code into long code.
-	        $longforshort = array('ar'=>'ar_SA', 'el'=>'el_GR', 'ca'=>'ca_ES', 'en'=>'en_US', 'nb'=>'nb_NO', 'no'=>'nb_NO');
+			// Array to convert short lang code into long code.
+			$longforshort = array('ar'=>'ar_SA', 'el'=>'el_GR', 'ca'=>'ca_ES', 'en'=>'en_US', 'ja'=>'ja_JP', 'nb'=>'nb_NO', 'no'=>'nb_NO');
 			if (isset($longforshort[strtolower($langpart[0])])) $srclang = $longforshort[strtolower($langpart[0])];
 			elseif (!empty($langpart[0])) $srclang = strtolower($langpart[0])."_".strtoupper($langpart[0]);
 			else $srclang = 'en_US';
@@ -134,36 +134,36 @@ class Translate
 	 */
 	public function getDefaultLang($mode = 0)
 	{
-	    if (empty($mode)) return $this->defaultlang;
-	    else return substr($this->defaultlang, 0, 2);
+		if (empty($mode)) return $this->defaultlang;
+		else return substr($this->defaultlang, 0, 2);
 	}
 
 
 	/**
 	 *  Load translation files.
-     *
+	 *
 	 *  @param	array	$domains      		Array of lang files to load
 	 *	@return	int							<0 if KO, 0 if already loaded or loading not required, >0 if OK
 	 */
 	public function loadLangs($domains)
 	{
-	    foreach ($domains as $domain)
-	    {
-	        $this->load($domain);
-	    }
+		foreach ($domains as $domain)
+		{
+			$this->load($domain);
+		}
 	}
 
 	/**
 	 *  Load translation key-value for a particular file, into a memory array.
 	 *  If data for file already loaded, do nothing.
 	 * 	All data in translation array are stored in UTF-8 format.
-     *  tab_loaded is completed with $domain key.
-     *  rule "we keep first entry found with we keep last entry found" so it is probably not what you want to do.
-     *
-     *  Value for hash are: 1:Loaded from disk, 2:Not found, 3:Loaded from cache
-     *
+	 *  tab_loaded is completed with $domain key.
+	 *  rule "we keep first entry found with we keep last entry found" so it is probably not what you want to do.
+	 *
+	 *  Value for hash are: 1:Loaded from disk, 2:Not found, 3:Loaded from cache
+	 *
 	 *  @param	string	$domain      				File name to load (.lang file). Must be "file" or "file@module" for module language files:
- 	 *												If $domain is "file@module" instead of "file" then we look for module lang file
+	 *												If $domain is "file@module" instead of "file" then we look for module lang file
 	 *												in htdocs/custom/modules/mymodule/langs/code_CODE/file.lang
 	 *												then in htdocs/module/langs/code_CODE/file.lang instead of htdocs/langs/code_CODE/file.lang
 	 *  @param	integer	$alt         				0 (try xx_ZZ then 1), 1 (try xx_XX then 2), 2 (try en_US)
@@ -183,8 +183,8 @@ class Translate
 		// Check parameters
 		if (empty($domain))
 		{
-		    dol_print_error('', get_class($this)."::Load ErrorWrongParameters");
-		    return -1;
+			dol_print_error('', get_class($this)."::Load ErrorWrongParameters");
+			return -1;
 		}
 		if ($this->defaultlang == 'none_NONE') return 0; // Special language code to not translate keys
 
@@ -204,7 +204,7 @@ class Translate
 			$modulename = $regs[2];
 		}
 
-        // Check cache
+		// Check cache
 		if (!empty($this->_tab_loaded[$newdomain])
 			&& ($this->_tab_loaded[$newdomain] != 2 || empty($forceloadifalreadynotfound))) // File already loaded and found and not forced for this domain
 		{
@@ -212,7 +212,7 @@ class Translate
 			return 0;
 		}
 
-        $fileread = 0;
+		$fileread = 0;
 		$langofdir = (empty($forcelangdir) ? $this->defaultlang : $forcelangdir);
 
 		// Redefine alt
@@ -240,7 +240,7 @@ class Translate
 			if ($filelangexists)
 			{
 				// TODO Move cache read out of loop on dirs or at least filelangexists
-			    $found = false;
+				$found = false;
 
 				// Enable caching of lang file in memory (not by default)
 				$usecachekey = '';
@@ -257,14 +257,14 @@ class Translate
 
 				if ($usecachekey)
 				{
-			        //dol_syslog('Translate::Load we will cache result into usecachekey '.$usecachekey);
-                    //global $aaa; $aaa+=1;
-                    //print $aaa." ".$usecachekey."\n";
-				    require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
+					//dol_syslog('Translate::Load we will cache result into usecachekey '.$usecachekey);
+					//global $aaa; $aaa+=1;
+					//print $aaa." ".$usecachekey."\n";
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
 					$tmparray = dol_getcache($usecachekey);
 					if (is_array($tmparray) && count($tmparray))
 					{
-				        $this->tab_translate += $tmparray; // Faster than array_merge($tmparray,$this->tab_translate). Note: If a value already exists into tab_translate, value into tmparaay is not added.
+						$this->tab_translate += $tmparray; // Faster than array_merge($tmparray,$this->tab_translate). Note: If a value already exists into tab_translate, value into tmparaay is not added.
 						//print $newdomain."\n";
 						//var_dump($this->tab_translate);
 						if ($alt == 2) $fileread = 1;
@@ -303,7 +303,7 @@ class Translate
 										}
 									} elseif ($key[0] == '#')
 									{
-									    continue;
+										continue;
 									} else {
 										// Convert some strings: Parse and render carriage returns. Also, change '\\s' into '\s' because transifex sync pull the string '\s' into string '\\s'
 										$this->tab_translate[$key] = str_replace(array('\\n', '\\\\s'), array("\n", '\s'), $value);
@@ -324,8 +324,8 @@ class Translate
 							$ressetcache = dol_setcache($usecachekey, $tabtranslatedomain);
 							if ($ressetcache < 0)
 							{
-							    $error = 'Failed to set cache for usecachekey='.$usecachekey.' result='.$ressetcache;
-							    dol_syslog($error, LOG_ERR);
+								$error = 'Failed to set cache for usecachekey='.$usecachekey.' result='.$ressetcache;
+								dol_syslog($error, LOG_ERR);
 							}
 						}
 
@@ -367,20 +367,20 @@ class Translate
 		// Kept for backward compatibility.
 		if (empty($loadfromfileonly))
 		{
-    		$overwritekey = 'MAIN_OVERWRITE_TRANS_'.$this->defaultlang;
-            if (!empty($conf->global->$overwritekey))    // Overwrite translation with key1:newstring1,key2:newstring2
-            {
-        		// Overwrite translation with param MAIN_OVERWRITE_TRANS_xx_XX
-                $tmparray = explode(',', $conf->global->$overwritekey);
-                foreach ($tmparray as $tmp)
-                {
-                    $tmparray2 = explode(':', $tmp);
-                    if (!empty($tmparray2[1])) $this->tab_translate[$tmparray2[0]] = $tmparray2[1];
-                }
-            }
+			$overwritekey = 'MAIN_OVERWRITE_TRANS_'.$this->defaultlang;
+			if (!empty($conf->global->$overwritekey))    // Overwrite translation with key1:newstring1,key2:newstring2
+			{
+				// Overwrite translation with param MAIN_OVERWRITE_TRANS_xx_XX
+				$tmparray = explode(',', $conf->global->$overwritekey);
+				foreach ($tmparray as $tmp)
+				{
+					$tmparray2 = explode(':', $tmp);
+					if (!empty($tmparray2[1])) $this->tab_translate[$tmparray2[0]] = $tmparray2[1];
+				}
+			}
 		}
 
-        // Check to be sure that SeparatorDecimal differs from SeparatorThousand
+		// Check to be sure that SeparatorDecimal differs from SeparatorThousand
 		if (!empty($this->tab_translate["SeparatorDecimal"]) && !empty($this->tab_translate["SeparatorThousand"])
 		&& $this->tab_translate["SeparatorDecimal"] == $this->tab_translate["SeparatorThousand"]) $this->tab_translate["SeparatorThousand"] = '';
 
@@ -391,12 +391,12 @@ class Translate
 	 *  Load translation key-value from database into a memory array.
 	 *  If data already loaded, do nothing.
 	 * 	All data in translation array are stored in UTF-8 format.
-     *  tab_loaded is completed with $domain key.
-     *  rule "we keep first entry found with we keep last entry found" so it is probably not what you want to do.
-     *
-     *  Value for hash are: 1:Loaded from disk, 2:Not found, 3:Loaded from cache
-     *
-     *  @param  Database    $db             Database handler
+	 *  tab_loaded is completed with $domain key.
+	 *  rule "we keep first entry found with we keep last entry found" so it is probably not what you want to do.
+	 *
+	 *  Value for hash are: 1:Loaded from disk, 2:Not found, 3:Loaded from cache
+	 *
+	 *  @param  Database    $db             Database handler
 	 *	@return	int							<0 if KO, 0 if already loaded or loading not required, >0 if OK
 	 */
 	public function loadFromDatabase($db)
@@ -421,7 +421,7 @@ class Translate
 
 		$this->_tab_loaded[$newdomain] = 1; // We want to be sure this function is called once only for domain 'database'
 
-        $fileread = 0;
+		$fileread = 0;
 		$langofdir = $this->defaultlang;
 
 		if (empty($langofdir))	// This may occurs when load is called without setting the language and without providing a value for forcelangdir
@@ -448,10 +448,10 @@ class Translate
 
 		if ($usecachekey)
 		{
-	        //dol_syslog('Translate::Load we will cache result into usecachekey '.$usecachekey);
-            //global $aaa; $aaa+=1;
-            //print $aaa." ".$usecachekey."\n";
-		    require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
+			//dol_syslog('Translate::Load we will cache result into usecachekey '.$usecachekey);
+			//global $aaa; $aaa+=1;
+			//print $aaa." ".$usecachekey."\n";
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
 			$tmparray = dol_getcache($usecachekey);
 			if (is_array($tmparray) && count($tmparray))
 			{
@@ -465,26 +465,26 @@ class Translate
 
 		if (!$found && !empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
 		{
-    		// Overwrite translation with database read
-            $sql = "SELECT transkey, transvalue FROM ".MAIN_DB_PREFIX."overwrite_trans where lang='".$db->escape($this->defaultlang)."' OR lang IS NULL";
-            $sql .= " AND entity IN (0, ".getEntity('overwrite_trans').")";
-            $sql .= $db->order("lang", "DESC");
-		    $resql = $db->query($sql);
+			// Overwrite translation with database read
+			$sql = "SELECT transkey, transvalue FROM ".MAIN_DB_PREFIX."overwrite_trans where lang='".$db->escape($this->defaultlang)."' OR lang IS NULL";
+			$sql .= " AND entity IN (0, ".getEntity('overwrite_trans').")";
+			$sql .= $db->order("lang", "DESC");
+			$resql = $db->query($sql);
 
-		    if ($resql)
-		    {
-    		    $num = $db->num_rows($resql);
-    		    if ($num)
-    		    {
-    				if ($usecachekey) $tabtranslatedomain = array(); // To save lang content in cache
+			if ($resql)
+			{
+				$num = $db->num_rows($resql);
+				if ($num)
+				{
+					if ($usecachekey) $tabtranslatedomain = array(); // To save lang content in cache
 
-    				$i = 0;
-    				while ($i < $num)	// Ex: Need 225ms for all fgets on all lang file for Third party page. Same speed than file_get_contents
-    				{
-    				    $obj = $db->fetch_object($resql);
+					$i = 0;
+					while ($i < $num)	// Ex: Need 225ms for all fgets on all lang file for Third party page. Same speed than file_get_contents
+					{
+						$obj = $db->fetch_object($resql);
 
-    				    $key = $obj->transkey;
-    					$value = $obj->transvalue;
+						$key = $obj->transkey;
+						$value = $obj->transvalue;
 
 						//print "Domain=$domain, found a string for $tab[0] with value $tab[1]<br>";
 						if (empty($this->tab_translate[$key]))    // If translation was already found, we must not continue, even if MAIN_FORCELANGDIR is set (MAIN_FORCELANGDIR is to replace lang dir, not to overwrite entries)
@@ -495,26 +495,26 @@ class Translate
 							if ($usecachekey) $tabtranslatedomain[$key] = $value; // To save lang content in cache
 						}
 
-    					$i++;
-    				}
+						$i++;
+					}
 
-    				$fileread = 1;
+					$fileread = 1;
 
-    				// TODO Move cache write out of loop on dirs
-    				// To save lang content for usecachekey into cache
-    				if ($usecachekey && count($tabtranslatedomain))
-    				{
-    					$ressetcache = dol_setcache($usecachekey, $tabtranslatedomain);
-    					if ($ressetcache < 0)
-    					{
-    					    $error = 'Failed to set cache for usecachekey='.$usecachekey.' result='.$ressetcache;
-    					    dol_syslog($error, LOG_ERR);
-    					}
-    				}
-    			}
-		    } else {
-		        dol_print_error($db);
-		    }
+					// TODO Move cache write out of loop on dirs
+					// To save lang content for usecachekey into cache
+					if ($usecachekey && count($tabtranslatedomain))
+					{
+						$ressetcache = dol_setcache($usecachekey, $tabtranslatedomain);
+						if ($ressetcache < 0)
+						{
+							$error = 'Failed to set cache for usecachekey='.$usecachekey.' result='.$ressetcache;
+							dol_syslog($error, LOG_ERR);
+						}
+					}
+				}
+			} else {
+				dol_print_error($db);
+			}
 		}
 
 		if ($fileread) $this->_tab_loaded[$newdomain] = 1; // Set domain file as loaded
@@ -546,8 +546,8 @@ class Translate
 	 * @param	string		$key		Key to translate
 	 * @return 	string					Translated string (translated with transnoentitiesnoconv)
 	 */
-    private function getTradFromKey($key)
-    {
+	private function getTradFromKey($key)
+	{
 		global $conf, $db;
 
 		if (!is_string($key)) {
@@ -556,94 +556,101 @@ class Translate
 		}
 
 		$newstr = $key;
-	    if (preg_match('/^Civility([0-9A-Z]+)$/i', $key, $reg))
-        {
-            $newstr = $this->getLabelFromKey($db, $reg[1], 'c_civility', 'code', 'label');
-        } elseif (preg_match('/^Currency([A-Z][A-Z][A-Z])$/i', $key, $reg))
+		if (preg_match('/^Civility([0-9A-Z]+)$/i', $key, $reg))
+		{
+			$newstr = $this->getLabelFromKey($db, $reg[1], 'c_civility', 'code', 'label');
+		} elseif (preg_match('/^Currency([A-Z][A-Z][A-Z])$/i', $key, $reg))
 		{
 			$newstr = $this->getLabelFromKey($db, $reg[1], 'c_currencies', 'code_iso', 'label');
 		} elseif (preg_match('/^SendingMethod([0-9A-Z]+)$/i', $key, $reg))
 		{
 			$newstr = $this->getLabelFromKey($db, $reg[1], 'c_shipment_mode', 'code', 'libelle');
 		} elseif (preg_match('/^PaymentTypeShort([0-9A-Z]+)$/i', $key, $reg))
-        {
-            $newstr = $this->getLabelFromKey($db, $reg[1], 'c_paiement', 'code', 'libelle', '', 1);
-        } elseif (preg_match('/^OppStatus([0-9A-Z]+)$/i', $key, $reg))
-        {
-            $newstr = $this->getLabelFromKey($db, $reg[1], 'c_lead_status', 'code', 'label');
-        } elseif (preg_match('/^OrderSource([0-9A-Z]+)$/i', $key, $reg))
-        {
-        	// TODO OrderSourceX must be replaced with content of table llx_c_input_reason or llx_c_input_method
-            //$newstr=$this->getLabelFromKey($db,$reg[1],'c_ordersource','code','label');
-        }
+		{
+			$newstr = $this->getLabelFromKey($db, $reg[1], 'c_paiement', 'code', 'libelle', '', 1);
+		} elseif (preg_match('/^OppStatus([0-9A-Z]+)$/i', $key, $reg))
+		{
+			$newstr = $this->getLabelFromKey($db, $reg[1], 'c_lead_status', 'code', 'label');
+		} elseif (preg_match('/^OrderSource([0-9A-Z]+)$/i', $key, $reg))
+		{
+			// TODO OrderSourceX must be replaced with content of table llx_c_input_reason or llx_c_input_method
+			//$newstr=$this->getLabelFromKey($db,$reg[1],'c_ordersource','code','label');
+		}
 
-        /* Disabled. There is too many cases where translation of $newstr is not defined is normal (like when output with setEventMessage an already translated string)
+		/* Disabled. There is too many cases where translation of $newstr is not defined is normal (like when output with setEventMessage an already translated string)
         if (! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2)
         {
         	dol_syslog(__METHOD__." MAIN_FEATURES_LEVEL=DEVELOP: missing translation for key '".$newstr."' in ".$_SERVER["PHP_SELF"], LOG_DEBUG);
         }*/
 
-        return $newstr;
-    }
+		return $newstr;
+	}
 
 
 	/**
 	 *  Return text translated of text received as parameter (and encode it into HTML)
-	 *              If there is no match for this text, we look in alternative file and if still not found,
-	 * 				it is returned as it is
-	 *              The parameters of this method can contain HTML tags
+	 *  If there is no match for this text, we look in alternative file and if still not found, it is returned as it is.
+	 *  The parameters of this method should not contain HTML tags. If there is, they will be htmlencoded to have no effect.
 	 *
 	 *  @param	string	$key        Key to translate
 	 *  @param  string	$param1     param1 string
 	 *  @param  string	$param2     param2 string
 	 *  @param  string	$param3     param3 string
 	 *  @param  string	$param4     param4 string
-	 *	@param	int		$maxsize	Max length of text
+	 *	@param	int		$maxsize	Max length of text. Warning: Will not work if paramX has HTML content. deprecated.
 	 *  @return string      		Translated string (encoded into HTML entities and UTF8)
 	 */
-    public function trans($key, $param1 = '', $param2 = '', $param3 = '', $param4 = '', $maxsize = 0)
-    {
-        global $conf;
+	public function trans($key, $param1 = '', $param2 = '', $param3 = '', $param4 = '', $maxsize = 0)
+	{
+		global $conf;
 
-	    if (!empty($this->tab_translate[$key]))	// Translation is available
+		if (!empty($this->tab_translate[$key]))	// Translation is available
 		{
-            $str = $this->tab_translate[$key];
+			$str = $this->tab_translate[$key];
 
-    		// Make some string replacement after translation
-            $replacekey = 'MAIN_REPLACE_TRANS_'.$this->defaultlang;
-            if (!empty($conf->global->$replacekey))    // Replacement translation variable with string1:newstring1;string2:newstring2
-            {
-                $tmparray = explode(';', $conf->global->$replacekey);
-                foreach ($tmparray as $tmp)
-                {
-                    $tmparray2 = explode(':', $tmp);
-                    $str = preg_replace('/'.preg_quote($tmparray2[0]).'/', $tmparray2[1], $str);
-                }
-            }
+			// Make some string replacement after translation
+			$replacekey = 'MAIN_REPLACE_TRANS_'.$this->defaultlang;
+			if (!empty($conf->global->$replacekey))    // Replacement translation variable with string1:newstring1;string2:newstring2
+			{
+				$tmparray = explode(';', $conf->global->$replacekey);
+				foreach ($tmparray as $tmp)
+				{
+					$tmparray2 = explode(':', $tmp);
+					$str = preg_replace('/'.preg_quote($tmparray2[0]).'/', $tmparray2[1], $str);
+				}
+			}
 
-            if (strpos($key, 'Format') !== 0)
-            {
-            	$str = sprintf($str, $param1, $param2, $param3, $param4); // Replace %s and %d except for FormatXXX strings.
-            }
+			// We replace some HTML tags by __xx__ to avoid having them encoded by htmlentities because
+			// we want to keep '"' '<b>' '</b>' '<strong' '</strong>' '<a ' '</a>' '<br>' '< ' '<span' '</span>' that are reliable HTML tags inside translation strings.
+			$str = str_replace(
+				array('"', '<b>', '</b>', '<u>', '</u>', '<i>', '</i>', '<center>', '</center>', '<strong>', '</strong>', '<a ', '</a>', '<br>', '<span', '</span>', '< ', '>'), // We accept '< ' but not '<'. We can accept however '>'
+				array('__quot__', '__tagb__', '__tagbend__', '__tagu__', '__taguend__', '__tagi__', '__tagiend__', '__tagcenter__', '__tagcenterend__', '__tagb__', '__tagbend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__ltspace__', '__gt__'),
+				$str
+			);
+
+			if (strpos($key, 'Format') !== 0)
+			{
+				$str = sprintf($str, $param1, $param2, $param3, $param4); // Replace %s and %d except for FormatXXX strings.
+			}
+
+			// Crypt string into HTML
+			$str = htmlentities($str, ENT_COMPAT, $this->charset_output); // Do not convert simple quotes in translation (strings in html are embraced by "). Use dol_escape_htmltag around text in HTML content
+
+			// Restore reliable HTML tags into original translation string
+			$str = str_replace(
+				array('__quot__', '__tagb__', '__tagbend__', '__tagu__', '__taguend__', '__tagi__', '__tagiend__', '__tagcenter__', '__tagcenterend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__ltspace__', '__gt__'),
+				array('"', '<b>', '</b>', '<u>', '</u>', '<i>', '</i>', '<center>', '</center>', '<a ', '</a>', '<br>', '<span', '</span>', '< ', '>'),
+				$str
+			);
 
 			if ($maxsize) $str = dol_trunc($str, $maxsize);
 
-			// We replace some HTML tags by __xx__ to avoid having them encoded by htmlentities
-            $str = str_replace(array('<', '>', '"',), array('__lt__', '__gt__', '__quot__'), $str);
-
-			// Crypt string into HTML
-			$str = htmlentities($str, ENT_COMPAT, $this->charset_output); // Do not convert simple quotes in translation (strings in html are enmbraced by "). Use dol_escape_htmltag around text in HTML content
-
-			// Restore HTML tags
-            $str = str_replace(array('__lt__', '__gt__', '__quot__'), array('<', '>', '"',), $str);
-
 			return $str;
-		} else // Translation is not available
-		{
-		    //if ($key[0] == '$') { return dol_eval($key,1); }
+		} else { // Translation is not available
+			//if ($key[0] == '$') { return dol_eval($key,1); }
 			return $this->getTradFromKey($key);
 		}
-    }
+	}
 
 
 	/**
@@ -687,29 +694,29 @@ class Translate
 
 		if (!empty($this->tab_translate[$key]))	// Translation is available
 		{
-		    $str = $this->tab_translate[$key];
+			$str = $this->tab_translate[$key];
 
-    		// Make some string replacement after translation
-            $replacekey = 'MAIN_REPLACE_TRANS_'.$this->defaultlang;
-            if (!empty($conf->global->$replacekey))    // Replacement translation variable with string1:newstring1;string2:newstring2
-            {
-                $tmparray = explode(';', $conf->global->$replacekey);
-                foreach ($tmparray as $tmp)
-                {
-                    $tmparray2 = explode(':', $tmp);
-                    $str = preg_replace('/'.preg_quote($tmparray2[0]).'/', $tmparray2[1], $str);
-                }
-            }
+			// Make some string replacement after translation
+			$replacekey = 'MAIN_REPLACE_TRANS_'.$this->defaultlang;
+			if (!empty($conf->global->$replacekey))    // Replacement translation variable with string1:newstring1;string2:newstring2
+			{
+				$tmparray = explode(';', $conf->global->$replacekey);
+				foreach ($tmparray as $tmp)
+				{
+					$tmparray2 = explode(':', $tmp);
+					$str = preg_replace('/'.preg_quote($tmparray2[0]).'/', $tmparray2[1], $str);
+				}
+			}
 
-            if (!preg_match('/^Format/', $key))
-            {
-            	//print $str;
-           		$str = sprintf($str, $param1, $param2, $param3, $param4, $param5); // Replace %s and %d except for FormatXXX strings.
-            }
+			if (!preg_match('/^Format/', $key))
+			{
+				//print $str;
+		   		$str = sprintf($str, $param1, $param2, $param3, $param4, $param5); // Replace %s and %d except for FormatXXX strings.
+			}
 
-            return $str;
+			return $str;
 		} else {
-		    if ($key[0] == '$') { return dol_eval($key, 1); }
+			if ($key[0] == '$') { return dol_eval($key, 1); }
 			return $this->getTradFromKey($key);
 		}
 	}
@@ -738,7 +745,7 @@ class Translate
 	 */
 	public function transcountrynoentities($str, $countrycode)
 	{
-		if ($this->tab_translate["$str$countrycode"]) return $this->transnoentities("$str$countrycode");
+		if (!empty($this->tab_translate["$str$countrycode"])) return $this->transnoentities("$str$countrycode");
 		else return $this->transnoentities($str);
 	}
 
@@ -758,7 +765,7 @@ class Translate
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of all available languages
 	 *
@@ -769,8 +776,8 @@ class Translate
 	 *  @return array     				List of languages
 	 */
 	public function get_available_languages($langdir = DOL_DOCUMENT_ROOT, $maxlength = 0, $usecode = 0, $mainlangonly = 0)
-    {
-        // phpcs:enable
+	{
+		// phpcs:enable
 		global $conf;
 
 		$this->load("languages");
@@ -787,29 +794,33 @@ class Translate
 				if ($mainlangonly) {
 					$arrayofspecialmainlanguages = array(
 						'en'=>'en_US',
-						'sq'=>'sq_AL',
+						'am'=>'am_ET',
 						'ar'=>'ar_SA',
-						'eu'=>'eu_ES',
 						'bn'=>'bn_DB',
 						'bs'=>'bs_BA',
 						'ca'=>'ca_ES',
-						'zh'=>'zh_TW',
 						'cs'=>'cs_CZ',
 						'da'=>'da_DK',
 						'et'=>'et_EE',
-						'ka'=>'ka_GE',
 						'el'=>'el_GR',
+						'eu'=>'eu_ES',
+						'fa'=>'fa_IR',
 						'he'=>'he_IL',
-						'kn'=>'kn_IN',
+						'ka'=>'ka_GE',
 						'km'=>'km_KH',
+						'kn'=>'kn_IN',
 						'ko'=>'ko_KR',
+						'ja'=>'ja_JP',
 						'lo'=>'lo_LA',
 						'nb'=>'nb_NO',
 						'fa'=>'fa_IR',
+						'sq'=>'sq_AL',
 						'sr'=>'sr_RS',
+						'sv'=>'sv_SE',
 						'sl'=>'sl_SI',
 						'uk'=>'uk_UA',
-						'vi'=>'vi_VN'
+						'vi'=>'vi_VN',
+						'zh'=>'zh_CN'
 					);
 					if (strtolower($regs[1]) != strtolower($regs[2]) && !in_array($dir, $arrayofspecialmainlanguages)) continue;
 				}
@@ -818,12 +829,12 @@ class Translate
 
 				if ($usecode == 2)
 				{
-				    $langs_available[$dir] = $dir;
+					$langs_available[$dir] = $dir;
 				}
 
 				if ($usecode == 1 || !empty($conf->global->MAIN_SHOW_LANGUAGE_CODE))
 				{
-				    $langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir), $maxlength);
+					$langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir), $maxlength);
 				} else {
 					$langs_available[$dir] = $this->trans('Language_'.$dir);
 				}
@@ -833,10 +844,10 @@ class Translate
 			}
 		}
 		return $langs_available;
-    }
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return if a filename $filename exists for current language (or alternate language)
 	 *
@@ -844,9 +855,9 @@ class Translate
 	 *  @param  integer	$searchalt      Search also alernate language file
 	 *  @return boolean         		true if exists and readable
 	 */
-    public function file_exists($filename, $searchalt = 0)
-    {
-        // phpcs:enable
+	public function file_exists($filename, $searchalt = 0)
+	{
+		// phpcs:enable
 		// Test si fichier dans repertoire de la langue
 		foreach ($this->dir as $searchdir)
 		{
@@ -862,22 +873,22 @@ class Translate
 		}
 
 		return false;
-    }
+	}
 
 
 	/**
 	 *      Return full text translated to language label for a key. Store key-label in a cache.
-     *      This function need module "numberwords" to be installed. If not it will return
-     *      same number (this module is not provided by default as it use non GPL source code).
+	 *      This function need module "numberwords" to be installed. If not it will return
+	 *      same number (this module is not provided by default as it use non GPL source code).
 	 *
 	 *		@param	int		$number		Number to encode in full text
-     *      @param  string	$isamount	''=it's just a number, '1'=It's an amount (default currency), 'currencycode'=It's an amount (foreign currency)
+	 *      @param  string	$isamount	''=it's just a number, '1'=It's an amount (default currency), 'currencycode'=It's an amount (foreign currency)
 	 *      @return string				Label translated in UTF8 (but without entities)
 	 * 									10 if setDefaultLang was en_US => ten
 	 * 									123 if setDefaultLang was fr_FR => cent vingt trois
 	 */
-    public function getLabelFromNumber($number, $isamount = '')
-    {
+	public function getLabelFromNumber($number, $isamount = '')
+	{
 		global $conf;
 
 		$newnumber = $number;
@@ -885,11 +896,11 @@ class Translate
 		$dirsubstitutions = array_merge(array(), $conf->modules_parts['substitutions']);
 		foreach ($dirsubstitutions as $reldir)
 		{
-		    $dir = dol_buildpath($reldir, 0);
-		    $newdir = dol_osencode($dir);
+			$dir = dol_buildpath($reldir, 0);
+			$newdir = dol_osencode($dir);
 
-		    // Check if directory exists
-		    if (!is_dir($newdir)) continue; // We must not use dol_is_dir here, function may not be loaded
+			// Check if directory exists
+			if (!is_dir($newdir)) continue; // We must not use dol_is_dir here, function may not be loaded
 
 			$fonc = 'numberwords';
 			if (file_exists($newdir.'/functions_'.$fonc.'.lib.php'))
@@ -901,7 +912,7 @@ class Translate
 		}
 
 		return $newnumber;
-    }
+	}
 
 
 	/**
@@ -919,12 +930,12 @@ class Translate
 	 *      @return string					Label in UTF8 (but without entities)
 	 *      @see dol_getIdFromCode()
 	 */
-    public function getLabelFromKey($db, $key, $tablename, $fieldkey, $fieldlabel, $keyforselect = '', $filteronentity = 0)
-    {
+	public function getLabelFromKey($db, $key, $tablename, $fieldkey, $fieldlabel, $keyforselect = '', $filteronentity = 0)
+	{
 		// If key empty
 		if ($key == '') return '';
 
-        //print 'param: '.$key.'-'.$keydatabase.'-'.$this->trans($key); exit;
+		//print 'param: '.$key.'-'.$keydatabase.'-'.$this->trans($key); exit;
 
 		// Check if a translation is available (this can call getTradFromKey)
 		$tmp = $this->transnoentitiesnoconv($key);
@@ -957,7 +968,7 @@ class Translate
 			$this->error = $db->lasterror();
 			return -1;
 		}
-    }
+	}
 
 
 	/**
@@ -969,7 +980,7 @@ class Translate
 	 *  @deprecated							Use method price to output a price
 	 *  @see price()
 	 */
-    public function getCurrencyAmount($currency_code, $amount)
+	public function getCurrencyAmount($currency_code, $amount)
 	{
 		$symbol = $this->getCurrencySymbol($currency_code);
 
@@ -985,8 +996,8 @@ class Translate
 	 *  @param	integer	$forceloadall		1=Force to load all currencies into cache. We know we need to use all of them. By default read and cache only the requested currency.
 	 *  @return	string						Currency symbol encoded into UTF8
 	 */
-    public function getCurrencySymbol($currency_code, $forceloadall = 0)
-    {
+	public function getCurrencySymbol($currency_code, $forceloadall = 0)
+	{
 		$currency_sign = ''; // By default return iso code
 
 		if (function_exists("mb_convert_encoding"))
@@ -1003,7 +1014,7 @@ class Translate
 		}
 
 		return ($currency_sign ? $currency_sign : $currency_code);
-    }
+	}
 
 	/**
 	 *  Load into the cache this->cache_currencies, all currencies
@@ -1057,23 +1068,23 @@ class Translate
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return an array with content of all loaded translation keys (found into this->tab_translate) so
 	 * we get a substitution array we can use for substitutions (for mail or ODT generation for example)
 	 *
 	 * @return array	Array of translation keys lang_key => string_translation_loaded
 	 */
-    public function get_translations_for_substitutions()
-    {
-        // phpcs:enable
-        $substitutionarray = array();
+	public function get_translations_for_substitutions()
+	{
+		// phpcs:enable
+		$substitutionarray = array();
 
-        foreach ($this->tab_translate as $code => $label) {
-            $substitutionarray['lang_'.$code] = $label;
-            $substitutionarray['__('.$code.')__'] = $label;
-        }
+		foreach ($this->tab_translate as $code => $label) {
+			$substitutionarray['lang_'.$code] = $label;
+			$substitutionarray['__('.$code.')__'] = $label;
+		}
 
-        return $substitutionarray;
-    }
+		return $substitutionarray;
+	}
 }
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 454ace0ebfa..3436a6d3c4f 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -28,12 +28,12 @@
 class Utils
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $output; // Used by Cron method to return message
-    public $result; // Used by Cron method to return data
+	public $output; // Used by Cron method to return message
+	public $result; // Used by Cron method to return data
 
 	/**
 	 *	Constructor
@@ -72,14 +72,14 @@ class Utils
 			// Delete temporary files
 			if ($dolibarr_main_data_root)
 			{
-			    $filesarray = dol_dir_list($dolibarr_main_data_root, "directories", 1, '^temp$', '', 'name', SORT_ASC, 2, 0, '', 1); // Do not follow symlinks
+				$filesarray = dol_dir_list($dolibarr_main_data_root, "directories", 1, '^temp$', '', 'name', SORT_ASC, 2, 0, '', 1); // Do not follow symlinks
 
-			    if ($choice == 'tempfilesold')
+				if ($choice == 'tempfilesold')
 				{
 					$now = dol_now();
 					foreach ($filesarray as $key => $val)
 					{
-					    if ($val['date'] > ($now - ($nbsecondsold))) unset($filesarray[$key]); // Discard temp dir not older than $nbsecondsold
+						if ($val['date'] > ($now - ($nbsecondsold))) unset($filesarray[$key]); // Discard temp dir not older than $nbsecondsold
 					}
 				}
 			}
@@ -122,10 +122,10 @@ class Utils
 		$counterror = 0;
 		if (count($filesarray))
 		{
-		    foreach ($filesarray as $key => $value)
+			foreach ($filesarray as $key => $value)
 			{
 				//print "x ".$filesarray[$key]['fullname']."-".$filesarray[$key]['type']."<br>\n";
-			    if ($filesarray[$key]['type'] == 'dir')
+				if ($filesarray[$key]['type'] == 'dir')
 				{
 					$startcount = 0;
 					$tmpcountdeleted = 0;
@@ -168,7 +168,7 @@ class Utils
 		// Recreate temp dir that are not automatically recreated by core code for performance purpose, we need them
 		if (!empty($conf->api->enabled))
 		{
-		    dol_mkdir($conf->api->dir_temp);
+			dol_mkdir($conf->api->dir_temp);
 		}
 		dol_mkdir($conf->user->dir_temp);
 
@@ -631,8 +631,8 @@ class Utils
 
 				if (empty($conf->global->MODULEBUILDER_ASCIIDOCTOR) && empty($conf->global->MODULEBUILDER_ASCIIDOCTORPDF))
 				{
-				    $this->error = 'Setup of module ModuleBuilder not complete';
-				    return -1;
+					$this->error = 'Setup of module ModuleBuilder not complete';
+					return -1;
 				}
 
 				// Copy some files into temp directory, so instruction include::ChangeLog.md[] will works inside the asciidoc file.
@@ -687,36 +687,36 @@ class Utils
 
 					//var_dump($phpfileval['fullname']);
 					$arrayreplacement = array(
-					    'mymodule'=>strtolower($module),
-					    'MyModule'=>$module,
-					    'MYMODULE'=>strtoupper($module),
-					    'My module'=>$module,
-					    'my module'=>$module,
-					    'Mon module'=>$module,
-					    'mon module'=>$module,
-					    'htdocs/modulebuilder/template'=>strtolower($module),
-					    '__MYCOMPANY_NAME__'=>$mysoc->name,
-					    '__KEYWORDS__'=>$module,
-					    '__USER_FULLNAME__'=>$user->getFullName($langs),
-					    '__USER_EMAIL__'=>$user->email,
-					    '__YYYY-MM-DD__'=>dol_print_date($now, 'dayrfc'),
-					    '---Put here your own copyright and developer email---'=>dol_print_date($now, 'dayrfc').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : ''),
-					    '__DATA_SPECIFICATION__'=>'Not yet available',
-					    '__README__'=>dolMd2Asciidoc($contentreadme),
-					    '__CHANGELOG__'=>dolMd2Asciidoc($contentchangelog),
+						'mymodule'=>strtolower($module),
+						'MyModule'=>$module,
+						'MYMODULE'=>strtoupper($module),
+						'My module'=>$module,
+						'my module'=>$module,
+						'Mon module'=>$module,
+						'mon module'=>$module,
+						'htdocs/modulebuilder/template'=>strtolower($module),
+						'__MYCOMPANY_NAME__'=>$mysoc->name,
+						'__KEYWORDS__'=>$module,
+						'__USER_FULLNAME__'=>$user->getFullName($langs),
+						'__USER_EMAIL__'=>$user->email,
+						'__YYYY-MM-DD__'=>dol_print_date($now, 'dayrfc'),
+						'---Put here your own copyright and developer email---'=>dol_print_date($now, 'dayrfc').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : ''),
+						'__DATA_SPECIFICATION__'=>'Not yet available',
+						'__README__'=>dolMd2Asciidoc($contentreadme),
+						'__CHANGELOG__'=>dolMd2Asciidoc($contentchangelog),
 					);
 
 					dolReplaceInFile($destfile, $arrayreplacement);
 				}
 
 				// Launch doc generation
-                $currentdir = getcwd();
-                chdir($dirofmodule);
+				$currentdir = getcwd();
+				chdir($dirofmodule);
 
-                require_once DOL_DOCUMENT_ROOT.'/core/class/utils.class.php';
-                $utils = new Utils($this->db);
+				require_once DOL_DOCUMENT_ROOT.'/core/class/utils.class.php';
+				$utils = new Utils($this->db);
 
-                // Build HTML doc
+				// Build HTML doc
 				$command = $conf->global->MODULEBUILDER_ASCIIDOCTOR.' '.$destfile.' -n -o '.$dirofmoduledoc.'/'.$FILENAMEDOC;
 				$outfile = $dirofmoduletmp.'/out.tmp';
 
@@ -733,7 +733,7 @@ class Utils
 				$resarray = $utils->executeCLI($command, $outfile);
 				if ($resarray['result'] != '0')
 				{
-				    $this->error = $resarray['error'].' '.$resarray['output'];
+					$this->error = $resarray['error'].' '.$resarray['output'];
 				}
 				$result = ($resarray['result'] == 0) ? 1 : 0;
 
@@ -766,8 +766,8 @@ class Utils
 	 *
 	 * @return	int						0 if OK, < 0 if KO
 	 */
-    public function compressSyslogs()
-    {
+	public function compressSyslogs()
+	{
 		global $conf;
 
 		if (empty($conf->loghandlers['mod_syslog_file'])) { // File Syslog disabled
@@ -871,7 +871,7 @@ class Utils
 
 		$this->output = 'Archive log files (keeping last SYSLOG_FILE_SAVES='.$nbSaves.' files) done.';
 		return 0;
-    }
+	}
 
 	/**	Backup the db OR just a table without mysqldump binary, with PHP only (does not require any exec permission)
 	 *	Author: David Walsh (http://davidwalsh.name/backup-mysql-database-php)
diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php
index fc67eb2f2a0..9c03475453f 100644
--- a/htdocs/core/class/vcard.class.php
+++ b/htdocs/core/class/vcard.class.php
@@ -31,7 +31,7 @@
  */
 function encode($string)
 {
-    return str_replace(";", "\;", (dol_quoted_printable_encode(utf8_decode($string))));
+	return str_replace(";", "\;", (dol_quoted_printable_encode(utf8_decode($string))));
 }
 
 
@@ -45,38 +45,38 @@ function encode($string)
  */
 function dol_quoted_printable_encode($input, $line_max = 76)
 {
-    $hex = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
-    $lines = preg_split("/(\?:\r\n|\r|\n)/", $input);
-    $eol = "\r\n";
-    $linebreak = "=0D=0A";
-    $escape = "=";
-    $output = "";
+	$hex = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
+	$lines = preg_split("/(\?:\r\n|\r|\n)/", $input);
+	$eol = "\r\n";
+	$linebreak = "=0D=0A";
+	$escape = "=";
+	$output = "";
 
-    $num = count($lines);
-    for ($j = 0; $j < $num; $j++)
-    {
-        $line = $lines[$j];
-        $linlen = strlen($line);
-        $newline = "";
-        for ($i = 0; $i < $linlen; $i++) {
-            $c = substr($line, $i, 1);
-            $dec = ord($c);
-            if (($dec == 32) && ($i == ($linlen - 1))) { // convert space at eol only
-                $c = "=20";
-            } elseif (($dec == 61) || ($dec < 32) || ($dec > 126)) { // always encode "\t", which is *not* required
-                $h2 = floor($dec / 16); $h1 = floor($dec % 16);
-                $c = $escape.$hex["$h2"].$hex["$h1"];
-            }
-            if ((strlen($newline) + strlen($c)) >= $line_max) { // CRLF is not counted
-                $output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay
-                $newline = "    ";
-            }
-            $newline .= $c;
-        } // end of for
-        $output .= $newline;
-        if ($j < count($lines) - 1) $output .= $linebreak;
-    }
-    return trim($output);
+	$num = count($lines);
+	for ($j = 0; $j < $num; $j++)
+	{
+		$line = $lines[$j];
+		$linlen = strlen($line);
+		$newline = "";
+		for ($i = 0; $i < $linlen; $i++) {
+			$c = substr($line, $i, 1);
+			$dec = ord($c);
+			if (($dec == 32) && ($i == ($linlen - 1))) { // convert space at eol only
+				$c = "=20";
+			} elseif (($dec == 61) || ($dec < 32) || ($dec > 126)) { // always encode "\t", which is *not* required
+				$h2 = floor($dec / 16); $h1 = floor($dec % 16);
+				$c = $escape.$hex["$h2"].$hex["$h1"];
+			}
+			if ((strlen($newline) + strlen($c)) >= $line_max) { // CRLF is not counted
+				$output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay
+				$newline = "    ";
+			}
+			$newline .= $c;
+		} // end of for
+		$output .= $newline;
+		if ($j < count($lines) - 1) $output .= $linebreak;
+	}
+	return trim($output);
 }
 
 
@@ -85,254 +85,263 @@ function dol_quoted_printable_encode($input, $line_max = 76)
  */
 class vCard
 {
-    public $properties;
-    public $filename;
+	/**
+	 * @var array array of properties
+	 */
+	public $properties;
 
-    //var $encoding="UTF-8";
-    public $encoding = "ISO-8859-1;ENCODING=QUOTED-PRINTABLE";
+	/**
+	 * @var string filename
+	 */
+	public $filename;
+
+	/**
+	 * @var string encoding
+	 */
+	public $encoding = "ISO-8859-1;ENCODING=QUOTED-PRINTABLE";
 
 
-    /**
-     *  mise en forme du numero de telephone
-     *
-     *  @param	int		$number		numero de telephone
-     *  @param	string	$type		Type
-     *  @return	void
-     */
-    public function setPhoneNumber($number, $type = "")
-    {
-        // type may be PREF | WORK | HOME | VOICE | FAX | MSG | CELL | PAGER | BBS | CAR | MODEM | ISDN | VIDEO or any senseful combination, e.g. "PREF;WORK;VOICE"
-        $key = "TEL";
-        if ($type != "") $key .= ";".$type;
-        $key .= ";CHARSET=".$this->encoding;
-        $this->properties[$key] = encode($number);
-    }
+	/**
+	 *  mise en forme du numero de telephone
+	 *
+	 *  @param	int		$number		numero de telephone
+	 *  @param	string	$type		Type
+	 *  @return	void
+	 */
+	public function setPhoneNumber($number, $type = "")
+	{
+		// type may be PREF | WORK | HOME | VOICE | FAX | MSG | CELL | PAGER | BBS | CAR | MODEM | ISDN | VIDEO or any senseful combination, e.g. "PREF;WORK;VOICE"
+		$key = "TEL";
+		if ($type != "") $key .= ";".$type;
+		$key .= ";CHARSET=".$this->encoding;
+		$this->properties[$key] = encode($number);
+	}
 
-    /**
-     *	mise en forme de la photo
-     *  warning NON TESTE !
-     *
-     *  @param  string  $type			Type
-     *  @param  string  $photo			Photo
-     *  @return	void
-     */
-    public function setPhoto($type, $photo)
-    {
-        // $type = "GIF" | "JPEG"
-        $this->properties["PHOTO;TYPE=$type;ENCODING=BASE64"] = base64_encode($photo);
-    }
+	/**
+	 *	mise en forme de la photo
+	 *  warning NON TESTE !
+	 *
+	 *  @param  string  $type			Type
+	 *  @param  string  $photo			Photo
+	 *  @return	void
+	 */
+	public function setPhoto($type, $photo)
+	{
+		// $type = "GIF" | "JPEG"
+		$this->properties["PHOTO;TYPE=$type;ENCODING=BASE64"] = base64_encode($photo);
+	}
 
-    /**
-     *	mise en forme du nom formate
-     *
-     *	@param	string	$name			Name
-     *	@return	void
-     */
-    public function setFormattedName($name)
-    {
-        $this->properties["FN;CHARSET=".$this->encoding] = encode($name);
-    }
+	/**
+	 *	mise en forme du nom formate
+	 *
+	 *	@param	string	$name			Name
+	 *	@return	void
+	 */
+	public function setFormattedName($name)
+	{
+		$this->properties["FN;CHARSET=".$this->encoding] = encode($name);
+	}
 
-    /**
-     *	mise en forme du nom complet
-     *
-     *	@param	string	$family			Family name
-     *	@param	string	$first			First name
-     *	@param	string	$additional		Additional (e.g. second name, nick name)
-     *	@param	string	$prefix			Prefix (e.g. "Mr.", "Ms.", "Prof.")
-     *	@param	string	$suffix			Suffix (e.g. "sen." for senior, "jun." for junior)
-     *	@return	void
-     */
-    public function setName($family = "", $first = "", $additional = "", $prefix = "", $suffix = "")
-    {
-        $this->properties["N;CHARSET=".$this->encoding] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);
-        $this->filename = "$first%20$family.vcf";
-        if (empty($this->properties["FN"])) $this->setFormattedName(trim("$prefix $first $additional $family $suffix"));
-    }
+	/**
+	 *	mise en forme du nom complet
+	 *
+	 *	@param	string	$family			Family name
+	 *	@param	string	$first			First name
+	 *	@param	string	$additional		Additional (e.g. second name, nick name)
+	 *	@param	string	$prefix			Prefix (e.g. "Mr.", "Ms.", "Prof.")
+	 *	@param	string	$suffix			Suffix (e.g. "sen." for senior, "jun." for junior)
+	 *	@return	void
+	 */
+	public function setName($family = "", $first = "", $additional = "", $prefix = "", $suffix = "")
+	{
+		$this->properties["N;CHARSET=".$this->encoding] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);
+		$this->filename = "$first%20$family.vcf";
+		if (empty($this->properties["FN"])) $this->setFormattedName(trim("$prefix $first $additional $family $suffix"));
+	}
 
-    /**
-     *	mise en forme de l'anniversaire
-     *
-     *	@param	integer	  $date		Date
-     *	@return	void
-     */
-    public function setBirthday($date)
-    {
-        // $date format is YYYY-MM-DD - RFC 2425 and RFC 2426
-        $this->properties["BDAY"] = dol_print_date($date, 'dayrfc');
-    }
+	/**
+	 *	mise en forme de l'anniversaire
+	 *
+	 *	@param	integer	  $date		Date
+	 *	@return	void
+	 */
+	public function setBirthday($date)
+	{
+		// $date format is YYYY-MM-DD - RFC 2425 and RFC 2426
+		$this->properties["BDAY"] = dol_print_date($date, 'dayrfc');
+	}
 
-    /**
-     *	mise en forme de l'adresse
-     *
-     *	@param	string	$postoffice		Postoffice
-     *	@param	string	$extended		Extended
-     *	@param	string	$street			Street
-     *	@param	string	$city			City
-     *	@param	string	$region			Region
-     *	@param	string	$zip			Zip
-     *	@param	string	$country		Country
-     *	@param	string	$type			Type
-     *	@return	void
-     */
-    public function setAddress($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME;POSTAL")
-    {
-        // $type may be DOM | INTL | POSTAL | PARCEL | HOME | WORK or any combination of these: e.g. "WORK;PARCEL;POSTAL"
-        $key = "ADR";
-        if ($type != "") $key .= ";$type";
-        $key .= ";CHARSET=".$this->encoding;
-        $this->properties[$key] = ";".encode($extended).";".encode($street).";".encode($city).";".encode($region).";".encode($zip).";".encode($country);
+	/**
+	 *	mise en forme de l'adresse
+	 *
+	 *	@param	string	$postoffice		Postoffice
+	 *	@param	string	$extended		Extended
+	 *	@param	string	$street			Street
+	 *	@param	string	$city			City
+	 *	@param	string	$region			Region
+	 *	@param	string	$zip			Zip
+	 *	@param	string	$country		Country
+	 *	@param	string	$type			Type
+	 *	@return	void
+	 */
+	public function setAddress($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME;POSTAL")
+	{
+		// $type may be DOM | INTL | POSTAL | PARCEL | HOME | WORK or any combination of these: e.g. "WORK;PARCEL;POSTAL"
+		$key = "ADR";
+		if ($type != "") $key .= ";$type";
+		$key .= ";CHARSET=".$this->encoding;
+		$this->properties[$key] = ";".encode($extended).";".encode($street).";".encode($city).";".encode($region).";".encode($zip).";".encode($country);
 
-        if ($this->properties["LABEL;$type;CHARSET=".$this->encoding] == "")
-        {
-            //$this->setLabel($postoffice, $extended, $street, $city, $region, $zip, $country, $type);
-        }
-    }
+		if ($this->properties["LABEL;$type;CHARSET=".$this->encoding] == "")
+		{
+			//$this->setLabel($postoffice, $extended, $street, $city, $region, $zip, $country, $type);
+		}
+	}
 
-    /**
-     *  mise en forme du label
-     *
-     *  @param	string	$postoffice		Postoffice
-     *  @param	string	$extended		Extended
-     *  @param	string	$street			Street
-     *  @param	string	$city			City
-     *  @param	string	$region			Region
-     *  @param	string	$zip			Zip
-     *  @param	string	$country		Country
-     *  @param	string	$type			Type
-     *  @return	void
-     */
-    public function setLabel($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME;POSTAL")
-    {
-        $label = "";
-        if ($postoffice != "") $label .= "$postoffice\r\n";
-        if ($extended != "") $label .= "$extended\r\n";
-        if ($street != "") $label .= "$street\r\n";
-        if ($zip != "") $label .= "$zip ";
-        if ($city != "") $label .= "$city\r\n";
-        if ($region != "") $label .= "$region\r\n";
-        if ($country != "") $country .= "$country\r\n";
+	/**
+	 *  mise en forme du label
+	 *
+	 *  @param	string	$postoffice		Postoffice
+	 *  @param	string	$extended		Extended
+	 *  @param	string	$street			Street
+	 *  @param	string	$city			City
+	 *  @param	string	$region			Region
+	 *  @param	string	$zip			Zip
+	 *  @param	string	$country		Country
+	 *  @param	string	$type			Type
+	 *  @return	void
+	 */
+	public function setLabel($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME;POSTAL")
+	{
+		$label = "";
+		if ($postoffice != "") $label .= "$postoffice\r\n";
+		if ($extended != "") $label .= "$extended\r\n";
+		if ($street != "") $label .= "$street\r\n";
+		if ($zip != "") $label .= "$zip ";
+		if ($city != "") $label .= "$city\r\n";
+		if ($region != "") $label .= "$region\r\n";
+		if ($country != "") $country .= "$country\r\n";
 
-        $this->properties["LABEL;$type;CHARSET=".$this->encoding] = encode($label);
-    }
+		$this->properties["LABEL;$type;CHARSET=".$this->encoding] = encode($label);
+	}
 
-    /**
-     *	Add a e-mail address to this vCard
-     *
-     *	@param	string	$address		E-mail address
-     *	@param	string	$type			(optional) The type of the e-mail (typical "PREF;INTERNET" or "INTERNET")
-     *	@return	void
-     */
-    public function setEmail($address, $type = "TYPE=INTERNET;PREF")
-    {
-        $key = "EMAIL";
-        if ($type != "") $key .= ";".$type;
-        $this->properties[$key] = $address;
-    }
+	/**
+	 *	Add a e-mail address to this vCard
+	 *
+	 *	@param	string	$address		E-mail address
+	 *	@param	string	$type			(optional) The type of the e-mail (typical "PREF;INTERNET" or "INTERNET")
+	 *	@return	void
+	 */
+	public function setEmail($address, $type = "TYPE=INTERNET;PREF")
+	{
+		$key = "EMAIL";
+		if ($type != "") $key .= ";".$type;
+		$this->properties[$key] = $address;
+	}
 
-    /**
-     *	mise en forme de la note
-     *
-     *	@param	string	$note		Note
-     *	@return	void
-     */
-    public function setNote($note)
-    {
-        $this->properties["NOTE;CHARSET=".$this->encoding] = encode($note);
-    }
+	/**
+	 *	mise en forme de la note
+	 *
+	 *	@param	string	$note		Note
+	 *	@return	void
+	 */
+	public function setNote($note)
+	{
+		$this->properties["NOTE;CHARSET=".$this->encoding] = encode($note);
+	}
 
-    /**
-     * 	mise en forme de la fonction
-     *
-     *	@param	string	$title		Title
-     *	@return	void
-     */
-    public function setTitle($title)
-    {
-        $this->properties["TITLE;CHARSET=".$this->encoding] = encode($title);
-    }
+	/**
+	 * 	mise en forme de la fonction
+	 *
+	 *	@param	string	$title		Title
+	 *	@return	void
+	 */
+	public function setTitle($title)
+	{
+		$this->properties["TITLE;CHARSET=".$this->encoding] = encode($title);
+	}
 
 
-    /**
-     *  mise en forme de la societe
-     *
-     *  @param	string	$org		Org
-     *  @return	void
-     */
-    public function setOrg($org)
-    {
-        $this->properties["ORG;CHARSET=".$this->encoding] = encode($org);
-    }
+	/**
+	 *  mise en forme de la societe
+	 *
+	 *  @param	string	$org		Org
+	 *  @return	void
+	 */
+	public function setOrg($org)
+	{
+		$this->properties["ORG;CHARSET=".$this->encoding] = encode($org);
+	}
 
 
-    /**
-     * 	mise en forme du logiciel generateur
-     *
-     *  @param	string	$prodid		Prodid
-     *	@return	void
-     */
-    public function setProdId($prodid)
-    {
-        $this->properties["PRODID;CHARSET=".$this->encoding] = encode($prodid);
-    }
+	/**
+	 * 	mise en forme du logiciel generateur
+	 *
+	 *  @param	string	$prodid		Prodid
+	 *	@return	void
+	 */
+	public function setProdId($prodid)
+	{
+		$this->properties["PRODID;CHARSET=".$this->encoding] = encode($prodid);
+	}
 
 
-    /**
-     * 	mise en forme du logiciel generateur
-     *
-     *  @param	string	$uid	Uid
-     *	@return	void
-     */
-    public function setUID($uid)
-    {
-        $this->properties["UID;CHARSET=".$this->encoding] = encode($uid);
-    }
+	/**
+	 * 	mise en forme du logiciel generateur
+	 *
+	 *  @param	string	$uid	Uid
+	 *	@return	void
+	 */
+	public function setUID($uid)
+	{
+		$this->properties["UID;CHARSET=".$this->encoding] = encode($uid);
+	}
 
 
-    /**
-     *  mise en forme de l'url
-     *
-     *	@param	string	$url		URL
-     *  @param	string	$type		Type
-     *	@return	void
-     */
-    public function setURL($url, $type = "")
-    {
-        // $type may be WORK | HOME
-        $key = "URL";
-        if ($type != "") $key .= ";$type";
-        $this->properties[$key] = $url;
-    }
+	/**
+	 *  mise en forme de l'url
+	 *
+	 *	@param	string	$url		URL
+	 *  @param	string	$type		Type
+	 *	@return	void
+	 */
+	public function setURL($url, $type = "")
+	{
+		// $type may be WORK | HOME
+		$key = "URL";
+		if ($type != "") $key .= ";$type";
+		$this->properties[$key] = $url;
+	}
 
-    /**
-     *  permet d'obtenir une vcard
-     *
-     *  @return	string
-     */
-    public function getVCard()
-    {
-        $text = "BEGIN:VCARD\r\n";
-        $text .= "VERSION:3.0\r\n";
-        //$text.= "VERSION:2.1\r\n";
-        foreach ($this->properties as $key => $value)
-        {
-            $text .= "$key:$value\r\n";
-        }
-        $text .= "REV:".date("Y-m-d")."T".date("H:i:s")."Z\r\n";
-        $text .= "MAILER: Dolibarr\r\n";
-        $text .= "END:VCARD\r\n";
-        return $text;
-    }
+	/**
+	 *  permet d'obtenir une vcard
+	 *
+	 *  @return	string
+	 */
+	public function getVCard()
+	{
+		$text = "BEGIN:VCARD\r\n";
+		$text .= "VERSION:3.0\r\n";
+		//$text.= "VERSION:2.1\r\n";
+		foreach ($this->properties as $key => $value)
+		{
+			$text .= "$key:$value\r\n";
+		}
+		$text .= "REV:".date("Y-m-d")."T".date("H:i:s")."Z\r\n";
+		$text .= "MAILER: Dolibarr\r\n";
+		$text .= "END:VCARD\r\n";
+		return $text;
+	}
 
-    /**
-     *  permet d'obtenir le nom de fichier
-     *
-     *  @return	string		Filename
-     */
-    public function getFileName()
-    {
-        return $this->filename;
-    }
+	/**
+	 *  permet d'obtenir le nom de fichier
+	 *
+	 *  @return	string		Filename
+	 */
+	public function getFileName()
+	{
+		return $this->filename;
+	}
 
 	/* Example from Microsoft Outlook 2019
 
diff --git a/htdocs/core/class/workboardresponse.class.php b/htdocs/core/class/workboardresponse.class.php
index e2d9cc2c0d7..ac1d8fe9676 100644
--- a/htdocs/core/class/workboardresponse.class.php
+++ b/htdocs/core/class/workboardresponse.class.php
@@ -24,6 +24,11 @@
 
 class WorkboardResponse
 {
+	/**
+	 * Unique key of the workboard
+	 * @var string
+	 */
+	public $id;
 
 	/**
 	 * Image URL to represent the board item
diff --git a/htdocs/core/commonfieldsinexport.inc.php b/htdocs/core/commonfieldsinexport.inc.php
index a16d6297dd4..5db67f36c78 100644
--- a/htdocs/core/commonfieldsinexport.inc.php
+++ b/htdocs/core/commonfieldsinexport.inc.php
@@ -2,9 +2,9 @@
 
 if (empty($keyforclass) || empty($keyforclassfile) || empty($keyforelement))
 {
-    //print $keyforclass.' - '.$keyforclassfile.' - '.$keyforelement;
-    dol_print_error('', 'include of file commonfieldsinexport.inc.php was done but var $keyforclass or $keyforclassfile or $keyforelement was not set');
-    exit;
+	//print $keyforclass.' - '.$keyforclassfile.' - '.$keyforelement;
+	dol_print_error('', 'include of file commonfieldsinexport.inc.php was done but var $keyforclass or $keyforclassfile or $keyforelement was not set');
+	exit;
 }
 if (empty($keyforalias)) $keyforalias = 't';
 
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 7deb98dbfd5..901a0aa0f59 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -115,23 +115,23 @@ elseif (is_array($hookmanager->resArray)) {
 	}
 	if (!empty($hookmanager->resArray['arrayoftype'])) {	// Add entries from hook
 		foreach ($hookmanager->resArray['arrayoftype'] as $key => $val) {
-	        $arrayoftype[$key] = $val;
-	    }
+			$arrayoftype[$key] = $val;
+		}
 	}
 }
 
 if ($objecttype) {
-    try {
-    	if (!empty($arrayoftype[$objecttype]['ClassPath'])) {
-    		dol_include_once($arrayoftype[$objecttype]['ClassPath']);
-    	} else {
-    		dol_include_once("/".$objecttype."/class/".$objecttype.".class.php");
-    	}
-        $ObjectClassName = $arrayoftype[$objecttype]['ObjectClassName'];
-        $object = new $ObjectClassName($db);
-    } catch (Exception $e) {
-        print 'Failed to load class for type '.$objecttype;
-    }
+	try {
+		if (!empty($arrayoftype[$objecttype]['ClassPath'])) {
+			dol_include_once($arrayoftype[$objecttype]['ClassPath']);
+		} else {
+			dol_include_once("/".$objecttype."/class/".$objecttype.".class.php");
+		}
+		$ObjectClassName = $arrayoftype[$objecttype]['ObjectClassName'];
+		$object = new $ObjectClassName($db);
+	} catch (Exception $e) {
+		print 'Failed to load class for type '.$objecttype;
+	}
 }
 
 // Security check
@@ -188,7 +188,7 @@ $formother = new FormOther($db);
 if (!defined('USE_CUSTOME_REPORT_AS_INCLUDE')) {
 	llxHeader('', $langs->transnoentitiesnoconv('CustomReports'), '');
 
-	dol_fiche_head($head, 'customreports', $title, -1, $picto);
+	print dol_get_fiche_head($head, 'customreports', $title, -1, $picto);
 }
 
 // Check parameters
@@ -289,13 +289,13 @@ if (is_array($search_groupby) && count($search_groupby)) {
 		if (count($arrayofvaluesforgroupby['g_'.$gkey]) > $MAXUNIQUEVALFORGROUP) {
 			$langs->load("errors");
 			if (strpos($fieldtocount, 'te.') === 0) {
-                //if (!empty($extrafields->attributes[$object->table_element]['langfile'][$gvalwithoutprefix])) {
-                //      $langs->load($extrafields->attributes[$object->table_element]['langfile'][$gvalwithoutprefix]);
-                //}
-                $keyforlabeloffield = $extrafields->attributes[$object->table_element]['label'][$gvalwithoutprefix];
-            } else {
-                $keyforlabeloffield = $object->fields[$gvalwithoutprefix]['label'];
-            }
+				//if (!empty($extrafields->attributes[$object->table_element]['langfile'][$gvalwithoutprefix])) {
+				//      $langs->load($extrafields->attributes[$object->table_element]['langfile'][$gvalwithoutprefix]);
+				//}
+				$keyforlabeloffield = $extrafields->attributes[$object->table_element]['label'][$gvalwithoutprefix];
+			} else {
+				$keyforlabeloffield = $object->fields[$gvalwithoutprefix]['label'];
+			}
 			//var_dump($gkey.' '.$gval.' '.$gvalwithoutprefix);
 			$gvalwithoutprefix = preg_replace('/\-(year|month|day)/', '', $gvalwithoutprefix);
 			$labeloffield = $langs->transnoentitiesnoconv($keyforlabeloffield);
@@ -339,7 +339,7 @@ foreach ($arrayoftype as $key => $val) {
 print $form->selectarray('objecttype', $newarrayoftype, $objecttype, 0, 0, 0, '', 1, 0, 0, '', 'minwidth200', 1);
 if (empty($conf->use_javascript_ajax)) print '<input type="submit" class="button buttongen" name="changeobjecttype" value="'.$langs->trans("Refresh").'">';
 else {
-    print '<script type="text/javascript" language="javascript">
+	print '<script type="text/javascript" language="javascript">
         jQuery(document).ready(function() {
         	jQuery("#objecttype").change(function() {
         		console.log("Reload for "+jQuery("#objecttype").val());
@@ -359,25 +359,25 @@ print '</div>';
 print '<div class="divadvancedsearchfield clearboth">';
 foreach ($object->fields as $key => $val) {
 	if (!empty($val['isameasure']) && (!isset($val['enabled']) || dol_eval($val['enabled'], 1))) {
-        $arrayofmesures['t.'.$key.'-sum'] = $langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>';
-        $arrayofmesures['t.'.$key.'-average'] = $langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Average").')</span>';
-        $arrayofmesures['t.'.$key.'-min'] = $langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Minimum").')</span>';
-        $arrayofmesures['t.'.$key.'-max'] = $langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>';
-    }
+		$arrayofmesures['t.'.$key.'-sum'] = $langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>';
+		$arrayofmesures['t.'.$key.'-average'] = $langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Average").')</span>';
+		$arrayofmesures['t.'.$key.'-min'] = $langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Minimum").')</span>';
+		$arrayofmesures['t.'.$key.'-max'] = $langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>';
+	}
 }
 // Add extrafields to Measures
 if ($object->isextrafieldmanaged) {
-    foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-    	if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key]) && (!isset($extrafields->attributes[$object->table_element]['enabled'][$key]) || dol_eval($extrafields->attributes[$object->table_element]['enabled'][$key], 1))) {
-            $arrayofmesures['te.'.$key.'-sum'] = $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>';
-            $arrayofmesures['te.'.$key.'-average'] = $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Average").')</span>';
-            $arrayofmesures['te.'.$key.'-min'] = $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Minimum").')</span>';
-            $arrayofmesures['te.'.$key.'-max'] = $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>';
-        }
-    }
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key]) && (!isset($extrafields->attributes[$object->table_element]['enabled'][$key]) || dol_eval($extrafields->attributes[$object->table_element]['enabled'][$key], 1))) {
+			$arrayofmesures['te.'.$key.'-sum'] = $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>';
+			$arrayofmesures['te.'.$key.'-average'] = $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Average").')</span>';
+			$arrayofmesures['te.'.$key.'-min'] = $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Minimum").')</span>';
+			$arrayofmesures['te.'.$key.'-max'] = $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>';
+		}
+	}
 }
 print '<div class="inline-block"><span class="fas fa-chart-line paddingright" title="'.$langs->trans("Measures").'"></span>'.$langs->trans("Measures").'</div> ';
-print $form->multiselectarray('search_measures', $arrayofmesures, $search_measures, 0, 0, 'minwidth500', 1);
+print $form->multiselectarray('search_measures', $arrayofmesures, $search_measures, 0, 0, 'minwidth400', 1);
 print '</div>';
 
 
@@ -398,44 +398,44 @@ print '</div>';
 if ($mode == 'grid') {
 	// YAxis
 	print '<div class="divadvancedsearchfield">';
-    foreach ($object->fields as $key => $val) {
-    	if (empty($val['measure']) && (!isset($val['enabled']) || dol_eval($val['enabled'], 1))) {
-            if (in_array($key, array('id', 'rowid', 'entity', 'last_main_doc', 'extraparams'))) continue;
-            if (preg_match('/^fk_/', $key)) continue;
-            if (in_array($val['type'], array('html', 'text'))) continue;
-            if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
-            	$arrayofyaxis['t.'.$key.'-year'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.')', 'position' => $val['position']);
-                $arrayofyaxis['t.'.$key.'-month'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.')', 'position' => $val['position']);
-                $arrayofyaxis['t.'.$key.'-day'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.'-'.$DD.')', 'position' => $val['position']);
-            } else {
-                $arrayofyaxis['t.'.$key] = array('label' => $val['label'], 'position' => (int) $val['position']);
-            }
-        }
-        // Add measure from extrafields
-        if ($object->isextrafieldmanaged) {
-            foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-            	if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key]) && (!isset($extrafields->attributes[$object->table_element]['enabled'][$key]) || dol_eval($extrafields->attributes[$object->table_element]['enabled'][$key], 1))) {
+	foreach ($object->fields as $key => $val) {
+		if (empty($val['measure']) && (!isset($val['enabled']) || dol_eval($val['enabled'], 1))) {
+			if (in_array($key, array('id', 'rowid', 'entity', 'last_main_doc', 'extraparams'))) continue;
+			if (preg_match('/^fk_/', $key)) continue;
+			if (in_array($val['type'], array('html', 'text'))) continue;
+			if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
+				$arrayofyaxis['t.'.$key.'-year'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.')', 'position' => $val['position']);
+				$arrayofyaxis['t.'.$key.'-month'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.')', 'position' => $val['position']);
+				$arrayofyaxis['t.'.$key.'-day'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.'-'.$DD.')', 'position' => $val['position']);
+			} else {
+				$arrayofyaxis['t.'.$key] = array('label' => $val['label'], 'position' => (int) $val['position']);
+			}
+		}
+		// Add measure from extrafields
+		if ($object->isextrafieldmanaged) {
+			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+				if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key]) && (!isset($extrafields->attributes[$object->table_element]['enabled'][$key]) || dol_eval($extrafields->attributes[$object->table_element]['enabled'][$key], 1))) {
 					$arrayofyaxis['te.'.$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'position' => (int) $extrafields->attributes[$object->table_element]['pos'][$key]);
-                }
-            }
-        }
-    }
-    $arrayofyaxis = dol_sort_array($arrayofyaxis, 'position');
-    $arrayofyaxislabel = array();
-    foreach ($arrayofyaxis as $key => $val) {
-        $arrayofyaxislabel[$key] = $val['label'];
-    }
-    print '<div class="inline-block opacitymedium"><span class="fas fa-ruler-vertical paddingright" title="'.$langs->trans("YAxis").'"></span>'.$langs->trans("YAxis").'</div> ';
-    print $form->multiselectarray('search_yaxis', $arrayofyaxislabel, $search_yaxis, 0, 0, 'minwidth100', 1);
-    print '</div>';
+				}
+			}
+		}
+	}
+	$arrayofyaxis = dol_sort_array($arrayofyaxis, 'position');
+	$arrayofyaxislabel = array();
+	foreach ($arrayofyaxis as $key => $val) {
+		$arrayofyaxislabel[$key] = $val['label'];
+	}
+	print '<div class="inline-block opacitymedium"><span class="fas fa-ruler-vertical paddingright" title="'.$langs->trans("YAxis").'"></span>'.$langs->trans("YAxis").'</div> ';
+	print $form->multiselectarray('search_yaxis', $arrayofyaxislabel, $search_yaxis, 0, 0, 'minwidth100', 1);
+	print '</div>';
 }
 
 if ($mode == 'graph') {
-    print '<div class="divadvancedsearchfield">';
-    $arrayofgraphs = array('bars' => 'Bars', 'lines' => 'Lines'); // also 'pies'
-    print '<div class="inline-block opacitymedium"><span class="fas fa-chart-area paddingright" title="'.$langs->trans("Graph").'"></span>'.$langs->trans("Graph").'</div> ';
-    print $form->selectarray('search_graph', $arrayofgraphs, $search_graph, 0, 0, 0, 'minwidth100', 1);
-    print '</div>';
+	print '<div class="divadvancedsearchfield">';
+	$arrayofgraphs = array('bars' => 'Bars', 'lines' => 'Lines'); // also 'pies'
+	print '<div class="inline-block opacitymedium"><span class="fas fa-chart-area paddingright" title="'.$langs->trans("Graph").'"></span>'.$langs->trans("Graph").'</div> ';
+	print $form->selectarray('search_graph', $arrayofgraphs, $search_graph, 0, 0, 0, 'minwidth100', 1);
+	print '</div>';
 }
 print '<div class="divadvancedsearchfield">';
 print '<input type="submit" class="button buttongen" value="'.$langs->trans("Refresh").'">';
@@ -447,129 +447,129 @@ print '</form>';
 $sql = '';
 if (!empty($search_measures) && !empty($search_xaxis))
 {
-    $fieldid = 'rowid';
+	$fieldid = 'rowid';
 
-    $sql = 'SELECT ';
-    foreach ($search_xaxis as $key => $val) {
-        if (preg_match('/\-year$/', $val)) {
-            $tmpval = preg_replace('/\-year$/', '', $val);
-            $sql .= 'DATE_FORMAT('.$tmpval.", '%Y') as x_".$key.', ';
-        } elseif (preg_match('/\-month$/', $val)) {
-            $tmpval = preg_replace('/\-month$/', '', $val);
-            $sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m') as x_".$key.', ';
-        } elseif (preg_match('/\-day$/', $val)) {
-            $tmpval = preg_replace('/\-day$/', '', $val);
-            $sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d') as x_".$key.', ';
-        } else $sql .= $val.' as x_'.$key.', ';
-    }
-    foreach ($search_groupby as $key => $val) {
-    	if (preg_match('/\-year$/', $val)) {
-    		$tmpval = preg_replace('/\-year$/', '', $val);
-    		$sql .= 'DATE_FORMAT('.$tmpval.", '%Y') as g_".$key.', ';
-    	} elseif (preg_match('/\-month$/', $val)) {
-    		$tmpval = preg_replace('/\-month$/', '', $val);
-    		$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m') as g_".$key.', ';
-    	} elseif (preg_match('/\-day$/', $val)) {
-    		$tmpval = preg_replace('/\-day$/', '', $val);
-    		$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d') as g_".$key.', ';
-    	} else $sql .= $val.' as g_'.$key.', ';
-    }
-    foreach ($search_measures as $key => $val) {
-        if ($val == 't.count') $sql .= 'COUNT(t.'.$fieldid.') as y_'.$key.', ';
-        elseif (preg_match('/\-sum$/', $val)) {
-            $tmpval = preg_replace('/\-sum$/', '', $val);
-            $sql .= 'SUM('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
-        } elseif (preg_match('/\-average$/', $val)) {
-            $tmpval = preg_replace('/\-average$/', '', $val);
-            $sql .= 'AVG('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
-        } elseif (preg_match('/\-min$/', $val)) {
-        	$tmpval  = preg_replace('/\-min$/', '', $val);
-        	$sql .= 'MIN('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
-        } elseif (preg_match('/\-max$/', $val)) {
-        	$tmpval = preg_replace('/\-max$/', '', $val);
-        	$sql .= 'MAX('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
-        }
-    }
-    $sql = preg_replace('/,\s*$/', '', $sql);
-    $sql .= ' FROM '.MAIN_DB_PREFIX.$object->table_element.' as t';
-    // Add measure from extrafields
-    if ($object->isextrafieldmanaged) {
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.$object->table_element.'_extrafields as te ON te.fk_object = t.'.$fieldid;
-    }
-    if ($object->ismultientitymanaged) {
-    	if ($object->ismultientitymanaged == 1) {
-    		// Nothing here
-    	} else {
-    		$tmparray = explode('@', $object->ismultientitymanaged);
-    		$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.$tmparray[1].' as parenttable ON t.'.$tmparray[0].' = parenttable.rowid';
-    		$sql .= ' AND parenttable.entity IN ('.getEntity($tmparray[1]).')';
-    	}
-    }
-    $sql .= ' WHERE 1 = 1';
-    if ($object->ismultientitymanaged == 1) {
+	$sql = 'SELECT ';
+	foreach ($search_xaxis as $key => $val) {
+		if (preg_match('/\-year$/', $val)) {
+			$tmpval = preg_replace('/\-year$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y') as x_".$key.', ';
+		} elseif (preg_match('/\-month$/', $val)) {
+			$tmpval = preg_replace('/\-month$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m') as x_".$key.', ';
+		} elseif (preg_match('/\-day$/', $val)) {
+			$tmpval = preg_replace('/\-day$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d') as x_".$key.', ';
+		} else $sql .= $val.' as x_'.$key.', ';
+	}
+	foreach ($search_groupby as $key => $val) {
+		if (preg_match('/\-year$/', $val)) {
+			$tmpval = preg_replace('/\-year$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y') as g_".$key.', ';
+		} elseif (preg_match('/\-month$/', $val)) {
+			$tmpval = preg_replace('/\-month$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m') as g_".$key.', ';
+		} elseif (preg_match('/\-day$/', $val)) {
+			$tmpval = preg_replace('/\-day$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d') as g_".$key.', ';
+		} else $sql .= $val.' as g_'.$key.', ';
+	}
+	foreach ($search_measures as $key => $val) {
+		if ($val == 't.count') $sql .= 'COUNT(t.'.$fieldid.') as y_'.$key.', ';
+		elseif (preg_match('/\-sum$/', $val)) {
+			$tmpval = preg_replace('/\-sum$/', '', $val);
+			$sql .= 'SUM('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
+		} elseif (preg_match('/\-average$/', $val)) {
+			$tmpval = preg_replace('/\-average$/', '', $val);
+			$sql .= 'AVG('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
+		} elseif (preg_match('/\-min$/', $val)) {
+			$tmpval = preg_replace('/\-min$/', '', $val);
+			$sql .= 'MIN('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
+		} elseif (preg_match('/\-max$/', $val)) {
+			$tmpval = preg_replace('/\-max$/', '', $val);
+			$sql .= 'MAX('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
+		}
+	}
+	$sql = preg_replace('/,\s*$/', '', $sql);
+	$sql .= ' FROM '.MAIN_DB_PREFIX.$object->table_element.' as t';
+	// Add measure from extrafields
+	if ($object->isextrafieldmanaged) {
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.$object->table_element.'_extrafields as te ON te.fk_object = t.'.$fieldid;
+	}
+	if ($object->ismultientitymanaged) {
+		if ($object->ismultientitymanaged == 1) {
+			// Nothing here
+		} else {
+			$tmparray = explode('@', $object->ismultientitymanaged);
+			$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.$tmparray[1].' as parenttable ON t.'.$tmparray[0].' = parenttable.rowid';
+			$sql .= ' AND parenttable.entity IN ('.getEntity($tmparray[1]).')';
+		}
+	}
+	$sql .= ' WHERE 1 = 1';
+	if ($object->ismultientitymanaged == 1) {
    		$sql .= ' AND entity IN ('.getEntity($object->element).')';
-    }
-    foreach ($search_filters as $key => $val) {
-    	// TODO Add the where here
-    }
-    $sql .= ' GROUP BY ';
-    foreach ($search_xaxis as $key => $val) {
-        if (preg_match('/\-year$/', $val)) {
-            $tmpval = preg_replace('/\-year$/', '', $val);
-            $sql .= 'DATE_FORMAT('.$tmpval.", '%Y'), ";
-        } elseif (preg_match('/\-month$/', $val)) {
-            $tmpval = preg_replace('/\-month$/', '', $val);
-            $sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m'), ";
-        } elseif (preg_match('/\-day$/', $val)) {
-            $tmpval = preg_replace('/\-day$/', '', $val);
-            $sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
-        } else $sql .= $val.', ';
-    }
-    foreach ($search_groupby as $key => $val) {
-    	if (preg_match('/\-year$/', $val)) {
-    		$tmpval = preg_replace('/\-year$/', '', $val);
-    		$sql .= 'DATE_FORMAT('.$tmpval.", '%Y'), ";
-    	} elseif (preg_match('/\-month$/', $val)) {
-    		$tmpval = preg_replace('/\-month$/', '', $val);
-    		$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m'), ";
-    	} elseif (preg_match('/\-day$/', $val)) {
-    		$tmpval = preg_replace('/\-day$/', '', $val);
-    		$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
-    	} else $sql .= $val.', ';
-    }
-    $sql = preg_replace('/,\s*$/', '', $sql);
-    $sql .= ' ORDER BY ';
-    foreach ($search_xaxis as $key => $val) {
-        if (preg_match('/\-year$/', $val)) {
-            $tmpval = preg_replace('/\-year$/', '', $val);
-            $sql .= 'DATE_FORMAT('.$tmpval.", '%Y'), ";
-        } elseif (preg_match('/\-month$/', $val)) {
-            $tmpval = preg_replace('/\-month$/', '', $val);
-            $sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m'), ";
-        } elseif (preg_match('/\-day$/', $val)) {
-            $tmpval = preg_replace('/\-day$/', '', $val);
-            $sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
-        } else $sql .= $val.', ';
-    }
-    foreach ($search_groupby as $key => $val) {
-    	if (preg_match('/\-year$/', $val)) {
-    		$tmpval = preg_replace('/\-year$/', '', $val);
-    		$sql .= 'DATE_FORMAT('.$tmpval.", '%Y'), ";
-    	} elseif (preg_match('/\-month$/', $val)) {
-    		$tmpval = preg_replace('/\-month$/', '', $val);
-    		$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m'), ";
-    	} elseif (preg_match('/\-day$/', $val)) {
-    		$tmpval = preg_replace('/\-day$/', '', $val);
-    		$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
-    	} else $sql .= $val.', ';
-    }
-    $sql = preg_replace('/,\s*$/', '', $sql);
+	}
+	foreach ($search_filters as $key => $val) {
+		// TODO Add the where here
+	}
+	$sql .= ' GROUP BY ';
+	foreach ($search_xaxis as $key => $val) {
+		if (preg_match('/\-year$/', $val)) {
+			$tmpval = preg_replace('/\-year$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y'), ";
+		} elseif (preg_match('/\-month$/', $val)) {
+			$tmpval = preg_replace('/\-month$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m'), ";
+		} elseif (preg_match('/\-day$/', $val)) {
+			$tmpval = preg_replace('/\-day$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
+		} else $sql .= $val.', ';
+	}
+	foreach ($search_groupby as $key => $val) {
+		if (preg_match('/\-year$/', $val)) {
+			$tmpval = preg_replace('/\-year$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y'), ";
+		} elseif (preg_match('/\-month$/', $val)) {
+			$tmpval = preg_replace('/\-month$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m'), ";
+		} elseif (preg_match('/\-day$/', $val)) {
+			$tmpval = preg_replace('/\-day$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
+		} else $sql .= $val.', ';
+	}
+	$sql = preg_replace('/,\s*$/', '', $sql);
+	$sql .= ' ORDER BY ';
+	foreach ($search_xaxis as $key => $val) {
+		if (preg_match('/\-year$/', $val)) {
+			$tmpval = preg_replace('/\-year$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y'), ";
+		} elseif (preg_match('/\-month$/', $val)) {
+			$tmpval = preg_replace('/\-month$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m'), ";
+		} elseif (preg_match('/\-day$/', $val)) {
+			$tmpval = preg_replace('/\-day$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
+		} else $sql .= $val.', ';
+	}
+	foreach ($search_groupby as $key => $val) {
+		if (preg_match('/\-year$/', $val)) {
+			$tmpval = preg_replace('/\-year$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y'), ";
+		} elseif (preg_match('/\-month$/', $val)) {
+			$tmpval = preg_replace('/\-month$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m'), ";
+		} elseif (preg_match('/\-day$/', $val)) {
+			$tmpval = preg_replace('/\-day$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
+		} else $sql .= $val.', ';
+	}
+	$sql = preg_replace('/,\s*$/', '', $sql);
 }
 //print $sql;
 
 $legend = array();
 foreach ($search_measures as $key => $val) {
-    $legend[] = $langs->trans($arrayofmesures[$val]);
+	$legend[] = $langs->trans($arrayofmesures[$val]);
 }
 
 $useagroupby = (is_array($search_groupby) && count($search_groupby));
@@ -580,33 +580,33 @@ $useagroupby = (is_array($search_groupby) && count($search_groupby));
 $totalnbofrecord = 0;
 $data = array();
 if ($sql) {
-    $resql = $db->query($sql);
-    if (!$resql) {
-        dol_print_error($db);
-    }
+	$resql = $db->query($sql);
+	if (!$resql) {
+		dol_print_error($db);
+	}
 
-    $ifetch = 0; $xi = 0; $oldlabeltouse = '';
-    while ($obj = $db->fetch_object($resql)) {
-    	$ifetch++;
-    	if ($useagroupby) {
-    		$xval = $search_xaxis[0];
-    		$fieldforxkey = 'x_0';
-    		$xlabel = $obj->$fieldforxkey;
-    		$xvalwithoutprefix = preg_replace('/^[a-z]+\./', '', $xval);
+	$ifetch = 0; $xi = 0; $oldlabeltouse = '';
+	while ($obj = $db->fetch_object($resql)) {
+		$ifetch++;
+		if ($useagroupby) {
+			$xval = $search_xaxis[0];
+			$fieldforxkey = 'x_0';
+			$xlabel = $obj->$fieldforxkey;
+			$xvalwithoutprefix = preg_replace('/^[a-z]+\./', '', $xval);
 
-    		// Define $xlabel
-    		if (!empty($object->fields[$xvalwithoutprefix]['arrayofkeyval'])) {
-    			$xlabel = $object->fields[$xvalwithoutprefix]['arrayofkeyval'][$obj->$fieldforxkey];
-    		}
-    		$labeltouse = (($xlabel || $xlabel == '0') ? dol_trunc($xlabel, 20, 'middle') : ($xlabel === '' ? $langs->trans("Empty") : $langs->trans("NotDefined")));
+			// Define $xlabel
+			if (!empty($object->fields[$xvalwithoutprefix]['arrayofkeyval'])) {
+				$xlabel = $object->fields[$xvalwithoutprefix]['arrayofkeyval'][$obj->$fieldforxkey];
+			}
+			$labeltouse = (($xlabel || $xlabel == '0') ? dol_trunc($xlabel, 20, 'middle') : ($xlabel === '' ? $langs->trans("Empty") : $langs->trans("NotDefined")));
 
-    		if ($oldlabeltouse && ($labeltouse != $oldlabeltouse)) {
-    			$xi++; // Increase $xi
-    		}
-    		//var_dump($labeltouse.' '.$oldlabeltouse.' '.$xi);
-    		$oldlabeltouse = $labeltouse;
+			if ($oldlabeltouse && ($labeltouse != $oldlabeltouse)) {
+				$xi++; // Increase $xi
+			}
+			//var_dump($labeltouse.' '.$oldlabeltouse.' '.$xi);
+			$oldlabeltouse = $labeltouse;
 
-    		/* Example of value for $arrayofvaluesforgroupby
+			/* Example of value for $arrayofvaluesforgroupby
     		 * array (size=1)
 			 *	  'g_0' =>
 			 *	    array (size=6)
@@ -617,80 +617,80 @@ if ($sql) {
 			 *	      'processing' => string 'processing' (length=10)
 			 *	      'undeployed' => string 'undeployed' (length=10)
     		 */
-    		foreach ($search_measures as $key => $val) {
-    			$gi = 0;
-    			foreach ($search_groupby as $gkey) {
-    				//var_dump('*** Fetch #'.$ifetch.' for labeltouse='.$labeltouse.' measure number '.$key.' and group g_'.$gi);
-    				//var_dump($arrayofvaluesforgroupby);
-    				foreach ($arrayofvaluesforgroupby['g_'.$gi] as $gvaluepossiblekey => $gvaluepossiblelabel) {
-    					$ykeysuffix = $gvaluepossiblelabel;
-    					$gvalwithoutprefix = preg_replace('/^[a-z]+\./', '', $gval);
+			foreach ($search_measures as $key => $val) {
+				$gi = 0;
+				foreach ($search_groupby as $gkey) {
+					//var_dump('*** Fetch #'.$ifetch.' for labeltouse='.$labeltouse.' measure number '.$key.' and group g_'.$gi);
+					//var_dump($arrayofvaluesforgroupby);
+					foreach ($arrayofvaluesforgroupby['g_'.$gi] as $gvaluepossiblekey => $gvaluepossiblelabel) {
+						$ykeysuffix = $gvaluepossiblelabel;
+						$gvalwithoutprefix = preg_replace('/^[a-z]+\./', '', $gval);
 
-    					$fieldfory = 'y_'.$key;
-    					$fieldforg = 'g_'.$gi;
-    					$fieldforybis = 'y_'.$key.'_'.$ykeysuffix;
-    					//var_dump('gvaluepossiblekey='.$gvaluepossiblekey.' gvaluepossiblelabel='.$gvaluepossiblelabel.' ykeysuffix='.$ykeysuffix.' gval='.$gval.' gvalwithoutsuffix='.$gvalwithoutprefix);
-    					//var_dump('fieldforg='.$fieldforg.' obj->$fieldforg='.$obj->$fieldforg.' fieldfory='.$fieldfory.' obj->$fieldfory='.$obj->$fieldfory.' fieldforybis='.$fieldforybis);
+						$fieldfory = 'y_'.$key;
+						$fieldforg = 'g_'.$gi;
+						$fieldforybis = 'y_'.$key.'_'.$ykeysuffix;
+						//var_dump('gvaluepossiblekey='.$gvaluepossiblekey.' gvaluepossiblelabel='.$gvaluepossiblelabel.' ykeysuffix='.$ykeysuffix.' gval='.$gval.' gvalwithoutsuffix='.$gvalwithoutprefix);
+						//var_dump('fieldforg='.$fieldforg.' obj->$fieldforg='.$obj->$fieldforg.' fieldfory='.$fieldfory.' obj->$fieldfory='.$obj->$fieldfory.' fieldforybis='.$fieldforybis);
 
-    					if (!is_array($data[$xi])) $data[$xi] = array();
+						if (!is_array($data[$xi])) $data[$xi] = array();
 
 						if (!array_key_exists('label', $data[$xi])) {
-    						$data[$xi] = array();
-    						$data[$xi]['label'] = $labeltouse;
-    					}
+							$data[$xi] = array();
+							$data[$xi]['label'] = $labeltouse;
+						}
 
-    					$objfieldforg = $obj->$fieldforg;
-    					if (is_null($objfieldforg)) $objfieldforg = '__NULL__';
+						$objfieldforg = $obj->$fieldforg;
+						if (is_null($objfieldforg)) $objfieldforg = '__NULL__';
 
-    					if ($gvaluepossiblekey == '0') {	// $gvaluepossiblekey can have type int or string. So we create a special if, used when value is '0'
-    						//var_dump($objfieldforg.' == \'0\' -> '.($objfieldforg == '0'));
-    						if ($objfieldforg == '0') {
-    							// The record we fetch is for this group
-    							$data[$xi][$fieldforybis] = $obj->$fieldfory;
-    						}
-    						// The record we fetch is not for this group
-    						elseif (!isset($data[$xi][$fieldforybis])) {
-    							$data[$xi][$fieldforybis] = '0';
-    						}
-    					} else {
-    						//var_dump((string) $objfieldforg.' === '.(string) $gvaluepossiblekey.' -> '.((string) $objfieldforg === (string) $gvaluepossiblekey));
-    						if ((string) $objfieldforg === (string) $gvaluepossiblekey) {
-    							// The record we fetch is for this group
-    							$data[$xi][$fieldforybis] = $obj->$fieldfory;
-    						}
-    						// The record we fetch is not for this group
-    						elseif (!isset($data[$xi][$fieldforybis])) {
-    							$data[$xi][$fieldforybis] = '0';
-    						}
-    					}
-    				}
-    				//var_dump($data[$xi]);
-    				$gi++;
-    			}
-    		}
-    	} else {	// No group by
-    		$xval = $search_xaxis[0];
-    		$fieldforxkey = 'x_0';
-    		$xlabel = $obj->$fieldforxkey;
-    		$xvalwithoutprefix = preg_replace('/^[a-z]+\./', '', $xval);
+						if ($gvaluepossiblekey == '0') {	// $gvaluepossiblekey can have type int or string. So we create a special if, used when value is '0'
+							//var_dump($objfieldforg.' == \'0\' -> '.($objfieldforg == '0'));
+							if ($objfieldforg == '0') {
+								// The record we fetch is for this group
+								$data[$xi][$fieldforybis] = $obj->$fieldfory;
+							}
+							// The record we fetch is not for this group
+							elseif (!isset($data[$xi][$fieldforybis])) {
+								$data[$xi][$fieldforybis] = '0';
+							}
+						} else {
+							//var_dump((string) $objfieldforg.' === '.(string) $gvaluepossiblekey.' -> '.((string) $objfieldforg === (string) $gvaluepossiblekey));
+							if ((string) $objfieldforg === (string) $gvaluepossiblekey) {
+								// The record we fetch is for this group
+								$data[$xi][$fieldforybis] = $obj->$fieldfory;
+							}
+							// The record we fetch is not for this group
+							elseif (!isset($data[$xi][$fieldforybis])) {
+								$data[$xi][$fieldforybis] = '0';
+							}
+						}
+					}
+					//var_dump($data[$xi]);
+					$gi++;
+				}
+			}
+		} else {	// No group by
+			$xval = $search_xaxis[0];
+			$fieldforxkey = 'x_0';
+			$xlabel = $obj->$fieldforxkey;
+			$xvalwithoutprefix = preg_replace('/^[a-z]+\./', '', $xval);
 
-    		// Define $xlabel
-    		if (!empty($object->fields[$xvalwithoutprefix]['arrayofkeyval'])) {
-    			$xlabel = $object->fields[$xvalwithoutprefix]['arrayofkeyval'][$obj->$fieldforxkey];
-    		}
+			// Define $xlabel
+			if (!empty($object->fields[$xvalwithoutprefix]['arrayofkeyval'])) {
+				$xlabel = $object->fields[$xvalwithoutprefix]['arrayofkeyval'][$obj->$fieldforxkey];
+			}
 
-    		$labeltouse = (($xlabel || $xlabel == '0') ? dol_trunc($xlabel, 20, 'middle') : ($xlabel === '' ? $langs->trans("Empty") : $langs->trans("NotDefined")));
-    		$xarrayforallseries = array('label' => $labeltouse);
-    		foreach ($search_measures as $key => $val) {
-    			$fieldfory = 'y_'.$key;
-    			$xarrayforallseries[$fieldfory] = $obj->$fieldfory;
-    		}
-    		$data[$xi] = $xarrayforallseries;
-    		$xi++;
-    	}
-    }
+			$labeltouse = (($xlabel || $xlabel == '0') ? dol_trunc($xlabel, 20, 'middle') : ($xlabel === '' ? $langs->trans("Empty") : $langs->trans("NotDefined")));
+			$xarrayforallseries = array('label' => $labeltouse);
+			foreach ($search_measures as $key => $val) {
+				$fieldfory = 'y_'.$key;
+				$xarrayforallseries[$fieldfory] = $obj->$fieldfory;
+			}
+			$data[$xi] = $xarrayforallseries;
+			$xi++;
+		}
+	}
 
-    $totalnbofrecord = count($data);
+	$totalnbofrecord = count($data);
 }
 //var_dump($data);
 
@@ -703,62 +703,62 @@ if ($mode == 'grid') {
 }
 
 if ($mode == 'graph') {
-    $WIDTH = '80%';
-    $HEIGHT = 200;
+	$WIDTH = '80%';
+	$HEIGHT = 200;
 
-    // Show graph
-    $px1 = new DolGraph();
-    $mesg = $px1->isGraphKo();
-    if (!$mesg)
-    {
-    	/*var_dump($legend);
+	// Show graph
+	$px1 = new DolGraph();
+	$mesg = $px1->isGraphKo();
+	if (!$mesg)
+	{
+		/*var_dump($legend);
     	var_dump($data);*/
-    	$px1->SetData($data);
-    	unset($data);
+		$px1->SetData($data);
+		unset($data);
 
-    	$arrayoftypes = array();
-    	foreach ($search_measures as $key => $val) {
-    	    $arrayoftypes[] = $search_graph;
-    	}
+		$arrayoftypes = array();
+		foreach ($search_measures as $key => $val) {
+			$arrayoftypes[] = $search_graph;
+		}
 
-    	$px1->SetLegend($legend);
-    	$px1->SetMinValue($px1->GetFloorMinValue());
-    	$px1->SetMaxValue($px1->GetCeilMaxValue());
-    	$px1->SetWidth($WIDTH);
-    	$px1->SetHeight($HEIGHT);
-    	$px1->SetYLabel($langs->trans("Y"));
-    	$px1->SetShading(3);
-    	$px1->SetHorizTickIncrement(1);
-    	$px1->SetCssPrefix("cssboxes");
-    	$px1->SetType($arrayoftypes);
-    	$px1->mode = 'depth';
-    	$px1->SetTitle('');
+		$px1->SetLegend($legend);
+		$px1->SetMinValue($px1->GetFloorMinValue());
+		$px1->SetMaxValue($px1->GetCeilMaxValue());
+		$px1->SetWidth($WIDTH);
+		$px1->SetHeight($HEIGHT);
+		$px1->SetYLabel($langs->trans("Y"));
+		$px1->SetShading(3);
+		$px1->SetHorizTickIncrement(1);
+		$px1->SetCssPrefix("cssboxes");
+		$px1->SetType($arrayoftypes);
+		$px1->mode = 'depth';
+		$px1->SetTitle('');
 
-    	$dir = $conf->user->dir_temp;
-    	dol_mkdir($dir);
-    	$filenamenb = $dir.'/customreport_'.$object->element.'.png';
-    	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=user&file=customreport_'.$object->element.'.png';
+		$dir = $conf->user->dir_temp;
+		dol_mkdir($dir);
+		$filenamenb = $dir.'/customreport_'.$object->element.'.png';
+		$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=user&file=customreport_'.$object->element.'.png';
 
-    	$px1->draw($filenamenb, $fileurlnb);
+		$px1->draw($filenamenb, $fileurlnb);
 
-    	$texttoshow = $langs->trans("NoRecordFound");
-    	if (!GETPOSTISSET('search_measures') || !GETPOSTISSET('search_xaxis')) {
-    		$texttoshow = $langs->trans("SelectYourGraphOptionsFirst");
-    	}
+		$texttoshow = $langs->trans("NoRecordFound");
+		if (!GETPOSTISSET('search_measures') || !GETPOSTISSET('search_xaxis')) {
+			$texttoshow = $langs->trans("SelectYourGraphOptionsFirst");
+		}
 
-    	print $px1->show($totalnbofrecord ? 0 : $texttoshow);
-    }
+		print $px1->show($totalnbofrecord ? 0 : $texttoshow);
+	}
 }
 
 if ($sql) {
-    // Show admin info
-    print '<br>'.info_admin($langs->trans("SQLUsedForExport").':<br> '.$sql, 0, 0, 1, '', 'TechnicalInformation');
+	// Show admin info
+	print '<br>'.info_admin($langs->trans("SQLUsedForExport").':<br> '.$sql, 0, 0, 1, '', 'TechnicalInformation');
 }
 
 print '<div>';
 
 if (!defined('USE_CUSTOME_REPORT_AS_INCLUDE')) {
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index cb290a49c07..48bcbab6f3e 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -75,7 +75,7 @@ abstract class DoliDB implements Database
 	 *	@param	string	$resko          resultat si test non egal
 	 *	@return	string          		SQL string
 	 */
-    public function ifsql($test, $resok, $resko)
+	public function ifsql($test, $resok, $resko)
 	{
 		return 'IF('.$test.','.$resok.','.$resko.')';
 	}
@@ -87,10 +87,10 @@ abstract class DoliDB implements Database
 	 *   @param	    int		$param      	Date TMS to convert
 	 *   @return	string      			Date in a string YYYY-MM-DD HH:MM:SS
 	 */
-    public function idate($param)
+	public function idate($param)
 	{
 		// TODO GMT $param should be gmt, so we should add tzouptut to 'gmt'
-		return dol_print_date($param, "%Y-%m-%d %H:%M:%S");
+		return dol_print_date($param, "%Y-%m-%d %H:%M:%S", 'tzserver');
 	}
 
 	/**
@@ -98,7 +98,7 @@ abstract class DoliDB implements Database
 	 *
 	 *	@return	    string	lasterrno
 	 */
-    public function lasterrno()
+	public function lasterrno()
 	{
 		return $this->lasterrno;
 	}
@@ -106,12 +106,17 @@ abstract class DoliDB implements Database
 	/**
 	 * Sanitize a string for SQL forging
 	 *
-	 * @param   string $stringtosanitize 	String to escape
+	 * @param   string 	$stringtosanitize 	String to escape
+	 * @param   int		$allowsimplequote 	Allow simple quote
 	 * @return  string                      String escaped
 	 */
-	public function sanitize($stringtosanitize)
+	public function sanitize($stringtosanitize, $allowsimplequote = 0)
 	{
-		return preg_replace('/[^a-z0-9_\-\.,]/i', '', $stringtosanitize);
+		if ($allowsimplequote) {
+			return preg_replace('/[^a-z0-9_\-\.,\']/i', '', $stringtosanitize);
+		} else {
+			return preg_replace('/[^a-z0-9_\-\.,]/i', '', $stringtosanitize);
+		}
 	}
 
 	/**
@@ -119,7 +124,7 @@ abstract class DoliDB implements Database
 	 *
 	 * @return	    int         1 if transaction successfuly opened or already opened, 0 if error
 	 */
-    public function begin()
+	public function begin()
 	{
 		if (!$this->transaction_opened)
 		{
@@ -144,7 +149,7 @@ abstract class DoliDB implements Database
 	 * @param	string	$log		Add more log to default log line
 	 * @return	int         		1 if validation is OK or transaction level no started, 0 if ERROR
 	 */
-    public function commit($log = '')
+	public function commit($log = '')
 	{
 		dol_syslog('', 0, -1);
 		if ($this->transaction_opened <= 1)
@@ -170,7 +175,7 @@ abstract class DoliDB implements Database
 	 * 	@param	string			$log		Add more log to default log line
 	 * 	@return	resource|int         		1 if cancelation is ok or transaction not open, 0 if error
 	 */
-    public function rollback($log = '')
+	public function rollback($log = '')
 	{
 		dol_syslog('', 0, -1);
 		if ($this->transaction_opened <= 1)
@@ -192,7 +197,7 @@ abstract class DoliDB implements Database
 	 *	@param	int		$offset     Numero of line from where starting fetch
 	 *	@return	string      		String with SQL syntax to add a limit and offset
 	 */
-    public function plimit($limit = 0, $offset = 0)
+	public function plimit($limit = 0, $offset = 0)
 	{
 		global $conf;
 		if (empty($limit)) return "";
@@ -206,7 +211,7 @@ abstract class DoliDB implements Database
 	 *
 	 *	@return	        array  		Version array
 	 */
-    public function getVersionArray()
+	public function getVersionArray()
 	{
 		return preg_split("/[\.,-]/", $this->getVersion());
 	}
@@ -216,7 +221,7 @@ abstract class DoliDB implements Database
 	 *
 	 *	@return	string					Last query
 	 */
-    public function lastquery()
+	public function lastquery()
 	{
 		return $this->lastquery;
 	}
@@ -228,28 +233,32 @@ abstract class DoliDB implements Database
 	 * @param	string		$sortorder		Sort order, separated by comma. Example: 'ASC,DESC';
 	 * @return	string						String to provide syntax of a sort sql string
 	 */
-    public function order($sortfield = null, $sortorder = null)
+	public function order($sortfield = null, $sortorder = null)
 	{
 		if (!empty($sortfield))
 		{
+			$oldsortorder = '';
 			$return = '';
 			$fields = explode(',', $sortfield);
 			$orders = explode(',', $sortorder);
 			$i = 0;
-			foreach ($fields as $val)
-			{
+			foreach ($fields as $val) {
 				if (!$return) $return .= ' ORDER BY ';
 				else $return .= ', ';
 
-				$return .= preg_replace('/[^0-9a-z_\.]/i', '', $val);
+				$return .= preg_replace('/[^0-9a-z_\.]/i', '', $val); // Add field
 
-				$tmpsortorder = trim($orders[$i]);
+				$tmpsortorder = (empty($orders[$i]) ? '' : trim($orders[$i]));
 
 				// Only ASC and DESC values are valid SQL
 				if (strtoupper($tmpsortorder) === 'ASC') {
+					$oldsortorder = 'ASC';
 					$return .= ' ASC';
 				} elseif (strtoupper($tmpsortorder) === 'DESC') {
+					$oldsortorder = 'DESC';
 					$return .= ' DESC';
+				} else {
+					$return .= ' '.($oldsortorder ? $oldsortorder : 'ASC');
 				}
 
 				$i++;
@@ -265,7 +274,7 @@ abstract class DoliDB implements Database
 	 *
 	 *	@return	    string		Last error
 	 */
-    public function lasterror()
+	public function lasterror()
 	{
 		return $this->lasterror;
 	}
@@ -279,7 +288,7 @@ abstract class DoliDB implements Database
 	 *	@param	bool				$gm			1=Input informations are GMT values, otherwise local to server TZ
 	 *	@return	int|string						Date TMS or ''
 	 */
-    public function jdate($string, $gm = false)
+	public function jdate($string, $gm = false)
 	{
 		// TODO GMT must set param gm to true by default
 		if ($string == 0 || $string == "0000-00-00 00:00:00") return '';
@@ -294,7 +303,7 @@ abstract class DoliDB implements Database
 	 *
 	 *	@return	    string	lastqueryerror
 	 */
-    public function lastqueryerror()
+	public function lastqueryerror()
 	{
 		return $this->lastqueryerror;
 	}
@@ -332,8 +341,8 @@ abstract class DoliDB implements Database
 		if ($res)
 		{
 			$results = array();
-			if ($this->num_rows($res) > 0){
-				while ($obj = $this->fetch_object($res)){
+			if ($this->num_rows($res) > 0) {
+				while ($obj = $this->fetch_object($res)) {
 					$results[] = $obj;
 				}
 			}
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index e3687f7f405..2c24cfe7461 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -34,16 +34,16 @@ class DoliDBMysqli extends DoliDB
 {
 	/** @var mysqli Database object */
 	public $db;
-    //! Database type
-    public $type = 'mysqli';
-    //! Database label
-    const LABEL = 'MySQL or MariaDB';
-    //! Version min database
-    const VERSIONMIN = '5.0.3';
+	//! Database type
+	public $type = 'mysqli';
+	//! Database label
+	const LABEL = 'MySQL or MariaDB';
+	//! Version min database
+	const VERSIONMIN = '5.0.3';
 	/** @var bool|mysqli_result Resultset of last query */
 	private $_results;
 
-    /**
+	/**
 	 *	Constructor.
 	 *	This create an opened connexion to a database server and eventually to a database
 	 *
@@ -53,38 +53,38 @@ class DoliDBMysqli extends DoliDB
 	 *	@param	    string	$pass		Mot de passe
 	 *	@param	    string	$name		Nom de la database
 	 *	@param	    int		$port		Port of database server
-     */
-    public function __construct($type, $host, $user, $pass, $name = '', $port = 0)
-    {
-        global $conf, $langs;
+	 */
+	public function __construct($type, $host, $user, $pass, $name = '', $port = 0)
+	{
+		global $conf, $langs;
 
-        // Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
-        if (!empty($conf->db->character_set)) $this->forcecharset = $conf->db->character_set;
-        if (!empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate = $conf->db->dolibarr_main_db_collation;
+		// Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
+		if (!empty($conf->db->character_set)) $this->forcecharset = $conf->db->character_set;
+		if (!empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate = $conf->db->dolibarr_main_db_collation;
 
-        $this->database_user = $user;
-        $this->database_host = $host;
-        $this->database_port = $port;
+		$this->database_user = $user;
+		$this->database_host = $host;
+		$this->database_port = $port;
 
-        $this->transaction_opened = 0;
+		$this->transaction_opened = 0;
 
-        //print "Name DB: $host,$user,$pass,$name<br>";
+		//print "Name DB: $host,$user,$pass,$name<br>";
 
-        if (!class_exists('mysqli'))
-        {
-            $this->connected = false;
-            $this->ok = false;
-            $this->error = "Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.";
-            dol_syslog(get_class($this)."::DoliDBMysqli : Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.", LOG_ERR);
-        }
+		if (!class_exists('mysqli'))
+		{
+			$this->connected = false;
+			$this->ok = false;
+			$this->error = "Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.";
+			dol_syslog(get_class($this)."::DoliDBMysqli : Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.", LOG_ERR);
+		}
 
-        if (!$host)
-        {
-            $this->connected = false;
-            $this->ok = false;
-            $this->error = $langs->trans("ErrorWrongHostParameter");
-            dol_syslog(get_class($this)."::DoliDBMysqli : Connect error, wrong host parameters", LOG_ERR);
-        }
+		if (!$host)
+		{
+			$this->connected = false;
+			$this->ok = false;
+			$this->error = $langs->trans("ErrorWrongHostParameter");
+			dol_syslog(get_class($this)."::DoliDBMysqli : Connect error, wrong host parameters", LOG_ERR);
+		}
 
 		// Try server connection
 		// We do not try to connect to database, only to server. Connect to database is done later in constrcutor
@@ -101,17 +101,17 @@ class DoliDBMysqli extends DoliDB
 		}
 
 		// If server connection is ok, we try to connect to the database
-        if ($this->connected && $name)
-        {
-            if ($this->select_db($name))
-            {
-                $this->database_selected = true;
-                $this->database_name = $name;
-                $this->ok = true;
+		if ($this->connected && $name)
+		{
+			if ($this->select_db($name))
+			{
+				$this->database_selected = true;
+				$this->database_name = $name;
+				$this->ok = true;
 
-                // If client is old latin, we force utf8
-                $clientmustbe = empty($conf->db->dolibarr_main_db_character_set) ? 'utf8' : $conf->db->dolibarr_main_db_character_set;
-                if (preg_match('/latin1/', $clientmustbe)) $clientmustbe = 'utf8';
+				// If client is old latin, we force utf8
+				$clientmustbe = empty($conf->db->dolibarr_main_db_character_set) ? 'utf8' : $conf->db->dolibarr_main_db_character_set;
+				if (preg_match('/latin1/', $clientmustbe)) $clientmustbe = 'utf8';
 
 				if ($this->db->character_set_name() != $clientmustbe) {
 					$this->db->set_charset($clientmustbe); // This set charset, but with a bad collation
@@ -121,63 +121,63 @@ class DoliDBMysqli extends DoliDB
 
 					if (!preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
 				}
-            } else {
-                $this->database_selected = false;
-                $this->database_name = '';
-                $this->ok = false;
-                $this->error = $this->error();
-                dol_syslog(get_class($this)."::DoliDBMysqli : Select_db error ".$this->error, LOG_ERR);
-            }
-        } else {
-            // Pas de selection de base demandee, ok ou ko
-            $this->database_selected = false;
+			} else {
+				$this->database_selected = false;
+				$this->database_name = '';
+				$this->ok = false;
+				$this->error = $this->error();
+				dol_syslog(get_class($this)."::DoliDBMysqli : Select_db error ".$this->error, LOG_ERR);
+			}
+		} else {
+			// Pas de selection de base demandee, ok ou ko
+			$this->database_selected = false;
 
-            if ($this->connected)
-            {
-            	// If client is old latin, we force utf8
-            	$clientmustbe = empty($conf->db->dolibarr_main_db_character_set) ? 'utf8' : $conf->db->dolibarr_main_db_character_set;
-            	if (preg_match('/latin1/', $clientmustbe)) $clientmustbe = 'utf8';
-            	if (preg_match('/utf8mb4/', $clientmustbe)) $clientmustbe = 'utf8';
+			if ($this->connected)
+			{
+				// If client is old latin, we force utf8
+				$clientmustbe = empty($conf->db->dolibarr_main_db_character_set) ? 'utf8' : $conf->db->dolibarr_main_db_character_set;
+				if (preg_match('/latin1/', $clientmustbe)) $clientmustbe = 'utf8';
+				if (preg_match('/utf8mb4/', $clientmustbe)) $clientmustbe = 'utf8';
 
-            	if ($this->db->character_set_name() != $clientmustbe) {
-            		$this->db->set_charset($clientmustbe); // This set utf8_unicode_ci
+				if ($this->db->character_set_name() != $clientmustbe) {
+					$this->db->set_charset($clientmustbe); // This set utf8_unicode_ci
 
-            		$collation = $conf->db->dolibarr_main_db_collation;
-            		if (preg_match('/latin1/', $collation)) $collation = 'utf8_unicode_ci';
-            		if (preg_match('/utf8mb4/', $collation)) $collation = 'utf8_unicode_ci';
+					$collation = $conf->db->dolibarr_main_db_collation;
+					if (preg_match('/latin1/', $collation)) $collation = 'utf8_unicode_ci';
+					if (preg_match('/utf8mb4/', $collation)) $collation = 'utf8_unicode_ci';
 
 					if (!preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
 				}
 			}
-        }
-    }
+		}
+	}
 
 
-    /**
-     *  Convert a SQL request in Mysql syntax to native syntax
-     *
-     *  @param     string	$line   SQL request line to convert
-     *  @param     string	$type	Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
-     *  @return    string   		SQL request line converted
-     */
-    public static function convertSQLFromMysql($line, $type = 'ddl')
-    {
-        return $line;
-    }
+	/**
+	 *  Convert a SQL request in Mysql syntax to native syntax
+	 *
+	 *  @param     string	$line   SQL request line to convert
+	 *  @param     string	$type	Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
+	 *  @return    string   		SQL request line converted
+	 */
+	public static function convertSQLFromMysql($line, $type = 'ddl')
+	{
+		return $line;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Select a database
 	 *
 	 *  @param	    string	$database	Name of database
 	 *  @return	    boolean  		    true if OK, false if KO
 	 */
-    public function select_db($database)
-    {
-        // phpcs:enable
-        dol_syslog(get_class($this)."::select_db database=".$database, LOG_DEBUG);
-        return $this->db->select_db($database);
-    }
+	public function select_db($database)
+	{
+		// phpcs:enable
+		dol_syslog(get_class($this)."::select_db database=".$database, LOG_DEBUG);
+		return $this->db->select_db($database);
+	}
 
 
 	/**
@@ -191,385 +191,385 @@ class DoliDBMysqli extends DoliDB
 	 * @return  mysqli  		Database access object
 	 * @see close()
 	 */
-    public function connect($host, $login, $passwd, $name, $port = 0)
-    {
+	public function connect($host, $login, $passwd, $name, $port = 0)
+	{
 		dol_syslog(get_class($this)."::connect host=$host, port=$port, login=$login, passwd=--hidden--, name=$name", LOG_DEBUG);
 
 		// Can also be
 		// mysqli::init(); mysql::options(MYSQLI_INIT_COMMAND, 'SET AUTOCOMMIT = 0'); mysqli::options(MYSQLI_OPT_CONNECT_TIMEOUT, 5);
 		// return mysqli::real_connect($host, $user, $pass, $db, $port);
 		return new mysqli($host, $login, $passwd, $name, $port);
-    }
+	}
 
-    /**
+	/**
 	 *	Return version of database server
 	 *
 	 *	@return	        string      Version string
-     */
-    public function getVersion()
-    {
-        return $this->db->server_info;
-    }
+	 */
+	public function getVersion()
+	{
+		return $this->db->server_info;
+	}
 
-    /**
-     *	Return version of database client driver
-     *
-     *	@return	        string      Version string
-     */
-    public function getDriverInfo()
-    {
-        return $this->db->client_info;
-    }
+	/**
+	 *	Return version of database client driver
+	 *
+	 *	@return	        string      Version string
+	 */
+	public function getDriverInfo()
+	{
+		return $this->db->client_info;
+	}
 
 
-    /**
-     *  Close database connexion
-     *
-     *  @return     bool     True if disconnect successfull, false otherwise
-     *  @see        connect()
-     */
-    public function close()
-    {
-        if ($this->db)
-        {
-	        if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened, LOG_ERR);
-            $this->connected = false;
-            return $this->db->close();
-        }
-        return false;
-    }
+	/**
+	 *  Close database connexion
+	 *
+	 *  @return     bool     True if disconnect successfull, false otherwise
+	 *  @see        connect()
+	 */
+	public function close()
+	{
+		if ($this->db)
+		{
+			if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened, LOG_ERR);
+			$this->connected = false;
+			return $this->db->close();
+		}
+		return false;
+	}
 
-    /**
-     * 	Execute a SQL request and return the resultset
-     *
-     * 	@param	string	$query			SQL query string
-     * 	@param	int		$usesavepoint	0=Default mode, 1=Run a savepoint before and a rollback to savepoint if error (this allow to have some request with errors inside global transactions).
-     * 									Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
-     *  @param  string	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
-     *	@return	bool|mysqli_result		Resultset of answer
-     */
-    public function query($query, $usesavepoint = 0, $type = 'auto')
-    {
-    	global $conf;
+	/**
+	 * 	Execute a SQL request and return the resultset
+	 *
+	 * 	@param	string	$query			SQL query string
+	 * 	@param	int		$usesavepoint	0=Default mode, 1=Run a savepoint before and a rollback to savepoint if error (this allow to have some request with errors inside global transactions).
+	 * 									Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
+	 *  @param  string	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
+	 *	@return	bool|mysqli_result		Resultset of answer
+	 */
+	public function query($query, $usesavepoint = 0, $type = 'auto')
+	{
+		global $conf;
 
-        $query = trim($query);
+		$query = trim($query);
 
-	    if (!in_array($query, array('BEGIN', 'COMMIT', 'ROLLBACK')))
-	    {
-	    	$SYSLOG_SQL_LIMIT = 10000; // limit log to 10kb per line to limit DOS attacks
-	    	dol_syslog('sql='.substr($query, 0, $SYSLOG_SQL_LIMIT), LOG_DEBUG);
-	    }
-        if (empty($query)) return false; // Return false = error if empty request
+		if (!in_array($query, array('BEGIN', 'COMMIT', 'ROLLBACK')))
+		{
+			$SYSLOG_SQL_LIMIT = 10000; // limit log to 10kb per line to limit DOS attacks
+			dol_syslog('sql='.substr($query, 0, $SYSLOG_SQL_LIMIT), LOG_DEBUG);
+		}
+		if (empty($query)) return false; // Return false = error if empty request
 
-        if (!$this->database_name)
-        {
-            // Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
-            $ret = $this->db->query($query);
-        } else {
-            $ret = $this->db->query($query);
-        }
+		if (!$this->database_name)
+		{
+			// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
+			$ret = $this->db->query($query);
+		} else {
+			$ret = $this->db->query($query);
+		}
 
-        if (!preg_match("/^COMMIT/i", $query) && !preg_match("/^ROLLBACK/i", $query))
-        {
-            // Si requete utilisateur, on la sauvegarde ainsi que son resultset
-            if (!$ret)
-            {
-                $this->lastqueryerror = $query;
-                $this->lasterror = $this->error();
-                $this->lasterrno = $this->errno();
+		if (!preg_match("/^COMMIT/i", $query) && !preg_match("/^ROLLBACK/i", $query))
+		{
+			// Si requete utilisateur, on la sauvegarde ainsi que son resultset
+			if (!$ret)
+			{
+				$this->lastqueryerror = $query;
+				$this->lasterror = $this->error();
+				$this->lasterrno = $this->errno();
 
 				if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR); // Log of request was not yet done previously
-                dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterrno." ".$this->lasterror, LOG_ERR);
-                //var_dump(debug_print_backtrace());
-            }
-            $this->lastquery = $query;
-            $this->_results = $ret;
-        }
+				dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterrno." ".$this->lasterror, LOG_ERR);
+				//var_dump(debug_print_backtrace());
+			}
+			$this->lastquery = $query;
+			$this->_results = $ret;
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Renvoie la ligne courante (comme un objet) pour le curseur resultset
-     *
-     *	@param	mysqli_result	$resultset	Curseur de la requete voulue
-     *	@return	object|null					Object result line or null if KO or end of cursor
-     */
-    public function fetch_object($resultset)
-    {
-        // phpcs:enable
-        // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-        if (!is_object($resultset)) { $resultset = $this->_results; }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Renvoie la ligne courante (comme un objet) pour le curseur resultset
+	 *
+	 *	@param	mysqli_result	$resultset	Curseur de la requete voulue
+	 *	@return	object|null					Object result line or null if KO or end of cursor
+	 */
+	public function fetch_object($resultset)
+	{
+		// phpcs:enable
+		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
+		if (!is_object($resultset)) { $resultset = $this->_results; }
 		return $resultset->fetch_object();
-    }
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Return datas as an array
-     *
-     *	@param	mysqli_result	$resultset	Resultset of request
-     *	@return	array|null					Array or null if KO or end of cursor
-     */
-    public function fetch_array($resultset)
-    {
-        // phpcs:enable
-        // If resultset not provided, we take the last used by connexion
-        if (!is_object($resultset)) { $resultset = $this->_results; }
-        return $resultset->fetch_array();
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return datas as an array
+	 *
+	 *	@param	mysqli_result	$resultset	Resultset of request
+	 *	@return	array|null					Array or null if KO or end of cursor
+	 */
+	public function fetch_array($resultset)
+	{
+		// phpcs:enable
+		// If resultset not provided, we take the last used by connexion
+		if (!is_object($resultset)) { $resultset = $this->_results; }
+		return $resultset->fetch_array();
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Return datas as an array
-     *
-     *	@param	mysqli_result	$resultset	Resultset of request
-     *	@return	array|null|int				Array or null if KO or end of cursor or 0 if resultset is bool
-     */
-    public function fetch_row($resultset)
-    {
-        // phpcs:enable
-        // If resultset not provided, we take the last used by connexion
-        if (!is_bool($resultset))
-        {
-            if (!is_object($resultset)) { $resultset = $this->_results; }
-            return $resultset->fetch_row();
-        } else {
-            // si le curseur est un booleen on retourne la valeur 0
-            return 0;
-        }
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return datas as an array
+	 *
+	 *	@param	mysqli_result	$resultset	Resultset of request
+	 *	@return	array|null|int				Array or null if KO or end of cursor or 0 if resultset is bool
+	 */
+	public function fetch_row($resultset)
+	{
+		// phpcs:enable
+		// If resultset not provided, we take the last used by connexion
+		if (!is_bool($resultset))
+		{
+			if (!is_object($resultset)) { $resultset = $this->_results; }
+			return $resultset->fetch_row();
+		} else {
+			// si le curseur est un booleen on retourne la valeur 0
+			return 0;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Return number of lines for result of a SELECT
-     *
-     *	@param	mysqli_result	$resultset  Resulset of requests
-     *	@return	int				Nb of lines
-     *	@see    affected_rows()
-     */
-    public function num_rows($resultset)
-    {
-        // phpcs:enable
-        // If resultset not provided, we take the last used by connexion
-        if (!is_object($resultset)) { $resultset = $this->_results; }
-        return $resultset->num_rows;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return number of lines for result of a SELECT
+	 *
+	 *	@param	mysqli_result	$resultset  Resulset of requests
+	 *	@return	int				Nb of lines
+	 *	@see    affected_rows()
+	 */
+	public function num_rows($resultset)
+	{
+		// phpcs:enable
+		// If resultset not provided, we take the last used by connexion
+		if (!is_object($resultset)) { $resultset = $this->_results; }
+		return $resultset->num_rows;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Return the number of lines in the result of a request INSERT, DELETE or UPDATE
-     *
-     *	@param	mysqli_result	$resultset	Curseur de la requete voulue
-     *	@return int							Number of lines
-     *	@see    num_rows()
-     */
-    public function affected_rows($resultset)
-    {
-        // phpcs:enable
-        // If resultset not provided, we take the last used by connexion
-        if (!is_object($resultset)) { $resultset = $this->_results; }
-        // mysql necessite un link de base pour cette fonction contrairement
-        // a pqsql qui prend un resultset
-        return $this->db->affected_rows;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return the number of lines in the result of a request INSERT, DELETE or UPDATE
+	 *
+	 *	@param	mysqli_result	$resultset	Curseur de la requete voulue
+	 *	@return int							Number of lines
+	 *	@see    num_rows()
+	 */
+	public function affected_rows($resultset)
+	{
+		// phpcs:enable
+		// If resultset not provided, we take the last used by connexion
+		if (!is_object($resultset)) { $resultset = $this->_results; }
+		// mysql necessite un link de base pour cette fonction contrairement
+		// a pqsql qui prend un resultset
+		return $this->db->affected_rows;
+	}
 
 
-    /**
-     *	Libere le dernier resultset utilise sur cette connexion
-     *
-     *	@param  mysqli_result	$resultset	Curseur de la requete voulue
-     *	@return	void
-     */
-    public function free($resultset = null)
-    {
-        // If resultset not provided, we take the last used by connexion
-        if (!is_object($resultset)) { $resultset = $this->_results; }
-        // Si resultset en est un, on libere la memoire
-        if (is_object($resultset)) $resultset->free_result();
-    }
+	/**
+	 *	Libere le dernier resultset utilise sur cette connexion
+	 *
+	 *	@param  mysqli_result	$resultset	Curseur de la requete voulue
+	 *	@return	void
+	 */
+	public function free($resultset = null)
+	{
+		// If resultset not provided, we take the last used by connexion
+		if (!is_object($resultset)) { $resultset = $this->_results; }
+		// Si resultset en est un, on libere la memoire
+		if (is_object($resultset)) $resultset->free_result();
+	}
 
-    /**
-     *	Escape a string to insert data
-     *
-     *	@param	string	$stringtoencode		String to escape
-     *	@return	string						String escaped
-     */
-    public function escape($stringtoencode)
-    {
-        return $this->db->real_escape_string($stringtoencode);
-    }
+	/**
+	 *	Escape a string to insert data
+	 *
+	 *	@param	string	$stringtoencode		String to escape
+	 *	@return	string						String escaped
+	 */
+	public function escape($stringtoencode)
+	{
+		return $this->db->real_escape_string($stringtoencode);
+	}
 
-    /**
-     *	Return generic error code of last operation.
-     *
-     *	@return	string		Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
-     */
-    public function errno()
-    {
-        if (!$this->connected) {
-            // Si il y a eu echec de connexion, $this->db n'est pas valide.
-            return 'DB_ERROR_FAILED_TO_CONNECT';
-        } else {
-            // Constants to convert a MySql error code to a generic Dolibarr error code
-            $errorcode_map = array(
-            1004 => 'DB_ERROR_CANNOT_CREATE',
-            1005 => 'DB_ERROR_CANNOT_CREATE',
-            1006 => 'DB_ERROR_CANNOT_CREATE',
-            1007 => 'DB_ERROR_ALREADY_EXISTS',
-            1008 => 'DB_ERROR_CANNOT_DROP',
-            1022 => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS',
-            1025 => 'DB_ERROR_NO_FOREIGN_KEY_TO_DROP',
-            1044 => 'DB_ERROR_ACCESSDENIED',
-            1046 => 'DB_ERROR_NODBSELECTED',
-            1048 => 'DB_ERROR_CONSTRAINT',
-            1050 => 'DB_ERROR_TABLE_ALREADY_EXISTS',
-            1051 => 'DB_ERROR_NOSUCHTABLE',
-            1054 => 'DB_ERROR_NOSUCHFIELD',
-            1060 => 'DB_ERROR_COLUMN_ALREADY_EXISTS',
-            1061 => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS',
-            1062 => 'DB_ERROR_RECORD_ALREADY_EXISTS',
-            1064 => 'DB_ERROR_SYNTAX',
-            1068 => 'DB_ERROR_PRIMARY_KEY_ALREADY_EXISTS',
-            1075 => 'DB_ERROR_CANT_DROP_PRIMARY_KEY',
-            1091 => 'DB_ERROR_NOSUCHFIELD',
-            1100 => 'DB_ERROR_NOT_LOCKED',
-            1136 => 'DB_ERROR_VALUE_COUNT_ON_ROW',
-            1146 => 'DB_ERROR_NOSUCHTABLE',
-            1215 => 'DB_ERROR_CANNOT_ADD_FOREIGN_KEY_CONSTRAINT',
-            1216 => 'DB_ERROR_NO_PARENT',
-            1217 => 'DB_ERROR_CHILD_EXISTS',
-            1396 => 'DB_ERROR_USER_ALREADY_EXISTS', // When creating a user that already existing
-            1451 => 'DB_ERROR_CHILD_EXISTS',
-            1826 => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS'
-            );
+	/**
+	 *	Return generic error code of last operation.
+	 *
+	 *	@return	string		Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
+	 */
+	public function errno()
+	{
+		if (!$this->connected) {
+			// Si il y a eu echec de connexion, $this->db n'est pas valide.
+			return 'DB_ERROR_FAILED_TO_CONNECT';
+		} else {
+			// Constants to convert a MySql error code to a generic Dolibarr error code
+			$errorcode_map = array(
+			1004 => 'DB_ERROR_CANNOT_CREATE',
+			1005 => 'DB_ERROR_CANNOT_CREATE',
+			1006 => 'DB_ERROR_CANNOT_CREATE',
+			1007 => 'DB_ERROR_ALREADY_EXISTS',
+			1008 => 'DB_ERROR_CANNOT_DROP',
+			1022 => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS',
+			1025 => 'DB_ERROR_NO_FOREIGN_KEY_TO_DROP',
+			1044 => 'DB_ERROR_ACCESSDENIED',
+			1046 => 'DB_ERROR_NODBSELECTED',
+			1048 => 'DB_ERROR_CONSTRAINT',
+			1050 => 'DB_ERROR_TABLE_ALREADY_EXISTS',
+			1051 => 'DB_ERROR_NOSUCHTABLE',
+			1054 => 'DB_ERROR_NOSUCHFIELD',
+			1060 => 'DB_ERROR_COLUMN_ALREADY_EXISTS',
+			1061 => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS',
+			1062 => 'DB_ERROR_RECORD_ALREADY_EXISTS',
+			1064 => 'DB_ERROR_SYNTAX',
+			1068 => 'DB_ERROR_PRIMARY_KEY_ALREADY_EXISTS',
+			1075 => 'DB_ERROR_CANT_DROP_PRIMARY_KEY',
+			1091 => 'DB_ERROR_NOSUCHFIELD',
+			1100 => 'DB_ERROR_NOT_LOCKED',
+			1136 => 'DB_ERROR_VALUE_COUNT_ON_ROW',
+			1146 => 'DB_ERROR_NOSUCHTABLE',
+			1215 => 'DB_ERROR_CANNOT_ADD_FOREIGN_KEY_CONSTRAINT',
+			1216 => 'DB_ERROR_NO_PARENT',
+			1217 => 'DB_ERROR_CHILD_EXISTS',
+			1396 => 'DB_ERROR_USER_ALREADY_EXISTS', // When creating a user that already existing
+			1451 => 'DB_ERROR_CHILD_EXISTS',
+			1826 => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS'
+			);
 
-            if (isset($errorcode_map[$this->db->errno])) {
-                return $errorcode_map[$this->db->errno];
-            }
-            $errno = $this->db->errno;
-            return ($errno ? 'DB_ERROR_'.$errno : '0');
-        }
-    }
+			if (isset($errorcode_map[$this->db->errno])) {
+				return $errorcode_map[$this->db->errno];
+			}
+			$errno = $this->db->errno;
+			return ($errno ? 'DB_ERROR_'.$errno : '0');
+		}
+	}
 
-    /**
+	/**
 	 *	Return description of last error
 	 *
 	 *	@return	string		Error text
-     */
-    public function error()
-    {
-        if (!$this->connected) {
-            // Si il y a eu echec de connexion, $this->db n'est pas valide pour mysqli_error.
-            return 'Not connected. Check setup parameters in conf/conf.php file and your mysql client and server versions';
-        } else {
-            return $this->db->error;
-        }
-    }
+	 */
+	public function error()
+	{
+		if (!$this->connected) {
+			// Si il y a eu echec de connexion, $this->db n'est pas valide pour mysqli_error.
+			return 'Not connected. Check setup parameters in conf/conf.php file and your mysql client and server versions';
+		} else {
+			return $this->db->error;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 * Get last ID after an insert INSERT
 	 *
 	 * @param   string	$tab    	Table name concerned by insert. Ne sert pas sous MySql mais requis pour compatibilite avec Postgresql
 	 * @param	string	$fieldid	Field name
 	 * @return  int|string			Id of row
-     */
-    public function last_insert_id($tab, $fieldid = 'rowid')
-    {
-        // phpcs:enable
-        return $this->db->insert_id;
-    }
+	 */
+	public function last_insert_id($tab, $fieldid = 'rowid')
+	{
+		// phpcs:enable
+		return $this->db->insert_id;
+	}
 
-    /**
-     *	Encrypt sensitive data in database
-     *  Warning: This function includes the escape, so it must use direct value
-     *
-     *	@param	string	$fieldorvalue	Field name or value to encrypt
-     * 	@param	int		$withQuotes		Return string with quotes
-     * 	@return	string					XXX(field) or XXX('value') or field or 'value'
-     *
-     */
-    public function encrypt($fieldorvalue, $withQuotes = 0)
-    {
-        global $conf;
+	/**
+	 *	Encrypt sensitive data in database
+	 *  Warning: This function includes the escape, so it must use direct value
+	 *
+	 *	@param	string	$fieldorvalue	Field name or value to encrypt
+	 * 	@param	int		$withQuotes		Return string with quotes
+	 * 	@return	string					XXX(field) or XXX('value') or field or 'value'
+	 *
+	 */
+	public function encrypt($fieldorvalue, $withQuotes = 0)
+	{
+		global $conf;
 
-        // Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-        $cryptType = (!empty($conf->db->dolibarr_main_db_encryption) ? $conf->db->dolibarr_main_db_encryption : 0);
+		// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
+		$cryptType = (!empty($conf->db->dolibarr_main_db_encryption) ? $conf->db->dolibarr_main_db_encryption : 0);
 
-        //Encryption key
-        $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
+		//Encryption key
+		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
 
-        $return = ($withQuotes ? "'" : "").$this->escape($fieldorvalue).($withQuotes ? "'" : "");
+		$return = ($withQuotes ? "'" : "").$this->escape($fieldorvalue).($withQuotes ? "'" : "");
 
-        if ($cryptType && !empty($cryptKey))
-        {
-            if ($cryptType == 2)
-            {
-                $return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
-            } elseif ($cryptType == 1)
-            {
-                $return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
-            }
-        }
+		if ($cryptType && !empty($cryptKey))
+		{
+			if ($cryptType == 2)
+			{
+				$return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
+			} elseif ($cryptType == 1)
+			{
+				$return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
+			}
+		}
 
-        return $return;
-    }
+		return $return;
+	}
 
-    /**
-     *	Decrypt sensitive data in database
-     *
-     *	@param	string	$value			Value to decrypt
-     * 	@return	string					Decrypted value if used
-     */
-    public function decrypt($value)
-    {
-        global $conf;
+	/**
+	 *	Decrypt sensitive data in database
+	 *
+	 *	@param	string	$value			Value to decrypt
+	 * 	@return	string					Decrypted value if used
+	 */
+	public function decrypt($value)
+	{
+		global $conf;
 
-        // Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-        $cryptType = (!empty($conf->db->dolibarr_main_db_encryption) ? $conf->db->dolibarr_main_db_encryption : 0);
+		// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
+		$cryptType = (!empty($conf->db->dolibarr_main_db_encryption) ? $conf->db->dolibarr_main_db_encryption : 0);
 
-        //Encryption key
-        $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
+		//Encryption key
+		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
 
-        $return = $value;
+		$return = $value;
 
-        if ($cryptType && !empty($cryptKey))
-        {
-            if ($cryptType == 2)
-            {
-                $return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';
-            } elseif ($cryptType == 1)
-            {
-                $return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';
-            }
-        }
+		if ($cryptType && !empty($cryptKey))
+		{
+			if ($cryptType == 2)
+			{
+				$return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';
+			} elseif ($cryptType == 1)
+			{
+				$return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';
+			}
+		}
 
-        return $return;
-    }
+		return $return;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 * Return connexion ID
 	 *
 	 * @return	        string      Id connexion
-     */
-    public function DDLGetConnectId()
-    {
-        // phpcs:enable
-        $resql = $this->query('SELECT CONNECTION_ID()');
-        if ($resql)
-        {
-            $row = $this->fetch_row($resql);
-            return $row[0];
-        } else return '?';
-    }
+	 */
+	public function DDLGetConnectId()
+	{
+		// phpcs:enable
+		$resql = $this->query('SELECT CONNECTION_ID()');
+		if ($resql)
+		{
+			$row = $this->fetch_row($resql);
+			return $row[0];
+		} else return '?';
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Create a new database
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Create a new database
 	 *	Do not use function xxx_create_db (xxx=mysql, ...) as they are deprecated
 	 *	We force to create database with charset this->forcecharset and collate this->forcecollate
 	 *
@@ -578,85 +578,85 @@ class DoliDBMysqli extends DoliDB
 	 * 	@param	string	$collation		Charset used to sort data
 	 * 	@param	string	$owner			Username of database owner
 	 * 	@return	bool|mysqli_result		resource defined if OK, null if KO
-     */
-    public function DDLCreateDb($database, $charset = '', $collation = '', $owner = '')
-    {
-        // phpcs:enable
-        if (empty($charset))   $charset = $this->forcecharset;
-        if (empty($collation)) $collation = $this->forcecollate;
+	 */
+	public function DDLCreateDb($database, $charset = '', $collation = '', $owner = '')
+	{
+		// phpcs:enable
+		if (empty($charset))   $charset = $this->forcecharset;
+		if (empty($collation)) $collation = $this->forcecollate;
 
-        // ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci
+		// ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci
 		$sql = "CREATE DATABASE `".$this->escape($database)."`";
 		$sql .= " DEFAULT CHARACTER SET `".$this->escape($charset)."` DEFAULT COLLATE `".$this->escape($collation)."`";
 
-        dol_syslog($sql, LOG_DEBUG);
-        $ret = $this->query($sql);
-        if (!$ret)
-        {
-            // We try again for compatibility with Mysql < 4.1.1
-            $sql = "CREATE DATABASE `".$this->escape($database)."`";
-            dol_syslog($sql, LOG_DEBUG);
-            $ret = $this->query($sql);
-        }
-        return $ret;
-    }
+		dol_syslog($sql, LOG_DEBUG);
+		$ret = $this->query($sql);
+		if (!$ret)
+		{
+			// We try again for compatibility with Mysql < 4.1.1
+			$sql = "CREATE DATABASE `".$this->escape($database)."`";
+			dol_syslog($sql, LOG_DEBUG);
+			$ret = $this->query($sql);
+		}
+		return $ret;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *  List tables into a database
 	 *
 	 *  @param	string		$database	Name of database
 	 *  @param	string		$table		Nmae of table filter ('xxx%')
 	 *  @return	array					List of tables in an array
-     */
-    public function DDLListTables($database, $table = '')
-    {
-        // phpcs:enable
-        $listtables = array();
+	 */
+	public function DDLListTables($database, $table = '')
+	{
+		// phpcs:enable
+		$listtables = array();
 
-        $like = '';
-        if ($table) $like = "LIKE '".$table."'";
-        $sql = "SHOW TABLES FROM ".$database." ".$like.";";
-        //print $sql;
-        $result = $this->query($sql);
-        if ($result)
-        {
-            while ($row = $this->fetch_row($result))
-            {
-                $listtables[] = $row[0];
-            }
-        }
-        return $listtables;
-    }
+		$like = '';
+		if ($table) $like = "LIKE '".$table."'";
+		$sql = "SHOW TABLES FROM ".$database." ".$like.";";
+		//print $sql;
+		$result = $this->query($sql);
+		if ($result)
+		{
+			while ($row = $this->fetch_row($result))
+			{
+				$listtables[] = $row[0];
+			}
+		}
+		return $listtables;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	List information of columns into a table.
 	 *
 	 *	@param	string	$table		Name of table
 	 *	@return	array				Tableau des informations des champs de la table
-     */
-    public function DDLInfoTable($table)
-    {
-        // phpcs:enable
-        $infotables = array();
+	 */
+	public function DDLInfoTable($table)
+	{
+		// phpcs:enable
+		$infotables = array();
 
-        $sql = "SHOW FULL COLUMNS FROM ".$table.";";
+		$sql = "SHOW FULL COLUMNS FROM ".$table.";";
 
-        dol_syslog($sql, LOG_DEBUG);
-        $result = $this->query($sql);
-        if ($result)
-        {
-            while ($row = $this->fetch_row($result))
-            {
-                $infotables[] = $row;
-            }
-        }
-        return $infotables;
-    }
+		dol_syslog($sql, LOG_DEBUG);
+		$result = $this->query($sql);
+		if ($result)
+		{
+			while ($row = $this->fetch_row($result))
+			{
+				$infotables[] = $row;
+			}
+		}
+		return $infotables;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	Create a table into database
 	 *
 	 *	@param	    string	$table 			Name of table
@@ -667,20 +667,20 @@ class DoliDBMysqli extends DoliDB
 	 *	@param	    array	$fulltext_keys	Tableau des Nom de champs qui seront indexes en fulltext
 	 *	@param	    array	$keys 			Tableau des champs cles noms => valeur
 	 *	@return	    int						<0 if KO, >=0 if OK
-     */
-    public function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null)
-    {
-        // phpcs:enable
-	    // FIXME: $fulltext_keys parameter is unused
+	 */
+	public function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null)
+	{
+		// phpcs:enable
+		// FIXME: $fulltext_keys parameter is unused
 
-        // cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
-        // ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
-        $sql = "CREATE TABLE ".$table."(";
-        $i = 0;
-	    $sqlfields = array();
-        foreach ($fields as $field_name => $field_desc)
-        {
-        	$sqlfields[$i] = $field_name." ";
+		// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
+		// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
+		$sql = "CREATE TABLE ".$table."(";
+		$i = 0;
+		$sqlfields = array();
+		foreach ($fields as $field_name => $field_desc)
+		{
+			$sqlfields[$i] = $field_name." ";
 			$sqlfields[$i] .= $field_desc['type'];
 			if (preg_match("/^[^\s]/i", $field_desc['value'])) {
 				$sqlfields[$i]  .= "(".$field_desc['value'].")";
@@ -702,79 +702,79 @@ class DoliDBMysqli extends DoliDB
 			if (preg_match("/^[^\s]/i", $field_desc['extra'])) {
 				$sqlfields[$i]  .= " ".$field_desc['extra'];
 			}
-            $i++;
-        }
-        if ($primary_key != "")
-        $pk = "primary key(".$primary_key.")";
+			$i++;
+		}
+		if ($primary_key != "")
+		$pk = "primary key(".$primary_key.")";
 
-        if (is_array($unique_keys)) {
-            $i = 0;
-            foreach ($unique_keys as $key => $value)
-            {
-                $sqluq[$i] = "UNIQUE KEY '".$key."' ('".$this->escape($value)."')";
-                $i++;
-            }
-        }
-        if (is_array($keys))
-        {
-            $i = 0;
-            foreach ($keys as $key => $value)
-            {
-                $sqlk[$i] = "KEY ".$key." (".$value.")";
-                $i++;
-            }
-        }
-        $sql .= implode(',', $sqlfields);
-        if ($primary_key != "")
-        $sql .= ",".$pk;
-        if ($unique_keys != "")
-        $sql .= ",".implode(',', $sqluq);
-        if (is_array($keys))
-        $sql .= ",".implode(',', $sqlk);
-        $sql .= ") engine=".$type;
+		if (is_array($unique_keys)) {
+			$i = 0;
+			foreach ($unique_keys as $key => $value)
+			{
+				$sqluq[$i] = "UNIQUE KEY '".$key."' ('".$this->escape($value)."')";
+				$i++;
+			}
+		}
+		if (is_array($keys))
+		{
+			$i = 0;
+			foreach ($keys as $key => $value)
+			{
+				$sqlk[$i] = "KEY ".$key." (".$value.")";
+				$i++;
+			}
+		}
+		$sql .= implode(',', $sqlfields);
+		if ($primary_key != "")
+		$sql .= ",".$pk;
+		if ($unique_keys != "")
+		$sql .= ",".implode(',', $sqluq);
+		if (is_array($keys))
+		$sql .= ",".implode(',', $sqlk);
+		$sql .= ") engine=".$type;
 
-        if (!$this->query($sql))
-        return -1;
-        else return 1;
-    }
+		if (!$this->query($sql))
+		return -1;
+		else return 1;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Drop a table into database
-     *
-     *	@param	    string	$table 			Name of table
-     *	@return	    int						<0 if KO, >=0 if OK
-     */
-    public function DDLDropTable($table)
-    {
-        // phpcs:enable
-        $sql = "DROP TABLE ".$table;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Drop a table into database
+	 *
+	 *	@param	    string	$table 			Name of table
+	 *	@return	    int						<0 if KO, >=0 if OK
+	 */
+	public function DDLDropTable($table)
+	{
+		// phpcs:enable
+		$sql = "DROP TABLE ".$table;
 
 		if (!$this->query($sql))
  			return -1;
-    	else return 1;
-    }
+		else return 1;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	Return a pointer of line with description of a table or field
 	 *
 	 *	@param	string		$table	Name of table
 	 *	@param	string		$field	Optionnel : Name of field if we want description of field
 	 *	@return	bool|mysqli_result	Resultset x (x->Field, x->Type, ...)
-     */
-    public function DDLDescTable($table, $field = "")
-    {
-        // phpcs:enable
-        $sql = "DESC ".$table." ".$field;
+	 */
+	public function DDLDescTable($table, $field = "")
+	{
+		// phpcs:enable
+		$sql = "DESC ".$table." ".$field;
 
-        dol_syslog(get_class($this)."::DDLDescTable ".$sql, LOG_DEBUG);
-        $this->_results = $this->query($sql);
-        return $this->_results;
-    }
+		dol_syslog(get_class($this)."::DDLDescTable ".$sql, LOG_DEBUG);
+		$this->_results = $this->query($sql);
+		return $this->_results;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	Create a new field into table
 	 *
 	 *	@param	string	$table 				Name of table
@@ -782,116 +782,116 @@ class DoliDBMysqli extends DoliDB
 	 *	@param	string	$field_desc 		Tableau associatif de description du champ a inserer[nom du parametre][valeur du parametre]
 	 *	@param	string	$field_position 	Optionnel ex.: "after champtruc"
 	 *	@return	int							<0 if KO, >0 if OK
-     */
-    public function DDLAddField($table, $field_name, $field_desc, $field_position = "")
-    {
-        // phpcs:enable
-        // cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
-        // ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
-        $sql = "ALTER TABLE ".$table." ADD ".$field_name." ";
-        $sql .= $field_desc['type'];
-        if (preg_match("/^[^\s]/i", $field_desc['value']))
-        {
-        	if (!in_array($field_desc['type'], array('date', 'datetime')) && $field_desc['value'])
-            {
-                $sql .= "(".$field_desc['value'].")";
-            }
-        }
-        if (isset($field_desc['attribute']) && preg_match("/^[^\s]/i", $field_desc['attribute']))
-        {
-        	$sql .= " ".$field_desc['attribute'];
-        }
-        if (isset($field_desc['null']) && preg_match("/^[^\s]/i", $field_desc['null']))
-        {
-        	$sql .= " ".$field_desc['null'];
-        }
-        if (isset($field_desc['default']) && preg_match("/^[^\s]/i", $field_desc['default']))
-        {
-            if (preg_match("/null/i", $field_desc['default']))
-            $sql .= " default ".$field_desc['default'];
-            else $sql .= " default '".$this->escape($field_desc['default'])."'";
-        }
-        if (isset($field_desc['extra']) && preg_match("/^[^\s]/i", $field_desc['extra']))
-        {
-        	$sql .= " ".$field_desc['extra'];
-        }
-        $sql .= " ".$field_position;
+	 */
+	public function DDLAddField($table, $field_name, $field_desc, $field_position = "")
+	{
+		// phpcs:enable
+		// cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
+		// ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
+		$sql = "ALTER TABLE ".$table." ADD ".$field_name." ";
+		$sql .= $field_desc['type'];
+		if (preg_match("/^[^\s]/i", $field_desc['value']))
+		{
+			if (!in_array($field_desc['type'], array('date', 'datetime')) && $field_desc['value'])
+			{
+				$sql .= "(".$field_desc['value'].")";
+			}
+		}
+		if (isset($field_desc['attribute']) && preg_match("/^[^\s]/i", $field_desc['attribute']))
+		{
+			$sql .= " ".$field_desc['attribute'];
+		}
+		if (isset($field_desc['null']) && preg_match("/^[^\s]/i", $field_desc['null']))
+		{
+			$sql .= " ".$field_desc['null'];
+		}
+		if (isset($field_desc['default']) && preg_match("/^[^\s]/i", $field_desc['default']))
+		{
+			if (preg_match("/null/i", $field_desc['default']))
+			$sql .= " default ".$field_desc['default'];
+			else $sql .= " default '".$this->escape($field_desc['default'])."'";
+		}
+		if (isset($field_desc['extra']) && preg_match("/^[^\s]/i", $field_desc['extra']))
+		{
+			$sql .= " ".$field_desc['extra'];
+		}
+		$sql .= " ".$field_position;
 
-        dol_syslog(get_class($this)."::DDLAddField ".$sql, LOG_DEBUG);
-        if ($this->query($sql)) {
-            return 1;
-        }
-        return -1;
-    }
+		dol_syslog(get_class($this)."::DDLAddField ".$sql, LOG_DEBUG);
+		if ($this->query($sql)) {
+			return 1;
+		}
+		return -1;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	Update format of a field into a table
 	 *
 	 *	@param	string	$table 				Name of table
 	 *	@param	string	$field_name 		Name of field to modify
 	 *	@param	string	$field_desc 		Array with description of field format
 	 *	@return	int							<0 if KO, >0 if OK
-     */
-    public function DDLUpdateField($table, $field_name, $field_desc)
-    {
-        // phpcs:enable
-        $sql = "ALTER TABLE ".$table;
-        $sql .= " MODIFY COLUMN ".$field_name." ".$field_desc['type'];
-        if (in_array($field_desc['type'], array('double', 'tinyint', 'int', 'varchar')) && $field_desc['value']) {
-        	$sql .= "(".$field_desc['value'].")";
-        }
-        if ($field_desc['null'] == 'not null' || $field_desc['null'] == 'NOT NULL')
-        {
-        	// We will try to change format of column to NOT NULL. To be sure the ALTER works, we try to update fields that are NULL
-        	if ($field_desc['type'] == 'varchar' || $field_desc['type'] == 'text')
-        	{
-        		$sqlbis = "UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
-        		$this->query($sqlbis);
-        	} elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
-        	{
-        		$sqlbis = "UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
-        		$this->query($sqlbis);
-        	}
+	 */
+	public function DDLUpdateField($table, $field_name, $field_desc)
+	{
+		// phpcs:enable
+		$sql = "ALTER TABLE ".$table;
+		$sql .= " MODIFY COLUMN ".$field_name." ".$field_desc['type'];
+		if (in_array($field_desc['type'], array('double', 'tinyint', 'int', 'varchar')) && $field_desc['value']) {
+			$sql .= "(".$field_desc['value'].")";
+		}
+		if ($field_desc['null'] == 'not null' || $field_desc['null'] == 'NOT NULL')
+		{
+			// We will try to change format of column to NOT NULL. To be sure the ALTER works, we try to update fields that are NULL
+			if ($field_desc['type'] == 'varchar' || $field_desc['type'] == 'text')
+			{
+				$sqlbis = "UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
+				$this->query($sqlbis);
+			} elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
+			{
+				$sqlbis = "UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
+				$this->query($sqlbis);
+			}
 
-        	$sql .= " NOT NULL";
-        }
+			$sql .= " NOT NULL";
+		}
 
-        if ($field_desc['default'] != '')
-        {
+		if ($field_desc['default'] != '')
+		{
 			if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') $sql .= " DEFAULT ".$this->escape($field_desc['default']);
 			elseif ($field_desc['type'] != 'text') $sql .= " DEFAULT '".$this->escape($field_desc['default'])."'"; // Default not supported on text fields
-        }
+		}
 
-        dol_syslog(get_class($this)."::DDLUpdateField ".$sql, LOG_DEBUG);
-        if (!$this->query($sql))
-        return -1;
-        else return 1;
-    }
+		dol_syslog(get_class($this)."::DDLUpdateField ".$sql, LOG_DEBUG);
+		if (!$this->query($sql))
+		return -1;
+		else return 1;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	Drop a field from table
 	 *
 	 *	@param	string	$table 			Name of table
 	 *	@param	string	$field_name 	Name of field to drop
 	 *	@return	int						<0 if KO, >0 if OK
-     */
-    public function DDLDropField($table, $field_name)
-    {
-        // phpcs:enable
-        $sql = "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
-        dol_syslog(get_class($this)."::DDLDropField ".$sql, LOG_DEBUG);
-        if ($this->query($sql)) {
-            return 1;
-        }
-        $this->error = $this->lasterror();
-        return -1;
-    }
+	 */
+	public function DDLDropField($table, $field_name)
+	{
+		// phpcs:enable
+		$sql = "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
+		dol_syslog(get_class($this)."::DDLDropField ".$sql, LOG_DEBUG);
+		if ($this->query($sql)) {
+			return 1;
+		}
+		$this->error = $this->lasterror();
+		return -1;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 * 	Create a user and privileges to connect to database (even if database does not exists yet)
 	 *
 	 *	@param	string	$dolibarr_main_db_host 		Ip server or '%'
@@ -899,218 +899,218 @@ class DoliDBMysqli extends DoliDB
 	 *	@param	string	$dolibarr_main_db_pass 		Mot de passe user a creer
 	 *	@param	string	$dolibarr_main_db_name		Database name where user must be granted
 	 *	@return	int									<0 if KO, >=0 if OK
-     */
-    public function DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name)
-    {
-        // phpcs:enable
-        $sql = "CREATE USER '".$this->escape($dolibarr_main_db_user)."'";
-        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
-        $resql = $this->query($sql);
-        if (!$resql)
-        {
-            if ($this->lasterrno != 'DB_ERROR_USER_ALREADY_EXISTS')
-            {
-            	return -1;
-            } else {
-            	// If user already exists, we continue to set permissions
-            	dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
-            }
-        }
+	 */
+	public function DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name)
+	{
+		// phpcs:enable
+		$sql = "CREATE USER '".$this->escape($dolibarr_main_db_user)."'";
+		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
+		$resql = $this->query($sql);
+		if (!$resql)
+		{
+			if ($this->lasterrno != 'DB_ERROR_USER_ALREADY_EXISTS')
+			{
+				return -1;
+			} else {
+				// If user already exists, we continue to set permissions
+				dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
+			}
+		}
 
-        // Redo with localhost forced (sometimes user is created on %)
-        $sql = "CREATE USER '".$this->escape($dolibarr_main_db_user)."'@'localhost'";
-        $resql = $this->query($sql);
+		// Redo with localhost forced (sometimes user is created on %)
+		$sql = "CREATE USER '".$this->escape($dolibarr_main_db_user)."'@'localhost'";
+		$resql = $this->query($sql);
 
-        $sql = "GRANT ALL PRIVILEGES ON ".$this->escape($dolibarr_main_db_name).".* TO '".$this->escape($dolibarr_main_db_user)."'@'".$this->escape($dolibarr_main_db_host)."' IDENTIFIED BY '".$this->escape($dolibarr_main_db_pass)."'";
-        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
-        $resql = $this->query($sql);
-        if (!$resql)
-        {
-            $this->error = "Connected user not allowed to GRANT ALL PRIVILEGES ON ".$this->escape($dolibarr_main_db_name).".* TO '".$this->escape($dolibarr_main_db_user)."'@'".$this->escape($dolibarr_main_db_host)."'  IDENTIFIED BY '*****'";
-            return -1;
-        }
+		$sql = "GRANT ALL PRIVILEGES ON ".$this->escape($dolibarr_main_db_name).".* TO '".$this->escape($dolibarr_main_db_user)."'@'".$this->escape($dolibarr_main_db_host)."' IDENTIFIED BY '".$this->escape($dolibarr_main_db_pass)."'";
+		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
+		$resql = $this->query($sql);
+		if (!$resql)
+		{
+			$this->error = "Connected user not allowed to GRANT ALL PRIVILEGES ON ".$this->escape($dolibarr_main_db_name).".* TO '".$this->escape($dolibarr_main_db_user)."'@'".$this->escape($dolibarr_main_db_host)."'  IDENTIFIED BY '*****'";
+			return -1;
+		}
 
-        $sql = "FLUSH Privileges";
+		$sql = "FLUSH Privileges";
 
-        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
-        $resql = $this->query($sql);
-        if (!$resql)
-        {
-            return -1;
-        }
+		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
+		$resql = $this->query($sql);
+		if (!$resql)
+		{
+			return -1;
+		}
 
-        return 1;
-    }
+		return 1;
+	}
 
-    /**
-     *	Return charset used to store data in current database
-     *  Note: if we are connected to databasename, it is same result than using SELECT default_character_set_name FROM information_schema.SCHEMATA WHERE schema_name = "databasename";)
-     *
-     *	@return		string		Charset
-     *  @see getDefaultCollationDatabase()
-     */
-    public function getDefaultCharacterSetDatabase()
-    {
-        $resql = $this->query('SHOW VARIABLES LIKE \'character_set_database\'');
-        if (!$resql)
-        {
-            // version Mysql < 4.1.1
-            return $this->forcecharset;
-        }
-        $liste = $this->fetch_array($resql);
-        $tmpval = $liste['Value'];
+	/**
+	 *	Return charset used to store data in current database
+	 *  Note: if we are connected to databasename, it is same result than using SELECT default_character_set_name FROM information_schema.SCHEMATA WHERE schema_name = "databasename";)
+	 *
+	 *	@return		string		Charset
+	 *  @see getDefaultCollationDatabase()
+	 */
+	public function getDefaultCharacterSetDatabase()
+	{
+		$resql = $this->query('SHOW VARIABLES LIKE \'character_set_database\'');
+		if (!$resql)
+		{
+			// version Mysql < 4.1.1
+			return $this->forcecharset;
+		}
+		$liste = $this->fetch_array($resql);
+		$tmpval = $liste['Value'];
 
-        return $tmpval;
-    }
+		return $tmpval;
+	}
 
-    /**
-     *	Return list of available charset that can be used to store data in database
-     *
-     *	@return		array|null		List of Charset
-     */
-    public function getListOfCharacterSet()
-    {
-        $resql = $this->query('SHOW CHARSET');
-        $liste = array();
-        if ($resql)
-        {
-            $i = 0;
-            while ($obj = $this->fetch_object($resql))
-            {
-                $liste[$i]['charset'] = $obj->Charset;
-                $liste[$i]['description'] = $obj->Description;
-                $i++;
-            }
-            $this->free($resql);
-        } else {
-            // version Mysql < 4.1.1
-            return null;
-        }
-        return $liste;
-    }
+	/**
+	 *	Return list of available charset that can be used to store data in database
+	 *
+	 *	@return		array|null		List of Charset
+	 */
+	public function getListOfCharacterSet()
+	{
+		$resql = $this->query('SHOW CHARSET');
+		$liste = array();
+		if ($resql)
+		{
+			$i = 0;
+			while ($obj = $this->fetch_object($resql))
+			{
+				$liste[$i]['charset'] = $obj->Charset;
+				$liste[$i]['description'] = $obj->Description;
+				$i++;
+			}
+			$this->free($resql);
+		} else {
+			// version Mysql < 4.1.1
+			return null;
+		}
+		return $liste;
+	}
 
-    /**
-     *	Return collation used in current database
-     *
-     *	@return		string		Collation value
-     *  @see getDefaultCharacterSetDatabase()
-     */
-    public function getDefaultCollationDatabase()
-    {
-        $resql = $this->query('SHOW VARIABLES LIKE \'collation_database\'');
-        if (!$resql)
-        {
-            // version Mysql < 4.1.1
-            return $this->forcecollate;
-        }
-        $liste = $this->fetch_array($resql);
-        $tmpval = $liste['Value'];
+	/**
+	 *	Return collation used in current database
+	 *
+	 *	@return		string		Collation value
+	 *  @see getDefaultCharacterSetDatabase()
+	 */
+	public function getDefaultCollationDatabase()
+	{
+		$resql = $this->query('SHOW VARIABLES LIKE \'collation_database\'');
+		if (!$resql)
+		{
+			// version Mysql < 4.1.1
+			return $this->forcecollate;
+		}
+		$liste = $this->fetch_array($resql);
+		$tmpval = $liste['Value'];
 
-        return $tmpval;
-    }
+		return $tmpval;
+	}
 
-    /**
-     *	Return list of available collation that can be used for database
-     *
-     *	@return		array|null		Liste of Collation
-     */
-    public function getListOfCollation()
-    {
-        $resql = $this->query('SHOW COLLATION');
-        $liste = array();
-        if ($resql)
-        {
-            $i = 0;
-            while ($obj = $this->fetch_object($resql))
-            {
-                $liste[$i]['collation'] = $obj->Collation;
-                $i++;
-            }
-            $this->free($resql);
-        } else {
-            // version Mysql < 4.1.1
-            return null;
-        }
-        return $liste;
-    }
+	/**
+	 *	Return list of available collation that can be used for database
+	 *
+	 *	@return		array|null		Liste of Collation
+	 */
+	public function getListOfCollation()
+	{
+		$resql = $this->query('SHOW COLLATION');
+		$liste = array();
+		if ($resql)
+		{
+			$i = 0;
+			while ($obj = $this->fetch_object($resql))
+			{
+				$liste[$i]['collation'] = $obj->Collation;
+				$i++;
+			}
+			$this->free($resql);
+		} else {
+			// version Mysql < 4.1.1
+			return null;
+		}
+		return $liste;
+	}
 
-    /**
+	/**
 	 *	Return full path of dump program
 	 *
 	 *	@return		string		Full path of dump program
-     */
-    public function getPathOfDump()
-    {
-        $fullpathofdump = '/pathtomysqldump/mysqldump';
+	 */
+	public function getPathOfDump()
+	{
+		$fullpathofdump = '/pathtomysqldump/mysqldump';
 
-        $resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
-        if ($resql)
-        {
-            $liste = $this->fetch_array($resql);
-            $basedir = $liste['Value'];
-            $fullpathofdump = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysqldump';
-        }
-        return $fullpathofdump;
-    }
+		$resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
+		if ($resql)
+		{
+			$liste = $this->fetch_array($resql);
+			$basedir = $liste['Value'];
+			$fullpathofdump = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysqldump';
+		}
+		return $fullpathofdump;
+	}
 
-    /**
-     *	Return full path of restore program
-     *
-     *	@return		string		Full path of restore program
-     */
-    public function getPathOfRestore()
-    {
-        $fullpathofimport = '/pathtomysql/mysql';
+	/**
+	 *	Return full path of restore program
+	 *
+	 *	@return		string		Full path of restore program
+	 */
+	public function getPathOfRestore()
+	{
+		$fullpathofimport = '/pathtomysql/mysql';
 
-        $resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
-        if ($resql)
-        {
-            $liste = $this->fetch_array($resql);
-            $basedir = $liste['Value'];
-            $fullpathofimport = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysql';
-        }
-        return $fullpathofimport;
-    }
+		$resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
+		if ($resql)
+		{
+			$liste = $this->fetch_array($resql);
+			$basedir = $liste['Value'];
+			$fullpathofimport = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysql';
+		}
+		return $fullpathofimport;
+	}
 
-    /**
-     * Return value of server parameters
-     *
-     * @param	string	$filter		Filter list on a particular value
+	/**
+	 * Return value of server parameters
+	 *
+	 * @param	string	$filter		Filter list on a particular value
 	 * @return	array				Array of key-values (key=>value)
-     */
-    public function getServerParametersValues($filter = '')
-    {
-        $result = array();
+	 */
+	public function getServerParametersValues($filter = '')
+	{
+		$result = array();
 
-        $sql = 'SHOW VARIABLES';
-        if ($filter) $sql .= " LIKE '".$this->escape($filter)."'";
-        $resql = $this->query($sql);
-        if ($resql)
-        {
-        	while ($obj = $this->fetch_object($resql)) $result[$obj->Variable_name] = $obj->Value;
-        }
+		$sql = 'SHOW VARIABLES';
+		if ($filter) $sql .= " LIKE '".$this->escape($filter)."'";
+		$resql = $this->query($sql);
+		if ($resql)
+		{
+			while ($obj = $this->fetch_object($resql)) $result[$obj->Variable_name] = $obj->Value;
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Return value of server status (current indicators on memory, cache...)
-     *
-     * @param	string	$filter		Filter list on a particular value
+	/**
+	 * Return value of server status (current indicators on memory, cache...)
+	 *
+	 * @param	string	$filter		Filter list on a particular value
 	 * @return  array				Array of key-values (key=>value)
-     */
-    public function getServerStatusValues($filter = '')
-    {
-        $result = array();
+	 */
+	public function getServerStatusValues($filter = '')
+	{
+		$result = array();
 
-        $sql = 'SHOW STATUS';
-        if ($filter) $sql .= " LIKE '".$this->escape($filter)."'";
-        $resql = $this->query($sql);
-        if ($resql)
-        {
-            while ($obj = $this->fetch_object($resql)) $result[$obj->Variable_name] = $obj->Value;
-        }
+		$sql = 'SHOW STATUS';
+		if ($filter) $sql .= " LIKE '".$this->escape($filter)."'";
+		$resql = $this->query($sql);
+		if ($resql)
+		{
+			while ($obj = $this->fetch_object($resql)) $result[$obj->Variable_name] = $obj->Value;
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 }
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 3c49bcf6f4b..b393945eeb3 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -35,14 +35,14 @@ require_once DOL_DOCUMENT_ROOT.'/core/db/DoliDB.class.php';
  */
 class DoliDBPgsql extends DoliDB
 {
-    //! Database type
-    public $type = 'pgsql'; // Name of manager
-    //! Database label
+	//! Database type
+	public $type = 'pgsql'; // Name of manager
+	//! Database label
 	const LABEL = 'PostgreSQL'; // Label of manager
 	//! Charset
-    public $forcecharset = 'UTF8'; // Can't be static as it may be forced with a dynamic value
-    //! Collate used to force collate when creating database
-    public $forcecollate = ''; // Can't be static as it may be forced with a dynamic value
+	public $forcecharset = 'UTF8'; // Can't be static as it may be forced with a dynamic value
+	//! Collate used to force collate when creating database
+	public $forcecollate = ''; // Can't be static as it may be forced with a dynamic value
 	//! Version min database
 	const VERSIONMIN = '9.0.0'; // Version min database
 	/** @var resource Resultset of last query */
@@ -62,17 +62,17 @@ class DoliDBPgsql extends DoliDB
 	 *	@param	    string	$name		Nom de la database
 	 *	@param	    int		$port		Port of database server
 	 */
-    public function __construct($type, $host, $user, $pass, $name = '', $port = 0)
+	public function __construct($type, $host, $user, $pass, $name = '', $port = 0)
 	{
 		global $conf, $langs;
 
-        // Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
+		// Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
 		if (!empty($conf->db->character_set)) $this->forcecharset = $conf->db->character_set;
 		if (!empty($conf->db->dolibarr_main_db_collation))	$this->forcecollate = $conf->db->dolibarr_main_db_collation;
 
 		$this->database_user = $user;
-        $this->database_host = $host;
-        $this->database_port = $port;
+		$this->database_host = $host;
+		$this->database_port = $port;
 
 		$this->transaction_opened = 0;
 
@@ -136,14 +136,14 @@ class DoliDBPgsql extends DoliDB
 	}
 
 
-    /**
-     *  Convert a SQL request in Mysql syntax to native syntax
-     *
-     *  @param  string	$line   			SQL request line to convert
-     *  @param  string	$type				Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
-     *  @param	bool	$unescapeslashquot	Unescape slash quote with quote quote
-     *  @return string   					SQL request line converted
-     */
+	/**
+	 *  Convert a SQL request in Mysql syntax to native syntax
+	 *
+	 *  @param  string	$line   			SQL request line to convert
+	 *  @param  string	$type				Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
+	 *  @param	bool	$unescapeslashquot	Unescape slash quote with quote quote
+	 *  @return string   					SQL request line converted
+	 */
 	public static function convertSQLFromMysql($line, $type = 'auto', $unescapeslashquot = false)
 	{
 		global $conf;
@@ -161,160 +161,163 @@ class DoliDBPgsql extends DoliDB
 		{
 			// group_concat support (PgSQL >= 9.0)
 			// Replace group_concat(x) or group_concat(x SEPARATOR ',') with string_agg(x, ',')
-		    $line = preg_replace('/GROUP_CONCAT/i', 'STRING_AGG', $line);
+			$line = preg_replace('/GROUP_CONCAT/i', 'STRING_AGG', $line);
 			$line = preg_replace('/ SEPARATOR/i', ',', $line);
 			$line = preg_replace('/STRING_AGG\(([^,\)]+)\)/i', 'STRING_AGG(\\1, \',\')', $line);
 			//print $line."\n";
 
-		    if ($type == 'auto')
-		    {
-                if (preg_match('/ALTER TABLE/i', $line)) $type = 'dml';
-                elseif (preg_match('/CREATE TABLE/i', $line)) $type = 'dml';
-                elseif (preg_match('/DROP TABLE/i', $line)) $type = 'dml';
-		    }
+			if ($type == 'auto')
+			{
+				if (preg_match('/ALTER TABLE/i', $line)) $type = 'dml';
+				elseif (preg_match('/CREATE TABLE/i', $line)) $type = 'dml';
+				elseif (preg_match('/DROP TABLE/i', $line)) $type = 'dml';
+			}
 
-    		$line = preg_replace('/ as signed\)/i', ' as integer)', $line);
+			$line = preg_replace('/ as signed\)/i', ' as integer)', $line);
 
-		    if ($type == 'dml')
-		    {
-		    	$reg = array();
+			if ($type == 'dml')
+			{
+				$reg = array();
 
-                $line = preg_replace('/\s/', ' ', $line); // Replace tabulation with space
+				$line = preg_replace('/\s/', ' ', $line); // Replace tabulation with space
 
-		        // we are inside create table statement so lets process datatypes
-    			if (preg_match('/(ISAM|innodb)/i', $line)) { // end of create table sequence
-    				$line = preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i', ');', $line);
-    				$line = preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i', ');', $line);
-    				$line = preg_replace('/,$/', '', $line);
-    			}
+				// we are inside create table statement so lets process datatypes
+				if (preg_match('/(ISAM|innodb)/i', $line)) { // end of create table sequence
+					$line = preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i', ');', $line);
+					$line = preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i', ');', $line);
+					$line = preg_replace('/,$/', '', $line);
+				}
 
-    			// Process case: "CREATE TABLE llx_mytable(rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,code..."
-    			if (preg_match('/[\s\t\(]*(\w*)[\s\t]+int.*auto_increment/i', $line, $reg)) {
-    				$newline = preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i', '\\1 \\2 SERIAL PRIMARY KEY', $line);
-                    //$line = "-- ".$line." replaced by --\n".$newline;
-                    $line = $newline;
-    			}
+				// Process case: "CREATE TABLE llx_mytable(rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,code..."
+				if (preg_match('/[\s\t\(]*(\w*)[\s\t]+int.*auto_increment/i', $line, $reg)) {
+					$newline = preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i', '\\1 \\2 SERIAL PRIMARY KEY', $line);
+					//$line = "-- ".$line." replaced by --\n".$newline;
+					$line = $newline;
+				}
 
-    			if (preg_match('/[\s\t\(]*(\w*)[\s\t]+bigint.*auto_increment/i', $line, $reg)) {
-    				$newline = preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+bigint.*auto_increment[^,]*/i', '\\1 \\2 BIGSERIAL PRIMARY KEY', $line);
-    				//$line = "-- ".$line." replaced by --\n".$newline;
-    				$line = $newline;
-    			}
+				if (preg_match('/[\s\t\(]*(\w*)[\s\t]+bigint.*auto_increment/i', $line, $reg)) {
+					$newline = preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+bigint.*auto_increment[^,]*/i', '\\1 \\2 BIGSERIAL PRIMARY KEY', $line);
+					//$line = "-- ".$line." replaced by --\n".$newline;
+					$line = $newline;
+				}
 
-    			// tinyint type conversion
-    			$line = preg_replace('/tinyint\(?[0-9]*\)?/', 'smallint', $line);
-    			$line = preg_replace('/tinyint/i', 'smallint', $line);
+				// tinyint type conversion
+				$line = preg_replace('/tinyint\(?[0-9]*\)?/', 'smallint', $line);
+				$line = preg_replace('/tinyint/i', 'smallint', $line);
 
-    			// nuke unsigned
-    			$line = preg_replace('/(int\w+|smallint)\s+unsigned/i', '\\1', $line);
+				// nuke unsigned
+				$line = preg_replace('/(int\w+|smallint)\s+unsigned/i', '\\1', $line);
 
-    			// blob -> text
-    			$line = preg_replace('/\w*blob/i', 'text', $line);
+				// blob -> text
+				$line = preg_replace('/\w*blob/i', 'text', $line);
 
-    			// tinytext/mediumtext -> text
-    			$line = preg_replace('/tinytext/i', 'text', $line);
-    			$line = preg_replace('/mediumtext/i', 'text', $line);
-    			$line = preg_replace('/longtext/i', 'text', $line);
+				// tinytext/mediumtext -> text
+				$line = preg_replace('/tinytext/i', 'text', $line);
+				$line = preg_replace('/mediumtext/i', 'text', $line);
+				$line = preg_replace('/longtext/i', 'text', $line);
 
-    			$line = preg_replace('/text\([0-9]+\)/i', 'text', $line);
+				$line = preg_replace('/text\([0-9]+\)/i', 'text', $line);
 
-    			// change not null datetime field to null valid ones
-    			// (to support remapping of "zero time" to null
-    			$line = preg_replace('/datetime not null/i', 'datetime', $line);
-    			$line = preg_replace('/datetime/i', 'timestamp', $line);
+				// change not null datetime field to null valid ones
+				// (to support remapping of "zero time" to null
+				$line = preg_replace('/datetime not null/i', 'datetime', $line);
+				$line = preg_replace('/datetime/i', 'timestamp', $line);
 
-    			// double -> numeric
-    			$line = preg_replace('/^double/i', 'numeric', $line);
-    			$line = preg_replace('/(\s*)double/i', '\\1numeric', $line);
-    			// float -> numeric
-    			$line = preg_replace('/^float/i', 'numeric', $line);
-    			$line = preg_replace('/(\s*)float/i', '\\1numeric', $line);
+				// double -> numeric
+				$line = preg_replace('/^double/i', 'numeric', $line);
+				$line = preg_replace('/(\s*)double/i', '\\1numeric', $line);
+				// float -> numeric
+				$line = preg_replace('/^float/i', 'numeric', $line);
+				$line = preg_replace('/(\s*)float/i', '\\1numeric', $line);
 
-    			//Check tms timestamp field case (in Mysql this field is defautled to now and
-    			// on update defaulted by now
-    			$line = preg_replace('/(\s*)tms(\s*)timestamp/i', '\\1tms timestamp without time zone DEFAULT now() NOT NULL', $line);
+				//Check tms timestamp field case (in Mysql this field is defautled to now and
+				// on update defaulted by now
+				$line = preg_replace('/(\s*)tms(\s*)timestamp/i', '\\1tms timestamp without time zone DEFAULT now() NOT NULL', $line);
 
-    			// nuke ON UPDATE CURRENT_TIMESTAMP
-    			$line = preg_replace('/(\s*)on(\s*)update(\s*)CURRENT_TIMESTAMP/i', '\\1', $line);
+				// nuke DEFAULT CURRENT_TIMESTAMP
+				$line = preg_replace('/(\s*)DEFAULT(\s*)CURRENT_TIMESTAMP/i', '\\1', $line);
 
-    			// unique index(field1,field2)
-    			if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i', $line))
-    			{
-    				$line = preg_replace('/unique index\s*\((\w+\s*,\s*\w+)\)/i', 'UNIQUE\(\\1\)', $line);
-    			}
+				// nuke ON UPDATE CURRENT_TIMESTAMP
+				$line = preg_replace('/(\s*)ON(\s*)UPDATE(\s*)CURRENT_TIMESTAMP/i', '\\1', $line);
 
-    			// We remove end of requests "AFTER fieldxxx"
-    			$line = preg_replace('/\sAFTER [a-z0-9_]+/i', '', $line);
+				// unique index(field1,field2)
+				if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i', $line))
+				{
+					$line = preg_replace('/unique index\s*\((\w+\s*,\s*\w+)\)/i', 'UNIQUE\(\\1\)', $line);
+				}
 
-    			// We remove start of requests "ALTER TABLE tablexxx" if this is a DROP INDEX
-    			$line = preg_replace('/ALTER TABLE [a-z0-9_]+\s+DROP INDEX/i', 'DROP INDEX', $line);
+				// We remove end of requests "AFTER fieldxxx"
+				$line = preg_replace('/\sAFTER [a-z0-9_]+/i', '', $line);
 
-                // Translate order to rename fields
-                if (preg_match('/ALTER TABLE ([a-z0-9_]+)\s+CHANGE(?: COLUMN)? ([a-z0-9_]+) ([a-z0-9_]+)(.*)$/i', $line, $reg))
-                {
-                	$line = "-- ".$line." replaced by --\n";
-                    $line .= "ALTER TABLE ".$reg[1]." RENAME COLUMN ".$reg[2]." TO ".$reg[3];
-                }
+				// We remove start of requests "ALTER TABLE tablexxx" if this is a DROP INDEX
+				$line = preg_replace('/ALTER TABLE [a-z0-9_]+\s+DROP INDEX/i', 'DROP INDEX', $line);
 
-                // Translate order to modify field format
-                if (preg_match('/ALTER TABLE ([a-z0-9_]+)\s+MODIFY(?: COLUMN)? ([a-z0-9_]+) (.*)$/i', $line, $reg))
-                {
-                    $line = "-- ".$line." replaced by --\n";
-                    $newreg3 = $reg[3];
-                    $newreg3 = preg_replace('/ DEFAULT NULL/i', '', $newreg3);
-                    $newreg3 = preg_replace('/ NOT NULL/i', '', $newreg3);
-                    $newreg3 = preg_replace('/ NULL/i', '', $newreg3);
-                    $newreg3 = preg_replace('/ DEFAULT 0/i', '', $newreg3);
-                    $newreg3 = preg_replace('/ DEFAULT \'?[0-9a-zA-Z_@]*\'?/i', '', $newreg3);
-                    $line .= "ALTER TABLE ".$reg[1]." ALTER COLUMN ".$reg[2]." TYPE ".$newreg3;
-                    // TODO Add alter to set default value or null/not null if there is this in $reg[3]
-                }
+				// Translate order to rename fields
+				if (preg_match('/ALTER TABLE ([a-z0-9_]+)\s+CHANGE(?: COLUMN)? ([a-z0-9_]+) ([a-z0-9_]+)(.*)$/i', $line, $reg))
+				{
+					$line = "-- ".$line." replaced by --\n";
+					$line .= "ALTER TABLE ".$reg[1]." RENAME COLUMN ".$reg[2]." TO ".$reg[3];
+				}
 
-                // alter table add primary key (field1, field2 ...) -> We remove the primary key name not accepted by PostGreSQL
-    			// ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity)
-    			if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i', $line, $reg))
-    			{
-    				$line = "-- ".$line." replaced by --\n";
-    				$line .= "ALTER TABLE ".$reg[1]." ADD PRIMARY KEY (".$reg[3];
-    			}
+				// Translate order to modify field format
+				if (preg_match('/ALTER TABLE ([a-z0-9_]+)\s+MODIFY(?: COLUMN)? ([a-z0-9_]+) (.*)$/i', $line, $reg))
+				{
+					$line = "-- ".$line." replaced by --\n";
+					$newreg3 = $reg[3];
+					$newreg3 = preg_replace('/ DEFAULT NULL/i', '', $newreg3);
+					$newreg3 = preg_replace('/ NOT NULL/i', '', $newreg3);
+					$newreg3 = preg_replace('/ NULL/i', '', $newreg3);
+					$newreg3 = preg_replace('/ DEFAULT 0/i', '', $newreg3);
+					$newreg3 = preg_replace('/ DEFAULT \'?[0-9a-zA-Z_@]*\'?/i', '', $newreg3);
+					$line .= "ALTER TABLE ".$reg[1]." ALTER COLUMN ".$reg[2]." TYPE ".$newreg3;
+					// TODO Add alter to set default value or null/not null if there is this in $reg[3]
+				}
 
-                // Translate order to drop primary keys
-                // ALTER TABLE llx_dolibarr_modules DROP PRIMARY KEY pk_xxx
-                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+PRIMARY\s+KEY\s*([^;]+)$/i', $line, $reg))
-                {
-                    $line = "-- ".$line." replaced by --\n";
-                    $line .= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
-                }
+				// alter table add primary key (field1, field2 ...) -> We remove the primary key name not accepted by PostGreSQL
+				// ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity)
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i', $line, $reg))
+				{
+					$line = "-- ".$line." replaced by --\n";
+					$line .= "ALTER TABLE ".$reg[1]." ADD PRIMARY KEY (".$reg[3];
+				}
 
-		        // Translate order to drop foreign keys
-                // ALTER TABLE llx_dolibarr_modules DROP FOREIGN KEY fk_xxx
-                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+FOREIGN\s+KEY\s*(.*)$/i', $line, $reg))
-                {
-                    $line = "-- ".$line." replaced by --\n";
-                    $line .= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
-                }
+				// Translate order to drop primary keys
+				// ALTER TABLE llx_dolibarr_modules DROP PRIMARY KEY pk_xxx
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+PRIMARY\s+KEY\s*([^;]+)$/i', $line, $reg))
+				{
+					$line = "-- ".$line." replaced by --\n";
+					$line .= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
+				}
 
-                // Translate order to add foreign keys
-                // ALTER TABLE llx_tablechild ADD CONSTRAINT fk_tablechild_fk_fieldparent FOREIGN KEY (fk_fieldparent) REFERENCES llx_tableparent (rowid)
-                if (preg_match('/ALTER\s+TABLE\s+(.*)\s*ADD CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*(.*)$/i', $line, $reg))
-                {
-                    $line = preg_replace('/;$/', '', $line);
-                    $line .= " DEFERRABLE INITIALLY IMMEDIATE;";
-                }
+				// Translate order to drop foreign keys
+				// ALTER TABLE llx_dolibarr_modules DROP FOREIGN KEY fk_xxx
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+FOREIGN\s+KEY\s*(.*)$/i', $line, $reg))
+				{
+					$line = "-- ".$line." replaced by --\n";
+					$line .= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
+				}
 
-                // alter table add [unique] [index] (field1, field2 ...)
-    			// ALTER TABLE llx_accountingaccount ADD INDEX idx_accountingaccount_fk_pcg_version (fk_pcg_version)
-    			if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+(UNIQUE INDEX|INDEX|UNIQUE)\s+(.*)\s*\(([\w,\s]+)\)/i', $line, $reg))
-    			{
-    				$fieldlist = $reg[4];
-    				$idxname = $reg[3];
-    				$tablename = $reg[1];
-    				$line = "-- ".$line." replaced by --\n";
-    				$line .= "CREATE ".(preg_match('/UNIQUE/', $reg[2]) ? 'UNIQUE ' : '')."INDEX ".$idxname." ON ".$tablename." (".$fieldlist.")";
-    			}
-            }
+				// Translate order to add foreign keys
+				// ALTER TABLE llx_tablechild ADD CONSTRAINT fk_tablechild_fk_fieldparent FOREIGN KEY (fk_fieldparent) REFERENCES llx_tableparent (rowid)
+				if (preg_match('/ALTER\s+TABLE\s+(.*)\s*ADD CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*(.*)$/i', $line, $reg))
+				{
+					$line = preg_replace('/;$/', '', $line);
+					$line .= " DEFERRABLE INITIALLY IMMEDIATE;";
+				}
 
-            // To have postgresql case sensitive
+				// alter table add [unique] [index] (field1, field2 ...)
+				// ALTER TABLE llx_accountingaccount ADD INDEX idx_accountingaccount_fk_pcg_version (fk_pcg_version)
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+(UNIQUE INDEX|INDEX|UNIQUE)\s+(.*)\s*\(([\w,\s]+)\)/i', $line, $reg))
+				{
+					$fieldlist = $reg[4];
+					$idxname = $reg[3];
+					$tablename = $reg[1];
+					$line = "-- ".$line." replaced by --\n";
+					$line .= "CREATE ".(preg_match('/UNIQUE/', $reg[2]) ? 'UNIQUE ' : '')."INDEX ".$idxname." ON ".$tablename." (".$fieldlist.")";
+				}
+			}
+
+			// To have postgresql case sensitive
 			$count_like = 0;
 			$line = str_replace(' LIKE \'', ' ILIKE \'', $line, $count_like);
 			if (!empty($conf->global->PSQL_USE_UNACCENT) && $count_like > 0)
@@ -323,10 +326,10 @@ class DoliDBPgsql extends DoliDB
 				$line = preg_replace('/\s+(\(+\s*)([a-zA-Z0-9\-\_\.]+) ILIKE /', ' \1unaccent(\2) ILIKE ', $line);
 			}
 
-            $line = str_replace(' LIKE BINARY \'', ' LIKE \'', $line);
+			$line = str_replace(' LIKE BINARY \'', ' LIKE \'', $line);
 
-            // Replace INSERT IGNORE into INSERT
-            $line = preg_replace('/^INSERT IGNORE/', 'INSERT', $line);
+			// Replace INSERT IGNORE into INSERT
+			$line = preg_replace('/^INSERT IGNORE/', 'INSERT', $line);
 
 			// Delete using criteria on other table must not declare twice the deleted table
 			// DELETE FROM tabletodelete USING tabletodelete, othertable -> DELETE FROM tabletodelete USING othertable
@@ -370,24 +373,24 @@ class DoliDBPgsql extends DoliDB
 		return $line;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Select a database
-     *  Ici postgresql n'a aucune fonction equivalente de mysql_select_db
-     *  On compare juste manuellement si la database choisie est bien celle activee par la connexion
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Select a database
+	 *  Ici postgresql n'a aucune fonction equivalente de mysql_select_db
+	 *  On compare juste manuellement si la database choisie est bien celle activee par la connexion
 	 *
 	 *	@param	    string	$database	Name of database
 	 *	@return	    bool				true if OK, false if KO
 	 */
-    public function select_db($database)
+	public function select_db($database)
 	{
-        // phpcs:enable
-        if ($database == $this->database_name) {
-            return true;
-        } else {
-            return false;
-        }
-    }
+		// phpcs:enable
+		if ($database == $this->database_name) {
+			return true;
+		} else {
+			return false;
+		}
+	}
 
 	/**
 	 *	Connexion to server
@@ -400,7 +403,7 @@ class DoliDBPgsql extends DoliDB
 	 *	@return		bool|resource			Database access handler
 	 *	@see		close()
 	 */
-    public function connect($host, $login, $passwd, $name, $port = 0)
+	public function connect($host, $login, $passwd, $name, $port = 0)
 	{
 		// use pg_pconnect() instead of pg_connect() if you want to use persistent connection costing 1ms, instead of 30ms for non persistent
 
@@ -425,7 +428,7 @@ class DoliDBPgsql extends DoliDB
 		// if local connection failed or not requested, use TCP/IP
 		if (!$this->db)
 		{
-		    if (!$host) $host = "localhost";
+			if (!$host) $host = "localhost";
 			if (!$port) $port = 5432;
 
 			$con_string = "host='".$host."' port='".$port."' dbname='".$name."' user='".$login."' password='".$passwd."'";
@@ -448,13 +451,13 @@ class DoliDBPgsql extends DoliDB
 	 *
 	 *	@return	        string      Version string
 	 */
-    public function getVersion()
+	public function getVersion()
 	{
 		$resql = $this->query('SHOW server_version');
 		if ($resql)
 		{
-		    $liste = $this->fetch_array($resql);
-		    return $liste['server_version'];
+			$liste = $this->fetch_array($resql);
+			return $liste['server_version'];
 		}
 		return '';
 	}
@@ -464,37 +467,37 @@ class DoliDBPgsql extends DoliDB
 	 *
 	 *	@return	        string      Version string
 	 */
-    public function getDriverInfo()
+	public function getDriverInfo()
 	{
 		return 'pgsql php driver';
 	}
 
-    /**
-     *  Close database connexion
-     *
-     *  @return     boolean     True if disconnect successfull, false otherwise
-     *  @see        connect()
-     */
-    public function close()
-    {
-        if ($this->db)
-        {
-            if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened, LOG_ERR);
-            $this->connected = false;
-            return pg_close($this->db);
-        }
-        return false;
-    }
+	/**
+	 *  Close database connexion
+	 *
+	 *  @return     boolean     True if disconnect successfull, false otherwise
+	 *  @see        connect()
+	 */
+	public function close()
+	{
+		if ($this->db)
+		{
+			if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened, LOG_ERR);
+			$this->connected = false;
+			return pg_close($this->db);
+		}
+		return false;
+	}
 
 	/**
 	 * Convert request to PostgreSQL syntax, execute it and return the resultset
 	 *
 	 * @param	string	$query			SQL query string
 	 * @param	int		$usesavepoint	0=Default mode, 1=Run a savepoint before and a rollback to savepoint if error (this allow to have some request with errors inside global transactions).
-     * @param   string	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
+	 * @param   string	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
 	 * @return	false|resource			Resultset of answer
 	 */
-    public function query($query, $usesavepoint = 0, $type = 'auto')
+	public function query($query, $usesavepoint = 0, $type = 'auto')
 	{
 		global $conf;
 
@@ -536,16 +539,16 @@ class DoliDBPgsql extends DoliDB
 		{
 			if (!$ret)
 			{
-			    if ($this->errno() != 'DB_ERROR_25P02')	// Do not overwrite errors if this is a consecutive error
-			    {
-    				$this->lastqueryerror = $query;
-    				$this->lasterror = $this->error();
-    				$this->lasterrno = $this->errno();
+				if ($this->errno() != 'DB_ERROR_25P02')	// Do not overwrite errors if this is a consecutive error
+				{
+					$this->lastqueryerror = $query;
+					$this->lasterror = $this->error();
+					$this->lasterrno = $this->errno();
 
-    				if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR); // Log of request was not yet done previously
+					if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR); // Log of request was not yet done previously
 					dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterror." (".$this->lasterrno.")", LOG_ERR);
 					dol_syslog(get_class($this)."::query SQL Error usesavepoint = ".$usesavepoint, LOG_ERR);
-			    }
+				}
 
 				if ($usesavepoint && $this->transaction_opened)	// Warning, after that errno will be erased
 				{
@@ -559,68 +562,68 @@ class DoliDBPgsql extends DoliDB
 		return $ret;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Renvoie la ligne courante (comme un objet) pour le curseur resultset
 	 *
 	 *	@param	resource	$resultset  Curseur de la requete voulue
 	 *	@return	false|object			Object result line or false if KO or end of cursor
 	 */
-    public function fetch_object($resultset)
+	public function fetch_object($resultset)
 	{
-        // phpcs:enable
-        // If resultset not provided, we take the last used by connexion
+		// phpcs:enable
+		// If resultset not provided, we take the last used by connexion
 		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		return pg_fetch_object($resultset);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Return datas as an array
-     *
-     *	@param	resource	$resultset  Resultset of request
-     *	@return	false|array				Array
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return datas as an array
+	 *
+	 *	@param	resource	$resultset  Resultset of request
+	 *	@return	false|array				Array
 	 */
-    public function fetch_array($resultset)
+	public function fetch_array($resultset)
 	{
-        // phpcs:enable
-        // If resultset not provided, we take the last used by connexion
+		// phpcs:enable
+		// If resultset not provided, we take the last used by connexion
 		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		return pg_fetch_array($resultset);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-     *	Return datas as an array
-     *
-     *	@param	resource	$resultset  Resultset of request
-     *	@return	false|array				Array
+	 *	Return datas as an array
+	 *
+	 *	@param	resource	$resultset  Resultset of request
+	 *	@return	false|array				Array
 	 */
-    public function fetch_row($resultset)
+	public function fetch_row($resultset)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
 		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		return pg_fetch_row($resultset);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Return number of lines for result of a SELECT
-     *
-     *	@param	resource	$resultset  Resulset of requests
-     *	@return int		    			Nb of lines, -1 on error
-     *	@see    affected_rows()
-     */
-    public function num_rows($resultset)
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return number of lines for result of a SELECT
+	 *
+	 *	@param	resource	$resultset  Resulset of requests
+	 *	@return int		    			Nb of lines, -1 on error
+	 *	@see    affected_rows()
+	 */
+	public function num_rows($resultset)
 	{
-        // phpcs:enable
-        // If resultset not provided, we take the last used by connexion
+		// phpcs:enable
+		// If resultset not provided, we take the last used by connexion
 		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		return pg_num_rows($resultset);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return the number of lines in the result of a request INSERT, DELETE or UPDATE
 	 *
@@ -628,10 +631,10 @@ class DoliDBPgsql extends DoliDB
 	 * @return  int		    			Nb of lines
 	 * @see 	num_rows()
 	 */
-    public function affected_rows($resultset)
+	public function affected_rows($resultset)
 	{
-        // phpcs:enable
-        // If resultset not provided, we take the last used by connexion
+		// phpcs:enable
+		// If resultset not provided, we take the last used by connexion
 		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		// pgsql necessite un resultset pour cette fonction contrairement
 		// a mysql qui prend un link de base
@@ -645,9 +648,9 @@ class DoliDBPgsql extends DoliDB
 	 * @param	resource	$resultset  Result set of request
 	 * @return	void
 	 */
-    public function free($resultset = null)
+	public function free($resultset = null)
 	{
-        // If resultset not provided, we take the last used by connexion
+		// If resultset not provided, we take the last used by connexion
 		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		// Si resultset en est un, on libere la memoire
 		if (is_resource($resultset)) pg_free_result($resultset);
@@ -655,16 +658,16 @@ class DoliDBPgsql extends DoliDB
 
 
 	/**
-     *	Define limits and offset of request
-     *
-     *	@param	int		$limit      Maximum number of lines returned (-1=conf->liste_limit, 0=no limit)
-     *	@param	int		$offset     Numero of line from where starting fetch
-     *	@return	string      		String with SQL syntax to add a limit and offset
+	 *	Define limits and offset of request
+	 *
+	 *	@param	int		$limit      Maximum number of lines returned (-1=conf->liste_limit, 0=no limit)
+	 *	@param	int		$offset     Numero of line from where starting fetch
+	 *	@return	string      		String with SQL syntax to add a limit and offset
 	 */
-    public function plimit($limit = 0, $offset = 0)
+	public function plimit($limit = 0, $offset = 0)
 	{
 		global $conf;
-        if (empty($limit)) return "";
+		if (empty($limit)) return "";
 		if ($limit < 0) $limit = $conf->liste_limit;
 		if ($offset > 0) return " LIMIT ".$limit." OFFSET ".$offset." ";
 		else return " LIMIT $limit ";
@@ -677,32 +680,32 @@ class DoliDBPgsql extends DoliDB
 	 *   @param		string	$stringtoencode		String to escape
 	 *   @return	string						String escaped
 	 */
-    public function escape($stringtoencode)
+	public function escape($stringtoencode)
 	{
 		return pg_escape_string($stringtoencode);
 	}
 
-    /**
+	/**
 	 *   Convert (by PHP) a GM Timestamp date into a GM string date to insert into a date field.
 	 *   Function to use to build INSERT, UPDATE or WHERE predica
 	 *
 	 *   @param	    string	$param      Date TMS to convert
 	 *   @return	string   			Date in a string YYYY-MM-DD HH:MM:SS
 	 */
-    public function idate($param)
+	public function idate($param)
 	{
 		return dol_print_date($param, "%Y-%m-%d %H:%M:%S");
 	}
 
 	/**
-     *  Format a SQL IF
-     *
+	 *  Format a SQL IF
+	 *
 	 *  @param	string	$test           Test string (example: 'cd.statut=0', 'field IS NULL')
 	 *  @param	string	$resok          resultat si test egal
 	 *  @param	string	$resko          resultat si test non egal
 	 *  @return	string          		chaine formate SQL
 	 */
-    public function ifsql($test, $resok, $resko)
+	public function ifsql($test, $resok, $resko)
 	{
 		return '(CASE WHEN '.$test.' THEN '.$resok.' ELSE '.$resko.' END)';
 	}
@@ -712,7 +715,7 @@ class DoliDBPgsql extends DoliDB
 	 *
 	 * @return	string		Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
 	 */
-    public function errno()
+	public function errno()
 	{
 		if (!$this->connected) {
 			// Si il y a eu echec de connexion, $this->db n'est pas valide.
@@ -777,12 +780,12 @@ class DoliDBPgsql extends DoliDB
 	 *
 	 * @return	string		Error text
 	 */
-    public function error()
+	public function error()
 	{
 		return pg_last_error($this->db);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Get last ID after an insert INSERT
 	 *
@@ -790,9 +793,9 @@ class DoliDBPgsql extends DoliDB
 	 * @param	string	$fieldid	Field name
 	 * @return  string     			Id of row
 	 */
-    public function last_insert_id($tab, $fieldid = 'rowid')
+	public function last_insert_id($tab, $fieldid = 'rowid')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		//$result = pg_query($this->db,"SELECT MAX(".$fieldid.") FROM ".$tab);
 		$result = pg_query($this->db, "SELECT currval('".$tab."_".$fieldid."_seq')");
 		if (!$result)
@@ -806,14 +809,14 @@ class DoliDBPgsql extends DoliDB
 	}
 
 	/**
-     *  Encrypt sensitive data in database
-     *  Warning: This function includes the escape, so it must use direct value
-     *
-     *  @param  string  $fieldorvalue   Field name or value to encrypt
-     *  @param	int		$withQuotes     Return string with quotes
-     *  @return string          		XXX(field) or XXX('value') or field or 'value'
+	 *  Encrypt sensitive data in database
+	 *  Warning: This function includes the escape, so it must use direct value
+	 *
+	 *  @param  string  $fieldorvalue   Field name or value to encrypt
+	 *  @param	int		$withQuotes     Return string with quotes
+	 *  @return string          		XXX(field) or XXX('value') or field or 'value'
 	 */
-    public function encrypt($fieldorvalue, $withQuotes = 0)
+	public function encrypt($fieldorvalue, $withQuotes = 0)
 	{
 		global $conf;
 
@@ -834,7 +837,7 @@ class DoliDBPgsql extends DoliDB
 	 *	@param	int		$value			Value to decrypt
 	 * 	@return	string					Decrypted value if used
 	 */
-    public function decrypt($value)
+	public function decrypt($value)
 	{
 		global $conf;
 
@@ -849,21 +852,21 @@ class DoliDBPgsql extends DoliDB
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return connexion ID
 	 *
 	 * @return	        string      Id connexion
 	 */
-    public function DDLGetConnectId()
+	public function DDLGetConnectId()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return '?';
 	}
 
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Create a new database
 	 *	Do not use function xxx_create_db (xxx=mysql, ...) as they are deprecated
@@ -875,10 +878,10 @@ class DoliDBPgsql extends DoliDB
 	 * 	@param	string	$owner			Username of database owner
 	 * 	@return	false|resource				resource defined if OK, null if KO
 	 */
-    public function DDLCreateDb($database, $charset = '', $collation = '', $owner = '')
+	public function DDLCreateDb($database, $charset = '', $collation = '', $owner = '')
 	{
-        // phpcs:enable
-	    if (empty($charset))   $charset = $this->forcecharset;
+		// phpcs:enable
+		if (empty($charset))   $charset = $this->forcecharset;
 		if (empty($collation)) $collation = $this->forcecollate;
 
 		// Test charset match LC_TYPE (pgsql error otherwise)
@@ -890,7 +893,7 @@ class DoliDBPgsql extends DoliDB
 		return $ret;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  List tables into a database
 	 *
@@ -898,25 +901,25 @@ class DoliDBPgsql extends DoliDB
 	 *  @param	string		$table		Name of table filter ('xxx%')
 	 *  @return	array					List of tables in an array
 	 */
-    public function DDLListTables($database, $table = '')
-    {
-        // phpcs:enable
+	public function DDLListTables($database, $table = '')
+	{
+		// phpcs:enable
 		$listtables = array();
 
 		$like = '';
 		if ($table) $like = " AND table_name LIKE '".$this->escape($table)."'";
 		$result = pg_query($this->db, "SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'".$like." ORDER BY table_name");
-        if ($result)
-        {
-    		while ($row = $this->fetch_row($result))
-    		{
-    			$listtables[] = $row[0];
-    		}
-        }
+		if ($result)
+		{
+			while ($row = $this->fetch_row($result))
+			{
+				$listtables[] = $row[0];
+			}
+		}
 		return $listtables;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	List information of columns into a table.
 	 *
@@ -924,9 +927,9 @@ class DoliDBPgsql extends DoliDB
 	 *	@return	array				Tableau des informations des champs de la table
 	 *
 	 */
-    public function DDLInfoTable($table)
+	public function DDLInfoTable($table)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$infotables = array();
 
 		$sql = "SELECT ";
@@ -949,16 +952,16 @@ class DoliDBPgsql extends DoliDB
 		$result = $this->query($sql);
 		if ($result)
 		{
-    		while ($row = $this->fetch_row($result))
-    		{
-    			$infotables[] = $row;
-    		}
+			while ($row = $this->fetch_row($result))
+			{
+				$infotables[] = $row;
+			}
 		}
-        return $infotables;
+		return $infotables;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Create a table into database
 	 *
@@ -971,9 +974,9 @@ class DoliDBPgsql extends DoliDB
 	 *	@param	    array	$keys 			Tableau des champs cles noms => valeur
 	 *	@return	    int						<0 if KO, >=0 if OK
 	 */
-    public function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null)
+	public function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// FIXME: $fulltext_keys parameter is unused
 
 		// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
@@ -985,19 +988,19 @@ class DoliDBPgsql extends DoliDB
 			$sqlfields[$i] = $field_name." ";
 			$sqlfields[$i] .= $field_desc['type'];
 			if (preg_match("/^[^\s]/i", $field_desc['value']))
-			    $sqlfields[$i] .= "(".$field_desc['value'].")";
+				$sqlfields[$i] .= "(".$field_desc['value'].")";
 			elseif (preg_match("/^[^\s]/i", $field_desc['attribute']))
-			    $sqlfields[$i] .= " ".$field_desc['attribute'];
+				$sqlfields[$i] .= " ".$field_desc['attribute'];
 			elseif (preg_match("/^[^\s]/i", $field_desc['default']))
 			{
 				if (preg_match("/null/i", $field_desc['default']))
-				    $sqlfields[$i] .= " default ".$field_desc['default'];
-			    else $sqlfields[$i] .= " default '".$this->escape($field_desc['default'])."'";
+					$sqlfields[$i] .= " default ".$field_desc['default'];
+				else $sqlfields[$i] .= " default '".$this->escape($field_desc['default'])."'";
 			} elseif (preg_match("/^[^\s]/i", $field_desc['null']))
-			    $sqlfields[$i]  .= " ".$field_desc['null'];
+				$sqlfields[$i]  .= " ".$field_desc['null'];
 
 			elseif (preg_match("/^[^\s]/i", $field_desc['extra']))
-			    $sqlfields[$i]  .= " ".$field_desc['extra'];
+				$sqlfields[$i]  .= " ".$field_desc['extra'];
 			$i++;
 		}
 		if ($primary_key != "")
@@ -1036,16 +1039,16 @@ class DoliDBPgsql extends DoliDB
 		else return 1;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Drop a table into database
 	 *
 	 *	@param	    string	$table 			Name of table
 	 *	@return	    int						<0 if KO, >=0 if OK
 	 */
-    public function DDLDropTable($table)
+	public function DDLDropTable($table)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "DROP TABLE ".$table;
 
 		if (!$this->query($sql))
@@ -1053,7 +1056,7 @@ class DoliDBPgsql extends DoliDB
 		else return 1;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Create a user to connect to database
 	 *
@@ -1063,9 +1066,9 @@ class DoliDBPgsql extends DoliDB
 	 *	@param	string	$dolibarr_main_db_name		Database name where user must be granted
 	 *	@return	int									<0 if KO, >=0 if OK
 	 */
-    public function DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name)
+	public function DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// Note: using ' on user does not works with pgsql
 		$sql = "CREATE USER ".$this->escape($dolibarr_main_db_user)." with password '".$this->escape($dolibarr_main_db_pass)."'";
 
@@ -1079,7 +1082,7 @@ class DoliDBPgsql extends DoliDB
 		return 1;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return a pointer of line with description of a table or field
 	 *
@@ -1087,9 +1090,9 @@ class DoliDBPgsql extends DoliDB
 	 *	@param	string		$field	Optionnel : Name of field if we want description of field
 	 *	@return	false|resource		Resultset x (x->attname)
 	 */
-    public function DDLDescTable($table, $field = "")
+	public function DDLDescTable($table, $field = "")
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "SELECT attname FROM pg_attribute, pg_type WHERE typname = '".$this->escape($table)."' AND attrelid = typrelid";
 		$sql .= " AND attname NOT IN ('cmin', 'cmax', 'ctid', 'oid', 'tableoid', 'xmin', 'xmax')";
 		if ($field) $sql .= " AND attname = '".$this->escape($field)."'";
@@ -1099,7 +1102,7 @@ class DoliDBPgsql extends DoliDB
 		return $this->_results;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Create a new field into table
 	 *
@@ -1109,26 +1112,26 @@ class DoliDBPgsql extends DoliDB
 	 *	@param	string	$field_position 	Optionnel ex.: "after champtruc"
 	 *	@return	int							<0 if KO, >0 if OK
 	 */
-    public function DDLAddField($table, $field_name, $field_desc, $field_position = "")
+	public function DDLAddField($table, $field_name, $field_desc, $field_position = "")
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
 		// ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
 		$sql = "ALTER TABLE ".$table." ADD ".$field_name." ";
 		$sql .= $field_desc['type'];
 		if (preg_match("/^[^\s]/i", $field_desc['value'])) {
 			if (!in_array($field_desc['type'], array('int', 'date', 'datetime')) && $field_desc['value'])
-		    {
-		        $sql .= "(".$field_desc['value'].")";
-		    }
+			{
+				$sql .= "(".$field_desc['value'].")";
+			}
 		}
 		if (preg_match("/^[^\s]/i", $field_desc['attribute']))
-            $sql .= " ".$field_desc['attribute'];
+			$sql .= " ".$field_desc['attribute'];
 		if (preg_match("/^[^\s]/i", $field_desc['null']))
-            $sql .= " ".$field_desc['null'];
+			$sql .= " ".$field_desc['null'];
 		if (preg_match("/^[^\s]/i", $field_desc['default'])) {
-            if (preg_match("/null/i", $field_desc['default'])) {
-                $sql .= " default ".$field_desc['default'];
+			if (preg_match("/null/i", $field_desc['default'])) {
+				$sql .= " default ".$field_desc['default'];
 			} else {
 				$sql .= " default '".$this->escape($field_desc['default'])."'";
 			}
@@ -1144,7 +1147,7 @@ class DoliDBPgsql extends DoliDB
 		return 1;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Update format of a field into a table
 	 *
@@ -1153,9 +1156,9 @@ class DoliDBPgsql extends DoliDB
 	 *	@param	string	$field_desc 		Array with description of field format
 	 *	@return	int							<0 if KO, >0 if OK
 	 */
-    public function DDLUpdateField($table, $field_name, $field_desc)
+	public function DDLUpdateField($table, $field_name, $field_desc)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "ALTER TABLE ".$table;
 		$sql .= " MODIFY COLUMN ".$field_name." ".$field_desc['type'];
 		if (in_array($field_desc['type'], array('double', 'tinyint', 'int', 'varchar')) && $field_desc['value']) {
@@ -1164,22 +1167,22 @@ class DoliDBPgsql extends DoliDB
 
 		if ($field_desc['null'] == 'not null' || $field_desc['null'] == 'NOT NULL')
 		{
-        	// We will try to change format of column to NOT NULL. To be sure the ALTER works, we try to update fields that are NULL
-        	if ($field_desc['type'] == 'varchar' || $field_desc['type'] == 'text')
-        	{
-        		$sqlbis = "UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
-        		$this->query($sqlbis);
-        	} elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
-        	{
-        		$sqlbis = "UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
-        		$this->query($sqlbis);
-        	}
+			// We will try to change format of column to NOT NULL. To be sure the ALTER works, we try to update fields that are NULL
+			if ($field_desc['type'] == 'varchar' || $field_desc['type'] == 'text')
+			{
+				$sqlbis = "UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
+				$this->query($sqlbis);
+			} elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
+			{
+				$sqlbis = "UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
+				$this->query($sqlbis);
+			}
 		}
 
 		if ($field_desc['default'] != '')
 		{
 			if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') $sql .= " DEFAULT ".$this->escape($field_desc['default']);
-        	elseif ($field_desc['type'] != 'text') $sql .= " DEFAULT '".$this->escape($field_desc['default'])."'"; // Default not supported on text fields
+			elseif ($field_desc['type'] != 'text') $sql .= " DEFAULT '".$this->escape($field_desc['default'])."'"; // Default not supported on text fields
 		}
 
 		dol_syslog($sql, LOG_DEBUG);
@@ -1188,7 +1191,7 @@ class DoliDBPgsql extends DoliDB
 		return 1;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Drop a field from table
 	 *
@@ -1196,9 +1199,9 @@ class DoliDBPgsql extends DoliDB
 	 *	@param	string	$field_name 	Name of field to drop
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-    public function DDLDropField($table, $field_name)
+	public function DDLDropField($table, $field_name)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "ALTER TABLE ".$table." DROP COLUMN ".$field_name;
 		dol_syslog($sql, LOG_DEBUG);
 		if (!$this->query($sql))
@@ -1214,13 +1217,13 @@ class DoliDBPgsql extends DoliDB
 	 *
 	 *	@return		string		Charset
 	 */
-    public function getDefaultCharacterSetDatabase()
+	public function getDefaultCharacterSetDatabase()
 	{
 		$resql = $this->query('SHOW SERVER_ENCODING');
 		if ($resql)
 		{
-            $liste = $this->fetch_array($resql);
-		    return $liste['server_encoding'];
+			$liste = $this->fetch_array($resql);
+			return $liste['server_encoding'];
 		} else return '';
 	}
 
@@ -1229,7 +1232,7 @@ class DoliDBPgsql extends DoliDB
 	 *
 	 *	@return		array		List of Charset
 	 */
-    public function getListOfCharacterSet()
+	public function getListOfCharacterSet()
 	{
 		$resql = $this->query('SHOW SERVER_ENCODING');
 		$liste = array();
@@ -1254,12 +1257,12 @@ class DoliDBPgsql extends DoliDB
 	 *
 	 *	@return		string		Collation value
 	 */
-    public function getDefaultCollationDatabase()
+	public function getDefaultCollationDatabase()
 	{
 		$resql = $this->query('SHOW LC_COLLATE');
 		if ($resql)
 		{
-		    $liste = $this->fetch_array($resql);
+			$liste = $this->fetch_array($resql);
 			return $liste['lc_collate'];
 		} else return '';
 	}
@@ -1269,7 +1272,7 @@ class DoliDBPgsql extends DoliDB
 	 *
 	 *	@return		array		Liste of Collation
 	 */
-    public function getListOfCollation()
+	public function getListOfCollation()
 	{
 		$resql = $this->query('SHOW LC_COLLATE');
 		$liste = array();
@@ -1293,52 +1296,52 @@ class DoliDBPgsql extends DoliDB
 	 *
 	 *	@return		string		Full path of dump program
 	 */
-    public function getPathOfDump()
+	public function getPathOfDump()
 	{
 		$fullpathofdump = '/pathtopgdump/pg_dump';
 
 		if (file_exists('/usr/bin/pg_dump'))
 		{
-		    $fullpathofdump = '/usr/bin/pg_dump';
+			$fullpathofdump = '/usr/bin/pg_dump';
 		} else {
-            // TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
-		    $resql = $this->query('SHOW data_directory');
-    		if ($resql)
-    		{
-    			$liste = $this->fetch_array($resql);
-    			$basedir = $liste['data_directory'];
-    			$fullpathofdump = preg_replace('/data$/', 'bin', $basedir).'/pg_dump';
-    		}
+			// TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
+			$resql = $this->query('SHOW data_directory');
+			if ($resql)
+			{
+				$liste = $this->fetch_array($resql);
+				$basedir = $liste['data_directory'];
+				$fullpathofdump = preg_replace('/data$/', 'bin', $basedir).'/pg_dump';
+			}
 		}
 
 		return $fullpathofdump;
 	}
 
-    /**
-     *	Return full path of restore program
-     *
-     *	@return		string		Full path of restore program
-     */
-    public function getPathOfRestore()
+	/**
+	 *	Return full path of restore program
+	 *
+	 *	@return		string		Full path of restore program
+	 */
+	public function getPathOfRestore()
 	{
 		//$tool='pg_restore';
 		$tool = 'psql';
 
 		$fullpathofdump = '/pathtopgrestore/'.$tool;
 
-        if (file_exists('/usr/bin/'.$tool))
-        {
-            $fullpathofdump = '/usr/bin/'.$tool;
-        } else {
-            // TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
-            $resql = $this->query('SHOW data_directory');
-            if ($resql)
-            {
-                $liste = $this->fetch_array($resql);
-                $basedir = $liste['data_directory'];
-                $fullpathofdump = preg_replace('/data$/', 'bin', $basedir).'/'.$tool;
-            }
-        }
+		if (file_exists('/usr/bin/'.$tool))
+		{
+			$fullpathofdump = '/usr/bin/'.$tool;
+		} else {
+			// TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
+			$resql = $this->query('SHOW data_directory');
+			if ($resql)
+			{
+				$liste = $this->fetch_array($resql);
+				$basedir = $liste['data_directory'];
+				$fullpathofdump = preg_replace('/data$/', 'bin', $basedir).'/'.$tool;
+			}
+		}
 
 		return $fullpathofdump;
 	}
@@ -1349,7 +1352,7 @@ class DoliDBPgsql extends DoliDB
 	 * @param	string	$filter		Filter list on a particular value
 	 * @return	array				Array of key-values (key=>value)
 	 */
-    public function getServerParametersValues($filter = '')
+	public function getServerParametersValues($filter = '')
 	{
 		$result = array();
 
@@ -1370,7 +1373,7 @@ class DoliDBPgsql extends DoliDB
 	 * @param	string	$filter		Filter list on a particular value
 	 * @return  array				Array of key-values (key=>value)
 	 */
-    public function getServerStatusValues($filter = '')
+	public function getServerStatusValues($filter = '')
 	{
 		/* This is to return current running requests.
 		$sql='SELECT datname,procpid,current_query FROM pg_stat_activity ORDER BY procpid';
diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
index c34b9dddac0..a6ca38c7e15 100644
--- a/htdocs/core/db/sqlite3.class.php
+++ b/htdocs/core/db/sqlite3.class.php
@@ -32,48 +32,48 @@ require_once DOL_DOCUMENT_ROOT.'/core/db/DoliDB.class.php';
  */
 class DoliDBSqlite3 extends DoliDB
 {
-    //! Database type
-    public $type = 'sqlite3';
-    //! Database label
-    const LABEL = 'Sqlite3';
-    //! Version min database
-    const VERSIONMIN = '3.0.0';
-    /** @var SQLite3Result Resultset of last query */
-    private $_results;
+	//! Database type
+	public $type = 'sqlite3';
+	//! Database label
+	const LABEL = 'Sqlite3';
+	//! Version min database
+	const VERSIONMIN = '3.0.0';
+	/** @var SQLite3Result Resultset of last query */
+	private $_results;
 
-    const WEEK_MONDAY_FIRST = 1;
-    const WEEK_YEAR = 2;
-    const WEEK_FIRST_WEEKDAY = 4;
+	const WEEK_MONDAY_FIRST = 1;
+	const WEEK_YEAR = 2;
+	const WEEK_FIRST_WEEKDAY = 4;
 
 
-    /**
-     *  Constructor.
-     *  This create an opened connexion to a database server and eventually to a database
-     *
-     *  @param      string	$type		Type of database (mysql, pgsql...)
-     *  @param	    string	$host		Address of database server
-     *  @param	    string	$user		Nom de l'utilisateur autorise
-     *  @param	    string	$pass		Mot de passe
-     *  @param	    string	$name		Nom de la database
-     *  @param	    int		$port		Port of database server
-     */
-    public function __construct($type, $host, $user, $pass, $name = '', $port = 0)
-    {
-        global $conf;
+	/**
+	 *  Constructor.
+	 *  This create an opened connexion to a database server and eventually to a database
+	 *
+	 *  @param      string	$type		Type of database (mysql, pgsql...)
+	 *  @param	    string	$host		Address of database server
+	 *  @param	    string	$user		Nom de l'utilisateur autorise
+	 *  @param	    string	$pass		Mot de passe
+	 *  @param	    string	$name		Nom de la database
+	 *  @param	    int		$port		Port of database server
+	 */
+	public function __construct($type, $host, $user, $pass, $name = '', $port = 0)
+	{
+		global $conf;
 
-        // Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
-        if (!empty($conf->db->character_set)) $this->forcecharset = $conf->db->character_set;
-        if (!empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate = $conf->db->dolibarr_main_db_collation;
+		// Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
+		if (!empty($conf->db->character_set)) $this->forcecharset = $conf->db->character_set;
+		if (!empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate = $conf->db->dolibarr_main_db_collation;
 
-        $this->database_user = $user;
-        $this->database_host = $host;
-        $this->database_port = $port;
+		$this->database_user = $user;
+		$this->database_host = $host;
+		$this->database_port = $port;
 
-        $this->transaction_opened = 0;
+		$this->transaction_opened = 0;
 
-        //print "Name DB: $host,$user,$pass,$name<br>";
+		//print "Name DB: $host,$user,$pass,$name<br>";
 
-        /*if (! function_exists("sqlite_query"))
+		/*if (! function_exists("sqlite_query"))
         {
             $this->connected = false;
             $this->ok = false;
@@ -82,7 +82,7 @@ class DoliDBSqlite3 extends DoliDB
             return $this->ok;
         }*/
 
-        /*if (! $host)
+		/*if (! $host)
         {
             $this->connected = false;
             $this->ok = false;
@@ -91,228 +91,228 @@ class DoliDBSqlite3 extends DoliDB
             return $this->ok;
         }*/
 
-        // Essai connexion serveur
-        // We do not try to connect to database, only to server. Connect to database is done later in constrcutor
-        $this->db = $this->connect($host, $user, $pass, $name, $port);
+		// Essai connexion serveur
+		// We do not try to connect to database, only to server. Connect to database is done later in constrcutor
+		$this->db = $this->connect($host, $user, $pass, $name, $port);
 
-        if ($this->db)
-        {
-            $this->connected = true;
-            $this->ok = true;
-            $this->database_selected = true;
-            $this->database_name = $name;
+		if ($this->db)
+		{
+			$this->connected = true;
+			$this->ok = true;
+			$this->database_selected = true;
+			$this->database_name = $name;
 
-            $this->addCustomFunction('IF');
-            $this->addCustomFunction('MONTH');
-            $this->addCustomFunction('CURTIME');
-            $this->addCustomFunction('CURDATE');
-            $this->addCustomFunction('WEEK', 1);
-            $this->addCustomFunction('WEEK', 2);
-            $this->addCustomFunction('WEEKDAY');
-            $this->addCustomFunction('date_format');
-            //$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-        } else {
-            // host, login ou password incorrect
-            $this->connected = false;
-            $this->ok = false;
-            $this->database_selected = false;
-            $this->database_name = '';
-            //$this->error=sqlite_connect_error();
-            dol_syslog(get_class($this)."::DoliDBSqlite3 : Error Connect ".$this->error, LOG_ERR);
-        }
+			$this->addCustomFunction('IF');
+			$this->addCustomFunction('MONTH');
+			$this->addCustomFunction('CURTIME');
+			$this->addCustomFunction('CURDATE');
+			$this->addCustomFunction('WEEK', 1);
+			$this->addCustomFunction('WEEK', 2);
+			$this->addCustomFunction('WEEKDAY');
+			$this->addCustomFunction('date_format');
+			//$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+		} else {
+			// host, login ou password incorrect
+			$this->connected = false;
+			$this->ok = false;
+			$this->database_selected = false;
+			$this->database_name = '';
+			//$this->error=sqlite_connect_error();
+			dol_syslog(get_class($this)."::DoliDBSqlite3 : Error Connect ".$this->error, LOG_ERR);
+		}
 
-        return $this->ok;
-    }
+		return $this->ok;
+	}
 
 
-    /**
-     *  Convert a SQL request in Mysql syntax to native syntax
-     *
-     *  @param     string	$line   SQL request line to convert
-     *  @param     string	$type	Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
-     *  @return    string   		SQL request line converted
-     */
-    public static function convertSQLFromMysql($line, $type = 'ddl')
-    {
-        // Removed empty line if this is a comment line for SVN tagging
-        if (preg_match('/^--\s\$Id/i', $line)) {
-            return '';
-        }
-        // Return line if this is a comment
-        if (preg_match('/^#/i', $line) || preg_match('/^$/i', $line) || preg_match('/^--/i', $line))
-        {
-            return $line;
-        }
-        if ($line != "")
-        {
-            if ($type == 'auto')
-            {
-                if (preg_match('/ALTER TABLE/i', $line)) $type = 'dml';
-                elseif (preg_match('/CREATE TABLE/i', $line)) $type = 'dml';
-                elseif (preg_match('/DROP TABLE/i', $line)) $type = 'dml';
-            }
+	/**
+	 *  Convert a SQL request in Mysql syntax to native syntax
+	 *
+	 *  @param     string	$line   SQL request line to convert
+	 *  @param     string	$type	Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
+	 *  @return    string   		SQL request line converted
+	 */
+	public static function convertSQLFromMysql($line, $type = 'ddl')
+	{
+		// Removed empty line if this is a comment line for SVN tagging
+		if (preg_match('/^--\s\$Id/i', $line)) {
+			return '';
+		}
+		// Return line if this is a comment
+		if (preg_match('/^#/i', $line) || preg_match('/^$/i', $line) || preg_match('/^--/i', $line))
+		{
+			return $line;
+		}
+		if ($line != "")
+		{
+			if ($type == 'auto')
+			{
+				if (preg_match('/ALTER TABLE/i', $line)) $type = 'dml';
+				elseif (preg_match('/CREATE TABLE/i', $line)) $type = 'dml';
+				elseif (preg_match('/DROP TABLE/i', $line)) $type = 'dml';
+			}
 
-            if ($type == 'dml')
-            {
-                $line = preg_replace('/\s/', ' ', $line); // Replace tabulation with space
+			if ($type == 'dml')
+			{
+				$line = preg_replace('/\s/', ' ', $line); // Replace tabulation with space
 
-                // we are inside create table statement so lets process datatypes
-                if (preg_match('/(ISAM|innodb)/i', $line)) { // end of create table sequence
-                    $line = preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb);/i', ');', $line);
-                    $line = preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb);/i', ');', $line);
-                    $line = preg_replace('/,$/', '', $line);
-                }
+				// we are inside create table statement so lets process datatypes
+				if (preg_match('/(ISAM|innodb)/i', $line)) { // end of create table sequence
+					$line = preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb);/i', ');', $line);
+					$line = preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb);/i', ');', $line);
+					$line = preg_replace('/,$/', '', $line);
+				}
 
-                // Process case: "CREATE TABLE llx_mytable(rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,code..."
-                if (preg_match('/[\s\t\(]*(\w*)[\s\t]+int.*auto_increment/i', $line, $reg)) {
-                    $newline = preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i', '\\1 \\2 integer PRIMARY KEY AUTOINCREMENT', $line);
-                    //$line = "-- ".$line." replaced by --\n".$newline;
-                    $line = $newline;
-                }
+				// Process case: "CREATE TABLE llx_mytable(rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,code..."
+				if (preg_match('/[\s\t\(]*(\w*)[\s\t]+int.*auto_increment/i', $line, $reg)) {
+					$newline = preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i', '\\1 \\2 integer PRIMARY KEY AUTOINCREMENT', $line);
+					//$line = "-- ".$line." replaced by --\n".$newline;
+					$line = $newline;
+				}
 
-                // tinyint type conversion
-                $line = str_replace('tinyint', 'smallint', $line);
+				// tinyint type conversion
+				$line = str_replace('tinyint', 'smallint', $line);
 
-                // nuke unsigned
-                $line = preg_replace('/(int\w+|smallint)\s+unsigned/i', '\\1', $line);
+				// nuke unsigned
+				$line = preg_replace('/(int\w+|smallint)\s+unsigned/i', '\\1', $line);
 
-                // blob -> text
-                $line = preg_replace('/\w*blob/i', 'text', $line);
+				// blob -> text
+				$line = preg_replace('/\w*blob/i', 'text', $line);
 
-                // tinytext/mediumtext -> text
-                $line = preg_replace('/tinytext/i', 'text', $line);
-                $line = preg_replace('/mediumtext/i', 'text', $line);
+				// tinytext/mediumtext -> text
+				$line = preg_replace('/tinytext/i', 'text', $line);
+				$line = preg_replace('/mediumtext/i', 'text', $line);
 
-                // change not null datetime field to null valid ones
-                // (to support remapping of "zero time" to null
-                $line = preg_replace('/datetime not null/i', 'datetime', $line);
-                $line = preg_replace('/datetime/i', 'timestamp', $line);
+				// change not null datetime field to null valid ones
+				// (to support remapping of "zero time" to null
+				$line = preg_replace('/datetime not null/i', 'datetime', $line);
+				$line = preg_replace('/datetime/i', 'timestamp', $line);
 
-                // double -> numeric
-                $line = preg_replace('/^double/i', 'numeric', $line);
-                $line = preg_replace('/(\s*)double/i', '\\1numeric', $line);
-                // float -> numeric
-                $line = preg_replace('/^float/i', 'numeric', $line);
-                $line = preg_replace('/(\s*)float/i', '\\1numeric', $line);
+				// double -> numeric
+				$line = preg_replace('/^double/i', 'numeric', $line);
+				$line = preg_replace('/(\s*)double/i', '\\1numeric', $line);
+				// float -> numeric
+				$line = preg_replace('/^float/i', 'numeric', $line);
+				$line = preg_replace('/(\s*)float/i', '\\1numeric', $line);
 
-                // unique index(field1,field2)
-                if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i', $line))
-                {
-                    $line = preg_replace('/unique index\s*\((\w+\s*,\s*\w+)\)/i', 'UNIQUE\(\\1\)', $line);
-                }
+				// unique index(field1,field2)
+				if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i', $line))
+				{
+					$line = preg_replace('/unique index\s*\((\w+\s*,\s*\w+)\)/i', 'UNIQUE\(\\1\)', $line);
+				}
 
-                // We remove end of requests "AFTER fieldxxx"
-                $line = preg_replace('/AFTER [a-z0-9_]+/i', '', $line);
+				// We remove end of requests "AFTER fieldxxx"
+				$line = preg_replace('/AFTER [a-z0-9_]+/i', '', $line);
 
-                // We remove start of requests "ALTER TABLE tablexxx" if this is a DROP INDEX
-                $line = preg_replace('/ALTER TABLE [a-z0-9_]+ DROP INDEX/i', 'DROP INDEX', $line);
+				// We remove start of requests "ALTER TABLE tablexxx" if this is a DROP INDEX
+				$line = preg_replace('/ALTER TABLE [a-z0-9_]+ DROP INDEX/i', 'DROP INDEX', $line);
 
-                // Translate order to rename fields
-                if (preg_match('/ALTER TABLE ([a-z0-9_]+) CHANGE(?: COLUMN)? ([a-z0-9_]+) ([a-z0-9_]+)(.*)$/i', $line, $reg))
-                {
-                    $line = "-- ".$line." replaced by --\n";
-                    $line .= "ALTER TABLE ".$reg[1]." RENAME COLUMN ".$reg[2]." TO ".$reg[3];
-                }
+				// Translate order to rename fields
+				if (preg_match('/ALTER TABLE ([a-z0-9_]+) CHANGE(?: COLUMN)? ([a-z0-9_]+) ([a-z0-9_]+)(.*)$/i', $line, $reg))
+				{
+					$line = "-- ".$line." replaced by --\n";
+					$line .= "ALTER TABLE ".$reg[1]." RENAME COLUMN ".$reg[2]." TO ".$reg[3];
+				}
 
-                // Translate order to modify field format
-                if (preg_match('/ALTER TABLE ([a-z0-9_]+) MODIFY(?: COLUMN)? ([a-z0-9_]+) (.*)$/i', $line, $reg))
-                {
-                    $line = "-- ".$line." replaced by --\n";
-                    $newreg3 = $reg[3];
-                    $newreg3 = preg_replace('/ DEFAULT NULL/i', '', $newreg3);
-                    $newreg3 = preg_replace('/ NOT NULL/i', '', $newreg3);
-                    $newreg3 = preg_replace('/ NULL/i', '', $newreg3);
-                    $newreg3 = preg_replace('/ DEFAULT 0/i', '', $newreg3);
-                    $newreg3 = preg_replace('/ DEFAULT \'[0-9a-zA-Z_@]*\'/i', '', $newreg3);
-                    $line .= "ALTER TABLE ".$reg[1]." ALTER COLUMN ".$reg[2]." TYPE ".$newreg3;
-                    // TODO Add alter to set default value or null/not null if there is this in $reg[3]
-                }
+				// Translate order to modify field format
+				if (preg_match('/ALTER TABLE ([a-z0-9_]+) MODIFY(?: COLUMN)? ([a-z0-9_]+) (.*)$/i', $line, $reg))
+				{
+					$line = "-- ".$line." replaced by --\n";
+					$newreg3 = $reg[3];
+					$newreg3 = preg_replace('/ DEFAULT NULL/i', '', $newreg3);
+					$newreg3 = preg_replace('/ NOT NULL/i', '', $newreg3);
+					$newreg3 = preg_replace('/ NULL/i', '', $newreg3);
+					$newreg3 = preg_replace('/ DEFAULT 0/i', '', $newreg3);
+					$newreg3 = preg_replace('/ DEFAULT \'[0-9a-zA-Z_@]*\'/i', '', $newreg3);
+					$line .= "ALTER TABLE ".$reg[1]." ALTER COLUMN ".$reg[2]." TYPE ".$newreg3;
+					// TODO Add alter to set default value or null/not null if there is this in $reg[3]
+				}
 
-                // alter table add primary key (field1, field2 ...) -> We create a unique index instead as dynamic creation of primary key is not supported
-                // ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity);
-                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i', $line, $reg))
-                {
-                    $line = "-- ".$line." replaced by --\n";
-                    $line .= "CREATE UNIQUE INDEX ".$reg[2]." ON ".$reg[1]."(".$reg[3];
-                }
+				// alter table add primary key (field1, field2 ...) -> We create a unique index instead as dynamic creation of primary key is not supported
+				// ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity);
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i', $line, $reg))
+				{
+					$line = "-- ".$line." replaced by --\n";
+					$line .= "CREATE UNIQUE INDEX ".$reg[2]." ON ".$reg[1]."(".$reg[3];
+				}
 
-                // Translate order to drop foreign keys
-                // ALTER TABLE llx_dolibarr_modules DROP FOREIGN KEY fk_xxx;
-                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+FOREIGN\s+KEY\s*(.*)$/i', $line, $reg))
-                {
-                    $line = "-- ".$line." replaced by --\n";
-                    $line .= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
-                }
+				// Translate order to drop foreign keys
+				// ALTER TABLE llx_dolibarr_modules DROP FOREIGN KEY fk_xxx;
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+FOREIGN\s+KEY\s*(.*)$/i', $line, $reg))
+				{
+					$line = "-- ".$line." replaced by --\n";
+					$line .= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
+				}
 
-                // alter table add [unique] [index] (field1, field2 ...)
-                // ALTER TABLE llx_accountingaccount ADD INDEX idx_accountingaccount_fk_pcg_version (fk_pcg_version)
-                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+(UNIQUE INDEX|INDEX|UNIQUE)\s+(.*)\s*\(([\w,\s]+)\)/i', $line, $reg))
-                {
-                    $fieldlist = $reg[4];
-                    $idxname = $reg[3];
-                    $tablename = $reg[1];
-                    $line = "-- ".$line." replaced by --\n";
-                    $line .= "CREATE ".(preg_match('/UNIQUE/', $reg[2]) ? 'UNIQUE ' : '')."INDEX ".$idxname." ON ".$tablename." (".$fieldlist.")";
-                }
-                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i', $line, $reg)) {
-                    // Pour l'instant les contraintes ne sont pas créées
-                    dol_syslog(get_class().'::query line emptied');
-                    $line = 'SELECT 0;';
-                }
+				// alter table add [unique] [index] (field1, field2 ...)
+				// ALTER TABLE llx_accountingaccount ADD INDEX idx_accountingaccount_fk_pcg_version (fk_pcg_version)
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+(UNIQUE INDEX|INDEX|UNIQUE)\s+(.*)\s*\(([\w,\s]+)\)/i', $line, $reg))
+				{
+					$fieldlist = $reg[4];
+					$idxname = $reg[3];
+					$tablename = $reg[1];
+					$line = "-- ".$line." replaced by --\n";
+					$line .= "CREATE ".(preg_match('/UNIQUE/', $reg[2]) ? 'UNIQUE ' : '')."INDEX ".$idxname." ON ".$tablename." (".$fieldlist.")";
+				}
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i', $line, $reg)) {
+					// Pour l'instant les contraintes ne sont pas créées
+					dol_syslog(get_class().'::query line emptied');
+					$line = 'SELECT 0;';
+				}
 
-                //if (preg_match('/rowid\s+.*\s+PRIMARY\s+KEY,/i', $line)) {
-                    //preg_replace('/(rowid\s+.*\s+PRIMARY\s+KEY\s*,)/i', '/* \\1 */', $line);
-                //}
-            }
+				//if (preg_match('/rowid\s+.*\s+PRIMARY\s+KEY,/i', $line)) {
+					//preg_replace('/(rowid\s+.*\s+PRIMARY\s+KEY\s*,)/i', '/* \\1 */', $line);
+				//}
+			}
 
-            // Delete using criteria on other table must not declare twice the deleted table
-            // DELETE FROM tabletodelete USING tabletodelete, othertable -> DELETE FROM tabletodelete USING othertable
-            if (preg_match('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i', $line, $reg))
-            {
+			// Delete using criteria on other table must not declare twice the deleted table
+			// DELETE FROM tabletodelete USING tabletodelete, othertable -> DELETE FROM tabletodelete USING othertable
+			if (preg_match('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i', $line, $reg))
+			{
 				if ($reg[1] == $reg[2])	// If same table, we remove second one
-                {
-                    $line = preg_replace('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i', 'DELETE FROM \\1 USING \\3', $line);
-                }
-            }
+				{
+					$line = preg_replace('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i', 'DELETE FROM \\1 USING \\3', $line);
+				}
+			}
 
-            // Remove () in the tables in FROM if one table
-            $line = preg_replace('/FROM\s*\((([a-z_]+)\s+as\s+([a-z_]+)\s*)\)/i', 'FROM \\1', $line);
-            //print $line."\n";
+			// Remove () in the tables in FROM if one table
+			$line = preg_replace('/FROM\s*\((([a-z_]+)\s+as\s+([a-z_]+)\s*)\)/i', 'FROM \\1', $line);
+			//print $line."\n";
 
-            // Remove () in the tables in FROM if two table
-            $line = preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2', $line);
-            //print $line."\n";
+			// Remove () in the tables in FROM if two table
+			$line = preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2', $line);
+			//print $line."\n";
 
-            // Remove () in the tables in FROM if two table
-            $line = preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2, \\3', $line);
-            //print $line."\n";
+			// Remove () in the tables in FROM if two table
+			$line = preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2, \\3', $line);
+			//print $line."\n";
 
-            //print "type=".$type." newline=".$line."<br>\n";
-        }
+			//print "type=".$type." newline=".$line."<br>\n";
+		}
 
-        return $line;
-    }
+		return $line;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	Select a database
-     *
+	 *
 	 *	@param	    string	$database	Name of database
 	 *	@return	    boolean  		    true if OK, false if KO
-     */
-    public function select_db($database)
-    {
-        // phpcs:enable
-        dol_syslog(get_class($this)."::select_db database=".$database, LOG_DEBUG);
-        // sqlite_select_db() does not exist
-        //return sqlite_select_db($this->db,$database);
-        return true;
-    }
+	 */
+	public function select_db($database)
+	{
+		// phpcs:enable
+		dol_syslog(get_class($this)."::select_db database=".$database, LOG_DEBUG);
+		// sqlite_select_db() does not exist
+		//return sqlite_select_db($this->db,$database);
+		return true;
+	}
 
 
-    /**
+	/**
 	 *	Connexion to server
-     *
+	 *
 	 *	@param	    string	$host		database server host
 	 *	@param	    string	$login		login
 	 *	@param	    string	$passwd		password
@@ -320,324 +320,324 @@ class DoliDBSqlite3 extends DoliDB
 	 *	@param		integer	$port		Port of database server
 	 *	@return		SQLite3				Database access handler
 	 *	@see		close()
-     */
-    public function connect($host, $login, $passwd, $name, $port = 0)
-    {
-        global $main_data_dir;
+	 */
+	public function connect($host, $login, $passwd, $name, $port = 0)
+	{
+		global $main_data_dir;
 
-        dol_syslog(get_class($this)."::connect name=".$name, LOG_DEBUG);
+		dol_syslog(get_class($this)."::connect name=".$name, LOG_DEBUG);
 
-        $dir = $main_data_dir;
-        if (empty($dir)) $dir = DOL_DATA_ROOT;
-        // With sqlite, port must be in connect parameters
-        //if (! $newport) $newport=3306;
-        $database_name = $dir.'/database_'.$name.'.sdb';
-        try {
-            /*** connect to SQLite database ***/
-            //$this->db = new PDO("sqlite:".$dir.'/database_'.$name.'.sdb');
+		$dir = $main_data_dir;
+		if (empty($dir)) $dir = DOL_DATA_ROOT;
+		// With sqlite, port must be in connect parameters
+		//if (! $newport) $newport=3306;
+		$database_name = $dir.'/database_'.$name.'.sdb';
+		try {
+			/*** connect to SQLite database ***/
+			//$this->db = new PDO("sqlite:".$dir.'/database_'.$name.'.sdb');
 			$this->db = new SQLite3($database_name);
-            //$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-        } catch (Exception $e)
-        {
-            $this->error = self::LABEL.' '.$e->getMessage().' current dir='.$database_name;
-            return '';
-        }
+			//$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+		} catch (Exception $e)
+		{
+			$this->error = self::LABEL.' '.$e->getMessage().' current dir='.$database_name;
+			return '';
+		}
 
-        //print "Resultat fonction connect: ".$this->db;
-        return $this->db;
-    }
+		//print "Resultat fonction connect: ".$this->db;
+		return $this->db;
+	}
 
 
-    /**
+	/**
 	 *	Return version of database server
-     *
+	 *
 	 *	@return	        string      Version string
-     */
-    public function getVersion()
-    {
-    	$tmp = $this->db->version();
-        return $tmp['versionString'];
-    }
+	 */
+	public function getVersion()
+	{
+		$tmp = $this->db->version();
+		return $tmp['versionString'];
+	}
 
-    /**
-     *	Return version of database client driver
-     *
-     *	@return	        string      Version string
-     */
-    public function getDriverInfo()
-    {
-        return 'sqlite3 php driver';
-    }
+	/**
+	 *	Return version of database client driver
+	 *
+	 *	@return	        string      Version string
+	 */
+	public function getDriverInfo()
+	{
+		return 'sqlite3 php driver';
+	}
 
 
-    /**
-     *  Close database connexion
-     *
-     *  @return     bool     True if disconnect successfull, false otherwise
-     *  @see        connect()
-     */
-    public function close()
-    {
-        if ($this->db)
-        {
-            if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened, LOG_ERR);
-            $this->connected = false;
-            $this->db->close();
-            unset($this->db); // Clean this->db
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     *  Execute a SQL request and return the resultset
-     *
-     * 	@param	string	$query			SQL query string
-     * 	@param	int		$usesavepoint	0=Default mode, 1=Run a savepoint before and a rollbock to savepoint if error (this allow to have some request with errors inside global transactions).
-     * 									Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
-     *  @param  string	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
-     *	@return	SQLite3Result			Resultset of answer
-     */
-    public function query($query, $usesavepoint = 0, $type = 'auto')
-    {
-    	global $conf;
-
-        $ret = null;
-
-        $query = trim($query);
-
-        $this->error = '';
-
-        // Convert MySQL syntax to SQLite syntax
-        if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i', $query, $reg)) {
-            // Ajout d'une clef étrangère à la table
-            // procédure de remplacement de la table pour ajouter la contrainte
-            // Exemple : ALTER TABLE llx_adherent ADD CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid)
-            // -> CREATE TABLE ( ... ,CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid))
-            $foreignFields = $reg[5];
-            $foreignTable = $reg[4];
-            $localfields = $reg[3];
-            $constraintname = trim($reg[2]);
-            $tablename = trim($reg[1]);
-
-            $descTable = $this->db->querySingle("SELECT sql FROM sqlite_master WHERE name='".$this->escape($tablename)."'");
-
-            // 1- Renommer la table avec un nom temporaire
-            $this->query('ALTER TABLE '.$tablename.' RENAME TO tmp_'.$tablename);
-
-            // 2- Recréer la table avec la contrainte ajoutée
-
-            // on bricole la requete pour ajouter la contrainte
-            $descTable = substr($descTable, 0, strlen($descTable) - 1);
-            $descTable .= ", CONSTRAINT ".$constraintname." FOREIGN KEY (".$localfields.") REFERENCES ".$foreignTable."(".$foreignFields.")";
-
-            // fermeture de l'instruction
-            $descTable .= ')';
-
-            // Création proprement dite de la table
-            $this->query($descTable);
-
-            // 3- Transférer les données
-            $this->query('INSERT INTO '.$tablename.' SELECT * FROM tmp_'.$tablename);
-
-            // 4- Supprimer la table temporaire
-            $this->query('DROP TABLE tmp_'.$tablename);
-
-            // dummy statement
-            $query = "SELECT 0";
-        } else {
-            $query = $this->convertSQLFromMysql($query, $type);
-        }
-        //print "After convertSQLFromMysql:\n".$query."<br>\n";
-
-        if (!in_array($query, array('BEGIN', 'COMMIT', 'ROLLBACK')))
-        {
-        	$SYSLOG_SQL_LIMIT = 10000; // limit log to 10kb per line to limit DOS attacks
-        	dol_syslog('sql='.substr($query, 0, $SYSLOG_SQL_LIMIT), LOG_DEBUG);
-        }
-        if (empty($query)) return false; // Return false = error if empty request
-
-        // Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
-        try {
-            //$ret = $this->db->exec($query);
-            $ret = $this->db->query($query); // $ret is a Sqlite3Result
-            if ($ret) {
-                $ret->queryString = $query;
-            }
-        } catch (Exception $e)
-        {
-            $this->error = $this->db->lastErrorMsg();
-        }
-
-        if (!preg_match("/^COMMIT/i", $query) && !preg_match("/^ROLLBACK/i", $query))
-        {
-            // Si requete utilisateur, on la sauvegarde ainsi que son resultset
-            if (!is_object($ret) || $this->error)
-            {
-                $this->lastqueryerror = $query;
-                $this->lasterror = $this->error();
-                $this->lasterrno = $this->errno();
-
-                dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);
-
-                $errormsg = get_class($this)."::query SQL Error message: ".$this->lasterror;
-
-                if (preg_match('/[0-9]/', $this->lasterrno)) {
-                    $errormsg .= ' ('.$this->lasterrno.')';
-                }
-
-                if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR); // Log of request was not yet done previously
-                dol_syslog(get_class($this)."::query SQL Error message: ".$errormsg, LOG_ERR);
-            }
-            $this->lastquery = $query;
-            $this->_results = $ret;
-        }
-
-        return $ret;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Renvoie la ligne courante (comme un objet) pour le curseur resultset
-     *
-     *	@param	SQLite3Result	$resultset  Curseur de la requete voulue
-     *	@return	false|object				Object result line or false if KO or end of cursor
-     */
-    public function fetch_object($resultset)
-    {
-        // phpcs:enable
-        // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-        if (!is_object($resultset)) { $resultset = $this->_results; }
-        //return $resultset->fetch(PDO::FETCH_OBJ);
-        $ret = $resultset->fetchArray(SQLITE3_ASSOC);
-        if ($ret) {
-            return (object) $ret;
-        }
+	/**
+	 *  Close database connexion
+	 *
+	 *  @return     bool     True if disconnect successfull, false otherwise
+	 *  @see        connect()
+	 */
+	public function close()
+	{
+		if ($this->db)
+		{
+			if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened, LOG_ERR);
+			$this->connected = false;
+			$this->db->close();
+			unset($this->db); // Clean this->db
+			return true;
+		}
 		return false;
-    }
+	}
+
+	/**
+	 *  Execute a SQL request and return the resultset
+	 *
+	 * 	@param	string	$query			SQL query string
+	 * 	@param	int		$usesavepoint	0=Default mode, 1=Run a savepoint before and a rollbock to savepoint if error (this allow to have some request with errors inside global transactions).
+	 * 									Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
+	 *  @param  string	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
+	 *	@return	SQLite3Result			Resultset of answer
+	 */
+	public function query($query, $usesavepoint = 0, $type = 'auto')
+	{
+		global $conf;
+
+		$ret = null;
+
+		$query = trim($query);
+
+		$this->error = '';
+
+		// Convert MySQL syntax to SQLite syntax
+		if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i', $query, $reg)) {
+			// Ajout d'une clef étrangère à la table
+			// procédure de remplacement de la table pour ajouter la contrainte
+			// Exemple : ALTER TABLE llx_adherent ADD CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid)
+			// -> CREATE TABLE ( ... ,CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid))
+			$foreignFields = $reg[5];
+			$foreignTable = $reg[4];
+			$localfields = $reg[3];
+			$constraintname = trim($reg[2]);
+			$tablename = trim($reg[1]);
+
+			$descTable = $this->db->querySingle("SELECT sql FROM sqlite_master WHERE name='".$this->escape($tablename)."'");
+
+			// 1- Renommer la table avec un nom temporaire
+			$this->query('ALTER TABLE '.$tablename.' RENAME TO tmp_'.$tablename);
+
+			// 2- Recréer la table avec la contrainte ajoutée
+
+			// on bricole la requete pour ajouter la contrainte
+			$descTable = substr($descTable, 0, strlen($descTable) - 1);
+			$descTable .= ", CONSTRAINT ".$constraintname." FOREIGN KEY (".$localfields.") REFERENCES ".$foreignTable."(".$foreignFields.")";
+
+			// fermeture de l'instruction
+			$descTable .= ')';
+
+			// Création proprement dite de la table
+			$this->query($descTable);
+
+			// 3- Transférer les données
+			$this->query('INSERT INTO '.$tablename.' SELECT * FROM tmp_'.$tablename);
+
+			// 4- Supprimer la table temporaire
+			$this->query('DROP TABLE tmp_'.$tablename);
+
+			// dummy statement
+			$query = "SELECT 0";
+		} else {
+			$query = $this->convertSQLFromMysql($query, $type);
+		}
+		//print "After convertSQLFromMysql:\n".$query."<br>\n";
+
+		if (!in_array($query, array('BEGIN', 'COMMIT', 'ROLLBACK')))
+		{
+			$SYSLOG_SQL_LIMIT = 10000; // limit log to 10kb per line to limit DOS attacks
+			dol_syslog('sql='.substr($query, 0, $SYSLOG_SQL_LIMIT), LOG_DEBUG);
+		}
+		if (empty($query)) return false; // Return false = error if empty request
+
+		// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
+		try {
+			//$ret = $this->db->exec($query);
+			$ret = $this->db->query($query); // $ret is a Sqlite3Result
+			if ($ret) {
+				$ret->queryString = $query;
+			}
+		} catch (Exception $e)
+		{
+			$this->error = $this->db->lastErrorMsg();
+		}
+
+		if (!preg_match("/^COMMIT/i", $query) && !preg_match("/^ROLLBACK/i", $query))
+		{
+			// Si requete utilisateur, on la sauvegarde ainsi que son resultset
+			if (!is_object($ret) || $this->error)
+			{
+				$this->lastqueryerror = $query;
+				$this->lasterror = $this->error();
+				$this->lasterrno = $this->errno();
+
+				dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);
+
+				$errormsg = get_class($this)."::query SQL Error message: ".$this->lasterror;
+
+				if (preg_match('/[0-9]/', $this->lasterrno)) {
+					$errormsg .= ' ('.$this->lasterrno.')';
+				}
+
+				if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR); // Log of request was not yet done previously
+				dol_syslog(get_class($this)."::query SQL Error message: ".$errormsg, LOG_ERR);
+			}
+			$this->lastquery = $query;
+			$this->_results = $ret;
+		}
+
+		return $ret;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Renvoie la ligne courante (comme un objet) pour le curseur resultset
+	 *
+	 *	@param	SQLite3Result	$resultset  Curseur de la requete voulue
+	 *	@return	false|object				Object result line or false if KO or end of cursor
+	 */
+	public function fetch_object($resultset)
+	{
+		// phpcs:enable
+		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
+		if (!is_object($resultset)) { $resultset = $this->_results; }
+		//return $resultset->fetch(PDO::FETCH_OBJ);
+		$ret = $resultset->fetchArray(SQLITE3_ASSOC);
+		if ($ret) {
+			return (object) $ret;
+		}
+		return false;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Return datas as an array
-     *
-     *	@param	SQLite3Result	$resultset  Resultset of request
-     *	@return	false|array					Array or false if KO or end of cursor
-     */
-    public function fetch_array($resultset)
-    {
-        // phpcs:enable
-        // If resultset not provided, we take the last used by connexion
-        if (!is_object($resultset)) { $resultset = $this->_results; }
-        //return $resultset->fetch(PDO::FETCH_ASSOC);
-        $ret = $resultset->fetchArray(SQLITE3_ASSOC);
-	    return $ret;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return datas as an array
+	 *
+	 *	@param	SQLite3Result	$resultset  Resultset of request
+	 *	@return	false|array					Array or false if KO or end of cursor
+	 */
+	public function fetch_array($resultset)
+	{
+		// phpcs:enable
+		// If resultset not provided, we take the last used by connexion
+		if (!is_object($resultset)) { $resultset = $this->_results; }
+		//return $resultset->fetch(PDO::FETCH_ASSOC);
+		$ret = $resultset->fetchArray(SQLITE3_ASSOC);
+		return $ret;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Return datas as an array
-     *
-     *	@param	SQLite3Result	$resultset  Resultset of request
-     *	@return	false|array					Array or false if KO or end of cursor
-     */
-    public function fetch_row($resultset)
-    {
-        // phpcs:enable
-        // If resultset not provided, we take the last used by connexion
-        if (!is_bool($resultset))
-        {
-            if (!is_object($resultset)) { $resultset = $this->_results; }
-            return $resultset->fetchArray(SQLITE3_NUM);
-        } else {
-            // si le curseur est un booleen on retourne la valeur 0
-            return false;
-        }
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return datas as an array
+	 *
+	 *	@param	SQLite3Result	$resultset  Resultset of request
+	 *	@return	false|array					Array or false if KO or end of cursor
+	 */
+	public function fetch_row($resultset)
+	{
+		// phpcs:enable
+		// If resultset not provided, we take the last used by connexion
+		if (!is_bool($resultset))
+		{
+			if (!is_object($resultset)) { $resultset = $this->_results; }
+			return $resultset->fetchArray(SQLITE3_NUM);
+		} else {
+			// si le curseur est un booleen on retourne la valeur 0
+			return false;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Return number of lines for result of a SELECT
-     *
-     *	@param	SQLite3Result	$resultset  Resulset of requests
-     *	@return int		    			Nb of lines
-     *	@see    affected_rows()
-     */
-    public function num_rows($resultset)
-    {
-        // phpcs:enable
-        // FIXME: SQLite3Result does not have a queryString member
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return number of lines for result of a SELECT
+	 *
+	 *	@param	SQLite3Result	$resultset  Resulset of requests
+	 *	@return int		    			Nb of lines
+	 *	@see    affected_rows()
+	 */
+	public function num_rows($resultset)
+	{
+		// phpcs:enable
+		// FIXME: SQLite3Result does not have a queryString member
 
-        // If resultset not provided, we take the last used by connexion
-        if (!is_object($resultset)) { $resultset = $this->_results; }
-        if (preg_match("/^SELECT/i", $resultset->queryString)) {
-            return $this->db->querySingle("SELECT count(*) FROM (".$resultset->queryString.") q");
-        }
-        return 0;
-    }
+		// If resultset not provided, we take the last used by connexion
+		if (!is_object($resultset)) { $resultset = $this->_results; }
+		if (preg_match("/^SELECT/i", $resultset->queryString)) {
+			return $this->db->querySingle("SELECT count(*) FROM (".$resultset->queryString.") q");
+		}
+		return 0;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Return number of lines for result of a SELECT
-     *
-     *	@param	SQLite3Result	$resultset  Resulset of requests
-     *	@return int		    			Nb of lines
-     *	@see    affected_rows()
-     */
-    public function affected_rows($resultset)
-    {
-        // phpcs:enable
-        // FIXME: SQLite3Result does not have a queryString member
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return number of lines for result of a SELECT
+	 *
+	 *	@param	SQLite3Result	$resultset  Resulset of requests
+	 *	@return int		    			Nb of lines
+	 *	@see    affected_rows()
+	 */
+	public function affected_rows($resultset)
+	{
+		// phpcs:enable
+		// FIXME: SQLite3Result does not have a queryString member
 
-        // If resultset not provided, we take the last used by connexion
-        if (!is_object($resultset)) { $resultset = $this->_results; }
-        if (preg_match("/^SELECT/i", $resultset->queryString)) {
-            return $this->num_rows($resultset);
-        }
-        // mysql necessite un link de base pour cette fonction contrairement
-        // a pqsql qui prend un resultset
-        return $this->db->changes();
-    }
+		// If resultset not provided, we take the last used by connexion
+		if (!is_object($resultset)) { $resultset = $this->_results; }
+		if (preg_match("/^SELECT/i", $resultset->queryString)) {
+			return $this->num_rows($resultset);
+		}
+		// mysql necessite un link de base pour cette fonction contrairement
+		// a pqsql qui prend un resultset
+		return $this->db->changes();
+	}
 
 
-    /**
+	/**
 	 *	Free last resultset used.
-     *
+	 *
 	 *	@param  SQLite3Result	$resultset   Curseur de la requete voulue
 	 *	@return	void
-     */
-    public function free($resultset = null)
-    {
-        // If resultset not provided, we take the last used by connexion
-        if (!is_object($resultset)) { $resultset = $this->_results; }
-        // Si resultset en est un, on libere la memoire
-        if ($resultset && is_object($resultset)) $resultset->finalize();
-    }
+	 */
+	public function free($resultset = null)
+	{
+		// If resultset not provided, we take the last used by connexion
+		if (!is_object($resultset)) { $resultset = $this->_results; }
+		// Si resultset en est un, on libere la memoire
+		if ($resultset && is_object($resultset)) $resultset->finalize();
+	}
 
-    /**
+	/**
 	 *	Escape a string to insert data
-     *
+	 *
 	 *  @param	string	$stringtoencode		String to escape
 	 *  @return	string						String escaped
-     */
-    public function escape($stringtoencode)
-    {
-        return Sqlite3::escapeString($stringtoencode);
-    }
+	 */
+	public function escape($stringtoencode)
+	{
+		return Sqlite3::escapeString($stringtoencode);
+	}
 
-    /**
-     *	Renvoie le code erreur generique de l'operation precedente.
-     *
-     *	@return	string		Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
-     */
-    public function errno()
-    {
-        if (!$this->connected) {
-            // Si il y a eu echec de connexion, $this->db n'est pas valide.
-            return 'DB_ERROR_FAILED_TO_CONNECT';
-        } else {
-            // Constants to convert error code to a generic Dolibarr error code
-            /*$errorcode_map = array(
+	/**
+	 *	Renvoie le code erreur generique de l'operation precedente.
+	 *
+	 *	@return	string		Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
+	 */
+	public function errno()
+	{
+		if (!$this->connected) {
+			// Si il y a eu echec de connexion, $this->db n'est pas valide.
+			return 'DB_ERROR_FAILED_TO_CONNECT';
+		} else {
+			// Constants to convert error code to a generic Dolibarr error code
+			/*$errorcode_map = array(
             1004 => 'DB_ERROR_CANNOT_CREATE',
             1005 => 'DB_ERROR_CANNOT_CREATE',
             1006 => 'DB_ERROR_CANNOT_CREATE',
@@ -669,228 +669,228 @@ class DoliDBSqlite3 extends DoliDB
             {
                 return $errorcode_map[$this->db->errorCode()];
             }*/
-            $errno = $this->db->lastErrorCode();
+			$errno = $this->db->lastErrorCode();
 			if ($errno == 'HY000' || $errno == 0)
-            {
-                if (preg_match('/table.*already exists/i', $this->error))     return 'DB_ERROR_TABLE_ALREADY_EXISTS';
-                elseif (preg_match('/index.*already exists/i', $this->error)) return 'DB_ERROR_KEY_NAME_ALREADY_EXISTS';
-                elseif (preg_match('/syntax error/i', $this->error))          return 'DB_ERROR_SYNTAX';
-            }
-            if ($errno == '23000')
-            {
-                if (preg_match('/column.* not unique/i', $this->error))       return 'DB_ERROR_RECORD_ALREADY_EXISTS';
-                elseif (preg_match('/PRIMARY KEY must be unique/i', $this->error)) return 'DB_ERROR_RECORD_ALREADY_EXISTS';
-            }
-            if ($errno > 1) {
-                // TODO Voir la liste des messages d'erreur
-            }
+			{
+				if (preg_match('/table.*already exists/i', $this->error))     return 'DB_ERROR_TABLE_ALREADY_EXISTS';
+				elseif (preg_match('/index.*already exists/i', $this->error)) return 'DB_ERROR_KEY_NAME_ALREADY_EXISTS';
+				elseif (preg_match('/syntax error/i', $this->error))          return 'DB_ERROR_SYNTAX';
+			}
+			if ($errno == '23000')
+			{
+				if (preg_match('/column.* not unique/i', $this->error))       return 'DB_ERROR_RECORD_ALREADY_EXISTS';
+				elseif (preg_match('/PRIMARY KEY must be unique/i', $this->error)) return 'DB_ERROR_RECORD_ALREADY_EXISTS';
+			}
+			if ($errno > 1) {
+				// TODO Voir la liste des messages d'erreur
+			}
 
-            return ($errno ? 'DB_ERROR_'.$errno : '0');
-        }
-    }
+			return ($errno ? 'DB_ERROR_'.$errno : '0');
+		}
+	}
 
-    /**
-     *	Renvoie le texte de l'erreur mysql de l'operation precedente.
-     *
-     *	@return	string	Error text
-     */
-    public function error()
-    {
-        if (!$this->connected) {
-            // Si il y a eu echec de connexion, $this->db n'est pas valide pour sqlite_error.
-            return 'Not connected. Check setup parameters in conf/conf.php file and your sqlite version';
-        } else {
-            return $this->error;
-        }
-    }
+	/**
+	 *	Renvoie le texte de l'erreur mysql de l'operation precedente.
+	 *
+	 *	@return	string	Error text
+	 */
+	public function error()
+	{
+		if (!$this->connected) {
+			// Si il y a eu echec de connexion, $this->db n'est pas valide pour sqlite_error.
+			return 'Not connected. Check setup parameters in conf/conf.php file and your sqlite version';
+		} else {
+			return $this->error;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Get last ID after an insert INSERT
-     *
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Get last ID after an insert INSERT
+	 *
 	 * @param   string	$tab    	Table name concerned by insert. Ne sert pas sous MySql mais requis pour compatibilite avec Postgresql
 	 * @param	string	$fieldid	Field name
 	 * @return  int     			Id of row
-     */
-    public function last_insert_id($tab, $fieldid = 'rowid')
-    {
-        // phpcs:enable
-        return $this->db->lastInsertRowId();
-    }
+	 */
+	public function last_insert_id($tab, $fieldid = 'rowid')
+	{
+		// phpcs:enable
+		return $this->db->lastInsertRowId();
+	}
 
-    /**
-     *  Encrypt sensitive data in database
-     *  Warning: This function includes the escape, so it must use direct value
-     *
-     *  @param  string  $fieldorvalue   Field name or value to encrypt
-     *  @param	int		$withQuotes     Return string with quotes
-     *  @return string          		XXX(field) or XXX('value') or field or 'value'
-     */
-    public function encrypt($fieldorvalue, $withQuotes = 0)
-    {
-        global $conf;
+	/**
+	 *  Encrypt sensitive data in database
+	 *  Warning: This function includes the escape, so it must use direct value
+	 *
+	 *  @param  string  $fieldorvalue   Field name or value to encrypt
+	 *  @param	int		$withQuotes     Return string with quotes
+	 *  @return string          		XXX(field) or XXX('value') or field or 'value'
+	 */
+	public function encrypt($fieldorvalue, $withQuotes = 0)
+	{
+		global $conf;
 
-        // Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-        $cryptType = ($conf->db->dolibarr_main_db_encryption ? $conf->db->dolibarr_main_db_encryption : 0);
+		// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
+		$cryptType = ($conf->db->dolibarr_main_db_encryption ? $conf->db->dolibarr_main_db_encryption : 0);
 
-        //Encryption key
-        $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
+		//Encryption key
+		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
 
-        $return = ($withQuotes ? "'" : "").$this->escape($fieldorvalue).($withQuotes ? "'" : "");
+		$return = ($withQuotes ? "'" : "").$this->escape($fieldorvalue).($withQuotes ? "'" : "");
 
-        if ($cryptType && !empty($cryptKey))
-        {
-            if ($cryptType == 2)
-            {
-                $return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
-            } elseif ($cryptType == 1)
-            {
-                $return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
-            }
-        }
+		if ($cryptType && !empty($cryptKey))
+		{
+			if ($cryptType == 2)
+			{
+				$return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
+			} elseif ($cryptType == 1)
+			{
+				$return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
+			}
+		}
 
-        return $return;
-    }
+		return $return;
+	}
 
-    /**
-     *	Decrypt sensitive data in database
-     *
-     *	@param	string	$value			Value to decrypt
-     * 	@return	string					Decrypted value if used
-     */
-    public function decrypt($value)
-    {
-        global $conf;
+	/**
+	 *	Decrypt sensitive data in database
+	 *
+	 *	@param	string	$value			Value to decrypt
+	 * 	@return	string					Decrypted value if used
+	 */
+	public function decrypt($value)
+	{
+		global $conf;
 
-        // Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-        $cryptType = ($conf->db->dolibarr_main_db_encryption ? $conf->db->dolibarr_main_db_encryption : 0);
+		// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
+		$cryptType = ($conf->db->dolibarr_main_db_encryption ? $conf->db->dolibarr_main_db_encryption : 0);
 
-        //Encryption key
-        $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
+		//Encryption key
+		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
 
-        $return = $value;
+		$return = $value;
 
-        if ($cryptType && !empty($cryptKey))
-        {
-            if ($cryptType == 2)
-            {
-                $return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';
-            } elseif ($cryptType == 1)
-            {
-                $return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';
-            }
-        }
+		if ($cryptType && !empty($cryptKey))
+		{
+			if ($cryptType == 2)
+			{
+				$return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';
+			} elseif ($cryptType == 1)
+			{
+				$return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';
+			}
+		}
 
-        return $return;
-    }
+		return $return;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Return connexion ID
-     *
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return connexion ID
+	 *
 	 * @return	        string      Id connexion
-     */
-    public function DDLGetConnectId()
-    {
-        // phpcs:enable
-        return '?';
-    }
+	 */
+	public function DDLGetConnectId()
+	{
+		// phpcs:enable
+		return '?';
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	Create a new database
 	 *	Do not use function xxx_create_db (xxx=mysql, ...) as they are deprecated
 	 *	We force to create database with charset this->forcecharset and collate this->forcecollate
-     *
+	 *
 	 *	@param	string	$database		Database name to create
 	 * 	@param	string	$charset		Charset used to store data
 	 * 	@param	string	$collation		Charset used to sort data
 	 * 	@param	string	$owner			Username of database owner
 	 * 	@return	SQLite3Result   		resource defined if OK, null if KO
-     */
-    public function DDLCreateDb($database, $charset = '', $collation = '', $owner = '')
-    {
-        // phpcs:enable
-        if (empty($charset))   $charset = $this->forcecharset;
-        if (empty($collation)) $collation = $this->forcecollate;
+	 */
+	public function DDLCreateDb($database, $charset = '', $collation = '', $owner = '')
+	{
+		// phpcs:enable
+		if (empty($charset))   $charset = $this->forcecharset;
+		if (empty($collation)) $collation = $this->forcecollate;
 
-        // ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci
-        $sql = 'CREATE DATABASE '.$database;
-        $sql .= ' DEFAULT CHARACTER SET '.$charset.' DEFAULT COLLATE '.$collation;
+		// ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci
+		$sql = 'CREATE DATABASE '.$database;
+		$sql .= ' DEFAULT CHARACTER SET '.$charset.' DEFAULT COLLATE '.$collation;
 
-        dol_syslog($sql, LOG_DEBUG);
-        $ret = $this->query($sql);
-        if (!$ret)
-        {
-            // We try again for compatibility with Mysql < 4.1.1
-            $sql = 'CREATE DATABASE '.$database;
-            $ret = $this->query($sql);
-            dol_syslog($sql, LOG_DEBUG);
-        }
-        return $ret;
-    }
+		dol_syslog($sql, LOG_DEBUG);
+		$ret = $this->query($sql);
+		if (!$ret)
+		{
+			// We try again for compatibility with Mysql < 4.1.1
+			$sql = 'CREATE DATABASE '.$database;
+			$ret = $this->query($sql);
+			dol_syslog($sql, LOG_DEBUG);
+		}
+		return $ret;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  List tables into a database
-     *
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  List tables into a database
+	 *
 	 *  @param	string		$database	Name of database
 	 *  @param	string		$table		Name of table filter ('xxx%')
 	 *  @return	array					List of tables in an array
-     */
-    public function DDLListTables($database, $table = '')
-    {
-        // phpcs:enable
-        $listtables = array();
+	 */
+	public function DDLListTables($database, $table = '')
+	{
+		// phpcs:enable
+		$listtables = array();
 
-        $like = '';
-        if ($table) $like = "LIKE '".$table."'";
-        $sql = "SHOW TABLES FROM ".$database." ".$like.";";
-        //print $sql;
-        $result = $this->query($sql);
-        if ($result)
-        {
-            while ($row = $this->fetch_row($result))
-            {
-                $listtables[] = $row[0];
-            }
-        }
-        return $listtables;
-    }
+		$like = '';
+		if ($table) $like = "LIKE '".$table."'";
+		$sql = "SHOW TABLES FROM ".$database." ".$like.";";
+		//print $sql;
+		$result = $this->query($sql);
+		if ($result)
+		{
+			while ($row = $this->fetch_row($result))
+			{
+				$listtables[] = $row[0];
+			}
+		}
+		return $listtables;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  List information of columns into a table.
-     *
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  List information of columns into a table.
+	 *
 	 *	@param	string	$table		Name of table
 	 *	@return	array				Tableau des informations des champs de la table
 	 *	TODO modify for sqlite
-     */
-    public function DDLInfoTable($table)
-    {
-        // phpcs:enable
-        $infotables = array();
+	 */
+	public function DDLInfoTable($table)
+	{
+		// phpcs:enable
+		$infotables = array();
 
-        $sql = "SHOW FULL COLUMNS FROM ".$table.";";
+		$sql = "SHOW FULL COLUMNS FROM ".$table.";";
 
-        dol_syslog($sql, LOG_DEBUG);
-        $result = $this->query($sql);
-        if ($result)
-        {
-            while ($row = $this->fetch_row($result))
-            {
-                $infotables[] = $row;
-            }
-        }
-        return $infotables;
-    }
+		dol_syslog($sql, LOG_DEBUG);
+		$result = $this->query($sql);
+		if ($result)
+		{
+			while ($row = $this->fetch_row($result))
+			{
+				$infotables[] = $row;
+			}
+		}
+		return $infotables;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	Create a table into database
-     *
+	 *
 	 *	@param	    string	$table 			Nom de la table
 	 *	@param	    array	$fields 		Tableau associatif [nom champ][tableau des descriptions]
 	 *	@param	    string	$primary_key 	Nom du champ qui sera la clef primaire
@@ -899,391 +899,391 @@ class DoliDBSqlite3 extends DoliDB
 	 *	@param	    array	$fulltext_keys	Tableau des Nom de champs qui seront indexes en fulltext
 	 *	@param	    array	$keys 			Tableau des champs cles noms => valeur
 	 *	@return	    int						<0 if KO, >=0 if OK
-     */
-    public function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null)
-    {
-        // phpcs:enable
-        // FIXME: $fulltext_keys parameter is unused
+	 */
+	public function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null)
+	{
+		// phpcs:enable
+		// FIXME: $fulltext_keys parameter is unused
 
-        // cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
-        // ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
-        $sql = "create table ".$table."(";
-        $i = 0;
-        foreach ($fields as $field_name => $field_desc)
-        {
-            $sqlfields[$i] = $field_name." ";
-            $sqlfields[$i] .= $field_desc['type'];
-            if (preg_match("/^[^\s]/i", $field_desc['value']))
-                $sqlfields[$i]  .= "(".$field_desc['value'].")";
-            elseif (preg_match("/^[^\s]/i", $field_desc['attribute']))
-                $sqlfields[$i]  .= " ".$field_desc['attribute'];
-            elseif (preg_match("/^[^\s]/i", $field_desc['default']))
-            {
-                if (preg_match("/null/i", $field_desc['default']))
-                    $sqlfields[$i] .= " default ".$field_desc['default'];
-                else $sqlfields[$i] .= " default '".$this->escape($field_desc['default'])."'";
-            } elseif (preg_match("/^[^\s]/i", $field_desc['null']))
-                $sqlfields[$i] .= " ".$field_desc['null'];
+		// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
+		// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
+		$sql = "create table ".$table."(";
+		$i = 0;
+		foreach ($fields as $field_name => $field_desc)
+		{
+			$sqlfields[$i] = $field_name." ";
+			$sqlfields[$i] .= $field_desc['type'];
+			if (preg_match("/^[^\s]/i", $field_desc['value']))
+				$sqlfields[$i]  .= "(".$field_desc['value'].")";
+			elseif (preg_match("/^[^\s]/i", $field_desc['attribute']))
+				$sqlfields[$i]  .= " ".$field_desc['attribute'];
+			elseif (preg_match("/^[^\s]/i", $field_desc['default']))
+			{
+				if (preg_match("/null/i", $field_desc['default']))
+					$sqlfields[$i] .= " default ".$field_desc['default'];
+				else $sqlfields[$i] .= " default '".$this->escape($field_desc['default'])."'";
+			} elseif (preg_match("/^[^\s]/i", $field_desc['null']))
+				$sqlfields[$i] .= " ".$field_desc['null'];
 
-            elseif (preg_match("/^[^\s]/i", $field_desc['extra']))
-                $sqlfields[$i] .= " ".$field_desc['extra'];
-            $i++;
-        }
-        if ($primary_key != "")
-        $pk = "primary key(".$primary_key.")";
+			elseif (preg_match("/^[^\s]/i", $field_desc['extra']))
+				$sqlfields[$i] .= " ".$field_desc['extra'];
+			$i++;
+		}
+		if ($primary_key != "")
+		$pk = "primary key(".$primary_key.")";
 
-        if (is_array($unique_keys))
-        {
-            $i = 0;
-            foreach ($unique_keys as $key => $value)
-            {
-            	$sqluq[$i] = "UNIQUE KEY '".$key."' ('".$this->escape($value)."')";
-                $i++;
-            }
-        }
-        if (is_array($keys))
-        {
-            $i = 0;
-            foreach ($keys as $key => $value)
-            {
-                $sqlk[$i] = "KEY ".$key." (".$value.")";
-                $i++;
-            }
-        }
-        $sql .= implode(',', $sqlfields);
-        if ($primary_key != "")
-        $sql .= ",".$pk;
-        if (is_array($unique_keys))
-        $sql .= ",".implode(',', $sqluq);
-        if (is_array($keys))
-        $sql .= ",".implode(',', $sqlk);
-        $sql .= ") type=".$type;
+		if (is_array($unique_keys))
+		{
+			$i = 0;
+			foreach ($unique_keys as $key => $value)
+			{
+				$sqluq[$i] = "UNIQUE KEY '".$key."' ('".$this->escape($value)."')";
+				$i++;
+			}
+		}
+		if (is_array($keys))
+		{
+			$i = 0;
+			foreach ($keys as $key => $value)
+			{
+				$sqlk[$i] = "KEY ".$key." (".$value.")";
+				$i++;
+			}
+		}
+		$sql .= implode(',', $sqlfields);
+		if ($primary_key != "")
+		$sql .= ",".$pk;
+		if (is_array($unique_keys))
+		$sql .= ",".implode(',', $sqluq);
+		if (is_array($keys))
+		$sql .= ",".implode(',', $sqlk);
+		$sql .= ") type=".$type;
 
-        dol_syslog($sql, LOG_DEBUG);
-        if (!$this -> query($sql))
-            return -1;
-        return 1;
-    }
+		dol_syslog($sql, LOG_DEBUG);
+		if (!$this -> query($sql))
+			return -1;
+		return 1;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Drop a table into database
-     *
-     *	@param	    string	$table 			Name of table
-     *	@return	    int						<0 if KO, >=0 if OK
-     */
-    public function DDLDropTable($table)
-    {
-        // phpcs:enable
-    	$sql = "DROP TABLE ".$table;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Drop a table into database
+	 *
+	 *	@param	    string	$table 			Name of table
+	 *	@return	    int						<0 if KO, >=0 if OK
+	 */
+	public function DDLDropTable($table)
+	{
+		// phpcs:enable
+		$sql = "DROP TABLE ".$table;
 
-    	if (!$this->query($sql))
-    		return -1;
-    	else return 1;
-    }
+		if (!$this->query($sql))
+			return -1;
+		else return 1;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	Return a pointer of line with description of a table or field
-     *
+	 *
 	 *	@param	string		$table	Name of table
 	 *	@param	string		$field	Optionnel : Name of field if we want description of field
 	 *	@return	SQLite3Result		Resource
-     */
-    public function DDLDescTable($table, $field = "")
-    {
-        // phpcs:enable
-        $sql = "DESC ".$table." ".$field;
+	 */
+	public function DDLDescTable($table, $field = "")
+	{
+		// phpcs:enable
+		$sql = "DESC ".$table." ".$field;
 
-        dol_syslog(get_class($this)."::DDLDescTable ".$sql, LOG_DEBUG);
-        $this->_results = $this->query($sql);
-        return $this->_results;
-    }
+		dol_syslog(get_class($this)."::DDLDescTable ".$sql, LOG_DEBUG);
+		$this->_results = $this->query($sql);
+		return $this->_results;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	Create a new field into table
-     *
+	 *
 	 *	@param	string	$table 				Name of table
 	 *	@param	string	$field_name 		Name of field to add
 	 *	@param	string	$field_desc 		Tableau associatif de description du champ a inserer[nom du parametre][valeur du parametre]
 	 *	@param	string	$field_position 	Optionnel ex.: "after champtruc"
 	 *	@return	int							<0 if KO, >0 if OK
-     */
-    public function DDLAddField($table, $field_name, $field_desc, $field_position = "")
-    {
-        // phpcs:enable
-        // cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
-        // ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
-        $sql = "ALTER TABLE ".$table." ADD ".$field_name." ";
-        $sql .= $field_desc['type'];
-        if (preg_match("/^[^\s]/i", $field_desc['value']))
-        if (!in_array($field_desc['type'], array('date', 'datetime')))
-        {
-            $sql .= "(".$field_desc['value'].")";
-        }
-        if (preg_match("/^[^\s]/i", $field_desc['attribute']))
-        $sql .= " ".$field_desc['attribute'];
-        if (preg_match("/^[^\s]/i", $field_desc['null']))
-        $sql .= " ".$field_desc['null'];
-        if (preg_match("/^[^\s]/i", $field_desc['default']))
-        {
-            if (preg_match("/null/i", $field_desc['default']))
-            $sql .= " default ".$field_desc['default'];
-            else $sql .= " default '".$this->escape($field_desc['default'])."'";
-        }
-        if (preg_match("/^[^\s]/i", $field_desc['extra']))
-        $sql .= " ".$field_desc['extra'];
-        $sql .= " ".$field_position;
+	 */
+	public function DDLAddField($table, $field_name, $field_desc, $field_position = "")
+	{
+		// phpcs:enable
+		// cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
+		// ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
+		$sql = "ALTER TABLE ".$table." ADD ".$field_name." ";
+		$sql .= $field_desc['type'];
+		if (preg_match("/^[^\s]/i", $field_desc['value']))
+		if (!in_array($field_desc['type'], array('date', 'datetime')))
+		{
+			$sql .= "(".$field_desc['value'].")";
+		}
+		if (preg_match("/^[^\s]/i", $field_desc['attribute']))
+		$sql .= " ".$field_desc['attribute'];
+		if (preg_match("/^[^\s]/i", $field_desc['null']))
+		$sql .= " ".$field_desc['null'];
+		if (preg_match("/^[^\s]/i", $field_desc['default']))
+		{
+			if (preg_match("/null/i", $field_desc['default']))
+			$sql .= " default ".$field_desc['default'];
+			else $sql .= " default '".$this->escape($field_desc['default'])."'";
+		}
+		if (preg_match("/^[^\s]/i", $field_desc['extra']))
+		$sql .= " ".$field_desc['extra'];
+		$sql .= " ".$field_position;
 
-        dol_syslog(get_class($this)."::DDLAddField ".$sql, LOG_DEBUG);
-        if (!$this->query($sql))
-        {
-            return -1;
-        }
-        return 1;
-    }
+		dol_syslog(get_class($this)."::DDLAddField ".$sql, LOG_DEBUG);
+		if (!$this->query($sql))
+		{
+			return -1;
+		}
+		return 1;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	Update format of a field into a table
-     *
+	 *
 	 *	@param	string	$table 				Name of table
 	 *	@param	string	$field_name 		Name of field to modify
 	 *	@param	string	$field_desc 		Array with description of field format
 	 *	@return	int							<0 if KO, >0 if OK
-     */
-    public function DDLUpdateField($table, $field_name, $field_desc)
-    {
-        // phpcs:enable
-        $sql = "ALTER TABLE ".$table;
-        $sql .= " MODIFY COLUMN ".$field_name." ".$field_desc['type'];
-        if ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int' || $field_desc['type'] == 'varchar') {
-            $sql .= "(".$field_desc['value'].")";
-        }
+	 */
+	public function DDLUpdateField($table, $field_name, $field_desc)
+	{
+		// phpcs:enable
+		$sql = "ALTER TABLE ".$table;
+		$sql .= " MODIFY COLUMN ".$field_name." ".$field_desc['type'];
+		if ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int' || $field_desc['type'] == 'varchar') {
+			$sql .= "(".$field_desc['value'].")";
+		}
 
-        dol_syslog(get_class($this)."::DDLUpdateField ".$sql, LOG_DEBUG);
-        if (!$this->query($sql))
-            return -1;
-        return 1;
-    }
+		dol_syslog(get_class($this)."::DDLUpdateField ".$sql, LOG_DEBUG);
+		if (!$this->query($sql))
+			return -1;
+		return 1;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	Drop a field from table
-     *
+	 *
 	 *	@param	string	$table 			Name of table
 	 *	@param	string	$field_name 	Name of field to drop
 	 *	@return	int						<0 if KO, >0 if OK
-     */
-    public function DDLDropField($table, $field_name)
-    {
-        // phpcs:enable
-        $sql = "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
-        dol_syslog(get_class($this)."::DDLDropField ".$sql, LOG_DEBUG);
-        if (!$this->query($sql))
-        {
-            $this->error = $this->lasterror();
-            return -1;
-        }
-        return 1;
-    }
+	 */
+	public function DDLDropField($table, $field_name)
+	{
+		// phpcs:enable
+		$sql = "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
+		dol_syslog(get_class($this)."::DDLDropField ".$sql, LOG_DEBUG);
+		if (!$this->query($sql))
+		{
+			$this->error = $this->lasterror();
+			return -1;
+		}
+		return 1;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * 	Create a user and privileges to connect to database (even if database does not exists yet)
-     *
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * 	Create a user and privileges to connect to database (even if database does not exists yet)
+	 *
 	 *	@param	string	$dolibarr_main_db_host 		Ip serveur
 	 *	@param	string	$dolibarr_main_db_user 		Nom user a creer
 	 *	@param	string	$dolibarr_main_db_pass 		Mot de passe user a creer
 	 *	@param	string	$dolibarr_main_db_name		Database name where user must be granted
 	 *	@return	int									<0 if KO, >=0 if OK
-     */
-    public function DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name)
-    {
-        // phpcs:enable
-        $sql = "INSERT INTO user ";
-        $sql .= "(Host,User,password,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv,Lock_tables_priv)";
-        $sql .= " VALUES ('".$this->escape($dolibarr_main_db_host)."','".$this->escape($dolibarr_main_db_user)."',password('".addslashes($dolibarr_main_db_pass)."')";
-        $sql .= ",'Y','Y','Y','Y','Y','Y','Y','Y','Y')";
+	 */
+	public function DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name)
+	{
+		// phpcs:enable
+		$sql = "INSERT INTO user ";
+		$sql .= "(Host,User,password,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv,Lock_tables_priv)";
+		$sql .= " VALUES ('".$this->escape($dolibarr_main_db_host)."','".$this->escape($dolibarr_main_db_user)."',password('".addslashes($dolibarr_main_db_pass)."')";
+		$sql .= ",'Y','Y','Y','Y','Y','Y','Y','Y','Y')";
 
-        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
-        $resql = $this->query($sql);
-        if (!$resql)
-        {
-            return -1;
-        }
+		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
+		$resql = $this->query($sql);
+		if (!$resql)
+		{
+			return -1;
+		}
 
-        $sql = "INSERT INTO db ";
-        $sql .= "(Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv,Lock_tables_priv)";
-        $sql .= " VALUES ('".$this->escape($dolibarr_main_db_host)."','".$this->escape($dolibarr_main_db_name)."','".addslashes($dolibarr_main_db_user)."'";
-        $sql .= ",'Y','Y','Y','Y','Y','Y','Y','Y','Y')";
+		$sql = "INSERT INTO db ";
+		$sql .= "(Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv,Lock_tables_priv)";
+		$sql .= " VALUES ('".$this->escape($dolibarr_main_db_host)."','".$this->escape($dolibarr_main_db_name)."','".addslashes($dolibarr_main_db_user)."'";
+		$sql .= ",'Y','Y','Y','Y','Y','Y','Y','Y','Y')";
 
-        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
-        $resql = $this->query($sql);
-        if (!$resql)
-        {
-            return -1;
-        }
+		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
+		$resql = $this->query($sql);
+		if (!$resql)
+		{
+			return -1;
+		}
 
-        $sql = "FLUSH Privileges";
+		$sql = "FLUSH Privileges";
 
-        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
-        $resql = $this->query($sql);
-        if (!$resql)
-        {
-            return -1;
-        }
-        return 1;
-    }
+		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
+		$resql = $this->query($sql);
+		if (!$resql)
+		{
+			return -1;
+		}
+		return 1;
+	}
 
-    /**
+	/**
 	 *	Return charset used to store data in database
-     *
+	 *
 	 *	@return		string		Charset
-     */
-    public function getDefaultCharacterSetDatabase()
-    {
-        return 'UTF-8';
-    }
+	 */
+	public function getDefaultCharacterSetDatabase()
+	{
+		return 'UTF-8';
+	}
 
-    /**
+	/**
 	 *	Return list of available charset that can be used to store data in database
-     *
+	 *
 	 *	@return		array		List of Charset
-     */
-    public function getListOfCharacterSet()
-    {
-        $liste = array();
-        $i = 0;
-        $liste[$i]['charset'] = 'UTF-8';
-        $liste[$i]['description'] = 'UTF-8';
-        return $liste;
-    }
+	 */
+	public function getListOfCharacterSet()
+	{
+		$liste = array();
+		$i = 0;
+		$liste[$i]['charset'] = 'UTF-8';
+		$liste[$i]['description'] = 'UTF-8';
+		return $liste;
+	}
 
-    /**
+	/**
 	 *	Return collation used in database
-     *
+	 *
 	 *	@return		string		Collation value
-     */
-    public function getDefaultCollationDatabase()
-    {
-        return 'UTF-8';
-    }
+	 */
+	public function getDefaultCollationDatabase()
+	{
+		return 'UTF-8';
+	}
 
-    /**
+	/**
 	 *	Return list of available collation that can be used for database
-     *
+	 *
 	 *	@return		array		List of Collation
-     */
-    public function getListOfCollation()
-    {
-        $liste = array();
-        $i = 0;
-        $liste[$i]['charset'] = 'UTF-8';
-        $liste[$i]['description'] = 'UTF-8';
-        return $liste;
-    }
+	 */
+	public function getListOfCollation()
+	{
+		$liste = array();
+		$i = 0;
+		$liste[$i]['charset'] = 'UTF-8';
+		$liste[$i]['description'] = 'UTF-8';
+		return $liste;
+	}
 
-    /**
+	/**
 	 *	Return full path of dump program
-     *
+	 *
 	 *	@return		string		Full path of dump program
-     */
-    public function getPathOfDump()
-    {
-	    // FIXME: not for SQLite
-        $fullpathofdump = '/pathtomysqldump/mysqldump';
+	 */
+	public function getPathOfDump()
+	{
+		// FIXME: not for SQLite
+		$fullpathofdump = '/pathtomysqldump/mysqldump';
 
-        $resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
-        if ($resql)
-        {
-            $liste = $this->fetch_array($resql);
-            $basedir = $liste['Value'];
-            $fullpathofdump = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysqldump';
-        }
-        return $fullpathofdump;
-    }
+		$resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
+		if ($resql)
+		{
+			$liste = $this->fetch_array($resql);
+			$basedir = $liste['Value'];
+			$fullpathofdump = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysqldump';
+		}
+		return $fullpathofdump;
+	}
 
-    /**
+	/**
 	 *	Return full path of restore program
-     *
+	 *
 	 *	@return		string		Full path of restore program
-     */
-    public function getPathOfRestore()
-    {
-	    // FIXME: not for SQLite
-        $fullpathofimport = '/pathtomysql/mysql';
+	 */
+	public function getPathOfRestore()
+	{
+		// FIXME: not for SQLite
+		$fullpathofimport = '/pathtomysql/mysql';
 
-        $resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
-        if ($resql)
-        {
-            $liste = $this->fetch_array($resql);
-            $basedir = $liste['Value'];
-            $fullpathofimport = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysql';
-        }
-        return $fullpathofimport;
-    }
+		$resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
+		if ($resql)
+		{
+			$liste = $this->fetch_array($resql);
+			$basedir = $liste['Value'];
+			$fullpathofimport = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysql';
+		}
+		return $fullpathofimport;
+	}
 
-    /**
-     * Return value of server parameters
-     *
+	/**
+	 * Return value of server parameters
+	 *
 	 * @param	string	$filter		Filter list on a particular value
 	 * @return	array				Array of key-values (key=>value)
-     */
-    public function getServerParametersValues($filter = '')
-    {
-        $result = array();
-        static $pragmas;
-        if (!isset($pragmas)) {
-            // Définition de la liste des pragmas utilisés qui ne retournent qu'une seule valeur
-            // indépendante de la base de données.
-            // cf. http://www.sqlite.org/pragma.html
-            $pragmas = array(
-                'application_id', 'auto_vacuum', 'automatic_index', 'busy_timeout', 'cache_size',
-                'cache_spill', 'case_sensitive_like', 'checkpoint_fullsync', 'collation_list',
-                'compile_options', 'data_version', /*'database_list',*/
-                'defer_foreign_keys', 'encoding', 'foreign_key_check', 'freelist_count',
-                'full_column_names', 'fullsync', 'ingore_check_constraints', 'integrity_check',
-                'journal_mode', 'journal_size_limit', 'legacy_file_format', 'locking_mode',
-                'max_page_count', 'page_count', 'page_size', 'parser_trace',
-                'query_only', 'quick_check', 'read_uncommitted', 'recursive_triggers',
-                'reverse_unordered_selects', 'schema_version', 'user_version',
-                'secure_delete', 'short_column_names', 'shrink_memory', 'soft_heap_limit',
-                'synchronous', 'temp_store', /*'temp_store_directory',*/ 'threads',
-                'vdbe_addoptrace', 'vdbe_debug', 'vdbe_listing', 'vdbe_trace',
-                'wal_autocheckpoint',
-            );
-        }
+	 */
+	public function getServerParametersValues($filter = '')
+	{
+		$result = array();
+		static $pragmas;
+		if (!isset($pragmas)) {
+			// Définition de la liste des pragmas utilisés qui ne retournent qu'une seule valeur
+			// indépendante de la base de données.
+			// cf. http://www.sqlite.org/pragma.html
+			$pragmas = array(
+				'application_id', 'auto_vacuum', 'automatic_index', 'busy_timeout', 'cache_size',
+				'cache_spill', 'case_sensitive_like', 'checkpoint_fullsync', 'collation_list',
+				'compile_options', 'data_version', /*'database_list',*/
+				'defer_foreign_keys', 'encoding', 'foreign_key_check', 'freelist_count',
+				'full_column_names', 'fullsync', 'ingore_check_constraints', 'integrity_check',
+				'journal_mode', 'journal_size_limit', 'legacy_file_format', 'locking_mode',
+				'max_page_count', 'page_count', 'page_size', 'parser_trace',
+				'query_only', 'quick_check', 'read_uncommitted', 'recursive_triggers',
+				'reverse_unordered_selects', 'schema_version', 'user_version',
+				'secure_delete', 'short_column_names', 'shrink_memory', 'soft_heap_limit',
+				'synchronous', 'temp_store', /*'temp_store_directory',*/ 'threads',
+				'vdbe_addoptrace', 'vdbe_debug', 'vdbe_listing', 'vdbe_trace',
+				'wal_autocheckpoint',
+			);
+		}
 
-        // TODO prendre en compte le filtre
-        foreach ($pragmas as $var) {
-            $sql = "PRAGMA $var";
-            $resql = $this->query($sql);
-            if ($resql)
-            {
-                $obj = $this->fetch_row($resql);
-                //dol_syslog(get_class($this)."::select_db getServerParametersValues $var=". print_r($obj, true), LOG_DEBUG);
-                $result[$var] = $obj[0];
-            } else {
-                // TODO Récupérer le message
-                $result[$var] = 'FAIL';
-            }
-        }
-        return $result;
-    }
+		// TODO prendre en compte le filtre
+		foreach ($pragmas as $var) {
+			$sql = "PRAGMA $var";
+			$resql = $this->query($sql);
+			if ($resql)
+			{
+				$obj = $this->fetch_row($resql);
+				//dol_syslog(get_class($this)."::select_db getServerParametersValues $var=". print_r($obj, true), LOG_DEBUG);
+				$result[$var] = $obj[0];
+			} else {
+				// TODO Récupérer le message
+				$result[$var] = 'FAIL';
+			}
+		}
+		return $result;
+	}
 
-    /**
-     * Return value of server status
-     *
+	/**
+	 * Return value of server status
+	 *
 	 * @param	string	$filter		Filter list on a particular value
 	 * @return  array				Array of key-values (key=>value)
-     */
-    public function getServerStatusValues($filter = '')
-    {
-        $result = array();
-        /*
+	 */
+	public function getServerStatusValues($filter = '')
+	{
+		$result = array();
+		/*
         $sql='SHOW STATUS';
         if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
         $resql=$this->query($sql);
@@ -1293,88 +1293,88 @@ class DoliDBSqlite3 extends DoliDB
         }
          */
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Permet le chargement d'une fonction personnalisee dans le moteur de base de donnees.
-     * Note: le nom de la fonction personnalisee est prefixee par 'db'. La fonction doit être
-     * statique et publique. Le nombre de parametres est determine automatiquement.
-     *
-     * @param 	string 	$name 			Le nom de la fonction a definir dans Sqlite
-     * @param	int		$arg_count		Arg count
-     * @return	void
-     */
-    private function addCustomFunction($name, $arg_count = -1)
-    {
-        if ($this->db)
-        {
-        	$newname = preg_replace('/_/', '', $name);
-            $localname = __CLASS__.'::db'.$newname;
-            $reflectClass = new ReflectionClass(__CLASS__);
-            $reflectFunction = $reflectClass->getMethod('db'.$newname);
-            if ($arg_count < 0) {
-                $arg_count = $reflectFunction->getNumberOfParameters();
-            }
-            if (!$this->db->createFunction($name, $localname, $arg_count))
-            {
-                $this->error = "unable to create custom function '$name'";
-            }
-        }
-    }
+	/**
+	 * Permet le chargement d'une fonction personnalisee dans le moteur de base de donnees.
+	 * Note: le nom de la fonction personnalisee est prefixee par 'db'. La fonction doit être
+	 * statique et publique. Le nombre de parametres est determine automatiquement.
+	 *
+	 * @param 	string 	$name 			Le nom de la fonction a definir dans Sqlite
+	 * @param	int		$arg_count		Arg count
+	 * @return	void
+	 */
+	private function addCustomFunction($name, $arg_count = -1)
+	{
+		if ($this->db)
+		{
+			$newname = preg_replace('/_/', '', $name);
+			$localname = __CLASS__.'::db'.$newname;
+			$reflectClass = new ReflectionClass(__CLASS__);
+			$reflectFunction = $reflectClass->getMethod('db'.$newname);
+			if ($arg_count < 0) {
+				$arg_count = $reflectFunction->getNumberOfParameters();
+			}
+			if (!$this->db->createFunction($name, $localname, $arg_count))
+			{
+				$this->error = "unable to create custom function '$name'";
+			}
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * calc_daynr
-     *
-     * @param 	int 	$year		Year
-     * @param 	int 	$month		Month
-     * @param	int     $day 		Day
-     * @return int Formatted date
-     */
-    private static function calc_daynr($year, $month, $day)
-    {
-        // phpcs:enable
-        $y = $year;
-        if ($y == 0 && $month == 0) return 0;
-        $num = (365 * $y + 31 * ($month - 1) + $day);
-        if ($month <= 2) {
-            $y--; } else {
-            $num -= floor(($month * 4 + 23) / 10);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * calc_daynr
+	 *
+	 * @param 	int 	$year		Year
+	 * @param 	int 	$month		Month
+	 * @param	int     $day 		Day
+	 * @return int Formatted date
+	 */
+	private static function calc_daynr($year, $month, $day)
+	{
+		// phpcs:enable
+		$y = $year;
+		if ($y == 0 && $month == 0) return 0;
+		$num = (365 * $y + 31 * ($month - 1) + $day);
+		if ($month <= 2) {
+			$y--; } else {
+			$num -= floor(($month * 4 + 23) / 10);
 			}
 			$temp = floor(($y / 100 + 1) * 3 / 4);
 			return $num + floor($y / 4) - $temp;
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * calc_weekday
-     *
-     * @param int	$daynr							???
-     * @param bool	$sunday_first_day_of_week		???
-     * @return int
-     */
-    private static function calc_weekday($daynr, $sunday_first_day_of_week)
-    {
-        // phpcs:enable
-        $ret = floor(($daynr + 5 + ($sunday_first_day_of_week ? 1 : 0)) % 7);
-        return $ret;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * calc_weekday
+	 *
+	 * @param int	$daynr							???
+	 * @param bool	$sunday_first_day_of_week		???
+	 * @return int
+	 */
+	private static function calc_weekday($daynr, $sunday_first_day_of_week)
+	{
+		// phpcs:enable
+		$ret = floor(($daynr + 5 + ($sunday_first_day_of_week ? 1 : 0)) % 7);
+		return $ret;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * calc_days_in_year
-     *
-     * @param 	string	$year		Year
-     * @return	int					Nb of days in year
-     */
-    private static function calc_days_in_year($year)
-    {
-        // phpcs:enable
-        return (($year & 3) == 0 && ($year % 100 || ($year % 400 == 0 && $year)) ? 366 : 365);
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * calc_days_in_year
+	 *
+	 * @param 	string	$year		Year
+	 * @return	int					Nb of days in year
+	 */
+	private static function calc_days_in_year($year)
+	{
+		// phpcs:enable
+		return (($year & 3) == 0 && ($year % 100 || ($year % 400 == 0 && $year)) ? 366 : 365);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * calc_week
 	 *
@@ -1385,40 +1385,40 @@ class DoliDBSqlite3 extends DoliDB
 	 * @param 	string	$calc_year			???
 	 * @return	string						???
 	 */
-    private static function calc_week($year, $month, $day, $week_behaviour, &$calc_year)
-    {
-        // phpcs:enable
-        $daynr = self::calc_daynr($year, $month, $day);
-        $first_daynr = self::calc_daynr($year, 1, 1);
-        $monday_first = ($week_behaviour & self::WEEK_MONDAY_FIRST) ? 1 : 0;
-        $week_year = ($week_behaviour & self::WEEK_YEAR) ? 1 : 0;
-        $first_weekday = ($week_behaviour & self::WEEK_FIRST_WEEKDAY) ? 1 : 0;
+	private static function calc_week($year, $month, $day, $week_behaviour, &$calc_year)
+	{
+		// phpcs:enable
+		$daynr = self::calc_daynr($year, $month, $day);
+		$first_daynr = self::calc_daynr($year, 1, 1);
+		$monday_first = ($week_behaviour & self::WEEK_MONDAY_FIRST) ? 1 : 0;
+		$week_year = ($week_behaviour & self::WEEK_YEAR) ? 1 : 0;
+		$first_weekday = ($week_behaviour & self::WEEK_FIRST_WEEKDAY) ? 1 : 0;
 
-        $weekday = self::calc_weekday($first_daynr, !$monday_first);
-        $calc_year = $year;
+		$weekday = self::calc_weekday($first_daynr, !$monday_first);
+		$calc_year = $year;
 
-        if ($month == 1 && $day <= 7 - $weekday) {
-            if (!$week_year && (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)))
-                return 0;
-            $week_year = 1;
-            $calc_year--;
-            $first_daynr -= ($days = self::calc_days_in_year($calc_year));
-            $weekday = ($weekday + 53 * 7 - $days) % 7;
-        }
+		if ($month == 1 && $day <= 7 - $weekday) {
+			if (!$week_year && (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)))
+				return 0;
+			$week_year = 1;
+			$calc_year--;
+			$first_daynr -= ($days = self::calc_days_in_year($calc_year));
+			$weekday = ($weekday + 53 * 7 - $days) % 7;
+		}
 
-        if (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)) {
-            $days = $daynr - ($first_daynr + (7 - $weekday));
-        } else {
-            $days = $daynr - ($first_daynr - $weekday);
-        }
+		if (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)) {
+			$days = $daynr - ($first_daynr + (7 - $weekday));
+		} else {
+			$days = $daynr - ($first_daynr - $weekday);
+		}
 
-        if ($week_year && $days >= 52 * 7) {
-            $weekday = ($weekday + self::calc_days_in_year($calc_year)) % 7;
-            if ((!$first_weekday && $weekday < 4) || ($first_weekday && $weekday == 0)) {
-                $calc_year++;
-                return 1;
-            }
-        }
-        return floor($days / 7 + 1);
-    }
+		if ($week_year && $days >= 52 * 7) {
+			$weekday = ($weekday + self::calc_days_in_year($calc_year)) % 7;
+			if ((!$first_weekday && $weekday < 4) || ($first_weekday && $weekday == 0)) {
+				$calc_year++;
+				return 1;
+			}
+		}
+		return floor($days / 7 + 1);
+	}
 }
diff --git a/htdocs/core/extrafieldsinexport.inc.php b/htdocs/core/extrafieldsinexport.inc.php
index ae6fdf8bf70..cef5f74d172 100644
--- a/htdocs/core/extrafieldsinexport.inc.php
+++ b/htdocs/core/extrafieldsinexport.inc.php
@@ -2,9 +2,9 @@
 
 if (empty($keyforselect) || empty($keyforelement) || empty($keyforaliasextra))
 {
-    //print $keyforselet.' - '.$keyforelement.' - '.$keyforaliasextra;
-    dol_print_error('', 'include of file extrafieldsinexport.inc.php was done but var $keyforselect or $keyforelement or $keyforaliasextra was not set');
-    exit;
+	//print $keyforselet.' - '.$keyforelement.' - '.$keyforaliasextra;
+	dol_print_error('', 'include of file extrafieldsinexport.inc.php was done but var $keyforselect or $keyforelement or $keyforaliasextra was not set');
+	exit;
 }
 
 // Add extra fields
@@ -36,14 +36,14 @@ if ($resql)    // This can fail when class is used on old database (during migra
 				$typeFilter = "Boolean";
 				break;
 			case 'select':
-			    if (!empty($conf->global->EXPORT_LABEL_FOR_SELECT))
-			    {
-    			    $tmpparam = unserialize($obj->param); // $tmpparam may be array with 'options' = array(key1=>val1, key2=>val2 ...)
-    			    if ($tmpparam['options'] && is_array($tmpparam['options'])) {
-    			        $typeFilter = "Select:".$obj->param;
-    			    }
-			    }
-			    break;
+				if (!empty($conf->global->EXPORT_LABEL_FOR_SELECT))
+				{
+					$tmpparam = unserialize($obj->param); // $tmpparam may be array with 'options' = array(key1=>val1, key2=>val2 ...)
+					if ($tmpparam['options'] && is_array($tmpparam['options'])) {
+						$typeFilter = "Select:".$obj->param;
+					}
+				}
+				break;
 			case 'sellist':
 				$tmp = '';
 				$tmpparam = unserialize($obj->param); // $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
@@ -56,19 +56,19 @@ if ($resql)    // This can fail when class is used on old database (during migra
 		}
 		if ($obj->type != 'separate')
 		{
-		    // If not a computed field
-		    if (empty($obj->fieldcomputed))
-		    {
-    			$this->export_fields_array[$r][$fieldname] = $fieldlabel;
-    			$this->export_TypeFields_array[$r][$fieldname] = $typeFilter;
-    			$this->export_entities_array[$r][$fieldname] = $keyforelement;
-		    }
+			// If not a computed field
+			if (empty($obj->fieldcomputed))
+			{
+				$this->export_fields_array[$r][$fieldname] = $fieldlabel;
+				$this->export_TypeFields_array[$r][$fieldname] = $typeFilter;
+				$this->export_entities_array[$r][$fieldname] = $keyforelement;
+			}
 			// If this is a computed field
 			else {
-			    $this->export_fields_array[$r][$fieldname] = $fieldlabel;
-			    $this->export_TypeFields_array[$r][$fieldname] = $typeFilter.'Compute';
-			    $this->export_special_array[$r][$fieldname] = $obj->fieldcomputed;
-			    $this->export_entities_array[$r][$fieldname] = $keyforelement;
+				$this->export_fields_array[$r][$fieldname] = $fieldlabel;
+				$this->export_TypeFields_array[$r][$fieldname] = $typeFilter.'Compute';
+				$this->export_special_array[$r][$fieldname] = $obj->fieldcomputed;
+				$this->export_entities_array[$r][$fieldname] = $keyforelement;
 			}
 		}
 	}
diff --git a/htdocs/core/filemanagerdol/browser/default/browser.php b/htdocs/core/filemanagerdol/browser/default/browser.php
index 8f7ff82ecff..50bd538078b 100644
--- a/htdocs/core/filemanagerdol/browser/default/browser.php
+++ b/htdocs/core/filemanagerdol/browser/default/browser.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2003-2010 Frederico Caldeira Knabben
  *
  * Source modified from part of fckeditor (http://www.fckeditor.net)
- * retreived as GPL v2 or later
+ * retrieved as GPL v2 or later
  *
  * 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
diff --git a/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php b/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php
index a4e43de9fc8..d2d7a0966ce 100644
--- a/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php
+++ b/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2003-2010 Frederico Caldeira Knabben
  *
  * Source modified from part of fckeditor (http://www.fckeditor.net)
- * retreived as GPL v2 or later
+ * retrieved as GPL v2 or later
  *
  * 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
diff --git a/htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php b/htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php
index ec891285319..5e262b9a32a 100644
--- a/htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php
+++ b/htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2003-2010 Frederico Caldeira Knabben
  *
  * Source modified from part of fckeditor (http://www.fckeditor.net)
- * retreived as GPL v2 or later
+ * retrieved as GPL v2 or later
  *
  * 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
diff --git a/htdocs/core/filemanagerdol/browser/default/frmfolders.php b/htdocs/core/filemanagerdol/browser/default/frmfolders.php
index c2bf1086c2f..b272fd668c4 100644
--- a/htdocs/core/filemanagerdol/browser/default/frmfolders.php
+++ b/htdocs/core/filemanagerdol/browser/default/frmfolders.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2003-2010 Frederico Caldeira Knabben
  *
  * Source modified from part of fckeditor (http://www.fckeditor.net)
- * retreived as GPL v2 or later
+ * retrieved as GPL v2 or later
  *
  * 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
diff --git a/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php b/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php
index a562d30a5a1..5f7f7e1214d 100644
--- a/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php
+++ b/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2003-2010 Frederico Caldeira Knabben
  *
  * Source modified from part of fckeditor (http://www.fckeditor.net)
- * retreived as GPL v2 or later
+ * retrieved as GPL v2 or later
  *
  * 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
@@ -130,7 +130,7 @@ function OpenFile( fileUrl )
     funcNum = GetUrlParam('CKEditorFuncNum');
     //window.top.opener.CKEDITOR.tools.callFunction(funcNum, encodeURI( fileUrl ).replace( '#', '%23' ));
 	window.top.opener.CKEDITOR.tools.callFunction(funcNum, fileUrl.replace( '#', '%23' ));
-    
+
     ///////////////////////////////////
     window.top.close();
     window.top.opener.focus();
diff --git a/htdocs/core/filemanagerdol/browser/default/frmupload.php b/htdocs/core/filemanagerdol/browser/default/frmupload.php
index e0f0f03e430..c82581cc51c 100644
--- a/htdocs/core/filemanagerdol/browser/default/frmupload.php
+++ b/htdocs/core/filemanagerdol/browser/default/frmupload.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2003-2010 Frederico Caldeira Knabben
  *
  * Source modified from part of fckeditor (http://www.fckeditor.net)
- * retreived as GPL v2 or later
+ * retrieved as GPL v2 or later
  *
  * 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
diff --git a/htdocs/core/filemanagerdol/connectors/php/commands.php b/htdocs/core/filemanagerdol/connectors/php/commands.php
index 5590879f8e6..cc6afb4e0e4 100644
--- a/htdocs/core/filemanagerdol/connectors/php/commands.php
+++ b/htdocs/core/filemanagerdol/connectors/php/commands.php
@@ -197,8 +197,8 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
 	$sFileName = '';
 
 	if (isset($_FILES['NewFile']) && !is_null($_FILES['NewFile']['tmp_name'])
-       // This is for the QuickUpload tab box
-        or (isset($_FILES['upload']) && !is_null($_FILES['upload']['tmp_name'])))
+	   // This is for the QuickUpload tab box
+		or (isset($_FILES['upload']) && !is_null($_FILES['upload']['tmp_name'])))
 	{
 		global $Config;
 
@@ -298,16 +298,16 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
 	// @CHANGE
 	//SendUploadResults( $sErrorNumber, $sFileUrl, $sFileName );
 	if ($CKEcallback == '')
-    {
-        // this line already exists so wrap the if block around it
-        SendUploadResults($sErrorNumber, $sFileUrl, $sFileName);
-    } else {
-	    //issue the CKEditor Callback
-        SendCKEditorResults(
+	{
+		// this line already exists so wrap the if block around it
+		SendUploadResults($sErrorNumber, $sFileUrl, $sFileName);
+	} else {
+		//issue the CKEditor Callback
+		SendCKEditorResults(
 			$CKEcallback,
 			$sFileUrl,
 			($sErrorNumber != 0 ? 'Error '.$sErrorNumber.' upload failed.' : 'Upload Successful')
-    	);
+		);
 	}
 
 	exit;
diff --git a/htdocs/core/filemanagerdol/connectors/php/connector.php b/htdocs/core/filemanagerdol/connectors/php/connector.php
index ce38e7c059a..6d67734d3bc 100644
--- a/htdocs/core/filemanagerdol/connectors/php/connector.php
+++ b/htdocs/core/filemanagerdol/connectors/php/connector.php
@@ -42,9 +42,9 @@ DoResponse();
  */
 function DoResponse()
 {
-    if (!isset($_GET)) {
-        global $_GET;
-    }
+	if (!isset($_GET)) {
+		global $_GET;
+	}
 	if (!isset($_GET['Command']) || !isset($_GET['Type']) || !isset($_GET['CurrentFolder']))
 		return;
 
diff --git a/htdocs/core/filemanagerdol/connectors/php/io.php b/htdocs/core/filemanagerdol/connectors/php/io.php
index 2438882604e..5ad0cd1b25e 100644
--- a/htdocs/core/filemanagerdol/connectors/php/io.php
+++ b/htdocs/core/filemanagerdol/connectors/php/io.php
@@ -128,8 +128,8 @@ function ServerMapFolder($resourceType, $folderPath, $sCommand)
  */
 function GetParentFolder($folderPath)
 {
-    $sPattern = "-[/\\\\][^/\\\\]+[/\\\\]?$-";
-    return preg_replace($sPattern, '', $folderPath);
+	$sPattern = "-[/\\\\][^/\\\\]+[/\\\\]?$-";
+	return preg_replace($sPattern, '', $folderPath);
 }
 
 /**
@@ -207,26 +207,26 @@ function CreateServerFolder($folderPath, $lastFolder = null)
  */
 function GetRootPath()
 {
-    if (!isset($_SERVER)) {
-        global $_SERVER;
-    }
-    $sRealPath = realpath('./');
-    // #2124 ensure that no slash is at the end
-    $sRealPath = rtrim($sRealPath, "\\/");
+	if (!isset($_SERVER)) {
+		global $_SERVER;
+	}
+	$sRealPath = realpath('./');
+	// #2124 ensure that no slash is at the end
+	$sRealPath = rtrim($sRealPath, "\\/");
 
-    $sSelfPath = $_SERVER['PHP_SELF'];
-    $sSelfPath = substr($sSelfPath, 0, strrpos($sSelfPath, '/'));
+	$sSelfPath = $_SERVER['PHP_SELF'];
+	$sSelfPath = substr($sSelfPath, 0, strrpos($sSelfPath, '/'));
 
-    $sSelfPath = str_replace('/', DIRECTORY_SEPARATOR, $sSelfPath);
+	$sSelfPath = str_replace('/', DIRECTORY_SEPARATOR, $sSelfPath);
 
-    $position = strpos($sRealPath, $sSelfPath);
+	$position = strpos($sRealPath, $sSelfPath);
 
-    // This can check only that this script isn't run from a virtual dir
-    // But it avoids the problems that arise if it isn't checked
-    if ($position === false || $position <> strlen($sRealPath) - strlen($sSelfPath))
-        SendError(1, 'Sorry, can\'t map "UserFilesPath" to a physical path. You must set the "UserFilesAbsolutePath" value in "editor/filemanager/connectors/php/config.php".');
+	// This can check only that this script isn't run from a virtual dir
+	// But it avoids the problems that arise if it isn't checked
+	if ($position === false || $position <> strlen($sRealPath) - strlen($sSelfPath))
+		SendError(1, 'Sorry, can\'t map "UserFilesPath" to a physical path. You must set the "UserFilesAbsolutePath" value in "editor/filemanager/connectors/php/config.php".');
 
-    return substr($sRealPath, 0, $position);
+	return substr($sRealPath, 0, $position);
 }
 
 /**
@@ -236,15 +236,15 @@ function GetRootPath()
  */
 function Server_MapPath($path)
 {
-    // This function is available only for Apache
-    if (function_exists('apache_lookup_uri')) {
-        $info = apache_lookup_uri($path);
-        return $info->filename.$info->path_info;
-    }
+	// This function is available only for Apache
+	if (function_exists('apache_lookup_uri')) {
+		$info = apache_lookup_uri($path);
+		return $info->filename.$info->path_info;
+	}
 
-    // This isn't correct but for the moment there's no other solution
-    // If this script is under a virtual directory or symlink it will detect the problem and stop
-    return GetRootPath().$path;
+	// This isn't correct but for the moment there's no other solution
+	// If this script is under a virtual directory or symlink it will detect the problem and stop
+	return GetRootPath().$path;
 }
 
 /**
@@ -415,11 +415,11 @@ EOF;
  */
 function SendCKEditorResults($callback, $sFileUrl, $customMsg = '')
 {
-    echo '<script type="text/javascript">';
+	echo '<script type="text/javascript">';
 
-    $rpl = array('\\' => '\\\\', '"' => '\\"');
+	$rpl = array('\\' => '\\\\', '"' => '\\"');
 
-    echo 'window.parent.CKEDITOR.tools.callFunction("'.$callback.'","'.strtr($sFileUrl, $rpl).'", "'.strtr($customMsg, $rpl).'");';
+	echo 'window.parent.CKEDITOR.tools.callFunction("'.$callback.'","'.strtr($sFileUrl, $rpl).'", "'.strtr($customMsg, $rpl).'");';
 
-    echo '</script>';
+	echo '</script>';
 }
diff --git a/htdocs/core/filemanagerdol/connectors/php/util.php b/htdocs/core/filemanagerdol/connectors/php/util.php
index b8caad99ee3..beec251f40e 100644
--- a/htdocs/core/filemanagerdol/connectors/php/util.php
+++ b/htdocs/core/filemanagerdol/connectors/php/util.php
@@ -59,7 +59,7 @@ function FindBadUtf8($string)
 	$regex = '([\x00-\x7F]|[\xC2-\xDF][\x80-\xBF]|\xE0[\xA0-\xBF][\x80-\xBF]|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}|\xED[\x80-\x9F][\x80-\xBF]';
 	$regex .= '|\xF0[\x90-\xBF][\x80-\xBF]{2}|[\xF1-\xF3][\x80-\xBF]{3}|\xF4[\x80-\x8F][\x80-\xBF]{2}|(.{1}))';
 
-	$matches =array();
+	$matches = array();
 	while (preg_match('/'.$regex.'/S', $string, $matches)) {
 		if (isset($matches[2])) {
 			return true;
diff --git a/htdocs/core/get_info.php b/htdocs/core/get_info.php
index 48b957b9e8a..a91d5a6afec 100644
--- a/htdocs/core/get_info.php
+++ b/htdocs/core/get_info.php
@@ -60,8 +60,6 @@ print '<body>'."\n";
 print '<div style="padding: 20px;">';
 //print '<br>';
 
-$nbofsearch = 0;
-
 // Define link to login card
 $appli = constant('DOL_APPLICATION_TITLE');
 if (!empty($conf->global->MAIN_APPLICATION_TITLE))
@@ -117,6 +115,11 @@ if (is_numeric($result))
 	else $toprightmenu = $hookmanager->resPrint; // replace
 } else $toprightmenu .= $result; // For backward compatibility
 
+if (!isset($form) || !is_object($form)) {
+	include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+	$form = new Form($db);
+}
+
 // Link to module builder
 if (!empty($conf->modulebuilder->enabled))
 {
@@ -124,7 +127,7 @@ if (!empty($conf->modulebuilder->enabled))
 	//$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
 	$text .= '<span class="fa fa-bug atoplogin"></span>';
 	$text .= '</a>';
-	$toprightmenu .= @Form::textwithtooltip('', $langs->trans("ModuleBuilder"), 2, 1, $text, 'login_block_elem', 2);
+	$toprightmenu .= $form->textwithtooltip('', $langs->trans("ModuleBuilder"), 2, 1, $text, 'login_block_elem', 2);
 }
 
 // Link to print main content area
@@ -144,7 +147,7 @@ if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->global->MAIN_OP
 	//$text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"');
 	$text.='<span class="fa fa-print atoplogin"></span>';
 	$text.='</a>';
-	$toprightmenu.=@Form::textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'login_block_elem',2);
+	$toprightmenu .= $form->textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'login_block_elem',2);
 }
 */
 
@@ -183,13 +186,13 @@ if (empty($conf->global->MAIN_HELP_DISABLELINK) && empty($conf->global->MAIN_OPT
 		//if ($mode == 'wiki') $text.=' ('.dol_trunc(strtr($helppage,'_',' '),8).')';
 		$text.='</a>';
 		//$toprightmenu.='</div>'."\n";
-		$toprightmenu.=@Form::textwithtooltip('',$title,2,1,$text,'login_block_elem',2);
+		$toprightmenu .= $form->textwithtooltip('',$title,2,1,$text,'login_block_elem',2);
 	}
 }
 */
 
 // Logout link
-if (GETPOST('withlogout', 'int')) $toprightmenu .= @Form::textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem', 2);
+if (GETPOST('withlogout', 'int')) $toprightmenu .= $form->textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem', 2);
 
 $toprightmenu .= '</div>';
 
diff --git a/htdocs/core/get_menudiv.php b/htdocs/core/get_menudiv.php
index 78a96484751..c64006439bc 100644
--- a/htdocs/core/get_menudiv.php
+++ b/htdocs/core/get_menudiv.php
@@ -32,13 +32,13 @@ if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
 //if (! defined('NOLOGIN')) define('NOLOGIN',1);					// Not disabled cause need to load personalized language
 if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', 1);
 if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', 1);
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', 1);
 
 if (!defined('DISABLE_JQUERY_TABLEDND'))   define('DISABLE_JQUERY_TABLEDND', 1);
 if (!defined('DISABLE_JQUERY_JNOTIFY'))    define('DISABLE_JQUERY_JNOTIFY', 1);
 if (!defined('DISABLE_JQUERY_FLOT'))       define('DISABLE_JQUERY_FLOT', 1);
 if (!defined('DISABLE_JQUERY_JEDITABLE'))  define('DISABLE_JQUERY_JEDITABLE', 1);
 if (!defined('DISABLE_CKEDITOR'))          define('DISABLE_CKEDITOR', 1);
-if (!defined('DISABLE_BROWSER_NOTIF'))     define('DISABLE_BROWSER_NOTIF', 1);
 if (!defined('DISABLE_DATE_PICKER'))       define('DISABLE_DATE_PICKER', 1);
 if (!defined('DISABLE_SELECT2'))           define('DISABLE_SELECT2', 1);
 
@@ -184,7 +184,7 @@ if (empty($user->socid))	// If internal user or not defined
 
 // Load the menu manager (only if not already done)
 $file_menu = $conf->standard_menu;
-if (GETPOST('menu', 'aZ09')) $file_menu = GETPOST('menu', 'aZ09');     // example: menu=eldy_menu.php
+if (GETPOST('menu', 'aZ09')) $file_menu = GETPOST('menu', 'aZ09'); // example: menu=eldy_menu.php
 if (!class_exists('MenuManager'))
 {
 	$menufound = 0;
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index b71dfc3eeb2..382f12840d7 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -1105,7 +1105,7 @@ function price2numjs(amount) {
 
 <?php
 if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && !defined('DISABLE_JQUERY_JNOTIFY')) {
-    ?>
+	?>
 // Defined properties for JNotify
 $(document).ready(function() {
 	if (typeof $.jnotify == 'function')
@@ -1135,7 +1135,7 @@ $(document).ready(function() {
 	if (window.location !== window.parent.location ) {
 		console.log("Page is detected to be into an iframe, we hide by CSS the menus");
 		// The page is in an iframe
-		jQuery(".side-nav-vert, .side-nav").hide();
+		jQuery(".side-nav-vert, .side-nav, .websitebar").hide();
 		jQuery(".id-container").css('width', '100%');
 
 	}
diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
index a95e3556405..d404e09b578 100644
--- a/htdocs/core/js/lib_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -30,17 +30,17 @@ if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
 require_once '../../main.inc.php';
 
 if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/index.php'
-    || preg_match('/getmenu_div\.php/', $_SERVER['HTTP_REFERER'])))
+	|| preg_match('/getmenu_div\.php/', $_SERVER['HTTP_REFERER'])))
 {
-    global $langs, $conf;
+	global $langs, $conf;
 
-    top_httphead('text/javascript; charset=UTF-8');
+	top_httphead('text/javascript; charset=UTF-8');
 
-    print 'var login = \''.$_SESSION['dol_login'].'\';'."\n";
+	print 'var login = \''.$_SESSION['dol_login'].'\';'."\n";
 	print 'var nowtime = Date.now();';
-    print 'var time_auto_update = '.$conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY.';'."\n"; // Always defined
-    print 'var time_js_next_test;'."\n";
-    ?>
+	print 'var time_auto_update = '.$conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY.';'."\n"; // Always defined
+	print 'var time_js_next_test;'."\n";
+	?>
 
 	/* Check if permission ok */
 	if (Notification.permission !== "granted") {
@@ -51,7 +51,7 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP
 	/* Launch timer */
    	// We set a delay before launching first test so next check will arrive after the time_auto_update compared to previous one.
     //var time_first_execution = (time_auto_update + (time_js_next_test - nowtime)) * 1000;	//need milliseconds
-    var time_first_execution = <?php echo max(3, $conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION); ?>;
+    var time_first_execution = <?php echo max(3, empty($conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION) ? 0 : $conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION); ?>;
     if (login != '') {
     	setTimeout(first_execution, time_first_execution * 1000);
         time_js_next_test = nowtime + time_first_execution;
@@ -77,10 +77,10 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP
                 data: { time_js_next_test: time_js_next_test, forcechecknow: 1, token: 'notrequired' },
                 dataType: "json",
                 success: function (result) {
-                	console.log(result);
+                	//console.log(result);
                     var arrayofpastreminders = Object.values(result.pastreminders);
-                    console.log("arrayofpastreminders.length"+arrayofpastreminders.length);
                     if (arrayofpastreminders && arrayofpastreminders.length > 0) {
+	                    console.log("Retrieved "+arrayofpastreminders.length+" reminders to do.");
                     	var audio = null;
                         <?php
 						if (!empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) {
@@ -105,8 +105,8 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP
 
                             if (value.type == 'agenda')
                             {
-                             	url = '<?php echo DOL_URL_ROOT.'/comm/action/card.php?id='; ?>' + value.id_agenda;
-                                title = '<?php print $langs->trans('EventReminder') ?>';
+                             	url = '<?php print DOL_URL_ROOT.'/comm/action/card.php?id='; ?>' + value.id_agenda;
+                                title = '<?php print dol_escape_js($langs->trans('EventReminder')) ?>';
                             }
                             var extra = {
                                 icon: '<?php print DOL_URL_ROOT.'/theme/common/bell.png'; ?>',
@@ -145,7 +145,7 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP
 			                data: { time_js_next_test: time_js_next_test, token: 'notrequired' }
 			            });
                     } else {
-                    	console.log("No past reminder found, next try at "+time_js_next_test);
+                    	console.log("No reminder to do found, next search at "+time_js_next_test);
                     }
                 }
             });
diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index 683d3a87401..20ffa3f52b6 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -188,7 +188,7 @@ function journalHead($nom, $variante, $period, $periodlink, $description, $build
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].$varlink.'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 
-	dol_fiche_head($head, 'journal');
+	print dol_get_fiche_head($head, 'journal');
 
 	foreach ($moreparam as $key => $value)
 	{
@@ -235,7 +235,7 @@ function journalHead($nom, $variante, $period, $periodlink, $description, $build
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center"><input type="submit" class="button" name="submit" value="'.$langs->trans("Refresh").'"></div>';
 
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 9227d9a1cfd..13f59c45ba8 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -35,17 +35,23 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
  */
 function versiontostring($versionarray)
 {
-    $string = '?';
-    if (isset($versionarray[0])) $string = $versionarray[0];
-    if (isset($versionarray[1])) $string .= '.'.$versionarray[1];
-    if (isset($versionarray[2])) $string .= '.'.$versionarray[2];
-    return $string;
+	$string = '?';
+	if (isset($versionarray[0])) {
+		$string = $versionarray[0];
+	}
+	if (isset($versionarray[1])) {
+		$string .= '.'.$versionarray[1];
+	}
+	if (isset($versionarray[2])) {
+		$string .= '.'.$versionarray[2];
+	}
+	return $string;
 }
 
 /**
  *	Compare 2 versions (stored into 2 arrays).
  *  To check if Dolibarr version is lower than (x,y,z), do "if versioncompare(versiondolibarrarray(), array(x.y.z)) <= 0"
- *  For example: if (versioncompare(versiondolibarrarray(),array(4,0,-4)) >= 0) is true if version is 4.0 alpha or higher.
+ *  For example: if (versioncompare(versiondolibarrarray(),array(4,0,-5)) >= 0) is true if version is 4.0 alpha or higher.
  *  For example: if (versioncompare(versiondolibarrarray(),array(4,0,0)) >= 0) is true if version is 4.0 final or higher.
  *  For example: if (versioncompare(versiondolibarrarray(),array(4,0,1)) >= 0) is true if version is 4.0.1 or higher.
  *  Alternative way to compare: if ((float) DOL_VERSION >= 4.0) is true if version is 4.0 alpha or higher (works only to compare first and second level)
@@ -59,32 +65,55 @@ function versiontostring($versionarray)
  */
 function versioncompare($versionarray1, $versionarray2)
 {
-    $ret = 0;
-    $level = 0;
-    $count1 = count($versionarray1);
-    $count2 = count($versionarray2);
-    $maxcount = max($count1, $count2);
-    while ($level < $maxcount)
-    {
-        $operande1 = isset($versionarray1[$level]) ? $versionarray1[$level] : 0;
-        $operande2 = isset($versionarray2[$level]) ? $versionarray2[$level] : 0;
-        if (preg_match('/alpha|dev/i', $operande1)) $operande1 = -5;
-        if (preg_match('/alpha|dev/i', $operande2)) $operande2 = -5;
-        if (preg_match('/beta$/i', $operande1)) $operande1 = -4;
-        if (preg_match('/beta$/i', $operande2)) $operande2 = -4;
-        if (preg_match('/beta([0-9])+/i', $operande1)) $operande1 = -3;
-        if (preg_match('/beta([0-9])+/i', $operande2)) $operande2 = -3;
-        if (preg_match('/rc$/i', $operande1)) $operande1 = -2;
-        if (preg_match('/rc$/i', $operande2)) $operande2 = -2;
-        if (preg_match('/rc([0-9])+/i', $operande1)) $operande1 = -1;
-        if (preg_match('/rc([0-9])+/i', $operande2)) $operande2 = -1;
-        $level++;
-        //print 'level '.$level.' '.$operande1.'-'.$operande2.'<br>';
-        if ($operande1 < $operande2) { $ret = -$level; break; }
-        if ($operande1 > $operande2) { $ret = $level; break; }
-    }
-    //print join('.',$versionarray1).'('.count($versionarray1).') / '.join('.',$versionarray2).'('.count($versionarray2).') => '.$ret.'<br>'."\n";
-    return $ret;
+	$ret = 0;
+	$level = 0;
+	$count1 = count($versionarray1);
+	$count2 = count($versionarray2);
+	$maxcount = max($count1, $count2);
+	while ($level < $maxcount) {
+		$operande1 = isset($versionarray1[$level]) ? $versionarray1[$level] : 0;
+		$operande2 = isset($versionarray2[$level]) ? $versionarray2[$level] : 0;
+		if (preg_match('/alpha|dev/i', $operande1)) {
+			$operande1 = -5;
+		}
+		if (preg_match('/alpha|dev/i', $operande2)) {
+			$operande2 = -5;
+		}
+		if (preg_match('/beta$/i', $operande1)) {
+			$operande1 = -4;
+		}
+		if (preg_match('/beta$/i', $operande2)) {
+			$operande2 = -4;
+		}
+		if (preg_match('/beta([0-9])+/i', $operande1)) {
+			$operande1 = -3;
+		}
+		if (preg_match('/beta([0-9])+/i', $operande2)) {
+			$operande2 = -3;
+		}
+		if (preg_match('/rc$/i', $operande1)) {
+			$operande1 = -2;
+		}
+		if (preg_match('/rc$/i', $operande2)) {
+			$operande2 = -2;
+		}
+		if (preg_match('/rc([0-9])+/i', $operande1)) {
+			$operande1 = -1;
+		}
+		if (preg_match('/rc([0-9])+/i', $operande2)) {
+			$operande2 = -1;
+		}
+		$level++;
+		//print 'level '.$level.' '.$operande1.'-'.$operande2.'<br>';
+		if ($operande1 < $operande2) {
+			$ret = -$level; break;
+		}
+		if ($operande1 > $operande2) {
+			$ret = $level; break;
+		}
+	}
+	//print join('.',$versionarray1).'('.count($versionarray1).') / '.join('.',$versionarray2).'('.count($versionarray2).') => '.$ret.'<br>'."\n";
+	return $ret;
 }
 
 
@@ -95,7 +124,7 @@ function versioncompare($versionarray1, $versionarray2)
  */
 function versionphparray()
 {
-    return explode('.', PHP_VERSION);
+	return explode('.', PHP_VERSION);
 }
 
 /**
@@ -105,7 +134,7 @@ function versionphparray()
  */
 function versiondolibarrarray()
 {
-    return explode('.', DOL_VERSION);
+	return explode('.', DOL_VERSION);
 }
 
 
@@ -131,246 +160,255 @@ function versiondolibarrarray()
  */
 function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handler = '', $okerror = 'default', $linelengthlimit = 32768, $nocommentremoval = 0, $offsetforchartofaccount = 0)
 {
-    global $db, $conf, $langs, $user;
+	global $db, $conf, $langs, $user;
 
-    dol_syslog("Admin.lib::run_sql run sql file ".$sqlfile." silent=".$silent." entity=".$entity." usesavepoint=".$usesavepoint." handler=".$handler." okerror=".$okerror, LOG_DEBUG);
+	dol_syslog("Admin.lib::run_sql run sql file ".$sqlfile." silent=".$silent." entity=".$entity." usesavepoint=".$usesavepoint." handler=".$handler." okerror=".$okerror, LOG_DEBUG);
 
-    if (!is_numeric($linelengthlimit))
-    {
-    	dol_syslog("Admin.lib::run_sql param linelengthlimit is not a numeric", LOG_ERR);
-    	return -1;
-    }
+	if (!is_numeric($linelengthlimit)) {
+		dol_syslog("Admin.lib::run_sql param linelengthlimit is not a numeric", LOG_ERR);
+		return -1;
+	}
 
-    $ok = 0;
-    $error = 0;
-    $i = 0;
-    $buffer = '';
-    $arraysql = array();
+	$ok = 0;
+	$error = 0;
+	$i = 0;
+	$buffer = '';
+	$arraysql = array();
 
-    // Get version of database
-    $versionarray = $db->getVersionArray();
+	// Get version of database
+	$versionarray = $db->getVersionArray();
 
-    $fp = fopen($sqlfile, "r");
-    if ($fp)
-    {
-        while (!feof($fp))
-        {
-        	// Warning fgets with second parameter that is null or 0 hang.
-        	if ($linelengthlimit > 0) $buf = fgets($fp, $linelengthlimit);
-        	else $buf = fgets($fp);
+	$fp = fopen($sqlfile, "r");
+	if ($fp) {
+		while (!feof($fp)) {
+			// Warning fgets with second parameter that is null or 0 hang.
+			if ($linelengthlimit > 0) {
+				$buf = fgets($fp, $linelengthlimit);
+			} else {
+				$buf = fgets($fp);
+			}
 
-            // Test if request must be ran only for particular database or version (if yes, we must remove the -- comment)
-            $reg = array();
-            if (preg_match('/^--\sV(MYSQL|PGSQL)([^\s]*)/i', $buf, $reg))
-            {
-            	$qualified = 1;
+			// Test if request must be ran only for particular database or version (if yes, we must remove the -- comment)
+			$reg = array();
+			if (preg_match('/^--\sV(MYSQL|PGSQL)([^\s]*)/i', $buf, $reg)) {
+				$qualified = 1;
 
-            	// restrict on database type
-            	if (!empty($reg[1]))
-            	{
-            		if (!preg_match('/'.preg_quote($reg[1]).'/i', $db->type)) $qualified = 0;
-            	}
+				// restrict on database type
+				if (!empty($reg[1])) {
+					if (!preg_match('/'.preg_quote($reg[1]).'/i', $db->type)) {
+						$qualified = 0;
+					}
+				}
 
-            	// restrict on version
-            	if ($qualified)
-            	{
-            		if (!empty($reg[2]))
-            		{
-            			if (is_numeric($reg[2]))	// This is a version
-            			{
-			                $versionrequest = explode('.', $reg[2]);
-			                //print var_dump($versionrequest);
-			                //print var_dump($versionarray);
-			                if (!count($versionrequest) || !count($versionarray) || versioncompare($versionrequest, $versionarray) > 0)
-			                {
-			                	$qualified = 0;
-			                }
-            			} else // This is a test on a constant. For example when we have -- VMYSQLUTF8UNICODE, we test constant $conf->global->UTF8UNICODE
-            			{
-            				$dbcollation = strtoupper(preg_replace('/_/', '', $conf->db->dolibarr_main_db_collation));
-            				//var_dump($reg[2]);
-            				//var_dump($dbcollation);
-            				if (empty($conf->db->dolibarr_main_db_collation) || ($reg[2] != $dbcollation)) $qualified = 0;
-            				//var_dump($qualified);
-            			}
-            		}
-            	}
+				// restrict on version
+				if ($qualified) {
+					if (!empty($reg[2])) {
+						if (is_numeric($reg[2])) {	// This is a version
+							$versionrequest = explode('.', $reg[2]);
+							//print var_dump($versionrequest);
+							//print var_dump($versionarray);
+							if (!count($versionrequest) || !count($versionarray) || versioncompare($versionrequest, $versionarray) > 0) {
+								$qualified = 0;
+							}
+						} else // This is a test on a constant. For example when we have -- VMYSQLUTF8UNICODE, we test constant $conf->global->UTF8UNICODE
+						{
+							$dbcollation = strtoupper(preg_replace('/_/', '', $conf->db->dolibarr_main_db_collation));
+							//var_dump($reg[2]);
+							//var_dump($dbcollation);
+							if (empty($conf->db->dolibarr_main_db_collation) || ($reg[2] != $dbcollation)) {
+								$qualified = 0;
+							}
+							//var_dump($qualified);
+						}
+					}
+				}
 
-                if ($qualified)
-                {
-                    // Version qualified, delete SQL comments
-                    $buf = preg_replace('/^--\sV(MYSQL|PGSQL)([^\s]*)/i', '', $buf);
-                    //print "Ligne $i qualifi?e par version: ".$buf.'<br>';
-                }
-            }
+				if ($qualified) {
+					// Version qualified, delete SQL comments
+					$buf = preg_replace('/^--\sV(MYSQL|PGSQL)([^\s]*)/i', '', $buf);
+					//print "Ligne $i qualifi?e par version: ".$buf.'<br>';
+				}
+			}
 
-            // Add line buf to buffer if not a comment
-            if ($nocommentremoval || !preg_match('/^\s*--/', $buf))
-            {
-            	if (empty($nocommentremoval)) $buf = preg_replace('/([,;ERLT\)])\s*--.*$/i', '\1', $buf); //remove comment from a line that not start with -- before add it to the buffer
-                $buffer .= trim($buf);
-            }
+			// Add line buf to buffer if not a comment
+			if ($nocommentremoval || !preg_match('/^\s*--/', $buf)) {
+				if (empty($nocommentremoval)) {
+					$buf = preg_replace('/([,;ERLT\)])\s*--.*$/i', '\1', $buf); //remove comment from a line that not start with -- before add it to the buffer
+				}
+				$buffer .= trim($buf);
+			}
 
-            //print $buf.'<br>';exit;
+			//print $buf.'<br>';exit;
 
-            if (preg_match('/;/', $buffer))	// If string contains ';', it's end of a request string, we save it in arraysql.
-            {
-                // Found new request
-                if ($buffer) $arraysql[$i] = $buffer;
-                $i++;
-                $buffer = '';
-            }
-        }
+			if (preg_match('/;/', $buffer)) {	// If string contains ';', it's end of a request string, we save it in arraysql.
+				// Found new request
+				if ($buffer) {
+					$arraysql[$i] = $buffer;
+				}
+				$i++;
+				$buffer = '';
+			}
+		}
 
-        if ($buffer) $arraysql[$i] = $buffer;
-        fclose($fp);
-    } else {
-        dol_syslog("Admin.lib::run_sql failed to open file ".$sqlfile, LOG_ERR);
-    }
+		if ($buffer) {
+			$arraysql[$i] = $buffer;
+		}
+		fclose($fp);
+	} else {
+		dol_syslog("Admin.lib::run_sql failed to open file ".$sqlfile, LOG_ERR);
+	}
 
-    // Loop on each request to see if there is a __+MAX_table__ key
-    $listofmaxrowid = array(); // This is a cache table
-    foreach ($arraysql as $i => $sql)
-    {
-        $newsql = $sql;
+	// Loop on each request to see if there is a __+MAX_table__ key
+	$listofmaxrowid = array(); // This is a cache table
+	foreach ($arraysql as $i => $sql) {
+		$newsql = $sql;
 
-        // Replace __+MAX_table__ with max of table
-        while (preg_match('/__\+MAX_([A-Za-z0-9_]+)__/i', $newsql, $reg))
-        {
-            $table = $reg[1];
-            if (!isset($listofmaxrowid[$table]))
-            {
-                //var_dump($db);
-                $sqlgetrowid = 'SELECT MAX(rowid) as max from '.preg_replace('/^llx_/', MAIN_DB_PREFIX, $table);
-                $resql = $db->query($sqlgetrowid);
-                if ($resql)
-                {
-                    $obj = $db->fetch_object($resql);
-                    $listofmaxrowid[$table] = $obj->max;
-                    if (empty($listofmaxrowid[$table])) $listofmaxrowid[$table] = 0;
-                } else {
-                    if (!$silent) print '<tr><td class="tdtop" colspan="2">';
-                    if (!$silent) print '<div class="error">'.$langs->trans("Failed to get max rowid for ".$table)."</div></td>";
-                    if (!$silent) print '</tr>';
-                    $error++;
-                    break;
-                }
-            }
-            // Replace __+MAX_llx_table__ with +999
-            $from = '__+MAX_'.$table.'__';
-            $to = '+'.$listofmaxrowid[$table];
-            $newsql = str_replace($from, $to, $newsql);
-            dol_syslog('Admin.lib::run_sql New Request '.($i + 1).' (replacing '.$from.' to '.$to.')', LOG_DEBUG);
+		// Replace __+MAX_table__ with max of table
+		while (preg_match('/__\+MAX_([A-Za-z0-9_]+)__/i', $newsql, $reg)) {
+			$table = $reg[1];
+			if (!isset($listofmaxrowid[$table])) {
+				//var_dump($db);
+				$sqlgetrowid = 'SELECT MAX(rowid) as max from '.preg_replace('/^llx_/', MAIN_DB_PREFIX, $table);
+				$resql = $db->query($sqlgetrowid);
+				if ($resql) {
+					$obj = $db->fetch_object($resql);
+					$listofmaxrowid[$table] = $obj->max;
+					if (empty($listofmaxrowid[$table])) {
+						$listofmaxrowid[$table] = 0;
+					}
+				} else {
+					if (!$silent) {
+						print '<tr><td class="tdtop" colspan="2">';
+					}
+					if (!$silent) {
+						print '<div class="error">'.$langs->trans("Failed to get max rowid for ".$table)."</div></td>";
+					}
+					if (!$silent) {
+						print '</tr>';
+					}
+					$error++;
+					break;
+				}
+			}
+			// Replace __+MAX_llx_table__ with +999
+			$from = '__+MAX_'.$table.'__';
+			$to = '+'.$listofmaxrowid[$table];
+			$newsql = str_replace($from, $to, $newsql);
+			dol_syslog('Admin.lib::run_sql New Request '.($i + 1).' (replacing '.$from.' to '.$to.')', LOG_DEBUG);
 
-            $arraysql[$i] = $newsql;
-        }
+			$arraysql[$i] = $newsql;
+		}
 
-        if ($offsetforchartofaccount > 0)
-        {
-        	// Replace lines
-        	// 'INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1401, 'PCG99-ABREGE', 'CAPIT', '1234', 1400, '...', 1);'
-        	// with
-            // 'INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1401 + 200100000, 'PCG99-ABREGE','CAPIT', '1234', 1400 + 200100000, '...', 1);'
-            // Note: string with 1234 instead of '1234' is also supported
-        	$newsql = preg_replace('/VALUES\s*\(__ENTITY__, \s*(\d+)\s*,(\s*\'[^\',]*\'\s*,\s*\'[^\',]*\'\s*,\s*\'?[^\',]*\'?\s*),\s*\'?([^\',]*)\'?/ims', 'VALUES (__ENTITY__, \1 + '.$offsetforchartofaccount.', \2, \3 + '.$offsetforchartofaccount, $newsql);
-        	$newsql = preg_replace('/([,\s])0 \+ '.$offsetforchartofaccount.'/ims', '\1 0', $newsql);
-        	//var_dump($newsql);
-        	$arraysql[$i] = $newsql;
-        }
-    }
+		if ($offsetforchartofaccount > 0) {
+			// Replace lines
+			// 'INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1401, 'PCG99-ABREGE', 'CAPIT', '1234', 1400, '...', 1);'
+			// with
+			// 'INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1401 + 200100000, 'PCG99-ABREGE','CAPIT', '1234', 1400 + 200100000, '...', 1);'
+			// Note: string with 1234 instead of '1234' is also supported
+			$newsql = preg_replace('/VALUES\s*\(__ENTITY__, \s*(\d+)\s*,(\s*\'[^\',]*\'\s*,\s*\'[^\',]*\'\s*,\s*\'?[^\',]*\'?\s*),\s*\'?([^\',]*)\'?/ims', 'VALUES (__ENTITY__, \1 + '.$offsetforchartofaccount.', \2, \3 + '.$offsetforchartofaccount, $newsql);
+			$newsql = preg_replace('/([,\s])0 \+ '.$offsetforchartofaccount.'/ims', '\1 0', $newsql);
+			//var_dump($newsql);
+			$arraysql[$i] = $newsql;
+		}
+	}
 
-    // Loop on each request to execute request
-    $cursorinsert = 0;
-    $listofinsertedrowid = array();
-    foreach ($arraysql as $i => $sql)
-    {
-        if ($sql)
-        {
-        	// Replace the prefix tables
-        	if (MAIN_DB_PREFIX != 'llx_')
-        	{
-        		$sql = preg_replace('/llx_/i', MAIN_DB_PREFIX, $sql);
-        	}
+	// Loop on each request to execute request
+	$cursorinsert = 0;
+	$listofinsertedrowid = array();
+	foreach ($arraysql as $i => $sql) {
+		if ($sql) {
+			// Replace the prefix tables
+			if (MAIN_DB_PREFIX != 'llx_') {
+				$sql = preg_replace('/llx_/i', MAIN_DB_PREFIX, $sql);
+			}
 
-            if (!empty($handler)) $sql = preg_replace('/__HANDLER__/i', "'".$db->escape($handler)."'", $sql);
+			if (!empty($handler)) {
+				$sql = preg_replace('/__HANDLER__/i', "'".$db->escape($handler)."'", $sql);
+			}
 
-            $newsql = preg_replace('/__ENTITY__/i', (!empty($entity) ? $entity : $conf->entity), $sql);
+			$newsql = preg_replace('/__ENTITY__/i', (!empty($entity) ? $entity : $conf->entity), $sql);
 
-            // Ajout trace sur requete (eventuellement a commenter si beaucoup de requetes)
-            if (!$silent) print '<tr><td class="tdtop">'.$langs->trans("Request").' '.($i + 1)." sql='".dol_htmlentities($newsql, ENT_NOQUOTES)."'</td></tr>\n";
-            dol_syslog('Admin.lib::run_sql Request '.($i + 1), LOG_DEBUG);
+			// Add log of request
+			if (!$silent) {
+				print '<tr class="trforrunsql"><td class="tdtop opacitymedium">'.$langs->trans("Request").' '.($i + 1)." sql='".dol_htmlentities($newsql, ENT_NOQUOTES)."'</td></tr>\n";
+			}
+			dol_syslog('Admin.lib::run_sql Request '.($i + 1), LOG_DEBUG);
 			$sqlmodified = 0;
 
-            // Replace for encrypt data
-            if (preg_match_all('/__ENCRYPT\(\'([^\']+)\'\)__/i', $newsql, $reg))
-            {
-                $num = count($reg[0]);
+			// Replace for encrypt data
+			if (preg_match_all('/__ENCRYPT\(\'([^\']+)\'\)__/i', $newsql, $reg)) {
+				$num = count($reg[0]);
 
-                for ($j = 0; $j < $num; $j++)
-                {
-                    $from = $reg[0][$j];
-                    $to = $db->encrypt($reg[1][$j], 1);
-                    $newsql = str_replace($from, $to, $newsql);
-                }
-                $sqlmodified++;
-            }
+				for ($j = 0; $j < $num; $j++) {
+					$from = $reg[0][$j];
+					$to = $db->encrypt($reg[1][$j], 1);
+					$newsql = str_replace($from, $to, $newsql);
+				}
+				$sqlmodified++;
+			}
 
-            // Replace for decrypt data
-            if (preg_match_all('/__DECRYPT\(\'([A-Za-z0-9_]+)\'\)__/i', $newsql, $reg))
-            {
-                $num = count($reg[0]);
+			// Replace for decrypt data
+			if (preg_match_all('/__DECRYPT\(\'([A-Za-z0-9_]+)\'\)__/i', $newsql, $reg)) {
+				$num = count($reg[0]);
 
-                for ($j = 0; $j < $num; $j++)
-                {
-                    $from = $reg[0][$j];
-                    $to = $db->decrypt($reg[1][$j]);
-                    $newsql = str_replace($from, $to, $newsql);
-                }
-                $sqlmodified++;
-            }
+				for ($j = 0; $j < $num; $j++) {
+					$from = $reg[0][$j];
+					$to = $db->decrypt($reg[1][$j]);
+					$newsql = str_replace($from, $to, $newsql);
+				}
+				$sqlmodified++;
+			}
 
-            // Replace __x__ with rowid of insert nb x
-            while (preg_match('/__([0-9]+)__/', $newsql, $reg))
-            {
-                $cursor = $reg[1];
-                if (empty($listofinsertedrowid[$cursor]))
-                {
-                    if (!$silent) print '<tr><td class="tdtop" colspan="2">';
-                    if (!$silent) print '<div class="error">'.$langs->trans("FileIsNotCorrect")."</div></td>";
-                    if (!$silent) print '</tr>';
-                    $error++;
-                    break;
-                }
-                $from = '__'.$cursor.'__';
-                $to = $listofinsertedrowid[$cursor];
-                $newsql = str_replace($from, $to, $newsql);
-                $sqlmodified++;
-            }
+			// Replace __x__ with rowid of insert nb x
+			while (preg_match('/__([0-9]+)__/', $newsql, $reg)) {
+				$cursor = $reg[1];
+				if (empty($listofinsertedrowid[$cursor])) {
+					if (!$silent) {
+						print '<tr><td class="tdtop" colspan="2">';
+					}
+					if (!$silent) {
+						print '<div class="error">'.$langs->trans("FileIsNotCorrect")."</div></td>";
+					}
+					if (!$silent) {
+						print '</tr>';
+					}
+					$error++;
+					break;
+				}
+				$from = '__'.$cursor.'__';
+				$to = $listofinsertedrowid[$cursor];
+				$newsql = str_replace($from, $to, $newsql);
+				$sqlmodified++;
+			}
 
-            if ($sqlmodified) dol_syslog('Admin.lib::run_sql New Request '.($i + 1), LOG_DEBUG);
+			if ($sqlmodified) {
+				dol_syslog('Admin.lib::run_sql New Request '.($i + 1), LOG_DEBUG);
+			}
 
-            $result = $db->query($newsql, $usesavepoint);
-            if ($result)
-            {
-                if (!$silent) print '<!-- Result = OK -->'."\n";
+			$result = $db->query($newsql, $usesavepoint);
+			if ($result) {
+				if (!$silent) {
+					print '<!-- Result = OK -->'."\n";
+				}
 
-                if (preg_replace('/insert into ([^\s]+)/i', $newsql, $reg))
-                {
-                    $cursorinsert++;
+				if (preg_replace('/insert into ([^\s]+)/i', $newsql, $reg)) {
+					$cursorinsert++;
 
-                    // It's an insert
-                    $table = preg_replace('/([^a-zA-Z_]+)/i', '', $reg[1]);
-                    $insertedrowid = $db->last_insert_id($table);
-                    $listofinsertedrowid[$cursorinsert] = $insertedrowid;
-                    dol_syslog('Admin.lib::run_sql Insert nb '.$cursorinsert.', done in table '.$table.', rowid is '.$listofinsertedrowid[$cursorinsert], LOG_DEBUG);
-                }
-                // 	          print '<td class="right">OK</td>';
-            } else {
-                $errno = $db->errno();
-                if (!$silent) print '<!-- Result = '.$errno.' -->'."\n";
+					// It's an insert
+					$table = preg_replace('/([^a-zA-Z_]+)/i', '', $reg[1]);
+					$insertedrowid = $db->last_insert_id($table);
+					$listofinsertedrowid[$cursorinsert] = $insertedrowid;
+					dol_syslog('Admin.lib::run_sql Insert nb '.$cursorinsert.', done in table '.$table.', rowid is '.$listofinsertedrowid[$cursorinsert], LOG_DEBUG);
+				}
+				// 	          print '<td class="right">OK</td>';
+			} else {
+				$errno = $db->errno();
+				if (!$silent) {
+					print '<!-- Result = '.$errno.' -->'."\n";
+				}
 
 				// Define list of errors we accept (array $okerrors)
-            	$okerrors = array(	// By default
+				$okerrors = array(	// By default
 					'DB_ERROR_TABLE_ALREADY_EXISTS',
 					'DB_ERROR_COLUMN_ALREADY_EXISTS',
 					'DB_ERROR_KEY_NAME_ALREADY_EXISTS',
@@ -383,37 +421,68 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 					'DB_ERROR_CANNOT_CREATE', // Qd contrainte deja existante
 					'DB_ERROR_CANT_DROP_PRIMARY_KEY',
 					'DB_ERROR_PRIMARY_KEY_ALREADY_EXISTS',
-            		'DB_ERROR_22P02'
+					'DB_ERROR_22P02'
 				);
-                if ($okerror == 'none') $okerrors = array();
-
-                // Is it an error we accept
-				if (!in_array($errno, $okerrors))
-				{
-				    if (!$silent) print '<tr><td class="tdtop" colspan="2">';
-				    if (!$silent) print '<div class="error">'.$langs->trans("Error")." ".$db->errno().": ".$newsql."<br>".$db->error()."</div></td>";
-				    if (!$silent) print '</tr>'."\n";
-				    dol_syslog('Admin.lib::run_sql Request '.($i + 1)." Error ".$db->errno()." ".$newsql."<br>".$db->error(), LOG_ERR);
-				    $error++;
+				if ($okerror == 'none') {
+					$okerrors = array();
 				}
-            }
 
-            if (!$silent) print '</tr>'."\n";
-        }
-    }
+				// Is it an error we accept
+				if (!in_array($errno, $okerrors)) {
+					if (!$silent) {
+						print '<tr><td class="tdtop" colspan="2">';
+					}
+					if (!$silent) {
+						print '<div class="error">'.$langs->trans("Error")." ".$db->errno().": ".$newsql."<br>".$db->error()."</div></td>";
+					}
+					if (!$silent) {
+						print '</tr>'."\n";
+					}
+					dol_syslog('Admin.lib::run_sql Request '.($i + 1)." Error ".$db->errno()." ".$newsql."<br>".$db->error(), LOG_ERR);
+					$error++;
+				}
+			}
 
-    if ($error == 0)
-    {
-        if (!$silent) print '<tr><td>'.$langs->trans("ProcessMigrateScript").'</td>';
-        if (!$silent) print '<td class="right">'.$langs->trans("OK").'</td></tr>'."\n";
-        $ok = 1;
-    } else {
-        if (!$silent) print '<tr><td>'.$langs->trans("ProcessMigrateScript").'</td>';
-        if (!$silent) print '<td class="right"><font class="error">'.$langs->trans("KO").'</font></td></tr>'."\n";
-        $ok = 0;
-    }
+			if (!$silent) {
+				print '</tr>'."\n";
+			}
+		}
+	}
 
-    return $ok;
+	if (!$silent) {
+		print '<tr><td>'.$langs->trans("ProcessMigrateScript").'</td>';
+		print '<td class="right">';
+		if ($error == 0) {
+			print '<span class="ok">'.$langs->trans("OK").'</span>';
+		} else {
+			print '<span class="error">'.$langs->trans("Error").'</span>';
+		}
+		//if (! empty($conf->use_javascript_ajax)) {
+			print '<script type="text/javascript" language="javascript">
+			jQuery(document).ready(function() {
+				function init_trrunsql()
+				{
+					console.log("toggle .trforrunsql");
+					jQuery(".trforrunsql").toggle();
+				}
+				init_trrunsql();
+				jQuery(".trforrunsqlshowhide").click(function() {
+					init_trrunsql();
+				});
+			});
+			</script>';
+			print ' - <a class="trforrunsqlshowhide" href="#">'.$langs->trans("ShowHideDetails").'</a>';
+		//}
+		print '</td></tr>'."\n";
+	}
+
+	if ($error == 0) {
+		$ok = 1;
+	} else {
+		$ok = 0;
+	}
+
+	return $ok;
 }
 
 
@@ -429,30 +498,32 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
  */
 function dolibarr_del_const($db, $name, $entity = 1)
 {
-    global $conf;
+	global $conf;
 
-    if (empty($name))
-    {
-    	dol_print_error('', 'Error call dolibar_del_const with parameter name empty');
-    	return -1;
-    }
+	if (empty($name)) {
+		dol_print_error('', 'Error call dolibar_del_const with parameter name empty');
+		return -1;
+	}
 
-    $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
-    $sql .= " WHERE (".$db->decrypt('name')." = '".$db->escape($name)."'";
-    if (is_numeric($name)) $sql .= " OR rowid = '".$db->escape($name)."'";
-    $sql .= ")";
-    if ($entity >= 0) $sql .= " AND entity = ".$entity;
+	$sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
+	$sql .= " WHERE (".$db->decrypt('name')." = '".$db->escape($name)."'";
+	if (is_numeric($name)) {
+		$sql .= " OR rowid = '".$db->escape($name)."'";
+	}
+	$sql .= ")";
+	if ($entity >= 0) {
+		$sql .= " AND entity = ".$entity;
+	}
 
-    dol_syslog("admin.lib::dolibarr_del_const", LOG_DEBUG);
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $conf->global->$name = '';
-        return 1;
-    } else {
-        dol_print_error($db);
-        return -1;
-    }
+	dol_syslog("admin.lib::dolibarr_del_const", LOG_DEBUG);
+	$resql = $db->query($sql);
+	if ($resql) {
+		$conf->global->$name = '';
+		return 1;
+	} else {
+		dol_print_error($db);
+		return -1;
+	}
 }
 
 /**
@@ -467,22 +538,23 @@ function dolibarr_del_const($db, $name, $entity = 1)
  */
 function dolibarr_get_const($db, $name, $entity = 1)
 {
-    global $conf;
-    $value = '';
+	global $conf;
+	$value = '';
 
-    $sql = "SELECT ".$db->decrypt('value')." as value";
-    $sql .= " FROM ".MAIN_DB_PREFIX."const";
-    $sql .= " WHERE name = ".$db->encrypt($name, 1);
-    $sql .= " AND entity = ".$entity;
+	$sql = "SELECT ".$db->decrypt('value')." as value";
+	$sql .= " FROM ".MAIN_DB_PREFIX."const";
+	$sql .= " WHERE name = ".$db->encrypt($name, 1);
+	$sql .= " AND entity = ".$entity;
 
-    dol_syslog("admin.lib::dolibarr_get_const", LOG_DEBUG);
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $obj = $db->fetch_object($resql);
-        if ($obj) $value = $obj->value;
-    }
-    return $value;
+	dol_syslog("admin.lib::dolibarr_get_const", LOG_DEBUG);
+	$resql = $db->query($sql);
+	if ($resql) {
+		$obj = $db->fetch_object($resql);
+		if ($obj) {
+			$value = $obj->value;
+		}
+	}
+	return $value;
 }
 
 
@@ -502,53 +574,52 @@ function dolibarr_get_const($db, $name, $entity = 1)
  */
 function dolibarr_set_const($db, $name, $value, $type = 'chaine', $visible = 0, $note = '', $entity = 1)
 {
-    global $conf;
+	global $conf;
 
-    // Clean parameters
-    $name = trim($name);
+	// Clean parameters
+	$name = trim($name);
 
-    // Check parameters
-    if (empty($name))
-    {
-        dol_print_error($db, "Error: Call to function dolibarr_set_const with wrong parameters", LOG_ERR);
-        exit;
-    }
+	// Check parameters
+	if (empty($name)) {
+		dol_print_error($db, "Error: Call to function dolibarr_set_const with wrong parameters", LOG_ERR);
+		exit;
+	}
 
-    //dol_syslog("dolibarr_set_const name=$name, value=$value type=$type, visible=$visible, note=$note entity=$entity");
+	//dol_syslog("dolibarr_set_const name=$name, value=$value type=$type, visible=$visible, note=$note entity=$entity");
 
-    $db->begin();
+	$db->begin();
 
-    $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
-    $sql .= " WHERE name = ".$db->encrypt($name, 1);
-    if ($entity >= 0) $sql .= " AND entity = ".$entity;
+	$sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
+	$sql .= " WHERE name = ".$db->encrypt($name, 1);
+	if ($entity >= 0) {
+		$sql .= " AND entity = ".$entity;
+	}
 
-    dol_syslog("admin.lib::dolibarr_set_const", LOG_DEBUG);
-    $resql = $db->query($sql);
+	dol_syslog("admin.lib::dolibarr_set_const", LOG_DEBUG);
+	$resql = $db->query($sql);
 
-    if (strcmp($value, ''))	// true if different. Must work for $value='0' or $value=0
-    {
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity)";
-        $sql .= " VALUES (";
-        $sql .= $db->encrypt($name, 1);
-        $sql .= ", ".$db->encrypt($value, 1);
-        $sql .= ",'".$db->escape($type)."',".$visible.",'".$db->escape($note)."',".$entity.")";
+	if (strcmp($value, '')) {	// true if different. Must work for $value='0' or $value=0
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity)";
+		$sql .= " VALUES (";
+		$sql .= $db->encrypt($name, 1);
+		$sql .= ", ".$db->encrypt($value, 1);
+		$sql .= ",'".$db->escape($type)."',".$visible.",'".$db->escape($note)."',".$entity.")";
 
-        //print "sql".$value."-".pg_escape_string($value)."-".$sql;exit;
-        //print "xx".$db->escape($value);
-        dol_syslog("admin.lib::dolibarr_set_const", LOG_DEBUG);
-        $resql = $db->query($sql);
-    }
+		//print "sql".$value."-".pg_escape_string($value)."-".$sql;exit;
+		//print "xx".$db->escape($value);
+		dol_syslog("admin.lib::dolibarr_set_const", LOG_DEBUG);
+		$resql = $db->query($sql);
+	}
 
-    if ($resql)
-    {
-        $db->commit();
-        $conf->global->$name = $value;
-        return 1;
-    } else {
-        $error = $db->lasterror();
-        $db->rollback();
-        return -1;
-    }
+	if ($resql) {
+		$db->commit();
+		$conf->global->$name = $value;
+		return 1;
+	} else {
+		$error = $db->lasterror();
+		$db->rollback();
+		return -1;
+	}
 }
 
 
@@ -564,10 +635,10 @@ function modules_prepare_head()
 	global $langs, $conf, $user;
 	$h = 0;
 	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=commonkanban";
+	$mode = empty($conf->global->MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT) ? 'commonkanban' : 'common';
+	$head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=".$mode;
 	$head[$h][1] = $langs->trans("AvailableModules");
-	$head[$h][2] = 'commonkanban';
+	$head[$h][2] = 'modules';
 	$h++;
 
 	$head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=marketplace";
@@ -596,65 +667,72 @@ function modules_prepare_head()
  */
 function security_prepare_head()
 {
-    global $db, $langs, $conf, $user;
-    $h = 0;
-    $head = array();
+	global $db, $langs, $conf, $user;
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/security_other.php";
-    $head[$h][1] = $langs->trans("Miscellaneous");
-    $head[$h][2] = 'misc';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/security_other.php";
+	$head[$h][1] = $langs->trans("Miscellaneous");
+	$head[$h][2] = 'misc';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/security.php";
-    $head[$h][1] = $langs->trans("Passwords");
-    $head[$h][2] = 'passwords';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/security.php";
+	$head[$h][1] = $langs->trans("Passwords");
+	$head[$h][2] = 'passwords';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/security_file.php";
-    $head[$h][1] = $langs->trans("Files").' ('.$langs->trans("Upload").')';
-    $head[$h][2] = 'file';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/security_file.php";
+	$head[$h][1] = $langs->trans("Files").' ('.$langs->trans("Upload").')';
+	$head[$h][2] = 'file';
+	$h++;
 
-    /*
-    $head[$h][0] = DOL_URL_ROOT."/admin/security_file_download.php";
-    $head[$h][1] = $langs->trans("Files").' ('.$langs->trans("Download").')';
-    $head[$h][2] = 'filedownload';
-    $h++;
+	/*
+	$head[$h][0] = DOL_URL_ROOT."/admin/security_file_download.php";
+	$head[$h][1] = $langs->trans("Files").' ('.$langs->trans("Download").')';
+	$head[$h][2] = 'filedownload';
+	$h++;
 	*/
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/proxy.php";
-    $head[$h][1] = $langs->trans("ExternalAccess");
-    $head[$h][2] = 'proxy';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/proxy.php";
+	$head[$h][1] = $langs->trans("ExternalAccess");
+	$head[$h][2] = 'proxy';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/events.php";
-    $head[$h][1] = $langs->trans("Audit");
-    $head[$h][2] = 'audit';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/events.php";
+	$head[$h][1] = $langs->trans("Audit");
+	$head[$h][2] = 'audit';
+	$h++;
 
 
-    // Show permissions lines
-    $nbPerms = 0;
-    $sql = "SELECT COUNT(r.id) as nb";
-    $sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r";
-    $sql .= " WHERE r.libelle NOT LIKE 'tou%'"; // On ignore droits "tous"
-    $sql .= " AND entity = ".$conf->entity;
-    $sql .= " AND bydefault = 1";
-    if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) $sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is not enabled
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-    	$obj = $db->fetch_object($resql);
-    	if ($obj) $nbPerms = $obj->nb;
-    } else dol_print_error($db);
+	// Show permissions lines
+	$nbPerms = 0;
+	$sql = "SELECT COUNT(r.id) as nb";
+	$sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r";
+	$sql .= " WHERE r.libelle NOT LIKE 'tou%'"; // On ignore droits "tous"
+	$sql .= " AND entity = ".$conf->entity;
+	$sql .= " AND bydefault = 1";
+	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+		$sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is not enabled
+	}
+	$resql = $db->query($sql);
+	if ($resql) {
+		$obj = $db->fetch_object($resql);
+		if ($obj) {
+			$nbPerms = $obj->nb;
+		}
+	} else {
+		dol_print_error($db);
+	}
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/perms.php";
-    $head[$h][1] = $langs->trans("DefaultRights");
-    if ($nbPerms > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbPerms.'</span>' : '');
-    $head[$h][2] = 'default';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/perms.php";
+	$head[$h][1] = $langs->trans("DefaultRights");
+	if ($nbPerms > 0) {
+		$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbPerms.'</span>' : '');
+	}
+	$head[$h][2] = 'default';
+	$h++;
 
-    return $head;
+	return $head;
 }
 
 /**
@@ -664,12 +742,12 @@ function security_prepare_head()
  */
 function modulehelp_prepare_head($object)
 {
-    global $langs, $conf, $user;
-    $h = 0;
-    $head = array();
+	global $langs, $conf, $user;
+	$h = 0;
+	$head = array();
 
-    // FIX for compatibity habitual tabs
-    $object->id = $object->numero;
+	// FIX for compatibity habitual tabs
+	$object->id = $object->numero;
 
 	$head[$h][0] = DOL_URL_ROOT."/admin/modulehelp.php?id=".$object->id.'&mode=desc';
 	$head[$h][1] = $langs->trans("Description");
@@ -681,20 +759,19 @@ function modulehelp_prepare_head($object)
 	$head[$h][2] = 'feature';
 	$h++;
 
-	if ($object->isCoreOrExternalModule() == 'external')
-	{
+	if ($object->isCoreOrExternalModule() == 'external') {
 		$head[$h][0] = DOL_URL_ROOT."/admin/modulehelp.php?id=".$object->id.'&mode=changelog';
 		$head[$h][1] = $langs->trans("ChangeLog");
 		$head[$h][2] = 'changelog';
 		$h++;
 	}
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'modulehelp_admin');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'modulehelp_admin');
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'modulehelp_admin', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'modulehelp_admin', 'remove');
 
 
-    return $head;
+	return $head;
 }
 /**
  * Prepare array with list of tabs
@@ -703,26 +780,26 @@ function modulehelp_prepare_head($object)
  */
 function translation_prepare_head()
 {
-    global $langs, $conf, $user;
-    $h = 0;
-    $head = array();
+	global $langs, $conf, $user;
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/translation.php?mode=searchkey";
-    $head[$h][1] = $langs->trans("TranslationKeySearch");
-    $head[$h][2] = 'searchkey';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/translation.php?mode=searchkey";
+	$head[$h][1] = $langs->trans("TranslationKeySearch");
+	$head[$h][2] = 'searchkey';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/translation.php?mode=overwrite";
-    $head[$h][1] = $langs->trans("TranslationOverwriteKey").'<span class="fa fa-plus-circle valignmiddle paddingleft"></span>';
-    $head[$h][2] = 'overwrite';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/translation.php?mode=overwrite";
+	$head[$h][1] = $langs->trans("TranslationOverwriteKey").'<span class="fa fa-plus-circle valignmiddle paddingleft"></span>';
+	$head[$h][2] = 'overwrite';
+	$h++;
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'translation_admin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'translation_admin');
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'translation_admin', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'translation_admin', 'remove');
 
 
-    return $head;
+	return $head;
 }
 
 
@@ -733,49 +810,48 @@ function translation_prepare_head()
  */
 function defaultvalues_prepare_head()
 {
-    global $langs, $conf, $user;
-    $h = 0;
-    $head = array();
+	global $langs, $conf, $user;
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=createform";
-    $head[$h][1] = $langs->trans("DefaultCreateForm");
-    $head[$h][2] = 'createform';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=createform";
+	$head[$h][1] = $langs->trans("DefaultCreateForm");
+	$head[$h][2] = 'createform';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=filters";
-    $head[$h][1] = $langs->trans("DefaultSearchFilters");
-    $head[$h][2] = 'filters';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=filters";
+	$head[$h][1] = $langs->trans("DefaultSearchFilters");
+	$head[$h][2] = 'filters';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=sortorder";
-    $head[$h][1] = $langs->trans("DefaultSortOrder");
-    $head[$h][2] = 'sortorder';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=sortorder";
+	$head[$h][1] = $langs->trans("DefaultSortOrder");
+	$head[$h][2] = 'sortorder';
+	$h++;
 
-    if (!empty($conf->use_javascript_ajax))
-    {
-    	$head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=focus";
-	    $head[$h][1] = $langs->trans("DefaultFocus");
-	    $head[$h][2] = 'focus';
-	    $h++;
+	if (!empty($conf->use_javascript_ajax)) {
+		$head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=focus";
+		$head[$h][1] = $langs->trans("DefaultFocus");
+		$head[$h][2] = 'focus';
+		$h++;
 
-	    $head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=mandatory";
-	    $head[$h][1] = $langs->trans("DefaultMandatory");
-	    $head[$h][2] = 'mandatory';
-	    $h++;
-    }
+		$head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=mandatory";
+		$head[$h][1] = $langs->trans("DefaultMandatory");
+		$head[$h][2] = 'mandatory';
+		$h++;
+	}
 
-    /*$head[$h][0] = DOL_URL_ROOT."/admin/translation.php?mode=searchkey";
-    $head[$h][1] = $langs->trans("TranslationKeySearch");
-    $head[$h][2] = 'searchkey';
-    $h++;*/
+	/*$head[$h][0] = DOL_URL_ROOT."/admin/translation.php?mode=searchkey";
+	$head[$h][1] = $langs->trans("TranslationKeySearch");
+	$head[$h][2] = 'searchkey';
+	$h++;*/
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'defaultvalues_admin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'defaultvalues_admin');
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'defaultvalues_admin', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'defaultvalues_admin', 'remove');
 
 
-    return $head;
+	return $head;
 }
 
 
@@ -786,55 +862,52 @@ function defaultvalues_prepare_head()
  */
 function listOfSessions()
 {
-    global $conf;
+	global $conf;
 
-    $arrayofSessions = array();
-    // session.save_path can be returned empty so we set a default location and work from there
-    $sessPath = '/tmp';
-    $iniPath = ini_get("session.save_path");
-    if ($iniPath) {
-        $sessPath = $iniPath;
-    }
-    $sessPath .= '/'; // We need the trailing slash
-    dol_syslog('admin.lib:listOfSessions sessPath='.$sessPath);
+	$arrayofSessions = array();
+	// session.save_path can be returned empty so we set a default location and work from there
+	$sessPath = '/tmp';
+	$iniPath = ini_get("session.save_path");
+	if ($iniPath) {
+		$sessPath = $iniPath;
+	}
+	$sessPath .= '/'; // We need the trailing slash
+	dol_syslog('admin.lib:listOfSessions sessPath='.$sessPath);
 
-    $dh = @opendir(dol_osencode($sessPath));
-    if ($dh)
-    {
-        while (($file = @readdir($dh)) !== false)
-        {
-            if (preg_match('/^sess_/i', $file) && $file != "." && $file != "..")
-            {
-                $fullpath = $sessPath.$file;
-                if (!@is_dir($fullpath) && is_readable($fullpath))
-                {
-                    $sessValues = file_get_contents($fullpath); // get raw session data
-                    // Example of possible value
+	$dh = @opendir(dol_osencode($sessPath));
+	if ($dh) {
+		while (($file = @readdir($dh)) !== false) {
+			if (preg_match('/^sess_/i', $file) && $file != "." && $file != "..") {
+				$fullpath = $sessPath.$file;
+				if (!@is_dir($fullpath) && is_readable($fullpath)) {
+					$sessValues = file_get_contents($fullpath); // get raw session data
+					// Example of possible value
 					//$sessValues = 'newtoken|s:32:"1239f7a0c4b899200fe9ca5ea394f307";dol_loginmesg|s:0:"";newtoken|s:32:"1236457104f7ae0f328c2928973f3cb5";dol_loginmesg|s:0:"";token|s:32:"123615ad8d650c5cc4199b9a1a76783f";
 					// dol_login|s:5:"admin";dol_authmode|s:8:"dolibarr";dol_tz|s:1:"1";dol_tz_string|s:13:"Europe/Berlin";dol_dst|i:0;dol_dst_observed|s:1:"1";dol_dst_first|s:0:"";dol_dst_second|s:0:"";dol_screenwidth|s:4:"1920";
 					// dol_screenheight|s:3:"971";dol_company|s:12:"MyBigCompany";dol_entity|i:1;mainmenu|s:4:"home";leftmenuopened|s:10:"admintools";idmenu|s:0:"";leftmenu|s:10:"admintools";';
 
-                    if (preg_match('/dol_login/i', $sessValues) && // limit to dolibarr session
-                        (preg_match('/dol_entity\|i:'.$conf->entity.';/i', $sessValues) || preg_match('/dol_entity\|s:([0-9]+):"'.$conf->entity.'"/i', $sessValues)) && // limit to current entity
-                    preg_match('/dol_company\|s:([0-9]+):"('.$conf->global->MAIN_INFO_SOCIETE_NOM.')"/i', $sessValues)) // limit to company name
-                    {
-                        $tmp = explode('_', $file);
-                        $idsess = $tmp[1];
-                        $regs = array();
-                        $loginfound = preg_match('/dol_login\|s:[0-9]+:"([A-Za-z0-9]+)"/i', $sessValues, $regs);
-                        if ($loginfound) $arrayofSessions[$idsess]["login"] = $regs[1];
-                        $arrayofSessions[$idsess]["age"] = time() - filectime($fullpath);
-                        $arrayofSessions[$idsess]["creation"] = filectime($fullpath);
-                        $arrayofSessions[$idsess]["modification"] = filemtime($fullpath);
-                        $arrayofSessions[$idsess]["raw"] = $sessValues;
-                    }
-                }
-            }
-        }
-        @closedir($dh);
-    }
+					if (preg_match('/dol_login/i', $sessValues) && // limit to dolibarr session
+						(preg_match('/dol_entity\|i:'.$conf->entity.';/i', $sessValues) || preg_match('/dol_entity\|s:([0-9]+):"'.$conf->entity.'"/i', $sessValues)) && // limit to current entity
+					preg_match('/dol_company\|s:([0-9]+):"('.$conf->global->MAIN_INFO_SOCIETE_NOM.')"/i', $sessValues)) { // limit to company name
+						$tmp = explode('_', $file);
+						$idsess = $tmp[1];
+						$regs = array();
+						$loginfound = preg_match('/dol_login\|s:[0-9]+:"([A-Za-z0-9]+)"/i', $sessValues, $regs);
+						if ($loginfound) {
+							$arrayofSessions[$idsess]["login"] = $regs[1];
+						}
+						$arrayofSessions[$idsess]["age"] = time() - filectime($fullpath);
+						$arrayofSessions[$idsess]["creation"] = filectime($fullpath);
+						$arrayofSessions[$idsess]["modification"] = filemtime($fullpath);
+						$arrayofSessions[$idsess]["raw"] = $sessValues;
+					}
+				}
+			}
+		}
+		@closedir($dh);
+	}
 
-    return $arrayofSessions;
+	return $arrayofSessions;
 }
 
 /**
@@ -845,42 +918,45 @@ function listOfSessions()
  */
 function purgeSessions($mysessionid)
 {
-    global $conf;
+	global $conf;
 
-    $sessPath = ini_get("session.save_path")."/";
-    dol_syslog('admin.lib:purgeSessions mysessionid='.$mysessionid.' sessPath='.$sessPath);
+	$sessPath = ini_get("session.save_path")."/";
+	dol_syslog('admin.lib:purgeSessions mysessionid='.$mysessionid.' sessPath='.$sessPath);
 
-    $error = 0;
-    $dh = @opendir(dol_osencode($sessPath));
-    while (($file = @readdir($dh)) !== false)
-    {
-        if ($file != "." && $file != "..")
-        {
-            $fullpath = $sessPath.$file;
-            if (!@is_dir($fullpath))
-            {
-                $sessValues = file_get_contents($fullpath); // get raw session data
+	$error = 0;
 
-                if (preg_match('/dol_login/i', $sessValues) && // limit to dolibarr session
-                preg_match('/dol_entity\|s:([0-9]+):"('.$conf->entity.')"/i', $sessValues) && // limit to current entity
-                preg_match('/dol_company\|s:([0-9]+):"('.$conf->global->MAIN_INFO_SOCIETE_NOM.')"/i', $sessValues)) // limit to company name
-                {
-                    $tmp = explode('_', $file);
-                    $idsess = $tmp[1];
-                    // We remove session if it's not ourself
-                    if ($idsess != $mysessionid)
-                    {
-                        $res = @unlink($fullpath);
-                        if (!$res) $error++;
-                    }
-                }
-            }
-        }
-    }
-    @closedir($dh);
+	$dh = @opendir(dol_osencode($sessPath));
+	if ($dh) {
+		while (($file = @readdir($dh)) !== false) {
+			if ($file != "." && $file != "..") {
+				$fullpath = $sessPath.$file;
+				if (!@is_dir($fullpath)) {
+					$sessValues = file_get_contents($fullpath); // get raw session data
 
-    if (!$error) return 1;
-    else return -$error;
+					if (preg_match('/dol_login/i', $sessValues) && // limit to dolibarr session
+					preg_match('/dol_entity\|s:([0-9]+):"('.$conf->entity.')"/i', $sessValues) && // limit to current entity
+					preg_match('/dol_company\|s:([0-9]+):"('.$conf->global->MAIN_INFO_SOCIETE_NOM.')"/i', $sessValues)) { // limit to company name
+						$tmp = explode('_', $file);
+						$idsess = $tmp[1];
+						// We remove session if it's not ourself
+						if ($idsess != $mysessionid) {
+							$res = @unlink($fullpath);
+							if (!$res) {
+								$error++;
+							}
+						}
+					}
+				}
+			}
+		}
+		@closedir($dh);
+	}
+
+	if (!$error) {
+		return 1;
+	} else {
+		return -$error;
+	}
 }
 
 
@@ -894,9 +970,9 @@ function purgeSessions($mysessionid)
  */
 function activateModule($value, $withdeps = 1)
 {
-    global $db, $langs, $conf, $mysoc;
+	global $db, $langs, $conf, $mysoc;
 
-    $ret = array();
+	$ret = array();
 
 	// Check parameters
 	if (empty($value)) {
@@ -904,38 +980,38 @@ function activateModule($value, $withdeps = 1)
 		return $ret;
 	}
 
-    $ret = array('nbmodules'=>0, 'errors'=>array(), 'nbperms'=>0);
-    $modName = $value;
-    $modFile = $modName.".class.php";
+	$ret = array('nbmodules'=>0, 'errors'=>array(), 'nbperms'=>0);
+	$modName = $value;
+	$modFile = $modName.".class.php";
 
-    // Loop on each directory to fill $modulesdir
-    $modulesdir = dolGetModulesDirs();
+	// Loop on each directory to fill $modulesdir
+	$modulesdir = dolGetModulesDirs();
 
-    // Loop on each modulesdir directories
-    $found = false;
-    foreach ($modulesdir as $dir)
-    {
-        if (file_exists($dir.$modFile))
-        {
-            $found = @include_once $dir.$modFile;
-            if ($found) break;
-        }
-    }
+	// Loop on each modulesdir directories
+	$found = false;
+	foreach ($modulesdir as $dir) {
+		if (file_exists($dir.$modFile)) {
+			$found = @include_once $dir.$modFile;
+			if ($found) {
+				break;
+			}
+		}
+	}
 
-    $objMod = new $modName($db);
+	$objMod = new $modName($db);
 
-    // Test if PHP version ok
-    $verphp = versionphparray();
-    $vermin = isset($objMod->phpmin) ? $objMod->phpmin : 0;
+	// Test if PHP version ok
+	$verphp = versionphparray();
+	$vermin = isset($objMod->phpmin) ? $objMod->phpmin : 0;
 	if (is_array($vermin) && versioncompare($verphp, $vermin) < 0) {
 		$ret['errors'][] = $langs->trans("ErrorModuleRequirePHPVersion", versiontostring($vermin));
 		return $ret;
 	}
 
-    // Test if Dolibarr version ok
-    $verdol = versiondolibarrarray();
-    $vermin = isset($objMod->need_dolibarr_version) ? $objMod->need_dolibarr_version : 0;
-    //print 'version: '.versioncompare($verdol,$vermin).' - '.join(',',$verdol).' - '.join(',',$vermin);exit;
+	// Test if Dolibarr version ok
+	$verdol = versiondolibarrarray();
+	$vermin = isset($objMod->need_dolibarr_version) ? $objMod->need_dolibarr_version : 0;
+	//print 'version: '.versioncompare($verdol,$vermin).' - '.join(',',$verdol).' - '.join(',',$vermin);exit;
 	if (is_array($vermin) && versioncompare($verdol, $vermin) < 0) {
 		$ret['errors'][] = $langs->trans("ErrorModuleRequireDolibarrVersion", versiontostring($vermin));
 		return $ret;
@@ -949,81 +1025,68 @@ function activateModule($value, $withdeps = 1)
 
 	$const_name = $objMod->const_name;
 	if (!empty($conf->global->$const_name)) {
-        return $ret;
-    }
+		return $ret;
+	}
 
-    $result = $objMod->init(); // Enable module
+	$result = $objMod->init(); // Enable module
 
-    if ($result <= 0)
-    {
-        $ret['errors'][] = $objMod->error;
-    } else {
-        if ($withdeps)
-        {
-            if (isset($objMod->depends) && is_array($objMod->depends) && !empty($objMod->depends))
-            {
-                // Activation of modules this module depends on
-                // this->depends may be array('modModule1', 'mmodModule2') or array('always1'=>"modModule1", 'FR'=>'modModule2')
-                foreach ($objMod->depends as $key => $modulestring)
-                {
-                	//var_dump((! is_numeric($key)) && ! preg_match('/^always/', $key) && $mysoc->country_code && ! preg_match('/^'.$mysoc->country_code.'/', $key));exit;
-                	if ((!is_numeric($key)) && !preg_match('/^always/', $key) && $mysoc->country_code && !preg_match('/^'.$mysoc->country_code.'/', $key))
-                    {
-                        dol_syslog("We are not concerned by dependency with key=".$key." because our country is ".$mysoc->country_code);
-                        continue;
-                    }
-                	$activate = false;
-                	foreach ($modulesdir as $dir)
-                	{
-                		if (file_exists($dir.$modulestring.".class.php"))
-                		{
-                			$resarray = activateModule($modulestring);
-    						if (empty($resarray['errors'])) {
-    						    $activate = true;
-                            } else {
-    						    foreach ($resarray['errors'] as $errorMessage) {
-                                    dol_syslog($errorMessage, LOG_ERR);
-                                }
-                            }
-    						break;
-                		}
-                	}
+	if ($result <= 0) {
+		$ret['errors'][] = $objMod->error;
+	} else {
+		if ($withdeps) {
+			if (isset($objMod->depends) && is_array($objMod->depends) && !empty($objMod->depends)) {
+				// Activation of modules this module depends on
+				// this->depends may be array('modModule1', 'mmodModule2') or array('always1'=>"modModule1", 'FR'=>'modModule2')
+				foreach ($objMod->depends as $key => $modulestring) {
+					//var_dump((! is_numeric($key)) && ! preg_match('/^always/', $key) && $mysoc->country_code && ! preg_match('/^'.$mysoc->country_code.'/', $key));exit;
+					if ((!is_numeric($key)) && !preg_match('/^always/', $key) && $mysoc->country_code && !preg_match('/^'.$mysoc->country_code.'/', $key)) {
+						dol_syslog("We are not concerned by dependency with key=".$key." because our country is ".$mysoc->country_code);
+						continue;
+					}
+					$activate = false;
+					foreach ($modulesdir as $dir) {
+						if (file_exists($dir.$modulestring.".class.php")) {
+							$resarray = activateModule($modulestring);
+							if (empty($resarray['errors'])) {
+								$activate = true;
+							} else {
+								foreach ($resarray['errors'] as $errorMessage) {
+									dol_syslog($errorMessage, LOG_ERR);
+								}
+							}
+							break;
+						}
+					}
 
-    				if ($activate)
-    				{
-    				    $ret['nbmodules'] += $resarray['nbmodules'];
-    				    $ret['nbperms'] += $resarray['nbperms'];
-    				} else {
-    				    $ret['errors'][] = $langs->trans('activateModuleDependNotSatisfied', $objMod->name, $modulestring);
-    				}
-                }
-            }
+					if ($activate) {
+						$ret['nbmodules'] += $resarray['nbmodules'];
+						$ret['nbperms'] += $resarray['nbperms'];
+					} else {
+						$ret['errors'][] = $langs->trans('activateModuleDependNotSatisfied', $objMod->name, $modulestring);
+					}
+				}
+			}
 
-            if (isset($objMod->conflictwith) && is_array($objMod->conflictwith) && !empty($objMod->conflictwith))
-            {
-                // Desactivation des modules qui entrent en conflit
-                $num = count($objMod->conflictwith);
-                for ($i = 0; $i < $num; $i++)
-                {
-                	foreach ($modulesdir as $dir)
-                	{
-                		if (file_exists($dir.$objMod->conflictwith[$i].".class.php"))
-                		{
-                			unActivateModule($objMod->conflictwith[$i], 0);
-                		}
-                	}
-                }
-            }
-        }
-    }
+			if (isset($objMod->conflictwith) && is_array($objMod->conflictwith) && !empty($objMod->conflictwith)) {
+				// Desactivation des modules qui entrent en conflit
+				$num = count($objMod->conflictwith);
+				for ($i = 0; $i < $num; $i++) {
+					foreach ($modulesdir as $dir) {
+						if (file_exists($dir.$objMod->conflictwith[$i].".class.php")) {
+							unActivateModule($objMod->conflictwith[$i], 0);
+						}
+					}
+				}
+			}
+		}
+	}
 
-    if (!count($ret['errors']))
-    {
-        $ret['nbmodules']++;
-        $ret['nbperms'] += count($objMod->rights);
-    }
+	if (!count($ret['errors'])) {
+		$ret['nbmodules']++;
+		$ret['nbperms'] += count($objMod->rights);
+	}
 
-    return $ret;
+	return $ret;
 }
 
 
@@ -1036,59 +1099,60 @@ function activateModule($value, $withdeps = 1)
  */
 function unActivateModule($value, $requiredby = 1)
 {
-    global $db, $modules, $conf;
+	global $db, $modules, $conf;
 
-    // Check parameters
-    if (empty($value)) return 'ErrorBadParameter';
+	// Check parameters
+	if (empty($value)) {
+		return 'ErrorBadParameter';
+	}
 
-    $ret = '';
-    $modName = $value;
-    $modFile = $modName.".class.php";
+	$ret = '';
+	$modName = $value;
+	$modFile = $modName.".class.php";
 
-    // Loop on each directory to fill $modulesdir
-    $modulesdir = dolGetModulesDirs();
+	// Loop on each directory to fill $modulesdir
+	$modulesdir = dolGetModulesDirs();
 
-    // Loop on each modulesdir directories
-    $found = false;
-    foreach ($modulesdir as $dir)
-    {
-        if (file_exists($dir.$modFile))
-        {
-            $found = @include_once $dir.$modFile;
-            if ($found) break;
-        }
-    }
+	// Loop on each modulesdir directories
+	$found = false;
+	foreach ($modulesdir as $dir) {
+		if (file_exists($dir.$modFile)) {
+			$found = @include_once $dir.$modFile;
+			if ($found) {
+				break;
+			}
+		}
+	}
 
-    if ($found)
-    {
-        $objMod = new $modName($db);
-        $result = $objMod->remove();
-        if ($result <= 0) $ret = $objMod->error;
-    } else // We come here when we try to unactivate a module when module does not exists anymore in sources
-    {
-        //print $dir.$modFile;exit;
-    	// TODO Replace this after DolibarrModules is moved as abstract class with a try catch to show module we try to disable has not been found or could not be loaded
-        include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
-    	$genericMod = new DolibarrModules($db);
-        $genericMod->name = preg_replace('/^mod/i', '', $modName);
-        $genericMod->rights_class = strtolower(preg_replace('/^mod/i', '', $modName));
-        $genericMod->const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', $modName));
-        dol_syslog("modules::unActivateModule Failed to find module file, we use generic function with name ".$modName);
-        $genericMod->remove('');
-    }
+	if ($found) {
+		$objMod = new $modName($db);
+		$result = $objMod->remove();
+		if ($result <= 0) {
+			$ret = $objMod->error;
+		}
+	} else // We come here when we try to unactivate a module when module does not exists anymore in sources
+	{
+		//print $dir.$modFile;exit;
+		// TODO Replace this after DolibarrModules is moved as abstract class with a try catch to show module we try to disable has not been found or could not be loaded
+		include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
+		$genericMod = new DolibarrModules($db);
+		$genericMod->name = preg_replace('/^mod/i', '', $modName);
+		$genericMod->rights_class = strtolower(preg_replace('/^mod/i', '', $modName));
+		$genericMod->const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', $modName));
+		dol_syslog("modules::unActivateModule Failed to find module file, we use generic function with name ".$modName);
+		$genericMod->remove('');
+	}
 
-    // Disable modules that depends on module we disable
-    if (!$ret && $requiredby && is_object($objMod) && is_array($objMod->requiredby))
-    {
-        $countrb = count($objMod->requiredby);
-        for ($i = 0; $i < $countrb; $i++)
-        {
-            //var_dump($objMod->requiredby[$i]);
-            unActivateModule($objMod->requiredby[$i]);
-        }
-    }
+	// Disable modules that depends on module we disable
+	if (!$ret && $requiredby && is_object($objMod) && is_array($objMod->requiredby)) {
+		$countrb = count($objMod->requiredby);
+		for ($i = 0; $i < $countrb; $i++) {
+			//var_dump($objMod->requiredby[$i]);
+			unActivateModule($objMod->requiredby[$i]);
+		}
+	}
 
-    return $ret;
+	return $ret;
 }
 
 
@@ -1112,53 +1176,52 @@ function unActivateModule($value, $requiredby = 1)
  */
 function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tabsql, &$tabsqlsort, &$tabfield, &$tabfieldvalue, &$tabfieldinsert, &$tabrowid, &$tabcond, &$tabhelp, &$tabfieldcheck)
 {
-    global $db, $modules, $conf, $langs;
+	global $db, $modules, $conf, $langs;
 
-    dol_syslog("complete_dictionary_with_modules Search external modules to complete the list of dictionnary tables", LOG_DEBUG, 1);
+	dol_syslog("complete_dictionary_with_modules Search external modules to complete the list of dictionnary tables", LOG_DEBUG, 1);
 
-    // Search modules
+	// Search modules
 	$modulesdir = dolGetModulesDirs();
-    $i = 0; // is a sequencer of modules found
-    $j = 0; // j is module number. Automatically affected if module number not defined.
+	$i = 0; // is a sequencer of modules found
+	$j = 0; // j is module number. Automatically affected if module number not defined.
 
-    foreach ($modulesdir as $dir)
-    {
-    	// Load modules attributes in arrays (name, numero, orders) from dir directory
-    	//print $dir."\n<br>";
-    	dol_syslog("Scan directory ".$dir." for modules");
-        $handle = @opendir(dol_osencode($dir));
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                //print "$i ".$file."\n<br>";
-                if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php')
-                {
-                    $modName = substr($file, 0, dol_strlen($file) - 10);
+	foreach ($modulesdir as $dir) {
+		// Load modules attributes in arrays (name, numero, orders) from dir directory
+		//print $dir."\n<br>";
+		dol_syslog("Scan directory ".$dir." for modules");
+		$handle = @opendir(dol_osencode($dir));
+		if (is_resource($handle)) {
+			while (($file = readdir($handle)) !== false) {
+				//print "$i ".$file."\n<br>";
+				if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php') {
+					$modName = substr($file, 0, dol_strlen($file) - 10);
 
-                    if ($modName)
-                    {
-                        include_once $dir.$file;
-                        $objMod = new $modName($db);
+					if ($modName) {
+						include_once $dir.$file;
+						$objMod = new $modName($db);
 
-                        if ($objMod->numero > 0)
-                        {
-                            $j = $objMod->numero;
-                        } else {
-                            $j = 1000 + $i;
-                        }
+						if ($objMod->numero > 0) {
+							$j = $objMod->numero;
+						} else {
+							$j = 1000 + $i;
+						}
 
-                        $modulequalified = 1;
+						$modulequalified = 1;
 
-                        // We discard modules according to features level (PS: if module is activated we always show it)
-                        $const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
-                        if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && !$conf->global->$const_name) $modulequalified = 0;
-                        if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && !$conf->global->$const_name) $modulequalified = 0;
-                        //If module is not activated disqualified
-                        if (empty($conf->global->$const_name)) $modulequalified = 0;
+						// We discard modules according to features level (PS: if module is activated we always show it)
+						$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
+						if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && !$conf->global->$const_name) {
+							$modulequalified = 0;
+						}
+						if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && !$conf->global->$const_name) {
+							$modulequalified = 0;
+						}
+						//If module is not activated disqualified
+						if (empty($conf->global->$const_name)) {
+							$modulequalified = 0;
+						}
 
-                        if ($modulequalified)
-                        {
+						if ($modulequalified) {
 							// Load languages files of module
 							if (isset($objMod->langfiles) && is_array($objMod->langfiles)) {
 								foreach ($objMod->langfiles as $langfile) {
@@ -1166,49 +1229,77 @@ function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tab
 								}
 							}
 
-                            // Complete the arrays &$tabname,&$tablib,&$tabsql,&$tabsqlsort,&$tabfield,&$tabfieldvalue,&$tabfieldinsert,&$tabrowid,&$tabcond
-                            if (empty($objMod->dictionaries) && !empty($objMod->dictionnaries)) $objMod->dictionaries = $objMod->dictionnaries; // For backward compatibility
+							// Complete the arrays &$tabname,&$tablib,&$tabsql,&$tabsqlsort,&$tabfield,&$tabfieldvalue,&$tabfieldinsert,&$tabrowid,&$tabcond
+							if (empty($objMod->dictionaries) && !empty($objMod->dictionnaries)) {
+								$objMod->dictionaries = $objMod->dictionnaries; // For backward compatibility
+							}
 
-                            if (!empty($objMod->dictionaries))
-                            {
-                                //var_dump($objMod->dictionaries['tabname']);
-                                $nbtabname = $nbtablib = $nbtabsql = $nbtabsqlsort = $nbtabfield = $nbtabfieldvalue = $nbtabfieldinsert = $nbtabrowid = $nbtabcond = $nbtabfieldcheck = $nbtabhelp = 0;
-                                foreach ($objMod->dictionaries['tabname'] as $val) { $nbtabname++; $taborder[] = max($taborder) + 1; $tabname[] = $val; }		// Position
-                                foreach ($objMod->dictionaries['tablib'] as $val) { $nbtablib++; $tablib[] = $val; }
-                                foreach ($objMod->dictionaries['tabsql'] as $val) { $nbtabsql++; $tabsql[] = $val; }
-                                foreach ($objMod->dictionaries['tabsqlsort'] as $val) { $nbtabsqlsort++; $tabsqlsort[] = $val; }
-                                foreach ($objMod->dictionaries['tabfield'] as $val) { $nbtabfield++; $tabfield[] = $val; }
-                                foreach ($objMod->dictionaries['tabfieldvalue'] as $val) { $nbtabfieldvalue++; $tabfieldvalue[] = $val; }
-                                foreach ($objMod->dictionaries['tabfieldinsert'] as $val) { $nbtabfieldinsert++; $tabfieldinsert[] = $val; }
-                                foreach ($objMod->dictionaries['tabrowid'] as $val) { $nbtabrowid++; $tabrowid[] = $val; }
-                                foreach ($objMod->dictionaries['tabcond'] as $val) { $nbtabcond++; $tabcond[] = $val; }
-                                if (!empty($objMod->dictionaries['tabhelp']))       foreach ($objMod->dictionaries['tabhelp'] as $val) { $nbtabhelp++; $tabhelp[] = $val; }
-                                if (!empty($objMod->dictionaries['tabfieldcheck'])) foreach ($objMod->dictionaries['tabfieldcheck'] as $val) { $nbtabfieldcheck++; $tabfieldcheck[] = $val; }
+							if (!empty($objMod->dictionaries)) {
+								//var_dump($objMod->dictionaries['tabname']);
+								$nbtabname = $nbtablib = $nbtabsql = $nbtabsqlsort = $nbtabfield = $nbtabfieldvalue = $nbtabfieldinsert = $nbtabrowid = $nbtabcond = $nbtabfieldcheck = $nbtabhelp = 0;
+								foreach ($objMod->dictionaries['tabname'] as $val) {
+									$nbtabname++; $taborder[] = max($taborder) + 1; $tabname[] = $val;
+								}		// Position
+								foreach ($objMod->dictionaries['tablib'] as $val) {
+									$nbtablib++; $tablib[] = $val;
+								}
+								foreach ($objMod->dictionaries['tabsql'] as $val) {
+									$nbtabsql++; $tabsql[] = $val;
+								}
+								foreach ($objMod->dictionaries['tabsqlsort'] as $val) {
+									$nbtabsqlsort++; $tabsqlsort[] = $val;
+								}
+								foreach ($objMod->dictionaries['tabfield'] as $val) {
+									$nbtabfield++; $tabfield[] = $val;
+								}
+								foreach ($objMod->dictionaries['tabfieldvalue'] as $val) {
+									$nbtabfieldvalue++; $tabfieldvalue[] = $val;
+								}
+								foreach ($objMod->dictionaries['tabfieldinsert'] as $val) {
+									$nbtabfieldinsert++; $tabfieldinsert[] = $val;
+								}
+								foreach ($objMod->dictionaries['tabrowid'] as $val) {
+									$nbtabrowid++; $tabrowid[] = $val;
+								}
+								foreach ($objMod->dictionaries['tabcond'] as $val) {
+									$nbtabcond++; $tabcond[] = $val;
+								}
+								if (!empty($objMod->dictionaries['tabhelp'])) {
+									foreach ($objMod->dictionaries['tabhelp'] as $val) {
+										$nbtabhelp++; $tabhelp[] = $val;
+									}
+								}
+								if (!empty($objMod->dictionaries['tabfieldcheck'])) {
+									foreach ($objMod->dictionaries['tabfieldcheck'] as $val) {
+										$nbtabfieldcheck++; $tabfieldcheck[] = $val;
+									}
+								}
 
-                                if ($nbtabname != $nbtablib || $nbtablib != $nbtabsql || $nbtabsql != $nbtabsqlsort)
-                                {
-                                    print 'Error in descriptor of module '.$const_name.'. Array ->dictionaries has not same number of record for key "tabname", "tablib", "tabsql" and "tabsqlsort"';
-                                    //print "$const_name: $nbtabname=$nbtablib=$nbtabsql=$nbtabsqlsort=$nbtabfield=$nbtabfieldvalue=$nbtabfieldinsert=$nbtabrowid=$nbtabcond=$nbtabfieldcheck=$nbtabhelp\n";
-                                } else {
-                                	$taborder[] = 0; // Add an empty line
-                                }
-                            }
+								if ($nbtabname != $nbtablib || $nbtablib != $nbtabsql || $nbtabsql != $nbtabsqlsort) {
+									print 'Error in descriptor of module '.$const_name.'. Array ->dictionaries has not same number of record for key "tabname", "tablib", "tabsql" and "tabsqlsort"';
+									//print "$const_name: $nbtabname=$nbtablib=$nbtabsql=$nbtabsqlsort=$nbtabfield=$nbtabfieldvalue=$nbtabfieldinsert=$nbtabrowid=$nbtabcond=$nbtabfieldcheck=$nbtabhelp\n";
+								} else {
+									$taborder[] = 0; // Add an empty line
+								}
+							}
 
-                            $j++;
-                            $i++;
-                        } else dol_syslog("Module ".get_class($objMod)." not qualified");
-                    }
-                }
-            }
-            closedir($handle);
-        } else {
-            dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
-        }
-    }
+							$j++;
+							$i++;
+						} else {
+							dol_syslog("Module ".get_class($objMod)." not qualified");
+						}
+					}
+				}
+			}
+			closedir($handle);
+		} else {
+			dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
+		}
+	}
 
-    dol_syslog("", LOG_DEBUG, -1);
+	dol_syslog("", LOG_DEBUG, -1);
 
-    return 1;
+	return 1;
 }
 
 /**
@@ -1223,21 +1314,16 @@ function activateModulesRequiredByCountry($country_code)
 
 	$modulesdir = dolGetModulesDirs();
 
-	foreach ($modulesdir as $dir)
-	{
+	foreach ($modulesdir as $dir) {
 		// Load modules attributes in arrays (name, numero, orders) from dir directory
 		dol_syslog("Scan directory ".$dir." for modules");
 		$handle = @opendir(dol_osencode($dir));
-		if (is_resource($handle))
-		{
-			while (($file = readdir($handle)) !== false)
-			{
-				if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php')
-				{
+		if (is_resource($handle)) {
+			while (($file = readdir($handle)) !== false) {
+				if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php') {
 					$modName = substr($file, 0, dol_strlen($file) - 10);
 
-					if ($modName)
-					{
+					if ($modName) {
 						include_once $dir.$file;
 						$objMod = new $modName($db);
 
@@ -1246,20 +1332,26 @@ function activateModulesRequiredByCountry($country_code)
 						// We discard modules according to features level (PS: if module is activated we always show it)
 						$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
 
-						if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
-						if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
-						if (!empty($conf->global->$const_name)) $modulequalified = 0; // already activated
+						if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							$modulequalified = 0;
+						}
+						if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							$modulequalified = 0;
+						}
+						if (!empty($conf->global->$const_name)) {
+							$modulequalified = 0; // already activated
+						}
 
-						if ($modulequalified)
-						{
+						if ($modulequalified) {
 							// Load languages files of module
-							if (isset($objMod->automatic_activation) && is_array($objMod->automatic_activation) && isset($objMod->automatic_activation[$country_code]))
-							{
+							if (isset($objMod->automatic_activation) && is_array($objMod->automatic_activation) && isset($objMod->automatic_activation[$country_code])) {
 								activateModule($modName);
 
 								setEventMessages($objMod->automatic_activation[$country_code], null, 'warnings');
 							}
-						} else dol_syslog("Module ".get_class($objMod)." not qualified");
+						} else {
+							dol_syslog("Module ".get_class($objMod)." not qualified");
+						}
 					}
 				}
 			}
@@ -1280,95 +1372,93 @@ function activateModulesRequiredByCountry($country_code)
  */
 function complete_elementList_with_modules(&$elementList)
 {
-    global $db, $modules, $conf, $langs;
+	global $db, $modules, $conf, $langs;
 
-    // Search modules
-    $filename = array();
-    $modules = array();
-    $orders = array();
-    $categ = array();
-    $dirmod = array();
+	// Search modules
+	$filename = array();
+	$modules = array();
+	$orders = array();
+	$categ = array();
+	$dirmod = array();
 
-    $i = 0; // is a sequencer of modules found
-    $j = 0; // j is module number. Automatically affected if module number not defined.
+	$i = 0; // is a sequencer of modules found
+	$j = 0; // j is module number. Automatically affected if module number not defined.
 
-    dol_syslog("complete_elementList_with_modules Search external modules to complete the list of contact element", LOG_DEBUG, 1);
+	dol_syslog("complete_elementList_with_modules Search external modules to complete the list of contact element", LOG_DEBUG, 1);
 
-    $modulesdir = dolGetModulesDirs();
+	$modulesdir = dolGetModulesDirs();
 
-    foreach ($modulesdir as $dir)
-    {
-    	// Load modules attributes in arrays (name, numero, orders) from dir directory
-    	//print $dir."\n<br>";
-    	dol_syslog("Scan directory ".$dir." for modules");
-        $handle = @opendir(dol_osencode($dir));
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                //print "$i ".$file."\n<br>";
-                if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php')
-                {
-                    $modName = substr($file, 0, dol_strlen($file) - 10);
+	foreach ($modulesdir as $dir) {
+		// Load modules attributes in arrays (name, numero, orders) from dir directory
+		//print $dir."\n<br>";
+		dol_syslog("Scan directory ".$dir." for modules");
+		$handle = @opendir(dol_osencode($dir));
+		if (is_resource($handle)) {
+			while (($file = readdir($handle)) !== false) {
+				//print "$i ".$file."\n<br>";
+				if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php') {
+					$modName = substr($file, 0, dol_strlen($file) - 10);
 
-                    if ($modName)
-                    {
-                        include_once $dir.$file;
-                        $objMod = new $modName($db);
+					if ($modName) {
+						include_once $dir.$file;
+						$objMod = new $modName($db);
 
-                        if ($objMod->numero > 0)
-                        {
-                            $j = $objMod->numero;
-                        } else {
-                            $j = 1000 + $i;
-                        }
+						if ($objMod->numero > 0) {
+							$j = $objMod->numero;
+						} else {
+							$j = 1000 + $i;
+						}
 
-                        $modulequalified = 1;
+						$modulequalified = 1;
 
-                        // We discard modules according to features level (PS: if module is activated we always show it)
-                        $const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
-                        if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && !$conf->global->$const_name) $modulequalified = 0;
-                        if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && !$conf->global->$const_name) $modulequalified = 0;
-                        //If module is not activated disqualified
-                        if (empty($conf->global->$const_name)) $modulequalified = 0;
+						// We discard modules according to features level (PS: if module is activated we always show it)
+						$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
+						if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && !$conf->global->$const_name) {
+							$modulequalified = 0;
+						}
+						if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && !$conf->global->$const_name) {
+							$modulequalified = 0;
+						}
+						//If module is not activated disqualified
+						if (empty($conf->global->$const_name)) {
+							$modulequalified = 0;
+						}
 
-                        if ($modulequalified)
-                        {
+						if ($modulequalified) {
 							// Load languages files of module
-                            if (isset($objMod->langfiles) && is_array($objMod->langfiles))
-                            {
-                             	foreach ($objMod->langfiles as $langfile)
-                              	{
-                               		$langs->load($langfile);
-                               	}
-                           	}
+							if (isset($objMod->langfiles) && is_array($objMod->langfiles)) {
+								foreach ($objMod->langfiles as $langfile) {
+									$langs->load($langfile);
+								}
+							}
 
-                            $modules[$i] = $objMod;
-                            $filename[$i] = $modName;
-                            $orders[$i]  = $objMod->family."_".$j; // Sort on family then module number
-                            $dirmod[$i] = $dir;
-                            //print "x".$modName." ".$orders[$i]."\n<br>";
+							$modules[$i] = $objMod;
+							$filename[$i] = $modName;
+							$orders[$i]  = $objMod->family."_".$j; // Sort on family then module number
+							$dirmod[$i] = $dir;
+							//print "x".$modName." ".$orders[$i]."\n<br>";
 
-                            if (!empty($objMod->module_parts['contactelement']))
-                            {
-                            	$elementList[$objMod->name] = $langs->trans($objMod->name);
-                            }
+							if (!empty($objMod->module_parts['contactelement'])) {
+								$elementList[$objMod->name] = $langs->trans($objMod->name);
+							}
 
-                            $j++;
-                            $i++;
-                        } else dol_syslog("Module ".get_class($objMod)." not qualified");
-                    }
-                }
-            }
-            closedir($handle);
-        } else {
-            dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
-        }
-    }
+							$j++;
+							$i++;
+						} else {
+							dol_syslog("Module ".get_class($objMod)." not qualified");
+						}
+					}
+				}
+			}
+			closedir($handle);
+		} else {
+			dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
+		}
+	}
 
-    dol_syslog("", LOG_DEBUG, -1);
+	dol_syslog("", LOG_DEBUG, -1);
 
-    return 1;
+	return 1;
 }
 
 /**
@@ -1382,201 +1472,192 @@ function complete_elementList_with_modules(&$elementList)
  */
 function form_constantes($tableau, $strictw3c = 0, $helptext = '')
 {
-    global $db, $langs, $conf, $user;
-    global $_Avery_Labels;
+	global $db, $langs, $conf, $user;
+	global $_Avery_Labels;
 
-    $form = new Form($db);
+	$form = new Form($db);
 
-    if (empty($strictw3c)) {
-    	dol_syslog("Warning: Function form_constantes is calle with parameter strictw3c = 0, this is deprecated. Value must be 2 now.", LOG_DEBUG);
-    }
-    if (!empty($strictw3c) && $strictw3c == 1)
-    {
-        print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-        print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<input type="hidden" name="action" value="updateall">';
-    }
+	if (empty($strictw3c)) {
+		dol_syslog("Warning: Function form_constantes is calle with parameter strictw3c = 0, this is deprecated. Value must be 2 now.", LOG_DEBUG);
+	}
+	if (!empty($strictw3c) && $strictw3c == 1) {
+		print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="action" value="updateall">';
+	}
 
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td class="titlefield">'.$langs->trans("Description").'</td>';
-    print '<td>';
-    $text = $langs->trans("Value");
-    print $form->textwithpicto($text, $helptext, 1, 'help', '', 0, 2, 'idhelptext');
-    print '</td>';
-    if (empty($strictw3c)) print '<td class="center" width="80">'.$langs->trans("Action").'</td>';
-    print "</tr>\n";
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td class="titlefield">'.$langs->trans("Description").'</td>';
+	print '<td>';
+	$text = $langs->trans("Value");
+	print $form->textwithpicto($text, $helptext, 1, 'help', '', 0, 2, 'idhelptext');
+	print '</td>';
+	if (empty($strictw3c)) {
+		print '<td class="center" width="80">'.$langs->trans("Action").'</td>';
+	}
+	print "</tr>\n";
 
-    $label = '';
-    foreach ($tableau as $key => $const)	// Loop on each param
-    {
-    	$label = '';
-    	// $const is a const key like 'MYMODULE_ABC'
-    	if (is_numeric($key)) {		// Very old behaviour
-    		$type = 'string';
-    	} else {
-    		if (is_array($const))
-    		{
-    			$type = $const['type'];
+	$label = '';
+	foreach ($tableau as $key => $const) {	// Loop on each param
+		$label = '';
+		// $const is a const key like 'MYMODULE_ABC'
+		if (is_numeric($key)) {		// Very old behaviour
+			$type = 'string';
+		} else {
+			if (is_array($const)) {
+				$type = $const['type'];
 				$label = $const['label'];
-    			$const = $key;
-    		} else {
-    			$type = $const;
-    			$const = $key;
-    		}
-    	}
+				$const = $key;
+			} else {
+				$type = $const;
+				$const = $key;
+			}
+		}
 
-        $sql = "SELECT ";
-        $sql .= "rowid";
-        $sql .= ", ".$db->decrypt('name')." as name";
-        $sql .= ", ".$db->decrypt('value')." as value";
-        $sql .= ", type";
-        $sql .= ", note";
-        $sql .= " FROM ".MAIN_DB_PREFIX."const";
-        $sql .= " WHERE ".$db->decrypt('name')." = '".$db->escape($const)."'";
-        $sql .= " AND entity IN (0, ".$conf->entity.")";
-        $sql .= " ORDER BY name ASC, entity DESC";
-        $result = $db->query($sql);
+		$sql = "SELECT ";
+		$sql .= "rowid";
+		$sql .= ", ".$db->decrypt('name')." as name";
+		$sql .= ", ".$db->decrypt('value')." as value";
+		$sql .= ", type";
+		$sql .= ", note";
+		$sql .= " FROM ".MAIN_DB_PREFIX."const";
+		$sql .= " WHERE ".$db->decrypt('name')." = '".$db->escape($const)."'";
+		$sql .= " AND entity IN (0, ".$conf->entity.")";
+		$sql .= " ORDER BY name ASC, entity DESC";
+		$result = $db->query($sql);
 
-        dol_syslog("List params", LOG_DEBUG);
-        if ($result)
-        {
-            $obj = $db->fetch_object($result); // Take first result of select
+		dol_syslog("List params", LOG_DEBUG);
+		if ($result) {
+			$obj = $db->fetch_object($result); // Take first result of select
 
-            if (empty($obj))	// If not yet into table
-            {
-            	$obj = (object) array('rowid'=>'', 'name'=>$const, 'value'=>'', 'type'=>$type, 'note'=>'');
-            }
+			if (empty($obj)) {	// If not yet into table
+				$obj = (object) array('rowid'=>'', 'name'=>$const, 'value'=>'', 'type'=>$type, 'note'=>'');
+			}
 
-            if (empty($strictw3c))
-            {
-            	print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-            	print '<input type="hidden" name="token" value="'.newToken().'">';
-            }
+			if (empty($strictw3c)) {
+				print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+			}
 
-            print '<tr class="oddeven">';
+			print '<tr class="oddeven">';
 
-            // Show constant
-            print '<td>';
-            if (empty($strictw3c)) print '<input type="hidden" name="action" value="update">';
-            print '<input type="hidden" name="rowid'.(empty($strictw3c) ? '' : '[]').'" value="'.$obj->rowid.'">';
-            print '<input type="hidden" name="constname'.(empty($strictw3c) ? '' : '[]').'" value="'.$const.'">';
-            print '<input type="hidden" name="constnote_'.$obj->name.'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
-            print '<input type="hidden" name="consttype_'.$obj->name.'" value="'.($obj->type ? $obj->type : 'string').'">';
+			// Show constant
+			print '<td>';
+			if (empty($strictw3c)) {
+				print '<input type="hidden" name="action" value="update">';
+			}
+			print '<input type="hidden" name="rowid'.(empty($strictw3c) ? '' : '[]').'" value="'.$obj->rowid.'">';
+			print '<input type="hidden" name="constname'.(empty($strictw3c) ? '' : '[]').'" value="'.$const.'">';
+			print '<input type="hidden" name="constnote_'.$obj->name.'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
+			print '<input type="hidden" name="consttype_'.$obj->name.'" value="'.($obj->type ? $obj->type : 'string').'">';
 
-            print ($label ? $label : $langs->trans('Desc'.$const));
+			print ($label ? $label : $langs->trans('Desc'.$const));
 
-            if ($const == 'ADHERENT_MAILMAN_URL')
-            {
-                print '. '.$langs->trans("Example").': <a href="#" id="exampleclick1">'.img_down().'</a><br>';
-                //print 'http://lists.exampe.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&subscribees=%EMAIL%&send_welcome_msg_to_this_batch=1';
-                print '<div id="example1" class="hidden">';
-                print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/add?subscribees_upload=%EMAIL%&amp;adminpw=%MAILMAN_ADMINPW%&amp;subscribe_or_invite=0&amp;send_welcome_msg_to_this_batch=0&amp;notification_to_list_owner=0';
-                print '</div>';
-            }
-            if ($const == 'ADHERENT_MAILMAN_UNSUB_URL')
-            {
-                print '. '.$langs->trans("Example").': <a href="#" id="exampleclick2">'.img_down().'</a><br>';
-                print '<div id="example2" class="hidden">';
-                print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/remove?unsubscribees_upload=%EMAIL%&amp;adminpw=%MAILMAN_ADMINPW%&amp;send_unsub_ack_to_this_batch=0&amp;send_unsub_notifications_to_list_owner=0';
-                print '</div>';
-                //print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/remove?adminpw=%MAILMAN_ADMINPW%&unsubscribees=%EMAIL%';
-            }
-            if ($const == 'ADHERENT_MAILMAN_LISTS')
-            {
-            	print '. '.$langs->trans("Example").': <a href="#" id="exampleclick3">'.img_down().'</a><br>';
-            	print '<div id="example3" class="hidden">';
-            	print 'mymailmanlist<br>';
-            	print 'mymailmanlist1,mymailmanlist2<br>';
-            	print 'TYPE:Type1:mymailmanlist1,TYPE:Type2:mymailmanlist2<br>';
-            	if ($conf->categorie->enabled) print 'CATEG:Categ1:mymailmanlist1,CATEG:Categ2:mymailmanlist2<br>';
-            	print '</div>';
-            	//print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/remove?adminpw=%MAILMAN_ADMINPW%&unsubscribees=%EMAIL%';
-            }
+			if ($const == 'ADHERENT_MAILMAN_URL') {
+				print '. '.$langs->trans("Example").': <a href="#" id="exampleclick1">'.img_down().'</a><br>';
+				//print 'http://lists.exampe.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&subscribees=%EMAIL%&send_welcome_msg_to_this_batch=1';
+				print '<div id="example1" class="hidden">';
+				print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/add?subscribees_upload=%EMAIL%&amp;adminpw=%MAILMAN_ADMINPW%&amp;subscribe_or_invite=0&amp;send_welcome_msg_to_this_batch=0&amp;notification_to_list_owner=0';
+				print '</div>';
+			}
+			if ($const == 'ADHERENT_MAILMAN_UNSUB_URL') {
+				print '. '.$langs->trans("Example").': <a href="#" id="exampleclick2">'.img_down().'</a><br>';
+				print '<div id="example2" class="hidden">';
+				print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/remove?unsubscribees_upload=%EMAIL%&amp;adminpw=%MAILMAN_ADMINPW%&amp;send_unsub_ack_to_this_batch=0&amp;send_unsub_notifications_to_list_owner=0';
+				print '</div>';
+				//print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/remove?adminpw=%MAILMAN_ADMINPW%&unsubscribees=%EMAIL%';
+			}
+			if ($const == 'ADHERENT_MAILMAN_LISTS') {
+				print '. '.$langs->trans("Example").': <a href="#" id="exampleclick3">'.img_down().'</a><br>';
+				print '<div id="example3" class="hidden">';
+				print 'mymailmanlist<br>';
+				print 'mymailmanlist1,mymailmanlist2<br>';
+				print 'TYPE:Type1:mymailmanlist1,TYPE:Type2:mymailmanlist2<br>';
+				if ($conf->categorie->enabled) {
+					print 'CATEG:Categ1:mymailmanlist1,CATEG:Categ2:mymailmanlist2<br>';
+				}
+				print '</div>';
+				//print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/remove?adminpw=%MAILMAN_ADMINPW%&unsubscribees=%EMAIL%';
+			}
 
-            print "</td>\n";
+			print "</td>\n";
 
-            // Value
-            if ($const == 'ADHERENT_CARD_TYPE' || $const == 'ADHERENT_ETIQUETTE_TYPE')
-            {
-                print '<td>';
-                // List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php)
-                require_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';
-                $arrayoflabels = array();
-                foreach (array_keys($_Avery_Labels) as $codecards)
-                {
-                    $arrayoflabels[$codecards] = $_Avery_Labels[$codecards]['name'];
-                }
-                print $form->selectarray('constvalue'.(empty($strictw3c) ? '' : '[]'), $arrayoflabels, ($obj->value ? $obj->value : 'CARD'), 1, 0, 0);
-                print '<input type="hidden" name="consttype" value="yesno">';
-                print '<input type="hidden" name="constnote'.(empty($strictw3c) ? '' : '[]').'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
-                print '</td>';
-            } else {
-                print '<td>';
-                print '<input type="hidden" name="consttype'.(empty($strictw3c) ? '' : '[]').'" value="'.($obj->type ? $obj->type : 'string').'">';
-                print '<input type="hidden" name="constnote'.(empty($strictw3c) ? '' : '[]').'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
-                if ($obj->type == 'textarea' || in_array($const, array('ADHERENT_CARD_TEXT', 'ADHERENT_CARD_TEXT_RIGHT', 'ADHERENT_ETIQUETTE_TEXT')))
-                {
-                    print '<textarea class="flat" name="constvalue'.(empty($strictw3c) ? '' : '[]').'" cols="50" rows="5" wrap="soft">'."\n";
-                    print $obj->value;
-                    print "</textarea>\n";
-                } elseif ($obj->type == 'html')
-                {
-                	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-                	$doleditor = new DolEditor('constvalue_'.$const.(empty($strictw3c) ? '' : '[]'), $obj->value, '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
-                	$doleditor->Create();
-                } elseif ($obj->type == 'yesno')
-                {
-                	print $form->selectyesno('constvalue'.(empty($strictw3c) ? '' : '[]'), $obj->value, 1);
-                } elseif (preg_match('/emailtemplate/', $obj->type))
-                {
-                	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-                	$formmail = new FormMail($db);
+			// Value
+			if ($const == 'ADHERENT_CARD_TYPE' || $const == 'ADHERENT_ETIQUETTE_TYPE') {
+				print '<td>';
+				// List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php)
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';
+				$arrayoflabels = array();
+				foreach (array_keys($_Avery_Labels) as $codecards) {
+					$arrayoflabels[$codecards] = $_Avery_Labels[$codecards]['name'];
+				}
+				print $form->selectarray('constvalue'.(empty($strictw3c) ? '' : '[]'), $arrayoflabels, ($obj->value ? $obj->value : 'CARD'), 1, 0, 0);
+				print '<input type="hidden" name="consttype" value="yesno">';
+				print '<input type="hidden" name="constnote'.(empty($strictw3c) ? '' : '[]').'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
+				print '</td>';
+			} else {
+				print '<td>';
+				print '<input type="hidden" name="consttype'.(empty($strictw3c) ? '' : '[]').'" value="'.($obj->type ? $obj->type : 'string').'">';
+				print '<input type="hidden" name="constnote'.(empty($strictw3c) ? '' : '[]').'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
+				if ($obj->type == 'textarea' || in_array($const, array('ADHERENT_CARD_TEXT', 'ADHERENT_CARD_TEXT_RIGHT', 'ADHERENT_ETIQUETTE_TEXT'))) {
+					print '<textarea class="flat" name="constvalue'.(empty($strictw3c) ? '' : '[]').'" cols="50" rows="5" wrap="soft">'."\n";
+					print $obj->value;
+					print "</textarea>\n";
+				} elseif ($obj->type == 'html') {
+					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+					$doleditor = new DolEditor('constvalue_'.$const.(empty($strictw3c) ? '' : '[]'), $obj->value, '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
+					$doleditor->Create();
+				} elseif ($obj->type == 'yesno') {
+					print $form->selectyesno('constvalue'.(empty($strictw3c) ? '' : '[]'), $obj->value, 1);
+				} elseif (preg_match('/emailtemplate/', $obj->type)) {
+					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+					$formmail = new FormMail($db);
 
-                	$tmp = explode(':', $obj->type);
+					$tmp = explode(':', $obj->type);
 
-                	$nboftemplates = $formmail->fetchAllEMailTemplate($tmp[1], $user, null, -1); // We set lang=null to get in priority record with no lang
-                	//$arraydefaultmessage = $formmail->getEMailTemplate($db, $tmp[1], $user, null, 0, 1, '');
-                	$arrayofmessagename = array();
-                	if (is_array($formmail->lines_model))
-                	{
-	                	foreach ($formmail->lines_model as $modelmail)
-	                	{
-	                		//var_dump($modelmail);
-	                		$moreonlabel = '';
-	                		if (!empty($arrayofmessagename[$modelmail->label])) $moreonlabel = ' <span class="opacitymedium">('.$langs->trans("SeveralLangugeVariatFound").')</span>';
-	                		// The 'label' is the key that is unique if we exclude the language
-	                		$arrayofmessagename[$modelmail->label.':'.$tmp[1]] = $langs->trans(preg_replace('/\(|\)/', '', $modelmail->label)).$moreonlabel;
-	                	}
-                	}
-                	//var_dump($arraydefaultmessage);
-                	//var_dump($arrayofmessagename);
-                	print $form->selectarray('constvalue_'.$obj->name, $arrayofmessagename, $obj->value.':'.$tmp[1], 'None', 0, 0, '', 0, 0, 0, '', '', 1);
-                } else // type = 'string' ou 'chaine'
-                {
-                    print '<input type="text" class="flat" size="48" name="constvalue'.(empty($strictw3c) ? '' : '[]').'" value="'.dol_escape_htmltag($obj->value).'">';
-                }
-                print '</td>';
-            }
-            // Submit
-            if (empty($strictw3c))
-            {
-            	print '<td class="center">';
-            	print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
-	            print "</td>";
-            }
-    	    print "</tr>\n";
+					$nboftemplates = $formmail->fetchAllEMailTemplate($tmp[1], $user, null, -1); // We set lang=null to get in priority record with no lang
+					//$arraydefaultmessage = $formmail->getEMailTemplate($db, $tmp[1], $user, null, 0, 1, '');
+					$arrayofmessagename = array();
+					if (is_array($formmail->lines_model)) {
+						foreach ($formmail->lines_model as $modelmail) {
+							//var_dump($modelmail);
+							$moreonlabel = '';
+							if (!empty($arrayofmessagename[$modelmail->label])) {
+								$moreonlabel = ' <span class="opacitymedium">('.$langs->trans("SeveralLangugeVariatFound").')</span>';
+							}
+							// The 'label' is the key that is unique if we exclude the language
+							$arrayofmessagename[$modelmail->label.':'.$tmp[1]] = $langs->trans(preg_replace('/\(|\)/', '', $modelmail->label)).$moreonlabel;
+						}
+					}
+					//var_dump($arraydefaultmessage);
+					//var_dump($arrayofmessagename);
+					print $form->selectarray('constvalue_'.$obj->name, $arrayofmessagename, $obj->value.':'.$tmp[1], 'None', 0, 0, '', 0, 0, 0, '', '', 1);
+				} else // type = 'string' ou 'chaine'
+				{
+					print '<input type="text" class="flat" size="48" name="constvalue'.(empty($strictw3c) ? '' : '[]').'" value="'.dol_escape_htmltag($obj->value).'">';
+				}
+				print '</td>';
+			}
+			// Submit
+			if (empty($strictw3c)) {
+				print '<td class="center">';
+				print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
+				print "</td>";
+			}
+			print "</tr>\n";
 
-            if (empty($strictw3c)) print "</form>\n";
-        }
-    }
-    print '</table>';
+			if (empty($strictw3c)) {
+				print "</form>\n";
+			}
+		}
+	}
+	print '</table>';
 
-    if (!empty($strictw3c) && $strictw3c == 1)
-    {
-    	print '<div align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
-    	print "</form>\n";
-    }
+	if (!empty($strictw3c) && $strictw3c == 1) {
+		print '<div align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
+		print "</form>\n";
+	}
 }
 
 
@@ -1594,18 +1675,22 @@ function showModulesExludedForExternal($modules)
 	$listofmodules = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
 	$i = 0;
 	if (!empty($modules)) {
-		foreach ($modules as $module)
-		{
+		foreach ($modules as $module) {
 			$moduleconst = $module->const_name;
 			$modulename = strtolower($module->name);
 			//print 'modulename='.$modulename;
 
 			//if (empty($conf->global->$moduleconst)) continue;
-			if (!in_array($modulename, $listofmodules)) continue;
+			if (!in_array($modulename, $listofmodules)) {
+				continue;
+			}
 			//var_dump($modulename.' - '.$langs->trans('Module'.$module->numero.'Name'));
 
-			if ($i > 0) $text .= ', ';
-			else $text .= ' ';
+			if ($i > 0) {
+				$text .= ', ';
+			} else {
+				$text .= ' ';
+			}
 			$i++;
 			$text .= $langs->trans('Module'.$module->numero.'Name');
 		}
@@ -1629,16 +1714,15 @@ function addDocumentModel($name, $type, $label = '', $description = '')
 
 	$db->begin();
 
-    $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
-    $sql .= " VALUES ('".$db->escape($name)."','".$db->escape($type)."',".$conf->entity.", ";
-    $sql .= ($label ? "'".$db->escape($label)."'" : 'null').", ";
-    $sql .= (!empty($description) ? "'".$db->escape($description)."'" : "null");
-    $sql .= ")";
+	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
+	$sql .= " VALUES ('".$db->escape($name)."','".$db->escape($type)."',".$conf->entity.", ";
+	$sql .= ($label ? "'".$db->escape($label)."'" : 'null').", ";
+	$sql .= (!empty($description) ? "'".$db->escape($description)."'" : "null");
+	$sql .= ")";
 
-    dol_syslog("admin.lib::addDocumentModel", LOG_DEBUG);
+	dol_syslog("admin.lib::addDocumentModel", LOG_DEBUG);
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$db->commit();
 		return 1;
 	} else {
@@ -1668,8 +1752,7 @@ function delDocumentModel($name, $type)
 
 	dol_syslog("admin.lib::delDocumentModel", LOG_DEBUG);
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$db->commit();
 		return 1;
 	} else {
@@ -1689,20 +1772,20 @@ function phpinfo_array()
 {
 	ob_start();
 	phpinfo();
+	$phpinfostring = ob_get_contents();
+	ob_end_clean();
+
 	$info_arr = array();
-	$info_lines = explode("\n", strip_tags(ob_get_clean(), "<tr><td><h2>")); // end of ob_start()
+	$info_lines = explode("\n", strip_tags($phpinfostring, "<tr><td><h2>"));
 	$cat = "General";
-	foreach ($info_lines as $line)
-	{
+	foreach ($info_lines as $line) {
 		// new cat?
 		$title = array();
 		preg_match("~<h2>(.*)</h2>~", $line, $title) ? $cat = $title[1] : null;
 		$val = array();
-		if (preg_match("~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~", $line, $val))
-		{
+		if (preg_match("~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~", $line, $val)) {
 			$info_arr[trim($cat)][trim($val[1])] = $val[2];
-		} elseif (preg_match("~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~", $line, $val))
-		{
+		} elseif (preg_match("~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~", $line, $val)) {
 			$info_arr[trim($cat)][trim($val[1])] = array("local" => $val[2], "master" => $val[3]);
 		}
 	}
@@ -1726,16 +1809,21 @@ function company_admin_prepare_head()
 	$head[$h][2] = 'company';
 	$h++;
 
-   	$head[$h][0] = DOL_URL_ROOT."/admin/openinghours.php";
-   	$head[$h][1] = $langs->trans("OpeningHours");
-   	$head[$h][2] = 'openinghours';
-   	$h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/openinghours.php";
+	$head[$h][1] = $langs->trans("OpeningHours");
+	$head[$h][2] = 'openinghours';
+	$h++;
 
 	$head[$h][0] = DOL_URL_ROOT."/admin/accountant.php";
 	$head[$h][1] = $langs->trans("Accountant");
 	$head[$h][2] = 'accountant';
 	$h++;
 
+	$head[$h][0] = DOL_URL_ROOT."/admin/company_socialnetworks.php";
+	$head[$h][1] = $langs->trans("SocialNetworksInformation");
+	$head[$h][2] = 'socialnetworks';
+	$h++;
+
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'mycompany_admin', 'add');
 
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'mycompany_admin', 'remove');
@@ -1755,23 +1843,20 @@ function email_admin_prepare_head()
 	$h = 0;
 	$head = array();
 
-	if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates'))
-	{
+	if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates')) {
 		$head[$h][0] = DOL_URL_ROOT."/admin/mails.php";
 		$head[$h][1] = $langs->trans("OutGoingEmailSetup");
 		$head[$h][2] = 'common';
 		$h++;
 
-		if ($conf->mailing->enabled)
-		{
+		if ($conf->mailing->enabled) {
 			$head[$h][0] = DOL_URL_ROOT."/admin/mails_emailing.php";
 			$head[$h][1] = $langs->trans("OutGoingEmailSetupForEmailing", $langs->transnoentitiesnoconv("EMailing"));
 			$head[$h][2] = 'common_emailing';
 			$h++;
 		}
 
-		if ($conf->ticket->enabled)
-		{
+		if ($conf->ticket->enabled) {
 			$head[$h][0] = DOL_URL_ROOT."/admin/mails_ticket.php";
 			$head[$h][1] = $langs->trans("OutGoingEmailSetupForEmailing", $langs->transnoentitiesnoconv("Ticket"));
 			$head[$h][2] = 'common_ticket';
@@ -1784,8 +1869,7 @@ function email_admin_prepare_head()
 	$head[$h][2] = 'templates';
 	$h++;
 
-	if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates'))
-	{
+	if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates')) {
 		$head[$h][0] = DOL_URL_ROOT."/admin/mails_senderprofile_list.php";
 		$head[$h][1] = $langs->trans("EmailSenderProfiles");
 		$head[$h][2] = 'senderprofiles';
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 43408a38373..fd3ba8c6fb2 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -87,7 +87,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 		print '<div class="divsearchfield">';
 		print img_picto('', 'user', 'class="fawidth30 inline-block"');
 		print '<span class="hideonsmartphone">'.$langs->trans("ActionsToDoBy").'</span>';
-		print $form->select_dolusers($filtert, 'search_filtert', 1, '', !$canedit, '', '', 0, 0, 0, '', 0, '', 'maxwidth500');
+		print $form->select_dolusers($filtert, 'search_filtert', 1, '', !$canedit, '', '', 0, 0, 0, '', 0, '', 'maxwidth500 widthcentpercentminusxx');
 		print '</div>';
 		print '<div class="divsearchfield">';
 		print img_picto('', 'object_group', 'class="fawidth30 inline-block"');
@@ -97,15 +97,15 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 
 		if ($conf->resource->enabled)
 		{
-		    include_once DOL_DOCUMENT_ROOT.'/resource/class/html.formresource.class.php';
-		    $formresource = new FormResource($db);
+			include_once DOL_DOCUMENT_ROOT.'/resource/class/html.formresource.class.php';
+			$formresource = new FormResource($db);
 
-    		// Resource
-		    print '<div class="divsearchfield">';
-		    print img_picto('', 'object_resource', 'class="fawidth30 inline-block"');
-		    print '<span class="hideonsmartphone">'.$langs->trans("Resource").'</span>';
-    		print $formresource->select_resource_list($resourceid, "search_resourceid", '', 1, 0, 0, null, '', 2, 0, 'maxwidth500');
-    		print '</div>';
+			// Resource
+			print '<div class="divsearchfield">';
+			print img_picto('', 'object_resource', 'class="fawidth30 inline-block"');
+			print '<span class="hideonsmartphone">'.$langs->trans("Resource").'</span>';
+			print $formresource->select_resource_list($resourceid, "search_resourceid", '', 1, 0, 0, null, '', 2, 0, 'maxwidth500');
+			print '</div>';
 		}
 	}
 
@@ -157,22 +157,24 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
  */
 function show_array_actions_to_do($max = 5)
 {
-	global $langs, $conf, $user, $db, $bc, $socid;
+	global $langs, $conf, $user, $db, $socid;
 
 	$now = dol_now();
 
 	include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 	include_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
 
-	$sql = "SELECT a.id, a.label, a.datep as dp, a.datep2 as dp2, a.fk_user_author, a.percent,";
-	$sql .= " c.code, c.libelle as type_label,";
-	$sql .= " s.nom as sname, s.rowid, s.client";
+	$sql = "SELECT a.id, a.label, a.datep as dp, a.datep2 as dp2, a.fk_user_author, a.percent";
+	$sql .= ", c.code, c.libelle as type_label";
+	$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+	$sql .= ", s.code_client, s.code_compta, s.client";
+	$sql .= ", s.logo, s.email, s.entity";
 	$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
 	$sql .= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql .= " WHERE a.entity = ".$conf->entity;
-    $sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))";
+	$sql .= " WHERE a.entity IN (".getEntity('agenda').")";
+	$sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 	if ($socid) $sql .= " AND s.rowid = ".$socid;
 	$sql .= " ORDER BY a.datep DESC, a.id DESC";
@@ -181,49 +183,54 @@ function show_array_actions_to_do($max = 5)
 	$resql = $db->query($sql);
 	if ($resql)
 	{
-	    $num = $db->num_rows($resql);
+		$num = $db->num_rows($resql);
 
 		print '<div class="div-table-responsive-no-min">';
-	    print '<table class="noborder centpercent">';
-	    print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastActionsToDo", $max).'</th>';
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastActionsToDo", $max).'</th>';
 		print '<th colspan="2" class="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&status=todo">'.$langs->trans("FullList").'</a></th>';
 		print '</tr>';
 
-		$var = true;
-	    $i = 0;
+		$i = 0;
 
 		$staticaction = new ActionComm($db);
-	    $customerstatic = new Client($db);
+		$customerstatic = new Client($db);
 
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($resql);
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
 
 
-            print '<tr class="oddeven">';
+			print '<tr class="oddeven">';
 
-            $staticaction->type_code = $obj->code;
-            $staticaction->label = ($obj->label ? $obj->label : $obj->type_label);
-            $staticaction->id = $obj->id;
-            print '<td>'.$staticaction->getNomUrl(1, 34).'</td>';
+			$staticaction->type_code = $obj->code;
+			$staticaction->label = ($obj->label ? $obj->label : $obj->type_label);
+			$staticaction->id = $obj->id;
+			print '<td>'.$staticaction->getNomUrl(1, 34).'</td>';
 
-            // print '<td>'.dol_trunc($obj->label,22).'</td>';
+			// print '<td>'.dol_trunc($obj->label,22).'</td>';
 
-            print '<td>';
-            if ($obj->rowid > 0)
-            {
-            	$customerstatic->id = $obj->rowid;
-            	$customerstatic->name = $obj->sname;
-            	$customerstatic->client = $obj->client;
-            	print $customerstatic->getNomUrl(1, '', 16);
-            }
-            print '</td>';
+			print '<td>';
+			if ($obj->socid > 0)
+			{
+				$customerstatic->id = $obj->socid;
+				$customerstatic->name = $obj->name;
+				//$customerstatic->name_alias = $obj->name_alias;
+				$customerstatic->code_client = $obj->code_client;
+				$customerstatic->code_compta = $obj->code_compta;
+				$customerstatic->client = $obj->client;
+				$customerstatic->logo = $obj->logo;
+				$customerstatic->email = $obj->email;
+				$customerstatic->entity = $obj->entity;
+				print $customerstatic->getNomUrl(1, '', 40);
+			}
+			print '</td>';
 
-            $datep = $db->jdate($obj->dp);
-            $datep2 = $db->jdate($obj->dp2);
+			$datep = $db->jdate($obj->dp);
+			$datep2 = $db->jdate($obj->dp2);
 
-            // Date
-			print '<td width="100" class="right">'.dol_print_date($datep, 'day').'&nbsp;';
+			// Date
+			print '<td width="100" class="right tddate">'.dol_print_date($datep, 'day').'&nbsp;';
 			$late = 0;
 			if ($obj->percent == 0 && $datep && $datep < time()) $late = 1;
 			if ($obj->percent == 0 && !$datep && $datep2 && $datep2 < time()) $late = 1;
@@ -237,13 +244,13 @@ function show_array_actions_to_do($max = 5)
 
 			print "</tr>\n";
 
-            $i++;
-        }
-	    print "</table></div><br>";
+			$i++;
+		}
+		print "</table></div><br>";
 
-	    $db->free($resql);
+		$db->free($resql);
 	} else {
-	    dol_print_error($db);
+		dol_print_error($db);
 	}
 }
 
@@ -256,21 +263,23 @@ function show_array_actions_to_do($max = 5)
  */
 function show_array_last_actions_done($max = 5)
 {
-	global $langs, $conf, $user, $db, $bc, $socid;
+	global $langs, $conf, $user, $db, $socid;
 
 	$now = dol_now();
 
-	$sql = "SELECT a.id, a.percent, a.datep as da, a.datep2 as da2, a.fk_user_author, a.label,";
-	$sql .= " c.code, c.libelle,";
-	$sql .= " s.rowid, s.nom as sname, s.client";
+	$sql = "SELECT a.id, a.percent, a.datep as da, a.datep2 as da2, a.fk_user_author, a.label";
+	$sql .= ", c.code, c.libelle";
+	$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+	$sql .= ", s.code_client, s.code_compta, s.client";
+	$sql .= ", s.logo, s.email, s.entity";
 	$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
 	$sql .= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action ";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql .= " WHERE a.entity = ".$conf->entity;
-    $sql .= " AND (a.percent >= 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))";
+	$sql .= " WHERE a.entity IN (".getEntity('agenda').")";
+	$sql .= " AND (a.percent >= 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-    if ($socid) $sql .= " AND s.rowid = ".$socid;
+	if ($socid) $sql .= " AND s.rowid = ".$socid;
 	$sql .= " ORDER BY a.datep2 DESC";
 	$sql .= $db->plimit($max, 0);
 
@@ -284,11 +293,11 @@ function show_array_last_actions_done($max = 5)
 		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastDoneTasks", $max).'</th>';
 		print '<th colspan="2" class="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&status=done">'.$langs->trans("FullList").'</a></th>';
 		print '</tr>';
-		$var = true;
+
 		$i = 0;
 
-	    $staticaction = new ActionComm($db);
-	    $customerstatic = new Societe($db);
+		$staticaction = new ActionComm($db);
+		$customerstatic = new Societe($db);
 
 		while ($i < $num)
 		{
@@ -302,24 +311,30 @@ function show_array_last_actions_done($max = 5)
 			$staticaction->id = $obj->id;
 			print '<td>'.$staticaction->getNomUrl(1, 34).'</td>';
 
-            //print '<td>'.dol_trunc($obj->label,24).'</td>';
+			//print '<td>'.dol_trunc($obj->label,24).'</td>';
 
 			print '<td>';
-			if ($obj->rowid > 0)
+			if ($obj->socid > 0)
 			{
-                $customerstatic->id = $obj->rowid;
-                $customerstatic->name = $obj->sname;
-                $customerstatic->client = $obj->client;
-			    print $customerstatic->getNomUrl(1, '', 24);
+				$customerstatic->id = $obj->socid;
+				$customerstatic->name = $obj->name;
+				//$customerstatic->name_alias = $obj->name_alias;
+				$customerstatic->code_client = $obj->code_client;
+				$customerstatic->code_compta = $obj->code_compta;
+				$customerstatic->client = $obj->client;
+				$customerstatic->logo = $obj->logo;
+				$customerstatic->email = $obj->email;
+				$customerstatic->entity = $obj->entity;
+				print $customerstatic->getNomUrl(1, '', 30);
 			}
 			print '</td>';
 
 			// Date
-			print '<td width="100" class="right">'.dol_print_date($db->jdate($obj->da2), 'day');
+			print '<td width="100" class="right tddate">'.dol_print_date($db->jdate($obj->da2), 'day');
 			print "</td>";
 
-			// Statut
-			print "<td class=\"right\" width=\"14\">".$staticaction->LibStatut($obj->percent, 3)."</td>\n";
+			// Status
+			print '<td class="right" width="14">'.$staticaction->LibStatut($obj->percent, 3)."</td>\n";
 
 			print "</tr>\n";
 			$i++;
@@ -356,13 +371,10 @@ function agenda_prepare_head()
 	$head[$h][2] = 'autoactions';
 	$h++;
 
-	if ($conf->global->MAIN_FEATURES_LEVEL > 0)
-	{
-	    $head[$h][0] = DOL_URL_ROOT."/admin/agenda_reminder.php";
-	    $head[$h][1] = $langs->trans("Reminders");
-	    $head[$h][2] = 'reminders';
-	    $h++;
-	}
+	$head[$h][0] = DOL_URL_ROOT."/admin/agenda_reminder.php";
+	$head[$h][1] = $langs->trans("Reminders");
+	$head[$h][2] = 'reminders';
+	$h++;
 
 	$head[$h][0] = DOL_URL_ROOT."/admin/agenda_xcal.php";
 	$head[$h][1] = $langs->trans("ExportCal");
@@ -405,32 +417,32 @@ function actions_prepare_head($object)
 	$head[$h][2] = 'card';
 	$h++;
 
-    // Tab to link resources
+	// Tab to link resources
 	if ($conf->resource->enabled)
 	{
-	    include_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
-	    $resource = new DolResource($db);
+		include_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
+		$resource = new DolResource($db);
 
 		$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=action&element_id='.$object->id;
-        $listofresourcelinked = $resource->getElementResources($object->element, $object->id);
-        $nbResources = (is_array($listofresourcelinked) ?count($listofresourcelinked) : 0);
+		$listofresourcelinked = $resource->getElementResources($object->element, $object->id);
+		$nbResources = (is_array($listofresourcelinked) ?count($listofresourcelinked) : 0);
 		$head[$h][1] = $langs->trans("Resources");
 		if ($nbResources > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.($nbResources).'</span>' : '');
 		$head[$h][2] = 'resources';
 		$h++;
 	}
 
-    // Attached files
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    $upload_dir = $conf->agenda->dir_output."/".$object->id;
-    $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
-    $head[$h][0] = DOL_URL_ROOT.'/comm/action/document.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("Documents");
-    if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>' : '');
-    $head[$h][2] = 'documents';
-    $h++;
+	// Attached files
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->agenda->dir_output."/".$object->id;
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+	$nbLinks = Link::count($db, $object->element, $object->id);
+	$head[$h][0] = DOL_URL_ROOT.'/comm/action/document.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Documents");
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>' : '');
+	$head[$h][2] = 'documents';
+	$h++;
 
 	$head[$h][0] = DOL_URL_ROOT.'/comm/action/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Info');
@@ -453,55 +465,55 @@ function actions_prepare_head($object)
  */
 function calendars_prepare_head($param)
 {
-    global $langs, $conf, $user;
+	global $langs, $conf, $user;
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/comm/action/list.php?action=show_list'.($param ? '&'.$param : '');
-    $head[$h][1] = $langs->trans("ViewList");
-    $head[$h][2] = 'cardlist';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/comm/action/list.php?action=show_list'.($param ? '&'.$param : '');
+	$head[$h][1] = $langs->trans("ViewList");
+	$head[$h][2] = 'cardlist';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_month'.($param ? '&'.$param : '');
-    $head[$h][1] = $langs->trans("ViewCal");
-    $head[$h][2] = 'cardmonth';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_month'.($param ? '&'.$param : '');
+	$head[$h][1] = $langs->trans("ViewCal");
+	$head[$h][2] = 'cardmonth';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_week'.($param ? '&'.$param : '');
-    $head[$h][1] = $langs->trans("ViewWeek");
-    $head[$h][2] = 'cardweek';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_week'.($param ? '&'.$param : '');
+	$head[$h][1] = $langs->trans("ViewWeek");
+	$head[$h][2] = 'cardweek';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_day'.($param ? '&'.$param : '');
-    $head[$h][1] = $langs->trans("ViewDay");
-    $head[$h][2] = 'cardday';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_day'.($param ? '&'.$param : '');
+	$head[$h][1] = $langs->trans("ViewDay");
+	$head[$h][2] = 'cardday';
+	$h++;
 
-    //if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
-    if (!empty($conf->global->AGENDA_SHOW_PERTYPE))
-    {
-        $head[$h][0] = DOL_URL_ROOT.'/comm/action/pertype.php'.($param ? '?'.$param : '');
-        $head[$h][1] = $langs->trans("ViewPerType");
-        $head[$h][2] = 'cardpertype';
-        $h++;
-    }
+	//if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+	if (!empty($conf->global->AGENDA_SHOW_PERTYPE))
+	{
+		$head[$h][0] = DOL_URL_ROOT.'/comm/action/pertype.php'.($param ? '?'.$param : '');
+		$head[$h][1] = $langs->trans("ViewPerType");
+		$head[$h][2] = 'cardpertype';
+		$h++;
+	}
 
-    $newparam = $param;
-    $newparam = preg_replace('/&?search_filtert=\d+/', '', $newparam);
-    $head[$h][0] = DOL_URL_ROOT.'/comm/action/peruser.php'.($newparam ? '?'.$newparam : '');
-    $head[$h][1] = $langs->trans("ViewPerUser");
-    $head[$h][2] = 'cardperuser';
-    $h++;
+	$newparam = $param;
+	$newparam = preg_replace('/&?search_filtert=\d+/', '', $newparam);
+	$head[$h][0] = DOL_URL_ROOT.'/comm/action/peruser.php'.($newparam ? '?'.$newparam : '');
+	$head[$h][1] = $langs->trans("ViewPerUser");
+	$head[$h][2] = 'cardperuser';
+	$h++;
 
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'agenda');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'agenda');
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'agenda', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'agenda', 'remove');
 
-    return $head;
+	return $head;
 }
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 10fa477600a..d1c1540cb8a 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -34,7 +34,7 @@
  * @param string	$url 				Ajax Url to call for request: /path/page.php. Must return a json array ('key'=>id, 'value'=>String shown into input field once selected, 'label'=>String shown into combo list)
  * @param string	$urloption			More parameters on URL request
  * @param int		$minLength			Minimum number of chars to trigger that Ajax search
- * @param int		$autoselect			Automatic selection if just one value
+ * @param int		$autoselect			Automatic selection if just one value (trigger("change") on field is done is search return only 1 result)
  * @param array		$ajaxoptions		Multiple options array
  *                                      - Ex: array('update'=>array('field1','field2'...)) will reset field1 and field2 once select done
  *                                      - Ex: array('disabled'=> )
@@ -68,6 +68,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
 					$("input#search_'.$htmlname.'").keydown(function(e) {
 						if (e.keyCode != 9)		/* If not "Tab" key */
 						{
+							if (e.keyCode == 13) { return false; } /* disable "ENTER" key useful for barcode readers */
 							console.log("Clear id previously selected for field '.$htmlname.'");
 							$("#'.$htmlname.'").val("");
 						}
diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index 387d705780a..7df82942613 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -34,88 +34,88 @@
  */
 function bank_prepare_head(Account $object)
 {
-    global $db, $langs, $conf, $user;
-    $h = 0;
-    $head = array();
+	global $db, $langs, $conf, $user;
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/compta/bank/card.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("BankAccount");
-    $head[$h][2] = 'bankname';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/card.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("BankAccount");
+	$head[$h][2] = 'bankname';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT."/compta/bank/bankentries_list.php?id=".$object->id;
-    $head[$h][1] = $langs->trans("BankTransactions");
-    $head[$h][2] = 'journal';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/compta/bank/bankentries_list.php?id=".$object->id;
+	$head[$h][1] = $langs->trans("BankTransactions");
+	$head[$h][2] = 'journal';
+	$h++;
 
-    //    if ($conf->global->MAIN_FEATURES_LEVEL >= 1)
-    //    {
-    $head[$h][0] = DOL_URL_ROOT."/compta/bank/treso.php?account=".$object->id;
-    $head[$h][1] = $langs->trans("PlannedTransactions");
-    $head[$h][2] = 'cash';
-    $h++;
-    //    }
+	//    if ($conf->global->MAIN_FEATURES_LEVEL >= 1)
+	//    {
+	$head[$h][0] = DOL_URL_ROOT."/compta/bank/treso.php?account=".$object->id;
+	$head[$h][1] = $langs->trans("PlannedTransactions");
+	$head[$h][2] = 'cash';
+	$h++;
+	//    }
 
-    $head[$h][0] = DOL_URL_ROOT."/compta/bank/annuel.php?account=".$object->id;
-    $head[$h][1] = $langs->trans("IOMonthlyReporting");
-    $head[$h][2] = 'annual';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/compta/bank/annuel.php?account=".$object->id;
+	$head[$h][1] = $langs->trans("IOMonthlyReporting");
+	$head[$h][2] = 'annual';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT."/compta/bank/graph.php?account=".$object->id;
-    $head[$h][1] = $langs->trans("Graph");
-    $head[$h][2] = 'graph';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/compta/bank/graph.php?account=".$object->id;
+	$head[$h][1] = $langs->trans("Graph");
+	$head[$h][2] = 'graph';
+	$h++;
 
-    if ($object->courant != Account::TYPE_CASH)
-    {
-    	$nbReceipts = 0;
+	if ($object->courant != Account::TYPE_CASH)
+	{
+		$nbReceipts = 0;
 
-    	// List of all standing receipts
-    	$sql = "SELECT COUNT(DISTINCT(b.num_releve)) as nb";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
-    	$sql .= " WHERE b.fk_account = ".$object->id;
+		// List of all standing receipts
+		$sql = "SELECT COUNT(DISTINCT(b.num_releve)) as nb";
+		$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
+		$sql .= " WHERE b.fk_account = ".$object->id;
 
-    	$resql = $db->query($sql);
-    	if ($resql)
-    	{
-    		$obj = $db->fetch_object($resql);
-    		if ($obj) $nbReceipts = $obj->nb;
-    		$db->free($resql);
-    	}
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$obj = $db->fetch_object($resql);
+			if ($obj) $nbReceipts = $obj->nb;
+			$db->free($resql);
+		}
 
-    	$head[$h][0] = DOL_URL_ROOT."/compta/bank/releve.php?account=".$object->id;
-	    $head[$h][1] = $langs->trans("AccountStatements");
-	    if (($nbReceipts) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbReceipts).'</span>';
-	    $head[$h][2] = 'statement';
-	    $h++;
+		$head[$h][0] = DOL_URL_ROOT."/compta/bank/releve.php?account=".$object->id;
+		$head[$h][1] = $langs->trans("AccountStatements");
+		if (($nbReceipts) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbReceipts).'</span>';
+		$head[$h][2] = 'statement';
+		$h++;
 	}
 
-    // Attached files
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    $upload_dir = $conf->bank->dir_output."/".dol_sanitizeFileName($object->ref);
-    $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
-    $head[$h][0] = DOL_URL_ROOT."/compta/bank/document.php?account=".$object->id;
-    $head[$h][1] = $langs->trans("Documents");
-    if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
-    $head[$h][2] = 'document';
-    $h++;
+	// Attached files
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->bank->dir_output."/".dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+	$nbLinks = Link::count($db, $object->element, $object->id);
+	$head[$h][0] = DOL_URL_ROOT."/compta/bank/document.php?account=".$object->id;
+	$head[$h][1] = $langs->trans("Documents");
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	$head[$h][2] = 'document';
+	$h++;
 
 	// Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank');
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank');
 
-    /*$head[$h][0] = DOL_URL_ROOT . "/compta/bank/info.php?id=" . $object->id;
+	/*$head[$h][0] = DOL_URL_ROOT . "/compta/bank/info.php?id=" . $object->id;
     $head[$h][1] = $langs->trans("Info");
     $head[$h][2] = 'info';
     $h++;*/
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank', 'remove');
 
-    return $head;
+	return $head;
 }
 /**
  * Prepare array with list of tabs
@@ -134,10 +134,10 @@ function bank_admin_prepare_head($object)
 	$head[$h][2] = 'general';
 	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/admin/chequereceipts.php';
-    $head[$h][1] = $langs->trans("CheckReceiptShort");
-    $head[$h][2] = 'checkreceipts';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/admin/chequereceipts.php';
+	$head[$h][1] = $langs->trans("CheckReceiptShort");
+	$head[$h][2] = 'checkreceipts';
+	$h++;
 
 
 	// Show more tabs from modules
@@ -215,17 +215,17 @@ function various_payment_prepare_head($object)
 	$head[$h][2] = 'card';
 	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'various_payment');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'various_payment');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->bank->dir_output."/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/various_payment/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
@@ -250,12 +250,12 @@ function various_payment_prepare_head($object)
  */
 function checkSwiftForAccount($account)
 {
-    $swift = $account->bic;
-    if (preg_match("/^([a-zA-Z]){4}([a-zA-Z]){2}([0-9a-zA-Z]){2}([0-9a-zA-Z]{3})?$/", $swift)) {
-        return true;
-    } else {
-        return false;
-    }
+	$swift = $account->bic;
+	if (preg_match("/^([a-zA-Z]){4}([a-zA-Z]){2}([0-9a-zA-Z]){2}([0-9a-zA-Z]{3})?$/", $swift)) {
+		return true;
+	} else {
+		return false;
+	}
 }
 
 /**
@@ -266,13 +266,13 @@ function checkSwiftForAccount($account)
  */
 function checkIbanForAccount($account)
 {
-    require_once DOL_DOCUMENT_ROOT.'/includes/php-iban/oophp-iban.php';
+	require_once DOL_DOCUMENT_ROOT.'/includes/php-iban/oophp-iban.php';
 
-    $iban = new IBAN($account->iban);
-    $check = $iban->Verify();
+	$iban = new IBAN($account->iban);
+	$check = $iban->Verify();
 
-    if ($check) return true;
-    else return false;
+	if ($check) return true;
+	else return false;
 }
 
 /**
@@ -283,68 +283,68 @@ function checkIbanForAccount($account)
  */
 function checkBanForAccount($account)
 {
-    $country_code = $account->getCountryCode();
+	$country_code = $account->getCountryCode();
 
-    // For compatibility between
-    // account of type CompanyBankAccount class (we use number, cle_rib)
-    // account of type Account class (we use num_compte, cle)
-    if (empty($account->number))
-        $account->number = $account->num_compte;
-    if (empty($account->cle))
-        $account->cle = $account->cle_rib;
+	// For compatibility between
+	// account of type CompanyBankAccount class (we use number, cle_rib)
+	// account of type Account class (we use num_compte, cle)
+	if (empty($account->number))
+		$account->number = $account->num_compte;
+	if (empty($account->cle))
+		$account->cle = $account->cle_rib;
 
-    dol_syslog("bank.lib::checkBanForAccount account->code_banque=".$account->code_banque." account->code_guichet=".$account->code_guichet." account->number=".$account->number." account->cle=".$account->cle." account->iban=".$account->iban." country_code=".$country_code, LOG_DEBUG);
+	dol_syslog("bank.lib::checkBanForAccount account->code_banque=".$account->code_banque." account->code_guichet=".$account->code_guichet." account->number=".$account->number." account->cle=".$account->cle." account->iban=".$account->iban." country_code=".$country_code, LOG_DEBUG);
 
-    if ($country_code == 'FR') { // France rules
-        $coef = array(62, 34, 3);
-        // Concatenation des differents codes.
-        $rib = strtolower(trim($account->code_banque).trim($account->code_guichet).trim($account->number).trim($account->cle));
-        // On remplace les eventuelles lettres par des chiffres.
-        //$rib = strtr($rib, "abcdefghijklmnopqrstuvwxyz","12345678912345678912345678");	//Ne marche pas
-        $rib = strtr($rib, "abcdefghijklmnopqrstuvwxyz", "12345678912345678923456789");
-        // Separation du rib en 3 groupes de 7 + 1 groupe de 2.
-        // Multiplication de chaque groupe par les coef du tableau
+	if ($country_code == 'FR') { // France rules
+		$coef = array(62, 34, 3);
+		// Concatenation des differents codes.
+		$rib = strtolower(trim($account->code_banque).trim($account->code_guichet).trim($account->number).trim($account->cle));
+		// On remplace les eventuelles lettres par des chiffres.
+		//$rib = strtr($rib, "abcdefghijklmnopqrstuvwxyz","12345678912345678912345678");	//Ne marche pas
+		$rib = strtr($rib, "abcdefghijklmnopqrstuvwxyz", "12345678912345678923456789");
+		// Separation du rib en 3 groupes de 7 + 1 groupe de 2.
+		// Multiplication de chaque groupe par les coef du tableau
 
-        for ($i = 0, $s = 0; $i < 3; $i++) {
-            $code = substr($rib, 7 * $i, 7);
-            $s += (0 + (int) $code) * $coef[$i];
-        }
-        // Soustraction du modulo 97 de $s a 97 pour obtenir la cle
-        $cle_rib = 97 - ($s % 97);
-        if ($cle_rib == $account->cle) {
-            return true;
-        }
-        return false;
-    }
+		for ($i = 0, $s = 0; $i < 3; $i++) {
+			$code = substr($rib, 7 * $i, 7);
+			$s += (0 + (int) $code) * $coef[$i];
+		}
+		// Soustraction du modulo 97 de $s a 97 pour obtenir la cle
+		$cle_rib = 97 - ($s % 97);
+		if ($cle_rib == $account->cle) {
+			return true;
+		}
+		return false;
+	}
 
-    if ($country_code == 'BE') { // Belgium rules
-    }
+	if ($country_code == 'BE') { // Belgium rules
+	}
 
-    if ($country_code == 'ES') { // Spanish rules
-        $CCC = strtolower(trim($account->number));
-        $rib = strtolower(trim($account->code_banque).trim($account->code_guichet));
-        $cle_rib = strtolower(checkES($rib, $CCC));
-        if ($cle_rib == strtolower($account->cle)) {
-            return true;
-        }
-        return false;
-    }
-    if ($country_code == 'AU') {  // Australian
-        if (strlen($account->code_banque) > 7)
-            return false; // Sould be 6 but can be 123-456
-        elseif (strlen($account->code_banque) < 6)
-            return false; // Sould be 6
-        else return true;
-    }
+	if ($country_code == 'ES') { // Spanish rules
+		$CCC = strtolower(trim($account->number));
+		$rib = strtolower(trim($account->code_banque).trim($account->code_guichet));
+		$cle_rib = strtolower(checkES($rib, $CCC));
+		if ($cle_rib == strtolower($account->cle)) {
+			return true;
+		}
+		return false;
+	}
+	if ($country_code == 'AU') {  // Australian
+		if (strlen($account->code_banque) > 7)
+			return false; // Sould be 6 but can be 123-456
+		elseif (strlen($account->code_banque) < 6)
+			return false; // Sould be 6
+		else return true;
+	}
 
-    // No particular rule
-    // If account is CompanyBankAccount class, we use number
-    // If account is Account class, we use num_compte
-    if (empty($account->number)) {
-        return false;
-    }
+	// No particular rule
+	// If account is CompanyBankAccount class, we use number
+	// If account is Account class, we use num_compte
+	if (empty($account->number)) {
+		return false;
+	}
 
-    return true;
+	return true;
 }
 
 
@@ -358,53 +358,53 @@ function checkBanForAccount($account)
  */
 function checkES($IentOfi, $InumCta)
 {
-    if (empty($IentOfi) || empty($InumCta) || strlen($IentOfi) != 8 || strlen($InumCta) != 10) {
-        $keycontrol = "";
-        return $keycontrol;
-    }
+	if (empty($IentOfi) || empty($InumCta) || strlen($IentOfi) != 8 || strlen($InumCta) != 10) {
+		$keycontrol = "";
+		return $keycontrol;
+	}
 
-    $ccc = $IentOfi.$InumCta;
-    $numbers = "1234567890";
+	$ccc = $IentOfi.$InumCta;
+	$numbers = "1234567890";
 
-    $i = 0;
+	$i = 0;
 
-    while ($i <= strlen($ccc) - 1) {
-        if (strpos($numbers, substr($ccc, $i, 1)) === false) {
-            $keycontrol = "";
-            return $keycontrol;
-        }
-        $i++;
-    }
+	while ($i <= strlen($ccc) - 1) {
+		if (strpos($numbers, substr($ccc, $i, 1)) === false) {
+			$keycontrol = "";
+			return $keycontrol;
+		}
+		$i++;
+	}
 
-    $values = array(1, 2, 4, 8, 5, 10, 9, 7, 3, 6);
-    $sum = 0;
+	$values = array(1, 2, 4, 8, 5, 10, 9, 7, 3, 6);
+	$sum = 0;
 
-    for ($i = 2; $i < 10; $i++) {
-        $sum += $values[$i] * substr($IentOfi, $i - 2, 1);
-    }
+	for ($i = 2; $i < 10; $i++) {
+		$sum += $values[$i] * substr($IentOfi, $i - 2, 1);
+	}
 
-    $key = 11 - $sum % 11;
+	$key = 11 - $sum % 11;
 
-    if ($key == 10)
-        $key = 1;
-    if ($key == 11)
-        $key = 0;
+	if ($key == 10)
+		$key = 1;
+	if ($key == 11)
+		$key = 0;
 
-    $keycontrol = $key;
+	$keycontrol = $key;
 
-    $sum = 0;
+	$sum = 0;
 
-    for ($i = 0; $i < 11; $i++) {
-        $sum += $values[$i] * (int) substr($InumCta, $i, 1); //int to cast result of substr to a number
-    }
+	for ($i = 0; $i < 11; $i++) {
+		$sum += $values[$i] * (int) substr($InumCta, $i, 1); //int to cast result of substr to a number
+	}
 
-    $key = 11 - $sum % 11;
+	$key = 11 - $sum % 11;
 
-    if ($key == 10)
-        $key = 1;
-    if ($key == 11)
-        $key = 0;
+	if ($key == 10)
+		$key = 1;
+	if ($key == 11)
+		$key = 0;
 
-    $keycontrol .= $key;
-    return $keycontrol;
+	$keycontrol .= $key;
+	return $keycontrol;
 }
diff --git a/htdocs/core/lib/barcode.lib.php b/htdocs/core/lib/barcode.lib.php
index da712d960cd..0447927ec4d 100644
--- a/htdocs/core/lib/barcode.lib.php
+++ b/htdocs/core/lib/barcode.lib.php
@@ -67,23 +67,23 @@ else $genbarcode_loc = $conf->global->GENBARCODE_LOCATION;
  */
 function barcode_print($code, $encoding = "ANY", $scale = 2, $mode = "png")
 {
-    dol_syslog("barcode.lib.php::barcode_print $code $encoding $scale $mode");
+	dol_syslog("barcode.lib.php::barcode_print $code $encoding $scale $mode");
 
-    $bars = barcode_encode($code, $encoding);
-    if (!$bars || !empty($bars['error']))
-    {
-        // Return error message instead of array
-        if (empty($bars['error'])) $error = 'Bad Value '.$code.' for encoding '.$encoding;
-        else $error = $bars['error'];
-        dol_syslog('barcode.lib.php::barcode_print '.$error, LOG_ERR);
-        return $error;
-    }
-    if (!$mode) $mode = "png";
-    //if (preg_match("/^(text|txt|plain)$/i",$mode)) print barcode_outtext($bars['text'],$bars['bars']);
-    //elseif (preg_match("/^(html|htm)$/i",$mode)) print barcode_outhtml($bars['text'],$bars['bars'], $scale,0, 0);
-    //else
-    barcode_outimage($bars['text'], $bars['bars'], $scale, $mode);
-    return $bars;
+	$bars = barcode_encode($code, $encoding);
+	if (!$bars || !empty($bars['error']))
+	{
+		// Return error message instead of array
+		if (empty($bars['error'])) $error = 'Bad Value '.$code.' for encoding '.$encoding;
+		else $error = $bars['error'];
+		dol_syslog('barcode.lib.php::barcode_print '.$error, LOG_ERR);
+		return $error;
+	}
+	if (!$mode) $mode = "png";
+	//if (preg_match("/^(text|txt|plain)$/i",$mode)) print barcode_outtext($bars['text'],$bars['bars']);
+	//elseif (preg_match("/^(html|htm)$/i",$mode)) print barcode_outhtml($bars['text'],$bars['bars'], $scale,0, 0);
+	//else
+	barcode_outimage($bars['text'], $bars['bars'], $scale, $mode);
+	return $bars;
 }
 
 /**
@@ -110,42 +110,42 @@ function barcode_print($code, $encoding = "ANY", $scale = 2, $mode = "png")
  */
 function barcode_encode($code, $encoding)
 {
-    global $genbarcode_loc;
+	global $genbarcode_loc;
 
-    if (
-    (preg_match("/^ean$/i", $encoding))
+	if (
+	(preg_match("/^ean$/i", $encoding))
 
-    || (($encoding) && (preg_match("/^isbn$/i", $encoding))
-    && ((strlen($code) == 9 || strlen($code) == 10) ||
-    (((preg_match("/^978/", $code) && strlen($code) == 12) ||
-    (strlen($code) == 13)))))
+	|| (($encoding) && (preg_match("/^isbn$/i", $encoding))
+	&& ((strlen($code) == 9 || strlen($code) == 10) ||
+	(((preg_match("/^978/", $code) && strlen($code) == 12) ||
+	(strlen($code) == 13)))))
 
-    || ((!isset($encoding) || !$encoding || (preg_match("/^ANY$/i", $encoding)))
-    && (preg_match("/^[0-9]{12,13}$/", $code)))
-    )
-    {
-        /* use built-in EAN-Encoder */
-        dol_syslog("barcode.lib.php::barcode_encode Use barcode_encode_ean");
-        $bars = barcode_encode_ean($code, $encoding);
-    } elseif (file_exists($genbarcode_loc))	// For example C39
-    {
-        /* use genbarcode */
-        dol_syslog("barcode.lib.php::barcode_encode Use genbarcode ".$genbarcode_loc." code=".$code." encoding=".$encoding);
-        $bars = barcode_encode_genbarcode($code, $encoding);
-    } else {
-        print "barcode_encode needs an external programm for encodings other then EAN/ISBN (code=".$code.", encoding=".$encoding.")<BR>\n";
-        print "<UL>\n";
-        print "<LI>download gnu-barcode from <A href=\"https://www.gnu.org/software/barcode/\">www.gnu.org/software/barcode/</A>\n";
-        print "<LI>compile and install them\n";
-        print "<LI>download genbarcode from <A href=\"http://www.ashberg.de/bar/\">www.ashberg.de/bar/</A>\n";
-        print "<LI>compile and install them\n";
-        print "<LI>specify path the genbarcode in barcode module setup\n";
-        print "</UL>\n";
-        print "<BR>\n";
-        return false;
-    }
+	|| ((!isset($encoding) || !$encoding || (preg_match("/^ANY$/i", $encoding)))
+	&& (preg_match("/^[0-9]{12,13}$/", $code)))
+	)
+	{
+		/* use built-in EAN-Encoder */
+		dol_syslog("barcode.lib.php::barcode_encode Use barcode_encode_ean");
+		$bars = barcode_encode_ean($code, $encoding);
+	} elseif (file_exists($genbarcode_loc))	// For example C39
+	{
+		/* use genbarcode */
+		dol_syslog("barcode.lib.php::barcode_encode Use genbarcode ".$genbarcode_loc." code=".$code." encoding=".$encoding);
+		$bars = barcode_encode_genbarcode($code, $encoding);
+	} else {
+		print "barcode_encode needs an external programm for encodings other then EAN/ISBN (code=".$code.", encoding=".$encoding.")<BR>\n";
+		print "<UL>\n";
+		print "<LI>download gnu-barcode from <A href=\"https://www.gnu.org/software/barcode/\">www.gnu.org/software/barcode/</A>\n";
+		print "<LI>compile and install them\n";
+		print "<LI>download genbarcode from <A href=\"http://www.ashberg.de/bar/\">www.ashberg.de/bar/</A>\n";
+		print "<LI>compile and install them\n";
+		print "<LI>specify path the genbarcode in barcode module setup\n";
+		print "</UL>\n";
+		print "<BR>\n";
+		return false;
+	}
 
-    return $bars;
+	return $bars;
 }
 
 
@@ -157,14 +157,14 @@ function barcode_encode($code, $encoding)
  */
 function barcode_gen_ean_sum($ean)
 {
-    $even = true; $esum = 0; $osum = 0;
-    $ln = strlen($ean) - 1;
-    for ($i = $ln; $i >= 0; $i--)
-    {
-        if ($even) $esum += $ean[$i]; else $osum += $ean[$i];
-        $even = !$even;
-    }
-    return (10 - ((3 * $esum + $osum) % 10)) % 10;
+	$even = true; $esum = 0; $osum = 0;
+	$ln = strlen($ean) - 1;
+	for ($i = $ln; $i >= 0; $i--)
+	{
+		if ($even) $esum += $ean[$i]; else $osum += $ean[$i];
+		$even = !$even;
+	}
+	return (10 - ((3 * $esum + $osum) % 10)) % 10;
 }
 
 /**
@@ -176,56 +176,56 @@ function barcode_gen_ean_sum($ean)
  */
 function barcode_encode_ean($ean, $encoding = "EAN-13")
 {
-    $digits = array(3211, 2221, 2122, 1411, 1132, 1231, 1114, 1312, 1213, 3112);
-    $mirror = array("000000", "001011", "001101", "001110", "010011", "011001", "011100", "010101", "010110", "011010");
-    $guards = array("9a1a", "1a1a1", "a1a");
+	$digits = array(3211, 2221, 2122, 1411, 1132, 1231, 1114, 1312, 1213, 3112);
+	$mirror = array("000000", "001011", "001101", "001110", "010011", "011001", "011100", "010101", "010110", "011010");
+	$guards = array("9a1a", "1a1a1", "a1a");
 
-    $ean = trim($ean);
-    if (preg_match("/[^0-9]/i", $ean))
-    {
-        return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (not a numeric)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (not a numeric)");
-    }
-    $encoding = strtoupper($encoding);
-    if ($encoding == "ISBN")
-    {
-        if (!preg_match("/^978/", $ean)) $ean = "978".$ean;
-    }
-    if (preg_match("/^978/", $ean)) $encoding = "ISBN";
-    if (strlen($ean) < 12 || strlen($ean) > 13)
-    {
-        return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)");
-    }
+	$ean = trim($ean);
+	if (preg_match("/[^0-9]/i", $ean))
+	{
+		return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (not a numeric)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (not a numeric)");
+	}
+	$encoding = strtoupper($encoding);
+	if ($encoding == "ISBN")
+	{
+		if (!preg_match("/^978/", $ean)) $ean = "978".$ean;
+	}
+	if (preg_match("/^978/", $ean)) $encoding = "ISBN";
+	if (strlen($ean) < 12 || strlen($ean) > 13)
+	{
+		return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)");
+	}
 
-    $ean = substr($ean, 0, 12);
-    $eansum = barcode_gen_ean_sum($ean);
-    $ean .= $eansum;
-    $line = $guards[0];
-    for ($i = 1; $i < 13; $i++)
-    {
-        $str = $digits[$ean[$i]];
-        if ($i < 7 && $mirror[$ean[0]][$i - 1] == 1) $line .= strrev($str); else $line .= $str;
-        if ($i == 6) $line .= $guards[1];
-    }
-    $line .= $guards[2];
+	$ean = substr($ean, 0, 12);
+	$eansum = barcode_gen_ean_sum($ean);
+	$ean .= $eansum;
+	$line = $guards[0];
+	for ($i = 1; $i < 13; $i++)
+	{
+		$str = $digits[$ean[$i]];
+		if ($i < 7 && $mirror[$ean[0]][$i - 1] == 1) $line .= strrev($str); else $line .= $str;
+		if ($i == 6) $line .= $guards[1];
+	}
+	$line .= $guards[2];
 
-    /* create text */
-    $pos = 0;
-    $text = "";
-    for ($a = 0; $a < 13; $a++)
-    {
-        if ($a > 0) $text .= " ";
-        $text .= "$pos:12:{$ean[$a]}";
-        if ($a == 0) $pos += 12;
-        elseif ($a == 6) $pos += 12;
-        else $pos += 7;
-    }
+	/* create text */
+	$pos = 0;
+	$text = "";
+	for ($a = 0; $a < 13; $a++)
+	{
+		if ($a > 0) $text .= " ";
+		$text .= "$pos:12:{$ean[$a]}";
+		if ($a == 0) $pos += 12;
+		elseif ($a == 6) $pos += 12;
+		else $pos += 7;
+	}
 
-    return array(
-        "error" => '',
-        "encoding" => $encoding,
+	return array(
+		"error" => '',
+		"encoding" => $encoding,
 		"bars" => $line,
 		"text" => $text
-    );
+	);
 }
 
 /**
@@ -237,50 +237,50 @@ function barcode_encode_ean($ean, $encoding = "EAN-13")
  */
 function barcode_encode_genbarcode($code, $encoding)
 {
-    global $genbarcode_loc;
+	global $genbarcode_loc;
 
-    // Clean parameters
-    if (preg_match("/^ean$/i", $encoding) && strlen($code) == 13) $code = substr($code, 0, 12);
-    if (!$encoding) $encoding = "ANY";
-    $encoding = preg_replace("/[\\\|]/", "_", $encoding);
-    $code = preg_replace("/[\\\|]/", "_", $code);
+	// Clean parameters
+	if (preg_match("/^ean$/i", $encoding) && strlen($code) == 13) $code = substr($code, 0, 12);
+	if (!$encoding) $encoding = "ANY";
+	$encoding = preg_replace("/[\\\|]/", "_", $encoding);
+	$code = preg_replace("/[\\\|]/", "_", $code);
 
-    $command = escapeshellarg($genbarcode_loc);
-    //$paramclear=" \"".str_replace("\"", "\\\"",$code)."\" \"".str_replace("\"", "\\\"",strtoupper($encoding))."\"";
-    $paramclear = " ".escapeshellarg($code)." ".escapeshellarg(strtoupper($encoding));
+	$command = escapeshellarg($genbarcode_loc);
+	//$paramclear=" \"".str_replace("\"", "\\\"",$code)."\" \"".str_replace("\"", "\\\"",strtoupper($encoding))."\"";
+	$paramclear = " ".escapeshellarg($code)." ".escapeshellarg(strtoupper($encoding));
 
-    $fullcommandclear = $command." ".$paramclear." 2>&1";
-    //print $fullcommandclear."<br>\n";exit;
+	$fullcommandclear = $command." ".$paramclear." 2>&1";
+	//print $fullcommandclear."<br>\n";exit;
 
-    dol_syslog("Run command ".$fullcommandclear);
-    $fp = popen($fullcommandclear, "r");
-    if ($fp)
-    {
-        $bars = fgets($fp, 1024);
-        $text = fgets($fp, 1024);
-        $encoding = fgets($fp, 1024);
-        pclose($fp);
-    } else {
-        dol_syslog("barcode.lib.php::barcode_encode_genbarcode failed to run popen ".$fullcommandclear, LOG_ERR);
-        return false;
-    }
-    //var_dump($bars);
-    $ret = array(
+	dol_syslog("Run command ".$fullcommandclear);
+	$fp = popen($fullcommandclear, "r");
+	if ($fp)
+	{
+		$bars = fgets($fp, 1024);
+		$text = fgets($fp, 1024);
+		$encoding = fgets($fp, 1024);
+		pclose($fp);
+	} else {
+		dol_syslog("barcode.lib.php::barcode_encode_genbarcode failed to run popen ".$fullcommandclear, LOG_ERR);
+		return false;
+	}
+	//var_dump($bars);
+	$ret = array(
 		"bars" => trim($bars),
 		"text" => trim($text),
 		"encoding" => trim($encoding),
-    	"error" => ""
-    );
-    //var_dump($ret);
-    if (preg_match('/permission denied/i', $ret['bars']))
-    {
-    	$ret['error'] = $ret['bars']; $ret['bars'] = '';
-    	return $ret;
-    }
-    if (!$ret['bars']) return false;
-    if (!$ret['text']) return false;
-    if (!$ret['encoding']) return false;
-    return $ret;
+		"error" => ""
+	);
+	//var_dump($ret);
+	if (preg_match('/permission denied/i', $ret['bars']))
+	{
+		$ret['error'] = $ret['bars']; $ret['bars'] = '';
+		return $ret;
+	}
+	if (!$ret['bars']) return false;
+	if (!$ret['text']) return false;
+	if (!$ret['encoding']) return false;
+	return $ret;
 }
 
 /**
@@ -296,110 +296,105 @@ function barcode_encode_genbarcode($code, $encoding)
  */
 function barcode_outimage($text, $bars, $scale = 1, $mode = "png", $total_y = 0, $space = '')
 {
-    global $bar_color, $bg_color, $text_color;
-    global $font_loc, $filebarcode;
+	global $bar_color, $bg_color, $text_color;
+	global $font_loc, $filebarcode;
 
-    //print "$text, $bars, $scale, $mode, $total_y, $space, $font_loc, $filebarcode<br>";
-    //var_dump($text);
-    //var_dump($bars);
-    //var_dump($font_loc);
+	//print "$text, $bars, $scale, $mode, $total_y, $space, $font_loc, $filebarcode<br>";
+	//var_dump($text);
+	//var_dump($bars);
+	//var_dump($font_loc);
 
-    /* set defaults */
-    if ($scale < 1) $scale = 2;
-    $total_y = (int) $total_y;
-    if ($total_y < 1) $total_y = (int) $scale * 60;
-    if (!$space)
-    $space = array('top'=>2 * $scale, 'bottom'=>2 * $scale, 'left'=>2 * $scale, 'right'=>2 * $scale);
+	/* set defaults */
+	if ($scale < 1) $scale = 2;
+	$total_y = (int) $total_y;
+	if ($total_y < 1) $total_y = (int) $scale * 60;
+	if (!$space)
+	$space = array('top'=>2 * $scale, 'bottom'=>2 * $scale, 'left'=>2 * $scale, 'right'=>2 * $scale);
 
-    /* count total width */
-    $xpos = 0;
-    $width = true;
-    $ln = strlen($bars);
-    for ($i = 0; $i < $ln; $i++)
-    {
-        $val = strtolower($bars[$i]);
-        if ($width)
-        {
-            $xpos += $val * $scale;
-            $width = false;
-            continue;
-        }
-        if (preg_match("/[a-z]/", $val))
-        {
-            /* tall bar */
-            $val = ord($val) - ord('a') + 1;
-        }
-        $xpos += $val * $scale;
-        $width = true;
-    }
+	/* count total width */
+	$xpos = 0;
+	$width = true;
+	$ln = strlen($bars);
+	for ($i = 0; $i < $ln; $i++)
+	{
+		$val = strtolower($bars[$i]);
+		if ($width)
+		{
+			$xpos += $val * $scale;
+			$width = false;
+			continue;
+		}
+		if (preg_match("/[a-z]/", $val))
+		{
+			/* tall bar */
+			$val = ord($val) - ord('a') + 1;
+		}
+		$xpos += $val * $scale;
+		$width = true;
+	}
 
-    /* allocate the image */
-    $total_x = ($xpos) + $space['right'] + $space['right'];
-    $xpos = $space['left'];
-    if (!function_exists("imagecreate"))
-    {
-        print "You don't have the gd2 extension enabled<br>\n";
-        return "";
-    }
-    $im = imagecreate($total_x, $total_y);
-    /* create two images */
-    $col_bg = ImageColorAllocate($im, $bg_color[0], $bg_color[1], $bg_color[2]);
-    $col_bar = ImageColorAllocate($im, $bar_color[0], $bar_color[1], $bar_color[2]);
-    $col_text = ImageColorAllocate($im, $text_color[0], $text_color[1], $text_color[2]);
-    $height = round($total_y - ($scale * 10));
-    $height2 = round($total_y - $space['bottom']);
+	/* allocate the image */
+	$total_x = ($xpos) + $space['right'] + $space['right'];
+	$xpos = $space['left'];
+	if (!function_exists("imagecreate"))
+	{
+		print "You don't have the gd2 extension enabled<br>\n";
+		return "";
+	}
+	$im = imagecreate($total_x, $total_y);
+	/* create two images */
+	$col_bg = ImageColorAllocate($im, $bg_color[0], $bg_color[1], $bg_color[2]);
+	$col_bar = ImageColorAllocate($im, $bar_color[0], $bar_color[1], $bar_color[2]);
+	$col_text = ImageColorAllocate($im, $text_color[0], $text_color[1], $text_color[2]);
+	$height = round($total_y - ($scale * 10));
+	$height2 = round($total_y - $space['bottom']);
 
-    /* paint the bars */
-    $width = true;
-    $ln = strlen($bars);
-    for ($i = 0; $i < $ln; $i++)
-    {
-        $val = strtolower($bars[$i]);
-        if ($width)
-        {
-            $xpos += $val * $scale;
-            $width = false;
-            continue;
-        }
-        if (preg_match("/[a-z]/", $val))
-        {
-            /* tall bar */
-            $val = ord($val) - ord('a') + 1;
-            $h = $height2;
-        } else $h = $height;
-        imagefilledrectangle($im, $xpos, $space['top'], $xpos + ($val * $scale) - 1, $h, $col_bar);
-        $xpos += $val * $scale;
-        $width = true;
-    }
+	/* paint the bars */
+	$width = true;
+	$ln = strlen($bars);
+	for ($i = 0; $i < $ln; $i++)
+	{
+		$val = strtolower($bars[$i]);
+		if ($width)
+		{
+			$xpos += $val * $scale;
+			$width = false;
+			continue;
+		}
+		if (preg_match("/[a-z]/", $val))
+		{
+			/* tall bar */
+			$val = ord($val) - ord('a') + 1;
+			$h = $height2;
+		} else $h = $height;
+		imagefilledrectangle($im, $xpos, $space['top'], $xpos + ($val * $scale) - 1, $h, $col_bar);
+		$xpos += $val * $scale;
+		$width = true;
+	}
 
-    $chars = explode(" ", $text);
-    reset($chars);
-    while (list($n, $v) = each($chars))
-    {
-        if (trim($v))
-        {
-            $inf = explode(":", $v);
-            $fontsize = $scale * ($inf[1] / 1.8);
-            $fontheight = $total_y - ($fontsize / 2.7) + 2;
-            imagettftext($im, $fontsize, 0, $space['left'] + ($scale * $inf[0]) + 2, $fontheight, $col_text, $font_loc, $inf[2]);
-        }
-    }
+	$chars = explode(" ", $text);
+	foreach ($chars as $v) {
+		if (trim($v)) {
+			$inf = explode(":", $v);
+			$fontsize = $scale * ($inf[1] / 1.8);
+			$fontheight = $total_y - ($fontsize / 2.7) + 2;
+			imagettftext($im, $fontsize, 0, $space['left'] + ($scale * $inf[0]) + 2, $fontheight, $col_text, $font_loc, $inf[2]);
+		}
+	}
 
-    /* output the image */
-    $mode = strtolower($mode);
-    if ($mode == 'jpg' || $mode == 'jpeg')
-    {
-        header("Content-Type: image/jpeg; name=\"barcode.jpg\"");
-        imagejpeg($im);
-    } elseif ($mode == 'gif')
-    {
-        header("Content-Type: image/gif; name=\"barcode.gif\"");
-        imagegif($im);
-    } elseif (!empty($filebarcode))    // To wxrite into  afile onto disk
-    {
-        imagepng($im, $filebarcode);
-    } else {
-        header("Content-Type: image/png; name=\"barcode.png\"");
-        imagepng($im);
-    }
+	/* output the image */
+	$mode = strtolower($mode);
+	if ($mode == 'jpg' || $mode == 'jpeg') {
+		header("Content-Type: image/jpeg; name=\"barcode.jpg\"");
+		imagejpeg($im);
+	} elseif ($mode == 'gif') {
+		header("Content-Type: image/gif; name=\"barcode.gif\"");
+		imagegif($im);
+	} elseif (!empty($filebarcode)) {
+		// To wxrite into  afile onto disk
+		imagepng($im, $filebarcode);
+	} else {
+		header("Content-Type: image/png; name=\"barcode.png\"");
+		imagepng($im);
+	}
 }
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index d7b5773e1c2..1e2be9e856d 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -50,10 +50,8 @@ function societe_prepare_head(Societe $object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (empty($conf->global->MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES))
-	{
-		if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->societe->contact->lire)
-		{
+	if (empty($conf->global->MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES)) {
+		if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->societe->contact->lire) {
 			//$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 			$nbContact = 0; // TODO
 
@@ -61,8 +59,7 @@ function societe_prepare_head(Societe $object)
 			$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
 			$sql .= " WHERE p.fk_soc = ".$object->id;
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$obj = $db->fetch_object($resql);
 				if ($obj) $nbContact = $obj->nb;
 			}
@@ -82,8 +79,7 @@ function societe_prepare_head(Societe $object)
 		$h++;
 	}
 
-	if ($object->client == 1 || $object->client == 2 || $object->client == 3)
-	{
+	if ($object->client == 1 || $object->client == 2 || $object->client == 3) {
 		$head[$h][0] = DOL_URL_ROOT.'/comm/card.php?socid='.$object->id;
 		$head[$h][1] = '';
 		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && ($object->client == 2 || $object->client == 3)) $head[$h][1] .= $langs->trans("Prospect");
@@ -92,8 +88,7 @@ function societe_prepare_head(Societe $object)
 		$head[$h][2] = 'customer';
 		$h++;
 
-		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
-		{
+		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 			$langs->load("products");
 			// price
 			$head[$h][0] = DOL_URL_ROOT.'/societe/price.php?socid='.$object->id;
@@ -104,16 +99,14 @@ function societe_prepare_head(Societe $object)
 	}
 	$supplier_module_enabled = 0;
 	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_proposal->enabled) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) $supplier_module_enabled = 1;
-	if ($supplier_module_enabled == 1 && $object->fournisseur && !empty($user->rights->fournisseur->lire))
-	{
+	if ($supplier_module_enabled == 1 && $object->fournisseur && !empty($user->rights->fournisseur->lire)) {
 		$head[$h][0] = DOL_URL_ROOT.'/fourn/card.php?socid='.$object->id;
 		$head[$h][1] = $langs->trans("Supplier");
 		$head[$h][2] = 'supplier';
 		$h++;
 	}
 
-	if (!empty($conf->projet->enabled) && (!empty($user->rights->projet->lire)))
-	{
+	if (!empty($conf->projet->enabled) && (!empty($user->rights->projet->lire))) {
 		$head[$h][0] = DOL_URL_ROOT.'/societe/project.php?socid='.$object->id;
 		$head[$h][1] = $langs->trans("Projects");
 		$nbNote = 0;
@@ -122,12 +115,10 @@ function societe_prepare_head(Societe $object)
 		$sql .= " WHERE fk_soc = ".$object->id;
 		$sql .= " AND entity IN (".getEntity('project').")";
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 				$nbNote = $obj->nb;
 				$i++;
@@ -141,19 +132,16 @@ function societe_prepare_head(Societe $object)
 	}
 
 	// Tab to link resources
-	if (!empty($conf->resource->enabled) && !empty($conf->global->RESOURCE_ON_THIRDPARTIES))
-	{
+	if (!empty($conf->resource->enabled) && !empty($conf->global->RESOURCE_ON_THIRDPARTIES)) {
 		$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=societe&element_id='.$object->id;
 		$head[$h][1] = $langs->trans("Resources");
 		$head[$h][2] = 'resources';
 		$h++;
 	}
 
-	if (!empty($conf->global->ACCOUNTING_ENABLE_LETTERING))
-	{
+	if (!empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) {
 		// Tab to accountancy
-		if (!empty($conf->accounting->enabled) && $object->client > 0)
-		{
+		if (!empty($conf->accounting->enabled) && $object->client > 0) {
 			$head[$h][0] = DOL_URL_ROOT.'/accountancy/bookkeeping/thirdparty_lettering_customer.php?socid='.$object->id;
 			$head[$h][1] = $langs->trans("TabLetteringCustomer");
 			$head[$h][2] = 'lettering_customer';
@@ -161,8 +149,7 @@ function societe_prepare_head(Societe $object)
 		}
 
 		// Tab to accountancy
-		if (!empty($conf->accounting->enabled) && $object->fournisseur > 0)
-		{
+		if (!empty($conf->accounting->enabled) && $object->fournisseur > 0) {
 			$head[$h][0] = DOL_URL_ROOT.'/accountancy/bookkeeping/thirdparty_lettering_supplier.php?socid='.$object->id;
 			$head[$h][1] = $langs->trans("TabLetteringSupplier");
 			$head[$h][2] = 'lettering_supplier';
@@ -172,8 +159,7 @@ function societe_prepare_head(Societe $object)
 
 	// Related items
 	if ((!empty($conf->commande->enabled) || !empty($conf->propal->enabled) || !empty($conf->facture->enabled) || !empty($conf->ficheinter->enabled) || !empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
-		&& empty($conf->global->THIRPARTIES_DISABLE_RELATED_OBJECT_TAB))
-	{
+		&& empty($conf->global->THIRPARTIES_DISABLE_RELATED_OBJECT_TAB)) {
 		$head[$h][0] = DOL_URL_ROOT.'/societe/consumption.php?socid='.$object->id;
 		$head[$h][1] = $langs->trans("Referers");
 		$head[$h][2] = 'consumption';
@@ -181,8 +167,7 @@ function societe_prepare_head(Societe $object)
 	}
 
 	// Bank accounts
-	if (empty($conf->global->SOCIETE_DISABLE_BANKACCOUNT))
-	{
+	if (empty($conf->global->SOCIETE_DISABLE_BANKACCOUNT)) {
 		$nbBankAccount = 0;
 		$foundonexternalonlinesystem = 0;
 		$langs->load("banks");
@@ -190,8 +175,7 @@ function societe_prepare_head(Societe $object)
 		//$title = $langs->trans("BankAccounts");
 		$title = $langs->trans("PaymentInformation");
 
-		if (!empty($conf->stripe->enabled))
-		{
+		if (!empty($conf->stripe->enabled)) {
 			//$langs->load("stripe");
 			//$title = $langs->trans("BankAccountsAndGateways");
 
@@ -214,12 +198,10 @@ function societe_prepare_head(Societe $object)
 		}
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 				$nbBankAccount = $obj->nb;
 				$i++;
@@ -238,8 +220,7 @@ function societe_prepare_head(Societe $object)
 		$h++;
 	}
 
-	if (!empty($conf->website->enabled) && (!empty($conf->global->WEBSITE_USE_WEBSITE_ACCOUNTS)) && (!empty($user->rights->societe->lire)))
-	{
+	if (!empty($conf->website->enabled) && (!empty($conf->global->WEBSITE_USE_WEBSITE_ACCOUNTS)) && (!empty($user->rights->societe->lire))) {
 		$head[$h][0] = DOL_URL_ROOT.'/societe/website.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("WebSiteAccounts");
 		$nbNote = 0;
@@ -247,12 +228,10 @@ function societe_prepare_head(Societe $object)
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_account as n";
 		$sql .= " WHERE fk_soc = ".$object->id.' AND fk_website > 0';
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 				$nbNote = $obj->nb;
 				$i++;
@@ -271,22 +250,18 @@ function societe_prepare_head(Societe $object)
 	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'thirdparty');
 
-	if ($user->socid == 0)
-	{
+	if ($user->socid == 0) {
 		// Notifications
-		if (!empty($conf->notification->enabled))
-		{
+		if (!empty($conf->notification->enabled)) {
 			$nbNote = 0;
 			$sql = "SELECT COUNT(n.rowid) as nb";
 			$sql .= " FROM ".MAIN_DB_PREFIX."notify_def as n";
 			$sql .= " WHERE fk_soc = ".$object->id;
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$num = $db->num_rows($resql);
 				$i = 0;
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $db->fetch_object($resql);
 					$nbNote = $obj->nb;
 					$i++;
@@ -328,8 +303,7 @@ function societe_prepare_head(Societe $object)
 
 	$head[$h][0] = DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id;
 	$head[$h][1] .= $langs->trans("Events");
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-	{
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$head[$h][1] .= '/';
 		$head[$h][1] .= $langs->trans("Agenda");
 	}
@@ -437,8 +411,7 @@ function getCountry($searchkey, $withcode = '', $dbtouse = 0, $outputlangs = '',
 	$result = '';
 
 	// Check parameters
-	if (empty($searchkey) && empty($searchlabel))
-	{
+	if (empty($searchkey) && empty($searchlabel)) {
 		if ($withcode === 'all') return array('id'=>'', 'code'=>'', 'label'=>'');
 		else return '';
 	}
@@ -451,14 +424,11 @@ function getCountry($searchkey, $withcode = '', $dbtouse = 0, $outputlangs = '',
 	else $sql .= " WHERE label='".$db->escape($searchlabel)."'";
 
 	$resql = $dbtouse->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$obj = $dbtouse->fetch_object($resql);
-		if ($obj)
-		{
+		if ($obj) {
 			$label = ((!empty($obj->label) && $obj->label != '-') ? $obj->label : '');
-			if (is_object($outputlangs))
-			{
+			if (is_object($outputlangs)) {
 				$outputlangs->load("dict");
 				if ($entconv) $label = ($obj->code && ($outputlangs->trans("Country".$obj->code) != "Country".$obj->code)) ? $outputlangs->trans("Country".$obj->code) : $label;
 				else $label = ($obj->code && ($outputlangs->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code)) ? $outputlangs->transnoentitiesnoconv("Country".$obj->code) : $label;
@@ -506,14 +476,11 @@ function getState($id, $withcode = '', $dbtouse = 0, $withregion = 0, $outputlan
 
 	dol_syslog("Company.lib::getState", LOG_DEBUG);
 	$resql = $dbtouse->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$obj = $dbtouse->fetch_object($resql);
-		if ($obj)
-		{
+		if ($obj) {
 			$label = ((!empty($obj->name) && $obj->name != '-') ? $obj->name : '');
-			if (is_object($outputlangs))
-			{
+			if (is_object($outputlangs)) {
 				$outputlangs->load("dict");
 				if ($entconv) $label = ($obj->code && ($outputlangs->trans("State".$obj->code) != "State".$obj->code)) ? $outputlangs->trans("State".$obj->code) : $label;
 				else $label = ($obj->code && ($outputlangs->transnoentitiesnoconv("State".$obj->code) != "State".$obj->code)) ? $outputlangs->transnoentitiesnoconv("State".$obj->code) : $label;
@@ -567,8 +534,7 @@ function currency_name($code_iso, $withcode = '', $outputlangs = null)
 	$outputlangs->load("dict");
 
 	// If there is a translation, we can send immediatly the label
-	if ($outputlangs->trans("Currency".$code_iso) != "Currency".$code_iso)
-	{
+	if ($outputlangs->trans("Currency".$code_iso) != "Currency".$code_iso) {
 		return ($withcode ? $code_iso.' - ' : '').$outputlangs->trans("Currency".$code_iso);
 	}
 
@@ -577,12 +543,10 @@ function currency_name($code_iso, $withcode = '', $outputlangs = null)
 	$sql .= " WHERE code_iso='".$db->escape($code_iso)."'";
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 
-		if ($num)
-		{
+		if ($num) {
 			$obj = $db->fetch_object($resql);
 			$label = ($obj->label != '-' ? $obj->label : '');
 			if ($withcode) return ($label == $code_iso) ? "$code_iso" : "$code_iso - $label";
@@ -611,12 +575,10 @@ function getFormeJuridiqueLabel($code)
 
 	dol_syslog("Company.lib::getFormeJuridiqueLabel", LOG_DEBUG);
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 
-		if ($num)
-		{
+		if ($num) {
 			$obj = $db->fetch_object($resql);
 			$label = ($obj->libelle != '-' ? $obj->libelle : '');
 			return $label;
@@ -675,8 +637,7 @@ function getCountriesInEEC()
 		//'CH',	// Switzerland - No. Swizerland in not in EEC
 	);
 
-	if (!empty($conf->global->MAIN_COUNTRIES_IN_EEC))
-	{
+	if (!empty($conf->global->MAIN_COUNTRIES_IN_EEC)) {
 		// For example MAIN_COUNTRIES_IN_EEC = 'AT,BE,BG,CY,CZ,DE,DK,EE,ES,FI,FR,GB,GR,HR,NL,HU,IE,IM,IT,LT,LU,LV,MC,MT,PL,PT,RO,SE,SK,SI,UK'
 		$country_code_in_EEC = explode(',', $conf->global->MAIN_COUNTRIES_IN_EEC);
 	}
@@ -719,13 +680,11 @@ function show_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatel
 
 	$i = -1;
 
-	if (!empty($conf->projet->enabled) && $user->rights->projet->lire)
-	{
+	if (!empty($conf->projet->enabled) && $user->rights->projet->lire) {
 		$langs->load("projects");
 
 		$newcardbutton = '';
-		if (!empty($conf->projet->enabled) && $user->rights->projet->creer && empty($nocreatelink))
-		{
+		if (!empty($conf->projet->enabled) && $user->rights->projet->creer && empty($nocreatelink)) {
 			$newcardbutton .= dolGetButtonTitle($langs->trans('AddProject'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/card.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage));
 		}
 
@@ -743,8 +702,7 @@ function show_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatel
 		$sql .= " ORDER BY p.dateo DESC";
 
 		$result = $db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $db->num_rows($result);
 
 			print '<tr class="liste_titre">';
@@ -758,24 +716,21 @@ function show_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatel
 			print '<td class="right">'.$langs->trans("Status").'</td>';
 			print '</tr>';
 
-			if ($num > 0)
-			{
+			if ($num > 0) {
 				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 				$projecttmp = new Project($db);
 
 				$i = 0;
 
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $db->fetch_object($result);
 					$projecttmp->fetch($obj->id);
 
 					// To verify role of users
 					$userAccess = $projecttmp->restrictedProjectArea($user);
 
-					if ($user->rights->projet->lire && $userAccess > 0)
-					{
+					if ($user->rights->projet->lire && $userAccess > 0) {
 						print '<tr class="oddeven">';
 
 						// Ref
@@ -791,8 +746,7 @@ function show_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatel
 						print '<td class="center">'.dol_print_date($db->jdate($obj->de), "day").'</td>';
 						// Opp amount
 						print '<td class="right">';
-						if ($obj->opp_status_code)
-						{
+						if ($obj->opp_status_code) {
 							print price($obj->opp_amount, 1, '', 1, -1, -1, '');
 						}
 						print '</td>';
@@ -889,8 +843,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 	if (!$sortorder) $sortorder = "ASC";
 	if (!$sortfield) $sortfield = "t.lastname";
 
-	if (!empty($conf->clicktodial->enabled))
-	{
+	if (!empty($conf->clicktodial->enabled)) {
 		$user->fetch_clicktodial(); // lecture des infos de clicktodial du user
 	}
 
@@ -917,10 +870,8 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 		't.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>50, 'class'=>'center'),
 	);
 	// Extra fields
-	if (is_array($extrafields->attributes[$contactstatic->table_element]['label']) && count($extrafields->attributes[$contactstatic->table_element]['label']))
-	{
-		foreach ($extrafields->attributes[$contactstatic->table_element]['label'] as $key => $val)
-		{
+	if (is_array($extrafields->attributes[$contactstatic->table_element]['label']) && count($extrafields->attributes[$contactstatic->table_element]['label'])) {
+		foreach ($extrafields->attributes[$contactstatic->table_element]['label'] as $key => $val) {
 			if (!empty($extrafields->attributes[$contactstatic->table_element]['list'][$key])) {
 				$arrayfields["ef.".$key] = array(
 					'label'=>$extrafields->attributes[$contactstatic->table_element]['label'][$key],
@@ -933,8 +884,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 
 	// Initialize array of search criterias
 	$search = array();
-	foreach ($arrayfields as $key => $val)
-	{
+	foreach ($arrayfields as $key => $val) {
 		$queryName = 'search_'.substr($key, 2);
 		if (GETPOST($queryName, 'alpha')) {
 			$search[substr($key, 2)] = GETPOST($queryName, 'alpha');
@@ -943,8 +893,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 	$search_array_options = $extrafields->getOptionalsFromPost($contactstatic->table_element, '', 'search_');
 
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 		$search_status = '';
 		$search_name         = '';
 		$search_roles        = array();
@@ -953,8 +902,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 		$search = array();
 		$search_array_options = array();
 
-		foreach ($contactstatic->fields as $key => $val)
-   		{
+		foreach ($contactstatic->fields as $key => $val) {
    			$search[$key] = '';
    		}
 	}
@@ -963,8 +911,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 	$arrayfields = dol_sort_array($arrayfields, 'position');
 
 	$newcardbutton = '';
-	if ($user->rights->societe->contact->creer)
-	{
+	if ($user->rights->societe->contact->creer) {
 		$addcontact = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));
 		$newcardbutton .= dolGetButtonTitle($addcontact, '', 'fa fa-plus-circle', DOL_URL_ROOT.'/contact/card.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage));
 	}
@@ -1030,14 +977,12 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 	// Fields title search
 	// --------------------------------------------------------------------
 	print '<tr class="liste_titre">';
-	foreach ($contactstatic->fields as $key => $val)
-	{
+	foreach ($contactstatic->fields as $key => $val) {
 		$align = '';
 		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $align .= ($align ? ' ' : '').'center';
 		if (in_array($val['type'], array('timestamp'))) $align .= ($align ? ' ' : '').'nowrap';
 		if ($key == 'status' || $key == 'statut') $align .= ($align ? ' ' : '').'center';
-		if (!empty($arrayfields['t.'.$key]['checked']) || !empty($arrayfields['sc.'.$key]['checked']))
-		{
+		if (!empty($arrayfields['t.'.$key]['checked']) || !empty($arrayfields['sc.'.$key]['checked'])) {
 			print '<td class="liste_titre'.($align ? ' '.$align : '').'">';
 			if (in_array($key, array('statut'))) {
 				print $form->selectarray('search_status', array('-1'=>'', '0'=>$contactstatic->LibStatut(0, 1), '1'=>$contactstatic->LibStatut(1, 1)), $search_status);
@@ -1067,8 +1012,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 	// Fields title label
 	// --------------------------------------------------------------------
 	print '<tr class="liste_titre">';
-	foreach ($contactstatic->fields as $key => $val)
-	{
+	foreach ($contactstatic->fields as $key => $val) {
 		$align = '';
 		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $align .= ($align ? ' ' : '').'center';
 		if (in_array($val['type'], array('timestamp'))) $align .= ($align ? ' ' : '').'nowrap';
@@ -1091,12 +1035,10 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 
 	$i = -1;
 
-	if ($num || (GETPOST('button_search') || GETPOST('button_search.x') || GETPOST('button_search_x')))
-	{
+	if ($num || (GETPOST('button_search') || GETPOST('button_search.x') || GETPOST('button_search_x'))) {
 		$i = 0;
 
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($result);
 
 			$contactstatic->id = $obj->rowid;
@@ -1129,10 +1071,8 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 				setEventMessages(null, $contactstatic->errors, 'errors');
 			}
 
-			if (is_array($contactstatic->array_options))
-			{
-				foreach ($contactstatic->array_options as $key => $val)
-				{
+			if (is_array($contactstatic->array_options)) {
+				foreach ($contactstatic->array_options as $key => $val) {
 					$obj->$key = $val;
 				}
 			}
@@ -1140,16 +1080,14 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 			print '<tr class="oddeven">';
 
 			// ID
-			if (!empty($arrayfields['t.rowid']['checked']))
-			{
+			if (!empty($arrayfields['t.rowid']['checked'])) {
 				print '<td>';
 				print $contactstatic->id;
 				print '</td>';
 			}
 
 			// Photo - Name
-			if (!empty($arrayfields['t.name']['checked']))
-			{
+			if (!empty($arrayfields['t.name']['checked'])) {
 				print '<td>';
 				print $form->showphoto('contact', $contactstatic, 0, 0, 0, 'photorefnoborder valignmiddle marginrightonly', 'small', 1, 0, 1);
 				print $contactstatic->getNomUrl(0, '', 0, '&backtopage='.urlencode($backtopage));
@@ -1157,32 +1095,28 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 			}
 
 			// Job position
-			if (!empty($arrayfields['t.poste']['checked']))
-			{
+			if (!empty($arrayfields['t.poste']['checked'])) {
 				print '<td>';
 				if ($obj->poste) print $obj->poste;
 				print '</td>';
 			}
 
 			// Address - Phone - Email
-			if (!empty($arrayfields['t.address']['checked']))
-			{
+			if (!empty($arrayfields['t.address']['checked'])) {
 				print '<td>';
 				print $contactstatic->getBannerAddress('contact', $object);
 				print '</td>';
 			}
 
 			// Role
-			if (!empty($arrayfields['sc.role']['checked']))
-			{
+			if (!empty($arrayfields['sc.role']['checked'])) {
 				print '<td>';
 				print $formcompany->showRoles("roles", $contactstatic, 'view');
 				print '</td>';
 			}
 
 			// Status
-			if (!empty($arrayfields['t.statut']['checked']))
-			{
+			if (!empty($arrayfields['t.statut']['checked'])) {
 				print '<td class="center">'.$contactstatic->getLibStatut(5).'</td>';
 			}
 
@@ -1194,16 +1128,14 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 			print '<td align="right">';
 
 			// Add to agenda
-			if (!empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
-			{
+			if (!empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) {
 				print '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&actioncode=&contactid='.$obj->rowid.'&socid='.$object->id.'&backtopage='.urlencode($backtopage).'">';
 				print img_object($langs->trans("Event"), "action");
 				print '</a> &nbsp; ';
 			}
 
 			// Edit
-			if ($user->rights->societe->contact->creer)
-			{
+			if ($user->rights->societe->contact->creer) {
 				print '<a class="editfielda paddingleft" href="'.DOL_URL_ROOT.'/contact/card.php?action=edit&id='.$obj->rowid.'&backtopage='.urlencode($backtopage).'">';
 				print img_edit();
 				print '</a>';
@@ -1288,8 +1220,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 		$search_end = $end_year.'-'.$end_month.'-'.$end_day.' 23:59:59';
 		$tms_end = strtotime($search_end);
 	}
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
 		$search_start = '';
 		$tms_start = '';
 		$search_end = '';
@@ -1316,8 +1247,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 
 	$sql = '';
 
-	if (!empty($conf->agenda->enabled))
-	{
+	if (!empty($conf->agenda->enabled)) {
 		// Recherche histo sur actioncomm
 		if (is_object($objcon) && $objcon->id > 0) {
 			$sql = "SELECT DISTINCT a.id, a.label as label,";
@@ -1370,32 +1300,25 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 			if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')) && $filterobj->id) $sql .= " AND a.fk_soc = ".$filterobj->id;
 			elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { /* Nothing */ }
 			elseif (is_object($filterobj) && get_class($filterobj) == 'Project' && $filterobj->id) $sql .= " AND a.fk_project = ".$filterobj->id;
-			elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent')
-			{
+			elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') {
 				$sql .= " AND a.fk_element = m.rowid AND a.elementtype = 'member'";
 				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-			} elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')
-			{
+			} elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'order_supplier'";
 				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-			} elseif (is_object($filterobj) && get_class($filterobj) == 'Product')
-			{
+			} elseif (is_object($filterobj) && get_class($filterobj) == 'Product') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'product'";
 				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-			} elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')
-			{
+			} elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'ticket'";
 				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-			} elseif (is_object($filterobj) && get_class($filterobj) == 'BOM')
-			{
+			} elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'bom'";
 				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-			} elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat')
-			{
+			} elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'contract'";
 				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-			} elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element)
-			{
+			} elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element) {
 				// Generic case
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = '".$db->escape($filterobj->element).($module ? '@'.$module : '')."'";
 				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
@@ -1445,18 +1368,15 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 	}
 
 	//TODO Add limit in nb of results
-	if ($sql)
-	{
+	if ($sql) {
 		$sql .= $db->order($sortfield_new, $sortorder);
 		dol_syslog("company.lib::show_actions_done", LOG_DEBUG);
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$i = 0;
 			$num = $db->num_rows($resql);
 
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 
 				if ($obj->type == 'action') {
@@ -1527,8 +1447,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 		}
 	}
 
-	if (!empty($conf->agenda->enabled) || (!empty($conf->mailing->enabled) && !empty($objcon->email)))
-	{
+	if (!empty($conf->agenda->enabled) || (!empty($conf->mailing->enabled) && !empty($objcon->email))) {
 		$delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;
 
 		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
@@ -1540,12 +1459,14 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 
 		$actionstatic = new ActionComm($db);
 		$userstatic = new User($db);
+		$userlinkcache = array();
 		$contactstatic = new Contact($db);
+		$elementlinkcache = array();
 
 		$out .= '<form name="listactionsfilter" class="listactionsfilter" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$out .= '<input type="hidden" name="token" value="'.newToken().'">';
 		if ($objcon && get_class($objcon) == 'Contact' &&
-			(is_null($filterobj) || get_class($filterobj) == 'Societe'))
-		{
+			(is_null($filterobj) || get_class($filterobj) == 'Societe')) {
 			$out .= '<input type="hidden" name="id" value="'.$objcon->id.'" />';
 		} else {
 			$out .= '<input type="hidden" name="id" value="'.$filterobj->id.'" />';
@@ -1558,8 +1479,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 		$out .= '<table class="noborder centpercent">';
 
 		$out .= '<tr class="liste_titre">';
-		if ($donetodo)
-		{
+		if ($donetodo) {
 			$out .= '<td class="liste_titre"></td>';
 		}
 		$out .= '<td class="liste_titre"></td>';
@@ -1580,8 +1500,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 		$out .= '</tr>';
 
 		$out .= '<tr class="liste_titre">';
-		if ($donetodo)
-		{
+		if ($donetodo) {
 			$tmp = '';
 			if (get_class($filterobj) == 'Societe') $tmp .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&socid='.$filterobj->id.'&status=done">';
 			$tmp .= ($donetodo != 'done' ? $langs->trans("ActionsToDoShort") : '');
@@ -1606,8 +1525,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 		$caction = new CActionComm($db);
 		$arraylist = $caction->liste_array(1, 'code', '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : 0), '', 1);
 
-		foreach ($histo as $key => $value)
-		{
+		foreach ($histo as $key => $value) {
 			$actionstatic->fetch($histo[$key]['id']); // TODO Do we need this, we already have a lot of data of line into $histo
 
 			$actionstatic->type_picto = $histo[$key]['apicto'];
@@ -1616,8 +1534,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 			$out .= '<tr class="oddeven">';
 
 			// Done or todo
-			if ($donetodo)
-			{
+			if ($donetodo) {
 				$out .= '<td class="nowrap">';
 				$out .= '</td>';
 			}
@@ -1638,10 +1555,15 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 			//$userstatic->id=$histo[$key]['userid'];
 			//$userstatic->login=$histo[$key]['login'];
 			//$out.=$userstatic->getLoginUrl(1);
-			if ($histo[$key]['userid'] > 0)
-			{
-				$userstatic->fetch($histo[$key]['userid']); // TODO Introduce a cache on users fetched
-				$out .= $userstatic->getNomUrl(-1, '', 0, 0, 16, 0, 'firstelselast', '');
+			if ($histo[$key]['userid'] > 0) {
+				if (isset($userlinkcache[$histo[$key]['userid']])) {
+					$link = $userlinkcache[$histo[$key]['userid']];
+				} else {
+					$userstatic->fetch($histo[$key]['userid']);
+					$link = $userstatic->getNomUrl(-1, '', 0, 0, 16, 0, 'firstelselast', '');
+					$userlinkcache[$histo[$key]['userid']] = $link;
+				}
+				$out .= $link;
 			}
 			$out .= '</td>';
 
@@ -1649,8 +1571,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 			$out .= '<td>';
 			// TODO Code common with code into showactions
 			$imgpicto = '';
-			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
-			{
+			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
 				if ($actionstatic->type_picto) {
 					$imgpicto .= img_picto('', $actionstatic->type_picto);
 				}
@@ -1678,8 +1599,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 
 			// Title
 			$out .= '<td>';
-			if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'action')
-			{
+			if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'action') {
 				$transcode = $langs->trans("Action".$histo[$key]['acode']);
 				$libelle = ($transcode != "Action".$histo[$key]['acode'] ? $transcode : $histo[$key]['alabel']);
 				//$actionstatic->libelle=$libelle;
@@ -1687,8 +1607,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 				$actionstatic->id = $histo[$key]['id'];
 				$out .= dol_trunc($libelle, 120);
 			}
-			if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'mailing')
-			{
+			if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'mailing') {
 				$out .= '<a href="'.DOL_URL_ROOT.'/comm/mailing/card.php?id='.$histo[$key]['id'].'">'.img_object($langs->trans("ShowEMailing"), "email").' ';
 				$transcode = $langs->trans("Action".$histo[$key]['acode']);
 				$libelle = ($transcode != "Action".$histo[$key]['acode'] ? $transcode : 'Send mass mailing');
@@ -1699,8 +1618,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 			// Date
 			$out .= '<td class="center nowrap">';
 			$out .= dol_print_date($histo[$key]['datestart'], 'dayhour', 'tzuserrel');
-			if ($histo[$key]['dateend'] && $histo[$key]['dateend'] != $histo[$key]['datestart'])
-			{
+			if ($histo[$key]['dateend'] && $histo[$key]['dateend'] != $histo[$key]['datestart']) {
 				$tmpa = dol_getdate($histo[$key]['datestart'], true);
 				$tmpb = dol_getdate($histo[$key]['dateend'], true);
 				if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $out .= '-'.dol_print_date($histo[$key]['dateend'], 'hour', 'tzuserrel');
@@ -1719,15 +1637,24 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 
 			// Linked object
 			$out .= '<td class="nowraponall">';
-			if (isset($histo[$key]['elementtype']) && !empty($histo[$key]['fk_element']))
-			{
-				$out .= dolGetElementUrl($histo[$key]['fk_element'], $histo[$key]['elementtype'], 1);
-			} else $out .= '&nbsp;';
+			if (isset($histo[$key]['elementtype']) && !empty($histo[$key]['fk_element'])) {
+				if (isset($elementlinkcache[$histo[$key]['elementtype']]) && isset($elementlinkcache[$histo[$key]['elementtype']][$histo[$key]['fk_element']])) {
+					$link = $elementlinkcache[$histo[$key]['elementtype']][$histo[$key]['fk_element']];
+				} else {
+					if (!isset($elementlinkcache[$histo[$key]['elementtype']])) {
+						$elementlinkcache[$histo[$key]['elementtype']] = array();
+					}
+					$link = dolGetElementUrl($histo[$key]['fk_element'], $histo[$key]['elementtype'], 1);
+					$elementlinkcache[$histo[$key]['elementtype']][$histo[$key]['fk_element']] = $link;
+				}
+				$out .= $link;
+			} else {
+				$out .= '&nbsp;';
+			}
 			$out .= '</td>';
 
 			// Contact(s) for action
-			if (empty($objcon->id) && isset($histo[$key]['contact_id']) && $histo[$key]['contact_id'] > 0)
-			{
+			if (empty($objcon->id) && isset($histo[$key]['contact_id']) && $histo[$key]['contact_id'] > 0) {
 				$contactstatic->lastname = $histo[$key]['lastname'];
 				$contactstatic->firstname = $histo[$key]['firstname'];
 				$contactstatic->id = $histo[$key]['contact_id'];
@@ -1798,8 +1725,7 @@ function show_subsidiaries($conf, $langs, $db, $object)
 	$result = $db->query($sql);
 	$num = $db->num_rows($result);
 
-	if ($num)
-	{
+	if ($num) {
 		$socstatic = new Societe($db);
 
 		print load_fiche_titre($langs->trans("Subsidiaries"), '', '');
@@ -1813,8 +1739,7 @@ function show_subsidiaries($conf, $langs, $db, $object)
 
 		$i = 0;
 
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($result);
 
 			$socstatic->id = $obj->rowid;
@@ -1872,8 +1797,7 @@ function addEventTypeSQL(&$sql, $actioncode, $donetodo, $now, $filters, $sqlANDO
 	global $conf, $db;
 	// Condition on actioncode
 
-	if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
-		{
+	if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
 		if ($actioncode == 'AC_NON_AUTO') $sql .= " $sqlANDOR c.type != 'systemauto'";
 		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " $sqlANDOR c.type = 'systemauto'";
 		else {
@@ -1895,12 +1819,12 @@ function addEventTypeSQL(&$sql, $actioncode, $donetodo, $now, $filters, $sqlANDO
 }
 
 /**
- * 		Add Mailing Event Type SQL
+ *  Add Mailing Event Type SQL
  *
- * 		@param	string	    $actioncode		Action code
- * 		@param	string		$objcon		    objcon
- * 		@param	Object		$filterobj      filterobj
- * 		@return	string
+ *  @param	string	    $actioncode		Action code
+ *  @param	Object		$objcon		    objcon
+ *  @param	Object		$filterobj      filterobj
+ *  @return	string
  */
 function addMailingEventTypeSQL($actioncode, $objcon, $filterobj)
 {
diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
index 1589809dd6b..7f7ea22e254 100644
--- a/htdocs/core/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -59,54 +59,54 @@ function contact_prepare_head(Contact $object)
 	$tab++;
 
 	// Related items
-    if (! empty($conf->commande->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->facture->enabled) || ! empty($conf->ficheinter->enabled) || !empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
-    {
-        $head[$tab][0] = DOL_URL_ROOT.'/contact/consumption.php?id='.$object->id;
-        $head[$tab][1] = $langs->trans("Referers");
-        $head[$tab][2] = 'consumption';
-        $tab++;
-    }
+	if (!empty($conf->commande->enabled) || !empty($conf->propal->enabled) || !empty($conf->facture->enabled) || !empty($conf->ficheinter->enabled) || !empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
+	{
+		$head[$tab][0] = DOL_URL_ROOT.'/contact/consumption.php?id='.$object->id;
+		$head[$tab][1] = $langs->trans("Referers");
+		$head[$tab][2] = 'consumption';
+		$tab++;
+	}
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $tab, 'contact');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $tab, 'contact');
 
-    // Notes
-    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
-        $nbNote = (empty($object->note_private) ? 0 : 1) + (empty($object->note_public) ? 0 : 1);
-        $head[$tab][0] = DOL_URL_ROOT.'/contact/note.php?id='.$object->id;
-        $head[$tab][1] = $langs->trans("Note");
-        if ($nbNote > 0) $head[$tab][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
-        $head[$tab][2] = 'note';
-        $tab++;
-    }
+	// Notes
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+		$nbNote = (empty($object->note_private) ? 0 : 1) + (empty($object->note_public) ? 0 : 1);
+		$head[$tab][0] = DOL_URL_ROOT.'/contact/note.php?id='.$object->id;
+		$head[$tab][1] = $langs->trans("Note");
+		if ($nbNote > 0) $head[$tab][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		$head[$tab][2] = 'note';
+		$tab++;
+	}
 
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    $upload_dir = $conf->societe->dir_output."/contact/".dol_sanitizeFileName($object->ref);
-    $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
-    $head[$tab][0] = DOL_URL_ROOT.'/contact/document.php?id='.$object->id;
-    $head[$tab][1] = $langs->trans("Documents");
-    if (($nbFiles + $nbLinks) > 0) $head[$tab][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
-    $head[$tab][2] = 'documents';
-    $tab++;
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->societe->dir_output."/contact/".dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+	$nbLinks = Link::count($db, $object->element, $object->id);
+	$head[$tab][0] = DOL_URL_ROOT.'/contact/document.php?id='.$object->id;
+	$head[$tab][1] = $langs->trans("Documents");
+	if (($nbFiles + $nbLinks) > 0) $head[$tab][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	$head[$tab][2] = 'documents';
+	$tab++;
 
-    // Agenda / Events
-    $head[$tab][0] = DOL_URL_ROOT.'/contact/agenda.php?id='.$object->id;
-    $head[$tab][1] .= $langs->trans("Events");
-    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-    {
-        $head[$tab][1] .= '/';
-        $head[$tab][1] .= $langs->trans("Agenda");
-    }
-    $head[$tab][2] = 'agenda';
-    $tab++;
+	// Agenda / Events
+	$head[$tab][0] = DOL_URL_ROOT.'/contact/agenda.php?id='.$object->id;
+	$head[$tab][1] .= $langs->trans("Events");
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
+	{
+		$head[$tab][1] .= '/';
+		$head[$tab][1] .= $langs->trans("Agenda");
+	}
+	$head[$tab][2] = 'agenda';
+	$tab++;
 
-    // Log
-    /*
+	// Log
+	/*
     $head[$tab][0] = DOL_URL_ROOT.'/contact/info.php?id='.$object->id;
 	$head[$tab][1] = $langs->trans("Info");
 	$head[$tab][2] = 'info';
diff --git a/htdocs/core/lib/contract.lib.php b/htdocs/core/lib/contract.lib.php
index b7d3c45bee3..c72c46c8916 100644
--- a/htdocs/core/lib/contract.lib.php
+++ b/htdocs/core/lib/contract.lib.php
@@ -42,37 +42,37 @@ function contract_prepare_head(Contrat $object)
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
-	    $head[$h][0] = DOL_URL_ROOT.'/contrat/contact.php?id='.$object->id;
+		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
+		$head[$h][0] = DOL_URL_ROOT.'/contrat/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("ContactsAddresses");
 		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
 		$head[$h][2] = 'contact';
 		$h++;
 	}
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'contract');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'contract');
 
-    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-    {
-    	$nbNote = 0;
-        if (!empty($object->note_private)) $nbNote++;
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+	{
+		$nbNote = 0;
+		if (!empty($object->note_private)) $nbNote++;
 		if (!empty($object->note_public)) $nbNote++;
-    	$head[$h][0] = DOL_URL_ROOT.'/contrat/note.php?id='.$object->id;
-    	$head[$h][1] = $langs->trans("Notes");
+		$head[$h][0] = DOL_URL_ROOT.'/contrat/note.php?id='.$object->id;
+		$head[$h][1] = $langs->trans("Notes");
 		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
-    	$head[$h][2] = 'note';
-    	$h++;
-    }
+		$head[$h][2] = 'note';
+		$h++;
+	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->contrat->dir_output."/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/contrat/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Documents");
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
@@ -89,7 +89,7 @@ function contract_prepare_head(Contrat $object)
 	$head[$h][2] = 'agenda';
 	$h++;
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'contract', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'contract', 'remove');
 
 	return $head;
 }
@@ -119,13 +119,13 @@ function contract_admin_prepare_head()
 
 	$head[$h][0] = DOL_URL_ROOT.'/contrat/admin/contract_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
-    $head[$h][2] = 'attributes';
-    $h++;
+	$head[$h][2] = 'attributes';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/contrat/admin/contractdet_extrafields.php';
-    $head[$h][1] = $langs->trans("ExtraFieldsLines");
-    $head[$h][2] = 'attributeslines';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/contrat/admin/contractdet_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFieldsLines");
+	$head[$h][2] = 'attributeslines';
+	$h++;
 
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'contract_admin', 'remove');
 
diff --git a/htdocs/core/lib/cron.lib.php b/htdocs/core/lib/cron.lib.php
index 1779e77213e..fda122be7bf 100644
--- a/htdocs/core/lib/cron.lib.php
+++ b/htdocs/core/lib/cron.lib.php
@@ -30,21 +30,26 @@
  */
 function cronadmin_prepare_head()
 {
-    global $langs, $conf, $user;
-    $h = 0;
-    $head = array();
+	global $langs, $conf, $user;
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = dol_buildpath('/cron/admin/cron.php', 1);
-    $head[$h][1] = $langs->trans("Miscellaneous");
-    $head[$h][2] = 'setup';
-    $h++;
+	$head[$h][0] = dol_buildpath('/cron/admin/cron.php', 1);
+	$head[$h][1] = $langs->trans("Miscellaneous");
+	$head[$h][2] = 'setup';
+	$h++;
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'cronadmin');
+	$head[$h][0] = dol_buildpath('/cron/list.php?mode=modulesetup', 1);
+	$head[$h][1] = $langs->trans("Module2300Name");
+	$head[$h][2] = 'jobs';
+	$h++;
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'cronadmin', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'cronadmin');
+
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'cronadmin', 'remove');
 
 
-    return $head;
+	return $head;
 }
 
 /**
@@ -99,8 +104,8 @@ function dol_print_cron_urls()
 	print ' '.$langs->trans("OrToLaunchASpecificJob").'<br>';
 	$url = $urlwithroot.'/public/cron/cron_run_jobs.php?'.(empty($conf->global->CRON_KEY) ? '' : 'securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login.'&id=cronjobid';
 	print img_picto('', 'globe').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
-    print '</div>';
-    print '<br>';
+	print '</div>';
+	print '<br>';
 
 	$logintouse = 'firstadmin';
 	if ($user->admin) $logintouse = $user->login;
@@ -114,18 +119,18 @@ function dol_print_cron_urls()
 	// Add note
 	if (empty($conf->global->CRON_DISABLE_TUTORIAL_CRON))
 	{
-    	$linuxlike = 1;
-    	if (preg_match('/^win/i', PHP_OS)) $linuxlike = 0;
-    	if (preg_match('/^mac/i', PHP_OS)) $linuxlike = 0;
-    	print $langs->trans("Note").': ';
-    	if ($linuxlike)
-    	{
-    		print $langs->trans("CronExplainHowToRunUnix");
-    		print '<br>';
-    		print '<textarea class="quatrevingtpercent">*/5 * * * * pathtoscript/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY) ? 'securitykey' : ''.$conf->global->CRON_KEY.'').' '.$logintouse.' &gt; '.DOL_DATA_ROOT.'/cron_run_jobs.php.log</textarea><br>';
-    	} else {
-    		print $langs->trans("CronExplainHowToRunWin");
-    	}
+		$linuxlike = 1;
+		if (preg_match('/^win/i', PHP_OS)) $linuxlike = 0;
+		if (preg_match('/^mac/i', PHP_OS)) $linuxlike = 0;
+		print $langs->trans("Note").': ';
+		if ($linuxlike)
+		{
+			print $langs->trans("CronExplainHowToRunUnix");
+			print '<br>';
+			print '<textarea class="quatrevingtpercent">*/5 * * * * pathtoscript/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY) ? 'securitykey' : ''.$conf->global->CRON_KEY.'').' '.$logintouse.' &gt; '.DOL_DATA_ROOT.'/cron_run_jobs.php.log</textarea><br>';
+		} else {
+			print $langs->trans("CronExplainHowToRunWin");
+		}
 	}
 
 	return 0;
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 48e347afbd1..163f6d85b6d 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -33,34 +33,34 @@
  */
 function get_tz_array()
 {
-    $tzarray = array(
-        -11=>"Pacific/Midway",
-        -10=>"Pacific/Fakaofo",
-        -9=>"America/Anchorage",
-        -8=>"America/Los_Angeles",
-        -7=>"America/Dawson_Creek",
-        -6=>"America/Chicago",
-        -5=>"America/Bogota",
-        -4=>"America/Anguilla",
-        -3=>"America/Araguaina",
-        -2=>"America/Noronha",
-        -1=>"Atlantic/Azores",
-        0=>"Africa/Abidjan",
-        1=>"Europe/Paris",
-        2=>"Europe/Helsinki",
-        3=>"Europe/Moscow",
-        4=>"Asia/Dubai",
-        5=>"Asia/Karachi",
-        6=>"Indian/Chagos",
-        7=>"Asia/Jakarta",
-        8=>"Asia/Hong_Kong",
-        9=>"Asia/Tokyo",
-        10=>"Australia/Sydney",
-        11=>"Pacific/Noumea",
-        12=>"Pacific/Auckland",
-        13=>"Pacific/Enderbury"
-    );
-    return $tzarray;
+	$tzarray = array(
+		-11=>"Pacific/Midway",
+		-10=>"Pacific/Fakaofo",
+		-9=>"America/Anchorage",
+		-8=>"America/Los_Angeles",
+		-7=>"America/Dawson_Creek",
+		-6=>"America/Chicago",
+		-5=>"America/Bogota",
+		-4=>"America/Anguilla",
+		-3=>"America/Araguaina",
+		-2=>"America/Noronha",
+		-1=>"Atlantic/Azores",
+		0=>"Africa/Abidjan",
+		1=>"Europe/Paris",
+		2=>"Europe/Helsinki",
+		3=>"Europe/Moscow",
+		4=>"Asia/Dubai",
+		5=>"Asia/Karachi",
+		6=>"Indian/Chagos",
+		7=>"Asia/Jakarta",
+		8=>"Asia/Hong_Kong",
+		9=>"Asia/Tokyo",
+		10=>"Australia/Sydney",
+		11=>"Pacific/Noumea",
+		12=>"Pacific/Auckland",
+		13=>"Pacific/Enderbury"
+	);
+	return $tzarray;
 }
 
 
@@ -71,35 +71,35 @@ function get_tz_array()
  */
 function getServerTimeZoneString()
 {
-    return @date_default_timezone_get();
+	return @date_default_timezone_get();
 }
 
 /**
  * Return server timezone int.
  *
  * @param	string	$refgmtdate		Reference period for timezone (timezone differs on winter and summer. May be 'now', 'winter' or 'summer')
- * @return 	int						An offset in hour (+1 for Europe/Paris on winter and +2 for Europe/Paris on summer)
+ * @return 	float					An offset in hour (+1 for Europe/Paris on winter and +2 for Europe/Paris on summer). Note some countries use half and even quarter hours.
  */
 function getServerTimeZoneInt($refgmtdate = 'now')
 {
-    if (method_exists('DateTimeZone', 'getOffset'))
-    {
-        // Method 1 (include daylight)
-        $gmtnow = dol_now('gmt'); $yearref = dol_print_date($gmtnow, '%Y'); $monthref = dol_print_date($gmtnow, '%m'); $dayref = dol_print_date($gmtnow, '%d');
-        if ($refgmtdate == 'now') $newrefgmtdate = $yearref.'-'.$monthref.'-'.$dayref;
-        elseif ($refgmtdate == 'summer') $newrefgmtdate = $yearref.'-08-01';
-        else $newrefgmtdate = $yearref.'-01-01';
-        $newrefgmtdate .= 'T00:00:00+00:00';
-        $localtz = new DateTimeZone(getServerTimeZoneString());
-        $localdt = new DateTime($newrefgmtdate, $localtz);
-        $tmp = -1 * $localtz->getOffset($localdt);
-        //print $refgmtdate.'='.$tmp;
-    } else {
-    	$tmp = 0;
-    	dol_print_error('', 'PHP version must be 5.3+');
-    }
-    $tz = round(($tmp < 0 ? 1 : -1) * abs($tmp / 3600));
-    return $tz;
+	if (method_exists('DateTimeZone', 'getOffset'))
+	{
+		// Method 1 (include daylight)
+		$gmtnow = dol_now('gmt'); $yearref = dol_print_date($gmtnow, '%Y'); $monthref = dol_print_date($gmtnow, '%m'); $dayref = dol_print_date($gmtnow, '%d');
+		if ($refgmtdate == 'now') $newrefgmtdate = $yearref.'-'.$monthref.'-'.$dayref;
+		elseif ($refgmtdate == 'summer') $newrefgmtdate = $yearref.'-08-01';
+		else $newrefgmtdate = $yearref.'-01-01';
+		$newrefgmtdate .= 'T00:00:00+00:00';
+		$localtz = new DateTimeZone(getServerTimeZoneString());
+		$localdt = new DateTime($newrefgmtdate, $localtz);
+		$tmp = -1 * $localtz->getOffset($localdt);
+		//print $refgmtdate.'='.$tmp;
+	} else {
+		$tmp = 0;
+		dol_print_error('', 'PHP version must be 5.3+');
+	}
+	$tz = round(($tmp < 0 ? 1 : -1) * abs($tmp / 3600));
+	return $tz;
 }
 
 
@@ -182,15 +182,15 @@ function convertSecondToTime($iSecond, $format = 'all', $lengthOfDay = 86400, $l
 	global $langs;
 
 	if (empty($lengthOfDay))  $lengthOfDay = 86400; // 1 day = 24 hours
-    if (empty($lengthOfWeek)) $lengthOfWeek = 7; // 1 week = 7 days
+	if (empty($lengthOfWeek)) $lengthOfWeek = 7; // 1 week = 7 days
 
-    if ($format == 'all' || $format == 'allwithouthour' || $format == 'allhour' || $format == 'allhourmin' || $format == 'allhourminsec')
+	if ($format == 'all' || $format == 'allwithouthour' || $format == 'allhour' || $format == 'allhourmin' || $format == 'allhourminsec')
 	{
 		if ((int) $iSecond === 0) return '0'; // This is to avoid having 0 return a 12:00 AM for en_US
 
-        $sTime = '';
-        $sDay = 0;
-        $sWeek = 0;
+		$sTime = '';
+		$sDay = 0;
+		$sWeek = 0;
 
 		if ($iSecond >= $lengthOfDay)
 		{
@@ -205,17 +205,17 @@ function convertSecondToTime($iSecond, $format = 'all', $lengthOfDay = 86400, $l
 
 		if ($lengthOfWeek < 7)
 		{
-        	if ($sDay)
-            {
-                if ($sDay >= $lengthOfWeek)
-                {
-                    $sWeek = (int) (($sDay - $sDay % $lengthOfWeek) / $lengthOfWeek);
-                    $sDay = $sDay % $lengthOfWeek;
-                    $weekTranslate = $langs->trans("DurationWeek");
-                    if ($sWeek >= 2) $weekTranslate = $langs->trans("DurationWeeks");
-                    $sTime .= $sWeek.' '.$weekTranslate.' ';
-                }
-            }
+			if ($sDay)
+			{
+				if ($sDay >= $lengthOfWeek)
+				{
+					$sWeek = (int) (($sDay - $sDay % $lengthOfWeek) / $lengthOfWeek);
+					$sDay = $sDay % $lengthOfWeek;
+					$weekTranslate = $langs->trans("DurationWeek");
+					if ($sWeek >= 2) $weekTranslate = $langs->trans("DurationWeeks");
+					$sTime .= $sWeek.' '.$weekTranslate.' ';
+				}
+			}
 		}
 		if ($sDay > 0)
 		{
@@ -232,10 +232,10 @@ function convertSecondToTime($iSecond, $format = 'all', $lengthOfDay = 86400, $l
 			}
 		} elseif ($format == 'allhourminsec')
 		{
-		    return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60))).':'.sprintf("%02d", ((int) ($iSecond % 60)));
+			return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60))).':'.sprintf("%02d", ((int) ($iSecond % 60)));
 		} elseif ($format == 'allhourmin')
 		{
-		    return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60)));
+			return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60)));
 		} elseif ($format == 'allhour')
 		{
 			return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600)));
@@ -255,16 +255,16 @@ function convertSecondToTime($iSecond, $format = 'all', $lengthOfDay = 86400, $l
 	{
 		$sTime = dol_print_date($iSecond, '%M', true);
 	} elseif ($format == 'sec')	// only sec part
-    {
-        $sTime = dol_print_date($iSecond, '%S', true);
-    } elseif ($format == 'month')	// only month part
-    {
-        $sTime = dol_print_date($iSecond, '%m', true);
-    } elseif ($format == 'year')	// only year part
-    {
-        $sTime = dol_print_date($iSecond, '%Y', true);
-    }
-    return trim($sTime);
+	{
+		$sTime = dol_print_date($iSecond, '%S', true);
+	} elseif ($format == 'month')	// only month part
+	{
+		$sTime = dol_print_date($iSecond, '%m', true);
+	} elseif ($format == 'year')	// only year part
+	{
+		$sTime = dol_print_date($iSecond, '%Y', true);
+	}
+	return trim($sTime);
 }
 
 
@@ -319,40 +319,40 @@ function dolSqlDateFilter($datefield, $day_date, $month_date, $year_date, $exclu
 function dol_stringtotime($string, $gm = 1)
 {
 	$reg = array();
-    // Convert date with format DD/MM/YYY HH:MM:SS. This part of code should not be used.
-    if (preg_match('/^([0-9]+)\/([0-9]+)\/([0-9]+)\s?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $string, $reg))
-    {
-        dol_syslog("dol_stringtotime call to function with deprecated parameter format", LOG_WARNING);
-        // Date est au format 'DD/MM/YY' ou 'DD/MM/YY HH:MM:SS'
-        // Date est au format 'DD/MM/YYYY' ou 'DD/MM/YYYY HH:MM:SS'
-        $sday = $reg[1];
-        $smonth = $reg[2];
-        $syear = $reg[3];
-        $shour = $reg[4];
-        $smin = $reg[5];
-        $ssec = $reg[6];
-        if ($syear < 50) $syear += 1900;
-        if ($syear >= 50 && $syear < 100) $syear += 2000;
-        $string = sprintf("%04d%02d%02d%02d%02d%02d", $syear, $smonth, $sday, $shour, $smin, $ssec);
-    } elseif (
-    	   preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z$/i', $string, $reg)	// Convert date with format YYYY-MM-DDTHH:MM:SSZ (RFC3339)
-    	|| preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})$/i', $string, $reg)	// Convert date with format YYYY-MM-DD HH:MM:SS
+	// Convert date with format DD/MM/YYY HH:MM:SS. This part of code should not be used.
+	if (preg_match('/^([0-9]+)\/([0-9]+)\/([0-9]+)\s?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $string, $reg))
+	{
+		dol_syslog("dol_stringtotime call to function with deprecated parameter format", LOG_WARNING);
+		// Date est au format 'DD/MM/YY' ou 'DD/MM/YY HH:MM:SS'
+		// Date est au format 'DD/MM/YYYY' ou 'DD/MM/YYYY HH:MM:SS'
+		$sday = $reg[1];
+		$smonth = $reg[2];
+		$syear = $reg[3];
+		$shour = $reg[4];
+		$smin = $reg[5];
+		$ssec = $reg[6];
+		if ($syear < 50) $syear += 1900;
+		if ($syear >= 50 && $syear < 100) $syear += 2000;
+		$string = sprintf("%04d%02d%02d%02d%02d%02d", $syear, $smonth, $sday, $shour, $smin, $ssec);
+	} elseif (
+		   preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z$/i', $string, $reg)	// Convert date with format YYYY-MM-DDTHH:MM:SSZ (RFC3339)
+		|| preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})$/i', $string, $reg)	// Convert date with format YYYY-MM-DD HH:MM:SS
    		|| preg_match('/^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2})([0-9]{2})([0-9]{2})Z$/i', $string, $reg)		// Convert date with format YYYYMMDDTHHMMSSZ
-    )
-    {
-        $syear = $reg[1];
-        $smonth = $reg[2];
-        $sday = $reg[3];
-        $shour = $reg[4];
-        $smin = $reg[5];
-        $ssec = $reg[6];
-        $string = sprintf("%04d%02d%02d%02d%02d%02d", $syear, $smonth, $sday, $shour, $smin, $ssec);
-    }
+	)
+	{
+		$syear = $reg[1];
+		$smonth = $reg[2];
+		$sday = $reg[3];
+		$shour = $reg[4];
+		$smin = $reg[5];
+		$ssec = $reg[6];
+		$string = sprintf("%04d%02d%02d%02d%02d%02d", $syear, $smonth, $sday, $shour, $smin, $ssec);
+	}
 
-    $string = preg_replace('/([^0-9])/i', '', $string);
-    $tmp = $string.'000000';
-    $date = dol_mktime(substr($tmp, 8, 2), substr($tmp, 10, 2), substr($tmp, 12, 2), substr($tmp, 4, 2), substr($tmp, 6, 2), substr($tmp, 0, 4), ($gm ? 1 : 0));
-    return $date;
+	$string = preg_replace('/([^0-9])/i', '', $string);
+	$tmp = $string.'000000';
+	$date = dol_mktime(substr($tmp, 8, 2), substr($tmp, 10, 2), substr($tmp, 12, 2), substr($tmp, 4, 2), substr($tmp, 6, 2), substr($tmp, 0, 4), ($gm ? 1 : 0));
+	return $date;
 }
 
 
@@ -548,28 +548,28 @@ function dol_get_first_day_week($day, $month, $year, $gm = false)
 	$days = $start_week - $tmparray['wday'];
  	if ($days >= 1) $days = 7 - $days;
  	$days = abs($days);
-    $seconds = $days * 24 * 60 * 60;
+	$seconds = $days * 24 * 60 * 60;
 	//print 'start_week='.$start_week.' tmparray[wday]='.$tmparray['wday'].' day offset='.$days.' seconds offset='.$seconds.'<br>';
 
-    //Get first day of week
-    $tmpdaytms = date($tmparray[0]) - $seconds; // $tmparray[0] is day of parameters
+	//Get first day of week
+	$tmpdaytms = date($tmparray[0]) - $seconds; // $tmparray[0] is day of parameters
 	$tmpday = date("d", $tmpdaytms);
 
 	//Check first day of week is in same month than current day or not
 	if ($tmpday > $day)
-    {
-    	$prev_month = $month - 1;
+	{
+		$prev_month = $month - 1;
 		$prev_year = $year;
 
-    	if ($prev_month == 0)
-    	{
-    		$prev_month = 12;
-    		$prev_year  = $year - 1;
-    	}
-    } else {
-    	$prev_month = $month;
+		if ($prev_month == 0)
+		{
+			$prev_month = 12;
+			$prev_year  = $year - 1;
+		}
+	} else {
+		$prev_month = $month;
 		$prev_year = $year;
-    }
+	}
 	$tmpmonth = $prev_month;
 	$tmpyear = $prev_year;
 
@@ -577,30 +577,45 @@ function dol_get_first_day_week($day, $month, $year, $gm = false)
 	$tmptime = dol_mktime(12, 0, 0, $month, $tmpday, $year, 1, 0);
 	$tmptime -= 24 * 60 * 60 * 7;
 	$tmparray = dol_getdate($tmptime, true);
-    $prev_day = $tmparray['mday'];
+	$prev_day = $tmparray['mday'];
 
-    //Check prev day of week is in same month than first day or not
+	//Check prev day of week is in same month than first day or not
 	if ($prev_day > $tmpday)
-    {
-    	$prev_month = $month - 1;
+	{
+		$prev_month = $month - 1;
 		$prev_year = $year;
 
-    	if ($prev_month == 0)
-    	{
-    		$prev_month = 12;
-    		$prev_year  = $year - 1;
-    	}
-    }
+		if ($prev_month == 0)
+		{
+			$prev_month = 12;
+			$prev_year  = $year - 1;
+		}
+	}
 
-    $week = date("W", dol_mktime(0, 0, 0, $tmpmonth, $tmpday, $tmpyear, $gm));
+	$week = date("W", dol_mktime(0, 0, 0, $tmpmonth, $tmpday, $tmpyear, $gm));
 
 	return array('year' => $year, 'month' => $month, 'week' => $week, 'first_day' => $tmpday, 'first_month' => $tmpmonth, 'first_year' => $tmpyear, 'prev_year' => $prev_year, 'prev_month' => $prev_month, 'prev_day' => $prev_day);
 }
 
+/**
+ *	Return the easter day in GMT time.
+ *  This function replaces easter_date() that returns a date in local TZ.
+ *
+ *	@param	    int			$year     			Year
+ *	@return   	int								GMT Date of easter day
+ */
+function getGMTEasterDatetime($year)
+{
+	$base = new DateTime("$year-03-21");
+	$days = easter_days($year);	// Return number of days between 21 march and easter day.
+	$tmp = $base->add(new DateInterval("P{$days}D"));
+	return $tmp->getTimestamp();
+}
+
 /**
  *	Return the number of non working days including saturday and sunday (or not) between 2 dates in timestamp.
  *  Dates must be UTC with hour, day, min to 0.
- *	Called by function num_open_day
+ *	Called by function num_open_day()
  *
  *	@param	    int			$timestampStart     Timestamp de debut
  *	@param	    int			$timestampEnd       Timestamp de fin
@@ -616,30 +631,32 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 	global $db, $conf, $mysoc;
 
 	$nbFerie = 0;
-	$specialdayrule = array();
 
 	// Check to ensure we use correct parameters
-	if ((($timestampEnd - $timestampStart) % 86400) != 0) return 'ErrorDates must use same hours and must be GMT dates';
+	if ((($timestampEnd - $timestampStart) % 86400) != 0) return 'Error Dates must use same hours and must be GMT dates';
 
 	if (empty($country_code)) $country_code = $mysoc->country_code;
 
 	if ($includesaturday < 0) $includesaturday = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY : 1);
 	if ($includesunday < 0)   $includesunday   = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY : 1);
 
+	$country_id = dol_getIdFromCode($db, $country_code, 'c_country', 'code', 'rowid');
 
 	$i = 0;
 	while ((($lastday == 0 && $timestampStart < $timestampEnd) || ($lastday && $timestampStart <= $timestampEnd))
-	    && ($i < 50000))		// Loop end when equals (Test on i is a security loop to avoid infinite loop)
+		&& ($i < 50000))		// Loop end when equals (Test on i is a security loop to avoid infinite loop)
 	{
 		$ferie = false;
+		$specialdayrule = array();
 
-		$jour  = date("d", $timestampStart);
-		$mois  = date("m", $timestampStart);
-		$annee = date("Y", $timestampStart);
+		$jour  = gmdate("d", $timestampStart);
+		$mois  = gmdate("m", $timestampStart);
+		$annee = gmdate("Y", $timestampStart);
 
-		$country_id = dol_getIdFromCode($db, $country_code, 'c_country', 'code', 'rowid');
+		//print "jour=".$jour." month=".$mois." year=".$annee." includesaturday=".$includesaturday." includesunday=".$includesunday."\n";
 
-		// Loop on public holiday defined into hrm_public_holiday
+		// Loop on public holiday defined into hrm_public_holiday for the day, month and year analyzed
+		// TODO Execute this request first and store results into an array, then reuse this array.
 		$sql = "SELECT code, entity, fk_country, dayrule, year, month, day, active";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_hrm_public_holiday";
 		$sql .= " WHERE active = 1 and fk_country IN (0".($country_id > 0 ? ", ".$country_id : 0).")";
@@ -671,139 +688,147 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 			dol_syslog($db->lasterror(), LOG_ERR);
 			return 'Error sql '.$db->lasterror();
 		}
+		//var_dump($specialdayrule)."\n";
+		//print "ferie=".$ferie."\n";
 
-		// Special dayrules
-		if (in_array('easter', $specialdayrule))
-		{
-			// Calculation for easter date
-			$date_paques = easter_date($annee);
-			$jour_paques = date("d", $date_paques);
-			$mois_paques = date("m", $date_paques);
-			if ($jour_paques == $jour && $mois_paques == $mois) $ferie = true;
-			// Easter (sunday)
-		}
+		if (!$ferie) {
+			// Special dayrules
+			if (in_array('easter', $specialdayrule))
+			{
+				// Calculation for easter date
+				$date_paques = getGMTEasterDatetime($annee);
+				$jour_paques = gmdate("d", $date_paques);
+				$mois_paques = gmdate("m", $date_paques);
+				if ($jour_paques == $jour && $mois_paques == $mois) $ferie = true;
+				// Easter (sunday)
+			}
 
-		if (in_array('eastermonday', $specialdayrule))
-		{
-			// Calculation for the monday of easter date
-			$date_paques = easter_date($annee);
-			$date_lundi_paques = mktime(
-                date("H", $date_paques),
-                date("i", $date_paques),
-                date("s", $date_paques),
-                date("m", $date_paques),
-                date("d", $date_paques) + 1,
-                date("Y", $date_paques)
-            );
-			$jour_lundi_ascension = date("d", $date_lundi_paques);
-			$mois_lundi_ascension = date("m", $date_lundi_paques);
-			if ($jour_lundi_ascension == $jour && $mois_lundi_ascension == $mois) $ferie = true;
-			// Easter (monday)
-		}
-
-		if (in_array('ascension', $specialdayrule))
-		{
-			// Calcul du jour de l'ascension (39 days after easter day)
-			$date_paques = easter_date($annee);
-			$date_ascension = mktime(
-                date("H", $date_paques),
-                date("i", $date_paques),
-                date("s", $date_paques),
-                date("m", $date_paques),
-                date("d", $date_paques) + 39,
-                date("Y", $date_paques)
-            );
-			$jour_ascension = date("d", $date_ascension);
-			$mois_ascension = date("m", $date_ascension);
-			if ($jour_ascension == $jour && $mois_ascension == $mois) $ferie = true;
-			// Ascension (thursday)
-		}
-
-		if (in_array('pentecote', $specialdayrule))
-		{
-			// Calculation of "Pentecote" (49 days after easter day)
-			$date_paques = easter_date($annee);
-			$date_pentecote = mktime(
-                date("H", $date_paques),
-                date("i", $date_paques),
-                date("s", $date_paques),
-                date("m", $date_paques),
-                date("d", $date_paques) + 49,
-                date("Y", $date_paques)
-            );
-			$jour_pentecote = date("d", $date_pentecote);
-			$mois_pentecote = date("m", $date_pentecote);
-			if ($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie = true;
-			// "Pentecote" (sunday)
-		}
-		if (in_array('pentecotemonday', $specialdayrule))
-		{
-			// Calculation of "Pentecote" (49 days after easter day)
-			$date_paques = easter_date($annee);
-			$date_pentecote = mktime(
-				date("H", $date_paques),
-				date("i", $date_paques),
-				date("s", $date_paques),
-				date("m", $date_paques),
-				date("d", $date_paques) + 50,
-				date("Y", $date_paques)
+			if (in_array('eastermonday', $specialdayrule))
+			{
+				// Calculation for the monday of easter date
+				$date_paques = getGMTEasterDatetime($annee);
+				$date_lundi_paques = mktime(
+					gmdate("H", $date_paques),
+					gmdate("i", $date_paques),
+					gmdate("s", $date_paques),
+					gmdate("m", $date_paques),
+					gmdate("d", $date_paques) + 1,
+					gmdate("Y", $date_paques)
 				);
-			$jour_pentecote = date("d", $date_pentecote);
-			$mois_pentecote = date("m", $date_pentecote);
-			if ($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie = true;
-			// "Pentecote" (monday)
-		}
+				$jour_lundi_paques = gmdate("d", $date_lundi_paques);
+				$mois_lundi_paques = gmdate("m", $date_lundi_paques);
+				if ($jour_lundi_paques == $jour && $mois_lundi_paques == $mois) $ferie = true;
+				// Easter (monday)
+			}
 
-		if (in_array('viernessanto', $specialdayrule))
-		{
-			// Viernes Santo
-			$date_paques = easter_date($annee);
-			$date_viernes = mktime(
-                date("H", $date_paques),
-                date("i", $date_paques),
-                date("s", $date_paques),
-                date("m", $date_paques),
-                date("d", $date_paques) - 2,
-                date("Y", $date_paques)
-            );
-			$jour_viernes = date("d", $date_viernes);
-			$mois_viernes = date("m", $date_viernes);
-			if ($jour_viernes == $jour && $mois_viernes == $mois) $ferie = true;
-			//Viernes Santo
-		}
+			if (in_array('ascension', $specialdayrule))
+			{
+				// Calcul du jour de l'ascension (39 days after easter day)
+				$date_paques = getGMTEasterDatetime($annee);
+				$date_ascension = mktime(
+					gmdate("H", $date_paques),
+					gmdate("i", $date_paques),
+					gmdate("s", $date_paques),
+					gmdate("m", $date_paques),
+					gmdate("d", $date_paques) + 39,
+					gmdate("Y", $date_paques)
+				);
+				$jour_ascension = gmdate("d", $date_ascension);
+				$mois_ascension = gmdate("m", $date_ascension);
+				if ($jour_ascension == $jour && $mois_ascension == $mois) $ferie = true;
+				// Ascension (thursday)
+			}
 
-		if (in_array('fronleichnam', $specialdayrule))
-		{
-		    // Fronleichnam (60 days after easter sunday)
-			$date_paques = easter_date($annee);
-			$date_fronleichnam = mktime(
-		        date("H", $date_paques),
-		        date("i", $date_paques),
-		        date("s", $date_paques),
-		        date("m", $date_paques),
-		        date("d", $date_paques) + 60,
-		        date("Y", $date_paques)
-		        );
-		    $jour_fronleichnam = date("d", $date_fronleichnam);
-		    $mois_fronleichnam = date("m", $date_fronleichnam);
-		    if ($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) $ferie = true;
-		    // Fronleichnam
+			if (in_array('pentecote', $specialdayrule))
+			{
+				// Calculation of "Pentecote" (49 days after easter day)
+				$date_paques = getGMTEasterDatetime($annee);
+				$date_pentecote = mktime(
+					gmdate("H", $date_paques),
+					gmdate("i", $date_paques),
+					gmdate("s", $date_paques),
+					gmdate("m", $date_paques),
+					gmdate("d", $date_paques) + 49,
+					gmdate("Y", $date_paques)
+				);
+				$jour_pentecote = gmdate("d", $date_pentecote);
+				$mois_pentecote = gmdate("m", $date_pentecote);
+				if ($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie = true;
+				// "Pentecote" (sunday)
+			}
+			if (in_array('pentecotemonday', $specialdayrule))
+			{
+				// Calculation of "Pentecote" (49 days after easter day)
+				$date_paques = getGMTEasterDatetime($annee);
+				$date_pentecote = mktime(
+					gmdate("H", $date_paques),
+					gmdate("i", $date_paques),
+					gmdate("s", $date_paques),
+					gmdate("m", $date_paques),
+					gmdate("d", $date_paques) + 50,
+					gmdate("Y", $date_paques)
+					);
+				$jour_pentecote = gmdate("d", $date_pentecote);
+				$mois_pentecote = gmdate("m", $date_pentecote);
+				if ($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie = true;
+				// "Pentecote" (monday)
+			}
+
+			if (in_array('viernessanto', $specialdayrule))
+			{
+				// Viernes Santo
+				$date_paques = getGMTEasterDatetime($annee);
+				$date_viernes = mktime(
+					gmdate("H", $date_paques),
+					gmdate("i", $date_paques),
+					gmdate("s", $date_paques),
+					gmdate("m", $date_paques),
+					gmdate("d", $date_paques) - 2,
+					gmdate("Y", $date_paques)
+				);
+				$jour_viernes = gmdate("d", $date_viernes);
+				$mois_viernes = gmdate("m", $date_viernes);
+				if ($jour_viernes == $jour && $mois_viernes == $mois) $ferie = true;
+				//Viernes Santo
+			}
+
+			if (in_array('fronleichnam', $specialdayrule))
+			{
+				// Fronleichnam (60 days after easter sunday)
+				$date_paques = getGMTEasterDatetime($annee);
+				$date_fronleichnam = mktime(
+					gmdate("H", $date_paques),
+					gmdate("i", $date_paques),
+					gmdate("s", $date_paques),
+					gmdate("m", $date_paques),
+					gmdate("d", $date_paques) + 60,
+					gmdate("Y", $date_paques)
+					);
+				$jour_fronleichnam = gmdate("d", $date_fronleichnam);
+				$mois_fronleichnam = gmdate("m", $date_fronleichnam);
+				if ($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) $ferie = true;
+				// Fronleichnam
+			}
 		}
+		//print "ferie=".$ferie."\n";
 
 		// If we have to include saturday and sunday
-		if ($includesaturday || $includesunday)
-		{
-			$jour_julien = unixtojd($timestampStart);
-			$jour_semaine = jddayofweek($jour_julien, 0);
-			if ($includesaturday)					//Saturday (6) and Sunday (0)
+		if (!$ferie) {
+			if ($includesaturday || $includesunday)
 			{
-				if ($jour_semaine == 6) $ferie = true;
-			}
-			if ($includesunday)						//Saturday (6) and Sunday (0)
-			{
-				if ($jour_semaine == 0) $ferie = true;
+				$jour_julien = unixtojd($timestampStart);
+				$jour_semaine = jddayofweek($jour_julien, 0);
+				if ($includesaturday)					//Saturday (6) and Sunday (0)
+				{
+					if ($jour_semaine == 6) $ferie = true;
+				}
+				if ($includesunday)						//Saturday (6) and Sunday (0)
+				{
+					if ($jour_semaine == 0) $ferie = true;
+				}
 			}
 		}
+		//print "ferie=".$ferie."\n";
 
 		// We increase the counter of non working day
 		if ($ferie) $nbFerie++;
@@ -815,6 +840,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 		$i++;
 	}
 
+	//print "nbFerie=".$nbFerie."\n";
 	return $nbFerie;
 }
 
@@ -907,35 +933,35 @@ function num_open_day($timestampStart, $timestampEnd, $inhour = 0, $lastday = 0,
 function monthArray($outputlangs, $short = 0)
 {
 	$montharray = array(
-	    1  => $outputlangs->trans("Month01"),
-	    2  => $outputlangs->trans("Month02"),
-	    3  => $outputlangs->trans("Month03"),
-	    4  => $outputlangs->trans("Month04"),
-	    5  => $outputlangs->trans("Month05"),
-	    6  => $outputlangs->trans("Month06"),
-	    7  => $outputlangs->trans("Month07"),
-	    8  => $outputlangs->trans("Month08"),
-	    9  => $outputlangs->trans("Month09"),
-	    10 => $outputlangs->trans("Month10"),
-	    11 => $outputlangs->trans("Month11"),
-	    12 => $outputlangs->trans("Month12")
-    );
+		1  => $outputlangs->trans("Month01"),
+		2  => $outputlangs->trans("Month02"),
+		3  => $outputlangs->trans("Month03"),
+		4  => $outputlangs->trans("Month04"),
+		5  => $outputlangs->trans("Month05"),
+		6  => $outputlangs->trans("Month06"),
+		7  => $outputlangs->trans("Month07"),
+		8  => $outputlangs->trans("Month08"),
+		9  => $outputlangs->trans("Month09"),
+		10 => $outputlangs->trans("Month10"),
+		11 => $outputlangs->trans("Month11"),
+		12 => $outputlangs->trans("Month12")
+	);
 
 	if (!empty($short))
 	{
 		$montharray = array(
-		    1  => $outputlangs->trans("MonthShort01"),
-		    2  => $outputlangs->trans("MonthShort02"),
-		    3  => $outputlangs->trans("MonthShort03"),
-		    4  => $outputlangs->trans("MonthShort04"),
-		    5  => $outputlangs->trans("MonthShort05"),
-		    6  => $outputlangs->trans("MonthShort06"),
-		    7  => $outputlangs->trans("MonthShort07"),
-		    8  => $outputlangs->trans("MonthShort08"),
-		    9  => $outputlangs->trans("MonthShort09"),
-		    10 => $outputlangs->trans("MonthShort10"),
-		    11 => $outputlangs->trans("MonthShort11"),
-		    12 => $outputlangs->trans("MonthShort12")
+			1  => $outputlangs->trans("MonthShort01"),
+			2  => $outputlangs->trans("MonthShort02"),
+			3  => $outputlangs->trans("MonthShort03"),
+			4  => $outputlangs->trans("MonthShort04"),
+			5  => $outputlangs->trans("MonthShort05"),
+			6  => $outputlangs->trans("MonthShort06"),
+			7  => $outputlangs->trans("MonthShort07"),
+			8  => $outputlangs->trans("MonthShort08"),
+			9  => $outputlangs->trans("MonthShort09"),
+			10 => $outputlangs->trans("MonthShort10"),
+			11 => $outputlangs->trans("MonthShort11"),
+			12 => $outputlangs->trans("MonthShort12")
 			);
 	}
 
@@ -943,7 +969,6 @@ function monthArray($outputlangs, $short = 0)
 }
 /**
  *	Return array of week numbers.
-
  *
  *	@param	int 		$month			Month number
  *  @param	int			$year			Year number
@@ -961,7 +986,6 @@ function getWeekNumbersOfMonth($month, $year)
 }
 /**
  *	Return array of first day of weeks.
-
  *
  *	@param	array 		$TWeek			array of week numbers
  *  @param	int			$year			Year number
@@ -978,7 +1002,6 @@ function getFirstDayOfEachWeek($TWeek, $year)
 }
 /**
  *	Return array of last day of weeks.
-
  *
  *	@param	array 		$TWeek			array of week numbers
  *  @param	int			$year			Year number
@@ -994,7 +1017,6 @@ function getLastDayOfEachWeek($TWeek, $year)
 }
 /**
  *	Return week number.
-
  *
  *	@param	int 		$day			Day number
  *	@param	int 		$month			Month number
diff --git a/htdocs/core/lib/doleditor.lib.php b/htdocs/core/lib/doleditor.lib.php
index ddccb11247e..1ad17280f22 100644
--- a/htdocs/core/lib/doleditor.lib.php
+++ b/htdocs/core/lib/doleditor.lib.php
@@ -33,36 +33,36 @@
  */
 function show_skin($fuser, $edit = 0)
 {
-    global $conf, $langs, $db;
-    global $bc;
+	global $conf, $langs, $db;
+	global $bc;
 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
-    $formother = new FormOther($db);
+	$formother = new FormOther($db);
 
-    $dirskins = array('/includes/ckeditor/ckeditor/skins');
-    if (!empty($conf->modules_parts['theme']))		// Using this feature slow down application
-    {
-    	foreach ($conf->modules_parts['theme'] as $reldir)
-    	{
-	    	$dirskins = array_merge($dirskins, (array) ($reldir.'theme'));
-    	}
-    }
-    $dirskins = array_unique($dirskins);
+	$dirskins = array('/includes/ckeditor/ckeditor/skins');
+	if (!empty($conf->modules_parts['theme']))		// Using this feature slow down application
+	{
+		foreach ($conf->modules_parts['theme'] as $reldir)
+		{
+			$dirskins = array_merge($dirskins, (array) ($reldir.'theme'));
+		}
+	}
+	$dirskins = array_unique($dirskins);
 	// Now dir_themes=array('/themes') or dir_themes=array('/theme','/mymodule/theme')
 
-    $selected_theme = '';
-    if (empty($conf->global->FCKEDITOR_SKIN)) $selected_theme = 'moono-lisa';
-    else $selected_theme = $conf->global->FCKEDITOR_SKIN;
+	$selected_theme = '';
+	if (empty($conf->global->FCKEDITOR_SKIN)) $selected_theme = 'moono-lisa';
+	else $selected_theme = $conf->global->FCKEDITOR_SKIN;
 
-    $colspan = 2;
+	$colspan = 2;
 
-    $thumbsbyrow = 6;
-    print '<table class="noborder centpercent">';
+	$thumbsbyrow = 6;
+	print '<table class="noborder centpercent">';
 
-    $var = false;
+	$var = false;
 
-    // Title
+	// Title
    	print '<tr class="liste_titre"><th width="35%">'.$langs->trans("DefaultSkin").'</th>';
    	print '<th class="right">';
    	$url = 'http://ckeditor.com/addons/skins/all';
@@ -81,51 +81,51 @@ function show_skin($fuser, $edit = 0)
    	print '</td>';
    	print '</tr>';
 
-    //
-    print '<tr class="oddeven"><td colspan="'.$colspan.'">';
+	//
+	print '<tr class="oddeven"><td colspan="'.$colspan.'">';
 
-    print '<table class="nobordernopadding" width="100%"><tr><td><div class="center">';
+	print '<table class="nobordernopadding" width="100%"><tr><td><div class="center">';
 
-    $i = 0;
-    foreach ($dirskins as $dir)
-    {
-    	//print $dirroot.$dir;exit;
-    	$dirskin = dol_buildpath($dir, 0); // This include loop on $conf->file->dol_document_root
-    	$urltheme = dol_buildpath($dir, 1);
+	$i = 0;
+	foreach ($dirskins as $dir)
+	{
+		//print $dirroot.$dir;exit;
+		$dirskin = dol_buildpath($dir, 0); // This include loop on $conf->file->dol_document_root
+		$urltheme = dol_buildpath($dir, 1);
 
-    	if (is_dir($dirskin))
-    	{
-    		$handle = opendir($dirskin);
-    		if (is_resource($handle))
-    		{
-    			while (($subdir = readdir($handle)) !== false)
-    			{
-    				if (is_dir($dirskin."/".$subdir) && substr($subdir, 0, 1) <> '.'
-    						&& substr($subdir, 0, 3) <> 'CVS' && !preg_match('/common|phones/i', $subdir))
-    				{
-    					// Disable not stable themes (dir ends with _exp or _dev)
-    					if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) continue;
-    					if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i', $subdir)) continue;
+		if (is_dir($dirskin))
+		{
+			$handle = opendir($dirskin);
+			if (is_resource($handle))
+			{
+				while (($subdir = readdir($handle)) !== false)
+				{
+					if (is_dir($dirskin."/".$subdir) && substr($subdir, 0, 1) <> '.'
+							&& substr($subdir, 0, 3) <> 'CVS' && !preg_match('/common|phones/i', $subdir))
+					{
+						// Disable not stable themes (dir ends with _exp or _dev)
+						if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) continue;
+						if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i', $subdir)) continue;
 
-    					print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
-    					if ($subdir == $selected_theme)
-    					{
-    						print '<input '.($edit ? '' : 'disabled').' type="radio" '.$bc[$var].' style="border: 0px;" checked name="fckeditor_skin" value="'.$subdir.'"> <b>'.$subdir.'</b>';
-    					} else {
-    						print '<input '.($edit ? '' : 'disabled').' type="radio" '.$bc[$var].' style="border: 0px;" name="fckeditor_skin" value="'.$subdir.'"> '.$subdir;
-    					}
+						print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
+						if ($subdir == $selected_theme)
+						{
+							print '<input '.($edit ? '' : 'disabled').' type="radio" '.$bc[$var].' style="border: 0px;" checked name="fckeditor_skin" value="'.$subdir.'"> <b>'.$subdir.'</b>';
+						} else {
+							print '<input '.($edit ? '' : 'disabled').' type="radio" '.$bc[$var].' style="border: 0px;" name="fckeditor_skin" value="'.$subdir.'"> '.$subdir;
+						}
 						print '</div>';
 
-    					$i++;
-    				}
-    			}
-    		}
-    	}
-    }
+						$i++;
+					}
+				}
+			}
+		}
+	}
 
-    print '</div></td></tr></table>';
+	print '</div></td></tr></table>';
 
-    print '</td></tr>';
+	print '</td></tr>';
 
-    print '</table>';
+	print '</table>';
 }
diff --git a/htdocs/core/lib/donation.lib.php b/htdocs/core/lib/donation.lib.php
index 425dd05fbb5..c39229d1e23 100644
--- a/htdocs/core/lib/donation.lib.php
+++ b/htdocs/core/lib/donation.lib.php
@@ -46,7 +46,7 @@ function donation_admin_prepare_head()
 
 	$head[$h][0] = DOL_URL_ROOT.'/don/admin/donation_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
-    $head[$h][2] = 'attributes';
+	$head[$h][2] = 'attributes';
 	$h++;
 
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'donation_admin', 'remove');
@@ -79,10 +79,10 @@ function donation_prepare_head($object)
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'donation');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->don->dir_output.'/'.dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/don/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
diff --git a/htdocs/core/lib/ecm.lib.php b/htdocs/core/lib/ecm.lib.php
index b9da91093bb..1f22e464358 100644
--- a/htdocs/core/lib/ecm.lib.php
+++ b/htdocs/core/lib/ecm.lib.php
@@ -138,3 +138,38 @@ function ecm_prepare_head_fm($object)
 
 	return $head;
 }
+
+/**
+ *  Return array head with list of tabs to view object informations.
+ *
+ *  @return	array               head array with tabs
+ */
+function ecm_admin_prepare_head()
+{
+	global $langs, $conf;
+	$langs->load("ecm");
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = DOL_URL_ROOT."/admin/ecm.php";
+	$head[$h][1] = $langs->trans("Setup");
+	$head[$h][2] = 'ecm';
+	$h++;
+
+	$head[$h][0] = DOL_URL_ROOT.'/admin/ecm_files_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFieldsEcmFiles");
+	$head[$h][2] = 'attributes_ecm_files';
+	$h++;
+
+	$head[$h][0] = DOL_URL_ROOT.'/admin/ecm_directories_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFieldsEcmDirectories");
+	$head[$h][2] = 'attributes_ecm_directories';
+	$h++;
+
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'ecm_admin');
+
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'ecm_admin', 'remove');
+
+	return $head;
+}
diff --git a/htdocs/core/lib/emailing.lib.php b/htdocs/core/lib/emailing.lib.php
index 8afbf7a654d..86f11a7a271 100644
--- a/htdocs/core/lib/emailing.lib.php
+++ b/htdocs/core/lib/emailing.lib.php
@@ -41,11 +41,11 @@ function emailing_prepare_head(Mailing $object)
 
 	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->mailing->mailing_advance->recipient))
 	{
-    	$head[$h][0] = DOL_URL_ROOT."/comm/mailing/cibles.php?id=".$object->id;
-    	$head[$h][1] = $langs->trans("MailRecipients");
+		$head[$h][0] = DOL_URL_ROOT."/comm/mailing/cibles.php?id=".$object->id;
+		$head[$h][1] = $langs->trans("MailRecipients");
 		if ($object->nbemail > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$object->nbemail.'</span>';
-    	$head[$h][2] = 'targets';
-    	$h++;
+		$head[$h][2] = 'targets';
+		$h++;
 	}
 
 	if (!empty($conf->global->EMAILING_USE_ADVANCED_SELECTOR))
diff --git a/htdocs/core/lib/expedition.lib.php b/htdocs/core/lib/expedition.lib.php
index b575247e84b..92c58d7b5db 100644
--- a/htdocs/core/lib/expedition.lib.php
+++ b/htdocs/core/lib/expedition.lib.php
@@ -51,9 +51,9 @@ function expedition_prepare_head(Expedition $object)
 	$hselected = $h;
 	$h++;
 
-	if (!empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+	if (!empty($conf->global->MAIN_SUBMODULE_DELIVERY))
 	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/livraison.php";
+		$head[$h][0] = DOL_URL_ROOT."/admin/delivery.php";
 		$head[$h][1] = $langs->trans("Receivings");
 		$h++;
 	}
@@ -109,25 +109,25 @@ function expedition_admin_prepare_head()
 		$h++;
 	}
 
-	if (!empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+	if (!empty($conf->global->MAIN_SUBMODULE_DELIVERY))
 	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/livraison.php";
+		$head[$h][0] = DOL_URL_ROOT."/admin/delivery.php";
 		$head[$h][1] = $langs->trans("Receivings");
 		$head[$h][2] = 'receivings';
 		$h++;
 	}
 
-	if (!empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+	if (!empty($conf->global->MAIN_SUBMODULE_DELIVERY))
 	{
-		$head[$h][0] = DOL_URL_ROOT.'/admin/livraison_extrafields.php';
+		$head[$h][0] = DOL_URL_ROOT.'/admin/delivery_extrafields.php';
 		$head[$h][1] = $langs->trans("ExtraFields");
 		$head[$h][2] = 'attributes_receivings';
 		$h++;
 	}
 
-	if (!empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+	if (!empty($conf->global->MAIN_SUBMODULE_DELIVERY))
 	{
-		$head[$h][0] = DOL_URL_ROOT.'/admin/livraisondet_extrafields.php';
+		$head[$h][0] = DOL_URL_ROOT.'/admin/deliverydet_extrafields.php';
 		$head[$h][1] = $langs->trans("ExtraFieldsLines");
 		$head[$h][2] = 'attributeslines_receivings';
 		$h++;
diff --git a/htdocs/core/lib/expensereport.lib.php b/htdocs/core/lib/expensereport.lib.php
index c4e68356349..b77082804ba 100644
--- a/htdocs/core/lib/expensereport.lib.php
+++ b/htdocs/core/lib/expensereport.lib.php
@@ -41,15 +41,15 @@ function expensereport_prepare_head($object)
 
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'expensereport');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/expensereport/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
@@ -58,14 +58,14 @@ function expensereport_prepare_head($object)
 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
-	    $nbNote = 0;
-	    if (!empty($object->note_private)) $nbNote++;
-	    if (!empty($object->note_public)) $nbNote++;
-	    $head[$h][0] = DOL_URL_ROOT.'/expensereport/note.php?id='.$object->id;
-	    $head[$h][1] = $langs->trans('Notes');
-	    if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
-	    $head[$h][2] = 'note';
-	    $h++;
+		$nbNote = 0;
+		if (!empty($object->note_private)) $nbNote++;
+		if (!empty($object->note_public)) $nbNote++;
+		$head[$h][0] = DOL_URL_ROOT.'/expensereport/note.php?id='.$object->id;
+		$head[$h][1] = $langs->trans('Notes');
+		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		$head[$h][2] = 'note';
+		$h++;
 	}
 
 	$head[$h][0] = DOL_URL_ROOT.'/expensereport/info.php?id='.$object->id;
@@ -94,15 +94,15 @@ function payment_expensereport_prepare_head(PaymentExpenseReport $object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/expensereport/payment/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("ExpenseReport");
+	$head[$h][1] = $langs->trans("ExpenseReportPayment");
 	$head[$h][2] = 'payment';
 	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment_expensereport');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment_expensereport');
 
 	$head[$h][0] = DOL_URL_ROOT.'/expensereport/payment/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Info");
@@ -157,10 +157,10 @@ function expensereport_admin_prepare_head()
 
 	$head[$h][0] = DOL_URL_ROOT.'/admin/expensereport_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
-    $head[$h][2] = 'attributes';
-    $h++;
+	$head[$h][2] = 'attributes';
+	$h++;
 
-    /*
+	/*
 	$head[$h][0] = DOL_URL_ROOT.'/fichinter/admin/fichinterdet_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsLines");
     $head[$h][2] = 'attributesdet';
@@ -169,5 +169,5 @@ function expensereport_admin_prepare_head()
 
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'expensereport_admin', 'remove');
 
-    return $head;
+	return $head;
 }
diff --git a/htdocs/core/lib/fichinter.lib.php b/htdocs/core/lib/fichinter.lib.php
index 260bbf980f8..bbc10f0b756 100644
--- a/htdocs/core/lib/fichinter.lib.php
+++ b/htdocs/core/lib/fichinter.lib.php
@@ -48,19 +48,19 @@ function fichinter_prepare_head($object)
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
-	    $head[$h][0] = DOL_URL_ROOT.'/fichinter/contact.php?id='.$object->id;
+		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
+		$head[$h][0] = DOL_URL_ROOT.'/fichinter/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('InterventionContact');
 		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
 		$head[$h][2] = 'contact';
 		$h++;
 	}
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'intervention');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'intervention');
 
 	// Tab to link resources
 	if ($conf->resource->enabled)
@@ -88,37 +88,37 @@ function fichinter_prepare_head($object)
 		$h++;
 	}
 
-    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-    {
-    	$nbNote = 0;
-        if (!empty($object->note_private)) $nbNote++;
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+	{
+		$nbNote = 0;
+		if (!empty($object->note_private)) $nbNote++;
 		if (!empty($object->note_public)) $nbNote++;
-    	$head[$h][0] = DOL_URL_ROOT.'/fichinter/note.php?id='.$object->id;
-    	$head[$h][1] = $langs->trans('Notes');
+		$head[$h][0] = DOL_URL_ROOT.'/fichinter/note.php?id='.$object->id;
+		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
-    	$head[$h][2] = 'note';
-    	$h++;
-    }
+		$head[$h][2] = 'note';
+		$h++;
+	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->ficheinter->dir_output."/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/fichinter/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Documents");
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/fichinter/info.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/fichinter/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Info');
 	$head[$h][2] = 'info';
 	$h++;
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'intervention', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'intervention', 'remove');
 
-    return $head;
+	return $head;
 }
 
 /**
@@ -148,13 +148,13 @@ function fichinter_admin_prepare_head()
 
 	$head[$h][0] = DOL_URL_ROOT.'/fichinter/admin/fichinter_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
-    $head[$h][2] = 'attributes';
-    $h++;
+	$head[$h][2] = 'attributes';
+	$h++;
 
 	$head[$h][0] = DOL_URL_ROOT.'/fichinter/admin/fichinterdet_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsLines");
-    $head[$h][2] = 'attributesdet';
-    $h++;
+	$head[$h][2] = 'attributesdet';
+	$h++;
 
 
 
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index aecf488d2b7..0be1cfbc3bc 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -228,8 +228,12 @@ function dol_dir_list_in_database($path, $filter = "", $excludefilter = null, $s
 	$sql .= " date_c, tms as date_m, fk_user_c, fk_user_m, acl, position, share";
 	if ($mode) $sql .= ", description";
 	$sql .= " FROM ".MAIN_DB_PREFIX."ecm_files";
-	$sql .= " WHERE filepath = '".$db->escape($path)."'";
-	$sql .= " AND entity = ".$conf->entity;
+	$sql .= " WHERE entity = ".$conf->entity;
+	if (preg_match('/%$/', $path)) {
+		$sql .= " AND filepath LIKE '".$db->escape($path)."'";
+	} else {
+		$sql .= " AND filepath = '".$db->escape($path)."'";
+	}
 
 	$resql = $db->query($sql);
 	if ($resql)
@@ -242,6 +246,7 @@ function dol_dir_list_in_database($path, $filter = "", $excludefilter = null, $s
 			$obj = $db->fetch_object($resql);
 			if ($obj)
 			{
+				$reg = array();
 				preg_match('/([^\/]+)\/[^\/]+$/', DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename, $reg);
 				$level1name = (isset($reg[1]) ? $reg[1] : '');
 				$file_list[] = array(
@@ -289,7 +294,7 @@ function dol_dir_list_in_database($path, $filter = "", $excludefilter = null, $s
  * Complete $filearray with data from database.
  * This will call doldir_list_indatabase to complate filearray.
  *
- * @param	array	$filearray			Array of files get using dol_dir_list
+ * @param	array	$filearray			Array of files obtained using dol_dir_list
  * @param	string	$relativedir		Relative dir from DOL_DATA_ROOT
  * @return	void
  */
@@ -315,19 +320,19 @@ function completeFileArrayWithDatabaseInfo(&$filearray, $relativedir)
 		}
 	}
 
-	//var_dump($filearray);
-	//var_dump($filearrayindatabase);
+	/*var_dump($relativedir);
+	var_dump($filearray);
+	var_dump($filearrayindatabase);*/
 
 	// Complete filearray with properties found into $filearrayindatabase
 	foreach ($filearray as $key => $val)
 	{
 		$tmpfilename = preg_replace('/\.noexe$/', '', $filearray[$key]['name']);
-
 		$found = 0;
 		// Search if it exists into $filearrayindatabase
 		foreach ($filearrayindatabase as $key2 => $val2)
 		{
-			if ($filearrayindatabase[$key2]['name'] == $tmpfilename)
+			if (($filearrayindatabase[$key2]['path'] == $filearray[$key]['path']) && ($filearrayindatabase[$key2]['name'] == $tmpfilename))
 			{
 				$filearray[$key]['position_name'] = ($filearrayindatabase[$key2]['position'] ? $filearrayindatabase[$key2]['position'] : '0').'_'.$filearrayindatabase[$key2]['name'];
 				$filearray[$key]['position'] = $filearrayindatabase[$key2]['position'];
@@ -348,6 +353,7 @@ function completeFileArrayWithDatabaseInfo(&$filearray, $relativedir)
 			$filearray[$key]['acl'] = '';
 
 			$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $filearray[$key]['fullname']);
+
 			if (!preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filename))     // If not a tmp file
 			{
 				dol_syslog("list_of_documents We found a file called '".$filearray[$key]['name']."' not indexed into database. We add it");
@@ -379,8 +385,7 @@ function completeFileArrayWithDatabaseInfo(&$filearray, $relativedir)
 			}
 		}
 	}
-
-	/*var_dump($filearray);*/
+	//var_dump($filearray); var_dump($relativedir.' - tmpfilename='.$tmpfilename.' - found='.$found);
 }
 
 
@@ -1075,13 +1080,11 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 		}
 	}
 
-	if ($reshook < 0)	// At least one blocking error returned by one hook
-	{
+	if ($reshook < 0) {	// At least one blocking error returned by one hook
 		$errmsg = join(',', $hookmanager->errors);
 		if (empty($errmsg)) $errmsg = 'ErrorReturnedBySomeHooks'; // Should not occurs. Added if hook is bugged and does not set ->errors when there is error.
 		return $errmsg;
-	} elseif (empty($reshook))
-	{
+	} elseif (empty($reshook)) {
 		// The file functions must be in OS filesystem encoding.
 		$src_file_osencoded = dol_osencode($src_file);
 		$file_name_osencoded = dol_osencode($file_name);
@@ -1508,9 +1511,10 @@ function dol_init_file_process($pathtoscan = '', $trackid = '')
  * @param	string	$link					Link to add (to add a link instead of a file)
  * @param   string  $trackid                Track id (used to prefix name of session vars to avoid conflict)
  * @param	int		$generatethumbs			1=Generate also thumbs for uploaded image files
+ * @param   Object  $object                 Object used to set 'src_object_*' fields
  * @return	int                             <=0 if KO, >0 if OK
  */
-function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesession = 0, $varfiles = 'addedfile', $savingdocmask = '', $link = null, $trackid = '', $generatethumbs = 1)
+function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesession = 0, $varfiles = 'addedfile', $savingdocmask = '', $link = null, $trackid = '', $generatethumbs = 1, $object = null)
 {
 	global $db, $user, $conf, $langs;
 
@@ -1535,6 +1539,8 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 			$nbok = 0;
 			for ($i = 0; $i < $nbfile; $i++)
 			{
+				if (empty($TFile['name'][$i])) continue; // For example, when submitting a form with no file name
+
 				// Define $destfull (path to file including filename) and $destfile (only filename)
 				$destfull = $upload_dir."/".$TFile['name'][$i];
 				$destfile = $TFile['name'][$i];
@@ -1561,7 +1567,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 				$destfile = dol_sanitizeFileName($info['filename'].($info['extension'] != '' ? ('.'.strtolower($info['extension'])) : ''));
 
 				// We apply dol_string_nohtmltag also to clean file names (this remove duplicate spaces) because
-				// this function is also applied when we make try to download file (by the GETPOST(filename, 'alphanohtml') call).
+				// this function is also applied when we rename and when we make try to download file (by the GETPOST(filename, 'alphanohtml') call).
 				$destfile = dol_string_nohtmltag($destfile);
 				$destfull = dol_string_nohtmltag($destfull);
 
@@ -1602,7 +1608,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 					// Update index table of files (llx_ecm_files)
 					if ($donotupdatesession == 1)
 					{
-						$result = addFileIntoDatabaseIndex($upload_dir, basename($destfile).($resupload == 2 ? '.noexe' : ''), $TFile['name'][$i], 'uploaded', 0);
+						$result = addFileIntoDatabaseIndex($upload_dir, basename($destfile).($resupload == 2 ? '.noexe' : ''), $TFile['name'][$i], 'uploaded', 0, $object);
 						if ($result < 0)
 						{
 							if ($allowoverwrite) {
@@ -1718,9 +1724,10 @@ function dol_remove_file_process($filenb, $donotupdatesession = 0, $donotdeletef
  *  @param		string	$fullpathorig	Full path of origin for file (can be '')
  *  @param		string	$mode			How file was created ('uploaded', 'generated', ...)
  *  @param		int		$setsharekey	Set also the share key
+ *  @param      Object  $object         Object used to set 'src_object_*' fields
  *	@return		int						<0 if KO, 0 if nothing done, >0 if OK
  */
-function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uploaded', $setsharekey = 0)
+function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uploaded', $setsharekey = 0, $object = null)
 {
 	global $db, $user;
 
@@ -1743,6 +1750,12 @@ function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uplo
 		$ecmfile->gen_or_uploaded = $mode;
 		$ecmfile->description = ''; // indexed content
 		$ecmfile->keyword = ''; // keyword content
+
+		if (is_object($object) && $object->id > 0) {
+			$ecmfile->src_object_id = $object->id;
+			$ecmfile->src_object_type = $object->table_element;
+		}
+
 		if ($setsharekey)
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
@@ -2053,7 +2066,7 @@ function dol_uncompress($inputfile, $outputdir)
 			for ($i = 0; $i < $zip->numFiles; $i++) {
 				if (preg_match('/\.\./', $zip->getNameIndex($i))) {
 					dol_syslog("Warning: Try to unzip a file with a transversal path ".$zip->getNameIndex($i), LOG_WARNING);
-					continue;	// Discard the file
+					continue; // Discard the file
 				}
 				$zip->extractTo($outputdir.'/', array($zip->getNameIndex($i)));
 			}
@@ -2636,10 +2649,10 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->expedition->dir_output."/sending/".$original_file;
-	} // Wrapping pour les bons de livraison
-	elseif ($modulepart == 'livraison' && !empty($conf->expedition->dir_output))
+	} // Delivery Note Wrapping
+	elseif ($modulepart == 'delivery' && !empty($conf->expedition->dir_output))
 	{
-		if ($fuser->rights->expedition->livraison->{$lire} || preg_match('/^specimen/i', $original_file))
+		if ($fuser->rights->expedition->delivery->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed = 1;
 		}
@@ -2844,9 +2857,11 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 
 			// Check fuser->rights->modulepart->myobject->read and fuser->rights->modulepart->read
 			$partsofdirinoriginalfile = explode('/', $original_file);
-			$partofdirinoriginalfile = $partsofdirinoriginalfile[0];
-			if ($partofdirinoriginalfile && ($fuser->rights->$modulepart->$partofdirinoriginalfile->{$lire} || $fuser->rights->$modulepart->$partofdirinoriginalfile->{$read})) $accessallowed = 1;
-			if ($fuser->rights->$modulepart->{$lire} || $fuser->rights->$modulepart->{$read}) $accessallowed = 1;
+			if (!empty($partsofdirinoriginalfile[1])) {	// If original_file is xxx/filename (xxx is a part we will use)
+				$partofdirinoriginalfile = $partsofdirinoriginalfile[0];
+				if ($partofdirinoriginalfile && !empty($fuser->rights->$modulepart->$partofdirinoriginalfile) && ($fuser->rights->$modulepart->$partofdirinoriginalfile->{$lire} || $fuser->rights->$modulepart->$partofdirinoriginalfile->{$read})) $accessallowed = 1;
+			}
+			if (!empty($fuser->rights->$modulepart->{$lire}) || !empty($fuser->rights->$modulepart->{$read})) $accessallowed = 1;
 
 			if (is_array($conf->$modulepart->multidir_output) && !empty($conf->$modulepart->multidir_output[$entity])) {
 				$original_file = $conf->$modulepart->multidir_output[$entity].'/'.$original_file;
diff --git a/htdocs/core/lib/fiscalyear.lib.php b/htdocs/core/lib/fiscalyear.lib.php
index 8bd3ff55624..9b235287993 100644
--- a/htdocs/core/lib/fiscalyear.lib.php
+++ b/htdocs/core/lib/fiscalyear.lib.php
@@ -41,8 +41,8 @@ function fiscalyear_prepare_head(Fiscalyear $object)
 
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'fiscalyear');
 
 	$head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/fiscalyear_info.php?id='.$object->id;
diff --git a/htdocs/core/lib/format_cards.lib.php b/htdocs/core/lib/format_cards.lib.php
index 1693329329e..d8e5f17f8e0 100644
--- a/htdocs/core/lib/format_cards.lib.php
+++ b/htdocs/core/lib/format_cards.lib.php
@@ -36,27 +36,27 @@ $sql = "SELECT rowid, code, name, paper_size, orientation, metric, leftmargin, t
 $resql = $db->query($sql);
 if ($resql)
 {
-    while ($row = $db->fetch_array($resql))
-    {
-        $_Avery_Labels[$row['code']]['name'] = $row['name'];
-        $_Avery_Labels[$row['code']]['paper-size'] = $row['paper_size'];
-        $_Avery_Labels[$row['code']]['orientation'] = $row['orientation'];
-        $_Avery_Labels[$row['code']]['metric'] = $row['metric'];
-        $_Avery_Labels[$row['code']]['marginLeft'] = $row['leftmargin'];
-        $_Avery_Labels[$row['code']]['marginTop'] = $row['topmargin'];
-        $_Avery_Labels[$row['code']]['marginTop'] = $row['topmargin'];
-        $_Avery_Labels[$row['code']]['NX'] = $row['nx'];
-        $_Avery_Labels[$row['code']]['NY'] = $row['ny'];
-        $_Avery_Labels[$row['code']]['SpaceX'] = $row['spacex'];
-        $_Avery_Labels[$row['code']]['SpaceY'] = $row['spacey'];
-        $_Avery_Labels[$row['code']]['width'] = $row['width'];
-        $_Avery_Labels[$row['code']]['height'] = $row['height'];
-        $_Avery_Labels[$row['code']]['font-size'] = $row['font_size'];
-        $_Avery_Labels[$row['code']]['custom_x'] = $row['custom_x'];
-        $_Avery_Labels[$row['code']]['custom_y'] = $row['custom_y'];
-    }
+	while ($row = $db->fetch_array($resql))
+	{
+		$_Avery_Labels[$row['code']]['name'] = $row['name'];
+		$_Avery_Labels[$row['code']]['paper-size'] = $row['paper_size'];
+		$_Avery_Labels[$row['code']]['orientation'] = $row['orientation'];
+		$_Avery_Labels[$row['code']]['metric'] = $row['metric'];
+		$_Avery_Labels[$row['code']]['marginLeft'] = $row['leftmargin'];
+		$_Avery_Labels[$row['code']]['marginTop'] = $row['topmargin'];
+		$_Avery_Labels[$row['code']]['marginTop'] = $row['topmargin'];
+		$_Avery_Labels[$row['code']]['NX'] = $row['nx'];
+		$_Avery_Labels[$row['code']]['NY'] = $row['ny'];
+		$_Avery_Labels[$row['code']]['SpaceX'] = $row['spacex'];
+		$_Avery_Labels[$row['code']]['SpaceY'] = $row['spacey'];
+		$_Avery_Labels[$row['code']]['width'] = $row['width'];
+		$_Avery_Labels[$row['code']]['height'] = $row['height'];
+		$_Avery_Labels[$row['code']]['font-size'] = $row['font_size'];
+		$_Avery_Labels[$row['code']]['custom_x'] = $row['custom_x'];
+		$_Avery_Labels[$row['code']]['custom_y'] = $row['custom_y'];
+	}
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // We add characteristics to the name
diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php
index 8b0e71a2a46..7ebe1d290b7 100644
--- a/htdocs/core/lib/fourn.lib.php
+++ b/htdocs/core/lib/fourn.lib.php
@@ -45,8 +45,8 @@ function facturefourn_prepare_head($object)
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
-	    $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/contact.php?facid='.$object->id;
+		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
+		$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/contact.php?facid='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
 		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
 		$head[$h][2] = 'contact';
@@ -75,29 +75,29 @@ function facturefourn_prepare_head($object)
 		$h++;
 	}
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_invoice');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_invoice');
 
-    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-    {
-    	$nbNote = 0;
-        if (!empty($object->note_private)) $nbNote++;
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+	{
+		$nbNote = 0;
+		if (!empty($object->note_private)) $nbNote++;
 		if (!empty($object->note_public)) $nbNote++;
-    	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/note.php?facid='.$object->id;
-    	$head[$h][1] = $langs->trans('Notes');
+		$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/note.php?facid='.$object->id;
+		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
-    	$head[$h][2] = 'note';
-    	$h++;
-    }
+		$head[$h][2] = 'note';
+		$h++;
+	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$object->ref;
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
@@ -109,9 +109,9 @@ function facturefourn_prepare_head($object)
 	$head[$h][2] = 'info';
 	$h++;
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_invoice', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_invoice', 'remove');
 
-    return $head;
+	return $head;
 }
 
 
@@ -135,8 +135,8 @@ function ordersupplier_prepare_head($object)
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
-	    $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/contact.php?id='.$object->id;
+		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
+		$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
 		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
 		$head[$h][2] = 'contact';
@@ -153,28 +153,28 @@ function ordersupplier_prepare_head($object)
 	}
 
 	// Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_order');
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_order');
 
-    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-    {
-    	$nbNote = 0;
-        if (!empty($object->note_private)) $nbNote++;
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+	{
+		$nbNote = 0;
+		if (!empty($object->note_private)) $nbNote++;
 		if (!empty($object->note_public)) $nbNote++;
-    	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/note.php?id='.$object->id;
-    	$head[$h][1] = $langs->trans("Notes");
+		$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/note.php?id='.$object->id;
+		$head[$h][1] = $langs->trans("Notes");
 		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
-    	$head[$h][2] = 'note';
-    	$h++;
-    }
+		$head[$h][2] = 'note';
+		$h++;
+	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->fournisseur->dir_output."/commande/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
@@ -185,8 +185,8 @@ function ordersupplier_prepare_head($object)
 	$head[$h][1] .= $langs->trans("Events");
 	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
 	{
-	    $head[$h][1] .= '/';
-	    $head[$h][1] .= $langs->trans("Agenda");
+		$head[$h][1] .= '/';
+		$head[$h][1] .= $langs->trans("Agenda");
 	}
 	$head[$h][2] = 'info';
 	$h++;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4fe156b249b..f846ea55787 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -84,8 +84,8 @@ function getEntity($element, $shared = 1, $currentobject = null)
 
 	// fix different element names (France to English)
 	switch ($element) {
-		case 'contrat':			$element = 'contract';			break;	// "/contrat/class/contrat.class.php"
-		case 'order_supplier':	$element = 'supplier_order';	break;	// "/fourn/class/fournisseur.commande.class.php"
+		case 'contrat':			$element = 'contract'; break; // "/contrat/class/contrat.class.php"
+		case 'order_supplier':	$element = 'supplier_order'; break; // "/fourn/class/fournisseur.commande.class.php"
 	}
 
 	if (is_object($mc))
@@ -118,6 +118,17 @@ function setEntity($currentobject)
 	}
 }
 
+/**
+ * 	Return if string has a name dedicated to store a secret
+ *
+ * 	@param	string	$keyname	Name of key to test
+ * 	@return	boolean				True if key is used to store a secret
+ */
+function isASecretKey($keyname)
+{
+	return preg_match('/(_pass|password|_pw|_key|securekey|serverkey|secret\d?|p12key|exportkey|_PW_[a-z]+|token)$/i', $keyname);
+}
+
 /**
  * Return information about user browser
  *
@@ -143,6 +154,8 @@ function getBrowserInfo($user_agent)
 	$os = 'unknown';
 	$phone = '';
 
+	$user_agent = substr($user_agent, 0, 512);	// Avoid to process too large user agent
+
 	$detectmobile = new Mobile_Detect(null, $user_agent);
 	$tablet = $detectmobile->isTablet();
 
@@ -174,6 +187,7 @@ function getBrowserInfo($user_agent)
 	if (preg_match('/linux/i', $user_agent)) { $os = 'linux'; } elseif (preg_match('/macintosh/i', $user_agent)) { $os = 'macintosh'; } elseif (preg_match('/windows/i', $user_agent)) { $os = 'windows'; }
 
 	// Name
+	$reg = array();
 	if (preg_match('/firefox(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'firefox'; $version = $reg[2]; } elseif (preg_match('/edge(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'edge'; $version = $reg[2]; } elseif (preg_match('/chrome(\/|\s)([\d\.]+)/i', $user_agent, $reg)) { $name = 'chrome'; $version = $reg[2]; } // we can have 'chrome (Mozilla...) chrome x.y' in one string
 	elseif (preg_match('/chrome/i', $user_agent, $reg)) { $name = 'chrome'; } elseif (preg_match('/iceweasel/i', $user_agent)) { $name = 'iceweasel'; } elseif (preg_match('/epiphany/i', $user_agent)) { $name = 'epiphany'; } elseif (preg_match('/safari(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'safari'; $version = $reg[2]; } // Safari is often present in string for mobile but its not.
 	elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'opera'; $version = $reg[2]; } elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) { $name = 'ie'; $version = end($reg); } // MS products at end
@@ -212,14 +226,14 @@ function dol_shutdown()
 }
 
 /**
- * Return true if we are in a context of submitting a parameter
+ * Return true if we are in a context of submitting the parameter $paramname
  *
  * @param 	string	$paramname		Name or parameter to test
  * @return 	boolean					True if we have just submit a POST or GET request with the parameter provided (even if param is empty)
  */
 function GETPOSTISSET($paramname)
 {
-	$isset = 0;
+	$isset = false;
 
 	$relativepathstring = $_SERVER["PHP_SELF"];
 	// Clean $relativepathstring
@@ -242,7 +256,7 @@ function GETPOSTISSET($paramname)
 				{
 					if ($key == $paramname)	// We are on the requested parameter
 					{
-						$isset = 1;
+						$isset = true;
 						break;
 					}
 				}
@@ -251,16 +265,16 @@ function GETPOSTISSET($paramname)
 		// If there is saved contextpage, page or limit
 		if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_'.$relativepathstring]))
 		{
-			$isset = 1;
+			$isset = true;
 		} elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring]))
 		{
-			$isset = 1;
+			$isset = true;
 		} elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring]))
 		{
-			$isset = 1;
+			$isset = true;
 		}
 	} else {
-		$isset = (isset($_POST[$paramname]) || isset($_GET[$paramname]));
+		$isset = (isset($_POST[$paramname]) || isset($_GET[$paramname])); // We must keep $_POST and $_GET here
 	}
 
 	return $isset;
@@ -275,13 +289,13 @@ function GETPOSTISSET($paramname)
  *  @param  string  $check	     Type of check
  *                               ''=no check (deprecated)
  *                               'none'=no check (only for param that should have very rich content)
+ *                               'array', 'array:restricthtml' or 'array:aZ09' to check it's an array
  *                               'int'=check it's numeric (integer or float)
  *                               'intcomma'=check it's integer+comma ('1,2,3,4...')
  *                               'alpha'=Same than alphanohtml since v13
  *                               'alphanohtml'=check there is no html content and no " and no ../
  *                               'aZ'=check it's a-z only
  *                               'aZ09'=check it's simple alpha string (recommended for keys)
- *                               'array'=check it's array
  *                               'san_alpha'=Use filter_var with FILTER_SANITIZE_STRING (do not use this for free text string)
  *                               'nohtml'=check there is no html content and no " and no ../
  *                               'restricthtml'=check html content is restricted to some tags only
@@ -350,7 +364,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 			{
 				$out = $_SESSION['lastsearch_limit_'.$relativepathstring];
 			}
-		} // Else, retreive default values if we are not doing a sort
+		} // Else, retrieve default values if we are not doing a sort
 		elseif (!isset($_GET['sortfield']))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_ENABLE_DEFAULT_VALUES is not set
 		{
 			if (!empty($_GET['action']) && $_GET['action'] == 'create' && !isset($_GET[$paramname]) && !isset($_POST[$paramname]))
@@ -399,7 +413,6 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 						}
 					}
 				} // Management of default search_filters and sort order
-				//elseif (preg_match('/list.php$/', $_SERVER["PHP_SELF"]) && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 				elseif (!empty($paramname) && !isset($_GET[$paramname]) && !isset($_POST[$paramname]))
 				{
 					if (!empty($user->default_values))		// $user->default_values defined from menu 'Setup - Default values'
@@ -464,6 +477,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 
 								if ($qualified)
 								{
+									// We must keep $_POST and $_GET here
 									if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all']))
 									{
 										// We made a search from quick search menu, do we still use default filter ?
@@ -592,6 +606,22 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 	return $out;
 }
 
+/**
+ *  Return value of a param into GET or POST supervariable.
+ *  Use the property $user->default_values[path]['creatform'] and/or $user->default_values[path]['filters'] and/or $user->default_values[path]['sortorder']
+ *  Note: The property $user->default_values is loaded by main.php when loading the user.
+ *
+ *  @param  string  $paramname   Name of parameter to found
+ *  @param	int		$method	     Type of method (0 = get then post, 1 = only get, 2 = only post, 3 = post then get)
+ *  @param  int     $filter      Filter to apply when $check is set to 'custom'. (See http://php.net/manual/en/filter.filters.php for détails)
+ *  @param  mixed   $options     Options to pass to filter_var when $check is set to 'custom'
+ *  @param	string	$noreplace   Force disable of replacement of __xxx__ strings.
+ *  @return int                  Value found (int)
+ */
+function GETPOSTINT($paramname, $method = 0, $filter = null, $options = null, $noreplace = 0)
+{
+	return (int) GETPOST($paramname, 'int', $method, $filter, $options, $noreplace);
+}
 
 /**
  *  Return a value after checking on a rule.
@@ -618,6 +648,9 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 		case 'san_alpha':
 			$out = filter_var($out, FILTER_SANITIZE_STRING);
 			break;
+		case 'email':
+			$out = filter_var($out, FILTER_SANITIZE_EMAIL);
+			break;
 		case 'aZ':
 			if (!is_array($out))
 			{
@@ -644,17 +677,16 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 			break;
 		case 'alpha':		// No html and no " and no ../
 		case 'alphanohtml':	// Recommended for most scalar parameters and search parameters
-			if (!is_array($out))
-			{
+			if (!is_array($out)) {
 				// '"' is dangerous because param in url can close the href= or src= and add javascript functions.
 				// '../' is dangerous because it allows dir transversals
 				$out = str_replace(array('&quot;', '"', '../'), '', trim($out));
+				// keep lines feed
 				$out = dol_string_nohtmltag($out, 0);
 			}
 			break;
 		case 'restricthtml':		// Recommended for most html textarea
-			$out = dol_string_onlythesehtmltags($out, 0);
-			// TODO We can also remove all javascripts reference
+			$out = dol_string_onlythesehtmltags($out, 0, 1, 1);
 			break;
 		case 'custom':
 			if (empty($filter)) return 'BadFourthParameterForGETPOST';
@@ -679,11 +711,11 @@ if (!function_exists('dol_getprefix'))
 	 */
 	function dol_getprefix($mode = '')
 	{
-		global $conf;
-
-		// If prefix is for email
+		// If prefix is for email (we need to have $conf alreayd loaded for this case)
 		if ($mode == 'email')
 		{
+			global $conf;
+
 			if (!empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID))	// If MAIL_PREFIX_FOR_EMAIL_ID is set (a value initialized with a random value is recommended)
 			{
 				if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;
@@ -697,12 +729,17 @@ if (!function_exists('dol_getprefix'))
 			return dol_hash(DOL_DOCUMENT_ROOT.DOL_URL_ROOT, '3');
 		}
 
+		// If prefix is for session (no need to have $conf loaded)
+		global $dolibarr_main_instance_unique_id, $dolibarr_main_cookie_cryptkey;	// This is loaded by filefunc.inc.php
+		$tmp_instance_unique_id = empty($dolibarr_main_instance_unique_id) ? (empty($dolibarr_main_cookie_cryptkey) ? '' : $dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id; // Unique id of instance
+
 		// The recommended value (may be not defined for old versions)
-		if (!empty($conf->file->instance_unique_id)) return $conf->file->instance_unique_id;
+		if (!empty($tmp_instance_unique_id)) {
+			return $tmp_instance_unique_id;
+		}
 
 		// For backward compatibility
-		if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"]))
-		{
+		if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"])) {
 			return dol_hash($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT, '3');
 		}
 
@@ -722,7 +759,7 @@ if (!function_exists('dol_getprefix'))
  */
 function dol_include_once($relpath, $classname = '')
 {
-	global $conf, $langs, $user, $mysoc; // Do not remove this. They must be defined for files we include. Other globals var must be retreived with $GLOBALS['var']
+	global $conf, $langs, $user, $mysoc; // Do not remove this. They must be defined for files we include. Other globals var must be retrieved with $GLOBALS['var']
 
 	$fullpath = dol_buildpath($relpath);
 
@@ -855,7 +892,7 @@ function dol_clone($object, $native = 0)
 	{
 		$myclone = unserialize(serialize($object));
 	} else {
-		$myclone = clone $object; // PHP clone is a shallow copy only, not a real clone, so properties of references will keep references (refer to the same target/variable)
+		$myclone = clone $object; // PHP clone is a shallow copy only, not a real clone, so properties of references will keep the reference (refering to the same target/variable)
 	}
 
 	return $myclone;
@@ -894,8 +931,9 @@ function dol_sanitizeFileName($str, $newstr = '_', $unaccent = 1)
 	// List of special chars for filenames in windows are defined on page https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file
 	// Char '>' '<' '|' '$' and ';' are special chars for shells.
 	// Char '/' and '\' are file delimiters.
-	$filesystem_forbidden_chars = array('<', '>', '/', '\\', '?', '*', '|', '"', ':', '°', '$', ';');
-	return dol_string_nospecial($unaccent ?dol_string_unaccent($str) : $str, $newstr, $filesystem_forbidden_chars);
+	// -- car can be used into filename to inject special paramaters like --use-compress-program to make command with file as parameter making remote execution of command
+	$filesystem_forbidden_chars = array('<', '>', '/', '\\', '?', '*', '|', '"', ':', '°', '$', ';', '--');
+	return dol_string_nospecial($unaccent ? dol_string_unaccent($str) : $str, $newstr, $filesystem_forbidden_chars);
 }
 
 /**
@@ -990,17 +1028,25 @@ function dol_string_nospecial($str, $newstr = '_', $badcharstoreplace = '')
 
 
 /**
- *	Clean a string from all non printable ascii chars (0x00-0x1F and 0x7F). It removes also CR-LF
+ *	Clean a string from all non printable ASCII chars (0x00-0x1F and 0x7F). It can also removes also Tab-CR-LF. UTF8 chars remains.
  *  This can be used to sanitize a string and view its real content. Some hacks try to obfuscate attacks by inserting non printable chars.
- *
+ *  Note, for information: UTF8 on 1 byte are: \x00-\7F
+ *                                 2 bytes are: byte 1 \xc0-\xdf, byte 2 = \x80-\xbf
+ *                                 3 bytes are: byte 1 \xe0-\xef, byte 2 = \x80-\xbf, byte 3 = \x80-\xbf
+ *                                 4 bytes are: byte 1 \xf0-\xf7, byte 2 = \x80-\xbf, byte 3 = \x80-\xbf, byte 4 = \x80-\xbf
  *	@param	string	$str            	String to clean
+ *  @param	int		$removetabcrlf		Remove also CR-LF
  * 	@return string          			Cleaned string
  *
  * 	@see    		dol_sanitizeFilename(), dol_string_unaccent(), dol_string_nospecial()
  */
-function dol_string_nounprintableascii($str)
+function dol_string_nounprintableascii($str, $removetabcrlf = 1)
 {
-	return preg_replace('/[\x00-\x1F\x7F]/u', '', $str);
+	if ($removetabcrlf) {
+		return preg_replace('/[\x00-\x1F\x7F]/u', '', $str); // /u operator makes UTF8 valid characters being ignored so are not included into the replace
+	} else {
+		return preg_replace('/[\x00-\x08\x11-\x12\x14-\x1F\x7F]/u', '', $str); // /u operator should make UTF8 valid characters being ignored so are not included into the replace
+	}
 }
 
 
@@ -1038,7 +1084,7 @@ function dol_escape_json($stringtoescape)
  *  Returns text escaped for inclusion in HTML alt or title tags, or into values of HTML input fields.
  *
  *  @param      string		$stringtoescape			String to escape
- *  @param		int			$keepb					1=Preserve b tags (otherwise, remove them)
+ *  @param		int			$keepb					1=Keep b tags and escape them, 0=remove them
  *  @param      int         $keepn              	1=Preserve \r\n strings (otherwise, replace them with escaped value). Set to 1 when escaping for a <textarea>.
  *  @param		string		$keepmoretags			'' or 'common' or list of tags
  *  @param		int			$escapeonlyhtmltags		1=Escape only html tags, not the special chars like accents.
@@ -1047,7 +1093,7 @@ function dol_escape_json($stringtoescape)
  */
 function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $keepmoretags = '', $escapeonlyhtmltags = 0)
 {
-	if ($keepmoretags == 'common') $keepmoretags = 'html,body,a,em,i,u,ul,li,br,div,img,font,p,span,strong,table,tr,td,th,tbody';
+	if ($keepmoretags == 'common') $keepmoretags = 'html,body,a,b,em,i,u,ul,li,br,div,img,font,p,span,strong,table,tr,td,th,tbody';
 	// TODO Implement $keepmoretags
 
 	// escape quotes and backslashes, newlines, etc.
@@ -1065,29 +1111,69 @@ function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $keepmoreta
 	}
 }
 
-
 /**
  * Convert a string to lower. Never use strtolower because it does not works with UTF8 strings.
  *
- * @param 	string		$utf8_string		String to encode
+ * @param 	string		$string		        String to encode
+ * @param   string      $encoding           Character set encoding
  * @return 	string							String converted
  */
-function dol_strtolower($utf8_string)
+function dol_strtolower($string, $encoding = "UTF-8")
 {
-	return mb_strtolower($utf8_string, "UTF-8");
+	if (function_exists('mb_strtolower')) {
+		return mb_strtolower($string, $encoding);
+	} else {
+		return strtolower($string);
+	}
 }
 
 /**
  * Convert a string to upper. Never use strtolower because it does not works with UTF8 strings.
  *
- * @param 	string		$utf8_string		String to encode
+ * @param 	string		$string		        String to encode
+ * @param   string      $encoding           Character set encoding
  * @return 	string							String converted
  */
-function dol_strtoupper($utf8_string)
+function dol_strtoupper($string, $encoding = "UTF-8")
 {
-	return mb_strtoupper($utf8_string, "UTF-8");
+	if (function_exists('mb_strtoupper')) {
+		return mb_strtoupper($string, $encoding);
+	} else {
+		return strtoupper($string);
+	}
 }
 
+/**
+ * Convert first character of the first word of a string to upper. Never use ucfirst because it does not works with UTF8 strings.
+ *
+ * @param   string      $string         String to encode
+ * @param   string      $encoding       Character set encodign
+ * @return  string                      String converted
+ */
+function dol_ucfirst($string, $encoding = "UTF-8")
+{
+	if (function_exists('mb_substr')) {
+		return mb_strtoupper(mb_substr($string, 0, 1, $encoding), $encoding).mb_substr($string, 1, null, $encoding);
+	} else {
+		return ucfirst($string);
+	}
+}
+
+/**
+ * Convert first character of all the words of a string to upper. Never use ucfirst because it does not works with UTF8 strings.
+ *
+ * @param   string      $string         String to encode
+ * @param   string      $encoding       Character set encodign
+ * @return  string                      String converted
+ */
+function dol_ucwords($string, $encoding = "UTF-8")
+{
+	if (function_exists('mb_convert_case')) {
+		return mb_convert_case($string, MB_CASE_TITLE, $encoding);
+	} else {
+		return ucwords($string);
+	}
+}
 
 /**
  *	Write log message into outputs. Possible outputs can be:
@@ -1198,6 +1284,44 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
 	}
 }
 
+/**
+ *	Return HTML code to output a button to open a dialog popup box.
+ *  Such buttons must be included inside a HTML form.
+ *
+ *	@param	string	$name				A name for the html component
+ *	@param	string	$label 	    		Label of button
+ *	@param  string	$buttonstring  		button string
+ *	@param  string	$url				Url to open
+ *  @param	string	$disabled			Disabled text
+ * 	@return	string						HTML component with button
+ */
+function dolButtonToOpenUrlInDialogPopup($name, $label, $buttonstring, $url, $disabled = '')
+{
+	if (strpos($url, '?') > 0) {
+		$url .= '&dol_hide_topmenu=1&dol_hide_leftmenu=1&dol_openinpopup=1';
+	} else {
+		$url .= '?dol_hide_menuinpopup=1&dol_hide_leftmenu=1&dol_openinpopup=1';
+	}
+
+	//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("MediaFiles")).'" name="file_manager">';
+	$out = '<a class="button bordertransp button_'.$name.'"'.$disabled.' title="'.dol_escape_htmltag($label).'">'.$buttonstring.'</a>';
+	$out .= '<script language="javascript">
+				 jQuery(document).ready(function () {
+					 jQuery(".button_'.$name.'").click(function () {
+						 var $dialog = $(\'<div></div>\').html(\'<iframe class="iframedialog" style="border: 0px;" src="'.DOL_URL_ROOT.$url.'" width="100%" height="98%"></iframe>\')
+						 .dialog({
+						 	autoOpen: false,
+						 	modal: true,
+						 	height: (window.innerHeight - 150),
+						 	width: \'80%\',
+						 	title: "'.dol_escape_js($label).'"
+						 });
+						 $dialog.dialog(\'open\');
+					 });
+				 });
+				 </script>';
+	return $out;
+}
 
 /**
  *	Show tab header of a card
@@ -1205,7 +1329,7 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
  *	@param	array	$links				Array of tabs. Currently initialized by calling a function xxx_admin_prepare_head
  *	@param	string	$active     		Active tab name (document', 'info', 'ldap', ....)
  *	@param  string	$title      		Title
- *	@param  int		$notab				-1 or 0=Add tab header, 1=no tab header (if you set this to 1, using dol_fiche_end() to close tab is not required), -2=Add tab header with no seaparation under tab (to start a tab just after)
+ *	@param  int		$notab				-1 or 0=Add tab header, 1=no tab header (if you set this to 1, using print dol_get_fiche_end() to close tab is not required), -2=Add tab header with no seaparation under tab (to start a tab just after)
  * 	@param	string	$picto				Add a picto on tab title
  *	@param	int		$pictoisfullpath	If 1, image path is a full path. If you set this to 1, you can use url returned by dol_buildpath('/mymodyle/img/myimg.png',1) for $picto.
  *  @param	string	$morehtmlright		Add more html content on right of tabs title
@@ -1213,6 +1337,7 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
  *  @param	int		$limittoshow		Limit number of tabs to show. Use 0 to use automatic default value.
  *  @param	string	$moretabssuffix		A suffix to use when you have several dol_get_fiche_head() in same page
  * 	@return	void
+ *  @deprecated Use print dol_get_fiche_head() instead
  */
 function dol_fiche_head($links = array(), $active = '0', $title = '', $notab = 0, $picto = '', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '', $limittoshow = 0, $moretabssuffix = '')
 {
@@ -1225,7 +1350,7 @@ function dol_fiche_head($links = array(), $active = '0', $title = '', $notab = 0
  *	@param	array	$links				Array of tabs
  *	@param	string	$active     		Active tab name
  *	@param  string	$title      		Title
- *	@param  int		$notab				-1 or 0=Add tab header, 1=no tab header (if you set this to 1, using dol_fiche_end() to close tab is not required), -2=Add tab header with no seaparation under tab (to start a tab just after)
+ *	@param  int		$notab				-1 or 0=Add tab header, 1=no tab header (if you set this to 1, using print dol_get_fiche_end() to close tab is not required), -2=Add tab header with no seaparation under tab (to start a tab just after)
  * 	@param	string	$picto				Add a picto on tab title
  *	@param	int		$pictoisfullpath	If 1, image path is a full path. If you set this to 1, you can use url returned by dol_buildpath('/mymodyle/img/myimg.png',1) for $picto.
  *  @param	string	$morehtmlright		Add more html content on right of tabs title
@@ -1360,7 +1485,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 		$tabsname = $moretabssuffix;
 		if (empty($tabsname)) { $tabsname = str_replace("@", "", $picto); }
 		$out .= '<div id="moretabs'.$tabsname.'" class="inline-block tabsElem">';
-		$out .= '<a href="#" class="tab moretab inline-block tabunactive">'.$langs->trans("More").'... ('.$nbintab.')</a>';	// Do not use "reposition" class in the "More".
+		$out .= '<a href="#" class="tab moretab inline-block tabunactive">'.$langs->trans("More").'... ('.$nbintab.')</a>'; // Do not use "reposition" class in the "More".
 		$out .= '<div id="moretabsList'.$tabsname.'" style="width: '.$widthofpopup.'px; position: absolute; '.$left.': -999em; text-align: '.$left.'; margin:0px; padding:2px; z-index:10;">';
 		$out .= $outmore;
 		$out .= '</div>';
@@ -1371,7 +1496,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 		$out .= "$('#moretabs".$tabsname."').mouseenter( function() {
 			var x = this.offsetLeft, y = this.offsetTop;
 			console.log('mouseenter ".$left." x='+x+' y='+y+' window.innerWidth='+window.innerWidth);
-			if ((window.innerWidth - x) < ".($widthofpopup+10).") {
+			if ((window.innerWidth - x) < ".($widthofpopup + 10).") {
 				$('#moretabsList".$tabsname."').css('".$right."','8px');
 			}
 			$('#moretabsList".$tabsname."').css('".$left."','auto');
@@ -1402,6 +1527,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
  *
  *  @param	int		$notab       -1 or 0=Add tab footer, 1=no tab footer
  *  @return	void
+ *  @deprecated Use print dol_get_fiche_end() instead
  */
 function dol_fiche_end($notab = 0)
 {
@@ -1478,8 +1604,9 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 		$showimage = $object->is_photo_available($conf->product->multidir_output[$entity]);
 		$maxvisiblephotos = (isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO) ? $conf->global->PRODUCT_MAX_VISIBLE_PHOTO : 5);
 		if ($conf->browser->layout == 'phone') $maxvisiblephotos = 1;
-		if ($showimage) $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>';
-		else {
+		if ($showimage) {
+			$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>';
+		} else {
 			if (!empty($conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {
 				$nophoto = '';
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';
@@ -1561,23 +1688,21 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 
 					if ($pdfexists && !$error)
 					{
-						$heightforphotref = 70;
+						$heightforphotref = 80;
 						if (!empty($conf->dol_optimize_smallscreen)) $heightforphotref = 60;
 						// If the preview file is found
 						if (file_exists($fileimage))
 						{
-							$phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';
+							$phototoshow = '<div class="photoref">';
 							$phototoshow .= '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
-							$phototoshow .= '</div></div>';
+							$phototoshow .= '</div>';
 						}
 					}
-				} elseif (!$phototoshow)
-				{
+				} elseif (!$phototoshow) { // example if modulepart = 'photo'
 					$phototoshow .= $form->showphoto($modulepart, $object, 0, 0, 0, 'photoref', 'small', 1, 0, $maxvisiblephotos);
 				}
 
-				if ($phototoshow)
-				{
+				if ($phototoshow) {
 					$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">';
 					$morehtmlleft .= $phototoshow;
 					$morehtmlleft .= '</div>';
@@ -1633,21 +1758,17 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 		} else {
 			$morehtmlstatus .= '<span class="statusrefbuy">'.$object->getLibStatut(6, 1).'</span>';
 		}
-	} elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan')))
-	{
+	} elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan'))) {
 		$tmptxt = $object->getLibStatut(6, $object->totalpaye);
 		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) $tmptxt = $object->getLibStatut(5, $object->totalpaye);
 		$morehtmlstatus .= $tmptxt;
-	} elseif ($object->element == 'contrat' || $object->element == 'contract')
-	{
+	} elseif ($object->element == 'contrat' || $object->element == 'contract') {
 		if ($object->statut == 0) $morehtmlstatus .= $object->getLibStatut(5);
 		else $morehtmlstatus .= $object->getLibStatut(4);
-	} elseif ($object->element == 'facturerec')
-	{
+	} elseif ($object->element == 'facturerec') {
 		if ($object->frequency == 0) $morehtmlstatus .= $object->getLibStatut(2);
 		else $morehtmlstatus .= $object->getLibStatut(5);
-	} elseif ($object->element == 'project_task')
-	{
+	} elseif ($object->element == 'project_task') {
 		$object->fk_statut = 1;
 		if ($object->progress > 0) $object->fk_statut = 2;
 		if ($object->progress >= 100) $object->fk_statut = 3;
@@ -1660,8 +1781,9 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 	}
 
 	// Add if object was dispatched "into accountancy"
-	if (!empty($conf->accounting->enabled) && in_array($object->element, array('bank', 'facture', 'invoice', 'invoice_supplier', 'expensereport', 'payment_various')))
+	if (!empty($conf->accounting->enabled) && in_array($object->element, array('bank', 'paiementcharge', 'facture', 'invoice', 'invoice_supplier', 'expensereport', 'payment_various')))
 	{
+		// Note: For 'chargesociales', 'salaries'... this is the payments that are dispatched (so element = 'bank')
 		if (method_exists($object, 'getVentilExportCompta'))
 		{
 			$accounted = $object->getVentilExportCompta();
@@ -1764,54 +1886,44 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 		$ret .= ($extralangcode ? $object->array_languages['address'][$extralangcode] : $object->address);
 	}
 	// Zip/Town/State
-	if (in_array($object->country_code, array('AU', 'CA', 'US')) || !empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS))   	// US: title firstname name \n address lines \n town, state, zip \n country
-	{
+	if (isset($object->country_code) && in_array($object->country_code, array('AU', 'CA', 'US')) || !empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)) {  	// US: title firstname name \n address lines \n town, state, zip \n country
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= ($ret ? $sep : '').$town;
-		if ($object->state)
-		{
+		if (!empty($object->state))	{
 			$ret .= ($ret ? ", " : '').$object->state;
 		}
 		if ($object->zip) $ret .= ($ret ? ", " : '').$object->zip;
-	} elseif (in_array($object->country_code, array('GB', 'UK'))) // UK: title firstname name \n address lines \n town state \n zip \n country
-	{
+	} elseif (isset($object->country_code) && in_array($object->country_code, array('GB', 'UK'))) { // UK: title firstname name \n address lines \n town state \n zip \n country
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= ($ret ? $sep : '').$town;
-		if ($object->state)
-		{
+		if (!empty($object->state)) {
 			$ret .= ($ret ? ", " : '').$object->state;
 		}
 		if ($object->zip) $ret .= ($ret ? $sep : '').$object->zip;
-	} elseif (in_array($object->country_code, array('ES', 'TR'))) // ES: title firstname name \n address lines \n zip town \n state \n country
-	{
+	} elseif (isset($object->country_code) && in_array($object->country_code, array('ES', 'TR'))) { // ES: title firstname name \n address lines \n zip town \n state \n country
 		$ret .= ($ret ? $sep : '').$object->zip;
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= ($town ? (($object->zip ? ' ' : '').$town) : '');
-		if ($object->state)
-		{
+		if (!empty($object->state)) {
 			$ret .= "\n".$object->state;
 		}
-	} elseif (in_array($object->country_code, array('IT'))) // IT: tile firstname name\n address lines \n zip (Code Departement) \n country
-	{
+	} elseif (isset($object->country_code) && in_array($object->country_code, array('IT'))) { // IT: tile firstname name\n address lines \n zip (Code Departement) \n country
 		$ret .= ($ret ? $sep : '').$object->zip;
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= ($town ? (($object->zip ? ' ' : '').$town) : '');
-		$ret .= ($object->state_code ? (' '.($object->state_code)) : '');
-	} else // Other: title firstname name \n address lines \n zip town \n country
-	{
+		$ret .= (empty($object->state_code) ? '' : (' '.$object->state_code));
+	} else { // Other: title firstname name \n address lines \n zip town \n country
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= $object->zip ? (($ret ? $sep : '').$object->zip) : '';
 		$ret .= ($town ? (($object->zip ? ' ' : ($ret ? $sep : '')).$town) : '');
-		if ($object->state && in_array($object->country_code, $countriesusingstate))
-		{
+		if (!empty($object->state) && in_array($object->country_code, $countriesusingstate)) {
 			$ret .= ($ret ? ", " : '').$object->state;
 		}
 	}
 	if (!is_object($outputlangs)) $outputlangs = $langs;
-	if ($withcountry)
-	{
+	if ($withcountry) {
 		$langs->load("dict");
-		$ret .= ($object->country_code ? ($ret ? $sep : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->country_code)) : '');
+		$ret .= (empty($object->country_code) ? '' : ($ret ? $sep : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->country_code)));
 	}
 
 	return $ret;
@@ -2000,15 +2112,13 @@ function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlang
 
 /**
  *  Return an array with locale date info.
- *  PHP getdate is restricted to the years 1901-2038 on Unix and 1970-2038 on Windows
- *  WARNING: This function always use PHP server timezone to return locale informations !!!
- *  Usage must be avoid.
- *  FIXME: Replace this with PHP date function and a parameter $gm
+ *  WARNING: This function use PHP server timezone by default to return locale informations.
+ *  Be aware to add the third parameter to "UTC" if you need to work on UTC.
  *
  *	@param	int			$timestamp      Timestamp
- *	@param	boolean		$fast           Fast mode
+ *	@param	boolean		$fast           Fast mode. deprecated.
+ *  @param	string		$forcetimezone	'' to use the PHP server timezone. Or use a form like 'Europe/Paris' or '+0200' to force timezone.
  *	@return	array						Array of informations
- *										If no fast mode:
  *										'seconds' => $secs,
  *										'minutes' => $min,
  *										'hours' => $hour,
@@ -2016,34 +2126,42 @@ function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlang
  *										'wday' => $dow,		0=sunday, 6=saturday
  *										'mon' => $month,
  *										'year' => $year,
- *										'yday' => floor($secsInYear/$_day_power),
- *										'weekday' => gmdate('l',$_day_power*(3+$dow)),
- *										'month' => gmdate('F',mktime(0,0,0,$month,2,1971)),
- *										If fast mode:
- *										'seconds' => $secs,
- *										'minutes' => $min,
- *										'hours' => $hour,
- *										'mday' => $day,
- *										'mon' => $month,
- *										'year' => $year,
- *										'yday' => floor($secsInYear/$_day_power),
- *										'leap' => $leaf,
- *										'ndays' => $ndays
+ *										'yday' => floor($secsInYear/$_day_power)
+ *										'0' => original timestamp
  * 	@see 								dol_print_date(), dol_stringtotime(), dol_mktime()
  */
-function dol_getdate($timestamp, $fast = false)
+function dol_getdate($timestamp, $fast = false, $forcetimezone = '')
 {
 	global $conf;
 
-	$usealternatemethod = false;
-	if ($timestamp <= 0) $usealternatemethod = true; // <= 1970
-	if ($timestamp >= 2145913200) $usealternatemethod = true; // >= 2038
-
-	if ($usealternatemethod)
-	{
-		$arrayinfo = adodb_getdate($timestamp, $fast);
+	if (empty($conf->global->MAIN_USE_OLD_FUNCTIONS_FOR_GETDATE)) {
+		//$datetimeobj = new DateTime('@'.$timestamp);
+		$datetimeobj = new DateTime();
+		$datetimeobj->setTimestamp($timestamp); // Use local PHP server timezone
+		if ($forcetimezone) $datetimeobj->setTimezone(new DateTimeZone($forcetimezone)); //  (add timezone relative to the date entered)
+		$arrayinfo = array(
+			'year'=>((int) date_format($datetimeobj, 'Y')),
+			'mon'=>((int) date_format($datetimeobj, 'm')),
+			'mday'=>((int) date_format($datetimeobj, 'd')),
+			'wday'=>((int) date_format($datetimeobj, 'w')),
+			'yday'=>((int) date_format($datetimeobj, 'z')),
+			'hours'=>((int) date_format($datetimeobj, 'H')),
+			'minutes'=>((int) date_format($datetimeobj, 'i')),
+			'seconds'=>((int) date_format($datetimeobj, 's')),
+			'0'=>$timestamp
+		);
 	} else {
-		$arrayinfo = getdate($timestamp);
+		// PHP getdate is restricted to the years 1901-2038 on Unix and 1970-2038 on Windows
+		$usealternatemethod = false;
+		if ($timestamp <= 0) $usealternatemethod = true; // <= 1970
+		if ($timestamp >= 2145913200) $usealternatemethod = true; // >= 2038
+
+		if ($usealternatemethod)
+		{
+			$arrayinfo = adodb_getdate($timestamp, $fast);
+		} else {
+			$arrayinfo = getdate($timestamp);
+		}
 	}
 
 	return $arrayinfo;
@@ -2226,7 +2344,7 @@ function dol_print_url($url, $target = '_blank', $max = 32, $withpicto = 0)
 }
 
 /**
- * Show EMail link
+ * Show EMail link formatted for HTML output.
  *
  * @param	string		$email			EMail to show (only email, without 'Name of recipient' before)
  * @param 	int			$cid 			Id of contact if known
@@ -2241,7 +2359,7 @@ function dol_print_email($email, $cid = 0, $socid = 0, $addlink = 0, $max = 64,
 {
 	global $conf, $user, $langs, $hookmanager;
 
-	$newemail = $email;
+	$newemail = dol_escape_htmltag($email);
 
 	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpicto) $withpicto = 0;
 
@@ -2319,13 +2437,14 @@ function getArrayOfSocialNetworks()
 /**
  * Show social network link
  *
- * @param	string		$value			Skype to show (only skype, without 'Name of recipient' before)
- * @param	int 		$cid 			Id of contact if known
- * @param	int 		$socid 			Id of third party if known
- * @param	string 		$type			'skype','facebook',...
- * @return	string						HTML Link
+ * @param	string		$value				Skype to show (only skype, without 'Name of recipient' before)
+ * @param	int 		$cid 				Id of contact if known
+ * @param	int 		$socid 				Id of third party if known
+ * @param	string 		$type				'skype','facebook',...
+ * @param	array		$dictsocialnetworks socialnetworks availables
+ * @return	string							HTML Link
  */
-function dol_print_socialnetworks($value, $cid, $socid, $type)
+function dol_print_socialnetworks($value, $cid, $socid, $type, $dictsocialnetworks = array())
 {
 	global $conf, $user, $langs;
 
@@ -2333,13 +2452,12 @@ function dol_print_socialnetworks($value, $cid, $socid, $type)
 
 	if (empty($value)) return '&nbsp;';
 
-	if (!empty($type))
-	{
+	if (!empty($type)) {
 		$htmllink = '<div class="divsocialnetwork inline-block valignmiddle">';
-		$htmllink .= img_picto($langs->trans(strtoupper($type)), $type.'.png', '', false, 0, 0, '', 'paddingright', 0);
-		$htmllink .= $value;
-		if ($type == 'skype')
-		{
+		// TODO use dictionary definition for picto $dictsocialnetworks[$type]['icon']
+		$htmllink .= img_picto($langs->trans(dol_ucfirst($type)), $type.'.png', '', false, 0, 0, '', 'paddingright', 0);
+		if ($type == 'skype') {
+			$htmllink .= $value;
 			$htmllink .= '&nbsp;';
 			$htmllink .= '<a href="skype:';
 			$htmllink .= $value;
@@ -2350,13 +2468,19 @@ function dol_print_socialnetworks($value, $cid, $socid, $type)
 			$htmllink .= '?chat" alt="'.$langs->trans("Chat").'&nbsp;'.$value.'" title="'.$langs->trans("Chat").'&nbsp;'.$value.'">';
 			$htmllink .= '<img class="paddingleft" src="'.DOL_URL_ROOT.'/theme/common/skype_chatbutton.png" border="0">';
 			$htmllink .= '</a>';
-		}
-		if (($cid || $socid) && !empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create && $type == 'skype')
-		{
-			$addlink = 'AC_SKYPE';
-			$link = '';
-			if (!empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) $link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$addlink.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';
-			$htmllink .= ($link ? ' '.$link : '');
+			if (($cid || $socid) && !empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) {
+				$addlink = 'AC_SKYPE';
+				$link = '';
+				if (!empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) $link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$addlink.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';
+				$htmllink .= ($link ? ' '.$link : '');
+			}
+		} else {
+			if (!empty($dictsocialnetworks[$type]['url'])) {
+				$link = str_replace('{socialid}', $value, $dictsocialnetworks[$type]['url']);
+				$htmllink .= '&nbsp;<a href="'.$link.'" target="_blank">'.$value.'</a>';
+			} else {
+				$htmllink .= $value;
+			}
 		}
 		$htmllink .= '</div>';
 	} else {
@@ -2387,7 +2511,7 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 	// Clean phone parameter
 	$phone = preg_replace("/[\s.-]/", "", trim($phone));
 	if (empty($phone)) { return ''; }
-	if ($conf->global->MAIN_PHONE_SEPAR) $separ = $conf->global->MAIN_PHONE_SEPAR;
+	if (!empty($conf->global->MAIN_PHONE_SEPAR)) $separ = $conf->global->MAIN_PHONE_SEPAR;
 	if (empty($countrycode)) $countrycode = $mysoc->country_code;
 
 	// Short format for small screens
@@ -2764,7 +2888,7 @@ function getUserRemoteIP()
 			$ip = $_SERVER['HTTP_CLIENT_IP']; // value is clean here
 		}
 	} else {
-		$ip = $_SERVER['HTTP_X_FORWARDED_FOR'];	// value is clean here
+		$ip = $_SERVER['HTTP_X_FORWARDED_FOR']; // value is clean here
 	}
 	return $ip;
 }
@@ -2878,11 +3002,12 @@ function dol_print_address($address, $htmlid, $element, $id, $noprint = 0, $char
 
 
 /**
- *	Return true if email syntax is ok
+ *	Return true if email syntax is ok.
  *
  *	@param	    string		$address    			email (Ex: "toto@examle.com", "John Do <johndo@example.com>")
  *  @param		int			$acceptsupervisorkey	If 1, the special string '__SUPERVISOREMAIL__' is also accepted as valid
  *	@return     boolean     						true if email syntax is OK, false if KO or empty string
+ *  @see isValidMXRecord()
  */
 function isValidEmail($address, $acceptsupervisorkey = 0)
 {
@@ -2898,6 +3023,7 @@ function isValidEmail($address, $acceptsupervisorkey = 0)
  *
  *	@param	    string		$domain	    			Domain name (Ex: "yahoo.com", "yhaoo.com", "dolibarr.fr")
  *	@return     int     							-1 if error (function not available), 0=Not valid, 1=Valid
+ *  @see isValidEmail()
  */
 function isValidMXRecord($domain)
 {
@@ -2991,7 +3117,7 @@ function dol_substr($string, $start, $length, $stringencoding = '', $trunconbyte
  *
  *	@param	string	$string				String to truncate
  *	@param  int		$size				Max string size visible (excluding ...). 0 for no limit. WARNING: Final string size can have 3 more chars (if we added ..., or if size was max+1 or max+2 or max+3 so it does not worse to replace with ...)
- *	@param	string	$trunc				Where to trunc: right, left, middle (size must be a 2 power), wrap
+ *	@param	string	$trunc				Where to trunc: 'right', 'left', 'middle' (size must be a 2 power), 'wrap'
  * 	@param	string	$stringencoding		Tell what is source string encoding
  *  @param	int		$nodot				Truncation do not add ... after truncation. So it's an exact truncation.
  *  @param  int     $display            Trunc is used to display data and can be changed for small screen. TODO Remove this param (must be dealt with CSS)
@@ -3064,9 +3190,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 	// We forge fullpathpicto for image to $path/img/$picto. By default, we take DOL_URL_ROOT/theme/$conf->theme/img/$picto
 	$url = DOL_URL_ROOT;
-	$theme = $conf->theme;
+	$theme = isset($conf->theme) ? $conf->theme : null;
 	$path = 'theme/'.$theme;
-
 	// Define fullpathpicto to use into src
 	if ($pictoisfullpath) {
 		// Clean parameters
@@ -3083,27 +3208,28 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		$pictowithouttext = preg_replace('/(\.png|\.gif|\.svg)$/', '', $picto);
 		if (empty($srconly) && in_array($pictowithouttext, array(
 				'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
-				'accountancy', 'account', 'accountline', 'action', 'add', 'address', 'bank_account', 'barcode', 'bank', 'bill', 'bookmark', 'bom', 'building',
-				'cash-register', 'category', 'check', 'clock', 'close_title', 'company', 'contact', 'contract', 'cubes',
-				'delete', 'dolly', 'dollyrevert', 'edit', 'ellipsis-h', 'email', 'external-link-alt', 'external-link-square-alt',
-				'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'globe', 'globe-americas', 'grip', 'grip_title',
+				'accountancy', 'account', 'accountline', 'action', 'add', 'address', 'bank_account', 'barcode', 'bank', 'bill', 'billa', 'billr', 'billd', 'bookmark', 'bom', 'building',
+				'cash-register', 'category', 'check', 'clock', 'close_title', 'company', 'contact', 'contract', 'cron', 'cubes',
+				'delete', 'dolly', 'dollyrevert', 'donation', 'edit', 'ellipsis-h', 'email', 'eraser', 'external-link-alt', 'external-link-square-alt',
+				'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'globe', 'globe-americas', 'grip', 'grip_title', 'group',
 				'help', 'holiday',
 				'intervention', 'label', 'language', 'list', 'listlight', 'lot',
-				'map-marker-alt', 'money-bill-alt', 'mrp', 'note',
+				'map-marker-alt', 'member', 'money-bill-alt', 'mrp', 'note', 'next',
 				'object_accounting', 'object_account', 'object_accountline', 'object_action', 'object_barcode', 'object_bill', 'object_billa', 'object_billd', 'object_bom',
 				'object_category', 'object_conversation', 'object_bookmark', 'object_bug', 'object_dolly', 'object_dollyrevert', 'object_generic', 'object_folder',
 				'object_list-alt', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
 				'object_cash-register', 'object_company', 'object_contact', 'object_contract', 'object_donation', 'object_dynamicprice',
 				'object_globe', 'object_holiday', 'object_hrm', 'object_invoice', 'object_intervention', 'object_label',
 				'object_margin', 'object_money-bill-alt', 'object_multicurrency', 'object_order', 'object_payment',
-				'object_lot', 'object_mrp', 'object_payment', 'object_product', 'object_propal',
-				'object_other', 'object_paragraph', 'object_poll', 'object_printer', 'object_project', 'object_projectpub', 'object_propal', 'object_resource', 'object_rss', 'object_projecttask',
+				'object_lot', 'object_mrp', 'object_other',
+				'object_payment', 'object_pdf', 'object_product', 'object_propal',
+				'object_paragraph', 'object_poll', 'object_printer', 'object_project', 'object_projectpub', 'object_propal', 'object_resource', 'object_rss', 'object_projecttask',
 				'object_recruitmentjobposition', 'object_recruitmentcandidature',
 				'object_shipment', 'object_share-alt', 'object_supplier_invoice', 'object_supplier_invoicea', 'object_supplier_invoiced', 'object_supplier_order', 'object_supplier_proposal', 'object_service', 'object_stock',
 				'object_technic', 'object_ticket', 'object_trip', 'object_user', 'object_group', 'object_member',
 				'object_phoning', 'object_phoning_mobile', 'object_phoning_fax', 'object_email', 'object_website',
 				'off', 'on', 'order',
-				'paiment', 'play', 'playdisabled', 'poll', 'printer', 'product', 'propal', 'projecttask', 'stock', 'resize', 'service', 'stats', 'trip',
+				'paiment', 'play', 'pdf', 'playdisabled', 'previous', 'poll', 'printer', 'product', 'propal', 'projecttask', 'stock', 'resize', 'service', 'stats', 'trip',
 				'setup', 'share-alt', 'sign-out', 'split', 'stripe-s', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'vcard', 'wrench',
 				'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
 				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top', 'commercial', 'companies',
@@ -3115,18 +3241,18 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda'
 			)
 		)) {
+			$pictowithouttext = str_replace('object_', '', $pictowithouttext);
+
 			$fakey = $pictowithouttext;
 			$facolor = ''; $fasize = '';
 			$fa = 'fas';
-			if (in_array($pictowithouttext, array('clock', 'object_generic', 'note', 'off', 'on', 'object_bookmark', 'bookmark', 'vcard'))) {
+			if (in_array($pictowithouttext, array('clock', 'generic', 'minus-square', 'object_generic', 'pdf', 'plus-square', 'note', 'off', 'on', 'object_bookmark', 'bookmark', 'vcard'))) {
 				$fa = 'far';
 			}
 			if (in_array($pictowithouttext, array('black-tie', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'stripe-s', 'youtube', 'google-plus-g', 'whatsapp'))) {
 				$fa = 'fab';
 			}
 
-			$pictowithouttext = str_replace('object_', '', $pictowithouttext);
-
 			$arrayconvpictotofa = array(
 				'account'=>'university', 'accountline'=>'receipt', 'accountancy'=>'money-check-alt', 'action'=>'calendar-alt', 'add'=>'plus-circle', 'address'=> 'address-book',
 				'bank_account'=>'university', 'bill'=>'file-invoice-dollar', 'billa'=>'file-excel', 'supplier_invoicea'=>'file-excel', 'billd'=>'file-medical', 'supplier_invoiced'=>'file-medical', 'bom'=>'cubes',
@@ -3137,18 +3263,19 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'email'=>'at',
 				'edit'=>'pencil-alt', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'question-circle',
 				'generic'=>'file', 'holiday'=>'umbrella-beach', 'label'=>'layer-group',
-				'member'=>'users', 'mrp'=>'cubes', 'trip'=>'wallet', 'group'=>'users',
+				'member'=>'users', 'mrp'=>'cubes', 'next'=>'arrow-alt-circle-right',
+				'trip'=>'wallet', 'group'=>'users',
 				'sign-out'=>'sign-out-alt',
 				'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on', 'check'=>'check', 'bookmark'=>'star', 'bookmark'=>'star',
-				'bank'=>'university', 'close_title'=>'window-close', 'delete'=>'trash', 'edit'=>'pencil-alt', 'filter'=>'filter',
+				'bank'=>'university', 'close_title'=>'times', 'delete'=>'trash', 'edit'=>'pencil-alt', 'filter'=>'filter',
 				'list-alt'=>'list-alt', 'calendar'=>'calendar-alt', 'calendarweek'=>'calendar-week', 'calendarmonth'=>'calendar-alt', 'calendarday'=>'calendar-day', 'calendarperuser'=>'table',
 				'intervention'=>'ambulance', 'invoice'=>'file-invoice-dollar', 'multicurrency'=>'dollar-sign', 'order'=>'file-invoice',
 				'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle',
 				'other'=>'square',
-				'playdisabled'=>'play', 'poll'=>'check-double', 'preview'=>'binoculars', 'project'=>'sitemap', 'projectpub'=>'sitemap', 'projecttask'=>'tasks', 'propal'=>'file-signature',
+				'playdisabled'=>'play', 'pdf'=>'file-pdf',  'poll'=>'check-double', 'preview'=>'binoculars', 'project'=>'sitemap', 'projectpub'=>'sitemap', 'projecttask'=>'tasks', 'propal'=>'file-signature',
+				'payment'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'previous'=>'arrow-alt-circle-left', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
 				'recruitmentjobposition'=>'id-card-alt', 'recruitmentcandidature'=>'id-badge',
 				'resize'=>'crop', 'supplier_order'=>'dol-order_supplier', 'supplier_proposal'=>'file-signature',
-				'payment'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
 				'refresh'=>'redo', 'resource'=>'laptop-house',
 				'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'supplier_invoice'=>'file-invoice-dollar', 'technic'=>'cogs', 'ticket'=>'ticket-alt',
 				'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
@@ -3177,8 +3304,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				$fakey = 'fa-'.$convertarray[$pictowithouttext];
 				if (preg_match('/selected/', $pictowithouttext)) $facolor = '#888';
 				$marginleftonlyshort = 1;
-			} elseif (!empty($arrayconvpictotofa[$pictowithouttext]))
-			{
+			} elseif (!empty($arrayconvpictotofa[$pictowithouttext])) {
 				$fakey = 'fa-'.$arrayconvpictotofa[$pictowithouttext];
 			} else {
 				$fakey = 'fa-'.$pictowithouttext;
@@ -3224,7 +3350,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 			// Define $color
 			$arrayconvpictotocolor = array(
 				'address'=>'#6c6aa8', 'building'=>'#6c6aa8', 'bom'=>'#a69944',
-				'companies'=>'#6c6aa8', 'company'=>'#6c6aa8', 'contact'=>'#37a', 'dynamicprice'=>'#a69944',
+				'companies'=>'#6c6aa8', 'company'=>'#6c6aa8', 'contact'=>'#6c6aa8', 'dynamicprice'=>'#a69944',
 				'edit'=>'#444', 'note'=>'#999', 'error'=>'', 'help'=>'#bbb', 'listlight'=>'#999',
 				'dolly'=>'#a69944', 'dollyrevert'=>'#a69944', 'lot'=>'#a69944',
 				'map-marker-alt'=>'#aaa', 'mrp'=>'#a69944', 'product'=>'#a69944', 'service'=>'#a69944', 'stock'=>'#a69944',
@@ -3239,22 +3365,23 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 			// This snippet only needed since function img_edit accepts only one additional parameter: no separate one for css only.
 			// class/style need to be extracted to avoid duplicate class/style validation errors when $moreatt is added to the end of the attributes.
+			$morestyle = '';
 			$reg = array();
 			if (preg_match('/class="([^"]+)"/', $moreatt, $reg)) {
 				$morecss .= ($morecss ? ' ' : '').$reg[1];
 				$moreatt = str_replace('class="'.$reg[1].'"', '', $moreatt);
 			}
 			if (preg_match('/style="([^"]+)"/', $moreatt, $reg)) {
-				$morestyle = ' '.$reg[1];
+				$morestyle = $reg[1];
 				$moreatt = str_replace('style="'.$reg[1].'"', '', $moreatt);
 			}
 			$moreatt = trim($moreatt);
 
 			$enabledisablehtml = '<span class="'.$fa.' '.$fakey.($marginleftonlyshort ? ($marginleftonlyshort == 1 ? ' marginleftonlyshort' : ' marginleftonly') : '');
 			$enabledisablehtml .= ($morecss ? ' '.$morecss : '').'" style="'.($fasize ? ('font-size: '.$fasize.';') : '').($facolor ? (' color: '.$facolor.';') : '').($morestyle ? ' '.$morestyle : '').'"'.(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt : '').'>';
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			/*if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$enabledisablehtml .= $titlealt;
-			}
+			}*/
 			$enabledisablehtml .= '</span>';
 
 			return $enabledisablehtml;
@@ -3887,9 +4014,9 @@ function info_admin($text, $infoonimgalt = 0, $nodiv = 0, $admin = '1', $morecss
  *  This function must be called when a blocking technical error is encountered.
  *  However, one must try to call it only within php pages, classes must return their error through their property "error".
  *
- *	@param	 	DoliDB	$db      	Database handler
- *	@param  	mixed	$error		String or array of errors strings to show
- *  @param		array	$errors		Array of errors
+ *	@param	 	DoliDB          $db      	Database handler
+ *	@param  	string|string[] $error		String or array of errors strings to show
+ *  @param		array           $errors		Array of errors
  *	@return 	void
  *  @see    	dol_htmloutput_errors()
  */
@@ -4004,16 +4131,17 @@ function dol_print_error($db = '', $error = '', $errors = null)
 	}
 
 	// Return a http error code if possible
-	if (! headers_sent()) {
+	if (!headers_sent()) {
 		http_response_code(500);
 	}
 
 	if (empty($dolibarr_main_prod)) {
 		print $out;
 	} else {
+		if (empty($langs->defaultlang)) $langs->setDefaultLang();
+		$langs->loadLangs(array("main", "errors")); // Reload main because language may have been set only on previous line so we have to reload files we need.
 		// This should not happen, except if there is a bug somewhere. Enabled and check log in such case.
 		print 'This website or feature is currently temporarly not available or failed after a technical error.<br><br>This may be due to a maintenance operation. Current status of operation are on next line...<br><br>'."\n";
-		$langs->load("errors");
 		print $langs->trans("DolibarrHasDetectedError").'. ';
 		print $langs->trans("YouCanSetOptionDolibarrMainProdToZero");
 		define("MAIN_CORE_ERROR", 1);
@@ -4157,7 +4285,11 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 		$out .= '>';
 	}
 
-	if ($tooltip) $out .= $form->textwithpicto($langs->trans($name), $langs->trans($tooltip));
+	if ($tooltip) {
+		// You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
+		$tmptooltip = explode(':', $tooltip);
+		$out .= $form->textwithpicto($langs->trans($name), $langs->trans($tmptooltip[0]), 1, 'help', '', 0, 3, (empty($tmptooltip[1]) ? '' : 'extra_'.str_replace('.', '_', $field).'_'.$tmptooltip[1]));
+	}
 	else $out .= $langs->trans($name);
 
 	if (empty($thead) && $field && empty($disablesortlink))    // If this is a sort field
@@ -4331,6 +4463,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
 
 	// Right
 	print '<td class="nobordernopadding valignmiddle right">';
+	print '<input type="hidden" name="pageplusoneold" value="'.((int) $page + 1).'">';
 	if ($sortfield) $options .= "&sortfield=".urlencode($sortfield);
 	if ($sortorder) $options .= "&sortorder=".urlencode($sortorder);
 	// Show navigation bar
@@ -4641,21 +4774,22 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
  *	Function to use on each input amount before any numeric test or database insert. A better name for this function
  *  should be roundtext2num().
  *
- *	@param	float	$amount			Amount to convert/clean or round
- *	@param	string	$rounding		''=No rounding
- * 									'MU'=Round to Max unit price (MAIN_MAX_DECIMALS_UNIT)
- *									'MT'=Round to Max for totals with Tax (MAIN_MAX_DECIMALS_TOT)
- *									'MS'=Round to Max for stock quantity (MAIN_MAX_DECIMALS_STOCK)
- *                                  'CR'=Currency rate
- *									Numeric = Nb of digits for rounding
- * 	@param	int		$alreadysqlnb	Put 1 if you know that content is already universal format number
- *	@return	string					Amount with universal numeric format (Example: '99.99999').
- *									If conversion fails, it return text unchanged if $rounding = '' or '0' if $rounding is defined.
- *									If amount is null or '', it returns '' if $rounding = '' or '0' if $rounding is defined..
+ *	@param	string|float	$amount			Amount to convert/clean or round
+ *	@param	string			$rounding		''=No rounding
+ * 											'MU'=Round to Max unit price (MAIN_MAX_DECIMALS_UNIT)
+ *											'MT'=Round to Max for totals with Tax (MAIN_MAX_DECIMALS_TOT)
+ *											'MS'=Round to Max for stock quantity (MAIN_MAX_DECIMALS_STOCK)
+ *      		                            'CR'=Currency rate
+ *											Numeric = Nb of digits for rounding
+ * 	@param	int				$option			Put 1 if you know that content is already universal format number (so no correction on decimal will be done)
+ * 											Put 2 if you know that number is a user input (so we know we don't have to fix decimal separator).
+ *	@return	string							Amount with universal numeric format (Example: '99.99999').
+ *											If conversion fails, it return text unchanged if $rounding = '' or '0' if $rounding is defined.
+ *											If amount is null or '', it returns '' if $rounding = '' or '0' if $rounding is defined..
  *
- *	@see    price()					Opposite function of price2num
+ *	@see    price()							Opposite function of price2num
  */
-function price2num($amount, $rounding = '', $alreadysqlnb = 0)
+function price2num($amount, $rounding = '', $option = 0)
 {
 	global $langs, $conf;
 
@@ -4670,12 +4804,19 @@ function price2num($amount, $rounding = '', $alreadysqlnb = 0)
 	//print "amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";
 
 	// Convert value to universal number format (no thousand separator, '.' as decimal separator)
-	if ($alreadysqlnb != 1)	// If not a PHP number or unknown, we change format
-	{
+	if ($option != 1) {	// If not a PHP number or unknown, we change or clean format
 		//print 'PP'.$amount.' - '.$dec.' - '.$thousand.' - '.intval($amount).'<br>';
+		if (!is_numeric($amount)) {
+			$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>]/', '', $amount);
+		}
+
+		if ($option == 2 && $thousand == '.' && preg_match('/\.(\d\d\d)$/', (string) $amount)) {	// It means the . is used as a thousand separator and string come frominput data, so 1.123 is 1123
+			$amount = str_replace($thousand, '', $amount);
+		}
 
 		// Convert amount to format with dolibarr dec and thousand (this is because PHP convert a number
 		// to format defined by LC_NUMERIC after a calculation and we want source format to be like defined by Dolibarr setup.
+		// So if number was already a good number, it is converted into local Dolibarr setup.
 		if (is_numeric($amount))
 		{
 			// We put in temps value of decimal ("0.00001"). Works with 0 and 2.0E-5 and 9999.10
@@ -4684,10 +4825,12 @@ function price2num($amount, $rounding = '', $alreadysqlnb = 0)
 			$nbofdec = max(0, dol_strlen($temps) - 2); // -2 to remove "0."
 			$amount = number_format($amount, $nbofdec, $dec, $thousand);
 		}
-		//print "QQ".$amount.'<br>';
+		//print "QQ".$amount."<br>\n";
 
 		// Now make replace (the main goal of function)
-		if ($thousand != ',' && $thousand != '.') $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users
+		if ($thousand != ',' && $thousand != '.') {
+			$amount = str_replace(',', '.', $amount); // To accept 2 notations for french users
+		}
 		$amount = str_replace(' ', '', $amount); // To avoid spaces
 		$amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .
 		$amount = str_replace($dec, '.', $amount);
@@ -4895,8 +5038,8 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
    	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
    	$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($thirdparty_seller->country_code)."'";
    	$sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
-   	if ($vatratecode) $sql .= " AND t.code ='".$db->escape($vatratecode)."'"; // If we have the code, we use it in priority
-   	else $sql .= " AND t.recuperableonly ='".$db->escape($vatnpr)."'";
+   	if (!empty($vatratecode)) $sql .= " AND t.code ='".$db->escape($vatratecode)."'"; // If we have the code, we use it in priority
+   	else $sql .= " AND t.recuperableonly = '".$db->escape($vatnpr)."'";
    	dol_syslog("get_localtax", LOG_DEBUG);
    	$resql = $db->query($sql);
 
@@ -5013,17 +5156,17 @@ function getTaxesFromId($vatrate, $buyer = null, $seller = null, $firstparamisid
 /**
  *  Get type and rate of localtaxes for a particular vat rate/country of a thirdparty.
  *  This does not take into account the seller setup if subject to vat or not, only country.
- *  TODO
- *  This function is ALSO called to retrieve type for building PDF. Such call of function must be removed.
- *  Instead this function must be called when adding a line to get the array of localtax and type, and then
- *  provide it to the function calcul_price_total.
+ *
+ *  TODO This function is ALSO called to retrieve type for building PDF. Such call of function must be removed.
+ *  Instead this function must be called when adding a line to get the array of possible values for localtax and type, and then
+ *  provide the selected value to the function calcul_price_total.
  *
  *  @param	int|string  $vatrate			VAT ID or Rate+Code. Value can be value or the string with code into parenthesis or rowid if $firstparamisid is 1. Example: '8.5' or '8.5 (8.5NPR)' or 123.
  *  @param	int		    $local              Number of localtax (1 or 2, or 0 to return 1 & 2)
  *  @param	Societe	    $buyer         		Company object
  *  @param	Societe	    $seller        		Company object
  *  @param  int         $firstparamisid     1 if first param is ID into table instead of Rate+code (use this if you can)
- *  @return	array    	    				array(localtax_type1(1-6/0 if not found), rate localtax1, localtax_type2, rate localtax2, accountancycodecust, accountancycodesupp)
+ *  @return	array    	    				array(localtax_type1(1-6 or 0 if not found), rate localtax1, localtax_type2, rate localtax2, accountancycodecust, accountancycodesupp)
  *  @see getTaxesFromId()
  */
 function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisid = 0)
@@ -5035,13 +5178,13 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 	// Search local taxes
 	$sql  = "SELECT t.taux as rate, t.code, t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";
 	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";
-	if ($firstparamisid) $sql .= " WHERE t.rowid = ".(int) $vatrate;
-	else {
+	if ($firstparamisid) {
+		$sql .= " WHERE t.rowid = ".(int) $vatrate;
+	} else {
 		$vatratecleaned = $vatrate;
 		$vatratecode = '';
 		$reg = array();
-		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "x.x (yy)"
-		{
+		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {     // If vat is "x.x (yy)"
 			$vatratecleaned = $reg[1];
 			$vatratecode = $reg[2];
 		}
@@ -5054,20 +5197,19 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 	}
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$obj = $db->fetch_object($resql);
 
-		$vateratestring = $obj->rate.($obj->code ? ' ('.$obj->code.')' : '');
+		if ($obj) {
+			$vateratestring = $obj->rate.($obj->code ? ' ('.$obj->code.')' : '');
 
-		if ($local == 1)
-		{
-			return array($obj->localtax1_type, get_localtax($vateratestring, $local, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
-		} elseif ($local == 2)
-		{
-			return array($obj->localtax2_type, get_localtax($vateratestring, $local, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
-		} else {
-			return array($obj->localtax1_type, get_localtax($vateratestring, 1, $buyer, $seller), $obj->localtax2_type, get_localtax($vateratestring, 2, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
+			if ($local == 1) {
+				return array($obj->localtax1_type, get_localtax($vateratestring, $local, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
+			} elseif ($local == 2) {
+				return array($obj->localtax2_type, get_localtax($vateratestring, $local, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
+			} else {
+				return array($obj->localtax1_type, get_localtax($vateratestring, 1, $buyer, $seller), $obj->localtax2_type, get_localtax($vateratestring, 2, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
+			}
 		}
 	}
 
@@ -5416,29 +5558,30 @@ function yn($yesno, $case = 1, $color = 0)
 
 /**
  *	Return a path to have a the directory according to object where files are stored.
- *  New usage:       $conf->module->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, $modulepart)
- *         or:       $conf->module->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, $modulepart)     if multidir_output not defined.
- *  Example our with new usage:       $object is invoice -> 'INYYMM-ABCD'
- *  Example our with old usage:       '015' with level 3->"0/1/5/", '015' with level 1->"5/", 'ABC-1' with level 3 ->"0/0/1/"
+ *  New usage:       $conf->module->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, '').'/'
+ *         or:       $conf->module->dir_output.'/'.get_exdir(0, 0, 0, 0, $object, '')     if multidir_output not defined.
+ *  Example out with new usage:       $object is invoice -> 'INYYMM-ABCD'
+ *  Example out with old usage:       '015' with level 3->"0/1/5/", '015' with level 1->"5/", 'ABC-1' with level 3 ->"0/0/1/"
  *
- *	@param	string	$num            Id of object (deprecated, $object will be used in future)
- *	@param  int		$level		    Level of subdirs to return (1, 2 or 3 levels). (deprecated, global option will be used in future)
- * 	@param	int		$alpha		    0=Keep number only to forge path, 1=Use alpha part afer the - (By default, use 0). (deprecated, global option will be used in future)
- *  @param  int		$withoutslash   0=With slash at end (except if '/', we return ''), 1=without slash at end
- *  @param	Object	$object			Object
- *  @param	string	$modulepart		Type of object ('invoice_supplier, 'donation', 'invoice', ...')
- *  @return	string					Dir to use ending. Example '' or '1/' or '1/2/'
+ *	@param	string|int	$num            Id of object (deprecated, $object will be used in future)
+ *	@param  int			$level		    Level of subdirs to return (1, 2 or 3 levels). (deprecated, global option will be used in future)
+ * 	@param	int			$alpha		    0=Keep number only to forge path, 1=Use alpha part afer the - (By default, use 0). (deprecated, global option will be used in future)
+ *  @param  int			$withoutslash   0=With slash at end (except if '/', we return ''), 1=without slash at end
+ *  @param	Object		$object			Object to use to get ref to forge the path.
+ *  @param	string		$modulepart		Type of object ('invoice_supplier, 'donation', 'invoice', ...'). Use '' for autodetect from $object.
+ *  @return	string						Dir to use ending. Example '' or '1/' or '1/2/'
  */
-function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart)
+function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart = '')
 {
 	global $conf;
 
+	if (empty($modulepart) && !empty($object->module)) $modulepart = $object->module;
+
 	$path = '';
 
-	$arrayforoldpath = array('cheque', 'user', 'category', 'holiday', 'supplier_invoice', 'invoice_supplier', 'mailing', 'supplier_payment');
+	$arrayforoldpath = array('cheque', 'category', 'holiday', 'supplier_invoice', 'invoice_supplier', 'mailing', 'supplier_payment');
 	if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $arrayforoldpath[] = 'product';
-	if (!empty($level) && in_array($modulepart, $arrayforoldpath))
-	{
+	if (!empty($level) && in_array($modulepart, $arrayforoldpath)) {
 		// This part should be removed once all code is using "get_exdir" to forge path, with all parameters provided.
 		if (empty($alpha)) $num = preg_replace('/([^0-9])/i', '', $num);
 		else $num = preg_replace('/^.*\-/i', '', $num);
@@ -5447,14 +5590,12 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart)
 		if ($level == 2) $path = substr($num, 1, 1).'/'.substr($num, 0, 1);
 		if ($level == 3) $path = substr($num, 2, 1).'/'.substr($num, 1, 1).'/'.substr($num, 0, 1);
 	} else {
-		// TODO
-		// We will enhance here a common way of forging path for document storage
-		// Here, object->id, object->ref and modulepart are required.
+		// We will enhance here a common way of forging path for document storage.
+		// In a future, we may distribut directories on several levels depending on setup and object.
+		// Here, $object->id, $object->ref and $modulepart are required.
 		//var_dump($modulepart);
-		if (in_array($modulepart, array('thirdparty', 'contact', 'member', 'propal', 'proposal', 'commande', 'order', 'facture', 'invoice',
-			'supplier_order', 'supplier_proposal', 'shipment', 'contract', 'expensereport', 'ficheinter')))
-		{
-			$path = ($object->ref ? $object->ref : $object->id);
+		if (!in_array($modulepart, array('product'))) {	// Test to remove
+			$path = dol_sanitizeFileName(empty($object->ref) ? (string) $object->id : $object->ref);
 		}
 	}
 
@@ -5554,17 +5695,20 @@ function picto_required()
  *	@param	integer	$removelinefeed		1=Replace all new lines by 1 space, 0=Only ending new lines are removed others are replaced with \n, 2=Ending new lines are removed but others are kept with a same number of \n than nb of <br> when there is both "...<br>\n..."
  *  @param  string	$pagecodeto      	Encoding of input/output string
  *  @param	integer	$strip_tags			0=Use internal strip, 1=Use strip_tags() php function (bugged when text contains a < char that is not for a html tag)
+ *  @param	integer	$removedoublespaces	Replace double space into one space
  *	@return string	    				String cleaned
  *
  * 	@see	dol_escape_htmltag() strip_tags() dol_string_onlythesehtmltags() dol_string_neverthesehtmltags(), dolStripPhpCode()
  */
-function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto = 'UTF-8', $strip_tags = 0)
+function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto = 'UTF-8', $strip_tags = 0, $removedoublespaces = 1)
 {
 	if ($removelinefeed == 2) $stringtoclean = preg_replace('/<br[^>]*>(\n|\r)+/ims', '<br>', $stringtoclean);
 	$temp = preg_replace('/<br[^>]*>/i', "\n", $stringtoclean);
 
-	// We remove entities BEFORE stripping (in case of a separator char is encoded and not the other, the strip will fails)
-	$temp = dol_html_entity_decode($temp, ENT_COMPAT, $pagecodeto);
+	// We remove entities BEFORE stripping (in case of an open separator char that is entity encoded and not the closing other, the strip will fails)
+	$temp = dol_html_entity_decode($temp, ENT_COMPAT | ENT_HTML5, $pagecodeto);
+
+	$temp = str_replace('< ', '__ltspace__', $temp);
 
 	if ($strip_tags) {
 		$temp = strip_tags($temp);
@@ -5577,29 +5721,36 @@ function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto =
 		// $temp after pass 2: 0000-021
 	}
 
-	// Remove also CR LF
+	$temp = dol_html_entity_decode($temp, ENT_COMPAT, $pagecodeto);
+
+	// Remove also carriage returns
 	if ($removelinefeed == 1) $temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);
 
-	// and double spaces
-	while (strpos($temp, "  "))
-	{
-		$temp = str_replace("  ", " ", $temp);
+	// And double quotes
+	if ($removedoublespaces) {
+		while (strpos($temp, "  ")) {
+			$temp = str_replace("  ", " ", $temp);
+		}
 	}
 
+	$temp = str_replace('__ltspace__', '< ', $temp);
+
 	return trim($temp);
 }
 
 /**
  *	Clean a string to keep only desirable HTML tags.
+ *  WARNING: This also clean HTML comments (used to obfuscate tag name).
  *
  *	@param	string	$stringtoclean			String to clean
- *  @param	boolean	$cleanalsosomestyles	Remove absolute/fixed positioning from inline styles
- *  @param	boolean	$removeclassattribute	Remove the class attribute from tags
+ *  @param	int		$cleanalsosomestyles	Remove absolute/fixed positioning from inline styles
+ *  @param	int		$removeclassattribute	Remove the class attribute from tags
+ *  @param	int		$cleanalsojavascript	Remove also occurence of 'javascript:'.
  *	@return string	    					String cleaned
  *
  * 	@see	dol_escape_htmltag() strip_tags() dol_string_nohtmltag() dol_string_neverthesehtmltags()
  */
-function dol_string_onlythesehtmltags($stringtoclean, $cleanalsosomestyles = 1, $removeclassattribute = 1)
+function dol_string_onlythesehtmltags($stringtoclean, $cleanalsosomestyles = 1, $removeclassattribute = 1, $cleanalsojavascript = 0)
 {
 	$allowed_tags = array(
 		"html", "head", "meta", "body", "article", "a", "abbr", "b", "blockquote", "br", "cite", "div", "dl", "dd", "dt", "em", "font", "img", "ins", "hr", "i", "li", "link",
@@ -5609,22 +5760,34 @@ function dol_string_onlythesehtmltags($stringtoclean, $cleanalsosomestyles = 1,
 	$allowed_tags_string = join("><", $allowed_tags);
 	$allowed_tags_string = '<'.$allowed_tags_string.'>';
 
-	if ($cleanalsosomestyles) {
-		$stringtoclean = preg_replace('/position\s*:\s*(absolute|fixed)\s*!\s*important/i', '', $stringtoclean); // Note: If hacker try to introduce css comment into string to bypass this regex, the string must also be encoded by the dol_htmlentitiesbr during output so it become harmless
-	}
-	if ($removeclassattribute) {
-		$stringtoclean = preg_replace('/(<[^>]+)\s+class=((["\']).*?\\3|\\w*)/i', '\\1', $stringtoclean);
-	}
-	// TODO Remove '/href=("|\'|)javascript/' string ?
+	$stringtoclean = dol_string_nounprintableascii($stringtoclean, 0);
+	$stringtoclean = preg_replace('/&colon;/i', ':', $stringtoclean);
+
+	$stringtoclean = preg_replace('/<!--[^>]*-->/', '', $stringtoclean);
+	$stringtoclean = preg_replace('/&#58;|&#0000058|&#x3A/i', '', $stringtoclean); // refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
+	$stringtoclean = preg_replace('/javascript\s*:/i', '', $stringtoclean);
 
 	$temp = strip_tags($stringtoclean, $allowed_tags_string);
 
+	if ($cleanalsosomestyles) {	// Clean for remaining html tags
+		$temp = preg_replace('/position\s*:\s*(absolute|fixed)\s*!\s*important/i', '', $temp); // Note: If hacker try to introduce css comment into string to bypass this regex, the string must also be encoded by the dol_htmlentitiesbr during output so it become harmless
+	}
+	if ($removeclassattribute) {	// Clean for remaining html tags
+		$temp = preg_replace('/(<[^>]+)\s+class=((["\']).*?\\3|\\w*)/i', '\\1', $temp);
+	}
+
+	// Remove 'javascript:' that we should not find into a text with
+	// Warning: This is not reliable to fight against obfuscated javascript, there is a lot of other solution to include js into a common html tag (only filtered by the GETPOST).
+	if ($cleanalsojavascript) {
+		$temp = preg_replace('/javascript\s*:/i', '', $temp);
+	}
+
 	return $temp;
 }
 
 /**
  *	Clean a string from some undesirable HTML tags.
- *  Note. Not enough secured as dol_string_onlythesehtmltags().
+ *  Note. Not as secured as dol_string_onlythesehtmltags().
  *
  *	@param	string	$stringtoclean			String to clean
  *  @param	array	$disallowed_tags		Array of tags not allowed
@@ -5768,7 +5931,7 @@ function dol_htmlentitiesbr($stringtoencode, $nl2brmode = 0, $pagecodefrom = 'UT
  */
 function dol_htmlentitiesbr_decode($stringtodecode, $pagecodeto = 'UTF-8')
 {
-	$ret = dol_html_entity_decode($stringtodecode, ENT_COMPAT, $pagecodeto);
+	$ret = dol_html_entity_decode($stringtodecode, ENT_COMPAT | ENT_HTML5, $pagecodeto);
 	$ret = preg_replace('/'."\r\n".'<br(\s[\sa-zA-Z_="]*)?\/?>/i', "<br>", $ret);
 	$ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>'."\r\n".'/i', "\r\n", $ret);
 	$ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>'."\n".'/i', "\n", $ret);
@@ -5792,7 +5955,7 @@ function dol_htmlcleanlastbr($stringtodecode)
  * Replace html_entity_decode functions to manage errors
  *
  * @param   string	$a					Operand a
- * @param   string	$b					Operand b (ENT_QUOTES=convert simple and double quotes)
+ * @param   string	$b					Operand b (ENT_QUOTES|ENT_HTML5=convert simple, double quotes, colon, e accent, ...)
  * @param   string	$c					Operand c
  * @param	string	$keepsomeentities	Entities but &, <, >, " are not converted.
  * @return  string						String decoded
@@ -6115,9 +6278,14 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 
 			if (!empty($conf->expedition->enabled) && (!is_object($object) || $object->element == 'shipping'))
 			{
-				$substitutionarray['__SHIPPINGTRACKNUM__'] = 'Shipping tacking number';
+				$substitutionarray['__SHIPPINGTRACKNUM__'] = 'Shipping tracking number';
 				$substitutionarray['__SHIPPINGTRACKNUMURL__'] = 'Shipping tracking url';
 			}
+			if (!empty($conf->reception->enabled) && (!is_object($object) || $object->element == 'reception'))
+			{
+				$substitutionarray['__RECEPTIONTRACKNUM__'] = 'Shippin tracking number of shipment';
+				$substitutionarray['__RECEPTIONTRACKNUMURL__'] = 'Shipping tracking url';
+			}
 		} else {
 			$substitutionarray['__ID__'] = $object->id;
 			$substitutionarray['__REF__'] = $object->ref;
@@ -6134,12 +6302,12 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			$substitutionarray['__REFCLIENT__'] = (isset($object->ref_client) ? $object->ref_client : (isset($object->ref_customer) ? $object->ref_customer : null));
 			$substitutionarray['__REFSUPPLIER__'] = (isset($object->ref_supplier) ? $object->ref_supplier : null);
 			$substitutionarray['__SUPPLIER_ORDER_DATE_DELIVERY__'] = (isset($object->date_livraison) ? dol_print_date($object->date_livraison, 'day', 0, $outputlangs) : '');
-			$substitutionarray['__SUPPLIER_ORDER_DELAY_DELIVERY__'] = $outputlangs->transnoentities("AvailabilityType".$object->availability_code) != ('AvailabilityType'.$object->availability_code) ? $outputlangs->transnoentities("AvailabilityType".$object->availability_code) : $outputlangs->convToOutputCharset(isset($object->availability) ? $object->availability : '');
-
-			$birthday = dol_print_date($object->birth, 'day');
+			$substitutionarray['__SUPPLIER_ORDER_DELAY_DELIVERY__'] = (isset($object->availability_code) ? ($outputlangs->transnoentities("AvailabilityType".$object->availability_code) != ('AvailabilityType'.$object->availability_code) ? $outputlangs->transnoentities("AvailabilityType".$object->availability_code) : $outputlangs->convToOutputCharset(isset($object->availability) ? $object->availability : '')) : '');
 
 			if (is_object($object) && ($object->element == 'adherent' || $object->element == 'member') && $object->id > 0)
 			{
+				$birthday = (empty($object->birth) ? '' : dol_print_date($object->birth, 'day'));
+
 				$substitutionarray['__MEMBER_ID__'] = (isset($object->id) ? $object->id : '');
 				if (method_exists($object, 'getCivilityLabel')) $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();
 				$substitutionarray['__MEMBER_FIRSTNAME__'] = (isset($object->firstname) ? $object->firstname : '');
@@ -6239,6 +6407,11 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__SHIPPINGTRACKNUM__'] = $object->tracking_number;
 				$substitutionarray['__SHIPPINGTRACKNUMURL__'] = $object->tracking_url;
 			}
+			if (is_object($object) && $object->element == 'reception')
+			{
+				$substitutionarray['__RECEPTIONTRACKNUM__'] = $object->tracking_number;
+				$substitutionarray['__RECEPTIONTRACKNUMURL__'] = $object->tracking_url;
+			}
 
 			if (is_object($object) && $object->element == 'contrat' && $object->id > 0 && is_array($object->lines))
 			{
@@ -6333,29 +6506,38 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 	}
 	if (empty($exclude) || !in_array('objectamount', $exclude))
 	{
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functionsnumtoword.lib.php';
+
 		$substitutionarray['__DATE_YMD__']        = is_object($object) ? (isset($object->date) ? dol_print_date($object->date, 'day', 0, $outputlangs) : null) : '';
 		$substitutionarray['__DATE_DUE_YMD__']    = is_object($object) ? (isset($object->date_lim_reglement) ? dol_print_date($object->date_lim_reglement, 'day', 0, $outputlangs) : null) : '';
 
 		$substitutionarray['__AMOUNT__']          = is_object($object) ? $object->total_ttc : '';
+		$substitutionarray['__AMOUNT_TEXT__']     = is_object($object) ? dol_convertToWord($object->total_ttc, $outputlangs, '', true) : '';
+		$substitutionarray['__AMOUNT_TEXTCURRENCY__'] = is_object($object) ? dol_convertToWord($object->total_ttc, $outputlangs, $conf->currency, true) : '';
 		$substitutionarray['__AMOUNT_EXCL_TAX__'] = is_object($object) ? $object->total_ht : '';
-		$substitutionarray['__AMOUNT_VAT__']      = is_object($object) ? ($object->total_vat ? $object->total_vat : $object->total_tva) : '';
+		$substitutionarray['__AMOUNT_VAT__']      = is_object($object) ? (isset($object->total_vat) ? $object->total_vat : $object->total_tva) : '';
+		$substitutionarray['__AMOUNT_VAT_TEXT__']      = is_object($object) ? (isset($object->total_vat) ? dol_convertToWord($object->total_vat, $outputlangs, '', true) : dol_convertToWord($object->total_tva, $outputlangs, '', true)) : '';
+		$substitutionarray['__AMOUNT_VAT_TEXTCURRENCY__']      = is_object($object) ? (isset($object->total_vat) ? dol_convertToWord($object->total_vat, $outputlangs, $conf->currency, true) : dol_convertToWord($object->total_tva, $outputlangs, $conf->currency, true)) : '';
 		if ($onlykey != 2 || $mysoc->useLocalTax(1)) $substitutionarray['__AMOUNT_TAX2__']     = is_object($object) ? $object->total_localtax1 : '';
 		if ($onlykey != 2 || $mysoc->useLocalTax(2)) $substitutionarray['__AMOUNT_TAX3__']     = is_object($object) ? $object->total_localtax2 : '';
 
 		$substitutionarray['__AMOUNT_FORMATED__']          = is_object($object) ? ($object->total_ttc ? price($object->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';
 		$substitutionarray['__AMOUNT_EXCL_TAX_FORMATED__'] = is_object($object) ? ($object->total_ht ? price($object->total_ht, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';
-		$substitutionarray['__AMOUNT_VAT_FORMATED__']      = is_object($object) ? ($object->total_vat ? price($object->total_vat, 0, $outputlangs, 0, 0, -1, $conf->currency) : ($object->total_tva ? price($object->total_tva, 0, $outputlangs, 0, 0, -1, $conf->currency) : null)) : '';
+		$substitutionarray['__AMOUNT_VAT_FORMATED__']      = is_object($object) ? (isset($object->total_vat) ? price($object->total_vat, 0, $outputlangs, 0, 0, -1, $conf->currency) : ($object->total_tva ? price($object->total_tva, 0, $outputlangs, 0, 0, -1, $conf->currency) : null)) : '';
 		if ($onlykey != 2 || $mysoc->useLocalTax(1)) $substitutionarray['__AMOUNT_TAX2_FORMATED__']     = is_object($object) ? ($object->total_localtax1 ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';
 		if ($onlykey != 2 || $mysoc->useLocalTax(2)) $substitutionarray['__AMOUNT_TAX3_FORMATED__']     = is_object($object) ? ($object->total_localtax2 ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';
 
-		// TODO Add keys for foreign multicurrency
+		$substitutionarray['__AMOUNT_MULTICURRENCY__']          = (is_object($object) && isset($object->multicurrency_total_ttc)) ? $object->multicurrency_total_ttc : '';
+		$substitutionarray['__AMOUNT_MULTICURRENCY_TEXT__']     = (is_object($object) && isset($object->multicurrency_total_ttc)) ? dol_convertToWord($object->multicurrency_total_ttc, $outputlangs, '', true) : '';
+		$substitutionarray['__AMOUNT_MULTICURRENCY_TEXTCURRENCY__'] = (is_object($object) && isset($object->multicurrency_total_ttc)) ? dol_convertToWord($object->multicurrency_total_ttc, $outputlangs, $object->multicurrency_code, true) : '';
+		// TODO Add other keys for foreign multicurrency
 
 		// For backward compatibility
 		if ($onlykey != 2)
 		{
 			$substitutionarray['__TOTAL_TTC__']    = is_object($object) ? $object->total_ttc : '';
 			$substitutionarray['__TOTAL_HT__']     = is_object($object) ? $object->total_ht : '';
-			$substitutionarray['__TOTAL_VAT__']    = is_object($object) ? ($object->total_vat ? $object->total_vat : $object->total_tva) : '';
+			$substitutionarray['__TOTAL_VAT__']    = is_object($object) ? (isset($object->total_vat) ? $object->total_vat : $object->total_tva) : '';
 		}
 	}
 
@@ -6370,11 +6552,13 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 		$tmp4 = dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']);
 		$tmp5 = dol_get_next_month($tmp['mon'], $tmp['year']);
 
+		$daytext = $outputlangs->trans('Day'.$tmp['wday']);
+
 		$substitutionarray = array_merge($substitutionarray, array(
 			'__DAY__' => (string) $tmp['mday'],
-			'__DAY_TEXT__' => $outputlangs->trans('Day'.$tmp['wday']), // Monday
-			'__DAY_TEXT_SHORT__' => $outputlangs->trans($tmp['weekday'].'Min'), // Mon
-			'__DAY_TEXT_MIN__' => $outputlangs->trans('Short'.$tmp['weekday']), // M
+			'__DAY_TEXT__' => $daytext, // Monday
+			'__DAY_TEXT_SHORT__' => dol_trunc($daytext, 3, 'right', 'UTF-8', 1), // Mon
+			'__DAY_TEXT_MIN__' => dol_trunc($daytext, 1, 'right', 'UTF-8', 1), // M
 			'__MONTH__' => (string) $tmp['mon'],
 			'__MONTH_TEXT__' => $outputlangs->trans('Month'.sprintf("%02d", $tmp['mon'])),
 			'__MONTH_TEXT_SHORT__' => $outputlangs->trans('MonthShort'.sprintf("%02d", $tmp['mon'])),
@@ -6452,7 +6636,7 @@ function make_substitutions($text, $substitutionarray, $outputlangs = null)
 		if (dol_textishtml($text, 1)) $msgishtml = 1;
 
 		$keyfound = $reg[1];
-		if (preg_match('/(_pass|_pw|password|secret|_key|key$)/i', $keyfound)) $newval = '*****forbidden*****';
+		if (isASecretKey($keyfound)) $newval = '*****forbidden*****';
 		else $newval = empty($conf->global->$keyfound) ? '' : $conf->global->$keyfound;
 		$text = preg_replace('/__\['.preg_quote($keyfound, '/').'\]__/', $msgishtml ?dol_htmlentitiesbr($newval) : $newval, $text);
 	}
@@ -6527,6 +6711,14 @@ function complete_substitutions_array(&$substitutionarray, $outputlangs, $object
 			}
 		}
 	}
+	if (!empty($conf->global->ODT_ENABLE_ALL_TAGS_IN_SUBSTITUTIONS)) {
+		// to list all tags in odt template
+		$tags = '';
+		foreach ($substitutionarray as $key => $value) {
+			$tags .= '{'.$key.'} => '.$value."\n";
+		}
+		$substitutionarray = array_merge($substitutionarray, array('__ALL_TAGS__' => $tags));
+	}
 }
 
 /**
@@ -6582,7 +6774,7 @@ function get_date_range($date_start, $date_end, $format = '', $outputlangs = '',
  *
  * @param	string	$firstname		Firstname
  * @param	string	$lastname		Lastname
- * @param	int		$nameorder		-1=Auto, 0=Lastname+Firstname, 1=Firstname+Lastname, 2=Firstname, 3=Firstname if defined else lastname
+ * @param	int		$nameorder		-1=Auto, 0=Lastname+Firstname, 1=Firstname+Lastname, 2=Firstname, 3=Firstname if defined else lastname, 4=Lastname, 5=Lastname if defined else firstname
  * @return	string					Firstname + lastname or Lastname + firstname
  */
 function dolGetFirstLastname($firstname, $lastname, $nameorder = -1)
@@ -6592,22 +6784,24 @@ function dolGetFirstLastname($firstname, $lastname, $nameorder = -1)
 	$ret = '';
 	// If order not defined, we use the setup
 	if ($nameorder < 0) $nameorder = (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0);
-	if ($nameorder && $nameorder != 2 && $nameorder != 3)
-	{
+	if ($nameorder == 1) {
 		$ret .= $firstname;
 		if ($firstname && $lastname) $ret .= ' ';
 		$ret .= $lastname;
-	} elseif ($nameorder == 2 || $nameorder == 3)
-	{
+	} elseif ($nameorder == 2 || $nameorder == 3) {
 		$ret .= $firstname;
-		if (empty($ret) && $nameorder == 3)
-		{
+		if (empty($ret) && $nameorder == 3) {
 			$ret .= $lastname;
 		}
-	} else {
+	} else {	// 0, 4 or 5
 		$ret .= $lastname;
-		if ($firstname && $lastname) $ret .= ' ';
-		$ret .= $firstname;
+		if (empty($ret) && $nameorder == 5) {
+			$ret .= $firstname;
+		}
+		if ($nameorder == 0) {
+			if ($firstname && $lastname) $ret .= ' ';
+			$ret .= $firstname;
+		}
 	}
 	return $ret;
 }
@@ -6618,19 +6812,19 @@ function dolGetFirstLastname($firstname, $lastname, $nameorder = -1)
  *  Note: Calling dol_htmloutput_events is done into pages by standard llxFooter() function.
  *  Note: Prefer to use setEventMessages instead.
  *
- *	@param	mixed	$mesgs			Message string or array
- *  @param  string	$style      	Which style to use ('mesgs' by default, 'warnings', 'errors')
+ *	@param	string|string[] $mesgs			Message string or array
+ *  @param  string          $style      	Which style to use ('mesgs' by default, 'warnings', 'errors')
  *  @return	void
  *  @see	dol_htmloutput_events()
  */
 function setEventMessage($mesgs, $style = 'mesgs')
 {
 	//dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);		This is not deprecated, it is used by setEventMessages function
-	if (!is_array($mesgs))		// If mesgs is a string
-	{
+	if (!is_array($mesgs)) {
+		// If mesgs is a string
 		if ($mesgs) $_SESSION['dol_events'][$style][] = $mesgs;
-	} else // If mesgs is an array
-	{
+	} else {
+		// If mesgs is an array
 		foreach ($mesgs as $mesg)
 		{
 			if ($mesg) $_SESSION['dol_events'][$style][] = $mesg;
@@ -6897,8 +7091,7 @@ function dol_sort_array(&$array, $index, $order = 'asc', $natsort = 0, $case_sen
 			$temp = array();
 			foreach (array_keys($array) as $key)
 			{
-				if (is_object($array[$key]))
-				{
+				if (is_object($array[$key])) {
 					$temp[$key] = $array[$key]->$index;
 				} else {
 					$temp[$key] = $array[$key][$index];
@@ -6934,10 +7127,11 @@ function dol_sort_array(&$array, $index, $order = 'asc', $natsort = 0, $case_sen
  */
 function utf8_check($str)
 {
+	$str = (string) $str;	// Sometimes string is an int.
+
 	// We must use here a binary strlen function (so not dol_strlen)
 	$strLength = dol_strlen($str);
-	for ($i = 0; $i < $strLength; $i++)
-	{
+	for ($i = 0; $i < $strLength; $i++) {
 		if (ord($str[$i]) < 0x80) continue; // 0bbbbbbb
 		elseif ((ord($str[$i]) & 0xE0) == 0xC0) $n = 1; // 110bbbbb
 		elseif ((ord($str[$i]) & 0xF0) == 0xE0) $n = 2; // 1110bbbb
@@ -7084,8 +7278,7 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1)
 	global $soc; // For backward compatibility
 
 	//print $s."<br>\n";
-	if ($returnvalue)
-	{
+	if ($returnvalue) {
 		if ($hideerrors) return @eval('return '.$s.';');
 		else return eval('return '.$s.';');
 	} else {
@@ -7108,14 +7301,12 @@ function dol_validElement($element)
 /**
  * 	Return img flag of country for a language code or country code
  *
- * 	@param	string	$codelang	Language code (en_IN, fr_CA...) or Country code (IN, FR)
- *  @param	string	$moreatt	Add more attribute on img tag (For example 'style="float: right"')
+ * 	@param	string	$codelang	Language code ('en_IN', 'fr_CA', ...) or ISO Country code on 2 characters in uppercase ('IN', 'FR')
+ *  @param	string	$moreatt	Add more attribute on img tag (For example 'style="float: right"' or 'class="saturatemedium"')
  * 	@return	string				HTML img string with flag.
  */
 function picto_from_langcode($codelang, $moreatt = '')
 {
-	global $langs;
-
 	if (empty($codelang)) return '';
 
 	if ($codelang == 'auto')
@@ -7128,7 +7319,14 @@ function picto_from_langcode($codelang, $moreatt = '')
 		'ca_ES' => 'catalonia',
 		'da_DA' => 'dk',
 		'fr_CA' => 'mq',
-		'sv_SV' => 'se'
+		'sv_SV' => 'se',
+		'AQ' => 'unknown',
+		'CW' => 'unknown',
+		'IM' => 'unknown',
+		'JE' => 'unknown',
+		'MF' => 'unknown',
+		'BL' => 'unknown',
+		'SX' => 'unknown'
 	);
 
 	if (isset($langtocountryflag[$codelang])) $flagImage = $langtocountryflag[$codelang];
@@ -7488,7 +7686,7 @@ function printCommonFooter($zone = 'private')
 
 	// A div to store page_y POST parameter so we can read it using javascript
 	print "\n<!-- A div to store page_y POST parameter -->\n";
-	print '<div id="page_y" style="display: none;">'.$_POST['page_y'].'</div>'."\n";
+	print '<div id="page_y" style="display: none;">'.(empty($_POST['page_y']) ? '' : $_POST['page_y']).'</div>'."\n";
 
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printCommonFooter', $parameters); // Note that $action and $object may have been modified by some hooks
@@ -7789,7 +7987,7 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 					$numnewcrit = price2num($newcrit);
 					if (is_numeric($numnewcrit))
 					{
-						$newres .= ($i2 > 0 ? ' OR ' : '').$field.' '.$operator.' '.$db->sanitize($numnewcrit);	// should be a numeric
+						$newres .= ($i2 > 0 ? ' OR ' : '').$field.' '.$operator.' '.$db->sanitize($numnewcrit); // should be a numeric
 					} else {
 						$newres .= ($i2 > 0 ? ' OR ' : '').'1 = 2'; // force false
 					}
@@ -7797,7 +7995,7 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 				}
 			} elseif ($mode == 2 || $mode == -2)
 			{
-				$crit = preg_replace('/[^0-9,]/', '', $crit);	// ID are always integer
+				$crit = preg_replace('/[^0-9,]/', '', $crit); // ID are always integer
 				$newres .= ($i2 > 0 ? ' OR ' : '').$field." ".($mode == -2 ? 'NOT ' : '');
 				$newres .= $crit ? "IN (".$db->sanitize($db->escape($crit)).")" : "IN (0)";
 				if ($mode == -2) $newres .= ' OR '.$field.' IS NULL';
@@ -7817,7 +8015,7 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 							$listofcodes .= "'".$db->escape($val)."'";
 						}
 					}
-					$newres .= ($i2 > 0 ? ' OR ' : '').$field." ".($mode == -3 ? 'NOT ' : '')."IN (".$db->sanitize($listofcodes).")";
+					$newres .= ($i2 > 0 ? ' OR ' : '').$field." ".($mode == -3 ? 'NOT ' : '')."IN (".$db->sanitize($listofcodes, 1).")";
 					$i2++; // a criteria was added to string
 				}
 				if ($mode == -3) $newres .= ' OR '.$field.' IS NULL';
@@ -8325,7 +8523,7 @@ function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = '
 
 
 /**
- * Function dolGetStatus
+ * Output the badge of a status.
  *
  * @param   string  $statusLabel       Label of badge no html : use in alt attribute for accessibility
  * @param   string  $statusLabelShort  Short label of badge no html
@@ -8333,7 +8531,7 @@ function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = '
  * @param   string  $statusType        status0 status1 status2 status3 status4 status5 status6 status7 status8 status9 : image name or badge name
  * @param   int	    $displayMode       0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
  * @param   string  $url               The url for link
- * @param   array   $params            Various params for future : recommended rather than adding more function arguments
+ * @param   array   $params            Various params. Example: array('tooltip'=>'...', 'badgeParams'=>...)
  * @return  string                     Html status string
  */
 function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $statusType = 'status0', $displayMode = 0, $url = '', $params = array())
@@ -8402,7 +8600,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
 		$statusLabelShort = (empty($statusLabelShort) ? $statusLabel : $statusLabelShort);
 
 		$dolGetBadgeParams['attr']['class'] = 'badge-status';
-		$dolGetBadgeParams['attr']['title'] = $statusLabel;
+		$dolGetBadgeParams['attr']['title'] = empty($params['tooltip']) ? $statusLabel : $params['tooltip'];
 
 		if ($displayMode == 3) {
 			$return = dolGetBadge((empty($conf->dol_optimize_smallscreen) ? $statusLabel : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort)), '', $statusType, 'dot', $url, $dolGetBadgeParams);
@@ -8650,9 +8848,9 @@ function getElementProperties($element_type)
 		$module = 'expedition_bon';
 	}
 	if ($element_type == 'delivery') {
-		$classpath = 'livraison/class';
-		$subelement = 'livraison';
-		$module = 'livraison_bon';
+		$classpath = 'delivery/class';
+		$subelement = 'delivery';
+		$module = 'delivery_note';
 	}
 	if ($element_type == 'contract') {
 		$classpath = 'contrat/class';
@@ -8919,3 +9117,46 @@ function addSummaryTableLine($tableColumnCount, $num, $nbofloop = 0, $total = 0,
 
 	print '</tr>';
 }
+
+/**
+ *  Return a file on output using a low memory. It can return very large files with no need of memory.
+ *  WARNING: This close output buffers.
+ *
+ *  @param	string	$fullpath_original_file_osencoded		Full path of file to return.
+ *  @param	int		$method									-1 automatic, 0=readfile, 1=fread, 2=stream_copy_to_stream
+ *  @return void
+ */
+function readfileLowMemory($fullpath_original_file_osencoded, $method = -1)
+{
+	global $conf;
+
+	if ($method == -1) {
+		$method = 0;
+		if (!empty($conf->global->MAIN_FORCE_READFILE_WITH_FREAD)) $method = 1;
+		if (!empty($conf->global->MAIN_FORCE_READFILE_WITH_STREAM_COPY)) $method = 2;
+	}
+
+	// Be sure we don't have output buffering enabled to have readfile working correctly
+	while (ob_get_level()) ob_end_flush();
+
+	// Solution 0
+	if ($method == 0) {
+		readfile($fullpath_original_file_osencoded);
+	}
+	// Solution 1
+	elseif ($method == 1) {
+		$handle = fopen($fullpath_original_file_osencoded, "rb");
+		while (!feof($handle)) {
+			print fread($handle, 8192);
+		}
+		fclose($handle);
+	}
+	// Solution 2
+	elseif ($method == 2) {
+		$handle1 = fopen($fullpath_original_file_osencoded, "rb");
+		$handle2 = fopen("php://output", "wb");
+		stream_copy_to_stream($handle1, $handle2);
+		fclose($handle1);
+		fclose($handle2);
+	}
+}
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 7cc14060aac..7d00fee0773 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -66,7 +66,7 @@ function jsUnEscape($source)
 			$pos++;
 		}
 	}
-	return dol_html_entity_decode($decodedStr, ENT_COMPAT);
+	return dol_html_entity_decode($decodedStr, ENT_COMPAT | ENT_HTML5);
 }
 
 
@@ -227,12 +227,12 @@ function dol_print_object_info($object, $usetable = 0)
 		else print ': ';
 		if (is_object($object->user_creation))
 		{
-			if ($object->user_creation->id) print $object->user_creation->getNomUrl(1, '', 0, 0, 0);
+			if ($object->user_creation->id) print $object->user_creation->getNomUrl(-1, '', 0, 0, 0);
 			else print $langs->trans("Unknown");
 		} else {
 			$userstatic = new User($db);
 			$userstatic->fetch($object->user_creation_id ? $object->user_creation_id : $object->user_creation);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			if ($userstatic->id) print $userstatic->getNomUrl(-1, '', 0, 0, 0);
 			else print $langs->trans("Unknown");
 		}
 		if ($usetable) print '</td></tr>';
@@ -261,12 +261,12 @@ function dol_print_object_info($object, $usetable = 0)
 		else print ': ';
 		if (is_object($object->user_modification))
 		{
-			if ($object->user_modification->id) print $object->user_modification->getNomUrl(1, '', 0, 0, 0);
+			if ($object->user_modification->id) print $object->user_modification->getNomUrl(-1, '', 0, 0, 0);
 			else print $langs->trans("Unknown");
 		} else {
 			$userstatic = new User($db);
 			$userstatic->fetch($object->user_modification_id ? $object->user_modification_id : $object->user_modification);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			if ($userstatic->id) print $userstatic->getNomUrl(-1, '', 0, 0, 0);
 			else print $langs->trans("Unknown");
 		}
 		if ($usetable) print '</td></tr>';
@@ -295,12 +295,12 @@ function dol_print_object_info($object, $usetable = 0)
 		else print ': ';
 		if (is_object($object->user_validation))
 		{
-			if ($object->user_validation->id) print $object->user_validation->getNomUrl(1, '', 0, 0, 0);
+			if ($object->user_validation->id) print $object->user_validation->getNomUrl(-1, '', 0, 0, 0);
 			else print $langs->trans("Unknown");
 		} else {
 			$userstatic = new User($db);
 			$userstatic->fetch($object->user_validation_id ? $object->user_validation_id : $object->user_validation);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			if ($userstatic->id) print $userstatic->getNomUrl(-1, '', 0, 0, 0);
 			else print $langs->trans("Unknown");
 		}
 		if ($usetable) print '</td></tr>';
@@ -329,12 +329,12 @@ function dol_print_object_info($object, $usetable = 0)
 		else print ': ';
 		if (is_object($object->user_approve))
 		{
-			if ($object->user_approve->id) print $object->user_approve->getNomUrl(1, '', 0, 0, 0);
+			if ($object->user_approve->id) print $object->user_approve->getNomUrl(-1, '', 0, 0, 0);
 			else print $langs->trans("Unknown");
 		} else {
 			$userstatic = new User($db);
 			$userstatic->fetch($object->user_approve_id ? $object->user_approve_id : $object->user_approve);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			if ($userstatic->id) print $userstatic->getNomUrl(-1, '', 0, 0, 0);
 			else print $langs->trans("Unknown");
 		}
 		if ($usetable) print '</td></tr>';
@@ -363,7 +363,7 @@ function dol_print_object_info($object, $usetable = 0)
 		else print ': ';
 		$userstatic = new User($db);
 		$userstatic->fetch($object->user_approve_id2);
-		if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
+		if ($userstatic->id) print $userstatic->getNomUrl(-1, '', 0, 0, 0);
 		else print $langs->trans("Unknown");
 		if ($usetable) print '</td></tr>';
 		else print '<br>';
@@ -392,12 +392,12 @@ function dol_print_object_info($object, $usetable = 0)
 		else print ': ';
 		if (is_object($object->user_closing))
 		{
-			if ($object->user_closing->id) print $object->user_closing->getNomUrl(1, '', 0, 0, 0);
+			if ($object->user_closing->id) print $object->user_closing->getNomUrl(-1, '', 0, 0, 0);
 			else print $langs->trans("Unknown");
 		} else {
 			$userstatic = new User($db);
 			$userstatic->fetch($object->user_closing);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			if ($userstatic->id) print $userstatic->getNomUrl(-1, '', 0, 0, 0);
 			else print $langs->trans("Unknown");
 		}
 		if ($usetable) print '</td></tr>';
@@ -427,7 +427,7 @@ function dol_print_object_info($object, $usetable = 0)
 		else print ': ';
 		if (is_object($object->user_rappro))
 		{
-			if ($object->user_rappro->id) print $object->user_rappro->getNomUrl(1, '', 0, 0, 0);
+			if ($object->user_rappro->id) print $object->user_rappro->getNomUrl(-1, '', 0, 0, 0);
 			else print $langs->trans("Unknown");
 		} else {
 			$userstatic = new User($db);
@@ -484,15 +484,15 @@ function dolAddEmailTrackId($email, $trackingid)
 }
 
 /**
- *	Return true if email has a domain name that can't be resolved
+ *	Return true if email has a domain name that can be resolved to MX type.
  *
  *	@param	string	$mail       Email address (Ex: "toto@example.com", "John Do <johndo@example.com>")
- *	@return boolean     		True if domain email is OK, False if KO
+ *	@return int     			-1 if error (function not available), 0=Not valid, 1=Valid
  */
 function isValidMailDomain($mail)
 {
 	list($user, $domain) = explode("@", $mail, 2);
-	return checkdnsrr($domain, "MX");
+	return ($domain ? isValidMXRecord($domain) : 0);
 }
 
 /**
@@ -944,9 +944,8 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 	//print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";
 
 	// Define $sqlstring
-	if (function_exists('mb_strrpos'))
-		{
-		$posnumstart = mb_strrpos($maskwithnocode, $maskcounter, 'UTF-8');
+	if (function_exists('mb_strrpos')) {
+		$posnumstart = mb_strrpos($maskwithnocode, $maskcounter, 0, 'UTF-8');
 	} else {
 		$posnumstart = strrpos($maskwithnocode, $maskcounter);
 	}	// Pos of counter in final string (from 0 to ...)
@@ -1567,7 +1566,7 @@ function version_webserver()
  * 	@param	DoliDB		$db				    Database handler
  * 	@param	string		$type			    Type of models (company, invoice, ...)
  *  @param  int		    $maxfilenamelength  Max length of value to show
- * 	@return	mixed			    			0 if no module is activated, or array(key=>label). For modules that need directory scan, key is completed with ":filename".
+ * 	@return	array|int			    		0 if no module is activated, or array(key=>label). For modules that need directory scan, key is completed with ":filename".
  */
 function getListOfModels($db, $type, $maxfilenamelength = 0)
 {
@@ -1640,8 +1639,8 @@ function getListOfModels($db, $type, $maxfilenamelength = 0)
 					{
 						$liste[$obj->id.':'.$key] = ($obj->label ? $obj->label : $obj->doc_template_name).' '.$val['name'];
 					}
-				} else // Common usage
-				{
+				} else {
+					// Common usage
 					$liste[$obj->id] = $obj->label ? $obj->label : $obj->doc_template_name;
 				}
 			}
@@ -1688,10 +1687,23 @@ function is_ip($ip)
  */
 function dol_buildlogin($lastname, $firstname)
 {
-	$login = strtolower(dol_string_unaccent($firstname));
-	$login .= ($login ? '.' : '');
-	$login .= strtolower(dol_string_unaccent($lastname));
-	$login = dol_string_nospecial($login, ''); // For special names
+	global $conf;
+
+	//$conf->global->MAIN_BUILD_LOGIN_RULE = 'f.lastname';
+	if (!empty($conf->global->MAIN_BUILD_LOGIN_RULE) && $conf->global->MAIN_BUILD_LOGIN_RULE == 'f.lastname') {	// f.lastname
+		$login = strtolower(dol_string_unaccent(dol_trunc($firstname, 1, 'right', 'UTF-8', 1)));
+		$login .= ($login ? '.' : '');
+		$login .= strtolower(dol_string_unaccent($lastname));
+		$login = dol_string_nospecial($login, ''); // For special names
+	} else {	// firstname.lastname
+		$login = strtolower(dol_string_unaccent($firstname));
+		$login .= ($login ? '.' : '');
+		$login .= strtolower(dol_string_unaccent($lastname));
+		$login = dol_string_nospecial($login, ''); // For special names
+	}
+
+	// TODO Add a hook to allow external modules to suggest new rules
+
 	return $login;
 }
 
@@ -1791,9 +1803,9 @@ function dolGetElementUrl($objectid, $objecttype, $withpicto = 0, $option = '')
 		$myobject = 'expedition';
 		$module = 'expedition_bon';
 	} elseif ($objecttype == 'delivery') {
-		$classpath = 'livraison/class';
-		$myobject = 'livraison';
-		$module = 'livraison_bon';
+		$classpath = 'delivery/class';
+		$myobject = 'delivery';
+		$module = 'delivery_note';
 	} elseif ($objecttype == 'contract') {
 		$classpath = 'contrat/class';
 		$module = 'contrat';
@@ -1842,7 +1854,14 @@ function dolGetElementUrl($objectid, $objecttype, $withpicto = 0, $option = '')
 		$classname = 'CommandeFournisseur';
 		$classpath = 'fourn/class';
 		$module = 'fournisseur';
-	} elseif ($objecttype == 'stock') {
+	}
+	elseif ($objecttype == 'supplier_proposal') {
+		$classfile = 'supplier_proposal';
+		$classname = 'SupplierProposal';
+		$classpath = 'supplier_proposal/class';
+		$module = 'supplier_proposal';
+	}
+	elseif ($objecttype == 'stock') {
 		$classpath = 'product/stock/class';
 		$classfile = 'entrepot';
 		$classname = 'Entrepot';
@@ -2384,3 +2403,77 @@ function price2fec($amount)
 
 	return $output;
 }
+
+/**
+ * Check the syntax of some PHP code.
+ *
+ * @param 	string 			$code 	PHP code to check.
+ * @return 	boolean|array 			If false, then check was successful, otherwise an array(message,line) of errors is returned.
+ */
+function phpSyntaxError($code)
+{
+	if (!defined("CR")) define("CR", "\r");
+	if (!defined("LF")) define("LF", "\n");
+	if (!defined("CRLF")) define("CRLF", "\r\n");
+
+	$braces = 0;
+	$inString = 0;
+	foreach (token_get_all('<?php '.$code) as $token) {
+		if (is_array($token)) {
+			switch ($token[0]) {
+				case T_CURLY_OPEN:
+				case T_DOLLAR_OPEN_CURLY_BRACES:
+				case T_START_HEREDOC: ++$inString; break;
+				case T_END_HEREDOC:   --$inString; break;
+			}
+		} elseif ($inString & 1) {
+			switch ($token) {
+				case '`':
+				case '\'':
+				case '"': --$inString; break;
+			}
+		} else {
+			switch ($token) {
+				case '`':
+				case '\'':
+				case '"': ++$inString; break;
+				case '{': ++$braces; break;
+				case '}':
+					if ($inString) {
+						--$inString;
+					} else {
+						--$braces;
+						if ($braces < 0) break 2;
+					}
+					break;
+			}
+		}
+	}
+	$inString = @ini_set('log_errors', false);
+	$token = @ini_set('display_errors', true);
+	ob_start();
+	$code = substr($code, strlen('<?php '));
+	$braces || $code = "if(0){{$code}\n}";
+	if (eval($code) === false) {
+		if ($braces) {
+			$braces = PHP_INT_MAX;
+		} else {
+			false !== strpos($code, CR) && $code = strtr(str_replace(CRLF, LF, $code), CR, LF);
+			$braces = substr_count($code, LF);
+		}
+		$code = ob_get_clean();
+		$code = strip_tags($code);
+		if (preg_match("'syntax error, (.+) in .+ on line (\d+)$'s", $code, $code)) {
+			$code[2] = (int) $code[2];
+			$code = $code[2] <= $braces
+			? array($code[1], $code[2])
+			: array('unexpected $end'.substr($code[1], 14), $braces);
+		} else $code = array('syntax error', 0);
+	} else {
+		ob_end_clean();
+		$code = false;
+	}
+	@ini_set('display_errors', $token);
+	@ini_set('log_errors', $inString);
+	return $code;
+}
diff --git a/htdocs/core/lib/functionsnumtoword.lib.php b/htdocs/core/lib/functionsnumtoword.lib.php
index ae9401b7954..930c6d06a9e 100644
--- a/htdocs/core/lib/functionsnumtoword.lib.php
+++ b/htdocs/core/lib/functionsnumtoword.lib.php
@@ -29,11 +29,11 @@
  *
  * @param	float       $num			Number to convert (must be a numeric value, like reported by price2num())
  * @param	Translate   $langs			Language
- * @param	boolean     $currency		0=number to translate | 1=currency to translate
- * @param	boolean     $centimes		0=no cents/centimes | 1=there is cents/centimes to translate
+ * @param	string      $currency		''=number to translate | 'XX'=currency code to use into text
+ * @param	boolean     $centimes		false=no cents/centimes | true=there is cents/centimes
  * @return 	string|false			    Text of the number
  */
-function dol_convertToWord($num, $langs, $currency = false, $centimes = false)
+function dol_convertToWord($num, $langs, $currency = '', $centimes = false)
 {
 	global $conf;
 
@@ -48,9 +48,9 @@ function dol_convertToWord($num, $langs, $currency = false, $centimes = false)
 
 	if (!empty($conf->global->MAIN_MODULE_NUMBERWORDS)) {
 		if ($currency) {
-			$type = 1;
+			$type = '1';
 		} else {
-			$type = 0;
+			$type = '0';
 		}
 
 		$concatWords = $langs->getLabelFromNumber($num, $type);
@@ -139,8 +139,7 @@ function dol_convertToWord($num, $langs, $currency = false, $centimes = false)
 		}
 
 		// If we need to write cents call again this function for cents
-		$decimalpart = $TNum[1];
-		$decimalpart = preg_replace('/0+$/', '', $decimalpart);
+		$decimalpart = empty($TNum[1]) ? '' : preg_replace('/0+$/', '', $TNum[1]);
 
 		if ($decimalpart) {
 			if (!empty($currency)) $concatWords .= ' '.$langs->transnoentities('and');
diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index e6e20692317..8cfc08222cd 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2008-2013	Laurent Destailleur			<eldy@users.sourceforge.net>
+/* Copyright (C) 2008-2020	Laurent Destailleur			<eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,45 +18,50 @@
 
 /**
  *	\file			htdocs/core/lib/geturl.lib.php
- *	\brief			This file contains functions dedicated to get URL.
+ *	\brief			This file contains functions dedicated to get URLs.
  */
 
 /**
- * Function to get a content from an URL (use proxy if proxy defined)
+ * Function to get a content from an URL (use proxy if proxy defined).
+ * Support Dolibarr setup for timeout and proxy.
+ * Enhancement of CURL to add an anti SSRF protection.
  *
  * @param	string	  $url 				    URL to call.
  * @param	string    $postorget		    'POST', 'GET', 'HEAD', 'PUT', 'PUTALREADYFORMATED', 'POSTALREADYFORMATED', 'DELETE'
- * @param	string    $param			    Parameters of URL (x=value1&y=value2) or may be a formated content with PUTALREADYFORMATED
- * @param	integer   $followlocation		1=Follow location, 0=Do not follow
+ * @param	string    $param			    Parameters of URL (x=value1&y=value2) or may be a formated content with $postorget='PUTALREADYFORMATED'
+ * @param	integer   $followlocation		0=Do not follow, 1=Follow location.
  * @param	string[]  $addheaders			Array of string to add into header. Example: ('Accept: application/xrds+xml', ....)
+ * @param	string[]  $allowedschemes		List of schemes that are allowed ('http' + 'https' only by default)
+ * @param	int		  $localurl				0=Only external URL are possible, 1=Only local URL, 2=Both external and local URL are allowed.
  * @return	array						    Returns an associative array containing the response from the server array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
  */
-function getURLContent($url, $postorget = 'GET', $param = '', $followlocation = 1, $addheaders = array())
+function getURLContent($url, $postorget = 'GET', $param = '', $followlocation = 1, $addheaders = array(), $allowedschemes = array('http', 'https'), $localurl = 0)
 {
-    //declaring of global variables
-    global $conf;
-    $USE_PROXY = empty($conf->global->MAIN_PROXY_USE) ? 0 : $conf->global->MAIN_PROXY_USE;
-    $PROXY_HOST = empty($conf->global->MAIN_PROXY_HOST) ? 0 : $conf->global->MAIN_PROXY_HOST;
-    $PROXY_PORT = empty($conf->global->MAIN_PROXY_PORT) ? 0 : $conf->global->MAIN_PROXY_PORT;
-    $PROXY_USER = empty($conf->global->MAIN_PROXY_USER) ? 0 : $conf->global->MAIN_PROXY_USER;
-    $PROXY_PASS = empty($conf->global->MAIN_PROXY_PASS) ? 0 : $conf->global->MAIN_PROXY_PASS;
+	//declaring of global variables
+	global $conf;
+	$USE_PROXY = empty($conf->global->MAIN_PROXY_USE) ? 0 : $conf->global->MAIN_PROXY_USE;
+	$PROXY_HOST = empty($conf->global->MAIN_PROXY_HOST) ? 0 : $conf->global->MAIN_PROXY_HOST;
+	$PROXY_PORT = empty($conf->global->MAIN_PROXY_PORT) ? 0 : $conf->global->MAIN_PROXY_PORT;
+	$PROXY_USER = empty($conf->global->MAIN_PROXY_USER) ? 0 : $conf->global->MAIN_PROXY_USER;
+	$PROXY_PASS = empty($conf->global->MAIN_PROXY_PASS) ? 0 : $conf->global->MAIN_PROXY_PASS;
 
 	dol_syslog("getURLContent postorget=".$postorget." URL=".$url." param=".$param);
 
-    //setting the curl parameters.
-    $ch = curl_init();
+	//setting the curl parameters.
+	$ch = curl_init();
 
-    /*print $API_Endpoint."-".$API_version."-".$PAYPAL_API_USER."-".$PAYPAL_API_PASSWORD."-".$PAYPAL_API_SIGNATURE."<br>";
+	/*print $API_Endpoint."-".$API_version."-".$PAYPAL_API_USER."-".$PAYPAL_API_PASSWORD."-".$PAYPAL_API_SIGNATURE."<br>";
      print $USE_PROXY."-".$gv_ApiErrorURL."<br>";
      print $nvpStr;
      exit;*/
-    curl_setopt($ch, CURLOPT_URL, $url);
-    curl_setopt($ch, CURLOPT_VERBOSE, 1);
+	curl_setopt($ch, CURLOPT_VERBOSE, 1);
 	curl_setopt($ch, CURLOPT_USERAGENT, 'Dolibarr geturl function');
 
-	@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, ($followlocation ?true:false)); // We use @ here because this may return warning if safe mode is on or open_basedir is on
+	// We use @ here because this may return warning if safe mode is on or open_basedir is on (following location is forbidden when safe mode is on).
+	// We force value to false so we will manage redirection ourself later.
+	@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, false);
 
-	if (count($addheaders)) curl_setopt($ch, CURLOPT_HTTPHEADER, $addheaders);
+	if (is_array($addheaders) && count($addheaders)) curl_setopt($ch, CURLOPT_HTTPHEADER, $addheaders);
 	curl_setopt($ch, CURLINFO_HEADER_OUT, true); // To be able to retrieve request header and log it
 
 	// By default use tls decied by PHP.
@@ -64,96 +69,160 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 	if (!empty($conf->global->MAIN_CURL_SSLVERSION)) curl_setopt($ch, CURLOPT_SSLVERSION, $conf->global->MAIN_CURL_SSLVERSION);
 	//curl_setopt($ch, CURLOPT_SSLVERSION, 6); for tls 1.2
 
-    //turning off the server and peer verification(TrustManager Concept).
-    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+	// Turning off the server and peer verification(TrustManager Concept).
+	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
 
-    curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT);
-    curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
+	// Restrict use to some protocols only
+	$protocols = 0;
+	if (is_array($allowedschemes)) {
+		foreach ($allowedschemes as $allowedscheme) {
+			if ($allowedscheme == 'http') $protocols |= CURLPROTO_HTTP;
+			if ($allowedscheme == 'https') $protocols |= CURLPROTO_HTTPS;
+		}
+		curl_setopt($ch, CURLOPT_PROTOCOLS, $protocols);
+		curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, $protocols);
+	}
 
-    //curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true);	// PHP 5.5
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); // We want response
-    if ($postorget == 'POST')
-    {
-    	curl_setopt($ch, CURLOPT_POST, 1); // POST
-    	curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // Setting param x=a&y=z as POST fields
-    } elseif ($postorget == 'POSTALREADYFORMATED')
-    {
-        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST'); // HTTP request is 'POST' but param string is taken as it is
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // param = content of post, like a xml string
-    } elseif ($postorget == 'PUT')
-    {
-        $array_param = null;
-    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
-    	if (!is_array($param)) parse_str($param, $array_param);
-    	else {
-    	    dol_syslog("parameter param must be a string", LOG_WARNING);
-    	    $array_param = $param;
-    	}
-    	curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param)); // Setting param x=a&y=z as PUT fields
-    } elseif ($postorget == 'PUTALREADYFORMATED')
-    {
-    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
-    	curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // param = content of post, like a xml string
-    } elseif ($postorget == 'HEAD')
-    {
-    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'HEAD'); // HTTP request is 'HEAD'
-    	curl_setopt($ch, CURLOPT_NOBODY, true);
-    } elseif ($postorget == 'DELETE')
-    {
-    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE'); // POST
-    } else {
-    	curl_setopt($ch, CURLOPT_POST, 0); // GET
-    }
+	curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT);
+	curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
 
-    //if USE_PROXY constant set at begin of this method.
-    if ($USE_PROXY)
-    {
-        dol_syslog("getURLContent set proxy to ".$PROXY_HOST.":".$PROXY_PORT." - ".$PROXY_USER.":".$PROXY_PASS);
-        //curl_setopt ($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP); // Curl 7.10
-        curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST.":".$PROXY_PORT);
-        if ($PROXY_USER) curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER.":".$PROXY_PASS);
-    }
+	//curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true);	// PHP 5.5
+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); // We want response
+	if ($postorget == 'POST') {
+		curl_setopt($ch, CURLOPT_POST, 1); // POST
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // Setting param x=a&y=z as POST fields
+	} elseif ($postorget == 'POSTALREADYFORMATED') {
+		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST'); // HTTP request is 'POST' but param string is taken as it is
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // param = content of post, like a xml string
+	} elseif ($postorget == 'PUT') {
+		$array_param = null;
+		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
+		if (!is_array($param)) parse_str($param, $array_param);
+		else {
+			dol_syslog("parameter param must be a string", LOG_WARNING);
+			$array_param = $param;
+		}
+		curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param)); // Setting param x=a&y=z as PUT fields
+	} elseif ($postorget == 'PUTALREADYFORMATED') {
+		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // param = content of post, like a xml string
+	} elseif ($postorget == 'HEAD') {
+		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'HEAD'); // HTTP request is 'HEAD'
+		curl_setopt($ch, CURLOPT_NOBODY, true);
+	} elseif ($postorget == 'DELETE') {
+		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE'); // POST
+	} else {
+		curl_setopt($ch, CURLOPT_POST, 0); // GET
+	}
 
-    //getting response from server
-    $response = curl_exec($ch);
+	//if USE_PROXY constant set at begin of this method.
+	if ($USE_PROXY) {
+		dol_syslog("getURLContent set proxy to ".$PROXY_HOST.":".$PROXY_PORT." - ".$PROXY_USER.":".$PROXY_PASS);
+		//curl_setopt ($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP); // Curl 7.10
+		curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST.":".$PROXY_PORT);
+		if ($PROXY_USER) curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER.":".$PROXY_PASS);
+	}
 
-    $request = curl_getinfo($ch, CURLINFO_HEADER_OUT); // Reading of request must be done after sending request
+	$newUrl = $url;
+	$maxRedirection = 5;
+	$info = array();
+	$response = '';
 
-    dol_syslog("getURLContent request=".$request);
-    //dol_syslog("getURLContent response =".response);	// This may contains binary data, so we dont output it
-    dol_syslog("getURLContent response size=".strlen($response)); // This may contains binary data, so we dont output it
+	do {
+		if ($maxRedirection < 1) break;
 
-    $rep = array();
-    if (curl_errno($ch))
-    {
-        // Ad keys to $rep
-        $rep['content'] = $response;
+		curl_setopt($ch, CURLOPT_URL, $newUrl);
 
-        // moving to display page to display curl errors
+		// Parse $newUrl
+		$newUrlArray = parse_url($newUrl);
+		$hosttocheck = $newUrlArray['host'];
+		$hosttocheck = str_replace(array('[', ']'), '', $hosttocheck); // Remove brackets of IPv6
+
+		if (in_array($hosttocheck, array('localhost', 'localhost.domain'))) {
+			$iptocheck = '127.0.0.1';
+		} else {
+			// TODO Resolve $iptocheck to get an IP and set CURLOPT_CONNECT_TO to use this ip
+			$iptocheck = $hosttocheck;
+		}
+
+		if (!filter_var($iptocheck, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6)) {	// This is not an IP
+			$iptocheck = 0; //
+		}
+
+		if ($iptocheck) {
+			if ($localurl == 0) {	// Only external url allowed (dangerous, may allow to get malware)
+				if (!filter_var($iptocheck, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
+					$info['http_code'] = 400;
+					$info['content'] = 'Error bad hostname IP (private or reserved range). Must be an external URL.';
+					break;
+				}
+				if (in_array($iptocheck, array('100.100.100.200'))) {
+					$info['http_code'] = 400;
+					$info['content'] = 'Error bad hostname IP (Used by Alibaba metadata). Must be an external URL.';
+					break;
+				}
+			}
+			if ($localurl == 1) {	// Only local url allowed (dangerous, may allow to get metadata on server or make internal port scanning)
+				if (filter_var($iptocheck, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
+					$info['http_code'] = 400;
+					$info['content'] = 'Error bad hostname. Must be a local URL.';
+					break;
+				}
+			}
+		}
+
+		// Getting response from server
+		$response = curl_exec($ch);
+
+		$info = curl_getinfo($ch); // Reading of request must be done after sending request
+		$http_code = $info['http_code'];
+		if ($followlocation && ($http_code == 301 || $http_code == 302 || $http_code == 303 || $http_code == 307)) {
+			$newUrl = $info['redirect_url'];
+			$maxRedirection--;
+			// TODO Use $info['local_ip'] and $info['primary_ip'] ?
+			continue;
+		} else {
+			$http_code = 0;
+		}
+	}
+	while ($http_code);
+
+	$request = curl_getinfo($ch, CURLINFO_HEADER_OUT); // Reading of request must be done after sending request
+
+	dol_syslog("getURLContent request=".$request);
+	//dol_syslog("getURLContent response =".response);	// This may contains binary data, so we dont output it
+	dol_syslog("getURLContent response size=".strlen($response)); // This may contains binary data, so we dont output it
+
+	$rep = array();
+	if (curl_errno($ch)) {
+		// Ad keys to $rep
+		$rep['content'] = $response;
+
+		// moving to display page to display curl errors
 		$rep['curl_error_no'] = curl_errno($ch);
-        $rep['curl_error_msg'] = curl_error($ch);
+		$rep['curl_error_msg'] = curl_error($ch);
 
 		dol_syslog("getURLContent response array is ".join(',', $rep));
-    } else {
-    	$info = curl_getinfo($ch);
+	} else {
+		//$info = curl_getinfo($ch);
 
-    	// Ad keys to $rep
-    	$rep = $info;
-    	//$rep['header_size']=$info['header_size'];
-    	//$rep['http_code']=$info['http_code'];
-    	dol_syslog("getURLContent http_code=".$rep['http_code']);
+		// Ad keys to $rep
+		$rep = $info;
+		//$rep['header_size']=$info['header_size'];
+		//$rep['http_code']=$info['http_code'];
+		dol_syslog("getURLContent http_code=".$rep['http_code']);
 
-        // Add more keys to $rep
-        $rep['content'] = $response;
-    	$rep['curl_error_no'] = '';
-    	$rep['curl_error_msg'] = '';
+		// Add more keys to $rep
+		$rep['content'] = $response;
+		$rep['curl_error_no'] = '';
+		$rep['curl_error_msg'] = '';
+	}
 
-    	//closing the curl
-        curl_close($ch);
-    }
+	//closing the curl
+	curl_close($ch);
 
-    return $rep;
+	return $rep;
 }
 
 
@@ -169,14 +238,12 @@ function getDomainFromURL($url, $mode = 0)
 {
 	$tmpdomain = preg_replace('/^https?:\/\//i', '', $url); // Remove http(s)://
 	$tmpdomain = preg_replace('/\/.*$/i', '', $tmpdomain); // Remove part after domain
-	if ($mode == 2)
-	{
+	if ($mode == 2) {
 		$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)\.([^\.]+)$/', '\1.\2.\3', $tmpdomain); // Remove part 'www.' before 'abc.mydomain.com'
 	} else {
 		$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)$/', '\1.\2', $tmpdomain); // Remove part 'www.abc.' before 'mydomain.com'
 	}
-	if (empty($mode))
-	{
+	if (empty($mode)) {
 		$tmpdomain = preg_replace('/\.[^\.]+$/', '', $tmpdomain); // Remove first level domain (.com, .net, ...)
 	}
 
diff --git a/htdocs/core/lib/holiday.lib.php b/htdocs/core/lib/holiday.lib.php
index 3c98f14a385..f5297f6fd89 100644
--- a/htdocs/core/lib/holiday.lib.php
+++ b/htdocs/core/lib/holiday.lib.php
@@ -34,28 +34,28 @@ function holiday_prepare_head($object)
 	$h = 0;
 	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/holiday/card.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("Leave");
-    $head[$h][2] = 'card';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/holiday/card.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Leave");
+	$head[$h][2] = 'card';
+	$h++;
 
-    // Attachments
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    $upload_dir = $conf->holiday->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
-    $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
-    $head[$h][0] = DOL_URL_ROOT.'/holiday/document.php?id='.$object->id;
-    $head[$h][1] = $langs->trans('Documents');
-    if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
-    $head[$h][2] = 'documents';
-    $h++;
+	// Attachments
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->holiday->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+	$nbLinks = Link::count($db, $object->element, $object->id);
+	$head[$h][0] = DOL_URL_ROOT.'/holiday/document.php?id='.$object->id;
+	$head[$h][1] = $langs->trans('Documents');
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	$head[$h][2] = 'documents';
+	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'holiday');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'holiday');
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'holiday', 'remove');
 
@@ -66,7 +66,7 @@ function holiday_prepare_head($object)
 /**
  *  Return array head with list of tabs to view object informations
  *
-  *  @return array           		head
+ *  @return array           		head
  */
 function holiday_admin_prepare_head()
 {
@@ -75,21 +75,21 @@ function holiday_admin_prepare_head()
 	$h = 0;
 	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/admin/holiday.php';
-    $head[$h][1] = $langs->trans("Setup");
-    $head[$h][2] = 'holiday';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/admin/holiday.php';
+	$head[$h][1] = $langs->trans("Setup");
+	$head[$h][2] = 'holiday';
+	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'holiday_admin');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'holiday_admin');
 
-    $head[$h][0] = DOL_URL_ROOT.'/admin/holiday_extrafields.php';
-    $head[$h][1] = $langs->trans("ExtraFields");
-    $head[$h][2] = 'attributes';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/admin/holiday_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFields");
+	$head[$h][2] = 'attributes';
+	$h++;
 
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'holiday_admin', 'remove');
 
diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index 00f628bb0c4..bd392760cc5 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -23,7 +23,7 @@
  */
 
 // Define size of logo small and mini
-$maxwidthsmall = 350; $maxheightsmall = 200; // Near 16/9eme
+$maxwidthsmall = 480; $maxheightsmall = 270; // Near 16/9eme
 $maxwidthmini = 128; $maxheightmini = 72; // 16/9eme
 $quality = 80;
 
diff --git a/htdocs/core/lib/intracommreport.lib.php b/htdocs/core/lib/intracommreport.lib.php
new file mode 100644
index 00000000000..9bf4996525b
--- /dev/null
+++ b/htdocs/core/lib/intracommreport.lib.php
@@ -0,0 +1,83 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) 2015 ATM Consulting <support@atm-consulting.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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * 	\file		htdocs/core/lib/intracommreport.lib.php
+ * 	\ingroup	Intracomm report
+ * 	\brief		Library of intracomm report functions
+ */
+
+/**
+ *	Prepare array with list of admin tabs
+ *
+ *	@return	array					Array of tabs to show
+ */
+function intracommReportAdminPrepareHead()
+{
+	global $langs, $conf;
+
+	$langs->load("intracommreport");
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = DOL_URL_ROOT.'/intracommreport/admin/intracommreport.php';
+	$head[$h][1] = $langs->trans("Parameters");
+	$head[$h][2] = 'general';
+	$h++;
+
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
+	// $this->tabs = array('entity:-tabname); to remove a tab
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'intracommreport_admin');
+
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'intracommreport_admin', 'remove');
+	return $head;
+}
+
+/**
+ *	Prepare array with list of tabs
+ *
+ *  @param   Object	$object		Object related to tabs
+ *
+ *	@return	array					Array of tabs to show
+ */
+function intracommReportPrepareHead($object)
+{
+	global $langs, $conf;
+
+	$langs->load("intracommreport");
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = DOL_URL_ROOT.'/intracommreport/card.php?rowid='.$object->id;
+	$head[$h][1] = $langs->trans("Card");
+	$head[$h][2] = 'card';
+	$h++;
+
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
+	// $this->tabs = array('entity:-tabname); to remove a tab
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'intracommreport');
+
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'intracommreport', 'remove');
+	return $head;
+}
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index f840c037821..453bc34be8a 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -47,8 +47,8 @@ function facture_prepare_head($object)
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
-	    $head[$h][0] = DOL_URL_ROOT.'/compta/facture/contact.php?facid='.$object->id;
+		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
+		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/contact.php?facid='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
 		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
 		$head[$h][2] = 'contact';
@@ -57,17 +57,17 @@ function facture_prepare_head($object)
 
 	if (!empty($conf->prelevement->enabled))
 	{
-	    $nbStandingOrders = 0;
-	    $sql = "SELECT COUNT(pfd.rowid) as nb";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
-	    $sql .= " WHERE pfd.fk_facture = ".$object->id;
-	    $sql .= " AND pfd.ext_payment_id IS NULL";
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $obj = $db->fetch_object($resql);
-            if ($obj) $nbStandingOrders = $obj->nb;
-        } else dol_print_error($db);
+		$nbStandingOrders = 0;
+		$sql = "SELECT COUNT(pfd.rowid) as nb";
+		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+		$sql .= " WHERE pfd.fk_facture = ".$object->id;
+		$sql .= " AND pfd.ext_payment_id IS NULL";
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$obj = $db->fetch_object($resql);
+			if ($obj) $nbStandingOrders = $obj->nb;
+		} else dol_print_error($db);
 		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$object->id;
 		$head[$h][1] = $langs->trans('StandingOrders');
 		if ($nbStandingOrders > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbStandingOrders.'</span>';
@@ -75,29 +75,29 @@ function facture_prepare_head($object)
 		$h++;
 	}
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'invoice');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'invoice');
 
-    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-    {
-    	$nbNote = 0;
-        if (!empty($object->note_private)) $nbNote++;
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+	{
+		$nbNote = 0;
+		if (!empty($object->note_private)) $nbNote++;
 		if (!empty($object->note_public)) $nbNote++;
-    	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/note.php?facid='.$object->id;
-    	$head[$h][1] = $langs->trans('Notes');
+		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/note.php?facid='.$object->id;
+		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
-    	$head[$h][2] = 'note';
-    	$h++;
-    }
+		$head[$h][2] = 'note';
+		$h++;
+	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->facture->dir_output."/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/document.php?facid='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
@@ -193,11 +193,11 @@ function invoice_rec_prepare_head($object)
 	$head[$h][2] = 'card';
 	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'invoice-rec');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'invoice-rec');
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'invoice-rec', 'remove');
 
diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php
index e4dfa3a0830..cd48bbcb3c7 100644
--- a/htdocs/core/lib/json.lib.php
+++ b/htdocs/core/lib/json.lib.php
@@ -54,7 +54,7 @@ function dol_json_encode($elements)
 	{
 		foreach ($elements as $key => $value) $num++;
 	} else {
-	    $num = count($elements);
+		$num = count($elements);
 	}
 	//var_dump($num);
 
@@ -103,96 +103,95 @@ function dol_json_encode($elements)
  */
 function _val($val)
 {
-	if (is_string($val))
-	{
-        // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
-        $ascii = '';
-        $strlen_var = strlen($val);
+	if (is_string($val)) {
+		// STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
+		$ascii = '';
+		$strlen_var = strlen($val);
 
-        /*
+		/*
 	     * Iterate over every character in the string,
 	     * escaping with a slash or encoding to UTF-8 where necessary
 	     */
-	    for ($c = 0; $c < $strlen_var; ++$c) {
-	        $ord_var_c = ord($val[$c]);
+		for ($c = 0; $c < $strlen_var; ++$c) {
+			$ord_var_c = ord($val[$c]);
 
-	        switch (true) {
-	            case $ord_var_c == 0x08:
-	                $ascii .= '\b';
-	                break;
-	            case $ord_var_c == 0x09:
-	                $ascii .= '\t';
-	                break;
-	            case $ord_var_c == 0x0A:
-	                $ascii .= '\n';
-	                break;
-	            case $ord_var_c == 0x0C:
-	                $ascii .= '\f';
-	                break;
-	            case $ord_var_c == 0x0D:
-	                $ascii .= '\r';
-	                break;
+			switch (true) {
+				case $ord_var_c == 0x08:
+					$ascii .= '\b';
+					break;
+				case $ord_var_c == 0x09:
+					$ascii .= '\t';
+					break;
+				case $ord_var_c == 0x0A:
+					$ascii .= '\n';
+					break;
+				case $ord_var_c == 0x0C:
+					$ascii .= '\f';
+					break;
+				case $ord_var_c == 0x0D:
+					$ascii .= '\r';
+					break;
 
-	            case $ord_var_c == 0x22:
-	            case $ord_var_c == 0x2F:
-	            case $ord_var_c == 0x5C:
-	                // double quote, slash, slosh
-	                $ascii .= '\\'.$val[$c];
-	                break;
+				case $ord_var_c == 0x22:
+				case $ord_var_c == 0x2F:
+				case $ord_var_c == 0x5C:
+					// double quote, slash, slosh
+					$ascii .= '\\'.$val[$c];
+					break;
 
-	            case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
-	                // characters U-00000000 - U-0000007F (same as ASCII)
-	                $ascii .= $val[$c];
-	                break;
+				case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
+					// characters U-00000000 - U-0000007F (same as ASCII)
+					$ascii .= $val[$c];
+					break;
 
-	            case (($ord_var_c & 0xE0) == 0xC0):
-	                // characters U-00000080 - U-000007FF, mask 110XXXXX
-	                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-	                $char = pack('C*', $ord_var_c, ord($val[$c + 1]));
-	                $c += 1;
-	                $utf16 = utf82utf16($char);
-	                $ascii .= sprintf('\u%04s', bin2hex($utf16));
-	                break;
+				case (($ord_var_c & 0xE0) == 0xC0):
+					// characters U-00000080 - U-000007FF, mask 110XXXXX
+					// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+					$char = pack('C*', $ord_var_c, ord($val[$c + 1]));
+					$c += 1;
+					$utf16 = utf82utf16($char);
+					$ascii .= sprintf('\u%04s', bin2hex($utf16));
+					break;
 
-	            case (($ord_var_c & 0xF0) == 0xE0):
-	                // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-	                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-	                $char = pack('C*', $ord_var_c, ord($val[$c + 1]), ord($val[$c + 2]));
-	                $c += 2;
-	                $utf16 = utf82utf16($char);
-	                $ascii .= sprintf('\u%04s', bin2hex($utf16));
-	                break;
+				case (($ord_var_c & 0xF0) == 0xE0):
+					// characters U-00000800 - U-0000FFFF, mask 1110XXXX
+					// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+					$char = pack('C*', $ord_var_c, ord($val[$c + 1]), ord($val[$c + 2]));
+					$c += 2;
+					$utf16 = utf82utf16($char);
+					$ascii .= sprintf('\u%04s', bin2hex($utf16));
+					break;
 
-	            case (($ord_var_c & 0xF8) == 0xF0):
-	                // characters U-00010000 - U-001FFFFF, mask 11110XXX
-	                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-	                $char = pack('C*', $ord_var_c, ord($val[$c + 1]), ord($val[$c + 2]), ord($val[$c + 3]));
-	                $c += 3;
-	                $utf16 = utf82utf16($char);
-	                $ascii .= sprintf('\u%04s', bin2hex($utf16));
-	                break;
+				case (($ord_var_c & 0xF8) == 0xF0):
+					// characters U-00010000 - U-001FFFFF, mask 11110XXX
+					// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+					$char = pack('C*', $ord_var_c, ord($val[$c + 1]), ord($val[$c + 2]), ord($val[$c + 3]));
+					$c += 3;
+					$utf16 = utf82utf16($char);
+					$ascii .= sprintf('\u%04s', bin2hex($utf16));
+					break;
 
-	            case (($ord_var_c & 0xFC) == 0xF8):
-	                // characters U-00200000 - U-03FFFFFF, mask 111110XX
-	                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-	                $char = pack('C*', $ord_var_c, ord($val[$c + 1]), ord($val[$c + 2]), ord($val[$c + 3]), ord($val[$c + 4]));
-	                $c += 4;
-	                $utf16 = utf82utf16($char);
-	                $ascii .= sprintf('\u%04s', bin2hex($utf16));
-	                break;
+				case (($ord_var_c & 0xFC) == 0xF8):
+					// characters U-00200000 - U-03FFFFFF, mask 111110XX
+					// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+					$char = pack('C*', $ord_var_c, ord($val[$c + 1]), ord($val[$c + 2]), ord($val[$c + 3]), ord($val[$c + 4]));
+					$c += 4;
+					$utf16 = utf82utf16($char);
+					$ascii .= sprintf('\u%04s', bin2hex($utf16));
+					break;
 
-	            case (($ord_var_c & 0xFE) == 0xFC):
-	                // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-	                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-	                $char = pack('C*', $ord_var_c, ord($val[$c + 1]), ord($val[$c + 2]), ord($val[$c + 3]), ord($val[$c + 4]), ord($val[$c + 5]));
-	                $c += 5;
-	                $utf16 = utf82utf16($char);
-	                $ascii .= sprintf('\u%04s', bin2hex($utf16));
-	                break;
-	        }
-	    }
+				case (($ord_var_c & 0xFE) == 0xFC):
+					// characters U-04000000 - U-7FFFFFFF, mask 1111110X
+					// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+					$char = pack('C*', $ord_var_c, ord($val[$c + 1]), ord($val[$c + 2]), ord($val[$c + 3]), ord($val[$c + 4]), ord($val[$c + 5]));
+					$c += 5;
+					$utf16 = utf82utf16($char);
+					$ascii .= sprintf('\u%04s', bin2hex($utf16));
+					break;
+			}
+		}
 
-	    return '"'.$ascii.'"';
+		return '"'.$ascii.'"';
 	} elseif (is_int($val)) return sprintf('%d', $val);
 	elseif (is_float($val)) return sprintf('%F', $val);
 	elseif (is_bool($val)) return ($val ? 'true' : 'false');
@@ -229,7 +228,7 @@ function dol_json_decode($json, $assoc = false)
 
 	$comment = false;
 
-    $out = '';
+	$out = '';
 	$strLength = strlen($json); // Must stay strlen and not dol_strlen because we want technical length, not visible length
 	for ($i = 0; $i < $strLength; $i++)
 	{
@@ -290,10 +289,10 @@ function _unval($val)
 	$reg = array();
 	while (preg_match('/\\\u([0-9A-F]{2})([0-9A-F]{2})/i', $val, $reg))
 	{
-	    // single, escaped unicode character
-	    $utf16 = chr(hexdec($reg[1])).chr(hexdec($reg[2]));
-	    $utf8  = utf162utf8($utf16);
-	    $val = preg_replace('/\\\u'.$reg[1].$reg[2].'/i', $utf8, $val);
+		// single, escaped unicode character
+		$utf16 = chr(hexdec($reg[1])).chr(hexdec($reg[2]));
+		$utf8  = utf162utf8($utf16);
+		$val = preg_replace('/\\\u'.$reg[1].$reg[2].'/i', $utf8, $val);
 	}
 	return $val;
 }
@@ -312,29 +311,29 @@ function utf162utf8($utf16)
 {
 	// oh please oh please oh please oh please oh please
 	if (function_exists('mb_convert_encoding')) {
-	    return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
+		return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
 	}
 
 	$bytes = (ord($utf16[0]) << 8) | ord($utf16[1]);
 
 	switch (true) {
-    	case ((0x7F & $bytes) == $bytes):
+		case ((0x7F & $bytes) == $bytes):
 			// this case should never be reached, because we are in ASCII range
 			// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-    	return chr($bytes);
+		return chr($bytes);
 
-    	case (0x07FF & $bytes) == $bytes:
+		case (0x07FF & $bytes) == $bytes:
 			// return a 2-byte UTF-8 character
 			// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-    	return chr(0xC0 | (($bytes >> 6) & 0x1F))
-    	. chr(0x80 | ($bytes & 0x3F));
+		return chr(0xC0 | (($bytes >> 6) & 0x1F))
+		. chr(0x80 | ($bytes & 0x3F));
 
-    	case (0xFFFF & $bytes) == $bytes:
+		case (0xFFFF & $bytes) == $bytes:
 			// return a 3-byte UTF-8 character
 			// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-    	return chr(0xE0 | (($bytes >> 12) & 0x0F))
-    	. chr(0x80 | (($bytes >> 6) & 0x3F))
-    	. chr(0x80 | ($bytes & 0x3F));
+		return chr(0xE0 | (($bytes >> 12) & 0x0F))
+		. chr(0x80 | (($bytes >> 6) & 0x3F))
+		. chr(0x80 | ($bytes & 0x3F));
 	}
 
 	// ignoring UTF-32 for now, sorry
@@ -355,12 +354,12 @@ function utf82utf16($utf8)
 {
 	// oh please oh please oh please oh please oh please
 	if (function_exists('mb_convert_encoding')) {
-	    return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
+		return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
 	}
 
 	switch (strlen($utf8)) {
 		case 1:
-	        // this case should never be reached, because we are in ASCII range
+			// this case should never be reached, because we are in ASCII range
 			// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
 			return $utf8;
 
diff --git a/htdocs/core/lib/loan.lib.php b/htdocs/core/lib/loan.lib.php
index f6b61db794c..3a34d3e57c4 100644
--- a/htdocs/core/lib/loan.lib.php
+++ b/htdocs/core/lib/loan.lib.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2014-2016	Alexandre Spangaro	<aspangaro@open-dsi.fr>
- * Copyright (C) 2015		Frederic France		<frederic.france@free.fr>
+ * Copyright (C) 2015-2020	Frederic France     <frederic.france@netlogic.fr>
  * Copyright (C) 2020       Maxime DEMAREST     <maxime@indelog.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -32,10 +32,10 @@
  */
 function loan_prepare_head($object)
 {
-    global $db, $langs, $conf;
+	global $db, $langs, $conf;
 
-    $tab = 0;
-    $head = array();
+	$tab = 0;
+	$head = array();
 
 	$head[$tab][0] = DOL_URL_ROOT.'/loan/card.php?id='.$object->id;
 	$head[$tab][1] = $langs->trans('Card');
@@ -47,25 +47,24 @@ function loan_prepare_head($object)
 	$head[$tab][2] = 'FinancialCommitment';
 	$tab++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $tab, 'loan');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $tab, 'loan');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->loan->dir_output."/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$tab][0] = DOL_URL_ROOT.'/loan/document.php?id='.$object->id;
 	$head[$tab][1] = $langs->trans("Documents");
 	if (($nbFiles + $nbLinks) > 0) $head[$tab][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
 	$head[$tab][2] = 'documents';
 	$tab++;
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
 		$nbNote = (empty($object->note_private) ? 0 : 1) + (empty($object->note_public) ? 0 : 1);
 		$head[$tab][0] = DOL_URL_ROOT."/loan/note.php?id=".$object->id;
 		$head[$tab][1] = $langs->trans("Notes");
@@ -74,14 +73,14 @@ function loan_prepare_head($object)
 		$tab++;
 	}
 
-    $head[$tab][0] = DOL_URL_ROOT.'/loan/info.php?id='.$object->id;
-    $head[$tab][1] = $langs->trans("Info");
-    $head[$tab][2] = 'info';
-    $tab++;
+	$head[$tab][0] = DOL_URL_ROOT.'/loan/info.php?id='.$object->id;
+	$head[$tab][1] = $langs->trans("Info");
+	$head[$tab][2] = 'info';
+	$tab++;
 
-    complete_head_from_modules($conf, $langs, $object, $head, $tab, 'loan', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $tab, 'loan', 'remove');
 
-    return $head;
+	return $head;
 }
 
 /**
@@ -96,37 +95,42 @@ function loan_prepare_head($object)
  */
 function loanCalcMonthlyPayment($mens, $capital, $rate, $echance, $nbterm)
 {
-    global $conf;
-    require_once DOL_DOCUMENT_ROOT.'/loan/class/loanschedule.class.php';
-    $object = new LoanSchedule($db);
+	global $conf, $db;
+	require_once DOL_DOCUMENT_ROOT.'/loan/class/loanschedule.class.php';
+	$object = new LoanSchedule($db);
+	$output = array();
 
-    // If mensuality is 0 we don't pay interests and remaining capital not modified
-    if ($mens == 0)
-    {
-        $int = 0;
-        $cap_rest = $capital;
-    }
-    else {
-        $int = ($capital * ($rate / 12));
-        $int = round($int, 2, PHP_ROUND_HALF_UP);
-        $cap_rest = round($capital - ($mens - $int), 2, PHP_ROUND_HALF_UP);
-    }
-    $output[$echance] = array('cap_rest'=>$cap_rest, 'cap_rest_str'=>price($cap_rest, 0, '', 1, -1, -1, $conf->currency), 'interet'=>$int, 'interet_str'=>price($int, 0, '', 1, -1, -1, $conf->currency), 'mens'=>$mens);
+	// If mensuality is 0 we don't pay interests and remaining capital not modified
+	if ($mens == 0) {
+		$int = 0;
+		$cap_rest = $capital;
+	} else {
+		$int = ($capital * ($rate / 12));
+		$int = round($int, 2, PHP_ROUND_HALF_UP);
+		$cap_rest = round($capital - ($mens - $int), 2, PHP_ROUND_HALF_UP);
+	}
+	$output[$echance] = array('cap_rest'=>$cap_rest, 'cap_rest_str'=>price($cap_rest, 0, '', 1, -1, -1, $conf->currency), 'interet'=>$int, 'interet_str'=>price($int, 0, '', 1, -1, -1, $conf->currency), 'mens'=>$mens);
 
-    $echance++;
-    $capital = $cap_rest;
-    while ($echance <= $nbterm) {
-        $mens = round($object->calcMonthlyPayments($capital, $rate, $nbterm - $echance + 1), 2, PHP_ROUND_HALF_UP);
+	$echance++;
+	$capital = $cap_rest;
+	while ($echance <= $nbterm) {
+		$mens = round($object->calcMonthlyPayments($capital, $rate, $nbterm - $echance + 1), 2, PHP_ROUND_HALF_UP);
 
-        $int = ($capital * ($rate / 12));
-        $int = round($int, 2, PHP_ROUND_HALF_UP);
-        $cap_rest = round($capital - ($mens - $int), 2, PHP_ROUND_HALF_UP);
+		$int = ($capital * ($rate / 12));
+		$int = round($int, 2, PHP_ROUND_HALF_UP);
+		$cap_rest = round($capital - ($mens - $int), 2, PHP_ROUND_HALF_UP);
 
-        $output[$echance] = array('cap_rest'=>$cap_rest, 'cap_rest_str'=>price($cap_rest, 0, '', 1, -1, -1, $conf->currency), 'interet'=>$int, 'interet_str'=>price($int, 0, '', 1, -1, -1, $conf->currency), 'mens'=>$mens);
+		$output[$echance] = array(
+			'cap_rest' => $cap_rest,
+			'cap_rest_str' => price($cap_rest, 0, '', 1, -1, -1, $conf->currency),
+			'interet' => $int,
+			'interet_str' => price($int, 0, '', 1, -1, -1, $conf->currency),
+			'mens' => $mens,
+		);
 
-        $capital = $cap_rest;
-        $echance++;
-    }
+		$capital = $cap_rest;
+		$echance++;
+	}
 
-    return $output;
+	return $output;
 }
diff --git a/htdocs/core/lib/memory.lib.php b/htdocs/core/lib/memory.lib.php
index 9d64185c781..7b863391b24 100644
--- a/htdocs/core/lib/memory.lib.php
+++ b/htdocs/core/lib/memory.lib.php
@@ -47,16 +47,16 @@ function dol_setcache($memoryid, $data)
 	// Using a memcached server
 	if (!empty($conf->memcached->enabled) && class_exists('Memcached'))
 	{
-	    global $dolmemcache;
+		global $dolmemcache;
 		if (empty($dolmemcache) || !is_object($dolmemcache))
-    	{
-       	    $dolmemcache = new Memcached();
-       		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
-       		$result = $dolmemcache->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
-       		if (!$result) return -1;
-       	}
+		{
+	   		$dolmemcache = new Memcached();
+	   		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
+	   		$result = $dolmemcache->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
+	   		if (!$result) return -1;
+	   	}
 
-	    $memoryid = session_name().'_'.$memoryid;
+		$memoryid = session_name().'_'.$memoryid;
 		//$dolmemcache->setOption(Memcached::OPT_COMPRESSION, false);
 		$dolmemcache->add($memoryid, $data); // This fails if key already exists
 		$rescode = $dolmemcache->getResultCode();
@@ -70,14 +70,14 @@ function dol_setcache($memoryid, $data)
 	{
 		global $dolmemcache;
 		if (empty($dolmemcache) || !is_object($dolmemcache))
-    	{
-       	    $dolmemcache = new Memcache();
-       		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
-       		$result = $dolmemcache->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
-       		if (!$result) return -1;
-       	}
+		{
+	   		$dolmemcache = new Memcache();
+	   		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
+	   		$result = $dolmemcache->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
+	   		if (!$result) return -1;
+	   	}
 
-       	$memoryid = session_name().'_'.$memoryid;
+	   	$memoryid = session_name().'_'.$memoryid;
 		//$dolmemcache->setOption(Memcached::OPT_COMPRESSION, false);
 		$result = $dolmemcache->add($memoryid, $data); // This fails if key already exists
 		if ($result)
@@ -110,12 +110,12 @@ function dol_getcache($memoryid)
 	{
 		global $m;
 		if (empty($m) || !is_object($m))
-    	{
-            $m = new Memcached();
-       		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
-       		$result = $m->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
-       		if (!$result) return -1;
-       	}
+		{
+			$m = new Memcached();
+	   		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
+	   		$result = $m->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
+	   		if (!$result) return -1;
+	   	}
 
 		$memoryid = session_name().'_'.$memoryid;
 		//$m->setOption(Memcached::OPT_COMPRESSION, false);
@@ -134,14 +134,14 @@ function dol_getcache($memoryid)
 	{
 		global $m;
 		if (empty($m) || !is_object($m))
-    	{
-       	    $m = new Memcache();
-       		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
-       		$result = $m->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
-       		if (!$result) return -1;
-       	}
+		{
+	   		$m = new Memcache();
+	   		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
+	   		$result = $m->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
+	   		if (!$result) return -1;
+	   	}
 
-       	$memoryid = session_name().'_'.$memoryid;
+	   	$memoryid = session_name().'_'.$memoryid;
 		//$m->setOption(Memcached::OPT_COMPRESSION, false);
 		$data = $m->get($memoryid);
 		//print "memoryid=".$memoryid." - rescode=".$rescode." - data=".count($data)."\n<br>";
diff --git a/htdocs/core/lib/multicurrency.lib.php b/htdocs/core/lib/multicurrency.lib.php
index 065b4dfc886..a3f7d56ec90 100644
--- a/htdocs/core/lib/multicurrency.lib.php
+++ b/htdocs/core/lib/multicurrency.lib.php
@@ -40,6 +40,11 @@ function multicurrencyAdminPrepareHead()
 	$head[$h][2] = 'settings';
 	$h++;
 
+	$head[$h][0] = dol_buildpath("/multicurrency/multicurrency_rate.php", 1);
+	$head[$h][1] = $langs->trans("TabTitleMulticurrencyRate");
+	$head[$h][2] = 'ratelist';
+	$h++;
+
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'multicurrency');
 
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'multicurrency', 'remove');
diff --git a/htdocs/core/lib/oauth.lib.php b/htdocs/core/lib/oauth.lib.php
index 34e1d99bd80..a006aad8964 100644
--- a/htdocs/core/lib/oauth.lib.php
+++ b/htdocs/core/lib/oauth.lib.php
@@ -25,7 +25,7 @@
 
 // Supported OAUTH (a provider is supported when a file xxx_oauthcallback.php is available into htdocs/core/modules/oauth)
 $supportedoauth2array = array(
-    'OAUTH_GOOGLE_NAME'=>'google',
+	'OAUTH_GOOGLE_NAME'=>'google',
 );
 if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 {
@@ -38,188 +38,188 @@ $supportedoauth2array['OAUTH_GITHUB_NAME'] = 'github';
 
 // API access parameters OAUTH
 $list = array(
-    array(
-        'OAUTH_AMAZON_NAME',
-        'OAUTH_AMAZON_ID',
-        'OAUTH_AMAZON_SECRET',
-    ),
-    array(
-        'OAUTH_BITBUCKET_NAME',
-        'OAUTH_BITBUCKET_ID',
-        'OAUTH_BITBUCKET_SECRET',
-    ),
-    array(
-        'OAUTH_BITLY_NAME',
-        'OAUTH_BITLY_ID',
-        'OAUTH_BITLY_SECRET',
-    ),
-    array(
-        'OAUTH_BITRIX24_NAME',
-        'OAUTH_BITRIX24_ID',
-        'OAUTH_BITRIX24_SECRET',
-    ),
-    array(
-        'OAUTH_BOX_NAME',
-        'OAUTH_BOX_ID',
-        'OAUTH_BOX_SECRET',
-    ),
-    array(
-        'OAUTH_BUFFER_NAME',
-        'OAUTH_BUFFER_ID',
-        'OAUTH_BUFFER_SECRET',
-    ),
-    array(
-        'OAUTH_DAILYMOTION_NAME',
-        'OAUTH_DAILYMOTION_ID',
-        'OAUTH_DAILYMOTION_SECRET',
-    ),
-    array(
-        'OAUTH_DEVIANTART_NAME',
-        'OAUTH_DEVIANTART_ID',
-        'OAUTH_DEVIANTART_SECRET',
-    ),
-    array(
-        'OAUTH_DROPBOX_NAME',
-        'OAUTH_DROPBOX_ID',
-        'OAUTH_DROPBOX_SECRET',
-    ),
-    array(
-        'OAUTH_ETSY_NAME',
-        'OAUTH_ETSY_ID',
-        'OAUTH_ETSY_SECRET',
-    ),
-    array(
-        'OAUTH_EVEONLINE_NAME',
-        'OAUTH_EVEONLINE_ID',
-        'OAUTH_EVEONLINE_SECRET',
-    ),
-    array(
-        'OAUTH_FACEBOOK_NAME',
-        'OAUTH_FACEBOOK_ID',
-        'OAUTH_FACEBOOK_SECRET',
-    ),
-    array(
-        'OAUTH_FITBIT_NAME',
-        'OAUTH_FITBIT_ID',
-        'OAUTH_FITBIT_SECRET',
-    ),
-    array(
-        'OAUTH_FIVEHUNDREDPX_NAME',
-        'OAUTH_FIVEHUNDREDPX_ID',
-        'OAUTH_FIVEHUNDREDPX_SECRET',
-    ),
-    array(
-        'OAUTH_FLICKR_NAME',
-        'OAUTH_FLICKR_ID',
-        'OAUTH_FLICKR_SECRET',
-    ),
-    array(
-        'OAUTH_FOURSQUARE_NAME',
-        'OAUTH_FOURSQUARE_ID',
-        'OAUTH_FOURSQUARE_SECRET',
-    ),
-    array(
-        'OAUTH_GITHUB_NAME',
-        'OAUTH_GITHUB_ID',
-        'OAUTH_GITHUB_SECRET',
-        'OAUTH_GITHUB_DESC',
-    ),
-    array(
-        'OAUTH_GOOGLE_NAME',
-        'OAUTH_GOOGLE_ID',
-        'OAUTH_GOOGLE_SECRET',
-        'OAUTH_GOOGLE_DESC',
-    ),
-    array(
-        'OAUTH_HUBIC_NAME',
-        'OAUTH_HUBIC_ID',
-        'OAUTH_HUBIC_SECRET',
-    ),
-    array(
-        'OAUTH_INSTAGRAM_NAME',
-        'OAUTH_INSTAGRAM_ID',
-        'OAUTH_INSTAGRAM_SECRET',
-    ),
-    array(
-        'OAUTH_LINKEDIN_NAME',
-        'OAUTH_LINKEDIN_ID',
-        'OAUTH_LINKEDIN_SECRET',
-    ),
-    array(
-        'OAUTH_MAILCHIMP_NAME',
-        'OAUTH_MAILCHIMP_ID',
-        'OAUTH_MAILCHIMP_SECRET',
-    ),
-    array(
-        'OAUTH_MICROSOFT_NAME',
-        'OAUTH_MICROSOFT_ID',
-        'OAUTH_MICROSOFT_SECRET',
-    ),
-    array(
-        'OAUTH_NEST_NAME',
-        'OAUTH_NEST_ID',
-        'OAUTH_NEST_SECRET',
-    ),
-    array(
-        'OAUTH_NETATMO_NAME',
-        'OAUTH_NETATMO_ID',
-        'OAUTH_NETATMO_SECRET',
-    ),
-    array(
-        'OAUTH_PARROTFLOWERPOWER_NAME',
-        'OAUTH_PARROTFLOWERPOWER_ID',
-        'OAUTH_PARROTFLOWERPOWER_SECRET',
-    ),
-    array(
-        'OAUTH_PAYPAL_NAME',
-        'OAUTH_PAYPAL_ID',
-        'OAUTH_PAYPAL_SECRET',
-    ),
-    array(
-        'OAUTH_POCKET_NAME',
-        'OAUTH_POCKET_ID',
-        'OAUTH_POCKET_SECRET',
-    ),
-    array(
-        'OAUTH_QUICKBOOKS_NAME',
-        'OAUTH_QUICKBOOKS_ID',
-        'OAUTH_QUICKBOOKS_SECRET',
-    ),
-    array(
-        'OAUTH_REDDIT_NAME',
-        'OAUTH_REDDIT_ID',
-        'OAUTH_REDDIT_SECRET',
-    ),
-    array(
-        'OAUTH_REDMINE_NAME',
-        'OAUTH_REDMINE_ID',
-        'OAUTH_REDMINE_SECRET',
-    ),
-    array(
-        'OAUTH_RUNKEEPER_NAME',
-        'OAUTH_RUNKEEPER_ID',
-        'OAUTH_RUNKEEPER_SECRET',
-    ),
-    array(
-        'OAUTH_SCOOPIT_NAME',
-        'OAUTH_SCOOPIT_ID',
-        'OAUTH_SCOOPIT_SECRET',
-    ),
-    array(
-        'OAUTH_SOUNDCLOUD_NAME',
-        'OAUTH_SOUNDCLOUD_ID',
-        'OAUTH_SOUNDCLOUD_SECRET',
-    ),
-    array(
-        'OAUTH_SPOTIFY_NAME',
-        'OAUTH_SPOTIFY_ID',
-        'OAUTH_SPOTIFY_SECRET',
-    ),
-    array(
-        'OAUTH_STRAVA_NAME',
-        'OAUTH_STRAVA_ID',
-        'OAUTH_STRAVA_SECRET',
-    ),
+	array(
+		'OAUTH_AMAZON_NAME',
+		'OAUTH_AMAZON_ID',
+		'OAUTH_AMAZON_SECRET',
+	),
+	array(
+		'OAUTH_BITBUCKET_NAME',
+		'OAUTH_BITBUCKET_ID',
+		'OAUTH_BITBUCKET_SECRET',
+	),
+	array(
+		'OAUTH_BITLY_NAME',
+		'OAUTH_BITLY_ID',
+		'OAUTH_BITLY_SECRET',
+	),
+	array(
+		'OAUTH_BITRIX24_NAME',
+		'OAUTH_BITRIX24_ID',
+		'OAUTH_BITRIX24_SECRET',
+	),
+	array(
+		'OAUTH_BOX_NAME',
+		'OAUTH_BOX_ID',
+		'OAUTH_BOX_SECRET',
+	),
+	array(
+		'OAUTH_BUFFER_NAME',
+		'OAUTH_BUFFER_ID',
+		'OAUTH_BUFFER_SECRET',
+	),
+	array(
+		'OAUTH_DAILYMOTION_NAME',
+		'OAUTH_DAILYMOTION_ID',
+		'OAUTH_DAILYMOTION_SECRET',
+	),
+	array(
+		'OAUTH_DEVIANTART_NAME',
+		'OAUTH_DEVIANTART_ID',
+		'OAUTH_DEVIANTART_SECRET',
+	),
+	array(
+		'OAUTH_DROPBOX_NAME',
+		'OAUTH_DROPBOX_ID',
+		'OAUTH_DROPBOX_SECRET',
+	),
+	array(
+		'OAUTH_ETSY_NAME',
+		'OAUTH_ETSY_ID',
+		'OAUTH_ETSY_SECRET',
+	),
+	array(
+		'OAUTH_EVEONLINE_NAME',
+		'OAUTH_EVEONLINE_ID',
+		'OAUTH_EVEONLINE_SECRET',
+	),
+	array(
+		'OAUTH_FACEBOOK_NAME',
+		'OAUTH_FACEBOOK_ID',
+		'OAUTH_FACEBOOK_SECRET',
+	),
+	array(
+		'OAUTH_FITBIT_NAME',
+		'OAUTH_FITBIT_ID',
+		'OAUTH_FITBIT_SECRET',
+	),
+	array(
+		'OAUTH_FIVEHUNDREDPX_NAME',
+		'OAUTH_FIVEHUNDREDPX_ID',
+		'OAUTH_FIVEHUNDREDPX_SECRET',
+	),
+	array(
+		'OAUTH_FLICKR_NAME',
+		'OAUTH_FLICKR_ID',
+		'OAUTH_FLICKR_SECRET',
+	),
+	array(
+		'OAUTH_FOURSQUARE_NAME',
+		'OAUTH_FOURSQUARE_ID',
+		'OAUTH_FOURSQUARE_SECRET',
+	),
+	array(
+		'OAUTH_GITHUB_NAME',
+		'OAUTH_GITHUB_ID',
+		'OAUTH_GITHUB_SECRET',
+		'OAUTH_GITHUB_DESC',
+	),
+	array(
+		'OAUTH_GOOGLE_NAME',
+		'OAUTH_GOOGLE_ID',
+		'OAUTH_GOOGLE_SECRET',
+		'OAUTH_GOOGLE_DESC',
+	),
+	array(
+		'OAUTH_HUBIC_NAME',
+		'OAUTH_HUBIC_ID',
+		'OAUTH_HUBIC_SECRET',
+	),
+	array(
+		'OAUTH_INSTAGRAM_NAME',
+		'OAUTH_INSTAGRAM_ID',
+		'OAUTH_INSTAGRAM_SECRET',
+	),
+	array(
+		'OAUTH_LINKEDIN_NAME',
+		'OAUTH_LINKEDIN_ID',
+		'OAUTH_LINKEDIN_SECRET',
+	),
+	array(
+		'OAUTH_MAILCHIMP_NAME',
+		'OAUTH_MAILCHIMP_ID',
+		'OAUTH_MAILCHIMP_SECRET',
+	),
+	array(
+		'OAUTH_MICROSOFT_NAME',
+		'OAUTH_MICROSOFT_ID',
+		'OAUTH_MICROSOFT_SECRET',
+	),
+	array(
+		'OAUTH_NEST_NAME',
+		'OAUTH_NEST_ID',
+		'OAUTH_NEST_SECRET',
+	),
+	array(
+		'OAUTH_NETATMO_NAME',
+		'OAUTH_NETATMO_ID',
+		'OAUTH_NETATMO_SECRET',
+	),
+	array(
+		'OAUTH_PARROTFLOWERPOWER_NAME',
+		'OAUTH_PARROTFLOWERPOWER_ID',
+		'OAUTH_PARROTFLOWERPOWER_SECRET',
+	),
+	array(
+		'OAUTH_PAYPAL_NAME',
+		'OAUTH_PAYPAL_ID',
+		'OAUTH_PAYPAL_SECRET',
+	),
+	array(
+		'OAUTH_POCKET_NAME',
+		'OAUTH_POCKET_ID',
+		'OAUTH_POCKET_SECRET',
+	),
+	array(
+		'OAUTH_QUICKBOOKS_NAME',
+		'OAUTH_QUICKBOOKS_ID',
+		'OAUTH_QUICKBOOKS_SECRET',
+	),
+	array(
+		'OAUTH_REDDIT_NAME',
+		'OAUTH_REDDIT_ID',
+		'OAUTH_REDDIT_SECRET',
+	),
+	array(
+		'OAUTH_REDMINE_NAME',
+		'OAUTH_REDMINE_ID',
+		'OAUTH_REDMINE_SECRET',
+	),
+	array(
+		'OAUTH_RUNKEEPER_NAME',
+		'OAUTH_RUNKEEPER_ID',
+		'OAUTH_RUNKEEPER_SECRET',
+	),
+	array(
+		'OAUTH_SCOOPIT_NAME',
+		'OAUTH_SCOOPIT_ID',
+		'OAUTH_SCOOPIT_SECRET',
+	),
+	array(
+		'OAUTH_SOUNDCLOUD_NAME',
+		'OAUTH_SOUNDCLOUD_ID',
+		'OAUTH_SOUNDCLOUD_SECRET',
+	),
+	array(
+		'OAUTH_SPOTIFY_NAME',
+		'OAUTH_SPOTIFY_ID',
+		'OAUTH_SPOTIFY_SECRET',
+	),
+	array(
+		'OAUTH_STRAVA_NAME',
+		'OAUTH_STRAVA_ID',
+		'OAUTH_STRAVA_SECRET',
+	),
 	array(
 		'OAUTH_STRIPE_TEST_NAME',
 		'OAUTH_STRIPE_TEST_ID',
@@ -231,35 +231,35 @@ $list = array(
 		'STRIPE_LIVE_SECRET_KEY',
 	),
 	array(
-        'OAUTH_TUMBLR_NAME',
-        'OAUTH_TUMBLR_ID',
-        'OAUTH_TUMBLR_SECRET',
-    ),
-    array(
-        'OAUTH_TWITTER_NAME',
-        'OAUTH_TWITTER_ID',
-        'OAUTH_TWITTER_SECRET',
-    ),
-    array(
-        'OAUTH_USTREAM_NAME',
-        'OAUTH_USTREAM_ID',
-        'OAUTH_USTREAM_SECRET',
-    ),
-    array(
-        'OAUTH_VIMEO_NAME',
-        'OAUTH_VIMEO_ID',
-        'OAUTH_VIMEO_SECRET',
-    ),
-    array(
-        'OAUTH_YAHOO_NAME',
-        'OAUTH_YAHOO_ID',
-        'OAUTH_YAHOO_SECRET',
-    ),
-    array(
-        'OAUTH_YAMMER_NAME',
-        'OAUTH_YAMMER_ID',
-        'OAUTH_YAMMER_SECRET',
-    ),
+		'OAUTH_TUMBLR_NAME',
+		'OAUTH_TUMBLR_ID',
+		'OAUTH_TUMBLR_SECRET',
+	),
+	array(
+		'OAUTH_TWITTER_NAME',
+		'OAUTH_TWITTER_ID',
+		'OAUTH_TWITTER_SECRET',
+	),
+	array(
+		'OAUTH_USTREAM_NAME',
+		'OAUTH_USTREAM_ID',
+		'OAUTH_USTREAM_SECRET',
+	),
+	array(
+		'OAUTH_VIMEO_NAME',
+		'OAUTH_VIMEO_ID',
+		'OAUTH_VIMEO_SECRET',
+	),
+	array(
+		'OAUTH_YAHOO_NAME',
+		'OAUTH_YAHOO_ID',
+		'OAUTH_YAHOO_SECRET',
+	),
+	array(
+		'OAUTH_YAMMER_NAME',
+		'OAUTH_YAMMER_ID',
+		'OAUTH_YAMMER_SECRET',
+	),
 );
 
 
@@ -271,24 +271,24 @@ $list = array(
  */
 function oauthadmin_prepare_head()
 {
-    global $langs, $conf;
-    $h = 0;
-    $head = array();
+	global $langs, $conf;
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = dol_buildpath('/admin/oauth.php', 1);
-    $head[$h][1] = $langs->trans("OAuthServices");
-    $head[$h][2] = 'services';
-    $h++;
+	$head[$h][0] = dol_buildpath('/admin/oauth.php', 1);
+	$head[$h][1] = $langs->trans("OAuthServices");
+	$head[$h][2] = 'services';
+	$h++;
 
-    $head[$h][0] = dol_buildpath('/admin/oauthlogintokens.php', 1);
-    $head[$h][1] = $langs->trans("TokenManager");
-    $head[$h][2] = 'tokengeneration';
-    $h++;
+	$head[$h][0] = dol_buildpath('/admin/oauthlogintokens.php', 1);
+	$head[$h][1] = $langs->trans("TokenManager");
+	$head[$h][2] = 'tokengeneration';
+	$h++;
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'oauthadmin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'oauthadmin');
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'oauthadmin', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'oauthadmin', 'remove');
 
 
-    return $head;
+	return $head;
 }
diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php
index 939b731f135..9bd92a2c79b 100644
--- a/htdocs/core/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@@ -50,8 +50,8 @@ function commande_prepare_head(Commande $object)
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
-	    $head[$h][0] = DOL_URL_ROOT.'/commande/contact.php?id='.$object->id;
+		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
+		$head[$h][0] = DOL_URL_ROOT.'/commande/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
 		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
 		$head[$h][2] = 'contact';
@@ -59,33 +59,33 @@ function commande_prepare_head(Commande $object)
 	}
 
 	if (($conf->expedition_bon->enabled && $user->rights->expedition->lire)
-	|| ($conf->livraison_bon->enabled && $user->rights->expedition->livraison->lire))
+	|| ($conf->delivery_note->enabled && $user->rights->expedition->delivery->lire))
 	{
 		$nbShipments = $object->getNbOfShipments(); $nbReceiption = 0;
 		$head[$h][0] = DOL_URL_ROOT.'/expedition/shipment.php?id='.$object->id;
 		$text = '';
 		if ($conf->expedition_bon->enabled) $text .= $langs->trans("Shipments");
-		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled) $text .= ' - ';
-		if ($conf->livraison_bon->enabled)  $text .= $langs->trans("Receivings");
+		if ($conf->expedition_bon->enabled && $conf->delivery_note->enabled) $text .= ' - ';
+		if ($conf->delivery_note->enabled)  $text .= $langs->trans("Receivings");
 		if ($nbShipments > 0 || $nbReceiption > 0) $text .= '<span class="badge marginleftonlyshort">'.($nbShipments ? $nbShipments : 0);
-		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled && ($nbShipments > 0 || $nbReceiption > 0)) $text .= ' - ';
-		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled && ($nbShipments > 0 || $nbReceiption > 0)) $text .= ($nbReceiption ? $nbReceiption : 0);
+		if ($conf->expedition_bon->enabled && $conf->delivery_note->enabled && ($nbShipments > 0 || $nbReceiption > 0)) $text .= ' - ';
+		if ($conf->expedition_bon->enabled && $conf->delivery_note->enabled && ($nbShipments > 0 || $nbReceiption > 0)) $text .= ($nbReceiption ? $nbReceiption : 0);
 		if ($nbShipments > 0 || $nbReceiption > 0) $text .= '</span>';
 		$head[$h][1] = $text;
 		$head[$h][2] = 'shipping';
 		$h++;
 	}
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'order');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'order');
 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
 		$nbNote = 0;
-        if (!empty($object->note_private)) $nbNote++;
+		if (!empty($object->note_private)) $nbNote++;
 		if (!empty($object->note_public)) $nbNote++;
 		$head[$h][0] = DOL_URL_ROOT.'/commande/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
@@ -95,10 +95,10 @@ function commande_prepare_head(Commande $object)
 	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->commande->multidir_output[$object->entity]."/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/commande/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
@@ -110,9 +110,9 @@ function commande_prepare_head(Commande $object)
 	$head[$h][2] = 'info';
 	$h++;
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'order', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'order', 'remove');
 
-    return $head;
+	return $head;
 }
 
 /**
diff --git a/htdocs/core/lib/parsemd.lib.php b/htdocs/core/lib/parsemd.lib.php
index 1120b3f8d15..ef0de8c1298 100644
--- a/htdocs/core/lib/parsemd.lib.php
+++ b/htdocs/core/lib/parsemd.lib.php
@@ -31,25 +31,25 @@
  */
 function dolMd2Html($content, $parser = 'parsedown', $replaceimagepath = null)
 {
-    if (is_array($replaceimagepath))
-    {
-        foreach ($replaceimagepath as $key => $val)
-        {
-            $keytoreplace = ']('.$key;
-            $valafter = ']('.$val;
-            $content = preg_replace('/'.preg_quote($keytoreplace, '/').'/m', $valafter, $content);
-        }
-    }
-    if ($parser == 'parsedown')
-    {
-        include_once DOL_DOCUMENT_ROOT.'/includes/parsedown/Parsedown.php';
-        $Parsedown = new Parsedown();
-        $content = $Parsedown->text($content);
-    } else {
-        $content = nl2br($content);
-    }
+	if (is_array($replaceimagepath))
+	{
+		foreach ($replaceimagepath as $key => $val)
+		{
+			$keytoreplace = ']('.$key;
+			$valafter = ']('.$val;
+			$content = preg_replace('/'.preg_quote($keytoreplace, '/').'/m', $valafter, $content);
+		}
+	}
+	if ($parser == 'parsedown')
+	{
+		include_once DOL_DOCUMENT_ROOT.'/includes/parsedown/Parsedown.php';
+		$Parsedown = new Parsedown();
+		$content = $Parsedown->text($content);
+	} else {
+		$content = nl2br($content);
+	}
 
-    return $content;
+	return $content;
 }
 
 
@@ -63,23 +63,23 @@ function dolMd2Html($content, $parser = 'parsedown', $replaceimagepath = null)
  */
 function dolMd2Asciidoc($content, $parser = 'dolibarr', $replaceimagepath = null)
 {
-    if (is_array($replaceimagepath))
-    {
-        foreach ($replaceimagepath as $key => $val)
-        {
-            $keytoreplace = ']('.$key;
-            $valafter = ']('.$val;
-            $content = preg_replace('/'.preg_quote($keytoreplace, '/').'/m', $valafter, $content);
-        }
-    }
-    //if ($parser == 'dolibarr')
-    //{
-        $content = preg_replace('/<!--.*-->/msU', '', $content);
-    //}
-    //else
-    //{
-    //    $content = $content;
-    //}
+	if (is_array($replaceimagepath))
+	{
+		foreach ($replaceimagepath as $key => $val)
+		{
+			$keytoreplace = ']('.$key;
+			$valafter = ']('.$val;
+			$content = preg_replace('/'.preg_quote($keytoreplace, '/').'/m', $valafter, $content);
+		}
+	}
+	//if ($parser == 'dolibarr')
+	//{
+		$content = preg_replace('/<!--.*-->/msU', '', $content);
+	//}
+	//else
+	//{
+	//    $content = $content;
+	//}
 
-    return $content;
+	return $content;
 }
diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index 4fb593e354d..601dad3275d 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -29,30 +29,30 @@
 function payment_prepare_head(Paiement $object)
 {
 
-    global $langs, $conf;
+	global $langs, $conf;
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("Payment");
-    $head[$h][2] = 'payment';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Payment");
+	$head[$h][2] = 'payment';
+	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment');
 
-    $head[$h][0] = DOL_URL_ROOT.'/compta/paiement/info.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("Info");
-    $head[$h][2] = 'info';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/compta/paiement/info.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Info");
+	$head[$h][2] = 'info';
+	$h++;
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment', 'remove');
 
-    return $head;
+	return $head;
 }
 
 /**
@@ -64,30 +64,30 @@ function payment_prepare_head(Paiement $object)
  */
 function bankline_prepare_head($id)
 {
-    global $langs, $conf;
+	global $langs, $conf;
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$id;
-    $head[$h][1] = $langs->trans('BankTransaction');
-    $head[$h][2] = 'bankline';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$id;
+	$head[$h][1] = $langs->trans('BankTransaction');
+	$head[$h][2] = 'bankline';
+	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'bankline');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'bankline');
 
-    $head[$h][0] = DOL_URL_ROOT.'/compta/bank/info.php?rowid='.$id;
-    $head[$h][1] = $langs->trans("Info");
-    $head[$h][2] = 'info';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/info.php?rowid='.$id;
+	$head[$h][1] = $langs->trans("Info");
+	$head[$h][2] = 'info';
+	$h++;
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'bankline', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'bankline', 'remove');
 
-    return $head;
+	return $head;
 }
 
 /**
@@ -109,11 +109,11 @@ function payment_supplier_prepare_head(Paiement $object)
 	$head[$h][2] = 'payment';
 	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment_supplier');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment_supplier');
 
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/paiement/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Info');
@@ -170,7 +170,7 @@ function showOnlinePaymentUrl($type, $ref)
 	global $langs;
 
 	// Load translation files required by the page
-    $langs->loadLangs(array('payment', 'stripe'));
+	$langs->loadLangs(array('payment', 'stripe'));
 
 	$servicename = $langs->transnoentitiesnoconv('Online');
 
@@ -194,7 +194,7 @@ function showOnlinePaymentUrl($type, $ref)
  */
 function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag = 'your_tag', $localorexternal = 0)
 {
-    global $conf, $dolibarr_main_url_root;
+	global $conf, $dolibarr_main_url_root;
 
 	$ref = str_replace(' ', '', $ref);
 	$out = '';
@@ -209,7 +209,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 
 	if ($type == 'free')
 	{
-	    $out = $urltouse.'/public/payment/newpayment.php?amount='.($mode ? '<font color="#666666">' : '').$amount.($mode ? '</font>' : '').'&tag='.($mode ? '<font color="#666666">' : '').$freetag.($mode ? '</font>' : '');
+		$out = $urltouse.'/public/payment/newpayment.php?amount='.($mode ? '<font color="#666666">' : '').$amount.($mode ? '</font>' : '').'&tag='.($mode ? '<font color="#666666">' : '').$freetag.($mode ? '</font>' : '');
 		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
 			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
@@ -218,7 +218,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 		//if ($mode) $out.='&noidempotency=1';
 	} elseif ($type == 'order')
 	{
-	    $out = $urltouse.'/public/payment/newpayment.php?source=order&ref='.($mode ? '<font color="#666666">' : '');
+		$out = $urltouse.'/public/payment/newpayment.php?source=order&ref='.($mode ? '<font color="#666666">' : '');
 		if ($mode == 1) $out .= 'order_ref';
 		if ($mode == 0) $out .= urlencode($ref);
 		$out .= ($mode ? '</font>' : '');
@@ -234,7 +234,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 		}
 	} elseif ($type == 'invoice')
 	{
-	    $out = $urltouse.'/public/payment/newpayment.php?source=invoice&ref='.($mode ? '<font color="#666666">' : '');
+		$out = $urltouse.'/public/payment/newpayment.php?source=invoice&ref='.($mode ? '<font color="#666666">' : '');
 		if ($mode == 1) $out .= 'invoice_ref';
 		if ($mode == 0) $out .= urlencode($ref);
 		$out .= ($mode ? '</font>' : '');
@@ -250,7 +250,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 		}
 	} elseif ($type == 'contractline')
 	{
-	    $out = $urltouse.'/public/payment/newpayment.php?source=contractline&ref='.($mode ? '<font color="#666666">' : '');
+		$out = $urltouse.'/public/payment/newpayment.php?source=contractline&ref='.($mode ? '<font color="#666666">' : '');
 		if ($mode == 1) $out .= 'contractline_ref';
 		if ($mode == 0) $out .= urlencode($ref);
 		$out .= ($mode ? '</font>' : '');
@@ -266,7 +266,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 		}
 	} elseif ($type == 'member' || $type == 'membersubscription')
 	{
-	    $out = $urltouse.'/public/payment/newpayment.php?source=membersubscription&ref='.($mode ? '<font color="#666666">' : '');
+		$out = $urltouse.'/public/payment/newpayment.php?source=membersubscription&ref='.($mode ? '<font color="#666666">' : '');
 		if ($mode == 1) $out .= 'member_ref';
 		if ($mode == 0) $out .= urlencode($ref);
 		$out .= ($mode ? '</font>' : '');
@@ -283,7 +283,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 	}
 	if ($type == 'donation')
 	{
-	    $out = $urltouse.'/public/payment/newpayment.php?source=donation&ref='.($mode ? '<font color="#666666">' : '');
+		$out = $urltouse.'/public/payment/newpayment.php?source=donation&ref='.($mode ? '<font color="#666666">' : '');
 		if ($mode == 1) $out .= 'donation_ref';
 		if ($mode == 0) $out .= urlencode($ref);
 		$out .= ($mode ? '</font>' : '');
@@ -319,82 +319,82 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
  */
 function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0, $suffix = '', $object = null)
 {
-    global $conf;
+	global $conf;
 
-    // Juridical status
-    $line1 = "";
-    if ($fromcompany->forme_juridique_code)
-    {
-        $line1 .= ($line1 ? " - " : "").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);
-    }
-    // Capital
-    if ($fromcompany->capital)
-    {
-        $line1 .= ($line1 ? " - " : "").$langs->transnoentities("CapitalOf", $fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
-    }
-    // Prof Id 1
-    if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || !$fromcompany->idprof2))
-    {
-        $field = $langs->transcountrynoentities("ProfId1", $fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
-        $line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof1;
-    }
-    // Prof Id 2
-    if ($fromcompany->idprof2)
-    {
-        $field = $langs->transcountrynoentities("ProfId2", $fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
-        $line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof2;
-    }
+	// Juridical status
+	$line1 = "";
+	if ($fromcompany->forme_juridique_code)
+	{
+		$line1 .= ($line1 ? " - " : "").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);
+	}
+	// Capital
+	if ($fromcompany->capital)
+	{
+		$line1 .= ($line1 ? " - " : "").$langs->transnoentities("CapitalOf", $fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
+	}
+	// Prof Id 1
+	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || !$fromcompany->idprof2))
+	{
+		$field = $langs->transcountrynoentities("ProfId1", $fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		$line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof1;
+	}
+	// Prof Id 2
+	if ($fromcompany->idprof2)
+	{
+		$field = $langs->transcountrynoentities("ProfId2", $fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		$line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof2;
+	}
 
-    // Second line of company infos
-    $line2 = "";
-    // Prof Id 3
-    if ($fromcompany->idprof3)
-    {
-        $field = $langs->transcountrynoentities("ProfId3", $fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
-        $line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof3;
-    }
-    // Prof Id 4
-    if ($fromcompany->idprof4)
-    {
-        $field = $langs->transcountrynoentities("ProfId4", $fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
-        $line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof4;
-    }
-    // IntraCommunautary VAT
-    if ($fromcompany->tva_intra != '')
-    {
-        $line2 .= ($line2 ? " - " : "").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
-    }
+	// Second line of company infos
+	$line2 = "";
+	// Prof Id 3
+	if ($fromcompany->idprof3)
+	{
+		$field = $langs->transcountrynoentities("ProfId3", $fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		$line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof3;
+	}
+	// Prof Id 4
+	if ($fromcompany->idprof4)
+	{
+		$field = $langs->transcountrynoentities("ProfId4", $fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		$line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof4;
+	}
+	// IntraCommunautary VAT
+	if ($fromcompany->tva_intra != '')
+	{
+		$line2 .= ($line2 ? " - " : "").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
+	}
 
-    print '<br>';
+	print '<br>';
 
-    print '<div class="center">'."\n";
-    if ($addformmessage)
-    {
-    	print '<!-- object = '.$object->element.' -->';
-    	print '<br>';
+	print '<div class="center">'."\n";
+	if ($addformmessage)
+	{
+		print '<!-- object = '.$object->element.' -->';
+		print '<br>';
 
-    	$parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORM_'.$suffix;
-    	if (!empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
-    	elseif (!empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORM)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORM);
+		$parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORM_'.$suffix;
+		if (!empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
+		elseif (!empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORM)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORM);
 
-    	// Add other message if VAT exists
-    	if ($object->total_vat != 0 || $object->total_tva != 0)
-    	{
-    		$parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORMIFVAT_'.$suffix;
-    		if (!empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
-    		elseif (!empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT);
-    	}
-    }
+		// Add other message if VAT exists
+		if ($object->total_vat != 0 || $object->total_tva != 0)
+		{
+			$parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORMIFVAT_'.$suffix;
+			if (!empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
+			elseif (!empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT);
+		}
+	}
 
-    print '<font style="font-size: 10px;"><br><hr>'."\n";
-    print $fromcompany->name.'<br>';
-    print $line1;
-    if (strlen($line1.$line2) > 50) print '<br>';
-    else print ' - ';
-    print $line2;
-    print '</font></div>'."\n";
+	print '<font style="font-size: 10px;"><br><hr>'."\n";
+	print $fromcompany->name.'<br>';
+	print $line1;
+	if (strlen($line1.$line2) > 50) print '<br>';
+	else print ' - ';
+	print $line2;
+	print '</font></div>'."\n";
 }
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index deacc6c128b..6e4cc60ce53 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -11,6 +11,7 @@
  * Copyright (C) 2014		Teddy Andreotti			<125155@supinfo.com>
  * Copyright (C) 2015-2016  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2019       Lenin Rivas           	<lenin.rivas@servcom-it.com>
+ * Copyright (C) 2020       Nicolas ZABOURI         <info@inovea-conseil.com>
  *
  * 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
@@ -121,7 +122,11 @@ function pdf_getInstance($format = '', $metric = 'mm', $pagetype = 'P')
 		define('K_SMALL_RATIO', 2 / 3);
 		define('K_THAI_TOPCHARS', true);
 		define('K_TCPDF_CALLS_IN_HTML', true);
-		define('K_TCPDF_THROW_EXCEPTION_ERROR', false);
+		if (!empty($conf->global->TCPDF_THROW_ERRORS_INSTEAD_OF_DIE)) {
+			define('K_TCPDF_THROW_EXCEPTION_ERROR', true);
+		} else {
+			define('K_TCPDF_THROW_EXCEPTION_ERROR', false);
+		}
 	}
 
 	// Load TCPDF
@@ -288,41 +293,41 @@ function pdf_getHeightForLogo($logo, $url = false)
  */
 function pdfGetHeightForHtmlContent(&$pdf, $htmlcontent)
 {
-    // store current object
-    $pdf->startTransaction();
-    // store starting values
-    $start_y = $pdf->GetY();
-    //var_dump($start_y);
-    $start_page = $pdf->getPage();
-    // call printing functions with content
-    $pdf->writeHTMLCell(0, 0, 0, $start_y, $htmlcontent, 0, 1, false, true, 'J', true);
-    // get the new Y
-    $end_y = $pdf->GetY();
-    $end_page = $pdf->getPage();
-    // calculate height
-    $height = 0;
-    if ($end_page == $start_page) {
-        $height = $end_y - $start_y;
-    } else {
-        for ($page = $start_page; $page <= $end_page; ++$page) {
-        	$pdf->setPage($page);
-        	$tmpm = $pdf->getMargins();
-        	$tMargin = $tmpm['top'];
-        	if ($page == $start_page) {
-        		// first page
-        		$height = $pdf->getPageHeight() - $start_y - $pdf->getBreakMargin();
-        	} elseif ($page == $end_page) {
-        		// last page
-        		$height = $end_y - $tMargin;
-        	} else {
-        		$height = $pdf->getPageHeight() - $tMargin - $pdf->getBreakMargin();
-        	}
-        }
+	// store current object
+	$pdf->startTransaction();
+	// store starting values
+	$start_y = $pdf->GetY();
+	//var_dump($start_y);
+	$start_page = $pdf->getPage();
+	// call printing functions with content
+	$pdf->writeHTMLCell(0, 0, 0, $start_y, $htmlcontent, 0, 1, false, true, 'J', true);
+	// get the new Y
+	$end_y = $pdf->GetY();
+	$end_page = $pdf->getPage();
+	// calculate height
+	$height = 0;
+	if ($end_page == $start_page) {
+		$height = $end_y - $start_y;
+	} else {
+		for ($page = $start_page; $page <= $end_page; ++$page) {
+			$pdf->setPage($page);
+			$tmpm = $pdf->getMargins();
+			$tMargin = $tmpm['top'];
+			if ($page == $start_page) {
+				// first page
+				$height = $pdf->getPageHeight() - $start_y - $pdf->getBreakMargin();
+			} elseif ($page == $end_page) {
+				// last page
+				$height = $end_y - $tMargin;
+			} else {
+				$height = $pdf->getPageHeight() - $tMargin - $pdf->getBreakMargin();
+			}
+		}
 	}
 	// restore previous object
 	$pdf = $pdf->rollbackTransaction();
 
-    return $height;
+	return $height;
 }
 
 
@@ -336,7 +341,7 @@ function pdfGetHeightForHtmlContent(&$pdf, $htmlcontent)
  */
 function pdfBuildThirdpartyName($thirdparty, Translate $outputlangs, $includealias = 0)
 {
-    global $conf;
+	global $conf;
 
 	// Recipient name
 	$socname = '';
@@ -344,7 +349,7 @@ function pdfBuildThirdpartyName($thirdparty, Translate $outputlangs, $includeali
 	if ($thirdparty instanceof Societe) {
 		$socname .= $thirdparty->name;
 		if (($includealias || !empty($conf->global->PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME)) && !empty($thirdparty->name_alias)) {
-		    $socname .= " - ".$thirdparty->name_alias;
+			$socname .= " - ".$thirdparty->name_alias;
 		}
 	} elseif ($thirdparty instanceof Contact) {
 		$socname = $thirdparty->socname;
@@ -389,82 +394,82 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
 	}
 	if (empty($reshook))
 	{
-    	if ($mode == 'source')
-    	{
-    		$withCountry = 0;
-    		if (!empty($sourcecompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) $withCountry = 1;
+		if ($mode == 'source')
+		{
+			$withCountry = 0;
+			if (!empty($sourcecompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) $withCountry = 1;
 
-    		$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($sourcecompany, $withCountry, "\n", $outputlangs))."\n";
+			$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($sourcecompany, $withCountry, "\n", $outputlangs))."\n";
 
-    		if (empty($conf->global->MAIN_PDF_DISABLESOURCEDETAILS))
-    		{
-    			// Phone
-    			if ($sourcecompany->phone) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("PhoneShort").": ".$outputlangs->convToOutputCharset($sourcecompany->phone);
-    			// Fax
-    			if ($sourcecompany->fax) $stringaddress .= ($stringaddress ? ($sourcecompany->phone ? " - " : "\n") : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax);
-    			// EMail
-    			if ($sourcecompany->email) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($sourcecompany->email);
-    			// Web
-    			if ($sourcecompany->url) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($sourcecompany->url);
-    		}
-    		// Intra VAT
-    		if (!empty($conf->global->MAIN_TVAINTRA_IN_SOURCE_ADDRESS))
-    		{
-    			if ($sourcecompany->tva_intra) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($sourcecompany->tva_intra);
-    		}
-    		// Professionnal Ids
-    		$reg = array();
-    		if (!empty($conf->global->MAIN_PROFID1_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof1))
-    		{
-    			$tmp = $outputlangs->transcountrynoentities("ProfId1", $sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
-    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof1);
-    		}
-    		if (!empty($conf->global->MAIN_PROFID2_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof2))
-    		{
-    			$tmp = $outputlangs->transcountrynoentities("ProfId2", $sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
-    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof2);
-    		}
-    		if (!empty($conf->global->MAIN_PROFID3_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof3))
-    		{
-    			$tmp = $outputlangs->transcountrynoentities("ProfId3", $sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
-    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof3);
-    		}
-    		if (!empty($conf->global->MAIN_PROFID4_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof4))
-    		{
-    			$tmp = $outputlangs->transcountrynoentities("ProfId4", $sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
-    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof4);
-    		}
-    		if (!empty($conf->global->MAIN_PROFID5_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof5))
-    		{
-    			$tmp = $outputlangs->transcountrynoentities("ProfId5", $sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
-    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof5);
-    		}
-    		if (!empty($conf->global->MAIN_PROFID6_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof6))
-    		{
-    			$tmp = $outputlangs->transcountrynoentities("ProfId6", $sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
-    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof6);
-    		}
-    		if (!empty($conf->global->PDF_ADD_MORE_AFTER_SOURCE_ADDRESS)) {
-    			$stringaddress .= ($stringaddress ? "\n" : '').$conf->global->PDF_ADD_MORE_AFTER_SOURCE_ADDRESS;
-    		}
-    	}
+			if (empty($conf->global->MAIN_PDF_DISABLESOURCEDETAILS))
+			{
+				// Phone
+				if ($sourcecompany->phone) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("PhoneShort").": ".$outputlangs->convToOutputCharset($sourcecompany->phone);
+				// Fax
+				if ($sourcecompany->fax) $stringaddress .= ($stringaddress ? ($sourcecompany->phone ? " - " : "\n") : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax);
+				// EMail
+				if ($sourcecompany->email) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($sourcecompany->email);
+				// Web
+				if ($sourcecompany->url) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($sourcecompany->url);
+			}
+			// Intra VAT
+			if (!empty($conf->global->MAIN_TVAINTRA_IN_SOURCE_ADDRESS))
+			{
+				if ($sourcecompany->tva_intra) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($sourcecompany->tva_intra);
+			}
+			// Professionnal Ids
+			$reg = array();
+			if (!empty($conf->global->MAIN_PROFID1_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof1))
+			{
+				$tmp = $outputlangs->transcountrynoentities("ProfId1", $sourcecompany->country_code);
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof1);
+			}
+			if (!empty($conf->global->MAIN_PROFID2_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof2))
+			{
+				$tmp = $outputlangs->transcountrynoentities("ProfId2", $sourcecompany->country_code);
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof2);
+			}
+			if (!empty($conf->global->MAIN_PROFID3_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof3))
+			{
+				$tmp = $outputlangs->transcountrynoentities("ProfId3", $sourcecompany->country_code);
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof3);
+			}
+			if (!empty($conf->global->MAIN_PROFID4_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof4))
+			{
+				$tmp = $outputlangs->transcountrynoentities("ProfId4", $sourcecompany->country_code);
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof4);
+			}
+			if (!empty($conf->global->MAIN_PROFID5_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof5))
+			{
+				$tmp = $outputlangs->transcountrynoentities("ProfId5", $sourcecompany->country_code);
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof5);
+			}
+			if (!empty($conf->global->MAIN_PROFID6_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof6))
+			{
+				$tmp = $outputlangs->transcountrynoentities("ProfId6", $sourcecompany->country_code);
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof6);
+			}
+			if (!empty($conf->global->PDF_ADD_MORE_AFTER_SOURCE_ADDRESS)) {
+				$stringaddress .= ($stringaddress ? "\n" : '').$conf->global->PDF_ADD_MORE_AFTER_SOURCE_ADDRESS;
+			}
+		}
 
-    	if ($mode == 'target' || preg_match('/targetwithdetails/', $mode))
-    	{
-    		if ($usecontact)
-    		{
-    			$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($targetcontact->getFullName($outputlangs, 1));
+		if ($mode == 'target' || preg_match('/targetwithdetails/', $mode))
+		{
+			if ($usecontact)
+			{
+				$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($targetcontact->getFullName($outputlangs, 1));
 
-    			if (!empty($targetcontact->address)) {
-    				$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($targetcontact));
-    			} else {
-    				$companytouseforaddress = $targetcompany;
+				if (!empty($targetcontact->address)) {
+					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($targetcontact));
+				} else {
+					$companytouseforaddress = $targetcompany;
 
 					// Contact on a thirdparty that is a different thirdparty than the thirdparty of object
 					if ($targetcontact->socid > 0 && $targetcontact->socid != $targetcompany->id)
@@ -475,129 +480,129 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
 
 					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($companytouseforaddress));
 				}
-    			// Country
-    			if (!empty($targetcontact->country_code) && $targetcontact->country_code != $sourcecompany->country_code) {
-    				$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcontact->country_code));
-    			} elseif (empty($targetcontact->country_code) && !empty($targetcompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {
-    				$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
-    			}
+				// Country
+				if (!empty($targetcontact->country_code) && $targetcontact->country_code != $sourcecompany->country_code) {
+					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcontact->country_code));
+				} elseif (empty($targetcontact->country_code) && !empty($targetcompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {
+					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
+				}
 
-    			if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/', $mode))
-    			{
-    				// Phone
-    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/', $mode))
-    			    {
-        				if (!empty($targetcontact->phone_pro) || !empty($targetcontact->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Phone").": ";
-        				if (!empty($targetcontact->phone_pro)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_pro);
-        				if (!empty($targetcontact->phone_pro) && !empty($targetcontact->phone_mobile)) $stringaddress .= " / ";
-        				if (!empty($targetcontact->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_mobile);
-    			    }
-    				// Fax
-    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/', $mode))
-    			    {
-                        if ($targetcontact->fax) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcontact->fax);
-    			    }
-    				// EMail
-    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/', $mode))
-    			    {
-                        if ($targetcontact->email) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcontact->email);
-    			    }
-    				// Web
-    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/', $mode))
-    			    {
-                        if ($targetcontact->url) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcontact->url);
-    			    }
-    			}
-    		} else {
-    			$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($targetcompany));
-    			// Country
-    			if (!empty($targetcompany->country_code) && $targetcompany->country_code != $sourcecompany->country_code) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
+				if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/', $mode))
+				{
+					// Phone
+					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/', $mode))
+					{
+						if (!empty($targetcontact->phone_pro) || !empty($targetcontact->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Phone").": ";
+						if (!empty($targetcontact->phone_pro)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_pro);
+						if (!empty($targetcontact->phone_pro) && !empty($targetcontact->phone_mobile)) $stringaddress .= " / ";
+						if (!empty($targetcontact->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_mobile);
+					}
+					// Fax
+					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/', $mode))
+					{
+						if ($targetcontact->fax) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcontact->fax);
+					}
+					// EMail
+					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/', $mode))
+					{
+						if ($targetcontact->email) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcontact->email);
+					}
+					// Web
+					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/', $mode))
+					{
+						if ($targetcontact->url) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcontact->url);
+					}
+				}
+			} else {
+				$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($targetcompany));
+				// Country
+				if (!empty($targetcompany->country_code) && $targetcompany->country_code != $sourcecompany->country_code) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
 
-    			if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/', $mode))
-    			{
-    				// Phone
-    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/', $mode))
-    			    {
-    			    	if (!empty($targetcompany->phone) || !empty($targetcompany->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Phone").": ";
-	    				if (!empty($targetcompany->phone)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone);
-    					if (!empty($targetcompany->phone) && !empty($targetcompany->phone_mobile)) $stringaddress .= " / ";
-    					if (!empty($targetcompany->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone_mobile);
-    			    }
-    				// Fax
-    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/', $mode))
-    			    {
-    			    	if ($targetcompany->fax) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcompany->fax);
-    			    }
-    				// EMail
-    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/', $mode))
-    			    {
-    			    	if ($targetcompany->email) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcompany->email);
-    			    }
-    				// Web
-    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/', $mode))
-    			    {
-    			    	if ($targetcompany->url) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcompany->url);
-    			    }
-    			}
-    		}
+				if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/', $mode))
+				{
+					// Phone
+					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/', $mode))
+					{
+						if (!empty($targetcompany->phone) || !empty($targetcompany->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Phone").": ";
+						if (!empty($targetcompany->phone)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone);
+						if (!empty($targetcompany->phone) && !empty($targetcompany->phone_mobile)) $stringaddress .= " / ";
+						if (!empty($targetcompany->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone_mobile);
+					}
+					// Fax
+					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/', $mode))
+					{
+						if ($targetcompany->fax) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcompany->fax);
+					}
+					// EMail
+					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/', $mode))
+					{
+						if ($targetcompany->email) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcompany->email);
+					}
+					// Web
+					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/', $mode))
+					{
+						if ($targetcompany->url) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcompany->url);
+					}
+				}
+			}
 
-    		// Intra VAT
-    		if (empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS))
-    		{
-    			if ($targetcompany->tva_intra) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcompany->tva_intra);
-    		}
+			// Intra VAT
+			if (empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS))
+			{
+				if ($targetcompany->tva_intra) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcompany->tva_intra);
+			}
 
-    		// Professionnal Ids
-    		if (!empty($conf->global->MAIN_PROFID1_IN_ADDRESS) && !empty($targetcompany->idprof1))
-    		{
-    			$tmp = $outputlangs->transcountrynoentities("ProfId1", $targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
-    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof1);
-    		}
-    		if (!empty($conf->global->MAIN_PROFID2_IN_ADDRESS) && !empty($targetcompany->idprof2))
-    		{
-    			$tmp = $outputlangs->transcountrynoentities("ProfId2", $targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
-    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof2);
-    		}
-    		if (!empty($conf->global->MAIN_PROFID3_IN_ADDRESS) && !empty($targetcompany->idprof3))
-    		{
-    			$tmp = $outputlangs->transcountrynoentities("ProfId3", $targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
-    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof3);
-    		}
-    		if (!empty($conf->global->MAIN_PROFID4_IN_ADDRESS) && !empty($targetcompany->idprof4))
-    		{
-    			$tmp = $outputlangs->transcountrynoentities("ProfId4", $targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
-    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof4);
-    		}
-    		if (!empty($conf->global->MAIN_PROFID5_IN_ADDRESS) && !empty($targetcompany->idprof5))
-    		{
-    		    $tmp = $outputlangs->transcountrynoentities("ProfId5", $targetcompany->country_code);
-    		    if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
-    		    $stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof5);
-    		}
-    		if (!empty($conf->global->MAIN_PROFID6_IN_ADDRESS) && !empty($targetcompany->idprof6))
-    		{
-    		    $tmp = $outputlangs->transcountrynoentities("ProfId6", $targetcompany->country_code);
-    		    if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
-    		    $stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof6);
-    		}
+			// Professionnal Ids
+			if (!empty($conf->global->MAIN_PROFID1_IN_ADDRESS) && !empty($targetcompany->idprof1))
+			{
+				$tmp = $outputlangs->transcountrynoentities("ProfId1", $targetcompany->country_code);
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof1);
+			}
+			if (!empty($conf->global->MAIN_PROFID2_IN_ADDRESS) && !empty($targetcompany->idprof2))
+			{
+				$tmp = $outputlangs->transcountrynoentities("ProfId2", $targetcompany->country_code);
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof2);
+			}
+			if (!empty($conf->global->MAIN_PROFID3_IN_ADDRESS) && !empty($targetcompany->idprof3))
+			{
+				$tmp = $outputlangs->transcountrynoentities("ProfId3", $targetcompany->country_code);
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof3);
+			}
+			if (!empty($conf->global->MAIN_PROFID4_IN_ADDRESS) && !empty($targetcompany->idprof4))
+			{
+				$tmp = $outputlangs->transcountrynoentities("ProfId4", $targetcompany->country_code);
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof4);
+			}
+			if (!empty($conf->global->MAIN_PROFID5_IN_ADDRESS) && !empty($targetcompany->idprof5))
+			{
+				$tmp = $outputlangs->transcountrynoentities("ProfId5", $targetcompany->country_code);
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof5);
+			}
+			if (!empty($conf->global->MAIN_PROFID6_IN_ADDRESS) && !empty($targetcompany->idprof6))
+			{
+				$tmp = $outputlangs->transcountrynoentities("ProfId6", $targetcompany->country_code);
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof6);
+			}
 
-    		// Public note
-    		if (!empty($conf->global->MAIN_PUBLIC_NOTE_IN_ADDRESS))
-    		{
-    		    if ($mode == 'source' && !empty($sourcecompany->note_public))
-        		{
-        		    $stringaddress .= ($stringaddress ? "\n" : '').dol_string_nohtmltag($sourcecompany->note_public);
-        		}
-        		if (($mode == 'target' || preg_match('/targetwithdetails/', $mode)) && !empty($targetcompany->note_public))
-        		{
-        		    $stringaddress .= ($stringaddress ? "\n" : '').dol_string_nohtmltag($targetcompany->note_public);
-        		}
-    		}
-    	}
+			// Public note
+			if (!empty($conf->global->MAIN_PUBLIC_NOTE_IN_ADDRESS))
+			{
+				if ($mode == 'source' && !empty($sourcecompany->note_public))
+				{
+					$stringaddress .= ($stringaddress ? "\n" : '').dol_string_nohtmltag($sourcecompany->note_public);
+				}
+				if (($mode == 'target' || preg_match('/targetwithdetails/', $mode)) && !empty($targetcompany->note_public))
+				{
+					$stringaddress .= ($stringaddress ? "\n" : '').dol_string_nohtmltag($targetcompany->note_public);
+				}
+			}
+		}
 	}
 
 	return $stringaddress;
@@ -637,10 +642,10 @@ function pdf_pagehead(&$pdf, $outputlangs, $page_height)
  */
 function pdf_getSubstitutionArray($outputlangs, $exclude = null, $object = null, $onlykey = 0)
 {
-    $substitutionarray = getCommonSubstitutionArray($outputlangs, $onlykey, $exclude, $object);
-    $substitutionarray['__FROM_NAME__'] = '__FROM_NAME__';
-    $substitutionarray['__FROM_EMAIL__'] = '__FROM_EMAIL__';
-    return $substitutionarray;
+	$substitutionarray = getCommonSubstitutionArray($outputlangs, $onlykey, $exclude, $object);
+	$substitutionarray['__FROM_NAME__'] = '__FROM_NAME__';
+	$substitutionarray['__FROM_EMAIL__'] = '__FROM_EMAIL__';
+	return $substitutionarray;
 }
 
 
@@ -745,12 +750,12 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 
 		if (empty($conf->global->PDF_BANK_HIDE_NUMBER_SHOW_ONLY_BICIBAN))    // Note that some countries still need bank number, BIC/IBAN not enougth for them
 		{
-		    // Note:
-		    // bank = code_banque (FR), sort code (GB, IR. Example: 12-34-56)
-		    // desk = code guichet (FR), used only when $usedetailedbban = 1
-		    // number = account number
-		    // key = check control key used only when $usedetailedbban = 1
-    		if (empty($onlynumber)) $pdf->line($curx + 1, $cury + 1, $curx + 1, $cury + 6);
+			// Note:
+			// bank = code_banque (FR), sort code (GB, IR. Example: 12-34-56)
+			// desk = code guichet (FR), used only when $usedetailedbban = 1
+			// number = account number
+			// key = check control key used only when $usedetailedbban = 1
+			if (empty($onlynumber)) $pdf->line($curx + 1, $cury + 1, $curx + 1, $cury + 6);
 
 
 			foreach ($account->getFieldsToShow() as $val)
@@ -791,10 +796,10 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 				if (empty($onlynumber)) {
 					$pdf->line($curx, $cury + 1, $curx, $cury + 7);
 				}
-    		}
+			}
 
-    		$curx = $savcurx;
-    		$cury += 8;
+			$curx = $savcurx;
+			$cury += 8;
 		}
 	} else {
 		$pdf->SetFont('', 'B', $default_font_size - $diffsizecontent);
@@ -812,8 +817,7 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 
 	$pdf->SetFont('', '', $default_font_size - $diffsizecontent);
 
-	if (empty($onlynumber) && !empty($account->domiciliation))
-	{
+	if (empty($onlynumber) && !empty($account->domiciliation)) {
 		$pdf->SetXY($curx, $cury);
 		$val = $outputlangs->transnoentities("Residence").': '.$outputlangs->convToOutputCharset($account->domiciliation);
 		$pdf->MultiCell(100, 3, $val, 0, 'L', 0);
@@ -823,15 +827,15 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 		$cury += $tmpy;
 	}
 
-	if (!empty($account->proprio))
-	{
+	if (!empty($account->proprio)) {
 		$pdf->SetXY($curx, $cury);
 		$val = $outputlangs->transnoentities("BankAccountOwner").': '.$outputlangs->convToOutputCharset($account->proprio);
 		$pdf->MultiCell(100, 3, $val, 0, 'L', 0);
 		$tmpy = $pdf->getStringHeight(100, $val);
 		$cury += $tmpy;
-		$cur += 1;
-	} elseif (!$usedetailedbban) $cury += 1;
+	} elseif (!$usedetailedbban) {
+		$cury += 1;
+	}
 
 	// Use correct name of bank id according to country
 	$ibankey = FormBank::getIBANLabel($account);
@@ -911,7 +915,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 	// First line of company infos
 	$line1 = ""; $line2 = ""; $line3 = ""; $line4 = "";
 
-    if ($showdetails == 1 || $showdetails == 3)
+	if ($showdetails == 1 || $showdetails == 3)
 	{
 		// Company name
 		if ($fromcompany->name)
@@ -1040,16 +1044,16 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 	if ($line)	// Free text
 	{
 		//$line="sample text<br>\nfd<strong>sf</strong>sdf<br>\nghfghg<br>";
-	    if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
+		if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 		{
 			$width = 20000; $align = 'L'; // By default, ask a manual break: We use a large value 20000, to not have automatic wrap. This make user understand, he need to add CR on its text.
-    		if (!empty($conf->global->MAIN_USE_AUTOWRAP_ON_FREETEXT)) {
-    			$width = 200; $align = 'C';
-    		}
-		    $freetextheight = $pdf->getStringHeight($width, $line);
+			if (!empty($conf->global->MAIN_USE_AUTOWRAP_ON_FREETEXT)) {
+				$width = 200; $align = 'C';
+			}
+			$freetextheight = $pdf->getStringHeight($width, $line);
 		} else {
-            $freetextheight = pdfGetHeightForHtmlContent($pdf, dol_htmlentitiesbr($line, 1, 'UTF-8', 0)); // New method (works for HTML content)
-            //print '<br>'.$freetextheight;exit;
+			$freetextheight = pdfGetHeightForHtmlContent($pdf, dol_htmlentitiesbr($line, 1, 'UTF-8', 0)); // New method (works for HTML content)
+			//print '<br>'.$freetextheight;exit;
 		}
 	}
 
@@ -1061,9 +1065,9 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 		$pdf->SetXY($dims['lm'], -$posy);
 		if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))   // by default
 		{
-            $pdf->MultiCell(0, 3, $line, 0, $align, 0);
+			$pdf->MultiCell(0, 3, $line, 0, $align, 0);
 		} else {
-            $pdf->writeHTMLCell($pdf->page_largeur - $pdf->margin_left - $pdf->margin_right, $freetextheight, $dims['lm'], $dims['hk'] - $marginwithfooter, dol_htmlentitiesbr($line, 1, 'UTF-8', 0));
+			$pdf->writeHTMLCell($pdf->page_largeur - $pdf->margin_left - $pdf->margin_right, $freetextheight, $dims['lm'], $dims['hk'] - $marginwithfooter, dol_htmlentitiesbr($line, 1, 'UTF-8', 0));
 		}
 		$posy -= $freetextheight;
 	}
@@ -1135,11 +1139,11 @@ function pdf_writeLinkedObjects(&$pdf, $object, $outputlangs, $posx, $posy, $w,
 	{
 		foreach ($linkedobjects as $linkedobject)
 		{
-		    $reftoshow = $linkedobject["ref_title"].' : '.$linkedobject["ref_value"];
-		    if (!empty($linkedobject["date_value"]))
-		    {
-		        $reftoshow .= ' / '.$linkedobject["date_value"];
-		    }
+			$reftoshow = $linkedobject["ref_title"].' : '.$linkedobject["ref_value"];
+			if (!empty($linkedobject["date_value"]))
+			{
+				$reftoshow .= ' / '.$linkedobject["date_value"];
+			}
 
 			$posy += 3;
 			$pdf->SetXY($posx, $posy);
@@ -1176,7 +1180,7 @@ function pdf_writelinedesc(&$pdf, $object, $i, $outputlangs, $w, $h, $posx, $pos
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
-		$special_code = $object->lines[$i]->special_code;
+		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;
 		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		$parameters = array('pdf'=>$pdf, 'i'=>$i, 'outputlangs'=>$outputlangs, 'w'=>$w, 'h'=>$h, 'posx'=>$posx, 'posy'=>$posy, 'hideref'=>$hideref, 'hidedesc'=>$hidedesc, 'issupplierline'=>$issupplierline, 'special_code'=>$special_code);
 		$action = '';
@@ -1249,13 +1253,15 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			// If we want another language, and if label is same than default language (we did force it to a specific value), we can use translation.
 			//var_dump($outputlangs->defaultlang.' - '.$langs->defaultlang.' - '.$label.' - '.$prodser->label);exit;
 			$textwasmodified = ($label == $prodser->label);
-			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && ($textwasmodified || $translatealsoifmodified))     $label = $prodser->multilangs[$outputlangs->defaultlang]["label"];
+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && ($textwasmodified || $translatealsoifmodified)) {
+				$label = $prodser->multilangs[$outputlangs->defaultlang]["label"];
+			}
 
 			// Set desc
 			// Manage HTML entities description test because $prodser->description is store with htmlentities but $desc no
 			$textwasmodified = false;
 			if (!empty($desc) && dol_textishtml($desc) && !empty($prodser->description) && dol_textishtml($prodser->description)) {
-				$textwasmodified = (strpos(dol_html_entity_decode($desc, ENT_QUOTES | ENT_HTML401), dol_html_entity_decode($prodser->description, ENT_QUOTES | ENT_HTML401)) !== false);
+				$textwasmodified = (strpos(dol_html_entity_decode($desc, ENT_QUOTES | ENT_HTML5), dol_html_entity_decode($prodser->description, ENT_QUOTES | ENT_HTML5)) !== false);
 			} else {
 				$textwasmodified = ($desc == $prodser->description);
 			}
@@ -1273,6 +1279,20 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 
 	// Description short of product line
 	$libelleproduitservice = $label;
+	if (!empty($libelleproduitservice) && !empty($conf->global->PDF_BOLD_PRODUCT_LABEL)) {
+		$libelleproduitservice = '<b>'.$libelleproduitservice.'</b>';
+	}
+
+	// Add ref of subproducts
+	if (!empty($conf->global->SHOW_SUBPRODUCT_REF_IN_PDF)) {
+		$prodser->get_sousproduits_arbo();
+		if (!empty($prodser->sousprods) && is_array($prodser->sousprods) && count($prodser->sousprods)) {
+			$tmparrayofsubproducts = reset($prodser->sousprods);
+			foreach ($tmparrayofsubproducts as $subprodval) {
+				$libelleproduitservice .= "\n * ".$subprodval[5].(($subprodval[5] && $subprodval[3]) ? ' - ' : '').$subprodval[3].' ('.$subprodval[1].')';
+			}
+		}
+	}
 
 	// Description long of product line
 	if (!empty($desc) && ($desc != $label))
@@ -1307,15 +1327,23 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			$discount->fetch($object->lines[$i]->fk_remise_except);
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid", $discount->ref_invoice_supplier_source);
 		} else {
-			if ($idprod)
-			{
-				if (empty($hidedesc))
-				{
-					if (!empty($conf->global->MAIN_DOCUMENTS_DESCRIPTION_FIRST))
-					{
+			if ($idprod) {
+				// Check if description must be output
+				if (!empty($object->element)) {
+					$tmpkey = 'MAIN_DOCUMENTS_HIDE_DESCRIPTION_FOR_'.strtoupper($object->element);
+					if (!empty($conf->global->$tmpkey)) {
+						$hidedesc = 1;
+					}
+				}
+				if (empty($hidedesc)) {
+					if (!empty($conf->global->MAIN_DOCUMENTS_DESCRIPTION_FIRST)) {
 						$libelleproduitservice = $desc."\n".$libelleproduitservice;
 					} else {
-						$libelleproduitservice .= $desc;
+						if (!empty($conf->global->HIDE_LABEL_VARIANT_PDF) && $prodser->isVariant()) {
+							$libelleproduitservice = $desc;
+						} else {
+							$libelleproduitservice .= $desc;
+						}
 					}
 				}
 			} else {
@@ -1327,28 +1355,23 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 	// We add ref of product (and supplier ref if defined)
 	$prefix_prodserv = "";
 	$ref_prodserv = "";
-	if (!empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS))   // In standard mode, we do not show this
-	{
-		if ($prodser->isService())
-		{
+	if (!empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS)) {   // In standard mode, we do not show this
+		if ($prodser->isService()) {
 			$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." ";
 		} else {
 			$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Product")." ";
 		}
 	}
 
-	if (empty($hideref))
-	{
-		if ($issupplierline)
-		{
-			if ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 1)
-				$ref_prodserv = $ref_supplier;
-			elseif ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 2)
-				$ref_prodserv = $ref_supplier.' ('.$outputlangs->transnoentitiesnoconv("InternalRef").' '.$prodser->ref.')';
-			else // Common case
-			{
+	if (empty($hideref)) {
+		if ($issupplierline) {
+			if (empty($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES)) {  // Common case
 				$ref_prodserv = $prodser->ref; // Show local ref
 				if ($ref_supplier) $ref_prodserv .= ($prodser->ref ? ' (' : '').$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.($prodser->ref ? ')' : '');
+			} elseif ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 1) {
+				$ref_prodserv = $ref_supplier;
+			} elseif ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 2) {
+				$ref_prodserv = $ref_supplier.' ('.$outputlangs->transnoentitiesnoconv("InternalRef").' '.$prodser->ref.')';
 			}
 		} else {
 			$ref_prodserv = $prodser->ref; // Show local ref only
@@ -1379,7 +1402,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 	if (!empty($object->lines[$i]->date_start) || !empty($object->lines[$i]->date_end))
 	{
 		$format = 'day';
-        $period = '';
+		$period = '';
 		// Show duration if exists
 		if ($object->lines[$i]->date_start && $object->lines[$i]->date_end)
 		{
@@ -1395,9 +1418,9 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		}
 		//print '>'.$outputlangs->charset_output.','.$period;
 		if (!empty($conf->global->PDF_BOLD_PRODUCT_REF_AND_PERIOD)) {
-		    $libelleproduitservice .= '<b style="color:#333666;" ><em>'."__N__</b> ".$period.'</em>';
+			$libelleproduitservice .= '<b style="color:#333666;" ><em>'."__N__</b> ".$period.'</em>';
 		} else {
-		    $libelleproduitservice .= "__N__".$period;
+			$libelleproduitservice .= "__N__".$period;
 		}
 		//print $libelleproduitservice;
 	}
@@ -1613,7 +1636,7 @@ function pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails = 0)
 	{
 		if (empty($hidedetails) || $hidedetails > 1)
 		{
-			$subprice = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_subprice : $object->lines[$i]->subprice);
+			$subprice = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_subprice : $object->lines[$i]->subprice);
 			$result .= price($sign * $subprice, 0, $outputlangs);
 		}
 	}
@@ -1682,10 +1705,10 @@ function pdf_getlineqty($object, $i, $outputlangs, $hidedetails = 0)
 
 		if (!empty($hookmanager->resPrint)) $result = $hookmanager->resPrint;
 	}
-    if (empty($reshook))
+	if (empty($reshook))
 	{
-	    if ($object->lines[$i]->special_code == 3) return '';
-	    if (empty($hidedetails) || $hidedetails > 1) $result .= $object->lines[$i]->qty;
+		if ($object->lines[$i]->special_code == 3) return '';
+		if (empty($hidedetails) || $hidedetails > 1) $result .= $object->lines[$i]->qty;
 	}
 	return $result;
 }
@@ -1718,8 +1741,8 @@ function pdf_getlineqty_asked($object, $i, $outputlangs, $hidedetails = 0)
 	}
 	if (empty($reshook))
 	{
-        if ($object->lines[$i]->special_code == 3) return '';
-        if (empty($hidedetails) || $hidedetails > 1) $result .= $object->lines[$i]->qty_asked;
+		if ($object->lines[$i]->special_code == 3) return '';
+		if (empty($hidedetails) || $hidedetails > 1) $result .= $object->lines[$i]->qty_asked;
 	}
 	return $result;
 }
@@ -1752,8 +1775,8 @@ function pdf_getlineqty_shipped($object, $i, $outputlangs, $hidedetails = 0)
 	}
 	if (empty($reshook))
 	{
-        if ($object->lines[$i]->special_code == 3) return '';
-	    if (empty($hidedetails) || $hidedetails > 1) $result .= $object->lines[$i]->qty_shipped;
+		if ($object->lines[$i]->special_code == 3) return '';
+		if (empty($hidedetails) || $hidedetails > 1) $result .= $object->lines[$i]->qty_shipped;
 	}
 	return $result;
 }
@@ -1772,8 +1795,8 @@ function pdf_getlineqty_keeptoship($object, $i, $outputlangs, $hidedetails = 0)
 	global $hookmanager;
 
 	$reshook = 0;
-    $result = '';
-    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	$result = '';
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
@@ -1786,7 +1809,7 @@ function pdf_getlineqty_keeptoship($object, $i, $outputlangs, $hidedetails = 0)
 	}
 	if (empty($reshook))
 	{
-        if ($object->lines[$i]->special_code == 3) return '';
+		if ($object->lines[$i]->special_code == 3) return '';
 		if (empty($hidedetails) || $hidedetails > 1) $result .= ($object->lines[$i]->qty_asked - $object->lines[$i]->qty_shipped);
 	}
 	return $result;
@@ -1807,8 +1830,8 @@ function pdf_getlineunit($object, $i, $outputlangs, $hidedetails = 0, $hookmanag
 	global $langs;
 
 	$reshook = 0;
-    $result = '';
-    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	$result = '';
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
@@ -1828,7 +1851,7 @@ function pdf_getlineunit($object, $i, $outputlangs, $hidedetails = 0, $hookmanag
 	}
 	if (empty($reshook))
 	{
-	    if (empty($hidedetails) || $hidedetails > 1) $result .= $langs->transnoentitiesnoconv($object->lines[$i]->getLabelOfUnit('short'));
+		if (empty($hidedetails) || $hidedetails > 1) $result .= $langs->transnoentitiesnoconv($object->lines[$i]->getLabelOfUnit('short'));
 	}
 	return $result;
 }
@@ -1864,8 +1887,8 @@ function pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails = 0)
 	}
 	if (empty($reshook))
 	{
-        if ($object->lines[$i]->special_code == 3) return '';
-	    if (empty($hidedetails) || $hidedetails > 1) $result .= dol_print_reduction($object->lines[$i]->remise_percent, $outputlangs);
+		if ($object->lines[$i]->special_code == 3) return '';
+		if (empty($hidedetails) || $hidedetails > 1) $result .= dol_print_reduction($object->lines[$i]->remise_percent, $outputlangs);
 	}
 	return $result;
 }
@@ -1886,8 +1909,8 @@ function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookm
 	global $conf;
 
 	$reshook = 0;
-    $result = '';
-    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	$result = '';
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
@@ -1900,7 +1923,7 @@ function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookm
 	}
 	if (empty($reshook))
 	{
-        	if ($object->lines[$i]->special_code == 3) return '';
+			if ($object->lines[$i]->special_code == 3) return '';
 		if (empty($hidedetails) || $hidedetails > 1)
 		{
 			if ($conf->global->SITUATION_DISPLAY_DIFF_ON_PDF)
@@ -1946,32 +1969,32 @@ function pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails = 0)
 
 		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;
 	}
-    if (empty($reshook))
-    {
-	    if ($object->lines[$i]->special_code == 3)
-    	{
-    		return $outputlangs->transnoentities("Option");
-    	}
-        if (empty($hidedetails) || $hidedetails > 1)
-        {
-        	$total_ht = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ht : $object->lines[$i]->total_ht);
-        	if ($object->lines[$i]->situation_percent > 0)
-        	{
-        	    // TODO Remove this. The total should be saved correctly in database instead of being modified here.
-        		$prev_progress = 0;
-        		$progress = 1;
-        		if (method_exists($object->lines[$i], 'get_prev_progress'))
-        		{
+	if (empty($reshook))
+	{
+		if ($object->lines[$i]->special_code == 3)
+		{
+			$result .= $outputlangs->transnoentities("Option");
+		}
+		elseif (empty($hidedetails) || $hidedetails > 1)
+		{
+			$total_ht = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ht : $object->lines[$i]->total_ht);
+			if (!empty($object->lines[$i]->situation_percent) && $object->lines[$i]->situation_percent > 0)
+			{
+				// TODO Remove this. The total should be saved correctly in database instead of being modified here.
+				$prev_progress = 0;
+				$progress = 1;
+				if (method_exists($object->lines[$i], 'get_prev_progress'))
+				{
 					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
 					$progress = ($object->lines[$i]->situation_percent - $prev_progress) / 100;
-        		}
+				}
 				$result .= price($sign * ($total_ht / ($object->lines[$i]->situation_percent / 100)) * $progress, 0, $outputlangs);
-        	} else {
-                $result .= price($sign * $total_ht, 0, $outputlangs);
-        	}
-        }
-    }
-    return $result;
+			} else {
+				$result .= price($sign * $total_ht, 0, $outputlangs);
+			}
+		}
+	}
+	return $result;
 }
 
 /**
@@ -2006,9 +2029,27 @@ function pdf_getlinetotalwithtax($object, $i, $outputlangs, $hidedetails = 0)
 	if (empty($reshook))
 	{
 		if ($object->lines[$i]->special_code == 3)
-    	{
-    		$result .= $outputlangs->transnoentities("Option");
-    	} elseif (empty($hidedetails) || $hidedetails > 1) $result .= price($sign * ($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht) * ($object->lines[$i]->tva_tx) / 100, 0, $outputlangs);
+		{
+			$result .= $outputlangs->transnoentities("Option");
+		}
+		elseif (empty($hidedetails) || $hidedetails > 1)
+		{
+			$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ttc : $object->lines[$i]->total_ttc);
+			if ($object->lines[$i]->situation_percent > 0)
+			{
+				// TODO Remove this. The total should be saved correctly in database instead of being modified here.
+				$prev_progress = 0;
+				$progress = 1;
+				if (method_exists($object->lines[$i], 'get_prev_progress'))
+				{
+					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
+					$progress = ($object->lines[$i]->situation_percent - $prev_progress) / 100;
+				}
+				$result .= price($sign * ($total_ttc / ($object->lines[$i]->situation_percent / 100)) * $progress, 0, $outputlangs);
+			} else {
+				$result .= price($sign * $total_ttc, 0, $outputlangs);
+			}
+		}
 	}
 	return $result;
 }
@@ -2076,10 +2117,10 @@ function pdf_getLinkedObjects($object, $outputlangs)
 
 	foreach ($object->linkedObjects as $objecttype => $objects)
 	{
-	    if ($objecttype == 'facture')
-	    {
-	        // For invoice, we don't want to have a reference line on document. Image we are using recuring invoice, we will have a line longer than document width.
-	    } elseif ($objecttype == 'propal' || $objecttype == 'supplier_proposal')
+		if ($objecttype == 'facture')
+		{
+			// For invoice, we don't want to have a reference line on document. Image we are using recuring invoice, we will have a line longer than document width.
+		} elseif ($objecttype == 'propal' || $objecttype == 'supplier_proposal')
 		{
 			$outputlangs->load('propal');
 
@@ -2126,34 +2167,34 @@ function pdf_getLinkedObjects($object, $outputlangs)
 
 			foreach ($objects as $x => $elementobject)
 			{
-			    $order = null;
-			    // We concat this record info into fields xxx_value. title is overwrote.
-			    if (empty($object->linkedObjects['commande']) && $object->element != 'commande')	// There is not already a link to order and object is not the order, so we show also info with order
-			    {
-			        $elementobject->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0);
-			        if (! empty($elementobject->linkedObjectsIds['commande'])){
+				$order = null;
+				// We concat this record info into fields xxx_value. title is overwrote.
+				if (empty($object->linkedObjects['commande']) && $object->element != 'commande')	// There is not already a link to order and object is not the order, so we show also info with order
+				{
+					$elementobject->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0);
+					if (!empty($elementobject->linkedObjectsIds['commande'])) {
 						include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 						$order = new Commande($db);
 						$ret = $order->fetch(reset($elementobject->linkedObjectsIds['commande']));
-						if ($ret < 1) { $order=null; }
+						if ($ret < 1) { $order = null; }
 					}
-			    }
-			    if (!is_object($order))
-			    {
-			        $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
-			        if (!empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] .= ' / ';
-			        $linkedobjects[$objecttype]['ref_value'] .= $outputlangs->transnoentities($elementobject->ref);
-			        //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateShipment");
-			        //if (! empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'].=' / ';
-			        //$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
-			    } else {
-			        $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending");
-			        if (empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : '');
-			        $linkedobjects[$objecttype]['ref_value'] .= ' / '.$outputlangs->transnoentities($elementobject->ref);
-			        //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateShipment") : '');
-			        //if (empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
-			        //$linkedobjects[$objecttype]['date_value'].= ($elementobject->date_delivery ? ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs) : '');
-			    }
+				}
+				if (!is_object($order))
+				{
+					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
+					if (!empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] .= ' / ';
+					$linkedobjects[$objecttype]['ref_value'] .= $outputlangs->transnoentities($elementobject->ref);
+					//$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateShipment");
+					//if (! empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'].=' / ';
+					//$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
+				} else {
+					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending");
+					if (empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : '');
+					$linkedobjects[$objecttype]['ref_value'] .= ' / '.$outputlangs->transnoentities($elementobject->ref);
+					//$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateShipment") : '');
+					//if (empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
+					//$linkedobjects[$objecttype]['date_value'].= ($elementobject->date_delivery ? ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs) : '');
+				}
 			}
 		}
 	}
diff --git a/htdocs/core/lib/phpsessionindb.lib.php b/htdocs/core/lib/phpsessionindb.lib.php
new file mode 100644
index 00000000000..132036ba23d
--- /dev/null
+++ b/htdocs/core/lib/phpsessionindb.lib.php
@@ -0,0 +1,165 @@
+<?php
+/* Copyright (C) 2020 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ *  \file		htdocs/core/lib/phpsessionindb.lib.php
+ *  \ingroup    core
+ *  \brief		Set function handlers for PHP session management in DB.
+ */
+
+// The session handler file must be included just after the call of the master.inc.php into main.inc.php
+// The $conf is already defined from conf.php file.
+// To use it set in your PHP.ini:  session.save_handler = user
+
+/**
+ * The session open handler called by PHP whenever a session is initialized.
+ *
+ * @param	string	$database_name  Database NamedConstraint
+ * @param	string	$table_name		Table name
+ * @return	boolean					Always true
+ */
+function dolSessionOpen($database_name, $table_name)
+{
+	global $conf, $dbsession;
+
+	$dbsession = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);
+
+	return true;
+}
+
+/**
+ * This function is called whenever a session_start() call is made and reads the session variables.
+ *
+ * @param	string		$sess_id	Session ID
+ * @return	string					Returns "" when a session is not found  or (serialized)string if session exists
+ */
+function dolSessionRead($sess_id)
+{
+	global $dbsession;
+
+	$sql = "SELECT session_variable FROM ".MAIN_DB_PREFIX."session";
+	$sql .= " WHERE session_id = '".$dbsession->escape($sess_id)."'";
+
+	// Execute the query
+	$resql = $dbsession->query($sql);
+	$num_rows = $dbsession->num_rows($resql);
+	if ($num_rows == 0) {
+		// No session found - return an empty string
+		return '';
+	} else {
+		// Found a session - return the serialized string
+		$obj = $dbsession->fetch_object($resql);
+		return $obj->session_variable;
+	}
+}
+
+/**
+ * This function is called when a session is initialized with a session_start(  ) call, when variables are registered or unregistered,
+ * and when session variables are modified. Returns true on success.
+ *
+ * @param	string		$sess_id		Session iDecodeStream
+ * @param	string		$val			Content of session
+ * @return	boolean						Always true
+ */
+function dolSessionWrite($sess_id, $val)
+{
+	global $dbsession;
+
+	$time_stamp = dol_now();
+
+	$sql = "SELECT session_id FROM ".MAIN_DB_PREFIX."session";
+	$sql .= " WHERE session_id = '".$dbsession->escape($sess_id)."'";
+
+	// Execute the query
+	$resql = $dbsession->query($sql);
+	$num_rows = $dbsession->num_rows($resql);
+	if ($num_rows == 0) {
+		// No session found, insert a new one
+		$insert_query = "INSERT INTO ".MAIN_DB_PREFIX."session";
+		$insert_query .= "(session_id, session_variable, last_accessed)";
+		$insert_query .= " VALUES ('".$dbsession->escape($sess_id)."', '".$dbsession->escape($val)."', '".$dbsession->idate($time_stamp)."')";
+		$dbsession->query($insert_query);
+	} else {
+		// Existing session found - Update the session variables
+		$update_query = "UPDATE ".MAIN_DB_PREFIX."session";
+		$update_query .= "SET session_variable = '".$dbsession->escape($val)."',";
+		$update_query .= " last_accessed = '".$dbsession->idate($time_stamp)."'";
+		$update_query .= " WHERE session_id = '".$dbsession->escape($sess_id)."'";
+		$dbsession->query($update_query);
+	}
+	return true;
+}
+
+/**
+ * This function is executed on shutdown of the session.
+ *
+ * @param	string		$sess_id	Session ID
+ * @return	boolean					Always returns true.
+ */
+function dolSessionClose($sess_id)
+{
+	global $dbsession;
+
+	$dbsession->close();
+
+	return true;
+}
+
+/**
+ * This is called whenever the session_destroy() function call is made. Returns true if the session has successfully been deleted.
+ *
+ * @param	string	$sess_id		Session iDecodeStream
+ * @return	boolean					Always true
+ */
+function dolSessionDestroy($sess_id)
+{
+	global $dbsession;
+
+	$delete_query = "DELETE FROM ".MAIN_DB_PREFIX."session";
+	$delete_query .= " WHERE session_id = '".$dbsession->escape($sess_id)."'";
+	$dbsession->query($delete_query);
+
+	return true;
+}
+
+/**
+ * This function is called on a session's start up with the probability specified in session.gc_probability.
+ * Performs garbage collection by removing all sessions that haven't been updated in the last $max_lifetime seconds as set in session.gc_maxlifetime.
+ *
+ * @param	int		$max_lifetime		Max lifetime
+ * @return	boolean						true if the DELETE query succeeded.
+ */
+function dolSessionGC($max_lifetime)
+{
+	global $dbsession;
+
+	$time_stamp = dol_now();
+
+	$delete_query = "DELETE FROM ".MAIN_DB_PREFIX."session";
+	$delete_query .= " WHERE last_accessed < '".$dbsession->idate($time_stamp - $max_lifetime)."'";
+
+	$resql = $dbsession->query($delete_query);
+	if ($resql) {
+		return true;
+	} else {
+		return false;
+	}
+}
+
+// Call to register user call back functions.
+session_set_save_handler("dolSessionOpen", "dolSessionClose", "dolSessionRead", "dolSessionWrite", "dolSessionDestroy", "dolSessionGC");
diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index ea80732ae41..ce14295b4b2 100644
--- a/htdocs/core/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -103,10 +103,14 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 		$seller = $mysoc; // If sell is done to a customer, $seller is not provided, we use $mysoc
 		//var_dump($seller->country_id);exit;
 	}
-	if (empty($localtaxes_array) || !is_array($localtaxes_array))
-	{
+	if (empty($localtaxes_array) || !is_array($localtaxes_array)) {
 		dol_syslog("Price.lib::calcul_price_total Warning: function is called with parameter localtaxes_array that is missing", LOG_WARNING);
 	}
+	if (!is_numeric($txtva)) {
+		dol_syslog("Price.lib::calcul_price_total Warning: function was called with a parameter vat rate that is not a real numeric value. There is surely a bug.", LOG_ERR);
+	} elseif ($txtva >= 1000) {
+		dol_syslog("Price.lib::calcul_price_total Warning: function was called with a bad value for vat rate (should be often < 100, always < 1000). There is surely a bug.", LOG_ERR);
+	}
 	// Too verbose. Enable for debug only
 	//dol_syslog("Price.lib::calcul_price_total qty=".$qty." pu=".$pu." remiserpercent_ligne=".$remise_percent_ligne." txtva=".$txtva." uselocaltax1_rate=".$uselocaltax1_rate." uselocaltax2_rate=".$uselocaltax2_rate.' remise_percent_global='.$remise_percent_global.' price_base_type='.$ice_base_type.' type='.$type.' progress='.$progress);
 
@@ -121,21 +125,21 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 	//var_dump($uselocaltax1_rate.' - '.$uselocaltax2_rate);
 	dol_syslog('Price.lib::calcul_price_total qty='.$qty.' pu='.$pu.' remise_percent_ligne='.$remise_percent_ligne.' txtva='.$txtva.' uselocaltax1_rate='.$uselocaltax1_rate.' uselocaltax2_rate='.$uselocaltax2_rate.' remise_percent_global='.$remise_percent_global.' price_base_type='.$price_base_type.' type='.$type.' progress='.$progress);
 
-    // Now we search localtaxes information ourself (rates and types).
+	// Now we search localtaxes information ourself (rates and types).
 	$localtax1_type = 0;
 	$localtax2_type = 0;
 
-	if (is_array($localtaxes_array))
-	{
+	if (is_array($localtaxes_array)) {
 		$localtax1_type = $localtaxes_array[0];
 		$localtax1_rate = $localtaxes_array[1];
 		$localtax2_type = $localtaxes_array[2];
 		$localtax2_rate = $localtaxes_array[3];
-	} else // deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate using the full vat rate (including text code)
-	{
-	    dol_syslog("Price.lib::calcul_price_total search vat information using old deprecated method", LOG_WARNING);
+	} else {
+		// deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate using the full vat rate (including text code)
+		// also, with this method, we may get several possible values (for example with localtax2 in spain), so we take the first one.
+		dol_syslog("Price.lib::calcul_price_total search vat information using old deprecated method", LOG_WARNING);
 
-	    $sql = "SELECT taux, localtax1, localtax2, localtax1_type, localtax2_type";
+		$sql = "SELECT taux, localtax1, localtax2, localtax1_type, localtax2_type";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as cv";
 		$sql .= " WHERE cv.taux = ".$txtva;
 		$sql .= " AND cv.fk_pays = ".$countryid;
@@ -145,11 +149,11 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 			$obj = $db->fetch_object($resql);
 			if ($obj)
 			{
-				$localtax1_rate = $obj->localtax1;
-				$localtax2_rate = $obj->localtax2;
+				$localtax1_rate = (float) $obj->localtax1;		// Use float to force to get first numeric value when value is x:y:z
+				$localtax2_rate = (float) $obj->localtax2;		// Use float to force to get first numeric value when value is -19:-15:-9
 				$localtax1_type = $obj->localtax1_type;
 				$localtax2_type = $obj->localtax2_type;
-				//var_dump($localtax1_rate.' '.$localtax2_rate.' '.$localtax1_type.' '.$localtax2_type);exit;
+				//var_dump($localtax1_rate.' '.$localtax2_rate.' '.$localtax1_type.' '.$localtax2_type);
 			}
 		} else dol_print_error($db);
 	}
@@ -182,35 +186,35 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 
 	// if there's some localtax including vat, we calculate localtaxes (we will add later)
 
-    // if input unit price is 'HT', we need to have the totals with main VAT for a correct calculation
-    if ($price_base_type != 'TTC')
-    {
-    	$tot_sans_remise_wt = price2num($tot_sans_remise * (1 + ($txtva / 100)), 'MU');
-    	$tot_avec_remise_wt = price2num($tot_avec_remise * (1 + ($txtva / 100)), 'MU');
-    	$pu_wt = price2num($pu * (1 + ($txtva / 100)), 'MU');
-    } else {
-    	$tot_sans_remise_wt = $tot_sans_remise;
-    	$tot_avec_remise_wt = $tot_avec_remise;
-    	$pu_wt = $pu;
-    }
+	// if input unit price is 'HT', we need to have the totals with main VAT for a correct calculation
+	if ($price_base_type != 'TTC')
+	{
+		$tot_sans_remise_wt = price2num($tot_sans_remise * (1 + ($txtva / 100)), 'MU');
+		$tot_avec_remise_wt = price2num($tot_avec_remise * (1 + ($txtva / 100)), 'MU');
+		$pu_wt = price2num($pu * (1 + ($txtva / 100)), 'MU');
+	} else {
+		$tot_sans_remise_wt = $tot_sans_remise;
+		$tot_avec_remise_wt = $tot_avec_remise;
+		$pu_wt = $pu;
+	}
 
 	//print 'rr'.$price_base_type.'-'.$txtva.'-'.$tot_sans_remise_wt."-".$pu_wt."-".$uselocaltax1_rate."-".$localtax1_rate."-".$localtax1_type."\n";
 
-    $localtaxes = array(0, 0, 0);
-    $apply_tax = false;
-    switch ($localtax1_type) {
-        case '2':     // localtax on product or service
-            $apply_tax = true;
-            break;
-        case '4':     // localtax on product
-            if ($type == 0) $apply_tax = true;
-            break;
-        case '6':     // localtax on service
-            if ($type == 1) $apply_tax = true;
-            break;
-    }
+	$localtaxes = array(0, 0, 0);
+	$apply_tax = false;
+	switch ($localtax1_type) {
+		case '2':     // localtax on product or service
+			$apply_tax = true;
+			break;
+		case '4':     // localtax on product
+			if ($type == 0) $apply_tax = true;
+			break;
+		case '6':     // localtax on service
+			if ($type == 1) $apply_tax = true;
+			break;
+	}
 
-    if ($uselocaltax1_rate && $apply_tax) {
+	if ($uselocaltax1_rate && $apply_tax) {
   		$result[14] = price2num(($tot_sans_remise_wt * (1 + ($localtax1_rate / 100))) - $tot_sans_remise_wt, 'MT');
   		$localtaxes[0] += $result[14];
 
@@ -219,21 +223,21 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 
   		$result[11] = price2num(($pu_wt * (1 + ($localtax1_rate / 100))) - $pu_wt, 'MU');
   		$localtaxes[2] += $result[11];
-    }
+	}
 
-    $apply_tax = false;
-    switch ($localtax2_type) {
-        case '2':     // localtax on product or service
-            $apply_tax = true;
-            break;
-        case '4':     // localtax on product
-            if ($type == 0) $apply_tax = true;
-            break;
-        case '6':     // localtax on service
-            if ($type == 1) $apply_tax = true;
-            break;
-    }
-    if ($uselocaltax2_rate && $apply_tax) {
+	$apply_tax = false;
+	switch ($localtax2_type) {
+		case '2':     // localtax on product or service
+			$apply_tax = true;
+			break;
+		case '4':     // localtax on product
+			if ($type == 0) $apply_tax = true;
+			break;
+		case '6':     // localtax on service
+			if ($type == 1) $apply_tax = true;
+			break;
+	}
+	if ($uselocaltax2_rate && $apply_tax) {
   		$result[15] = price2num(($tot_sans_remise_wt * (1 + ($localtax2_rate / 100))) - $tot_sans_remise_wt, 'MT');
   		$localtaxes[0] += $result[15];
 
@@ -242,7 +246,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 
   		$result[12] = price2num(($pu_wt * (1 + ($localtax2_rate / 100))) - $pu_wt, 'MU');
   		$localtaxes[2] += $result[12];
-    }
+	}
 
 	//dol_syslog("price.lib::calcul_price_total $qty, $pu, $remise_percent_ligne, $txtva, $price_base_type $info_bits");
 	if ($price_base_type == 'HT')
@@ -282,27 +286,27 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 
 	// if there's some localtax without vat, we calculate localtaxes (we will add them at end)
 
-    //If input unit price is 'TTC', we need to have the totals without main VAT for a correct calculation
-    if ($price_base_type == 'TTC')
-    {
-    	$tot_sans_remise = price2num($tot_sans_remise / (1 + ($txtva / 100)), 'MU');
-    	$tot_avec_remise = price2num($tot_avec_remise / (1 + ($txtva / 100)), 'MU');
-    	$pu = price2num($pu / (1 + ($txtva / 100)), 'MU');
-    }
+	//If input unit price is 'TTC', we need to have the totals without main VAT for a correct calculation
+	if ($price_base_type == 'TTC')
+	{
+		$tot_sans_remise = price2num($tot_sans_remise / (1 + ($txtva / 100)), 'MU');
+		$tot_avec_remise = price2num($tot_avec_remise / (1 + ($txtva / 100)), 'MU');
+		$pu = price2num($pu / (1 + ($txtva / 100)), 'MU');
+	}
 
 	$apply_tax = false;
-    switch ($localtax1_type) {
-        case '1':     // localtax on product or service
-            $apply_tax = true;
-            break;
-        case '3':     // localtax on product
-            if ($type == 0) $apply_tax = true;
-            break;
-        case '5':     // localtax on service
-            if ($type == 1) $apply_tax = true;
-            break;
-    }
-    if ($uselocaltax1_rate && $apply_tax) {
+	switch ($localtax1_type) {
+		case '1':     // localtax on product or service
+			$apply_tax = true;
+			break;
+		case '3':     // localtax on product
+			if ($type == 0) $apply_tax = true;
+			break;
+		case '5':     // localtax on service
+			if ($type == 1) $apply_tax = true;
+			break;
+	}
+	if ($uselocaltax1_rate && $apply_tax) {
   		$result[14] = price2num(($tot_sans_remise * (1 + ($localtax1_rate / 100))) - $tot_sans_remise, 'MT'); // amount tax1 for total_ht_without_discount
   		$result[8] += $result[14]; // total_ttc_without_discount + tax1
 
@@ -311,21 +315,21 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 
   		$result[11] = price2num(($pu * (1 + ($localtax1_rate / 100))) - $pu, 'MU'); // amount tax1 for pu_ht
   		$result[5] += $result[11]; // pu_ht + tax1
-    }
+	}
 
-    $apply_tax = false;
-    switch ($localtax2_type) {
-        case '1':     // localtax on product or service
-            $apply_tax = true;
-            break;
-        case '3':     // localtax on product
-            if ($type == 0) $apply_tax = true;
-            break;
-        case '5':     // localtax on service
-            if ($type == 1) $apply_tax = true;
-            break;
-    }
-    if ($uselocaltax2_rate && $apply_tax) {
+	$apply_tax = false;
+	switch ($localtax2_type) {
+		case '1':     // localtax on product or service
+			$apply_tax = true;
+			break;
+		case '3':     // localtax on product
+			if ($type == 0) $apply_tax = true;
+			break;
+		case '5':     // localtax on service
+			if ($type == 1) $apply_tax = true;
+			break;
+	}
+	if ($uselocaltax2_rate && $apply_tax) {
   		$result[15] = price2num(($tot_sans_remise * (1 + ($localtax2_rate / 100))) - $tot_sans_remise, 'MT'); // amount tax2 for total_ht_without_discount
   		$result[8] += $result[15]; // total_ttc_without_discount + tax2
 
@@ -334,7 +338,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 
   		$result[12] = price2num(($pu * (1 + ($localtax2_rate / 100))) - $pu, 'MU'); // amount tax2 for pu_ht
   		$result[5] += $result[12]; // pu_ht + tax2
-    }
+	}
 
 	// If rounding is not using base 10 (rare)
 	if (!empty($conf->global->MAIN_ROUNDING_RULE_TOT))
@@ -413,7 +417,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 	// initialize result array
 	//for ($i=0; $i <= 18; $i++) $result[$i] = (float) $result[$i];
 
-	dol_syslog('Price.lib::calcul_price_total MAIN_ROUNDING_RULE_TOT='.$conf->global->MAIN_ROUNDING_RULE_TOT.' pu='.$pu.' qty='.$qty.' price_base_type='.$price_base_type.' total_ht='.$result[0].'-total_vat='.$result[1].'-total_ttc='.$result[2]);
+	dol_syslog('Price.lib::calcul_price_total MAIN_ROUNDING_RULE_TOT='.(empty($conf->global->MAIN_ROUNDING_RULE_TOT)?'':$conf->global->MAIN_ROUNDING_RULE_TOT).' pu='.$pu.' qty='.$qty.' price_base_type='.$price_base_type.' total_ht='.$result[0].'-total_vat='.$result[1].'-total_ttc='.$result[2]);
 
 	return $result;
 }
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index dfc57313add..909e51dc6d7 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -50,23 +50,23 @@ function product_prepare_head($object)
 
 	if (!empty($object->status))
 	{
-    	$head[$h][0] = DOL_URL_ROOT."/product/price.php?id=".$object->id;
-    	$head[$h][1] = $langs->trans("SellingPrices");
-    	$head[$h][2] = 'price';
-    	$h++;
+		$head[$h][0] = DOL_URL_ROOT."/product/price.php?id=".$object->id;
+		$head[$h][1] = $langs->trans("SellingPrices");
+		$head[$h][2] = 'price';
+		$h++;
 	}
 
 	if (!empty($object->status_buy) || (!empty($conf->margin->enabled) && !empty($object->status)))   // If margin is on and product on sell, we may need the cost price even if product os not on purchase
 	{
-    	if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->lire)
-    	|| (!empty($conf->margin->enabled) && $user->rights->margin->liretous)
-    	)
-    	{
-    		$head[$h][0] = DOL_URL_ROOT."/product/fournisseurs.php?id=".$object->id;
-    		$head[$h][1] = $langs->trans("BuyingPrices");
-    		$head[$h][2] = 'suppliers';
-    		$h++;
-    	}
+		if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->lire)
+		|| (!empty($conf->margin->enabled) && $user->rights->margin->liretous)
+		)
+		{
+			$head[$h][0] = DOL_URL_ROOT."/product/fournisseurs.php?id=".$object->id;
+			$head[$h][1] = $langs->trans("BuyingPrices");
+			$head[$h][2] = 'suppliers';
+			$h++;
+		}
 	}
 
 	// Multilangs
@@ -90,16 +90,6 @@ function product_prepare_head($object)
 		$h++;
 	}
 
-	$head[$h][0] = DOL_URL_ROOT."/product/stats/card.php?id=".$object->id;
-	$head[$h][1] = $langs->trans('Statistics');
-	$head[$h][2] = 'stats';
-	$h++;
-
-	$head[$h][0] = DOL_URL_ROOT."/product/stats/facture.php?showmessage=1&id=".$object->id;
-	$head[$h][1] = $langs->trans('Referers');
-	$head[$h][2] = 'referers';
-	$h++;
-
 	if (!empty($conf->variants->enabled) && ($object->isProduct() || $object->isService())) {
 		global $db;
 
@@ -107,97 +97,107 @@ function product_prepare_head($object)
 
 		$prodcomb = new ProductCombination($db);
 
-		if ($prodcomb->fetchByFkProductChild($object->id) == -1)
+		if ($prodcomb->fetchByFkProductChild($object->id) <= 0)
 		{
 			$head[$h][0] = DOL_URL_ROOT."/variants/combinations.php?id=".$object->id;
 			$head[$h][1] = $langs->trans('ProductCombinations');
 			$head[$h][2] = 'combinations';
 			$nbVariant = $prodcomb->countNbOfCombinationForFkProductParent($object->id);
-            if ($nbVariant > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbVariant.'</span>';
+			if ($nbVariant > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbVariant.'</span>';
 		}
 
 		$h++;
 	}
 
-    if ($object->isProduct() || ($object->isService() && !empty($conf->global->STOCK_SUPPORTS_SERVICES)))    // If physical product we can stock (or service with option)
-    {
-        if (!empty($conf->stock->enabled) && $user->rights->stock->lire)
-        {
-            $head[$h][0] = DOL_URL_ROOT."/product/stock/product.php?id=".$object->id;
-            $head[$h][1] = $langs->trans("Stock");
-            $head[$h][2] = 'stock';
-            $h++;
-        }
-    }
+	if ($object->isProduct() || ($object->isService() && !empty($conf->global->STOCK_SUPPORTS_SERVICES)))    // If physical product we can stock (or service with option)
+	{
+		if (!empty($conf->stock->enabled) && $user->rights->stock->lire)
+		{
+			$head[$h][0] = DOL_URL_ROOT."/product/stock/product.php?id=".$object->id;
+			$head[$h][1] = $langs->trans("Stock");
+			$head[$h][2] = 'stock';
+			$h++;
+		}
+	}
 
-    // Tab to link resources
-    if (!empty($conf->resource->enabled))
-    {
-        if ($object->isProduct() && !empty($conf->global->RESOURCE_ON_PRODUCTS))
-        {
-            $head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=product&ref='.$object->ref;
-            $head[$h][1] = $langs->trans("Resources");
-            $head[$h][2] = 'resources';
-            $h++;
-        }
-        if ($object->isService() && !empty($conf->global->RESOURCE_ON_SERVICES))
-        {
-            $head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=service&ref='.$object->ref;
-            $head[$h][1] = $langs->trans("Resources");
-            $head[$h][2] = 'resources';
-            $h++;
-        }
-    }
+	// Tab to link resources
+	if (!empty($conf->resource->enabled))
+	{
+		if ($object->isProduct() && !empty($conf->global->RESOURCE_ON_PRODUCTS))
+		{
+			$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=product&ref='.$object->ref;
+			$head[$h][1] = $langs->trans("Resources");
+			$head[$h][2] = 'resources';
+			$h++;
+		}
+		if ($object->isService() && !empty($conf->global->RESOURCE_ON_SERVICES))
+		{
+			$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=service&ref='.$object->ref;
+			$head[$h][1] = $langs->trans("Resources");
+			$head[$h][2] = 'resources';
+			$h++;
+		}
+	}
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'product');
+	$head[$h][0] = DOL_URL_ROOT."/product/stats/facture.php?showmessage=1&id=".$object->id;
+	$head[$h][1] = $langs->trans('Referers');
+	$head[$h][2] = 'referers';
+	$h++;
 
-    // Notes
-    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-    {
-        $nbNote = 0;
-        if (!empty($object->note_private)) $nbNote++;
-        if (!empty($object->note_public)) $nbNote++;
-        $head[$h][0] = DOL_URL_ROOT.'/product/note.php?id='.$object->id;
-        $head[$h][1] = $langs->trans('Notes');
-        if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
-        $head[$h][2] = 'note';
-        $h++;
-    }
+	$head[$h][0] = DOL_URL_ROOT."/product/stats/card.php?id=".$object->id;
+	$head[$h][1] = $langs->trans('Statistics');
+	$head[$h][2] = 'stats';
+	$h++;
 
-    // Attachments
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'product');
+
+	// Notes
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+	{
+		$nbNote = 0;
+		if (!empty($object->note_private)) $nbNote++;
+		if (!empty($object->note_public)) $nbNote++;
+		$head[$h][0] = DOL_URL_ROOT.'/product/note.php?id='.$object->id;
+		$head[$h][1] = $langs->trans('Notes');
+		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		$head[$h][2] = 'note';
+		$h++;
+	}
+
+	// Attachments
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    if (!empty($conf->product->enabled) && ($object->type == Product::TYPE_PRODUCT)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
-    if (!empty($conf->service->enabled) && ($object->type == Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
-    $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
-        if (!empty($conf->product->enabled) && ($object->type == Product::TYPE_PRODUCT)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir($object->id, 2, 0, 0, $object, 'product').$object->id.'/photos';
-        if (!empty($conf->service->enabled) && ($object->type == Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir($object->id, 2, 0, 0, $object, 'product').$object->id.'/photos';
-        $nbFiles += count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    }
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	if (!empty($conf->product->enabled) && ($object->type == Product::TYPE_PRODUCT)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+	if (!empty($conf->service->enabled) && ($object->type == Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+	if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+		if (!empty($conf->product->enabled) && ($object->type == Product::TYPE_PRODUCT)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir($object->id, 2, 0, 0, $object, 'product').$object->id.'/photos';
+		if (!empty($conf->service->enabled) && ($object->type == Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir($object->id, 2, 0, 0, $object, 'product').$object->id.'/photos';
+		$nbFiles += count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+	}
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/product/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'product', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'product', 'remove');
 
-    // Log
-    $head[$h][0] = DOL_URL_ROOT.'/product/agenda.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("Events");
-    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-    {
-    	$head[$h][1] .= '/';
-    	$head[$h][1] .= $langs->trans("Agenda");
-    }
-    $head[$h][2] = 'agenda';
-    $h++;
+	// Log
+	$head[$h][0] = DOL_URL_ROOT.'/product/agenda.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Events");
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
+	{
+		$head[$h][1] .= '/';
+		$head[$h][1] .= $langs->trans("Agenda");
+	}
+	$head[$h][2] = 'agenda';
+	$h++;
 
 	return $head;
 }
@@ -210,48 +210,48 @@ function product_prepare_head($object)
  */
 function productlot_prepare_head($object)
 {
-    global $db, $langs, $conf, $user;
+	global $db, $langs, $conf, $user;
 
-    // Load translation files required by the page
-    $langs->loadLangs(array("products", "productbatch"));
+	// Load translation files required by the page
+	$langs->loadLangs(array("products", "productbatch"));
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT."/product/stock/productlot_card.php?id=".$object->id;
-    $head[$h][1] = $langs->trans("Lot");
-    $head[$h][2] = 'card';
+	$head[$h][0] = DOL_URL_ROOT."/product/stock/productlot_card.php?id=".$object->id;
+	$head[$h][1] = $langs->trans("Lot");
+	$head[$h][2] = 'card';
 	$h++;
 
 	// Attachments
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    $upload_dir = $conf->productbatch->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
-    $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->productbatch->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT."/product/stock/productlot_document.php?id=".$object->id;
 	$head[$h][1] = $langs->trans("Documents");
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
-    $head[$h][2] = 'documents';
+	$head[$h][2] = 'documents';
 	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'productlot');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'productlot');
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'productlot', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'productlot', 'remove');
 
-    // Log
-    /*
+	// Log
+	/*
     $head[$h][0] = DOL_URL_ROOT.'/product/info.php?id='.$object->id;
     $head[$h][1] = $langs->trans("Info");
     $head[$h][2] = 'info';
     $h++;
     */
 
-    return $head;
+	return $head;
 }
 
 
@@ -285,8 +285,8 @@ function product_admin_prepare_head()
 
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'product_admin');
 
 	$head[$h][0] = DOL_URL_ROOT.'/product/admin/product_extrafields.php';
@@ -313,25 +313,25 @@ function product_admin_prepare_head()
  */
 function product_lot_admin_prepare_head()
 {
-    global $langs, $conf, $user;
+	global $langs, $conf, $user;
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'product_lot_admin');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'product_lot_admin');
 
-    $head[$h][0] = DOL_URL_ROOT.'/product/admin/product_lot_extrafields.php';
-    $head[$h][1] = $langs->trans("ExtraFields");
-    $head[$h][2] = 'attributes';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/product/admin/product_lot_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFields");
+	$head[$h][2] = 'attributes';
+	$h++;
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'product_lot_admin', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'product_lot_admin', 'remove');
 
-    return $head;
+	return $head;
 }
 
 
@@ -346,6 +346,7 @@ function product_lot_admin_prepare_head()
 function show_stats_for_company($product, $socid)
 {
 	global $conf, $langs, $user, $db;
+	$form = new Form($db);
 
 	$nblines = 0;
 
@@ -356,24 +357,6 @@ function show_stats_for_company($product, $socid)
 	print '<td class="right" width="25%">'.$langs->trans("TotalQuantity").'</td>';
 	print '</tr>';
 
-	// MO
-	if (!empty($conf->mrp->enabled) && $user->rights->mrp->read)
-	{
-		$nblines++;
-		//$ret = $product->load_stats_mo($socid);
-		if ($ret < 0) dol_print_error($db);
-		$langs->load("orders");
-		print '<tr><td>';
-		print '<a href="mo.php?id='.$product->id.'">'.img_object('', 'mrp').' '.$langs->trans("MO").'</a>';
-		print '</td><td class="right">';
-		print $product->stats_mo['suppliers'];
-		print '</td><td class="right">';
-		print $product->stats_mo['nb'];
-		print '</td><td class="right">';
-		print $product->stats_mo['qty'];
-		print '</td>';
-		print '</tr>';
-	}
 	// Customer proposals
 	if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
 	{
@@ -502,6 +485,60 @@ function show_stats_for_company($product, $socid)
 		print '</tr>';
 	}
 
+	// BOM
+	if (!empty($conf->bom->enabled) && $user->rights->bom->read)
+	{
+		$nblines++;
+		$ret = $product->load_stats_bom($socid);
+		if ($ret < 0) {
+			setEventMessage($product->error, 'errors');
+		}
+		$langs->load("mrp");
+
+		print '<tr><td>';
+		print '<a href="bom.php?id='.$product->id.'">'.img_object('', 'mrp').' '.$langs->trans("BOM").'</a>';
+		print '</td><td class="right">';
+
+		print '</td><td class="right">';
+		print $form->textwithpicto($product->stats_bom['nb_toproduce'], $langs->trans("QtyToProduce"));
+		print $form->textwithpicto($product->stats_bom['nb_toconsume'], $langs->trans("ToConsume"));
+		print '</td><td class="right">';
+		print $form->textwithpicto($product->stats_bom['qty_toproduce'], $langs->trans("QtyToProduce"));
+		print $form->textwithpicto($product->stats_bom['qty_toconsume'], $langs->trans("ToConsume"));
+		print '</td>';
+		print '</tr>';
+	}
+
+	// MO
+	if (!empty($conf->mrp->enabled) && $user->rights->mrp->read)
+	{
+		$nblines++;
+		$ret = $product->load_stats_mo($socid);
+		if ($ret < 0) {
+			setEventMessage($product->error, 'errors');
+		}
+		$langs->load("mrp");
+		print '<tr><td>';
+		print '<a href="mo.php?id='.$product->id.'">'.img_object('', 'mrp').' '.$langs->trans("MO").'</a>';
+		print '</td><td class="right">';
+		print $form->textwithpicto($product->stats_mo['customers_toconsume'], $langs->trans("ToConsume"));
+		print $form->textwithpicto($product->stats_mo['customers_consumed'], $langs->trans("QtyAlreadyConsumed"));
+		print $form->textwithpicto($product->stats_mo['customers_toproduce'], $langs->trans("QtyToProduce"));
+		print $form->textwithpicto($product->stats_mo['customers_produced'], $langs->trans("QtyAlreadyProduced"));
+		print '</td><td class="right">';
+		print $form->textwithpicto($product->stats_mo['nb_toconsume'], $langs->trans("ToConsume"));
+		print $form->textwithpicto($product->stats_mo['nb_consumed'], $langs->trans("QtyAlreadyConsumed"));
+		print $form->textwithpicto($product->stats_mo['nb_toproduce'], $langs->trans("QtyToProduce"));
+		print $form->textwithpicto($product->stats_mo['nb_produced'], $langs->trans("QtyAlreadyProduced"));
+		print '</td><td class="right">';
+		print $form->textwithpicto($product->stats_mo['qty_toconsume'], $langs->trans("ToConsume"));
+		print $form->textwithpicto($product->stats_mo['qty_consumed'], $langs->trans("QtyAlreadyConsumed"));
+		print $form->textwithpicto($product->stats_mo['qty_toproduce'], $langs->trans("QtyToProduce"));
+		print $form->textwithpicto($product->stats_mo['qty_produced'], $langs->trans("QtyAlreadyProduced"));
+		print '</td>';
+		print '</tr>';
+	}
+
 	return $nblines++;
 }
 
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 782e18151b2..74e624ca7cb 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -30,23 +30,23 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 /**
  * Prepare array with list of tabs
  *
- * @param   Object	$object		Object related to tabs
- * @return  array				Array of tabs to show
+ * @param	Project	$project	Object related to tabs
+ * @return	array				Array of tabs to show
  */
-function project_prepare_head($object)
+function project_prepare_head(Project $project)
 {
 	global $db, $langs, $conf, $user;
 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/projet/card.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/projet/card.php?id='.$project->id;
 	$head[$h][1] = $langs->trans("Project");
 	$head[$h][2] = 'project';
 	$h++;
 
-	$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
-	$head[$h][0] = DOL_URL_ROOT.'/projet/contact.php?id='.$object->id;
+	$nbContact = count($project->liste_contact(-1, 'internal')) + count($project->liste_contact(-1, 'external'));
+	$head[$h][0] = DOL_URL_ROOT.'/projet/contact.php?id='.$project->id;
 	$head[$h][1] = $langs->trans("ProjectContact");
 	if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
 	$head[$h][2] = 'contact';
@@ -55,12 +55,12 @@ function project_prepare_head($object)
 	if (empty($conf->global->PROJECT_HIDE_TASKS))
 	{
 		// Then tab for sub level of projet, i mean tasks
-		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks.php?id='.$project->id;
 		$head[$h][1] = $langs->trans("Tasks");
 
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 		$taskstatic = new Task($db);
-		$nbTasks = count($taskstatic->getTasksArray(0, 0, $object->id, 0, 0));
+		$nbTasks = count($taskstatic->getTasksArray(0, 0, $project->id, 0, 0));
 		if ($nbTasks > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbTasks).'</span>';
 		$head[$h][2] = 'tasks';
 		$h++;
@@ -71,7 +71,7 @@ function project_prepare_head($object)
 		//$sql .= " WHERE t.fk_user = u.rowid AND t.fk_task = pt.rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt";
 		$sql .= " WHERE t.fk_task = pt.rowid";
-		$sql .= " AND pt.fk_projet =".$object->id;
+		$sql .= " AND pt.fk_projet =".$project->id;
 		$resql = $db->query($sql);
 		if ($resql)
 		{
@@ -79,7 +79,7 @@ function project_prepare_head($object)
 			if ($obj) $nbTimeSpent = 1;
 		} else dol_print_error($db);
 
-		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?withproject=1&projectid='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?withproject=1&projectid='.$project->id;
 		$head[$h][1] = $langs->trans("TimeSpent");
 		if ($nbTimeSpent > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">...</span>';
 		$head[$h][2] = 'timespent';
@@ -91,8 +91,32 @@ function project_prepare_head($object)
 		|| !empty($conf->facture->enabled) || !empty($conf->contrat->enabled)
 		|| !empty($conf->ficheinter->enabled) || !empty($conf->agenda->enabled) || !empty($conf->deplacement->enabled))
 	{
-		$head[$h][0] = DOL_URL_ROOT.'/projet/element.php?id='.$object->id;
+		$count = 0;
+
+		if (!empty($conf->propal->enabled))				$count += $project->getElementCount('propal', 'propal');
+		if (!empty($conf->commande->enabled))			$count += $project->getElementCount('order', 'commande');
+		if (!empty($conf->facture->enabled))			$count += $project->getElementCount('invoice', 'facture');
+		if (!empty($conf->facture->enabled))			$count += $project->getElementCount('invoice_predefined', 'facture_rec');
+		if (!empty($conf->supplier_proposal->enabled))	$count += $project->getElementCount('proposal_supplier', 'supplier_proposal');
+		if (!empty($conf->supplier_order->enabled))		$count += $project->getElementCount('order_supplier', 'commande_fournisseur');
+		if (!empty($conf->supplier_invoice->enabled))	$count += $project->getElementCount('invoice_supplier', 'facture_fourn');
+		if (!empty($conf->contrat->enabled))			$count += $project->getElementCount('contract', 'contrat');
+		if (!empty($conf->ficheinter->enabled))			$count += $project->getElementCount('intervention', 'fichinter');
+		if (!empty($conf->expedition->enabled))			$count += $project->getElementCount('shipping', 'expedition');
+		if (!empty($conf->mrp->enabled))				$count += $project->getElementCount('mrp', 'mrp_mo', 'fk_project');
+		if (!empty($conf->deplacement->enabled))		$count += $project->getElementCount('trip', 'deplacement');
+		if (!empty($conf->expensereport->enabled))		$count += $project->getElementCount('expensereport', 'expensereport');
+		if (!empty($conf->don->enabled))				$count += $project->getElementCount('donation', 'don');
+		if (!empty($conf->loan->enabled))				$count += $project->getElementCount('loan', 'loan');
+		if (!empty($conf->tax->enabled))				$count += $project->getElementCount('chargesociales', 'chargesociales');
+		if (!empty($conf->projet->enabled))				$count += $project->getElementCount('project_task', 'projet_task');
+		if (!empty($conf->stock->enabled))				$count += $project->getElementCount('stock_mouvement', 'stock');
+		if (!empty($conf->salaries->enabled))			$count += $project->getElementCount('salaries', 'payment_salary');
+		if (!empty($conf->banque->enabled))				$count += $project->getElementCount('variouspayment', 'payment_various');
+
+		$head[$h][0] = DOL_URL_ROOT.'/projet/element.php?id='.$project->id;
 		$head[$h][1] = $langs->trans("ProjectOverview");
+		if ($count > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$count.'</span>';
 		$head[$h][2] = 'element';
 		$h++;
 	}
@@ -101,15 +125,15 @@ function project_prepare_head($object)
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'project');
+	complete_head_from_modules($conf, $langs, $project, $head, $h, 'project');
 
 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
 		$nbNote = 0;
-		if (!empty($object->note_private)) $nbNote++;
-		if (!empty($object->note_public)) $nbNote++;
-		$head[$h][0] = DOL_URL_ROOT.'/projet/note.php?id='.$object->id;
+		if (!empty($project->note_private)) $nbNote++;
+		if (!empty($project->note_public)) $nbNote++;
+		$head[$h][0] = DOL_URL_ROOT.'/projet/note.php?id='.$project->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
 		$head[$h][2] = 'notes';
@@ -118,10 +142,10 @@ function project_prepare_head($object)
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($object->ref);
+	$upload_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($project->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-	$nbLinks = Link::count($db, $object->element, $object->id);
-	$head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$object->id;
+	$nbLinks = Link::count($db, $project->element, $project->id);
+	$head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$project->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'document';
@@ -130,15 +154,15 @@ function project_prepare_head($object)
 	// Manage discussion
 	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT))
 	{
-		$nbComments = $object->getNbComments();
-		$head[$h][0] = DOL_URL_ROOT.'/projet/comment.php?id='.$object->id;
+		$nbComments = $project->getNbComments();
+		$head[$h][0] = DOL_URL_ROOT.'/projet/comment.php?id='.$project->id;
 		$head[$h][1] = $langs->trans("CommentLink");
 		if ($nbComments > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbComments.'</span>';
 		$head[$h][2] = 'project_comment';
 		$h++;
 	}
 
-	$head[$h][0] = DOL_URL_ROOT.'/projet/info.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/projet/info.php?id='.$project->id;
 	$head[$h][1] .= $langs->trans("Events");
 	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
 	{
@@ -148,7 +172,7 @@ function project_prepare_head($object)
 	$head[$h][2] = 'agenda';
 	$h++;
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'project', 'remove');
+	complete_head_from_modules($conf, $langs, $project, $head, $h, 'project', 'remove');
 
 	return $head;
 }
@@ -385,7 +409,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 		$total_projectlinesa_spent = 0;
 		$total_projectlinesa_planned = 0;
 		$total_projectlinesa_spent_if_planned = 0;
-        $total_projectlinesa_declared_if_planned = 0;
+		$total_projectlinesa_declared_if_planned = 0;
 		$total_projectlinesa_tobill = 0;
 		$total_projectlinesa_billed = 0;
 	}
@@ -459,9 +483,11 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				$taskstatic->projectstatus = $lines[$i]->projectstatus;
 				$taskstatic->progress = $lines[$i]->progress;
 				$taskstatic->fk_statut = $lines[$i]->status;
-				$taskstatic->datee = $lines[$i]->date_end;
-                $taskstatic->planned_workload = $lines[$i]->planned_workload;
-                $taskstatic->duration_effective = $lines[$i]->duration;
+				$taskstatic->date_start = $lines[$i]->date_start;
+				$taskstatic->date_end = $lines[$i]->date_end;
+				$taskstatic->datee = $lines[$i]->date_end; // deprecated
+				$taskstatic->planned_workload = $lines[$i]->planned_workload;
+				$taskstatic->duration_effective = $lines[$i]->duration;
 
 
 				if ($showproject)
@@ -598,7 +624,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 
 				if ($showbilltime)
 				{
-    				// Time not billed
+					// Time not billed
 					if (count($arrayfields) > 0 && !empty($arrayfields['t.tobill']['checked'])) {
 						print '<td class="right">';
 						if ($lines[$i]->usage_bill_time) {
@@ -610,7 +636,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 						print '</td>';
 					}
 
-    				// Time billed
+					// Time billed
 					if (count($arrayfields) > 0 && !empty($arrayfields['t.billed']['checked'])) {
 						print '<td class="right">';
 						if ($lines[$i]->usage_bill_time) {
@@ -654,10 +680,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				print $hookmanager->resPrint;
 
 				// Tick to drag and drop
-				if ($addordertick)
-				{
-					print '<td class="tdlineupdown hideonsmartphone center">&nbsp;</td>';
-				}
+				print '<td class="tdlineupdown center"></td>';
 
 				print "</tr>\n";
 
@@ -673,7 +696,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				$total_projectlinesa_spent += $lines[$i]->duration;
 				$total_projectlinesa_planned += $lines[$i]->planned_workload;
 				if ($lines[$i]->planned_workload) $total_projectlinesa_spent_if_planned += $lines[$i]->duration;
-                if ($lines[$i]->planned_workload) $total_projectlinesa_declared_if_planned += $lines[$i]->planned_workload * $lines[$i]->progress / 100;
+				if ($lines[$i]->planned_workload) $total_projectlinesa_declared_if_planned += $lines[$i]->planned_workload * $lines[$i]->progress / 100;
 			}
 		} else {
 			//$level--;
@@ -681,7 +704,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 	}
 
 	if (($total_projectlinesa_planned > 0 || $total_projectlinesa_spent > 0 || $total_projectlinesa_tobill > 0 || $total_projectlinesa_billed > 0)
-	    && $level <= 0)
+		&& $level <= 0)
 	{
 		print '<tr class="liste_total nodrag nodrop">';
 		print '<td class="liste_total">'.$langs->trans("Total").'</td>';
@@ -704,28 +727,28 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 			print '</td>';
 		}
 
-        if ($total_projectlinesa_planned) {
-            $totalAverageDeclaredProgress = round(100 * $total_projectlinesa_declared_if_planned / $total_projectlinesa_planned, 2);
-            $totalCalculatedProgress = round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned, 2);
+		if ($total_projectlinesa_planned) {
+			$totalAverageDeclaredProgress = round(100 * $total_projectlinesa_declared_if_planned / $total_projectlinesa_planned, 2);
+			$totalCalculatedProgress = round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned, 2);
 
-            // this conf is actually hidden, by default we use 10% for "be carefull or warning"
-            $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
+			// this conf is actually hidden, by default we use 10% for "be carefull or warning"
+			$warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
 
-            // define progress color according to time spend vs workload
-            $progressBarClass = 'progress-bar-info';
-            $badgeClass = 'badge ';
+			// define progress color according to time spend vs workload
+			$progressBarClass = 'progress-bar-info';
+			$badgeClass = 'badge ';
 
-            if ($totalCalculatedProgress > $totalAverageDeclaredProgress) {
-                $progressBarClass = 'progress-bar-danger';
-                $badgeClass .= 'badge-danger';
-            } elseif ($totalCalculatedProgress * $warningRatio >= $totalAverageDeclaredProgress) { // warning if close at 1%
-                $progressBarClass = 'progress-bar-warning';
-                $badgeClass .= 'badge-warning';
-            } else {
-                $progressBarClass = 'progress-bar-success';
-                $badgeClass .= 'badge-success';
-            }
-        }
+			if ($totalCalculatedProgress > $totalAverageDeclaredProgress) {
+				$progressBarClass = 'progress-bar-danger';
+				$badgeClass .= 'badge-danger';
+			} elseif ($totalCalculatedProgress * $warningRatio >= $totalAverageDeclaredProgress) { // warning if close at 1%
+				$progressBarClass = 'progress-bar-warning';
+				$badgeClass .= 'badge-warning';
+			} else {
+				$progressBarClass = 'progress-bar-success';
+				$badgeClass .= 'badge-success';
+			}
+		}
 
 		if (count($arrayfields) > 0 && !empty($arrayfields['t.progress_calculated']['checked'])) {
 			print '<td class="nowrap liste_total right">';
@@ -741,7 +764,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 		}
 
 
-        // resume
+		// resume
 		if (count($arrayfields) > 0 && !empty($arrayfields['t.progress_summary']['checked'])) {
 			print '<td class="right">';
 			if ($total_projectlinesa_planned) {
@@ -772,7 +795,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 		{
 			print '<td></td>';
 		}
-		if ($addordertick) print '<td class="hideonsmartphone"></td>';
+		print '<td class=""></td>';
 		print '</tr>';
 	}
 
@@ -1058,7 +1081,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 
 		if ($lines[$i]->fk_task_parent == $parent)
 		{
-            $obj = &$lines[$i]; // To display extrafields
+			$obj = &$lines[$i]; // To display extrafields
 
 			// If we want all or we have a role on task, we show it
 			if (empty($mine) || !empty($tasksrole[$lines[$i]->id]))
@@ -1106,13 +1129,13 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 
 				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
 				{
-                    $addcolspan = 0;
-                    if (!empty($arrayfields['t.planned_workload']['checked'])) $addcolspan++;
-                    if (!empty($arrayfields['t.progress']['checked'])) $addcolspan++;
-                    foreach ($arrayfields as $key => $val)
-                    {
-                        if ($val['checked'] && substr($key, 0, 5) == 'efpt.') $addcolspan++;
-                    }
+					$addcolspan = 0;
+					if (!empty($arrayfields['t.planned_workload']['checked'])) $addcolspan++;
+					if (!empty($arrayfields['t.progress']['checked'])) $addcolspan++;
+					foreach ($arrayfields as $key => $val)
+					{
+						if ($val['checked'] && substr($key, 0, 5) == 'efpt.') $addcolspan++;
+					}
 
 					print '<tr class="oddeven trforbreak nobold">'."\n";
 					print '<td colspan="'.(7 + $addcolspan).'">';
@@ -1202,17 +1225,17 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				// Project
 				if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT))
 				{
-				    print "<td>";
-				    if ($oldprojectforbreak == -1) print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
-				    print "</td>";
+					print "<td>";
+					if ($oldprojectforbreak == -1) print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+					print "</td>";
 				}
 
 				// Thirdparty
 				if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT))
 				{
-				    print '<td class="tdoverflowmax100">';
-				    if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project', 10);
-				    print '</td>';
+					print '<td class="tdoverflowmax100">';
+					if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project', 10);
+					print '</td>';
 				}
 
 				// Ref
@@ -1226,27 +1249,27 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				for ($k = 0; $k < $level; $k++) print "</div>";
 				print "</td>\n";
 
-                // TASK extrafields
-                $extrafieldsobjectkey = 'projet_task';
-                $extrafieldsobjectprefix = 'efpt.';
-                include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+				// TASK extrafields
+				$extrafieldsobjectkey = 'projet_task';
+				$extrafieldsobjectprefix = 'efpt.';
+				include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 
-                // Planned Workload
-                if (!empty($arrayfields['t.planned_workload']['checked']))
-                {
-                    print '<td class="leftborder plannedworkload right">';
-				    if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
-				    else print '--:--';
-				    print '</td>';
-                }
+				// Planned Workload
+				if (!empty($arrayfields['t.planned_workload']['checked']))
+				{
+					print '<td class="leftborder plannedworkload right">';
+					if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
+					else print '--:--';
+					print '</td>';
+				}
 
 				// Progress declared %
-                if (!empty($arrayfields['t.progress']['checked']))
-                {
-                    print '<td class="right">';
-				    print $formother->select_percent($lines[$i]->progress, $lines[$i]->id.'progress');
-				    print '</td>';
-                }
+				if (!empty($arrayfields['t.progress']['checked']))
+				{
+					print '<td class="right">';
+					print $formother->select_percent($lines[$i]->progress, $lines[$i]->id.'progress');
+					print '</td>';
+				}
 
 				// Time spent by everybody
 				print '<td class="right">';
@@ -1295,11 +1318,11 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 
 				global $daytoparse;
 				$tmparray = dol_getdate($daytoparse, true); // detail of current day
-				$idw = $tmparray['wday'];
 
+				$idw = ($tmparray['wday'] - (empty($conf->global->MAIN_START_WEEK) ? 0 : 1));
 				global $numstartworkingday, $numendworkingday;
 				$cssweekend = '';
-				if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday)	// This is a day is not inside the setup of working days, so we use a week-end css.
+				if ((($idw + 1) < $numstartworkingday) || (($idw + 1) > $numendworkingday))	// This is a day is not inside the setup of working days, so we use a week-end css.
 				{
 					$cssweekend = 'weekend';
 				}
@@ -1415,7 +1438,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 	{
 		for ($i = 0; $i < $numlines; $i++)
 		{
-		    if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[] = $lines[$i];
+			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[] = $lines[$i];
 		}
 	}
 
@@ -1432,7 +1455,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 
 		if ($lines[$i]->fk_task_parent == $parent)
 		{
-            $obj = &$lines[$i]; // To display extrafields
+			$obj = &$lines[$i]; // To display extrafields
 
 			// If we want all or we have a role on task, we show it
 			if (empty($mine) || !empty($tasksrole[$lines[$i]->id]))
@@ -1479,13 +1502,13 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 
 				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
 				{
-                    $addcolspan = 0;
-                    if (!empty($arrayfields['t.planned_workload']['checked'])) $addcolspan++;
-                    if (!empty($arrayfields['t.progress']['checked'])) $addcolspan++;
-                    foreach ($arrayfields as $key => $val)
-                    {
-                        if ($val['checked'] && substr($key, 0, 5) == 'efpt.') $addcolspan++;
-                    }
+					$addcolspan = 0;
+					if (!empty($arrayfields['t.planned_workload']['checked'])) $addcolspan++;
+					if (!empty($arrayfields['t.progress']['checked'])) $addcolspan++;
+					foreach ($arrayfields as $key => $val)
+					{
+						if ($val['checked'] && substr($key, 0, 5) == 'efpt.') $addcolspan++;
+					}
 
 					print '<tr class="oddeven trforbreak nobold">'."\n";
 					print '<td colspan="'.(11 + $addcolspan).'">';
@@ -1497,7 +1520,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 						print '<span class="secondary">'.$projectstatic->title.'</span>';
 					}
 
-                    /*$colspan=5+(empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:2);
+					/*$colspan=5+(empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:2);
 					print '<table class="">';
 
 					print '<tr class="liste_titre">';
@@ -1575,17 +1598,17 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				// Project
 				if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT))
 				{
-    				print '<td class="nowrap">';
-    				if ($oldprojectforbreak == -1) print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
-    				print "</td>";
+					print '<td class="nowrap">';
+					if ($oldprojectforbreak == -1) print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+					print "</td>";
 				}
 
 				// Thirdparty
 				if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT))
 				{
-				    print '<td class="tdoverflowmax100">';
-				    if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project');
-				    print '</td>';
+					print '<td class="tdoverflowmax100">';
+					if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project');
+					print '</td>';
 				}
 
 				// Ref
@@ -1600,26 +1623,26 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				print "</td>\n";
 
 				// TASK extrafields
-                $extrafieldsobjectkey = 'projet_task';
-                $extrafieldsobjectprefix = 'efpt.';
-                include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+				$extrafieldsobjectkey = 'projet_task';
+				$extrafieldsobjectprefix = 'efpt.';
+				include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 
-                // Planned Workload
-                if (!empty($arrayfields['t.planned_workload']['checked']))
-                {
-    				print '<td class="leftborder plannedworkload right">';
-    				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
-    				else print '--:--';
-    				print '</td>';
-                }
+				// Planned Workload
+				if (!empty($arrayfields['t.planned_workload']['checked']))
+				{
+					print '<td class="leftborder plannedworkload right">';
+					if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
+					else print '--:--';
+					print '</td>';
+				}
 
-                if (!empty($arrayfields['t.progress']['checked']))
-                {
-                    // Progress declared %
-    				print '<td class="right">';
-    				print $formother->select_percent($lines[$i]->progress, $lines[$i]->id.'progress');
-    				print '</td>';
-                }
+				if (!empty($arrayfields['t.progress']['checked']))
+				{
+					// Progress declared %
+					print '<td class="right">';
+					print $formother->select_percent($lines[$i]->progress, $lines[$i]->id.'progress');
+					print '</td>';
+				}
 
 				// Time spent by everybody
 				print '<td class="right">';
@@ -1678,12 +1701,13 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 
 					global $numstartworkingday, $numendworkingday;
 					$cssweekend = '';
-					if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday)	// This is a day is not inside the setup of working days, so we use a week-end css.
+					if (($idw + 1 < $numstartworkingday) || ($idw + 1 > $numendworkingday))	// This is a day is not inside the setup of working days, so we use a week-end css.
 					{
 						$cssweekend = 'weekend';
 					}
 
 					$tableCell = '<td class="center hide'.$idw.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'">';
+					//$tableCell .= 'idw='.$idw.' '.$conf->global->MAIN_START_WEEK.' '.$numstartworkingday.'-'.$numendworkingday;
 					$placeholder = '';
 					if ($alreadyspent)
 					{
@@ -2144,7 +2168,11 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 	if (empty($arrayidofprojects)) $arrayidofprojects[0] = -1;
 
 	// Get list of project with calculation on tasks
-	$sql2 = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_soc, s.nom as socname, s.email, s.client, s.fournisseur,";
+	$sql2 = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_soc,";
+	$sql2 .= " s.rowid as socid, s.nom as socname, s.name_alias,";
+	$sql2 .= " s.code_client, s.code_compta, s.client,";
+	$sql2 .= " s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur,";
+	$sql2 .= " s.logo, s.email, s.entity,";
 	$sql2 .= " p.fk_user_creat, p.public, p.fk_statut as status, p.fk_opp_status as opp_status, p.opp_percent, p.opp_amount,";
 	$sql2 .= " p.dateo, p.datee,";
 	$sql2 .= " COUNT(t.rowid) as nb, SUM(t.planned_workload) as planned_workload, SUM(t.planned_workload * t.progress / 100) as declared_progess_workload";
@@ -2158,7 +2186,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 	$resql = $db->query($sql2);
 	if ($resql)
 	{
-	    $total_task = 0;
+		$total_task = 0;
 		$total_opp_amount = 0;
 		$ponderated_opp_amount = 0;
 
@@ -2213,12 +2241,18 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 				print '<td class="nowraponall tdoverflowmax100">';
 				if ($objp->fk_soc > 0)
 				{
-					$thirdpartystatic->id = $objp->fk_soc;
-					$thirdpartystatic->ref = $objp->socname;
+					$thirdpartystatic->id = $objp->socid;
 					$thirdpartystatic->name = $objp->socname;
+					//$thirdpartystatic->name_alias = $objp->name_alias;
+					//$thirdpartystatic->code_client = $objp->code_client;
+					$thirdpartystatic->code_compta = $objp->code_compta;
 					$thirdpartystatic->client = $objp->client;
+					//$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
 					$thirdpartystatic->fournisseur = $objp->fournisseur;
+					$thirdpartystatic->logo = $objp->logo;
 					$thirdpartystatic->email = $objp->email;
+					$thirdpartystatic->entity = $objp->entity;
 					print $thirdpartystatic->getNomUrl(1);
 				}
 				print '</td>';
@@ -2353,117 +2387,117 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
  */
 function getTaskProgressView($task, $label = true, $progressNumber = true, $hideOnProgressNull = false, $spaced = false)
 {
-    global $langs, $conf;
+	global $langs, $conf;
 
-    $out = '';
+	$out = '';
 
-    $plannedworkloadoutputformat = 'allhourmin';
-    $timespentoutputformat = 'allhourmin';
-    if (!empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) $plannedworkloadoutputformat = $conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
-    if (!empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat = $conf->global->PROJECT_TIME_SPENT_FORMAT;
+	$plannedworkloadoutputformat = 'allhourmin';
+	$timespentoutputformat = 'allhourmin';
+	if (!empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) $plannedworkloadoutputformat = $conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
+	if (!empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat = $conf->global->PROJECT_TIME_SPENT_FORMAT;
 
-    if (empty($task->progress) && !empty($hideOnProgressNull)) {
-        return '';
-    }
+	if (empty($task->progress) && !empty($hideOnProgressNull)) {
+		return '';
+	}
 
-    $spaced = !empty($spaced) ? 'spaced' : '';
+	$spaced = !empty($spaced) ? 'spaced' : '';
 
-    $diff = '';
+	$diff = '';
 
-    // define progress color according to time spend vs workload
-    $progressBarClass = 'progress-bar-info';
-    if ($task->planned_workload) {
-        $progressCalculated = round(100 * doubleval($task->duration_effective) / doubleval($task->planned_workload), 2);
+	// define progress color according to time spend vs workload
+	$progressBarClass = 'progress-bar-info';
+	if ($task->planned_workload) {
+		$progressCalculated = round(100 * doubleval($task->duration_effective) / doubleval($task->planned_workload), 2);
 
-        // this conf is actually hidden, by default we use 10% for "be carefull or warning"
-        $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
+		// this conf is actually hidden, by default we use 10% for "be carefull or warning"
+		$warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
 
-        $diffTitle = '<br/>'.$langs->trans('ProgressDeclared').' : '.$task->progress.($task->progress ? '%' : '');
-        $diffTitle .= '<br/>'.$langs->trans('ProgressCalculated').' : '.$progressCalculated.($progressCalculated ? '%' : '');
+		$diffTitle = '<br>'.$langs->trans('ProgressDeclared').' : '.$task->progress.($task->progress ? '%' : '');
+		$diffTitle .= '<br>'.$langs->trans('ProgressCalculated').' : '.$progressCalculated.($progressCalculated ? '%' : '');
 
-        //var_dump($progressCalculated.' '.$warningRatio.' '.$task->progress.' '.doubleval($task->progress * $warningRatio));
-        if (doubleval($progressCalculated) > doubleval($task->progress * $warningRatio)) {
-            $progressBarClass = 'progress-bar-danger';
-            $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress - $progressCalculated).' '.$langs->trans("point"));
-            $diff = '<span class="text-danger classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-down"></i> '.($task->progress - $progressCalculated).'%</span>';
-        } elseif (doubleval($progressCalculated) > doubleval($task->progress)) { // warning if close at 10%
-            $progressBarClass = 'progress-bar-warning';
-            $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress - $progressCalculated).' '.$langs->trans("point"));
-            $diff = '<span class="text-warning classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-left"></i> '.($task->progress - $progressCalculated).'%</span>';
-        } else {
-            $progressBarClass = 'progress-bar-success';
-            $title = $langs->trans('TheReportedProgressIsMoreThanTheCalculatedProgressionByX', ($task->progress - $progressCalculated).' '.$langs->trans("point"));
-            $diff = '<span class="text-success classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-up"></i> '.($task->progress - $progressCalculated).'%</span>';
-        }
-    }
+		//var_dump($progressCalculated.' '.$warningRatio.' '.$task->progress.' '.doubleval($task->progress * $warningRatio));
+		if (doubleval($progressCalculated) > doubleval($task->progress * $warningRatio)) {
+			$progressBarClass = 'progress-bar-danger';
+			$title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress - $progressCalculated).' '.$langs->trans("point"));
+			$diff = '<span class="text-danger classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-down"></i> '.($task->progress - $progressCalculated).'%</span>';
+		} elseif (doubleval($progressCalculated) > doubleval($task->progress)) { // warning if close at 10%
+			$progressBarClass = 'progress-bar-warning';
+			$title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress - $progressCalculated).' '.$langs->trans("point"));
+			$diff = '<span class="text-warning classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-left"></i> '.($task->progress - $progressCalculated).'%</span>';
+		} else {
+			$progressBarClass = 'progress-bar-success';
+			$title = $langs->trans('TheReportedProgressIsMoreThanTheCalculatedProgressionByX', ($task->progress - $progressCalculated).' '.$langs->trans("point"));
+			$diff = '<span class="text-success classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-up"></i> '.($task->progress - $progressCalculated).'%</span>';
+		}
+	}
 
-    $out .= '<div class="progress-group">';
+	$out .= '<div class="progress-group">';
 
-    if ($label !== false)
-    {
-        $out .= '    <span class="progress-text">';
+	if ($label !== false)
+	{
+		$out .= '    <span class="progress-text">';
 
-        if ($label !== true) {
-            $out .= $label; // replace label by param
-        } else {
-            $out .= $task->getNomUrl(1).' '.dol_htmlentities($task->label);
-        }
-        $out .= '    </span>';
-    }
+		if ($label !== true) {
+			$out .= $label; // replace label by param
+		} else {
+			$out .= $task->getNomUrl(1).' '.dol_htmlentities($task->label);
+		}
+		$out .= '    </span>';
+	}
 
 
-    if ($progressNumber !== false)
-    {
-        $out .= '    <span class="progress-number">';
-        if ($progressNumber !== true) {
-            $out .= $progressNumber; // replace label by param
-        } else {
-            if ($task->hasDelay()) $out .= img_warning($langs->trans("Late")).' ';
+	if ($progressNumber !== false)
+	{
+		$out .= '    <span class="progress-number">';
+		if ($progressNumber !== true) {
+			$out .= $progressNumber; // replace label by param
+		} else {
+			if ($task->hasDelay()) $out .= img_warning($langs->trans("Late")).' ';
 
 			$url = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$task->id;
 
-            $out .= !empty($diff) ? $diff.' ' : '';
+			$out .= !empty($diff) ? $diff.' ' : '';
 			$out .= '<a href="'.$url.'" >';
-            $out .= '<b title="'.$langs->trans('TimeSpent').'" >';
-            if ($task->duration_effective) $out .= convertSecondToTime($task->duration_effective, $timespentoutputformat);
-            else $out .= '--:--';
-            $out .= '</b>';
+			$out .= '<b title="'.$langs->trans('TimeSpent').'" >';
+			if ($task->duration_effective) $out .= convertSecondToTime($task->duration_effective, $timespentoutputformat);
+			else $out .= '--:--';
+			$out .= '</b>';
 			$out .= '</a>';
 
-            $out .= ' / ';
+			$out .= ' / ';
 
 			$out .= '<a href="'.$url.'" >';
-            $out .= '<span title="'.$langs->trans('PlannedWorkload').'" >';
-            if ($task->planned_workload) $out .= convertSecondToTime($task->planned_workload, $plannedworkloadoutputformat);
-            else $out .= '--:--';
+			$out .= '<span title="'.$langs->trans('PlannedWorkload').'" >';
+			if ($task->planned_workload) $out .= convertSecondToTime($task->planned_workload, $plannedworkloadoutputformat);
+			else $out .= '--:--';
 			$out .= '</a>';
-        }
-        $out .= '    </span>';
-    }
+		}
+		$out .= '    </span>';
+	}
 
 
-    $out .= '</span>';
-    $out .= '    <div class="progress sm '.$spaced.'">';
-    $diffval = doubleval($task->progress) - doubleval($progressCalculated);
-    if ($diffval >= 0) {
-    	// good
-    	$out .= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.doubleval($task->progress).'%" title="'.doubleval($task->progress).'%">';
-    	if (!empty($task->progress)) {
+	$out .= '</span>';
+	$out .= '    <div class="progress sm '.$spaced.'">';
+	$diffval = doubleval($task->progress) - doubleval($progressCalculated);
+	if ($diffval >= 0) {
+		// good
+		$out .= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.doubleval($task->progress).'%" title="'.doubleval($task->progress).'%">';
+		if (!empty($task->progress)) {
 			$out .= '        <div class="progress-bar progress-bar-consumed" style="width: '.doubleval($progressCalculated / $task->progress * 100).'%" title="'.doubleval($progressCalculated).'%"></div>';
 		}
-    	$out .= '        </div>';
-    } else {
-    	// bad
-    	$out .= '        <div class="progress-bar progress-bar-consumed" style="width: '.doubleval($progressCalculated).'%" title="'.doubleval($progressCalculated).'%">';
-    	$out .= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.($task->progress ? doubleval($task->progress / $progressCalculated * 100).'%' : '1px').'" title="'.doubleval($task->progress).'%"></div>';
-    	$out .= '        </div>';
-    }
-    $out .= '    </div>';
-    $out .= '</div>';
+		$out .= '        </div>';
+	} else {
+		// bad
+		$out .= '        <div class="progress-bar progress-bar-consumed" style="width: '.doubleval($progressCalculated).'%" title="'.doubleval($progressCalculated).'%">';
+		$out .= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.($task->progress ? doubleval($task->progress / $progressCalculated * 100).'%' : '1px').'" title="'.doubleval($task->progress).'%"></div>';
+		$out .= '        </div>';
+	}
+	$out .= '    </div>';
+	$out .= '</div>';
 
 
 
-    return $out;
+	return $out;
 }
 /**
  * @param   Task    $task       the task object
@@ -2474,48 +2508,48 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
  */
 function getTaskProgressBadge($task, $label = '', $tooltip = '')
 {
-    global $conf, $langs;
+	global $conf, $langs;
 
-    $out = '';
-    $badgeClass = '';
-    if ($task->progress != '')
-    {
-        // TODO : manage 100%
+	$out = '';
+	$badgeClass = '';
+	if ($task->progress != '')
+	{
+		// TODO : manage 100%
 
-        // define color according to time spend vs workload
-        $badgeClass = 'badge ';
-        if ($task->planned_workload) {
-            $progressCalculated = round(100 * doubleval($task->duration_effective) / doubleval($task->planned_workload), 2);
+		// define color according to time spend vs workload
+		$badgeClass = 'badge ';
+		if ($task->planned_workload) {
+			$progressCalculated = round(100 * doubleval($task->duration_effective) / doubleval($task->planned_workload), 2);
 
-            // this conf is actually hidden, by default we use 10% for "be carefull or warning"
-            $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
+			// this conf is actually hidden, by default we use 10% for "be carefull or warning"
+			$warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
 
-            if (doubleval($progressCalculated) > doubleval($task->progress * $warningRatio)) {
-                $badgeClass .= 'badge-danger';
-                if (empty($tooltip)) $tooltip = $task->progress.'% < '.$langs->trans("Expected").' '.$progressCalculated.'%';
-            } elseif (doubleval($progressCalculated) > doubleval($task->progress)) { // warning if close at 10%
-                $badgeClass .= 'badge-warning';
-                if (empty($tooltip)) $tooltip = $task->progress.'% < '.$langs->trans("Expected").' '.$progressCalculated.'%';
-            } else {
-                $badgeClass .= 'badge-success';
-                if (empty($tooltip)) $tooltip = $task->progress.'% >= '.$langs->trans("Expected").' '.$progressCalculated.'%';
-            }
-        }
-    }
+			if (doubleval($progressCalculated) > doubleval($task->progress * $warningRatio)) {
+				$badgeClass .= 'badge-danger';
+				if (empty($tooltip)) $tooltip = $task->progress.'% < '.$langs->trans("Expected").' '.$progressCalculated.'%';
+			} elseif (doubleval($progressCalculated) > doubleval($task->progress)) { // warning if close at 10%
+				$badgeClass .= 'badge-warning';
+				if (empty($tooltip)) $tooltip = $task->progress.'% < '.$langs->trans("Expected").' '.$progressCalculated.'%';
+			} else {
+				$badgeClass .= 'badge-success';
+				if (empty($tooltip)) $tooltip = $task->progress.'% >= '.$langs->trans("Expected").' '.$progressCalculated.'%';
+			}
+		}
+	}
 
-    $title = '';
-    if (!empty($tooltip)) {
-        $badgeClass .= ' classfortooltip';
-        $title = 'title="'.dol_htmlentities($tooltip).'"';
-    }
+	$title = '';
+	if (!empty($tooltip)) {
+		$badgeClass .= ' classfortooltip';
+		$title = 'title="'.dol_htmlentities($tooltip).'"';
+	}
 
-    if (empty($label)) {
-        $label = $task->progress.' %';
-    }
+	if (empty($label)) {
+		$label = $task->progress.' %';
+	}
 
-    if (!empty($label)) {
-        $out = '<span class="'.$badgeClass.'" '.$title.' >'.$label.'</span>';
-    }
+	if (!empty($label)) {
+		$out = '<span class="'.$badgeClass.'" '.$title.' >'.$label.'</span>';
+	}
 
-    return $out;
+	return $out;
 }
diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php
index a1dab5cd6cb..bd3a30151da 100644
--- a/htdocs/core/lib/propal.lib.php
+++ b/htdocs/core/lib/propal.lib.php
@@ -43,13 +43,13 @@ function propal_prepare_head($object)
 	$h++;
 
 	if ((empty($conf->commande->enabled) && ((!empty($conf->expedition->enabled) && !empty($conf->expedition_bon->enabled) && $user->rights->expedition->lire)
-	    || (!empty($conf->expedition->enabled) && !empty($conf->livraison_bon->enabled) && $user->rights->expedition->livraison->lire))))
+		|| (!empty($conf->expedition->enabled) && !empty($conf->delivery_note->enabled) && $user->rights->expedition->delivery->lire))))
 	{
 		$langs->load("sendings");
 		$text = '';
 		$head[$h][0] = DOL_URL_ROOT.'/expedition/propal.php?id='.$object->id;
 		if ($conf->expedition_bon->enabled) $text = $langs->trans("Shipment");
-		if ($conf->livraison_bon->enabled)  $text .= '/'.$langs->trans("Receivings");
+		if ($conf->delivery_note->enabled)  $text .= '/'.$langs->trans("Receivings");
 		$head[$h][1] = $text;
 		$head[$h][2] = 'shipping';
 		$h++;
@@ -57,7 +57,7 @@ function propal_prepare_head($object)
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
+		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/comm/propal/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
 		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
@@ -65,29 +65,29 @@ function propal_prepare_head($object)
 		$h++;
 	}
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'propal');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'propal');
 
-    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-    {
-    	$nbNote = 0;
-        if (!empty($object->note_private)) $nbNote++;
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+	{
+		$nbNote = 0;
+		if (!empty($object->note_private)) $nbNote++;
 		if (!empty($object->note_public)) $nbNote++;
-	    $head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?id='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
 		$head[$h][2] = 'note';
 		$h++;
-    }
+	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    $upload_dir = $conf->propal->multidir_output[$object->entity]."/".dol_sanitizeFileName($object->ref);
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->propal->multidir_output[$object->entity]."/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
@@ -129,13 +129,13 @@ function propal_admin_prepare_head()
 
 	$head[$h][0] = DOL_URL_ROOT.'/comm/admin/propal_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
-    $head[$h][2] = 'attributes';
-    $h++;
+	$head[$h][2] = 'attributes';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/comm/admin/propaldet_extrafields.php';
-    $head[$h][1] = $langs->trans("ExtraFieldsLines");
-    $head[$h][2] = 'attributeslines';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/comm/admin/propaldet_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFieldsLines");
+	$head[$h][2] = 'attributeslines';
+	$h++;
 
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'propal_admin', 'remove');
 
diff --git a/htdocs/core/lib/report.lib.php b/htdocs/core/lib/report.lib.php
index 67e01e376c9..b23acd76a5b 100644
--- a/htdocs/core/lib/report.lib.php
+++ b/htdocs/core/lib/report.lib.php
@@ -56,7 +56,7 @@ function report_header($reportname, $notused, $period, $periodlink, $description
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].$varlink.'">'."\n";
 	print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
 
-	dol_fiche_head($head, 'report');
+	print dol_get_fiche_head($head, 'report');
 
 	foreach ($moreparam as $key => $value)
 	{
@@ -115,7 +115,7 @@ function report_header($reportname, $notused, $period, $periodlink, $description
 
 	print '</table>'."\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center"><input type="submit" class="button" name="submit" value="'.$langs->trans("Refresh").'"></div>';
 
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index cd4bc333b41..9667a67d360 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -639,18 +639,18 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
  *	@param	int			$printheader		Show header before
  *  @param  int			$printfooter        Show footer after
  *  @param  int			$showonlymessage    Show only message parameter. Otherwise add more information.
- *  @param  array|null  $params         	Send params
+ *  @param  array|null  $params         	More parameters provided to hook
  *  @return	void
  */
 function accessforbidden($message = '', $printheader = 1, $printfooter = 1, $showonlymessage = 0, $params = null)
 {
-    global $conf, $db, $user, $langs, $hookmanager;
-    if (!is_object($langs))
-    {
-        include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
-        $langs = new Translate('', $conf);
-        $langs->setDefaultLang();
-    }
+	global $conf, $db, $user, $langs, $hookmanager;
+	if (!is_object($langs))
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
+		$langs = new Translate('', $conf);
+		$langs->setDefaultLang();
+	}
 
 	$langs->load("errors");
 
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index 6f206832e2d..fefe0aa19d5 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -34,10 +34,10 @@
  */
 function dol_getwebuser($mode)
 {
-    $t = '?';
-    if ($mode == 'user')  $t = getenv('APACHE_RUN_USER'); // $_ENV['APACHE_RUN_USER'] is empty
-    if ($mode == 'group') $t = getenv('APACHE_RUN_GROUP');
-    return $t;
+	$t = '?';
+	if ($mode == 'user')  $t = getenv('APACHE_RUN_USER'); // $_ENV['APACHE_RUN_USER'] is empty
+	if ($mode == 'group') $t = getenv('APACHE_RUN_GROUP');
+	return $t;
 }
 
 /**
@@ -53,64 +53,64 @@ function dol_getwebuser($mode)
 function checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $authmode, $context = '')
 {
 	global $conf, $langs;
-    //global $dolauthmode;    // To return authentication finally used
+	//global $dolauthmode;    // To return authentication finally used
 
 	// Check parameters
 	if ($entitytotest == '') $entitytotest = 1;
 
-    dol_syslog("checkLoginPassEntity usertotest=".$usertotest." entitytotest=".$entitytotest." authmode=".join(',', $authmode));
+	dol_syslog("checkLoginPassEntity usertotest=".$usertotest." entitytotest=".$entitytotest." authmode=".join(',', $authmode));
 	$login = '';
 
 	// Validation of login/pass/entity with standard modules
 	if (empty($login))
 	{
-	    $test = true;
-    	foreach ($authmode as $mode)
-    	{
-    		if ($test && $mode && !$login)
-    		{
-    		    // Validation of login/pass/entity for mode $mode
-    		    $mode = trim($mode);
-        		$authfile = 'functions_'.$mode.'.php';
-        		$fullauthfile = '';
+		$test = true;
+		foreach ($authmode as $mode)
+		{
+			if ($test && $mode && !$login)
+			{
+				// Validation of login/pass/entity for mode $mode
+				$mode = trim($mode);
+				$authfile = 'functions_'.$mode.'.php';
+				$fullauthfile = '';
 
-    		    $dirlogin = array_merge(array("/core/login"), (array) $conf->modules_parts['login']);
-    		    foreach ($dirlogin as $reldir)
-    		    {
-    		        $dir = dol_buildpath($reldir, 0);
-    		        $newdir = dol_osencode($dir);
+				$dirlogin = array_merge(array("/core/login"), (array) $conf->modules_parts['login']);
+				foreach ($dirlogin as $reldir)
+				{
+					$dir = dol_buildpath($reldir, 0);
+					$newdir = dol_osencode($dir);
 
-    		        // Check if file found (do not use dol_is_file to avoid loading files.lib.php)
-    		        $tmpnewauthfile = $newdir.(preg_match('/\/$/', $newdir) ? '' : '/').$authfile;
-    		        if (is_file($tmpnewauthfile)) $fullauthfile = $tmpnewauthfile;
-    		    }
+					// Check if file found (do not use dol_is_file to avoid loading files.lib.php)
+					$tmpnewauthfile = $newdir.(preg_match('/\/$/', $newdir) ? '' : '/').$authfile;
+					if (is_file($tmpnewauthfile)) $fullauthfile = $tmpnewauthfile;
+				}
 
-    		    $result = false;
-    		    if ($fullauthfile) $result = include_once $fullauthfile;
-    			if ($fullauthfile && $result)
-    			{
-    				// Call function to check user/password
-    				$function = 'check_user_password_'.$mode;
-    				$login = call_user_func($function, $usertotest, $passwordtotest, $entitytotest, $context);
-    				if ($login && $login != '--bad-login-validity--')	// Login is successfull
-    				{
-    					$test = false; // To stop once at first login success
-    					$conf->authmode = $mode; // This properties is defined only when logged to say what mode was successfully used
-    					$dol_tz = GETPOST('tz');
-    					$dol_dst = GETPOST('dst');
-    					$dol_screenwidth = GETPOST('screenwidth');
-    					$dol_screenheight = GETPOST('screenheight');
-    				}
-    			} else {
-    				dol_syslog("Authentication KO - failed to load file '".$authfile."'", LOG_ERR);
-    				sleep(1);
-    				// Load translation files required by the page
-                    $langs->loadLangs(array('other', 'main', 'errors'));
+				$result = false;
+				if ($fullauthfile) $result = include_once $fullauthfile;
+				if ($fullauthfile && $result)
+				{
+					// Call function to check user/password
+					$function = 'check_user_password_'.$mode;
+					$login = call_user_func($function, $usertotest, $passwordtotest, $entitytotest, $context);
+					if ($login && $login != '--bad-login-validity--')	// Login is successfull
+					{
+						$test = false; // To stop once at first login success
+						$conf->authmode = $mode; // This properties is defined only when logged to say what mode was successfully used
+						$dol_tz = GETPOST('tz');
+						$dol_dst = GETPOST('dst');
+						$dol_screenwidth = GETPOST('screenwidth');
+						$dol_screenheight = GETPOST('screenheight');
+					}
+				} else {
+					dol_syslog("Authentication KO - failed to load file '".$authfile."'", LOG_ERR);
+					sleep(1);
+					// Load translation files required by the page
+					$langs->loadLangs(array('other', 'main', 'errors'));
 
-    				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorFailedToLoadLoginFileForMode", $mode);
-    			}
-    		}
-    	}
+					$_SESSION["dol_loginmesg"] = $langs->trans("ErrorFailedToLoadLoginFileForMode", $mode);
+				}
+			}
+		}
 	}
 
 	return $login;
@@ -119,16 +119,16 @@ function checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $auth
 
 if (!function_exists('dol_loginfunction'))
 {
-    /**
-     * Show Dolibarr default login page.
-     * Part of this code is also duplicated into main.inc.php::top_htmlhead
-     *
-     * @param       Translate   $langs      Lang object (must be initialized by a new).
-     * @param       Conf        $conf       Conf object
-     * @param       Societe     $mysoc      Company object
-     * @return      void
-     */
-    function dol_loginfunction($langs, $conf, $mysoc)
+	/**
+	 * Show Dolibarr default login page.
+	 * Part of this code is also duplicated into main.inc.php::top_htmlhead
+	 *
+	 * @param       Translate   $langs      Lang object (must be initialized by a new).
+	 * @param       Conf        $conf       Conf object
+	 * @param       Societe     $mysoc      Company object
+	 * @return      void
+	 */
+	function dol_loginfunction($langs, $conf, $mysoc)
 	{
 		global $dolibarr_main_demo, $dolibarr_main_force_https;
 		global $db, $hookmanager;
@@ -260,9 +260,9 @@ if (!function_exists('dol_loginfunction'))
 		$main_home = '';
 		if (!empty($conf->global->MAIN_HOME))
 		{
-		    $substitutionarray = getCommonSubstitutionArray($langs);
-		    complete_substitutions_array($substitutionarray, $langs);
-		    $texttoshow = make_substitutions($conf->global->MAIN_HOME, $substitutionarray, $langs);
+			$substitutionarray = getCommonSubstitutionArray($langs);
+			complete_substitutions_array($substitutionarray, $langs);
+			$texttoshow = make_substitutions($conf->global->MAIN_HOME, $substitutionarray, $langs);
 
 			$main_home = dol_htmlcleanlastbr($texttoshow);
 		}
@@ -290,6 +290,8 @@ if (!function_exists('dol_loginfunction'))
 		// Include login page template
 		include $template_dir.'login.tpl.php';
 
+		// Global html output events ($mesgs, $errors, $warnings)
+		dol_htmloutput_events(0);
 
 		$_SESSION["dol_loginmesg"] = '';
 	}
@@ -448,15 +450,18 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 		{
 			$max = strlen($lowercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $lowercase[random_int(0, $max)];
+				$tmp = random_int(0, $max);
+				$randomCode .= $lowercase[$tmp];
 			}
 			$max = strlen($uppercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $uppercase[random_int(0, $max)];
+				$tmp = random_int(0, $max);
+				$randomCode .= $uppercase[$tmp];
 			}
 			$max = strlen($numbers) - 1;
 			for ($x = 0; $x < $nbofcharlast; $x++) {
-				$randomCode .= $numbers[random_int(0, $max)];
+				$tmp = random_int(0, $max);
+				$randomCode .= $numbers[$tmp];
 			}
 
 			$generated_password = str_shuffle($randomCode);
@@ -464,15 +469,18 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 		{
 			$max = strlen($lowercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $lowercase[mt_rand(0, $max)];
+				$tmp = mt_rand(0, $max);
+				$randomCode .= $lowercase[$tmp];
 			}
 			$max = strlen($uppercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $uppercase[mt_rand(0, $max)];
+				$tmp = mt_rand(0, $max);
+				$randomCode .= $uppercase[$tmp];
 			}
 			$max = strlen($numbers) - 1;
 			for ($x = 0; $x < $nbofcharlast; $x++) {
-				$randomCode .= $numbers[mt_rand(0, $max)];
+				$tmp = mt_rand(0, $max);
+				$randomCode .= $numbers[$tmp];
 			}
 
 			$generated_password = str_shuffle($randomCode);
@@ -493,11 +501,12 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 	{
 		$numbers = "ABCDEF";
 		$max = strlen($numbers) - 1;
-		if (function_exists('random_int'))	// Cryptographic random
-		{
-			$generated_password = str_replace($replaceambiguouschars, $numbers[random_int(0, $max)], $generated_password);
+		if (function_exists('random_int')) {	// Cryptographic random
+			$tmp = random_int(0, $max);
+			$generated_password = str_replace($replaceambiguouschars, $numbers[$tmp], $generated_password);
 		} else {
-			$generated_password = str_replace($replaceambiguouschars, $numbers[mt_rand(0, $max)], $generated_password);
+			$tmp = mt_rand(0, $max);
+			$generated_password = str_replace($replaceambiguouschars, $numbers[$tmp], $generated_password);
 		}
 	}
 
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index b81757f261f..cf1d1793a88 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -37,7 +37,7 @@ function shipping_prepare_head($object)
 	global $db, $langs, $conf, $user;
 
 	// Load translation files required by the page
-    $langs->loadLangs(array("sendings", "deliveries"));
+	$langs->loadLangs(array("sendings", "deliveries"));
 
 	$h = 0;
 	$head = array();
@@ -47,16 +47,16 @@ function shipping_prepare_head($object)
 	$head[$h][2] = 'shipping';
 	$h++;
 
-	if ($conf->livraison_bon->enabled && $user->rights->expedition->livraison->lire)
+	if ($conf->delivery_note->enabled && $user->rights->expedition->delivery->lire)
 	{
 		// delivery link
 		$object->fetchObjectLinked($object->id, $object->element);
 		if (is_array($object->linkedObjectsIds['delivery']) && count($object->linkedObjectsIds['delivery']) > 0)        // If there is a delivery
 		{
-		    // Take first one element of array
-		    $tmp = reset($object->linkedObjectsIds['delivery']);
+			// Take first one element of array
+			$tmp = reset($object->linkedObjectsIds['delivery']);
 
-			$head[$h][0] = DOL_URL_ROOT."/livraison/card.php?id=".$tmp;
+			$head[$h][0] = DOL_URL_ROOT."/delivery/card.php?id=".$tmp;
 			$head[$h][1] = $langs->trans("DeliveryCard");
 			$head[$h][2] = 'delivery';
 			$h++;
@@ -65,34 +65,34 @@ function shipping_prepare_head($object)
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-	    $objectsrc = $object;
-	    if ($object->origin == 'commande' && $object->origin_id > 0)
-	    {
-	        $objectsrc = new Commande($db);
-	        $objectsrc->fetch($object->origin_id);
-	    }
-	    $nbContact = count($objectsrc->liste_contact(-1, 'internal')) + count($objectsrc->liste_contact(-1, 'external'));
-	    $head[$h][0] = DOL_URL_ROOT."/expedition/contact.php?id=".$object->id;
-    	$head[$h][1] = $langs->trans("ContactsAddresses");
+		$objectsrc = $object;
+		if ($object->origin == 'commande' && $object->origin_id > 0)
+		{
+			$objectsrc = new Commande($db);
+			$objectsrc->fetch($object->origin_id);
+		}
+		$nbContact = count($objectsrc->liste_contact(-1, 'internal')) + count($objectsrc->liste_contact(-1, 'external'));
+		$head[$h][0] = DOL_URL_ROOT."/expedition/contact.php?id=".$object->id;
+		$head[$h][1] = $langs->trans("ContactsAddresses");
 		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
-    	$head[$h][2] = 'contact';
-    	$h++;
+		$head[$h][2] = 'contact';
+		$h++;
 	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->commande->dir_output."/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/expedition/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 
-    $nbNote = 0;
-    if (!empty($object->note_private)) $nbNote++;
-    if (!empty($object->note_public)) $nbNote++;
+	$nbNote = 0;
+	if (!empty($object->note_private)) $nbNote++;
+	if (!empty($object->note_public)) $nbNote++;
 	$head[$h][0] = DOL_URL_ROOT."/expedition/note.php?id=".$object->id;
 	$head[$h][1] = $langs->trans("Notes");
 	if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
@@ -101,8 +101,8 @@ function shipping_prepare_head($object)
 
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'delivery');
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'delivery', 'remove');
@@ -122,7 +122,7 @@ function delivery_prepare_head($object)
 	global $langs, $db, $conf, $user;
 
 	// Load translation files required by the page
-    $langs->loadLangs(array("sendings", "deliveries"));
+	$langs->loadLangs(array("sendings", "deliveries"));
 
 	$h = 0;
 	$head = array();
@@ -135,7 +135,7 @@ function delivery_prepare_head($object)
 		$h++;
 	}
 
-	$head[$h][0] = DOL_URL_ROOT."/livraison/card.php?id=".$object->id;
+	$head[$h][0] = DOL_URL_ROOT."/delivery/card.php?id=".$object->id;
 	$head[$h][1] = $langs->trans("DeliveryCard");
 	$head[$h][2] = 'delivery';
 	$h++;
@@ -157,11 +157,21 @@ function delivery_prepare_head($object)
 		$tmpobject = $object;
 	}
 
-	$head[$h][0] = DOL_URL_ROOT."/expedition/contact.php?id=".$tmpobject->id;
-	$head[$h][1] = $langs->trans("ContactsAddresses");
-	$head[$h][2] = 'contact';
-	$h++;
-
+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+	{
+		$objectsrc = $tmpobject;
+		if ($tmpobject->origin == 'commande' && $tmpobject->origin_id > 0)
+		{
+			$objectsrc = new Commande($db);
+			$objectsrc->fetch($tmpobject->origin_id);
+		}
+		$nbContact = count($objectsrc->liste_contact(-1, 'internal')) + count($objectsrc->liste_contact(-1, 'external'));
+		$head[$h][0] = DOL_URL_ROOT."/expedition/contact.php?id=".$tmpobject->id;
+		$head[$h][1] = $langs->trans("ContactsAddresses");
+		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		$head[$h][2] = 'contact';
+		$h++;
+	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
@@ -185,7 +195,7 @@ function delivery_prepare_head($object)
 
 	$object->id = $tmpobject->id;
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'delivery');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'delivery');
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'delivery', 'remove');
 
@@ -213,13 +223,13 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 	$sql = "SELECT obj.rowid, obj.fk_product, obj.label, obj.description, obj.product_type as fk_product_type, obj.qty as qty_asked, obj.date_start, obj.date_end,";
 	$sql .= " ed.rowid as edrowid, ed.qty as qty_shipped, ed.fk_expedition as expedition_id, ed.fk_origin_line, ed.fk_entrepot as warehouse_id,";
 	$sql .= " e.rowid as sendingid, e.ref as exp_ref, e.date_creation, e.date_delivery, e.date_expedition,";
-	//if ($conf->livraison_bon->enabled) $sql .= " l.rowid as livraison_id, l.ref as livraison_ref, l.date_delivery, ld.qty as qty_received,";
+	//if ($conf->delivery_note->enabled) $sql .= " l.rowid as livraison_id, l.ref as livraison_ref, l.date_delivery, ld.qty as qty_received,";
 	$sql .= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.tobatch as product_tobatch,';
 	$sql .= ' p.description as product_desc';
 	$sql .= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed";
 	$sql .= ", ".MAIN_DB_PREFIX."expedition as e";
 	$sql .= ", ".MAIN_DB_PREFIX.$origin."det as obj";
-	//if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."livraisondet as ld ON ld.fk_livraison = l.rowid  AND obj.rowid = ld.fk_origin_line";
+	//if ($conf->delivery_note->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."deliverydet as ld ON ld.fk_delivery = l.rowid  AND obj.rowid = ld.fk_origin_line";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
 	//TODO Add link to expeditiondet_batch
 	$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
@@ -252,7 +262,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 			print '<td class="center">'.$langs->trans("QtyPreparedOrShipped").'</td>';
 			if (!empty($conf->stock->enabled))
 			{
-                print '<td>'.$langs->trans("Warehouse").'</td>';
+				print '<td>'.$langs->trans("Warehouse").'</td>';
 			}
 			/*TODO Add link to expeditiondet_batch
 			if (! empty($conf->productbatch->enabled))
@@ -260,7 +270,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 			    print '<td>';
 			    print '</td>';
 			}*/
-			if (!empty($conf->livraison_bon->enabled))
+			if (!empty($conf->delivery_note->enabled))
 			{
 				print '<td>'.$langs->trans("DeliveryOrder").'</td>';
 				//print '<td class="center">'.$langs->trans("QtyReceived").'</td>';
@@ -361,13 +371,13 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 				// Warehouse
 				if (!empty($conf->stock->enabled))
 				{
-				    print '<td>';
-    				if ($objp->warehouse_id > 0)
-    				{
-        				$warehousestatic->fetch($objp->warehouse_id);
-        				print $warehousestatic->getNomUrl(1);
-    				}
-    				print '</td>';
+					print '<td>';
+					if ($objp->warehouse_id > 0)
+					{
+						$warehousestatic->fetch($objp->warehouse_id);
+						print $warehousestatic->getNomUrl(1);
+					}
+					print '</td>';
 				}
 
 				// Batch number managment
@@ -403,9 +413,9 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 				}*/
 
 				// Informations on receipt
-				if (!empty($conf->livraison_bon->enabled))
+				if (!empty($conf->delivery_note->enabled))
 				{
-					include_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php';
+					include_once DOL_DOCUMENT_ROOT.'/delivery/class/delivery.class.php';
 					$expedition->id = $objp->sendingid;
 					$expedition->fetchObjectLinked($expedition->id, $expedition->element);
 					//var_dump($expedition->linkedObjects);
@@ -423,7 +433,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 						// Ref
 						print '<td>';
 						print $receiving->getNomUrl($db);
-						//print '<a href="'.DOL_URL_ROOT.'/livraison/card.php?id='.$livraison_id.'">'.img_object($langs->trans("ShowReceiving"),'sending').' '.$objp->livraison_ref.'<a>';
+						//print '<a href="'.DOL_URL_ROOT.'/delivery/card.php?id='.$livraison_id.'">'.img_object($langs->trans("ShowReceiving"),'sending').' '.$objp->livraison_ref.'<a>';
 						print '</td>';
 						// Qty received
 						//print '<td class="center">';
diff --git a/htdocs/core/lib/signature.lib.php b/htdocs/core/lib/signature.lib.php
index 37cb9b31e8d..14ca70926d3 100644
--- a/htdocs/core/lib/signature.lib.php
+++ b/htdocs/core/lib/signature.lib.php
@@ -29,7 +29,7 @@ function showOnlineSignatureUrl($type, $ref)
 	global $conf, $langs;
 
 	// Load translation files required by the page
-    $langs->loadLangs(array("payment", "paybox"));
+	$langs->loadLangs(array("payment", "paybox"));
 
 	$servicename = 'Online';
 
diff --git a/htdocs/core/lib/stock.lib.php b/htdocs/core/lib/stock.lib.php
index 0b9deb7779b..2d6768010fb 100644
--- a/htdocs/core/lib/stock.lib.php
+++ b/htdocs/core/lib/stock.lib.php
@@ -66,20 +66,20 @@ function stock_prepare_head($object)
 	}
 	*/
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'stock');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'stock');
 
-    $head[$h][0] = DOL_URL_ROOT.'/product/stock/info.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/product/stock/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Info");
 	$head[$h][2] = 'info';
 	$h++;
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'stock', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'stock', 'remove');
 
-    return $head;
+	return $head;
 }
 
 /**
@@ -89,28 +89,28 @@ function stock_prepare_head($object)
  */
 function stock_admin_prepare_head()
 {
-    global $langs, $conf, $user;
+	global $langs, $conf, $user;
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/admin/stock.php';
-    $head[$h][1] = $langs->trans("Miscellaneous");
-    $head[$h][2] = 'general';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/admin/stock.php';
+	$head[$h][1] = $langs->trans("Miscellaneous");
+	$head[$h][2] = 'general';
+	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'stock_admin');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'stock_admin');
 
-    $head[$h][0] = DOL_URL_ROOT.'/product/admin/stock_extrafields.php';
-    $head[$h][1] = $langs->trans("ExtraFields");
-    $head[$h][2] = 'attributes';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/product/admin/stock_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFields");
+	$head[$h][2] = 'attributes';
+	$h++;
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'stock_admin', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'stock_admin', 'remove');
 
-    return $head;
+	return $head;
 }
diff --git a/htdocs/core/lib/supplier_proposal.lib.php b/htdocs/core/lib/supplier_proposal.lib.php
index ddc85616ba6..ec782350c9d 100644
--- a/htdocs/core/lib/supplier_proposal.lib.php
+++ b/htdocs/core/lib/supplier_proposal.lib.php
@@ -34,7 +34,7 @@ function supplier_proposal_prepare_head($object)
 	global $db, $langs, $conf, $user;
 
 	// Load translation files required by the page
-    $langs->loadLangs(array("supplier_proposal", "compta"));
+	$langs->loadLangs(array("supplier_proposal", "compta"));
 
 	$h = 0;
 	$head = array();
@@ -54,29 +54,29 @@ function supplier_proposal_prepare_head($object)
 		$h++;
 	}
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_proposal');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_proposal');
 
-    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-    {
-    	$nbNote = 0;
-        if (!empty($object->note_private)) $nbNote++;
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+	{
+		$nbNote = 0;
+		if (!empty($object->note_private)) $nbNote++;
 		if (!empty($object->note_public)) $nbNote++;
-	    $head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/note.php?id='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
 		$head[$h][2] = 'note';
 		$h++;
-    }
+	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->supplier_proposal->dir_output."/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
@@ -118,13 +118,13 @@ function supplier_proposal_admin_prepare_head()
 
 	$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/admin/supplier_proposal_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
-    $head[$h][2] = 'attributes';
-    $h++;
+	$head[$h][2] = 'attributes';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/admin/supplier_proposaldet_extrafields.php';
-    $head[$h][1] = $langs->trans("ExtraFieldsLines");
-    $head[$h][2] = 'attributeslines';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/admin/supplier_proposaldet_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFieldsLines");
+	$head[$h][2] = 'attributeslines';
+	$h++;
 
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'supplier_proposal_admin', 'remove');
 
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index d56d2260afc..36ce55f7c85 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -36,41 +36,41 @@
  */
 function tax_prepare_head(ChargeSociales $object)
 {
-    global $db, $langs, $conf, $user;
+	global $db, $langs, $conf, $user;
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('SocialContribution');
 	$head[$h][2] = 'card';
 	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'tax');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'tax');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->tax->dir_output."/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/compta/sociales/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Documents");
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/compta/sociales/info.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("Info");
-    $head[$h][2] = 'info';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/compta/sociales/info.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Info");
+	$head[$h][2] = 'info';
+	$h++;
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'tax', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'tax', 'remove');
 
-    return $head;
+	return $head;
 }
 
 
@@ -90,438 +90,438 @@ function tax_prepare_head(ChargeSociales $object)
  */
 function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $direction, $m = 0, $q = 0)
 {
-    global $conf;
+	global $conf;
 
-    // If we use date_start and date_end, we must not use $y, $m, $q
-    if (($date_start || $date_end) && (!empty($y) || !empty($m) || !empty($q)))
-    {
-    	dol_print_error('', 'Bad value of input parameter for tax_by_rate');
-    }
+	// If we use date_start and date_end, we must not use $y, $m, $q
+	if (($date_start || $date_end) && (!empty($y) || !empty($m) || !empty($q)))
+	{
+		dol_print_error('', 'Bad value of input parameter for tax_by_rate');
+	}
 
-    $list = array();
-    if ($direction == 'sell')
-    {
-    	$invoicetable = 'facture';
-    	$invoicedettable = 'facturedet';
-    	$fk_facture = 'fk_facture';
-    	$fk_facture2 = 'fk_facture';
-    	$fk_payment = 'fk_paiement';
-    	$total_tva = 'total_tva';
-    	$paymenttable = 'paiement';
-    	$paymentfacturetable = 'paiement_facture';
-    	$invoicefieldref = 'ref';
-    } elseif ($direction == 'buy')
-    {
-    	$invoicetable = 'facture_fourn';
-    	$invoicedettable = 'facture_fourn_det';
-    	$fk_facture = 'fk_facture_fourn';
-    	$fk_facture2 = 'fk_facturefourn';
-    	$fk_payment = 'fk_paiementfourn';
-    	$total_tva = 'tva';
-    	$paymenttable = 'paiementfourn';
-    	$paymentfacturetable = 'paiementfourn_facturefourn';
-    	$invoicefieldref = 'ref';
-    }
+	$list = array();
+	if ($direction == 'sell')
+	{
+		$invoicetable = 'facture';
+		$invoicedettable = 'facturedet';
+		$fk_facture = 'fk_facture';
+		$fk_facture2 = 'fk_facture';
+		$fk_payment = 'fk_paiement';
+		$total_tva = 'total_tva';
+		$paymenttable = 'paiement';
+		$paymentfacturetable = 'paiement_facture';
+		$invoicefieldref = 'ref';
+	} elseif ($direction == 'buy')
+	{
+		$invoicetable = 'facture_fourn';
+		$invoicedettable = 'facture_fourn_det';
+		$fk_facture = 'fk_facture_fourn';
+		$fk_facture2 = 'fk_facturefourn';
+		$fk_payment = 'fk_paiementfourn';
+		$total_tva = 'tva';
+		$paymenttable = 'paiementfourn';
+		$paymentfacturetable = 'paiementfourn_facturefourn';
+		$invoicefieldref = 'ref';
+	}
 
-    if (strpos($type, 'localtax') === 0) {
-    	$f_rate = $type.'_tx';
-    } else {
-    	$f_rate = 'tva_tx';
-    }
+	if (strpos($type, 'localtax') === 0) {
+		$f_rate = $type.'_tx';
+	} else {
+		$f_rate = 'tva_tx';
+	}
 
-    $total_localtax1 = 'total_localtax1';
-    $total_localtax2 = 'total_localtax2';
+	$total_localtax1 = 'total_localtax1';
+	$total_localtax2 = 'total_localtax2';
 
 
-    // CAS DES BIENS/PRODUITS
+	// CAS DES BIENS/PRODUITS
 
-    // Define sql request
-    $sql = '';
-    if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-    	|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice'))
-    {
-    	// Count on delivery date (use invoice date as delivery is unknown)
-    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-    	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-    	$sql .= " d.date_start as date_start, d.date_end as date_end,";
-    	$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-    	$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-    	$sql .= " 0 as payment_id, 0 as payment_amount";
-    	$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-    	$sql .= " ".MAIN_DB_PREFIX."societe as s,";
-    	$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
-    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-    	$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
-    	$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
-    	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
-    	else $sql .= " AND f.type IN (0,1,2,3,5)";
-    	$sql .= " AND f.rowid = d.".$fk_facture;
-    	$sql .= " AND s.rowid = f.fk_soc";
-    	if ($y && $m)
-    	{
-    		$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
-    		$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-    	} elseif ($y)
-    	{
-    		$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
-    		$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
-    	}
-    	if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
-    	if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-    	$sql .= " AND (d.product_type = 0"; // Limit to products
-    	$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-    	$sql .= " ORDER BY d.rowid, d.".$fk_facture;
-    } else {
-    	// Count on payments date
-    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-    	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-    	$sql .= " d.date_start as date_start, d.date_end as date_end,";
-    	$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-    	$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-    	$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
-    	$sql .= " pa.datep as datep";
-    	$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-    	$sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
-    	$sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
-    	$sql .= " ".MAIN_DB_PREFIX."societe as s,";
-    	$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
-    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-    	$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
-    	$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
-    	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
-    	else $sql .= " AND f.type IN (0,1,2,3,5)";
-    	$sql .= " AND f.rowid = d.".$fk_facture;
-    	$sql .= " AND s.rowid = f.fk_soc";
-    	$sql .= " AND pf.".$fk_facture2." = f.rowid";
-    	$sql .= " AND pa.rowid = pf.".$fk_payment;
-    	if ($y && $m)
-    	{
-    		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
-    		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-    	} elseif ($y)
-    	{
-    		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
-    		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
-    	}
-    	if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
-    	if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
-    	$sql .= " AND (d.product_type = 0"; // Limit to products
-    	$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-    	$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
-    }
+	// Define sql request
+	$sql = '';
+	if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+		|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice'))
+	{
+		// Count on delivery date (use invoice date as delivery is unknown)
+		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+		$sql .= " d.date_start as date_start, d.date_end as date_end,";
+		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+		$sql .= " 0 as payment_id, 0 as payment_amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+		$sql .= " ".MAIN_DB_PREFIX."societe as s,";
+		$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
+		$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+		else $sql .= " AND f.type IN (0,1,2,3,5)";
+		$sql .= " AND f.rowid = d.".$fk_facture;
+		$sql .= " AND s.rowid = f.fk_soc";
+		if ($y && $m)
+		{
+			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+		} elseif ($y)
+		{
+			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+		}
+		if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
+		if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		$sql .= " AND (d.product_type = 0"; // Limit to products
+		$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		$sql .= " ORDER BY d.rowid, d.".$fk_facture;
+	} else {
+		// Count on payments date
+		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+		$sql .= " d.date_start as date_start, d.date_end as date_end,";
+		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+		$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
+		$sql .= " pa.datep as datep";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+		$sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
+		$sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
+		$sql .= " ".MAIN_DB_PREFIX."societe as s,";
+		$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
+		$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+		else $sql .= " AND f.type IN (0,1,2,3,5)";
+		$sql .= " AND f.rowid = d.".$fk_facture;
+		$sql .= " AND s.rowid = f.fk_soc";
+		$sql .= " AND pf.".$fk_facture2." = f.rowid";
+		$sql .= " AND pa.rowid = pf.".$fk_payment;
+		if ($y && $m)
+		{
+			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+		} elseif ($y)
+		{
+			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+		}
+		if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
+		if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+		$sql .= " AND (d.product_type = 0"; // Limit to products
+		$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
+	}
 
-    if (!$sql) return -1;
-    if ($sql == 'TODO') return -2;
-    if ($sql != 'TODO')
-    {
-    	dol_syslog("Tax.lib.php::tax_by_thirdparty", LOG_DEBUG);
+	if (!$sql) return -1;
+	if ($sql == 'TODO') return -2;
+	if ($sql != 'TODO')
+	{
+		dol_syslog("Tax.lib.php::tax_by_thirdparty", LOG_DEBUG);
 
-    	$resql = $db->query($sql);
-    	if ($resql)
-    	{
-    		$company_id = -1;
-    		$oldrowid = '';
-    		while ($assoc = $db->fetch_array($resql))
-    		{
-    			if (!isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht'] = 0;
-    			if (!isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat'] = 0;
-    			if (!isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1'] = 0;
-    			if (!isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2'] = 0;
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$company_id = -1;
+			$oldrowid = '';
+			while ($assoc = $db->fetch_array($resql))
+			{
+				if (!isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht'] = 0;
+				if (!isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat'] = 0;
+				if (!isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1'] = 0;
+				if (!isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2'] = 0;
 
-    			if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
-    			{
-    				$oldrowid = $assoc['rowid'];
-    				$list[$assoc['company_id']]['totalht']  += $assoc['total_ht'];
-    				$list[$assoc['company_id']]['vat']      += $assoc['total_vat'];
-    				$list[$assoc['company_id']]['localtax1']      += $assoc['total_localtax1'];
-    				$list[$assoc['company_id']]['localtax2']      += $assoc['total_localtax2'];
-    			}
-    			$list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];
-    			$list[$assoc['company_id']]['dtype'][] = $assoc['dtype'];
-    			$list[$assoc['company_id']]['datef'][] = $db->jdate($assoc['datef']);
-    			$list[$assoc['company_id']]['datep'][] = $db->jdate($assoc['datep']);
-    			$list[$assoc['company_id']]['company_name'][] = $assoc['company_name'];
-    			$list[$assoc['company_id']]['company_id'][] = $assoc['company_id'];
-    			$list[$assoc['company_id']]['drate'][] = $assoc['rate'];
-    			$list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);
-    			$list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);
+				if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
+				{
+					$oldrowid = $assoc['rowid'];
+					$list[$assoc['company_id']]['totalht']  += $assoc['total_ht'];
+					$list[$assoc['company_id']]['vat']      += $assoc['total_vat'];
+					$list[$assoc['company_id']]['localtax1']      += $assoc['total_localtax1'];
+					$list[$assoc['company_id']]['localtax2']      += $assoc['total_localtax2'];
+				}
+				$list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];
+				$list[$assoc['company_id']]['dtype'][] = $assoc['dtype'];
+				$list[$assoc['company_id']]['datef'][] = $db->jdate($assoc['datef']);
+				$list[$assoc['company_id']]['datep'][] = $db->jdate($assoc['datep']);
+				$list[$assoc['company_id']]['company_name'][] = $assoc['company_name'];
+				$list[$assoc['company_id']]['company_id'][] = $assoc['company_id'];
+				$list[$assoc['company_id']]['drate'][] = $assoc['rate'];
+				$list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);
+				$list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);
 
-    			$list[$assoc['company_id']]['facid'][] = $assoc['facid'];
-    			$list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];
-    			$list[$assoc['company_id']]['type'][] = $assoc['type'];
-    			$list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
-    			$list[$assoc['company_id']]['descr'][] = $assoc['descr'];
+				$list[$assoc['company_id']]['facid'][] = $assoc['facid'];
+				$list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];
+				$list[$assoc['company_id']]['type'][] = $assoc['type'];
+				$list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
+				$list[$assoc['company_id']]['descr'][] = $assoc['descr'];
 
-    			$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
-    			$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
-    			$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
-    			$list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];
+				$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
+				$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
+				$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
+				$list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];
 
-    			$list[$assoc['company_id']]['pid'][] = $assoc['pid'];
-    			$list[$assoc['company_id']]['pref'][] = $assoc['pref'];
-    			$list[$assoc['company_id']]['ptype'][] = $assoc['ptype'];
+				$list[$assoc['company_id']]['pid'][] = $assoc['pid'];
+				$list[$assoc['company_id']]['pref'][] = $assoc['pref'];
+				$list[$assoc['company_id']]['ptype'][] = $assoc['ptype'];
 
-    			$list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];
-    			$list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];
+				$list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];
+				$list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];
 
-    			$company_id = $assoc['company_id'];
-    		}
-    	} else {
-    		dol_print_error($db);
-    		return -3;
-    	}
-    }
+				$company_id = $assoc['company_id'];
+			}
+		} else {
+			dol_print_error($db);
+			return -3;
+		}
+	}
 
 
-    // CAS DES SERVICES
+	// CAS DES SERVICES
 
-    // Define sql request
-    $sql = '';
-    if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')
-    	|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
-    {
-    	// Count on invoice date
-    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-    	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-    	$sql .= " d.date_start as date_start, d.date_end as date_end,";
-    	$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-    	$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-    	$sql .= " 0 as payment_id, 0 as payment_amount";
-    	$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-    	$sql .= " ".MAIN_DB_PREFIX."societe as s,";
-    	$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
-    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-    	$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
-    	$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
-    	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
-    	else $sql .= " AND f.type IN (0,1,2,3,5)";
-    	$sql .= " AND f.rowid = d.".$fk_facture;
-    	$sql .= " AND s.rowid = f.fk_soc";
-    	if ($y && $m)
-    	{
-    		$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
-    		$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-    	} elseif ($y)
-    	{
-    		$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
-    		$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
-    	}
-    	if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
-    	if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-    	$sql .= " AND (d.product_type = 1"; // Limit to services
-    	$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-    	$sql .= " ORDER BY d.rowid, d.".$fk_facture;
-    } else {
-    	// Count on payments date
-    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-    	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-    	$sql .= " d.date_start as date_start, d.date_end as date_end,";
-    	$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-    	$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-    	$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
-    	$sql .= " pa.datep as datep";
-    	$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-    	$sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
-    	$sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
-    	$sql .= " ".MAIN_DB_PREFIX."societe as s,";
-    	$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
-    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-    	$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
-    	$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
-    	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
-    	else $sql .= " AND f.type IN (0,1,2,3,5)";
-    	$sql .= " AND f.rowid = d.".$fk_facture;
-    	$sql .= " AND s.rowid = f.fk_soc";
-    	$sql .= " AND pf.".$fk_facture2." = f.rowid";
-    	$sql .= " AND pa.rowid = pf.".$fk_payment;
-    	if ($y && $m)
-    	{
-    		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
-    		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-    	} elseif ($y)
-    	{
-    		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
-    		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
-    	}
-    	if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
-    	if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
-    	$sql .= " AND (d.product_type = 1"; // Limit to services
-    	$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-    	$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
-    }
+	// Define sql request
+	$sql = '';
+	if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')
+		|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
+	{
+		// Count on invoice date
+		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+		$sql .= " d.date_start as date_start, d.date_end as date_end,";
+		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+		$sql .= " 0 as payment_id, 0 as payment_amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+		$sql .= " ".MAIN_DB_PREFIX."societe as s,";
+		$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
+		$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+		else $sql .= " AND f.type IN (0,1,2,3,5)";
+		$sql .= " AND f.rowid = d.".$fk_facture;
+		$sql .= " AND s.rowid = f.fk_soc";
+		if ($y && $m)
+		{
+			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+		} elseif ($y)
+		{
+			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+		}
+		if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
+		if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		$sql .= " AND (d.product_type = 1"; // Limit to services
+		$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		$sql .= " ORDER BY d.rowid, d.".$fk_facture;
+	} else {
+		// Count on payments date
+		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+		$sql .= " d.date_start as date_start, d.date_end as date_end,";
+		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+		$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
+		$sql .= " pa.datep as datep";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+		$sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
+		$sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
+		$sql .= " ".MAIN_DB_PREFIX."societe as s,";
+		$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
+		$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+		else $sql .= " AND f.type IN (0,1,2,3,5)";
+		$sql .= " AND f.rowid = d.".$fk_facture;
+		$sql .= " AND s.rowid = f.fk_soc";
+		$sql .= " AND pf.".$fk_facture2." = f.rowid";
+		$sql .= " AND pa.rowid = pf.".$fk_payment;
+		if ($y && $m)
+		{
+			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+		} elseif ($y)
+		{
+			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+		}
+		if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
+		if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+		$sql .= " AND (d.product_type = 1"; // Limit to services
+		$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
+	}
 
-    if (!$sql)
-    {
-    	dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);
-    	return -1; // -1 = Not accountancy module enabled
-    }
-    if ($sql == 'TODO') return -2; // -2 = Feature not yet available
-    if ($sql != 'TODO')
-    {
-    	dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
-    	$resql = $db->query($sql);
-    	if ($resql)
-    	{
-    		$company_id = -1;
-    		$oldrowid = '';
-    		while ($assoc = $db->fetch_array($resql))
-    		{
-    			if (!isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht'] = 0;
-    			if (!isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat'] = 0;
-    			if (!isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1'] = 0;
-    			if (!isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2'] = 0;
+	if (!$sql)
+	{
+		dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);
+		return -1; // -1 = Not accountancy module enabled
+	}
+	if ($sql == 'TODO') return -2; // -2 = Feature not yet available
+	if ($sql != 'TODO')
+	{
+		dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$company_id = -1;
+			$oldrowid = '';
+			while ($assoc = $db->fetch_array($resql))
+			{
+				if (!isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht'] = 0;
+				if (!isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat'] = 0;
+				if (!isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1'] = 0;
+				if (!isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2'] = 0;
 
-    			if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
-    			{
-    				$oldrowid = $assoc['rowid'];
-    				$list[$assoc['company_id']]['totalht']  += $assoc['total_ht'];
-    				$list[$assoc['company_id']]['vat']      += $assoc['total_vat'];
-    				$list[$assoc['company_id']]['localtax1']	 += $assoc['total_localtax1'];
-    				$list[$assoc['company_id']]['localtax2']	 += $assoc['total_localtax2'];
-    			}
-    			$list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];
-    			$list[$assoc['company_id']]['dtype'][] = $assoc['dtype'];
-    			$list[$assoc['company_id']]['datef'][] = $db->jdate($assoc['datef']);
-    			$list[$assoc['company_id']]['datep'][] = $db->jdate($assoc['datep']);
-    			$list[$assoc['company_id']]['company_name'][] = $assoc['company_name'];
-    			$list[$assoc['company_id']]['company_id'][] = $assoc['company_id'];
-    			$list[$assoc['company_id']]['drate'][] = $assoc['rate'];
-    			$list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);
-    			$list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);
+				if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
+				{
+					$oldrowid = $assoc['rowid'];
+					$list[$assoc['company_id']]['totalht']  += $assoc['total_ht'];
+					$list[$assoc['company_id']]['vat']      += $assoc['total_vat'];
+					$list[$assoc['company_id']]['localtax1']	 += $assoc['total_localtax1'];
+					$list[$assoc['company_id']]['localtax2']	 += $assoc['total_localtax2'];
+				}
+				$list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];
+				$list[$assoc['company_id']]['dtype'][] = $assoc['dtype'];
+				$list[$assoc['company_id']]['datef'][] = $db->jdate($assoc['datef']);
+				$list[$assoc['company_id']]['datep'][] = $db->jdate($assoc['datep']);
+				$list[$assoc['company_id']]['company_name'][] = $assoc['company_name'];
+				$list[$assoc['company_id']]['company_id'][] = $assoc['company_id'];
+				$list[$assoc['company_id']]['drate'][] = $assoc['rate'];
+				$list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);
+				$list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);
 
-    			$list[$assoc['company_id']]['facid'][] = $assoc['facid'];
-    			$list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];
-    			$list[$assoc['company_id']]['type'][] = $assoc['type'];
-    			$list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
-    			$list[$assoc['company_id']]['descr'][] = $assoc['descr'];
+				$list[$assoc['company_id']]['facid'][] = $assoc['facid'];
+				$list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];
+				$list[$assoc['company_id']]['type'][] = $assoc['type'];
+				$list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
+				$list[$assoc['company_id']]['descr'][] = $assoc['descr'];
 
-    			$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
-    			$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
-    			$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
-    			$list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];
+				$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
+				$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
+				$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
+				$list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];
 
-    			$list[$assoc['company_id']]['pid'][] = $assoc['pid'];
-    			$list[$assoc['company_id']]['pref'][] = $assoc['pref'];
-    			$list[$assoc['company_id']]['ptype'][] = $assoc['ptype'];
+				$list[$assoc['company_id']]['pid'][] = $assoc['pid'];
+				$list[$assoc['company_id']]['pref'][] = $assoc['pref'];
+				$list[$assoc['company_id']]['ptype'][] = $assoc['ptype'];
 
-    			$list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];
-    			$list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];
+				$list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];
+				$list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];
 
-    			$company_id = $assoc['company_id'];
-    		}
-    	} else {
-    		dol_print_error($db);
-    		return -3;
-    	}
-    }
+				$company_id = $assoc['company_id'];
+			}
+		} else {
+			dol_print_error($db);
+			return -3;
+		}
+	}
 
 
-    // CASE OF EXPENSE REPORT
+	// CASE OF EXPENSE REPORT
 
-    if ($direction == 'buy')		// buy only for expense reports
-    {
-    	// Define sql request
-    	$sql = '';
+	if ($direction == 'buy')		// buy only for expense reports
+	{
+		// Define sql request
+		$sql = '';
 
-    	// Count on payments date
-    	$sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,";
-    	$sql .= " d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, ";
-    	$sql .= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,";
-    	$sql .= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,";
-    	$sql .= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as e";
-    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid ";
-    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid ";
-    	$sql .= " WHERE e.entity = ".$conf->entity;
-    	$sql .= " AND e.fk_statut in (6)";
-    	if ($y && $m)
-    	{
-    		$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
-    		$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-    	} elseif ($y)
-    	{
-    		$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
-    		$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
-    	}
-    	if ($q) $sql .= " AND (date_format(p.datep,'%m') > ".(($q - 1) * 3)." AND date_format(p.datep,'%m') <= ".($q * 3).")";
-    	if ($date_start && $date_end) $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
-    	$sql .= " AND (d.product_type = -1";
-    	$sql .= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
-    	$sql .= " ORDER BY e.rowid";
+		// Count on payments date
+		$sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,";
+		$sql .= " d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, ";
+		$sql .= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,";
+		$sql .= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,";
+		$sql .= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref";
+		$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as e";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid ";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid ";
+		$sql .= " WHERE e.entity = ".$conf->entity;
+		$sql .= " AND e.fk_statut in (6)";
+		if ($y && $m)
+		{
+			$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+			$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+		} elseif ($y)
+		{
+			$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+			$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+		}
+		if ($q) $sql .= " AND (date_format(p.datep,'%m') > ".(($q - 1) * 3)." AND date_format(p.datep,'%m') <= ".($q * 3).")";
+		if ($date_start && $date_end) $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		$sql .= " AND (d.product_type = -1";
+		$sql .= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
+		$sql .= " ORDER BY e.rowid";
 
-    	if (!$sql)
-    	{
-    		dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);
-    		return -1; // -1 = Not accountancy module enabled
-    	}
-    	if ($sql == 'TODO') return -2; // -2 = Feature not yet available
-    	if ($sql != 'TODO')
-    	{
-    		dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
-    		$resql = $db->query($sql);
-    		if ($resql)
-    		{
-    			$company_id = -1;
-    			$oldrowid = '';
-    			while ($assoc = $db->fetch_array($resql))
-    			{
-    				if (!isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht'] = 0;
-    				if (!isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat'] = 0;
-    				if (!isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1'] = 0;
-    				if (!isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2'] = 0;
+		if (!$sql)
+		{
+			dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);
+			return -1; // -1 = Not accountancy module enabled
+		}
+		if ($sql == 'TODO') return -2; // -2 = Feature not yet available
+		if ($sql != 'TODO')
+		{
+			dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$company_id = -1;
+				$oldrowid = '';
+				while ($assoc = $db->fetch_array($resql))
+				{
+					if (!isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht'] = 0;
+					if (!isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat'] = 0;
+					if (!isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1'] = 0;
+					if (!isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2'] = 0;
 
-    				if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
-    				{
-    					$oldrowid = $assoc['rowid'];
-    					$list[$assoc['company_id']]['totalht'] += $assoc['total_ht'];
-    					$list[$assoc['company_id']]['vat'] += $assoc['total_vat'];
-    					$list[$assoc['company_id']]['localtax1']	 += $assoc['total_localtax1'];
-    					$list[$assoc['company_id']]['localtax2']	 += $assoc['total_localtax2'];
-    				}
+					if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
+					{
+						$oldrowid = $assoc['rowid'];
+						$list[$assoc['company_id']]['totalht'] += $assoc['total_ht'];
+						$list[$assoc['company_id']]['vat'] += $assoc['total_vat'];
+						$list[$assoc['company_id']]['localtax1']	 += $assoc['total_localtax1'];
+						$list[$assoc['company_id']]['localtax2']	 += $assoc['total_localtax2'];
+					}
 
-    				$list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];
-    				$list[$assoc['company_id']]['dtype'][] = 'ExpenseReportPayment';
-    				$list[$assoc['company_id']]['datef'][] = $assoc['datef'];
-    				$list[$assoc['company_id']]['company_name'][] = '';
-    				$list[$assoc['company_id']]['company_id'][] = '';
-    				$list[$assoc['company_id']]['user_id'][] = $assoc['fk_user_author'];
-    				$list[$assoc['company_id']]['drate'][] = $assoc['rate'];
-    				$list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);
-    				$list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);
+					$list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];
+					$list[$assoc['company_id']]['dtype'][] = 'ExpenseReportPayment';
+					$list[$assoc['company_id']]['datef'][] = $assoc['datef'];
+					$list[$assoc['company_id']]['company_name'][] = '';
+					$list[$assoc['company_id']]['company_id'][] = '';
+					$list[$assoc['company_id']]['user_id'][] = $assoc['fk_user_author'];
+					$list[$assoc['company_id']]['drate'][] = $assoc['rate'];
+					$list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);
+					$list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);
 
-    				$list[$assoc['company_id']]['facid'][] = $assoc['facid'];
-    				$list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];
-    				$list[$assoc['company_id']]['type'][] = $assoc['type'];
-    				$list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
-    				$list[$assoc['company_id']]['descr'][] = $assoc['descr'];
+					$list[$assoc['company_id']]['facid'][] = $assoc['facid'];
+					$list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];
+					$list[$assoc['company_id']]['type'][] = $assoc['type'];
+					$list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
+					$list[$assoc['company_id']]['descr'][] = $assoc['descr'];
 
-    				$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
-    				$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
-    				$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
-    				$list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];
+					$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
+					$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
+					$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
+					$list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];
 
-    				$list[$assoc['company_id']]['pid'][] = $assoc['pid'];
-    				$list[$assoc['company_id']]['pref'][] = $assoc['pref'];
-    				$list[$assoc['company_id']]['ptype'][] = 'ExpenseReportPayment';
+					$list[$assoc['company_id']]['pid'][] = $assoc['pid'];
+					$list[$assoc['company_id']]['pref'][] = $assoc['pref'];
+					$list[$assoc['company_id']]['ptype'][] = 'ExpenseReportPayment';
 
-    				$list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];
-    				$list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];
+					$list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];
+					$list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];
 
-    				$company_id = $assoc['company_id'];
-    			}
-    		} else {
-    			dol_print_error($db);
-    			return -3;
-    		}
-    	}
-    }
+					$company_id = $assoc['company_id'];
+				}
+			} else {
+				dol_print_error($db);
+				return -3;
+			}
+		}
+	}
 
-    return $list;
+	return $list;
 }
 
 /**
@@ -542,38 +542,38 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
  */
 function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $direction, $m = 0)
 {
-    global $conf;
+	global $conf;
 
-    // If we use date_start and date_end, we must not use $y, $m, $q
-    if (($date_start || $date_end) && (!empty($y) || !empty($m) || !empty($q)))
-    {
-    	dol_print_error('', 'Bad value of input parameter for tax_by_rate');
-    }
+	// If we use date_start and date_end, we must not use $y, $m, $q
+	if (($date_start || $date_end) && (!empty($y) || !empty($m) || !empty($q)))
+	{
+		dol_print_error('', 'Bad value of input parameter for tax_by_rate');
+	}
 
-    $list = array();
+	$list = array();
 
-    if ($direction == 'sell')
-    {
-        $invoicetable = 'facture';
-        $invoicedettable = 'facturedet';
-        $fk_facture = 'fk_facture';
-        $fk_facture2 = 'fk_facture';
-        $fk_payment = 'fk_paiement';
-        $total_tva = 'total_tva';
-        $paymenttable = 'paiement';
-        $paymentfacturetable = 'paiement_facture';
-        $invoicefieldref = 'ref';
-    } else {
-        $invoicetable = 'facture_fourn';
-        $invoicedettable = 'facture_fourn_det';
-        $fk_facture = 'fk_facture_fourn';
-        $fk_facture2 = 'fk_facturefourn';
-        $fk_payment = 'fk_paiementfourn';
-        $total_tva = 'tva';
-        $paymenttable = 'paiementfourn';
-        $paymentfacturetable = 'paiementfourn_facturefourn';
-        $invoicefieldref = 'ref';
-    }
+	if ($direction == 'sell')
+	{
+		$invoicetable = 'facture';
+		$invoicedettable = 'facturedet';
+		$fk_facture = 'fk_facture';
+		$fk_facture2 = 'fk_facture';
+		$fk_payment = 'fk_paiement';
+		$total_tva = 'total_tva';
+		$paymenttable = 'paiement';
+		$paymentfacturetable = 'paiement_facture';
+		$invoicefieldref = 'ref';
+	} else {
+		$invoicetable = 'facture_fourn';
+		$invoicedettable = 'facture_fourn_det';
+		$fk_facture = 'fk_facture_fourn';
+		$fk_facture2 = 'fk_facturefourn';
+		$fk_payment = 'fk_paiementfourn';
+		$total_tva = 'tva';
+		$paymenttable = 'paiementfourn';
+		$paymentfacturetable = 'paiementfourn_facturefourn';
+		$invoicefieldref = 'ref';
+	}
 
 	if (strpos($type, 'localtax') === 0) {
 		$f_rate = $type.'_tx';
@@ -585,294 +585,294 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 	$total_localtax2 = 'total_localtax2';
 
 
-    // CAS DES BIENS/PRODUITS
+	// CAS DES BIENS/PRODUITS
 
-    // Define sql request
-    $sql = '';
-    if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-    	|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice'))
-    {
-        // Count on delivery date (use invoice date as delivery is unknown)
-        $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-        $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-        $sql .= " d.date_start as date_start, d.date_end as date_end,";
-        $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-        $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-        $sql .= " 0 as payment_id, 0 as payment_amount";
-        $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-        $sql .= " ".MAIN_DB_PREFIX."societe as s,";
-        $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-        $sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
-        $sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
-        if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
-        else $sql .= " AND f.type IN (0,1,2,3,5)";
-        $sql .= " AND f.rowid = d.".$fk_facture;
-        $sql .= " AND s.rowid = f.fk_soc";
-        if ($y && $m)
-        {
-            $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
-            $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-        } elseif ($y)
-        {
-            $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
-            $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
-        }
-        if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
-        if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-        $sql .= " AND (d.product_type = 0"; // Limit to products
-        $sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
-        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-        $sql .= " ORDER BY d.rowid, d.".$fk_facture;
-    } else {
-    	// Count on payments date
-    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-    	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-    	$sql .= " d.date_start as date_start, d.date_end as date_end,";
-    	$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-    	$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-    	$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
-    	$sql .= " pa.datep as datep";
-    	$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-    	$sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
-    	$sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
-    	$sql .= " ".MAIN_DB_PREFIX."societe as s,";
-    	$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
-    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-    	$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
-    	$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
-    	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
-    	else $sql .= " AND f.type IN (0,1,2,3,5)";
-    	$sql .= " AND f.rowid = d.".$fk_facture;
-    	$sql .= " AND s.rowid = f.fk_soc";
-    	$sql .= " AND pf.".$fk_facture2." = f.rowid";
-    	$sql .= " AND pa.rowid = pf.".$fk_payment;
-    	if ($y && $m)
-    	{
-    		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
-    		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-    	} elseif ($y)
-    	{
-    		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
-    		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
-    	}
-    	if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
-    	if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
-    	$sql .= " AND (d.product_type = 0"; // Limit to products
-    	$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-    	$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
-    }
-
-    if (!$sql) return -1;
-    if ($sql == 'TODO') return -2;
-    if ($sql != 'TODO')
-    {
-        dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
-
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $rate = -1;
-            $oldrowid = '';
-            while ($assoc = $db->fetch_array($resql))
-            {
-            	// Code to avoid warnings when array entry not defined
-            	if (!isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht'] = 0;
-                if (!isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat'] = 0;
-                if (!isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1'] = 0;
-                if (!isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2'] = 0;
-
-                if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
-                {
-                    $oldrowid = $assoc['rowid'];
-                    $list[$assoc['rate']]['totalht']   += $assoc['total_ht'];
-                    $list[$assoc['rate']]['vat']       += $assoc['total_vat'];
-                    $list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];
-                    $list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2'];
-                }
-                $list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc'];
-                $list[$assoc['rate']]['dtype'][] = $assoc['dtype'];
-                $list[$assoc['rate']]['datef'][] = $db->jdate($assoc['datef']);
-                $list[$assoc['rate']]['datep'][] = $db->jdate($assoc['datep']);
-                $list[$assoc['rate']]['company_name'][] = $assoc['company_name'];
-                $list[$assoc['rate']]['company_id'][] = $assoc['company_id'];
-                $list[$assoc['rate']]['ddate_start'][] = $db->jdate($assoc['date_start']);
-                $list[$assoc['rate']]['ddate_end'][] = $db->jdate($assoc['date_end']);
-
-                $list[$assoc['rate']]['facid'][] = $assoc['facid'];
-                $list[$assoc['rate']]['facnum'][] = $assoc['facnum'];
-                $list[$assoc['rate']]['type'][] = $assoc['type'];
-                $list[$assoc['rate']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
-                $list[$assoc['rate']]['descr'][] = $assoc['descr'];
-
-                $list[$assoc['rate']]['totalht_list'][] = $assoc['total_ht'];
-                $list[$assoc['rate']]['vat_list'][] = $assoc['total_vat'];
-                $list[$assoc['rate']]['localtax1_list'][] = $assoc['total_localtax1'];
-                $list[$assoc['rate']]['localtax2_list'][] = $assoc['total_localtax2'];
-
-                $list[$assoc['rate']]['pid'][] = $assoc['pid'];
-                $list[$assoc['rate']]['pref'][] = $assoc['pref'];
-                $list[$assoc['rate']]['ptype'][] = $assoc['ptype'];
-
-                $list[$assoc['rate']]['payment_id'][] = $assoc['payment_id'];
-                $list[$assoc['rate']]['payment_amount'][] = $assoc['payment_amount'];
-
-                $rate = $assoc['rate'];
-            }
-        } else {
-            dol_print_error($db);
-            return -3;
-        }
-    }
-
-
-    // CAS DES SERVICES
-
-    // Define sql request
-    $sql = '';
-    if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')
-    	|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
-    {
-        // Count on invoice date
-        $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-        $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-        $sql .= " d.date_start as date_start, d.date_end as date_end,";
-        $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-        $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-        $sql .= " 0 as payment_id, 0 as payment_amount";
-        $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-        $sql .= " ".MAIN_DB_PREFIX."societe as s,";
-        $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-        $sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
-        $sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
-        if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+	// Define sql request
+	$sql = '';
+	if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+		|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice'))
+	{
+		// Count on delivery date (use invoice date as delivery is unknown)
+		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+		$sql .= " d.date_start as date_start, d.date_end as date_end,";
+		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+		$sql .= " 0 as payment_id, 0 as payment_amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+		$sql .= " ".MAIN_DB_PREFIX."societe as s,";
+		$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
+		$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
 		else $sql .= " AND f.type IN (0,1,2,3,5)";
-        $sql .= " AND f.rowid = d.".$fk_facture;
-        $sql .= " AND s.rowid = f.fk_soc";
-        if ($y && $m)
-        {
-            $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
-            $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-        } elseif ($y)
-        {
-            $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
-            $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
-        }
-        if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
-        if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-        $sql .= " AND (d.product_type = 1"; // Limit to services
-        $sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
-        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-        $sql .= " ORDER BY d.rowid, d.".$fk_facture;
-    } else {
-        // Count on payments date
-        $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-        $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-        $sql .= " d.date_start as date_start, d.date_end as date_end,";
-        $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-        $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-        $sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
-        $sql .= " pa.datep as datep";
-        $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-        $sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
-        $sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
-        $sql .= " ".MAIN_DB_PREFIX."societe as s,";
-        $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-        $sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
-        $sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
-        if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+		$sql .= " AND f.rowid = d.".$fk_facture;
+		$sql .= " AND s.rowid = f.fk_soc";
+		if ($y && $m)
+		{
+			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+		} elseif ($y)
+		{
+			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+		}
+		if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
+		if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		$sql .= " AND (d.product_type = 0"; // Limit to products
+		$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		$sql .= " ORDER BY d.rowid, d.".$fk_facture;
+	} else {
+		// Count on payments date
+		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+		$sql .= " d.date_start as date_start, d.date_end as date_end,";
+		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+		$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
+		$sql .= " pa.datep as datep";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+		$sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
+		$sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
+		$sql .= " ".MAIN_DB_PREFIX."societe as s,";
+		$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
+		$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
 		else $sql .= " AND f.type IN (0,1,2,3,5)";
-        $sql .= " AND f.rowid = d.".$fk_facture;
-        $sql .= " AND s.rowid = f.fk_soc";
-        $sql .= " AND pf.".$fk_facture2." = f.rowid";
-        $sql .= " AND pa.rowid = pf.".$fk_payment;
-        if ($y && $m)
-        {
-            $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
-            $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-        } elseif ($y)
-        {
-            $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
-            $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
-        }
-        if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
-        if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
-        $sql .= " AND (d.product_type = 1"; // Limit to services
-        $sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
-        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-        $sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
-    }
+		$sql .= " AND f.rowid = d.".$fk_facture;
+		$sql .= " AND s.rowid = f.fk_soc";
+		$sql .= " AND pf.".$fk_facture2." = f.rowid";
+		$sql .= " AND pa.rowid = pf.".$fk_payment;
+		if ($y && $m)
+		{
+			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+		} elseif ($y)
+		{
+			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+		}
+		if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
+		if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+		$sql .= " AND (d.product_type = 0"; // Limit to products
+		$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
+	}
 
-    if (!$sql)
-    {
-        dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);
-        return -1; // -1 = Not accountancy module enabled
-    }
-    if ($sql == 'TODO') return -2; // -2 = Feature not yet available
-    if ($sql != 'TODO')
-    {
-        dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $rate = -1;
-            $oldrowid = '';
-            while ($assoc = $db->fetch_array($resql))
-            {
-            	// Code to avoid warnings when array entry not defined
-            	if (!isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht'] = 0;
-                if (!isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat'] = 0;
+	if (!$sql) return -1;
+	if ($sql == 'TODO') return -2;
+	if ($sql != 'TODO')
+	{
+		dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
+
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$rate = -1;
+			$oldrowid = '';
+			while ($assoc = $db->fetch_array($resql))
+			{
+				// Code to avoid warnings when array entry not defined
+				if (!isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht'] = 0;
+				if (!isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat'] = 0;
 				if (!isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1'] = 0;
-                if (!isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2'] = 0;
+				if (!isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2'] = 0;
 
-                if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
-                {
-                    $oldrowid = $assoc['rowid'];
-                    $list[$assoc['rate']]['totalht']   += $assoc['total_ht'];
-                    $list[$assoc['rate']]['vat']       += $assoc['total_vat'];
-                    $list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];
-                    $list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2'];
-                }
-                $list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc'];
-                $list[$assoc['rate']]['dtype'][] = $assoc['dtype'];
-                $list[$assoc['rate']]['datef'][] = $db->jdate($assoc['datef']);
-                $list[$assoc['rate']]['datep'][] = $db->jdate($assoc['datep']);
-                $list[$assoc['rate']]['company_name'][] = $assoc['company_name'];
-                $list[$assoc['rate']]['company_id'][] = $assoc['company_id'];
-                $list[$assoc['rate']]['ddate_start'][] = $db->jdate($assoc['date_start']);
-                $list[$assoc['rate']]['ddate_end'][] = $db->jdate($assoc['date_end']);
+				if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
+				{
+					$oldrowid = $assoc['rowid'];
+					$list[$assoc['rate']]['totalht']   += $assoc['total_ht'];
+					$list[$assoc['rate']]['vat']       += $assoc['total_vat'];
+					$list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];
+					$list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2'];
+				}
+				$list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc'];
+				$list[$assoc['rate']]['dtype'][] = $assoc['dtype'];
+				$list[$assoc['rate']]['datef'][] = $db->jdate($assoc['datef']);
+				$list[$assoc['rate']]['datep'][] = $db->jdate($assoc['datep']);
+				$list[$assoc['rate']]['company_name'][] = $assoc['company_name'];
+				$list[$assoc['rate']]['company_id'][] = $assoc['company_id'];
+				$list[$assoc['rate']]['ddate_start'][] = $db->jdate($assoc['date_start']);
+				$list[$assoc['rate']]['ddate_end'][] = $db->jdate($assoc['date_end']);
 
-                $list[$assoc['rate']]['facid'][] = $assoc['facid'];
-                $list[$assoc['rate']]['facnum'][] = $assoc['facnum'];
-                $list[$assoc['rate']]['type'][] = $assoc['type'];
-                $list[$assoc['rate']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
-                $list[$assoc['rate']]['descr'][] = $assoc['descr'];
+				$list[$assoc['rate']]['facid'][] = $assoc['facid'];
+				$list[$assoc['rate']]['facnum'][] = $assoc['facnum'];
+				$list[$assoc['rate']]['type'][] = $assoc['type'];
+				$list[$assoc['rate']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
+				$list[$assoc['rate']]['descr'][] = $assoc['descr'];
 
-                $list[$assoc['rate']]['totalht_list'][] = $assoc['total_ht'];
-                $list[$assoc['rate']]['vat_list'][] = $assoc['total_vat'];
-                $list[$assoc['rate']]['localtax1_list'][] = $assoc['total_localtax1'];
-                $list[$assoc['rate']]['localtax2_list'][] = $assoc['total_localtax2'];
+				$list[$assoc['rate']]['totalht_list'][] = $assoc['total_ht'];
+				$list[$assoc['rate']]['vat_list'][] = $assoc['total_vat'];
+				$list[$assoc['rate']]['localtax1_list'][] = $assoc['total_localtax1'];
+				$list[$assoc['rate']]['localtax2_list'][] = $assoc['total_localtax2'];
 
-                $list[$assoc['rate']]['pid'][] = $assoc['pid'];
-                $list[$assoc['rate']]['pref'][] = $assoc['pref'];
-                $list[$assoc['rate']]['ptype'][] = $assoc['ptype'];
+				$list[$assoc['rate']]['pid'][] = $assoc['pid'];
+				$list[$assoc['rate']]['pref'][] = $assoc['pref'];
+				$list[$assoc['rate']]['ptype'][] = $assoc['ptype'];
 
-                $list[$assoc['rate']]['payment_id'][] = $assoc['payment_id'];
-                $list[$assoc['rate']]['payment_amount'][] = $assoc['payment_amount'];
+				$list[$assoc['rate']]['payment_id'][] = $assoc['payment_id'];
+				$list[$assoc['rate']]['payment_amount'][] = $assoc['payment_amount'];
 
-                $rate = $assoc['rate'];
-            }
-        } else {
-            dol_print_error($db);
-            return -3;
-        }
-    }
+				$rate = $assoc['rate'];
+			}
+		} else {
+			dol_print_error($db);
+			return -3;
+		}
+	}
 
 
-    // CASE OF EXPENSE REPORT
+	// CAS DES SERVICES
+
+	// Define sql request
+	$sql = '';
+	if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')
+		|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
+	{
+		// Count on invoice date
+		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+		$sql .= " d.date_start as date_start, d.date_end as date_end,";
+		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+		$sql .= " 0 as payment_id, 0 as payment_amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+		$sql .= " ".MAIN_DB_PREFIX."societe as s,";
+		$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
+		$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+		else $sql .= " AND f.type IN (0,1,2,3,5)";
+		$sql .= " AND f.rowid = d.".$fk_facture;
+		$sql .= " AND s.rowid = f.fk_soc";
+		if ($y && $m)
+		{
+			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+		} elseif ($y)
+		{
+			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+		}
+		if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
+		if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		$sql .= " AND (d.product_type = 1"; // Limit to services
+		$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		$sql .= " ORDER BY d.rowid, d.".$fk_facture;
+	} else {
+		// Count on payments date
+		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+		$sql .= " d.date_start as date_start, d.date_end as date_end,";
+		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+		$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
+		$sql .= " pa.datep as datep";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+		$sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
+		$sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
+		$sql .= " ".MAIN_DB_PREFIX."societe as s,";
+		$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
+		$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+		else $sql .= " AND f.type IN (0,1,2,3,5)";
+		$sql .= " AND f.rowid = d.".$fk_facture;
+		$sql .= " AND s.rowid = f.fk_soc";
+		$sql .= " AND pf.".$fk_facture2." = f.rowid";
+		$sql .= " AND pa.rowid = pf.".$fk_payment;
+		if ($y && $m)
+		{
+			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+		} elseif ($y)
+		{
+			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+		}
+		if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
+		if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+		$sql .= " AND (d.product_type = 1"; // Limit to services
+		$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
+	}
+
+	if (!$sql)
+	{
+		dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);
+		return -1; // -1 = Not accountancy module enabled
+	}
+	if ($sql == 'TODO') return -2; // -2 = Feature not yet available
+	if ($sql != 'TODO')
+	{
+		dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$rate = -1;
+			$oldrowid = '';
+			while ($assoc = $db->fetch_array($resql))
+			{
+				// Code to avoid warnings when array entry not defined
+				if (!isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht'] = 0;
+				if (!isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat'] = 0;
+				if (!isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1'] = 0;
+				if (!isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2'] = 0;
+
+				if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
+				{
+					$oldrowid = $assoc['rowid'];
+					$list[$assoc['rate']]['totalht']   += $assoc['total_ht'];
+					$list[$assoc['rate']]['vat']       += $assoc['total_vat'];
+					$list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];
+					$list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2'];
+				}
+				$list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc'];
+				$list[$assoc['rate']]['dtype'][] = $assoc['dtype'];
+				$list[$assoc['rate']]['datef'][] = $db->jdate($assoc['datef']);
+				$list[$assoc['rate']]['datep'][] = $db->jdate($assoc['datep']);
+				$list[$assoc['rate']]['company_name'][] = $assoc['company_name'];
+				$list[$assoc['rate']]['company_id'][] = $assoc['company_id'];
+				$list[$assoc['rate']]['ddate_start'][] = $db->jdate($assoc['date_start']);
+				$list[$assoc['rate']]['ddate_end'][] = $db->jdate($assoc['date_end']);
+
+				$list[$assoc['rate']]['facid'][] = $assoc['facid'];
+				$list[$assoc['rate']]['facnum'][] = $assoc['facnum'];
+				$list[$assoc['rate']]['type'][] = $assoc['type'];
+				$list[$assoc['rate']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
+				$list[$assoc['rate']]['descr'][] = $assoc['descr'];
+
+				$list[$assoc['rate']]['totalht_list'][] = $assoc['total_ht'];
+				$list[$assoc['rate']]['vat_list'][] = $assoc['total_vat'];
+				$list[$assoc['rate']]['localtax1_list'][] = $assoc['total_localtax1'];
+				$list[$assoc['rate']]['localtax2_list'][] = $assoc['total_localtax2'];
+
+				$list[$assoc['rate']]['pid'][] = $assoc['pid'];
+				$list[$assoc['rate']]['pref'][] = $assoc['pref'];
+				$list[$assoc['rate']]['ptype'][] = $assoc['ptype'];
+
+				$list[$assoc['rate']]['payment_id'][] = $assoc['payment_id'];
+				$list[$assoc['rate']]['payment_amount'][] = $assoc['payment_amount'];
+
+				$rate = $assoc['rate'];
+			}
+		} else {
+			dol_print_error($db);
+			return -3;
+		}
+	}
+
+
+	// CASE OF EXPENSE REPORT
 
 	if ($direction == 'buy')		// buy only for expense reports
 	{
@@ -903,7 +903,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		if ($date_start && $date_end) $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 		$sql .= " AND (d.product_type = -1";
 		$sql .= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service
-		if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
 		$sql .= " ORDER BY e.rowid";
 
 		if (!$sql)
@@ -932,7 +932,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 					{
 						$oldrowid = $assoc['rowid'];
 						$list[$assoc['rate']]['totalht']   += $assoc['total_ht'];
-                        $list[$assoc['rate']]['vat'] += $assoc['total_vat'];
+						$list[$assoc['rate']]['vat'] += $assoc['total_vat'];
 						$list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];
 						$list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2'];
 					}
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index 826e2d6bc98..dc7766dbdfa 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2018	Jean-François FERRY	<hello@librethic.io>
  * Copyright (C) 2016		Christophe Battarel	<christophe@altairis.fr>
- * Copyright (C) 2019       Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2020  Frédéric 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
@@ -84,8 +84,7 @@ function ticket_prepare_head($object)
 	$head[$h][2] = 'tabTicket';
 	$h++;
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && empty($user->socid))
-	{
+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && empty($user->socid)) {
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/ticket/contact.php?track_id='.$object->track_id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
@@ -133,10 +132,8 @@ function ticket_prepare_head($object)
 	$head[$h][2] = 'tabTicketLogs';
 	$h++;
 
-
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticket', 'remove');
 
-
 	return $head;
 }
 
@@ -159,13 +156,11 @@ function showDirectPublicLink($object)
 	}
 
 	$out = '';
-	if (empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
-	{
+	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)
-		{
+		if ($url) {
 			$out .= '<input type="text" id="directpubliclink" class="quatrevingtpercent" value="'.$url.'">';
 			$out .= ajax_autoselect("directpubliclink", 0);
 		} else {
@@ -208,7 +203,7 @@ function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $
 {
 	global $user, $conf, $langs, $mysoc;
 
-	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
+	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss, 0, 1); // Show html headers
 
 	print '<body id="mainbody" class="publicnewticketform">';
 	print '<div class="center">';
@@ -216,8 +211,7 @@ function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $
 	// Define urllogo
 	if (!empty($conf->global->TICKET_SHOW_COMPANY_LOGO) || !empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC)) {
 		// Print logo
-		if (!empty($conf->global->TICKET_SHOW_COMPANY_LOGO))
-		{
+		if (!empty($conf->global->TICKET_SHOW_COMPANY_LOGO)) {
 			$urllogo = DOL_URL_ROOT.'/theme/common/login_logo.png';
 
 			if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
@@ -231,8 +225,7 @@ function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $
 	}
 
 	// Output html code for logo
-	if ($urllogo || !empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC))
-	{
+	if ($urllogo || !empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC)) {
 		print '<div class="backgreypublicpayment">';
 		print '<div class="logopublicpayment">';
 		if ($urllogo) {
@@ -246,7 +239,7 @@ function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $
 		}
 		print '</div>';
 		if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
-			print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
+			print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref?utm_medium=website&utm_source=poweredby" href="https://www.dolibarr.org" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 		}
 		print '</div>';
 	}
@@ -317,13 +310,21 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 		$sql .= " a.fk_contact,";
 		$sql .= " c.code as acode, c.libelle as alabel, c.picto as apicto,";
 		$sql .= " u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname";
-		if (is_object($filterobj) && get_class($filterobj) == 'Societe')      $sql .= ", sp.lastname, sp.firstname";
-		elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", m.lastname, m.firstname";
-		elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')  $sql .= ", o.ref";
-		elseif (is_object($filterobj) && get_class($filterobj) == 'Product')  $sql .= ", o.ref";
-		elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')   $sql .= ", o.ref";
-		elseif (is_object($filterobj) && get_class($filterobj) == 'BOM')      $sql .= ", o.ref";
-		elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat')  $sql .= ", o.ref";
+		if (is_object($filterobj) && get_class($filterobj) == 'Societe') {
+			$sql .= ", sp.lastname, sp.firstname";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') {
+			$sql .= ", m.lastname, m.firstname";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') {
+			$sql .= ", o.ref";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'Product') {
+			$sql .= ", o.ref";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') {
+			$sql .= ", o.ref";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') {
+			$sql .= ", o.ref";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') {
+			$sql .= ", o.ref";
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_action";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_actioncomm as c ON a.fk_action = c.id";
@@ -335,60 +336,67 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 			$sql .= " AND r.element_type = '".$db->escape($objcon->table_element)."' AND r.fk_element = ".$objcon->id;
 		}
 
-		if (is_object($filterobj) && get_class($filterobj) == 'Societe')  $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
-		elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') {
+		if (is_object($filterobj) && get_class($filterobj) == 'Societe') {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') {
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_resources as er";
 			$sql .= " ON er.resource_type = 'dolresource'";
 			$sql .= " AND er.element_id = a.id";
 			$sql .= " AND er.resource_id = ".$filterobj->id;
-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", ".MAIN_DB_PREFIX."adherent as m";
-		elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as o";
-		elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql .= ", ".MAIN_DB_PREFIX."product as o";
-		elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql .= ", ".MAIN_DB_PREFIX."ticket as o";
-		elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') $sql .= ", ".MAIN_DB_PREFIX."bom_bom as o";
-		elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') $sql .= ", ".MAIN_DB_PREFIX."contrat as o";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') {
+			$sql .= ", ".MAIN_DB_PREFIX."adherent as m";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') {
+			$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as o";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'Product') {
+			$sql .= ", ".MAIN_DB_PREFIX."product as o";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') {
+			$sql .= ", ".MAIN_DB_PREFIX."ticket as o";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') {
+			$sql .= ", ".MAIN_DB_PREFIX."bom_bom as o";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') {
+			$sql .= ", ".MAIN_DB_PREFIX."contrat as o";
+		}
 
 		$sql .= " WHERE a.entity IN (".getEntity('agenda').")";
 		if ($force_filter_contact === false) {
-			if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')) && $filterobj->id) $sql .= " AND a.fk_soc = ".$filterobj->id;
-			elseif (is_object($filterobj) && get_class($filterobj) == 'Project' && $filterobj->id) $sql .= " AND a.fk_project = ".$filterobj->id;
-			elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent')
-			{
+			if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')) && $filterobj->id) {
+				$sql .= " AND a.fk_soc = ".$filterobj->id;
+			} elseif (is_object($filterobj) && get_class($filterobj) == 'Project' && $filterobj->id) {
+				$sql .= " AND a.fk_project = ".$filterobj->id;
+			} elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') {
 				$sql .= " AND a.fk_element = m.rowid AND a.elementtype = 'member'";
 				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-			} elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')
-			{
+			} elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'order_supplier'";
 				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-			} elseif (is_object($filterobj) && get_class($filterobj) == 'Product')
-			{
+			} elseif (is_object($filterobj) && get_class($filterobj) == 'Product') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'product'";
 				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-			} elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')
-			{
+			} elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'ticket'";
 				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-			} elseif (is_object($filterobj) && get_class($filterobj) == 'BOM')
-			{
+			} elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'bom'";
 				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-			} elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat')
-			{
+			} elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'contract'";
 				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
 			}
 		}
 
 		// Condition on actioncode
-		if (!empty($actioncode))
-		{
-			if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
-			{
-				if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
-				elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
-				else {
-					if ($actioncode == 'AC_OTH') $sql .= " AND c.type != 'systemauto'";
-					elseif ($actioncode == 'AC_OTH_AUTO') $sql .= " AND c.type = 'systemauto'";
+		if (!empty($actioncode)) {
+			if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+				if ($actioncode == 'AC_NON_AUTO') {
+					$sql .= " AND c.type != 'systemauto'";
+				} elseif ($actioncode == 'AC_ALL_AUTO') {
+					$sql .= " AND c.type = 'systemauto'";
+				} else {
+					if ($actioncode == 'AC_OTH') {
+						$sql .= " AND c.type != 'systemauto'";
+					} elseif ($actioncode == 'AC_OTH_AUTO') {
+						$sql .= " AND c.type = 'systemauto'";
+					}
 				}
 			} else {
 				if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
@@ -411,11 +419,17 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 		$sql2 .= ", null as fk_element, '' as elementtype, null as contact_id";
 		$sql2 .= ", 'AC_EMAILING' as acode, '' as alabel, '' as apicto";
 		$sql2 .= ", u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname"; // User that valid action
-		if (is_object($filterobj) && get_class($filterobj) == 'Societe')      $sql2 .= ", '' as lastname, '' as firstname";
-		elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql2 .= ", '' as lastname, '' as firstname";
-		elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')  $sql2 .= ", '' as ref";
-		elseif (is_object($filterobj) && get_class($filterobj) == 'Product')  $sql2 .= ", '' as ref";
-		elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')   $sql2 .= ", '' as ref";
+		if (is_object($filterobj) && get_class($filterobj) == 'Societe') {
+			$sql2 .= ", '' as lastname, '' as firstname";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') {
+			$sql2 .= ", '' as lastname, '' as firstname";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') {
+			$sql2 .= ", '' as ref";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'Product') {
+			$sql2 .= ", '' as ref";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') {
+			$sql2 .= ", '' as ref";
+		}
 		$sql2 .= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."user as u";
 		$sql2 .= " WHERE mc.email = '".$db->escape($objcon->email)."'"; // Search is done on email.
 		$sql2 .= " AND mc.statut = 1";
@@ -434,13 +448,11 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 
 	dol_syslog("company.lib::show_actions_done", LOG_DEBUG);
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$i = 0;
 		$num = $db->num_rows($resql);
 
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 
 			if ($obj->type == 'action') {
@@ -512,8 +524,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 		dol_print_error($db);
 	}
 
-	if (!empty($conf->agenda->enabled) || (!empty($conf->mailing->enabled) && !empty($objcon->email)))
-	{
+	if (!empty($conf->agenda->enabled) || (!empty($conf->mailing->enabled) && !empty($objcon->email))) {
 		$delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;
 
 		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
@@ -533,8 +544,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 		$out .= '<input type="hidden" name="token" value="'.newToken().'">';
 
 		if ($objcon && get_class($objcon) == 'Contact' &&
-			(is_null($filterobj) || get_class($filterobj) == 'Societe'))
-		{
+			(is_null($filterobj) || get_class($filterobj) == 'Societe')) {
 			$out .= '<input type="hidden" name="id" value="'.$objcon->id.'" />';
 		} else {
 			$out .= '<input type="hidden" name="id" value="'.$filterobj->id.'" />';
@@ -553,8 +563,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 		//$out.='</td>';
 
 		$out .= '<th class="liste_titre"><strong>'.$langs->trans("Search").' : </strong></th>';
-		if ($donetodo)
-		{
+		if ($donetodo) {
 			$out .= '<th class="liste_titre"></th>';
 		}
 		$out .= '<th class="liste_titre">'.$langs->trans("Type").' ';
@@ -581,8 +590,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 
 		$out .= '<ul class="timeline">';
 
-		if ($donetodo)
-		{
+		if ($donetodo) {
 			$tmp = '';
 			if (get_class($filterobj) == 'Societe') $tmp .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&socid='.$filterobj->id.'&status=done">';
 			$tmp .= ($donetodo != 'done' ? $langs->trans("ActionsToDoShort") : '');
@@ -625,53 +633,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 			$out .= '<!-- timeline item -->'."\n";
 			$out .= '<li class="timeline-code-'.strtolower($actionstatic->code).'">';
 
-
-			$out .= '<!-- timeline icon -->'."\n";
-			$iconClass = 'fa fa-comments';
-			$img_picto = '';
-			$colorClass = '';
-			$pictoTitle = '';
-
-			if ($histo[$key]['percent'] == -1) {
-				$colorClass = 'timeline-icon-not-applicble';
-				$pictoTitle = $langs->trans('StatusNotApplicable');
-			} elseif ($histo[$key]['percent'] == 0) {
-				$colorClass = 'timeline-icon-todo';
-				$pictoTitle = $langs->trans('StatusActionToDo').' (0%)';
-			} elseif ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100) {
-				$colorClass = 'timeline-icon-in-progress';
-				$pictoTitle = $langs->trans('StatusActionInProcess').' ('.$histo[$key]['percent'].'%)';
-			} elseif ($histo[$key]['percent'] >= 100) {
-				$colorClass = 'timeline-icon-done';
-				$pictoTitle = $langs->trans('StatusActionDone').' (100%)';
-			}
-
-
-			if ($actionstatic->code == 'AC_TICKET_CREATE') {
-				$iconClass = 'fa fa-ticket';
-			} elseif ($actionstatic->code == 'AC_TICKET_MODIFY') {
-				$iconClass = 'fa fa-pencil';
-			} elseif ($actionstatic->code == 'TICKET_MSG') {
-				$iconClass = 'fa fa-comments';
-			} elseif ($actionstatic->code == 'TICKET_MSG_PRIVATE') {
-				$iconClass = 'fa fa-mask';
-			} elseif (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
-			{
-				if ($actionstatic->type_picto) $img_picto = img_picto('', $actionstatic->type_picto);
-				else {
-					if ($actionstatic->type_code == 'AC_RDV')       $iconClass = 'fa fa-handshake';
-					elseif ($actionstatic->type_code == 'AC_TEL')   $iconClass = 'fa fa-phone';
-					elseif ($actionstatic->type_code == 'AC_FAX')   $iconClass = 'fa fa-fax';
-					elseif ($actionstatic->type_code == 'AC_EMAIL') $iconClass = 'fa fa-envelope';
-					elseif ($actionstatic->type_code == 'AC_INT')   $iconClass = 'fa fa-shipping-fast';
-					elseif ($actionstatic->type_code == 'AC_OTH_AUTO')   $iconClass = 'fa fa-robot';
-					elseif (!preg_match('/_AUTO/', $actionstatic->type_code)) $iconClass = 'fa fa-robot';
-				}
-			}
-
-
-
-			$out .= '<i class="'.$iconClass.' '.$colorClass.'" title="'.$pictoTitle.'">'.$img_picto.'</i>'."\n";
+			$out .= getTicketTimelineIcon($actionstatic, $histo, $key);
 
 			$out .= '<div class="timeline-item">'."\n";
 
@@ -690,24 +652,24 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 			//	$out.='<a href="'.$url.'" class="timeline-btn" title="'.$langs->trans('Show').'" ><i class="fa fa-calendar" ></i>'.$langs->trans('Show').'</a>';
 			//}
 
-
 			if ($user->rights->agenda->allactions->create ||
 				(($actionstatic->authorid == $user->id || $actionstatic->userownerid == $user->id) && $user->rights->agenda->myactions->create))
 			{
 				$out .= '<a class="timeline-btn" href="'.DOL_MAIN_URL_ROOT.'/comm/action/card.php?action=edit&id='.$actionstatic->id.'"><i class="fa fa-pencil" title="'.$langs->trans("Modify").'" ></i></a>';
 			}
 
-
 			$out .= '</span>';
 			// Date
 			$out .= '<span class="time"><i class="fa fa-clock-o"></i> ';
 			$out .= dol_print_date($histo[$key]['datestart'], 'dayhour');
-			if ($histo[$key]['dateend'] && $histo[$key]['dateend'] != $histo[$key]['datestart'])
-			{
+			if ($histo[$key]['dateend'] && $histo[$key]['dateend'] != $histo[$key]['datestart']) {
 				$tmpa = dol_getdate($histo[$key]['datestart'], true);
 				$tmpb = dol_getdate($histo[$key]['dateend'], true);
-				if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $out .= '-'.dol_print_date($histo[$key]['dateend'], 'hour');
-				else $out .= '-'.dol_print_date($histo[$key]['dateend'], 'dayhour');
+				if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) {
+					$out .= '-'.dol_print_date($histo[$key]['dateend'], 'hour');
+				} else {
+					$out .= '-'.dol_print_date($histo[$key]['dateend'], 'dayhour');
+				}
 			}
 			$late = 0;
 			if ($histo[$key]['percent'] == 0 && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;
@@ -755,7 +717,6 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 				}
 			}
 
-
 			$out .= '</span>';
 
 			$out .= '</h3>';
@@ -770,7 +731,6 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 				$out .= '</div>';
 			}
 
-
 			// Timeline footer
 			$footer = '';
 
@@ -781,8 +741,9 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 					$contact = new Contact($db);
 					$result = $contact->fetch($cid);
 
-					if ($result < 0)
+					if ($result < 0) {
 						dol_print_error($db, $contact->error);
+					}
 
 					if ($result > 0) {
 						$contactList .= !empty($contactList) ? ', ' : '';
@@ -795,8 +756,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 				}
 
 				$footer .= $langs->trans('ActionOnContact').' : '.$contactList;
-			} elseif (empty($objcon->id) && isset($histo[$key]['contact_id']) && $histo[$key]['contact_id'] > 0)
-			{
+			} elseif (empty($objcon->id) && isset($histo[$key]['contact_id']) && $histo[$key]['contact_id'] > 0) {
 				$contact = new Contact($db);
 				$result = $contact->fetch($histo[$key]['contact_id']);
 
@@ -846,17 +806,10 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 				$footer .= '</div>';
 			}
 
-
-
-
-
-
-
 			if (!empty($footer)) {
 				$out .= '<div class="timeline-footer">'.$footer.'</div>';
 			}
 
-
 			$out .= '</div>'."\n"; // end timeline-item
 
 			$out .= '</li>';
@@ -867,11 +820,73 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 		$out .= "</ul>\n";
 	}
 
-
 	if ($noprint) return $out;
 	else print $out;
 }
 
+/**
+ * Get timeline icon
+ * @param ActionComm $actionstatic actioncomm
+ * @param array $histo histo
+ * @param int $key key
+ * @return string
+ */
+function getTicketTimelineIcon($actionstatic, &$histo, $key)
+{
+	global $conf, $langs;
+	$out = '<!-- timeline icon -->'."\n";
+	$iconClass = 'fa fa-comments';
+	$img_picto = '';
+	$colorClass = '';
+	$pictoTitle = '';
+
+	if ($histo[$key]['percent'] == -1) {
+		$colorClass = 'timeline-icon-not-applicble';
+		$pictoTitle = $langs->trans('StatusNotApplicable');
+	} elseif ($histo[$key]['percent'] == 0) {
+		$colorClass = 'timeline-icon-todo';
+		$pictoTitle = $langs->trans('StatusActionToDo').' (0%)';
+	} elseif ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100) {
+		$colorClass = 'timeline-icon-in-progress';
+		$pictoTitle = $langs->trans('StatusActionInProcess').' ('.$histo[$key]['percent'].'%)';
+	} elseif ($histo[$key]['percent'] >= 100) {
+		$colorClass = 'timeline-icon-done';
+		$pictoTitle = $langs->trans('StatusActionDone').' (100%)';
+	}
+
+	if ($actionstatic->code == 'AC_TICKET_CREATE') {
+		$iconClass = 'fa fa-ticket';
+	} elseif ($actionstatic->code == 'AC_TICKET_MODIFY') {
+		$iconClass = 'fa fa-pencil';
+	} elseif ($actionstatic->code == 'TICKET_MSG') {
+		$iconClass = 'fa fa-comments';
+	} elseif ($actionstatic->code == 'TICKET_MSG_PRIVATE') {
+		$iconClass = 'fa fa-mask';
+	} elseif (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+		if ($actionstatic->type_picto) {
+			$img_picto = img_picto('', $actionstatic->type_picto);
+		} else {
+			if ($actionstatic->type_code == 'AC_RDV') {
+				$iconClass = 'fa fa-handshake';
+			} elseif ($actionstatic->type_code == 'AC_TEL') {
+				$iconClass = 'fa fa-phone';
+			} elseif ($actionstatic->type_code == 'AC_FAX') {
+				$iconClass = 'fa fa-fax';
+			} elseif ($actionstatic->type_code == 'AC_EMAIL') {
+				$iconClass = 'fa fa-envelope';
+			} elseif ($actionstatic->type_code == 'AC_INT') {
+				$iconClass = 'fa fa-shipping-fast';
+			} elseif ($actionstatic->type_code == 'AC_OTH_AUTO') {
+				$iconClass = 'fa fa-robot';
+			} elseif (!preg_match('/_AUTO/', $actionstatic->type_code)) {
+				$iconClass = 'fa fa-robot';
+			}
+		}
+	}
+
+	$out .= '<i class="'.$iconClass.' '.$colorClass.'" title="'.$pictoTitle.'">'.$img_picto.'</i>'."\n";
+	return $out;
+}
 
 /**
  * getTicketActionCommEcmList
diff --git a/htdocs/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php
index c0cfa20f529..e4de8b0c833 100644
--- a/htdocs/core/lib/treeview.lib.php
+++ b/htdocs/core/lib/treeview.lib.php
@@ -49,7 +49,7 @@ function tree_showpad(&$fulltree, $key, $silent = 0)
 		//print 'x'.$key;
 		foreach ($fulltree as $key2 => $val2)
 		{
-            //print "x".$pos." ".$key2." ".$found." ".$fulltree[$key2]['level'];
+			//print "x".$pos." ".$key2." ".$found." ".$fulltree[$key2]['level'];
 			if ($found == 1) // We are after the entry to show
 			{
 				if ($fulltree[$key2]['level'] > $pos)
@@ -75,14 +75,14 @@ function tree_showpad(&$fulltree, $key, $silent = 0)
 
 		if (!$silent)
 		{
-    		if ($atleastoneofthislevelafter)
-    		{
-    			if ($fulltree[$key]['level'] == $pos) print img_picto_common('', 'treemenu/branch.gif');
-    			else print img_picto_common('', 'treemenu/line.gif');
-    		} else {
-    			if ($fulltree[$key]['level'] == $pos) print img_picto_common('', 'treemenu/branchbottom.gif');
-    			else print img_picto_common('', 'treemenu/linebottom.gif');
-    		}
+			if ($atleastoneofthislevelafter)
+			{
+				if ($fulltree[$key]['level'] == $pos) print img_picto_common('', 'treemenu/branch.gif');
+				else print img_picto_common('', 'treemenu/line.gif');
+			} else {
+				if ($fulltree[$key]['level'] == $pos) print img_picto_common('', 'treemenu/branchbottom.gif');
+				else print img_picto_common('', 'treemenu/linebottom.gif');
+			}
 		}
 		$pos++;
 	}
@@ -114,11 +114,11 @@ function tree_showpad(&$fulltree, $key, $silent = 0)
  */
 function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoresetalreadyloaded = 0, $showfk = 0, $moreparam = '')
 {
-    global $tree_recur_alreadyadded, $menu_handler_to_search;
+	global $tree_recur_alreadyadded, $menu_handler_to_search;
 
-    if ($rang == 0 && empty($donoresetalreadyloaded)) $tree_recur_alreadyadded = array();
+	if ($rang == 0 && empty($donoresetalreadyloaded)) $tree_recur_alreadyadded = array();
 
-    if ($rang == 0)
+	if ($rang == 0)
 	{
 		// Test also done with jstree and dynatree (not able to have <a> inside label)
 		print '<script type="text/javascript" language="javascript">
@@ -140,7 +140,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 
 	if ($rang > 50)
 	{
-	    return; // Protect against infinite loop. Max 50 depth
+		return; // Protect against infinite loop. Max 50 depth
 	}
 
 	//ballayage du tableau
@@ -152,71 +152,71 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 		// If an element has $pere for parent
 		if ($tab[$x]['fk_menu'] != -1 && $tab[$x]['fk_menu'] == $pere['rowid'])
 		{
-		    //print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
+			//print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
 			if (empty($ulprinted) && !empty($pere['rowid']))
 			{
-    		    if (!empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
-    		    {
-    		          dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);
-    		          continue;
-    		    }
+				if (!empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
+				{
+					  dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);
+					  continue;
+				}
 
-                print '<ul'.(empty($pere['rowid']) ? ' id="treeData"' : '').'>'; $ulprinted++;
+				print '<ul'.(empty($pere['rowid']) ? ' id="treeData"' : '').'>'; $ulprinted++;
 			}
 			print "\n".'<li '.($tab[$x]['statut'] ? ' class="liuseractive"' : 'class="liuserdisabled"').'>';
 			if ($showfk)
 			{
-			    print '<table class="nobordernopadding centpercent"><tr><td>';
-			    print '<strong> &nbsp; ';
-			    print $tab[$x]['title'];
-			    print '&nbsp; (fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';
-			    print '</td><td class="right">';
-			    print $tab[$x]['buttons'];
-			    print '</td></tr></table>';
+				print '<table class="nobordernopadding centpercent"><tr><td>';
+				print '<strong> &nbsp; ';
+				print $tab[$x]['title'];
+				print '&nbsp; (fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';
+				print '</td><td class="right">';
+				print $tab[$x]['buttons'];
+				print '</td></tr></table>';
 			} else {
-			    print $tab[$x]['entry'];
+				print $tab[$x]['entry'];
 			}
 			//print ' -> A '.$tab[$x]['rowid'].' mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].'<br>'."\n";
-		    $tree_recur_alreadyadded[$tab[$x]['rowid']] = ($rang + 1);
+			$tree_recur_alreadyadded[$tab[$x]['rowid']] = ($rang + 1);
 			// And now we search all its sons of lower level
 			tree_recur($tab, $tab[$x], $rang + 1, 'iddivjstree', 0, $showfk);
 			print '</li>';
 		} elseif (!empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu']) {
-		    //print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
-		    if (empty($ulprinted) && !empty($pere['rowid']))
-		    {
-		        if (!empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
-		        {
-		            dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);
-		            //print 'Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.';
-                    continue;
-		        }
+			//print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
+			if (empty($ulprinted) && !empty($pere['rowid']))
+			{
+				if (!empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
+				{
+					dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);
+					//print 'Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.';
+					continue;
+				}
 
-		        print '<ul'.(empty($pere['rowid']) ? ' id="treeData"' : '').'>'; $ulprinted++;
-		    }
+				print '<ul'.(empty($pere['rowid']) ? ' id="treeData"' : '').'>'; $ulprinted++;
+			}
 			print "\n".'<li '.($tab[$x]['statut'] ? ' class="liuseractive"' : 'class="liuserdisabled"').'>';
 			if ($showfk)
 			{
-			    print '<table class="nobordernopadding centpercent"><tr><td>';
-			    print '<strong> &nbsp; <a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&menuId='.$tab[$x]['rowid'].$moreparam.'">';
-			    print $tab[$x]['title'];
-			    print '</a></strong>';
-			    print '&nbsp; (mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' - fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';
-			    print '</td><td class="right">';
-			    print $tab[$x]['buttons'];
-			    print '</td></tr></table>';
+				print '<table class="nobordernopadding centpercent"><tr><td>';
+				print '<strong> &nbsp; <a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&menuId='.$tab[$x]['rowid'].$moreparam.'">';
+				print $tab[$x]['title'];
+				print '</a></strong>';
+				print '&nbsp; (mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' - fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';
+				print '</td><td class="right">';
+				print $tab[$x]['buttons'];
+				print '</td></tr></table>';
 			} else {
-			    print $tab[$x]['entry'];
+				print $tab[$x]['entry'];
 			}
 			//print ' -> B '.$tab[$x]['rowid'].' mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].'<br>'."\n";
 			$tree_recur_alreadyadded[$tab[$x]['rowid']] = ($rang + 1);
 			// And now we search all its sons of lower level
 			//print 'Call tree_recur for x='.$x.' rowid='.$tab[$x]['rowid']." fk_mainmenu pere = ".$tab[$x]['fk_mainmenu']." fk_leftmenu pere = ".$tab[$x]['fk_leftmenu']."<br>\n";
-		    tree_recur($tab, $tab[$x], $rang + 1, 'iddivjstree', 0, $showfk);
+			tree_recur($tab, $tab[$x], $rang + 1, 'iddivjstree', 0, $showfk);
 			print '</li>';
 		}
 	}
 	if (!empty($ulprinted) && !empty($pere['rowid'])) { print '</ul>'."\n"; }
 
-    if ($rang == 0) print '</ul>';
+	if ($rang == 0) print '</ul>';
 }
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 7d67635a1e2..913112e04e6 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -38,8 +38,7 @@ function user_prepare_head($object)
 	$langs->load("users");
 
 	$canreadperms = true;
-	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS))
-	{
+	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 		$canreadperms = ($user->admin || ($user->id != $object->id && $user->rights->user->user_advance->readperms) || ($user->id == $object->id && $user->rights->user->self_advance->readperms));
 	}
 
@@ -52,8 +51,7 @@ function user_prepare_head($object)
 	$h++;
 
 	if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_SYNCHRO_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin)))
-	{
+		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin))) {
 		$langs->load("ldap");
 		$head[$h][0] = DOL_URL_ROOT.'/user/ldap.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("LDAPCard");
@@ -61,8 +59,7 @@ function user_prepare_head($object)
 		$h++;
 	}
 
-	if ($canreadperms)
-	{
+	if ($canreadperms) {
 		$head[$h][0] = DOL_URL_ROOT.'/user/perms.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("Rights").(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.($object->nb_rights).'</span>' : '');
 		$head[$h][2] = 'rights';
@@ -74,15 +71,13 @@ function user_prepare_head($object)
 	$head[$h][2] = 'guisetup';
 	$h++;
 
-	if (!empty($conf->agenda->enabled))
-	{
+	if (!empty($conf->agenda->enabled)) {
 		if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB = 5;
 		$MAXAGENDA = $conf->global->AGENDA_EXT_NB;
 
 		$i = 1;
 		$nbagenda = 0;
-		while ($i <= $MAXAGENDA)
-		{
+		while ($i <= $MAXAGENDA) {
 			$key = $i;
 			$name = 'AGENDA_EXT_NAME_'.$object->id.'_'.$key;
 			$src = 'AGENDA_EXT_SRC_'.$object->id.'_'.$key;
@@ -99,8 +94,7 @@ function user_prepare_head($object)
 		$h++;
 	}
 
-	if (!empty($conf->clicktodial->enabled))
-	{
+	if (!empty($conf->clicktodial->enabled)) {
 		$head[$h][0] = DOL_URL_ROOT.'/user/clicktodial.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("ClickToDial");
 		$head[$h][2] = 'clicktodial';
@@ -108,19 +102,16 @@ function user_prepare_head($object)
 	}
 
 	// Notifications
-	if ($user->socid == 0 && !empty($conf->notification->enabled))
-	{
+	if ($user->socid == 0 && !empty($conf->notification->enabled)) {
 		$nbNote = 0;
 		$sql = "SELECT COUNT(n.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."notify_def as n";
 		$sql .= " WHERE fk_user = ".$object->id;
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 				$nbNote = $obj->nb;
 				$i++;
@@ -146,9 +137,8 @@ function user_prepare_head($object)
 	if ((!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
 		|| (!empty($conf->hrm->enabled) && !empty($user->rights->hrm->employee->read))
 		|| (!empty($conf->expensereport->enabled) && !empty($user->rights->expensereport->lire) && ($user->id == $object->id || $user->rights->expensereport->readall))
-		|| (!empty($conf->holiday->enabled) && !empty($user->rights->holiday->read) && ($user->id == $object->id || $user->rights->holiday->read_all))
-		)
-	{
+		|| (!empty($conf->holiday->enabled) && !empty($user->rights->holiday->read) && ($user->id == $object->id || $user->rights->holiday->readall))
+		) {
 		// Bank
 		$head[$h][0] = DOL_URL_ROOT.'/user/bank.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("HRAndBank");
@@ -157,8 +147,7 @@ function user_prepare_head($object)
 	}
 
 	// Such info on users is visible only by internal user
-	if (empty($user->socid))
-	{
+	if (empty($user->socid)) {
 		// Notes
 		$nbNote = 0;
 		if (!empty($object->note)) $nbNote++;
@@ -202,8 +191,7 @@ function group_prepare_head($object)
 	global $langs, $conf, $user;
 
 	$canreadperms = true;
-	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS))
-	{
+	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 		$canreadperms = ($user->admin || $user->rights->user->group_advance->readperms);
 	}
 
@@ -216,8 +204,7 @@ function group_prepare_head($object)
 	$h++;
 
 	if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_SYNCHRO_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin)))
-	{
+		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin))) {
 		$langs->load("ldap");
 		$head[$h][0] = DOL_URL_ROOT.'/user/group/ldap.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("LDAPCard");
@@ -225,8 +212,7 @@ function group_prepare_head($object)
 		$h++;
 	}
 
-	if ($canreadperms)
-	{
+	if ($canreadperms) {
 		$head[$h][0] = DOL_URL_ROOT.'/user/group/perms.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("GroupRights").'<span class="badge marginleftonlyshort">'.($object->nb_rights).'</span>';
 		$head[$h][2] = 'rights';
@@ -255,7 +241,7 @@ function user_admin_prepare_head()
 
 	$langs->load("users");
 	$h = 0;
-    $head = array();
+	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/admin/user.php';
 	$head[$h][1] = $langs->trans("Parameters");
@@ -305,10 +291,8 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	$formother = new FormOther($db);
 
 	$dirthemes = array('/theme');
-	if (!empty($conf->modules_parts['theme']))		// Using this feature slow down application
-	{
-		foreach ($conf->modules_parts['theme'] as $reldir)
-		{
+	if (!empty($conf->modules_parts['theme'])) {		// Using this feature slow down application
+		foreach ($conf->modules_parts['theme'] as $reldir) {
 			$dirthemes = array_merge($dirthemes, (array) ($reldir.'theme'));
 		}
 	}
@@ -331,11 +315,11 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	if ($foruserprofile) $colspan = 4;
 
 	$thumbsbyrow = 6;
+	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent'.($edit ? ' editmode' : '').' tableforfield">';
 
 	// Title
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 		print '<tr class="liste_titre"><th class="titlefield">'.$langs->trans("Parameter").'</th><th>'.$langs->trans("DefaultValue").'</th>';
 		print '<th colspan="2">&nbsp;</th>';
 		print '</tr>';
@@ -348,8 +332,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '</tr>';
 	} else {
 		$dirthemestring = '';
-		foreach ($dirthemes as $dirtheme)
-		{
+		foreach ($dirthemes as $dirtheme) {
 			$dirthemestring .= '"'.$dirtheme.'" ';
 		}
 
@@ -369,22 +352,17 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	print '<table class="nobordernopadding" width="100%"><tr><td><div class="center">';
 
 	$i = 0;
-	foreach ($dirthemes as $dir)
-	{
+	foreach ($dirthemes as $dir) {
 		//print $dirroot.$dir;exit;
 		$dirtheme = dol_buildpath($dir, 0); // This include loop on $conf->file->dol_document_root
 		$urltheme = dol_buildpath($dir, 1);
 
-		if (is_dir($dirtheme))
-		{
+		if (is_dir($dirtheme)) {
 			$handle = opendir($dirtheme);
-			if (is_resource($handle))
-			{
-				while (($subdir = readdir($handle)) !== false)
-				{
+			if (is_resource($handle)) {
+				while (($subdir = readdir($handle)) !== false) {
 					if (is_dir($dirtheme."/".$subdir) && substr($subdir, 0, 1) <> '.'
-							&& substr($subdir, 0, 3) <> 'CVS' && !preg_match('/common|phones/i', $subdir))
-					{
+							&& substr($subdir, 0, 3) <> 'CVS' && !preg_match('/common|phones/i', $subdir)) {
 						// Disable not stable themes (dir ends with _exp or _dev)
 						if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) continue;
 						if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i', $subdir)) continue;
@@ -398,8 +376,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 						else $title = $langs->trans("ShowPreview");
 						print '<img class="img-skinthumb shadow" src="'.$url.'" alt="'.$title.'" title="'.$title.'" style="border: none; margin-bottom: 5px;">';
 						print '</a><br>';
-						if ($subdir == $selected_theme)
-						{
+						if ($subdir == $selected_theme) {
 							print '<input '.($edit ? '' : 'disabled').' type="radio" class="themethumbs" style="border: 0px;" checked name="main_theme" value="'.$subdir.'"> <b>'.$subdir.'</b>';
 						} else {
 							print '<input '.($edit ? '' : 'disabled').' type="radio" class="themethumbs" style="border: 0px;" name="main_theme" value="'.$subdir.'"> '.$subdir;
@@ -421,6 +398,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	$colorbackhmenu1 = '';
 	$colorbackvmenu1 = '';
 	$colortexttitlenotab = '';
+	$colortexttitlelink = '';
 	$colorbacktitle1 = '';
 	$colortexttitle = '';
 	$colorbacklineimpair1 = '';
@@ -434,14 +412,12 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// Show logo
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 		// Nothing
 	} else {
 		// Show logo
 		print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("EnableShowLogo").'</td><td>';
-		if ($edit)
-		{
+		if ($edit) {
 			print ajax_constantonoff('MAIN_SHOW_LOGO', array(), null, 0, 0, 1);
 			//print $form->selectyesno('MAIN_SHOW_LOGO', $conf->global->MAIN_SHOW_LOGO, 1);
 		} else {
@@ -456,8 +432,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 
 
 	// TopMenuDisableImages
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 		/*
          print '<tr class="oddeven">';
          print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
@@ -468,7 +443,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
          print '<td>';
          if ($edit)
          {
-         print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_TOPMENU_DISABLE_IMAGE,array()),''),'THEME_TOPMENU_DISABLE_IMAGE','formcolor',1).' ';
+         print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_TOPMENU_DISABLE_IMAGE,array()),''),'THEME_TOPMENU_DISABLE_IMAGE','',1).' ';
          }
          else
          {
@@ -483,8 +458,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
-		if ($edit)
-		{
+		if ($edit) {
 			print ajax_constantonoff('THEME_TOPMENU_DISABLE_IMAGE', array(), null, 0, 0, 1);
 			//print $form->selectyesno('THEME_TOPMENU_DISABLE_IMAGE', $conf->global->THEME_TOPMENU_DISABLE_IMAGE, 1);
 		} else {
@@ -497,8 +471,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// Background color THEME_ELDY_BACKBODY
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 		/*
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
@@ -509,7 +482,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
         print '<td>';
 	    if ($edit)
 	    {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','formcolor',1).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','',1).' ';
 	    }
 	   	else
 	   	{
@@ -524,9 +497,8 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("BackgroundColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		//var_dump($conf->global->THEME_ELDY_BACKBODY);
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), ''), 'THEME_ELDY_BACKBODY', 'formcolor', 1).' ';
+		if ($edit) {
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), ''), 'THEME_ELDY_BACKBODY', '', 1, '', '', 'colorbackbody').' ';
 		} else {
 	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -539,8 +511,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// TopMenuBackgroundColor
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 		/*
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
@@ -551,7 +522,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
         print '<td>';
 	    if ($edit)
 	    {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','formcolor',1).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','',1).' ';
 	    }
 	   	else
 	   	{
@@ -567,9 +538,8 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), ''), 'THEME_ELDY_TOPMENU_BACK1', 'formcolor', 1).' ';
+		if ($edit) {
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), ''), 'THEME_ELDY_TOPMENU_BACK1', '', 1, '', '', 'colorbackhmenu1').' ';
 		} else {
 	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -582,8 +552,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// LeftMenuBackgroundColor
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 		/*
 		 print '<tr class="oddeven">';
 		 print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
@@ -594,7 +563,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		 print '<td>';
 		 if ($edit)
 		 {
-		 print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1,array()),''),'THEME_ELDY_VERMENU_BACK1','formcolor',1).' ';
+		 print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1,array()),''),'THEME_ELDY_VERMENU_BACK1','',1).' ';
 		 }
 		 else
 		 {
@@ -610,9 +579,8 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("LeftMenuBackgroundColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), ''), 'THEME_ELDY_VERMENU_BACK1', 'formcolor', 1).' ';
+		if ($edit) {
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), ''), 'THEME_ELDY_VERMENU_BACK1', '', 1, '', '', 'colorbackvmenu1').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -625,17 +593,15 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// TextTitleColor for title of Pages
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 	} else {
 		$default = (empty($colortexttitlenotab) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortexttitlenotab)));
 
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("TextTitleColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLENOTAB, array()), ''), 'THEME_ELDY_TEXTTITLENOTAB', 'formcolor', 1).' ';
+		if ($edit) {
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLENOTAB, array()), ''), 'THEME_ELDY_TEXTTITLENOTAB', '', 1, '', '', 'colortexttitlenotab').' ';
 		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLENOTAB, $langs->trans("Default"));
 		}
@@ -647,17 +613,15 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// BackgroundTableTitleColor
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 	} else {
 		$default = (empty($colorbacktitle1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacktitle1)));
 
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("BackgroundTableTitleColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKTITLE1, array()), ''), 'THEME_ELDY_BACKTITLE1', 'formcolor', 1).' ';
+		if ($edit) {
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKTITLE1, array()), ''), 'THEME_ELDY_BACKTITLE1', '', 1, '', '', 'colorbacktitle1').' ';
 		} else {
 	   		print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
 	   	}
@@ -669,17 +633,15 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// TextTitleColor
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 	} else {
 		$default = (empty($colortexttitle) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortexttitle)));
 
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("BackgroundTableTitleTextColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLE, array()), ''), 'THEME_ELDY_TEXTTITLE', 'formcolor', 1).' ';
+		if ($edit) {
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLE, array()), ''), 'THEME_ELDY_TEXTTITLE', '', 1, '', '', 'colortexttitle').' ';
 		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLE, $langs->trans("Default"));
 		}
@@ -691,17 +653,15 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// TextTitleLinkColor
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 	} else {
-		$default=(empty($colortexttitlelink) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortexttitlelink)));
+		$default = (empty($colortexttitlelink) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortexttitlelink)));
 
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("BackgroundTableTitleTextlinkColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLELINK, array()), ''), 'THEME_ELDY_TEXTTITLELINK', 'formcolor', 1).' ';
+		if ($edit) {
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLELINK, array()), ''), 'THEME_ELDY_TEXTTITLELINK', '', 1, '', '', 'colortexttitlelink').' ';
 		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLELINK, $langs->trans("Default"));
 		}
@@ -714,17 +674,15 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// BackgroundTableLineOddColor
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 	} else {
 		$default = (empty($colorbacklineimpair1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklineimpair1)));
 
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("BackgroundTableLineOddColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), ''), 'THEME_ELDY_LINEIMPAIR1', 'formcolor', 1).' ';
+		if ($edit) {
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), ''), 'THEME_ELDY_LINEIMPAIR1', '', 1, '', '', 'colorbacklinepair2').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -737,17 +695,15 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// BackgroundTableLineEvenColor
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 	} else {
 		$default = (empty($colorbacklinepair1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklinepair1)));
 
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("BackgroundTableLineEvenColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), ''), 'THEME_ELDY_LINEPAIR1', 'formcolor', 1).' ';
+		if ($edit) {
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), ''), 'THEME_ELDY_LINEPAIR1', '', 1, '', '', 'colorbacklineimpair2').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -760,8 +716,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// Text LinkColor
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 		/*
 	     print '<tr class="oddeven">';
 	     print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
@@ -772,7 +727,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	     print '<td>';
 	     if ($edit)
 	     {
-	     print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),''),'THEME_ELDY_TEXTLINK','formcolor',1).' ';
+	     print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),''),'THEME_ELDY_TEXTLINK','',1).' ';
 	     }
 	     else
 	     {
@@ -788,9 +743,8 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("LinkColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), ''), 'THEME_ELDY_TEXTLINK', 'formcolor', 1).' ';
+		if ($edit) {
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), ''), 'THEME_ELDY_TEXTLINK', '', 1, '', '', 'colortextlink').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -807,8 +761,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// Use Hover
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 		/* Must first change option to choose color of highlight instead of yes or no.
 	     print '<tr class="oddeven">';
 	     print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';
@@ -827,16 +780,14 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td colspan="'.($colspan - 1).'">';
 		//print '<input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
 		//print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
-		if ($edit)
-		{
+		if ($edit) {
 			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));
 			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');
-			print $formother->selectColor($color, 'THEME_ELDY_USE_HOVER', 'formcolor', 1).' ';
+			print $formother->selectColor($color, 'THEME_ELDY_USE_HOVER', '', 1, '', '', 'colorbacklinepairhover').' ';
 		} else {
 			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));
 			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');
-			if ($color)
-			{
+			if ($color) {
 				if ($color != colorArrayToHex(colorStringToArray($colorbacklinepairhover))) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 				else print $langs->trans("Default");
 			} else print $langs->trans("Default");
@@ -847,8 +798,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// Use Checked
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 		/* Must first change option to choose color of highlight instead of yes or no.
 	     print '<tr class="oddeven">';
 	     print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';
@@ -867,16 +817,14 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td colspan="'.($colspan - 1).'">';
 		//print '<input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
 		//print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
-		if ($edit)
-		{
+		if ($edit) {
 			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color = 'e6edf0';
 			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED, array()), '');
-			print $formother->selectColor($color, 'THEME_ELDY_USE_CHECKED', 'formcolor', 1).' ';
+			print $formother->selectColor($color, 'THEME_ELDY_USE_CHECKED', '', 1, '', '', 'colorbacklinepairchecked').' ';
 		} else {
 			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color = 'e6edf0';
 			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED, array()), '');
-			if ($color)
-			{
+			if ($color) {
 				if ($color != 'e6edf0') print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 				else print $langs->trans("Default");
 			} else print $langs->trans("Default");
@@ -888,32 +836,29 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// Use MAIN_OPTIMIZEFORTEXTBROWSER
-	if ($foruserprofile)
-	{
-	    //$default=yn($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
-	    $default = $langs->trans('No');
-	    print '<tr class="oddeven">';
-	    print '<td>'.$langs->trans("MAIN_OPTIMIZEFORTEXTBROWSER").'</td>';
-	    print '<td colspan="'.($colspan - 1).'">';
-	    //print ajax_constantonoff("MAIN_OPTIMIZEFORTEXTBROWSER", array(), null, 0, 0, 1, 0);
-   	    if ($edit)
-   	    {
-   	        print $form->selectyesno('MAIN_OPTIMIZEFORTEXTBROWSER', $fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER, 1);
-   	    } else {
-   	        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-   	        {
-   	            print yn($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER);
-   	        } else {
-   	            print yn(1);
-   	            if (empty($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) print ' ('.$langs->trans("ForcedByGlobalSetup").')';
-   	        }
-   	    }
-   	    print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';
-	    print $form->textwithpicto('', $langs->trans("MAIN_OPTIMIZEFORTEXTBROWSERDesc"));
-	    print '</td>';
-	    print '</tr>';
+	if ($foruserprofile) {
+		//$default=yn($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
+		$default = $langs->trans('No');
+		print '<tr class="oddeven">';
+		print '<td>'.$langs->trans("MAIN_OPTIMIZEFORTEXTBROWSER").'</td>';
+		print '<td colspan="'.($colspan - 1).'">';
+		//print ajax_constantonoff("MAIN_OPTIMIZEFORTEXTBROWSER", array(), null, 0, 0, 1, 0);
+   		if ($edit) {
+   			print $form->selectyesno('MAIN_OPTIMIZEFORTEXTBROWSER', $fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER, 1);
+   		} else {
+   			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+   				print yn($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER);
+   			} else {
+   				print yn(1);
+   				if (empty($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) print ' ('.$langs->trans("ForcedByGlobalSetup").')';
+   			}
+   		}
+   		print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';
+		print $form->textwithpicto('', $langs->trans("MAIN_OPTIMIZEFORTEXTBROWSERDesc"));
+		print '</td>';
+		print '</tr>';
 	} else {
-	    /*var_dump($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
+		/*var_dump($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
 	    $default=$langs->trans('No');
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("MAIN_OPTIMIZEFORTEXTBROWSER").'</td>';
@@ -936,8 +881,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 
 
 	// Use MAIN_OPTIMIZEFORTEXTBROWSER
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 		//$default=yn($conf->global->MAIN_OPTIMIZEFORCOLORBLIND);
 		$default = $langs->trans('No');
 		print '<tr class="oddeven">';
@@ -952,8 +896,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 			'tritanopes' => $langs->trans('Tritanopes'),
 		);
 
-		if ($edit)
-		{
+		if ($edit) {
 			print $form->selectArray('MAIN_OPTIMIZEFORCOLORBLIND', $colorBlindOptions, $fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND, 0);
 		} else {
 			if (!empty($fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND) && isset($colorBlindOptions[$fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND])) {
@@ -969,4 +912,5 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	} else {
 	}
 	print '</table>';
+	print '</div>';
 }
diff --git a/htdocs/core/lib/vat.lib.php b/htdocs/core/lib/vat.lib.php
index 68e52a142a3..5cd2203a393 100644
--- a/htdocs/core/lib/vat.lib.php
+++ b/htdocs/core/lib/vat.lib.php
@@ -31,39 +31,39 @@
  */
 function vat_prepare_head($object)
 {
-    global $db, $langs, $conf;
+	global $db, $langs, $conf;
 
-    $tab = 0;
-    $head = array();
+	$tab = 0;
+	$head = array();
 
 	$head[$tab][0] = DOL_URL_ROOT.'/compta/tva/card.php?id='.$object->id;
 	$head[$tab][1] = $langs->trans('VATPayment');
 	$head[$tab][2] = 'card';
 	$tab++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $tab, 'vat');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $tab, 'vat');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->tax->dir_output."/vat/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$tab][0] = DOL_URL_ROOT.'/compta/tva/document.php?id='.$object->id;
 	$head[$tab][1] = $langs->trans("Documents");
 	if (($nbFiles + $nbLinks) > 0) $head[$tab][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
 	$head[$tab][2] = 'documents';
 	$tab++;
 
-    $head[$tab][0] = DOL_URL_ROOT.'/compta/tva/info.php?id='.$object->id;
-    $head[$tab][1] = $langs->trans("Info");
-    $head[$tab][2] = 'info';
-    $tab++;
+	$head[$tab][0] = DOL_URL_ROOT.'/compta/tva/info.php?id='.$object->id;
+	$head[$tab][1] = $langs->trans("Info");
+	$head[$tab][2] = 'info';
+	$tab++;
 
-    complete_head_from_modules($conf, $langs, $object, $head, $tab, 'vat', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $tab, 'vat', 'remove');
 
-    return $head;
+	return $head;
 }
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index e0f7f4d50b6..75a20ac6852 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -554,7 +554,7 @@ function getStructuredData($type, $data = array())
 			"name": "'.dol_escape_json($data['name']).'",
 			"operatingSystem": "'.dol_escape_json($data['os']).'",
 			"applicationCategory": "https://schema.org/'.$data['applicationCategory'].'",';
-		if (! empty($data['ratingcount'])) {
+		if (!empty($data['ratingcount'])) {
 			$ret .= '
 				"aggregateRating": {
 					"@type": "AggregateRating",
@@ -594,11 +594,11 @@ function getStructuredData($type, $data = array())
 			$i = 0;
 			foreach ($mysoc->socialnetworks as $key => $value) {
 				if ($key == 'linkedin') {
-					$ret.= '"https://www.'.$key.'.com/company/'.dol_escape_json($value).'"';
+					$ret .= '"https://www.'.$key.'.com/company/'.dol_escape_json($value).'"';
 				} elseif ($key == 'youtube') {
-					$ret.= '"https://www.'.$key.'.com/user/'.dol_escape_json($value).'"';
+					$ret .= '"https://www.'.$key.'.com/user/'.dol_escape_json($value).'"';
 				} else {
-					$ret.= '"https://www.'.$key.'.com/'.dol_escape_json($value).'"';
+					$ret .= '"https://www.'.$key.'.com/'.dol_escape_json($value).'"';
 				}
 				$i++;
 				if ($i < count($mysoc->socialnetworks)) $ret .= ', ';
@@ -660,7 +660,7 @@ function getStructuredData($type, $data = array())
 				$i = 0;
 				$arrayofkeywords = explode(',', $websitepage->keywords);
 				foreach ($arrayofkeywords as $keyword) {
-					$ret.= '"'.dol_escape_json($keyword).'"';
+					$ret .= '"'.dol_escape_json($keyword).'"';
 					$i++;
 					if ($i < count($arrayofkeywords)) $ret .= ', ';
 				}
@@ -849,7 +849,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 	if (!$error && (empty($max) || ($found < $max)) && (preg_match('/meta/', $algo) || preg_match('/content/', $algo)))
 	{
 		$sql = 'SELECT wp.rowid FROM '.MAIN_DB_PREFIX.'website_page as wp';
-		if (is_array($otherfilters) && ! empty($otherfilters['category'])) {
+		if (is_array($otherfilters) && !empty($otherfilters['category'])) {
 			$sql .= ', '.MAIN_DB_PREFIX.'categorie_website_page as cwp';
 		}
 		$sql .= " WHERE wp.fk_website = ".$website->id;
@@ -879,7 +879,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 			$searchalgo .= ($searchalgo ? ' OR ' : '')."wp.content LIKE '%".$db->escape($searchstring)."%'";
 		}
 		$sql .= $searchalgo;
-		if (is_array($otherfilters) && ! empty($otherfilters['category'])) {
+		if (is_array($otherfilters) && !empty($otherfilters['category'])) {
 			$sql .= ' AND cwp.fk_website_page = wp.rowid AND cwp.fk_categorie = '.((int) $otherfilters['category']);
 		}
 		$sql .= ")";
diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 673b904b743..1ed80ece372 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -442,7 +442,7 @@ function dolSaveReadme($file, $content)
 /**
  * 	Show list of themes. Show all thumbs of themes/skins
  *
- *	@param	Website		$website		Object website to load the tempalte into
+ *	@param	Website		$website		Object website to load the template into
  * 	@return	void
  */
 function showWebsiteTemplates(Website $website)
diff --git a/htdocs/core/lib/ws.lib.php b/htdocs/core/lib/ws.lib.php
index ad16755f617..faf1b5bc871 100644
--- a/htdocs/core/lib/ws.lib.php
+++ b/htdocs/core/lib/ws.lib.php
@@ -34,35 +34,35 @@
  */
 function check_authentication($authentication, &$error, &$errorcode, &$errorlabel)
 {
-    global $db, $conf, $langs;
-    global $dolibarr_main_authentication, $dolibarr_auto_user;
+	global $db, $conf, $langs;
+	global $dolibarr_main_authentication, $dolibarr_auto_user;
 
-    $fuser = new User($db);
+	$fuser = new User($db);
 
-    if (!$error && ($authentication['dolibarrkey'] != $conf->global->WEBSERVICES_KEY))
-    {
-        $error++;
-        $errorcode = 'BAD_VALUE_FOR_SECURITY_KEY'; $errorlabel = 'Value provided into dolibarrkey entry field does not match security key defined in Webservice module setup';
-    }
+	if (!$error && ($authentication['dolibarrkey'] != $conf->global->WEBSERVICES_KEY))
+	{
+		$error++;
+		$errorcode = 'BAD_VALUE_FOR_SECURITY_KEY'; $errorlabel = 'Value provided into dolibarrkey entry field does not match security key defined in Webservice module setup';
+	}
 
-    if (!$error && !empty($authentication['entity']) && !is_numeric($authentication['entity']))
-    {
-        $error++;
-        $errorcode = 'BAD_PARAMETERS'; $errorlabel = "The entity parameter must be empty (or filled with numeric id of instance if multicompany module is used).";
-    }
+	if (!$error && !empty($authentication['entity']) && !is_numeric($authentication['entity']))
+	{
+		$error++;
+		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "The entity parameter must be empty (or filled with numeric id of instance if multicompany module is used).";
+	}
 
-    if (!$error)
-    {
-        $result = $fuser->fetch('', $authentication['login'], '', 0);
-        if ($result < 0)
-        {
-            $error++;
-            $errorcode = 'ERROR_FETCH_USER'; $errorlabel = 'A technical error occurred during fetch of user';
-        } elseif ($result == 0)
-        {
-            $error++;
-            $errorcode = 'BAD_CREDENTIALS'; $errorlabel = 'Bad value for login or password';
-        }
+	if (!$error)
+	{
+		$result = $fuser->fetch('', $authentication['login'], '', 0);
+		if ($result < 0)
+		{
+			$error++;
+			$errorcode = 'ERROR_FETCH_USER'; $errorlabel = 'A technical error occurred during fetch of user';
+		} elseif ($result == 0)
+		{
+			$error++;
+			$errorcode = 'BAD_CREDENTIALS'; $errorlabel = 'Bad value for login or password';
+		}
 
 		if (!$error && $fuser->statut == 0)
 		{
@@ -70,27 +70,27 @@ function check_authentication($authentication, &$error, &$errorcode, &$errorlabe
 			$errorcode = 'ERROR_USER_DISABLED'; $errorlabel = 'This user has been locked or disabled';
 		}
 
-    	// Validation of login
+		// Validation of login
 		if (!$error)
 		{
 			$fuser->getrights(); // Load permission of user
 
-        	// Authentication mode
-        	if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication = 'http,dolibarr';
-        	// Authentication mode: forceuser
-        	if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user = 'auto';
-        	// Set authmode
-        	$authmode = explode(',', $dolibarr_main_authentication);
+			// Authentication mode
+			if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication = 'http,dolibarr';
+			// Authentication mode: forceuser
+			if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user = 'auto';
+			// Set authmode
+			$authmode = explode(',', $dolibarr_main_authentication);
 
-            include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-        	$login = checkLoginPassEntity($authentication['login'], $authentication['password'], $authentication['entity'], $authmode, 'ws');
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+			$login = checkLoginPassEntity($authentication['login'], $authentication['password'], $authentication['entity'], $authmode, 'ws');
 			if (empty($login))
 			{
-			    $error++;
-                $errorcode = 'BAD_CREDENTIALS'; $errorlabel = 'Bad value for login or password';
+				$error++;
+				$errorcode = 'BAD_CREDENTIALS'; $errorlabel = 'Bad value for login or password';
 			}
 		}
-    }
+	}
 
-    return $fuser;
+	return $fuser;
 }
diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index 52e50a504af..a6f9323f99b 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -123,11 +123,11 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 				{
 					$login = $obj->login;
 				} else {
-				    sleep(2); // Anti brut force protection
-				    dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO bad password for '".$usertotest."', cryptType=".$cryptType, LOG_NOTICE);
+					sleep(2); // Anti brut force protection
+					dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO bad password for '".$usertotest."', cryptType=".$cryptType, LOG_NOTICE);
 
 					// Load translation files required by the page
-                    $langs->loadLangs(array('main', 'errors'));
+					$langs->loadLangs(array('main', 'errors'));
 
 					$_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
 				}
@@ -152,7 +152,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 				sleep(1);
 
 				// Load translation files required by the page
-                $langs->loadLangs(array('main', 'errors'));
+				$langs->loadLangs(array('main', 'errors'));
 
 				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
 			}
diff --git a/htdocs/core/login/functions_googleoauth.php b/htdocs/core/login/functions_googleoauth.php
index e621f41e562..b5e56c74d74 100644
--- a/htdocs/core/login/functions_googleoauth.php
+++ b/htdocs/core/login/functions_googleoauth.php
@@ -41,16 +41,16 @@
  */
 function check_user_password_googleoauth($usertotest, $passwordtotest, $entitytotest)
 {
-    global $_POST, $db, $conf, $langs;
+	global $_POST, $db, $conf, $langs;
 
-    dol_syslog("functions_googleoauth::check_user_password_googleoauth usertotest=".$usertotest);
+	dol_syslog("functions_googleoauth::check_user_password_googleoauth usertotest=".$usertotest);
 
-    $login = '';
+	$login = '';
 
-    // Get identity from user and redirect browser to Google OAuth Server
-    if (GETPOSTISSET('username'))
-    {
-        /*$openid = new SimpleOpenID();
+	// Get identity from user and redirect browser to Google OAuth Server
+	if (GETPOSTISSET('username'))
+	{
+		/*$openid = new SimpleOpenID();
         $openid->SetIdentity($_POST['username']);
         $protocol = ($conf->file->main_force_https ? 'https://' : 'http://');
         $openid->SetTrustRoot($protocol . $_SERVER["HTTP_HOST"]);
@@ -68,8 +68,8 @@ function check_user_password_googleoauth($usertotest, $passwordtotest, $entityto
             return false;
         }
         return false;*/
-    }
+	}
 
 
-    return $login;
+	return $login;
 }
diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php
index 287563b01c3..41ce8a67316 100644
--- a/htdocs/core/login/functions_ldap.php
+++ b/htdocs/core/login/functions_ldap.php
@@ -56,7 +56,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 		sleep(1);
 
 		// Load translation files required by the page
-        $langs->loadLangs(array('main', 'other'));
+		$langs->loadLangs(array('main', 'other'));
 
 		$_SESSION["dol_loginmesg"] = $langs->trans("ErrorLDAPFunctionsAreDisabledOnThisPHP").' '.$langs->trans("TryAnotherConnectionMode");
 		return;
@@ -234,7 +234,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 				sleep(1);
 
 				// Load translation files required by the page
-                $langs->loadLangs(array('main', 'other'));
+				$langs->loadLangs(array('main', 'other'));
 
 				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
 			}
@@ -257,7 +257,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 			sleep(2); // Anti brut force protection
 
 			// Load translation files required by the page
-            $langs->loadLangs(array('main', 'other', 'errors'));
+			$langs->loadLangs(array('main', 'other', 'errors'));
 			$_SESSION["dol_loginmesg"] = ($ldap->error ? $ldap->error : $langs->trans("ErrorBadLoginPassword"));
 		}
 
diff --git a/htdocs/core/login/functions_openid.php b/htdocs/core/login/functions_openid.php
index e5e66a7fc80..f0191da53c0 100644
--- a/htdocs/core/login/functions_openid.php
+++ b/htdocs/core/login/functions_openid.php
@@ -36,87 +36,87 @@ include_once DOL_DOCUMENT_ROOT.'/core/class/openid.class.php';
  */
 function check_user_password_openid($usertotest, $passwordtotest, $entitytotest)
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    dol_syslog("functions_openid::check_user_password_openid usertotest=".$usertotest);
+	dol_syslog("functions_openid::check_user_password_openid usertotest=".$usertotest);
 
-    $login = '';
+	$login = '';
 
-    // Get identity from user and redirect browser to OpenID Server
-    if (GETPOSISSET('username'))
-    {
-        $openid = new SimpleOpenID();
-        $openid->SetIdentity($_POST['username']);
-        $protocol = ($conf->file->main_force_https ? 'https://' : 'http://');
-        $openid->SetTrustRoot($protocol.$_SERVER["HTTP_HOST"]);
-        $openid->SetRequiredFields(array('email', 'fullname'));
-        $_SESSION['dol_entity'] = $_POST["entity"];
-        //$openid->SetOptionalFields(array('dob','gender','postcode','country','language','timezone'));
-        if ($openid->sendDiscoveryRequestToGetXRDS())
-        {
-            $openid->SetApprovedURL($protocol.$_SERVER["HTTP_HOST"].$_SERVER["SCRIPT_NAME"]); // Send Response from OpenID server to this script
-            $openid->Redirect(); // This will redirect user to OpenID Server
-        } else {
-        	$_SESSION["dol_loginmesg"] = $openid->GetError();
-            return false;
-        }
-        return false;
-    }
-    // Perform HTTP Request to OpenID server to validate key
-    elseif ($_GET['openid_mode'] == 'id_res')
-    {
-        $openid = new SimpleOpenID();
-        $openid->SetIdentity($_GET['openid_identity']);
-        $openid_validation_result = $openid->ValidateWithServer();
-        if ($openid_validation_result === true)
-        {
-            // OK HERE KEY IS VALID
+	// Get identity from user and redirect browser to OpenID Server
+	if (GETPOSISSET('username'))
+	{
+		$openid = new SimpleOpenID();
+		$openid->SetIdentity($_POST['username']);
+		$protocol = ($conf->file->main_force_https ? 'https://' : 'http://');
+		$openid->SetTrustRoot($protocol.$_SERVER["HTTP_HOST"]);
+		$openid->SetRequiredFields(array('email', 'fullname'));
+		$_SESSION['dol_entity'] = $_POST["entity"];
+		//$openid->SetOptionalFields(array('dob','gender','postcode','country','language','timezone'));
+		if ($openid->sendDiscoveryRequestToGetXRDS())
+		{
+			$openid->SetApprovedURL($protocol.$_SERVER["HTTP_HOST"].$_SERVER["SCRIPT_NAME"]); // Send Response from OpenID server to this script
+			$openid->Redirect(); // This will redirect user to OpenID Server
+		} else {
+			$_SESSION["dol_loginmesg"] = $openid->GetError();
+			return false;
+		}
+		return false;
+	}
+	// Perform HTTP Request to OpenID server to validate key
+	elseif ($_GET['openid_mode'] == 'id_res')
+	{
+		$openid = new SimpleOpenID();
+		$openid->SetIdentity($_GET['openid_identity']);
+		$openid_validation_result = $openid->ValidateWithServer();
+		if ($openid_validation_result === true)
+		{
+			// OK HERE KEY IS VALID
 
-            $sql = "SELECT login, entity, datestartvalidity, dateendvalidity";
-            $sql .= " FROM ".MAIN_DB_PREFIX."user";
-            $sql .= " WHERE openid = '".$db->escape($_GET['openid_identity'])."'";
-            $sql .= " AND entity IN (0,".($_SESSION["dol_entity"] ? $_SESSION["dol_entity"] : 1).")";
+			$sql = "SELECT login, entity, datestartvalidity, dateendvalidity";
+			$sql .= " FROM ".MAIN_DB_PREFIX."user";
+			$sql .= " WHERE openid = '".$db->escape($_GET['openid_identity'])."'";
+			$sql .= " AND entity IN (0,".($_SESSION["dol_entity"] ? $_SESSION["dol_entity"] : 1).")";
 
-            dol_syslog("functions_openid::check_user_password_openid", LOG_DEBUG);
-            $resql = $db->query($sql);
-            if ($resql)
-            {
-                $obj = $db->fetch_object($resql);
-                if ($obj)
-                {
-                	$now = dol_now();
-                	if ($obj->datestartvalidity && $db->jdate($obj->datestartvalidity) > $now) {
-                		// Load translation files required by the page
-                		$langs->loadLangs(array('main', 'errors'));
-                		$_SESSION["dol_loginmesg"] = $langs->trans("ErrorLoginDateValidity");
-                		return '--bad-login-validity--';
-                	}
-                	if ($obj->dateendvalidity && $db->jdate($obj->dateendvalidity) < dol_get_first_hour($now)) {
-                		// Load translation files required by the page
-                		$langs->loadLangs(array('main', 'errors'));
-                		$_SESSION["dol_loginmesg"] = $langs->trans("ErrorLoginDateValidity");
-                		return '--bad-login-validity--';
-                	}
+			dol_syslog("functions_openid::check_user_password_openid", LOG_DEBUG);
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$obj = $db->fetch_object($resql);
+				if ($obj)
+				{
+					$now = dol_now();
+					if ($obj->datestartvalidity && $db->jdate($obj->datestartvalidity) > $now) {
+						// Load translation files required by the page
+						$langs->loadLangs(array('main', 'errors'));
+						$_SESSION["dol_loginmesg"] = $langs->trans("ErrorLoginDateValidity");
+						return '--bad-login-validity--';
+					}
+					if ($obj->dateendvalidity && $db->jdate($obj->dateendvalidity) < dol_get_first_hour($now)) {
+						// Load translation files required by the page
+						$langs->loadLangs(array('main', 'errors'));
+						$_SESSION["dol_loginmesg"] = $langs->trans("ErrorLoginDateValidity");
+						return '--bad-login-validity--';
+					}
 
-                    $login = $obj->login;
-                }
-            }
-        } elseif ($openid->IsError() === true)
-        {
-            // ON THE WAY, WE GOT SOME ERROR
-        	$_SESSION["dol_loginmesg"] = $openid->GetError();
-            return false;
-        } else {
-            // Signature Verification Failed
-            //echo "INVALID AUTHORIZATION";
-            return false;
-        }
-    } elseif ($_GET['openid_mode'] == 'cancel')
-    {
-        // User Canceled your Request
-        //echo "USER CANCELED REQUEST";
-        return false;
-    }
+					$login = $obj->login;
+				}
+			}
+		} elseif ($openid->IsError() === true)
+		{
+			// ON THE WAY, WE GOT SOME ERROR
+			$_SESSION["dol_loginmesg"] = $openid->GetError();
+			return false;
+		} else {
+			// Signature Verification Failed
+			//echo "INVALID AUTHORIZATION";
+			return false;
+		}
+	} elseif ($_GET['openid_mode'] == 'cancel')
+	{
+		// User Canceled your Request
+		//echo "USER CANCELED REQUEST";
+		return false;
+	}
 
-    return $login;
+	return $login;
 }
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index b1b5c708249..27eed001188 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -227,7 +227,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 -- Social contributions
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled', __HANDLER__, 'left', 2250__+MAX_llx_menu__, 'billing', 'tax_social', 2200__+MAX_llx_menu__, '/compta/sociales/list.php?mainmenu=billing&amp;leftmenu=tax_social', 'SocialContributions', 1, '', '$user->rights->tax->charges->lire', '', 0, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && $leftmenu=="tax_social"', __HANDLER__, 'left', 2251__+MAX_llx_menu__, 'billing', '', 2250__+MAX_llx_menu__, '/compta/sociales/card.php?mainmenu=billing&amp;leftmenu=tax_social&amp;action=create', 'MenuNewSocialContribution', 2, '', '$user->rights->tax->charges->creer', '', 0, 2, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && $leftmenu=="tax_social"', __HANDLER__, 'left', 2252__+MAX_llx_menu__, 'billing', '', 2250__+MAX_llx_menu__, '/compta/sociales/payments.php?mainmenu=billing&amp;leftmenu=tax_social&amp;mode=sconly', 'Payments', 2, '', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && $leftmenu=="tax_social"', __HANDLER__, 'left', 2252__+MAX_llx_menu__, 'billing', '', 2250__+MAX_llx_menu__, '/compta/sociales/payments.php?mainmenu=billing&amp;leftmenu=tax_social', 'Payments', 2, '', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__);
 -- VAT
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS)', __HANDLER__, 'left', 2300__+MAX_llx_menu__, 'billing', 'tax_vat', 2200__+MAX_llx_menu__, '/compta/tva/list.php?mainmenu=billing&amp;leftmenu=tax_vat', 'VAT', 1, 'companies', '$user->rights->tax->charges->lire', '', 0, 7, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2301__+MAX_llx_menu__, 'billing', '', 2300__+MAX_llx_menu__, '/compta/tva/card.php?mainmenu=billing&amp;leftmenu=tax_vat&amp;action=create', 'New', 2, 'companies', '$user->rights->tax->charges->creer', '', 0, 0, __ENTITY__);
@@ -251,58 +251,61 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && $leftmenu=="tax_various"', __HANDLER__, 'left', 2352__+MAX_llx_menu__, 'billing', '', 2350__+MAX_llx_menu__, '/compta/bank/various_payment/list.php?mainmenu=billing&amp;leftmenu=tax_various', 'List', 1, 'various_payment', '$user->rights->banque->lire', '', 0, 3, __ENTITY__);
 -- Accounting (Double entries)
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2400__+MAX_llx_menu__, 'accountancy', 'accountancy', 9__+MAX_llx_menu__, '/accountancy/index.php?mainmenu=accountancy&amp;leftmenu=accountancy', 'MenuAccountancy', 0, 'main', '! empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire', '', 0, 7, __ENTITY__);
-	-- Setup
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2451__+MAX_llx_menu__, 'accountancy', 'accountancy_admin',            2400__+MAX_llx_menu__, '/accountancy/index.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Setup', 1, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 1, __ENTITY__);
+-- Setup
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2451__+MAX_llx_menu__, 'accountancy', 'accountancy_admin',            2400__+MAX_llx_menu__, '/accountancy/index.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Setup', 1, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 1, __ENTITY__);
 
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2453__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_general',       2451__+MAX_llx_menu__, '/accountancy/admin/index.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'General', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 10, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2454__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_journal',       2451__+MAX_llx_menu__, '/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingJournals', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 20, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2455__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chartmodel',    2451__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Pcg_version', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 30, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2456__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart',         2451__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Chartofaccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 40, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2457__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart_group',   2451__+MAX_llx_menu__, '/accountancy/admin/categories_list.php?id=32&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingCategory', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 41, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2458__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_default',       2451__+MAX_llx_menu__, '/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuDefaultAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 50, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2453__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_general',       2451__+MAX_llx_menu__, '/accountancy/admin/index.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'General', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 10, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2454__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_journal',       2451__+MAX_llx_menu__, '/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingJournals', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 20, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2455__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chartmodel',    2451__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Pcg_version', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 30, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2456__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart',         2451__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Chartofaccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 40, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2457__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chartsubledger',2451__+MAX_llx_menu__, '/accountancy/admin/subaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'ChartOfSubaccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 41, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2458__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart_group',   2451__+MAX_llx_menu__, '/accountancy/admin/categories_list.php?id=32&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingCategory', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 45, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2459__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_default',       2451__+MAX_llx_menu__, '/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuDefaultAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 50, __ENTITY__);
 
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2459__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_vat',           2451__+MAX_llx_menu__, '/compta/bank/list.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuBankAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 51, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2460__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_vat',           2451__+MAX_llx_menu__, '/compta/bank/list.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuBankAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 51, __ENTITY__);
 
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2460__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_vat',           2451__+MAX_llx_menu__, '/admin/dict.php?id=10&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuVatAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 52, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2461__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_tax',           2451__+MAX_llx_menu__, '/admin/dict.php?id=7&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuTaxAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 53, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2462__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_expensereport', 2451__+MAX_llx_menu__, '/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuExpenseReportAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 54, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2463__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_product',       2451__+MAX_llx_menu__, '/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuProductsAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 55, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2461__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_vat',           2451__+MAX_llx_menu__, '/admin/dict.php?id=10&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuVatAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 52, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2462__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_tax',           2451__+MAX_llx_menu__, '/admin/dict.php?id=7&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuTaxAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 53, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2463__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_expensereport', 2451__+MAX_llx_menu__, '/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuExpenseReportAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 54, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2464__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_product',       2451__+MAX_llx_menu__, '/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuProductsAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 55, __ENTITY__);
 
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2464__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_export',        2451__+MAX_llx_menu__, '/accountancy/admin/export.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'ExportOptions', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 60, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin" && $conf->global->MAIN_FEATURES_LEVEL > 1', __HANDLER__, 'left', 2465__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_closure',       2451__+MAX_llx_menu__, '/accountancy/admin/closure.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuClosureAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 70, __ENTITY__);
-	-- Accounting period
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin" && $conf->global->MAIN_FEATURES_LEVEL > 0', __HANDLER__, 'left', 2450__+MAX_llx_menu__,  'accountancy', 'accountancy_admin_period', 2451__+MAX_llx_menu__, '/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'FiscalPeriod', 1, 'admin', '', '', 2, 80, __ENTITY__);
-	-- Binding
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->facture->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)', __HANDLER__, 'left', 2401__+MAX_llx_menu__, 'accountancy', 'accountancy_dispatch_customer', 2400__+MAX_llx_menu__, '/accountancy/customer/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer', 'CustomersVentilation', 1, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 2, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->facture->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES) && $leftmenu=="accountancy_dispatch_customer"', __HANDLER__, 'left', 2402__+MAX_llx_menu__, 'accountancy', '', 2401__+MAX_llx_menu__, '/accountancy/customer/list.php?mainmenu=accountancy', 'ToDispatch', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 3, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->facture->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES) && $leftmenu=="accountancy_dispatch_customer"', __HANDLER__, 'left', 2403__+MAX_llx_menu__, 'accountancy', '', 2401__+MAX_llx_menu__, '/accountancy/customer/lines.php?mainmenu=accountancy', 'Dispatched', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 4, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES)', __HANDLER__, 'left', 2410__+MAX_llx_menu__, 'accountancy', 'accountancy_dispatch_supplier', 2400__+MAX_llx_menu__, '/accountancy/supplier/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier', 'SuppliersVentilation', 1, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 5, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES) && $leftmenu=="accountancy_dispatch_supplier"', __HANDLER__, 'left', 2411__+MAX_llx_menu__, 'accountancy', '', 2410__+MAX_llx_menu__, '/accountancy/supplier/list.php?mainmenu=accountancy', 'ToDispatch', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 6, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES) && $leftmenu=="accountancy_dispatch_supplier"', __HANDLER__, 'left', 2412__+MAX_llx_menu__, 'accountancy', '', 2410__+MAX_llx_menu__, '/accountancy/supplier/lines.php?mainmenu=accountancy', 'Dispatched', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 7, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->expensereport->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS)', __HANDLER__, 'left', 2420__+MAX_llx_menu__, 'accountancy', 'accountancy_dispatch_expensereport', 2400__+MAX_llx_menu__, '/accountancy/expensereport/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport', 'ExpenseReportsVentilation', 1, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 5, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->expensereport->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS) && $leftmenu=="accountancy_dispatch_expensereport"', __HANDLER__, 'left', 2421__+MAX_llx_menu__, 'accountancy', '', 2420__+MAX_llx_menu__, '/accountancy/expensereport/list.php?mainmenu=accountancy', 'ToDispatch', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 6, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->expensereport->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS) && $leftmenu=="accountancy_dispatch_expensereport"', __HANDLER__, 'left', 2422__+MAX_llx_menu__, 'accountancy', '', 2420__+MAX_llx_menu__, '/accountancy/expensereport/lines.php?mainmenu=accountancy', 'Dispatched', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 7, __ENTITY__);
-	-- Journals
-	--insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2705__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '', 'Journalization', 1, 'main', '$user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
-	--insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2707__+MAX_llx_menu__, 'accountancy', '', 2705__+MAX_llx_menu__, '/accountancy/journal/bankjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=3', 'BankJournal', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
-	--insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2708__+MAX_llx_menu__, 'accountancy', '', 2705__+MAX_llx_menu__, '/accountancy/journal/expensereportsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=6', 'ExpenseReportJournal', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 2, __ENTITY__);
-	--insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2709__+MAX_llx_menu__, 'accountancy', '', 2705__+MAX_llx_menu__, '/accountancy/journal/purchasesjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=2', 'PurchasesJournal', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 3, __ENTITY__);
-	--insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2706__+MAX_llx_menu__, 'accountancy', '', 2705__+MAX_llx_menu__, '/accountancy/journal/sellsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=1', 'SellsJournal', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 4, __ENTITY__);
-	-- General Ledger
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2430__+MAX_llx_menu__, 'accountancy', 'bookkeeping', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/list.php?mainmenu=accountancy&leftmenu=accountancy_bookeeping', 'Bookkeeping', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 15, __ENTITY__);
-	-- Balance
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2435__+MAX_llx_menu__, 'accountancy', 'balance', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/balance.php?mainmenu=accountancy&leftmenu=accountancy_balance', 'AccountBalance', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 16, __ENTITY__);
-	-- Export accounting documents
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2436__+MAX_llx_menu__, 'accountancy', 'accountancy_files', 2400__+MAX_llx_menu__, '/compta/accounting-files.php?mainmenu=accountancy&leftmenu=accountancy_files', 'AccountantFiles', 1, 'accountancy', '$user->rights->compta->resultat->lire || $user->rights->accounting->mouvements->lire', '', 0, 17, __ENTITY__);
-	-- Reports
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2440__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2400__+MAX_llx_menu__, '/compta/resultat/index.php?mainmenu=accountancy&leftmenu=accountancy_report', 'Reportings', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 17, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2441__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2440__+MAX_llx_menu__, '/compta/resultat/index.php?mainmenu=accountancy&leftmenu=accountancy_report', 'MenuReportInOut', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 18, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2443__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2441__+MAX_llx_menu__, '/compta/resultat/clientfourn.php?mainmenu=accountancy&leftmenu=accountancy_report', 'ByPredefinedAccountGroups', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 19, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2442__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2441__+MAX_llx_menu__, '/compta/resultat/result.php?mainmenu=accountancy&leftmenu=accountancy_report', 'ByPersonalizedAccountGroups', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 20, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2444__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2440__+MAX_llx_menu__, '/compta/stats/index.php?mainmenu=accountancy&leftmenu=accountancy_report', 'ReportTurnover', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 21, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2445__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2444__+MAX_llx_menu__, '/compta/stats/casoc.php?mainmenu=accountancy&leftmenu=accountancy_report', 'ByCompanies', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 22, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2446__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2444__+MAX_llx_menu__, '/compta/stats/cabyuser.php?mainmenu=accountancy&leftmenu=accountancy_report', 'ByUsers', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 23, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2447__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2444__+MAX_llx_menu__, '/compta/stats/cabyprodserv.php?mainmenu=accountancy&leftmenu=accountancy_report', 'ByProductsAndServices', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 24, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2465__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_export',        2451__+MAX_llx_menu__, '/accountancy/admin/export.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'ExportOptions', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 60, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin" && $conf->global->MAIN_FEATURES_LEVEL > 1', __HANDLER__, 'left', 2466__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_closure',       2451__+MAX_llx_menu__, '/accountancy/admin/closure.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuClosureAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 70, __ENTITY__);
+-- Accounting period
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin" && $conf->global->MAIN_FEATURES_LEVEL > 0', __HANDLER__, 'left', 2450__+MAX_llx_menu__,  'accountancy', 'accountancy_admin_period', 2451__+MAX_llx_menu__, '/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'FiscalPeriod', 1, 'admin', '', '', 2, 80, __ENTITY__);
+-- Binding
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->facture->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)', __HANDLER__, 'left', 2401__+MAX_llx_menu__, 'accountancy', 'accountancy_dispatch_customer', 2400__+MAX_llx_menu__, '/accountancy/customer/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer', 'CustomersVentilation', 1, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 2, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->facture->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES) && $leftmenu=="accountancy_dispatch_customer"', __HANDLER__, 'left', 2402__+MAX_llx_menu__, 'accountancy', '', 2401__+MAX_llx_menu__, '/accountancy/customer/list.php?mainmenu=accountancy', 'ToDispatch', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 3, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->facture->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES) && $leftmenu=="accountancy_dispatch_customer"', __HANDLER__, 'left', 2403__+MAX_llx_menu__, 'accountancy', '', 2401__+MAX_llx_menu__, '/accountancy/customer/lines.php?mainmenu=accountancy', 'Dispatched', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 4, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES)', __HANDLER__, 'left', 2410__+MAX_llx_menu__, 'accountancy', 'accountancy_dispatch_supplier', 2400__+MAX_llx_menu__, '/accountancy/supplier/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier', 'SuppliersVentilation', 1, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 5, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES) && $leftmenu=="accountancy_dispatch_supplier"', __HANDLER__, 'left', 2411__+MAX_llx_menu__, 'accountancy', '', 2410__+MAX_llx_menu__, '/accountancy/supplier/list.php?mainmenu=accountancy', 'ToDispatch', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 6, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES) && $leftmenu=="accountancy_dispatch_supplier"', __HANDLER__, 'left', 2412__+MAX_llx_menu__, 'accountancy', '', 2410__+MAX_llx_menu__, '/accountancy/supplier/lines.php?mainmenu=accountancy', 'Dispatched', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 7, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->expensereport->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS)', __HANDLER__, 'left', 2420__+MAX_llx_menu__, 'accountancy', 'accountancy_dispatch_expensereport', 2400__+MAX_llx_menu__, '/accountancy/expensereport/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport', 'ExpenseReportsVentilation', 1, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 5, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->expensereport->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS) && $leftmenu=="accountancy_dispatch_expensereport"', __HANDLER__, 'left', 2421__+MAX_llx_menu__, 'accountancy', '', 2420__+MAX_llx_menu__, '/accountancy/expensereport/list.php?mainmenu=accountancy', 'ToDispatch', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 6, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->expensereport->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS) && $leftmenu=="accountancy_dispatch_expensereport"', __HANDLER__, 'left', 2422__+MAX_llx_menu__, 'accountancy', '', 2420__+MAX_llx_menu__, '/accountancy/expensereport/lines.php?mainmenu=accountancy', 'Dispatched', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 7, __ENTITY__);
+-- Journals
+--insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2705__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '', 'Journalization', 1, 'main', '$user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
+--insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2707__+MAX_llx_menu__, 'accountancy', '', 2705__+MAX_llx_menu__, '/accountancy/journal/bankjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=3', 'BankJournal', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
+--insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2708__+MAX_llx_menu__, 'accountancy', '', 2705__+MAX_llx_menu__, '/accountancy/journal/expensereportsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=6', 'ExpenseReportJournal', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 2, __ENTITY__);
+--insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2709__+MAX_llx_menu__, 'accountancy', '', 2705__+MAX_llx_menu__, '/accountancy/journal/purchasesjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=2', 'PurchasesJournal', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 3, __ENTITY__);
+--insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2706__+MAX_llx_menu__, 'accountancy', '', 2705__+MAX_llx_menu__, '/accountancy/journal/sellsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=1', 'SellsJournal', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 4, __ENTITY__);
+-- Balance
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2430__+MAX_llx_menu__, 'accountancy', 'balance', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/balance.php?mainmenu=accountancy&leftmenu=accountancy_balance', 'AccountBalance', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 10, __ENTITY__);
+-- General Ledger
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2432__+MAX_llx_menu__, 'accountancy', 'bookkeeping', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/listbyaccount.php?mainmenu=accountancy&leftmenu=accountancy_bookeeping', 'Bookkeeping', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 12, __ENTITY__);
+-- Journals
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2434__+MAX_llx_menu__, 'accountancy', 'bookkeeping', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/list.php?mainmenu=accountancy&leftmenu=accountancy_bookeeping', 'Journals', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 15, __ENTITY__);
+-- Export accounting documents
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2436__+MAX_llx_menu__, 'accountancy', 'accountancy_files', 2400__+MAX_llx_menu__, '/compta/accounting-files.php?mainmenu=accountancy&leftmenu=accountancy_files', 'AccountantFiles', 1, 'accountancy', '$user->rights->compta->resultat->lire || $user->rights->accounting->mouvements->lire', '', 0, 17, __ENTITY__);
+-- Reports
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2440__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2400__+MAX_llx_menu__, '/compta/resultat/index.php?mainmenu=accountancy&leftmenu=accountancy_report', 'Reportings', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 17, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2441__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2440__+MAX_llx_menu__, '/compta/resultat/index.php?mainmenu=accountancy&leftmenu=accountancy_report', 'MenuReportInOut', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 18, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2443__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2441__+MAX_llx_menu__, '/compta/resultat/clientfourn.php?mainmenu=accountancy&leftmenu=accountancy_report', 'ByPredefinedAccountGroups', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 19, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2442__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2441__+MAX_llx_menu__, '/compta/resultat/result.php?mainmenu=accountancy&leftmenu=accountancy_report', 'ByPersonalizedAccountGroups', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 20, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2444__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2440__+MAX_llx_menu__, '/compta/stats/index.php?mainmenu=accountancy&leftmenu=accountancy_report', 'ReportTurnover', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 21, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2445__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2444__+MAX_llx_menu__, '/compta/stats/casoc.php?mainmenu=accountancy&leftmenu=accountancy_report', 'ByCompanies', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 22, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2446__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2444__+MAX_llx_menu__, '/compta/stats/cabyuser.php?mainmenu=accountancy&leftmenu=accountancy_report', 'ByUsers', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 23, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2447__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2444__+MAX_llx_menu__, '/compta/stats/cabyprodserv.php?mainmenu=accountancy&leftmenu=accountancy_report', 'ByProductsAndServices', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 24, __ENTITY__);
 -- Accounting simple
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled', __HANDLER__, 'left', 2700__+MAX_llx_menu__, 'accountancy', 'ca', 9__+MAX_llx_menu__, '/compta/resultat/index.php?mainmenu=accountancy&amp;leftmenu=ca', 'Reportings', 0, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 11, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2711__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/resultat/index.php?mainmenu=accountancy&amp;leftmenu=ca', 'MenuReportInOut', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__);
@@ -390,10 +393,10 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4203__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/list.php?mainmenu=members&amp;leftmenu=members&amp;statut=-1', 'MenuMembersToValidate', 2, 'members', '$user->rights->adherent->lire', '', 2, 2, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4204__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/list.php?mainmenu=members&amp;leftmenu=members&amp;statut=1', 'MenuMembersValidated', 2, 'members', '$user->rights->adherent->lire', '', 2, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4205__+MAX_llx_menu__, 'members', '', 4204__+MAX_llx_menu__, '/adherents/list.php?mainmenu=members&amp;leftmenu=members&amp;statut=1&amp;filter=withoutsubscription', 'WithoutSubscription', 2, 'members', '$user->rights->adherent->lire', '', 2, 4, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4205__+MAX_llx_menu__, 'members', '', 4204__+MAX_llx_menu__, '/adherents/list.php?mainmenu=members&amp;leftmenu=members&amp;statut=1&amp;filter=outofdate', 'UpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 4, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4206__+MAX_llx_menu__, 'members', '', 4204__+MAX_llx_menu__, '/adherents/list.php?mainmenu=members&amp;leftmenu=members&amp;statut=1&amp;filter=uptodate', 'OutOfDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 5, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/list.php?mainmenu=members&amp;leftmenu=members&amp;statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4208__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/stats/geo.php?mainmenu=members&amp;leftmenu=members&amp;mode=memberbycountry', 'MenuMembersStats', 1, 'members', '$user->rights->adherent->lire', '', 2, 7, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4206__+MAX_llx_menu__, 'members', '', 4204__+MAX_llx_menu__, '/adherents/list.php?mainmenu=members&amp;leftmenu=members&amp;statut=1&amp;filter=outofdate', 'UpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 4, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4204__+MAX_llx_menu__, '/adherents/list.php?mainmenu=members&amp;leftmenu=members&amp;statut=1&amp;filter=uptodate', 'OutOfDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 5, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4208__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/list.php?mainmenu=members&amp;leftmenu=members&amp;statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 2, 6, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4209__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/stats/geo.php?mainmenu=members&amp;leftmenu=members&amp;mode=memberbycountry', 'MenuMembersStats', 1, 'members', '$user->rights->adherent->lire', '', 2, 7, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '! empty($conf->global->MEMBER_LINK_TO_HTPASSWDFILE) && $conf->adherent->enabled', __HANDLER__, 'left', 4502__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/htpasswd.php?mainmenu=members&amp;leftmenu=export', 'Filehtpasswd', 1, 'members', '$user->rights->adherent->export', '', 2, 9, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4503__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/cartes/carte.php?mainmenu=members&amp;leftmenu=export', 'MembersCards', 1, 'members', '$user->rights->adherent->export', '', 2, 10, __ENTITY__);
 -- Members - Subscriptions
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 8bde6d6fa61..b50ff9594c0 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -59,14 +59,14 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 	global $usemenuhider;
 	$usemenuhider = 1;
 
-    // Show/Hide vertical menu. The hamburger icon for .menuhider action.
-    if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+	// Show/Hide vertical menu. The hamburger icon for .menuhider action.
+	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 	{
-	    $showmode = 1;
-	    $classname = 'class="tmenu menuhider"';
-	    $idsel = 'menu';
+		$showmode = 1;
+		$classname = 'class="tmenu menuhider"';
+		$idsel = 'menu';
 
-	    $menu->add('#', (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE) ? '<span class="fa fa-bars"></span>' : ''), 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
+		$menu->add('#', (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE) ? '<span class="fa fa-bars"></span>' : ''), 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
 	}
 
 	$num = count($newTabMenu);
@@ -74,28 +74,29 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 	{
 		$idsel = (empty($newTabMenu[$i]['mainmenu']) ? 'none' : $newTabMenu[$i]['mainmenu']);
 
+		$shorturl = '';
+
 		$showmode = dol_auguria_showmenu($type_user, $newTabMenu[$i], $listofmodulesforexternal);
-		if ($showmode == 1)
-		{
+		if ($showmode == 1) {
 			$newTabMenu[$i]['url'] = make_substitutions($newTabMenu[$i]['url'], $substitarray);
 
 			$url = $shorturl = $newTabMenu[$i]['url'];
 
 			if (!preg_match("/^(http:\/\/|https:\/\/)/i", $newTabMenu[$i]['url']))
 			{
-			    $tmp = explode('?', $newTabMenu[$i]['url'], 2);
+				$tmp = explode('?', $newTabMenu[$i]['url'], 2);
 				$url = $shorturl = $tmp[0];
 				$param = (isset($tmp[1]) ? $tmp[1] : '');
 
 				// Complete param to force leftmenu to '' to close open menu when we click on a link with no leftmenu defined.
-			    if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && !empty($newTabMenu[$i]['url']))
-			    {
-			        $param .= ($param ? '&' : '').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';
-			    }
-			    if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && empty($newTabMenu[$i]['url']))
-			    {
-			        $param .= ($param ? '&' : '').'leftmenu=';
-			    }
+				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && !empty($newTabMenu[$i]['url']))
+				{
+					$param .= ($param ? '&' : '').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';
+				}
+				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && empty($newTabMenu[$i]['url']))
+				{
+					$param .= ($param ? '&' : '').'leftmenu=';
+				}
 				//$url.="idmenu=".$newTabMenu[$i]['rowid'];    // Already done by menuLoad
 				$url = dol_buildpath($url, 1).($param ? '?'.$param : '');
 				//$shorturl = $shorturl.($param?'?'.$param:'');
@@ -107,16 +108,20 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 			// TODO Find a generic solution
 			if (preg_match('/search_project_user=__search_project_user__/', $shorturl))
 			{
-			    $search_project_user = GETPOST('search_project_user', 'int');
-			    if ($search_project_user) $shorturl = preg_replace('/search_project_user=__search_project_user__/', 'search_project_user='.$search_project_user, $shorturl);
-			    else $shorturl = preg_replace('/search_project_user=__search_project_user__/', '', $shorturl);
+				$search_project_user = GETPOST('search_project_user', 'int');
+				if ($search_project_user) $shorturl = preg_replace('/search_project_user=__search_project_user__/', 'search_project_user='.$search_project_user, $shorturl);
+				else $shorturl = preg_replace('/search_project_user=__search_project_user__/', '', $shorturl);
 			}
 
 			// Define the class (top menu selected or not)
 			if (!empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname = 'class="tmenusel"';
 			elseif (!empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname = 'class="tmenusel"';
 			else $classname = 'class="tmenu"';
-		} elseif ($showmode == 2) $classname = 'class="tmenu"';
+		} elseif ($showmode == 2) {
+			$classname = 'class="tmenu"';
+		} else {
+			$classname = '';
+		}
 
 		$menu->add($shorturl, $newTabMenu[$i]['titre'], 0, $showmode, ($newTabMenu[$i]['target'] ? $newTabMenu[$i]['target'] : $atarget), ($newTabMenu[$i]['mainmenu'] ? $newTabMenu[$i]['mainmenu'] : $newTabMenu[$i]['rowid']), ($newTabMenu[$i]['leftmenu'] ? $newTabMenu[$i]['leftmenu'] : ''), $newTabMenu[$i]['position'], $id, $idsel, $classname);
 	}
@@ -162,8 +167,8 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 	if (empty($noout)) {
 		foreach ($menu->liste as $menuval) {
 			print_start_menu_entry_auguria($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
-	    	print_text_menu_entry_auguria($menuval['titre'], $menuval['enabled'], ($menuval['url'] != '#' ?DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));
-		    print_end_menu_entry_auguria($menuval['enabled']);
+			print_text_menu_entry_auguria($menuval['titre'], $menuval['enabled'], ($menuval['url'] != '#' ?DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));
+			print_end_menu_entry_auguria($menuval['enabled']);
 		}
 	}
 
@@ -185,7 +190,7 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
  */
 function print_start_menu_array_auguria()
 {
-    global $conf;
+	global $conf;
 
 	print '<div class="tmenudiv">';
 	print '<ul role="navigation" class="tmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Top menu"').'>';
@@ -302,22 +307,22 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 
 	if (is_array($moredata) && !empty($moredata['searchform']))	// searchform can contains select2 code or link to show old search form or link to switch on search page
 	{
-        print "\n";
-        print "<!-- Begin SearchForm -->\n";
-        print '<div id="blockvmenusearch" class="blockvmenusearch">'."\n";
-        print $moredata['searchform'];
-        print '</div>'."\n";
-        print "<!-- End SearchForm -->\n";
+		print "\n";
+		print "<!-- Begin SearchForm -->\n";
+		print '<div id="blockvmenusearch" class="blockvmenusearch">'."\n";
+		print $moredata['searchform'];
+		print '</div>'."\n";
+		print "<!-- End SearchForm -->\n";
 	}
 
 	if (is_array($moredata) && !empty($moredata['bookmarks']))
 	{
-	    print "\n";
-	    print "<!-- Begin Bookmarks -->\n";
-	    print '<div id="blockvmenubookmarks" class="blockvmenubookmarks">'."\n";
-	    print $moredata['bookmarks'];
-	    print '</div>'."\n";
-	    print "<!-- End Bookmarks -->\n";
+		print "\n";
+		print "<!-- Begin Bookmarks -->\n";
+		print '<div id="blockvmenubookmarks" class="blockvmenubookmarks">'."\n";
+		print $moredata['bookmarks'];
+		print '</div>'."\n";
+		print "<!-- End Bookmarks -->\n";
 	}
 
 	$substitarray = getCommonSubstitutionArray($langs, 0, null, null);
@@ -329,7 +334,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 	// We update newmenu for special dynamic menus
 	if ($conf->banque->enabled && $user->rights->banque->lire && $mainmenu == 'bank')	// Entry for each bank account
 	{
-	    include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Required for to get Account::TYPE_CASH for example
+		include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Required for to get Account::TYPE_CASH for example
 
 		$sql = "SELECT rowid, label, courant, rappro, courant";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank_account";
@@ -404,9 +409,9 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 
 					if ($nature)
 					{
-                        $langs->load('accountancy');
-                        $journallabel = $langs->transnoentities($objp->label); // Labels in this table are set by loading llx_accounting_abc.sql. Label can be 'ACCOUNTING_SELL_JOURNAL', 'InventoryJournal', ...
-                        $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $journallabel, 2, $user->rights->accounting->comptarapport->lire);
+						$langs->load('accountancy');
+						$journallabel = $langs->transnoentities($objp->label); // Labels in this table are set by loading llx_accounting_abc.sql. Label can be 'ACCOUNTING_SELL_JOURNAL', 'InventoryJournal', ...
+						$newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $journallabel, 2, $user->rights->accounting->comptarapport->lire);
 					}
 					$i++;
 				}
@@ -465,7 +470,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 				$lastopened = true;
 				for ($j = ($i + 1); $j < $num; $j++)
 				{
-				    if (empty($menu_array[$j]['level'])) $lastopened = false;
+					if (empty($menu_array[$j]['level'])) $lastopened = false;
 				}
 				if ($altok % 2 == 0)
 				{
@@ -533,7 +538,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 					print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
 					$lastlevel0 = 'greyed';
 				} else {
-				    $lastlevel0 = 'hidden';
+					$lastlevel0 = 'hidden';
 				}
 				if ($showmenu)
 				{
@@ -551,7 +556,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 				{
 					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring;
 					if ($shorturlwithoutparam) print '<a class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';
-					else print '<span class="vsmenu">';
+					else print '<span class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'">';
 					print $menu_array[$i]['titre'];
 					if ($shorturlwithoutparam) print '</a>';
 					else print '</span>';
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index 5b7aa913350..c80810656db 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -29,31 +29,31 @@
 class MenuManager
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $type_user; // Put 0 for internal users, 1 for external users
-    public $atarget = ""; // To store default target to use onto links
-    public $name = "auguria";
+	public $type_user; // Put 0 for internal users, 1 for external users
+	public $atarget = ""; // To store default target to use onto links
+	public $name = "auguria";
 
-    public $menu_array;
-    public $menu_array_after;
+	public $menu_array;
+	public $menu_array_after;
 
-    public $tabMenu;
+	public $tabMenu;
 
 
-    /**
-     *  Constructor
-     *
+	/**
+	 *  Constructor
+	 *
 	 *  @param	DoliDB		$db     	Database handler
-     *  @param	int			$type_user	Type of user
-     */
-    public function __construct($db, $type_user)
-    {
-    	$this->type_user = $type_user;
-    	$this->db = $db;
-    }
+	 *  @param	int			$type_user	Type of user
+	 */
+	public function __construct($db, $type_user)
+	{
+		$this->type_user = $type_user;
+		$this->db = $db;
+	}
 
 
    	/**
@@ -65,252 +65,252 @@ class MenuManager
    	 */
    	public function loadMenu($forcemainmenu = '', $forceleftmenu = '')
    	{
-    	global $conf, $user, $langs;
+		global $conf, $user, $langs;
 
    		// On sauve en session le menu principal choisi
-    	if (GETPOSTISSET("mainmenu")) $_SESSION["mainmenu"] = GETPOST("mainmenu", 'aZ09');
-    	if (GETPOSTISSET("idmenu"))   $_SESSION["idmenu"] = GETPOST("idmenu", 'int');
+		if (GETPOSTISSET("mainmenu")) $_SESSION["mainmenu"] = GETPOST("mainmenu", 'aZ09');
+		if (GETPOSTISSET("idmenu"))   $_SESSION["idmenu"] = GETPOST("idmenu", 'int');
 
-    	// Read mainmenu and leftmenu that define which menu to show
-    	if (GETPOSTISSET("mainmenu"))
-    	{
-    		// On sauve en session le menu principal choisi
-    		$mainmenu = GETPOST("mainmenu", 'aZ09');
-    		$_SESSION["mainmenu"] = $mainmenu;
-    		$_SESSION["leftmenuopened"] = "";
-    	} else {
-    		// On va le chercher en session si non defini par le lien
-    		$mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';
-    	}
+		// Read mainmenu and leftmenu that define which menu to show
+		if (GETPOSTISSET("mainmenu"))
+		{
+			// On sauve en session le menu principal choisi
+			$mainmenu = GETPOST("mainmenu", 'aZ09');
+			$_SESSION["mainmenu"] = $mainmenu;
+			$_SESSION["leftmenuopened"] = "";
+		} else {
+			// On va le chercher en session si non defini par le lien
+			$mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';
+		}
 		if (!empty($forcemainmenu)) $mainmenu = $forcemainmenu;
 
-    	if (GETPOSTISSET("leftmenu"))
-    	{
-    		// On sauve en session le menu principal choisi
-    		$leftmenu = GETPOST("leftmenu", 'aZ09');
-    		$_SESSION["leftmenu"] = $leftmenu;
+		if (GETPOSTISSET("leftmenu"))
+		{
+			// On sauve en session le menu principal choisi
+			$leftmenu = GETPOST("leftmenu", 'aZ09');
+			$_SESSION["leftmenu"] = $leftmenu;
 
-    		if ($_SESSION["leftmenuopened"] == $leftmenu)	// To collapse
-    		{
-    			//$leftmenu="";
-    			$_SESSION["leftmenuopened"] = "";
-    		} else {
-    			$_SESSION["leftmenuopened"] = $leftmenu;
-    		}
-    	} else {
-    		// On va le chercher en session si non defini par le lien
-    		$leftmenu = isset($_SESSION["leftmenu"]) ? $_SESSION["leftmenu"] : '';
-    	}
-    	if (!empty($forceleftmenu)) $leftmenu = $forceleftmenu;
+			if ($_SESSION["leftmenuopened"] == $leftmenu)	// To collapse
+			{
+				//$leftmenu="";
+				$_SESSION["leftmenuopened"] = "";
+			} else {
+				$_SESSION["leftmenuopened"] = $leftmenu;
+			}
+		} else {
+			// On va le chercher en session si non defini par le lien
+			$leftmenu = isset($_SESSION["leftmenu"]) ? $_SESSION["leftmenu"] : '';
+		}
+		if (!empty($forceleftmenu)) $leftmenu = $forceleftmenu;
 
-    	require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
-    	$tabMenu = array();
-    	$menuArbo = new Menubase($this->db, 'auguria');
-    	$menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'auguria', $tabMenu);
-    	$this->tabMenu = $tabMenu;
-    	//var_dump($tabMenu);
+		require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
+		$tabMenu = array();
+		$menuArbo = new Menubase($this->db, 'auguria');
+		$menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'auguria', $tabMenu);
+		$this->tabMenu = $tabMenu;
+		//var_dump($tabMenu);
 
-    	//if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }
+		//if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }
    	}
 
 
-    /**
-     *  Show menu.
-     *  Menu defined in sql tables were stored into $this->tabMenu BEFORE this is called.
-     *
-     *	@param	string	$mode		    'top', 'topnb', 'left', 'jmobile' (used to get full xml ul/li menu)
-     *  @param	array	$moredata		An array with more data to output
-     *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
+	/**
+	 *  Show menu.
+	 *  Menu defined in sql tables were stored into $this->tabMenu BEFORE this is called.
+	 *
+	 *	@param	string	$mode		    'top', 'topnb', 'left', 'jmobile' (used to get full xml ul/li menu)
+	 *  @param	array	$moredata		An array with more data to output
+	 *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
 	 */
 	public function showmenu($mode, $moredata = null)
 	{
-    	global $conf, $langs, $user;
+		global $conf, $langs, $user;
 
-        require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php';
 
-        if ($this->type_user == 1)
-        {
-        	$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED = 1;
-	        $conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED = 1;
-        }
+		if ($this->type_user == 1)
+		{
+			$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED = 1;
+			$conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED = 1;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
-        $this->menu = new Menu();
+		$this->menu = new Menu();
 
-        if (empty($conf->global->MAIN_MENU_INVERT))
-        {
-        	if ($mode == 'top')  print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
-        	if ($mode == 'left') print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata);
-        } else {
-        	$conf->global->MAIN_SHOW_LOGO = 0;
-        	if ($mode == 'top')  print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0);
-        	if ($mode == 'left') print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
-        }
+		if (empty($conf->global->MAIN_MENU_INVERT))
+		{
+			if ($mode == 'top')  print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
+			if ($mode == 'left') print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata);
+		} else {
+			$conf->global->MAIN_SHOW_LOGO = 0;
+			if ($mode == 'top')  print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0);
+			if ($mode == 'left') print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
+		}
 
 		if ($mode == 'topnb')
 		{
-		    print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode);
-		    return $this->menu->getNbOfVisibleMenuEntries();
+			print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode);
+			return $this->menu->getNbOfVisibleMenuEntries();
 		}
 
-        if ($mode == 'jmobile')     // Used to get menu in xml ul/li
-        {
-        	print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode);
+		if ($mode == 'jmobile')     // Used to get menu in xml ul/li
+		{
+			print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode);
 
-            // $this->menu->liste is top menu
-            //var_dump($this->menu->liste);exit;
-        	$lastlevel = array();
-        	print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
-        	foreach ($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-        	{
-        		print '<ul class="ulmenu" data-inset="true">';
-        		print '<li class="lilevel0">';
-        		if ($val['enabled'] == 1)
-        		{
-        			$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
-        			$substitarray['__USERID__'] = $user->id; // For backward compatibility
-        			$val['url'] = make_substitutions($val['url'], $substitarray);
+			// $this->menu->liste is top menu
+			//var_dump($this->menu->liste);exit;
+			$lastlevel = array();
+			print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
+			foreach ($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+			{
+				print '<ul class="ulmenu" data-inset="true">';
+				print '<li class="lilevel0">';
+				if ($val['enabled'] == 1)
+				{
+					$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
+					$substitarray['__USERID__'] = $user->id; // For backward compatibility
+					$val['url'] = make_substitutions($val['url'], $substitarray);
 
-        			$relurl = dol_buildpath($val['url'], 1);
-        			$canonurl = preg_replace('/\?.*$/', '', $val['url']);
+					$relurl = dol_buildpath($val['url'], 1);
+					$canonurl = preg_replace('/\?.*$/', '', $val['url']);
 
-        			print '<a class="alilevel0" href="#">';
+					print '<a class="alilevel0" href="#">';
 
 					// Add font-awesome
 					if ($val['level'] == 0 && $val['mainmenu'] == 'home') print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
 
 					print $val['titre'];
-        			print '</a>'."\n";
+					print '</a>'."\n";
 
-        			// Search submenu fot this mainmenu entry
-        			$tmpmainmenu = $val['mainmenu'];
-        			$tmpleftmenu = 'all';
-        			$submenu = new Menu();
-        			print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $submenu, 1, $tmpmainmenu, $tmpleftmenu);
-        			$nexturl = dol_buildpath($submenu->liste[0]['url'], 1);
+					// Search submenu fot this mainmenu entry
+					$tmpmainmenu = $val['mainmenu'];
+					$tmpleftmenu = 'all';
+					$submenu = new Menu();
+					print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $submenu, 1, $tmpmainmenu, $tmpleftmenu);
+					$nexturl = dol_buildpath($submenu->liste[0]['url'], 1);
 
-        			$canonrelurl = preg_replace('/\?.*$/', '', $relurl);
-        			$canonnexturl = preg_replace('/\?.*$/', '', $nexturl);
-        			//var_dump($canonrelurl);
-        			//var_dump($canonnexturl);
-        			print '<ul>'."\n";
-        			if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools')))
-        				|| (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false))
+					$canonrelurl = preg_replace('/\?.*$/', '', $relurl);
+					$canonnexturl = preg_replace('/\?.*$/', '', $nexturl);
+					//var_dump($canonrelurl);
+					//var_dump($canonnexturl);
+					print '<ul>'."\n";
+					if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools')))
+						|| (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false))
 					{
 						// We add sub entry
 						print str_pad('', 1).'<li class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
 						print '<a href="'.$relurl.'">';
-					    if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation
-        				{
-        				    if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab'))) print $langs->trans("Access");
-        				    else print $langs->trans("Dashboard");
-        				} else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
+						if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation
+						{
+							if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab'))) print $langs->trans("Access");
+							else print $langs->trans("Dashboard");
+						} else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
 						print '</a>';
 						print '</li>'."\n";
-        			}
+					}
 
-    				if ($val['level'] == 0)
+					if ($val['level'] == 0)
 					{
-					    if ($val['enabled'])
-					    {
-					        $lastlevel[0] = 'enabled';
-					    } elseif ($showmenu)                 // Not enabled but visible (so greyed)
-					    {
-					        $lastlevel[0] = 'greyed';
-					    } else {
-					        $lastlevel[0] = 'hidden';
-					    }
+						if ($val['enabled'])
+						{
+							$lastlevel[0] = 'enabled';
+						} elseif ($showmenu)                 // Not enabled but visible (so greyed)
+						{
+							$lastlevel[0] = 'greyed';
+						} else {
+							$lastlevel[0] = 'hidden';
+						}
 					}
 
 					$lastlevel2 = array();
 					foreach ($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-        			{
+					{
 						$showmenu = true;
 						if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu = false;
 
-        				// If at least one parent is not enabled, we do not show any menu of all children
+						// If at least one parent is not enabled, we do not show any menu of all children
 						if ($val2['level'] > 0)
 						{
-						    $levelcursor = $val2['level'] - 1;
-						    while ($levelcursor >= 0)
-						    {
-                                if ($lastlevel2[$levelcursor] != 'enabled') $showmenu = false;
-                                $levelcursor--;
-						    }
+							$levelcursor = $val2['level'] - 1;
+							while ($levelcursor >= 0)
+							{
+								if ($lastlevel2[$levelcursor] != 'enabled') $showmenu = false;
+								$levelcursor--;
+							}
 						}
 
 						if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)
-       					{
-       						$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
-       						$substitarray['__USERID__'] = $user->id; // For backward compatibility
-       						$val2['url'] = make_substitutions($val2['url'], $substitarray); // Make also substitution of __(XXX)__ and __[XXX]__
+	   					{
+	   						$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
+	   						$substitarray['__USERID__'] = $user->id; // For backward compatibility
+	   						$val2['url'] = make_substitutions($val2['url'], $substitarray); // Make also substitution of __(XXX)__ and __[XXX]__
 
-       						if (!preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url']))
-       						{
-       							$relurl2 = dol_buildpath($val2['url'], 1);
-       						} else {
-       							$relurl2 = $val2['url'];
-       						}
-	        				$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
-	        				//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
-	        				if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php'))) $relurl2 = '';
+	   						if (!preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url']))
+	   						{
+	   							$relurl2 = dol_buildpath($val2['url'], 1);
+	   						} else {
+	   							$relurl2 = $val2['url'];
+	   						}
+							$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
+							//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
+							if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php'))) $relurl2 = '';
 
-	        				$disabled = '';
-	        				if (!$val2['enabled'])
-	        				{
-	        				    $disabled = " vsmenudisabled";
-	        				}
+							$disabled = '';
+							if (!$val2['enabled'])
+							{
+								$disabled = " vsmenudisabled";
+							}
 
-	        				print str_pad('', $val2['level'] + 1);
-	        				print '<li class="lilevel'.($val2['level'] + 1);
-	        				if ($val2['level'] == 0) print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic
-	        				print $disabled.'">'; // ui-btn to highlight on clic
-	        				if ($relurl2)
-	        				{
-	        					if ($val2['enabled'])	// Allowed
-	        					{
-	        						print '<a href="'.$relurl2.'"';
-		        					//print ' data-ajax="false"';
-		        					print '>';
-		        					$lastlevel2[$val2['level']] = 'enabled';
-	        					} else // Not allowed but visible (greyed)
-	        					{
-				        			print '<a href="#" class="vsmenudisabled">';
-				        			$lastlevel2[$val2['level']] = 'greyed';
-	        					}
-	        				} else {
-	        				    if ($val2['enabled'])	// Allowed
-	        				    {
-	        				        $lastlevel2[$val2['level']] = 'enabled';
-	        				    } else {
-	        				        $lastlevel2[$val2['level']] = 'greyed';
-	        				    }
-	        				}
-	        				print $val2['titre'];
-	        				if ($relurl2)
-	        				{
-	        					if ($val2['enabled'])	// Allowed
-	        						print '</a>';
-	        					else print '</a>';
-	        				}
-	        				print '</li>'."\n";
-       					}
-        			}
-        			//var_dump($submenu);
-        			print '</ul>';
-        		}
-        		if ($val['enabled'] == 2)
-        		{
-        			print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
-        		}
-        		print '</li>';
-        		print '</ul>'."\n";
-        	}
-        }
+							print str_pad('', $val2['level'] + 1);
+							print '<li class="lilevel'.($val2['level'] + 1);
+							if ($val2['level'] == 0) print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic
+							print $disabled.'">'; // ui-btn to highlight on clic
+							if ($relurl2)
+							{
+								if ($val2['enabled'])	// Allowed
+								{
+									print '<a href="'.$relurl2.'"';
+									//print ' data-ajax="false"';
+									print '>';
+									$lastlevel2[$val2['level']] = 'enabled';
+								} else // Not allowed but visible (greyed)
+								{
+									print '<a href="#" class="vsmenudisabled">';
+									$lastlevel2[$val2['level']] = 'greyed';
+								}
+							} else {
+								if ($val2['enabled'])	// Allowed
+								{
+									$lastlevel2[$val2['level']] = 'enabled';
+								} else {
+									$lastlevel2[$val2['level']] = 'greyed';
+								}
+							}
+							print $val2['titre'];
+							if ($relurl2)
+							{
+								if ($val2['enabled'])	// Allowed
+									print '</a>';
+								else print '</a>';
+							}
+							print '</li>'."\n";
+	   					}
+					}
+					//var_dump($submenu);
+					print '</ul>';
+				}
+				if ($val['enabled'] == 2)
+				{
+					print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
+				}
+				print '</li>';
+				print '</ul>'."\n";
+			}
+		}
 
-        unset($this->menu);
+		unset($this->menu);
 
-        //print 'xx'.$mode;
-        return 0;
-    }
+		//print 'xx'.$mode;
+		return 0;
+	}
 }
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 7e808102bdd..85b63a6f4e3 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -54,13 +54,14 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	$substitarray = getCommonSubstitutionArray($langs, 0, null, null);
 
-	if (empty($noout)) print_start_menu_array();
+	if (empty($noout)) {
+		print_start_menu_array();
+	}
 
 	$usemenuhider = 1;
 
 	// Show/Hide vertical menu. The hamburger icon for .menuhider action.
-	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-	{
+	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 		$showmode = 1;
 		$classname = 'class="tmenu menuhider"';
 		$idsel = 'menu';
@@ -332,9 +333,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Accounting
 	$tmpentry = array(
-		'enabled'=>(!empty($conf->comptabilite->enabled) || !empty($conf->accounting->enabled) || !empty($conf->asset->enabled)),
-		'perms'=>(!empty($user->rights->compta->resultat->lire) || !empty($user->rights->accounting->mouvements->lire) || !empty($user->rights->asset->read)),
-		'module'=>'comptabilite|accounting|asset'
+		'enabled'=>(!empty($conf->comptabilite->enabled) || !empty($conf->accounting->enabled) || !empty($conf->asset->enabled) || !empty($conf->intracommreport->enabled)),
+		'perms'=>(!empty($user->rights->compta->resultat->lire) || !empty($user->rights->accounting->mouvements->lire) || !empty($user->rights->asset->read) || !empty($user->rights->intracommreport->read)),
+		'module'=>'comptabilite|accounting|asset|intracommreport'
 	);
 	$menu_arr[] = array(
 		'name' => 'Accounting',
@@ -353,16 +354,17 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy") ? 0 : 1),
 
-		'loadLangs' => array("compta", "accountancy", "assets"),
+		'loadLangs' => array("compta", "accountancy", "assets", "intracommreport"),
 		'submenus' => array(),
 	);
 
 	// HRM
 	$tmpentry = array(
-		'enabled'=>(!empty($conf->hrm->enabled) || !empty($conf->holiday->enabled) || !empty($conf->deplacement->enabled) || !empty($conf->expensereport->enabled) || !empty($conf->recruitment->enabled)),
+		'enabled'=>(!empty($conf->hrm->enabled) || (!empty($conf->holiday->enabled)) || !empty($conf->deplacement->enabled) || !empty($conf->expensereport->enabled) || !empty($conf->recruitment->enabled)),
 		'perms'=>(!empty($user->rights->hrm->employee->read) || !empty($user->rights->holiday->write) || !empty($user->rights->deplacement->lire) || !empty($user->rights->expensereport->lire) || !empty($user->rights->recruitment->recruitmentjobposition->read)),
 		'module'=>'hrm|holiday|deplacement|expensereport|recruitment'
 	);
+
 	$menu_arr[] = array(
 		'name' => 'HRM',
 		'link' => '/hrm/index.php?mainmenu=hrm&amp;leftmenu=',
@@ -412,29 +414,23 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	);
 
 	// Add menus
-	foreach ($menu_arr as $key => $smenu)
-	{
+	foreach ($menu_arr as $key => $smenu) {
 		$smenu = (object) $smenu;
 
-		if ($smenu->enabled)
-		{
-			if ($smenu->session)
-			{
+		if ($smenu->enabled) {
+			if ($smenu->session) {
 				$_SESSION['idmenu'] = '';
 			}
 
 			// Load Langue
-			if (!empty($smenu->loadLangs))
-			{
+			if (!empty($smenu->loadLangs)) {
 				$langs->loadLangs($smenu->loadLangs);
 			}
 
 			// Trans title
 			$mtitle = '';
-			if (is_array($smenu->title))
-			{
-				foreach ($smenu->title as $item)
-				{
+			if (is_array($smenu->title)) {
+				foreach ($smenu->title as $item) {
 					$mtitle .= $langs->trans($item);
 				}
 			} else {
@@ -451,8 +447,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	$newTabMenu = $menuArbo->menuTopCharger('', '', $type_user, 'eldy', $tabMenu); // Return tabMenu with only top entries
 
 	$num = count($newTabMenu);
-	for ($i = 0; $i < $num; $i++)
-	{
+	for ($i = 0; $i < $num; $i++) {
 		//var_dump($type_user.' '.$newTabMenu[$i]['url'].' '.$showmode.' '.$newTabMenu[$i]['perms']);
 		$idsel = (empty($newTabMenu[$i]['mainmenu']) ? 'none' : $newTabMenu[$i]['mainmenu']);
 
@@ -460,35 +455,50 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 		// url = url from host, shorturl = relative path into dolibarr sources
 		$url = $shorturl = $newTabMenu[$i]['url'];
-		if (!preg_match("/^(http:\/\/|https:\/\/)/i", $newTabMenu[$i]['url']))	// Do not change url content for external links
-		{
+		if (!preg_match("/^(http:\/\/|https:\/\/)/i", $newTabMenu[$i]['url'])) {	// Do not change url content for external links
 			$tmp = explode('?', $newTabMenu[$i]['url'], 2);
 			$url = $shorturl = $tmp[0];
 			$param = (isset($tmp[1]) ? $tmp[1] : '');
 
-			if (!preg_match('/mainmenu/i', $param) || !preg_match('/leftmenu/i', $param)) $param .= ($param ? '&' : '').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&amp;leftmenu=';
+			if (!preg_match('/mainmenu/i', $param) || !preg_match('/leftmenu/i', $param)) {
+				$param .= ($param ? '&' : '').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&amp;leftmenu=';
+			}
 			//$url.="idmenu=".$newTabMenu[$i]['rowid'];    // Already done by menuLoad
 			$url = dol_buildpath($url, 1).($param ? '?'.$param : '');
 			//$shorturl = $shorturl.($param?'?'.$param:'');
 			$shorturl = $url;
-			if (DOL_URL_ROOT) $shorturl = preg_replace('/^'.preg_quote(DOL_URL_ROOT, '/').'/', '', $shorturl);
+			if (DOL_URL_ROOT) {
+				$shorturl = preg_replace('/^'.preg_quote(DOL_URL_ROOT, '/').'/', '', $shorturl);
+			}
 		}
 
 		$showmode = isVisibleToUserType($type_user, $newTabMenu[$i], $listofmodulesforexternal);
-		if ($showmode == 1)
-		{
+		if ($showmode == 1) {
 			// Define the class (top menu selected or not)
-			if (!empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname = 'class="tmenusel"';
-			elseif (!empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname = 'class="tmenusel"';
-			else $classname = 'class="tmenu"';
+			if (!empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) {
+				$classname = 'class="tmenusel"';
+			} elseif (!empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) {
+				$classname = 'class="tmenusel"';
+			} else {
+				$classname = 'class="tmenu"';
+			}
 		} elseif ($showmode == 2) {
 			$classname = 'class="tmenu"';
 		}
 
-		$menu->add($shorturl, $newTabMenu[$i]['titre'], 0, $showmode, ($newTabMenu[$i]['target'] ? $newTabMenu[$i]['target'] : $atarget),
+		$menu->add(
+			$shorturl,
+			$newTabMenu[$i]['titre'],
+			0,
+			$showmode,
+			($newTabMenu[$i]['target'] ? $newTabMenu[$i]['target'] : $atarget),
 			($newTabMenu[$i]['mainmenu'] ? $newTabMenu[$i]['mainmenu'] : $newTabMenu[$i]['rowid']),
 			($newTabMenu[$i]['leftmenu'] ? $newTabMenu[$i]['leftmenu'] : ''),
-			$newTabMenu[$i]['position'], $id, $idsel, $classname);
+			$newTabMenu[$i]['position'],
+			$id,
+			$idsel,
+			$classname
+		);
 	}
 
 	// Sort on position
@@ -496,8 +506,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Output menu entries
 	// Show logo company
-	if (empty($conf->global->MAIN_MENU_INVERT) && empty($noout) && !empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-	{
+	if (empty($conf->global->MAIN_MENU_INVERT) && empty($noout) && !empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 		//$mysoc->logo_mini=(empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI);
 		$mysoc->logo_squarred_mini = (empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI) ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI);
 
@@ -506,8 +515,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 			$logoContainerAdditionalClass = '';
 		}
 
-		if (!empty($mysoc->logo_squarred_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini))
-		{
+		if (!empty($mysoc->logo_squarred_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini)) {
 			$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
 		}
 		/*elseif (! empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
@@ -570,8 +578,7 @@ function print_start_menu_array()
  */
 function print_start_menu_entry($idsel, $classname, $showmode)
 {
-	if ($showmode)
-	{
+	if ($showmode) {
 		print '<li '.$classname.' id="mainmenutd_'.$idsel.'">';
 		//print '<div class="tmenuleft tmenusep"></div>';
 		print '<div class="tmenucenter">';
@@ -621,8 +628,7 @@ function print_text_menu_entry($text, $showmode, $url, $id, $idsel, $classname,
  */
 function print_end_menu_entry($showmode)
 {
-	if ($showmode)
-	{
+	if ($showmode) {
 		print '</div></li>';
 	}
 	print "\n";
@@ -655,9 +661,10 @@ function print_end_menu_array()
  * @param	string		$forcemainmenu		'x'=Force mainmenu to mainmenu='x'
  * @param	string		$forceleftmenu		'all'=Force leftmenu to '' (= all). If value come being '', we change it to value in session and 'none' if not defined in session.
  * @param	array		$moredata			An array with more data to output
+ * @param 	int			$type_user     		0=Menu for backoffice, 1=Menu for front office
  * @return	int								Nb of menu entries
  */
-function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabMenu, &$menu, $noout = 0, $forcemainmenu = '', $forceleftmenu = '', $moredata = null)
+function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabMenu, &$menu, $noout = 0, $forcemainmenu = '', $forceleftmenu = '', $moredata = null, $type_user = 0)
 {
 	global $user, $conf, $langs, $dolibarr_main_db_name, $mysoc;
 
@@ -670,8 +677,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 	$usemenuhider = 0;
 
-	if (is_array($moredata) && !empty($moredata['searchform']))	// searchform can contains select2 code or link to show old search form or link to switch on search page
-	{
+	if (is_array($moredata) && !empty($moredata['searchform'])) {	// searchform can contains select2 code or link to show old search form or link to switch on search page
 		print "\n";
 		print "<!-- Begin SearchForm -->\n";
 		print '<div id="blockvmenusearch" class="blockvmenusearch">'."\n";
@@ -680,8 +686,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		print "<!-- End SearchForm -->\n";
 	}
 
-	if (is_array($moredata) && !empty($moredata['bookmarks']))
-	{
+	if (is_array($moredata) && !empty($moredata['bookmarks'])) {
 		print "\n";
 		print "<!-- Begin Bookmarks -->\n";
 		print '<div id="blockvmenubookmarks" class="blockvmenubookmarks">'."\n";
@@ -696,13 +701,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 	 * We update newmenu with entries found into database
 	 * --------------------------------------------------
 	 */
-	if ($mainmenu)	// If this is empty, loading hard coded menu and loading personalised menu will fail
-	{
+	if ($mainmenu) {	// If this is empty, loading hard coded menu and loading personalised menu will fail
 		/*
 		 * Menu HOME
 		 */
-		if ($mainmenu == 'home')
-		{
+		if ($mainmenu == 'home') {
 			$langs->load("users");
 
 			// Home - dashboard
@@ -711,23 +714,21 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			// Setup
 			$newmenu->add("/admin/index.php?mainmenu=home&amp;leftmenu=setup", $langs->trans("Setup"), 0, $user->admin, '', $mainmenu, 'setup', 0, '', '', '', '<i class="fa fa-wrench fa-fw paddingright"></i>');
 
-			if ($usemenuhider || empty($leftmenu) || $leftmenu == "setup")
-			{
+			if ($usemenuhider || empty($leftmenu) || $leftmenu == "setup") {
 				// Load translation files required by the page
 				$langs->loadLangs(array("admin", "help"));
 
 				$warnpicto = '';
-				if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY))
-				{
+				if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY)) {
 					$langs->load("errors");
-					$warnpicto = ' '.img_warning($langs->trans("WarningMandatorySetupNotComplete"));
+					$warnpicto = img_warning($langs->trans("WarningMandatorySetupNotComplete"));
 				}
 				$newmenu->add("/admin/company.php?mainmenu=home", $langs->trans("MenuCompanySetup").$warnpicto, 1);
+
 				$warnpicto = '';
-				if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING) ? 1 : $conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING))	// If only user module enabled
-				{
+				if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING) ? 1 : $conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)) {	// If only user module enabled
 					$langs->load("errors");
-					$warnpicto = ' '.img_warning($langs->trans("WarningMandatorySetupNotComplete"));
+					$warnpicto = img_warning($langs->trans("WarningMandatorySetupNotComplete"));
 				}
 				$newmenu->add("/admin/modules.php?mainmenu=home", $langs->trans("Modules").$warnpicto, 1);
 				$newmenu->add("/admin/ihm.php?mainmenu=home", $langs->trans("GUISetup"), 1);
@@ -740,7 +741,18 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/admin/security_other.php?mainmenu=home", $langs->trans("Security"), 1);
 				$newmenu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"), 1);
 				$newmenu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"), 1);
-				$newmenu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails"), 1);
+
+				$warnpicto = '';
+				if ($conf->global->MAIN_MAIL_SENDMODE == 'mail' && empty($conf->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP)) {
+					$langs->load("errors");
+					$warnpicto = img_warning($langs->trans("WarningPHPMailD"));
+				}
+				if (in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmail')) && empty($conf->global->MAIN_MAIL_SMTP_SERVER)) {
+					$langs->load("errors");
+					$warnpicto = img_warning($langs->trans("ErrorSetupOfEmailsNotComplete"));
+				}
+
+				$newmenu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails").$warnpicto, 1);
 				$newmenu->add("/admin/sms.php?mainmenu=home", $langs->trans("SMS"), 1);
 				$newmenu->add("/admin/dict.php?mainmenu=home", $langs->trans("Dictionary"), 1);
 				$newmenu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"), 1);
@@ -748,8 +760,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 			// System tools
 			$newmenu->add("/admin/tools/index.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("AdminTools"), 0, $user->admin, '', $mainmenu, 'admintools', 0, '', '', '', '<i class="fa fa-server fa-fw paddingright"></i>');
-			if ($usemenuhider || empty($leftmenu) || preg_match('/^admintools/', $leftmenu))
-			{
+			if ($usemenuhider || empty($leftmenu) || preg_match('/^admintools/', $leftmenu)) {
 				// Load translation files required by the page
 				$langs->loadLangs(array('admin', 'help'));
 
@@ -763,9 +774,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add('/admin/system/os.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoOS'), 1);
 				$newmenu->add('/admin/system/web.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoWebServer'), 1);
 				$newmenu->add('/admin/system/phpinfo.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoPHP'), 1);
-				//if (function_exists('xdebug_is_enabled')) $newmenu->add('/admin/system/xdebug.php', $langs->trans('XDebug'),1);
 				$newmenu->add('/admin/system/database.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoDatabase'), 1);
-				//$newmenu->add("/admin/system/perf.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("InfoPerf"),1);
+				if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
+					$newmenu->add("/admin/system/perf.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("InfoPerf"), 1);
+					$newmenu->add("/admin/system/security.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("InfoSecurity"), 1);
+				}
 				$newmenu->add("/admin/tools/dolibarr_export.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Backup"), 1);
 				$newmenu->add("/admin/tools/dolibarr_import.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Restore"), 1);
 				$newmenu->add("/admin/tools/update.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("MenuUpgrade"), 1);
@@ -774,24 +787,20 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/admin/tools/listsessions.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Sessions"), 1);
 				$newmenu->add('/admin/system/about.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('ExternalResources'), 1);
 
-				if (!empty($conf->product->enabled) || !empty($conf->service->enabled))
-				{
+				if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
 					$langs->load("products");
 					$newmenu->add("/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("ProductVatMassChange"), 1, $user->admin);
 				}
 			}
 
 			$newmenu->add("/user/home.php?leftmenu=users", $langs->trans("MenuUsersAndGroups"), 0, $user->rights->user->user->lire, '', $mainmenu, 'users', 0, '', '', '', '<i class="fa fa-users fa-fw paddingright"></i>');
-			if ($user->rights->user->user->lire)
-			{
-				if ($usemenuhider || empty($leftmenu) || $leftmenu == "users")
-				{
+			if ($user->rights->user->user->lire) {
+				if ($usemenuhider || empty($leftmenu) || $leftmenu == "users") {
 					$newmenu->add("", $langs->trans("Users"), 1, $user->rights->user->user->lire || $user->admin);
 					$newmenu->add("/user/card.php?leftmenu=users&action=create", $langs->trans("NewUser"), 2, ($user->rights->user->user->creer || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE), '', 'home');
 					$newmenu->add("/user/list.php?leftmenu=users", $langs->trans("ListOfUsers"), 2, $user->rights->user->user->lire || $user->admin);
 					$newmenu->add("/user/hierarchy.php?leftmenu=users", $langs->trans("HierarchicView"), 2, $user->rights->user->user->lire || $user->admin);
-					if (!empty($conf->categorie->enabled))
-					{
+					if (!empty($conf->categorie->enabled)) {
 						$langs->load("categories");
 						$newmenu->add("/categories/index.php?leftmenu=users&type=7", $langs->trans("UsersCategoriesShort"), 2, $user->rights->categorie->lire, '', $mainmenu, 'cat');
 					}
@@ -806,26 +815,24 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		/*
 		 * Menu THIRDPARTIES
 		 */
-		if ($mainmenu == 'companies')
-		{
+		if ($mainmenu == 'companies') {
 			// Societes
-			if (!empty($conf->societe->enabled))
-			{
+			if (!empty($conf->societe->enabled)) {
 				$langs->load("companies");
 				$newmenu->add("/societe/index.php?leftmenu=thirdparties", $langs->trans("ThirdParty"), 0, $user->rights->societe->lire, '', $mainmenu, 'thirdparties');
 
-				if ($user->rights->societe->creer)
-				{
+				if ($user->rights->societe->creer) {
 					$newmenu->add("/societe/card.php?action=create", $langs->trans("MenuNewThirdParty"), 1);
-					if (!$conf->use_javascript_ajax) $newmenu->add("/societe/card.php?action=create&amp;private=1", $langs->trans("MenuNewPrivateIndividual"), 1);
+					if (!$conf->use_javascript_ajax) {
+						$newmenu->add("/societe/card.php?action=create&amp;private=1", $langs->trans("MenuNewPrivateIndividual"), 1);
+					}
 				}
 			}
 
 			$newmenu->add("/societe/list.php?leftmenu=thirdparties", $langs->trans("List"), 1);
 
 			// Prospects
-			if (!empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
-			{
+			if (!empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
 				$langs->load("commercial");
 				$newmenu->add("/societe/list.php?type=p&amp;leftmenu=prospects", $langs->trans("ListProspectsShort"), 2, $user->rights->societe->lire, '', $mainmenu, 'prospects');
 				/* no more required, there is a filter that can do more
@@ -839,8 +846,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Customers/Prospects
-			if (!empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
-			{
+			if (!empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
 				$langs->load("commercial");
 				$newmenu->add("/societe/list.php?type=c&amp;leftmenu=customers", $langs->trans("ListCustomersShort"), 2, $user->rights->societe->lire, '', $mainmenu, 'customers');
 
@@ -848,28 +854,28 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Suppliers
-			if (!empty($conf->societe->enabled) && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) || !empty($conf->supplier_proposal->enabled)))
-			{
+			if (!empty($conf->societe->enabled) && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) || !empty($conf->supplier_proposal->enabled))) {
 				$langs->load("suppliers");
-				$newmenu->add("/societe/list.php?type=f&amp;leftmenu=suppliers", $langs->trans("ListSuppliersShort"), 2, ($user->rights->fournisseur->lire || $user->rights->supplier_proposal->lire), '', $mainmenu, 'suppliers');
-				$newmenu->add("/societe/card.php?leftmenu=suppliers&amp;action=create&amp;type=f", $langs->trans("MenuNewSupplier"), 3, $user->rights->societe->creer && ($user->rights->fournisseur->lire || $user->rights->supplier_proposal->lire));
+				$newmenu->add("/societe/list.php?type=f&amp;leftmenu=suppliers", $langs->trans("ListSuppliersShort"), 2, ($user->rights->fournisseur->lire), '', $mainmenu, 'suppliers');
+				$newmenu->add("/societe/card.php?leftmenu=suppliers&amp;action=create&amp;type=f", $langs->trans("MenuNewSupplier"), 3, $user->rights->societe->creer && ($user->rights->fournisseur->lire));
 			}
 
 			// Categories
-			if (!empty($conf->categorie->enabled))
-			{
+			if (!empty($conf->categorie->enabled)) {
 				$langs->load("categories");
-				if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
-				{
+				if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
 					// Categories prospects/customers
 					$menutoshow = $langs->trans("CustomersProspectsCategoriesShort");
-					if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $menutoshow = $langs->trans("CustomersCategoriesShort");
-					if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $menutoshow = $langs->trans("ProspectsCategoriesShort");
+					if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+						$menutoshow = $langs->trans("CustomersCategoriesShort");
+					}
+					if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+						$menutoshow = $langs->trans("ProspectsCategoriesShort");
+					}
 					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=2", $menutoshow, 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
 				}
 				// Categories suppliers
-				if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
-				{
+				if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
 					$newmenu->add("/categories/index.php?leftmenu=catfournish&amp;type=1", $langs->trans("SuppliersCategoriesShort"), 1, $user->rights->categorie->lire);
 				}
 			}
@@ -878,15 +884,20 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			$newmenu->add("/societe/index.php?leftmenu=thirdparties", (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses")), 0, $user->rights->societe->contact->lire, '', $mainmenu, 'contacts');
 			$newmenu->add("/contact/card.php?leftmenu=contacts&amp;action=create", (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("NewContact") : $langs->trans("NewContactAddress")), 1, $user->rights->societe->contact->creer);
 			$newmenu->add("/contact/list.php?leftmenu=contacts", $langs->trans("List"), 1, $user->rights->societe->contact->lire);
-			if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $newmenu->add("/contact/list.php?leftmenu=contacts&type=p", $langs->trans("Prospects"), 2, $user->rights->societe->contact->lire);
-			if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $newmenu->add("/contact/list.php?leftmenu=contacts&type=c", $langs->trans("Customers"), 2, $user->rights->societe->contact->lire);
-			if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) $newmenu->add("/contact/list.php?leftmenu=contacts&type=f", $langs->trans("Suppliers"), 2, $user->rights->societe->contact->lire);
+			if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+				$newmenu->add("/contact/list.php?leftmenu=contacts&type=p", $langs->trans("Prospects"), 2, $user->rights->societe->contact->lire);
+			}
+			if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+				$newmenu->add("/contact/list.php?leftmenu=contacts&type=c", $langs->trans("Customers"), 2, $user->rights->societe->contact->lire);
+			}
+			if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
+				$newmenu->add("/contact/list.php?leftmenu=contacts&type=f", $langs->trans("Suppliers"), 2, $user->rights->societe->contact->lire);
+			}
 			$newmenu->add("/contact/list.php?leftmenu=contacts&type=o", $langs->trans("ContactOthers"), 2, $user->rights->societe->contact->lire);
 			//$newmenu->add("/contact/list.php?userid=$user->id", $langs->trans("MyContacts"), 1, $user->rights->societe->contact->lire);
 
 			// Categories
-			if (!empty($conf->categorie->enabled))
-			{
+			if (!empty($conf->categorie->enabled)) {
 				$langs->load("categories");
 				// Categories Contact
 				$newmenu->add("/categories/index.php?leftmenu=catcontact&amp;type=4", $langs->trans("ContactCategoriesShort"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
@@ -896,13 +907,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		/*
 		 * Menu COMMERCIAL (propal, commande, supplier_proposal, supplier_order, contrat, ficheinter)
 		 */
-		if ($mainmenu == 'commercial')
-		{
+		if ($mainmenu == 'commercial') {
 			$langs->load("companies");
 
 			// Customer proposal
-			if (!empty($conf->propal->enabled))
-			{
+			if (!empty($conf->propal->enabled)) {
 				$langs->load("propal");
 				$newmenu->add("/comm/propal/index.php?leftmenu=propals", $langs->trans("Proposals"), 0, $user->rights->propale->lire, '', $mainmenu, 'propals', 100);
 				$newmenu->add("/comm/propal/card.php?action=create&amp;leftmenu=propals", $langs->trans("NewPropal"), 1, $user->rights->propale->creer);
@@ -919,8 +928,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Customers orders
-			if (!empty($conf->commande->enabled))
-			{
+			if (!empty($conf->commande->enabled)) {
 				$langs->load("orders");
 				$newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders', 200);
 				$newmenu->add("/commande/card.php?action=create&amp;leftmenu=orders", $langs->trans("NewOrder"), 1, $user->rights->commande->creer);
@@ -928,7 +936,9 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders") {
 					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire);
 					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire);
-					if (!empty($conf->expedition->enabled)) $newmenu->add("/commande/list.php?leftmenu=orders&search_status=2", $langs->trans("StatusOrderSentShort"), 2, $user->rights->commande->lire);
+					if (!empty($conf->expedition->enabled)) {
+						$newmenu->add("/commande/list.php?leftmenu=orders&search_status=2", $langs->trans("StatusOrderSentShort"), 2, $user->rights->commande->lire);
+					}
 					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=3", $langs->trans("StatusOrderDelivered"), 2, $user->rights->commande->lire);
 					//$newmenu->add("/commande/list.php?leftmenu=orders&search_status=4", $langs->trans("StatusOrderProcessed"), 2, $user->rights->commande->lire);
 					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->rights->commande->lire);
@@ -937,8 +947,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Supplier proposal
-			if (!empty($conf->supplier_proposal->enabled))
-			{
+			if (!empty($conf->supplier_proposal->enabled)) {
 				$langs->load("supplier_proposal");
 				$newmenu->add("/supplier_proposal/index.php?leftmenu=propals_supplier", $langs->trans("SupplierProposalsShort"), 0, $user->rights->supplier_proposal->lire, '', $mainmenu, 'propals_supplier', 300);
 				$newmenu->add("/supplier_proposal/card.php?action=create&amp;leftmenu=supplier_proposals", $langs->trans("SupplierProposalNew"), 1, $user->rights->supplier_proposal->creer);
@@ -947,8 +956,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Suppliers orders
-			if (!empty($conf->supplier_order->enabled))
-			{
+			if (!empty($conf->supplier_order->enabled)) {
 				$langs->load("orders");
 				$newmenu->add("/fourn/commande/index.php?leftmenu=orders_suppliers", $langs->trans("SuppliersOrders"), 0, $user->rights->fournisseur->commande->lire, '', $mainmenu, 'orders_suppliers', 400);
 				$newmenu->add("/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers", $langs->trans("NewOrder"), 1, $user->rights->fournisseur->commande->creer);
@@ -956,7 +964,9 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders_suppliers") {
 					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=0", $langs->trans("StatusSupplierOrderDraftShort"), 2, $user->rights->fournisseur->commande->lire);
-					if (empty($conf->global->SUPPLIER_ORDER_HIDE_VALIDATED)) $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=1", $langs->trans("StatusSupplierOrderValidated"), 2, $user->rights->fournisseur->commande->lire);
+					if (empty($conf->global->SUPPLIER_ORDER_HIDE_VALIDATED)) {
+						$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=1", $langs->trans("StatusSupplierOrderValidated"), 2, $user->rights->fournisseur->commande->lire);
+					}
 					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=2", $langs->trans("StatusSupplierOrderApprovedShort"), 2, $user->rights->fournisseur->commande->lire);
 					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=3", $langs->trans("StatusSupplierOrderOnProcessShort"), 2, $user->rights->fournisseur->commande->lire);
 					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=4", $langs->trans("StatusSupplierOrderReceivedPartiallyShort"), 2, $user->rights->fournisseur->commande->lire);
@@ -971,8 +981,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Contrat
-			if (!empty($conf->contrat->enabled))
-			{
+			if (!empty($conf->contrat->enabled)) {
 				$langs->load("contracts");
 				$newmenu->add("/contrat/index.php?leftmenu=contracts", $langs->trans("ContractsSubscriptions"), 0, $user->rights->contrat->lire, '', $mainmenu, 'contracts', 2000);
 				$newmenu->add("/contrat/card.php?action=create&amp;leftmenu=contracts", $langs->trans("NewContractSubscription"), 1, $user->rights->contrat->creer);
@@ -987,13 +996,14 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Interventions
-			if (!empty($conf->ficheinter->enabled))
-			{
+			if (!empty($conf->ficheinter->enabled)) {
 				$langs->load("interventions");
 				$newmenu->add("/fichinter/index.php?leftmenu=ficheinter", $langs->trans("Interventions"), 0, $user->rights->ficheinter->lire, '', $mainmenu, 'ficheinter', 2200);
 				$newmenu->add("/fichinter/card.php?action=create&amp;leftmenu=ficheinter", $langs->trans("NewIntervention"), 1, $user->rights->ficheinter->creer, '', '', '', 201);
 				$newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("List"), 1, $user->rights->ficheinter->lire, '', '', '', 202);
-				if ($conf->global->MAIN_FEATURES_LEVEL >= 2) $newmenu->add("/fichinter/card-rec.php?leftmenu=ficheinter", $langs->trans("ListOfTemplates"), 1, $user->rights->ficheinter->lire, '', '', '', 203);
+				if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+					$newmenu->add("/fichinter/card-rec.php?leftmenu=ficheinter", $langs->trans("ListOfTemplates"), 1, $user->rights->ficheinter->lire, '', '', '', 203);
+				}
 				$newmenu->add("/fichinter/stats/index.php?leftmenu=ficheinter", $langs->trans("Statistics"), 1, $user->rights->ficheinter->lire);
 			}
 		}
@@ -1002,20 +1012,17 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		/*
 		 * Menu COMPTA-FINANCIAL
 		 */
-		if ($mainmenu == 'billing')
-		{
+		if ($mainmenu == 'billing') {
 			$langs->load("companies");
 
 			// Customers invoices
-			if (!empty($conf->facture->enabled))
-			{
+			if (!empty($conf->facture->enabled)) {
 				$langs->load("bills");
 				$newmenu->add("/compta/facture/index.php?leftmenu=customers_bills", $langs->trans("BillsCustomers"), 0, $user->rights->facture->lire, '', $mainmenu, 'customers_bills');
 				$newmenu->add("/compta/facture/card.php?action=create", $langs->trans("NewBill"), 1, $user->rights->facture->creer);
 				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills", $langs->trans("List"), 1, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_list');
 
-				if ($usemenuhider || empty($leftmenu) || preg_match('/customers_bills(|_draft|_notpaid|_paid|_canceled)$/', $leftmenu))
-				{
+				if ($usemenuhider || empty($leftmenu) || preg_match('/customers_bills(|_draft|_notpaid|_paid|_canceled)$/', $leftmenu)) {
 					$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_draft&amp;search_status=0", $langs->trans("BillShortStatusDraft"), 2, $user->rights->facture->lire);
 					$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_notpaid&amp;search_status=1", $langs->trans("BillShortStatusNotPaid"), 2, $user->rights->facture->lire);
 					$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_paid&amp;search_status=2", $langs->trans("BillShortStatusPaid"), 2, $user->rights->facture->lire);
@@ -1025,8 +1032,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 				$newmenu->add("/compta/paiement/list.php?leftmenu=customers_bills_payment", $langs->trans("Payments"), 1, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_payment');
 
-				if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
-				{
+				if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) {
 					$newmenu->add("/compta/paiement/tovalidate.php?leftmenu=customers_bills_tovalid", $langs->trans("MenuToValid"), 2, $user->rights->facture->lire, '', $mainmenu, 'customer_bills_tovalid');
 				}
 				$newmenu->add("/compta/paiement/rapport.php?leftmenu=customers_bills_reports", $langs->trans("Reportings"), 2, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_reports');
@@ -1035,8 +1041,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Suppliers invoices
-			if (!empty($conf->societe->enabled) && !empty($conf->supplier_invoice->enabled))
-			{
+			if (!empty($conf->societe->enabled) && !empty($conf->supplier_invoice->enabled)) {
 				$langs->load("bills");
 				$newmenu->add("/fourn/facture/index.php?leftmenu=suppliers_bills", $langs->trans("BillsSuppliers"), 0, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills');
 				$newmenu->add("/fourn/facture/card.php?leftmenu=suppliers_bills&amp;action=create", $langs->trans("NewBill"), 1, $user->rights->fournisseur->facture->creer, '', $mainmenu, 'suppliers_bills_create');
@@ -1048,7 +1053,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_paid&amp;search_status=2", $langs->trans("BillShortStatusPaid"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_paid');
 				}
 
-				$newmenu->add("/fourn/facture/paiement.php?leftmenu=suppliers_bills_payment", $langs->trans("Payments"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_payment');
+				$newmenu->add("/fourn/paiement/list.php?leftmenu=suppliers_bills_payment", $langs->trans("Payments"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_payment');
 
 				$newmenu->add("/fourn/facture/rapport.php?leftmenu=suppliers_bills_report", $langs->trans("Reportings"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_report');
 
@@ -1056,18 +1061,17 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Orders
-			if (!empty($conf->commande->enabled))
-			{
+			if (!empty($conf->commande->enabled)) {
 				$langs->load("orders");
-				if (!empty($conf->facture->enabled)) $newmenu->add("/commande/list.php?leftmenu=orders&amp;search_status=-3&amp;billed=0&amp;contextpage=billableorders", $langs->trans("MenuOrdersToBill2"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');
+				if (!empty($conf->facture->enabled)) {
+					$newmenu->add("/commande/list.php?leftmenu=orders&amp;search_status=-3&amp;billed=0&amp;contextpage=billableorders", $langs->trans("MenuOrdersToBill2"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');
+				}
 				//if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire);
 			}
 
 			// Supplier Orders to bill
-			if (!empty($conf->supplier_invoice->enabled))
-			{
-				if (!empty($conf->global->SUPPLIER_MENU_ORDER_RECEIVED_INTO_INVOICE))
-				{
+			if (!empty($conf->supplier_invoice->enabled)) {
+				if (!empty($conf->global->SUPPLIER_MENU_ORDER_RECEIVED_INTO_INVOICE)) {
 					$langs->load("supplier");
 					$newmenu->add("/fourn/commande/list.php?leftmenu=orders&amp;search_status=5&amp;billed=0", $langs->trans("MenuOrdersSupplierToBill"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');
 					//if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire);
@@ -1076,8 +1080,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 
 			// Donations
-			if (!empty($conf->don->enabled))
-			{
+			if (!empty($conf->don->enabled)) {
 				$langs->load("donations");
 				$newmenu->add("/don/index.php?leftmenu=donations&amp;mainmenu=billing", $langs->trans("Donations"), 0, $user->rights->don->lire, '', $mainmenu, 'donations');
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "donations") {
@@ -1088,19 +1091,17 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Taxes and social contributions
-			if (!empty($conf->tax->enabled))
-			{
+			if (!empty($conf->tax->enabled)) {
 				$newmenu->add("/compta/charges/index.php?leftmenu=tax&amp;mainmenu=billing", $langs->trans("MenuTaxesAndSpecialExpenses"), 0, $user->rights->tax->charges->lire, '', $mainmenu, 'tax');
 
 				$newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", $langs->trans("MenuSocialContributions"), 1, $user->rights->tax->charges->lire);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_social/i', $leftmenu)) {
 					$newmenu->add("/compta/sociales/card.php?leftmenu=tax_social&action=create", $langs->trans("MenuNewSocialContribution"), 2, $user->rights->tax->charges->creer);
 					$newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
-					$newmenu->add("/compta/sociales/payments.php?leftmenu=tax_social&amp;mainmenu=billing&amp;mode=sconly", $langs->trans("Payments"), 2, $user->rights->tax->charges->lire);
+					$newmenu->add("/compta/sociales/payments.php?leftmenu=tax_social&amp;mainmenu=billing", $langs->trans("Payments"), 2, $user->rights->tax->charges->lire);
 				}
 				// VAT
-				if (empty($conf->global->TAX_DISABLE_VAT_MENUS))
-				{
+				if (empty($conf->global->TAX_DISABLE_VAT_MENUS)) {
 					global $mysoc;
 
 					$newmenu->add("/compta/tva/list.php?leftmenu=tax_vat&amp;mainmenu=billing", $langs->transcountry("VAT", $mysoc->country_code), 1, $user->rights->tax->charges->lire, '', $mainmenu, 'tax_vat');
@@ -1113,8 +1114,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					}
 
 					//Local Taxes 1
-					if ($mysoc->useLocalTax(1) && (isset($mysoc->localtax1_assuj) && $mysoc->localtax1_assuj == "1"))
-					{
+					if ($mysoc->useLocalTax(1) && (isset($mysoc->localtax1_assuj) && $mysoc->localtax1_assuj == "1")) {
 						$newmenu->add("/compta/localtax/list.php?leftmenu=tax_1_vat&amp;mainmenu=billing&amp;localTaxType=1", $langs->transcountry("LT1", $mysoc->country_code), 1, $user->rights->tax->charges->lire);
 						if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_1_vat/i', $leftmenu)) {
 							$newmenu->add("/compta/localtax/card.php?leftmenu=tax_1_vat&action=create&amp;localTaxType=1", $langs->trans("New"), 2, $user->rights->tax->charges->creer);
@@ -1125,8 +1125,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 						}
 					}
 					//Local Taxes 2
-					if ($mysoc->useLocalTax(2) && (isset($mysoc->localtax2_assuj) && $mysoc->localtax2_assuj == "1"))
-					{
+					if ($mysoc->useLocalTax(2) && (isset($mysoc->localtax2_assuj) && $mysoc->localtax2_assuj == "1")) {
 						$newmenu->add("/compta/localtax/list.php?leftmenu=tax_2_vat&amp;mainmenu=billing&amp;localTaxType=2", $langs->transcountry("LT2", $mysoc->country_code), 1, $user->rights->tax->charges->lire);
 						if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_2_vat/i', $leftmenu)) {
 							$newmenu->add("/compta/localtax/card.php?leftmenu=tax_2_vat&action=create&amp;localTaxType=2", $langs->trans("New"), 2, $user->rights->tax->charges->creer);
@@ -1140,8 +1139,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Salaries
-			if (!empty($conf->salaries->enabled))
-			{
+			if (!empty($conf->salaries->enabled)) {
 				$langs->load("salaries");
 				$newmenu->add("/salaries/list.php?leftmenu=tax_salary&amp;mainmenu=billing", $langs->trans("Salaries"), 0, $user->rights->salaries->read, '', $mainmenu, 'tax_salary');
 				if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_salary/i', $leftmenu)) {
@@ -1152,8 +1150,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Loan
-			if (!empty($conf->loan->enabled))
-			{
+			if (!empty($conf->loan->enabled)) {
 				$langs->load("loan");
 				$newmenu->add("/loan/list.php?leftmenu=tax_loan&amp;mainmenu=billing", $langs->trans("Loans"), 0, $user->rights->loan->read, '', $mainmenu, 'tax_loan');
 				if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_loan/i', $leftmenu)) {
@@ -1163,8 +1160,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Various payment
-			if (!empty($conf->banque->enabled) && empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT))
-			{
+			if (!empty($conf->banque->enabled) && empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT)) {
 				$langs->load("banks");
 				$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various&amp;mainmenu=billing", $langs->trans("MenuVariousPayment"), 0, $user->rights->banque->lire, '', $mainmenu, 'tax_various');
 				if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_various/i', $leftmenu)) {
@@ -1177,13 +1173,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		/*
 		 * Menu COMPTA-FINANCIAL
 		 */
-		if ($mainmenu == 'accountancy')
-		{
+		if ($mainmenu == 'accountancy') {
 			$langs->load("companies");
 
 			// Accounting (Double entries)
-			if (!empty($conf->accounting->enabled))
-			{
+			if (!empty($conf->accounting->enabled)) {
 				$permtoshowmenu = (!empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire);
 				//$newmenu->add("/accountancy/index.php?leftmenu=accountancy", $langs->trans("MenuAccountancy"), 0, $permtoshowmenu, '', $mainmenu, 'accountancy');
 
@@ -1200,6 +1194,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					$newmenu->add("/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingJournals"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_journal', 30);
 					$newmenu->add("/accountancy/admin/accountmodel.php?id=31&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Pcg_version"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chartmodel', 40);
 					$newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 41);
+					$newmenu->add("/accountancy/admin/subaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ChartOfSubaccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 41);
 					$newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 50);
 					$newmenu->add("/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDefaultAccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 60);
 					if (!empty($conf->banque->enabled)) {
@@ -1226,24 +1221,21 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 				// Binding
 				// $newmenu->add("", $langs->trans("Binding"), 0, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch');
-				if (!empty($conf->facture->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES))
-				{
+				if (!empty($conf->facture->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)) {
 					$newmenu->add("/accountancy/customer/index.php?leftmenu=accountancy_dispatch_customer&amp;mainmenu=accountancy", $langs->trans("CustomersVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_customer');
 					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_customer/', $leftmenu)) {
 						$newmenu->add("/accountancy/customer/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);
 						$newmenu->add("/accountancy/customer/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);
 					}
 				}
-				if (!empty($conf->supplier_invoice->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES))
-				{
+				if (!empty($conf->supplier_invoice->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES)) {
 					$newmenu->add("/accountancy/supplier/index.php?leftmenu=accountancy_dispatch_supplier&amp;mainmenu=accountancy", $langs->trans("SuppliersVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_supplier');
 					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_supplier/', $leftmenu)) {
 						$newmenu->add("/accountancy/supplier/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);
 						$newmenu->add("/accountancy/supplier/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);
 					}
 				}
-				if (!empty($conf->expensereport->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS))
-				{
+				if (!empty($conf->expensereport->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS)) {
 					$newmenu->add("/accountancy/expensereport/index.php?leftmenu=accountancy_dispatch_expensereport&amp;mainmenu=accountancy", $langs->trans("ExpenseReportsVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_expensereport');
 					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_expensereport/', $leftmenu)) {
 						$newmenu->add("/accountancy/expensereport/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);
@@ -1252,51 +1244,60 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				}
 
 				// Journals
-				if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy')
-				{
-					$newmenu->add('', $langs->trans("RegistrationInAccounting"), 1, $user->rights->accounting->comptarapport->lire);
+				if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
+					$newmenu->add('', $langs->trans("RegistrationInAccounting"), 1, $user->rights->accounting->comptarapport->lire, '', '', '');
 
 					// Multi journal
 					$sql = "SELECT rowid, code, label, nature";
 					$sql .= " FROM ".MAIN_DB_PREFIX."accounting_journal";
 					$sql .= " WHERE entity = ".$conf->entity;
 					$sql .= " AND active = 1";
-					$sql .= " ORDER BY label DESC";
+					$sql .= " ORDER BY nature ASC, label DESC";
 
 					$resql = $db->query($sql);
-					if ($resql)
-					{
+					if ($resql) {
 						$numr = $db->num_rows($resql);
 						$i = 0;
 
-						if ($numr > 0)
-						{
-							while ($i < $numr)
-							{
+						if ($numr > 0) {
+							while ($i < $numr) {
 								$objp = $db->fetch_object($resql);
 
 								$nature = '';
 
 								// Must match array $sourceList defined into journals_list.php
-								if ($objp->nature == 2 && !empty($conf->facture->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)) $nature = "sells";
+								if ($objp->nature == 2 && !empty($conf->facture->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)) {
+									$nature = "sells";
+								}
 								if ($objp->nature == 3
 									&& (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled))
-									&& empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES))
+									&& empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES)) {
 									$nature = "purchases";
-								if ($objp->nature == 4 && !empty($conf->banque->enabled)) $nature = "bank";
-								if ($objp->nature == 5 && !empty($conf->expensereport->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS)) $nature = "expensereports";
-								if ($objp->nature == 1) $nature = "various";
-								if ($objp->nature == 8) $nature = "inventory";
-								if ($objp->nature == 9) $nature = "hasnew";
-
-								// To enable when page exists
-								if (empty($conf->global->ACCOUNTANCY_SHOW_DEVELOP_JOURNAL))
-								{
-									if ($nature == 'various' || $nature == 'hasnew' || $nature == 'inventory') $nature = '';
+								}
+								if ($objp->nature == 4 && !empty($conf->banque->enabled)) {
+									$nature = "bank";
+								}
+								if ($objp->nature == 5 && !empty($conf->expensereport->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS)) {
+									$nature = "expensereports";
+								}
+								if ($objp->nature == 1) {
+									$nature = "various";
+								}
+								if ($objp->nature == 8) {
+									$nature = "inventory";
+								}
+								if ($objp->nature == 9) {
+									$nature = "hasnew";
 								}
 
-								if ($nature)
-								{
+								// To enable when page exists
+								if (empty($conf->global->ACCOUNTANCY_SHOW_DEVELOP_JOURNAL)) {
+									if ($nature == 'various' || $nature == 'hasnew' || $nature == 'inventory') {
+										$nature = '';
+									}
+								}
+
+								if ($nature) {
 									$langs->load('accountancy');
 									$journallabel = $langs->transnoentities($objp->label); // Labels in this table are set by loading llx_accounting_abc.sql. Label can be 'ACCOUNTING_SELL_JOURNAL', 'InventoryJournal', ...
 									$newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $journallabel, 2, $user->rights->accounting->comptarapport->lire);
@@ -1307,20 +1308,29 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 							// Should not happend. Entries are added
 							$newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->rights->accounting->comptarapport->lire);
 						}
-					} else dol_print_error($db);
+					} else {
+						dol_print_error($db);
+					}
 					$db->free($resql);
 				}
 
 				// Accounting
 				$newmenu->add("/accountancy/index.php?leftmenu=accountancy_accountancy", $langs->trans("MenuAccountancy"), 0, $user->rights->accounting->mouvements->lire, '', $mainmenu, 'accountancy', 1);
 
-
-				// General Ledger
-				$newmenu->add("/accountancy/bookkeeping/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Bookkeeping"), 1, $user->rights->accounting->mouvements->lire);
-
 				// Balance
 				$newmenu->add("/accountancy/bookkeeping/balance.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("AccountBalance"), 1, $user->rights->accounting->mouvements->lire);
 
+				// General Ledger
+				$newmenu->add("/accountancy/bookkeeping/listbyaccount.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Bookkeeping"), 1, $user->rights->accounting->mouvements->lire);
+
+				// Journals
+				$newmenu->add("/accountancy/bookkeeping/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Journals"), 1, $user->rights->accounting->mouvements->lire);
+
+				// Files
+				if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU)) {
+					$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 1, $user->rights->accounting->mouvements->lire);
+				}
+
 				// Closure
 				if (!empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2) {
 					$newmenu->add("/accountancy/closure/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_closure", $langs->trans("MenuAccountancyClosure"), 1, $user->rights->accounting->fiscalyear->write, '', $mainmenu, 'closure');
@@ -1330,12 +1340,6 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					}
 				}
 
-				// Files
-				if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU))
-				{
-					$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 1, $user->rights->accounting->mouvements->lire);
-				}
-
 				// Reports
 				$newmenu->add("/accountancy/index.php?leftmenu=accountancy_report", $langs->trans("Reportings"), 1, $user->rights->accounting->comptarapport->lire, '', $mainmenu, 'ca');
 
@@ -1346,9 +1350,10 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				}
 
 				$modecompta = 'CREANCES-DETTES';
-				if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') $modecompta = 'BOOKKEEPING'; // Not yet implemented. Should be BOOKKEEPINGCOLLECTED
-				if ($modecompta)
-				{
+				if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
+					$modecompta = 'BOOKKEEPING'; // Not yet implemented. Should be BOOKKEEPINGCOLLECTED
+				}
+				if ($modecompta) {
 					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
 						$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnover"), 2, $user->rights->accounting->comptarapport->lire);
 						$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
@@ -1360,8 +1365,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 				$modecompta = 'RECETTES-DEPENSES';
 				//if (! empty($conf->accounting->enabled) && ! empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') $modecompta='';	// Not yet implemented. Should be BOOKKEEPINGCOLLECTED
-				if ($modecompta)
-				{
+				if ($modecompta) {
 					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
 						$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnoverCollected"), 2, $user->rights->accounting->comptarapport->lire);
 						$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
@@ -1372,9 +1376,10 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				}
 
 				$modecompta = 'CREANCES-DETTES';
-				if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') $modecompta = 'BOOKKEEPING'; // Not yet implemented. Should be BOOKKEEPINGCOLLECTED
-				if ($modecompta && $conf->fournisseur->enabled)
-				{
+				if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
+					$modecompta = 'BOOKKEEPING'; // Not yet implemented. Should be BOOKKEEPINGCOLLECTED
+				}
+				if ($modecompta && $conf->fournisseur->enabled) {
 					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
 						$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnover"), 2, $user->rights->accounting->comptarapport->lire);
 						$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
@@ -1384,8 +1389,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 				$modecompta = 'RECETTES-DEPENSES';
 				//if (! empty($conf->accounting->enabled) && ! empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') $modecompta='';	// Not yet implemented. Should be BOOKKEEPINGCOLLECTED
-				if ($modecompta && $conf->fournisseur->enabled)
-				{
+				if ($modecompta && $conf->fournisseur->enabled) {
 					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
 						$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnoverCollected"), 2, $user->rights->accounting->comptarapport->lire);
 						$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
@@ -1394,11 +1398,9 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Accountancy (simple)
-			if (!empty($conf->comptabilite->enabled))
-			{
+			if (!empty($conf->comptabilite->enabled)) {
 				// Files
-				if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU))
-				{
+				if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU)) {
 					$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'files');
 				}
 
@@ -1409,18 +1411,18 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					$newmenu->add("/compta/resultat/index.php?leftmenu=report", $langs->trans("MenuReportInOut"), 1, $user->rights->compta->resultat->lire);
 					$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
 					/* On verra ca avec module compabilite expert
-                    $newmenu->add("/compta/resultat/compteres.php?leftmenu=report","Compte de resultat",2,$user->rights->compta->resultat->lire);
-                    $newmenu->add("/compta/resultat/bilan.php?leftmenu=report","Bilan",2,$user->rights->compta->resultat->lire);
-                    */
+					$newmenu->add("/compta/resultat/compteres.php?leftmenu=report","Compte de resultat",2,$user->rights->compta->resultat->lire);
+					$newmenu->add("/compta/resultat/bilan.php?leftmenu=report","Bilan",2,$user->rights->compta->resultat->lire);
+					*/
 					$newmenu->add("/compta/stats/index.php?leftmenu=report", $langs->trans("ReportTurnover"), 1, $user->rights->compta->resultat->lire);
 
 					/*
-                    $newmenu->add("/compta/stats/cumul.php?leftmenu=report","Cumule",2,$user->rights->compta->resultat->lire);
-                    if (! empty($conf->propal->enabled)) {
-                        $newmenu->add("/compta/stats/prev.php?leftmenu=report","Previsionnel",2,$user->rights->compta->resultat->lire);
-                        $newmenu->add("/compta/stats/comp.php?leftmenu=report","Transforme",2,$user->rights->compta->resultat->lire);
-                    }
-                    */
+					$newmenu->add("/compta/stats/cumul.php?leftmenu=report","Cumule",2,$user->rights->compta->resultat->lire);
+					if (! empty($conf->propal->enabled)) {
+						$newmenu->add("/compta/stats/prev.php?leftmenu=report","Previsionnel",2,$user->rights->compta->resultat->lire);
+						$newmenu->add("/compta/stats/comp.php?leftmenu=report","Transforme",2,$user->rights->compta->resultat->lire);
+					}
+					*/
 					$newmenu->add("/compta/stats/casoc.php?leftmenu=report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
 					$newmenu->add("/compta/stats/cabyuser.php?leftmenu=report", $langs->trans("ByUsers"), 2, $user->rights->compta->resultat->lire);
 					$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=report", $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);
@@ -1429,16 +1431,25 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report", $langs->trans("ReportPurchaseTurnover"), 1, $user->rights->compta->resultat->lire);
 					$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
 					$newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report", $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);
-					// Journaux
+					// Journals
 					$newmenu->add("/compta/journal/sellsjournal.php?leftmenu=report", $langs->trans("SellsJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 50);
 					$newmenu->add("/compta/journal/purchasesjournal.php?leftmenu=report", $langs->trans("PurchasesJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 51);
 				}
-				//if ($leftmenu=="ca") $newmenu->add("/compta/journaux/index.php?leftmenu=ca",$langs->trans("Journaux"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
+				//if ($leftmenu=="ca") $newmenu->add("/compta/journaux/index.php?leftmenu=ca",$langs->trans("Journals"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
+			}
+
+			// Intracomm report
+			if (!empty($conf->intracommreport->enabled)) {
+				$newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReport"), 0, $user->rights->intracommreport->read, '', $mainmenu, 'intracommreport', 1);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/intracommreport/', $leftmenu)) {
+					// DEB / DES
+					$newmenu->add("/intracommreport/card.php?action=create&leftmenu=intracommreport", $langs->trans("MenuIntracommReportNew"), 1, $user->rights->intracommreport->write, '', $mainmenu, 'intracommreport', 1);
+					$newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReportList"), 1, $user->rights->intracommreport->read, '', $mainmenu, 'intracommreport', 1);
+				}
 			}
 
 			// Assets
-			if (!empty($conf->asset->enabled))
-			{
+			if (!empty($conf->asset->enabled)) {
 				$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuAssets"), 0, $user->rights->asset->read, '', $mainmenu, 'asset');
 				$newmenu->add("/asset/card.php?leftmenu=asset&amp;action=create", $langs->trans("MenuNewAsset"), 1, $user->rights->asset->write);
 				$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuListAssets"), 1, $user->rights->asset->read);
@@ -1454,14 +1465,12 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		/*
 		 * Menu BANK
 		 */
-		if ($mainmenu == 'bank')
-		{
+		if ($mainmenu == 'bank') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("withdrawals", "banks", "bills", "categories"));
 
 			// Bank-Cash account
-			if (!empty($conf->banque->enabled))
-			{
+			if (!empty($conf->banque->enabled)) {
 				$newmenu->add("/compta/bank/list.php?leftmenu=bank&amp;mainmenu=bank", $langs->trans("MenuBankCash"), 0, $user->rights->banque->lire, '', $mainmenu, 'bank');
 
 				$newmenu->add("/compta/bank/card.php?action=create", $langs->trans("MenuNewFinancialAccount"), 1, $user->rights->banque->configurer);
@@ -1472,16 +1481,14 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/compta/bank/transfer.php", $langs->trans("MenuBankInternalTransfer"), 1, $user->rights->banque->transfer);
 			}
 
-			if (!empty($conf->categorie->enabled))
-			{
+			if (!empty($conf->categorie->enabled)) {
 				$langs->load("categories");
 				$newmenu->add("/categories/index.php?type=5", $langs->trans("Rubriques"), 1, $user->rights->categorie->creer, '', $mainmenu, 'tags');
 				$newmenu->add("/compta/bank/categ.php", $langs->trans("RubriquesTransactions"), 1, $user->rights->banque->configurer, '', $mainmenu, 'tags');
 			}
 
 			// Direct debit order
-			if (!empty($conf->prelevement->enabled))
-			{
+			if (!empty($conf->prelevement->enabled)) {
 				$newmenu->add("/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank", $langs->trans("PaymentByDirectDebit"), 0, $user->rights->prelevement->bons->lire, '', $mainmenu, 'withdraw');
 
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "withdraw") {
@@ -1495,8 +1502,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Bank transfer order
-			if (!empty($conf->paymentbybanktransfer->enabled))
-			{
+			if (!empty($conf->paymentbybanktransfer->enabled)) {
 				$newmenu->add("/compta/paymentbybanktransfer/index.php?leftmenu=banktransfer&amp;mainmenu=bank", $langs->trans("PaymentByBankTransfer"), 0, $user->rights->paymentbybanktransfer->read, '', $mainmenu, 'banktransfer');
 
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "banktransfer") {
@@ -1510,8 +1516,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Management of checks
-			if (empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && !empty($conf->banque->enabled) && (!empty($conf->facture->enabled) || !empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)))
-			{
+			if (empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && !empty($conf->banque->enabled) && (!empty($conf->facture->enabled) || !empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))) {
 				$newmenu->add("/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank", $langs->trans("MenuChequeDeposits"), 0, $user->rights->banque->cheque, '', $mainmenu, 'checks');
 				if (preg_match('/checks/', $leftmenu)) {
 					$newmenu->add("/compta/paiement/cheque/card.php?leftmenu=checks_bis&amp;action=new&amp;mainmenu=bank", $langs->trans("NewChequeDeposit"), 1, $user->rights->banque->cheque);
@@ -1520,8 +1525,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Cash Control
-			if (!empty($conf->takepos->enabled) || !empty($conf->cashdesk->enabled))
-			{
+			if (!empty($conf->takepos->enabled) || !empty($conf->cashdesk->enabled)) {
 				$permtomakecashfence = ($user->rights->cashdesk->run || $user->rights->takepos->run);
 				$newmenu->add("/compta/cashcontrol/cashcontrol_list.php?action=list", $langs->trans("POS"), 0, $permtomakecashfence, '', $mainmenu, 'cashcontrol');
 				$newmenu->add("/compta/cashcontrol/cashcontrol_card.php?action=create", $langs->trans("NewCashFence"), 1, $permtomakecashfence);
@@ -1532,36 +1536,29 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		/*
 		 * Menu PRODUCTS-SERVICES
 		 */
-		if ($mainmenu == 'products')
-		{
+		if ($mainmenu == 'products') {
 			// Products
-			if (!empty($conf->product->enabled))
-			{
+			if (!empty($conf->product->enabled)) {
 				$newmenu->add("/product/index.php?leftmenu=product&amp;type=0", $langs->trans("Products"), 0, $user->rights->produit->lire, '', $mainmenu, 'product');
 				$newmenu->add("/product/card.php?leftmenu=product&amp;action=create&amp;type=0", $langs->trans("NewProduct"), 1, $user->rights->produit->creer);
 				$newmenu->add("/product/list.php?leftmenu=product&amp;type=0", $langs->trans("List"), 1, $user->rights->produit->lire);
-				if (!empty($conf->stock->enabled))
-				{
+				if (!empty($conf->stock->enabled)) {
 					$newmenu->add("/product/reassort.php?type=0", $langs->trans("MenuStocks"), 1, $user->rights->produit->lire && $user->rights->stock->lire);
 				}
-				if (!empty($conf->productbatch->enabled))
-				{
+				if (!empty($conf->productbatch->enabled)) {
 					$langs->load("stocks");
 					$newmenu->add("/product/reassortlot.php?type=0", $langs->trans("StocksByLotSerial"), 1, $user->rights->produit->lire && $user->rights->stock->lire);
 					$newmenu->add("/product/stock/productlot_list.php", $langs->trans("LotSerial"), 1, $user->rights->produit->lire && $user->rights->stock->lire);
 				}
-				if (!empty($conf->variants->enabled))
-				{
+				if (!empty($conf->variants->enabled)) {
 					$newmenu->add("/variants/list.php", $langs->trans("VariantAttributes"), 1, $user->rights->produit->lire);
 				}
-				if (!empty($conf->propal->enabled) || !empty($conf->commande->enabled) || !empty($conf->facture->enabled) || !empty($conf->fournisseur->enabled) || !empty($conf->supplier_proposal->enabled))
-				{
+				if (!empty($conf->propal->enabled) || !empty($conf->commande->enabled) || !empty($conf->facture->enabled) || !empty($conf->fournisseur->enabled) || !empty($conf->supplier_proposal->enabled)) {
 					$newmenu->add("/product/stats/card.php?id=all&leftmenu=stats&type=0", $langs->trans("Statistics"), 1, $user->rights->produit->lire && $user->rights->propale->lire);
 				}
 
 				// Categories
-				if (!empty($conf->categorie->enabled))
-				{
+				if (!empty($conf->categorie->enabled)) {
 					$langs->load("categories");
 					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=0", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
 					//if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire);
@@ -1569,18 +1566,15 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Services
-			if (!empty($conf->service->enabled))
-			{
+			if (!empty($conf->service->enabled)) {
 				$newmenu->add("/product/index.php?leftmenu=service&amp;type=1", $langs->trans("Services"), 0, $user->rights->service->lire, '', $mainmenu, 'service');
 				$newmenu->add("/product/card.php?leftmenu=service&amp;action=create&amp;type=1", $langs->trans("NewService"), 1, $user->rights->service->creer);
 				$newmenu->add("/product/list.php?leftmenu=service&amp;type=1", $langs->trans("List"), 1, $user->rights->service->lire);
-				if (!empty($conf->propal->enabled) || !empty($conf->commande->enabled) || !empty($conf->facture->enabled) || !empty($conf->fournisseur->enabled) || !empty($conf->supplier_proposal->enabled))
-				{
+				if (!empty($conf->propal->enabled) || !empty($conf->commande->enabled) || !empty($conf->facture->enabled) || !empty($conf->fournisseur->enabled) || !empty($conf->supplier_proposal->enabled)) {
 					$newmenu->add("/product/stats/card.php?id=all&leftmenu=stats&type=1", $langs->trans("Statistics"), 1, $user->rights->service->lire && $user->rights->propale->lire);
 				}
 				// Categories
-				if (!empty($conf->categorie->enabled))
-				{
+				if (!empty($conf->categorie->enabled)) {
 					$langs->load("categories");
 					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=0", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
 					//if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire);
@@ -1588,8 +1582,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Warehouse
-			if (!empty($conf->stock->enabled))
-			{
+			if (!empty($conf->stock->enabled)) {
 				$langs->load("stocks");
 				$newmenu->add("/product/stock/index.php?leftmenu=stock", $langs->trans("Warehouses"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock');
 				$newmenu->add("/product/stock/card.php?action=create", $langs->trans("MenuNewWarehouse"), 1, $user->rights->stock->creer);
@@ -1597,24 +1590,22 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/product/stock/movement_list.php", $langs->trans("Movements"), 1, $user->rights->stock->mouvement->lire);
 
 				$newmenu->add("/product/stock/massstockmove.php", $langs->trans("MassStockTransferShort"), 1, $user->rights->stock->mouvement->creer);
-				if ($conf->supplier_order->enabled) $newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire);
-				$newmenu->add("/product/stock/stockatdate.php", $langs->trans("StockAtDate"), 1, $user->rights->produit->lire && $user->rights->stock->lire && $conf->global->MAIN_FEATURES_LEVEL >= 2);
+				if ($conf->supplier_order->enabled) {
+					$newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire);
+				}
+				$newmenu->add("/product/stock/stockatdate.php", $langs->trans("StockAtDate"), 1, $user->rights->produit->lire && $user->rights->stock->lire);
 
 				// Categories for warehouses
-				if (!empty($conf->categorie->enabled))
-				{
+				if (!empty($conf->categorie->enabled)) {
 					$newmenu->add("/categories/index.php?leftmenu=stock&amp;type=9", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
 				}
 			}
 
 			// Inventory
-			if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
-			{
-				if (!empty($conf->stock->enabled))
-				{
+			if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+				if (!empty($conf->stock->enabled)) {
 					$langs->load("stocks");
-					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
-					{
+					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 						$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock');
 						if ($usemenuhider || empty($leftmenu) || $leftmenu == "stock_inventories") {
 							$newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->rights->stock->creer);
@@ -1631,8 +1622,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Shipments
-			if (!empty($conf->expedition->enabled))
-			{
+			if (!empty($conf->expedition->enabled)) {
 				$langs->load("sendings");
 				$newmenu->add("/expedition/index.php?leftmenu=sendings", $langs->trans("Shipments"), 0, $user->rights->expedition->lire, '', $mainmenu, 'sendings');
 				$newmenu->add("/expedition/card.php?action=create2&amp;leftmenu=sendings", $langs->trans("NewSending"), 1, $user->rights->expedition->creer);
@@ -1646,15 +1636,20 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Receptions
-			if (!empty($conf->reception->enabled))
-			{
+			if (!empty($conf->reception->enabled)) {
 				$langs->load("receptions");
 				$newmenu->add("/reception/index.php?leftmenu=receptions", $langs->trans("Receptions"), 0, $user->rights->reception->lire, '', $mainmenu, 'receptions');
 				$newmenu->add("/reception/card.php?action=create2&amp;leftmenu=receptions", $langs->trans("NewReception"), 1, $user->rights->reception->creer);
 				$newmenu->add("/reception/list.php?leftmenu=receptions", $langs->trans("List"), 1, $user->rights->reception->lire);
-				if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") $newmenu->add("/reception/list.php?leftmenu=receptions&search_status=0", $langs->trans("StatusReceptionDraftShort"), 2, $user->rights->reception->lire);
-				if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") $newmenu->add("/reception/list.php?leftmenu=receptions&search_status=1", $langs->trans("StatusReceptionValidatedShort"), 2, $user->rights->reception->lire);
-				if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") $newmenu->add("/reception/list.php?leftmenu=receptions&search_status=2", $langs->trans("StatusReceptionProcessedShort"), 2, $user->rights->reception->lire);
+				if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") {
+					$newmenu->add("/reception/list.php?leftmenu=receptions&search_status=0", $langs->trans("StatusReceptionDraftShort"), 2, $user->rights->reception->lire);
+				}
+				if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") {
+					$newmenu->add("/reception/list.php?leftmenu=receptions&search_status=1", $langs->trans("StatusReceptionValidatedShort"), 2, $user->rights->reception->lire);
+				}
+				if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") {
+					$newmenu->add("/reception/list.php?leftmenu=receptions&search_status=2", $langs->trans("StatusReceptionProcessedShort"), 2, $user->rights->reception->lire);
+				}
 				$newmenu->add("/reception/stats/index.php?leftmenu=receptions", $langs->trans("Statistics"), 1, $user->rights->reception->lire);
 			}
 		}
@@ -1662,11 +1657,9 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		/*
 		 * Menu PRODUCTS-SERVICES MRP - GPAO
 		 */
-		if ($mainmenu == 'mrp')
-		{
+		if ($mainmenu == 'mrp') {
 			// BOM
-			if (!empty($conf->bom->enabled) || !empty($conf->mrp->enabled))
-			{
+			if (!empty($conf->bom->enabled) || !empty($conf->mrp->enabled)) {
 				$langs->load("mrp");
 
 				$newmenu->add("", $langs->trans("MenuBOM"), 0, $user->rights->bom->read, '', $mainmenu, 'bom');
@@ -1674,8 +1667,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/bom/bom_list.php?leftmenu=bom", $langs->trans("List"), 1, $user->rights->bom->read, '', $mainmenu, 'bom');
 			}
 
-			if (!empty($conf->mrp->enabled))
-			{
+			if (!empty($conf->mrp->enabled)) {
 				$langs->load("mrp");
 
 				$newmenu->add("", $langs->trans("MenuMRP"), 0, $user->rights->mrp->read, '', $mainmenu, 'mo');
@@ -1687,10 +1679,8 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		/*
 		 * Menu PROJECTS
 		 */
-		if ($mainmenu == 'project')
-		{
-			if (!empty($conf->projet->enabled))
-			{
+		if ($mainmenu == 'project') {
+			if (!empty($conf->projet->enabled)) {
 				$langs->load("projects");
 
 				$search_project_user = GETPOST('search_project_user', 'int');
@@ -1704,8 +1694,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 				$titleboth = $langs->trans("LeadsOrProjects");
 				$titlenew = $langs->trans("NewLeadOrProject"); // Leads and opportunities by default
-				if ($conf->global->PROJECT_USE_OPPORTUNITIES == 0)
-				{
+				if ($conf->global->PROJECT_USE_OPPORTUNITIES == 0) {
 					$titleboth = $langs->trans("Projects");
 					$titlenew = $langs->trans("NewProject");
 				}
@@ -1718,13 +1707,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/projet/index.php?leftmenu=projects".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titleboth, 0, $user->rights->projet->lire, '', $mainmenu, 'projects');
 				$newmenu->add("/projet/card.php?leftmenu=projects&action=create".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titlenew, 1, $user->rights->projet->creer);
 
-				if ($conf->global->PROJECT_USE_OPPORTUNITIES == 0)
-				{
+				if ($conf->global->PROJECT_USE_OPPORTUNITIES == 0) {
 					$newmenu->add("/projet/list.php?leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : '').'&search_status=99', $langs->trans("List"), 1, $showmode, '', 'project', 'list');
-				} elseif ($conf->global->PROJECT_USE_OPPORTUNITIES == 1)
-				{
+				} elseif ($conf->global->PROJECT_USE_OPPORTUNITIES == 1) {
 					$newmenu->add("/projet/list.php?leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $showmode, '', 'project', 'list');
-					$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_usage_opportunity=1&search_status=99&contextpage=lead', $langs->trans("ListOpenLeads"), 2, $showmode);
+					$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_usage_opportunity=1&search_status=99&search_opp_status=openedopp&contextpage=lead', $langs->trans("ListOpenLeads"), 2, $showmode);
 					$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_opp_status=notopenedopp&search_status=99&contextpage=project', $langs->trans("ListOpenProjects"), 2, $showmode);
 				} elseif ($conf->global->PROJECT_USE_OPPORTUNITIES == 2) {	// 2 = leads only
 					$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_usage_opportunity=1&search_status=99', $langs->trans("List"), 2, $showmode);
@@ -1733,14 +1720,12 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/projet/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);
 
 				// Categories
-				if (!empty($conf->categorie->enabled))
-				{
+				if (!empty($conf->categorie->enabled)) {
 					$langs->load("categories");
 					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=6", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
 				}
 
-				if (empty($conf->global->PROJECT_HIDE_TASKS))
-				{
+				if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 					// Project affected to user
 					$newmenu->add("/projet/activity/index.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("Activities"), 0, $user->rights->projet->lire, '', 'project', 'tasks');
 					$newmenu->add("/projet/tasks.php?leftmenu=tasks&action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer);
@@ -1755,11 +1740,9 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		/*
 		 * Menu HRM
 		*/
-		if ($mainmenu == 'hrm')
-		{
+		if ($mainmenu == 'hrm') {
 			// HRM module
-			if (!empty($conf->hrm->enabled))
-			{
+			if (!empty($conf->hrm->enabled)) {
 				$langs->load("hrm");
 
 				$newmenu->add("/user/list.php?mainmenu=hrm&leftmenu=hrm&mode=employee", $langs->trans("Employees"), 0, $user->rights->hrm->employee->read, '', $mainmenu, 'hrm');
@@ -1768,8 +1751,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Leave/Holiday/Vacation module
-			if (!empty($conf->holiday->enabled))
-			{
+			if (!empty($conf->holiday->enabled)) {
 				// Load translation files required by the page
 				$langs->loadLangs(array("holiday", "trips"));
 
@@ -1784,13 +1766,12 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					$newmenu->add("/holiday/list.php?search_statut=5&mainmenu=hrm&leftmenu=hrm", $langs->trans("RefuseCP"), 2, $user->rights->holiday->read);
 				}
 				$newmenu->add("/holiday/define_holiday.php?mainmenu=hrm&action=request", $langs->trans("MenuConfCP"), 1, $user->rights->holiday->read);
-				$newmenu->add("/holiday/month_report.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("MenuReportMonth"), 1, $user->rights->holiday->read_all);
+				$newmenu->add("/holiday/month_report.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("MenuReportMonth"), 1, $user->rights->holiday->readall);
 				$newmenu->add("/holiday/view_log.php?mainmenu=hrm&leftmenu=holiday&action=request", $langs->trans("MenuLogCP"), 1, $user->rights->holiday->define_holiday);
 			}
 
 			// Trips and expenses (old module)
-			if (!empty($conf->deplacement->enabled))
-			{
+			if (!empty($conf->deplacement->enabled)) {
 				$langs->load("trips");
 				$newmenu->add("/compta/deplacement/index.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("TripsAndExpenses"), 0, $user->rights->deplacement->lire, '', $mainmenu, 'tripsandexpenses');
 				$newmenu->add("/compta/deplacement/card.php?action=create&amp;leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("New"), 1, $user->rights->deplacement->creer);
@@ -1799,8 +1780,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Expense report
-			if (!empty($conf->expensereport->enabled))
-			{
+			if (!empty($conf->expensereport->enabled)) {
 				$langs->load("trips");
 				$newmenu->add("/expensereport/index.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("TripsAndExpenses"), 0, $user->rights->expensereport->lire, '', $mainmenu, 'expensereport');
 				$newmenu->add("/expensereport/card.php?action=create&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("New"), 1, $user->rights->expensereport->creer);
@@ -1816,10 +1796,8 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/expensereport/stats/index.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Statistics"), 1, $user->rights->expensereport->lire);
 			}
 
-			if (!empty($conf->projet->enabled))
-			{
-				if (empty($conf->global->PROJECT_HIDE_TASKS))
-				{
+			if (!empty($conf->projet->enabled)) {
+				if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 					$langs->load("projects");
 
 					$search_project_user = GETPOST('search_project_user', 'int');
@@ -1833,31 +1811,26 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		/*
 		 * Menu TOOLS
 		 */
-		if ($mainmenu == 'tools')
-		{
-			if (empty($user->socid)) // limit to internal users
-			{
+		if ($mainmenu == 'tools') {
+			if (empty($user->socid)) { // limit to internal users
 				$langs->load("mails");
 				$newmenu->add("/admin/mails_templates.php?leftmenu=email_templates", $langs->trans("EMailTemplates"), 0, 1, '', $mainmenu, 'email_templates');
 			}
 
-			if (!empty($conf->mailing->enabled))
-			{
+			if (!empty($conf->mailing->enabled)) {
 				$newmenu->add("/comm/mailing/index.php?leftmenu=mailing", $langs->trans("EMailings"), 0, $user->rights->mailing->lire, '', $mainmenu, 'mailing');
 				$newmenu->add("/comm/mailing/card.php?leftmenu=mailing&amp;action=create", $langs->trans("NewMailing"), 1, $user->rights->mailing->creer);
 				$newmenu->add("/comm/mailing/list.php?leftmenu=mailing", $langs->trans("List"), 1, $user->rights->mailing->lire);
 			}
 
-			if (!empty($conf->export->enabled))
-			{
+			if (!empty($conf->export->enabled)) {
 				$langs->load("exports");
 				$newmenu->add("/exports/index.php?leftmenu=export", $langs->trans("FormatedExport"), 0, $user->rights->export->lire, '', $mainmenu, 'export');
 				$newmenu->add("/exports/export.php?leftmenu=export", $langs->trans("NewExport"), 1, $user->rights->export->creer);
 				//$newmenu->add("/exports/export.php?leftmenu=export",$langs->trans("List"),1, $user->rights->export->lire);
 			}
 
-			if (!empty($conf->import->enabled))
-			{
+			if (!empty($conf->import->enabled)) {
 				$langs->load("exports");
 				$newmenu->add("/imports/index.php?leftmenu=import", $langs->trans("FormatedImport"), 0, $user->rights->import->run, '', $mainmenu, 'import');
 				$newmenu->add("/imports/import.php?leftmenu=import", $langs->trans("NewImport"), 1, $user->rights->import->run);
@@ -1867,10 +1840,8 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		/*
 		 * Menu MEMBERS
 		 */
-		if ($mainmenu == 'members')
-		{
-			if (!empty($conf->adherent->enabled))
-			{
+		if ($mainmenu == 'members') {
+			if (!empty($conf->adherent->enabled)) {
 				// Load translation files required by the page
 				$langs->loadLangs(array("members", "compta"));
 
@@ -1886,10 +1857,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/adherents/stats/index.php?leftmenu=members", $langs->trans("MenuMembersStats"), 1, $user->rights->adherent->lire);
 
 				$newmenu->add("/adherents/cartes/carte.php?leftmenu=export", $langs->trans("MembersCards"), 1, $user->rights->adherent->export);
-				if (!empty($conf->global->MEMBER_LINK_TO_HTPASSWDFILE) && ($usemenuhider || empty($leftmenu) || $leftmenu == 'none' || $leftmenu == "members" || $leftmenu == "export")) $newmenu->add("/adherents/htpasswd.php?leftmenu=export", $langs->trans("Filehtpasswd"), 1, $user->rights->adherent->export);
+				if (!empty($conf->global->MEMBER_LINK_TO_HTPASSWDFILE) && ($usemenuhider || empty($leftmenu) || $leftmenu == 'none' || $leftmenu == "members" || $leftmenu == "export")) {
+					$newmenu->add("/adherents/htpasswd.php?leftmenu=export", $langs->trans("Filehtpasswd"), 1, $user->rights->adherent->export);
+				}
 
-				if (!empty($conf->categorie->enabled))
-				{
+				if (!empty($conf->categorie->enabled)) {
 					$langs->load("categories");
 					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=3", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
 				}
@@ -1915,16 +1887,13 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		$newmenu = $menuArbo->menuLeftCharger($newmenu, $mainmenu, $leftmenu, (empty($user->socid) ? 0 : 1), 'eldy', $tabMenu);
 		//var_dump($newmenu->liste);    //
 
-		if (!empty($conf->ftp->enabled) && $mainmenu == 'ftp')	// Entry for FTP
-		{
+		if (!empty($conf->ftp->enabled) && $mainmenu == 'ftp') {	// Entry for FTP
 			$MAXFTP = 20;
 			$i = 1;
-			while ($i <= $MAXFTP)
-			{
+			while ($i <= $MAXFTP) {
 				$paramkey = 'FTP_NAME_'.$i;
 				//print $paramkey;
-				if (!empty($conf->global->$paramkey))
-				{
+				if (!empty($conf->global->$paramkey)) {
 					$link = "/ftp/index.php?idmenu=".$_SESSION["idmenu"]."&numero_ftp=".$i;
 
 					$newmenu->add($link, dol_trunc($conf->global->$paramkey, 24));
@@ -1941,10 +1910,16 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 	//var_dump($menu_array_before);exit;
 	//var_dump($menu_array_after);exit;
 	$menu_array = $newmenu->liste;
-	if (is_array($menu_array_before)) $menu_array = array_merge($menu_array_before, $menu_array);
-	if (is_array($menu_array_after))  $menu_array = array_merge($menu_array, $menu_array_after);
+	if (is_array($menu_array_before)) {
+		$menu_array = array_merge($menu_array_before, $menu_array);
+	}
+	if (is_array($menu_array_after)) {
+		$menu_array = array_merge($menu_array, $menu_array_after);
+	}
 	//var_dump($menu_array);exit;
-	if (!is_array($menu_array)) return 0;
+	if (!is_array($menu_array)) {
+		return 0;
+	}
 
 	// TODO Use the position property in menu_array to reorder the $menu_array
 	//var_dump($menu_array);
@@ -1954,32 +1929,31 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 	while (findNextEntryForLevel($menu_array, $cursor, $position, $level))
 	{
 
-	    $cursor++;
+		$cursor++;
 	}*/
 
 	// Show menu
 	$invert = empty($conf->global->MAIN_MENU_INVERT) ? "" : "invert";
-	if (empty($noout))
-	{
+	if (empty($noout)) {
 		$altok = 0; $blockvmenuopened = false; $lastlevel0 = '';
 		$num = count($menu_array);
-		for ($i = 0; $i < $num; $i++)     // Loop on each menu entry
-		{
+		for ($i = 0; $i < $num; $i++) {     // Loop on each menu entry
 			$showmenu = true;
-			if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) 	$showmenu = false;
+			if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) {
+				$showmenu = false;
+			}
 
 			// Begin of new left menu block
-			if (empty($menu_array[$i]['level']) && $showmenu)
-			{
+			if (empty($menu_array[$i]['level']) && $showmenu) {
 				$altok++;
 				$blockvmenuopened = true;
 				$lastopened = true;
-				for ($j = ($i + 1); $j < $num; $j++)
-				{
-					if (empty($menu_array[$j]['level'])) $lastopened = false;
+				for ($j = ($i + 1); $j < $num; $j++) {
+					if (empty($menu_array[$j]['level'])) {
+						$lastopened = false;
+					}
 				}
-				if ($altok % 2 == 0)
-				{
+				if ($altok % 2 == 0) {
 					print '<div class="blockvmenu blockvmenuimpair'.$invert.($lastopened ? ' blockvmenulast' : '').($altok == 1 ? ' blockvmenufirst' : '').'">'."\n";
 				} else {
 					print '<div class="blockvmenu blockvmenupair'.$invert.($lastopened ? ' blockvmenulast' : '').($altok == 1 ? ' blockvmenufirst' : '').'">'."\n";
@@ -1989,10 +1963,8 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			// Add tabulation
 			$tabstring = '';
 			$tabul = ($menu_array[$i]['level'] - 1);
-			if ($tabul > 0)
-			{
-				for ($j = 0; $j < $tabul; $j++)
-				{
+			if ($tabul > 0) {
+				for ($j = 0; $j < $tabul; $j++) {
 					$tabstring .= '&nbsp;&nbsp;&nbsp;';
 				}
 			}
@@ -2002,19 +1974,16 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			$menu_array[$i]['url'] = make_substitutions($menu_array[$i]['url'], $substitarray);
 
 			$url = $shorturl = $shorturlwithoutparam = $menu_array[$i]['url'];
-			if (!preg_match("/^(http:\/\/|https:\/\/)/i", $menu_array[$i]['url']))
-			{
+			if (!preg_match("/^(http:\/\/|https:\/\/)/i", $menu_array[$i]['url'])) {
 				$tmp = explode('?', $menu_array[$i]['url'], 2);
 				$url = $shorturl = $tmp[0];
 				$param = (isset($tmp[1]) ? $tmp[1] : ''); // params in url of the menu link
 
 				// Complete param to force leftmenu to '' to close open menu when we click on a link with no leftmenu defined.
-				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && !empty($menu_array[$i]['mainmenu']))
-				{
+				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && !empty($menu_array[$i]['mainmenu'])) {
 					$param .= ($param ? '&' : '').'mainmenu='.$menu_array[$i]['mainmenu'].'&leftmenu=';
 				}
-				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && empty($menu_array[$i]['mainmenu']))
-				{
+				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && empty($menu_array[$i]['mainmenu'])) {
 					$param .= ($param ? '&' : '').'leftmenu=';
 				}
 				//$url.="idmenu=".$menu_array[$i]['rowid'];    // Already done by menuLoad
@@ -2027,64 +1996,77 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			print '<!-- Process menu entry with mainmenu='.$menu_array[$i]['mainmenu'].', leftmenu='.$menu_array[$i]['leftmenu'].', level='.$menu_array[$i]['level'].' enabled='.$menu_array[$i]['enabled'].', position='.$menu_array[$i]['position'].' -->'."\n";
 
 			// Menu level 0
-			if ($menu_array[$i]['level'] == 0)
-			{
-				if ($menu_array[$i]['enabled'])     // Enabled so visible
-				{
+			if ($menu_array[$i]['level'] == 0) {
+				if ($menu_array[$i]['enabled']) {     // Enabled so visible
 					print '<div class="menu_titre">'.$tabstring;
-					if ($shorturlwithoutparam) print '<a class="vmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';
-					else print '<span class="vmenu">';
+					if ($shorturlwithoutparam) {
+						print '<a class="vmenu" title="'.dol_escape_htmltag(dol_string_nohtmltag($menu_array[$i]['titre'])).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';
+					} else {
+						print '<span class="vmenu">';
+					}
 					print ($menu_array[$i]['prefix'] ? $menu_array[$i]['prefix'] : '').$menu_array[$i]['titre'];
-					if ($shorturlwithoutparam) print '</a>';
-					else print '</span>';
+					if ($shorturlwithoutparam) {
+						print '</a>';
+					} else {
+						print '</span>';
+					}
 					print '</div>'."\n";
 					$lastlevel0 = 'enabled';
-				} elseif ($showmenu)                 // Not enabled but visible (so greyed)
-				{
+				} elseif ($showmenu) {                 // Not enabled but visible (so greyed)
 					print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
 					$lastlevel0 = 'greyed';
 				} else {
 					$lastlevel0 = 'hidden';
 				}
-				if ($showmenu)
-				{
+				if ($showmenu) {
 					print '<div class="menu_top"></div>'."\n";
 				}
 			}
 
 			// Menu level > 0
-			if ($menu_array[$i]['level'] > 0)
-			{
+			if ($menu_array[$i]['level'] > 0) {
 				$cssmenu = '';
-				if ($menu_array[$i]['url']) $cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $menu_array[$i]['url']));
+				if ($menu_array[$i]['url']) {
+					$cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $menu_array[$i]['url']));
+				}
 
-				if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled')     // Enabled so visible, except if parent was not enabled.
-				{
+				if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled') {     // Enabled so visible, except if parent was not enabled.
 					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring;
-					if ($shorturlwithoutparam) print '<a class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';
-					else print '<span class="vsmenu">';
+					if ($shorturlwithoutparam) {
+						print '<a class="vsmenu" title="'.dol_escape_htmltag(dol_string_nohtmltag($menu_array[$i]['titre'])).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';
+					} else {
+						print '<span class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'">';
+					}
 					print $menu_array[$i]['titre'];
-					if ($shorturlwithoutparam) print '</a>';
-					else print '</span>';
+					if ($shorturlwithoutparam) {
+						print '</a>';
+					} else {
+						print '</span>';
+					}
 					// If title is not pure text and contains a table, no carriage return added
-					if (!strstr($menu_array[$i]['titre'], '<table')) print '<br>';
+					if (!strstr($menu_array[$i]['titre'], '<table')) {
+						print '<br>';
+					}
 					print '</div>'."\n";
-				} elseif ($showmenu && $lastlevel0 == 'enabled')       // Not enabled but visible (so greyed), except if parent was not enabled.
-				{
+				} elseif ($showmenu && $lastlevel0 == 'enabled') {       // Not enabled but visible (so greyed), except if parent was not enabled.
 					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
 				}
 			}
 
 			// If next is a new block or if there is nothing after
-			if (empty($menu_array[$i + 1]['level']))               // End menu block
-			{
-				if ($showmenu)
+			if (empty($menu_array[$i + 1]['level'])) {               // End menu block
+				if ($showmenu) {
 					print '<div class="menu_end"></div>'."\n";
-				if ($blockvmenuopened) { print '</div>'."\n"; $blockvmenuopened = false; }
+				}
+				if ($blockvmenuopened) {
+					print '</div>'."\n"; $blockvmenuopened = false;
+				}
 			}
 		}
 
-		if ($altok) print '<div class="blockvmenuend"></div>'; // End menu block
+		if ($altok) {
+			print '<div class="blockvmenuend"></div>'; // End menu block
+		}
 	}
 
 	return count($menu_array);
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index c3e6a0bce05..a024e6743e8 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -28,293 +28,301 @@
 class MenuManager
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $type_user; // Put 0 for internal users, 1 for external users
-    public $atarget = ""; // To store default target to use onto links
-    public $name = "eldy";
+	public $type_user; // Put 0 for internal users, 1 for external users
+	public $atarget = ""; // To store default target to use onto links
+	public $name = "eldy";
 
-    public $menu_array;
-    public $menu_array_after;
+	public $menu_array;
+	public $menu_array_after;
 
-    public $tabMenu;
+	public $tabMenu;
 
 
-    /**
-     *  Constructor
-     *
+	/**
+	 *  Constructor
+	 *
 	 *  @param	DoliDB		$db     	Database handler
-     *  @param	int			$type_user	Type of user
-     */
-    public function __construct($db, $type_user)
-    {
-    	$this->type_user = $type_user;
-        $this->db = $db;
-    }
+	 *  @param	int			$type_user	Type of user
+	 */
+	public function __construct($db, $type_user)
+	{
+		$this->type_user = $type_user;
+		$this->db = $db;
+	}
 
 
-    /**
-     * Load this->tabMenu
-     *
-   	 * @param	string	$forcemainmenu		To force mainmenu to load
-   	 * @param	string	$forceleftmenu		To force leftmenu to load
-     * @return	void
-     */
-    public function loadMenu($forcemainmenu = '', $forceleftmenu = '')
-    {
-    	global $conf, $user, $langs;
+	/**
+	 * Load this->tabMenu
+	 *
+	 * @param	string	$forcemainmenu		To force mainmenu to load
+	 * @param	string	$forceleftmenu		To force leftmenu to load
+	 * @return	void
+	 */
+	public function loadMenu($forcemainmenu = '', $forceleftmenu = '')
+	{
+		global $conf, $user, $langs;
 
 		// We save into session the main menu selected
-    	if (GETPOSTISSET("mainmenu")) $_SESSION["mainmenu"] = GETPOST("mainmenu", 'aZ09');
-    	if (GETPOSTISSET("idmenu"))   $_SESSION["idmenu"] = GETPOST("idmenu", 'int');
+		if (GETPOSTISSET("mainmenu")) {
+			$_SESSION["mainmenu"] = GETPOST("mainmenu", 'aZ09');
+		}
+		if (GETPOSTISSET("idmenu")) {
+			$_SESSION["idmenu"] = GETPOST("idmenu", 'int');
+		}
 
 		// Read now mainmenu and leftmenu that define which menu to show
-    	if (GETPOSTISSET("mainmenu"))
-        {
-        	// On sauve en session le menu principal choisi
-        	$mainmenu = GETPOST("mainmenu", 'aZ09');
-        	$_SESSION["mainmenu"] = $mainmenu;
-        	$_SESSION["leftmenuopened"] = "";
-        } else {
-        	// On va le chercher en session si non defini par le lien
-        	$mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';
-        }
-        if (!empty($forcemainmenu)) $mainmenu = $forcemainmenu;
+		if (GETPOSTISSET("mainmenu")) {
+			// On sauve en session le menu principal choisi
+			$mainmenu = GETPOST("mainmenu", 'aZ09');
+			$_SESSION["mainmenu"] = $mainmenu;
+			$_SESSION["leftmenuopened"] = "";
+		} else {
+			// On va le chercher en session si non defini par le lien
+			$mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';
+		}
+		if (!empty($forcemainmenu)) {
+			$mainmenu = $forcemainmenu;
+		}
 
-        if (GETPOSTISSET("leftmenu"))
-        {
-        	// On sauve en session le menu principal choisi
-        	$leftmenu = GETPOST("leftmenu", 'aZ09');
-        	$_SESSION["leftmenu"] = $leftmenu;
+		if (GETPOSTISSET("leftmenu")) {
+			// On sauve en session le menu principal choisi
+			$leftmenu = GETPOST("leftmenu", 'aZ09');
+			$_SESSION["leftmenu"] = $leftmenu;
 
-        	if ($_SESSION["leftmenuopened"] == $leftmenu)	// To collapse
-        	{
-        		//$leftmenu="";
-        		$_SESSION["leftmenuopened"] = "";
-        	} else {
-        		$_SESSION["leftmenuopened"] = $leftmenu;
-        	}
-        } else {
-        	// On va le chercher en session si non defini par le lien
-        	$leftmenu = isset($_SESSION["leftmenu"]) ? $_SESSION["leftmenu"] : '';
-        }
-        if (!empty($forceleftmenu)) $leftmenu = $forceleftmenu;
+			if ($_SESSION["leftmenuopened"] == $leftmenu) {	// To collapse
+				//$leftmenu="";
+				$_SESSION["leftmenuopened"] = "";
+			} else {
+				$_SESSION["leftmenuopened"] = $leftmenu;
+			}
+		} else {
+			// On va le chercher en session si non defini par le lien
+			$leftmenu = isset($_SESSION["leftmenu"]) ? $_SESSION["leftmenu"] : '';
+		}
+		if (!empty($forceleftmenu)) {
+			$leftmenu = $forceleftmenu;
+		}
 
-        require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
-        $tabMenu = array();
-        $menuArbo = new Menubase($this->db, 'eldy');
-        $menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'eldy', $tabMenu);
-        $this->tabMenu = $tabMenu;
-        //var_dump($tabMenu);
+		require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
+		$tabMenu = array();
+		$menuArbo = new Menubase($this->db, 'eldy');
+		$menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'eldy', $tabMenu);
+		$this->tabMenu = $tabMenu;
+		//var_dump($tabMenu);
 
-        //if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }
-    }
+		//if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }
+	}
 
 
-    /**
-     *  Show menu.
-     *  Menu defined in sql tables were stored into $this->tabMenu BEFORE this is called.
-     *
-     *	@param	string	$mode			'top', 'topnb', 'left', 'jmobile' (used to get full xml ul/li menu)
-     *  @param	array	$moredata		An array with more data to output
-     *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
-     */
-    public function showmenu($mode, $moredata = null)
-    {
-    	global $conf, $langs, $user;
+	/**
+	 *  Show menu.
+	 *  Menu defined in sql tables were stored into $this->tabMenu BEFORE this is called.
+	 *
+	 *	@param	string	$mode			'top', 'topnb', 'left', 'jmobile' (used to get full xml ul/li menu)
+	 *  @param	array	$moredata		An array with more data to output
+	 *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
+	 */
+	public function showmenu($mode, $moredata = null)
+	{
+		global $conf, $langs, $user;
 
-    	//var_dump($this->tabMenu);
+		//var_dump($this->tabMenu);
 
-        require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php';
 
-        if ($this->type_user == 1)
-        {
-        	$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED = 1;
-        	$conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED = 1;
-        }
+		if ($this->type_user == 1) {
+			$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED = 1;
+			$conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED = 1;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
-        $this->menu = new Menu();
+		$this->menu = new Menu();
 
-        if (empty($conf->global->MAIN_MENU_INVERT))
-        {
-        	if ($mode == 'top')  print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
-        	if ($mode == 'left') print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata);
-        } else {
-        	$conf->global->MAIN_SHOW_LOGO = 0;
-        	if ($mode == 'top')  print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0);
-        	if ($mode == 'left') print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
+		if (empty($conf->global->MAIN_MENU_INVERT)) {
+			if ($mode == 'top') {
+				print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
+			}
+			if ($mode == 'left') {
+				print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata, $this->type_user);
+			}
+		} else {
+			$conf->global->MAIN_SHOW_LOGO = 0;
+			if ($mode == 'top') {
+				print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata, $this->type_user);
+			}
+			if ($mode == 'left') {
+				print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
+			}
 		}
-		if ($mode == 'topnb')
-		{
-		    print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode); // no output
-		    return $this->menu->getNbOfVisibleMenuEntries();
+		if ($mode == 'topnb') {
+			print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode); // no output
+			return $this->menu->getNbOfVisibleMenuEntries();
 		}
 
-        if ($mode == 'jmobile')     // Used to get menu in xml ul/li
-        {
-            print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode); // Fill this->menu that is empty with top menu
+		if ($mode == 'jmobile') {     // Used to get menu in xml ul/li
+			print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode); // Fill this->menu that is empty with top menu
 
-            // $this->menu->liste is top menu
-            //var_dump($this->menu->liste);exit;
-            $lastlevel = array();
-        	print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
-        	foreach ($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-        	{
-        		print '<ul class="ulmenu" data-inset="true">';
-        		print '<li class="lilevel0">';
+			// $this->menu->liste is top menu
+			//var_dump($this->menu->liste);exit;
+			$lastlevel = array();
+			print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
+			foreach ($this->menu->liste as $key => $val) {		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+				print '<ul class="ulmenu" data-inset="true">';
+				print '<li class="lilevel0">';
 
-        		if ($val['enabled'] == 1)
-        		{
-        			$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
-        			$substitarray['__USERID__'] = $user->id; // For backward compatibility
-        			$val['url'] = make_substitutions($val['url'], $substitarray);
+				if ($val['enabled'] == 1) {
+					$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
+					$substitarray['__USERID__'] = $user->id; // For backward compatibility
+					$val['url'] = make_substitutions($val['url'], $substitarray);
 
 					$relurl = dol_buildpath($val['url'], 1);
 					$canonurl = preg_replace('/\?.*$/', '', $val['url']);
 
-        			print '<a class="alilevel0" href="#">';
+					print '<a class="alilevel0" href="#">';
 
 					// Add font-awesome
-					if ($val['level'] == 0 && $val['mainmenu'] == 'home') print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
+					if ($val['level'] == 0 && $val['mainmenu'] == 'home') {
+						print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
+					}
 
 					print $val['titre'];
-        			print '</a>'."\n";
+					print '</a>'."\n";
 
-        			// Search submenu fot this mainmenu entry
-        			$tmpmainmenu = $val['mainmenu'];
-        			$tmpleftmenu = 'all';
-        			$submenu = new Menu();
-	        		print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $submenu, 1, $tmpmainmenu, $tmpleftmenu); // Fill $submenu (example with tmpmainmenu='home' tmpleftmenu='all', return left menu tree of Home)
-	        		// Note: $submenu contains menu entry with substitution not yet done
-        		    //if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }
-                    //if ($tmpmainmenu=='accountancy') { var_dump($submenu->liste); exit; }
-	        		$nexturl = dol_buildpath($submenu->liste[0]['url'], 1);
+					// Search submenu fot this mainmenu entry
+					$tmpmainmenu = $val['mainmenu'];
+					$tmpleftmenu = 'all';
+					$submenu = new Menu();
+					print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $submenu, 1, $tmpmainmenu, $tmpleftmenu, null, $this->type_user); // Fill $submenu (example with tmpmainmenu='home' tmpleftmenu='all', return left menu tree of Home)
+					// Note: $submenu contains menu entry with substitution not yet done
+					//if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }
+					//if ($tmpmainmenu=='accountancy') { var_dump($submenu->liste); exit; }
+					$nexturl = dol_buildpath($submenu->liste[0]['url'], 1);
 
-        			$canonrelurl = preg_replace('/\?.*$/', '', $relurl);
-        			$canonnexturl = preg_replace('/\?.*$/', '', $nexturl);
-        			//var_dump($canonrelurl);
-        			//var_dump($canonnexturl);
-        			print '<ul>'."\n";
-        			if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools')))
-        				|| (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false))
-					{
-        				// We add sub entry
-        				print str_pad('', 1).'<li class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
-        				print '<a href="'.$relurl.'">';
-        				if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation
-        				{
-        					if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab'))) print $langs->trans("Access");
-        				    else print $langs->trans("Dashboard");
-        				} else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
-        				print '</a>';
-        				print '</li>'."\n";
-        			}
+					$canonrelurl = preg_replace('/\?.*$/', '', $relurl);
+					$canonnexturl = preg_replace('/\?.*$/', '', $nexturl);
+					//var_dump($canonrelurl);
+					//var_dump($canonnexturl);
+					print '<ul>'."\n";
+					if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools')))
+						|| (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false)) {
+						// We add sub entry
+						print str_pad('', 1).'<li class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
+						print '<a href="'.$relurl.'">';
+						if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard") {  // No translation
+							if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab'))) {
+								print $langs->trans("Access");
+							} else {
+								print $langs->trans("Dashboard");
+							}
+						} else {
+							print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
+						}
+						print '</a>';
+						print '</li>'."\n";
+					}
 
-        			if ($val['level'] == 0)
-        			{
-        			    if ($val['enabled'])
-        			    {
-        			        $lastlevel[0] = 'enabled';
-        			    } elseif ($showmenu)                 // Not enabled but visible (so greyed)
-        			    {
-        			        $lastlevel[0] = 'greyed';
-        			    } else {
-        			        $lastlevel[0] = 'hidden';
-        			    }
-        			}
+					if ($val['level'] == 0) {
+						if ($val['enabled']) {
+							$lastlevel[0] = 'enabled';
+						} elseif ($showmenu) {                 // Not enabled but visible (so greyed)
+							$lastlevel[0] = 'greyed';
+						} else {
+							$lastlevel[0] = 'hidden';
+						}
+					}
 
-        			$lastlevel2 = array();
-       				foreach ($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-       				{
+					$lastlevel2 = array();
+					foreach ($submenu->liste as $key2 => $val2) {		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
 						$showmenu = true;
-						if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu = false;
-
-						// If at least one parent is not enabled, we do not show any menu of all children
-						if ($val2['level'] > 0)
-						{
-						    $levelcursor = $val2['level'] - 1;
-						    while ($levelcursor >= 0)
-						    {
-                                if ($lastlevel2[$levelcursor] != 'enabled') $showmenu = false;
-                                $levelcursor--;
-						    }
+						if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) {
+							$showmenu = false;
 						}
 
-       					if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)
-       					{
-       						$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
-       						$substitarray['__USERID__'] = $user->id; // For backward compatibility
-       						$val2['url'] = make_substitutions($val2['url'], $substitarray); // Make also substitution of __(XXX)__ and __[XXX]__
+						// If at least one parent is not enabled, we do not show any menu of all children
+						if ($val2['level'] > 0) {
+							$levelcursor = $val2['level'] - 1;
+							while ($levelcursor >= 0) {
+								if ($lastlevel2[$levelcursor] != 'enabled') {
+									$showmenu = false;
+								}
+								$levelcursor--;
+							}
+						}
 
-       						if (!preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url']))
-       						{
-       							$relurl2 = dol_buildpath($val2['url'], 1);
-       						} else {
-       							$relurl2 = $val2['url'];
-       						}
-	        				$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
-	        				//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
-	        				if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php'))) $relurl2 = '';
+						if ($showmenu) {		// Visible (option to hide when not allowed is off or allowed)
+							$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
+							$substitarray['__USERID__'] = $user->id; // For backward compatibility
+							$val2['url'] = make_substitutions($val2['url'], $substitarray); // Make also substitution of __(XXX)__ and __[XXX]__
 
-	        				$disabled = '';
-	        				if (!$val2['enabled'])
-	        				{
-	        				    $disabled = " vsmenudisabled";
-	        				}
+							if (!preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url'])) {
+								$relurl2 = dol_buildpath($val2['url'], 1);
+							} else {
+								$relurl2 = $val2['url'];
+							}
+							$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
+							//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
+							if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php'))) {
+								$relurl2 = '';
+							}
 
-	        				print str_pad('', $val2['level'] + 1);
-	        				print '<li class="lilevel'.($val2['level'] + 1);
-	        				if ($val2['level'] == 0) print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic
-	        				print $disabled.'">'; // ui-btn to highlight on clic
-	        				if ($relurl2)
-	        				{
-	        					if ($val2['enabled'])	// Allowed
-	        					{
-	        						print '<a href="'.$relurl2.'"';
-		        					//print ' data-ajax="false"';
-		        					print '>';
-		        					$lastlevel2[$val2['level']] = 'enabled';
-	        					} else // Not allowed but visible (greyed)
-	        					{
-				        			print '<a href="#" class="vsmenudisabled">';
-				        			$lastlevel2[$val2['level']] = 'greyed';
-	        					}
-	        				} else {
-	        				    if ($val2['enabled'])	// Allowed
-	        				    {
-	        				        $lastlevel2[$val2['level']] = 'enabled';
-	        				    } else {
-	        				        $lastlevel2[$val2['level']] = 'greyed';
-	        				    }
-	        				}
-                            print $val2['titre'];
-	        				if ($relurl2)
-	        				{
-	        					if ($val2['enabled'])	// Allowed
-	        						print '</a>';
-	        					else print '</a>';
-	        				}
-	        				print '</li>'."\n";
-       					}
-       				}
-        			//var_dump($submenu);
-        			print '</ul>';
-        		}
-        		if ($val['enabled'] == 2)
-        		{
-        			print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
-        		}
-        		print '</li>';
-        		print '</ul>'."\n";
-        	}
-        }
+							$disabled = '';
+							if (!$val2['enabled']) {
+								$disabled = " vsmenudisabled";
+							}
 
-        unset($this->menu);
+							print str_pad('', $val2['level'] + 1);
+							print '<li class="lilevel'.($val2['level'] + 1);
+							if ($val2['level'] == 0) {
+								print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic
+							}
+							print $disabled.'">'; // ui-btn to highlight on clic
+							if ($relurl2) {
+								if ($val2['enabled']) {	// Allowed
+									print '<a href="'.$relurl2.'"';
+									//print ' data-ajax="false"';
+									print '>';
+									$lastlevel2[$val2['level']] = 'enabled';
+								} else // Not allowed but visible (greyed)
+								{
+									print '<a href="#" class="vsmenudisabled">';
+									$lastlevel2[$val2['level']] = 'greyed';
+								}
+							} else {
+								if ($val2['enabled']) {	// Allowed
+									$lastlevel2[$val2['level']] = 'enabled';
+								} else {
+									$lastlevel2[$val2['level']] = 'greyed';
+								}
+							}
+							print $val2['titre'];
+							if ($relurl2) {
+								if ($val2['enabled']) {	// Allowed
+									print '</a>';
+								} else {
+									print '</a>';
+								}
+							}
+							print '</li>'."\n";
+						}
+					}
+					//var_dump($submenu);
+					print '</ul>';
+				}
+				if ($val['enabled'] == 2) {
+					print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
+				}
+				print '</li>';
+				print '</ul>'."\n";
+			}
+		}
 
-        //print 'xx'.$mode;
-        return 0;
-    }
+		unset($this->menu);
+
+		//print 'xx'.$mode;
+		return 0;
+	}
 }
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 64145334883..1ab7778bb01 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -26,22 +26,25 @@
 class MenuManager
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $type_user = 0; // Put 0 for internal users, 1 for external users
-    public $atarget = ""; // To store default target to use onto links
+	public $type_user = 0; // Put 0 for internal users, 1 for external users
+	public $atarget = ""; // To store default target to use onto links
+	public $name = "empty";
 
-    public $menu;
-    public $menu_array_after;
+	public $menu;
+	public $menu_array_after;
+
+	public $tabMenu;
 
 
 	/**
 	 *  Constructor
 	 *
 	 *  @param	DoliDB		$db     		Database handler
-     *  @param	int			$type_user		Type of user
+	 *  @param	int			$type_user		Type of user
 	 */
 	public function __construct($db, $type_user)
 	{
@@ -51,24 +54,25 @@ class MenuManager
 
 
 	/**
-   	 * Load this->tabMenu
-   	 *
-   	 * @param	string	$forcemainmenu		To force mainmenu to load
-   	 * @param	string	$forceleftmenu		To force leftmenu to load
-   	 * @return	void
+	 * Load this->tabMenu
+	 *
+	 * @param	string	$forcemainmenu		To force mainmenu to load
+	 * @param	string	$forceleftmenu		To force leftmenu to load
+	 * @return	void
 	 */
 	public function loadMenu($forcemainmenu = '', $forceleftmenu = '')
 	{
 		// Do nothing
+		$this->tabMenu = array();
 	}
 
 
 	/**
 	 *  Show menu
 	 *
-     *	@param	string	$mode			'top', 'left', 'jmobile'
-     *  @param	array	$moredata		An array with more data to output
-     *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
+	 *	@param	string	$mode			'top', 'left', 'jmobile'
+	 *  @param	array	$moredata		An array with more data to output
+	 *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
 	 */
 	public function showmenu($mode, $moredata = null)
 	{
@@ -84,25 +88,24 @@ class MenuManager
 		$noout = 0;
 		//if ($mode == 'jmobile') $noout=1;
 
-		if ($mode == 'topnb')
-		{
-		    return 1;
+		if ($mode == 'topnb') {
+			return 1;
 		}
 
-		if ($mode == 'top')
-		{
-			if (empty($noout)) print_start_menu_array_empty();
+		if ($mode == 'top') {
+			if (empty($noout)) {
+				print_start_menu_array_empty();
+			}
 
-            $usemenuhider = 1;
+			$usemenuhider = 1;
 
 			// Show/Hide vertical menu
-			if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
-			    $showmode = 1;
-			    $classname = 'class="tmenu menuhider"';
-			    $idsel = 'menu';
+			if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+				$showmode = 1;
+				$classname = 'class="tmenu menuhider"';
+				$idsel = 'menu';
 
-			    $this->menu->add('#', '', 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
+				$this->menu->add('#', '', 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
 			}
 
 			// Home
@@ -117,208 +120,214 @@ class MenuManager
 			$this->menu->liste = dol_sort_array($this->menu->liste, 'position');
 
 			// Output menu entries
-			foreach ($this->menu->liste as $menkey => $menuval)
-			{
-			    if (empty($noout)) print_start_menu_entry_empty($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
-			    if (empty($noout)) print_text_menu_entry_empty($menuval['titre'], $menuval['enabled'], ($menuval['url'] != '#' ?DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));
-			    if (empty($noout)) print_end_menu_entry_empty($menuval['enabled']);
+			foreach ($this->menu->liste as $menkey => $menuval) {
+				if (empty($noout)) {
+					print_start_menu_entry_empty($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
+				}
+				if (empty($noout)) {
+					print_text_menu_entry_empty($menuval['titre'], $menuval['enabled'], ($menuval['url'] != '#' ?DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));
+				}
+				if (empty($noout)) {
+					print_end_menu_entry_empty($menuval['enabled']);
+				}
 			}
 
 			$showmode = 1;
-			if (empty($noout)) print_start_menu_entry_empty('', 'class="tmenuend"', $showmode);
-			if (empty($noout)) print_end_menu_entry_empty($showmode);
+			if (empty($noout)) {
+				print_start_menu_entry_empty('', 'class="tmenuend"', $showmode);
+			}
+			if (empty($noout)) {
+				print_end_menu_entry_empty($showmode);
+			}
 
-			if (empty($noout)) print_end_menu_array_empty();
+			if (empty($noout)) {
+				print_end_menu_array_empty();
+			}
 
-			if ($mode == 'jmobile')
-			{
+			if ($mode == 'jmobile') {
 				$this->topmenu = clone $this->menu;
 				unset($this->menu->liste);
 			}
 		}
 
-		if ($mode == 'jmobile')     // Used to get menu in xml ul/li
-		{
-		    // Home
-		    $showmode = 1;
-		    $classname = 'class="tmenusel"';
-		    $idsel = 'home';
+		if ($mode == 'jmobile') {     // Used to get menu in xml ul/li
+			// Home
+			$showmode = 1;
+			$classname = 'class="tmenusel"';
+			$idsel = 'home';
 
-		    $this->menu->add('/index.php', $langs->trans("Home"), 0, $showmode, $this->atarget, 'home', '', 10, $id, $idsel, $classname);
+			$this->menu->add('/index.php', $langs->trans("Home"), 0, $showmode, $this->atarget, 'home', '', 10, $id, $idsel, $classname);
 
-		    $substitarray = getCommonSubstitutionArray($langs, 0, null, null);
+			$substitarray = getCommonSubstitutionArray($langs, 0, null, null);
 
-		    // $this->menu->liste is top menu
-		    //var_dump($this->menu->liste);exit;
-		    $lastlevel = array();
-		    print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
-		    foreach ($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-		    {
-		        print '<ul class="ulmenu" data-inset="true">';
-		        print '<li class="lilevel0">';
+			// $this->menu->liste is top menu
+			//var_dump($this->menu->liste);exit;
+			$lastlevel = array();
+			print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
+			foreach ($this->menu->liste as $key => $val) {		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+				print '<ul class="ulmenu" data-inset="true">';
+				print '<li class="lilevel0">';
 
-		        $val['url'] = make_substitutions($val['url'], $substitarray);
+				$val['url'] = make_substitutions($val['url'], $substitarray);
 
-		        if ($val['enabled'] == 1)
-		        {
-		            $relurl = dol_buildpath($val['url'], 1);
-		            $canonurl = preg_replace('/\?.*$/', '', $val['url']);
+				if ($val['enabled'] == 1) {
+					$relurl = dol_buildpath($val['url'], 1);
+					$canonurl = preg_replace('/\?.*$/', '', $val['url']);
 
-		            print '<a class="alilevel0" href="#">';
+					print '<a class="alilevel0" href="#">';
 
-		            // Add font-awesome
-		            if ($val['level'] == 0 && $val['mainmenu'] == 'home') print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
+					// Add font-awesome
+					if ($val['level'] == 0 && $val['mainmenu'] == 'home') {
+						print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
+					}
 
-		            print $val['titre'];
-		            print '</a>'."\n";
+					print $val['titre'];
+					print '</a>'."\n";
 
-		            // Search submenu fot this mainmenu entry
-		            $tmpmainmenu = $val['mainmenu'];
-		            $tmpleftmenu = 'all';
-		            $submenu = new Menu();
+					// Search submenu fot this mainmenu entry
+					$tmpmainmenu = $val['mainmenu'];
+					$tmpleftmenu = 'all';
+					$submenu = new Menu();
 
-		            $langs->load("admin"); // Load translation file admin.lang
-		            $submenu->add("/admin/index.php?leftmenu=setup", $langs->trans("Setup"), 0);
-		            $submenu->add("/admin/company.php", $langs->trans("MenuCompanySetup"), 1);
-		            $submenu->add("/admin/modules.php", $langs->trans("Modules"), 1);
-		            $submenu->add("/admin/menus.php", $langs->trans("Menus"), 1);
-		            $submenu->add("/admin/ihm.php", $langs->trans("GUISetup"), 1);
-		            $submenu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"), 1);
-		            $submenu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"), 1);
+					$langs->load("admin"); // Load translation file admin.lang
+					$submenu->add("/admin/index.php?leftmenu=setup", $langs->trans("Setup"), 0);
+					$submenu->add("/admin/company.php", $langs->trans("MenuCompanySetup"), 1);
+					$submenu->add("/admin/modules.php", $langs->trans("Modules"), 1);
+					$submenu->add("/admin/menus.php", $langs->trans("Menus"), 1);
+					$submenu->add("/admin/ihm.php", $langs->trans("GUISetup"), 1);
+					$submenu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"), 1);
+					$submenu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"), 1);
 
-		            $submenu->add("/admin/boxes.php", $langs->trans("Boxes"), 1);
-		            $submenu->add("/admin/delais.php", $langs->trans("Alerts"), 1);
-		            $submenu->add("/admin/proxy.php?mainmenu=home", $langs->trans("Security"), 1);
-		            $submenu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"), 1);
-		            $submenu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"), 1);
-		            $submenu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails"), 1);
-		            $submenu->add("/admin/sms.php?mainmenu=home", $langs->trans("SMS"), 1);
-		            $submenu->add("/admin/dict.php?mainmenu=home", $langs->trans("DictionarySetup"), 1);
-		            $submenu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"), 1);
+					$submenu->add("/admin/boxes.php", $langs->trans("Boxes"), 1);
+					$submenu->add("/admin/delais.php", $langs->trans("Alerts"), 1);
+					$submenu->add("/admin/proxy.php?mainmenu=home", $langs->trans("Security"), 1);
+					$submenu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"), 1);
+					$submenu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"), 1);
+					$submenu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails"), 1);
+					$submenu->add("/admin/sms.php?mainmenu=home", $langs->trans("SMS"), 1);
+					$submenu->add("/admin/dict.php?mainmenu=home", $langs->trans("DictionarySetup"), 1);
+					$submenu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"), 1);
 
-		            //if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }
-		            //if ($tmpmainmenu=='accountancy') { var_dump($submenu->liste); exit; }
-		            $nexturl = dol_buildpath($submenu->liste[0]['url'], 1);
+					//if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }
+					//if ($tmpmainmenu=='accountancy') { var_dump($submenu->liste); exit; }
+					$nexturl = dol_buildpath($submenu->liste[0]['url'], 1);
 
-		            $canonrelurl = preg_replace('/\?.*$/', '', $relurl);
-		            $canonnexturl = preg_replace('/\?.*$/', '', $nexturl);
-		            //var_dump($canonrelurl);
-		            //var_dump($canonnexturl);
-		            print '<ul>'."\n";
-		            if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools')))
-		                || (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false))
-		            {
-		                // We add sub entry
-		                print str_pad('', 1).'<li class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
-		                print '<a href="'.$relurl.'">';
-		                if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation
-		                {
-		                    if (in_array($val['mainmenu'], array('cashdesk', 'websites'))) print $langs->trans("Access");
-		                    else print $langs->trans("Dashboard");
-		                } else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
-		                print '</a>';
-		                print '</li>'."\n";
-		            }
+					$canonrelurl = preg_replace('/\?.*$/', '', $relurl);
+					$canonnexturl = preg_replace('/\?.*$/', '', $nexturl);
+					//var_dump($canonrelurl);
+					//var_dump($canonnexturl);
+					print '<ul>'."\n";
+					if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools')))
+						|| (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false)) {
+						// We add sub entry
+						print str_pad('', 1).'<li class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
+						print '<a href="'.$relurl.'">';
+						if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard") {  // No translation
+							if (in_array($val['mainmenu'], array('cashdesk', 'websites'))) {
+								print $langs->trans("Access");
+							} else {
+								print $langs->trans("Dashboard");
+							}
+						} else {
+							print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
+						}
+						print '</a>';
+						print '</li>'."\n";
+					}
 
-		            if ($val['level'] == 0)
-		            {
-		                if ($val['enabled'])
-		                {
-		                    $lastlevel[0] = 'enabled';
-		                } elseif ($showmenu)                 // Not enabled but visible (so greyed)
-		                {
-		                    $lastlevel[0] = 'greyed';
-		                } else {
-		                    $lastlevel[0] = 'hidden';
-		                }
-		            }
+					if ($val['level'] == 0) {
+						if ($val['enabled']) {
+							$lastlevel[0] = 'enabled';
+						} elseif ($showmenu) {                 // Not enabled but visible (so greyed)
+							$lastlevel[0] = 'greyed';
+						} else {
+							$lastlevel[0] = 'hidden';
+						}
+					}
 
-		            $lastlevel2 = array();
-		            foreach ($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-		            {
-		                $showmenu = true;
-		                if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu = false;
+					$lastlevel2 = array();
+					foreach ($submenu->liste as $key2 => $val2) {		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+						$showmenu = true;
+						if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) {
+							$showmenu = false;
+						}
 
-		                // If at least one parent is not enabled, we do not show any menu of all children
-		                if ($val2['level'] > 0)
-		                {
-		                    $levelcursor = $val2['level'] - 1;
-		                    while ($levelcursor >= 0)
-		                    {
-		                        if ($lastlevel2[$levelcursor] != 'enabled') $showmenu = false;
-		                        $levelcursor--;
-		                    }
-		                }
+						// If at least one parent is not enabled, we do not show any menu of all children
+						if ($val2['level'] > 0) {
+							$levelcursor = $val2['level'] - 1;
+							while ($levelcursor >= 0) {
+								if ($lastlevel2[$levelcursor] != 'enabled') {
+									$showmenu = false;
+								}
+								$levelcursor--;
+							}
+						}
 
-		                if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)
-		                {
-		                	$val2['url'] = make_substitutions($val2['url'], $substitarray);
+						if ($showmenu) {		// Visible (option to hide when not allowed is off or allowed)
+							$val2['url'] = make_substitutions($val2['url'], $substitarray);
 
-		                    $relurl2 = dol_buildpath($val2['url'], 1);
-		                    $canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
-		                    //var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
-		                    if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php'))) $relurl2 = '';
+							$relurl2 = dol_buildpath($val2['url'], 1);
+							$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
+							//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
+							if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php'))) {
+								$relurl2 = '';
+							}
 
-		                    $disabled = '';
-		                    if (!$val2['enabled'])
-		                    {
-		                        $disabled = " vsmenudisabled";
-		                    }
+							$disabled = '';
+							if (!$val2['enabled']) {
+								$disabled = " vsmenudisabled";
+							}
 
-		                    print str_pad('', $val2['level'] + 1);
-		                    print '<li class="lilevel'.($val2['level'] + 1);
-		                    if ($val2['level'] == 0) print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic
-		                    print $disabled.'">'; // ui-btn to highlight on clic
-		                    if ($relurl2)
-		                    {
-		                        if ($val2['enabled'])	// Allowed
-		                        {
-		                            print '<a href="'.$relurl2.'"';
-		                            //print ' data-ajax="false"';
-		                            print '>';
-		                            $lastlevel2[$val2['level']] = 'enabled';
-		                        } else // Not allowed but visible (greyed)
-		                        {
-		                            print '<a href="#" class="vsmenudisabled">';
-		                            $lastlevel2[$val2['level']] = 'greyed';
-		                        }
-		                    } else {
-		                        if ($val2['enabled'])	// Allowed
-		                        {
-		                            $lastlevel2[$val2['level']] = 'enabled';
-		                        } else {
-		                            $lastlevel2[$val2['level']] = 'greyed';
-		                        }
-		                    }
-		                    //var_dump($val2['level']);
-		                    //var_dump($lastlevel2);
-		                    print $val2['titre'];
-		                    if ($relurl2)
-		                    {
-		                        if ($val2['enabled']) {
-                                    // Allowed
-                                    print '</a>';
-                                } else {
-                                    print '</a>';
-                                }
-		                    }
-		                    print '</li>'."\n";
-		                }
-		            }
-		            //var_dump($submenu);
-		            print '</ul>';
-		        }
-		        if ($val['enabled'] == 2)
-		        {
-		            print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
-		        }
-		        print '</li>';
-		        print '</ul>'."\n";
-		    }
+							print str_pad('', $val2['level'] + 1);
+							print '<li class="lilevel'.($val2['level'] + 1);
+							if ($val2['level'] == 0) {
+								print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic
+							}
+							print $disabled.'">'; // ui-btn to highlight on clic
+							if ($relurl2) {
+								if ($val2['enabled']) {	// Allowed
+									print '<a href="'.$relurl2.'"';
+									//print ' data-ajax="false"';
+									print '>';
+									$lastlevel2[$val2['level']] = 'enabled';
+								} else // Not allowed but visible (greyed)
+								{
+									print '<a href="#" class="vsmenudisabled">';
+									$lastlevel2[$val2['level']] = 'greyed';
+								}
+							} else {
+								if ($val2['enabled']) {	// Allowed
+									$lastlevel2[$val2['level']] = 'enabled';
+								} else {
+									$lastlevel2[$val2['level']] = 'greyed';
+								}
+							}
+							//var_dump($val2['level']);
+							//var_dump($lastlevel2);
+							print $val2['titre'];
+							if ($relurl2) {
+								if ($val2['enabled']) {
+									// Allowed
+									print '</a>';
+								} else {
+									print '</a>';
+								}
+							}
+							print '</li>'."\n";
+						}
+					}
+					//var_dump($submenu);
+					print '</ul>';
+				}
+				if ($val['enabled'] == 2) {
+					print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
+				}
+				print '</li>';
+				print '</ul>'."\n";
+			}
 		}
 
-		if ($mode == 'left')
-		{
+		if ($mode == 'left') {
 			// Put here left menu entries
 			// ***** START *****
 
@@ -331,7 +340,7 @@ class MenuManager
 			$this->menu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"), 1);
 			$this->menu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"), 1);
 
-		    $this->menu->add("/admin/boxes.php", $langs->trans("Boxes"), 1);
+			$this->menu->add("/admin/boxes.php", $langs->trans("Boxes"), 1);
 			$this->menu->add("/admin/delais.php", $langs->trans("Alerts"), 1);
 			$this->menu->add("/admin/proxy.php?mainmenu=home", $langs->trans("Security"), 1);
 			$this->menu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"), 1);
@@ -343,28 +352,40 @@ class MenuManager
 
 			// ***** END *****
 
+			$menu_array_before = array();
+			$menu_array_after = array();
+
 			// do not change code after this
 
-			if (empty($noout))
-			{
+			$menu_array = $this->menu->liste;
+			if (is_array($menu_array_before)) {
+				$menu_array = array_merge($menu_array_before, $menu_array);
+			}
+			if (is_array($menu_array_after)) {
+				$menu_array = array_merge($menu_array, $menu_array_after);
+			}
+			//var_dump($menu_array);exit;
+			if (!is_array($menu_array)) {
+				return 0;
+			}
+
+			if (empty($noout)) {
 				$alt = 0; $altok = 0; $blockvmenuopened = false;
-				$num = count($this->menu->liste);
-				for ($i = 0; $i < $num; $i++)
-				{
+				$num = count($menu_array);
+				for ($i = 0; $i < $num; $i++) {
 					$alt++;
-					if (empty($this->menu->liste[$i]['level']))
-					{
-			    		$altok++;
-    					$blockvmenuopened = true;
+					if (empty($menu_array[$i]['level'])) {
+						$altok++;
+						$blockvmenuopened = true;
 						$lastopened = true;
-        				for ($j = ($i + 1); $j < $num; $j++)
-        				{
-        				    if (empty($menu_array[$j]['level'])) $lastopened = false;
-        				}
-        				$alt = 0; // For menu manager "empty", we force to not have blockvmenufirst defined
-        				$lastopened = 1; // For menu manager "empty", we force to not have blockvmenulast defined
-						if (($alt % 2 == 0))
-						{
+						for ($j = ($i + 1); $j < $num; $j++) {
+							if (empty($menu_array[$j]['level'])) {
+								$lastopened = false;
+							}
+						}
+						$alt = 0; // For menu manager "empty", we force to not have blockvmenufirst defined
+						$lastopened = 1; // For menu manager "empty", we force to not have blockvmenulast defined
+						if (($alt % 2 == 0)) {
 							print '<div class="blockvmenub lockvmenuimpair blockvmenuunique'.($lastopened ? ' blockvmenulast' : '').($alt == 1 ? ' blockvmenufirst' : '').'">'."\n";
 						} else {
 							print '<div class="blockvmenu blockvmenupair blockvmenuunique'.($lastopened ? ' blockvmenulast' : '').($alt == 1 ? ' blockvmenufirst' : '').'">'."\n";
@@ -373,122 +394,70 @@ class MenuManager
 
 					// Add tabulation
 					$tabstring = '';
-					$tabul = ($this->menu->liste[$i]['level'] - 1);
-					if ($tabul > 0)
-					{
-						for ($j = 0; $j < $tabul; $j++)
-						{
+					$tabul = ($menu_array[$i]['level'] - 1);
+					if ($tabul > 0) {
+						for ($j = 0; $j < $tabul; $j++) {
 							$tabstring .= '&nbsp; &nbsp;';
 						}
 					}
 
-					if ($this->menu->liste[$i]['level'] == 0) {
-						if ($this->menu->liste[$i]['enabled'])
-						{
-							print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.dol_buildpath($this->menu->liste[$i]['url'], 1).'"'.($this->menu->liste[$i]['target'] ? ' target="'.$this->menu->liste[$i]['target'].'"' : '').'>'.$this->menu->liste[$i]['titre'].'</a></div>'."\n";
+					if ($menu_array[$i]['level'] == 0) {
+						if ($menu_array[$i]['enabled']) {
+							print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.dol_buildpath($menu_array[$i]['url'], 1).'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>'.$menu_array[$i]['titre'].'</a></div>'."\n";
 						} else {
-							print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$this->menu->liste[$i]['titre'].'</font></div>'."\n";
+							print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
 						}
 						print '<div class="menu_top"></div>'."\n";
 					}
 
-					if ($this->menu->liste[$i]['level'] > 0)
-					{
-        				$cssmenu = '';
-        				if ($this->menu->liste[$i]['url']) $cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $this->menu->liste[$i]['url']));
+					if ($menu_array[$i]['level'] > 0) {
+						$cssmenu = '';
+						if ($menu_array[$i]['url']) {
+							$cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $menu_array[$i]['url']));
+						}
 
-					    print '<div class="menu_contenu'.$cssmenu.'">';
+						print '<div class="menu_contenu'.$cssmenu.'">';
 
-						if ($this->menu->liste[$i]['enabled'])
-						{
+						if ($menu_array[$i]['enabled']) {
 							print $tabstring;
-							if ($this->menu->liste[$i]['url']) print '<a class="vsmenu" href="'.dol_buildpath($this->menu->liste[$i]['url'], 1).'"'.($this->menu->liste[$i]['target'] ? ' target="'.$this->menu->liste[$i]['target'].'"' : '').'>';
-							else print '<span class="vsmenu">';
-							if ($this->menu->liste[$i]['url']) print $this->menu->liste[$i]['titre'].'</a>';
-							else print '</span>';
+							if ($menu_array[$i]['url']) {
+								print '<a class="vsmenu"  itle="'.dol_escape_htmltag($menu_array[$i]['titre']).'" href="'.dol_buildpath($menu_array[$i]['url'], 1).'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';
+							} else {
+								print '<span class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'">';
+							}
+							if ($menu_array[$i]['url']) {
+								print $menu_array[$i]['titre'].'</a>';
+							} else {
+								print '</span>';
+							}
 						} else {
-							print $tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$this->menu->liste[$i]['titre'].'</font>';
+							print $tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font>';
 						}
 
 						// If title is not pure text and contains a table, no carriage return added
-						if (!strstr($this->menu->liste[$i]['titre'], '<table')) print '<br>';
+						if (!strstr($menu_array[$i]['titre'], '<table')) {
+							print '<br>';
+						}
 						print '</div>'."\n";
 					}
 
 					// If next is a new block or end
-					if (empty($this->menu->liste[$i + 1]['level']))
-					{
+					if (empty($menu_array[$i + 1]['level'])) {
 						print '<div class="menu_end"></div>'."\n";
 						print "</div>\n";
 					}
 				}
 
-				if ($altok) print '<div class="blockvmenuend"></div>';
+				if ($altok) {
+					print '<div class="blockvmenuend"></div>';
+				}
 			}
 
-			if ($mode == 'jmobile')
-			{
+			if ($mode == 'jmobile') {
 				$this->leftmenu = clone $this->menu;
-				unset($this->menu->liste);
+				unset($menu_array);
 			}
 		}
-        /*
-		if ($mode == 'jmobile')
-		{
-			$substitarray = getCommonSubstitutionArray($langs, 0, null, null);
-
-			foreach($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-			{
-				print '<ul class="ulmenu" data-inset="true">';
-				print '<li class="lilevel0">';
-
-		        $val['url'] = make_substitutions($val['url'], $substitarray);
-
-				if ($val['enabled'] == 1)
-				{
-					$relurl=dol_buildpath($val['url'],1);
-
-					print '<a href="#">'.$val['titre'].'</a>'."\n";
-					// Search submenu fot this entry
-					$tmpmainmenu=$val['mainmenu'];
-					$tmpleftmenu='all';
-					//$submenu=new Menu();
-					//$res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$submenu,1,$tmpmainmenu,$tmpleftmenu);
-					//$nexturl=dol_buildpath($submenu->liste[0]['url'],1);
-					$submenu=$this->leftmenu;
-
-					$canonrelurl=preg_replace('/\?.*$/','',$relurl);
-					$canonnexturl=preg_replace('/\?.*$/','',$nexturl);
-					//var_dump($canonrelurl);
-					//var_dump($canonnexturl);
-					print '<ul>';
-        			if ($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('home','tools')))
-					{
-						// We add sub entry
-						print '<li><a href="'.$relurl.'">'.$langs->trans("MainArea").'-'.$val['titre'].'</a></li>'."\n";
-					}
-					foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-					{
-	                	$val2['url'] = make_substitutions($val2['url'], $substitarray);
-
-						$relurl2=dol_buildpath($val2['url'],1);
-						//var_dump($val2);
-						print '<li><a href="'.$relurl2.'">'.$val2['titre'].'</a></li>'."\n";
-					}
-					//var_dump($submenu);
-					print '</ul>';
-				}
-				if ($val['enabled'] == 2)
-				{
-					print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
-				}
-				print '</li>';
-				print '</ul>'."\n";
-
-				break;	// Only first menu entry (so home)
-			}
-		}
-        */
 		unset($this->menu);
 
 		return $res;
@@ -503,7 +472,7 @@ class MenuManager
  */
 function print_start_menu_array_empty()
 {
-    global $conf;
+	global $conf;
 
 	print '<div class="tmenudiv">';
 	print '<ul role="navigation" class="tmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Top menu"').'>';
@@ -519,8 +488,7 @@ function print_start_menu_array_empty()
  */
 function print_start_menu_entry_empty($idsel, $classname, $showmode)
 {
-	if ($showmode)
-	{
+	if ($showmode) {
 		print '<li '.$classname.' id="mainmenutd_'.$idsel.'">';
 		//print '<div class="tmenuleft tmenusep"></div>';
 		print '<div class="tmenucenter">';
@@ -543,8 +511,7 @@ function print_text_menu_entry_empty($text, $showmode, $url, $id, $idsel, $class
 {
 	global $conf, $langs;
 
-	if ($showmode == 1)
-	{
+	if ($showmode == 1) {
 		print '<a class="tmenuimage" tabindex="-1" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').'>';
 		print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
 		print '</a>';
@@ -554,8 +521,7 @@ function print_text_menu_entry_empty($text, $showmode, $url, $id, $idsel, $class
 		print '</span>';
 		print '</a>';
 	}
-	if ($showmode == 2)
-	{
+	if ($showmode == 2) {
 		print '<div class="'.$id.' '.$idsel.' tmenudisabled"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
 		print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
 	}
@@ -569,8 +535,7 @@ function print_text_menu_entry_empty($text, $showmode, $url, $id, $idsel, $class
  */
 function print_end_menu_entry_empty($showmode)
 {
-	if ($showmode)
-	{
+	if ($showmode) {
 		print '</div></li>';
 		print "\n";
 	}
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 69fce65f781..510ec8ef55a 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -1250,12 +1250,13 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 				//print "Remove box ".$file.'<br>';
 				if ($file == 'box_graph_product_distribution.php') {
 					if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
-						dol_syslog("We discard disabling of module ".$file." because another module still active require it.");
+						dol_syslog("We discard deleting module ".$file." because another module still active requires it.");
 						continue;
 					}
 				}
 
-				if (empty($file)) { $file = isset($this->boxes[$key][1]) ? $this->boxes[$key][1] : ''; // For backward compatibility
+				if (empty($file)) {
+					$file = isset($this->boxes[$key][1]) ? $this->boxes[$key][1] : ''; // For backward compatibility
 				}
 
 				if ($this->db->type == 'sqlite3') {
@@ -1284,7 +1285,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def";
 				$sql .= " WHERE file = '".$this->db->escape($file)."'";
-				$sql .= " AND entity = ".$conf->entity;
+				$sql .= " AND entity = ".$conf->entity;		// Do not use getEntity here, we want to delete only in current company
 
 				dol_syslog(get_class($this)."::delete_boxes", LOG_DEBUG);
 				$resql = $this->db->query($sql);
@@ -1679,13 +1680,12 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 					$r_id       = $this->rights[$key][0];
 					$r_desc     = $this->rights[$key][1];
 					$r_type     = isset($this->rights[$key][2]) ? $this->rights[$key][2] : '';
-					$r_def      = $this->rights[$key][3];
+					$r_def      = empty($this->rights[$key][3]) ? 0 : $this->rights[$key][3];
 					$r_perms    = $this->rights[$key][4];
 					$r_subperms = isset($this->rights[$key][5]) ? $this->rights[$key][5] : '';
 					$r_modul = empty($this->rights_class) ?strtolower($this->name) : $this->rights_class;
 
 					if (empty($r_type)) { $r_type = 'w'; }
-					if (empty($r_def)) { $r_def = 0; }
 
 					// Search if perm already present
 					$sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."rights_def";
diff --git a/htdocs/core/modules/action/modules_action.php b/htdocs/core/modules/action/modules_action.php
index 27260748662..cb57315322f 100644
--- a/htdocs/core/modules/action/modules_action.php
+++ b/htdocs/core/modules/action/modules_action.php
@@ -28,32 +28,32 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
  */
 abstract class ModeleAction extends CommonDocGenerator
 {
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return list of active generation modules
-     *
-     * 	@param	DoliDB		$db					Database handler
-     *  @param	integer		$maxfilenamelength  Max length of value to show
-     * 	@return	array							List of templates
-     */
-    public static function liste_modeles($db, $maxfilenamelength = 0)
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return list of active generation modules
+	 *
+	 * 	@param	DoliDB		$db					Database handler
+	 *  @param	integer		$maxfilenamelength  Max length of value to show
+	 * 	@return	array							List of templates
+	 */
+	public static function liste_modeles($db, $maxfilenamelength = 0)
+	{
+		// phpcs:enable
+		global $conf;
 
-        $type = 'action';
-        $list = array();
+		$type = 'action';
+		$list = array();
 
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-        $list = getListOfModels($db, $type, $maxfilenamelength);
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$list = getListOfModels($db, $type, $maxfilenamelength);
 
-        return $list;
-    }
+		return $list;
+	}
 }
 
 // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -71,7 +71,7 @@ abstract class ModeleAction extends CommonDocGenerator
  */
 function action_create($db, $object, $modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 {
-    // phpcs:enable
+	// phpcs:enable
 	global $conf, $langs, $user;
 	$langs->load("action");
 
@@ -92,11 +92,11 @@ function action_create($db, $object, $modele, $outputlangs, $hidedetails = 0, $h
 
 	// If selected modele is a filename template (then $modele="modelname:filename")
 	$tmp = explode(':', $modele, 2);
-    if (!empty($tmp[1]))
-    {
-        $modele = $tmp[0];
-        $srctemplatepath = $tmp[1];
-    }
+	if (!empty($tmp[1]))
+	{
+		$modele = $tmp[0];
+		$srctemplatepath = $tmp[1];
+	}
 
 	// Search template files
 	$file = ''; $classname = ''; $filefound = 0;
@@ -104,21 +104,21 @@ function action_create($db, $object, $modele, $outputlangs, $hidedetails = 0, $h
 	if (is_array($conf->modules_parts['models'])) $dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir)
 	{
-    	foreach (array('doc', 'pdf') as $prefix)
-    	{
-    	    $file = $prefix."_".$modele.".modules.php";
+		foreach (array('doc', 'pdf') as $prefix)
+		{
+			$file = $prefix."_".$modele.".modules.php";
 
-    		// On verifie l'emplacement du modele
-	        $file = dol_buildpath($reldir."core/modules/action/doc/".$file, 0);
-    		if (file_exists($file))
-    		{
-    			$filefound = 1;
-    			$classname = $prefix.'_'.$modele;
-    			break;
-    		}
-    	}
-    	if ($filefound) break;
-    }
+			// On verifie l'emplacement du modele
+			$file = dol_buildpath($reldir."core/modules/action/doc/".$file, 0);
+			if (file_exists($file))
+			{
+				$filefound = 1;
+				$classname = $prefix.'_'.$modele;
+				break;
+			}
+		}
+		if ($filefound) break;
+	}
 
 	// Charge le modele
 	if ($filefound)
diff --git a/htdocs/core/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.pdf.php
index 0b489e7202c..43df3d227b9 100644
--- a/htdocs/core/modules/action/rapport.pdf.php
+++ b/htdocs/core/modules/action/rapport.pdf.php
@@ -36,9 +36,9 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 class CommActionRapport
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string description
@@ -76,7 +76,7 @@ class CommActionRapport
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("commercial", "projects"));
+		$langs->loadLangs(array("commercial", "projects"));
 
 		$this->db = $db;
 		$this->description = "";
@@ -95,22 +95,22 @@ class CommActionRapport
 		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
 		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-        $this->title = $langs->transnoentitiesnoconv("ActionsReport").' '.$this->year."-".$this->month;
-        $this->subject = $langs->transnoentitiesnoconv("ActionsReport").' '.$this->year."-".$this->month;
+		$this->title = $langs->transnoentitiesnoconv("ActionsReport").' '.$this->year."-".$this->month;
+		$this->subject = $langs->transnoentitiesnoconv("ActionsReport").' '.$this->year."-".$this->month;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *      Write the object to document file to disk
-     *
-     *      @param	int			$socid			Thirdparty id
-     *      @param  int			$catid			Cat id
-     *      @param  Translate	$outputlangs    Lang object for output language
-     *      @return int             			1=OK, 0=KO
-     */
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *      Write the object to document file to disk
+	 *
+	 *      @param	int			$socid			Thirdparty id
+	 *      @param  int			$catid			Cat id
+	 *      @param  Translate	$outputlangs    Lang object for output language
+	 *      @return int             			1=OK, 0=KO
+	 */
 	public function write_file($socid = 0, $catid = 0, $outputlangs = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $conf, $langs, $hookmanager;
 
 		if (!is_object($outputlangs)) $outputlangs = $langs;
@@ -120,7 +120,7 @@ class CommActionRapport
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products"));
 
-        $dir = $conf->agenda->dir_temp."/";
+		$dir = $conf->agenda->dir_temp."/";
 		$file = $dir."actions-".$this->month."-".$this->year.".pdf";
 
 		if (!file_exists($dir))
@@ -148,18 +148,18 @@ class CommActionRapport
 			$parameters = array('file'=>$file, 'outputlangs'=>$outputlangs);
 			$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-            $pdf = pdf_getInstance($this->format);
-            $heightforinfotot = 50; // Height reserved to output the info and total part
-            $heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
-            $heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-            $pdf->SetAutoPageBreak(1, 0);
+			$pdf = pdf_getInstance($this->format);
+			$heightforinfotot = 50; // Height reserved to output the info and total part
+			$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+			$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
+			$pdf->SetAutoPageBreak(1, 0);
 
-            if (class_exists('TCPDF'))
-            {
-                $pdf->setPrintHeader(false);
-                $pdf->setPrintFooter(false);
-            }
-            $pdf->SetFont(pdf_getPDFFont($outputlangs));
+			if (class_exists('TCPDF'))
+			{
+				$pdf->setPrintHeader(false);
+				$pdf->setPrintFooter(false);
+			}
+			$pdf->SetFont(pdf_getPDFFont($outputlangs));
 
 			$pdf->Open();
 			$pagenb = 0;
@@ -193,8 +193,8 @@ class CommActionRapport
 			$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 			if ($reshook < 0)
 			{
-			    $this->error = $hookmanager->error;
-			    $this->errors = $hookmanager->errors;
+				$this->error = $hookmanager->error;
+				$this->errors = $hookmanager->errors;
 			}
 
 			if (!empty($conf->global->MAIN_UMASK))
@@ -210,7 +210,7 @@ class CommActionRapport
 	 * Write content of pages
 	 *
 	 * @param   PDF			$pdf			Object pdf
-     * @param	Translate   $outputlangs	Object langs
+	 * @param	Translate   $outputlangs	Object langs
 	 * @return  int							1
 	 */
 	private function _pages(&$pdf, $outputlangs)
@@ -230,7 +230,7 @@ class CommActionRapport
 		$sql .= " c.code, c.libelle,";
 		$sql .= " u.login";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."actioncomm as a";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
 		$sql .= " WHERE c.id=a.fk_action AND a.fk_user_author = u.rowid";
 		$sql .= " AND a.datep BETWEEN '".$this->db->idate(dol_get_first_day($this->year, $this->month, false))."'";
 		$sql .= " AND '".$this->db->idate(dol_get_last_day($this->year, $this->month, false))."'";
@@ -353,12 +353,12 @@ class CommActionRapport
 		$pdf->SetFont('', 'B', 10);
 		$pdf->SetXY($this->marge_gauche, $this->marge_haute);
 		$pdf->MultiCell(120, 1, $outputlangs->convToOutputCharset($this->title), 0, 'L', 0);
-        // Show page nb only on iso languages (so default Helvetica font)
-        if (pdf_getPDFFont($outputlangs) == 'Helvetica')
-        {
-		    $pdf->SetXY($this->page_largeur - $this->marge_droite - 40, $this->marge_haute);
-            $pdf->MultiCell(40, 1, $pagenb.'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
-        }
+		// Show page nb only on iso languages (so default Helvetica font)
+		if (pdf_getPDFFont($outputlangs) == 'Helvetica')
+		{
+			$pdf->SetXY($this->page_largeur - $this->marge_droite - 40, $this->marge_haute);
+			$pdf->MultiCell(40, 1, $pagenb.'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
+		}
 
 		$y = $pdf->GetY() + 2;
 
diff --git a/htdocs/core/modules/bank/doc/pdf_ban.modules.php b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
index 27b40d48257..e4531140f8f 100644
--- a/htdocs/core/modules/bank/doc/pdf_ban.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
@@ -93,7 +93,7 @@ class pdf_ban extends ModeleBankAccountDoc
 	/**
 	 *	Fonction generant le projet sur le disque
 	 *
-	 *	@param	Project		$object   		Object project a generer
+	 *	@param	Account		$object   		Object Account to generate
 	 *	@param	Translate	$outputlangs	Lang output object
 	 *	@return	int         				1 if OK, <=0 if KO
 	 */
@@ -114,8 +114,7 @@ class pdf_ban extends ModeleBankAccountDoc
 			//$nblines = count($object->lines);  // This is set later with array of tasks
 
 			// Definition of $dir and $file
-			if ($object->specimen)
-			{
+			if ($object->specimen) {
 				$dir = $conf->bank->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
@@ -151,7 +150,7 @@ class pdf_ban extends ModeleBankAccountDoc
 				$heightforinfotot = 50; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
 				$pdf->SetAutoPageBreak(1, 0);
 
 				if (class_exists('TCPDF'))
@@ -262,7 +261,7 @@ class pdf_ban extends ModeleBankAccountDoc
 			}
 		}
 
-		$this->error = $langs->transnoentities("ErrorConstantNotDefined", "LIVRAISON_OUTPUTDIR");
+		$this->error = $langs->transnoentities("ErrorConstantNotDefined", "DELIVERY_OUTPUTDIR");
 		return 0;
 	}
 
@@ -293,7 +292,7 @@ class pdf_ban extends ModeleBankAccountDoc
 	 *  Show top header of page.
 	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
-	 *  @param  Project		$object     	Object to show
+	 *  @param  Account		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
@@ -378,7 +377,7 @@ class pdf_ban extends ModeleBankAccountDoc
 	 *   	Show footer of page. Need this->emetteur object
 	 *
 	 *   	@param	TCPDF		$pdf     			PDF
-	 * 		@param	Project		$object				Object to show
+	 * 		@param	Account		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	integer
@@ -388,7 +387,7 @@ class pdf_ban extends ModeleBankAccountDoc
 		// phpcs:enable
 		global $conf;
 
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		//return pdf_pagefoot($pdf,$outputlangs,'BANK_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
 }
diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index b6e4cbc191a..a07592d339a 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -90,16 +90,16 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Fonction generant le projet sur le disque
+	 *  Function to create pdf of company bank account sepa mandate
 	 *
-	 *	@param	    Project		$object   		    Object project a generer
-	 *	@param	    Translate	$outputlangs	    Lang output object
-	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
-	 *  @param		int			$hidedetails		Do not show line details (not used for this template)
-	 *  @param		int			$hidedesc			Do not show desc (not used for this template)
-	 *  @param		int			$hideref			Do not show ref (not used for this template)
-	 *  @param      null|array  $moreparams         More parameters
-	 *	@return	    int         				    1 if OK, <=0 if KO
+	 *	@param	CompanyBankAccount	$object   		    Object bank account to generate document for
+	 *	@param	Translate			$outputlangs	    Lang output object
+	 *  @param	string				$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param	int					$hidedetails		Do not show line details (not used for this template)
+	 *  @param	int					$hidedesc			Do not show desc (not used for this template)
+	 *  @param	int					$hideref			Do not show ref (not used for this template)
+	 *  @param  null|array  		$moreparams         More parameters
+	 *	@return	int         				    		1 if OK, <=0 if KO
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
@@ -157,7 +157,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$heightforinfotot = 50; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
 				$pdf->SetAutoPageBreak(1, 0);
 
 				if (class_exists('TCPDF'))
@@ -415,7 +415,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 			}
 		}
 
-		$this->error = $langs->transnoentities("ErrorConstantNotDefined", "LIVRAISON_OUTPUTDIR");
+		$this->error = $langs->transnoentities("ErrorConstantNotDefined", "DELIVERY_OUTPUTDIR");
 		return 0;
 	}
 
@@ -447,10 +447,10 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 	/**
 	 *   Show miscellaneous information (payment mode, payment term, ...)
 	 *
-	 *   @param		TCPDF		$pdf     		Object PDF
-	 *   @param		Object		$object			Object to show
-	 *   @param		int			$posy			Y
-	 *   @param		Translate	$outputlangs	Langs object
+	 *   @param		TCPDF				$pdf     		Object PDF
+	 *   @param		CompanyBankAccount	$object			Object to show
+	 *   @param		int					$posy			Y
+	 *   @param		Translate			$outputlangs	Langs object
 	 *   @return	void
 	 */
 	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
@@ -485,11 +485,11 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 	/**
 	 *	Show area for the customer to sign
 	 *
-	 *	@param	TCPDF		$pdf           Object PDF
-	 *	@param  Facture		$object         Object invoice
-	 *	@param	int			$posy			Position depart
-	 *	@param	Translate	$outputlangs	Objet langs
-	 *	@return int							Position pour suite
+	 *	@param	TCPDF				$pdf           	Object PDF
+	 *	@param  CompanyBankAccount	$object         Object invoice
+	 *	@param	int					$posy			Position depart
+	 *	@param	Translate			$outputlangs	Objet langs
+	 *	@return int									Position pour suite
 	 */
 	protected function _signature_area(&$pdf, $object, $posy, $outputlangs)
 	{
@@ -527,10 +527,10 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	TCPDF		$pdf     		Object PDF
-	 *  @param  Project		$object     	Object to show
-	 *  @param  int	    	$showaddress    0=no, 1=yes
-	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @param	TCPDF				$pdf     		Object PDF
+	 *  @param  CompanyBankAccount	$object     	Object to show
+	 *  @param  int	    			$showaddress    0=no, 1=yes
+	 *  @param  Translate			$outputlangs	Object lang for output
 	 *  @return	void
 	 */
 	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
@@ -615,20 +615,20 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
-	 *   	Show footer of page. Need this->emetteur object
+	 *	Show footer of page. Need this->emetteur object
 	 *
-	 *   	@param	TCPDF		$pdf     			PDF
-	 * 		@param	Project		$object				Object to show
-	 *      @param	Translate	$outputlangs		Object lang for output
-	 *      @param	int			$hidefreetext		1=Hide free text
-	 *      @return	integer
+	 *	@param	TCPDF				$pdf     			PDF
+	 * 	@param	CompanyBankAccount	$object				Object to show
+	 * 	@param	Translate			$outputlangs		Object lang for output
+	 *	@param	int					$hidefreetext		1=Hide free text
+	 *	@return	integer
 	 */
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		// phpcs:enable
 		global $conf;
 
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'PAYMENTORDER_FREE_TEXT', null, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 }
diff --git a/htdocs/core/modules/bank/modules_bank.php b/htdocs/core/modules/bank/modules_bank.php
index ac03fa3d6fa..70f6717d0c7 100644
--- a/htdocs/core/modules/bank/modules_bank.php
+++ b/htdocs/core/modules/bank/modules_bank.php
@@ -37,17 +37,17 @@ abstract class ModeleBankAccountDoc extends CommonDocGenerator
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of active generation modules
 	 *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
-     */
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
+	 */
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'bankaccount';
diff --git a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
index a39e18f4cfb..34ebc518e56 100644
--- a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
+++ b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
@@ -33,9 +33,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/barcode.lib.php'; // This is to includ
 class modPhpbarcode extends ModeleBarCode
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -93,7 +93,7 @@ class modPhpbarcode extends ModeleBarCode
 	public function encodingIsSupported($encoding)
 	{
 		global $genbarcode_loc;
-        //print 'genbarcode_loc='.$genbarcode_loc.' encoding='.$encoding;exit;
+		//print 'genbarcode_loc='.$genbarcode_loc.' encoding='.$encoding;exit;
 
 		$supported = 0;
 		if ($encoding == 'EAN13') $supported = 1;
@@ -109,7 +109,7 @@ class modPhpbarcode extends ModeleBarCode
 		return $supported;
 	}
 
-    /**
+	/**
 	 *	Return an image file on the fly (no need to write on disk)
 	 *
 	 *	@param	string   	$code			  Value to encode
@@ -118,8 +118,8 @@ class modPhpbarcode extends ModeleBarCode
 	 *	@param	integer		$scale			  Scale
 	 *  @param  integer     $nooutputiferror  No output if error
 	 *	@return	int							  <0 if KO, >0 if OK
-     */
-    public function buildBarCode($code, $encoding, $readable = 'Y', $scale = 1, $nooutputiferror = 0)
+	 */
+	public function buildBarCode($code, $encoding, $readable = 'Y', $scale = 1, $nooutputiferror = 0)
 	{
 		global $_GET, $_SERVER;
 		global $conf;
diff --git a/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php b/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
index d87f39598c6..d13fe589883 100644
--- a/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
+++ b/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
@@ -32,9 +32,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/barcode.lib.php'; // This is to includ
 class modTcpdfbarcode extends ModeleBarCode
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index 5d43609e7de..3f18d536122 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -44,9 +44,9 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 	public $code_null; // Optional code
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -232,7 +232,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return if a code is used (by other element)
 	 *
@@ -243,7 +243,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 	 */
 	public function verif_dispo($db, $code, $product)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "SELECT barcode FROM ".MAIN_DB_PREFIX."product";
 		$sql .= " WHERE barcode = '".$db->escape($code)."'";
 		if ($product->id > 0) $sql .= " AND rowid <> ".$product->id;
@@ -262,17 +262,17 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return if a barcode value match syntax
 	 *
 	 *	@param	string	$codefortest	Code to check syntax
-     *  @param	string	$typefortest	Type of barcode (ISBN, EAN, ...)
+	 *  @param	string	$typefortest	Type of barcode (ISBN, EAN, ...)
 	 *	@return	int						0 if OK, <0 if KO
 	 */
 	public function verif_syntax($codefortest, $typefortest)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$result = 0;
@@ -289,15 +289,15 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 
 		$newcodefortest = $codefortest;
 
-        // Special case, if mask is on 12 digits instead of 13, we remove last char into code to test
-        if (in_array($typefortest, array('EAN13', 'ISBN')))	// We remove the CRC char not included into mask
-        {
-            if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $mask, $reg))
-            {
-                if (strlen($reg[1]) == 12) $newcodefortest = substr($newcodefortest, 0, 12);
-                dol_syslog(get_class($this).'::verif_syntax newcodefortest='.$newcodefortest);
-            }
-        }
+		// Special case, if mask is on 12 digits instead of 13, we remove last char into code to test
+		if (in_array($typefortest, array('EAN13', 'ISBN')))	// We remove the CRC char not included into mask
+		{
+			if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $mask, $reg))
+			{
+				if (strlen($reg[1]) == 12) $newcodefortest = substr($newcodefortest, 0, 12);
+				dol_syslog(get_class($this).'::verif_syntax newcodefortest='.$newcodefortest);
+			}
+		}
 
 		$result = check_value($mask, $newcodefortest);
 		if (is_string($result))
diff --git a/htdocs/core/modules/barcode/modules_barcode.class.php b/htdocs/core/modules/barcode/modules_barcode.class.php
index d043bfe6bc8..01e532a7e29 100644
--- a/htdocs/core/modules/barcode/modules_barcode.class.php
+++ b/htdocs/core/modules/barcode/modules_barcode.class.php
@@ -29,21 +29,21 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
  */
 abstract class ModeleBarCode
 {
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 
-    /**
-     * Return if a model can be used or not
-     *
-     * @return		boolean     true if model can be used
-     */
-    public function isEnabled()
-    {
-        return true;
-    }
+	/**
+	 * Return if a model can be used or not
+	 *
+	 * @return		boolean     true if model can be used
+	 */
+	public function isEnabled()
+	{
+		return true;
+	}
 }
 
 
@@ -52,128 +52,128 @@ abstract class ModeleBarCode
  */
 abstract class ModeleNumRefBarCode
 {
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
-    /**     Return default description of numbering model
-     *
-     *		@param	Translate	$langs		Object langs
-     *      @return string      			Descriptive text
-     */
-    public function info($langs)
-    {
-        $langs->load("bills");
-        return $langs->trans("NoDescription");
-    }
+	/**     Return default description of numbering model
+	 *
+	 *		@param	Translate	$langs		Object langs
+	 *      @return string      			Descriptive text
+	 */
+	public function info($langs)
+	{
+		$langs->load("bills");
+		return $langs->trans("NoDescription");
+	}
 
-    /**     Return model name
-     *
-     *		@param	Translate	$langs		Object langs
-     *      @return string      			Model name
-     */
-    public function getNom($langs)
-    {
-        return empty($this->name) ? $this->nom : $this->name;
-    }
+	/**     Return model name
+	 *
+	 *		@param	Translate	$langs		Object langs
+	 *      @return string      			Model name
+	 */
+	public function getNom($langs)
+	{
+		return empty($this->name) ? $this->nom : $this->name;
+	}
 
-    /**     Return a numbering example
-     *
-     *		@param	Translate	$langs		Object langs
-     *      @return string      			Example
-     */
-    public function getExample($langs)
-    {
-        $langs->load("bills");
-        return $langs->trans("NoExample");
-    }
+	/**     Return a numbering example
+	 *
+	 *		@param	Translate	$langs		Object langs
+	 *      @return string      			Example
+	 */
+	public function getExample($langs)
+	{
+		$langs->load("bills");
+		return $langs->trans("NoExample");
+	}
 
-    /**
-     *  Return next value available
-     *
-     *	@param	Product		$objproduct	Object Product
-     *	@param	string		$type		Type of barcode (EAN, ISBN, ...)
-     *  @return string      			Value
-     */
-    public function getNextValue($objproduct, $type = '')
-    {
-        global $langs;
-        return $langs->trans("Function_getNextValue_InModuleNotWorking");
-    }
+	/**
+	 *  Return next value available
+	 *
+	 *	@param	Product		$objproduct	Object Product
+	 *	@param	string		$type		Type of barcode (EAN, ISBN, ...)
+	 *  @return string      			Value
+	 */
+	public function getNextValue($objproduct, $type = '')
+	{
+		global $langs;
+		return $langs->trans("Function_getNextValue_InModuleNotWorking");
+	}
 
-    /**     Return version of module
-     *
-     *      @return     string      Version
-     */
-    public function getVersion()
-    {
-        global $langs;
-        $langs->load("admin");
+	/**     Return version of module
+	 *
+	 *      @return     string      Version
+	 */
+	public function getVersion()
+	{
+		global $langs;
+		$langs->load("admin");
 
-        if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-        if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-        if ($this->version == 'dolibarr') return DOL_VERSION;
-        if ($this->version) return $this->version;
-        return $langs->trans("NotAvailable");
-    }
+		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
+		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
+		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
+		return $langs->trans("NotAvailable");
+	}
 
-    /**
-     *      Return description of module parameters
-     *
-     *      @param	Translate	$langs      Output language
-     *		@param	Societe		$soc		Third party object
-     *		@param	int			$type		-1=Nothing, 0=Product, 1=Service
-     *		@return	string					HTML translated description
-     */
-    public function getToolTip($langs, $soc, $type)
-    {
-        global $conf;
+	/**
+	 *      Return description of module parameters
+	 *
+	 *      @param	Translate	$langs      Output language
+	 *		@param	Societe		$soc		Third party object
+	 *		@param	int			$type		-1=Nothing, 0=Product, 1=Service
+	 *		@return	string					HTML translated description
+	 */
+	public function getToolTip($langs, $soc, $type)
+	{
+		global $conf;
 
-        $langs->load("admin");
+		$langs->load("admin");
 
-        $s = '';
-        $s .= $langs->trans("Name").': <b>'.$this->name.'</b><br>';
-        $s .= $langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
-        if ($type != -1) $s .= $langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
-        $s .= '<br>';
-        $s .= '<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
-        if ($type == 0)
-        {
-            $s .= $langs->trans("RequiredIfProduct").': ';
-            if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
-            $s .= yn(!$this->code_null, 1, 2);
-            if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
-            $s .= '<br>';
-        }
-        if ($type == 1)
-        {
-            $s .= $langs->trans("RequiredIfService").': ';
-            if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
-            $s .= yn(!$this->code_null, 1, 2);
-            if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
-            $s .= '<br>';
-        }
-        if ($type == -1)
-        {
-            $s .= $langs->trans("Required").': ';
-            if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
-            $s .= yn(!$this->code_null, 1, 2);
-            if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
-            $s .= '<br>';
-        }
-        /*$s.=$langs->trans("CanBeModifiedIfOk").': ';
+		$s = '';
+		$s .= $langs->trans("Name").': <b>'.$this->name.'</b><br>';
+		$s .= $langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
+		if ($type != -1) $s .= $langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
+		$s .= '<br>';
+		$s .= '<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
+		if ($type == 0)
+		{
+			$s .= $langs->trans("RequiredIfProduct").': ';
+			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
+			$s .= yn(!$this->code_null, 1, 2);
+			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+			$s .= '<br>';
+		}
+		if ($type == 1)
+		{
+			$s .= $langs->trans("RequiredIfService").': ';
+			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
+			$s .= yn(!$this->code_null, 1, 2);
+			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+			$s .= '<br>';
+		}
+		if ($type == -1)
+		{
+			$s .= $langs->trans("Required").': ';
+			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
+			$s .= yn(!$this->code_null, 1, 2);
+			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+			$s .= '<br>';
+		}
+		/*$s.=$langs->trans("CanBeModifiedIfOk").': ';
         $s.=yn($this->code_modifiable,1,2);
         $s.='<br>';
         $s.=$langs->trans("CanBeModifiedIfKo").': '.yn($this->code_modifiable_invalide,1,2).'<br>';
         */
-        $s .= $langs->trans("AutomaticCode").': '.yn($this->code_auto, 1, 2).'<br>';
-        $s .= '<br>';
+		$s .= $langs->trans("AutomaticCode").': '.yn($this->code_auto, 1, 2).'<br>';
+		$s .= '<br>';
 
-        $nextval = $this->getNextValue($soc, '');
-        if (empty($nextval)) $nextval = $langs->trans("Undefined");
-        $s .= $langs->trans("NextValue").': <b>'.$nextval.'</b><br>';
+		$nextval = $this->getNextValue($soc, '');
+		if (empty($nextval)) $nextval = $langs->trans("Undefined");
+		$s .= $langs->trans("NextValue").': <b>'.$nextval.'</b><br>';
 
-        return $s;
-    }
+		return $s;
+	}
 }
diff --git a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
index 9b22b04800d..b5e1fc80a1d 100644
--- a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
+++ b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
@@ -47,14 +47,14 @@ class doc_generic_bom_odt extends ModelePDFBom
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * @var string Dolibarr version of the loaded document
-     */
+	 * @var string Dolibarr version of the loaded document
+	 */
 	public $version = 'dolibarr';
 
 
@@ -63,12 +63,12 @@ class doc_generic_bom_odt extends ModelePDFBom
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
@@ -101,12 +101,12 @@ class doc_generic_bom_odt extends ModelePDFBom
 	 *	@param	Translate	$langs      Lang object to use for output
 	 *	@return string       			Description
 	 */
-    public function info($langs)
+	public function info($langs)
 	{
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("errors", "companies"));
+		$langs->loadLangs(array("errors", "companies"));
 
 		$form = new Form($this->db);
 
@@ -165,7 +165,7 @@ class doc_generic_bom_odt extends ModelePDFBom
    			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
    			foreach ($listoffiles as $file)
    			{
-                $texte .= $file['name'].'<br>';
+				$texte .= $file['name'].'<br>';
    			}
    			$texte .= '</div>';
 		}
@@ -183,7 +183,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Function to build a document on disk using the generic odt module.
 	 *
@@ -195,9 +195,9 @@ class doc_generic_bom_odt extends ModelePDFBom
 	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-    public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
@@ -236,6 +236,8 @@ class doc_generic_bom_odt extends ModelePDFBom
 				}
 			}
 
+			$object->fetch_thirdparty();
+
 			$dir = $conf->bom->multidir_output[isset($object->entity) ? $object->entity : 1];
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
@@ -263,8 +265,8 @@ class doc_generic_bom_odt extends ModelePDFBom
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -292,12 +294,13 @@ class doc_generic_bom_odt extends ModelePDFBom
 				if (!empty($usecontact))
 				{
 					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else {
-                        $socobject = $object->thirdparty;
-               			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
-            			$contactobject = $object->contact;
-                    }
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+						$socobject = $object->contact;
+					} else {
+						$socobject = $object->thirdparty;
+			   			// if we have a CUSTOMER contact and we dont use as recipient we store the contact object for later use
+						$contactobject = $object->contact;
+					}
 				} else {
 					$socobject = $object->thirdparty;
 				}
@@ -322,7 +325,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->bom->dir_temp,
@@ -349,7 +352,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
 				} catch (OdfException $e)
 				{
-                    dol_syslog($e->getMessage(), LOG_INFO);
+					dol_syslog($e->getMessage(), LOG_INFO);
 				}
 
 				// Define substitution array
@@ -384,7 +387,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
@@ -415,10 +418,10 @@ class doc_generic_bom_odt extends ModelePDFBom
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								} catch (OdfException $e)
 								{
-                                    dol_syslog($e->getMessage(), LOG_INFO);
+									dol_syslog($e->getMessage(), LOG_INFO);
 								} catch (SegmentException $e)
 								{
-                                    dol_syslog($e->getMessage(), LOG_INFO);
+									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
 							$listlines->merge();
@@ -440,7 +443,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -454,16 +457,16 @@ class doc_generic_bom_odt extends ModelePDFBom
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
-                        $this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						$this->error = $e->getMessage();
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
-                        $this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						$this->error = $e->getMessage();
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
diff --git a/htdocs/core/modules/bom/mod_bom_advanced.php b/htdocs/core/modules/bom/mod_bom_advanced.php
index bb123f25b7c..53bd17f1b9d 100644
--- a/htdocs/core/modules/bom/mod_bom_advanced.php
+++ b/htdocs/core/modules/bom/mod_bom_advanced.php
@@ -35,9 +35,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/bom/modules_bom.php';
 class mod_bom_advanced extends ModeleNumRefboms
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -51,14 +51,14 @@ class mod_bom_advanced extends ModeleNumRefboms
 	public $name = 'advanced';
 
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     *  @return     string      Texte descripif
-     */
-    public function info()
-    {
-    	global $conf, $langs, $db;
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $conf, $langs, $db;
 
 		$langs->load("bills");
 
@@ -89,22 +89,22 @@ class mod_bom_advanced extends ModeleNumRefboms
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Return an example of numbering
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-     	global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+	 	global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$old_code_type = $mysoc->typent_code;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-    	$mysoc->typent_code = 'TTTTTTTTTT';
-     	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$old_code_type = $mysoc->typent_code;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$mysoc->typent_code = 'TTTTTTTTTT';
+	 	$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 		$mysoc->typent_code = $old_code_type;
 
@@ -113,7 +113,7 @@ class mod_bom_advanced extends ModeleNumRefboms
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 * 	Return next free value
@@ -122,8 +122,8 @@ class mod_bom_advanced extends ModeleNumRefboms
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    public function getNextValue($objprod, $object)
-    {
+	public function getNextValue($objprod, $object)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/core/modules/cheque/doc/pdf_blochet.class.php b/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
index 17ae82145df..f3ea817fa73 100644
--- a/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
+++ b/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
@@ -132,7 +132,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		$heightforinfotot = 50; // Height reserved to output the info and total part
 		$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 		$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-		if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
 		$pdf->SetAutoPageBreak(1, 0);
 
 		if (class_exists('TCPDF'))
@@ -399,9 +399,8 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 
 		// Line of free text
 		$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
index 9538155167f..6af1a89baca 100644
--- a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
+++ b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
@@ -32,9 +32,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php'
 class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -45,14 +45,14 @@ class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts
 	public $name = 'Thyme';
 
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     *  @return     string      Texte descripif
-     */
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
 	public function info()
-    {
-    	global $conf, $langs, $db;
+	{
+		global $conf, $langs, $db;
 
 		$langs->load("bills");
 
@@ -83,20 +83,20 @@ class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Return an example of numbering
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-        global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+		global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-     	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$mysoc->code_client = 'CCCCCCCCCC';
+	 	$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
 		if (!$numExample)
@@ -104,7 +104,7 @@ class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 * 	Return next free value
@@ -113,8 +113,8 @@ class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    public function getNextValue($objsoc, $object)
-    {
+	public function getNextValue($objsoc, $object)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -134,17 +134,17 @@ class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return next free value
 	 *
 	 *  @param	Societe		$objsoc     Object third party
 	 * 	@param	string		$objforref	Object for number to search
 	 *  @return string      			Next free value
-     */
-    public function chequereceipt_get_num($objsoc, $objforref)
-    {
-        // phpcs:enable
-        return $this->getNextValue($objsoc, $objforref);
-    }
+	 */
+	public function chequereceipt_get_num($objsoc, $objforref)
+	{
+		// phpcs:enable
+		return $this->getNextValue($objsoc, $objforref);
+	}
 }
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index 9c8bd72a6a0..3165760b541 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -47,14 +47,14 @@ class doc_generic_order_odt extends ModelePDFCommandes
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * @var string Dolibarr version of the loaded document
-     */
+	 * @var string Dolibarr version of the loaded document
+	 */
 	public $version = 'dolibarr';
 
 
@@ -63,12 +63,12 @@ class doc_generic_order_odt extends ModelePDFCommandes
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
@@ -108,12 +108,12 @@ class doc_generic_order_odt extends ModelePDFCommandes
 	 *	@param	Translate	$langs      Lang object to use for output
 	 *	@return string       			Description
 	 */
-    public function info($langs)
+	public function info($langs)
 	{
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("errors", "companies"));
+		$langs->loadLangs(array("errors", "companies"));
 
 		$form = new Form($this->db);
 
@@ -172,15 +172,15 @@ class doc_generic_order_odt extends ModelePDFCommandes
    			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
    			foreach ($listoffiles as $file)
    			{
-                $texte .= $file['name'].'<br>';
+				$texte .= $file['name'].'<br>';
    			}
    			$texte .= '</div>';
 		}
-        // Add input to upload a new template file.
-        $texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
-        $texte .= '<input type="hidden" value="COMMANDE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-        $texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
-        $texte .= '</div>';
+		// Add input to upload a new template file.
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte .= '<input type="hidden" value="COMMANDE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
+		$texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '</div>';
 
 		$texte .= '</td>';
 
@@ -195,7 +195,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Function to build a document on disk using the generic odt module.
 	 *
@@ -207,9 +207,9 @@ class doc_generic_order_odt extends ModelePDFCommandes
 	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-    public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
@@ -248,6 +248,8 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				}
 			}
 
+			$object->fetch_thirdparty();
+
 			$dir = $conf->commande->multidir_output[$object->entity];
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
@@ -275,8 +277,8 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -303,13 +305,13 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				$contactobject = null;
 				if (!empty($usecontact))
 				{
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else {
-                        $socobject = $object->thirdparty;
-               			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
-            			$contactobject = $object->contact;
-                    }
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+						$socobject = $object->contact;
+					} else {
+						$socobject = $object->thirdparty;
+						// if we have a CUSTOMER contact and we dont use as recipient we store the contact object for later use
+						$contactobject = $object->contact;
+					}
 				} else {
 					$socobject = $object->thirdparty;
 				}
@@ -320,7 +322,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				'__FROM_EMAIL__' => $this->emetteur->email,
 				'__TOTAL_TTC__' => $object->total_ttc,
 				'__TOTAL_HT__' => $object->total_ht,
-				'__TOTAL_VAT__' => $object->total_vat
+				'__TOTAL_VAT__' => $object->total_tva
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
@@ -338,7 +340,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->commande->dir_temp,
@@ -365,7 +367,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
 				} catch (OdfException $e)
 				{
-                    dol_syslog($e->getMessage(), LOG_INFO);
+					dol_syslog($e->getMessage(), LOG_INFO);
 				}
 
 				// Define substitution array
@@ -400,7 +402,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
@@ -431,10 +433,10 @@ class doc_generic_order_odt extends ModelePDFCommandes
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								} catch (OdfException $e)
 								{
-                                    dol_syslog($e->getMessage(), LOG_INFO);
+									dol_syslog($e->getMessage(), LOG_INFO);
 								} catch (SegmentException $e)
 								{
-                                    dol_syslog($e->getMessage(), LOG_INFO);
+									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
 							$listlines->merge();
@@ -456,7 +458,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -470,16 +472,16 @@ class doc_generic_order_odt extends ModelePDFCommandes
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
-                        $this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						$this->error = $e->getMessage();
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				} else {
 					try {
-					    $odfHandler->saveToDisk($file);
+						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
-                        $this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						$this->error = $e->getMessage();
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 603fd4efa22..5a0bbc30327 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2012       Cedric Salvador     <csalvador@gpcsolutions.fr>
  * Copyright (C) 2015       Marcos García       <marcosgdf@gmail.com>
  * Copyright (C) 2017-2018  Ferran Marcet       <fmarcet@2byte.es>
- * Copyright (C) 2018-2019  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric 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
@@ -42,83 +42,83 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
  */
 class pdf_einstein extends ModelePDFCommandes
 {
-    /**
-     * @var DoliDb Database handler
-     */
-    public $db;
+	/**
+	 * @var DoliDb Database handler
+	 */
+	public $db;
 
 	/**
-     * @var string model name
-     */
-    public $name;
+	 * @var string model name
+	 */
+	public $name;
 
 	/**
-     * @var string model description (short text)
-     */
-    public $description;
-
-    /**
-     * @var int 	Save the name of generated file as the main doc when generating a doc with this template
-     */
-    public $update_main_doc_field;
+	 * @var string model description (short text)
+	 */
+	public $description;
 
 	/**
-     * @var string document type
-     */
-    public $type;
+	 * @var int 	Save the name of generated file as the main doc when generating a doc with this template
+	 */
+	public $update_main_doc_field;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var string document type
+	 */
+	public $type;
+
+	/**
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	/**
-     * @var int page_largeur
-     */
-    public $page_largeur;
+	 * @var int page_largeur
+	 */
+	public $page_largeur;
 
-    /**
-     * @var int page_hauteur
-     */
-    public $page_hauteur;
+	/**
+	 * @var int page_hauteur
+	 */
+	public $page_hauteur;
 
-    /**
-     * @var array format
-     */
-    public $format;
+	/**
+	 * @var array format
+	 */
+	public $format;
 
-    /**
-     * @var int marge_gauche
-     */
+	/**
+	 * @var int marge_gauche
+	 */
 	public $marge_gauche;
 
 	/**
-     * @var int marge_droite
-     */
+	 * @var int marge_droite
+	 */
 	public $marge_droite;
 
 	/**
-     * @var int marge_haute
-     */
+	 * @var int marge_haute
+	 */
 	public $marge_haute;
 
 	/**
-     * @var int marge_basse
-     */
+	 * @var int marge_basse
+	 */
 	public $marge_basse;
 
 	/**
 	 * Issuer
 	 * @var Societe    Object that emits
 	 */
-    public $emetteur;
+	public $emetteur;
 
 
 	/**
@@ -166,7 +166,7 @@ class pdf_einstein extends ModelePDFCommandes
 
 		// Define position of columns
 		$this->posxdesc = $this->marge_gauche + 1;
-		if ($conf->global->PRODUCT_USE_UNITS)
+		if (!empty($conf->global->PRODUCT_USE_UNITS))
 		{
 			$this->posxtva = 101;
 			$this->posxup = 118;
@@ -200,21 +200,21 @@ class pdf_einstein extends ModelePDFCommandes
 		$this->atleastonediscount = 0;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Function to build pdf onto disk
-     *
-     *  @param		Object		$object				Object to generate
-     *  @param		Translate	$outputlangs		Lang output object
-     *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
-     *  @param		int			$hidedetails		Do not show line details
-     *  @param		int			$hidedesc			Do not show desc
-     *  @param		int			$hideref			Do not show ref
-     *  @return     int             			    1=OK, 0=KO
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Function to build pdf onto disk
+	 *
+	 *  @param		Commande	$object				Object to generate
+	 *  @param		Translate	$outputlangs		Lang output object
+	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *  @return     int             			    1=OK, 0=KO
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblines;
 
 		if (!is_object($outputlangs)) $outputlangs = $langs;
@@ -224,15 +224,23 @@ class pdf_einstein extends ModelePDFCommandes
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "orders", "deliveries"));
 
+		global $outputlangsbis;
+		$outputlangsbis = null;
+		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+			$outputlangsbis = new Translate('', $conf);
+			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
+			$outputlangsbis->loadLangs(array("main", "dict", "companies", "bills", "products", "orders", "deliveries"));
+		}
+
 		$nblines = count($object->lines);
 
-		if ($conf->commande->dir_output)
+		if ($conf->commande->multidir_output[$conf->entity])
 		{
-            $object->fetch_thirdparty();
+			$object->fetch_thirdparty();
 
-            $deja_regle = 0;
+			$deja_regle = 0;
 
-            // Definition of $dir and $file
+			// Definition of $dir and $file
 			if ($object->specimen)
 			{
 				$dir = $conf->commande->multidir_output[$conf->entity];
@@ -271,22 +279,22 @@ class pdf_einstein extends ModelePDFCommandes
 				$pdf->SetAutoPageBreak(1, 0);
 
 				$heightforinfotot = 40; // Height reserved to output the info and total part
-		        $heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
 
-                if (class_exists('TCPDF'))
-                {
-                    $pdf->setPrintHeader(false);
-                    $pdf->setPrintFooter(false);
-                }
-                $pdf->SetFont(pdf_getPDFFont($outputlangs));
-                // Set path to the background PDF File
-                if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-                {
-                	$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
-                    $tplidx = $pdf->importPage(1);
-                }
+				if (class_exists('TCPDF'))
+				{
+					$pdf->setPrintHeader(false);
+					$pdf->setPrintFooter(false);
+				}
+				$pdf->SetFont(pdf_getPDFFont($outputlangs));
+				// Set path to the background PDF File
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+				{
+					$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+					$tplidx = $pdf->importPage(1);
+				}
 
 				$pdf->Open();
 				$pagenb = 0;
@@ -311,21 +319,21 @@ class pdf_einstein extends ModelePDFCommandes
 				}
 				if (empty($this->atleastonediscount))
 				{
-				    $delta = ($this->postotalht - $this->posxdiscount);
-				    $this->posxpicture += $delta;
-				    $this->posxtva += $delta;
-				    $this->posxup += $delta;
-				    $this->posxqty += $delta;
-				    $this->posxunit += $delta;
-				    $this->posxdiscount += $delta;
-				    // post of fields after are not modified, stay at same position
+					$delta = ($this->postotalht - $this->posxdiscount);
+					$this->posxpicture += $delta;
+					$this->posxtva += $delta;
+					$this->posxup += $delta;
+					$this->posxqty += $delta;
+					$this->posxunit += $delta;
+					$this->posxdiscount += $delta;
+					// post of fields after are not modified, stay at same position
 				}
 
 				// New page
 				$pdf->AddPage();
 				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 				$pagenb++;
-				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
+				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs, (is_object($outputlangsbis) ? $outputlangsbis : null));
 				$pdf->SetFont('', '', $default_font_size - 1);
 				$pdf->MultiCell(0, 3, ''); // Set interline to 3
 				$pdf->SetTextColor(0, 0, 0);
@@ -335,7 +343,8 @@ class pdf_einstein extends ModelePDFCommandes
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
 
 				// Incoterm
-				if ($conf->incoterm->enabled)
+				$height_incoterms = 0;
+				if (!empty($conf->incoterm->enabled))
 				{
 					$desc_incoterms = $object->getIncotermsForPDF();
 					if ($desc_incoterms)
@@ -368,11 +377,11 @@ class pdf_einstein extends ModelePDFCommandes
 						if (!empty($salerepobj->signature)) $notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
 					}
 				}
-                // Extrafields in note
-                $extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
-                if (!empty($extranote)) {
-                    $notetoshow = dol_concatdesc($notetoshow, $extranote);
-                }
+				// Extrafields in note
+				$extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
+				if (!empty($extranote)) {
+					$notetoshow = dol_concatdesc($notetoshow, $extranote);
+				}
 
 				if ($notetoshow)
 				{
@@ -482,7 +491,7 @@ class pdf_einstein extends ModelePDFCommandes
 					$pdf->MultiCell($this->posxunit - $this->posxqty - 0.8, 4, $qty, 0, 'R'); // Enough for 6 chars
 
 					// Unit
-					if ($conf->global->PRODUCT_USE_UNITS)
+					if (!empty($conf->global->PRODUCT_USE_UNITS))
 					{
 						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
 						$pdf->SetXY($this->posxunit, $curY);
@@ -504,7 +513,7 @@ class pdf_einstein extends ModelePDFCommandes
 					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
 
 					// Collection of totals by value of vat in $this->vat["rate"] = total_tva
-					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
+					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
 					else $tvaligne = $object->lines[$i]->total_tva;
 
 					$localtax1ligne = $object->lines[$i]->total_localtax1;
@@ -529,7 +538,7 @@ class pdf_einstein extends ModelePDFCommandes
 						$localtax2_type = $localtaxtmp_array[2];
 					}
 
-				    // retrieve global local tax
+					// retrieve global local tax
 					if ($localtax1_type && $localtax1ligne != 0)
 						$this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
 					if ($localtax2_type && $localtax2ligne != 0)
@@ -585,15 +594,17 @@ class pdf_einstein extends ModelePDFCommandes
 				}
 
 				// Show square
-				if ($pagenb == 1)
+				if ($pagenb == 1) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
-				else $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
+				} else {
+					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
+				}
 				$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 
-				// Affiche zone infos
+				// Display infos area
 				$posy = $this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
 
-				// Affiche zone totaux
+				// Display total zone
 				$posy = $this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
 
 				// Affiche zone versements
@@ -619,8 +630,8 @@ class pdf_einstein extends ModelePDFCommandes
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0)
 				{
-				    $this->error = $hookmanager->error;
-				    $this->errors = $hookmanager->errors;
+					$this->error = $hookmanager->error;
+					$this->errors = $hookmanager->errors;
 				}
 
 				if (!empty($conf->global->MAIN_UMASK))
@@ -640,41 +651,41 @@ class pdf_einstein extends ModelePDFCommandes
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Show payments table
-     *
+	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
-	 *  @param  Object		$object			Object order
+	 *  @param  Commande	$object			Object order
 	 *	@param	int			$posy			Position y in PDF
 	 *	@param	Translate	$outputlangs	Object langs for output
 	 *	@return int							<0 if KO, >0 if OK
 	 */
 	protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *   Show miscellaneous information (payment mode, payment term, ...)
 	 *
 	 *   @param		TCPDF		$pdf     		Object PDF
-	 *   @param		Object		$object			Object to show
+	 *   @param		Commande	$object			Object to show
 	 *   @param		int			$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
-	 *   @return	void
+	 *   @return	int
 	 */
 	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $mysoc;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		$pdf->SetFont('', '', $default_font_size - 1);
 
-        // If France, show VAT mention if not applicable
+		// If France, show VAT mention if not applicable
 		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj))
 		{
 			$pdf->SetFont('', 'B', $default_font_size - 2);
@@ -703,8 +714,8 @@ class pdf_einstein extends ModelePDFCommandes
 			$posy = $pdf->GetY() + 3;
 		}
 
-        // Check a payment mode is defined
-        /* Not used with orders
+		// Check a payment mode is defined
+		/* Not used with orders
 		if (empty($object->mode_reglement_code)
         	&& ! $conf->global->FACTURE_CHQ_NUMBER
         	&& ! $conf->global->FACTURE_RIB_NUMBER)
@@ -730,22 +741,22 @@ class pdf_einstein extends ModelePDFCommandes
             $posy=$pdf->GetY()+1;
 		}*/
 
-	    // Show planed date of delivery
-        if (!empty($object->date_livraison))
+		// Show planed date of delivery
+		if (!empty($object->delivery_date))
 		{
-            $outputlangs->load("sendings");
+			$outputlangs->load("sendings");
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("DateDeliveryPlanned").':';
 			$pdf->MultiCell(80, 4, $titre, 0, 'L');
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posxval, $posy);
-			$dlp = dol_print_date($object->date_livraison, "daytext", false, $outputlangs, true);
+			$dlp = dol_print_date($object->delivery_date, "daytext", false, $outputlangs, true);
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
-            $posy = $pdf->GetY() + 1;
-		} elseif ($object->availability_code || $object->availability)    // Show availability conditions
-		{
+			$posy = $pdf->GetY() + 1;
+		} elseif ($object->availability_code || $object->availability) {
+			// Show availability conditions
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("AvailabilityPeriod").':';
@@ -760,72 +771,74 @@ class pdf_einstein extends ModelePDFCommandes
 			$posy = $pdf->GetY() + 1;
 		}
 
-        // Show payment mode
-        if ($object->mode_reglement_code
-        	&& $object->mode_reglement_code != 'CHQ'
-           	&& $object->mode_reglement_code != 'VIR') {
-            $pdf->SetFont('', 'B', $default_font_size - 2);
-            $pdf->SetXY($this->marge_gauche, $posy);
-            $titre = $outputlangs->transnoentities("PaymentMode").':';
-            $pdf->MultiCell(80, 5, $titre, 0, 'L');
+		// Show payment mode
+		if ($object->mode_reglement_code
+			&& $object->mode_reglement_code != 'CHQ'
+		   	&& $object->mode_reglement_code != 'VIR') {
+			$pdf->SetFont('', 'B', $default_font_size - 2);
+			$pdf->SetXY($this->marge_gauche, $posy);
+			$titre = $outputlangs->transnoentities("PaymentMode").':';
+			$pdf->MultiCell(80, 5, $titre, 0, 'L');
 
 			$pdf->SetFont('', '', $default_font_size - 2);
-            $pdf->SetXY($posxval, $posy);
-            $lib_mode_reg = $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) != ('PaymentType'.$object->mode_reglement_code) ? $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) : $outputlangs->convToOutputCharset($object->mode_reglement);
-            $pdf->MultiCell(80, 5, $lib_mode_reg, 0, 'L');
+			$pdf->SetXY($posxval, $posy);
+			$lib_mode_reg = $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) != ('PaymentType'.$object->mode_reglement_code) ? $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) : $outputlangs->convToOutputCharset($object->mode_reglement);
+			$pdf->MultiCell(80, 5, $lib_mode_reg, 0, 'L');
 
-            $posy = $pdf->GetY() + 2;
-        }
-
-		// Show payment mode CHQ
-        if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
-        {
-        	// Si mode reglement non force ou si force a CHQ
-	        if (!empty($conf->global->FACTURE_CHQ_NUMBER))
-	        {
-	            if ($conf->global->FACTURE_CHQ_NUMBER > 0)
-	            {
-	                $account = new Account($this->db);
-	                $account->fetch($conf->global->FACTURE_CHQ_NUMBER);
-
-	                $pdf->SetXY($this->marge_gauche, $posy);
-	                $pdf->SetFont('', 'B', $default_font_size - 3);
-	                $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->proprio), 0, 'L', 0);
-		            $posy = $pdf->GetY() + 1;
-
-		            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-		            {
-		                $pdf->SetXY($this->marge_gauche, $posy);
-		                $pdf->SetFont('', '', $default_font_size - 3);
-		                $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
-			            $posy = $pdf->GetY() + 2;
-		            }
-	            }
-	            if ($conf->global->FACTURE_CHQ_NUMBER == -1)
-	            {
-	                $pdf->SetXY($this->marge_gauche, $posy);
-	                $pdf->SetFont('', 'B', $default_font_size - 3);
-	                $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
-		            $posy = $pdf->GetY() + 1;
-
-		            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-		            {
-			            $pdf->SetXY($this->marge_gauche, $posy);
-		                $pdf->SetFont('', '', $default_font_size - 3);
-		                $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
-			            $posy = $pdf->GetY() + 2;
-		            }
-	            }
-	        }
+			$posy = $pdf->GetY() + 2;
 		}
 
-        // If payment mode not forced or forced to VIR, show payment with BAN
-        if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
-        {
-			if (!empty($object->fk_account) || !empty($object->fk_bank) || !empty($conf->global->FACTURE_RIB_NUMBER))
+		// Show payment mode CHQ
+		if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
+		{
+			// Si mode reglement non force ou si force a CHQ
+			if (!empty($conf->global->FACTURE_CHQ_NUMBER))
 			{
-				$bankid = (empty($object->fk_account) ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
-				if (!empty($object->fk_bank)) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
+				$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
+
+				if ($conf->global->FACTURE_CHQ_NUMBER > 0)
+				{
+					$account = new Account($this->db);
+					$account->fetch($conf->global->FACTURE_CHQ_NUMBER);
+
+					$pdf->SetXY($this->marge_gauche, $posy);
+					$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->proprio), 0, 'L', 0);
+					$posy = $pdf->GetY() + 1;
+
+					if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
+					{
+						$pdf->SetXY($this->marge_gauche, $posy);
+						$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
+						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
+						$posy = $pdf->GetY() + 2;
+					}
+				}
+				if ($conf->global->FACTURE_CHQ_NUMBER == -1)
+				{
+					$pdf->SetXY($this->marge_gauche, $posy);
+					$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
+					$posy = $pdf->GetY() + 1;
+
+					if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
+					{
+						$pdf->SetXY($this->marge_gauche, $posy);
+						$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
+						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
+						$posy = $pdf->GetY() + 2;
+					}
+				}
+			}
+		}
+
+		// If payment mode not forced or forced to VIR, show payment with BAN
+		if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
+		{
+			if ($object->fk_account > 0 || $object->fk_bank > 0 || !empty($conf->global->FACTURE_RIB_NUMBER))
+			{
+				$bankid = ($object->fk_account <= 0 ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
+				if ($object->fk_bank > 0) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
 				$account = new Account($this->db);
 				$account->fetch($bankid);
 
@@ -836,18 +849,18 @@ class pdf_einstein extends ModelePDFCommandes
 
 				$posy += 2;
 			}
-        }
+		}
 
 		return $posy;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Show total to pay
 	 *
 	 *	@param	TCPDF		$pdf            Object PDF
-	 *	@param  Facture		$object         Object invoice
+	 *	@param  Commande	$object         Object invoice
 	 *	@param  int			$deja_regle     Montant deja regle
 	 *	@param	int			$posy			Position depart
 	 *	@param	Translate	$outputlangs	Objet langs
@@ -855,17 +868,25 @@ class pdf_einstein extends ModelePDFCommandes
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
-        // phpcs:enable
-	    global $conf, $mysoc;
+		// phpcs:enable
+		global $conf, $mysoc, $hookmanager;
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
+		$outputlangsbis = null;
+		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+			$outputlangsbis = new Translate('', $conf);
+			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
+			$outputlangsbis->loadLangs(array("main", "dict", "companies", "bills", "products", "propal"));
+			$default_font_size--;
+		}
+
 		$tab2_top = $posy;
 		$tab2_hl = 4;
 		$pdf->SetFont('', '', $default_font_size - 1);
 
-		// Tableau total
-        $col1x = 120; $col2x = 170;
+		// Total table
+		$col1x = 120; $col2x = 170;
 		if ($this->page_largeur < 210) // To work with US executive format
 		{
 			$col2x -= 20;
@@ -878,16 +899,16 @@ class pdf_einstein extends ModelePDFCommandes
 		// Total HT
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top + 0);
-		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', 1);
 
-		$total_ht = (($conf->multicurrency->enabled && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
+		$total_ht = ((!empty($conf->multicurrency->enabled) && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + 0);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248, 248, 248);
 
-		$total_ttc = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
+		$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
 		$this->atleastoneratenotnull = 0;
 		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
@@ -918,7 +939,8 @@ class pdf_einstein extends ModelePDFCommandes
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
-							$totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).' ';
+							$totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("TotalLT1", $mysoc->country_code) : '');
+							$totalvat .= ' ';
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
@@ -927,7 +949,7 @@ class pdf_einstein extends ModelePDFCommandes
 						}
 					}
 				}
-	      		//}
+		  		//}
 				//Local tax 2 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
@@ -949,7 +971,8 @@ class pdf_einstein extends ModelePDFCommandes
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
-							$totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).' ';
+							$totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("TotalLT2", $mysoc->country_code) : '');
+							$totalvat .= ' ';
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
@@ -975,7 +998,8 @@ class pdf_einstein extends ModelePDFCommandes
 							$tvakey = str_replace('*', '', $tvakey);
 							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 						}
-						$totalvat = $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code).' ';
+						$totalvat = $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code).(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("TotalVAT", $mysoc->country_code) : '');
+						$totalvat .= ' ';
 						$totalvat .= vatrate($tvakey, 1).$tvacompl;
 						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
@@ -1006,7 +1030,8 @@ class pdf_einstein extends ModelePDFCommandes
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
-							$totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).' ';
+							$totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("TotalLT1", $mysoc->country_code) : '');
+							$totalvat .= ' ';
 
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
@@ -1015,7 +1040,7 @@ class pdf_einstein extends ModelePDFCommandes
 						}
 					}
 				}
-	      		//}
+		  		//}
 				//Local tax 2 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
@@ -1025,6 +1050,7 @@ class pdf_einstein extends ModelePDFCommandes
 
 					foreach ($localtax_rate as $tvakey => $tvaval)
 					{
+						// retrieve global local tax
 						if ($tvakey != 0)    // On affiche pas taux 0
 						{
 							//$this->atleastoneratenotnull++;
@@ -1038,7 +1064,8 @@ class pdf_einstein extends ModelePDFCommandes
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
-							$totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).' ';
+							$totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("TotalLT2", $mysoc->country_code) : '');
+							$totalvat .= ' ';
 
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
@@ -1055,7 +1082,7 @@ class pdf_einstein extends ModelePDFCommandes
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 				$pdf->SetTextColor(0, 0, 60);
 				$pdf->SetFillColor(224, 224, 224);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("TotalTTC", $mysoc->country_code) : ''), $useborder, 'L', 1);
 
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc, 0, $outputlangs), $useborder, 'R', 1);
@@ -1064,8 +1091,8 @@ class pdf_einstein extends ModelePDFCommandes
 
 		$pdf->SetTextColor(0, 0, 0);
 
-        $creditnoteamount = 0;
-        $depositsamount = 0;
+		$creditnoteamount = 0;
+		$depositsamount = 0;
 		//$creditnoteamount=$object->getSumCreditNotesUsed();
 		//$depositsamount=$object->getSumDepositsUsed();
 		//print "x".$creditnoteamount."-".$depositsamount;exit;
@@ -1078,7 +1105,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$index++;
 
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("AlreadyPaid") : ''), 0, 'L', 0);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', 0);
 
@@ -1086,7 +1113,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->SetFillColor(224, 224, 224);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("AlreadyPaid") : ''), $useborder, 'L', 1);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
@@ -1111,9 +1138,10 @@ class pdf_einstein extends ModelePDFCommandes
 	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
 	 *   @param		int			$hidebottom		Hide bottom bar of array
 	 *   @param		string		$currency		Currency code
+	 *   @param		Translate	$outputlangsbis	Langs object bis
 	 *   @return	void
 	 */
-	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '', $outputlangsbis = null)
 	{
 		global $conf;
 
@@ -1131,6 +1159,10 @@ class pdf_einstein extends ModelePDFCommandes
 		if (empty($hidetop))
 		{
 			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
+			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+				$titre .= ' - '.$outputlangsbis->transnoentities("AmountInCurrency", $outputlangsbis->transnoentitiesnoconv("Currency".$currency));
+			}
+
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
@@ -1176,7 +1208,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
 		}
 
-		if ($conf->global->PRODUCT_USE_UNITS) {
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxunit - 1, $tab_top + 1);
@@ -1211,13 +1243,14 @@ class pdf_einstein extends ModelePDFCommandes
 	 *  Show top header of page.
 	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
-	 *  @param  Object		$object     	Object to show
+	 *  @param  Commande	$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @param  Translate	$outputlangsbis	Object lang for output bis
 	 *  @param	string		$titlekey		Translation key to show as title of document
 	 *  @return	int                         Return topshift value
 	 */
-	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey = "PdfOrderTitle")
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $outputlangsbis = null, $titlekey = "PdfOrderTitle")
 	{
 		// phpcs:enable
 		global $conf, $langs, $hookmanager;
@@ -1232,14 +1265,16 @@ class pdf_einstein extends ModelePDFCommandes
 		// Show Draft Watermark
 		if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK)))
 		{
-            pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->COMMANDE_DRAFT_WATERMARK);
+			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->COMMANDE_DRAFT_WATERMARK);
 		}
 
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 
+		$w = 100;
+
 		$posy = $this->marge_haute;
-		$posx = $this->page_largeur - $this->marge_droite - 100;
+		$posx = $this->page_largeur - $this->marge_droite - $w;
 
 		$pdf->SetXY($this->marge_gauche, $posy);
 
@@ -1258,17 +1293,17 @@ class pdf_einstein extends ModelePDFCommandes
 				}
 				if (is_readable($logo))
 				{
-				    $height = pdf_getHeightForLogo($logo);
-				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
+					$height = pdf_getHeightForLogo($logo);
+					$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 				} else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
+					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
 			} else {
 				$text = $this->emetteur->name;
-				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
 		}
 
@@ -1276,7 +1311,7 @@ class pdf_einstein extends ModelePDFCommandes
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
 		$title = $outputlangs->transnoentities($titlekey);
-		$pdf->MultiCell(100, 3, $title, '', 'R');
+		$pdf->MultiCell($w, 3, $title, '', 'R');
 
 		$pdf->SetFont('', 'B', $default_font_size);
 
@@ -1293,7 +1328,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$posy += 5;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
 
 		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE))
@@ -1323,29 +1358,29 @@ class pdf_einstein extends ModelePDFCommandes
 		$posy += 4;
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
+		$pdf->MultiCell($w, 3, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
 
 		if (!empty($conf->global->DOC_SHOW_CUSTOMER_CODE) && !empty($object->thirdparty->code_client))
 		{
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("CustomerCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
 		}
 
 		// Get contact
 		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
 		{
-		    $arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-		    if (count($arrayidcontact) > 0)
-		    {
-                $usertmp = new User($this->db);
-		        $usertmp->fetch($arrayidcontact[0]);
-                $posy += 4;
-                $pdf->SetXY($posx, $posy);
-		        $pdf->SetTextColor(0, 0, 60);
-		        $pdf->MultiCell(100, 3, $langs->trans("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
-		    }
+			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
+			if (count($arrayidcontact) > 0)
+			{
+				$usertmp = new User($this->db);
+				$usertmp->fetch($arrayidcontact[0]);
+				$posy += 4;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 3, $langs->transnoentities("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
+			}
 		}
 
 		$posy += 2;
@@ -1353,7 +1388,7 @@ class pdf_einstein extends ModelePDFCommandes
 		$top_shift = 0;
 		// Show list of linked objects
 		$current_y = $pdf->getY();
-		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);
 		if ($current_y < $pdf->getY())
 		{
 			$top_shift = $pdf->getY() - $current_y;
@@ -1402,8 +1437,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
 
 
-
-			// If CUSTOMER contact defined on order, we use it
+			// If CUSTOMER contact defined, we use it
 			$usecontact = false;
 			$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
 			if (count($arrayidcontact) > 0)
@@ -1412,9 +1446,8 @@ class pdf_einstein extends ModelePDFCommandes
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -1425,9 +1458,10 @@ class pdf_einstein extends ModelePDFCommandes
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, 'target', $object);
 
 			// Show recipient
-			$widthrecbox = 100;
+			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
 			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
-			$posy = 42 + $top_shift;
+			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+			$posy += $top_shift;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
 			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
 
@@ -1441,7 +1475,7 @@ class pdf_einstein extends ModelePDFCommandes
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
+			$pdf->MultiCell($widthrecbox, 2, $carac_client_name, 0, 'L');
 
 			$posy = $pdf->getY();
 
@@ -1459,9 +1493,9 @@ class pdf_einstein extends ModelePDFCommandes
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
-     *
+	 *
 	 *   	@param	TCPDF		$pdf     			PDF
-	 * 		@param	Object		$object				Object to show
+	 * 		@param	Commande	$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	int								Return height of bottom margin including footer text
@@ -1470,7 +1504,7 @@ class pdf_einstein extends ModelePDFCommandes
 	{
 		// phpcs:enable
 		global $conf;
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'ORDER_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 }
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index e6e54e521d8..97354c5c266 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2012       Cedric Salvador     <csalvador@gpcsolutions.fr>
  * Copyright (C) 2015       Marcos García       <marcosgdf@gmail.com>
  * Copyright (C) 2017       Ferran Marcet       <fmarcet@2byte.es>
- * Copyright (C) 2018-2019  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric 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
@@ -42,84 +42,89 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
  */
 class pdf_eratosthene extends ModelePDFCommandes
 {
-    /**
-     * @var DoliDb Database handler
-     */
-    public $db;
+	/**
+	 * @var DoliDb Database handler
+	 */
+	public $db;
 
 	/**
-     * @var string model name
-     */
-    public $name;
+	 * @var string model name
+	 */
+	public $name;
 
 	/**
-     * @var string model description (short text)
-     */
-    public $description;
-
-    /**
-     * @var int 	Save the name of generated file as the main doc when generating a doc with this template
-     */
-    public $update_main_doc_field;
+	 * @var string model description (short text)
+	 */
+	public $description;
 
 	/**
-     * @var string document type
-     */
-    public $type;
+	 * @var int 	Save the name of generated file as the main doc when generating a doc with this template
+	 */
+	public $update_main_doc_field;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var string document type
+	 */
+	public $type;
+
+	/**
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
-     /**
-     * @var int page_largeur
-     */
-    public $page_largeur;
+	 /**
+	  * @var int page_largeur
+	  */
+	public $page_largeur;
 
 	/**
-     * @var int page_hauteur
-     */
-    public $page_hauteur;
+	 * @var int page_hauteur
+	 */
+	public $page_hauteur;
 
 	/**
-     * @var array format
-     */
-    public $format;
+	 * @var array format
+	 */
+	public $format;
 
 	/**
-     * @var int marge_gauche
-     */
+	 * @var int marge_gauche
+	 */
 	public $marge_gauche;
 
 	/**
-     * @var int marge_droite
-     */
+	 * @var int marge_droite
+	 */
 	public $marge_droite;
 
 	/**
-     * @var int marge_haute
-     */
+	 * @var int marge_haute
+	 */
 	public $marge_haute;
 
 	/**
-     * @var int marge_basse
-     */
+	 * @var int marge_basse
+	 */
 	public $marge_basse;
 
-    /**
-	* Issuer
-	* @var Societe	Object that emits
-	*/
+	/**
+	 * Issuer
+	 * @var Societe	Object that emits
+	 */
 	public $emetteur;
 
+	/**
+	 * @var array of document table collumns
+	 */
+	public $cols;
+
 
 	/**
 	 *	Constructor
@@ -165,11 +170,13 @@ class pdf_eratosthene extends ModelePDFCommandes
 		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
 
 		// Define position of columns
-		$this->posxdesc = $this->marge_gauche + 1;
+		$this->posxdesc = $this->marge_gauche + 1; // used for notes ans other stuff
 
 
 		$this->tabTitleHeight = 5; // default height
 
+		//  Use new system for position of columns, view  $this->defineColumnField()
+
 		$this->tva = array();
 		$this->localtax1 = array();
 		$this->localtax2 = array();
@@ -177,21 +184,21 @@ class pdf_eratosthene extends ModelePDFCommandes
 		$this->atleastonediscount = 0;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Function to build pdf onto disk
-     *
-     *  @param		Object		$object				Object to generate
-     *  @param		Translate	$outputlangs		Lang output object
-     *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
-     *  @param		int			$hidedetails		Do not show line details
-     *  @param		int			$hidedesc			Do not show desc
-     *  @param		int			$hideref			Do not show ref
-     *  @return     int             			    1=OK, 0=KO
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Function to build pdf onto disk
+	 *
+	 *  @param		Commande	$object				Object to generate
+	 *  @param		Translate	$outputlangs		Lang output object
+	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *  @return     int             			    1=OK, 0=KO
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-	    // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblines;
 
 		if (!is_object($outputlangs)) $outputlangs = $langs;
@@ -201,8 +208,9 @@ class pdf_eratosthene extends ModelePDFCommandes
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "orders", "deliveries"));
 
+		global $outputlangsbis;
+		$outputlangsbis = null;
 		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
-			global $outputlangsbis;
 			$outputlangsbis = new Translate('', $conf);
 			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
 			$outputlangsbis->loadLangs(array("main", "dict", "companies", "bills", "products", "orders", "deliveries"));
@@ -212,7 +220,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 		$hidetop = 0;
 		if (!empty($conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE)) {
-		    $hidetop = $conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE;
+			$hidetop = $conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE;
 		}
 
 		// Loop on each lines to detect if there is at least one image to show
@@ -220,64 +228,68 @@ class pdf_eratosthene extends ModelePDFCommandes
 		$this->atleastonephoto = false;
 		if (!empty($conf->global->MAIN_GENERATE_ORDERS_WITH_PICTURE))
 		{
-		    $objphoto = new Product($this->db);
+			$objphoto = new Product($this->db);
 
-		    for ($i = 0; $i < $nblines; $i++)
-		    {
-		        if (empty($object->lines[$i]->fk_product)) continue;
+			for ($i = 0; $i < $nblines; $i++)
+			{
+				if (empty($object->lines[$i]->fk_product)) continue;
 
-		        $objphoto->fetch($object->lines[$i]->fk_product);
-		        //var_dump($objphoto->ref);exit;
-		        if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-		        {
-		            $pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
-		            $pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
-		        } else {
-		            $pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
-		            $pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
-		        }
+				$objphoto->fetch($object->lines[$i]->fk_product);
+				//var_dump($objphoto->ref);exit;
+				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
+				{
+					$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
+					$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
+				} else {
+					$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
+					$pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
+				}
 
-		        $arephoto = false;
-		        foreach ($pdir as $midir)
-		        {
-		            if (!$arephoto)
-		            {
-		                $dir = $conf->product->dir_output.'/'.$midir;
+				$arephoto = false;
+				foreach ($pdir as $midir)
+				{
+					if (!$arephoto)
+					{
+						if ($conf->product->entity != $objphoto->entity) {
+							$dir = $conf->product->multidir_output[$objphoto->entity].'/'.$midir; //Check repertories of current entities
+						} else {
+							$dir = $conf->product->dir_output.'/'.$midir; //Check repertory of the current product
+						}
 
-		                foreach ($objphoto->liste_photos($dir, 1) as $key => $obj)
-		                {
-		                    if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES))		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
-		                    {
-		                        if ($obj['photo_vignette'])
-		                        {
-		                            $filename = $obj['photo_vignette'];
-		                        } else {
-		                            $filename = $obj['photo'];
-		                        }
-		                    } else {
-		                        $filename = $obj['photo'];
-		                    }
+						foreach ($objphoto->liste_photos($dir, 1) as $key => $obj)
+						{
+							if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES))		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
+							{
+								if ($obj['photo_vignette'])
+								{
+									$filename = $obj['photo_vignette'];
+								} else {
+									$filename = $obj['photo'];
+								}
+							} else {
+								$filename = $obj['photo'];
+							}
 
-		                    $realpath = $dir.$filename;
-		                    $arephoto = true;
-		                    $this->atleastonephoto = true;
-		                }
-		            }
-		        }
+							$realpath = $dir.$filename;
+							$arephoto = true;
+							$this->atleastonephoto = true;
+						}
+					}
+				}
 
-		        if ($realpath && $arephoto) $realpatharray[$i] = $realpath;
-		    }
+				if ($realpath && $arephoto) $realpatharray[$i] = $realpath;
+			}
 		}
 
 
 
-		if ($conf->commande->dir_output)
+		if ($conf->commande->multidir_output[$conf->entity])
 		{
-            $object->fetch_thirdparty();
+			$object->fetch_thirdparty();
 
-            $deja_regle = 0;
+			$deja_regle = 0;
 
-            // Definition of $dir and $file
+			// Definition of $dir and $file
 			if ($object->specimen)
 			{
 				$dir = $conf->commande->multidir_output[$conf->entity];
@@ -316,21 +328,21 @@ class pdf_eratosthene extends ModelePDFCommandes
 				$pdf->SetAutoPageBreak(1, 0);
 
 				$heightforinfotot = 40; // Height reserved to output the info and total part
-		        $heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
-		        $heightforfooter = $this->marge_basse + (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
+				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+				$heightforfooter = $this->marge_basse + (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
 
-                if (class_exists('TCPDF'))
-                {
-                    $pdf->setPrintHeader(false);
-                    $pdf->setPrintFooter(false);
-                }
-                $pdf->SetFont(pdf_getPDFFont($outputlangs));
-                // Set path to the background PDF File
-                if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-                {
-                	$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
-                    $tplidx = $pdf->importPage(1);
-                }
+				if (class_exists('TCPDF'))
+				{
+					$pdf->setPrintHeader(false);
+					$pdf->setPrintFooter(false);
+				}
+				$pdf->SetFont(pdf_getPDFFont($outputlangs));
+				// Set path to the background PDF File
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+				{
+					$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+					$tplidx = $pdf->importPage(1);
+				}
 
 				$pdf->Open();
 				$pagenb = 0;
@@ -345,12 +357,13 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
-				/// Does we have at least one line with discount $this->atleastonediscount
-				foreach ($object->lines as $line) {
-				    if ($line->remise_percent) {
-				        $this->atleastonediscount = true;
-				        break;
-				    }
+				// Set $this->atleastonediscount if you have at least one discount
+				for ($i = 0; $i < $nblines; $i++)
+				{
+					if ($object->lines[$i]->remise_percent)
+					{
+						$this->atleastonediscount++;
+					}
 				}
 
 
@@ -358,7 +371,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 				$pdf->AddPage();
 				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 				$pagenb++;
-				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
+				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs, $outputlangsbis);
 				$pdf->SetFont('', '', $default_font_size - 1);
 				$pdf->MultiCell(0, 3, ''); // Set interline to 3
 				$pdf->SetTextColor(0, 0, 0);
@@ -368,7 +381,8 @@ class pdf_eratosthene extends ModelePDFCommandes
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
 
 				// Incoterm
-				if ($conf->incoterm->enabled)
+				$height_incoterms = 0;
+				if (!empty($conf->incoterm->enabled))
 				{
 					$desc_incoterms = $object->getIncotermsForPDF();
 					if ($desc_incoterms)
@@ -377,7 +391,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 						$pdf->SetFont('', '', $default_font_size - 1);
 						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top - 1, dol_htmlentitiesbr($desc_incoterms), 0, 1);
-						$nexY = $pdf->GetY();
+						$nexY = max($pdf->GetY(), $nexY);
 						$height_incoterms = $nexY - $tab_top;
 
 						// Rect takes a length in 3rd parameter
@@ -402,125 +416,124 @@ class pdf_eratosthene extends ModelePDFCommandes
 					}
 				}
 
-                // Extrafields in note
-                $extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
-                if (!empty($extranote))
-                {
-                    $notetoshow = dol_concatdesc($notetoshow, $extranote);
-                }
+				// Extrafields in note
+				$extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
+				if (!empty($extranote)) {
+					$notetoshow = dol_concatdesc($notetoshow, $extranote);
+				}
 
 				$pagenb = $pdf->getPage();
 				if ($notetoshow)
 				{
-				    $tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
-				    $pageposbeforenote = $pagenb;
-
-				    $substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
-				    complete_substitutions_array($substitutionarray, $outputlangs, $object);
-				    $notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
-				    $notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
-
 					$tab_top -= 2;
 
-				    $pdf->startTransaction();
+					$tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
+					$pageposbeforenote = $pagenb;
 
-				    $pdf->SetFont('', '', $default_font_size - 1);
-				    $pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
-				    // Description
-				    $pageposafternote = $pdf->getPage();
-				    $posyafter = $pdf->GetY();
+					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
+					complete_substitutions_array($substitutionarray, $outputlangs, $object);
+					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
+					$notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
 
-				    if ($pageposafternote > $pageposbeforenote)
-				    {
-				        $pdf->rollbackTransaction(true);
+					$pdf->startTransaction();
 
-				        // prepare pages to receive notes
-				        while ($pagenb < $pageposafternote) {
-				            $pdf->AddPage();
-				            $pagenb++;
-				            if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-				            if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-				            // $this->_pagefoot($pdf,$object,$outputlangs,1);
-				            $pdf->setTopMargin($tab_top_newpage);
-				            // The only function to edit the bottom margin of current page to set it.
-				            $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
-				        }
+					$pdf->SetFont('', '', $default_font_size - 1);
+					$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+					// Description
+					$pageposafternote = $pdf->getPage();
+					$posyafter = $pdf->GetY();
 
-				        // back to start
-				        $pdf->setPage($pageposbeforenote);
-				        $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
-				        $pdf->SetFont('', '', $default_font_size - 1);
-				        $pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
-				        $pageposafternote = $pdf->getPage();
+					if ($pageposafternote > $pageposbeforenote)
+					{
+						$pdf->rollbackTransaction(true);
 
-				        $posyafter = $pdf->GetY();
+						// prepare pages to receive notes
+						while ($pagenb < $pageposafternote) {
+							$pdf->AddPage();
+							$pagenb++;
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							// $this->_pagefoot($pdf,$object,$outputlangs,1);
+							$pdf->setTopMargin($tab_top_newpage);
+							// The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						}
 
-				        if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))	// There is no space left for total+free text
-				        {
-				            $pdf->AddPage('', '', true);
-				            $pagenb++;
-				            $pageposafternote++;
-				            $pdf->setPage($pageposafternote);
-				            $pdf->setTopMargin($tab_top_newpage);
-				            // The only function to edit the bottom margin of current page to set it.
-				            $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
-				            //$posyafter = $tab_top_newpage;
-				        }
+						// back to start
+						$pdf->setPage($pageposbeforenote);
+						$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						$pdf->SetFont('', '', $default_font_size - 1);
+						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+						$pageposafternote = $pdf->getPage();
+
+						$posyafter = $pdf->GetY();
+
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))	// There is no space left for total+free text
+						{
+							$pdf->AddPage('', '', true);
+							$pagenb++;
+							$pageposafternote++;
+							$pdf->setPage($pageposafternote);
+							$pdf->setTopMargin($tab_top_newpage);
+							// The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							//$posyafter = $tab_top_newpage;
+						}
 
 
-				        // apply note frame to previous pages
-				        $i = $pageposbeforenote;
-				        while ($i < $pageposafternote) {
-				            $pdf->setPage($i);
+						// apply note frame to previous pages
+						$i = $pageposbeforenote;
+						while ($i < $pageposafternote) {
+							$pdf->setPage($i);
 
 
-				            $pdf->SetDrawColor(128, 128, 128);
-				            // Draw note frame
-				            if ($i > $pageposbeforenote) {
-				                $height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
-				                $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-				            } else {
-				                $height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
-				                $pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
-				            }
+							$pdf->SetDrawColor(128, 128, 128);
+							// Draw note frame
+							if ($i > $pageposbeforenote) {
+								$height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
+								$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
+							} else {
+								$height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
+								$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
+							}
 
-				            // Add footer
-				            $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-				            $this->_pagefoot($pdf, $object, $outputlangs, 1);
+							// Add footer
+							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 
-				            $i++;
-				        }
+							$i++;
+						}
 
-				        // apply note frame to last page
-				        $pdf->setPage($pageposafternote);
-				        if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-				        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-				        $height_note = $posyafter - $tab_top_newpage;
-				        $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-				    } else // No pagebreak
-				    {
-				        $pdf->commitTransaction();
-				        $posyafter = $pdf->GetY();
-				        $height_note = $posyafter - $tab_top;
-				        $pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
+						// apply note frame to last page
+						$pdf->setPage($pageposafternote);
+						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						$height_note = $posyafter - $tab_top_newpage;
+						$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
+					} else // No pagebreak
+					{
+						$pdf->commitTransaction();
+						$posyafter = $pdf->GetY();
+						$height_note = $posyafter - $tab_top;
+						$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
 
 
-				        if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))
-				        {
-				            // not enough space, need to add page
-				            $pdf->AddPage('', '', true);
-				            $pagenb++;
-				            $pageposafternote++;
-				            $pdf->setPage($pageposafternote);
-				            if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-				            if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))
+						{
+							// not enough space, need to add page
+							$pdf->AddPage('', '', true);
+							$pagenb++;
+							$pageposafternote++;
+							$pdf->setPage($pageposafternote);
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 
-				            $posyafter = $tab_top_newpage;
-				        }
-				    }
+							$posyafter = $tab_top_newpage;
+						}
+					}
 
-				    $tab_height = $tab_height - $height_note;
-				    $tab_top = $posyafter + 6;
+					$tab_height = $tab_height - $height_note;
+					$tab_top = $posyafter + 6;
 				} else {
 					$height_note = 0;
 				}
@@ -529,7 +542,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 				// Use new auto column system
 				$this->prepareArrayColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
-				// tab simulation to know line height
+				// Table simulation to know the height of the title line
 				$pdf->startTransaction();
 				$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
 				$pdf->rollbackTransaction(true);
@@ -556,73 +569,75 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 					$showpricebeforepagebreak = 1;
 					$posYAfterImage = 0;
+					$posYAfterDescription = 0;
 
 					if ($this->getColumnStatus('photo'))
 					{
-					    // We start with Photo of product line
-					    if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// If photo too high, we moved completely on new page
-					    {
-					        $pdf->AddPage('', '', true);
-					        if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-					        $pdf->setPage($pageposbefore + 1);
+						// We start with Photo of product line
+						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// If photo too high, we moved completely on new page
+						{
+							$pdf->AddPage('', '', true);
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							$pdf->setPage($pageposbefore + 1);
 
-					        $curY = $tab_top_newpage;
+							$curY = $tab_top_newpage;
 
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
 							else $showpricebeforepagebreak = 0;
-					    }
+						}
 
-					    if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
-					    {
-					        $pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
-					        // $pdf->Image does not increase value return by getY, so we save it manually
-					        $posYAfterImage = $curY + $imglinesize['height'];
-					    }
+						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
+						{
+							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
+							// $pdf->Image does not increase value return by getY, so we save it manually
+							$posYAfterImage = $curY + $imglinesize['height'];
+						}
 					}
 
+					// Description of product line
 					if ($this->getColumnStatus('desc'))
 					{
-    					$pdf->startTransaction();
+						$pdf->startTransaction();
 
-                        $this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
+						$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
+						$pageposafter = $pdf->getPage();
 
-                        $pageposafter = $pdf->getPage();
-    					if ($pageposafter > $pageposbefore)	// There is a pagebreak
-    					{
-    						$pdf->rollbackTransaction(true);
-    						$pageposafter = $pageposbefore;
-    						//print $pageposafter.'-'.$pageposbefore;exit;
-    						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+						if ($pageposafter > $pageposbefore)	// There is a pagebreak
+						{
+							$pdf->rollbackTransaction(true);
+							$pageposafter = $pageposbefore;
+							//print $pageposafter.'-'.$pageposbefore;exit;
+							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
-                            $this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
-    						$pageposafter = $pdf->getPage();
-    						$posyafter = $pdf->GetY();
-    						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
-    						{
-    							if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-    							{
-    								$pdf->AddPage('', '', true);
-    								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-    								//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-    								$pdf->setPage($pageposafter + 1);
-    							}
-    						} else {
-    							// We found a page break
+							$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
+							$pageposafter = $pdf->getPage();
+							$posyafter = $pdf->GetY();
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
+							{
+								if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
+								{
+									$pdf->AddPage('', '', true);
+									if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+									//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+									$pdf->setPage($pageposafter + 1);
+								}
+							} else {
+								// We found a page break
 								// Allows data in the first page if description is long enough to break in multiples pages
 								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 									$showpricebeforepagebreak = 1;
 								else $showpricebeforepagebreak = 0;
-    						}
-    					} else // No pagebreak
-    					{
-    						$pdf->commitTransaction();
-    					}
+							}
+						} else // No pagebreak
+						{
+							$pdf->commitTransaction();
+						}
+						$posYAfterDescription = $pdf->GetY();
 					}
 
 
-
 					$nexY = max($pdf->GetY(), $posYAfterImage);
 
 
@@ -632,7 +647,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 					$pdf->setTopMargin($this->marge_haute);
 					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 
-					// We suppose that a too long description is moved completely on next page
+					// We suppose that a too long description or photo were moved completely on next page
 					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
 						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
 					}
@@ -642,79 +657,87 @@ class pdf_eratosthene extends ModelePDFCommandes
 					// VAT Rate
 					if ($this->getColumnStatus('vat'))
 					{
-					    $vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
-					    $this->printStdColumnContent($pdf, $curY, 'vat', $vat_rate);
-					    $nexY = max($pdf->GetY(), $nexY);
+						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
+						$this->printStdColumnContent($pdf, $curY, 'vat', $vat_rate);
+						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Unit price before discount
 					if ($this->getColumnStatus('subprice'))
 					{
-					    $up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
-					    $this->printStdColumnContent($pdf, $curY, 'subprice', $up_excl_tax);
-					    $nexY = max($pdf->GetY(), $nexY);
+						$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
+						$this->printStdColumnContent($pdf, $curY, 'subprice', $up_excl_tax);
+						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Quantity
 					// Enough for 6 chars
 					if ($this->getColumnStatus('qty'))
 					{
-					    $qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
-					    $this->printStdColumnContent($pdf, $curY, 'qty', $qty);
-					    $nexY = max($pdf->GetY(), $nexY);
+						$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
+						$this->printStdColumnContent($pdf, $curY, 'qty', $qty);
+						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 
 					// Unit
 					if ($this->getColumnStatus('unit'))
 					{
-					    $unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
-					    $this->printStdColumnContent($pdf, $curY, 'unit', $unit);
-					    $nexY = max($pdf->GetY(), $nexY);
+						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$this->printStdColumnContent($pdf, $curY, 'unit', $unit);
+						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Discount on line
 					if ($this->getColumnStatus('discount') && $object->lines[$i]->remise_percent)
 					{
-					    $remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
-					    $this->printStdColumnContent($pdf, $curY, 'discount', $remise_percent);
-					    $nexY = max($pdf->GetY(), $nexY);
+						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
+						$this->printStdColumnContent($pdf, $curY, 'discount', $remise_percent);
+						$nexY = max($pdf->GetY(), $nexY);
 					}
 
-					// Total HT line
+					// Total excl tax line (HT)
 					if ($this->getColumnStatus('totalexcltax'))
 					{
-					    $total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
-					    $this->printStdColumnContent($pdf, $curY, 'totalexcltax', $total_excl_tax);
-					    $nexY = max($pdf->GetY(), $nexY);
+						$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
+						$this->printStdColumnContent($pdf, $curY, 'totalexcltax', $total_excl_tax);
+						$nexY = max($pdf->GetY(), $nexY);
 					}
 
-                    // Extrafields
-                    if (!empty($object->lines[$i]->array_options)) {
-                        foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
-                            if ($this->getColumnStatus($extrafieldColKey))
-                            {
-                                $extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey);
-                                $this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
-                                $nexY = max($pdf->GetY(), $nexY);
-                            }
-                        }
-                    }
+					// Total with tax line (TTC)
+					if ($this->getColumnStatus('totalincltax'))
+					{
+						$total_incl_tax = pdf_getlinetotalwithtax($object, $i, $outputlangs, $hidedetails);
+						$this->printStdColumnContent($pdf, $curY, 'totalincltax', $total_incl_tax);
+						$nexY = max($pdf->GetY(), $nexY);
+					}
+
+					// Extrafields
+					if (!empty($object->lines[$i]->array_options)) {
+						foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
+							if ($this->getColumnStatus($extrafieldColKey))
+							{
+								$extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey);
+								$this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
+								$nexY = max($pdf->GetY(), $nexY);
+							}
+						}
+					}
 
 					$parameters = array(
-					    'object' => $object,
-					    'i' => $i,
-					    'pdf' =>& $pdf,
-					    'curY' =>& $curY,
-					    'nexY' =>& $nexY,
-					    'outputlangs' => $outputlangs,
-					    'hidedetails' => $hidedetails
+						'object' => $object,
+						'i' => $i,
+						'pdf' =>& $pdf,
+						'curY' =>& $curY,
+						'nexY' =>& $nexY,
+						'outputlangs' => $outputlangs,
+						'hidedetails' => $hidedetails
 					);
 					$reshook = $hookmanager->executeHooks('printPDFline', $parameters, $this); // Note that $object may have been modified by hook
 
 
 					// Collection of totals by value of vat in $this->tva["rate"] = total_tva
-					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
+					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
 					else $tvaligne = $object->lines[$i]->total_tva;
 
 					$localtax1ligne = $object->lines[$i]->total_localtax1;
@@ -739,7 +762,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 						$localtax2_type = $localtaxtmp_array[2];
 					}
 
-				    // retrieve global local tax
+					// retrieve global local tax
 					if ($localtax1_type && $localtax1ligne != 0)
 						$this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
 					if ($localtax2_type && $localtax2ligne != 0)
@@ -766,7 +789,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 						$pdf->setPage($pagenb);
 						if ($pagenb == $pageposbeforeprintlines)
 						{
-						    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
@@ -778,10 +801,10 @@ class pdf_eratosthene extends ModelePDFCommandes
 					}
 					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
 					{
-					    if ($pagenb == $pageposafter)
+						if ($pagenb == $pageposafter)
 						{
-						    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
-					    } else {
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -795,14 +818,17 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 				// Show square
 				if ($pagenb == $pageposbeforeprintlines)
-				    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code);
-				else $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
+				{
+					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code);
+				} else {
+					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
+				}
 				$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 
-				// Affiche zone infos
+				// Display infos area
 				$posy = $this->drawInfoTable($pdf, $object, $bottomlasttab, $outputlangs);
 
-				// Affiche zone totaux
+				// Display total zone
 				$posy = $this->drawTotalTable($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
 
 				// Affiche zone versements
@@ -828,8 +854,8 @@ class pdf_eratosthene extends ModelePDFCommandes
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0)
 				{
-				    $this->error = $hookmanager->error;
-				    $this->errors = $hookmanager->errors;
+					$this->error = $hookmanager->error;
+					$this->errors = $hookmanager->errors;
 				}
 
 				if (!empty($conf->global->MAIN_UMASK))
@@ -850,9 +876,9 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 	/**
 	 *  Show payments table
-   *
+	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
-	 *  @param  Object		$object			Object order
+	 *  @param  Commande	$object			Object order
 	 *	@param	int			$posy			Position y in PDF
 	 *	@param	Translate	$outputlangs	Object langs for output
 	 *	@return int							<0 if KO, >0 if OK
@@ -865,7 +891,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 	 *   Show miscellaneous information (payment mode, payment term, ...)
 	 *
 	 *   @param		TCPDF		$pdf     		Object PDF
-	 *   @param		Object		$object			Object to show
+	 *   @param		Commande	$object			Object to show
 	 *   @param		int			$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @return	int							Pos y
@@ -877,7 +903,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 		$pdf->SetFont('', '', $default_font_size - 1);
 
-        // If France, show VAT mention if not applicable
+		// If France, show VAT mention if not applicable
 		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj))
 		{
 			$pdf->SetFont('', 'B', $default_font_size - 2);
@@ -906,8 +932,8 @@ class pdf_eratosthene extends ModelePDFCommandes
 			$posy = $pdf->GetY() + 3;
 		}
 
-        // Check a payment mode is defined
-        /* Not used with orders
+		// Check a payment mode is defined
+		/* Not used with orders
 		if (empty($object->mode_reglement_code)
         	&& ! $conf->global->FACTURE_CHQ_NUMBER
         	&& ! $conf->global->FACTURE_RIB_NUMBER)
@@ -933,21 +959,21 @@ class pdf_eratosthene extends ModelePDFCommandes
             $posy=$pdf->GetY()+1;
 		}*/
 
-	    // Show planed date of delivery
-        if (!empty($object->date_livraison))
+		// Show planed date of delivery
+		if (!empty($object->delivery_date))
 		{
-            $outputlangs->load("sendings");
+			$outputlangs->load("sendings");
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("DateDeliveryPlanned").':';
 			$pdf->MultiCell(80, 4, $titre, 0, 'L');
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posxval, $posy);
-			$dlp = dol_print_date($object->date_livraison, "daytext", false, $outputlangs, true);
+			$dlp = dol_print_date($object->delivery_date, "daytext", false, $outputlangs, true);
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
-            $posy = $pdf->GetY() + 1;
-        } elseif ($object->availability_code || $object->availability)    // Show availability conditions
+			$posy = $pdf->GetY() + 1;
+		} elseif ($object->availability_code || $object->availability)    // Show availability conditions
 		{
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
@@ -961,74 +987,76 @@ class pdf_eratosthene extends ModelePDFCommandes
 			$pdf->MultiCell(80, 4, $lib_availability, 0, 'L');
 
 			$posy = $pdf->GetY() + 1;
-        }
+		}
 
-        // Show payment mode
-        if ($object->mode_reglement_code
-        	&& $object->mode_reglement_code != 'CHQ'
-           	&& $object->mode_reglement_code != 'VIR') {
-            $pdf->SetFont('', 'B', $default_font_size - 2);
-            $pdf->SetXY($this->marge_gauche, $posy);
-            $titre = $outputlangs->transnoentities("PaymentMode").':';
-            $pdf->MultiCell(80, 5, $titre, 0, 'L');
+		// Show payment mode
+		if ($object->mode_reglement_code
+			&& $object->mode_reglement_code != 'CHQ'
+		   	&& $object->mode_reglement_code != 'VIR') {
+			$pdf->SetFont('', 'B', $default_font_size - 2);
+			$pdf->SetXY($this->marge_gauche, $posy);
+			$titre = $outputlangs->transnoentities("PaymentMode").':';
+			$pdf->MultiCell(80, 5, $titre, 0, 'L');
 
 			$pdf->SetFont('', '', $default_font_size - 2);
-            $pdf->SetXY($posxval, $posy);
-            $lib_mode_reg = $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) != ('PaymentType'.$object->mode_reglement_code) ? $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) : $outputlangs->convToOutputCharset($object->mode_reglement);
-            $pdf->MultiCell(80, 5, $lib_mode_reg, 0, 'L');
+			$pdf->SetXY($posxval, $posy);
+			$lib_mode_reg = $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) != ('PaymentType'.$object->mode_reglement_code) ? $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) : $outputlangs->convToOutputCharset($object->mode_reglement);
+			$pdf->MultiCell(80, 5, $lib_mode_reg, 0, 'L');
 
-            $posy = $pdf->GetY() + 2;
-        }
+			$posy = $pdf->GetY() + 2;
+		}
 
 		// Show payment mode CHQ
-        if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
-        {
-            // Si mode reglement non force ou si force a CHQ
-            if (!empty($conf->global->FACTURE_CHQ_NUMBER))
-            {
-	            if ($conf->global->FACTURE_CHQ_NUMBER > 0)
-	            {
-	                $account = new Account($this->db);
-	                $account->fetch($conf->global->FACTURE_CHQ_NUMBER);
-
-	                $pdf->SetXY($this->marge_gauche, $posy);
-	                $pdf->SetFont('', 'B', $default_font_size - 3);
-	                $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->proprio), 0, 'L', 0);
-		            $posy = $pdf->GetY() + 1;
-
-		            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-		            {
-		                $pdf->SetXY($this->marge_gauche, $posy);
-		                $pdf->SetFont('', '', $default_font_size - 3);
-		                $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
-			            $posy = $pdf->GetY() + 2;
-		            }
-	            }
-	            if ($conf->global->FACTURE_CHQ_NUMBER == -1)
-	            {
-	                $pdf->SetXY($this->marge_gauche, $posy);
-	                $pdf->SetFont('', 'B', $default_font_size - 3);
-	                $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
-		            $posy = $pdf->GetY() + 1;
-
-		            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-		            {
-			            $pdf->SetXY($this->marge_gauche, $posy);
-		                $pdf->SetFont('', '', $default_font_size - 3);
-		                $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
-			            $posy = $pdf->GetY() + 2;
-		            }
-	            }
-            }
-        }
-
-        // If payment mode not forced or forced to VIR, show payment with BAN
-        if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
-        {
-			if (!empty($object->fk_account) || !empty($object->fk_bank) || !empty($conf->global->FACTURE_RIB_NUMBER))
+		if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
+		{
+			// Si mode reglement non force ou si force a CHQ
+			if (!empty($conf->global->FACTURE_CHQ_NUMBER))
 			{
-				$bankid = (empty($object->fk_account) ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
-				if (!empty($object->fk_bank)) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
+				$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
+
+				if ($conf->global->FACTURE_CHQ_NUMBER > 0)
+				{
+					$account = new Account($this->db);
+					$account->fetch($conf->global->FACTURE_CHQ_NUMBER);
+
+					$pdf->SetXY($this->marge_gauche, $posy);
+					$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->proprio), 0, 'L', 0);
+					$posy = $pdf->GetY() + 1;
+
+					if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
+					{
+						$pdf->SetXY($this->marge_gauche, $posy);
+						$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
+						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
+						$posy = $pdf->GetY() + 2;
+					}
+				}
+				if ($conf->global->FACTURE_CHQ_NUMBER == -1)
+				{
+					$pdf->SetXY($this->marge_gauche, $posy);
+					$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
+					$posy = $pdf->GetY() + 1;
+
+					if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
+					{
+						$pdf->SetXY($this->marge_gauche, $posy);
+						$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
+						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
+						$posy = $pdf->GetY() + 2;
+					}
+				}
+			}
+		}
+
+		// If payment mode not forced or forced to VIR, show payment with BAN
+		if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
+		{
+			if ($object->fk_account > 0 || $object->fk_bank > 0 || !empty($conf->global->FACTURE_RIB_NUMBER))
+			{
+				$bankid = ($object->fk_account <= 0 ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
+				if ($object->fk_bank > 0) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
 				$account = new Account($this->db);
 				$account->fetch($bankid);
 
@@ -1039,7 +1067,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 				$posy += 2;
 			}
-        }
+		}
 
 		return $posy;
 	}
@@ -1048,8 +1076,8 @@ class pdf_eratosthene extends ModelePDFCommandes
 	/**
 	 *	Show total to pay
 	 *
-	 *	@param	TCPDF		$pdf           Object PDF
-	 *	@param  Facture		$object         Object invoice
+	 *	@param	TCPDF		$pdf            Object PDF
+	 *	@param  Commande	$object         Object to show
 	 *	@param  int			$deja_regle     Montant deja regle
 	 *	@param	int			$posy			Position depart
 	 *	@param	Translate	$outputlangs	Objet langs
@@ -1057,43 +1085,45 @@ class pdf_eratosthene extends ModelePDFCommandes
 	 */
 	protected function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
-	    global $conf, $mysoc;
+		global $conf, $mysoc, $hookmanager;
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$tab2_top = $posy;
-		$tab2_hl = 4;
-		$pdf->SetFont('', '', $default_font_size - 1);
-
-		// Tableau total
-        $col1x = 120; $col2x = 170;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
-			$col2x -= 20;
-		}
-		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
-		$useborder = 0;
-		$index = 0;
-
 		$outputlangsbis = null;
 		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
 			$outputlangsbis = new Translate('', $conf);
 			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
 			$outputlangsbis->loadLangs(array("main", "dict", "companies", "bills", "products", "propal"));
+			$default_font_size--;
 		}
 
+		$tab2_top = $posy;
+		$tab2_hl = 4;
+		$pdf->SetFont('', '', $default_font_size - 1);
+
+		// Total table
+		$col1x = 120; $col2x = 170;
+		if ($this->page_largeur < 210) // To work with US executive format
+		{
+			$col2x -= 20;
+		}
+		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
+
+		$useborder = 0;
+		$index = 0;
+
 		// Total HT
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top + 0);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', 1);
-		$total_ht = (($conf->multicurrency->enabled && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
+		$total_ht = ((!empty($conf->multicurrency->enabled) && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + 0);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248, 248, 248);
 
-		$total_ttc = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
+		$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
 		$this->atleastoneratenotnull = 0;
 		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
@@ -1133,7 +1163,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 						}
 					}
 				}
-	      		//}
+		  		//}
 				//Local tax 2 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
@@ -1216,15 +1246,15 @@ class pdf_eratosthene extends ModelePDFCommandes
 							}
 							$totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("TotalLT1", $mysoc->country_code) : '');
 							$totalvat .= ' ';
-
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
+
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
 						}
 					}
 				}
-	      		//}
+		  		//}
 				//Local tax 2 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
@@ -1234,6 +1264,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 					foreach ($localtax_rate as $tvakey => $tvaval)
 					{
+						// retrieve global local tax
 						if ($tvakey != 0)    // On affiche pas taux 0
 						{
 							//$this->atleastoneratenotnull++;
@@ -1274,8 +1305,8 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 		$pdf->SetTextColor(0, 0, 0);
 
-        $creditnoteamount = 0;
-        $depositsamount = 0;
+		$creditnoteamount = 0;
+		$depositsamount = 0;
 		//$creditnoteamount=$object->getSumCreditNotesUsed();
 		//$depositsamount=$object->getSumDepositsUsed();
 		//print "x".$creditnoteamount."-".$depositsamount;exit;
@@ -1296,7 +1327,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->SetFillColor(224, 224, 224);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("AlreadyPaid") : ''), $useborder, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("RemainderToPay") : ''), $useborder, 'L', 1);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
@@ -1321,9 +1352,10 @@ class pdf_eratosthene extends ModelePDFCommandes
 	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
 	 *   @param		int			$hidebottom		Hide bottom bar of array
 	 *   @param		string		$currency		Currency code
+	 *   @param		Translate	$outputlangsbis	Langs object bis
 	 *   @return	void
 	 */
-	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '', $outputlangsbis = null)
 	{
 		global $conf;
 
@@ -1341,6 +1373,10 @@ class pdf_eratosthene extends ModelePDFCommandes
 		if (empty($hidetop))
 		{
 			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
+			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+				$titre .= ' - '.$outputlangsbis->transnoentities("AmountInCurrency", $outputlangsbis->transnoentitiesnoconv("Currency".$currency));
+			}
+
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
@@ -1360,7 +1396,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
 
 		if (empty($hidetop)) {
-		    $pdf->line($this->marge_gauche, $tab_top + $this->tabTitleHeight, $this->page_largeur - $this->marge_droite, $tab_top + $this->tabTitleHeight); // line takes a position y in 2nd parameter and 4th parameter
+			$pdf->line($this->marge_gauche, $tab_top + $this->tabTitleHeight, $this->page_largeur - $this->marge_droite, $tab_top + $this->tabTitleHeight); // line takes a position y in 2nd parameter and 4th parameter
 		}
 	}
 
@@ -1370,13 +1406,14 @@ class pdf_eratosthene extends ModelePDFCommandes
 	 *  Show top header of page.
 	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
-	 *  @param  Object		$object     	Object to show
+	 *  @param  Commande	$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @param  Translate	$outputlangsbis	Object lang for output bis
 	 *  @param	string		$titlekey		Translation key to show as title of document
 	 *  @return	int                         Return topshift value
 	 */
-	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey = "PdfOrderTitle")
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $outputlangsbis = null, $titlekey = "PdfOrderTitle")
 	{
 		// phpcs:enable
 		global $conf, $langs, $hookmanager;
@@ -1391,14 +1428,16 @@ class pdf_eratosthene extends ModelePDFCommandes
 		// Show Draft Watermark
 		if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK)))
 		{
-            pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->COMMANDE_DRAFT_WATERMARK);
+			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->COMMANDE_DRAFT_WATERMARK);
 		}
 
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 
+		$w = 100;
+
 		$posy = $this->marge_haute;
-		$posx = $this->page_largeur - $this->marge_droite - 100;
+		$posx = $this->page_largeur - $this->marge_droite - $w;
 
 		$pdf->SetXY($this->marge_gauche, $posy);
 
@@ -1415,19 +1454,18 @@ class pdf_eratosthene extends ModelePDFCommandes
 				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
 				}
-				if (is_readable($logo))
-				{
-				    $height = pdf_getHeightForLogo($logo);
-				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
+				if (is_readable($logo)) {
+					$height = pdf_getHeightForLogo($logo);
+					$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 				} else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
+					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
 			} else {
 				$text = $this->emetteur->name;
-				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
 		}
 
@@ -1435,24 +1473,35 @@ class pdf_eratosthene extends ModelePDFCommandes
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
 		$title = $outputlangs->transnoentities($titlekey);
-		$pdf->MultiCell(100, 3, $title, '', 'R');
+		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+			$title .= ' - ';
+			$title .= $outputlangsbis->transnoentities($titlekey);
+		}
+
+		$pdf->MultiCell($w, 3, $title, '', 'R');
 
 		$pdf->SetFont('', 'B', $default_font_size);
 
 		$posy += 5;
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
-		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref), '', 'R');
+		$textref = $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref);
+		if ($object->statut == $object::STATUS_DRAFT)
+		{
+			$pdf->SetTextColor(128, 0, 0);
+			$textref .= ' - '.$outputlangs->transnoentities("NotValidated");
+		}
+		$pdf->MultiCell($w, 4, $textref, '', 'R');
 
 		$posy += 1;
-		$pdf->SetFont('', '', $default_font_size - 1);
+		$pdf->SetFont('', '', $default_font_size - 2);
 
 		if ($object->ref_client)
 		{
-			$posy += 5;
+			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
 
 		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE))
@@ -1483,29 +1532,33 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
+		$title = $outputlangs->transnoentities("OrderDate");
+		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+			$title .= ' - '.$outputlangsbis->transnoentities("DateInvoice");
+		}
+		$pdf->MultiCell($w, 3, $title." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
 
 		if (!empty($conf->global->DOC_SHOW_CUSTOMER_CODE) && !empty($object->thirdparty->code_client))
 		{
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("CustomerCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
 		}
 
 		// Get contact
 		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
 		{
-		    $arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-		    if (count($arrayidcontact) > 0)
-		    {
-                $usertmp = new User($this->db);
-		        $usertmp->fetch($arrayidcontact[0]);
-                $posy += 4;
-                $pdf->SetXY($posx, $posy);
-		        $pdf->SetTextColor(0, 0, 60);
-		        $pdf->MultiCell(100, 3, $langs->trans("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
-		    }
+			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
+			if (count($arrayidcontact) > 0)
+			{
+				$usertmp = new User($this->db);
+				$usertmp->fetch($arrayidcontact[0]);
+				$posy += 4;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 3, $langs->transnoentities("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
+			}
 		}
 
 		$posy += 2;
@@ -1513,7 +1566,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		$top_shift = 0;
 		// Show list of linked objects
 		$current_y = $pdf->getY();
-		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);
 		if ($current_y < $pdf->getY())
 		{
 			$top_shift = $pdf->getY() - $current_y;
@@ -1535,10 +1588,14 @@ class pdf_eratosthene extends ModelePDFCommandes
 		 	$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
 
 			// Show sender
-			$posy = 42 + $top_shift;
+		 	$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+		 	$posy += $top_shift;
 			$posx = $this->marge_gauche;
 			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
-			$hautcadre = 40;
+
+			$hautcadre = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
+			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
+
 
 			// Show sender frame
 			$pdf->SetTextColor(0, 0, 0);
@@ -1547,23 +1604,21 @@ class pdf_eratosthene extends ModelePDFCommandes
 			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
-			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+			$pdf->MultiCell($widthrecbox, $hautcadre, "", 0, 'R', 1);
 			$pdf->SetTextColor(0, 0, 60);
 
 			// Show sender name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+			$pdf->MultiCell($widthrecbox - 2, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
 			$posy = $pdf->getY();
 
 			// Show sender information
 			$pdf->SetXY($posx + 2, $posy);
 			$pdf->SetFont('', '', $default_font_size - 1);
-			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
+			$pdf->MultiCell($widthrecbox - 2, 4, $carac_emetteur, 0, 'L');
 
-
-
-			// If CUSTOMER contact defined on order, we use it
+			// If CUSTOMER contact defined, we use it
 			$usecontact = false;
 			$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
 			if (count($arrayidcontact) > 0)
@@ -1573,8 +1628,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			}
 
 			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -1585,9 +1639,10 @@ class pdf_eratosthene extends ModelePDFCommandes
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, 'target', $object);
 
 			// Show recipient
-			$widthrecbox = 100;
+			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
 			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
-			$posy = 42 + $top_shift;
+			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+			$posy += $top_shift;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
 			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
 
@@ -1601,7 +1656,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
+			$pdf->MultiCell($widthrecbox, 2, $carac_client_name, 0, 'L');
 
 			$posy = $pdf->getY();
 
@@ -1619,9 +1674,9 @@ class pdf_eratosthene extends ModelePDFCommandes
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
-     *
+	 *
 	 *   	@param	TCPDF		$pdf     			PDF
-	 * 		@param	Object		$object				Object to show
+	 * 		@param	Commande	$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	int								Return height of bottom margin including footer text
@@ -1630,7 +1685,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 	{
 		// phpcs:enable
 		global $conf;
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'ORDER_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 
@@ -1639,30 +1694,30 @@ class pdf_eratosthene extends ModelePDFCommandes
 	/**
 	 *   	Define Array Column Field
 	 *
-	 *   	@param	object			$object    		common object
+	 *   	@param	Commande		$object    		common object
 	 *   	@param	Translate		$outputlangs    langs
 	 *      @param	int				$hidedetails	Do not show line details
 	 *      @param	int				$hidedesc		Do not show desc
 	 *      @param	int				$hideref		Do not show ref
 	 *      @return	null
 	 */
-    public function defineColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
-    {
-	    global $conf, $hookmanager;
+	public function defineColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		global $conf, $hookmanager;
 
-	    // Default field style for content
-	    $this->defaultContentsFieldsStyle = array(
-	        'align' => 'R', // R,C,L
-            'padding' => array(1, 0.5, 1, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	    );
+		// Default field style for content
+		$this->defaultContentsFieldsStyle = array(
+			'align' => 'R', // R,C,L
+			'padding' => array(1, 0.5, 1, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+		);
 
-	    // Default field style for content
-	    $this->defaultTitlesFieldsStyle = array(
-	        'align' => 'C', // R,C,L
-	        'padding' => array(0.5, 0, 0.5, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	    );
+		// Default field style for content
+		$this->defaultTitlesFieldsStyle = array(
+			'align' => 'C', // R,C,L
+			'padding' => array(0.5, 0, 0.5, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+		);
 
-	    /*
+		/*
 	     * For exemple
 	     $this->cols['theColKey'] = array(
 	     'rank' => $rank, // int : use for ordering columns
@@ -1680,145 +1735,167 @@ class pdf_eratosthene extends ModelePDFCommandes
 	     );
 	     */
 
-	    $rank = 0; // do not use negative rank
-	    $this->cols['desc'] = array(
-	        'rank' => $rank,
-	        'width' => false, // only for desc
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'Designation', // use lang key is usefull in somme case with module
-	            'align' => 'L',
-	            // 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
-	            // 'label' => ' ', // the final label
-                'padding' => array(0.5, 1, 0.5, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	        ),
-	        'content' => array(
-	            'align' => 'L',
-                'padding' => array(1, 0.5, 1, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	        ),
-	    );
+		$rank = 0; // do not use negative rank
+		$this->cols['desc'] = array(
+			'rank' => $rank,
+			'width' => false, // only for desc
+			'status' => true,
+			'title' => array(
+				'textkey' => 'Designation', // use lang key is usefull in somme case with module
+				'align' => 'L',
+				// 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
+				// 'label' => ' ', // the final label
+				'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+			'content' => array(
+				'align' => 'L',
+				'padding' => array(1, 0.5, 1, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+		);
 
-	    $rank = $rank + 10;
-	    $this->cols['photo'] = array(
-	        'rank' => $rank,
-	        'width' => (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
-	        'status' => false,
-	        'title' => array(
-	            'textkey' => 'Photo',
-	            'label' => ' '
-	        ),
-	        'content' => array(
-	            'padding' => array(0, 0, 0, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	        ),
-	        'border-left' => false, // remove left line separator
-	    );
+		// Image of product
+		$rank = $rank + 10;
+		$this->cols['photo'] = array(
+			'rank' => $rank,
+			'width' => (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'Photo',
+				'label' => ' '
+			),
+			'content' => array(
+				'padding' => array(0, 0, 0, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+			'border-left' => false, // remove left line separator
+		);
 
-	    if (!empty($conf->global->MAIN_GENERATE_ORDERS_WITH_PICTURE))
-	    {
-	        $this->cols['photo']['status'] = true;
-	    }
+		if (!empty($conf->global->MAIN_GENERATE_ORDERS_WITH_PICTURE) && !empty($this->atleastonephoto))
+		{
+			$this->cols['photo']['status'] = true;
+		}
 
+		$rank = $rank + 10;
+		$this->cols['vat'] = array(
+			'rank' => $rank,
+			'status' => false,
+			'width' => 16, // in mm
+			'title' => array(
+				'textkey' => 'VAT'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    $rank = $rank + 10;
-	    $this->cols['vat'] = array(
-	        'rank' => $rank,
-	        'status' => false,
-	        'width' => 16, // in mm
-	        'title' => array(
-	            'textkey' => 'VAT'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
+		{
+			$this->cols['vat']['status'] = true;
+		}
 
-	    if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
-	    {
-	        $this->cols['vat']['status'] = true;
-	    }
+		$rank = $rank + 10;
+		$this->cols['subprice'] = array(
+			'rank' => $rank,
+			'width' => 19, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'PriceUHT'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    $rank = $rank + 10;
-	    $this->cols['subprice'] = array(
-	        'rank' => $rank,
-	        'width' => 19, // in mm
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'PriceUHT'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		// Adapt dynamically the width of subprice, if text is too long.
+		$tmpwidth = 0;
+		$nblines = count($object->lines);
+		for ($i = 0; $i < $nblines; $i++) {
+			$tmpwidth2 = dol_strlen(dol_string_nohtmltag(pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails)));
+			$tmpwidth = max($tmpwidth, $tmpwidth2);
+		}
+		if ($tmpwidth > 10) {
+			$this->cols['subprice']['width'] += (2 * ($tmpwidth - 10));
+		}
 
-	    $rank = $rank + 10;
-	    $this->cols['qty'] = array(
-	        'rank' => $rank,
-	        'width' => 16, // in mm
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'Qty'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 10;
+		$this->cols['qty'] = array(
+			'rank' => $rank,
+			'width' => 16, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'Qty'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    $rank = $rank + 10;
-	    $this->cols['unit'] = array(
-	        'rank' => $rank,
-	        'width' => 11, // in mm
-	        'status' => false,
-	        'title' => array(
-	            'textkey' => 'Unit'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
-	    if ($conf->global->PRODUCT_USE_UNITS) {
-	        $this->cols['unit']['status'] = true;
-	    }
+		$rank = $rank + 10;
+		$this->cols['unit'] = array(
+			'rank' => $rank,
+			'width' => 11, // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'Unit'
+			),
+			'border-left' => true, // add left line separator
+		);
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+			$this->cols['unit']['status'] = true;
+		}
 
-	    $rank = $rank + 10;
-	    $this->cols['discount'] = array(
-	        'rank' => $rank,
-	        'width' => 13, // in mm
-	        'status' => false,
-	        'title' => array(
-	            'textkey' => 'ReductionShort'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
-	    if ($this->atleastonediscount) {
-	        $this->cols['discount']['status'] = true;
-	    }
+		$rank = $rank + 10;
+		$this->cols['discount'] = array(
+			'rank' => $rank,
+			'width' => 13, // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'ReductionShort'
+			),
+			'border-left' => true, // add left line separator
+		);
+		if ($this->atleastonediscount) {
+			$this->cols['discount']['status'] = true;
+		}
 
-	    $rank = $rank + 1000; // add a big offset to be sure is the last col because default extrafield rank is 100
-	    $this->cols['totalexcltax'] = array(
-	        'rank' => $rank,
-	        'width' => 26, // in mm
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'TotalHT'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 1000; // add a big offset to be sure is the last col because default extrafield rank is 100
+		$this->cols['totalexcltax'] = array(
+			'rank' => $rank,
+			'width' => 26, // in mm
+			'status' => empty($conf->global->PDF_PROPAL_HIDE_PRICE_EXCL_TAX) ? true : false,
+			'title' => array(
+				'textkey' => 'TotalHT'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-        // Add extrafields cols
-        if (!empty($object->lines)) {
-            $line = reset($object->lines);
-            $this->defineColumnExtrafield($line, $outputlangs, $hidedetails);
-        }
+		$rank = $rank + 1010; // add a big offset to be sure is the last col because default extrafield rank is 100
+		$this->cols['totalincltax'] = array(
+			'rank' => $rank,
+			'width' => 26, // in mm
+			'status' => empty($conf->global->PDF_PROPAL_SHOW_PRICE_INCL_TAX) ? false : true,
+			'title' => array(
+				'textkey' => 'TotalTTC'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    $parameters = array(
-	        'object' => $object,
-	        'outputlangs' => $outputlangs,
-	        'hidedetails' => $hidedetails,
-	        'hidedesc' => $hidedesc,
-	        'hideref' => $hideref
-	    );
+		// Add extrafields cols
+		if (!empty($object->lines)) {
+			$line = reset($object->lines);
+			$this->defineColumnExtrafield($line, $outputlangs, $hidedetails);
+		}
 
-	    $reshook = $hookmanager->executeHooks('defineColumnField', $parameters, $this); // Note that $object may have been modified by hook
-	    if ($reshook < 0)
-	    {
-	        setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	    } elseif (empty($reshook))
-	    {
-	        $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
-	    } else {
-	        $this->cols = $hookmanager->resArray;
-	    }
-    }
+		$parameters = array(
+			'object' => $object,
+			'outputlangs' => $outputlangs,
+			'hidedetails' => $hidedetails,
+			'hidedesc' => $hidedesc,
+			'hideref' => $hideref
+		);
+
+		$reshook = $hookmanager->executeHooks('defineColumnField', $parameters, $this); // Note that $object may have been modified by hook
+		if ($reshook < 0)
+		{
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		} elseif (empty($reshook))
+		{
+			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
+		} else {
+			$this->cols = $hookmanager->resArray;
+		}
+	}
 }
diff --git a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
index d1df957b453..954252f8013 100644
--- a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
@@ -63,17 +63,18 @@ class pdf_proforma extends pdf_eratosthene
 	 *  Show top header of page.
 	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
-	 *  @param  Object		$object     	Object to show
+	 *  @param  Commande	$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @param  Translate	$outputlangsbis	Object lang for output bis
 	 *  @param	string		$titlekey		Translation key to show as title of document
 	 *  @return	int                         Return topshift value
 	 */
-	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey = "InvoiceProForma")
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $outputlangsbis = null, $titlekey = "InvoiceProForma")
 	{
 		// phpcs:enable
 		global $conf, $langs, $hookmanager;
 
-		return parent::_pagehead($pdf, $object, $showaddress, $outputlangs, $titlekey);
+		return parent::_pagehead($pdf, $object, $showaddress, $outputlangs, $outputlangsbis, $titlekey);
 	}
 }
diff --git a/htdocs/core/modules/commande/mod_commande_saphir.php b/htdocs/core/modules/commande/mod_commande_saphir.php
index 12b8fc604f6..7d99facd7d3 100644
--- a/htdocs/core/modules/commande/mod_commande_saphir.php
+++ b/htdocs/core/modules/commande/mod_commande_saphir.php
@@ -35,9 +35,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
 class mod_commande_saphir extends ModeleNumRefCommandes
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -51,14 +51,14 @@ class mod_commande_saphir extends ModeleNumRefCommandes
 	public $name = 'Saphir';
 
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     *  @return     string      Texte descripif
-     */
-    public function info()
-    {
-    	global $conf, $langs, $db;
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $conf, $langs, $db;
 
 		$langs->load("bills");
 
@@ -89,22 +89,22 @@ class mod_commande_saphir extends ModeleNumRefCommandes
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Return an example of numbering
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-     	global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+	 	global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$old_code_type = $mysoc->typent_code;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-    	$mysoc->typent_code = 'TTTTTTTTTT';
-     	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$old_code_type = $mysoc->typent_code;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$mysoc->typent_code = 'TTTTTTTTTT';
+	 	$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 		$mysoc->typent_code = $old_code_type;
 
@@ -113,7 +113,7 @@ class mod_commande_saphir extends ModeleNumRefCommandes
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 * 	Return next free value
@@ -122,8 +122,8 @@ class mod_commande_saphir extends ModeleNumRefCommandes
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    public function getNextValue($objsoc, $object)
-    {
+	public function getNextValue($objsoc, $object)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -148,17 +148,17 @@ class mod_commande_saphir extends ModeleNumRefCommandes
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return next free value
 	 *
 	 *  @param	Societe		$objsoc     Object third party
 	 *  @param	string		$objforref	Object for number to search
 	 *  @return string      			Next free value
-     */
-    public function commande_get_num($objsoc, $objforref)
-    {
-        // phpcs:enable
-        return $this->getNextValue($objsoc, $objforref);
-    }
+	 */
+	public function commande_get_num($objsoc, $objforref)
+	{
+		// phpcs:enable
+		return $this->getNextValue($objsoc, $objforref);
+	}
 }
diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
index 8f707493474..edad675857f 100644
--- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
+++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
@@ -45,15 +45,15 @@ class doc_generic_contract_odt extends ModelePDFContract
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 
@@ -67,7 +67,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
@@ -112,7 +112,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array('companies', 'errors'));
+		$langs->loadLangs(array('companies', 'errors'));
 
 		$form = new Form($this->db);
 
@@ -165,7 +165,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="CONTRACT_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
 		$texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
-        $texte .= '</div>';
+		$texte .= '</div>';
 
 		$texte .= '</td>';
 
@@ -180,7 +180,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Function to build a document on disk using the generic odt module.
 	 *
@@ -194,7 +194,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
@@ -234,6 +234,8 @@ class doc_generic_contract_odt extends ModelePDFContract
 				}
 			}
 
+			$object->fetch_thirdparty();
+
 			$dir = $conf->contrat->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
@@ -262,8 +264,8 @@ class doc_generic_contract_odt extends ModelePDFContract
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -288,15 +290,14 @@ class doc_generic_contract_odt extends ModelePDFContract
 
 				// Recipient name
 				$contactobject = null;
-                if (!empty($usecontact)) {
-                    // On peut utiliser le nom de la societe du contact
-                    if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
-                        $socobject = $object->contact;
-                    } else {
-                        $socobject = $object->thirdparty;
-                        // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
-                        $contactobject = $object->contact;
-                    }
+				if (!empty($usecontact)) {
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+						$socobject = $object->contact;
+					} else {
+						$socobject = $object->thirdparty;
+						// if we have a CUSTOMER contact and we dont use as recipient we store the contact object for later use
+						$contactobject = $object->contact;
+					}
 				} else {
 					$socobject = $object->thirdparty;
 				}
@@ -337,7 +338,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->contrat->dir_temp,
@@ -380,7 +381,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -437,7 +438,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -455,7 +456,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 					}
 				} else {
 					try {
-					    $odfHandler->saveToDisk($file);
+						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
 						return -1;
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index 264d48449e2..e28cd62efae 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2011		Fabrice CHERRIER
  * Copyright (C) 2013-2020  Philippe Grand	            <philippe.grand@atoo-net.com>
  * Copyright (C) 2015       Marcos García               <marcosgdf@gmail.com>
- * Copyright (C) 2018       Frédéric France             <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric 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
@@ -164,8 +164,8 @@ class pdf_strato extends ModelePDFContract
 	/**
 	 *  Function to build pdf onto disk
 	 *
-	 *  @param		CommonObject	$object				Id of object to generate
-	 *  @param		object			$outputlangs		Lang output object
+	 *  @param		Contrat			$object				Object to generate
+	 *  @param		Translate		$outputlangs		Lang output object
 	 *  @param		string			$srctemplatepath	Full path of source filename for generator using a template file
 	 *  @param		int				$hidedetails		Do not show line details
 	 *  @param		int				$hidedesc			Do not show desc
@@ -226,7 +226,7 @@ class pdf_strato extends ModelePDFContract
 				$heightforinfotot = 50; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
 				$pdf->SetAutoPageBreak(1, 0);
 
 				if (class_exists('TCPDF'))
@@ -580,7 +580,7 @@ class pdf_strato extends ModelePDFContract
 	 *  Show top header of page.
 	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
-	 *  @param  CommonObject	$object     	Object to show
+	 *  @param  Contrat		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
@@ -711,9 +711,8 @@ class pdf_strato extends ModelePDFContract
 
 			$this->recipient = $object->thirdparty;
 
-			//Recipient name
-			// You can use the name of the contact company
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -756,7 +755,7 @@ class pdf_strato extends ModelePDFContract
 	 *   	Show footer of page. Need this->emetteur object
 	 *
 	 *   	@param	PDF			$pdf     			PDF
-	 * 		@param	CommonObject		$object				Object to show
+	 * 		@param	Contrat		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	integer
@@ -764,7 +763,7 @@ class pdf_strato extends ModelePDFContract
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'CONTRACT_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 }
diff --git a/htdocs/core/modules/contract/mod_contract_magre.php b/htdocs/core/modules/contract/mod_contract_magre.php
index b9bfa0a35d6..226efa0c99e 100644
--- a/htdocs/core/modules/contract/mod_contract_magre.php
+++ b/htdocs/core/modules/contract/mod_contract_magre.php
@@ -31,9 +31,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
 class mod_contract_magre extends ModelNumRefContracts
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	/**
@@ -63,9 +63,9 @@ class mod_contract_magre extends ModelNumRefContracts
 	 *
 	 *	@return     string      text description
 	 */
-    public function info()
-    {
-    	global $conf, $langs, $db;
+	public function info()
+	{
+		global $conf, $langs, $db;
 
 		$langs->load("bills");
 
@@ -92,20 +92,20 @@ class mod_contract_magre extends ModelNumRefContracts
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
 	/**
 	 *	Return numbering example
 	 *
 	 *	@return     string      Example
 	 */
-    public function getExample()
-    {
-     	global $conf, $langs, $mysoc;
+	public function getExample()
+	{
+	 	global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-     	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$mysoc->code_client = 'CCCCCCCCCC';
+	 	$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
 		if (!$numExample)
@@ -113,7 +113,7 @@ class mod_contract_magre extends ModelNumRefContracts
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 *	Return next value
@@ -122,8 +122,8 @@ class mod_contract_magre extends ModelNumRefContracts
 	 *	@param	Object		$contract	contract object
 	 *	@return string      			Value if OK, 0 if KO
 	 */
-    public function getNextValue($objsoc, $contract)
-    {
+	public function getNextValue($objsoc, $contract)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -141,17 +141,17 @@ class mod_contract_magre extends ModelNumRefContracts
 		return  $numFinal;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return next value
 	 *
 	 *  @param	Societe		$objsoc     third party object
 	 *  @param	Object		$objforref	contract object
 	 *  @return string      			Value if OK, 0 if KO
-     */
-    public function contract_get_num($objsoc, $objforref)
-    {
-        // phpcs:enable
-        return $this->getNextValue($objsoc, $objforref);
-    }
+	 */
+	public function contract_get_num($objsoc, $objforref)
+	{
+		// phpcs:enable
+		return $this->getNextValue($objsoc, $objforref);
+	}
 }
diff --git a/htdocs/core/modules/contract/mod_contract_olive.php b/htdocs/core/modules/contract/mod_contract_olive.php
index ebb8cbf610e..0c49c63ab4a 100644
--- a/htdocs/core/modules/contract/mod_contract_olive.php
+++ b/htdocs/core/modules/contract/mod_contract_olive.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
  */
 class mod_contract_olive extends ModelNumRefContracts
 {
-    /**
+	/**
 	 * @var string Nom du modele
 	 * @deprecated
 	 * @see $name
@@ -53,9 +53,9 @@ class mod_contract_olive extends ModelNumRefContracts
 	public $code_null = 1; // Code facultatif
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
diff --git a/htdocs/core/modules/contract/mod_contract_serpis.php b/htdocs/core/modules/contract/mod_contract_serpis.php
index b503712c58f..de54fff3d76 100644
--- a/htdocs/core/modules/contract/mod_contract_serpis.php
+++ b/htdocs/core/modules/contract/mod_contract_serpis.php
@@ -29,9 +29,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
 class mod_contract_serpis extends ModelNumRefContracts
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	public $prefix = 'CT';
@@ -64,11 +64,11 @@ class mod_contract_serpis extends ModelNumRefContracts
 	 *
 	 *	@return     string      text description
 	 */
-    public function info()
-    {
-    	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
-    }
+	public function info()
+	{
+		global $langs;
+	  	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+	}
 
 
 	/**
@@ -154,7 +154,7 @@ class mod_contract_serpis extends ModelNumRefContracts
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return next value
 	 *
@@ -164,7 +164,7 @@ class mod_contract_serpis extends ModelNumRefContracts
 	 */
 	public function contract_get_num($objsoc, $objforref)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return $this->getNextValue($objsoc, $objforref);
 	}
 }
diff --git a/htdocs/core/modules/contract/modules_contract.php b/htdocs/core/modules/contract/modules_contract.php
index 641dc56f61a..c259c247304 100644
--- a/htdocs/core/modules/contract/modules_contract.php
+++ b/htdocs/core/modules/contract/modules_contract.php
@@ -43,17 +43,17 @@ abstract class ModelePDFContract extends CommonDocGenerator
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return list of active generation modules
 	 *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
 	 */
-    public static function liste_modeles($db, $maxfilenamelength = 0)
+	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'contract';
diff --git a/htdocs/core/modules/livraison/doc/index.html b/htdocs/core/modules/delivery/doc/index.html
similarity index 100%
rename from htdocs/core/modules/livraison/doc/index.html
rename to htdocs/core/modules/delivery/doc/index.html
diff --git a/htdocs/core/modules/livraison/doc/pdf_storm.modules.php b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
similarity index 92%
rename from htdocs/core/modules/livraison/doc/pdf_storm.modules.php
rename to htdocs/core/modules/delivery/doc/pdf_storm.modules.php
index 2019de478eb..d6376e6cd17 100644
--- a/htdocs/core/modules/livraison/doc/pdf_storm.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
@@ -23,13 +23,13 @@
  */
 
 /**
- *	\file       htdocs/core/modules/livraison/doc/pdf_storm.modules.php
+ *	\file       htdocs/core/modules/delivery/doc/pdf_storm.modules.php
  *	\ingroup    livraison
  *	\brief      File of class to manage receving receipts with template Storm
  */
 
-require_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
-require_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/delivery/modules_delivery.php';
+require_once DOL_DOCUMENT_ROOT.'/delivery/class/delivery.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 
@@ -157,7 +157,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 	/**
 	 *  Function to build pdf onto disk
 	 *
-	 *  @param      Livraison	$object				Object to generate
+	 *  @param      Delivery	$object				Object to generate
 	 *  @param      Translate	$outputlangs		Lang output object
 	 *  @param      string		$srctemplatepath	Full path of source filename for generator using a template file
 	 *  @param      int			$hidedetails		Do not show line details
@@ -219,32 +219,32 @@ class pdf_storm extends ModelePDFDeliveryOrder
 
 
 				// Loop on each lines to detect if there is at least one image to show
-				$realpatharray=array();
+				$realpatharray = array();
 				$this->atleastonephoto = false;
-				if (! empty($conf->global->MAIN_GENERATE_DELIVERY_WITH_PICTURE))
+				if (!empty($conf->global->MAIN_GENERATE_DELIVERY_WITH_PICTURE))
 				{
 					$objphoto = new Product($this->db);
 
-					for ($i = 0 ; $i < $nblines ; $i++)
+					for ($i = 0; $i < $nblines; $i++)
 					{
 						if (empty($object->lines[$i]->fk_product)) continue;
 
 						$objphoto->fetch($object->lines[$i]->fk_product);
 
-						if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
+						if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
 						{
-							$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product') . $objphoto->id ."/photos/";
-							$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product') . dol_sanitizeFileName($objphoto->ref).'/';
+							$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
+							$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 						}
 						else {
-							$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product') . dol_sanitizeFileName($objphoto->ref).'/';				// default
-							$pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product') . $objphoto->id ."/photos/";	// alternative
+							$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
+							$pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
 						}
 
 						$arephoto = false;
 						foreach ($pdir as $midir)
 						{
-							if (! $arephoto)
+							if (!$arephoto)
 							{
 								$dir = $conf->product->dir_output.'/'.$midir;
 
@@ -254,14 +254,14 @@ class pdf_storm extends ModelePDFDeliveryOrder
 									{
 										if ($obj['photo_vignette'])
 										{
-											$filename= $obj['photo_vignette'];
+											$filename = $obj['photo_vignette'];
 										}
 										else {
-											$filename=$obj['photo'];
+											$filename = $obj['photo'];
 										}
 									}
 									else {
-										$filename=$obj['photo'];
+										$filename = $obj['photo'];
 									}
 
 									$realpath = $dir.$filename;
@@ -271,7 +271,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 							}
 						}
 
-						if ($realpath && $arephoto) $realpatharray[$i]=$realpath;
+						if ($realpath && $arephoto) $realpatharray[$i] = $realpath;
 					}
 				}
 
@@ -285,7 +285,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 				$heightforinfotot = 30; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
 				$pdf->SetAutoPageBreak(1, 0);
 
 				if (class_exists('TCPDF'))
@@ -346,7 +346,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 
 				// Incoterm
 				$height_incoterms = 0;
-				if ($conf->incoterm->enabled)
+				if (!empty($conf->incoterm->enabled))
 				{
 					$desc_incoterms = $object->getIncotermsForPDF();
 					if ($desc_incoterms)
@@ -413,7 +413,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 				for ($i = 0; $i < $nblines; $i++)
 				{
 					// Fetch optionals
-					if (empty($object->lines[$i]->array_options)){
+					if (empty($object->lines[$i]->array_options)) {
 						$object->lines[$i]->fetch_optionals();
 					}
 
@@ -422,8 +422,8 @@ class pdf_storm extends ModelePDFDeliveryOrder
 					$pdf->SetTextColor(0, 0, 0);
 
 					// Define size of image if we need it
-	                $imglinesize=array();
-	                if (! empty($realpatharray[$i])) $imglinesize=pdf_getSizeForImage($realpatharray[$i]);
+					$imglinesize = array();
+					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
 
 
 					$pdf->setTopMargin($tab_top_newpage);
@@ -435,17 +435,17 @@ class pdf_storm extends ModelePDFDeliveryOrder
 
 					$showpricebeforepagebreak = 1;
 
-					$posYAfterImage=0;
-					$posYAfterDescription=0;
+					$posYAfterImage = 0;
+					$posYAfterDescription = 0;
 					if ($this->getColumnStatus('photo'))
 					{
 						// We start with Photo of product line
-						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur-($heightforfooter+$heightforfreetext+$heightforinfotot)))	// If photo too high, we moved completely on new page
+						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// If photo too high, we moved completely on new page
 						{
 							$pdf->AddPage('', '', true);
-							if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 							//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-							$pdf->setPage($pageposbefore+1);
+							$pdf->setPage($pageposbefore + 1);
 
 							$curY = $tab_top_newpage;
 
@@ -458,9 +458,9 @@ class pdf_storm extends ModelePDFDeliveryOrder
 
 						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
 						{
-							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300);	// Use 300 dpi
+							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
 							// $pdf->Image does not increase value return by getY, so we save it manually
-							$posYAfterImage=$curY+$imglinesize['height'];
+							$posYAfterImage = $curY + $imglinesize['height'];
 						}
 					}
 
@@ -499,7 +499,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 							$pdf->commitTransaction();
 						}
 
-						$posYAfterDescription=$pdf->GetY();
+						$posYAfterDescription = $pdf->GetY();
 					}
 
 					$nexY = $pdf->GetY();
@@ -652,7 +652,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 	 *   Show miscellaneous information (payment mode, payment term, ...)
 	 *
 	 *   @param		TCPDF		$pdf     		Object PDF
-	 *   @param		Object		$object			Object to show
+	 *   @param		Delivery	$object			Object to show
 	 *   @param		int			$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @return	void
@@ -708,20 +708,20 @@ class pdf_storm extends ModelePDFDeliveryOrder
 		if (empty($hidetop))
 		{
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
 		}
 
 		$pdf->SetDrawColor(128, 128, 128);
 		$pdf->SetFont('', '', $default_font_size - 1);
 
 		// Output Rect
-		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect takes a length in 3rd parameter and 4th parameter
+		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
 
 
 		$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
 
-		if (empty($hidetop)){
-			$pdf->line($this->marge_gauche, $tab_top+$this->tabTitleHeight, $this->page_largeur-$this->marge_droite, $tab_top+$this->tabTitleHeight);	// line takes a position y in 2nd parameter and 4th parameter
+		if (empty($hidetop)) {
+			$pdf->line($this->marge_gauche, $tab_top + $this->tabTitleHeight, $this->page_largeur - $this->marge_droite, $tab_top + $this->tabTitleHeight); // line takes a position y in 2nd parameter and 4th parameter
 		}
 	}
 
@@ -730,7 +730,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 	 *  Show top header of page.
 	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
-	 *  @param  Object		$object     	Object to show
+	 *  @param  Delivery	$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
@@ -860,9 +860,8 @@ class pdf_storm extends ModelePDFDeliveryOrder
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -906,8 +905,8 @@ class pdf_storm extends ModelePDFDeliveryOrder
 	/**
 	 *  Show footer of page. Need this->emetteur object
 	 *
-	 *  @param	TCPDF			$pdf     			PDF
-	 *  @param	Object		$object				Object to show
+	 *  @param	TCPDF		$pdf     			PDF
+	 *  @param	Delivery	$object				Object to show
 	 *  @param	Translate	$outputlangs		Object lang for output
 	 *  @param	int			$hidefreetext		1=Hide free text
 	 *  @return	int								Return height of bottom margin including footer text
@@ -915,7 +914,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'DELIVERY_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 
@@ -924,7 +923,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 	/**
 	 *   	Define Array Column Field
 	 *
-	 *   	@param	object		   $object    	    common object
+	 *   	@param	Delivery	   $object    	    common object
 	 *   	@param	Translate	   $outputlangs     langs
 	 *      @param	int			   $hidedetails		Do not show line details
 	 *      @param	int			   $hidedesc		Do not show desc
diff --git a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
similarity index 96%
rename from htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
rename to htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
index 34b66066f54..3b8baa107ad 100644
--- a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
@@ -22,13 +22,13 @@
  */
 
 /**
- *	\file       htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
+ *	\file       htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
  *	\ingroup    livraison
  *	\brief      File of class to manage receving receipts with template Typhon
  */
 
-require_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
-require_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/delivery/modules_delivery.php';
+require_once DOL_DOCUMENT_ROOT.'/delivery/class/delivery.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 
@@ -124,7 +124,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		$langs->loadLangs(array("main", "bills", "sendings", "companies"));
 
 		$this->db = $db;
-		$this->name = "typhon";
+		$this->name = "Typhon";
 		$this->description = $langs->trans("DocumentModelTyphon");
 
 		// Page size for A4 format
@@ -175,7 +175,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 	/**
 	 *  Function to build pdf onto disk
 	 *
-	 *  @param      Object		$object				Object to generate
+	 *  @param      Delivery	$object				Object to generate
 	 *  @param      Translate	$outputlangs		Lang output object
 	 *  @param      string		$srctemplatepath	Full path of source filename for generator using a template file
 	 *  @param      int			$hidedetails		Do not show line details
@@ -240,7 +240,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 				$heightforinfotot = 30; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
 				$pdf->SetAutoPageBreak(1, 0);
 
 				if (class_exists('TCPDF'))
@@ -318,7 +318,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 
 				// Incoterm
 				$height_incoterms = 0;
-				if ($conf->incoterm->enabled)
+				if (!empty($conf->incoterm->enabled))
 				{
 					$desc_incoterms = $object->getIncotermsForPDF();
 					if ($desc_incoterms)
@@ -618,7 +618,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 			}
 		}
 
-		$this->error = $langs->transnoentities("ErrorConstantNotDefined", "LIVRAISON_OUTPUTDIR");
+		$this->error = $langs->transnoentities("ErrorConstantNotDefined", "DELIVERY_OUTPUTDIR");
 		return 0;
 	}
 
@@ -628,7 +628,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 	 *   Show miscellaneous information (payment mode, payment term, ...)
 	 *
 	 *   @param		TCPDF		$pdf     		Object PDF
-	 *   @param		Object		$object			Object to show
+	 *   @param		Delivery	$object			Object to show
 	 *   @param		int			$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @return	void
@@ -723,7 +723,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 	 *  Show top header of page.
 	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
-	 *  @param  Object		$object     	Object to show
+	 *  @param  Delivery	$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
@@ -844,15 +844,14 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 			// If SHIPPING contact defined on order, we use it
 			$usecontact = false;
 			$arrayidcontact = $object->commande->getIdContact('external', 'SHIPPING');
-			if (count($arrayidcontact) > 0)
+			if ($arrayidcontact && count($arrayidcontact) > 0)
 			{
 				$usecontact = true;
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -897,7 +896,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 	 *  Show footer of page. Need this->emetteur object
 	 *
 	 *  @param	TCPDF		$pdf     			PDF
-	 *  @param	Object		$object				Object to show
+	 *  @param	Delivery	$object				Object to show
 	 *  @param	Translate	$outputlangs		Object lang for output
 	 *  @param	int			$hidefreetext		1=Hide free text
 	 *  @return	int								Return height of bottom margin including footer text
@@ -905,7 +904,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'DELIVERY_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 }
diff --git a/htdocs/core/modules/livraison/index.html b/htdocs/core/modules/delivery/index.html
similarity index 100%
rename from htdocs/core/modules/livraison/index.html
rename to htdocs/core/modules/delivery/index.html
diff --git a/htdocs/core/modules/livraison/mod_livraison_jade.php b/htdocs/core/modules/delivery/mod_delivery_jade.php
similarity index 88%
rename from htdocs/core/modules/livraison/mod_livraison_jade.php
rename to htdocs/core/modules/delivery/mod_delivery_jade.php
index 01788cd863b..822986cffa5 100644
--- a/htdocs/core/modules/livraison/mod_livraison_jade.php
+++ b/htdocs/core/modules/delivery/mod_delivery_jade.php
@@ -19,20 +19,20 @@
  */
 
 /**
- *   \file       htdocs/core/modules/livraison/mod_livraison_jade.php
+ *   \file       htdocs/core/modules/delivery/mod_delivery_jade.php
  *   \ingroup    delivery
  *   \brief      Fichier contenant la classe du modele de numerotation de reference de bon de livraison Jade
  */
 
-require_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/delivery/modules_delivery.php';
 
 
 /**
- *  \class      mod_livraison_jade
+ *  \class      mod_delivery_jade
  *  \brief      Classe du modele de numerotation de reference de bon de livraison Jade
  */
 
-class mod_livraison_jade extends ModeleNumRefDeliveryOrder
+class mod_delivery_jade extends ModeleNumRefDeliveryOrder
 {
 	/**
 	 * Dolibarr version of the loaded document
@@ -98,7 +98,7 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
 
 		$posindice = strlen($this->prefix) + 6;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
-		$sql .= " FROM ".MAIN_DB_PREFIX."livraison";
+		$sql .= " FROM ".MAIN_DB_PREFIX."delivery";
 		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql .= " AND entity = ".$conf->entity;
 
@@ -132,12 +132,12 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
 		// First, we get the max value
 		$posindice = strlen($this->prefix) + 6;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
-		$sql .= " FROM ".MAIN_DB_PREFIX."livraison";
+		$sql .= " FROM ".MAIN_DB_PREFIX."delivery";
 		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		dol_syslog("mod_livraison_jade::getNextValue", LOG_DEBUG);
+		dol_syslog("mod_delivery_jade::getNextValue", LOG_DEBUG);
 		if ($resql) {
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
@@ -153,7 +153,7 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
 		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		else $num = sprintf("%04s", $max + 1);
 
-		dol_syslog("mod_livraison_jade::getNextValue return ".$this->prefix.$yymm."-".$num);
+		dol_syslog("mod_delivery_jade::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
 	}
 
@@ -166,7 +166,7 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
 	 *  @param  Object      $object         Object livraison
 	 *  @return string                      Texte descriptif
 	 */
-	public function livraison_get_num($objsoc = 0, $object = '')
+	public function delivery_get_num($objsoc = 0, $object = '')
 	{
 		// phpcs:enable
 		return $this->getNextValue($objsoc, $object);
diff --git a/htdocs/core/modules/livraison/mod_livraison_saphir.php b/htdocs/core/modules/delivery/mod_delivery_saphir.php
similarity index 65%
rename from htdocs/core/modules/livraison/mod_livraison_saphir.php
rename to htdocs/core/modules/delivery/mod_delivery_saphir.php
index ad03984a6f2..ca0de68a670 100644
--- a/htdocs/core/modules/livraison/mod_livraison_saphir.php
+++ b/htdocs/core/modules/delivery/mod_delivery_saphir.php
@@ -19,22 +19,22 @@
  */
 
 /**
- *	\file       htdocs/core/modules/livraison/mod_livraison_saphir.php
+ *	\file       htdocs/core/modules/delivery/mod_livraison_saphir.php
  *	\ingroup    expedition
  *	\brief      Fichier contenant la classe du modele de numerotation de reference de livraison Saphir
  */
-require_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/delivery/modules_delivery.php';
 
 /**
- *	\class      mod_livraison_saphir
+ *	\class      mod_delivery_saphir
  *	\brief      Classe du modele de numerotation de reference de livraison Saphir
  */
-class mod_livraison_saphir extends ModeleNumRefDeliveryOrder
+class mod_delivery_saphir extends ModeleNumRefDeliveryOrder
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -55,14 +55,14 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder
 	public $name = 'Saphir';
 
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     *  @return     string      Texte descripif
-     */
-    public function info()
-    {
-    	global $conf, $langs, $db;
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $conf, $langs, $db;
 
 		$langs->load("bills");
 
@@ -72,7 +72,7 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder
 		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="action" value="updateMask">';
-		$texte .= '<input type="hidden" name="maskconstdelivery" value="LIVRAISON_SAPHIR_MASK">';
+		$texte .= '<input type="hidden" name="maskconstdelivery" value="DELIVERY_SAPHIR_MASK">';
 		$texte .= '<table class="nobordernopadding" width="100%">';
 
 		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Delivery"), $langs->transnoentities("Delivery"));
@@ -83,7 +83,7 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskdelivery" value="'.$conf->global->LIVRAISON_SAPHIR_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskdelivery" value="'.$conf->global->DELIVERY_SAPHIR_MASK.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
@@ -93,28 +93,28 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Return an example of number
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-     	global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of number
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+	 	global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$mysoc->code_client = 'CCCCCCCCCC';
+		$old_code_client = $mysoc->code_client;
+		$mysoc->code_client = 'CCCCCCCCCC';
 		$numExample = $this->getNextValue($mysoc, '');
-    	$mysoc->code_client = $old_code_client;
+		$mysoc->code_client = $old_code_client;
 
 		if (!$numExample)
 		{
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 
 	/**
@@ -124,14 +124,14 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder
 	 *  @param  Object		$object			Object delivery
 	 *  @return string      				Value if OK, 0 if KO
 	 */
-    public function getNextValue($objsoc, $object)
-    {
+	public function getNextValue($objsoc, $object)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// On defini critere recherche compteur
-		$mask = $conf->global->LIVRAISON_SAPHIR_MASK;
+		$mask = $conf->global->DELIVERY_SAPHIR_MASK;
 
 		if (!$mask)
 		{
@@ -139,36 +139,36 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder
 			return 0;
 		}
 
-		$numFinal = get_next_value($db, $mask, 'livraison', 'ref', '', $objsoc, $object->date_livraison);
+		$numFinal = get_next_value($db, $mask, 'delivery', 'ref', '', $objsoc, $object->delivery_date);
 
 		return  $numFinal;
-    }
+	}
 
 
 	/**
 	 *  Return next free value
 	 *
-     *  @param	Societe		$objsoc     Object third party
+	 *  @param	Societe		$objsoc     Object third party
 	 * 	@param	string		$objforref	Object for number to search
-     *  @return string      			Next free value
-     */
-    public function getNumRef($objsoc, $objforref)
-    {
-        return $this->getNextValue($objsoc, $objforref);
-    }
+	 *  @return string      			Next free value
+	 */
+	public function getNumRef($objsoc, $objforref)
+	{
+		return $this->getNextValue($objsoc, $objforref);
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return next free ref
-     *
-     *  @param	Societe		$objsoc      	Object thirdparty
-     *  @param  Object		$object			Objet livraison
-     *  @return string      				Texte descripif
-     */
-    public function livraison_get_num($objsoc = 0, $object = '')
-    {
-        // phpcs:enable
-        return $this->getNextValue($objsoc, $object);
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return next free ref
+	 *
+	 *  @param	Societe		$objsoc      	Object thirdparty
+	 *  @param  Object		$object			Objet livraison
+	 *  @return string      				Texte descripif
+	 */
+	public function delivery_get_num($objsoc = 0, $object = '')
+	{
+		// phpcs:enable
+		return $this->getNextValue($objsoc, $object);
+	}
 }
diff --git a/htdocs/core/modules/livraison/modules_livraison.php b/htdocs/core/modules/delivery/modules_delivery.php
similarity index 98%
rename from htdocs/core/modules/livraison/modules_livraison.php
rename to htdocs/core/modules/delivery/modules_delivery.php
index 9bf8a9e3ca2..80e2b092d42 100644
--- a/htdocs/core/modules/livraison/modules_livraison.php
+++ b/htdocs/core/modules/delivery/modules_delivery.php
@@ -22,7 +22,7 @@
  */
 
 /**
- *	\file       htdocs/core/modules/livraison/modules_livraison.php
+ *	\file       htdocs/core/modules/delivery/modules_delivery.php
  *	\ingroup    expedition
  *	\brief      Fichier contenant la classe mere de generation de bon de livraison en PDF
  *				et la classe mere de numerotation des bons de livraisons
diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php
index a4ff4e43a2d..b3480297476 100644
--- a/htdocs/core/modules/dons/html_cerfafr.modules.php
+++ b/htdocs/core/modules/dons/html_cerfafr.modules.php
@@ -64,7 +64,7 @@ class html_cerfafr extends ModeleDon
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Write the object to document file to disk
 	 *
@@ -75,7 +75,7 @@ class html_cerfafr extends ModeleDon
 	 */
 	public function write_file($don, $outputlangs, $currency = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $conf, $langs, $mysoc;
 
 		$now = dol_now();
@@ -303,67 +303,67 @@ class html_cerfafr extends ModeleDon
 				$prim[$i] = $chif[($unite[$i] + 10)];
 			} elseif ($dix[$i] == 2) {
 				if ($unite[$i] == 1) {
-                    $secon[$i] = 'vingt et';
-                    $prim[$i] = $chif[$unite[$i]];
+					$secon[$i] = 'vingt et';
+					$prim[$i] = $chif[$unite[$i]];
 				} else {
-                    $secon[$i] = 'vingt';
-                    $prim[$i] = $chif[$unite[$i]];
+					$secon[$i] = 'vingt';
+					$prim[$i] = $chif[$unite[$i]];
 				}
 			} elseif ($dix[$i] == 3) {
 				if ($unite[$i] == 1) {
-                    $secon[$i] = 'trente et';
-                    $prim[$i] = $chif[$unite[$i]];
+					$secon[$i] = 'trente et';
+					$prim[$i] = $chif[$unite[$i]];
 				} else {
-                    $secon[$i] = 'trente';
-                    $prim[$i] = $chif[$unite[$i]];
+					$secon[$i] = 'trente';
+					$prim[$i] = $chif[$unite[$i]];
 				}
 			} elseif ($dix[$i] == 4) {
 				if ($unite[$i] == 1) {
-                    $secon[$i] = 'quarante et';
-                    $prim[$i] = $chif[$unite[$i]];
+					$secon[$i] = 'quarante et';
+					$prim[$i] = $chif[$unite[$i]];
 				} else {
-                    $secon[$i] = 'quarante';
-                    $prim[$i] = $chif[$unite[$i]];
+					$secon[$i] = 'quarante';
+					$prim[$i] = $chif[$unite[$i]];
 				}
 			} elseif ($dix[$i] == 5) {
 				if ($unite[$i] == 1) {
-                    $secon[$i] = 'cinquante et';
-                    $prim[$i] = $chif[$unite[$i]];
+					$secon[$i] = 'cinquante et';
+					$prim[$i] = $chif[$unite[$i]];
 				} else {
-                    $secon[$i] = 'cinquante';
-                    $prim[$i] = $chif[$unite[$i]];
+					$secon[$i] = 'cinquante';
+					$prim[$i] = $chif[$unite[$i]];
 				}
 			} elseif ($dix[$i] == 6) {
 				if ($unite[$i] == 1) {
-                    $secon[$i] = 'soixante et';
-                    $prim[$i] = $chif[$unite[$i]];
+					$secon[$i] = 'soixante et';
+					$prim[$i] = $chif[$unite[$i]];
 				} else {
-                    $secon[$i] = 'soixante';
-                    $prim[$i] = $chif[$unite[$i]];
+					$secon[$i] = 'soixante';
+					$prim[$i] = $chif[$unite[$i]];
 				}
 			} elseif ($dix[$i] == 7) {
 				if ($unite[$i] == 1) {
-                    $secon[$i] = 'soixante et';
-                    $prim[$i] = $chif[$unite[$i] + 10];
+					$secon[$i] = 'soixante et';
+					$prim[$i] = $chif[$unite[$i] + 10];
 				} else {
-                    $secon[$i] = 'soixante';
-                    $prim[$i] = $chif[$unite[$i] + 10];
+					$secon[$i] = 'soixante';
+					$prim[$i] = $chif[$unite[$i] + 10];
 				}
 			} elseif ($dix[$i] == 8) {
 				if ($unite[$i] == 1) {
-                    $secon[$i] = 'quatre-vingts et';
-                    $prim[$i] = $chif[$unite[$i]];
+					$secon[$i] = 'quatre-vingts et';
+					$prim[$i] = $chif[$unite[$i]];
 				} else {
-                    $secon[$i] = 'quatre-vingt';
-                    $prim[$i] = $chif[$unite[$i]];
+					$secon[$i] = 'quatre-vingt';
+					$prim[$i] = $chif[$unite[$i]];
 				}
 			} elseif ($dix[$i] == 9) {
 				if ($unite[$i] == 1) {
-                    $secon[$i] = 'quatre-vingts et';
-                    $prim[$i] = $chif[$unite[$i] + 10];
+					$secon[$i] = 'quatre-vingts et';
+					$prim[$i] = $chif[$unite[$i] + 10];
 				} else {
-                    $secon[$i] = 'quatre-vingts';
-                    $prim[$i] = $chif[$unite[$i] + 10];
+					$secon[$i] = 'quatre-vingts';
+					$prim[$i] = $chif[$unite[$i] + 10];
 				}
 			}
 			if ($cent[$i] == 1) $trio[$i] = 'cent';
diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
index 122a5abdc10..b5ce775bcdc 100644
--- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
+++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
@@ -47,15 +47,15 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 
@@ -64,12 +64,12 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
@@ -109,12 +109,12 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 	 *	@param	Translate	$langs      Lang object to use for output
 	 *	@return string       			Description
 	 */
-    public function info($langs)
+	public function info($langs)
 	{
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("errors", "companies"));
+		$langs->loadLangs(array("errors", "companies"));
 
 		$form = new Form($this->db);
 
@@ -172,15 +172,15 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
    			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
    			foreach ($listoffiles as $file)
    			{
-                $texte .= $file['name'].'<br>';
+				$texte .= $file['name'].'<br>';
    			}
    			$texte .= '</div>';
 		}
-        // Add input to upload a new template file.
-        $texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
-        $texte .= '<input type="hidden" value="EXPEDITION_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-        $texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
-        $texte .= '</div>';
+		// Add input to upload a new template file.
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte .= '<input type="hidden" value="EXPEDITION_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
+		$texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '</div>';
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
@@ -194,7 +194,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to build a document on disk using the generic odt module.
 	 *
@@ -206,9 +206,9 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-    public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
@@ -248,6 +248,8 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				}
 			}
 
+			$object->fetch_thirdparty();
+
 			$dir = $conf->expedition->dir_output."/sending";
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
@@ -275,8 +277,8 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -302,12 +304,11 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				// Recipient name
 				$contactobject = null;
 				if (!empty($usecontact)) {
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 						$socobject = $object->contact;
-					else {
+					} else {
 						$socobject = $object->thirdparty;
-						// if we have a SHIIPPING contact and we dont use it as recipient we store the contact object for later use
+						// if we have a SHIPPING contact and we dont use as recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
@@ -320,7 +321,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 					'__FROM_EMAIL__' => $this->emetteur->email,
 					'__TOTAL_TTC__' => $object->total_ttc,
 					'__TOTAL_HT__' => $object->total_ht,
-					'__TOTAL_VAT__' => $object->total_vat
+					'__TOTAL_VAT__' => $object->total_tva
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
@@ -338,7 +339,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->expedition->dir_temp,
@@ -385,7 +386,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Make substitutions into odt of mysoc
@@ -405,15 +406,15 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Make substitutions into odt of thirdparty
-                if ($socobject->element == 'contact') {
-                    $tmparray = $this->get_substitutionarray_contact($socobject, $outputlangs);
-                } else {
-                    $tmparray = $this->get_substitutionarray_thirdparty($socobject, $outputlangs);
-                }
+				if ($socobject->element == 'contact') {
+					$tmparray = $this->get_substitutionarray_contact($socobject, $outputlangs);
+				} else {
+					$tmparray = $this->get_substitutionarray_thirdparty($socobject, $outputlangs);
+				}
 				foreach ($tmparray as $key=>$value)
 				{
 					try {
@@ -427,7 +428,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -446,13 +447,14 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 							}
 						} catch (OdfException $e)
 						{
-                            dol_syslog($e->getMessage(), LOG_INFO);
+							dol_syslog($e->getMessage(), LOG_INFO);
 						}
 					}
 				}
 
 				// Replace tags of object + external modules
 				$tmparray = $this->get_substitutionarray_shipment($object, $outputlangs);
+
 				complete_substitutions_array($tmparray, $outputlangs, $object);
 				// Call the ODTSubstitution hook
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
@@ -470,7 +472,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
@@ -524,7 +526,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -538,15 +540,15 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				} else {
 					try {
-					    $odfHandler->saveToDisk($file);
+						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index b07ba46bf85..165e83a8e87 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2005-2012 Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2014-2015 Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2018      Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020	Frédéric 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
@@ -146,7 +146,7 @@ class pdf_espadon extends ModelePdfExpedition
 	/**
 	 *	Function to build pdf onto disk
 	 *
-	 *	@param		Object		$object			    Object expedition to generate (or id if old method)
+	 *	@param		Expedition	$object			    Object expedition to generate (or id if old method)
 	 *	@param		Translate	$outputlangs		Lang output object
 	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
 	 *  @param		int			$hidedetails		Do not show line details
@@ -166,13 +166,14 @@ class pdf_espadon extends ModelePdfExpedition
 		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
 
 		// Load traductions files required by page
-		$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
+		$outputlangs->loadLangs(array("main", "bills", "orders", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
 
+		global $outputlangsbis;
+		$outputlangsbis = null;
 		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
-			global $outputlangsbis;
 			$outputlangsbis = new Translate('', $conf);
 			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
-			$outputlangsbis->loadLangs(array("main", "bills", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
+			$outputlangsbis->loadLangs(array("main", "bills", "orders", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
 		}
 
 		$nblines = count($object->lines);
@@ -191,12 +192,12 @@ class pdf_espadon extends ModelePdfExpedition
 				$objphoto = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
 
-				if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
+				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
 				{
-					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product') . $object->lines[$i]->fk_product ."/photos/";
+					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				} else {
-					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product') . dol_sanitizeFileName($objphoto->ref).'/';
+					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
 
@@ -270,7 +271,7 @@ class pdf_espadon extends ModelePdfExpedition
 				$heightforinfotot = 8; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
 				$pdf->SetAutoPageBreak(1, 0);
 
 				if (class_exists('TCPDF'))
@@ -319,7 +320,7 @@ class pdf_espadon extends ModelePdfExpedition
 
 				// Incoterm
 				$height_incoterms = 0;
-				if ($conf->incoterm->enabled)
+				if (!empty($conf->incoterm->enabled))
 				{
 					$desc_incoterms = $object->getIncotermsForPDF();
 					if ($desc_incoterms)
@@ -672,7 +673,7 @@ class pdf_espadon extends ModelePdfExpedition
 	 *	Show total to pay
 	 *
 	 *	@param	TCPDF		$pdf            Object PDF
-	 *	@param  Facture		$object         Object invoice
+	 *	@param  Expedition	$object         Object expedition
 	 *	@param  int			$deja_regle     Amount already paid
 	 *	@param	int         $posy           Start Position
 	 *	@param	Translate	$outputlangs	Objet langs
@@ -823,7 +824,7 @@ class pdf_espadon extends ModelePdfExpedition
 	 *  Show top header of page.
 	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
-	 *  @param  Object		$object     	Object to show
+	 *  @param  Expedition	$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
@@ -1019,9 +1020,8 @@ class pdf_espadon extends ModelePdfExpedition
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// You can use the name of the contact company
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -1066,7 +1066,7 @@ class pdf_espadon extends ModelePdfExpedition
 	 *   	Show footer of page. Need this->emetteur object
 	 *
 	 *   	@param	TCPDF		$pdf     			PDF
-	 * 		@param	Object		$object				Object to show
+	 * 		@param	Expedition	$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	int								Return height of bottom margin including footer text
@@ -1074,14 +1074,14 @@ class pdf_espadon extends ModelePdfExpedition
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'SHIPPING_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 
 	/**
 	 *   	Define Array Column Field
 	 *
-	 *   	@param	object		   $object    	    common object
+	 *   	@param	Expedition	   $object    	    common object
 	 *   	@param	Translate	   $outputlangs     langs
 	 *      @param	int			   $hidedetails		Do not show line details
 	 *      @param	int			   $hidedesc		Do not show desc
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index fa243b57626..bad252bf799 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -146,7 +146,7 @@ class pdf_merou extends ModelePdfExpedition
 	/**
 	 *	Function to build pdf onto disk
 	 *
-	 *	@param		Object		$object			Object expedition to generate (or id if old method)
+	 *	@param		Expedition	$object				Object expedition to generate (or id if old method)
 	 *	@param		Translate	$outputlangs		Lang output object
 	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
 	 *  @param		int			$hidedetails		Do not show line details
@@ -227,7 +227,7 @@ class pdf_merou extends ModelePdfExpedition
 				$heightforinfotot = 0; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
 				$pdf->SetAutoPageBreak(1, 0);
 
 				if (class_exists('TCPDF'))
@@ -453,7 +453,7 @@ class pdf_merou extends ModelePdfExpedition
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		// Translations
-		$langs->loadLangs(array("main", "bills"));
+		$langs->loadLangs(array("main", "bills", "orders"));
 
 		if (empty($hidetop))
 		{
@@ -481,7 +481,7 @@ class pdf_merou extends ModelePdfExpedition
 	 *   	Show footer of page. Need this->emetteur object
 	 *
 	 *   	@param	TCPDF		$pdf     			PDF
-	 * 		@param	Object		$object				Object to show
+	 * 		@param	Expedition	$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	void
@@ -510,7 +510,7 @@ class pdf_merou extends ModelePdfExpedition
 	 *  Show top header of page.
 	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
-	 *  @param  Object		$object     	Object to show
+	 *  @param  Expedition	$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
@@ -620,12 +620,12 @@ class pdf_merou extends ModelePdfExpedition
 
 		$pdf->SetFont('', 'B', $default_font_size - 3);
 		$pdf->SetTextColor(0, 0, 0);
-		$pdf->MultiCell(50, 8, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_delivery, 'day', false, $outputlangs, true), '', 'L');
+		$pdf->MultiCell(70, 8, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_delivery, 'day', false, $outputlangs, true), '', 'L');
 
 		$pdf->SetXY($blSocX - 80, $blSocY + 20);
 		$pdf->SetFont('', 'B', $default_font_size - 3);
 		$pdf->SetTextColor(0, 0, 0);
-		$pdf->MultiCell(50, 8, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, '', 'L');
+		$pdf->MultiCell(70, 8, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, '', 'L');
 
 		// Deliverer
 		$pdf->SetXY($blSocX - 80, $blSocY + 23);
@@ -678,8 +678,7 @@ class pdf_merou extends ModelePdfExpedition
 		}
 
 		// Recipient name
-		// You can use the name of the contact company
-		if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+		if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 			$thirdparty = $object->contact;
 		} else {
 			$thirdparty = $object->thirdparty;
@@ -693,6 +692,8 @@ class pdf_merou extends ModelePdfExpedition
 		$blW = 54;
 		$Yoff = $Ydef + 1;
 
+		$widthrecbox = $blW;
+
 		// Show Recipient frame
 		$pdf->SetFont('', 'B', $default_font_size - 3);
 		$pdf->SetXY($blDestX, $Yoff - 4);
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index e570a506eca..6698495f983 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2005-2012 Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2014-2015 Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2018      Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020	Frédéric 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
@@ -142,8 +142,8 @@ class pdf_rouget extends ModelePdfExpedition
 
 		// Define position of columns
 		$this->posxdesc = $this->marge_gauche + 1;
-		$this->posxweightvol = $this->page_largeur - $this->marge_droite - 78;
-		$this->posxqtyordered = $this->page_largeur - $this->marge_droite - 56;
+		$this->posxweightvol = $this->page_largeur - $this->marge_droite - 82;
+		$this->posxqtyordered = $this->page_largeur - $this->marge_droite - 60;
 		$this->posxqtytoship = $this->page_largeur - $this->marge_droite - 28;
 		$this->posxpuht = $this->page_largeur - $this->marge_droite;
 
@@ -178,7 +178,7 @@ class pdf_rouget extends ModelePdfExpedition
 	/**
 	 *	Function to build pdf onto disk
 	 *
-	 *	@param		Object		$object			Object expedition to generate (or id if old method)
+	 *	@param		Expedition	$object				Object expedition to generate (or id if old method)
 	 *	@param		Translate	$outputlangs		Lang output object
 	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
 	 *  @param		int			$hidedetails		Do not show line details
@@ -291,7 +291,7 @@ class pdf_rouget extends ModelePdfExpedition
 				$heightforinfotot = 8; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
 				$pdf->SetAutoPageBreak(1, 0);
 
 				if (class_exists('TCPDF'))
@@ -338,7 +338,7 @@ class pdf_rouget extends ModelePdfExpedition
 
 				// Incoterm
 				$height_incoterms = 0;
-				if ($conf->incoterm->enabled)
+				if (!empty($conf->incoterm->enabled))
 				{
 					$desc_incoterms = $object->getIncotermsForPDF();
 					if ($desc_incoterms)
@@ -526,12 +526,12 @@ class pdf_rouget extends ModelePdfExpedition
 
 					$pdf->SetXY($this->posxweightvol, $curY);
 					$weighttxt = '';
-					if ($object->lines[$i]->fk_product_type == 0 && $object->lines[$i]->weight)
+					if (empty($object->lines[$i]->fk_product_type) && $object->lines[$i]->weight)
 					{
 						$weighttxt = round($object->lines[$i]->weight * $object->lines[$i]->qty_shipped, 5).' '.measuringUnitString(0, "weight", $object->lines[$i]->weight_units, 1);
 					}
 					$voltxt = '';
-					if ($object->lines[$i]->fk_product_type == 0 && $object->lines[$i]->volume)
+					if (empty($object->lines[$i]->fk_product_type) && $object->lines[$i]->volume)
 					{
 						$voltxt = round($object->lines[$i]->volume * $object->lines[$i]->qty_shipped, 5).' '.measuringUnitString(0, "volume", $object->lines[$i]->volume_units ? $object->lines[$i]->volume_units : 0, 1);
 					}
@@ -662,8 +662,8 @@ class pdf_rouget extends ModelePdfExpedition
 	/**
 	 *	Show total to pay
 	 *
-	 *	@param	TCPDF		$pdf           Object PDF
-	 *	@param  Facture		$object         Object invoice
+	 *	@param	TCPDF		$pdf           	Object PDF
+	 *	@param  Expedition	$object         Object invoice
 	 *	@param  int			$deja_regle     Montant deja regle
 	 *	@param	int			$posy			Position depart
 	 *	@param	Translate	$outputlangs	Objet langs
@@ -712,8 +712,8 @@ class pdf_rouget extends ModelePdfExpedition
 
 		if ($totalWeight != '') $totalWeighttoshow = showDimensionInBestUnit($totalWeight, 0, "weight", $outputlangs);
 		if ($totalVolume != '') $totalVolumetoshow = showDimensionInBestUnit($totalVolume, 0, "volume", $outputlangs);
-		if ($object->trueWeight) $totalWeighttoshow = showDimensionInBestUnit($object->trueWeight, $object->weight_units, "weight", $outputlangs);
-		if ($object->trueVolume) $totalVolumetoshow = showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
+		if (!empty($object->trueWeight)) $totalWeighttoshow = showDimensionInBestUnit($object->trueWeight, $object->weight_units, "weight", $outputlangs);
+		if (!empty($object->trueVolume)) $totalVolumetoshow = showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
 
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
@@ -858,7 +858,7 @@ class pdf_rouget extends ModelePdfExpedition
 	 *  Show top header of page.
 	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
-	 *  @param  Object		$object     	Object to show
+	 *  @param  Expedition	$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
@@ -1054,9 +1054,8 @@ class pdf_rouget extends ModelePdfExpedition
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -1101,7 +1100,7 @@ class pdf_rouget extends ModelePdfExpedition
 	 *  Show footer of page. Need this->emetteur object
 	 *
 	 *  @param	TCPDF		$pdf     			PDF
-	 *  @param	Object		$object				Object to show
+	 *  @param	Expedition	$object				Object to show
 	 *  @param	Translate	$outputlangs		Object lang for output
 	 *  @param	int			$hidefreetext		1=Hide free text
 	 *  @return	int								Return height of bottom margin including footer text
@@ -1109,7 +1108,7 @@ class pdf_rouget extends ModelePdfExpedition
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'SHIPPING_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 }
diff --git a/htdocs/core/modules/expedition/mod_expedition_ribera.php b/htdocs/core/modules/expedition/mod_expedition_ribera.php
index c8f9b49e58d..6e13e4e3186 100644
--- a/htdocs/core/modules/expedition/mod_expedition_ribera.php
+++ b/htdocs/core/modules/expedition/mod_expedition_ribera.php
@@ -31,9 +31,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php'
 class mod_expedition_ribera extends ModelNumRefExpedition
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	/**
@@ -58,9 +58,9 @@ class mod_expedition_ribera extends ModelNumRefExpedition
 	 *
 	 *	@return     string      text description
 	 */
-    public function info()
-    {
-    	global $conf, $langs, $db;
+	public function info()
+	{
+		global $conf, $langs, $db;
 
 		$langs->load("bills");
 
@@ -87,22 +87,22 @@ class mod_expedition_ribera extends ModelNumRefExpedition
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
 	/**
 	 *	Return numbering example
 	 *
 	 *	@return     string      Example
 	 */
-    public function getExample()
-    {
-     	global $conf, $langs, $mysoc;
+	public function getExample()
+	{
+	 	global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$old_code_type = $mysoc->typent_code;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-    	$mysoc->typent_code = 'TTTTTTTTTT';
-     	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$old_code_type = $mysoc->typent_code;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$mysoc->typent_code = 'TTTTTTTTTT';
+	 	$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 		$mysoc->typent_code = $old_code_type;
 
@@ -111,7 +111,7 @@ class mod_expedition_ribera extends ModelNumRefExpedition
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 *	Return next value
@@ -120,8 +120,8 @@ class mod_expedition_ribera extends ModelNumRefExpedition
 	 *	@param	Object		$shipment	Shipment object
 	 *	@return string      			Value if OK, 0 if KO
 	 */
-    public function getNextValue($objsoc, $shipment)
-    {
+	public function getNextValue($objsoc, $shipment)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -141,7 +141,7 @@ class mod_expedition_ribera extends ModelNumRefExpedition
 		return  $numFinal;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return next free value
 	 *
@@ -149,9 +149,9 @@ class mod_expedition_ribera extends ModelNumRefExpedition
 	 *	@param	Object		$objforref	Shipment object
 	 *	@return string      			Next free value
 	 */
-    public function expedition_get_num($objsoc, $objforref)
-    {
-        // phpcs:enable
-        return $this->getNextValue($objsoc, $objforref);
-    }
+	public function expedition_get_num($objsoc, $objforref)
+	{
+		// phpcs:enable
+		return $this->getNextValue($objsoc, $objforref);
+	}
 }
diff --git a/htdocs/core/modules/expedition/mod_expedition_safor.php b/htdocs/core/modules/expedition/mod_expedition_safor.php
index e30ab1a9d8c..0edd59642c0 100644
--- a/htdocs/core/modules/expedition/mod_expedition_safor.php
+++ b/htdocs/core/modules/expedition/mod_expedition_safor.php
@@ -29,9 +29,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php'
 class mod_expedition_safor extends ModelNumRefExpedition
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	public $prefix = 'SH';
@@ -59,11 +59,11 @@ class mod_expedition_safor extends ModelNumRefExpedition
 	 *
 	 *	@return     string      text description
 	 */
-    public function info()
-    {
-    	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
-    }
+	public function info()
+	{
+		global $langs;
+	  	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+	}
 
 
 	/**
@@ -71,7 +71,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
 	 *
 	 *	@return     string      Example
 	 */
-    public function getExample()
+	public function getExample()
 	{
 		return $this->prefix."0501-0001";
 	}
@@ -82,7 +82,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
 	 *
 	 *	@return     boolean     false if conflit, true if ok
 	 */
-    public function canBeActivated()
+	public function canBeActivated()
 	{
 		global $conf, $langs, $db;
 
@@ -117,7 +117,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
 	 *	@param	Object		$shipment	Shipment object
 	 *	@return string      			Value if OK, 0 if KO
 	 */
-    public function getNextValue($objsoc, $shipment)
+	public function getNextValue($objsoc, $shipment)
 	{
 		global $db, $conf;
 
@@ -148,7 +148,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
 		return $this->prefix.$yymm."-".$num;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return next free value
 	 *
@@ -156,9 +156,9 @@ class mod_expedition_safor extends ModelNumRefExpedition
 	 *	@param	Object		$objforref	Shipment object
 	 *	@return string      			Next free value
 	 */
-    public function expedition_get_num($objsoc, $objforref)
+	public function expedition_get_num($objsoc, $objforref)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return $this->getNextValue($objsoc, $objforref);
 	}
 }
diff --git a/htdocs/core/modules/expedition/modules_expedition.php b/htdocs/core/modules/expedition/modules_expedition.php
index ce9ce7c8aa1..4305f8336e7 100644
--- a/htdocs/core/modules/expedition/modules_expedition.php
+++ b/htdocs/core/modules/expedition/modules_expedition.php
@@ -36,23 +36,23 @@
  */
 abstract class ModelePdfExpedition extends CommonDocGenerator
 {
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of active generation models
 	 *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
 	 */
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'shipping';
@@ -80,7 +80,7 @@ abstract class ModelNumRefExpedition
 	 *
 	 *  @return		boolean     true if model can be used
 	 */
-    public function isEnabled()
+	public function isEnabled()
 	{
 		return true;
 	}
@@ -90,7 +90,7 @@ abstract class ModelNumRefExpedition
 	 *
 	 *	@return     string      text description
 	 */
-    public function info()
+	public function info()
 	{
 		global $langs;
 		$langs->load("sendings");
@@ -102,7 +102,7 @@ abstract class ModelNumRefExpedition
 	 *
 	 *	@return     string      Example
 	 */
-    public function getExample()
+	public function getExample()
 	{
 		global $langs;
 		$langs->load("sendings");
@@ -114,7 +114,7 @@ abstract class ModelNumRefExpedition
 	 *
 	 *	@return     boolean     false if conflict, true if ok
 	 */
-    public function canBeActivated()
+	public function canBeActivated()
 	{
 		return true;
 	}
@@ -126,7 +126,7 @@ abstract class ModelNumRefExpedition
 	 *	@param	Object		$shipment	Shipment object
 	 *	@return	string					Value
 	 */
-    public function getNextValue($objsoc, $shipment)
+	public function getNextValue($objsoc, $shipment)
 	{
 		global $langs;
 		return $langs->trans("NotAvailable");
@@ -137,7 +137,7 @@ abstract class ModelNumRefExpedition
 	 *
 	 *	@return     string      Value
 	 */
-    public function getVersion()
+	public function getVersion()
 	{
 		global $langs;
 		$langs->load("admin");
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index ae1310a924a..176b09264d4 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2015       Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2015       Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2016-2019  Philippe Grand          <philippe.grand@atoo-net.com>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2018       Francis Appels          <francis.appels@z-application.com>
  * Copyright (C) 2019       Markus Welters          <markus@welters.de>
  * Copyright (C) 2019       Rafael Ingenleuf        <ingenleuf@welters.de>
@@ -199,13 +199,13 @@ class pdf_standard extends ModeleExpenseReport
 	/**
 	 *  Function to build pdf onto disk
 	 *
-	 *  @param		Object		$object				Object to generate
-	 *  @param		Translate	$outputlangs		Lang output object
-	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
-	 *  @param		int			$hidedetails		Do not show line details
-	 *  @param		int			$hidedesc			Do not show desc
-	 *  @param		int			$hideref			Do not show ref
-	 *  @return     int             				1=OK, 0=KO
+	 *  @param	ExpenseReport	$object				Object to generate
+	 *  @param	Translate		$outputlangs		Lang output object
+	 *  @param	string			$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param	int				$hidedetails		Do not show line details
+	 *  @param	int				$hidedesc			Do not show desc
+	 *  @param	int				$hideref			Do not show ref
+	 *  @return int             					1=OK, 0=KO
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
@@ -260,7 +260,7 @@ class pdf_standard extends ModeleExpenseReport
 				$heightforinfotot = 40; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 12; // Height reserved to output the footer (value include bottom margin)
-				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
 
 				$pdf->SetAutoPageBreak(1, 0);
 
@@ -368,6 +368,7 @@ class pdf_standard extends ModeleExpenseReport
 					if ($pageposafter > $pageposbefore) {
 						// There is a pagebreak
 						$pdf->rollbackTransaction(true);
+
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
 						if (empty($showpricebeforepagebreak)) {
@@ -557,19 +558,20 @@ class pdf_standard extends ModeleExpenseReport
 	}
 
 	/**
-	 * @param   TCPDF       $pdf                Object PDF
-	 * @param   Object      $object             Object to show
-	 * @param   int         $linenumber         line number
-	 * @param   int         $curY               current y position
-	 * @param   int         $default_font_size  default siez of font
-	 * @param   Translate   $outputlangs        Object lang for output
-	 * @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
+	 * @param   TCPDF       	$pdf                Object PDF
+	 * @param   ExpenseReport	$object             Object to show
+	 * @param   int         	$linenumber         line number
+	 * @param   int         	$curY               current y position
+	 * @param   int         	$default_font_size  default siez of font
+	 * @param   Translate   	$outputlangs        Object lang for output
+	 * @param	int				$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
 	 * @return  void
 	 */
 	protected function printLine(&$pdf, $object, $linenumber, $curY, $default_font_size, $outputlangs, $hidedetails = 0)
 	{
 		global $conf;
 		$pdf->SetFont('', '', $default_font_size - 1);
+		$pdf->SetTextColor(0, 0, 0);
 
 		// Accountancy piece
 		$pdf->SetXY($this->posxpiece, $curY);
@@ -642,10 +644,10 @@ class pdf_standard extends ModeleExpenseReport
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	TCPDF		$pdf     		Object PDF
-	 *  @param  Object		$object     	Object to show
-	 *  @param  int	    	$showaddress    0=no, 1=yes
-	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @param	TCPDF			$pdf     		Object PDF
+	 *  @param  ExpenseReport	$object     	Object to show
+	 *  @param  int	    		$showaddress    0=no, 1=yes
+	 *  @param  Translate		$outputlangs	Object lang for output
 	 *  @return	void
 	 */
 	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
@@ -979,11 +981,11 @@ class pdf_standard extends ModeleExpenseReport
 	/**
 	 *  Show payments table
 	 *
-	 *  @param	TCPDF		$pdf            Object PDF
-	 *  @param  Object		$object         Object invoice
-	 *  @param  int			$posy           Position y in PDF
-	 *  @param  Translate	$outputlangs    Object langs for output
-	 *  @return int             			<0 if KO, >0 if OK
+	 *  @param	TCPDF			$pdf            Object PDF
+	 *  @param  ExpenseReport	$object         Object expensereport
+	 *  @param  int				$posy           Position y in PDF
+	 *  @param  Translate		$outputlangs    Object langs for output
+	 *  @return int             				<0 if KO, >0 if OK
 	 */
 	protected function tablePayments(&$pdf, $object, $posy, $outputlangs)
 	{
@@ -1091,16 +1093,16 @@ class pdf_standard extends ModeleExpenseReport
 	/**
 	 *  Show footer of page. Need this->emetteur object
 	 *
-	 *  @param  TCPDF		$pdf     			PDF
-	 *  @param  Object		$object				Object to show
-	 *  @param  Translate	$outputlangs		Object lang for output
-	 *  @param  int			$hidefreetext		1=Hide free text
-	 *  @return int								Return height of bottom margin including footer text
+	 *  @param  TCPDF			$pdf     			PDF
+	 *  @param  ExpenseReport	$object				Object to show
+	 *  @param  Translate		$outputlangs		Object lang for output
+	 *  @param  int				$hidefreetext		1=Hide free text
+	 *  @return int									Return height of bottom margin including footer text
 	 */
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'EXPENSEREPORT_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 }
diff --git a/htdocs/core/modules/expensereport/mod_expensereport_jade.php b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
index 299b31ad85c..e6e60741628 100644
--- a/htdocs/core/modules/expensereport/mod_expensereport_jade.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
@@ -122,7 +122,7 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
 		global $db, $conf;
 
 		// For backward compatibility and restore old behavior to get ref of expense report
-		if ($conf->global->EXPENSEREPORT_USE_OLD_NUMBERING_RULE)
+		if (!empty($conf->global->EXPENSEREPORT_USE_OLD_NUMBERING_RULE))
 		{
 			$fuser = null;
 			if ($object->fk_user_author > 0)
diff --git a/htdocs/core/modules/expensereport/mod_expensereport_sand.php b/htdocs/core/modules/expensereport/mod_expensereport_sand.php
index 043f67cfb0f..4899383a97b 100644
--- a/htdocs/core/modules/expensereport/mod_expensereport_sand.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_sand.php
@@ -31,9 +31,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/expensereport/modules_expenserepor
 class mod_expensereport_sand extends ModeleNumRefExpenseReport
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -54,14 +54,14 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport
 	public $name = 'Sand';
 
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     *  @return     string      Texte descripif
-     */
-    public function info()
-    {
-    	global $db, $conf, $langs;
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $db, $conf, $langs;
 
 		$langs->load("bills");
 
@@ -92,39 +92,39 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Return an example of numbering
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-     	global $db, $conf, $langs, $user;
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+	 	global $db, $conf, $langs, $user;
 
-     	$exp = new ExpenseReport($db);
-     	$exp->initAsSpecimen();
-     	$exp->fk_user_author = $user->id;
+	 	$exp = new ExpenseReport($db);
+	 	$exp->initAsSpecimen();
+	 	$exp->fk_user_author = $user->id;
 
-     	$numExample = $this->getNextValue($exp);
+	 	$numExample = $this->getNextValue($exp);
 
 		if (!$numExample)
 		{
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
-    /**
-     *  Return next free value
-     *
-     *  @param  Object      $object     Object we need next value for
-     *  @return string                  Value if KO, <0 if KO
-     */
-    public function getNextValue($object)
-    {
-        global $db, $conf;
+	/**
+	 *  Return next free value
+	 *
+	 *  @param  Object      $object     Object we need next value for
+	 *  @return string                  Value if KO, <0 if KO
+	 */
+	public function getNextValue($object)
+	{
+		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
@@ -154,5 +154,5 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport
 		$numFinal = get_next_value($db, $mask, 'expensereport', 'ref', '', null, $date, 'next', true, $fuser);
 
 		return $numFinal;
-    }
+	}
 }
diff --git a/htdocs/core/modules/expensereport/modules_expensereport.php b/htdocs/core/modules/expensereport/modules_expensereport.php
index 40f33715c0f..12a6617cf72 100644
--- a/htdocs/core/modules/expensereport/modules_expensereport.php
+++ b/htdocs/core/modules/expensereport/modules_expensereport.php
@@ -29,17 +29,17 @@ abstract class ModeleExpenseReport extends CommonDocGenerator
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of active models generation
-     *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
-     */
+	 *
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
+	 */
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'expensereport';
@@ -67,7 +67,7 @@ abstract class ModeleExpenseReport extends CommonDocGenerator
  */
 function expensereport_pdf_create(DoliDB $db, ExpenseReport $object, $message, $modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 {
-    return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
+	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 }
 
 /**
@@ -87,7 +87,7 @@ abstract class ModeleNumRefExpenseReport
 	 *
 	 *	@return		boolean     true if model can be used
 	 */
-    public function isEnabled()
+	public function isEnabled()
 	{
 		return true;
 	}
@@ -97,7 +97,7 @@ abstract class ModeleNumRefExpenseReport
 	 *
 	 *	@return     string      Descriptive text
 	 */
-    public function info()
+	public function info()
 	{
 		global $langs;
 		$langs->load("orders");
@@ -109,7 +109,7 @@ abstract class ModeleNumRefExpenseReport
 	 *
 	 *	@return     string      Example
 	 */
-    public function getExample()
+	public function getExample()
 	{
 		global $langs;
 		$langs->load("trips");
@@ -121,7 +121,7 @@ abstract class ModeleNumRefExpenseReport
 	 *
 	 *	@return     boolean     false if conflict, true if ok
 	 */
-    public function canBeActivated()
+	public function canBeActivated()
 	{
 		return true;
 	}
@@ -132,26 +132,26 @@ abstract class ModeleNumRefExpenseReport
 	 *	@param	Object		$object		Object we need next value for
 	 *	@return	string      Value
 	 */
-    public function getNextValue($object)
+	public function getNextValue($object)
 	{
 		global $langs;
 		return $langs->trans("NotAvailable");
 	}
 
-    /**
-     *  Returns the version of the numbering module
-     *
-     *  @return     string      Value
-     */
-    public function getVersion()
-    {
-        global $langs;
-        $langs->load("admin");
+	/**
+	 *  Returns the version of the numbering module
+	 *
+	 *  @return     string      Value
+	 */
+	public function getVersion()
+	{
+		global $langs;
+		$langs->load("admin");
 
-        if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-        elseif ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-        elseif ($this->version == 'dolibarr') return DOL_VERSION;
-        elseif ($this->version) return $this->version;
-        else return $langs->trans("NotAvailable");
-    }
+		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
+		elseif ($this->version == 'experimental') return $langs->trans("VersionExperimental");
+		elseif ($this->version == 'dolibarr') return DOL_VERSION;
+		elseif ($this->version) return $this->version;
+		else return $langs->trans("NotAvailable");
+	}
 }
diff --git a/htdocs/core/modules/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php
index f4691ceb611..364f8562eb2 100644
--- a/htdocs/core/modules/export/export_csv.modules.php
+++ b/htdocs/core/modules/export/export_csv.modules.php
@@ -37,16 +37,16 @@ class ExportCsv extends ModeleExports
 	public $id;
 
 	/**
-     * @var string export files label
-     */
-    public $label;
+	 * @var string export files label
+	 */
+	public $label;
 
 	public $extension;
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	public $label_lib;
@@ -156,7 +156,7 @@ class ExportCsv extends ModeleExports
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Open output file
 	 *
@@ -166,7 +166,7 @@ class ExportCsv extends ModeleExports
 	 */
 	public function open_file($file, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		dol_syslog("ExportCsv::open_file file=".$file);
@@ -185,7 +185,7 @@ class ExportCsv extends ModeleExports
 		return $ret;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output header into file
 	 *
@@ -194,24 +194,24 @@ class ExportCsv extends ModeleExports
 	 */
 	public function write_header($outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return 0;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output title line into file
 	 *
-     *  @param      array		$array_export_fields_label   	Array with list of label of fields
-     *  @param      array		$array_selected_sorted       	Array with list of field to export
-     *  @param      Translate	$outputlangs    				Object lang to translate values
-     *  @param		array		$array_types					Array with types of fields
+	 *  @param      array		$array_export_fields_label   	Array with list of label of fields
+	 *  @param      array		$array_selected_sorted       	Array with list of field to export
+	 *  @param      Translate	$outputlangs    				Object lang to translate values
+	 *  @param		array		$array_types					Array with types of fields
 	 * 	@return		int											<0 if KO, >0 if OK
 	 */
 	public function write_title($array_export_fields_label, $array_selected_sorted, $outputlangs, $array_types)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		if (!empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
@@ -233,19 +233,19 @@ class ExportCsv extends ModeleExports
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Output record line into file
-     *
-     *  @param     	array		$array_selected_sorted      Array with list of field to export
-     *  @param     	resource	$objp                       A record from a fetch with all fields from select
-     *  @param     	Translate	$outputlangs    			Object lang to translate values
-     *  @param		array		$array_types				Array with types of fields
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Output record line into file
+	 *
+	 *  @param     	array		$array_selected_sorted      Array with list of field to export
+	 *  @param     	resource	$objp                       A record from a fetch with all fields from select
+	 *  @param     	Translate	$outputlangs    			Object lang to translate values
+	 *  @param		array		$array_types				Array with types of fields
 	 * 	@return		int										<0 if KO, >0 if OK
 	 */
 	public function write_record($array_selected_sorted, $objp, $outputlangs, $array_types)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		if (!empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
@@ -288,7 +288,7 @@ class ExportCsv extends ModeleExports
 		return 0;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output footer into file
 	 *
@@ -297,11 +297,11 @@ class ExportCsv extends ModeleExports
 	 */
 	public function write_footer($outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return 0;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Close file handle
 	 *
@@ -309,7 +309,7 @@ class ExportCsv extends ModeleExports
 	 */
 	public function close_file()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		fclose($this->handle);
 		return 0;
 	}
diff --git a/htdocs/core/modules/export/export_excel2007new.modules.php b/htdocs/core/modules/export/export_excel2007new.modules.php
index 6d7cbb5d05f..eb111ebb985 100644
--- a/htdocs/core/modules/export/export_excel2007new.modules.php
+++ b/htdocs/core/modules/export/export_excel2007new.modules.php
@@ -27,6 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 
 /**
  *	Class to build export files with Excel format
@@ -38,17 +39,17 @@ class ExportExcel2007new extends ModeleExports
 	 */
 	public $id;
 
-    /**
-     * @var string Export Excel label
-     */
-    public $label;
+	/**
+	 * @var string Export Excel label
+	 */
+	public $label;
 
 	public $extension;
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	public $label_lib;
@@ -59,11 +60,13 @@ class ExportExcel2007new extends ModeleExports
 
 	public $worksheet; // Handle sheet
 
+	public $styleArray;
+
 	public $row;
 
 	public $col;
 
-    public $file; // To save filename
+	public $file; // To save filename
 
 
 	/**
@@ -80,20 +83,17 @@ class ExportExcel2007new extends ModeleExports
 		$this->label = 'Excel 2007'; // Label of driver
 		$this->desc = $langs->trans('Excel2007FormatDesc');
 		$this->extension = 'xlsx'; // Extension for generated file by this driver
-        $this->picto = 'mime/xls'; // Picto
+		$this->picto = 'mime/xls'; // Picto
 		$this->version = '1.30'; // Driver version
 		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 
-		$this->disabled = (in_array(constant('PHPEXCEL_PATH'), array('disabled', 'disabled/')) ? 1 : 0); // A condition to disable module (used for native debian packages)
+		$this->disabled = 0;
 
 		if (empty($this->disabled))
 		{
-                //require_once PHPEXCEL_PATH.'PHPExcel.php';
-                //require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
-    		    //$this->label_lib='PhpExcel';
-    		    require_once PHPEXCELNEW_PATH.'Spreadsheet.php';
-    		    $this->label_lib = 'PhpSpreadSheet';
-                $this->version_lib = '1.6.0'; // No way to get info from library
+			require_once PHPEXCELNEW_PATH.'Spreadsheet.php';
+			$this->label_lib = 'PhpSpreadSheet';
+			$this->version_lib = '1.6.0'; // No way to get info from library
 		}
 
 		$this->row = 0;
@@ -125,16 +125,16 @@ class ExportExcel2007new extends ModeleExports
 	 * @return string
 	 */
 	public function getDriverDesc()
-    {
-        return $this->desc;
-    }
+	{
+		return $this->desc;
+	}
 
 	/**
 	 * getDriverExtension
 	 *
 	 * @return string
 	 */
-    public function getDriverExtension()
+	public function getDriverExtension()
 	{
 		return $this->extension;
 	}
@@ -170,7 +170,7 @@ class ExportExcel2007new extends ModeleExports
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Open output file
 	 *
@@ -180,86 +180,83 @@ class ExportExcel2007new extends ModeleExports
 	 */
 	public function open_file($file, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $conf, $langs;
 
 		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
 		{
-		    $outputlangs->charset_output = 'ISO-8859-1'; // Because Excel 5 format is ISO
+			$outputlangs->charset_output = 'ISO-8859-1'; // Because Excel 5 format is ISO
 		}
 
 		dol_syslog(get_class($this)."::open_file file=".$file);
-        $this->file = $file;
+		$this->file = $file;
 
 		$ret = 1;
 
-    	$outputlangs->load("exports");
+		$outputlangs->load("exports");
 
-        //require_once PHPEXCEL_PATH.'PHPExcel.php';
-        //require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
-	    require_once DOL_DOCUMENT_ROOT.'/includes/phpoffice/autoloader.php';
-	    require_once DOL_DOCUMENT_ROOT.'/includes/Psr/autoloader.php';
-	    require_once PHPEXCELNEW_PATH.'Spreadsheet.php';
+		require_once DOL_DOCUMENT_ROOT.'/includes/phpoffice/autoloader.php';
+		require_once DOL_DOCUMENT_ROOT.'/includes/Psr/autoloader.php';
+		require_once PHPEXCELNEW_PATH.'Spreadsheet.php';
 
-	    if ($this->id == 'excel2007new')
-	    {
-            if (!class_exists('ZipArchive'))	// For Excel2007, PHPExcel need ZipArchive
-            {
-            	$langs->load("errors");
-            	$this->error = $langs->trans('ErrorPHPNeedModule', 'zip');
-            	return -1;
-            }
-	    }
+		if ($this->id == 'excel2007new')
+		{
+			if (!class_exists('ZipArchive'))	// For Excel2007, PHPSpreadSheet may need ZipArchive
+			{
+				$langs->load("errors");
+				$this->error = $langs->trans('ErrorPHPNeedModule', 'zip');
+				return -1;
+			}
+		}
 
-        //$this->workbook = new PHPExcel();
-        $this->workbook = new Spreadsheet();
-        $this->workbook->getProperties()->setCreator($user->getFullName($outputlangs).' - '.DOL_APPLICATION_TITLE.' '.DOL_VERSION);
-        //$this->workbook->getProperties()->setLastModifiedBy('Dolibarr '.DOL_VERSION);
-        $this->workbook->getProperties()->setTitle(basename($file));
-        $this->workbook->getProperties()->setSubject(basename($file));
-        $this->workbook->getProperties()->setDescription(DOL_APPLICATION_TITLE.' '.DOL_VERSION);
+		$this->workbook = new Spreadsheet();
+		$this->workbook->getProperties()->setCreator($user->getFullName($outputlangs).' - '.DOL_APPLICATION_TITLE.' '.DOL_VERSION);
+		//$this->workbook->getProperties()->setLastModifiedBy('Dolibarr '.DOL_VERSION);
+		$this->workbook->getProperties()->setTitle(basename($file));
+		$this->workbook->getProperties()->setSubject(basename($file));
+		$this->workbook->getProperties()->setDescription(DOL_APPLICATION_TITLE.' '.DOL_VERSION);
 
-        $this->workbook->setActiveSheetIndex(0);
-        $this->workbook->getActiveSheet()->setTitle($outputlangs->trans("Sheet"));
-        $this->workbook->getActiveSheet()->getDefaultRowDimension()->setRowHeight(16);
+		$this->workbook->setActiveSheetIndex(0);
+		$this->workbook->getActiveSheet()->setTitle($outputlangs->trans("Sheet"));
+		$this->workbook->getActiveSheet()->getDefaultRowDimension()->setRowHeight(16);
 
 		return $ret;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Write header
 	 *
-     *  @param      Translate	$outputlangs        Object lang to translate values
+	 *  @param      Translate	$outputlangs        Object lang to translate values
 	 * 	@return		int								<0 if KO, >0 if OK
 	 */
 	public function write_header($outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		//$outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
 
 		return 0;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-     *  Output title line into file
-     *
-     *  @param      array		$array_export_fields_label   	Array with list of label of fields
-     *  @param      array		$array_selected_sorted       	Array with list of field to export
-     *  @param      Translate	$outputlangs    				Object lang to translate values
-     *  @param		array		$array_types					Array with types of fields
+	 *  Output title line into file
+	 *
+	 *  @param      array		$array_export_fields_label   	Array with list of label of fields
+	 *  @param      array		$array_selected_sorted       	Array with list of field to export
+	 *  @param      Translate	$outputlangs    				Object lang to translate values
+	 *  @param		array		$array_types					Array with types of fields
 	 * 	@return		int											<0 if KO, >0 if OK
 	 */
 	public function write_title($array_export_fields_label, $array_selected_sorted, $outputlangs, $array_types)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		// Create a format for the column headings
-        $this->workbook->getActiveSheet()->getStyle('1')->getFont()->setBold(true);
-        $this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_LEFT);
+		$this->workbook->getActiveSheet()->getStyle('1')->getFont()->setBold(true);
+		$this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_LEFT);
 
 		$this->col = 1;
 		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL)) {
@@ -267,38 +264,38 @@ class ExportExcel2007new extends ModeleExports
 		}
 		foreach ($array_selected_sorted as $code => $value)
 		{
-            $alias = $array_export_fields_label[$code];
+			$alias = $array_export_fields_label[$code];
 			//print "dd".$alias;
 			if (empty($alias)) dol_print_error('', 'Bad value for field with code='.$code.'. Try to redefine export.');
-    		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-    		{
-    			$this->worksheet->write($this->row, $this->col, $outputlangs->transnoentities($alias), $formatheader);
-    		} else {
-                $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $outputlangs->transnoentities($alias));
-    		    if (!empty($array_types[$code]) && in_array($array_types[$code], array('Date', 'Numeric', 'TextAuto')))		// Set autowidth for some types
-                {
-                	$this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($this->col + 1))->setAutoSize(true);
-                }
-    		}
+			if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+			{
+				$this->worksheet->write($this->row, $this->col, $outputlangs->transnoentities($alias), $formatheader);
+			} else {
+				$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $outputlangs->transnoentities($alias));
+				if (!empty($array_types[$code]) && in_array($array_types[$code], array('Date', 'Numeric', 'TextAuto')))		// Set autowidth for some types
+				{
+					$this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($this->col + 1))->setAutoSize(true);
+				}
+			}
 			$this->col++;
 		}
 		$this->row++;
 		return 0;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-     *  Output record line into file
-     *
-     *  @param      array		$array_selected_sorted      Array with list of field to export
-     *  @param      resource	$objp                       A record from a fetch with all fields from select
-     *  @param      Translate	$outputlangs                Object lang to translate values
-     *  @param		array		$array_types				Array with types of fields
+	 *  Output record line into file
+	 *
+	 *  @param      array		$array_selected_sorted      Array with list of field to export
+	 *  @param      resource	$objp                       A record from a fetch with all fields from select
+	 *  @param      Translate	$outputlangs                Object lang to translate values
+	 *  @param		array		$array_types				Array with types of fields
 	 * 	@return		int										<0 if KO, >0 if OK
 	 */
 	public function write_record($array_selected_sorted, $objp, $outputlangs, $array_types)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		// Define first row
@@ -313,8 +310,8 @@ class ExportExcel2007new extends ModeleExports
 		{
 			if (strpos($code, ' as ') == 0) $alias = str_replace(array('.', '-', '(', ')'), '_', $code);
 			else $alias = substr($code, strpos($code, ' as ') + 4);
-            if (empty($alias)) dol_print_error('', 'Bad value for field with code='.$code.'. Try to redefine export.');
-            $newvalue = $objp->$alias;
+			if (empty($alias)) dol_print_error('', 'Bad value for field with code='.$code.'. Try to redefine export.');
+			$newvalue = $objp->$alias;
 
 			$newvalue = $this->excel_clean($newvalue);
 			$typefield = isset($array_types[$code]) ? $array_types[$code] : '';
@@ -336,27 +333,26 @@ class ExportExcel2007new extends ModeleExports
 
 			if (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$/i', $newvalue))
 			{
-        	    $newvalue = dol_stringtotime($newvalue);
-        	    $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, \PhpOffice\PhpSpreadsheet\Shared\Date::PHPToExcel($newvalue));
-        	    $coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
-        	    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd');
+				$newvalue = dol_stringtotime($newvalue);
+				$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, \PhpOffice\PhpSpreadsheet\Shared\Date::PHPToExcel($newvalue));
+				$coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
+				$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd');
 			} elseif (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/i', $newvalue))
 			{
-        	    $newvalue = dol_stringtotime($newvalue);
-        	    $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, \PhpOffice\PhpSpreadsheet\Shared\Date::PHPToExcel($newvalue));
-        	    $coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
-        	    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd h:mm:ss');
+				$newvalue = dol_stringtotime($newvalue);
+				$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, \PhpOffice\PhpSpreadsheet\Shared\Date::PHPToExcel($newvalue));
+				$coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
+				$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd h:mm:ss');
 			} else {
-    	    	if ($typefield == 'Text' || $typefield == 'TextAuto')
-    	    	{
-    	    		//$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->setValueExplicit($newvalue, PHPExcel_Cell_DataType::TYPE_STRING);
+				if ($typefield == 'Text' || $typefield == 'TextAuto')
+				{
 					$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, (string) $newvalue);
-    	    		$coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
-    	    		$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@');
-    	    		$this->workbook->getActiveSheet()->getStyle($coord)->getAlignment()->setHorizontal(PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_LEFT);
-    	    	} else {
-    	    		$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $newvalue);
-    	    	}
+					$coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
+					$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@');
+					$this->workbook->getActiveSheet()->getStyle($coord)->getAlignment()->setHorizontal(PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_LEFT);
+				} else {
+					$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $newvalue);
+				}
 			}
 			$this->col++;
 		}
@@ -365,75 +361,275 @@ class ExportExcel2007new extends ModeleExports
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-     *	Write footer
-     *
+	 *	Write footer
+	 *
 	 * 	@param		Translate	$outputlangs	Output language object
 	 * 	@return		int							<0 if KO, >0 if OK
-     */
+	 */
 	public function write_footer($outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return 0;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Close Excel file
-     *
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Close Excel file
+	 *
 	 * 	@return		int							<0 if KO, >0 if OK
-     */
+	 */
 	public function close_file()
 	{
-        // phpcs:enable
-        global $conf;
+		// phpcs:enable
+		global $conf;
 
-        $objWriter = new Xlsx($this->workbook);
-        $objWriter->save($this->file);
-        $this->workbook->disconnectWorksheets();
-        unset($this->workbook);
+		$objWriter = new Xlsx($this->workbook);
+		$objWriter->save($this->file);
+		$this->workbook->disconnectWorksheets();
+		unset($this->workbook);
 
 		return 1;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Clean a cell to respect rules of Excel file cells
-     *
-     * @param 	string	$newvalue	String to clean
-     * @return 	string				Value cleaned
-     */
-    public function excel_clean($newvalue)
-    {
-        // phpcs:enable
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Clean a cell to respect rules of Excel file cells
+	 *
+	 * @param 	string	$newvalue	String to clean
+	 * @return 	string				Value cleaned
+	 */
+	public function excel_clean($newvalue)
+	{
+		// phpcs:enable
 		// Rule Dolibarr: No HTML
-    	$newvalue = dol_string_nohtmltag($newvalue);
+		$newvalue = dol_string_nohtmltag($newvalue);
 
-    	return $newvalue;
-    }
+		return $newvalue;
+	}
 
 
-    /**
-     * Convert a column to letter (1->A, 0->B, 27->AA, ...)
-     *
-     * @param 	int		$c		Column position
-     * @return 	string			Letter
-     */
-    public function column2Letter($c)
-    {
+	/**
+	 * Convert a column to letter (1->A, 0->B, 27->AA, ...)
+	 *
+	 * @param 	int		$c		Column position
+	 * @return 	string			Letter
+	 */
+	public function column2Letter($c)
+	{
 
-    	$c = intval($c);
-    	if ($c <= 0) return '';
+		$c = intval($c);
+		if ($c <= 0) return '';
 
-    	while ($c != 0) {
-    		$p = ($c - 1) % 26;
-    		$c = intval(($c - $p) / 26);
-    		$letter = chr(65 + $p).$letter;
-    	}
+		while ($c != 0) {
+			$p = ($c - 1) % 26;
+			$c = intval(($c - $p) / 26);
+			$letter = chr(65 + $p).$letter;
+		}
 
-    	return $letter;
-    }
+		return $letter;
+	}
+
+	/**
+	 * Set cell value and automatically merge if we give an endcell
+	 *
+	 * @param string $val cell value
+	 * @param string $startCell starting cell
+	 * @param string $endCell  ending cell
+	 * @return int 1 if success -1 if failed
+	 */
+	public function setCellValue($val, $startCell, $endCell = '')
+	{
+		try {
+			$this->workbook->getActiveSheet()->setCellValue($startCell, $val);
+
+			if (!empty($endCell)) {
+				$cellRange = $startCell.':'.$endCell;
+				$this->workbook->getActiveSheet()->mergeCells($startCell.':'.$endCell);
+			}
+			else $cellRange = $startCell;
+			if (!empty($this->styleArray)) $this->workbook->getActiveSheet()->getStyle($cellRange)->applyFromArray($this->styleArray);
+		}
+		catch (Exception $e) {
+			$this->error = $e->getMessage();
+			return -1;
+		}
+		return 1;
+	}
+
+	/**
+	 * Set border style
+	 *
+	 * @param string $thickness style \PhpOffice\PhpSpreadsheet\Style\Border
+	 * @param string $color     color \PhpOffice\PhpSpreadsheet\Style\Color
+	 * @return int 1 if ok
+	 */
+	public function setBorderStyle($thickness, $color)
+	{
+		$this->styleArray['borders'] = array(
+			'outline' => array(
+				'borderStyle' => $thickness,
+				'color' => array('argb' => $color)
+			)
+		);
+		return 1;
+	}
+
+	/**
+	 * Set font style
+	 *
+	 * @param bool   $bold  true if bold
+	 * @param string $color color \PhpOffice\PhpSpreadsheet\Style\Color
+	 * @return int 1
+	 */
+	public function setFontStyle($bold, $color)
+	{
+		$this->styleArray['font'] = array(
+			'color' => array('argb' => $color),
+			'bold' => $bold
+		);
+		return 1;
+	}
+
+	/**
+	 * Set alignment style (horizontal, left, right, ...)
+	 *
+	 * @param string $horizontal PhpOffice\PhpSpreadsheet\Style\Alignment
+	 * @return int 1
+	 */
+	public function setAlignmentStyle($horizontal)
+	{
+		$this->styleArray['alignment'] = array('horizontal' => $horizontal);
+		return 1;
+	}
+
+	/**
+	 * Reset Style
+	 * @return int 1
+	 */
+	public function resetStyle()
+	{
+		$this->styleArray = array();
+		return 1;
+	}
+
+	/**
+	 * Make a NxN Block in sheet
+	 *
+	 * @param string $startCell starting cell
+	 * @param array  $TDatas array(ColumnName=>array(Row value 1, row value 2, etc ...))
+	 * @param bool   $boldTitle true if bold headers
+	 * @return int 1 if OK, -1 if KO
+	 */
+	public function setBlock($startCell, $TDatas = array(), $boldTitle = false)
+	{
+		try {
+			if (!empty($TDatas)) {
+				$startCell = $this->workbook->getActiveSheet()->getCell($startCell);
+				$startColumn = Coordinate::columnIndexFromString($startCell->getColumn());
+				$startRow = $startCell->getRow();
+				foreach ($TDatas as $column => $TRows) {
+					if ($boldTitle) $this->setFontStyle(true, $this->styleArray['font']['color']['argb']);
+					$cell = $this->workbook->getActiveSheet()->getCellByColumnAndRow($startColumn, $startRow);
+					$this->setCellValue($column, $cell->getCoordinate());
+					$rowPos = $startRow;
+					if ($boldTitle) $this->setFontStyle(false, $this->styleArray['font']['color']['argb']);
+					foreach ($TRows as $row) {
+						$rowPos++;
+						$cell = $this->workbook->getActiveSheet()->getCellByColumnAndRow($startColumn, $rowPos);
+						$this->setCellValue($row, $cell->getCoordinate());
+					}
+					$startColumn++;
+				}
+			}
+		}
+		catch (Exception $e) {
+			$this->error = $e->getMessage();
+			return -1;
+		}
+		return 1;
+	}
+
+	/**
+	 * Make a 2xN Tab in Sheet
+	 *
+	 * @param string $startCell A1
+	 * @param array  $TDatas    array(Title=>val)
+	 * @param bool   $boldTitle true if bold titles
+	 * @return int 1 if OK, -1 if KO
+	 */
+	public function setBlock2Columns($startCell, $TDatas = array(), $boldTitle = false)
+	{
+		try {
+			if (!empty($TDatas)) {
+				$startCell = $this->workbook->getActiveSheet()->getCell($startCell);
+				$startColumn = Coordinate::columnIndexFromString($startCell->getColumn());
+				$startRow = $startCell->getRow();
+				foreach ($TDatas as $title => $val) {
+					$cell = $this->workbook->getActiveSheet()->getCellByColumnAndRow($startColumn, $startRow);
+					if ($boldTitle) $this->setFontStyle(true, $this->styleArray['font']['color']['argb']);
+					$this->setCellValue($title, $cell->getCoordinate());
+					if ($boldTitle) $this->setFontStyle(false, $this->styleArray['font']['color']['argb']);
+					$cell2 = $this->workbook->getActiveSheet()->getCellByColumnAndRow($startColumn + 1, $startRow);
+					$this->setCellValue($val, $cell2->getCoordinate());
+					$startRow++;
+				}
+			}
+		}
+		catch (Exception $e) {
+			$this->error = $e->getMessage();
+			return -1;
+		}
+		return 1;
+	}
+
+	/**
+	 * Enable auto sizing for column range
+	 *
+	 * @param string $firstColumn first column to autosize
+	 * @param string $lastColumn  to last column to autosize
+	 * @return int 1
+	 */
+	public function enableAutosize($firstColumn, $lastColumn)
+	{
+		foreach (range($firstColumn, $lastColumn) as $columnID) {
+			$this->workbook->getActiveSheet()->getColumnDimension($columnID)->setAutoSize(true);
+		}
+		return 1;
+	}
+
+	/**
+	 * Set a value cell and merging it by giving a starting cell and a length
+	 *
+	 * @param string $val       Cell value
+	 * @param string $startCell Starting cell
+	 * @param int    $length    Length
+	 * @param int    $offset    Starting offset
+	 * @return string Coordinate or -1 if KO
+	 */
+	public function setMergeCellValueByLength($val, $startCell, $length, $offset = 0)
+	{
+		try {
+			$startCell = $this->workbook->getActiveSheet()->getCell($startCell);
+			$startColumn = Coordinate::columnIndexFromString($startCell->getColumn());
+			if (!empty($offset)) $startColumn += $offset;
+
+			$startRow = $startCell->getRow();
+			$startCell = $this->workbook->getActiveSheet()->getCellByColumnAndRow($startColumn, $startRow);
+			$startCoordinate = $startCell->getCoordinate();
+			$this->setCellValue($val, $startCell->getCoordinate());
+
+			$endCell = $this->workbook->getActiveSheet()->getCellByColumnAndRow($startColumn + ($length - 1), $startRow);
+			$endCoordinate = $endCell->getCoordinate();
+			$this->workbook->getActiveSheet()->mergeCells($startCoordinate.':'.$endCoordinate);
+		}
+		catch (Exception $e) {
+			$this->error = $e->getMessage();
+			return -1;
+		}
+		return $endCoordinate;
+	}
 }
diff --git a/htdocs/core/modules/export/export_tsv.modules.php b/htdocs/core/modules/export/export_tsv.modules.php
index 873dd397b2e..90e478458f7 100644
--- a/htdocs/core/modules/export/export_tsv.modules.php
+++ b/htdocs/core/modules/export/export_tsv.modules.php
@@ -30,146 +30,146 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
  */
 class ExportTsv extends ModeleExports
 {
-    /**
+	/**
 	 * @var string ID
 	 */
 	public $id;
 
-    /**
-     * @var string label
-     */
-    public $label;
+	/**
+	 * @var string label
+	 */
+	public $label;
 
-    public $extension;
+	public $extension;
 
-    /**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
-    public $label_lib;
+	public $label_lib;
 
-    public $version_lib;
+	public $version_lib;
 
-    public $separator = "\t";
+	public $separator = "\t";
 
-    public $handle; // Handle fichier
+	public $handle; // Handle fichier
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB	$db      Database handler
-     */
-    public function __construct($db)
-    {
-        global $conf, $langs;
-        $this->db = $db;
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB	$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf, $langs;
+		$this->db = $db;
 
-        $this->id = 'tsv'; // Same value then xxx in file name export_xxx.modules.php
-        $this->label = 'TSV'; // Label of driver
-        $this->desc = $langs->trans('TsvFormatDesc');
-        $this->extension = 'tsv'; // Extension for generated file by this driver
-        $this->picto = 'mime/other'; // Picto
-        $this->version = '1.15'; // Driver version
+		$this->id = 'tsv'; // Same value then xxx in file name export_xxx.modules.php
+		$this->label = 'TSV'; // Label of driver
+		$this->desc = $langs->trans('TsvFormatDesc');
+		$this->extension = 'tsv'; // Extension for generated file by this driver
+		$this->picto = 'mime/other'; // Picto
+		$this->version = '1.15'; // Driver version
 
-        // If driver use an external library, put its name here
-        $this->label_lib = 'Dolibarr';
-        $this->version_lib = DOL_VERSION;
-    }
+		// If driver use an external library, put its name here
+		$this->label_lib = 'Dolibarr';
+		$this->version_lib = DOL_VERSION;
+	}
 
 	/**
 	 * getDriverId
 	 *
 	 * @return string
 	 */
-    public function getDriverId()
-    {
-        return $this->id;
-    }
+	public function getDriverId()
+	{
+		return $this->id;
+	}
 
 	/**
 	 * getDriverLabel
 	 *
 	 * @return 	string			Return driver label
 	 */
-    public function getDriverLabel()
-    {
-        return $this->label;
-    }
+	public function getDriverLabel()
+	{
+		return $this->label;
+	}
 
 	/**
 	 * getDriverDesc
 	 *
 	 * @return string
 	 */
-    public function getDriverDesc()
-    {
-        return $this->desc;
-    }
+	public function getDriverDesc()
+	{
+		return $this->desc;
+	}
 
 	/**
 	 * getDriverExtension
 	 *
 	 * @return string
 	 */
-    public function getDriverExtension()
-    {
-        return $this->extension;
-    }
+	public function getDriverExtension()
+	{
+		return $this->extension;
+	}
 
 	/**
 	 * getDriverVersion
 	 *
 	 * @return string
 	 */
-    public function getDriverVersion()
-    {
-        return $this->version;
-    }
+	public function getDriverVersion()
+	{
+		return $this->version;
+	}
 
 	/**
 	 * getLibLabel
 	 *
 	 * @return string
 	 */
-    public function getLibLabel()
-    {
-        return $this->label_lib;
-    }
+	public function getLibLabel()
+	{
+		return $this->label_lib;
+	}
 
 	/**
 	 * getLibVersion
 	 *
 	 * @return string
 	 */
-    public function getLibVersion()
-    {
-        return $this->version_lib;
-    }
+	public function getLibVersion()
+	{
+		return $this->version_lib;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *   Open output file
-     *
-     *  @param      string		$file			Path of filename to generate
-     *  @param      Translate	$outputlangs	Output language object
-     *  @return     int							<0 if KO, >=0 if OK
-     */
-    public function open_file($file, $outputlangs)
-    {
-        // phpcs:enable
-        global $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *   Open output file
+	 *
+	 *  @param      string		$file			Path of filename to generate
+	 *  @param      Translate	$outputlangs	Output language object
+	 *  @return     int							<0 if KO, >=0 if OK
+	 */
+	public function open_file($file, $outputlangs)
+	{
+		// phpcs:enable
+		global $langs;
 
-        dol_syslog("ExportTsv::open_file file=".$file);
+		dol_syslog("ExportTsv::open_file file=".$file);
 
-        $ret = 1;
+		$ret = 1;
 
-        $outputlangs->load("exports");
+		$outputlangs->load("exports");
 		$this->handle = fopen($file, "wt");
-        if (!$this->handle)
+		if (!$this->handle)
 		{
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorFailToCreateFile", $file);
@@ -177,73 +177,73 @@ class ExportTsv extends ModeleExports
 		}
 
 		return $ret;
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output header into file
 	 *
 	 * 	@param		Translate	$outputlangs		Output language object
 	 * 	@return		int								<0 if KO, >0 if OK
 	 */
-    public function write_header($outputlangs)
-    {
-        // phpcs:enable
-        return 0;
-    }
+	public function write_header($outputlangs)
+	{
+		// phpcs:enable
+		return 0;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Output title line into file
-     *
-     *  @param      array		$array_export_fields_label   	Array with list of label of fields
-     *  @param      array		$array_selected_sorted       	Array with list of field to export
-     *  @param      Translate	$outputlangs    				Object lang to translate values
-     *  @param		array		$array_types					Array with types of fields
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Output title line into file
+	 *
+	 *  @param      array		$array_export_fields_label   	Array with list of label of fields
+	 *  @param      array		$array_selected_sorted       	Array with list of field to export
+	 *  @param      Translate	$outputlangs    				Object lang to translate values
+	 *  @param		array		$array_types					Array with types of fields
 	 * 	@return		int											<0 if KO, >0 if OK
-     */
-    public function write_title($array_export_fields_label, $array_selected_sorted, $outputlangs, $array_types)
-    {
-        // phpcs:enable
-        foreach ($array_selected_sorted as $code => $value)
-        {
-            $newvalue = $outputlangs->transnoentities($array_export_fields_label[$code]); // newvalue is now $outputlangs->charset_output encoded
+	 */
+	public function write_title($array_export_fields_label, $array_selected_sorted, $outputlangs, $array_types)
+	{
+		// phpcs:enable
+		foreach ($array_selected_sorted as $code => $value)
+		{
+			$newvalue = $outputlangs->transnoentities($array_export_fields_label[$code]); // newvalue is now $outputlangs->charset_output encoded
 			$newvalue = $this->tsv_clean($newvalue, $outputlangs->charset_output);
 
 			fwrite($this->handle, $newvalue.$this->separator);
-        }
-        fwrite($this->handle, "\n");
-        return 0;
-    }
+		}
+		fwrite($this->handle, "\n");
+		return 0;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output record line into file
 	 *
 	 *  @param      array		$array_selected_sorted      Array with list of field to export
 	 *  @param      resource	$objp                       A record from a fetch with all fields from select
 	 *  @param      Translate	$outputlangs                Object lang to translate values
-     *  @param		array		$array_types				Array with types of fields
+	 *  @param		array		$array_types				Array with types of fields
 	 * 	@return		int										<0 if KO, >0 if OK
 	 */
-    public function write_record($array_selected_sorted, $objp, $outputlangs, $array_types)
-    {
-        // phpcs:enable
-    	global $conf;
+	public function write_record($array_selected_sorted, $objp, $outputlangs, $array_types)
+	{
+		// phpcs:enable
+		global $conf;
 
 		$this->col = 0;
  		foreach ($array_selected_sorted as $code => $value)
-        {
+		{
 			if (strpos($code, ' as ') == 0) $alias = str_replace(array('.', '-', '(', ')'), '_', $code);
 			else $alias = substr($code, strpos($code, ' as ') + 4);
-            if (empty($alias)) dol_print_error('', 'Bad value for field with code='.$code.'. Try to redefine export.');
+			if (empty($alias)) dol_print_error('', 'Bad value for field with code='.$code.'. Try to redefine export.');
 
-            $newvalue = $outputlangs->convToOutputCharset($objp->$alias); // objp->$alias must be utf8 encoded as any var in memory // newvalue is now $outputlangs->charset_output encoded
-            $typefield = isset($array_types[$code]) ? $array_types[$code] : '';
+			$newvalue = $outputlangs->convToOutputCharset($objp->$alias); // objp->$alias must be utf8 encoded as any var in memory // newvalue is now $outputlangs->charset_output encoded
+			$typefield = isset($array_types[$code]) ? $array_types[$code] : '';
 
-            // Translation newvalue
+			// Translation newvalue
 			if (preg_match('/^\((.*)\)$/i', $newvalue, $reg)) $newvalue = $outputlangs->transnoentities($reg[1]);
 
 			$newvalue = $this->tsv_clean($newvalue, $outputlangs->charset_output);
@@ -256,61 +256,61 @@ class ExportTsv extends ModeleExports
 			}
 
 			fwrite($this->handle, $newvalue.$this->separator);
-            $this->col++;
+			$this->col++;
 		}
-        fwrite($this->handle, "\n");
-        return 0;
-    }
+		fwrite($this->handle, "\n");
+		return 0;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output footer into file
 	 *
 	 * 	@param		Translate	$outputlangs		Output language object
 	 * 	@return		int								<0 if KO, >0 if OK
 	 */
-    public function write_footer($outputlangs)
-    {
-        // phpcs:enable
+	public function write_footer($outputlangs)
+	{
+		// phpcs:enable
 		return 0;
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Close file handle
 	 *
 	 * 	@return		int							<0 if KO, >0 if OK
 	 */
-    public function close_file()
-    {
-        // phpcs:enable
-        fclose($this->handle);
-        return 0;
-    }
+	public function close_file()
+	{
+		// phpcs:enable
+		fclose($this->handle);
+		return 0;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Clean a cell to respect rules of TSV file cells
-     *
-     * @param 	string	$newvalue	String to clean
-     * @param	string	$charset	Input AND Output character set
-     * @return 	string				Value cleaned
-     */
-    public function tsv_clean($newvalue, $charset)
-    {
-        // phpcs:enable
-        // Rule Dolibarr: No HTML
-        $newvalue = dol_string_nohtmltag($newvalue, 1, $charset);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Clean a cell to respect rules of TSV file cells
+	 *
+	 * @param 	string	$newvalue	String to clean
+	 * @param	string	$charset	Input AND Output character set
+	 * @return 	string				Value cleaned
+	 */
+	public function tsv_clean($newvalue, $charset)
+	{
+		// phpcs:enable
+		// Rule Dolibarr: No HTML
+		$newvalue = dol_string_nohtmltag($newvalue, 1, $charset);
 
-        // Rule 1 TSV: No CR, LF in cells
-        $newvalue = str_replace("\r", '', $newvalue);
-        $newvalue = str_replace("\n", '\n', $newvalue);
+		// Rule 1 TSV: No CR, LF in cells
+		$newvalue = str_replace("\r", '', $newvalue);
+		$newvalue = str_replace("\n", '\n', $newvalue);
 
-        // Rule 2 TSV: If value contains tab, we must replace by space
-        if (preg_match('/'.$this->separator.'/', $newvalue)) {
-            $newvalue = str_replace("\t", " ", $newvalue);
-        }
+		// Rule 2 TSV: If value contains tab, we must replace by space
+		if (preg_match('/'.$this->separator.'/', $newvalue)) {
+			$newvalue = str_replace("\t", " ", $newvalue);
+		}
 
-        return $newvalue;
-    }
+		return $newvalue;
+	}
 }
diff --git a/htdocs/core/modules/export/modules_export.php b/htdocs/core/modules/export/modules_export.php
index 15ccabbb2b2..2f345556bdf 100644
--- a/htdocs/core/modules/export/modules_export.php
+++ b/htdocs/core/modules/export/modules_export.php
@@ -44,17 +44,17 @@ class ModeleExports extends CommonDocGenerator    // This class can't be abstrac
 	public $libversion = array();
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Load into memory list of available export format
 	 *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates (same content than array this->driverlabel)
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates (same content than array this->driverlabel)
 	 */
 	public function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		dol_syslog(get_class($this)."::liste_modeles");
 
 		$dir = DOL_DOCUMENT_ROOT."/core/modules/export/";
@@ -62,40 +62,40 @@ class ModeleExports extends CommonDocGenerator    // This class can't be abstrac
 
 		// Recherche des fichiers drivers exports disponibles
 		$i = 0;
-        if (is_resource($handle))
-        {
-    		while (($file = readdir($handle)) !== false)
-    		{
-    			if (preg_match("/^export_(.*)\.modules\.php$/i", $file, $reg))
-    			{
-    				$moduleid = $reg[1];
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (preg_match("/^export_(.*)\.modules\.php$/i", $file, $reg))
+				{
+					$moduleid = $reg[1];
 
-    				// Loading Class
-    				$file = $dir."export_".$moduleid.".modules.php";
-    				$classname = "Export".ucfirst($moduleid);
+					// Loading Class
+					$file = $dir."export_".$moduleid.".modules.php";
+					$classname = "Export".ucfirst($moduleid);
 
-    				require_once $file;
-    				if (class_exists($classname))
-    				{
-        				$module = new $classname($db);
+					require_once $file;
+					if (class_exists($classname))
+					{
+						$module = new $classname($db);
 
-        				// Picto
-        				$this->picto[$module->id] = $module->picto;
-        				// Driver properties
-        				$this->driverlabel[$module->id] = $module->getDriverLabel().(empty($module->disabled) ? '' : ' __(Disabled)__'); // '__(Disabled)__' is a key
-        				$this->driverdesc[$module->id] = $module->getDriverDesc();
-        				$this->driverversion[$module->id] = $module->getDriverVersion();
-        				// If use an external lib
-        				$this->liblabel[$module->id] = $module->getLibLabel();
-        				$this->libversion[$module->id] = $module->getLibVersion();
-    				}
-    				$i++;
-    			}
-    		}
-    		closedir($handle);
-        }
+						// Picto
+						$this->picto[$module->id] = $module->picto;
+						// Driver properties
+						$this->driverlabel[$module->id] = $module->getDriverLabel().(empty($module->disabled) ? '' : ' __(Disabled)__'); // '__(Disabled)__' is a key
+						$this->driverdesc[$module->id] = $module->getDriverDesc();
+						$this->driverversion[$module->id] = $module->getDriverVersion();
+						// If use an external lib
+						$this->liblabel[$module->id] = $module->getLibLabel();
+						$this->libversion[$module->id] = $module->getLibVersion();
+					}
+					$i++;
+				}
+			}
+			closedir($handle);
+		}
 
-        asort($this->driverlabel);
+		asort($this->driverlabel);
 
 		return $this->driverlabel;
 	}
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index c581909588a..f2f4ee31823 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -46,15 +46,15 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 
@@ -63,12 +63,12 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
-    {
+	public function __construct($db)
+	{
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT/ODS templates";
@@ -99,7 +99,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
 		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // Par defaut, si n'etait pas defini
-    }
+	}
 
 
 	/**
@@ -108,12 +108,12 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 	 * @param	Translate	$langs      Lang object to use for output
 	 * @return	string      			Description
 	 */
-    public function info($langs)
-    {
+	public function info($langs)
+	{
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("errors", "companies"));
+		$langs->loadLangs(array("errors", "companies"));
 
 		$form = new Form($this->db);
 
@@ -171,15 +171,15 @@ class doc_generic_invoice_odt extends ModelePDFFactures
    			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
    			foreach ($listoffiles as $file)
    			{
-                $texte .= $file['name'].'<br>';
+				$texte .= $file['name'].'<br>';
    			}
    			$texte .= '</div>';
 		}
-        // Add input to upload a new template file.
-        $texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
-        $texte .= '<input type="hidden" value="FACTURE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-        $texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
-        $texte .= '</div>';
+		// Add input to upload a new template file.
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte .= '<input type="hidden" value="FACTURE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
+		$texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '</div>';
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
@@ -191,9 +191,9 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Function to build a document on disk using the generic odt module.
 	 *
@@ -205,9 +205,9 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-    public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
-    {
-        // phpcs:enable
+	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
@@ -247,6 +247,8 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				}
 			}
 
+			$object->fetch_thirdparty();
+
 			$dir = $conf->facture->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
@@ -275,8 +277,8 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -303,10 +305,9 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				// Recipient name
 				$contactobject = null;
 				if (!empty($usecontact)) {
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 						$socobject = $object->contact;
-					else {
+					} else {
 						$socobject = $object->thirdparty;
 						// if we have a BILLING contact and we dont use it as recipient we store the contact object for later use
 						$contactobject = $object->contact;
@@ -345,7 +346,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->facture->dir_temp,
@@ -410,7 +411,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
@@ -466,7 +467,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -480,7 +481,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				} else {
@@ -488,7 +489,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
@@ -510,5 +511,5 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 		}
 
 		return -1;
-    }
+	}
 }
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 6827f573402..f1c90305bef 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -220,7 +220,7 @@ class pdf_crabe extends ModelePDFFactures
 	/**
 	 *  Function to build pdf onto disk
 	 *
-	 *  @param		Object		$object				Object to generate
+	 *  @param		Facture		$object				Object to generate
 	 *  @param		Translate	$outputlangs		Lang output object
 	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
 	 *  @param		int			$hidedetails		Do not show line details
@@ -276,9 +276,9 @@ class pdf_crabe extends ModelePDFFactures
 		{
 			$object->fetch_thirdparty();
 
-			$deja_regle = $object->getSommePaiement(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
-			$amount_credit_notes_included = $object->getSumCreditNotesUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
-			$amount_deposits_included = $object->getSumDepositsUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
+			$deja_regle = $object->getSommePaiement((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
+			$amount_credit_notes_included = $object->getSumCreditNotesUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
+			$amount_deposits_included = $object->getSumDepositsUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
 
 			// Definition of $dir and $file
 			if ($object->specimen)
@@ -322,9 +322,10 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->SetAutoPageBreak(1, 0);
 
 				$heightforinfotot = 50 + (4 * $nbpayments); // Height reserved to output the info and total part and payment part
+				if ($heightforinfotot > 220) $heightforinfotot = 220;
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
 
 				if (class_exists('TCPDF'))
 				{
@@ -353,7 +354,7 @@ class pdf_crabe extends ModelePDFFactures
 
 				// Set certificate
 				$cert = empty($user->conf->CERTIFICATE_CRT) ? '' : $user->conf->CERTIFICATE_CRT;
-				// If use has no certificate, we try to take the company one
+				// If user has no certificate, we try to take the company one
 				if (!$cert) {
 					$cert = empty($conf->global->CERTIFICATE_CRT) ? '' : $conf->global->CERTIFICATE_CRT;
 				}
@@ -378,7 +379,7 @@ class pdf_crabe extends ModelePDFFactures
 						$this->atleastonediscount++;
 					}
 				}
-				if (empty($this->atleastonediscount))    // retreive space not used by discount
+				if (empty($this->atleastonediscount))    // retrieve space not used by discount
 				{
 					$delta = ($this->posxprogress - $this->posxdiscount);
 					$this->posxpicture += $delta;
@@ -419,7 +420,7 @@ class pdf_crabe extends ModelePDFFactures
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
 
 				// Incoterm
-				if ($conf->incoterm->enabled)
+				if (!empty($conf->incoterm->enabled))
 				{
 					$desc_incoterms = $object->getIncotermsForPDF();
 					if ($desc_incoterms)
@@ -631,10 +632,10 @@ class pdf_crabe extends ModelePDFFactures
 					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
 					if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) // Compute progress from previous situation
 					{
-						if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
+						if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
 						else $tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
 					} else {
-						if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva;
+						if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva;
 						else $tvaligne = $sign * $object->lines[$i]->total_tva;
 					}
 
@@ -781,7 +782,7 @@ class pdf_crabe extends ModelePDFFactures
 	 *  Show payments table
 	 *
 	 *  @param	TCPDF		$pdf            Object PDF
-	 *  @param  Object		$object         Object invoice
+	 *  @param  Facture		$object         Object invoice
 	 *  @param  int			$posy           Position y in PDF
 	 *  @param  Translate	$outputlangs    Object langs for output
 	 *  @param  int			$heightforfooter height for footer
@@ -852,7 +853,7 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->SetXY($tab3_posx, $tab3_top + $y);
 				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($obj->datef), 'day', false, $outputlangs, true), 0, 'L', 0);
 				$pdf->SetXY($tab3_posx + 21, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, price(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $obj->multicurrency_amount_ttc : $obj->amount_ttc, 0, $outputlangs), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, price((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $obj->multicurrency_amount_ttc : $obj->amount_ttc, 0, $outputlangs), 0, 'L', 0);
 				$pdf->SetXY($tab3_posx + 40, $tab3_top + $y);
 				$pdf->MultiCell(20, 3, $text, 0, 'L', 0);
 				$pdf->SetXY($tab3_posx + 58, $tab3_top + $y);
@@ -900,7 +901,7 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->SetXY($tab3_posx, $tab3_top + $y);
 				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date), 'day', false, $outputlangs, true), 0, 'L', 0);
 				$pdf->SetXY($tab3_posx + 21, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, price($sign * (($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount), 0, $outputlangs), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, price($sign * ((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount), 0, $outputlangs), 0, 'L', 0);
 				$pdf->SetXY($tab3_posx + 40, $tab3_top + $y);
 				$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort".$row->code);
 
@@ -966,7 +967,7 @@ class pdf_crabe extends ModelePDFFactures
 	 *   Show miscellaneous information (payment mode, payment term, ...)
 	 *
 	 *   @param		TCPDF		$pdf     		Object PDF
-	 *   @param		Object		$object			Object to show
+	 *   @param		Facture		$object			Object to show
 	 *   @param		int			$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @return	void
@@ -1176,14 +1177,14 @@ class pdf_crabe extends ModelePDFFactures
 		$pdf->SetXY($col1x, $tab2_top + 0);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
 
-		$total_ht = (($conf->multicurrency->enabled && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
+		$total_ht = ((!empty($conf->multicurrency->enabled) && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + 0);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, $outputlangs), 0, 'R', 1);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248, 248, 248);
 
-		$total_ttc = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
+		$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
 		$this->atleastoneratenotnull = 0;
 		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
@@ -1404,8 +1405,8 @@ class pdf_crabe extends ModelePDFFactures
 		}
 
 		$pdf->SetTextColor(0, 0, 0);
-		$creditnoteamount = $object->getSumCreditNotesUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0); // Warning, this also include excess received
-		$depositsamount = $object->getSumDepositsUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
+		$creditnoteamount = $object->getSumCreditNotesUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0); // Warning, this also include excess received
+		$depositsamount = $object->getSumDepositsUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
 		//print "x".$creditnoteamount."-".$depositsamount;exit;
 		$resteapayer = price2num($total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
 		if (!empty($object->paye)) $resteapayer = 0;
@@ -1587,7 +1588,7 @@ class pdf_crabe extends ModelePDFFactures
 	 *  Show top header of page.
 	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
-	 *  @param  Object		$object     	Object to show
+	 *  @param  Facture		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
@@ -1656,7 +1657,7 @@ class pdf_crabe extends ModelePDFFactures
 		if ($object->type == 2) $title = $outputlangs->transnoentities("InvoiceAvoir");
 		if ($object->type == 3) $title = $outputlangs->transnoentities("InvoiceDeposit");
 		if ($object->type == 4) $title = $outputlangs->transnoentities("InvoiceProForma");
-		if ($this->situationinvoice) $title = $outputlangs->transnoentities("InvoiceSituation");
+		if ($this->situationinvoice) $title = $outputlangs->transnoentities("PDFInvoiceSituation");
 		$pdf->MultiCell($w, 3, $title, '', 'R');
 
 		$pdf->SetFont('', 'B', $default_font_size);
@@ -1841,9 +1842,8 @@ class pdf_crabe extends ModelePDFFactures
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -1890,7 +1890,7 @@ class pdf_crabe extends ModelePDFFactures
 	 *   	Show footer of page. Need this->emetteur object
 	 *
 	 *   	@param	TCPDF		$pdf     			PDF
-	 * 		@param	Object		$object				Object to show
+	 * 		@param	Facture		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	int								Return height of bottom margin including footer text
@@ -1898,7 +1898,7 @@ class pdf_crabe extends ModelePDFFactures
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'INVOICE_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 }
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 8e41ae46574..4087e3db098 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -197,7 +197,7 @@ class pdf_sponge extends ModelePDFFactures
 	/**
 	 *  Function to build pdf onto disk
 	 *
-	 *  @param		Object		$object				Object to generate
+	 *  @param		Facture		$object				Object to generate
 	 *  @param		Translate	$outputlangs		Lang output object
 	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
 	 *  @param		int			$hidedetails		Do not show line details
@@ -219,8 +219,9 @@ class pdf_sponge extends ModelePDFFactures
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies"));
 
+		global $outputlangsbis;
+		$outputlangsbis = null;
 		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
-			global $outputlangsbis;
 			$outputlangsbis = new Translate('', $conf);
 			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
 			$outputlangsbis->loadLangs(array("main", "bills", "products", "dict", "companies"));
@@ -260,7 +261,11 @@ class pdf_sponge extends ModelePDFFactures
 				{
 					if (!$arephoto)
 					{
-						$dir = $conf->product->dir_output.'/'.$midir;
+						if ($conf->product->entity != $objphoto->entity) {
+							$dir = $conf->product->multidir_output[$objphoto->entity].'/'.$midir; //Check repertories of current entities
+						} else {
+							$dir = $conf->product->dir_output.'/'.$midir; //Check repertory of the current product
+						}
 
 						foreach ($objphoto->liste_photos($dir, 1) as $key => $obj)
 						{
@@ -289,22 +294,22 @@ class pdf_sponge extends ModelePDFFactures
 
 		//if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
 
-		if ($conf->facture->dir_output)
+		if ($conf->facture->multidir_output[$conf->entity])
 		{
 			$object->fetch_thirdparty();
 
-			$deja_regle = $object->getSommePaiement(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
-			$amount_credit_notes_included = $object->getSumCreditNotesUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
-			$amount_deposits_included = $object->getSumDepositsUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
+			$deja_regle = $object->getSommePaiement((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
+			$amount_credit_notes_included = $object->getSumCreditNotesUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
+			$amount_deposits_included = $object->getSumDepositsUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
 
 			// Definition of $dir and $file
 			if ($object->specimen)
 			{
-				$dir = $conf->facture->dir_output;
+				$dir = $conf->facture->multidir_output[$conf->entity];
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
-				$dir = $conf->facture->dir_output."/".$objectref;
+				$dir = $conf->facture->multidir_output[$object->entity]."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
 			}
 			if (!file_exists($dir))
@@ -369,7 +374,7 @@ class pdf_sponge extends ModelePDFFactures
 
 				// Set certificate
 				$cert = empty($user->conf->CERTIFICATE_CRT) ? '' : $user->conf->CERTIFICATE_CRT;
-				// If use has no certificate, we try to take the company one
+				// If user has no certificate, we try to take the company one
 				if (!$cert) {
 					$cert = empty($conf->global->CERTIFICATE_CRT) ? '' : $conf->global->CERTIFICATE_CRT;
 				}
@@ -386,11 +391,12 @@ class pdf_sponge extends ModelePDFFactures
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
-				// Does we have at least one line with discount $this->atleastonediscount
-				foreach ($object->lines as $line) {
-					if ($line->remise_percent) {
-						$this->atleastonediscount = true;
-						break;
+				// Set $this->atleastonediscount if you have at least one discount
+				for ($i = 0; $i < $nblines; $i++)
+				{
+					if ($object->lines[$i]->remise_percent)
+					{
+						$this->atleastonediscount++;
 					}
 				}
 
@@ -421,7 +427,7 @@ class pdf_sponge extends ModelePDFFactures
 
 				// Incoterm
 				$height_incoterms = 0;
-				if ($conf->incoterm->enabled)
+				if (!empty($conf->incoterm->enabled))
 				{
 					$desc_incoterms = $object->getIncotermsForPDF();
 					if ($desc_incoterms)
@@ -442,7 +448,7 @@ class pdf_sponge extends ModelePDFFactures
 					}
 				}
 
-				// Display notes
+				// Displays notes
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
 				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
 				{
@@ -458,8 +464,7 @@ class pdf_sponge extends ModelePDFFactures
 
 				// Extrafields in note
 				$extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
-				if (!empty($extranote))
-				{
+				if (!empty($extranote)) {
 					$notetoshow = dol_concatdesc($notetoshow, $extranote);
 				}
 
@@ -608,6 +613,7 @@ class pdf_sponge extends ModelePDFFactures
 
 					$showpricebeforepagebreak = 1;
 					$posYAfterImage = 0;
+					$posYAfterDescription = 0;
 
 					if ($this->getColumnStatus('photo'))
 					{
@@ -645,6 +651,7 @@ class pdf_sponge extends ModelePDFFactures
 						if ($pageposafter > $pageposbefore)	// There is a pagebreak
 						{
 							$pdf->rollbackTransaction(true);
+							$pageposafter = $pageposbefore;
 							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
 							$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
@@ -671,9 +678,11 @@ class pdf_sponge extends ModelePDFFactures
 						{
 							$pdf->commitTransaction();
 						}
+						$posYAfterDescription = $pdf->GetY();
 					}
 
-					$nexY = $pdf->GetY();
+					$nexY = max($pdf->GetY(), $posYAfterImage, $posYAfterDescription);
+
 					$pageposafter = $pdf->getPage();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
@@ -684,7 +693,7 @@ class pdf_sponge extends ModelePDFFactures
 						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
 					}
 
-					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+					$pdf->SetFont('', '', $default_font_size - 1); // We reposition the default font
 
 					// VAT Rate
 					if ($this->getColumnStatus('vat'))
@@ -735,7 +744,7 @@ class pdf_sponge extends ModelePDFFactures
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
-					// Total HT line
+					// Total excl tax line (HT)
 					if ($this->getColumnStatus('totalexcltax'))
 					{
 						$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
@@ -743,6 +752,14 @@ class pdf_sponge extends ModelePDFFactures
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
+					// Total with tax line (TTC)
+					if ($this->getColumnStatus('totalincltax'))
+					{
+						$total_incl_tax = pdf_getlinetotalwithtax($object, $i, $outputlangs, $hidedetails);
+						$this->printStdColumnContent($pdf, $curY, 'totalincltax', $total_incl_tax);
+						$nexY = max($pdf->GetY(), $nexY);
+					}
+
 					// Extrafields
 					if (!empty($object->lines[$i]->array_options)) {
 						foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
@@ -774,10 +791,10 @@ class pdf_sponge extends ModelePDFFactures
 					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
 					if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) // Compute progress from previous situation
 					{
-						if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
+						if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
 						else $tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
 					} else {
-						if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva;
+						if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva;
 						else $tvaligne = $sign * $object->lines[$i]->total_tva;
 					}
 
@@ -918,7 +935,7 @@ class pdf_sponge extends ModelePDFFactures
 	 *  Show payments table
 	 *
 	 *  @param	TCPDF		$pdf            Object PDF
-	 *  @param  Object		$object         Object invoice
+	 *  @param  Facture		$object         Object invoice
 	 *  @param  int			$posy           Position y in PDF
 	 *  @param  Translate	$outputlangs    Object langs for output
 	 *  @return int             			<0 if KO, >0 if OK
@@ -994,7 +1011,7 @@ class pdf_sponge extends ModelePDFFactures
 				$pdf->SetXY($tab3_posx, $tab3_top + $y);
 				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($obj->datef), 'day', false, $outputlangs, true), 0, 'L', 0);
 				$pdf->SetXY($tab3_posx + 21, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, price(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $obj->multicurrency_amount_ttc : $obj->amount_ttc, 0, $outputlangs), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, price((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $obj->multicurrency_amount_ttc : $obj->amount_ttc, 0, $outputlangs), 0, 'L', 0);
 				$pdf->SetXY($tab3_posx + 40, $tab3_top + $y);
 				$pdf->MultiCell(20, 3, $text, 0, 'L', 0);
 				$pdf->SetXY($tab3_posx + 58, $tab3_top + $y);
@@ -1031,7 +1048,7 @@ class pdf_sponge extends ModelePDFFactures
 				$pdf->SetXY($tab3_posx, $tab3_top + $y);
 				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date), 'day', false, $outputlangs, true), 0, 'L', 0);
 				$pdf->SetXY($tab3_posx + 21, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, price($sign * (($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount), 0, $outputlangs), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, price($sign * ((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount), 0, $outputlangs), 0, 'L', 0);
 				$pdf->SetXY($tab3_posx + 40, $tab3_top + $y);
 				$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort".$row->code);
 
@@ -1056,7 +1073,7 @@ class pdf_sponge extends ModelePDFFactures
 	 *   Show miscellaneous information (payment mode, payment term, ...)
 	 *
 	 *   @param		TCPDF		$pdf     		Object PDF
-	 *   @param		Object		$object			Object to show
+	 *   @param		Facture		$object			Object to show
 	 *   @param		int			$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @return	int							Pos y
@@ -1225,7 +1242,7 @@ class pdf_sponge extends ModelePDFFactures
 	/**
 	 *  Show total to pay
 	 *
-	 *  @param	TCPDI		$pdf            Object PDF
+	 *  @param	TCPDF		$pdf            Object PDF
 	 *	@param  Facture		$object         Object invoice
 	 *	@param  int			$deja_regle     Amount already paid (in the currency of invoice)
 	 *	@param	int			$posy			Position depart
@@ -1388,7 +1405,7 @@ class pdf_sponge extends ModelePDFFactures
 		$tab2_top += 3;
 
 		// Get Total HT
-		$total_ht = ($conf->multicurrency->enabled && $object->mylticurrency_tx != 1 ? $object->multicurrency_total_ht : $object->total_ht);
+		$total_ht = (!empty($conf->multicurrency->enabled) && $object->mylticurrency_tx != 1 ? $object->multicurrency_total_ht : $object->total_ht);
 
 		// Total remise
 		$total_line_remise = 0;
@@ -1424,14 +1441,14 @@ class pdf_sponge extends ModelePDFFactures
 		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', 1);
 
-		$total_ht = (($conf->multicurrency->enabled && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
+		$total_ht = ((!empty($conf->multicurrency->enabled) && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, $outputlangs), 0, 'R', 1);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248, 248, 248);
 
-		$total_ttc = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
+		$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
 		$this->atleastoneratenotnull = 0;
 		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
@@ -1650,8 +1667,6 @@ class pdf_sponge extends ModelePDFFactures
 				$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $total_ttc, 0, $outputlangs), $useborder, 'R', 1);
 
 
-
-
 				// Retained warranty
 				if ($object->displayRetainedWarranty())
 				{
@@ -1685,8 +1700,8 @@ class pdf_sponge extends ModelePDFFactures
 
 		$pdf->SetTextColor(0, 0, 0);
 
-		$creditnoteamount = $object->getSumCreditNotesUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0); // Warning, this also include excess received
-		$depositsamount = $object->getSumDepositsUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
+		$creditnoteamount = $object->getSumCreditNotesUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0); // Warning, this also include excess received
+		$depositsamount = $object->getSumDepositsUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
 
 		$resteapayer = price2num($total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
 		if (!empty($object->paye)) $resteapayer = 0;
@@ -1712,7 +1727,7 @@ class pdf_sponge extends ModelePDFFactures
 				$pdf->MultiCell($largcol2, $tab2_hl, price($creditnoteamount, 0, $outputlangs), 0, 'R', 0);
 			}
 
-			// Escompte
+			/*
 			if ($object->close_code == Facture::CLOSECODE_DISCOUNTVAT)
 			{
 				$index++;
@@ -1725,6 +1740,7 @@ class pdf_sponge extends ModelePDFFactures
 
 				$resteapayer = 0;
 			}
+			*/
 
 			$index++;
 			$pdf->SetTextColor(0, 0, 60);
@@ -1821,7 +1837,7 @@ class pdf_sponge extends ModelePDFFactures
 	 *  Show top header of page.
 	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
-	 *  @param  Object		$object     	Object to show
+	 *  @param  Facture		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @param  Translate	$outputlangsbis	Object lang for output bis
@@ -1839,7 +1855,7 @@ class pdf_sponge extends ModelePDFFactures
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		// Show Draft Watermark
-		if ($object->statut == Facture::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK)))
+		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK)))
 		{
 			  pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FACTURE_DRAFT_WATERMARK);
 		}
@@ -1867,8 +1883,7 @@ class pdf_sponge extends ModelePDFFactures
 				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
 				}
-				if (is_readable($logo))
-				{
+				if (is_readable($logo)) {
 					$height = pdf_getHeightForLogo($logo);
 					$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 				} else {
@@ -1891,11 +1906,11 @@ class pdf_sponge extends ModelePDFFactures
 		if ($object->type == 2) $title = $outputlangs->transnoentities("InvoiceAvoir");
 		if ($object->type == 3) $title = $outputlangs->transnoentities("InvoiceDeposit");
 		if ($object->type == 4) $title = $outputlangs->transnoentities("InvoiceProForma");
-		if ($this->situationinvoice) $title = $outputlangs->transnoentities("InvoiceSituation");
+		if ($this->situationinvoice) $title = $outputlangs->transnoentities("PDFInvoiceSituation");
 		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
 			$title .= ' - ';
 			if ($object->type == 0) {
-				if ($this->situationinvoice) $title .= $outputlangsbis->transnoentities("InvoiceSituation");
+				if ($this->situationinvoice) $title .= $outputlangsbis->transnoentities("PDFInvoiceSituation");
 				$title .= $outputlangsbis->transnoentities("PdfInvoiceTitle");
 			} elseif ($object->type == 1) $title .= $outputlangsbis->transnoentities("InvoiceReplacement");
 			elseif ($object->type == 2) $title .= $outputlangsbis->transnoentities("InvoiceAvoir");
@@ -1910,7 +1925,7 @@ class pdf_sponge extends ModelePDFFactures
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
 		$textref = $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref);
-		if ($object->statut == Facture::STATUS_DRAFT)
+		if ($object->statut == $object::STATUS_DRAFT)
 		{
 			$pdf->SetTextColor(128, 0, 0);
 			$textref .= ' - '.$outputlangs->transnoentities("NotValidated");
@@ -1992,7 +2007,7 @@ class pdf_sponge extends ModelePDFFactures
 		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
 			$title .= ' - '.$outputlangsbis->transnoentities("DateInvoice");
 		}
-		$pdf->MultiCell($w, 3, $title." : ".dol_print_date($object->date, "day", false, $outputlangs), '', 'R');
+		$pdf->MultiCell($w, 3, $title." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
 
 		if (!empty($conf->global->INVOICE_POINTOFTAX_DATE))
 		{
@@ -2084,7 +2099,7 @@ class pdf_sponge extends ModelePDFFactures
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->MultiCell($widthrecbox - 2, 4, $carac_emetteur, 0, 'L');
 
-			// If BILLING contact defined on invoice, we use it
+			// If BILLING contact defined, we use it
 			$usecontact = false;
 			$arrayidcontact = $object->getIdContact('external', 'BILLING');
 			if (count($arrayidcontact) > 0)
@@ -2093,9 +2108,8 @@ class pdf_sponge extends ModelePDFFactures
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -2142,7 +2156,7 @@ class pdf_sponge extends ModelePDFFactures
 	 *   	Show footer of page. Need this->emetteur object
 	 *
 	 *   	@param	TCPDF		$pdf     			PDF
-	 * 		@param	Object		$object				Object to show
+	 * 		@param	Facture		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	int								Return height of bottom margin including footer text
@@ -2150,14 +2164,14 @@ class pdf_sponge extends ModelePDFFactures
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'INVOICE_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 
 	/**
 	 *  Define Array Column Field
 	 *
-	 *  @param	object		   $object    		common object
+	 *  @param	Facture		   $object    		common object
 	 *  @param	Translate	   $outputlangs     langs
 	 *  @param	int			   $hidedetails		Do not show line details
 	 *  @param	int			   $hidedesc		Do not show desc
@@ -2216,7 +2230,7 @@ class pdf_sponge extends ModelePDFFactures
 			),
 		);
 
-		// PHOTO
+		// Image of product
 		$rank = $rank + 10;
 		$this->cols['photo'] = array(
 			'rank' => $rank,
@@ -2265,6 +2279,17 @@ class pdf_sponge extends ModelePDFFactures
 			'border-left' => true, // add left line separator
 		);
 
+		// Adapt dynamically the width of subprice, if text is too long.
+		$tmpwidth = 0;
+		$nblines = count($object->lines);
+		for ($i = 0; $i < $nblines; $i++) {
+			$tmpwidth2 = dol_strlen(dol_string_nohtmltag(pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails)));
+			$tmpwidth = max($tmpwidth, $tmpwidth2);
+		}
+		if ($tmpwidth > 10) {
+			$this->cols['subprice']['width'] += (2 * ($tmpwidth - 10));
+		}
+
 		$rank = $rank + 10;
 		$this->cols['qty'] = array(
 			'rank' => $rank,
@@ -2302,7 +2327,7 @@ class pdf_sponge extends ModelePDFFactures
 			),
 			'border-left' => true, // add left line separator
 		);
-		if ($conf->global->PRODUCT_USE_UNITS) {
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			$this->cols['unit']['status'] = true;
 		}
 
@@ -2324,13 +2349,24 @@ class pdf_sponge extends ModelePDFFactures
 		$this->cols['totalexcltax'] = array(
 			'rank' => $rank,
 			'width' => 26, // in mm
-			'status' => true,
+			'status' => empty($conf->global->PDF_PROPAL_HIDE_PRICE_EXCL_TAX) ? true : false,
 			'title' => array(
 				'textkey' => 'TotalHT'
 			),
 			'border-left' => true, // add left line separator
 		);
 
+		$rank = $rank + 1010; // add a big offset to be sure is the last col because default extrafield rank is 100
+		$this->cols['totalincltax'] = array(
+			'rank' => $rank,
+			'width' => 26, // in mm
+			'status' => empty($conf->global->PDF_PROPAL_SHOW_PRICE_INCL_TAX) ? false : true,
+			'title' => array(
+				'textkey' => 'TotalTTC'
+			),
+			'border-left' => true, // add left line separator
+		);
+
 		// Add extrafields cols
 		if (!empty($object->lines)) {
 			$line = reset($object->lines);
diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php
index 8dc23e045b3..b8c7b941a15 100644
--- a/htdocs/core/modules/facture/mod_facture_mars.php
+++ b/htdocs/core/modules/facture/mod_facture_mars.php
@@ -31,9 +31,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 class mod_facture_mars extends ModeleNumRefFactures
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	public $prefixinvoice = 'FA';
@@ -146,7 +146,7 @@ class mod_facture_mars extends ModeleNumRefFactures
 	 *
 	 * @param	Societe		$objsoc		Object third party
 	 * @param   Facture		$invoice	Object invoice
-     * @param   string		$mode       'next' for next value or 'last' for last value
+	 * @param   string		$mode       'next' for next value or 'last' for last value
 	 * @return  string       			Value
 	 */
 	public function getNextValue($objsoc, $invoice, $mode = 'next')
@@ -178,48 +178,48 @@ class mod_facture_mars extends ModeleNumRefFactures
 
 		if ($mode == 'last')
 		{
-    		if ($max >= (pow(10, 4) - 1)) $num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
-    		else $num = sprintf("%04s", $max);
+			if ($max >= (pow(10, 4) - 1)) $num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
+			else $num = sprintf("%04s", $max);
 
-            $ref = '';
-            $sql = "SELECT ref as ref";
-            $sql .= " FROM ".MAIN_DB_PREFIX."facture";
-            $sql .= " WHERE ref LIKE '".$db->escape($prefix)."____-".$num."'";
-            $sql .= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
-            $sql .= " ORDER BY ref DESC";
+			$ref = '';
+			$sql = "SELECT ref as ref";
+			$sql .= " FROM ".MAIN_DB_PREFIX."facture";
+			$sql .= " WHERE ref LIKE '".$db->escape($prefix)."____-".$num."'";
+			$sql .= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
+			$sql .= " ORDER BY ref DESC";
 
-            dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
-            $resql = $db->query($sql);
-            if ($resql)
-            {
-                $obj = $db->fetch_object($resql);
-                if ($obj) $ref = $obj->ref;
-            } else dol_print_error($db);
+			dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$obj = $db->fetch_object($resql);
+				if ($obj) $ref = $obj->ref;
+			} else dol_print_error($db);
 
-            return $ref;
+			return $ref;
 		} elseif ($mode == 'next')
 		{
 			$date = $invoice->date; // This is invoice date (not creation date)
-    		$yymm = strftime("%y%m", $date);
+			$yymm = strftime("%y%m", $date);
 
-    		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-    		else $num = sprintf("%04s", $max + 1);
+			if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+			else $num = sprintf("%04s", $max + 1);
 
-    		dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
-    		return $prefix.$yymm."-".$num;
+			dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
+			return $prefix.$yymm."-".$num;
 		} else dol_print_error('', 'Bad parameter for getNextValue');
 	}
 
-    /**
-     *  Return next free value
-     *
-     *  @param  Societe     $objsoc         Object third party
-     *  @param  string      $objforref      Object for number to search
-     *  @param  string      $mode           'next' for next value or 'last' for last value
-     *  @return string                      Next free value
-     */
-    public function getNumRef($objsoc, $objforref, $mode = 'next')
-    {
-        return $this->getNextValue($objsoc, $objforref, $mode);
-    }
+	/**
+	 *  Return next free value
+	 *
+	 *  @param  Societe     $objsoc         Object third party
+	 *  @param  string      $objforref      Object for number to search
+	 *  @param  string      $mode           'next' for next value or 'last' for last value
+	 *  @return string                      Next free value
+	 */
+	public function getNumRef($objsoc, $objforref, $mode = 'next')
+	{
+		return $this->getNextValue($objsoc, $objforref, $mode);
+	}
 }
diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php
index 50b708baefc..5273803ea58 100644
--- a/htdocs/core/modules/facture/mod_facture_mercure.php
+++ b/htdocs/core/modules/facture/mod_facture_mercure.php
@@ -33,156 +33,156 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
  */
 class mod_facture_mercure extends ModeleNumRefFactures
 {
-    /**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-    /**
+	/**
 	 * @var string Error message
 	 */
 	public $error = '';
 
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     *  @return     string      Texte descripif
-     */
-    public function info()
-    {
-        global $db, $conf, $langs;
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $db, $conf, $langs;
 
-        $langs->load("bills");
+		$langs->load("bills");
 
-        $form = new Form($db);
+		$form = new Form($db);
 
-        $texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-        $texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-        $texte .= '<input type="hidden" name="token" value="'.newToken().'">';
-        $texte .= '<input type="hidden" name="action" value="updateMask">';
-        $texte .= '<input type="hidden" name="maskconstinvoice" value="FACTURE_MERCURE_MASK_INVOICE">';
-        $texte .= '<input type="hidden" name="maskconstreplacement" value="FACTURE_MERCURE_MASK_REPLACEMENT">';
-        $texte .= '<input type="hidden" name="maskconstcredit" value="FACTURE_MERCURE_MASK_CREDIT">';
+		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
+		$texte .= '<input type="hidden" name="action" value="updateMask">';
+		$texte .= '<input type="hidden" name="maskconstinvoice" value="FACTURE_MERCURE_MASK_INVOICE">';
+		$texte .= '<input type="hidden" name="maskconstreplacement" value="FACTURE_MERCURE_MASK_REPLACEMENT">';
+		$texte .= '<input type="hidden" name="maskconstcredit" value="FACTURE_MERCURE_MASK_CREDIT">';
 		$texte .= '<input type="hidden" name="maskconstdeposit" value="FACTURE_MERCURE_MASK_DEPOSIT">';
-        $texte .= '<table class="nobordernopadding" width="100%">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
 
-        $tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Invoice"), $langs->transnoentities("Invoice"));
-        $tooltip .= $langs->trans("GenericMaskCodes2");
-        $tooltip .= $langs->trans("GenericMaskCodes3");
-        $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Invoice"), $langs->transnoentities("Invoice"));
-        $tooltip .= $langs->trans("GenericMaskCodes5");
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Invoice"), $langs->transnoentities("Invoice"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Invoice"), $langs->transnoentities("Invoice"));
+		$tooltip .= $langs->trans("GenericMaskCodes5");
 
-        // Setting the prefix
-        $texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceStandard").'):</td>';
-        $texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskinvoice" value="'.$conf->global->FACTURE_MERCURE_MASK_INVOICE.'">', $tooltip, 1, 1).'</td>';
+		// Setting the prefix
+		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceStandard").'):</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskinvoice" value="'.$conf->global->FACTURE_MERCURE_MASK_INVOICE.'">', $tooltip, 1, 1).'</td>';
 
-        $texte .= '<td class="left" rowspan="3">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td class="left" rowspan="3">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-        $texte .= '</tr>';
+		$texte .= '</tr>';
 
-        // Prefix setting of replacement invoices
-        $texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'):</td>';
-        $texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskreplacement" value="'.$conf->global->FACTURE_MERCURE_MASK_REPLACEMENT.'">', $tooltip, 1, 1).'</td>';
-        $texte .= '</tr>';
+		// Prefix setting of replacement invoices
+		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'):</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskreplacement" value="'.$conf->global->FACTURE_MERCURE_MASK_REPLACEMENT.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '</tr>';
 
-        // Prefix setting of credit note
-        $texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceAvoir").'):</td>';
-        $texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskcredit" value="'.$conf->global->FACTURE_MERCURE_MASK_CREDIT.'">', $tooltip, 1, 1).'</td>';
-        $texte .= '</tr>';
+		// Prefix setting of credit note
+		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceAvoir").'):</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskcredit" value="'.$conf->global->FACTURE_MERCURE_MASK_CREDIT.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '</tr>';
 
-        // Prefix setting of deposit
-        $texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'):</td>';
-        $texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskdeposit" value="'.$conf->global->FACTURE_MERCURE_MASK_DEPOSIT.'">', $tooltip, 1, 1).'</td>';
-        $texte .= '</tr>';
+		// Prefix setting of deposit
+		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'):</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskdeposit" value="'.$conf->global->FACTURE_MERCURE_MASK_DEPOSIT.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '</tr>';
 
-        $texte .= '</table>';
-        $texte .= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
-        return $texte;
-    }
+		return $texte;
+	}
 
-    /**
-     *  Return an example of number value
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-        global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of number value
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+		global $conf, $langs, $mysoc;
 
-        $old_code_client = $mysoc->code_client;
-        $old_code_type = $mysoc->typent_code;
-        $mysoc->code_client = 'CCCCCCCCCC';
-        $mysoc->typent_code = 'TTTTTTTTTT';
-        $numExample = $this->getNextValue($mysoc, '');
-        $mysoc->code_client = $old_code_client;
-        $mysoc->typent_code = $old_code_type;
+		$old_code_client = $mysoc->code_client;
+		$old_code_type = $mysoc->typent_code;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$mysoc->typent_code = 'TTTTTTTTTT';
+		$numExample = $this->getNextValue($mysoc, '');
+		$mysoc->code_client = $old_code_client;
+		$mysoc->typent_code = $old_code_type;
 
-        if (!$numExample)
-        {
-            $numExample = 'NotConfigured';
-        }
-        return $numExample;
-    }
+		if (!$numExample)
+		{
+			$numExample = 'NotConfigured';
+		}
+		return $numExample;
+	}
 
-    /**
-     * Return next value
-     *
-     * @param	Societe		$objsoc     Object third party
-     * @param   Facture		$invoice	Object invoice
-     * @param   string		$mode       'next' for next value or 'last' for last value
-     * @return  string      			Value if OK, 0 if KO
-     */
-    public function getNextValue($objsoc, $invoice, $mode = 'next')
-    {
-    	global $db, $conf;
+	/**
+	 * Return next value
+	 *
+	 * @param	Societe		$objsoc     Object third party
+	 * @param   Facture		$invoice	Object invoice
+	 * @param   string		$mode       'next' for next value or 'last' for last value
+	 * @return  string      			Value if OK, 0 if KO
+	 */
+	public function getNextValue($objsoc, $invoice, $mode = 'next')
+	{
+		global $db, $conf;
 
-    	require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-        // Get Mask value
-        $mask = '';
-        if (is_object($invoice) && $invoice->type == 1)
-        {
-        	$mask = $conf->global->FACTURE_MERCURE_MASK_REPLACEMENT;
-        	if (!$mask)
-        	{
-        		$mask = $conf->global->FACTURE_MERCURE_MASK_INVOICE;
-        	}
-        } elseif (is_object($invoice) && $invoice->type == 2) $mask = $conf->global->FACTURE_MERCURE_MASK_CREDIT;
-        elseif (is_object($invoice) && $invoice->type == 3) $mask = $conf->global->FACTURE_MERCURE_MASK_DEPOSIT;
-        else $mask = $conf->global->FACTURE_MERCURE_MASK_INVOICE;
-        if (!$mask)
-        {
-            $this->error = 'NotConfigured';
-            return 0;
-        }
+		// Get Mask value
+		$mask = '';
+		if (is_object($invoice) && $invoice->type == 1)
+		{
+			$mask = $conf->global->FACTURE_MERCURE_MASK_REPLACEMENT;
+			if (!$mask)
+			{
+				$mask = $conf->global->FACTURE_MERCURE_MASK_INVOICE;
+			}
+		} elseif (is_object($invoice) && $invoice->type == 2) $mask = $conf->global->FACTURE_MERCURE_MASK_CREDIT;
+		elseif (is_object($invoice) && $invoice->type == 3) $mask = $conf->global->FACTURE_MERCURE_MASK_DEPOSIT;
+		else $mask = $conf->global->FACTURE_MERCURE_MASK_INVOICE;
+		if (!$mask)
+		{
+			$this->error = 'NotConfigured';
+			return 0;
+		}
 
-    	$where = '';
-    	//if ($facture->type == 2) $where.= " AND type = 2";
-    	//else $where.=" AND type != 2";
+		$where = '';
+		//if ($facture->type == 2) $where.= " AND type = 2";
+		//else $where.=" AND type != 2";
 
-    	// Get entities
-    	$entity = getEntity('invoicenumber', 1, $invoice);
+		// Get entities
+		$entity = getEntity('invoicenumber', 1, $invoice);
 
-    	$numFinal = get_next_value($db, $mask, 'facture', 'ref', $where, $objsoc, $invoice->date, $mode, false, null, $entity);
-    	if (!preg_match('/([0-9])+/', $numFinal)) $this->error = $numFinal;
+		$numFinal = get_next_value($db, $mask, 'facture', 'ref', $where, $objsoc, $invoice->date, $mode, false, null, $entity);
+		if (!preg_match('/([0-9])+/', $numFinal)) $this->error = $numFinal;
 
-    	return  $numFinal;
-    }
+		return  $numFinal;
+	}
 
 
-    /**
-     * Return next free value
-     *
-     * @param	Societe		$objsoc     	Object third party
-     * @param	string		$objforref		Object for number to search
-     * @param   string		$mode       	'next' for next value or 'last' for last value
-     * @return  string      				Next free value
-     */
-    public function getNumRef($objsoc, $objforref, $mode = 'next')
-    {
-        return $this->getNextValue($objsoc, $objforref, $mode);
-    }
+	/**
+	 * Return next free value
+	 *
+	 * @param	Societe		$objsoc     	Object third party
+	 * @param	string		$objforref		Object for number to search
+	 * @param   string		$mode       	'next' for next value or 'last' for last value
+	 * @return  string      				Next free value
+	 */
+	public function getNumRef($objsoc, $objforref, $mode = 'next')
+	{
+		return $this->getNextValue($objsoc, $objforref, $mode);
+	}
 }
diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php
index 588b2f34aab..ae1afbf2ce4 100644
--- a/htdocs/core/modules/facture/mod_facture_terre.php
+++ b/htdocs/core/modules/facture/mod_facture_terre.php
@@ -30,34 +30,34 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
  */
 class mod_facture_terre extends ModeleNumRefFactures
 {
-    /**
-     * Dolibarr version of the loaded document 'development', 'experimental', 'dolibarr'
-     * @var string
-     */
-    public $version = 'dolibarr';
+	/**
+	 * Dolibarr version of the loaded document 'development', 'experimental', 'dolibarr'
+	 * @var string
+	 */
+	public $version = 'dolibarr';
 
-    /**
-     * Prefix for invoices
-     * @var string
-     */
-    public $prefixinvoice = 'FA';
+	/**
+	 * Prefix for invoices
+	 * @var string
+	 */
+	public $prefixinvoice = 'FA';
 
-    /**
-     * Prefix for credit note
-     * @var string
-     */
-    public $prefixcreditnote = 'AV';
+	/**
+	 * Prefix for credit note
+	 * @var string
+	 */
+	public $prefixcreditnote = 'AV';
 
-    /**
-     * Prefix for deposit
-     * @var string
-     */
-    public $prefixdeposit = 'AC';
+	/**
+	 * Prefix for deposit
+	 * @var string
+	 */
+	public $prefixdeposit = 'AC';
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 
 	/**
@@ -177,7 +177,7 @@ class mod_facture_terre extends ModeleNumRefFactures
 	 *
 	 * @param   Societe		$objsoc		Object third party
 	 * @param   Facture		$invoice	Object invoice
-     * @param   string		$mode       'next' for next value or 'last' for last value
+	 * @param   string		$mode       'next' for next value or 'last' for last value
 	 * @return  string       			Value
 	 */
 	public function getNextValue($objsoc, $invoice, $mode = 'next')
@@ -209,47 +209,47 @@ class mod_facture_terre extends ModeleNumRefFactures
 
 		if ($mode == 'last')
 		{
-    		if ($max >= (pow(10, 4) - 1)) $num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
-    		else $num = sprintf("%04s", $max);
+			if ($max >= (pow(10, 4) - 1)) $num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
+			else $num = sprintf("%04s", $max);
 
-            $ref = '';
-            $sql = "SELECT ref as ref";
-            $sql .= " FROM ".MAIN_DB_PREFIX."facture";
-            $sql .= " WHERE ref LIKE '".$db->escape($prefix)."____-".$num."'";
-            $sql .= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
-            $sql .= " ORDER BY ref DESC";
+			$ref = '';
+			$sql = "SELECT ref as ref";
+			$sql .= " FROM ".MAIN_DB_PREFIX."facture";
+			$sql .= " WHERE ref LIKE '".$db->escape($prefix)."____-".$num."'";
+			$sql .= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
+			$sql .= " ORDER BY ref DESC";
 
-            $resql = $db->query($sql);
-            if ($resql)
-            {
-                $obj = $db->fetch_object($resql);
-                if ($obj) $ref = $obj->ref;
-            } else dol_print_error($db);
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$obj = $db->fetch_object($resql);
+				if ($obj) $ref = $obj->ref;
+			} else dol_print_error($db);
 
-            return $ref;
+			return $ref;
 		} elseif ($mode == 'next')
 		{
 			$date = $invoice->date; // This is invoice date (not creation date)
-    		$yymm = strftime("%y%m", $date);
+			$yymm = strftime("%y%m", $date);
 
-    		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-    		else $num = sprintf("%04s", $max + 1);
+			if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+			else $num = sprintf("%04s", $max + 1);
 
-    		dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
-    		return $prefix.$yymm."-".$num;
+			dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
+			return $prefix.$yymm."-".$num;
 		} else dol_print_error('', 'Bad parameter for getNextValue');
 	}
 
-    /**
-     *  Return next free value
-     *
-     *  @param  Societe     $objsoc         Object third party
-     *  @param  string      $objforref      Object for number to search
-     *  @param   string     $mode           'next' for next value or 'last' for last value
-     *  @return  string                     Next free value
-     */
-    public function getNumRef($objsoc, $objforref, $mode = 'next')
-    {
-        return $this->getNextValue($objsoc, $objforref, $mode);
-    }
+	/**
+	 *  Return next free value
+	 *
+	 *  @param  Societe     $objsoc         Object third party
+	 *  @param  string      $objforref      Object for number to search
+	 *  @param   string     $mode           'next' for next value or 'last' for last value
+	 *  @return  string                     Next free value
+	 */
+	public function getNumRef($objsoc, $objforref, $mode = 'next')
+	{
+		return $this->getNextValue($objsoc, $objforref, $mode);
+	}
 }
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index 47abbc3640a..622cd0b2250 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -40,70 +40,70 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 class pdf_soleil extends ModelePDFFicheinter
 {
 	 /**
-     * @var DoliDb Database handler
-     */
-    public $db;
+	  * @var DoliDb Database handler
+	  */
+	public $db;
 
 	/**
-     * @var string model name
-     */
-    public $name;
+	 * @var string model name
+	 */
+	public $name;
 
 	/**
-     * @var string model description (short text)
-     */
-    public $description;
+	 * @var string model description (short text)
+	 */
+	public $description;
 
 	/**
-     * @var string document type
-     */
-    public $type;
+	 * @var string document type
+	 */
+	public $type;
 
-    /**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	/**
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	/**
-     * @var int page_largeur
-     */
-    public $page_largeur;
+	 * @var int page_largeur
+	 */
+	public $page_largeur;
 
 	/**
-     * @var int page_hauteur
-     */
-    public $page_hauteur;
+	 * @var int page_hauteur
+	 */
+	public $page_hauteur;
 
 	/**
-     * @var array format
-     */
-    public $format;
+	 * @var array format
+	 */
+	public $format;
 
 	/**
-     * @var int marge_gauche
-     */
+	 * @var int marge_gauche
+	 */
 	public $marge_gauche;
 
 	/**
-     * @var int marge_droite
-     */
+	 * @var int marge_droite
+	 */
 	public $marge_droite;
 
 	/**
-     * @var int marge_haute
-     */
+	 * @var int marge_haute
+	 */
 	public $marge_haute;
 
 	/**
-     * @var int marge_basse
-     */
+	 * @var int marge_basse
+	 */
 	public $marge_basse;
 
 	/**
@@ -152,11 +152,11 @@ class pdf_soleil extends ModelePDFFicheinter
 		$this->posxdesc = $this->marge_gauche + 1;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Function to build pdf onto disk
 	 *
-	 *  @param		Object			$object				Object to generate
+	 *  @param		Fichinter		$object				Object to generate
 	 *  @param		Translate		$outputlangs		Lang output object
 	 *  @param		string			$srctemplatepath	Full path of source filename for generator using a template file
 	 *  @param		int				$hidedetails		Do not show line details
@@ -166,7 +166,7 @@ class pdf_soleil extends ModelePDFFicheinter
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $db, $hookmanager;
 
 		if (!is_object($outputlangs)) $outputlangs = $langs;
@@ -180,7 +180,7 @@ class pdf_soleil extends ModelePDFFicheinter
 		{
 			$object->fetch_thirdparty();
 
-		    // Definition of $dir and $file
+			// Definition of $dir and $file
 			if ($object->specimen)
 			{
 				$dir = $conf->ficheinter->dir_output;
@@ -222,7 +222,7 @@ class pdf_soleil extends ModelePDFFicheinter
 				$heightforinfotot = 50; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
 				$pdf->SetAutoPageBreak(1, 0);
 
 				if (class_exists('TCPDF'))
@@ -304,8 +304,8 @@ class pdf_soleil extends ModelePDFFicheinter
 				$text = $object->description;
 				if ($object->duration > 0)
 				{
-				    $totaltime = convertSecondToTime($object->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
-				    $text .= ($text ? ' - ' : '').$langs->trans("Total").": ".$totaltime;
+					$totaltime = convertSecondToTime($object->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
+					$text .= ($text ? ' - ' : '').$langs->trans("Total").": ".$totaltime;
 				}
 				$desc = dol_htmlentitiesbr($text, 1);
 				//print $outputlangs->convToOutputCharset($desc); exit;
@@ -336,12 +336,12 @@ class pdf_soleil extends ModelePDFFicheinter
 						// Description of product line
 						$curX = $this->posxdesc - 1;
 
-                        // Description of product line
-                        if (empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) {
-                            $txt = $outputlangs->transnoentities("Date")." : ".dol_print_date($objectligne->datei, 'dayhour', false, $outputlangs, true);
-                        } else {
-                            $txt = $outputlangs->transnoentities("Date")." : ".dol_print_date($objectligne->datei, 'day', false, $outputlangs, true);
-                        }
+						// Description of product line
+						if (empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) {
+							$txt = $outputlangs->transnoentities("Date")." : ".dol_print_date($objectligne->datei, 'dayhour', false, $outputlangs, true);
+						} else {
+							$txt = $outputlangs->transnoentities("Date")." : ".dol_print_date($objectligne->datei, 'day', false, $outputlangs, true);
+						}
 
 						if ($objectligne->duration > 0)
 						{
@@ -448,8 +448,8 @@ class pdf_soleil extends ModelePDFFicheinter
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0)
 				{
-				    $this->error = $hookmanager->error;
-				    $this->errors = $hookmanager->errors;
+					$this->error = $hookmanager->error;
+					$this->errors = $hookmanager->errors;
 				}
 
 				if (!empty($conf->global->MAIN_UMASK))
@@ -487,7 +487,7 @@ class pdf_soleil extends ModelePDFFicheinter
 
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
-        /*
+		/*
 		$pdf->SetXY($this->marge_gauche, $tab_top);
 		$pdf->MultiCell(190,8,$outputlangs->transnoentities("Description"),0,'L',0);
 		$pdf->line($this->marge_gauche, $tab_top + 8, $this->page_largeur-$this->marge_droite, $tab_top + 8);
@@ -537,7 +537,7 @@ class pdf_soleil extends ModelePDFFicheinter
 	 *  Show top header of page.
 	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
-	 *  @param  Object		$object     	Object to show
+	 *  @param  Fichinter	$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
@@ -573,8 +573,8 @@ class pdf_soleil extends ModelePDFFicheinter
 		{
 			if (is_readable($logo))
 			{
-			    $height = pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
+				$height = pdf_getHeightForLogo($logo);
+				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
@@ -665,9 +665,8 @@ class pdf_soleil extends ModelePDFFicheinter
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -710,7 +709,7 @@ class pdf_soleil extends ModelePDFFicheinter
 	 *   	Show footer of page. Need this->emetteur object
 	 *
 	 *   	@param	TCPDF		$pdf     			PDF
-	 * 		@param	Object		$object				Object to show
+	 * 		@param	Fichinter	$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	integer
@@ -718,7 +717,7 @@ class pdf_soleil extends ModelePDFFicheinter
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'FICHINTER_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 }
diff --git a/htdocs/core/modules/fichinter/mod_arctic.php b/htdocs/core/modules/fichinter/mod_arctic.php
index f2f3a135785..58888a7cb8d 100644
--- a/htdocs/core/modules/fichinter/mod_arctic.php
+++ b/htdocs/core/modules/fichinter/mod_arctic.php
@@ -32,10 +32,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
  */
 class mod_arctic extends ModeleNumRefFicheinter
 {
-    /**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -57,13 +57,13 @@ class mod_arctic extends ModeleNumRefFicheinter
 
 
 	/**
-     *  Returns the description of the numbering model
-     *
-     *  @return     string      Texte descripif
-     */
-    public function info()
-    {
-    	global $db, $conf, $langs;
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $db, $conf, $langs;
 
 		$langs->load("bills");
 
@@ -94,20 +94,20 @@ class mod_arctic extends ModeleNumRefFicheinter
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     * Return an example of numbering
-     *
-     * @return     string      Example
-     */
-    public function getExample()
-    {
-     	global $conf, $langs, $mysoc;
+	/**
+	 * Return an example of numbering
+	 *
+	 * @return     string      Example
+	 */
+	public function getExample()
+	{
+	 	global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-     	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$mysoc->code_client = 'CCCCCCCCCC';
+	 	$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
 		if (!$numExample)
@@ -115,7 +115,7 @@ class mod_arctic extends ModeleNumRefFicheinter
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 * 	Return next free value
@@ -124,8 +124,8 @@ class mod_arctic extends ModeleNumRefFicheinter
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    public function getNextValue($objsoc = 0, $object = '')
-    {
+	public function getNextValue($objsoc = 0, $object = '')
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -142,18 +142,18 @@ class mod_arctic extends ModeleNumRefFicheinter
 		$numFinal = get_next_value($db, $mask, 'fichinter', 'ref', '', $objsoc, $object->datec);
 
 		return  $numFinal;
-    }
+	}
 
 
 	/**
 	 *  Return next free value
 	 *
-     *  @param	Societe		$objsoc     Object third party
+	 *  @param	Societe		$objsoc     Object third party
 	 *  @param	Object		$objforref	Object for number to search
-     *  @return string      			Next free value
-     */
-    public function getNumRef($objsoc, $objforref)
-    {
-        return $this->getNextValue($objsoc, $objforref);
-    }
+	 *  @return string      			Next free value
+	 */
+	public function getNumRef($objsoc, $objforref)
+	{
+		return $this->getNextValue($objsoc, $objforref);
+	}
 }
diff --git a/htdocs/core/modules/fichinter/mod_pacific.php b/htdocs/core/modules/fichinter/mod_pacific.php
index a653dc640cb..5af891f39a2 100644
--- a/htdocs/core/modules/fichinter/mod_pacific.php
+++ b/htdocs/core/modules/fichinter/mod_pacific.php
@@ -30,10 +30,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
  */
 class mod_pacific extends ModeleNumRefFicheinter
 {
-    /**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	public $prefix = 'FI';
@@ -59,13 +59,13 @@ class mod_pacific extends ModeleNumRefFicheinter
 	/**
 	 *  Return description of numbering module
 	 *
-     *  @return     string      Text with description
-     */
-    public function info()
-    {
-    	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
-    }
+	 *  @return     string      Text with description
+	 */
+	public function info()
+	{
+		global $langs;
+	  	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+	}
 
 	/**
 	 *  Return an example of numbering
@@ -143,8 +143,8 @@ class mod_pacific extends ModeleNumRefFicheinter
 		$date = $object->datec;
 		$yymm = strftime("%y%m", $date);
 
-    	if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-    	else $num = sprintf("%04s", $max + 1);
+		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		else $num = sprintf("%04s", $max + 1);
 
 		return $this->prefix.$yymm."-".$num;
 	}
diff --git a/htdocs/core/modules/holiday/mod_holiday_immaculate.php b/htdocs/core/modules/holiday/mod_holiday_immaculate.php
index 281af533f05..bedcfb0cc80 100644
--- a/htdocs/core/modules/holiday/mod_holiday_immaculate.php
+++ b/htdocs/core/modules/holiday/mod_holiday_immaculate.php
@@ -31,9 +31,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/holiday/modules_holiday.php';
 class mod_holiday_immaculate extends ModelNumRefHolidays
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	/**
@@ -63,9 +63,9 @@ class mod_holiday_immaculate extends ModelNumRefHolidays
 	 *
 	 *	@return     string      text description
 	 */
-    public function info()
-    {
-        global $db, $conf, $langs;
+	public function info()
+	{
+		global $db, $conf, $langs;
 
 		$langs->load("bills");
 
@@ -92,20 +92,20 @@ class mod_holiday_immaculate extends ModelNumRefHolidays
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
 	/**
 	 *	Return numbering example
 	 *
 	 *	@return     string      Example
 	 */
-    public function getExample()
-    {
-     	global $conf, $langs, $user;
+	public function getExample()
+	{
+	 	global $conf, $langs, $user;
 
-    	$old_login = $user->login;
-    	$user->login = 'UUUUUUU';
-     	$numExample = $this->getNextValue($user, '');
+		$old_login = $user->login;
+		$user->login = 'UUUUUUU';
+	 	$numExample = $this->getNextValue($user, '');
 		$user->login = $old_login;
 
 		if (!$numExample)
@@ -113,7 +113,7 @@ class mod_holiday_immaculate extends ModelNumRefHolidays
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 *	Return next value
@@ -122,8 +122,8 @@ class mod_holiday_immaculate extends ModelNumRefHolidays
 	 *	@param	Object		$holiday	holiday object
 	 *	@return string      			Value if OK, 0 if KO
 	 */
-    public function getNextValue($user, $holiday)
-    {
+	public function getNextValue($user, $holiday)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -141,7 +141,7 @@ class mod_holiday_immaculate extends ModelNumRefHolidays
 		return  $numFinal;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return next value
 	 *
@@ -149,9 +149,9 @@ class mod_holiday_immaculate extends ModelNumRefHolidays
 	 *  @param  Object		$objforref	Holiday object
 	 *  @return string      			Value if OK, 0 if KO
 	 */
-    public function holiday_get_num($fuser, $objforref)
-    {
-        // phpcs:enable
-        return $this->getNextValue($fuser, $objforref);
-    }
+	public function holiday_get_num($fuser, $objforref)
+	{
+		// phpcs:enable
+		return $this->getNextValue($fuser, $objforref);
+	}
 }
diff --git a/htdocs/core/modules/holiday/mod_holiday_madonna.php b/htdocs/core/modules/holiday/mod_holiday_madonna.php
index 348b25e8338..5028cad8afc 100644
--- a/htdocs/core/modules/holiday/mod_holiday_madonna.php
+++ b/htdocs/core/modules/holiday/mod_holiday_madonna.php
@@ -30,9 +30,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/holiday/modules_holiday.php';
 class mod_holiday_madonna extends ModelNumRefHolidays
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	public $prefix = 'HL';
@@ -65,11 +65,11 @@ class mod_holiday_madonna extends ModelNumRefHolidays
 	 *
 	 *	@return     string      text description
 	 */
-    public function info()
-    {
-    	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
-    }
+	public function info()
+	{
+		global $langs;
+	  	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+	}
 
 
 	/**
@@ -155,7 +155,7 @@ class mod_holiday_madonna extends ModelNumRefHolidays
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return next value
 	 *
@@ -165,7 +165,7 @@ class mod_holiday_madonna extends ModelNumRefHolidays
 	 */
 	public function holiday_get_num($fuser, $objforref)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return $this->getNextValue($fuser, $objforref);
 	}
 }
diff --git a/htdocs/core/modules/holiday/modules_holiday.php b/htdocs/core/modules/holiday/modules_holiday.php
index af84224dfa2..afd83c7429e 100644
--- a/htdocs/core/modules/holiday/modules_holiday.php
+++ b/htdocs/core/modules/holiday/modules_holiday.php
@@ -44,17 +44,17 @@ abstract class ModelePDFHoliday extends CommonDocGenerator
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	Return list of active generation modules
 	 *
-     *  @param  DoliDB  $db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
-     */
+	 *  @param  DoliDB  $db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
+	 */
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'holiday';
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 330454e2105..36dc3ca8f13 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -33,12 +33,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php';
  */
 class ImportCsv extends ModeleImports
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $datatoimport;
+	public $datatoimport;
 
 	/**
 	 * @var string Error code (or message)
@@ -50,22 +50,22 @@ class ImportCsv extends ModeleImports
 	 */
 	public $errors = array();
 
-    /**
+	/**
 	 * @var int ID
 	 */
 	public $id;
 
 	/**
-     * @var string label
-     */
-    public $label;
+	 * @var string label
+	 */
+	public $label;
 
 	public $extension; // Extension of files imported by driver
 
 	/**
-     * Dolibarr version of driver
-     * @var string
-     */
+	 * Dolibarr version of driver
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	public $label_lib; // Label of external lib used by driver
@@ -93,7 +93,7 @@ class ImportCsv extends ModeleImports
 	 *	@param	DoliDB		$db				Database handler
 	 *	@param	string		$datatoimport	String code describing import set (ex: 'societe_1')
 	 */
-    public function __construct($db, $datatoimport)
+	public function __construct($db, $datatoimport)
 	{
 		global $conf, $langs;
 		$this->db = $db;
@@ -118,20 +118,20 @@ class ImportCsv extends ModeleImports
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output header of an example file for this format
 	 *
 	 * 	@param	Translate	$outputlangs		Output language
 	 *  @return	string							Empty string
 	 */
-    public function write_header_example($outputlangs)
+	public function write_header_example($outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return '';
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output title line of an example file for this format
 	 *
@@ -139,14 +139,14 @@ class ImportCsv extends ModeleImports
 	 *  @param	array		$headerlinefields	Array of fields name
 	 * 	@return	string							String output
 	 */
-    public function write_title_example($outputlangs, $headerlinefields)
+	public function write_title_example($outputlangs, $headerlinefields)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$s = join($this->separator, array_map('cleansep', $headerlinefields));
 		return $s."\n";
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output record of an example file for this format
 	 *
@@ -154,37 +154,37 @@ class ImportCsv extends ModeleImports
 	 * 	@param	array		$contentlinevalues	Array of lines
 	 * 	@return	string							String output
 	 */
-    public function write_record_example($outputlangs, $contentlinevalues)
+	public function write_record_example($outputlangs, $contentlinevalues)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$s = join($this->separator, array_map('cleansep', $contentlinevalues));
 		return $s."\n";
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output footer of an example file for this format
 	 *
 	 * 	@param	Translate	$outputlangs		Output language
 	 *  @return	string							Empty string
 	 */
-    public function write_footer_example($outputlangs)
+	public function write_footer_example($outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return '';
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Open input file
 	 *
 	 *	@param	string	$file		Path of filename
 	 *	@return	int					<0 if KO, >=0 if OK
 	 */
-    public function import_open_file($file)
+	public function import_open_file($file)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$ret = 1;
 
@@ -206,42 +206,42 @@ class ImportCsv extends ModeleImports
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Return nb of records. File must be closed.
 	 *
 	 *	@param	string	$file		Path of filename
 	 * 	@return		int		<0 if KO, >=0 if OK
 	 */
-    public function import_get_nb_of_lines($file)
-    {
-        // phpcs:enable
-        return dol_count_nb_of_line($file);
-    }
+	public function import_get_nb_of_lines($file)
+	{
+		// phpcs:enable
+		return dol_count_nb_of_line($file);
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Input header line from file
 	 *
 	 * 	@return		int		<0 if KO, >=0 if OK
 	 */
-    public function import_read_header()
+	public function import_read_header()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return 0;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Return array of next record in input file.
 	 *
 	 * 	@return		Array		Array of field values. Data are UTF8 encoded. [fieldpos] => (['val']=>val, ['type']=>-1=null,0=blank,1=not empty string)
 	 */
-    public function import_read_record()
+	public function import_read_record()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$arrayres = fgetcsv($this->handle, 100000, $this->separator, $this->enclosure, $this->escape);
@@ -285,21 +285,21 @@ class ImportCsv extends ModeleImports
 		return $newarrayres;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Close file handle
 	 *
 	 *  @return	integer
 	 */
-    public function import_close_file()
+	public function import_close_file()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		fclose($this->handle);
 		return 0;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Insert a record into database
 	 *
@@ -311,11 +311,11 @@ class ImportCsv extends ModeleImports
 	 * @param	array	$updatekeys						Array of keys to use to try to do an update first before insert. This field are defined into the module descriptor.
 	 * @return	int										<0 if KO, >0 if OK
 	 */
-    public function import_insert($arrayrecord, $array_match_file_to_database, $objimport, $maxfields, $importid, $updatekeys)
+	public function import_insert($arrayrecord, $array_match_file_to_database, $objimport, $maxfields, $importid, $updatekeys)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf, $user;
-        global $thirdparty_static; // Specific to thirdparty import
+		global $thirdparty_static; // Specific to thirdparty import
 		global $tablewithentity_cache; // Cache to avoid to call  desc at each rows on tables
 
 		$error = 0;
@@ -369,18 +369,18 @@ class ImportCsv extends ModeleImports
 				}
 
 				// array of fields to column index
-                $arrayfield = array();
-                foreach ($sort_array_match_file_to_database as $key => $val) {
-                    $arrayfield[$val] = ($key - 1);
-                }
+				$arrayfield = array();
+				foreach ($sort_array_match_file_to_database as $key => $val) {
+					$arrayfield[$val] = ($key - 1);
+				}
 
 				// Loop on each fields in the match array: $key = 1..n, $val=alias of field (s.nom)
 				foreach ($sort_array_match_file_to_database as $key => $val)
 				{
-				    $fieldalias = preg_replace('/\..*$/i', '', $val);
-				    $fieldname = preg_replace('/^.*\./i', '', $val);
+					$fieldalias = preg_replace('/\..*$/i', '', $val);
+					$fieldname = preg_replace('/^.*\./i', '', $val);
 
-				    if ($alias != $fieldalias) continue; // Not a field of current table
+					if ($alias != $fieldalias) continue; // Not a field of current table
 
 					if ($key <= $maxfields)
 					{
@@ -400,43 +400,42 @@ class ImportCsv extends ModeleImports
 						}
 						// Test format only if field is not a missing mandatory field (field may be a value or empty but not mandatory)
 						else {
-						    // We convert field if required
-						    if (!empty($objimport->array_import_convertvalue[0][$val]))
-						    {
-                                //print 'Must convert '.$newval.' with rule '.join(',',$objimport->array_import_convertvalue[0][$val]).'. ';
-                                if ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeid'
-                                	|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromref'
-                                	|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel'
-                                	)
-                                {
-                                    // New val can be an id or ref. If it start with id: it is forced to id, if it start with ref: it is forced to ref. It not, we try to guess.
-                                    $isidorref = 'id';
-                                    if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
+							// We convert field if required
+							if (!empty($objimport->array_import_convertvalue[0][$val]))
+							{
+								//print 'Must convert '.$newval.' with rule '.join(',',$objimport->array_import_convertvalue[0][$val]).'. ';
+								if ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeid'
+									|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromref'
+									|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel'
+									)
+								{
+									// New val can be an id or ref. If it start with id: it is forced to id, if it start with ref: it is forced to ref. It not, we try to guess.
+									$isidorref = 'id';
+									if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
 
-                                    $newval = preg_replace('/^(id|ref):/i', '', $newval); // Remove id: or ref: that was used to force if field is id or ref
-                                    //print 'Val is now '.$newval.' and is type '.$isidorref."<br>\n";
+									$newval = preg_replace('/^(id|ref):/i', '', $newval); // Remove id: or ref: that was used to force if field is id or ref
+									//print 'Val is now '.$newval.' and is type '.$isidorref."<br>\n";
 
-                                    if ($isidorref == 'ref')    // If value into input import file is a ref, we apply the function defined into descriptor
-                                    {
-                                        $file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
-                                        $class = $objimport->array_import_convertvalue[0][$val]['class'];
-                                        $method = $objimport->array_import_convertvalue[0][$val]['method'];
-                                        if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
-                                        {
-                                        	$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
-                                        } else {
-                                            $resultload = dol_include_once($file);
-                                            if (empty($resultload))
-                                            {
-                                                dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
-                                                break;
-                                            }
-                                            $classinstance = new $class($this->db);
-                                            // Try the fetch from code or ref
-                                            $param_array = array('', $newval);
-                                            if ($class == 'AccountingAccount') {
-                                                //var_dump($arrayrecord[0]['val']);
-                                                /*include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancysystem.class.php';
+									if ($isidorref == 'ref') {    // If value into input import file is a ref, we apply the function defined into descriptor
+										$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
+										$class = $objimport->array_import_convertvalue[0][$val]['class'];
+										$method = $objimport->array_import_convertvalue[0][$val]['method'];
+										if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
+										{
+											$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
+										} else {
+											$resultload = dol_include_once($file);
+											if (empty($resultload))
+											{
+												dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
+												break;
+											}
+											$classinstance = new $class($this->db);
+											// Try the fetch from code or ref
+											$param_array = array('', $newval);
+											if ($class == 'AccountingAccount') {
+												//var_dump($arrayrecord[0]['val']);
+												/*include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancysystem.class.php';
                                                  $tmpchartofaccount = new AccountancySystem($this->db);
                                                  $tmpchartofaccount->fetch($conf->global->CHARTOFACCOUNTS);
                                                  var_dump($tmpchartofaccount->ref.' - '.$arrayrecord[0]['val']);
@@ -447,183 +446,175 @@ class ImportCsv extends ModeleImports
                                                  $errorforthistable++;
                                                  $error++;
                                                  }*/
-                                                $param_array = array('', $newval, 0, $arrayrecord[0]['val']); // Param to fetch parent from account, in chart.
-                                            }
+												$param_array = array('', $newval, 0, $arrayrecord[0]['val']); // Param to fetch parent from account, in chart.
+											}
 
-                                            call_user_func_array(array($classinstance, $method), $param_array);
-                                            // If not found, try the fetch from label
-                                            if (!($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel')
-                                            {
-                                                $param_array = array('', '', $newval);
-                                                call_user_func_array(array($classinstance, $method), $param_array);
-                                            }
-                                            $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] = $classinstance->id;
-                                            //print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
-                                            if ($classinstance->id != '')	// id may be 0, it is a found value
-                                            {
-                                                $newval = $classinstance->id;
-                                            } else {
-                                                if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-                                                elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
-                                                else $this->errors[$error]['lib'] = 'ErrorBadDefinitionOfImportProfile';
-                                                $this->errors[$error]['type'] = 'FOREIGNKEY';
-                                                $errorforthistable++;
-                                                $error++;
-                                            }
-                                        }
-                                    }
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel')
-                                {
-                                    $isidorref = 'id';
-                                    if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
-                                    $newval = preg_replace('/^(id|ref):/i', '', $newval);
+											call_user_func_array(array($classinstance, $method), $param_array);
+											// If not found, try the fetch from label
+											if (!($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel')
+											{
+												$param_array = array('', '', $newval);
+												call_user_func_array(array($classinstance, $method), $param_array);
+											}
+											$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] = $classinstance->id;
+											//print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
+											if ($classinstance->id != '')	// id may be 0, it is a found value
+											{
+												$newval = $classinstance->id;
+											} else {
+												if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+												elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
+												else $this->errors[$error]['lib'] = 'ErrorBadDefinitionOfImportProfile';
+												$this->errors[$error]['type'] = 'FOREIGNKEY';
+												$errorforthistable++;
+												$error++;
+											}
+										}
+									}
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel') {
+									$isidorref = 'id';
+									if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
+									$newval = preg_replace('/^(id|ref):/i', '', $newval);
 
-                                    if ($isidorref == 'ref') {
-                                        $file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
-                                        $class = $objimport->array_import_convertvalue[0][$val]['class'];
-                                        $method = $objimport->array_import_convertvalue[0][$val]['method'];
-                                        $codefromfield = $objimport->array_import_convertvalue[0][$val]['codefromfield'];
-                                        $code = $arrayrecord[$arrayfield[$codefromfield]]['val'];
-                                        if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval] != '') {
-                                            $newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval];
-                                        } else {
-                                            $resultload = dol_include_once($file);
-                                            if (empty($resultload)) {
-                                                dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method.', code='.$code);
-                                                break;
-                                            }
-                                            $classinstance = new $class($this->db);
-                                            // Try the fetch from code and ref
-                                            $param_array = array('', $newval, $code);
-                                            call_user_func_array(array($classinstance, $method), $param_array);
-                                            $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval] = $classinstance->id;
-                                            if ($classinstance->id > 0)    // we found record
-                                            {
-                                                $newval = $classinstance->id;
-                                            } else {
-                                                if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-                                                else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
-                                                $this->errors[$error]['type'] = 'FOREIGNKEY';
-                                                $errorforthistable++;
-                                                $error++;
-                                            }
-                                        }
-                                    }
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull')
-                                {
-                                    if (empty($newval)) $newval = '0';
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits' || $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchscalefromcodeunits')
-                                {
-                                	$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
-                                	$class = $objimport->array_import_convertvalue[0][$val]['class'];
-                                	$method = $objimport->array_import_convertvalue[0][$val]['method'];
-                                	$units = $objimport->array_import_convertvalue[0][$val]['units'];
-                                	if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] != '')
-                                	{
-                                		$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval];
-                                	} else {
-                                		$resultload = dol_include_once($file);
-                                		if (empty($resultload))
-                                		{
-                                			dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method.', units='.$units);
-                                			break;
-                                		}
-                                		$classinstance = new $class($this->db);
-                                		// Try the fetch from code or ref
-                                		call_user_func_array(array($classinstance, $method), array('', '', $newval, $units));
-                                		$scaleorid = (($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits') ? $classinstance->id : $classinstance->scale);
-                                		$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] = $scaleorid;
-                                		//print 'We have made a '.$class.'->'.$method." to get a value from key '".$newval."' and we got '".$scaleorid."'.";exit;
-                                		if ($classinstance->id > 0)	// we found record
-                                		{
-                                			$newval = $scaleorid ? $scaleorid : 0;
-                                		} else {
-                                			if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-                                			else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
-                                			$this->errors[$error]['type'] = 'FOREIGNKEY';
-                                			$errorforthistable++;
-                                			$error++;
-                                		}
-                                	}
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto')
-                                {
-                                    if (strtolower($newval) == 'auto')
-                                    {
-                                        $this->thirpartyobject->get_codeclient(0, 0);
-                                        $newval = $this->thirpartyobject->code_client;
-                                        //print 'code_client='.$newval;
-                                    }
-                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto')
-                                {
-                                    if (strtolower($newval) == 'auto')
-                                    {
-                                        $newval = $this->thirpartyobject->get_codefournisseur(0, 1);
-                                        $newval = $this->thirpartyobject->code_fournisseur;
-                                        //print 'code_fournisseur='.$newval;
-                                    }
-                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto')
-                                {
-                                    if (strtolower($newval) == 'auto')
-                                    {
-                                        $this->thirpartyobject->get_codecompta('customer');
-                                        $newval = $this->thirpartyobject->code_compta;
-                                        //print 'code_compta='.$newval;
-                                    }
-                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto')
-                                {
-                                    if (strtolower($newval) == 'auto')
-                                    {
-                                        $this->thirpartyobject->get_codecompta('supplier');
-                                        $newval = $this->thirpartyobject->code_compta_fournisseur;
-                                        if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                        //print 'code_compta_fournisseur='.$newval;
-                                    }
-                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto')
-                                {
-                                    $defaultref = '';
-                                    // TODO provide the $modTask (module of generation of ref) as parameter of import_insert function
-                                    $obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
-                                    if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php"))
-                                    {
-                                        require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
-                                        $modTask = new $obj;
-                                        $defaultref = $modTask->getNextValue(null, null);
-                                    }
-                                    if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
-                                    $newval = $defaultref;
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'compute')
-                                {
-                                    $file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
-                                    $class = $objimport->array_import_convertvalue[0][$val]['class'];
-                                    $method = $objimport->array_import_convertvalue[0][$val]['method'];
-                                    $resultload = dol_include_once($file);
-                                    if (empty($resultload))
-                                    {
-                                        dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
-                                        break;
-                                    }
-                                    $classinstance = new $class($this->db);
-                                    $res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord));
-                                    if ($res < 0) {
-                                        if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-                                        else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
-                                        $this->errors[$error]['type'] = 'FOREIGNKEY';
-                                        $errorforthistable++;
-                                        $error++;
-                                    }
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric')
-                                {
-                                    $newval = price2num($newval);
-                                }
+									if ($isidorref == 'ref') {
+										$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
+										$class = $objimport->array_import_convertvalue[0][$val]['class'];
+										$method = $objimport->array_import_convertvalue[0][$val]['method'];
+										$codefromfield = $objimport->array_import_convertvalue[0][$val]['codefromfield'];
+										$code = $arrayrecord[$arrayfield[$codefromfield]]['val'];
+										if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval] != '') {
+											$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval];
+										} else {
+											$resultload = dol_include_once($file);
+											if (empty($resultload)) {
+												dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method.', code='.$code);
+												break;
+											}
+											$classinstance = new $class($this->db);
+											// Try the fetch from code and ref
+											$param_array = array('', $newval, $code);
+											call_user_func_array(array($classinstance, $method), $param_array);
+											$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval] = $classinstance->id;
+											if ($classinstance->id > 0)    // we found record
+											{
+												$newval = $classinstance->id;
+											} else {
+												if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+												else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+												$this->errors[$error]['type'] = 'FOREIGNKEY';
+												$errorforthistable++;
+												$error++;
+											}
+										}
+									}
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull') {
+									if (empty($newval)) $newval = '0';
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits' || $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchscalefromcodeunits') {
+									$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
+									$class = $objimport->array_import_convertvalue[0][$val]['class'];
+									$method = $objimport->array_import_convertvalue[0][$val]['method'];
+									$units = $objimport->array_import_convertvalue[0][$val]['units'];
+									if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] != '')
+									{
+										$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval];
+									} else {
+										$resultload = dol_include_once($file);
+										if (empty($resultload))
+										{
+											dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method.', units='.$units);
+											break;
+										}
+										$classinstance = new $class($this->db);
+										// Try the fetch from code or ref
+										call_user_func_array(array($classinstance, $method), array('', '', $newval, $units));
+										$scaleorid = (($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits') ? $classinstance->id : $classinstance->scale);
+										$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] = $scaleorid;
+										//print 'We have made a '.$class.'->'.$method." to get a value from key '".$newval."' and we got '".$scaleorid."'.";exit;
+										if ($classinstance->id > 0)	// we found record
+										{
+											$newval = $scaleorid ? $scaleorid : 0;
+										} else {
+											if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+											else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+											$this->errors[$error]['type'] = 'FOREIGNKEY';
+											$errorforthistable++;
+											$error++;
+										}
+									}
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto') {
+									if (strtolower($newval) == 'auto')
+									{
+										$this->thirpartyobject->get_codeclient(0, 0);
+										$newval = $this->thirpartyobject->code_client;
+										//print 'code_client='.$newval;
+									}
+									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto') {
+									if (strtolower($newval) == 'auto')
+									{
+										$newval = $this->thirpartyobject->get_codefournisseur(0, 1);
+										$newval = $this->thirpartyobject->code_fournisseur;
+										//print 'code_fournisseur='.$newval;
+									}
+									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto') {
+									if (strtolower($newval) == 'auto')
+									{
+										$this->thirpartyobject->get_codecompta('customer');
+										$newval = $this->thirpartyobject->code_compta;
+										//print 'code_compta='.$newval;
+									}
+									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto') {
+									if (strtolower($newval) == 'auto')
+									{
+										$this->thirpartyobject->get_codecompta('supplier');
+										$newval = $this->thirpartyobject->code_compta_fournisseur;
+										if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+										//print 'code_compta_fournisseur='.$newval;
+									}
+									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto') {
+									$defaultref = '';
+									// TODO provide the $modTask (module of generation of ref) as parameter of import_insert function
+									$obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
+									if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php"))
+									{
+										require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
+										$modTask = new $obj;
+										$defaultref = $modTask->getNextValue(null, null);
+									}
+									if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
+									$newval = $defaultref;
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'compute') {
+									$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
+									$class = $objimport->array_import_convertvalue[0][$val]['class'];
+									$method = $objimport->array_import_convertvalue[0][$val]['method'];
+									$resultload = dol_include_once($file);
+									if (empty($resultload))
+									{
+										dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
+										break;
+									}
+									$classinstance = new $class($this->db);
+									$res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord));
+									if ($res < 0) {
+										if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+										else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+										$this->errors[$error]['type'] = 'FOREIGNKEY';
+										$errorforthistable++;
+										$error++;
+									} else {
+										$newval = $arrayrecord[($key - 1)]['val']; //We get new value computed.
+									}
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') {
+									$newval = price2num($newval);
+								}
 
-                                //print 'Val to use as insert is '.$newval.'<br>';
-						    }
+								//print 'Val to use as insert is '.$newval.'<br>';
+							}
 
-						    // Test regexp
+							// Test regexp
 							if (!empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
 							{
 								// If test is "Must exist in a field@table or field@table:..."
@@ -668,13 +659,13 @@ class ImportCsv extends ModeleImports
 										if (!empty($filter)) $tableforerror .= ':'.$filter;
 										$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorFieldValueNotIn', $key, $newval, $field, $tableforerror);
 										$this->errors[$error]['type'] = 'FOREIGNKEY';
-									    $errorforthistable++;
+										$errorforthistable++;
 										$error++;
 									}
 								}
 								// If test is just a static regex
 								elseif (!preg_match('/'.$objimport->array_import_regex[0][$val].'/i', $newval)) {
-								    //if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
+									//if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
 									$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorWrongValueForField', $key, $newval, $objimport->array_import_regex[0][$val]);
 									$this->errors[$error]['type'] = 'REGEX';
 									$errorforthistable++;
@@ -691,12 +682,12 @@ class ImportCsv extends ModeleImports
 
 						// Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
 						if (empty($newval) && $arrayrecord[($key - 1)]['type'] < 0) {
-                            $listvalues[] = ($newval == '0' ? $newval : "null");
-                        } elseif (empty($newval) && $arrayrecord[($key - 1)]['type'] == 0) {
-                            $listvalues[] = "''";
-                        } else {
-                            $listvalues[] = "'".$this->db->escape($newval)."'";
-                        }
+							$listvalues[] = ($newval == '0' ? $newval : "null");
+						} elseif (empty($newval) && $arrayrecord[($key - 1)]['type'] == 0) {
+							$listvalues[] = "''";
+						} else {
+							$listvalues[] = "'".$this->db->escape($newval)."'";
+						}
 					}
 					$i++;
 				}
@@ -704,33 +695,33 @@ class ImportCsv extends ModeleImports
 				// We add hidden fields (but only if there is at least one field to add into table)
 				if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0]))
 				{
-    				// Loop on each hidden fields to add them into listfields/listvalues
-				    foreach ($objimport->array_import_fieldshidden[0] as $key => $val)
-    				{
-    					if (!preg_match('/^'.preg_quote($alias, '/').'\./', $key)) continue; // Not a field of current table
-    				    if ($val == 'user->id')
-    				    {
-    				        $listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
-    				        $listvalues[] = $user->id;
-    				    } elseif (preg_match('/^lastrowid-/', $val))
-    				    {
-    				        $tmp = explode('-', $val);
-    				        $lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
+					// Loop on each hidden fields to add them into listfields/listvalues
+					foreach ($objimport->array_import_fieldshidden[0] as $key => $val)
+					{
+						if (!preg_match('/^'.preg_quote($alias, '/').'\./', $key)) continue; // Not a field of current table
+						if ($val == 'user->id')
+						{
+							$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
+							$listvalues[] = $user->id;
+						} elseif (preg_match('/^lastrowid-/', $val))
+						{
+							$tmp = explode('-', $val);
+							$lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
 							$keyfield = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
-    				        $listfields[] = $keyfield;
-                            $listvalues[] = $lastinsertid;
-    				        //print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
-    				    } elseif (preg_match('/^const-/', $val))
-    				    {
-    				    	$tmp = explode('-', $val, 2);
-    				    	$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
-    				    	$listvalues[] = "'".$tmp[1]."'";
-    				    } else {
-    				    	$this->errors[$error]['lib'] = 'Bad value of profile setup '.$val.' for array_import_fieldshidden';
-    				    	$this->errors[$error]['type'] = 'Import profile setup';
-    				    	$error++;
-    				    }
-    				}
+							$listfields[] = $keyfield;
+							$listvalues[] = $lastinsertid;
+							//print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
+						} elseif (preg_match('/^const-/', $val))
+						{
+							$tmp = explode('-', $val, 2);
+							$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
+							$listvalues[] = "'".$tmp[1]."'";
+						} else {
+							$this->errors[$error]['lib'] = 'Bad value of profile setup '.$val.' for array_import_fieldshidden';
+							$this->errors[$error]['type'] = 'Import profile setup';
+							$error++;
+						}
+					}
 				}
 				//print 'listfields='.$listfields.'<br>listvalues='.$listvalues.'<br>';
 
@@ -861,8 +852,8 @@ class ImportCsv extends ModeleImports
 								$resql = $this->db->query($sql);
 								if ($resql)
 								{
-								    $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
-								    $insertdone = true;
+									$last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
+									$insertdone = true;
 								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
@@ -878,7 +869,7 @@ class ImportCsv extends ModeleImports
 					}*/
 				}
 
-			    if ($error) break;
+				if ($error) break;
 			}
 
 			if ($updatedone) $this->nbupdate++;
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index 8e910a4fc68..c427e01a758 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -25,7 +25,11 @@
  *		\brief      File to load import files with Excel format
  */
 
-require_once DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php';
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+
+require_once DOL_DOCUMENT_ROOT . '/core/modules/import/modules_import.php';
 
 
 /**
@@ -33,14 +37,14 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php';
  */
 class ImportXlsx extends ModeleImports
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $datatoimport;
+	public $datatoimport;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
@@ -50,22 +54,22 @@ class ImportXlsx extends ModeleImports
 	 */
 	public $errors = array();
 
-    /**
+	/**
 	 * @var int ID
 	 */
 	public $id;
 
 	/**
-     * @var string label
-     */
-    public $label;
+	 * @var string label
+	 */
+	public $label;
 
 	public $extension; // Extension of files imported by driver
 
 	/**
-     * Dolibarr version of driver
-     * @var string
-     */
+	 * Dolibarr version of driver
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	public $label_lib; // Label of external lib used by driver
@@ -74,7 +78,7 @@ class ImportXlsx extends ModeleImports
 
 	public $separator;
 
-    public $file; // Path of file
+	public $file; // Path of file
 
 	public $handle; // Handle fichier
 
@@ -95,7 +99,7 @@ class ImportXlsx extends ModeleImports
 	 *	@param	DoliDB		$db				Database handler
 	 *	@param	string		$datatoimport	String code describing import set (ex: 'societe_1')
 	 */
-    public function __construct($db, $datatoimport)
+	public function __construct($db, $datatoimport)
 	{
 		global $conf, $langs;
 		$this->db = $db;
@@ -107,58 +111,54 @@ class ImportXlsx extends ModeleImports
 		$this->extension = 'xlsx'; // Extension for generated file by this driver
 		$this->picto = 'mime/xls'; // Picto (This is not used by the example file code as Mime type, too bad ...)
 		$this->version = '1.0'; // Driver version
-
 		// If driver use an external library, put its name here
-        require_once PHPEXCEL_PATH.'PHPExcel.php';
-		require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
-        if (!class_exists('ZipArchive')) // For Excel2007, PHPExcel need ZipArchive
-        {
-                $langs->load("errors");
-                $this->error = $langs->trans('ErrorPHPNeedModule', 'zip');
-                return -1;
-        }
-        $this->label_lib = 'PhpExcel';
-        $this->version_lib = '1.8.0';
+		require_once DOL_DOCUMENT_ROOT . '/includes/phpoffice/autoloader.php';
+		require_once DOL_DOCUMENT_ROOT . '/includes/Psr/autoloader.php';
+		require_once PHPEXCELNEW_PATH . 'Spreadsheet.php';
+		$this->workbook = new Spreadsheet();
+
+		//if ($this->id == 'excel2007new')
+		{
+		if (!class_exists('ZipArchive'))	// For Excel2007
+			{
+			$langs->load("errors");
+			$this->error = $langs->trans('ErrorPHPNeedModule', 'zip');
+			return -1;
+		}
+		}
+		$this->label_lib = 'PhpSpreadSheet';
+		$this->version_lib = '1.8.0';
 
 		$this->datatoimport = $datatoimport;
 		if (preg_match('/^societe_/', $datatoimport)) $this->thirpartyobject = new Societe($this->db);
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output header of an example file for this format
 	 *
 	 * 	@param	Translate	$outputlangs		Output language
 	 *  @return	string							Empty string
 	 */
-    public function write_header_example($outputlangs)
+	public function write_header_example($outputlangs)
 	{
-        // phpcs:enable
-        global $user, $conf, $langs;
-        // create a temporary object, the final output will be generated in footer
-        if (!empty($conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR)) {
-            $cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_discISAM;
-            $cacheSettings = array(
-                'dir' => $conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR
-            );
-            PHPExcel_Settings::setCacheStorageMethod($cacheMethod, $cacheSettings);
-        }
+		// phpcs:enable
+		global $user, $conf, $langs, $file;
+		// create a temporary object, the final output will be generated in footer
+		$this->workbook->getProperties()->setCreator($user->getFullName($outputlangs) . ' - Dolibarr ' . DOL_VERSION);
+		$this->workbook->getProperties()->setTitle($outputlangs->trans("Import") . ' - ' . $file);
+		$this->workbook->getProperties()->setSubject($outputlangs->trans("Import") . ' - ' . $file);
+		$this->workbook->getProperties()->setDescription($outputlangs->trans("Import") . ' - ' . $file);
 
-        $this->workbook = new PHPExcel();
-        $this->workbook->getProperties()->setCreator($user->getFullName($outputlangs).' - Dolibarr '.DOL_VERSION);
-        $this->workbook->getProperties()->setTitle($outputlangs->trans("Import").' - '.$file);
-        $this->workbook->getProperties()->setSubject($outputlangs->trans("Import").' - '.$file);
-        $this->workbook->getProperties()->setDescription($outputlangs->trans("Import").' - '.$file);
+		$this->workbook->setActiveSheetIndex(0);
+		$this->workbook->getActiveSheet()->setTitle($outputlangs->trans("Sheet"));
+		$this->workbook->getActiveSheet()->getDefaultRowDimension()->setRowHeight(16);
 
-        $this->workbook->setActiveSheetIndex(0);
-        $this->workbook->getActiveSheet()->setTitle($outputlangs->trans("Sheet"));
-        $this->workbook->getActiveSheet()->getDefaultRowDimension()->setRowHeight(16);
+		return '';
+	}
 
-        return '';
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output title line of an example file for this format
 	 *
@@ -166,12 +166,12 @@ class ImportXlsx extends ModeleImports
 	 *  @param	array		$headerlinefields	Array of fields name
 	 * 	@return	string							String output
 	 */
-    public function write_title_example($outputlangs, $headerlinefields)
+	public function write_title_example($outputlangs, $headerlinefields)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		$this->workbook->getActiveSheet()->getStyle('1')->getFont()->setBold(true);
-		$this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
+		$this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(Alignment::HORIZONTAL_LEFT);
 
 		$col = 0;
 		foreach ($headerlinefields as $field) {
@@ -184,7 +184,7 @@ class ImportXlsx extends ModeleImports
 		return ''; // final output will be generated in footer
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output record of an example file for this format
 	 *
@@ -192,9 +192,9 @@ class ImportXlsx extends ModeleImports
 	 * 	@param	array		$contentlinevalues	Array of lines
 	 * 	@return	string							Empty string
 	 */
-    public function write_record_example($outputlangs, $contentlinevalues)
+	public function write_record_example($outputlangs, $contentlinevalues)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$col = 0;
 		$row = 2;
 		foreach ($contentlinevalues as $cell) {
@@ -205,19 +205,19 @@ class ImportXlsx extends ModeleImports
 		return ''; // final output will be generated in footer
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output footer of an example file for this format
 	 *
 	 * 	@param	Translate	$outputlangs		Output language
 	 *  @return	string							String output
 	 */
-    public function write_footer_example($outputlangs)
+	public function write_footer_example($outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// return the file content as a string
 		$tempfile = tempnam(sys_get_temp_dir(), 'dol');
-		$objWriter = new PHPExcel_Writer_Excel2007($this->workbook);
+		$objWriter = new PhpOffice\PhpSpreadsheet\Writer\Xlsx($this->workbook);
 		$objWriter->save($tempfile);
 		$this->workbook->disconnectWorksheets();
 		unset($this->workbook);
@@ -229,22 +229,22 @@ class ImportXlsx extends ModeleImports
 
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Open input file
 	 *
 	 *	@param	string	$file		Path of filename
 	 *	@return	int					<0 if KO, >=0 if OK
 	 */
-    public function import_open_file($file)
+	public function import_open_file($file)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$ret = 1;
 
-		dol_syslog(get_class($this)."::open_file file=".$file);
+		dol_syslog(get_class($this) . "::open_file file=" . $file);
 
-		$reader = new PHPExcel_Reader_Excel2007();
+		$reader = new Xlsx();
 		$this->workbook = $reader->load($file);
 		$this->record = 1;
 		$this->file = $file;
@@ -253,17 +253,17 @@ class ImportXlsx extends ModeleImports
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Return nb of records. File must be closed.
 	 *
 	 *	@param	string	$file		Path of filename
 	 * 	@return	int					<0 if KO, >=0 if OK
 	 */
-    public function import_get_nb_of_lines($file)
+	public function import_get_nb_of_lines($file)
 	{
-        // phpcs:enable
-		$reader = new PHPExcel_Reader_Excel2007();
+		// phpcs:enable
+		$reader = new Xlsx();
 		$this->workbook = $reader->load($file);
 
 		$rowcount = $this->workbook->getActiveSheet()->getHighestDataRow();
@@ -275,42 +275,46 @@ class ImportXlsx extends ModeleImports
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Input header line from file
 	 *
 	 * 	@return		int		<0 if KO, >=0 if OK
 	 */
-    public function import_read_header()
+	public function import_read_header()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// This is not called by the import code !!!
 		$this->headers = array();
-		$colcount = PHPExcel_Cell::columnIndexFromString($this->workbook->getActiveSheet()->getHighestDataColumn());
-		for ($col = 0; $col < $colcount; $col++) {
+		$xlsx = new Xlsx();
+		$info = $xlsx->listWorksheetinfo($this->file);
+		$countcolumns = $info[0]['totalColumns'];
+		for ($col = 0; $col < $countcolumns; $col++) {
 			$this->headers[$col] = $this->workbook->getActiveSheet()->getCellByColumnAndRow($col, 1)->getValue();
 		}
 		return 0;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Return array of next record in input file.
 	 *
 	 * 	@return		Array		Array of field values. Data are UTF8 encoded. [fieldpos] => (['val']=>val, ['type']=>-1=null,0=blank,1=not empty string)
 	 */
-    public function import_read_record()
+	public function import_read_record()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$rowcount = $this->workbook->getActiveSheet()->getHighestDataRow();
 		if ($this->record > $rowcount)
 			return false;
 		$array = array();
-		$colcount = PHPExcel_Cell::columnIndexFromString($this->workbook->getActiveSheet()->getHighestDataColumn(0));
-		for ($col = 0; $col < $colcount; $col++) {
+		$xlsx = new Xlsx();
+		$info = $xlsx->listWorksheetinfo($this->file);
+		$countcolumns = $info[0]['totalColumns'];
+		for ($col = 0; $col < $countcolumns; $col++) {
 			$val = $this->workbook->getActiveSheet()->getCellByColumnAndRow($col, $this->record)->getValue();
 			$array[$col]['val'] = $val;
 			$array[$col]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we consider it null
@@ -319,22 +323,22 @@ class ImportXlsx extends ModeleImports
 		return $array;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Close file handle
 	 *
 	 *  @return	integer
 	 */
-    public function import_close_file()
+	public function import_close_file()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->workbook->disconnectWorksheets();
 		unset($this->workbook);
 	}
 
 
-    // What is this doing here ? it is common to all imports, is should be in the parent class
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// What is this doing here ? it is common to all imports, is should be in the parent class
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Insert a record into database
 	 *
@@ -346,11 +350,11 @@ class ImportXlsx extends ModeleImports
 	 * @param	array	$updatekeys						Array of keys to use to try to do an update first before insert. This field are defined into the module descriptor.
 	 * @return	int										<0 if KO, >0 if OK
 	 */
-    public function import_insert($arrayrecord, $array_match_file_to_database, $objimport, $maxfields, $importid, $updatekeys)
+	public function import_insert($arrayrecord, $array_match_file_to_database, $objimport, $maxfields, $importid, $updatekeys)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf, $user;
-        global $thirdparty_static; // Specific to thirdparty import
+		global $thirdparty_static; // Specific to thirdparty import
 		global $tablewithentity_cache; // Cache to avoid to call  desc at each rows on tables
 
 		$error = 0;
@@ -368,8 +372,7 @@ class ImportXlsx extends ModeleImports
 
 		//var_dump($sort_array_match_file_to_database);
 
-		if (count($arrayrecord) == 0 || (count($arrayrecord) == 1 && empty($arrayrecord[0]['val'])))
-		{
+		if (count($arrayrecord) == 0 || (count($arrayrecord) == 1 && empty($arrayrecord[0]['val']))) {
 			//print 'W';
 			$this->warnings[$warning]['lib'] = $langs->trans('EmptyLine');
 			$this->warnings[$warning]['type'] = 'EMPTY';
@@ -379,8 +382,7 @@ class ImportXlsx extends ModeleImports
 			$updatedone = false;
 			$insertdone = false;
 			// For each table to insert, me make a separate insert
-			foreach ($objimport->array_import_tables[0] as $alias => $tablename)
-			{
+			foreach ($objimport->array_import_tables[0] as $alias => $tablename) {
 				// Build sql request
 				$sql = '';
 				$listfields = array();
@@ -391,10 +393,9 @@ class ImportXlsx extends ModeleImports
 				// Define $tablewithentity_cache[$tablename] if not already defined
 				if (!isset($tablewithentity_cache[$tablename]))	// keep this test with "isset"
 				{
-					dol_syslog("Check if table ".$tablename." has an entity field");
+					dol_syslog("Check if table " . $tablename . " has an entity field");
 					$resql = $this->db->DDLDescTable($tablename, 'entity');
-					if ($resql)
-					{
+					if ($resql) {
 						$obj = $this->db->fetch_object($resql);
 						if ($obj) $tablewithentity_cache[$tablename] = 1; // table contains entity field
 						else $tablewithentity_cache[$tablename] = 0; // table does not contains entity field
@@ -403,22 +404,20 @@ class ImportXlsx extends ModeleImports
 					//dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
 				}
 
-                // array of fields to column index
-                $arrayfield = array();
-                foreach ($sort_array_match_file_to_database as $key => $val) {
-                    $arrayfield[$val] = ($key - 1);
-                }
+				// array of fields to column index
+				$arrayfield = array();
+				foreach ($sort_array_match_file_to_database as $key => $val) {
+					$arrayfield[$val] = ($key - 1);
+				}
 
 				// Loop on each fields in the match array: $key = 1..n, $val=alias of field (s.nom)
-				foreach ($sort_array_match_file_to_database as $key => $val)
-				{
-				    $fieldalias = preg_replace('/\..*$/i', '', $val);
-				    $fieldname = preg_replace('/^.*\./i', '', $val);
+				foreach ($sort_array_match_file_to_database as $key => $val) {
+					$fieldalias = preg_replace('/\..*$/i', '', $val);
+					$fieldname = preg_replace('/^.*\./i', '', $val);
 
-				    if ($alias != $fieldalias) continue; // Not a field of current table
+					if ($alias != $fieldalias) continue; // Not a field of current table
 
-					if ($key <= $maxfields)
-					{
+					if ($key <= $maxfields) {
 						// Set $newval with value to insert and set $listvalues with sql request part for insert
 						$newval = '';
 						if ($arrayrecord[($key - 1)]['type'] > 0) $newval = $arrayrecord[($key - 1)]['val']; // If type of field into input file is not empty string (so defined into input file), we get value
@@ -426,8 +425,7 @@ class ImportXlsx extends ModeleImports
 						// Make some tests on $newval
 
 						// Is it a required field ?
-						if (preg_match('/\*/', $objimport->array_import_fields[0][$val]) && ((string) $newval == ''))
-						{
+						if (preg_match('/\*/', $objimport->array_import_fields[0][$val]) && ((string) $newval == '')) {
 							$this->errors[$error]['lib'] = $langs->trans('ErrorMissingMandatoryValue', $key);
 							$this->errors[$error]['type'] = 'NOTNULL';
 							$errorforthistable++;
@@ -435,43 +433,38 @@ class ImportXlsx extends ModeleImports
 						}
 						// Test format only if field is not a missing mandatory field (field may be a value or empty but not mandatory)
 						else {
-						    // We convert field if required
-						    if (!empty($objimport->array_import_convertvalue[0][$val]))
-						    {
-                                //print 'Must convert '.$newval.' with rule '.join(',',$objimport->array_import_convertvalue[0][$val]).'. ';
-                                if ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeid'
-                                	|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromref'
-                                	|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel'
-                                	)
-                                {
-                                    // New val can be an id or ref. If it start with id: it is forced to id, if it start with ref: it is forced to ref. It not, we try to guess.
-                                    $isidorref = 'id';
-                                    if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
-                                    $newval = preg_replace('/^(id|ref):/i', '', $newval); // Remove id: or ref: that was used to force if field is id or ref
-                                    //print 'Val is now '.$newval.' and is type '.$isidorref."<br>\n";
+							// We convert field if required
+							if (!empty($objimport->array_import_convertvalue[0][$val])) {
+								//print 'Must convert '.$newval.' with rule '.join(',',$objimport->array_import_convertvalue[0][$val]).'. ';
+								if (
+									$objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeid'
+									|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromref'
+									|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel'
+								) {
+									// New val can be an id or ref. If it start with id: it is forced to id, if it start with ref: it is forced to ref. It not, we try to guess.
+									$isidorref = 'id';
+									if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
+									$newval = preg_replace('/^(id|ref):/i', '', $newval); // Remove id: or ref: that was used to force if field is id or ref
+									//print 'Val is now '.$newval.' and is type '.$isidorref."<br>\n";
 
-                                    if ($isidorref == 'ref')    // If value into input import file is a ref, we apply the function defined into descriptor
-                                    {
-                                        $file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
-                                        $class = $objimport->array_import_convertvalue[0][$val]['class'];
-                                        $method = $objimport->array_import_convertvalue[0][$val]['method'];
-                                        if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
-                                        {
-                                        	$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
-                                        } else {
-                                            $resultload = dol_include_once($file);
-                                            if (empty($resultload))
-                                            {
-                                                dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
-                                                break;
-                                            }
-                                            $classinstance = new $class($this->db);
-                                            // Try the fetch from code or ref
-                                            $param_array = array('', $newval);
-                                            if ($class == 'AccountingAccount')
-                                            {
-                                                //var_dump($arrayrecord[0]['val']);
-                                                /*include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancysystem.class.php';
+									if ($isidorref == 'ref') {    // If value into input import file is a ref, we apply the function defined into descriptor
+										$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
+										$class = $objimport->array_import_convertvalue[0][$val]['class'];
+										$method = $objimport->array_import_convertvalue[0][$val]['method'];
+										if ($this->cacheconvert[$file . '_' . $class . '_' . $method . '_'][$newval] != '') {
+											$newval = $this->cacheconvert[$file . '_' . $class . '_' . $method . '_'][$newval];
+										} else {
+											$resultload = dol_include_once($file);
+											if (empty($resultload)) {
+												dol_print_error('', 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method);
+												break;
+											}
+											$classinstance = new $class($this->db);
+											// Try the fetch from code or ref
+											$param_array = array('', $newval);
+											if ($class == 'AccountingAccount') {
+												//var_dump($arrayrecord[0]['val']);
+												/*include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancysystem.class.php';
                                                 $tmpchartofaccount = new AccountancySystem($this->db);
                                                 $tmpchartofaccount->fetch($conf->global->CHARTOFACCOUNTS);
                                                 var_dump($tmpchartofaccount->ref.' - '.$arrayrecord[0]['val']);
@@ -482,210 +475,188 @@ class ImportXlsx extends ModeleImports
                                                     $errorforthistable++;
                                                     $error++;
                                                 }*/
-                                                $param_array = array('', $newval, 0, $arrayrecord[0]['val']); // Param to fetch parent from account, in chart.
-                                            }
-                                            call_user_func_array(array($classinstance, $method), $param_array);
-                                            // If not found, try the fetch from label
-                                            if (!($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel')
-                                            {
-                                                $param_array = array('', '', $newval);
-                                                call_user_func_array(array($classinstance, $method), $param_array);
-                                            }
-                                            $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] = $classinstance->id;
-                                            //print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
-                                            if ($classinstance->id != '')	// id may be 0, it is a found value
-                                            {
-                                                $newval = $classinstance->id;
-                                            } else {
-                                                if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-                                                elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
-                                                else $this->errors[$error]['lib'] = 'ErrorBadDefinitionOfImportProfile';
-                                                $this->errors[$error]['type'] = 'FOREIGNKEY';
-                                                $errorforthistable++;
-                                                $error++;
-                                            }
-                                        }
-                                    }
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel')
-                                {
-                                    $isidorref = 'id';
-                                    if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
-                                    $newval = preg_replace('/^(id|ref):/i', '', $newval);
+												$param_array = array('', $newval, 0, $arrayrecord[0]['val']); // Param to fetch parent from account, in chart.
+											}
+											call_user_func_array(array($classinstance, $method), $param_array);
+											// If not found, try the fetch from label
+											if (!($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel') {
+												$param_array = array('', '', $newval);
+												call_user_func_array(array($classinstance, $method), $param_array);
+											}
+											$this->cacheconvert[$file . '_' . $class . '_' . $method . '_'][$newval] = $classinstance->id;
+											//print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
+											if ($classinstance->id != '')	// id may be 0, it is a found value
+											{
+												$newval = $classinstance->id;
+											} else {
+												if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+												elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
+												else $this->errors[$error]['lib'] = 'ErrorBadDefinitionOfImportProfile';
+												$this->errors[$error]['type'] = 'FOREIGNKEY';
+												$errorforthistable++;
+												$error++;
+											}
+										}
+									}
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel') {
+									$isidorref = 'id';
+									if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
+									$newval = preg_replace('/^(id|ref):/i', '', $newval);
 
-                                    if ($isidorref == 'ref') {
-                                        $file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
-                                        $class = $objimport->array_import_convertvalue[0][$val]['class'];
-                                        $method = $objimport->array_import_convertvalue[0][$val]['method'];
-                                        $codefromfield = $objimport->array_import_convertvalue[0][$val]['codefromfield'];
-                                        $code = $arrayrecord[$arrayfield[$codefromfield]]['val'];
-                                        if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval] != '') {
-                                            $newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval];
-                                        } else {
-                                            $resultload = dol_include_once($file);
-                                            if (empty($resultload)) {
-                                                dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method.', code='.$code);
-                                                break;
-                                            }
-                                            $classinstance = new $class($this->db);
-                                            // Try the fetch from code and ref
-                                            $param_array = array('', $newval, $code);
-                                            call_user_func_array(array($classinstance, $method), $param_array);
-                                            $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval] = $classinstance->id;
-                                            if ($classinstance->id > 0)    // we found record
-                                            {
-                                                $newval = $classinstance->id;
-                                            } else {
-                                                if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-                                                else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
-                                                $this->errors[$error]['type'] = 'FOREIGNKEY';
-                                                $errorforthistable++;
-                                                $error++;
-                                            }
-                                        }
-                                    }
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull')
-                                {
-                                    if (empty($newval)) $newval = '0';
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits' || $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchscalefromcodeunits')
-                                {
-                                	$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
-                                	$class = $objimport->array_import_convertvalue[0][$val]['class'];
-                                	$method = $objimport->array_import_convertvalue[0][$val]['method'];
-                                	$units = $objimport->array_import_convertvalue[0][$val]['units'];
-                                	if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] != '')
-                                	{
-                                		$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval];
-                                	} else {
-                                		$resultload = dol_include_once($file);
-                                		if (empty($resultload))
-                                		{
-                                			dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method.', units='.$units);
-                                			break;
-                                		}
-                                		$classinstance = new $class($this->db);
-                                		// Try the fetch from code or ref
-                                        call_user_func_array(array($classinstance, $method), array('', '', $newval, $units));
-                                        $scaleorid = (($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits') ? $classinstance->id : $classinstance->scale);
-                                        $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] = $scaleorid;
-                                        //print 'We have made a '.$class.'->'.$method." to get a value from key '".$newval."' and we got '".$scaleorid."'.";exit;
-                                        if ($classinstance->id > 0)	// we found record
-                                        {
-                                        	$newval = $scaleorid ? $scaleorid : 0;
-                                        } else {
-                                        	if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-                                        	else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
-                                			$this->errors[$error]['type'] = 'FOREIGNKEY';
-                                			$errorforthistable++;
-                                			$error++;
-                                		}
-                                	}
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto')
-                                {
-                                    if (strtolower($newval) == 'auto')
-                                    {
-                                        $this->thirpartyobject->get_codeclient(0, 0);
-                                        $newval = $this->thirpartyobject->code_client;
-                                        //print 'code_client='.$newval;
-                                    }
-                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto')
-                                {
-                                    if (strtolower($newval) == 'auto')
-                                    {
-                                        $newval = $this->thirpartyobject->get_codefournisseur(0, 1);
-                                        $newval = $this->thirpartyobject->code_fournisseur;
-                                        //print 'code_fournisseur='.$newval;
-                                    }
-                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto')
-                                {
-                                    if (strtolower($newval) == 'auto')
-                                    {
-                                        $this->thirpartyobject->get_codecompta('customer');
-                                        $newval = $this->thirpartyobject->code_compta;
-                                        //print 'code_compta='.$newval;
-                                    }
-                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto')
-                                {
-                                    if (strtolower($newval) == 'auto')
-                                    {
-                                        $this->thirpartyobject->get_codecompta('supplier');
-                                        $newval = $this->thirpartyobject->code_compta_fournisseur;
-                                        if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                        //print 'code_compta_fournisseur='.$newval;
-                                    }
-                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto')
-                                {
-                                    $defaultref = '';
-                                    // TODO provide the $modTask (module of generation of ref) as parameter of import_insert function
-                                    $obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
-                                    if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php"))
-                                    {
-                                        require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
-                                        $modTask = new $obj;
-                                        $defaultref = $modTask->getNextValue(null, null);
-                                    }
-                                    if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
-                                    $newval = $defaultref;
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'compute')
-                                {
-                                    $file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
-                                    $class = $objimport->array_import_convertvalue[0][$val]['class'];
-                                    $method = $objimport->array_import_convertvalue[0][$val]['method'];
-                                    $resultload = dol_include_once($file);
-                                    if (empty($resultload))
-                                    {
-                                        dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
-                                        break;
-                                    }
-                                    $classinstance = new $class($this->db);
-                                    $res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord));
-                                    if ($res < 0) {
-                                        if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-                                        else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
-                                        $this->errors[$error]['type'] = 'FOREIGNKEY';
-                                        $errorforthistable++;
-                                        $error++;
-                                    }
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric')
-                                {
-                                    $newval = price2num($newval);
-                                }
+									if ($isidorref == 'ref') {
+										$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
+										$class = $objimport->array_import_convertvalue[0][$val]['class'];
+										$method = $objimport->array_import_convertvalue[0][$val]['method'];
+										$codefromfield = $objimport->array_import_convertvalue[0][$val]['codefromfield'];
+										$code = $arrayrecord[$arrayfield[$codefromfield]]['val'];
+										if ($this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $code][$newval] != '') {
+											$newval = $this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $code][$newval];
+										} else {
+											$resultload = dol_include_once($file);
+											if (empty($resultload)) {
+												dol_print_error('', 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method . ', code=' . $code);
+												break;
+											}
+											$classinstance = new $class($this->db);
+											// Try the fetch from code and ref
+											$param_array = array('', $newval, $code);
+											call_user_func_array(array($classinstance, $method), $param_array);
+											$this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $code][$newval] = $classinstance->id;
+											if ($classinstance->id > 0)    // we found record
+											{
+												$newval = $classinstance->id;
+											} else {
+												if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+												else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+												$this->errors[$error]['type'] = 'FOREIGNKEY';
+												$errorforthistable++;
+												$error++;
+											}
+										}
+									}
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull') {
+									if (empty($newval)) $newval = '0';
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits' || $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchscalefromcodeunits') {
+									$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
+									$class = $objimport->array_import_convertvalue[0][$val]['class'];
+									$method = $objimport->array_import_convertvalue[0][$val]['method'];
+									$units = $objimport->array_import_convertvalue[0][$val]['units'];
+									if ($this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $units][$newval] != '') {
+										$newval = $this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $units][$newval];
+									} else {
+										$resultload = dol_include_once($file);
+										if (empty($resultload)) {
+											dol_print_error('', 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method . ', units=' . $units);
+											break;
+										}
+										$classinstance = new $class($this->db);
+										// Try the fetch from code or ref
+										call_user_func_array(array($classinstance, $method), array('', '', $newval, $units));
+										$scaleorid = (($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits') ? $classinstance->id : $classinstance->scale);
+										$this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $units][$newval] = $scaleorid;
+										//print 'We have made a '.$class.'->'.$method." to get a value from key '".$newval."' and we got '".$scaleorid."'.";exit;
+										if ($classinstance->id > 0)	// we found record
+										{
+											$newval = $scaleorid ? $scaleorid : 0;
+										} else {
+											if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+											else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+											$this->errors[$error]['type'] = 'FOREIGNKEY';
+											$errorforthistable++;
+											$error++;
+										}
+									}
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto') {
+									if (strtolower($newval) == 'auto') {
+										$this->thirpartyobject->get_codeclient(0, 0);
+										$newval = $this->thirpartyobject->code_client;
+										//print 'code_client='.$newval;
+									}
+									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto') {
+									if (strtolower($newval) == 'auto') {
+										$newval = $this->thirpartyobject->get_codefournisseur(0, 1);
+										$newval = $this->thirpartyobject->code_fournisseur;
+										//print 'code_fournisseur='.$newval;
+									}
+									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto') {
+									if (strtolower($newval) == 'auto') {
+										$this->thirpartyobject->get_codecompta('customer');
+										$newval = $this->thirpartyobject->code_compta;
+										//print 'code_compta='.$newval;
+									}
+									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto') {
+									if (strtolower($newval) == 'auto') {
+										$this->thirpartyobject->get_codecompta('supplier');
+										$newval = $this->thirpartyobject->code_compta_fournisseur;
+										if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+										//print 'code_compta_fournisseur='.$newval;
+									}
+									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto') {
+									$defaultref = '';
+									// TODO provide the $modTask (module of generation of ref) as parameter of import_insert function
+									$obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
+									if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT . "/core/modules/project/task/" . $conf->global->PROJECT_TASK_ADDON . ".php")) {
+										require_once DOL_DOCUMENT_ROOT . "/core/modules/project/task/" . $conf->global->PROJECT_TASK_ADDON . '.php';
+										$modTask = new $obj;
+										$defaultref = $modTask->getNextValue(null, null);
+									}
+									if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
+									$newval = $defaultref;
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'compute') {
+									$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
+									$class = $objimport->array_import_convertvalue[0][$val]['class'];
+									$method = $objimport->array_import_convertvalue[0][$val]['method'];
+									$resultload = dol_include_once($file);
+									if (empty($resultload)) {
+										dol_print_error('', 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method);
+										break;
+									}
+									$classinstance = new $class($this->db);
+									$res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord));
+									if ($res < 0) {
+										if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+										else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+										$this->errors[$error]['type'] = 'FOREIGNKEY';
+										$errorforthistable++;
+										$error++;
+									} else {
+										$newval = $arrayrecord[($key - 1)]['val']; //We get new value computed.
+									}
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') {
+									$newval = price2num($newval);
+								}
 
-                                //print 'Val to use as insert is '.$newval.'<br>';
-						    }
+								//print 'Val to use as insert is '.$newval.'<br>';
+							}
 
-						    // Test regexp
-							if (!empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
-							{
+							// Test regexp
+							if (!empty($objimport->array_import_regex[0][$val]) && ($newval != '')) {
 								// If test is "Must exist in a field@table or field@table:..."
-								if (preg_match('/^(.+)@([^:]+)(:.+)?$/', $objimport->array_import_regex[0][$val], $reg))
-								{
+								if (preg_match('/^(.+)@([^:]+)(:.+)?$/', $objimport->array_import_regex[0][$val], $reg)) {
 									$field = $reg[1];
 									$table = $reg[2];
-									$filter = !empty($reg[3]) ?substr($reg[3], 1) : '';
+									$filter = !empty($reg[3]) ? substr($reg[3], 1) : '';
 
-									$cachekey = $field.'@'.$table;
-									if (!empty($filter)) $cachekey .= ':'.$filter;
+									$cachekey = $field . '@' . $table;
+									if (!empty($filter)) $cachekey .= ':' . $filter;
 
 									// Load content of field@table into cache array
 									if (!is_array($this->cachefieldtable[$cachekey])) // If content of field@table not already loaded into cache
 									{
-										$sql = "SELECT ".$field." as aliasfield FROM ".$table;
-										if (!empty($filter))
-										{
-											$sql .= ' WHERE '.$filter;
+										$sql = "SELECT " . $field . " as aliasfield FROM " . $table;
+										if (!empty($filter)) {
+											$sql .= ' WHERE ' . $filter;
 										}
 
 										$resql = $this->db->query($sql);
-										if ($resql)
-										{
+										if ($resql) {
 											$num = $this->db->num_rows($resql);
 											$i = 0;
-											while ($i < $num)
-											{
+											while ($i < $num) {
 												$obj = $this->db->fetch_object($resql);
 												if ($obj) $this->cachefieldtable[$cachekey][] = $obj->aliasfield;
 												$i++;
@@ -696,19 +667,18 @@ class ImportXlsx extends ModeleImports
 									}
 
 									// Now we check cache is not empty (should not) and key is into cache
-									if (!is_array($this->cachefieldtable[$cachekey]) || !in_array($newval, $this->cachefieldtable[$cachekey]))
-									{
+									if (!is_array($this->cachefieldtable[$cachekey]) || !in_array($newval, $this->cachefieldtable[$cachekey])) {
 										$tableforerror = $table;
-										if (!empty($filter)) $tableforerror .= ':'.$filter;
+										if (!empty($filter)) $tableforerror .= ':' . $filter;
 										$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorFieldValueNotIn', $key, $newval, $field, $tableforerror);
 										$this->errors[$error]['type'] = 'FOREIGNKEY';
-									    $errorforthistable++;
+										$errorforthistable++;
 										$error++;
 									}
 								}
 								// If test is just a static regex
-								elseif (!preg_match('/'.$objimport->array_import_regex[0][$val].'/i', $newval)) {
-								    //if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
+								elseif (!preg_match('/' . $objimport->array_import_regex[0][$val] . '/i', $newval)) {
+									//if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
 									$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorWrongValueForField', $key, $newval, $objimport->array_import_regex[0][$val]);
 									$this->errors[$error]['type'] = 'REGEX';
 									$errorforthistable++;
@@ -726,58 +696,51 @@ class ImportXlsx extends ModeleImports
 						// Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
 						if (empty($newval) && $arrayrecord[($key - 1)]['type'] < 0)		 $listvalues[] = ($newval == '0' ? $newval : "null");
 						elseif (empty($newval) && $arrayrecord[($key - 1)]['type'] == 0)	 $listvalues[] = "''";
-						else $listvalues[] = "'".$this->db->escape($newval)."'";
+						else $listvalues[] = "'" . $this->db->escape($newval) . "'";
 					}
 					$i++;
 				}
 
 				// We add hidden fields (but only if there is at least one field to add into table)
-				if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0]))
-				{
-    				// Loop on each hidden fields to add them into listfields/listvalues
-				    foreach ($objimport->array_import_fieldshidden[0] as $key => $val)
-    				{
-    				    if (!preg_match('/^'.preg_quote($alias, '/').'\./', $key)) continue; // Not a field of current table
-    				    if ($val == 'user->id')
-    				    {
-    				        $listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
-    				        $listvalues[] = $user->id;
-    				    } elseif (preg_match('/^lastrowid-/', $val))
-    				    {
-    				        $tmp = explode('-', $val);
-    				        $lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
-							$keyfield = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
-    				        $listfields[] = $keyfield;
-                            $listvalues[] = $lastinsertid;
-    				        //print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
-    				    } elseif (preg_match('/^const-/', $val))
-    				    {
-    				    	$tmp = explode('-', $val, 2);
-    				    	$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
-    				    	$listvalues[] = "'".$tmp[1]."'";
-    				    } else {
-    				    	$this->errors[$error]['lib'] = 'Bad value of profile setup '.$val.' for array_import_fieldshidden';
-    				    	$this->errors[$error]['type'] = 'Import profile setup';
-    				    	$error++;
-    				    }
-    				}
+				if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0])) {
+					// Loop on each hidden fields to add them into listfields/listvalues
+					foreach ($objimport->array_import_fieldshidden[0] as $key => $val) {
+						if (!preg_match('/^' . preg_quote($alias, '/') . '\./', $key)) continue; // Not a field of current table
+						if ($val == 'user->id') {
+							$listfields[] = preg_replace('/^' . preg_quote($alias, '/') . '\./', '', $key);
+							$listvalues[] = $user->id;
+						} elseif (preg_match('/^lastrowid-/', $val)) {
+							$tmp = explode('-', $val);
+							$lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
+							$keyfield = preg_replace('/^' . preg_quote($alias, '/') . '\./', '', $key);
+							$listfields[] = $keyfield;
+							$listvalues[] = $lastinsertid;
+							//print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
+						} elseif (preg_match('/^const-/', $val)) {
+							$tmp = explode('-', $val, 2);
+							$listfields[] = preg_replace('/^' . preg_quote($alias, '/') . '\./', '', $key);
+							$listvalues[] = "'" . $tmp[1] . "'";
+						} else {
+							$this->errors[$error]['lib'] = 'Bad value of profile setup ' . $val . ' for array_import_fieldshidden';
+							$this->errors[$error]['type'] = 'Import profile setup';
+							$error++;
+						}
+					}
 				}
 				//print 'listfields='.$listfields.'<br>listvalues='.$listvalues.'<br>';
 
 				// If no error for this $alias/$tablename, we have a complete $listfields and $listvalues that are defined
 				// so we can try to make the insert or update now.
-				if (!$errorforthistable)
-				{
+				if (!$errorforthistable) {
 					//print "$alias/$tablename/$listfields/$listvalues<br>";
-					if (!empty($listfields))
-					{
+					if (!empty($listfields)) {
 						$updatedone = false;
 						$insertdone = false;
 						if (!empty($updatekeys)) {
 							// We do SELECT to get the rowid, if we already have the rowid, it's to be used below for related tables (extrafields)
 
 							if (empty($lastinsertid)) {	// No insert done yet for a parent table
-								$sqlSelect = 'SELECT rowid FROM '.$tablename;
+								$sqlSelect = 'SELECT rowid FROM ' . $tablename;
 
 								$data = array_combine($listfields, $listvalues);
 								$where = array();
@@ -785,10 +748,10 @@ class ImportXlsx extends ModeleImports
 								foreach ($updatekeys as $key) {
 									$col = $objimport->array_import_updatekeys[0][$key];
 									$key = preg_replace('/^.*\./i', '', $key);
-									$where[] = $key.' = '.$data[$key];
-									$filters[] = $col.' = '.$data[$key];
+									$where[] = $key . ' = ' . $data[$key];
+									$filters[] = $col . ' = ' . $data[$key];
 								}
-								$sqlSelect .= ' WHERE '.implode(' AND ', $where);
+								$sqlSelect .= ' WHERE ' . implode(' AND ', $where);
 
 								$resql = $this->db->query($sqlSelect);
 								if ($resql) {
@@ -815,10 +778,10 @@ class ImportXlsx extends ModeleImports
 								// a direct insert into subtable extrafields, but when me wake an update, the insertid is defined and the child record
 								// may already exists. So we rescan the extrafield table to know if record exists or not for the rowid.
 								// Note: For extrafield tablename, we have in importfieldshidden_array an enty 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
-								$sqlSelect = 'SELECT rowid FROM '.$tablename;
+								$sqlSelect = 'SELECT rowid FROM ' . $tablename;
 
 								if (empty($keyfield)) $keyfield = 'rowid';
-								$sqlSelect .= ' WHERE '.$keyfield.' = '.$lastinsertid;
+								$sqlSelect .= ' WHERE ' . $keyfield . ' = ' . $lastinsertid;
 
 								$resql = $this->db->query($sqlSelect);
 								if ($resql) {
@@ -840,19 +803,19 @@ class ImportXlsx extends ModeleImports
 
 							if (!empty($lastinsertid)) {
 								// Build SQL UPDATE request
-								$sqlstart = 'UPDATE '.$tablename;
+								$sqlstart = 'UPDATE ' . $tablename;
 
 								$data = array_combine($listfields, $listvalues);
 								$set = array();
 								foreach ($data as $key => $val) {
-									$set[] = $key.' = '.$val;
+									$set[] = $key . ' = ' . $val;
 								}
-								$sqlstart .= ' SET '.implode(', ', $set);
+								$sqlstart .= ' SET ' . implode(', ', $set);
 
 								if (empty($keyfield)) $keyfield = 'rowid';
-								$sqlend = ' WHERE '.$keyfield.' = '.$lastinsertid;
+								$sqlend = ' WHERE ' . $keyfield . ' = ' . $lastinsertid;
 
-								$sql = $sqlstart.$sqlend;
+								$sql = $sqlstart . $sqlend;
 
 								// Run update request
 								$resql = $this->db->query($sql);
@@ -871,27 +834,25 @@ class ImportXlsx extends ModeleImports
 						// Update not done, we do insert
 						if (!$error && !$updatedone) {
 							// Build SQL INSERT request
-							$sqlstart = 'INSERT INTO '.$tablename.'('.implode(', ', $listfields).', import_key';
-							$sqlend = ') VALUES('.implode(', ', $listvalues).", '".$this->db->escape($importid)."'";
+							$sqlstart = 'INSERT INTO ' . $tablename . '(' . implode(', ', $listfields) . ', import_key';
+							$sqlend = ') VALUES(' . implode(', ', $listvalues) . ", '" . $this->db->escape($importid) . "'";
 							if (!empty($tablewithentity_cache[$tablename])) {
 								$sqlstart .= ', entity';
-								$sqlend .= ', '.$conf->entity;
+								$sqlend .= ', ' . $conf->entity;
 							}
 							if (!empty($objimport->array_import_tables_creator[0][$alias])) {
-								$sqlstart .= ', '.$objimport->array_import_tables_creator[0][$alias];
-								$sqlend .= ', '.$user->id;
+								$sqlstart .= ', ' . $objimport->array_import_tables_creator[0][$alias];
+								$sqlend .= ', ' . $user->id;
 							}
-							$sql = $sqlstart.$sqlend.')';
+							$sql = $sqlstart . $sqlend . ')';
 							dol_syslog("import_xlsx.modules", LOG_DEBUG);
 
 							// Run insert request
-							if ($sql)
-							{
+							if ($sql) {
 								$resql = $this->db->query($sql);
-								if ($resql)
-								{
-								    $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
-								    $insertdone = true;
+								if ($resql) {
+									$last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
+									$insertdone = true;
 								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
@@ -907,7 +868,7 @@ class ImportXlsx extends ModeleImports
 					}*/
 				}
 
-			    if ($error) break;
+				if ($error) break;
 			}
 
 			if ($updatedone) $this->nbupdate++;
diff --git a/htdocs/core/modules/import/modules_import.php b/htdocs/core/modules/import/modules_import.php
index 20524b6bdc3..27b9a6e9cf4 100644
--- a/htdocs/core/modules/import/modules_import.php
+++ b/htdocs/core/modules/import/modules_import.php
@@ -30,34 +30,34 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
  */
 class ModeleImports
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $datatoimport;
+	public $datatoimport;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
-    /**
+	/**
 	 * @var int id of driver
 	 */
 	public $id;
 
-    /**
-     * @var string label
-     */
-    public $label;
+	/**
+	 * @var string label
+	 */
+	public $label;
 
 	public $extension; // Extension of files imported by driver
 
 	/**
-     * Dolibarr version of driver
-     * @var string
-     */
+	 * Dolibarr version of driver
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	public $label_lib; // Label of external lib used by driver
@@ -77,9 +77,9 @@ class ModeleImports
 
 
 	/**
-     *  Constructor
+	 *  Constructor
 	 */
-    public function __construct()
+	public function __construct()
 	{
 	}
 
@@ -89,9 +89,9 @@ class ModeleImports
 	 *
 	 * @return string		Id
 	 */
-    public function getDriverId()
+	public function getDriverId()
 	{
-	    return $this->id;
+		return $this->id;
 	}
 
 	/**
@@ -99,9 +99,9 @@ class ModeleImports
 	 *
 	 *	@return string	Label
 	 */
-    public function getDriverLabel()
+	public function getDriverLabel()
 	{
-	    return $this->label;
+		return $this->label;
 	}
 
 	/**
@@ -109,9 +109,9 @@ class ModeleImports
 	 *
 	 *	@return string	Description
 	 */
-    public function getDriverDesc()
+	public function getDriverDesc()
 	{
-	    return $this->desc;
+		return $this->desc;
 	}
 
 	/**
@@ -119,9 +119,9 @@ class ModeleImports
 	 *
 	 * @return string	Driver suffix
 	 */
-    public function getDriverExtension()
+	public function getDriverExtension()
 	{
-	    return $this->extension;
+		return $this->extension;
 	}
 
 	/**
@@ -129,9 +129,9 @@ class ModeleImports
 	 *
 	 *	@return string	Driver version
 	 */
-    public function getDriverVersion()
+	public function getDriverVersion()
 	{
-	    return $this->version;
+		return $this->version;
 	}
 
 	/**
@@ -139,9 +139,9 @@ class ModeleImports
 	 *
 	 *	@return string	Label of external lib
 	 */
-    public function getLibLabel()
+	public function getLibLabel()
 	{
-	    return $this->label_lib;
+		return $this->label_lib;
 	}
 
 	/**
@@ -149,23 +149,23 @@ class ModeleImports
 	 *
 	 *	@return string	Version of external lib
 	 */
-    public function getLibVersion()
+	public function getLibVersion()
 	{
-	    return $this->version_lib;
+		return $this->version_lib;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Charge en memoire et renvoie la liste des modeles actifs
-     *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Charge en memoire et renvoie la liste des modeles actifs
+	 *
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
 	 */
-    public function liste_modeles($db, $maxfilenamelength = 0)
+	public function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		dol_syslog(get_class($this)."::liste_modeles");
 
 		$dir = DOL_DOCUMENT_ROOT."/core/modules/import/";
@@ -173,35 +173,35 @@ class ModeleImports
 
 		// Recherche des fichiers drivers imports disponibles
 		$i = 0;
-        if (is_resource($handle))
-        {
-    		while (($file = readdir($handle)) !== false)
-    		{
-    			if (preg_match("/^import_(.*)\.modules\.php/i", $file, $reg))
-    			{
-    				$moduleid = $reg[1];
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (preg_match("/^import_(.*)\.modules\.php/i", $file, $reg))
+				{
+					$moduleid = $reg[1];
 
-    				// Loading Class
-    				$file = $dir."/import_".$moduleid.".modules.php";
-    				$classname = "Import".ucfirst($moduleid);
+					// Loading Class
+					$file = $dir."/import_".$moduleid.".modules.php";
+					$classname = "Import".ucfirst($moduleid);
 
-    				require_once $file;
-    				$module = new $classname($db, '');
+					require_once $file;
+					$module = new $classname($db, '');
 
-    				// Picto
-    				$this->picto[$module->id] = $module->picto;
-    				// Driver properties
-    				$this->driverlabel[$module->id] = $module->getDriverLabel('');
-    				$this->driverdesc[$module->id] = $module->getDriverDesc('');
-    				$this->driverversion[$module->id] = $module->getDriverVersion('');
-    				// If use an external lib
-    				$this->liblabel[$module->id] = $module->getLibLabel('');
-    				$this->libversion[$module->id] = $module->getLibVersion('');
+					// Picto
+					$this->picto[$module->id] = $module->picto;
+					// Driver properties
+					$this->driverlabel[$module->id] = $module->getDriverLabel('');
+					$this->driverdesc[$module->id] = $module->getDriverDesc('');
+					$this->driverversion[$module->id] = $module->getDriverVersion('');
+					// If use an external lib
+					$this->liblabel[$module->id] = $module->getLibLabel('');
+					$this->libversion[$module->id] = $module->getLibVersion('');
 
-    				$i++;
-    			}
-    		}
-        }
+					$i++;
+				}
+			}
+		}
 
 		return array_keys($this->driverlabel);
 	}
@@ -213,7 +213,7 @@ class ModeleImports
 	 *	@param	string	$key	Key
 	 *	@return	string
 	 */
-    public function getPictoForKey($key)
+	public function getPictoForKey($key)
 	{
 		return $this->picto[$key];
 	}
@@ -224,7 +224,7 @@ class ModeleImports
 	 *	@param	string	$key	Key
 	 *	@return	string
 	 */
-    public function getDriverLabelForKey($key)
+	public function getDriverLabelForKey($key)
 	{
 		return $this->driverlabel[$key];
 	}
@@ -235,7 +235,7 @@ class ModeleImports
 	 *	@param	string	$key	Key
 	 *	@return	string
 	 */
-    public function getDriverDescForKey($key)
+	public function getDriverDescForKey($key)
 	{
 		return $this->driverdesc[$key];
 	}
@@ -246,7 +246,7 @@ class ModeleImports
 	 *	@param	string	$key	Key
 	 *	@return	string
 	 */
-    public function getDriverVersionForKey($key)
+	public function getDriverVersionForKey($key)
 	{
 		return $this->driverversion[$key];
 	}
@@ -257,7 +257,7 @@ class ModeleImports
 	 *	@param	string	$key	Key
 	 *	@return	string
 	 */
-    public function getLibLabelForKey($key)
+	public function getLibLabelForKey($key)
 	{
 		return $this->liblabel[$key];
 	}
@@ -268,7 +268,7 @@ class ModeleImports
 	 *	@param	string	$key	Key
 	 *	@return	string
 	 */
-    public function getLibVersionForKey($key)
+	public function getLibVersionForKey($key)
 	{
 		return $this->libversion[$key];
 	}
diff --git a/htdocs/core/modules/mailings/advthirdparties.modules.php b/htdocs/core/modules/mailings/advthirdparties.modules.php
index 2d6ad7307b2..2820ea00ac5 100644
--- a/htdocs/core/modules/mailings/advthirdparties.modules.php
+++ b/htdocs/core/modules/mailings/advthirdparties.modules.php
@@ -25,22 +25,22 @@ include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
  */
 class mailing_advthirdparties extends MailingTargets
 {
-    public $name = 'ThirdPartyAdvancedTargeting';
+	public $name = 'ThirdPartyAdvancedTargeting';
 	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
-    public $desc = "Third parties";
-    public $require_admin = 0;
+	public $desc = "Third parties";
+	public $require_admin = 0;
 
-    public $require_module = array("none"); // This module should not be displayed as Selector in mailling
-
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto = 'company';
+	public $require_module = array("none"); // This module should not be displayed as Selector in mailling
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'company';
+
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 
 	/**
@@ -54,7 +54,7 @@ class mailing_advthirdparties extends MailingTargets
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    This is the main function that returns the array of emails
 	 *
@@ -66,7 +66,7 @@ class mailing_advthirdparties extends MailingTargets
 	 */
 	public function add_to_target_spec($mailing_id, $socid, $type_of_target, $contactid)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		dol_syslog(get_class($this)."::add_to_target_spec socid=".var_export($socid, true).' contactid='.var_export($contactid, true));
@@ -83,41 +83,41 @@ class mailing_advthirdparties extends MailingTargets
 				$sql .= " AND s.rowid IN (".implode(',', $socid).")";
 				$sql .= " ORDER BY email";
 
-    			// Stock recipients emails into targets table
-    			$result = $this->db->query($sql);
-    			if ($result)
-    			{
-    				$num = $this->db->num_rows($result);
-    				$i = 0;
+				// Stock recipients emails into targets table
+				$result = $this->db->query($sql);
+				if ($result)
+				{
+					$num = $this->db->num_rows($result);
+					$i = 0;
 
-    				dol_syslog(get_class($this)."::add_to_target_spec mailing ".$num." targets found", LOG_DEBUG);
+					dol_syslog(get_class($this)."::add_to_target_spec mailing ".$num." targets found", LOG_DEBUG);
 
-    				while ($i < $num)
-    				{
-    					$obj = $this->db->fetch_object($result);
+					while ($i < $num)
+					{
+						$obj = $this->db->fetch_object($result);
 
-    					if (!empty($obj->email) && filter_var($obj->email, FILTER_VALIDATE_EMAIL)) {
-    						if (!array_key_exists($obj->email, $cibles)) {
-    							$cibles[$obj->email] = array(
-    								'email' => $obj->email,
-    								'fk_contact' => $obj->fk_contact,
-    								'name' => $obj->name,
-    								'firstname' => $obj->firstname,
-    								'other' => '',
-    								'source_url' => $this->url($obj->id, 'thirdparty'),
-    								'source_id' => $obj->id,
-    								'source_type' => 'thirdparty'
-    							);
-    						}
-    					}
+						if (!empty($obj->email) && filter_var($obj->email, FILTER_VALIDATE_EMAIL)) {
+							if (!array_key_exists($obj->email, $cibles)) {
+								$cibles[$obj->email] = array(
+									'email' => $obj->email,
+									'fk_contact' => $obj->fk_contact,
+									'name' => $obj->name,
+									'firstname' => $obj->firstname,
+									'other' => '',
+									'source_url' => $this->url($obj->id, 'thirdparty'),
+									'source_id' => $obj->id,
+									'source_type' => 'thirdparty'
+								);
+							}
+						}
 
-    					$i++;
-    				}
-    			} else {
-    				dol_syslog($this->db->error());
-    				$this->error = $this->db->error();
-    				return -1;
-    			}
+						$i++;
+					}
+				} else {
+					dol_syslog($this->db->error());
+					$this->error = $this->db->error();
+					return -1;
+				}
 			}
 		}
 
@@ -136,41 +136,41 @@ class mailing_advthirdparties extends MailingTargets
 				}
 				$sql .= " ORDER BY email";
 
-    			// Stock recipients emails into targets table
-    			$result = $this->db->query($sql);
-    			if ($result)
-    			{
-    				$num = $this->db->num_rows($result);
-    				$i = 0;
+				// Stock recipients emails into targets table
+				$result = $this->db->query($sql);
+				if ($result)
+				{
+					$num = $this->db->num_rows($result);
+					$i = 0;
 
-    				dol_syslog(get_class($this)."::add_to_target_spec mailing ".$num." targets found");
+					dol_syslog(get_class($this)."::add_to_target_spec mailing ".$num." targets found");
 
-    				while ($i < $num)
-    				{
-    					$obj = $this->db->fetch_object($result);
+					while ($i < $num)
+					{
+						$obj = $this->db->fetch_object($result);
 
-    					if (!empty($obj->email) && filter_var($obj->email, FILTER_VALIDATE_EMAIL)) {
-    						if (!array_key_exists($obj->email, $cibles)) {
-    							$cibles[$obj->email] = array(
-    								'email' => $obj->email,
-    								'fk_contact' =>$obj->id,
-    								'lastname' => $obj->lastname,
-    								'firstname' => $obj->firstname,
-    								'other' => '',
-    								'source_url' => $this->url($obj->id, 'contact'),
-    								'source_id' => $obj->id,
-    								'source_type' => 'contact'
-    							);
-    						}
-    					}
+						if (!empty($obj->email) && filter_var($obj->email, FILTER_VALIDATE_EMAIL)) {
+							if (!array_key_exists($obj->email, $cibles)) {
+								$cibles[$obj->email] = array(
+									'email' => $obj->email,
+									'fk_contact' =>$obj->id,
+									'lastname' => $obj->lastname,
+									'firstname' => $obj->firstname,
+									'other' => '',
+									'source_url' => $this->url($obj->id, 'contact'),
+									'source_id' => $obj->id,
+									'source_type' => 'contact'
+								);
+							}
+						}
 
-    					$i++;
-    				}
-    			} else {
-    				dol_syslog($this->db->error());
-    				$this->error = $this->db->error();
-    				return -1;
-    			}
+						$i++;
+					}
+				} else {
+					dol_syslog($this->db->error());
+					$this->error = $this->db->error();
+					return -1;
+				}
 			}
 		}
 
diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index be5e8435ad2..deb1b1e12c6 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -44,23 +44,23 @@ class mailing_contacts1 extends MailingTargets
 	public $picto = 'contact';
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB      $db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB      $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
+	/**
 	 *	On the main mailing area, there is a box with statistics.
 	 *	If you want to add a line in this report you must provide an
 	 *	array of SQL request that returns two field:
@@ -68,8 +68,8 @@ class mailing_contacts1 extends MailingTargets
 	 *
 	 *	@return		string[]		Array with SQL requests
 	 */
-    public function getSqlArrayForStats()
-    {
+	public function getSqlArrayForStats()
+	{
 		global $conf, $langs;
 
 		$langs->load("commercial");
@@ -84,7 +84,7 @@ class mailing_contacts1 extends MailingTargets
 		$statssql[0] .= " AND c.statut = 1";
 
 		return $statssql;
-    }
+	}
 
 
 	/**
@@ -95,13 +95,13 @@ class mailing_contacts1 extends MailingTargets
 	 *  @param		string	$sql		Requete sql de comptage
 	 *	@return		int
 	 */
-    public function getNbOfRecipients($sql = '')
-    {
+	public function getNbOfRecipients($sql = '')
+	{
 		global $conf;
 
 		$sql = "SELECT count(distinct(c.email)) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c";
-    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc";
 		$sql .= " WHERE c.entity IN (".getEntity('socpeople').")";
 		$sql .= " AND c.email != ''"; // Note that null != '' is false
 		$sql .= " AND c.no_email = 0";
@@ -111,7 +111,7 @@ class mailing_contacts1 extends MailingTargets
 
 		// The request must return a field called "nb" to be understandable by parent::getNbOfRecipients
 		return parent::getNbOfRecipients($sql);
-    }
+	}
 
 
 	/**
@@ -119,12 +119,12 @@ class mailing_contacts1 extends MailingTargets
 	 *
 	 *   @return     string      Retourne zone select
 	 */
-    public function formFilter()
-    {
+	public function formFilter()
+	{
 		global $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("commercial", "companies", "suppliers", "categories"));
+		$langs->loadLangs(array("commercial", "companies", "suppliers", "categories"));
 
 		$s = '';
 
@@ -306,31 +306,31 @@ class mailing_contacts1 extends MailingTargets
 		$s .= '</select>';
 
 		return $s;
-    }
+	}
 
 
 	/**
 	 *  Renvoie url lien vers fiche de la source du destinataire du mailing
 	 *
-     *  @param	int		$id		ID
+	 *  @param	int		$id		ID
 	 *  @return string      	Url lien
 	 */
-    public function url($id)
-    {
-        return '<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$id.'">'.img_object('', "contact").'</a>';
-    }
+	public function url($id)
+	{
+		return '<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$id.'">'.img_object('', "contact").'</a>';
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Ajoute destinataires dans table des cibles
 	 *
 	 *  @param  int		$mailing_id    	Id of emailing
 	 *  @return int           			<0 si erreur, nb ajout si ok
 	 */
-    public function add_to_target($mailing_id)
-    {
-        // phpcs:enable
+	public function add_to_target($mailing_id)
+	{
+		// phpcs:enable
 		global $conf, $langs;
 
 		$filter = GETPOST('filter', 'alpha');
@@ -364,14 +364,14 @@ class mailing_contacts1 extends MailingTargets
 		$sql = "SELECT sp.rowid as id, sp.email as email, sp.rowid as fk_contact, sp.lastname, sp.firstname, sp.civility as civility_id, sp.poste as jobposition,";
 		$sql .= " s.nom as companyname";
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
-    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = sp.fk_soc";
-    	if ($filter_category <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie as c";
-    	if ($filter_category <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie_contact as cs";
-    	if ($filter_category_customer <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie as c2";
-    	if ($filter_category_customer <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie_societe as c2s";
-    	if ($filter_category_supplier <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie as c3";
-    	if ($filter_category_supplier <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie_fournisseur as c3s";
-    	$sql .= " WHERE sp.entity IN (".getEntity('socpeople').")";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = sp.fk_soc";
+		if ($filter_category <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie as c";
+		if ($filter_category <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie_contact as cs";
+		if ($filter_category_customer <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie as c2";
+		if ($filter_category_customer <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie_societe as c2s";
+		if ($filter_category_supplier <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie as c3";
+		if ($filter_category_supplier <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie_fournisseur as c3s";
+		$sql .= " WHERE sp.entity IN (".getEntity('socpeople').")";
 		$sql .= " AND sp.email <> ''";
 		$sql .= " AND sp.no_email = 0";
 		$sql .= " AND (SELECT count(*) FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE email = sp.email) = 0";
@@ -380,12 +380,12 @@ class mailing_contacts1 extends MailingTargets
 		$sql .= " AND sp.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
 		// Filter on category
 		if ($filter_category <> 'all') $sql .= " AND cs.fk_categorie = c.rowid AND cs.fk_socpeople = sp.rowid";
-    	if ($filter_category <> 'all') $sql .= " AND c.label = '".$this->db->escape($filter_category)."'";
+		if ($filter_category <> 'all') $sql .= " AND c.label = '".$this->db->escape($filter_category)."'";
 		if ($filter_category_customer <> 'all') $sql .= " AND c2s.fk_categorie = c2.rowid AND c2s.fk_soc = sp.fk_soc";
-    	if ($filter_category_customer <> 'all') $sql .= " AND c2.label = '".$this->db->escape($filter_category_customer)."'";
+		if ($filter_category_customer <> 'all') $sql .= " AND c2.label = '".$this->db->escape($filter_category_customer)."'";
 		if ($filter_category_supplier <> 'all') $sql .= " AND c3s.fk_categorie = c3.rowid AND c3s.fk_soc = sp.fk_soc";
-    	if ($filter_category_supplier <> 'all') $sql .= " AND c3.label = '".$this->db->escape($filter_category_supplier)."'";
-    	// Filter on nature
+		if ($filter_category_supplier <> 'all') $sql .= " AND c3.label = '".$this->db->escape($filter_category_supplier)."'";
+		// Filter on nature
 		$key = $filter;
 		{
 			//print "xx".$key;
@@ -417,17 +417,17 @@ class mailing_contacts1 extends MailingTargets
 				if ($old <> $obj->email)
 				{
 					$cibles[$j] = array(
-                    		'email' => $obj->email,
-                    		'fk_contact' => $obj->fk_contact,
-                    		'lastname' => $obj->lastname,
-                    		'firstname' => $obj->firstname,
-                    		'other' =>
-                                ($langs->transnoentities("ThirdParty").'='.$obj->companyname).';'.
-                                ($langs->transnoentities("UserTitle").'='.($obj->civility_id ? $langs->transnoentities("Civility".$obj->civility_id) : '')).';'.
-                                ($langs->transnoentities("JobPosition").'='.$obj->jobposition),
+							'email' => $obj->email,
+							'fk_contact' => $obj->fk_contact,
+							'lastname' => $obj->lastname,
+							'firstname' => $obj->firstname,
+							'other' =>
+								($langs->transnoentities("ThirdParty").'='.$obj->companyname).';'.
+								($langs->transnoentities("UserTitle").'='.($obj->civility_id ? $langs->transnoentities("Civility".$obj->civility_id) : '')).';'.
+								($langs->transnoentities("JobPosition").'='.$obj->jobposition),
 							'source_url' => $this->url($obj->id),
-                            'source_id' => $obj->id,
-                            'source_type' => 'contact'
+							'source_id' => $obj->id,
+							'source_type' => 'contact'
 					);
 					$old = $obj->email;
 					$j++;
@@ -442,5 +442,5 @@ class mailing_contacts1 extends MailingTargets
 		}
 
 		return parent::addTargetsToDatabase($mailing_id, $cibles);
-    }
+	}
 }
diff --git a/htdocs/core/modules/mailings/example.modules.php b/htdocs/core/modules/mailings/example.modules.php
index e0d79bb67ce..6c57baaa4da 100644
--- a/htdocs/core/modules/mailings/example.modules.php
+++ b/htdocs/core/modules/mailings/example.modules.php
@@ -25,70 +25,70 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php';
 */
 class mailing_example extends MailingTargets
 {
-    // CHANGE THIS: Put here a name not already used
-    public $name = 'example';
-    // CHANGE THIS: Put here a description of your selector module.
-    // This label is used if no translation is found for key MailingModuleDescXXX where XXX=name is found
-    public $desc = 'Put here a description';
-    // CHANGE THIS: Set to 1 if selector is available for admin users only
-    public $require_admin = 0;
-    // CHANGE THIS: Add a tooltip language key to add a tooltip help icon after the email target selector
-    public $tooltip = 'MyTooltipLangKey';
+	// CHANGE THIS: Put here a name not already used
+	public $name = 'example';
+	// CHANGE THIS: Put here a description of your selector module.
+	// This label is used if no translation is found for key MailingModuleDescXXX where XXX=name is found
+	public $desc = 'Put here a description';
+	// CHANGE THIS: Set to 1 if selector is available for admin users only
+	public $require_admin = 0;
+	// CHANGE THIS: Add a tooltip language key to add a tooltip help icon after the email target selector
+	public $tooltip = 'MyTooltipLangKey';
 
-    public $require_module = array();
+	public $require_module = array();
 
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto = '';
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = '';
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 
-    // CHANGE THIS: Constructor name must be called mailing_xxx with xxx=name of your selector
+	// CHANGE THIS: Constructor name must be called mailing_xxx with xxx=name of your selector
 	/**
 	 *	Constructor
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  This is the main function that returns the array of emails
-     *
-     *  @param	int		$mailing_id    	Id of mailing. No need to use it.
-     *  @return int           			<0 if error, number of emails added if ok
-     */
-    public function add_to_target($mailing_id)
-    {
-        // phpcs:enable
-        $target = array();
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  This is the main function that returns the array of emails
+	 *
+	 *  @param	int		$mailing_id    	Id of mailing. No need to use it.
+	 *  @return int           			<0 if error, number of emails added if ok
+	 */
+	public function add_to_target($mailing_id)
+	{
+		// phpcs:enable
+		$target = array();
 
-	    // CHANGE THIS
-	    // ----- Your code start here -----
+		// CHANGE THIS
+		// ----- Your code start here -----
 
-	    // You must fill the $target array with record like this
-	    // $target[0]=array('email'=>'email_0','name'=>'name_0','firstname'=>'firstname_0', 'other'=>'other_0');
+		// You must fill the $target array with record like this
+		// $target[0]=array('email'=>'email_0','name'=>'name_0','firstname'=>'firstname_0', 'other'=>'other_0');
 		// ...
-	    // $target[n]=array('email'=>'email_n','name'=>'name_n','firstname'=>'firstname_n', 'other'=>'other_n');
+		// $target[n]=array('email'=>'email_n','name'=>'name_n','firstname'=>'firstname_n', 'other'=>'other_n');
 
 		// Example: $target[0]=array('email'=>'myemail@example.com', 'name'=>'Doe', 'firstname'=>'John', 'other'=>'Other information');
 
 		// ----- Your code end here -----
 
-        return parent::addTargetsToDatabase($mailing_id, $target);
-    }
+		return parent::addTargetsToDatabase($mailing_id, $target);
+	}
 
 
-    /**
+	/**
 	 *	On the main mailing area, there is a box with statistics.
 	 *	If you want to add a line in this report you must provide an
 	 *	array of SQL request that returns two field:
@@ -96,59 +96,59 @@ class mailing_example extends MailingTargets
 	 *
 	 *	@return		array		Array with SQL requests
 	 */
-    public function getSqlArrayForStats()
+	public function getSqlArrayForStats()
 	{
-	    // CHANGE THIS: Optionnal
+		// CHANGE THIS: Optionnal
 
 		//var $statssql=array();
-        //$this->statssql[0]="SELECT field1 as label, count(distinct(email)) as nb FROM mytable WHERE email IS NOT NULL";
+		//$this->statssql[0]="SELECT field1 as label, count(distinct(email)) as nb FROM mytable WHERE email IS NOT NULL";
 		return array();
 	}
 
 
-    /**
-     *  Return here number of distinct emails returned by your selector.
-     *  For example if this selector is used to extract 500 different
-     *  emails from a text file, this function must return 500.
-     *
-     *  @param		string		$sql		Requete sql de comptage
-     *  @return		int|string				Number of recipient or '?'
-     */
-    public function getNbOfRecipients($sql = '')
-    {
-        // CHANGE THIS: Optionnal
+	/**
+	 *  Return here number of distinct emails returned by your selector.
+	 *  For example if this selector is used to extract 500 different
+	 *  emails from a text file, this function must return 500.
+	 *
+	 *  @param		string		$sql		Requete sql de comptage
+	 *  @return		int|string				Number of recipient or '?'
+	 */
+	public function getNbOfRecipients($sql = '')
+	{
+		// CHANGE THIS: Optionnal
 
-        // Example: return parent::getNbOfRecipients("SELECT count(*) as nb from dolibarr_table");
-        // Example: return 500;
-        return '?';
-    }
+		// Example: return parent::getNbOfRecipients("SELECT count(*) as nb from dolibarr_table");
+		// Example: return 500;
+		return '?';
+	}
 
-    /**
-     *  This is to add a form filter to provide variant of selector
-     *  If used, the HTML select must be called "filter"
-     *
-     *  @return     string      A html select zone
-     */
-    public function formFilter()
-    {
-        // CHANGE THIS: Optionnal
+	/**
+	 *  This is to add a form filter to provide variant of selector
+	 *  If used, the HTML select must be called "filter"
+	 *
+	 *  @return     string      A html select zone
+	 */
+	public function formFilter()
+	{
+		// CHANGE THIS: Optionnal
 
-        $s = '';
-        return $s;
-    }
+		$s = '';
+		return $s;
+	}
 
 
-    /**
-     *  Can include an URL link on each record provided by selector
-     *	shown on target page.
-     *
-     *  @param	int		$id		ID
-     *  @return string      	Url link
-     */
-    public function url($id)
-    {
-        // CHANGE THIS: Optionnal
+	/**
+	 *  Can include an URL link on each record provided by selector
+	 *	shown on target page.
+	 *
+	 *  @param	int		$id		ID
+	 *  @return string      	Url link
+	 */
+	public function url($id)
+	{
+		// CHANGE THIS: Optionnal
 
-        return '';
-    }
+		return '';
+	}
 }
diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php
index 7b9eeb02c0d..d57d4e8061a 100644
--- a/htdocs/core/modules/mailings/fraise.modules.php
+++ b/htdocs/core/modules/mailings/fraise.modules.php
@@ -33,288 +33,286 @@ include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
  */
 class mailing_fraise extends MailingTargets
 {
-    public $name = 'FundationMembers'; // Identifiant du module mailing
+	public $name = 'FundationMembers'; // Identifiant du module mailing
 	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
-    public $desc = 'Foundation members with emails';
-    // Set to 1 if selector is available for admin users only
-    public $require_admin = 0;
+	public $desc = 'Foundation members with emails';
+	// Set to 1 if selector is available for admin users only
+	public $require_admin = 0;
 
-    public $require_module = array('adherent');
+	public $require_module = array('adherent');
 
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto = 'user';
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'user';
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
-     *    Constructor
-     *
-     *  @param        DoliDB        $db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *    Constructor
+	 *
+	 *  @param        DoliDB        $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *    On the main mailing area, there is a box with statistics.
-     *    If you want to add a line in this report you must provide an
-     *    array of SQL request that returns two field:
-     *    One called "label", One called "nb".
-     *
-     *    @return        string[]        Array with SQL requests
-     */
-    public function getSqlArrayForStats()
-    {
-        global $langs;
+	/**
+	 *    On the main mailing area, there is a box with statistics.
+	 *    If you want to add a line in this report you must provide an
+	 *    array of SQL request that returns two field:
+	 *    One called "label", One called "nb".
+	 *
+	 *    @return        string[]        Array with SQL requests
+	 */
+	public function getSqlArrayForStats()
+	{
+		global $langs;
 
-        $langs->load("members");
+		$langs->load("members");
 
-        // Array for requests for statistics board
-        $statssql = array();
+		// Array for requests for statistics board
+		$statssql = array();
 
-        $statssql[0] = "SELECT '".$this->db->escape($langs->trans("FundationMembers"))."' as label, count(*) as nb";
-        $statssql[0] .= " FROM ".MAIN_DB_PREFIX."adherent where statut = 1 and entity IN (".getEntity('member').")";
+		$statssql[0] = "SELECT '".$this->db->escape($langs->trans("FundationMembers"))."' as label, count(*) as nb";
+		$statssql[0] .= " FROM ".MAIN_DB_PREFIX."adherent where statut = 1 and entity IN (".getEntity('member').")";
 
-        return $statssql;
-    }
+		return $statssql;
+	}
 
 
-    /**
-     *    Return here number of distinct emails returned by your selector.
-     *    For example if this selector is used to extract 500 different
-     *    emails from a text file, this function must return 500.
-     *
-     *  @param    string    $sql        Requete sql de comptage
-     *    @return        int            Nb of recipients
-     */
-    public function getNbOfRecipients($sql = '')
-    {
-        $sql  = "SELECT count(distinct(a.email)) as nb";
-        $sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
-        $sql .= " WHERE (a.email IS NOT NULL AND a.email != '') AND a.entity IN (".getEntity('member').")";
+	/**
+	 *    Return here number of distinct emails returned by your selector.
+	 *    For example if this selector is used to extract 500 different
+	 *    emails from a text file, this function must return 500.
+	 *
+	 *  @param    string    $sql        Requete sql de comptage
+	 *    @return        int            Nb of recipients
+	 */
+	public function getNbOfRecipients($sql = '')
+	{
+		$sql  = "SELECT count(distinct(a.email)) as nb";
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
+		$sql .= " WHERE (a.email IS NOT NULL AND a.email != '') AND a.entity IN (".getEntity('member').")";
 
-        // La requete doit retourner un champ "nb" pour etre comprise
-        // par parent::getNbOfRecipients
-        return parent::getNbOfRecipients($sql);
-    }
+		// La requete doit retourner un champ "nb" pour etre comprise
+		// par parent::getNbOfRecipients
+		return parent::getNbOfRecipients($sql);
+	}
 
 
-    /**
-     *   Affiche formulaire de filtre qui apparait dans page de selection des destinataires de mailings
-     *
-     *   @return     string      Retourne zone select
-     */
-    public function formFilter()
-    {
-        global $conf, $langs;
+	/**
+	 *   Affiche formulaire de filtre qui apparait dans page de selection des destinataires de mailings
+	 *
+	 *   @return     string      Retourne zone select
+	 */
+	public function formFilter()
+	{
+		global $conf, $langs;
 
-        // Load translation files required by the page
-        $langs->loadLangs(array("members", "companies", "categories"));
+		// Load translation files required by the page
+		$langs->loadLangs(array("members", "companies", "categories"));
 
-        $form = new Form($this->db);
+		$form = new Form($this->db);
 
-        $s = '';
+		$s = '';
 
-        // Status
-        $s .= $langs->trans("Status").': ';
-        $s .= '<select name="filter" class="flat">';
-        $s .= '<option value="none">&nbsp;</option>';
-        $s .= '<option value="-1">'.$langs->trans("MemberStatusDraft").'</option>';
-        $s .= '<option value="1a">'.$langs->trans("MemberStatusActiveShort").' ('.$langs->trans("MemberStatusPaidShort").')</option>';
-        $s .= '<option value="1b">'.$langs->trans("MemberStatusActiveShort").' ('.$langs->trans("MemberStatusActiveLateShort").')</option>';
-        $s .= '<option value="0">'.$langs->trans("MemberStatusResiliatedShort").'</option>';
-        $s .= '</select> ';
-        $s .= $langs->trans("Type").': ';
-        $s .= '<select name="filter_type" class="flat">';
-        $sql = "SELECT rowid, libelle as label, statut";
-        $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type";
-        $sql .= " WHERE entity IN (".getEntity('member_type').")";
-        $sql .= " ORDER BY rowid";
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $num = $this->db->num_rows($resql);
+		// Status
+		$s .= $langs->trans("Status").': ';
+		$s .= '<select name="filter" class="flat">';
+		$s .= '<option value="none">&nbsp;</option>';
+		$s .= '<option value="-1">'.$langs->trans("MemberStatusDraft").'</option>';
+		$s .= '<option value="1a">'.$langs->trans("MemberStatusActiveShort").' ('.$langs->trans("MemberStatusPaidShort").')</option>';
+		$s .= '<option value="1b">'.$langs->trans("MemberStatusActiveShort").' ('.$langs->trans("MemberStatusActiveLateShort").')</option>';
+		$s .= '<option value="0">'.$langs->trans("MemberStatusResiliatedShort").'</option>';
+		$s .= '</select> ';
+		$s .= $langs->trans("Type").': ';
+		$s .= '<select name="filter_type" class="flat">';
+		$sql = "SELECT rowid, libelle as label, statut";
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type";
+		$sql .= " WHERE entity IN (".getEntity('member_type').")";
+		$sql .= " ORDER BY rowid";
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
 
-            $s .= '<option value="0">&nbsp;</option>';
-            if (!$num) $s .= '<option value="0" disabled="disabled">'.$langs->trans("NoCategoriesDefined").'</option>';
+			$s .= '<option value="0">&nbsp;</option>';
+			if (!$num) $s .= '<option value="0" disabled="disabled">'.$langs->trans("NoCategoriesDefined").'</option>';
 
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $s .= '<option value="'.$obj->rowid.'">'.dol_trunc($obj->label, 38, 'middle');
-                $s .= '</option>';
-                $i++;
-            }
-        } else {
-            dol_print_error($this->db);
-        }
+				$s .= '<option value="'.$obj->rowid.'">'.dol_trunc($obj->label, 38, 'middle');
+				$s .= '</option>';
+				$i++;
+			}
+		} else {
+			dol_print_error($this->db);
+		}
 
-        $s .= '</select>';
+		$s .= '</select>';
 
-        $s .= ' ';
+		$s .= ' ';
 
-        $s .= $langs->trans("Category").': ';
-        $s .= '<select name="filter_category" class="flat">';
+		$s .= $langs->trans("Category").': ';
+		$s .= '<select name="filter_category" class="flat">';
 
-        // Show categories
-        $sql = "SELECT rowid, label, type, visible";
-        $sql .= " FROM ".MAIN_DB_PREFIX."categorie";
-        $sql .= " WHERE type = 3"; // We keep only categories for members
-        // $sql.= " AND visible > 0";	// We ignore the property visible because member's categories does not use this property (only products categories use it).
-        $sql .= " AND entity = ".$conf->entity;
-        $sql .= " ORDER BY label";
+		// Show categories
+		$sql = "SELECT rowid, label, type, visible";
+		$sql .= " FROM ".MAIN_DB_PREFIX."categorie";
+		$sql .= " WHERE type = 3"; // We keep only categories for members
+		// $sql.= " AND visible > 0";	// We ignore the property visible because member's categories does not use this property (only products categories use it).
+		$sql .= " AND entity = ".$conf->entity;
+		$sql .= " ORDER BY label";
 
-        //print $sql;
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-        	$num = $this->db->num_rows($resql);
+		//print $sql;
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
 
-        	$s .= '<option value="0">&nbsp;</option>';
-        	if (!$num) $s .= '<option value="0" disabled>'.$langs->trans("NoCategoriesDefined").'</option>';
+			$s .= '<option value="0">&nbsp;</option>';
+			if (!$num) $s .= '<option value="0" disabled>'.$langs->trans("NoCategoriesDefined").'</option>';
 
-        	$i = 0;
-        	while ($i < $num)
-        	{
-        		$obj = $this->db->fetch_object($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
 
-        		$s .= '<option value="'.$obj->rowid.'">'.dol_trunc($obj->label, 38, 'middle');
-        		$s .= '</option>';
-        		$i++;
-        	}
-        } else {
-        	dol_print_error($this->db);
-        }
+				$s .= '<option value="'.$obj->rowid.'">'.dol_trunc($obj->label, 38, 'middle');
+				$s .= '</option>';
+				$i++;
+			}
+		} else {
+			dol_print_error($this->db);
+		}
 
-        $s .= '</select>';
+		$s .= '</select>';
 
 
-        $s .= '<br>';
-        $s .= $langs->trans("DateEndSubscription").': &nbsp;';
-        $s .= $langs->trans("After").' > '.$form->selectDate(-1, 'subscriptionafter', 0, 0, 1, 'fraise', 1, 0, 0);
-        $s .= ' &nbsp; ';
-        $s .= $langs->trans("Before").' < '.$form->selectDate(-1, 'subscriptionbefore', 0, 0, 1, 'fraise', 1, 0, 0);
+		$s .= '<br>';
+		$s .= $langs->trans("DateEndSubscription").': &nbsp;';
+		$s .= $langs->trans("After").' > '.$form->selectDate(-1, 'subscriptionafter', 0, 0, 1, 'fraise', 1, 0, 0);
+		$s .= ' &nbsp; ';
+		$s .= $langs->trans("Before").' < '.$form->selectDate(-1, 'subscriptionbefore', 0, 0, 1, 'fraise', 1, 0, 0);
 
-        return $s;
-    }
+		return $s;
+	}
 
 
-    /**
-     *  Renvoie url lien vers fiche de la source du destinataire du mailing
-     *
-     *  @param    int        $id        ID
-     *  @return     string      Url lien
-     */
-    public function url($id)
-    {
-        return '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$id.'">'.img_object('', "user").'</a>';
-    }
+	/**
+	 *  Renvoie url lien vers fiche de la source du destinataire du mailing
+	 *
+	 *  @param    int        $id        ID
+	 *  @return     string      Url lien
+	 */
+	public function url($id)
+	{
+		return '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$id.'">'.img_object('', "user").'</a>';
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Ajoute destinataires dans table des cibles
-     *
-     *  @param    int        $mailing_id        Id of emailing
-     *  @return int                       < 0 si erreur, nb ajout si ok
-     */
-    public function add_to_target($mailing_id)
-    {
-        // phpcs:enable
-    	global $langs, $_POST;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Ajoute destinataires dans table des cibles
+	 *
+	 *  @param    int        $mailing_id        Id of emailing
+	 *  @return int                       < 0 si erreur, nb ajout si ok
+	 */
+	public function add_to_target($mailing_id)
+	{
+		// phpcs:enable
+		global $langs, $_POST;
 
-    	// Load translation files required by the page
-        $langs->loadLangs(array("members", "companies"));
+		// Load translation files required by the page
+		$langs->loadLangs(array("members", "companies"));
 
-        $cibles = array();
-        $now = dol_now();
+		$cibles = array();
+		$now = dol_now();
 
-        $dateendsubscriptionafter = dol_mktime($_POST['subscriptionafterhour'], $_POST['subscriptionaftermin'], $_POST['subscriptionaftersec'], $_POST['subscriptionaftermonth'], $_POST['subscriptionafterday'], $_POST['subscriptionafteryear']);
-        $dateendsubscriptionbefore = dol_mktime($_POST['subscriptionbeforehour'], $_POST['subscriptionbeforemin'], $_POST['subscriptionbeforesec'], $_POST['subscriptionbeforemonth'], $_POST['subscriptionbeforeday'], $_POST['subscriptionbeforeyear']);
+		$dateendsubscriptionafter = dol_mktime(GETPOST('subscriptionafterhour', 'int'), GETPOST('subscriptionaftermin', 'int'), GETPOST('subscriptionaftersec', 'int'), GETPOST('subscriptionaftermonth', 'int'), GETPOST('subscriptionafterday', 'int'), GETPOST('subscriptionafteryear', 'int'));
+		$dateendsubscriptionbefore = dol_mktime(GETPOST('subscriptionbeforehour', 'int'), GETPOST('subscriptionbeforemin', 'int'), GETPOST('subscriptionbeforesec', 'int'), GETPOST('subscriptionbeforemonth', 'int'), GETPOST('subscriptionbeforeday', 'int'), GETPOST('subscriptionbeforeyear', 'int'));
 
-        // La requete doit retourner: id, email, fk_contact, name, firstname
-        $sql = "SELECT a.rowid as id, a.email as email, null as fk_contact, ";
-        $sql .= " a.lastname, a.firstname,";
-        $sql .= " a.datefin, a.civility as civility_id, a.login, a.societe"; // Other fields
-        $sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
-        if ($_POST['filter_category'])
-        {
-        	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_member as cm ON cm.fk_member = a.rowid";
-        	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON c.rowid = cm.fk_categorie";
-        }
-        $sql .= " , ".MAIN_DB_PREFIX."adherent_type as ta";
-        $sql .= " WHERE a.entity IN (".getEntity('member').") AND a.email <> ''"; // Note that null != '' is false
-        $sql .= " AND a.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$this->db->escape($mailing_id).")";
-        // Filter on status
-        if (isset($_POST["filter"]) && $_POST["filter"] == '-1') {
-            $sql .= " AND a.statut=-1";
-        }
-        if (isset($_POST["filter"]) && $_POST["filter"] == '1a') $sql .= " AND a.statut=1 AND (a.datefin >= '".$this->db->idate($now)."' OR ta.subscription = 0)";
-        if (isset($_POST["filter"]) && $_POST["filter"] == '1b') $sql .= " AND a.statut=1 AND ((a.datefin IS NULL or a.datefin < '".$this->db->idate($now)."') AND ta.subscription = 1)";
-        if (isset($_POST["filter"]) && $_POST["filter"] == '0')  $sql .= " AND a.statut=0";
-        // Filter on date
-        if ($dateendsubscriptionafter > 0)  $sql .= " AND datefin > '".$this->db->idate($dateendsubscriptionafter)."'";
-        if ($dateendsubscriptionbefore > 0) $sql .= " AND datefin < '".$this->db->idate($dateendsubscriptionbefore)."'";
-        $sql .= " AND a.fk_adherent_type = ta.rowid";
-        // Filter on type
-        if (GETPOSTISET('filter_type')) $sql .= " AND ta.rowid='".$this->db->escape(GETPOST('filter_type'))."'";
-        // Filter on category
-        if (GETPOSTISSET('filter_category')) $sql .= " AND c.rowid='".$this->db->escape(GETPOST('filter_category'))."'";
-        $sql .= " ORDER BY a.email";
-        //print $sql;
+		// La requete doit retourner: id, email, fk_contact, name, firstname
+		$sql = "SELECT a.rowid as id, a.email as email, null as fk_contact, ";
+		$sql .= " a.lastname, a.firstname,";
+		$sql .= " a.datefin, a.civility as civility_id, a.login, a.societe"; // Other fields
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
+		if (GETPOST('filter_category'))
+		{
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie_member as cm ON cm.fk_member = a.rowid";
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie as c ON c.rowid = cm.fk_categorie AND c.rowid = ".((int) GETPOST('filter_category', 'int'));
+		}
+		$sql .= " , ".MAIN_DB_PREFIX."adherent_type as ta";
+		$sql .= " WHERE a.entity IN (".getEntity('member').") AND a.email <> ''"; // Note that null != '' is false
+		$sql .= " AND a.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$this->db->escape($mailing_id).")";
+		// Filter on status
+		if (GETPOST("filter") == '-1') {
+			$sql .= " AND a.statut=-1";
+		}
+		if (GETPOST("filter", 'aZ09') == '1a') $sql .= " AND a.statut=1 AND (a.datefin >= '".$this->db->idate($now)."' OR ta.subscription = 0)";
+		if (GETPOST("filter", 'aZ09') == '1b') $sql .= " AND a.statut=1 AND ((a.datefin IS NULL or a.datefin < '".$this->db->idate($now)."') AND ta.subscription = 1)";
+		if (GETPOST("filter", 'aZ09') === '0')  $sql .= " AND a.statut=0";
+		// Filter on date
+		if ($dateendsubscriptionafter > 0)  $sql .= " AND datefin > '".$this->db->idate($dateendsubscriptionafter)."'";
+		if ($dateendsubscriptionbefore > 0) $sql .= " AND datefin < '".$this->db->idate($dateendsubscriptionbefore)."'";
+		$sql .= " AND a.fk_adherent_type = ta.rowid";
+		// Filter on type
+		if (GETPOST('filter_type', 'int') > 0) $sql .= " AND ta.rowid='".$this->db->escape(GETPOST('filter_type', 'int'))."'";
+		$sql .= " ORDER BY a.email";
+		//print $sql;
 
-        // Add targets into table
-        dol_syslog(get_class($this)."::add_to_target", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $num = $this->db->num_rows($result);
-            $i = 0;
-            $j = 0;
+		// Add targets into table
+		dol_syslog(get_class($this)."::add_to_target", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			$j = 0;
 
-            dol_syslog(get_class($this)."::add_to_target mailing ".$num." targets found");
+			dol_syslog(get_class($this)."::add_to_target mailing ".$num." targets found");
 
-            $old = '';
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($result);
-                if ($old <> $obj->email)
-                {
-                    $cibles[$j] = array(
-                                'email' => $obj->email,
-                                'fk_contact' => $obj->fk_contact,
-                                'lastname' => $obj->lastname,
-                                'firstname' => $obj->firstname,
-                                'other' =>
-                                ($langs->transnoentities("Login").'='.$obj->login).';'.
-                                ($langs->transnoentities("UserTitle").'='.($obj->civility_id ? $langs->transnoentities("Civility".$obj->civility_id) : '')).';'.
-                                ($langs->transnoentities("DateEnd").'='.dol_print_date($this->db->jdate($obj->datefin), 'day')).';'.
-                                ($langs->transnoentities("Company").'='.$obj->societe),
-                                'source_url' => $this->url($obj->id),
-                                'source_id' => $obj->id,
-                                'source_type' => 'member'
-                                );
-                    $old = $obj->email;
-                    $j++;
-                }
+			$old = '';
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($result);
+				if ($old <> $obj->email)
+				{
+					$cibles[$j] = array(
+								'email' => $obj->email,
+								'fk_contact' => $obj->fk_contact,
+								'lastname' => $obj->lastname,
+								'firstname' => $obj->firstname,
+								'other' =>
+								($langs->transnoentities("Login").'='.$obj->login).';'.
+								($langs->transnoentities("UserTitle").'='.($obj->civility_id ? $langs->transnoentities("Civility".$obj->civility_id) : '')).';'.
+								($langs->transnoentities("DateEnd").'='.dol_print_date($this->db->jdate($obj->datefin), 'day')).';'.
+								($langs->transnoentities("Company").'='.$obj->societe),
+								'source_url' => $this->url($obj->id),
+								'source_id' => $obj->id,
+								'source_type' => 'member'
+					);
+					$old = $obj->email;
+					$j++;
+				}
 
-                $i++;
-            }
-        } else {
-            dol_syslog($this->db->error());
-            $this->error = $this->db->error();
-            return -1;
-        }
+				$i++;
+			}
+		} else {
+			dol_syslog($this->db->error());
+			$this->error = $this->db->error();
+			return -1;
+		}
 
-        return parent::addTargetsToDatabase($mailing_id, $cibles);
-    }
+		return parent::addTargetsToDatabase($mailing_id, $cibles);
+	}
 }
diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php
index 4c078a39130..5b1530bf02c 100644
--- a/htdocs/core/modules/mailings/modules_mailings.php
+++ b/htdocs/core/modules/mailings/modules_mailings.php
@@ -31,180 +31,180 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
  */
 class MailingTargets // This can't be abstract as it is used for some method
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
-    public $tooltip = '';
+	public $tooltip = '';
 
 
-    /**
+	/**
 	 *	Constructor
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
-        $this->db = $db;
+		$this->db = $db;
 	}
 
-    /**
-     * Return description of email selector
-     *
-     * @return     string      Return translation of module label. Try translation of $this->name then translation of 'MailingModuleDesc'.$this->name, or $this->desc if not found
-     */
-    public function getDesc()
-    {
-        global $langs, $form;
+	/**
+	 * Return description of email selector
+	 *
+	 * @return     string      Return translation of module label. Try translation of $this->name then translation of 'MailingModuleDesc'.$this->name, or $this->desc if not found
+	 */
+	public function getDesc()
+	{
+		global $langs, $form;
 
-        $langs->load("mails");
-        $transstring = "MailingModuleDesc".$this->name;
-        $s = '';
+		$langs->load("mails");
+		$transstring = "MailingModuleDesc".$this->name;
+		$s = '';
 
-        if ($langs->trans($this->name) != $this->name) $s = $langs->trans($this->name);
-        elseif ($langs->trans($transstring) != $transstring) $s = $langs->trans($transstring);
-        else $s = $this->desc;
+		if ($langs->trans($this->name) != $this->name) $s = $langs->trans($this->name);
+		elseif ($langs->trans($transstring) != $transstring) $s = $langs->trans($transstring);
+		else $s = $this->desc;
 
-        if ($this->tooltip && is_object($form)) $s .= ' '.$form->textwithpicto('', $langs->trans($this->tooltip), 1, 1);
-        return $s;
-    }
+		if ($this->tooltip && is_object($form)) $s .= ' '.$form->textwithpicto('', $langs->trans($this->tooltip), 1, 1);
+		return $s;
+	}
 
-    /**
+	/**
 	 *	Return number of records for email selector
-     *
-     *  @return     integer      Example
-     */
-    public function getNbOfRecords()
-    {
-        return 0;
-    }
+	 *
+	 *  @return     integer      Example
+	 */
+	public function getNbOfRecords()
+	{
+		return 0;
+	}
 
-    /**
-     * Retourne nombre de destinataires
-     *
-     * @param      string	$sql        Sql request to count
-     * @return     int       			Nb of recipient, or <0 if error
-     */
-    public function getNbOfRecipients($sql)
-    {
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $obj = $this->db->fetch_object($result);
-            return $obj->nb;
-        } else {
-        	$this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+	/**
+	 * Retourne nombre de destinataires
+	 *
+	 * @param      string	$sql        Sql request to count
+	 * @return     int       			Nb of recipient, or <0 if error
+	 */
+	public function getNbOfRecipients($sql)
+	{
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$obj = $this->db->fetch_object($result);
+			return $obj->nb;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
-    /**
-     * Affiche formulaire de filtre qui apparait dans page de selection
-     * des destinataires de mailings
-     *
-     * @return     string      Retourne zone select
-     */
-    public function formFilter()
-    {
-        return '';
-    }
+	/**
+	 * Affiche formulaire de filtre qui apparait dans page de selection
+	 * des destinataires de mailings
+	 *
+	 * @return     string      Retourne zone select
+	 */
+	public function formFilter()
+	{
+		return '';
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Met a jour nombre de destinataires
-     *
-     * @param	int		$mailing_id          Id of emailing
-     * @return  int			                 < 0 si erreur, nb destinataires si ok
-     */
-    public function update_nb($mailing_id)
-    {
-        // phpcs:enable
-        // Mise a jour nombre de destinataire dans table des mailings
-        $sql = "SELECT COUNT(*) nb FROM ".MAIN_DB_PREFIX."mailing_cibles";
-        $sql .= " WHERE fk_mailing = ".$mailing_id;
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $obj = $this->db->fetch_object($result);
-            $nb = $obj->nb;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Met a jour nombre de destinataires
+	 *
+	 * @param	int		$mailing_id          Id of emailing
+	 * @return  int			                 < 0 si erreur, nb destinataires si ok
+	 */
+	public function update_nb($mailing_id)
+	{
+		// phpcs:enable
+		// Mise a jour nombre de destinataire dans table des mailings
+		$sql = "SELECT COUNT(*) nb FROM ".MAIN_DB_PREFIX."mailing_cibles";
+		$sql .= " WHERE fk_mailing = ".$mailing_id;
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$obj = $this->db->fetch_object($result);
+			$nb = $obj->nb;
 
-            $sql = "UPDATE ".MAIN_DB_PREFIX."mailing";
-            $sql .= " SET nbemail = ".$nb." WHERE rowid = ".$mailing_id;
-            if (!$this->db->query($sql))
-            {
-                dol_syslog($this->db->error());
-                $this->error = $this->db->error();
-                return -1;
-            }
-        } else {
-            return -1;
-        }
-        return $nb;
-    }
+			$sql = "UPDATE ".MAIN_DB_PREFIX."mailing";
+			$sql .= " SET nbemail = ".$nb." WHERE rowid = ".$mailing_id;
+			if (!$this->db->query($sql))
+			{
+				dol_syslog($this->db->error());
+				$this->error = $this->db->error();
+				return -1;
+			}
+		} else {
+			return -1;
+		}
+		return $nb;
+	}
 
-    /**
-     * Add a list of targets int the database
-     *
-     * @param	int		$mailing_id    Id of emailing
-     * @param   array	$cibles        Array with targets
-     * @return  int      			   < 0 si erreur, nb ajout si ok
-     */
-    public function addTargetsToDatabase($mailing_id, $cibles)
-    {
-    	global $conf;
+	/**
+	 * Add a list of targets int the database
+	 *
+	 * @param	int		$mailing_id    Id of emailing
+	 * @param   array	$cibles        Array with targets
+	 * @return  int      			   < 0 si erreur, nb ajout si ok
+	 */
+	public function addTargetsToDatabase($mailing_id, $cibles)
+	{
+		global $conf;
 
-    	$this->db->begin();
+		$this->db->begin();
 
-        // Insert emailing targets from array into database
-        $j = 0;
-        $num = count($cibles);
-        foreach ($cibles as $targetarray)
-        {
-        	if (!empty($targetarray['email'])) // avoid empty email address
-        	{
-        		$sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing_cibles";
-        		$sql .= " (fk_mailing,";
-        		$sql .= " fk_contact,";
-        		$sql .= " lastname, firstname, email, other, source_url, source_id,";
-       			$sql .= " tag,";
-        		$sql .= " source_type)";
-        		$sql .= " VALUES (".$mailing_id.",";
-        		$sql .= (empty($targetarray['fk_contact']) ? '0' : "'".$this->db->escape($targetarray['fk_contact'])."'").",";
-        		$sql .= "'".$this->db->escape($targetarray['lastname'])."',";
-        		$sql .= "'".$this->db->escape($targetarray['firstname'])."',";
-        		$sql .= "'".$this->db->escape($targetarray['email'])."',";
-        		$sql .= "'".$this->db->escape($targetarray['other'])."',";
-        		$sql .= "'".$this->db->escape($targetarray['source_url'])."',";
-        		$sql .= (empty($targetarray['source_id']) ? 'null' : "'".$this->db->escape($targetarray['source_id'])."'").",";
-       			$sql .= "'".$this->db->escape(dol_hash($targetarray['email'].';'.$targetarray['lastname'].';'.$mailing_id.';'.$conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY))."',";
-        		$sql .= "'".$this->db->escape($targetarray['source_type'])."')";
-        		dol_syslog(__METHOD__, LOG_DEBUG);
-        		$result = $this->db->query($sql);
-        		if ($result)
-        		{
-        			$j++;
-        		} else {
-        			if ($this->db->errno() != 'DB_ERROR_RECORD_ALREADY_EXISTS')
-        			{
-        				// Si erreur autre que doublon
-        				dol_syslog($this->db->error().' : '.$targetarray['email']);
-        				$this->error = $this->db->error().' : '.$targetarray['email'];
-        				$this->db->rollback();
-        				return -1;
-        			}
-        		}
-        	}
-        }
+		// Insert emailing targets from array into database
+		$j = 0;
+		$num = count($cibles);
+		foreach ($cibles as $targetarray)
+		{
+			if (!empty($targetarray['email'])) // avoid empty email address
+			{
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing_cibles";
+				$sql .= " (fk_mailing,";
+				$sql .= " fk_contact,";
+				$sql .= " lastname, firstname, email, other, source_url, source_id,";
+	   			$sql .= " tag,";
+				$sql .= " source_type)";
+				$sql .= " VALUES (".$mailing_id.",";
+				$sql .= (empty($targetarray['fk_contact']) ? '0' : "'".$this->db->escape($targetarray['fk_contact'])."'").",";
+				$sql .= "'".$this->db->escape($targetarray['lastname'])."',";
+				$sql .= "'".$this->db->escape($targetarray['firstname'])."',";
+				$sql .= "'".$this->db->escape($targetarray['email'])."',";
+				$sql .= "'".$this->db->escape($targetarray['other'])."',";
+				$sql .= "'".$this->db->escape($targetarray['source_url'])."',";
+				$sql .= (empty($targetarray['source_id']) ? 'null' : "'".$this->db->escape($targetarray['source_id'])."'").",";
+	   			$sql .= "'".$this->db->escape(dol_hash($targetarray['email'].';'.$targetarray['lastname'].';'.$mailing_id.';'.$conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY))."',";
+				$sql .= "'".$this->db->escape($targetarray['source_type'])."')";
+				dol_syslog(__METHOD__, LOG_DEBUG);
+				$result = $this->db->query($sql);
+				if ($result)
+				{
+					$j++;
+				} else {
+					if ($this->db->errno() != 'DB_ERROR_RECORD_ALREADY_EXISTS')
+					{
+						// Si erreur autre que doublon
+						dol_syslog($this->db->error().' : '.$targetarray['email']);
+						$this->error = $this->db->error().' : '.$targetarray['email'];
+						$this->db->rollback();
+						return -1;
+					}
+				}
+			}
+		}
 
-        dol_syslog(__METHOD__.": mailing ".$j." targets added");
+		dol_syslog(__METHOD__.": mailing ".$j." targets added");
 
-        /*
+		/*
         //Update the status to show thirdparty mail that don't want to be contacted anymore'
         $sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
         $sql .= " SET statut=3";
@@ -222,42 +222,42 @@ class MailingTargets // This can't be abstract as it is used for some method
         $result=$this->db->query($sql);
 		*/
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
-        $sql .= " SET statut=3";
-        $sql .= " WHERE fk_mailing=".$mailing_id." AND email IN (SELECT mu.email FROM ".MAIN_DB_PREFIX."mailing_unsubscribe AS mu WHERE mu.entity IN ('".getEntity('mailing')."'))";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
+		$sql .= " SET statut=3";
+		$sql .= " WHERE fk_mailing=".$mailing_id." AND email IN (SELECT mu.email FROM ".MAIN_DB_PREFIX."mailing_unsubscribe AS mu WHERE mu.entity IN ('".getEntity('mailing')."'))";
 
-        dol_syslog(__METHOD__.":mailing update status to display emails that do not want to be contacted anymore", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if (!$result)
-        {
-        	dol_print_error($this->db);
-        }
+		dol_syslog(__METHOD__.":mailing update status to display emails that do not want to be contacted anymore", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if (!$result)
+		{
+			dol_print_error($this->db);
+		}
 
-        $this->update_nb($mailing_id);
+		$this->update_nb($mailing_id);
 
-        $this->db->commit();
+		$this->db->commit();
 
-        return $j;
-    }
+		return $j;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Supprime tous les destinataires de la table des cibles
-     *
-     *  @param  int		$mailing_id        Id of emailing
-     *  @return	void
-     */
-    public function clear_target($mailing_id)
-    {
-        // phpcs:enable
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles";
-        $sql .= " WHERE fk_mailing = ".$mailing_id;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Supprime tous les destinataires de la table des cibles
+	 *
+	 *  @param  int		$mailing_id        Id of emailing
+	 *  @return	void
+	 */
+	public function clear_target($mailing_id)
+	{
+		// phpcs:enable
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles";
+		$sql .= " WHERE fk_mailing = ".$mailing_id;
 
-        if (!$this->db->query($sql))
-        {
-            dol_syslog($this->db->error());
-        }
+		if (!$this->db->query($sql))
+		{
+			dol_syslog($this->db->error());
+		}
 
-        $this->update_nb($mailing_id);
-    }
+		$this->update_nb($mailing_id);
+	}
 }
diff --git a/htdocs/core/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php
index 52da4f87a32..3f4431f3eb4 100644
--- a/htdocs/core/modules/mailings/pomme.modules.php
+++ b/htdocs/core/modules/mailings/pomme.modules.php
@@ -42,9 +42,9 @@ class mailing_pomme extends MailingTargets
 	public $picto = 'user';
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 
 	/**
@@ -52,13 +52,13 @@ class mailing_pomme extends MailingTargets
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		$this->db = $db;
 	}
 
 
-    /**
+	/**
 	 *	On the main mailing area, there is a box with statistics.
 	 *	If you want to add a line in this report you must provide an
 	 *	array of SQL request that returns two field:
@@ -66,7 +66,7 @@ class mailing_pomme extends MailingTargets
 	 *
 	 *	@return		string[]		Array with SQL requests
 	 */
-    public function getSqlArrayForStats()
+	public function getSqlArrayForStats()
 	{
 		global $conf, $langs;
 
@@ -84,15 +84,15 @@ class mailing_pomme extends MailingTargets
 	}
 
 
-    /**
-     *	Return here number of distinct emails returned by your selector.
-     *	For example if this selector is used to extract 500 different
-     *	emails from a text file, this function must return 500.
-     *
-     *	@param	string	$sql		SQL request to use to count
-     *	@return	int					Number of recipients
-     */
-    public function getNbOfRecipients($sql = '')
+	/**
+	 *	Return here number of distinct emails returned by your selector.
+	 *	For example if this selector is used to extract 500 different
+	 *	emails from a text file, this function must return 500.
+	 *
+	 *	@param	string	$sql		SQL request to use to count
+	 *	@return	int					Number of recipients
+	 */
+	public function getNbOfRecipients($sql = '')
 	{
 		global $conf;
 
@@ -112,7 +112,7 @@ class mailing_pomme extends MailingTargets
 	 *
 	 *  @return     string      Retourne zone select
 	 */
-    public function formFilter()
+	public function formFilter()
 	{
 		global $langs;
 
@@ -141,26 +141,26 @@ class mailing_pomme extends MailingTargets
 	/**
 	 *  Renvoie url lien vers fiche de la source du destinataire du mailing
 	 *
-     *  @param	int		$id		ID
+	 *  @param	int		$id		ID
 	 *  @return     string      Url lien
 	 */
-    public function url($id)
+	public function url($id)
 	{
 		return '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$id.'">'.img_object('', "user").'</a>';
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Ajoute destinataires dans table des cibles
 	 *
 	 *  @param	int		$mailing_id    	Id of emailing
 	 *  @return int           			< 0 si erreur, nb ajout si ok
 	 */
-    public function add_to_target($mailing_id)
+	public function add_to_target($mailing_id)
 	{
-        // phpcs:enable
-	    global $conf, $langs;
+		// phpcs:enable
+		global $conf, $langs;
 		$langs->load("companies");
 
 		$cibles = array();
@@ -172,10 +172,10 @@ class mailing_pomme extends MailingTargets
 		$sql .= " WHERE u.email <> ''"; // u.email IS NOT NULL est implicite dans ce test
 		$sql .= " AND u.entity IN (0,".$conf->entity.")";
 		$sql .= " AND u.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
-		if (isset($_POST["filter"]) && $_POST["filter"] == '1') $sql .= " AND u.statut=1";
-		if (isset($_POST["filter"]) && $_POST["filter"] == '0') $sql .= " AND u.statut=0";
-		if (isset($_POST["filteremployee"]) && $_POST["filteremployee"] == '1') $sql .= " AND u.employee=1";
-		if (isset($_POST["filteremployee"]) && $_POST["filteremployee"] == '0') $sql .= " AND u.employee=0";
+		if (GETPOSTISSET("filter") && GETPOST("filter") == '1') $sql .= " AND u.statut=1";
+		if (GETPOSTISSET("filter") && GETPOST("filter") == '0') $sql .= " AND u.statut=0";
+		if (GETPOSTISSET("filteremployee") && GETPOSt("filteremployee") == '1') $sql .= " AND u.employee=1";
+		if (GETPOSTISSET("filteremployee") && GETPOST("filteremployee") == '0') $sql .= " AND u.employee=0";
 		$sql .= " ORDER BY u.email";
 
 		// Stocke destinataires dans cibles
@@ -195,17 +195,17 @@ class mailing_pomme extends MailingTargets
 				if ($old <> $obj->email)
 				{
 					$cibles[$j] = array(
-                    	'email' => $obj->email,
-                    	'fk_contact' => $obj->fk_contact,
-                    	'lastname' => $obj->lastname,
-                    	'firstname' => $obj->firstname,
-                    	'other' =>
-					        ($langs->transnoentities("Login").'='.$obj->login).';'.
-                            ($langs->transnoentities("UserTitle").'='.$obj->civility_id).';'.
-					        ($langs->transnoentities("PhonePro").'='.$obj->office_phone),
-                        'source_url' => $this->url($obj->id),
-                        'source_id' => $obj->id,
-                        'source_type' => 'user'
+						'email' => $obj->email,
+						'fk_contact' => $obj->fk_contact,
+						'lastname' => $obj->lastname,
+						'firstname' => $obj->firstname,
+						'other' =>
+							($langs->transnoentities("Login").'='.$obj->login).';'.
+							($langs->transnoentities("UserTitle").'='.$obj->civility_id).';'.
+							($langs->transnoentities("PhonePro").'='.$obj->office_phone),
+						'source_url' => $this->url($obj->id),
+						'source_id' => $obj->id,
+						'source_type' => 'user'
 					);
 					$old = $obj->email;
 					$j++;
@@ -220,5 +220,5 @@ class mailing_pomme extends MailingTargets
 		}
 
 		return parent::addTargetsToDatabase($mailing_id, $cibles);
-    }
+	}
 }
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index b286de97196..44b9d51bbf3 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -37,9 +37,9 @@ class mailing_thirdparties extends MailingTargets
 	public $picto = 'company';
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 
 	/**
@@ -47,99 +47,95 @@ class mailing_thirdparties extends MailingTargets
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		global $conf, $langs;
-        $langs->load("companies");
+		$langs->load("companies");
 
 		$this->db = $db;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    This is the main function that returns the array of emails
 	 *
 	 *    @param	int		$mailing_id    	Id of mailing. No need to use it.
 	 *    @return   int 					<0 if error, number of emails added if ok
 	 */
-    public function add_to_target($mailing_id)
+	public function add_to_target($mailing_id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		$cibles = array();
 
-        $addDescription = "";
+		$addDescription = "";
 		// Select the third parties from category
 		if (empty($_POST['filter']))
 		{
-		    $sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, null as label";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-		    $sql .= " WHERE s.email <> ''";
-		    $sql .= " AND s.entity IN (".getEntity('societe').")";
-		    $sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
+			$sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, null as label";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			$sql .= " WHERE s.email <> ''";
+			$sql .= " AND s.entity IN (".getEntity('societe').")";
+			$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
 		} else {
-            $addFilter = "";
-            if (isset($_POST["filter_client"]) && $_POST["filter_client"] <> '-1')
-            {
-                $addFilter .= " AND s.client=".$_POST["filter_client"];
-                $addDescription = $langs->trans('ProspectCustomer')."=";
-                if ($_POST["filter_client"] == 0)
-                {
-                    $addDescription .= $langs->trans('NorProspectNorCustomer');
-                } elseif ($_POST["filter_client"] == 1)
-                {
-                    $addDescription .= $langs->trans('Customer');
-                } elseif ($_POST["filter_client"] == 2)
-                {
-                    $addDescription .= $langs->trans('Prospect');
-                } elseif ($_POST["filter_client"] == 3)
-                {
-                    $addDescription .= $langs->trans('ProspectCustomer');
-                } else {
-                    $addDescription .= "Unknown status ".$_POST["filter_client"];
-                }
-            }
-            if (isset($_POST["filter_status"]))
-            {
-                if (strlen($addDescription) > 0)
-                {
-                    $addDescription .= ";";
-                }
-                $addDescription .= $langs->trans("Status")."=";
-                if ($_POST["filter_status"] == '1')
-                {
-                    $addFilter .= " AND s.status=1";
-                    $addDescription .= $langs->trans("Enabled");
-                } else {
-                    $addFilter .= " AND s.status=0";
-                    $addDescription .= $langs->trans("Disabled");
-                }
-            }
-		    $sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_societe as cs, ".MAIN_DB_PREFIX."categorie as c";
-		    $sql .= " WHERE s.email <> ''";
-		    $sql .= " AND s.entity IN (".getEntity('societe').")";
-		    $sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
-		    $sql .= " AND cs.fk_soc = s.rowid";
-		    $sql .= " AND c.rowid = cs.fk_categorie";
-		    $sql .= " AND c.rowid='".$this->db->escape($_POST['filter'])."'";
-            $sql .= $addFilter;
-		    $sql .= " UNION ";
-		    $sql .= "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_fournisseur as cs, ".MAIN_DB_PREFIX."categorie as c";
-		    $sql .= " WHERE s.email <> ''";
-		    $sql .= " AND s.entity IN (".getEntity('societe').")";
-		    $sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
-		    $sql .= " AND cs.fk_soc = s.rowid";
-		    $sql .= " AND c.rowid = cs.fk_categorie";
-		    $sql .= " AND c.rowid='".$this->db->escape($_POST['filter'])."'";
-            $sql .= $addFilter;
-        }
-        $sql .= " ORDER BY email";
+			$addFilter = "";
+			if (GETPOSTISSET("filter_client") && GETPOST("filter_client") <> '-1') {
+				$addFilter .= " AND s.client=".((int) GETPOST("filter_client", 'int'));
+				$addDescription = $langs->trans('ProspectCustomer')."=";
+				if ($_POST["filter_client"] == 0)
+				{
+					$addDescription .= $langs->trans('NorProspectNorCustomer');
+				} elseif ($_POST["filter_client"] == 1)
+				{
+					$addDescription .= $langs->trans('Customer');
+				} elseif ($_POST["filter_client"] == 2)
+				{
+					$addDescription .= $langs->trans('Prospect');
+				} elseif ($_POST["filter_client"] == 3)
+				{
+					$addDescription .= $langs->trans('ProspectCustomer');
+				} else {
+					$addDescription .= "Unknown status ".GETPOST("filter_client");
+				}
+			}
+			if (GETPOSTISSET("filter_status")) {
+				if (strlen($addDescription) > 0) {
+					$addDescription .= ";";
+				}
+				$addDescription .= $langs->trans("Status")."=";
+				if (GETPOST("filter_status") == '1') {
+					$addFilter .= " AND s.status=1";
+					$addDescription .= $langs->trans("Enabled");
+				} else {
+					$addFilter .= " AND s.status=0";
+					$addDescription .= $langs->trans("Disabled");
+				}
+			}
+			$sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_societe as cs, ".MAIN_DB_PREFIX."categorie as c";
+			$sql .= " WHERE s.email <> ''";
+			$sql .= " AND s.entity IN (".getEntity('societe').")";
+			$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
+			$sql .= " AND cs.fk_soc = s.rowid";
+			$sql .= " AND c.rowid = cs.fk_categorie";
+			$sql .= " AND c.rowid=".((int) GETPOST('filter', 'int'));
+			$sql .= $addFilter;
+			$sql .= " UNION ";
+			$sql .= "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_fournisseur as cs, ".MAIN_DB_PREFIX."categorie as c";
+			$sql .= " WHERE s.email <> ''";
+			$sql .= " AND s.entity IN (".getEntity('societe').")";
+			$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
+			$sql .= " AND cs.fk_soc = s.rowid";
+			$sql .= " AND c.rowid = cs.fk_categorie";
+			$sql .= " AND c.rowid=".((int) GETPOST('filter', 'int'));
+			$sql .= $addFilter;
+		}
+		$sql .= " ORDER BY email";
 
-        // Stock recipients emails into targets table
+		// Stock recipients emails into targets table
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -162,14 +158,14 @@ class mailing_thirdparties extends MailingTargets
 					}
 					$otherTxt .= $addDescription;
 					$cibles[$j] = array(
-                    			'email' => $obj->email,
-                    			'fk_contact' => $obj->fk_contact,
-                    			'lastname' => $obj->name, // For a thirdparty, we must use name
-                    			'firstname' => '', // For a thirdparty, lastname is ''
-                    			'other' => $otherTxt,
-                                'source_url' => $this->url($obj->id),
-                                'source_id' => $obj->id,
-                                'source_type' => 'thirdparty'
+								'email' => $obj->email,
+								'fk_contact' => $obj->fk_contact,
+								'lastname' => $obj->name, // For a thirdparty, we must use name
+								'firstname' => '', // For a thirdparty, lastname is ''
+								'other' => $otherTxt,
+								'source_url' => $this->url($obj->id),
+								'source_id' => $obj->id,
+								'source_type' => 'thirdparty'
 					);
 					$old = $obj->email;
 					$j++;
@@ -187,7 +183,7 @@ class mailing_thirdparties extends MailingTargets
 	}
 
 
-    /**
+	/**
 	 *	On the main mailing area, there is a box with statistics.
 	 *	If you want to add a line in this report you must provide an
 	 *	array of SQL request that returns two field:
@@ -195,7 +191,7 @@ class mailing_thirdparties extends MailingTargets
 	 *
 	 *	@return		array		Array with SQL requests
 	 */
-    public function getSqlArrayForStats()
+	public function getSqlArrayForStats()
 	{
 		// CHANGE THIS: Optionnal
 
@@ -213,7 +209,7 @@ class mailing_thirdparties extends MailingTargets
 	 *  @param      string	$sql        Requete sql de comptage
 	 *	@return		int					Nb of recipients
 	 */
-    public function getNbOfRecipients($sql = '')
+	public function getNbOfRecipients($sql = '')
 	{
 		global $conf;
 
@@ -233,7 +229,7 @@ class mailing_thirdparties extends MailingTargets
 	 *
 	 *  @return     string      A html select zone
 	 */
-    public function formFilter()
+	public function formFilter()
 	{
 		global $conf, $langs;
 
@@ -279,39 +275,39 @@ class mailing_thirdparties extends MailingTargets
 		}
 
 		$s .= '</select> ';
-        $s .= $langs->trans('ProspectCustomer');
-        $s .= ': <select name="filter_client" class="flat">';
-        $s .= '<option value="-1">&nbsp;</option>';
-        if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
-            $s .= '<option value="2">'.$langs->trans('Prospect').'</option>';
-        }
-        if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) {
-            $s .= '<option value="3">'.$langs->trans('ProspectCustomer').'</option>';
-        }
-        if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
-            $s .= '<option value="1">'.$langs->trans('Customer').'</option>';
-        }
-        $s .= '<option value="0">'.$langs->trans('NorProspectNorCustomer').'</option>';
+		$s .= $langs->trans('ProspectCustomer');
+		$s .= ': <select name="filter_client" class="flat">';
+		$s .= '<option value="-1">&nbsp;</option>';
+		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+			$s .= '<option value="2">'.$langs->trans('Prospect').'</option>';
+		}
+		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) {
+			$s .= '<option value="3">'.$langs->trans('ProspectCustomer').'</option>';
+		}
+		if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+			$s .= '<option value="1">'.$langs->trans('Customer').'</option>';
+		}
+		$s .= '<option value="0">'.$langs->trans('NorProspectNorCustomer').'</option>';
 
-        $s .= '</select> ';
+		$s .= '</select> ';
 
-        $s .= $langs->trans("Status");
-        $s .= ': <select name="filter_status" class="flat">';
-        $s .= '<option value="-1">&nbsp;</option>';
-        $s .= '<option value="1" selected>'.$langs->trans("Enabled").'</option>';
-        $s .= '<option value="0">'.$langs->trans("Disabled").'</option>';
-        $s .= '</select>';
+		$s .= $langs->trans("Status");
+		$s .= ': <select name="filter_status" class="flat">';
+		$s .= '<option value="-1">&nbsp;</option>';
+		$s .= '<option value="1" selected>'.$langs->trans("Enabled").'</option>';
+		$s .= '<option value="0">'.$langs->trans("Disabled").'</option>';
+		$s .= '</select>';
 		return $s;
 	}
 
 
-    /**
+	/**
 	 *  Can include an URL link on each record provided by selector shown on target page.
 	 *
-     *  @param	int		$id		ID
+	 *  @param	int		$id		ID
 	 *  @return string      	Url link
 	 */
-    public function url($id)
+	public function url($id)
 	{
 		return '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$id.'">'.img_object('', "company").'</a>';
 	}
diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
index 51bdb7b6b87..d6eea141bab 100644
--- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
@@ -22,224 +22,224 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
  */
 class mailing_thirdparties_services_expired extends MailingTargets
 {
-    public $name = 'DolibarrContractsLinesExpired';
+	public $name = 'DolibarrContractsLinesExpired';
 	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
-    public $desc = 'Third parties with expired contract\'s lines';
-    public $require_admin = 0;
+	public $desc = 'Third parties with expired contract\'s lines';
+	public $require_admin = 0;
 
-    public $require_module = array('contrat');
+	public $require_module = array('contrat');
 
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto = 'company';
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'company';
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $arrayofproducts = array();
+	public $arrayofproducts = array();
 
 
-    /**
-     *	Constructor
-     *
-     *  @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-    	global $conf;
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->arrayofproducts = array();
+		$this->arrayofproducts = array();
 
-        // List of services
-        $sql = "SELECT ref FROM ".MAIN_DB_PREFIX."product";
-        $sql .= " WHERE entity IN (".getEntity('product').")";
-        if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $sql .= " AND fk_product_type = 1"; // By default, only services
-        $sql .= " ORDER BY ref";
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $num = $this->db->num_rows($result);
-            dol_syslog("dolibarr_services_expired.modules.php:mailing_dolibarr_services_expired ".$num." services found");
+		// List of services
+		$sql = "SELECT ref FROM ".MAIN_DB_PREFIX."product";
+		$sql .= " WHERE entity IN (".getEntity('product').")";
+		if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $sql .= " AND fk_product_type = 1"; // By default, only services
+		$sql .= " ORDER BY ref";
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			dol_syslog("dolibarr_services_expired.modules.php:mailing_dolibarr_services_expired ".$num." services found");
 
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($result);
-                $i++;
-                $this->arrayofproducts[$i] = $obj->ref;
-            }
-        } else {
-            dol_print_error($this->db);
-        }
-    }
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($result);
+				$i++;
+				$this->arrayofproducts[$i] = $obj->ref;
+			}
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  This is the main function that returns the array of emails
-     *
-     *  @param	int		$mailing_id    	Id of mailing. No need to use it.
-     *  @return int           			<0 if error, number of emails added if ok
-     */
-    public function add_to_target($mailing_id)
-    {
-        // phpcs:enable
-        $key = GETPOST('filter', 'int');
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  This is the main function that returns the array of emails
+	 *
+	 *  @param	int		$mailing_id    	Id of mailing. No need to use it.
+	 *  @return int           			<0 if error, number of emails added if ok
+	 */
+	public function add_to_target($mailing_id)
+	{
+		// phpcs:enable
+		$key = GETPOST('filter', 'int');
 
-        $cibles = array();
-        $j = 0;
+		$cibles = array();
+		$j = 0;
 
-        $product = '';
-        if ($key == '0')
-        {
-        	$this->error = "Error: You must choose a filter";
-        	$this->errors[] = $this->error;
-        	return $this->error;
-        }
+		$product = '';
+		if ($key == '0')
+		{
+			$this->error = "Error: You must choose a filter";
+			$this->errors[] = $this->error;
+			return $this->error;
+		}
 
-        $product = $this->arrayofproducts[$key];
+		$product = $this->arrayofproducts[$key];
 
-        $now = dol_now();
+		$now = dol_now();
 
-        // La requete doit retourner: id, email, name
-        $sql = "SELECT s.rowid as id, s.email, s.nom as name, cd.rowid as cdid, cd.date_ouverture, cd.date_fin_validite, cd.fk_contrat";
-        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
-        $sql .= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."product as p";
-        $sql .= " WHERE s.entity IN (".getEntity('societe').")";
-        $sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
-        $sql .= " AND s.rowid = c.fk_soc AND cd.fk_contrat = c.rowid AND s.email != ''";
-        $sql .= " AND cd.statut= 4 AND cd.fk_product=p.rowid AND p.ref = '".$this->db->escape($product)."'";
-        $sql .= " AND cd.date_fin_validite < '".$this->db->idate($now)."'";
-        $sql .= " ORDER BY s.email";
+		// La requete doit retourner: id, email, name
+		$sql = "SELECT s.rowid as id, s.email, s.nom as name, cd.rowid as cdid, cd.date_ouverture, cd.date_fin_validite, cd.fk_contrat";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
+		$sql .= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."product as p";
+		$sql .= " WHERE s.entity IN (".getEntity('societe').")";
+		$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
+		$sql .= " AND s.rowid = c.fk_soc AND cd.fk_contrat = c.rowid AND s.email != ''";
+		$sql .= " AND cd.statut= 4 AND cd.fk_product=p.rowid AND p.ref = '".$this->db->escape($product)."'";
+		$sql .= " AND cd.date_fin_validite < '".$this->db->idate($now)."'";
+		$sql .= " ORDER BY s.email";
 
-        // Stocke destinataires dans cibles
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $num = $this->db->num_rows($result);
-            $i = 0;
+		// Stocke destinataires dans cibles
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$i = 0;
 
-            dol_syslog(get_class($this)."::add_to_target ".$num." targets found");
+			dol_syslog(get_class($this)."::add_to_target ".$num." targets found");
 
-            $old = '';
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($result);
-                if ($old <> $obj->email)
-                {
-                    $cibles[$j] = array(
+			$old = '';
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($result);
+				if ($old <> $obj->email)
+				{
+					$cibles[$j] = array(
 					'email' => $obj->email,
 					'lastname' => $obj->name, // For thirdparties, lastname must be name
-                    'firstname' => '', // For thirdparties, firstname is ''
+					'firstname' => '', // For thirdparties, firstname is ''
 					'other' =>
-                    ('DateStart='.dol_print_date($this->db->jdate($obj->date_ouverture), 'day')).';'.
-                    ('DateEnd='.dol_print_date($this->db->jdate($obj->date_fin_validite), 'day')).';'.
-                    ('Contract='.$obj->fk_contrat).';'.
-                    ('ContactLine='.$obj->cdid),
+					('DateStart='.dol_print_date($this->db->jdate($obj->date_ouverture), 'day')).';'.
+					('DateEnd='.dol_print_date($this->db->jdate($obj->date_fin_validite), 'day')).';'.
+					('Contract='.$obj->fk_contrat).';'.
+					('ContactLine='.$obj->cdid),
 					'source_url' => $this->url($obj->id),
 					'source_id' => $obj->id,
 					'source_type' => 'thirdparty'
-                    );
-                    $old = $obj->email;
-                    $j++;
-                }
+					);
+					$old = $obj->email;
+					$j++;
+				}
 
-                $i++;
-            }
-        } else {
-            dol_syslog($this->db->lasterror());
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
+				$i++;
+			}
+		} else {
+			dol_syslog($this->db->lasterror());
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
 
-        // ----- Your code end here -----
+		// ----- Your code end here -----
 
-        return parent::addTargetsToDatabase($mailing_id, $cibles);
-    }
+		return parent::addTargetsToDatabase($mailing_id, $cibles);
+	}
 
 
-    /**
-     *	On the main mailing area, there is a box with statistics.
-     *	If you want to add a line in this report you must provide an
-     *	array of SQL request that returns two field:
-     *	One called "label", One called "nb".
-     *
-     *	@return		array		Array with SQL requests
-     */
-    public function getSqlArrayForStats()
-    {
+	/**
+	 *	On the main mailing area, there is a box with statistics.
+	 *	If you want to add a line in this report you must provide an
+	 *	array of SQL request that returns two field:
+	 *	One called "label", One called "nb".
+	 *
+	 *	@return		array		Array with SQL requests
+	 */
+	public function getSqlArrayForStats()
+	{
 
-        //var $statssql=array();
-        //$this->statssql[0]="SELECT field1 as label, count(distinct(email)) as nb FROM mytable WHERE email IS NOT NULL";
+		//var $statssql=array();
+		//$this->statssql[0]="SELECT field1 as label, count(distinct(email)) as nb FROM mytable WHERE email IS NOT NULL";
 
-        return array();
-    }
+		return array();
+	}
 
 
-    /**
-     *	Return here number of distinct emails returned by your selector.
-     *	For example if this selector is used to extract 500 different
-     *	emails from a text file, this function must return 500.
-     *
-     *	@param	string	$sql		SQL request to use to count
-     *	@return	int					Number of recipients
-     */
-    public function getNbOfRecipients($sql = '')
-    {
-        $now = dol_now();
+	/**
+	 *	Return here number of distinct emails returned by your selector.
+	 *	For example if this selector is used to extract 500 different
+	 *	emails from a text file, this function must return 500.
+	 *
+	 *	@param	string	$sql		SQL request to use to count
+	 *	@return	int					Number of recipients
+	 */
+	public function getNbOfRecipients($sql = '')
+	{
+		$now = dol_now();
 
-        // Example: return parent::getNbOfRecipients("SELECT count(*) as nb from dolibarr_table");
-        // Example: return 500;
-        $sql = "SELECT count(*) as nb";
-        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
-        $sql .= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."product as p";
-        $sql .= " WHERE s.entity IN (".getEntity('societe').")";
-        $sql .= " AND s.rowid = c.fk_soc AND cd.fk_contrat = c.rowid AND s.email != ''";
-        $sql .= " AND cd.statut= 4 AND cd.fk_product=p.rowid";
-        $sql .= " AND p.ref IN ('".join("','", $this->arrayofproducts)."')";
-        $sql .= " AND cd.date_fin_validite < '".$this->db->idate($now)."'";
+		// Example: return parent::getNbOfRecipients("SELECT count(*) as nb from dolibarr_table");
+		// Example: return 500;
+		$sql = "SELECT count(*) as nb";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
+		$sql .= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."product as p";
+		$sql .= " WHERE s.entity IN (".getEntity('societe').")";
+		$sql .= " AND s.rowid = c.fk_soc AND cd.fk_contrat = c.rowid AND s.email != ''";
+		$sql .= " AND cd.statut= 4 AND cd.fk_product=p.rowid";
+		$sql .= " AND p.ref IN ('".join("','", $this->arrayofproducts)."')";
+		$sql .= " AND cd.date_fin_validite < '".$this->db->idate($now)."'";
 
-        $a = parent::getNbOfRecipients($sql);
+		$a = parent::getNbOfRecipients($sql);
 
-        return $a;
-    }
+		return $a;
+	}
 
-    /**
-     *  This is to add a form filter to provide variant of selector
-     *	If used, the HTML select must be called "filter"
-     *
-     *  @return     string      A html select zone
-     */
-    public function formFilter()
-    {
-        global $langs;
+	/**
+	 *  This is to add a form filter to provide variant of selector
+	 *	If used, the HTML select must be called "filter"
+	 *
+	 *  @return     string      A html select zone
+	 */
+	public function formFilter()
+	{
+		global $langs;
 
-        $s = $langs->trans("ProductOrService");
-        $s .= '<select name="filter" class="flat">';
-        if (count($this->arrayofproducts)) $s .= '<option value="0">&nbsp;</option>';
-        else $s .= '<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
-        foreach ($this->arrayofproducts as $key => $val)
-        {
-            $s .= '<option value="'.$key.'">'.$val.'</option>';
-        }
-        $s .= '</select>';
-        return $s;
-    }
+		$s = $langs->trans("ProductOrService");
+		$s .= '<select name="filter" class="flat">';
+		if (count($this->arrayofproducts)) $s .= '<option value="0">&nbsp;</option>';
+		else $s .= '<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
+		foreach ($this->arrayofproducts as $key => $val)
+		{
+			$s .= '<option value="'.$key.'">'.$val.'</option>';
+		}
+		$s .= '</select>';
+		return $s;
+	}
 
 
-    /**
-     *  Can include an URL link on each record provided by selector	shown on target page.
-     *
-     *  @param	int		$id		ID
-     *  @return string      	Url link
-     */
-    public function url($id)
-    {
-        return '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$id.'">'.img_object('', "company").'</a>';
-    }
+	/**
+	 *  Can include an URL link on each record provided by selector	shown on target page.
+	 *
+	 *  @param	int		$id		ID
+	 *  @return string      	Url link
+	 */
+	public function url($id)
+	{
+		return '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$id.'">'.img_object('', "company").'</a>';
+	}
 }
diff --git a/htdocs/core/modules/mailings/xinputfile.modules.php b/htdocs/core/modules/mailings/xinputfile.modules.php
index 3ab0735429e..afc691f3e2e 100644
--- a/htdocs/core/modules/mailings/xinputfile.modules.php
+++ b/htdocs/core/modules/mailings/xinputfile.modules.php
@@ -30,31 +30,31 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
  */
 class mailing_xinputfile extends MailingTargets
 {
-    public $name = 'EmailsFromFile'; // Identifiant du module mailing
-    // This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
-    public $desc = 'EMails from a file'; // Libelle utilise si aucune traduction pour MailingModuleDescXXX ou XXX=name trouv�e
-    public $require_module = array(); // Module mailing actif si modules require_module actifs
-    public $require_admin = 0; // Module mailing actif pour user admin ou non
+	public $name = 'EmailsFromFile'; // Identifiant du module mailing
+	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
+	public $desc = 'EMails from a file'; // Libelle utilise si aucune traduction pour MailingModuleDescXXX ou XXX=name trouv�e
+	public $require_module = array(); // Module mailing actif si modules require_module actifs
+	public $require_admin = 0; // Module mailing actif pour user admin ou non
 
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto = 'generic';
-    public $tooltip = 'UseFormatFileEmailToTarget';
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'generic';
+	public $tooltip = 'UseFormatFileEmailToTarget';
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB      $db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB      $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
+	/**
 	 *	On the main mailing area, there is a box with statistics.
 	 *	If you want to add a line in this report you must provide an
 	 *	array of SQL request that returns two field:
@@ -62,7 +62,7 @@ class mailing_xinputfile extends MailingTargets
 	 *
 	 *	@return		array		Array with SQL requests
 	 */
-    public function getSqlArrayForStats()
+	public function getSqlArrayForStats()
 	{
 		global $langs;
 		$langs->load("users");
@@ -80,7 +80,7 @@ class mailing_xinputfile extends MailingTargets
 	 *  @param      string	$sql        Sql request to count
 	 *	@return		string				'' means NA
 	 */
-    public function getNbOfRecipients($sql = '')
+	public function getNbOfRecipients($sql = '')
 	{
 		return '';
 	}
@@ -89,10 +89,10 @@ class mailing_xinputfile extends MailingTargets
 	/**
 	 *  Renvoie url lien vers fiche de la source du destinataire du mailing
 	 *
-     *  @param	int		$id		ID
+	 *  @param	int		$id		ID
 	 *  @return string      	Url lien
 	 */
-    public function url($id)
+	public function url($id)
 	{
 		global $langs;
 		return $langs->trans('LineInFile', $id);
@@ -105,7 +105,7 @@ class mailing_xinputfile extends MailingTargets
 	 *
 	 *   @return     string      Retourne zone select
 	 */
-    public function formFilter()
+	public function formFilter()
 	{
 		global $langs;
 
@@ -114,16 +114,16 @@ class mailing_xinputfile extends MailingTargets
 		return $s;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Ajoute destinataires dans table des cibles
 	 *
 	 *  @param	int		$mailing_id    	Id of emailing
 	 *  @return int           			< 0 si erreur, nb ajout si ok
 	 */
-    public function add_to_target($mailing_id)
+	public function add_to_target($mailing_id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs, $_FILES;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -147,53 +147,53 @@ class mailing_xinputfile extends MailingTargets
 				if ($handle)
 				{
 					$i = 0;
-		            $j = 0;
+					$j = 0;
 
-            		$old = '';
+					$old = '';
 					while (!feof($handle))
 					{
 						$cpt++;
-				        $buffer = trim(fgets($handle));
-			        	$tab = explode(';', $buffer, 4);
-				        $email = $tab[0];
-				        $name = $tab[1];
-				        $firstname = $tab[2];
-				        $other = $tab[3];
-				        if (!empty($buffer))
-				        {
-			        		//print 'xx'.dol_strlen($buffer).empty($buffer)."<br>\n";
-				        	$id = $cpt;
-					        if (isValidEMail($email))
-					        {
+						$buffer = trim(fgets($handle));
+						$tab = explode(';', $buffer, 4);
+						$email = $tab[0];
+						$name = $tab[1];
+						$firstname = $tab[2];
+						$other = $tab[3];
+						if (!empty($buffer))
+						{
+							//print 'xx'.dol_strlen($buffer).empty($buffer)."<br>\n";
+							$id = $cpt;
+							if (isValidEMail($email))
+							{
 		   						if ($old <> $email)
 								{
 									$cibles[$j] = array(
-					                    			'email' => $email,
-					                    			'lastname' => $name,
-					                    			'firstname' => $firstname,
+													'email' => $email,
+													'lastname' => $name,
+													'firstname' => $firstname,
 													'other' => $other,
-                                                    'source_url' => '',
-                                                    'source_id' => '',
-                                                    'source_type' => 'file'
+													'source_url' => '',
+													'source_id' => '',
+													'source_type' => 'file'
 									);
 									$old = $email;
 									$j++;
 								}
-					        } else {
-					        	$i++;
-					        	$langs->load("errors");
-                                $msg = $langs->trans("ErrorFoundBadEmailInFile", $i, $cpt, $email);
-					        	if (!empty($msg)) $this->error = $msg;
-                                else $this->error = 'ErrorFoundBadEmailInFile '.$i.' '.$cpt.' '.$email; // We experience case where $langs->trans return an empty string.
-					        }
-				        }
-				    }
-				    fclose($handle);
+							} else {
+								$i++;
+								$langs->load("errors");
+								$msg = $langs->trans("ErrorFoundBadEmailInFile", $i, $cpt, $email);
+								if (!empty($msg)) $this->error = $msg;
+								else $this->error = 'ErrorFoundBadEmailInFile '.$i.' '.$cpt.' '.$email; // We experience case where $langs->trans return an empty string.
+							}
+						}
+					}
+					fclose($handle);
 
-				    if ($i > 0)
-				    {
-				    	return -$i;
-				    }
+					if ($i > 0)
+					{
+						return -$i;
+					}
 				} else {
 					$this->error = $langs->trans("ErrorFaildToOpenFile");
 					return -1;
diff --git a/htdocs/core/modules/mailings/xinputuser.modules.php b/htdocs/core/modules/mailings/xinputuser.modules.php
index 72614d39e9d..9c6748a10c8 100644
--- a/htdocs/core/modules/mailings/xinputuser.modules.php
+++ b/htdocs/core/modules/mailings/xinputuser.modules.php
@@ -48,13 +48,13 @@ class mailing_xinputuser extends MailingTargets
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		$this->db = $db;
 	}
 
 
-    /**
+	/**
 	 *	On the main mailing area, there is a box with statistics.
 	 *	If you want to add a line in this report you must provide an
 	 *	array of SQL request that returns two field:
@@ -62,7 +62,7 @@ class mailing_xinputuser extends MailingTargets
 	 *
 	 *	@return		array		Array with SQL requests
 	 */
-    public function getSqlArrayForStats()
+	public function getSqlArrayForStats()
 	{
 		global $langs;
 		$langs->load("users");
@@ -80,7 +80,7 @@ class mailing_xinputuser extends MailingTargets
 	 *  @param      string	$sql   	Sql request to count
 	 *	@return		string			'' means NA
 	 */
-    public function getNbOfRecipients($sql = '')
+	public function getNbOfRecipients($sql = '')
 	{
 		return '';
 	}
@@ -89,10 +89,10 @@ class mailing_xinputuser extends MailingTargets
 	/**
 	 *  Renvoie url lien vers fiche de la source du destinataire du mailing
 	 *
-     *  @param	int		$id		ID
+	 *  @param	int		$id		ID
 	 *  @return string      	Url lien
 	 */
-    public function url($id)
+	public function url($id)
 	{
 		return '';
 	}
@@ -103,7 +103,7 @@ class mailing_xinputuser extends MailingTargets
 	 *
 	 *   @return     string      Retourne zone select
 	 */
-    public function formFilter()
+	public function formFilter()
 	{
 		global $langs;
 
@@ -112,16 +112,16 @@ class mailing_xinputuser extends MailingTargets
 		return $s;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Ajoute destinataires dans table des cibles
 	 *
 	 *  @param	int		$mailing_id    	Id of emailing
 	 *  @return int           			< 0 si erreur, nb ajout si ok
 	 */
-    public function add_to_target($mailing_id)
+	public function add_to_target($mailing_id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs, $_FILES;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -133,18 +133,18 @@ class mailing_xinputuser extends MailingTargets
 		$other = $tmparray[3];
 
 		$cibles = array();
-        if (!empty($email))
-        {
+		if (!empty($email))
+		{
 			if (isValidEMail($email))
 			{
 				$cibles[] = array(
-           			'email' => $email,
-           			'lastname' => $lastname,
-           			'firstname' => $firstname,
+		   			'email' => $email,
+		   			'lastname' => $lastname,
+		   			'firstname' => $firstname,
 					'other' => $other,
-                    'source_url' => '',
-                    'source_id' => '',
-                    'source_type' => 'file'
+					'source_url' => '',
+					'source_id' => '',
+					'source_type' => 'file'
 				);
 
 				return parent::addTargetsToDatabase($mailing_id, $cibles);
@@ -154,8 +154,8 @@ class mailing_xinputuser extends MailingTargets
 				return -1;
 			}
 		} else {
-            $langs->load("errors");
-            $this->error = $langs->trans("ErrorBadEmail", $email);
+			$langs->load("errors");
+			$this->error = $langs->trans("ErrorBadEmail", $email);
 			return -1;
 		}
 	}
diff --git a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
new file mode 100644
index 00000000000..be91acd7a3f
--- /dev/null
+++ b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
@@ -0,0 +1,419 @@
+<?php
+/* Copyright (C) 2010-2012 	Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2018       Frédéric 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
+* the Free Software Foundation; either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <https://www.gnu.org/licenses/>.
+* or see https://www.gnu.org/
+*/
+
+/**
+ *	\file       htdocs/core/modules/member/doc/doc_generic_member_odt.modules.php
+ *	\ingroup    societe
+ *	\brief      File of class to build ODT documents for members
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/modules/member/modules_member.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
+
+
+/**
+ *	Class to build documents using ODF templates generator
+ */
+class doc_generic_member_odt extends ModelePDFMember
+{
+	/**
+	 * @var Societe Issuer
+	 */
+	public $emetteur;
+
+	/**
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
+	public $phpmin = array(5, 6);
+
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr';
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf, $langs, $mysoc;
+
+		// Load translation files required by the page
+		$langs->loadLangs(array("main", "companies"));
+
+		$this->db = $db;
+		$this->name = "ODT templates";
+		$this->description = $langs->trans("DocumentModelOdt");
+		$this->scandir = 'MEMBER_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
+
+		// Page size for A4 format
+		$this->type = 'odt';
+		$this->page_largeur = 0;
+		$this->page_hauteur = 0;
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = 0;
+		$this->marge_droite = 0;
+		$this->marge_haute = 0;
+		$this->marge_basse = 0;
+
+		$this->option_logo = 1; // Affiche logo
+		$this->option_tva = 0; // Gere option tva MEMBER_TVAOPTION
+		$this->option_modereg = 0; // Affiche mode reglement
+		$this->option_condreg = 0; // Affiche conditions reglement
+		$this->option_codeproduitservice = 0; // Affiche code produit-service
+		$this->option_multilang = 1; // Dispo en plusieurs langues
+		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_credit_note = 0; // Support credit notes
+		$this->option_freetext = 1; // Support add of a personalised text
+		$this->option_draft_watermark = 0; // Support add of a watermark on drafts
+
+		// Recupere emetteur
+		$this->emetteur = $mysoc;
+		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+	}
+
+
+	/**
+	 *	Return description of a module
+	 *
+	 *	@param	Translate	$langs      Lang object to use for output
+	 *	@return string       			Description
+	 */
+	public function info($langs)
+	{
+		global $conf, $langs;
+
+		// Load translation files required by the page
+		$langs->loadLangs(array('companies', 'errors'));
+
+		$form = new Form($this->db);
+
+		$texte = $this->description.".<br>\n";
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" enctype="multipart/form-data">';
+		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
+		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
+		$texte .= '<input type="hidden" name="param1" value="MEMBER_ADDON_PDF_ODT_PATH">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		// List of directories area
+		$texte .= '<tr><td>';
+		$texttitle = $langs->trans("ListOfDirectories");
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->MEMBER_ADDON_PDF_ODT_PATH)));
+		$listoffiles = array();
+		foreach ($listofdir as $key=>$tmpdir)
+		{
+			$tmpdir = trim($tmpdir);
+			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
+			if (!$tmpdir) {
+				unset($listofdir[$key]); continue;
+			}
+			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			else {
+				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
+				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+			}
+		}
+		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
+		// Add list of substitution keys
+		$texthelp .= '<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
+		$texthelp .= $langs->transnoentitiesnoconv("FullListOnOnlineDocumentation"); // This contains an url, we don't modify it
+
+		$texte .= $form->textwithpicto($texttitle, $texthelp, 1, 'help', '', 1);
+		$texte .= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
+		$texte .= '<textarea class="flat" cols="60" name="value1">';
+		$texte .= $conf->global->MEMBER_ADDON_PDF_ODT_PATH;
+		$texte .= '</textarea>';
+		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
+		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<br></div></div>';
+
+		// Scan directories
+		if (count($listofdir))
+		{
+			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
+			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
+			foreach ($listoffiles as $file) {
+				$texte .= $file['name'].'<br>';
+			}
+			$texte .= '</div>';
+		}
+		// Add input to upload a new template file.
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte .= '<input type="hidden" value="MEMBER_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
+		$texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '</div>';
+		$texte .= '</td>';
+
+		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
+		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</td>';
+		$texte .= '</tr>';
+
+		$texte .= '</table>';
+		$texte .= '</form>';
+
+		return $texte;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Function to build a document on disk using the generic odt module.
+	 *
+	 *	@param	Adherent	$object				Object source to build document
+	 *	@param	Translate	$outputlangs		Lang output object
+	 * 	@param	string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *	@param	string		$mode				Tell if doc module is called for 'member', ...
+	 *  @param  int         $nooutput           1=Generate only file on disk and do not return it on response
+	 *	@return	int         					1 if OK, <=0 if KO
+	 */
+	public function write_file($object, $outputlangs, $srctemplatepath, $mode = 'member', $nooutput = 0)
+	{
+		// phpcs:enable
+		global $user, $langs, $conf, $mysoc, $hookmanager;
+
+		if (empty($srctemplatepath)) {
+			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
+			return -1;
+		}
+
+		// Add odtgeneration hook
+		if (!is_object($hookmanager))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+			$hookmanager = new HookManager($this->db);
+		}
+		$hookmanager->initHooks(array('odtgeneration'));
+		global $action;
+
+		if (!is_object($outputlangs)) $outputlangs = $langs;
+		$sav_charset_output = $outputlangs->charset_output;
+		$outputlangs->charset_output = 'UTF-8';
+
+		// Load translation files required by the page
+		$outputlangs->loadLangs(array("main", "companies", "bills", "dict"));
+
+		if ($conf->adherent->dir_output) {
+			// If $object is id instead of object
+			if (!is_object($object)) {
+				$id = $object;
+				$object = new User($this->db);
+				$result = $object->fetch($id);
+				if ($result < 0) {
+					dol_print_error($this->db, $object->error);
+					return -1;
+				}
+			}
+
+			$object->fetch_thirdparty();
+
+			$dir = $conf->adherent->dir_output;
+			$objectref = dol_sanitizeFileName($object->ref);
+			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			$file = $dir."/".$objectref.".odt";
+
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+					return -1;
+				}
+			}
+
+			if (file_exists($dir)) {
+				//print "srctemplatepath=".$srctemplatepath;	// Src filename
+				$newfile = basename($srctemplatepath);
+				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
+				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
+
+				$newfiletmp = $objectref.'_'.$newfiletmp;
+
+				// Get extension (ods or odt)
+				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
+				if (!empty($conf->global->MAIN_DOC_USE_TIMING)) {
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
+				} else {
+					$filename = $newfiletmp.'.'.$newfileformat;
+				}
+				$file = $dir.'/'.$filename;
+				//print "newdir=".$dir;
+				//print "newfile=".$newfile;
+				//print "file=".$file;
+				//print "conf->adherent->dir_temp=".$conf->adherent->dir_temp;
+
+				dol_mkdir($conf->adherent->dir_temp);
+
+
+				// If CUSTOMER contact defined on member, we use it
+				$usecontact = false;
+				$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
+				if (count($arrayidcontact) > 0) {
+					$usecontact = true;
+					$result = $object->fetch_contact($arrayidcontact[0]);
+				}
+
+				// Recipient name
+				if (!empty($usecontact)) {
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+						$socobject = $object->contact;
+					} else {
+						$socobject = $object->thirdparty;
+						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+						$contactobject = $object->contact;
+					}
+				} else {
+					$socobject = $object->thirdparty;
+				}
+
+				// Open and load template
+				require_once ODTPHP_PATH.'odf.php';
+				try {
+					$odfHandler = new odf(
+						$srctemplatepath,
+						array(
+							'PATH_TO_TMP'	  => $conf->adherent->dir_temp,
+							'ZIP_PROXY'		  => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
+							'DELIMITER_LEFT'  => '{',
+							'DELIMITER_RIGHT' => '}'
+						)
+					);
+				} catch (Exception $e)
+				{
+					$this->error = $e->getMessage();
+					dol_syslog($e->getMessage(), LOG_WARNING);
+					return -1;
+				}
+
+				// Make substitutions into odt
+				$array_member = $this->getSubstitutionarrayMember($object, $outputlangs);
+				$array_soc = $this->get_substitutionarray_mysoc($mysoc, $outputlangs);
+				$array_thirdparty = $this->get_substitutionarray_thirdparty($socobject, $outputlangs);
+				$array_other = $this->get_substitutionarray_other($outputlangs);
+				// retrieve contact information for use in object as contact_xxx tags
+				$array_thirdparty_contact = array();
+				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+
+				$tmparray = array_merge($array_member, $array_soc, $array_thirdparty, $array_other, $array_thirdparty_contact);
+				complete_substitutions_array($tmparray, $outputlangs, $object);
+				// Call the ODTSubstitution hook
+				$parameters = array(
+					'file'=>$file,
+					'object'=>$object,
+					'outputlangs'=>$outputlangs,
+					'substitutionarray'=>&$tmparray
+				);
+				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+				foreach ($tmparray as $key=>$value) {
+					try {
+						if (preg_match('/logo$/', $key)) {
+							// Image
+							if (file_exists($value)) $odfHandler->setImage($key, $value);
+							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						} else {
+							// Text
+							$odfHandler->setVars($key, $value, true, 'UTF-8');
+						}
+					} catch (OdfException $e) {
+						dol_syslog($e->getMessage(), LOG_WARNING);
+					}
+				}
+
+				// Replace labels translated
+				$tmparray = $outputlangs->get_translations_for_substitutions();
+				foreach ($tmparray as $key=>$value) {
+					try {
+						$odfHandler->setVars($key, $value, true, 'UTF-8');
+					} catch (OdfException $e) {
+						dol_syslog($e->getMessage(), LOG_WARNING);
+					}
+				}
+
+				// Call the beforeODTSave hook
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$reshook = $hookmanager->executeHooks('beforeODTSave', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+
+				// Write new file
+				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
+					try {
+						$odfHandler->exportAsAttachedPDF($file);
+					} catch (Exception $e) {
+						$this->error = $e->getMessage();
+						dol_syslog($e->getMessage(), LOG_WARNING);
+						return -1;
+					}
+				} else {
+					try {
+						$odfHandler->saveToDisk($file);
+					} catch (Exception $e) {
+						$this->error = $e->getMessage();
+						dol_syslog($e->getMessage(), LOG_WARNING);
+						return -1;
+					}
+				}
+
+				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+
+				if (!empty($conf->global->MAIN_UMASK))
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
+
+				$odfHandler = null; // Destroy object
+
+				$this->result = array('fullpath'=>$file);
+
+				return 1; // Success
+			} else {
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+				return -1;
+			}
+		}
+
+		return -1;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * get substitution array for object
+	 *
+	 * @param Adherent      $object         member
+	 * @param Translate     $outputlangs    translation object
+	 * @param string        $array_key      key for array
+	 * @return array                        array of substitutions
+	 */
+	public function get_substitutionarray_object($object, $outputlangs, $array_key = 'object')
+	{
+		// phpcs:enable
+		$array_other = array();
+		foreach ($object as $key => $value) {
+			if (!is_array($value) && !is_object($value)) {
+				$array_other[$array_key.'_'.$key] = $value;
+			}
+		}
+		return $array_other;
+	}
+}
diff --git a/htdocs/core/modules/member/doc/pdf_standard.class.php b/htdocs/core/modules/member/doc/pdf_standard.class.php
index e6fd6d04091..3cecb685f1d 100644
--- a/htdocs/core/modules/member/doc/pdf_standard.class.php
+++ b/htdocs/core/modules/member/doc/pdf_standard.class.php
@@ -242,68 +242,68 @@ class pdf_standard extends CommonStickerGenerator
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath, $mode = 'member', $nooutput = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $conf, $langs, $mysoc, $_Avery_Labels;
 
 		$this->code = $srctemplatepath;
 
 		if (is_object($object))
 		{
-		    if ($object->country == '-') $object->country = '';
+			if ($object->country == '-') $object->country = '';
 
 			$now = dol_now();
 			$year = dol_print_date($now, '%Y');
 			$month = dol_print_date($now, '%m');
 			$day = dol_print_date($now, '%d');
 
-    		// List of values to scan for a replacement
-    		$substitutionarray = array(
-    		    '__ID__' => $object->id,
-    		    '__LOGIN__'=>$object->login,
-    		    '__FIRSTNAME__'=>$object->firstname,
-    		    '__LASTNAME__'=>$object->lastname,
-    		    '__FULLNAME__'=>$object->getFullName($langs),
-    		    '__COMPANY__'=>$object->company,
-    		    '__ADDRESS__'=>$object->address,
-    		    '__ZIP__'=>$object->zip,
-    		    '__TOWN__'=>$object->town,
-    		    '__COUNTRY__'=>$object->country,
-    		    '__COUNTRY_CODE__'=>$object->country_code,
-    		    '__EMAIL__'=>$object->email,
-    		    '__BIRTH__'=>dol_print_date($object->birth, 'day'),
-    		    '__TYPE__'=>$object->type,
-    		    '__YEAR__'=>$year,
-    		    '__MONTH__'=>$month,
-    		    '__DAY__'=>$day,
-    		    '__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
-    		    '__SERVER__'=>"http://".$_SERVER["SERVER_NAME"]."/"
-    		);
-    		complete_substitutions_array($substitutionarray, $langs);
+			// List of values to scan for a replacement
+			$substitutionarray = array(
+				'__ID__' => $object->id,
+				'__LOGIN__'=>$object->login,
+				'__FIRSTNAME__'=>$object->firstname,
+				'__LASTNAME__'=>$object->lastname,
+				'__FULLNAME__'=>$object->getFullName($langs),
+				'__COMPANY__'=>$object->company,
+				'__ADDRESS__'=>$object->address,
+				'__ZIP__'=>$object->zip,
+				'__TOWN__'=>$object->town,
+				'__COUNTRY__'=>$object->country,
+				'__COUNTRY_CODE__'=>$object->country_code,
+				'__EMAIL__'=>$object->email,
+				'__BIRTH__'=>dol_print_date($object->birth, 'day'),
+				'__TYPE__'=>$object->type,
+				'__YEAR__'=>$year,
+				'__MONTH__'=>$month,
+				'__DAY__'=>$day,
+				'__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
+				'__SERVER__'=>"http://".$_SERVER["SERVER_NAME"]."/"
+			);
+			complete_substitutions_array($substitutionarray, $langs);
 
-    		// For business cards
-		    $textleft = make_substitutions($conf->global->ADHERENT_CARD_TEXT, $substitutionarray);
-		    $textheader = make_substitutions($conf->global->ADHERENT_CARD_HEADER_TEXT, $substitutionarray);
-		    $textfooter = make_substitutions($conf->global->ADHERENT_CARD_FOOTER_TEXT, $substitutionarray);
-		    $textright = make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
+			// For business cards
+			$textleft = make_substitutions($conf->global->ADHERENT_CARD_TEXT, $substitutionarray);
+			$textheader = make_substitutions($conf->global->ADHERENT_CARD_HEADER_TEXT, $substitutionarray);
+			$textfooter = make_substitutions($conf->global->ADHERENT_CARD_FOOTER_TEXT, $substitutionarray);
+			$textright = make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
 
-		    $nb = $_Avery_Labels[$this->code]['NX'] * $_Avery_Labels[$this->code]['NY'];
-		    if ($nb <= 0) $nb = 1; // Protection to avoid empty page
+			$nb = $_Avery_Labels[$this->code]['NX'] * $_Avery_Labels[$this->code]['NY'];
+			if ($nb <= 0) $nb = 1; // Protection to avoid empty page
 
-		    for ($j = 0; $j < $nb; $j++)
-	        {
-	            $arrayofmembers[] = array(
-	                'textleft'=>$textleft,
-	                'textheader'=>$textheader,
-	                'textfooter'=>$textfooter,
-	                'textright'=>$textright,
-	                'id'=>$object->rowid,
-	                'photo'=>$object->photo
-	            );
-	        }
+			for ($j = 0; $j < $nb; $j++)
+			{
+				$arrayofmembers[] = array(
+					'textleft'=>$textleft,
+					'textheader'=>$textheader,
+					'textfooter'=>$textfooter,
+					'textright'=>$textright,
+					'id'=>$object->rowid,
+					'photo'=>$object->photo
+				);
+			}
 
-    		$arrayofrecords = $arrayofmembers;
+			$arrayofrecords = $arrayofmembers;
 		} else {
-		    $arrayofrecords = $object;
+			$arrayofrecords = $object;
 		}
 
 		//var_dump($arrayofrecords);exit;
diff --git a/htdocs/core/modules/member/modules_cards.php b/htdocs/core/modules/member/modules_cards.php
index 65e9caef561..a6de637b24f 100644
--- a/htdocs/core/modules/member/modules_cards.php
+++ b/htdocs/core/modules/member/modules_cards.php
@@ -40,7 +40,7 @@ class ModelePDFCards
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return list of active generation modules
 	 *
@@ -50,7 +50,7 @@ class ModelePDFCards
 	 */
 	public function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'member';
@@ -78,7 +78,7 @@ class ModelePDFCards
  */
 function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $outputdir = '', $template = 'standard')
 {
-    // phpcs:enable
+	// phpcs:enable
 	global $conf, $langs;
 	$langs->load("members");
 
diff --git a/htdocs/core/modules/member/modules_member.class.php b/htdocs/core/modules/member/modules_member.class.php
new file mode 100644
index 00000000000..2166fd9ccb7
--- /dev/null
+++ b/htdocs/core/modules/member/modules_member.class.php
@@ -0,0 +1,66 @@
+<?php
+/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+
+/**
+ *	    \class      ModeleProductCode
+ *		\brief  	Parent class for product code generators
+ */
+
+/**
+ *  \file       htdocs/core/modules/member/modules_member.php
+ *  \ingroup    members
+ *  \brief      File with parent class for generating members to PDF
+ */
+
+ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
+
+/**
+ *	Parent class to manage intervention document templates
+ */
+abstract class ModelePDFMember extends CommonDocGenerator
+{
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return list of active generation modules
+	 *
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
+	 */
+	public static function liste_modeles($db, $maxfilenamelength = 0)
+	{
+		// phpcs:enable
+
+		$type = 'member';
+		$list = array();
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$list = getListOfModels($db, $type, $maxfilenamelength);
+		return $list;
+	}
+}
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index e769441288f..811dd57544e 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -173,15 +173,15 @@ class modAccounting extends DolibarrModules
 		$this->rights = array(); // Permission array used by this module
 		$r = 0;
 
-        $this->rights[$r][0] = 50440;
-        $this->rights[$r][1] = 'Manage chart of accounts, setup of accountancy';
-        $this->rights[$r][2] = 'r';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'chartofaccount';
-        $this->rights[$r][5] = '';
-        $r++;
+		$this->rights[$r][0] = 50440;
+		$this->rights[$r][1] = 'Manage chart of accounts, setup of accountancy';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'chartofaccount';
+		$this->rights[$r][5] = '';
+		$r++;
 
-        $this->rights[$r][0] = 50401;
+		$this->rights[$r][0] = 50401;
 		$this->rights[$r][1] = 'Bind products and invoices with accounting accounts';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
@@ -205,29 +205,29 @@ class modAccounting extends DolibarrModules
 		$this->rights[$r][5] = 'creer';
 		$r++;
 
-        $this->rights[$r][0] = 50414;
-        $this->rights[$r][1] = 'Delete operations in Ledger';
-        $this->rights[$r][2] = 'd';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'mouvements';
-        $this->rights[$r][5] = 'supprimer';
-        $r++;
+		$this->rights[$r][0] = 50414;
+		$this->rights[$r][1] = 'Delete operations in Ledger';
+		$this->rights[$r][2] = 'd';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'mouvements';
+		$this->rights[$r][5] = 'supprimer';
+		$r++;
 
-        $this->rights[$r][0] = 50415;
-        $this->rights[$r][1] = 'Delete all operations by year and journal in Ledger';
-        $this->rights[$r][2] = 'd';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'mouvements';
-        $this->rights[$r][5] = 'supprimer_tous';
-        $r++;
+		$this->rights[$r][0] = 50415;
+		$this->rights[$r][1] = 'Delete all operations by year and journal in Ledger';
+		$this->rights[$r][2] = 'd';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'mouvements';
+		$this->rights[$r][5] = 'supprimer_tous';
+		$r++;
 
-        $this->rights[$r][0] = 50418;
-        $this->rights[$r][1] = 'Export operations of the Ledger';
-        $this->rights[$r][2] = 'r';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'mouvements';
-        $this->rights[$r][5] = 'export';
-        $r++;
+		$this->rights[$r][0] = 50418;
+		$this->rights[$r][1] = 'Export operations of the Ledger';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'mouvements';
+		$this->rights[$r][5] = 'export';
+		$r++;
 
 		$this->rights[$r][0] = 50420;
 		$this->rights[$r][1] = 'Report and export reports (turnover, balance, journals, ledger)';
@@ -264,7 +264,7 @@ class modAccounting extends DolibarrModules
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'accounting_account as aa';
-        $this->export_sql_end[$r] .= ' ,'.MAIN_DB_PREFIX.'accounting_system as ac';
+		$this->export_sql_end[$r] .= ' ,'.MAIN_DB_PREFIX.'accounting_system as ac';
 		$this->export_sql_end[$r] .= ' WHERE ac.pcg_version = aa.fk_pcg_version AND aa.entity IN ('.getEntity('accounting').') ';
 
 
@@ -284,33 +284,33 @@ class modAccounting extends DolibarrModules
 			'b.doc_date'=>"Docdate",
 			//'b.doc_type'=>'Doctype',
 			'b.doc_ref'=>'Piece',
-            'b.code_journal'=>'Codejournal',
-            //'b.journal_label'=>'JournalLabel',
-            'b.numero_compte'=>'AccountAccounting',
-            //'b.label_compte'=>'LabelAccount',
-            'b.subledger_account'=>'SubledgerAccount',
-            'b.subledger_label'=>'SubledgerAccountLabel',
-            'b.label_operation'=>'LabelOperation',
-            'b.debit'=>"Debit",
-            'b.credit'=>"Credit"
-        );
+			'b.code_journal'=>'Codejournal',
+			//'b.journal_label'=>'JournalLabel',
+			'b.numero_compte'=>'AccountAccounting',
+			//'b.label_compte'=>'LabelAccount',
+			'b.subledger_account'=>'SubledgerAccount',
+			'b.subledger_label'=>'SubledgerAccountLabel',
+			'b.label_operation'=>'LabelOperation',
+			'b.debit'=>"Debit",
+			'b.credit'=>"Credit"
+		);
 		$this->import_fieldshidden_array[$r] = array('b.doc_type'=>'const-import_from_external', 'b.fk_doc'=>'const-0', 'b.fk_docdet'=>'const-0', 'b.fk_user_author'=>'user->id', 'b.date_creation'=>'const-'.dol_print_date(dol_now(), 'standard')); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
 		$this->import_regex_array[$r] = array('b.doc_date'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
 		$this->import_examplevalues_array[$r] = array(
-		    'b.piece_num'=>'123 (!!! use next value not already used)',
+			'b.piece_num'=>'123 (!!! use next value not already used)',
 			'b.doc_date'=>dol_print_date(dol_now(), "%Y-%m-%d"),
 			//'b.doc_type'=>'import',
 			'b.doc_ref'=>'My document ABC',
-            'b.code_journal'=>"VTE",
-            //'b.journal_label'=>"Sale journal",
-            'b.numero_compte'=>"707",
-            //'b.label_compte'=>'Product account 707',
-            'b.subledger_account'=>'',
-            'b.subledger_label'=>'',
-            'b.label_operation'=>"Sale of ABC",
-            'b.debit'=>"0",
-            'b.credit'=>"100"
-        );
+			'b.code_journal'=>"VTE",
+			//'b.journal_label'=>"Sale journal",
+			'b.numero_compte'=>"707",
+			//'b.label_compte'=>'Product account 707',
+			'b.subledger_account'=>'',
+			'b.subledger_label'=>'',
+			'b.label_operation'=>"Sale of ABC",
+			'b.debit'=>"0",
+			'b.credit'=>"100"
+		);
 
 		// Chart of accounts
 		$r++;
@@ -323,8 +323,8 @@ class modAccounting extends DolibarrModules
 		$this->import_fields_array[$r] = array('aa.fk_pcg_version'=>"Chartofaccounts*", 'aa.account_number'=>"AccountAccounting*", 'aa.label'=>"Label*", 'aa.account_parent'=>"Accountparent", "aa.fk_accounting_category"=>"AccountingCategory", "aa.pcg_type"=>"Pcgtype*", 'aa.active'=>'Status*', 'aa.datec'=>"DateCreation");
 		$this->import_regex_array[$r] = array('aa.fk_pcg_version'=>'pcg_version@'.MAIN_DB_PREFIX.'accounting_system', 'aa.account_number'=>'^.{1,32}$', 'aa.label'=>'^.{1,255}$', 'aa.account_parent'=>'^.{0,32}$', 'aa.fk_accounting_category'=>'rowid@'.MAIN_DB_PREFIX.'c_accounting_category', 'aa.pcg_type'=>'^.{1,20}$', 'aa.active'=>'^0|1$', 'aa.datec'=>'^\d{4}-\d{2}-\d{2}$');
 		$this->import_convertvalue_array[$r] = array(
-		    'aa.account_parent'=>array('rule'=>'fetchidfromref', 'classfile'=>'/accountancy/class/accountingaccount.class.php', 'class'=>'AccountingAccount', 'method'=>'fetch', 'element'=>'AccountingAccount'),
-		    'aa.fk_accounting_category'=>array('rule'=>'fetchidfromcodeorlabel', 'classfile'=>'/accountancy/class/accountancycategory.class.php', 'class'=>'AccountancyCategory', 'method'=>'fetch', 'dict'=>'DictionaryAccountancyCategory'),
+			'aa.account_parent'=>array('rule'=>'fetchidfromref', 'classfile'=>'/accountancy/class/accountingaccount.class.php', 'class'=>'AccountingAccount', 'method'=>'fetch', 'element'=>'AccountingAccount'),
+			'aa.fk_accounting_category'=>array('rule'=>'fetchidfromcodeorlabel', 'classfile'=>'/accountancy/class/accountancycategory.class.php', 'class'=>'AccountancyCategory', 'method'=>'fetch', 'dict'=>'DictionaryAccountancyCategory'),
 		);
 		$this->import_examplevalues_array[$r] = array('aa.fk_pcg_version'=>"PCG99-ABREGE", 'aa.account_number'=>"707", 'aa.label'=>"Product sales", 'aa.account_parent'=>"ref:7 or id:1407", "aa.fk_accounting_category"=>"", "aa.pcg_type"=>"PROD", 'aa.active'=>'1', 'aa.datec'=>"2017-04-28");
 		$this->import_updatekeys_array[$r] = array('aa.fk_pcg_version'=>'Chartofaccounts', 'aa.account_number'=>'AccountAccounting');
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index 911a4bbd5b9..1db3e2b7d50 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -37,360 +37,370 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modAdherent extends DolibarrModules
 {
 
-    /**
-     *   Constructor. Define names, constants, directories, boxes, permissions
-     *
-     *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        global $conf;
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf;
 
-        $this->db = $db;
-        $this->numero = 310;
+		$this->db = $db;
+		$this->numero = 310;
 
-        $this->family = "hr";
-        $this->module_position = '06';
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        $this->description = "Management of members of a foundation or association";
-        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        $this->picto = 'member';
+		$this->family = "hr";
+		$this->module_position = '06';
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		$this->description = "Management of members of a foundation or association";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'dolibarr';
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		$this->picto = 'member';
 
-        // Data directories to create when module is enabled
-        $this->dirs = array("/adherent/temp");
+		// Data directories to create when module is enabled
+		$this->dirs = array(
+			"/adherent/temp",
+			"/doctemplates/members",
+		);
 
-        // Config pages
-        $this->config_page_url = array("adherent.php@adherents");
+		// Config pages
+		$this->config_page_url = array("adherent.php@adherents");
 
-        // Dependencies
-        $this->hidden = false; // A condition to hide module
-        $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
-        $this->requiredby = array(); // List of module ids to disable if this one is disabled
-        $this->conflictwith = array('modMailmanSpip'); // List of module class names as string this module is in conflict with
-        $this->langfiles = array("members", "companies");
-        $this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		// Dependencies
+		$this->hidden = false; // A condition to hide module
+		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of module ids to disable if this one is disabled
+		$this->conflictwith = array('modMailmanSpip'); // List of module class names as string this module is in conflict with
+		$this->langfiles = array("members", "companies");
+		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
 
-        // Constants
-        $this->const = array();
-        $r = 0;
+		// Constants
+		$this->const = array();
+		$r = 0;
 
-        $this->const[$r][0] = "ADHERENT_ADDON_PDF";
-        $this->const[$r][1] = "chaine";
-        $this->const[$r][2] = "standard";
-        $this->const[$r][3] = 'Name of PDF model of member';
-        $this->const[$r][4] = 0;
-        $r++;
+		$this->const[$r][0] = "ADHERENT_ADDON_PDF";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "standard";
+		$this->const[$r][3] = 'Name of PDF model of member';
+		$this->const[$r][4] = 0;
+		$r++;
 
-        // For emails
-        $this->const[$r][0] = "ADHERENT_MAIL_FROM";
-        $this->const[$r][1] = "chaine";
-        $this->const[$r][2] = "";
-        $this->const[$r][3] = "From des mails";
-        $this->const[$r][4] = 0;
-        $r++;
+		// For emails
+		$this->const[$r][0] = "ADHERENT_MAIL_FROM";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "";
+		$this->const[$r][3] = "From des mails";
+		$this->const[$r][4] = 0;
+		$r++;
 
-        $this->const[$r][0] = "ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER";
-        $this->const[$r][1] = "emailtemplate:member";
-        $this->const[$r][2] = "(SendingEmailOnAutoSubscription)";
-        $this->const[$r][3] = "";
-        $this->const[$r][4] = 0;
-        $r++;
+		$this->const[$r][0] = "ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER";
+		$this->const[$r][1] = "emailtemplate:member";
+		$this->const[$r][2] = "(SendingEmailOnAutoSubscription)";
+		$this->const[$r][3] = "";
+		$this->const[$r][4] = 0;
+		$r++;
 
-        $this->const[$r][0] = "ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION";
-        $this->const[$r][1] = "emailtemplate:member";
-        $this->const[$r][2] = "(SendingEmailOnNewSubscription)";
-        $this->const[$r][3] = "";
-        $this->const[$r][4] = 0;
-        $r++;
+		$this->const[$r][0] = "ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION";
+		$this->const[$r][1] = "emailtemplate:member";
+		$this->const[$r][2] = "(SendingEmailOnNewSubscription)";
+		$this->const[$r][3] = "";
+		$this->const[$r][4] = 0;
+		$r++;
 
-        $this->const[$r][0] = "ADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION";
-        $this->const[$r][1] = "emailtemplate:member";
-        $this->const[$r][2] = "(SendingReminderForExpiredSubscription)";
-        $this->const[$r][3] = "";
-        $this->const[$r][4] = 0;
-        $r++;
+		$this->const[$r][0] = "ADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION";
+		$this->const[$r][1] = "emailtemplate:member";
+		$this->const[$r][2] = "(SendingReminderForExpiredSubscription)";
+		$this->const[$r][3] = "";
+		$this->const[$r][4] = 0;
+		$r++;
 
-        $this->const[$r][0] = "ADHERENT_EMAIL_TEMPLATE_CANCELATION";
-        $this->const[$r][1] = "emailtemplate:member";
-        $this->const[$r][2] = "(SendingEmailOnCancelation)";
-        $this->const[$r][3] = "";
-        $this->const[$r][4] = 0;
-        $r++;
+		$this->const[$r][0] = "ADHERENT_EMAIL_TEMPLATE_CANCELATION";
+		$this->const[$r][1] = "emailtemplate:member";
+		$this->const[$r][2] = "(SendingEmailOnCancelation)";
+		$this->const[$r][3] = "";
+		$this->const[$r][4] = 0;
+		$r++;
 
-        // For cards
-        $this->const[$r][0] = "ADHERENT_CARD_HEADER_TEXT";
-        $this->const[$r][1] = "chaine";
-        $this->const[$r][2] = "__YEAR__";
-        $this->const[$r][3] = "Texte imprimé sur le haut de la carte adhérent";
-        $this->const[$r][4] = 0;
-        $r++;
+		// For cards
+		$this->const[$r][0] = "ADHERENT_CARD_HEADER_TEXT";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "__YEAR__";
+		$this->const[$r][3] = "Texte imprimé sur le haut de la carte adhérent";
+		$this->const[$r][4] = 0;
+		$r++;
 
-        $this->const[$r][0] = "ADHERENT_CARD_FOOTER_TEXT";
-        $this->const[$r][1] = "chaine";
-        $this->const[$r][2] = "__COMPANY__";
-        $this->const[$r][3] = "Texte imprimé sur le bas de la carte adhérent";
-        $this->const[$r][4] = 0;
-        $r++;
+		$this->const[$r][0] = "ADHERENT_CARD_FOOTER_TEXT";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "__COMPANY__";
+		$this->const[$r][3] = "Texte imprimé sur le bas de la carte adhérent";
+		$this->const[$r][4] = 0;
+		$r++;
 
-        $this->const[$r][0] = "ADHERENT_CARD_TEXT";
-        $this->const[$r][1] = "texte";
-        $this->const[$r][2] = "__FULLNAME__\r\nID: __ID__\r\n__EMAIL__\r\n__ADDRESS__\r\n__ZIP__ __TOWN__\r\n__COUNTRY__";
-        $this->const[$r][3] = "Text to print on member cards";
-        $this->const[$r][4] = 0;
-        $r++;
+		$this->const[$r][0] = "ADHERENT_CARD_TEXT";
+		$this->const[$r][1] = "texte";
+		$this->const[$r][2] = "__FULLNAME__\r\nID: __ID__\r\n__EMAIL__\r\n__ADDRESS__\r\n__ZIP__ __TOWN__\r\n__COUNTRY__";
+		$this->const[$r][3] = "Text to print on member cards";
+		$this->const[$r][4] = 0;
+		$r++;
 
-        $this->const[$r][0] = "ADHERENT_MAILMAN_ADMINPW";
-        $this->const[$r][1] = "chaine";
-        $this->const[$r][2] = "";
-        $this->const[$r][3] = "Mot de passe Admin des liste mailman";
-        $this->const[$r][4] = 0;
-        $r++;
+		$this->const[$r][0] = "ADHERENT_MAILMAN_ADMINPW";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "";
+		$this->const[$r][3] = "Mot de passe Admin des liste mailman";
+		$this->const[$r][4] = 0;
+		$r++;
 
-        $this->const[$r][0] = "ADHERENT_ETIQUETTE_TYPE";
-        $this->const[$r][1] = "chaine";
-        $this->const[$r][2] = "L7163";
-        $this->const[$r][3] = "Type of address sheets";
-        $this->const[$r][4] = 0;
-        $r++;
+		$this->const[$r][0] = "ADHERENT_ETIQUETTE_TYPE";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "L7163";
+		$this->const[$r][3] = "Type of address sheets";
+		$this->const[$r][4] = 0;
+		$r++;
 
-        $this->const[$r][0] = "ADHERENT_ETIQUETTE_TEXT";
-        $this->const[$r][1] = "texte";
-        $this->const[$r][2] = "__FULLNAME__\n__ADDRESS__\n__ZIP__ __TOWN__\n__COUNTRY%";
-        $this->const[$r][3] = "Text to print on member address sheets";
-        $this->const[$r][4] = 0;
-        $r++;
+		$this->const[$r][0] = "ADHERENT_ETIQUETTE_TEXT";
+		$this->const[$r][1] = "texte";
+		$this->const[$r][2] = "__FULLNAME__\n__ADDRESS__\n__ZIP__ __TOWN__\n__COUNTRY%";
+		$this->const[$r][3] = "Text to print on member address sheets";
+		$this->const[$r][4] = 0;
+		$r++;
 
-        // For subscriptions
-        $this->const[$r][0] = "ADHERENT_BANK_ACCOUNT";
-        $this->const[$r][1] = "chaine";
-        $this->const[$r][2] = "";
-        $this->const[$r][3] = "ID of bank account to use";
-        $this->const[$r][4] = 0;
-        $r++;
+		// For subscriptions
+		$this->const[$r][0] = "ADHERENT_BANK_ACCOUNT";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "";
+		$this->const[$r][3] = "ID of bank account to use";
+		$this->const[$r][4] = 0;
+		$r++;
 
-        $this->const[$r][0] = "ADHERENT_BANK_CATEGORIE";
-        $this->const[$r][1] = "chaine";
-        $this->const[$r][2] = "";
-        $this->const[$r][3] = "ID of bank transaction category to use";
-        $this->const[$r][4] = 0;
-        $r++;
+		$this->const[$r][0] = "ADHERENT_BANK_CATEGORIE";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "";
+		$this->const[$r][3] = "ID of bank transaction category to use";
+		$this->const[$r][4] = 0;
+		$r++;
+
+		$this->const[$r][0] = "MEMBER_ADDON_PDF_ODT_PATH";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/members";
+		$this->const[$r][3] = "";
+		$this->const[$r][4] = 0;
+		$r++;
 
 
-        // Boxes
-        //-------
-        $this->boxes = array(
+		// Boxes
+		//-------
+		$this->boxes = array(
 			0=>array('file'=>'box_members.php', 'enabledbydefaulton'=>'Home'),
 			2=>array('file'=>'box_birthdays_members.php', 'enabledbydefaulton'=>'Home')
 		);
 
-        // Permissions
-        //------------
-        $this->rights = array();
-        $this->rights_class = 'adherent';
-        $r = 0;
+		// Permissions
+		//------------
+		$this->rights = array();
+		$this->rights_class = 'adherent';
+		$r = 0;
 
-        // $this->rights[$r][0]     Id permission (unique tous modules confondus)
-        // $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
-        // $this->rights[$r][2]     Non utilise
-        // $this->rights[$r][3]     1=Permis par defaut, 0=Non permis par defaut
-        // $this->rights[$r][4]     Niveau 1 pour nommer permission dans code
-        // $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
+		// $this->rights[$r][0]     Id permission (unique tous modules confondus)
+		// $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
+		// $this->rights[$r][2]     Non utilise
+		// $this->rights[$r][3]     1=Permis par defaut, 0=Non permis par defaut
+		// $this->rights[$r][4]     Niveau 1 pour nommer permission dans code
+		// $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
 
-        $r++;
-        $this->rights[$r][0] = 71;
-        $this->rights[$r][1] = 'Read members\' card';
-        $this->rights[$r][2] = 'r';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'lire';
+		$r++;
+		$this->rights[$r][0] = 71;
+		$this->rights[$r][1] = 'Read members\' card';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'lire';
 
-        $r++;
-        $this->rights[$r][0] = 72;
-        $this->rights[$r][1] = 'Create/modify members (need also user module permissions if member linked to a user)';
-        $this->rights[$r][2] = 'w';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'creer';
+		$r++;
+		$this->rights[$r][0] = 72;
+		$this->rights[$r][1] = 'Create/modify members (need also user module permissions if member linked to a user)';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'creer';
 
-        $r++;
-        $this->rights[$r][0] = 74;
-        $this->rights[$r][1] = 'Remove members';
-        $this->rights[$r][2] = 'd';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'supprimer';
+		$r++;
+		$this->rights[$r][0] = 74;
+		$this->rights[$r][1] = 'Remove members';
+		$this->rights[$r][2] = 'd';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'supprimer';
 
-        $r++;
-        $this->rights[$r][0] = 76;
-        $this->rights[$r][1] = 'Export members';
-        $this->rights[$r][2] = 'r';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'export';
+		$r++;
+		$this->rights[$r][0] = 76;
+		$this->rights[$r][1] = 'Export members';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'export';
 
-        $r++;
-        $this->rights[$r][0] = 75;
-        $this->rights[$r][1] = 'Setup types of membership';
-        $this->rights[$r][2] = 'w';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'configurer';
+		$r++;
+		$this->rights[$r][0] = 75;
+		$this->rights[$r][1] = 'Setup types of membership';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'configurer';
 
-        $r++;
-        $this->rights[$r][0] = 78;
-        $this->rights[$r][1] = 'Read subscriptions';
-        $this->rights[$r][2] = 'r';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'cotisation';
-        $this->rights[$r][5] = 'lire';
+		$r++;
+		$this->rights[$r][0] = 78;
+		$this->rights[$r][1] = 'Read subscriptions';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'cotisation';
+		$this->rights[$r][5] = 'lire';
 
-        $r++;
-        $this->rights[$r][0] = 79;
-        $this->rights[$r][1] = 'Create/modify/remove subscriptions';
-        $this->rights[$r][2] = 'w';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'cotisation';
-        $this->rights[$r][5] = 'creer';
+		$r++;
+		$this->rights[$r][0] = 79;
+		$this->rights[$r][1] = 'Create/modify/remove subscriptions';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'cotisation';
+		$this->rights[$r][5] = 'creer';
 
 
-        // Menus
-        //-------
-        $this->menu = 1; // This module add menu entries. They are coded into menu manager.
+		// Menus
+		//-------
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
 
 
-        // Exports
-        //--------
-        $r = 0;
+		// Exports
+		//--------
+		$r = 0;
 
-        // $this->export_code[$r]          Unique code identifying the export (all modules combined)
-        // $this->export_label[$r]         Libelle by default if translation of key "ExportXXX" not found (XXX = Code)
-        // $this->export_permission[$r]    List of permission codes required to export
-        // $this->export_fields_sql[$r]    List of exportable fields in SQL codiffication
-        // $this->export_fields_name[$r]   List of exportable fields in translation codiffication
-        // $this->export_sql[$r]           SQL query that offers data for export
+		// $this->export_code[$r]          Unique code identifying the export (all modules combined)
+		// $this->export_label[$r]         Libelle by default if translation of key "ExportXXX" not found (XXX = Code)
+		// $this->export_permission[$r]    List of permission codes required to export
+		// $this->export_fields_sql[$r]    List of exportable fields in SQL codiffication
+		// $this->export_fields_name[$r]   List of exportable fields in translation codiffication
+		// $this->export_sql[$r]           SQL query that offers data for export
 
-        $r++;
-        $this->export_code[$r] = $this->rights_class.'_'.$r;
-        $this->export_label[$r] = 'MembersAndSubscriptions';
-        $this->export_permission[$r] = array(array("adherent", "export"));
-        $this->export_fields_array[$r] = array(
-            'a.rowid'=>'Id', 'a.civility'=>"UserTitle", 'a.lastname'=>"Lastname", 'a.firstname'=>"Firstname", 'a.login'=>"Login", 'a.gender'=>"Gender", 'a.morphy'=>'Nature',
-            'a.societe'=>'Company', 'a.address'=>"Address", 'a.zip'=>"Zip", 'a.town'=>"Town", 'd.nom'=>"State", 'co.code'=>"CountryCode", 'co.label'=>"Country",
-            'a.phone'=>"PhonePro", 'a.phone_perso'=>"PhonePerso", 'a.phone_mobile'=>"PhoneMobile", 'a.email'=>"Email", 'a.birth'=>"Birthday", 'a.statut'=>"Status",
-            'a.photo'=>"Photo", 'a.note_public'=>"NotePublic", 'a.note_private'=>"NotePrivate", 'a.datec'=>'DateCreation', 'a.datevalid'=>'DateValidation',
-            'a.tms'=>'DateLastModification', 'a.datefin'=>'DateEndSubscription', 'ta.rowid'=>'MemberTypeId', 'ta.libelle'=>'MemberTypeLabel',
-            'c.rowid'=>'SubscriptionId', 'c.dateadh'=>'DateSubscription', 'c.datef'=>'DateEndSubscription', 'c.subscription'=>'Amount'
-        );
-        $this->export_TypeFields_array[$r] = array(
-            'a.civility'=>"Text", 'a.lastname'=>"Text", 'a.firstname'=>"Text", 'a.login'=>"Text", 'a.gender'=>'Text', 'a.morphy'=>'Text', 'a.societe'=>'Text', 'a.address'=>"Text",
-            'a.zip'=>"Text", 'a.town'=>"Text", 'd.nom'=>"Text", 'co.code'=>'Text', 'co.label'=>"Text", 'a.phone'=>"Text", 'a.phone_perso'=>"Text", 'a.phone_mobile'=>"Text",
-            'a.email'=>"Text", 'a.birth'=>"Date", 'a.statut'=>"Status", 'a.note_public'=>"Text", 'a.note_private'=>"Text", 'a.datec'=>'Date', 'a.datevalid'=>'Date',
-            'a.tms'=>'Date', 'a.datefin'=>'Date', 'ta.rowid'=>'List:adherent_type:libelle::member_type', 'ta.libelle'=>'Text',
+		$r++;
+		$this->export_code[$r] = $this->rights_class.'_'.$r;
+		$this->export_label[$r] = 'MembersAndSubscriptions';
+		$this->export_permission[$r] = array(array("adherent", "export"));
+		$this->export_fields_array[$r] = array(
+			'a.rowid'=>'Id', 'a.civility'=>"UserTitle", 'a.lastname'=>"Lastname", 'a.firstname'=>"Firstname", 'a.login'=>"Login", 'a.gender'=>"Gender", 'a.morphy'=>'Nature',
+			'a.societe'=>'Company', 'a.address'=>"Address", 'a.zip'=>"Zip", 'a.town'=>"Town", 'd.nom'=>"State", 'co.code'=>"CountryCode", 'co.label'=>"Country",
+			'a.phone'=>"PhonePro", 'a.phone_perso'=>"PhonePerso", 'a.phone_mobile'=>"PhoneMobile", 'a.email'=>"Email", 'a.birth'=>"Birthday", 'a.statut'=>"Status",
+			'a.photo'=>"Photo", 'a.note_public'=>"NotePublic", 'a.note_private'=>"NotePrivate", 'a.datec'=>'DateCreation', 'a.datevalid'=>'DateValidation',
+			'a.tms'=>'DateLastModification', 'a.datefin'=>'DateEndSubscription', 'ta.rowid'=>'MemberTypeId', 'ta.libelle'=>'MemberTypeLabel',
+			'c.rowid'=>'SubscriptionId', 'c.dateadh'=>'DateSubscription', 'c.datef'=>'DateEndSubscription', 'c.subscription'=>'Amount'
+		);
+		$this->export_TypeFields_array[$r] = array(
+			'a.civility'=>"Text", 'a.lastname'=>"Text", 'a.firstname'=>"Text", 'a.login'=>"Text", 'a.gender'=>'Text', 'a.morphy'=>'Text', 'a.societe'=>'Text', 'a.address'=>"Text",
+			'a.zip'=>"Text", 'a.town'=>"Text", 'd.nom'=>"Text", 'co.code'=>'Text', 'co.label'=>"Text", 'a.phone'=>"Text", 'a.phone_perso'=>"Text", 'a.phone_mobile'=>"Text",
+			'a.email'=>"Text", 'a.birth'=>"Date", 'a.statut'=>"Status", 'a.note_public'=>"Text", 'a.note_private'=>"Text", 'a.datec'=>'Date', 'a.datevalid'=>'Date',
+			'a.tms'=>'Date', 'a.datefin'=>'Date', 'ta.rowid'=>'List:adherent_type:libelle::member_type', 'ta.libelle'=>'Text',
 			'c.rowid'=>'Numeric', 'c.dateadh'=>'Date', 'c.datef'=>'Date', 'c.subscription'=>'Numeric'
-        );
-        $this->export_entities_array[$r] = array(
-            'a.rowid'=>'member', 'a.civility'=>"member", 'a.lastname'=>"member", 'a.firstname'=>"member", 'a.login'=>"member", 'a.gender'=>'member', 'a.morphy'=>'member',
-            'a.societe'=>'member', 'a.address'=>"member", 'a.zip'=>"member", 'a.town'=>"member", 'd.nom'=>"member", 'co.code'=>"member", 'co.label'=>"member",
-            'a.phone'=>"member", 'a.phone_perso'=>"member", 'a.phone_mobile'=>"member", 'a.email'=>"member", 'a.birth'=>"member", 'a.statut'=>"member",
-            'a.photo'=>"member", 'a.note_public'=>"member", 'a.note_private'=>"member", 'a.datec'=>'member', 'a.datevalid'=>'member', 'a.tms'=>'member',
-            'a.datefin'=>'member', 'ta.rowid'=>'member_type', 'ta.libelle'=>'member_type',
+		);
+		$this->export_entities_array[$r] = array(
+			'a.rowid'=>'member', 'a.civility'=>"member", 'a.lastname'=>"member", 'a.firstname'=>"member", 'a.login'=>"member", 'a.gender'=>'member', 'a.morphy'=>'member',
+			'a.societe'=>'member', 'a.address'=>"member", 'a.zip'=>"member", 'a.town'=>"member", 'd.nom'=>"member", 'co.code'=>"member", 'co.label'=>"member",
+			'a.phone'=>"member", 'a.phone_perso'=>"member", 'a.phone_mobile'=>"member", 'a.email'=>"member", 'a.birth'=>"member", 'a.statut'=>"member",
+			'a.photo'=>"member", 'a.note_public'=>"member", 'a.note_private'=>"member", 'a.datec'=>'member', 'a.datevalid'=>'member', 'a.tms'=>'member',
+			'a.datefin'=>'member', 'ta.rowid'=>'member_type', 'ta.libelle'=>'member_type',
 			'c.rowid'=>'subscription', 'c.dateadh'=>'subscription', 'c.datef'=>'subscription', 'c.subscription'=>'subscription'
-        );
-        // Add extra fields
-        $keyforselect = 'adherent'; $keyforelement = 'member'; $keyforaliasextra = 'extra';
-        include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-        // End add axtra fields
-        $this->export_sql_start[$r] = 'SELECT DISTINCT ';
-        $this->export_sql_end[$r]  = ' FROM ('.MAIN_DB_PREFIX.'adherent_type as ta, '.MAIN_DB_PREFIX.'adherent as a)';
-        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'adherent_extrafields as extra ON a.rowid = extra.fk_object';
-        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'subscription as c ON c.fk_adherent = a.rowid';
-        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON a.state_id = d.rowid';
-        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON a.country = co.rowid';
-        $this->export_sql_end[$r] .= ' WHERE a.fk_adherent_type = ta.rowid AND ta.entity IN ('.getEntity('member_type').') ';
-        $this->export_dependencies_array[$r] = array('subscription'=>'c.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+		);
+		// Add extra fields
+		$keyforselect = 'adherent'; $keyforelement = 'member'; $keyforaliasextra = 'extra';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		// End add axtra fields
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM ('.MAIN_DB_PREFIX.'adherent_type as ta, '.MAIN_DB_PREFIX.'adherent as a)';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'adherent_extrafields as extra ON a.rowid = extra.fk_object';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'subscription as c ON c.fk_adherent = a.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON a.state_id = d.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON a.country = co.rowid';
+		$this->export_sql_end[$r] .= ' WHERE a.fk_adherent_type = ta.rowid AND ta.entity IN ('.getEntity('member_type').') ';
+		$this->export_dependencies_array[$r] = array('subscription'=>'c.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 
-        // Imports
-        //--------
-        $r = 0;
+		// Imports
+		//--------
+		$r = 0;
 
-        $now = dol_now();
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+		$now = dol_now();
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-        $r++;
-        $this->import_code[$r] = $this->rights_class.'_'.$r;
-        $this->import_label[$r] = "Members"; // Translation key
-        $this->import_icon[$r] = $this->picto;
-        $this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-        $this->import_tables_array[$r] = array('a'=>MAIN_DB_PREFIX.'adherent', 'extra'=>MAIN_DB_PREFIX.'adherent_extrafields');
-        $this->import_tables_creator_array[$r] = array('a'=>'fk_user_author'); // Fields to store import user id
-        $this->import_fields_array[$r] = array(
-            'a.civility'=>"UserTitle", 'a.lastname'=>"Lastname*", 'a.firstname'=>"Firstname", 'a.gender'=>"Gender", 'a.login'=>"Login*", "a.pass"=>"Password",
-            "a.fk_adherent_type"=>"MemberType*", 'a.morphy'=>'Nature*', 'a.societe'=>'Company', 'a.address'=>"Address", 'a.zip'=>"Zip", 'a.town'=>"Town",
-            'a.state_id'=>'StateId', 'a.country'=>"CountryId", 'a.phone'=>"PhonePro", 'a.phone_perso'=>"PhonePerso", 'a.phone_mobile'=>"PhoneMobile",
-            'a.email'=>"Email", 'a.birth'=>"Birthday", 'a.statut'=>"Status*", 'a.photo'=>"Photo", 'a.note_public'=>"NotePublic", 'a.note_private'=>"NotePrivate",
-            'a.datec'=>'DateCreation', 'a.datefin'=>'DateEndSubscription'
-        );
-        // Add extra fields
-        $sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'adherent' AND entity IN (0,".$conf->entity.")";
-        $resql = $this->db->query($sql);
-        if ($resql)    // This can fail when class is used on old database (during migration for example)
-        {
-            while ($obj = $this->db->fetch_object($resql))
-            {
-                $fieldname = 'extra.'.$obj->name;
-                $fieldlabel = ucfirst($obj->label);
-                $this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
-            }
-        }
-        // End add extra fields
-        $this->import_fieldshidden_array[$r] = array('extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'adherent'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
-        $this->import_regex_array[$r] = array(
-            'a.civility'=>'code@'.MAIN_DB_PREFIX.'c_civility', 'a.fk_adherent_type'=>'rowid@'.MAIN_DB_PREFIX.'adherent_type', 'a.morphy'=>'(phy|mor)',
-            'a.statut'=>'^[0|1]', 'a.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$', 'a.datefin'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
-        $this->import_examplevalues_array[$r] = array(
-            'a.civility'=>"MR", 'a.lastname'=>'Smith', 'a.firstname'=>'John', 'a.login'=>'jsmith', 'a.pass'=>'passofjsmith', 'a.fk_adherent_type'=>'1',
-            'a.morphy'=>'"mor" or "phy"', 'a.societe'=>'JS company', 'a.address'=>'21 jump street', 'a.zip'=>'55000', 'a.town'=>'New York', 'a.country'=>'1',
-            'a.email'=>'jsmith@example.com', 'a.birth'=>'1972-10-10', 'a.statut'=>"0 or 1", 'a.note_public'=>"This is a public comment on member",
-            'a.note_private'=>"This is private comment on member", 'a.datec'=>dol_print_date($now, '%Y-%m__%d'), 'a.datefin'=>dol_print_date(dol_time_plus_duree($now, 1, 'y'), '%Y-%m-%d')
-        );
+		$r++;
+		$this->import_code[$r] = $this->rights_class.'_'.$r;
+		$this->import_label[$r] = "Members"; // Translation key
+		$this->import_icon[$r] = $this->picto;
+		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r] = array('a'=>MAIN_DB_PREFIX.'adherent', 'extra'=>MAIN_DB_PREFIX.'adherent_extrafields');
+		$this->import_tables_creator_array[$r] = array('a'=>'fk_user_author'); // Fields to store import user id
+		$this->import_fields_array[$r] = array(
+			'a.civility'=>"UserTitle", 'a.lastname'=>"Lastname*", 'a.firstname'=>"Firstname", 'a.gender'=>"Gender", 'a.login'=>"Login*", "a.pass"=>"Password",
+			"a.fk_adherent_type"=>"MemberType*", 'a.morphy'=>'Nature*', 'a.societe'=>'Company', 'a.address'=>"Address", 'a.zip'=>"Zip", 'a.town'=>"Town",
+			'a.state_id'=>'StateId', 'a.country'=>"CountryId", 'a.phone'=>"PhonePro", 'a.phone_perso'=>"PhonePerso", 'a.phone_mobile'=>"PhoneMobile",
+			'a.email'=>"Email", 'a.birth'=>"Birthday", 'a.statut'=>"Status*", 'a.photo'=>"Photo", 'a.note_public'=>"NotePublic", 'a.note_private'=>"NotePrivate",
+			'a.datec'=>'DateCreation', 'a.datefin'=>'DateEndSubscription'
+		);
+		// Add extra fields
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'adherent' AND entity IN (0,".$conf->entity.")";
+		$resql = $this->db->query($sql);
+		if ($resql)    // This can fail when class is used on old database (during migration for example)
+		{
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$fieldname = 'extra.'.$obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+			}
+		}
+		// End add extra fields
+		$this->import_fieldshidden_array[$r] = array('extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'adherent'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
+		$this->import_regex_array[$r] = array(
+			'a.civility'=>'code@'.MAIN_DB_PREFIX.'c_civility', 'a.fk_adherent_type'=>'rowid@'.MAIN_DB_PREFIX.'adherent_type', 'a.morphy'=>'(phy|mor)',
+			'a.statut'=>'^[0|1]', 'a.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$', 'a.datefin'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
+		$this->import_examplevalues_array[$r] = array(
+			'a.civility'=>"MR", 'a.lastname'=>'Smith', 'a.firstname'=>'John', 'a.login'=>'jsmith', 'a.pass'=>'passofjsmith', 'a.fk_adherent_type'=>'1',
+			'a.morphy'=>'"mor" or "phy"', 'a.societe'=>'JS company', 'a.address'=>'21 jump street', 'a.zip'=>'55000', 'a.town'=>'New York', 'a.country'=>'1',
+			'a.email'=>'jsmith@example.com', 'a.birth'=>'1972-10-10', 'a.statut'=>"0 or 1", 'a.note_public'=>"This is a public comment on member",
+			'a.note_private'=>"This is private comment on member", 'a.datec'=>dol_print_date($now, '%Y-%m__%d'), 'a.datefin'=>dol_print_date(dol_time_plus_duree($now, 1, 'y'), '%Y-%m-%d')
+		);
 
-        // Cronjobs
-        $arraydate = dol_getdate(dol_now());
-        $datestart = dol_mktime(22, 0, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
-        $this->cronjobs = array(
-            0=>array(
-                'label'=>'SendReminderForExpiredSubscriptionTitle',
-                'jobtype'=>'method', 'class'=>'adherents/class/adherent.class.php',
-                'objectname'=>'Adherent',
-                'method'=>'sendReminderForExpiredSubscription',
-                'parameters'=>'10;0',
-                'comment'=>'SendReminderForExpiredSubscription',
-                'frequency'=>1,
-                'unitfrequency'=> 3600 * 24,
-                'priority'=>50,
-                'status'=>1,
-                'test'=>'$conf->adherent->enabled',
-                'datestart'=>$datestart
-            ),
-        );
-    }
+		// Cronjobs
+		$arraydate = dol_getdate(dol_now());
+		$datestart = dol_mktime(22, 0, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
+		$this->cronjobs = array(
+			0=>array(
+				'label'=>'SendReminderForExpiredSubscriptionTitle',
+				'jobtype'=>'method', 'class'=>'adherents/class/adherent.class.php',
+				'objectname'=>'Adherent',
+				'method'=>'sendReminderForExpiredSubscription',
+				'parameters'=>'10;0',
+				'comment'=>'SendReminderForExpiredSubscription',
+				'frequency'=>1,
+				'unitfrequency'=> 3600 * 24,
+				'priority'=>50,
+				'status'=>1,
+				'test'=>'$conf->adherent->enabled',
+				'datestart'=>$datestart
+			),
+		);
+	}
 
 
-    /**
-     *		Function called when module is enabled.
-     *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *		It also creates data directories
-     *
-     *      @param      string	$options    Options when enabling module ('', 'newboxdefonly', 'noboxes')
-     *      @return     int             	1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-        global $conf, $langs;
+	/**
+	 *		Function called when module is enabled.
+	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *		It also creates data directories
+	 *
+	 *      @param      string	$options    Options when enabling module ('', 'newboxdefonly', 'noboxes')
+	 *      @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global $conf, $langs;
 
-        // Permissions
-        $this->remove($options);
+		// Permissions
+		$this->remove($options);
 
-        //ODT template
-        /*
+		//ODT template
+		/*
         $src=DOL_DOCUMENT_ROOT.'/install/doctemplates/orders/template_order.odt';
         $dirodt=DOL_DATA_ROOT.'/doctemplates/orders';
         $dest=$dirodt.'/template_order.odt';
@@ -408,11 +418,11 @@ class modAdherent extends DolibarrModules
             }
         }*/
 
-        $sql = array(
-            "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type='member' AND entity = ".$conf->entity,
-            "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','member',".$conf->entity.")"
-        );
+		$sql = array(
+			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type='member' AND entity = ".$conf->entity,
+			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','member',".$conf->entity.")"
+		);
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index d8165948837..559260a77c2 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -76,29 +76,29 @@ class modAgenda extends DolibarrModules
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
 
 		// Module parts
-        $this->module_parts = array();
+		$this->module_parts = array();
 
 		// Constants
-        //-----------
-        // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-        // Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
-        //                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
-        // );
+		//-----------
+		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
+		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
+		// );
 		$this->const = array();
 		//$this->const[] = array('AGENDA_DEFAULT_FILTER_TYPE', 'chaine', 'AC_NON_AUTO', 'Default filter for type of event on agenda', 0, 'current');
 		$sqlreadactions = "SELECT code, label, description FROM ".MAIN_DB_PREFIX."c_action_trigger ORDER by rang";
 		$resql = $this->db->query($sqlreadactions);
 		if ($resql)
 		{
-		    while ($obj = $this->db->fetch_object($resql))
-		    {
-		        //if (preg_match('/_CREATE$/',$obj->code) && (! in_array($obj->code, array('COMPANY_CREATE','PRODUCT_CREATE','TASK_CREATE')))) continue;    // We don't track such events (*_CREATE) by default, we prefer validation (except thirdparty/product/task creation because there is no validation).
-		        if (preg_match('/^TASK_/', $obj->code)) continue; // We don't track such events by default.
-		        //if (preg_match('/^_MODIFY/',$obj->code)) continue;    // We don't track such events by default.
-		        $this->const[] = array('MAIN_AGENDA_ACTIONAUTO_'.$obj->code, "chaine", "1", '', 0, 'current');
-		    }
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				//if (preg_match('/_CREATE$/',$obj->code) && (! in_array($obj->code, array('COMPANY_CREATE','PRODUCT_CREATE','TASK_CREATE')))) continue;    // We don't track such events (*_CREATE) by default, we prefer validation (except thirdparty/product/task creation because there is no validation).
+				if (preg_match('/^TASK_/', $obj->code)) continue; // We don't track such events by default.
+				//if (preg_match('/^_MODIFY/',$obj->code)) continue;    // We don't track such events by default.
+				$this->const[] = array('MAIN_AGENDA_ACTIONAUTO_'.$obj->code, "chaine", "1", '', 0, 'current');
+			}
 		} else {
-		    dol_print_error($this->db->lasterror());
+			dol_print_error($this->db->lasterror());
 		}
 
 		// New pages on tabs
@@ -113,7 +113,7 @@ class modAgenda extends DolibarrModules
 		//------------
 		$datestart = dol_now();
 		$this->cronjobs = array(
-			0=>array('label'=>'SendEmailsReminders', 'jobtype'=>'method', 'class'=>'comm/action/class/actioncomm.class.php', 'objectname'=>'ActionComm', 'method'=>'sendEmailsReminder', 'parameters'=>'', 'comment'=>'SendEMailsReminder', 'frequency'=>10, 'unitfrequency'=>60, 'priority'=>10, 'status'=>1, 'test'=>'$conf->agenda->enabled', 'datestart'=>$datestart),
+			0=>array('label'=>'SendEmailsReminders', 'jobtype'=>'method', 'class'=>'comm/action/class/actioncomm.class.php', 'objectname'=>'ActionComm', 'method'=>'sendEmailsReminder', 'parameters'=>'', 'comment'=>'SendEMailsReminder', 'frequency'=>5, 'unitfrequency'=>60, 'priority'=>10, 'status'=>1, 'test'=>'$conf->agenda->enabled', 'datestart'=>$datestart),
 		);
 
 		// Permissions
@@ -203,19 +203,19 @@ class modAgenda extends DolibarrModules
 		//							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
 		// $r++;
 		$this->menu[$r] = array(
-            'fk_menu'=>0,
-            'type'=>'top',
-            'titre'=>'TMenuAgenda',
-            'mainmenu'=>'agenda',
-            'url'=>'/comm/action/index.php',
-            'langs'=>'agenda',
-            'position'=>86,
-            'perms'=>'$user->rights->agenda->myactions->read',
-            'enabled'=>'$conf->agenda->enabled',
-            'target'=>'',
-            'user'=>2,
-        );
-        $r++;
+			'fk_menu'=>0,
+			'type'=>'top',
+			'titre'=>'TMenuAgenda',
+			'mainmenu'=>'agenda',
+			'url'=>'/comm/action/index.php',
+			'langs'=>'agenda',
+			'position'=>86,
+			'perms'=>'$user->rights->agenda->myactions->read',
+			'enabled'=>'$conf->agenda->enabled',
+			'target'=>'',
+			'user'=>2,
+		);
+		$r++;
 
 		$this->menu[$r] = array(
 			'fk_menu'=>'r=0',
diff --git a/htdocs/core/modules/modApi.class.php b/htdocs/core/modules/modApi.class.php
index de0db15cb56..32b16a74703 100644
--- a/htdocs/core/modules/modApi.class.php
+++ b/htdocs/core/modules/modApi.class.php
@@ -40,9 +40,9 @@ class modApi extends DolibarrModules
 	 */
 	public function __construct($db)
 	{
-        global $langs, $conf;
+		global $langs, $conf;
 
-        $this->db = $db;
+		$this->db = $db;
 
 		// Id for module (must be unique).
 		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
@@ -81,7 +81,7 @@ class modApi extends DolibarrModules
 		// Dependencies
 		$this->hidden = false; // A condition to hide module
 		$this->depends = array(); // List of modules id that must be enabled if this module is enabled
-		$this->requiredby = array(); // List of modules id to disable if this one is disabled
+		$this->requiredby = array('modZapier'); // List of modules id to disable if this one is disabled
 		$this->conflictwith = array(); // List of modules id this module is in conflict with
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
 		$this->langfiles = array("other");
@@ -95,8 +95,8 @@ class modApi extends DolibarrModules
 
 		// Array to add new pages in new tabs
 		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@api:$user->rights->api->read:/api/mynewtab1.php?id=__ID__',  					// To add a new tab identified by code tabname1
-        //                              'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@api:$user->rights->othermodule->read:/api/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
-        //                              'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
+		//                              'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@api:$user->rights->othermodule->read:/api/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
+		//                              'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
 		// where objecttype can be
 		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
 		// 'contact'          to add a tab in contact view
@@ -117,19 +117,19 @@ class modApi extends DolibarrModules
 		// 'stock'            to add a tab in stock view
 		// 'thirdparty'       to add a tab in third party view
 		// 'user'             to add a tab in user view
-        $this->tabs = array();
+		$this->tabs = array();
 
-        // Dictionaries
-	    if (!isset($conf->api->enabled))
-        {
-        	$conf->api = new stdClass();
-        	$conf->api->enabled = 0;
-        }
+		// Dictionaries
+		if (!isset($conf->api->enabled))
+		{
+			$conf->api = new stdClass();
+			$conf->api->enabled = 0;
+		}
 		$this->dictionaries = array();
 
-        // Boxes
+		// Boxes
 		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
-        $this->boxes = array(); // List of boxes
+		$this->boxes = array(); // List of boxes
 		// Example:
 		//$this->boxes=array(array(0=>array('file'=>'myboxa.php','note'=>'','enabledbydefaulton'=>'Home'),1=>array('file'=>'myboxb.php','note'=>''),2=>array('file'=>'myboxc.php','note'=>'')););
 
@@ -190,7 +190,7 @@ class modApi extends DolibarrModules
 		// Example:
 		// $this->export_code[$r]=$this->rights_class.'_'.$r;
 		// $this->export_label[$r]='CustomersInvoicesAndInvoiceLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
-        // $this->export_enabled[$r]='1';                               // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
+		// $this->export_enabled[$r]='1';                               // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
 		// $this->export_permission[$r]=array(array("facture","facture","export"));
 		// $this->export_fields_array[$r]=array(
 		//	's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone',
@@ -222,17 +222,17 @@ class modApi extends DolibarrModules
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
-    public function init($options = '')
-    {
-        $sql = array();
+	public function init($options = '')
+	{
+		$sql = array();
 
-        $result = $this->_load_tables('/api/sql/');
+		$result = $this->_load_tables('/api/sql/');
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 
 	/**
 	 *		Function called when module is disabled.
diff --git a/htdocs/core/modules/modAsset.class.php b/htdocs/core/modules/modAsset.class.php
index b736bdb4367..50fe71ef390 100644
--- a/htdocs/core/modules/modAsset.class.php
+++ b/htdocs/core/modules/modAsset.class.php
@@ -166,44 +166,44 @@ class modAsset extends DolibarrModules
 
 		// Permissions
 		$this->rights = array(); // Permission array used by this module
-        $this->rights_class = 'asset';
-        $r = 0;
+		$this->rights_class = 'asset';
+		$r = 0;
 
-        $r++;
-        $this->rights[$r][0] = 51001; // Permission id (must not be already used)
+		$r++;
+		$this->rights[$r][0] = 51001; // Permission id (must not be already used)
 		$this->rights[$r][1] = 'Read assets'; // Permission label
-        $this->rights[$r][2] = 'r';
-        $this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'read'; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
 		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
 
 		$r++;
 		$this->rights[$r][0] = 51002; // Permission id (must not be already used)
 		$this->rights[$r][1] = 'Create/Update assets'; // Permission label
-        $this->rights[$r][2] = 'w';
-        $this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'write'; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
 		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
 
 		$r++;
 		$this->rights[$r][0] = 51003; // Permission id (must not be already used)
 		$this->rights[$r][1] = 'Delete assets'; // Permission label
-        $this->rights[$r][2] = 'd';
-        $this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][2] = 'd';
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'delete'; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
 		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
 
-        $r++;
-        $this->rights[$r][0] = 51005; // Permission id (must not be already used)
-        $this->rights[$r][1] = 'Setup types of asset'; // Permission label
-        $this->rights[$r][2] = 'w';
-        $this->rights[$r][3] = 0; // Permission by default for new user (0/1)
-        $this->rights[$r][4] = 'setup_advance'; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
-        $this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
+		$r++;
+		$this->rights[$r][0] = 51005; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Setup types of asset'; // Permission label
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'setup_advance'; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
+		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
 
-        // Menus
-        //-------
-        $this->menu = 1; // This module add menu entries. They are coded into menu manager.
+		// Menus
+		//-------
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
 	}
 
 	/**
@@ -214,13 +214,13 @@ class modAsset extends DolibarrModules
 	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *  @return     int             	1 if OK, 0 if KO
 	 */
-    public function init($options = '')
-    {
-        // Permissions
-        $this->remove($options);
+	public function init($options = '')
+	{
+		// Permissions
+		$this->remove($options);
 
-        $sql = array();
+		$sql = array();
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modBarcode.class.php b/htdocs/core/modules/modBarcode.class.php
index bc45e078976..6a894972eb7 100644
--- a/htdocs/core/modules/modBarcode.class.php
+++ b/htdocs/core/modules/modBarcode.class.php
@@ -91,20 +91,20 @@ class modBarcode extends DolibarrModules
 		$this->rights[2][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[2][4] = 'creer_advance';
 
-        // Main menu entries
-        $r = 0;
-        $this->menu[$r] = array('fk_menu'=>'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-						        'mainmenu'=>'tools',
-        						'leftmenu'=>'barcodeprint',
-        						'type'=>'left', // This is a Left menu entry
-						        'titre'=>'BarCodePrintsheet',
-						        'url'=>'/barcode/printsheet.php?mainmenu=tools&leftmenu=barcodeprint',
-						        'langs'=>'products', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-						        'position'=>200,
-						        'enabled'=>'$conf->barcode->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-        				        'perms'=>'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->lire_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-						        'target'=>'',
-						        'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
+		// Main menu entries
+		$r = 0;
+		$this->menu[$r] = array('fk_menu'=>'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+								'mainmenu'=>'tools',
+								'leftmenu'=>'barcodeprint',
+								'type'=>'left', // This is a Left menu entry
+								'titre'=>'BarCodePrintsheet',
+								'url'=>'/barcode/printsheet.php?mainmenu=tools&leftmenu=barcodeprint',
+								'langs'=>'products', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+								'position'=>200,
+								'enabled'=>'$conf->barcode->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+								'perms'=>'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->lire_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+								'target'=>'',
+								'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
 		$r++;
 
 		$this->menu[$r] = array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
@@ -121,12 +121,12 @@ class modBarcode extends DolibarrModules
 	}
 
 
-    /**
-     *      Function called when module is enabled.
-     *      The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *      It also creates data directories.
-     *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	/**
+	 *      Function called when module is enabled.
+	 *      The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *      It also creates data directories.
+	 *
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
index 447e3e625ac..6a3cd4767f7 100644
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -29,57 +29,57 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modBlockedLog extends DolibarrModules
 {
-    /**
-     *   Constructor. Define names, constants, directories, boxes, permissions
-     *
-     *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        global $langs, $conf, $mysoc;
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $langs, $conf, $mysoc;
 
-        $this->db = $db;
-        $this->numero = 3200;
-        // Key text used to identify module (for permissions, menus, etc...)
-        $this->rights_class = 'blockedlog';
+		$this->db = $db;
+		$this->numero = 3200;
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'blockedlog';
 
-        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-        // It is used to group modules in module setup page
-        $this->family = "base";
-        // Module position in the family on 2 digits ('01', '10', '20', ...)
-        $this->module_position = '75';
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        $this->description = "Enable a log on some business events into a non reversible log. This module may be mandatory for some countries.";
-        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
-        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        $this->picto = 'technic';
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
+		$this->family = "base";
+		// Module position in the family on 2 digits ('01', '10', '20', ...)
+		$this->module_position = '75';
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		$this->description = "Enable a log on some business events into a non reversible log. This module may be mandatory for some countries.";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'dolibarr';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		$this->picto = 'technic';
 
-        // Data directories to create when module is enabled
-        $this->dirs = array();
+		// Data directories to create when module is enabled
+		$this->dirs = array();
 
-        // Config pages
-        //-------------
-        $this->config_page_url = array('blockedlog.php?withtab=1@blockedlog');
+		// Config pages
+		//-------------
+		$this->config_page_url = array('blockedlog.php?withtab=1@blockedlog');
 
-        // Dependancies
-        //-------------
-        $this->hidden = false; // A condition to disable module
-        $this->depends = array('always'=>'modFacture'); // List of modules id that must be enabled if this module is enabled
-        $this->requiredby = array(); // List of modules id to disable if this one is disabled
-        $this->conflictwith = array(); // List of modules id this module is in conflict with
-        $this->langfiles = array('blockedlog');
+		// Dependancies
+		//-------------
+		$this->hidden = false; // A condition to disable module
+		$this->depends = array('always'=>'modFacture'); // List of modules id that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of modules id to disable if this one is disabled
+		$this->conflictwith = array(); // List of modules id this module is in conflict with
+		$this->langfiles = array('blockedlog');
 
-        $this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-        $this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-        $this->warnings_unactivation = array('FR'=>'BlockedLogAreRequiredByYourCountryLegislation');
+		$this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		$this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		$this->warnings_unactivation = array('FR'=>'BlockedLogAreRequiredByYourCountryLegislation');
 
-        // Currently, activation is not automatic because only companies (in France) making invoices to non business customers must
-        // enable this module.
-        /*if (! empty($conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY))
+		// Currently, activation is not automatic because only companies (in France) making invoices to non business customers must
+		// enable this module.
+		/*if (! empty($conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY))
         {
             $tmp=explode(',', $conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY);
             $this->automatic_activation = array();
@@ -88,160 +88,160 @@ class modBlockedLog extends DolibarrModules
                 $this->automatic_activation[$key]='BlockedLogActivatedBecauseRequiredByYourCountryLegislation';
             }
         }*/
-        //var_dump($this->automatic_activation);
+		//var_dump($this->automatic_activation);
 
-        $this->always_enabled = (!empty($conf->blockedlog->enabled)
-            && !empty($conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY)
-            && in_array($mysoc->country_code, explode(',', $conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY))
-            && $this->alreadyUsed());
+		$this->always_enabled = (!empty($conf->blockedlog->enabled)
+			&& !empty($conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY)
+			&& in_array($mysoc->country_code, explode(',', $conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY))
+			&& $this->alreadyUsed());
 
-        // Constants
-        //-----------
-        $this->const = array(
-            1=>array('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY', 'chaine', 'FR', 'This is list of country code where the module may be mandatory', 0, 'current', 0)
-        );
+		// Constants
+		//-----------
+		$this->const = array(
+			1=>array('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY', 'chaine', 'FR', 'This is list of country code where the module may be mandatory', 0, 'current', 0)
+		);
 
-        // New pages on tabs
-        // -----------------
-        $this->tabs = array();
+		// New pages on tabs
+		// -----------------
+		$this->tabs = array();
 
-        // Boxes
-        //------
-        $this->boxes = array();
+		// Boxes
+		//------
+		$this->boxes = array();
 
-        // Permissions
-        // -----------------
-        $this->rights = array(); // Permission array used by this module
+		// Permissions
+		// -----------------
+		$this->rights = array(); // Permission array used by this module
 
-        $r = 0;
-        $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
-        $this->rights[$r][1] = 'Read archived events and fingerprints'; // Permission label
-        $this->rights[$r][3] = 0; // Permission by default for new user (0/1)
-        $this->rights[$r][4] = 'read'; // In php code, permission will be checked by test if ($user->rights->mymodule->level1->level2)
-        $this->rights[$r][5] = '';
+		$r = 0;
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Read archived events and fingerprints'; // Permission label
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'read'; // In php code, permission will be checked by test if ($user->rights->mymodule->level1->level2)
+		$this->rights[$r][5] = '';
 
-        // Main menu entries
-        // -----------------
-        $r = 0;
-        $this->menu[$r] = array(
-        'fk_menu'=>'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-        'mainmenu'=>'tools',
-        'leftmenu'=>'blockedlogbrowser',
-        'type'=>'left', // This is a Left menu entry
-        'titre'=>'BrowseBlockedLog',
-        'url'=>'/blockedlog/admin/blockedlog_list.php?mainmenu=tools&leftmenu=blockedlogbrowser',
-        'langs'=>'blockedlog', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-        'position'=>200,
-        'enabled'=>'$conf->blockedlog->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-        'perms'=>'$user->rights->blockedlog->read', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-        'target'=>'',
-        'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
-        $r++;
-    }
+		// Main menu entries
+		// -----------------
+		$r = 0;
+		$this->menu[$r] = array(
+		'fk_menu'=>'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+		'mainmenu'=>'tools',
+		'leftmenu'=>'blockedlogbrowser',
+		'type'=>'left', // This is a Left menu entry
+		'titre'=>'BrowseBlockedLog',
+		'url'=>'/blockedlog/admin/blockedlog_list.php?mainmenu=tools&leftmenu=blockedlogbrowser',
+		'langs'=>'blockedlog', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		'position'=>200,
+		'enabled'=>'$conf->blockedlog->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+		'perms'=>'$user->rights->blockedlog->read', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+		'target'=>'',
+		'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
+		$r++;
+	}
 
 
-    /**
-     * Check if module was already used before unactivation linked to warnings_unactivation property
-     *
-     * @return	boolean		True if already used, otherwise False
-     */
-    public function alreadyUsed()
-    {
-        require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
-        $b = new BlockedLog($this->db);
-        return $b->alreadyUsed(1);
-    }
+	/**
+	 * Check if module was already used before unactivation linked to warnings_unactivation property
+	 *
+	 * @return	boolean		True if already used, otherwise False
+	 */
+	public function alreadyUsed()
+	{
+		require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+		$b = new BlockedLog($this->db);
+		return $b->alreadyUsed(1);
+	}
 
 
-    /**
-     *      Function called when module is enabled.
-     *      The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *      It also creates data directories.
-     *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-     *      @return     int             	1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-        global $conf, $user;
+	/**
+	 *      Function called when module is enabled.
+	 *      The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *      It also creates data directories.
+	 *
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global $conf, $user;
 
-        $sql = array();
+		$sql = array();
 
-        // If already used, we add an entry to show we enable module
-           require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+		// If already used, we add an entry to show we enable module
+		   require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
 
-           $object = new stdClass();
-        $object->id = 1;
-        $object->element = 'module';
-        $object->ref = 'systemevent';
-        $object->entity = $conf->entity;
-        $object->date = dol_now();
+		   $object = new stdClass();
+		$object->id = 1;
+		$object->element = 'module';
+		$object->ref = 'systemevent';
+		$object->entity = $conf->entity;
+		$object->date = dol_now();
 
-        $b = new BlockedLog($this->db);
-        $result = $b->setObjectData($object, 'MODULE_SET', 0);
-        if ($result < 0)
-        {
-            $this->error = $b->error;
-            $this->errors = $b->erros;
-            return 0;
-        }
+		$b = new BlockedLog($this->db);
+		$result = $b->setObjectData($object, 'MODULE_SET', 0);
+		if ($result < 0)
+		{
+			$this->error = $b->error;
+			$this->errors = $b->erros;
+			return 0;
+		}
 
-        $res = $b->create($user);
-        if ($res <= 0) {
-            $this->error = $b->error;
-            $this->errors = $b->errors;
-            return $res;
-        }
+		$res = $b->create($user);
+		if ($res <= 0) {
+			$this->error = $b->error;
+			$this->errors = $b->errors;
+			return $res;
+		}
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 
-    /**
-     * Function called when module is disabled.
-     * The remove function removes tabs, constants, boxes, permissions and menus from Dolibarr database.
-     * Data directories are not deleted
-     *
-     * @param      string	$options    Options when enabling module ('', 'noboxes')
-     * @return     int             		1 if OK, 0 if KO
-     */
-    public function remove($options = '')
-    {
+	/**
+	 * Function called when module is disabled.
+	 * The remove function removes tabs, constants, boxes, permissions and menus from Dolibarr database.
+	 * Data directories are not deleted
+	 *
+	 * @param      string	$options    Options when enabling module ('', 'noboxes')
+	 * @return     int             		1 if OK, 0 if KO
+	 */
+	public function remove($options = '')
+	{
 
-        global $conf, $user;
+		global $conf, $user;
 
-        $sql = array();
+		$sql = array();
 
-        // If already used, we add an entry to show we enable module
-        require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+		// If already used, we add an entry to show we enable module
+		require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
 
-        $object = new stdClass();
-        $object->id = 1;
-        $object->element = 'module';
-        $object->ref = 'systemevent';
-        $object->entity = $conf->entity;
-        $object->date = dol_now();
+		$object = new stdClass();
+		$object->id = 1;
+		$object->element = 'module';
+		$object->ref = 'systemevent';
+		$object->entity = $conf->entity;
+		$object->date = dol_now();
 
-        $b = new BlockedLog($this->db);
-        $result = $b->setObjectData($object, 'MODULE_RESET', 0);
-        if ($result < 0)
-        {
-            $this->error = $b->error;
-            $this->errors = $b->erros;
-            return 0;
-        }
+		$b = new BlockedLog($this->db);
+		$result = $b->setObjectData($object, 'MODULE_RESET', 0);
+		if ($result < 0)
+		{
+			$this->error = $b->error;
+			$this->errors = $b->erros;
+			return 0;
+		}
 
-        if ($b->alreadyUsed(1))
-        {
-            $res = $b->create($user, '0000000000'); // If already used for something else than SET or UNSET, we log with error
-        } else {
-            $res = $b->create($user);
-        }
-        if ($res <= 0) {
-            $this->error = $b->error;
-            $this->errors = $b->errors;
-            return $res;
-        }
+		if ($b->alreadyUsed(1))
+		{
+			$res = $b->create($user, '0000000000'); // If already used for something else than SET or UNSET, we log with error
+		} else {
+			$res = $b->create($user);
+		}
+		if ($res <= 0) {
+			$this->error = $b->error;
+			$this->errors = $b->errors;
+			return $res;
+		}
 
-        return $this->_remove($sql, $options);
-    }
+		return $this->_remove($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modBom.class.php b/htdocs/core/modules/modBom.class.php
index 7258541a7da..092ceb17d79 100644
--- a/htdocs/core/modules/modBom.class.php
+++ b/htdocs/core/modules/modBom.class.php
@@ -54,7 +54,7 @@ class modBom extends DolibarrModules
 		// It is used to group modules by family in module setup page
 		$this->family = "products";
 		// Module position in the family on 2 digits ('01', '10', '20', ...)
-		$this->module_position = '60';
+		$this->module_position = '65';
 		// Gives the possibility for the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
 		//$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
 
@@ -300,6 +300,7 @@ class modBom extends DolibarrModules
 		$this->export_dependencies_array[$r] = array('bomline'=>'tl.rowid'); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields)
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'bom_bom as t';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bom_bom_extrafields as extra on (t.rowid = extra.fk_object)';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bom_bomline as tl ON tl.fk_bom = t.rowid';
 		$this->export_sql_end[$r] .= ' WHERE 1 = 1';
 		$this->export_sql_end[$r] .= ' AND t.entity IN ('.getEntity('bom').')';
diff --git a/htdocs/core/modules/modBookmark.class.php b/htdocs/core/modules/modBookmark.class.php
index 0a3d9ccd11b..e6ac76f0178 100644
--- a/htdocs/core/modules/modBookmark.class.php
+++ b/htdocs/core/modules/modBookmark.class.php
@@ -69,7 +69,9 @@ class modBookmark extends DolibarrModules
 		$this->const = array();
 
 		// Boxes
-		$this->boxes = array(0=>array('file'=>'box_bookmarks.php', 'enabledbydefaulton'=>'Home'));
+		$this->boxes = array(
+			0=>array('file'=>'box_bookmarks.php', 'enabledbydefaulton'=>'Home')
+		);
 
 		// Permissions
 		$this->rights = array();
diff --git a/htdocs/core/modules/modCashDesk.class.php b/htdocs/core/modules/modCashDesk.class.php
index b27a1ae30e4..e3368fb636f 100644
--- a/htdocs/core/modules/modCashDesk.class.php
+++ b/htdocs/core/modules/modCashDesk.class.php
@@ -46,12 +46,11 @@ class modCashDesk extends DolibarrModules
 		$this->rights_class = 'cashdesk';
 
 		$this->family = "portal";
-		$this->module_position = '55';
+		$this->module_position = '59';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "CashDesk module";
 
-		$this->revision = '1.27';
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
@@ -102,8 +101,8 @@ class modCashDesk extends DolibarrModules
 									'url'=>'/cashdesk/index.php?user=__USER_LOGIN__',
 									'langs'=>'cashdesk', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 									'position'=>900,
-                                    'enabled'=>'$conf->cashdesk->enabled',
-		                            'perms'=>'$user->rights->cashdesk->run', // Use 'perms'=>'1' if you want your menu with no permission rules
+									'enabled'=>'$conf->cashdesk->enabled',
+									'perms'=>'$user->rights->cashdesk->run', // Use 'perms'=>'1' if you want your menu with no permission rules
 									'target'=>'pointofsale',
 									'user'=>0); // 0=Menu for internal users, 1=external users, 2=both
 
@@ -121,24 +120,24 @@ class modCashDesk extends DolibarrModules
 		//							'target'=>'',
 		//							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
 		// $r++;
-    }
+	}
 
 
-    /**
-     *  Function called when module is enabled.
-     *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *  It also creates data directories
-     *
-     *  @param      string	$options    Options when enabling module ('', 'noboxes')
-     *  @return     int             	1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-        $sql = array();
+	/**
+	 *  Function called when module is enabled.
+	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *  It also creates data directories
+	 *
+	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *  @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		$sql = array();
 
-        // Remove permissions and default values
-        $this->remove($options);
+		// Remove permissions and default values
+		$this->remove($options);
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index 29a96c0f03c..bb6c36b353c 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -39,7 +39,7 @@ class modCategorie extends DolibarrModules
 	 */
 	public function __construct($db)
 	{
-	    global $conf;
+		global $conf;
 
 		$this->db = $db;
 		$this->numero = 1780;
@@ -153,7 +153,7 @@ class modCategorie extends DolibarrModules
 		$this->export_code[$r] = 'category_'.$r;
 		$this->export_label[$r] = 'CatCusList';
 		$this->export_icon[$r] = 'category';
-        $this->export_enabled[$r] = '$conf->societe->enabled';
+		$this->export_enabled[$r] = '$conf->societe->enabled';
 		$this->export_permission[$r] = array(array("categorie", "lire"), array("societe", "lire"));
 		$this->export_fields_array[$r] = array(
 			'u.rowid'=>"CategId", 'u.label'=>"Label", 'u.description'=>"Description", 's.rowid'=>'IdThirdParty', 's.nom'=>'Name', 's.prefix_comm'=>"Prefix",
@@ -176,61 +176,25 @@ class modCategorie extends DolibarrModules
 			's.idprof4'=>"company", 's.tva_intra'=>"company", 's.capital'=>"company", 's.note_public'=>"company", 's.fk_prospectlevel'=>'company',
 			's.fk_stcomm'=>'company'
 		); // We define here only fields that use another picto
+
+		$keyforselect = 'societe'; $keyforelement = 'company'; $keyforaliasextra = 'extrasoc';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as u, ';
 		$this->export_sql_end[$r] .= MAIN_DB_PREFIX.'categorie_societe as cf, ';
-		$this->export_sql_end[$r] .= MAIN_DB_PREFIX.'societe as s LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as ce ON s.fk_effectif = ce.id LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra ON s.rowid = extra.fk_object ';
+		$this->export_sql_end[$r] .= MAIN_DB_PREFIX.'societe as s';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as ce ON s.fk_effectif = ce.id LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code';
+	 	$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extrasoc ON s.rowid = extrasoc.fk_object ';
 		$this->export_sql_end[$r] .= ' WHERE u.rowid = cf.fk_categorie AND cf.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .= ' AND u.entity IN ('.getEntity('category').')';
 		$this->export_sql_end[$r] .= ' AND u.type = 2'; // Customer/Prospect categories
 
-        // Add extra fields
-        $sql = "SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'societe' AND entity IN (0, ".$conf->entity.")";
-        $resql = $this->db->query($sql);
-        if ($resql)    // This can fail when class is used on old database (during migration for example)
-        {
-            while ($obj = $this->db->fetch_object($resql))
-            {
-                $fieldname = 'extra.'.$obj->name;
-                $fieldlabel = ucfirst($obj->label);
-                $typeFilter = "Text";
-                switch ($obj->type)
-                {
-                    case 'int':
-                    case 'double':
-                    case 'price':
-                        $typeFilter = "Numeric";
-                        break;
-                    case 'date':
-                    case 'datetime':
-                        $typeFilter = "Date";
-                        break;
-                    case 'boolean':
-                        $typeFilter = "Boolean";
-                        break;
-                    case 'sellist':
-                        $typeFilter = "List:".$obj->param;
-                        break;
-                    case 'select':
-                        $typeFilter = "Select:".$obj->param;
-                        break;
-                }
-                $this->export_fields_array[$r][$fieldname] = $fieldlabel;
-                $this->export_TypeFields_array[$r][$fieldname] = $typeFilter;
-                $this->export_entities_array[$r][$fieldname] = 'company';
-            }
-        }
-        // End add axtra fields
-
-
-
-
-
 		$r++;
 		$this->export_code[$r] = 'category_'.$r;
 		$this->export_label[$r] = 'CatProdList';
 		$this->export_icon[$r] = 'category';
-        $this->export_enabled[$r] = '$conf->product->enabled || $conf->service->enabled';
+		$this->export_enabled[$r] = '$conf->product->enabled || $conf->service->enabled';
 		$this->export_permission[$r] = array(array("categorie", "lire"), array("produit", "lire"));
 		$this->export_fields_array[$r] = array('u.rowid'=>"CategId", 'u.label'=>"Label", 'u.description'=>"Description", 'p.rowid'=>'ProductId', 'p.ref'=>'Ref');
 		$this->export_TypeFields_array[$r] = array('u.label'=>"Text", 'u.description'=>"Text", 'p.ref'=>'Text');
@@ -245,7 +209,7 @@ class modCategorie extends DolibarrModules
 		$this->export_code[$r] = 'category_'.$r;
 		$this->export_label[$r] = 'CatMemberList';
 		$this->export_icon[$r] = 'category';
-        $this->export_enabled[$r] = '$conf->adherent->enabled';
+		$this->export_enabled[$r] = '$conf->adherent->enabled';
 		$this->export_permission[$r] = array(array("categorie", "lire"), array("adherent", "lire"));
 		$this->export_fields_array[$r] = array('u.rowid'=>"CategId", 'u.label'=>"Label", 'u.description'=>"Description", 'p.rowid'=>'MemberId', 'p.lastname'=>'LastName', 'p.firstname'=>'Firstname');
 		$this->export_TypeFields_array[$r] = array('u.label'=>"Text", 'u.description'=>"Text", 'p.lastname'=>'Text', 'p.firstname'=>'Text');
@@ -284,7 +248,7 @@ class modCategorie extends DolibarrModules
 			'p.email' => 'Email',
 			'p.note_private' => 'NotePrivate',
 			'p.note_public' => 'NotePublic',
-            'p.statut' => 'Status',
+			'p.statut' => 'Status',
 			's.nom'=>"Name",
 			's.client'=>"Customer",
 			's.fournisseur'=>"Supplier",
@@ -302,7 +266,7 @@ class modCategorie extends DolibarrModules
 			'u.description' => "Text",
 			'p.lastname' => 'Text',
 			'p.firstname' => 'Text',
-            'p.statut'=>"Numeric",
+			'p.statut'=>"Numeric",
 			's.nom'=>"Text",
 			's.status'=>"Text",
 			's.address'=>"Text",
@@ -335,7 +299,7 @@ class modCategorie extends DolibarrModules
 			'p.email' => 'contact',
 			'p.note_private' => 'contact',
 			'p.note_public' => 'contact',
-            'p.statut' => 'contact',
+			'p.statut' => 'contact',
 			's.nom'=>"company",
 			's.client'=>"company",
 			's.fournisseur'=>"company",
@@ -349,49 +313,49 @@ class modCategorie extends DolibarrModules
 			's.email'=>"company"
 		); // We define here only fields that use another picto
 
-        // Add extra fields
-        $sql = "SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'socpeople' AND entity IN (0, ".$conf->entity.")";
-        $resql = $this->db->query($sql);
-        if ($resql)    // This can fail when class is used on old database (during migration for example)
-        {
-        	while ($obj = $this->db->fetch_object($resql))
-        	{
-        		$fieldname = 'extra.'.$obj->name;
-        		$fieldlabel = ucfirst($obj->label);
-        		$typeFilter = "Text";
-        		switch ($obj->type)
-        		{
-        			case 'int':
-        			case 'double':
-        			case 'price':
-        				$typeFilter = "Numeric";
-        				break;
-        			case 'date':
-        			case 'datetime':
-        				$typeFilter = "Date";
-        				break;
-        			case 'boolean':
-        				$typeFilter = "Boolean";
-        				break;
-        			case 'sellist':
-        				$typeFilter = "List:".$obj->param;
-        				break;
+		// Add extra fields
+		$sql = "SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'socpeople' AND entity IN (0, ".$conf->entity.")";
+		$resql = $this->db->query($sql);
+		if ($resql)    // This can fail when class is used on old database (during migration for example)
+		{
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$fieldname = 'extra.'.$obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$typeFilter = "Text";
+				switch ($obj->type)
+				{
+					case 'int':
+					case 'double':
+					case 'price':
+						$typeFilter = "Numeric";
+						break;
+					case 'date':
+					case 'datetime':
+						$typeFilter = "Date";
+						break;
+					case 'boolean':
+						$typeFilter = "Boolean";
+						break;
+					case 'sellist':
+						$typeFilter = "List:".$obj->param;
+						break;
 					case 'select':
 						$typeFilter = "Select:".$obj->param;
 						break;
-        		}
-        		$this->export_fields_array[$r][$fieldname] = $fieldlabel;
-        		$this->export_TypeFields_array[$r][$fieldname] = $typeFilter;
-        		$this->export_entities_array[$r][$fieldname] = 'contact';
-        	}
-        }
-        // End add axtra fields
+				}
+				$this->export_fields_array[$r][$fieldname] = $fieldlabel;
+				$this->export_TypeFields_array[$r][$fieldname] = $typeFilter;
+				$this->export_entities_array[$r][$fieldname] = 'contact';
+			}
+		}
+		// End add axtra fields
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_contact as cp, '.MAIN_DB_PREFIX.'socpeople as p';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as country ON p.fk_pays = country.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc';
-        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra ON extra.fk_object = p.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra ON extra.fk_object = p.rowid';
 		$this->export_sql_end[$r] .= ' WHERE u.rowid = cp.fk_categorie AND cp.fk_socpeople = p.rowid AND u.entity IN ('.getEntity('category').')';
 		$this->export_sql_end[$r] .= ' AND u.type = 4'; // contact categories
 
@@ -406,30 +370,30 @@ class modCategorie extends DolibarrModules
 		$this->import_icon[$r] = $this->picto;
 		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
 		$this->import_tables_array[$r] = array('ca'=>MAIN_DB_PREFIX.'categorie');
-        $this->import_fields_array[$r] = array(
-            'ca.label'=>"Label*", 'ca.type'=>"Type*", 'ca.description'=>"Description",
-            'ca.fk_parent' => 'Parent'
-        );
-		$this->import_regex_array[$r] = array('ca.type'=>'^[0|1|2|3]');
-        $this->import_convertvalue_array[$r] = array(
-            'ca.fk_parent' => array(
-                'rule'          => 'fetchidfromcodeandlabel',
-                'classfile'     => '/categories/class/categorie.class.php',
-                'class'         => 'Categorie',
-                'method'        => 'fetch',
-                'element'       => 'category',
-                'codefromfield' => 'ca.type'
-            )
-        );
+		$this->import_fields_array[$r] = array(
+			'ca.label'=>"Label*", 'ca.type'=>"Type*", 'ca.description'=>"Description",
+			'ca.fk_parent' => 'Parent'
+		);
+		$this->import_regex_array[$r] = array('ca.type'=>'^\d+$');
+		$this->import_convertvalue_array[$r] = array(
+			'ca.fk_parent' => array(
+				'rule'          => 'fetchidfromcodeandlabel',
+				'classfile'     => '/categories/class/categorie.class.php',
+				'class'         => 'Categorie',
+				'method'        => 'fetch',
+				'element'       => 'category',
+				'codefromfield' => 'ca.type'
+			)
+		);
 		$typeexample = "";
-		if ($conf->product->enabled) { $typeexample .= ($typeexample ? "/" : "")."0=Product"; }
+		if (!empty($conf->product->enabled)) { $typeexample .= ($typeexample ? "/" : "")."0=Product"; }
 		if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) { $typeexample .= ($typeexample ? "/" : "")."1=Supplier"; }
-		if ($conf->societe->enabled) { $typeexample .= ($typeexample ? "/" : "")."2=Customer-Prospect"; }
-		if ($conf->adherent->enabled) { $typeexample .= ($typeexample ? "/" : "")."3=Member"; }
-        $this->import_examplevalues_array[$r] = array(
-            'ca.label'=>"Supplier Category", 'ca.type'=>$typeexample, 'ca.description'=>"My Category description",
-            'ca.fk_parent' => '0'
-        );
+		if (!empty($conf->societe->enabled)) { $typeexample .= ($typeexample ? "/" : "")."2=Customer-Prospect"; }
+		if (!empty($conf->adherent->enabled)) { $typeexample .= ($typeexample ? "/" : "")."3=Member"; }
+		$this->import_examplevalues_array[$r] = array(
+			'ca.label'=>"Supplier Category", 'ca.type'=>$typeexample, 'ca.description'=>"My Category description",
+			'ca.fk_parent' => '0'
+		);
 
 		if (!empty($conf->product->enabled))
 		{
@@ -515,14 +479,14 @@ class modCategorie extends DolibarrModules
 	}
 
 
-    /**
+	/**
 	 *		Function called when module is enabled.
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
-     */
+	 */
 	public function init($options = '')
 	{
 		// Permissions
diff --git a/htdocs/core/modules/modCollab.class.php b/htdocs/core/modules/modCollab.class.php
index 345a292cb92..1f777a4a117 100644
--- a/htdocs/core/modules/modCollab.class.php
+++ b/htdocs/core/modules/modCollab.class.php
@@ -31,65 +31,65 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modCollab extends DolibarrModules
 {
 
-    /**
-     *   Constructor. Define names, constants, directories, boxes, permissions
-     *
-     *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        global $langs, $conf;
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $langs, $conf;
 
-        $this->db = $db;
-        $this->numero = 30000;
+		$this->db = $db;
+		$this->numero = 30000;
 
-        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-        // It is used to group modules in module setup page
-        $this->family = "portal";
-        $this->module_position = '51';
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        $this->description = "Enable the public collaboration features, like shared pad, shared online sheets, etc...";
-        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'development';
-        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        $this->picto = 'website';
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
+		$this->family = "portal";
+		$this->module_position = '51';
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		$this->description = "Enable the public collaboration features, like shared pad, shared online sheets, etc...";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'development';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		$this->picto = 'website';
 
-        // Data directories to create when module is enabled
-        $this->dirs = array("/collab/temp");
+		// Data directories to create when module is enabled
+		$this->dirs = array("/collab/temp");
 
-        // Config pages
-        //-------------
-        $this->config_page_url = array(/*'collab.php'*/);
+		// Config pages
+		//-------------
+		$this->config_page_url = array(/*'collab.php'*/);
 
-        // Dependancies
-        //-------------
-        $this->hidden = !empty($conf->global->MODULE_COLLAB_DISABLED); // A condition to disable module
-        $this->depends = array(); // List of modules id that must be enabled if this module is enabled
-        $this->requiredby = array(); // List of modules id to disable if this one is disabled
-        $this->conflictwith = array(); // List of modules id this module is in conflict with
-        $this->langfiles = array("collab");
+		// Dependancies
+		//-------------
+		$this->hidden = !empty($conf->global->MODULE_COLLAB_DISABLED); // A condition to disable module
+		$this->depends = array(); // List of modules id that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of modules id to disable if this one is disabled
+		$this->conflictwith = array(); // List of modules id this module is in conflict with
+		$this->langfiles = array("collab");
 
-        // Constants
-        //-----------
-           $this->const = array();
+		// Constants
+		//-----------
+		   $this->const = array();
 
-        // New pages on tabs
-        // -----------------
-        $this->tabs = array();
+		// New pages on tabs
+		// -----------------
+		$this->tabs = array();
 
-        // Boxes
-        //------
-        $this->boxes = array();
+		// Boxes
+		//------
+		$this->boxes = array();
 
-        // Permissions
-        $this->rights = array(); // Permission array used by this module
-        $this->rights_class = 'collab';
-        $r = 0;
+		// Permissions
+		$this->rights = array(); // Permission array used by this module
+		$this->rights_class = 'collab';
+		$r = 0;
 
-        /*$this->rights[$r][0] = 30001;
+		/*$this->rights[$r][0] = 30001;
         $this->rights[$r][1] = 'Read website content';
         $this->rights[$r][3] = 0;
         $this->rights[$r][4] = 'read';
@@ -107,21 +107,21 @@ class modCollab extends DolibarrModules
         $this->rights[$r][4] = 'delete';
         $r++;*/
 
-        // Main menu entries
-        $r = 0;
-        $this->menu[$r] = array(
+		// Main menu entries
+		$r = 0;
+		$this->menu[$r] = array(
 			'fk_menu'=>'0', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-            'type'=>'top', // This is a Left menu entry
-            'titre'=>'Collab',
-            'mainmenu'=>'collab',
-            'url'=>'/collab/index.php',
-            'langs'=>'collab', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-            'position'=>100,
-            'enabled'=>'$conf->collab->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-            'perms'=>'1', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-            'target'=>'',
-            'user'=>2				                // 0=Menu for internal users, 1=external users, 2=both
-        );
-        $r++;
-    }
+			'type'=>'top', // This is a Left menu entry
+			'titre'=>'Collab',
+			'mainmenu'=>'collab',
+			'url'=>'/collab/index.php',
+			'langs'=>'collab', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>100,
+			'enabled'=>'$conf->collab->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms'=>'1', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+			'target'=>'',
+			'user'=>2				                // 0=Menu for internal users, 1=external users, 2=both
+		);
+		$r++;
+	}
 }
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index 5c9ca314bef..84a46c49d63 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2004		Eric Seigne				<eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2012		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2020		Ahmad Jamaly Rabub		<rabib@metroworks.co.jp>
  *
  * 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
@@ -144,7 +145,7 @@ class modCommande extends DolibarrModules
 		$this->rights[$r][2] = 'd';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'order_advance';
-        $this->rights[$r][5] = 'send';
+		$this->rights[$r][5] = 'send';
 
 		$r++;
 		$this->rights[$r][0] = 87;
@@ -204,11 +205,11 @@ class modCommande extends DolibarrModules
 		);
 		if (!empty($conf->multicurrency->enabled))
 		{
-		    $this->export_fields_array[$r]['c.multicurrency_code'] = 'Currency';
-		    $this->export_fields_array[$r]['c.multicurrency_tx'] = 'CurrencyRate';
-		    $this->export_fields_array[$r]['c.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
-		    $this->export_fields_array[$r]['c.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
-		    $this->export_fields_array[$r]['c.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
+			$this->export_fields_array[$r]['c.multicurrency_code'] = 'Currency';
+			$this->export_fields_array[$r]['c.multicurrency_tx'] = 'CurrencyRate';
+			$this->export_fields_array[$r]['c.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
+			$this->export_fields_array[$r]['c.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
+			$this->export_fields_array[$r]['c.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
 		}
 		//$this->export_TypeFields_array[$r]=array(
 		//	's.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label',
@@ -262,6 +263,161 @@ class modCommande extends DolibarrModules
 		$this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_commande';
 		$this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('commande').')';
 		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.(empty($user) ? 0 : $user->id);
+		// Imports
+		//--------
+		$r = 0;
+		//Import Order Header
+
+		$r++;
+		$this->import_code[$r] = 'commande_'.$r;
+		$this->import_label[$r] = 'Sales Orders';
+		$this->import_icon[$r] = $this->picto;
+		$this->import_entities_array[$r] = [];
+		$this->import_tables_array[$r] = ['c' => MAIN_DB_PREFIX.'commande', 'extra' => MAIN_DB_PREFIX.'commande_extrafields'];
+		$this->import_tables_creator_array[$r] = ['c' => 'fk_user_author']; // Fields to store import user id
+		$this->import_fields_array[$r] = [
+			'c.ref'               => 'Document Ref*',
+			'c.ref_client'        => 'RefCustomer',
+			'c.fk_soc'            => 'ThirdPartyName*',
+			'c.fk_projet'         => 'ProjectId',
+			'c.date_creation'     => 'DateCreation',
+			'c.date_valid'        => 'DateValid',
+			'c.date_commande'     => 'DateOrder',
+			'c.fk_user_modif'     => 'ModifiedById',
+			'c.fk_user_valid'     => 'ValidatedById',
+			'c.fk_statut'         => 'Status*',
+			'c.remise_percent'    => 'GlobalDiscount',
+			'c.tva'               => 'TotalTVA',
+			'c.total_ht'          => 'TotalHT',
+			'c.total_ttc'         => 'TotalTTC',
+			'c.note_private'      => 'NotePrivate',
+			'c.note_public'       => 'Note',
+			'c.facture'           => 'Invoice(1/0)',
+			'c.date_livraison'    => 'DeliveryDate',
+			'c.fk_cond_reglement' => 'Payment Condition',
+			'c.fk_mode_reglement' => 'Payment Mode',
+			'c.model_pdf'         => 'Model'
+		];
+
+		if (!empty($conf->multicurrency->enabled)) {
+			$this->import_fields_array[$r]['c.multicurrency_code']      = 'Currency';
+			$this->import_fields_array[$r]['c.multicurrency_tx']        = 'CurrencyRate';
+			$this->import_fields_array[$r]['c.multicurrency_total_ht']  = 'MulticurrencyAmountHT';
+			$this->import_fields_array[$r]['c.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
+			$this->import_fields_array[$r]['c.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
+		}
+
+		// Add extra fields
+		$import_extrafield_sample = [];
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commande' AND entity IN (0, ".$conf->entity.")";
+		$resql = $this->db->query($sql);
+
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$fieldname = 'extra.'.$obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+				$import_extrafield_sample[$fieldname] = $fieldlabel;
+			}
+		}
+		// End add extra fields
+
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'commande'];
+		$this->import_regex_array[$r] = [
+			'c.ref' => '(CPV\d{4}-\d{4}|CO\d{4}-\d{4}|PROV.{1,32}$)',
+			'c.multicurrency_code' => 'code@'.MAIN_DB_PREFIX.'multicurrency'
+		];
+
+		$this->import_updatekeys_array[$r] = ['c.ref' => 'Ref'];
+		$this->import_convertvalue_array[$r] = [
+			'c.fk_soc' => [
+				'rule'    => 'fetchidfromref',
+				'file'    => '/societe/class/societe.class.php',
+				'class'   => 'Societe',
+				'method'  => 'fetch',
+				'element' => 'ThirdParty'
+			],
+			'c.fk_user_valid' => [
+				'rule'    => 'fetchidfromref',
+				'file'    => '/user/class/user.class.php',
+				'class'   => 'User',
+				'method'  => 'fetch',
+				'element' => 'user'
+			],
+			'c.fk_mode_reglement' => [
+				'rule' => 'fetchidfromcodeorlabel',
+				'file' => '/compta/paiement/class/cpaiement.class.php',
+				'class' => 'Cpaiement',
+				'method' => 'fetch',
+				'element' => 'cpayment'
+			],
+		];
+
+		//Import CPV Lines
+		$r++;
+		$this->import_code[$r] = 'commande_lines_'.$r;
+		$this->import_label[$r] = 'Order Details';
+		$this->import_icon[$r] = $this->picto;
+		$this->import_entities_array[$r] = [];
+		$this->import_tables_array[$r] = ['cd' => MAIN_DB_PREFIX.'commandedet', 'extra' => MAIN_DB_PREFIX.'commandedet_extrafields'];
+		$this->import_fields_array[$r] = [
+			'cd.fk_commande'    => 'Document Ref*',
+			'cd.fk_parent_line' => 'PrParentLine',
+			'cd.fk_product'     => 'IdProduct',
+			'cd.label'          => 'Label',
+			'cd.description'    => 'LineDescription',
+			'cd.tva_tx'         => 'LineVATRate',
+			'cd.qty'            => 'LineQty',
+			'cd.remise_percent' => 'Reduc. Percent',
+			'cd.remise'         => 'Reduc.',
+			'cd.price'          => 'Price',
+			'cd.subprice'       => 'Sub Price',
+			'cd.total_ht'       => 'LineTotalHT',
+			'cd.total_tva'      => 'LineTotalVAT',
+			'cd.total_ttc'      => 'LineTotalTTC',
+			'cd.product_type'   => 'TypeOfLineServiceOrProduct',
+			'cd.date_start'     => 'Start Date',
+			'cd.date_end'       => 'End Date',
+			'cd.buy_price_ht'   => 'LineBuyPriceHT',
+			'cd.rang'           => 'LinePosition'
+		];
+
+		if (!empty($conf->multicurrency->enabled)) {
+			$this->import_fields_array[$r]['cd.multicurrency_code'] = 'Currency';
+			$this->import_fields_array[$r]['cd.multicurrency_subprice'] = 'CurrencyRate';
+			$this->import_fields_array[$r]['cd.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
+			$this->import_fields_array[$r]['cd.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
+			$this->import_fields_array[$r]['cd.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
+		}
+
+		// Add extra fields
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commandedet' AND entity IN (0, ".$conf->entity.")";
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$fieldname = 'extra.'.$obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+			}
+		}
+		// End add extra fields
+
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'commandedet'];
+		$this->import_regex_array[$r] = [
+			'cd.product_type'       => '[0|1]$',
+			'cd.fk_product'         => 'rowid@'.MAIN_DB_PREFIX.'product',
+			'cd.multicurrency_code' => 'code@'.MAIN_DB_PREFIX.'multicurrency'
+		];
+		$this->import_updatekeys_array[$r] = ['cd.fk_commande' => 'Sales Order Id', 'cd.fk_product' => 'Product Id'];
+		$this->import_convertvalue_array[$r] = [
+			'cd.fk_commande' => [
+				'rule'    => 'fetchidfromref',
+				'file'    => '/commande/class/commande.class.php',
+				'class'   => 'Commande',
+				'method'  => 'fetch',
+				'element' => 'commande'
+			],
+		];
 	}
 
 
@@ -270,7 +426,7 @@ class modCommande extends DolibarrModules
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'newboxdefonly', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'newboxdefonly', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
diff --git a/htdocs/core/modules/modComptabilite.class.php b/htdocs/core/modules/modComptabilite.class.php
index 508977e2396..7ee9fe3c70f 100644
--- a/htdocs/core/modules/modComptabilite.class.php
+++ b/htdocs/core/modules/modComptabilite.class.php
@@ -35,11 +35,11 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modComptabilite extends DolibarrModules
 {
 
-    /**
-     *   Constructor. Define names, constants, directories, boxes, permissions
-     *
-     *   @param      DoliDB		$db      Database handler
-     */
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
 	public function __construct($db)
 	{
 		global $conf;
@@ -57,7 +57,7 @@ class modComptabilite extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        $this->picto = 'accounting';
+		$this->picto = 'accounting';
 
 		// Config pages
 		$this->config_page_url = array("compta.php");
@@ -72,12 +72,12 @@ class modComptabilite extends DolibarrModules
 		$this->const = array();
 
 		// Data directories to create when module is enabled
-        $this->dirs = array(
-            "/comptabilite/temp",
-            "/comptabilite/rapport",
-            "/comptabilite/export",
-            "/comptabilite/bordereau"
-        );
+		$this->dirs = array(
+			"/comptabilite/temp",
+			"/comptabilite/rapport",
+			"/comptabilite/export",
+			"/comptabilite/bordereau"
+		);
 
 		// Boxes
 		$this->boxes = array();
@@ -102,16 +102,16 @@ class modComptabilite extends DolibarrModules
 	}
 
 
-    /**
-     *  Function called when module is enabled.
+	/**
+	 *  Function called when module is enabled.
 	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *  It also creates data directories
 	 *
-     *  @param      string	$options    Options when enabling module ('', 'noboxes')
-     *  @return     int             	1 if OK, 0 if KO
-    */
-    public function init($options = '')
-    {
+	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *  @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
 		global $conf;
 
 		// Nettoyage avant activation
diff --git a/htdocs/core/modules/modContrat.class.php b/htdocs/core/modules/modContrat.class.php
index 31c7a136aac..d58e1d8497a 100644
--- a/htdocs/core/modules/modContrat.class.php
+++ b/htdocs/core/modules/modContrat.class.php
@@ -215,7 +215,7 @@ class modContrat extends DolibarrModules
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
@@ -232,20 +232,20 @@ class modContrat extends DolibarrModules
 
 		if (file_exists($src) && !file_exists($dest))
 		{
-		    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		    dol_mkdir($dirodt);
-		    $result = dol_copy($src, $dest, 0, 0);
-		    if ($result < 0)
-		    {
-		        $langs->load("errors");
-		        $this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
-		        return 0;
-		    }
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			dol_mkdir($dirodt);
+			$result = dol_copy($src, $dest, 0, 0);
+			if ($result < 0)
+			{
+				$langs->load("errors");
+				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
+				return 0;
+			}
 		}
 
 		$sql = array(
-		    "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[1][2])."' AND type = 'contract' AND entity = ".$conf->entity,
-		    "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[1][2])."','contract',".$conf->entity.")"
+			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[1][2])."' AND type = 'contract' AND entity = ".$conf->entity,
+			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[1][2])."','contract',".$conf->entity.")"
 		);
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modCron.class.php b/htdocs/core/modules/modCron.class.php
index aebafb5b2d6..deb140f76e4 100644
--- a/htdocs/core/modules/modCron.class.php
+++ b/htdocs/core/modules/modCron.class.php
@@ -32,37 +32,37 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modCron extends DolibarrModules
 {
 
-    /**
+	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
 	 *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-    	global $langs, $conf;
+	 */
+	public function __construct($db)
+	{
+		global $langs, $conf;
 
-        $this->db = $db;
-        $this->numero = 2300;
+		$this->db = $db;
+		$this->numero = 2300;
 
 		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
 		// It is used to group modules in module setup page
-        $this->family = "base";
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        $this->description = "Enable the Dolibarr cron service";
+		$this->family = "base";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		$this->description = "Enable the Dolibarr cron service";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
-        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        $this->picto = 'technic';
+		$this->version = 'dolibarr';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		$this->picto = 'technic';
 
-        // Data directories to create when module is enabled
-        $this->dirs = array();
+		// Data directories to create when module is enabled
+		$this->dirs = array();
 
-        // Config pages
-        //-------------
-        $this->config_page_url = array("cron.php@cron");
+		// Config pages
+		//-------------
+		$this->config_page_url = array("cron.php@cron");
 
 		// Dependancies
 		//-------------
@@ -85,13 +85,15 @@ class modCron extends DolibarrModules
 					0
 				),);
 
-        // New pages on tabs
-        // -----------------
-        $this->tabs = array();
+		// New pages on tabs
+		// -----------------
+		$this->tabs = array();
 
-        // Boxes
-        //------
-        $this->boxes = array();
+		// Boxes
+		//------
+		$this->boxes = array(
+			0 => array('file' => 'box_scheduled_jobs.php', 'enabledbydefaulton' => 'Home')
+		);
 
 		// Cronjobs
 		$this->cronjobs = array(
@@ -100,7 +102,7 @@ class modCron extends DolibarrModules
 			// 1=>array('entity'=>0, 'label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24)
 		);
 
-        // Permissions
+		// Permissions
 		$this->rights = array(); // Permission array used by this module
 		$this->rights_class = 'cron';
 		$r = 0;
@@ -129,18 +131,18 @@ class modCron extends DolibarrModules
 		$this->rights[$r][4] = 'execute';
 		$r++;
 
-        // Main menu entries
-        $r = 0;
-        $this->menu[$r] = array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-						        'type'=>'left', // This is a Left menu entry
-						        'titre'=>'CronList',
-						        'url'=>'/cron/list.php?leftmenu=admintools',
-						        'langs'=>'cron', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-						        'position'=>200,
-						        'enabled'=>'$conf->cron->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-						        'perms'=>'$user->rights->cron->read', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-						        'target'=>'',
-						        'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
-        $r++;
-    }
+		// Main menu entries
+		$r = 0;
+		$this->menu[$r] = array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+								'type'=>'left', // This is a Left menu entry
+								'titre'=>'CronList',
+								'url'=>'/cron/list.php?leftmenu=admintools',
+								'langs'=>'cron', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+								'position'=>200,
+								'enabled'=>'$conf->cron->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+								'perms'=>'$user->rights->cron->read', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+								'target'=>'',
+								'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
+		$r++;
+	}
 }
diff --git a/htdocs/core/modules/modDataPolicy.class.php b/htdocs/core/modules/modDataPolicy.class.php
index ca9933d2eb5..54d29595982 100644
--- a/htdocs/core/modules/modDataPolicy.class.php
+++ b/htdocs/core/modules/modDataPolicy.class.php
@@ -37,187 +37,187 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modDataPolicy extends DolibarrModules {
 
-    // @codingStandardsIgnoreEnd
-    /**
-     * Constructor. Define names, constants, directories, boxes, permissions
-     *
-     * @param DoliDB $db Database handler
-     */
-    public function __construct($db)
-    {
-        global $langs, $conf;
+	// @codingStandardsIgnoreEnd
+	/**
+	 * Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		global $langs, $conf;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        // Id for module (must be unique).
-        // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-        $this->numero = 4100;
-        // Key text used to identify module (for permissions, menus, etc...)
-        $this->rights_class = 'datapolicy';
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 4100;
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'datapolicy';
 
-        // Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
-        // It is used to group modules by family in module setup page
-        $this->family = "technic";
-        // Module position in the family on 2 digits ('01', '10', '20', ...)
-        $this->module_position = '78';
-        // Gives the possibility to the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
-        //$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
-        // Module label (no space allowed), used if translation string 'ModuledatapolicyName' not found (MyModue is name of module).
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        // Module description, used if translation string 'ModuledatapolicyDesc' not found (MyModue is name of module).
-        $this->description = "Module to manage Data policy (for compliance with GDPR in Europe or other Data policy rules)";
-        // Used only if file README.md and README-LL.md not found.
-        $this->descriptionlong = "";
+		// Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
+		// It is used to group modules by family in module setup page
+		$this->family = "technic";
+		// Module position in the family on 2 digits ('01', '10', '20', ...)
+		$this->module_position = '78';
+		// Gives the possibility to the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
+		//$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
+		// Module label (no space allowed), used if translation string 'ModuledatapolicyName' not found (MyModue is name of module).
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		// Module description, used if translation string 'ModuledatapolicyDesc' not found (MyModue is name of module).
+		$this->description = "Module to manage Data policy (for compliance with GDPR in Europe or other Data policy rules)";
+		// Used only if file README.md and README-LL.md not found.
+		$this->descriptionlong = "";
 
-        // Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-        $this->version = 'experimental';
-        // Key used in llx_const table to save module status enabled/disabled (where datapolicy is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-        // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-        $this->picto = 'generic';
+		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
+		$this->version = 'experimental';
+		// Key used in llx_const table to save module status enabled/disabled (where datapolicy is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+		$this->picto = 'generic';
 
-        // Defined all module parts (triggers, login, substitutions, menus, css, etc...)
-        // for default path (eg: /datapolicy/core/xxxxx) (0=disable, 1=enable)
-        // for specific path of parts (eg: /datapolicy/core/modules/barcode)
-        // for specific css file (eg: /datapolicy/css/datapolicy.css.php)
-        $this->module_parts = array(
-            'triggers' => 0, // Set this to 1 if module has its own trigger directory (core/triggers)
-            'login' => 0, // Set this to 1 if module has its own login method file (core/login)
-            'substitutions' => 0, // Set this to 1 if module has its own substitution function file (core/substitutions)
-            'menus' => 0, // Set this to 1 if module has its own menus handler directory (core/menus)
-            'theme' => 0, // Set this to 1 if module has its own theme directory (theme)
-            'tpl' => 0, // Set this to 1 if module overwrite template dir (core/tpl)
-            'barcode' => 0, // Set this to 1 if module has its own barcode directory (core/modules/barcode)
-            'models' => 0, // Set this to 1 if module has its own models directory (core/modules/xxx)
-            'hooks' => array('data' => array('membercard', 'contactcard', 'thirdpartycard'), 'entity' => $conf->entity)  // Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context 'all'
-        );
+		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
+		// for default path (eg: /datapolicy/core/xxxxx) (0=disable, 1=enable)
+		// for specific path of parts (eg: /datapolicy/core/modules/barcode)
+		// for specific css file (eg: /datapolicy/css/datapolicy.css.php)
+		$this->module_parts = array(
+			'triggers' => 0, // Set this to 1 if module has its own trigger directory (core/triggers)
+			'login' => 0, // Set this to 1 if module has its own login method file (core/login)
+			'substitutions' => 0, // Set this to 1 if module has its own substitution function file (core/substitutions)
+			'menus' => 0, // Set this to 1 if module has its own menus handler directory (core/menus)
+			'theme' => 0, // Set this to 1 if module has its own theme directory (theme)
+			'tpl' => 0, // Set this to 1 if module overwrite template dir (core/tpl)
+			'barcode' => 0, // Set this to 1 if module has its own barcode directory (core/modules/barcode)
+			'models' => 0, // Set this to 1 if module has its own models directory (core/modules/xxx)
+			'hooks' => array('data' => array('membercard', 'contactcard', 'thirdpartycard'), 'entity' => $conf->entity)  // Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context 'all'
+		);
 
-        // Data directories to create when module is enabled.
-        // Example: this->dirs = array("/datapolicy/temp","/datapolicy/subdir");
-        $this->dirs = array("/datapolicy/temp");
+		// Data directories to create when module is enabled.
+		// Example: this->dirs = array("/datapolicy/temp","/datapolicy/subdir");
+		$this->dirs = array("/datapolicy/temp");
 
-        // Config pages. Put here list of php page, stored into datapolicy/admin directory, to use to setup module.
-        $this->config_page_url = array("setup.php@datapolicy");
+		// Config pages. Put here list of php page, stored into datapolicy/admin directory, to use to setup module.
+		$this->config_page_url = array("setup.php@datapolicy");
 
-        // Dependencies
-        $this->hidden = false; // A condition to hide module
-        $this->depends = array('always'=>'modCron'); // List of module class names as string that must be enabled if this module is enabled
-        $this->requiredby = array(); // List of module ids to disable if this one is disabled
-        $this->conflictwith = array(); // List of module class names as string this module is in conflict with
-        $this->langfiles = array("datapolicy@datapolicy");
-        $this->phpmin = array(5, 3); // Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(4, 0); // Minimum version of Dolibarr required by module
-        $this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-        $this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-        //$this->automatic_activation = array('FR'=>'datapolicyWasAutomaticallyActivatedBecauseOfYourCountryChoice');
-        //$this->always_enabled = true;								// If true, can't be disabled
-        // Constants
-        // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-        // Example: $this->const=array(0=>array('datapolicy_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
-        //                             1=>array('datapolicy_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
-        // );
-        $this->const = array(
-            array('DATAPOLICY_TIERS_CLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICY_TIERS_PROSPECT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICY_TIERS_PROSPECT_CLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICY_TIERS_NIPROSPECT_NICLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICY_TIERS_FOURNISSEUR', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICY_CONTACT_CLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICY_CONTACT_PROSPECT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICY_CONTACT_PROSPECT_CLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICY_CONTACT_FOURNISSEUR', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICY_ADHERENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-        );
+		// Dependencies
+		$this->hidden = false; // A condition to hide module
+		$this->depends = array('always'=>'modCron'); // List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of module ids to disable if this one is disabled
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
+		$this->langfiles = array("datapolicy@datapolicy");
+		$this->phpmin = array(5, 3); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(4, 0); // Minimum version of Dolibarr required by module
+		$this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		$this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		//$this->automatic_activation = array('FR'=>'datapolicyWasAutomaticallyActivatedBecauseOfYourCountryChoice');
+		//$this->always_enabled = true;								// If true, can't be disabled
+		// Constants
+		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example: $this->const=array(0=>array('datapolicy_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
+		//                             1=>array('datapolicy_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
+		// );
+		$this->const = array(
+			array('DATAPOLICY_TIERS_CLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+			array('DATAPOLICY_TIERS_PROSPECT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+			array('DATAPOLICY_TIERS_PROSPECT_CLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+			array('DATAPOLICY_TIERS_NIPROSPECT_NICLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+			array('DATAPOLICY_TIERS_FOURNISSEUR', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+			array('DATAPOLICY_CONTACT_CLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+			array('DATAPOLICY_CONTACT_PROSPECT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+			array('DATAPOLICY_CONTACT_PROSPECT_CLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+			array('DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+			array('DATAPOLICY_CONTACT_FOURNISSEUR', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+			array('DATAPOLICY_ADHERENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+		);
 
-        $country = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
+		$country = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
 
-        // Some keys to add into the overwriting translation tables
-        /* $this->overwrite_translation = array(
+		// Some keys to add into the overwriting translation tables
+		/* $this->overwrite_translation = array(
           'en_US:ParentCompany'=>'Parent company or reseller',
           'fr_FR:ParentCompany'=>'Maison mère ou revendeur'
           ) */
 
-        if (!isset($conf->datapolicy) || !isset($conf->datapolicy->enabled)) {
-            $conf->datapolicy = new stdClass();
-            $conf->datapolicy->enabled = 0;
-        }
+		if (!isset($conf->datapolicy) || !isset($conf->datapolicy->enabled)) {
+			$conf->datapolicy = new stdClass();
+			$conf->datapolicy->enabled = 0;
+		}
 
 
-        // Array to add new pages in new tabs
-        $this->tabs = array();
-        // Example:
-        // $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@datapolicy:$user->rights->datapolicy->read:/datapolicy/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
-        // $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@datapolicy:$user->rights->othermodule->read:/datapolicy/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
-        // $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
-        //
-        // Where objecttype can be
-        // 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
-        // 'contact'          to add a tab in contact view
-        // 'contract'         to add a tab in contract view
-        // 'group'            to add a tab in group view
-        // 'intervention'     to add a tab in intervention view
-        // 'invoice'          to add a tab in customer invoice view
-        // 'invoice_supplier' to add a tab in supplier invoice view
-        // 'member'           to add a tab in fundation member view
-        // 'opensurveypoll'	  to add a tab in opensurvey poll view
-        // 'order'            to add a tab in customer order view
-        // 'order_supplier'   to add a tab in supplier order view
-        // 'payment'		  to add a tab in payment view
-        // 'payment_supplier' to add a tab in supplier payment view
-        // 'product'          to add a tab in product view
-        // 'propal'           to add a tab in propal view
-        // 'project'          to add a tab in project view
-        // 'stock'            to add a tab in stock view
-        // 'thirdparty'       to add a tab in third party view
-        // 'user'             to add a tab in user view
+		// Array to add new pages in new tabs
+		$this->tabs = array();
+		// Example:
+		// $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@datapolicy:$user->rights->datapolicy->read:/datapolicy/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
+		// $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@datapolicy:$user->rights->othermodule->read:/datapolicy/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
+		// $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
+		//
+		// Where objecttype can be
+		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
+		// 'contact'          to add a tab in contact view
+		// 'contract'         to add a tab in contract view
+		// 'group'            to add a tab in group view
+		// 'intervention'     to add a tab in intervention view
+		// 'invoice'          to add a tab in customer invoice view
+		// 'invoice_supplier' to add a tab in supplier invoice view
+		// 'member'           to add a tab in fundation member view
+		// 'opensurveypoll'	  to add a tab in opensurvey poll view
+		// 'order'            to add a tab in customer order view
+		// 'order_supplier'   to add a tab in supplier order view
+		// 'payment'		  to add a tab in payment view
+		// 'payment_supplier' to add a tab in supplier payment view
+		// 'product'          to add a tab in product view
+		// 'propal'           to add a tab in propal view
+		// 'project'          to add a tab in project view
+		// 'stock'            to add a tab in stock view
+		// 'thirdparty'       to add a tab in third party view
+		// 'user'             to add a tab in user view
 
 
-        // Dictionaries
-        $this->dictionaries = array();
+		// Dictionaries
+		$this->dictionaries = array();
 
 
-        // Boxes/Widgets
-        // Add here list of php file(s) stored in datapolicy/core/boxes that contains class to show a widget.
-        $this->boxes = array();
+		// Boxes/Widgets
+		// Add here list of php file(s) stored in datapolicy/core/boxes that contains class to show a widget.
+		$this->boxes = array();
 
 
-        // Cronjobs (List of cron jobs entries to add when module is enabled)
-        // unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
-        $this->cronjobs = array(
-            0 => array('label' => 'DATAPOLICYJob', 'jobtype' => 'method', 'class' => 'datapolicy/class/datapolicycron.class.php', 'objectname' => 'DataPolicyCron', 'method' => 'cleanDataForDataPolicy', 'parameters' => '', 'comment' => 'Clean data', 'frequency' => 1, 'unitfrequency' => 86400, 'status' => 1, 'test' => '$conf->datapolicy->enabled'),
-        );
-        // Example: $this->cronjobs=array(0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>true),
-        //                                1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'status'=>0, 'test'=>true)
-        // );
-        // Permissions
-        $this->rights = array(); // Permission array used by this module
-        // Main menu entries
-        $this->menu = array(); // List of menus to add
-        $r = 0;
-    }
+		// Cronjobs (List of cron jobs entries to add when module is enabled)
+		// unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
+		$this->cronjobs = array(
+			0 => array('label' => 'DATAPOLICYJob', 'jobtype' => 'method', 'class' => 'datapolicy/class/datapolicycron.class.php', 'objectname' => 'DataPolicyCron', 'method' => 'cleanDataForDataPolicy', 'parameters' => '', 'comment' => 'Clean data', 'frequency' => 1, 'unitfrequency' => 86400, 'status' => 1, 'test' => '$conf->datapolicy->enabled'),
+		);
+		// Example: $this->cronjobs=array(0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>true),
+		//                                1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'status'=>0, 'test'=>true)
+		// );
+		// Permissions
+		$this->rights = array(); // Permission array used by this module
+		// Main menu entries
+		$this->menu = array(); // List of menus to add
+		$r = 0;
+	}
 
-    /**
-     * 	Function called when module is enabled.
-     * 	The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     * 	It also creates data directories
-     *
-     * 	@param      string	$options    Options when enabling module ('', 'noboxes')
-     * 	@return     int             	1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-        global $langs;
+	/**
+	 * 	Function called when module is enabled.
+	 * 	The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 * 	It also creates data directories
+	 *
+	 * 	@param      string	$options    Options when enabling module ('', 'noboxes')
+	 * 	@return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global $langs;
 
-        $this->_load_tables('/datapolicy/sql/');
+		$this->_load_tables('/datapolicy/sql/');
 
-        // Create extrafields
-        include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-        $extrafields = new ExtraFields($this->db);
+		// Create extrafields
+		include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+		$extrafields = new ExtraFields($this->db);
 
-        /*
+		/*
         // Extrafield contact
         $result1 = $extrafields->addExtraField('datapolicy_consentement', $langs->trans("DATAPOLICY_consentement"), 'boolean', 101, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
         $result1 = $extrafields->addExtraField('datapolicy_opposition_traitement', $langs->trans("DATAPOLICY_opposition_traitement"), 'boolean', 102, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
@@ -240,23 +240,23 @@ class modDataPolicy extends DolibarrModules {
         $result1 = $extrafields->addExtraField('datapolicy_send', $langs->trans("DATAPOLICY_send"), 'date', 105, 3, 'adherent', 0, 0, '', '', 0, '', '0', 0);
         */
 
-        $sql = array();
+		$sql = array();
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 
-    /**
-     * 	Function called when module is disabled.
-     * 	Remove from database constants, boxes and permissions from Dolibarr database.
-     * 	Data directories are not deleted
-     *
-     * 	@param      string	$options    Options when enabling module ('', 'noboxes')
-     * 	@return     int             	1 if OK, 0 if KO
-     */
-    public function remove($options = '')
-    {
-        $sql = array();
+	/**
+	 * 	Function called when module is disabled.
+	 * 	Remove from database constants, boxes and permissions from Dolibarr database.
+	 * 	Data directories are not deleted
+	 *
+	 * 	@param      string	$options    Options when enabling module ('', 'noboxes')
+	 * 	@return     int             	1 if OK, 0 if KO
+	 */
+	public function remove($options = '')
+	{
+		$sql = array();
 
-        return $this->_remove($sql, $options);
-    }
+		return $this->_remove($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modDebugBar.class.php b/htdocs/core/modules/modDebugBar.class.php
index f89f3659285..4d38e848bbe 100644
--- a/htdocs/core/modules/modDebugBar.class.php
+++ b/htdocs/core/modules/modDebugBar.class.php
@@ -32,77 +32,77 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modDebugBar extends DolibarrModules
 {
 
-    /**
-     *   Constructor. Define names, constants, directories, boxes, permissions
-     *
-     *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-        $this->numero = 43;
+		$this->numero = 43;
 
-        $this->rights_class = 'debugbar';
+		$this->rights_class = 'debugbar';
 
-        $this->family = "base";
-        $this->module_position = '75';
+		$this->family = "base";
+		$this->module_position = '75';
 
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        $this->description = "A tool for developper adding a debug bar in your browser.";
-        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        $this->picto = 'bug';
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		$this->description = "A tool for developper adding a debug bar in your browser.";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'dolibarr';
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		$this->picto = 'bug';
 
-        $this->module_parts = array('moduleforexternal' => 0);
+		$this->module_parts = array('moduleforexternal' => 0);
 
-        // Data directories to create when module is enabled
-        $this->dirs = array();
+		// Data directories to create when module is enabled
+		$this->dirs = array();
 
-        // Dependencies
-        $this->depends = array(); // May be used for product or service or third party module
-        $this->requiredby = array();
+		// Dependencies
+		$this->depends = array(); // May be used for product or service or third party module
+		$this->requiredby = array();
 
-        // Config pages
-        $this->config_page_url = array("debugbar.php");
+		// Config pages
+		$this->config_page_url = array("debugbar.php");
 
-        // Constants
-        // Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',0),
-        //							  1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0) );
-        $this->const = array();
+		// Constants
+		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',0),
+		//							  1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0) );
+		$this->const = array();
 
-        // Boxes
-        $this->boxes = array();
+		// Boxes
+		$this->boxes = array();
 
-        // Permissions
-        $this->rights = array();
+		// Permissions
+		$this->rights = array();
 
-        $this->rights[1][0] = 430; // id de la permission
-        $this->rights[1][1] = 'Use Debug Bar'; // libelle de la permission
-        $this->rights[1][2] = 'u'; // type de la permission (deprecie a ce jour)
-        $this->rights[1][3] = 1; // La permission est-elle une permission par defaut
-        $this->rights[1][4] = 'read';
-    }
+		$this->rights[1][0] = 430; // id de la permission
+		$this->rights[1][1] = 'Use Debug Bar'; // libelle de la permission
+		$this->rights[1][2] = 'u'; // type de la permission (deprecie a ce jour)
+		$this->rights[1][3] = 1; // La permission est-elle une permission par defaut
+		$this->rights[1][4] = 'read';
+	}
 
 
-    /**
-     *      Function called when module is enabled.
-     *      The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *      It also creates data directories.
-     *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-     *      @return     int             	1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-        // Permissions
-        $this->remove($options);
+	/**
+	 *      Function called when module is enabled.
+	 *      The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *      It also creates data directories.
+	 *
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		// Permissions
+		$this->remove($options);
 
-        $sql = array(
-        );
+		$sql = array(
+		);
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modDeplacement.class.php b/htdocs/core/modules/modDeplacement.class.php
index d89aac28e98..8e7ec7db4c2 100644
--- a/htdocs/core/modules/modDeplacement.class.php
+++ b/htdocs/core/modules/modDeplacement.class.php
@@ -45,7 +45,7 @@ class modDeplacement extends DolibarrModules
 		$this->numero = 75;
 
 		$this->family = "hr";
-		$this->module_position = '41';
+		$this->module_position = '43';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Gestion des notes de frais et deplacements"; // Si traduction Module75Desc non trouvee
@@ -89,13 +89,13 @@ class modDeplacement extends DolibarrModules
 		$this->rights[2][3] = 0;
 		$this->rights[2][4] = 'creer';
 
-    	$this->rights[3][0] = 173;
+		$this->rights[3][0] = 173;
 		$this->rights[3][1] = 'Supprimer les notes de frais et deplacements';
 		$this->rights[3][2] = 'd';
 		$this->rights[3][3] = 0;
 		$this->rights[3][4] = 'supprimer';
 
-    	$this->rights[4][0] = 174;
+		$this->rights[4][0] = 174;
 		$this->rights[4][1] = 'Lire toutes les notes de frais';
 		$this->rights[4][2] = 'd';
 		$this->rights[4][3] = 0;
@@ -120,10 +120,10 @@ class modDeplacement extends DolibarrModules
 		$this->export_code[$r] = 'trips_'.$r;
 		$this->export_label[$r] = 'ListTripsAndExpenses';
 		$this->export_permission[$r] = array(array("deplacement", "export"));
-        $this->export_fields_array[$r] = array('u.login'=>'Login', 'u.lastname'=>'Lastname', 'u.firstname'=>'Firstname', 'd.rowid'=>"TripId", 'd.type'=>"Type", 'd.km'=>"FeesKilometersOrAmout", 'd.dated'=>"Date", 'd.note_private'=>'NotePrivate', 'd.note_public'=>'NotePublic', 's.nom'=>'ThirdParty');
-        $this->export_TypeFields_array[$r] = array('u.rowid'=>'List:user:name', 'u.login'=>'Text', 'u.lastname'=>'Text', 'u.firstname'=>'Text', 'd.type'=>"Text", 'd.km'=>"Numeric", 'd.dated'=>"Date", 'd.note_private'=>'Text', 'd.note_public'=>'Text', 's.rowid'=>"List:societe:CompanyName", 's.nom'=>'Text');
-        $this->export_entities_array[$r] = array('u.login'=>'user', 'u.lastname'=>'user', 'u.firstname'=>'user', 'd.rowid'=>"trip", 'd.type'=>"trip", 'd.km'=>"trip", 'd.dated'=>"trip", 'd.note_private'=>'trip', 'd.note_public'=>'trip', 's.nom'=>'company');
-        $this->export_dependencies_array[$r] = array('trip'=>'d.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+		$this->export_fields_array[$r] = array('u.login'=>'Login', 'u.lastname'=>'Lastname', 'u.firstname'=>'Firstname', 'd.rowid'=>"TripId", 'd.type'=>"Type", 'd.km'=>"FeesKilometersOrAmout", 'd.dated'=>"Date", 'd.note_private'=>'NotePrivate', 'd.note_public'=>'NotePublic', 's.nom'=>'ThirdParty');
+		$this->export_TypeFields_array[$r] = array('u.rowid'=>'List:user:name', 'u.login'=>'Text', 'u.lastname'=>'Text', 'u.firstname'=>'Text', 'd.type'=>"Text", 'd.km'=>"Numeric", 'd.dated'=>"Date", 'd.note_private'=>'Text', 'd.note_public'=>'Text', 's.rowid'=>"List:societe:CompanyName", 's.nom'=>'Text');
+		$this->export_entities_array[$r] = array('u.login'=>'user', 'u.lastname'=>'user', 'u.firstname'=>'user', 'd.rowid'=>"trip", 'd.type'=>"trip", 'd.km'=>"trip", 'd.dated'=>"trip", 'd.note_private'=>'trip', 'd.note_public'=>'trip', 's.nom'=>'company');
+		$this->export_dependencies_array[$r] = array('trip'=>'d.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'user as u';
@@ -136,10 +136,10 @@ class modDeplacement extends DolibarrModules
 
 		if (!empty($user))   // Not defined during migration process
 		{
-    		$childids = $user->getAllChildIds();
-    		$childids[] = $user->id;
+			$childids = $user->getAllChildIds();
+			$childids[] = $user->id;
 
-    		if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $this->export_sql_end[$r] .= ' AND d.fk_user IN ('.join(',', $childids).')';
+			if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $this->export_sql_end[$r] .= ' AND d.fk_user IN ('.join(',', $childids).')';
 		}
 	}
 
@@ -149,7 +149,7 @@ class modDeplacement extends DolibarrModules
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
diff --git a/htdocs/core/modules/modDocumentGeneration.class.php b/htdocs/core/modules/modDocumentGeneration.class.php
index 698197f0275..2c2c2ed1888 100644
--- a/htdocs/core/modules/modDocumentGeneration.class.php
+++ b/htdocs/core/modules/modDocumentGeneration.class.php
@@ -100,11 +100,11 @@ class modDocumentGeneration extends DolibarrModules
 	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *  It also creates data directories
 	 *
-     *  @param      string  $options    Options when enabling module ('', 'noboxes')
-     *  @return     int                 1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
+	 *  @param      string  $options    Options when enabling module ('', 'noboxes')
+	 *  @return     int                 1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
 		global $conf;
 
 		// Permissions
diff --git a/htdocs/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php
index 88b7400cc36..64d9c045ad1 100644
--- a/htdocs/core/modules/modDon.class.php
+++ b/htdocs/core/modules/modDon.class.php
@@ -148,7 +148,7 @@ class modDon extends DolibarrModules
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
diff --git a/htdocs/core/modules/modDynamicPrices.class.php b/htdocs/core/modules/modDynamicPrices.class.php
index c5e429b465c..fc4863e1280 100644
--- a/htdocs/core/modules/modDynamicPrices.class.php
+++ b/htdocs/core/modules/modDynamicPrices.class.php
@@ -31,57 +31,57 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modDynamicPrices extends DolibarrModules
 {
 
-    /**
+	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
 	 *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-        $this->numero = 2200;
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+		$this->numero = 2200;
 
-        $this->family = "products";
-        $this->module_position = '85';
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        $this->description = "Enable the usage of math expressions for prices";
+		$this->family = "products";
+		$this->module_position = '85';
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		$this->description = "Enable the usage of math expressions for prices";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'experimental';
-        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        $this->picto = 'dynamicprice';
+		$this->version = 'experimental';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		$this->picto = 'dynamicprice';
 
-        // Data directories to create when module is enabled
-        $this->dirs = array();
+		// Data directories to create when module is enabled
+		$this->dirs = array();
 
-        // Config pages
-        //-------------
+		// Config pages
+		//-------------
 		$this->config_page_url = array("dynamic_prices.php@product");
 
-        // Dependancies
-        //-------------
-        $this->depends = array();
-        $this->requiredby = array();
-        $this->langfiles = array("other");
+		// Dependancies
+		//-------------
+		$this->depends = array();
+		$this->requiredby = array();
+		$this->langfiles = array("other");
 
-        // Constants
-        //-----------
-        $this->const = array();
+		// Constants
+		//-----------
+		$this->const = array();
 
-        // New pages on tabs
-        // -----------------
-        $this->tabs = array();
+		// New pages on tabs
+		// -----------------
+		$this->tabs = array();
 
-        // Boxes
-        //------
-        $this->boxes = array();
+		// Boxes
+		//------
+		$this->boxes = array();
 
-        // Permissions
-        //------------
-        $this->rights = array();
-        $this->rights_class = 'dynamicprices';
-        $r = 0;
-    }
+		// Permissions
+		//------------
+		$this->rights = array();
+		$this->rights_class = 'dynamicprices';
+		$r = 0;
+	}
 }
diff --git a/htdocs/core/modules/modECM.class.php b/htdocs/core/modules/modECM.class.php
index 637cdb33739..d83edc6cf96 100644
--- a/htdocs/core/modules/modECM.class.php
+++ b/htdocs/core/modules/modECM.class.php
@@ -32,12 +32,12 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modECM extends DolibarrModules
 {
 
-    /**
-     *   Constructor. Define names, constants, directories, boxes, permissions
-     *
-     *   @param      DoliDB		$db      Database handler
-    */
-    public function __construct($db)
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
 	{
 		$this->db = $db;
 
@@ -86,10 +86,10 @@ class modECM extends DolibarrModules
 
 		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
 		// Example:
-        //$this->boxes[$r][1] = "myboxa.php";
-    	//$r++;
-        //$this->boxes[$r][1] = "myboxb.php";
-    	//$r++;
+		//$this->boxes[$r][1] = "myboxa.php";
+		//$r++;
+		//$this->boxes[$r][1] = "myboxb.php";
+		//$r++;
 
 		// Permissions
 		$this->rights_class = 'ecm'; // Permission key
@@ -117,7 +117,7 @@ class modECM extends DolibarrModules
 		$this->rights[$r][4] = 'setup';
 
 
-        // Menus
+		// Menus
 		//------
 		$this->menus = array(); // List of menus to add
 		$r = 0;
diff --git a/htdocs/core/modules/modEmailCollector.class.php b/htdocs/core/modules/modEmailCollector.class.php
index 86bf582edf2..f71932c93b9 100644
--- a/htdocs/core/modules/modEmailCollector.class.php
+++ b/htdocs/core/modules/modEmailCollector.class.php
@@ -38,9 +38,9 @@ class modEmailCollector extends DolibarrModules
 	 */
 	public function __construct($db)
 	{
-        global $langs, $conf;
+		global $langs, $conf;
 
-        $this->db = $db;
+		$this->db = $db;
 
 		// Id for module (must be unique).
 		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
@@ -52,7 +52,7 @@ class modEmailCollector extends DolibarrModules
 		// It is used to group modules by family in module setup page
 		$this->family = "interface";
 		// Module position in the family on 2 digits ('01', '10', '20', ...)
-		$this->module_position = '12';
+		$this->module_position = '23';
 		// Gives the possibility to the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
 		//$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
 
@@ -116,13 +116,13 @@ class modEmailCollector extends DolibarrModules
 
 
 		// Array to add new pages in new tabs
-        $this->tabs = array();
+		$this->tabs = array();
 		// Example:
 		// $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@dav:$user->rights->dav->read:/dav/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
-        // $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@dav:$user->rights->othermodule->read:/dav/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
-        // $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
-        //
-        // Where objecttype can be
+		// $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@dav:$user->rights->othermodule->read:/dav/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
+		// $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
+		//
+		// Where objecttype can be
 		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
 		// 'contact'          to add a tab in contact view
 		// 'contract'         to add a tab in contract view
@@ -144,9 +144,9 @@ class modEmailCollector extends DolibarrModules
 		// 'user'             to add a tab in user view
 
 
-        // Dictionaries
+		// Dictionaries
 		$this->dictionaries = array();
-        /* Example:
+		/* Example:
         $this->dictionaries=array(
             'langs'=>'mylangfile@dav',
             'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
@@ -162,13 +162,13 @@ class modEmailCollector extends DolibarrModules
         */
 
 
-        // Boxes/Widgets
+		// Boxes/Widgets
 		// Add here list of php file(s) stored in dav/core/boxes that contains class to show a widget.
-        $this->boxes = array(
-        	//0=>array('file'=>'davwidget1.php@dav','note'=>'Widget provided by dav','enabledbydefaulton'=>'Home'),
-        	//1=>array('file'=>'davwidget2.php@dav','note'=>'Widget provided by dav'),
-        	//2=>array('file'=>'davwidget3.php@dav','note'=>'Widget provided by dav')
-        );
+		$this->boxes = array(
+			//0=>array('file'=>'davwidget1.php@dav','note'=>'Widget provided by dav','enabledbydefaulton'=>'Home'),
+			//1=>array('file'=>'davwidget2.php@dav','note'=>'Widget provided by dav'),
+			//2=>array('file'=>'davwidget3.php@dav','note'=>'Widget provided by dav')
+		);
 
 
 		// Cronjobs (List of cron jobs entries to add when module is enabled)
@@ -259,7 +259,7 @@ class modEmailCollector extends DolibarrModules
 	 *	The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *	It also creates data directories
 	 *
-     *	@param      string	$options    Options when enabling module ('', 'noboxes')
+	 *	@param      string	$options    Options when enabling module ('', 'noboxes')
 	 *	@return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
@@ -313,7 +313,7 @@ class modEmailCollector extends DolibarrModules
 				$descriptionA1 = 'This collector will scan your mailbox "Sent" directory to find emails that was sent as an answer of another email directly from your email software and not from Dolibarr. If such an email is found, the event of answer is recorded into Dolibarr.';
 
 				$sqlforexampleA1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
-				$sqlforexampleA1 .= " VALUES (".$conf->entity.", 'Collect_Responses_Out', 'Example to collect answers to emails done from email software', '".$this->db->escape($descriptionA1)."', 'Sent', '".$this->db->idate(dol_now())."', ".$user->id.", 0)";
+				$sqlforexampleA1 .= " VALUES (".$conf->entity.", 'Collect_Responses_Out', 'Example to collect answers to emails done from your external email software', '".$this->db->escape($descriptionA1)."', 'Sent', '".$this->db->idate(dol_now())."', ".$user->id.", 0)";
 
 				$sqlforexampleFilterA1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
 				$sqlforexampleFilterA1 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses_Out' and entity = ".$conf->entity."), 'isanswer', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
@@ -333,10 +333,10 @@ class modEmailCollector extends DolibarrModules
 		$tmpresql = $this->db->query($tmpsql);
 		if ($tmpresql) {
 			if ($this->db->num_rows($tmpresql) == 0) {
-				$descriptionB1 = 'This collector will scan your mailbox to find all emails that are an answer of an email sent from your application. An event (Module Agenda must be enabled) with the email response will be recorded at the good place. For example, if your send a commercial proposal, order, invoice or message for a ticket by email from the application, and your customer answers your email, the system will automatically find the answer and add it into your ERP.';
+				$descriptionB1 = 'This collector will scan your mailbox to find all emails that are an answer of an email sent from your application. An event (Module Agenda must be enabled) with the email response will be recorded at the good place. For example, if your send a commercial proposal, order, invoice or message for a ticket by email from the application, and your customer answers your email, the system will automatically catch the answer and add it into your ERP.';
 
 				$sqlforexampleB1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
-				$sqlforexampleB1 .= " VALUES (".$conf->entity.", 'Collect_Responses_In', 'Example to collect any input email responses', '".$this->db->escape($descriptionB1)."', 'INBOX', '".$this->db->idate(dol_now())."', ".$user->id.", 0)";
+				$sqlforexampleB1 .= " VALUES (".$conf->entity.", 'Collect_Responses_In', 'Example to collect any received email that is a response of an email sent from Dolibarr', '".$this->db->escape($descriptionB1)."', 'INBOX', '".$this->db->idate(dol_now())."', ".$user->id.", 0)";
 				$sqlforexampleB2 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
 				$sqlforexampleB2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses_In' and entity = ".$conf->entity."), 'isanswer', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
 				$sqlforexampleB3 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectoraction (fk_emailcollector, type, date_creation, fk_user_creat, status)";
diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index 19e22497a7a..54fecd1a5af 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -62,12 +62,12 @@ class modExpedition extends DolibarrModules
 		// Data directories to create when module is enabled
 		$this->dirs = array("/expedition/temp",
 							"/expedition/sending",
-		                    "/expedition/sending/temp",
-		                    "/expedition/receipt",
-		                    "/expedition/receipt/temp",
+							"/expedition/sending/temp",
+							"/expedition/receipt",
+							"/expedition/receipt/temp",
 							"/doctemplates/shipments",
 							"/doctemplates/deliveries"
-		                    );
+							);
 
 		// Config pages
 		$this->config_page_url = array("confexped.php");
@@ -103,21 +103,21 @@ class modExpedition extends DolibarrModules
 		$this->const[$r][4] = 0;
 		$r++;
 
-		$this->const[$r][0] = "LIVRAISON_ADDON_PDF";
+		$this->const[$r][0] = "DELIVERY_ADDON_PDF";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "typhon";
 		$this->const[$r][3] = 'Nom du gestionnaire de generation des bons de reception en PDF';
 		$this->const[$r][4] = 0;
 		$r++;
 
-		$this->const[$r][0] = "LIVRAISON_ADDON_NUMBER";
+		$this->const[$r][0] = "DELIVERY_ADDON_NUMBER";
 		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "mod_livraison_jade";
+		$this->const[$r][2] = "mod_delivery_jade";
 		$this->const[$r][3] = 'Nom du gestionnaire de numerotation des bons de reception';
 		$this->const[$r][4] = 0;
 		$r++;
 
-		$this->const[$r][0] = "LIVRAISON_ADDON_PDF_ODT_PATH";
+		$this->const[$r][0] = "DELIVERY_ADDON_PDF_ODT_PATH";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/deliveries";
 		$this->const[$r][3] = "";
@@ -169,7 +169,7 @@ class modExpedition extends DolibarrModules
 		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'shipping_advance';
-        $this->rights[$r][5] = 'send';
+		$this->rights[$r][5] = 'send';
 
 		$r++;
 		$this->rights[$r][0] = 106;
@@ -191,7 +191,7 @@ class modExpedition extends DolibarrModules
 		$this->rights[$r][1] = 'Read delivery receipts';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'livraison';
+		$this->rights[$r][4] = 'delivery';
 		$this->rights[$r][5] = 'lire';
 
 		$r++;
@@ -199,7 +199,7 @@ class modExpedition extends DolibarrModules
 		$this->rights[$r][1] = 'Create/modify delivery receipts';
 		$this->rights[$r][2] = 'w';
 		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'livraison';
+		$this->rights[$r][4] = 'delivery';
 		$this->rights[$r][5] = 'creer';
 
 		$r++;
@@ -207,7 +207,7 @@ class modExpedition extends DolibarrModules
 		$this->rights[$r][1] = 'Validate delivery receipts';
 		$this->rights[$r][2] = 'd';
 		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'livraison_advance';
+		$this->rights[$r][4] = 'delivery_advance';
 		$this->rights[$r][5] = 'validate';
 
 		$r++;
@@ -215,7 +215,7 @@ class modExpedition extends DolibarrModules
 		$this->rights[$r][1] = 'Delete delivery receipts';
 		$this->rights[$r][2] = 'd';
 		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'livraison';
+		$this->rights[$r][4] = 'delivery';
 		$this->rights[$r][5] = 'supprimer';
 
 
@@ -277,8 +277,8 @@ class modExpedition extends DolibarrModules
 		$this->export_dependencies_array[$r] = array('shipment_line'=>'ed.rowid', 'product'=>'ed.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		if ($idcontacts && !empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT))
 		{
-		    $keyforselect = 'socpeople'; $keyforelement = 'contact'; $keyforaliasextra = 'extra3';
-		    include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+			$keyforselect = 'socpeople'; $keyforelement = 'contact'; $keyforaliasextra = 'extra3';
+			include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		}
 		$keyforselect = 'expedition'; $keyforelement = 'shipment'; $keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
@@ -291,7 +291,7 @@ class modExpedition extends DolibarrModules
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'expedition as c';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'expedition_extrafields as extra ON c.rowid = extra.fk_object,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'societe as s';
-		if (!$user->rights->societe->client->voir) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'expeditiondet as ed';
@@ -300,13 +300,13 @@ class modExpedition extends DolibarrModules
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on cd.fk_product = p.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extraprod ON p.rowid = extraprod.fk_object';
 		if ($idcontacts && !empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) {
-		    $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'element_contact as ee ON ee.element_id = cd.fk_commande AND ee.fk_c_type_contact IN ('.$idcontacts.')';
-		    $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp ON sp.rowid = ee.fk_socpeople';
-		    $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra3 ON sp.rowid = extra3.fk_object';
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'element_contact as ee ON ee.element_id = cd.fk_commande AND ee.fk_c_type_contact IN ('.$idcontacts.')';
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp ON sp.rowid = ee.fk_socpeople';
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra3 ON sp.rowid = extra3.fk_object';
 		}
 		$this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = ed.fk_expedition AND ed.fk_origin_line = cd.rowid';
 		$this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('expedition').')';
-		if (!$user->rights->societe->client->voir) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
 	}
 
 
@@ -315,7 +315,7 @@ class modExpedition extends DolibarrModules
 	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *  It also creates data directories
 	 *
-     *  @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *  @return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
diff --git a/htdocs/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php
index ee6e39c591c..befafbc6767 100644
--- a/htdocs/core/modules/modExpenseReport.class.php
+++ b/htdocs/core/modules/modExpenseReport.class.php
@@ -180,35 +180,35 @@ class modExpenseReport extends DolibarrModules
 		$this->export_label[$r] = 'ListTripsAndExpenses';
 		$this->export_icon[$r] = 'trip';
 		$this->export_permission[$r] = array(array("expensereport", "export"));
-        $this->export_fields_array[$r] = array(
+		$this->export_fields_array[$r] = array(
 			'd.rowid'=>"TripId", 'd.ref'=>'Ref', 'd.date_debut'=>'DateStart', 'd.date_fin'=>'DateEnd', 'd.date_create'=>'DateCreation', 'd.date_approve'=>'DateApprove',
 			'd.total_ht'=>"TotalHT", 'd.total_tva'=>'TotalVAT', 'd.total_ttc'=>'TotalTTC',
-        	'd.fk_statut'=>'Status', 'd.paid'=>'Paid',
-        	'd.note_private'=>'NotePrivate', 'd.note_public'=>'NotePublic', 'd.detail_cancel'=>'MOTIF_CANCEL', 'd.detail_refuse'=>'MOTIF_REFUS',
+			'd.fk_statut'=>'Status', 'd.paid'=>'Paid',
+			'd.note_private'=>'NotePrivate', 'd.note_public'=>'NotePublic', 'd.detail_cancel'=>'MOTIF_CANCEL', 'd.detail_refuse'=>'MOTIF_REFUS',
 			'u.lastname'=>'Lastname', 'u.firstname'=>'Firstname', 'u.login'=>"Login", 'ed.rowid'=>'LineId', 'tf.code'=>'Type', 'ed.date'=>'Date', 'ed.tva_tx'=>'VATRate',
 			'ed.total_ht'=>'TotalHT', 'ed.total_tva'=>'TotalVAT', 'ed.total_ttc'=>'TotalTTC', 'ed.comments'=>'Comment', 'p.rowid'=>'ProjectId', 'p.ref'=>'Ref',
-            'user_rib.iban_prefix' => 'IBAN', 'user_rib.bic' => 'BIC', 'user_rib.code_banque' => 'BankCode', 'user_rib.bank' => 'BankName', 'user_rib.proprio' => 'BankAccountOwner',
-            'user_rib.owner_address' => 'BankAccountOwnerAddress'
+			'user_rib.iban_prefix' => 'IBAN', 'user_rib.bic' => 'BIC', 'user_rib.code_banque' => 'BankCode', 'user_rib.bank' => 'BankName', 'user_rib.proprio' => 'BankAccountOwner',
+			'user_rib.owner_address' => 'BankAccountOwnerAddress'
 		);
-        $this->export_TypeFields_array[$r] = array(
-        	'd.rowid'=>"Numeric", 'd.ref'=>'Text', 'd.date_debut'=>'Date', 'd.date_fin'=>'Date', 'd.date_create'=>'Date', 'd.date_approve'=>'Date',
-        	'd.total_ht'=>"Numeric", 'd.total_tva'=>'Numeric', 'd.total_ttc'=>'Numeric',
-        	'd.fk_statut'=>"Numeric", 'd.paid'=>'Numeric',
-        	'd.note_private'=>'Text', 'd.note_public'=>'Text', 'd.detail_cancel'=>'Text', 'd.detail_refuse'=>'Text',
-        	'u.lastname'=>'Text', 'u.firstname'=>'Text', 'u.login'=>"Text", 'ed.rowid'=>'Numeric', 'tf.code'=>'Code', 'ed.date'=>'Date', 'ed.tva_tx'=>'Numeric',
-        	'ed.total_ht'=>'Numeric', 'ed.total_tva'=>'Numeric', 'ed.total_ttc'=>'Numeric', 'ed.comments'=>'Text', 'p.rowid'=>'Numeric', 'p.ref'=>'Text',
-            'user_rib.iban_prefix' => 'Text', 'user_rib.bic' => 'Text', 'user_rib.code_banque' => 'Text', 'user_rib.bank' => 'Text', 'user_rib.proprio' => 'Text',
-            'user_rib.owner_address' => 'Text'
-        );
-        $this->export_entities_array[$r] = array(
+		$this->export_TypeFields_array[$r] = array(
+			'd.rowid'=>"Numeric", 'd.ref'=>'Text', 'd.date_debut'=>'Date', 'd.date_fin'=>'Date', 'd.date_create'=>'Date', 'd.date_approve'=>'Date',
+			'd.total_ht'=>"Numeric", 'd.total_tva'=>'Numeric', 'd.total_ttc'=>'Numeric',
+			'd.fk_statut'=>"Numeric", 'd.paid'=>'Numeric',
+			'd.note_private'=>'Text', 'd.note_public'=>'Text', 'd.detail_cancel'=>'Text', 'd.detail_refuse'=>'Text',
+			'u.lastname'=>'Text', 'u.firstname'=>'Text', 'u.login'=>"Text", 'ed.rowid'=>'Numeric', 'tf.code'=>'Code', 'ed.date'=>'Date', 'ed.tva_tx'=>'Numeric',
+			'ed.total_ht'=>'Numeric', 'ed.total_tva'=>'Numeric', 'ed.total_ttc'=>'Numeric', 'ed.comments'=>'Text', 'p.rowid'=>'Numeric', 'p.ref'=>'Text',
+			'user_rib.iban_prefix' => 'Text', 'user_rib.bic' => 'Text', 'user_rib.code_banque' => 'Text', 'user_rib.bank' => 'Text', 'user_rib.proprio' => 'Text',
+			'user_rib.owner_address' => 'Text'
+		);
+		$this->export_entities_array[$r] = array(
 			'u.lastname'=>'user', 'u.firstname'=>'user', 'u.login'=>'user', 'ed.rowid'=>'expensereport_line', 'ed.date'=>'expensereport_line',
 			'ed.tva_tx'=>'expensereport_line', 'ed.total_ht'=>'expensereport_line', 'ed.total_tva'=>'expensereport_line', 'ed.total_ttc'=>'expensereport_line',
 			'ed.comments'=>'expensereport_line', 'tf.code'=>'expensereport_line', 'p.project_ref'=>'expensereport_line', 'p.rowid'=>'project', 'p.ref'=>'project',
-            'user_rib.iban_prefix' => 'user', 'user_rib.bic' => 'user', 'user_rib.code_banque' => 'user', 'user_rib.bank' => 'user', 'user_rib.proprio' => 'user',
-            'user_rib.owner_address' => 'user'
+			'user_rib.iban_prefix' => 'user', 'user_rib.bic' => 'user', 'user_rib.code_banque' => 'user', 'user_rib.bank' => 'user', 'user_rib.proprio' => 'user',
+			'user_rib.owner_address' => 'user'
 
 		);
-        $this->export_alias_array[$r] = array('d.rowid'=>"idtrip", 'd.type'=>"type", 'd.note_private'=>'note_private', 'd.note_public'=>'note_public', 'u.lastname'=>'name', 'u.firstname'=>'firstname', 'u.login'=>'login');
+		$this->export_alias_array[$r] = array('d.rowid'=>"idtrip", 'd.type'=>"type", 'd.note_private'=>'note_private', 'd.note_public'=>'note_public', 'u.lastname'=>'name', 'u.firstname'=>'firstname', 'u.login'=>'login');
 		$this->export_dependencies_array[$r] = array('expensereport_line'=>'ed.rowid', 'type_fees'=>'tf.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 
 		$keyforselect = 'expensereport'; $keyforelement = 'expensereport'; $keyforaliasextra = 'extra';
diff --git a/htdocs/core/modules/modExternalRss.class.php b/htdocs/core/modules/modExternalRss.class.php
index f0bdc6335ff..05cc62094e6 100644
--- a/htdocs/core/modules/modExternalRss.class.php
+++ b/htdocs/core/modules/modExternalRss.class.php
@@ -83,7 +83,7 @@ class modExternalRss extends DolibarrModules
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
@@ -118,21 +118,21 @@ class modExternalRss extends DolibarrModules
 		return $this->_init($sql, $options);
 	}
 
-    /**
+	/**
 	 *		Function called when module is disabled.
 	 *      Remove from database constants, boxes and permissions from Dolibarr database.
 	 *		Data directories are not deleted
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
-     */
-    public function remove($options = '')
-    {
+	 */
+	public function remove($options = '')
+	{
 		$sql = array();
 
 		// Delete old declarations of RSS box
 		$this->boxes[0]['file'] = "box_external_rss.php";
 
 		return $this->_remove($sql, $options);
-    }
+	}
 }
diff --git a/htdocs/core/modules/modExternalSite.class.php b/htdocs/core/modules/modExternalSite.class.php
index d3cf9ea38e6..54c7a9d9b0b 100644
--- a/htdocs/core/modules/modExternalSite.class.php
+++ b/htdocs/core/modules/modExternalSite.class.php
@@ -34,11 +34,11 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modExternalSite extends DolibarrModules
 {
 
-    /**
+	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
 	 *   @param      DoliDB		$db      Database handler
-     */
+	 */
 	public function __construct($db)
 	{
 		$this->db = $db;
@@ -86,16 +86,16 @@ class modExternalSite extends DolibarrModules
 
 		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
 		// Example:
-        //$this->boxes[$r][1] = "myboxa.php";
-    	//$r++;
-        //$this->boxes[$r][1] = "myboxb.php";
-    	//$r++;
+		//$this->boxes[$r][1] = "myboxa.php";
+		//$r++;
+		//$this->boxes[$r][1] = "myboxb.php";
+		//$r++;
 
 		// Permissions
 		$this->rights_class = 'externalsite'; // Permission key
 		$this->rights = array(); // Permission array used by this module
 
-        // Menus
+		// Menus
 		//------
 		$r = 0;
 
diff --git a/htdocs/core/modules/modFTP.class.php b/htdocs/core/modules/modFTP.class.php
index 4b6ac9f92ec..52944961379 100644
--- a/htdocs/core/modules/modFTP.class.php
+++ b/htdocs/core/modules/modFTP.class.php
@@ -33,11 +33,11 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modFTP extends DolibarrModules
 {
 
-    /**
-     *   Constructor. Define names, constants, directories, boxes, permissions
-     *
-     *   @param      DoliDB		$db      Database handler
-    */
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
 	public function __construct($db)
 	{
 		$this->db = $db;
@@ -75,8 +75,8 @@ class modFTP extends DolibarrModules
 
 		// Constants
 		$this->const = array(
-		    1=>array('FTP_CONNECT_WITH_SSL', 'chaine', '0', 'Use FTPS for FTP module', 1, 'current', 1),
-		    2=>array('FTP_CONNECT_WITH_SFTP', 'chaine', '0', 'Use SFTP for FTP module', 1, 'current', 1)
+			1=>array('FTP_CONNECT_WITH_SSL', 'chaine', '0', 'Use FTPS for FTP module', 1, 'current', 1),
+			2=>array('FTP_CONNECT_WITH_SFTP', 'chaine', '0', 'Use SFTP for FTP module', 1, 'current', 1)
 		); // List of parameters
 
 		// Boxes
@@ -85,10 +85,10 @@ class modFTP extends DolibarrModules
 
 		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
 		// Example:
-        //$this->boxes[$r][1] = "myboxa.php";
-    	//$r++;
-        //$this->boxes[$r][1] = "myboxb.php";
-    	//$r++;
+		//$this->boxes[$r][1] = "myboxa.php";
+		//$r++;
+		//$this->boxes[$r][1] = "myboxb.php";
+		//$r++;
 
 		// Permissions
 		$this->rights_class = 'ftp'; // Permission key
@@ -118,8 +118,8 @@ class modFTP extends DolibarrModules
 							  'url'=>'/ftp/index.php',
 							  'langs'=>'ftp',
 							  'position'=>100,
-                              'enabled'=>'$conf->ftp->enabled',
-		                      'perms'=>'$user->rights->ftp->read || $user->rights->ftp->write || $user->rights->ftp->setup',
+							  'enabled'=>'$conf->ftp->enabled',
+							  'perms'=>'$user->rights->ftp->read || $user->rights->ftp->write || $user->rights->ftp->setup',
 							  'target'=>'',
 							  'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
 		$r++;
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index a4e6134060d..8f4172112b5 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -111,7 +111,8 @@ class modFacture extends DolibarrModules
 		$this->boxes = array(
 				0=>array('file'=>'box_factures_imp.php', 'enabledbydefaulton'=>'Home'),
 				1=>array('file'=>'box_factures.php', 'enabledbydefaulton'=>'Home'),
-				2=>array('file'=>'box_graph_invoices_permonth.php', 'enabledbydefaulton'=>'Home')
+				2=>array('file'=>'box_graph_invoices_permonth.php', 'enabledbydefaulton'=>'Home'),
+				3=>array('file'=>'box_customers_outstanding_bill_reached.php', 'enabledbydefaulton'=>'Home')
 		);
 
 		// Cronjobs
@@ -146,7 +147,7 @@ class modFacture extends DolibarrModules
 		$this->rights[$r][1] = 'Devalidate invoices';
 		$this->rights[$r][2] = 'a';
 		$this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'invoice_advance';
+		$this->rights[$r][4] = 'invoice_advance';
 		$this->rights[$r][5] = 'unvalidate';
 
 		$r++;
@@ -163,7 +164,7 @@ class modFacture extends DolibarrModules
 		$this->rights[$r][2] = 'a';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'invoice_advance';
-        $this->rights[$r][5] = 'send';
+		$this->rights[$r][5] = 'send';
 
 		$r++;
 		$this->rights[$r][0] = 16;
@@ -210,8 +211,8 @@ class modFacture extends DolibarrModules
 		$this->export_icon[$r] = 'invoice';
 		$this->export_permission[$r] = array(array("facture", "facture", "export", "other"));
 		$this->export_fields_array[$r] = array(
-		    's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.code_client'=>'CustomerCode', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'c.code'=>'CountryCode', 'cd.nom'=>'State',
-		    's.phone'=>'Phone',
+			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.code_client'=>'CustomerCode', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'c.code'=>'CountryCode', 'cd.nom'=>'State',
+			's.phone'=>'Phone',
 			's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4',
 			's.code_compta'=>'CustomerAccountancyCode',
 			's.code_compta_fournisseur'=>'SupplierAccountancyCode',
@@ -229,11 +230,11 @@ class modFacture extends DolibarrModules
 		);
 		if (!empty($conf->multicurrency->enabled))
 		{
-		    $this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
-		    $this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
-		    $this->export_fields_array[$r]['f.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
-		    $this->export_fields_array[$r]['f.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
-		    $this->export_fields_array[$r]['f.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
+			$this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
+			$this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
+			$this->export_fields_array[$r]['f.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
+			$this->export_fields_array[$r]['f.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
+			$this->export_fields_array[$r]['f.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
 		}
 		if (!empty($conf->cashdesk->enabled) || !empty($conf->takepos->enabled) || !empty($conf->global->INVOICE_SHOW_POS))
 		{
@@ -299,8 +300,8 @@ class modFacture extends DolibarrModules
 		$this->export_icon[$r] = 'invoice';
 		$this->export_permission[$r] = array(array("facture", "facture", "export"));
 		$this->export_fields_array[$r] = array(
-		    's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.code_client'=>'CustomerCode', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'c.code'=>'CountryCode', 'cd.nom'=>'State',
-		    's.phone'=>'Phone',
+			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.code_client'=>'CustomerCode', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'c.code'=>'CountryCode', 'cd.nom'=>'State',
+			's.phone'=>'Phone',
 			's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 's.code_compta'=>'CustomerAccountancyCode',
 			's.code_compta_fournisseur'=>'SupplierAccountancyCode', 's.tva_intra'=>'VATIntra',
 			'f.rowid'=>"InvoiceId", 'f.ref'=>"InvoiceRef", 'f.ref_client'=>'RefCustomer',
@@ -315,12 +316,12 @@ class modFacture extends DolibarrModules
 		$this->export_help_array[$r] = array('f.paye'=>'InvoicePaidCompletelyHelp');
 		if (!empty($conf->multicurrency->enabled))
 		{
-		    $this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
-		    $this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
-		    $this->export_fields_array[$r]['f.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
-		    $this->export_fields_array[$r]['f.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
-		    $this->export_fields_array[$r]['f.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
-		    $this->export_examplevalues_array[$r]['f.multicurrency_code'] = 'EUR';
+			$this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
+			$this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
+			$this->export_fields_array[$r]['f.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
+			$this->export_fields_array[$r]['f.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
+			$this->export_fields_array[$r]['f.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
+			$this->export_examplevalues_array[$r]['f.multicurrency_code'] = 'EUR';
 		}
 		if (!empty($conf->cashdesk->enabled) || !empty($conf->takepos->enabled) || !empty($conf->global->INVOICE_SHOW_POS))
 		{
@@ -328,7 +329,7 @@ class modFacture extends DolibarrModules
 			$this->export_fields_array[$r]['f.pos_source'] = 'POSTerminal';
 		}
 		$this->export_TypeFields_array[$r] = array(
-		    's.rowid'=>'Numeric', 's.nom'=>'Text', 's.code_client'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'c.code'=>'Text', 'cd.nom'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text',
+			's.rowid'=>'Numeric', 's.nom'=>'Text', 's.code_client'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'c.code'=>'Text', 'cd.nom'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text',
 			's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 's.code_compta'=>'Text', 's.code_compta_fournisseur'=>'Text', 's.tva_intra'=>'Text',
 			'f.rowid'=>"Numeric", 'f.ref'=>"Text", 'f.ref_client'=>'Text', 'f.type'=>"Numeric", 'f.datec'=>"Date", 'f.datef'=>"Date", 'f.date_lim_reglement'=>"Date",
 			'f.total'=>"Numeric", 'f.total_ttc'=>"Numeric", 'f.tva'=>"Numeric", 'f.localtax1'=>'Numeric', 'f.localtax2'=>'Numeric', 'f.paye'=>"Boolean", 'f.fk_statut'=>'Status', 'f.close_code'=>'Text', 'f.close_note'=>'Text',
@@ -380,7 +381,7 @@ class modFacture extends DolibarrModules
 	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *  It also creates data directories
 	 *
-     *  @param      string	$options    Options when enabling module ('', 'newboxdefonly', 'noboxes')
+	 *  @param      string	$options    Options when enabling module ('', 'newboxdefonly', 'noboxes')
 	 *  @return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
diff --git a/htdocs/core/modules/modFckeditor.class.php b/htdocs/core/modules/modFckeditor.class.php
index 8f2d164e9ca..f93e08c1872 100644
--- a/htdocs/core/modules/modFckeditor.class.php
+++ b/htdocs/core/modules/modFckeditor.class.php
@@ -69,12 +69,12 @@ class modFckeditor extends DolibarrModules
 
 		// Constants
 		$this->const = array();
-        $this->const[0]  = array("FCKEDITOR_ENABLE_SOCIETE", "yesno", "1", "WYSIWIG for description and note (except products/services)");
-        $this->const[1]  = array("FCKEDITOR_ENABLE_PRODUCTDESC", "yesno", "1", "WYSIWIG for products/services description and note");
-        $this->const[2]  = array("FCKEDITOR_ENABLE_MAILING", "yesno", "1", "WYSIWIG for mass emailings");
-        $this->const[3]  = array("FCKEDITOR_ENABLE_DETAILS", "yesno", "1", "WYSIWIG for products details lines for all entities");
-        $this->const[4]  = array("FCKEDITOR_ENABLE_USERSIGN", "yesno", "1", "WYSIWIG for user signature");
-        $this->const[5]  = array("FCKEDITOR_ENABLE_MAIL", "yesno", "1", "WYSIWIG for products details lines for all entities");
+		$this->const[0]  = array("FCKEDITOR_ENABLE_SOCIETE", "yesno", "1", "WYSIWIG for description and note (except products/services)");
+		$this->const[1]  = array("FCKEDITOR_ENABLE_PRODUCTDESC", "yesno", "1", "WYSIWIG for products/services description and note");
+		$this->const[2]  = array("FCKEDITOR_ENABLE_MAILING", "yesno", "1", "WYSIWIG for mass emailings");
+		$this->const[3]  = array("FCKEDITOR_ENABLE_DETAILS", "yesno", "1", "WYSIWIG for products details lines for all entities");
+		$this->const[4]  = array("FCKEDITOR_ENABLE_USERSIGN", "yesno", "1", "WYSIWIG for user signature");
+		$this->const[5]  = array("FCKEDITOR_ENABLE_MAIL", "yesno", "1", "WYSIWIG for products details lines for all entities");
 		$this->const[6] = array("FCKEDITOR_SKIN", "string", "moono-lisa", "Skin by default for fckeditor");
 
 		// Boxes
diff --git a/htdocs/core/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php
index 817ee5a27f8..422ca6b22d5 100644
--- a/htdocs/core/modules/modFicheinter.class.php
+++ b/htdocs/core/modules/modFicheinter.class.php
@@ -37,200 +37,200 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modFicheinter extends DolibarrModules
 {
 
-    /**
+	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
 	 *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        global $conf;
+	 */
+	public function __construct($db)
+	{
+		global $conf;
 
-        $this->db = $db;
-        $this->numero = 70;
+		$this->db = $db;
+		$this->numero = 70;
 
-        $this->family = "crm";
-        $this->module_position = '41';
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        $this->description = "Gestion des fiches d'intervention";
+		$this->family = "crm";
+		$this->module_position = '41';
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		$this->description = "Gestion des fiches d'intervention";
 
-        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'dolibarr';
 
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        $this->picto = "intervention";
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		$this->picto = "intervention";
 
-        // Data directories to create when module is enabled
-        $this->dirs = array("/ficheinter/temp");
+		// Data directories to create when module is enabled
+		$this->dirs = array("/ficheinter/temp");
 
-        // Dependencies
-        $this->depends = array("modSociete");
-        $this->requiredby = array();
-        $this->conflictwith = array();
-        $this->langfiles = array("bills", "companies", "interventions");
+		// Dependencies
+		$this->depends = array("modSociete");
+		$this->requiredby = array();
+		$this->conflictwith = array();
+		$this->langfiles = array("bills", "companies", "interventions");
 
-        // Config pages
-        $this->config_page_url = array("fichinter.php");
+		// Config pages
+		$this->config_page_url = array("fichinter.php");
 
-        // Constants
-        $this->const = array();
-        $r = 0;
+		// Constants
+		$this->const = array();
+		$r = 0;
 
-        $this->const[$r][0] = "FICHEINTER_ADDON_PDF";
-        $this->const[$r][1] = "chaine";
-        $this->const[$r][2] = "soleil";
-        $r++;
+		$this->const[$r][0] = "FICHEINTER_ADDON_PDF";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "soleil";
+		$r++;
 
-        $this->const[$r][0] = "FICHEINTER_ADDON";
-        $this->const[$r][1] = "chaine";
-        $this->const[$r][2] = "pacific";
-        $r++;
+		$this->const[$r][0] = "FICHEINTER_ADDON";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "pacific";
+		$r++;
 
-        // Boxes
-        $this->boxes = array(0=>array('file'=>'box_ficheinter.php', 'enabledbydefaulton'=>'Home'));
+		// Boxes
+		$this->boxes = array(0=>array('file'=>'box_ficheinter.php', 'enabledbydefaulton'=>'Home'));
 
-        // Permissions
-        $this->rights = array();
-        $this->rights_class = 'ficheinter';
-        $r = 0;
+		// Permissions
+		$this->rights = array();
+		$this->rights_class = 'ficheinter';
+		$r = 0;
 
-        $r++;
-        $this->rights[$r][0] = 61;
-        $this->rights[$r][1] = 'Lire les fiches d\'intervention';
-        $this->rights[$r][2] = 'r';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'lire';
+		$r++;
+		$this->rights[$r][0] = 61;
+		$this->rights[$r][1] = 'Lire les fiches d\'intervention';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'lire';
 
-        $r++;
-        $this->rights[$r][0] = 62;
-        $this->rights[$r][1] = 'Creer/modifier les fiches d\'intervention';
-        $this->rights[$r][2] = 'w';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'creer';
+		$r++;
+		$this->rights[$r][0] = 62;
+		$this->rights[$r][1] = 'Creer/modifier les fiches d\'intervention';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'creer';
 
-        $r++;
-        $this->rights[$r][0] = 64;
-        $this->rights[$r][1] = 'Supprimer les fiches d\'intervention';
-        $this->rights[$r][2] = 'd';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'supprimer';
+		$r++;
+		$this->rights[$r][0] = 64;
+		$this->rights[$r][1] = 'Supprimer les fiches d\'intervention';
+		$this->rights[$r][2] = 'd';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'supprimer';
 
-        $r++;
-        $this->rights[$r][0] = 67;
-        $this->rights[$r][1] = 'Exporter les fiches interventions';
-        $this->rights[$r][2] = 'r';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'export';
+		$r++;
+		$this->rights[$r][0] = 67;
+		$this->rights[$r][1] = 'Exporter les fiches interventions';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'export';
 
-        $r++;
-        $this->rights[$r][0] = 68;
-        $this->rights[$r][1] = 'Envoyer les fiches d\'intervention par courriel';
-        $this->rights[$r][2] = 'r';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'ficheinter_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
-        $this->rights[$r][5] = 'send';
+		$r++;
+		$this->rights[$r][0] = 68;
+		$this->rights[$r][1] = 'Envoyer les fiches d\'intervention par courriel';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'ficheinter_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
+		$this->rights[$r][5] = 'send';
 
-        $r++;
-        $this->rights[$r][0] = 69;
-        $this->rights[$r][1] = 'Valider les fiches d\'intervention ';
-        $this->rights[$r][2] = 'a';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'ficheinter_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
-        $this->rights[$r][5] = 'validate';
+		$r++;
+		$this->rights[$r][0] = 69;
+		$this->rights[$r][1] = 'Valider les fiches d\'intervention ';
+		$this->rights[$r][2] = 'a';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'ficheinter_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
+		$this->rights[$r][5] = 'validate';
 
-        $r++;
-        $this->rights[$r][0] = 70;
-        $this->rights[$r][1] = 'Dévalider les fiches d\'intervention';
-        $this->rights[$r][2] = 'a';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'ficheinter_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
-        $this->rights[$r][5] = 'unvalidate';
+		$r++;
+		$this->rights[$r][0] = 70;
+		$this->rights[$r][1] = 'Dévalider les fiches d\'intervention';
+		$this->rights[$r][2] = 'a';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'ficheinter_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
+		$this->rights[$r][5] = 'unvalidate';
 
 
-        // Menus
-        //-------
-        $this->menu = 1; // This module add menu entries. They are coded into menu manager.
+		// Menus
+		//-------
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
 
 
-        //Exports
-        //--------
-        $r = 1;
+		//Exports
+		//--------
+		$r = 1;
 
-        $this->export_code[$r] = $this->rights_class.'_'.$r;
-        $this->export_label[$r] = 'InterventionCardsAndInterventionLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
-        $this->export_permission[$r] = array(array("ficheinter", "export"));
-        $this->export_fields_array[$r] = array(
+		$this->export_code[$r] = $this->rights_class.'_'.$r;
+		$this->export_label[$r] = 'InterventionCardsAndInterventionLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_permission[$r] = array(array("ficheinter", "export"));
+		$this->export_fields_array[$r] = array(
 			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 's.fk_pays'=>'Country', 's.phone'=>'Phone',
 			's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 's.code_compta'=>'CustomerAccountancyCode',
 			's.code_compta_fournisseur'=>'SupplierAccountancyCode', 'f.rowid'=>"InterId", 'f.ref'=>"InterRef", 'f.datec'=>"InterDateCreation",
 			'f.duree'=>"InterDuration", 'f.fk_statut'=>'InterStatus', 'f.description'=>"InterNote");
-        $keyforselect = 'fichinter'; $keyforelement = 'intervention'; $keyforaliasextra = 'extra';
-        include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-        $this->export_fields_array[$r] += array(
-        	'pj.ref'=>'ProjectRef', 'pj.title'=>'ProjectLabel',
-        	'fd.rowid'=>'InterLineId',
+		$keyforselect = 'fichinter'; $keyforelement = 'intervention'; $keyforaliasextra = 'extra';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		$this->export_fields_array[$r] += array(
+			'pj.ref'=>'ProjectRef', 'pj.title'=>'ProjectLabel',
+			'fd.rowid'=>'InterLineId',
 			'fd.date'=>"InterLineDate", 'fd.duree'=>"InterLineDuration", 'fd.description'=>"InterLineDesc"
 		);
-        //$this->export_TypeFields_array[$r]=array(
+		//$this->export_TypeFields_array[$r]=array(
 		//	's.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','s.fk_pays'=>'List:c_country:label',
 		//	's.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text',
 		//	's.code_compta_fournisseur'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",'f.duree'=>"Duree",'f.fk_statut'=>'Statut','f.description'=>"Text",
 		//	'f.datee'=>"Date",'f.dateo'=>"Date",'f.fulldayevent'=>"Boolean",'fd.date'=>"Date",'fd.duree'=>"Duree",'fd.description'=>"Text",
 		//	'fd.total_ht'=>"Numeric"
 		//);
-        $this->export_TypeFields_array[$r] = array(
-        	's.rowid'=>"Numeric", 's.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 's.fk_pays'=>'List:c_country:label', 's.phone'=>'Text', 's.siren'=>'Text',
+		$this->export_TypeFields_array[$r] = array(
+			's.rowid'=>"Numeric", 's.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 's.fk_pays'=>'List:c_country:label', 's.phone'=>'Text', 's.siren'=>'Text',
 			's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 's.code_compta'=>'Text', 's.code_compta_fournisseur'=>'Text',
-        	'f.rowid'=>'Numeric', 'f.ref'=>"Text", 'f.datec'=>"Date",
+			'f.rowid'=>'Numeric', 'f.ref'=>"Text", 'f.datec'=>"Date",
 			'f.duree'=>"Duree", 'f.fk_statut'=>'Numeric', 'f.description'=>"Text", 'f.datee'=>"Date", 'f.dateo'=>"Date", 'f.fulldayevent'=>"Boolean",
-        	'pj.ref'=>'Text', 'pj.title'=>'Text',
-        	'fd.rowid'=>"Numeric", 'fd.date'=>"Date", 'fd.duree'=>"Duree", 'fd.description'=>"Text", 'fd.total_ht'=>"Numeric"
+			'pj.ref'=>'Text', 'pj.title'=>'Text',
+			'fd.rowid'=>"Numeric", 'fd.date'=>"Date", 'fd.duree'=>"Duree", 'fd.description'=>"Text", 'fd.total_ht'=>"Numeric"
 		);
-        $this->export_entities_array[$r] = array(
+		$this->export_entities_array[$r] = array(
 			's.rowid'=>"company", 's.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 's.fk_pays'=>'company', 's.phone'=>'company',
 			's.siren'=>'company', 's.siret'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.code_compta'=>'company',
 			's.code_compta_fournisseur'=>'company', 'f.rowid'=>"intervention", 'f.ref'=>"intervention", 'f.datec'=>"intervention", 'f.duree'=>"intervention",
-        	'f.fk_statut'=>"intervention", 'f.description'=>"intervention", 'pj.ref'=>'project', 'pj.title'=>'project', 'fd.rowid'=>"inter_line", 'fd.date'=>"inter_line",
+			'f.fk_statut'=>"intervention", 'f.description'=>"intervention", 'pj.ref'=>'project', 'pj.title'=>'project', 'fd.rowid'=>"inter_line", 'fd.date'=>"inter_line",
 			'fd.duree'=>'inter_line', 'fd.description'=>'inter_line'
 		);
-        $this->export_dependencies_array[$r] = array('inter_line'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-        $keyforselect = 'fichinterdet'; $keyforelement = 'inter_line'; $keyforaliasextra = 'extradet';
-        include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		$this->export_dependencies_array[$r] = array('inter_line'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+		$keyforselect = 'fichinterdet'; $keyforelement = 'inter_line'; $keyforaliasextra = 'extradet';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 
-        $this->export_sql_start[$r] = 'SELECT DISTINCT ';
-        $this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'fichinter as f';
-        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'fichinter_extrafields as extra ON f.rowid = extra.fk_object';
-        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON f.fk_projet = pj.rowid';
-        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'fichinterdet as fd ON f.rowid = fd.fk_fichinter';
-        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'fichinterdet_extrafields as extradet ON fd.rowid = extradet.fk_object,';
-        $this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'societe as s';
-        $this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid';
-        $this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('intervention').')';
-        $r++;
-    }
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'fichinter as f';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'fichinter_extrafields as extra ON f.rowid = extra.fk_object';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON f.fk_projet = pj.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'fichinterdet as fd ON f.rowid = fd.fk_fichinter';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'fichinterdet_extrafields as extradet ON fd.rowid = extradet.fk_object,';
+		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'societe as s';
+		$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid';
+		$this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('intervention').')';
+		$r++;
+	}
 
 
-    /**
+	/**
 	 *  Function called when module is enabled.
 	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *  It also creates data directories
 	 *
-     *  @param      string	$options    Options when enabling module ('', 'noboxes')
-     *  @return     int             	1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-        global $conf;
+	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *  @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global $conf;
 
-        // Permissions
-        $this->remove($options);
+		// Permissions
+		$this->remove($options);
 
-        $sql = array(
+		$sql = array(
 			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'ficheinter' AND entity = ".$conf->entity,
 			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','ficheinter',".$conf->entity.")",
-        );
+		);
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index b65c4fd956b..d39d67775f5 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2012      Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2013-2015 Philippe Grand	    <philippe.grand@atoo-net.com>
+ * Copyright (C) 2020      Ahmad Jamaly Rabib   <rabib@metroworks.co.jp>
  *
  * 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
@@ -62,12 +63,12 @@ class modFournisseur extends DolibarrModules
 
 		// Data directories to create when module is enabled
 		$this->dirs = array(
-            "/fournisseur/temp",
-            "/fournisseur/commande",
-            "/fournisseur/commande/temp",
-            "/fournisseur/facture",
-            "/fournisseur/facture/temp"
-        );
+			"/fournisseur/temp",
+			"/fournisseur/commande",
+			"/fournisseur/commande/temp",
+			"/fournisseur/facture",
+			"/fournisseur/facture/temp"
+		);
 
 		// Dependencies
 		$this->depends = array("modSociete");
@@ -120,13 +121,13 @@ class modFournisseur extends DolibarrModules
 
 		// Boxes
 		$this->boxes = array(
-		0=>array('file'=>'box_graph_invoices_supplier_permonth.php', 'enabledbydefaulton'=>'Home'),
-		1=>array('file'=>'box_graph_orders_supplier_permonth.php', 'enabledbydefaulton'=>'Home'),
-		2=>array('file'=>'box_fournisseurs.php', 'enabledbydefaulton'=>'Home'),
-		3=>array('file'=>'box_factures_fourn_imp.php', 'enabledbydefaulton'=>'Home'),
-		4=>array('file'=>'box_factures_fourn.php', 'enabledbydefaulton'=>'Home'),
-		5=>array('file'=>'box_supplier_orders.php', 'enabledbydefaulton'=>'Home'),
-		6=>array('file'=>'box_supplier_orders_awaiting_reception.php', 'enabledbydefaulton'=>'Home'),
+			0=>array('file'=>'box_graph_invoices_supplier_permonth.php', 'enabledbydefaulton'=>'Home'),
+			1=>array('file'=>'box_graph_orders_supplier_permonth.php', 'enabledbydefaulton'=>'Home'),
+			2=>array('file'=>'box_fournisseurs.php', 'enabledbydefaulton'=>'Home'),
+			3=>array('file'=>'box_factures_fourn_imp.php', 'enabledbydefaulton'=>'Home'),
+			4=>array('file'=>'box_factures_fourn.php', 'enabledbydefaulton'=>'Home'),
+			5=>array('file'=>'box_supplier_orders.php', 'enabledbydefaulton'=>'Home'),
+			6=>array('file'=>'box_supplier_orders_awaiting_reception.php', 'enabledbydefaulton'=>'Home'),
 		);
 
 		// Permissions
@@ -190,12 +191,12 @@ class modFournisseur extends DolibarrModules
 		$this->rights[$r][5] = 'receptionner';
 
 		$r++;
-        $this->rights[$r][0] = 1189;
-        $this->rights[$r][1] = 'Check/Uncheck a supplier order reception';
-        $this->rights[$r][2] = 'w';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'commande_advance';
-        $this->rights[$r][5] = 'check';
+		$this->rights[$r][0] = 1189;
+		$this->rights[$r][1] = 'Check/Uncheck a supplier order reception';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'commande_advance';
+		$this->rights[$r][5] = 'check';
 
 		$r++;
 		$this->rights[$r][0] = 1188;
@@ -273,9 +274,9 @@ class modFournisseur extends DolibarrModules
 		$this->rights[$r][5] = 'export';
 
 
-	    // Menus
-	    //-------
-	    $this->menu = 1; // This module add menu entries. They are coded into menu manager.
+		// Menus
+		//-------
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
 
 
 		// Exports
@@ -298,7 +299,7 @@ class modFournisseur extends DolibarrModules
 			'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel', 'p.accountancy_code_buy'=>'ProductAccountancyBuyCode', 'project.rowid'=>'ProjectId',
 			'project.ref'=>'ProjectRef', 'project.title'=>'ProjectLabel'
 		);
-		if (! empty($conf->multicurrency->enabled))
+		if (!empty($conf->multicurrency->enabled))
 		{
 			$this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
 			$this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
@@ -433,7 +434,7 @@ class modFournisseur extends DolibarrModules
 			'f.fk_statut'=>'InvoiceStatus', 'f.note_public'=>"InvoiceNote", 'p.rowid'=>'PaymentId', 'pf.amount'=>'AmountPayment',
 			'p.datep'=>'DatePayment', 'p.num_paiement'=>'PaymentNumber', 'p.fk_bank'=>'IdTransaction', 'project.rowid'=>'ProjectId', 'project.ref'=>'ProjectRef', 'project.title'=>'ProjectLabel'
 		);
-		if (! empty($conf->multicurrency->enabled))
+		if (!empty($conf->multicurrency->enabled))
 		{
 			$this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
 			$this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
@@ -459,7 +460,7 @@ class modFournisseur extends DolibarrModules
 			's.code_compta'=>'company', 's.code_compta_fournisseur'=>'company', 's.tva_intra'=>'company',
 			'f.rowid'=>"invoice", 'f.ref'=>"invoice", 'f.ref_supplier'=>"invoice", 'f.datec'=>"invoice", 'f.datef'=>"invoice", 'f.total_ht'=>"invoice",
 			'f.total_ttc'=>"invoice", 'f.total_tva'=>"invoice", 'f.paye'=>"invoice", 'f.fk_statut'=>'invoice', 'f.note_public'=>"invoice", 'p.rowid'=>'payment', 'pf.amount'=>'payment',
-		    'p.datep'=>'payment', 'p.num_paiement'=>'payment', 'p.fk_bank'=>'account', 'project.rowid'=>'project', 'project.ref'=>'project', 'project.title'=>'project');
+			'p.datep'=>'payment', 'p.num_paiement'=>'payment', 'p.fk_bank'=>'account', 'project.rowid'=>'project', 'project.ref'=>'project', 'project.title'=>'project');
 		$this->export_dependencies_array[$r] = array('payment'=>'p.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		// Add extra fields object
 		$sql = "SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn' AND entity IN (0, ".$conf->entity.")";
@@ -508,7 +509,7 @@ class modFournisseur extends DolibarrModules
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn as p ON pf.fk_paiementfourn = p.rowid';
 		$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid';
-        $this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('supplier_invoice').')';
+		$this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('supplier_invoice').')';
 		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
 
 		// Order
@@ -527,7 +528,7 @@ class modFournisseur extends DolibarrModules
 			'fd.total_tva'=>"LineTotalVAT", 'fd.product_type'=>'TypeOfLineServiceOrProduct', 'fd.ref'=>'RefSupplier', 'fd.fk_product'=>'ProductId',
 			'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel', 'project.rowid'=>'ProjectId', 'project.ref'=>'ProjectRef', 'project.title'=>'ProjectLabel'
 		);
-		if (! empty($conf->multicurrency->enabled))
+		if (!empty($conf->multicurrency->enabled))
 		{
 			$this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
 			$this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
@@ -650,6 +651,334 @@ class modFournisseur extends DolibarrModules
 		$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_commande';
 		$this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('supplier_order').')';
 		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+
+		//Import Supplier Invoice
+		//--------
+		$r = 0;
+
+		$r++;
+		$this->import_code[$r] = $this->rights_class.'_'.$r;
+		$this->import_label[$r] = "Supplier Invoice"; // Translation key
+		$this->import_icon[$r] = $this->picto;
+		$this->import_entities_array[$r] = []; // We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r] = ['f' => MAIN_DB_PREFIX.'facture_fourn', 'extra' => MAIN_DB_PREFIX.'facture_fourn_extrafields'];
+		$this->import_tables_creator_array[$r] = ['f' => 'fk_user_author']; // Fields to store import user id
+		$this->import_fields_array[$r] = [
+			'f.ref' => 'InvoiceRef*',
+			'f.ref_supplier' => 'RefSupplier',
+			'f.type' => 'Type*',
+			'f.fk_soc' => 'Supplier/Vendor*',
+			'f.datec' => 'InvoiceDateCreation',
+			'f.datef' => 'DateInvoice',
+			'f.date_lim_reglement' => 'DateMaxPayment',
+			'f.total_ht' => 'TotalHT',
+			'f.total_ttc' => 'TotalTTC',
+			'f.total_tva' => 'TotalVAT',
+			'f.paye' => 'InvoicePaid',
+			'f.fk_statut' => 'InvoiceStatus',
+			'f.fk_user_modif' => 'Modifier Id',
+			'f.fk_user_valid' => 'Validator Id',
+			'f.fk_facture_source' => 'Invoice Source Id',
+			'f.fk_projet' => 'Project Id',
+			'f.fk_account' => 'Bank Account*',
+			'f.note_public' => 'InvoiceNote',
+			'f.note_private' => 'NotePrivate',
+			'f.fk_cond_reglement' => 'Payment Condition',
+			'f.fk_mode_reglement' => 'Payment Mode',
+			'f.model_pdf' => 'Model',
+			'f.date_valid' => 'Validation Date'
+		];
+		if (!empty($conf->multicurrency->enabled)) {
+			$this->import_fields_array[$r]['f.multicurrency_code'] = 'Currency';
+			$this->import_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
+			$this->import_fields_array[$r]['f.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
+			$this->import_fields_array[$r]['f.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
+			$this->import_fields_array[$r]['f.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
+		}
+		// Add extra fields
+		$import_extrafield_sample = [];
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn' AND entity IN (0, ".$conf->entity.")";
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$fieldname = 'extra.'.$obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+				$import_extrafield_sample[$fieldname] = $fieldlabel;
+			}
+		}
+		// End add extra fields
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'facture_fourn'];
+		$this->import_regex_array[$r] = ['f.ref' => '(SI\d{4}-\d{4}|PROV.{1,32}$)', 'f.multicurrency_code' => 'code@'.MAIN_DB_PREFIX.'multicurrency'];
+		$import_sample = [
+			'f.ref' => '(PROV001)',
+			'f.ref_supplier' => 'Supplier1',
+			'f.type' => '0',
+			'f.fk_soc' => 'Vendor1',
+			'f.datec' => '2021-01-01',
+			'f.datef' => '',
+			'f.date_lim_reglement' => '2021-01-30',
+			'f.total_ht' => '1000',
+			'f.total_ttc' => '1000',
+			'f.total_tva' => '0',
+			'f.paye' => '0',
+			'f.fk_statut' => '0',
+			'f.fk_user_modif' => '',
+			'f.fk_user_valid' => '',
+			'f.fk_facture_source' => '',
+			'f.fk_projet' => '',
+			'f.fk_account' => 'BANK1',
+			'f.note_public' => 'Note: ',
+			'f.note_private' => '',
+			'f.fk_cond_reglement' => '1',
+			'f.fk_mode_reglement' => '2',
+			'f.model_pdf' => 'crab',
+			'f.date_valid' => '',
+			'f.multicurrency_code' => 'USD',
+			'f.multicurrency_tx' => '1',
+			'f.multicurrency_total_ht' => '1000',
+			'f.multicurrency_total_tva' => '0',
+			'f.multicurrency_total_ttc' => '1000'
+		];
+		$this->import_examplevalues_array[$r] = array_merge($import_sample, $import_extrafield_sample);
+		$this->import_updatekeys_array[$r] = ['f.ref' => 'Ref'];
+		$this->import_convertvalue_array[$r] = [
+			//'c.ref'=>array('rule'=>'getrefifauto'),
+			'f.fk_soc' => ['rule' => 'fetchidfromref', 'file' => '/societe/class/societe.class.php', 'class' => 'Societe', 'method' => 'fetch', 'element' => 'ThirdParty'],
+			'f.fk_account' => ['rule' => 'fetchidfromref', 'file' => '/compta/bank/class/account.class.php', 'class' => 'Account', 'method' => 'fetch', 'element' => 'bank_account'],
+		];
+
+		//Import Supplier Invoice Lines
+		$r++;
+		$this->import_code[$r] = $this->rights_class.'_'.$r;
+		$this->import_label[$r] = "Supplier Invoice Lines"; // Translation key
+		$this->import_icon[$r] = $this->picto;
+		$this->import_entities_array[$r] = []; // We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r] = ['fd' => MAIN_DB_PREFIX.'facture_fourn_det', 'extra' => MAIN_DB_PREFIX.'facture_fourn_det_extrafields'];
+		$this->import_fields_array[$r] = [
+			'fd.fk_facture_fourn' => 'InvoiceRef*',
+			'fd.fk_parent_line' => 'FacParentLine',
+			'fd.fk_product' => 'IdProduct',
+			'fd.label' => 'Label',
+			'fd.description' => 'LineDescription',
+			'fd.pu_ht' => 'PriceUHT',
+			'fd.pu_ttc' => 'PriceUTTC',
+			'fd.qty' => 'LineQty',
+			'fd.remise_percent' => 'Reduc.',
+			'fd.vat_src_code' => 'Vat Source Code',
+			'fd.product_type' => 'TypeOfLineServiceOrProduct',
+			'fd.tva_tx' => 'LineVATRate',
+			'fd.total_ht' => 'LineTotalHT',
+			'fd.tva' => 'LineTotalVAT',
+			'fd.total_ttc' => 'LineTotalTTC',
+			'fd.date_start' => 'Start Date',
+			'fd.date_end' => 'End Date',
+			'fd.fk_unit' => 'Unit'
+		];
+		if (!empty($conf->multicurrency->enabled)) {
+			$this->import_fields_array[$r]['fd.multicurrency_code'] = 'Currency';
+			$this->import_fields_array[$r]['fd.multicurrency_subprice'] = 'CurrencyRate';
+			$this->import_fields_array[$r]['fd.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
+			$this->import_fields_array[$r]['fd.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
+			$this->import_fields_array[$r]['fd.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
+		}
+		// Add extra fields
+		$import_extrafield_sample = [];
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn_det' AND entity IN (0, ".$conf->entity.")";
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$fieldname = 'extra.'.$obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+				$import_extrafield_sample[$fieldname] = $fieldlabel;
+			}
+		}
+		// End add extra fields
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'facture_fourn_det'];
+		$this->import_regex_array[$r] = ['fd.product_type' => '[0|1]$', 'fd.fk_product' => 'rowid@'.MAIN_DB_PREFIX.'product', 'fd.multicurrency_code' => 'code@'.MAIN_DB_PREFIX.'multicurrency'];
+		$import_sample = [
+			'fd.fk_facture_fourn' => '(PROV001)',
+			'fd.fk_parent_line' => '',
+			'fd.fk_product' => '',
+			'fd.label' => '',
+			'fd.description' => 'Test Product',
+			'fd.pu_ht' => '50000',
+			'fd.pu_ttc' => '50000',
+			'fd.qty' => '1',
+			'fd.remise_percent' => '0',
+			'fd.vat_src_code' => '',
+			'fd.product_type' => '0',
+			'fd.tva_tx' => '0',
+			'fd.total_ht' => '50000',
+			'fd.tva' => '0',
+			'fd.total_ttc' => '50000',
+			'fd.date_start' => '',
+			'fd.date_end' => '',
+			'fd.fk_unit' => '',
+			'fd.multicurrency_code' => 'USD',
+			'fd.multicurrency_tx' => '0',
+			'fd.multicurrency_total_ht' => '50000',
+			'fd.multicurrency_total_tva' => '0',
+			'fd.multicurrency_total_ttc' => '50000'
+		];
+		$this->import_examplevalues_array[$r] = array_merge($import_sample, $import_extrafield_sample);
+		$this->import_updatekeys_array[$r] = ['fd.rowid' => 'Row Id', 'fd.fk_facture_fourn' => 'Invoice Id', 'fd.fk_product' => 'Product Id'];
+		$this->import_convertvalue_array[$r] = [
+			'fd.fk_facture_fourn' => ['rule' => 'fetchidfromref', 'file' => '/fourn/class/fournisseur.facture.class.php', 'class' => 'FactureFournisseur', 'method' => 'fetch'],
+		];
+
+		//Import Purchase Orders
+		$r++;
+		$this->import_code[$r] = 'commande_fournisseur_'.$r;
+		$this->import_label[$r] = 'Purchase Orders';
+		$this->import_icon[$r] = $this->picto;
+		$this->import_entities_array[$r] = [];
+		$this->import_tables_array[$r] = ['c' => MAIN_DB_PREFIX.'commande_fournisseur', 'extra' => MAIN_DB_PREFIX.'commande_fournisseur_extrafields'];
+		$this->import_tables_creator_array[$r] = ['c' => 'fk_user_author']; // Fields to store import user id
+		$this->import_fields_array[$r] = [
+			'c.ref'               => 'Document Ref*',
+			'c.ref_supplier'      => 'RefSupplier',
+			'c.fk_soc'            => 'ThirdPartyName*',
+			'c.fk_projet'         => 'ProjectId',
+			'c.date_creation'     => 'DateCreation',
+			'c.date_valid'        => 'DateValid',
+			'c.date_approve'      => 'DateApprove',
+			'c.date_commande'     => 'DateOrder',
+			'c.fk_user_modif'     => 'ModifiedById',
+			'c.fk_user_valid'     => 'ValidatedById',
+			'c.fk_user_approve'   => 'ApprovedById',
+			'c.source'            => 'Source',
+			'c.fk_statut'         => 'Status*',
+			'c.billed'            => 'Billed(0/1)',
+			'c.remise_percent'    => 'GlobalDiscount',
+			'c.tva'               => 'TotalTVA',
+			'c.total_ht'          => 'TotalHT',
+			'c.total_ttc'         => 'TotalTTC',
+			'c.note_private'      => 'NotePrivate',
+			'c.note_public'       => 'Note',
+			'c.date_livraison'    => 'DeliveryDate',
+			'c.fk_cond_reglement' => 'Payment Condition',
+			'c.fk_mode_reglement' => 'Payment Mode',
+			'c.model_pdf'         => 'Model'
+		];
+
+		if (!empty($conf->multicurrency->enabled)) {
+			$this->import_fields_array[$r]['c.multicurrency_code']      = 'Currency';
+			$this->import_fields_array[$r]['c.multicurrency_tx']        = 'CurrencyRate';
+			$this->import_fields_array[$r]['c.multicurrency_total_ht']  = 'MulticurrencyAmountHT';
+			$this->import_fields_array[$r]['c.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
+			$this->import_fields_array[$r]['c.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
+		}
+
+		// Add extra fields
+		$import_extrafield_sample = [];
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commande_fournisseur' AND entity IN (0, ".$conf->entity.")";
+		$resql = $this->db->query($sql);
+
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$fieldname = 'extra.'.$obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+				$import_extrafield_sample[$fieldname] = $fieldlabel;
+			}
+		}
+		// End add extra fields
+
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'commande_fournisseur'];
+		$this->import_regex_array[$r] = [
+			'c.ref' => '(PO\d{4}-\d{4}|PORDER.{1,32}$|PROV.{1,32}$)',
+			'c.multicurrency_code' => 'code@'.MAIN_DB_PREFIX.'multicurrency'
+		];
+
+		$this->import_updatekeys_array[$r] = ['c.ref' => 'Ref'];
+		$this->import_convertvalue_array[$r] = [
+			'c.fk_soc' => [
+				'rule'    => 'fetchidfromref',
+				'file'    => '/societe/class/societe.class.php',
+				'class'   => 'Societe',
+				'method'  => 'fetch',
+				'element' => 'ThirdParty'
+			],
+			'c.fk_mode_reglement' => [
+				'rule' => 'fetchidfromcodeorlabel',
+				'file' => '/compta/paiement/class/cpaiement.class.php',
+				'class' => 'Cpaiement',
+				'method' => 'fetch',
+				'element' => 'cpayment'
+			],
+			'c.source' => ['rule' => 'zeroifnull'],
+		];
+
+		//Import PO Lines
+		$r++;
+		$this->import_code[$r] = 'commande_fournisseurdet_'.$r;
+		$this->import_label[$r] = 'PO Lines';
+		$this->import_icon[$r] = $this->picto;
+		$this->import_entities_array[$r] = [];
+		$this->import_tables_array[$r] = ['cd' => MAIN_DB_PREFIX.'commande_fournisseurdet', 'extra' => MAIN_DB_PREFIX.'commande_fournisseurdet_extrafields'];
+		$this->import_fields_array[$r] = [
+			'cd.fk_commande'    => 'Document Ref*',
+			'cd.fk_parent_line' => 'PrParentLine',
+			'cd.fk_product'     => 'IdProduct',
+			'cd.label'          => 'Label',
+			'cd.description'    => 'LineDescription',
+			'cd.tva_tx'         => 'LineVATRate',
+			'cd.qty'            => 'LineQty',
+			'cd.remise_percent' => 'Reduc. Percent',
+			'cd.remise'         => 'Reduc.',
+			'cd.subprice'       => 'Sub Price',
+			'cd.total_ht'       => 'LineTotalHT',
+			'cd.total_tva'      => 'LineTotalVAT',
+			'cd.total_ttc'      => 'LineTotalTTC',
+			'cd.product_type'   => 'TypeOfLineServiceOrProduct',
+			'cd.date_start'     => 'Start Date',
+			'cd.date_end'       => 'End Date',
+			'cd.info_bits'      => 'InfoBits',
+			'cd.special_code'   => 'Special Code',
+			'cd.rang'           => 'LinePosition',
+			'cd.fk_unit'        => 'Unit'
+		];
+
+		if (!empty($conf->multicurrency->enabled)) {
+			$this->import_fields_array[$r]['cd.multicurrency_code'] = 'Currency';
+			$this->import_fields_array[$r]['cd.multicurrency_subprice'] = 'CurrencyRate';
+			$this->import_fields_array[$r]['cd.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
+			$this->import_fields_array[$r]['cd.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
+			$this->import_fields_array[$r]['cd.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
+		}
+
+		// Add extra fields
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commande_fournisseurdet' AND entity IN (0, ".$conf->entity.")";
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$fieldname = 'extra.'.$obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+			}
+		}
+		// End add extra fields
+
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'commande_fournisseurdet'];
+		$this->import_regex_array[$r] = [
+			'cd.product_type'       => '[0|1]$',
+			'cd.fk_product'         => 'rowid@'.MAIN_DB_PREFIX.'product',
+			'cd.multicurrency_code' => 'code@'.MAIN_DB_PREFIX.'multicurrency'
+		];
+		$this->import_updatekeys_array[$r] = ['cd.fk_commande' => 'Purchase Order Id'];
+		$this->import_convertvalue_array[$r] = [
+			'cd.fk_commande' => [
+				'rule'    => 'fetchidfromref',
+				'file'    => '/fourn/class/fournisseur.commande.class.php',
+				'class'   => 'CommandeFournisseur',
+				'method'  => 'fetch',
+				'element' => 'order_supplier'
+			],
+			'cd.info_bits' => ['rule' => 'zeroifnull'],
+			'cd.special_code' => ['rule' => 'zeroifnull'],
+		];
 	}
 
 
@@ -658,7 +987,7 @@ class modFournisseur extends DolibarrModules
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php
index 484564b7066..ad36253fe22 100644
--- a/htdocs/core/modules/modHRM.class.php
+++ b/htdocs/core/modules/modHRM.class.php
@@ -49,7 +49,7 @@ class modHRM extends DolibarrModules
 		$this->description = "Management of employees carrier and feelings (department, employment contract)";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'development';
+		$this->version = 'experimental';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		// Name of image file used for this module.
diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index 6673f55711c..6c6eaba69e0 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -140,14 +140,14 @@ class modHoliday extends DolibarrModules
 		$r = 0;
 
 		$this->rights[$r][0] = 20001; // Permission id (must not be already used)
-		$this->rights[$r][1] = 'Read your own leave requests'; // Permission label
+		$this->rights[$r][1] = 'Read leave requests (yours and your subordinates)'; // Permission label
 		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'read'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
 		$this->rights[$r][0] = 20002; // Permission id (must not be already used)
-		$this->rights[$r][1] = 'Create/modify your own leave requests'; // Permission label
+		$this->rights[$r][1] = 'Create/modify leave requests'; // Permission label
 		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'write'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
@@ -170,14 +170,14 @@ class modHoliday extends DolibarrModules
 		$this->rights[$r][0] = 20004; // Permission id (must not be already used)
 		$this->rights[$r][1] = 'Read leave requests for everybody'; // Permission label
 		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'read_all'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][4] = 'readall'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
 		$this->rights[$r][0] = 20005; // Permission id (must not be already used)
 		$this->rights[$r][1] = 'Create/modify leave requests for everybody'; // Permission label
 		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'write_all'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][4] = 'writeall_advance'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
@@ -201,7 +201,7 @@ class modHoliday extends DolibarrModules
 		$this->export_code[$r] = 'leaverequest_'.$r;
 		$this->export_label[$r] = 'ListeCP';
 		$this->export_icon[$r] = 'holiday';
-		$this->export_permission[$r] = array(array("holiday", "read_all"));
+		$this->export_permission[$r] = array(array("holiday", "readall"));
 		$this->export_fields_array[$r] = array(
 			'd.rowid'=>"LeaveId", 'd.fk_type'=>'TypeOfLeaveId', 't.code'=>'TypeOfLeaveCode', 't.label'=>'TypeOfLeaveLabel', 'd.fk_user'=>'UserID',
 			'u.lastname'=>'Lastname', 'u.firstname'=>'Firstname', 'u.login'=>"Login", 'd.date_debut'=>'DateStart', 'd.date_fin'=>'DateEnd', 'd.halfday'=>'HalfDay', 'none.num_open_days'=>'NbUseDaysCP',
diff --git a/htdocs/core/modules/modIncoterm.class.php b/htdocs/core/modules/modIncoterm.class.php
index d8a6186be94..70e6c738801 100644
--- a/htdocs/core/modules/modIncoterm.class.php
+++ b/htdocs/core/modules/modIncoterm.class.php
@@ -37,11 +37,11 @@ class modIncoterm extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
-    {
-        global $langs, $conf;
+	public function __construct($db)
+	{
+		global $langs, $conf;
 
-        $this->db = $db;
+		$this->db = $db;
 
 		// Id for module (must be unique).
 		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
@@ -76,28 +76,28 @@ class modIncoterm extends DolibarrModules
 			array('INCOTERM_ACTIVATE', 'chaine', 0, 'Description de INCOTERM_ACTIVATE')
 		);
 
-        $this->tabs = array();
+		$this->tabs = array();
 
-        // Dictionaries
+		// Dictionaries
 		if (!isset($conf->incoterm->enabled))
-        {
-        	$conf->incoterm = new stdClass();
-        	$conf->incoterm->enabled = 0;
-        }
+		{
+			$conf->incoterm = new stdClass();
+			$conf->incoterm->enabled = 0;
+		}
 		$this->dictionaries = array(
 			'langs'=>'incoterm',
-            'tabname'=>array(MAIN_DB_PREFIX."c_incoterms"), // List of tables we want to see into dictonnary editor
-            'tablib'=>array("Incoterms"), // Label of tables
-            'tabsql'=>array('SELECT rowid, code, libelle, active FROM '.MAIN_DB_PREFIX.'c_incoterms'), // Request to select fields
-            'tabsqlsort'=>array("rowid ASC"), // Sort order
-            'tabfield'=>array("code,libelle"), // List of fields (result of select to show dictionary)
-            'tabfieldvalue'=>array("code,libelle"), // List of fields (list of fields to edit a record)
-            'tabfieldinsert'=>array("code,libelle"), // List of fields (list of fields for insert)
-            'tabrowid'=>array("rowid"), // Name of columns with primary key (try to always name it 'rowid')
-            'tabcond'=>array($conf->incoterm->enabled)
+			'tabname'=>array(MAIN_DB_PREFIX."c_incoterms"), // List of tables we want to see into dictonnary editor
+			'tablib'=>array("Incoterms"), // Label of tables
+			'tabsql'=>array('SELECT rowid, code, libelle, active FROM '.MAIN_DB_PREFIX.'c_incoterms'), // Request to select fields
+			'tabsqlsort'=>array("rowid ASC"), // Sort order
+			'tabfield'=>array("code,libelle"), // List of fields (result of select to show dictionary)
+			'tabfieldvalue'=>array("code,libelle"), // List of fields (list of fields to edit a record)
+			'tabfieldinsert'=>array("code,libelle"), // List of fields (list of fields for insert)
+			'tabrowid'=>array("rowid"), // Name of columns with primary key (try to always name it 'rowid')
+			'tabcond'=>array($conf->incoterm->enabled)
 		);
 
-        $this->boxes = array(); // List of boxes
+		$this->boxes = array(); // List of boxes
 		$r = 0;
 
 		// Permissions
diff --git a/htdocs/core/modules/modIntracommreport.class.php b/htdocs/core/modules/modIntracommreport.class.php
new file mode 100644
index 00000000000..668cf7af875
--- /dev/null
+++ b/htdocs/core/modules/modIntracommreport.class.php
@@ -0,0 +1,129 @@
+<?php
+/* Copyright (C) 2003       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
+ * Copyright (C) 2019       Open-DSI                <support@open-dsi.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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/core/modules/modIntracommreport.class.php
+ * 	\ingroup    Intracomm report
+ *	\brief      Module to activate intracomm report module
+ */
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
+
+
+/**
+ *  Description and activation class for module intracommreport
+ */
+class modIntracommreport extends DolibarrModules
+{
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf, $langs;
+
+		$this->db = $db;
+		$this->numero = 68000;
+
+		$this->family = "financial";
+		$this->module_position = '100';
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		$this->description = "Intracomm report management (Support for French DEB/DES format)";
+
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
+		$this->version = 'development';
+
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		$this->picto = 'intracommreport';
+
+		// Data directories to create when module is enabled
+		$this->dirs = array('/intracommreport/temp');
+
+		// Config pages
+		$this->config_page_url = array("intracommreport.php@intracommreport");
+
+		// Dependencies
+		$this->depends = array("modFacture", "modTax"); // List of modules id that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of modules id to disable if this one is disabled
+		$this->conflictwith = array(); // List of modules id this module is in conflict with
+		$this->phpmin = array(5, 5); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(13, 0, -5); // Minimum version of Dolibarr required by module
+		$this->langfiles = array("intracommreport");
+
+		// Constants
+		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
+		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
+		// );
+		$this->const = array();
+
+		// Tabs
+		$this->tabs = array();
+
+		// Css
+		$this->module_parts = array();
+
+		// Boxes
+		$this->boxes = array();
+
+		// Dictionaries
+		if (!isset($conf->intracommreport->enabled))
+		{
+			$conf->intracommreport = new stdClass();
+			$conf->intracommreport->enabled = 0;
+		}
+		$this->dictionaries = array();
+
+		// Permissions
+		$this->rights = array();
+		$this->rights_class = 'intracommreport';
+		$r = 0;
+
+		$r++;
+		$this->rights[$r][0] = 68001;
+		$this->rights[$r][1] = 'Read intracomm report';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'read';
+
+		$r++;
+		$this->rights[$r][0] = 68002;
+		$this->rights[$r][1] = 'Create/modify intracomm report';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'write';
+
+		$r++;
+		$this->rights[$r][0] = 68004;
+		$this->rights[$r][1] = 'Delete intracomm report';
+		$this->rights[$r][2] = 'd';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'delete';
+
+		// Main menu entries
+		$this->menu = array(); // List of menus to add
+		$r = 0;
+
+		// Exports
+		$r = 1;
+	}
+}
diff --git a/htdocs/core/modules/modLabel.class.php b/htdocs/core/modules/modLabel.class.php
index 78ed97cd295..88e044f0444 100644
--- a/htdocs/core/modules/modLabel.class.php
+++ b/htdocs/core/modules/modLabel.class.php
@@ -97,16 +97,16 @@ class modLabel extends DolibarrModules
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
-    public function init($options = '')
-    {
+	public function init($options = '')
+	{
 		// Permissions
 		$this->remove($options);
 
 		$sql = array();
 
 		return $this->_init($sql, $options);
-    }
+	}
 }
diff --git a/htdocs/core/modules/modLoan.class.php b/htdocs/core/modules/modLoan.class.php
index b1adf99940b..c29658ae0a7 100644
--- a/htdocs/core/modules/modLoan.class.php
+++ b/htdocs/core/modules/modLoan.class.php
@@ -153,7 +153,7 @@ class modLoan extends DolibarrModules
 	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *  It also creates data directories
 	 *
-     *  @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *  @return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
diff --git a/htdocs/core/modules/modMailing.class.php b/htdocs/core/modules/modMailing.class.php
index ae475836bb5..22cc75689a5 100644
--- a/htdocs/core/modules/modMailing.class.php
+++ b/htdocs/core/modules/modMailing.class.php
@@ -48,7 +48,7 @@ class modMailing extends DolibarrModules
 		// It is used to group modules by family in module setup page
 		$this->family = "interface";
 		// Module position in the family on 2 digits ('01', '10', '20', ...)
-		$this->module_position = '11';
+		$this->module_position = '22';
 
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
@@ -146,7 +146,7 @@ class modMailing extends DolibarrModules
 	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *  It also creates data directories
 	 *
-     *  @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *  @return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
diff --git a/htdocs/core/modules/modModuleBuilder.class.php b/htdocs/core/modules/modModuleBuilder.class.php
index 6f4af44ee1e..6060186a746 100644
--- a/htdocs/core/modules/modModuleBuilder.class.php
+++ b/htdocs/core/modules/modModuleBuilder.class.php
@@ -30,89 +30,89 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modModuleBuilder extends DolibarrModules
 {
-    /**
+	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
 	 *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-    	global $langs, $conf;
+	 */
+	public function __construct($db)
+	{
+		global $langs, $conf;
 
-        $this->db = $db;
-        $this->numero = 3300;
+		$this->db = $db;
+		$this->numero = 3300;
 
 		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
 		// It is used to group modules in module setup page
-        $this->family = "technic";
-        $this->module_position = '90';
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        $this->description = "A RAD (Rapid Application Development) tool to help developers to build their own module.";
+		$this->family = "technic";
+		$this->module_position = '90';
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		$this->description = "A RAD (Rapid Application Development) tool to help developers to build their own module.";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
-        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        $this->picto = 'bug';
+		$this->version = 'dolibarr';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		$this->picto = 'bug';
 
-        // Data directories to create when module is enabled
-        $this->dirs = array();
+		// Data directories to create when module is enabled
+		$this->dirs = array();
 
-        // Config pages
-        //-------------
-        $this->config_page_url = array('setup.php@modulebuilder');
+		// Config pages
+		//-------------
+		$this->config_page_url = array('setup.php@modulebuilder');
 
-        // Dependencies
-        //-------------
-	    $this->hidden = false; // A condition to disable module
-	    $this->depends = array(); // List of modules id that must be enabled if this module is enabled
-        $this->requiredby = array(); // List of modules id to disable if this one is disabled
-	    $this->conflictwith = array(); // List of modules id this module is in conflict with
-        $this->langfiles = array();
+		// Dependencies
+		//-------------
+		$this->hidden = false; // A condition to disable module
+		$this->depends = array(); // List of modules id that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of modules id to disable if this one is disabled
+		$this->conflictwith = array(); // List of modules id this module is in conflict with
+		$this->langfiles = array();
 
-        // Constants
-        //-----------
+		// Constants
+		//-----------
 
 
-        // New pages on tabs
-        // -----------------
-        $this->tabs = array();
+		// New pages on tabs
+		// -----------------
+		$this->tabs = array();
 
-        // Boxes
-        //------
-        $this->boxes = array();
+		// Boxes
+		//------
+		$this->boxes = array();
 
-        // Permissions
-        //------------
-        $this->rights = array(); // Permission array used by this module
-        $this->rights_class = 'modulebuilder';
+		// Permissions
+		//------------
+		$this->rights = array(); // Permission array used by this module
+		$this->rights_class = 'modulebuilder';
 
-        $r = 0;
+		$r = 0;
 
-        $r++;
-        $this->rights[$r][0] = 3301;
-        $this->rights[$r][1] = 'Generate new modules';
-        $this->rights[$r][2] = 'a';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'run';
+		$r++;
+		$this->rights[$r][0] = 3301;
+		$this->rights[$r][1] = 'Generate new modules';
+		$this->rights[$r][2] = 'a';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'run';
 
 
-        // Main menu entries
-        //------------------
-        $this->menu = array();
+		// Main menu entries
+		//------------------
+		$this->menu = array();
 
-        $this->menu[$r] = array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',
-            'type'=>'left',
-            'titre'=>'ModuleBuilder',
-            'mainmenu'=>'home',
-            'leftmenu'=>'admintools_modulebuilder',
-            'url'=>'/modulebuilder/index.php?mainmenu=home&amp;leftmenu=admintools',
-            'langs'=>'modulebuilder',
-            'position'=>100,
-            'perms'=>'1',
-            'enabled'=>'$conf->modulebuilder->enabled && preg_match(\'/^(admintools|all)/\',$leftmenu) && ($user->admin || $conf->global->MODULEBUILDER_FOREVERYONE)',
-            'target'=>'_modulebuilder',
-            'user'=>0);
-    }
+		$this->menu[$r] = array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',
+			'type'=>'left',
+			'titre'=>'ModuleBuilder',
+			'mainmenu'=>'home',
+			'leftmenu'=>'admintools_modulebuilder',
+			'url'=>'/modulebuilder/index.php?mainmenu=home&amp;leftmenu=admintools',
+			'langs'=>'modulebuilder',
+			'position'=>100,
+			'perms'=>'1',
+			'enabled'=>'$conf->modulebuilder->enabled && preg_match(\'/^(admintools|all)/\',$leftmenu) && ($user->admin || $conf->global->MODULEBUILDER_FOREVERYONE)',
+			'target'=>'_modulebuilder',
+			'user'=>0);
+	}
 }
diff --git a/htdocs/core/modules/modMrp.class.php b/htdocs/core/modules/modMrp.class.php
index 73df7523843..012bb2d576a 100644
--- a/htdocs/core/modules/modMrp.class.php
+++ b/htdocs/core/modules/modMrp.class.php
@@ -33,155 +33,155 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modMrp extends DolibarrModules
 {
-    /**
-     * Constructor. Define names, constants, directories, boxes, permissions
-     *
-     * @param DoliDB $db Database handler
-     */
-    public function __construct($db)
-    {
-        global $langs, $conf;
-        $this->db = $db;
+	/**
+	 * Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		global $langs, $conf;
+		$this->db = $db;
 
-        // Id for module (must be unique).
-        // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-        $this->numero = 660;
-        // Key text used to identify module (for permissions, menus, etc...)
-        $this->rights_class = 'mrp';
-        // Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
-        // It is used to group modules by family in module setup page
-        $this->family = "products";
-        // Module position in the family on 2 digits ('01', '10', '20', ...)
-        $this->module_position = '62';
-        // Gives the possibility for the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
-        //$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
-        // Module label (no space allowed), used if translation string 'ModuleMrpName' not found (Mrp is name of module).
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        // Module description, used if translation string 'ModuleMrpDesc' not found (Mrp is name of module).
-        $this->description = "Module to Manage Manufacturing Orders (MO)";
-        // Used only if file README.md and README-LL.md not found.
-        $this->descriptionlong = "Module to Manage Manufacturing Orders (MO)";
-        // Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-        $this->version = 'dolibarr';
-        // Url to the file with your last numberversion of this module
-        //$this->url_last_version = 'http://www.example.com/versionmodule.txt';
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 660;
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'mrp';
+		// Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
+		// It is used to group modules by family in module setup page
+		$this->family = "products";
+		// Module position in the family on 2 digits ('01', '10', '20', ...)
+		$this->module_position = '66';
+		// Gives the possibility for the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
+		//$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
+		// Module label (no space allowed), used if translation string 'ModuleMrpName' not found (Mrp is name of module).
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		// Module description, used if translation string 'ModuleMrpDesc' not found (Mrp is name of module).
+		$this->description = "Module to Manage Manufacturing Orders (MO)";
+		// Used only if file README.md and README-LL.md not found.
+		$this->descriptionlong = "Module to Manage Manufacturing Orders (MO)";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
+		$this->version = 'dolibarr';
+		// Url to the file with your last numberversion of this module
+		//$this->url_last_version = 'http://www.example.com/versionmodule.txt';
 
-        // Key used in llx_const table to save module status enabled/disabled (where MRP is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-        // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-        $this->picto = 'mrp';
-        // Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
-        $this->module_parts = array(
-            // Set this to 1 if module has its own trigger directory (core/triggers)
-            'triggers' => 0,
-            // Set this to 1 if module has its own login method file (core/login)
-            'login' => 0,
-            // Set this to 1 if module has its own substitution function file (core/substitutions)
-            'substitutions' => 0,
-            // Set this to 1 if module has its own menus handler directory (core/menus)
-            'menus' => 0,
-            // Set this to 1 if module overwrite template dir (core/tpl)
-            'tpl' => 0,
-            // Set this to 1 if module has its own barcode directory (core/modules/barcode)
-            'barcode' => 0,
-            // Set this to 1 if module has its own models directory (core/modules/xxx)
-            'models' => 0,
-            // Set this to 1 if module has its own theme directory (theme)
-            'theme' => 0,
-            // Set this to relative path of css file if module has its own css file
-            'css' => array(
-                //    '/mrp/css/mrp.css.php',
-            ),
-            // Set this to relative path of js file if module must load a js on all pages
-            'js' => array(
-                //   '/mrp/js/mrp.js.php',
-            ),
-            // Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context to 'all'
-            'hooks' => array(
-                //   'data' => array(
-                //       'hookcontext1',
-                //       'hookcontext2',
-                //   ),
-                //   'entity' => '0',
-            ),
-            // Set this to 1 if features of module are opened to external users
-            'moduleforexternal' => 0,
-        );
-        // Data directories to create when module is enabled.
-        // Example: this->dirs = array("/mrp/temp","/mrp/subdir");
-        $this->dirs = array("/mrp/temp");
-        // Config pages. Put here list of php page, stored into mrp/admin directory, to use to setup module.
-        $this->config_page_url = array("mrp.php");
-        // Dependencies
-        // A condition to hide module
-        $this->hidden = false;
-        // List of module class names as string that must be enabled if this module is enabled. Example: array('always1'=>'modModuleToEnable1','always2'=>'modModuleToEnable2', 'FR1'=>'modModuleToEnableFR'...)
-        $this->depends = array('modBom');
-        $this->requiredby = array(); // List of module class names as string to disable if this one is disabled. Example: array('modModuleToDisable1', ...)
-        $this->conflictwith = array(); // List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...)
-        $this->langfiles = array("mrp");
-        $this->phpmin = array(5, 5); // Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(8, 0); // Minimum version of Dolibarr required by module
-        $this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-        $this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-        //$this->automatic_activation = array('FR'=>'MrpWasAutomaticallyActivatedBecauseOfYourCountryChoice');
-        //$this->always_enabled = true;								// If true, can't be disabled
+		// Key used in llx_const table to save module status enabled/disabled (where MRP is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+		$this->picto = 'mrp';
+		// Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
+		$this->module_parts = array(
+			// Set this to 1 if module has its own trigger directory (core/triggers)
+			'triggers' => 0,
+			// Set this to 1 if module has its own login method file (core/login)
+			'login' => 0,
+			// Set this to 1 if module has its own substitution function file (core/substitutions)
+			'substitutions' => 0,
+			// Set this to 1 if module has its own menus handler directory (core/menus)
+			'menus' => 0,
+			// Set this to 1 if module overwrite template dir (core/tpl)
+			'tpl' => 0,
+			// Set this to 1 if module has its own barcode directory (core/modules/barcode)
+			'barcode' => 0,
+			// Set this to 1 if module has its own models directory (core/modules/xxx)
+			'models' => 0,
+			// Set this to 1 if module has its own theme directory (theme)
+			'theme' => 0,
+			// Set this to relative path of css file if module has its own css file
+			'css' => array(
+				//    '/mrp/css/mrp.css.php',
+			),
+			// Set this to relative path of js file if module must load a js on all pages
+			'js' => array(
+				//   '/mrp/js/mrp.js.php',
+			),
+			// Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context to 'all'
+			'hooks' => array(
+				//   'data' => array(
+				//       'hookcontext1',
+				//       'hookcontext2',
+				//   ),
+				//   'entity' => '0',
+			),
+			// Set this to 1 if features of module are opened to external users
+			'moduleforexternal' => 0,
+		);
+		// Data directories to create when module is enabled.
+		// Example: this->dirs = array("/mrp/temp","/mrp/subdir");
+		$this->dirs = array("/mrp/temp");
+		// Config pages. Put here list of php page, stored into mrp/admin directory, to use to setup module.
+		$this->config_page_url = array("mrp.php");
+		// Dependencies
+		// A condition to hide module
+		$this->hidden = false;
+		// List of module class names as string that must be enabled if this module is enabled. Example: array('always1'=>'modModuleToEnable1','always2'=>'modModuleToEnable2', 'FR1'=>'modModuleToEnableFR'...)
+		$this->depends = array('modBom');
+		$this->requiredby = array(); // List of module class names as string to disable if this one is disabled. Example: array('modModuleToDisable1', ...)
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...)
+		$this->langfiles = array("mrp");
+		$this->phpmin = array(5, 5); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(8, 0); // Minimum version of Dolibarr required by module
+		$this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		$this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		//$this->automatic_activation = array('FR'=>'MrpWasAutomaticallyActivatedBecauseOfYourCountryChoice');
+		//$this->always_enabled = true;								// If true, can't be disabled
 
-        // Constants
-        // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-        // Example: $this->const=array(1 => array('MRP_MYNEWCONST1', 'chaine', 'myvalue', 'This is a constant to add', 1),
-        //                             2 => array('MRP_MYNEWCONST2', 'chaine', 'myvalue', 'This is another constant to add', 0, 'current', 1)
-        // );
-        $this->const = array(
-        	1=>array('MRP_MO_ADDON_PDF', 'chaine', 'alpha', 'Name of PDF model of MO', 0),
-        	2=>array('MRP_MO_ADDON', 'chaine', 'mod_mo_standard', 'Name of numbering rules of MO', 0),
-        	3=>array('MRP_MO_ADDON_PDF_ODT_PATH', 'chaine', 'DOL_DATA_ROOT/doctemplates/mrps', '', 0)
-        );
+		// Constants
+		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example: $this->const=array(1 => array('MRP_MYNEWCONST1', 'chaine', 'myvalue', 'This is a constant to add', 1),
+		//                             2 => array('MRP_MYNEWCONST2', 'chaine', 'myvalue', 'This is another constant to add', 0, 'current', 1)
+		// );
+		$this->const = array(
+			1=>array('MRP_MO_ADDON_PDF', 'chaine', 'alpha', 'Name of PDF model of MO', 0),
+			2=>array('MRP_MO_ADDON', 'chaine', 'mod_mo_standard', 'Name of numbering rules of MO', 0),
+			3=>array('MRP_MO_ADDON_PDF_ODT_PATH', 'chaine', 'DOL_DATA_ROOT/doctemplates/mrps', '', 0)
+		);
 
-        // Some keys to add into the overwriting translation tables
-        /*$this->overwrite_translation = array(
+		// Some keys to add into the overwriting translation tables
+		/*$this->overwrite_translation = array(
             'en_US:ParentCompany'=>'Parent company or reseller',
             'fr_FR:ParentCompany'=>'Maison mère ou revendeur'
         )*/
 
-        if (!isset($conf->mrp) || !isset($conf->mrp->enabled)) {
-            $conf->mrp = new stdClass();
-            $conf->mrp->enabled = 0;
-        }
+		if (!isset($conf->mrp) || !isset($conf->mrp->enabled)) {
+			$conf->mrp = new stdClass();
+			$conf->mrp->enabled = 0;
+		}
 
-        // Array to add new pages in new tabs
-        $this->tabs = array();
-        // Example:
-        // $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@mrp:$user->rights->mrp->read:/mrp/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
-        // $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@mrp:$user->rights->othermodule->read:/mrp/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
-        // $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
-        //
-        // Where objecttype can be
-        // 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
-        // 'contact'          to add a tab in contact view
-        // 'contract'         to add a tab in contract view
-        // 'group'            to add a tab in group view
-        // 'intervention'     to add a tab in intervention view
-        // 'invoice'          to add a tab in customer invoice view
-        // 'invoice_supplier' to add a tab in supplier invoice view
-        // 'member'           to add a tab in fundation member view
-        // 'opensurveypoll'	  to add a tab in opensurvey poll view
-        // 'order'            to add a tab in customer order view
-        // 'order_supplier'   to add a tab in supplier order view
-        // 'payment'		  to add a tab in payment view
-        // 'payment_supplier' to add a tab in supplier payment view
-        // 'product'          to add a tab in product view
-        // 'propal'           to add a tab in propal view
-        // 'project'          to add a tab in project view
-        // 'stock'            to add a tab in stock view
-        // 'thirdparty'       to add a tab in third party view
-        // 'user'             to add a tab in user view
+		// Array to add new pages in new tabs
+		$this->tabs = array();
+		// Example:
+		// $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@mrp:$user->rights->mrp->read:/mrp/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
+		// $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@mrp:$user->rights->othermodule->read:/mrp/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
+		// $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
+		//
+		// Where objecttype can be
+		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
+		// 'contact'          to add a tab in contact view
+		// 'contract'         to add a tab in contract view
+		// 'group'            to add a tab in group view
+		// 'intervention'     to add a tab in intervention view
+		// 'invoice'          to add a tab in customer invoice view
+		// 'invoice_supplier' to add a tab in supplier invoice view
+		// 'member'           to add a tab in fundation member view
+		// 'opensurveypoll'	  to add a tab in opensurvey poll view
+		// 'order'            to add a tab in customer order view
+		// 'order_supplier'   to add a tab in supplier order view
+		// 'payment'		  to add a tab in payment view
+		// 'payment_supplier' to add a tab in supplier payment view
+		// 'product'          to add a tab in product view
+		// 'propal'           to add a tab in propal view
+		// 'project'          to add a tab in project view
+		// 'stock'            to add a tab in stock view
+		// 'thirdparty'       to add a tab in third party view
+		// 'user'             to add a tab in user view
 
-        // Dictionaries
-        $this->dictionaries = array();
-        /* Example:
+		// Dictionaries
+		$this->dictionaries = array();
+		/* Example:
         $this->dictionaries=array(
             'langs'=>'mylangfile@mrp',
             // List of tables we want to see into dictonnary editor
@@ -205,68 +205,68 @@ class modMrp extends DolibarrModules
         );
         */
 
-        // Boxes/Widgets
-        // Add here list of php file(s) stored in mrp/core/boxes that contains a class to show a widget.
-        $this->boxes = array(
-            0 => array('file' => 'box_mos.php', 'note' => '', 'enabledbydefaulton' => 'Home')
-        );
+		// Boxes/Widgets
+		// Add here list of php file(s) stored in mrp/core/boxes that contains a class to show a widget.
+		$this->boxes = array(
+			0 => array('file' => 'box_mos.php', 'note' => '', 'enabledbydefaulton' => 'Home')
+		);
 
-        // Cronjobs (List of cron jobs entries to add when module is enabled)
-        // unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
-        $this->cronjobs = array(
-            //  0 => array(
-            //      'label' => 'MyJob label',
-            //      'jobtype' => 'method',
-            //      'class' => '/mrp/class/mo.class.php',
-            //      'objectname' => 'Mo',
-            //      'method' => 'doScheduledJob',
-            //      'parameters' => '',
-            //      'comment' => 'Comment',
-            //      'frequency' => 2,
-            //      'unitfrequency' => 3600,
-            //      'status' => 0,
-            //      'test' => '$conf->mrp->enabled',
-            //      'priority' => 50,
-            //  ),
-        );
-        // Example: $this->cronjobs=array(
-        //    0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>'$conf->mrp->enabled', 'priority'=>50),
-        //    1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'status'=>0, 'test'=>'$conf->mrp->enabled', 'priority'=>50)
-        // );
+		// Cronjobs (List of cron jobs entries to add when module is enabled)
+		// unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
+		$this->cronjobs = array(
+			//  0 => array(
+			//      'label' => 'MyJob label',
+			//      'jobtype' => 'method',
+			//      'class' => '/mrp/class/mo.class.php',
+			//      'objectname' => 'Mo',
+			//      'method' => 'doScheduledJob',
+			//      'parameters' => '',
+			//      'comment' => 'Comment',
+			//      'frequency' => 2,
+			//      'unitfrequency' => 3600,
+			//      'status' => 0,
+			//      'test' => '$conf->mrp->enabled',
+			//      'priority' => 50,
+			//  ),
+		);
+		// Example: $this->cronjobs=array(
+		//    0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>'$conf->mrp->enabled', 'priority'=>50),
+		//    1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'status'=>0, 'test'=>'$conf->mrp->enabled', 'priority'=>50)
+		// );
 
-        // Permissions provided by this module
-        $this->rights = array();
-        $r = 0;
-        // Add here entries to declare new permissions
-        /* BEGIN MODULEBUILDER PERMISSIONS */
-        $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
-        $this->rights[$r][1] = 'Read Manufacturing Order'; // Permission label
-        $this->rights[$r][4] = 'read'; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
-        $this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
-        $r++;
-        $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
-        $this->rights[$r][1] = 'Create/Update Manufacturing Order'; // Permission label
-        $this->rights[$r][4] = 'write'; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
-        $this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
-        $r++;
-        $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
-        $this->rights[$r][1] = 'Delete Manufacturing Order'; // Permission label
-        $this->rights[$r][4] = 'delete'; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
-        $this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
-        $r++;
-        /* END MODULEBUILDER PERMISSIONS */
+		// Permissions provided by this module
+		$this->rights = array();
+		$r = 0;
+		// Add here entries to declare new permissions
+		/* BEGIN MODULEBUILDER PERMISSIONS */
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Read Manufacturing Order'; // Permission label
+		$this->rights[$r][4] = 'read'; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
+		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Create/Update Manufacturing Order'; // Permission label
+		$this->rights[$r][4] = 'write'; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
+		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Delete Manufacturing Order'; // Permission label
+		$this->rights[$r][4] = 'delete'; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
+		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
+		$r++;
+		/* END MODULEBUILDER PERMISSIONS */
 
-        // Main menu entries to add
-        $this->menu = array();
-        $r = 0;
-        // Add here entries to declare new menus
-        /* BEGIN MODULEBUILDER TOPMENU */
+		// Main menu entries to add
+		$this->menu = array();
+		$r = 0;
+		// Add here entries to declare new menus
+		/* BEGIN MODULEBUILDER TOPMENU */
 		/* END MODULEBUILDER LEFTMENU MO */
 
-        // Exports profiles provided by this module
-        $r = 1;
-        /* BEGIN MODULEBUILDER EXPORT MO */
-        /*
+		// Exports profiles provided by this module
+		$r = 1;
+		/* BEGIN MODULEBUILDER EXPORT MO */
+		/*
         $langs->load("mrp");
         $this->export_code[$r]=$this->rights_class.'_'.$r;
         $this->export_label[$r]='MoLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
@@ -281,12 +281,12 @@ class modMrp extends DolibarrModules
         $this->export_sql_end[$r] .=' WHERE 1 = 1';
         $this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('mo').')';
         $r++; */
-        /* END MODULEBUILDER EXPORT MO */
+		/* END MODULEBUILDER EXPORT MO */
 
-        // Imports profiles provided by this module
-        $r = 1;
-        /* BEGIN MODULEBUILDER IMPORT MO */
-        /*
+		// Imports profiles provided by this module
+		$r = 1;
+		/* BEGIN MODULEBUILDER IMPORT MO */
+		/*
          $langs->load("mrp");
          $this->export_code[$r]=$this->rights_class.'_'.$r;
          $this->export_label[$r]='MoLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
@@ -301,75 +301,75 @@ class modMrp extends DolibarrModules
          $this->export_sql_end[$r] .=' WHERE 1 = 1';
          $this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('mo').')';
          $r++; */
-        /* END MODULEBUILDER IMPORT MO */
-    }
+		/* END MODULEBUILDER IMPORT MO */
+	}
 
-    /**
-     *  Function called when module is enabled.
-     *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *  It also creates data directories
-     *
-     *  @param      string  $options    Options when enabling module ('', 'noboxes')
-     *  @return     int             	1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-    	global $conf, $langs;
+	/**
+	 *  Function called when module is enabled.
+	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *  It also creates data directories
+	 *
+	 *  @param      string  $options    Options when enabling module ('', 'noboxes')
+	 *  @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global $conf, $langs;
 
-        $result = $this->_load_tables('/mrp/sql/');
-        if ($result < 0) return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
+		$result = $this->_load_tables('/mrp/sql/');
+		if ($result < 0) return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
 
-        // Create extrafields during init
-        //include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-        //$extrafields = new ExtraFields($this->db);
-        //$result1=$extrafields->addExtraField('myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
-        //$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
-        //$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
-        //$result4=$extrafields->addExtraField('myattr4', "New Attr 4 label", 'select',  1,  3, 'thirdparty',   0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1,'', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
-        //$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
+		// Create extrafields during init
+		//include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+		//$extrafields = new ExtraFields($this->db);
+		//$result1=$extrafields->addExtraField('myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
+		//$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
+		//$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
+		//$result4=$extrafields->addExtraField('myattr4', "New Attr 4 label", 'select',  1,  3, 'thirdparty',   0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1,'', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
+		//$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
 
-        // Permissions
-        $this->remove($options);
+		// Permissions
+		$this->remove($options);
 
-        $sql = array();
+		$sql = array();
 
-        // ODT template
-        $src = DOL_DOCUMENT_ROOT.'/install/doctemplates/mrps/template_mo.odt';
-        $dirodt = DOL_DATA_ROOT.'/doctemplates/mrps';
-        $dest = $dirodt.'/template_mo.odt';
+		// ODT template
+		$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/mrps/template_mo.odt';
+		$dirodt = DOL_DATA_ROOT.'/doctemplates/mrps';
+		$dest = $dirodt.'/template_mo.odt';
 
-        if (file_exists($src) && !file_exists($dest))
-        {
-        	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-        	dol_mkdir($dirodt);
-        	$result = dol_copy($src, $dest, 0, 0);
-        	if ($result < 0)
-        	{
-        		$langs->load("errors");
-        		$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
-        		return 0;
-        	}
-        }
+		if (file_exists($src) && !file_exists($dest))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			dol_mkdir($dirodt);
+			$result = dol_copy($src, $dest, 0, 0);
+			if ($result < 0)
+			{
+				$langs->load("errors");
+				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
+				return 0;
+			}
+		}
 
-        $sql = array(
-        	//"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape('standard')."' AND type = 'mo' AND entity = ".$conf->entity,
-        	//"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape('standard')."', 'mo', ".$conf->entity.")"
-        );
+		$sql = array(
+			//"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape('standard')."' AND type = 'mo' AND entity = ".$conf->entity,
+			//"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape('standard')."', 'mo', ".$conf->entity.")"
+		);
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 
-    /**
-     *  Function called when module is disabled.
-     *  Remove from database constants, boxes and permissions from Dolibarr database.
-     *  Data directories are not deleted
-     *
-     *  @param      string	$options    Options when enabling module ('', 'noboxes')
-     *  @return     int                 1 if OK, 0 if KO
-     */
-    public function remove($options = '')
-    {
-        $sql = array();
-        return $this->_remove($sql, $options);
-    }
+	/**
+	 *  Function called when module is disabled.
+	 *  Remove from database constants, boxes and permissions from Dolibarr database.
+	 *  Data directories are not deleted
+	 *
+	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *  @return     int                 1 if OK, 0 if KO
+	 */
+	public function remove($options = '')
+	{
+		$sql = array();
+		return $this->_remove($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modMultiCurrency.class.php b/htdocs/core/modules/modMultiCurrency.class.php
index 47788fa44c8..605276dee0e 100644
--- a/htdocs/core/modules/modMultiCurrency.class.php
+++ b/htdocs/core/modules/modMultiCurrency.class.php
@@ -38,11 +38,11 @@ class modMultiCurrency extends DolibarrModules
 	 *
 	 * @param DoliDB $db Database handler
 	 */
-    public function __construct($db)
-    {
-        global $langs, $conf;
+	public function __construct($db)
+	{
+		global $langs, $conf;
 
-        $this->db = $db;
+		$this->db = $db;
 
 		// Id for module (must be unique).
 		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
@@ -101,8 +101,8 @@ class modMultiCurrency extends DolibarrModules
 
 		// Array to add new pages in new tabs
 		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@multicurrency:$user->rights->multicurrency->read:/multicurrency/mynewtab1.php?id=__ID__',  					// To add a new tab identified by code tabname1
-        //                              'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@multicurrency:$user->rights->othermodule->read:/multicurrency/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
-        //                              'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
+		//                              'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@multicurrency:$user->rights->othermodule->read:/multicurrency/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
+		//                              'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
 		// where objecttype can be
 		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
 		// 'contact'          to add a tab in contact view
@@ -123,16 +123,16 @@ class modMultiCurrency extends DolibarrModules
 		// 'stock'            to add a tab in stock view
 		// 'thirdparty'       to add a tab in third party view
 		// 'user'             to add a tab in user view
-        $this->tabs = array();
+		$this->tabs = array();
 
-        // Dictionaries
-	    if (!isset($conf->multicurrency->enabled))
-        {
-        	$conf->multicurrency = new stdClass();
-        	$conf->multicurrency->enabled = 0;
-        }
+		// Dictionaries
+		if (!isset($conf->multicurrency->enabled))
+		{
+			$conf->multicurrency = new stdClass();
+			$conf->multicurrency->enabled = 0;
+		}
 		$this->dictionaries = array();
-        /* Example:
+		/* Example:
         if (! isset($conf->multicurrency->enabled)) $conf->multicurrency->enabled=0;	// This is to avoid warnings
         $this->dictionaries=array(
             'langs'=>'mylangfile@multicurrency',
@@ -149,9 +149,9 @@ class modMultiCurrency extends DolibarrModules
         );
         */
 
-        // Boxes
+		// Boxes
 		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
-        $this->boxes = array(); // List of boxes
+		$this->boxes = array(); // List of boxes
 		// Example:
 		//$this->boxes=array(
 		//    0=>array('file'=>'myboxa.php@multicurrency','note'=>'','enabledbydefaulton'=>'Home'),
@@ -215,8 +215,8 @@ class modMultiCurrency extends DolibarrModules
 		// Example:
 		// $this->export_code[$r]=$this->rights_class.'_'.$r;
 		// $this->export_label[$r]='MyModule';	// Translation key (used only if key ExportDataset_xxx_z not found)
-        // $this->export_enabled[$r]='1';                               // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
-        // $this->export_icon[$r]='generic:MyModule';
+		// $this->export_enabled[$r]='1';                               // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
+		// $this->export_icon[$r]='generic:MyModule';
 		// $this->export_permission[$r]=array(array("multicurrency","level1","level2"));
 		// $this->export_fields_array[$r]=array(
 		//	's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone',
@@ -259,7 +259,7 @@ class modMultiCurrency extends DolibarrModules
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
diff --git a/htdocs/core/modules/modNotification.class.php b/htdocs/core/modules/modNotification.class.php
index ecd66168c8f..dbc355ce53e 100644
--- a/htdocs/core/modules/modNotification.class.php
+++ b/htdocs/core/modules/modNotification.class.php
@@ -49,9 +49,9 @@ class modNotification extends DolibarrModules
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "EMail notifications (push) on business Dolibarr events";
-        $this->descriptionlong = 'Module600Long';
+		$this->descriptionlong = 'Module600Long';
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
+		$this->version = 'dolibarr';
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		$this->picto = 'email';
 
@@ -86,7 +86,7 @@ class modNotification extends DolibarrModules
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
diff --git a/htdocs/core/modules/modOauth.class.php b/htdocs/core/modules/modOauth.class.php
index a118ab672bf..48c31b15d24 100644
--- a/htdocs/core/modules/modOauth.class.php
+++ b/htdocs/core/modules/modOauth.class.php
@@ -35,110 +35,110 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modOauth extends DolibarrModules
 {
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB      $db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-        $this->numero = 66000;
-        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-        // It is used to group modules in module setup page
-        $this->family = "interface";
-        $this->module_position = '31';
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-        $this->description = "Enable OAuth authentication";
-        // Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
-        $this->version = 'dolibarr';
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-        // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-        $this->picto = 'technic';
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB      $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+		$this->numero = 66000;
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
+		$this->family = "interface";
+		$this->module_position = '31';
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		$this->description = "Enable OAuth authentication";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
+		$this->version = 'dolibarr';
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+		$this->picto = 'technic';
 
-        // Data directories to create when module is enabled.
-        $this->dirs = array();
+		// Data directories to create when module is enabled.
+		$this->dirs = array();
 
-        // Config pages
-        $this->config_page_url = array("oauth.php");
+		// Config pages
+		$this->config_page_url = array("oauth.php");
 
-        // Dependencies
-        $this->hidden = false; // A condition to hide module
+		// Dependencies
+		$this->hidden = false; // A condition to hide module
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module                    // Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(3, 7, -2); // Minimum version of Dolibarr required by module
-        $this->conflictwith = array();
-        $this->langfiles = array("oauth");
+		$this->need_dolibarr_version = array(3, 7, -2); // Minimum version of Dolibarr required by module
+		$this->conflictwith = array();
+		$this->langfiles = array("oauth");
 
-        // Constants
-        $this->const = array();
+		// Constants
+		$this->const = array();
 
-        // Boxes
-        $this->boxes = array();
+		// Boxes
+		$this->boxes = array();
 
-        // Permissions
-        $this->rights = array();
-        $this->rights_class = 'oauth';
+		// Permissions
+		$this->rights = array();
+		$this->rights_class = 'oauth';
 
-        $r = 0;
-        // $this->rights[$r][0]     Id permission (unique tous modules confondus)
-        // $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
-        // $this->rights[$r][2]     Non utilise
-        // $this->rights[$r][3]     1=Permis par defaut, 0=Non permis par defaut
-        // $this->rights[$r][4]     Niveau 1 pour nommer permission dans code
-        // $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
+		$r = 0;
+		// $this->rights[$r][0]     Id permission (unique tous modules confondus)
+		// $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
+		// $this->rights[$r][2]     Non utilise
+		// $this->rights[$r][3]     1=Permis par defaut, 0=Non permis par defaut
+		// $this->rights[$r][4]     Niveau 1 pour nommer permission dans code
+		// $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
 
-        /*$r++;
+		/*$r++;
         $this->rights[$r][0] = 66000;
         $this->rights[$r][1] = 'OauthAccess';
         $this->rights[$r][2] = 'r';
         $this->rights[$r][3] = 0;
         $this->rights[$r][4] = 'read';*/
 
-        // Main menu entries
-        $this->menus = array(); // List of menus to add
-        $r = 0;
+		// Main menu entries
+		$this->menus = array(); // List of menus to add
+		$r = 0;
 
-        // This is to declare the Top Menu entry:
-        //$this->menu[$r]=array(  'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',               // Put 0 if this is a top menu
-        //                        'type'=>'left',                 // This is a Top menu entry
-        //                        'titre'=>'MenuOauth',
-        //                        'mainmenu'=>'oauth',
-        //                        'url'=>'/oauth/index.php',
-        //                        'langs'=>'oauth',            // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-        //                        'position'=>300,
-        //                        'enabled'=>'$conf->oauth->enabled && preg_match(\'/^(admintools|all)/\',$leftmenu)',
-        //                        'perms'=>'$user->rights->oauth->read',    // Use 'perms'=>'1' if you want your menu with no permission rules
-        //                        'target'=>'',
-        //                        'user'=>0);                     // 0=Menu for internal users, 1=external users, 2=both
+		// This is to declare the Top Menu entry:
+		//$this->menu[$r]=array(  'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',               // Put 0 if this is a top menu
+		//                        'type'=>'left',                 // This is a Top menu entry
+		//                        'titre'=>'MenuOauth',
+		//                        'mainmenu'=>'oauth',
+		//                        'url'=>'/oauth/index.php',
+		//                        'langs'=>'oauth',            // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//                        'position'=>300,
+		//                        'enabled'=>'$conf->oauth->enabled && preg_match(\'/^(admintools|all)/\',$leftmenu)',
+		//                        'perms'=>'$user->rights->oauth->read',    // Use 'perms'=>'1' if you want your menu with no permission rules
+		//                        'target'=>'',
+		//                        'user'=>0);                     // 0=Menu for internal users, 1=external users, 2=both
 
-        //$r++;
-    }
+		//$r++;
+	}
 
 
-    /**
-     *      Function called when module is enabled.
-     *      The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *      It also creates data directories
-     *
-     *      @param      string  $options    Options when enabling module ('', 'noboxes')
-     *      @return     int                 1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-        global $conf;
+	/**
+	 *      Function called when module is enabled.
+	 *      The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *      It also creates data directories
+	 *
+	 *      @param      string  $options    Options when enabling module ('', 'noboxes')
+	 *      @return     int                 1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global $conf;
 
-        // Clean before activation
-        $this->remove($options);
+		// Clean before activation
+		$this->remove($options);
 
-        $sql = array();
+		$sql = array();
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modOpenSurvey.class.php b/htdocs/core/modules/modOpenSurvey.class.php
index 1c1774c83fd..623c6d7c43e 100644
--- a/htdocs/core/modules/modOpenSurvey.class.php
+++ b/htdocs/core/modules/modOpenSurvey.class.php
@@ -37,8 +37,8 @@ class modOpenSurvey extends DolibarrModules
 	 *
 	 *   @param		DoliDB		$db		Database handler
 	 */
-    public function __construct($db)
-    {
+	public function __construct($db)
+	{
 		global $langs, $conf;
 
 		$this->db = $db;
@@ -83,7 +83,7 @@ class modOpenSurvey extends DolibarrModules
 		$this->const = array(); // List of parameters
 
 		// Dictionaries
-        $this->dictionaries = array();
+		$this->dictionaries = array();
 
 		// Boxes
 		$this->boxes = array(); // List of boxes
@@ -119,73 +119,73 @@ class modOpenSurvey extends DolibarrModules
 		$r++;
 
 
-        // Menus
-        //-------
-        $r = 0;
-        $this->menu[$r] = array(
-            'fk_menu'=>'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-            'type'=>'left',
-            'titre'=>'Survey',
-            'mainmenu'=>'tools',
-            'leftmenu'=>'opensurvey',
-            'url'=>'/opensurvey/index.php?mainmenu=tools&leftmenu=opensurvey',
-            'langs'=>'opensurvey',
-            'position'=>200,
-            'enabled'=>'$conf->opensurvey->enabled', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
-            'perms'=>'$user->rights->opensurvey->read',
-            'target'=>'',
-            'user'=>0,
-        );
-        $r++;
+		// Menus
+		//-------
+		$r = 0;
+		$this->menu[$r] = array(
+			'fk_menu'=>'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'=>'left',
+			'titre'=>'Survey',
+			'mainmenu'=>'tools',
+			'leftmenu'=>'opensurvey',
+			'url'=>'/opensurvey/index.php?mainmenu=tools&leftmenu=opensurvey',
+			'langs'=>'opensurvey',
+			'position'=>200,
+			'enabled'=>'$conf->opensurvey->enabled', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
+			'perms'=>'$user->rights->opensurvey->read',
+			'target'=>'',
+			'user'=>0,
+		);
+		$r++;
 
-        $this->menu[$r] = array(
-            'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=opensurvey', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-            'type'=>'left',
-            'titre'=>'NewSurvey',
-            'mainmenu'=>'tools',
-            'leftmenu'=>'opensurvey_new',
-            'url'=>'/opensurvey/wizard/index.php',
-            'langs'=>'opensurvey',
-            'position'=>210,
-            'enabled'=>'$conf->opensurvey->enabled', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
-            'perms'=>'$user->rights->opensurvey->write',
-            'target'=>'',
-            'user'=>0,
-        );
-        $r++;
+		$this->menu[$r] = array(
+			'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=opensurvey', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'=>'left',
+			'titre'=>'NewSurvey',
+			'mainmenu'=>'tools',
+			'leftmenu'=>'opensurvey_new',
+			'url'=>'/opensurvey/wizard/index.php',
+			'langs'=>'opensurvey',
+			'position'=>210,
+			'enabled'=>'$conf->opensurvey->enabled', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
+			'perms'=>'$user->rights->opensurvey->write',
+			'target'=>'',
+			'user'=>0,
+		);
+		$r++;
 
-        $this->menu[$r] = array(
-            'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=opensurvey', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-            'type'=>'left',
-            'titre'=>'List',
-            'mainmenu'=>'tools',
-            'leftmenu'=>'opensurvey_list',
-            'url'=>'/opensurvey/list.php',
-            'langs'=>'opensurvey',
-            'position'=>220,
-            'enabled'=>'$conf->opensurvey->enabled', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
-            'perms'=>'$user->rights->opensurvey->read',
-            'target'=>'',
-            'user'=>0,
-        );
-        $r++;
-    }
+		$this->menu[$r] = array(
+			'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=opensurvey', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'=>'left',
+			'titre'=>'List',
+			'mainmenu'=>'tools',
+			'leftmenu'=>'opensurvey_list',
+			'url'=>'/opensurvey/list.php',
+			'langs'=>'opensurvey',
+			'position'=>220,
+			'enabled'=>'$conf->opensurvey->enabled', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
+			'perms'=>'$user->rights->opensurvey->read',
+			'target'=>'',
+			'user'=>0,
+		);
+		$r++;
+	}
 
 	/**
 	 *	Function called when module is enabled.
 	 *	The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *	It also creates data directories
 	 *
-     *  @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *  @return     int             	1 if OK, 0 if KO
 	 */
-    public function init($options = '')
-    {
-        // Permissions
-        $this->remove($options);
+	public function init($options = '')
+	{
+		// Permissions
+		$this->remove($options);
 
-        $sql = array();
+		$sql = array();
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modPaybox.class.php b/htdocs/core/modules/modPaybox.class.php
index cd4630fb6cf..a5cda052656 100644
--- a/htdocs/core/modules/modPaybox.class.php
+++ b/htdocs/core/modules/modPaybox.class.php
@@ -31,161 +31,161 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modPayBox extends DolibarrModules
 {
-    /**
-     *   Constructor. Define names, constants, directories, boxes, permissions
-     *
-     *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-        // Id for module (must be unique).
-        // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-        $this->numero = 50000;
-        // Key text used to identify module (for permissions, menus, etc...)
-        $this->rights_class = 'paybox';
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 50000;
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'paybox';
 
-        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-        // It is used to group modules in module setup page
-        $this->family = "interface";
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-        $this->description = "Module to offer an online payment page by credit card with PayBox";
-        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
-        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-        // If file is in module/img directory, use this->picto=DOL_URL_ROOT.'/module/img/file.png'
-        $this->picto = 'paybox@paybox';
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
+		$this->family = "interface";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		$this->description = "Module to offer an online payment page by credit card with PayBox";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'dolibarr';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory, use this->picto=DOL_URL_ROOT.'/module/img/file.png'
+		$this->picto = 'paybox@paybox';
 
-        // Data directories to create when module is enabled.
-        $this->dirs = array('/paybox/temp');
+		// Data directories to create when module is enabled.
+		$this->dirs = array('/paybox/temp');
 
-        // Config pages. Put here list of php page names stored in admmin directory used to setup module.
-        $this->config_page_url = array("paybox.php@paybox");
+		// Config pages. Put here list of php page names stored in admmin directory used to setup module.
+		$this->config_page_url = array("paybox.php@paybox");
 
-        // Dependencies
-        $this->hidden = false; // A condition to hide module
+		// Dependencies
+		$this->hidden = false; // A condition to hide module
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(2, 6); // Minimum version of Dolibarr required by module
-        $this->langfiles = array("paybox");
+		$this->need_dolibarr_version = array(2, 6); // Minimum version of Dolibarr required by module
+		$this->langfiles = array("paybox");
 
-        // Constants
-        $this->const = array(); // List of particular constants to add when module is enabled
-        //Example: $this->const=array(0=>array('MODULE_MY_NEW_CONST1','chaine','myvalue','This is a constant to add',0),
-        //                            1=>array('MODULE_MY_NEW_CONST2','chaine','myvalue','This is another constant to add',0) );
+		// Constants
+		$this->const = array(); // List of particular constants to add when module is enabled
+		//Example: $this->const=array(0=>array('MODULE_MY_NEW_CONST1','chaine','myvalue','This is a constant to add',0),
+		//                            1=>array('MODULE_MY_NEW_CONST2','chaine','myvalue','This is another constant to add',0) );
 
-        // New pages on tabs
-        $this->tabs = array();
+		// New pages on tabs
+		$this->tabs = array();
 
 
-        // Boxes
-        $this->boxes = array(); // List of boxes
-        $r = 0;
+		// Boxes
+		$this->boxes = array(); // List of boxes
+		$r = 0;
 
-        // Add here list of php file(s) stored in core/boxes that contains class to show a box.
-        // Example:
-        //$this->boxes[$r][1] = "myboxa.php";
-        //$r++;
-        //$this->boxes[$r][1] = "myboxb.php";
-        //$r++;
+		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
+		// Example:
+		//$this->boxes[$r][1] = "myboxa.php";
+		//$r++;
+		//$this->boxes[$r][1] = "myboxb.php";
+		//$r++;
 
 
-        // Permissions
-        $this->rights = array(); // Permission array used by this module
-        $r = 0;
+		// Permissions
+		$this->rights = array(); // Permission array used by this module
+		$r = 0;
 
-        // Add here list of permission defined by an id, a label, a boolean and two constant strings.
-        // Example:
-        // $this->rights[$r][0] = 2000; 				// Permission id (must not be already used)
-        // $this->rights[$r][1] = 'Permision label';	// Permission label
-        // $this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-        // $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-        // $this->rights[$r][5] = 'level2';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-        // $r++;
+		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
+		// Example:
+		// $this->rights[$r][0] = 2000; 				// Permission id (must not be already used)
+		// $this->rights[$r][1] = 'Permision label';	// Permission label
+		// $this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+		// $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		// $this->rights[$r][5] = 'level2';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		// $r++;
 
 
-        // Main menu entries
-        $this->menus = array(); // List of menus to add
-        $r = 0;
+		// Main menu entries
+		$this->menus = array(); // List of menus to add
+		$r = 0;
 
-        // Add here entries to declare new menus
-        // Example to declare the Top Menu entry:
-        // $this->menu[$r]=array(	'fk_menu'=>0,			// Put 0 if this is a top menu
-        //							'type'=>'top',			// This is a Top menu entry
-        //							'titre'=>'MyModule top menu',
-        //							'mainmenu'=>'mymodule',
-        //							'url'=>'/mymodule/pagetop.php',
-        //							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-        //							'position'=>100,
-        //							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-        //							'target'=>'',
-        //							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
-        // $r++;
-        //
-        // Example to declare a Left Menu entry:
-        // $this->menu[$r]=array(	'fk_menu'=>'r=0',		// Use r=value where r is index key used for the parent menu entry (higher parent must be a top menu entry)
-        //							'type'=>'left',			// This is a Left menu entry
-        //							'titre'=>'MyModule left menu 1',
-        //							'mainmenu'=>'mymodule',
-        //							'url'=>'/mymodule/pagelevel1.php',
-        //							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-        //							'position'=>100,
-        //							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-        //							'target'=>'',
-        //							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
-        // $r++;
-        //
-        // Example to declare another Left Menu entry:
-        // $this->menu[$r]=array(	'fk_menu'=>'r=1',		// Use r=value where r is index key used for the parent menu entry (higher parent must be a top menu entry)
-        //							'type'=>'left',			// This is a Left menu entry
-        //							'titre'=>'MyModule left menu 2',
-        //							'mainmenu'=>'mymodule',
-        //							'url'=>'/mymodule/pagelevel2.php',
-        //							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-        //							'position'=>100,
-        //							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-        //							'target'=>'',
-        //							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
-        // $r++;
+		// Add here entries to declare new menus
+		// Example to declare the Top Menu entry:
+		// $this->menu[$r]=array(	'fk_menu'=>0,			// Put 0 if this is a top menu
+		//							'type'=>'top',			// This is a Top menu entry
+		//							'titre'=>'MyModule top menu',
+		//							'mainmenu'=>'mymodule',
+		//							'url'=>'/mymodule/pagetop.php',
+		//							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//							'position'=>100,
+		//							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+		//							'target'=>'',
+		//							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
+		// $r++;
+		//
+		// Example to declare a Left Menu entry:
+		// $this->menu[$r]=array(	'fk_menu'=>'r=0',		// Use r=value where r is index key used for the parent menu entry (higher parent must be a top menu entry)
+		//							'type'=>'left',			// This is a Left menu entry
+		//							'titre'=>'MyModule left menu 1',
+		//							'mainmenu'=>'mymodule',
+		//							'url'=>'/mymodule/pagelevel1.php',
+		//							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//							'position'=>100,
+		//							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+		//							'target'=>'',
+		//							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
+		// $r++;
+		//
+		// Example to declare another Left Menu entry:
+		// $this->menu[$r]=array(	'fk_menu'=>'r=1',		// Use r=value where r is index key used for the parent menu entry (higher parent must be a top menu entry)
+		//							'type'=>'left',			// This is a Left menu entry
+		//							'titre'=>'MyModule left menu 2',
+		//							'mainmenu'=>'mymodule',
+		//							'url'=>'/mymodule/pagelevel2.php',
+		//							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//							'position'=>100,
+		//							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+		//							'target'=>'',
+		//							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
+		// $r++;
 
 
-        // Exports
-        $r = 1;
+		// Exports
+		$r = 1;
 
-        // Example:
-        // $this->export_code[$r]=$this->rights_class.'_'.$r;
-        // $this->export_label[$r]='CustomersInvoicesAndInvoiceLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
-        // $this->export_permission[$r]=array(array("facture","facture","export"));
-        // $this->export_fields_array[$r]=array(
-        //     's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town',
-        //     's.fk_pays'=>'Country','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3',
-        //     's.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode',
-        //     'f.rowid'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",
-        //     'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note'=>"InvoiceNote",'fd.rowid'=>'LineId',
-        //     'fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",
-        //     'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef',
-        // );
-        // $this->export_entities_array[$r]=array(
-        //     's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company',
-        //     's.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company',
-        //     's.code_compta'=>'company','s.code_compta_fournisseur'=>'company','f.rowid'=>"invoice",'f.ref'=>"invoice",'f.datec'=>"invoice",
-        //     'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice',
-        //     'f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",
-        //     'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",
-        //     'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product',
-        // );
-        // $this->export_sql_start[$r]='SELECT DISTINCT ';
-        // $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
-        // $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
-        // $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
-        // $r++;
-    }
+		// Example:
+		// $this->export_code[$r]=$this->rights_class.'_'.$r;
+		// $this->export_label[$r]='CustomersInvoicesAndInvoiceLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		// $this->export_permission[$r]=array(array("facture","facture","export"));
+		// $this->export_fields_array[$r]=array(
+		//     's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town',
+		//     's.fk_pays'=>'Country','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3',
+		//     's.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode',
+		//     'f.rowid'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",
+		//     'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note'=>"InvoiceNote",'fd.rowid'=>'LineId',
+		//     'fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",
+		//     'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef',
+		// );
+		// $this->export_entities_array[$r]=array(
+		//     's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company',
+		//     's.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company',
+		//     's.code_compta'=>'company','s.code_compta_fournisseur'=>'company','f.rowid'=>"invoice",'f.ref'=>"invoice",'f.datec'=>"invoice",
+		//     'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice',
+		//     'f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",
+		//     'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",
+		//     'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product',
+		// );
+		// $this->export_sql_start[$r]='SELECT DISTINCT ';
+		// $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
+		// $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
+		// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
+		// $r++;
+	}
 }
diff --git a/htdocs/core/modules/modPaymentByBankTransfer.class.php b/htdocs/core/modules/modPaymentByBankTransfer.class.php
index 9ea1bf00f29..0eab52fcdec 100644
--- a/htdocs/core/modules/modPaymentByBankTransfer.class.php
+++ b/htdocs/core/modules/modPaymentByBankTransfer.class.php
@@ -120,29 +120,29 @@ class modPaymentByBankTransfer extends DolibarrModules
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'debit';
 
-        // Menus
-        //-------
-        $this->menu = 1; // This module add menu entries. They are coded into menu manager.
-    }
+		// Menus
+		//-------
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
+	}
 
 
-    /**
-     *  Function called when module is enabled.
-     *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *  It also creates data directories
-     *
-     *  @param      string	$options    Options when enabling module ('', 'noboxes')
-     *  @return     int             	1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-        global $conf;
+	/**
+	 *  Function called when module is enabled.
+	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *  It also creates data directories
+	 *
+	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *  @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global $conf;
 
-        // Permissions
-        $this->remove($options);
+		// Permissions
+		$this->remove($options);
 
-        $sql = array();
+		$sql = array();
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modPaypal.class.php b/htdocs/core/modules/modPaypal.class.php
index c8e15838704..15a92020062 100644
--- a/htdocs/core/modules/modPaypal.class.php
+++ b/htdocs/core/modules/modPaypal.class.php
@@ -32,82 +32,82 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modPaypal extends DolibarrModules
 {
-    /**
-     *   Constructor. Define names, constants, directories, boxes, permissions
-     *
-     *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-        // Id for module (must be unique).
-        // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-        $this->numero = 50200;
-        // Key text used to identify module (for permissions, menus, etc...)
-        $this->rights_class = 'paypal';
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 50200;
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'paypal';
 
-        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-        // It is used to group modules in module setup page
-        $this->family = "interface";
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-        $this->description = "Module to offer an online payment page with PayPal";
-        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
-        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-        // If file is in module/img directory, use this->picto=DOL_URL_ROOT.'/module/img/file.png'
-        $this->picto = 'paypal@paypal';
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
+		$this->family = "interface";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		$this->description = "Module to offer an online payment page with PayPal";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'dolibarr';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory, use this->picto=DOL_URL_ROOT.'/module/img/file.png'
+		$this->picto = 'paypal@paypal';
 
-        // Data directories to create when module is enabled.
-        $this->dirs = array('/paypal/temp');
+		// Data directories to create when module is enabled.
+		$this->dirs = array('/paypal/temp');
 
-        // Config pages. Put here list of php page names stored in admmin directory used to setup module.
-        $this->config_page_url = array("paypal.php@paypal");
+		// Config pages. Put here list of php page names stored in admmin directory used to setup module.
+		$this->config_page_url = array("paypal.php@paypal");
 
-        // Dependencies
-        $this->hidden = false; // A condition to hide module
+		// Dependencies
+		$this->hidden = false; // A condition to hide module
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array('modPaypalPlus'); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(3, 0); // Minimum version of Dolibarr required by module
-        $this->langfiles = array("paypal");
+		$this->need_dolibarr_version = array(3, 0); // Minimum version of Dolibarr required by module
+		$this->langfiles = array("paypal");
 
-        // Constants
-        $this->const = array(); // List of particular constants to add when module is enabled
-        //Example: $this->const=array(0=>array('MODULE_MY_NEW_CONST1','chaine','myvalue','This is a constant to add',0),
-        //                            1=>array('MODULE_MY_NEW_CONST2','chaine','myvalue','This is another constant to add',0) );
+		// Constants
+		$this->const = array(); // List of particular constants to add when module is enabled
+		//Example: $this->const=array(0=>array('MODULE_MY_NEW_CONST1','chaine','myvalue','This is a constant to add',0),
+		//                            1=>array('MODULE_MY_NEW_CONST2','chaine','myvalue','This is another constant to add',0) );
 
-        // New pages on tabs
-        $this->tabs = array();
+		// New pages on tabs
+		$this->tabs = array();
 
 
-        // Boxes
-        $this->boxes = array(); // List of boxes
-        $r = 0;
+		// Boxes
+		$this->boxes = array(); // List of boxes
+		$r = 0;
 
-        // Add here list of php file(s) stored in core/boxes that contains class to show a box.
-        // Example:
-        //$this->boxes[$r][1] = "myboxa.php";
-        //$r++;
-        //$this->boxes[$r][1] = "myboxb.php";
-        //$r++;
+		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
+		// Example:
+		//$this->boxes[$r][1] = "myboxa.php";
+		//$r++;
+		//$this->boxes[$r][1] = "myboxb.php";
+		//$r++;
 
 
-        // Permissions
-        $this->rights = array(); // Permission array used by this module
-        $r = 0;
+		// Permissions
+		$this->rights = array(); // Permission array used by this module
+		$r = 0;
 
 
-        // Main menu entries
-        $this->menus = array(); // List of menus to add
-        $r = 0;
-        /*$this->menu[$r]=array(
+		// Main menu entries
+		$this->menus = array(); // List of menus to add
+		$r = 0;
+		/*$this->menu[$r]=array(
 	        'fk_menu'=>'fk_mainmenu=billing,fk_leftmenu=customers_bills_payment',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 	        'mainmenu'=>'billing',
 	        'leftmenu'=>'customers_bills_payment_paypal',
@@ -123,75 +123,75 @@ class modPaypal extends DolibarrModules
         );				                // 0=Menu for internal users, 1=external users, 2=both
         $r++;*/
 
-        // Add here entries to declare new menus
-        // Example to declare the Top Menu entry:
-        // $this->menu[$r]=array(	'fk_menu'=>0,			// Put 0 if this is a top menu
-        //							'type'=>'top',			// This is a Top menu entry
-        //							'titre'=>'MyModule top menu',
-        //							'mainmenu'=>'mymodule',
-        //							'url'=>'/mymodule/pagetop.php',
-        //							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-        //							'position'=>100,
-        //							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-        //							'target'=>'',
-        //							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
-        // $r++;
-        //
-        // Example to declare a Left Menu entry:
-        // $this->menu[$r]=array(	'fk_menu'=>'r=0',		// Use r=value where r is index key used for the parent menu entry (higher parent must be a top menu entry)
-        //							'type'=>'left',			// This is a Left menu entry
-        //							'titre'=>'MyModule left menu 1',
-        //							'mainmenu'=>'mymodule',
-        //							'url'=>'/mymodule/pagelevel1.php',
-        //							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-        //							'position'=>100,
-        //							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-        //							'target'=>'',
-        //							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
-        // $r++;
-        //
-        // Example to declare another Left Menu entry:
-        // $this->menu[$r]=array(	'fk_menu'=>'r=1',		// Use r=value where r is index key used for the parent menu entry (higher parent must be a top menu entry)
-        //							'type'=>'left',			// This is a Left menu entry
-        //							'titre'=>'MyModule left menu 2',
-        //							'mainmenu'=>'mymodule',
-        //							'url'=>'/mymodule/pagelevel2.php',
-        //							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-        //							'position'=>100,
-        //							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-        //							'target'=>'',
-        //							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
-        // $r++;
+		// Add here entries to declare new menus
+		// Example to declare the Top Menu entry:
+		// $this->menu[$r]=array(	'fk_menu'=>0,			// Put 0 if this is a top menu
+		//							'type'=>'top',			// This is a Top menu entry
+		//							'titre'=>'MyModule top menu',
+		//							'mainmenu'=>'mymodule',
+		//							'url'=>'/mymodule/pagetop.php',
+		//							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//							'position'=>100,
+		//							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+		//							'target'=>'',
+		//							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
+		// $r++;
+		//
+		// Example to declare a Left Menu entry:
+		// $this->menu[$r]=array(	'fk_menu'=>'r=0',		// Use r=value where r is index key used for the parent menu entry (higher parent must be a top menu entry)
+		//							'type'=>'left',			// This is a Left menu entry
+		//							'titre'=>'MyModule left menu 1',
+		//							'mainmenu'=>'mymodule',
+		//							'url'=>'/mymodule/pagelevel1.php',
+		//							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//							'position'=>100,
+		//							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+		//							'target'=>'',
+		//							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
+		// $r++;
+		//
+		// Example to declare another Left Menu entry:
+		// $this->menu[$r]=array(	'fk_menu'=>'r=1',		// Use r=value where r is index key used for the parent menu entry (higher parent must be a top menu entry)
+		//							'type'=>'left',			// This is a Left menu entry
+		//							'titre'=>'MyModule left menu 2',
+		//							'mainmenu'=>'mymodule',
+		//							'url'=>'/mymodule/pagelevel2.php',
+		//							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//							'position'=>100,
+		//							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+		//							'target'=>'',
+		//							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
+		// $r++;
 
 
-        // Exports
-        $r = 1;
+		// Exports
+		$r = 1;
 
-        // Example:
-        // $this->export_code[$r]=$this->rights_class.'_'.$r;
-        // $this->export_label[$r]='CustomersInvoicesAndInvoiceLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
-        // $this->export_permission[$r]=array(array("facture","facture","export"));
-        // $this->export_fields_array[$r]=array(
-        //    's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone',
-        //    's.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode',
-        //    's.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",
-        //    'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus',
-        //    'f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",
-        //    'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",
-        //    'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef'
-        // );
-        // $this->export_entities_array[$r]=array(
-        //    's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company',
-        //    's.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company',
-        //    'f.rowid'=>"invoice",'f.ref'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",
-        //    'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",
-        //    'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",
-        //    'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product'
-        // );
-        // $this->export_sql_start[$r]='SELECT DISTINCT ';
-        // $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
-        // $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
-        // $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
-        // $r++;
-    }
+		// Example:
+		// $this->export_code[$r]=$this->rights_class.'_'.$r;
+		// $this->export_label[$r]='CustomersInvoicesAndInvoiceLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		// $this->export_permission[$r]=array(array("facture","facture","export"));
+		// $this->export_fields_array[$r]=array(
+		//    's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone',
+		//    's.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode',
+		//    's.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",
+		//    'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus',
+		//    'f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",
+		//    'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",
+		//    'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef'
+		// );
+		// $this->export_entities_array[$r]=array(
+		//    's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company',
+		//    's.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company',
+		//    'f.rowid'=>"invoice",'f.ref'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",
+		//    'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",
+		//    'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",
+		//    'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product'
+		// );
+		// $this->export_sql_start[$r]='SELECT DISTINCT ';
+		// $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
+		// $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
+		// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
+		// $r++;
+	}
 }
diff --git a/htdocs/core/modules/modPrelevement.class.php b/htdocs/core/modules/modPrelevement.class.php
index b1e8cb2db57..4ffa8358a06 100644
--- a/htdocs/core/modules/modPrelevement.class.php
+++ b/htdocs/core/modules/modPrelevement.class.php
@@ -123,32 +123,32 @@ class modPrelevement extends DolibarrModules
 		$this->rights[$r][4] = 'bons';
 		$this->rights[$r][5] = 'credit';
 
-        // Menus
-        //-------
-        $this->menu = 1; // This module add menu entries. They are coded into menu manager.
-    }
+		// Menus
+		//-------
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
+	}
 
 
-    /**
-     *  Function called when module is enabled.
-     *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *  It also creates data directories
-     *
-     *  @param      string	$options    Options when enabling module ('', 'noboxes')
-     *  @return     int             	1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-        global $conf;
+	/**
+	 *  Function called when module is enabled.
+	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *  It also creates data directories
+	 *
+	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *  @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global $conf;
 
-        // Permissions
-        $this->remove($options);
+		// Permissions
+		$this->remove($options);
 
-        $sql = array(
-            "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'bankaccount' AND entity = ".$conf->entity,
-            "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','bankaccount',".$conf->entity.")",
-        );
+		$sql = array(
+			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'bankaccount' AND entity = ".$conf->entity,
+			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','bankaccount',".$conf->entity.")",
+		);
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modPrinting.class.php b/htdocs/core/modules/modPrinting.class.php
index 464b383c7c1..b918a8b1158 100644
--- a/htdocs/core/modules/modPrinting.class.php
+++ b/htdocs/core/modules/modPrinting.class.php
@@ -35,87 +35,87 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modPrinting extends DolibarrModules
 {
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB      $db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-        $this->numero = 64000;
-        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-        // It is used to group modules in module setup page
-        $this->family = "interface";
-        $this->module_position = '52';
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-        $this->description = "Enable Direct Printing System.";
-        $this->version = 'dolibarr'; // 'development' or 'experimental' or 'dolibarr' or version
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-        // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-        $this->picto = 'printer';
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB      $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+		$this->numero = 64000;
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
+		$this->family = "interface";
+		$this->module_position = '52';
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		$this->description = "Enable Direct Printing System.";
+		$this->version = 'dolibarr'; // 'development' or 'experimental' or 'dolibarr' or version
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+		$this->picto = 'printer';
 
-        // Data directories to create when module is enabled.
-        $this->dirs = array();
+		// Data directories to create when module is enabled.
+		$this->dirs = array();
 
-        // Config pages
-        $this->config_page_url = array("printing.php@printing");
+		// Config pages
+		$this->config_page_url = array("printing.php@printing");
 
-        // Dependencies
-        $this->hidden = false; // A condition to hide module
+		// Dependencies
+		$this->hidden = false; // A condition to hide module
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(3, 7, -2); // Minimum version of Dolibarr required by module
-        $this->conflictwith = array();
-        $this->langfiles = array("printing");
+		$this->need_dolibarr_version = array(3, 7, -2); // Minimum version of Dolibarr required by module
+		$this->conflictwith = array();
+		$this->langfiles = array("printing");
 
-        // Constants
-        $this->const = array();
+		// Constants
+		$this->const = array();
 
-        // Boxes
-        $this->boxes = array();
+		// Boxes
+		$this->boxes = array();
 
-        // Permissions
-        $this->rights = array();
-        $this->rights_class = 'printing';
+		// Permissions
+		$this->rights = array();
+		$this->rights_class = 'printing';
 
-        $r = 0;
-        // $this->rights[$r][0]     Id permission (unique tous modules confondus)
-        // $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
-        // $this->rights[$r][2]     Non utilise
-        // $this->rights[$r][3]     1=Permis par defaut, 0=Non permis par defaut
-        // $this->rights[$r][4]     Niveau 1 pour nommer permission dans code
-        // $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
+		$r = 0;
+		// $this->rights[$r][0]     Id permission (unique tous modules confondus)
+		// $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
+		// $this->rights[$r][2]     Non utilise
+		// $this->rights[$r][3]     1=Permis par defaut, 0=Non permis par defaut
+		// $this->rights[$r][4]     Niveau 1 pour nommer permission dans code
+		// $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
 
-        $r++;
-        $this->rights[$r][0] = 64001;
-        $this->rights[$r][1] = 'DirectPrint';
-        $this->rights[$r][2] = 'r';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'read';
+		$r++;
+		$this->rights[$r][0] = 64001;
+		$this->rights[$r][1] = 'DirectPrint';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'read';
 
-        // Main menu entries
-        $this->menus = array(); // List of menus to add
-        $r = 0;
+		// Main menu entries
+		$this->menus = array(); // List of menus to add
+		$r = 0;
 
-        // This is to declare the Top Menu entry:
-        $this->menu[$r] = array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools', // Put 0 if this is a top menu
-                                'type'=>'left', // This is a Top menu entry
-                                'titre'=>'MenuDirectPrinting',
-                                'url'=>'/printing/index.php?mainmenu=home&leftmenu=admintools',
-                                'langs'=>'printing', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-                                'position'=>300,
-                                'enabled'=>'$conf->printing->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)',
-                                'perms'=>'$user->rights->printing->read', // Use 'perms'=>'1' if you want your menu with no permission rules
-                                'target'=>'',
-                                'user'=>0); // 0=Menu for internal users, 1=external users, 2=both
+		// This is to declare the Top Menu entry:
+		$this->menu[$r] = array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools', // Put 0 if this is a top menu
+								'type'=>'left', // This is a Top menu entry
+								'titre'=>'MenuDirectPrinting',
+								'url'=>'/printing/index.php?mainmenu=home&leftmenu=admintools',
+								'langs'=>'printing', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+								'position'=>300,
+								'enabled'=>'$conf->printing->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)',
+								'perms'=>'$user->rights->printing->read', // Use 'perms'=>'1' if you want your menu with no permission rules
+								'target'=>'',
+								'user'=>0); // 0=Menu for internal users, 1=external users, 2=both
 
-        $r++;
-    }
+		$r++;
+	}
 }
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 5237f5f9b4b..f92d9b30890 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -51,7 +51,7 @@ class modProduct extends DolibarrModules
 		$this->numero = 50;
 
 		$this->family = "products";
-		$this->module_position = '25';
+		$this->module_position = '26';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Product management";
@@ -477,7 +477,14 @@ class modProduct extends DolibarrModules
 					'class' => 'Ccountry',
 					'method' => 'fetch',
 					'dict' => 'DictionaryCountry'
-				)
+				),
+				'p.finished'=> array(
+					'rule' => 'fetchidfromcodeorlabel',
+					'classfile' => '/core/class/cproductnature.class.php',
+					'class' => 'CProductNature',
+					'method' => 'fetch',
+					'dict' => 'DictionaryProductNature'
+					),
 		);
 
 		$this->import_regex_array[$r] = array(
@@ -488,7 +495,6 @@ class modProduct extends DolibarrModules
 			'p.fk_product_type' => '^[0|1]$',
 			'p.datec' => '^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$',
 			'p.recuperableonly' => '^[0|1]$',
-			'p.finished' => '^[0|1]$'
 		);
 
 		if (!empty($conf->stock->enabled)) {//if Stock module enabled
@@ -578,7 +584,7 @@ class modProduct extends DolibarrModules
 			'p.surface_units' => 'm2', // 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.volume' => "",
 			'p.volume_units' => 'm3', //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.finished' => '0 (raw material) / 1 (finished goods)'
+			'p.finished' => '0 (raw material) / 1 (finished goods), matches field "code" in dictionary table "'.MAIN_DB_PREFIX.'c_product_nature"'
 		);
 		//clauses copied from import_fields_array
 		if (!empty($conf->stock->enabled)) $import_sample = array_merge($import_sample, array(
@@ -622,7 +628,7 @@ class modProduct extends DolibarrModules
 			$this->import_label[$r] = "SuppliersPricesOfProductsOrServices"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-			$this->import_tables_array[$r] = array('sp'=>MAIN_DB_PREFIX.'product_fournisseur_price');
+			$this->import_tables_array[$r] = array('sp'=>MAIN_DB_PREFIX.'product_fournisseur_price', 'extra'=>MAIN_DB_PREFIX.'product_fournisseur_price_extrafields');
 			$this->import_tables_creator_array[$r] = array('sp'=>'fk_user');
 			$this->import_fields_array[$r] = array(//field order as per structure of table llx_product_fournisseur_price, without optional fields
 				'sp.fk_product'=>"ProductOrService*",
@@ -643,7 +649,7 @@ class modProduct extends DolibarrModules
 					'sp.remise_percent'=>'DiscountQtyMin'
 			));
 
-			if ($conf->multicurrency->enabled)
+			if (!empty($conf->multicurrency->enabled))
 			{
 				$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array(
 					'sp.fk_multicurrency'=>'CurrencyCodeId', //ideally this should be automatically obtained from the CurrencyCode on the next line
@@ -654,6 +660,27 @@ class modProduct extends DolibarrModules
 				));
 			}
 
+			if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
+				$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.packaging' => 'PackagingForThisProduct'));
+			}
+
+			// Add extra fields
+			$import_extrafield_sample = array();
+			$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product_fournisseur_price' AND entity IN (0, ".$conf->entity.")";
+			$resql = $this->db->query($sql);
+			if ($resql)    // This can fail when class is used on old database (during migration for example)
+			{
+				while ($obj = $this->db->fetch_object($resql))
+				{
+					$fieldname = 'extra.'.$obj->name;
+					$fieldlabel = ucfirst($obj->label);
+					$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+					$import_extrafield_sample[$fieldname] = $fieldlabel;
+				}
+			}
+			// End add extra fields
+			$this->import_fieldshidden_array[$r] = array('extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'product_fournisseur_price'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
+
 			$this->import_convertvalue_array[$r] = array(
 					'sp.fk_soc'=>array('rule'=>'fetchidfromref', 'classfile'=>'/societe/class/societe.class.php', 'class'=>'Societe', 'method'=>'fetch', 'element'=>'ThirdParty'),
 					'sp.fk_product'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/class/product.class.php', 'class'=>'Product', 'method'=>'fetch', 'element'=>'Product')
@@ -681,7 +708,7 @@ class modProduct extends DolibarrModules
 				// TODO Make this field not required and calculate it from price and qty
 				'sp.remise_percent' => '20'
 			));
-			if ($conf->multicurrency->enabled)
+			if (!empty($conf->multicurrency->enabled))
 			{
 				$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array(
 					'sp.fk_multicurrency'=>'eg: 2, rowid for code of multicurrency currency',
@@ -692,6 +719,11 @@ class modProduct extends DolibarrModules
 					'sp.multicurrency_price'=>''
 				));
 			}
+			if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
+				$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array(
+					'sp.packagning'=>'1',
+				));
+			}
 
 			$this->import_updatekeys_array[$r] = array('sp.fk_product'=>'ProductOrService', 'sp.ref_fourn'=>'SupplierRef', 'sp.fk_soc'=>'Supplier');
 		}
diff --git a/htdocs/core/modules/modProductBatch.class.php b/htdocs/core/modules/modProductBatch.class.php
index 7a1d89c8b41..92bfb9b66a5 100644
--- a/htdocs/core/modules/modProductBatch.class.php
+++ b/htdocs/core/modules/modProductBatch.class.php
@@ -40,9 +40,9 @@ class modProductBatch extends DolibarrModules
 	 */
 	public function __construct($db)
 	{
-        global $langs, $conf;
+		global $langs, $conf;
 
-        $this->db = $db;
+		$this->db = $db;
 		$this->numero = 39000;
 
 		$this->family = "products";
@@ -79,18 +79,18 @@ class modProductBatch extends DolibarrModules
 		// Constants
 		$this->const = array();
 
-        $this->tabs = array();
+		$this->tabs = array();
 
-        // Dictionaries
-	    if (!isset($conf->productbatch->enabled))
-        {
-        	$conf->productbatch = new stdClass();
-        	$conf->productbatch->enabled = 0;
-        }
+		// Dictionaries
+		if (!isset($conf->productbatch->enabled))
+		{
+			$conf->productbatch = new stdClass();
+			$conf->productbatch->enabled = 0;
+		}
 		$this->dictionaries = array();
 
-        // Boxes
-        $this->boxes = array(); // List of boxes
+		// Boxes
+		$this->boxes = array(); // List of boxes
 
 		// Permissions
 		$this->rights = array(); // Permission array used by this module
@@ -111,20 +111,20 @@ class modProductBatch extends DolibarrModules
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
 	{
-	    global $db, $conf;
+		global $db, $conf;
 
 		$sql = array();
 
 		if (!empty($conf->cashdesk->enabled)) {
-    		if (empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) {
-    		    include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-    		    $res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK", 1, 'chaine', 0, '', $conf->entity);
-    		}
+			if (empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) {
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+				$res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK", 1, 'chaine', 0, '', $conf->entity);
+			}
 		}
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index ad77f85dfb5..ff2edd3c787 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -138,14 +138,12 @@ class modProjet extends DolibarrModules
 		$r++;
 
 		// Boxes
-		$this->boxes = array();
-		$r = 0;
-		$this->boxes[$r][1] = "box_project.php";
-		$r++;
-		$this->boxes[$r][1] = "box_task.php";
-		$r++;
-		$this->boxes[$r][1] = "box_validated_projects.php";
-		$r++;
+		$this->boxes = array(
+			0=>array('file'=>'box_project.php', 'enabledbydefaulton'=>'Home'),
+			1=>array('file'=>'box_task.php', 'enabledbydefaulton'=>'Home'),
+			2=>array('file'=>'box_validated_projects.php', 'enabledbydefaulton'=>'Home'),
+			3=>array('file'=>'box_funnel_of_prospection.php', 'enabledbydefaulton'=>'Home'),
+		);
 
 		// Permissions
 		$this->rights = array();
@@ -239,17 +237,17 @@ class modProjet extends DolibarrModules
 			'p.usage_opportunity'=>'ProjectFollowOpportunity', 'p.usage_task'=>'ProjectFollowTasks', 'p.usage_bill_time'=>'BillTime',
 			'p.datec'=>"DateCreation", 'p.dateo'=>"DateStart", 'p.datee'=>"DateEnd", 'p.fk_statut'=>'ProjectStatus', 'cls.code'=>'OpportunityStatus', 'p.opp_percent'=>'OpportunityProbability', 'p.opp_amount'=>'OpportunityAmount', 'p.description'=>"Description"
 		);
-	    // Add multicompany field
-        if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED))
-        {
-            $nbofallowedentities = count(explode(',', getEntity('project'))); // If project are shared, nb will be > 1
-            if (!empty($conf->multicompany->enabled) && $nbofallowedentities > 1) $this->export_fields_array[$r] += array('p.entity'=>'Entity');
-        }
+		// Add multicompany field
+		if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED))
+		{
+			$nbofallowedentities = count(explode(',', getEntity('project'))); // If project are shared, nb will be > 1
+			if (!empty($conf->multicompany->enabled) && $nbofallowedentities > 1) $this->export_fields_array[$r] += array('p.entity'=>'Entity');
+		}
 		if (empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 		{
-		    unset($this->export_fields_array[$r]['p.opp_percent']);
-		    unset($this->export_fields_array[$r]['p.opp_amount']);
-		    unset($this->export_fields_array[$r]['cls.code']);
+			unset($this->export_fields_array[$r]['p.opp_percent']);
+			unset($this->export_fields_array[$r]['p.opp_amount']);
+			unset($this->export_fields_array[$r]['cls.code']);
 		}
 
 		// Add fields for project
@@ -260,22 +258,22 @@ class modProjet extends DolibarrModules
 		// Add fields for tasks
 		$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('pt.rowid'=>'TaskId', 'pt.ref'=>'RefTask', 'pt.label'=>'LabelTask', 'pt.dateo'=>"TaskDateStart", 'pt.datee'=>"TaskDateEnd", 'pt.duration_effective'=>"DurationEffective", 'pt.planned_workload'=>"PlannedWorkload", 'pt.progress'=>"Progress", 'pt.description'=>"TaskDescription"));
 		$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('pt.rowid'=>'projecttask', 'pt.ref'=>'projecttask', 'pt.label'=>'projecttask', 'pt.dateo'=>"projecttask", 'pt.datee'=>"projecttask", 'pt.duration_effective'=>"projecttask", 'pt.planned_workload'=>"projecttask", 'pt.progress'=>"projecttask", 'pt.description'=>"projecttask"));
-        // Add extra fields for task
+		// Add extra fields for task
 		$keyforselect = 'projet_task'; $keyforelement = 'projecttask'; $keyforaliasextra = 'extra2';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-        // End add extra fields
+		// End add extra fields
 		$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('ptt.rowid'=>'IdTaskTime', 'ptt.task_date'=>'TaskTimeDate', 'ptt.task_duration'=>"TimesSpent", 'ptt.fk_user'=>"TaskTimeUser", 'ptt.note'=>"TaskTimeNote"));
 		$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('ptt.rowid'=>'task_time', 'ptt.task_date'=>'task_time', 'ptt.task_duration'=>"task_time", 'ptt.fk_user'=>"task_time", 'ptt.note'=>"task_time"));
 		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('f.ref'=>"Billed"));
 			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('f.ref'=>"task_time"));
 		}
-        $this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r] = ' FROM '.MAIN_DB_PREFIX.'projet as p';
-        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet_extrafields as extra ON p.rowid = extra.fk_object';
-        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_lead_status as cls ON p.fk_opp_status = cls.rowid';
-        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX."projet_task as pt ON p.rowid = pt.fk_projet";
-        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet_task_extrafields as extra2 ON pt.rowid = extra2.fk_object';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet_extrafields as extra ON p.rowid = extra.fk_object';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_lead_status as cls ON p.fk_opp_status = cls.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX."projet_task as pt ON p.rowid = pt.fk_projet";
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet_task_extrafields as extra2 ON pt.rowid = extra2.fk_object';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX."projet_task_time as ptt ON pt.rowid = ptt.fk_task";
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON p.fk_soc = s.rowid';
 		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
@@ -287,34 +285,34 @@ class modProjet extends DolibarrModules
 		// Import list of tasks
 		if (empty($conf->global->PROJECT_HIDE_TASKS))
 		{
-    		$r++;
-    		$this->import_code[$r] = 'tasksofprojects';
-    		$this->import_label[$r] = 'ImportDatasetTasks';
-    		$this->import_icon[$r] = 'task';
-    		$this->import_entities_array[$r] = array('t.fk_projet'=>'project'); // We define here only fields that use another icon that the one defined into import_icon
-    		$this->import_tables_array[$r] = array('t'=>MAIN_DB_PREFIX.'projet_task', 'extra'=>MAIN_DB_PREFIX.'projet_task_extrafields'); // List of tables to insert into (insert done in same order)
-    		$this->import_fields_array[$r] = array('t.fk_projet'=>'ProjectRef*', 't.ref'=>'RefTask*', 't.label'=>'LabelTask*', 't.dateo'=>"DateStart", 't.datee'=>"DateEnd", 't.planned_workload'=>"PlannedWorkload", 't.progress'=>"Progress", 't.note_private'=>"NotePrivate", 't.note_public'=>"NotePublic", 't.datec'=>"DateCreation");
-    		// Add extra fields
-    		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'projet_task' AND entity IN (0,".$conf->entity.")";
-    		$resql = $this->db->query($sql);
-    		if ($resql)    // This can fail when class is used on old database (during migration for example)
-    		{
-    		    while ($obj = $this->db->fetch_object($resql))
-    		    {
-    		        $fieldname = 'extra.'.$obj->name;
-    		        $fieldlabel = ucfirst($obj->label);
-    		        $this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
-    		    }
-    		}
-    		// End add extra fields
-    		$this->import_fieldshidden_array[$r] = array('t.fk_user_creat'=>'user->id', 'extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'projet_task'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
-    		$this->import_convertvalue_array[$r] = array(
-    		    't.fk_projet'=>array('rule'=>'fetchidfromref', 'classfile'=>'/projet/class/project.class.php', 'class'=>'Project', 'method'=>'fetch', 'element'=>'Project'),
-    		    't.ref'=>array('rule'=>'getrefifauto')
-    		);
-    		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
-    		$this->import_regex_array[$r] = array('t.dateo'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$', 't.datee'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$', 't.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$');
-    		$this->import_examplevalues_array[$r] = array('t.fk_projet'=>'MyProjectRef', 't.ref'=>"auto or TK2010-1234", 't.label'=>"My task", 't.progress'=>"0 (not started) to 100 (finished)", 't.datec'=>'1972-10-10', 't.note_private'=>"My private note", 't.note_public'=>"My public note");
+			$r++;
+			$this->import_code[$r] = 'tasksofprojects';
+			$this->import_label[$r] = 'ImportDatasetTasks';
+			$this->import_icon[$r] = 'task';
+			$this->import_entities_array[$r] = array('t.fk_projet'=>'project'); // We define here only fields that use another icon that the one defined into import_icon
+			$this->import_tables_array[$r] = array('t'=>MAIN_DB_PREFIX.'projet_task', 'extra'=>MAIN_DB_PREFIX.'projet_task_extrafields'); // List of tables to insert into (insert done in same order)
+			$this->import_fields_array[$r] = array('t.fk_projet'=>'ProjectRef*', 't.ref'=>'RefTask*', 't.label'=>'LabelTask*', 't.dateo'=>"DateStart", 't.datee'=>"DateEnd", 't.planned_workload'=>"PlannedWorkload", 't.progress'=>"Progress", 't.note_private'=>"NotePrivate", 't.note_public'=>"NotePublic", 't.datec'=>"DateCreation");
+			// Add extra fields
+			$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'projet_task' AND entity IN (0,".$conf->entity.")";
+			$resql = $this->db->query($sql);
+			if ($resql)    // This can fail when class is used on old database (during migration for example)
+			{
+				while ($obj = $this->db->fetch_object($resql))
+				{
+					$fieldname = 'extra.'.$obj->name;
+					$fieldlabel = ucfirst($obj->label);
+					$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+				}
+			}
+			// End add extra fields
+			$this->import_fieldshidden_array[$r] = array('t.fk_user_creat'=>'user->id', 'extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'projet_task'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
+			$this->import_convertvalue_array[$r] = array(
+				't.fk_projet'=>array('rule'=>'fetchidfromref', 'classfile'=>'/projet/class/project.class.php', 'class'=>'Project', 'method'=>'fetch', 'element'=>'Project'),
+				't.ref'=>array('rule'=>'getrefifauto')
+			);
+			//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
+			$this->import_regex_array[$r] = array('t.dateo'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$', 't.datee'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$', 't.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$');
+			$this->import_examplevalues_array[$r] = array('t.fk_projet'=>'MyProjectRef', 't.ref'=>"auto or TK2010-1234", 't.label'=>"My task", 't.progress'=>"0 (not started) to 100 (finished)", 't.datec'=>'1972-10-10', 't.note_private'=>"My private note", 't.note_public'=>"My public note");
 		}
 	}
 
@@ -324,7 +322,7 @@ class modProjet extends DolibarrModules
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index 4da02808251..f1de32bd1a9 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -113,8 +113,8 @@ class modPropale extends DolibarrModules
 
 		// Boxes
 		$this->boxes = array(
-           	0=>array('file'=>'box_graph_propales_permonth.php', 'enabledbydefaulton'=>'Home'),
-           	1=>array('file'=>'box_propales.php', 'enabledbydefaulton'=>'Home'),
+		   	0=>array('file'=>'box_graph_propales_permonth.php', 'enabledbydefaulton'=>'Home'),
+		   	1=>array('file'=>'box_propales.php', 'enabledbydefaulton'=>'Home'),
 		);
 
 		// Permissions
@@ -150,7 +150,7 @@ class modPropale extends DolibarrModules
 		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'propal_advance';
-        $this->rights[$r][5] = 'send';
+		$this->rights[$r][5] = 'send';
 
 		$r++;
 		$this->rights[$r][0] = 26; // id de la permission
@@ -199,11 +199,11 @@ class modPropale extends DolibarrModules
 		);
 		if (!empty($conf->multicurrency->enabled))
 		{
-		    $this->export_fields_array[$r]['c.multicurrency_code'] = 'Currency';
-		    $this->export_fields_array[$r]['c.multicurrency_tx'] = 'CurrencyRate';
-		    $this->export_fields_array[$r]['c.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
-		    $this->export_fields_array[$r]['c.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
-		    $this->export_fields_array[$r]['c.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
+			$this->export_fields_array[$r]['c.multicurrency_code'] = 'Currency';
+			$this->export_fields_array[$r]['c.multicurrency_tx'] = 'CurrencyRate';
+			$this->export_fields_array[$r]['c.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
+			$this->export_fields_array[$r]['c.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
+			$this->export_fields_array[$r]['c.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
 		}
 		//$this->export_TypeFields_array[$r]=array(
 		//	's.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.code'=>'Text','s.phone'=>'Text',
@@ -241,7 +241,7 @@ class modPropale extends DolibarrModules
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s ';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra4 ON s.rowid = extra4.fk_object';
 
-		if (!$user->rights->societe->client->voir) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'propal as c';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON c.fk_projet = pj.rowid';
@@ -254,7 +254,7 @@ class modPropale extends DolibarrModules
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
 		$this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_propal';
 		$this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('propal').')';
-		if (!$user->rights->societe->client->voir) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
 
 		// Imports
 		//--------
@@ -262,11 +262,11 @@ class modPropale extends DolibarrModules
 
 		$r++;
 		$this->import_code[$r] = $this->rights_class.'_'.$r;
-		$this->import_label[$r] = 'Proposals';	// Translation key
+		$this->import_label[$r] = 'Proposals'; // Translation key
 		$this->import_icon[$r] = $this->picto;
-		$this->import_entities_array[$r] = [];		// We define here only fields that use another icon that the one defined into import_icon
-		$this->import_tables_array[$r] = ['c' => MAIN_DB_PREFIX . 'propal', 'extra' => MAIN_DB_PREFIX . 'propal_extrafields'];
-		$this->import_tables_creator_array[$r] = ['c'=>'fk_user_author'];	// Fields to store import user id
+		$this->import_entities_array[$r] = []; // We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r] = ['c' => MAIN_DB_PREFIX.'propal', 'extra' => MAIN_DB_PREFIX.'propal_extrafields'];
+		$this->import_tables_creator_array[$r] = ['c'=>'fk_user_author']; // Fields to store import user id
 		$this->import_fields_array[$r] = [
 			'c.ref' => 'Document Ref*',
 			'c.ref_client' => 'RefCustomer',
@@ -282,7 +282,7 @@ class modPropale extends DolibarrModules
 			'c.date_livraison' => 'DeliveryDate',
 			'c.fk_user_valid' => 'ValidatedById'
 		];
-		if (! empty($conf->multicurrency->enabled)) {
+		if (!empty($conf->multicurrency->enabled)) {
 			$this->import_fields_array[$r]['c.multicurrency_code'] = 'Currency';
 			$this->import_fields_array[$r]['c.multicurrency_tx'] = 'CurrencyRate';
 			$this->import_fields_array[$r]['c.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
@@ -291,18 +291,18 @@ class modPropale extends DolibarrModules
 		}
 		// Add extra fields
 		$import_extrafield_sample = [];
-		$sql = "SELECT name, label, fieldrequired FROM " . MAIN_DB_PREFIX . "extrafields WHERE elementtype = 'propal' AND entity IN (0, " . $conf->entity . ")";
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'propal' AND entity IN (0, ".$conf->entity.")";
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			while ($obj = $this->db->fetch_object($resql)) {
-				$fieldname = 'extra.' . $obj->name;
+				$fieldname = 'extra.'.$obj->name;
 				$fieldlabel = ucfirst($obj->label);
-				$this->import_fields_array[$r][$fieldname] = $fieldlabel . ($obj->fieldrequired ? '*' : '');
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
 				$import_extrafield_sample[$fieldname] = $fieldlabel;
 			}
 		}
 		// End add extra fields
-		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-' . MAIN_DB_PREFIX . 'propal'];
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'propal'];
 		$this->import_regex_array[$r] = ['c.ref' => '[^ ]'];
 		$import_sample = [
 			'c.ref' => 'PROV0077',
@@ -339,12 +339,12 @@ class modPropale extends DolibarrModules
 		//Import Proposal Lines
 		$r++;
 		$this->import_code[$r] = $this->rights_class.'line_'.$r;
-		$this->import_label[$r] = "ProposalLine";	// Translation key
+		$this->import_label[$r] = "ProposalLine"; // Translation key
 		$this->import_icon[$r] = $this->picto;
-		$this->import_entities_array[$r] = [];		// We define here only fields that use another icon that the one defined into import_icon
+		$this->import_entities_array[$r] = []; // We define here only fields that use another icon that the one defined into import_icon
 		$this->import_tables_array[$r] = [
-			'cd' => MAIN_DB_PREFIX . 'propaldet',
-			'extra' => MAIN_DB_PREFIX . 'propaldet_extrafields'
+			'cd' => MAIN_DB_PREFIX.'propaldet',
+			'extra' => MAIN_DB_PREFIX.'propaldet_extrafields'
 		];
 		$this->import_fields_array[$r] = [
 			'cd.fk_propal' => 'Document Ref*',
@@ -366,7 +366,7 @@ class modPropale extends DolibarrModules
 			'cd.date_end' => 'End Date',
 			'cd.buy_price_ht' => 'LineBuyPriceHT'
 		];
-		if (! empty($conf->multicurrency->enabled)) {
+		if (!empty($conf->multicurrency->enabled)) {
 			$this->import_fields_array[$r]['cd.multicurrency_code'] = 'Currency';
 			$this->import_fields_array[$r]['cd.multicurrency_subprice'] = 'CurrencyRate';
 			$this->import_fields_array[$r]['cd.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
@@ -379,14 +379,14 @@ class modPropale extends DolibarrModules
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			while ($obj = $this->db->fetch_object($resql)) {
-				$fieldname = 'extra.' . $obj->name;
+				$fieldname = 'extra.'.$obj->name;
 				$fieldlabel = ucfirst($obj->label);
-				$this->import_fields_array[$r][$fieldname] = $fieldlabel . ($obj->fieldrequired ? '*' : '');
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
 				$import_extrafield_sample[$fieldname] = $fieldlabel;
 			}
 		}
 		// End add extra fields
-		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-' . MAIN_DB_PREFIX . 'propaldet'];
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'propaldet'];
 		$this->import_regex_array[$r] = ['cd.product_type' => '[0|1]$'];
 		$import_sample = [
 			'cd.fk_propal' => 'PROV(0001)',
@@ -431,7 +431,7 @@ class modPropale extends DolibarrModules
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
diff --git a/htdocs/core/modules/modReceiptPrinter.class.php b/htdocs/core/modules/modReceiptPrinter.class.php
index 818c090dcc0..7143dd0d614 100644
--- a/htdocs/core/modules/modReceiptPrinter.class.php
+++ b/htdocs/core/modules/modReceiptPrinter.class.php
@@ -35,114 +35,114 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modReceiptPrinter extends DolibarrModules
 {
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB      $db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-        $this->numero = 67000;
-        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-        // It is used to group modules in module setup page
-        $this->family = "interface";
-        $this->module_position = '53';
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-        $this->description = "ReceiptPrinterDesc";
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB      $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+		$this->numero = 67000;
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
+		$this->family = "interface";
+		$this->module_position = '53';
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		$this->description = "ReceiptPrinterDesc";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
-        $this->version = 'experimental';
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-        // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-        $this->picto = 'printer';
+		$this->version = 'dolibarr';
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+		$this->picto = 'printer';
 
-        // Data directories to create when module is enabled.
-        $this->dirs = array();
+		// Data directories to create when module is enabled.
+		$this->dirs = array();
 
-        // Config pages
-        $this->config_page_url = array("receiptprinter.php");
+		// Config pages
+		$this->config_page_url = array("receiptprinter.php");
 
-        // Dependencies
-        $this->hidden = false; // A condition to hide module
+		// Dependencies
+		$this->hidden = false; // A condition to hide module
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(3, 9, -2); // Minimum version of Dolibarr required by module
-        $this->conflictwith = array();
-        $this->langfiles = array("receiptprinter");
+		$this->need_dolibarr_version = array(3, 9, -2); // Minimum version of Dolibarr required by module
+		$this->conflictwith = array();
+		$this->langfiles = array("receiptprinter");
 
-        // Constants
-        $this->const = array();
+		// Constants
+		$this->const = array();
 
-        // Boxes
-        $this->boxes = array();
+		// Boxes
+		$this->boxes = array();
 
-        // Permissions
-        $this->rights = array();
-        $this->rights_class = 'receiptprinter';
+		// Permissions
+		$this->rights = array();
+		$this->rights_class = 'receiptprinter';
 
-        $r = 0;
-        // $this->rights[$r][0]     Id permission (unique tous modules confondus)
-        // $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
-        // $this->rights[$r][2]     Non utilise
-        // $this->rights[$r][3]     1=Permis par defaut, 0=Non permis par defaut
-        // $this->rights[$r][4]     Niveau 1 pour nommer permission dans code
-        // $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
+		$r = 0;
+		// $this->rights[$r][0]     Id permission (unique tous modules confondus)
+		// $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
+		// $this->rights[$r][2]     Non utilise
+		// $this->rights[$r][3]     1=Permis par defaut, 0=Non permis par defaut
+		// $this->rights[$r][4]     Niveau 1 pour nommer permission dans code
+		// $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
 
-        $r++;
-        $this->rights[$r][0] = 67000;
-        $this->rights[$r][1] = 'ReceiptPrinter';
-        $this->rights[$r][2] = 'r';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'read';
+		$r++;
+		$this->rights[$r][0] = 67000;
+		$this->rights[$r][1] = 'ReceiptPrinter';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'read';
 
-        // Main menu entries
-        $this->menus = array(); // List of menus to add
-        $r = 0;
+		// Main menu entries
+		$this->menus = array(); // List of menus to add
+		$r = 0;
 
-        // This is to declare the Top Menu entry:
-        //$this->menu[$r]=array(  'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',               // Put 0 if this is a top menu
-        //                        'type'=>'left',                 // This is a Top menu entry
-        //                        'titre'=>'MenuDirectPrinting',
-        //                        'mainmenu'=>'printing',
-        //                        'url'=>'/printing/index.php',
-        //                        'langs'=>'printing',            // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-        //                        'position'=>300,
-        //                        'enabled'=>'$conf->printing->enabled && preg_match(\'/^(admintools|all)/\',$leftmenu)',
-        //                        'perms'=>'$user->rights->printing->read',    // Use 'perms'=>'1' if you want your menu with no permission rules
-        //                        'target'=>'',
-        //                        'user'=>0);                     // 0=Menu for internal users, 1=external users, 2=both
+		// This is to declare the Top Menu entry:
+		//$this->menu[$r]=array(  'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',               // Put 0 if this is a top menu
+		//                        'type'=>'left',                 // This is a Top menu entry
+		//                        'titre'=>'MenuDirectPrinting',
+		//                        'mainmenu'=>'printing',
+		//                        'url'=>'/printing/index.php',
+		//                        'langs'=>'printing',            // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//                        'position'=>300,
+		//                        'enabled'=>'$conf->printing->enabled && preg_match(\'/^(admintools|all)/\',$leftmenu)',
+		//                        'perms'=>'$user->rights->printing->read',    // Use 'perms'=>'1' if you want your menu with no permission rules
+		//                        'target'=>'',
+		//                        'user'=>0);                     // 0=Menu for internal users, 1=external users, 2=both
 
-        $r++;
-    }
+		$r++;
+	}
 
 
-    /**
-     *      Function called when module is enabled.
-     *      The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *      It also creates data directories
-     *
-     *      @param      string  $options    Options when enabling module ('', 'noboxes')
-     *      @return     int                 1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-        global $conf, $langs;
-        // Clean before activation
-        $this->remove($options);
+	/**
+	 *      Function called when module is enabled.
+	 *      The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *      It also creates data directories
+	 *
+	 *      @param      string  $options    Options when enabling module ('', 'noboxes')
+	 *      @return     int                 1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global $conf, $langs;
+		// Clean before activation
+		$this->remove($options);
 
-        $templateexample = '<dol_align_center>\r\n<dol_print_text><dol_value_mysoc_name>\r\n<dol_print_text><dol_value_mysoc_address>\r\n<dol_print_text><dol_value_mysoc_zip><dol_value_mysoc_town>\r\n<dol_line_feed>\r\n<dol_print_text>Facture <dol_value_object_ref>\r\n<dol_line_feed>\r\n<dol_align_left>\r\n<dol_print_object_lines>\r\n<dol_line_feed>\r\n<dol_print_object_tax>\r\n<dol_line_feed>\r\n<dol_print_object_total>\r\n<dol_line_feed>\r\n<dol_cut_paper_full>';
-        $sql = array(
-            "CREATE TABLE IF NOT EXISTS ".MAIN_DB_PREFIX."printer_receipt (rowid integer AUTO_INCREMENT PRIMARY KEY, name varchar(128), fk_type integer, fk_profile integer, parameter varchar(128), entity integer) ENGINE=innodb;",
-            "CREATE TABLE IF NOT EXISTS ".MAIN_DB_PREFIX."printer_receipt_template (rowid integer AUTO_INCREMENT PRIMARY KEY, name varchar(128), template text, entity integer) ENGINE=innodb;",
-        	"DELETE FROM ".MAIN_DB_PREFIX."printer_receipt_template WHERE name = '".$langs->trans('Example')."';",
+		$templateexample = '{dol_align_center}\r\n{dol_print_text}{dol_value_mysoc_name}\r\n{dol_print_text}{dol_value_mysoc_address}\r\n{dol_print_text}{dol_value_mysoc_zip}{dol_value_mysoc_town}\r\n{dol_line_feed}\r\n{dol_print_text}Facture {dol_value_object_ref}\r\n{dol_line_feed}\r\n{dol_align_left}\r\n{dol_print_object_lines}\r\n{dol_line_feed}\r\n{dol_print_object_tax}\r\n{dol_line_feed}\r\n{dol_print_object_total}\r\n{dol_line_feed}\r\n{dol_cut_paper_full}';
+		$sql = array(
+			"CREATE TABLE IF NOT EXISTS ".MAIN_DB_PREFIX."printer_receipt (rowid integer AUTO_INCREMENT PRIMARY KEY, name varchar(128), fk_type integer, fk_profile integer, parameter varchar(128), entity integer) ENGINE=innodb;",
+			"CREATE TABLE IF NOT EXISTS ".MAIN_DB_PREFIX."printer_receipt_template (rowid integer AUTO_INCREMENT PRIMARY KEY, name varchar(128), template text, entity integer) ENGINE=innodb;",
+			"DELETE FROM ".MAIN_DB_PREFIX."printer_receipt_template WHERE name = '".$langs->trans('Example')."';",
 			"INSERT INTO ".MAIN_DB_PREFIX."printer_receipt_template (name,template,entity) VALUES ('".$langs->trans('Example')."', '".$templateexample."', 1);",
 		);
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modReception.class.php b/htdocs/core/modules/modReception.class.php
index 19cd20271b8..f784d88a3da 100644
--- a/htdocs/core/modules/modReception.class.php
+++ b/htdocs/core/modules/modReception.class.php
@@ -57,9 +57,9 @@ class modReception extends DolibarrModules
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/reception/receipt",
-		                    "/reception/receipt/temp",
-		                    "/doctemplates/receptions"
-		                    );
+							"/reception/receipt/temp",
+							"/doctemplates/receptions"
+							);
 
 		// Config pages
 		$this->config_page_url = array("reception_setup.php");
@@ -138,7 +138,7 @@ class modReception extends DolibarrModules
 		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'reception_advance';
-        $this->rights[$r][5] = 'send';
+		$this->rights[$r][5] = 'send';
 
 		$r++;
 		$this->rights[$r][0] = $this->numero.$r;
@@ -205,8 +205,8 @@ class modReception extends DolibarrModules
 		$this->export_dependencies_array[$r] = array('reception_line'=>'ed.rowid', 'product'=>'ed.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		if ($idcontacts && !empty($conf->global->RECEPTION_ADD_CONTACTS_IN_EXPORT))
 		{
-		    $keyforselect = 'socpeople'; $keyforelement = 'contact'; $keyforaliasextra = 'extra3';
-		    include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+			$keyforselect = 'socpeople'; $keyforelement = 'contact'; $keyforaliasextra = 'extra3';
+			include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		}
 		$keyforselect = 'reception'; $keyforelement = 'reception'; $keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
@@ -217,7 +217,7 @@ class modReception extends DolibarrModules
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'reception as c';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'reception_extrafields as extra ON c.rowid = extra.fk_object,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'societe as s';
-		if (!$user->rights->societe->client->voir) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch as ed';
@@ -225,13 +225,13 @@ class modReception extends DolibarrModules
 		$this->export_sql_end[$r] .= ' , '.MAIN_DB_PREFIX.'commande_fournisseurdet as cd';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on cd.fk_product = p.rowid';
 		if ($idcontacts && !empty($conf->global->RECEPTION_ADD_CONTACTS_IN_EXPORT)) {
-		    $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'element_contact as ee ON ee.element_id = cd.fk_commande AND ee.fk_c_type_contact IN ('.$idcontacts.')';
-		    $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp ON sp.rowid = ee.fk_socpeople';
-		    $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra3 ON sp.rowid = extra3.fk_object';
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'element_contact as ee ON ee.element_id = cd.fk_commande AND ee.fk_c_type_contact IN ('.$idcontacts.')';
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp ON sp.rowid = ee.fk_socpeople';
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra3 ON sp.rowid = extra3.fk_object';
 		}
 		$this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = ed.fk_reception AND ed.fk_commandefourndet = cd.rowid';
 		$this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('reception').')';
-		if (!$user->rights->societe->client->voir) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
 	}
 
 
@@ -240,7 +240,7 @@ class modReception extends DolibarrModules
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
diff --git a/htdocs/core/modules/modRecruitment.class.php b/htdocs/core/modules/modRecruitment.class.php
index 6d994ac1071..8e282a9513d 100644
--- a/htdocs/core/modules/modRecruitment.class.php
+++ b/htdocs/core/modules/modRecruitment.class.php
@@ -52,7 +52,7 @@ class modRecruitment extends DolibarrModules
 		// It is used to group modules by family in module setup page
 		$this->family = "hr";
 		// Module position in the family on 2 digits ('01', '10', '20', ...)
-		$this->module_position = '51';
+		$this->module_position = '44';
 		// Gives the possibility for the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
 		//$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
 		// Module label (no space allowed), used if translation string 'ModuleRecruitmentName' not found (Recruitment is name of module).
diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php
index 0e96b8d4c11..0d1353076ec 100644
--- a/htdocs/core/modules/modResource.class.php
+++ b/htdocs/core/modules/modResource.class.php
@@ -246,9 +246,9 @@ class modResource extends DolibarrModules
 
 		$this->export_dependencies_array[$r] = array('resource'=>array('r.rowid')); // We must keep this until the aggregate_array is used. To add unique key if we ask a field of a child to avoid the DISTINCT to discard them.
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
-		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'resource as r ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'resource as r';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_resource as c ON c.rowid=r.fk_code_type_resource';
-		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'resource_extrafields as extra ON extra.fk_object = c.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'resource_extrafields as extra ON extra.fk_object = r.rowid';
 		$this->export_sql_end[$r] .= ' AND r.entity IN ('.getEntity('resource').')';
 
 
diff --git a/htdocs/core/modules/modSalaries.class.php b/htdocs/core/modules/modSalaries.class.php
index 7159ca634d5..23c892333d8 100644
--- a/htdocs/core/modules/modSalaries.class.php
+++ b/htdocs/core/modules/modSalaries.class.php
@@ -101,7 +101,7 @@ class modSalaries extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 511;
-		$this->rights[$r][1] = 'Read payments of employee salaries';
+		$this->rights[$r][1] = 'Read payments of employee salaries (yours and your subordinates)';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'read';
@@ -125,6 +125,13 @@ class modSalaries extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 517;
+		$this->rights[$r][1] = 'Read payments of salariests of every employee';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'readall';
+
+		$r++;
+		$this->rights[$r][0] = 519;
 		$this->rights[$r][1] = 'Export payments of employee salaries';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
@@ -132,6 +139,7 @@ class modSalaries extends DolibarrModules
 		$this->rights[$r][5] = '';
 
 
+
 		// Menus
 		//-------
 		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index 258af06389a..b4dd93ff3e0 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -93,28 +93,28 @@ class modService extends DolibarrModules
 		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'lire';
-        $r++;
+		$r++;
 
 		$this->rights[$r][0] = 532; // id de la permission
 		$this->rights[$r][1] = 'Create/modify services'; // libelle de la permission
 		$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'creer';
-        $r++;
+		$r++;
 
 		$this->rights[$r][0] = 534; // id de la permission
 		$this->rights[$r][1] = 'Delete les services'; // libelle de la permission
 		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'supprimer';
-        $r++;
+		$r++;
 
 		$this->rights[$r][0] = 538; // Must be same permission than in product module
 		$this->rights[$r][1] = 'Export services';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'export';
-        $r++;
+		$r++;
 
 		// Menus
 		//-------
@@ -137,7 +137,7 @@ class modService extends DolibarrModules
 		$usenpr = 0;
 		if (is_object($mysoc)) $usenpr = $mysoc->useNPR();
 
-        // Exports
+		// Exports
 		//--------
 		$r = 0;
 
@@ -208,8 +208,8 @@ class modService extends DolibarrModules
 		if (!empty($conf->global->MAIN_MULTILANGS)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_lang as l ON l.fk_product = p.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON p.rowid = extra.fk_object';
 		if (!empty($conf->fournisseur->enabled)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price as pf ON pf.fk_product = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'societe s ON s.rowid = pf.fk_soc';
-        $this->export_sql_end[$r] .= ' WHERE p.fk_product_type = 1 AND p.entity IN ('.getEntity('product').')';
-        if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_sql_order[$r] = ' GROUP BY p.rowid'; // FIXME The group by used a generic value to say "all fields in select except function fields"
+		$this->export_sql_end[$r] .= ' WHERE p.fk_product_type = 1 AND p.entity IN ('.getEntity('product').')';
+		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_sql_order[$r] = ' GROUP BY p.rowid'; // FIXME The group by used a generic value to say "all fields in select except function fields"
 
 		if (empty($conf->product->enabled))	// We enable next import templates only if module product not already enabled (to avoid duplicate entries)
 		{
@@ -238,8 +238,8 @@ class modService extends DolibarrModules
 					'pr.price_ttc'=>"product",
 					'pr.price_min'=>"product", 'pr.price_min_ttc'=>"product",
 					'pr.tva_tx'=>'product',
-				    'pr.recuperableonly'=>'product',
-				    'pr.date_price'=>"product");
+					'pr.recuperableonly'=>'product',
+					'pr.date_price'=>"product");
 				$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 				$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
 				$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_price as pr ON p.rowid = pr.fk_product AND pr.entity = '.$conf->entity; // export prices only for the current entity
@@ -248,90 +248,90 @@ class modService extends DolibarrModules
 
 			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 			{
-			    // Exports product multiprice
-			    $r++;
-			    $this->export_code[$r] = $this->rights_class.'_'.$r;
-			    $this->export_label[$r] = "ProductsPricePerCustomer"; // Translation key (used only if key ExportDataset_xxx_z not found)
-			    $this->export_permission[$r] = array(array("produit", "export"));
-			    $this->export_fields_array[$r] = array('p.rowid'=>"Id", 'p.ref'=>"Ref",
-			        's.nom'=>'ThirdParty',
-			        'pr.price_base_type'=>"PriceBase",
-			        'pr.price'=>"PriceUnitPriceHT", 'pr.price_ttc'=>"PriceUnitPriceTTC",
-			        'pr.price_min'=>"MinPriceUnitPriceHT", 'pr.price_min_ttc'=>"MinPriceUnitPriceTTC",
-			        'pr.tva_tx'=>'PriceVATRate',
-			        'pr.default_vat_code'=>'PriceVATCode',
-			        'pr.datec'=>'DateCreation');
-			    if (is_object($mysoc) && $usenpr) $this->export_fields_array[$r]['pr.recuperableonly'] = 'NPR';
-			    $this->export_entities_array[$r] = array('p.rowid'=>"product", 'p.ref'=>"product",
-			        's.nom'=>'company',
-			        'pr.price_base_type'=>"product", 'pr.price'=>"product",
-			        'pr.price_ttc'=>"product",
-			        'pr.price_min'=>"product", 'pr.price_min_ttc'=>"product",
-			        'pr.tva_tx'=>'product',
-			        'pr.default_vat_code'=>'product',
-			        'pr.recuperableonly'=>'product',
-			        'pr.datec'=>"product");
-			    $this->export_sql_start[$r] = 'SELECT DISTINCT ';
-			    $this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
-			    $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_customer_price as pr ON p.rowid = pr.fk_product AND pr.entity = '.$conf->entity; // export prices only for the current entity
-			    $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON pr.fk_soc = s.rowid';
-			    $this->export_sql_end[$r] .= ' WHERE p.entity IN ('.getEntity('product').')'; // For product and service profile
+				// Exports product multiprice
+				$r++;
+				$this->export_code[$r] = $this->rights_class.'_'.$r;
+				$this->export_label[$r] = "ProductsPricePerCustomer"; // Translation key (used only if key ExportDataset_xxx_z not found)
+				$this->export_permission[$r] = array(array("produit", "export"));
+				$this->export_fields_array[$r] = array('p.rowid'=>"Id", 'p.ref'=>"Ref",
+					's.nom'=>'ThirdParty',
+					'pr.price_base_type'=>"PriceBase",
+					'pr.price'=>"PriceUnitPriceHT", 'pr.price_ttc'=>"PriceUnitPriceTTC",
+					'pr.price_min'=>"MinPriceUnitPriceHT", 'pr.price_min_ttc'=>"MinPriceUnitPriceTTC",
+					'pr.tva_tx'=>'PriceVATRate',
+					'pr.default_vat_code'=>'PriceVATCode',
+					'pr.datec'=>'DateCreation');
+				if (is_object($mysoc) && $usenpr) $this->export_fields_array[$r]['pr.recuperableonly'] = 'NPR';
+				$this->export_entities_array[$r] = array('p.rowid'=>"product", 'p.ref'=>"product",
+					's.nom'=>'company',
+					'pr.price_base_type'=>"product", 'pr.price'=>"product",
+					'pr.price_ttc'=>"product",
+					'pr.price_min'=>"product", 'pr.price_min_ttc'=>"product",
+					'pr.tva_tx'=>'product',
+					'pr.default_vat_code'=>'product',
+					'pr.recuperableonly'=>'product',
+					'pr.datec'=>"product");
+				$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+				$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
+				$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_customer_price as pr ON p.rowid = pr.fk_product AND pr.entity = '.$conf->entity; // export prices only for the current entity
+				$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON pr.fk_soc = s.rowid';
+				$this->export_sql_end[$r] .= ' WHERE p.entity IN ('.getEntity('product').')'; // For product and service profile
 			}
 
 			if (!empty($conf->global->PRODUIT_SOUSPRODUITS))
 			{
-			    // Exports virtual products
-			    $r++;
-			    $this->export_code[$r] = $this->rights_class.'_'.$r;
-			    $this->export_label[$r] = "AssociatedProducts"; // Translation key (used only if key ExportDataset_xxx_z not found)
-			    $this->export_permission[$r] = array(array("produit", "export"));
-			    $this->export_fields_array[$r] = array(
-			        'p.rowid'=>"Id", 'p.ref'=>"Ref", 'p.label'=>"Label", 'p.description'=>"Description", 'p.url'=>"PublicUrl",
-			    	'p.accountancy_code_sell'=>"ProductAccountancySellCode", 'p.accountancy_code_sell_intra'=>"ProductAccountancySellIntraCode",
-			    	'p.accountancy_code_sell_export'=>"ProductAccountancySellExportCode", 'p.accountancy_code_buy'=>"ProductAccountancyBuyCode",
+				// Exports virtual products
+				$r++;
+				$this->export_code[$r] = $this->rights_class.'_'.$r;
+				$this->export_label[$r] = "AssociatedProducts"; // Translation key (used only if key ExportDataset_xxx_z not found)
+				$this->export_permission[$r] = array(array("produit", "export"));
+				$this->export_fields_array[$r] = array(
+					'p.rowid'=>"Id", 'p.ref'=>"Ref", 'p.label'=>"Label", 'p.description'=>"Description", 'p.url'=>"PublicUrl",
+					'p.accountancy_code_sell'=>"ProductAccountancySellCode", 'p.accountancy_code_sell_intra'=>"ProductAccountancySellIntraCode",
+					'p.accountancy_code_sell_export'=>"ProductAccountancySellExportCode", 'p.accountancy_code_buy'=>"ProductAccountancyBuyCode",
 					'p.accountancy_code_buy_intra'=>"ProductAccountancyBuyIntraCode", 'p.accountancy_code_buy_export'=>"ProductAccountancyBuyExportCode",
-			    	'p.note'=>"NotePrivate", 'p.note_public'=>'NotePublic',
-			    	'p.weight'=>"Weight", 'p.length'=>"Length", 'p.surface'=>"Surface", 'p.volume'=>"Volume", 'p.customcode'=>'CustomCode',
-			        'p.price_base_type'=>"PriceBase", 'p.price'=>"UnitPriceHT", 'p.price_ttc'=>"UnitPriceTTC", 'p.tva_tx'=>'VATRate', 'p.tosell'=>"OnSell",
-			        'p.tobuy'=>"OnBuy", 'p.datec'=>'DateCreation', 'p.tms'=>'DateModification'
-			    );
-			    if (!empty($conf->stock->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.stock'=>'Stock', 'p.seuil_stock_alerte'=>'StockLimit', 'p.desiredstock'=>'DesiredStock', 'p.pmp'=>'PMPValue'));
-			    if (!empty($conf->barcode->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode'=>'BarCode'));
-			    $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('pa.qty'=>'Qty', 'pa.incdec'=>'ComposedProductIncDecStock'));
-			    $this->export_TypeFields_array[$r] = array(
-			        'p.ref'=>"Text", 'p.label'=>"Text", 'p.description'=>"Text", 'p.url'=>"Text",
-			    	'p.accountancy_code_sell'=>"Text", 'p.accountancy_code_sell_intra'=>"Text", 'p.accountancy_code_sell_export'=>"Text",
+					'p.note'=>"NotePrivate", 'p.note_public'=>'NotePublic',
+					'p.weight'=>"Weight", 'p.length'=>"Length", 'p.surface'=>"Surface", 'p.volume'=>"Volume", 'p.customcode'=>'CustomCode',
+					'p.price_base_type'=>"PriceBase", 'p.price'=>"UnitPriceHT", 'p.price_ttc'=>"UnitPriceTTC", 'p.tva_tx'=>'VATRate', 'p.tosell'=>"OnSell",
+					'p.tobuy'=>"OnBuy", 'p.datec'=>'DateCreation', 'p.tms'=>'DateModification'
+				);
+				if (!empty($conf->stock->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.stock'=>'Stock', 'p.seuil_stock_alerte'=>'StockLimit', 'p.desiredstock'=>'DesiredStock', 'p.pmp'=>'PMPValue'));
+				if (!empty($conf->barcode->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode'=>'BarCode'));
+				$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('pa.qty'=>'Qty', 'pa.incdec'=>'ComposedProductIncDecStock'));
+				$this->export_TypeFields_array[$r] = array(
+					'p.ref'=>"Text", 'p.label'=>"Text", 'p.description'=>"Text", 'p.url'=>"Text",
+					'p.accountancy_code_sell'=>"Text", 'p.accountancy_code_sell_intra'=>"Text", 'p.accountancy_code_sell_export'=>"Text",
 					'p.accountancy_code_buy'=>"Text", 'p.accountancy_code_buy_intra'=>"Text", 'p.accountancy_code_buy_export'=>"Text",
-			    	'p.note'=>"Text", 'p.note_public'=>"Text",
-			    	'p.weight'=>"Numeric", 'p.length'=>"Numeric", 'p.surface'=>"Numeric", 'p.volume'=>"Numeric", 'p.customcode'=>'Text',
-			        'p.price_base_type'=>"Text", 'p.price'=>"Numeric", 'p.price_ttc'=>"Numeric", 'p.tva_tx'=>'Numeric', 'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean",
-			        'p.datec'=>'Date', 'p.tms'=>'Date'
-			    );
-			    if (!empty($conf->stock->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.stock'=>'Numeric', 'p.seuil_stock_alerte'=>'Numeric', 'p.desiredstock'=>'Numeric', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric'));
-			    if (!empty($conf->barcode->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode'=>'Text'));
-			    $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('pa.qty'=>'Numeric'));
-			    $this->export_entities_array[$r] = array(
-			        'p.rowid'=>"virtualproduct", 'p.ref'=>"virtualproduct", 'p.label'=>"virtualproduct", 'p.description'=>"virtualproduct", 'p.url'=>"virtualproduct",
-			    	'p.accountancy_code_sell'=>'virtualproduct', 'p.accountancy_code_sell_intra'=>'virtualproduct', 'p.accountancy_code_sell_export'=>'virtualproduct',
-			    	'p.accountancy_code_buy'=>'virtualproduct', 'p.accountancy_code_buy_intra'=>'virtualproduct', 'p.accountancy_code_buy_export'=>'virtualproduct',
+					'p.note'=>"Text", 'p.note_public'=>"Text",
+					'p.weight'=>"Numeric", 'p.length'=>"Numeric", 'p.surface'=>"Numeric", 'p.volume'=>"Numeric", 'p.customcode'=>'Text',
+					'p.price_base_type'=>"Text", 'p.price'=>"Numeric", 'p.price_ttc'=>"Numeric", 'p.tva_tx'=>'Numeric', 'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean",
+					'p.datec'=>'Date', 'p.tms'=>'Date'
+				);
+				if (!empty($conf->stock->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.stock'=>'Numeric', 'p.seuil_stock_alerte'=>'Numeric', 'p.desiredstock'=>'Numeric', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric'));
+				if (!empty($conf->barcode->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode'=>'Text'));
+				$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('pa.qty'=>'Numeric'));
+				$this->export_entities_array[$r] = array(
+					'p.rowid'=>"virtualproduct", 'p.ref'=>"virtualproduct", 'p.label'=>"virtualproduct", 'p.description'=>"virtualproduct", 'p.url'=>"virtualproduct",
+					'p.accountancy_code_sell'=>'virtualproduct', 'p.accountancy_code_sell_intra'=>'virtualproduct', 'p.accountancy_code_sell_export'=>'virtualproduct',
+					'p.accountancy_code_buy'=>'virtualproduct', 'p.accountancy_code_buy_intra'=>'virtualproduct', 'p.accountancy_code_buy_export'=>'virtualproduct',
 					'p.note'=>"virtualproduct", 'p.length'=>"virtualproduct",
-			        'p.surface'=>"virtualproduct", 'p.volume'=>"virtualproduct", 'p.weight'=>"virtualproduct", 'p.customcode'=>'virtualproduct',
-			        'p.price_base_type'=>"virtualproduct", 'p.price'=>"virtualproduct", 'p.price_ttc'=>"virtualproduct", 'p.tva_tx'=>"virtualproduct",
-			        'p.tosell'=>"virtualproduct", 'p.tobuy'=>"virtualproduct", 'p.datec'=>"virtualproduct", 'p.tms'=>"virtualproduct"
-			    );
-			    if (!empty($conf->stock->enabled)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'virtualproduct', 'p.seuil_stock_alerte'=>'virtualproduct', 'p.desiredstock'=>'virtualproduct', 'p.pmp'=>'virtualproduct'));
-			    if (!empty($conf->barcode->enabled)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'virtualproduct'));
-			    $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('pa.qty'=>"subproduct", 'pa.incdec'=>'subproduct'));
-			    $keyforselect = 'product'; $keyforelement = 'product'; $keyforaliasextra = 'extra';
-			    include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-			    $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p2.rowid'=>"Id", 'p2.ref'=>"Ref", 'p2.label'=>"Label", 'p2.description'=>"Description"));
-			    $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p2.rowid'=>"subproduct", 'p2.ref'=>"subproduct", 'p2.label'=>"subproduct", 'p2.description'=>"subproduct"));
-			    $this->export_sql_start[$r] = 'SELECT DISTINCT ';
-			    $this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
-			    $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON p.rowid = extra.fk_object,';
-			    $this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'product_association as pa, '.MAIN_DB_PREFIX.'product as p2';
-			    $this->export_sql_end[$r] .= ' WHERE p.entity IN ('.getEntity('product').')'; // For product and service profile
-			    $this->export_sql_end[$r] .= ' AND p.rowid = pa.fk_product_pere AND p2.rowid = pa.fk_product_fils';
+					'p.surface'=>"virtualproduct", 'p.volume'=>"virtualproduct", 'p.weight'=>"virtualproduct", 'p.customcode'=>'virtualproduct',
+					'p.price_base_type'=>"virtualproduct", 'p.price'=>"virtualproduct", 'p.price_ttc'=>"virtualproduct", 'p.tva_tx'=>"virtualproduct",
+					'p.tosell'=>"virtualproduct", 'p.tobuy'=>"virtualproduct", 'p.datec'=>"virtualproduct", 'p.tms'=>"virtualproduct"
+				);
+				if (!empty($conf->stock->enabled)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'virtualproduct', 'p.seuil_stock_alerte'=>'virtualproduct', 'p.desiredstock'=>'virtualproduct', 'p.pmp'=>'virtualproduct'));
+				if (!empty($conf->barcode->enabled)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'virtualproduct'));
+				$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('pa.qty'=>"subproduct", 'pa.incdec'=>'subproduct'));
+				$keyforselect = 'product'; $keyforelement = 'product'; $keyforaliasextra = 'extra';
+				include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+				$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p2.rowid'=>"Id", 'p2.ref'=>"Ref", 'p2.label'=>"Label", 'p2.description'=>"Description"));
+				$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p2.rowid'=>"subproduct", 'p2.ref'=>"subproduct", 'p2.label'=>"subproduct", 'p2.description'=>"subproduct"));
+				$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+				$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
+				$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON p.rowid = extra.fk_object,';
+				$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'product_association as pa, '.MAIN_DB_PREFIX.'product as p2';
+				$this->export_sql_end[$r] .= ' WHERE p.entity IN ('.getEntity('product').')'; // For product and service profile
+				$this->export_sql_end[$r] .= ' AND p.rowid = pa.fk_product_pere AND p2.rowid = pa.fk_product_fils';
 			}
 		}
 
@@ -348,141 +348,141 @@ class modService extends DolibarrModules
 		$this->import_entities_array[$r] = array(); // We define here only fields that use a different icon from the one defined in import_icon
 		$this->import_tables_array[$r] = array('p'=>MAIN_DB_PREFIX.'product', 'extra'=>MAIN_DB_PREFIX.'product_extrafields');
 		$this->import_tables_creator_array[$r] = array('p'=>'fk_user_author'); // Fields to store import user id
-        $this->import_fields_array[$r] = array(
-        	'p.ref' => "Ref*",
-        	'p.label' => "Label*",
-        	'p.fk_product_type' => "Type*",
-        	'p.tosell' => "OnSell*",
-        	'p.tobuy' => "OnBuy*",
-        	'p.description' => "Description",
-        	'p.url' => "PublicUrl",
-        	'p.customcode' => 'CustomCode',
-        	'p.fk_country' => 'CountryCode',
-        	'p.accountancy_code_sell' => "ProductAccountancySellCode",
-        	'p.accountancy_code_sell_intra' => "ProductAccountancySellIntraCode",
-        	'p.accountancy_code_sell_export' => "ProductAccountancySellExportCode",
-        	'p.accountancy_code_buy' => "ProductAccountancyBuyCode",
-        	'p.accountancy_code_buy_intra' => "ProductAccountancyBuyIntraCode",
-        	'p.accountancy_code_buy_export' => "ProductAccountancyBuyExportCode",
-        	'p.note_public' => "NotePublic",
-        	'p.note' => "NotePrivate",
-        	'p.weight' => "Weight",
-        	'p.weight_units' => "WeightUnits",
-        	'p.length' => "Length",
-        	'p.length_units' => "LengthUnit",
-        	'p.width' => "Width",
-            'p.width_units' => "WidthUnits",
-        	'p.height' => "Height",
-        	'p.height_units' => "HeightUnit",
-        	'p.surface' => "Surface",
-        	'p.surface_units' => "SurfaceUnit",
-        	'p.volume' => "Volume",
-        	'p.volume_units' => "VolumeUnits",
-        	'p.duration' => "Duration", //duration of service
-        	'p.finished' => 'Nature',
-        	'p.price' => "SellingPriceHT", //without
-        	'p.price_min' => "MinPrice",
-        	'p.price_ttc' => "SellingPriceTTC", //with tax
-        	'p.price_min_ttc' => "SellingMinPriceTTC",
-        	'p.price_base_type' => "PriceBaseType", //price base: with-tax (TTC) or without (HT) tax. Displays accordingly in Product card
-        	'p.tva_tx' => 'VATRate',
-        	'p.datec' => 'DateCreation',
-        	'p.cost_price' => "CostPrice",
+		$this->import_fields_array[$r] = array(
+			'p.ref' => "Ref*",
+			'p.label' => "Label*",
+			'p.fk_product_type' => "Type*",
+			'p.tosell' => "OnSell*",
+			'p.tobuy' => "OnBuy*",
+			'p.description' => "Description",
+			'p.url' => "PublicUrl",
+			'p.customcode' => 'CustomCode',
+			'p.fk_country' => 'CountryCode',
+			'p.accountancy_code_sell' => "ProductAccountancySellCode",
+			'p.accountancy_code_sell_intra' => "ProductAccountancySellIntraCode",
+			'p.accountancy_code_sell_export' => "ProductAccountancySellExportCode",
+			'p.accountancy_code_buy' => "ProductAccountancyBuyCode",
+			'p.accountancy_code_buy_intra' => "ProductAccountancyBuyIntraCode",
+			'p.accountancy_code_buy_export' => "ProductAccountancyBuyExportCode",
+			'p.note_public' => "NotePublic",
+			'p.note' => "NotePrivate",
+			'p.weight' => "Weight",
+			'p.weight_units' => "WeightUnits",
+			'p.length' => "Length",
+			'p.length_units' => "LengthUnit",
+			'p.width' => "Width",
+			'p.width_units' => "WidthUnits",
+			'p.height' => "Height",
+			'p.height_units' => "HeightUnit",
+			'p.surface' => "Surface",
+			'p.surface_units' => "SurfaceUnit",
+			'p.volume' => "Volume",
+			'p.volume_units' => "VolumeUnits",
+			'p.duration' => "Duration", //duration of service
+			'p.finished' => 'Nature',
+			'p.price' => "SellingPriceHT", //without
+			'p.price_min' => "MinPrice",
+			'p.price_ttc' => "SellingPriceTTC", //with tax
+			'p.price_min_ttc' => "SellingMinPriceTTC",
+			'p.price_base_type' => "PriceBaseType", //price base: with-tax (TTC) or without (HT) tax. Displays accordingly in Product card
+			'p.tva_tx' => 'VATRate',
+			'p.datec' => 'DateCreation',
+			'p.cost_price' => "CostPrice",
 		);
-        if (!empty($conf->stock->enabled)) {//if Stock module enabled
-        	$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array(
-        		'p.seuil_stock_alerte' => 'StockLimit', //lower limit for warning
-        		'p.pmp' => 'PMPValue', //weighted average price
-        		'p.desiredstock' => 'DesiredStock'//desired stock for replenishment feature
-        	));
-        }
+		if (!empty($conf->stock->enabled)) {//if Stock module enabled
+			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array(
+				'p.seuil_stock_alerte' => 'StockLimit', //lower limit for warning
+				'p.pmp' => 'PMPValue', //weighted average price
+				'p.desiredstock' => 'DesiredStock'//desired stock for replenishment feature
+			));
+		}
 
-        $this->import_convertvalue_array[$r] = array(
-        	'p.weight_units' => array(
-        		'rule' => 'fetchscalefromcodeunits', // Switch this to fetchidfromcodeunits when we will store id instead of scale in product table
-        		'classfile' => '/core/class/cunits.class.php',
-        		'class' => 'CUnits',
-        		'method' => 'fetch',
-        		'units' => 'weight',
-        		'dict' => 'DictionaryMeasuringUnits'
-        	),
-        	'p.length_units' => array(
-        		'rule' => 'fetchscalefromcodeunits', // Switch this to fetchidfromcodeunits when we will store id instead of scale in product table
-        		'classfile' => '/core/class/cunits.class.php',
-        		'class' => 'CUnits',
-        		'method' => 'fetch',
-        		'units' => 'size',
-        		'dict' => 'DictionaryMeasuringUnits'
-        	),
-        	'p.width_units' => array(
-        		'rule' => 'fetchscalefromcodeunits', // Switch this to fetchidfromcodeunits when we will store id instead of scale in product table
-        		'classfile' => '/core/class/cunits.class.php',
-        		'class' => 'CUnits',
-        		'method' => 'fetch',
-        		'units' => 'size',
-        		'dict' => 'DictionaryMeasuringUnits'
-        	),
-        	'p.height_units' => array(
-        		'rule' => 'fetchscalefromcodeunits', // Switch this to fetchidfromcodeunits when we will store id instead of scale in product table
-        		'classfile' => '/core/class/cunits.class.php',
-        		'class' => 'CUnits',
-        		'method' => 'fetch',
-        		'units' => 'size',
-        		'dict' => 'DictionaryMeasuringUnits'
-        	),
-        	'p.surface_units' => array(
-        		'rule' => 'fetchscalefromcodeunits', // Switch this to fetchidfromcodeunits when we will store id instead of scale in product table
-        		'classfile' => '/core/class/cunits.class.php',
-        		'class' => 'CUnits',
-        		'method' => 'fetch',
-        		'units' => 'surface',
-        		'dict' => 'DictionaryMeasuringUnits'
-        	),
-        	'p.volume_units' => array(
-        		'rule' => 'fetchscalefromcodeunits', // Switch this to fetchidfromcodeunits when we will store id instead of scale in product table
-        		'classfile' => '/core/class/cunits.class.php',
-        		'class' => 'CUnits',
-        		'method' => 'fetch',
-        		'units' => 'volume',
-        		'dict' => 'DictionaryMeasuringUnits'
-        	),
-        	'p.fk_country' => array(
-        		'rule' => 'fetchidfromcodeid',
-        		'classfile' => '/core/class/ccountry.class.php',
-        		'class' => 'Ccountry',
-        		'method' => 'fetch',
-        		'dict' => 'DictionaryCountry'
-        	)
-        );
-        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) && $usenpr) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.recuperableonly'=>'NPR'));
-        if (is_object($mysoc) && $mysoc->useLocalTax(1)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.localtax1_tx'=>'LT1', 'p.localtax1_type'=>'LT1Type'));
-        if (is_object($mysoc) && $mysoc->useLocalTax(2)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.localtax2_tx'=>'LT2', 'p.localtax2_type'=>'LT2Type'));
-        if (!empty($conf->barcode->enabled)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.barcode'=>'BarCode'));
+		$this->import_convertvalue_array[$r] = array(
+			'p.weight_units' => array(
+				'rule' => 'fetchscalefromcodeunits', // Switch this to fetchidfromcodeunits when we will store id instead of scale in product table
+				'classfile' => '/core/class/cunits.class.php',
+				'class' => 'CUnits',
+				'method' => 'fetch',
+				'units' => 'weight',
+				'dict' => 'DictionaryMeasuringUnits'
+			),
+			'p.length_units' => array(
+				'rule' => 'fetchscalefromcodeunits', // Switch this to fetchidfromcodeunits when we will store id instead of scale in product table
+				'classfile' => '/core/class/cunits.class.php',
+				'class' => 'CUnits',
+				'method' => 'fetch',
+				'units' => 'size',
+				'dict' => 'DictionaryMeasuringUnits'
+			),
+			'p.width_units' => array(
+				'rule' => 'fetchscalefromcodeunits', // Switch this to fetchidfromcodeunits when we will store id instead of scale in product table
+				'classfile' => '/core/class/cunits.class.php',
+				'class' => 'CUnits',
+				'method' => 'fetch',
+				'units' => 'size',
+				'dict' => 'DictionaryMeasuringUnits'
+			),
+			'p.height_units' => array(
+				'rule' => 'fetchscalefromcodeunits', // Switch this to fetchidfromcodeunits when we will store id instead of scale in product table
+				'classfile' => '/core/class/cunits.class.php',
+				'class' => 'CUnits',
+				'method' => 'fetch',
+				'units' => 'size',
+				'dict' => 'DictionaryMeasuringUnits'
+			),
+			'p.surface_units' => array(
+				'rule' => 'fetchscalefromcodeunits', // Switch this to fetchidfromcodeunits when we will store id instead of scale in product table
+				'classfile' => '/core/class/cunits.class.php',
+				'class' => 'CUnits',
+				'method' => 'fetch',
+				'units' => 'surface',
+				'dict' => 'DictionaryMeasuringUnits'
+			),
+			'p.volume_units' => array(
+				'rule' => 'fetchscalefromcodeunits', // Switch this to fetchidfromcodeunits when we will store id instead of scale in product table
+				'classfile' => '/core/class/cunits.class.php',
+				'class' => 'CUnits',
+				'method' => 'fetch',
+				'units' => 'volume',
+				'dict' => 'DictionaryMeasuringUnits'
+			),
+			'p.fk_country' => array(
+				'rule' => 'fetchidfromcodeid',
+				'classfile' => '/core/class/ccountry.class.php',
+				'class' => 'Ccountry',
+				'method' => 'fetch',
+				'dict' => 'DictionaryCountry'
+			)
+		);
+		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) && $usenpr) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.recuperableonly'=>'NPR'));
+		if (is_object($mysoc) && $mysoc->useLocalTax(1)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.localtax1_tx'=>'LT1', 'p.localtax1_type'=>'LT1Type'));
+		if (is_object($mysoc) && $mysoc->useLocalTax(2)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.localtax2_tx'=>'LT2', 'p.localtax2_type'=>'LT2Type'));
+		if (!empty($conf->barcode->enabled)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.barcode'=>'BarCode'));
 		if (!empty($conf->global->PRODUCT_USE_UNITS)) $this->import_fields_array[$r]['p.fk_unit'] = 'Unit';
-        // Add extra fields
+		// Add extra fields
 		$import_extrafield_sample = array();
 		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product' AND entity IN (0,".$conf->entity.")";
 		$resql = $this->db->query($sql);
 		if ($resql)    // This can fail when class is used on old database (during migration for example)
 		{
-		    while ($obj = $this->db->fetch_object($resql))
-		    {
-		        $fieldname = 'extra.'.$obj->name;
-		        $fieldlabel = ucfirst($obj->label);
-		        $this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
-		        $import_extrafield_sample[$fieldname] = $fieldlabel;
-		    }
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$fieldname = 'extra.'.$obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+				$import_extrafield_sample[$fieldname] = $fieldlabel;
+			}
 		}
 		// End add extra fields
 		$this->import_fieldshidden_array[$r] = array('extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'product'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
 		$this->import_regex_array[$r] = array(
-            'p.ref'=>'[^ ]',
+			'p.ref'=>'[^ ]',
 			'p.price_base_type' => '\AHT\z|\ATTC\z',
 			'p.tosell'=>'^[0|1]$',
-            'p.tobuy'=>'^[0|1]$',
-            'p.fk_product_type'=>'^[0|1]$',
-            'p.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$',
+			'p.tobuy'=>'^[0|1]$',
+			'p.fk_product_type'=>'^[0|1]$',
+			'p.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$',
 			'p.recuperableonly' => '^[0|1]$',
 			'p.finished' => '^[0|1]$'
 		);
@@ -565,7 +565,7 @@ class modService extends DolibarrModules
 		{
 			if (!empty($conf->fournisseur->enabled))
 			{
-			    // Import suppliers prices (note: this code is duplicated in module Service)
+				// Import suppliers prices (note: this code is duplicated in module Service)
 				$r++;
 				$this->import_code[$r] = $this->rights_class.'_supplierprices';
 				$this->import_label[$r] = "SuppliersPricesOfProductsOrServices"; // Translation key
@@ -574,14 +574,14 @@ class modService extends DolibarrModules
 				$this->import_tables_array[$r] = array('sp'=>MAIN_DB_PREFIX.'product_fournisseur_price');
 				$this->import_tables_creator_array[$r] = array('sp'=>'fk_user');
 				$this->import_fields_array[$r] = array(//field order as per structure of table llx_product_fournisseur_price, without optional fields
-				    'sp.fk_product'=>"ProductOrService*",
-				    'sp.fk_soc' => "Supplier*",
-				    'sp.ref_fourn' => 'SupplierRef*',
-				    'sp.quantity' => "QtyMin*",
-				    'sp.tva_tx' => 'VATRate',
-				    'sp.default_vat_code' => 'VATCode',
-				    'sp.delivery_time_days' => 'DeliveryDelay',
-				    'sp.supplier_reputation' => 'SupplierReputation'
+					'sp.fk_product'=>"ProductOrService*",
+					'sp.fk_soc' => "Supplier*",
+					'sp.ref_fourn' => 'SupplierRef*',
+					'sp.quantity' => "QtyMin*",
+					'sp.tva_tx' => 'VATRate',
+					'sp.default_vat_code' => 'VATCode',
+					'sp.delivery_time_days' => 'DeliveryDelay',
+					'sp.supplier_reputation' => 'SupplierReputation'
 				);
 				if (is_object($mysoc) && $usenpr)       $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.recuperableonly'=>'VATNPR'));
 				if (is_object($mysoc) && $mysoc->useLocalTax(1)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.localtax1_tx'=>'LT1', 'sp.localtax1_type'=>'LT1Type'));
@@ -594,13 +594,13 @@ class modService extends DolibarrModules
 
 				if (!empty($conf->multicurrency->enabled))
 				{
-				    $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array(
-				        'sp.fk_multicurrency'=>'CurrencyCodeId', //ideally this should be automatically obtained from the CurrencyCode on the next line
-				        'sp.multicurrency_code'=>'CurrencyCode',
-				        'sp.multicurrency_tx'=>'CurrencyRate',
-				        'sp.multicurrency_unitprice'=>'CurrencyUnitPrice',
-				        'sp.multicurrency_price'=>'CurrencyPrice',
-				    ));
+					$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array(
+						'sp.fk_multicurrency'=>'CurrencyCodeId', //ideally this should be automatically obtained from the CurrencyCode on the next line
+						'sp.multicurrency_code'=>'CurrencyCode',
+						'sp.multicurrency_tx'=>'CurrencyRate',
+						'sp.multicurrency_unitprice'=>'CurrencyUnitPrice',
+						'sp.multicurrency_price'=>'CurrencyPrice',
+					));
 				}
 
 				$this->import_convertvalue_array[$r] = array(
@@ -646,7 +646,7 @@ class modService extends DolibarrModules
 
 			if (!empty($conf->global->PRODUIT_MULTIPRICES))
 			{
-			    // Import products multiprices
+				// Import products multiprices
 				$r++;
 				$this->import_code[$r] = $this->rights_class.'_multiprice';
 				$this->import_label[$r] = "ProductsOrServiceMultiPrice"; // Translation key
@@ -663,20 +663,20 @@ class modService extends DolibarrModules
 				if (is_object($mysoc) && $usenpr) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('pr.recuperableonly'=>'NPR'));
 				$this->import_regex_array[$r] = array('pr.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$', 'pr.recuperableonly'=>'^[0|1]$');
 				$this->import_convertvalue_array[$r] = array(
-				    'pr.fk_product'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/class/product.class.php', 'class'=>'Product', 'method'=>'fetch', 'element'=>'Product')
+					'pr.fk_product'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/class/product.class.php', 'class'=>'Product', 'method'=>'fetch', 'element'=>'Product')
 				);
 				$this->import_examplevalues_array[$r] = array('pr.fk_product'=>"SERVICE_REF or id:123456",
 					'pr.price_base_type'=>"HT (for excl tax) or TTC (for inc tax)", 'pr.price_level'=>"1",
 					'pr.price'=>"100", 'pr.price_ttc'=>"110",
 					'pr.price_min'=>"100", 'pr.price_min_ttc'=>"110",
 					'pr.tva_tx'=>'20',
-				    'pr.recuperableonly'=>'0',
+					'pr.recuperableonly'=>'0',
 					'pr.date_price'=>'2013-04-10');
 			}
 
 			if (!empty($conf->global->MAIN_MULTILANGS))
 			{
-			    // Import translations of product names and descriptions
+				// Import translations of product names and descriptions
 				$r++;
 				$this->import_code[$r] = $this->rights_class.'_languages';
 				$this->import_label[$r] = "ProductsOrServicesTranslations";
@@ -701,7 +701,7 @@ class modService extends DolibarrModules
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'newboxdefonly', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'newboxdefonly', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
diff --git a/htdocs/core/modules/modSocialNetworks.class.php b/htdocs/core/modules/modSocialNetworks.class.php
index a51a83a8743..bf7573a912b 100644
--- a/htdocs/core/modules/modSocialNetworks.class.php
+++ b/htdocs/core/modules/modSocialNetworks.class.php
@@ -66,7 +66,7 @@ class modSocialNetworks extends DolibarrModules
 
 		// Dependencies
 		$this->hidden = !empty($conf->global->MODULE_SOCIALNETWORKS_DISABLED); // A condition to hide module
-		$this->depends = array('modSociete'); // List of module class names as string that must be enabled if this module is enabled
+		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 60e0fb3b198..1bb0c61b83e 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -122,20 +122,14 @@ class modSociete extends DolibarrModules
 		$r++;
 
 		// Boxes
-		$this->boxes = array();
-		$r = 0;
-		$this->boxes[$r][1] = "box_clients.php";
-		$r++;
-		$this->boxes[$r][1] = "box_prospect.php";
-		$r++;
-		$this->boxes[$r][1] = "box_contacts.php";
-		$r++;
-		$this->boxes[$r][1] = "box_activity.php";
-		$this->boxes[$r][2] = '(WarningUsingThisBoxSlowDown)';
-		$r++;
-		$this->boxes[$r][1] = "box_goodcustomers.php";
-		$this->boxes[$r][2] = '(WarningUsingThisBoxSlowDown)';
-		$r++;
+		$this->boxes = array(
+			0=>array('file'=>'box_clients.php', 'enabledbydefaulton'=>'Home'),
+			1=>array('file'=>'box_prospect.php', 'enabledbydefaulton'=>'Home'),
+			2=>array('file'=>'box_contacts.php', 'enabledbydefaulton'=>'Home'),
+			3=>array('file'=>'box_activity.php', 'enabledbydefaulton'=>'Home', 'note'=>'(WarningUsingThisBoxSlowDown)'),
+			4=>array('file'=>'box_goodcustomers.php', 'enabledbydefaulton'=>'Home', 'note'=>'(WarningUsingThisBoxSlowDown)'),
+		);
+
 		// Permissions
 		$this->rights = array();
 		$this->rights_class = 'societe';
@@ -295,7 +289,7 @@ class modSociete extends DolibarrModules
 			's.rowid'=>"Numeric", 's.nom'=>"Text", 's.name_alias'=>"Text", 'ps.nom'=>"Text",
 			's.status'=>"Numeric", 's.client'=>"Numeric", 's.fournisseur'=>"Boolean", 's.datec'=>"Date", 's.tms'=>"Date",
 			's.code_client'=>"Text", 's.code_fournisseur'=>"Text", 's.code_compta'=>"Text", 's.code_compta_fournisseur'=>"Text",
-			's.address'=>"Text", 's.zip'=>"Text",'s.town'=>"Text",
+			's.address'=>"Text", 's.zip'=>"Text", 's.town'=>"Text",
 			'd.nom'=>'Text', 'r.nom'=>'Text', 'c.label'=>"List:c_country:label:label", 'c.code'=>"Text",
 			's.phone'=>"Text", 's.fax'=>"Text",
 			's.url'=>"Text", 's.email'=>"Text", 's.default_lang'=>"Text", 's.canvas' => "Canvas",
@@ -496,7 +490,7 @@ class modSociete extends DolibarrModules
 				'classfile' => '/core/class/cstate.class.php',
 				'class' => 'Cstate',
 				'method' => 'fetch',
-				'dict' => 'DictionaryState'
+				'dict' => 'DictionaryStateCode'
 			),
 			's.fk_pays' => array(
 				'rule' => 'fetchidfromcodeid',
@@ -676,7 +670,7 @@ class modSociete extends DolibarrModules
 				'classfile' => '/core/class/cstate.class.php',
 				'class' => 'Cstate',
 				'method' => 'fetch',
-				'dict' => 'DictionaryState'
+				'dict' => 'DictionaryStateCode'
 			),
 			's.fk_pays' => array(
 				'rule' => 'fetchidfromcodeid',
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index 831358dcf6b..da18f2faf11 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -150,29 +150,29 @@ class modStock extends DolibarrModules
 
 		if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 		{
-    		$this->rights[5][0] = 1011;
-    		$this->rights[5][1] = 'inventoryReadPermission'; // Permission label
-    		$this->rights[5][3] = 0; // Permission by default for new user (0/1)
-    		$this->rights[5][4] = 'inventory_advance'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-    		$this->rights[5][5] = 'read'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+			$this->rights[5][0] = 1011;
+			$this->rights[5][1] = 'inventoryReadPermission'; // Permission label
+			$this->rights[5][3] = 0; // Permission by default for new user (0/1)
+			$this->rights[5][4] = 'inventory_advance'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+			$this->rights[5][5] = 'read'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 
-    		$this->rights[6][0] = 1012;
-    		$this->rights[6][1] = 'inventoryCreatePermission'; // Permission label
-    		$this->rights[6][3] = 0; // Permission by default for new user (0/1)
-    		$this->rights[6][4] = 'inventory_advance'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-    		$this->rights[6][5] = 'write'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+			$this->rights[6][0] = 1012;
+			$this->rights[6][1] = 'inventoryCreatePermission'; // Permission label
+			$this->rights[6][3] = 0; // Permission by default for new user (0/1)
+			$this->rights[6][4] = 'inventory_advance'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+			$this->rights[6][5] = 'write'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 
-    		$this->rights[8][0] = 1014;
-    		$this->rights[8][1] = 'inventoryValidatePermission'; // Permission label
-    		$this->rights[8][3] = 0; // Permission by default for new user (0/1)
-    		$this->rights[8][4] = 'inventory_advance'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-    		$this->rights[8][5] = 'validate'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+			$this->rights[8][0] = 1014;
+			$this->rights[8][1] = 'inventoryValidatePermission'; // Permission label
+			$this->rights[8][3] = 0; // Permission by default for new user (0/1)
+			$this->rights[8][4] = 'inventory_advance'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+			$this->rights[8][5] = 'validate'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 
-    		$this->rights[9][0] = 1015;
-    		$this->rights[9][1] = 'inventoryChangePMPPermission'; // Permission label
-    		$this->rights[9][3] = 0; // Permission by default for new user (0/1)
-    		$this->rights[9][4] = 'inventory_advance'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-    		$this->rights[9][5] = 'changePMP'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+			$this->rights[9][0] = 1015;
+			$this->rights[9][1] = 'inventoryChangePMPPermission'; // Permission label
+			$this->rights[9][3] = 0; // Permission by default for new user (0/1)
+			$this->rights[9][4] = 'inventory_advance'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+			$this->rights[9][5] = 'changePMP'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		}
 
 		// Main menu entries
@@ -188,28 +188,60 @@ class modStock extends DolibarrModules
 		//--------
 		$r = 0;
 
+		// Export warehouses
 		$r++;
-		$this->export_code[$r] = $this->rights_class;
-		$this->export_label[$r] = "WarehousesAndProducts"; // Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_code[$r] = $this->rights_class.'_emplacement';
+		$this->export_label[$r] = "Warehouses"; // Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_icon[$r] = "warehouse";
 		$this->export_permission[$r] = array(array("stock", "lire"));
 		$this->export_fields_array[$r] = array(
-			'e.rowid'=>'IdWarehouse', 'e.ref'=>'LocationSummary', 'e.description'=>'DescWareHouse', 'e.lieu'=>'LieuWareHouse', 'e.address'=>'Address',
-			'e.zip'=>'Zip', 'e.town'=>'Town', 'p.rowid'=>"ProductId", 'p.ref'=>"Ref", 'p.fk_product_type'=>"Type", 'p.label'=>"Label", 'p.description'=>"Description",
-			'p.note'=>"Note", 'p.price'=>"Price", 'p.tva_tx'=>'VAT', 'p.tosell'=>"OnSell", 'p.tobuy'=>'OnBuy', 'p.duration'=>"Duration", 'p.datec'=>'DateCreation',
-			'p.tms'=>'DateModification', 'p.pmp'=>'PMPValue', 'p.cost_price'=>'CostPrice'
+			'e.rowid'=>'IdWarehouse', 'e.ref'=>'LocationSummary', 'e.description'=>'DescWareHouse', 'e.lieu'=>'LieuWareHouse', 'e.address'=>'Address', 'e.zip'=>'Zip', 'e.town'=>'Town',
+			'd.code_departement'=>'Departement', 'c.code'=>'CountryCode',
+			'e.phone'=>'Phone', 'e.fax'=>'Fax', 'e.statut'=>'Status', 'pe.rowid'=>'ParentWarehouse', 'pe.ref'=>'LocationSummary'
 		);
 		$this->export_TypeFields_array[$r] = array(
-			'e.rowid'=>'List:entrepot:ref::stock', 'e.ref'=>'Text', 'e.lieu'=>'Text', 'e.address'=>'Text', 'e.zip'=>'Text', 'e.town'=>'Text', 'p.rowid'=>"List:product:label::product",
-			'p.ref'=>"Text", 'p.fk_product_type'=>"Text", 'p.label'=>"Text", 'p.description'=>"Text", 'p.note'=>"Text", 'p.price'=>"Numeric", 'p.tva_tx'=>'Numeric',
-			'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean", 'p.duration'=>"Duree", 'p.datec'=>'Date', 'p.tms'=>'Date', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric',
+			'e.ref'=>'Text', 'e.description'=>'Text', 'e.lieu'=>'Text', 'e.address'=>'Text', 'e.zip'=>'Text', 'e.town'=>'Text',
+			'd.code_departement'=>'List:c_departements:code_departement:code_departement:', 'c.code'=>'List:c_country:code:code:',
+			'e.phone'=>'Text', 'e.fax'=>'Text', 'e.statut'=>'Text', 'pe.rowid'=>'List:entrepot:ref:rowid:stock', 'pe.ref'=>'Text'
+		);
+		$this->export_entities_array[$r] = array();	// We define here only fields that use another icon that the one defined into export_icon
+		$this->export_aggregate_array[$r] = array();
+		$keyforselect = 'warehouse'; $keyforelement = 'warehouse'; $keyforaliasextra = 'extra';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'entrepot as e';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON d.rowid = e.fk_departement';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON c.rowid = e.fk_pays';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot as pe ON pe.rowid = e.fk_parent';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot_extrafields as extra ON extra.fk_object = e.rowid';
+		$this->export_sql_end[$r] .= ' WHERE e.entity IN ('.getEntity('stock').')';
+
+		// Export stock (without batch number)
+		$r++;
+		$this->export_code[$r] = $this->rights_class.'_emplacement_product';
+		$this->export_label[$r] = "Stocks"; // Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_icon[$r] = "warehouse";
+		$this->export_permission[$r] = array(array("stock", "lire"));
+		$this->export_fields_array[$r] = array(
+			'e.rowid'=>'IdWarehouse', 'e.ref'=>'LocationSummary', 'e.description'=>'DescWareHouse', 'e.lieu'=>'LieuWareHouse', 'e.address'=>'Address', 'e.zip'=>'Zip', 'e.town'=>'Town',
+			'p.rowid'=>"ProductId", 'p.ref'=>"Ref", 'p.fk_product_type'=>"Type", 'p.label'=>"Label", 'p.description'=>"Description", 'p.note'=>"Note",
+			'p.price'=>"Price", 'p.tva_tx'=>'VAT', 'p.tosell'=>"OnSell", 'p.tobuy'=>'OnBuy', 'p.duration'=>"Duration",
+			'p.datec'=>'DateCreation', 'p.tms'=>'DateModification', 'p.pmp'=>'PMPValue', 'p.cost_price'=>'CostPrice',
+		);
+		$this->export_TypeFields_array[$r] = array(
+			'e.rowid'=>'List:entrepot:ref::stock', 'e.ref'=>'Text', 'e.lieu'=>'Text', 'e.address'=>'Text', 'e.zip'=>'Text', 'e.town'=>'Text',
+			'p.rowid'=>"List:product:label::product", 'p.ref'=>"Text", 'p.fk_product_type'=>"Text", 'p.label'=>"Text", 'p.description'=>"Text", 'p.note'=>"Text",
+			'p.price'=>"Numeric", 'p.tva_tx'=>'Numeric', 'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean", 'p.duration'=>"Duree",
+			'p.datec'=>'Date', 'p.tms'=>'Date', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric',
 			'ps.reel'=>'Numeric'
 		);
 		$this->export_entities_array[$r] = array(
-			'e.rowid'=>'warehouse', 'e.ref'=>'warehouse', 'e.description'=>'warehouse', 'e.lieu'=>'warehouse', 'e.address'=>'warehouse', 'e.zip'=>'warehouse',
-			'e.town'=>'warehouse', 'p.rowid'=>"product", 'p.ref'=>"product", 'p.fk_product_type'=>"product", 'p.label'=>"product", 'p.description'=>"product",
-			'p.note'=>"product", 'p.price'=>"product", 'p.tva_tx'=>'product', 'p.tosell'=>"product", 'p.tobuy'=>"product", 'p.duration'=>"product",
-			'p.datec'=>'product', 'p.tms'=>'product', 'p.pmp'=>'product', 'p.cost_price'=>'product', 'ps.reel'=>'stock'
-		);
+			'p.rowid'=>"product", 'p.ref'=>"product", 'p.fk_product_type'=>"product", 'p.label'=>"product", 'p.description'=>"product", 'p.note'=>"product",
+			'p.price'=>"product", 'p.tva_tx'=>'product', 'p.tosell'=>"product", 'p.tobuy'=>"product", 'p.duration'=>"product",
+			'p.datec'=>'product', 'p.tms'=>'product', 'p.pmp'=>'product', 'p.cost_price'=>'product',
+			'ps.reel'=>'stock'
+		);	// We define here only fields that use another icon that the one defined into export_icon
 		$this->export_aggregate_array[$r] = array('ps.reel'=>'SUM'); // TODO Not used yet
 		$this->export_dependencies_array[$r] = array('stock'=>array('p.rowid', 'e.rowid')); // We must keep this until the aggregate_array is used. To have a unique key, if we ask a field of a child, to avoid the DISTINCT to discard them.
 		$keyforselect = 'product'; $keyforelement = 'product'; $keyforaliasextra = 'extra';
@@ -220,73 +252,78 @@ class modStock extends DolibarrModules
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON extra.fk_object = p.rowid, '.MAIN_DB_PREFIX.'product_stock as ps, '.MAIN_DB_PREFIX.'entrepot as e';
 		$this->export_sql_end[$r] .= ' WHERE p.rowid = ps.fk_product AND ps.fk_entrepot = e.rowid';
 		$this->export_sql_end[$r] .= ' AND e.entity IN ('.getEntity('stock').')';
+
+		// Export stock including batch number
 		if ($conf->productbatch->enabled)
 		{
-			// Export of stock including lot number
 			$langs->load("productbatch");
 
 			// This request is same than previous but without field ps.stock (real stock in warehouse) and with link to subtable productbatch
 			$r++;
 
-			$this->export_code[$r] = $this->rights_class.'_lot';
-			$this->export_label[$r] = "WarehousesAndProductsBatchDetail"; // Translation key (used only if key ExportDataset_xxx_z not found)
+			$this->export_code[$r] = $this->rights_class.'_emplacement_product_lot';
+			$this->export_label[$r] = "StocksWithBatch"; // Translation key (used only if key ExportDataset_xxx_z not found)
+			$this->export_icon[$r] = "warehouse";
 			$this->export_permission[$r] = array(array("stock", "lire"));
 			$this->export_fields_array[$r] = array(
-				'e.rowid'=>'IdWarehouse', 'e.ref'=>'LocationSummary', 'e.description'=>'DescWareHouse', 'e.lieu'=>'LieuWareHouse', 'e.address'=>'Address',
-				'e.zip'=>'Zip', 'e.town'=>'Town', 'p.rowid'=>"ProductId", 'p.ref'=>"Ref", 'p.fk_product_type'=>"Type", 'p.label'=>"Label", 'p.description'=>"Description",
-				'p.note'=>"Note", 'p.price'=>"Price", 'p.tva_tx'=>'VAT', 'p.tosell'=>"OnSell", 'p.tobuy'=>'OnBuy', 'p.duration'=>"Duration", 'p.datec'=>'DateCreation',
-				'p.tms'=>'DateModification', 'pb.rowid'=>'Id', 'pb.batch'=>'Batch', 'pb.qty'=>'Qty', 'pl.eatby'=>'EatByDate', 'pl.sellby'=>'SellByDate'
+				'e.rowid'=>'IdWarehouse', 'e.ref'=>'LocationSummary', 'e.description'=>'DescWareHouse', 'e.lieu'=>'LieuWareHouse', 'e.address'=>'Address', 'e.zip'=>'Zip', 'e.town'=>'Town',
+				'p.rowid'=>"ProductId", 'p.ref'=>"Ref", 'p.fk_product_type'=>"Type", 'p.label'=>"Label", 'p.description'=>"Description", 'p.note'=>"Note",
+				'p.price'=>"Price", 'p.tva_tx'=>'VAT', 'p.tosell'=>"OnSell", 'p.tobuy'=>'OnBuy', 'p.duration'=>"Duration",
+				'p.datec'=>'DateCreation', 'p.tms'=>'DateModification', 'p.pmp'=>'PMPValue', 'p.cost_price'=>'CostPrice',
+				'pb.rowid'=>'Id', 'pb.batch'=>'Batch', 'pb.qty'=>'Qty',
+				'pl.eatby'=>'EatByDate', 'pl.sellby'=>'SellByDate'
 			);
 			$this->export_TypeFields_array[$r] = array(
 				'e.rowid'=>'List:entrepot:ref::stock', 'e.ref'=>'Text', 'e.lieu'=>'Text', 'e.description'=>'Text', 'e.address'=>'Text', 'e.zip'=>'Text', 'e.town'=>'Text',
 				'p.rowid'=>"List:product:label::product", 'p.ref'=>"Text", 'p.fk_product_type'=>"Text", 'p.label'=>"Text", 'p.description'=>"Text", 'p.note'=>"Text",
-				'p.price'=>"Numeric", 'p.tva_tx'=>'Numeric', 'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean", 'p.duration'=>"Duree", 'p.datec'=>'Date', 'p.tms'=>'Date',
-				'pb.batch'=>'Text', 'pb.qty'=>'Numeric', 'pl.eatby'=>'Date', 'pl.sellby'=>'Date'
+				'p.price'=>"Numeric", 'p.tva_tx'=>'Numeric', 'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean", 'p.duration'=>"Duree",
+				'p.datec'=>'DateCreation', 'p.tms'=>'DateModification', 'p.pmp'=>'PMPValue', 'p.cost_price'=>'CostPrice',
+				'pb.batch'=>'Text', 'pb.qty'=>'Numeric',
+				'pl.eatby'=>'Date', 'pl.sellby'=>'Date'
 			);
 			$this->export_entities_array[$r] = array(
-				'e.rowid'=>'warehouse', 'e.ref'=>'warehouse', 'e.description'=>'warehouse', 'e.lieu'=>'warehouse', 'e.address'=>'warehouse', 'e.zip'=>'warehouse',
-				'e.town'=>'warehouse', 'p.rowid'=>"product", 'p.ref'=>"product", 'p.fk_product_type'=>"product", 'p.label'=>"product", 'p.description'=>"product",
-				'p.note'=>"product", 'p.price'=>"product", 'p.tva_tx'=>'product', 'p.tosell'=>"product", 'p.tobuy'=>"product", 'p.duration'=>"product",
-				'p.datec'=>'product', 'p.tms'=>'product', 'pb.rowid'=>'stockbatch', 'pb.batch'=>'stockbatch', 'pb.qty'=>'stockbatch', 'pl.eatby'=>'batch',
-				'pl.sellby'=>'batch'
-			);
+				'p.rowid'=>"product", 'p.ref'=>"product", 'p.fk_product_type'=>"product", 'p.label'=>"product", 'p.description'=>"product", 'p.note'=>"product",
+				'p.price'=>"product", 'p.tva_tx'=>'product', 'p.tosell'=>"product", 'p.tobuy'=>"product", 'p.duration'=>"product",
+				'p.datec'=>'product', 'p.tms'=>'product', 'p.pmp'=>'product', 'p.cost_price'=>'product',
+				'pb.rowid'=>'batch', 'pb.batch'=>'batch', 'pb.qty'=>'batch',
+				'pl.eatby'=>'batch', 'pl.sellby'=>'batch'
+			);	// We define here only fields that use another icon that the one defined into export_icon
 			$this->export_aggregate_array[$r] = array('ps.reel'=>'SUM'); // TODO Not used yet
 			$this->export_dependencies_array[$r] = array('stockbatch'=>array('pb.rowid'), 'batch'=>array('pb.rowid')); // We must keep this until the aggregate_array is used. To add unique key if we ask a field of a child to avoid the DISTINCT to discard them.
 			$keyforselect = 'product_lot'; $keyforelement = 'batch'; $keyforaliasextra = 'extra';
 			include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+
 			$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 			$this->export_sql_end[$r]  = ' FROM ('.MAIN_DB_PREFIX.'product as p, '.MAIN_DB_PREFIX.'product_stock as ps, '.MAIN_DB_PREFIX.'product_batch as pb)';
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_lot as pl ON pl.fk_product = p.rowid AND pl.batch = pb.batch';
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_lot_extrafields as extra ON extra.fk_object = pl.rowid,';
 			$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'entrepot as e';
 			$this->export_sql_end[$r] .= ' WHERE p.rowid = ps.fk_product AND ps.fk_entrepot = e.rowid AND ps.rowid = pb.fk_product_stock';
-			$this->export_sql_end[$r] .= ' AND e.entity IN ('.getEntity('stock').')';
-		}
+			$this->export_sql_end[$r] .= ' AND e.entity IN ('.getEntity('stock').')';		}
 
-		// Export of stock movement
+		// Export of stock movements
 		$r++;
 		$this->export_code[$r] = $this->rights_class.'_movement';
 		$this->export_label[$r] = "StockMovements"; // Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_icon[$r] = "movement";
 		$this->export_permission[$r] = array(array("stock", "lire"));
 		$this->export_fields_array[$r] = array(
-			'e.rowid'=>'IdWarehouse', 'e.ref'=>'LocationSummary', 'e.description'=>'DescWareHouse', 'e.lieu'=>'LieuWareHouse', 'e.address'=>'Address', 'e.zip'=>'Zip',
-			'e.town'=>'Town', 'p.rowid'=>"ProductId", 'p.ref'=>"Ref", 'p.fk_product_type'=>"Type", 'p.label'=>"Label", 'p.description'=>"Description", 'p.note'=>"Note",
-			'p.price'=>"Price", 'p.tva_tx'=>'VAT', 'p.tosell'=>"OnSell", 'p.tobuy'=>'OnBuy', 'p.duration'=>"Duration", 'p.datec'=>'DateCreation',
-			'p.tms'=>'DateModification', 'sm.rowid'=>'MovementId', 'sm.value'=>'Qty', 'sm.datem'=>'DateMovement', 'sm.label'=>'MovementLabel',
-			'sm.inventorycode'=>'InventoryCode'
+			'sm.rowid'=>'MovementId', 'sm.value'=>'Qty', 'sm.datem'=>'DateMovement', 'sm.label'=>'MovementLabel', 'sm.inventorycode'=>'InventoryCode',
+			'e.rowid'=>'IdWarehouse', 'e.ref'=>'LocationSummary', 'e.description'=>'DescWareHouse', 'e.lieu'=>'LieuWareHouse', 'e.address'=>'Address', 'e.zip'=>'Zip', 'e.town'=>'Town',
+			'p.rowid'=>"ProductId", 'p.ref'=>"Ref", 'p.fk_product_type'=>"Type", 'p.label'=>"Label", 'p.description'=>"Description", 'p.note'=>"Note",
+			'p.price'=>"Price", 'p.tva_tx'=>'VAT', 'p.tosell'=>"OnSell", 'p.tobuy'=>'OnBuy', 'p.duration'=>"Duration", 'p.datec'=>'DateCreation', 'p.tms'=>'DateModification'
 		);
 		$this->export_TypeFields_array[$r] = array(
+			'sm.rowid'=>'Numeric', 'sm.value'=>'Numeric', 'sm.datem'=>'Date', 'sm.batch'=>'Text', 'sm.label'=>'Text', 'sm.inventorycode'=>'Text',
 			'e.rowid'=>'List:entrepot:ref::stock', 'e.ref'=>'Text', 'e.description'=>'Text', 'e.lieu'=>'Text', 'e.address'=>'Text', 'e.zip'=>'Text', 'e.town'=>'Text',
 			'p.rowid'=>"List:product:label::product", 'p.ref'=>"Text", 'p.fk_product_type'=>"Text", 'p.label'=>"Text", 'p.description'=>"Text", 'p.note'=>"Text",
-			'p.price'=>"Numeric", 'p.tva_tx'=>'Numeric', 'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean", 'p.duration'=>"Duree", 'p.datec'=>'Date', 'p.tms'=>'Date',
-			'sm.rowid'=>'Numeric', 'sm.value'=>'Numeric', 'sm.datem'=>'Date', 'sm.batch'=>'Text', 'sm.label'=>'Text', 'sm.inventorycode'=>'Text'
+			'p.price'=>"Numeric", 'p.tva_tx'=>'Numeric', 'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean", 'p.duration'=>"Duree", 'p.datec'=>'Date', 'p.tms'=>'Date'
 		);
 		$this->export_entities_array[$r] = array(
-			'e.rowid'=>'warehouse', 'e.ref'=>'warehouse', 'e.description'=>'warehouse', 'e.lieu'=>'warehouse', 'e.address'=>'warehouse', 'e.zip'=>'warehouse',
-			'e.town'=>'warehouse', 'p.rowid'=>"product", 'p.ref'=>"product", 'p.fk_product_type'=>"product", 'p.label'=>"product", 'p.description'=>"product",
-			'p.note'=>"product", 'p.price'=>"product", 'p.tva_tx'=>'product', 'p.tosell'=>"product", 'p.tobuy'=>"product", 'p.duration'=>"product", 'p.datec'=>'product',
-			'p.tms'=>'product', 'sm.rowid'=>'movement', 'sm.value'=>'movement', 'sm.datem'=>'movement', 'sm.label'=>'movement', 'sm.inventorycode'=>'movement'
-		);
+			'e.rowid'=>'warehouse', 'e.ref'=>'warehouse', 'e.description'=>'warehouse', 'e.lieu'=>'warehouse', 'e.address'=>'warehouse', 'e.zip'=>'warehouse', 'e.town'=>'warehouse',
+			'p.rowid'=>"product", 'p.ref'=>"product", 'p.fk_product_type'=>"product", 'p.label'=>"product", 'p.description'=>"product", 'p.note'=>"product",
+			'p.price'=>"product", 'p.tva_tx'=>'product', 'p.tosell'=>"product", 'p.tobuy'=>"product", 'p.duration'=>"product", 'p.datec'=>'product', 'p.tms'=>'product'
+		);	// We define here only fields that use another icon that the one defined into export_icon
 		if ($conf->productbatch->enabled)
 		{
 			$this->export_fields_array[$r]['sm.batch'] = 'Batch';
@@ -295,6 +332,7 @@ class modStock extends DolibarrModules
 		}
 		$this->export_aggregate_array[$r] = array('sm.value'=>'SUM'); // TODO Not used yet
 		$this->export_dependencies_array[$r] = array('movement'=>array('sm.rowid')); // We must keep this until the aggregate_array is used. To add unique key if we ask a field of a child to avoid the DISTINCT to discard them.
+
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p, '.MAIN_DB_PREFIX.'stock_mouvement as sm, '.MAIN_DB_PREFIX.'entrepot as e';
 		$this->export_sql_end[$r] .= ' WHERE p.rowid = sm.fk_product AND sm.fk_entrepot = e.rowid';
@@ -309,34 +347,48 @@ class modStock extends DolibarrModules
 		$r++;
 		$this->import_code[$r] = $this->rights_class.'_'.$r;
 		$this->import_label[$r] = "Warehouses"; // Translation key
-		$this->import_icon[$r] = $this->picto;
+		$this->import_icon[$r] = "warehouse";
 		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
 		$this->import_tables_array[$r] = array('e'=>MAIN_DB_PREFIX.'entrepot');
 		$this->import_tables_creator_array[$r] = array('e'=>'fk_user_author');
 		$this->import_fields_array[$r] = array('e.ref'=>"LocationSummary*",
-				'e.description'=>"DescWareHouse", 'e.lieu'=>"LieuWareHouse",
-				'e.address'=>"Address", 'e.zip'=>'Zip', 'e.fk_pays'=>'CountryCode',
+				'e.description'=>"DescWareHouse",
+				'e.lieu'=>"LieuWareHouse",
+				'e.address'=>"Address",
+				'e.zip'=>'Zip',
+				'e.fk_departement'=>'StateCode',
+				'e.fk_pays'=>'CountryCode',
+				'e.phone'=>'Phone',
+				'e.fax'=>'Fax',
 				'e.statut'=>'Status',
-                'e.fk_parent'=>'ParentWarehouse'
+				'e.fk_parent'=>'ParentWarehouse'
 		);
 
 		$this->import_convertvalue_array[$r] = array(
+				'e.fk_departement'=>array('rule'=>'fetchidfromcodeid', 'classfile'=>'/core/class/cstate.class.php', 'class'=>'Cstate', 'method'=>'fetch', 'dict'=>'DictionaryStateCode'),
 				'e.fk_pays'=>array('rule'=>'fetchidfromcodeid', 'classfile'=>'/core/class/ccountry.class.php', 'class'=>'Ccountry', 'method'=>'fetch', 'dict'=>'DictionaryCountry'),
-                'e.fk_parent'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/stock/class/entrepot.class.php', 'class'=>'Entrepot', 'method'=>'fetch', 'element'=>'ref')
+				'e.fk_parent'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/stock/class/entrepot.class.php', 'class'=>'Entrepot', 'method'=>'fetch', 'element'=>'ref')
 		);
 		$this->import_regex_array[$r] = array('e.statut'=>'^[0|1]');
 		$this->import_examplevalues_array[$r] = array('e.ref'=>"ALM001",
-				'e.description'=>"Central Warehouse", 'e.lieu'=>"Central",
-				'e.address'=>"Route 66", 'e.zip'=>'28080', 'e.fk_pays'=>'US',
+				'e.description'=>"Central Warehouse",
+				'e.lieu'=>"Central",
+				'e.address'=>"Route 66",
+				'e.zip'=>'28080',
+				'e.fk_departement'=>'matches field "code_departement" in table "'.MAIN_DB_PREFIX.'c_departements"',
+				'e.fk_pays'=>'US/FR/DE etc. matches field "code" in table "'.MAIN_DB_PREFIX.'c_country"',
+				'e.phone'=>'(+33)(0)123456789',
+				'e.fax'=>'(+33)(0)123456790',
 				'e.statut'=>'1',
-                'e.fk_parent'=>''
+                'e.fk_parent'=>'id or ref of warehouse'
         );
+        $this->import_updatekeys_array[$r] = array('p.ref'=>'Ref');
 
 		// Import stocks
 		$r++;
 		$this->import_code[$r] = $this->rights_class.'_'.$r;
 		$this->import_label[$r] = "Stocks"; // Translation key
-		$this->import_icon[$r] = $this->picto;
+		$this->import_icon[$r] = "stock";
 		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
 		$this->import_tables_array[$r] = array('ps'=>MAIN_DB_PREFIX.'product_stock');
 		$this->import_fields_array[$r] = array('ps.fk_product'=>"Product*", 'ps.fk_entrepot'=>"Warehouse*", 'ps.reel'=>"Stock*");
@@ -346,11 +398,11 @@ class modStock extends DolibarrModules
 			'ps.fk_entrepot'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/stock/class/entrepot.class.php', 'class'=>'Entrepot', 'method'=>'fetch', 'element'=>'ref')
 		  );
 		$this->import_examplevalues_array[$r] = array(
-		    'ps.fk_product'=>"PREF123456", 'ps.fk_entrepot'=>"ALM001", 'ps.reel'=>"10"
+		    'ps.fk_product'=>"id or ref of product", 'ps.fk_entrepot'=>"id or ref of warehouse", 'ps.reel'=>"10"
 		);
 		$this->import_updatekeys_array[$r] = array('ps.fk_product'=>'Product', 'ps.fk_entrepot'=>"Warehouse");
 		$this->import_run_sql_after_array[$r] = array(    // Because we may change data that are denormalized, we must update dernormalized data after.
-		    'UPDATE '.MAIN_DB_PREFIX.'product p SET p.stock= (SELECT SUM(ps.reel) FROM '.MAIN_DB_PREFIX.'product_stock ps WHERE ps.fk_product = p.rowid);'
+			'UPDATE '.MAIN_DB_PREFIX.'product p SET p.stock= (SELECT SUM(ps.reel) FROM '.MAIN_DB_PREFIX.'product_stock ps WHERE ps.fk_product = p.rowid);'
 		);
 	}
 
diff --git a/htdocs/core/modules/modStripe.class.php b/htdocs/core/modules/modStripe.class.php
index e7a29deeae6..4d95a6329ba 100644
--- a/htdocs/core/modules/modStripe.class.php
+++ b/htdocs/core/modules/modStripe.class.php
@@ -31,68 +31,68 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modStripe extends DolibarrModules
 {
-    /**
-     *   Constructor. Define names, constants, directories, boxes, permissions
-     *
-     *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-        // Id for module (must be unique).
-        // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-        $this->numero = 50300;
-        // Key text used to identify module (for permissions, menus, etc...)
-        $this->rights_class = 'stripe';
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 50300;
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'stripe';
 
-        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-        // It is used to group modules in module setup page
-        $this->family = "interface";
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-        $this->description = "Module to offer an online payment page by credit card with Stripe";
-        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
-        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-        // If file is in module/img directory, use this->picto=DOL_URL_ROOT.'/module/img/file.png'
-        $this->picto = 'stripe';
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
+		$this->family = "interface";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		$this->description = "Module to offer an online payment page by credit card with Stripe";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'dolibarr';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory, use this->picto=DOL_URL_ROOT.'/module/img/file.png'
+		$this->picto = 'stripe';
 
-        // Data directories to create when module is enabled.
-        $this->dirs = array();
+		// Data directories to create when module is enabled.
+		$this->dirs = array();
 
-        // Config pages. Put here list of php page names stored in admin directory used to setup module.
-        $this->config_page_url = array("stripe.php@stripe");
+		// Config pages. Put here list of php page names stored in admin directory used to setup module.
+		$this->config_page_url = array("stripe.php@stripe");
 
-        // Dependencies
-        $this->hidden = false; // A condition to hide module
-        $this->depends = array(); // List of modules id that must be enabled if this module is enabled
-        $this->requiredby = array(); // List of modules id to disable if this one is disabled
-        $this->phpmin = array(5, 4); // Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(5, 0); // Minimum version of Dolibarr required by module
-        $this->langfiles = array("stripe");
+		// Dependencies
+		$this->hidden = false; // A condition to hide module
+		$this->depends = array(); // List of modules id that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of modules id to disable if this one is disabled
+		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(5, 0); // Minimum version of Dolibarr required by module
+		$this->langfiles = array("stripe");
 
-        // Constants
-        $this->const = array(); // List of particular constants to add when module is enabled
+		// Constants
+		$this->const = array(); // List of particular constants to add when module is enabled
 
-        // New pages on tabs
-        $this->tabs = array();
+		// New pages on tabs
+		$this->tabs = array();
 
-        // List of boxes
-        $this->boxes = array();
-        $r = 0;
+		// List of boxes
+		$this->boxes = array();
+		$r = 0;
 
-        // Permissions
-        $this->rights = array(); // Permission array used by this module
-        $r = 0;
+		// Permissions
+		$this->rights = array(); // Permission array used by this module
+		$r = 0;
 
-        // Main menu entries
-        $r = 0;
-        /* $this->menu[$r]=array(
+		// Main menu entries
+		$r = 0;
+		/* $this->menu[$r]=array(
             'fk_menu'=>'fk_mainmenu=billing,fk_leftmenu=customers_bills_payment',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 	        'mainmenu'=>'billing',
         	'leftmenu'=>'customers_bills_payment_stripe',
@@ -108,8 +108,8 @@ class modStripe extends DolibarrModules
         );				                // 0=Menu for internal users, 1=external users, 2=both
         $r++;*/
 
-        $this->menu[$r] = array(
-        	'fk_menu'=>'fk_mainmenu=bank',
+		$this->menu[$r] = array(
+			'fk_menu'=>'fk_mainmenu=bank',
 			'type'=>'left',
 			'titre'=>'StripeAccount',
 			'mainmenu'=>'bank',
@@ -123,7 +123,7 @@ class modStripe extends DolibarrModules
 			'user' => 0
 		);
 
-        $r++;
+		$r++;
 		$this->menu[$r] = array(
 			'fk_menu' => 'fk_mainmenu=bank,fk_leftmenu=stripe',
 			'type' => 'left',
@@ -137,7 +137,7 @@ class modStripe extends DolibarrModules
 			'user' => 0
 		);
 
-        $r++;
+		$r++;
 		$this->menu[$r] = array(
 			'fk_menu' => 'fk_mainmenu=bank,fk_leftmenu=stripe',
 			'type' => 'left',
@@ -151,8 +151,8 @@ class modStripe extends DolibarrModules
 			'user' => 0
 		);
 
-        $r++;
-	    $this->menu[$r] = array(
+		$r++;
+		$this->menu[$r] = array(
 			'fk_menu' => 'fk_mainmenu=bank,fk_leftmenu=stripe',
 			'type' => 'left',
 			'titre' => 'StripePayoutList',
@@ -165,7 +165,7 @@ class modStripe extends DolibarrModules
 			'user' => 0
 		);
 
-        // Exports
-        $r = 1;
-    }
+		// Exports
+		$r = 1;
+	}
 }
diff --git a/htdocs/core/modules/modSupplierProposal.class.php b/htdocs/core/modules/modSupplierProposal.class.php
index 0deea28f4b1..6074966b4b1 100644
--- a/htdocs/core/modules/modSupplierProposal.class.php
+++ b/htdocs/core/modules/modSupplierProposal.class.php
@@ -63,7 +63,7 @@ class modSupplierProposal extends DolibarrModules
 		$this->dirs = array();
 
 		 // Config pages. Put here list of php page names stored in admin directory used to setup module.
-        $this->config_page_url = array("supplier_proposal.php");
+		$this->config_page_url = array("supplier_proposal.php");
 
 		// Dependencies
 		$this->hidden = false; // A condition to hide module
@@ -127,7 +127,7 @@ class modSupplierProposal extends DolibarrModules
 		$this->rights[$r][0] = $this->numero + $r; // id de la permission
 		$this->rights[$r][1] = 'Envoyer les demandes fournisseurs'; // libelle de la permission
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-        $this->rights[$r][4] = 'send_advance';
+		$this->rights[$r][4] = 'send_advance';
 
 		$r++;
 		$this->rights[$r][0] = $this->numero + $r; // id de la permission
@@ -152,10 +152,10 @@ class modSupplierProposal extends DolibarrModules
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
-    public function init($options = '')
+	public function init($options = '')
 	{
 		global $conf, $langs;
 
@@ -200,10 +200,10 @@ class modSupplierProposal extends DolibarrModules
 	 */
 	public function remove($options = '')
 	{
-	    $sql = array(
-	        "DELETE FROM ".MAIN_DB_PREFIX."rights_def WHERE module = 'askpricesupplier'"		// To delete/clean deprecated entries
-	    );
+		$sql = array(
+			"DELETE FROM ".MAIN_DB_PREFIX."rights_def WHERE module = 'askpricesupplier'"		// To delete/clean deprecated entries
+		);
 
-	    return $this->_remove($sql, $options);
+		return $this->_remove($sql, $options);
 	}
 }
diff --git a/htdocs/core/modules/modTakePos.class.php b/htdocs/core/modules/modTakePos.class.php
index 7ff90c2bd6c..e8162ebf570 100644
--- a/htdocs/core/modules/modTakePos.class.php
+++ b/htdocs/core/modules/modTakePos.class.php
@@ -39,9 +39,9 @@ class modTakePos extends DolibarrModules
 	 */
 	public function __construct($db)
 	{
-        global $langs, $conf;
+		global $langs, $conf;
 
-        $this->db = $db;
+		$this->db = $db;
 
 		// Id for module (must be unique).
 		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
@@ -78,16 +78,16 @@ class modTakePos extends DolibarrModules
 		// for specific path of parts (eg: /takepos/core/modules/barcode)
 		// for specific css file (eg: /takepos/css/takepos.css.php)
 		$this->module_parts = array(
-		                        	'triggers' => 0, // Set this to 1 if module has its own trigger directory (core/triggers)
+									'triggers' => 0, // Set this to 1 if module has its own trigger directory (core/triggers)
 									'login' => 0, // Set this to 1 if module has its own login method file (core/login)
 									'substitutions' => 1, // Set this to 1 if module has its own substitution function file (core/substitutions)
 									'menus' => 0, // Set this to 1 if module has its own menus handler directory (core/menus)
 									'theme' => 0, // Set this to 1 if module has its own theme directory (theme)
-		                        	'tpl' => 0, // Set this to 1 if module overwrite template dir (core/tpl)
+									'tpl' => 0, // Set this to 1 if module overwrite template dir (core/tpl)
 									'barcode' => 0, // Set this to 1 if module has its own barcode directory (core/modules/barcode)
 									'models' => 0, // Set this to 1 if module has its own models directory (core/modules/xxx)
 									'hooks' => array() 	                                // Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context 'all'
-		                        );
+								);
 
 		// Data directories to create when module is enabled.
 		// Example: this->dirs = array("/takepos/temp","/takepos/subdir");
@@ -127,13 +127,13 @@ class modTakePos extends DolibarrModules
 
 
 		// Array to add new pages in new tabs
-        $this->tabs = array();
+		$this->tabs = array();
 		// Example:
 		// $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@takepos:$user->rights->takepos->read:/takepos/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
-        // $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@takepos:$user->rights->othermodule->read:/takepos/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
-        // $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
-        //
-        // Where objecttype can be
+		// $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@takepos:$user->rights->othermodule->read:/takepos/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
+		// $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
+		//
+		// Where objecttype can be
 		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
 		// 'contact'          to add a tab in contact view
 		// 'contract'         to add a tab in contract view
@@ -155,9 +155,9 @@ class modTakePos extends DolibarrModules
 		// 'user'             to add a tab in user view
 
 
-        // Dictionaries
+		// Dictionaries
 		$this->dictionaries = array();
-        /* Example:
+		/* Example:
         $this->dictionaries=array(
             'langs'=>'mylangfile@takepos',
             'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
@@ -173,13 +173,13 @@ class modTakePos extends DolibarrModules
         */
 
 
-        // Boxes/Widgets
+		// Boxes/Widgets
 		// Add here list of php file(s) stored in takepos/core/boxes that contains class to show a widget.
-        $this->boxes = array(
-        	//0=>array('file'=>'takeposwidget1.php@takepos','note'=>'Widget provided by TakePos','enabledbydefaulton'=>'Home'),
-        	//1=>array('file'=>'takeposwidget2.php@takepos','note'=>'Widget provided by TakePos'),
-        	//2=>array('file'=>'takeposwidget3.php@takepos','note'=>'Widget provided by TakePos')
-        );
+		$this->boxes = array(
+			//0=>array('file'=>'takeposwidget1.php@takepos','note'=>'Widget provided by TakePos','enabledbydefaulton'=>'Home'),
+			//1=>array('file'=>'takeposwidget2.php@takepos','note'=>'Widget provided by TakePos'),
+			//2=>array('file'=>'takeposwidget3.php@takepos','note'=>'Widget provided by TakePos')
+		);
 
 
 		// Cronjobs (List of cron jobs entries to add when module is enabled)
@@ -260,7 +260,7 @@ class modTakePos extends DolibarrModules
 	 *	The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *	It also creates data directories
 	 *
-     *	@param      string	$options    Options when enabling module ('', 'noboxes')
+	 *	@param      string	$options    Options when enabling module ('', 'noboxes')
 	 *	@return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
diff --git a/htdocs/core/modules/modTax.class.php b/htdocs/core/modules/modTax.class.php
index cc093225afc..3e2a62e099a 100644
--- a/htdocs/core/modules/modTax.class.php
+++ b/htdocs/core/modules/modTax.class.php
@@ -147,14 +147,14 @@ class modTax extends DolibarrModules
 		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
 		$this->import_tables_array[$r] = array('t'=>MAIN_DB_PREFIX.'chargesociales');
 		$this->import_fields_array[$r] = array('t.libelle'=>"Label*", 't.fk_type'=>"Type",
-		    't.amount'=>"Amount*", 't.date_ech'=>"DateDue*", 't.periode'=>"PeriodEndDate*"
+			't.amount'=>"Amount*", 't.date_ech'=>"DateDue*", 't.periode'=>"PeriodEndDate*"
 		);
 
 		$this->import_convertvalue_array[$r] = array(
-		    't.fk_type'=>array('rule'=>'fetchidfromref', 'classfile'=>'/compta/sociales/class/cchargesociales.class.php', 'class'=>'Cchargesociales', 'method'=>'fetch', 'element'=>'Cchargesociales')
+			't.fk_type'=>array('rule'=>'fetchidfromref', 'classfile'=>'/compta/sociales/class/cchargesociales.class.php', 'class'=>'Cchargesociales', 'method'=>'fetch', 'element'=>'Cchargesociales')
 		);
 		$this->import_examplevalues_array[$r] = array('t.libelle'=>"Social/fiscal contribution", 't.fk_type'=>"TAXPRO (must be id or code found into dictionary)",
-		    't.date_ech'=>"2016-01-01", 't.periode'=>"2016-01-01"
+			't.date_ech'=>"2016-01-01", 't.periode'=>"2016-01-01"
 		);
 
 		// Import Taxes
@@ -165,14 +165,14 @@ class modTax extends DolibarrModules
 		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
 		$this->import_tables_array[$r] = array('t'=>MAIN_DB_PREFIX.'tva');
 		$this->import_fields_array[$r] = array('t.datep'=>"DatePayment*", 't.datev'=>"DateValue*", 't.label'=>"Label*", 't.fk_typepayment'=>"PaymentMode*",
-		    't.amount'=>"Amount*", 't.num_payment'=>'Numero'
+			't.amount'=>"Amount*", 't.num_payment'=>'Numero'
 		);
 
 		$this->import_convertvalue_array[$r] = array(
-		    't.fk_typepayment'=>array('rule'=>'fetchidfromref', 'classfile'=>'/compta/paiement/class/cpaiement.class.php', 'class'=>'Cpaiement', 'method'=>'fetch', 'element'=>'Cpaiement')
+			't.fk_typepayment'=>array('rule'=>'fetchidfromref', 'classfile'=>'/compta/paiement/class/cpaiement.class.php', 'class'=>'Cpaiement', 'method'=>'fetch', 'element'=>'Cpaiement')
 		);
 		$this->import_examplevalues_array[$r] = array('t.label'=>"VAT Payment 1st quarter 2016", 't.fk_typepayment'=>"CHQ (must be id or code found into dictionary)",
-		    't.datep'=>"2016-04-02", 't.datev'=>"2016-03-31", 't.amount'=>1000, 't.num_payment'=>'123456'
+			't.datep'=>"2016-04-02", 't.datev'=>"2016-03-31", 't.amount'=>1000, 't.num_payment'=>'123456'
 		);
 	}
 
@@ -182,7 +182,7 @@ class modTax extends DolibarrModules
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index 0b5e54e9637..def2a7f7e69 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -32,267 +32,262 @@ require_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";
  */
 class modTicket extends DolibarrModules
 {
-    /**
-     *     Constructor. Define names, constants, directories, boxes, permissions
-     *
-     *     @param DoliDB $db Database handler
-     */
-    public function __construct($db)
-    {
-        global $langs, $conf;
+	/**
+	 *     Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *     @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		global $langs, $conf;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        // Id for module (must be unique).
-        // Use a free id here
-        // (See in Home -> System information -> Dolibarr for list of used modules id).
-        $this->numero = 56000;
-        // Key text used to identify module (for permissions, menus, etc...)
-        $this->rights_class = 'ticket';
+		// Id for module (must be unique).
+		// Use a free id here
+		// (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 56000;
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'ticket';
 
-        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-        // It is used to group modules in module setup page
-        $this->family = "crm";
-        // Module position in the family
-        $this->module_position = '60';
-        // Module label (no space allowed)
-        // used if translation string 'ModuleXXXName' not found
-        // (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        // Module description
-        // used if translation string 'ModuleXXXDesc' not found
-        // (where XXX is value of numeric property 'numero' of module)
-        $this->description = "Incident/support ticket management";
-        // Possible values for version are: 'development', 'experimental' or version
-        $this->version = 'dolibarr';
-        // Key used in llx_const table to save module status enabled/disabled
-        // (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        // If file is in theme/yourtheme/img directory under name object_pictovalue.png
-        // use this->picto='pictovalue'
-        // If file is in module/img directory under name object_pictovalue.png
-        // use this->picto='pictovalue@module'
-        $this->picto = 'ticket'; // mypicto@ticket
-        // Defined all module parts (triggers, login, substitutions, menus, css, etc...)
-        // for default path (eg: /ticket/core/xxxxx) (0=disable, 1=enable)
-        // for specific path of parts (eg: /ticket/core/modules/barcode)
-        // for specific css file (eg: /ticket/css/ticket.css.php)
-        $this->module_parts = array(
-            // Set this to 1 if module has its own trigger directory
-            'triggers' => 1,
-        );
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
+		$this->family = "crm";
+		// Module position in the family
+		$this->module_position = '60';
+		// Module label (no space allowed)
+		// used if translation string 'ModuleXXXName' not found
+		// (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		// Module description
+		// used if translation string 'ModuleXXXDesc' not found
+		// (where XXX is value of numeric property 'numero' of module)
+		$this->description = "Incident/support ticket management";
+		// Possible values for version are: 'development', 'experimental' or version
+		$this->version = 'dolibarr';
+		// Key used in llx_const table to save module status enabled/disabled
+		// (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png
+		// use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png
+		// use this->picto='pictovalue@module'
+		$this->picto = 'ticket'; // mypicto@ticket
+		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
+		// for default path (eg: /ticket/core/xxxxx) (0=disable, 1=enable)
+		// for specific path of parts (eg: /ticket/core/modules/barcode)
+		// for specific css file (eg: /ticket/css/ticket.css.php)
+		$this->module_parts = array(
+			// Set this to 1 if module has its own trigger directory
+			'triggers' => 1,
+		);
 
-        // Data directories to create when module is enabled.
-        // Example: this->dirs = array("/ticket/temp");
-        $this->dirs = array();
+		// Data directories to create when module is enabled.
+		// Example: this->dirs = array("/ticket/temp");
+		$this->dirs = array();
 
-        // Config pages. Put here list of php pages
-        // stored into ticket/admin directory, used to setup module.
-        $this->config_page_url = array("ticket.php");
+		// Config pages. Put here list of php pages
+		// stored into ticket/admin directory, used to setup module.
+		$this->config_page_url = array("ticket.php");
 
-        // Dependencies
-        $this->hidden = false; // A condition to hide module
+		// Dependencies
+		$this->hidden = false; // A condition to hide module
 		$this->depends = array('modAgenda'); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
-        $this->langfiles = array("ticket");
+		$this->langfiles = array("ticket");
 
-        // Constants
-        // List of particular constants to add when module is enabled
-        // (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-        // Example:
-        $this->const = array(
-            1 => array('TICKET_ENABLE_PUBLIC_INTERFACE', 'chaine', '0', 'Enable ticket public interface', 0),
-            2 => array('TICKET_ADDON', 'chaine', 'mod_ticket_simple', 'Ticket ref module', 0)
-        );
+		// Constants
+		// List of particular constants to add when module is enabled
+		// (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example:
+		$this->const = array(
+			1 => array('TICKET_ENABLE_PUBLIC_INTERFACE', 'chaine', '0', 'Enable ticket public interface', 0),
+			2 => array('TICKET_ADDON', 'chaine', 'mod_ticket_simple', 'Ticket ref module', 0)
+		);
 
-        $this->tabs = array(
-            'thirdparty:+ticket:Tickets:@ticket:$user->rights->ticket->read:/ticket/list.php?socid=__ID__',
-            'project:+ticket:Tickets:@ticket:$user->rights->ticket->read:/ticket/list.php?projectid=__ID__',
-        );
+		$this->tabs = array(
+			'thirdparty:+ticket:Tickets:@ticket:$user->rights->ticket->read:/ticket/list.php?socid=__ID__',
+			'project:+ticket:Tickets:@ticket:$user->rights->ticket->read:/ticket/list.php?projectid=__ID__',
+		);
 
-        // Dictionaries
-        if (!isset($conf->ticket->enabled)) {
-            $conf->ticket = new stdClass();
-            $conf->ticket->enabled = 0;
-        }
-        $this->dictionaries = array(
-            'langs' => 'ticket',
-        	'tabname' => array(MAIN_DB_PREFIX."c_ticket_type", MAIN_DB_PREFIX."c_ticket_severity", MAIN_DB_PREFIX."c_ticket_category", MAIN_DB_PREFIX."c_ticket_resolution"),
-        	'tablib' => array("TicketDictType", "TicketDictSeverity", "TicketDictCategory", "TicketDictResolution"),
-        	'tabsql' => array(
-        		'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_type as f',
-        		'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_severity as f',
-        		'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_category as f',
-        		'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_resolution as f'
-        	),
-        	'tabsqlsort' => array("pos ASC", "pos ASC", "pos ASC", "pos ASC"),
-        	'tabfield' => array("pos,code,label,use_default", "pos,code,label,use_default", "pos,code,label,use_default", "pos,code,label,use_default"),
-        	'tabfieldvalue' => array("pos,code,label,use_default", "pos,code,label,use_default", "pos,code,label,use_default", "pos,code,label,use_default"),
-        	'tabfieldinsert' => array("pos,code,label,use_default", "pos,code,label,use_default", "pos,code,label,use_default", "pos,code,label,use_default"),
-            'tabrowid' => array("rowid", "rowid", "rowid", "rowid"),
-        	'tabcond' => array($conf->ticket->enabled, $conf->ticket->enabled, $conf->ticket->enabled, $conf->ticket->enabled),
-        	'tabhelp' => array(array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")), array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")), array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")), array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1"))),
-        );
+		// Dictionaries
+		if (!isset($conf->ticket->enabled)) {
+			$conf->ticket = new stdClass();
+			$conf->ticket->enabled = 0;
+		}
+		$this->dictionaries = array(
+			'langs' => 'ticket',
+			'tabname' => array(MAIN_DB_PREFIX."c_ticket_type", MAIN_DB_PREFIX."c_ticket_severity", MAIN_DB_PREFIX."c_ticket_category", MAIN_DB_PREFIX."c_ticket_resolution"),
+			'tablib' => array("TicketDictType", "TicketDictSeverity", "TicketDictCategory", "TicketDictResolution"),
+			'tabsql' => array(
+				'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_type as f',
+				'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_severity as f',
+				'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_category as f',
+				'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_resolution as f'
+			),
+			'tabsqlsort' => array("pos ASC", "pos ASC", "pos ASC", "pos ASC"),
+			'tabfield' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default"),
+			'tabfieldvalue' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default"),
+			'tabfieldinsert' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default"),
+			'tabrowid' => array("rowid", "rowid", "rowid", "rowid"),
+			'tabcond' => array($conf->ticket->enabled, $conf->ticket->enabled, $conf->ticket->enabled, $conf->ticket->enabled),
+			'tabhelp' => array(array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")), array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")), array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")), array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1"))),
+		);
 
-        // Boxes
-        // Add here list of php file(s) stored in core/boxes that contains class to show a box.
-        $this->boxes = array(); // Boxes list
-        $r = 0;
-        // Example:
+		// Boxes
+		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
+		$this->boxes = array(
+			0=>array('file'=>'box_last_ticket.php', 'enabledbydefaulton'=>'Home'),
+			1=>array('file'=>'box_last_modified_ticket.php', 'enabledbydefaulton'=>'Home')
+		); // Boxes list
 
-        $this->boxes[$r][1] = "box_last_ticket";
-        $r++;
+		// Permissions
+		$this->rights = array(); // Permission array used by this module
 
-        $this->boxes[$r][1] = "box_last_modified_ticket";
-        $r++;
+		$r = 0;
+		$this->rights[$r][0] = 56001; // id de la permission
+		$this->rights[$r][1] = "Read ticket"; // libelle de la permission
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][4] = 'read';
 
-        // Permissions
-        $this->rights = array(); // Permission array used by this module
+		$r++;
+		$this->rights[$r][0] = 56002; // id de la permission
+		$this->rights[$r][1] = "Create les tickets"; // libelle de la permission
+		$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][4] = 'write';
 
-        $r = 0;
-        $this->rights[$r][0] = 56001; // id de la permission
-        $this->rights[$r][1] = "Read ticket"; // libelle de la permission
-        $this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-        $this->rights[$r][4] = 'read';
+		$r++;
+		$this->rights[$r][0] = 56003; // id de la permission
+		$this->rights[$r][1] = "Delete les tickets"; // libelle de la permission
+		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][4] = 'delete';
 
-        $r++;
-        $this->rights[$r][0] = 56002; // id de la permission
-        $this->rights[$r][1] = "Create les tickets"; // libelle de la permission
-        $this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
-        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-        $this->rights[$r][4] = 'write';
+		$r++;
+		$this->rights[$r][0] = 56004; // id de la permission
+		$this->rights[$r][1] = "Manage tickets"; // libelle de la permission
+		//$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][4] = 'manage';
 
-        $r++;
-        $this->rights[$r][0] = 56003; // id de la permission
-        $this->rights[$r][1] = "Delete les tickets"; // libelle de la permission
-        $this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-        $this->rights[$r][4] = 'delete';
+		$r++;
+		$this->rights[$r][0] = 56005; // id de la permission
+		$this->rights[$r][1] = 'See all tickets, even if not assigned to (not effective for external users, always restricted to the thirdpardy they depends on)'; // libelle de la permission
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][4] = 'view';
+		$this->rights[$r][5] = 'all';
 
-        $r++;
-        $this->rights[$r][0] = 56004; // id de la permission
-        $this->rights[$r][1] = "Manage tickets"; // libelle de la permission
-        //$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-        $this->rights[$r][4] = 'manage';
+		// Main menu entries
+		$this->menus = array(); // List of menus to add
+		$r = 0;
 
-        $r++;
-        $this->rights[$r][0] = 56005; // id de la permission
-        $this->rights[$r][1] = 'See all tickets, even if not assigned to (not effective for external users, always restricted to the thirdpardy they depends on)'; // libelle de la permission
-        $this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-        $this->rights[$r][4] = 'view';
-        $this->rights[$r][5] = 'all';
+		$this->menu[$r] = array('fk_menu' => 0, // Put 0 if this is a top menu
+			'type' => 'top', // This is a Top menu entry
+			'titre' => 'Ticket',
+			'mainmenu' => 'ticket',
+			'leftmenu' => '1', // Use 1 if you also want to add left menu entries using this descriptor.
+			'url' => '/ticket/index.php',
+			'langs' => 'ticket', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position' => 88,
+			'enabled' => '$conf->ticket->enabled', // Define condition to show or hide menu entry. Use '$conf->ticket->enabled' if entry must be visible if module is enabled.
+			'perms' => '$user->rights->ticket->read', // Use 'perms'=>'$user->rights->ticket->level1->level2' if you want your menu with a permission rules
+			'target' => '',
+			'user' => 2); // 0=Menu for internal users, 1=external users, 2=both
+		$r++;
 
-        // Main menu entries
-        $this->menus = array(); // List of menus to add
-        $r = 0;
+		$this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket',
+			'type' => 'left',
+			'titre' => 'Ticket',
+			'mainmenu' => 'ticket',
+			'leftmenu' => 'ticket',
+			'url' => '/ticket/index.php',
+			'langs' => 'ticket',
+			'position' => 101,
+			'enabled' => '$conf->ticket->enabled',
+			'perms' => '$user->rights->ticket->read',
+			'target' => '',
+			'user' => 2);
+		$r++;
 
-        $this->menu[$r] = array('fk_menu' => 0, // Put 0 if this is a top menu
-            'type' => 'top', // This is a Top menu entry
-            'titre' => 'Ticket',
-            'mainmenu' => 'ticket',
-            'leftmenu' => '1', // Use 1 if you also want to add left menu entries using this descriptor.
-            'url' => '/ticket/index.php',
-            'langs' => 'ticket', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-            'position' => 88,
-            'enabled' => '$conf->ticket->enabled', // Define condition to show or hide menu entry. Use '$conf->ticket->enabled' if entry must be visible if module is enabled.
-            'perms' => '$user->rights->ticket->read', // Use 'perms'=>'$user->rights->ticket->level1->level2' if you want your menu with a permission rules
-            'target' => '',
-            'user' => 2); // 0=Menu for internal users, 1=external users, 2=both
-        $r++;
+		$this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=ticket',
+			'type' => 'left',
+			'titre' => 'NewTicket',
+			'mainmenu' => 'ticket',
+			'url' => '/ticket/card.php?action=create',
+			'langs' => 'ticket',
+			'position' => 102,
+			'enabled' => '$conf->ticket->enabled',
+			'perms' => '$user->rights->ticket->write',
+			'target' => '',
+			'user' => 2);
+		$r++;
 
-        $this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket',
-            'type' => 'left',
-            'titre' => 'Ticket',
-            'mainmenu' => 'ticket',
-            'leftmenu' => 'ticket',
-            'url' => '/ticket/index.php',
-            'langs' => 'ticket',
-            'position' => 101,
-            'enabled' => '$conf->ticket->enabled',
-            'perms' => '$user->rights->ticket->read',
-            'target' => '',
-            'user' => 2);
-        $r++;
+		$this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=ticket',
+			'type' => 'left',
+			'titre' => 'List',
+			'mainmenu' => 'ticket',
+			'leftmenu' => 'ticketlist',
+			'url' => '/ticket/list.php?search_fk_status=non_closed',
+			'langs' => 'ticket',
+			'position' => 103,
+			'enabled' => '$conf->ticket->enabled',
+			'perms' => '$user->rights->ticket->read',
+			'target' => '',
+			'user' => 2);
+		$r++;
 
-        $this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=ticket',
-            'type' => 'left',
-            'titre' => 'NewTicket',
-            'mainmenu' => 'ticket',
-            'url' => '/ticket/card.php?action=create',
-            'langs' => 'ticket',
-            'position' => 102,
-            'enabled' => '$conf->ticket->enabled',
-            'perms' => '$user->rights->ticket->write',
-            'target' => '',
-            'user' => 2);
-        $r++;
+		$this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=ticket',
+			'type' => 'left',
+			'titre' => 'MenuTicketMyAssign',
+			'mainmenu' => 'ticket',
+			'leftmenu' => 'ticketmy',
+			'url' => '/ticket/list.php?mode=mine&search_fk_status=non_closed',
+			'langs' => 'ticket',
+			'position' => 105,
+			'enabled' => '$conf->ticket->enabled',
+			'perms' => '$user->rights->ticket->read',
+			'target' => '',
+			'user' => 0);
+		$r++;
 
-        $this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=ticket',
-            'type' => 'left',
-            'titre' => 'List',
-            'mainmenu' => 'ticket',
-            'leftmenu' => 'ticketlist',
-            'url' => '/ticket/list.php?search_fk_status=non_closed',
-            'langs' => 'ticket',
-            'position' => 103,
-            'enabled' => '$conf->ticket->enabled',
-            'perms' => '$user->rights->ticket->read',
-            'target' => '',
-            'user' => 2);
-        $r++;
+		$this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=ticket',
+			'type' => 'left',
+			'titre' => 'Statistics',
+			'mainmenu' => 'ticket',
+			'url' => '/ticket/stats/index.php',
+			'langs' => 'ticket',
+			'position' => 107,
+			'enabled' => '$conf->ticket->enabled',
+			'perms' => '$user->rights->ticket->read',
+			'target' => '',
+			'user' => 0);
+		$r++;
+	}
 
-        $this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=ticket',
-            'type' => 'left',
-            'titre' => 'MenuTicketMyAssign',
-            'mainmenu' => 'ticket',
-            'leftmenu' => 'ticketmy',
-            'url' => '/ticket/list.php?mode=mine&search_fk_status=non_closed',
-            'langs' => 'ticket',
-            'position' => 105,
-            'enabled' => '$conf->ticket->enabled',
-            'perms' => '$user->rights->ticket->read',
-            'target' => '',
-            'user' => 0);
-        $r++;
+	/**
+	 *	Function called when module is enabled.
+	 *	The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *	It also creates data directories
+	 *
+	 *	@param      string	$options    Options when enabling module ('', 'noboxes')
+	 *	@return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
 
-        $this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=ticket',
-            'type' => 'left',
-            'titre' => 'Statistics',
-            'mainmenu' => 'ticket',
-            'url' => '/ticket/stats/index.php',
-            'langs' => 'ticket',
-            'position' => 107,
-            'enabled' => '$conf->ticket->enabled',
-            'perms' => '$user->rights->ticket->read',
-            'target' => '',
-            'user' => 0);
-        $r++;
-    }
+		$sql = array(
+			array("sql" => "insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (110120, 'ticket',  'internal', 'SUPPORTTEC', 'Utilisateur assigné au ticket', 1);", "ignoreerror" => 1),
+			array("sql" => "insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (110121, 'ticket',  'internal', 'CONTRIBUTOR', 'Intervenant', 1);", "ignoreerror" => 1),
+			array("sql" => "insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (110122, 'ticket',  'external', 'SUPPORTCLI', 'Contact client suivi incident', 1);", "ignoreerror" => 1),
+			array("sql" => "insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (110123, 'ticket',  'external', 'CONTRIBUTOR', 'Intervenant', 1);", "ignoreerror" => 1),
+		);
 
-    /**
-     *	Function called when module is enabled.
-     *	The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *	It also creates data directories
-     *
-     *	@param      string	$options    Options when enabling module ('', 'noboxes')
-     *	@return     int             	1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-
-        $sql = array(
-            array("sql" => "insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (110120, 'ticket',  'internal', 'SUPPORTTEC', 'Utilisateur assigné au ticket', 1);", "ignoreerror" => 1),
-            array("sql" => "insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (110121, 'ticket',  'internal', 'CONTRIBUTOR', 'Intervenant', 1);", "ignoreerror" => 1),
-            array("sql" => "insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (110122, 'ticket',  'external', 'SUPPORTCLI', 'Contact client suivi incident', 1);", "ignoreerror" => 1),
-            array("sql" => "insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (110123, 'ticket',  'external', 'CONTRIBUTOR', 'Intervenant', 1);", "ignoreerror" => 1),
-        );
-
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index 56e08ee7644..4b397df65e4 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -77,8 +77,8 @@ class modUser extends DolibarrModules
 
 		// Boxes
 		$this->boxes = array(
-		    0=>array('file'=>'box_lastlogin.php', 'enabledbydefaulton'=>'Home'),
-            1=>array('file'=>'box_birthdays.php', 'enabledbydefaulton'=>'Home')
+			0=>array('file'=>'box_lastlogin.php', 'enabledbydefaulton'=>'Home'),
+			1=>array('file'=>'box_birthdays.php', 'enabledbydefaulton'=>'Home')
 		);
 
 		// Permissions
@@ -208,8 +208,8 @@ class modUser extends DolibarrModules
 		$this->rights[$r][5] = 'export';
 
 
-        // Menus
-        $this->menu = 1; // This module add menu entries. They are coded into menu manager.
+		// Menus
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
 
 
 		// Exports
@@ -220,48 +220,51 @@ class modUser extends DolibarrModules
 		$this->export_label[$r] = 'List of users and attributes';
 		$this->export_permission[$r] = array(array("user", "user", "export"));
 		$this->export_fields_array[$r] = array(
-		    'u.rowid'=>"Id", 'u.login'=>"Login", 'u.lastname'=>"Lastname", 'u.firstname'=>"Firstname", 'u.employee'=>"Employee", 'u.job'=>"PostOrFunction", 'u.gender'=>"Gender",
-		    'u.accountancy_code'=>"UserAccountancyCode",
-		    'u.address'=>"Address", 'u.zip'=>"Zip", 'u.town'=>"Town",
-		    'u.office_phone'=>'Phone', 'u.user_mobile'=>"Mobile", 'u.office_fax'=>'Fax',
-		    'u.email'=>"Email", 'u.note'=>"Note", 'u.signature'=>'Signature',
-		    'u.fk_user'=>'HierarchicalResponsible', 'u.thm'=>'THM', 'u.tjm'=>'TJM', 'u.weeklyhours'=>'WeeklyHours',
-		    'u.dateemployment'=>'DateEmployment', 'u.salary'=>'Salary', 'u.color'=>'Color', 'u.api_key'=>'ApiKey',
-		    'u.birth'=>'DateOfBirth',
-		    'u.datec'=>"DateCreation", 'u.tms'=>"DateLastModification",
+			'u.rowid'=>"Id", 'u.login'=>"Login", 'u.lastname'=>"Lastname", 'u.firstname'=>"Firstname", 'u.employee'=>"Employee", 'u.job'=>"PostOrFunction", 'u.gender'=>"Gender",
+			'u.accountancy_code'=>"UserAccountancyCode",
+			'u.address'=>"Address", 'u.zip'=>"Zip", 'u.town'=>"Town",
+			'u.office_phone'=>'Phone', 'u.user_mobile'=>"Mobile", 'u.office_fax'=>'Fax',
+			'u.email'=>"Email", 'u.note'=>"Note", 'u.signature'=>'Signature',
+			'u.fk_user'=>'HierarchicalResponsible', 'u.thm'=>'THM', 'u.tjm'=>'TJM', 'u.weeklyhours'=>'WeeklyHours',
+			'u.dateemployment'=>'DateEmployment', 'u.salary'=>'Salary', 'u.color'=>'Color', 'u.api_key'=>'ApiKey',
+			'u.birth'=>'DateOfBirth',
+			'u.datec'=>"DateCreation", 'u.tms'=>"DateLastModification",
 			'u.admin'=>"Administrator", 'u.statut'=>'Status', 'u.datelastlogin'=>'LastConnexion', 'u.datepreviouslogin'=>'PreviousConnexion',
 			'u.fk_socpeople'=>"IdContact", 'u.fk_soc'=>"IdCompany", 'u.fk_member'=>"MemberId"
 		);
 		$this->export_TypeFields_array[$r] = array(
 			'u.rowid'=>'Numeric', 'u.login'=>"Text", 'u.lastname'=>"Text", 'u.firstname'=>"Text", 'u.employee'=>'Boolean', 'u.job'=>'Text',
-		    'u.accountancy_code'=>'Text',
-		    'u.address'=>"Text", 'u.zip'=>"Text", 'u.town'=>"Text",
-		    'u.office_phone'=>'Text', 'u.user_mobile'=>'Text', 'u.office_fax'=>'Text',
+			'u.accountancy_code'=>'Text',
+			'u.address'=>"Text", 'u.zip'=>"Text", 'u.town'=>"Text",
+			'u.office_phone'=>'Text', 'u.user_mobile'=>'Text', 'u.office_fax'=>'Text',
 			'u.email'=>'Text', 'u.datec'=>"Date", 'u.tms'=>"Date", 'u.admin'=>"Boolean", 'u.statut'=>'Status', 'u.note'=>"Text", 'u.datelastlogin'=>'Date',
-		    'u.fk_user'=>"List:user:login",
-		    'u.birth'=>'Date',
-		    'u.datepreviouslogin'=>'Date', 'u.fk_soc'=>"List:societe:nom:rowid", 'u.fk_member'=>"List:adherent:firstname"
+			'u.fk_user'=>"List:user:login",
+			'u.birth'=>'Date',
+			'u.datepreviouslogin'=>'Date', 'u.fk_soc'=>"List:societe:nom:rowid", 'u.fk_member'=>"List:adherent:firstname"
 		);
 		$this->export_entities_array[$r] = array(
 			'u.rowid'=>"user", 'u.login'=>"user", 'u.lastname'=>"user", 'u.firstname'=>"user", 'u.employee'=>'user', 'u.job'=>'user', 'u.gender'=>'user',
-		    'u.accountancy_code'=>'user',
-		    'u.address'=>"user", 'u.zip'=>"user", 'u.town'=>"user",
-		    'u.office_phone'=>'user', 'u.user_mobile'=>'user', 'u.office_fax'=>'user',
-		    'u.email'=>'user', 'u.note'=>"user", 'u.signature'=>'user',
-		    'u.fk_user'=>'user', 'u.thm'=>'user', 'u.tjm'=>'user', 'u.weeklyhours'=>'user',
-		    'u.dateemployment'=>'user', 'u.salary'=>'user', 'u.color'=>'user', 'u.api_key'=>'user',
-		    'u.birth'=>'user',
-		    'u.datec'=>"user", 'u.tms'=>"user",
-		    'u.admin'=>"user", 'u.statut'=>'user', 'u.datelastlogin'=>'user', 'u.datepreviouslogin'=>'user',
-		    'u.fk_socpeople'=>"contact", 'u.fk_soc'=>"company", 'u.fk_member'=>"member"
+			'u.accountancy_code'=>'user',
+			'u.address'=>"user", 'u.zip'=>"user", 'u.town'=>"user",
+			'u.office_phone'=>'user', 'u.user_mobile'=>'user', 'u.office_fax'=>'user',
+			'u.email'=>'user', 'u.note'=>"user", 'u.signature'=>'user',
+			'u.fk_user'=>'user', 'u.thm'=>'user', 'u.tjm'=>'user', 'u.weeklyhours'=>'user',
+			'u.dateemployment'=>'user', 'u.salary'=>'user', 'u.color'=>'user', 'u.api_key'=>'user',
+			'u.birth'=>'user',
+			'u.datec'=>"user", 'u.tms'=>"user",
+			'u.admin'=>"user", 'u.statut'=>'user', 'u.datelastlogin'=>'user', 'u.datepreviouslogin'=>'user',
+			'u.fk_socpeople'=>"contact", 'u.fk_soc'=>"company", 'u.fk_member'=>"member"
 		);
-        if (empty($conf->adherent->enabled))
-        {
-            unset($this->export_fields_array[$r]['u.fk_member']);
-            unset($this->export_entities_array[$r]['u.fk_member']);
-        }
+		$keyforselect = 'user'; $keyforelement = 'user'; $keyforaliasextra = 'extra';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		if (empty($conf->adherent->enabled))
+		{
+			unset($this->export_fields_array[$r]['u.fk_member']);
+			unset($this->export_entities_array[$r]['u.fk_member']);
+		}
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'user as u';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user_extrafields as extra ON u.rowid = extra.fk_object';
 		$this->export_sql_end[$r] .= ' WHERE u.entity IN ('.getEntity('user').')';
 
 		// Imports
@@ -275,43 +278,43 @@ class modUser extends DolibarrModules
 		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
 		$this->import_tables_array[$r] = array('u'=>MAIN_DB_PREFIX.'user', 'extra'=>MAIN_DB_PREFIX.'user_extrafields'); // List of tables to insert into (insert done in same order)
 		$this->import_fields_array[$r] = array(
-		    'u.login'=>"Login*", 'u.lastname'=>"Name*", 'u.firstname'=>"Firstname", 'u.employee'=>"Employee*", 'u.job'=>"PostOrFunction", 'u.gender'=>"Gender",
-		    'u.accountancy_code'=>"UserAccountancyCode",
+			'u.login'=>"Login*", 'u.lastname'=>"Name*", 'u.firstname'=>"Firstname", 'u.employee'=>"Employee*", 'u.job'=>"PostOrFunction", 'u.gender'=>"Gender",
+			'u.accountancy_code'=>"UserAccountancyCode",
 			'u.pass_crypted'=>"Password", 'u.admin'=>"Administrator", 'u.fk_soc'=>"Company*", 'u.address'=>"Address", 'u.zip'=>"Zip", 'u.town'=>"Town",
 			'u.fk_state'=>"StateId", 'u.fk_country'=>"CountryCode",
-		    'u.office_phone'=>"Phone", 'u.user_mobile'=>"Mobile", 'u.office_fax'=>"Fax",
-		    'u.email'=>"Email", 'u.note'=>"Note", 'u.signature'=>'Signature',
-		    'u.fk_user'=>'HierarchicalResponsible', 'u.thm'=>'THM', 'u.tjm'=>'TJM', 'u.weeklyhours'=>'WeeklyHours',
+			'u.office_phone'=>"Phone", 'u.user_mobile'=>"Mobile", 'u.office_fax'=>"Fax",
+			'u.email'=>"Email", 'u.note'=>"Note", 'u.signature'=>'Signature',
+			'u.fk_user'=>'HierarchicalResponsible', 'u.thm'=>'THM', 'u.tjm'=>'TJM', 'u.weeklyhours'=>'WeeklyHours',
 			'u.dateemployment'=>'DateEmployment', 'u.salary'=>'Salary', 'u.color'=>'Color', 'u.api_key'=>'ApiKey',
-		    'u.birth'=>'DateOfBirth',
-		    'u.datec'=>"DateCreation",
-		    'u.statut'=>'Status'
+			'u.birth'=>'DateOfBirth',
+			'u.datec'=>"DateCreation",
+			'u.statut'=>'Status'
 		);
 		// Add extra fields
 		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'user' AND entity IN (0,".$conf->entity.")";
 		$resql = $this->db->query($sql);
 		if ($resql)    // This can fail when class is used on old database (during migration for example)
 		{
-		    while ($obj = $this->db->fetch_object($resql))
-		    {
-		        $fieldname = 'extra.'.$obj->name;
-		        $fieldlabel = ucfirst($obj->label);
-		        $this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
-		    }
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$fieldname = 'extra.'.$obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+			}
 		}
 		// End add extra fields
 		$this->import_fieldshidden_array[$r] = array('u.fk_user_creat'=>'user->id', 'extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'user'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
 		$this->import_convertvalue_array[$r] = array(
 			'u.fk_state'=>array('rule'=>'fetchidfromcodeid', 'classfile'=>'/core/class/cstate.class.php', 'class'=>'Cstate', 'method'=>'fetch', 'dict'=>'DictionaryState'),
-		    'u.fk_country'=>array('rule'=>'fetchidfromcodeid', 'classfile'=>'/core/class/ccountry.class.php', 'class'=>'Ccountry', 'method'=>'fetch', 'dict'=>'DictionaryCountry'),
-		    'u.salary'=>array('rule'=>'numeric')
+			'u.fk_country'=>array('rule'=>'fetchidfromcodeid', 'classfile'=>'/core/class/ccountry.class.php', 'class'=>'Ccountry', 'method'=>'fetch', 'dict'=>'DictionaryCountry'),
+			'u.salary'=>array('rule'=>'numeric')
 		);
 		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
 		$this->import_regex_array[$r] = array(
 			'u.employee'=>'^[0|1]',
 			'u.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$',
-            'u.dateemployment'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$',
-            'u.birth'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$'
+			'u.dateemployment'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$',
+			'u.birth'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$'
 		);
 		$this->import_examplevalues_array[$r] = array(
 			'u.lastname'=>"Doe", 'u.firstname'=>'John', 'u.login'=>'jdoe', 'u.employee'=>'0 or 1', 'u.job'=>'CTO', 'u.gender'=>'0 or 1',
@@ -319,22 +322,22 @@ class modUser extends DolibarrModules
 			'u.fk_soc'=>'0 (internal user) or company name (external user)', 'u.datec'=>dol_print_date(dol_now(), '%Y-%m-%d'), 'u.address'=>"61 jump street",
 			'u.zip'=>"123456", 'u.town'=>"Big town", 'u.fk_country'=>'US, FR, DE...', 'u.office_phone'=>"0101010101", 'u.office_fax'=>"0101010102",
 			'u.email'=>"test@mycompany.com", 'u.salary'=>"10000", 'u.note'=>"This is an example of note for record", 'u.datec'=>"2015-01-01 or 2015-01-01 12:30:00",
-		    'u.statut'=>"0 (closed) or 1 (active)",
+			'u.statut'=>"0 (closed) or 1 (active)",
 		);
 		$this->import_updatekeys_array[$r] = array('u.lastname'=>'Lastname', 'u.firstname'=>'Firstname', 'u.login'=>'Login');
 	}
 
 
-    /**
+	/**
 	 *		Function called when module is enabled.
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
+	 */
+	public function init($options = '')
+	{
 		global $conf;
 
 		// Permissions
@@ -343,5 +346,5 @@ class modUser extends DolibarrModules
 		$sql = array();
 
 		return $this->_init($sql, $options);
-    }
+	}
 }
diff --git a/htdocs/core/modules/modVariants.class.php b/htdocs/core/modules/modVariants.class.php
index 827078c3b78..72b29230def 100644
--- a/htdocs/core/modules/modVariants.class.php
+++ b/htdocs/core/modules/modVariants.class.php
@@ -92,7 +92,7 @@ class modVariants extends DolibarrModules
 
 		// Array to add new pages in new tabs
 		$this->tabs = array(
-        //	'product:+combinations:Combinaciones:products:1:/variants/combinations.php?id=__ID__'
+		//	'product:+combinations:Combinaciones:products:1:/variants/combinations.php?id=__ID__'
 		);
 
 		// Dictionaries
diff --git a/htdocs/core/modules/modWebServices.class.php b/htdocs/core/modules/modWebServices.class.php
index 5d405ec0afe..e61ed5dc689 100644
--- a/htdocs/core/modules/modWebServices.class.php
+++ b/htdocs/core/modules/modWebServices.class.php
@@ -30,54 +30,54 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modWebServices extends DolibarrModules
 {
 
-    /**
+	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
 	 *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-        $this->numero = 2600;
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+		$this->numero = 2600;
 
-        $this->family = "interface";
-        $this->module_position = '25';
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        $this->description = "Enable the Dolibarr web services server";
+		$this->family = "interface";
+		$this->module_position = '25';
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		$this->description = "Enable the Dolibarr web services server";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
-        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        $this->picto = 'technic';
+		$this->version = 'dolibarr';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		$this->picto = 'technic';
 
-        // Data directories to create when module is enabled
-        $this->dirs = array();
+		// Data directories to create when module is enabled
+		$this->dirs = array();
 
-        // Config pages
-        $this->config_page_url = array("index.php@webservices");
+		// Config pages
+		$this->config_page_url = array("index.php@webservices");
 
-        // Dependencies
-        $this->hidden = false; // A condition to hide module
+		// Dependencies
+		$this->hidden = false; // A condition to hide module
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
-        $this->langfiles = array("other");
+		$this->langfiles = array("other");
 
-        // Constants
-        $this->const = array();
+		// Constants
+		$this->const = array();
 
-        // New pages on tabs
-        $this->tabs = array();
+		// New pages on tabs
+		$this->tabs = array();
 
-        // Boxes
-        $this->boxes = array();
+		// Boxes
+		$this->boxes = array();
 
-        // Permissions
-        $this->rights = array();
-        $this->rights_class = 'webservices';
-        $r = 0;
-    }
+		// Permissions
+		$this->rights = array();
+		$this->rights_class = 'webservices';
+		$r = 0;
+	}
 }
diff --git a/htdocs/core/modules/modWebServicesClient.class.php b/htdocs/core/modules/modWebServicesClient.class.php
index d61052c0e1b..52a8889fbbb 100644
--- a/htdocs/core/modules/modWebServicesClient.class.php
+++ b/htdocs/core/modules/modWebServicesClient.class.php
@@ -30,54 +30,54 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modWebServicesClient extends DolibarrModules
 {
 
-    /**
+	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
 	 *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-        $this->numero = 2660;
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+		$this->numero = 2660;
 
-        $this->family = "interface";
-        $this->module_position = '26';
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        $this->description = "Enable the web service client to call external supplier web services";
+		$this->family = "interface";
+		$this->module_position = '25';
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		$this->description = "Enable the web service client to call external supplier web services";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'experimental';
-        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        $this->picto = 'technic';
+		$this->version = 'experimental';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		$this->picto = 'technic';
 
-        // Data directories to create when module is enabled
-        $this->dirs = array();
+		// Data directories to create when module is enabled
+		$this->dirs = array();
 
-        // Config pages
-        //$this->config_page_url = array();
+		// Config pages
+		//$this->config_page_url = array();
 
-        // Dependencies
-        $this->hidden = false; // A condition to hide module
+		// Dependencies
+		$this->hidden = false; // A condition to hide module
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
-        $this->langfiles = array("other");
+		$this->langfiles = array("other");
 
-        // Constants
-        $this->const = array();
+		// Constants
+		$this->const = array();
 
-        // New pages on tabs
-        $this->tabs = array();
+		// New pages on tabs
+		$this->tabs = array();
 
-        // Boxes
-        $this->boxes = array();
+		// Boxes
+		$this->boxes = array();
 
-        // Permissions
-        $this->rights = array();
-        $this->rights_class = 'syncsupplierwebservices';
-        $r = 0;
-    }
+		// Permissions
+		$this->rights = array();
+		$this->rights_class = 'syncsupplierwebservices';
+		$r = 0;
+	}
 }
diff --git a/htdocs/core/modules/modWebsite.class.php b/htdocs/core/modules/modWebsite.class.php
index 60cc93b5d39..c452ed9ded2 100644
--- a/htdocs/core/modules/modWebsite.class.php
+++ b/htdocs/core/modules/modWebsite.class.php
@@ -31,54 +31,54 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modWebsite extends DolibarrModules
 {
 
-    /**
+	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
 	 *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-    	global $langs, $conf;
+	 */
+	public function __construct($db)
+	{
+		global $langs, $conf;
 
-        $this->db = $db;
-        $this->numero = 10000;
+		$this->db = $db;
+		$this->numero = 10000;
 
 		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
 		// It is used to group modules in module setup page
-        $this->family = "portal";
-        $this->module_position = '50';
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        $this->description = "Enable to build and serve public web sites with CMS features";
+		$this->family = "portal";
+		$this->module_position = '50';
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		$this->description = "Enable to build and serve public web sites with CMS features";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
-        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        $this->picto = 'website';
+		$this->version = 'dolibarr';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		$this->picto = 'website';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/website/temp");
 
-        // Config pages
-        $this->config_page_url = array('website.php');
+		// Config pages
+		$this->config_page_url = array('website.php');
 
-        // Dependencies
+		// Dependencies
 		$this->hidden = !empty($conf->global->MODULE_WEBSITE_DISABLED); // A condition to disable module
 		$this->depends = array('modFckeditor'); // List of modules id that must be enabled if this module is enabled
-        $this->requiredby = array(); // List of modules id to disable if this one is disabled
+		$this->requiredby = array(); // List of modules id to disable if this one is disabled
 		$this->conflictwith = array(); // List of modules id this module is in conflict with
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
-        $this->langfiles = array("website");
+		$this->langfiles = array("website");
 
-        // Constants
-       	$this->const = array();
+		// Constants
+	   	$this->const = array();
 
-        // New pages on tabs
-       	//$this->tabs[] = array();  					// To add a new tab identified by code tabname1
+		// New pages on tabs
+	   	//$this->tabs[] = array();  					// To add a new tab identified by code tabname1
 
-        // Boxes
-        $this->boxes = array();
+		// Boxes
+		$this->boxes = array();
 
 		// Permissions
 		$this->rights = array(); // Permission array used by this module
@@ -109,95 +109,95 @@ class modWebsite extends DolibarrModules
 		$this->rights[$r][4] = 'delete';
 		$r++;
 
-        // Main menu entries
-        $r = 0;
-        $this->menu[$r] = array('fk_menu'=>'0', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-						        'type'=>'top', // This is a Left menu entry
-						        'titre'=>'WebSites',
-                                'mainmenu'=>'website',
-						        'url'=>'/website/index.php',
-						        'langs'=>'website', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-						        'position'=>100,
-						        'enabled'=>'$conf->website->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-						        'perms'=>'$user->rights->website->read', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-						        'target'=>'',
-						        'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
-        $r++;
+		// Main menu entries
+		$r = 0;
+		$this->menu[$r] = array('fk_menu'=>'0', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+								'type'=>'top', // This is a Left menu entry
+								'titre'=>'WebSites',
+								'mainmenu'=>'website',
+								'url'=>'/website/index.php',
+								'langs'=>'website', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+								'position'=>100,
+								'enabled'=>'$conf->website->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+								'perms'=>'$user->rights->website->read', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+								'target'=>'',
+								'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
+		$r++;
 
-        // Exports
-        $r = 1;
+		// Exports
+		$r = 1;
 
-        $this->export_code[$r] = $this->rights_class.'_'.$r;
-        $this->export_label[$r] = 'MyWebsitePages'; // Translation key (used only if key ExportDataset_xxx_z not found)
-        $this->export_icon[$r] = 'globe';
-        $keyforclass = 'WebsitePage'; $keyforclassfile = '/website/class/websitepage.class.php'; $keyforelement = 'Website';
-        include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
-        //$keyforselect='myobject'; $keyforelement='myobject'; $keyforaliasextra='extra';
-        //include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-        $this->export_sql_start[$r] = 'SELECT DISTINCT ';
-        $this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'website_page as t, '.MAIN_DB_PREFIX.'website as p';
-        $this->export_sql_end[$r] .= ' WHERE t.fk_website = p.rowid';
-        $this->export_sql_end[$r] .= ' AND p.entity IN ('.getEntity('website').')';
-        $r++;
-    }
+		$this->export_code[$r] = $this->rights_class.'_'.$r;
+		$this->export_label[$r] = 'MyWebsitePages'; // Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_icon[$r] = 'globe';
+		$keyforclass = 'WebsitePage'; $keyforclassfile = '/website/class/websitepage.class.php'; $keyforelement = 'Website';
+		include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
+		//$keyforselect='myobject'; $keyforelement='myobject'; $keyforaliasextra='extra';
+		//include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'website_page as t, '.MAIN_DB_PREFIX.'website as p';
+		$this->export_sql_end[$r] .= ' WHERE t.fk_website = p.rowid';
+		$this->export_sql_end[$r] .= ' AND p.entity IN ('.getEntity('website').')';
+		$r++;
+	}
 
 
-    /**
-     *  Function called when module is enabled.
-     *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *  It also creates data directories
-     *
-     *  @param      string	$options    Options when enabling module ('', 'noboxes')
-     *  @return     int                 1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-    	global $conf, $langs;
+	/**
+	 *  Function called when module is enabled.
+	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *  It also creates data directories
+	 *
+	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *  @return     int                 1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global $conf, $langs;
 
-    	// Remove permissions and default values
-    	$this->remove($options);
+		// Remove permissions and default values
+		$this->remove($options);
 
-    	// Copy flags and octicons directory
-    	$dirarray = array('common/flags'=>'flags', 'common/octicons/build/svg'=>'octicons');
-    	foreach ($dirarray as $dirfrom => $dirtarget)
-    	{
-	    	$src = DOL_DOCUMENT_ROOT.'/theme/'.$dirfrom;
-	    	$dest = DOL_DATA_ROOT.'/medias/image/'.$dirtarget;
+		// Copy flags and octicons directory
+		$dirarray = array('common/flags'=>'flags', 'common/octicons/build/svg'=>'octicons');
+		foreach ($dirarray as $dirfrom => $dirtarget)
+		{
+			$src = DOL_DOCUMENT_ROOT.'/theme/'.$dirfrom;
+			$dest = DOL_DATA_ROOT.'/medias/image/'.$dirtarget;
 
-	    	if (is_dir($src))
-	    	{
-	    		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	    		dol_mkdir($dest);
-	    		$result = dolCopyDir($src, $dest, 0, 0);
-	    		if ($result < 0)
-	    		{
-	    			$langs->load("errors");
-	    			$this->error = $langs->trans('ErrorFailToCopyDir', $src, $dest);
-	    			return 0;
-	    		}
-	    	}
-    	}
+			if (is_dir($src))
+			{
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+				dol_mkdir($dest);
+				$result = dolCopyDir($src, $dest, 0, 0);
+				if ($result < 0)
+				{
+					$langs->load("errors");
+					$this->error = $langs->trans('ErrorFailToCopyDir', $src, $dest);
+					return 0;
+				}
+			}
+		}
 
-    	// Website templates
-    	$srcroot = DOL_DOCUMENT_ROOT.'/install/doctemplates/websites';
-    	$destroot = DOL_DATA_ROOT.'/doctemplates/websites';
+		// Website templates
+		$srcroot = DOL_DOCUMENT_ROOT.'/install/doctemplates/websites';
+		$destroot = DOL_DATA_ROOT.'/doctemplates/websites';
 
-    	dol_mkdir($destroot);
+		dol_mkdir($destroot);
 
-    	$docs = dol_dir_list($srcroot, 'files', 0, 'website_.*(\.zip|\.jpg)$');
-    	foreach ($docs as $cursorfile) {
-	    	$src = $srcroot.'/'.$cursorfile['name'];
-	    	$dest = $destroot.'/'.$cursorfile['name'];
+		$docs = dol_dir_list($srcroot, 'files', 0, 'website_.*(\.zip|\.jpg)$');
+		foreach ($docs as $cursorfile) {
+			$src = $srcroot.'/'.$cursorfile['name'];
+			$dest = $destroot.'/'.$cursorfile['name'];
 
-	    	$result = dol_copy($src, $dest, 0, 1); // For full zip templates, we overwrite old existing files
-	    	if ($result < 0) {
-	    		$langs->load("errors");
-	    		$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
-	    	}
-    	}
+			$result = dol_copy($src, $dest, 0, 1); // For full zip templates, we overwrite old existing files
+			if ($result < 0) {
+				$langs->load("errors");
+				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
+			}
+		}
 
-    	$sql = array();
+		$sql = array();
 
-    	return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modWorkflow.class.php b/htdocs/core/modules/modWorkflow.class.php
index 601106d7f02..c7bd464b9d1 100644
--- a/htdocs/core/modules/modWorkflow.class.php
+++ b/htdocs/core/modules/modWorkflow.class.php
@@ -32,75 +32,75 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modWorkflow extends DolibarrModules
 {
 
-    /**
+	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
 	 *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-        // Id for module (must be unique).
-        // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-        $this->numero = 6000;
-        // Key text used to identify module (for permissions, menus, etc...)
-        $this->rights_class = 'workflow';
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 6000;
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'workflow';
 
-        $this->family = "technic";
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-        $this->description = "Workflow management";
-        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
-        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of png file (without png) used for this module.
-        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-        // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-        $this->picto = 'technic';
+		$this->family = "technic";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		$this->description = "Workflow management";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'dolibarr';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of png file (without png) used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+		$this->picto = 'technic';
 
-        // Data directories to create when module is enabled
-        $this->dirs = array("/workflow/temp");
+		// Data directories to create when module is enabled
+		$this->dirs = array("/workflow/temp");
 
-        // Config pages. Put here list of php page names stored in admmin directory used to setup module.
-        $this->config_page_url = array('workflow.php');
+		// Config pages. Put here list of php page names stored in admmin directory used to setup module.
+		$this->config_page_url = array('workflow.php');
 
-        // Dependencies
-        $this->hidden = false; // A condition to hide module
+		// Dependencies
+		$this->hidden = false; // A condition to hide module
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(2, 8); // Minimum version of Dolibarr required by module
-        $this->langfiles = array("@workflow");
+		$this->need_dolibarr_version = array(2, 8); // Minimum version of Dolibarr required by module
+		$this->langfiles = array("@workflow");
 
-        // Constants
-        // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-        // Example: $this->const=array(1 => array('MYMODULE_MYNEWCONST1', 'chaine', 'myvalue', 'This is a constant to add', 1),
-        //                             2 => array('MYMODULE_MYNEWCONST2', 'chaine', 'myvalue', 'This is another constant to add', 0, 'current', 1)
-        // );
-        $this->const = array(
-            //0=>array('WORKFLOW_PROPAL_AUTOCREATE_ORDER', 'chaine', '1', 'WORKFLOW_PROPAL_AUTOCREATE_ORDER', 0, 'current', 0),
-            //0=>array('WORKFLOW_ORDER_AUTOCREATE_INVOICE', 'chaine', '1', 'WORKFLOW_ORDER_AUTOCREATE_INVOICE', 0, 'current', 0),
-            0=>array('WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL', 0, 'current', 0),
-            1=>array('WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL', 'chaine', '1', 'WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL', 0, 'current', 0),
-            2=>array('WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING', 0, 'current', 0),
-            4=>array('WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER', 'chaine', '1', 'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER', 0, 'current', 0),
-            5=>array('WORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL', 0, 'current', 0),
-            6=>array('WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER', 'chaine', '1', 'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER', 0, 'current', 0),
-            7=>array('WORKFLOW_BILL_ON_RECEPTION', 'chaine', '1', 'WORKFLOW_BILL_ON_RECEPTION', 0, 'current', 0)
-        );
+		// Constants
+		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example: $this->const=array(1 => array('MYMODULE_MYNEWCONST1', 'chaine', 'myvalue', 'This is a constant to add', 1),
+		//                             2 => array('MYMODULE_MYNEWCONST2', 'chaine', 'myvalue', 'This is another constant to add', 0, 'current', 1)
+		// );
+		$this->const = array(
+			//0=>array('WORKFLOW_PROPAL_AUTOCREATE_ORDER', 'chaine', '1', 'WORKFLOW_PROPAL_AUTOCREATE_ORDER', 0, 'current', 0),
+			//0=>array('WORKFLOW_ORDER_AUTOCREATE_INVOICE', 'chaine', '1', 'WORKFLOW_ORDER_AUTOCREATE_INVOICE', 0, 'current', 0),
+			0=>array('WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL', 0, 'current', 0),
+			1=>array('WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL', 'chaine', '1', 'WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL', 0, 'current', 0),
+			2=>array('WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING', 0, 'current', 0),
+			4=>array('WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER', 'chaine', '1', 'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER', 0, 'current', 0),
+			5=>array('WORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL', 0, 'current', 0),
+			6=>array('WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER', 'chaine', '1', 'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER', 0, 'current', 0),
+			7=>array('WORKFLOW_BILL_ON_RECEPTION', 'chaine', '1', 'WORKFLOW_BILL_ON_RECEPTION', 0, 'current', 0)
+		);
 
-        // Boxes
-        $this->boxes = array();
+		// Boxes
+		$this->boxes = array();
 
-        // Permissions
-        $this->rights = array();
-        $r = 0;
+		// Permissions
+		$this->rights = array();
+		$r = 0;
 
-        /*
+		/*
         $r++;
         $this->rights[$r][0] = 6001; // id de la permission
         $this->rights[$r][1] = "Lire les workflow"; // libelle de la permission
@@ -109,10 +109,10 @@ class modWorkflow extends DolibarrModules
         $this->rights[$r][4] = 'read';
         */
 
-        // Main menu entries
-        $this->menus = array(); // List of menus to add
-        $r = 0;
-        /*
+		// Main menu entries
+		$this->menus = array(); // List of menus to add
+		$r = 0;
+		/*
         $this->menu[$r]=array('fk_menu'=>0,
                                 'type'=>'top',
                                 'titre'=>'Workflow',
@@ -139,24 +139,24 @@ class modWorkflow extends DolibarrModules
                                 'user'=>0);
         $r++;
         */
-    }
+	}
 
 
-    /**
+	/**
 	 *		Function called when module is enabled.
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int                 1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
+	 */
+	public function init($options = '')
+	{
 		// Permissions
 		$this->remove($options);
 
 		$sql = array();
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modZapier.class.php b/htdocs/core/modules/modZapier.class.php
index 1e2f69cb2ea..ee7589c6537 100644
--- a/htdocs/core/modules/modZapier.class.php
+++ b/htdocs/core/modules/modZapier.class.php
@@ -30,159 +30,159 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modZapier extends DolibarrModules
 {
-    /**
-     * Constructor. Define names, constants, directories, boxes, permissions
-     *
-     * @param DoliDB $db Database handler
-     */
-    public function __construct($db)
-    {
-        global $langs, $conf;
+	/**
+	 * Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		global $langs, $conf;
 
-        $this->db = $db;
-        // Id for module (must be unique).
-        // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-        $this->numero = 50330;
-        // Key text used to identify module (for permissions, menus, etc...)
-        $this->rights_class = 'zapier';
-        // Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
-        // It is used to group modules by family in module setup page
-        $this->family = "interface";
-        // Module position in the family on 2 digits ('01', '10', '20', ...)
-        $this->module_position = '22';
-        // Gives the possibility for the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
-        //$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
-        // Module label (no space allowed), used if translation string 'ModuleZapierName' not found (Zapier is name of module).
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        // Module description, used if translation string 'ModuleZapierDesc' not found (Zapier is name of module).
-        $this->description = "ZapierDescription";
-        // Used only if file README.md and README-LL.md not found.
-        $this->descriptionlong = "Zapier description (Long)";
-        // Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-        $this->version = 'development';
-        //Url to the file with your last numberversion of this module
-        //$this->url_last_version = 'http://www.example.com/versionmodule.txt';
-        // Key used in llx_const table to save module status enabled/disabled (where ZAPIERFORDOLIBARR is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-        // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-        $this->picto = 'zapier';
-        // Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
-        $this->module_parts = array(
-            // Set this to 1 if module has its own trigger directory (core/triggers)
-            'triggers' => 1,
-            // Set this to 1 if module has its own login method file (core/login)
-            'login' => 0,
-            // Set this to 1 if module has its own substitution function file (core/substitutions)
-            'substitutions' => 0,
-            // Set this to 1 if module has its own menus handler directory (core/menus)
-            'menus' => 0,
-            // Set this to 1 if module overwrite template dir (core/tpl)
-            'tpl' => 0,
-            // Set this to 1 if module has its own barcode directory (core/modules/barcode)
-            'barcode' => 0,
-            // Set this to 1 if module has its own models directory (core/modules/xxx)
-            'models' => 0,
-            // Set this to 1 if module has its own theme directory (theme)
-            'theme' => 0,
-            // Set this to relative path of css file if module has its own css file
-            'css' => array(
-                //    '/zapier/css/zapier.css.php',
-            ),
-            // Set this to relative path of js file if module must load a js on all pages
-            'js' => array(
-                //   '/zapier/js/zapier.js.php',
-            ),
-            // Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context 'all'
-            'hooks' => array(
-                //   'data' => array(
-                //       'hookcontext1',
-                //       'hookcontext2',
-                //   ),
-                //   'entity' => '0',
-            ),
-            // Set this to 1 if feature of module are opened to external users
-            'moduleforexternal' => 0,
-        );
-        // Data directories to create when module is enabled.
-        // Example: this->dirs = array("/zapier/temp","/zapier/subdir");
-        $this->dirs = array("/zapier/temp");
-        // Config pages. Put here list of php page, stored into zapier/admin directory, to use to setup module.
-        $this->config_page_url = array(
-        //    "setup.php@zapier"
-        );
-        // Dependencies
-        // A condition to hide module
-        $this->hidden = false;
-        // List of module class names as string that must be enabled if this module is enabled. Example: array('always1'=>'modModuleToEnable1','always2'=>'modModuleToEnable2', 'FR1'=>'modModuleToEnableFR'...)
-        $this->depends = array();
-        // List of module class names as string to disable if this one is disabled. Example: array('modModuleToDisable1', ...)
-        $this->requiredby = array();
-        // List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...)
-        $this->conflictwith = array();
-        $this->langfiles = array("zapier");
-        // Minimum version of PHP required by module
-        //$this->phpmin = array(5, 5);
-        // Minimum version of Dolibarr required by module
-        $this->need_dolibarr_version = array(10, 0);
-        // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-        $this->warnings_activation = array();
-        // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-        $this->warnings_activation_ext = array();
-        // $this->automatic_activation = array(
-        //     'FR'=>'ZapierWasAutomaticallyActivatedBecauseOfYourCountryChoice',
-        // );
-        // If true, can't be disabled
-        // $this->always_enabled = true;
-        // Constants
-        // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-        // Example: $this->const=array(
-        //    1 => array('ZAPIERFORDOLIBARR_MYNEWCONST1', 'chaine', 'myvalue', 'This is a constant to add', 1),
-        //    2 => array('ZAPIERFORDOLIBARR_MYNEWCONST2', 'chaine', 'myvalue', 'This is another constant to add', 0, 'current', 1)
-        // );
-        $this->const = array(
-            // 1 => array('ZAPIERFORDOLIBARR_MYCONSTANT', 'chaine', 'avalue', 'This is a constant to add', 1, 'allentities', 1)
-        );
-        // Some keys to add into the overwriting translation tables
-        /*$this->overwrite_translation = array(
+		$this->db = $db;
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 50330;
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'zapier';
+		// Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
+		// It is used to group modules by family in module setup page
+		$this->family = "interface";
+		// Module position in the family on 2 digits ('01', '10', '20', ...)
+		$this->module_position = '26';
+		// Gives the possibility for the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
+		//$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
+		// Module label (no space allowed), used if translation string 'ModuleZapierName' not found (Zapier is name of module).
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		// Module description, used if translation string 'ModuleZapierDesc' not found (Zapier is name of module).
+		$this->description = "ZapierDescription";
+		// Used only if file README.md and README-LL.md not found.
+		$this->descriptionlong = "Zapier description (Long)";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
+		$this->version = 'development';
+		//Url to the file with your last numberversion of this module
+		//$this->url_last_version = 'http://www.example.com/versionmodule.txt';
+		// Key used in llx_const table to save module status enabled/disabled (where ZAPIERFORDOLIBARR is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+		$this->picto = 'zapier';
+		// Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
+		$this->module_parts = array(
+			// Set this to 1 if module has its own trigger directory (core/triggers)
+			'triggers' => 1,
+			// Set this to 1 if module has its own login method file (core/login)
+			'login' => 0,
+			// Set this to 1 if module has its own substitution function file (core/substitutions)
+			'substitutions' => 0,
+			// Set this to 1 if module has its own menus handler directory (core/menus)
+			'menus' => 0,
+			// Set this to 1 if module overwrite template dir (core/tpl)
+			'tpl' => 0,
+			// Set this to 1 if module has its own barcode directory (core/modules/barcode)
+			'barcode' => 0,
+			// Set this to 1 if module has its own models directory (core/modules/xxx)
+			'models' => 0,
+			// Set this to 1 if module has its own theme directory (theme)
+			'theme' => 0,
+			// Set this to relative path of css file if module has its own css file
+			'css' => array(
+				//    '/zapier/css/zapier.css.php',
+			),
+			// Set this to relative path of js file if module must load a js on all pages
+			'js' => array(
+				//   '/zapier/js/zapier.js.php',
+			),
+			// Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context 'all'
+			'hooks' => array(
+				//   'data' => array(
+				//       'hookcontext1',
+				//       'hookcontext2',
+				//   ),
+				//   'entity' => '0',
+			),
+			// Set this to 1 if feature of module are opened to external users
+			'moduleforexternal' => 0,
+		);
+		// Data directories to create when module is enabled.
+		// Example: this->dirs = array("/zapier/temp","/zapier/subdir");
+		$this->dirs = array("/zapier/temp");
+		// Config pages. Put here list of php page, stored into zapier/admin directory, to use to setup module.
+		$this->config_page_url = array(
+		//    "setup.php@zapier"
+		);
+		// Dependencies
+		// A condition to hide module
+		$this->hidden = false;
+		// List of module class names as string that must be enabled if this module is enabled. Example: array('always1'=>'modModuleToEnable1','always2'=>'modModuleToEnable2', 'FR1'=>'modModuleToEnableFR'...)
+		$this->depends = array('modApi');
+		// List of module class names as string to disable if this one is disabled. Example: array('modModuleToDisable1', ...)
+		$this->requiredby = array();
+		// List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...)
+		$this->conflictwith = array();
+		$this->langfiles = array("zapier");
+		// Minimum version of PHP required by module
+		//$this->phpmin = array(5, 5);
+		// Minimum version of Dolibarr required by module
+		$this->need_dolibarr_version = array(10, 0);
+		// Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		$this->warnings_activation = array();
+		// Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		$this->warnings_activation_ext = array();
+		// $this->automatic_activation = array(
+		//     'FR'=>'ZapierWasAutomaticallyActivatedBecauseOfYourCountryChoice',
+		// );
+		// If true, can't be disabled
+		// $this->always_enabled = true;
+		// Constants
+		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example: $this->const=array(
+		//    1 => array('ZAPIERFORDOLIBARR_MYNEWCONST1', 'chaine', 'myvalue', 'This is a constant to add', 1),
+		//    2 => array('ZAPIERFORDOLIBARR_MYNEWCONST2', 'chaine', 'myvalue', 'This is another constant to add', 0, 'current', 1)
+		// );
+		$this->const = array(
+			// 1 => array('ZAPIERFORDOLIBARR_MYCONSTANT', 'chaine', 'avalue', 'This is a constant to add', 1, 'allentities', 1)
+		);
+		// Some keys to add into the overwriting translation tables
+		/*$this->overwrite_translation = array(
             'en_US:ParentCompany'=>'Parent company or reseller',
             'fr_FR:ParentCompany'=>'Maison mère ou revendeur'
         )*/
-        if (!isset($conf->zapier) || !isset($conf->zapier->enabled)) {
-            $conf->zapier = new stdClass();
-            $conf->zapier->enabled = 0;
-        }
-        // Array to add new pages in new tabs
-        $this->tabs = array();
-        // Example:
-        // $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@zapier:$user->rights->zapier->read:/zapier/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
-        // $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@zapier:$user->rights->othermodule->read:/zapier/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
-        // $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
-        //
-        // Where objecttype can be
-        // 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
-        // 'contact'          to add a tab in contact view
-        // 'contract'         to add a tab in contract view
-        // 'group'            to add a tab in group view
-        // 'intervention'     to add a tab in intervention view
-        // 'invoice'          to add a tab in customer invoice view
-        // 'invoice_supplier' to add a tab in supplier invoice view
-        // 'member'           to add a tab in fundation member view
-        // 'opensurveypoll'	  to add a tab in opensurvey poll view
-        // 'order'            to add a tab in customer order view
-        // 'order_supplier'   to add a tab in supplier order view
-        // 'payment'		  to add a tab in payment view
-        // 'payment_supplier' to add a tab in supplier payment view
-        // 'product'          to add a tab in product view
-        // 'propal'           to add a tab in propal view
-        // 'project'          to add a tab in project view
-        // 'stock'            to add a tab in stock view
-        // 'thirdparty'       to add a tab in third party view
-        // 'user'             to add a tab in user view
-        // Dictionaries
-        $this->dictionaries = array();
-        /* Example:
+		if (!isset($conf->zapier) || !isset($conf->zapier->enabled)) {
+			$conf->zapier = new stdClass();
+			$conf->zapier->enabled = 0;
+		}
+		// Array to add new pages in new tabs
+		$this->tabs = array();
+		// Example:
+		// $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@zapier:$user->rights->zapier->read:/zapier/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
+		// $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@zapier:$user->rights->othermodule->read:/zapier/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
+		// $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
+		//
+		// Where objecttype can be
+		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
+		// 'contact'          to add a tab in contact view
+		// 'contract'         to add a tab in contract view
+		// 'group'            to add a tab in group view
+		// 'intervention'     to add a tab in intervention view
+		// 'invoice'          to add a tab in customer invoice view
+		// 'invoice_supplier' to add a tab in supplier invoice view
+		// 'member'           to add a tab in fundation member view
+		// 'opensurveypoll'	  to add a tab in opensurvey poll view
+		// 'order'            to add a tab in customer order view
+		// 'order_supplier'   to add a tab in supplier order view
+		// 'payment'		  to add a tab in payment view
+		// 'payment_supplier' to add a tab in supplier payment view
+		// 'product'          to add a tab in product view
+		// 'propal'           to add a tab in propal view
+		// 'project'          to add a tab in project view
+		// 'stock'            to add a tab in stock view
+		// 'thirdparty'       to add a tab in third party view
+		// 'user'             to add a tab in user view
+		// Dictionaries
+		$this->dictionaries = array();
+		/* Example:
         $this->dictionaries=array(
             'langs'=>'mylangfile@zapier',
             // List of tables we want to see into dictonnary editor
@@ -205,88 +205,88 @@ class modZapier extends DolibarrModules
             'tabcond'=>array($conf->zapier->enabled,$conf->zapier->enabled,$conf->zapier->enabled)
         );
         */
-        // Boxes/Widgets
-        // Add here list of php file(s) stored in zapier/core/boxes that contains class to show a widget.
-        $this->boxes = array(
-            //  0 => array(
-            //      'file' => 'zapierwidget1.php@zapier',
-            //      'note' => 'Widget provided by Zapier',
-            //      'enabledbydefaulton' => 'Home',
-            //  ),
-            //1=>array('file'=>'zapierwidget2.php@zapier','note'=>'Widget provided by Zapier'),
-            //2=>array('file'=>'zapierwidget3.php@zapier','note'=>'Widget provided by Zapier')
-        );
-        // Cronjobs (List of cron jobs entries to add when module is enabled)
-        // unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
-        $this->cronjobs = array(
-            //  0 => array(
-            //      'label' => 'MyJob label',
-            //      'jobtype' => 'method',
-            //      'class' => '/zapier/class/myobject.class.php',
-            //      'objectname' => 'MyObject',
-            //      'method' => 'doScheduledJob',
-            //      'parameters' => '',
-            //      'comment' => 'Comment',
-            //      'frequency' => 2,
-            //      'unitfrequency' => 3600,
-            //      'status' => 0,
-            //      'test' => '$conf->zapier->enabled',
-            //      'priority' => 50,
-            //  ),
-        );
-        // Example: $this->cronjobs=array(
-        //    0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>'$conf->zapier->enabled', 'priority'=>50),
-        //    1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'status'=>0, 'test'=>'$conf->zapier->enabled', 'priority'=>50)
-        // );
-        // Permissions
-        // Permission array used by this module
-        $this->rights = array();
+		// Boxes/Widgets
+		// Add here list of php file(s) stored in zapier/core/boxes that contains class to show a widget.
+		$this->boxes = array(
+			//  0 => array(
+			//      'file' => 'zapierwidget1.php@zapier',
+			//      'note' => 'Widget provided by Zapier',
+			//      'enabledbydefaulton' => 'Home',
+			//  ),
+			//1=>array('file'=>'zapierwidget2.php@zapier','note'=>'Widget provided by Zapier'),
+			//2=>array('file'=>'zapierwidget3.php@zapier','note'=>'Widget provided by Zapier')
+		);
+		// Cronjobs (List of cron jobs entries to add when module is enabled)
+		// unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
+		$this->cronjobs = array(
+			//  0 => array(
+			//      'label' => 'MyJob label',
+			//      'jobtype' => 'method',
+			//      'class' => '/zapier/class/myobject.class.php',
+			//      'objectname' => 'MyObject',
+			//      'method' => 'doScheduledJob',
+			//      'parameters' => '',
+			//      'comment' => 'Comment',
+			//      'frequency' => 2,
+			//      'unitfrequency' => 3600,
+			//      'status' => 0,
+			//      'test' => '$conf->zapier->enabled',
+			//      'priority' => 50,
+			//  ),
+		);
+		// Example: $this->cronjobs=array(
+		//    0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>'$conf->zapier->enabled', 'priority'=>50),
+		//    1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'status'=>0, 'test'=>'$conf->zapier->enabled', 'priority'=>50)
+		// );
+		// Permissions
+		// Permission array used by this module
+		$this->rights = array();
 
-        $r = 0;
-        // Permission id (must not be already used)
-        $this->rights[$r][0] = $this->numero + $r;
-        // Permission label
-        $this->rights[$r][1] = 'Read myobject of Zapier';
-        // Permission by default for new user (0/1)
-        $this->rights[$r][3] = 1;
-        // In php code, permission will be checked by test if ($user->rights->zapier->level1->level2)
-        $this->rights[$r][4] = 'read';
-        // In php code, permission will be checked by test if ($user->rights->zapier->level1->level2)
-        $this->rights[$r][5] = '';
-        $r++;
-        $this->rights[$r][0] = $this->numero + $r;
-        $this->rights[$r][1] = 'Create/Update myobject of Zapier';
-        $this->rights[$r][3] = 1;
-        $this->rights[$r][4] = 'write';
-        $this->rights[$r][5] = '';
-        $r++;
-        $this->rights[$r][0] = $this->numero + $r;
-        $this->rights[$r][1] = 'Delete myobject of Zapier';
-        $this->rights[$r][3] = 1;
-        $this->rights[$r][4] = 'delete';
-        $this->rights[$r][5] = '';
+		$r = 0;
+		// Permission id (must not be already used)
+		$this->rights[$r][0] = $this->numero + $r;
+		// Permission label
+		$this->rights[$r][1] = 'Read myobject of Zapier';
+		// Permission by default for new user (0/1)
+		$this->rights[$r][3] = 1;
+		// In php code, permission will be checked by test if ($user->rights->zapier->level1->level2)
+		$this->rights[$r][4] = 'read';
+		// In php code, permission will be checked by test if ($user->rights->zapier->level1->level2)
+		$this->rights[$r][5] = '';
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r;
+		$this->rights[$r][1] = 'Create/Update myobject of Zapier';
+		$this->rights[$r][3] = 1;
+		$this->rights[$r][4] = 'write';
+		$this->rights[$r][5] = '';
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r;
+		$this->rights[$r][1] = 'Delete myobject of Zapier';
+		$this->rights[$r][3] = 1;
+		$this->rights[$r][4] = 'delete';
+		$this->rights[$r][5] = '';
 
-        // Main menu entries
-        $this->menu = array(); // List of menus to add
-        $r = 0;
+		// Main menu entries
+		$this->menu = array(); // List of menus to add
+		$r = 0;
 
-        // Add here entries to declare new menus
-        // $this->menu[$r++]=array(
-        //     'fk_menu' => '',                          // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-        //     'type' => 'top',                          // This is a Top menu entry
-        //     'titre' => 'Zapier',
-        //     'mainmenu' => 'zapier',
-        //     'leftmenu' => '',
-        //     'url' => '/zapier/zapierindex.php',
-        //     'langs' => 'zapier@zapier',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-        //     'position' => 1000+$r,
-        //     'enabled' => '$conf->zapier->enabled',  // Define condition to show or hide menu entry. Use '$conf->zapier->enabled' if entry must be visible if module is enabled.
-        //     'perms' => '1',			                // Use 'perms'=>'$user->rights->zapier->level1->level2' if you want your menu with a permission rules
-        //     'target' => '',
-        //     'user' => 2,				                // 0=Menu for internal users, 1=external users, 2=both
-        // );
+		// Add here entries to declare new menus
+		// $this->menu[$r++]=array(
+		//     'fk_menu' => '',                          // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+		//     'type' => 'top',                          // This is a Top menu entry
+		//     'titre' => 'Zapier',
+		//     'mainmenu' => 'zapier',
+		//     'leftmenu' => '',
+		//     'url' => '/zapier/zapierindex.php',
+		//     'langs' => 'zapier@zapier',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//     'position' => 1000+$r,
+		//     'enabled' => '$conf->zapier->enabled',  // Define condition to show or hide menu entry. Use '$conf->zapier->enabled' if entry must be visible if module is enabled.
+		//     'perms' => '1',			                // Use 'perms'=>'$user->rights->zapier->level1->level2' if you want your menu with a permission rules
+		//     'target' => '',
+		//     'user' => 2,				                // 0=Menu for internal users, 1=external users, 2=both
+		// );
 
-        /*
+		/*
         $this->menu[$r++]=array(
             'fk_menu'=>'fk_mainmenu=zapier',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
             'type'=>'left',			                // This is a Left menu entry
@@ -316,44 +316,44 @@ class modZapier extends DolibarrModules
             'user'=>2,                              // 0=Menu for internal users, 1=external users, 2=both
         );
         */
-    }
+	}
 
-    /**
-     *  Function called when module is enabled.
-     *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *  It also creates data directories
-     *
-     *  @param      string  $options    Options when enabling module ('', 'noboxes')
-     *  @return     int                 1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-        $result = $this->_load_tables('/zapier/sql/');
-        if ($result < 0) return -1; // Do not activate module if not allowed errors found on module SQL queries (the _load_table run sql with run_sql with error allowed parameter to 'default')
+	/**
+	 *  Function called when module is enabled.
+	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *  It also creates data directories
+	 *
+	 *  @param      string  $options    Options when enabling module ('', 'noboxes')
+	 *  @return     int                 1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		$result = $this->_load_tables('/zapier/sql/');
+		if ($result < 0) return -1; // Do not activate module if not allowed errors found on module SQL queries (the _load_table run sql with run_sql with error allowed parameter to 'default')
 
-        // Create extrafields
-        //include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-        //$extrafields = new ExtraFields($this->db);
-        //$result1=$extrafields->addExtraField('myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->enabled');
-        //$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->enabled');
-        //$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->enabled');
-        //$result4=$extrafields->addExtraField('myattr4', "New Attr 4 label", 'select',  1,  3, 'thirdparty',   0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1,'', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->enabled');
-        //$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->enabled');
-        $sql = array();
-        return $this->_init($sql, $options);
-    }
+		// Create extrafields
+		//include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+		//$extrafields = new ExtraFields($this->db);
+		//$result1=$extrafields->addExtraField('myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->enabled');
+		//$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->enabled');
+		//$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->enabled');
+		//$result4=$extrafields->addExtraField('myattr4', "New Attr 4 label", 'select',  1,  3, 'thirdparty',   0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1,'', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->enabled');
+		//$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->enabled');
+		$sql = array();
+		return $this->_init($sql, $options);
+	}
 
-    /**
-     *  Function called when module is disabled.
-     *  Remove from database constants, boxes and permissions from Dolibarr database.
-     *  Data directories are not deleted
-     *
-     *  @param      string	$options    Options when enabling module ('', 'noboxes')
-     *  @return     int                 1 if OK, 0 if KO
-     */
-    public function remove($options = '')
-    {
-        $sql = array();
-        return $this->_remove($sql, $options);
-    }
+	/**
+	 *  Function called when module is disabled.
+	 *  Remove from database constants, boxes and permissions from Dolibarr database.
+	 *  Data directories are not deleted
+	 *
+	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *  @return     int                 1 if OK, 0 if KO
+	 */
+	public function remove($options = '')
+	{
+		$sql = array();
+		return $this->_remove($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/movement/doc/pdf_standard.modules.php b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
index c37e0cc60a7..5917cb85042 100644
--- a/htdocs/core/modules/movement/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
@@ -1156,7 +1156,7 @@ class pdf_stdandard extends ModelePDFMovement
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'PRODUCT_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 }
diff --git a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
index e41b4b35adc..eeaeb2c8e54 100644
--- a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
+++ b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
@@ -47,14 +47,14 @@ class doc_generic_mo_odt extends ModelePDFMo
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * @var string Dolibarr version of the loaded document
-     */
+	 * @var string Dolibarr version of the loaded document
+	 */
 	public $version = 'dolibarr';
 
 
@@ -63,12 +63,12 @@ class doc_generic_mo_odt extends ModelePDFMo
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
@@ -108,12 +108,12 @@ class doc_generic_mo_odt extends ModelePDFMo
 	 *	@param	Translate	$langs      Lang object to use for output
 	 *	@return string       			Description
 	 */
-    public function info($langs)
+	public function info($langs)
 	{
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("errors", "companies"));
+		$langs->loadLangs(array("errors", "companies"));
 
 		$form = new Form($this->db);
 
@@ -172,7 +172,7 @@ class doc_generic_mo_odt extends ModelePDFMo
    			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
    			foreach ($listoffiles as $file)
    			{
-                $texte .= $file['name'].'<br>';
+				$texte .= $file['name'].'<br>';
    			}
    			$texte .= '</div>';
 		}
@@ -190,7 +190,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Function to build a document on disk using the generic odt module.
 	 *
@@ -202,9 +202,9 @@ class doc_generic_mo_odt extends ModelePDFMo
 	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-    public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
@@ -243,6 +243,8 @@ class doc_generic_mo_odt extends ModelePDFMo
 				}
 			}
 
+			$object->fetch_thirdparty();
+
 			$dir = $conf->mrp->multidir_output[isset($object->entity) ? $object->entity : 1];
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
@@ -270,8 +272,8 @@ class doc_generic_mo_odt extends ModelePDFMo
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -296,15 +298,14 @@ class doc_generic_mo_odt extends ModelePDFMo
 
 				// Recipient name
 				$contactobject = null;
-				if (!empty($usecontact))
-				{
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else {
-                        $socobject = $object->thirdparty;
-               			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
-            			$contactobject = $object->contact;
-                    }
+				if (!empty($usecontact)) {
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+						$socobject = $object->contact;
+					} else {
+						$socobject = $object->thirdparty;
+			   			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+						$contactobject = $object->contact;
+					}
 				} else {
 					$socobject = $object->thirdparty;
 				}
@@ -329,7 +330,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->mrp->dir_temp,
@@ -356,7 +357,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
 				} catch (OdfException $e)
 				{
-                    dol_syslog($e->getMessage(), LOG_INFO);
+					dol_syslog($e->getMessage(), LOG_INFO);
 				}
 
 				// Define substitution array
@@ -391,7 +392,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
@@ -422,10 +423,10 @@ class doc_generic_mo_odt extends ModelePDFMo
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								} catch (OdfException $e)
 								{
-                                    dol_syslog($e->getMessage(), LOG_INFO);
+									dol_syslog($e->getMessage(), LOG_INFO);
 								} catch (SegmentException $e)
 								{
-                                    dol_syslog($e->getMessage(), LOG_INFO);
+									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
 							$listlines->merge();
@@ -447,7 +448,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -461,16 +462,16 @@ class doc_generic_mo_odt extends ModelePDFMo
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
-                        $this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						$this->error = $e->getMessage();
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
-                        $this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						$this->error = $e->getMessage();
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
diff --git a/htdocs/core/modules/mrp/mod_mo_advanced.php b/htdocs/core/modules/mrp/mod_mo_advanced.php
index 186caca619a..610346c67e2 100644
--- a/htdocs/core/modules/mrp/mod_mo_advanced.php
+++ b/htdocs/core/modules/mrp/mod_mo_advanced.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2009  Regis Houssin               <regis.houssin@inodbox.com>
  * Copyright (C) 2008       Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
  * Copyright (C) 2019       Frédéric France             <frederic.france@netlogic.fr>
+ * Copyright (C) 2020       Josep Lluís Amador          <joseplluis@lliuretic.cat>
  *
  * 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
@@ -35,9 +36,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/mrp/modules_mo.php';
 class mod_mo_advanced extends ModeleNumRefMos
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -51,14 +52,14 @@ class mod_mo_advanced extends ModeleNumRefMos
 	public $name = 'advanced';
 
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     *  @return     string      Texte descripif
-     */
-    public function info()
-    {
-    	global $conf, $langs, $db;
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $conf, $langs, $db;
 
 		$langs->load("bills");
 
@@ -68,7 +69,7 @@ class mod_mo_advanced extends ModeleNumRefMos
 		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="action" value="updateMask">';
-		$texte .= '<input type="hidden" name="maskconstBom" value="MRP_MO_ADVANCED_MASK">';
+		$texte .= '<input type="hidden" name="maskconstMo" value="MRP_MO_ADVANCED_MASK">';
 		$texte .= '<table class="nobordernopadding" width="100%">';
 
 		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Mo"), $langs->transnoentities("Mo"));
@@ -89,22 +90,22 @@ class mod_mo_advanced extends ModeleNumRefMos
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Return an example of numbering
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-     	global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+	 	global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$old_code_type = $mysoc->typent_code;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-    	$mysoc->typent_code = 'TTTTTTTTTT';
-     	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$old_code_type = $mysoc->typent_code;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$mysoc->typent_code = 'TTTTTTTTTT';
+	 	$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 		$mysoc->typent_code = $old_code_type;
 
@@ -113,7 +114,7 @@ class mod_mo_advanced extends ModeleNumRefMos
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 * 	Return next free value
@@ -122,8 +123,8 @@ class mod_mo_advanced extends ModeleNumRefMos
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    public function getNextValue($objprod, $object)
-    {
+	public function getNextValue($objprod, $object)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/core/modules/oauth/github_oauthcallback.php b/htdocs/core/modules/oauth/github_oauthcallback.php
index 6f3b53bee44..c92cab93aa1 100644
--- a/htdocs/core/modules/oauth/github_oauthcallback.php
+++ b/htdocs/core/modules/oauth/github_oauthcallback.php
@@ -65,17 +65,17 @@ $storage = new DoliStorage($db, $conf);
 
 // Setup the credentials for the requests
 $credentials = new Credentials(
-    $conf->global->OAUTH_GITHUB_ID,
-    $conf->global->OAUTH_GITHUB_SECRET,
-    $currentUri->getAbsoluteUri()
+	$conf->global->OAUTH_GITHUB_ID,
+	$conf->global->OAUTH_GITHUB_SECRET,
+	$currentUri->getAbsoluteUri()
 );
 
 $requestedpermissionsarray = array();
 if (GETPOST('state')) $requestedpermissionsarray = explode(',', GETPOST('state')); // Example: 'user'. 'state' parameter is standard to retrieve some parameters back
 if ($action != 'delete' && empty($requestedpermissionsarray))
 {
-    print 'Error, parameter state is not defined';
-    exit;
+	print 'Error, parameter state is not defined';
+	exit;
 }
 //var_dump($requestedpermissionsarray);exit;
 
@@ -94,12 +94,12 @@ $langs->load("oauth");
 
 if ($action == 'delete')
 {
-    $storage->clearToken('GitHub');
+	$storage->clearToken('GitHub');
 
-    setEventMessages($langs->trans('TokenDeleted'), null, 'mesgs');
+	setEventMessages($langs->trans('TokenDeleted'), null, 'mesgs');
 
-    header('Location: '.$backtourl);
-    exit();
+	header('Location: '.$backtourl);
+	exit();
 }
 
 if (!empty($_GET['code']))     // We are coming from oauth provider page
@@ -108,55 +108,55 @@ if (!empty($_GET['code']))     // We are coming from oauth provider page
 	//$_GET=array('code' => string 'aaaaaaaaaaaaaa' (length=20), 'state' => string 'user,public_repo' (length=16))
 
 	dol_syslog("We are coming from the oauth provider page");
-    //llxHeader('',$langs->trans("OAuthSetup"));
+	//llxHeader('',$langs->trans("OAuthSetup"));
 
-    //$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-    //print load_fiche_titre($langs->trans("OAuthSetup"),$linkback,'title_setup');
+	//$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+	//print load_fiche_titre($langs->trans("OAuthSetup"),$linkback,'title_setup');
 
-    //dol_fiche_head();
-    // retrieve the CSRF state parameter
-    $state = isset($_GET['state']) ? $_GET['state'] : null;
-    //print '<table>';
+	//print dol_get_fiche_head();
+	// retrieve the CSRF state parameter
+	$state = isset($_GET['state']) ? $_GET['state'] : null;
+	//print '<table>';
 
-    // This was a callback request from service, get the token
-    try {
-        //var_dump($_GET['code']);
-        //var_dump($state);
-        //var_dump($apiService);      // OAuth\OAuth2\Service\GitHub
+	// This was a callback request from service, get the token
+	try {
+		//var_dump($_GET['code']);
+		//var_dump($state);
+		//var_dump($apiService);      // OAuth\OAuth2\Service\GitHub
 
-        //$token = $apiService->requestAccessToken($_GET['code'], $state);
-        $token = $apiService->requestAccessToken($_GET['code']);
-        // Github is a service that does not need state to be stored.
-        // Into constructor of GitHub, the call
-        // parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri)
-        // has not the ending parameter to true like the Google class constructor.
+		//$token = $apiService->requestAccessToken($_GET['code'], $state);
+		$token = $apiService->requestAccessToken($_GET['code']);
+		// Github is a service that does not need state to be stored.
+		// Into constructor of GitHub, the call
+		// parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri)
+		// has not the ending parameter to true like the Google class constructor.
 
-        setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs'); // Stored into object managed by class DoliStorage so into table oauth_token
+		setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs'); // Stored into object managed by class DoliStorage so into table oauth_token
 
-        $backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
-        unset($_SESSION["backtourlsavedbeforeoauthjump"]);
+		$backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
+		unset($_SESSION["backtourlsavedbeforeoauthjump"]);
 
-        header('Location: '.$backtourl);
-        exit();
-    } catch (Exception $e) {
-        print $e->getMessage();
-    }
+		header('Location: '.$backtourl);
+		exit();
+	} catch (Exception $e) {
+		print $e->getMessage();
+	}
 } else // If entry on page with no parameter, we arrive here
 {
-    $_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
+	$_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
 
-    // This may create record into oauth_state before the header redirect.
-    // Creation of record with state in this tables depend on the Provider used (see its constructor).
-    if (GETPOST('state'))
-    {
-        $url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
-    } else {
-        $url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated
-    }
+	// This may create record into oauth_state before the header redirect.
+	// Creation of record with state in this tables depend on the Provider used (see its constructor).
+	if (GETPOST('state'))
+	{
+		$url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
+	} else {
+		$url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated
+	}
 
-    // we go on oauth provider authorization page
-    header('Location: '.$url);
-    exit();
+	// we go on oauth provider authorization page
+	header('Location: '.$url);
+	exit();
 }
 
 
diff --git a/htdocs/core/modules/oauth/google_oauthcallback.php b/htdocs/core/modules/oauth/google_oauthcallback.php
index ea68a5b6141..0b76a8151cf 100644
--- a/htdocs/core/modules/oauth/google_oauthcallback.php
+++ b/htdocs/core/modules/oauth/google_oauthcallback.php
@@ -65,17 +65,17 @@ $storage = new DoliStorage($db, $conf);
 
 // Setup the credentials for the requests
 $credentials = new Credentials(
-    $conf->global->OAUTH_GOOGLE_ID,
-    $conf->global->OAUTH_GOOGLE_SECRET,
-    $currentUri->getAbsoluteUri()
+	$conf->global->OAUTH_GOOGLE_ID,
+	$conf->global->OAUTH_GOOGLE_SECRET,
+	$currentUri->getAbsoluteUri()
 );
 
 $requestedpermissionsarray = array();
 if (GETPOST('state')) $requestedpermissionsarray = explode(',', GETPOST('state')); // Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to store a hash value and can be used to retrieve some parameters back
 if ($action != 'delete' && empty($requestedpermissionsarray))
 {
-    print 'Error, parameter state is not defined';
-    exit;
+	print 'Error, parameter state is not defined';
+	exit;
 }
 //var_dump($requestedpermissionsarray);exit;
 
@@ -100,12 +100,12 @@ $langs->load("oauth");
 
 if ($action == 'delete')
 {
-    $storage->clearToken('Google');
+	$storage->clearToken('Google');
 
-    setEventMessages($langs->trans('TokenDeleted'), null, 'mesgs');
+	setEventMessages($langs->trans('TokenDeleted'), null, 'mesgs');
 
-    header('Location: '.$backtourl);
-    exit();
+	header('Location: '.$backtourl);
+	exit();
 }
 
 if (!empty($_GET['code']))     // We are coming from oauth provider page
@@ -113,48 +113,48 @@ if (!empty($_GET['code']))     // We are coming from oauth provider page
 	dol_syslog("We are coming from the oauth provider page");
 	//llxHeader('',$langs->trans("OAuthSetup"));
 
-    //$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-    //print load_fiche_titre($langs->trans("OAuthSetup"),$linkback,'title_setup');
+	//$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+	//print load_fiche_titre($langs->trans("OAuthSetup"),$linkback,'title_setup');
 
-    //dol_fiche_head();
-    // retrieve the CSRF state parameter
-    $state = isset($_GET['state']) ? $_GET['state'] : null;
-    //print '<table>';
+	//print dol_get_fiche_head();
+	// retrieve the CSRF state parameter
+	$state = isset($_GET['state']) ? $_GET['state'] : null;
+	//print '<table>';
 
-    // This was a callback request from service, get the token
-    try {
-        //var_dump($_GET['code']);
-        //var_dump($state);
-        //var_dump($apiService);      // OAuth\OAuth2\Service\Google
+	// This was a callback request from service, get the token
+	try {
+		//var_dump($_GET['code']);
+		//var_dump($state);
+		//var_dump($apiService);      // OAuth\OAuth2\Service\Google
 
-        $token = $apiService->requestAccessToken($_GET['code'], $state);
+		$token = $apiService->requestAccessToken($_GET['code'], $state);
 
-        setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs'); // Stored into object managed by class DoliStorage so into table oauth_token
+		setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs'); // Stored into object managed by class DoliStorage so into table oauth_token
 
-        $backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
-        unset($_SESSION["backtourlsavedbeforeoauthjump"]);
+		$backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
+		unset($_SESSION["backtourlsavedbeforeoauthjump"]);
 
-        header('Location: '.$backtourl);
-        exit();
-    } catch (Exception $e) {
-        print $e->getMessage();
-    }
+		header('Location: '.$backtourl);
+		exit();
+	} catch (Exception $e) {
+		print $e->getMessage();
+	}
 } else // If entry on page with no parameter, we arrive here
 {
-    $_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
+	$_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
 
-    // This may create record into oauth_state before the header redirect.
-    // Creation of record with state in this tables depend on the Provider used (see its constructor).
-    if (GETPOST('state'))
-    {
-    	$url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
-    } else {
-        $url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated
-    }
+	// This may create record into oauth_state before the header redirect.
+	// Creation of record with state in this tables depend on the Provider used (see its constructor).
+	if (GETPOST('state'))
+	{
+		$url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
+	} else {
+		$url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated
+	}
 
-    // we go on oauth provider authorization page
-    header('Location: '.$url);
-    exit();
+	// we go on oauth provider authorization page
+	header('Location: '.$url);
+	exit();
 }
 
 
diff --git a/htdocs/core/modules/oauth/stripelive_oauthcallback.php b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
index 6f5da103cf3..ef0496a8541 100644
--- a/htdocs/core/modules/oauth/stripelive_oauthcallback.php
+++ b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
@@ -65,9 +65,9 @@ $storage = new DoliStorage($db, $conf);
 
 // Setup the credentials for the requests
 $credentials = new Credentials(
-    $conf->global->OAUTH_STRIPE_LIVE_ID,
+	$conf->global->OAUTH_STRIPE_LIVE_ID,
 	$conf->global->STRIPE_LIVE_SECRET_KEY,
-    $currentUri->getAbsoluteUri()
+	$currentUri->getAbsoluteUri()
 );
 
 $requestedpermissionsarray = array();
@@ -98,12 +98,12 @@ $langs->load("oauth");
 
 if ($action == 'delete')
 {
-    $storage->clearToken('StripeLive');
+	$storage->clearToken('StripeLive');
 
-    setEventMessages($langs->trans('TokenDeleted'), null, 'mesgs');
+	setEventMessages($langs->trans('TokenDeleted'), null, 'mesgs');
 
-    header('Location: '.$backtourl);
-    exit();
+	header('Location: '.$backtourl);
+	exit();
 }
 
 if (!empty($_GET['code']))     // We are coming from oauth provider page
@@ -112,57 +112,57 @@ if (!empty($_GET['code']))     // We are coming from oauth provider page
 	//$_GET=array('code' => string 'aaaaaaaaaaaaaa' (length=20), 'state' => string 'user,public_repo' (length=16))
 
 	dol_syslog("We are coming from the oauth provider page");
-    //llxHeader('',$langs->trans("OAuthSetup"));
+	//llxHeader('',$langs->trans("OAuthSetup"));
 
-    //$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-    //print load_fiche_titre($langs->trans("OAuthSetup"),$linkback,'title_setup');
+	//$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+	//print load_fiche_titre($langs->trans("OAuthSetup"),$linkback,'title_setup');
 
-    //dol_fiche_head();
-    // retrieve the CSRF state parameter
-    $state = isset($_GET['state']) ? $_GET['state'] : null;
-    //print '<table>';
+	//print dol_get_fiche_head();
+	// retrieve the CSRF state parameter
+	$state = isset($_GET['state']) ? $_GET['state'] : null;
+	//print '<table>';
 
-    // This was a callback request from service, get the token
-    try {
-        //var_dump($_GET['code']);
-        //var_dump($state);
-        //var_dump($apiService);      // OAuth\OAuth2\Service\GitHub
+	// This was a callback request from service, get the token
+	try {
+		//var_dump($_GET['code']);
+		//var_dump($state);
+		//var_dump($apiService);      // OAuth\OAuth2\Service\GitHub
 
-        //$token = $apiService->requestAccessToken($_GET['code'], $state);
-        $token = $apiService->requestAccessToken($_GET['code']);
-        // Github is a service that does not need state to be stored.
-        // Into constructor of GitHub, the call
-        // parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri)
-        // has not the ending parameter to true like the Google class constructor.
+		//$token = $apiService->requestAccessToken($_GET['code'], $state);
+		$token = $apiService->requestAccessToken($_GET['code']);
+		// Github is a service that does not need state to be stored.
+		// Into constructor of GitHub, the call
+		// parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri)
+		// has not the ending parameter to true like the Google class constructor.
 
-        setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs'); // Stored into object managed by class DoliStorage so into table oauth_token
+		setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs'); // Stored into object managed by class DoliStorage so into table oauth_token
 
-        $backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
-        unset($_SESSION["backtourlsavedbeforeoauthjump"]);
+		$backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
+		unset($_SESSION["backtourlsavedbeforeoauthjump"]);
 
-        header('Location: '.$backtourl);
-        exit();
-    } catch (Exception $e) {
-        print $e->getMessage();
-    }
+		header('Location: '.$backtourl);
+		exit();
+	} catch (Exception $e) {
+		print $e->getMessage();
+	}
 } else // If entry on page with no parameter, we arrive here
 {
-    $_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
+	$_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
 
-    // This may create record into oauth_state before the header redirect.
-    // Creation of record with state in this tables depend on the Provider used (see its constructor).
-    if (GETPOST('state'))
-    {
-        $url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
-    } else {
-        //$url = $apiService->getAuthorizationUri();      // Parameter state will be randomly generated
-    	//https://connect.stripe.com/oauth/authorize?response_type=code&client_id=ca_AX27ut70tJ1j6eyFCV3ObEXhNOo2jY6V&scope=read_write
-    	$url = 'https://connect.stripe.com/oauth/authorize?response_type=code&client_id='.$conf->global->OAUTH_STRIPE_LIVE_ID.'&scope=read_write';
-    }
+	// This may create record into oauth_state before the header redirect.
+	// Creation of record with state in this tables depend on the Provider used (see its constructor).
+	if (GETPOST('state'))
+	{
+		$url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
+	} else {
+		//$url = $apiService->getAuthorizationUri();      // Parameter state will be randomly generated
+		//https://connect.stripe.com/oauth/authorize?response_type=code&client_id=ca_AX27ut70tJ1j6eyFCV3ObEXhNOo2jY6V&scope=read_write
+		$url = 'https://connect.stripe.com/oauth/authorize?response_type=code&client_id='.$conf->global->OAUTH_STRIPE_LIVE_ID.'&scope=read_write';
+	}
 
-    // we go on oauth provider authorization page
-    header('Location: '.$url);
-    exit();
+	// we go on oauth provider authorization page
+	header('Location: '.$url);
+	exit();
 }
 
 
diff --git a/htdocs/core/modules/oauth/stripetest_oauthcallback.php b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
index d0ca0ba03a4..46576b0547e 100644
--- a/htdocs/core/modules/oauth/stripetest_oauthcallback.php
+++ b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
@@ -117,7 +117,7 @@ if (!empty($_GET['code']))     // We are coming from oauth provider page
 	//$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 	//print load_fiche_titre($langs->trans("OAuthSetup"),$linkback,'title_setup');
 
-	//dol_fiche_head();
+	//print dol_get_fiche_head();
 	// retrieve the CSRF state parameter
 	$state = isset($_GET['state']) ? $_GET['state'] : null;
 	//print '<table>';
diff --git a/htdocs/core/modules/payment/mod_payment_ant.php b/htdocs/core/modules/payment/mod_payment_ant.php
index 56cebfddc8b..b5452f994ee 100644
--- a/htdocs/core/modules/payment/mod_payment_ant.php
+++ b/htdocs/core/modules/payment/mod_payment_ant.php
@@ -31,9 +31,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/payment/modules_payment.php';
 class mod_payment_ant extends ModeleNumRefPayments
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -54,14 +54,14 @@ class mod_payment_ant extends ModeleNumRefPayments
 	public $name = 'Ant';
 
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     *  @return     string      Texte descripif
-     */
-    public function info()
-    {
-    	global $db, $conf, $langs;
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $db, $conf, $langs;
 
 		$langs->load("bills");
 
@@ -92,20 +92,20 @@ class mod_payment_ant extends ModeleNumRefPayments
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Return an example of numbering
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-     	global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+	 	global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-     	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$mysoc->code_client = 'CCCCCCCCCC';
+	 	$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
 		if (!$numExample)
@@ -113,7 +113,7 @@ class mod_payment_ant extends ModeleNumRefPayments
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 * 	Return next free value
@@ -122,8 +122,8 @@ class mod_payment_ant extends ModeleNumRefPayments
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    public function getNextValue($objsoc, $object)
-    {
+	public function getNextValue($objsoc, $object)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -143,17 +143,17 @@ class mod_payment_ant extends ModeleNumRefPayments
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return next free value
 	 *
 	 *  @param	Societe		$objsoc     Object third party
 	 * 	@param	string		$objforref	Object for number to search
 	 *  @return string      			Next free value
-     */
-    public function commande_get_num($objsoc, $objforref)
-    {
-        // phpcs:enable
-        return $this->getNextValue($objsoc, $objforref);
-    }
+	 */
+	public function commande_get_num($objsoc, $objforref)
+	{
+		// phpcs:enable
+		return $this->getNextValue($objsoc, $objforref);
+	}
 }
diff --git a/htdocs/core/modules/printing/modules_printing.php b/htdocs/core/modules/printing/modules_printing.php
index e7e16dc7979..006156d37bf 100644
--- a/htdocs/core/modules/printing/modules_printing.php
+++ b/htdocs/core/modules/printing/modules_printing.php
@@ -31,61 +31,66 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
  */
 class PrintingDriver
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB      $db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB      $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
-    /**
-     *  Return list of printing driver
-     *
-     *  @param  DoliDB  $db                 Database handler
-     *  @param  integer  $maxfilenamelength  Max length of value to show
-     *  @return array                       List of drivers
-    */
-    public static function listDrivers($db, $maxfilenamelength = 0)
-    {
-        global $conf;
+	/**
+	 *  Return list of printing driver
+	 *
+	 *  @param  DoliDB  $db                 Database handler
+	 *  @param  integer  $maxfilenamelength  Max length of value to show
+	 *  @return array                       List of drivers
+	 */
+	public static function listDrivers($db, $maxfilenamelength = 0)
+	{
+		global $conf;
 
-        $type = 'printing';
-        $list = array();
+		$type = 'printing';
+		$list = array();
 
-        $moduledir = DOL_DOCUMENT_ROOT."/core/modules/printing/";
-        $tmpfiles = dol_dir_list($moduledir, 'all', 0, '\modules.php', '', 'name', SORT_ASC, 0);
-        foreach ($tmpfiles as $record) {
-            $list[$record['fullname']] = str_replace('.modules.php', '', $record['name']);
-        }
+		$listoffiles = array();
+		$dirmodels = array_merge(array('/core/modules/printing/'), (array) $conf->modules_parts['printing']);
+		foreach ($dirmodels as $dir) {
+			$tmpfiles = dol_dir_list(dol_buildpath($dir, 0), 'all', 0, '\modules.php', '', 'name', SORT_ASC, 0);
+			if (!empty($tmpfiles)) {
+				$listoffiles = array_merge($listoffiles, $tmpfiles);
+			}
+		}
+		foreach ($listoffiles as $record) {
+			$list[$record['fullname']] = str_replace('.modules.php', '', $record['name']);
+		}
+		return $list;
+	}
 
-        return $list;
-    }
-
-    /**
-     *  Return description of Printing Module
-     *
-     *  @return     string      Return translation of key PrintingModuleDescXXX where XXX is module name, or $this->desc if not exists
-     */
-    public function getDesc()
-    {
-        global $langs;
-        $langs->load("printing");
-        $transstring = "PrintingModuleDesc".$this->name;
-        if ($langs->trans($transstring) != $transstring) return $langs->trans($transstring);
-        else return $this->desc;
-    }
+	/**
+	 *  Return description of Printing Module
+	 *
+	 *  @return     string      Return translation of key PrintingModuleDescXXX where XXX is module name, or $this->desc if not exists
+	 */
+	public function getDesc()
+	{
+		global $langs;
+		$langs->load("printing");
+		$transstring = "PrintingModuleDesc".$this->name;
+		if ($langs->trans($transstring) != $transstring) return $langs->trans($transstring);
+		else return $this->desc;
+	}
 }
diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index 0312aa061f8..9560af284b7 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -35,478 +35,502 @@ use OAuth\OAuth2\Service\Google;
  */
 class printing_printgcp extends PrintingDriver
 {
-    public $name = 'printgcp';
-    public $desc = 'PrintGCPDesc';
+	/**
+	 * @var string module name
+	 */
+	public $name = 'printgcp';
 
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto = 'printer';
-    public $active = 'PRINTING_PRINTGCP';
-    public $conf = array();
-    public $google_id = '';
-    public $google_secret = '';
+	/**
+	 * @var string module description
+	 */
+	public $desc = 'PrintGCPDesc';
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'printer';
 
-    /**
-     * @var string[] Error codes (or messages)
-     */
-    public $errors = array();
+	/**
+	 * @var string module description
+	 */
+	public $active = 'PRINTING_PRINTGCP';
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var array module parameters
+	 */
+	public $conf = array();
 
-    private $OAUTH_SERVICENAME_GOOGLE = 'Google';
+	/**
+	 * @var string google id
+	 */
+	public $google_id = '';
 
-    const LOGIN_URL = 'https://accounts.google.com/o/oauth2/token';
-    const PRINTERS_SEARCH_URL = 'https://www.google.com/cloudprint/search';
-    const PRINTERS_GET_JOBS = 'https://www.google.com/cloudprint/jobs';
-    const PRINT_URL = 'https://www.google.com/cloudprint/submit';
+	/**
+	 * @var string google secret
+	 */
+	public $google_secret = '';
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB      $db      Database handler
-     */
-    public function __construct($db)
-    {
-        global $conf, $langs, $dolibarr_main_url_root;
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
-        // Define $urlwithroot
-        $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
-        $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
-        //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+	/**
+	 * @var string[] Error codes (or messages)
+	 */
+	public $errors = array();
 
-        $this->db = $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-        if (!$conf->oauth->enabled) {
-            $this->conf[] = array(
-                'varname'=>'PRINTGCP_INFO',
-                'info'=>$langs->transnoentitiesnoconv("WarningModuleNotActive", "OAuth"),
-                'type'=>'info',
-            );
-        } else {
-            $this->google_id = $conf->global->OAUTH_GOOGLE_ID;
-            $this->google_secret = $conf->global->OAUTH_GOOGLE_SECRET;
-            // Token storage
-            $storage = new DoliStorage($this->db, $this->conf);
-            //$storage->clearToken($this->OAUTH_SERVICENAME_GOOGLE);
-            // Setup the credentials for the requests
-            $credentials = new Credentials(
-                $this->google_id,
-                $this->google_secret,
-                $urlwithroot.'/core/modules/oauth/google_oauthcallback.php'
-            );
-            $access = ($storage->hasAccessToken($this->OAUTH_SERVICENAME_GOOGLE) ? 'HasAccessToken' : 'NoAccessToken');
-            $serviceFactory = new \OAuth\ServiceFactory();
-            $apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
-            $token_ok = true;
-            try {
-                $token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
-            } catch (Exception $e) {
-                $this->errors[] = $e->getMessage();
-                $token_ok = false;
-            }
-            //var_dump($this->errors);exit;
+	private $OAUTH_SERVICENAME_GOOGLE = 'Google';
 
-            $expire = false;
-            // Is token expired or will token expire in the next 30 seconds
-            if ($token_ok) {
-                $expire = ($token->getEndOfLife() !== -9002 && $token->getEndOfLife() !== -9001 && time() > ($token->getEndOfLife() - 30));
-            }
+	const LOGIN_URL = 'https://accounts.google.com/o/oauth2/token';
+	const PRINTERS_SEARCH_URL = 'https://www.google.com/cloudprint/search';
+	const PRINTERS_GET_JOBS = 'https://www.google.com/cloudprint/jobs';
+	const PRINT_URL = 'https://www.google.com/cloudprint/submit';
+	const LANGFILE = 'printgcp';
 
-            // Token expired so we refresh it
-            if ($token_ok && $expire) {
-                try {
-                    // il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
-                    $refreshtoken = $token->getRefreshToken();
-                    $token = $apiService->refreshAccessToken($token);
-                    $token->setRefreshToken($refreshtoken);
-                    $storage->storeAccessToken($this->OAUTH_SERVICENAME_GOOGLE, $token);
-                } catch (Exception $e) {
-                    $this->errors[] = $e->getMessage();
-                }
-            }
-            if ($this->google_id != '' && $this->google_secret != '') {
-                $this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'GoogleAuthConfigured', 'type'=>'info');
-                $this->conf[] = array(
-                    'varname'=>'PRINTGCP_TOKEN_ACCESS',
-                    'info'=>$access,
-                    'type'=>'info',
-                    'renew'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?state=userinfo_email,userinfo_profile,cloud_print&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'),
-                    'delete'=>($storage->hasAccessToken($this->OAUTH_SERVICENAME_GOOGLE) ? $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp') : '')
-                );
-                if ($token_ok) {
-                    $expiredat = '';
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB      $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf, $langs, $dolibarr_main_url_root;
 
-                    $refreshtoken = $token->getRefreshToken();
+		// Define $urlwithroot
+		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+		$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
-                    $endoflife = $token->getEndOfLife();
+		$this->db = $db;
 
-                    if ($endoflife == $token::EOL_NEVER_EXPIRES)
-                    {
-                        $expiredat = $langs->trans("Never");
-                    } elseif ($endoflife == $token::EOL_UNKNOWN)
-                    {
-                        $expiredat = $langs->trans("Unknown");
-                    } else {
-                        $expiredat = dol_print_date($endoflife, "dayhour");
-                    }
+		if (!$conf->oauth->enabled) {
+			$this->conf[] = array(
+				'varname'=>'PRINTGCP_INFO',
+				'info'=>$langs->transnoentitiesnoconv("WarningModuleNotActive", "OAuth"),
+				'type'=>'info',
+			);
+		} else {
+			$this->google_id = $conf->global->OAUTH_GOOGLE_ID;
+			$this->google_secret = $conf->global->OAUTH_GOOGLE_SECRET;
+			// Token storage
+			$storage = new DoliStorage($this->db, $this->conf);
+			//$storage->clearToken($this->OAUTH_SERVICENAME_GOOGLE);
+			// Setup the credentials for the requests
+			$credentials = new Credentials(
+				$this->google_id,
+				$this->google_secret,
+				$urlwithroot.'/core/modules/oauth/google_oauthcallback.php'
+			);
+			$access = ($storage->hasAccessToken($this->OAUTH_SERVICENAME_GOOGLE) ? 'HasAccessToken' : 'NoAccessToken');
+			$serviceFactory = new \OAuth\ServiceFactory();
+			$apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
+			$token_ok = true;
+			try {
+				$token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
+			} catch (Exception $e) {
+				$this->errors[] = $e->getMessage();
+				$token_ok = false;
+			}
+			//var_dump($this->errors);exit;
 
-                    $this->conf[] = array('varname'=>'TOKEN_REFRESH', 'info'=>((!empty($refreshtoken)) ? 'Yes' : 'No'), 'type'=>'info');
-                    $this->conf[] = array('varname'=>'TOKEN_EXPIRED', 'info'=>($expire ? 'Yes' : 'No'), 'type'=>'info');
-                    $this->conf[] = array('varname'=>'TOKEN_EXPIRE_AT', 'info'=>($expiredat), 'type'=>'info');
-                }
-                /*
+			$expire = false;
+			// Is token expired or will token expire in the next 30 seconds
+			if ($token_ok) {
+				$expire = ($token->getEndOfLife() !== -9002 && $token->getEndOfLife() !== -9001 && time() > ($token->getEndOfLife() - 30));
+			}
+
+			// Token expired so we refresh it
+			if ($token_ok && $expire) {
+				try {
+					// il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
+					$refreshtoken = $token->getRefreshToken();
+					$token = $apiService->refreshAccessToken($token);
+					$token->setRefreshToken($refreshtoken);
+					$storage->storeAccessToken($this->OAUTH_SERVICENAME_GOOGLE, $token);
+				} catch (Exception $e) {
+					$this->errors[] = $e->getMessage();
+				}
+			}
+			if ($this->google_id != '' && $this->google_secret != '') {
+				$this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'GoogleAuthConfigured', 'type'=>'info');
+				$this->conf[] = array(
+					'varname'=>'PRINTGCP_TOKEN_ACCESS',
+					'info'=>$access,
+					'type'=>'info',
+					'renew'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?state=userinfo_email,userinfo_profile,cloud_print&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'),
+					'delete'=>($storage->hasAccessToken($this->OAUTH_SERVICENAME_GOOGLE) ? $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp') : '')
+				);
+				if ($token_ok) {
+					$expiredat = '';
+
+					$refreshtoken = $token->getRefreshToken();
+
+					$endoflife = $token->getEndOfLife();
+
+					if ($endoflife == $token::EOL_NEVER_EXPIRES)
+					{
+						$expiredat = $langs->trans("Never");
+					} elseif ($endoflife == $token::EOL_UNKNOWN)
+					{
+						$expiredat = $langs->trans("Unknown");
+					} else {
+						$expiredat = dol_print_date($endoflife, "dayhour");
+					}
+
+					$this->conf[] = array('varname'=>'TOKEN_REFRESH', 'info'=>((!empty($refreshtoken)) ? 'Yes' : 'No'), 'type'=>'info');
+					$this->conf[] = array('varname'=>'TOKEN_EXPIRED', 'info'=>($expire ? 'Yes' : 'No'), 'type'=>'info');
+					$this->conf[] = array('varname'=>'TOKEN_EXPIRE_AT', 'info'=>($expiredat), 'type'=>'info');
+				}
+				/*
                 if ($storage->hasAccessToken($this->OAUTH_SERVICENAME_GOOGLE)) {
                     $this->conf[] = array('varname'=>'PRINTGCP_AUTHLINK', 'link'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'authlink');
                     $this->conf[] = array('varname'=>'DELETE_TOKEN', 'link'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'delete');
                 } else {
                     $this->conf[] = array('varname'=>'PRINTGCP_AUTHLINK', 'link'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'authlink');
                 }*/
-            } else {
-                $this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'GoogleAuthNotConfigured', 'type'=>'info');
-            }
-        }
-        // do not display submit button
-        $this->conf[] = array('enabled'=>0, 'type'=>'submit');
-    }
+			} else {
+				$this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'GoogleAuthNotConfigured', 'type'=>'info');
+			}
+		}
+		// do not display submit button
+		$this->conf[] = array('enabled'=>0, 'type'=>'submit');
+	}
 
-    /**
-     *  Return list of available printers
-     *
-     *  @return  int                     0 if OK, >0 if KO
-     */
-    public function listAvailablePrinters()
-    {
-        global $conf, $langs;
-        $error = 0;
-        $langs->load('printing');
+	/**
+	 *  Return list of available printers
+	 *
+	 *  @return  int                     0 if OK, >0 if KO
+	 */
+	public function listAvailablePrinters()
+	{
+		global $conf, $langs;
+		$error = 0;
+		$langs->load('printing');
 
-        $html = '<tr class="liste_titre">';
-        $html .= '<td>'.$langs->trans('GCP_Name').'</td>';
-        $html .= '<td>'.$langs->trans('GCP_displayName').'</td>';
-        $html .= '<td>'.$langs->trans('GCP_Id').'</td>';
-        $html .= '<td>'.$langs->trans('GCP_OwnerName').'</td>';
-        $html .= '<td>'.$langs->trans('GCP_State').'</td>';
-        $html .= '<td>'.$langs->trans('GCP_connectionStatus').'</td>';
-        $html .= '<td>'.$langs->trans('GCP_Type').'</td>';
-        $html .= '<td class="center">'.$langs->trans("Select").'</td>';
-        $html .= '</tr>'."\n";
-        $list = $this->getlistAvailablePrinters();
-        //$html.= '<td><pre>'.print_r($list,true).'</pre></td>';
-        foreach ($list['available'] as $printer_det)
-        {
-            $html .= '<tr class="oddeven">';
-            $html .= '<td>'.$printer_det['name'].'</td>';
-            $html .= '<td>'.$printer_det['displayName'].'</td>';
-            $html .= '<td>'.$printer_det['id'].'</td>'; // id to identify printer to use
-            $html .= '<td>'.$printer_det['ownerName'].'</td>';
-            $html .= '<td>'.$printer_det['status'].'</td>';
-            $html .= '<td>'.$langs->trans('STATE_'.$printer_det['connectionStatus']).'</td>';
-            $html .= '<td>'.$langs->trans('TYPE_'.$printer_det['type']).'</td>';
-            // Defaut
-            $html .= '<td class="center">';
-            if ($conf->global->PRINTING_GCP_DEFAULT == $printer_det['id'])
-            {
-                $html .= img_picto($langs->trans("Default"), 'on');
-            } else $html .= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;token='.newToken().'&amp;mode=test&amp;varname=PRINTING_GCP_DEFAULT&amp;driver=printgcp&amp;value='.urlencode($printer_det['id']).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-            $html .= '</td>';
-            $html .= '</tr>'."\n";
-        }
-        $this->resprint = $html;
-        return $error;
-    }
+		$html = '<tr class="liste_titre">';
+		$html .= '<td>'.$langs->trans('GCP_Name').'</td>';
+		$html .= '<td>'.$langs->trans('GCP_displayName').'</td>';
+		$html .= '<td>'.$langs->trans('GCP_Id').'</td>';
+		$html .= '<td>'.$langs->trans('GCP_OwnerName').'</td>';
+		$html .= '<td>'.$langs->trans('GCP_State').'</td>';
+		$html .= '<td>'.$langs->trans('GCP_connectionStatus').'</td>';
+		$html .= '<td>'.$langs->trans('GCP_Type').'</td>';
+		$html .= '<td class="center">'.$langs->trans("Select").'</td>';
+		$html .= '</tr>'."\n";
+		$list = $this->getlistAvailablePrinters();
+		//$html.= '<td><pre>'.print_r($list,true).'</pre></td>';
+		foreach ($list['available'] as $printer_det)
+		{
+			$html .= '<tr class="oddeven">';
+			$html .= '<td>'.$printer_det['name'].'</td>';
+			$html .= '<td>'.$printer_det['displayName'].'</td>';
+			$html .= '<td>'.$printer_det['id'].'</td>'; // id to identify printer to use
+			$html .= '<td>'.$printer_det['ownerName'].'</td>';
+			$html .= '<td>'.$printer_det['status'].'</td>';
+			$html .= '<td>'.$langs->trans('STATE_'.$printer_det['connectionStatus']).'</td>';
+			$html .= '<td>'.$langs->trans('TYPE_'.$printer_det['type']).'</td>';
+			// Defaut
+			$html .= '<td class="center">';
+			if ($conf->global->PRINTING_GCP_DEFAULT == $printer_det['id'])
+			{
+				$html .= img_picto($langs->trans("Default"), 'on');
+			} else $html .= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;token='.newToken().'&amp;mode=test&amp;varname=PRINTING_GCP_DEFAULT&amp;driver=printgcp&amp;value='.urlencode($printer_det['id']).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+			$html .= '</td>';
+			$html .= '</tr>'."\n";
+		}
+		$this->resprint = $html;
+		return $error;
+	}
 
 
-    /**
-     *  Return list of available printers
-     *
-     *  @return array      list of printers
-     */
-    public function getlistAvailablePrinters()
-    {
-        $ret = array();
-        // Token storage
-        $storage = new DoliStorage($this->db, $this->conf);
-        // Setup the credentials for the requests
-        $credentials = new Credentials(
-            $this->google_id,
-            $this->google_secret,
-            DOL_MAIN_URL_ROOT.'/core/modules/oauth/google_oauthcallback.php'
-        );
-        $serviceFactory = new \OAuth\ServiceFactory();
-        $apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
-        // Check if we have auth token
-        $token_ok = true;
-        try {
-            $token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
-        } catch (Exception $e) {
-            $this->errors[] = $e->getMessage();
-            $token_ok = false;
-        }
-        $expire = false;
-        // Is token expired or will token expire in the next 30 seconds
-        if ($token_ok) {
-            $expire = ($token->getEndOfLife() !== -9002 && $token->getEndOfLife() !== -9001 && time() > ($token->getEndOfLife() - 30));
-        }
+	/**
+	 *  Return list of available printers
+	 *
+	 *  @return array      list of printers
+	 */
+	public function getlistAvailablePrinters()
+	{
+		$ret = array();
+		// Token storage
+		$storage = new DoliStorage($this->db, $this->conf);
+		// Setup the credentials for the requests
+		$credentials = new Credentials(
+			$this->google_id,
+			$this->google_secret,
+			DOL_MAIN_URL_ROOT.'/core/modules/oauth/google_oauthcallback.php'
+		);
+		$serviceFactory = new \OAuth\ServiceFactory();
+		$apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
+		// Check if we have auth token
+		$token_ok = true;
+		try {
+			$token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
+		} catch (Exception $e) {
+			$this->errors[] = $e->getMessage();
+			$token_ok = false;
+		}
+		$expire = false;
+		// Is token expired or will token expire in the next 30 seconds
+		if ($token_ok) {
+			$expire = ($token->getEndOfLife() !== -9002 && $token->getEndOfLife() !== -9001 && time() > ($token->getEndOfLife() - 30));
+		}
 
-        // Token expired so we refresh it
-        if ($token_ok && $expire) {
-            try {
-                // il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
-                $refreshtoken = $token->getRefreshToken();
-                $token = $apiService->refreshAccessToken($token);
-                $token->setRefreshToken($refreshtoken);
-                $storage->storeAccessToken($this->OAUTH_SERVICENAME_GOOGLE, $token);
-            } catch (Exception $e) {
-                $this->errors[] = $e->getMessage();
-            }
-        }
-        // Send a request with api
-        try {
-            $response = $apiService->request(self::PRINTERS_SEARCH_URL);
-        } catch (Exception $e) {
-            $this->errors[] = $e->getMessage();
-            print '<pre>'.print_r($e->getMessage(), true).'</pre>';
-        }
-        //print '<tr><td><pre>'.print_r($response, true).'</pre></td></tr>';
-        $responsedata = json_decode($response, true);
-        $printers = $responsedata['printers'];
-        // Check if we have printers?
-        if (count($printers) == 0) {
-            // We dont have printers so return blank array
-            $ret['available'] = array();
-        } else {
-            // We have printers so returns printers as array
-            $ret['available'] = $printers;
-        }
-        return $ret;
-    }
+		// Token expired so we refresh it
+		if ($token_ok && $expire) {
+			try {
+				// il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
+				$refreshtoken = $token->getRefreshToken();
+				$token = $apiService->refreshAccessToken($token);
+				$token->setRefreshToken($refreshtoken);
+				$storage->storeAccessToken($this->OAUTH_SERVICENAME_GOOGLE, $token);
+			} catch (Exception $e) {
+				$this->errors[] = $e->getMessage();
+			}
+		}
+		// Send a request with api
+		try {
+			$response = $apiService->request(self::PRINTERS_SEARCH_URL);
+		} catch (Exception $e) {
+			$this->errors[] = $e->getMessage();
+			print '<pre>'.print_r($e->getMessage(), true).'</pre>';
+		}
+		//print '<tr><td><pre>'.print_r($response, true).'</pre></td></tr>';
+		$responsedata = json_decode($response, true);
+		$printers = $responsedata['printers'];
+		// Check if we have printers?
+		if (is_array($printers) && count($printers) == 0) {
+			// We dont have printers so return blank array
+			$ret['available'] = array();
+		} else {
+			// We have printers so returns printers as array
+			$ret['available'] = $printers;
+		}
+		return $ret;
+	}
 
-    /**
-     *  Print selected file
-     *
-     * @param   string      $file       file
-     * @param   string      $module     module
-     * @param   string      $subdir     subdir for file
-     * @return  int                     0 if OK, >0 if KO
-     */
-    public function printFile($file, $module, $subdir = '')
-    {
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	/**
+	 *  Print selected file
+	 *
+	 * @param   string      $file       file
+	 * @param   string      $module     module
+	 * @param   string      $subdir     subdir for file
+	 * @return  int                     0 if OK, >0 if KO
+	 */
+	public function printFile($file, $module, $subdir = '')
+	{
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        global $conf, $user;
-        $error = 0;
+		global $conf, $user;
+		$error = 0;
 
-        $fileprint = $conf->{$module}->dir_output;
-        if ($subdir != '') {
-            $fileprint .= '/'.$subdir;
-        }
-        $fileprint .= '/'.$file;
-        $mimetype = dol_mimetype($fileprint);
-        // select printer uri for module order, propal,...
-        $sql = "SELECT rowid, printer_id, copy FROM ".MAIN_DB_PREFIX."printing WHERE module='".$this->db->escape($module)."' AND driver='printgcp' AND userid=".$user->id;
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $obj = $this->db->fetch_object($result);
-            if ($obj)
-            {
-                $printer_id = $obj->printer_id;
-            } else {
-                if (!empty($conf->global->PRINTING_GCP_DEFAULT))
-                {
-                    $printer_id = $conf->global->PRINTING_GCP_DEFAULT;
-                } else {
-                    $this->errors[] = 'NoDefaultPrinterDefined';
-                    $error++;
-                    return $error;
-                }
-            }
-        } else {
-            dol_print_error($this->db);
-        }
+		$fileprint = $conf->{$module}->dir_output;
+		if ($subdir != '') {
+			$fileprint .= '/'.$subdir;
+		}
+		$fileprint .= '/'.$file;
+		$mimetype = dol_mimetype($fileprint);
+		// select printer uri for module order, propal,...
+		$sql = "SELECT rowid, printer_id, copy FROM ".MAIN_DB_PREFIX."printing WHERE module='".$this->db->escape($module)."' AND driver='printgcp' AND userid=".$user->id;
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$obj = $this->db->fetch_object($result);
+			if ($obj)
+			{
+				$printer_id = $obj->printer_id;
+			} else {
+				if (!empty($conf->global->PRINTING_GCP_DEFAULT))
+				{
+					$printer_id = $conf->global->PRINTING_GCP_DEFAULT;
+				} else {
+					$this->errors[] = 'NoDefaultPrinterDefined';
+					$error++;
+					return $error;
+				}
+			}
+		} else {
+			dol_print_error($this->db);
+		}
 
-        $ret = $this->sendPrintToPrinter($printer_id, $file, $fileprint, $mimetype);
-        $this->error = 'PRINTGCP: '.$ret['errormessage'];
-        if ($ret['status'] != 1) {
-            $error++;
-        }
-        return $error;
-    }
+		$ret = $this->sendPrintToPrinter($printer_id, $file, $fileprint, $mimetype);
+		$this->error = 'PRINTGCP: '.$ret['errormessage'];
+		if ($ret['status'] != 1) {
+			$error++;
+		}
+		return $error;
+	}
 
-    /**
-     *  Sends document to the printer
-     *
-     *  @param  string      $printerid      Printer id returned by Google Cloud Print
-     *  @param  string      $printjobtitle  Job Title
-     *  @param  string      $filepath       File Path to be send to Google Cloud Print
-     *  @param  string      $contenttype    File content type by example application/pdf, image/png
-     *  @return array                       status array
-     */
-    public function sendPrintToPrinter($printerid, $printjobtitle, $filepath, $contenttype)
-    {
-        // Check if printer id
-        if (empty($printerid)) {
-            return array('status' =>0, 'errorcode' =>'', 'errormessage'=>'No provided printer ID');
-        }
-        // Open the file which needs to be print
-        $handle = fopen($filepath, "rb");
-        if (!$handle) {
-            return array('status' =>0, 'errorcode' =>'', 'errormessage'=>'Could not read the file.');
-        }
-        // Read file content
-        $contents = fread($handle, filesize($filepath));
-        fclose($handle);
-        // Prepare post fields for sending print
-        $post_fields = array(
-            'printerid' => $printerid,
-            'title' => $printjobtitle,
-            'contentTransferEncoding' => 'base64',
-            'content' => base64_encode($contents), // encode file content as base64
-            'contentType' => $contenttype,
-        );
-        // Dolibarr Token storage
-        $storage = new DoliStorage($this->db, $this->conf);
-        // Setup the credentials for the requests
-        $credentials = new Credentials(
-            $this->google_id,
-            $this->google_secret,
-            DOL_MAIN_URL_ROOT.'/core/modules/oauth/google_oauthcallback.php?service=google'
-        );
-        $serviceFactory = new \OAuth\ServiceFactory();
-        $apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
+	/**
+	 *  Sends document to the printer
+	 *
+	 *  @param  string      $printerid      Printer id returned by Google Cloud Print
+	 *  @param  string      $printjobtitle  Job Title
+	 *  @param  string      $filepath       File Path to be send to Google Cloud Print
+	 *  @param  string      $contenttype    File content type by example application/pdf, image/png
+	 *  @return array                       status array
+	 */
+	public function sendPrintToPrinter($printerid, $printjobtitle, $filepath, $contenttype)
+	{
+		// Check if printer id
+		if (empty($printerid)) {
+			return array('status' =>0, 'errorcode' =>'', 'errormessage'=>'No provided printer ID');
+		}
+		// Open the file which needs to be print
+		$handle = fopen($filepath, "rb");
+		if (!$handle) {
+			return array('status' =>0, 'errorcode' =>'', 'errormessage'=>'Could not read the file.');
+		}
+		// Read file content
+		$contents = fread($handle, filesize($filepath));
+		fclose($handle);
+		// Prepare post fields for sending print
+		$post_fields = array(
+			'printerid' => $printerid,
+			'title' => $printjobtitle,
+			'contentTransferEncoding' => 'base64',
+			'content' => base64_encode($contents), // encode file content as base64
+			'contentType' => $contenttype,
+		);
+		// Dolibarr Token storage
+		$storage = new DoliStorage($this->db, $this->conf);
+		// Setup the credentials for the requests
+		$credentials = new Credentials(
+			$this->google_id,
+			$this->google_secret,
+			DOL_MAIN_URL_ROOT.'/core/modules/oauth/google_oauthcallback.php?service=google'
+		);
+		$serviceFactory = new \OAuth\ServiceFactory();
+		$apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
 
-        // Check if we have auth token and refresh it
-        $token_ok = true;
-        try {
-            $token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
-        } catch (Exception $e) {
-            $this->errors[] = $e->getMessage();
-            $token_ok = false;
-        }
-        if ($token_ok) {
-            try {
-                // il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
-                $refreshtoken = $token->getRefreshToken();
-                $token = $apiService->refreshAccessToken($token);
-                $token->setRefreshToken($refreshtoken);
-                $storage->storeAccessToken($this->OAUTH_SERVICENAME_GOOGLE, $token);
-            } catch (Exception $e) {
-                $this->errors[] = $e->getMessage();
-            }
-        }
+		// Check if we have auth token and refresh it
+		$token_ok = true;
+		try {
+			$token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
+		} catch (Exception $e) {
+			$this->errors[] = $e->getMessage();
+			$token_ok = false;
+		}
+		if ($token_ok) {
+			try {
+				// il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
+				$refreshtoken = $token->getRefreshToken();
+				$token = $apiService->refreshAccessToken($token);
+				$token->setRefreshToken($refreshtoken);
+				$storage->storeAccessToken($this->OAUTH_SERVICENAME_GOOGLE, $token);
+			} catch (Exception $e) {
+				$this->errors[] = $e->getMessage();
+			}
+		}
 
-        // Send a request with api
-        $response = json_decode($apiService->request(self::PRINT_URL, 'POST', $post_fields), true);
-        //print '<tr><td><pre>'.print_r($response, true).'</pre></td></tr>';
-        return array('status' => $response['success'], 'errorcode' => $response['errorCode'], 'errormessage' => $response['message']);
-    }
+		// Send a request with api
+		$response = json_decode($apiService->request(self::PRINT_URL, 'POST', $post_fields), true);
+		//print '<tr><td><pre>'.print_r($response, true).'</pre></td></tr>';
+		return array('status' => $response['success'], 'errorcode' => $response['errorCode'], 'errormessage' => $response['message']);
+	}
 
 
-    /**
-     *  List jobs print
-     *
-     *  @return  int                     0 if OK, >0 if KO
-     */
-    public function listJobs()
-    {
-        global $conf, $langs;
+	/**
+	 *  List jobs print
+	 *
+	 *  @return  int                     0 if OK, >0 if KO
+	 */
+	public function listJobs()
+	{
+		global $conf, $langs;
 
-        $error = 0;
-        $html = '';
-        // Token storage
-        $storage = new DoliStorage($this->db, $this->conf);
-        // Setup the credentials for the requests
-        $credentials = new Credentials(
-            $this->google_id,
-            $this->google_secret,
-            DOL_MAIN_URL_ROOT.'/core/modules/oauth/google_oauthcallback.php'
-        );
-        $serviceFactory = new \OAuth\ServiceFactory();
-        $apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
-        // Check if we have auth token
-        $token_ok = true;
-        try {
-            $token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
-        } catch (Exception $e) {
-            $this->errors[] = $e->getMessage();
-            $token_ok = false;
-            $error++;
-        }
-        $expire = false;
-        // Is token expired or will token expire in the next 30 seconds
-        if ($token_ok) {
-            $expire = ($token->getEndOfLife() !== -9002 && $token->getEndOfLife() !== -9001 && time() > ($token->getEndOfLife() - 30));
-        }
+		$error = 0;
+		$html = '';
+		// Token storage
+		$storage = new DoliStorage($this->db, $this->conf);
+		// Setup the credentials for the requests
+		$credentials = new Credentials(
+			$this->google_id,
+			$this->google_secret,
+			DOL_MAIN_URL_ROOT.'/core/modules/oauth/google_oauthcallback.php'
+		);
+		$serviceFactory = new \OAuth\ServiceFactory();
+		$apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
+		// Check if we have auth token
+		$token_ok = true;
+		try {
+			$token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
+		} catch (Exception $e) {
+			$this->errors[] = $e->getMessage();
+			$token_ok = false;
+			$error++;
+		}
+		$expire = false;
+		// Is token expired or will token expire in the next 30 seconds
+		if ($token_ok) {
+			$expire = ($token->getEndOfLife() !== -9002 && $token->getEndOfLife() !== -9001 && time() > ($token->getEndOfLife() - 30));
+		}
 
-        // Token expired so we refresh it
-        if ($token_ok && $expire) {
-            try {
-                // il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
-                $refreshtoken = $token->getRefreshToken();
-                $token = $apiService->refreshAccessToken($token);
-                $token->setRefreshToken($refreshtoken);
-                $storage->storeAccessToken($this->OAUTH_SERVICENAME_GOOGLE, $token);
-            } catch (Exception $e) {
-                $this->errors[] = $e->getMessage();
-                $error++;
-            }
-        }
-        // Getting Jobs
-        // Send a request with api
-        try {
-            $response = $apiService->request(self::PRINTERS_GET_JOBS);
-        } catch (Exception $e) {
-            $this->errors[] = $e->getMessage();
-            $error++;
-        }
-        $responsedata = json_decode($response, true);
-        //$html .= '<pre>'.print_r($responsedata,true).'</pre>';
-        $html .= '<div class="div-table-responsive">';
-        $html .= '<table width="100%" class="noborder">';
-        $html .= '<tr class="liste_titre">';
-        $html .= '<td>'.$langs->trans("Id").'</td>';
-        $html .= '<td>'.$langs->trans("Date").'</td>';
-        $html .= '<td>'.$langs->trans("Owner").'</td>';
-        $html .= '<td>'.$langs->trans("Printer").'</td>';
-        $html .= '<td>'.$langs->trans("Filename").'</td>';
-        $html .= '<td>'.$langs->trans("Status").'</td>';
-        $html .= '<td>'.$langs->trans("Cancel").'</td>';
-        $html .= '</tr>'."\n";
+		// Token expired so we refresh it
+		if ($token_ok && $expire) {
+			try {
+				// il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
+				$refreshtoken = $token->getRefreshToken();
+				$token = $apiService->refreshAccessToken($token);
+				$token->setRefreshToken($refreshtoken);
+				$storage->storeAccessToken($this->OAUTH_SERVICENAME_GOOGLE, $token);
+			} catch (Exception $e) {
+				$this->errors[] = $e->getMessage();
+				$error++;
+			}
+		}
+		// Getting Jobs
+		// Send a request with api
+		try {
+			$response = $apiService->request(self::PRINTERS_GET_JOBS);
+		} catch (Exception $e) {
+			$this->errors[] = $e->getMessage();
+			$error++;
+		}
+		$responsedata = json_decode($response, true);
+		//$html .= '<pre>'.print_r($responsedata,true).'</pre>';
+		$html .= '<div class="div-table-responsive">';
+		$html .= '<table width="100%" class="noborder">';
+		$html .= '<tr class="liste_titre">';
+		$html .= '<td>'.$langs->trans("Id").'</td>';
+		$html .= '<td>'.$langs->trans("Date").'</td>';
+		$html .= '<td>'.$langs->trans("Owner").'</td>';
+		$html .= '<td>'.$langs->trans("Printer").'</td>';
+		$html .= '<td>'.$langs->trans("Filename").'</td>';
+		$html .= '<td>'.$langs->trans("Status").'</td>';
+		$html .= '<td>'.$langs->trans("Cancel").'</td>';
+		$html .= '</tr>'."\n";
 
-        $jobs = $responsedata['jobs'];
-        //$html .= '<pre>'.print_r($jobs['0'],true).'</pre>';
-        if (is_array($jobs)) {
-            foreach ($jobs as $value) {
-                $html .= '<tr class="oddeven">';
-                $html .= '<td>'.$value['id'].'</td>';
-                $dates = dol_print_date((int) substr($value['createTime'], 0, 10), 'dayhour');
-                $html .= '<td>'.$dates.'</td>';
-                $html .= '<td>'.$value['ownerId'].'</td>';
-                $html .= '<td>'.$value['printerName'].'</td>';
-                $html .= '<td>'.$value['title'].'</td>';
-                $html .= '<td>'.$value['status'].'</td>';
-                $html .= '<td>&nbsp;</td>';
-                $html .= '</tr>';
-            }
-        } else {
-                $html .= '<tr class="oddeven">';
-                $html .= '<td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td>';
-                $html .= '</tr>';
-        }
-        $html .= '</table>';
-        $html .= '</div>';
+		$jobs = $responsedata['jobs'];
+		//$html .= '<pre>'.print_r($jobs['0'],true).'</pre>';
+		if (is_array($jobs)) {
+			foreach ($jobs as $value) {
+				$html .= '<tr class="oddeven">';
+				$html .= '<td>'.$value['id'].'</td>';
+				$dates = dol_print_date((int) substr($value['createTime'], 0, 10), 'dayhour');
+				$html .= '<td>'.$dates.'</td>';
+				$html .= '<td>'.$value['ownerId'].'</td>';
+				$html .= '<td>'.$value['printerName'].'</td>';
+				$html .= '<td>'.$value['title'].'</td>';
+				$html .= '<td>'.$value['status'].'</td>';
+				$html .= '<td>&nbsp;</td>';
+				$html .= '</tr>';
+			}
+		} else {
+				$html .= '<tr class="oddeven">';
+				$html .= '<td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td>';
+				$html .= '</tr>';
+		}
+		$html .= '</table>';
+		$html .= '</div>';
 
-        $this->resprint = $html;
+		$this->resprint = $html;
 
-        return $error;
-    }
+		return $error;
+	}
 }
diff --git a/htdocs/core/modules/printing/printipp.modules.php b/htdocs/core/modules/printing/printipp.modules.php
index 6b0e528aa1e..5d840cb5ca3 100644
--- a/htdocs/core/modules/printing/printipp.modules.php
+++ b/htdocs/core/modules/printing/printipp.modules.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (C) 2014-2018  Frederic France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2014-2020  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
@@ -30,284 +30,322 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/printing/modules_printing.php';
  */
 class printing_printipp extends PrintingDriver
 {
-    public $name = 'printipp';
-    public $desc = 'PrintIPPDesc';
+	/**
+	 * @var string module name
+	 */
+	public $name = 'printipp';
 
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto = 'printer';
-    public $active = 'PRINTING_PRINTIPP';
-    public $conf = array();
-    public $host;
-    public $port;
-    public $userid; /* user login */
-    public $user;
-    public $password;
+	/**
+	 * @var string module description
+	 */
+	public $desc = 'PrintIPPDesc';
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'printer';
 
-    /**
-     * @var string[] Error codes (or messages)
-     */
-    public $errors = array();
+	/**
+	 * @var string Constant name
+	 */
+	public $active = 'PRINTING_PRINTIPP';
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var array array of setup value
+	 */
+	public $conf = array();
+
+	/**
+	 * @var string host
+	 */
+	public $host;
+
+	/**
+	 * @var string port
+	 */
+	public $port;
+
+	/**
+	 * @var string username
+	 */
+	public $userid;
+
+	/**
+	 * @var string login for printer host
+	 */
+	public $user;
+
+	/**
+	 * @var string password for printer host
+	 */
+	public $password;
+
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
+
+	/**
+	 * @var string[] Error codes (or messages)
+	 */
+	public $errors = array();
+
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
+
+	const LANGFILE = 'printipp';
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB      $db      Database handler
-     */
-    public function __construct($db)
-    {
-        global $conf;
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB      $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf;
 
-        $this->db = $db;
-        $this->host = $conf->global->PRINTIPP_HOST;
-        $this->port = $conf->global->PRINTIPP_PORT;
-        $this->user = $conf->global->PRINTIPP_USER;
-        $this->password = $conf->global->PRINTIPP_PASSWORD;
-        $this->conf[] = array('varname'=>'PRINTIPP_HOST', 'required'=>1, 'example'=>'localhost', 'type'=>'text');
-        $this->conf[] = array('varname'=>'PRINTIPP_PORT', 'required'=>1, 'example'=>'631', 'type'=>'text');
-        $this->conf[] = array('varname'=>'PRINTIPP_USER', 'required'=>0, 'example'=>'', 'type'=>'text', 'moreattributes'=>'autocomplete="off"');
-        $this->conf[] = array('varname'=>'PRINTIPP_PASSWORD', 'required'=>0, 'example'=>'', 'type'=>'password', 'moreattributes'=>'autocomplete="off"');
-        $this->conf[] = array('enabled'=>1, 'type'=>'submit');
-    }
+		$this->db = $db;
+		$this->host = $conf->global->PRINTIPP_HOST;
+		$this->port = $conf->global->PRINTIPP_PORT;
+		$this->user = $conf->global->PRINTIPP_USER;
+		$this->password = $conf->global->PRINTIPP_PASSWORD;
+		$this->conf[] = array('varname'=>'PRINTIPP_HOST', 'required'=>1, 'example'=>'localhost', 'type'=>'text');
+		$this->conf[] = array('varname'=>'PRINTIPP_PORT', 'required'=>1, 'example'=>'631', 'type'=>'text');
+		$this->conf[] = array('varname'=>'PRINTIPP_USER', 'required'=>0, 'example'=>'', 'type'=>'text', 'moreattributes'=>'autocomplete="off"');
+		$this->conf[] = array('varname'=>'PRINTIPP_PASSWORD', 'required'=>0, 'example'=>'', 'type'=>'password', 'moreattributes'=>'autocomplete="off"');
+		$this->conf[] = array('enabled'=>1, 'type'=>'submit');
+	}
 
-    /**
-     *  Print selected file
-     *
-     * @param   string      $file       file
-     * @param   string      $module     module
-     * @param   string      $subdir     subdirectory of document like for expedition subdir is sendings
-     *
-     * @return  int                     0 if OK, >0 if KO
-     */
-    public function printFile($file, $module, $subdir = '')
-    {
-        global $conf, $user;
-        $error = 0;
+	/**
+	 *  Print selected file
+	 *
+	 * @param   string      $file       file
+	 * @param   string      $module     module
+	 * @param   string      $subdir     subdirectory of document like for expedition subdir is sendings
+	 *
+	 * @return  int                     0 if OK, >0 if KO
+	 */
+	public function printFile($file, $module, $subdir = '')
+	{
+		global $conf, $user;
+		$error = 0;
 
-        include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
+		include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
 
-        $ipp = new CupsPrintIPP();
-        $ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log', 'file', 3); // logging very verbose
-        $ipp->setHost($this->host);
-        $ipp->setPort($this->port);
-        $ipp->setJobName($file, true);
-        $ipp->setUserName($this->userid);
-        if (!empty($this->user)) $ipp->setAuthentication($this->user, $this->password);
+		$ipp = new CupsPrintIPP();
+		$ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log', 'file', 3); // logging very verbose
+		$ipp->setHost($this->host);
+		$ipp->setPort($this->port);
+		$ipp->setJobName($file, true);
+		$ipp->setUserName($this->userid);
+		// Set default number of copy
+		$ipp->setCopies(1);
+		if (!empty($this->user)) $ipp->setAuthentication($this->user, $this->password);
 
-        // select printer uri for module order, propal,...
-        $sql = "SELECT rowid,printer_id,copy FROM ".MAIN_DB_PREFIX."printing WHERE module = '".$this->db->escape($module)."' AND driver = 'printipp' AND userid = ".$user->id;
-        $result = $this->db->query($sql);
-        if ($result) {
-            $obj = $this->db->fetch_object($result);
-            if ($obj)
-            {
-            	dol_syslog("Found a default printer for user ".$user->id." = ".$obj->printer_id);
-                $ipp->setPrinterURI($obj->printer_id);
-            } else {
-                if (!empty($conf->global->PRINTIPP_URI_DEFAULT))
-                {
-                    dol_syslog("Will use default printer conf->global->PRINTIPP_URI_DEFAULT = ".$conf->global->PRINTIPP_URI_DEFAULT);
-                    $ipp->setPrinterURI($conf->global->PRINTIPP_URI_DEFAULT);
-                } else {
-                    $this->errors[] = 'NoDefaultPrinterDefined';
-                    $error++;
-                    return $error;
-                }
-            }
-        } else {
-            dol_print_error($this->db);
-        }
+		// select printer uri for module order, propal,...
+		$sql = "SELECT rowid,printer_id,copy FROM ".MAIN_DB_PREFIX."printing WHERE module = '".$this->db->escape($module)."' AND driver = 'printipp' AND userid = ".$user->id;
+		$result = $this->db->query($sql);
+		if ($result) {
+			$obj = $this->db->fetch_object($result);
+			if ($obj) {
+				dol_syslog("Found a default printer for user ".$user->id." = ".$obj->printer_id);
+				$ipp->setPrinterURI($obj->printer_id);
+				// Set number of copy
+				$ipp->setCopies($obj->copy);
+			} else {
+				if (!empty($conf->global->PRINTIPP_URI_DEFAULT))
+				{
+					dol_syslog("Will use default printer conf->global->PRINTIPP_URI_DEFAULT = ".$conf->global->PRINTIPP_URI_DEFAULT);
+					$ipp->setPrinterURI($conf->global->PRINTIPP_URI_DEFAULT);
+				} else {
+					$this->errors[] = 'NoDefaultPrinterDefined';
+					$error++;
+					return $error;
+				}
+			}
+		} else {
+			dol_print_error($this->db);
+		}
 
-        // Set number of copy
-        $ipp->setCopies($obj->copy);
-        $fileprint = $conf->{$module}->dir_output;
-        if ($subdir != '') $fileprint .= '/'.$subdir;
-        $fileprint .= '/'.$file;
-        $ipp->setData($fileprint);
-        try {
-            $ipp->printJob();
-        } catch (Exception $e) {
-            $this->errors[] = $e->getMessage();
-            $error++;
-        }
-        if ($error == 0) $this->errors[] = 'PRINTIPP: Job added';
+		$fileprint = $conf->{$module}->dir_output;
+		if ($subdir != '') $fileprint .= '/'.$subdir;
+		$fileprint .= '/'.$file;
+		$ipp->setData($fileprint);
+		try {
+			$ipp->printJob();
+		} catch (Exception $e) {
+			$this->errors[] = $e->getMessage();
+			$error++;
+		}
+		if ($error == 0) $this->errors[] = 'PRINTIPP: Job added';
 
-        return $error;
-    }
+		return $error;
+	}
 
-    /**
-     *  Return list of available printers
-     *
-     *  @return  int                     0 if OK, >0 if KO
-     */
-    public function listAvailablePrinters()
-    {
-        global $conf, $langs;
-        $error = 0;
+	/**
+	 *  Return list of available printers
+	 *
+	 *  @return  int                     0 if OK, >0 if KO
+	 */
+	public function listAvailablePrinters()
+	{
+		global $conf, $langs;
+		$error = 0;
 
-        $html = '<tr class="liste_titre">';
-        $html .= '<td>'.$langs->trans('IPP_Uri').'</td>';
-        $html .= '<td>'.$langs->trans('IPP_Name').'</td>';
-        $html .= '<td>'.$langs->trans('IPP_State').'</td>';
-        $html .= '<td>'.$langs->trans('IPP_State_reason').'</td>';
-        $html .= '<td>'.$langs->trans('IPP_State_reason1').'</td>';
-        $html .= '<td>'.$langs->trans('IPP_BW').'</td>';
-        $html .= '<td>'.$langs->trans('IPP_Color').'</td>';
-        //$html.= '<td>'.$langs->trans('IPP_Device').'</td>';
-        $html .= '<td>'.$langs->trans('IPP_Media').'</td>';
-        $html .= '<td>'.$langs->trans('IPP_Supported').'</td>';
-        $html .= '<td class="center">'.$langs->trans("Select").'</td>';
-        $html .= "</tr>\n";
-        $list = $this->getlistAvailablePrinters();
-        foreach ($list as $value) {
-            $printer_det = $this->getPrinterDetail($value);
-            $html .= '<tr class="oddeven">';
-            $html .= '<td>'.$value.'</td>';
-            //$html.= '<td><pre>'.print_r($printer_det,true).'</pre></td>';
-            $html .= '<td>'.$printer_det->printer_name->_value0.'</td>';
-            $html .= '<td>'.$langs->trans('STATE_IPP_'.$printer_det->printer_state->_value0).'</td>';
-            $html .= '<td>'.$langs->trans('STATE_IPP_'.$printer_det->printer_state_reasons->_value0).'</td>';
-            $html .= '<td>'.(!empty($printer_det->printer_state_reasons->_value1) ? $langs->trans('STATE_IPP_'.$printer_det->printer_state_reasons->_value1) : '').'</td>';
-            $html .= '<td>'.$langs->trans('IPP_COLOR_'.$printer_det->printer_type->_value2).'</td>';
-            $html .= '<td>'.$langs->trans('IPP_COLOR_'.$printer_det->printer_type->_value3).'</td>';
-            //$html.= '<td>'.$printer_det->device_uri->_value0.'</td>';
-            $html .= '<td>'.$printer_det->media_default->_value0.'</td>';
-            $html .= '<td>'.$langs->trans('MEDIA_IPP_'.$printer_det->media_type_supported->_value1).'</td>';
-            // Defaut
-            $html .= '<td class="center">';
-            if ($conf->global->PRINTIPP_URI_DEFAULT == $value) {
-                $html .= img_picto($langs->trans("Default"), 'on');
-            } else {
-                $html .= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;token='.newToken().'&amp;mode=test&amp;varname=PRINTIPP_URI_DEFAULT&amp;driver=printipp&amp;value='.urlencode($value).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-            }
-            $html .= '</td>';
-            $html .= '</tr>'."\n";
-        }
-        $this->resprint = $html;
-        return $error;
-    }
+		$html = '<tr class="liste_titre">';
+		$html .= '<td>'.$langs->trans('IPP_Uri').'</td>';
+		$html .= '<td>'.$langs->trans('IPP_Name').'</td>';
+		$html .= '<td>'.$langs->trans('IPP_State').'</td>';
+		$html .= '<td>'.$langs->trans('IPP_State_reason').'</td>';
+		$html .= '<td>'.$langs->trans('IPP_State_reason1').'</td>';
+		$html .= '<td>'.$langs->trans('IPP_BW').'</td>';
+		$html .= '<td>'.$langs->trans('IPP_Color').'</td>';
+		//$html.= '<td>'.$langs->trans('IPP_Device').'</td>';
+		$html .= '<td>'.$langs->trans('IPP_Media').'</td>';
+		$html .= '<td>'.$langs->trans('IPP_Supported').'</td>';
+		$html .= '<td class="center">'.$langs->trans("Select").'</td>';
+		$html .= "</tr>\n";
+		$list = $this->getlistAvailablePrinters();
+		foreach ($list as $value) {
+			$printer_det = $this->getPrinterDetail($value);
+			$html .= '<tr class="oddeven">';
+			$html .= '<td>'.$value.'</td>';
+			//$html.= '<td><pre>'.print_r($printer_det,true).'</pre></td>';
+			$html .= '<td>'.$printer_det->printer_name->_value0.'</td>';
+			$html .= '<td>'.$langs->trans('STATE_IPP_'.$printer_det->printer_state->_value0).'</td>';
+			$html .= '<td>'.$langs->trans('STATE_IPP_'.$printer_det->printer_state_reasons->_value0).'</td>';
+			$html .= '<td>'.(!empty($printer_det->printer_state_reasons->_value1) ? $langs->trans('STATE_IPP_'.$printer_det->printer_state_reasons->_value1) : '').'</td>';
+			$html .= '<td>'.$langs->trans('IPP_COLOR_'.$printer_det->printer_type->_value2).'</td>';
+			$html .= '<td>'.$langs->trans('IPP_COLOR_'.$printer_det->printer_type->_value3).'</td>';
+			//$html.= '<td>'.$printer_det->device_uri->_value0.'</td>';
+			$html .= '<td>'.$printer_det->media_default->_value0.'</td>';
+			$html .= '<td>'.$langs->trans('MEDIA_IPP_'.$printer_det->media_type_supported->_value1).'</td>';
+			// Defaut
+			$html .= '<td class="center">';
+			if ($conf->global->PRINTIPP_URI_DEFAULT == $value) {
+				$html .= img_picto($langs->trans("Default"), 'on');
+			} else {
+				$html .= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;token='.newToken().'&amp;mode=test&amp;varname=PRINTIPP_URI_DEFAULT&amp;driver=printipp&amp;value='.urlencode($value).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+			}
+			$html .= '</td>';
+			$html .= '</tr>'."\n";
+		}
+		$this->resprint = $html;
+		return $error;
+	}
 
-    /**
-     *  Return list of available printers
-     *
-     *  @return array                list of printers
-     */
-    public function getlistAvailablePrinters()
-    {
-        global $conf, $db;
-        include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
-        $ipp = new CupsPrintIPP();
-        $ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log', 'file', 3); // logging very verbose
-        $ipp->setHost($this->host);
-        $ipp->setPort($this->port);
-        $ipp->setUserName($this->userid);
-        if (!empty($this->user)) {
-            $ipp->setAuthentication($this->user, $this->password);
-        }
-        $ipp->getPrinters();
-        return $ipp->available_printers;
-    }
+	/**
+	 *  Return list of available printers
+	 *
+	 *  @return array                list of printers
+	 */
+	public function getlistAvailablePrinters()
+	{
+		global $conf, $db;
+		include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
+		$ipp = new CupsPrintIPP();
+		$ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log', 'file', 3); // logging very verbose
+		$ipp->setHost($this->host);
+		$ipp->setPort($this->port);
+		$ipp->setUserName($this->userid);
+		if (!empty($this->user)) {
+			$ipp->setAuthentication($this->user, $this->password);
+		}
+		$ipp->getPrinters();
+		return $ipp->available_printers;
+	}
 
-    /**
-     *  Get printer detail
-     *
-     *  @param  string  $uri    URI
-     *  @return array           List of attributes
-     */
-    private function getPrinterDetail($uri)
-    {
-        global $conf, $db;
+	/**
+	 *  Get printer detail
+	 *
+	 *  @param  string  $uri    URI
+	 *  @return array           List of attributes
+	 */
+	private function getPrinterDetail($uri)
+	{
+		global $conf, $db;
 
-        include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
-        $ipp = new CupsPrintIPP();
-        $ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log', 'file', 3); // logging very verbose
-        $ipp->setHost($this->host);
-        $ipp->setPort($this->port);
-        $ipp->setUserName($this->userid);
-        if (!empty($this->user)) {
-            $ipp->setAuthentication($this->user, $this->password);
-        }
-        $ipp->setPrinterURI($uri);
-        $ipp->getPrinterAttributes();
-        return $ipp->printer_attributes;
-    }
+		include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
+		$ipp = new CupsPrintIPP();
+		$ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log', 'file', 3); // logging very verbose
+		$ipp->setHost($this->host);
+		$ipp->setPort($this->port);
+		$ipp->setUserName($this->userid);
+		if (!empty($this->user)) {
+			$ipp->setAuthentication($this->user, $this->password);
+		}
+		$ipp->setPrinterURI($uri);
+		$ipp->getPrinterAttributes();
+		return $ipp->printer_attributes;
+	}
 
-    /**
-     *  List jobs print
-     *
-     *  @param   string      $module     module
-     *
-     *  @return  int                     0 if OK, >0 if KO
-     */
-    public function listJobs($module)
-    {
-        global $conf;
-        $error = 0;
-        $html = '';
-        include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
-        $ipp = new CupsPrintIPP();
-        $ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log', 'file', 3); // logging very verbose
-        $ipp->setHost($this->host);
-        $ipp->setPort($this->port);
-        $ipp->setUserName($this->userid);
-        if (!empty($this->user)) {
-            $ipp->setAuthentication($this->user, $this->password);
-        }
-        // select printer uri for module order, propal,...
-        $sql = 'SELECT rowid,printer_uri,printer_name FROM '.MAIN_DB_PREFIX.'printer_ipp WHERE module="'.$module.'"';
-        $result = $this->db->query($sql);
-        if ($result) {
-            $obj = $this->db->fetch_object($result);
-            if ($obj) {
-                $ipp->setPrinterURI($obj->printer_uri);
-            } else {
-                // All printers
-                $ipp->setPrinterURI("ipp://localhost:631/printers/");
-            }
-        }
-        // Getting Jobs
-        try {
-            $ipp->getJobs(false, 0, 'completed', false);
-        } catch (Exception $e) {
-            $this->errors[] = $e->getMessage();
-            $error++;
-        }
-        $html .= '<table width="100%" class="noborder">';
-        $html .= '<tr class="liste_titre">';
-        $html .= '<td>Id</td>';
-        $html .= '<td>Owner</td>';
-        $html .= '<td>Printer</td>';
-        $html .= '<td>File</td>';
-        $html .= '<td>Status</td>';
-        $html .= '<td>Cancel</td>';
-        $html .= '</tr>'."\n";
-        $jobs = $ipp->jobs_attributes;
+	/**
+	 *  List jobs print
+	 *
+	 *  @param   string      $module     module
+	 *
+	 *  @return  int                     0 if OK, >0 if KO
+	 */
+	public function listJobs($module)
+	{
+		global $conf;
+		$error = 0;
+		$html = '';
+		include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
+		$ipp = new CupsPrintIPP();
+		$ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log', 'file', 3); // logging very verbose
+		$ipp->setHost($this->host);
+		$ipp->setPort($this->port);
+		$ipp->setUserName($this->userid);
+		if (!empty($this->user)) {
+			$ipp->setAuthentication($this->user, $this->password);
+		}
+		// select printer uri for module order, propal,...
+		$sql = 'SELECT rowid,printer_uri,printer_name FROM '.MAIN_DB_PREFIX.'printer_ipp WHERE module="'.$module.'"';
+		$result = $this->db->query($sql);
+		if ($result) {
+			$obj = $this->db->fetch_object($result);
+			if ($obj) {
+				$ipp->setPrinterURI($obj->printer_uri);
+			} else {
+				// All printers
+				$ipp->setPrinterURI("ipp://localhost:631/printers/");
+			}
+		}
+		// Getting Jobs
+		try {
+			$ipp->getJobs(false, 0, 'completed', false);
+		} catch (Exception $e) {
+			$this->errors[] = $e->getMessage();
+			$error++;
+		}
+		$html .= '<table width="100%" class="noborder">';
+		$html .= '<tr class="liste_titre">';
+		$html .= '<td>Id</td>';
+		$html .= '<td>Owner</td>';
+		$html .= '<td>Printer</td>';
+		$html .= '<td>File</td>';
+		$html .= '<td>Status</td>';
+		$html .= '<td>Cancel</td>';
+		$html .= '</tr>'."\n";
+		$jobs = $ipp->jobs_attributes;
 
-        //$html .= '<pre>'.print_r($jobs,true).'</pre>';
-        foreach ($jobs as $value) {
-            $html .= '<tr class="oddeven">';
-            $html .= '<td>'.$value->job_id->_value0.'</td>';
-            $html .= '<td>'.$value->job_originating_user_name->_value0.'</td>';
-            $html .= '<td>'.$value->printer_uri->_value0.'</td>';
-            $html .= '<td>'.$value->job_name->_value0.'</td>';
-            $html .= '<td>'.$value->job_state->_value0.'</td>';
-            $html .= '<td>'.$value->job_uri->_value0.'</td>';
-            $html .= '</tr>';
-        }
-        $html .= "</table>";
-        $this->resprint = $html;
-        return $error;
-    }
+		//$html .= '<pre>'.print_r($jobs,true).'</pre>';
+		foreach ($jobs as $value) {
+			$html .= '<tr class="oddeven">';
+			$html .= '<td>'.$value->job_id->_value0.'</td>';
+			$html .= '<td>'.$value->job_originating_user_name->_value0.'</td>';
+			$html .= '<td>'.$value->printer_uri->_value0.'</td>';
+			$html .= '<td>'.$value->job_name->_value0.'</td>';
+			$html .= '<td>'.$value->job_state->_value0.'</td>';
+			$html .= '<td>'.$value->job_uri->_value0.'</td>';
+			$html .= '</tr>';
+		}
+		$html .= "</table>";
+		$this->resprint = $html;
+		return $error;
+	}
 }
diff --git a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
index f8460b7483f..90836ca4fd9 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
@@ -41,12 +41,12 @@ class pdf_standardlabel extends CommonStickerGenerator
 	 * @param	array		$param			Associative array containing label content and optional parameters
 	 * @return	void
 	 */
-    public function addSticker(&$pdf, $outputlangs, $param)
-    {
+	public function addSticker(&$pdf, $outputlangs, $param)
+	{
 		// use this method in future refactoring
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0)
 	 * - %LOGO% is replace with company logo
@@ -63,7 +63,7 @@ class pdf_standardlabel extends CommonStickerGenerator
 	 */
 	public function Add_PDF_label(&$pdf, $textleft, $header, $footer, $outputlangs, $textright = '', $photo = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $mysoc, $conf, $langs;
 		global $forceimgscalewidth, $forceimgscaleheight;
 
@@ -219,7 +219,7 @@ class pdf_standardlabel extends CommonStickerGenerator
 
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to build PDF on disk, then output on HTTP strem.
 	 *
@@ -232,21 +232,21 @@ class pdf_standardlabel extends CommonStickerGenerator
 	 */
 	public function write_file($arrayofrecords, $outputlangs, $srctemplatepath, $outputdir = '', $filename = 'tmp_address_sheet.pdf')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $conf, $langs, $mysoc, $_Avery_Labels;
 
 		$this->code = $srctemplatepath;
 		$this->Tformat = $_Avery_Labels[$this->code];
 		if (empty($this->Tformat)) { dol_print_error('', 'ErrorBadTypeForCard'.$this->code); exit; }
 		$this->type = 'pdf';
-        // standard format or custom
-        if ($this->Tformat['paper-size'] != 'custom') {
-            $this->format = $this->Tformat['paper-size'];
-        } else {
-            //custom
-            $resolution = array($this->Tformat['custom_x'], $this->Tformat['custom_y']);
-            $this->format = $resolution;
-        }
+		// standard format or custom
+		if ($this->Tformat['paper-size'] != 'custom') {
+			$this->format = $this->Tformat['paper-size'];
+		} else {
+			//custom
+			$resolution = array($this->Tformat['custom_x'], $this->Tformat['custom_y']);
+			$this->format = $resolution;
+		}
 
 		if (!is_object($outputlangs)) $outputlangs = $langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
diff --git a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
index a451df3f17c..1540fc29e8e 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
@@ -257,7 +257,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to build PDF on disk, then output on HTTP strem.
 	 *
@@ -270,21 +270,21 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 	 */
 	public function write_file($arrayofrecords, $outputlangs, $srctemplatepath, $outputdir = '', $filename = 'tmp_address_sheet.pdf')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $conf, $langs, $mysoc, $_Avery_Labels;
 
 		$this->code = $srctemplatepath;
 		$this->Tformat = $_Avery_Labels[$this->code];
 		if (empty($this->Tformat)) { dol_print_error('', 'ErrorBadTypeForCard'.$this->code); exit; }
 		$this->type = 'pdf';
-        // standard format or custom
-        if ($this->Tformat['paper-size'] != 'custom') {
-            $this->format = $this->Tformat['paper-size'];
-        } else {
-            //custom
-            $resolution = array($this->Tformat['custom_x'], $this->Tformat['custom_y']);
-            $this->format = $resolution;
-        }
+		// standard format or custom
+		if ($this->Tformat['paper-size'] != 'custom') {
+			$this->format = $this->Tformat['paper-size'];
+		} else {
+			//custom
+			$resolution = array($this->Tformat['custom_x'], $this->Tformat['custom_y']);
+			$this->format = $resolution;
+		}
 
 		if (!is_object($outputlangs)) $outputlangs = $langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
diff --git a/htdocs/core/modules/printsheet/modules_labels.php b/htdocs/core/modules/printsheet/modules_labels.php
index 215c3a854ad..3320b4ff928 100644
--- a/htdocs/core/modules/printsheet/modules_labels.php
+++ b/htdocs/core/modules/printsheet/modules_labels.php
@@ -40,17 +40,17 @@ class ModelePDFLabels
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of active generation modules
 	 *
-     *  @param  DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
+	 *  @param  DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
 	 */
 	public function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'members_labels';
@@ -79,7 +79,7 @@ class ModelePDFLabels
  */
 function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outputdir = '', $template = 'standardlabel', $filename = 'tmp_address_sheet.pdf')
 {
-    // phpcs:enable
+	// phpcs:enable
 	global $conf, $langs;
 	$langs->load("members");
 
diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
index e1c760ccb32..ef5e97997f9 100644
--- a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
+++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
@@ -44,15 +44,15 @@ class doc_generic_product_odt extends ModelePDFProduct
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 
@@ -66,7 +66,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
@@ -111,7 +111,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("errors", "companies"));
+		$langs->loadLangs(array("errors", "companies"));
 
 		$form = new Form($this->db);
 
@@ -204,7 +204,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to build a document on disk using the generic odt module.
 	 *
@@ -218,7 +218,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $product, $langs, $conf, $mysoc, $hookmanager, $user;
 
 		if (empty($srctemplatepath))
@@ -289,8 +289,8 @@ class doc_generic_product_odt extends ModelePDFProduct
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -315,16 +315,14 @@ class doc_generic_product_odt extends ModelePDFProduct
 
 				// Recipient name
 				$contactobject = null;
-				if (!empty($usecontact))
-				{
-                    // On peut utiliser le nom de la societe du contact
-                    if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
-                        $socobject = $object->contact;
-                    } else {
-                        $socobject = $object->thirdparty;
-                        // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
-                        $contactobject = $object->contact;
-                    }
+				if (!empty($usecontact)) {
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+						$socobject = $object->contact;
+					} else {
+						$socobject = $object->thirdparty;
+						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+						$contactobject = $object->contact;
+					}
 				} else {
 					$socobject = $object->thirdparty;
 				}
@@ -352,7 +350,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-    				$odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 							'PATH_TO_TMP'	  => $conf->product->dir_temp,
@@ -415,7 +413,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
@@ -460,7 +458,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -474,7 +472,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				} else {
@@ -482,7 +480,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index d5e45fa3c73..82143123c40 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -36,74 +36,74 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
  */
 class pdf_standard extends ModelePDFProduct
 {
-    /**
-     * @var DoliDb Database handler
-     */
-    public $db;
+	/**
+	 * @var DoliDb Database handler
+	 */
+	public $db;
 
 	/**
-     * @var string model name
-     */
-    public $name;
+	 * @var string model name
+	 */
+	public $name;
 
 	/**
-     * @var string model description (short text)
-     */
-    public $description;
+	 * @var string model description (short text)
+	 */
+	public $description;
 
 	/**
-     * @var string document type
-     */
-    public $type;
+	 * @var string document type
+	 */
+	public $type;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
-    /**
-     * @var int page_largeur
-     */
-    public $page_largeur;
-
-    /**
-     * @var int page_hauteur
-     */
-    public $page_hauteur;
-
-    /**
-     * @var array format
-     */
-    public $format;
+	/**
+	 * @var int page_largeur
+	 */
+	public $page_largeur;
 
 	/**
-     * @var int marge_gauche
-     */
+	 * @var int page_hauteur
+	 */
+	public $page_hauteur;
+
+	/**
+	 * @var array format
+	 */
+	public $format;
+
+	/**
+	 * @var int marge_gauche
+	 */
 	public $marge_gauche;
 
 	/**
-     * @var int marge_droite
-     */
+	 * @var int marge_droite
+	 */
 	public $marge_droite;
 
 	/**
-     * @var int marge_haute
-     */
+	 * @var int marge_haute
+	 */
 	public $marge_haute;
 
 	/**
-     * @var int marge_basse
-     */
+	 * @var int marge_basse
+	 */
 	public $marge_basse;
 
-    /**
+	/**
 	 * Issuer
 	 * @var Societe
 	 */
@@ -148,7 +148,7 @@ class pdf_standard extends ModelePDFProduct
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to build a document on disk using the generic odt module.
 	 *
@@ -160,9 +160,9 @@ class pdf_standard extends ModelePDFProduct
 	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-    public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
-    {
-        // phpcs:enable
+	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $db, $hookmanager;
 
 		if (!is_object($outputlangs)) $outputlangs = $langs;
@@ -176,7 +176,7 @@ class pdf_standard extends ModelePDFProduct
 
 		if ($conf->product->dir_output)
 		{
-		    // Definition of $dir and $file
+			// Definition of $dir and $file
 			if ($object->specimen)
 			{
 				$dir = $conf->product->dir_output;
@@ -219,22 +219,22 @@ class pdf_standard extends ModelePDFProduct
 				$pdf->SetAutoPageBreak(1, 0);
 
 				$heightforinfotot = 40; // Height reserved to output the info and total part
-		        $heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
 
-                if (class_exists('TCPDF'))
-                {
-                    $pdf->setPrintHeader(false);
-                    $pdf->setPrintFooter(false);
-                }
-                $pdf->SetFont(pdf_getPDFFont($outputlangs));
-                // Set path to the background PDF File
-                if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-                {
-                    $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
-                    $tplidx = $pdf->importPage(1);
-                }
+				if (class_exists('TCPDF'))
+				{
+					$pdf->setPrintHeader(false);
+					$pdf->setPrintFooter(false);
+				}
+				$pdf->SetFont(pdf_getPDFFont($outputlangs));
+				// Set path to the background PDF File
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+				{
+					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+					$tplidx = $pdf->importPage(1);
+				}
 
 				$pdf->Open();
 				$pagenb = 0;
@@ -278,23 +278,23 @@ class pdf_standard extends ModelePDFProduct
 
 				if ($object->weight)
 				{
-				    $pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Weight").': '.dol_htmlentitiesbr($object->weight), 0, 1);
-				    $nexY = $pdf->GetY();
+					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Weight").': '.dol_htmlentitiesbr($object->weight), 0, 1);
+					$nexY = $pdf->GetY();
 				}
 				if ($object->weight)
 				{
-				    $pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").': '.($object->length != '' ? $object->length : '?').' x '.($object->width != '' ? $object->width : '?').' x '.($object->height != '' ? $object->height : '?'), 0, 1);
-				    $nexY = $pdf->GetY();
+					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").': '.($object->length != '' ? $object->length : '?').' x '.($object->width != '' ? $object->width : '?').' x '.($object->height != '' ? $object->height : '?'), 0, 1);
+					$nexY = $pdf->GetY();
 				}
 				if ($object->surface)
 				{
-				    $pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Area").': '.dol_htmlentitiesbr($object->surface), 0, 1);
-				    $nexY = $pdf->GetY();
+					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Area").': '.dol_htmlentitiesbr($object->surface), 0, 1);
+					$nexY = $pdf->GetY();
 				}
 				if ($object->volume)
 				{
-    				$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Volume").': '.dol_htmlentitiesbr($object->volume), 0, 1);
-	   			    $nexY = $pdf->GetY();
+					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Volume").': '.dol_htmlentitiesbr($object->volume), 0, 1);
+	   				$nexY = $pdf->GetY();
 				}
 
 
@@ -444,7 +444,7 @@ class pdf_standard extends ModelePDFProduct
 					$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne=$object->lines[$i]->multicurrency_total_tva;
+					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne=$object->lines[$i]->multicurrency_total_tva;
 					else $tvaligne=$object->lines[$i]->total_tva;
 
 					$localtax1ligne=$object->lines[$i]->total_localtax1;
@@ -559,8 +559,8 @@ class pdf_standard extends ModelePDFProduct
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0)
 				{
-				    $this->error = $hookmanager->error;
-				    $this->errors = $hookmanager->errors;
+					$this->error = $hookmanager->error;
+					$this->errors = $hookmanager->errors;
 				}
 
 				if (!empty($conf->global->MAIN_UMASK))
@@ -577,7 +577,7 @@ class pdf_standard extends ModelePDFProduct
 			$this->error = $langs->trans("ErrorConstantNotDefined", "PRODUCT_OUTPUTDIR");
 			return 0;
 		}
-    }
+	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
@@ -595,94 +595,94 @@ class pdf_standard extends ModelePDFProduct
 	 */
 	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
 	{
-	    global $conf;
+		global $conf;
 
-	    // Force to disable hidetop and hidebottom
-	    $hidebottom = 0;
-	    if ($hidetop) $hidetop = -1;
+		// Force to disable hidetop and hidebottom
+		$hidebottom = 0;
+		if ($hidetop) $hidetop = -1;
 
-	    $currency = !empty($currency) ? $currency : $conf->currency;
-	    $default_font_size = pdf_getPDFFontSize($outputlangs);
+		$currency = !empty($currency) ? $currency : $conf->currency;
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-	    // Amount in (at tab_top - 1)
-	    $pdf->SetTextColor(0, 0, 0);
-	    $pdf->SetFont('', '', $default_font_size - 2);
+		// Amount in (at tab_top - 1)
+		$pdf->SetTextColor(0, 0, 0);
+		$pdf->SetFont('', '', $default_font_size - 2);
 
-	    if (empty($hidetop))
-	    {
-	        $titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
-	        $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
-	        $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
+		if (empty($hidetop))
+		{
+			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
+			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
+			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
-	        //$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-	        if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
-	    }
+			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
+			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+		}
 
-	    $pdf->SetDrawColor(128, 128, 128);
-	    $pdf->SetFont('', '', $default_font_size - 1);
+		$pdf->SetDrawColor(128, 128, 128);
+		$pdf->SetFont('', '', $default_font_size - 1);
 
-	    // Output Rect
-	    $this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
+		// Output Rect
+		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
 
-	    if (empty($hidetop))
-	    {
-	        $pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5); // line takes a position y in 2nd parameter and 4th parameter
+		if (empty($hidetop))
+		{
+			$pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5); // line takes a position y in 2nd parameter and 4th parameter
 
-	        $pdf->SetXY($this->posxdesc - 1, $tab_top + 1);
-	        $pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
-	    }
+			$pdf->SetXY($this->posxdesc - 1, $tab_top + 1);
+			$pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
+		}
 
-	    if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
-	    {
-	        $pdf->line($this->posxtva - 1, $tab_top, $this->posxtva - 1, $tab_top + $tab_height);
-	        if (empty($hidetop))
-	        {
-	            $pdf->SetXY($this->posxtva - 3, $tab_top + 1);
-	            $pdf->MultiCell($this->posxup - $this->posxtva + 3, 2, $outputlangs->transnoentities("VAT"), '', 'C');
-	        }
-	    }
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
+		{
+			$pdf->line($this->posxtva - 1, $tab_top, $this->posxtva - 1, $tab_top + $tab_height);
+			if (empty($hidetop))
+			{
+				$pdf->SetXY($this->posxtva - 3, $tab_top + 1);
+				$pdf->MultiCell($this->posxup - $this->posxtva + 3, 2, $outputlangs->transnoentities("VAT"), '', 'C');
+			}
+		}
 
-	    $pdf->line($this->posxup - 1, $tab_top, $this->posxup - 1, $tab_top + $tab_height);
-	    if (empty($hidetop))
-	    {
-	        $pdf->SetXY($this->posxup - 1, $tab_top + 1);
-	        $pdf->MultiCell($this->posxqty - $this->posxup - 1, 2, $outputlangs->transnoentities("PriceUHT"), '', 'C');
-	    }
+		$pdf->line($this->posxup - 1, $tab_top, $this->posxup - 1, $tab_top + $tab_height);
+		if (empty($hidetop))
+		{
+			$pdf->SetXY($this->posxup - 1, $tab_top + 1);
+			$pdf->MultiCell($this->posxqty - $this->posxup - 1, 2, $outputlangs->transnoentities("PriceUHT"), '', 'C');
+		}
 
-	    $pdf->line($this->posxqty - 1, $tab_top, $this->posxqty - 1, $tab_top + $tab_height);
-	    if (empty($hidetop))
-	    {
-	        $pdf->SetXY($this->posxqty - 1, $tab_top + 1);
-	        $pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
-	    }
+		$pdf->line($this->posxqty - 1, $tab_top, $this->posxqty - 1, $tab_top + $tab_height);
+		if (empty($hidetop))
+		{
+			$pdf->SetXY($this->posxqty - 1, $tab_top + 1);
+			$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
+		}
 
-	    if ($conf->global->PRODUCT_USE_UNITS) {
-	        $pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
-	        if (empty($hidetop)) {
-	            $pdf->SetXY($this->posxunit - 1, $tab_top + 1);
-                $pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("Unit"), '', 'C');
-	        }
-	    }
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+			$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
+			if (empty($hidetop)) {
+				$pdf->SetXY($this->posxunit - 1, $tab_top + 1);
+				$pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("Unit"), '', 'C');
+			}
+		}
 
-	    $pdf->line($this->posxdiscount - 1, $tab_top, $this->posxdiscount - 1, $tab_top + $tab_height);
-	    if (empty($hidetop))
-	    {
-	        if ($this->atleastonediscount)
-	        {
-	            $pdf->SetXY($this->posxdiscount - 1, $tab_top + 1);
-	            $pdf->MultiCell($this->postotalht - $this->posxdiscount + 1, 2, $outputlangs->transnoentities("ReductionShort"), '', 'C');
-	        }
-	    }
+		$pdf->line($this->posxdiscount - 1, $tab_top, $this->posxdiscount - 1, $tab_top + $tab_height);
+		if (empty($hidetop))
+		{
+			if ($this->atleastonediscount)
+			{
+				$pdf->SetXY($this->posxdiscount - 1, $tab_top + 1);
+				$pdf->MultiCell($this->postotalht - $this->posxdiscount + 1, 2, $outputlangs->transnoentities("ReductionShort"), '', 'C');
+			}
+		}
 
-	    if ($this->atleastonediscount)
-	    {
-	        $pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
-	    }
-	    if (empty($hidetop))
-	    {
-	        $pdf->SetXY($this->postotalht - 1, $tab_top + 1);
-	        $pdf->MultiCell(30, 2, $outputlangs->transnoentities("TotalHT"), '', 'C');
-	    }
+		if ($this->atleastonediscount)
+		{
+			$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
+		}
+		if (empty($hidetop))
+		{
+			$pdf->SetXY($this->postotalht - 1, $tab_top + 1);
+			$pdf->MultiCell(30, 2, $outputlangs->transnoentities("TotalHT"), '', 'C');
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
@@ -690,7 +690,7 @@ class pdf_standard extends ModelePDFProduct
 	 *  Show top header of page.
 	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
-	 *  @param  Object		$object     	Object to show
+	 *  @param  Product		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @param	string		$titlekey		Translation key to show as title of document
@@ -698,68 +698,68 @@ class pdf_standard extends ModelePDFProduct
 	 */
 	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey = "")
 	{
-	    global $conf, $langs, $hookmanager;
+		global $conf, $langs, $hookmanager;
 
-	    // Load traductions files required by page
+		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "propal", "companies", "bills", "orders"));
 
-	    $default_font_size = pdf_getPDFFontSize($outputlangs);
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-	    if ($object->type == 1) $titlekey = 'ServiceSheet';
-	    else $titlekey = 'ProductSheet';
+		if ($object->type == 1) $titlekey = 'ServiceSheet';
+		else $titlekey = 'ProductSheet';
 
-	    pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
+		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
-	    // Show Draft Watermark
-	    if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK)))
-	    {
-	        pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->COMMANDE_DRAFT_WATERMARK);
-	    }
+		// Show Draft Watermark
+		if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK)))
+		{
+			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->COMMANDE_DRAFT_WATERMARK);
+		}
 
-	    $pdf->SetTextColor(0, 0, 60);
-	    $pdf->SetFont('', 'B', $default_font_size + 3);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->SetFont('', 'B', $default_font_size + 3);
 
-	    $posy = $this->marge_haute;
-	    $posx = $this->page_largeur - $this->marge_droite - 100;
+		$posy = $this->marge_haute;
+		$posx = $this->page_largeur - $this->marge_droite - 100;
 
-	    $pdf->SetXY($this->marge_gauche, $posy);
+		$pdf->SetXY($this->marge_gauche, $posy);
 
-	    // Logo
-	    $logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
-	    if ($this->emetteur->logo)
-	    {
-	        if (is_readable($logo))
-	        {
-	            $height = pdf_getHeightForLogo($logo);
-	            $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-	        } else {
-	            $pdf->SetTextColor(200, 0, 0);
-	            $pdf->SetFont('', 'B', $default_font_size - 2);
-	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
-	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
-	        }
-	    } else {
-	        $text = $this->emetteur->name;
-	        $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
-	    }
+		// Logo
+		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
+		if ($this->emetteur->logo)
+		{
+			if (is_readable($logo))
+			{
+				$height = pdf_getHeightForLogo($logo);
+				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
+			} else {
+				$pdf->SetTextColor(200, 0, 0);
+				$pdf->SetFont('', 'B', $default_font_size - 2);
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+			}
+		} else {
+			$text = $this->emetteur->name;
+			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+		}
 
-	    $pdf->SetFont('', 'B', $default_font_size + 3);
-	    $pdf->SetXY($posx, $posy);
-	    $pdf->SetTextColor(0, 0, 60);
-	    $title = $outputlangs->transnoentities($titlekey);
-	    $pdf->MultiCell(100, 3, $title, '', 'R');
+		$pdf->SetFont('', 'B', $default_font_size + 3);
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$title = $outputlangs->transnoentities($titlekey);
+		$pdf->MultiCell(100, 3, $title, '', 'R');
 
-	    $pdf->SetFont('', 'B', $default_font_size);
+		$pdf->SetFont('', 'B', $default_font_size);
 
-	    $posy += 5;
-	    $pdf->SetXY($posx, $posy);
-	    $pdf->SetTextColor(0, 0, 60);
-	    $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref), '', 'R');
+		$posy += 5;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref), '', 'R');
 
-	    $posy += 1;
-	    $pdf->SetFont('', '', $default_font_size - 1);
+		$posy += 1;
+		$pdf->SetFont('', '', $default_font_size - 1);
 
-	    /*if ($object->ref_client)
+		/*if ($object->ref_client)
 	    {
 	        $posy+=5;
 	        $pdf->SetXY($posx,$posy);
@@ -767,14 +767,14 @@ class pdf_standard extends ModelePDFProduct
 	        $pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 	    }*/
 
-	    /*$posy+=4;
+		/*$posy+=4;
 	    $pdf->SetXY($posx,$posy);
 	    $pdf->SetTextColor(0,0,60);
 	    $pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : " . dol_print_date($object->date,"%d %b %Y",false,$outputlangs,true), '', 'R');
 	    */
 
-	    // Get contact
-	    /*
+		// Get contact
+		/*
 	    if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
 	    {
 	        $arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
@@ -789,14 +789,14 @@ class pdf_standard extends ModelePDFProduct
 	        }
 	    }*/
 
-	    $posy += 2;
+		$posy += 2;
 
-	    // Show list of linked objects
-	    $posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
+		// Show list of linked objects
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
 
-	    if ($showaddress)
-	    {
-	        /*
+		if ($showaddress)
+		{
+			/*
 	        // Sender properties
 	        $carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
 
@@ -827,25 +827,25 @@ class pdf_standard extends ModelePDFProduct
 	        $pdf->SetFont('','', $default_font_size - 1);
 	        $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
 	        */
-        }
+		}
 
-        $pdf->SetTextColor(0, 0, 0);
-    }
+		$pdf->SetTextColor(0, 0, 0);
+	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     *  Show footer of page. Need this->emetteur object
-     *
-     *  @param	TCPDF		$pdf     			PDF
-     *  @param	Object		$object				Object to show
-     *  @param	Translate	$outputlangs		Object lang for output
-     *  @param	int			$hidefreetext		1=Hide free text
-     *  @return	int								Return height of bottom margin including footer text
-     */
+	/**
+	 *  Show footer of page. Need this->emetteur object
+	 *
+	 *  @param	TCPDF		$pdf     			PDF
+	 *  @param	Product		$object				Object to show
+	 *  @param	Translate	$outputlangs		Object lang for output
+	 *  @param	int			$hidefreetext		1=Hide free text
+	 *  @return	int								Return height of bottom margin including footer text
+	 */
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
-    {
-        global $conf;
-        $showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
-        return pdf_pagefoot($pdf, $outputlangs, 'PRODUCT_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
-    }
+	{
+		global $conf;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		return pdf_pagefoot($pdf, $outputlangs, 'PRODUCT_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+	}
 }
diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php
index 20943a70703..2580000ca7a 100644
--- a/htdocs/core/modules/product/mod_codeproduct_elephant.php
+++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php
@@ -55,9 +55,9 @@ class mod_codeproduct_elephant extends ModeleProductCode
 	public $code_null; // Code facultatif
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -86,14 +86,14 @@ class mod_codeproduct_elephant extends ModeleProductCode
 	}
 
 
-    /**
-     *  Return description of module
-     *
-     *  @param	Translate	$langs		Object langs
-     *  @return string      			Description of module
-     */
-    public function info($langs)
-    {
+	/**
+	 *  Return description of module
+	 *
+	 *  @param	Translate	$langs		Object langs
+	 *  @return string      			Description of module
+	 */
+	public function info($langs)
+	{
 		global $conf, $mc;
 		global $form;
 
@@ -131,7 +131,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
 
 	/**
@@ -142,7 +142,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
 	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 * @return	string					Return string example
 	 */
-    public function getExample($langs, $objproduct = 0, $type = -1)
+	public function getExample($langs, $objproduct = 0, $type = -1)
 	{
 		if ($type == 0 || $type == -1)
 		{
@@ -226,7 +226,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *   Check if mask/numbering use prefix
 	 *
@@ -234,7 +234,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
 	 */
 	public function verif_prefixIsUsed()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$mask = $conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT;
@@ -300,7 +300,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi si un code est pris ou non (par autre tiers)
 	 *
@@ -311,7 +311,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
 	 */
 	public function verif_dispo($db, $code, $product)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "SELECT ref FROM ".MAIN_DB_PREFIX."product";
 		$sql .= " WHERE ref = '".$db->escape($code)."'";
 		if ($product->id > 0) $sql .= " AND rowid <> ".$product->id;
diff --git a/htdocs/core/modules/product/mod_codeproduct_leopard.php b/htdocs/core/modules/product/mod_codeproduct_leopard.php
index cfdcbcdb404..49a3e65f9b0 100644
--- a/htdocs/core/modules/product/mod_codeproduct_leopard.php
+++ b/htdocs/core/modules/product/mod_codeproduct_leopard.php
@@ -60,9 +60,9 @@ class mod_codeproduct_leopard extends ModeleProductCode
 	public $code_null; // Code facultatif
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -85,7 +85,7 @@ class mod_codeproduct_leopard extends ModeleProductCode
 
 
 	/**
-     *  Return description of module
+	 *  Return description of module
 	 *
 	 *  @param	Translate	$langs	Object langs
 	 *  @return string      		Description of module
diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php
index 308f98d7828..79950e4f14f 100644
--- a/htdocs/core/modules/product/modules_product.class.php
+++ b/htdocs/core/modules/product/modules_product.class.php
@@ -137,10 +137,18 @@ abstract class ModeleProductCode
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		}
+		if ($this->version) {
+			return $this->version;
+		}
 		return $langs->trans("NotAvailable");
 	}
 
@@ -159,12 +167,10 @@ abstract class ModeleProductCode
 		$sql = "";
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$row = $db->fetch_row($resql);
 				$liste[$row[0]] = $row[1];
 				$i++;
@@ -188,37 +194,37 @@ abstract class ModeleProductCode
 		global $conf;
 
 		$langs->load("admin");
-
+		$strikestart = '';
+		$strikeend = '';
+		if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) {
+			$strikestart = '<strike>';
+			$strikeend = '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+		}
 		$s = '';
 		if ($type == -1) {
 			$s .= $langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
 			$s .= $langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
+		} elseif ($type == 0) {
+			$s .= $langs->trans("ProductCodeDesc").'<br>';
+		} elseif ($type == 1) {
+			$s .= $langs->trans("ServiceCodeDesc").'<br>';
+		}
+		if ($type != -1) {
+			$s .= $langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
 		}
-		if ($type == 0)  $s .= $langs->trans("ProductCodeDesc").'<br>';
-		if ($type == 1)  $s .= $langs->trans("ServiceCodeDesc").'<br>';
-		if ($type != -1) $s .= $langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
 		$s .= '<br>';
 		$s .= '<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
-		if ($type == 0)
-		{
-			$s .= $langs->trans("RequiredIfProduct").': ';
-			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
-			$s .= yn(!$this->code_null, 1, 2);
-			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+		if ($type == 0) {
+			$s .= $langs->trans("RequiredIfProduct").': '.$strikestart;
+			$s .= yn(!$this->code_null, 1, 2).$strikeend;
 			$s .= '<br>';
-		} elseif ($type == 1)
-		{
-			$s .= $langs->trans("RequiredIfService").': ';
-			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
-			$s .= yn(!$this->code_null, 1, 2);
-			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+		} elseif ($type == 1) {
+			$s .= $langs->trans("RequiredIfService").': '.$strikestart;
+			$s .= yn(!$this->code_null, 1, 2).$strikeend;
 			$s .= '<br>';
-		} elseif ($type == -1)
-		{
-			$s .= $langs->trans("Required").': ';
-			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
-			$s .= yn(!$this->code_null, 1, 2);
-			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+		} elseif ($type == -1) {
+			$s .= $langs->trans("Required").': '.$strikestart;
+			$s .= yn(!$this->code_null, 1, 2).$strikeend;
 			$s .= '<br>';
 		}
 		$s .= $langs->trans("CanBeModifiedIfOk").': ';
@@ -227,16 +233,18 @@ abstract class ModeleProductCode
 		$s .= $langs->trans("CanBeModifiedIfKo").': '.yn($this->code_modifiable_invalide, 1, 2).'<br>';
 		$s .= $langs->trans("AutomaticCode").': '.yn($this->code_auto, 1, 2).'<br>';
 		$s .= '<br>';
-		if ($type == 0 || $type == -1)
-		{
+		if ($type == 0 || $type == -1) {
 			$nextval = $this->getNextValue($product, 0);
-			if (empty($nextval)) $nextval = $langs->trans("Undefined");
+			if (empty($nextval)) {
+				$nextval = $langs->trans("Undefined");
+			}
 			$s .= $langs->trans("NextValue").($type == -1 ? ' ('.$langs->trans("Product").')' : '').': <b>'.$nextval.'</b><br>';
 		}
-		if ($type == 1 || $type == -1)
-		{
+		if ($type == 1 || $type == -1) {
 			$nextval = $this->getNextValue($product, 1);
-			if (empty($nextval)) $nextval = $langs->trans("Undefined");
+			if (empty($nextval)) {
+				$nextval = $langs->trans("Undefined");
+			}
 			$s .= $langs->trans("NextValue").($type == -1 ? ' ('.$langs->trans("Service").')' : '').': <b>'.$nextval.'</b>';
 		}
 		return $s;
diff --git a/htdocs/core/modules/product_batch/modules_product_batch.class.php b/htdocs/core/modules/product_batch/modules_product_batch.class.php
index d86cacaedc8..f5ef6ac3dda 100644
--- a/htdocs/core/modules/product_batch/modules_product_batch.class.php
+++ b/htdocs/core/modules/product_batch/modules_product_batch.class.php
@@ -38,30 +38,30 @@
  */
 abstract class ModelePDFProductBatch extends CommonDocGenerator
 {
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return list of active generation modules
-     *
-     *  @param  DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
-     */
-    public static function liste_modeles($db, $maxfilenamelength = 0)
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return list of active generation modules
+	 *
+	 *  @param  DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
+	 */
+	public static function liste_modeles($db, $maxfilenamelength = 0)
+	{
+		// phpcs:enable
+		global $conf;
 
-        $type = 'product_batch';
-        $list = array();
+		$type = 'product_batch';
+		$list = array();
 
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-        $list = getListOfModels($db, $type, $maxfilenamelength);
-        return $list;
-    }
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$list = getListOfModels($db, $type, $maxfilenamelength);
+		return $list;
+	}
 }
diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index fe2b217124e..c6e07911ff7 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -61,15 +61,15 @@ class doc_generic_project_odt extends ModelePDFProjects
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 
@@ -117,33 +117,33 @@ class doc_generic_project_odt extends ModelePDFProjects
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Define array with couple substitution key => substitution value
 	 *
 	 * @param   Project			$object             Main object to use as data source
 	 * @param   Translate		$outputlangs        Lang object to use for output
-     * @param   string		    $array_key	        Name of the key for return array
+	 * @param   string		    $array_key	        Name of the key for return array
 	 * @return	array								Array of substitution
 	 */
 	public function get_substitutionarray_object($object, $outputlangs, $array_key = 'object')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$resarray = array(
-		    $array_key.'_id'=>$object->id,
-            $array_key.'_ref'=>$object->ref,
-            $array_key.'_title'=>$object->title,
-            $array_key.'_description'=>$object->description,
-            $array_key.'_date_creation'=>dol_print_date($object->date_c, 'day'),
-            $array_key.'_date_modification'=>dol_print_date($object->date_m, 'day'),
-            $array_key.'_date_start'=>dol_print_date($object->date_start, 'day'),
-            $array_key.'_date_end'=>dol_print_date($object->date_end, 'day'),
-            $array_key.'_note_private'=>$object->note_private,
-            $array_key.'_note_public'=>$object->note_public,
-            $array_key.'_public'=>$object->public,
-            $array_key.'_statut'=>$object->getLibStatut()
+			$array_key.'_id'=>$object->id,
+			$array_key.'_ref'=>$object->ref,
+			$array_key.'_title'=>$object->title,
+			$array_key.'_description'=>$object->description,
+			$array_key.'_date_creation'=>dol_print_date($object->date_c, 'day'),
+			$array_key.'_date_modification'=>dol_print_date($object->date_m, 'day'),
+			$array_key.'_date_start'=>dol_print_date($object->date_start, 'day'),
+			$array_key.'_date_end'=>dol_print_date($object->date_end, 'day'),
+			$array_key.'_note_private'=>$object->note_private,
+			$array_key.'_note_public'=>$object->note_public,
+			$array_key.'_public'=>$object->public,
+			$array_key.'_statut'=>$object->getLibStatut()
 		);
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
@@ -156,7 +156,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 		return $resarray;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -166,7 +166,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 	 */
 	public function get_substitutionarray_tasks(Task $task, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$resarray = array(
@@ -197,7 +197,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 		return $resarray;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -207,7 +207,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 	 */
 	public function get_substitutionarray_project_contacts($contact, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		$pc = 'projcontacts_'; // prefix to avoid typos
 
@@ -255,7 +255,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 		return $ret;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -263,19 +263,19 @@ class doc_generic_project_odt extends ModelePDFProjects
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
-    public function get_substitutionarray_project_file($file, $outputlangs)
-    {
-        // phpcs:enable
-        global $conf;
+	public function get_substitutionarray_project_file($file, $outputlangs)
+	{
+		// phpcs:enable
+		global $conf;
 
-        return array(
-            'projfile_name'=>$file['name'],
-            'projfile_date'=>dol_print_date($file['date'], 'day'),
-            'projfile_size'=>$file['size']
-        );
-    }
+		return array(
+			'projfile_name'=>$file['name'],
+			'projfile_date'=>dol_print_date($file['date'], 'day'),
+			'projfile_size'=>$file['size']
+		);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -283,23 +283,23 @@ class doc_generic_project_odt extends ModelePDFProjects
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
-    public function get_substitutionarray_project_reference($refdetail, $outputlangs)
-    {
-        // phpcs:enable
-        global $conf;
+	public function get_substitutionarray_project_reference($refdetail, $outputlangs)
+	{
+		// phpcs:enable
+		global $conf;
 
-        return array(
-            'projref_type'=>$refdetail['type'],
-            'projref_ref'=>$refdetail['ref'],
-            'projref_date'=>dol_print_date($refdetail['date'], 'day'),
-            'projref_socname'=>$refdetail['socname'],
-            'projref_amountht'=>price($refdetail['amountht'], 0, $outputlangs),
-            'projref_amountttc'=>price($refdetail['amountttc'], 0, $outputlangs),
-            'projref_status'=>$refdetail['status']
-        );
-    }
+		return array(
+			'projref_type'=>$refdetail['type'],
+			'projref_ref'=>$refdetail['ref'],
+			'projref_date'=>dol_print_date($refdetail['date'], 'day'),
+			'projref_socname'=>$refdetail['socname'],
+			'projref_amountht'=>price($refdetail['amountht'], 0, $outputlangs),
+			'projref_amountttc'=>price($refdetail['amountttc'], 0, $outputlangs),
+			'projref_status'=>$refdetail['status']
+		);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -309,7 +309,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 	 */
 	public function get_substitutionarray_tasksressource($taskressource, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		//dol_syslog(get_class($this).'::get_substitutionarray_tasksressource taskressource='.var_export($taskressource,true),LOG_DEBUG);
 		return array(
@@ -323,7 +323,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 		);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -333,7 +333,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 	 */
 	public function get_substitutionarray_taskstime($tasktime, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		return array(
@@ -352,7 +352,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 		);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -362,7 +362,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 	 */
 	public function get_substitutionarray_task_file($file, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		return array(
@@ -384,7 +384,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("companies", "errors"));
+		$langs->loadLangs(array("companies", "errors"));
 
 		$form = new Form($this->db);
 
@@ -443,7 +443,7 @@ class doc_generic_project_odt extends ModelePDFProjects
    			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
    			foreach ($listoffiles as $file)
    			{
-                $texte .= $file['name'].'<br>';
+				$texte .= $file['name'].'<br>';
    			}
    			$texte .= '</div>';
 		}
@@ -461,7 +461,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to build a document on disk using the generic odt module.
 	 *
@@ -472,7 +472,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
@@ -512,6 +512,8 @@ class doc_generic_project_odt extends ModelePDFProjects
 				}
 			}
 
+			$object->fetch_thirdparty();
+
 			$dir = $conf->projet->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
@@ -539,8 +541,8 @@ class doc_generic_project_odt extends ModelePDFProjects
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -566,8 +568,8 @@ class doc_generic_project_odt extends ModelePDFProjects
 				$contactobject = null;
 				if (!empty($usecontact))
 				{
-        			// if we have a PROJECTLEADER contact and we dont use it as recipient we store the contact object for later use
-        			$contactobject = $object->contact;
+					// if we have a PROJECTLEADER contact and we dont use it as recipient we store the contact object for later use
+					$contactobject = $object->contact;
 				}
 
 				$socobject = $object->thirdparty;
@@ -585,7 +587,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->projet->dir_temp,
@@ -638,7 +640,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -1143,7 +1145,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e) {
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -1165,7 +1167,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
index 84cc5829571..6baf416ed64 100644
--- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
@@ -38,26 +38,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 class pdf_baleine extends ModelePDFProjects
 {
-	/**
-	 * @var DoliDb Database handler
-	 */
-	public $db;
-
-	/**
-	 * @var string model name
-	 */
-	public $name;
-
-	/**
-	 * @var string model description (short text)
-	 */
-	public $description;
-
-	/**
-	 * @var string document type
-	 */
-	public $type;
-
 	/**
 	 * @var array Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.6 = array(5, 6)
@@ -70,44 +50,9 @@ class pdf_baleine extends ModelePDFProjects
 	 */
 	public $version = 'dolibarr';
 
-	/**
-	 * @var int page_largeur
-	 */
-	public $page_largeur;
-
-	/**
-	 * @var int page_hauteur
-	 */
-	public $page_hauteur;
-
-	/**
-	 * @var array format
-	 */
-	public $format;
-
-	/**
-	 * @var int marge_gauche
-	 */
-	public $marge_gauche;
-
-	/**
-	 * @var int marge_droite
-	 */
-	public $marge_droite;
-
-	/**
-	 * @var int marge_haute
-	 */
-	public $marge_haute;
-
-	/**
-	 * @var int marge_basse
-	 */
-	public $marge_basse;
-
 	/**
 	 * Issuer
-	 * @var Societe object that emits
+	 * @var Societe Object that emits
 	 */
 	public $emetteur;
 
@@ -149,10 +94,10 @@ class pdf_baleine extends ModelePDFProjects
 		// Define position of columns
 		$this->posxref = $this->marge_gauche + 1;
 		$this->posxlabel = $this->marge_gauche + 25;
-		$this->posxworkload = $this->marge_gauche + 120;
-		$this->posxprogress = $this->marge_gauche + 140;
-		$this->posxdatestart = $this->marge_gauche + 152;
-		$this->posxdateend = $this->marge_gauche + 170;
+		$this->posxworkload = $this->marge_gauche + 117;
+		$this->posxprogress = $this->marge_gauche + 137;
+		$this->posxdatestart = $this->marge_gauche + 147;
+		$this->posxdateend = $this->marge_gauche + 169;
 		if ($this->page_largeur < 210) // To work with US executive format
 		{
 			$this->posxref -= 20;
@@ -224,7 +169,7 @@ class pdf_baleine extends ModelePDFProjects
 				$heightforinfotot = 40; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
 
 				if (class_exists('TCPDF'))
 				{
@@ -420,7 +365,8 @@ class pdf_baleine extends ModelePDFProjects
 					// Progress
 					$pdf->SetXY($this->posxprogress, $curY);
 					$pdf->MultiCell($this->posxdatestart - $this->posxprogress, 3, $progress, 0, 'R');
-					// Date
+
+					// Date start and end
 					$pdf->SetXY($this->posxdatestart, $curY);
 					$pdf->MultiCell($this->posxdateend - $this->posxdatestart, 3, $datestart, 0, 'C');
 					$pdf->SetXY($this->posxdateend, $curY);
@@ -538,7 +484,7 @@ class pdf_baleine extends ModelePDFProjects
 		// Draw rect of all tab (title + lines). Rect takes a length in 3rd parameter
 		$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height);
 
-		// line takes a position y in 3rd parameter
+		// Line takes a position y in 3rd parameter
 		$pdf->line($this->marge_gauche, $tab_top + $heightoftitleline, $this->page_largeur - $this->marge_droite, $tab_top + $heightoftitleline);
 
 		$pdf->SetTextColor(0, 0, 0);
@@ -556,11 +502,13 @@ class pdf_baleine extends ModelePDFProjects
 		$pdf->SetXY($this->posxprogress, $tab_top + 1);
 		$pdf->MultiCell($this->posxdatestart - $this->posxprogress, 3, '%', 0, 'R');
 
+		// Date start
 		$pdf->SetXY($this->posxdatestart, $tab_top + 1);
-		$pdf->MultiCell($this->posxdateend - $this->posxdatestart, 3, '', 0, 'C');
+		$pdf->MultiCell($this->posxdateend - $this->posxdatestart, 3, $outputlangs->trans("Start"), 0, 'C');
 
+		// Date end
 		$pdf->SetXY($this->posxdateend, $tab_top + 1);
-		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxdatestart, 3, '', 0, 'C');
+		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxdateend, 3, $outputlangs->trans("End"), 0, 'C');
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
@@ -667,7 +615,7 @@ class pdf_baleine extends ModelePDFProjects
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'PROJECT_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 }
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index 1309f329e30..0f877428052 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -111,14 +111,14 @@ class pdf_beluga extends ModelePDFProjects
 		if ($this->orientation == 'L' || $this->orientation == 'Landscape') {
 			$this->posxref = $this->marge_gauche + 1;
 			$this->posxdate = $this->marge_gauche + 105;
-			$this->posxsociety = $this->marge_gauche + 125;
+			$this->posxsociety = $this->marge_gauche + 126;
 			$this->posxamountht = $this->marge_gauche + 190;
 			$this->posxamountttc = $this->marge_gauche + 215;
 			$this->posxstatut = $this->marge_gauche + 245;
 		} else {
 			$this->posxref = $this->marge_gauche + 1;
 			$this->posxdate = $this->marge_gauche + 25;
-			$this->posxsociety = $this->marge_gauche + 45;
+			$this->posxsociety = $this->marge_gauche + 46;
 			$this->posxamountht = $this->marge_gauche + 110;
 			$this->posxamountttc = $this->marge_gauche + 135;
 			$this->posxstatut = $this->marge_gauche + 165;
@@ -196,7 +196,7 @@ class pdf_beluga extends ModelePDFProjects
 				$heightforinfotot = 40; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
 
 				if (class_exists('TCPDF'))
 				{
@@ -818,7 +818,7 @@ class pdf_beluga extends ModelePDFProjects
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'PROJECT_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 }
diff --git a/htdocs/core/modules/project/doc/pdf_timespent.modules.php b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
index 3f30391117b..5426e076d33 100644
--- a/htdocs/core/modules/project/doc/pdf_timespent.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
@@ -37,9 +37,21 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 class pdf_timespent extends ModelePDFProjects
 {
+	/**
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
+	public $phpmin = array(5, 6);
+
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr';
+
 	/**
 	 * Issuer
-	 * @var Societe
+	 * @var Societe	Object that emits
 	 */
 	public $emetteur;
 
@@ -81,25 +93,26 @@ class pdf_timespent extends ModelePDFProjects
 		// Define position of columns
 		$this->posxref = $this->marge_gauche + 1;
 		$this->posxlabel = $this->marge_gauche + 25;
+		$this->posxworkload = $this->marge_gauche + 100;
 		$this->posxtimespent = $this->marge_gauche + 120;
 		//$this->posxprogress=$this->marge_gauche+140;
-		$this->posxdatestart = $this->marge_gauche + 152;
-		$this->posxdateend = $this->marge_gauche + 170;
+		$this->posxuser = $this->marge_gauche + 147;
+		//$this->posxdateend = $this->marge_gauche + 169;
 		if ($this->page_largeur < 210) // To work with US executive format
 		{
 			$this->posxref -= 20;
 			$this->posxlabel -= 20;
 			$this->posxtimespent -= 20;
 			//$this->posxprogress-=20;
-			$this->posxdatestart -= 20;
-			$this->posxdateend -= 20;
+			$this->posxuser -= 20;
+			//$this->posxdateend -= 20;
 		}
 	}
 
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *	Fonction generant le projet sur le disque
+	 *	Function to build pdf project onto disk
 	 *
 	 *	@param	Project		$object   		Object project a generer
 	 *	@param	Translate	$outputlangs	Lang output object
@@ -156,6 +169,7 @@ class pdf_timespent extends ModelePDFProjects
 				$heightforinfotot = 40; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
 
 				if (class_exists('TCPDF'))
 				{
@@ -227,7 +241,7 @@ class pdf_timespent extends ModelePDFProjects
 
 					// Rect takes a length in 3rd parameter
 					$pdf->SetDrawColor(192, 192, 192);
-					$pdf->Rect($this->marge_gauche, $tab_top - 1, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $height_note + 1);
+					$pdf->Rect($this->marge_gauche, $tab_top - 2, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $height_note + 2);
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
@@ -240,6 +254,10 @@ class pdf_timespent extends ModelePDFProjects
 				$curY = $tab_top + $heightoftitleline + 1;
 				$nexY = $tab_top + $heightoftitleline + 1;
 
+				$tmpuser = new User($this->db);
+
+				// TODO We should loop on record of times spent grouped by user instead of lines of tasks
+
 				// Loop on each lines
 				for ($i = 0; $i < $nblines; $i++)
 				{
@@ -340,22 +358,24 @@ class pdf_timespent extends ModelePDFProjects
 						$pdf->setPage($pageposafter); $curY = $tab_top_newpage + $heightoftitleline + 1;
 					}
 
-					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+					$pdf->SetFont('', '', $default_font_size - 1); // We reposition the default font
 
 					// Ref of task
 					$pdf->SetXY($this->posxref, $curY);
 					$pdf->MultiCell($this->posxlabel - $this->posxref, 3, $outputlangs->convToOutputCharset($ref), 0, 'L');
 					// timespent
 					$pdf->SetXY($this->posxtimespent, $curY);
-					$pdf->MultiCell($this->posxdatestart - $this->posxtimespent, 3, $duration ? $duration : '', 0, 'R');
+					$pdf->MultiCell($this->posxuser - $this->posxtimespent, 3, $duration ? $duration : '', 0, 'R');
 					// Progress
 					//$pdf->SetXY($this->posxprogress, $curY);
-					//$pdf->MultiCell($this->posxdatestart-$this->posxprogress, 3, $progress, 0, 'R');
-					// Date
-					$pdf->SetXY($this->posxdatestart, $curY);
-					$pdf->MultiCell($this->posxdateend - $this->posxdatestart, 3, $datestart, 0, 'C');
-					$pdf->SetXY($this->posxdateend, $curY);
-					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxdateend, 3, $dateend, 0, 'C');
+					//$pdf->MultiCell($this->posxuser-$this->posxprogress, 3, $progress, 0, 'R');
+
+					// User spending time
+					/*var_dump($object->lines[$i]);exit;
+					$tmpuser->fetch($object->lines[$i]->fk_user);
+					$pdf->SetXY($this->posxuser, $curY);
+					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxuser, 3, $tmpuser->getFullName($outputlangs, 0, -1, 20), 0, 'C');
+					*/
 
 					// Add line
 					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
@@ -408,7 +428,7 @@ class pdf_timespent extends ModelePDFProjects
 				else $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 				$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 
-				// Pied de page
+				// Footer of the page
 				$this->_pagefoot($pdf, $object, $outputlangs);
 				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
 
@@ -469,7 +489,7 @@ class pdf_timespent extends ModelePDFProjects
 		// Draw rect of all tab (title + lines). Rect takes a length in 3rd parameter
 		$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height);
 
-		// line prend une position y en 3eme param
+		// Line takes a position y in 3rd parameter
 		$pdf->line($this->marge_gauche, $tab_top + $heightoftitleline, $this->page_largeur - $this->marge_droite, $tab_top + $heightoftitleline);
 
 		$pdf->SetTextColor(0, 0, 0);
@@ -482,16 +502,13 @@ class pdf_timespent extends ModelePDFProjects
 		$pdf->MultiCell($this->posxtimespent - $this->posxlabel, 3, $outputlangs->transnoentities("Description"), 0, 'L');
 
 		$pdf->SetXY($this->posxtimespent, $tab_top + 1);
-		$pdf->MultiCell($this->posxdatestart - $this->posxtimespent, 3, $outputlangs->transnoentities("TimeSpent"), 0, 'R');
+		$pdf->MultiCell($this->posxuser - $this->posxtimespent, 3, $outputlangs->transnoentities("TimeSpent"), 0, 'R');
 
 		//$pdf->SetXY($this->posxprogress, $tab_top+1);
-		//$pdf->MultiCell($this->posxdatestart-$this->posxprogress, 3, '%', 0, 'R');
+		//$pdf->MultiCell($this->posxuser - $this->posxprogress, 3, '%', 0, 'R');
 
-		$pdf->SetXY($this->posxdatestart, $tab_top + 1);
-		$pdf->MultiCell($this->posxdateend - $this->posxdatestart, 3, $outputlangs->transnoentities("Date"), 0, 'C');
-
-		$pdf->SetXY($this->posxdateend, $tab_top + 1);
-		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxdatestart, 3, '', 0, 'C');
+		$pdf->SetXY($this->posxuser, $tab_top + 1);
+		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxuser, 3, '', 0, 'C');
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
@@ -598,7 +615,7 @@ class pdf_timespent extends ModelePDFProjects
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'PROJECT_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 }
diff --git a/htdocs/core/modules/project/mod_project_universal.php b/htdocs/core/modules/project/mod_project_universal.php
index f833ec280d2..7c7ed786d92 100644
--- a/htdocs/core/modules/project/mod_project_universal.php
+++ b/htdocs/core/modules/project/mod_project_universal.php
@@ -31,15 +31,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
 class mod_project_universal extends ModeleNumRefProjects
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 	/**
 	 * @var string Nom du modele
@@ -54,17 +54,17 @@ class mod_project_universal extends ModeleNumRefProjects
 	public $name = 'Universal';
 
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     *  @return     string      Texte descripif
-     */
-    public function info()
-    {
-    	global $conf, $langs;
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("projects", "admin"));
+		$langs->loadLangs(array("projects", "admin"));
 
 		$form = new Form($this->db);
 
@@ -93,20 +93,20 @@ class mod_project_universal extends ModeleNumRefProjects
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Return an example of numbering
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-    	global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+		global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-    	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
 		if (!$numExample)
@@ -114,17 +114,17 @@ class mod_project_universal extends ModeleNumRefProjects
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
-    /**
-     *  Return next value
-     *
-     *  @param	Societe		$objsoc		Object third party
-     *  @param   Project		$project	Object project
-     *  @return  string					Value if OK, 0 if KO
-     */
-    public function getNextValue($objsoc, $project)
-    {
+	/**
+	 *  Return next value
+	 *
+	 *  @param	Societe		$objsoc		Object third party
+	 *  @param   Project		$project	Object project
+	 *  @return  string					Value if OK, 0 if KO
+	 */
+	public function getNextValue($objsoc, $project)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -145,17 +145,17 @@ class mod_project_universal extends ModeleNumRefProjects
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return next reference not yet used as a reference
-     *
-     *  @param	Societe		$objsoc     Object third party
-     *  @param  Project		$project	Object project
-     *  @return string      			Next not used reference
-     */
-    public function project_get_num($objsoc = 0, $project = '')
-    {
-        // phpcs:enable
-        return $this->getNextValue($objsoc, $project);
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return next reference not yet used as a reference
+	 *
+	 *  @param	Societe		$objsoc     Object third party
+	 *  @param  Project		$project	Object project
+	 *  @return string      			Next not used reference
+	 */
+	public function project_get_num($objsoc = 0, $project = '')
+	{
+		// phpcs:enable
+		return $this->getNextValue($objsoc, $project);
+	}
 }
diff --git a/htdocs/core/modules/project/modules_project.php b/htdocs/core/modules/project/modules_project.php
index 250e760c9f6..6f174a27d7a 100644
--- a/htdocs/core/modules/project/modules_project.php
+++ b/htdocs/core/modules/project/modules_project.php
@@ -31,23 +31,78 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
  */
 abstract class ModelePDFProjects extends CommonDocGenerator
 {
+	/**
+	 * @var DoliDb Database handler
+	 */
+	public $db;
+
+	/**
+	 * @var string model name
+	 */
+	public $name;
+
+	/**
+	 * @var string model description (short text)
+	 */
+	public $description;
+
+	/**
+	 * @var string document type
+	 */
+	public $type;
+
+	/**
+	 * @var int page_largeur
+	 */
+	public $page_largeur;
+
+	/**
+	 * @var int page_hauteur
+	 */
+	public $page_hauteur;
+
+	/**
+	 * @var array format
+	 */
+	public $format;
+
+	/**
+	 * @var int marge_gauche
+	 */
+	public $marge_gauche;
+
+	/**
+	 * @var int marge_droite
+	 */
+	public $marge_droite;
+
+	/**
+	 * @var int marge_haute
+	 */
+	public $marge_haute;
+
+	/**
+	 * @var int marge_basse
+	 */
+	public $marge_basse;
+
 	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *  Return list of active generation modules
 	 *
-     *  @param  DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
-     */
-    public static function liste_modeles($db, $maxfilenamelength = 0)
+	 *  @param  DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
+	 */
+	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'project';
@@ -77,7 +132,7 @@ abstract class ModeleNumRefProjects
 	 *
 	 *  @return		boolean     true if module can be used
 	 */
-    public function isEnabled()
+	public function isEnabled()
 	{
 		return true;
 	}
@@ -87,7 +142,7 @@ abstract class ModeleNumRefProjects
 	 *
 	 *  @return     string      Texte descripif
 	 */
-    public function info()
+	public function info()
 	{
 		global $langs;
 		$langs->load("projects");
@@ -99,7 +154,7 @@ abstract class ModeleNumRefProjects
 	 *
 	 *  @return     string      Example
 	 */
-    public function getExample()
+	public function getExample()
 	{
 		global $langs;
 		$langs->load("projects");
@@ -112,7 +167,7 @@ abstract class ModeleNumRefProjects
 	 *
 	 *  @return     boolean     false if conflict, true if ok
 	 */
-    public function canBeActivated()
+	public function canBeActivated()
 	{
 		return true;
 	}
@@ -124,7 +179,7 @@ abstract class ModeleNumRefProjects
 	 *	@param	Project		$project	Object project
 	 *	@return	string					Valeur
 	 */
-    public function getNextValue($objsoc, $project)
+	public function getNextValue($objsoc, $project)
 	{
 		global $langs;
 		return $langs->trans("NotAvailable");
@@ -135,8 +190,8 @@ abstract class ModeleNumRefProjects
 	 *
 	 *  @return     string      Valeur
 	 */
-    public function getVersion()
-    {
+	public function getVersion()
+	{
 		global $langs;
 		$langs->load("admin");
 
@@ -145,5 +200,5 @@ abstract class ModeleNumRefProjects
 		elseif ($this->version == 'dolibarr') return DOL_VERSION;
 		elseif ($this->version) return $this->version;
 		else return $langs->trans("NotAvailable");
-    }
+	}
 }
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index 70cffdf9032..edd777901ec 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -62,15 +62,15 @@ class doc_generic_task_odt extends ModelePDFTask
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 
@@ -79,12 +79,12 @@ class doc_generic_task_odt extends ModelePDFTask
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
@@ -118,33 +118,33 @@ class doc_generic_task_odt extends ModelePDFTask
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Define array with couple substitution key => substitution value
 	 *
 	 * @param   Project			$object             Main object to use as data source
 	 * @param   Translate		$outputlangs        Lang object to use for output
-     * @param   string		    $array_key	        Name of the key for return array
+	 * @param   string		    $array_key	        Name of the key for return array
 	 * @return	array								Array of substitution
 	 */
 	public function get_substitutionarray_object($object, $outputlangs, $array_key = 'object')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $extrafields;
 
 		$resarray = array(
-            $array_key.'_id'=>$object->id,
-            $array_key.'_ref'=>$object->ref,
-            $array_key.'_title'=>$object->title,
-            $array_key.'_description'=>$object->description,
-            $array_key.'_date_creation'=>dol_print_date($object->date_c, 'day'),
-            $array_key.'_date_modification'=>dol_print_date($object->date_m, 'day'),
-            $array_key.'_date_start'=>dol_print_date($object->date_start, 'day'),
-            $array_key.'_date_end'=>dol_print_date($object->date_end, 'day'),
-            $array_key.'_note_private'=>$object->note_private,
-            $array_key.'_note_public'=>$object->note_public,
-            $array_key.'_public'=>$object->public,
-            $array_key.'_statut'=>$object->getLibStatut()
+			$array_key.'_id'=>$object->id,
+			$array_key.'_ref'=>$object->ref,
+			$array_key.'_title'=>$object->title,
+			$array_key.'_description'=>$object->description,
+			$array_key.'_date_creation'=>dol_print_date($object->date_c, 'day'),
+			$array_key.'_date_modification'=>dol_print_date($object->date_m, 'day'),
+			$array_key.'_date_start'=>dol_print_date($object->date_start, 'day'),
+			$array_key.'_date_end'=>dol_print_date($object->date_end, 'day'),
+			$array_key.'_note_private'=>$object->note_private,
+			$array_key.'_note_public'=>$object->note_public,
+			$array_key.'_public'=>$object->public,
+			$array_key.'_statut'=>$object->getLibStatut()
 		);
 
 		// Retrieve extrafields
@@ -158,7 +158,7 @@ class doc_generic_task_odt extends ModelePDFTask
 		return $resarray;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -167,43 +167,43 @@ class doc_generic_task_odt extends ModelePDFTask
 	 *  @param  string		    $array_key	        Name of the key for return array
 	 *  @return	array								Return a substitution array
 	 */
-    public function get_substitutionarray_tasks($task, $outputlangs, $array_key = 'task')
-    {
-        // phpcs:enable
-        global $conf, $extrafields;
+	public function get_substitutionarray_tasks($task, $outputlangs, $array_key = 'task')
+	{
+		// phpcs:enable
+		global $conf, $extrafields;
 
-	    $resarray = array(
-            'task_ref'=>$task->ref,
-            'task_fk_project'=>$task->fk_project,
-            'task_projectref'=>$task->projectref,
-            'task_projectlabel'=>$task->projectlabel,
-            'task_label'=>$task->label,
-            'task_description'=>$task->description,
-            'task_fk_parent'=>$task->fk_parent,
+		$resarray = array(
+			'task_ref'=>$task->ref,
+			'task_fk_project'=>$task->fk_project,
+			'task_projectref'=>$task->projectref,
+			'task_projectlabel'=>$task->projectlabel,
+			'task_label'=>$task->label,
+			'task_description'=>$task->description,
+			'task_fk_parent'=>$task->fk_parent,
 			'task_duration'=>$task->duration_effective,
-            'task_duration_formated'=>convertSecondToTime($task->duration_effective, 'allhourmin'),
-            'task_planned_workload'=>$task->planned_workload,
-            'task_planned_workload_formated'=>convertSecondToTime($task->planned_workload, 'allhourmin'),
-            'task_progress'=>$task->progress,
-            'task_public'=>$task->public,
-            'task_date_start'=>dol_print_date($task->date_start, 'day'),
-            'task_date_end'=>dol_print_date($task->date_end, 'day'),
-            'task_note_private'=>$task->note_private,
-            'task_note_public'=>$task->note_public
-        );
+			'task_duration_formated'=>convertSecondToTime($task->duration_effective, 'allhourmin'),
+			'task_planned_workload'=>$task->planned_workload,
+			'task_planned_workload_formated'=>convertSecondToTime($task->planned_workload, 'allhourmin'),
+			'task_progress'=>$task->progress,
+			'task_public'=>$task->public,
+			'task_date_start'=>dol_print_date($task->date_start, 'day'),
+			'task_date_end'=>dol_print_date($task->date_end, 'day'),
+			'task_note_private'=>$task->note_private,
+			'task_note_public'=>$task->note_public
+		);
 
-	    // Retrieve extrafields
-	    if (is_array($task->array_options) && count($task->array_options))
-	    {
-		    $task->fetch_optionals();
+		// Retrieve extrafields
+		if (is_array($task->array_options) && count($task->array_options))
+		{
+			$task->fetch_optionals();
 
-		    $resarray = $this->fill_substitutionarray_with_extrafields($task, $resarray, $extrafields, $array_key, $outputlangs);
-	    }
+			$resarray = $this->fill_substitutionarray_with_extrafields($task, $resarray, $extrafields, $array_key, $outputlangs);
+		}
 
-	    return $resarray;
-    }
+		return $resarray;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -213,7 +213,7 @@ class doc_generic_task_odt extends ModelePDFTask
 	 */
 	public function get_substitutionarray_project_contacts($contact, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		return array(
@@ -228,7 +228,7 @@ class doc_generic_task_odt extends ModelePDFTask
 		);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -238,7 +238,7 @@ class doc_generic_task_odt extends ModelePDFTask
 	 */
 	public function get_substitutionarray_project_file($file, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		return array(
@@ -248,7 +248,7 @@ class doc_generic_task_odt extends ModelePDFTask
 		);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -258,7 +258,7 @@ class doc_generic_task_odt extends ModelePDFTask
 	 */
 	public function get_substitutionarray_project_reference($refdetail, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		return array(
@@ -272,7 +272,7 @@ class doc_generic_task_odt extends ModelePDFTask
 		);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -282,7 +282,7 @@ class doc_generic_task_odt extends ModelePDFTask
 	 */
 	public function get_substitutionarray_tasksressource($taskressource, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		//dol_syslog(get_class($this).'::get_substitutionarray_tasksressource taskressource='.var_export($taskressource,true),LOG_DEBUG);
 		return array(
@@ -296,7 +296,7 @@ class doc_generic_task_odt extends ModelePDFTask
 		);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -306,7 +306,7 @@ class doc_generic_task_odt extends ModelePDFTask
 	 */
 	public function get_substitutionarray_taskstime($tasktime, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		return array(
@@ -321,7 +321,7 @@ class doc_generic_task_odt extends ModelePDFTask
 		);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -331,7 +331,7 @@ class doc_generic_task_odt extends ModelePDFTask
 	 */
 	public function get_substitutionarray_task_file($file, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		return array(
@@ -353,7 +353,7 @@ class doc_generic_task_odt extends ModelePDFTask
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("errors", "companies"));
+		$langs->loadLangs(array("errors", "companies"));
 
 		$form = new Form($this->db);
 
@@ -412,7 +412,7 @@ class doc_generic_task_odt extends ModelePDFTask
    			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
    			foreach ($listoffiles as $file)
    			{
-                $texte .= $file['name'].'<br>';
+				$texte .= $file['name'].'<br>';
    			}
    			$texte .= '</div>';
 		}
@@ -430,7 +430,7 @@ class doc_generic_task_odt extends ModelePDFTask
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to build a document on disk using the generic odt module.
 	 *
@@ -441,7 +441,7 @@ class doc_generic_task_odt extends ModelePDFTask
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
@@ -522,7 +522,7 @@ class doc_generic_task_odt extends ModelePDFTask
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->projet->dir_temp,
@@ -567,7 +567,7 @@ class doc_generic_task_odt extends ModelePDFTask
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -828,7 +828,7 @@ class doc_generic_task_odt extends ModelePDFTask
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				} else {
@@ -836,7 +836,7 @@ class doc_generic_task_odt extends ModelePDFTask
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
diff --git a/htdocs/core/modules/project/task/mod_task_universal.php b/htdocs/core/modules/project/task/mod_task_universal.php
index b1c4f576a74..011ac381254 100644
--- a/htdocs/core/modules/project/task/mod_task_universal.php
+++ b/htdocs/core/modules/project/task/mod_task_universal.php
@@ -31,15 +31,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php';
 class mod_task_universal extends ModeleNumRefTask
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 	/**
 	 * @var string
@@ -54,19 +54,19 @@ class mod_task_universal extends ModeleNumRefTask
 	public $name = 'Universal';
 
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     *  @return     string      Texte descripif
-     */
-    public function info()
-    {
-    	global $conf, $langs;
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $conf, $langs, $db;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("projects", "admin"));
+		$langs->loadLangs(array("projects", "admin"));
 
-		$form = new Form($this->db);
+		$form = new Form($db);
 
 		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
 		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
@@ -93,38 +93,37 @@ class mod_task_universal extends ModeleNumRefTask
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Return an example of numbering
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-    	global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+		global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-    	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
-		if (!$numExample)
-		{
+		if (!$numExample) {
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
-    /**
-     *  Return next value
-     *
-     *  @param	Societe		$objsoc		Object third party
-     *  @param   Task		$object	    Object task
-     *  @return  string					Value if OK, 0 if KO
-     */
-    public function getNextValue($objsoc, $object)
-    {
+	/**
+	 *  Return next value
+	 *
+	 *  @param	Societe		$objsoc		Object third party
+	 *  @param   Task		$object	    Object task
+	 *  @return  string					Value if OK, 0 if KO
+	 */
+	public function getNextValue($objsoc, $object)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -132,8 +131,7 @@ class mod_task_universal extends ModeleNumRefTask
 		// On defini critere recherche compteur
 		$mask = $conf->global->PROJECT_TASK_UNIVERSAL_MASK;
 
-		if (!$mask)
-		{
+		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return 0;
 		}
@@ -145,17 +143,17 @@ class mod_task_universal extends ModeleNumRefTask
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return next reference not yet used as a reference
-     *
-     *  @param	Societe		$objsoc     Object third party
-     *  @param  Task		$object	    Object task
-     *  @return string      			Next not used reference
-     */
-    public function project_get_num($objsoc = 0, $object = '')
-    {
-        // phpcs:enable
-        return $this->getNextValue($objsoc, $object);
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return next reference not yet used as a reference
+	 *
+	 *  @param	Societe		$objsoc     Object third party
+	 *  @param  Task		$object	    Object task
+	 *  @return string      			Next not used reference
+	 */
+	public function project_get_num($objsoc = 0, $object = '')
+	{
+		// phpcs:enable
+		return $this->getNextValue($objsoc, $object);
+	}
 }
diff --git a/htdocs/core/modules/project/task/modules_task.php b/htdocs/core/modules/project/task/modules_task.php
index 4bf0a5f6bb8..2600538f273 100644
--- a/htdocs/core/modules/project/task/modules_task.php
+++ b/htdocs/core/modules/project/task/modules_task.php
@@ -38,17 +38,17 @@ abstract class ModelePDFTask extends CommonDocGenerator
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of active generation modules
 	 *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
-     */
-    public static function liste_modeles($db, $maxfilenamelength = 0)
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
+	 */
+	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'project_task';
@@ -78,7 +78,7 @@ abstract class ModeleNumRefTask
 	 *
 	 *  @return		boolean     true if module can be used
 	 */
-    public function isEnabled()
+	public function isEnabled()
 	{
 		return true;
 	}
@@ -88,7 +88,7 @@ abstract class ModeleNumRefTask
 	 *
 	 *  @return     string      Texte descripif
 	 */
-    public function info()
+	public function info()
 	{
 		global $langs;
 		$langs->load("projects");
@@ -100,7 +100,7 @@ abstract class ModeleNumRefTask
 	 *
 	 *  @return     string      Example
 	 */
-    public function getExample()
+	public function getExample()
 	{
 		global $langs;
 		$langs->load("projects");
@@ -113,7 +113,7 @@ abstract class ModeleNumRefTask
 	 *
 	 *  @return     boolean     false if conflict, true if ok
 	 */
-    public function canBeActivated()
+	public function canBeActivated()
 	{
 		return true;
 	}
@@ -125,7 +125,7 @@ abstract class ModeleNumRefTask
 	 *	@param	Project		$project	Object project
 	 *	@return	string					Valeur
 	 */
-    public function getNextValue($objsoc, $project)
+	public function getNextValue($objsoc, $project)
 	{
 		global $langs;
 		return $langs->trans("NotAvailable");
@@ -136,7 +136,7 @@ abstract class ModeleNumRefTask
 	 *
 	 *  @return     string      Valeur
 	 */
-    public function getVersion()
+	public function getVersion()
 	{
 		global $langs;
 		$langs->load("admin");
diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index 59e0e27b677..b27e94b46b7 100644
--- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
+++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
@@ -38,21 +38,21 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
  */
 class doc_generic_proposal_odt extends ModelePDFPropales
 {
-    /**
-     * @var Societe Issuer object that emits
-     */
-    public $emetteur;
+	/**
+	 * @var Societe Issuer object that emits
+	 */
+	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
-    /**
-     * @var string Dolibarr version of the loaded document
-     */
-    public $version = 'dolibarr';
+	/**
+	 * @var string Dolibarr version of the loaded document
+	 */
+	public $version = 'dolibarr';
 
 
 	/**
@@ -65,7 +65,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
@@ -110,7 +110,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("errors", "companies"));
+		$langs->loadLangs(array("errors", "companies"));
 
 		$form = new Form($this->db);
 
@@ -175,7 +175,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
    			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
    			foreach ($listoffiles as $file)
    			{
-                $texte .= $file['name'].'<br>';
+				$texte .= $file['name'].'<br>';
    			}
    			$texte .= '</div>';
 
@@ -204,11 +204,11 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				$texte .= '</table>';
 			}
 		}
-        // Add input to upload a new template file.
-        $texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
-        $texte .= '<input type="hidden" value="PROPALE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-        $texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
-        $texte .= '</div>';
+		// Add input to upload a new template file.
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte .= '<input type="hidden" value="PROPALE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
+		$texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '</div>';
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
@@ -222,7 +222,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to build a document on disk using the generic odt module.
 	 *
@@ -236,7 +236,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
@@ -276,6 +276,8 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				}
 			}
 
+			$object->fetch_thirdparty();
+
 			$dir = $conf->propal->multidir_output[$object->entity];
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
@@ -304,8 +306,8 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -332,13 +334,13 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				$contactobject = null;
 				if (!empty($usecontact))
 				{
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else {
-                        $socobject = $object->thirdparty;
-                        // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
-                        $contactobject = $object->contact;
-                    }
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+						$socobject = $object->contact;
+					} else {
+						$socobject = $object->thirdparty;
+						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+						$contactobject = $object->contact;
+					}
 				} else {
 					$socobject = $object->thirdparty;
 				}
@@ -348,7 +350,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				'__FROM_EMAIL__' => $this->emetteur->email,
 				'__TOTAL_TTC__' => $object->total_ttc,
 				'__TOTAL_HT__' => $object->total_ht,
-				'__TOTAL_VAT__' => $object->total_vat
+				'__TOTAL_VAT__' => $object->total_tva
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
@@ -366,7 +368,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->propal->multidir_temp[$object->entity],
@@ -429,7 +431,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
@@ -485,7 +487,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -499,15 +501,15 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				} else {
 					try {
-					    $odfHandler->saveToDisk($file);
+						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index c67789b1814..a889dec7815 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -166,15 +166,15 @@ class pdf_azur extends ModelePDFPropales
 
 		// Define position of columns
 		$this->posxdesc = $this->marge_gauche + 1;
-		if ($conf->global->PRODUCT_USE_UNITS)
+		if (!empty($conf->global->PRODUCT_USE_UNITS))
 		{
 			$this->posxtva = 101;
 			$this->posxup = 118;
 			$this->posxqty = 135;
 			$this->posxunit = 151;
 		} else {
-			$this->posxtva = 110;
-			$this->posxup = 126;
+			$this->posxtva = 106;
+			$this->posxup = 122;
 			$this->posxqty = 145;
 			$this->posxunit = 162;
 		}
@@ -204,7 +204,7 @@ class pdf_azur extends ModelePDFPropales
 	/**
 	 *  Function to build pdf onto disk
 	 *
-	 *  @param		Object		$object				Object to generate
+	 *  @param		Propal		$object				Object to generate
 	 *  @param		Translate	$outputlangs		Lang output object
 	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
 	 *  @param		int			$hidedetails		Do not show line details
@@ -383,7 +383,7 @@ class pdf_azur extends ModelePDFPropales
 				$heightforsignature = empty($conf->global->PROPAL_DISABLE_SIGNATURE) ? (pdfGetHeightForHtmlContent($pdf, $outputlangs->transnoentities("ProposalCustomerSignature")) + 10) : 0;
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
 				//print $heightforinfotot + $heightforsignature + $heightforfreetext + $heightforfooter;exit;
 
 				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
@@ -396,7 +396,7 @@ class pdf_azur extends ModelePDFPropales
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
 
 				// Incoterm
-				if ($conf->incoterm->enabled)
+				if (!empty($conf->incoterm->enabled))
 				{
 					$desc_incoterms = $object->getIncotermsForPDF();
 					if ($desc_incoterms)
@@ -583,7 +583,7 @@ class pdf_azur extends ModelePDFPropales
 					$pdf->MultiCell($this->posxunit - $this->posxqty - 0.8, 4, $qty, 0, 'R'); // Enough for 6 chars
 
 					// Unit
-					if ($conf->global->PRODUCT_USE_UNITS)
+					if (!empty($conf->global->PRODUCT_USE_UNITS))
 					{
 						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
 						$pdf->SetXY($this->posxunit, $curY);
@@ -605,7 +605,7 @@ class pdf_azur extends ModelePDFPropales
 					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
+					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
 					else $tvaligne = $object->lines[$i]->total_tva;
 
 					$localtax1ligne = $object->lines[$i]->total_localtax1;
@@ -827,8 +827,8 @@ class pdf_azur extends ModelePDFPropales
 	/**
 	 *  Show payments table
 	 *
-	 *  @param	TCPDF		$pdf           Object PDF
-	 *  @param  Object		$object         Object proposal
+	 *  @param	TCPDF		$pdf            Object PDF
+	 *  @param  Propal		$object         Object proposal
 	 *  @param  int			$posy           Position y in PDF
 	 *  @param  Translate	$outputlangs    Object langs for output
 	 *  @return int             			<0 if KO, >0 if OK
@@ -844,7 +844,7 @@ class pdf_azur extends ModelePDFPropales
 	 *   Show miscellaneous information (payment mode, payment term, ...)
 	 *
 	 *   @param		TCPDF		$pdf     		Object PDF
-	 *   @param		Object		$object			Object to show
+	 *   @param		Propal		$object			Object to show
 	 *   @param		int			$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @return	void
@@ -870,7 +870,7 @@ class pdf_azur extends ModelePDFPropales
 		$posxval = 52;
 
 		// Show shipping date
-		if (!empty($object->date_livraison))
+		if (!empty($object->delivery_date))
 		{
 			$outputlangs->load("sendings");
 			$pdf->SetFont('', 'B', $default_font_size - 2);
@@ -879,7 +879,7 @@ class pdf_azur extends ModelePDFPropales
 			$pdf->MultiCell(80, 4, $titre, 0, 'L');
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posxval, $posy);
-			$dlp = dol_print_date($object->date_livraison, "daytext", false, $outputlangs, true);
+			$dlp = dol_print_date($object->delivery_date, "daytext", false, $outputlangs, true);
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
 			$posy = $pdf->GetY() + 1;
@@ -1056,14 +1056,14 @@ class pdf_azur extends ModelePDFPropales
 		$pdf->SetXY($col1x, $tab2_top + 0);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
 
-		$total_ht = (($conf->multicurrency->enabled && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
+		$total_ht = ((!empty($conf->multicurrency->enabled) && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + 0);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248, 248, 248);
 
-		$total_ttc = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
+		$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
 		$this->atleastoneratenotnull = 0;
 		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
@@ -1381,7 +1381,7 @@ class pdf_azur extends ModelePDFPropales
 			$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
 		}
 
-		if ($conf->global->PRODUCT_USE_UNITS) {
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxunit - 1, $tab_top + 1);
@@ -1415,7 +1415,7 @@ class pdf_azur extends ModelePDFPropales
 	 *  Show top header of page.
 	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
-	 *  @param  Object		$object     	Object to show
+	 *  @param  Propal		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
@@ -1618,9 +1618,8 @@ class pdf_azur extends ModelePDFPropales
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -1666,7 +1665,7 @@ class pdf_azur extends ModelePDFPropales
 	 *   	Show footer of page. Need this->emetteur object
 	 *
 	 *   	@param	TCPDF		$pdf     			PDF
-	 * 		@param	Object		$object				Object to show
+	 * 		@param	Propal		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	int								Return height of bottom margin including footer text
@@ -1674,7 +1673,7 @@ class pdf_azur extends ModelePDFPropales
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'PROPOSAL_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 
@@ -1684,7 +1683,7 @@ class pdf_azur extends ModelePDFPropales
 	 *	Show area for the customer to sign
 	 *
 	 *	@param	TCPDF		$pdf            Object PDF
-	 *	@param  Facture		$object         Object invoice
+	 *	@param  Propal		$object         Object invoice
 	 *	@param	int			$posy			Position depart
 	 *	@param	Translate	$outputlangs	Objet langs
 	 *	@return int							Position pour suite
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 8563c845d2b..119932949b2 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -57,7 +57,7 @@ class pdf_cyan extends ModelePDFPropales
 	public $description;
 
 	/**
-	 * @var string     Save the name of generated file as the main doc when generating a doc with this template
+	 * @var int    Save the name of generated file as the main doc when generating a doc with this template
 	 */
 	public $update_main_doc_field;
 
@@ -119,6 +119,11 @@ class pdf_cyan extends ModelePDFPropales
 	 */
 	public $emetteur;
 
+	/**
+	 * @var array of document table collumns
+	 */
+	public $cols;
+
 
 	/**
 	 *	Constructor
@@ -164,11 +169,13 @@ class pdf_cyan extends ModelePDFPropales
 		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
 
 		// Define position of columns
-		$this->posxdesc = $this->marge_gauche + 1;
+		$this->posxdesc = $this->marge_gauche + 1; // used for notes ans other stuff
 
 
 		$this->tabTitleHeight = 5; // default height
 
+		//  Use new system for position of columns, view  $this->defineColumnField()
+
 		$this->tva = array();
 		$this->localtax1 = array();
 		$this->localtax2 = array();
@@ -180,7 +187,7 @@ class pdf_cyan extends ModelePDFPropales
 	/**
 	 *  Function to build pdf onto disk
 	 *
-	 *  @param		Object		$object				Object to generate
+	 *  @param		Propal		$object				Object to generate
 	 *  @param		Translate	$outputlangs		Lang output object
 	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
 	 *  @param		int			$hidedetails		Do not show line details
@@ -193,15 +200,18 @@ class pdf_cyan extends ModelePDFPropales
 	  // phpcs:enable
 		global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblines;
 
+		dol_syslog("write_file outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));
+
 		if (!is_object($outputlangs)) $outputlangs = $langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
 		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
 
-		// Load traductions files required by page
+		// Load translation files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "propal"));
 
+		global $outputlangsbis;
+		$outputlangsbis = null;
 		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
-			global $outputlangsbis;
 			$outputlangsbis = new Translate('', $conf);
 			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
 			$outputlangsbis->loadLangs(array("main", "dict", "companies", "bills", "products", "propal"));
@@ -313,6 +323,10 @@ class pdf_cyan extends ModelePDFPropales
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
+				// Set nblines with the new facture lines content after hook
+				$nblines = count($object->lines);
+				//$nbpayments = count($object->getListOfPayments());
+
 				// Create pdf instance
 				$pdf = pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
@@ -344,16 +358,16 @@ class pdf_cyan extends ModelePDFPropales
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
-				// Does we have at least one line with discount $this->atleastonediscount
-				foreach ($object->lines as $line) {
-					if ($line->remise_percent) {
-						$this->atleastonediscount = true;
-						break;
+				// Set $this->atleastonediscount if you have at least one discount
+				for ($i = 0; $i < $nblines; $i++)
+				{
+					if ($object->lines[$i]->remise_percent)
+					{
+						$this->atleastonediscount++;
 					}
 				}
 
 
-
 				// New page
 				$pdf->AddPage();
 				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
@@ -365,7 +379,7 @@ class pdf_cyan extends ModelePDFPropales
 				$heightforfooter = $this->marge_basse + (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
 				//print $heightforinfotot + $heightforsignature + $heightforfreetext + $heightforfooter;exit;
 
-				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
+				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs, $outputlangsbis);
 				$pdf->SetFont('', '', $default_font_size - 1);
 				$pdf->MultiCell(0, 3, ''); // Set interline to 3
 				$pdf->SetTextColor(0, 0, 0);
@@ -377,7 +391,7 @@ class pdf_cyan extends ModelePDFPropales
 
 				// Incoterm
 				$height_incoterms = 0;
-				if ($conf->incoterm->enabled)
+				if (!empty($conf->incoterm->enabled))
 				{
 					$desc_incoterms = $object->getIncotermsForPDF();
 					if ($desc_incoterms)
@@ -386,7 +400,7 @@ class pdf_cyan extends ModelePDFPropales
 
 						$pdf->SetFont('', '', $default_font_size - 1);
 						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top - 1, dol_htmlentitiesbr($desc_incoterms), 0, 1);
-						$nexY = $pdf->GetY();
+						$nexY = max($pdf->GetY(), $nexY);
 						$height_incoterms = $nexY - $tab_top;
 
 						// Rect takes a length in 3rd parameter
@@ -397,7 +411,7 @@ class pdf_cyan extends ModelePDFPropales
 					}
 				}
 
-				// Affiche notes
+				// Displays notes
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
 				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
 				{
@@ -413,8 +427,7 @@ class pdf_cyan extends ModelePDFPropales
 
 				// Extrafields in note
 				$extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
-				if (!empty($extranote))
-				{
+				if (!empty($extranote)) {
 					$notetoshow = dol_concatdesc($notetoshow, $extranote);
 				}
 
@@ -454,7 +467,7 @@ class pdf_cyan extends ModelePDFPropales
 					{
 						$pdf->rollbackTransaction(true);
 
-						// prepar pages to receive notes
+						// prepare pages to receive notes
 						while ($pagenb < $pageposafternote) {
 							$pdf->AddPage();
 							$pagenb++;
@@ -488,7 +501,7 @@ class pdf_cyan extends ModelePDFPropales
 						}
 
 
-						// apply note frame to previus pages
+						// apply note frame to previous pages
 						$i = $pageposbeforenote;
 						while ($i < $pageposafternote) {
 							$pdf->setPage($i);
@@ -544,10 +557,10 @@ class pdf_cyan extends ModelePDFPropales
 					$height_note = 0;
 				}
 
-				// Use new auto collum system
+				// Use new auto column system
 				$this->prepareArrayColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
-				// Simulation de tableau pour connaitre la hauteur de la ligne de titre
+				// Table simulation to know the height of the title line
 				$pdf->startTransaction();
 				$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
 				$pdf->rollbackTransaction(true);
@@ -582,7 +595,6 @@ class pdf_cyan extends ModelePDFPropales
 						{
 							$pdf->AddPage('', '', true);
 							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-							//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 							$pdf->setPage($pageposbefore + 1);
 
 							$curY = $tab_top_newpage;
@@ -627,7 +639,6 @@ class pdf_cyan extends ModelePDFPropales
 								{
 									$pdf->AddPage('', '', true);
 									if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-									//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 									$pdf->setPage($pageposafter + 1);
 								}
 							} else {
@@ -656,7 +667,7 @@ class pdf_cyan extends ModelePDFPropales
 						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
 					}
 
-					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+					$pdf->SetFont('', '', $default_font_size - 1); // We reposition the default font
 
 					// VAT Rate
 					if ($this->getColumnStatus('vat'))
@@ -700,7 +711,7 @@ class pdf_cyan extends ModelePDFPropales
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
-					// Total HT line
+					// Total excl tax line (HT)
 					if ($this->getColumnStatus('totalexcltax'))
 					{
 						$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
@@ -708,6 +719,14 @@ class pdf_cyan extends ModelePDFPropales
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
+					// Total with tax line (TTC)
+					if ($this->getColumnStatus('totalincltax'))
+					{
+						$total_incl_tax = pdf_getlinetotalwithtax($object, $i, $outputlangs, $hidedetails);
+						$this->printStdColumnContent($pdf, $curY, 'totalincltax', $total_incl_tax);
+						$nexY = max($pdf->GetY(), $nexY);
+					}
+
 					// Extrafields
 					if (!empty($object->lines[$i]->array_options)) {
 						foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
@@ -732,9 +751,8 @@ class pdf_cyan extends ModelePDFPropales
 					$reshook = $hookmanager->executeHooks('printPDFline', $parameters, $this); // Note that $object may have been modified by hook
 
 
-
-					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
+					// Collection of totals by value of vat in $this->tva["rate"] = total_tva
+					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
 					else $tvaligne = $object->lines[$i]->total_tva;
 
 					$localtax1ligne = $object->lines[$i]->total_localtax1;
@@ -760,20 +778,21 @@ class pdf_cyan extends ModelePDFPropales
 					}
 
 					// retrieve global local tax
-					if ($localtax1_type && $localtax1ligne != 0)
+					if ($localtax1_type && $localtax1ligne != 0) {
 						$this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
-					if ($localtax2_type && $localtax2ligne != 0)
+					}
+					if ($localtax2_type && $localtax2ligne != 0) {
 						$this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
+					}
 
 					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate .= '*';
 					if (!isset($this->tva[$vatrate]))				$this->tva[$vatrate] = 0;
 					$this->tva[$vatrate] += $tvaligne;
 
-					if ($posYAfterImage > $posYAfterDescription) $nexY = $posYAfterImage;
+					if ($posYAfterImage > $posYAfterDescription) $nexY = max($nexY, $posYAfterImage);
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
-					{
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
 						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
@@ -784,14 +803,12 @@ class pdf_cyan extends ModelePDFPropales
 
 
 					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
+					while ($pagenb < $pageposafter) {
 						$pdf->setPage($pagenb);
-						if ($pagenb == $pageposbeforeprintlines)
-						{
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
+						if ($pagenb == $pageposbeforeprintlines) {
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
 						} else {
-							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
@@ -799,13 +816,12 @@ class pdf_cyan extends ModelePDFPropales
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 					}
-					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
-					{
-						if ($pagenb == $pageposafter)
-						{
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
+
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == $pageposafter) {
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
 						} else {
-							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
@@ -819,20 +835,20 @@ class pdf_cyan extends ModelePDFPropales
 				// Show square
 				if ($pagenb == $pageposbeforeprintlines)
 				{
-					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code);
+					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code, $outputlangsbis);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
 				} else {
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
+					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code, $outputlangsbis);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
 				}
 
-				// Affiche zone infos
+				// Display infos area
 				$posy = $this->drawInfoTable($pdf, $object, $bottomlasttab, $outputlangs);
 
-				// Affiche zone totaux
+				// Display total zone
 				$posy = $this->drawTotalTable($pdf, $object, 0, $bottomlasttab, $outputlangs);
 
-				// Affiche zone versements
+				// Display payment area
 				/*
 				if ($deja_regle || $amount_credit_notes_included || $amount_deposits_included)
 				{
@@ -846,7 +862,7 @@ class pdf_cyan extends ModelePDFPropales
 					$posy = $this->drawSignatureArea($pdf, $object, $posy, $outputlangs);
 				}
 
-				// Pied de page
+				// Pagefoot
 				$this->_pagefoot($pdf, $object, $outputlangs);
 				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
 
@@ -954,8 +970,8 @@ class pdf_cyan extends ModelePDFPropales
 	/**
 	 *  Show payments table
 	 *
-	 *  @param	TCPDF		$pdf           Object PDF
-	 *  @param  Object		$object         Object proposal
+	 *  @param	TCPDF		$pdf            Object PDF
+	 *  @param  Propal		$object         Object proposal
 	 *  @param  int			$posy           Position y in PDF
 	 *  @param  Translate	$outputlangs    Object langs for output
 	 *  @return int             			<0 if KO, >0 if OK
@@ -968,7 +984,7 @@ class pdf_cyan extends ModelePDFPropales
 	 *   Show miscellaneous information (payment mode, payment term, ...)
 	 *
 	 *   @param		TCPDF		$pdf     		Object PDF
-	 *   @param		Object		$object			Object to show
+	 *   @param		Propal		$object			Object to show
 	 *   @param		int			$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @return	int							Pos y
@@ -993,7 +1009,7 @@ class pdf_cyan extends ModelePDFPropales
 		$posxval = 52;
 
 		// Show shipping date
-		if (!empty($object->date_livraison))
+		if (!empty($object->delivery_date))
 		{
 			$outputlangs->load("sendings");
 			$pdf->SetFont('', 'B', $default_font_size - 2);
@@ -1002,7 +1018,7 @@ class pdf_cyan extends ModelePDFPropales
 			$pdf->MultiCell(80, 4, $titre, 0, 'L');
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posxval, $posy);
-			$dlp = dol_print_date($object->date_livraison, "daytext", false, $outputlangs, true);
+			$dlp = dol_print_date($object->delivery_date, "daytext", false, $outputlangs, true);
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
 			$posy = $pdf->GetY() + 1;
@@ -1121,10 +1137,10 @@ class pdf_cyan extends ModelePDFPropales
 			// If payment mode not forced or forced to VIR, show payment with BAN
 			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
 			{
-				if (!empty($object->fk_account) || !empty($object->fk_bank) || !empty($conf->global->FACTURE_RIB_NUMBER))
+				if ($object->fk_account > 0 || $object->fk_bank > 0 || !empty($conf->global->FACTURE_RIB_NUMBER))
 				{
-					$bankid = (empty($object->fk_account) ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
-					if (!empty($object->fk_bank)) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
+					$bankid = ($object->fk_account <= 0 ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
+					if ($object->fk_bank > 0) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
 					$account = new Account($this->db);
 					$account->fetch($bankid);
 
@@ -1145,24 +1161,32 @@ class pdf_cyan extends ModelePDFPropales
 	/**
 	 *	Show total to pay
 	 *
-	 *	@param	TCPDF		$pdf           Object PDF
-	 *	@param  Facture		$object         Object invoice
-	 *	@param  int			$deja_regle     Montant deja regle
+	 *	@param	TCPDF		$pdf            Object PDF
+	 *	@param  Propal		$object         Object proposal
+	 *	@param  int			$deja_regle     Amount already paid (in the currency of invoice)
 	 *	@param	int			$posy			Position depart
 	 *	@param	Translate	$outputlangs	Objet langs
 	 *	@return int							Position pour suite
 	 */
 	protected function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
-		global $conf, $mysoc;
+		global $conf, $mysoc, $hookmanager;
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
+		$outputlangsbis = null;
+		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+			$outputlangsbis = new Translate('', $conf);
+			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
+			$outputlangsbis->loadLangs(array("main", "dict", "companies", "bills", "products", "propal"));
+			$default_font_size--;
+		}
+
 		$tab2_top = $posy;
 		$tab2_hl = 4;
 		$pdf->SetFont('', '', $default_font_size - 1);
 
-		// Tableau total
+		// Total table
 		$col1x = 120; $col2x = 170;
 		if ($this->page_largeur < 210) // To work with US executive format
 		{
@@ -1173,26 +1197,19 @@ class pdf_cyan extends ModelePDFPropales
 		$useborder = 0;
 		$index = 0;
 
-		$outputlangsbis = null;
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
-			$outputlangsbis = new Translate('', $conf);
-			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
-			$outputlangsbis->loadLangs(array("main", "dict", "companies", "bills", "products", "propal"));
-		}
-
 		// Total HT
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top + 0);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', 1);
 
-		$total_ht = (($conf->multicurrency->enabled && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
+		$total_ht = ((!empty($conf->multicurrency->enabled) && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + 0);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248, 248, 248);
 
-		$total_ttc = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
+		$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
 		$this->atleastoneratenotnull = 0;
 		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
@@ -1387,6 +1404,7 @@ class pdf_cyan extends ModelePDFPropales
 
 		if ($deja_regle > 0)
 		{
+			// Already paid + Deposits
 			$index++;
 
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
@@ -1402,7 +1420,7 @@ class pdf_cyan extends ModelePDFPropales
 				$pdf->SetFillColor(255,255,255);
 
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOfferedShort"), $useborder, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOfferedShort"), $useborder, 'L', 1);
 
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle, 0, $outputlangs), $useborder, 'R', 1);
@@ -1440,9 +1458,10 @@ class pdf_cyan extends ModelePDFPropales
 	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
 	 *   @param		int			$hidebottom		Hide bottom bar of array
 	 *   @param		string		$currency		Currency code
+	 *   @param		Translate	$outputlangsbis	Langs object bis
 	 *   @return	void
 	 */
-	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '', $outputlangsbis = null)
 	{
 		global $conf;
 
@@ -1460,6 +1479,10 @@ class pdf_cyan extends ModelePDFPropales
 		if (empty($hidetop))
 		{
 			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
+			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+				$titre .= ' - '.$outputlangsbis->transnoentities("AmountInCurrency", $outputlangsbis->transnoentitiesnoconv("Currency".$currency));
+			}
+
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
@@ -1487,12 +1510,13 @@ class pdf_cyan extends ModelePDFPropales
 	 *  Show top header of page.
 	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
-	 *  @param  Object		$object     	Object to show
+	 *  @param  Propal		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @param  Translate	$outputlangsbis	Object lang for output bis
 	 *  @return	void
 	 */
-	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $outputlangsbis = null)
 	{
 		global $conf, $langs;
 
@@ -1504,7 +1528,7 @@ class pdf_cyan extends ModelePDFPropales
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		//  Show Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->PROPALE_DRAFT_WATERMARK)))
+		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->PROPALE_DRAFT_WATERMARK)))
 		{
 			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->PROPALE_DRAFT_WATERMARK);
 		}
@@ -1512,8 +1536,10 @@ class pdf_cyan extends ModelePDFPropales
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 
+		$w = 100;
+
 		$posy = $this->marge_haute;
-		$posx = $this->page_largeur - $this->marge_droite - 100;
+		$posx = $this->page_largeur - $this->marge_droite - $w;
 
 		$pdf->SetXY($this->marge_gauche, $posy);
 
@@ -1530,19 +1556,18 @@ class pdf_cyan extends ModelePDFPropales
 				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
 				}
-				if (is_readable($logo))
-				{
+				if (is_readable($logo)) {
 					$height = pdf_getHeightForLogo($logo);
 					$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 				} else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
+					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
 			} else {
 				$text = $this->emetteur->name;
-				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
 		}
 
@@ -1550,14 +1575,20 @@ class pdf_cyan extends ModelePDFPropales
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
 		$title = $outputlangs->transnoentities("PdfCommercialProposalTitle");
-		$pdf->MultiCell(100, 4, $title, '', 'R');
+		$pdf->MultiCell($w, 4, $title, '', 'R');
 
 		$pdf->SetFont('', 'B', $default_font_size);
 
 		$posy += 5;
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
-		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref), '', 'R');
+		$textref = $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref);
+		if ($object->statut == $object::STATUS_DRAFT)
+		{
+			$pdf->SetTextColor(128, 0, 0);
+			$textref .= ' - '.$outputlangs->transnoentities("NotValidated");
+		}
+		$pdf->MultiCell($w, 4, $textref, '', 'R');
 
 		$posy += 1;
 		$pdf->SetFont('', '', $default_font_size - 2);
@@ -1567,7 +1598,7 @@ class pdf_cyan extends ModelePDFPropales
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
 
 		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE))
@@ -1597,19 +1628,24 @@ class pdf_cyan extends ModelePDFPropales
 		$posy += 4;
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
+		$pdf->MultiCell($w, 3, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
 
 		$posy += 4;
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEndPropal")." : ".dol_print_date($object->fin_validite, "day", false, $outputlangs, true), '', 'R');
+
+		$title = $outputlangs->transnoentities("DateEndPropal");
+		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+			$title .= ' - '.$outputlangsbis->transnoentities("DateEndPropal");
+		}
+		$pdf->MultiCell($w, 3, $title." : ".dol_print_date($object->fin_validite, "day", false, $outputlangs, true), '', 'R');
 
 		if ($object->thirdparty->code_client)
 		{
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("CustomerCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
 		}
 
 		// Get contact
@@ -1623,7 +1659,7 @@ class pdf_cyan extends ModelePDFPropales
 				$posy += 4;
 				$pdf->SetXY($posx, $posy);
 				$pdf->SetTextColor(0, 0, 60);
-				$pdf->MultiCell(100, 3, $langs->trans("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
+				$pdf->MultiCell($w, 3, $langs->transnoentities("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
 			}
 		}
 
@@ -1632,7 +1668,7 @@ class pdf_cyan extends ModelePDFPropales
 		$top_shift = 0;
 		// Show list of linked objects
 		$current_y = $pdf->getY();
-		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);
 		if ($current_y < $pdf->getY())
 		{
 			$top_shift = $pdf->getY() - $current_y;
@@ -1654,10 +1690,13 @@ class pdf_cyan extends ModelePDFPropales
 		 	$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
 
 			// Show sender
-			$posy = 42 + $top_shift;
+		 	$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+		 	$posy += $top_shift;
 		 	$posx = $this->marge_gauche;
 			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
-			$hautcadre = 40;
+
+			$hautcadre = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
+			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
 
 			// Show sender frame
 			$pdf->SetTextColor(0, 0, 0);
@@ -1666,19 +1705,19 @@ class pdf_cyan extends ModelePDFPropales
 			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
-			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+			$pdf->MultiCell($widthrecbox, $hautcadre, "", 0, 'R', 1);
 			$pdf->SetTextColor(0, 0, 60);
 
 			// Show sender name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+			$pdf->MultiCell($widthrecbox - 2, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
 			$posy = $pdf->getY();
 
 			// Show sender information
 			$pdf->SetXY($posx + 2, $posy);
 			$pdf->SetFont('', '', $default_font_size - 1);
-			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
+			$pdf->MultiCell($widthrecbox - 2, 4, $carac_emetteur, 0, 'L');
 
 
 			// If CUSTOMER contact defined, we use it
@@ -1690,9 +1729,8 @@ class pdf_cyan extends ModelePDFPropales
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -1703,9 +1741,10 @@ class pdf_cyan extends ModelePDFPropales
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, 'target', $object);
 
 			// Show recipient
-			$widthrecbox = 100;
+			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
 			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
-			$posy = 42 + $top_shift;
+			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+			$posy += $top_shift;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
 			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
 
@@ -1719,7 +1758,7 @@ class pdf_cyan extends ModelePDFPropales
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
+			$pdf->MultiCell($widthrecbox, 2, $carac_client_name, 0, 'L');
 
 			$posy = $pdf->getY();
 
@@ -1738,7 +1777,7 @@ class pdf_cyan extends ModelePDFPropales
 	 *   	Show footer of page. Need this->emetteur object
 	 *
 	 *   	@param	TCPDF		$pdf     			PDF
-	 * 		@param	Object		$object				Object to show
+	 * 		@param	Propal		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	int								Return height of bottom margin including footer text
@@ -1746,15 +1785,15 @@ class pdf_cyan extends ModelePDFPropales
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'PROPOSAL_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 
 	/**
 	 *	Show area for the customer to sign
 	 *
-	 *	@param	TCPDF		$pdf           Object PDF
-	 *	@param  Facture		$object         Object invoice
+	 *	@param	TCPDF		$pdf            Object PDF
+	 *	@param  Propal		$object         Object proposal
 	 *	@param	int			$posy			Position depart
 	 *	@param	Translate	$outputlangs	Objet langs
 	 *	@return int							Position pour suite
@@ -1789,7 +1828,7 @@ class pdf_cyan extends ModelePDFPropales
 	/**
 	 *   	Define Array Column Field
 	 *
-	 *   	@param	object			$object			common object
+	 *   	@param	Propal			$object			object proposal
 	 *   	@param	Translate		$outputlangs	langs
 	 *      @param	int				$hidedetails	Do not show line details
 	 *      @param	int				$hidedesc		Do not show desc
@@ -1840,7 +1879,7 @@ class pdf_cyan extends ModelePDFPropales
 				'align' => 'L',
 				// 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 				// 'label' => ' ', // the final label
-				'padding' => array(0.5, 1, 0.5, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+				'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 			),
 			'content' => array(
 				'align' => 'L',
@@ -1848,6 +1887,7 @@ class pdf_cyan extends ModelePDFPropales
 			),
 		);
 
+		// Image of product
 		$rank = $rank + 10;
 		$this->cols['photo'] = array(
 			'rank' => $rank,
@@ -1896,6 +1936,17 @@ class pdf_cyan extends ModelePDFPropales
 			'border-left' => true, // add left line separator
 		);
 
+		// Adapt dynamically the width of subprice, if text is too long.
+		$tmpwidth = 0;
+		$nblines = count($object->lines);
+		for ($i = 0; $i < $nblines; $i++) {
+			$tmpwidth2 = dol_strlen(dol_string_nohtmltag(pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails)));
+			$tmpwidth = max($tmpwidth, $tmpwidth2);
+		}
+		if ($tmpwidth > 10) {
+			$this->cols['subprice']['width'] += (2 * ($tmpwidth - 10));
+		}
+
 		$rank = $rank + 10;
 		$this->cols['qty'] = array(
 			'rank' => $rank,
@@ -1917,7 +1968,7 @@ class pdf_cyan extends ModelePDFPropales
 			),
 			'border-left' => true, // add left line separator
 		);
-		if ($conf->global->PRODUCT_USE_UNITS) {
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			$this->cols['unit']['status'] = true;
 		}
 
@@ -1939,13 +1990,24 @@ class pdf_cyan extends ModelePDFPropales
 		$this->cols['totalexcltax'] = array(
 			'rank' => $rank,
 			'width' => 26, // in mm
-			'status' => true,
+			'status' => empty($conf->global->PDF_PROPAL_HIDE_PRICE_EXCL_TAX) ? true : false,
 			'title' => array(
 				'textkey' => 'TotalHT'
 			),
 			'border-left' => true, // add left line separator
 		);
 
+		$rank = $rank + 1010; // add a big offset to be sure is the last col because default extrafield rank is 100
+		$this->cols['totalincltax'] = array(
+			'rank' => $rank,
+			'width' => 26, // in mm
+			'status' => empty($conf->global->PDF_PROPAL_SHOW_PRICE_INCL_TAX) ? false : true,
+			'title' => array(
+				'textkey' => 'TotalTTC'
+			),
+			'border-left' => true, // add left line separator
+		);
+
 		// Add extrafields cols
 		if (!empty($object->lines)) {
 			$line = reset($object->lines);
diff --git a/htdocs/core/modules/propale/mod_propale_saphir.php b/htdocs/core/modules/propale/mod_propale_saphir.php
index 9c8ca9ffa24..4a2bb721591 100644
--- a/htdocs/core/modules/propale/mod_propale_saphir.php
+++ b/htdocs/core/modules/propale/mod_propale_saphir.php
@@ -34,15 +34,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php';
 class mod_propale_saphir extends ModeleNumRefPropales
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 	/**
 	 * @var string Nom du modele
@@ -57,14 +57,14 @@ class mod_propale_saphir extends ModeleNumRefPropales
 	public $name = 'Saphir';
 
 
-    /**
-     *  Return description of module
-     *
-     *  @return     string      Texte descripif
-     */
+	/**
+	 *  Return description of module
+	 *
+	 *  @return     string      Texte descripif
+	 */
 	public function info()
-    {
-    	global $conf, $langs, $db;
+	{
+		global $conf, $langs, $db;
 
 		$langs->load("bills");
 
@@ -95,22 +95,22 @@ class mod_propale_saphir extends ModeleNumRefPropales
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Return an example of numbering
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-     	global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+	 	global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$old_code_type = $mysoc->typent_code;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-    	$mysoc->typent_code = 'TTTTTTTTTT';
-     	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$old_code_type = $mysoc->typent_code;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$mysoc->typent_code = 'TTTTTTTTTT';
+	 	$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 		$mysoc->typent_code = $old_code_type;
 
@@ -119,7 +119,7 @@ class mod_propale_saphir extends ModeleNumRefPropales
 			$numExample = 'NotConfigured';
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 *  Return next value
diff --git a/htdocs/core/modules/propale/modules_propale.php b/htdocs/core/modules/propale/modules_propale.php
index d10bc912eec..2127ff1f70c 100644
--- a/htdocs/core/modules/propale/modules_propale.php
+++ b/htdocs/core/modules/propale/modules_propale.php
@@ -42,17 +42,17 @@ abstract class ModelePDFPropales extends CommonDocGenerator
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of active generation modules
 	 *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
 	 */
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'propal';
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index 8905f6cf2b4..fb9bfbb8809 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -34,16 +34,16 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 class pdf_paiement
 {
 	/**
-     *  Constructor
-     *
-     *  @param      DoliDb		$db      Database handler
+	 *  Constructor
+	 *
+	 *  @param      DoliDb		$db      Database handler
 	 */
 	public function __construct($db)
 	{
 		global $langs, $conf;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("bills", "compta", "main"));
+		$langs->loadLangs(array("bills", "compta", "main"));
 
 		$this->db = $db;
 		$this->description = $langs->transnoentities("ListOfCustomerPayments");
@@ -84,7 +84,7 @@ class pdf_paiement
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Fonction generant la rapport sur le disque
 	 *
@@ -96,7 +96,7 @@ class pdf_paiement
 	 */
 	public function write_file($_dir, $month, $year, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 		global $conf, $hookmanager, $langs, $user;
@@ -126,14 +126,14 @@ class pdf_paiement
 		$year = sprintf("%04d", $year);
 
 		$file = $dir."/payments-".$year."-".$month.".pdf";
-        switch ($this->doc_type) {
-            case "client":
-                $file = $dir."/payments-".$year."-".$month.".pdf";
-                break;
-            case "fourn":
-                $file = $dir."/supplier_payments-".$year."-".$month.".pdf";
-                break;
-        }
+		switch ($this->doc_type) {
+			case "client":
+				$file = $dir."/payments-".$year."-".$month.".pdf";
+				break;
+			case "fourn":
+				$file = $dir."/supplier_payments-".$year."-".$month.".pdf";
+				break;
+		}
 
 
 		// Add pdfgeneration hook
@@ -147,29 +147,29 @@ class pdf_paiement
 		global $action;
 		$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-        $pdf = pdf_getInstance($this->format);
-        $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+		$pdf = pdf_getInstance($this->format);
+		$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
 
-        if (class_exists('TCPDF'))
-        {
-            $pdf->setPrintHeader(false);
-            $pdf->setPrintFooter(false);
-        }
-        $pdf->SetFont(pdf_getPDFFont($outputlangs));
+		if (class_exists('TCPDF'))
+		{
+			$pdf->setPrintHeader(false);
+			$pdf->setPrintFooter(false);
+		}
+		$pdf->SetFont(pdf_getPDFFont($outputlangs));
 
-        $num = 0;
-        $lines = array();
+		$num = 0;
+		$lines = array();
 
-        // count number of lines of payment
-        $sql = "SELECT p.rowid as prowid";
-        switch ($this->doc_type) {
-            case "client":
-                $sql .= " FROM ".MAIN_DB_PREFIX."paiement as p";
-                break;
-            case "fourn":
-                $sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p";
-                break;
-        }
+		// count number of lines of payment
+		$sql = "SELECT p.rowid as prowid";
+		switch ($this->doc_type) {
+			case "client":
+				$sql .= " FROM ".MAIN_DB_PREFIX."paiement as p";
+				break;
+			case "fourn":
+				$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p";
+				break;
+		}
 		$sql .= " WHERE p.datep BETWEEN '".$this->db->idate(dol_get_first_day($year, $month))."' AND '".$this->db->idate(dol_get_last_day($year, $month))."'";
 		$sql .= " AND p.entity = ".$conf->entity;
 		$result = $this->db->query($sql);
@@ -241,7 +241,7 @@ class pdf_paiement
 					$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 				}
 				if (!empty($socid)) $sql .= " AND s.rowid = ".$socid;
-                // If global param PAYMENTS_FOURN_REPORT_GROUP_BY_MOD is set, payement fourn are ordered by paiement_code
+				// If global param PAYMENTS_FOURN_REPORT_GROUP_BY_MOD is set, payement fourn are ordered by paiement_code
 				if (!empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD))
 					$sql .= " ORDER BY paiement_code ASC, p.datep ASC, pf.fk_paiementfourn ASC";
 				else $sql .= " ORDER BY p.datep ASC, pf.fk_paiementfourn ASC";
@@ -331,8 +331,8 @@ class pdf_paiement
 		$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook < 0)
 		{
-		    $this->error = $hookmanager->error;
-		    $this->errors = $hookmanager->errors;
+			$this->error = $hookmanager->error;
+			$this->errors = $hookmanager->errors;
 		}
 
 		if (!empty($conf->global->MAIN_UMASK))
@@ -343,7 +343,7 @@ class pdf_paiement
 		return 1;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show top header of page.
 	 *
@@ -355,7 +355,7 @@ class pdf_paiement
 	 */
 	protected function _pagehead(&$pdf, $page, $showaddress, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf;
 
 		// Do not add the BACKGROUND as this is a report
@@ -364,14 +364,14 @@ class pdf_paiement
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		$title = $conf->global->MAIN_INFO_SOCIETE_NOM;
-        switch ($this->doc_type) {
-            case "client":
-                $title .= ' - '.$outputlangs->transnoentities("ListOfCustomerPayments");
-                break;
-            case "fourn":
-                $title .= ' - '.$outputlangs->transnoentities("ListOfSupplierPayments");
-                break;
-        }
+		switch ($this->doc_type) {
+			case "client":
+				$title .= ' - '.$outputlangs->transnoentities("ListOfCustomerPayments");
+				break;
+			case "fourn":
+				$title .= ' - '.$outputlangs->transnoentities("ListOfSupplierPayments");
+				break;
+		}
 		$title .= ' - '.dol_print_date(dol_mktime(0, 0, 0, $this->month, 1, $this->year), "%B %Y", false, $outputlangs, true);
 		$pdf->SetFont('', 'B', $default_font_size + 1);
 		$pdf->SetXY($this->marge_gauche, 10);
@@ -379,36 +379,36 @@ class pdf_paiement
 
 		$pdf->SetFont('', '', $default_font_size);
 
-        $pdf->SetXY($this->posxdate, 16);
+		$pdf->SetXY($this->posxdate, 16);
 		$pdf->MultiCell(80, 2, $outputlangs->transnoentities("DateBuild")." : ".dol_print_date(time(), "day", false, $outputlangs, true), 0, 'L');
 
-        $pdf->SetXY($this->posxdate + 100, 16);
+		$pdf->SetXY($this->posxdate + 100, 16);
 		$pdf->MultiCell(80, 2, $outputlangs->transnoentities("Page")." : ".$page, 0, 'R');
 
 
 		// Title line
-        $pdf->SetXY($this->posxdate, $this->tab_top + 2);
+		$pdf->SetXY($this->posxdate, $this->tab_top + 2);
 		$pdf->MultiCell($this->posxpaymenttype - $this->posxdate, 2, 'Date');
 
 		$pdf->line($this->posxpaymenttype - 1, $this->tab_top, $this->posxpaymenttype - 1, $this->tab_top + $this->tab_height + 10);
-        $pdf->SetXY($this->posxpaymenttype, $this->tab_top + 2);
+		$pdf->SetXY($this->posxpaymenttype, $this->tab_top + 2);
 		$pdf->MultiCell($this->posxinvoice - $this->posxpaymenttype, 2, $outputlangs->transnoentities("PaymentMode"), 0, 'L');
 
 		$pdf->line($this->posxinvoice - 1, $this->tab_top, $this->posxinvoice - 1, $this->tab_top + $this->tab_height + 10);
-        $pdf->SetXY($this->posxinvoice, $this->tab_top + 2);
+		$pdf->SetXY($this->posxinvoice, $this->tab_top + 2);
 		$pdf->MultiCell($this->posxbankaccount - $this->posxinvoice, 2, $outputlangs->transnoentities("Invoice"), 0, 'L');
 
 		$pdf->line($this->posxbankaccount - 1, $this->tab_top, $this->posxbankaccount - 1, $this->tab_top + $this->tab_height + 10);
-        $pdf->SetXY($this->posxbankaccount, $this->tab_top + 2);
+		$pdf->SetXY($this->posxbankaccount, $this->tab_top + 2);
 		$pdf->MultiCell($this->posxinvoiceamount - $this->posxbankaccount, 2, $outputlangs->transnoentities("Account"), 0, 'L');
 
 
 		$pdf->line($this->posxinvoiceamount - 1, $this->tab_top, $this->posxinvoiceamount - 1, $this->tab_top + $this->tab_height + 10);
-        $pdf->SetXY($this->posxinvoiceamount, $this->tab_top + 2);
+		$pdf->SetXY($this->posxinvoiceamount, $this->tab_top + 2);
 		$pdf->MultiCell($this->posxpaymentamount - $this->posxinvoiceamount - 1, 2, $outputlangs->transnoentities("AmountInvoice"), 0, 'R');
 
 		$pdf->line($this->posxpaymentamount - 1, $this->tab_top, $this->posxpaymentamount - 1, $this->tab_top + $this->tab_height + 10);
-        $pdf->SetXY($this->posxpaymentamount, $this->tab_top + 2);
+		$pdf->SetXY($this->posxpaymentamount, $this->tab_top + 2);
 		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount - 1, 2, $outputlangs->transnoentities("AmountPayment"), 0, 'R');
 
 		$pdf->line($this->marge_gauche, $this->tab_top + 10, $this->page_largeur - $this->marge_droite, $this->tab_top + 10);
@@ -417,7 +417,7 @@ class pdf_paiement
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Output body
 	 *
@@ -429,7 +429,7 @@ class pdf_paiement
 	 */
 	public function Body(&$pdf, $page, $lines, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
@@ -460,17 +460,17 @@ class pdf_paiement
 			{
 				if ($yp > $this->tab_height - 15)
 				{
-                    $pdf->SetFillColor(255, 255, 255);
-                    $pdf->Rect($this->marge_gauche + 1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite - 3, $this->line_height, 'F', array(), array());
-                    $pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash'=>1));
-                    $pdf->line($this->marge_gauche, $this->tab_top + 15 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 15 + $yp);
-                    $pdf->SetFont('', 'B', $default_font_size - 1);
-                    $pdf->SetXY($this->posxdate - 1, $this->tab_top + 10 + $yp);
-                    $pdf->MultiCell($this->posxpaymentamount - 2 - $this->marge_droite, $this->line_height, $langs->transnoentities('SubTotal')." : ", 0, 'R', 1);
-                    $pdf->SetXY($this->posxpaymentamount - 1, $this->tab_top + 10 + $yp);
-                    $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount + 1, $this->line_height, price($total_page), 0, 'R', 1);
-                    $pdf->SetFont('', '', $default_font_size - 1);
-                    $pdf->SetFillColor(220, 220, 220);
+					$pdf->SetFillColor(255, 255, 255);
+					$pdf->Rect($this->marge_gauche + 1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite - 3, $this->line_height, 'F', array(), array());
+					$pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash'=>1));
+					$pdf->line($this->marge_gauche, $this->tab_top + 15 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 15 + $yp);
+					$pdf->SetFont('', 'B', $default_font_size - 1);
+					$pdf->SetXY($this->posxdate - 1, $this->tab_top + 10 + $yp);
+					$pdf->MultiCell($this->posxpaymentamount - 2 - $this->marge_droite, $this->line_height, $langs->transnoentities('SubTotal')." : ", 0, 'R', 1);
+					$pdf->SetXY($this->posxpaymentamount - 1, $this->tab_top + 10 + $yp);
+					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount + 1, $this->line_height, price($total_page), 0, 'R', 1);
+					$pdf->SetFont('', '', $default_font_size - 1);
+					$pdf->SetFillColor(220, 220, 220);
 					$page++;
 					$pdf->AddPage();
 					$this->_pagehead($pdf, $page, 0, $outputlangs);
@@ -518,43 +518,43 @@ class pdf_paiement
 				$oldprowid = $lines[$j][7];
 			}
 
-            // Add line to add total by payment mode if mode reglement for nex line change
-            if ((($this->doc_type == 'client' && !empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD)) || ($this->doc_type == 'fourn' && !empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD))) && ($mod != $lines[$j + 1][2]))
-            {
-                $pdf->SetFillColor(245, 245, 245);
-                $pdf->Rect($this->marge_gauche + 1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite - 3, $this->line_height, 'F', array(), array());
-                $pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash'=>1));
-                $pdf->line($this->marge_gauche, $this->tab_top + 15 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 15 + $yp);
-                $pdf->SetXY($this->posxdate - 1, $this->tab_top + 10 + $yp);
+			// Add line to add total by payment mode if mode reglement for nex line change
+			if ((($this->doc_type == 'client' && !empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD)) || ($this->doc_type == 'fourn' && !empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD))) && ($mod != $lines[$j + 1][2]))
+			{
+				$pdf->SetFillColor(245, 245, 245);
+				$pdf->Rect($this->marge_gauche + 1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite - 3, $this->line_height, 'F', array(), array());
+				$pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash'=>1));
+				$pdf->line($this->marge_gauche, $this->tab_top + 15 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 15 + $yp);
+				$pdf->SetXY($this->posxdate - 1, $this->tab_top + 10 + $yp);
 				$pdf->SetFont('', 'I', $default_font_size - 1);
-                $pdf->MultiCell($this->posxpaymentamount - 2 - $this->marge_droite, $this->line_height, $langs->transnoentities('Total').' '.$mod." : ", 0, 'R', 1);
-                $pdf->SetXY($this->posxpaymentamount - 1, $this->tab_top + 10 + $yp);
-                $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount + 1, $this->line_height, price($total_mod), 0, 'R', 1);
+				$pdf->MultiCell($this->posxpaymentamount - 2 - $this->marge_droite, $this->line_height, $langs->transnoentities('Total').' '.$mod." : ", 0, 'R', 1);
+				$pdf->SetXY($this->posxpaymentamount - 1, $this->tab_top + 10 + $yp);
+				$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount + 1, $this->line_height, price($total_mod), 0, 'R', 1);
 				$pdf->SetFont('', '', $default_font_size - 1);
-                $mod = $lines[$j + 1][2];
-                $total_mod = 0;
+				$mod = $lines[$j + 1][2];
+				$total_mod = 0;
 				$yp = $yp + 5;
-                if ($yp > $this->tab_height - 5)
-                {
-                    $page++;
-                    $pdf->AddPage();
-                    $this->_pagehead($pdf, $page, 0, $outputlangs);
-                    $pdf->SetFont('', '', $default_font_size - 1);
-                    $yp = 0;
-                }
-                $pdf->SetFillColor(220, 220, 220);
-            }
+				if ($yp > $this->tab_height - 5)
+				{
+					$page++;
+					$pdf->AddPage();
+					$this->_pagehead($pdf, $page, 0, $outputlangs);
+					$pdf->SetFont('', '', $default_font_size - 1);
+					$yp = 0;
+				}
+				$pdf->SetFillColor(220, 220, 220);
+			}
 		}
 		$total += $total_page;
-        $pdf->SetFillColor(255, 255, 255);
-        $pdf->Rect($this->marge_gauche + 1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite - 3, $this->line_height, 'F', array(), array());
-        $pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash'=>1));
-        $pdf->line($this->marge_gauche, $this->tab_top + 15 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 15 + $yp);
-        $pdf->SetXY($this->posxdate - 1, $this->tab_top + 10 + $yp);
-        $pdf->SetFont('', 'B');
-        $pdf->MultiCell($this->posxpaymentamount - 2 - $this->marge_droite, $this->line_height, $langs->transnoentities('Total')." : ", 0, 'R', 1);
-        $pdf->SetXY($this->posxpaymentamount - 1, $this->tab_top + 10 + $yp);
-        $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount + 1, $this->line_height, price($total), 0, 'R', 1);
-        $pdf->SetFillColor(220, 220, 220);
+		$pdf->SetFillColor(255, 255, 255);
+		$pdf->Rect($this->marge_gauche + 1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite - 3, $this->line_height, 'F', array(), array());
+		$pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash'=>1));
+		$pdf->line($this->marge_gauche, $this->tab_top + 15 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 15 + $yp);
+		$pdf->SetXY($this->posxdate - 1, $this->tab_top + 10 + $yp);
+		$pdf->SetFont('', 'B');
+		$pdf->MultiCell($this->posxpaymentamount - 2 - $this->marge_droite, $this->line_height, $langs->transnoentities('Total')." : ", 0, 'R', 1);
+		$pdf->SetXY($this->posxpaymentamount - 1, $this->tab_top + 10 + $yp);
+		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount + 1, $this->line_height, price($total), 0, 'R', 1);
+		$pdf->SetFillColor(220, 220, 220);
 	}
 }
diff --git a/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php b/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
index 3b723190af4..f5af4dd8776 100644
--- a/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
@@ -31,9 +31,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/rapport/pdf_paiement.class.php';
 class pdf_paiement_fourn extends pdf_paiement
 {
 	/**
-     *  Constructor
-     *
-     *  @param      DoliDb		$db      Database handler
+	 *  Constructor
+	 *
+	 *  @param      DoliDb		$db      Database handler
 	 */
 	public function __construct($db)
 	{
diff --git a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
index 9676bb2ff70..1105a5f6d4c 100644
--- a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
+++ b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
@@ -36,20 +36,20 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
  */
 class doc_generic_reception_odt extends ModelePdfReception
 {
-    /**
-     * @var Societe Issuer object that emits
-     */
-    public $emetteur; // Objet societe qui emet
+	/**
+	 * @var Societe Issuer object that emits
+	 */
+	public $emetteur; // Objet societe qui emet
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
-    /**
-     * @var string Dolibarr version of the loaded document
-     */
+	/**
+	 * @var string Dolibarr version of the loaded document
+	 */
 	public $version = 'dolibarr';
 
 
@@ -58,8 +58,8 @@ class doc_generic_reception_odt extends ModelePdfReception
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
-    {
+	public function __construct($db)
+	{
 		global $conf, $langs, $mysoc;
 
 		$langs->load("main");
@@ -94,18 +94,18 @@ class doc_generic_reception_odt extends ModelePdfReception
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
 		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
-    }
+	}
 
 
-    /**
-     *  Return description of a module
-     *
-     *  @param	Translate	$langs      Lang object to use for output
-     *  @return string       			Description
-     */
-    public function info($langs)
-    {
-        global $conf, $langs;
+	/**
+	 *  Return description of a module
+	 *
+	 *  @param	Translate	$langs      Lang object to use for output
+	 *  @return string       			Description
+	 */
+	public function info($langs)
+	{
+		global $conf, $langs;
 
 		$langs->load("companies");
 		$langs->load("errors");
@@ -166,7 +166,7 @@ class doc_generic_reception_odt extends ModelePdfReception
    			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
    			foreach ($listoffiles as $file)
    			{
-                $texte .= $file['name'].'<br>';
+				$texte .= $file['name'].'<br>';
    			}
    			$texte .= '</div>';
 		}
@@ -182,7 +182,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
@@ -196,8 +196,8 @@ class doc_generic_reception_odt extends ModelePdfReception
 	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-    public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
-    {
+	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
@@ -240,6 +240,8 @@ class doc_generic_reception_odt extends ModelePdfReception
 				}
 			}
 
+			$object->fetch_thirdparty();
+
 			$dir = $conf->reception->dir_output."/reception";
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
@@ -267,8 +269,8 @@ class doc_generic_reception_odt extends ModelePdfReception
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -292,11 +294,14 @@ class doc_generic_reception_odt extends ModelePdfReception
 				}
 
 				// Recipient name
-				if (!empty($usecontact))
-				{
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else $socobject = $object->thirdparty;
+				if (!empty($usecontact)) {
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+						$socobject = $object->contact;
+					} else {
+						$socobject = $object->thirdparty;
+						// if we have a BILLING contact and we dont use it as recipient we store the contact object for later use
+						$contactobject = $object->contact;
+					}
 				} else {
 					$socobject = $object->thirdparty;
 				}
@@ -325,7 +330,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->reception->dir_temp,
@@ -351,7 +356,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
 				} catch (OdfException $e) {
 					dol_syslog($e->getMessage(), LOG_INFO);
-                }
+				}
 
 				// Make substitutions into odt of user info
 				$tmparray = $this->get_substitutionarray_user($user, $outputlangs);
@@ -369,7 +374,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Make substitutions into odt of mysoc
@@ -388,7 +393,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Make substitutions into odt of thirdparty
@@ -405,7 +410,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of object + external modules
@@ -426,7 +431,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
@@ -444,9 +449,9 @@ class doc_generic_reception_odt extends ModelePdfReception
 							try {
 								$listlines->setVars($key, $val, true, 'UTF-8');
 							} catch (OdfException $e) {
-                                dol_syslog($e->getMessage(), LOG_INFO);
+								dol_syslog($e->getMessage(), LOG_INFO);
 							} catch (SegmentException $e) {
-                                dol_syslog($e->getMessage(), LOG_INFO);
+								dol_syslog($e->getMessage(), LOG_INFO);
 							}
 						}
 						$listlines->merge();
@@ -466,7 +471,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e) {
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -484,7 +489,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 					}
 				} else {
 					try {
-					    $odfHandler->saveToDisk($file);
+						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
 						return -1;
diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index a95d7594458..8043f9f9ba6 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -254,7 +254,7 @@ class pdf_squille extends ModelePdfReception
 
 				// Incoterm
 				$height_incoterms = 0;
-				if ($conf->incoterm->enabled)
+				if (!empty($conf->incoterm->enabled))
 				{
 					$desc_incoterms = $object->getIncotermsForPDF();
 					if ($desc_incoterms)
@@ -944,9 +944,8 @@ class pdf_squille extends ModelePdfReception
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -1012,7 +1011,7 @@ class pdf_squille extends ModelePdfReception
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'RECEPTION_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 }
diff --git a/htdocs/core/modules/reception/mod_reception_beryl.php b/htdocs/core/modules/reception/mod_reception_beryl.php
index 2b596cc070f..7dfd46c32c7 100644
--- a/htdocs/core/modules/reception/mod_reception_beryl.php
+++ b/htdocs/core/modules/reception/mod_reception_beryl.php
@@ -28,10 +28,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/reception/modules_reception.php';
  */
 class mod_reception_beryl extends ModelNumRefReception
 {
-    public $version = 'dolibarr';
-    public $prefix = 'RCP';
-    public $error = '';
-    public $nom = 'Beryl';
+	public $version = 'dolibarr';
+	public $prefix = 'RCP';
+	public $error = '';
+	public $nom = 'Beryl';
 
 
 	/**
@@ -39,11 +39,11 @@ class mod_reception_beryl extends ModelNumRefReception
 	 *
 	 *	@return     string      text description
 	 */
-    public function info()
-    {
-    	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
-    }
+	public function info()
+	{
+		global $langs;
+	  	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+	}
 
 
 	/**
diff --git a/htdocs/core/modules/reception/mod_reception_moonstone.php b/htdocs/core/modules/reception/mod_reception_moonstone.php
index febdc3bde5f..13f8e224754 100644
--- a/htdocs/core/modules/reception/mod_reception_moonstone.php
+++ b/htdocs/core/modules/reception/mod_reception_moonstone.php
@@ -30,18 +30,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/reception/modules_reception.php';
  */
 class mod_reception_moonstone extends ModelNumRefReception
 {
-    public $version = 'dolibarr';
-    public $error = '';
-    public $nom = 'Moonstone';
+	public $version = 'dolibarr';
+	public $error = '';
+	public $nom = 'Moonstone';
 
-    /**
-     *  Return default description of numbering model
-     *
-     *  @return     string      text description
-     */
-    public function info()
-    {
-    	global $conf, $langs, $db;
+	/**
+	 *  Return default description of numbering model
+	 *
+	 *  @return     string      text description
+	 */
+	public function info()
+	{
+		global $conf, $langs, $db;
 
 		$langs->load("bills");
 
@@ -68,22 +68,22 @@ class mod_reception_moonstone extends ModelNumRefReception
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
 	/**
 	 *	Return numbering example
 	 *
 	 *	@return     string      Example
 	 */
-    public function getExample()
-    {
-     	global $conf, $langs, $mysoc;
+	public function getExample()
+	{
+	 	global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$old_code_type = $mysoc->typent_code;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-    	$mysoc->typent_code = 'TTTTTTTTTT';
-     	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$old_code_type = $mysoc->typent_code;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$mysoc->typent_code = 'TTTTTTTTTT';
+	 	$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 		$mysoc->typent_code = $old_code_type;
 
@@ -92,7 +92,7 @@ class mod_reception_moonstone extends ModelNumRefReception
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 *	Return next value
@@ -101,8 +101,8 @@ class mod_reception_moonstone extends ModelNumRefReception
 	 *	@param	Object		$reception	Reception object
 	 *	@return string      			Value if OK, 0 if KO
 	 */
-    public function getNextValue($objsoc, $reception)
-    {
+	public function getNextValue($objsoc, $reception)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -120,7 +120,7 @@ class mod_reception_moonstone extends ModelNumRefReception
 		$numFinal = get_next_value($db, $mask, 'reception', 'ref', '', $objsoc, $date);
 
 		return  $numFinal;
-    }
+	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
diff --git a/htdocs/core/modules/reception/modules_reception.php b/htdocs/core/modules/reception/modules_reception.php
index 6aa42a06743..28b0bce6500 100644
--- a/htdocs/core/modules/reception/modules_reception.php
+++ b/htdocs/core/modules/reception/modules_reception.php
@@ -29,16 +29,16 @@
  */
 abstract class ModelePdfReception extends CommonDocGenerator
 {
-    public $error = '';
+	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *  Return list of active generation modules
 	 *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
 	 */
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
@@ -61,7 +61,7 @@ abstract class ModelePdfReception extends CommonDocGenerator
  */
 abstract class ModelNumRefReception
 {
-    public $error = '';
+	public $error = '';
 
 	/** Return if a model can be used or not
 	 *
diff --git a/htdocs/core/modules/security/generate/modGeneratePassNone.class.php b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
index 8f485e6a608..e353903b6e7 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
@@ -39,9 +39,9 @@ class modGeneratePassNone extends ModeleGenPassword
 	public $length;
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	public $conf;
 	public $lang;
@@ -70,7 +70,7 @@ class modGeneratePassNone extends ModeleGenPassword
 	/**
 	 *		Return description of module
 	 *
- 	 *      @return     string      Description of text
+	 *      @return     string      Description of text
 	 */
 	public function getDescription()
 	{
@@ -81,7 +81,7 @@ class modGeneratePassNone extends ModeleGenPassword
 	/**
 	 * 		Return an example of password generated by this module
 	 *
- 	 *      @return     string      Example of password
+	 *      @return     string      Example of password
 	 */
 	public function getExample()
 	{
@@ -91,7 +91,7 @@ class modGeneratePassNone extends ModeleGenPassword
 	/**
 	 * 		Build new password
 	 *
- 	 *      @return     string      Return a new generated password
+	 *      @return     string      Return a new generated password
 	 */
 	public function getNewGeneratedPassword()
 	{
@@ -102,7 +102,7 @@ class modGeneratePassNone extends ModeleGenPassword
 	 * 		Validate a password
 	 *
 	 *		@param		string	$password	Password to check
- 	 *      @return     int					0 if KO, >0 if OK
+	 *      @return     int					0 if KO, >0 if OK
 	 */
 	public function validatePassword($password)
 	{
diff --git a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
index 79d6865037a..7a1da5ae130 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
@@ -47,9 +47,9 @@ class modGeneratePassPerso extends ModeleGenPassword
 	public $WithoutAmbi;
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	public $conf;
 	public $lang;
@@ -145,22 +145,22 @@ class modGeneratePassPerso extends ModeleGenPassword
 	{
 		$pass = "";
 		for ($i = 0; $i < $this->NbMaj; $i++) {
-            // Y
+			// Y
 			$pass .= $this->Maj[mt_rand(0, strlen($this->Maj) - 1)];
 		}
 
 		for ($i = 0; $i < $this->NbNum; $i++) {
-            // X
+			// X
 			$pass .= $this->Nb[mt_rand(0, strlen($this->Nb) - 1)];
 		}
 
 		for ($i = 0; $i < $this->NbSpe; $i++) {
-            // @
+			// @
 			$pass .= $this->Spe[mt_rand(0, strlen($this->Spe) - 1)];
 		}
 
 		for ($i = strlen($pass); $i < $this->length2; $i++) {
-            // y
+			// y
 			$pass .= $this->All[mt_rand(0, strlen($this->All) - 1)];
 		}
 
@@ -211,8 +211,8 @@ class modGeneratePassPerso extends ModeleGenPassword
 	 *  @param		string	$password	Password to check
 	 *  @return     bool
 	 */
-    private function consecutiveInterationSameCharacter($password)
-    {
+	private function consecutiveInterationSameCharacter($password)
+	{
 		$last = "";
 
 		if (empty($this->NbRepeat)) return 1;
@@ -228,7 +228,7 @@ class modGeneratePassPerso extends ModeleGenPassword
 				continue;
 			}
 
-            $count++;
+			$count++;
 			if ($count > $this->NbRepeat) {
 				return false;
 			}
diff --git a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
index 0c5f2c1807c..cf49f0f063d 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
@@ -39,9 +39,9 @@ class modGeneratePassStandard extends ModeleGenPassword
 	public $length;
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	public $conf;
 	public $lang;
@@ -70,7 +70,7 @@ class modGeneratePassStandard extends ModeleGenPassword
 	/**
 	 *		Return description of module
 	 *
- 	 *      @return     string      Description of module
+	 *      @return     string      Description of module
 	 */
 	public function getDescription()
 	{
@@ -81,7 +81,7 @@ class modGeneratePassStandard extends ModeleGenPassword
 	/**
 	 * 		Return an example of password generated by this module
 	 *
- 	 *      @return     string      Example of password
+	 *      @return     string      Example of password
 	 */
 	public function getExample()
 	{
@@ -91,7 +91,7 @@ class modGeneratePassStandard extends ModeleGenPassword
 	/**
 	 * 		Build new password
 	 *
- 	 *      @return     string      Return a new generated password
+	 *      @return     string      Return a new generated password
 	 */
 	public function getNewGeneratedPassword()
 	{
@@ -122,15 +122,15 @@ class modGeneratePassStandard extends ModeleGenPassword
 		return $password;
 	}
 
-    /**
-     *  Validate a password
-     *
-     *  @param      string  $password   Password to check
-     *  @return     int                 0 if KO, >0 if OK
-     */
-    public function validatePassword($password)
-    {
-        if (dol_strlen($password) < $this->length) return 0;
-        return 1;
-    }
+	/**
+	 *  Validate a password
+	 *
+	 *  @param      string  $password   Password to check
+	 *  @return     int                 0 if KO, >0 if OK
+	 */
+	public function validatePassword($password)
+	{
+		if (dol_strlen($password) < $this->length) return 0;
+		return 1;
+	}
 }
diff --git a/htdocs/core/modules/security/generate/modules_genpassword.php b/htdocs/core/modules/security/generate/modules_genpassword.php
index 1df8949f242..37bb37ad092 100644
--- a/htdocs/core/modules/security/generate/modules_genpassword.php
+++ b/htdocs/core/modules/security/generate/modules_genpassword.php
@@ -30,63 +30,63 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
  */
 abstract class ModeleGenPassword
 {
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
-    /**
-     * 		Return if a module can be used or not
-     *
-     *      @return		boolean     true if module can be used
-     */
-    public function isEnabled()
-    {
-        return true;
-    }
+	/**
+	 * 		Return if a module can be used or not
+	 *
+	 *      @return		boolean     true if module can be used
+	 */
+	public function isEnabled()
+	{
+		return true;
+	}
 
-    /**
-     *		Return description of module
-     *
-     *      @return     string      Description of text
-     */
-    public function getDescription()
-    {
-        global $langs;
-        return $langs->trans("NoDescription");
-    }
+	/**
+	 *		Return description of module
+	 *
+	 *      @return     string      Description of text
+	 */
+	public function getDescription()
+	{
+		global $langs;
+		return $langs->trans("NoDescription");
+	}
 
-    /**
-     *  Return an example of password generated by this module
-     *
-     *  @return     string      Example of password
-     */
-    public function getExample()
-    {
-        global $langs;
-        $langs->load("bills");
-        return $langs->trans("NoExample");
-    }
+	/**
+	 *  Return an example of password generated by this module
+	 *
+	 *  @return     string      Example of password
+	 */
+	public function getExample()
+	{
+		global $langs;
+		$langs->load("bills");
+		return $langs->trans("NoExample");
+	}
 
 	/**
 	 *  Build new password
 	 *
- 	 *  @return     string      Return a new generated password
+	 *  @return     string      Return a new generated password
 	 */
-    public function getNewGeneratedPassword()
-    {
-        global $langs;
-        return $langs->trans("NotAvailable");
-    }
+	public function getNewGeneratedPassword()
+	{
+		global $langs;
+		return $langs->trans("NotAvailable");
+	}
 
 	/**
 	 * 		Validate a password
 	 *
 	 *		@param		string	$password	Password to check
- 	 *      @return     int					0 if KO, >0 if OK
+	 *      @return     int					0 if KO, >0 if OK
 	 */
-    public function validatePassword($password)
-    {
-        return 1;
-    }
+	public function validatePassword($password)
+	{
+		return 1;
+	}
 }
diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
index 9cc3adf708e..66064cc4946 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -43,9 +43,9 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 
@@ -59,7 +59,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
@@ -128,16 +128,16 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 		$texthelp .= $langs->transnoentitiesnoconv("FullListOnOnlineDocumentation"); // This contains an url, we don't modify it
 
 		$texte .= $form->textwithpicto($texttitle, $texthelp, 1, 'help', '', 1);
-        $texte .= '<table><tr><td>';
+		$texte .= '<table><tr><td>';
 		$texte .= '<textarea class="flat" cols="60" name="value1">';
 		$texte .= $conf->global->COMPANY_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
-        $texte .= '</td>';
-        $texte .= '<td class="center">&nbsp; ';
-        $texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
-        $texte .= '</td>';
-        $texte .= '</tr>';
-        $texte .= '</table>';
+		$texte .= '</td>';
+		$texte .= '<td class="center">&nbsp; ';
+		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '</td>';
+		$texte .= '</tr>';
+		$texte .= '</table>';
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
@@ -155,15 +155,15 @@ class doc_generic_odt extends ModeleThirdPartyDoc
    			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
    			foreach ($listoffiles as $file)
    			{
-                $texte .= $file['name'].'<br>';
+				$texte .= $file['name'].'<br>';
    			}
    			$texte .= '</div>';
 		}
-        // Add input to upload a new template file.
-        $texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
-        $texte .= '<input type="hidden" value="COMPANY_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-        $texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
-        $texte .= '</div>';
+		// Add input to upload a new template file.
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte .= '<input type="hidden" value="COMPANY_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
+		$texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '</div>';
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
@@ -177,22 +177,22 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to build a document on disk using the generic odt module.
 	 *
 	 *	@param		Societe		$object				Object source to build document
 	 *	@param		Translate	$outputlangs		Lang output object
 	 * 	@param		string		$srctemplatepath	Full path of source filename for generator using a template file
-     *  @param		int			$hidedetails		Do not show line details
-     *  @param		int			$hidedesc			Do not show desc
-     *  @param		int			$hideref			Do not show ref
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
-        global $user, $langs, $conf, $mysoc, $hookmanager;
+		// phpcs:enable
+		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
 		{
@@ -200,13 +200,13 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 			return -1;
 		}
 
-        // Add odtgeneration hook
-        if (!is_object($hookmanager)) {
-            include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-            $hookmanager = new HookManager($this->db);
-        }
-        $hookmanager->initHooks(array('odtgeneration'));
-        global $action;
+		// Add odtgeneration hook
+		if (!is_object($hookmanager)) {
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+			$hookmanager = new HookManager($this->db);
+		}
+		$hookmanager->initHooks(array('odtgeneration'));
+		global $action;
 
 		if (!is_object($outputlangs)) $outputlangs = $langs;
 		$sav_charset_output = $outputlangs->charset_output;
@@ -241,12 +241,12 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_OBJECT_THIRDPARTY_NAME))
 				{
-				    $newfiletmp = dol_sanitizeFileName(dol_string_nospecial($object->name)).'-'.$newfiletmp;
+					$newfiletmp = dol_sanitizeFileName(dol_string_nospecial($object->name)).'-'.$newfiletmp;
 				}
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -265,13 +265,13 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
-					    $srctemplatepath,
-					    array(
-	    					'PATH_TO_TMP'	  => $conf->societe->multidir_temp[$object->entity],
-	    					'ZIP_PROXY'		  => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
-	    					'DELIMITER_LEFT'  => '{',
-	    					'DELIMITER_RIGHT' => '}'
+					$odfHandler = new odf(
+						$srctemplatepath,
+						array(
+							'PATH_TO_TMP'	  => $conf->societe->multidir_temp[$object->entity],
+							'ZIP_PROXY'		  => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
+							'DELIMITER_LEFT'  => '{',
+							'DELIMITER_RIGHT' => '}'
 						)
 					);
 				} catch (Exception $e)
@@ -282,77 +282,77 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 				}
 				//print $odfHandler->__toString()."\n";
 
-                // Replace tags of lines for contacts
-                $contact_arrray = array();
+				// Replace tags of lines for contacts
+				$contact_arrray = array();
 
-                $sql = "SELECT p.rowid";
-                $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
-                $sql .= " WHERE p.fk_soc = ".$object->id;
+				$sql = "SELECT p.rowid";
+				$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
+				$sql .= " WHERE p.fk_soc = ".$object->id;
 
-                $result = $this->db->query($sql);
-                $num = $this->db->num_rows($result);
+				$result = $this->db->query($sql);
+				$num = $this->db->num_rows($result);
 
-                if ($num)
-                {
-                    require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+				if ($num)
+				{
+					require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 
-                	$i = 0;
-                	$contactstatic = new Contact($this->db);
+					$i = 0;
+					$contactstatic = new Contact($this->db);
 
-                	while ($i < $num)
-                	{
-                		$obj = $this->db->fetch_object($result);
+					while ($i < $num)
+					{
+						$obj = $this->db->fetch_object($result);
 
-                		$contact_arrray[$i] = $obj->rowid;
-                		$i++;
-                	}
-                }
-                if ((is_array($contact_arrray) && count($contact_arrray) > 0))
-                {
-                	try {
-                		$listlines = $odfHandler->setSegment('companycontacts');
+						$contact_arrray[$i] = $obj->rowid;
+						$i++;
+					}
+				}
+				if ((is_array($contact_arrray) && count($contact_arrray) > 0))
+				{
+					try {
+						$listlines = $odfHandler->setSegment('companycontacts');
 
-                		foreach ($contact_arrray as $array_key => $contact_id)
-                		{
-                			$res_contact = $contactstatic->fetch($contact_id);
-                			$tmparray = $this->get_substitutionarray_contact($contactstatic, $outputlangs, 'contact');
-                			foreach ($tmparray as $key => $val)
-                			{
-                				try {
-                					$listlines->setVars($key, $val, true, 'UTF-8');
-                				} catch (OdfException $e)
-                				{
+						foreach ($contact_arrray as $array_key => $contact_id)
+						{
+							$res_contact = $contactstatic->fetch($contact_id);
+							$tmparray = $this->get_substitutionarray_contact($contactstatic, $outputlangs, 'contact');
+							foreach ($tmparray as $key => $val)
+							{
+								try {
+									$listlines->setVars($key, $val, true, 'UTF-8');
+								} catch (OdfException $e)
+								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-                				} catch (SegmentException $e)
-                				{
+								} catch (SegmentException $e)
+								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-                				}
-                			}
-                			$listlines->merge();
-                		}
-                		$odfHandler->mergeSegment($listlines);
-                	} catch (OdfException $e)
-                	{
-                		$this->error = $e->getMessage();
-                		dol_syslog($this->error, LOG_WARNING);
-                		//return -1;
-                	}
-                }
+								}
+							}
+							$listlines->merge();
+						}
+						$odfHandler->mergeSegment($listlines);
+					} catch (OdfException $e)
+					{
+						$this->error = $e->getMessage();
+						dol_syslog($this->error, LOG_WARNING);
+						//return -1;
+					}
+				}
 
-                // Make substitutions into odt
-                $array_user = $this->get_substitutionarray_user($user, $outputlangs);
-                $array_soc = $this->get_substitutionarray_mysoc($mysoc, $outputlangs);
-                $array_thirdparty = $this->get_substitutionarray_thirdparty($object, $outputlangs);
-                $array_other = $this->get_substitutionarray_other($outputlangs);
+				// Make substitutions into odt
+				$array_user = $this->get_substitutionarray_user($user, $outputlangs);
+				$array_soc = $this->get_substitutionarray_mysoc($mysoc, $outputlangs);
+				$array_thirdparty = $this->get_substitutionarray_thirdparty($object, $outputlangs);
+				$array_other = $this->get_substitutionarray_other($outputlangs);
 
-                $tmparray = array_merge($array_user, $array_soc, $array_thirdparty, $array_other);
-                complete_substitutions_array($tmparray, $outputlangs, $object);
+				$tmparray = array_merge($array_user, $array_soc, $array_thirdparty, $array_other);
+				complete_substitutions_array($tmparray, $outputlangs, $object);
 
-                // Call the ODTSubstitution hook
-                $parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				// Call the ODTSubstitution hook
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-                // Replace variables into document
+				// Replace variables into document
 				foreach ($tmparray as $key=>$value)
 				{
 					try {
@@ -367,7 +367,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 					} catch (OdfException $e)
 					{
 						// setVars failed, probably because key not found
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -379,7 +379,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -393,24 +393,24 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				} else {
-				    try {
-                        $odfHandler->creator = $user->getFullName($outputlangs);
-                        $odfHandler->title = $object->builddoc_filename;
-                        $odfHandler->subject = $object->builddoc_filename;
+					try {
+						$odfHandler->creator = $user->getFullName($outputlangs);
+						$odfHandler->title = $object->builddoc_filename;
+						$odfHandler->subject = $object->builddoc_filename;
 
-                        if (!empty($conf->global->ODT_ADD_DOLIBARR_ID)) {
-                            $odfHandler->userdefined['dol_id'] = $object->id;
-                            $odfHandler->userdefined['dol_element'] = $object->element;
-                        }
+						if (!empty($conf->global->ODT_ADD_DOLIBARR_ID)) {
+							$odfHandler->userdefined['dol_id'] = $object->id;
+							$odfHandler->userdefined['dol_element'] = $object->element;
+						}
 
-                        $odfHandler->saveToDisk($file);
+						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
index 948be99b61a..a7d9c99f401 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2007-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011      Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2013-2018 Philippe Grand      	<philippe.grand@atoo-net.com>
+ * Copyright (C) 2020		Frédéric 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
@@ -39,18 +40,30 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 	 */
 	public $name = 'Elephant';
 
-	public $code_modifiable; // Code modifiable
-
-	public $code_modifiable_invalide; // Code modifiable si il est invalide
-
-	public $code_modifiable_null; // Code modifiables si il est null
-
-	public $code_null; // Code facultatif
+	/**
+	 * @var int Code modifiable
+	 */
+	public $code_modifiable;
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * @var int Code modifiable si il est invalide
+	 */
+	public $code_modifiable_invalide;
+
+	/**
+	 * @var int Code modifiables si il est null
+	 */
+	public $code_modifiable_null;
+
+	/**
+	 * @var int Code facultatif
+	 */
+	public $code_null;
+
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -58,11 +71,20 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 	 */
 	public $code_auto;
 
-	public $searchcode; // String de recherche
+	/**
+	 * @var string search string
+	 */
+	public $searchcode;
 
-	public $numbitcounter; // Nombre de chiffres du compteur
+	/**
+	 * @var int Nombre de chiffres du compteur
+	 */
+	public $numbitcounter;
 
-	public $prefixIsRequired; // Le champ prefix du tiers doit etre renseigne quand on utilise {pre}
+	/**
+	 * @var int thirdparty prefix is required when using {pre}
+	 */
+	public $prefixIsRequired;
 
 
 	/**
@@ -80,7 +102,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 
 
 	/**
-     *  Return description of module
+	 *  Return description of module
 	 *
 	 *  @param	Translate	$langs		Object langs
 	 *  @return string      			Description of module
@@ -138,56 +160,41 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 	 */
 	public function getExample($langs, $objsoc = 0, $type = -1)
 	{
-		if ($type == 0 || $type == -1)
-		{
+		$examplecust = '';
+		$examplesup = '';
+		$errmsg = array(
+			"ErrorBadMask",
+			"ErrorCantUseRazIfNoYearInMask",
+			"ErrorCantUseRazInStartedYearIfNoYearMonthInMask",
+		);
+		if ($type != 1) {
 			$examplecust = $this->getNextValue($objsoc, 0);
-			if (!$examplecust)
-			{
+			if (!$examplecust) {
 				$examplecust = $langs->trans('NotConfigured');
 			}
-			if ($examplecust == "ErrorBadMask")
-			{
-				$langs->load("errors");
-				$examplecust = $langs->trans($examplecust);
-			}
-			if ($examplecust == "ErrorCantUseRazIfNoYearInMask")
-			{
-				$langs->load("errors");
-				$examplecust = $langs->trans($examplecust);
-			}
-			if ($examplecust == "ErrorCantUseRazInStartedYearIfNoYearMonthInMask")
-			{
+			if (in_array($examplecust, $errmsg)) {
 				$langs->load("errors");
 				$examplecust = $langs->trans($examplecust);
 			}
 		}
-		if ($type == 1 || $type == -1)
-		{
+		if ($type != 0) {
 			$examplesup = $this->getNextValue($objsoc, 1);
-			if (!$examplesup)
-			{
+			if (!$examplesup) {
 				$examplesup = $langs->trans('NotConfigured');
 			}
-			if ($examplesup == "ErrorBadMask")
-			{
-				$langs->load("errors");
-				$examplesup = $langs->trans($examplesup);
-			}
-			if ($examplesup == "ErrorCantUseRazIfNoYearInMask")
-			{
-				$langs->load("errors");
-				$examplesup = $langs->trans($examplesup);
-			}
-			if ($examplesup == "ErrorCantUseRazInStartedYearIfNoYearMonthInMask")
-			{
+			if (in_array($examplesup, $errmsg)) {
 				$langs->load("errors");
 				$examplesup = $langs->trans($examplesup);
 			}
 		}
 
-		if ($type == 0) return $examplecust;
-		if ($type == 1) return $examplesup;
-		return $examplecust.'<br>'.$examplesup;
+		if ($type == 0) {
+			return $examplecust;
+		} elseif ($type == 1) {
+			return $examplesup;
+		} else {
+			return $examplecust.'<br>'.$examplesup;
+		}
 	}
 
 	/**
@@ -232,7 +239,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *   Check if mask/numbering use prefix
 	 *
@@ -240,7 +247,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 	 */
 	public function verif_prefixIsUsed()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$mask = $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
@@ -306,7 +313,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *		Renvoi si un code est pris ou non (par autre tiers)
 	 *
@@ -318,7 +325,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 	 */
 	public function verif_dispo($db, $code, $soc, $type = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe";
 		if ($type == 1) $sql .= " WHERE code_fournisseur = '".$db->escape($code)."'";
 		else $sql .= " WHERE code_client = '".$db->escape($code)."'";
diff --git a/htdocs/core/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php
index c3ce858ec0d..54ba73d08ef 100644
--- a/htdocs/core/modules/societe/mod_codeclient_leopard.php
+++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php
@@ -52,9 +52,9 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode
 	public $code_null; // Code facultatif
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -77,7 +77,7 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode
 
 
 	/**
-     *  Return description of module
+	 *  Return description of module
 	 *
 	 *  @param  Translate   $langs  Object langs
 	 *  @return string              Description of module
diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php
index a73e7db2911..1d8b543234d 100644
--- a/htdocs/core/modules/societe/mod_codeclient_monkey.php
+++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php
@@ -46,9 +46,9 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 	public $code_null; // Code facultatif
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -81,7 +81,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 
 
 	/**
-     *  Return description of module
+	 *  Return description of module
 	 *
 	 *  @param	Translate	$langs	Object langs
 	 *  @return string      		Description of module
@@ -118,20 +118,20 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 		global $db, $conf, $mc;
 
 		$field = '';
-        $prefix = '';
+		$prefix = '';
 		if ($type == 0) {
 			$field = 'code_client';
-            $prefix = $this->prefixcustomer;
+			$prefix = $this->prefixcustomer;
 		} elseif ($type == 1) {
 			$field = 'code_fournisseur';
-            $prefix = $this->prefixsupplier;
+			$prefix = $this->prefixsupplier;
 		} else {
-            return -1;
-        }
+			return -1;
+		}
 
-        // First, we get the max value (reponse immediate car champ indexe)
-        $posindice = strlen($prefix) + 6;
-        $sql = "SELECT MAX(CAST(SUBSTRING(".$field." FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
+		// First, we get the max value (reponse immediate car champ indexe)
+		$posindice = strlen($prefix) + 6;
+		$sql = "SELECT MAX(CAST(SUBSTRING(".$field." FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
 		$sql .= " WHERE ".$field." LIKE '".$db->escape($prefix)."____-%'";
 		$sql .= " AND entity IN (".getEntity('societe').")";
@@ -210,7 +210,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *		Renvoi si un code est pris ou non (par autre tiers)
 	 *
@@ -222,7 +222,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 	 */
 	public function verif_dispo($db, $code, $soc, $type = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $mc;
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe";
@@ -247,7 +247,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi si un code respecte la syntaxe
 	 *
@@ -256,7 +256,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 	 */
 	public function verif_syntax($code)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$res = 0;
 
 		if (dol_strlen($code) < 11)
diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
index fc993a0d671..13cc8a4948c 100644
--- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php
+++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
@@ -37,9 +37,9 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 	public $name = 'Aquarium';
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	public $prefixcustomeraccountancycode;
@@ -54,11 +54,11 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 	 */
 	public function __construct()
 	{
-	    global $conf;
+		global $conf;
 		if (!isset($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) || trim($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) == '') $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER = '411';
-        if (!isset($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) || trim($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) == '') $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER = '401';
+		if (!isset($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) || trim($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) == '') $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER = '401';
 		$this->prefixcustomeraccountancycode = $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER;
-	    $this->prefixsupplieraccountancycode = $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER;
+		$this->prefixsupplieraccountancycode = $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER;
 	}
 
 
@@ -70,12 +70,12 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 	 */
 	public function info($langs)
 	{
-	    global $conf;
-	    global $form;
+		global $conf;
+		global $form;
 
 		$langs->load("companies");
 
-        $tooltip = '';
+		$tooltip = '';
 		$texte = '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
@@ -85,16 +85,18 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 		$s1 = $form->textwithpicto('<input type="text" class="flat" size="4" name="value1" value="'.$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER.'">', $tooltip, 1, 1);
 		$s2 = $form->textwithpicto('<input type="text" class="flat" size="4" name="value2" value="'.$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER.'">', $tooltip, 1, 1);
 		$texte .= '<tr><td>';
-		$texte .= $langs->trans("ModuleCompanyCodeCustomer".$this->name, $s2)."<br>\n";
-		$texte .= $langs->trans("ModuleCompanyCodeSupplier".$this->name, $s1)."<br>\n";
+		// trans remove html entities
+		$texte .= $langs->trans("ModuleCompanyCodeCustomer".$this->name, '{s2}')."<br>\n";
+		$texte .= $langs->trans("ModuleCompanyCodeSupplier".$this->name, '{s1}')."<br>\n";
+		$texte = str_replace(array('{s1}', '{s2}'), array($s1, $s2), $texte);
 		$texte .= "<br>\n";
 		if (!isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || !empty($conf->global->$conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) $texte .= $langs->trans('RemoveSpecialChars').' = '.yn(1)."<br>\n";
 		//if (! empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)) $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_ALPHA').' = '.yn($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)."<br>\n";
 		if (!empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX))  $texte .= $langs->trans('COMPANY_AQUARIUM_CLEAN_REGEX').' = '.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX."<br>\n";
 		$texte .= '</td>';
 		$texte .= '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
-        $texte .= '</tr></table>';
-        $texte .= '</form>';
+		$texte .= '</tr></table>';
+		$texte .= '</form>';
 
 		return $texte;
 	}
@@ -111,13 +113,13 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 	{
 		$s = '';
 		$s .= $this->prefixcustomeraccountancycode.'CUSTCODE';
-	    $s .= "<br>\n";
-	    $s .= $this->prefixsupplieraccountancycode.'SUPPCODE';
-	    return $s;
+		$s .= "<br>\n";
+		$s .= $this->prefixsupplieraccountancycode.'SUPPCODE';
+		return $s;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Set accountancy account code for a third party into this->code
 	 *
@@ -128,7 +130,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 	 */
 	public function get_code($db, $societe, $type = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$i = 0;
diff --git a/htdocs/core/modules/societe/mod_codecompta_digitaria.php b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
index 9835851cc7c..961fa1a4e73 100644
--- a/htdocs/core/modules/societe/mod_codecompta_digitaria.php
+++ b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
@@ -32,30 +32,30 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'
  */
 class mod_codecompta_digitaria extends ModeleAccountancyCode
 {
-    /**
-     * @var string model name
-     */
-    public $name = 'Digitaria';
+	/**
+	 * @var string model name
+	 */
+	public $name = 'Digitaria';
 
-    /**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
-    public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-    /**
-     * Prefix customer accountancy code
-     * @var string
-     */
-    public $prefixcustomeraccountancycode;
+	/**
+	 * Prefix customer accountancy code
+	 * @var string
+	 */
+	public $prefixcustomeraccountancycode;
 
-    /**
-     * Prefix supplier accountancy code
-     * @var string
-     */
-    public $prefixsupplieraccountancycode;
+	/**
+	 * Prefix supplier accountancy code
+	 * @var string
+	 */
+	public $prefixsupplieraccountancycode;
 
-    public $position = 30;
+	public $position = 30;
 
 
 	/**
@@ -63,16 +63,16 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 	 */
 	public function __construct()
 	{
-        global $conf, $langs;
-        if (!isset($conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER) || trim($conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER) == '') $conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER = '411';
-        if (!isset($conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER) || trim($conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER) == '') $conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER = '401';
-        $this->prefixcustomeraccountancycode = $conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER;
-        $this->prefixsupplieraccountancycode = $conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER;
+		global $conf, $langs;
+		if (!isset($conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER) || trim($conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER) == '') $conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER = '411';
+		if (!isset($conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER) || trim($conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER) == '') $conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER = '401';
+		$this->prefixcustomeraccountancycode = $conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER;
+		$this->prefixsupplieraccountancycode = $conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER;
 
-        if (!isset($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER) || trim($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER) == '') $conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER = '5';
-        if (!isset($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER) || trim($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER) == '') $conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER = '5';
-        $this->customeraccountancycodecharacternumber = $conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER;
-        $this->supplieraccountancycodecharacternumber = $conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER;
+		if (!isset($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER) || trim($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER) == '') $conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER = '5';
+		if (!isset($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER) || trim($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER) == '') $conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER = '5';
+		$this->customeraccountancycodecharacternumber = $conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER;
+		$this->supplieraccountancycodecharacternumber = $conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER;
 	}
 
 	/**
@@ -83,37 +83,39 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 	 */
 	public function info($langs)
 	{
-        global $conf, $form;
+		global $conf, $form;
 
-        $tooltip = '';
-        $texte = '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-        $texte .= '<input type="hidden" name="token" value="'.newToken().'">';
-        $texte .= '<input type="hidden" name="action" value="setModuleOptions">';
-        $texte .= '<input type="hidden" name="param1" value="COMPANY_DIGITARIA_MASK_SUPPLIER">';
-        $texte .= '<input type="hidden" name="param2" value="COMPANY_DIGITARIA_MASK_CUSTOMER">';
-        $texte .= '<input type="hidden" name="param3" value="COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER">';
-        $texte .= '<input type="hidden" name="param4" value="COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER">';
-        $texte .= '<table class="nobordernopadding" width="100%">';
-        $s1 = $form->textwithpicto('<input type="text" class="flat" size="4" name="value1" value="'.$conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER.'">', $tooltip, 1, 1);
-        $s2 = $form->textwithpicto('<input type="text" class="flat" size="4" name="value2" value="'.$conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER.'">', $tooltip, 1, 1);
-        $s3 = $form->textwithpicto('<input type="text" class="flat" size="2" name="value3" value="'.$conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER.'">', $tooltip, 1, 1);
-        $s4 = $form->textwithpicto('<input type="text" class="flat" size="2" name="value4" value="'.$conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER.'">', $tooltip, 1, 1);
-        $texte .= '<tr><td>';
-        $texte .= $langs->trans("ModuleCompanyCodeCustomer".$this->name, $s2, $s4)."<br>\n";
-        $texte .= $langs->trans("ModuleCompanyCodeSupplier".$this->name, $s1, $s3)."<br>\n";
-        $texte .= "<br>\n";
-        // Remove special char if COMPANY_DIGITARIA_REMOVE_SPECIAL is set to 1 or not set (default)
-        if (!isset($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL) || !empty($conf->global->$conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL)) $texte .= $langs->trans('RemoveSpecialChars').' = '.yn(1)."<br>\n";
-        // Apply a regex replacement pattern on code if COMPANY_DIGITARIA_CLEAN_REGEX is set. Value must be a regex with parenthesis. The part into parenthesis is kept, the rest removed.
-        if (!empty($conf->global->COMPANY_DIGITARIA_CLEAN_REGEX))  $texte .= $langs->trans('COMPANY_DIGITARIA_CLEAN_REGEX').' = '.$conf->global->COMPANY_DIGITARIA_CLEAN_REGEX."<br>\n";
-        // Unique index on code if COMPANY_DIGITARIA_UNIQUE_CODE is set to 1 or not set (default)
-        if (!isset($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE) || !empty($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE)) $texte .= $langs->trans('COMPANY_DIGITARIA_UNIQUE_CODE').' = '.yn(1)."<br>\n";
-        $texte .= '</td>';
-        $texte .= '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
-        $texte .= '</tr></table>';
-        $texte .= '</form>';
+		$tooltip = '';
+		$texte = '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
+		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
+		$texte .= '<input type="hidden" name="param1" value="COMPANY_DIGITARIA_MASK_SUPPLIER">';
+		$texte .= '<input type="hidden" name="param2" value="COMPANY_DIGITARIA_MASK_CUSTOMER">';
+		$texte .= '<input type="hidden" name="param3" value="COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER">';
+		$texte .= '<input type="hidden" name="param4" value="COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+		$s1 = $form->textwithpicto('<input type="text" class="flat" size="4" name="value1" value="'.$conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER.'">', $tooltip, 1, 1);
+		$s2 = $form->textwithpicto('<input type="text" class="flat" size="4" name="value2" value="'.$conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER.'">', $tooltip, 1, 1);
+		$s3 = $form->textwithpicto('<input type="text" class="flat" size="2" name="value3" value="'.$conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER.'">', $tooltip, 1, 1);
+		$s4 = $form->textwithpicto('<input type="text" class="flat" size="2" name="value4" value="'.$conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER.'">', $tooltip, 1, 1);
+		$texte .= '<tr><td>';
+		// trans remove html entities
+		$texte .= $langs->trans("ModuleCompanyCodeCustomer".$this->name, '{s2}', '{s4}')."<br>\n";
+		$texte .= $langs->trans("ModuleCompanyCodeSupplier".$this->name, '{s1}', '{s3}')."<br>\n";
+		$texte = str_replace(array('{s1}', '{s2}', '{s3}', '{s4}'), array($s1, $s2, $s3, $s4), $texte);
+		$texte .= "<br>\n";
+		// Remove special char if COMPANY_DIGITARIA_REMOVE_SPECIAL is set to 1 or not set (default)
+		if (!isset($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL) || !empty($conf->global->$conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL)) $texte .= $langs->trans('RemoveSpecialChars').' = '.yn(1)."<br>\n";
+		// Apply a regex replacement pattern on code if COMPANY_DIGITARIA_CLEAN_REGEX is set. Value must be a regex with parenthesis. The part into parenthesis is kept, the rest removed.
+		if (!empty($conf->global->COMPANY_DIGITARIA_CLEAN_REGEX))  $texte .= $langs->trans('COMPANY_DIGITARIA_CLEAN_REGEX').' = '.$conf->global->COMPANY_DIGITARIA_CLEAN_REGEX."<br>\n";
+		// Unique index on code if COMPANY_DIGITARIA_UNIQUE_CODE is set to 1 or not set (default)
+		if (!isset($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE) || !empty($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE)) $texte .= $langs->trans('COMPANY_DIGITARIA_UNIQUE_CODE').' = '.yn(1)."<br>\n";
+		$texte .= '</td>';
+		$texte .= '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '</tr></table>';
+		$texte .= '</form>';
 
-        return $texte;
+		return $texte;
 	}
 
 	/**
@@ -126,21 +128,21 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 	 */
 	public function getExample($langs, $objsoc = 0, $type = -1)
 	{
-	    global $conf, $mysoc;
+		global $conf, $mysoc;
 
-        $s = $langs->trans("ThirdPartyName").": ".$mysoc->name;
-        $s .= "<br>\n";
+		$s = $langs->trans("ThirdPartyName").": ".$mysoc->name;
+		$s .= "<br>\n";
 
-        if (!isset($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL)) $thirdpartylabelexample = preg_replace('/([^a-z0-9])/i', '', $mysoc->name);
-        $s .= "<br>\n";
-        $s .= $this->prefixcustomeraccountancycode.strtoupper(substr($thirdpartylabelexample, 0, $this->customeraccountancycodecharacternumber));
-        $s .= "<br>\n";
-        $s .= $this->prefixsupplieraccountancycode.strtoupper(substr($thirdpartylabelexample, 0, $this->supplieraccountancycodecharacternumber));
-        return $s;
+		if (!isset($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL)) $thirdpartylabelexample = preg_replace('/([^a-z0-9])/i', '', $mysoc->name);
+		$s .= "<br>\n";
+		$s .= $this->prefixcustomeraccountancycode.strtoupper(substr($thirdpartylabelexample, 0, $this->customeraccountancycodecharacternumber));
+		$s .= "<br>\n";
+		$s .= $this->prefixsupplieraccountancycode.strtoupper(substr($thirdpartylabelexample, 0, $this->supplieraccountancycodecharacternumber));
+		return $s;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *  Set accountancy account code for a third party into this->code
 	 *
 	 *  @param	DoliDB	$db              Database handler
@@ -150,116 +152,116 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 	 */
 	public function get_code($db, $societe, $type = '')
 	{
-        // phpcs:enable
-        global $conf;
-        $i = 0;
-        $this->code = '';
+		// phpcs:enable
+		global $conf;
+		$i = 0;
+		$this->code = '';
 
 		if (is_object($societe))
 		{
-            dol_syslog("mod_codecompta_digitaria::get_code search code for type=".$type." & company=".(!empty($societe->name) ? $societe->name : ''));
+			dol_syslog("mod_codecompta_digitaria::get_code search code for type=".$type." & company=".(!empty($societe->name) ? $societe->name : ''));
 
 			if ($type == 'supplier') {
-                $codetouse = $societe->name;
-                $prefix = $this->prefixsupplieraccountancycode;
-                $width = $this->supplieraccountancycodecharacternumber;
+				$codetouse = $societe->name;
+				$prefix = $this->prefixsupplieraccountancycode;
+				$width = $this->supplieraccountancycodecharacternumber;
 			} elseif ($type == 'customer')
-            {
-                $codetouse = $societe->name;
-                $prefix = $this->prefixcustomeraccountancycode;
-                $width = $this->customeraccountancycodecharacternumber;
-            } else {
-                $this->error = 'Bad value for parameter type';
-                return -1;
-            }
+			{
+				$codetouse = $societe->name;
+				$prefix = $this->prefixcustomeraccountancycode;
+				$width = $this->customeraccountancycodecharacternumber;
+			} else {
+				$this->error = 'Bad value for parameter type';
+				return -1;
+			}
 
-            // Remove special char if COMPANY_DIGITARIA_REMOVE_SPECIAL is set to 1 or not set (default)
-            if (!isset($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL) || !empty($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL)) $codetouse = preg_replace('/([^a-z0-9])/i', '', $codetouse);
-            // Apply a regex replacement pattern on code if COMPANY_DIGITARIA_CLEAN_REGEX is set. Value must be a regex with parenthesis. The part into parenthesis is kept, the rest removed.
-            if (!empty($conf->global->COMPANY_DIGITARIA_CLEAN_REGEX))	// Example: $conf->global->COMPANY_DIGITARIA_CLEAN_REGEX='^..(..)..';
-            {
-                $codetouse = preg_replace('/'.$conf->global->COMPANY_DIGITARIA_CLEAN_REGEX.'/', '\1\2\3', $codetouse);
-            }
+			// Remove special char if COMPANY_DIGITARIA_REMOVE_SPECIAL is set to 1 or not set (default)
+			if (!isset($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL) || !empty($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL)) $codetouse = preg_replace('/([^a-z0-9])/i', '', $codetouse);
+			// Apply a regex replacement pattern on code if COMPANY_DIGITARIA_CLEAN_REGEX is set. Value must be a regex with parenthesis. The part into parenthesis is kept, the rest removed.
+			if (!empty($conf->global->COMPANY_DIGITARIA_CLEAN_REGEX))	// Example: $conf->global->COMPANY_DIGITARIA_CLEAN_REGEX='^..(..)..';
+			{
+				$codetouse = preg_replace('/'.$conf->global->COMPANY_DIGITARIA_CLEAN_REGEX.'/', '\1\2\3', $codetouse);
+			}
 
-            $this->code = $prefix.strtoupper(substr($codetouse, 0, $width));
-            dol_syslog("mod_codecompta_digitaria::get_code search code proposed=".$this->code);
+			$this->code = $prefix.strtoupper(substr($codetouse, 0, $width));
+			dol_syslog("mod_codecompta_digitaria::get_code search code proposed=".$this->code);
 
-            // Unique index on code if COMPANY_DIGITARIA_UNIQUE_CODE is set to 1 or not set (default)
-            if (!isset($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE) || !empty($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE))
-            {
-                $disponibility = $this->checkIfAccountancyCodeIsAlreadyUsed($db, $this->code, $type);
+			// Unique index on code if COMPANY_DIGITARIA_UNIQUE_CODE is set to 1 or not set (default)
+			if (!isset($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE) || !empty($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE))
+			{
+				$disponibility = $this->checkIfAccountancyCodeIsAlreadyUsed($db, $this->code, $type);
 
-                while ($disponibility <> 0 && $i < 100) {
-                    $widthsupplier = $this->supplieraccountancycodecharacternumber;
-                    $widthcustomer = $this->customeraccountancycodecharacternumber;
+				while ($disponibility <> 0 && $i < 100) {
+					$widthsupplier = $this->supplieraccountancycodecharacternumber;
+					$widthcustomer = $this->customeraccountancycodecharacternumber;
 
-                    if ($i <= 9) {
-                        $a = 1;
-                    }
-                    if ($i >= 10 && $i <= 99) {
-                        $a = 2;
-                    }
+					if ($i <= 9) {
+						$a = 1;
+					}
+					if ($i >= 10 && $i <= 99) {
+						$a = 2;
+					}
 
-                    if ($type == 'supplier') {
-                        $this->code = $prefix.strtoupper(substr($codetouse, 0, $widthsupplier - $a)).$i;
-                    } elseif ($type == 'customer') {
-                        $this->code = $prefix.strtoupper(substr($codetouse, 0, $widthcustomer - $a)).$i;
-                    }
-                    $disponibility = $this->checkIfAccountancyCodeIsAlreadyUsed($db, $this->code, $type);
+					if ($type == 'supplier') {
+						$this->code = $prefix.strtoupper(substr($codetouse, 0, $widthsupplier - $a)).$i;
+					} elseif ($type == 'customer') {
+						$this->code = $prefix.strtoupper(substr($codetouse, 0, $widthcustomer - $a)).$i;
+					}
+					$disponibility = $this->checkIfAccountancyCodeIsAlreadyUsed($db, $this->code, $type);
 
-                    $i++;
-                }
-            } else {
-                $disponibility == 0;
-            }
+					$i++;
+				}
+			} else {
+				$disponibility == 0;
+			}
 		}
 
-        if ($disponibility == 0)
-        {
-            return 0; // return ok
-        } else {
-            return -1; // return ko
-        }
+		if ($disponibility == 0)
+		{
+			return 0; // return ok
+		} else {
+			return -1; // return ko
+		}
 	}
 
-    /**
-     *  Check accountancy account code for a third party into this->code
-     *
-     *  @param	DoliDB	$db             Database handler
-     *  @param  string	$code           Code of third party
-     *  @param  int		$type			'customer' or 'supplier'
-     *  @return	int						>=0 if OK, <0 if KO
-     */
-    public function checkIfAccountancyCodeIsAlreadyUsed($db, $code, $type = '')
-    {
-        if ($type == 'supplier')
-        {
-            $typethirdparty = 'code_compta_fournisseur';
-        } elseif ($type == 'customer')
-        {
-            $typethirdparty = 'code_compta';
-        } else {
-            $this->error = 'Bad value for parameter type';
-            return -1;
-        }
+	/**
+	 *  Check accountancy account code for a third party into this->code
+	 *
+	 *  @param	DoliDB	$db             Database handler
+	 *  @param  string	$code           Code of third party
+	 *  @param  int		$type			'customer' or 'supplier'
+	 *  @return	int						>=0 if OK, <0 if KO
+	 */
+	public function checkIfAccountancyCodeIsAlreadyUsed($db, $code, $type = '')
+	{
+		if ($type == 'supplier')
+		{
+			$typethirdparty = 'code_compta_fournisseur';
+		} elseif ($type == 'customer')
+		{
+			$typethirdparty = 'code_compta';
+		} else {
+			$this->error = 'Bad value for parameter type';
+			return -1;
+		}
 
-        $sql = "SELECT ".$typethirdparty." FROM ".MAIN_DB_PREFIX."societe";
-        $sql .= " WHERE ".$typethirdparty." = '".$db->escape($code)."'";
+		$sql = "SELECT ".$typethirdparty." FROM ".MAIN_DB_PREFIX."societe";
+		$sql .= " WHERE ".$typethirdparty." = '".$db->escape($code)."'";
 
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            if ($db->num_rows($resql) == 0)
-            {
-                dol_syslog("mod_codecompta_digitaria::checkIfAccountancyCodeIsAlreadyUsed '".$code."' available");
-                return 0; // Available
-            } else {
-                dol_syslog("mod_codecompta_digitaria::checkIfAccountancyCodeIsAlreadyUsed '".$code."' not available");
-                return -1; // Not available
-            }
-        } else {
-            $this->error = $db->error()." sql=".$sql;
-            return -2; // Error
-        }
-    }
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			if ($db->num_rows($resql) == 0)
+			{
+				dol_syslog("mod_codecompta_digitaria::checkIfAccountancyCodeIsAlreadyUsed '".$code."' available");
+				return 0; // Available
+			} else {
+				dol_syslog("mod_codecompta_digitaria::checkIfAccountancyCodeIsAlreadyUsed '".$code."' not available");
+				return -1; // Not available
+			}
+		} else {
+			$this->error = $db->error()." sql=".$sql;
+			return -2; // Error
+		}
+	}
 }
diff --git a/htdocs/core/modules/societe/mod_codecompta_panicum.php b/htdocs/core/modules/societe/mod_codecompta_panicum.php
index 732090a9340..04ae16a1630 100644
--- a/htdocs/core/modules/societe/mod_codecompta_panicum.php
+++ b/htdocs/core/modules/societe/mod_codecompta_panicum.php
@@ -36,9 +36,9 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
 	public $name = 'Panicum';
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	public $position = 10;
@@ -76,7 +76,7 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
 		return '';
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Set accountancy account code for a third party into this->code
 	 *
@@ -87,7 +87,7 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
 	 */
 	public function get_code($db, $societe, $type = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->code = '';
 
 		if (is_object($societe)) {
diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
index df280e11679..03463f364bd 100644
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -28,8 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
 
 
 /**
- *	\class      ModeleThirdPartyDoc
- *	\brief      Parent class for third parties models of doc generators
+ *	Parent class for third parties models of doc generators
  */
 abstract class ModeleThirdPartyDoc extends CommonDocGenerator
 {
@@ -62,8 +61,7 @@ abstract class ModeleThirdPartyDoc extends CommonDocGenerator
 }
 
 /**
- *	    \class      ModeleThirdPartyCode
- *		\brief  	Parent class for third parties code generators
+ *		Parent class for third parties code generators
  */
 abstract class ModeleThirdPartyCode
 {
@@ -72,6 +70,12 @@ abstract class ModeleThirdPartyCode
 	 */
 	public $error = '';
 
+	/**
+	 * @var array Error code (or message) array
+	 */
+	public $errors;
+
+
 	/**     Renvoi la description par defaut du modele de numerotation
 	 *
 	 *		@param	Translate	$langs		Object langs
@@ -140,11 +144,17 @@ abstract class ModeleThirdPartyCode
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
-		return $langs->trans("NotAvailable");
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		} elseif ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		} elseif ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		} elseif ($this->version) {
+			return $this->version;
+		} else {
+			return $langs->trans("NotAvailable");
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -153,7 +163,7 @@ abstract class ModeleThirdPartyCode
 	 *
 	 *  @param	DoliDB	$db     			Database handler
 	 *  @param  integer	$maxfilenamelength  Max length of value to show
-	 *  @return	array						List of numbers
+	 *  @return	array|int					List of numbers
 	 */
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
@@ -162,12 +172,10 @@ abstract class ModeleThirdPartyCode
 		$sql = "";
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$row = $db->fetch_row($resql);
 				$liste[$row[0]] = $row[1];
 				$i++;
@@ -191,37 +199,39 @@ abstract class ModeleThirdPartyCode
 		global $conf;
 
 		$langs->load("admin");
+		$strikestart = '';
+		$strikeend = '';
+		if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) {
+			$strikestart = '<strike>';
+			$strikeend = '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+		}
 
 		$s = '';
-		if ($type == -1) $s .= $langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
-		if ($type == -1) $s .= $langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
-		if ($type == 0)  $s .= $langs->trans("CustomerCodeDesc").'<br>';
-		if ($type == 1)  $s .= $langs->trans("SupplierCodeDesc").'<br>';
-		if ($type != -1) $s .= $langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
+		if ($type == -1) {
+			$s .= $langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
+		} elseif ($type == -1) {
+			$s .= $langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
+		} elseif ($type == 0) {
+			$s .= $langs->trans("CustomerCodeDesc").'<br>';
+		} elseif ($type == 1) {
+			$s .= $langs->trans("SupplierCodeDesc").'<br>';
+		}
+		if ($type != -1) {
+			$s .= $langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
+		}
 		$s .= '<br>';
 		$s .= '<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
-		if ($type == 0)
-		{
-			$s .= $langs->trans("RequiredIfCustomer").': ';
-			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
-			$s .= yn(!$this->code_null, 1, 2);
-			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+		if ($type == 0) {
+			$s .= $langs->trans("RequiredIfCustomer").': '.$strikestart;
+			$s .= yn(!$this->code_null, 1, 2).$strikeend;
 			$s .= '<br>';
-		}
-		if ($type == 1)
-		{
-			$s .= $langs->trans("RequiredIfSupplier").': ';
-			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
-			$s .= yn(!$this->code_null, 1, 2);
-			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+		} elseif ($type == 1) {
+			$s .= $langs->trans("RequiredIfSupplier").': '.$strikestart;
+			$s .= yn(!$this->code_null, 1, 2).$strikeend;
 			$s .= '<br>';
-		}
-		if ($type == -1)
-		{
-			$s .= $langs->trans("Required").': ';
-			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
-			$s .= yn(!$this->code_null, 1, 2);
-			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+		} elseif ($type == -1) {
+			$s .= $langs->trans("Required").': '.$strikestart;
+			$s .= yn(!$this->code_null, 1, 2).$strikeend;
 			$s .= '<br>';
 		}
 		$s .= $langs->trans("CanBeModifiedIfOk").': ';
@@ -230,16 +240,18 @@ abstract class ModeleThirdPartyCode
 		$s .= $langs->trans("CanBeModifiedIfKo").': '.yn($this->code_modifiable_invalide, 1, 2).'<br>';
 		$s .= $langs->trans("AutomaticCode").': '.yn($this->code_auto, 1, 2).'<br>';
 		$s .= '<br>';
-		if ($type == 0 || $type == -1)
-		{
+		if ($type == 0 || $type == -1) {
 			$nextval = $this->getNextValue($soc, 0);
-			if (empty($nextval)) $nextval = $langs->trans("Undefined");
+			if (empty($nextval)) {
+				$nextval = $langs->trans("Undefined");
+			}
 			$s .= $langs->trans("NextValue").($type == -1 ? ' ('.$langs->trans("Customer").')' : '').': <b>'.$nextval.'</b><br>';
 		}
-		if ($type == 1 || $type == -1)
-		{
+		if ($type == 1 || $type == -1) {
 			$nextval = $this->getNextValue($soc, 1);
-			if (empty($nextval)) $nextval = $langs->trans("Undefined");
+			if (empty($nextval)) {
+				$nextval = $langs->trans("Undefined");
+			}
 			$s .= $langs->trans("NextValue").($type == -1 ? ' ('.$langs->trans("Supplier").')' : '').': <b>'.$nextval.'</b>';
 		}
 		return $s;
@@ -317,11 +329,17 @@ abstract class ModeleAccountancyCode
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
-		return $langs->trans("NotAvailable");
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		} elseif ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		} elseif ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		} elseif ($this->version) {
+			return $this->version;
+		} else {
+			return $langs->trans("NotAvailable");
+		}
 	}
 
 	/**
@@ -339,23 +357,27 @@ abstract class ModeleAccountancyCode
 		$langs->load("admin");
 
 		$s = '';
-		if ($type == -1) $s .= $langs->trans("Name").': <b>'.$this->name.'</b><br>';
-		if ($type == -1) $s .= $langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
+		if ($type == -1) {
+			$s .= $langs->trans("Name").': <b>'.$this->name.'</b><br>';
+			$s .= $langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
+		}
 		//$s.='<br>';
 		//$s.='<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
 		$s .= '<br>';
-		if ($type == 0 || $type == -1)
-		{
+		if ($type == 0 || $type == -1) {
 			$result = $this->get_code($db, $soc, 'customer');
 			$nextval = $this->code;
-			if (empty($nextval)) $nextval = $langs->trans("Undefined");
+			if (empty($nextval)) {
+				$nextval = $langs->trans("Undefined");
+			}
 			$s .= $langs->trans("NextValue").($type == -1 ? ' ('.$langs->trans("Customer").')' : '').': <b>'.$nextval.'</b><br>';
 		}
-		if ($type == 1 || $type == -1)
-		{
+		if ($type == 1 || $type == -1) {
 			$result = $this->get_code($db, $soc, 'supplier');
 			$nextval = $this->code;
-			if (empty($nextval)) $nextval = $langs->trans("Undefined");
+			if (empty($nextval)) {
+				$nextval = $langs->trans("Undefined");
+			}
 			$s .= $langs->trans("NextValue").($type == -1 ? ' ('.$langs->trans("Supplier").')' : '').': <b>'.$nextval.'</b>';
 		}
 		return $s;
diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
index 89be1983115..1b3053aaaaf 100644
--- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
+++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
@@ -306,8 +306,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 				$contactobject = null;
 				if (!empty($usecontact))
 				{
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 						$socobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
@@ -323,7 +322,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 				'__FROM_EMAIL__' => $this->emetteur->email,
 				'__TOTAL_TTC__' => $object->total_ttc,
 				'__TOTAL_HT__' => $object->total_ht,
-				'__TOTAL_VAT__' => $object->total_vat
+				'__TOTAL_VAT__' => $object->total_tva
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
index 4b4be2de5b3..55923d68a79 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
@@ -912,7 +912,7 @@ class pdf_standard extends ModelePDFStock
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'PRODUCT_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 }
diff --git a/htdocs/core/modules/stock/modules_stock.php b/htdocs/core/modules/stock/modules_stock.php
index 35dc1c68a72..cd4fed5665f 100644
--- a/htdocs/core/modules/stock/modules_stock.php
+++ b/htdocs/core/modules/stock/modules_stock.php
@@ -23,31 +23,31 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
  */
 abstract class ModelePDFStock extends CommonDocGenerator
 {
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return list of active generation modules
-     *
-     *  @param  DoliDB      $db                 Database handler
-     *  @param  integer     $maxfilenamelength  Max length of value to show
-     *  @return array                           List of templates
-     */
-    public static function liste_modeles($db, $maxfilenamelength = 0)
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return list of active generation modules
+	 *
+	 *  @param  DoliDB      $db                 Database handler
+	 *  @param  integer     $maxfilenamelength  Max length of value to show
+	 *  @return array                           List of templates
+	 */
+	public static function liste_modeles($db, $maxfilenamelength = 0)
+	{
+		// phpcs:enable
+		global $conf;
 
-        $type = 'stock';
-        $liste = array();
+		$type = 'stock';
+		$liste = array();
 
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-        $liste = getListOfModels($db, $type, $maxfilenamelength);
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$liste = getListOfModels($db, $type, $maxfilenamelength);
 
-        return $liste;
-    }
+		return $liste;
+	}
 }
diff --git a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
index 80a222d9a6c..7a3ecf88e19 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -134,7 +134,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$this->name = "canelle";
 		$this->description = $langs->trans('SuppliersInvoiceModel');
 
-		// Dimension page
+		// Page dimensions
 		$this->type = 'pdf';
 		$formatarray = pdf_getFormat();
 		$this->page_largeur = $formatarray['width'];
@@ -145,12 +145,12 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
 		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
-		$this->option_modereg = 1; // Affiche mode reglement
-		$this->option_condreg = 1; // Affiche conditions reglement
-		$this->option_codeproduitservice = 1; // Affiche code produit-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
+		$this->option_modereg = 1; // Display payment mode
+		$this->option_condreg = 1; // Display payment terms
+		$this->option_codeproduitservice = 1; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
 
 		// Define column position
 		$this->posxdesc = $this->marge_gauche + 1;
@@ -161,7 +161,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$this->posxdiscount = 162;
 		$this->postotalht = 174;
 
-		if ($conf->global->PRODUCT_USE_UNITS) {
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			$this->posxtva = 99;
 			$this->posxup = 114;
 			$this->posxqty = 130;
@@ -224,9 +224,9 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		{
 			$object->fetch_thirdparty();
 
-			$deja_regle = $object->getSommePaiement(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
-			$amount_credit_notes_included = $object->getSumCreditNotesUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
-			$amount_deposits_included = $object->getSumDepositsUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
+			$deja_regle = $object->getSommePaiement((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
+			$amount_credit_notes_included = $object->getSumCreditNotesUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
+			$amount_deposits_included = $object->getSumDepositsUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
 
 			// Definition of $dir and $file
 			if ($object->specimen)
@@ -275,7 +275,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$heightforinfotot = 50 + (4 * $nbpayments); // Height reserved to output the info and total part and payment part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
 
 				if (class_exists('TCPDF'))
 				{
@@ -336,7 +336,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
 
 				// Incoterm
-				if ($conf->incoterm->enabled)
+				if (!empty($conf->incoterm->enabled))
 				{
 					$desc_incoterms = $object->getIncotermsForPDF();
 					if ($desc_incoterms)
@@ -400,6 +400,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					$pageposbefore = $pdf->getPage();
 
 					$showpricebeforepagebreak = 1;
+					$posYAfterImage = 0;
 
 					// Description of product line
 					$curX = $this->posxdesc - 1;
@@ -489,8 +490,8 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					$pdf->SetXY($this->postotalht, $curY);
 					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
 
-					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
+					// Collection of totals by VAT value in $this->tva["taux"]=total_tva
+					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
 					else $tvaligne = $object->lines[$i]->total_tva;
 
 					$localtax1ligne = $object->lines[$i]->total_localtax1;
@@ -656,19 +657,19 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$pdf->SetXY($col1x, $tab2_top + 0);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
 
-		$total_ht = (($conf->multicurrency->enabled && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
+		$total_ht = ((!empty($conf->multicurrency->enabled) && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + 0);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, $outputlangs), 0, 'R', 1);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248, 248, 248);
 
-		$total_ttc = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
+		$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
 		$this->atleastoneratenotnull = 0;
 		foreach ($this->tva as $tvakey => $tvaval)
 		{
-			if ($tvakey > 0)    // On affiche pas taux 0
+			if ($tvakey > 0)    // We do not display rate 0
 			{
 				$this->atleastoneratenotnull++;
 
@@ -785,8 +786,8 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $total_ttc, 0, $outputlangs), $useborder, 'R', 1);
 
 		$pdf->SetTextColor(0, 0, 0);
-		$creditnoteamount = $object->getSumCreditNotesUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0); // Warning, this also include excess received
-		$depositsamount = $object->getSumDepositsUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
+		$creditnoteamount = $object->getSumCreditNotesUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0); // Warning, this also include excess received
+		$depositsamount = $object->getSumDepositsUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
 		//print "x".$creditnoteamount."-".$depositsamount;exit;
 		$resteapayer = price2num($total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
 		if (!empty($object->paye)) $resteapayer = 0;
@@ -1020,7 +1021,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$pdf->SetXY($tab3_posx, $tab3_top + $y);
 				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date), 'day', false, $outputlangs, true), 0, 'L', 0);
 				$pdf->SetXY($tab3_posx + 21, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, price($sign * (($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount)), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, price($sign * ((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount)), 0, 'L', 0);
 				$pdf->SetXY($tab3_posx + 40, $tab3_top + $y);
 				$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort".$row->code);
 
@@ -1208,9 +1209,8 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $mysoc;
@@ -1263,7 +1263,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'SUPPLIER_INVOICE_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 }
diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
index 2b528e1154f..74c487b4d25 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
@@ -33,16 +33,16 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefo
  */
 class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 {
-    /**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
-    public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 	/**
 	 * @var string Nom du modele
@@ -63,28 +63,28 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 	public $prefixdeposit = 'SD';
 
 
-    /**
-     *  Return description of numbering model
-     *
-     *  @return     string      Text with description
-     */
-    public function info()
-    {
-        global $langs;
-        $langs->load("bills");
-        return $langs->trans("CactusNumRefModelDesc1", $this->prefixinvoice, $this->prefixcreditnote, $this->prefixdeposit);
-    }
+	/**
+	 *  Return description of numbering model
+	 *
+	 *  @return     string      Text with description
+	 */
+	public function info()
+	{
+		global $langs;
+		$langs->load("bills");
+		return $langs->trans("CactusNumRefModelDesc1", $this->prefixinvoice, $this->prefixcreditnote, $this->prefixdeposit);
+	}
 
 
-    /**
-     *  Returns a numbering example
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-        return $this->prefixinvoice."1301-0001";
-    }
+	/**
+	 *  Returns a numbering example
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+		return $this->prefixinvoice."1301-0001";
+	}
 
 
 	/**
@@ -160,84 +160,84 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
 		}
-    }
+	}
 
-    /**
-     * Return next value
-     *
-     * @param	Societe		$objsoc     Object third party
-     * @param  	Object		$object		Object invoice
-     * @param   string		$mode       'next' for next value or 'last' for last value
-     * @return 	string      			Value if OK, 0 if KO
-     */
-    public function getNextValue($objsoc, $object, $mode = 'next')
-    {
-        global $db, $conf;
+	/**
+	 * Return next value
+	 *
+	 * @param	Societe		$objsoc     Object third party
+	 * @param  	Object		$object		Object invoice
+	 * @param   string		$mode       'next' for next value or 'last' for last value
+	 * @return 	string      			Value if OK, 0 if KO
+	 */
+	public function getNextValue($objsoc, $object, $mode = 'next')
+	{
+		global $db, $conf;
 
-        $prefix = $this->prefixinvoice;
-        if ($object->type == 2) $prefix = $this->prefixcreditnote;
-        elseif ($object->type == 3) $prefix = $this->prefixdeposit;
+		$prefix = $this->prefixinvoice;
+		if ($object->type == 2) $prefix = $this->prefixcreditnote;
+		elseif ($object->type == 3) $prefix = $this->prefixdeposit;
 
-        // First, we get the max value
-        $posindice = strlen($prefix) + 6;
-        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
-        $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn";
-        $sql .= " WHERE ref LIKE '".$db->escape($prefix)."____-%'";
-        $sql .= " AND entity = ".$conf->entity;
+		// First, we get the max value
+		$posindice = strlen($prefix) + 6;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn";
+		$sql .= " WHERE ref LIKE '".$db->escape($prefix)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-        $resql = $db->query($sql);
-        dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
-        if ($resql)
-        {
-        	$obj = $db->fetch_object($resql);
-        	if ($obj) $max = intval($obj->max);
-        	else $max = 0;
-        } else {
-        	return -1;
-        }
+		$resql = $db->query($sql);
+		dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
+		if ($resql)
+		{
+			$obj = $db->fetch_object($resql);
+			if ($obj) $max = intval($obj->max);
+			else $max = 0;
+		} else {
+			return -1;
+		}
 
-        if ($mode == 'last')
-        {
-    		if ($max >= (pow(10, 4) - 1)) $num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
-    		else $num = sprintf("%04s", $max);
+		if ($mode == 'last')
+		{
+			if ($max >= (pow(10, 4) - 1)) $num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
+			else $num = sprintf("%04s", $max);
 
-        	$ref = '';
-        	$sql = "SELECT ref as ref";
-        	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn";
-        	$sql .= " WHERE ref LIKE '".$db->escape($prefix)."____-".$num."'";
-        	$sql .= " AND entity = ".$conf->entity;
+			$ref = '';
+			$sql = "SELECT ref as ref";
+			$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn";
+			$sql .= " WHERE ref LIKE '".$db->escape($prefix)."____-".$num."'";
+			$sql .= " AND entity = ".$conf->entity;
 
-        	dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
-        	$resql = $db->query($sql);
-        	if ($resql)
-        	{
-        		$obj = $db->fetch_object($resql);
-        		if ($obj) $ref = $obj->ref;
-        	} else dol_print_error($db);
+			dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$obj = $db->fetch_object($resql);
+				if ($obj) $ref = $obj->ref;
+			} else dol_print_error($db);
 
-        	return $ref;
-        } elseif ($mode == 'next')
-        {
-        	$date = $object->date; // This is invoice date (not creation date)
-        	$yymm = strftime("%y%m", $date);
+			return $ref;
+		} elseif ($mode == 'next')
+		{
+			$date = $object->date; // This is invoice date (not creation date)
+			$yymm = strftime("%y%m", $date);
 
-        	if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-        	else $num = sprintf("%04s", $max + 1);
+			if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+			else $num = sprintf("%04s", $max + 1);
 
-        	dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
-        	return $prefix.$yymm."-".$num;
-        } else dol_print_error('', 'Bad parameter for getNextValue');
-    }
+			dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
+			return $prefix.$yymm."-".$num;
+		} else dol_print_error('', 'Bad parameter for getNextValue');
+	}
 
 
-    /**
-     * Return next free value
-     *
-     * @param	Societe		$objsoc     	Object third party
-     * @param	string		$objforref		Object for number to search
-     * @param   string		$mode       	'next' for next value or 'last' for last value
-     * @return  string      				Next free value
-     */
+	/**
+	 * Return next free value
+	 *
+	 * @param	Societe		$objsoc     	Object third party
+	 * @param	string		$objforref		Object for number to search
+	 * @param   string		$mode       	'next' for next value or 'last' for last value
+	 * @return  string      				Next free value
+	 */
 	public function getNumRef($objsoc, $objforref, $mode = 'next')
 	{
 		return $this->getNextValue($objsoc, $objforref, $mode);
diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
index 3805a941476..db24e32280c 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
@@ -37,15 +37,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefo
 class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 	/**
 	 * @var string Nom du modele
@@ -60,17 +60,17 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 	public $name = 'Tulip';
 
 
-    /**
-     *  Returns the description of the model numbering
-     *
-     * 	@return     string      Description Text
-     */
-    public function info()
-    {
-        global $conf, $langs;
+	/**
+	 *  Returns the description of the model numbering
+	 *
+	 * 	@return     string      Description Text
+	 */
+	public function info()
+	{
+		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("bills", "admin"));
+		$langs->loadLangs(array("bills", "admin"));
 
 		$form = new Form($this->db);
 
@@ -79,8 +79,8 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="action" value="updateMask">';
 		$texte .= '<input type="hidden" name="maskconstinvoice" value="SUPPLIER_INVOICE_TULIP_MASK">';
-        $texte .= '<input type="hidden" name="maskconstreplacement" value="SUPPLIER_REPLACEMENT_TULIP_MASK">';
-        $texte .= '<input type="hidden" name="maskconstcredit" value="SUPPLIER_CREDIT_TULIP_MASK">';
+		$texte .= '<input type="hidden" name="maskconstreplacement" value="SUPPLIER_REPLACEMENT_TULIP_MASK">';
+		$texte .= '<input type="hidden" name="maskconstcredit" value="SUPPLIER_CREDIT_TULIP_MASK">';
 		$texte .= '<input type="hidden" name="maskconstdeposit" value="SUPPLIER_DEPOSIT_TULIP_MASK">';
 		$texte .= '<table class="nobordernopadding" width="100%">';
 
@@ -106,36 +106,36 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 
 		if ($conf->global->MAIN_FEATURE_LEVEL >= 2)
 		{
-    		// Parametrage du prefix des replacement
-    		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'):</td>';
-    		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskreplacement" value="'.$conf->global->SUPPLIER_REPLACEMENT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
-    		$texte .= '</tr>';
+			// Parametrage du prefix des replacement
+			$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'):</td>';
+			$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskreplacement" value="'.$conf->global->SUPPLIER_REPLACEMENT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
+			$texte .= '</tr>';
 
 
-    		// Parametrage du prefix des acomptes
-    		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'):</td>';
-    		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskdeposit" value="'.$conf->global->SUPPLIER_DEPOSIT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
-    		$texte .= '</tr>';
+			// Parametrage du prefix des acomptes
+			$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'):</td>';
+			$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskdeposit" value="'.$conf->global->SUPPLIER_DEPOSIT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
+			$texte .= '</tr>';
 		}
 
 		$texte .= '</table>';
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Returns a numbering example
-     *
-     *  @return     string     Example
-     */
-    public function getExample()
-    {
-    	global $conf, $langs, $mysoc;
+	/**
+	 *  Returns a numbering example
+	 *
+	 *  @return     string     Example
+	 */
+	public function getExample()
+	{
+		global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-    	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
 		if (!$numExample)
@@ -143,18 +143,18 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 * Return next value
 	 *
 	 * @param	Societe		$objsoc     Object third party
 	 * @param  	Object	    $object		Object invoice
-     * @param	string		$mode       'next' for next value or 'last' for last value
-     * @return 	string      			Value if OK, 0 if KO
+	 * @param	string		$mode       'next' for next value or 'last' for last value
+	 * @return 	string      			Value if OK, 0 if KO
 	 */
-    public function getNextValue($objsoc, $object, $mode = 'next')
-    {
+	public function getNextValue($objsoc, $object, $mode = 'next')
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -181,18 +181,18 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 		$numFinal = get_next_value($db, $mask, 'facture_fourn', 'ref', '', $objsoc, $object->date);
 
 		return  $numFinal;
-    }
+	}
 
-    /**
-     * Return next free value
-     *
-     *  @param  Societe     $objsoc         Object third party
-     *  @param  string      $objforref      Object for number to search
-     *  @param  string      $mode           'next' for next value or 'last' for last value
-     *  @return string                      Next free value
-     */
-    public function getNumRef($objsoc, $objforref, $mode = 'next')
-    {
-        return $this->getNextValue($objsoc, $objforref, $mode);
-    }
+	/**
+	 * Return next free value
+	 *
+	 *  @param  Societe     $objsoc         Object third party
+	 *  @param  string      $objforref      Object for number to search
+	 *  @param  string      $mode           'next' for next value or 'last' for last value
+	 *  @return string                      Next free value
+	 */
+	public function getNumRef($objsoc, $objforref, $mode = 'next')
+	{
+		return $this->getNextValue($objsoc, $objforref, $mode);
+	}
 }
diff --git a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
index aeeb79a1310..855809c0a58 100644
--- a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
+++ b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
@@ -40,17 +40,17 @@ abstract class ModelePDFSuppliersInvoices extends CommonDocGenerator
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of active generation models
 	 *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of numbers
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of numbers
 	 */
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'invoice_supplier';
@@ -77,7 +77,7 @@ abstract class ModeleNumRefSuppliersInvoices
 	 *
 	 *   @return	boolean     true if model can be used
 	 */
-    public function isEnabled()
+	public function isEnabled()
 	{
 		return true;
 	}
@@ -86,7 +86,7 @@ abstract class ModeleNumRefSuppliersInvoices
 	 *
 	 *   @return    string      Description Text
 	 */
-    public function info()
+	public function info()
 	{
 		global $langs;
 		$langs->load("invoices");
@@ -97,7 +97,7 @@ abstract class ModeleNumRefSuppliersInvoices
 	 *
 	 *    @return   string      Example
 	 */
-    public function getExample()
+	public function getExample()
 	{
 		global $langs;
 		$langs->load("invoices");
@@ -108,30 +108,30 @@ abstract class ModeleNumRefSuppliersInvoices
 	 *
 	 *   @return	boolean     false if conflict, true if ok
 	 */
-    public function canBeActivated()
+	public function canBeActivated()
 	{
 		return true;
 	}
 
-    /**  Returns next value assigned
-     *
-     * @param	Societe		$objsoc     Object third party
-     * @param  	Object	    $object		Object
-     * @param	string		$mode       'next' for next value or 'last' for last value
-     * @return 	string      			Value if OK, 0 if KO
-     */
-    public function getNextValue($objsoc, $object, $mode)
-    {
+	/**  Returns next value assigned
+	 *
+	 * @param	Societe		$objsoc     Object third party
+	 * @param  	Object	    $object		Object
+	 * @param	string		$mode       'next' for next value or 'last' for last value
+	 * @return 	string      			Value if OK, 0 if KO
+	 */
+	public function getNextValue($objsoc, $object, $mode)
+	{
 		global $langs;
 		return $langs->trans("NotAvailable");
-    }
+	}
 
 	/**   Returns version of the model numbering
 	 *
 	 *    @return     string      Value
 	 */
-    public function getVersion()
-    {
+	public function getVersion()
+	{
 		global $langs;
 		$langs->load("admin");
 
@@ -140,5 +140,5 @@ abstract class ModeleNumRefSuppliersInvoices
 		if ($this->version == 'dolibarr') return DOL_VERSION;
 		if ($this->version) return $this->version;
 		return $langs->trans("NotAvailable");
-    }
+	}
 }
diff --git a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
index 9c9e43a9475..18c3a9a3574 100644
--- a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
@@ -48,14 +48,14 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 	public $issuer;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * @var string Dolibarr version of the loaded document
-     */
+	 * @var string Dolibarr version of the loaded document
+	 */
 	public $version = 'dolibarr';
 
 
@@ -64,12 +64,12 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
@@ -109,12 +109,12 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 	 *	@param	Translate	$langs      Lang object to use for output
 	 *	@return string       			Description
 	 */
-    public function info($langs)
+	public function info($langs)
 	{
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("errors", "companies"));
+		$langs->loadLangs(array("errors", "companies"));
 
 		$form = new Form($this->db);
 
@@ -173,7 +173,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
    			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
    			foreach ($listoffiles as $file)
    			{
-                $texte .= $file['name'].'<br>';
+				$texte .= $file['name'].'<br>';
    			}
    			$texte .= '</div>';
 		}
@@ -191,7 +191,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Function to build a document on disk using the generic odt module.
 	 *
@@ -203,9 +203,9 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-    public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
@@ -231,9 +231,9 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 
 		if ($conf->fournisseur->commande->dir_output)
 		{
-            $object->fetch_thirdparty();
+			$object->fetch_thirdparty();
 
-            if ($object->specimen)
+			if ($object->specimen)
 			{
 				$dir = $conf->fournisseur->commande->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
@@ -267,8 +267,8 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -295,13 +295,13 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				$contactobject = null;
 				if (!empty($usecontact))
 				{
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else {
-                        $socobject = $object->thirdparty;
-               			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
-            			$contactobject = $object->contact;
-                    }
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+						$socobject = $object->contact;
+					} else {
+						$socobject = $object->thirdparty;
+			   			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+						$contactobject = $object->contact;
+					}
 				} else {
 					$socobject = $object->thirdparty;
 				}
@@ -312,7 +312,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				'__FROM_EMAIL__' => $this->issuer->email,
 				'__TOTAL_TTC__' => $object->total_ttc,
 				'__TOTAL_HT__' => $object->total_ht,
-				'__TOTAL_VAT__' => $object->total_vat
+				'__TOTAL_VAT__' => $object->total_tva
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
@@ -330,7 +330,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->fournisseur->dir_temp,
@@ -357,7 +357,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
 				} catch (OdfException $e)
 				{
-                    dol_syslog($e->getMessage(), LOG_INFO);
+					dol_syslog($e->getMessage(), LOG_INFO);
 				}
 
 				// Define substitution array
@@ -392,7 +392,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
@@ -423,10 +423,10 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								} catch (OdfException $e)
 								{
-                                    dol_syslog($e->getMessage(), LOG_INFO);
+									dol_syslog($e->getMessage(), LOG_INFO);
 								} catch (SegmentException $e)
 								{
-                                    dol_syslog($e->getMessage(), LOG_INFO);
+									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
 							$listlines->merge();
@@ -448,7 +448,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -462,16 +462,16 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
-                        $this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						$this->error = $e->getMessage();
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				} else {
 					try {
-					    $odfHandler->saveToDisk($file);
+						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
-                        $this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						$this->error = $e->getMessage();
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index c0b849fad67..3a4bc56f64a 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -192,8 +192,9 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "orders", "companies", "bills", "dict", "products"));
 
+		global $outputlangsbis;
+		$outputlangsbis = null;
 		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
-			global $outputlangsbis;
 			$outputlangsbis = new Translate('', $conf);
 			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
 			$outputlangsbis->loadLangs(array("main", "orders", "companies", "bills", "dict", "products"));
@@ -292,7 +293,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				$heightforinfotot = 50; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
 				$pdf->SetAutoPageBreak(1, 0);
 
 				if (class_exists('TCPDF'))
@@ -342,7 +343,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
 
 				// Incoterm
-				if ($conf->incoterm->enabled)
+				if (!empty($conf->incoterm->enabled))
 				{
 					$desc_incoterms = $object->getIncotermsForPDF();
 					if ($desc_incoterms)
@@ -666,7 +667,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
+					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
 					else $tvaligne = $object->lines[$i]->total_tva;
 
 					$localtax1ligne = $object->lines[$i]->total_localtax1;
@@ -924,7 +925,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		$pdf->SetXY($col1x, $tab2_top + 0);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
 
-		$total_ht = (($conf->multicurrency->enabled && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
+		$total_ht = ((!empty($conf->multicurrency->enabled) && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + 0);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, 'R', 1);
 
@@ -1058,7 +1059,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		$pdf->SetFillColor(224, 224, 224);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
 
-		$total_ttc = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
+		$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc), $useborder, 'R', 1);
 		$pdf->SetFont('', '', $default_font_size - 1);
@@ -1276,11 +1277,11 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		$pdf->SetTextColor(0, 0, 60);
 		$usehourmin = 'day';
 		if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) $usehourmin = 'dayhour';
-		if (!empty($object->date_livraison))
+		if (!empty($object->delivery_date))
 		{
 			$posy += 4;
 			$pdf->SetXY($posx - 90, $posy);
-			$pdf->MultiCell(190, 3, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_livraison, $usehourmin, false, $outputlangs, true), '', 'R');
+			$pdf->MultiCell(190, 3, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->delivery_date, $usehourmin, false, $outputlangs, true), '', 'R');
 		}
 
 		if ($object->thirdparty->code_fournisseur)
@@ -1370,9 +1371,8 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -1425,7 +1425,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'SUPPLIER_ORDER_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 
@@ -1562,7 +1562,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			),
 			'border-left' => true, // add left line separator
 		);
-		if ($conf->global->PRODUCT_USE_UNITS) {
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			$this->cols['unit']['status'] = true;
 		}
 
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
index b96f2f83a76..c8edef0679c 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -142,13 +142,13 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
 		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
-		$this->option_modereg = 1; // Affiche mode reglement
-		$this->option_condreg = 1; // Affiche conditions reglement
-		$this->option_codeproduitservice = 1; // Affiche code produit-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
-		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
+		$this->option_modereg = 1; // Display payment mode
+		$this->option_condreg = 1; // Display payment terms
+		$this->option_codeproduitservice = 1; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
+		$this->option_escompte = 0; // Displays if there has been a discount
 		$this->option_credit_note = 0; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 1; // Support add of a watermark on drafts
@@ -162,7 +162,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$this->posxdiscount = 162;
 		$this->postotalht = 174;
 
-		if ($conf->global->PRODUCT_USE_UNITS)
+		if (!empty($conf->global->PRODUCT_USE_UNITS))
 		{
 			$this->posxtva = 95;
 			$this->posxup = 114;
@@ -308,7 +308,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$heightforinfotot = 50; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
 				$pdf->SetAutoPageBreak(1, 0);
 
 				if (class_exists('TCPDF'))
@@ -370,7 +370,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
 
 				// Incoterm
-				if ($conf->incoterm->enabled)
+				if (!empty($conf->incoterm->enabled))
 				{
 					$desc_incoterms = $object->getIncotermsForPDF();
 					if ($desc_incoterms)
@@ -528,7 +528,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					$pdf->MultiCell($this->posxunit - $this->posxqty - 0.8, 4, $qty, 0, 'R'); // Enough for 6 chars
 
 					// Unit
-					if ($conf->global->PRODUCT_USE_UNITS)
+					if (!empty($conf->global->PRODUCT_USE_UNITS))
 					{
 						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
 						$pdf->SetXY($this->posxunit, $curY);
@@ -549,7 +549,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
+					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
 					else $tvaligne = $object->lines[$i]->total_tva;
 
 					$localtax1ligne = $object->lines[$i]->total_localtax1;
@@ -805,7 +805,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$pdf->SetXY($col1x, $tab2_top + 0);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
 
-		$total_ht = (($conf->multicurrency->enabled && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
+		$total_ht = ((!empty($conf->multicurrency->enabled) && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + 0);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, 'R', 1);
 
@@ -939,7 +939,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$pdf->SetFillColor(224, 224, 224);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
 
-		$total_ttc = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
+		$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc), $useborder, 'R', 1);
 		$pdf->SetFont('', '', $default_font_size - 1);
@@ -1057,7 +1057,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
 		}
 
-		if ($conf->global->PRODUCT_USE_UNITS) {
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxunit - 1, $tab_top + 1);
@@ -1190,11 +1190,11 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$pdf->SetTextColor(0, 0, 60);
 		$usehourmin = 'day';
 		if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) $usehourmin = 'dayhour';
-		if (!empty($object->date_livraison))
+		if (!empty($object->delivery_date))
 		{
 			$posy += 4;
 			$pdf->SetXY($posx - 90, $posy);
-			$pdf->MultiCell(190, 3, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_livraison, $usehourmin, false, $outputlangs, true), '', 'R');
+			$pdf->MultiCell(190, 3, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->delivery_date, $usehourmin, false, $outputlangs, true), '', 'R');
 		}
 
 		if ($object->thirdparty->code_fournisseur)
@@ -1283,9 +1283,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			//Recipient name
-			// On peut utiliser le nom de la societe du contact
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -1338,7 +1337,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'SUPPLIER_ORDER_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 }
diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
index 82d5dffa830..7fa99bd7453 100644
--- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
+++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
@@ -33,15 +33,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefou
 class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 	/**
 	 * @var string Nom du modele
@@ -56,17 +56,17 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
 	public $name = 'Orchidee';
 
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     * 	@return     string      Texte descripif
-     */
-    public function info()
-    {
-    	global $db, $conf, $langs;
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 * 	@return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $db, $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("bills", "admin"));
+		$langs->loadLangs(array("bills", "admin"));
 
 		$form = new Form($db);
 
@@ -95,20 +95,20 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Return an example of numbering
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-    	global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+		global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-    	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
 		if (!$numExample)
@@ -116,17 +116,17 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 *  Return next value
 	 *
 	 *  @param	Societe		$objsoc     Object third party
 	 *  @param  Object	    $object		Object
-     *  @return string      			Value if OK, 0 if KO
-	*/
-    public function getNextValue($objsoc = 0, $object = '')
-    {
+	 *  @return string      			Value if OK, 0 if KO
+	 */
+	public function getNextValue($objsoc = 0, $object = '')
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -146,17 +146,17 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Renvoie la reference de commande suivante non utilisee
-     *
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Renvoie la reference de commande suivante non utilisee
+	 *
 	 *  @param	Societe		$objsoc     Object third party
 	 *  @param  Object	    $object		Object
-     *  @return string      			Texte descripif
-     */
-    public function commande_get_num($objsoc = 0, $object = '')
-    {
-        // phpcs:enable
-        return $this->getNextValue($objsoc, $object);
-    }
+	 *  @return string      			Texte descripif
+	 */
+	public function commande_get_num($objsoc = 0, $object = '')
+	{
+		// phpcs:enable
+		return $this->getNextValue($objsoc, $object);
+	}
 }
diff --git a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
index dd5d6e55d7a..dcd48b25913 100644
--- a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
+++ b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
@@ -43,13 +43,13 @@ abstract class ModelePDFSuppliersOrders extends CommonDocGenerator
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of active generation models
 	 *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
 	 */
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
@@ -82,7 +82,7 @@ abstract class ModeleNumRefSuppliersOrders
 	 *
 	 *   @return	boolean     true if model can be used
 	 */
-    public function isEnabled()
+	public function isEnabled()
 	{
 		return true;
 	}
@@ -91,7 +91,7 @@ abstract class ModeleNumRefSuppliersOrders
 	 *
 	 *   @return    string      Description Text
 	 */
-    public function info()
+	public function info()
 	{
 		global $langs;
 		$langs->load("orders");
@@ -102,7 +102,7 @@ abstract class ModeleNumRefSuppliersOrders
 	 *
 	 *    @return   string      Example
 	 */
-    public function getExample()
+	public function getExample()
 	{
 		global $langs;
 		$langs->load("orders");
@@ -113,7 +113,7 @@ abstract class ModeleNumRefSuppliersOrders
 	 *
 	 *   @return	boolean     false if conflict, true if ok
 	 */
-    public function canBeActivated()
+	public function canBeActivated()
 	{
 		return true;
 	}
@@ -122,7 +122,7 @@ abstract class ModeleNumRefSuppliersOrders
 	 *
 	 *   @return     string      Valeur
 	 */
-    public function getNextValue()
+	public function getNextValue()
 	{
 		global $langs;
 		return $langs->trans("NotAvailable");
@@ -132,7 +132,7 @@ abstract class ModeleNumRefSuppliersOrders
 	 *
 	 *    @return     string      Value
 	 */
-    public function getVersion()
+	public function getVersion()
 	{
 		global $langs;
 		$langs->load("admin");
diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
index adccb15892b..19e78eb4ff9 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
@@ -139,8 +139,8 @@ class pdf_standard extends ModelePDFSuppliersPayments
 		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
 		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_multilang = 1; // Dispo en plusieurs langues
+		$this->option_logo = 1; // Display logo
+		$this->option_multilang = 1; // Available in several languages
 
 		// Define column position
 		$this->posxdate = $this->marge_gauche + 1;
@@ -168,7 +168,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 		$this->atleastoneratenotnull = 0;
 		$this->atleastonediscount = 0;
 
-		// Recupere emetteur
+		// Get source company
 		$this->emetteur = $mysoc;
 		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
 	}
@@ -267,7 +267,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 				$heightforinfotot = 50; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
 				$pdf->SetAutoPageBreak(1, 0);
 
 				if (class_exists('TCPDF'))
@@ -462,13 +462,13 @@ class pdf_standard extends ModelePDFSuppliersPayments
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
 
-				// Affiche zone cheèque
+				// Display check zone
 				$posy = $this->_tableau_cheque($pdf, $object, $bottomlasttab, $outputlangs);
 
 				// Affiche zone totaux
 				//$posy=$this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
 
-				// Pied de page
+				// Footer page
 				$this->_pagefoot($pdf, $object, $outputlangs);
 				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
 
@@ -798,7 +798,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'SUPPLIER_INVOICE_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 }
diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
index b6154d10375..394ac684485 100644
--- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
+++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
@@ -31,15 +31,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_payment/modules_supplier_
 class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 	/**
 	 * @var string Nom du modele
@@ -54,14 +54,14 @@ class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments
 	public $name = 'Brodator';
 
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     *  @return     string      Texte descripif
-     */
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
 	public function info()
-    {
-    	global $conf, $langs;
+	{
+		global $conf, $langs;
 
 		$langs->load("bills");
 
@@ -92,20 +92,20 @@ class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Return an example of numbering
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-     	global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+	 	global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-     	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$mysoc->code_client = 'CCCCCCCCCC';
+	 	$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
 		if (!$numExample)
@@ -113,7 +113,7 @@ class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 * 	Return next free value
@@ -122,8 +122,8 @@ class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    public function getNextValue($objsoc, $object)
-    {
+	public function getNextValue($objsoc, $object)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -143,17 +143,17 @@ class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return next free value
 	 *
 	 *  @param	Societe		$objsoc     Object third party
 	 * 	@param	string		$objforref	Object for number to search
 	 *  @return string      			Next free value
-     */
-    public function commande_get_num($objsoc, $objforref)
-    {
-        // phpcs:enable
-        return $this->getNextValue($objsoc, $objforref);
-    }
+	 */
+	public function commande_get_num($objsoc, $objforref)
+	{
+		// phpcs:enable
+		return $this->getNextValue($objsoc, $objforref);
+	}
 }
diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
index ea6c1574149..918f5fd9215 100644
--- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
@@ -45,15 +45,15 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-   * Dolibarr version of the loaded document
-   * @var string
-   */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 
@@ -67,7 +67,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
@@ -112,7 +112,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array('companies', 'errors'));
+		$langs->loadLangs(array('companies', 'errors'));
 
 		$form = new Form($this->db);
 
@@ -177,7 +177,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
    			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
    			foreach ($listoffiles as $file)
    			{
-                $texte .= $file['name'].'<br>';
+				$texte .= $file['name'].'<br>';
    			}
    			$texte .= '</div>';
 
@@ -220,7 +220,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to build a document on disk using the generic odt module.
 	 *
@@ -234,7 +234,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
@@ -274,6 +274,8 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				}
 			}
 
+			$object->fetch_thirdparty();
+
 			$dir = $conf->supplier_proposal->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
@@ -302,8 +304,8 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -328,15 +330,12 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 
 				// Recipient name
 				$contactobject = null;
-				if (!empty($usecontact))
-				{
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))
-					{
+				if (!empty($usecontact)) {
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 						$socobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
-						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+						// if we have a BILLING contact and we dont use it as recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
@@ -349,7 +348,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				'__FROM_EMAIL__' => $this->emetteur->email,
 				'__TOTAL_TTC__' => $object->total_ttc,
 				'__TOTAL_HT__' => $object->total_ht,
-				'__TOTAL_VAT__' => $object->total_vat
+				'__TOTAL_VAT__' => $object->total_tva
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
@@ -367,7 +366,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 							'PATH_TO_TMP'	  => $conf->supplier_proposal->dir_temp,
@@ -428,7 +427,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
@@ -484,7 +483,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -498,7 +497,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				} else {
@@ -506,7 +505,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index 06bdb462b18..27cfd949ca6 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -152,15 +152,16 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 		// Get source company
 		$this->emetteur = $mysoc;
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		if (empty($this->emetteur->country_code)) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		}
 
 		// Define position of columns
 		$this->posxdesc = $this->marge_gauche + 1;
 		$this->posxdiscount = 162;
 		$this->postotalht = 174;
 
-		if ($conf->global->PRODUCT_USE_UNITS)
-		{
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			$this->posxtva = 101;
 			$this->posxup = 118;
 			$this->posxqty = 135;
@@ -172,10 +173,11 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			$this->posxunit = 162;
 		}
 
-		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) $this->posxup = $this->posxtva;
+		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
+			$this->posxup = $this->posxtva;
+		}
 		$this->posxpicture = $this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$this->posxpicture -= 20;
 			$this->posxtva -= 20;
 			$this->posxup -= 20;
@@ -209,9 +211,13 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblines;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "supplier_proposal"));
@@ -220,17 +226,16 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 		// Loop on each lines to detect if there is at least one image to show
 		$realpatharray = array();
-		if (!empty($conf->global->MAIN_GENERATE_SUPPLIER_PROPOSAL_WITH_PICTURE))
-		{
-			for ($i = 0; $i < $nblines; $i++)
-			{
-				if (empty($object->lines[$i]->fk_product)) continue;
+		if (!empty($conf->global->MAIN_GENERATE_SUPPLIER_PROPOSAL_WITH_PICTURE)) {
+			for ($i = 0; $i < $nblines; $i++) {
+				if (empty($object->lines[$i]->fk_product)) {
+					continue;
+				}
 
 				$objphoto = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
 
-				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-				{
+				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
 					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				} else {
@@ -239,28 +244,29 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				}
 
 				$realpath = '';
-				foreach ($objphoto->liste_photos($dir, 1) as $key => $obj)
-				{
+				foreach ($objphoto->liste_photos($dir, 1) as $key => $obj) {
 					$filename = $obj['photo'];
 					//if ($obj['photo_vignette']) $filename='thumbs/'.$obj['photo_vignette'];
 					$realpath = $dir.$filename;
 					break;
 				}
 
-				if ($realpath) $realpatharray[$i] = $realpath;
+				if ($realpath) {
+					$realpatharray[$i] = $realpath;
+				}
 			}
 		}
-		if (count($realpatharray) == 0) $this->posxpicture = $this->posxtva;
+		if (count($realpatharray) == 0) {
+			$this->posxpicture = $this->posxtva;
+		}
 
-		if ($conf->supplier_proposal->dir_output)
-		{
+		if ($conf->supplier_proposal->dir_output) {
 			$object->fetch_thirdparty();
 
 			// $deja_regle = 0;
 
 			// Definition of $dir and $file
-			if ($object->specimen)
-			{
+			if ($object->specimen) {
 				$dir = $conf->supplier_proposal->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
@@ -269,20 +275,16 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				$file = $dir."/".$objectref.".pdf";
 			}
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -297,18 +299,18 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				$heightforinfotot = 50; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+					$heightforfooter += 6;
+				}
 				$pdf->SetAutoPageBreak(1, 0);
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-				{
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
@@ -322,20 +324,19 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("CommercialAsk")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Positionne $this->atleastonediscount si on a au moins une remise
-				for ($i = 0; $i < $nblines; $i++)
-				{
-					if ($object->lines[$i]->remise_percent)
-					{
+				for ($i = 0; $i < $nblines; $i++) {
+					if ($object->lines[$i]->remise_percent) {
 						$this->atleastonediscount++;
 					}
 				}
-				if (empty($this->atleastonediscount))
-				{
+				if (empty($this->atleastonediscount)) {
 					$delta = ($this->postotalht - $this->posxdiscount);
 					$this->posxpicture += $delta;
 					$this->posxtva += $delta;
@@ -348,7 +349,9 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -360,19 +363,18 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 				// Affiche notes
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
-				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
-				{
+				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE)) {
 					// Get first sale rep
-					if (is_object($object->thirdparty))
-					{
+					if (is_object($object->thirdparty)) {
 						$salereparray = $object->thirdparty->getSalesRepresentatives($user);
 						$salerepobj = new User($this->db);
 						$salerepobj->fetch($salereparray[0]['id']);
-						if (!empty($salerepobj->signature)) $notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
+						if (!empty($salerepobj->signature)) {
+							$notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
+						}
 					}
 				}
-				if ($notetoshow)
-				{
+				if ($notetoshow) {
 					$tab_top -= 2;
 
 					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
@@ -397,15 +399,16 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				$nexY = $tab_top + 7;
 
 				// Loop on each lines
-				for ($i = 0; $i < $nblines; $i++)
-				{
+				for ($i = 0; $i < $nblines; $i++) {
 					$curY = $nexY;
 					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
 					$pdf->SetTextColor(0, 0, 0);
 
 					// Define size of image if we need it
 					$imglinesize = array();
-					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					if (!empty($realpatharray[$i])) {
+						$imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					}
 
 					$pdf->setTopMargin($tab_top_newpage);
 					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
@@ -416,23 +419,27 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					$posYAfterDescription = 0;
 
 					// We start with Photo of product line
-					if (!empty($imglinesize['width']) && !empty($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// If photo too high, we moved completely on new page
-					{
+					if (!empty($imglinesize['width']) && !empty($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// If photo too high, we moved completely on new page
 						$pdf->AddPage('', '', true);
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 						$pdf->setPage($pageposbefore + 1);
 
 						$curY = $tab_top_newpage;
 
 						// Allows data in the first page if description is long enough to break in multiples pages
-						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 							$showpricebeforepagebreak = 1;
-						else $showpricebeforepagebreak = 0;
+						} else {
+							$showpricebeforepagebreak = 0;
+						}
 					}
 
-					if (!empty($imglinesize['width']) && !empty($imglinesize['height']))
-					{
+					if (!empty($imglinesize['width']) && !empty($imglinesize['height'])) {
 						$curX = $this->posxpicture - 1;
 						$pdf->Image($realpatharray[$i], $curX + (($this->posxtva - $this->posxpicture - $imglinesize['width']) / 2), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
 						// $pdf->Image does not increase value return by getY, so we save it manually
@@ -443,8 +450,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					$curX = $this->posxdesc - 1;
 
 					$pdf->startTransaction();
-					if ($posYAfterImage > 0)
-					{
+					if ($posYAfterImage > 0) {
 						$descWidth = $this->posxpicture - $curX;
 					} else {
 						$descWidth = $this->posxtva - $curX;
@@ -452,8 +458,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $descWidth, 3, $curX, $curY, $hideref, $hidedesc, 1);
 
 					$pageposafter = $pdf->getPage();
-					if ($pageposafter > $pageposbefore)	// There is a pagebreak
-					{
+					if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
@@ -463,21 +468,25 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						$pageposafter = $pdf->getPage();
 						$posyafter = $pdf->GetY();
 						//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
-						{
-							if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-							{
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
+							if ($i == ($nblines - 1)) {	// No more lines, and no space left to show total, so we create a new page
 								$pdf->AddPage('', '', true);
-								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+								if (!empty($tplidx)) {
+									$pdf->useTemplate($tplidx);
+								}
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+									$this->_pagehead($pdf, $object, 0, $outputlangs);
+								}
 								$pdf->setPage($pageposafter + 1);
 							}
 						} else {
 							// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
-							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 								$showpricebeforepagebreak = 1;
-							else $showpricebeforepagebreak = 0;
+							} else {
+								$showpricebeforepagebreak = 0;
+							}
 						}
 					} else // No pagebreak
 					{
@@ -513,7 +522,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					$pdf->SetXY($this->posxup, $curY);
 					if ($up_excl_tax > 0)
 						$pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, $up_excl_tax, 0, 'R', 0);
-                    */
+					*/
 
 					// Quantity
 					$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
@@ -521,8 +530,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					$pdf->MultiCell($this->posxunit - $this->posxqty - 0.8, 4, $qty, 0, 'R'); // Enough for 6 chars
 
 					// Unit
-					if ($conf->global->PRODUCT_USE_UNITS)
-					{
+					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
 						$pdf->SetXY($this->posxunit, $curY);
 						$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
@@ -542,11 +550,14 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					$pdf->SetXY($this->postotalht, $curY);
 					if ($total_excl_tax > 0)
 						$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
-                    */
+					*/
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
-					else $tvaligne = $object->lines[$i]->total_tva;
+					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+						$tvaligne = $object->lines[$i]->multicurrency_total_tva;
+					} else {
+						$tvaligne = $object->lines[$i]->total_tva;
+					}
 
 					$localtax1ligne = $object->lines[$i]->total_localtax1;
 					$localtax2ligne = $object->lines[$i]->total_localtax2;
@@ -555,36 +566,48 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					$localtax1_type = $object->lines[$i]->localtax1_type;
 					$localtax2_type = $object->lines[$i]->localtax2_type;
 
-					if ($object->remise_percent) $tvaligne -= ($tvaligne * $object->remise_percent) / 100;
-					if ($object->remise_percent) $localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
-					if ($object->remise_percent) $localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
+					if ($object->remise_percent) {
+						$tvaligne -= ($tvaligne * $object->remise_percent) / 100;
+					}
+					if ($object->remise_percent) {
+						$localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
+					}
+					if ($object->remise_percent) {
+						$localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
+					}
 
 					$vatrate = (string) $object->lines[$i]->tva_tx;
 
 					// Retrieve type from database for backward compatibility with old records
 					if ((!isset($localtax1_type) || $localtax1_type == '' || !isset($localtax2_type) || $localtax2_type == '') // if tax type not defined
-					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
-					{
+					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) { // and there is local tax
 						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
 						$localtax1_type = $localtaxtmp_array[0];
 						$localtax2_type = $localtaxtmp_array[2];
 					}
 
 					// retrieve global local tax
-					if ($localtax1_type && $localtax1ligne != 0)
+					if ($localtax1_type && $localtax1ligne != 0) {
 						$this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
-					if ($localtax2_type && $localtax2ligne != 0)
+					}
+					if ($localtax2_type && $localtax2ligne != 0) {
 						$this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
+					}
 
-					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate .= '*';
-					if (!isset($this->tva[$vatrate]))				$this->tva[$vatrate] = 0;
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
+						$vatrate .= '*';
+					}
+					if (!isset($this->tva[$vatrate])) {
+						$this->tva[$vatrate] = 0;
+					}
 					$this->tva[$vatrate] += $tvaligne;
 
-					if ($posYAfterImage > $posYAfterDescription) $nexY = $posYAfterImage;
+					if ($posYAfterImage > $posYAfterDescription) {
+						$nexY = $posYAfterImage;
+					}
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
-					{
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
 						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
@@ -595,11 +618,9 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					$nexY += 2; // Add space between lines
 
 					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
+					while ($pagenb < $pageposafter) {
 						$pdf->setPage($pagenb);
-						if ($pagenb == 1)
-						{
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
@@ -608,12 +629,12 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
-					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
-					{
-						if ($pagenb == 1)
-						{
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
@@ -621,15 +642,18 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
 				// Show square
-				if ($pagenb == 1)
-				{
+				if ($pagenb == 1) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				} else {
@@ -653,7 +677,9 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -664,14 +690,14 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				if (!empty($conf->global->MAIN_UMASK))
-				@chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (!empty($conf->global->MAIN_UMASK)) {
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -724,8 +750,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$posxval = 52;
 
 		// Show shipping date
-		if (!empty($object->date_livraison))
-		{
+		if (!empty($object->delivery_date)) {
 			$outputlangs->load("sendings");
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
@@ -733,7 +758,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			$pdf->MultiCell(80, 4, $titre, 0, 'L');
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posxval, $posy);
-			$dlp = dol_print_date($object->date_livraison, "daytext", false, $outputlangs, true);
+			$dlp = dol_print_date($object->delivery_date, "daytext", false, $outputlangs, true);
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
 			$posy = $pdf->GetY() + 1;
@@ -745,7 +770,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			$pdf->MultiCell(80, 4, $titre, 0, 'L');
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posxval, $posy);
-			//$dlp=dol_print_date($object->date_livraison,"daytext",false,$outputlangs,true);
+			//$dlp=dol_print_date($object->delivery_date,"daytext",false,$outputlangs,true);
 			$pdf->MultiCell(80, 4, '', 0, 'L');
 
 			$posy = $pdf->GetY() + 1;
@@ -768,8 +793,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		}*/
 
 		// Show payments conditions
-		if (empty($conf->global->SUPPLIER_PROPOSAL_PDF_HIDE_PAYMENTTERMCOND) && ($object->cond_reglement_code || $object->cond_reglement))
-		{
+		if (empty($conf->global->SUPPLIER_PROPOSAL_PDF_HIDE_PAYMENTTERMCOND) && ($object->cond_reglement_code || $object->cond_reglement)) {
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("PaymentConditions").':';
@@ -784,13 +808,11 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			$posy = $pdf->GetY() + 3;
 		}
 
-		if (!empty($conf->global->SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE))
-		{
+		if (!empty($conf->global->SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE)) {
 			// Show payment mode
 			if ($object->mode_reglement_code
 			&& $object->mode_reglement_code != 'CHQ'
-			&& $object->mode_reglement_code != 'VIR')
-			{
+			&& $object->mode_reglement_code != 'VIR') {
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->SetXY($this->marge_gauche, $posy - 2);
 				$titre = $outputlangs->transnoentities("PaymentMode").':';
@@ -804,15 +826,12 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			}
 
 			// Show payment mode CHQ
-			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
-			{
+			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ') {
 				// Si mode reglement non force ou si force a CHQ
-				if (!empty($conf->global->FACTURE_CHQ_NUMBER))
-				{
+				if (!empty($conf->global->FACTURE_CHQ_NUMBER)) {
 					$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
 
-					if ($conf->global->FACTURE_CHQ_NUMBER > 0)
-					{
+					if ($conf->global->FACTURE_CHQ_NUMBER > 0) {
 						$account = new Account($this->db);
 						$account->fetch($conf->global->FACTURE_CHQ_NUMBER);
 
@@ -821,23 +840,20 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->proprio), 0, 'L', 0);
 						$posy = $pdf->GetY() + 1;
 
-						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-						{
+						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
 							$posy = $pdf->GetY() + 2;
 						}
 					}
-					if ($conf->global->FACTURE_CHQ_NUMBER == -1)
-					{
+					if ($conf->global->FACTURE_CHQ_NUMBER == -1) {
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
 						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
 						$posy = $pdf->GetY() + 1;
 
-						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-						{
+						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
@@ -848,10 +864,8 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			}
 
 			// If payment mode not forced or forced to VIR, show payment with BAN
-			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
-			{
-				if (!empty($object->fk_bank) || !empty($conf->global->FACTURE_RIB_NUMBER))
-				{
+			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR') {
+				if (!empty($object->fk_bank) || !empty($conf->global->FACTURE_RIB_NUMBER)) {
 					$bankid = (empty($object->fk_bank) ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_bank);
 					$account = new Account($this->db);
 					$account->fetch($bankid);
@@ -893,8 +907,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 		// Tableau total
 		$col1x = 120; $col2x = 170;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$col2x -= 20;
 		}
 		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
@@ -914,32 +927,28 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$pdf->SetFillColor(248, 248, 248);
 
 		$this->atleastoneratenotnull = 0;
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-		{
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
 			$tvaisnull = ((!empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
-			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
-			{
+			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull) {
 				// Nothing to do
 			} else {
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
-				foreach ($this->localtax1 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('1', '3', '5'))) continue;
+				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
+					foreach ($localtax_rate as $tvakey => $tvaval) {
+						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -952,18 +961,17 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						}
 					}
 				}
-		  		//}
+				//}
 				//Local tax 2 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
-				foreach ($this->localtax2 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('1', '3', '5'))) continue;
+				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
+					foreach ($localtax_rate as $tvakey => $tvaval) {
+						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
 
@@ -972,8 +980,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -988,18 +995,15 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				}
 				//}
 				// VAT
-				foreach ($this->tva as $tvakey => $tvaval)
-				{
-					if ($tvakey > 0)    // On affiche pas taux 0
-					{
+				foreach ($this->tva as $tvakey => $tvaval) {
+					if ($tvakey > 0) {    // On affiche pas taux 0
 						$this->atleastoneratenotnull++;
 
 						$index++;
 						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 						$tvacompl = '';
-						if (preg_match('/\*/', $tvakey))
-						{
+						if (preg_match('/\*/', $tvakey)) {
 							$tvakey = str_replace('*', '', $tvakey);
 							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 						}
@@ -1015,22 +1019,20 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				//Local tax 1 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
-				foreach ($this->localtax1 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
+				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
+					foreach ($localtax_rate as $tvakey => $tvaval) {
+						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -1043,27 +1045,25 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						}
 					}
 				}
-		  		//}
+				//}
 				//Local tax 2 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
-				foreach ($this->localtax2 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
+				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
+					foreach ($localtax_rate as $tvakey => $tvaval) {
 						// retrieve global local tax
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
+						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -1094,7 +1094,9 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$pdf->SetTextColor(0, 0, 0);
 
 		$resteapayer = $object->total_ttc - $deja_regle;
-		if (!empty($object->paye)) $resteapayer = 0;
+		if (!empty($object->paye)) {
+			$resteapayer = 0;
+		}
 
 		if ($deja_regle > 0) {
 			$index++;
@@ -1158,7 +1160,9 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -1167,14 +1171,15 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$pdf->SetTextColor(0, 0, 0);
 		$pdf->SetFont('', '', $default_font_size - 2);
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) {
+				$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			}
 		}
 
 		$pdf->SetDrawColor(128, 128, 128);
@@ -1183,40 +1188,35 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		// Output Rect
 		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5); // line takes a position y in 2nd parameter and 4th parameter
 
 			$pdf->SetXY($this->posxdesc - 1, $tab_top + 1);
 			$pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
 		}
 
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-		{
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
 			$pdf->line($this->posxtva, $tab_top, $this->posxtva, $tab_top + $tab_height);
 			//$pdf->line($this->posxtva-2, $tab_top, $this->posxtva-2, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
+			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxtva - 5, $tab_top + 1);
 				$pdf->MultiCell($this->posxup - $this->posxtva + 3, 2, $outputlangs->transnoentities("VAT"), '', 'C');
 			}
 		}
 
 		$pdf->line($this->posxup - 3, $tab_top, $this->posxup - 3, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxup - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxqty - $this->posxup - 1, 2, $outputlangs->transnoentities("PriceUHT"), '', 'C');
 		}
 
 		$pdf->line($this->posxqty - 1, $tab_top, $this->posxqty - 1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxqty - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
 		}
 
-		if ($conf->global->PRODUCT_USE_UNITS) {
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxunit - 1, $tab_top + 1);
@@ -1225,20 +1225,16 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		}
 
 		$pdf->line($this->posxdiscount - 1, $tab_top, $this->posxdiscount - 1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
-			if ($this->atleastonediscount)
-			{
+		if (empty($hidetop)) {
+			if ($this->atleastonediscount) {
 				$pdf->SetXY($this->posxdiscount - 1, $tab_top + 1);
 				$pdf->MultiCell($this->postotalht - $this->posxdiscount + 1, 2, $outputlangs->transnoentities("ReductionShort"), '', 'C');
 			}
 		}
-		if ($this->atleastonediscount)
-		{
+		if ($this->atleastonediscount) {
 			$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
 		}
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->postotalht - 1, $tab_top + 1);
 			$pdf->MultiCell(30, 2, $outputlangs->transnoentities("TotalHT"), '', 'C');
 		}
@@ -1266,8 +1262,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		//  Show Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->SUPPLIER_PROPOSAL_DRAFT_WATERMARK)))
-		{
+		if ($object->statut == 0 && (!empty($conf->global->SUPPLIER_PROPOSAL_DRAFT_WATERMARK))) {
 			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->SUPPLIER_PROPOSAL_DRAFT_WATERMARK);
 		}
 
@@ -1281,10 +1276,8 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 		// Logo
 		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
-		if ($this->emetteur->logo)
-		{
-			if (is_readable($logo))
-			{
+		if ($this->emetteur->logo) {
+			if (is_readable($logo)) {
 				$height = pdf_getHeightForLogo($logo);
 				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			} else {
@@ -1314,8 +1307,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$posy += 1;
 		$pdf->SetFont('', '', $default_font_size - 2);
 
-		if ($object->ref_client)
-		{
+		if ($object->ref_client) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1325,11 +1317,10 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$posy+=4;
 		$pdf->SetXY($posx,$posy);
 		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("SupplierProposalDate")." : " . dol_print_date($object->date_livraison, "day", false, $outputlangs, true), '', 'R');
-        */
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("SupplierProposalDate")." : " . dol_print_date($object->delivery_date, "day", false, $outputlangs, true), '', 'R');
+		*/
 
-		if ($object->thirdparty->code_fournisseur)
-		{
+		if ($object->thirdparty->code_fournisseur) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1337,11 +1328,9 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		}
 
 		// Get contact
-		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
-		{
+		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP)) {
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$usertmp = new User($this->db);
 				$usertmp->fetch($arrayidcontact[0]);
 				$posy += 4;
@@ -1357,30 +1346,29 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		// Show list of linked objects
 		$current_y = $pdf->getY();
 		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
-		if ($current_y < $pdf->getY())
-		{
+		if ($current_y < $pdf->getY()) {
 			$top_shift = $pdf->getY() - $current_y;
 		}
 
-		if ($showaddress)
-		{
+		if ($showaddress) {
 			// Sender properties
 			$carac_emetteur = '';
-		 	// Add internal contact of proposal if defined
+			// Add internal contact of proposal if defined
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-		 	if (count($arrayidcontact) > 0)
-		 	{
-		 		$object->fetch_user($arrayidcontact[0]);
-		 		$labelbeforecontactname = ($outputlangs->transnoentities("FromContactName") != 'FromContactName' ? $outputlangs->transnoentities("FromContactName") : $outputlangs->transnoentities("Name"));
-		 		$carac_emetteur .= ($carac_emetteur ? "\n" : '').$labelbeforecontactname.": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
-		 	}
+			if (count($arrayidcontact) > 0) {
+				$object->fetch_user($arrayidcontact[0]);
+				$labelbeforecontactname = ($outputlangs->transnoentities("FromContactName") != 'FromContactName' ? $outputlangs->transnoentities("FromContactName") : $outputlangs->transnoentities("Name"));
+				$carac_emetteur .= ($carac_emetteur ? "\n" : '').$labelbeforecontactname.": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
+			}
 
-		 	$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
+			$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
 
 			// Show sender
 			$posy = 42 + $top_shift;
-		 	$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
+			$posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->page_largeur - $this->marge_droite - 80;
+			}
 			$hautcadre = 40;
 
 			// Show sender frame
@@ -1408,31 +1396,36 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			// If CUSTOMER contact defined, we use it
 			$usecontact = false;
 			$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$usecontact = true;
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
 			// Recipient name
-			if (!empty($usecontact))
-			{
-				// On peut utiliser le nom de la societe du contact
-				if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname;
-				else $socname = $object->thirdparty->name;
-				$carac_client_name = $outputlangs->convToOutputCharset($socname);
+			if (!empty($usecontact)) {
+				if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+					$socname = $object->contact;
+				} else {
+					$socname = $object->thirdparty;
+				}
 			} else {
-				$carac_client_name = $outputlangs->convToOutputCharset($object->thirdparty->name);
+				$socname = $object->thirdparty;
 			}
 
+			$carac_client_name = pdfBuildThirdpartyName($socname, $outputlangs);
+
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, 'target', $object);
 
 			// Show recipient
 			$widthrecbox = 100;
-			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			if ($this->page_largeur < 210) {
+				$widthrecbox = 84; // To work with US executive format
+			}
 			$posy = 42 + $top_shift;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0, 0, 0);
@@ -1469,7 +1462,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'SUPPLIER_PROPOSAL_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 }
diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
index 036edd251dd..4abb7cb07f1 100644
--- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
+++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
@@ -34,15 +34,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_proposal/modules_supplier
 class mod_supplier_proposal_saphir extends ModeleNumRefSupplierProposal
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 	/**
 	 * @var string Nom du modele
@@ -57,14 +57,14 @@ class mod_supplier_proposal_saphir extends ModeleNumRefSupplierProposal
 	public $name = 'Saphir';
 
 
-    /**
-     *  Return description of module
-     *
-     *  @return     string      Texte descripif
-     */
-    public function info()
-    {
-    	global $conf, $langs, $db;
+	/**
+	 *  Return description of module
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $conf, $langs, $db;
 
 		$langs->load("bills");
 
@@ -95,20 +95,20 @@ class mod_supplier_proposal_saphir extends ModeleNumRefSupplierProposal
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Return an example of numbering
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-     	global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+	 	global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-     	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$mysoc->code_client = 'CCCCCCCCCC';
+	 	$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
 		if (!$numExample)
@@ -116,7 +116,7 @@ class mod_supplier_proposal_saphir extends ModeleNumRefSupplierProposal
 			$numExample = 'NotConfigured';
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 *  Return next value
diff --git a/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
index b354f114be2..4e32817ff19 100644
--- a/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
+++ b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
@@ -42,17 +42,17 @@ abstract class ModelePDFSupplierProposal extends CommonDocGenerator
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return list of active generation modules
-     *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return list of active generation modules
+	 *
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
 	 */
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'supplier_proposal';
diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index 4f70dc6544c..cac16178c92 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -7,8 +7,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/syslog/logHandler.php';
  */
 class mod_syslog_file extends LogHandler implements LogHandlerInterface
 {
-    public $code = 'file';
-    public $lastTime = 0;
+	public $code = 'file';
+	public $lastTime = 0;
 
 	/**
 	 * 	Return name of logger
@@ -51,7 +51,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 	 */
 	public function isActive()
 	{
-	    global $conf;
+		global $conf;
 		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_FILE) ? 1 : 0; // Set SYSLOG_DISABLE_LOGHANDLER_FILE to 1 to disable this loghandler
 	}
 
@@ -103,24 +103,24 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 	 */
 	private function getFilename($suffixinfilename = '')
 	{
-	    global $conf;
+		global $conf;
 
-	    if (empty($conf->global->SYSLOG_FILE)) $tmp = DOL_DATA_ROOT.'/dolibarr.log';
-	    else $tmp = str_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, $conf->global->SYSLOG_FILE);
+		if (empty($conf->global->SYSLOG_FILE)) $tmp = DOL_DATA_ROOT.'/dolibarr.log';
+		else $tmp = str_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, $conf->global->SYSLOG_FILE);
 
-	    if (!empty($conf->global->SYSLOG_FILE_ONEPERSESSION))
-	    {
-	    	if ($conf->global->SYSLOG_FILE_ONEPERSESSION == 1)	// file depend on session key name (Note that session name is same for all users and is not a per user value)
-	    	{
-	        	$suffixinfilename .= '_'.session_name();
-	    	}
-	    	if ($conf->global->SYSLOG_FILE_ONEPERSESSION == 2)	// file depend on session value sor per user
-	    	{
-	    		$suffixinfilename .= '_'.session_name().'_'.$_SERVER["REMOTE_ADDR"];
-	    	}
-	    }
+		if (!empty($conf->global->SYSLOG_FILE_ONEPERSESSION))
+		{
+			if ($conf->global->SYSLOG_FILE_ONEPERSESSION == 1)	// file depend on session key name (Note that session name is same for all users and is not a per user value)
+			{
+				$suffixinfilename .= '_'.session_name();
+			}
+			if ($conf->global->SYSLOG_FILE_ONEPERSESSION == 2)	// file depend on session value sor per user
+			{
+				$suffixinfilename .= '_'.session_name().'_'.$_SERVER["REMOTE_ADDR"];
+			}
+		}
 
-	    return $suffixinfilename ?preg_replace('/\.log$/i', $suffixinfilename.'.log', $tmp) : $tmp;
+		return $suffixinfilename ?preg_replace('/\.log$/i', $suffixinfilename.'.log', $tmp) : $tmp;
 	}
 
 	/**
diff --git a/htdocs/core/modules/syslog/mod_syslog_syslog.php b/htdocs/core/modules/syslog/mod_syslog_syslog.php
index 58fb5f632bf..0ac23c0bda4 100644
--- a/htdocs/core/modules/syslog/mod_syslog_syslog.php
+++ b/htdocs/core/modules/syslog/mod_syslog_syslog.php
@@ -7,7 +7,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/syslog/logHandler.php';
  */
 class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 {
-    public $code = 'syslog';
+	public $code = 'syslog';
 
 	/**
 	 * 	Return name of logger
@@ -48,7 +48,7 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 	 */
 	public function isActive()
 	{
-	    global $conf;
+		global $conf;
 
 		// This function does not exists on some ISP (Ex: Free in France)
 		if (!function_exists('openlog')) return 0;
@@ -85,15 +85,15 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 
 		$errors = array();
 
-	    $facility = constant($conf->global->SYSLOG_FACILITY);
-	    if ($facility)
+		$facility = constant($conf->global->SYSLOG_FACILITY);
+		if ($facility)
 		{
 			// Only LOG_USER supported on Windows
 			if (!empty($_SERVER["WINDIR"])) $facility = constant('LOG_USER');
 
 			dol_syslog("admin/syslog: facility ".$facility);
 		} else {
-		    $errors[] = $langs->trans("ErrorUnknownSyslogConstant", $facility);
+			$errors[] = $langs->trans("ErrorUnknownSyslogConstant", $facility);
 		}
 
 		return $errors;
diff --git a/htdocs/core/modules/takepos/mod_takepos_ref_simple.php b/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
index f4de0f6646e..57e87006559 100644
--- a/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
+++ b/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
@@ -35,7 +35,7 @@ class mod_takepos_ref_simple extends ModeleNumRefTakepos
 	 * Dolibarr version of the loaded document 'development', 'experimental', 'dolibarr'
 	 * @var string
 	 */
-    public $version = 'dolibarr';
+	public $version = 'dolibarr';
 
 	/**
 	 * Prefix
@@ -54,141 +54,141 @@ class mod_takepos_ref_simple extends ModeleNumRefTakepos
 	 */
 	public $nom = 'Simple';
 
-    /**
-     *  Return description of numbering module
-     *
-     * @return     string      Text with description
-     */
+	/**
+	 *  Return description of numbering module
+	 *
+	 * @return     string      Text with description
+	 */
 	public function info()
-    {
-        global $langs;
+	{
+		global $langs;
 
-        return $langs->trans('SimpleNumRefModelDesc', $this->prefix.'0-');
-    }
+		return $langs->trans('SimpleNumRefModelDesc', $this->prefix.'0-');
+	}
 
-    /**
-     *  Return an example of numbering module values
-     *
-     * @return     string      Example
-     */
+	/**
+	 *  Return an example of numbering module values
+	 *
+	 * @return     string      Example
+	 */
 	public function getExample()
-    {
-        return $this->prefix.'0-0501-0001';
-    }
+	{
+		return $this->prefix.'0-0501-0001';
+	}
 
-    /**
-     *  Test si les numeros deja en vigueur dans la base ne provoquent pas de
-     *  de conflits qui empechera cette numerotation de fonctionner.
-     *
-     * @return     boolean     false si conflit, true si ok
-     */
+	/**
+	 *  Test si les numeros deja en vigueur dans la base ne provoquent pas de
+	 *  de conflits qui empechera cette numerotation de fonctionner.
+	 *
+	 * @return     boolean     false si conflit, true si ok
+	 */
 	public function canBeActivated()
-    {
-        global $conf, $langs, $db;
+	{
+		global $conf, $langs, $db;
 
-        $pryymm = '';
-        $max = '';
+		$pryymm = '';
+		$max = '';
 
-        $pos_source = 0;
+		$pos_source = 0;
 
-        // First, we get the max value
-        $posindice = strlen($this->prefix.$pos_source.'-____-') + 1;
+		// First, we get the max value
+		$posindice = strlen($this->prefix.$pos_source.'-____-') + 1;
 
-        $sql  = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-        $sql .= " FROM ".MAIN_DB_PREFIX."facture";
-        $sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-        $sql .= " AND entity = ".$conf->entity;
+		$sql  = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-        $resql = $db->query($sql);
-        if ($resql) {
-            $row = $db->fetch_row($resql);
-            if ($row) {
-                $pryymm = substr($row[0], 0, 6);
-                $max = $row[0];
-            }
-        }
+		$resql = $db->query($sql);
+		if ($resql) {
+			$row = $db->fetch_row($resql);
+			if ($row) {
+				$pryymm = substr($row[0], 0, 6);
+				$max = $row[0];
+			}
+		}
 
-        if (!$pryymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $pryymm)) {
-            return true;
-        } else {
-            $langs->load("errors");
-            $this->error = $langs->trans('ErrorNumRefModel', $max);
-            return false;
-        }
-    }
+		if (!$pryymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $pryymm)) {
+			return true;
+		} else {
+			$langs->load("errors");
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
+			return false;
+		}
+	}
 
-    /**
-     *  Return next value
-     *
-     * @param   Societe     $objsoc     Object third party
-     * @param   Facture		$invoice	Object invoice
-     * @param   string		$mode       'next' for next value or 'last' for last value
-     * @return  string      Next value
-     */
+	/**
+	 *  Return next value
+	 *
+	 * @param   Societe     $objsoc     Object third party
+	 * @param   Facture		$invoice	Object invoice
+	 * @param   string		$mode       'next' for next value or 'last' for last value
+	 * @return  string      Next value
+	 */
 	public function getNextValue($objsoc = null, $invoice = null, $mode = 'next')
-    {
-        global $db;
+	{
+		global $db;
 
-        $pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0;
+		$pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0;
 
-        // First, we get the max value
-        $posindice = strlen($this->prefix.$pos_source.'-____-') + 1;
-        $sql  = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
-        $sql .= " FROM ".MAIN_DB_PREFIX."facture";
-        $sql .= " WHERE ref LIKE '".$db->escape($this->prefix.$pos_source)."-____-%'";
-        $sql .= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
+		// First, we get the max value
+		$posindice = strlen($this->prefix.$pos_source.'-____-') + 1;
+		$sql  = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix.$pos_source)."-____-%'";
+		$sql .= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
 
-        $resql = $db->query($sql);
-        if ($resql) {
-            $obj = $db->fetch_object($resql);
-            if ($obj) $max = intval($obj->max);
-            else $max = 0;
-        } else {
-            dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
-            return -1;
-        }
+		$resql = $db->query($sql);
+		if ($resql) {
+			$obj = $db->fetch_object($resql);
+			if ($obj) $max = intval($obj->max);
+			else $max = 0;
+		} else {
+			dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
+			return -1;
+		}
 
-        if ($mode == 'last')
-        {
-            if ($max >= (pow(10, 4) - 1)) $num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
-            else $num = sprintf("%04s", $max);
+		if ($mode == 'last')
+		{
+			if ($max >= (pow(10, 4) - 1)) $num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
+			else $num = sprintf("%04s", $max);
 
-            $ref = '';
-            $sql  = "SELECT ref as ref";
-            $sql .= " FROM ".MAIN_DB_PREFIX."facture";
-            $sql .= " WHERE ref LIKE '".$db->escape($this->prefix.$pos_source)."-____-".$num."'";
-            $sql .= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
-            $sql .= " ORDER BY ref DESC";
+			$ref = '';
+			$sql  = "SELECT ref as ref";
+			$sql .= " FROM ".MAIN_DB_PREFIX."facture";
+			$sql .= " WHERE ref LIKE '".$db->escape($this->prefix.$pos_source)."-____-".$num."'";
+			$sql .= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
+			$sql .= " ORDER BY ref DESC";
 
-            $resql = $db->query($sql);
-            if ($resql) {
-                $obj = $db->fetch_object($resql);
-                if ($obj) $ref = $obj->ref;
-            } else dol_print_error($db);
+			$resql = $db->query($sql);
+			if ($resql) {
+				$obj = $db->fetch_object($resql);
+				if ($obj) $ref = $obj->ref;
+			} else dol_print_error($db);
 
-            return $ref;
-        } elseif ($mode == 'next')
-        {
-            $date = $invoice->date; // This is invoice date (not creation date)
-            $yymm = strftime("%y%m", $date);
+			return $ref;
+		} elseif ($mode == 'next')
+		{
+			$date = $invoice->date; // This is invoice date (not creation date)
+			$yymm = strftime("%y%m", $date);
 
-            if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-            else $num = sprintf("%04s", $max + 1);
+			if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+			else $num = sprintf("%04s", $max + 1);
 
-            dol_syslog(get_class($this)."::getNextValue return ".$this->prefix.$pos_source.'-'.$yymm.'-'.$num);
-            return $this->prefix.$pos_source.'-'.$yymm.'-'.$num;
-        } else dol_print_error('', 'Bad parameter for getNextValue');
-    }
+			dol_syslog(get_class($this)."::getNextValue return ".$this->prefix.$pos_source.'-'.$yymm.'-'.$num);
+			return $this->prefix.$pos_source.'-'.$yymm.'-'.$num;
+		} else dol_print_error('', 'Bad parameter for getNextValue');
+	}
 
-    /**
-     *  Return next free value
-     *
-     * @param       Societe     $objsoc         Object third party
-     * @param       Object      $objforref      Object for number to search
-     * @return      string      Next free value
-     */
+	/**
+	 *  Return next free value
+	 *
+	 * @param       Societe     $objsoc         Object third party
+	 * @param       Object      $objforref      Object for number to search
+	 * @return      string      Next free value
+	 */
 	public function getNumRef($objsoc, $objforref)
-    {
-        return $this->getNextValue($objsoc, $objforref);
-    }
+	{
+		return $this->getNextValue($objsoc, $objforref);
+	}
 }
diff --git a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
index 405bcfc6dcb..e6487db6ed1 100644
--- a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
+++ b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
@@ -50,109 +50,109 @@ class mod_takepos_ref_universal extends ModeleNumRefTakepos
 	 */
 	public $nom = 'Universal';
 
-    /**
-     *  Renvoi la description du modele de numerotation
-     *
-     * @return     string      Texte descripif
-     */
+	/**
+	 *  Renvoi la description du modele de numerotation
+	 *
+	 * @return     string      Texte descripif
+	 */
 	public function info()
-    {
-        global $conf, $langs;
+	{
+		global $conf, $langs;
 
-        $langs->load('cashdesk@cashdesk');
+		$langs->load('cashdesk@cashdesk');
 
-        $form = new Form($this->db);
+		$form = new Form($this->db);
 
-        $texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-        $texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-        $texte .= '<input type="hidden" name="token" value="'.newToken().'">';
-        $texte .= '<input type="hidden" name="action" value="updateMask">';
-        $texte .= '<input type="hidden" name="maskconst" value="TAKEPOS_REF_UNIVERSAL_MASK">';
-        $texte .= '<table class="nobordernopadding" width="100%">';
+		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
+		$texte .= '<input type="hidden" name="action" value="updateMask">';
+		$texte .= '<input type="hidden" name="maskconst" value="TAKEPOS_REF_UNIVERSAL_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
 
-        $tooltip = $langs->trans('GenericMaskCodes', $langs->transnoentities('CashDesk'), $langs->transnoentities('CashDesk'));
-        $tooltip .= $langs->trans('GenericMaskCodes2');
-        $tooltip .= $langs->trans('GenericMaskCodes3');
-        $tooltip .= $langs->trans('GenericMaskCodes4a', $langs->transnoentities('CashDesk'), $langs->transnoentities('CashDesk'));
-        $tooltip .= $langs->trans('GenericMaskCodes5');
-        $tooltip .= $langs->trans('CashDeskGenericMaskCodes6');
+		$tooltip = $langs->trans('GenericMaskCodes', $langs->transnoentities('CashDesk'), $langs->transnoentities('CashDesk'));
+		$tooltip .= $langs->trans('GenericMaskCodes2');
+		$tooltip .= $langs->trans('GenericMaskCodes3');
+		$tooltip .= $langs->trans('GenericMaskCodes4a', $langs->transnoentities('CashDesk'), $langs->transnoentities('CashDesk'));
+		$tooltip .= $langs->trans('GenericMaskCodes5');
+		$tooltip .= $langs->trans('CashDeskGenericMaskCodes6');
 
-        // Parametrage du prefix
-        $texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-        $texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskvalue" value="'.$conf->global->TAKEPOS_REF_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
+		// Parametrage du prefix
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskvalue" value="'.$conf->global->TAKEPOS_REF_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
 
-        $texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-        $texte .= '</tr>';
+		$texte .= '</tr>';
 
-        $texte .= '</table>';
-        $texte .= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
-        return $texte;
-    }
+		return $texte;
+	}
 
-    /**
-     * Renvoi un exemple de numerotation
-     *
-     * @return     string      Example
-     */
+	/**
+	 * Renvoi un exemple de numerotation
+	 *
+	 * @return     string      Example
+	 */
 	public function getExample()
-    {
-        global $conf, $langs, $mysoc;
+	{
+		global $conf, $langs, $mysoc;
 
-        $old_code_client = $mysoc->code_client;
-        $mysoc->code_client = 'CCCCCCCCCC';
-        $numExample = $this->getNextValue($mysoc, '');
-        $mysoc->code_client = $old_code_client;
+		$old_code_client = $mysoc->code_client;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$numExample = $this->getNextValue($mysoc, '');
+		$mysoc->code_client = $old_code_client;
 
-        if (!$numExample) {
-            $numExample = $langs->trans('NotConfigured');
-        }
-        return $numExample;
-    }
+		if (!$numExample) {
+			$numExample = $langs->trans('NotConfigured');
+		}
+		return $numExample;
+	}
 
-    /**
-     * Return next free value
-     *
-     * @param   Societe     $objsoc     Object thirdparty
-     * @param   Facture		$invoice	Object invoice
-     * @param   string		$mode       'next' for next value or 'last' for last value
-     * @return  string      Value if KO, <0 if KO
-     */
+	/**
+	 * Return next free value
+	 *
+	 * @param   Societe     $objsoc     Object thirdparty
+	 * @param   Facture		$invoice	Object invoice
+	 * @param   string		$mode       'next' for next value or 'last' for last value
+	 * @return  string      Value if KO, <0 if KO
+	 */
 	public function getNextValue($objsoc = 0, $invoice = null, $mode = 'next')
-    {
-        global $db, $conf;
+	{
+		global $db, $conf;
 
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-        // On defini critere recherche compteur
-        $mask = $conf->global->TAKEPOS_REF_UNIVERSAL_MASK;
+		// On defini critere recherche compteur
+		$mask = $conf->global->TAKEPOS_REF_UNIVERSAL_MASK;
 
-        if (!$mask) {
-            $this->error = 'NotConfigured';
-            return 0;
-        }
+		if (!$mask) {
+			$this->error = 'NotConfigured';
+			return 0;
+		}
 
-        // Get entities
-        $entity = getEntity('invoicenumber', 1, $invoice);
+		// Get entities
+		$entity = getEntity('invoicenumber', 1, $invoice);
 
-        $pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0;
-	    $mask = str_replace('{TN}', $pos_source, $mask);
-        $numFinal = get_next_value($db, $mask, 'facture', 'ref', '', $objsoc, $invoice->date, $mode, false, null, $entity);
+		$pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0;
+		$mask = str_replace('{TN}', $pos_source, $mask);
+		$numFinal = get_next_value($db, $mask, 'facture', 'ref', '', $objsoc, $invoice->date, $mode, false, null, $entity);
 
-        return $numFinal;
-    }
+		return $numFinal;
+	}
 
 
-    /**
-     * Return next free value
-     *
-     * @param   Societe     $objsoc         Object third party
-     * @param   Object      $objforref      Object for number to search
-     * @return  string      Next free value
-     */
+	/**
+	 * Return next free value
+	 *
+	 * @param   Societe     $objsoc         Object third party
+	 * @param   Object      $objforref      Object for number to search
+	 * @return  string      Next free value
+	 */
 	public function getNumRef($objsoc, $objforref)
-    {
-        return $this->getNextValue($objsoc, $objforref);
-    }
+	{
+		return $this->getNextValue($objsoc, $objforref);
+	}
 }
diff --git a/htdocs/core/modules/ticket/mod_ticket_simple.php b/htdocs/core/modules/ticket/mod_ticket_simple.php
index 679224c5357..2badaf4a33f 100644
--- a/htdocs/core/modules/ticket/mod_ticket_simple.php
+++ b/htdocs/core/modules/ticket/mod_ticket_simple.php
@@ -115,9 +115,9 @@ class mod_ticket_simple extends ModeleNumRefTicket
 	/**
 	 *  Return next value
 	 *
-	 *  @param  Societe $objsoc    Object third party
-	 *  @param  Project $ticket Object ticket
-	 *  @return string                Value if OK, 0 if KO
+	 *  @param  Societe $objsoc    	Object third party
+	 *  @param  Ticket 	$ticket 	Object ticket
+	 *  @return string              Value if OK, 0 if KO
 	 */
 	public function getNextValue($objsoc, $ticket)
 	{
diff --git a/htdocs/core/modules/ticket/mod_ticket_universal.php b/htdocs/core/modules/ticket/mod_ticket_universal.php
index 010eb973f9b..1a528359221 100644
--- a/htdocs/core/modules/ticket/mod_ticket_universal.php
+++ b/htdocs/core/modules/ticket/mod_ticket_universal.php
@@ -29,18 +29,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/ticket/modules_ticket.php';
  */
 class mod_ticket_universal extends ModeleNumRefTicket
 {
-    /**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
-    public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
-    /**
+	/**
 	 * @var string Nom du modele
 	 * @deprecated
 	 * @see $name
@@ -52,91 +52,91 @@ class mod_ticket_universal extends ModeleNumRefTicket
 	 */
 	public $name = 'Universal';
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     *  @return string      Texte descripif
-     */
-    public function info()
-    {
-        global $db, $conf, $langs;
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return string      Texte descripif
+	 */
+	public function info()
+	{
+		global $db, $conf, $langs;
 
-        // Load translation files required by the page
-        $langs->loadLangs(array("ticket", "admin"));
+		// Load translation files required by the page
+		$langs->loadLangs(array("ticket", "admin"));
 
-        $form = new Form($db);
+		$form = new Form($db);
 
-        $texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-        $texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-        $texte .= '<input type="hidden" name="token" value="'.newToken().'">';
-        $texte .= '<input type="hidden" name="action" value="updateMask">';
-        $texte .= '<input type="hidden" name="maskconstticket" value="TICKET_UNIVERSAL_MASK">';
-        $texte .= '<table class="nobordernopadding" width="100%">';
+		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
+		$texte .= '<input type="hidden" name="action" value="updateMask">';
+		$texte .= '<input type="hidden" name="maskconstticket" value="TICKET_UNIVERSAL_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
 
-        $tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Ticket"), $langs->transnoentities("Ticket"));
-        $tooltip .= $langs->trans("GenericMaskCodes2");
-        $tooltip .= $langs->trans("GenericMaskCodes3");
-        $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Ticket"), $langs->transnoentities("Ticket"));
-        $tooltip .= $langs->trans("GenericMaskCodes5");
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Ticket"), $langs->transnoentities("Ticket"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Ticket"), $langs->transnoentities("Ticket"));
+		$tooltip .= $langs->trans("GenericMaskCodes5");
 
-        // Parametrage du prefix
-        $texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-        $texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskticket" value="'.$conf->global->TICKET_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
+		// Parametrage du prefix
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskticket" value="'.$conf->global->TICKET_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
 
-        $texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-        $texte .= '</tr>';
+		$texte .= '</tr>';
 
-        $texte .= '</table>';
-        $texte .= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
-        return $texte;
-    }
+		return $texte;
+	}
 
-    /**
-     *  Return an example of numbering
-     *
-     *  @return string      Example
-     */
-    public function getExample()
-    {
-        global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return string      Example
+	 */
+	public function getExample()
+	{
+		global $conf, $langs, $mysoc;
 
-        $old_code_client = $mysoc->code_client;
-        $mysoc->code_client = 'CCCCCCCCCC';
-        $numExample = $this->getNextValue($mysoc, '');
-        $mysoc->code_client = $old_code_client;
+		$old_code_client = $mysoc->code_client;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$numExample = $this->getNextValue($mysoc, '');
+		$mysoc->code_client = $old_code_client;
 
-        if (!$numExample) {
-            $numExample = $langs->trans('NotConfigured');
-        }
-        return $numExample;
-    }
+		if (!$numExample) {
+			$numExample = $langs->trans('NotConfigured');
+		}
+		return $numExample;
+	}
 
-    /**
-     *  Return next value
-     *
-     *  @param  Societe $objsoc    Object third party
-     *  @param  Project $ticket Object ticket
-     *  @return string                    Value if OK, 0 if KO
-     */
-    public function getNextValue($objsoc, $ticket)
-    {
-        global $db, $conf;
+	/**
+	 *  Return next value
+	 *
+	 *  @param  Societe $objsoc     Object third party
+	 *  @param  Ticket  $ticket 	Object ticket
+	 *  @return string              Value if OK, 0 if KO
+	 */
+	public function getNextValue($objsoc, $ticket)
+	{
+		global $db, $conf;
 
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-        // On defini critere recherche compteur
-        $mask = $conf->global->TICKET_UNIVERSAL_MASK;
+		// On defini critere recherche compteur
+		$mask = $conf->global->TICKET_UNIVERSAL_MASK;
 
-        if (!$mask) {
-            $this->error = 'NotConfigured';
-            return 0;
-        }
+		if (!$mask) {
+			$this->error = 'NotConfigured';
+			return 0;
+		}
 
-        $date = empty($ticket->date_c) ? dol_now() : $ticket->datec;
-        $numFinal = get_next_value($db, $mask, 'ticket', 'ref', '', $objsoc->code_client, $date);
+		$date = empty($ticket->datec) ? dol_now() : $ticket->datec;
+		$numFinal = get_next_value($db, $mask, 'ticket', 'ref', '', $objsoc->code_client, $date);
 
-        return $numFinal;
-    }
+		return $numFinal;
+	}
 }
diff --git a/htdocs/core/modules/ticket/modules_ticket.php b/htdocs/core/modules/ticket/modules_ticket.php
index 6aa027f16fc..f1d67cf5025 100644
--- a/htdocs/core/modules/ticket/modules_ticket.php
+++ b/htdocs/core/modules/ticket/modules_ticket.php
@@ -33,17 +33,17 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
 abstract class ModelePDFTicket extends CommonDocGenerator
 {
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return list of active generation modules
-     *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return list of active generation modules
+	 *
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
 	 */
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'ticket';
diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
index e71b09f8a0a..2a326282fa0 100644
--- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
+++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2010-2012 	Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric 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
@@ -42,15 +42,15 @@ class doc_generic_user_odt extends ModelePDFUser
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 
@@ -59,12 +59,12 @@ class doc_generic_user_odt extends ModelePDFUser
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
@@ -104,17 +104,17 @@ class doc_generic_user_odt extends ModelePDFUser
 	 *	@param	Translate	$langs      Lang object to use for output
 	 *	@return string       			Description
 	 */
-    public function info($langs)
+	public function info($langs)
 	{
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array('companies', 'errors'));
+		$langs->loadLangs(array('companies', 'errors'));
 
 		$form = new Form($this->db);
 
 		$texte = $this->description.".<br>\n";
-		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" enctype="multipart/form-data">';
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="USER_ADDON_PDF_ODT_PATH">';
@@ -187,7 +187,17 @@ class doc_generic_user_odt extends ModelePDFUser
 				$texte .= "</td></tr>";
 				$texte .= '</table>';
 			}
+			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
+			foreach ($listoffiles as $file) {
+				$texte .= $file['name'].'<br>';
+			}
+			$texte .= '</div>';
 		}
+		// Add input to upload a new template file.
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte .= '<input type="hidden" value="USER_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
+		$texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '</div>';
 
 		$texte .= '</td>';
 
@@ -202,7 +212,7 @@ class doc_generic_user_odt extends ModelePDFUser
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Function to build a document on disk using the generic odt module.
 	 *
@@ -214,9 +224,9 @@ class doc_generic_user_odt extends ModelePDFUser
 	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-    public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
@@ -256,6 +266,8 @@ class doc_generic_user_odt extends ModelePDFUser
 				}
 			}
 
+			$object->fetch_thirdparty();
+
 			$dir = $conf->user->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
@@ -284,8 +296,8 @@ class doc_generic_user_odt extends ModelePDFUser
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -311,13 +323,13 @@ class doc_generic_user_odt extends ModelePDFUser
 				// Recipient name
 				if (!empty($usecontact))
 				{
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else {
-                        $socobject = $object->thirdparty;
-                        // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
-                        $contactobject = $object->contact;
-                    }
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+						$socobject = $object->contact;
+					} else {
+						$socobject = $object->thirdparty;
+						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+						$contactobject = $object->contact;
+					}
 				} else {
 					$socobject = $object->thirdparty;
 				}
@@ -325,7 +337,7 @@ class doc_generic_user_odt extends ModelePDFUser
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 							'PATH_TO_TMP'	  => $conf->user->dir_temp,
@@ -427,18 +439,18 @@ class doc_generic_user_odt extends ModelePDFUser
 		return -1;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * get substitution array for object
-     *
-     * @param User          $object         user
-     * @param Translate     $outputlangs    translation object
-     * @param string        $array_key      key for array
-     * @return array                        array of substitutions
-     */
-    public function get_substitutionarray_object($object, $outputlangs, $array_key = 'object')
-    {
-        // phpcs:enable
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * get substitution array for object
+	 *
+	 * @param User          $object         user
+	 * @param Translate     $outputlangs    translation object
+	 * @param string        $array_key      key for array
+	 * @return array                        array of substitutions
+	 */
+	public function get_substitutionarray_object($object, $outputlangs, $array_key = 'object')
+	{
+		// phpcs:enable
 		$array_other = array();
 		foreach ($object as $key => $value) {
 			if (!is_array($value) && !is_object($value)) {
diff --git a/htdocs/livraison/class/index.html b/htdocs/core/modules/user/doc/index.html
similarity index 100%
rename from htdocs/livraison/class/index.html
rename to htdocs/core/modules/user/doc/index.html
diff --git a/htdocs/core/modules/user/modules_user.class.php b/htdocs/core/modules/user/modules_user.class.php
index 2ef42f07db0..2269d530c97 100644
--- a/htdocs/core/modules/user/modules_user.class.php
+++ b/htdocs/core/modules/user/modules_user.class.php
@@ -44,17 +44,17 @@ abstract class ModelePDFUser extends CommonDocGenerator
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return list of active generation modules
 	 *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
 	 */
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'user';
diff --git a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
index 391eab28838..6fcc6160a97 100644
--- a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
+++ b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
@@ -45,15 +45,15 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-   * Dolibarr version of the loaded document
-   * @var string
-   */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 
@@ -62,12 +62,12 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
@@ -107,12 +107,12 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 	 *	@param	Translate	$langs      Lang object to use for output
 	 *	@return string       			Description
 	 */
-    public function info($langs)
+	public function info($langs)
 	{
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("errors", "companies"));
+		$langs->loadLangs(array("errors", "companies"));
 
 		$form = new Form($this->db);
 
@@ -205,7 +205,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to build a document on disk using the generic odt module.
 	 *
@@ -217,9 +217,9 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-    public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
@@ -287,8 +287,8 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -314,13 +314,13 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				// Recipient name
 				if (!empty($usecontact))
 				{
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else {
-                        $socobject = $object->thirdparty;
-                        // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
-                        $contactobject = $object->contact;
-                    }
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+						$socobject = $object->contact;
+					} else {
+						$socobject = $object->thirdparty;
+						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+						$contactobject = $object->contact;
+					}
 				} else {
 					$socobject = $object->thirdparty;
 				}
@@ -330,7 +330,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				'__FROM_EMAIL__' => $this->emetteur->email,
 				'__TOTAL_TTC__' => $object->total_ttc,
 				'__TOTAL_HT__' => $object->total_ht,
-				'__TOTAL_VAT__' => $object->total_vat
+				'__TOTAL_VAT__' => $object->total_tva
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
@@ -348,7 +348,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 							'PATH_TO_TMP'	  => $conf->user->dir_temp,
@@ -508,6 +508,6 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 			}
 		}
 
-        return -1;
-    }
+		return -1;
+	}
 }
diff --git a/htdocs/core/modules/usergroup/modules_usergroup.class.php b/htdocs/core/modules/usergroup/modules_usergroup.class.php
index db5f0167ef4..99ee232fdf2 100644
--- a/htdocs/core/modules/usergroup/modules_usergroup.class.php
+++ b/htdocs/core/modules/usergroup/modules_usergroup.class.php
@@ -38,30 +38,30 @@
  */
 abstract class ModelePDFUserGroup extends CommonDocGenerator
 {
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Return list of active generation modules
-     *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
-     */
-    public static function liste_modeles($db, $maxfilenamelength = 0)
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return list of active generation modules
+	 *
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
+	 */
+	public static function liste_modeles($db, $maxfilenamelength = 0)
+	{
+		// phpcs:enable
+		global $conf;
 
-        $type = 'group';
-        $list = array();
+		$type = 'group';
+		$list = array();
 
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-        $list = getListOfModels($db, $type, $maxfilenamelength);
-        return $list;
-    }
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$list = getListOfModels($db, $type, $maxfilenamelength);
+		return $list;
+	}
 }
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index c7a52865dc7..0dacab15f3f 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -52,7 +52,7 @@ if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'serv
 	$accessallowed = 1;
 } elseif ($modulepart == 'project')
 {
-    $result = restrictedArea($user, 'projet', $id);
+	$result = restrictedArea($user, 'projet', $id);
 	if (!$user->rights->projet->lire) accessforbidden();
 	$accessallowed = 1;
 } elseif ($modulepart == 'bom')
@@ -114,14 +114,14 @@ if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'serv
 	}
 } elseif ($modulepart == 'project')
 {
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-    $object = new Project($db);
-    if ($id > 0)
-    {
-        $result = $object->fetch($id);
-        if ($result <= 0) dol_print_error($db, 'Failed to load object');
-        $dir = $conf->project->multidir_output[$object->entity]; // By default
-    }
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	$object = new Project($db);
+	if ($id > 0)
+	{
+		$result = $object->fetch($id);
+		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		$dir = $conf->project->multidir_output[$object->entity]; // By default
+	}
 } elseif ($modulepart == 'propal')
 {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
@@ -154,34 +154,34 @@ if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'serv
 	}
 } elseif ($modulepart == 'societe')
 {
-    require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-    $object = new Societe($db);
-    if ($id > 0)
-    {
-        $result = $object->fetch($id);
-        if ($result <= 0) dol_print_error($db, 'Failed to load object');
-        $dir = $conf->$modulepart->dir_output;
-    }
+	require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+	$object = new Societe($db);
+	if ($id > 0)
+	{
+		$result = $object->fetch($id);
+		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		$dir = $conf->$modulepart->dir_output;
+	}
 } elseif ($modulepart == 'user')
 {
-    require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-    $object = new User($db);
-    if ($id > 0)
-    {
-        $result = $object->fetch($id);
-        if ($result <= 0) dol_print_error($db, 'Failed to load object');
-        $dir = $conf->$modulepart->dir_output; // By default
-    }
+	require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+	$object = new User($db);
+	if ($id > 0)
+	{
+		$result = $object->fetch($id);
+		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		$dir = $conf->$modulepart->dir_output; // By default
+	}
 } elseif ($modulepart == 'expensereport')
 {
-    require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
-    $object = new ExpenseReport($db);
-    if ($id > 0)
-    {
-        $result = $object->fetch($id);
-        if ($result <= 0) dol_print_error($db, 'Failed to load object');
-        $dir = $conf->expensereport->dir_output; // By default
-    }
+	require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+	$object = new ExpenseReport($db);
+	if ($id > 0)
+	{
+		$result = $object->fetch($id);
+		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		$dir = $conf->expensereport->dir_output; // By default
+	}
 } elseif ($modulepart == 'tax')
 {
 	require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
@@ -240,28 +240,28 @@ if (empty($backtourl))
 {
 	$regs = array();
 
-    if (in_array($modulepart, array('product', 'produit', 'service', 'produit|service'))) $backtourl = DOL_URL_ROOT."/product/document.php?id=".$id.'&file='.urldecode($file);
-    elseif (in_array($modulepart, array('expensereport'))) $backtourl = DOL_URL_ROOT."/expensereport/document.php?id=".$id.'&file='.urldecode($file);
-    elseif (in_array($modulepart, array('holiday')))       $backtourl = DOL_URL_ROOT."/holiday/document.php?id=".$id.'&file='.urldecode($file);
-    elseif (in_array($modulepart, array('member')))        $backtourl = DOL_URL_ROOT."/adherents/document.php?id=".$id.'&file='.urldecode($file);
-    elseif (in_array($modulepart, array('project')))       $backtourl = DOL_URL_ROOT."/projet/document.php?id=".$id.'&file='.urldecode($file);
-    elseif (in_array($modulepart, array('propal')))        $backtourl = DOL_URL_ROOT."/comm/propal/document.php?id=".$id.'&file='.urldecode($file);
-    elseif (in_array($modulepart, array('societe')))       $backtourl = DOL_URL_ROOT."/societe/document.php?id=".$id.'&file='.urldecode($file);
-    elseif (in_array($modulepart, array('tax')))           $backtourl = DOL_URL_ROOT."/compta/sociales/document.php?id=".$id.'&file='.urldecode($file);
-    elseif (in_array($modulepart, array('ticket')))        $backtourl = DOL_URL_ROOT."/ticket/document.php?id=".$id.'&file='.urldecode($file);
-    elseif (in_array($modulepart, array('user')))          $backtourl = DOL_URL_ROOT."/user/document.php?id=".$id.'&file='.urldecode($file);
-    elseif (in_array($modulepart, array('bank')) && preg_match('/\/statement\/([^\/]+)\//', $file, $regs)) {
-    	$num = $regs[1];
-    	$backtourl = DOL_URL_ROOT."/compta/bank/account_statement_document.php?id=".$id.'&num='.urlencode($num).'&file='.urldecode($file);
-    } elseif (in_array($modulepart, array('bank')))          $backtourl = DOL_URL_ROOT."/compta/bank/document.php?id=".$id.'&file='.urldecode($file);
-    elseif (in_array($modulepart, array('mrp')))           $backtourl = DOL_URL_ROOT."/mrp/mo_document.php?id=".$id.'&file='.urldecode($file);
-    elseif (in_array($modulepart, array('medias'))) {
-    	$section_dir = dirname($file);
-    	if (! preg_match('/\/$/', $section_dir)) $section_dir.='/';
-    	$backtourl = DOL_URL_ROOT."/website/index.php?action=file_manager&website=".$website.'&section_dir='.urlencode($section_dir);
-    }
-    // Generic case that should work for everybody else
-    else $backtourl = DOL_URL_ROOT."/".$modulepart."/".$modulepart."_document.php?id=".$id.'&file='.urldecode($file);
+	if (in_array($modulepart, array('product', 'produit', 'service', 'produit|service'))) $backtourl = DOL_URL_ROOT."/product/document.php?id=".$id.'&file='.urldecode($file);
+	elseif (in_array($modulepart, array('expensereport'))) $backtourl = DOL_URL_ROOT."/expensereport/document.php?id=".$id.'&file='.urldecode($file);
+	elseif (in_array($modulepart, array('holiday')))       $backtourl = DOL_URL_ROOT."/holiday/document.php?id=".$id.'&file='.urldecode($file);
+	elseif (in_array($modulepart, array('member')))        $backtourl = DOL_URL_ROOT."/adherents/document.php?id=".$id.'&file='.urldecode($file);
+	elseif (in_array($modulepart, array('project')))       $backtourl = DOL_URL_ROOT."/projet/document.php?id=".$id.'&file='.urldecode($file);
+	elseif (in_array($modulepart, array('propal')))        $backtourl = DOL_URL_ROOT."/comm/propal/document.php?id=".$id.'&file='.urldecode($file);
+	elseif (in_array($modulepart, array('societe')))       $backtourl = DOL_URL_ROOT."/societe/document.php?id=".$id.'&file='.urldecode($file);
+	elseif (in_array($modulepart, array('tax')))           $backtourl = DOL_URL_ROOT."/compta/sociales/document.php?id=".$id.'&file='.urldecode($file);
+	elseif (in_array($modulepart, array('ticket')))        $backtourl = DOL_URL_ROOT."/ticket/document.php?id=".$id.'&file='.urldecode($file);
+	elseif (in_array($modulepart, array('user')))          $backtourl = DOL_URL_ROOT."/user/document.php?id=".$id.'&file='.urldecode($file);
+	elseif (in_array($modulepart, array('bank')) && preg_match('/\/statement\/([^\/]+)\//', $file, $regs)) {
+		$num = $regs[1];
+		$backtourl = DOL_URL_ROOT."/compta/bank/account_statement_document.php?id=".$id.'&num='.urlencode($num).'&file='.urldecode($file);
+	} elseif (in_array($modulepart, array('bank')))          $backtourl = DOL_URL_ROOT."/compta/bank/document.php?id=".$id.'&file='.urldecode($file);
+	elseif (in_array($modulepart, array('mrp')))           $backtourl = DOL_URL_ROOT."/mrp/mo_document.php?id=".$id.'&file='.urldecode($file);
+	elseif (in_array($modulepart, array('medias'))) {
+		$section_dir = dirname($file);
+		if (!preg_match('/\/$/', $section_dir)) $section_dir .= '/';
+		$backtourl = DOL_URL_ROOT."/website/index.php?action=file_manager&website=".$website.'&section_dir='.urlencode($section_dir);
+	}
+	// Generic case that should work for everybody else
+	else $backtourl = DOL_URL_ROOT."/".$modulepart."/".$modulepart."_document.php?id=".$id.'&file='.urldecode($file);
 }
 
 
@@ -276,8 +276,8 @@ if ($cancel)
 		header("Location: ".$backtourl);
 		exit;
 	} else {
-	    dol_print_error('', 'Cancel on photo_resize with a not supported value of modulepart='.$modulepart);
-	    exit;
+		dol_print_error('', 'Cancel on photo_resize with a not supported value of modulepart='.$modulepart);
+		exit;
 	}
 }
 
@@ -303,33 +303,33 @@ if ($action == 'confirm_resize' && GETPOSTISSET("file") && GETPOSTISSET("sizex")
 		$result = $ecmfile->fetch(0, '', $rel_filename);
 		if ($result > 0)   // If found
 		{
-		    $filename = basename($rel_filename);
-		    $rel_dir = dirname($rel_filename);
-		    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-		    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+			$filename = basename($rel_filename);
+			$rel_dir = dirname($rel_filename);
+			$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+			$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
-		    $ecmfile->label = md5_file(dol_osencode($fullpath));
-		    $result = $ecmfile->update($user);
+			$ecmfile->label = md5_file(dol_osencode($fullpath));
+			$result = $ecmfile->update($user);
 		} elseif ($result == 0)   // If not found
 		{
-		    $filename = basename($rel_filename);
-		    $rel_dir = dirname($rel_filename);
-		    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-		    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+			$filename = basename($rel_filename);
+			$rel_dir = dirname($rel_filename);
+			$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+			$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
-		    $ecmfile->filepath = $rel_dir;
-		    $ecmfile->filename = $filename;
-		    $ecmfile->label = md5_file(dol_osencode($fullpath)); // $fullpath is a full path to file
-		    $ecmfile->fullpath_orig = $fullpath;
-		    $ecmfile->gen_or_uploaded = 'unknown';
-		    $ecmfile->description = ''; // indexed content
-		    $ecmfile->keyword = ''; // keyword content
-		    $result = $ecmfile->create($user);
-		    if ($result < 0)
-		    {
-		        setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-		    }
-		    $result = $ecmfile->create($user);
+			$ecmfile->filepath = $rel_dir;
+			$ecmfile->filename = $filename;
+			$ecmfile->label = md5_file(dol_osencode($fullpath)); // $fullpath is a full path to file
+			$ecmfile->fullpath_orig = $fullpath;
+			$ecmfile->gen_or_uploaded = 'unknown';
+			$ecmfile->description = ''; // indexed content
+			$ecmfile->keyword = ''; // keyword content
+			$result = $ecmfile->create($user);
+			if ($result < 0)
+			{
+				setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+			}
+			$result = $ecmfile->create($user);
 		}
 
 		if ($backtourl)
@@ -337,8 +337,8 @@ if ($action == 'confirm_resize' && GETPOSTISSET("file") && GETPOSTISSET("sizex")
 			header("Location: ".$backtourl);
 			exit;
 		} else {
-    	    dol_print_error('', 'confirm_resize on photo_resize without backtourl defined for modulepart='.$modulepart);
-    	    exit;
+			dol_print_error('', 'confirm_resize on photo_resize without backtourl defined for modulepart='.$modulepart);
+			exit;
 		}
 	} else {
 		setEventMessages($result, null, 'errors');
@@ -370,33 +370,33 @@ if ($action == 'confirm_crop')
 		$result = $ecmfile->fetch(0, '', $rel_filename);
 		if ($result > 0)   // If found
 		{
-		    $filename = basename($rel_filename);
-		    $rel_dir = dirname($rel_filename);
-		    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-		    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+			$filename = basename($rel_filename);
+			$rel_dir = dirname($rel_filename);
+			$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+			$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
-		    $ecmfile->label = md5_file(dol_osencode($fullpath));
-		    $result = $ecmfile->update($user);
+			$ecmfile->label = md5_file(dol_osencode($fullpath));
+			$result = $ecmfile->update($user);
 		} elseif ($result == 0)   // If not found
 		{
-		    $filename = basename($rel_filename);
-		    $rel_dir = dirname($rel_filename);
-		    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-		    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+			$filename = basename($rel_filename);
+			$rel_dir = dirname($rel_filename);
+			$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+			$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
-		    $ecmfile->filepath = $rel_dir;
-		    $ecmfile->filename = $filename;
-		    $ecmfile->label = md5_file(dol_osencode($fullpath)); // $fullpath is a full path to file
-		    $ecmfile->fullpath_orig = $fullpath;
-		    $ecmfile->gen_or_uploaded = 'unknown';
-		    $ecmfile->description = ''; // indexed content
-		    $ecmfile->keyword = ''; // keyword content
-		    $result = $ecmfile->create($user);
-		    if ($result < 0)
-		    {
-		        setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-		    }
-		    $result = $ecmfile->create($user);
+			$ecmfile->filepath = $rel_dir;
+			$ecmfile->filename = $filename;
+			$ecmfile->label = md5_file(dol_osencode($fullpath)); // $fullpath is a full path to file
+			$ecmfile->fullpath_orig = $fullpath;
+			$ecmfile->gen_or_uploaded = 'unknown';
+			$ecmfile->description = ''; // indexed content
+			$ecmfile->keyword = ''; // keyword content
+			$result = $ecmfile->create($user);
+			if ($result < 0)
+			{
+				setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+			}
+			$result = $ecmfile->create($user);
 		}
 
 		if ($backtourl)
@@ -404,8 +404,8 @@ if ($action == 'confirm_crop')
 			header("Location: ".$backtourl);
 			exit;
 		} else {
-    	    dol_print_error('', 'confirm_crop on photo_resize without backtourl defined for modulepart='.$modulepart);
-    	    exit;
+			dol_print_error('', 'confirm_crop on photo_resize without backtourl defined for modulepart='.$modulepart);
+			exit;
 		}
 	} else {
 		setEventMessages($result, null, 'errors');
@@ -455,7 +455,7 @@ print '<input type="hidden" name="id" value="'.$id.'" />';
 print '<br>';
 print '<input class="button" id="submitresize" name="sendit" value="'.dol_escape_htmltag($langs->trans("Resize")).'" type="submit" />';
 print '&nbsp;';
-print '<input type="submit" id="cancelresize" name="cancel" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" />';
+print '<input type="submit" id="cancelresize" name="cancel" class="button button-cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" />';
 print '</fieldset>'."\n";
 print '</form>';
 print '<br>'."\n";
@@ -514,7 +514,7 @@ if (!empty($conf->use_javascript_ajax))
 	      <br>
 	      <input type="submit" id="submitcrop" name="submitcrop" class="button" value="'.dol_escape_htmltag($langs->trans("Recenter")).'" />
 	      &nbsp;
-	      <input type="submit" id="cancelcrop" name="cancel" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" />
+	      <input type="submit" id="cancelcrop" name="cancel" class="button button-cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" />
 	   </form>'."\n";
 	print '</fieldset>'."\n";
 	print '<br>';
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 8f55e0bfc69..2a9438f4413 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -57,17 +57,17 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:con
     		var list = jQuery("#list");
             var totalizable = jQuery("#totalizable");
     		<?php
-    		if ((GETPOST('type', 'alpha') != "select") && (GETPOST('type', 'alpha') != "sellist"))
-    		{
-    			print 'jQuery("#value_choice").hide();';
-    		}
+			if ((GETPOST('type', 'alpha') != "select") && (GETPOST('type', 'alpha') != "sellist"))
+			{
+				print 'jQuery("#value_choice").hide();';
+			}
 
-    		if (GETPOST('type', 'alpha') == "separate")
-    		{
+			if (GETPOST('type', 'alpha') == "separate")
+			{
 				print "jQuery('#size, #default_value, #langfile').val('').prop('disabled', true);";
-    			print 'jQuery("#value_choice").hide();';
-    		}
-    		?>
+				print 'jQuery("#value_choice").hide();';
+			}
+			?>
 
     		// Case of computed field
     		if (type == '' || type == 'varchar' || type == 'int' || type == 'double' || type == 'price') {
@@ -144,7 +144,7 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:con
 <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
 <input type="hidden" name="action" value="add">
 
-<?php dol_fiche_head(); ?>
+<?php print dol_get_fiche_head(); ?>
 
 <table summary="listofattributes" class="border centpercent">
 <!-- Label -->
@@ -153,7 +153,7 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:con
 <tr><td class="fieldrequired"><?php echo $langs->trans("AttributeCode"); ?></td><td class="valeur"><input type="text" name="attrname" id="attrname"  size="10" value="<?php echo GETPOST('attrname', 'alpha'); ?>"> <span class="opacitymedium">(<?php echo $langs->trans("AlphaNumOnlyLowerCharsAndNoSpace"); ?>)</span></td></tr>
 <!-- Type -->
 <tr><td class="fieldrequired"><?php echo $langs->trans("Type"); ?></td><td class="valeur">
-<?php print $form->selectarray('type', $type2label, GETPOST('type', 'alpha')); ?>
+<?php print $form->selectarray('type', $type2label, GETPOST('type', 'alpha'), 0, 0, 0, '', 0, 0, 0, '', '', 1); ?>
 </td></tr>
 <!-- Size -->
 <tr class="extra_size"><td class="fieldrequired"><?php echo $langs->trans("Size"); ?></td><td class="valeur"><input id="size" type="text" name="size" size="5" value="<?php echo (GETPOST('size', 'alpha') ?GETPOST('size', 'alpha') : ''); ?>"></td></tr>
@@ -211,10 +211,10 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:con
 <?php } ?>
 </table>
 
-<?php dol_fiche_end(); ?>
+<?php print dol_get_fiche_end(); ?>
 
-<div class="center"><input type="submit" name="button" class="button" value="<?php echo $langs->trans("Save"); ?>">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<input type="submit" name="button" class="button" value="<?php echo $langs->trans("Cancel"); ?>"></div>
+<div class="center"><input type="submit" name="button" class="button button-save" value="<?php echo $langs->trans("Save"); ?>">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<input type="submit" name="button" class="button button-cancel" value="<?php echo $langs->trans("Cancel"); ?>"></div>
 
 </form>
 
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index 451bb93d6c7..8990f75951d 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -56,17 +56,17 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:con
     		var list = jQuery("#list");
             var totalizable = jQuery("#totalizable");
     		<?php
-    		if ((GETPOST('type', 'alpha') != "select") && (GETPOST('type', 'alpha') != "sellist"))
-    		{
-    			print 'jQuery("#value_choice").hide();';
-    		}
+			if ((GETPOST('type', 'alpha') != "select") && (GETPOST('type', 'alpha') != "sellist"))
+			{
+				print 'jQuery("#value_choice").hide();';
+			}
 
-    		if (GETPOST('type', 'alpha') == "separate")
-    		{
+			if (GETPOST('type', 'alpha') == "separate")
+			{
 				print "jQuery('#size, #default_value, #langfile').val('').prop('disabled', true);";
-    			print 'jQuery("#value_choice").hide();';
-    		}
-    		?>
+				print 'jQuery("#value_choice").hide();';
+			}
+			?>
 
     		// Case of computed field
     		if (type == 'varchar' || type == 'int' || type == 'double' || type == 'price') {
@@ -145,8 +145,9 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:con
 <input type="hidden" name="attrname" value="<?php echo $attrname; ?>">
 <input type="hidden" name="action" value="update">
 <input type="hidden" name="rowid" value="<?php echo $rowid ?>">
+<input type="hidden" name="enabled" value="<?php echo $extrafields->attributes[$elementtype]['enabled'][$attrname]; ?>">
 
-<?php dol_fiche_head(); ?>
+<?php print dol_get_fiche_head(); ?>
 
 <table summary="listofattributes" class="border centpercent">
 
@@ -203,9 +204,10 @@ $typewecanchangeinto = array(
 	'html'=>array('text', 'html'),
 	'password'=>array('password', 'varchar'),
 	'mail'=>array('varchar', 'phone', 'mail', 'url', 'select'),
-    'url'=>array('varchar', 'phone', 'mail', 'url', 'select'),
-    'phone'=>array('varchar', 'phone', 'mail', 'url', 'select'),
-    'select'=>array('varchar', 'phone', 'mail', 'url', 'select')
+	'url'=>array('varchar', 'phone', 'mail', 'url', 'select'),
+	'phone'=>array('varchar', 'phone', 'mail', 'url', 'select'),
+	'select'=>array('varchar', 'phone', 'mail', 'url', 'select'),
+	'date'=>array('date', 'datetime')
 );
 /* Disabled because text is text on several lines, when varchar is text on 1 line, we should not be able to convert
 if ($size <= 255 && in_array($type, array('text', 'html'))) {
@@ -214,19 +216,20 @@ if ($size <= 255 && in_array($type, array('text', 'html'))) {
 
 if (in_array($type, array_keys($typewecanchangeinto)))
 {
-    $newarray = array();
-    print '<select id="type" class="flat type" name="type">';
-    foreach ($type2label as $key => $val)
-    {
-        $selected = '';
-        if ($key == (GETPOST('type', 'alpha') ?GETPOST('type', 'alpha') : $type)) $selected = ' selected="selected"';
-        if (in_array($key, $typewecanchangeinto[$type])) print '<option value="'.$key.'"'.$selected.'>'.$val.'</option>';
-        else print '<option value="'.$key.'" disabled="disabled"'.$selected.'>'.$val.'</option>';
-    }
-    print '</select>';
+	$newarray = array();
+	print '<select id="type" class="flat type" name="type">';
+	foreach ($type2label as $key => $val)
+	{
+		$selected = '';
+		if ($key == (GETPOST('type', 'alpha') ?GETPOST('type', 'alpha') : $type)) $selected = ' selected="selected"';
+		if (in_array($key, $typewecanchangeinto[$type])) print '<option value="'.$key.'"'.$selected.'>'.$val.'</option>';
+		else print '<option value="'.$key.'" disabled="disabled"'.$selected.'>'.$val.'</option>';
+	}
+	print '</select>';
+	print ajax_combobox('type');
 } else {
 	print $type2label[$type];
-    print '<input type="hidden" name="type" id="type" value="'.$type.'">';
+	print '<input type="hidden" name="type" id="type" value="'.$type.'">';
 }
 ?>
 </td></tr>
@@ -298,10 +301,10 @@ if (in_array($type, array_keys($typewecanchangeinto)))
 <?php } ?>
 </table>
 
-<?php dol_fiche_end(); ?>
+<?php print dol_get_fiche_end(); ?>
 
-<div class="center"><input type="submit" name="button" class="button" value="<?php echo $langs->trans("Save"); ?>">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<input type="submit" name="button" class="button" value="<?php echo $langs->trans("Cancel"); ?>"></div>
+<div class="center"><input type="submit" name="button" class="button button-save" value="<?php echo $langs->trans("Save"); ?>">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<input type="submit" name="button" class="button button-cancel" value="<?php echo $langs->trans("Cancel"); ?>"></div>
 
 </form>
 
diff --git a/htdocs/core/tpl/advtarget.tpl.php b/htdocs/core/tpl/advtarget.tpl.php
index 8f9c8ec83e2..590a65f1286 100644
--- a/htdocs/core/tpl/advtarget.tpl.php
+++ b/htdocs/core/tpl/advtarget.tpl.php
@@ -154,11 +154,11 @@ if (!empty($array_query['cust_status'])) {
 }
 print '</td><td>';
 print $formadvtargetemaling->advMultiselectarray(
-    'cust_status', array(
+	'cust_status', array(
 		'0' => $langs->trans('ActivityCeased'),
 		'1' => $langs->trans('InActivity')
-    ),
-    $array_query['cust_status']
+	),
+	$array_query['cust_status']
 );
 print '</td><td>'."\n";
 print '</td></tr>'."\n";
@@ -300,15 +300,15 @@ if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
 				print '</td><td>'."\n";
 				print $form->textwithpicto('', $langs->trans("AdvTgtSearchDtHelp"), 1, 'help');
 			} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'boolean')) {
-                print $form->selectarray(
-                    'options_'.$key,
-                    array(
+				print $form->selectarray(
+					'options_'.$key,
+					array(
 						'' => '',
 						'1' => $langs->trans('Yes'),
 						'0' => $langs->trans('No')
-                    ),
-                    $array_query['options_'.$key]
-                );
+					),
+					$array_query['options_'.$key]
+				);
 				print '</td><td>'."\n";
 			} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'select')) {
 				print $formadvtargetemaling->advMultiselectarray('options_'.$key, $extrafields->attributes[$key]['param']['options'], $array_query['options_'.$key]);
@@ -346,7 +346,7 @@ if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
 	}
 	// Other attributes
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $std_soc, $action_search);
-    print $hookmanager->resPrint;
+	print $hookmanager->resPrint;
 }
 
 // State Contact
@@ -356,12 +356,12 @@ if (!empty($array_query['contact_status'])) {
 }
 print '</td><td>';
 print $formadvtargetemaling->advMultiselectarray(
-    'contact_status',
-    array(
+	'contact_status',
+	array(
 		'0' => $langs->trans('ActivityCeased'),
 		'1' => $langs->trans('InActivity')
-    ),
-    $array_query['contact_status']
+	),
+	$array_query['contact_status']
 );
 print '</td><td>'."\n";
 print $form->textwithpicto('', $langs->trans("AdvTgtContactHelp"), 1, 'help');
@@ -409,13 +409,13 @@ if (!empty($array_query['contact_no_email'])) {
 }
 print '</td><td>'."\n";
 print $form->selectarray(
-    'contact_no_email',
-    array(
+	'contact_no_email',
+	array(
 		'' => '',
 		'1' => $langs->trans('Yes'),
 		'0' => $langs->trans('No')
-    ),
-    $array_query['contact_no_email']
+	),
+	$array_query['contact_no_email']
 );
 print '</td><td>'."\n";
 print '</td></tr>'."\n";
@@ -479,57 +479,54 @@ if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
 	}
 	if (!empty($extrafields->attributes[$elementtype]['label'])) {
 		foreach ($extrafields->attributes[$elementtype]['label'] as $key => $val) {
-			print '<tr><td>' . $extrafields->attributes[$elementtype]['label'][$key];
-			if ($array_query['options_' . $key . '_cnct'] != '' || (is_array($array_query['options_' . $key . '_cnct']) && count($array_query['options_' . $key . '_cnct']) > 0)) {
+			print '<tr><td>'.$extrafields->attributes[$elementtype]['label'][$key];
+			if ($array_query['options_'.$key.'_cnct'] != '' || (is_array($array_query['options_'.$key.'_cnct']) && count($array_query['options_'.$key.'_cnct']) > 0)) {
 				print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 			}
 			print '</td><td>';
 			if (($extrafields->attributes[$elementtype]['type'][$key] == 'varchar') || ($extrafields->attributes[$elementtype]['type'][$key] == 'text')) {
-				print '<input type="text" name="options_' . $key . '_cnct"/></td><td>' . "\n";
+				print '<input type="text" name="options_'.$key.'_cnct"/></td><td>'."\n";
 				print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
 			} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'int') || ($extrafields->attributes[$elementtype]['type'][$key] == 'double')) {
-				print $langs->trans("AdvTgtMinVal") . '<input type="text" name="options_' . $key . '_min_cnct"/>';
-				print $langs->trans("AdvTgtMaxVal") . '<input type="text" name="options_' . $key . '_max_cnct"/>';
-				print '</td><td>' . "\n";
+				print $langs->trans("AdvTgtMinVal").'<input type="text" name="options_'.$key.'_min_cnct"/>';
+				print $langs->trans("AdvTgtMaxVal").'<input type="text" name="options_'.$key.'_max_cnct"/>';
+				print '</td><td>'."\n";
 				print $form->textwithpicto('', $langs->trans("AdvTgtSearchIntHelp"), 1, 'help');
 			} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'date') || ($extrafields->attributes[$elementtype]['type'][$key] == 'datetime')) {
 				print '<table class="nobordernopadding"><tr>';
-				print '<td>' . $langs->trans("AdvTgtStartDt") . '</td><td>';
-				print $form->selectDate('', 'options_' . $key . '_st_dt_cnct');
-				print '</td><td>' . $langs->trans("AdvTgtEndDt") . '</td><td>';
-				print $form->selectDate('', 'options_' . $key . '_end_dt_cnct');
+				print '<td>'.$langs->trans("AdvTgtStartDt").'</td><td>';
+				print $form->selectDate('', 'options_'.$key.'_st_dt_cnct');
+				print '</td><td>'.$langs->trans("AdvTgtEndDt").'</td><td>';
+				print $form->selectDate('', 'options_'.$key.'_end_dt_cnct');
 				print '</td></tr></table>';
-				print '</td><td>' . "\n";
+				print '</td><td>'."\n";
 				print $form->textwithpicto('', $langs->trans("AdvTgtSearchDtHelp"), 1, 'help');
 			} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'boolean')) {
 				print $form->selectarray(
-					'options_' . $key . '_cnct',
+					'options_'.$key.'_cnct',
 					array(
 						''  => '',
 						'1' => $langs->trans('Yes'),
 						'0' => $langs->trans('No')
 					),
-					$array_query['options_' . $key . '_cnct']
+					$array_query['options_'.$key.'_cnct']
 				);
-				print '</td><td>' . "\n";
+				print '</td><td>'."\n";
 			} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'select')) {
-				print $formadvtargetemaling->advMultiselectarray('options_' . $key . '_cnct', $extrafields->attributes[$key]['param']['options'], $array_query['options_' . $key . '_cnct']);
-				print '</td><td>' . "\n";
+				print $formadvtargetemaling->advMultiselectarray('options_'.$key.'_cnct', $extrafields->attributes[$key]['param']['options'], $array_query['options_'.$key.'_cnct']);
+				print '</td><td>'."\n";
 			} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'sellist')) {
-				print $formadvtargetemaling->advMultiselectarraySelllist('options_' . $key . '_cnct', $extrafields->attributes[$key]['param']['options'], $array_query['options_' . $key . '_cnct']);
-				print '</td><td>' . "\n";
+				print $formadvtargetemaling->advMultiselectarraySelllist('options_'.$key.'_cnct', $extrafields->attributes[$key]['param']['options'], $array_query['options_'.$key.'_cnct']);
+				print '</td><td>'."\n";
 			} else {
-				print '<table class="nobordernopadding"><tr>';
-				print '<td></td><td>';
-				if (is_array($array_query['options_' . $key . '_cnct'])) {
-					print $extrafields->showInputField($key, implode(',', $array_query['options_' . $key . '_cnct']), '', '_cnct');
+				if (is_array($array_query['options_'.$key.'_cnct'])) {
+					print $extrafields->showInputField($key, implode(',', $array_query['options_'.$key.'_cnct']), '', '_cnct');
 				} else {
-					print $extrafields->showInputField($key, $array_query['options_' . $key . '_cnct'], '', '_cnct');
+					print $extrafields->showInputField($key, $array_query['options_'.$key.'_cnct'], '', '_cnct');
 				}
-				print '</td></tr></table>';
-				print '</td><td>' . "\n";
+				print '</td><td>'."\n";
 			}
-			print '</td></tr>' . "\n";
+			print '</td></tr>'."\n";
 		}
 	}
 }
diff --git a/htdocs/core/tpl/ajax/fileupload_main.tpl.php b/htdocs/core/tpl/ajax/fileupload_main.tpl.php
index 8aab549bf33..6b7e21b5261 100644
--- a/htdocs/core/tpl/ajax/fileupload_main.tpl.php
+++ b/htdocs/core/tpl/ajax/fileupload_main.tpl.php
@@ -38,7 +38,7 @@ window.locale = {
         },
         "error": "<?php echo $langs->trans('Error'); ?>",
         "start": "<?php echo $langs->trans('Start'); ?>",
-        "cancel": "<?php echo $langs->trans('Cancel'); ?>",
+        "cancel": "<?php echo $langs->trans("Cancel"); ?>",
         "destroy": "<?php echo $langs->trans('Delete'); ?>"
     }
 };
@@ -82,7 +82,7 @@ $(function () {
 							});
 						}
 					},
-					"<?php echo $langs->trans('Cancel'); ?>": function() {
+					"<?php echo $langs->trans("Cancel"); ?>": function() {
 						$( "#confirm-delete" ).dialog( "close" );
 					}
 				}
diff --git a/htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php b/htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php
index 61bec967ecf..119e27a705b 100644
--- a/htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php
+++ b/htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php
@@ -25,7 +25,7 @@ if (empty($conf) || !is_object($conf))
 $objectUrl = $object->getNomUrl(0, '', 0, 1);
 if ($object->element == 'propal')
 {
-    $objectUrl = DOL_URL_ROOT.'/comm/propal/card.php?id='.$object->id;
+	$objectUrl = DOL_URL_ROOT.'/comm/propal/card.php?id='.$object->id;
 }
 
 ?>
@@ -83,7 +83,7 @@ $(document).ready(function(){
     	      	        	$("#" + formId).append('<input type="hidden" name="fromelementid" value="' + fromelementid + '" />');
     	      	        	$("#" + formId).submit();
 	                    },
-	                    "<?php echo $langs->trans('Cancel'); ?>": function() {
+	                    "<?php echo $langs->trans("Cancel"); ?>": function() {
 	                      $( this ).dialog( "close" );
 	                    }
 	            }
diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php
index de837b16edf..25d5f6f3526 100644
--- a/htdocs/core/tpl/ajaxrow.tpl.php
+++ b/htdocs/core/tpl/ajaxrow.tpl.php
@@ -44,7 +44,8 @@ $forcereloadpage = empty($conf->global->MAIN_FORCE_RELOAD_PAGE) ? 0 : 1;
 $tagidfortablednd = (empty($tagidfortablednd) ? 'tablelines' : $tagidfortablednd);
 $filepath = (empty($filepath) ? '' : $filepath);
 
-if (GETPOST('action', 'aZ09') != 'editline' && $nboflines > 1) { ?>
+
+if (GETPOST('action', 'aZ09') != 'editline' && $nboflines > 1 && $conf->browser->layout != 'phone') { ?>
 <script>
 $(document).ready(function(){
 	$(".imgupforline").hide();
@@ -80,7 +81,12 @@ $(document).ready(function(){
 						console.log("tableDND end of ajax call");
 						if (reloadpage == 1) {
 							//console.log('<?php echo $urltorefreshaftermove.' - '.$_SERVER['PHP_SELF'].' - '.dol_escape_js($_SERVER['QUERY_STRING']); ?>');
-							location.href = '<?php echo dol_escape_js(empty($urltorefreshaftermove) ? ($_SERVER['PHP_SELF'].'?'.dol_escape_js($_SERVER['QUERY_STRING'])) : $urltorefreshaftermove); ?>';
+							<?php
+							$redirectURL = empty($urltorefreshaftermove) ? ($_SERVER['PHP_SELF'].'?'.dol_escape_js($_SERVER['QUERY_STRING'])) : $urltorefreshaftermove;
+							// remove action parameter from URL
+							$redirectURL = preg_replace('/(&|\?)action=[^&#]*/', '', $redirectURL);
+							?>
+							location.href = '<?php echo dol_escape_js($redirectURL); ?>';
 						} else {
 							$("#<?php echo $tagidfortablednd; ?> .drag").each(
 									function( intIndex ) {
diff --git a/htdocs/core/tpl/bloc_comment.tpl.php b/htdocs/core/tpl/bloc_comment.tpl.php
index edb675e45d6..6dae2c713f2 100644
--- a/htdocs/core/tpl/bloc_comment.tpl.php
+++ b/htdocs/core/tpl/bloc_comment.tpl.php
@@ -38,21 +38,21 @@ print "</tr>\n";
 
 if ($action !== 'editcomment')
 {
-    print '<tr class="oddeven">';
+	print '<tr class="oddeven">';
 
-    // Description
-    print '<td colspan="3">';
+	// Description
+	print '<td colspan="3">';
 
-    $desc = GETPOST('comment_description');
+	$desc = GETPOST('comment_description');
 
-    $doleditor = new DolEditor('comment_description', $desc, '', 80, 'dolibarr_notes', 'In', 0, true, true, ROWS_3, '100%');
-    print $doleditor->Create(1);
+	$doleditor = new DolEditor('comment_description', $desc, '', 80, 'dolibarr_notes', 'In', 0, true, true, ROWS_3, '100%');
+	print $doleditor->Create(1);
 
-    print '</td>';
+	print '</td>';
 
-    print '<td class="center">';
-    print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
-    print '</td></tr>';
+	print '<td class="center">';
+	print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
+	print '</td></tr>';
 }
 
 print '</table></form>';
@@ -96,47 +96,47 @@ if (!empty($object->comments))
 		print '<div class="comment-cell comment-right">';
 		print '<div class="comment-table width100p">';
 
-        if ($action === 'editcomment' && $comment->id == $idcomment)
-        {
-            print '<form method="POST" action="'.$varpage.'?id='.$object->id.'">';
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            print '<input type="hidden" name="action" value="updatecomment">';
-            print '<input type="hidden" name="id" value="'.$object->id.'">';
-            print '<input type="hidden" name="idcomment" value="'.$idcomment.'">';
-            print '<input type="hidden" name="withproject" value="'.$withproject.'">';
-        }
+		if ($action === 'editcomment' && $comment->id == $idcomment)
+		{
+			print '<form method="POST" action="'.$varpage.'?id='.$object->id.'">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="action" value="updatecomment">';
+			print '<input type="hidden" name="id" value="'.$object->id.'">';
+			print '<input type="hidden" name="idcomment" value="'.$idcomment.'">';
+			print '<input type="hidden" name="withproject" value="'.$withproject.'">';
+		}
 
-        print '<div class="comment-description comment-cell">';
-        if ($action === 'editcomment' && $comment->id == $idcomment)
-        {
-            $doleditor = new DolEditor('comment_description', $comment->description, '', 80, 'dolibarr_notes', 'In', 0, true, true, ROWS_3, '100%');
-            print $doleditor->Create(1);
-        } else {
-            print $comment->description;
-        }
+		print '<div class="comment-description comment-cell">';
+		if ($action === 'editcomment' && $comment->id == $idcomment)
+		{
+			$doleditor = new DolEditor('comment_description', $comment->description, '', 80, 'dolibarr_notes', 'In', 0, true, true, ROWS_3, '100%');
+			print $doleditor->Create(1);
+		} else {
+			print $comment->description;
+		}
 		print '</div>'; // End comment-description
 
-        if ($action === 'editcomment' && $comment->id == $idcomment)
-        {
-            print '<input name="update" type="submit" class="button" value="'.$langs->trans("Update").'">';
-            print '<input name="cancel" type="submit" class="button" value="'.$langs->trans("Cancel").'">';
+		if ($action === 'editcomment' && $comment->id == $idcomment)
+		{
+			print '<input name="update" type="submit" class="button" value="'.$langs->trans("Update").'">';
+			print '<input name="cancel" type="submit" class="button button-cancel" value="'.$langs->trans("Cancel").'">';
 
-            print '</form>';
-        } else {
-            if ($fk_user == $user->id || $user->admin == 1)
-            {
-                print '<a class="comment-edit comment-cell" href="'.$varpage.'?action=editcomment&token='.newToken().'&id='.$id.'&withproject=1&idcomment='.$comment->id.'#comment" title="'.$langs->trans('Edit').'">';
-                print img_picto('', 'edit.png');
-                print '</a>';
-            }
-            if (($first && $fk_user == $user->id) || $user->admin == 1) {
-                print '<a class="comment-delete comment-cell" href="'.$varpage.'?action=deletecomment&token='.newToken().'&id='.$id.'&withproject=1&idcomment='.$comment->id.'" title="'.$langs->trans('Delete').'">';
-                print img_picto('', 'delete.png');
-                print '</a>';
-            }
-        }
+			print '</form>';
+		} else {
+			if ($fk_user == $user->id || $user->admin == 1)
+			{
+				print '<a class="comment-edit comment-cell" href="'.$varpage.'?action=editcomment&token='.newToken().'&id='.$id.'&withproject=1&idcomment='.$comment->id.'#comment" title="'.$langs->trans('Edit').'">';
+				print img_picto('', 'edit.png');
+				print '</a>';
+			}
+			if (($first && $fk_user == $user->id) || $user->admin == 1) {
+				print '<a class="comment-delete comment-cell" href="'.$varpage.'?action=deletecomment&token='.newToken().'&id='.$id.'&withproject=1&idcomment='.$comment->id.'" title="'.$langs->trans('Delete').'">';
+				print img_picto('', 'delete.png');
+				print '</a>';
+			}
+		}
 
-        print '</div>'; // End comment-table
+		print '</div>'; // End comment-table
 		print '</div>'; // End comment-right
 		print '</div>'; // End comment
 
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 9ce7d8bfaff..92a767a23ea 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -75,7 +75,7 @@ if ($action == 'presend')
 		$outputlangs = new Translate('', $conf);
 		$outputlangs->setDefaultLang($newlang);
 		// Load traductions files required by page
-		$outputlangs->loadLangs(array('commercial', 'bills', 'orders', 'contracts', 'members', 'propal', 'products', 'supplier_proposal', 'interventions'));
+		$outputlangs->loadLangs(array('commercial', 'bills', 'orders', 'contracts', 'members', 'propal', 'products', 'supplier_proposal', 'interventions', 'receptions'));
 	}
 
 	$topicmail = '';
@@ -114,7 +114,7 @@ if ($action == 'presend')
 	print '<br>';
 	print load_fiche_titre($langs->trans($titreform));
 
-	dol_fiche_head('');
+	print dol_get_fiche_head('');
 
 	// Create form for email
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
@@ -144,7 +144,7 @@ if ($action == 'presend')
 		$formmail->fromtype = 'special';
 	}
 
-	$formmail->trackid=$trackid;
+	$formmail->trackid = $trackid;
 	if (!empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
 	{
 		include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -167,6 +167,9 @@ if ($action == 'presend')
 	} elseif ($object->element == 'user' || $object->element == 'member') {
 		$liste['thirdparty'] = $object->getFullName($outputlangs)." <".$object->email.">";
 	} else {
+		if (!empty($object->socid) && $object->socid > 0 && !is_object($object->thirdparty) && method_exists($object, 'fetch_thirdparty')) {
+			$object->fetch_thirdparty();
+		}
 		if (is_object($object->thirdparty))
 		{
 			foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value) {
@@ -289,5 +292,5 @@ if ($action == 'presend')
 	// Show form
 	print $formmail->get_form();
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
diff --git a/htdocs/core/tpl/commonfields_add.tpl.php b/htdocs/core/tpl/commonfields_add.tpl.php
index d36f0c2a87a..c7069b3d2aa 100644
--- a/htdocs/core/tpl/commonfields_add.tpl.php
+++ b/htdocs/core/tpl/commonfields_add.tpl.php
@@ -53,6 +53,7 @@ foreach ($object->fields as $key => $val)
 	else print $langs->trans($val['label']);
 	print '</td>';
 	print '<td>';
+	if (!empty($val['picto'])) { print img_picto('', $val['picto']); }
 	if (in_array($val['type'], array('int', 'integer'))) $value = GETPOST($key, 'int');
 	elseif ($val['type'] == 'text' || $val['type'] == 'html') $value = GETPOST($key, 'restricthtml');
 	else $value = GETPOST($key, 'alpha');
diff --git a/htdocs/core/tpl/commonfields_edit.tpl.php b/htdocs/core/tpl/commonfields_edit.tpl.php
index ad1a3bd2330..946d8c0b504 100644
--- a/htdocs/core/tpl/commonfields_edit.tpl.php
+++ b/htdocs/core/tpl/commonfields_edit.tpl.php
@@ -51,6 +51,7 @@ foreach ($object->fields as $key => $val)
 	else print $langs->trans($val['label']);
 	print '</td>';
 	print '<td>';
+	if (!empty($val['picto'])) { print img_picto('', $val['picto']); }
 	if (in_array($val['type'], array('int', 'integer'))) $value = GETPOSTISSET($key) ?GETPOST($key, 'int') : $object->$key;
 	elseif (preg_match('/^(text|html)/', $val['type'])) {
 		$tmparray = explode(':', $val['type']);
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 1cb8b813001..a1abc3a9240 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -108,7 +108,7 @@ if ($permission)
 		<?php
 		$tmpobject = $object;
 		if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) $tmpobject = $objectsrc;
-		echo $formcompany->selectTypeContact($tmpobject, '', 'type', 'internal');
+		$formcompany->selectTypeContact($tmpobject, '', 'type', 'internal');
 		?></div>
 		<div class="tagtd">&nbsp;</div>
 		<div class="tagtd center"><input type="submit" class="button" value="<?php echo $langs->trans("Add"); ?>"></div>
@@ -117,8 +117,7 @@ if ($permission)
 	    <?php
 	}
 
-	if (empty($hideaddcontactforthirdparty))
-	{
+	if (empty($hideaddcontactforthirdparty)) {
 		?>
 
 	<form class="tagtr pair nohover" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id; ?>" method="POST">
@@ -141,12 +140,13 @@ if ($permission)
 		</div>
 		<div class="tagtd maxwidthonsmartphone noborderbottom">
 			<?php
-			$nbofcontacts = $form->select_contacts(($selectedCompany > 0 ? $selectedCompany : -1), '', 'contactid', 3, '', '', 1, 'minwidth100imp');
+			print $form->selectcontacts(($selectedCompany > 0 ? $selectedCompany : -1), '', 'contactid', 3, '', '', 1, 'minwidth100imp');
+			$nbofcontacts = $form->num;
 
 			$newcardbutton = '';
 			if (!empty($object->socid) && $object->socid > 1 && $user->rights->societe->creer)
 			{
-				$newcardbutton .= '<a href="'.DOL_URL_ROOT.'/contact/card.php?socid='.$object->socid.'&action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'" title="'.$langs->trans('NewContact').'"><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
+				$newcardbutton .= '<a href="'.DOL_URL_ROOT.'/contact/card.php?socid='.$selectedCompany.'&action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'" title="'.$langs->trans('NewContact').'"><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
 			}
 			print $newcardbutton;
 			?>
@@ -155,7 +155,7 @@ if ($permission)
 			<?php
 			$tmpobject = $object;
 			if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) $tmpobject = $objectsrc;
-			$formcompany->selectTypeContact($tmpobject, $preselectedtypeofcontact, 'type', 'external', 'position', 0, 'minwidth100imp');
+			$formcompany->selectTypeContact($tmpobject, $preselectedtypeofcontact, 'typecontact', 'external', 'position', 0, 'minwidth100imp');
 			?>
 		</div>
 		<div class="tagtd noborderbottom">&nbsp;</div>
@@ -239,8 +239,8 @@ foreach (array('internal', 'external') as $source)
 }
 
 
-$sortfield = GETPOST("sortfield", "alpha");
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST("sortfield", "aZ09comma");
+$sortorder = GETPOST("sortorder", 'aZ09comma');
 
 if (!$sortfield) $sortfield = "nature";
 if (!$sortorder) $sortorder = "asc";
@@ -282,7 +282,7 @@ print_liste_field_titre($arrayfields['thirdparty']['label'], $_SERVER["PHP_SELF"
 print_liste_field_titre($arrayfields['contact']['label'], $_SERVER["PHP_SELF"], "contact_name", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre($arrayfields['type']['label'], $_SERVER["PHP_SELF"], "type", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre($arrayfields['status']['label'], $_SERVER["PHP_SELF"], "statut", "", $param, "", $sortfield, $sortorder, 'center ');
-print_liste_field_titre($arrayfields['link']['label'], $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder, 'center maxwidthsearch ');
+print_liste_field_titre('', $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder, 'center maxwidthsearch ');
 print "</tr>";
 
 foreach ($list as $entry)
diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php
index 32f6e67cb00..80fd0d7df12 100644
--- a/htdocs/core/tpl/document_actions_post_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php
@@ -59,7 +59,7 @@ if (in_array($modulepart, array('product', 'produit', 'societe', 'user', 'ticket
 if ($action == 'delete')
 {
 	$langs->load("companies"); // Need for string DeleteFile+ConfirmDeleteFiles
-    print $form->formconfirm(
+	print $form->formconfirm(
 			$_SERVER["PHP_SELF"].'?id='.$object->id.'&urlfile='.urlencode(GETPOST("urlfile")).'&linkid='.GETPOST('linkid', 'int').(empty($param) ? '' : $param),
 			$langs->trans('DeleteFile'),
 			$langs->trans('ConfirmDeleteFile'),
@@ -112,13 +112,13 @@ if (!isset($savingdocmask) || !empty($conf->global->MAIN_DISABLE_SUGGEST_REF_AS_
 
 // Show upload form (document and links)
 $formfile->form_attach_new_file(
-    $_SERVER["PHP_SELF"].'?id='.$object->id.(empty($withproject) ? '' : '&withproject=1').(empty($moreparam) ? '' : $moreparam),
-    '',
-    0,
-    0,
-    $permission,
-    $conf->browser->layout == 'phone' ? 40 : 60,
-    $object,
+	$_SERVER["PHP_SELF"].'?id='.$object->id.(empty($withproject) ? '' : '&withproject=1').(empty($moreparam) ? '' : $moreparam),
+	'',
+	0,
+	0,
+	$permission,
+	$conf->browser->layout == 'phone' ? 40 : 60,
+	$object,
 	'',
 	1,
 	$savingdocmask
@@ -126,24 +126,24 @@ $formfile->form_attach_new_file(
 
 // List of document
 $formfile->list_of_documents(
-    $filearray,
-    $object,
-    $modulepart,
-    $param,
-    0,
-    $relativepathwithnofile, // relative path with no file. For example "0/1"
-    $permission,
-    0,
-    '',
-    0,
-    '',
-    '',
-    0,
-    $permtoedit,
-    $upload_dir,
-    $sortfield,
-    $sortorder,
-    $disablemove
+	$filearray,
+	$object,
+	$modulepart,
+	$param,
+	0,
+	$relativepathwithnofile, // relative path with no file. For example "0/1"
+	$permission,
+	0,
+	'',
+	0,
+	'',
+	'',
+	0,
+	$permtoedit,
+	$upload_dir,
+	$sortfield,
+	$sortorder,
+	$disablemove
 );
 
 print "<br>";
diff --git a/htdocs/core/tpl/extrafields_list_array_fields.tpl.php b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
new file mode 100644
index 00000000000..6e68dd94bea
--- /dev/null
+++ b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
@@ -0,0 +1,32 @@
+<?php
+
+print '<!-- extrafields_list_array_fields.tpl.php -->'."\n";
+
+// Protection to avoid direct call of template
+if (empty($conf) || !is_object($conf))
+{
+	print "Error, template page can't be called as URL";
+	exit;
+}
+
+if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey = $object->table_element;
+
+// Loop to show all columns of extrafields from $obj, $extrafields and $db
+if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
+{
+	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']) > 0) {
+		if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';
+
+		foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val) {
+			if (!empty($extrafields->attributes[$extrafieldsobjectkey]['list'][$key]))
+				$arrayfields[$extrafieldsobjectprefix.$key] = array(
+					'label'    => $extrafields->attributes[$extrafieldsobjectkey]['label'][$key],
+					'checked'  => (($extrafields->attributes[$extrafieldsobjectkey]['list'][$key] < 0) ? 0 : 1),
+					'position' => $extrafields->attributes[$extrafieldsobjectkey]['pos'][$key],
+					'enabled'  => (abs($extrafields->attributes[$extrafieldsobjectkey]['list'][$key]) != 3 && $extrafields->attributes[$extrafieldsobjectkey]['perms'][$key]),
+					'langfile' => $extrafields->attributes[$extrafieldsobjectkey]['langfile'][$key],
+					'help'     => $extrafields->attributes[$extrafieldsobjectkey]['help'][$key],
+				);
+		}
+	}
+}
diff --git a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
index 95ac0d6d5ce..8c46e34b428 100644
--- a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
@@ -14,18 +14,18 @@ if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_e
 {
 	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
 	{
-        if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';
+		if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';
 
-        foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)
+		foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)
 		{
 			if (!empty($arrayfields[$extrafieldsobjectprefix.$key]['checked']))
 			{
 				$align = $extrafields->getAlignFlag($key, $extrafieldsobjectkey);
 				print '<td';
-                if ($align) print ' class="'.$align.'"';
-                print ' data-key="'.$key.'"';
-                print '>';
-                $tmpkey = 'options_'.$key;
+				if ($align) print ' class="'.$align.'"';
+				print ' data-key="'.$key.'"';
+				print '>';
+				$tmpkey = 'options_'.$key;
 
 				if (in_array($extrafields->attributes[$extrafieldsobjectkey]['type'][$key], array('date', 'datetime', 'timestamp')) && !is_numeric($obj->$tmpkey))
 				{
@@ -53,13 +53,13 @@ if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_e
 				print '</td>';
 				if (!$i) $totalarray['nbfield']++;
 
-                if ($extrafields->attributes[$extrafieldsobjectkey]['totalizable'][$key]) {
-                    if (!$i) {
-                        // we keep position for the first line
-                        $totalarray['totalizable'][$key]['pos'] = $totalarray['nbfield'];
-                    }
-	                if (is_numeric($obj->$tmpkey)) $totalarray['totalizable'][$key]['total'] += $obj->$tmpkey;
-                }
+				if ($extrafields->attributes[$extrafieldsobjectkey]['totalizable'][$key]) {
+					if (!$i) {
+						// we keep position for the first line
+						$totalarray['totalizable'][$key]['pos'] = $totalarray['nbfield'];
+					}
+					if (is_numeric($obj->$tmpkey)) $totalarray['totalizable'][$key]['total'] += $obj->$tmpkey;
+				}
 				if (!empty($val['isameasure']))
 				{
 					if (!$i) $totalarray['pos'][$totalarray['nbfield']] = $extrafieldsobjectprefix.$tmpkey;
diff --git a/htdocs/core/tpl/extrafields_list_search_input.tpl.php b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
index 22a6135cd13..bf31ff34ad7 100644
--- a/htdocs/core/tpl/extrafields_list_search_input.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
@@ -5,8 +5,8 @@ print '<!-- extrafields_list_search_input.tpl.php -->'."\n";
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf))
 {
-    print "Error, template page can't be called as URL";
-    exit;
+	print "Error, template page can't be called as URL";
+	exit;
 }
 
 if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey = $object->table_element;
@@ -14,37 +14,37 @@ if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey =
 // Loop to show all columns of extrafields for the search title line
 if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 {
-    if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
-    {
-        if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';
-        if (empty($search_options_pattern)) $search_options_pattern = 'search_options_';
+	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
+	{
+		if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';
+		if (empty($search_options_pattern)) $search_options_pattern = 'search_options_';
 
-        foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)
-        {
-            if (!empty($arrayfields[$extrafieldsobjectprefix.$key]['checked'])) {
-                $align = $extrafields->getAlignFlag($key);
-                $typeofextrafield = $extrafields->attributes[$extrafieldsobjectkey]['type'][$key];
+		foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)
+		{
+			if (!empty($arrayfields[$extrafieldsobjectprefix.$key]['checked'])) {
+				$align = $extrafields->getAlignFlag($key);
+				$typeofextrafield = $extrafields->attributes[$extrafieldsobjectkey]['type'][$key];
 
-                print '<td class="liste_titre'.($align ? ' '.$align : '').'">';
-                $tmpkey = preg_replace('/'.$search_options_pattern.'/', '', $key);
-                if (in_array($typeofextrafield, array('varchar', 'int', 'double')) && empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key]))
-                {
-                    $searchclass = '';
-                    if (in_array($typeofextrafield, array('varchar'))) $searchclass = 'searchstring';
-                    if (in_array($typeofextrafield, array('int', 'double'))) $searchclass = 'searchnum';
-                    print '<input class="flat'.($searchclass ? ' '.$searchclass : '').'" size="4" type="text" name="'.$search_options_pattern.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options[$search_options_pattern.$tmpkey]).'">';
-                } elseif (in_array($typeofextrafield, array('datetime', 'timestamp')))
-                {
-                	// TODO
-                	// Use showInputField in a particular manner to have input with a comparison operator, not input for a specific value date-hour-minutes
-                } else {
-                    // 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 (in_array($typeofextrafield, array('link', 'sellist', 'text', 'html'))) $morecss = 'maxwidth200';
-                    echo $extrafields->showInputField($key, $search_array_options[$search_options_pattern.$tmpkey], '', '', $search_options_pattern, $morecss, 0, $extrafieldsobjectkey, 1);
-                }
-                print '</td>';
-            }
-        }
-    }
+				print '<td class="liste_titre'.($align ? ' '.$align : '').'">';
+				$tmpkey = preg_replace('/'.$search_options_pattern.'/', '', $key);
+				if (in_array($typeofextrafield, array('varchar', 'int', 'double')) && empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key]))
+				{
+					$searchclass = '';
+					if (in_array($typeofextrafield, array('varchar'))) $searchclass = 'searchstring';
+					if (in_array($typeofextrafield, array('int', 'double'))) $searchclass = 'searchnum';
+					print '<input class="flat'.($searchclass ? ' '.$searchclass : '').'" size="4" type="text" name="'.$search_options_pattern.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options[$search_options_pattern.$tmpkey]).'">';
+				} elseif (in_array($typeofextrafield, array('datetime', 'timestamp')))
+				{
+					// TODO
+					// Use showInputField in a particular manner to have input with a comparison operator, not input for a specific value date-hour-minutes
+				} else {
+					// 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 (in_array($typeofextrafield, array('link', 'sellist', 'text', 'html'))) $morecss = 'maxwidth200';
+					echo $extrafields->showInputField($key, $search_array_options[$search_options_pattern.$tmpkey], '', '', $search_options_pattern, $morecss, 0, $extrafieldsobjectkey, 1);
+				}
+				print '</td>';
+			}
+		}
+	}
 }
diff --git a/htdocs/core/tpl/extrafields_list_search_param.tpl.php b/htdocs/core/tpl/extrafields_list_search_param.tpl.php
index 6e6d6305106..224066d57ce 100644
--- a/htdocs/core/tpl/extrafields_list_search_param.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_param.tpl.php
@@ -10,12 +10,12 @@ if (empty($conf) || !is_object($conf))
 // Loop to complete $param for extrafields
 if (!empty($search_array_options) && is_array($search_array_options))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 {
-    if (empty($search_options_pattern)) $search_options_pattern = 'search_options_';
+	if (empty($search_options_pattern)) $search_options_pattern = 'search_options_';
 
-    foreach ($search_array_options as $key => $val)
-    {
-        $crit = $val;
-        $tmpkey = preg_replace('/'.$search_options_pattern.'/', '', $key);
-        if ($val != '') $param .= '&'.$search_options_pattern.$tmpkey.'='.urlencode($val);
-    }
+	foreach ($search_array_options as $key => $val)
+	{
+		$crit = $val;
+		$tmpkey = preg_replace('/'.$search_options_pattern.'/', '', $key);
+		if ($val != '') $param .= '&'.$search_options_pattern.$tmpkey.'='.urlencode($val);
+	}
 }
diff --git a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
index 42dc67d2b87..5ef86f3b79d 100644
--- a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
@@ -12,10 +12,10 @@ if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey =
 // Loop to complete the sql search criterias from extrafields
 if (!empty($extrafieldsobjectkey) && !empty($search_array_options) && is_array($search_array_options))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 {
-    if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';
-    if (empty($search_options_pattern)) $search_options_pattern = 'search_options_';
+	if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';
+	if (empty($search_options_pattern)) $search_options_pattern = 'search_options_';
 
-    foreach ($search_array_options as $key => $val)
+	foreach ($search_array_options as $key => $val)
 	{
 		$crit = $val;
 		$tmpkey = preg_replace('/'.$search_options_pattern.'/', '', $key);
diff --git a/htdocs/core/tpl/extrafields_list_search_title.tpl.php b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
index 5db8d04e8ec..1c071ac64c1 100644
--- a/htdocs/core/tpl/extrafields_list_search_title.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
@@ -15,7 +15,7 @@ if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_e
 {
 	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
 	{
-        if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';
+		if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';
 
 		foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)
 		{
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 8f02f40fe3c..9db0ae13824 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -51,9 +51,9 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]['label']))
 {
 	$lastseparatorkeyfound = '';
-    $extrafields_collapse_num = '';
-    $extrafields_collapse_num_old = '';
-    $i = 0;
+	$extrafields_collapse_num = '';
+	$extrafields_collapse_num_old = '';
+	$i = 0;
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $tmpkeyextra => $tmplabelextra)
 	{
 		$i++;
@@ -85,7 +85,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 		if (!empty($extrafields->attributes[$object->table_element]['langfile'][$tmpkeyextra])) $langs->load($extrafields->attributes[$object->table_element]['langfile'][$tmpkeyextra]);
 		if ($action == 'edit_extras')
 		{
-			$value = (isset($_POST["options_".$tmpkeyextra]) ? $_POST["options_".$tmpkeyextra] : $object->array_options["options_".$tmpkeyextra]);
+			$value = (GETPOSTISSET("options_".$tmpkeyextra) ? GETPOST("options_".$tmpkeyextra) : $object->array_options["options_".$tmpkeyextra]);
 		} else {
 			$value = $object->array_options["options_".$tmpkeyextra];
 			//var_dump($tmpkeyextra.' - '.$value);
@@ -94,19 +94,19 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 		// Print line tr of extra field
 		if ($extrafields->attributes[$object->table_element]['type'][$tmpkeyextra] == 'separate')
 		{
-            $extrafields_collapse_num = '';
-            $extrafield_param = $extrafields->attributes[$object->table_element]['param'][$tmpkeyextra];
-            if (!empty($extrafield_param) && is_array($extrafield_param)) {
-                $extrafield_param_list = array_keys($extrafield_param['options']);
+			$extrafields_collapse_num = '';
+			$extrafield_param = $extrafields->attributes[$object->table_element]['param'][$tmpkeyextra];
+			if (!empty($extrafield_param) && is_array($extrafield_param)) {
+				$extrafield_param_list = array_keys($extrafield_param['options']);
 
-                if (count($extrafield_param_list) > 0) {
-                    $extrafield_collapse_display_value = intval($extrafield_param_list[0]);
+				if (count($extrafield_param_list) > 0) {
+					$extrafield_collapse_display_value = intval($extrafield_param_list[0]);
 
-                    if ($extrafield_collapse_display_value == 1 || $extrafield_collapse_display_value == 2) {
-                        $extrafields_collapse_num = $extrafields->attributes[$object->table_element]['pos'][$tmpkeyextra];
-                    }
-                }
-            }
+					if ($extrafield_collapse_display_value == 1 || $extrafield_collapse_display_value == 2) {
+						$extrafields_collapse_num = $extrafields->attributes[$object->table_element]['pos'][$tmpkeyextra];
+					}
+				}
+			}
 
 			print $extrafields->showSeparator($tmpkeyextra, $object);
 
@@ -128,8 +128,13 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 			print '<td class="';
 			if ((!empty($action) && ($action == 'create' || $action == 'edit')) && !empty($extrafields->attributes[$object->table_element]['required'][$tmpkeyextra])) print ' fieldrequired';
 			print '">';
-			if (!empty($extrafields->attributes[$object->table_element]['help'][$tmpkeyextra])) print $form->textwithpicto($langs->trans($tmplabelextra), $langs->trans($extrafields->attributes[$object->table_element]['help'][$tmpkeyextra]));
-			else print $langs->trans($tmplabelextra);
+			if (!empty($extrafields->attributes[$object->table_element]['help'][$tmpkeyextra])) {
+				// You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
+				$tmptooltip = explode(':', $extrafields->attributes[$object->table_element]['help'][$tmpkeyextra]);
+				print $form->textwithpicto($langs->trans($tmplabelextra), $langs->trans($tmptooltip[0]), 1, 'help', '', 0, 3, (empty($tmptooltip[1]) ? '' : 'extra_'.$tmpkeyextra.'_'.$tmptooltip[1]));
+			} else {
+				print $langs->trans($tmplabelextra);
+			}
 			print '</td>';
 
 			//TODO Improve element and rights detection
@@ -141,7 +146,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 			if ($object->element == 'order_supplier')   $permok = $user->rights->fournisseur->commande->creer;
 			if ($object->element == 'invoice_supplier') $permok = $user->rights->fournisseur->facture->creer;
 			if ($object->element == 'shipping')         $permok = $user->rights->expedition->creer;
-			if ($object->element == 'delivery')         $permok = $user->rights->expedition->livraison->creer;
+			if ($object->element == 'delivery')         $permok = $user->rights->expedition->delivery->creer;
 			if ($object->element == 'productlot')       $permok = $user->rights->stock->creer;
 			if ($object->element == 'facturerec') 	    $permok = $user->rights->facture->creer;
 			if ($object->element == 'mo') 	    		$permok = $user->rights->mrp->write;
@@ -149,11 +154,11 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 			$isdraft = ((isset($object->statut) && $object->statut == 0) || (isset($object->status) && $object->status == 0));
 			if (($isdraft || !empty($extrafields->attributes[$object->table_element]['alwayseditable'][$tmpkeyextra]))
 				&& $permok && $enabled != 5 && ($action != 'edit_extras' || GETPOST('attribute') != $tmpkeyextra)
-			    && empty($extrafields->attributes[$object->table_element]['computed'][$tmpkeyextra]))
+				&& empty($extrafields->attributes[$object->table_element]['computed'][$tmpkeyextra]))
 			{
-			    $fieldid = 'id';
-			    if ($object->table_element == 'societe') $fieldid = 'socid';
-			    print '<td class="right"><a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?'.$fieldid.'='.$object->id.'&action=edit_extras&attribute='.$tmpkeyextra.'&ignorecollapsesetup=1">'.img_edit().'</a></td>';
+				$fieldid = 'id';
+				if ($object->table_element == 'societe') $fieldid = 'socid';
+				print '<td class="right"><a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?'.$fieldid.'='.$object->id.'&action=edit_extras&attribute='.$tmpkeyextra.'&ignorecollapsesetup=1">'.img_edit().'</a></td>';
 			}
 			print '</tr></table>';
 			print '</td>';
@@ -172,15 +177,15 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 					$datenotinstring = $db->jdate($datenotinstring);
 				}
 				//print 'x'.$object->array_options['options_' . $tmpkeyextra].'-'.$datenotinstring.' - '.dol_print_date($datenotinstring, 'dayhour');
-				$value = isset($_POST["options_".$tmpkeyextra]) ? dol_mktime($_POST["options_".$tmpkeyextra."hour"], $_POST["options_".$tmpkeyextra."min"], 0, $_POST["options_".$tmpkeyextra."month"], $_POST["options_".$tmpkeyextra."day"], $_POST["options_".$tmpkeyextra."year"]) : $datenotinstring;
+				$value = GETPOSTISSET("options_".$tmpkeyextra) ? dol_mktime(GETPOST("options_".$tmpkeyextra."hour", 'int'), GETPOST("options_".$tmpkeyextra."min", 'int'), 0, GETPOST("options_".$tmpkeyextra."month", 'int'), GETPOST("options_".$tmpkeyextra."day", 'int'), GETPOST("options_".$tmpkeyextra."year", 'int')) : $datenotinstring;
 			}
 
 			//TODO Improve element and rights detection
 			if ($action == 'edit_extras' && $permok && GETPOST('attribute', 'restricthtml') == $tmpkeyextra)
 			{
-			    $fieldid = 'id';
-			    if ($object->table_element == 'societe') $fieldid = 'socid';
-			    print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formextra">';
+				$fieldid = 'id';
+				if ($object->table_element == 'societe') $fieldid = 'socid';
+				print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formextra">';
 				print '<input type="hidden" name="action" value="update_extras">';
 				print '<input type="hidden" name="attribute" value="'.$tmpkeyextra.'">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -226,6 +231,9 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 								var parent = $(this).find("option[parent]:first").attr("parent");
 								var infos = parent.split(":");
 								var parent_list = infos[0];
+								showOptions(child_list, parent_list);
+
+								/* Activate the handler to call showOptions on each future change */
 								$("select[name=\""+parent_list+"\"]").change(function() {
 									showOptions(child_list, parent_list);
 								});
diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index b980ca40cef..a9098d60211 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -74,18 +74,18 @@ print '<div class="inline-block toolbarbutton centpercent">';
 // Toolbar
 if ($permtoadd)
 {
-	print '<a href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&module='.urlencode($module).($websitekey ? '&website='.$websitekey : '').($pageid ? '&pageid='.$pageid : '').'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid).'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('ECMAddSection')).'">';
-    print '<img class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
-    print '</a>';
+	print '<a href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&module='.urlencode($module).($websitekey ? '&website='.$websitekey : '').($pageid ? '&pageid='.$pageid : '').'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid).'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans('ECMAddSection')).'">';
+	print '<img class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
+	print '</a>';
 } else {
-    print '<a href="#" class="inline-block valignmiddle toolbarbutton" title="'.$langs->trans("NotAllowed").'">';
-    print '<img class="toolbarbutton disabled" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
-    print '</a>';
+	print '<a href="#" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.$langs->trans("NotAllowed").'">';
+	print '<img class="toolbarbutton disabled" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
+	print '</a>';
 }
 if ($module == 'ecm')
 {
 	$tmpurl = ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) ? '#' : ($_SERVER["PHP_SELF"].'?action=refreshmanual'.($module ? '&amp;module='.$module : '').($section ? '&amp;section='.$section : '')));
-	print '<a href="'.$tmpurl.'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('ReSyncListOfDir')).'">';
+	print '<a href="'.$tmpurl.'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans('ReSyncListOfDir')).'">';
 	print '<img id="refreshbutton" class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/view-refresh.png">';
 	print '</a>';
 }
@@ -112,8 +112,8 @@ if ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE
 	$sectiondir = GETPOST('file', 'alpha') ?GETPOST('file', 'alpha') : GETPOST('section_dir', 'alpha');
 	print '<!-- Start form to attach new file in filemanager.tpl.php sectionid='.$section.' sectiondir='.$sectiondir.' -->'."\n";
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-    $formfile = new FormFile($db);
-    $formfile->form_attach_new_file($_SERVER["PHP_SELF"], 'none', 0, ($section ? $section : -1), $permtoupload, 48, null, '', 0, '', 0, $nameforformuserfile, '', $sectiondir);
+	$formfile = new FormFile($db);
+	$formfile->form_attach_new_file($_SERVER["PHP_SELF"], 'none', 0, ($section ? $section : -1), $permtoupload, 48, null, '', 0, '', 0, $nameforformuserfile, '', $sectiondir);
 } else print '&nbsp;';
 
 print '</div>';
@@ -133,7 +133,7 @@ print '</div>';
 // Ask confirmation of deletion of directory
 if ($action == 'delete_section')
 {
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section, $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection', '', '', 1);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section, $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection', '', '', 1);
 }
 // End confirm
 
@@ -146,54 +146,54 @@ if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg
 
 	print '<!-- Title for manual directories -->'."\n";
 	print '<tr class="liste_titre">'."\n";
-    print '<th class="liste_titre left">';
-    print '&nbsp;'.$langs->trans("ECMSections");
+	print '<th class="liste_titre left">';
+	print '&nbsp;'.$langs->trans("ECMSections");
 	print '</th></tr>';
 
-    $showonrightsize = '';
+	$showonrightsize = '';
 
 	// Manual section
 	$htmltooltip = $langs->trans("ECMAreaDesc2");
 
-    if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))
-    {
-    	// Show the link to "Root"
-    	if ($showroot)
-    	{
-    		print '<tr><td><div style="padding-left: 5px; padding-right: 5px;"><a href="'.$_SERVER["PHP_SELF"].'?file_manager=1&pageid='.$pageid.'">';
-    		if ($module == 'medias') print $langs->trans("RootOfMedias");
-    		else print $langs->trans("Root");
-    		print '</a></div></td></tr>';
-    	}
+	if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))
+	{
+		// Show the link to "Root"
+		if ($showroot)
+		{
+			print '<tr><td><div style="padding-left: 5px; padding-right: 5px;"><a href="'.$_SERVER["PHP_SELF"].'?file_manager=1&pageid='.$pageid.'">';
+			if ($module == 'medias') print $langs->trans("RootOfMedias");
+			else print $langs->trans("Root");
+			print '</a></div></td></tr>';
+		}
 
-    	print '<tr><td>';
+		print '<tr><td>';
 
-    	// Show filemanager tree (will be filled by a call of ajax /ecm/tpl/enablefiletreeajax.tpl.php, later, that executes ajaxdirtree.php)
-	    print '<div id="filetree" class="ecmfiletree"></div>';
+		// Show filemanager tree (will be filled by a call of ajax /ecm/tpl/enablefiletreeajax.tpl.php, later, that executes ajaxdirtree.php)
+		print '<div id="filetree" class="ecmfiletree"></div>';
 
-	    if ($action == 'deletefile') print $form->formconfirm('eeeee', $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 'deletefile');
+		if ($action == 'deletefile') print $form->formconfirm('eeeee', $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 'deletefile');
 
-	    print '</td></tr>';
-    } else { // Show filtree when ajax is disabled (rare)
-        print '<tr><td style="padding-left: 20px">';
+		print '</td></tr>';
+	} else { // Show filtree when ajax is disabled (rare)
+		print '<tr><td style="padding-left: 20px">';
 
-        $_POST['modulepart'] = $module;
-        $_POST['openeddir'] = GETPOST('openeddir');
-        $_POST['dir'] = empty($_POST['dir']) ? '/' : $_POST['dir'];
+		$_POST['modulepart'] = $module;
+		$_POST['openeddir'] = GETPOST('openeddir');
+		$_POST['dir'] = empty($_POST['dir']) ? '/' : $_POST['dir'];
 
-        // Show filemanager tree (will be filled by direct include of ajaxdirtree.php in mode noajax, this will return all dir - all levels - to show)
-        print '<div id="filetree" class="ecmfiletree">';
+		// Show filemanager tree (will be filled by direct include of ajaxdirtree.php in mode noajax, this will return all dir - all levels - to show)
+		print '<div id="filetree" class="ecmfiletree">';
 
-        // Variables that may be defined:
-        // $_GET['modulepart'], $_GET['openeddir'], $_GET['sortfield'], $_GET['sortorder']
-        // $_POST['dir']
-        $mode = 'noajax';
-        if (empty($url)) $url = DOL_URL_ROOT.'/ecm/index.php';
-        include DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirtree.php';
+		// Variables that may be defined:
+		// $_GET['modulepart'], $_GET['openeddir'], $_GET['sortfield'], $_GET['sortorder']
+		// $_POST['dir']
+		$mode = 'noajax';
+		if (empty($url)) $url = DOL_URL_ROOT.'/ecm/index.php';
+		include DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirtree.php';
 
-    	print '</div>';
-    	print '</td></tr>';
-    }
+		print '</div>';
+		print '</td></tr>';
+	}
 
 
 	print "</table>";
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index a4b2ba13ed9..821b423aab3 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -20,10 +20,12 @@
 // Caller can also set 	$morelogincontent = array(['options']=>array('js'=>..., 'table'=>...);
 
 
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', 1);
+
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
-    print "Error, template page can't be called as URL";
-    exit;
+	print "Error, template page can't be called as URL";
+	exit;
 }
 
 
@@ -50,7 +52,14 @@ $arrayofjs = array(
 	'/includes/jstz/jstz.min.js'.(empty($conf->dol_use_jmobile) ? '' : '?version='.urlencode(DOL_VERSION)),
 	'/core/js/dst.js'.(empty($conf->dol_use_jmobile) ? '' : '?version='.urlencode(DOL_VERSION))
 );
-$titleofloginpage = $langs->trans('Login').' @ '.$titletruedolibarrversion; // $titletruedolibarrversion is defined by dol_loginfunction in security2.lib.php. We must keep the @, some tools use it to know it is login page and find true dolibarr version.
+
+// We display application title instead Login term
+if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+	$titleofloginpage = $conf->global->MAIN_APPLICATION_TITLE;
+} else {
+	$titleofloginpage = $langs->trans('Login');
+}
+$titleofloginpage .= ' @ '.$titletruedolibarrversion; // $titletruedolibarrversion is defined by dol_loginfunction in security2.lib.php. We must keep the @, some tools use it to know it is login page and find true dolibarr version.
 
 $disablenofollow = 1;
 if (!preg_match('/'.constant('DOL_APPLICATION_TITLE').'/', $title)) $disablenofollow = 0;
@@ -140,8 +149,7 @@ if ($disablenofollow) echo '</a>';
 <div class="tagtd nowraponall center valignmiddle tdinputlogin">
 <?php if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?><label for="username" class="hidden"><?php echo $langs->trans("Login"); ?></label><?php } ?>
 <!-- <span class="span-icon-user">-->
-<span class="fa fa-user">
-</span>
+<span class="fa fa-user"></span>
 <input type="text" id="username" placeholder="<?php echo $langs->trans("Login"); ?>" name="username" class="flat input-icon-user minwidth150" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" autofocus="autofocus" />
 </div>
 </div>
@@ -151,12 +159,35 @@ if ($disablenofollow) echo '</a>';
 <div class="tagtd nowraponall center valignmiddle tdinputlogin">
 <?php if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?><label for="password" class="hidden"><?php echo $langs->trans("Password"); ?></label><?php } ?>
 <!--<span class="span-icon-password">-->
-<span class="fa fa-key">
-</span>
+<span class="fa fa-key"></span>
 <input id="password" placeholder="<?php echo $langs->trans("Password"); ?>" name="password" class="flat input-icon-password minwidth150" type="password" value="<?php echo dol_escape_htmltag($password); ?>" tabindex="2" autocomplete="<?php echo empty($conf->global->MAIN_LOGIN_ENABLE_PASSWORD_AUTOCOMPLETE) ? 'off' : 'on'; ?>" />
 </div></div>
 
 <?php
+if ($captcha) {
+	// Add a variable param to force not using cache (jmobile)
+	$php_self = preg_replace('/[&\?]time=(\d+)/', '', $php_self); // Remove param time
+	if (preg_match('/\?/', $php_self)) $php_self .= '&time='.dol_print_date(dol_now(), 'dayhourlog');
+	else $php_self .= '?time='.dol_print_date(dol_now(), 'dayhourlog');
+	// TODO: provide accessible captcha variants
+	?>
+	<!-- Captcha -->
+	<div class="trinputlogin">
+	<div class="tagtd none valignmiddle tdinputlogin">
+
+	<span class="fa fa-unlock"></span>
+	<span class="span-icon-security inline-block">
+	<input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security width150" type="text" maxlength="5" name="code" tabindex="3" />
+	</span>
+	<span class="nowrap inline-block">
+	<img class="inline-block valignmiddle" src="<?php echo DOL_URL_ROOT ?>/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" />
+	<a class="inline-block valignmiddle" href="<?php echo $php_self; ?>" tabindex="4" data-role="button"><?php echo $captcha_refresh; ?></a>
+	</span>
+
+	</div></div>
+	<?php
+}
+
 if (!empty($morelogincontent)) {
 	if (is_array($morelogincontent)) {
 		foreach ($morelogincontent as $format => $option)
@@ -172,31 +203,7 @@ if (!empty($morelogincontent)) {
 	}
 }
 
-if ($captcha) {
-	// Add a variable param to force not using cache (jmobile)
-	$php_self = preg_replace('/[&\?]time=(\d+)/', '', $php_self); // Remove param time
-	if (preg_match('/\?/', $php_self)) $php_self .= '&time='.dol_print_date(dol_now(), 'dayhourlog');
-	else $php_self .= '?time='.dol_print_date(dol_now(), 'dayhourlog');
-	// TODO: provide accessible captcha variants
-	?>
-	<!-- Captcha -->
-	<div class="trinputlogin">
-	<div class="tagtd nowraponall none center valignmiddle tdinputlogin">
-
-	<table class="login_table_securitycode centpercent">
-	<tr class="valignmiddle">
-	<td>
-	<span class="span-icon-security">
-	<input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security width100" type="text" maxlength="5" name="code" tabindex="3" />
-	</span>
-	</td>
-	<td><img src="<?php echo DOL_URL_ROOT ?>/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" /></td>
-	<td><a href="<?php echo $php_self; ?>" tabindex="4" data-role="button"><?php echo $captcha_refresh; ?></a></td>
-	</tr>
-	</table>
-
-	</div></div>
-<?php } ?>
+?>
 
 </div>
 
@@ -286,18 +293,18 @@ if (!empty($_SESSION['dol_loginmesg']))
 
 // Add commit strip
 if (!empty($conf->global->MAIN_EASTER_EGG_COMMITSTRIP)) {
-    include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+	include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 	if (substr($langs->defaultlang, 0, 2) == 'fr') {
-		$resgetcommitstrip = getURLContent("http://www.commitstrip.com/fr/feed/");
+		$resgetcommitstrip = getURLContent("https://www.commitstrip.com/fr/feed/");
 	} else {
-		$resgetcommitstrip = getURLContent("http://www.commitstrip.com/en/feed/");
+		$resgetcommitstrip = getURLContent("https://www.commitstrip.com/en/feed/");
+	}
+	if ($resgetcommitstrip && $resgetcommitstrip['http_code'] == '200')
+	{
+		$xml = simplexml_load_string($resgetcommitstrip['content']);
+		$little = $xml->channel->item[0]->children('content', true);
+		print preg_replace('/width="650" height="658"/', '', $little->encoded);
 	}
-    if ($resgetcommitstrip && $resgetcommitstrip['http_code'] == '200')
-    {
-        $xml = simplexml_load_string($resgetcommitstrip['content']);
-        $little = $xml->channel->item[0]->children('content', true);
-        print preg_replace('/width="650" height="658"/', '', $little->encoded);
-    }
 }
 
 ?>
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index 900d0366d87..21070467f57 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -69,7 +69,7 @@ if ($massaction == 'presend')
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	$formmail = new FormMail($db);
 
-	dol_fiche_head(null, '', '');
+	print dol_get_fiche_head(null, '', '');
 
 	// Cree l'objet formulaire mail
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
@@ -160,7 +160,7 @@ if ($massaction == 'presend')
 		print $formmail->get_form();
 	}
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 // Allow Pre-Mass-Action hook (eg for confirmation dialog)
 $parameters = array(
@@ -170,7 +170,7 @@ $parameters = array(
 
 $reshook = $hookmanager->executeHooks('doPreMassActions', $parameters, $object, $action);
 if ($reshook < 0) {
-    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 } else {
-    print $hookmanager->resPrint;
+	print $hookmanager->resPrint;
 }
diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
index 8cda27679c4..283f9eeb873 100644
--- a/htdocs/core/tpl/notes.tpl.php
+++ b/htdocs/core/tpl/notes.tpl.php
@@ -88,20 +88,22 @@ else $typeofdata = 'textarea:12:95%';
 print '<!-- BEGIN PHP TEMPLATE NOTES -->'."\n";
 print '<div class="tagtable border table-border tableforfield centpercent">'."\n";
 print '<div class="tagtr table-border-row">'."\n";
-print '<div class="tagtd tagtdnote tdtop sensiblehtmlcontent table-key-border-col'.(empty($cssclass) ? '' : ' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";
+$editmode = (GETPOST('action', 'aZ09') == 'edit'.$note_public);
+print '<div class="tagtd tagtdnote tdtop'.($editmode ? '' : ' sensiblehtmlcontent').' table-key-border-col'.(empty($cssclass) ? '' : ' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";
 print $form->editfieldkey("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, $moreparam, '', 0);
 print '</div>'."\n";
-print '<div class="tagtd wordbreak table-val-border-col sensiblehtmlcontent">'."\n";
+print '<div class="tagtd wordbreak table-val-border-col'.($editmode ? '' : ' sensiblehtmlcontent').'">'."\n";
 print $form->editfieldval("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, '', null, null, $moreparam, 1)."\n";
 print '</div>'."\n";
 print '</div>'."\n";
 if (empty($user->socid)) {
 	// Private notes (always hidden to external users)
 	print '<div class="tagtr table-border-row">'."\n";
-	print '<div class="tagtd tagtdnote tdtop sensiblehtmlcontent table-key-border-col'.(empty($cssclass) ? '' : ' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";
+	$editmode = (GETPOST('action', 'aZ09') == 'edit'.$note_private);
+	print '<div class="tagtd tagtdnote tdtop'.($editmode ? '' : ' sensiblehtmlcontent').' table-key-border-col'.(empty($cssclass) ? '' : ' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";
 	print $form->editfieldkey("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, $moreparam, '', 0);
 	print '</div>'."\n";
-	print '<div class="tagtd wordbreak table-val-border-col sensiblehtmlcontent">'."\n";
+	print '<div class="tagtd wordbreak table-val-border-col'.($editmode ? '' : ' sensiblehtmlcontent').'">'."\n";
 	print $form->editfieldval("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, '', null, null, $moreparam, 1);
 	print '</div>'."\n";
 	print '</div>'."\n";
diff --git a/htdocs/core/tpl/object_discounts.tpl.php b/htdocs/core/tpl/object_discounts.tpl.php
index e3e921c20c5..7bc98d12278 100644
--- a/htdocs/core/tpl/object_discounts.tpl.php
+++ b/htdocs/core/tpl/object_discounts.tpl.php
@@ -44,7 +44,7 @@ if ($fixedDiscount > 0)
 	print $langs->trans($translationKey, $fixedDiscount).'.';
 } else {
 	$translationKey = (!empty($discount_type)) ? 'HasNoRelativeDiscountFromSupplier' : 'CompanyHasNoRelativeDiscount';
-	print $langs->trans($translationKey).'.';
+	print '<span class="opacitymedium">'.$langs->trans($translationKey).'.</span>';
 }
 if ($isNewObject) print ' ('.$addrelativediscount.')';
 
@@ -62,7 +62,7 @@ if ($absolute_discount > 0) {
 			$text .= ' ('.$addabsolutediscount.')';
 		}
 
-		print '<br>'.$text;
+		print '<div class="inline-block clearboth">'.$text.'</div>';
 	} else {
 		// Discount available of type fixed amount (not credit note)
 		$more = '('.$addabsolutediscount.')';
@@ -85,7 +85,7 @@ if ($absolute_creditnote > 0) {
 			$text .= '('.$addabsolutediscount.')';
 		}
 
-		print '<br>'.$text;
+		print '<div class="inline-block clearboth">'.$text.'</div>';
 	} else {  // We can add a credit note on a down payment or standard invoice or situation invoice
 		// There is credit notes discounts available
 		$more = $isInvoice && !$isNewObject ? ' ('.$viewabsolutediscount.')' : '';
@@ -95,7 +95,7 @@ if ($absolute_creditnote > 0) {
 
 if ($absolute_discount <= 0 && $absolute_creditnote <= 0) {
 	$translationKey = !empty($discount_type) ? 'HasNoAbsoluteDiscountFromSupplier' : 'CompanyHasNoAbsoluteDiscount';
-	print '<br>'.$langs->trans($translationKey).'.';
+	print '<br><span class="opacitymedium">'.$langs->trans($translationKey).'.</span>';
 
 	if ($isInvoice && $object->statut == $objclassname::STATUS_DRAFT && $object->type != $objclassname::TYPE_CREDIT_NOTE && $object->type != $objclassname::TYPE_DEPOSIT) {
 		print ' ('.$addabsolutediscount.')';
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index eed6c9d201e..f028c00d704 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -105,7 +105,7 @@ if ($nolinesbefore) {
 		<?php } ?>
 		<td class="linecolqty right"><?php echo $langs->trans('Qty'); ?></td>
 		<?php
-		if ($conf->global->PRODUCT_USE_UNITS)
+		if (!empty($conf->global->PRODUCT_USE_UNITS))
 		{
 			print '<td class="linecoluseunit left">';
 			print '<span id="title_units">';
@@ -324,17 +324,17 @@ if ($nolinesbefore) {
 		{
 			$coldisplay++;
 			?>
-	<td class="nobottom linecolresupplier"><input id="fourn_ref" name="fourn_ref" class="flat minwidth50 maxwidth150" value="<?php echo (isset($_POST["fourn_ref"]) ?GETPOST("fourn_ref", 'alpha', 2) : ''); ?>"></td>
+	<td class="nobottom linecolresupplier"><input id="fourn_ref" name="fourn_ref" class="flat minwidth50 maxwidth150" value="<?php echo (GETPOSTISSET("fourn_ref") ? GETPOST("fourn_ref", 'alpha', 2) : ''); ?>"></td>
         <?php }
 		print '<td class="nobottom linecolvat right">';
 		$coldisplay++;
 		if ($seller->tva_assuj == "0") echo '<input type="hidden" name="tva_tx" id="tva_tx" value="0">'.vatrate(0, true);
-		else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"]) ?GETPOST("tva_tx", 'alpha', 2) : -1), $seller, $buyer, 0, 0, '', false, 1);
+		else echo $form->load_tva('tva_tx', (GETPOSTISSET("tva_tx") ? GETPOST("tva_tx", 'alpha', 2) : -1), $seller, $buyer, 0, 0, '', false, 1);
 		?>
 	</td>
 
 	<td class="nobottom linecoluht right"><?php $coldisplay++; ?>
-		<input type="text" size="5" name="price_ht" id="price_ht" class="flat right" value="<?php echo (isset($_POST["price_ht"]) ?GETPOST("price_ht", 'alpha', 2) : ''); ?>">
+		<input type="text" size="5" name="price_ht" id="price_ht" class="flat right" value="<?php echo (GETPOSTISSET("price_ht") ? GETPOST("price_ht", 'alpha', 2) : ''); ?>">
 	</td>
 
 	<?php
@@ -342,7 +342,7 @@ if ($nolinesbefore) {
 		$coldisplay++;
 		?>
 		<td class="nobottom linecoluht_currency right">
-			<input type="text" size="5" name="multicurrency_price_ht" id="multicurrency_price_ht" class="flat right" value="<?php echo (isset($_POST["multicurrency_price_ht"]) ?GETPOST("multicurrency_price_ht", 'alpha', 2) : ''); ?>">
+			<input type="text" size="5" name="multicurrency_price_ht" id="multicurrency_price_ht" class="flat right" value="<?php echo (GETPOSTISSET("multicurrency_price_ht") ? GETPOST("multicurrency_price_ht", 'alpha', 2) : ''); ?>">
 		</td>
 		<?php
 	}
@@ -350,13 +350,13 @@ if ($nolinesbefore) {
 		$coldisplay++;
 		?>
 		<td class="nobottom linecoluttc right">
-			<input type="text" size="5" name="price_ttc" id="price_ttc" class="flat" value="<?php echo (isset($_POST["price_ttc"]) ?GETPOST("price_ttc", 'alpha', 2) : ''); ?>">
+			<input type="text" size="5" name="price_ttc" id="price_ttc" class="flat" value="<?php echo (GETPOSTISSET("price_ttc") ? GETPOST("price_ttc", 'alpha', 2) : ''); ?>">
 		</td>
 		<?php
 	}
 	$coldisplay++;
 	?>
-	<td class="nobottom linecolqty right"><input type="text" size="2" name="qty" id="qty" class="flat right" value="<?php echo (isset($_POST["qty"]) ?GETPOST("qty", 'alpha', 2) : 1); ?>">
+	<td class="nobottom linecolqty right"><input type="text" size="2" name="qty" id="qty" class="flat right" value="<?php echo (GETPOSTISSET("qty") ? GETPOST("qty", 'alpha', 2) : 1); ?>">
 	</td>
 	<?php
 	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
@@ -371,7 +371,7 @@ if ($nolinesbefore) {
 	}
 	$coldisplay++;
 	?>
-	<td class="nobottom nowrap linecoldiscount right"><input type="text" size="1" name="remise_percent" id="remise_percent" class="flat right" value="<?php echo (isset($_POST["remise_percent"]) ?GETPOST("remise_percent", 'alpha', 2) : $remise_percent); ?>"><span class="hideonsmartphone">%</span></td>
+	<td class="nobottom nowrap linecoldiscount right"><input type="text" size="1" name="remise_percent" id="remise_percent" class="flat right" value="<?php echo (GETPOSTISSET("remise_percent") ? GETPOST("remise_percent", 'alpha', 2) : $remise_percent); ?>"><span class="hideonsmartphone">%</span></td>
 	<?php
 	if ($this->situation_cycle_ref) {
 		$coldisplay++;
@@ -389,17 +389,17 @@ if ($nolinesbefore) {
 					<select id="fournprice_predef" name="fournprice_predef" class="flat minwidth75imp" style="display: none;"></select>
 				<?php } ?>
 				<!-- For free product -->
-				<input type="text" id="buying_price" name="buying_price" class="flat maxwidth75 right" value="<?php echo (isset($_POST["buying_price"]) ?GETPOST("buying_price", 'alpha', 2) : ''); ?>">
+				<input type="text" id="buying_price" name="buying_price" class="flat maxwidth75 right" value="<?php echo (GETPOSTISSET("buying_price") ? GETPOST("buying_price", 'alpha', 2) : ''); ?>">
 			</td>
 			<?php
 			if (!empty($conf->global->DISPLAY_MARGIN_RATES))
 			{
-				echo '<td class="nobottom nowrap margininfos right"><input class="flat right" type="text" size="2" id="np_marginRate" name="np_marginRate" value="'.(isset($_POST["np_marginRate"]) ?GETPOST("np_marginRate", 'alpha', 2) : '').'"><span class="np_marginRate hideonsmartphone">%</span></td>';
+				echo '<td class="nobottom nowrap margininfos right"><input class="flat right" type="text" size="2" id="np_marginRate" name="np_marginRate" value="'.(GETPOSTISSET("np_marginRate") ? GETPOST("np_marginRate", 'alpha', 2) : '').'"><span class="np_marginRate hideonsmartphone">%</span></td>';
 				$coldisplay++;
 			}
 			if (!empty($conf->global->DISPLAY_MARK_RATES))
 			{
-				echo '<td class="nobottom nowrap margininfos right"><input class="flat right" type="text" size="2" id="np_markRate" name="np_markRate" value="'.(isset($_POST["np_markRate"]) ?GETPOST("np_markRate", 'alpha', 2) : '').'"><span class="np_markRate hideonsmartphone">%</span></td>';
+				echo '<td class="nobottom nowrap margininfos right"><input class="flat right" type="text" size="2" id="np_markRate" name="np_markRate" value="'.(GETPOSTISSET("np_markRate") ? GETPOST("np_markRate", 'alpha', 2) : '').'"><span class="np_markRate hideonsmartphone">%</span></td>';
 				$coldisplay++;
 			}
 		}
@@ -419,7 +419,9 @@ if (is_object($objectline)) {
 if ((!empty($conf->service->enabled) || ($object->element == 'contrat')) && $dateSelector && GETPOST('type') != '0')	// We show date field if required
 {
 	print '<tr id="trlinefordates" class="oddeven">'."\n";
-	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { print '<td></td>'; }
+	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+		print '<td></td>';
+	}
 	print '<td colspan="'.($coldisplay - (empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? 0 : 1)).'">';
 	$date_start = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
 	$date_end = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
@@ -693,7 +695,8 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 			$("#buying_price").val("").show();
 
 			/* Call post to load content of combo list fournprice_predef */
-			$.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php?bestpricefirst=1', { 'idprod': $(this).val() }, function(data) {
+			var token = '<?php echo currentToken(); ?>';		// For AJAX Call we use old 'token' and not 'newtoken'
+			$.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php?bestpricefirst=1', { 'idprod': $(this).val(), 'token': token }, function(data) {
 				if (data && data.length > 0)
 				{
 					var options = ''; var defaultkey = ''; var defaultprice = ''; var bestpricefound = 0;
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 6ced56b5e03..bc6b87a3353 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -105,8 +105,8 @@ $coldisplay++;
 	if (is_object($hookmanager))
 	{
 		$fk_parent_line = (GETPOST('fk_parent_line') ? GETPOST('fk_parent_line') : $line->fk_parent_line);
-	    $parameters = array('line'=>$line, 'fk_parent_line'=>$fk_parent_line, 'var'=>$var, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer);
-	    $reshook = $hookmanager->executeHooks('formEditProductOptions', $parameters, $this, $action);
+		$parameters = array('line'=>$line, 'fk_parent_line'=>$fk_parent_line, 'var'=>$var, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer);
+		$reshook = $hookmanager->executeHooks('formEditProductOptions', $parameters, $this, $action);
 	}
 
 	// Do not allow editing during a situation cycle
@@ -142,7 +142,7 @@ $coldisplay++;
 	<?php
 	if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier')	// We must have same test in printObjectLines
 	{
-	    $coldisplay++;
+		$coldisplay++;
 		?>
 		<td class="right"><input id="fourn_ref" name="fourn_ref" class="flat minwidth50 maxwidth150" value="<?php echo ($line->ref_supplier ? $line->ref_supplier : $line->ref_fourn); ?>"></td>
 		<?php
@@ -161,7 +161,7 @@ $coldisplay++;
 	print '></td>';
 
 	if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
-	    $coldisplay++;
+		$coldisplay++;
 		print '<td class="right"><input rel="'.$object->multicurrency_tx.'" type="text" class="flat right" size="5" id="multicurrency_subprice" name="multicurrency_subprice" value="'.price($line->multicurrency_subprice).'" /></td>';
 	}
 
@@ -189,9 +189,9 @@ $coldisplay++;
 	</td>
 
 	<?php
-	if ($conf->global->PRODUCT_USE_UNITS)
+	if (!empty($conf->global->PRODUCT_USE_UNITS))
 	{
-	    $coldisplay++;
+		$coldisplay++;
 		print '<td class="left">';
 		print $form->selectUnits($line->fk_unit, "units");
 		print '</td>';
@@ -217,10 +217,10 @@ $coldisplay++;
 	}
 	if (!empty($usemargins))
 	{
-        if (!empty($user->rights->margins->creer))
-        {
-            $coldisplay++;
-        	?>
+		if (!empty($user->rights->margins->creer))
+		{
+			$coldisplay++;
+			?>
         <td class="margininfos right">
 			<!-- For predef product -->
 			<?php if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) { ?>
@@ -231,10 +231,10 @@ $coldisplay++;
 		</td>
 		<?php }
 
-        if ($user->rights->margins->creer) {
+		if ($user->rights->margins->creer) {
 			if (!empty($conf->global->DISPLAY_MARGIN_RATES))
 			{
-				$margin_rate = (isset($_POST["np_marginRate"]) ?GETPOST("np_marginRate", "alpha", 2) : (($line->pa_ht == 0) ? '' : price($line->marge_tx)));
+				$margin_rate = (GETPOSTISSET("np_marginRate") ? GETPOST("np_marginRate", "alpha", 2) : (($line->pa_ht == 0) ? '' : price($line->marge_tx)));
 				// if credit note, dont allow to modify margin
 				if ($line->subprice < 0)
 					echo '<td class="right nowrap margininfos">'.$margin_rate.'<span class="hideonsmartphone">%</span></td>';
@@ -242,7 +242,7 @@ $coldisplay++;
 				$coldisplay++;
 			} elseif (!empty($conf->global->DISPLAY_MARK_RATES))
 			{
-				$mark_rate = (isset($_POST["np_markRate"]) ?GETPOST("np_markRate", 'alpha', 2) : price($line->marque_tx));
+				$mark_rate = (GETPOSTISSET("np_markRate") ? GETPOST("np_markRate", 'alpha', 2) : price($line->marque_tx));
 				// if credit note, dont allow to modify margin
 				if ($line->subprice < 0)
 					echo '<td class="right nowrap margininfos">'.$mark_rate.'<span class="hideonsmartphone">%</span></td>';
@@ -255,8 +255,8 @@ $coldisplay++;
 
 	<!-- colspan for this td because it replace total_ht+3 td for buttons+... -->
 	<td class="center valignmiddle" colspan="<?php echo $colspan; ?>"><?php $coldisplay += $colspan; ?>
-		<input type="submit" class="button buttongen marginbottomonly" id="savelinebutton marginbottomonly" name="save" value="<?php echo $langs->trans("Save"); ?>"><br>
-		<input type="submit" class="button buttongen marginbottomonly" id="cancellinebutton" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>">
+		<input type="submit" class="button buttongen marginbottomonly button-save" id="savelinebutton marginbottomonly" name="save" value="<?php echo $langs->trans("Save"); ?>"><br>
+		<input type="submit" class="button buttongen marginbottomonly button-cancel" id="cancellinebutton" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>">
 	</td>
 </tr>
 
@@ -306,6 +306,79 @@ if (!empty($extrafields))
 
 <script>
 
+<?php
+if (!empty($usemargins) && $user->rights->margins->creer)
+{
+	?>
+	/* Some js test when we click on button "Add" */
+	jQuery(document).ready(function() {
+	<?php
+	if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+		?>
+			$("input[name='np_marginRate']:first").blur(function(e) {
+				return checkFreeLine(e, "np_marginRate");
+			});
+		<?php
+	}
+	if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+		?>
+			$("input[name='np_markRate']:first").blur(function(e) {
+				return checkFreeLine(e, "np_markRate");
+			});
+		<?php
+	}
+	?>
+	});
+
+	/* TODO This does not work for number with thousand separator that is , */
+	function checkFreeLine(e, npRate)
+	{
+		var buying_price = $("input[name='buying_price']:first");
+		var remise = $("input[name='remise_percent']:first");
+
+		var rate = $("input[name='"+npRate+"']:first");
+		if (rate.val() == '')
+			return true;
+
+		var ratejs = price2numjs(rate.val());
+		if (! $.isNumeric(ratejs))
+		{
+			alert('<?php echo dol_escape_js($langs->transnoentities("rateMustBeNumeric")); ?>');
+			e.stopPropagation();
+			setTimeout(function () { rate.focus() }, 50);
+			return false;
+		}
+		if (npRate == "np_markRate" && rate.val() >= 100)
+		{
+			alert('<?php echo dol_escape_js($langs->transnoentities("markRateShouldBeLesserThan100")); ?>');
+			e.stopPropagation();
+			setTimeout(function () { rate.focus() }, 50);
+			return false;
+		}
+
+		var price = 0;
+		remisejs=price2numjs(remise.val());
+
+		if (remisejs != 100)	// If a discount not 100 or no discount
+		{
+			if (remisejs == '') remisejs=0;
+
+			bpjs=price2numjs(buying_price.val());
+			ratejs=price2numjs(rate.val());
+
+			if (npRate == "np_marginRate")
+				price = ((bpjs * (1 + ratejs / 100)) / (1 - remisejs / 100));
+			else if (npRate == "np_markRate")
+				price = ((bpjs / (1 - ratejs / 100)) / (1 - remisejs / 100));
+		}
+		$("input[name='price_ht']:first").val(price);	// TODO Must use a function like php price to have here a formated value
+
+		return true;
+	}
+	<?php
+}
+?>
+
 jQuery(document).ready(function()
 {
 	jQuery("#price_ht").keyup(function(event) {
@@ -331,9 +404,9 @@ jQuery(document).ready(function()
 	});
 
     <?php
-    if (!empty($conf->margin->enabled))
-    {
-        ?>
+	if (!empty($conf->margin->enabled))
+	{
+		?>
 		/* Add rule to clear margin when we change some data, so when we change sell or buy price, margin will be recalculated after submitting form */
 		jQuery("#tva_tx").click(function() {						/* somtimes field is a text, sometimes a combo */
 			jQuery("input[name='np_marginRate']:first").val('');
@@ -361,7 +434,8 @@ jQuery(document).ready(function()
 		});
 
 		/* Init field buying_price and fournprice */
-		$.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', {'idprod': <?php echo $line->fk_product ? $line->fk_product : 0; ?>}, function(data) {
+		var token = '<?php echo currentToken(); ?>';		// For AJAX Call we use old 'token' and not 'newtoken'
+		$.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', {'idprod': <?php echo $line->fk_product ? $line->fk_product : 0; ?>, 'token': token }, function(data) {
           if (data && data.length > 0) {
 			var options = '';
 			var trouve=false;
@@ -397,8 +471,8 @@ jQuery(document).ready(function()
 		}
 		}, 'json');
         <?php
-    }
-    ?>
+	}
+	?>
 });
 
 </script>
diff --git a/htdocs/core/tpl/objectline_title.tpl.php b/htdocs/core/tpl/objectline_title.tpl.php
index 1154dd61834..bfced08e5c8 100644
--- a/htdocs/core/tpl/objectline_title.tpl.php
+++ b/htdocs/core/tpl/objectline_title.tpl.php
@@ -68,12 +68,12 @@ if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || !empty($conf->global->FA
 if (in_array($object->element, array('propal', 'commande', 'facture')) && $object->status == $object::STATUS_DRAFT)
 {
 	global $mysoc;
-	print img_edit($langs->trans("UpdateForAllLines"), 0, 'class="clickvatforalllines opacitymedium paddingleft"');
+	print img_edit($langs->trans("UpdateForAllLines"), 0, 'class="clickvatforalllines opacitymedium paddingleft cursorpointer"');
 	print '<script>$(document).ready(function() { $(".clickvatforalllines").click(function() { jQuery(".classvatforalllines").toggle(); }); });</script>';
 	print '<div class="classvatforalllines hidden inline-block nowraponall">';
 	//print '<input class="inline-block maxwidth50" type="text" name="vatforalllines" id="vatforalllines" value="">';
 	print $form->load_tva('vatforalllines', '', $mysoc, $object->thirdparty, 0, 0, '', false, 1);
-	print '<input class="inline-block" type="submit" name="submitforalllines" value="'.$langs->trans("Update").'">';
+	print '<input class="inline-block button smallpaddingimp" type="submit" name="submitforalllines" value="'.$langs->trans("Update").'">';
 	print '</div>';
 }
 print '</td>';
@@ -89,7 +89,7 @@ if ($inputalsopricewithtax) print '<td class="right" style="width: 80px">'.$lang
 // Qty
 print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
 
-if ($conf->global->PRODUCT_USE_UNITS)
+if (!empty($conf->global->PRODUCT_USE_UNITS))
 {
 	print '<td class="linecoluseunit left">'.$langs->trans('Unit').'</td>';
 }
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 99e727c48d5..cba0b0b3e53 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -73,12 +73,12 @@ $coldisplay = 0;
 <!-- BEGIN PHP TEMPLATE objectline_view.tpl.php -->
 <tr  id="row-<?php print $line->id?>" class="drag drop oddeven" <?php print $domData; ?> >
 <?php if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
-	<td class="linecolnum center"><?php $coldisplay++; ?><?php print ($i + 1); ?></td>
+	<td class="linecolnum center"><span class="opacitymedium"><?php $coldisplay++; ?><?php print ($i + 1); ?></span></td>
 <?php } ?>
 	<td class="linecoldescription minwidth300imp"><?php $coldisplay++; ?><div id="line_<?php print $line->id; ?>"></div>
 <?php
 if (($line->info_bits & 2) == 2) {
-    print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$this->socid.'">';
+	print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$this->socid.'">';
 	$txt = '';
 	print img_object($langs->trans("ShowReduc"), 'reduc').' ';
 	if ($line->description == '(DEPOSIT)') $txt = $langs->trans("Deposit");
@@ -101,7 +101,7 @@ if (($line->info_bits & 2) == 2) {
 			print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
 			// Add date of deposit
 			if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE))
-			    print ' ('.dol_print_date($discount->datec).')';
+				print ' ('.dol_print_date($discount->datec).')';
 		} elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
 		{
 			$discount = new DiscountAbsolute($this->db);
@@ -119,7 +119,7 @@ if (($line->info_bits & 2) == 2) {
 } else {
 	$format = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE ? 'dayhour' : 'day';
 
-    if ($line->fk_product > 0)
+	if ($line->fk_product > 0)
 	{
 		print $form->textwithtooltip($text, $description, 3, '', '', $i, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
 	} else {
@@ -162,7 +162,7 @@ if (($line->info_bits & 2) == 2) {
 
 if ($user->rights->fournisseur->lire && $line->fk_fournprice > 0)
 {
-    require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 	$productfourn = new ProductFournisseur($this->db);
 	$productfourn->fetch_product_fournisseur_price($line->fk_fournprice);
 	print '<div class="clearboth"></div>';
@@ -223,7 +223,7 @@ if ((($line->info_bits & 2) != 2) && $line->special_code != 3) {
 } else print '&nbsp;';
 print '</td>';
 
-if ($conf->global->PRODUCT_USE_UNITS)
+if (!empty($conf->global->PRODUCT_USE_UNITS))
 {
 	print '<td class="linecoluseunit nowrap left">';
 	$label = $line->getLabelOfUnit('short');
@@ -246,7 +246,7 @@ if (!empty($line->remise_percent) && $line->special_code != 3) {
 // Fields for situation invoices
 if ($this->situation_cycle_ref)
 {
-    include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+	include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 	$coldisplay++;
 	print '<td class="linecolcycleref nowrap right">'.$line->situation_percent.'%</td>';
 	$coldisplay++;
@@ -263,7 +263,7 @@ if ($usemargins && !empty($conf->margin->enabled) && empty($user->socid))
 	if (!empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous) { ?>
 		<td class="linecolmargin2 nowrap margininfos right"><?php $coldisplay++; ?><?php print (($line->pa_ht == 0) ? 'n/a' : price(price2num($line->marge_tx, 'MT')).'%'); ?></td>
 	<?php }
-    if (!empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous) {?>
+	if (!empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous) {?>
   	  <td class="linecolmargin2 nowrap margininfos right"><?php $coldisplay++; ?><?php print price(price2num($line->marque_tx, 'MT')).'%'; ?></td>
     <?php }
 }
@@ -300,7 +300,7 @@ if ($line->special_code == 3) { ?>
 	print price($sign * $line->total_ht);
 	if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 	{
-	    print '</span>';
+		print '</span>';
 	}
 	print '</td>';
 	if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
@@ -346,7 +346,7 @@ if ($this->statut == 0 && ($object_rights->creer) && $action != 'selectlines') {
 			</a>
 		<?php }
 		print '</td>';
-    } else {
+	} else {
 		print '<td '.(($conf->browser->layout != 'phone' && empty($disablemove)) ? ' class="linecolmove tdlineupdown center"' : ' class="linecolmove center"').'></td>';
 		$coldisplay++;
 	}
diff --git a/htdocs/core/tpl/onlinepaymentlinks.tpl.php b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
index dcf8e712709..959bf7fd6ad 100644
--- a/htdocs/core/tpl/onlinepaymentlinks.tpl.php
+++ b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
@@ -32,126 +32,126 @@ print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFr
 print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'free')."</strong><br><br>\n";
 if (!empty($conf->commande->enabled))
 {
-    print '<div id="order"></div>';
-    print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder", $servicename).':<br>';
+	print '<div id="order"></div>';
+	print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder", $servicename).':<br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'order')."</strong><br>\n";
 	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 	{
-	    $langs->load("orders");
-	    print '<form action="'.$_SERVER["PHP_SELF"].'#order" method="POST">';
-	    print '<input type="hidden" name="token" value="'.newToken().'">';
+		$langs->load("orders");
+		print '<form action="'.$_SERVER["PHP_SELF"].'#order" method="POST">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 
-	    print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Order")).': ';
-        print '<input type="text class="flat" id="generate_order_ref" name="generate_order_ref" value="'.GETPOST('generate_order_ref', 'alpha').'" size="10">';
-        print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
-        if (GETPOST('generate_order_ref', 'alpha'))
-        {
-            print '<br> -> <strong class="wordbreak">';
-            $url = getOnlinePaymentUrl(0, 'order', GETPOST('generate_order_ref', 'alpha'));
-            print $url;
-            print "</strong><br>\n";
-        }
-        print '</form>';
+		print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Order")).': ';
+		print '<input type="text class="flat" id="generate_order_ref" name="generate_order_ref" value="'.GETPOST('generate_order_ref', 'alpha').'" size="10">';
+		print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
+		if (GETPOST('generate_order_ref', 'alpha'))
+		{
+			print '<br> -> <strong class="wordbreak">';
+			$url = getOnlinePaymentUrl(0, 'order', GETPOST('generate_order_ref', 'alpha'));
+			print $url;
+			print "</strong><br>\n";
+		}
+		print '</form>';
 	}
 	print '<br>';
 }
 if (!empty($conf->facture->enabled))
 {
-    print '<div id="invoice"></div>';
-    print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnInvoice", $servicename).':<br>';
+	print '<div id="invoice"></div>';
+	print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnInvoice", $servicename).':<br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'invoice')."</strong><br>\n";
 	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 	{
-	    $langs->load("bills");
-	    print '<form action="'.$_SERVER["PHP_SELF"].'#invoice" method="POST">';
-	    print '<input type="hidden" name="token" value="'.newToken().'">';
+		$langs->load("bills");
+		print '<form action="'.$_SERVER["PHP_SELF"].'#invoice" method="POST">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 
-	    print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Invoice")).': ';
-        print '<input type="text class="flat" id="generate_invoice_ref" name="generate_invoice_ref" value="'.GETPOST('generate_invoice_ref', 'alpha').'" size="10">';
-        print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
-        if (GETPOST('generate_invoice_ref', 'alpha'))
-        {
-            print '<br> -> <strong class="wordbreak">';
-            $url = getOnlinePaymentUrl(0, 'invoice', GETPOST('generate_invoice_ref', 'alpha'));
-            print $url;
-            print "</strong><br>\n";
-        }
-        print '</form>';
+		print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Invoice")).': ';
+		print '<input type="text class="flat" id="generate_invoice_ref" name="generate_invoice_ref" value="'.GETPOST('generate_invoice_ref', 'alpha').'" size="10">';
+		print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
+		if (GETPOST('generate_invoice_ref', 'alpha'))
+		{
+			print '<br> -> <strong class="wordbreak">';
+			$url = getOnlinePaymentUrl(0, 'invoice', GETPOST('generate_invoice_ref', 'alpha'));
+			print $url;
+			print "</strong><br>\n";
+		}
+		print '</form>';
 	}
 	print '<br>';
 }
 if (!empty($conf->contrat->enabled))
 {
-    print '<div id="contractline"></div>';
-    print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnContractLine", $servicename).':<br>';
+	print '<div id="contractline"></div>';
+	print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnContractLine", $servicename).':<br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'contractline')."</strong><br>\n";
 	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 	{
-	    $langs->load("contracts");
-	    print '<form action="'.$_SERVER["PHP_SELF"].'#contractline" method="POST">';
-	    print '<input type="hidden" name="token" value="'.newToken().'">';
+		$langs->load("contracts");
+		print '<form action="'.$_SERVER["PHP_SELF"].'#contractline" method="POST">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 
-	    print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("ContractLine")).': ';
-        print '<input type="text class="flat" id="generate_contract_ref" name="generate_contract_ref" value="'.GETPOST('generate_contract_ref', 'alpha').'" size="10">';
-        print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
-        if (GETPOST('generate_contract_ref'))
-        {
-            print '<br> -> <strong class="wordbreak">';
-            $url = getOnlinePaymentUrl(0, 'contractline', GETPOST('generate_contract_ref', 'alpha'));
-            print $url;
-            print "</strong><br>\n";
-        }
-        print '</form>';
+		print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("ContractLine")).': ';
+		print '<input type="text class="flat" id="generate_contract_ref" name="generate_contract_ref" value="'.GETPOST('generate_contract_ref', 'alpha').'" size="10">';
+		print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
+		if (GETPOST('generate_contract_ref'))
+		{
+			print '<br> -> <strong class="wordbreak">';
+			$url = getOnlinePaymentUrl(0, 'contractline', GETPOST('generate_contract_ref', 'alpha'));
+			print $url;
+			print "</strong><br>\n";
+		}
+		print '</form>';
 	}
 	print '<br>';
 }
 if (!empty($conf->adherent->enabled))
 {
-    print '<div id="membersubscription"></div>';
-    print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnMemberSubscription", $servicename).':<br>';
+	print '<div id="membersubscription"></div>';
+	print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnMemberSubscription", $servicename).':<br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'membersubscription')."</strong><br>\n";
 	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 	{
-	    $langs->load("members");
-	    print '<form action="'.$_SERVER["PHP_SELF"].'#membersubscription" method="POST">';
-	    print '<input type="hidden" name="token" value="'.newToken().'">';
+		$langs->load("members");
+		print '<form action="'.$_SERVER["PHP_SELF"].'#membersubscription" method="POST">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 
-	    print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Member")).': ';
-        print '<input type="text class="flat" id="generate_member_ref" name="generate_member_ref" value="'.GETPOST('generate_member_ref', 'alpha').'" size="10">';
-        print '<input type="submit" class="none reposition button" value="'.$langs->trans("GetSecuredUrl").'">';
-        if (GETPOST('generate_member_ref'))
-        {
-            print '<br> -> <strong class="wordbreak">';
-            $url = getOnlinePaymentUrl(0, 'membersubscription', GETPOST('generate_member_ref', 'alpha'));
-            print $url;
-            print "</strong><br>\n";
-        }
-        print '</form>';
+		print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Member")).': ';
+		print '<input type="text class="flat" id="generate_member_ref" name="generate_member_ref" value="'.GETPOST('generate_member_ref', 'alpha').'" size="10">';
+		print '<input type="submit" class="none reposition button" value="'.$langs->trans("GetSecuredUrl").'">';
+		if (GETPOST('generate_member_ref'))
+		{
+			print '<br> -> <strong class="wordbreak">';
+			$url = getOnlinePaymentUrl(0, 'membersubscription', GETPOST('generate_member_ref', 'alpha'));
+			print $url;
+			print "</strong><br>\n";
+		}
+		print '</form>';
 	}
 	print '<br>';
 }
 if (!empty($conf->don->enabled))
 {
-    print '<div id="donation"></div>';
+	print '<div id="donation"></div>';
 	print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnDonation", $servicename).':<br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'donation')."</strong><br>\n";
 	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 	{
-	    $langs->load("members");
-	    print '<form action="'.$_SERVER["PHP_SELF"].'#donation" method="POST">';
-	    print '<input type="hidden" name="token" value="'.newToken().'">';
+		$langs->load("members");
+		print '<form action="'.$_SERVER["PHP_SELF"].'#donation" method="POST">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 
-	    print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Don")).': ';
-        print '<input type="text class="flat" id="generate_donation_ref" name="generate_donation_ref" value="'.GETPOST('generate_donation_ref', 'alpha').'" size="10">';
-        print '<input type="submit" class="none reposition button" value="'.$langs->trans("GetSecuredUrl").'">';
-        if (GETPOST('generate_donation_ref'))
-        {
-            print '<br> -> <strong class="wordbreak">';
-            $url = getOnlinePaymentUrl(0, 'donation', GETPOST('generate_donation_ref', 'alpha'));
-            print $url;
-            print "</strong><br>\n";
-        }
-        print '</form>';
+		print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Don")).': ';
+		print '<input type="text class="flat" id="generate_donation_ref" name="generate_donation_ref" value="'.GETPOST('generate_donation_ref', 'alpha').'" size="10">';
+		print '<input type="submit" class="none reposition button" value="'.$langs->trans("GetSecuredUrl").'">';
+		if (GETPOST('generate_donation_ref'))
+		{
+			print '<br> -> <strong class="wordbreak">';
+			$url = getOnlinePaymentUrl(0, 'donation', GETPOST('generate_donation_ref', 'alpha'));
+			print $url;
+			print "</strong><br>\n";
+		}
+		print '</form>';
 	}
 	print '<br>';
 }
diff --git a/htdocs/core/tpl/originproductline.tpl.php b/htdocs/core/tpl/originproductline.tpl.php
index 1b996556253..bd87008d0f8 100644
--- a/htdocs/core/tpl/originproductline.tpl.php
+++ b/htdocs/core/tpl/originproductline.tpl.php
@@ -36,7 +36,7 @@ if (!empty($conf->multicurrency->enabled))
 	print '<td class="right">'.$this->tpl['multicurrency_price'].'</td>';
 
 print '<td class="right">'.$this->tpl['qty'].'</td>';
-if ($conf->global->PRODUCT_USE_UNITS)
+if (!empty($conf->global->PRODUCT_USE_UNITS))
 	print '<td class="left">'.$langs->trans($this->tpl['unit']).'</td>';
 
 print '<td class="right">'.$this->tpl['remise_percent'].'</td>';
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 84abd97bc14..937ee63a68c 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -16,6 +16,9 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
+
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', 1);
+
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf))
 {
@@ -104,13 +107,36 @@ if ($disablenofollow) echo '</a>';
 <div class="trinputlogin">
 <div class="tagtd nowraponall center valignmiddle tdinputlogin">
 <!-- <span class="span-icon-user">-->
-<span class="fa fa-user">
-</span>
+<span class="fa fa-user"></span>
 <input type="text" placeholder="<?php echo $langs->trans("Login"); ?>" <?php echo $disabled; ?> id="username" name="username" class="flat input-icon-user minwidth150" value="<?php echo dol_escape_htmltag($username); ?>" tabindex="1" />
 </div>
 </div>
 
 <?php
+if ($captcha) {
+	// Add a variable param to force not using cache (jmobile)
+	$php_self = preg_replace('/[&\?]time=(\d+)/', '', $php_self); // Remove param time
+	if (preg_match('/\?/', $php_self)) $php_self .= '&time='.dol_print_date(dol_now(), 'dayhourlog');
+	else $php_self .= '?time='.dol_print_date(dol_now(), 'dayhourlog');
+	// TODO: provide accessible captcha variants
+	?>
+	<!-- Captcha -->
+	<div class="trinputlogin">
+	<div class="tagtd tdinputlogin nowraponall none valignmiddle">
+
+	<span class="fa fa-unlock"></span>
+	<span class="nofa inline-block">
+	<input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security width150" type="text" maxlength="5" name="code" tabindex="3" />
+	</span>
+	<span class="nowrap inline-block">
+	<img class="inline-block valignmiddle" src="<?php echo DOL_URL_ROOT ?>/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" />
+	<a class="inline-block valignmiddle" href="<?php echo $php_self; ?>" tabindex="4"><?php echo $captcha_refresh; ?></a>
+	</span>
+
+	</div></div>
+	<?php
+}
+
 if (!empty($morelogincontent)) {
 	if (is_array($morelogincontent)) {
 		foreach ($morelogincontent as $format => $option)
@@ -127,31 +153,6 @@ if (!empty($morelogincontent)) {
 }
 ?>
 
-<?php if ($captcha) {
-	// Add a variable param to force not using cache (jmobile)
-	$php_self = preg_replace('/[&\?]time=(\d+)/', '', $php_self); // Remove param time
-	if (preg_match('/\?/', $php_self)) $php_self .= '&time='.dol_print_date(dol_now(), 'dayhourlog');
-	else $php_self .= '?time='.dol_print_date(dol_now(), 'dayhourlog');
-	?>
-	<!-- Captcha -->
-	<div class="trinputlogin">
-	<div class="tdinputlogin nowraponall none center valignmiddle tdinputlogin">
-
-	<table class="login_table_securitycode centpercent">
-	<tr class="valignmiddle">
-	<td>
-	<!-- <span class="span-icon-security"> -->
-	<span class="nofa">
-	<input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security width100" type="text" maxlength="5" name="code" tabindex="3" />
-	</span>
-	</td>
-	<td><img src="<?php echo DOL_URL_ROOT ?>/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" /></td>
-	<td><a href="<?php echo $php_self; ?>" tabindex="4"><?php echo $captcha_refresh; ?></a></td>
-	</tr></table>
-
-	</div></div>
-<?php } ?>
-
 </div>
 
 </div> <!-- end div login_right -->
diff --git a/htdocs/core/tpl/resource_add.tpl.php b/htdocs/core/tpl/resource_add.tpl.php
index 05b9d6fd50a..d1db4a819a5 100644
--- a/htdocs/core/tpl/resource_add.tpl.php
+++ b/htdocs/core/tpl/resource_add.tpl.php
@@ -32,8 +32,8 @@ $events = array();
 $out .= $formresources->select_resource_list('', 'fk_resource', '', 1, 1, 0, $events, '', 2, null);
 $out .= '</div>';
 
-$out .= '<div class="tagtd"><label>'.$langs->trans('Busy').'</label> '.$form->selectyesno('busy', (isset($_POST['busy']) ? $_POST['busy'] : 1), 1).'</div>';
-$out .= '<div class="tagtd"><label>'.$langs->trans('Mandatory').'</label> '.$form->selectyesno('mandatory', (isset($_POST['mandatory']) ? $_POST['mandatory'] : 0), 1).'</div>';
+$out .= '<div class="tagtd"><label>'.$langs->trans('Busy').'</label> '.$form->selectyesno('busy', (GETPOSTISSET('busy') ? GETPOST('busy') : 1), 1).'</div>';
+$out .= '<div class="tagtd"><label>'.$langs->trans('Mandatory').'</label> '.$form->selectyesno('mandatory', (GETPOSTISSET('mandatory') ? GETPOST('mandatory') : 0), 1).'</div>';
 
 $out .= '<div class="tagtd right">';
 $out .= '<input type="submit" id="add-resource-place" class="button" value="'.$langs->trans("Add").'"/>';
diff --git a/htdocs/core/tpl/resource_view.tpl.php b/htdocs/core/tpl/resource_view.tpl.php
index 9bc8447a796..1df05e6e0a1 100644
--- a/htdocs/core/tpl/resource_view.tpl.php
+++ b/htdocs/core/tpl/resource_view.tpl.php
@@ -38,9 +38,9 @@ if ((array) $linked_resources && count($linked_resources) > 0)
 
 		if ($mode == 'edit' && $linked_resource['rowid'] == GETPOST('lineid'))
 		{
-		    print '<div class="tagtr oddeven">';
-		    print '<input type="hidden" name="lineid" value="'.$linked_resource['rowid'].'" />';
-		    print '<input type="hidden" name="element" value="'.$element.'" />';
+			print '<div class="tagtr oddeven">';
+			print '<input type="hidden" name="lineid" value="'.$linked_resource['rowid'].'" />';
+			print '<input type="hidden" name="element" value="'.$element.'" />';
 			print '<input type="hidden" name="element_id" value="'.$element_id.'" />';
 
 			print '<div class="tagtd">'.$object_resource->getNomUrl(1).'</div>';
diff --git a/htdocs/core/triggers/dolibarrtriggers.class.php b/htdocs/core/triggers/dolibarrtriggers.class.php
index 3d60ea890ed..4db110c20da 100644
--- a/htdocs/core/triggers/dolibarrtriggers.class.php
+++ b/htdocs/core/triggers/dolibarrtriggers.class.php
@@ -70,8 +70,19 @@ abstract class DolibarrTriggers
 	 */
 	public $errors = array();
 
+	/**
+	 * @var string module is in development
+	 */
 	const VERSION_DEVELOPMENT = 'development';
+
+	/**
+	 * @var string module is experimental
+	 */
 	const VERSION_EXPERIMENTAL = 'experimental';
+
+	/**
+	 * @var string module is dolibarr ready
+	 */
 	const VERSION_DOLIBARR = 'dolibarr';
 
 	/**
@@ -79,13 +90,12 @@ abstract class DolibarrTriggers
 	 *
 	 * @param DoliDB $db Database handler
 	 */
-    public function __construct(DoliDB $db)
-    {
+	public function __construct(DoliDB $db)
+	{
 
 		$this->db = $db;
 
-		if (empty($this->name))
-		{
+		if (empty($this->name)) {
 			$this->name = preg_replace('/^Interface/i', '', get_class($this));
 		}
 	}
@@ -133,16 +143,16 @@ abstract class DolibarrTriggers
 		}
 	}
 
-    /**
-     *  Function called when a Dolibarrr business event is done.
-     *  All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
-     *
-     *  @param string       $action     Event action code
-     *  @param Object       $object     Object
-     *  @param User         $user       Object user
-     *  @param Translate    $langs      Object langs
-     *  @param conf         $conf       Object conf
-     *  @return int                     <0 if KO, 0 if no triggered ran, >0 if OK
-     */
-    public abstract function runTrigger($action, $object, User $user, Translate $langs, Conf $conf);
+	/**
+	 *  Function called when a Dolibarrr business event is done.
+	 *  All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
+	 *
+	 *  @param string       $action     Event action code
+	 *  @param Object       $object     Object
+	 *  @param User         $user       Object user
+	 *  @param Translate    $langs      Object langs
+	 *  @param conf         $conf       Object conf
+	 *  @return int                     <0 if KO, 0 if no triggered ran, >0 if OK
+	 */
+	public abstract function runTrigger($action, $object, User $user, Translate $langs, Conf $conf);
 }
diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php
index 4f368f95473..48c9614dea6 100644
--- a/htdocs/core/triggers/interface_20_all_Logevents.class.php
+++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php
@@ -32,19 +32,21 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
 class InterfaceLogevents extends DolibarrTriggers
 {
 	/**
-	 * @var string Image of the trigger
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
 	 */
-	public $picto = 'technic';
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-	public $family = 'core';
-
-	public $description = "Triggers of this module allows to add security event records inside Dolibarr.";
-
-	/**
-	 * Version of the trigger
-	 * @var string
-	 */
-	public $version = self::VERSION_DOLIBARR;
+		$this->name = preg_replace('/^Interface/i', '', get_class($this));
+		$this->family = "core";
+		$this->description = "Triggers of this module allows to add security event records inside Dolibarr.";
+		// 'development', 'experimental', 'dolibarr' or version
+		$this->version = self::VERSION_DOLIBARR;
+		$this->picto = 'technic';
+	}
 
 	/**
 	 * Function called when a Dolibarrr security audit event is done.
@@ -58,120 +60,102 @@ class InterfaceLogevents extends DolibarrTriggers
 	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
-    {
-    	if (!empty($conf->global->MAIN_LOGEVENTS_DISABLE_ALL)) return 0; // Log events is disabled (hidden features)
+	{
+		if (!empty($conf->global->MAIN_LOGEVENTS_DISABLE_ALL)) return 0; // Log events is disabled (hidden features)
 
-    	$key = 'MAIN_LOGEVENTS_'.$action;
-    	//dol_syslog("xxxxxxxxxxx".$key);
-    	if (empty($conf->global->$key)) return 0; // Log events not enabled for this action
+		$key = 'MAIN_LOGEVENTS_'.$action;
+		//dol_syslog("xxxxxxxxxxx".$key);
+		if (empty($conf->global->$key)) return 0; // Log events not enabled for this action
 
-    	if (empty($conf->entity)) $conf->entity = $entity; // forcing of the entity if it's not defined (ex: in login form)
+		if (empty($conf->entity)) $conf->entity = $entity; // forcing of the entity if it's not defined (ex: in login form)
 
-        $date = dol_now();
+		$date = dol_now();
 
-        // Actions
-        if ($action == 'USER_LOGIN')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+		// Actions
+		if ($action == 'USER_LOGIN') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-            $langs->load("users");
-            // Initialisation donnees (date,duree,texte,desc)
-            $text = "(UserLogged,".$object->login.")";
-            $text .= (empty($object->trigger_mesg) ? '' : ' - '.$object->trigger_mesg);
-            $desc = "(UserLogged,".$object->login.")";
-            $desc .= (empty($object->trigger_mesg) ? '' : ' - '.$object->trigger_mesg);
-        }
-        if ($action == 'USER_LOGIN_FAILED')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("users");
+			// Initialisation donnees (date,duree,texte,desc)
+			$text = "(UserLogged,".$object->login.")";
+			$text .= (empty($object->trigger_mesg) ? '' : ' - '.$object->trigger_mesg);
+			$desc = "(UserLogged,".$object->login.")";
+			$desc .= (empty($object->trigger_mesg) ? '' : ' - '.$object->trigger_mesg);
+		} elseif ($action == 'USER_LOGIN_FAILED') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-            // Initialisation donnees (date,duree,texte,desc)
-            $text = $object->trigger_mesg; // Message direct
-            $desc = $object->trigger_mesg; // Message direct
-        }
-        if ($action == 'USER_LOGOUT')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			// Initialisation donnees (date,duree,texte,desc)
+			$text = $object->trigger_mesg; // Message direct
+			$desc = $object->trigger_mesg; // Message direct
+		} elseif ($action == 'USER_LOGOUT') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-            $langs->load("users");
-            // Initialisation donnees (date,duree,texte,desc)
-            $text = "(UserLogoff,".$object->login.")";
-            $desc = "(UserLogoff,".$object->login.")";
-        }
-        if ($action == 'USER_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            $langs->load("users");
+			$langs->load("users");
+			// Initialisation donnees (date,duree,texte,desc)
+			$text = "(UserLogoff,".$object->login.")";
+			$desc = "(UserLogoff,".$object->login.")";
+		} elseif ($action == 'USER_CREATE') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("users");
 
-            // Initialisation donnees (date,duree,texte,desc)
-            $text = $langs->transnoentities("NewUserCreated", $object->login);
-            $desc = $langs->transnoentities("NewUserCreated", $object->login);
-		} elseif ($action == 'USER_MODIFY')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            $langs->load("users");
+			// Initialisation donnees (date,duree,texte,desc)
+			$text = $langs->transnoentities("NewUserCreated", $object->login);
+			$desc = $langs->transnoentities("NewUserCreated", $object->login);
+		} elseif ($action == 'USER_MODIFY') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("users");
 
-            // Initialisation donnees (date,duree,texte,desc)
-            $text = $langs->transnoentities("EventUserModified", $object->login);
-            $desc = $langs->transnoentities("EventUserModified", $object->login);
-        } elseif ($action == 'USER_NEW_PASSWORD')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            $langs->load("users");
+			// Initialisation donnees (date,duree,texte,desc)
+			$text = $langs->transnoentities("EventUserModified", $object->login);
+			$desc = $langs->transnoentities("EventUserModified", $object->login);
+		} elseif ($action == 'USER_NEW_PASSWORD') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("users");
 
-            // Initialisation donnees (date,duree,texte,desc)
-            $text = $langs->transnoentities("NewUserPassword", $object->login);
-            $desc = $langs->transnoentities("NewUserPassword", $object->login);
-        } elseif ($action == 'USER_ENABLEDISABLE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            $langs->load("users");
-            // Initialisation donnees (date,duree,texte,desc)
-			if ($object->statut == 0)
-			{
+			// Initialisation donnees (date,duree,texte,desc)
+			$text = $langs->transnoentities("NewUserPassword", $object->login);
+			$desc = $langs->transnoentities("NewUserPassword", $object->login);
+		} elseif ($action == 'USER_ENABLEDISABLE') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("users");
+			// Initialisation donnees (date,duree,texte,desc)
+			if ($object->statut == 0) {
 				$text = $langs->transnoentities("UserEnabled", $object->login);
 				$desc = $langs->transnoentities("UserEnabled", $object->login);
 			}
-			if ($object->statut == 1)
-			{
+			if ($object->statut == 1) {
 				$text = $langs->transnoentities("UserDisabled", $object->login);
 				$desc = $langs->transnoentities("UserDisabled", $object->login);
 			}
-        } elseif ($action == 'USER_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            $langs->load("users");
-            // Initialisation donnees (date,duree,texte,desc)
-            $text = $langs->transnoentities("UserDeleted", $object->login);
-            $desc = $langs->transnoentities("UserDeleted", $object->login);
-        }
-
-		// Groupes
-        elseif ($action == 'USERGROUP_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            $langs->load("users");
-            // Initialisation donnees (date,duree,texte,desc)
-            $text = $langs->transnoentities("NewGroupCreated", $object->name);
-            $desc = $langs->transnoentities("NewGroupCreated", $object->name);
-		} elseif ($action == 'USERGROUP_MODIFY')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            $langs->load("users");
-            // Initialisation donnees (date,duree,texte,desc)
-            $text = $langs->transnoentities("GroupModified", $object->name);
-            $desc = $langs->transnoentities("GroupModified", $object->name);
-		} elseif ($action == 'USERGROUP_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            $langs->load("users");
-            // Initialisation donnees (date,duree,texte,desc)
-            $text = $langs->transnoentities("GroupDeleted", $object->name);
-            $desc = $langs->transnoentities("GroupDeleted", $object->name);
+		} elseif ($action == 'USER_DELETE') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("users");
+			// Initialisation donnees (date,duree,texte,desc)
+			$text = $langs->transnoentities("UserDeleted", $object->login);
+			$desc = $langs->transnoentities("UserDeleted", $object->login);
+		} elseif ($action == 'USERGROUP_CREATE') {
+			// Groups
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("users");
+			// Initialisation donnees (date,duree,texte,desc)
+			$text = $langs->transnoentities("NewGroupCreated", $object->name);
+			$desc = $langs->transnoentities("NewGroupCreated", $object->name);
+		} elseif ($action == 'USERGROUP_MODIFY') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("users");
+			// Initialisation donnees (date,duree,texte,desc)
+			$text = $langs->transnoentities("GroupModified", $object->name);
+			$desc = $langs->transnoentities("GroupModified", $object->name);
+		} elseif ($action == 'USERGROUP_DELETE') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("users");
+			// Initialisation donnees (date,duree,texte,desc)
+			$text = $langs->transnoentities("GroupDeleted", $object->name);
+			$desc = $langs->transnoentities("GroupDeleted", $object->name);
 		}
 
 		// If not found
-        /*
+		/*
         else
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' was ran by ".__FILE__." but no handler found for this action.");
@@ -182,27 +166,26 @@ class InterfaceLogevents extends DolibarrTriggers
 		// Add more information into desc from the context property
 		if (!empty($desc) && !empty($object->context['audit'])) $desc .= ' - '.$object->context['audit'];
 
-        // Add entry in event table
+		// Add entry in event table
 		include_once DOL_DOCUMENT_ROOT.'/core/class/events.class.php';
 
 		$event = new Events($this->db);
-        $event->type = $action;
-        $event->dateevent = $date;
-        $event->label = $text;
-        $event->description = $desc;
-		$event->user_agent = $_SERVER["HTTP_USER_AGENT"];
+		$event->type = $action;
+		$event->dateevent = $date;
+		$event->label = $text;
+		$event->description = $desc;
+		$event->user_agent = (empty($_SERVER["HTTP_USER_AGENT"]) ? '' : $_SERVER["HTTP_USER_AGENT"]);
 
-        $result = $event->create($user);
-        if ($result > 0)
-        {
-            return 1;
-        } else {
-            $error = "Failed to insert security event: ".$event->error;
-            $this->errors[] = $error;
-            $this->error = $error;
+		$result = $event->create($user);
+		if ($result > 0) {
+			return 1;
+		} else {
+			$error = "Failed to insert security event: ".$event->error;
+			$this->errors[] = $error;
+			$this->error = $error;
 
-            dol_syslog(get_class($this).": ".$error, LOG_ERR);
-            return -1;
-        }
-    }
+			dol_syslog(get_class($this).": ".$error, LOG_ERR);
+			return -1;
+		}
+	}
 }
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index 09ae60a69b7..9793022319e 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -33,18 +33,21 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
 class InterfaceWorkflowManager extends DolibarrTriggers
 {
 	/**
-	 * @var string Image of the trigger
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
 	 */
-	public $picto = 'technic';
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-	public $family = 'core';
-	public $description = "Triggers of this module allows to manage workflows";
-
-	/**
-	 * Version of the trigger
-	 * @var string
-	 */
-	public $version = self::VERSION_DOLIBARR;
+		$this->name = preg_replace('/^Interface/i', '', get_class($this));
+		$this->family = "core";
+		$this->description = "Triggers of this module allows to manage workflows";
+		// 'development', 'experimental', 'dolibarr' or version
+		$this->version = self::VERSION_DOLIBARR;
+		$this->picto = 'technic';
+	}
 
 	/**
 	 * Function called when a Dolibarrr business event is done.
@@ -58,312 +61,267 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
-    {
-        if (empty($conf->workflow->enabled)) return 0; // Module not active, we do nothing
+	{
+		if (empty($conf->workflow->enabled)) return 0; // Module not active, we do nothing
 
-        // Proposals to order
-        if ($action == 'PROPAL_CLOSE_SIGNED')
-        {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            if (!empty($conf->commande->enabled) && !empty($conf->global->WORKFLOW_PROPAL_AUTOCREATE_ORDER))
-            {
-                include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-                $newobject = new Commande($this->db);
+		// Proposals to order
+		if ($action == 'PROPAL_CLOSE_SIGNED') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			if (!empty($conf->commande->enabled) && !empty($conf->global->WORKFLOW_PROPAL_AUTOCREATE_ORDER)) {
+				include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+				$newobject = new Commande($this->db);
 
-                $newobject->context['createfrompropal'] = 'createfrompropal';
-                $newobject->context['origin'] = $object->element;
-                $newobject->context['origin_id'] = $object->id;
+				$newobject->context['createfrompropal'] = 'createfrompropal';
+				$newobject->context['origin'] = $object->element;
+				$newobject->context['origin_id'] = $object->id;
 
-                $ret = $newobject->createFromProposal($object, $user);
-                if ($ret < 0) { $this->error = $newobject->error; $this->errors[] = $newobject->error; }
-                return $ret;
-            }
-        }
-
-        // Order to invoice
-        if ($action == 'ORDER_CLOSE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            if (!empty($conf->facture->enabled) && !empty($conf->global->WORKFLOW_ORDER_AUTOCREATE_INVOICE))
-            {
-                include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-                $newobject = new Facture($this->db);
-
-                $newobject->context['createfromorder'] = 'createfromorder';
-                $newobject->context['origin'] = $object->element;
-                $newobject->context['origin_id'] = $object->id;
-
-                $ret = $newobject->createFromOrder($object, $user);
-                if ($ret < 0) { $this->error = $newobject->error; $this->errors[] = $newobject->error; }
-                return $ret;
-            }
-        }
-
-        // Order classify billed proposal
-        if ($action == 'ORDER_CLASSIFY_BILLED')
-        {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        	if (!empty($conf->propal->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL))
-        	{
-        		$object->fetchObjectLinked('', 'propal', $object->id, $object->element);
-				if (!empty($object->linkedObjects))
-				{
-				    $totalonlinkedelements = 0;
-					foreach ($object->linkedObjects['propal'] as $element)
-					{
-					    if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
-					}
-					dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of order = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
-                    if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht))
-                    {
-    					foreach ($object->linkedObjects['propal'] as $element)
-    					{
-    					    $ret = $element->classifyBilled($user);
-    					}
-					}
-				}
-        		return $ret;
-        	}
-        }
-
-        // classify billed order & billed propososal
-        if ($action == 'BILL_VALIDATE')
-        {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        	$ret = 0;
-
-			// First classify billed the order to allow the proposal classify process
-			if (!empty($conf->commande->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER))
-        	{
-        		$object->fetchObjectLinked('', 'commande', $object->id, $object->element);
-        		if (!empty($object->linkedObjects))
-        		{
-        		    $totalonlinkedelements = 0;
-        		    foreach ($object->linkedObjects['commande'] as $element)
-        		    {
-        		        if ($element->statut == Commande::STATUS_VALIDATED || $element->statut == Commande::STATUS_SHIPMENTONPROCESS || $element->statut == Commande::STATUS_CLOSED) $totalonlinkedelements += $element->total_ht;
-        		    }
-        		    dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
-                    if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht))
-        		    {
-        		        foreach ($object->linkedObjects['commande'] as $element)
-        		        {
-        		            $ret = $element->classifyBilled($user);
-        		        }
-        		    }
-        		}
-        	}
-
-			// Second classify billed the proposal.
-        	if (!empty($conf->propal->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL))
-        	{
-        		$object->fetchObjectLinked('', 'propal', $object->id, $object->element);
-        		if (!empty($object->linkedObjects))
-        		{
-        		    $totalonlinkedelements = 0;
-        		    foreach ($object->linkedObjects['propal'] as $element)
-        		    {
-        		        if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
-        		    }
-        		    dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
-                    if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht))
-        		    {
-        		        foreach ($object->linkedObjects['propal'] as $element)
-        		        {
-        		            $ret = $element->classifyBilled($user);
-        		        }
-        		    }
-        		}
-        	}
-
-        	return $ret;
-        }
-
-        // classify billed order & billed propososal
-        if ($action == 'BILL_SUPPLIER_VALIDATE')
-        {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-        	// First classify billed the order to allow the proposal classify process
-        	if (!empty($conf->fournisseur->enabled) && !empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER))
-        	{
-        		$object->fetchObjectLinked('', 'order_supplier', $object->id, $object->element);
-        		if (!empty($object->linkedObjects))
-        		{
-        			$totalonlinkedelements = 0;
-        			foreach ($object->linkedObjects['order_supplier'] as $element)
-        			{
-        				if ($element->statut == CommandeFournisseur::STATUS_ACCEPTED || $element->statut == CommandeFournisseur::STATUS_ORDERSENT || $element->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY || $element->statut == CommandeFournisseur::STATUS_RECEIVED_COMPLETELY) $totalonlinkedelements += $element->total_ht;
-        			}
-        			dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
-                    if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht))
-					{
-        				foreach ($object->linkedObjects['order_supplier'] as $element)
-        				{
-        					$ret = $element->classifyBilled($user);
-        				}
-        			}
-        		}
-        		return $ret;
-        	}
-
-        	// Second classify billed the proposal.
-        	if (!empty($conf->supplier_proposal->enabled) && !empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_SUPPLIER_PROPOSAL))
-        	{
-        		$object->fetchObjectLinked('', 'supplier_proposal', $object->id, $object->element);
-        		if (!empty($object->linkedObjects))
-        		{
-        			$totalonlinkedelements = 0;
-        			foreach ($object->linkedObjects['supplier_proposal'] as $element)
-        			{
-        				if ($element->statut == SupplierProposal::STATUS_SIGNED || $element->statut == SupplierProposal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
-        			}
-        			dol_syslog("Amount of linked supplier proposals = ".$totalonlinkedelements.", of supplier invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
-                    if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht))
-        			{
-        				foreach ($object->linkedObjects['supplier_proposal'] as $element)
-        				{
-        					$ret = $element->classifyBilled($user);
-        				}
-        			}
-        		}
-        		return $ret;
-        	}
-        }
-
-        // Invoice classify billed order
-        if ($action == 'BILL_PAYED')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-            if (!empty($conf->commande->enabled) && !empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER))
-            {
-                $object->fetchObjectLinked('', 'commande', $object->id, $object->element);
-                if (!empty($object->linkedObjects))
-                {
-                    $totalonlinkedelements = 0;
-                    foreach ($object->linkedObjects['commande'] as $element)
-                    {
-                        if ($element->statut == Commande::STATUS_VALIDATED || $element->statut == Commande::STATUS_SHIPMENTONPROCESS || $element->statut == Commande::STATUS_CLOSED) $totalonlinkedelements += $element->total_ht;
-                    }
-                    dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
-                    if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht))
-                    {
-                        foreach ($object->linkedObjects['commande'] as $element)
-                        {
-                            $ret = $element->classifyBilled($user);
-                        }
-                    }
-                }
-                return $ret;
-            }
-        }
-
-        if ($action == 'SHIPPING_VALIDATE')
-        {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-        	if (!empty($conf->commande->enabled) && !empty($conf->expedition->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING))
-        	{
-        		$qtyshipped = array();
-        		$qtyordred = array();
-        		require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-
-        		//find all shippement on order origin
-        		$order = new Commande($this->db);
-        		$ret = $order->fetch($object->origin_id);
-        		if ($ret < 0) {
-        			$this->error = $order->error; $this->errors = $order->errors;
-        			return $ret;
-        		}
-        		$ret = $order->fetchObjectLinked($order->id, 'commande', null, 'shipping');
-        		if ($ret < 0) {
-        			$this->error = $order->error; $this->errors = $order->errors;
-        			return $ret;
-        		}
-        		//Build array of quantity shipped by product for an order
-        		if (is_array($order->linkedObjects) && count($order->linkedObjects) > 0) {
-        			foreach ($order->linkedObjects as $type=>$shipping_array) {
-        				if ($type == 'shipping' && is_array($shipping_array) && count($shipping_array) > 0) {
-        					foreach ($shipping_array as $shipping) {
-		        				if (is_array($shipping->lines) && count($shipping->lines) > 0) {
-		        					foreach ($shipping->lines as $shippingline) {
-		        						$qtyshipped[$shippingline->fk_product] += $shippingline->qty;
-		        					}
-		        				}
-	        				}
-        				}
-        			}
-        		}
-
-        		//Build array of quantity ordered by product
-        		if (is_array($order->lines) && count($order->lines) > 0) {
-        			foreach ($order->lines as $orderline) {
-        				$qtyordred[$orderline->fk_product] += $orderline->qty;
-        			}
-        		}
-        		//dol_syslog(var_export($qtyordred,true),LOG_DEBUG);
-        		//dol_syslog(var_export($qtyshipped,true),LOG_DEBUG);
-        		//Compare array
-        		$diff_array = array_diff_assoc($qtyordred, $qtyshipped);
-        		if (count($diff_array) == 0) {
-        			//No diff => mean everythings is shipped
-        			$ret = $object->setStatut(Commande::STATUS_CLOSED, $object->origin_id, $object->origin, 'ORDER_CLOSE');
-        			if ($ret < 0) {
-        				$this->error = $object->error; $this->errors = $object->errors;
-        				return $ret;
-        			}
-        		}
-        	}
-        }
-		 // classify billed reception
-        if ($action == 'BILL_SUPPLIER_VALIDATE')
-        {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id, LOG_DEBUG);
-
-        	if (!empty($conf->reception->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_RECEPTION))
-        	{
-        		$object->fetchObjectLinked('', 'reception', $object->id, $object->element);
-        		if (!empty($object->linkedObjects))
-        		{
-        		    $totalonlinkedelements = 0;
-        		    foreach ($object->linkedObjects['reception'] as $element)
-        		    {
-        		        if ($element->statut == Reception::STATUS_VALIDATED) $totalonlinkedelements += $element->total_ht;
-        		    }
-        		    dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht), LOG_DEBUG);
-        		    if ($totalonlinkedelements == $object->total_ht)
-        		    {
-        		        foreach ($object->linkedObjects['reception'] as $element)
-        		        {
-        		            $ret = $element->set_billed();
-        		        }
-        		    }
-        		}
-        		return $ret;
-        	}
+				$ret = $newobject->createFromProposal($object, $user);
+				if ($ret < 0) { $this->error = $newobject->error; $this->errors[] = $newobject->error; }
+				return $ret;
+			}
 		}
 
-        return 0;
-    }
+		// Order to invoice
+		if ($action == 'ORDER_CLOSE') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			if (!empty($conf->facture->enabled) && !empty($conf->global->WORKFLOW_ORDER_AUTOCREATE_INVOICE)) {
+				include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+				$newobject = new Facture($this->db);
 
-    /**
-     * @param Object $conf                  Dolibarr settings object
-     * @param float $totalonlinkedelements  Sum of total amounts (excl VAT) of
-     *                                      invoices linked to $object
-     * @param float $object_total_ht        The total amount (excl VAT) of the object
-     *                                      (an order, a proposal, a bill, etc.)
-     * @return bool  True if the amounts are equal (rounded on total amount)
-     *               True if the module is configured to skip the amount equality check
-     *               False otherwise.
-     */
-    private function shouldClassify($conf, $totalonlinkedelements, $object_total_ht)
-    {
-        // if the configuration allows unmatching amounts, allow classification anyway
-        if (!empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) {
-            return true;
-        }
-        // if the amount are same, allow classification, else deny
-        return (price2num($totalonlinkedelements, 'MT') == price2num($object_total_ht, 'MT'));
-    }
+				$newobject->context['createfromorder'] = 'createfromorder';
+				$newobject->context['origin'] = $object->element;
+				$newobject->context['origin_id'] = $object->id;
+
+				$ret = $newobject->createFromOrder($object, $user);
+				if ($ret < 0) { $this->error = $newobject->error; $this->errors[] = $newobject->error; }
+				return $ret;
+			}
+		}
+
+		// Order classify billed proposal
+		if ($action == 'ORDER_CLASSIFY_BILLED') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			if (!empty($conf->propal->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL)) {
+				$object->fetchObjectLinked('', 'propal', $object->id, $object->element);
+				if (!empty($object->linkedObjects)) {
+					$totalonlinkedelements = 0;
+					foreach ($object->linkedObjects['propal'] as $element) {
+						if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
+					}
+					dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of order = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+					if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
+						foreach ($object->linkedObjects['propal'] as $element) {
+							$ret = $element->classifyBilled($user);
+						}
+					}
+				}
+				return $ret;
+			}
+		}
+
+		// classify billed order & billed propososal
+		if ($action == 'BILL_VALIDATE') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$ret = 0;
+
+			// First classify billed the order to allow the proposal classify process
+			if (!empty($conf->commande->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER)) {
+				$object->fetchObjectLinked('', 'commande', $object->id, $object->element);
+				if (!empty($object->linkedObjects)) {
+					$totalonlinkedelements = 0;
+					foreach ($object->linkedObjects['commande'] as $element) {
+						if ($element->statut == Commande::STATUS_VALIDATED || $element->statut == Commande::STATUS_SHIPMENTONPROCESS || $element->statut == Commande::STATUS_CLOSED) $totalonlinkedelements += $element->total_ht;
+					}
+					dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+					if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
+						foreach ($object->linkedObjects['commande'] as $element) {
+							$ret = $element->classifyBilled($user);
+						}
+					}
+				}
+			}
+
+			// Second classify billed the proposal.
+			if (!empty($conf->propal->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL)) {
+				$object->fetchObjectLinked('', 'propal', $object->id, $object->element);
+				if (!empty($object->linkedObjects)) {
+					$totalonlinkedelements = 0;
+					foreach ($object->linkedObjects['propal'] as $element) {
+						if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
+					}
+					dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+					if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
+						foreach ($object->linkedObjects['propal'] as $element) {
+							$ret = $element->classifyBilled($user);
+						}
+					}
+				}
+			}
+
+			return $ret;
+		}
+
+		// classify billed order & billed propososal
+		if ($action == 'BILL_SUPPLIER_VALIDATE') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+
+			// First classify billed the order to allow the proposal classify process
+			if (!empty($conf->fournisseur->enabled) && !empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER)) {
+				$object->fetchObjectLinked('', 'order_supplier', $object->id, $object->element);
+				if (!empty($object->linkedObjects)) {
+					$totalonlinkedelements = 0;
+					foreach ($object->linkedObjects['order_supplier'] as $element) {
+						if ($element->statut == CommandeFournisseur::STATUS_ACCEPTED || $element->statut == CommandeFournisseur::STATUS_ORDERSENT || $element->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY || $element->statut == CommandeFournisseur::STATUS_RECEIVED_COMPLETELY) $totalonlinkedelements += $element->total_ht;
+					}
+					dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+					if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
+						foreach ($object->linkedObjects['order_supplier'] as $element) {
+							$ret = $element->classifyBilled($user);
+						}
+					}
+				}
+				return $ret;
+			}
+
+			// Second classify billed the proposal.
+			if (!empty($conf->supplier_proposal->enabled) && !empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_SUPPLIER_PROPOSAL)) {
+				$object->fetchObjectLinked('', 'supplier_proposal', $object->id, $object->element);
+				if (!empty($object->linkedObjects)) {
+					$totalonlinkedelements = 0;
+					foreach ($object->linkedObjects['supplier_proposal'] as $element) {
+						if ($element->statut == SupplierProposal::STATUS_SIGNED || $element->statut == SupplierProposal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
+					}
+					dol_syslog("Amount of linked supplier proposals = ".$totalonlinkedelements.", of supplier invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+					if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
+						foreach ($object->linkedObjects['supplier_proposal'] as $element) {
+							$ret = $element->classifyBilled($user);
+						}
+					}
+				}
+				return $ret;
+			}
+		}
+
+		// Invoice classify billed order
+		if ($action == 'BILL_PAYED') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+
+			if (!empty($conf->commande->enabled) && !empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER)) {
+				$object->fetchObjectLinked('', 'commande', $object->id, $object->element);
+				if (!empty($object->linkedObjects)) {
+					$totalonlinkedelements = 0;
+					foreach ($object->linkedObjects['commande'] as $element) {
+						if ($element->statut == Commande::STATUS_VALIDATED || $element->statut == Commande::STATUS_SHIPMENTONPROCESS || $element->statut == Commande::STATUS_CLOSED) $totalonlinkedelements += $element->total_ht;
+					}
+					dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+					if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
+						foreach ($object->linkedObjects['commande'] as $element) {
+							$ret = $element->classifyBilled($user);
+						}
+					}
+				}
+				return $ret;
+			}
+		}
+
+		if ($action == 'SHIPPING_VALIDATE') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+
+			if (!empty($conf->commande->enabled) && !empty($conf->expedition->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING)) {
+				$qtyshipped = array();
+				$qtyordred = array();
+				require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+
+				//find all shippement on order origin
+				$order = new Commande($this->db);
+				$ret = $order->fetch($object->origin_id);
+				if ($ret < 0) {
+					$this->error = $order->error; $this->errors = $order->errors;
+					return $ret;
+				}
+				$ret = $order->fetchObjectLinked($order->id, 'commande', null, 'shipping');
+				if ($ret < 0) {
+					$this->error = $order->error; $this->errors = $order->errors;
+					return $ret;
+				}
+				//Build array of quantity shipped by product for an order
+				if (is_array($order->linkedObjects) && count($order->linkedObjects) > 0) {
+					foreach ($order->linkedObjects as $type=>$shipping_array) {
+						if ($type == 'shipping' && is_array($shipping_array) && count($shipping_array) > 0) {
+							foreach ($shipping_array as $shipping) {
+								if (is_array($shipping->lines) && count($shipping->lines) > 0) {
+									foreach ($shipping->lines as $shippingline) {
+										$qtyshipped[$shippingline->fk_product] += $shippingline->qty;
+									}
+								}
+							}
+						}
+					}
+				}
+
+				//Build array of quantity ordered by product
+				if (is_array($order->lines) && count($order->lines) > 0) {
+					foreach ($order->lines as $orderline) {
+						if (empty($conf->global->STOCK_SUPPORTS_SERVICES) && $orderline->product_type > 0) continue;
+						$qtyordred[$orderline->fk_product] += $orderline->qty;
+					}
+				}
+				//dol_syslog(var_export($qtyordred,true),LOG_DEBUG);
+				//dol_syslog(var_export($qtyshipped,true),LOG_DEBUG);
+				//Compare array
+				$diff_array = array_diff_assoc($qtyordred, $qtyshipped);
+				if (count($diff_array) == 0) {
+					//No diff => mean everythings is shipped
+					$ret = $object->setStatut(Commande::STATUS_CLOSED, $object->origin_id, $object->origin, 'ORDER_CLOSE');
+					if ($ret < 0) {
+						$this->error = $object->error; $this->errors = $object->errors;
+						return $ret;
+					}
+				}
+			}
+		}
+		 // classify billed reception
+		if ($action == 'BILL_SUPPLIER_VALIDATE') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id, LOG_DEBUG);
+
+			if (!empty($conf->reception->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_RECEPTION)) {
+				$object->fetchObjectLinked('', 'reception', $object->id, $object->element);
+				if (!empty($object->linkedObjects)) {
+					$totalonlinkedelements = 0;
+					foreach ($object->linkedObjects['reception'] as $element) {
+						if ($element->statut == Reception::STATUS_VALIDATED) $totalonlinkedelements += $element->total_ht;
+					}
+					dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht), LOG_DEBUG);
+					if ($totalonlinkedelements == $object->total_ht) {
+						foreach ($object->linkedObjects['reception'] as $element) {
+							$ret = $element->set_billed();
+						}
+					}
+				}
+				return $ret;
+			}
+		}
+
+		return 0;
+	}
+
+	/**
+	 * @param Object $conf                  Dolibarr settings object
+	 * @param float $totalonlinkedelements  Sum of total amounts (excl VAT) of
+	 *                                      invoices linked to $object
+	 * @param float $object_total_ht        The total amount (excl VAT) of the object
+	 *                                      (an order, a proposal, a bill, etc.)
+	 * @return bool  True if the amounts are equal (rounded on total amount)
+	 *               True if the module is configured to skip the amount equality check
+	 *               False otherwise.
+	 */
+	private function shouldClassify($conf, $totalonlinkedelements, $object_total_ht)
+	{
+		// if the configuration allows unmatching amounts, allow classification anyway
+		if (!empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) {
+			return true;
+		}
+		// if the amount are same, allow classification, else deny
+		return (price2num($totalonlinkedelements, 'MT') == price2num($object_total_ht, 'MT'));
+	}
 }
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 386bedad910..3d4c4ed63b7 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -34,19 +34,22 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
  */
 class InterfaceActionsAuto extends DolibarrTriggers
 {
-	public $family = 'agenda';
-	public $description = "Triggers of this module add actions in agenda according to setup made in agenda setup.";
-
 	/**
-	 * Version of the trigger
-	 * @var string
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
 	 */
-	public $version = self::VERSION_DOLIBARR;
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-	/**
-	 * @var string Image of the trigger
-	 */
-	public $picto = 'action';
+		$this->name = preg_replace('/^Interface/i', '', get_class($this));
+		$this->family = "agenda";
+		$this->description = "Triggers of this module add actions in agenda according to setup made in agenda setup.";
+		// 'development', 'experimental', 'dolibarr' or version
+		$this->version = self::VERSION_DOLIBARR;
+		$this->picto = 'action';
+	}
 
 	/**
 	 * Function called when a Dolibarrr business event is done.
@@ -74,6 +77,11 @@ class InterfaceActionsAuto extends DolibarrTriggers
 	{
 		if (empty($conf->agenda->enabled)) return 0; // Module not active, we do nothing
 
+		// Do not log events when trigger is for creating event (infinite loop)
+		if (preg_match('/^ACTION_/', $action)) {
+			return 0;
+		}
+
 		$key = 'MAIN_AGENDA_ACTIONAUTO_'.$action;
 		//var_dump($action.' - '.$conf->global->$key);exit;
 
@@ -87,8 +95,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		if (empty($object->actiontypecode)) $object->actiontypecode = 'AC_OTH_AUTO';
 
 		// Actions
-		if ($action == 'COMPANY_CREATE')
-		{
+		if ($action == 'COMPANY_CREATE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "companies"));
 
@@ -97,8 +104,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			$object->sendtoid = 0;
 			$object->socid = $object->id;
-		} elseif ($action == 'COMPANY_SENTBYMAIL')
-		{
+		} elseif ($action == 'COMPANY_SENTBYMAIL') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "orders"));
 
@@ -106,8 +112,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			// Parameters $object->sendtoid defined by caller
 			//$object->sendtoid=0;
-		} elseif ($action == 'CONTACT_CREATE')
-		{
+		} elseif ($action == 'CONTACT_CREATE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "companies"));
 
@@ -116,8 +121,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			$object->sendtoid = array($object->id => $object->id);
 			$object->socid = $object->socid;
-		} elseif ($action == 'CONTRACT_VALIDATE')
-		{
+		} elseif ($action == 'CONTRACT_VALIDATE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "contracts"));
 
@@ -125,21 +129,18 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("ContractValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'CONTRACT_SENTBYMAIL')
-		{
+		} elseif ($action == 'CONTRACT_SENTBYMAIL') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "contracts"));
 
 			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ContractSentByEMail", $object->ref);
-			if (empty($object->actionmsg))
-			{
+			if (empty($object->actionmsg)) {
 				$object->actionmsg = $langs->transnoentities("ContractSentByEMail", $object->ref);
 			}
 
 			// Parameters $object->sendtoid defined by caller
 			//$object->sendtoid=0;
-		} elseif ($action == 'PROPAL_VALIDATE')
-		{
+		} elseif ($action == 'PROPAL_VALIDATE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "propal"));
 
@@ -147,21 +148,18 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'PROPAL_SENTBYMAIL')
-		{
+		} elseif ($action == 'PROPAL_SENTBYMAIL') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "propal"));
 
 			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProposalSentByEMail", $object->ref);
-			if (empty($object->actionmsg))
-			{
+			if (empty($object->actionmsg)) {
 				$object->actionmsg = $langs->transnoentities("ProposalSentByEMail", $object->ref);
 			}
 
 			// Parameters $object->sendtoid defined by caller
 			//$object->sendtoid=0;
-		} elseif ($action == 'PROPAL_CLOSE_SIGNED')
-		{
+		} elseif ($action == 'PROPAL_CLOSE_SIGNED') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "propal"));
 
@@ -169,8 +167,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'PROPAL_CLASSIFY_BILLED')
-		{
+		} elseif ($action == 'PROPAL_CLASSIFY_BILLED') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "propal"));
 
@@ -178,8 +175,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("PropalClassifiedBilledInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'PROPAL_CLOSE_REFUSED')
-		{
+		} elseif ($action == 'PROPAL_CLOSE_REFUSED') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "propal"));
 
@@ -187,8 +183,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'ORDER_VALIDATE')
-		{
+		} elseif ($action == 'ORDER_VALIDATE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "orders"));
 
@@ -196,8 +191,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'ORDER_CLOSE')
-		{
+		} elseif ($action == 'ORDER_CLOSE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "orders"));
 
@@ -205,8 +199,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("OrderDeliveredInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'ORDER_CLASSIFY_BILLED')
-		{
+		} elseif ($action == 'ORDER_CLASSIFY_BILLED') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "orders"));
 
@@ -214,8 +207,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("OrderBilledInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'ORDER_CANCEL')
-		{
+		} elseif ($action == 'ORDER_CANCEL') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "orders"));
 
@@ -223,21 +215,18 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("OrderCanceledInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'ORDER_SENTBYMAIL')
-		{
+		} elseif ($action == 'ORDER_SENTBYMAIL') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "orders"));
 
 			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderSentByEMail", $object->ref);
-			if (empty($object->actionmsg))
-			{
+			if (empty($object->actionmsg)) {
 				$object->actionmsg = $langs->transnoentities("OrderSentByEMail", $object->ref);
 			}
 
 			// Parameters $object->sendtoid defined by caller
 			//$object->sendtoid=0;
-		} elseif ($action == 'BILL_VALIDATE')
-		{
+		} elseif ($action == 'BILL_VALIDATE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "bills"));
 
@@ -245,8 +234,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'BILL_UNVALIDATE')
-		{
+		} elseif ($action == 'BILL_UNVALIDATE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "bills"));
 
@@ -254,21 +242,18 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'BILL_SENTBYMAIL')
-		{
+		} elseif ($action == 'BILL_SENTBYMAIL') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "bills"));
 
 			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceSentByEMail", $object->ref);
-			if (empty($object->actionmsg))
-			{
+			if (empty($object->actionmsg)) {
 				$object->actionmsg = $langs->transnoentities("InvoiceSentByEMail", $object->ref);
 			}
 
 			// Parameters $object->sendtoid defined by caller
 			//$object->sendtoid=0;
-		} elseif ($action == 'BILL_PAYED')
-		{
+		} elseif ($action == 'BILL_PAYED') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "bills"));
 
@@ -277,8 +262,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'BILL_CANCEL')
-		{
+		} elseif ($action == 'BILL_CANCEL') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "bills"));
 
@@ -286,8 +270,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'FICHINTER_CREATE')
-		{
+		} elseif ($action == 'FICHINTER_CREATE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "interventions"));
 
@@ -297,8 +280,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->sendtoid = 0;
 			$object->fk_element = 0;
 			$object->elementtype = '';
-		} elseif ($action == 'FICHINTER_VALIDATE')
-		{
+		} elseif ($action == 'FICHINTER_VALIDATE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "interventions"));
 
@@ -308,8 +290,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->sendtoid = 0;
 			$object->fk_element = 0;
 			$object->elementtype = '';
-		} elseif ($action == 'FICHINTER_MODIFY')
-		{
+		} elseif ($action == 'FICHINTER_MODIFY') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "interventions"));
 
@@ -319,21 +300,18 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->sendtoid = 0;
 			$object->fk_element = 0;
 			$object->elementtype = '';
-		} elseif ($action == 'FICHINTER_SENTBYMAIL')
-		{
+		} elseif ($action == 'FICHINTER_SENTBYMAIL') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "interventions"));
 
 			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionSentByEMail", $object->ref);
-			if (empty($object->actionmsg))
-			{
+			if (empty($object->actionmsg)) {
 				$object->actionmsg = $langs->transnoentities("InterventionSentByEMail", $object->ref);
 			}
 
 			// Parameters $object->sendtoid defined by caller
 			//$object->sendtoid=0;
-		} elseif ($action == 'FICHINTER_CLASSIFY_BILLED')
-		{
+		} elseif ($action == 'FICHINTER_CLASSIFY_BILLED') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "interventions"));
 
@@ -341,8 +319,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		   	$object->actionmsg = $langs->transnoentities("InterventionClassifiedBilledInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'FICHINTER_CLASSIFY_UNBILLED')
-		{
+		} elseif ($action == 'FICHINTER_CLASSIFY_UNBILLED') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "interventions"));
 
@@ -350,8 +327,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		   	$object->actionmsg = $langs->transnoentities("InterventionClassifiedUnbilledInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'FICHINTER_DELETE')
-		{
+		} elseif ($action == 'FICHINTER_DELETE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "interventions"));
 
@@ -361,62 +337,53 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->sendtoid = 0;
 			$object->fk_element = 0;
 			$object->elementtype = '';
-		} elseif ($action == 'SHIPPING_VALIDATE')
-		{
+		} elseif ($action == 'SHIPPING_VALIDATE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "sendings"));
 
 			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ShippingValidated", ($object->newref ? $object->newref : $object->ref));
-			if (empty($object->actionmsg))
-			{
+			if (empty($object->actionmsg)) {
 				$object->actionmsg = $langs->transnoentities("ShippingValidated", ($object->newref ? $object->newref : $object->ref));
 			}
 
 			// Parameters $object->sendtoid defined by caller
 			//$object->sendtoid=0;
-		} elseif ($action == 'SHIPPING_SENTBYMAIL')
-		{
+		} elseif ($action == 'SHIPPING_SENTBYMAIL') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "sendings"));
 
 			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ShippingSentByEMail", $object->ref);
-			if (empty($object->actionmsg))
-			{
+			if (empty($object->actionmsg)) {
 				$object->actionmsg = $langs->transnoentities("ShippingSentByEMail", $object->ref);
 			}
 
 			// Parameters $object->sendtoid defined by caller
 			//$object->sendtoid=0;
-		} elseif ($action == 'RECEPTION_VALIDATE')
-		{
+		} elseif ($action == 'RECEPTION_VALIDATE') {
 			$langs->load("agenda");
 			$langs->load("other");
 			$langs->load("receptions");
 
 			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ReceptionValidated", ($object->newref ? $object->newref : $object->ref));
-			if (empty($object->actionmsg))
-			{
+			if (empty($object->actionmsg)) {
 				$object->actionmsg = $langs->transnoentities("ReceptionValidated", ($object->newref ? $object->newref : $object->ref));
 			}
 
 			// Parameters $object->sendtoid defined by caller
 			//$object->sendtoid=0;
-		} elseif ($action == 'RECEPTION_SENTBYMAIL')
-		{
+		} elseif ($action == 'RECEPTION_SENTBYMAIL') {
 			$langs->load("agenda");
 			$langs->load("other");
 			$langs->load("receptions");
 
 			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ReceptionSentByEMail", $object->ref);
-			if (empty($object->actionmsg))
-			{
+			if (empty($object->actionmsg)) {
 				$object->actionmsg = $langs->transnoentities("ReceptionSentByEMail", $object->ref);
 			}
 
 			// Parameters $object->sendtoid defined by caller
 			//$object->sendtoid=0;
-		} elseif ($action == 'PROPOSAL_SUPPLIER_VALIDATE')
-		{
+		} elseif ($action == 'PROPOSAL_SUPPLIER_VALIDATE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "propal"));
 
@@ -424,21 +391,18 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'PROPOSAL_SUPPLIER_SENTBYMAIL')
-		{
+		} elseif ($action == 'PROPOSAL_SUPPLIER_SENTBYMAIL') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "propal"));
 
 			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProposalSentByEMail", $object->ref);
-			if (empty($object->actionmsg))
-			{
+			if (empty($object->actionmsg)) {
 				$object->actionmsg = $langs->transnoentities("ProposalSentByEMail", $object->ref);
 			}
 
 			// Parameters $object->sendtoid defined by caller
 			//$object->sendtoid=0;
-		} elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_SIGNED')
-		{
+		} elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_SIGNED') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "propal"));
 
@@ -446,8 +410,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_REFUSED')
-		{
+		} elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_REFUSED') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "propal"));
 
@@ -455,8 +418,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'ORDER_SUPPLIER_CREATE')
-		{
+		} elseif ($action == 'ORDER_SUPPLIER_CREATE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "orders"));
 
@@ -464,8 +426,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("OrderCreatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'ORDER_SUPPLIER_VALIDATE')
-		{
+		} elseif ($action == 'ORDER_SUPPLIER_VALIDATE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "orders"));
 
@@ -473,8 +434,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'ORDER_SUPPLIER_APPROVE')
-		{
+		} elseif ($action == 'ORDER_SUPPLIER_APPROVE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "orders"));
 
@@ -482,8 +442,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("OrderApprovedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'ORDER_SUPPLIER_REFUSE')
-		{
+		} elseif ($action == 'ORDER_SUPPLIER_REFUSE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "orders"));
 
@@ -491,8 +450,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("OrderRefusedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'ORDER_SUPPLIER_SUBMIT')
-		{
+		} elseif ($action == 'ORDER_SUPPLIER_SUBMIT') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "orders"));
 
@@ -500,8 +458,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'ORDER_SUPPLIER_RECEIVE')
-		{
+		} elseif ($action == 'ORDER_SUPPLIER_RECEIVE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "orders"));
 
@@ -509,33 +466,28 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("SupplierOrderReceivedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL')
-		{
+		} elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "bills", "orders"));
 
 			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierOrderSentByEMail", $object->ref);
-			if (empty($object->actionmsg))
-			{
+			if (empty($object->actionmsg)) {
 				$object->actionmsg = $langs->transnoentities("SupplierOrderSentByEMail", $object->ref);
 			}
 
 			// Parameters $object->sendtoid defined by caller
 			//$object->sendtoid=0;
-		} elseif ($action == 'ORDER_SUPPLIER_CLASSIFY_BILLED')
-		{
+		} elseif ($action == 'ORDER_SUPPLIER_CLASSIFY_BILLED') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "bills", "orders"));
 
 			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierOrderClassifiedBilled", $object->ref);
-			if (empty($object->actionmsg))
-			{
+			if (empty($object->actionmsg)) {
 				$object->actionmsg = $langs->transnoentities("SupplierOrderClassifiedBilled", $object->ref);
 			}
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'BILL_SUPPLIER_VALIDATE')
-		{
+		} elseif ($action == 'BILL_SUPPLIER_VALIDATE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "bills"));
 
@@ -543,8 +495,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'BILL_SUPPLIER_UNVALIDATE')
-		{
+		} elseif ($action == 'BILL_SUPPLIER_UNVALIDATE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "bills"));
 
@@ -552,21 +503,18 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'BILL_SUPPLIER_SENTBYMAIL')
-		{
+		} elseif ($action == 'BILL_SUPPLIER_SENTBYMAIL') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "bills", "orders"));
 
 			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierInvoiceSentByEMail", $object->ref);
-			if (empty($object->actionmsg))
-			{
+			if (empty($object->actionmsg)) {
 				$object->actionmsg = $langs->transnoentities("SupplierInvoiceSentByEMail", $object->ref);
 			}
 
 			// Parameters $object->sendtoid defined by caller
 			//$object->sendtoid=0;
-		} elseif ($action == 'BILL_SUPPLIER_PAYED')
-		{
+		} elseif ($action == 'BILL_SUPPLIER_PAYED') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "bills"));
 
@@ -574,8 +522,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'BILL_SUPPLIER_CANCELED')
-		{
+		} elseif ($action == 'BILL_SUPPLIER_CANCELED') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "bills"));
 
@@ -586,8 +533,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 
 		// Members
-		elseif ($action == 'MEMBER_VALIDATE')
-		{
+		elseif ($action == 'MEMBER_VALIDATE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "members"));
 
@@ -597,8 +543,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'MEMBER_MODIFY')
-		{
+		} elseif ($action == 'MEMBER_MODIFY') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "members"));
 
@@ -608,17 +553,16 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'MEMBER_SUBSCRIPTION_CREATE')
-		{
+		} elseif ($action == 'MEMBER_SUBSCRIPTION_CREATE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "members"));
 
 			$member = $this->context['member'];
-			if (!is_object($member))	// This should not happen
-			{
+			if (!is_object($member)) {	// This should not happen
+				dol_syslog("Execute a trigger MEMBER_SUBSCRIPTION_CREATE with context key 'member' not an object");
 				include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 				$member = new Adherent($this->db);
-				$member->fetch($this->fk_adherent);
+				$member->fetch($object->fk_adherent);
 			}
 
 			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberSubscriptionAddedInDolibarr", $object->id, $member->getFullName($langs));
@@ -630,14 +574,12 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			$object->sendtoid = 0;
 			if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
-		} elseif ($action == 'MEMBER_SUBSCRIPTION_MODIFY')
-		{
+		} elseif ($action == 'MEMBER_SUBSCRIPTION_MODIFY') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "members"));
 
 			$member = $this->context['member'];
-			if (!is_object($member))	// This should not happen
-			{
+			if (!is_object($member)) {	// This should not happen
 				include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 				$member = new Adherent($this->db);
 				$member->fetch($this->fk_adherent);
@@ -652,8 +594,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			$object->sendtoid = 0;
 			if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
-		} elseif ($action == 'MEMBER_SUBSCRIPTION_DELETE')
-		{
+		} elseif ($action == 'MEMBER_SUBSCRIPTION_DELETE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "members"));
 
@@ -666,8 +607,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			$object->sendtoid = 0;
 			if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
-		} elseif ($action == 'MEMBER_RESILIATE')
-		{
+		} elseif ($action == 'MEMBER_RESILIATE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "members"));
 
@@ -677,8 +617,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'MEMBER_DELETE')
-		{
+		} elseif ($action == 'MEMBER_DELETE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "members"));
 
@@ -691,8 +630,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 
 		// Projects
-		elseif ($action == 'PROJECT_CREATE')
-		{
+		elseif ($action == 'PROJECT_CREATE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "projects"));
 
@@ -701,8 +639,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg .= "\n".$langs->transnoentities("Project").': '.$object->ref;
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'PROJECT_VALIDATE')
-		{
+		} elseif ($action == 'PROJECT_VALIDATE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "projects"));
 
@@ -711,8 +648,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg .= "\n".$langs->transnoentities("Project").': '.$object->ref;
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'PROJECT_MODIFY')
-		{
+		} elseif ($action == 'PROJECT_MODIFY') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "projects"));
 
@@ -724,8 +660,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 
 		// Project tasks
-		elseif ($action == 'TASK_CREATE')
-		{
+		elseif ($action == 'TASK_CREATE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "projects"));
 
@@ -734,8 +669,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'TASK_MODIFY')
-		{
+		} elseif ($action == 'TASK_MODIFY') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "projects"));
 
@@ -744,8 +678,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'TASK_DELETE')
-		{
+		} elseif ($action == 'TASK_DELETE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "projects"));
 
@@ -754,23 +687,20 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
 
 			$object->sendtoid = 0;
-		} elseif ($action == 'TICKET_ASSIGNED')
-		{
+		} elseif ($action == 'TICKET_ASSIGNED') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "projects"));
 
 			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("TICKET_ASSIGNEDInDolibarr", $object->ref);
 			$object->actionmsg = $langs->transnoentities("TICKET_ASSIGNEDInDolibarr", $object->ref);
-			if ($object->oldcopy->fk_user_assign > 0)
-			{
+			if ($object->oldcopy->fk_user_assign > 0) {
 				$tmpuser = new User($this->db);
 				$tmpuser->fetch($object->oldcopy->fk_user_assign);
 				$object->actionmsg .= "\n".$langs->transnoentities("OldUser").': '.$tmpuser->getFullName($langs);
 			} else {
 				$object->actionmsg .= "\n".$langs->transnoentities("OldUser").': '.$langs->trans("None");
 			}
-			if ($object->fk_user_assign > 0)
-			{
+			if ($object->fk_user_assign > 0) {
 				$tmpuser = new User($this->db);
 				$tmpuser->fetch($object->fk_user_assign);
 				$object->actionmsg .= "\n".$langs->transnoentities("NewUser").': '.$tmpuser->getFullName($langs);
@@ -787,20 +717,20 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			if (empty($object->actionmsg2)) {
 				$langs->loadLangs(array("agenda", "other"));
-				if ($langs->transnoentities($action."InDolibarr", ($object->newref ? $object->newref : $object->ref)) != $action."InDolibarr") {	// specific translation key
-					$object->actionmsg2 = $langs->transnoentities($action."InDolibarr", ($object->newref ? $object->newref : $object->ref));
+				if ($langs->transnoentities($action."InDolibarr", (empty($object->newref) ? $object->ref : $object->newref)) != $action."InDolibarr") {	// specific translation key
+					$object->actionmsg2 = $langs->transnoentities($action."InDolibarr", (empty($object->newref) ? $object->ref : $object->newref));
 				} else {	// generic translation key
 					$tmp = explode('_', $action);
-					$object->actionmsg2 = $langs->transnoentities($tmp[count($tmp) - 1]."InDolibarr", ($object->newref ? $object->newref : $object->ref));
+					$object->actionmsg2 = $langs->transnoentities($tmp[count($tmp) - 1]."InDolibarr", (empty($object->newref) ? $object->ref : $object->newref));
 				}
 			}
 			if (empty($object->actionmsg)) {
 				$langs->loadLangs(array("agenda", "other"));
-				if ($langs->transnoentities($action."InDolibarr", ($object->newref ? $object->newref : $object->ref)) != $action."InDolibarr") {	// specific translation key
-					$object->actionmsg = $langs->transnoentities($action."InDolibarr", ($object->newref ? $object->newref : $object->ref));
+				if ($langs->transnoentities($action."InDolibarr", (empty($object->newref) ? $object->ref : $object->newref)) != $action."InDolibarr") {	// specific translation key
+					$object->actionmsg = $langs->transnoentities($action."InDolibarr", (empty($object->newref) ? $object->ref : $object->newref));
 				} else {	// generic translation key
 					$tmp = explode('_', $action);
-					$object->actionmsg = $langs->transnoentities($tmp[count($tmp) - 1]."InDolibarr", ($object->newref ? $object->newref : $object->ref));
+					$object->actionmsg = $langs->transnoentities($tmp[count($tmp) - 1]."InDolibarr", (empty($object->newref) ? $object->ref : $object->newref));
 				}
 			}
 
@@ -809,18 +739,39 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			}
 		}
 
-		$object->actionmsg = $langs->transnoentities("Author").': '.$user->login."\n".$object->actionmsg;
+		// If trackid is not defined, we set it
+		if (empty($object->trackid)) {
+			// See also similar list into emailcollector.class.php
+			if (preg_match('/^COMPANY_/', $action)) { $object->trackid = 'thi'.$object->id; }
+			elseif (preg_match('/^CONTACT_/', $action)) { $object->trackid = 'ctc'.$object->id; }
+			elseif (preg_match('/^CONTRACT_/', $action)) { $object->trackid = 'con'.$object->id; }
+			elseif (preg_match('/^PROPAL_/', $action)) { $object->trackid = 'pro'.$object->id; }
+			elseif (preg_match('/^ORDER_/', $action)) { $object->trackid = 'ord'.$object->id; }
+			elseif (preg_match('/^BILL_/', $action)) { $object->trackid = 'inv'.$object->id; }
+			elseif (preg_match('/^FICHINTER_/', $action)) { $object->trackid = 'int'.$object->id; }
+			elseif (preg_match('/^SHIPPING_/', $action)) { $object->trackid = 'shi'.$object->id; }
+			elseif (preg_match('/^RECEPTION_/', $action)) { $object->trackid = 'rec'.$object->id; }
+			elseif (preg_match('/^PROPOSAL_SUPPLIER/', $action)) { $object->trackid = 'spr'.$object->id; }
+			elseif (preg_match('/^ORDER_SUPPLIER_/', $action)) { $object->trackid = 'sor'.$object->id; }
+			elseif (preg_match('/^BILL_SUPPLIER_/', $action)) { $object->trackid = 'sin'.$object->id; }
+			elseif (preg_match('/^MEMBER_SUBSCRIPTION_/', $action)) { $object->trackid = 'sub'.$object->id; }
+			elseif (preg_match('/^MEMBER_/', $action)) { $object->trackid = 'mem'.$object->id; }
+			elseif (preg_match('/^PROJECT_/', $action)) { $object->trackid = 'proj'.$object->id; }
+			elseif (preg_match('/^TASK_/', $action)) { $object->trackid = 'tas'.$object->id; }
+			elseif (preg_match('/^TICKET_/', $action)) { $object->trackid = 'tic'.$object->id; }
+			else $object->trackid = '';
+		}
+
+		$object->actionmsg = dol_concatdesc($langs->transnoentities("Author").': '.$user->login, $object->actionmsg);
 
 		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
 		// Add entry in event table
 		$now = dol_now();
 
-		if (isset($_SESSION['listofnames-'.$object->trackid]))
-		{
+		if (isset($_SESSION['listofnames-'.$object->trackid])) {
 			$attachs = $_SESSION['listofnames-'.$object->trackid];
-			if ($attachs && strpos($action, 'SENTBYMAIL'))
-			{
+			if ($attachs && strpos($action, 'SENTBYMAIL')) {
 				$object->actionmsg = dol_concatdesc($object->actionmsg, "\n".$langs->transnoentities("AttachedFiles").': '.$attachs);
 			}
 		}
@@ -830,24 +781,22 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		$societeforaction = new Societe($this->db);
 		// Set contactforaction if there is only 1 contact.
 
-		if (is_array($object->sendtoid))
-		{
+		if (is_array($object->sendtoid)) {
 			if (count($object->sendtoid) == 1) $contactforaction->fetch(reset($object->sendtoid));
 		} else {
 			if ($object->sendtoid > 0) $contactforaction->fetch($object->sendtoid);
 		}
 		// Set societeforaction.
-		if ($object->socid > 0)			$societeforaction->fetch($object->socid);
-		elseif ($object->fk_soc > 0)	$societeforaction->fetch($object->fk_soc);
+		if (isset($object->socid) && $object->socid > 0)		$societeforaction->fetch($object->socid);
+		elseif (isset($object->fk_soc) && $object->fk_soc > 0)	$societeforaction->fetch($object->fk_soc);
 
 		$projectid = isset($object->fk_project) ? $object->fk_project : 0;
 		if ($object->element == 'project') $projectid = $object->id;
 
 		$elementid = $object->id; // id of object
 		$elementtype = $object->element;
-		$elementmodule = $object->module;
-		if ($object->element == 'subscription')
-		{
+		$elementmodule = (empty($object->module) ? '' : $object->module);
+		if ($object->element == 'subscription') {
 			$elementid = $object->fk_adherent;
 			$elementtype = 'member';
 		}
@@ -870,19 +819,18 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		$actioncomm->authorid    = $user->id; // User saving action
 		$actioncomm->userownerid = $user->id; // Owner of action
 		// Fields defined when action is an email (content should be into object->actionmsg to be added into note, subject into object->actionms2 to be added into label)
-		$actioncomm->email_msgid   = $object->email_msgid;
-		$actioncomm->email_from    = $object->email_from;
-		$actioncomm->email_sender  = $object->email_sender;
-		$actioncomm->email_to      = $object->email_to;
-		$actioncomm->email_tocc    = $object->email_tocc;
-		$actioncomm->email_tobcc   = $object->email_tobcc;
-		$actioncomm->email_subject = $object->email_subject;
-		$actioncomm->errors_to     = $object->errors_to;
+		$actioncomm->email_msgid   = empty($object->email_msgid) ? null : $object->email_msgid;
+		$actioncomm->email_from    = empty($object->email_from) ? null : $object->email_from;
+		$actioncomm->email_sender  = empty($object->email_sender) ? null : $object->email_sender;
+		$actioncomm->email_to      = empty($object->email_to) ? null : $object->email_to;
+		$actioncomm->email_tocc    = empty($object->email_tocc) ? null : $object->email_tocc;
+		$actioncomm->email_tobcc   = empty($object->email_tobcc) ? null : $object->email_tobcc;
+		$actioncomm->email_subject = empty($object->email_subject) ? null : $object->email_subject;
+		$actioncomm->errors_to     = empty($object->errors_to) ? null : $object->errors_to;
 
 		// Object linked (if link is for thirdparty, contact, project it is a recording error. We should not have links in link table
 		// for such objects because there is already a dedicated field into table llx_actioncomm or llx_actioncomm_resources.
-		if (!in_array($elementtype, array('societe', 'contact', 'project')))
-		{
+		if (!in_array($elementtype, array('societe', 'contact', 'project'))) {
 			$actioncomm->fk_element  = $elementid;
 			$actioncomm->elementtype = $elementtype.($elementmodule ? '@'.$elementmodule : '');
 		}
@@ -901,8 +849,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 		$ret = $actioncomm->create($user); // User creating action
 
-		if ($ret > 0 && $conf->global->MAIN_COPY_FILE_IN_EVENT_AUTO)
-		{
+		if ($ret > 0 && !empty($conf->global->MAIN_COPY_FILE_IN_EVENT_AUTO)) {
 			if (is_array($object->attachedfiles) && array_key_exists('paths', $object->attachedfiles) && count($object->attachedfiles['paths']) > 0) {
 				foreach ($object->attachedfiles['paths'] as $key=>$filespath) {
 					$srcfile = $filespath;
@@ -918,8 +865,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 		unset($object->actionmsg); unset($object->actionmsg2); unset($object->actiontypecode); // When several action are called on same object, we must be sure to not reuse value of first action.
 
-		if ($ret > 0)
-		{
+		if ($ret > 0) {
 			$_SESSION['LAST_ACTION_CREATED'] = $ret;
 			return 1;
 		} else {
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index 0800d66eea3..221c1d70846 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -30,19 +30,22 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
  */
 class InterfaceActionsBlockedLog extends DolibarrTriggers
 {
-	public $family = 'system';
-	public $description = "Triggers of this module add action for BlockedLog module (Module of unalterable logs).";
-
 	/**
-	 * Version of the trigger
-	 * @var string
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
 	 */
-	public $version = self::VERSION_DOLIBARR;
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-	/**
-	 * @var string Image of the trigger
-	 */
-	public $picto = 'technic';
+		$this->name = preg_replace('/^Interface/i', '', get_class($this));
+		$this->family = "system";
+		$this->description = "Triggers of this module add action for BlockedLog module (Module of unalterable logs).";
+		// 'development', 'experimental', 'dolibarr' or version
+		$this->version = self::VERSION_DOLIBARR;
+		$this->picto = 'technic';
+	}
 
 	/**
 	 * Function called on Dolibarr payment or invoice event.
@@ -68,8 +71,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 		$b = new BlockedLog($this->db);
 
 		// Tracked events
-		if (!in_array($action, array_keys($b->trackedevents)))
-		{
+		if (!in_array($action, array_keys($b->trackedevents))) {
 			return 0;
 		}
 
@@ -77,22 +79,20 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 		$qualified = 0;
 		$amounts = 0;
 		if ($action === 'BILL_VALIDATE' || (($action === 'BILL_DELETE' || $action === 'BILL_SENTBYMAIL') && $object->statut != 0)
-		    || $action === 'BILL_SUPPLIER_VALIDATE' || (($action === 'BILL_SUPPLIER_DELETE' || $action === 'BILL_SUPPLIER_SENTBYMAIL') && $object->statut != 0)
-		    || $action === 'MEMBER_SUBSCRIPTION_CREATE' || $action === 'MEMBER_SUBSCRIPTION_MODIFY' || $action === 'MEMBER_SUBSCRIPTION_DELETE'
-		    || $action === 'DON_VALIDATE' || (($action === 'DON_MODIFY' || $action === 'DON_DELETE') && $object->statut != 0)
-		    || $action === 'CASHCONTROL_VALIDATE'
-		    || (in_array($object->element, array('facture', 'supplier_invoice')) && $action === 'DOC_DOWNLOAD' && $object->statut != 0)
-		    || (in_array($object->element, array('facture', 'supplier_invoice')) && $action === 'DOC_PREVIEW' && $object->statut != 0)
+			|| $action === 'BILL_SUPPLIER_VALIDATE' || (($action === 'BILL_SUPPLIER_DELETE' || $action === 'BILL_SUPPLIER_SENTBYMAIL') && $object->statut != 0)
+			|| $action === 'MEMBER_SUBSCRIPTION_CREATE' || $action === 'MEMBER_SUBSCRIPTION_MODIFY' || $action === 'MEMBER_SUBSCRIPTION_DELETE'
+			|| $action === 'DON_VALIDATE' || (($action === 'DON_MODIFY' || $action === 'DON_DELETE') && $object->statut != 0)
+			|| $action === 'CASHCONTROL_VALIDATE'
+			|| (in_array($object->element, array('facture', 'supplier_invoice')) && $action === 'DOC_DOWNLOAD' && $object->statut != 0)
+			|| (in_array($object->element, array('facture', 'supplier_invoice')) && $action === 'DOC_PREVIEW' && $object->statut != 0)
 			|| (!empty($conf->global->BLOCKEDLOG_ADD_ACTIONS_SUPPORTED) && in_array($action, explode(',', $conf->global->BLOCKEDLOG_ADD_ACTIONS_SUPPORTED)))
-		)
-		{
+		) {
 			$qualified++;
 
 			if (in_array($action, array(
 				'MEMBER_SUBSCRIPTION_CREATE', 'MEMBER_SUBSCRIPTION_MODIFY', 'MEMBER_SUBSCRIPTION_DELETE',
 				'DON_VALIDATE', 'DON_MODIFY', 'DON_DELETE'))) $amounts = (double) $object->amount;
-			elseif ($action == 'CASHCONTROL_VALIDATE')
-			{
+			elseif ($action == 'CASHCONTROL_VALIDATE') {
 				$amounts = (double) $object->cash + (double) $object->cheque + (double) $object->card;
 			} else $amounts = (double) $object->total_ttc;
 		}
@@ -103,8 +103,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 			$amounts=  (double) $object->total_ttc;
 		}*/
 		if ($action === 'PAYMENT_CUSTOMER_CREATE' || $action === 'PAYMENT_SUPPLIER_CREATE' || $action === 'DONATION_PAYMENT_CREATE'
-			|| $action === 'PAYMENT_CUSTOMER_DELETE' || $action === 'PAYMENT_SUPPLIER_DELETE' || $action === 'DONATION_PAYMENT_DELETE')
-		{
+			|| $action === 'PAYMENT_CUSTOMER_DELETE' || $action === 'PAYMENT_SUPPLIER_DELETE' || $action === 'DONATION_PAYMENT_DELETE') {
 			$qualified++;
 			$amounts = 0;
 			if (!empty($object->amounts)) {
@@ -112,23 +111,20 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 					$amounts += price2num($amount);
 				}
 			}
-		} elseif (strpos($action, 'PAYMENT') !== false && !in_array($action, array('PAYMENT_ADD_TO_BANK')))
-		{
+		} elseif (strpos($action, 'PAYMENT') !== false && !in_array($action, array('PAYMENT_ADD_TO_BANK'))) {
 			$qualified++;
 			$amounts = (double) $object->amount;
 		}
 
 		// Another protection.
 		// May be used when event is DOC_DOWNLOAD or DOC_PREVIEW and element is not an invoice
-		if (!$qualified)
-		{
+		if (!$qualified) {
 			return 0; // not implemented action log
 		}
 
 		$result = $b->setObjectData($object, $action, $amounts, $user); // Set field date_object, ref_object, fk_object, element, object_data
 
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$this->error = $b->error;
 			$this->errors = $b->errors;
 			return -1;
@@ -136,13 +132,12 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 
 		$res = $b->create($user);
 
-		if ($res < 0)
-		{
+		if ($res < 0) {
 			$this->error = $b->error;
 			$this->errors = $b->errors;
 			return -1;
 		} else {
 			return 1;
 		}
-    }
+	}
 }
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index 9c3987cbeb1..7417d07ccff 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -31,19 +31,22 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
  */
 class InterfaceLdapsynchro extends DolibarrTriggers
 {
-	public $family = 'ldap';
-	public $description = "Triggers of this module allows to synchronize Dolibarr toward a LDAP database.";
-
 	/**
-	 * Version of the trigger
-	 * @var string
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
 	 */
-	public $version = self::VERSION_DOLIBARR;
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-	/**
-	 * @var string Image of the trigger
-	 */
-	public $picto = 'technic';
+		$this->name = preg_replace('/^Interface/i', '', get_class($this));
+		$this->family = "ldap";
+		$this->description = "Triggers of this module allows to synchronize Dolibarr toward a LDAP database.";
+		// 'development', 'experimental', 'dolibarr' or version
+		$this->version = self::VERSION_DOLIBARR;
+		$this->picto = 'technic';
+	}
 
 	/**
 	 * Function called when a Dolibarrr business event is done.
@@ -61,8 +64,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 		if (empty($conf->ldap->enabled)) return 0; // Module not active, we do nothing
 		if (defined('DISABLE_LDAP_SYNCHRO')) return 0; // If constant defined, we do nothing
 
-		if (!function_exists('ldap_connect'))
-		{
+		if (!function_exists('ldap_connect')) {
 			dol_syslog("Warning, module LDAP is enabled but LDAP functions not available in this PHP", LOG_WARNING);
 			return 0;
 		}
@@ -73,16 +75,13 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 		$result = 0;
 
 		// Users
-		if ($action == 'USER_CREATE')
-		{
+		if ($action == 'USER_CREATE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
-			{
+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap') {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$info = $object->_load_ldap_info();
 					$dn = $object->_load_ldap_dn($info);
 
@@ -91,18 +90,14 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		} elseif ($action == 'USER_MODIFY')
-		{
+		} elseif ($action == 'USER_MODIFY') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
-			{
+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap') {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
-				if ($result > 0)
-				{
-					if (empty($object->oldcopy) || !is_object($object->oldcopy))
-					{
+				if ($result > 0) {
+					if (empty($object->oldcopy) || !is_object($object->oldcopy)) {
 						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);
 						$object->oldcopy = clone $object;
 					}
@@ -114,8 +109,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$container = $object->oldcopy->_load_ldap_dn($oldinfo, 1);
 					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo, 2).")";
 					$records = $ldap->search($container, $search);
-					if (count($records) && $records['count'] == 0)
-					{
+					if (count($records) && $records['count'] == 0) {
 						$olddn = '';
 					}
 
@@ -129,18 +123,14 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		} elseif ($action == 'USER_NEW_PASSWORD')
-		{
+		} elseif ($action == 'USER_NEW_PASSWORD') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
-			{
+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap') {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
-				if ($result > 0)
-				{
-					if (empty($object->oldcopy) || !is_object($object->oldcopy))
-					{
+				if ($result > 0) {
+					if (empty($object->oldcopy) || !is_object($object->oldcopy)) {
 						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);
 						$object->oldcopy = clone $object;
 					}
@@ -152,8 +142,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$container = $object->oldcopy->_load_ldap_dn($oldinfo, 1);
 					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo, 2).")";
 					$records = $ldap->search($container, $search);
-					if (count($records) && $records['count'] == 0)
-					{
+					if (count($records) && $records['count'] == 0) {
 						$olddn = '';
 					}
 
@@ -165,19 +154,15 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		} elseif ($action == 'USER_ENABLEDISABLE')
-		{
+		} elseif ($action == 'USER_ENABLEDISABLE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-		} elseif ($action == 'USER_DELETE')
-		{
+		} elseif ($action == 'USER_DELETE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
-			{
+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap') {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$info = $object->_load_ldap_info();
 					$dn = $object->_load_ldap_dn($info);
 
@@ -186,20 +171,16 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		} elseif ($action == 'USER_SETINGROUP')
-		{
+		} elseif ($action == 'USER_SETINGROUP') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
-			{
+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap') {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					// Must edit $object->newgroupid
 					$usergroup = new UserGroup($this->db);
-					if ($object->newgroupid > 0)
-					{
+					if ($object->newgroupid > 0) {
 						$usergroup->fetch($object->newgroupid);
 
 						$oldinfo = $usergroup->_load_ldap_info();
@@ -209,8 +190,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 						$container = $usergroup->_load_ldap_dn($oldinfo, 1);
 						$search = "(".$usergroup->_load_ldap_dn($oldinfo, 2).")";
 						$records = $ldap->search($container, $search);
-						if (count($records) && $records['count'] == 0)
-						{
+						if (count($records) && $records['count'] == 0) {
 							$olddn = '';
 						}
 
@@ -223,20 +203,16 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		} elseif ($action == 'USER_REMOVEFROMGROUP')
-		{
+		} elseif ($action == 'USER_REMOVEFROMGROUP') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
-			{
+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap') {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					// Must edit $object->newgroupid
 					$usergroup = new UserGroup($this->db);
-					if ($object->oldgroupid > 0)
-					{
+					if ($object->oldgroupid > 0) {
 						$usergroup->fetch($object->oldgroupid);
 
 						$oldinfo = $usergroup->_load_ldap_info();
@@ -246,8 +222,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 						$container = $usergroup->_load_ldap_dn($oldinfo, 1);
 						$search = "(".$usergroup->_load_ldap_dn($oldinfo, 2).")";
 						$records = $ldap->search($container, $search);
-						if (count($records) && $records['count'] == 0)
-						{
+						if (count($records) && $records['count'] == 0) {
 							$olddn = '';
 						}
 
@@ -263,16 +238,13 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 		}
 
 		// Groupes
-		elseif ($action == 'USERGROUP_CREATE')
-		{
+		elseif ($action == 'USERGROUP_CREATE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
-			{
+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap') {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$info = $object->_load_ldap_info();
 					$dn = $object->_load_ldap_dn($info);
 
@@ -286,18 +258,14 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		} elseif ($action == 'USERGROUP_MODIFY')
-		{
+		} elseif ($action == 'USERGROUP_MODIFY') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
-			{
+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap') {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
-				if ($result > 0)
-				{
-					if (empty($object->oldcopy) || !is_object($object->oldcopy))
-					{
+				if ($result > 0) {
+					if (empty($object->oldcopy) || !is_object($object->oldcopy)) {
 						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);
 						$object->oldcopy = clone $object;
 					}
@@ -309,8 +277,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$container = $object->oldcopy->_load_ldap_dn($oldinfo, 1);
 					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo, 2).")";
 					$records = $ldap->search($container, $search);
-					if (count($records) && $records['count'] == 0)
-					{
+					if (count($records) && $records['count'] == 0) {
 						$olddn = '';
 					}
 
@@ -322,16 +289,13 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		} elseif ($action == 'USERGROUP_DELETE')
-		{
+		} elseif ($action == 'USERGROUP_DELETE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
-			{
+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap') {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$info = $object->_load_ldap_info();
 					$dn = $object->_load_ldap_dn($info);
 
@@ -343,16 +307,13 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 		}
 
 		// Contacts
-		elseif ($action == 'CONTACT_CREATE')
-		{
+		elseif ($action == 'CONTACT_CREATE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_CONTACT_ACTIVE))
-			{
+			if (!empty($conf->global->LDAP_CONTACT_ACTIVE)) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$info = $object->_load_ldap_info();
 					$dn = $object->_load_ldap_dn($info);
 
@@ -361,18 +322,14 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		} elseif ($action == 'CONTACT_MODIFY')
-		{
+		} elseif ($action == 'CONTACT_MODIFY') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_CONTACT_ACTIVE))
-			{
+			if (!empty($conf->global->LDAP_CONTACT_ACTIVE)) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
-				if ($result > 0)
-				{
-					if (empty($object->oldcopy) || !is_object($object->oldcopy))
-					{
+				if ($result > 0) {
+					if (empty($object->oldcopy) || !is_object($object->oldcopy)) {
 						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);
 						$object->oldcopy = clone $object;
 					}
@@ -384,8 +341,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$container = $object->oldcopy->_load_ldap_dn($oldinfo, 1);
 					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo, 2).")";
 					$records = $ldap->search($container, $search);
-					if (count($records) && $records['count'] == 0)
-					{
+					if (count($records) && $records['count'] == 0) {
 						$olddn = '';
 					}
 
@@ -397,16 +353,13 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		} elseif ($action == 'CONTACT_DELETE')
-		{
+		} elseif ($action == 'CONTACT_DELETE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_CONTACT_ACTIVE))
-			{
+			if (!empty($conf->global->LDAP_CONTACT_ACTIVE)) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$info = $object->_load_ldap_info();
 					$dn = $object->_load_ldap_dn($info);
 
@@ -418,26 +371,21 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 		}
 
 		// Members
-		elseif ($action == 'MEMBER_CREATE')
-		{
+		elseif ($action == 'MEMBER_CREATE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
-			{
+			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1') {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$info = $object->_load_ldap_info();
 					$dn = $object->_load_ldap_dn($info);
 
 					$result = $ldap->add($dn, $info, $user);
 
 					// For member type
-					if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
-					{
-						if ($object->typeid > 0)
-						{
+					if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1') {
+						if ($object->typeid > 0) {
 							require_once DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php";
 							$membertype = new AdherentType($this->db);
 							$membertype->fetch($object->typeid);
@@ -450,8 +398,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 							$container = $membertype->_load_ldap_dn($oldinfo, 1);
 							$search = "(".$membertype->_load_ldap_dn($oldinfo, 2).")";
 							$records = $ldap->search($container, $search);
-							if (count($records) && $records['count'] == 0)
-							{
+							if (count($records) && $records['count'] == 0) {
 								$olddn = '';
 							}
 
@@ -465,19 +412,15 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		} elseif ($action == 'MEMBER_VALIDATE')
-		{
+		} elseif ($action == 'MEMBER_VALIDATE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
-			{
+			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1') {
 				// If status field is setup to be synchronized
-				if (!empty($conf->global->LDAP_FIELD_MEMBER_STATUS))
-				{
+				if (!empty($conf->global->LDAP_FIELD_MEMBER_STATUS)) {
 					$ldap = new Ldap();
 					$result = $ldap->connect_bind();
 
-					if ($result > 0)
-					{
+					if ($result > 0) {
 						$info = $object->_load_ldap_info();
 						$dn = $object->_load_ldap_dn($info);
 						$olddn = $dn; // We know olddn=dn as we change only status
@@ -488,23 +431,19 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 				}
 			}
-		} elseif ($action == 'MEMBER_SUBSCRIPTION')
-		{
+		} elseif ($action == 'MEMBER_SUBSCRIPTION') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
-			{
+			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1') {
 				// If subscriptions fields are setup to be synchronized
 				if ($conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE
 					|| $conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT
 					|| $conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE
 					|| $conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT
-					|| $conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION)
-				{
+					|| $conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION) {
 					$ldap = new Ldap();
 					$result = $ldap->connect_bind();
 
-					if ($result > 0)
-					{
+					if ($result > 0) {
 						$info = $object->_load_ldap_info();
 						$dn = $object->_load_ldap_dn($info);
 						$olddn = $dn; // We know olddn=dn as we change only subscriptions
@@ -515,18 +454,14 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 				}
 			}
-		} elseif ($action == 'MEMBER_MODIFY')
-		{
+		} elseif ($action == 'MEMBER_MODIFY') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
-			{
+			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1') {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
-				if ($result > 0)
-				{
-					if (empty($object->oldcopy) || !is_object($object->oldcopy))
-					{
+				if ($result > 0) {
+					if (empty($object->oldcopy) || !is_object($object->oldcopy)) {
 						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);
 						$object->oldcopy = clone $object;
 					}
@@ -538,8 +473,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$container = $object->oldcopy->_load_ldap_dn($oldinfo, 1);
 					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo, 2).")";
 					$records = $ldap->search($container, $search);
-					if (count($records) && $records['count'] == 0)
-					{
+					if (count($records) && $records['count'] == 0) {
 						$olddn = '';
 					}
 
@@ -551,8 +485,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$result = $ldap->update($dn, $info, $user, $olddn, $newrdn, $newparent);
 
 					// For member type
-					if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
-					{
+					if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1') {
 						require_once DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php";
 
 						/*
@@ -569,8 +502,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 						$container = $newmembertype->_load_ldap_dn($oldinfo, 1);
 						$search = "(".$newmembertype->_load_ldap_dn($oldinfo, 2).")";
 						$records = $ldap->search($container, $search);
-						if (count($records) && $records['count'] == 0)
-						{
+						if (count($records) && $records['count'] == 0) {
 							$olddn = '';
 						}
 
@@ -579,8 +511,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 						$result = $ldap->update($dn, $info, $user, $olddn);
 
-						if ($object->oldcopy->typeid != $object->typeid)
-						{
+						if ($object->oldcopy->typeid != $object->typeid) {
 							/*
 							 * Remove member in old member type
 							 */
@@ -595,8 +526,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 							$container = $oldmembertype->_load_ldap_dn($oldinfo, 1);
 							$search = "(".$oldmembertype->_load_ldap_dn($oldinfo, 2).")";
 							$records = $ldap->search($container, $search);
-							if (count($records) && $records['count'] == 0)
-							{
+							if (count($records) && $records['count'] == 0) {
 								$olddn = '';
 							}
 
@@ -608,24 +538,19 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					}
 				}
 
-				if ($result <= 0)
-				{
+				if ($result <= 0) {
 					$this->errors[] = "ErrorLDAP ".$ldap->error;
 				}
 			}
-		} elseif ($action == 'MEMBER_NEW_PASSWORD')
-		{
+		} elseif ($action == 'MEMBER_NEW_PASSWORD') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
-			{
+			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1') {
 				// If password field is setup to be synchronized
-				if ($conf->global->LDAP_FIELD_PASSWORD || $conf->global->LDAP_FIELD_PASSWORD_CRYPTED)
-				{
+				if ($conf->global->LDAP_FIELD_PASSWORD || $conf->global->LDAP_FIELD_PASSWORD_CRYPTED) {
 					$ldap = new Ldap();
 					$result = $ldap->connect_bind();
 
-					if ($result > 0)
-					{
+					if ($result > 0) {
 						$info = $object->_load_ldap_info();
 						$dn = $object->_load_ldap_dn($info);
 						$olddn = $dn; // We know olddn=dn as we change only password
@@ -633,25 +558,20 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 						$result = $ldap->update($dn, $info, $user, $olddn);
 					}
 
-					if ($result <= 0)
-					{
+					if ($result <= 0) {
 						$this->errors[] = "ErrorLDAP ".$ldap->error;
 					}
 				}
 			}
-		} elseif ($action == 'MEMBER_RESILIATE')
-		{
+		} elseif ($action == 'MEMBER_RESILIATE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
-			{
+			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1') {
 				// If status field is setup to be synchronized
-				if (!empty($conf->global->LDAP_FIELD_MEMBER_STATUS))
-				{
+				if (!empty($conf->global->LDAP_FIELD_MEMBER_STATUS)) {
 					$ldap = new Ldap();
 					$result = $ldap->connect_bind();
 
-					if ($result > 0)
-					{
+					if ($result > 0) {
 						$info = $object->_load_ldap_info();
 						$dn = $object->_load_ldap_dn($info);
 						$olddn = $dn; // We know olddn=dn as we change only status
@@ -659,32 +579,26 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 						$result = $ldap->update($dn, $info, $user, $olddn);
 					}
 
-					if ($result <= 0)
-					{
+					if ($result <= 0) {
 						$this->errors[] = "ErrorLDAP ".$ldap->error;
 					}
 				}
 			}
-		} elseif ($action == 'MEMBER_DELETE')
-		{
+		} elseif ($action == 'MEMBER_DELETE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
-			{
+			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1') {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$info = $object->_load_ldap_info();
 					$dn = $object->_load_ldap_dn($info);
 
 					$result = $ldap->delete($dn);
 
 					// For member type
-					if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
-					{
-						if ($object->typeid > 0)
-						{
+					if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1') {
+						if ($object->typeid > 0) {
 							require_once DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php";
 
 							/*
@@ -701,8 +615,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 							$container = $membertype->_load_ldap_dn($oldinfo, 1);
 							$search = "(".$membertype->_load_ldap_dn($oldinfo, 2).")";
 							$records = $ldap->search($container, $search);
-							if (count($records) && $records['count'] == 0)
-							{
+							if (count($records) && $records['count'] == 0) {
 								$olddn = '';
 							}
 
@@ -714,24 +627,20 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					}
 				}
 
-				if ($result <= 0)
-				{
+				if ($result <= 0) {
 					$this->errors[] = "ErrorLDAP ".$ldap->error;
 				}
 			}
 		}
 
 		// Members types
-		elseif ($action == 'MEMBER_TYPE_CREATE')
-		{
+		elseif ($action == 'MEMBER_TYPE_CREATE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
-			{
+			if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1') {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$info = $object->_load_ldap_info();
 					$dn = $object->_load_ldap_dn($info);
 
@@ -743,23 +652,18 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$result = $ldap->add($dn, $info, $user);
 				}
 
-				if ($result <= 0)
-				{
+				if ($result <= 0) {
 					$this->errors[] = "ErrorLDAP ".$ldap->error;
 				}
 			}
-		} elseif ($action == 'MEMBER_TYPE_MODIFY')
-		{
+		} elseif ($action == 'MEMBER_TYPE_MODIFY') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
-			{
+			if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1') {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
-				if ($result > 0)
-				{
-					if (empty($object->oldcopy) || !is_object($object->oldcopy))
-					{
+				if ($result > 0) {
+					if (empty($object->oldcopy) || !is_object($object->oldcopy)) {
 						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);
 						$object->oldcopy = clone $object;
 					}
@@ -773,8 +677,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$container = $object->oldcopy->_load_ldap_dn($oldinfo, 1);
 					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo, 2).")";
 					$records = $ldap->search($container, $search);
-					if (count($records) && $records['count'] == 0)
-					{
+					if (count($records) && $records['count'] == 0) {
 						$olddn = '';
 					}
 
@@ -790,24 +693,20 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$this->errors[] = "ErrorLDAP ".$ldap->error;
 				}
 			}
-		} elseif ($action == 'MEMBER_TYPE_DELETE')
-		{
+		} elseif ($action == 'MEMBER_TYPE_DELETE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
-			{
+			if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1') {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$info = $object->_load_ldap_info();
 					$dn = $object->_load_ldap_dn($info);
 
 					$result = $ldap->delete($dn);
 				}
 
-				if ($result <= 0)
-				{
+				if ($result <= 0) {
 					$this->errors[] = "ErrorLDAP ".$ldap->error;
 				}
 			}
diff --git a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
index 59005b2f34d..de75b010305 100644
--- a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
@@ -29,19 +29,22 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
  */
 class InterfaceMailmanSpipsynchro extends DolibarrTriggers
 {
-	public $family = 'mailmanspip';
-	public $description = "Triggers of this module allows to synchronize Mailman an Spip.";
-
 	/**
-	 * Version of the trigger
-	 * @var string
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
 	 */
-	public $version = self::VERSION_DOLIBARR;
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-	/**
-	 * @var string Image of the trigger
-	 */
-	public $picto = 'technic';
+		$this->name = preg_replace('/^Interface/i', '', get_class($this));
+		$this->family = "mailmanspip";
+		$this->description = "Triggers of this module allows to synchronize Mailman an Spip.";
+		// 'development', 'experimental', 'dolibarr' or version
+		$this->version = self::VERSION_DOLIBARR;
+		$this->picto = 'technic';
+	}
 
 	/**
 	 * Function called when a Dolibarrr business event is done.
@@ -56,98 +59,45 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-        if (empty($conf->mailmanspip->enabled)) return 0; // Module not active, we do nothing
+		if (empty($conf->mailmanspip->enabled)) return 0; // Module not active, we do nothing
 
-        require_once DOL_DOCUMENT_ROOT."/mailmanspip/class/mailmanspip.class.php";
-        require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php";
+		require_once DOL_DOCUMENT_ROOT."/mailmanspip/class/mailmanspip.class.php";
+		require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php";
 
-        if ($action == 'CATEGORY_LINK')
-        {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+		if ($action == 'CATEGORY_LINK') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-        	// We add subscription if we change category (new category may means more mailing-list to subscribe)
-        	if (is_object($object->context['linkto']) && method_exists($object->context['linkto'], 'add_to_abo') && $object->context['linkto']->add_to_abo() < 0)
-    		{
-    			$this->error = $object->context['linkto']->error;
-    			$this->errors = $object->context['linkto']->errors;
-    			$return = -1;
-    		} else {
+			// We add subscription if we change category (new category may means more mailing-list to subscribe)
+			if (is_object($object->context['linkto']) && method_exists($object->context['linkto'], 'add_to_abo') && $object->context['linkto']->add_to_abo() < 0) {
+				$this->error = $object->context['linkto']->error;
+				$this->errors = $object->context['linkto']->errors;
+				$return = -1;
+			} else {
 				$return = 1;
 			}
 
-        	return $return;
-        } elseif ($action == 'CATEGORY_UNLINK')
-        {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			return $return;
+		} elseif ($action == 'CATEGORY_UNLINK') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-        	// We remove subscription if we change category (lessw category may means less mailing-list to subscribe)
-        	if (is_object($object->context['unlinkoff']) && method_exists($object->context['unlinkoff'], 'del_to_abo') && $object->context['unlinkoff']->del_to_abo() < 0)
-        	{
-        		$this->error = $object->context['unlinkoff']->error;
-        		$this->errors = $object->context['unlinkoff']->errors;
-        		$return = -1;
-        	} else {
-        		$return = 1;
-        	}
-
-        	return $return;
-        }
-
-        // Members
-        elseif ($action == 'MEMBER_VALIDATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-            $return = 0;
-            if ($object->add_to_abo() < 0)
-            {
-                $this->errors = $object->errors;
-                if (!empty($object->error)) $this->errors[] = $object->error;
-                $return = -1;
-            } else {
-                $return = 1;
-            }
-
-            return $return;
-        } elseif ($action == 'MEMBER_MODIFY')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-            $return = 0;
-            // Add user into some linked tools (mailman, spip, etc...)
-            if (($object->oldcopy->email != $object->email) || ($object->oldcopy->typeid != $object->typeid))
-            {
-                if (is_object($object->oldcopy) && (($object->oldcopy->email != $object->email) || ($object->oldcopy->typeid != $object->typeid)))    // If email has changed or if list has changed we delete mailman subscription for old email
-                {
-                    if ($object->oldcopy->del_to_abo() < 0)
-                    {
-                        $this->errors = $object->oldcopy->errors;
-                        if (!empty($object->oldcopy->error)) $this->errors[] = $object->oldcopy->error;
-                        $return = -1;
-                    } else {
-                        $return = 1;
-                    }
-                }
-                // We add subscription if new email or new type (new type may means more mailing-list to subscribe)
-                if ($object->add_to_abo() < 0)
-                {
-                    $this->errors = $object->errors;
-                    if (!empty($object->error)) $this->errors[] = $object->error;
-                    $return = -1;
-                } else {
-                    $return = 1;
-                }
-            }
+			// We remove subscription if we change category (lessw category may means less mailing-list to subscribe)
+			if (is_object($object->context['unlinkoff']) && method_exists($object->context['unlinkoff'], 'del_to_abo') && $object->context['unlinkoff']->del_to_abo() < 0) {
+				$this->error = $object->context['unlinkoff']->error;
+				$this->errors = $object->context['unlinkoff']->errors;
+				$return = -1;
+			} else {
+				$return = 1;
+			}
 
 			return $return;
-        } elseif ($action == 'MEMBER_RESILIATE' || $action == 'MEMBER_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+		}
 
-            $return = 0;
-            // Remove from external tools (mailman, spip, etc...)
-        	if ($object->del_to_abo() < 0)
-			{
+		// Members
+		elseif ($action == 'MEMBER_VALIDATE') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+
+			$return = 0;
+			if ($object->add_to_abo() < 0) {
 				$this->errors = $object->errors;
 				if (!empty($object->error)) $this->errors[] = $object->error;
 				$return = -1;
@@ -155,9 +105,49 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
 				$return = 1;
 			}
 
-	        return $return;
-        }
+			return $return;
+		} elseif ($action == 'MEMBER_MODIFY') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+
+			$return = 0;
+			// Add user into some linked tools (mailman, spip, etc...)
+			if (($object->oldcopy->email != $object->email) || ($object->oldcopy->typeid != $object->typeid)) {
+				if (is_object($object->oldcopy) && (($object->oldcopy->email != $object->email) || ($object->oldcopy->typeid != $object->typeid))) {    // If email has changed or if list has changed we delete mailman subscription for old email
+					if ($object->oldcopy->del_to_abo() < 0) {
+						$this->errors = $object->oldcopy->errors;
+						if (!empty($object->oldcopy->error)) $this->errors[] = $object->oldcopy->error;
+						$return = -1;
+					} else {
+						$return = 1;
+					}
+				}
+				// We add subscription if new email or new type (new type may means more mailing-list to subscribe)
+				if ($object->add_to_abo() < 0) {
+					$this->errors = $object->errors;
+					if (!empty($object->error)) $this->errors[] = $object->error;
+					$return = -1;
+				} else {
+					$return = 1;
+				}
+			}
+
+			return $return;
+		} elseif ($action == 'MEMBER_RESILIATE' || $action == 'MEMBER_DELETE') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+
+			$return = 0;
+			// Remove from external tools (mailman, spip, etc...)
+			if ($object->del_to_abo() < 0) {
+				$this->errors = $object->errors;
+				if (!empty($object->error)) $this->errors[] = $object->error;
+				$return = -1;
+			} else {
+				$return = 1;
+			}
+
+			return $return;
+		}
 
 		return 0;
-    }
+	}
 }
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index a7157ea866a..c5a4f450e42 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -30,20 +30,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
  */
 class InterfaceNotification extends DolibarrTriggers
 {
-	public $family = 'notification';
-	public $description = "Triggers of this module send email notifications according to Notification module setup.";
-
-	/**
-	 * Version of the trigger
-	 * @var string
-	 */
-	public $version = self::VERSION_DOLIBARR;
-
-	/**
-	 * @var string Image of the trigger
-	 */
-	public $picto = 'email';
-
 	// @todo Defined also into notify.class.php)
 	public $listofmanagedevents = array(
 		'BILL_VALIDATE',
@@ -63,6 +49,23 @@ class InterfaceNotification extends DolibarrTriggers
 		'HOLIDAY_APPROVE'
 	);
 
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+
+		$this->name = preg_replace('/^Interface/i', '', get_class($this));
+		$this->family = "notification";
+		$this->description = "Triggers of this module send email notifications according to Notification module setup.";
+		// 'development', 'experimental', 'dolibarr' or version
+		$this->version = self::VERSION_DOLIBARR;
+		$this->picto = 'email';
+	}
+
 	/**
 	 * Function called when a Dolibarrr business event is done.
 	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
@@ -107,20 +110,17 @@ class InterfaceNotification extends DolibarrTriggers
 		$sql .= $this->db->order("rang, elementtype, code");
 		dol_syslog("getListOfManagedEvents Get list of notifications", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
 				$qualified = 0;
 				// Check is this event is supported by notification module
 				if (in_array($obj->code, $this->listofmanagedevents)) $qualified = 1;
 				// Check if module for this event is active
-				if ($qualified)
-				{
+				if ($qualified) {
 					//print 'xx'.$obj->code;
 					$element = $obj->elementtype;
 
@@ -133,8 +133,7 @@ class InterfaceNotification extends DolibarrTriggers
 					elseif (!in_array($element, array('order_supplier', 'invoice_supplier', 'withdraw', 'shipping', 'member', 'expensereport')) && empty($conf->$element->enabled)) $qualified = 0;
 				}
 
-				if ($qualified)
-				{
+				if ($qualified) {
 					$ret[] = array('rowid'=>$obj->rowid, 'code'=>$obj->code, 'label'=>$obj->label, 'description'=>$obj->description, 'elementtype'=>$obj->elementtype);
 				}
 
diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index d541f2e82d0..7bb8988e18e 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -30,11 +30,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
  */
 class InterfaceTicketEmail extends DolibarrTriggers
 {
-	/**
-	 * @var DoliDB Database handler.
-	 */
-	public $db;
-
 	/**
 	 *   Constructor
 	 *
@@ -47,53 +42,10 @@ class InterfaceTicketEmail extends DolibarrTriggers
 		$this->name = preg_replace('/^Interface/i', '', get_class($this));
 		$this->family = "ticket";
 		$this->description = "Triggers of the module ticket to send notifications to internal users and to third-parties";
-		$this->version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' or version
+		$this->version = self::VERSION_DOLIBARR; // 'development', 'experimental', 'dolibarr' or version
 		$this->picto = 'ticket';
 	}
 
-	/**
-	 *   Return name of trigger file
-	 *
-	 *   @return string      Name of trigger file
-	 */
-	public function getName()
-	{
-		return $this->name;
-	}
-
-	/**
-	 *   Return description of trigger file
-	 *
-	 *   @return string      Description of trigger file
-	 */
-	public function getDesc()
-	{
-		return $this->description;
-	}
-
-	/**
-	 *   Return version of trigger file
-	 *
-	 *   @return string      Version of trigger file
-	 */
-	public function getVersion()
-	{
-		global $langs;
-		$langs->load("admin");
-
-		if ($this->version == 'development') {
-			return $langs->trans("Development");
-		} elseif ($this->version == 'experimental') {
-			return $langs->trans("Experimental");
-		} elseif ($this->version == 'dolibarr') {
-			return DOL_VERSION;
-		} elseif ($this->version) {
-			return $this->version;
-		} else {
-			return $langs->trans("Unknown");
-		}
-	}
-
 	/**
 	 *      Function called when a Dolibarrr business event is done.
 	 *      All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers
@@ -115,16 +67,13 @@ class InterfaceTicketEmail extends DolibarrTriggers
 			case 'TICKET_ASSIGNED':
 				dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-				if ($object->fk_user_assign > 0 && $object->fk_user_assign != $user->id)
-				{
+				if ($object->fk_user_assign > 0 && $object->fk_user_assign != $user->id) {
 					$userstat = new User($this->db);
 					$res = $userstat->fetch($object->fk_user_assign);
-					if ($res > 0)
-					{
+					if ($res > 0) {
 						// Send email to notification email
 
-						if (empty($conf->global->TICKET_DISABLE_ALL_MAILS))
-						{
+						if (empty($conf->global->TICKET_DISABLE_ALL_MAILS)) {
 							// Init to avoid errors
 							$filepath = array();
 							$filename = array();
@@ -183,11 +132,10 @@ class InterfaceTicketEmail extends DolibarrTriggers
 				$langs->load('ticket');
 
 				// Send email to notification email
-				$sendto = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
-				if (!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO) && empty($object->context['disableticketemail']))
-				{
-					if ($sendto)
-					{
+				if (!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO) && empty($object->context['disableticketemail'])) {
+					$sendto = empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO) ? '' : $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
+
+					if ($sendto) {
 						// Init to avoid errors
 						$filepath = array();
 						$filename = array();
@@ -248,8 +196,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 
 				// Send email to customer
 
-				if (empty($conf->global->TICKET_DISABLE_CUSTOMER_MAILS) && empty($object->context['disableticketemail']) && $object->notify_tiers_at_create)
-				{
+				if (empty($conf->global->TICKET_DISABLE_CUSTOMER_MAILS) && empty($object->context['disableticketemail']) && $object->notify_tiers_at_create) {
 					$sendto = '';
 					if (empty($user->socid) && empty($user->email)) {
 							  $object->fetch_thirdparty();
@@ -272,16 +219,13 @@ class InterfaceTicketEmail extends DolibarrTriggers
 						$message_customer .= '<li>'.$langs->trans('Severity').' : '.$langs->getLabelFromKey($this->db, 'TicketSeverityShort'.$object->severity_code, 'c_ticket_severity', 'code', 'label', $object->severity_code).'</li>';
 
 						// Extrafields
-						foreach ($this->attributes[$object->table_element]['label'] as $key => $value)
-						{
+						foreach ($this->attributes[$object->table_element]['label'] as $key => $value) {
 							$enabled = 1;
-							if ($enabled && isset($this->attributes[$object->table_element]['list'][$key]))
-							{
+							if ($enabled && isset($this->attributes[$object->table_element]['list'][$key])) {
 								$enabled = dol_eval($this->attributes[$object->table_element]['list'][$key], 1);
 							}
 							$perms = 1;
-							if ($perms && isset($this->attributes[$object->table_element]['perms'][$key]))
-							{
+							if ($perms && isset($this->attributes[$object->table_element]['perms'][$key])) {
 								$perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1);
 							}
 
@@ -303,7 +247,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 						$message_customer .= '<p>'.$langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer').' : <a href="'.$url_public_ticket.'">'.$url_public_ticket.'</a></p>';
 						$message_customer .= '<p>'.$langs->trans('TicketEmailPleaseDoNotReplyToThisEmail').'</p>';
 
-						$from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
+						$from = (empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? '' : $conf->global->MAIN_INFO_SOCIETE_NOM.' ').'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
 						$replyto = $from;
 
 						$trackid = 'tic'.$object->id;
diff --git a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
index 49bfae82247..502a32656c8 100644
--- a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
+++ b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
@@ -35,46 +35,20 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
  */
 class InterfaceStripe extends DolibarrTriggers
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
-
-    /**
-     *   Constructor
-     *
-     *   @param DoliDB $db Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-
-        $this->name = preg_replace('/^Interface/i', '', get_class($this));
-	    $this->family = 'stripe';
-        $this->description = "Triggers of the module Stripe";
-        $this->version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' or version
-        $this->picto = 'stripe';
-    }
-
 	/**
-	 * Trigger name
+	 *   Constructor
 	 *
-	 * @return string Name of trigger file
+	 *   @param DoliDB $db Database handler
 	 */
-	public function getName()
+	public function __construct($db)
 	{
-		return $this->name;
-	}
+		$this->db = $db;
 
-
-	/**
-	 * Trigger description
-	 *
-	 * @return string Description of trigger file
-	 */
-	public function getDesc()
-	{
-		return $this->description;
+		$this->name = preg_replace('/^Interface/i', '', get_class($this));
+		$this->family = 'stripe';
+		$this->description = "Triggers of the module Stripe";
+		$this->version = self::VERSION_DOLIBARR; // 'development', 'experimental', 'dolibarr' or version
+		$this->picto = 'stripe';
 	}
 
 	/**
@@ -104,8 +78,7 @@ class InterfaceStripe extends DolibarrTriggers
 
 		$service = 'StripeTest';
 		$servicestatus = 0;
-		if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha'))
-		{
+		if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) {
 			$service = 'StripeLive';
 			$servicestatus = 1;
 		}
@@ -118,8 +91,7 @@ class InterfaceStripe extends DolibarrTriggers
 
 			if ($object->client != 0) {
 				$customer = $stripe->customerStripe($object, $stripeacc, $servicestatus); // This make a network request
-				if ($customer)
-				{
+				if ($customer) {
 					$namecleaned = $object->name ? $object->name : null;
 					$vatcleaned = $object->tva_intra ? $object->tva_intra : null; // Example of valid numbers are 'FR12345678901' or 'FR12345678902'
 					$desccleaned = $object->name_alias ? $object->name_alias : null;
@@ -147,15 +119,13 @@ class InterfaceStripe extends DolibarrTriggers
 					if ($desccleaned != $customer->description) $changerequested++;
 					if (($customer->tax_exempt == 'exempt' && !$object->tva_assuj) || (!$customer->tax_exempt == 'exempt' && empty($object->tva_assuj))) $changerequested++;
 					if (!isset($customer->tax_ids['data']) && !is_null($vatcleaned)) $changerequested++;
-					elseif (isset($customer->tax_ids['data']))
-					{
+					elseif (isset($customer->tax_ids['data'])) {
 						$taxinfo = reset($customer->tax_ids['data']);
 						if (empty($taxinfo) && !empty($vatcleaned)) $changerequested++;
 						if (isset($taxinfo->value) && $vatcleaned != $taxinfo->value) $changerequested++;
 					}
 
-					if ($changerequested)
-					{
+					if ($changerequested) {
 						/*if (! empty($object->email)) $customer->email = $object->email;
 						$customer->description = $namecleaned;
 						if (empty($taxinfo)) $customer->tax_info = array('type'=>'vat', 'tax_id'=>null);
@@ -167,22 +137,17 @@ class InterfaceStripe extends DolibarrTriggers
 
 						try {
 							// Update Tax info on Stripe
-							if (!empty($conf->global->STRIPE_SAVE_TAX_IDS))	// We setup to save Tax info on Stripe side. Warning: This may result in error when saving customer
-							{
-								if (!empty($vatcleaned))
-								{
+							if (!empty($conf->global->STRIPE_SAVE_TAX_IDS)) {	// We setup to save Tax info on Stripe side. Warning: This may result in error when saving customer
+								if (!empty($vatcleaned)) {
 									$isineec = isInEEC($object);
-									if ($object->country_code && $isineec)
-									{
+									if ($object->country_code && $isineec) {
 										//$taxids = $customer->allTaxIds($customer->id);
 										$customer->createTaxId($customer->id, array('type'=>'eu_vat', 'value'=>$vatcleaned));
 									}
 								} else {
 									$taxids = $customer->allTaxIds($customer->id);
-									if (is_array($taxids->data))
-									{
-										foreach ($taxids->data as $taxidobj)
-										{
+									if (is_array($taxids->data)) {
+										foreach ($taxids->data as $taxidobj) {
 											$customer->deleteTaxId($customer->id, $taxidobj->id);
 										}
 									}
@@ -191,9 +156,8 @@ class InterfaceStripe extends DolibarrTriggers
 
 							// Update Customer on Stripe
 							$customer->save();
-						} catch (Exception $e)
-						{
-						    //var_dump(\Stripe\Stripe::getApiVersion());
+						} catch (Exception $e) {
+							//var_dump(\Stripe\Stripe::getApiVersion());
 							$this->errors[] = $e->getMessage();
 							$ok = -1;
 						}
@@ -204,17 +168,15 @@ class InterfaceStripe extends DolibarrTriggers
 		if ($action == 'COMPANY_DELETE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-			if (! empty($conf->global->STRIPE_DELETE_STRIPE_ACCOUNT_WHEN_DELETING_THIRPARTY)) {
+			if (!empty($conf->global->STRIPE_DELETE_STRIPE_ACCOUNT_WHEN_DELETING_THIRPARTY)) {
 				// By default, we do not delete the stripe account. We may need to reuse it with its payment_intent, for example if delete is for a merge of thirdparties.
 				$stripeacc = $stripe->getStripeAccount($service); // No need of network access for this. May return '' if no Oauth defined.
 
 				$customer = $stripe->customerStripe($object, $stripeacc, $servicestatus);
-				if ($customer)
-				{
+				if ($customer) {
 					try {
 						$customer->delete();
-					} catch (Exception $e)
-					{
+					} catch (Exception $e) {
 						dol_syslog("Failed to delete Stripe customer ".$e->getMessage(), LOG_WARNING);
 					}
 				}
@@ -232,13 +194,11 @@ class InterfaceStripe extends DolibarrTriggers
 		if ($action == 'COMPANYPAYMENTMODE_MODIFY' && $object->type == 'card') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-			if (!empty($object->stripe_card_ref))
-			{
+			if (!empty($object->stripe_card_ref)) {
 				$stripeacc = $stripe->getStripeAccount($service); // No need of network access for this. May return '' if no Oauth defined.
 				$stripecu = $stripe->getStripeCustomerAccount($object->fk_soc); // No need of network access for this
 
-				if ($stripecu)
-				{
+				if ($stripecu) {
 					// Get customer (required to get a card)
 					if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
 						$customer = \Stripe\Customer::retrieve($stripecu);
@@ -246,15 +206,13 @@ class InterfaceStripe extends DolibarrTriggers
 						$customer = \Stripe\Customer::retrieve($stripecu, array("stripe_account" => $stripeacc));
 					}
 
-					if ($customer)
-					{
+					if ($customer) {
 						$card = $stripe->cardStripe($customer, $object, $stripeacc, $servicestatus);
 						if ($card) {
 							$card->metadata = array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']));
 							try {
 								$card->save();
-							} catch (Exception $e)
-							{
+							} catch (Exception $e) {
 								$ok = -1;
 								$this->error = $e->getMessages();
 							}
@@ -266,13 +224,11 @@ class InterfaceStripe extends DolibarrTriggers
 		if ($action == 'COMPANYPAYMENTMODE_DELETE' && $object->type == 'card') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-			if (!empty($object->stripe_card_ref))
-			{
+			if (!empty($object->stripe_card_ref)) {
 				$stripeacc = $stripe->getStripeAccount($service); // No need of network access for this. May return '' if no Oauth defined.
 				$stripecu = $stripe->getStripeCustomerAccount($object->fk_soc); // No need of network access for this
 
-				if ($stripecu)
-				{
+				if ($stripecu) {
 					// Get customer (required to get a card)
 					if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
 						$customer = \Stripe\Customer::retrieve($stripecu);
@@ -280,8 +236,7 @@ class InterfaceStripe extends DolibarrTriggers
 						$customer = \Stripe\Customer::retrieve($stripecu, array("stripe_account" => $stripeacc));
 					}
 
-					if ($customer)
-					{
+					if ($customer) {
 						$card = $stripe->cardStripe($customer, $object, $stripeacc, $servicestatus);
 						if ($card) {
 							if (method_exists($card, 'detach')) $card->detach();
diff --git a/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php b/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
index b51fd0a20b7..ee576992865 100644
--- a/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
+++ b/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
@@ -33,23 +33,22 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
  */
 class InterfaceContactRoles extends DolibarrTriggers
 {
-
-	public $family = 'agenda';
-
-	public $description = "Triggers of this module auto link contact to company.";
-
 	/**
-	 * Version of the trigger
+	 * Constructor
 	 *
-	 * @var string
+	 * @param DoliDB $db Database handler
 	 */
-	public $version = self::VERSION_DOLIBARR;
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-	/**
-	 *
-	 * @var string Image of the trigger
-	 */
-	public $picto = 'action';
+		$this->name = preg_replace('/^Interface/i', '', get_class($this));
+		$this->family = "agenda";
+		$this->description = "Triggers of this module auto link contact to company.";
+		// 'development', 'experimental', 'dolibarr' or version
+		$this->version = self::VERSION_DOLIBARR;
+		$this->picto = 'action';
+	}
 
 	/**
 	 * Function called when a Dolibarrr business event is done.
diff --git a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
index 62d84295915..de81e54165a 100644
--- a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
+++ b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2017-2019  Frédéric France     <frederic.france@netlogic.fr>
+/* Copyright (C) 2017-2020  Frédéric 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
@@ -39,335 +39,343 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
  */
 class InterfaceZapierTriggers extends DolibarrTriggers
 {
-    /**
-     * @var DoliDB Database handler
-     */
-    protected $db;
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-    /**
-     * Constructor
-     *
-     * @param DoliDB $db Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
+		$this->name = preg_replace('/^Interface/i', '', get_class($this));
+		$this->family = "technic";
+		$this->description = "Zapier triggers.";
+		// 'development', 'experimental', 'dolibarr' or version
+		$this->version = self::VERSION_DEVELOPMENT;
+		$this->picto = 'zapier';
+	}
 
-        $this->name = preg_replace('/^Interface/i', '', get_class($this));
-        $this->family = "technic";
-        $this->description = "Zapier triggers.";
-        // 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'development';
-        $this->picto = 'zapier';
-    }
+	/**
+	 * Function called when a Dolibarrr business event is done.
+	 * All functions "runTrigger" are triggered if file
+	 * is inside directory core/triggers
+	 *
+	 * @param string        $action     Event action code
+	 * @param CommonObject  $object     Object
+	 * @param User          $user       Object user
+	 * @param Translate     $langs      Object langs
+	 * @param Conf          $conf       Object conf
+	 * @return int                      <0 if KO, 0 if no triggered ran, >0 if OK
+	 */
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
+	{
+		if (empty($conf->zapier->enabled)) {
+			// Module not active, we do nothing
+			return 0;
+		}
+		$logtriggeraction = false;
+		$sql = '';
+		if ($action != '') {
+			$actions = explode('_', $action);
+			$sql = 'SELECT rowid, url FROM '.MAIN_DB_PREFIX.'zapier_hook';
+			$sql .= ' WHERE module="'.$this->db->escape(strtolower($actions[0])).'" AND action="'.$this->db->escape(strtolower($actions[1])).'"';
+			//setEventMessages($sql, null);
+		}
 
-    /**
-     * Trigger name
-     *
-     * @return string Name of trigger file
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
+		switch ($action) {
+			// Users
+			case 'USER_CREATE':
+				$resql = $this->db->query($sql);
+				// TODO voir comment regrouper les webhooks en un post
+				while ($resql && $obj = $this->db->fetch_array($resql)) {
+					$cleaned = cleanObjectDatas(dol_clone($object));
+					$json = json_encode($cleaned);
+					// call the zapierPostWebhook() function
+					zapierPostWebhook($obj['url'], $json);
+				}
+				$logtriggeraction = true;
+				break;
+			case 'USER_MODIFY':
+				$resql = $this->db->query($sql);
+				// TODO voir comment regrouper les webhooks en un post
+				while ($resql && $obj = $this->db->fetch_array($resql)) {
+					$cleaned = cleanObjectDatas(dol_clone($object));
+					$json = json_encode($cleaned);
+					// call the zapierPostWebhook() function
+					zapierPostWebhook($obj['url'], $json);
+				}
+				$logtriggeraction = true;
+				break;
+			//case 'USER_NEW_PASSWORD':
+			//case 'USER_ENABLEDISABLE':
+			//case 'USER_DELETE':
+			//case 'USER_SETINGROUP':
+			//case 'USER_REMOVEFROMGROUP':
+			// case 'USER_LOGIN':
+			// case 'USER_LOGIN_FAILED':
+			// case 'USER_LOGOUT':
+			// Warning: To increase performances, this action is triggered only if constant MAIN_ACTIVATE_UPDATESESSIONTRIGGER is set to 1.
+			// // case 'USER_UPDATE_SESSION':
 
-    /**
-     * Trigger description
-     *
-     * @return string Description of trigger file
-     */
-    public function getDesc()
-    {
-        return $this->description;
-    }
+			// Actions
+			case 'ACTION_MODIFY':
+				//$logtriggeraction = true;
+				break;
+			case 'ACTION_CREATE':
+				$resql = $this->db->query($sql);
+				// TODO voir comment regrouper les webhooks en un post
+				while ($resql && $obj = $this->db->fetch_array($resql)) {
+					$cleaned = cleanObjectDatas(dol_clone($object));
+					$cleaned = cleanAgendaEventsDatas($cleaned);
+					$json = json_encode($cleaned);
+					// call the zapierPostWebhook() function
+					zapierPostWebhook($obj['url'], $json);
+					//setEventMessages($obj['url'], null);
+				}
+				$logtriggeraction = true;
+				break;
+			case 'ACTION_DELETE':
+				//$logtriggeraction = true;
+				break;
 
+			// Groups
+			//case 'USERGROUP_CREATE':
+			//case 'USERGROUP_MODIFY':
+			//case 'USERGROUP_DELETE':
 
-    /**
-     * Function called when a Dolibarrr business event is done.
-     * All functions "runTrigger" are triggered if file
-     * is inside directory core/triggers
-     *
-     * @param string        $action     Event action code
-     * @param CommonObject  $object     Object
-     * @param User          $user       Object user
-     * @param Translate     $langs      Object langs
-     * @param Conf          $conf       Object conf
-     * @return int                      <0 if KO, 0 if no triggered ran, >0 if OK
-     */
-    public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
-    {
-        global $db;
-        if (empty($conf->zapier->enabled)) {
-            // Module not active, we do nothing
-            return 0;
-        }
-        $logtriggeraction = false;
-        $sql = '';
-        if ($action != '') {
-            $actions = explode('_', $action);
-            $sql = 'SELECT rowid, url FROM '.MAIN_DB_PREFIX.'zapier_hook';
-            $sql .= ' WHERE module="'.$this->db->escape(strtolower($actions[0])).'" AND action="'.$this->db->escape(strtolower($actions[1])).'"';
-            //setEventMessages($sql, null);
-        }
+			// Categories
+			// case 'CATEGORY_CREATE':
+			// case 'CATEGORY_MODIFY':
+			// case 'CATEGORY_DELETE':
+			// case 'CATEGORY_SET_MULTILANGS':
 
-        switch ($action) {
-            // Users
-            //case 'USER_CREATE':
-            //case 'USER_MODIFY':
-            //case 'USER_NEW_PASSWORD':
-            //case 'USER_ENABLEDISABLE':
-            //case 'USER_DELETE':
-            //case 'USER_SETINGROUP':
-            //case 'USER_REMOVEFROMGROUP':
-            // case 'USER_LOGIN':
-            // case 'USER_LOGIN_FAILED':
-            // case 'USER_LOGOUT':
-            // Warning: To increase performances, this action is triggered only if constant MAIN_ACTIVATE_UPDATESESSIONTRIGGER is set to 1.
-            // // case 'USER_UPDATE_SESSION':
+			// Companies
+			case 'COMPANY_CREATE':
+				$resql = $this->db->query($sql);
+				while ($resql && $obj = $this->db->fetch_array($resql)) {
+					$cleaned = cleanObjectDatas(dol_clone($object));
+					$json = json_encode($cleaned);
+					// call the zapierPostWebhook() function
+					zapierPostWebhook($obj['url'], $json);
+				}
+				$logtriggeraction = true;
+				break;
+			case 'COMPANY_MODIFY':
+				$resql = $this->db->query($sql);
+				while ($resql && $obj = $this->db->fetch_array($resql)) {
+					$cleaned = cleanObjectDatas(dol_clone($object));
+					$json = json_encode($cleaned);
+					// call the zapierPostWebhook() function
+					zapierPostWebhook($obj['url'], $json);
+				}
+				$logtriggeraction = true;
+				break;
+			case 'COMPANY_DELETE':
+				//$logtriggeraction = true;
+				break;
 
-            // Actions
-            case 'ACTION_MODIFY':
-                //$logtriggeraction = true;
-                break;
-            case 'ACTION_CREATE':
-            	$resql = $this->db->query($sql);
-                // TODO voir comment regrouper les webhooks en un post
-            	while ($resql && $obj = $this->db->fetch_array($resql)) {
-                    $cleaned = cleanObjectDatas(dol_clone($object));
-                    $cleaned = cleanAgendaEventsDatas($cleaned);
-                    $json = json_encode($cleaned);
-                    // call the zapierPostWebhook() function
-                    zapierPostWebhook($obj['url'], $json);
-                    //setEventMessages($obj['url'], null);
-                }
-                $logtriggeraction = true;
-                break;
-            case 'ACTION_DELETE':
-                //$logtriggeraction = true;
-                break;
+			// Contacts
+			case 'CONTACT_CREATE':
+			case 'CONTACT_MODIFY':
+			case 'CONTACT_DELETE':
+			case 'CONTACT_ENABLEDISABLE':
+				break;
+			// Products
+			// case 'PRODUCT_CREATE':
+			// case 'PRODUCT_MODIFY':
+			// case 'PRODUCT_DELETE':
+			// case 'PRODUCT_PRICE_MODIFY':
+			// case 'PRODUCT_SET_MULTILANGS':
+			// case 'PRODUCT_DEL_MULTILANGS':
 
-            // Groups
-            //case 'USERGROUP_CREATE':
-            //case 'USERGROUP_MODIFY':
-            //case 'USERGROUP_DELETE':
+			//Stock mouvement
+			// case 'STOCK_MOVEMENT':
 
-            // Companies
-            case 'COMPANY_CREATE':
-            	$resql = $this->db->query($sql);
-            	while ($resql && $obj = $this->db->fetch_array($resql)) {
-                    $cleaned = cleanObjectDatas(dol_clone($object));
-                    $json = json_encode($cleaned);
-                    // call the zapierPostWebhook() function
-                    zapierPostWebhook($obj['url'], $json);
-                }
-                $logtriggeraction = true;
-                break;
-            case 'COMPANY_MODIFY':
-            	$resql = $this->db->query($sql);
-            	while ($resql && $obj = $this->db->fetch_array($resql)) {
-                    $cleaned = cleanObjectDatas(dol_clone($object));
-                    $json = json_encode($cleaned);
-                    // call the zapierPostWebhook() function
-                    zapierPostWebhook($obj['url'], $json);
-                }
-                $logtriggeraction = true;
-                break;
-            case 'COMPANY_DELETE':
-                //$logtriggeraction = true;
-                break;
+			//MYECMDIR
+			// case 'MYECMDIR_DELETE':
+			// case 'MYECMDIR_CREATE':
+			// case 'MYECMDIR_MODIFY':
 
-            // Contacts
-            case 'CONTACT_CREATE':
-            case 'CONTACT_MODIFY':
-            case 'CONTACT_DELETE':
-            case 'CONTACT_ENABLEDISABLE':
-                break;
-            // Products
-            // case 'PRODUCT_CREATE':
-            // case 'PRODUCT_MODIFY':
-            // case 'PRODUCT_DELETE':
-            // case 'PRODUCT_PRICE_MODIFY':
-            // case 'PRODUCT_SET_MULTILANGS':
-            // case 'PRODUCT_DEL_MULTILANGS':
+			// Customer orders
+			case 'ORDER_CREATE':
+				$resql = $this->db->query($sql);
+				while ($resql && $obj = $this->db->fetch_array($resql)) {
+					$cleaned = cleanObjectDatas(dol_clone($object));
+					$json = json_encode($cleaned);
+					// call the zapierPostWebhook() function
+					zapierPostWebhook($obj['url'], $json);
+				}
+				$logtriggeraction = true;
+				break;
+			case 'ORDER_CLONE':
+				break;
+			case 'ORDER_VALIDATE':
+				break;
+			case 'ORDER_DELETE':
+			case 'ORDER_CANCEL':
+			case 'ORDER_SENTBYMAIL':
+			case 'ORDER_CLASSIFY_BILLED':
+			case 'ORDER_SETDRAFT':
+			case 'LINEORDER_INSERT':
+			case 'LINEORDER_UPDATE':
+			case 'LINEORDER_DELETE':
+				break;
+			// Supplier orders
+			// case 'ORDER_SUPPLIER_CREATE':
+			// case 'ORDER_SUPPLIER_CLONE':
+			// case 'ORDER_SUPPLIER_VALIDATE':
+			// case 'ORDER_SUPPLIER_DELETE':
+			// case 'ORDER_SUPPLIER_APPROVE':
+			// case 'ORDER_SUPPLIER_REFUSE':
+			// case 'ORDER_SUPPLIER_CANCEL':
+			// case 'ORDER_SUPPLIER_SENTBYMAIL':
+			// case 'ORDER_SUPPLIER_DISPATCH':
+			// case 'LINEORDER_SUPPLIER_DISPATCH':
+			// case 'LINEORDER_SUPPLIER_CREATE':
+			// case 'LINEORDER_SUPPLIER_UPDATE':
 
-            //Stock mouvement
-            // case 'STOCK_MOVEMENT':
+			// Proposals
+			// case 'PROPAL_CREATE':
+			// case 'PROPAL_CLONE':
+			// case 'PROPAL_MODIFY':
+			// case 'PROPAL_VALIDATE':
+			// case 'PROPAL_SENTBYMAIL':
+			// case 'PROPAL_CLOSE_SIGNED':
+			// case 'PROPAL_CLOSE_REFUSED':
+			// case 'PROPAL_DELETE':
+			// case 'LINEPROPAL_INSERT':
+			// case 'LINEPROPAL_UPDATE':
+			// case 'LINEPROPAL_DELETE':
 
-            //MYECMDIR
-            // case 'MYECMDIR_DELETE':
-            // case 'MYECMDIR_CREATE':
-            // case 'MYECMDIR_MODIFY':
+			// SupplierProposal
+			// case 'SUPPLIER_PROPOSAL_CREATE':
+			// case 'SUPPLIER_PROPOSAL_CLONE':
+			// case 'SUPPLIER_PROPOSAL_MODIFY':
+			// case 'SUPPLIER_PROPOSAL_VALIDATE':
+			// case 'SUPPLIER_PROPOSAL_SENTBYMAIL':
+			// case 'SUPPLIER_PROPOSAL_CLOSE_SIGNED':
+			// case 'SUPPLIER_PROPOSAL_CLOSE_REFUSED':
+			// case 'SUPPLIER_PROPOSAL_DELETE':
+			// case 'LINESUPPLIER_PROPOSAL_INSERT':
+			// case 'LINESUPPLIER_PROPOSAL_UPDATE':
+			// case 'LINESUPPLIER_PROPOSAL_DELETE':
 
-            // Customer orders
-            case 'ORDER_CREATE':
-            	$resql = $this->db->query($sql);
-            	while ($resql && $obj = $this->db->fetch_array($resql)) {
-                    $cleaned = cleanObjectDatas(dol_clone($object));
-                    $json = json_encode($cleaned);
-                    // call the zapierPostWebhook() function
-                    zapierPostWebhook($obj['url'], $json);
-                }
-                $logtriggeraction = true;
-                break;
-            case 'ORDER_CLONE':
-                break;
-            case 'ORDER_VALIDATE':
-                break;
-            case 'ORDER_DELETE':
-            case 'ORDER_CANCEL':
-            case 'ORDER_SENTBYMAIL':
-            case 'ORDER_CLASSIFY_BILLED':
-            case 'ORDER_SETDRAFT':
-            case 'LINEORDER_INSERT':
-            case 'LINEORDER_UPDATE':
-            case 'LINEORDER_DELETE':
-                break;
-            // Supplier orders
-            // case 'ORDER_SUPPLIER_CREATE':
-            // case 'ORDER_SUPPLIER_CLONE':
-            // case 'ORDER_SUPPLIER_VALIDATE':
-            // case 'ORDER_SUPPLIER_DELETE':
-            // case 'ORDER_SUPPLIER_APPROVE':
-            // case 'ORDER_SUPPLIER_REFUSE':
-            // case 'ORDER_SUPPLIER_CANCEL':
-            // case 'ORDER_SUPPLIER_SENTBYMAIL':
-            // case 'ORDER_SUPPLIER_DISPATCH':
-            // case 'LINEORDER_SUPPLIER_DISPATCH':
-            // case 'LINEORDER_SUPPLIER_CREATE':
-            // case 'LINEORDER_SUPPLIER_UPDATE':
+			// Contracts
+			// case 'CONTRACT_CREATE':
+			// case 'CONTRACT_ACTIVATE':
+			// case 'CONTRACT_CANCEL':
+			// case 'CONTRACT_CLOSE':
+			// case 'CONTRACT_DELETE':
+			// case 'LINECONTRACT_INSERT':
+			// case 'LINECONTRACT_UPDATE':
+			// case 'LINECONTRACT_DELETE':
 
-            // Proposals
-            // case 'PROPAL_CREATE':
-            // case 'PROPAL_CLONE':
-            // case 'PROPAL_MODIFY':
-            // case 'PROPAL_VALIDATE':
-            // case 'PROPAL_SENTBYMAIL':
-            // case 'PROPAL_CLOSE_SIGNED':
-            // case 'PROPAL_CLOSE_REFUSED':
-            // case 'PROPAL_DELETE':
-            // case 'LINEPROPAL_INSERT':
-            // case 'LINEPROPAL_UPDATE':
-            // case 'LINEPROPAL_DELETE':
+			// Bills
+			// case 'BILL_CREATE':
+			// case 'BILL_CLONE':
+			// case 'BILL_MODIFY':
+			// case 'BILL_VALIDATE':
+			// case 'BILL_UNVALIDATE':
+			// case 'BILL_SENTBYMAIL':
+			// case 'BILL_CANCEL':
+			// case 'BILL_DELETE':
+			// case 'BILL_PAYED':
+			// case 'LINEBILL_INSERT':
+			// case 'LINEBILL_UPDATE':
+			// case 'LINEBILL_DELETE':
 
-            // SupplierProposal
-            // case 'SUPPLIER_PROPOSAL_CREATE':
-            // case 'SUPPLIER_PROPOSAL_CLONE':
-            // case 'SUPPLIER_PROPOSAL_MODIFY':
-            // case 'SUPPLIER_PROPOSAL_VALIDATE':
-            // case 'SUPPLIER_PROPOSAL_SENTBYMAIL':
-            // case 'SUPPLIER_PROPOSAL_CLOSE_SIGNED':
-            // case 'SUPPLIER_PROPOSAL_CLOSE_REFUSED':
-            // case 'SUPPLIER_PROPOSAL_DELETE':
-            // case 'LINESUPPLIER_PROPOSAL_INSERT':
-            // case 'LINESUPPLIER_PROPOSAL_UPDATE':
-            // case 'LINESUPPLIER_PROPOSAL_DELETE':
+			//Supplier Bill
+			// case 'BILL_SUPPLIER_CREATE':
+			// case 'BILL_SUPPLIER_UPDATE':
+			// case 'BILL_SUPPLIER_DELETE':
+			// case 'BILL_SUPPLIER_PAYED':
+			// case 'BILL_SUPPLIER_UNPAYED':
+			// case 'BILL_SUPPLIER_VALIDATE':
+			// case 'BILL_SUPPLIER_UNVALIDATE':
+			// case 'LINEBILL_SUPPLIER_CREATE':
+			// case 'LINEBILL_SUPPLIER_UPDATE':
+			// case 'LINEBILL_SUPPLIER_DELETE':
 
-            // Contracts
-            // case 'CONTRACT_CREATE':
-            // case 'CONTRACT_ACTIVATE':
-            // case 'CONTRACT_CANCEL':
-            // case 'CONTRACT_CLOSE':
-            // case 'CONTRACT_DELETE':
-            // case 'LINECONTRACT_INSERT':
-            // case 'LINECONTRACT_UPDATE':
-            // case 'LINECONTRACT_DELETE':
+			// Payments
+			// case 'PAYMENT_CUSTOMER_CREATE':
+			// case 'PAYMENT_SUPPLIER_CREATE':
+			// case 'PAYMENT_ADD_TO_BANK':
+			// case 'PAYMENT_DELETE':
 
-            // Bills
-            // case 'BILL_CREATE':
-            // case 'BILL_CLONE':
-            // case 'BILL_MODIFY':
-            // case 'BILL_VALIDATE':
-            // case 'BILL_UNVALIDATE':
-            // case 'BILL_SENTBYMAIL':
-            // case 'BILL_CANCEL':
-            // case 'BILL_DELETE':
-            // case 'BILL_PAYED':
-            // case 'LINEBILL_INSERT':
-            // case 'LINEBILL_UPDATE':
-            // case 'LINEBILL_DELETE':
+			// Online
+			// case 'PAYMENT_PAYBOX_OK':
+			// case 'PAYMENT_PAYPAL_OK':
+			// case 'PAYMENT_STRIPE_OK':
 
-            //Supplier Bill
-            // case 'BILL_SUPPLIER_CREATE':
-            // case 'BILL_SUPPLIER_UPDATE':
-            // case 'BILL_SUPPLIER_DELETE':
-            // case 'BILL_SUPPLIER_PAYED':
-            // case 'BILL_SUPPLIER_UNPAYED':
-            // case 'BILL_SUPPLIER_VALIDATE':
-            // case 'BILL_SUPPLIER_UNVALIDATE':
-            // case 'LINEBILL_SUPPLIER_CREATE':
-            // case 'LINEBILL_SUPPLIER_UPDATE':
-            // case 'LINEBILL_SUPPLIER_DELETE':
+			// Donation
+			// case 'DON_CREATE':
+			// case 'DON_UPDATE':
+			// case 'DON_DELETE':
 
-            // Payments
-            // case 'PAYMENT_CUSTOMER_CREATE':
-            // case 'PAYMENT_SUPPLIER_CREATE':
-            // case 'PAYMENT_ADD_TO_BANK':
-            // case 'PAYMENT_DELETE':
+			// Interventions
+			// case 'FICHINTER_CREATE':
+			// case 'FICHINTER_MODIFY':
+			// case 'FICHINTER_VALIDATE':
+			// case 'FICHINTER_DELETE':
+			// case 'LINEFICHINTER_CREATE':
+			// case 'LINEFICHINTER_UPDATE':
+			// case 'LINEFICHINTER_DELETE':
 
-            // Online
-            // case 'PAYMENT_PAYBOX_OK':
-            // case 'PAYMENT_PAYPAL_OK':
-            // case 'PAYMENT_STRIPE_OK':
+			// Members
+			// case 'MEMBER_CREATE':
+			// case 'MEMBER_VALIDATE':
+			// case 'MEMBER_SUBSCRIPTION':
+			// case 'MEMBER_MODIFY':
+			// case 'MEMBER_NEW_PASSWORD':
+			// case 'MEMBER_RESILIATE':
+			// case 'MEMBER_DELETE':
 
-            // Donation
-            // case 'DON_CREATE':
-            // case 'DON_UPDATE':
-            // case 'DON_DELETE':
+			// Projects
+			// case 'PROJECT_CREATE':
+			// case 'PROJECT_MODIFY':
+			// case 'PROJECT_DELETE':
 
-            // Interventions
-            // case 'FICHINTER_CREATE':
-            // case 'FICHINTER_MODIFY':
-            // case 'FICHINTER_VALIDATE':
-            // case 'FICHINTER_DELETE':
-            // case 'LINEFICHINTER_CREATE':
-            // case 'LINEFICHINTER_UPDATE':
-            // case 'LINEFICHINTER_DELETE':
+			// Project tasks
+			// case 'TASK_CREATE':
+			// case 'TASK_MODIFY':
+			// case 'TASK_DELETE':
 
-            // Members
-            // case 'MEMBER_CREATE':
-            // case 'MEMBER_VALIDATE':
-            // case 'MEMBER_SUBSCRIPTION':
-            // case 'MEMBER_MODIFY':
-            // case 'MEMBER_NEW_PASSWORD':
-            // case 'MEMBER_RESILIATE':
-            // case 'MEMBER_DELETE':
+			// Task time spent
+			// case 'TASK_TIMESPENT_CREATE':
+			// case 'TASK_TIMESPENT_MODIFY':
+			// case 'TASK_TIMESPENT_DELETE':
+			case 'TICKET_CREATE':
+				$resql = $this->db->query($sql);
+				// TODO voir comment regrouper les webhooks en un post
+				while ($resql && $obj = $this->db->fetch_array($resql)) {
+					$cleaned = cleanObjectDatas(dol_clone($object));
+					$json = json_encode($cleaned);
+					// call the zapierPostWebhook() function
+					zapierPostWebhook($obj['url'], $json);
+				}
+				$logtriggeraction = true;
+				break;
+			// case 'TICKET_MODIFY':
+			// 	break;
+			// case 'TICKET_DELETE':
+			// 	break;
 
-            // Categories
-            // case 'CATEGORY_CREATE':
-            // case 'CATEGORY_MODIFY':
-            // case 'CATEGORY_DELETE':
-            // case 'CATEGORY_SET_MULTILANGS':
-
-            // Projects
-            // case 'PROJECT_CREATE':
-            // case 'PROJECT_MODIFY':
-            // case 'PROJECT_DELETE':
-
-            // Project tasks
-            // case 'TASK_CREATE':
-            // case 'TASK_MODIFY':
-            // case 'TASK_DELETE':
-
-            // Task time spent
-            // case 'TASK_TIMESPENT_CREATE':
-            // case 'TASK_TIMESPENT_MODIFY':
-            // case 'TASK_TIMESPENT_DELETE':
-
-            // Shipping
-            // case 'SHIPPING_CREATE':
-            // case 'SHIPPING_MODIFY':
-            // case 'SHIPPING_VALIDATE':
-            // case 'SHIPPING_SENTBYMAIL':
-            // case 'SHIPPING_BILLED':
-            // case 'SHIPPING_CLOSED':
-            // case 'SHIPPING_REOPEN':
-            // case 'SHIPPING_DELETE':
-        }
-        if ($logtriggeraction) {
-            dol_syslog("Trigger '".$this->name."' for action '.$action.' launched by ".__FILE__." id=".$object->id);
-        }
-        return 0;
-    }
+			// Shipping
+			// case 'SHIPPING_CREATE':
+			// case 'SHIPPING_MODIFY':
+			// case 'SHIPPING_VALIDATE':
+			// case 'SHIPPING_SENTBYMAIL':
+			// case 'SHIPPING_BILLED':
+			// case 'SHIPPING_CLOSED':
+			// case 'SHIPPING_REOPEN':
+			// case 'SHIPPING_DELETE':
+		}
+		if ($logtriggeraction) {
+			dol_syslog("Trigger '".$this->name."' for action '.$action.' launched by ".__FILE__." id=".$object->id);
+		}
+		return 0;
+	}
 }
 /**
  * Post webhook in zapier with object data
@@ -378,153 +386,153 @@ class InterfaceZapierTriggers extends DolibarrTriggers
  */
 function zapierPostWebhook($url, $json)
 {
-    $headers = array('Accept: application/json', 'Content-Type: application/json');
-    // TODO supprimer le webhook en cas de mauvaise réponse
-    $ch = curl_init();
-    curl_setopt($ch, CURLOPT_URL, $url);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-    curl_setopt($ch, CURLOPT_TIMEOUT, 10);
-    curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
-    curl_setopt($ch, CURLOPT_POST, 1);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $json);
-    curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-    $output = curl_exec($ch);
-    curl_close($ch);
+	$headers = array('Accept: application/json', 'Content-Type: application/json');
+	// TODO supprimer le webhook en cas de mauvaise réponse
+	$ch = curl_init();
+	curl_setopt($ch, CURLOPT_URL, $url);
+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+	curl_setopt($ch, CURLOPT_TIMEOUT, 10);
+	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
+	curl_setopt($ch, CURLOPT_POST, 1);
+	curl_setopt($ch, CURLOPT_POSTFIELDS, $json);
+	curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+	$output = curl_exec($ch);
+	curl_close($ch);
 }
 
 /**
  * Clean sensible object datas
  *
- * @param   object  $toclean    Object to clean
- * @return  array   Array of cleaned object properties
+ * @param   Object  $toclean    Object to clean
+ * @return  Object              Object with cleaned properties
  */
 function cleanObjectDatas($toclean)
 {
-    // Remove $db object property for object
-    unset($toclean->db);
+	// Remove $db object property for object
+	unset($toclean->db);
 
-    // Remove linkedObjects. We should already have linkedObjectIds that avoid huge responses
-    unset($toclean->linkedObjects);
+	// Remove linkedObjects. We should already have linkedObjectsIds that avoid huge responses
+	unset($toclean->linkedObjects);
 
-    unset($toclean->lines); // should be ->lines
+	unset($toclean->lines); // should be ->lines
 
-    unset($toclean->fields);
+	unset($toclean->fields);
 
-    unset($toclean->oldline);
+	unset($toclean->oldline);
 
-    unset($toclean->error);
-    unset($toclean->errors);
+	unset($toclean->error);
+	unset($toclean->errors);
 
-    unset($toclean->ref_previous);
-    unset($toclean->ref_next);
-    unset($toclean->ref_int);
+	unset($toclean->ref_previous);
+	unset($toclean->ref_next);
+	unset($toclean->ref_int);
 
-    unset($toclean->projet); // Should be fk_project
-    unset($toclean->project); // Should be fk_project
-    unset($toclean->author); // Should be fk_user_author
-    unset($toclean->timespent_old_duration);
-    unset($toclean->timespent_id);
-    unset($toclean->timespent_duration);
-    unset($toclean->timespent_date);
-    unset($toclean->timespent_datehour);
-    unset($toclean->timespent_withhour);
-    unset($toclean->timespent_fk_user);
-    unset($toclean->timespent_note);
+	unset($toclean->projet); // Should be fk_project
+	unset($toclean->project); // Should be fk_project
+	unset($toclean->author); // Should be fk_user_author
+	unset($toclean->timespent_old_duration);
+	unset($toclean->timespent_id);
+	unset($toclean->timespent_duration);
+	unset($toclean->timespent_date);
+	unset($toclean->timespent_datehour);
+	unset($toclean->timespent_withhour);
+	unset($toclean->timespent_fk_user);
+	unset($toclean->timespent_note);
 
-    unset($toclean->statuts);
-    unset($toclean->statuts_short);
-    unset($toclean->statuts_logo);
-    unset($toclean->statuts_long);
+	unset($toclean->statuts);
+	unset($toclean->statuts_short);
+	unset($toclean->statuts_logo);
+	unset($toclean->statuts_long);
 
-    unset($toclean->element);
-    unset($toclean->fk_element);
-    unset($toclean->table_element);
-    unset($toclean->table_element_line);
-    unset($toclean->picto);
+	unset($toclean->element);
+	unset($toclean->fk_element);
+	unset($toclean->table_element);
+	unset($toclean->table_element_line);
+	unset($toclean->picto);
 
-    unset($toclean->skip_update_total);
-    unset($toclean->context);
+	unset($toclean->skip_update_total);
+	unset($toclean->context);
 
-    // Remove the $oldcopy property because it is not supported by the JSON
-    // encoder. The following error is generated when trying to serialize
-    // it: "Error encoding/decoding JSON: Type is not supported"
-    // Note: Event if this property was correctly handled by the JSON
-    // encoder, it should be ignored because keeping it would let the API
-    // have a very strange behavior: calling PUT and then GET on the same
-    // resource would give different results:
-    // PUT /objects/{id} -> returns object with oldcopy = previous version of the object
-    // GET /objects/{id} -> returns object with oldcopy empty
-    unset($toclean->oldcopy);
+	// Remove the $oldcopy property because it is not supported by the JSON
+	// encoder. The following error is generated when trying to serialize
+	// it: "Error encoding/decoding JSON: Type is not supported"
+	// Note: Event if this property was correctly handled by the JSON
+	// encoder, it should be ignored because keeping it would let the API
+	// have a very strange behavior: calling PUT and then GET on the same
+	// resource would give different results:
+	// PUT /objects/{id} -> returns object with oldcopy = previous version of the object
+	// GET /objects/{id} -> returns object with oldcopy empty
+	unset($toclean->oldcopy);
 
-    // If object has lines, remove $db property
-    if (isset($toclean->lines) && count($toclean->lines) > 0) {
-        $nboflines = count($toclean->lines);
-        for ($i = 0; $i < $nboflines; $i++) {
-            cleanObjectDatas($toclean->lines[$i]);
-        }
-    }
+	// If object has lines, remove $db property
+	if (isset($toclean->lines) && count($toclean->lines) > 0) {
+		$nboflines = count($toclean->lines);
+		for ($i = 0; $i < $nboflines; $i++) {
+			cleanObjectDatas($toclean->lines[$i]);
+		}
+	}
 
-    // If object has linked objects, remove $db property
-    /*
-    if(isset($toclean->linkedObjects) && count($toclean->linkedObjects) > 0)  {
-        foreach($toclean->linkedObjects as $type_object => $linked_object) {
-            foreach($linked_object as $toclean2clean) {
-                $this->cleanObjectDatas($toclean2clean);
-            }
-        }
-    }*/
+	// If object has linked objects, remove $db property
+	/*
+	if(isset($toclean->linkedObjects) && count($toclean->linkedObjects) > 0)  {
+		foreach($toclean->linkedObjects as $type_object => $linked_object) {
+			foreach($linked_object as $toclean2clean) {
+				$this->cleanObjectDatas($toclean2clean);
+			}
+		}
+	}*/
 
-    return $toclean;
+	return $toclean;
 }
 
 /**
  * Clean sensible object datas
  *
- * @param   object  $toclean    Object to clean
- * @return  array   Array of cleaned object properties
+ * @param   Object  $toclean    Object to clean
+ * @return  Object              Object with cleaned properties
  */
 function cleanAgendaEventsDatas($toclean)
 {
-    unset($toclean->usermod);
-    unset($toclean->libelle);
-    //unset($toclean->array_options);
-    unset($toclean->context);
-    unset($toclean->canvas);
-    unset($toclean->contact);
-    unset($toclean->contact_id);
-    unset($toclean->thirdparty);
-    unset($toclean->user);
-    unset($toclean->origin);
-    unset($toclean->origin_id);
-    unset($toclean->ref_ext);
-    unset($toclean->statut);
-    unset($toclean->country);
-    unset($toclean->country_id);
-    unset($toclean->country_code);
-    unset($toclean->barcode_type);
-    unset($toclean->barcode_type_code);
-    unset($toclean->barcode_type_label);
-    unset($toclean->barcode_type_coder);
-    unset($toclean->mode_reglement_id);
-    unset($toclean->cond_reglement_id);
-    unset($toclean->cond_reglement);
-    unset($toclean->fk_delivery_address);
-    unset($toclean->shipping_method_id);
-    unset($toclean->fk_account);
-    unset($toclean->total_ht);
-    unset($toclean->total_tva);
-    unset($toclean->total_localtax1);
-    unset($toclean->total_localtax2);
-    unset($toclean->total_ttc);
-    unset($toclean->fk_incoterms);
-    unset($toclean->libelle_incoterms);
-    unset($toclean->location_incoterms);
-    unset($toclean->name);
-    unset($toclean->lastname);
-    unset($toclean->firstname);
-    unset($toclean->civility_id);
-    unset($toclean->contact);
-    unset($toclean->societe);
+	unset($toclean->usermod);
+	unset($toclean->libelle);
+	//unset($toclean->array_options);
+	unset($toclean->context);
+	unset($toclean->canvas);
+	unset($toclean->contact);
+	unset($toclean->contact_id);
+	unset($toclean->thirdparty);
+	unset($toclean->user);
+	unset($toclean->origin);
+	unset($toclean->origin_id);
+	unset($toclean->ref_ext);
+	unset($toclean->statut);
+	unset($toclean->country);
+	unset($toclean->country_id);
+	unset($toclean->country_code);
+	unset($toclean->barcode_type);
+	unset($toclean->barcode_type_code);
+	unset($toclean->barcode_type_label);
+	unset($toclean->barcode_type_coder);
+	unset($toclean->mode_reglement_id);
+	unset($toclean->cond_reglement_id);
+	unset($toclean->cond_reglement);
+	unset($toclean->fk_delivery_address);
+	unset($toclean->shipping_method_id);
+	unset($toclean->fk_account);
+	unset($toclean->total_ht);
+	unset($toclean->total_tva);
+	unset($toclean->total_localtax1);
+	unset($toclean->total_localtax2);
+	unset($toclean->total_ttc);
+	unset($toclean->fk_incoterms);
+	unset($toclean->libelle_incoterms);
+	unset($toclean->location_incoterms);
+	unset($toclean->name);
+	unset($toclean->lastname);
+	unset($toclean->firstname);
+	unset($toclean->civility_id);
+	unset($toclean->contact);
+	unset($toclean->societe);
 
-    return $toclean;
+	return $toclean;
 }
diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index 9d4cc3f7797..7fe59ad9903 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -53,7 +53,7 @@ if (!$pageid && !empty($websitepagefile))
 }
 if (!is_object($websitepage))
 {
-    $websitepage = new WebsitePage($db);
+	$websitepage = new WebsitePage($db);
 }
 // Define $weblangs
 if (!is_object($weblangs))
@@ -82,11 +82,9 @@ if ($pageid > 0)
 
 if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
 	header("X-Content-Type-Options: nosniff");
-	/* TODO Manage allow_frames flag on websitepage.
-	if (empty($websitepage->allow_frames) && empty($conf->global->WEBSITE_ALLOW_FRAMES_ON_ALL_PAGES)) {
+	if (empty($websitepage->allowed_in_frames) && empty($conf->global->WEBSITE_ALLOW_FRAMES_ON_ALL_PAGES)) {
 		header("X-Frame-Options: SAMEORIGIN");
 	}
-	*/
 }
 
 // A lang was forced, so we change weblangs init
diff --git a/htdocs/cron/admin/cron.php b/htdocs/cron/admin/cron.php
index 7c094a4cd20..ea4209ae91d 100644
--- a/htdocs/cron/admin/cron.php
+++ b/htdocs/cron/admin/cron.php
@@ -35,7 +35,7 @@ $langs->loadLangs(array('admin', 'cron'));
 if (!$user->admin)
 	accessforbidden();
 
-$actionsave = GETPOST("save");
+$actionsave = GETPOST("save", 'alphanohtml');
 
 // Save parameters
 if (!empty($actionsave))
@@ -73,7 +73,9 @@ $head = cronadmin_prepare_head();
 print '<form name="agendasetupform" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
-dol_fiche_head($head, 'setup', $langs->trans("Module2300Name"), -1, 'cron');
+print dol_get_fiche_head($head, 'setup', $langs->trans("Module2300Name"), -1, 'cron');
+
+print '<span class="opacitymedium">'.$langs->trans('CronInfo').'</span><br>';
 
 print "<br>\n";
 
@@ -92,12 +94,12 @@ if (!empty($conf->global->CRON_DISABLE_KEY_CHANGE)) $disabled = ' disabled="disa
 print '<td>';
 if (empty($conf->global->CRON_DISABLE_KEY_CHANGE))
 {
-    print '<input type="text" class="flat minwidth300"'.$disabled.' id="CRON_KEY" name="CRON_KEY" value="'.(GETPOST('CRON_KEY') ?GETPOST('CRON_KEY') : (!empty($conf->global->CRON_KEY) ? $conf->global->CRON_KEY : '')).'">';
-    if (!empty($conf->use_javascript_ajax))
-    	print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
+	print '<input type="text" class="flat minwidth300"'.$disabled.' id="CRON_KEY" name="CRON_KEY" value="'.(GETPOST('CRON_KEY') ?GETPOST('CRON_KEY') : (!empty($conf->global->CRON_KEY) ? $conf->global->CRON_KEY : '')).'">';
+	if (!empty($conf->use_javascript_ajax))
+		print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
 } else {
-    print (!empty($conf->global->CRON_KEY) ? $conf->global->CRON_KEY : '');
-    print '<input type="hidden" id="CRON_KEY" name="CRON_KEY" value="'.(GETPOST('CRON_KEY') ?GETPOST('CRON_KEY') : (!empty($conf->global->CRON_KEY) ? $conf->global->CRON_KEY : '')).'">';
+	print (!empty($conf->global->CRON_KEY) ? $conf->global->CRON_KEY : '');
+	print '<input type="hidden" id="CRON_KEY" name="CRON_KEY" value="'.(GETPOST('CRON_KEY') ?GETPOST('CRON_KEY') : (!empty($conf->global->CRON_KEY) ? $conf->global->CRON_KEY : '')).'">';
 }
 print '</td>';
 print '<td>&nbsp;</td>';
@@ -105,10 +107,10 @@ print '</tr>';
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center">';
-print '<input type="submit" name="save" class="button" value="'.$langs->trans("Save").'">';
+print '<input type="submit" name="save" class="button button-save" value="'.$langs->trans("Save").'">';
 print '</div>';
 
 print '</form>';
@@ -116,7 +118,7 @@ print '</form>';
 
 print '<br><br><br>';
 
-print $langs->trans("UseMenuModuleToolsToAddCronJobs", dol_buildpath('/cron/list.php?leftmenu=admintools', 1)).'<br>';
+//print $langs->trans("UseMenuModuleToolsToAddCronJobs", dol_buildpath('/cron/list.php?leftmenu=admintools', 1)).'<br>';
 if (!empty($conf->global->CRON_WARNING_DELAY_HOURS)) print info_admin($langs->trans("WarningCronDelayed", $conf->global->CRON_WARNING_DELAY_HOURS)).'<br>';
 
 print '<br>';
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index df529b598ec..b0e5936d326 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -42,7 +42,9 @@ $id = GETPOST('id', 'int');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
-$backtourl = GETPOST('backtourl', 'alpha');
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+
 $securitykey = GETPOST('securitykey', 'alpha');
 
 
@@ -62,18 +64,18 @@ if (!empty($id))
 
 if (!empty($cancel))
 {
-    if (!empty($id) && empty($backtourl))
+	if (!empty($id) && empty($backtopage))
 	{
 		$action = '';
 	} else {
-	    if ($backtourl)
-	    {
-	        header("Location: ".$backtourl);
-	        exit;
-	    } else {
-	        header("Location: ".DOL_URL_ROOT.'/cron/list.php');
-		    exit;
-	    }
+		if ($backtopage)
+		{
+			header("Location: ".$backtopage);
+			exit;
+		} else {
+			header("Location: ".DOL_URL_ROOT.'/cron/list.php');
+			exit;
+		}
 	}
 }
 
@@ -95,32 +97,32 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->cron->del
 // Execute jobs
 if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->execute)
 {
-    if (!empty($conf->global->CRON_KEY) && $conf->global->CRON_KEY != $securitykey)
-    {
-        setEventMessages('Security key '.$securitykey.' is wrong', null, 'errors');
-        $action = '';
-    } else {
-        $now = dol_now(); // Date we start
+	if (!empty($conf->global->CRON_KEY) && $conf->global->CRON_KEY != $securitykey)
+	{
+		setEventMessages('Security key '.$securitykey.' is wrong', null, 'errors');
+		$action = '';
+	} else {
+		$now = dol_now(); // Date we start
 
-    	$result = $object->run_jobs($user->login);
+		$result = $object->run_jobs($user->login);
 
-    	if ($result < 0)
-    	{
-    		setEventMessages($object->error, $object->errors, 'errors');
-    		$action = '';
-    	} else {
-    		$res = $object->reprogram_jobs($user->login, $now);
-    		if ($res > 0)
-    		{
-    			if ($object->lastresult > 0) setEventMessages($langs->trans("JobFinished"), null, 'warnings');
-    			else setEventMessages($langs->trans("JobFinished"), null, 'mesgs');
-    			$action = '';
-    		} else {
-    			setEventMessages($object->error, $object->errors, 'errors');
-    			$action = '';
-    		}
-    	}
-    }
+		if ($result < 0)
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action = '';
+		} else {
+			$res = $object->reprogram_jobs($user->login, $now);
+			if ($res > 0)
+			{
+				if ($object->lastresult > 0) setEventMessages($langs->trans("JobFinished"), null, 'warnings');
+				else setEventMessages($langs->trans("JobFinished"), null, 'mesgs');
+				$action = '';
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = '';
+			}
+		}
+	}
 }
 
 
@@ -297,7 +299,7 @@ if (($action == "create") || ($action == "edit"))
 {
 	print '<form name="cronform" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
-	print '<input type="hidden" name="backtourl" value="'.GETPOST('backtourl').'">'."\n";
+	print '<input type="hidden" name="backtopage" value="'.GETPOST('backtopage').'">'."\n";
 	if (!empty($object->id)) {
 		print '<input type="hidden" name="action" value="update">'."\n";
 		print '<input type="hidden" name="id" value="'.$object->id.'">'."\n";
@@ -305,8 +307,8 @@ if (($action == "create") || ($action == "edit"))
 		print '<input type="hidden" name="action" value="add">'."\n";
 	}
 
-	if ($action == "edit") dol_fiche_head($head, 'card', $langs->trans("CronTask"), 0, 'cron');
-	else dol_fiche_head('');
+	if ($action == "edit") print dol_get_fiche_head($head, 'card', $langs->trans("CronTask"), 0, 'cron');
+	else print dol_get_fiche_head('');
 
 	print '<table class="border centpercent">';
 
@@ -395,47 +397,47 @@ if (($action == "create") || ($action == "edit"))
 	print '<select name="nbfrequency">';
 	for ($i = 1; $i <= 60; $i++)
 	{
-	    if ($object->frequency == $i)
-	    {
-	        print "<option value='".$i."' selected>".$i."</option>";
-	    } else {
-	        print "<option value='".$i."'>".$i."</option>";
-	    }
+		if ($object->frequency == $i)
+		{
+			print "<option value='".$i."' selected>".$i."</option>";
+		} else {
+			print "<option value='".$i."'>".$i."</option>";
+		}
 	}
 	print "</select>";
 	$input = " <input type=\"radio\" name=\"unitfrequency\" value=\"60\" id=\"frequency_minute\" ";
 	if ($object->unitfrequency == "60")
 	{
-	    $input .= ' checked />';
+		$input .= ' checked />';
 	} else {
-	    $input .= ' />';
+		$input .= ' />';
 	}
 	$input .= "<label for=\"frequency_minute\">".$langs->trans('Minutes')."</label>";
 	print $input;
 
 	$input = " <input type=\"radio\" name=\"unitfrequency\" value=\"3600\" id=\"frequency_heures\" ";
 	if ($object->unitfrequency == "3600") {
-	    $input .= ' checked />';
+		$input .= ' checked />';
 	} else {
-	    $input .= ' />';
+		$input .= ' />';
 	}
 	$input .= "<label for=\"frequency_heures\">".$langs->trans('Hours')."</label>";
 	print $input;
 
 	$input = " <input type=\"radio\" name=\"unitfrequency\" value=\"86400\" id=\"frequency_jours\" ";
 	if ($object->unitfrequency == "86400") {
-	    $input .= ' checked />';
+		$input .= ' checked />';
 	} else {
-	    $input .= ' />';
+		$input .= ' />';
 	}
 	$input .= "<label for=\"frequency_jours\">".$langs->trans('Days')."</label>";
 	print $input;
 
 	$input = " <input type=\"radio\" name=\"unitfrequency\" value=\"604800\" id=\"frequency_semaine\" ";
 	if ($object->unitfrequency == "604800") {
-	    $input .= ' checked />';
+		$input .= ' checked />';
 	} else {
-	    $input .= ' />';
+		$input .= ' />';
 	}
 	$input .= "<label for=\"frequency_semaine\">".$langs->trans('Weeks')."</label>";
 	print $input;
@@ -448,9 +450,9 @@ if (($action == "create") || ($action == "edit"))
 	print $langs->trans('CronDtStart')."</td><td>";
 	if (!empty($object->datestart))
 	{
-        print $form->selectDate($object->datestart, 'datestart', 1, 1, '', "cronform");
+		print $form->selectDate($object->datestart, 'datestart', 1, 1, '', "cronform");
 	} else {
-        print $form->selectDate('', 'datestart', 1, 1, '', "cronform");
+		print $form->selectDate('', 'datestart', 1, 1, '', "cronform");
 	}
 	print "</td>";
 	print "<td>";
@@ -460,9 +462,9 @@ if (($action == "create") || ($action == "edit"))
 	print "<tr><td>";
 	print $langs->trans('CronDtEnd')."</td><td>";
 	if (!empty($object->dateend)) {
-        print $form->selectDate($object->dateend, 'dateend', 1, 1, '', "cronform");
+		print $form->selectDate($object->dateend, 'dateend', 1, 1, '', "cronform");
 	} else {
-        print $form->selectDate(-1, 'dateend', 1, 1, 1, "cronform");
+		print $form->selectDate(-1, 'dateend', 1, 1, 1, "cronform");
 	}
 	print "</td>";
 	print "<td>";
@@ -473,7 +475,7 @@ if (($action == "create") || ($action == "edit"))
 	print $langs->trans('CronPriority')."</td>";
 	$priority = 0;
 	if (!empty($object->priority)) {
-	    $priority = $object->priority;
+		$priority = $object->priority;
 	}
 	print "<td><input type=\"text\" size=\"2\" name=\"priority\" value=\"".$priority."\" /> ";
 	print "</td>";
@@ -484,7 +486,7 @@ if (($action == "create") || ($action == "edit"))
 	print '<tr><td>';
 	$maxrun = '';
 	if (!empty($object->maxrun)) {
-	    $maxrun = $object->maxrun;
+		$maxrun = $object->maxrun;
 	}
 	print $langs->trans('CronMaxRun')."</td>";
 	print "<td><input type=\"text\" size=\"2\" name=\"maxrun\" value=\"".$maxrun."\" /> ";
@@ -499,23 +501,23 @@ if (($action == "create") || ($action == "edit"))
 	print "</td><td>";
 	if (!empty($object->datenextrun))
 	{
-        print $form->selectDate($object->datenextrun, 'datenextrun', 1, 1, '', "cronform");
+		print $form->selectDate($object->datenextrun, 'datenextrun', 1, 1, '', "cronform");
 	} else {
-        print $form->selectDate(-1, 'datenextrun', 1, 1, '', "cronform");
+		print $form->selectDate(-1, 'datenextrun', 1, 1, '', "cronform");
 	}
 	print "</td>";
-    print "<td>";
+	print "<td>";
 	print "</td>";
 	print "</tr>";
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div align="center">';
-	print '<input type="submit" name="save" class="button" value="'.$langs->trans("Save").'">';
+	print '<input type="submit" name="save" class="button button-save" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
+	print '<input type="submit" name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'">';
 	print "</div>";
 
 	print "</form>\n";
@@ -523,9 +525,9 @@ if (($action == "create") || ($action == "edit"))
 	/*
 	 * view card
 	 */
-    $now = dol_now();
+	$now = dol_now();
 
-	dol_fiche_head($head, 'card', $langs->trans("CronTask"), -1, 'cron');
+	print dol_get_fiche_head($head, 'card', $langs->trans("CronTask"), -1, 'cron');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/cron/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -601,7 +603,7 @@ if (($action == "create") || ($action == "edit"))
 	}
 
 	print '</table>';
-    print '</div>';
+	print '</div>';
 
 	print '<br>';
 
@@ -691,9 +693,9 @@ if (($action == "create") || ($action == "edit"))
 	print "</td></tr>";
 
 	print '</table>';
-    print '</div>';
+	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	print "\n\n<div class=\"tabsAction\">\n";
@@ -714,13 +716,13 @@ if (($action == "create") || ($action == "edit"))
 	}
 
 	if (!$user->rights->cron->create) {
-	    print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("CronStatusActiveBtn").'/'.$langs->trans("CronStatusInactiveBtn").'</a>';
+		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("CronStatusActiveBtn").'/'.$langs->trans("CronStatusInactiveBtn").'</a>';
 	} else {
-	    if (empty($object->status)) {
-	        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=activate&id='.$object->id.'">'.$langs->trans("CronStatusActiveBtn").'</a>';
-	    } else {
-	        print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=inactive&id='.$object->id.'">'.$langs->trans("CronStatusInactiveBtn").'</a>';
-	    }
+		if (empty($object->status)) {
+			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=activate&id='.$object->id.'">'.$langs->trans("CronStatusActiveBtn").'</a>';
+		} else {
+			print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=inactive&id='.$object->id.'">'.$langs->trans("CronStatusInactiveBtn").'</a>';
+		}
 	}
 
 	if (!$user->rights->cron->delete) {
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 10a2659f6a5..9d084ec4f24 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -40,24 +40,24 @@ class Cronjob extends CommonObject
 	 */
 	public $table_element = 'cronjob';
 
-    /**
+	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
 	public $picto = 'cron';
 
-    /**
+	/**
 	 * @var int Entity
 	 */
 	public $entity;
 
-    public $jobtype;
+	public $jobtype;
 	public $tms = '';
 	public $datec = '';
 
 	/**
-     * @var string Cron Job label
-     */
-    public $label;
+	 * @var string Cron Job label
+	 */
+	public $label;
 
 	public $command;
 	public $classesname;
@@ -91,13 +91,13 @@ class Cronjob extends CommonObject
 	public $processing;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_author;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_mod;
 
 	public $nbrun;
@@ -109,27 +109,27 @@ class Cronjob extends CommonObject
 	const STATUS_ARCHIVED = 2;
 
 
-    /**
-     *  Constructor
-     *
-     *  @param	DoliDb		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param	DoliDb		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *  Create object 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
-     */
-    public function create($user, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Create object 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
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		global $conf, $langs;
 		$error = 0;
 
 		$now = dol_now();
@@ -195,7 +195,7 @@ class Cronjob extends CommonObject
 			$error++;
 		}
 
-        // Insert request
+		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."cronjob(";
 		$sql .= "entity,";
 		$sql .= "datec,";
@@ -261,42 +261,44 @@ class Cronjob extends CommonObject
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
 		if (!$error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."cronjob");
-        }
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."cronjob");
+		}
 
-        // Commit or rollback
-        if ($error)
+		// Commit or rollback
+		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
 		} else {
 			$this->db->commit();
-            return $this->id;
+			return $this->id;
 		}
-    }
+	}
 
 
-    /**
-     *  Load object in memory from the database
-     *
-     *  @param	int		$id    Id object
-     *  @return int          	<0 if KO, >0 if OK
-     */
-    public function fetch($id)
-    {
-        $sql = "SELECT";
-        $sql .= " t.rowid,";
-        $sql .= " t.entity,";
+	/**
+	 *  Load object in memory from the database
+	 *
+	 *  @param	int		$id    			Id object
+	 *  @param	string	$objectname		Object name
+	 *  @param	string	$methodname		Method name
+	 *  @return int          			<0 if KO, >0 if OK
+	 */
+	public function fetch($id, $objectname = '', $methodname = '')
+	{
+		$sql = "SELECT";
+		$sql .= " t.rowid,";
+		$sql .= " t.entity,";
 		$sql .= " t.tms,";
 		$sql .= " t.datec,";
 		$sql .= " t.jobtype,";
@@ -327,19 +329,25 @@ class Cronjob extends CommonObject
 		$sql .= " t.maxrun,";
 		$sql .= " t.libname,";
 		$sql .= " t.test";
-        $sql .= " FROM ".MAIN_DB_PREFIX."cronjob as t";
-        $sql .= " WHERE t.rowid = ".$id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."cronjob as t";
+		if ($id > 0) {
+			$sql .= " WHERE t.rowid = ".$id;
+		} else {
+			$sql .= " WHERE t.entity IN(0, ".getEntity('cron').")";
+			$sql .= " AND t.objectname = '".$this->db->escape($objectname)."'";
+			$sql .= " AND t.methodename = '".$this->db->escape($methodname)."'";
+		}
 
-    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->rowid;
-                $this->ref = $obj->rowid;
+				$this->id = $obj->rowid;
+				$this->ref = $obj->rowid;
 				$this->entity = $obj->entity;
 				$this->tms = $this->db->jdate($obj->tms);
 				$this->datec = $this->db->jdate($obj->datec);
@@ -371,20 +379,20 @@ class Cronjob extends CommonObject
 				$this->maxrun = $obj->maxrun;
 				$this->libname = $obj->libname;
 				$this->test = $obj->test;
-            }
-            $this->db->free($resql);
+			}
+			$this->db->free($resql);
 
-            return 1;
-        } else {
-      	    $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+	  		$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Load object in memory from the database
-     *
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Load object in memory from the database
+	 *
 	 *  @param	string		$sortorder      sort order
 	 *  @param	string		$sortfield      sort field
 	 *  @param	int			$limit		    limit page
@@ -392,146 +400,146 @@ class Cronjob extends CommonObject
 	 *  @param	int			$status    	    display active or not
 	 *  @param	array		$filter    	    filter output
 	 *  @param  int         $processing     Processing or not
-     *  @return int          			    <0 if KO, >0 if OK
-     */
-    public function fetch_all($sortorder = 'DESC', $sortfield = 't.rowid', $limit = 0, $offset = 0, $status = 1, $filter = '', $processing = -1)
-    {
-        // phpcs:enable
-        global $langs;
+	 *  @return int          			    <0 if KO, >0 if OK
+	 */
+	public function fetch_all($sortorder = 'DESC', $sortfield = 't.rowid', $limit = 0, $offset = 0, $status = 1, $filter = '', $processing = -1)
+	{
+		// phpcs:enable
+		global $langs;
 
-    	$this->lines = array();
+		$this->lines = array();
 
-    	$sql = "SELECT";
-    	$sql .= " t.rowid,";
-    	$sql .= " t.entity,";
-    	$sql .= " t.tms,";
-    	$sql .= " t.datec,";
-    	$sql .= " t.jobtype,";
-    	$sql .= " t.label,";
-    	$sql .= " t.command,";
-    	$sql .= " t.classesname,";
-    	$sql .= " t.objectname,";
-    	$sql .= " t.methodename,";
-    	$sql .= " t.params,";
-    	$sql .= " t.md5params,";
-    	$sql .= " t.module_name,";
-    	$sql .= " t.priority,";
-    	$sql .= " t.datelastrun,";
-    	$sql .= " t.datenextrun,";
-    	$sql .= " t.dateend,";
-    	$sql .= " t.datestart,";
-    	$sql .= " t.lastresult,";
-    	$sql .= " t.datelastresult,";
-    	$sql .= " t.lastoutput,";
-    	$sql .= " t.unitfrequency,";
-    	$sql .= " t.frequency,";
-    	$sql .= " t.status,";
-    	$sql .= " t.processing,";
-    	$sql .= " t.fk_user_author,";
-    	$sql .= " t.fk_user_mod,";
-    	$sql .= " t.note as note_private,";
-    	$sql .= " t.nbrun,";
-    	$sql .= " t.libname,";
-    	$sql .= " t.test";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."cronjob as t";
-    	$sql .= " WHERE 1 = 1";
-    	if ($processing >= 0) $sql .= " AND t.processing = ".(empty($processing) ? '0' : '1');
-    	if ($status >= 0 && $status < 2) $sql .= " AND t.status = ".(empty($status) ? '0' : '1');
-    	elseif ($status == 2) $sql .= " AND t.status = 2";
-    	//Manage filter
-    	if (is_array($filter) && count($filter) > 0) {
-    		foreach ($filter as $key => $value)
-    		{
-    		    if ($key == 't.rowid') $sql .= ' AND '.$key.' = '.$this->db->escape($value);
+		$sql = "SELECT";
+		$sql .= " t.rowid,";
+		$sql .= " t.entity,";
+		$sql .= " t.tms,";
+		$sql .= " t.datec,";
+		$sql .= " t.jobtype,";
+		$sql .= " t.label,";
+		$sql .= " t.command,";
+		$sql .= " t.classesname,";
+		$sql .= " t.objectname,";
+		$sql .= " t.methodename,";
+		$sql .= " t.params,";
+		$sql .= " t.md5params,";
+		$sql .= " t.module_name,";
+		$sql .= " t.priority,";
+		$sql .= " t.datelastrun,";
+		$sql .= " t.datenextrun,";
+		$sql .= " t.dateend,";
+		$sql .= " t.datestart,";
+		$sql .= " t.lastresult,";
+		$sql .= " t.datelastresult,";
+		$sql .= " t.lastoutput,";
+		$sql .= " t.unitfrequency,";
+		$sql .= " t.frequency,";
+		$sql .= " t.status,";
+		$sql .= " t.processing,";
+		$sql .= " t.fk_user_author,";
+		$sql .= " t.fk_user_mod,";
+		$sql .= " t.note as note_private,";
+		$sql .= " t.nbrun,";
+		$sql .= " t.libname,";
+		$sql .= " t.test";
+		$sql .= " FROM ".MAIN_DB_PREFIX."cronjob as t";
+		$sql .= " WHERE 1 = 1";
+		if ($processing >= 0) $sql .= " AND t.processing = ".(empty($processing) ? '0' : '1');
+		if ($status >= 0 && $status < 2) $sql .= " AND t.status = ".(empty($status) ? '0' : '1');
+		elseif ($status == 2) $sql .= " AND t.status = 2";
+		//Manage filter
+		if (is_array($filter) && count($filter) > 0) {
+			foreach ($filter as $key => $value)
+			{
+				if ($key == 't.rowid') $sql .= ' AND '.$key.' = '.$this->db->escape($value);
    				else $sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
-    		}
-    	}
+			}
+		}
 
-    	$sql .= $this->db->order($sortfield, $sortorder);
-    	if (!empty($limit) && !empty($offset)) {
-    		$sql .= $this->db->plimit($limit + 1, $offset);
-    	}
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if (!empty($limit) && !empty($offset)) {
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-    	$sqlwhere = array();
+		$sqlwhere = array();
 
-    	if (count($sqlwhere) > 0) {
-    		$sql .= " WHERE ".implode(' AND ', $sqlwhere);
-    	}
+		if (count($sqlwhere) > 0) {
+			$sql .= " WHERE ".implode(' AND ', $sqlwhere);
+		}
 
-    	dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
-    	$resql = $this->db->query($sql);
-    	if ($resql)
-    	{
-    		$num = $this->db->num_rows($resql);
-    		$i = 0;
+		dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			$i = 0;
 
-    		if ($num)
-    		{
-	    		while ($i < $num)
-	    		{
-	    			$line = new Cronjobline();
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$line = new Cronjobline();
 
-	    			$obj = $this->db->fetch_object($resql);
+					$obj = $this->db->fetch_object($resql);
 
-	    			$line->id = $obj->rowid;
-	    			$line->ref = $obj->rowid;
-	    			$line->entity = $obj->entity;
-	    			$line->tms = $this->db->jdate($obj->tms);
-	    			$line->datec = $this->db->jdate($obj->datec);
-	    			$line->label = $obj->label;
-	    			$line->jobtype = $obj->jobtype;
-	    			$line->command = $obj->command;
-	    			$line->classesname = $obj->classesname;
-	    			$line->objectname = $obj->objectname;
-	    			$line->methodename = $obj->methodename;
-	    			$line->params = $obj->params;
-	    			$line->md5params = $obj->md5params;
-	    			$line->module_name = $obj->module_name;
-	    			$line->priority = $obj->priority;
-	    			$line->datelastrun = $this->db->jdate($obj->datelastrun);
-	    			$line->datenextrun = $this->db->jdate($obj->datenextrun);
-	    			$line->dateend = $this->db->jdate($obj->dateend);
-	    			$line->datestart = $this->db->jdate($obj->datestart);
-	    			$line->lastresult = $obj->lastresult;
-	    			$line->datelastresult = $this->db->jdate($obj->datelastresult);
-	    			$line->lastoutput = $obj->lastoutput;
-	    			$line->unitfrequency = $obj->unitfrequency;
-	    			$line->frequency = $obj->frequency;
-	    			$line->status = $obj->status;
-	    			$line->processing = $obj->processing;
-	    			$line->fk_user_author = $obj->fk_user_author;
-	    			$line->fk_user_mod = $obj->fk_user_mod;
-	    			$line->note_private = $obj->note_private;
-	    			$line->nbrun = $obj->nbrun;
-	    			$line->libname = $obj->libname;
-	    			$line->test = $obj->test;
-	    			$this->lines[] = $line;
+					$line->id = $obj->rowid;
+					$line->ref = $obj->rowid;
+					$line->entity = $obj->entity;
+					$line->tms = $this->db->jdate($obj->tms);
+					$line->datec = $this->db->jdate($obj->datec);
+					$line->label = $obj->label;
+					$line->jobtype = $obj->jobtype;
+					$line->command = $obj->command;
+					$line->classesname = $obj->classesname;
+					$line->objectname = $obj->objectname;
+					$line->methodename = $obj->methodename;
+					$line->params = $obj->params;
+					$line->md5params = $obj->md5params;
+					$line->module_name = $obj->module_name;
+					$line->priority = $obj->priority;
+					$line->datelastrun = $this->db->jdate($obj->datelastrun);
+					$line->datenextrun = $this->db->jdate($obj->datenextrun);
+					$line->dateend = $this->db->jdate($obj->dateend);
+					$line->datestart = $this->db->jdate($obj->datestart);
+					$line->lastresult = $obj->lastresult;
+					$line->datelastresult = $this->db->jdate($obj->datelastresult);
+					$line->lastoutput = $obj->lastoutput;
+					$line->unitfrequency = $obj->unitfrequency;
+					$line->frequency = $obj->frequency;
+					$line->status = $obj->status;
+					$line->processing = $obj->processing;
+					$line->fk_user_author = $obj->fk_user_author;
+					$line->fk_user_mod = $obj->fk_user_mod;
+					$line->note_private = $obj->note_private;
+					$line->nbrun = $obj->nbrun;
+					$line->libname = $obj->libname;
+					$line->test = $obj->test;
+					$this->lines[] = $line;
 
-	    			$i++;
-	    		}
-    		}
-    		$this->db->free($resql);
+					$i++;
+				}
+			}
+			$this->db->free($resql);
 
-    		return 1;
-    	} else {
-    		$this->error = "Error ".$this->db->lasterror();
-    		return -1;
-    	}
-    }
+			return 1;
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Update object into database
-     *
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    public function update($user = null, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Update object into database
+	 *
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update($user = null, $notrigger = 0)
+	{
+		global $conf, $langs;
 
-    	$langs->load('cron');
+		$langs->load('cron');
 
 		$error = 0;
 
@@ -553,11 +561,11 @@ class Cronjob extends CommonObject
 		if (isset($this->status)) $this->status = trim($this->status);
 		if (isset($this->note_private)) $this->note_private = trim($this->note_private);
 		if (isset($this->nbrun)) $this->nbrun = trim($this->nbrun);
-        if (isset($this->libname)) $this->libname = trim($this->libname);
-        if (isset($this->test)) $this->test = trim($this->test);
+		if (isset($this->libname)) $this->libname = trim($this->libname);
+		if (isset($this->test)) $this->test = trim($this->test);
 
 		if (empty($this->maxrun)) $this->maxrun = 0;
-        if (empty($this->processing)) $this->processing = 0;
+		if (empty($this->processing)) $this->processing = 0;
 
 		// Check parameters
 		// Put here code to add a control on parameters values
@@ -600,9 +608,9 @@ class Cronjob extends CommonObject
 		}
 
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."cronjob SET";
-        $sql .= " entity=".(isset($this->entity) ? $this->db->escape($this->entity) : $conf->entity).",";
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."cronjob SET";
+		$sql .= " entity=".(isset($this->entity) ? $this->db->escape($this->entity) : $conf->entity).",";
 		$sql .= " label=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
 		$sql .= " jobtype=".(isset($this->jobtype) ? "'".$this->db->escape($this->jobtype)."'" : "null").",";
 		$sql .= " command=".(isset($this->command) ? "'".$this->db->escape($this->command)."'" : "null").",";
@@ -632,19 +640,19 @@ class Cronjob extends CommonObject
 		$sql .= " test=".(isset($this->test) ? "'".$this->db->escape($this->test)."'" : "null");
 		$sql .= " WHERE rowid=".$this->id;
 
-        $this->db->begin();
+		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -652,39 +660,39 @@ class Cronjob extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-    }
+	}
 
 
  	/**
-	 *  Delete object in database
-	 *
-     *	@param  User	$user        User that deletes
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
-	 */
-    public function delete($user, $notrigger = 0)
+ 	 *  Delete object in database
+ 	 *
+ 	 *	@param  User	$user        User that deletes
+ 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+ 	 *  @return	int					 <0 if KO, >0 if OK
+ 	 */
+	public function delete($user, $notrigger = 0)
 	{
 		$error = 0;
 
 		$this->db->begin();
 
-    	$sql = "DELETE FROM ".MAIN_DB_PREFIX."cronjob";
-    	$sql .= " WHERE rowid=".$this->id;
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."cronjob";
+		$sql .= " WHERE rowid=".$this->id;
 
-    	dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-    	$resql = $this->db->query($sql);
-        if (!$resql) {
-            $error++;
-            $this->errors[] = "Error ".$this->db->lasterror();
-        }
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
+		}
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -788,7 +796,7 @@ class Cronjob extends CommonObject
 		$this->note_private = '';
 		$this->nbrun = '';
 		$this->maxrun = 100;
-        $this->libname = '';
+		$this->libname = '';
 	}
 
 
@@ -812,9 +820,12 @@ class Cronjob extends CommonObject
 
 		$result = '';
 
-		$label = '<u>'.$langs->trans("CronJob").'</u>';
-		$label .= '<br>';
-		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label = img_picto('', 'object_'.$this->picto).' <u>'.$langs->trans("CronTask").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
+		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label .= '<br><b>'.$langs->trans('Title').':</b> '.$this->label;
 
 		$url = DOL_URL_ROOT.'/cron/card.php?id='.$this->id;
 
@@ -888,7 +899,7 @@ class Cronjob extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Run a job.
 	 * Once job is finished, status and nb of run is updated.
@@ -899,7 +910,7 @@ class Cronjob extends CommonObject
 	 */
 	public function run_jobs($userlogin)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf, $hookmanager;
 
 		$hookmanager->initHooks(array('cron'));
@@ -999,24 +1010,24 @@ class Cronjob extends CommonObject
 			// test if method exists
 			if (!$error)
 			{
-			    if (!method_exists($this->objectname, $this->methodename))
-			    {
-			        $this->error = $langs->trans('CronMethodDoesNotExists', $this->objectname, $this->methodename);
-    				dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
-    				$this->lastoutput = $this->error;
-    				$this->lastresult = -1;
-    				$retval = $this->lastresult;
-    				$error++;
-			    }
-			    if (in_array(strtolower(trim($this->methodename)), array('executecli')))
-			    {
-			    	$this->error = $langs->trans('CronMethodNotAllowed', $this->methodename, $this->objectname);
-			    	dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
-			    	$this->lastoutput = $this->error;
-			    	$this->lastresult = -1;
-			    	$retval = $this->lastresult;
-			    	$error++;
-			    }
+				if (!method_exists($this->objectname, $this->methodename))
+				{
+					$this->error = $langs->trans('CronMethodDoesNotExists', $this->objectname, $this->methodename);
+					dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
+					$this->lastoutput = $this->error;
+					$this->lastresult = -1;
+					$retval = $this->lastresult;
+					$error++;
+				}
+				if (in_array(strtolower(trim($this->methodename)), array('executecli')))
+				{
+					$this->error = $langs->trans('CronMethodNotAllowed', $this->methodename, $this->objectname);
+					dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
+					$this->lastoutput = $this->error;
+					$this->lastresult = -1;
+					$retval = $this->lastresult;
+					$error++;
+				}
 			}
 
 			// Load langs
@@ -1031,8 +1042,8 @@ class Cronjob extends CommonObject
 					$this->error = $langs->error;
 					$this->lastoutput = $this->error;
 					$this->lastresult = -1;
-	                $retval = $this->lastresult;
-	                $error++;
+					$retval = $this->lastresult;
+					$error++;
 				}
 			}
 
@@ -1044,7 +1055,10 @@ class Cronjob extends CommonObject
 				$object = new $this->objectname($this->db);
 				if ($this->entity > 0) $object->entity = $this->entity; // We work on a dedicated entity
 
-				$params_arr = array_map('trim', explode(",", $this->params));
+				$params_arr = array();
+				if (!empty($this->params) || $this->params === '0') {
+					$params_arr = array_map('trim', explode(",", $this->params));
+				}
 
 				if (!is_array($params_arr))
 				{
@@ -1055,23 +1069,23 @@ class Cronjob extends CommonObject
 
 				if ($result === false || (!is_bool($result) && $result != 0))
 				{
-				    $langs->load("errors");
+					$langs->load("errors");
 
-				    $errmsg = '';
-				    if (!is_array($object->errors) || !in_array($object->error, $object->errors)) $errmsg .= $object->error;
-				    if (is_array($object->errors) && count($object->errors)) $errmsg .= (($errmsg ? ', ' : '').join(', ', $object->errors));
-				    if (empty($errmsg)) $errmsg = $langs->trans('ErrorUnknown');
+					$errmsg = '';
+					if (!is_array($object->errors) || !in_array($object->error, $object->errors)) $errmsg .= $object->error;
+					if (is_array($object->errors) && count($object->errors)) $errmsg .= (($errmsg ? ', ' : '').join(', ', $object->errors));
+					if (empty($errmsg)) $errmsg = $langs->trans('ErrorUnknown');
 
-				    dol_syslog(get_class($this)."::run_jobs END result=".$result." error=".$errmsg, LOG_ERR);
+					dol_syslog(get_class($this)."::run_jobs END result=".$result." error=".$errmsg, LOG_ERR);
 
-				    $this->error = $errmsg;
-				    $this->lastoutput = ($object->output ? $object->output."\n" : "").$errmsg;
+					$this->error = $errmsg;
+					$this->lastoutput = ($object->output ? $object->output."\n" : "").$errmsg;
 					$this->lastresult = is_numeric($result) ? $result : -1;
-		            $retval = $this->lastresult;
-		            $error++;
+					$retval = $this->lastresult;
+					$error++;
 				} else {
 					dol_syslog(get_class($this)."::run_jobs END");
-				    $this->lastoutput = $object->output;
+					$this->lastoutput = $object->output;
 					$this->lastresult = var_export($result, true);
 					$retval = $this->lastresult;
 				}
@@ -1111,17 +1125,17 @@ class Cronjob extends CommonObject
 
 			if ($result === false || (!is_bool($result) && $result != 0))
 			{
-			    $langs->load("errors");
-			    dol_syslog(get_class($this)."::run_jobs result=".$result, LOG_ERR);
-			    $this->error = $langs->trans('ErrorUnknown');
-			    $this->lastoutput = $this->error;
-			    $this->lastresult = is_numeric($result) ? $result : -1;
-			    $retval = $this->lastresult;
-			    $error++;
+				$langs->load("errors");
+				dol_syslog(get_class($this)."::run_jobs result=".$result, LOG_ERR);
+				$this->error = $langs->trans('ErrorUnknown');
+				$this->lastoutput = $this->error;
+				$this->lastresult = is_numeric($result) ? $result : -1;
+				$retval = $this->lastresult;
+				$error++;
 			} else {
-                $this->lastoutput = var_export($result, true);
-                $this->lastresult = var_export($result, true); // Return code
-                $retval = $this->lastresult;
+				$this->lastoutput = var_export($result, true);
+				$this->lastresult = var_export($result, true); // Return code
+				$retval = $this->lastresult;
 			}
 		}
 
@@ -1174,7 +1188,7 @@ class Cronjob extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Reprogram a job
 	 *
@@ -1184,7 +1198,7 @@ class Cronjob extends CommonObject
 	 */
 	public function reprogram_jobs($userlogin, $now)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		dol_syslog(get_class($this)."::reprogram_jobs userlogin:$userlogin", LOG_DEBUG);
 
 		require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
@@ -1214,28 +1228,28 @@ class Cronjob extends CommonObject
 
 		if ($this->datenextrun < $now && $this->frequency > 0 && $this->unitfrequency > 0)
 		{
-		    // Loop until date is after future
-		    while ($this->datenextrun < $now)
-		    {
-		        $this->datenextrun += ($this->frequency * $this->unitfrequency);
+			// Loop until date is after future
+			while ($this->datenextrun < $now)
+			{
+				$this->datenextrun += ($this->frequency * $this->unitfrequency);
 
-		        // TODO For exact frequency (every month, every year, ...), use instead a dol_time_plus_duree($time, $duration_value, $duration_unit)
-		    }
+				// TODO For exact frequency (every month, every year, ...), use instead a dol_time_plus_duree($time, $duration_value, $duration_unit)
+			}
 		} else {
 			//$this->datenextrun=$this->datenextrun + ($this->frequency * $this->unitfrequency);
-		    dol_syslog(get_class($this)."::reprogram_jobs datenextrun is already in future, we do not change it");
+			dol_syslog(get_class($this)."::reprogram_jobs datenextrun is already in future, we do not change it");
 		}
 
 
 		// Archive job
 		if ($this->autodelete == 2)
 		{
-		    if (($this->maxrun > 0 && ($this->nbrun >= $this->maxrun))
-		        || ($this->dateend && ($this->datenextrun > $this->dateend)))
-		    {
-		        $this->status = 2;
-		        dol_syslog(get_class($this)."::reprogram_jobs Job will be set to archived", LOG_ERR);
-		    }
+			if (($this->maxrun > 0 && ($this->nbrun >= $this->maxrun))
+				|| ($this->dateend && ($this->datenextrun > $this->dateend)))
+			{
+				$this->status = self::STATUS_ARCHIVED;
+				dol_syslog(get_class($this)."::reprogram_jobs Job will be set to archived", LOG_ERR);
+			}
 		}
 
 		$result = $this->update($user);
@@ -1256,10 +1270,10 @@ class Cronjob extends CommonObject
 	 */
 	public function getLibStatut($mode = 0)
 	{
-	    return $this->LibStatut($this->status, $mode, $this->processing, $this->lastresult);
+		return $this->LibStatut($this->status, $mode, $this->processing, $this->lastresult);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un statut donne
 	 *
@@ -1269,7 +1283,7 @@ class Cronjob extends CommonObject
 	 *  @param	int		$lastresult		Value of last result (0=no error, error otherwise)
 	 *  @return string 			       	Label of status
 	 */
-    public function LibStatut($status, $mode = 0, $processing = 0, $lastresult = 0)
+	public function LibStatut($status, $mode = 0, $processing = 0, $lastresult = 0)
 	{
 		// phpcs:enable
 		$this->labelStatus = array(); // Force reset o array because label depends on other fields
@@ -1285,9 +1299,9 @@ class Cronjob extends CommonObject
 			elseif ($lastresult) $moretext .= ' ('.$langs->trans("Error").')';
 
 			$this->labelStatus[self::STATUS_DISABLED] = $langs->trans('Disabled').$moretext;
-			$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Enabled').$moretext;
+			$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Scheduled').$moretext;
 			$this->labelStatusShort[self::STATUS_DISABLED] = $langs->trans('Disabled');
-			$this->labelStatusShort[self::STATUS_ENABLED] = $langs->trans('Enabled');
+			$this->labelStatusShort[self::STATUS_ENABLED] = $langs->trans('Scheduled');
 		}
 
 		$statusType = 'status4';
@@ -1296,7 +1310,7 @@ class Cronjob extends CommonObject
 		if ($this->lastresult) $statusType = 'status8';
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
-    }
+	}
 }
 
 
@@ -1320,9 +1334,9 @@ class Cronjobline
 	public $datec = '';
 
 	/**
-     * @var string Cron Job Line label
-     */
-    public $label;
+	 * @var string Cron Job Line label
+	 */
+	public $label;
 
 	public $jobtype;
 	public $command;
@@ -1348,13 +1362,13 @@ class Cronjobline
 	public $status;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_author;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_mod;
 
 	public $note;
diff --git a/htdocs/cron/info.php b/htdocs/cron/info.php
index d5ab27ace66..98319e51295 100644
--- a/htdocs/cron/info.php
+++ b/htdocs/cron/info.php
@@ -48,7 +48,7 @@ $object->info($id);
 
 $head = cron_prepare_head($object);
 
-dol_fiche_head($head, 'info', $langs->trans("CronTask"), -1, 'cron');
+print dol_get_fiche_head($head, 'info', $langs->trans("CronTask"), -1, 'cron');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/cron/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 927c1d1014f..587bd1b28d1 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -55,10 +55,12 @@ $pagenext = $page + 1;
 if (!$sortfield) $sortfield = 't.status,t.priority';
 if (!$sortorder) $sortorder = 'DESC,ASC';
 
-$search_status = (GETPOSTISSET('search_status') ?GETPOST('search_status', 'int') : GETPOST('status', 'int'));
-
+$mode = GETPOST('mode', 'aZ09');
 //Search criteria
+$search_status = (GETPOSTISSET('search_status') ?GETPOST('search_status', 'int') : GETPOST('status', 'int'));
 $search_label = GETPOST("search_label", 'alpha');
+$search_module_name = GETPOST("search_module_name", 'alpha');
+$search_lastresult = GETPOST("search_lastresult", "alpha");
 $securitykey = GETPOST('securitykey', 'alpha');
 
 $diroutputmassaction = $conf->cronjob->dir_output.'/temp/massgeneration/'.$user->id;
@@ -97,6 +99,7 @@ if (empty($reshook))
 	{
 		$search_label = '';
 		$search_status = -1;
+		$search_lastresult = '';
 		$toselect = '';
 		$search_array_options = array();
 	}
@@ -128,47 +131,47 @@ if (empty($reshook))
 	// Execute jobs
 	if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->execute)
 	{
-	    if (!empty($conf->global->CRON_KEY) && $conf->global->CRON_KEY != $securitykey)
-	    {
-	        setEventMessages('Security key '.$securitykey.' is wrong', null, 'errors');
-	        $action = '';
-	    } else {
-	        $object = new Cronjob($db);
-	    	$job = $object->fetch($id);
+		if (!empty($conf->global->CRON_KEY) && $conf->global->CRON_KEY != $securitykey)
+		{
+			setEventMessages('Security key '.$securitykey.' is wrong', null, 'errors');
+			$action = '';
+		} else {
+			$object = new Cronjob($db);
+			$job = $object->fetch($id);
 
-	        $now = dol_now(); // Date we start
+			$now = dol_now(); // Date we start
 
-	        $resrunjob = $object->run_jobs($user->login); // Return -1 if KO, 1 if OK
-	    	if ($resrunjob < 0) {
-	    		setEventMessages($object->error, $object->errors, 'errors');
-	    	}
+			$resrunjob = $object->run_jobs($user->login); // Return -1 if KO, 1 if OK
+			if ($resrunjob < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
 
-	    	// Programm next run
-	    	$res = $object->reprogram_jobs($user->login, $now);
-	    	if ($res > 0)
-	    	{
-	    		if ($resrunjob >= 0)	// We show the result of reprogram only if no error message already reported
-	    		{
-	    		    if ($object->lastresult >= 0) setEventMessages($langs->trans("JobFinished"), null, 'mesgs');
-	    		    else setEventMessages($langs->trans("JobFinished"), null, 'errors');
-	    		}
-	    		$action = '';
-	    	} else {
-	    		setEventMessages($object->error, $object->errors, 'errors');
-	    		$action = '';
-	    	}
+			// Programm next run
+			$res = $object->reprogram_jobs($user->login, $now);
+			if ($res > 0)
+			{
+				if ($resrunjob >= 0)	// We show the result of reprogram only if no error message already reported
+				{
+					if ($object->lastresult >= 0) setEventMessages($langs->trans("JobFinished"), null, 'mesgs');
+					else setEventMessages($langs->trans("JobFinished"), null, 'errors');
+				}
+				$action = '';
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = '';
+			}
 
-	    	$param = '&search_status='.urlencode($search_status);
-	    	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	    	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	    	if ($search_label)	  $param .= '&search_label='.urlencode($search_label);
-	    	if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
-	    	// Add $param from extra fields
-	    	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+			$param = '&search_status='.urlencode($search_status);
+			if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+			if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+			if ($search_label)	  $param .= '&search_label='.urlencode($search_label);
+			if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
+			// Add $param from extra fields
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
-	    	header("Location: ".DOL_URL_ROOT.'/cron/list.php?'.$param.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '')); // Make a redirect to avoid to run twice the job when using back
-	    	exit;
-	    }
+			header("Location: ".DOL_URL_ROOT.'/cron/list.php?'.$param.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '')); // Make a redirect to avoid to run twice the job when using back
+			exit;
+		}
 	}
 
 	// Mass actions
@@ -211,7 +214,6 @@ $pagetitle = $langs->trans("CronList");
 
 llxHeader('', $pagetitle);
 
-
 $sql = "SELECT";
 $sql .= " t.rowid,";
 $sql .= " t.tms,";
@@ -247,6 +249,7 @@ $sql .= " t.test";
 $sql .= " FROM ".MAIN_DB_PREFIX."cronjob as t";
 $sql .= " WHERE entity IN (0,".$conf->entity.")";
 if ($search_status >= 0 && $search_status < 2 && $search_status != '') $sql .= " AND t.status = ".(empty($search_status) ? '0' : '1');
+if ($search_lastresult != '') $sql .= natural_search("t.lastresult", $search_lastresult, 1);
 //Manage filter
 if (is_array($filter) && count($filter) > 0) {
 	foreach ($filter as $key => $value) {
@@ -254,8 +257,8 @@ if (is_array($filter) && count($filter) > 0) {
 	}
 }
 $sqlwhere = array();
-if (!empty($module_name)) {
-	$sqlwhere[] = '(t.module_name='.$db->escape($module_name).')';
+if (!empty($search_module_name)) {
+	$sqlwhere[] = '(t.module_name='.$db->escape($search_module_name).')';
 }
 if (count($sqlwhere) > 0) {
 	$sql .= " WHERE ".implode(' AND ', $sqlwhere);
@@ -273,13 +276,13 @@ $sql .= $db->order($sortfield, $sortorder);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-    	$page = 0;
-    	$offset = 0;
-    }
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -296,6 +299,9 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&co
 if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 if ($search_status)   $param .= '&search_status='.urlencode($search_status);
 if ($search_label)	  $param .= '&search_label='.urlencode($search_label);
+if ($search_module_name) $param .= '&search_module_name='.urlencode($search_module_name);
+if ($search_lastresult) $param .= '&search_lastresult='.urlencode($search_lastresult);
+if ($mode) $param .= '&mode='.urlencode($mode);
 if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -322,6 +328,13 @@ if ($user->rights->mymodule->delete) $arrayofmassactions['predelete'] = '<span c
 if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
+if ($mode == 'modulesetup') {
+	$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+	print load_fiche_titre($langs->trans("CronSetup"), $linkback, 'title_setup');
+
+	// Configuration header
+	$head = cronadmin_prepare_head();
+}
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'" name="search_form">'."\n";
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -332,15 +345,21 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 // Line with explanation and button new
-$newcardbutton = dolGetButtonTitle($langs->trans('New'), $langs->trans('CronCreateJob'), 'fa fa-plus-circle', DOL_URL_ROOT.'/cron/card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $user->rights->cron->create);
+$newcardbutton = dolGetButtonTitle($langs->trans('New'), $langs->trans('CronCreateJob'), 'fa fa-plus-circle', DOL_URL_ROOT.'/cron/card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF'].'?mode=modulesetup'), '', $user->rights->cron->create);
 
 
-print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_setup', 0, $newcardbutton, '', $limit);
+if ($mode == 'modulesetup') {
+	print dol_get_fiche_head($head, 'jobs', $langs->trans("Module2300Name"), -1, 'cron');
+
+	//print '<span class="opacitymedium">'.$langs->trans('CronInfo').'</span><br>';
+}
 
 
-print '<span class="opacitymedium">'.$langs->trans('CronInfo').'</span><br>';
+print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, ($mode == 'modulesetup' ? '' : 'title_setup'), 0, $newcardbutton, '', $limit);
+
 
 $text = $langs->trans("HoursOnThisPageAreOnServerTZ").' '.$stringcurrentdate.'<br>';
 if (!empty($conf->global->CRON_WARNING_DELAY_HOURS)) $text .= $langs->trans("WarningCronDelayed", $conf->global->CRON_WARNING_DELAY_HOURS);
@@ -368,11 +387,11 @@ print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre">&nbsp;</td>';
-print '<td class="liste_titre">&nbsp;</td>';
+print '<td class="liste_titre center"><input type="text" class="width50" name="search_lastresult" value="'.$search_lastresult.'"></td>';
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre" align="center">';
-print $form->selectarray('search_status', array('0'=>$langs->trans("Disabled"), '1'=>$langs->trans("Enabled")), $search_status, 1);
+print $form->selectarray('search_status', array('0'=>$langs->trans("Disabled"), '1'=>$langs->trans("Scheduled")), $search_status, 1);
 print '</td><td class="liste_titre right">';
 $searchpicto = $form->showFilterButtons();
 print $searchpicto;
@@ -449,7 +468,7 @@ if ($num > 0)
 		print '<td>';
 		if ($obj->jobtype == 'method')
 		{
-		    $text = $langs->trans("CronClass");
+			$text = $langs->trans("CronClass");
 			$texttoshow = $langs->trans('CronModule').': '.$obj->module_name.'<br>';
 			$texttoshow .= $langs->trans('CronClass').': '.$obj->classesname.'<br>';
 			$texttoshow .= $langs->trans('CronObject').': '.$obj->objectname.'<br>';
@@ -494,8 +513,8 @@ if ($num > 0)
 		// Duration
 		print '<td class="center">';
 		if (!empty($datelastresult) && ($datelastresult >= $datelastrun)) {
-		    print convertSecondToTime(max($datelastresult - $datelastrun, 1), 'allhourminsec');
-		    //print '<br>'.($datelastresult - $datelastrun).' '.$langs->trans("seconds");
+			print convertSecondToTime(max($datelastresult - $datelastrun, 1), 'allhourminsec');
+			//print '<br>'.($datelastresult - $datelastrun).' '.$langs->trans("seconds");
 		}
 		print '</td>';
 
@@ -533,11 +552,11 @@ if ($num > 0)
 
 		print '<td class="nowraponall right">';
 
-		$backtourl = urlencode($_SERVER["PHP_SELF"].'?'.$param.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : ''));
+		$backtopage = urlencode($_SERVER["PHP_SELF"].'?'.$param.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : ''));
 		if ($user->rights->cron->create)
 		{
 			print '<a class="editfielda" href="'.DOL_URL_ROOT."/cron/card.php?id=".$obj->rowid.'&action=edit&token='.newToken().($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').$param;
-			print "&backtourl=".$backtourl."\" title=\"".dol_escape_htmltag($langs->trans('Edit'))."\">".img_picto($langs->trans('Edit'), 'edit')."</a> &nbsp;";
+			print "&backtopage=".$backtopage."\" title=\"".dol_escape_htmltag($langs->trans('Edit'))."\">".img_picto($langs->trans('Edit'), 'edit')."</a> &nbsp;";
 		}
 		if ($user->rights->cron->delete)
 		{
@@ -573,7 +592,7 @@ if ($num > 0)
 		$i++;
 	}
 } else {
-	print '<tr><td colspan="9" class="opacitymedium">'.$langs->trans('CronNoJobs').'</td></tr>';
+	print '<tr><td colspan="15" class="opacitymedium">'.$langs->trans('CronNoJobs').'</td></tr>';
 }
 
 print '</table>';
@@ -581,11 +600,10 @@ print '</div>';
 
 print '</from>';
 
+if ($mode == 'modulesetup') {
+	print dol_get_fiche_end();
+}
 
-print '<br><br>';
-
-
-dol_print_cron_urls();
 
 llxFooter();
 
diff --git a/htdocs/datapolicy/admin/setup.php b/htdocs/datapolicy/admin/setup.php
index 8cbec549941..d50f544449d 100644
--- a/htdocs/datapolicy/admin/setup.php
+++ b/htdocs/datapolicy/admin/setup.php
@@ -41,25 +41,25 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 $arrayofparameters = array();
 $arrayofparameters['ThirdParty'] = array(
-    'DATAPOLICY_TIERS_CLIENT'=>array('css'=>'minwidth200'),
-    'DATAPOLICY_TIERS_PROSPECT'=>array('css'=>'minwidth200'),
-    'DATAPOLICY_TIERS_PROSPECT_CLIENT'=>array('css'=>'minwidth200'),
-    'DATAPOLICY_TIERS_NIPROSPECT_NICLIENT'=>array('css'=>'minwidth200'),
-    'DATAPOLICY_TIERS_FOURNISSEUR'=>array('css'=>'minwidth200'),
+	'DATAPOLICY_TIERS_CLIENT'=>array('css'=>'minwidth200'),
+	'DATAPOLICY_TIERS_PROSPECT'=>array('css'=>'minwidth200'),
+	'DATAPOLICY_TIERS_PROSPECT_CLIENT'=>array('css'=>'minwidth200'),
+	'DATAPOLICY_TIERS_NIPROSPECT_NICLIENT'=>array('css'=>'minwidth200'),
+	'DATAPOLICY_TIERS_FOURNISSEUR'=>array('css'=>'minwidth200'),
 );
 if (!empty($conf->global->DATAPOLICY_USE_SPECIFIC_DELAY_FOR_CONTACT)) {
-    $arrayofparameters['Contact'] = array(
-        'DATAPOLICY_CONTACT_CLIENT'=>array('css'=>'minwidth200'),
-        'DATAPOLICY_CONTACT_PROSPECT'=>array('css'=>'minwidth200'),
-        'DATAPOLICY_CONTACT_PROSPECT_CLIENT'=>array('css'=>'minwidth200'),
-        'DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT'=>array('css'=>'minwidth200'),
-        'DATAPOLICY_CONTACT_FOURNISSEUR'=>array('css'=>'minwidth200'),
-    );
+	$arrayofparameters['Contact'] = array(
+		'DATAPOLICY_CONTACT_CLIENT'=>array('css'=>'minwidth200'),
+		'DATAPOLICY_CONTACT_PROSPECT'=>array('css'=>'minwidth200'),
+		'DATAPOLICY_CONTACT_PROSPECT_CLIENT'=>array('css'=>'minwidth200'),
+		'DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT'=>array('css'=>'minwidth200'),
+		'DATAPOLICY_CONTACT_FOURNISSEUR'=>array('css'=>'minwidth200'),
+	);
 }
 if (!empty($conf->adherent->enabled)) {
-    $arrayofparameters['Member'] = array(
-        'DATAPOLICY_ADHERENT'=>array('css'=>'minwidth200'),
-    );
+	$arrayofparameters['Member'] = array(
+		'DATAPOLICY_ADHERENT'=>array('css'=>'minwidth200'),
+	);
 }
 
 
@@ -71,16 +71,16 @@ if (!empty($conf->adherent->enabled)) {
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 $valTab = array(
-    '' => $langs->trans('Never'),
-    '6' => $langs->trans('NB_MONTHS', 6),
-    '12' => $langs->trans('ONE_YEAR'),
-    '24' => $langs->trans('NB_YEARS', 2),
-    '36' => $langs->trans('NB_YEARS', 3),
-    '48' => $langs->trans('NB_YEARS', 4),
-    '60' => $langs->trans('NB_YEARS', 5),
-    '120' => $langs->trans('NB_YEARS', 10),
-    '180' => $langs->trans('NB_YEARS', 15),
-    '240' => $langs->trans('NB_YEARS', 20),
+	'' => $langs->trans('Never'),
+	'6' => $langs->trans('NB_MONTHS', 6),
+	'12' => $langs->trans('ONE_YEAR'),
+	'24' => $langs->trans('NB_YEARS', 2),
+	'36' => $langs->trans('NB_YEARS', 3),
+	'48' => $langs->trans('NB_YEARS', 4),
+	'60' => $langs->trans('NB_YEARS', 5),
+	'120' => $langs->trans('NB_YEARS', 10),
+	'180' => $langs->trans('NB_YEARS', 15),
+	'240' => $langs->trans('NB_YEARS', 20),
 );
 
 
@@ -98,7 +98,7 @@ print load_fiche_titre($langs->trans($page_name), $linkback, 'object_generic');
 
 // Configuration header
 $head = datapolicyAdminPrepareHead();
-dol_fiche_head($head, 'settings', '', -1, "datapolicy@datapolicy");
+print dol_get_fiche_head($head, 'settings', '', -1, "datapolicy@datapolicy");
 
 // Setup page goes here
 echo '<span class="opacitymedium">'.$langs->trans("datapolicySetupPage").'</span><br><br>';
@@ -106,65 +106,65 @@ echo '<span class="opacitymedium">'.$langs->trans("datapolicySetupPage").'</span
 
 if ($action == 'edit')
 {
-    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="update">';
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="update">';
 
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-    foreach ($arrayofparameters as $title => $tab)
-    {
-        print '<tr class="trforbreak"><td class="titlefield trforbreak" colspan="2">'.$langs->trans($title).'</td></tr>';
-        foreach ($tab as $key => $val)
-        {
-            print '<tr class="oddeven"><td>';
-            print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
-            print '</td><td>';
-            print '<select name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'">';
-            foreach ($valTab as $key1 => $val1) {
-                print '<option value="'.$key1.'" '.($conf->global->$key == $key1 ? 'selected="selected"' : '').'>';
-                print $val1;
-                print '</option>';
-            }
-            print '</select>';
-            print '</td></tr>';
-        }
-    }
+	foreach ($arrayofparameters as $title => $tab)
+	{
+		print '<tr class="trforbreak"><td class="titlefield trforbreak" colspan="2">'.$langs->trans($title).'</td></tr>';
+		foreach ($tab as $key => $val)
+		{
+			print '<tr class="oddeven"><td>';
+			print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
+			print '</td><td>';
+			print '<select name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'">';
+			foreach ($valTab as $key1 => $val1) {
+				print '<option value="'.$key1.'" '.($conf->global->$key == $key1 ? 'selected="selected"' : '').'>';
+				print $val1;
+				print '</option>';
+			}
+			print '</select>';
+			print '</td></tr>';
+		}
+	}
 
-    print '</table>';
+	print '</table>';
 
-    print '<br><div class="center">';
-    print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
-    print '</div>';
+	print '<br><div class="center">';
+	print '<input class="button button-save" type="submit" value="'.$langs->trans("Save").'">';
+	print '</div>';
 
-    print '</form>';
-    print '<br>';
+	print '</form>';
+	print '<br>';
 } else {
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-    foreach ($arrayofparameters as $title => $tab)
-    {
-        print '<tr class="trforbreak"><td class="titlefield trforbreak" colspan="2">'.$langs->trans($title).'</td></tr>';
-        foreach ($tab as $key => $val)
-        {
-            print '<tr class="oddeven"><td>';
-            print $form->textwithpicto($langs->trans($key), $langs->trans('DATAPOLICY_Tooltip_SETUP'));
-            print '</td><td>'.($conf->global->$key == '' ? $langs->trans('None') : $valTab[$conf->global->$key]).'</td></tr>';
-        }
-    }
+	foreach ($arrayofparameters as $title => $tab)
+	{
+		print '<tr class="trforbreak"><td class="titlefield trforbreak" colspan="2">'.$langs->trans($title).'</td></tr>';
+		foreach ($tab as $key => $val)
+		{
+			print '<tr class="oddeven"><td>';
+			print $form->textwithpicto($langs->trans($key), $langs->trans('DATAPOLICY_Tooltip_SETUP'));
+			print '</td><td>'.($conf->global->$key == '' ? $langs->trans('None') : $valTab[$conf->global->$key]).'</td></tr>';
+		}
+	}
 
-    print '</table>';
+	print '</table>';
 
-    print '<div class="tabsAction">';
-    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
-    print '</div>';
+	print '<div class="tabsAction">';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
+	print '</div>';
 }
 
 
 // Page end
-dol_fiche_end();
+print dol_get_fiche_end();
 
 llxFooter();
 $db->close();
diff --git a/htdocs/datapolicy/admin/setupmail.php b/htdocs/datapolicy/admin/setupmail.php
index b2b739a8f12..7076608898e 100644
--- a/htdocs/datapolicy/admin/setupmail.php
+++ b/htdocs/datapolicy/admin/setupmail.php
@@ -88,7 +88,7 @@ print load_fiche_titre($langs->trans($page_name), $linkback, 'object_datapolicy@
 
 // Configuration header
 $head = datapolicyAdminPrepareHead();
-dol_fiche_head($head, 'settings', '', -1, "datapolicy@datapolicy");
+print dol_get_fiche_head($head, 'settings', '', -1, "datapolicy@datapolicy");
 
 
 print "<script type='text/javascript'>
@@ -153,7 +153,7 @@ print '<br><center><input type="submit" class="button" value="'.$langs->trans("M
 
 print '</form>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<br><br>';
 
diff --git a/htdocs/datapolicy/class/actions_datapolicy.class.php b/htdocs/datapolicy/class/actions_datapolicy.class.php
index 74c254d395f..d6c16a6be4e 100644
--- a/htdocs/datapolicy/class/actions_datapolicy.class.php
+++ b/htdocs/datapolicy/class/actions_datapolicy.class.php
@@ -27,317 +27,317 @@
  */
 class ActionsDatapolicy
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
-     * @var string Error
-     */
-    public $error = '';
+	/**
+	 * @var string Error
+	 */
+	public $error = '';
 
-    /**
-     * @var array Errors
-     */
-    public $errors = array();
+	/**
+	 * @var array Errors
+	 */
+	public $errors = array();
 
-    /**
-     * @var array Hook results. Propagated to $hookmanager->resArray for later reuse
-     */
-    public $results = array();
+	/**
+	 * @var array Hook results. Propagated to $hookmanager->resArray for later reuse
+	 */
+	public $results = array();
 
-    /**
-     * @var string String displayed by executeHook() immediately after return
-     */
-    public $resprints;
+	/**
+	 * @var string String displayed by executeHook() immediately after return
+	 */
+	public $resprints;
 
-    /**
-     * Constructor
-     *
-     *  @param  DoliDB      $db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 *
+	 *  @param  DoliDB      $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
-    /**
-     * Execute action
-     *
-     * @param   array           $parameters		Array of parameters
-     * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
-     * @param   string          $action      	'add', 'update', 'view'
-     * @return  int         					<0 if KO,
-     *                           				=0 if OK but we want to process standard actions too,
-     *                            				>0 if OK and we want to replace standard actions.
-     */
-    public function getNomUrl($parameters, &$object, &$action)
-    {
-        global $db, $langs, $conf, $user;
-        $this->resprints = '';
-        return 0;
-    }
+	/**
+	 * Execute action
+	 *
+	 * @param   array           $parameters		Array of parameters
+	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
+	 * @param   string          $action      	'add', 'update', 'view'
+	 * @return  int         					<0 if KO,
+	 *                           				=0 if OK but we want to process standard actions too,
+	 *                            				>0 if OK and we want to replace standard actions.
+	 */
+	public function getNomUrl($parameters, &$object, &$action)
+	{
+		global $db, $langs, $conf, $user;
+		$this->resprints = '';
+		return 0;
+	}
 
-    /**
-     * Overloading the doActions function : replacing the parent's function with the one below
-     *
-     * @param   array           $parameters     Hook metadatas (context, etc...)
-     * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
-     * @param   string          $action         Current action (if set). Generally create or edit or null
-     * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
-     * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
-     */
-    public function doActions($parameters, &$object, &$action, $hookmanager)
-    {
-        global $conf, $user, $langs;
-        $langs->load('datapolicy@datapolicy');
-        $error = 0; // Error counter
+	/**
+	 * Overloading the doActions function : replacing the parent's function with the one below
+	 *
+	 * @param   array           $parameters     Hook metadatas (context, etc...)
+	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
+	 * @param   string          $action         Current action (if set). Generally create or edit or null
+	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
+	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
+	 */
+	public function doActions($parameters, &$object, &$action, $hookmanager)
+	{
+		global $conf, $user, $langs;
+		$langs->load('datapolicy@datapolicy');
+		$error = 0; // Error counter
 
-        if (GETPOST('socid') && $parameters['currentcontext'] == 'thirdpartycard') {
-            $object->fetch(GETPOST('socid'));
-        }
+		if (GETPOST('socid') && $parameters['currentcontext'] == 'thirdpartycard') {
+			$object->fetch(GETPOST('socid'));
+		}
 
-        // FIXME Removed hard coded id, use codes
-        if ($parameters['currentcontext'] == 'thirdpartycard' && $action == 'anonymiser' && (in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8)) {
-            // on verifie si l'objet est utilisé
-            if ($object->isObjectUsed(GETPOST('socid'))) {
-                $object->name = $langs->trans('ANONYME');
-                $object->name_bis = '';
-                $object->name_alias = '';
-                $object->address = '';
-                $object->town = '';
-                $object->zip = '';
-                $object->phone = '';
-                $object->email = '';
-                $object->url = '';
-                $object->fax = '';
-                $object->state = '';
-                $object->country = '';
-                $object->state_id = '';
-                $object->skype = '';
-                $object->country_id = '';
-                $object->note_private = $object->note_private.'<br/>'.$langs->trans('ANONYMISER_AT', dol_print_date(time()));
+		// FIXME Removed hard coded id, use codes
+		if ($parameters['currentcontext'] == 'thirdpartycard' && $action == 'anonymiser' && (in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8)) {
+			// on verifie si l'objet est utilisé
+			if ($object->isObjectUsed(GETPOST('socid'))) {
+				$object->name = $langs->trans('ANONYME');
+				$object->name_bis = '';
+				$object->name_alias = '';
+				$object->address = '';
+				$object->town = '';
+				$object->zip = '';
+				$object->phone = '';
+				$object->email = '';
+				$object->url = '';
+				$object->fax = '';
+				$object->state = '';
+				$object->country = '';
+				$object->state_id = '';
+				$object->skype = '';
+				$object->country_id = '';
+				$object->note_private = $object->note_private.'<br/>'.$langs->trans('ANONYMISER_AT', dol_print_date(time()));
 
-                if ($object->update($object->id, $user, 0)) {
-                    // On supprime les contacts associé
-                    $sql = "DELETE FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$object->id;
-                    $this->db->query($sql);
+				if ($object->update($object->id, $user, 0)) {
+					// On supprime les contacts associé
+					$sql = "DELETE FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$object->id;
+					$this->db->query($sql);
 
-                    setEventMessages($langs->trans('ANONYMISER_SUCCESS'), array());
-                    header('Location:'.$_SERVER["PHP_SELF"]."?socid=".$object->id);
-                }
-            }
-        } elseif ($parameters['currentcontext'] == 'thirdpartycard' && $action == 'datapolicy_portabilite') {
-            header('Content-Type: application/csv');
-            header('Content-Disposition: attachment; filename=datapolicy_portabilite.csv');
-            header('Pragma: no-cache');
-            $object->fetch(GETPOST('socid'));
-            echo 'Name;Fistname;Civility;Thirdparty;Function;Address;ZipCode;City;Department;Country;Email;Pro Phone;Perso Phone;Mobile Phone;Instant Mail;Birthday;'.PHP_EOL;
-            echo $object->name.';';
-            echo ';';
-            echo ';';
-            echo ';';
-            echo ';';
-            echo $object->address.';';
-            echo $object->zip.';';
-            echo $object->town.';';
-            echo $object->state.';';
-            echo $object->country.';';
-            echo $object->email.';';
-            echo $object->phone.';';
-            echo ';';
-            echo ';';
-            echo $object->skype.';';
-            echo ';';
-            exit;
-        } elseif ($parameters['currentcontext'] == 'membercard' && $action == 'datapolicy_portabilite') {
-            header('Content-Type: application/csv');
-            header('Content-Disposition: attachment; filename=datapolicy_portabilite.csv');
-            header('Pragma: no-cache');
-            $soc = $object->fetch_thirdparty();
+					setEventMessages($langs->trans('ANONYMISER_SUCCESS'), array());
+					header('Location:'.$_SERVER["PHP_SELF"]."?socid=".$object->id);
+				}
+			}
+		} elseif ($parameters['currentcontext'] == 'thirdpartycard' && $action == 'datapolicy_portabilite') {
+			header('Content-Type: application/csv');
+			header('Content-Disposition: attachment; filename=datapolicy_portabilite.csv');
+			header('Pragma: no-cache');
+			$object->fetch(GETPOST('socid'));
+			echo 'Name;Fistname;Civility;Thirdparty;Function;Address;ZipCode;City;Department;Country;Email;Pro Phone;Perso Phone;Mobile Phone;Instant Mail;Birthday;'.PHP_EOL;
+			echo $object->name.';';
+			echo ';';
+			echo ';';
+			echo ';';
+			echo ';';
+			echo $object->address.';';
+			echo $object->zip.';';
+			echo $object->town.';';
+			echo $object->state.';';
+			echo $object->country.';';
+			echo $object->email.';';
+			echo $object->phone.';';
+			echo ';';
+			echo ';';
+			echo $object->skype.';';
+			echo ';';
+			exit;
+		} elseif ($parameters['currentcontext'] == 'membercard' && $action == 'datapolicy_portabilite') {
+			header('Content-Type: application/csv');
+			header('Content-Disposition: attachment; filename=datapolicy_portabilite.csv');
+			header('Pragma: no-cache');
+			$soc = $object->fetch_thirdparty();
 
-            echo 'Name;Fistname;Civility;Thirdparty;Function;Address;ZipCode;City;Department;Country;Email;Pro Phone;Perso Phone;Mobile Phone;Instant Mail;Birthday;'.PHP_EOL;
-            echo $object->lastname.';';
-            echo $object->firstname.';';
-            echo $object->getCivilityLabel().';';
-            echo ($soc != -1 ? $object->thirdparty->name : '').';';
-            echo ';';
-            echo $object->address.';';
-            echo $object->zip.';';
-            echo $object->town.';';
-            echo $object->state.';';
-            echo $object->country.';';
-            echo $object->email.';';
-            echo $object->phone.';';
-            echo $object->phone_perso.';';
-            echo $object->phone_mobile.';';
-            echo $object->skype.';';
-            echo dol_print_date($object->birth).';';
-            exit;
-        } elseif ($parameters['currentcontext'] == 'contactcard' && $action == 'datapolicy_portabilite') {
-            $object->fetch(GETPOST('id'));
-            header('Content-Type: application/csv');
-            header('Content-Disposition: attachment; filename=datapolicy_portabilite.csv');
-            header('Pragma: no-cache');
-            $soc = $object->fetch_thirdparty();
-            echo 'Name;Fistname;Civility;Thirdparty;Function;Address;ZipCode;City;Department;Country;Email;Pro Phone;Perso Phone;Mobile Phone;Instant Mail;Birthday;'.PHP_EOL;
-            echo $object->lastname.';';
-            echo $object->firstname.';';
-            echo $object->getCivilityLabel().';';
-            echo ($soc != -1 ? $object->thirdparty->name : '').';';
-            echo $object->poste.';';
-            echo $object->address.';';
-            echo $object->zip.';';
-            echo $object->town.';';
-            echo $object->state.';';
-            echo $object->country.';';
-            echo $object->email.';';
-            echo $object->phone_pro.';';
-            echo $object->phone_perso.';';
-            echo $object->phone_mobile.';';
-            echo $object->jabberid.';';
-            echo dol_print_date($object->birth).';';
-            exit;
-        } elseif ($parameters['currentcontext'] == 'contactcard' && $action == 'send_datapolicy') {
-            $object->fetch(GETPOST('id'));
+			echo 'Name;Fistname;Civility;Thirdparty;Function;Address;ZipCode;City;Department;Country;Email;Pro Phone;Perso Phone;Mobile Phone;Instant Mail;Birthday;'.PHP_EOL;
+			echo $object->lastname.';';
+			echo $object->firstname.';';
+			echo $object->getCivilityLabel().';';
+			echo ($soc != -1 ? $object->thirdparty->name : '').';';
+			echo ';';
+			echo $object->address.';';
+			echo $object->zip.';';
+			echo $object->town.';';
+			echo $object->state.';';
+			echo $object->country.';';
+			echo $object->email.';';
+			echo $object->phone.';';
+			echo $object->phone_perso.';';
+			echo $object->phone_mobile.';';
+			echo $object->skype.';';
+			echo dol_print_date($object->birth).';';
+			exit;
+		} elseif ($parameters['currentcontext'] == 'contactcard' && $action == 'datapolicy_portabilite') {
+			$object->fetch(GETPOST('id'));
+			header('Content-Type: application/csv');
+			header('Content-Disposition: attachment; filename=datapolicy_portabilite.csv');
+			header('Pragma: no-cache');
+			$soc = $object->fetch_thirdparty();
+			echo 'Name;Fistname;Civility;Thirdparty;Function;Address;ZipCode;City;Department;Country;Email;Pro Phone;Perso Phone;Mobile Phone;Instant Mail;Birthday;'.PHP_EOL;
+			echo $object->lastname.';';
+			echo $object->firstname.';';
+			echo $object->getCivilityLabel().';';
+			echo ($soc != -1 ? $object->thirdparty->name : '').';';
+			echo $object->poste.';';
+			echo $object->address.';';
+			echo $object->zip.';';
+			echo $object->town.';';
+			echo $object->state.';';
+			echo $object->country.';';
+			echo $object->email.';';
+			echo $object->phone_pro.';';
+			echo $object->phone_perso.';';
+			echo $object->phone_mobile.';';
+			echo $object->jabberid.';';
+			echo dol_print_date($object->birth).';';
+			exit;
+		} elseif ($parameters['currentcontext'] == 'contactcard' && $action == 'send_datapolicy') {
+			$object->fetch(GETPOST('id'));
 
-            require_once  DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-            require_once  DOL_DOCUMENT_ROOT.'/datapolicy/class/datapolicy.class.php';
-            DataPolicy::sendMailDataPolicyContact($object);
-        } elseif ($parameters['currentcontext'] == 'membercard' && $action == 'send_datapolicy') {
-             $object->fetch(GETPOST('id'));
-            require_once  DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-            require_once  DOL_DOCUMENT_ROOT.'/datapolicy/class/datapolicy.class.php';
-            DataPolicy::sendMailDataPolicyAdherent($object);
-        } elseif ($parameters['currentcontext'] == 'thirdpartycard' && $action == 'send_datapolicy') {
-            $object->fetch(GETPOST('socid'));
-            require_once  DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-            require_once  DOL_DOCUMENT_ROOT.'/datapolicy/class/datapolicy.class.php';
-            DataPolicy::sendMailDataPolicyCompany($object);
-        }
+			require_once  DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+			require_once  DOL_DOCUMENT_ROOT.'/datapolicy/class/datapolicy.class.php';
+			DataPolicy::sendMailDataPolicyContact($object);
+		} elseif ($parameters['currentcontext'] == 'membercard' && $action == 'send_datapolicy') {
+			 $object->fetch(GETPOST('id'));
+			require_once  DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+			require_once  DOL_DOCUMENT_ROOT.'/datapolicy/class/datapolicy.class.php';
+			DataPolicy::sendMailDataPolicyAdherent($object);
+		} elseif ($parameters['currentcontext'] == 'thirdpartycard' && $action == 'send_datapolicy') {
+			$object->fetch(GETPOST('socid'));
+			require_once  DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+			require_once  DOL_DOCUMENT_ROOT.'/datapolicy/class/datapolicy.class.php';
+			DataPolicy::sendMailDataPolicyCompany($object);
+		}
 
 
-        if (!$error) {
-            $this->results = array('myreturn' => 999);
-            $this->resprints = 'A text to show';
-            return 0; // or return 1 to replace standard code
-        } else {
-            $this->errors[] = 'Error message';
-            return -1;
-        }
-    }
+		if (!$error) {
+			$this->results = array('myreturn' => 999);
+			$this->resprints = 'A text to show';
+			return 0; // or return 1 to replace standard code
+		} else {
+			$this->errors[] = 'Error message';
+			return -1;
+		}
+	}
 
-    /**
-     * Overloading the doActions function : replacing the parent's function with the one below
-     *
-     * @param   array           $parameters     Hook metadatas (context, etc...)
-     * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
-     * @param   string          $action         Current action (if set). Generally create or edit or null
-     * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
-     * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
-     */
-    public function doMassActions($parameters, &$object, &$action, $hookmanager)
-    {
-        global $conf, $user, $langs;
+	/**
+	 * Overloading the doActions function : replacing the parent's function with the one below
+	 *
+	 * @param   array           $parameters     Hook metadatas (context, etc...)
+	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
+	 * @param   string          $action         Current action (if set). Generally create or edit or null
+	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
+	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
+	 */
+	public function doMassActions($parameters, &$object, &$action, $hookmanager)
+	{
+		global $conf, $user, $langs;
 
-        $error = 0; // Error counter
+		$error = 0; // Error counter
 
-        /* print_r($parameters); print_r($object); echo "action: " . $action; */
-        //if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2'))) {
-        //    // do something only for the context 'somecontext1' or 'somecontext2'
-        //    foreach ($parameters['toselect'] as $objectid) {
-        //        // Do action on each object id
-        //    }
-        //}
+		/* print_r($parameters); print_r($object); echo "action: " . $action; */
+		//if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2'))) {
+		//    // do something only for the context 'somecontext1' or 'somecontext2'
+		//    foreach ($parameters['toselect'] as $objectid) {
+		//        // Do action on each object id
+		//    }
+		//}
 
-        if (!$error) {
-            $this->results = array('myreturn' => 999);
-            $this->resprints = 'A text to show';
-            return 0; // or return 1 to replace standard code
-        } else {
-            $this->errors[] = 'Error message';
-            return -1;
-        }
-    }
+		if (!$error) {
+			$this->results = array('myreturn' => 999);
+			$this->resprints = 'A text to show';
+			return 0; // or return 1 to replace standard code
+		} else {
+			$this->errors[] = 'Error message';
+			return -1;
+		}
+	}
 
-    /**
-     * Overloading the addMoreMassActions function : replacing the parent's function with the one below
-     *
-     * @param   array           $parameters		Hook metadatas (context, etc...)
-     * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
-     * @param   string          $action         Current action (if set). Generally create or edit or null
-     * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
-     * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
-     */
-    public function addMoreMassActions($parameters, &$object, &$action, $hookmanager)
-    {
-        global $conf, $user, $langs;
+	/**
+	 * Overloading the addMoreMassActions function : replacing the parent's function with the one below
+	 *
+	 * @param   array           $parameters		Hook metadatas (context, etc...)
+	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
+	 * @param   string          $action         Current action (if set). Generally create or edit or null
+	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
+	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
+	 */
+	public function addMoreMassActions($parameters, &$object, &$action, $hookmanager)
+	{
+		global $conf, $user, $langs;
 
-        $error = 0; // Error counter
+		$error = 0; // Error counter
 
-        /* print_r($parameters); print_r($object); echo "action: " . $action; */
-        if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2'))) {  // do something only for the context 'somecontext1' or 'somecontext2'
-            $this->resprints = '<option value="0"'.($disabled ? ' disabled="disabled"' : '').'>'.$langs->trans("datapolicyMassAction").'</option>';
-        }
+		/* print_r($parameters); print_r($object); echo "action: " . $action; */
+		if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2'))) {  // do something only for the context 'somecontext1' or 'somecontext2'
+			$this->resprints = '<option value="0"'.($disabled ? ' disabled="disabled"' : '').'>'.$langs->trans("datapolicyMassAction").'</option>';
+		}
 
-        if (!$error) {
-            return 0; // or return 1 to replace standard code
-        } else {
-            $this->errors[] = 'Error message';
-            return -1;
-        }
-    }
+		if (!$error) {
+			return 0; // or return 1 to replace standard code
+		} else {
+			$this->errors[] = 'Error message';
+			return -1;
+		}
+	}
 
-    /**
-     * Execute action
-     *
-     * @param   array   $parameters     Array of parameters
-     * @param   Object  $object         Object output on PDF
-     * @param   string  $action         'add', 'update', 'view'
-     * @return  int                     <0 if KO,
-     *                                  =0 if OK but we want to process standard actions too,
-     *                                  >0 if OK and we want to replace standard actions.
-     */
-    public function beforePDFCreation($parameters, &$object, &$action)
-    {
-        global $conf, $user, $langs;
-        global $hookmanager;
+	/**
+	 * Execute action
+	 *
+	 * @param   array   $parameters     Array of parameters
+	 * @param   Object  $object         Object output on PDF
+	 * @param   string  $action         'add', 'update', 'view'
+	 * @return  int                     <0 if KO,
+	 *                                  =0 if OK but we want to process standard actions too,
+	 *                                  >0 if OK and we want to replace standard actions.
+	 */
+	public function beforePDFCreation($parameters, &$object, &$action)
+	{
+		global $conf, $user, $langs;
+		global $hookmanager;
 
-        $outputlangs = $langs;
+		$outputlangs = $langs;
 
-        $ret = 0;
-        $deltemp = array();
-        dol_syslog(get_class($this).'::executeHooks action='.$action);
+		$ret = 0;
+		$deltemp = array();
+		dol_syslog(get_class($this).'::executeHooks action='.$action);
 
-        /* print_r($parameters); print_r($object); echo "action: " . $action; */
-        if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2'))) {  // do something only for the context 'somecontext1' or 'somecontext2'
-        }
+		/* print_r($parameters); print_r($object); echo "action: " . $action; */
+		if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2'))) {  // do something only for the context 'somecontext1' or 'somecontext2'
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 
 
-    /**
-     * addMoreActionsButtons
-     *
-     * @param array 		$parameters		array of parameters
-     * @param Object	 	$object			Object
-     * @param string		$action			Actions
-     * @param HookManager	$hookmanager	Hook manager
-     * @return void
-     */
-    public function addMoreActionsButtons($parameters, &$object, &$action, $hookmanager)
-    {
-        global $conf, $user, $langs;
-        $langs->load('datapolicy@datapolicy');
+	/**
+	 * addMoreActionsButtons
+	 *
+	 * @param array 		$parameters		array of parameters
+	 * @param Object	 	$object			Object
+	 * @param string		$action			Actions
+	 * @param HookManager	$hookmanager	Hook manager
+	 * @return void
+	 */
+	public function addMoreActionsButtons($parameters, &$object, &$action, $hookmanager)
+	{
+		global $conf, $user, $langs;
+		$langs->load('datapolicy@datapolicy');
 
-        if (!empty($conf->global->DATAPOLICIES_ENABLE_EMAILS))
-        {
-            $dialog = '<div id="dialogdatapolicy" style="display:none;" title="'.$langs->trans('DATAPOLICIES_PORTABILITE_TITLE').'">';
-            $dialog .= '<div class="confirmmessage">'.img_help('', '').' '.$langs->trans('DATAPOLICIES_PORTABILITE_CONFIRMATION').'</div>';
-            $dialog .= "</div>";
-            $dialog .= '<script>
+		if (!empty($conf->global->DATAPOLICIES_ENABLE_EMAILS))
+		{
+			$dialog = '<div id="dialogdatapolicy" style="display:none;" title="'.$langs->trans('DATAPOLICIES_PORTABILITE_TITLE').'">';
+			$dialog .= '<div class="confirmmessage">'.img_help('', '').' '.$langs->trans('DATAPOLICIES_PORTABILITE_CONFIRMATION').'</div>';
+			$dialog .= "</div>";
+			$dialog .= '<script>
                       $( function() {
                         $("#rpgpdbtn").on("click", function(){
                             var href = $(this).attr("href");
@@ -348,7 +348,7 @@ class ActionsDatapolicy
                                   window.open(href);
                                   $( this ).dialog( "close" );
                                 },
-                                "' . $langs->trans('Cancel').'": function() {
+                                "' . $langs->trans("Cancel").'": function() {
                                   $( this ).dialog( "close" );
                                 }
                               }
@@ -359,92 +359,92 @@ class ActionsDatapolicy
                         });
                       } );
                       </script>';
-            echo $dialog;
-            if ($parameters['currentcontext'] == 'thirdpartycard' && in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8) {
-                echo '<div class="inline-block divButAction"><a target="_blank" id="rpgpdbtn" class="butAction" href="'.$_SERVER["PHP_SELF"]."?socid=".$object->id.'&action=datapolicy_portabilite" title="'.$langs->trans('DATAPOLICIES_PORTABILITE_TITLE').'">'.$langs->trans("DATAPOLICIES_PORTABILITE").'</a></div>';
-            } elseif ($parameters['currentcontext'] == 'membercard') {
-                echo '<div class="inline-block divButAction"><a target="_blank" id="rpgpdbtn" class="butAction" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id.'&action=datapolicy_portabilite" title="'.$langs->trans('DATAPOLICIES_PORTABILITE_TITLE').'">'.$langs->trans("DATAPOLICIES_PORTABILITE").'</a></div>';
-            } elseif ($parameters['currentcontext'] == 'contactcard') {
-                echo '<div class="inline-block divButAction"><a target="_blank" id="rpgpdbtn" class="butAction" href="'.$_SERVER["PHP_SELF"]."?id=".$object->id.'&action=datapolicy_portabilite" title="'.$langs->trans('DATAPOLICIES_PORTABILITE_TITLE').'">'.$langs->trans("DATAPOLICIES_PORTABILITE").'</a></div>';
-            }
-            if (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'thirdpartycard' && in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8) {
-                echo '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?socid=".$object->id.'&action=send_datapolicy" title="'.$langs->trans('DATAPOLICIES_SEND').'">'.$langs->trans("DATAPOLICIES_SEND").'</a></div>';
-            } elseif (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'membercard') {
-                echo '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id.'&action=send_datapolicy" title="'.$langs->trans('DATAPOLICIES_SEND').'">'.$langs->trans("DATAPOLICIES_SEND").'</a></div>';
-            } elseif (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'contactcard') {
-                echo '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?id=".$object->id.'&action=send_datapolicy" title="'.$langs->trans('DATAPOLICIES_SEND').'">'.$langs->trans("DATAPOLICIES_SEND").'</a></div>';
-            }
-        }
-    }
+			echo $dialog;
+			if ($parameters['currentcontext'] == 'thirdpartycard' && in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8) {
+				echo '<div class="inline-block divButAction"><a target="_blank" id="rpgpdbtn" class="butAction" href="'.$_SERVER["PHP_SELF"]."?socid=".$object->id.'&action=datapolicy_portabilite" title="'.$langs->trans('DATAPOLICIES_PORTABILITE_TITLE').'">'.$langs->trans("DATAPOLICIES_PORTABILITE").'</a></div>';
+			} elseif ($parameters['currentcontext'] == 'membercard') {
+				echo '<div class="inline-block divButAction"><a target="_blank" id="rpgpdbtn" class="butAction" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id.'&action=datapolicy_portabilite" title="'.$langs->trans('DATAPOLICIES_PORTABILITE_TITLE').'">'.$langs->trans("DATAPOLICIES_PORTABILITE").'</a></div>';
+			} elseif ($parameters['currentcontext'] == 'contactcard') {
+				echo '<div class="inline-block divButAction"><a target="_blank" id="rpgpdbtn" class="butAction" href="'.$_SERVER["PHP_SELF"]."?id=".$object->id.'&action=datapolicy_portabilite" title="'.$langs->trans('DATAPOLICIES_PORTABILITE_TITLE').'">'.$langs->trans("DATAPOLICIES_PORTABILITE").'</a></div>';
+			}
+			if (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'thirdpartycard' && in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8) {
+				echo '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?socid=".$object->id.'&action=send_datapolicy" title="'.$langs->trans('DATAPOLICIES_SEND').'">'.$langs->trans("DATAPOLICIES_SEND").'</a></div>';
+			} elseif (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'membercard') {
+				echo '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id.'&action=send_datapolicy" title="'.$langs->trans('DATAPOLICIES_SEND').'">'.$langs->trans("DATAPOLICIES_SEND").'</a></div>';
+			} elseif (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'contactcard') {
+				echo '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?id=".$object->id.'&action=send_datapolicy" title="'.$langs->trans('DATAPOLICIES_SEND').'">'.$langs->trans("DATAPOLICIES_SEND").'</a></div>';
+			}
+		}
+	}
 
-    /**
-     * printCommonFooter
-     *
-     * @param array 		$parameters		array of parameters
-     * @param Object	 	$object			Object
-     * @param string		$action			Actions
-     * @param HookManager	$hookmanager	Hook manager
-     * @return int
-     */
-    public function printCommonFooter($parameters, &$object, &$action, $hookmanager)
-    {
-        global $conf, $user, $langs;
+	/**
+	 * printCommonFooter
+	 *
+	 * @param array 		$parameters		array of parameters
+	 * @param Object	 	$object			Object
+	 * @param string		$action			Actions
+	 * @param HookManager	$hookmanager	Hook manager
+	 * @return int
+	 */
+	public function printCommonFooter($parameters, &$object, &$action, $hookmanager)
+	{
+		global $conf, $user, $langs;
 
-        $jsscript = '';
-        if ($parameters['currentcontext'] == 'thirdpartycard') {
-            if (GETPOST('action') == 'create' || GETPOST('action') == 'edit' || GETPOST('action') == '') {
-                $jsscript .= '<script>';
-                $jsscript .= "var elementToHide = 'tr.societe_extras_datapolicy_consentement, tr.societe_extras_datapolicy_opposition_traitement, tr.societe_extras_datapolicy_opposition_prospection';".PHP_EOL;
-                $jsscript .= "var forme_juridique = [".PHP_EOL;
-                $jsscript .= "11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005".PHP_EOL;
-                $jsscript .= "];".PHP_EOL;
-                $jsscript .= "function hideRgPD() {".PHP_EOL;
-                $jsscript .= " if ($('#typent_id').val() == 8 || forme_juridique.indexOf(parseInt($('#forme_juridique_code').val())) > -1) {".PHP_EOL;
-                $jsscript .= " console.log(elementToHide);".PHP_EOL;
-                $jsscript .= " $('tr.societe_extras_datapolicy_consentement, tr.societe_extras_datapolicy_opposition_traitement, tr.societe_extras_datapolicy_opposition_prospection').show(); } else { $('tr.societe_extras_datapolicy_consentement, tr.societe_extras_datapolicy_opposition_traitement, tr.societe_extras_datapolicy_opposition_prospection').hide(); }}".PHP_EOL;
-                $jsscript .= "hideRgPD();".PHP_EOL;
-                $jsscript .= "$('#forme_juridique_code, #typent_id').change(function(){ hideRgPD(); });".PHP_EOL;
-                $jsscript .= '</script>';
-            } elseif (GETPOST('action') == 'confirm_delete' && GETPOST('confirm') == 'yes' && GETPOST('socid') > 0) {
-                // La suppression n'a pas été possible
-                require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-                $societe = new Societe($this->db);
-                $societe->fetch(GETPOST('socid'));
-                // On vérifie si il est utilisé
-                if ((in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $societe->typent_id == 8) && $societe->isObjectUsed(GETPOST('socid'))) {
-                    require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-                    $form = new Form($this->db);
-                    echo $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".GETPOST('socid'), substr($langs->trans("DATAPOLICIES_POPUP_ANONYME_TITLE"), 0, strlen($langs->trans("DATAPOLICIES_POPUP_ANONYME_TITLE")) - 2), $langs->trans("DATAPOLICIES_POPUP_ANONYME_TEXTE"), 'anonymiser', '', '', 1);
-                }
-            }
+		$jsscript = '';
+		if ($parameters['currentcontext'] == 'thirdpartycard') {
+			if (GETPOST('action') == 'create' || GETPOST('action') == 'edit' || GETPOST('action') == '') {
+				$jsscript .= '<script>';
+				$jsscript .= "var elementToHide = 'tr.societe_extras_datapolicy_consentement, tr.societe_extras_datapolicy_opposition_traitement, tr.societe_extras_datapolicy_opposition_prospection';".PHP_EOL;
+				$jsscript .= "var forme_juridique = [".PHP_EOL;
+				$jsscript .= "11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005".PHP_EOL;
+				$jsscript .= "];".PHP_EOL;
+				$jsscript .= "function hideRgPD() {".PHP_EOL;
+				$jsscript .= " if ($('#typent_id').val() == 8 || forme_juridique.indexOf(parseInt($('#forme_juridique_code').val())) > -1) {".PHP_EOL;
+				$jsscript .= " console.log(elementToHide);".PHP_EOL;
+				$jsscript .= " $('tr.societe_extras_datapolicy_consentement, tr.societe_extras_datapolicy_opposition_traitement, tr.societe_extras_datapolicy_opposition_prospection').show(); } else { $('tr.societe_extras_datapolicy_consentement, tr.societe_extras_datapolicy_opposition_traitement, tr.societe_extras_datapolicy_opposition_prospection').hide(); }}".PHP_EOL;
+				$jsscript .= "hideRgPD();".PHP_EOL;
+				$jsscript .= "$('#forme_juridique_code, #typent_id').change(function(){ hideRgPD(); });".PHP_EOL;
+				$jsscript .= '</script>';
+			} elseif (GETPOST('action') == 'confirm_delete' && GETPOST('confirm') == 'yes' && GETPOST('socid') > 0) {
+				// La suppression n'a pas été possible
+				require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+				$societe = new Societe($this->db);
+				$societe->fetch(GETPOST('socid'));
+				// On vérifie si il est utilisé
+				if ((in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $societe->typent_id == 8) && $societe->isObjectUsed(GETPOST('socid'))) {
+					require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+					$form = new Form($this->db);
+					echo $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".GETPOST('socid'), substr($langs->trans("DATAPOLICIES_POPUP_ANONYME_TITLE"), 0, strlen($langs->trans("DATAPOLICIES_POPUP_ANONYME_TITLE")) - 2), $langs->trans("DATAPOLICIES_POPUP_ANONYME_TEXTE"), 'anonymiser', '', '', 1);
+				}
+			}
 
-            if (GETPOST('socid')) {
-                require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-                $societe = new Societe($this->db);
-                $societe->fetch(GETPOST('socid'));
+			if (GETPOST('socid')) {
+				require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+				$societe = new Societe($this->db);
+				$societe->fetch(GETPOST('socid'));
 
-                if (!in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) && $societe->typent_id != 8) {
-                    require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-                    $jsscript .= '<script>';
-                    $jsscript .= "var elementToHide = 'td.societe_extras_datapolicy_opposition_traitement, td.societe_extras_datapolicy_opposition_prospection, td.societe_extras_datapolicy_consentement';".PHP_EOL;
-                    $jsscript .= "$(elementToHide).parent('tr').hide();".PHP_EOL;
-                    $jsscript .= '</script>';
-                }
-            }
-        } elseif ($parameters['currentcontext'] == 'contactcard') {
-            if (GETPOST('action') == 'create' || GETPOST('action') == 'edit') {
-                $jsscript .= '<script>';
-                $jsscript .= "$('#options_datapolicy_opposition_traitement, #options_datapolicy_opposition_prospection, input[name=\"options_datapolicy_opposition_traitement\"], input[name=\"options_datapolicy_opposition_prospection\"]').change(function(){
+				if (!in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) && $societe->typent_id != 8) {
+					require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+					$jsscript .= '<script>';
+					$jsscript .= "var elementToHide = 'td.societe_extras_datapolicy_opposition_traitement, td.societe_extras_datapolicy_opposition_prospection, td.societe_extras_datapolicy_consentement';".PHP_EOL;
+					$jsscript .= "$(elementToHide).parent('tr').hide();".PHP_EOL;
+					$jsscript .= '</script>';
+				}
+			}
+		} elseif ($parameters['currentcontext'] == 'contactcard') {
+			if (GETPOST('action') == 'create' || GETPOST('action') == 'edit') {
+				$jsscript .= '<script>';
+				$jsscript .= "$('#options_datapolicy_opposition_traitement, #options_datapolicy_opposition_prospection, input[name=\"options_datapolicy_opposition_traitement\"], input[name=\"options_datapolicy_opposition_prospection\"]').change(function(){
                     if($('#options_datapolicy_opposition_traitement').prop('checked') == true || $('input[name=options_datapolicy_opposition_traitement]').prop('checked') || $('#options_datapolicy_opposition_prospection').prop('checked') || $('input[name=options_datapolicy_opposition_prospection]').prop('checked')) {
                         $('#no_email').val(1);
                     }
                 });";
-                $jsscript .= '</script>';
-            }
-        }
+				$jsscript .= '</script>';
+			}
+		}
 
-        $this->resprint = $jsscript;
+		$this->resprint = $jsscript;
 
-        return 0;
-    }
+		return 0;
+	}
 }
diff --git a/htdocs/datapolicy/class/datapolicy.class.php b/htdocs/datapolicy/class/datapolicy.class.php
index ff9abcf5dce..6d7b71129f7 100644
--- a/htdocs/datapolicy/class/datapolicy.class.php
+++ b/htdocs/datapolicy/class/datapolicy.class.php
@@ -40,332 +40,332 @@ class DataPolicy
 		$this->db = $db;
 	}
 
-    /**
-     * getAllContactNotInformed
-     *
-     * @return number
-     */
-    public function getAllContactNotInformed()
-    {
-        global $langs, $conf, $db, $user;
+	/**
+	 * getAllContactNotInformed
+	 *
+	 * @return number
+	 */
+	public function getAllContactNotInformed()
+	{
+		global $langs, $conf, $db, $user;
 
-        $langs->load("companies");
+		$langs->load("companies");
 
-        $sql = "SELECT c.rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople_extrafields as spe ON spe.fk_object = c.rowid";
-        $sql .= " WHERE (c.statut=1 AND c.no_email=0 AND (spe.datapolicy_consentement=0 OR spe.datapolicy_consentement IS NULL) AND (spe.datapolicy_opposition_traitement=0 OR spe.datapolicy_opposition_traitement IS NULL) AND (spe.datapolicy_opposition_prospection=0 OR spe.datapolicy_opposition_prospection IS NULL))";
-        $sql .= " AND spe.datapolicy_send IS NULL";
-        $sql .= " AND c.entity=".$conf->entity;
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            $num = $this->db->num_rows($resql);
-            $i = 0;
-            while ($i < $num) {
-                $obj = $this->db->fetch_object($resql);
-                $contact = new Contact($db);
-                $contact->fetch($obj->rowid);
+		$sql = "SELECT c.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople_extrafields as spe ON spe.fk_object = c.rowid";
+		$sql .= " WHERE (c.statut=1 AND c.no_email=0 AND (spe.datapolicy_consentement=0 OR spe.datapolicy_consentement IS NULL) AND (spe.datapolicy_opposition_traitement=0 OR spe.datapolicy_opposition_traitement IS NULL) AND (spe.datapolicy_opposition_prospection=0 OR spe.datapolicy_opposition_prospection IS NULL))";
+		$sql .= " AND spe.datapolicy_send IS NULL";
+		$sql .= " AND c.entity=".$conf->entity;
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num) {
+				$obj = $this->db->fetch_object($resql);
+				$contact = new Contact($db);
+				$contact->fetch($obj->rowid);
 
-                DataPolicy::sendMailDataPolicyContact($contact);
-                $i++;
-            }
-        } else {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+				DataPolicy::sendMailDataPolicyContact($contact);
+				$i++;
+			}
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
-    /**
-     * getAllCompaniesNotInformed
-     *
-     * @return number
-     */
-    public function getAllCompaniesNotInformed()
-    {
-        global $langs, $conf, $db, $user;
+	/**
+	 * getAllCompaniesNotInformed
+	 *
+	 * @return number
+	 */
+	public function getAllCompaniesNotInformed()
+	{
+		global $langs, $conf, $db, $user;
 
-        $langs->load("companies");
+		$langs->load("companies");
 
-        $sql = "SELECT s.rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as se ON se.fk_object = s.rowid";
-        $sql .= " WHERE s.statut=0 AND (se.datapolicy_consentement=0 OR se.datapolicy_consentement IS NULL) AND (se.datapolicy_opposition_traitement=0 OR se.datapolicy_opposition_traitement IS NULL) AND (se.datapolicy_opposition_prospection=0 OR se.datapolicy_opposition_prospection IS NULL)";
-        $sql .= " AND se.datapolicy_send IS NULL";
-        $sql .= " AND s.entity=".$conf->entity;
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            $num = $this->db->num_rows($resql);
-            $i = 0;
-            while ($i < $num) {
-                $obj = $this->db->fetch_object($resql);
-                $societe = new Societe($db);
-                $societe->fetch($obj->rowid);
+		$sql = "SELECT s.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as se ON se.fk_object = s.rowid";
+		$sql .= " WHERE s.statut=0 AND (se.datapolicy_consentement=0 OR se.datapolicy_consentement IS NULL) AND (se.datapolicy_opposition_traitement=0 OR se.datapolicy_opposition_traitement IS NULL) AND (se.datapolicy_opposition_prospection=0 OR se.datapolicy_opposition_prospection IS NULL)";
+		$sql .= " AND se.datapolicy_send IS NULL";
+		$sql .= " AND s.entity=".$conf->entity;
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num) {
+				$obj = $this->db->fetch_object($resql);
+				$societe = new Societe($db);
+				$societe->fetch($obj->rowid);
 
-                DataPolicy::sendMailDataPolicyCompany($societe);
-                $i++;
-            }
-        } else {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+				DataPolicy::sendMailDataPolicyCompany($societe);
+				$i++;
+			}
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
-    /**
-     * getAllAdherentsNotInformed
-     *
-     * @return number
-     */
-    public function getAllAdherentsNotInformed()
-    {
-        global $langs, $conf, $db, $user;
+	/**
+	 * getAllAdherentsNotInformed
+	 *
+	 * @return number
+	 */
+	public function getAllAdherentsNotInformed()
+	{
+		global $langs, $conf, $db, $user;
 
-        $langs->load("adherent");
+		$langs->load("adherent");
 
-        $sql = "SELECT a.rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_extrafields as ae ON ae.fk_object = a.rowid";
-        $sql .= " WHERE a.statut=0 AND (ae.datapolicy_consentement=0 OR ae.datapolicy_consentement IS NULL) AND (ae.datapolicy_opposition_traitement=0 OR ae.datapolicy_opposition_traitement IS NULL) AND (ae.datapolicy_opposition_prospection=0 OR ae.datapolicy_opposition_prospection IS NULL)";
-        $sql .= " AND ae.datapolicy_send IS NULL";
-        $sql .= " AND a.entity=".$conf->entity;
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            $num = $this->db->num_rows($resql);
-            $i = 0;
-            while ($i < $num) {
-                $obj = $this->db->fetch_object($resql);
-                $adherent = new Adherent($db);
-                $adherent->fetch($obj->rowid);
+		$sql = "SELECT a.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_extrafields as ae ON ae.fk_object = a.rowid";
+		$sql .= " WHERE a.statut=0 AND (ae.datapolicy_consentement=0 OR ae.datapolicy_consentement IS NULL) AND (ae.datapolicy_opposition_traitement=0 OR ae.datapolicy_opposition_traitement IS NULL) AND (ae.datapolicy_opposition_prospection=0 OR ae.datapolicy_opposition_prospection IS NULL)";
+		$sql .= " AND ae.datapolicy_send IS NULL";
+		$sql .= " AND a.entity=".$conf->entity;
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num) {
+				$obj = $this->db->fetch_object($resql);
+				$adherent = new Adherent($db);
+				$adherent->fetch($obj->rowid);
 
-                DataPolicy::sendMailDataPolicyAdherent($adherent);
-                $i++;
-            }
-        } else {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+				DataPolicy::sendMailDataPolicyAdherent($adherent);
+				$i++;
+			}
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
-    /**
-     * sendMailDataPolicyContact
-     *
-     * @param 	mixed		$contact		Contact
-     * @return	void
-     */
-    public function sendMailDataPolicyContact($contact)
-    {
-        global $langs, $conf, $db, $user;
+	/**
+	 * sendMailDataPolicyContact
+	 *
+	 * @param 	mixed		$contact		Contact
+	 * @return	void
+	 */
+	public static function sendMailDataPolicyContact($contact)
+	{
+		global $langs, $conf, $db, $user;
 
-        $error = 0;
+		$error = 0;
 
-        $from = $user->getFullName($langs).' <'.$user->email.'>';
+		$from = $user->getFullName($langs).' <'.$user->email.'>';
 
-        $sendto = $contact->email;
-        $code = md5($contact->email);
-        if (!empty($contact->default_lang)) {
-            $l = $contact->default_lang;
-        } else {
-            $l = $langs->defaultlang;
-        }
-        $s = "DATAPOLICIESSUBJECT_".$l;
-        $ma = "DATAPOLICIESCONTENT_".$l;
-        $la = 'TXTLINKDATAPOLICIESACCEPT_'.$l;
-        $lr = 'TXTLINKDATAPOLICIESREFUSE_'.$l;
+		$sendto = $contact->email;
+		$code = md5($contact->email);
+		if (!empty($contact->default_lang)) {
+			$l = $contact->default_lang;
+		} else {
+			$l = $langs->defaultlang;
+		}
+		// TODO Use a dolibarr email template
+		$s = "DATAPOLICIESSUBJECT_".$l;
+		$ma = "DATAPOLICIESCONTENT_".$l;
+		$la = 'TXTLINKDATAPOLICIESACCEPT_'.$l;
+		$lr = 'TXTLINKDATAPOLICIESREFUSE_'.$l;
 
-        $subject = $conf->global->$s;
-        $message = $conf->global->$ma;
-        $linka = $conf->global->$la;
-        $linkr = $conf->global->$lr;
-        $sendtocc = $sendtobcc = '';
-        $filepath = $mimetype = $filename = array();
-        $deliveryreceipt = 0;
+		$subject = $conf->global->$s;
+		$message = $conf->global->$ma;
+		$linka = $conf->global->$la;
+		$linkr = $conf->global->$lr;
+		$sendtocc = $sendtobcc = '';
+		$filepath = $mimetype = $filename = array();
+		$deliveryreceipt = 0;
 
-        $substitutionarray = array(
-            '__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=1&c='.$contact->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linka.'</a>',
-            '__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=2&c='.$contact->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linkr.'</a>',
-            '__FIRSTNAME__' => $contact->firstname,
-            '__NAME__' => $contact->lastname,
-            '__CIVILITY__' => $contact->civility,
-        );
-        $subject = make_substitutions($subject, $substitutionarray);
-        $message = make_substitutions($message, $substitutionarray);
+		$substitutionarray = array(
+			'__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=1&c='.$contact->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linka.'</a>',
+			'__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=2&c='.$contact->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linkr.'</a>',
+			'__FIRSTNAME__' => $contact->firstname,
+			'__NAME__' => $contact->lastname,
+			'__CIVILITY__' => $contact->civility,
+		);
+		$subject = make_substitutions($subject, $substitutionarray);
+		$message = make_substitutions($message, $substitutionarray);
 
-        $actiontypecode = 'AC_EMAIL';
-        $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
-        if ($message) {
-            if ($sendtocc)
-                $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
-                $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
-                $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
-                $actionmsg = dol_concatdesc($actionmsg, $message);
-        }
+		$actiontypecode = 'AC_EMAIL';
+		$actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
+		if ($message) {
+			if ($sendtocc)
+				$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
+				$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
+				$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
+				$actionmsg = dol_concatdesc($actionmsg, $message);
+		}
 
 
-        // Send mail
-        require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-        $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1);
+		// Send mail
+		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+		$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1);
 
-        if ($mailfile->error) {
-            $resultmasssend .= '<div class="error">'.$mailfile->error.'</div>';
-        } else {
-            $result4 = $mailfile->sendfile();
-            if (!$error) {
-                $resultmasssend .= $langs->trans("MailSent").': '.$sendto."<br>";
-                $contact->array_options['options_datapolicy_send'] = date('Y-m-d', time());
-                $contact->update($contact->id);
-            } else {
-                dol_print_error($db);
-            }
-        }
-        setEventMessage($resultmasssend);
-    }
+		if ($mailfile->error) {
+			$resultmasssend .= '<div class="error">'.$mailfile->error.'</div>';
+		} else {
+			$result4 = $mailfile->sendfile();
+			if (!$error) {
+				$resultmasssend .= $langs->trans("MailSent").': '.$sendto."<br>";
+				$contact->array_options['options_datapolicy_send'] = date('Y-m-d', time());
+				$contact->update($contact->id);
+			} else {
+				dol_print_error($db);
+			}
+		}
+		setEventMessage($resultmasssend);
+	}
 
-    /**
-     * sendMailDataPolicyCompany
-     *
-     * @param Societe	$societe	Object societe
-     * @return	void
-     */
-    public function sendMailDataPolicyCompany($societe)
-    {
-        global $langs, $conf, $db, $user;
+	/**
+	 * sendMailDataPolicyCompany
+	 *
+	 * @param Societe	$societe	Object societe
+	 * @return	void
+	 */
+	public static function sendMailDataPolicyCompany($societe)
+	{
+		global $langs, $conf, $db, $user;
 
-        $error = 0;
+		$error = 0;
 
-        $from = $user->getFullName($langs).' <'.$user->email.'>';
+		$from = $user->getFullName($langs).' <'.$user->email.'>';
 
-        $sendto = $societe->email;
+		$sendto = $societe->email;
 
-        $code = md5($societe->email);
-        if (!empty($societe->default_lang)) {
-            $l = $societe->default_lang;
-        } else {
-            $l = $langs->defaultlang;
-        }
-        $s = "DATAPOLICIESSUBJECT_".$l;
-        $ma = "DATAPOLICIESCONTENT_".$l;
-        $la = 'TXTLINKDATAPOLICIESACCEPT_'.$l;
-        $lr = 'TXTLINKDATAPOLICIESREFUSE_'.$l;
+		$code = md5($societe->email);
+		if (!empty($societe->default_lang)) {
+			$l = $societe->default_lang;
+		} else {
+			$l = $langs->defaultlang;
+		}
+		// TODO Use a dolibarr email template
+		$s = "DATAPOLICIESSUBJECT_".$l;
+		$ma = "DATAPOLICIESCONTENT_".$l;
+		$la = 'TXTLINKDATAPOLICIESACCEPT_'.$l;
+		$lr = 'TXTLINKDATAPOLICIESREFUSE_'.$l;
 
-        $subject = $conf->global->$s;
-        $message = $conf->global->$ma;
-        $linka = $conf->global->$la;
-        $linkr = $conf->global->$lr;
-        $sendtocc = $sendtobcc = '';
-        $filepath = $mimetype = $filename = array();
-        $deliveryreceipt = 0;
+		$subject = $conf->global->$s;
+		$message = $conf->global->$ma;
+		$linka = $conf->global->$la;
+		$linkr = $conf->global->$lr;
+		$sendtocc = $sendtobcc = '';
+		$filepath = $mimetype = $filename = array();
+		$deliveryreceipt = 0;
 
-        $substitutionarray = array(
-            '__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=1&s='.$societe->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linka.'</a>',
-            '__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=2&s='.$societe->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linkr.'</a>',
-        );
-        $subject = make_substitutions($subject, $substitutionarray);
-        $message = make_substitutions($message, $substitutionarray);
+		$substitutionarray = array(
+			'__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=1&s='.$societe->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linka.'</a>',
+			'__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=2&s='.$societe->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linkr.'</a>',
+		);
+		$subject = make_substitutions($subject, $substitutionarray);
+		$message = make_substitutions($message, $substitutionarray);
 
-        $actiontypecode = 'AC_EMAIL';
-        $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
-        if ($message)
-        {
-            if ($sendtocc)
-            {
-                 $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
-            }
-            $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
-            $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
-            $actionmsg .= dol_concatdesc($actionmsg, $message);
-        }
+		$actiontypecode = 'AC_EMAIL';
+		$actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
+		if ($message) {
+			if ($sendtocc) {
+				 $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
+			}
+			$actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
+			$actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
+			$actionmsg .= dol_concatdesc($actionmsg, $message);
+		}
 
-        // Send mail
-        require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-        $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1);
-        if ($mailfile->error) {
-            $resultmasssend .= '<div class="error">'.$mailfile->error.'</div>';
-        } else {
-            $result4 = $mailfile->sendfile();
+		// Send mail
+		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+		$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1);
+		if ($mailfile->error) {
+			$resultmasssend .= '<div class="error">'.$mailfile->error.'</div>';
+		} else {
+			$result4 = $mailfile->sendfile();
 
-            if (!$error) {
-                $resultmasssend .= $langs->trans("MailSent").': '.$sendto."<br>";
-                $societe->array_options['options_datapolicy_send'] = date('Y-m-d', time());
-                $societe->update($societe->id);
-            } else {
-                dol_print_error($db);
-            }
-        }
-        setEventMessage($resultmasssend);
-    }
+			if (!$error) {
+				$resultmasssend .= $langs->trans("MailSent").': '.$sendto."<br>";
+				$societe->array_options['options_datapolicy_send'] = date('Y-m-d', time());
+				$societe->update($societe->id);
+			} else {
+				dol_print_error($db);
+			}
+		}
+		setEventMessage($resultmasssend);
+	}
 
-    /**
-     * sendMailDataPolicyAdherent
-     *
-     * @param Adherent	$adherent		Member
-     * @return void
-     */
-    public function sendMailDataPolicyAdherent($adherent)
-    {
-        global $langs, $conf, $db, $user;
+	/**
+	 * sendMailDataPolicyAdherent
+	 *
+	 * @param Adherent	$adherent		Member
+	 * @return void
+	 */
+	public static function sendMailDataPolicyAdherent($adherent)
+	{
+		global $langs, $conf, $db, $user;
 
-        $error = 0;
+		$error = 0;
 
-        $from = $user->getFullName($langs).' <'.$user->email.'>';
+		$from = $user->getFullName($langs).' <'.$user->email.'>';
 
-        $sendto = $adherent->email;
-
-        // TODO Use a dolibarr email template
-        $s = 'TXTLINKDATAPOLICIESSUBJECT_'.$l;
-        $ma = 'TXTLINKDATAPOLICIESMESSAGE_'.$l;
-
-        $code = md5($adherent->email);
-        if (!empty($adherent->default_lang)) {
-            $l = $adherent->default_lang;
-        } else {
-            $l = $langs->defaultlang;
-        }
-        $la = 'TXTLINKDATAPOLICIESACCEPT_'.$l;
-        $lr = 'TXTLINKDATAPOLICIESREFUSE_'.$l;
-
-        $subject = $conf->global->$s;
-        $message = $conf->global->$ma;
-        $linka = $conf->global->$la;
-        $linkr = $conf->global->$lr;
-        $sendtocc = $sendtobcc = '';
-        $filepath = $mimetype = $filename = array();
-        $deliveryreceipt = 0;
-
-        $substitutionarray = array(
-            '__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=1&a='.$adherent->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linka.'</a>',
-            '__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=2&a='.$adherent->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linkr.'</a>',
-        );
-        $subject = make_substitutions($subject, $substitutionarray);
-        $message = make_substitutions($message, $substitutionarray);
-
-        $actiontypecode = 'AC_EMAIL';
-        $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
-        if ($message) {
-            if ($sendtocc) {
-                $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
-            }
-            $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
-            $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
-            $actionmsg .= dol_concatdesc($actionmsg, $message);
-        }
+		$sendto = $adherent->email;
 
 
-        // Send mail
-        require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-        $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1);
-        if ($mailfile->error) {
-            $resultmasssend .= '<div class="error">'.$mailfile->error.'</div>';
-        } else {
-            $result4 = $mailfile->sendfile();
+		$code = md5($adherent->email);
+		if (!empty($adherent->default_lang)) {
+			$l = $adherent->default_lang;
+		} else {
+			$l = $langs->defaultlang;
+		}
+		// TODO Use a dolibarr email template
+		$s = 'TXTLINKDATAPOLICIESSUBJECT_'.$l;
+		$ma = 'TXTLINKDATAPOLICIESMESSAGE_'.$l;
+		$la = 'TXTLINKDATAPOLICIESACCEPT_'.$l;
+		$lr = 'TXTLINKDATAPOLICIESREFUSE_'.$l;
 
-            if (!$error) {
-                $resultmasssend .= $langs->trans("MailSent").': '.$sendto."<br>";
-                $adherent->array_options['options_datapolicy_send'] = date('Y-m-d', time());
-                $adherent->update($user);
-            } else {
-                dol_print_error($db);
-            }
-        }
-        setEventMessage($resultmasssend);
-    }
+		$subject = $conf->global->$s;
+		$message = $conf->global->$ma;
+		$linka = $conf->global->$la;
+		$linkr = $conf->global->$lr;
+		$sendtocc = $sendtobcc = '';
+		$filepath = $mimetype = $filename = array();
+		$deliveryreceipt = 0;
+
+		$substitutionarray = array(
+			'__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=1&a='.$adherent->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linka.'</a>',
+			'__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=2&a='.$adherent->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linkr.'</a>',
+		);
+		$subject = make_substitutions($subject, $substitutionarray);
+		$message = make_substitutions($message, $substitutionarray);
+
+		$actiontypecode = 'AC_EMAIL';
+		$actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
+		if ($message) {
+			if ($sendtocc) {
+				$actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
+			}
+			$actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
+			$actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
+			$actionmsg .= dol_concatdesc($actionmsg, $message);
+		}
+
+
+		// Send mail
+		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+		$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1);
+		if ($mailfile->error) {
+			$resultmasssend .= '<div class="error">'.$mailfile->error.'</div>';
+		} else {
+			$result4 = $mailfile->sendfile();
+
+			if (!$error) {
+				$resultmasssend .= $langs->trans("MailSent").': '.$sendto."<br>";
+				$adherent->array_options['options_datapolicy_send'] = date('Y-m-d', time());
+				$adherent->update($user);
+			} else {
+				dol_print_error($db);
+			}
+		}
+		setEventMessage($resultmasssend);
+	}
 }
diff --git a/htdocs/datapolicy/class/datapolicycron.class.php b/htdocs/datapolicy/class/datapolicycron.class.php
index 280f900f307..e1d8f7c36d4 100644
--- a/htdocs/datapolicy/class/datapolicycron.class.php
+++ b/htdocs/datapolicy/class/datapolicycron.class.php
@@ -38,26 +38,26 @@ class DataPolicyCron
 	}
 
 
-    /**
-     * Function exec
+	/**
+	 * Function exec
 	 * CAN BE A CRON TASK
-     *
+	 *
 	 * @return	int									0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
-     */
+	 */
 	public function cleanDataForDataPolicy()
-    {
-        global $conf, $langs, $user;
+	{
+		global $conf, $langs, $user;
 
-        $langs->load('datapolicy@datapolicy');
+		$langs->load('datapolicy@datapolicy');
 
-        $error = 0;
-        $errormsg = '';
-        $nbupdated = $nbdeleted = 0;
+		$error = 0;
+		$errormsg = '';
+		$nbupdated = $nbdeleted = 0;
 
-        // FIXME Removed hardcoded values of id
-        $arrayofparameters = array(
-            'DATAPOLICIES_TIERS_CLIENT' => array(
-                'sql' => "
+		// FIXME Removed hardcoded values of id
+		$arrayofparameters = array(
+			'DATAPOLICIES_TIERS_CLIENT' => array(
+				'sql' => "
                     SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s
                     WHERE (s.fk_forme_juridique IN (11, 12, 13, 15, 17, 18, 19, 35, 60, 312, 316, 401, 600, 700, 1005) OR s.fk_typent = 8)
                     AND s.entity = %d
@@ -71,28 +71,28 @@ class DataPolicyCron
                         AND a.fk_soc IS NOT NULL
                     )
                 ",
-                "class" => "Societe",
-                "file" => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
-                'fields_anonym' => array(
-                    'name' => $langs->trans('ANONYME'),
-                    'name_bis' => '',
-                    'name_alias' => '',
-                    'address' => '',
-                    'town' => '',
-                    'zip' => '',
-                    'phone' => '',
-                    'email' => '',
-                    'url' => '',
-                    'fax' => '',
-                    'state' => '',
-                    'country' => '',
-                    'state_id' => '',
-                    'skype' => '',
-                    'country_id' => '',
-                )
-            ),
-            'DATAPOLICIES_TIERS_PROSPECT' => array(
-                'sql' => "
+				"class" => "Societe",
+				"file" => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
+				'fields_anonym' => array(
+					'name' => $langs->trans('ANONYME'),
+					'name_bis' => '',
+					'name_alias' => '',
+					'address' => '',
+					'town' => '',
+					'zip' => '',
+					'phone' => '',
+					'email' => '',
+					'url' => '',
+					'fax' => '',
+					'state' => '',
+					'country' => '',
+					'state_id' => '',
+					'skype' => '',
+					'country_id' => '',
+				)
+			),
+			'DATAPOLICIES_TIERS_PROSPECT' => array(
+				'sql' => "
                     SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s
                     WHERE (s.fk_forme_juridique IN (11, 12, 13, 15, 17, 18, 19, 35, 60, 312, 316, 401, 600, 700, 1005) OR s.fk_typent = 8)
                     AND s.entity = %d
@@ -106,28 +106,28 @@ class DataPolicyCron
                         AND a.fk_soc IS NOT NULL
                     )
                 ",
-                "class" => "Societe",
-                "file" => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
-                'fields_anonym' => array(
-                    'name' => $langs->trans('ANONYME'),
-                    'name_bis' => '',
-                    'name_alias' => '',
-                    'address' => '',
-                    'town' => '',
-                    'zip' => '',
-                    'phone' => '',
-                    'email' => '',
-                    'url' => '',
-                    'fax' => '',
-                    'state' => '',
-                    'country' => '',
-                    'state_id' => '',
-                    'skype' => '',
-                    'country_id' => '',
-                )
-            ),
-            'DATAPOLICIES_TIERS_PROSPECT_CLIENT' => array(
-                'sql' => "
+				"class" => "Societe",
+				"file" => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
+				'fields_anonym' => array(
+					'name' => $langs->trans('ANONYME'),
+					'name_bis' => '',
+					'name_alias' => '',
+					'address' => '',
+					'town' => '',
+					'zip' => '',
+					'phone' => '',
+					'email' => '',
+					'url' => '',
+					'fax' => '',
+					'state' => '',
+					'country' => '',
+					'state_id' => '',
+					'skype' => '',
+					'country_id' => '',
+				)
+			),
+			'DATAPOLICIES_TIERS_PROSPECT_CLIENT' => array(
+				'sql' => "
                     SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s
                     WHERE (s.fk_forme_juridique  IN (11, 12, 13, 15, 17, 18, 19, 35, 60, 312, 316, 401, 600, 700, 1005) OR s.fk_typent = 8)
                     AND s.entity = %d
@@ -141,28 +141,28 @@ class DataPolicyCron
                         AND a.fk_soc IS NOT NULL
                     )
                 ",
-                "class" => "Societe",
-                "file" => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
-                'fields_anonym' => array(
-                    'name' => $langs->trans('ANONYME'),
-                    'name_bis' => '',
-                    'name_alias' => '',
-                    'address' => '',
-                    'town' => '',
-                    'zip' => '',
-                    'phone' => '',
-                    'email' => '',
-                    'url' => '',
-                    'fax' => '',
-                    'state' => '',
-                    'country' => '',
-                    'state_id' => '',
-                    'skype' => '',
-                    'country_id' => '',
-                )
-            ),
-            'DATAPOLICIES_TIERS_NIPROSPECT_NICLIENT' => array(
-                'sql' => "
+				"class" => "Societe",
+				"file" => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
+				'fields_anonym' => array(
+					'name' => $langs->trans('ANONYME'),
+					'name_bis' => '',
+					'name_alias' => '',
+					'address' => '',
+					'town' => '',
+					'zip' => '',
+					'phone' => '',
+					'email' => '',
+					'url' => '',
+					'fax' => '',
+					'state' => '',
+					'country' => '',
+					'state_id' => '',
+					'skype' => '',
+					'country_id' => '',
+				)
+			),
+			'DATAPOLICIES_TIERS_NIPROSPECT_NICLIENT' => array(
+				'sql' => "
                     SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s
                     WHERE (s.fk_forme_juridique  IN (11, 12, 13, 15, 17, 18, 19, 35, 60, 312, 316, 401, 600, 700, 1005) OR s.fk_typent = 8)
                     AND s.entity = %d
@@ -176,28 +176,28 @@ class DataPolicyCron
                         AND a.fk_soc IS NOT NULL
                     )
                 ",
-                "class" => "Societe",
-                "file" => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
-                'fields_anonym' => array(
-                    'name' => $langs->trans('ANONYME'),
-                    'name_bis' => '',
-                    'name_alias' => '',
-                    'address' => '',
-                    'town' => '',
-                    'zip' => '',
-                    'phone' => '',
-                    'email' => '',
-                    'url' => '',
-                    'fax' => '',
-                    'state' => '',
-                    'country' => '',
-                    'state_id' => '',
-                    'skype' => '',
-                    'country_id' => '',
-                )
-            ),
-            'DATAPOLICIES_TIERS_FOURNISSEUR' => array(
-                'sql' => "
+				"class" => "Societe",
+				"file" => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
+				'fields_anonym' => array(
+					'name' => $langs->trans('ANONYME'),
+					'name_bis' => '',
+					'name_alias' => '',
+					'address' => '',
+					'town' => '',
+					'zip' => '',
+					'phone' => '',
+					'email' => '',
+					'url' => '',
+					'fax' => '',
+					'state' => '',
+					'country' => '',
+					'state_id' => '',
+					'skype' => '',
+					'country_id' => '',
+				)
+			),
+			'DATAPOLICIES_TIERS_FOURNISSEUR' => array(
+				'sql' => "
                     SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s
                     WHERE (s.fk_forme_juridique  IN (11, 12, 13, 15, 17, 18, 19, 35, 60, 312, 316, 401, 600, 700, 1005) OR s.fk_typent = 8)
                     AND s.entity = %d
@@ -210,28 +210,28 @@ class DataPolicyCron
                         AND a.fk_contact IS NOT NULL
                     )
                 ",
-                "class" => "Societe",
-                "file" => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
-                'fields_anonym' => array(
-                    'name' => $langs->trans('ANONYME'),
-                    'name_bis' => '',
-                    'name_alias' => '',
-                    'address' => '',
-                    'town' => '',
-                    'zip' => '',
-                    'phone' => '',
-                    'email' => '',
-                    'url' => '',
-                    'fax' => '',
-                    'state' => '',
-                    'country' => '',
-                    'state_id' => '',
-                    'skype' => '',
-                    'country_id' => '',
-                )
-            ),
-            'DATAPOLICIES_CONTACT_CLIENT' => array(
-                'sql' => "
+				"class" => "Societe",
+				"file" => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
+				'fields_anonym' => array(
+					'name' => $langs->trans('ANONYME'),
+					'name_bis' => '',
+					'name_alias' => '',
+					'address' => '',
+					'town' => '',
+					'zip' => '',
+					'phone' => '',
+					'email' => '',
+					'url' => '',
+					'fax' => '',
+					'state' => '',
+					'country' => '',
+					'state_id' => '',
+					'skype' => '',
+					'country_id' => '',
+				)
+			),
+			'DATAPOLICIES_CONTACT_CLIENT' => array(
+				'sql' => "
                     SELECT c.rowid FROM ".MAIN_DB_PREFIX."socpeople as c
                     INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc
                     WHERE c.entity = %d
@@ -245,32 +245,32 @@ class DataPolicyCron
                         AND a.fk_contact IS NOT NULL
                     )
                 ",
-                "class" => "Contact",
-                "file" => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
-                'fields_anonym' => array(
-                    'lastname' => $langs->trans('ANONYME'),
-                    'firstname' => '',
-                    'civility_id' => '',
-                    'poste' => '',
-                    'address' => '',
-                    'town' => '',
-                    'zip' => '',
-                    'phone_pro' => '',
-                    'phone_perso' => '',
-                    'phone_mobile' => '',
-                    'email' => '',
-                    'url' => '',
-                    'fax' => '',
-                    'state' => '',
-                    'country' => '',
-                    'state_id' => '',
-                    'skype' => '',
-                    'jabberid' => '',
-                    'country_id' => '',
-                )
-            ),
-            'DATAPOLICIES_CONTACT_PROSPECT' => array(
-                'sql' => "
+				"class" => "Contact",
+				"file" => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
+				'fields_anonym' => array(
+					'lastname' => $langs->trans('ANONYME'),
+					'firstname' => '',
+					'civility_id' => '',
+					'poste' => '',
+					'address' => '',
+					'town' => '',
+					'zip' => '',
+					'phone_pro' => '',
+					'phone_perso' => '',
+					'phone_mobile' => '',
+					'email' => '',
+					'url' => '',
+					'fax' => '',
+					'state' => '',
+					'country' => '',
+					'state_id' => '',
+					'skype' => '',
+					'jabberid' => '',
+					'country_id' => '',
+				)
+			),
+			'DATAPOLICIES_CONTACT_PROSPECT' => array(
+				'sql' => "
                     SELECT c.rowid FROM ".MAIN_DB_PREFIX."socpeople as c
                     INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc
                     WHERE c.entity = %d
@@ -284,32 +284,32 @@ class DataPolicyCron
                         AND a.fk_contact IS NOT NULL
                     )
                 ",
-                "class" => "Contact",
-                "file" => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
-                'fields_anonym' => array(
-                    'lastname' => $langs->trans('ANONYME'),
-                    'firstname' => '',
-                    'civility_id' => '',
-                    'poste' => '',
-                    'address' => '',
-                    'town' => '',
-                    'zip' => '',
-                    'phone_pro' => '',
-                    'phone_perso' => '',
-                    'phone_mobile' => '',
-                    'email' => '',
-                    'url' => '',
-                    'fax' => '',
-                    'state' => '',
-                    'country' => '',
-                    'state_id' => '',
-                    'skype' => '',
-                    'jabberid' => '',
-                    'country_id' => '',
-                )
-            ),
-            'DATAPOLICIES_CONTACT_PROSPECT_CLIENT' => array(
-                'sql' => "
+				"class" => "Contact",
+				"file" => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
+				'fields_anonym' => array(
+					'lastname' => $langs->trans('ANONYME'),
+					'firstname' => '',
+					'civility_id' => '',
+					'poste' => '',
+					'address' => '',
+					'town' => '',
+					'zip' => '',
+					'phone_pro' => '',
+					'phone_perso' => '',
+					'phone_mobile' => '',
+					'email' => '',
+					'url' => '',
+					'fax' => '',
+					'state' => '',
+					'country' => '',
+					'state_id' => '',
+					'skype' => '',
+					'jabberid' => '',
+					'country_id' => '',
+				)
+			),
+			'DATAPOLICIES_CONTACT_PROSPECT_CLIENT' => array(
+				'sql' => "
                     SELECT c.rowid FROM ".MAIN_DB_PREFIX."socpeople as c
                     INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc
                     WHERE c.entity = %d
@@ -323,32 +323,32 @@ class DataPolicyCron
                         AND a.fk_contact IS NOT NULL
                     )
                 ",
-                "class" => "Contact",
-                "file" => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
-                'fields_anonym' => array(
-                    'lastname' => $langs->trans('ANONYME'),
-                    'firstname' => '',
-                    'civility_id' => '',
-                    'poste' => '',
-                    'address' => '',
-                    'town' => '',
-                    'zip' => '',
-                    'phone_pro' => '',
-                    'phone_perso' => '',
-                    'phone_mobile' => '',
-                    'email' => '',
-                    'url' => '',
-                    'fax' => '',
-                    'state' => '',
-                    'country' => '',
-                    'state_id' => '',
-                    'skype' => '',
-                    'jabberid' => '',
-                    'country_id' => '',
-                )
-            ),
-            'DATAPOLICIES_CONTACT_NIPROSPECT_NICLIENT' => array(
-                'sql' => "
+				"class" => "Contact",
+				"file" => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
+				'fields_anonym' => array(
+					'lastname' => $langs->trans('ANONYME'),
+					'firstname' => '',
+					'civility_id' => '',
+					'poste' => '',
+					'address' => '',
+					'town' => '',
+					'zip' => '',
+					'phone_pro' => '',
+					'phone_perso' => '',
+					'phone_mobile' => '',
+					'email' => '',
+					'url' => '',
+					'fax' => '',
+					'state' => '',
+					'country' => '',
+					'state_id' => '',
+					'skype' => '',
+					'jabberid' => '',
+					'country_id' => '',
+				)
+			),
+			'DATAPOLICIES_CONTACT_NIPROSPECT_NICLIENT' => array(
+				'sql' => "
                     SELECT c.rowid FROM ".MAIN_DB_PREFIX."socpeople as c
                     INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc
                     WHERE c.entity = %d
@@ -362,32 +362,32 @@ class DataPolicyCron
                         AND a.fk_contact IS NOT NULL
                     )
                 ",
-                "class" => "Contact",
-                "file" => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
-                'fields_anonym' => array(
-                    'lastname' => $langs->trans('ANONYME'),
-                    'firstname' => '',
-                    'civility_id' => '',
-                    'poste' => '',
-                    'address' => '',
-                    'town' => '',
-                    'zip' => '',
-                    'phone_pro' => '',
-                    'phone_perso' => '',
-                    'phone_mobile' => '',
-                    'email' => '',
-                    'url' => '',
-                    'fax' => '',
-                    'state' => '',
-                    'country' => '',
-                    'state_id' => '',
-                    'skype' => '',
-                    'jabberid' => '',
-                    'country_id' => '',
-                )
-            ),
-            'DATAPOLICIES_CONTACT_FOURNISSEUR' => array(
-                'sql' => "
+				"class" => "Contact",
+				"file" => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
+				'fields_anonym' => array(
+					'lastname' => $langs->trans('ANONYME'),
+					'firstname' => '',
+					'civility_id' => '',
+					'poste' => '',
+					'address' => '',
+					'town' => '',
+					'zip' => '',
+					'phone_pro' => '',
+					'phone_perso' => '',
+					'phone_mobile' => '',
+					'email' => '',
+					'url' => '',
+					'fax' => '',
+					'state' => '',
+					'country' => '',
+					'state_id' => '',
+					'skype' => '',
+					'jabberid' => '',
+					'country_id' => '',
+				)
+			),
+			'DATAPOLICIES_CONTACT_FOURNISSEUR' => array(
+				'sql' => "
                     SELECT c.rowid FROM ".MAIN_DB_PREFIX."socpeople as c
                     INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc
                     WHERE c.entity = %d
@@ -400,32 +400,32 @@ class DataPolicyCron
                         AND a.fk_contact IS NOT NULL
                     )
                 ",
-                "class" => "Contact",
-                "file" => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
-                'fields_anonym' => array(
-                    'lastname' => $langs->trans('ANONYME'),
-                    'firstname' => '',
-                    'civility_id' => '',
-                    'poste' => '',
-                    'address' => '',
-                    'town' => '',
-                    'zip' => '',
-                    'phone_pro' => '',
-                    'phone_perso' => '',
-                    'phone_mobile' => '',
-                    'email' => '',
-                    'url' => '',
-                    'fax' => '',
-                    'state' => '',
-                    'country' => '',
-                    'state_id' => '',
-                    'skype' => '',
-                    'jabberid' => '',
-                    'country_id' => '',
-                )
-            ),
-            'DATAPOLICIES_ADHERENT' => array(
-                'sql' => "
+				"class" => "Contact",
+				"file" => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
+				'fields_anonym' => array(
+					'lastname' => $langs->trans('ANONYME'),
+					'firstname' => '',
+					'civility_id' => '',
+					'poste' => '',
+					'address' => '',
+					'town' => '',
+					'zip' => '',
+					'phone_pro' => '',
+					'phone_perso' => '',
+					'phone_mobile' => '',
+					'email' => '',
+					'url' => '',
+					'fax' => '',
+					'state' => '',
+					'country' => '',
+					'state_id' => '',
+					'skype' => '',
+					'jabberid' => '',
+					'country_id' => '',
+				)
+			),
+			'DATAPOLICIES_ADHERENT' => array(
+				'sql' => "
                     SELECT a.rowid FROM ".MAIN_DB_PREFIX."adherent as a
                     WHERE a.entity = %d
                     AND a.tms < DATE_SUB(NOW(), INTERVAL %d MONTH)
@@ -437,109 +437,109 @@ class DataPolicyCron
                         AND a.fk_element IS NOT NULL
                     )
                 ",
-                "class" => "Adherent",
-                "file" => DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php',
-                'fields_anonym' => array(
-                    'lastname' => $langs->trans('ANONYME'),
-                    'firstname' => $langs->trans('ANONYME'),
-                    'civility_id' => '',
-                    'societe' => '',
-                    'address' => '',
-                    'town' => '',
-                    'zip' => '',
-                    'phone' => '',
-                    'phone_perso' => '',
-                    'phone_mobile' => '',
-                    'email' => '',
-                    'url' => '',
-                    'fax' => '',
-                    'state' => '',
-                    'country' => '',
-                    'state_id' => '',
-                    'skype' => '',
-                    'country_id' => '',
-                )
-            ),
-        );
+				"class" => "Adherent",
+				"file" => DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php',
+				'fields_anonym' => array(
+					'lastname' => $langs->trans('ANONYME'),
+					'firstname' => $langs->trans('ANONYME'),
+					'civility_id' => '',
+					'societe' => '',
+					'address' => '',
+					'town' => '',
+					'zip' => '',
+					'phone' => '',
+					'phone_perso' => '',
+					'phone_mobile' => '',
+					'email' => '',
+					'url' => '',
+					'fax' => '',
+					'state' => '',
+					'country' => '',
+					'state_id' => '',
+					'skype' => '',
+					'country_id' => '',
+				)
+			),
+		);
 
-        $this->db->begin();
+		$this->db->begin();
 
-        foreach ($arrayofparameters as $key => $params)
-        {
-            if ($conf->global->$key != '' && is_numeric($conf->global->$key) && (int) $conf->global->$key > 0)
-            {
-                $sql = sprintf($params['sql'], (int) $conf->entity, (int) $conf->global->$key, (int) $conf->global->$key);
+		foreach ($arrayofparameters as $key => $params)
+		{
+			if ($conf->global->$key != '' && is_numeric($conf->global->$key) && (int) $conf->global->$key > 0)
+			{
+				$sql = sprintf($params['sql'], (int) $conf->entity, (int) $conf->global->$key, (int) $conf->global->$key);
 
-                $resql = $this->db->query($sql);
+				$resql = $this->db->query($sql);
 
-                if ($resql && $this->db->num_rows($resql) > 0)
-                {
-                    $num = $this->db->num_rows($resql);
-                    $i = 0;
+				if ($resql && $this->db->num_rows($resql) > 0)
+				{
+					$num = $this->db->num_rows($resql);
+					$i = 0;
 
-                    require_once $params['file'];
-                    $object = new $params['class']($this->db);
+					require_once $params['file'];
+					$object = new $params['class']($this->db);
 
-                    while ($i < $num && !$error)
-                    {
-                        $obj = $this->db->fetch_object($resql);
+					while ($i < $num && !$error)
+					{
+						$obj = $this->db->fetch_object($resql);
 
-                        $object->fetch($obj->rowid);
-                        $object->id = $obj->rowid;
+						$object->fetch($obj->rowid);
+						$object->id = $obj->rowid;
 
-                        if ($object->isObjectUsed($obj->rowid) > 0)			// If object to clean is used
-                        {
-                            foreach ($params['fields_anonym'] as $fields => $val) {
-                                $object->$fields = $val;
-                            }
-                            $result = $object->update($obj->rowid, $user);
-                            if ($result > 0)
-                            {
-	                            if ($params['class'] == 'Societe') {
-	                                // We delete contacts of thirdparty
-	                                $sql = "DELETE FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$obj->rowid;
-	                                $result = $this->db->query($sql);
-	                                if ($result < 0)
-	                                {
-	                                	$errormsg = $this->db->lasterror();
-	                                	$error++;
-	                                }
-	                            }
-                            } else {
-                            	$errormsg = $object->error;
-                            	$error++;
-                            }
-                            $nbupdated++;
-                        } else {											// If object to clean is not used
-                            if ($object->element == 'adherent') {
-                            	$result = $object->delete($obj->rowid, $user);
-                            } else {
-                            	$result = $object->delete($user);
-                            }
-                            if ($result < 0)
-                            {
-                            	$errormsg = $object->error;
-                            	$error++;
-                            }
+						if ($object->isObjectUsed($obj->rowid) > 0)			// If object to clean is used
+						{
+							foreach ($params['fields_anonym'] as $fields => $val) {
+								$object->$fields = $val;
+							}
+							$result = $object->update($obj->rowid, $user);
+							if ($result > 0)
+							{
+								if ($params['class'] == 'Societe') {
+									// We delete contacts of thirdparty
+									$sql = "DELETE FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$obj->rowid;
+									$result = $this->db->query($sql);
+									if ($result < 0)
+									{
+										$errormsg = $this->db->lasterror();
+										$error++;
+									}
+								}
+							} else {
+								$errormsg = $object->error;
+								$error++;
+							}
+							$nbupdated++;
+						} else {											// If object to clean is not used
+							if ($object->element == 'adherent') {
+								$result = $object->delete($obj->rowid, $user);
+							} else {
+								$result = $object->delete($user);
+							}
+							if ($result < 0)
+							{
+								$errormsg = $object->error;
+								$error++;
+							}
 
-                            $nbdeleted++;
-                        }
+							$nbdeleted++;
+						}
 
-                        $i++;
-                    }
-                }
-            }
-        }
+						$i++;
+					}
+				}
+			}
+		}
 
-        $this->db->commit();
+		$this->db->commit();
 
-        if (!$error)
-        {
-        	$this->output = $nbupdated.' record updated, '.$nbdeleted.' record deleted';
-        } else {
-        	$this->error = $errormsg;
-        }
+		if (!$error)
+		{
+			$this->output = $nbupdated.' record updated, '.$nbdeleted.' record deleted';
+		} else {
+			$this->error = $errormsg;
+		}
 
-        return 0;
-    }
+		return 0;
+	}
 }
diff --git a/htdocs/datapolicy/lib/datapolicy.lib.php b/htdocs/datapolicy/lib/datapolicy.lib.php
index 57f34320d9b..02ac575047e 100644
--- a/htdocs/datapolicy/lib/datapolicy.lib.php
+++ b/htdocs/datapolicy/lib/datapolicy.lib.php
@@ -29,28 +29,28 @@
  */
 function datapolicyAdminPrepareHead()
 {
-    global $langs, $conf;
+	global $langs, $conf;
 
-    $langs->load("datapolicy@datapolicy");
+	$langs->load("datapolicy@datapolicy");
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT."/datapolicy/admin/setup.php";
-    $head[$h][1] = $langs->trans("Deletion");
-    $head[$h][2] = 'settings';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/datapolicy/admin/setup.php";
+	$head[$h][1] = $langs->trans("Deletion");
+	$head[$h][2] = 'settings';
+	$h++;
 
-    if (!empty($conf->global->DATAPOLICIES_ENABLE_EMAILS)) {
-        $head[$h][0] = DOL_URL_ROOT."/datapolicy/admin/setupmail.php";
-        $head[$h][1] = $langs->trans("DATAPOLICIESMail");
-        $head[$h][2] = 'settings';
-        $h++;
-    }
+	if (!empty($conf->global->DATAPOLICIES_ENABLE_EMAILS)) {
+		$head[$h][0] = DOL_URL_ROOT."/datapolicy/admin/setupmail.php";
+		$head[$h][1] = $langs->trans("DATAPOLICIESMail");
+		$head[$h][2] = 'settings';
+		$h++;
+	}
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'datapolicy');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'datapolicy');
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'datapolicy', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'datapolicy', 'remove');
 
-    return $head;
+	return $head;
 }
diff --git a/htdocs/datapolicy/public/index.php b/htdocs/datapolicy/public/index.php
index 079bcd340da..0930d7d07d7 100644
--- a/htdocs/datapolicy/public/index.php
+++ b/htdocs/datapolicy/public/index.php
@@ -23,11 +23,11 @@
  */
 
 if (!defined('NOLOGIN'))
-    define("NOLOGIN", 1); // This means this output page does not require to be logged.
+	define("NOLOGIN", 1); // This means this output page does not require to be logged.
 if (!defined('NOCSRFCHECK'))
-    define('NOCSRFCHECK', '1'); // Do not check anti CSRF attack test
+	define('NOCSRFCHECK', '1'); // Do not check anti CSRF attack test
 if (!defined('NOREQUIREMENU'))
-    define('NOREQUIREMENU', '1');
+	define('NOREQUIREMENU', '1');
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
@@ -48,73 +48,73 @@ $ref = "DATAPOLICIESREFUSE_".$lang;
 $langs->load('datapolicy@datapolicy', 0, 0, $lang);
 
 if (empty($action) || (empty($idc) && empty($ids) && empty($ida))) {
-    return 0;
+	return 0;
 } elseif (!empty($idc)) {
-    $contact = new Contact($db);
-    $contact->fetch($idc);
-    $check = md5($contact->email);
-    if ($check != $code) {
-        $return = $langs->trans('ErrorEmailDATAPOLICIES');
-    } elseif ($action == 1) {
-        $contact->array_options['options_datapolicy_consentement'] = 1;
-        $contact->array_options['options_datapolicy_opposition_traitement'] = 0;
-        $contact->array_options['options_datapolicy_opposition_prospection'] = 0;
-        $contact->array_options['options_datapolicy_date'] = date('Y-m-d', time());
+	$contact = new Contact($db);
+	$contact->fetch($idc);
+	$check = md5($contact->email);
+	if ($check != $code) {
+		$return = $langs->trans('ErrorEmailDATAPOLICIES');
+	} elseif ($action == 1) {
+		$contact->array_options['options_datapolicy_consentement'] = 1;
+		$contact->array_options['options_datapolicy_opposition_traitement'] = 0;
+		$contact->array_options['options_datapolicy_opposition_prospection'] = 0;
+		$contact->array_options['options_datapolicy_date'] = date('Y-m-d', time());
 
-        $return = $conf->global->$acc;
-    } elseif ($action == 2) {
-        $contact->no_email = 1;
-        $contact->array_options['options_datapolicy_consentement'] = 0;
-        $contact->array_options['options_datapolicy_opposition_traitement'] = 1;
-        $contact->array_options['options_datapolicy_opposition_prospection'] = 1;
-        $contact->array_options['options_datapolicy_date'] = date('Y-m-d', time());
+		$return = $conf->global->$acc;
+	} elseif ($action == 2) {
+		$contact->no_email = 1;
+		$contact->array_options['options_datapolicy_consentement'] = 0;
+		$contact->array_options['options_datapolicy_opposition_traitement'] = 1;
+		$contact->array_options['options_datapolicy_opposition_prospection'] = 1;
+		$contact->array_options['options_datapolicy_date'] = date('Y-m-d', time());
 
-        $return = $conf->global->$ref;
-    }
-    $contact->update($idc);
+		$return = $conf->global->$ref;
+	}
+	$contact->update($idc);
 } elseif (!empty($ids)) {
-    $societe = new Societe($db);
-    $societe->fetch($ids);
-    $check = md5($societe->email);
-    if ($check != $code) {
-        $return = $langs->trans('ErrorEmailDATAPOLICIES');
-    } elseif ($action == 1) {
-        $societe->array_options['options_datapolicy_consentement'] = 1;
-        $societe->array_options['options_datapolicy_opposition_traitement'] = 0;
-        $societe->array_options['options_datapolicy_opposition_prospection'] = 0;
-        $societe->array_options['options_datapolicy_date'] = date('Y-m-d', time());
-        $return = $conf->global->$acc;
-    } elseif ($action == 2) {
-        $societe->array_options['options_datapolicy_consentement'] = 0;
-        $societe->array_options['options_datapolicy_opposition_traitement'] = 1;
-        $societe->array_options['options_datapolicy_opposition_prospection'] = 1;
-        $societe->array_options['options_datapolicy_date'] = date('Y-m-d', time());
+	$societe = new Societe($db);
+	$societe->fetch($ids);
+	$check = md5($societe->email);
+	if ($check != $code) {
+		$return = $langs->trans('ErrorEmailDATAPOLICIES');
+	} elseif ($action == 1) {
+		$societe->array_options['options_datapolicy_consentement'] = 1;
+		$societe->array_options['options_datapolicy_opposition_traitement'] = 0;
+		$societe->array_options['options_datapolicy_opposition_prospection'] = 0;
+		$societe->array_options['options_datapolicy_date'] = date('Y-m-d', time());
+		$return = $conf->global->$acc;
+	} elseif ($action == 2) {
+		$societe->array_options['options_datapolicy_consentement'] = 0;
+		$societe->array_options['options_datapolicy_opposition_traitement'] = 1;
+		$societe->array_options['options_datapolicy_opposition_prospection'] = 1;
+		$societe->array_options['options_datapolicy_date'] = date('Y-m-d', time());
 
-        $return = $conf->global->$ref;
-    }
-    $societe->update($ids);
+		$return = $conf->global->$ref;
+	}
+	$societe->update($ids);
 } elseif (!empty($ida)) {
-    $adherent = new Adherent($db);
-    $adherent->fetch($ida);
-    $check = md5($adherent->email);
-    if ($check != $code) {
-        $return = $langs->trans('ErrorEmailDATAPOLICIES');
-    } elseif ($action == 1) {
-        $adherent->array_options['options_datapolicy_consentement'] = 1;
-        $adherent->array_options['options_datapolicy_opposition_traitement'] = 0;
-        $adherent->array_options['options_datapolicy_opposition_prospection'] = 0;
-        //$adherent->array_options['options_datapolicy_date'] = date('Y-m-d', time());
-        $return = $conf->global->$acc;
-    } elseif ($action == 2) {
-        $adherent->array_options['options_datapolicy_consentement'] = 0;
-        $adherent->array_options['options_datapolicy_opposition_traitement'] = 1;
-        $adherent->array_options['options_datapolicy_opposition_prospection'] = 1;
-        //$adherent->array_options['options_datapolicy_date'] = date('Y-m-d', time());
+	$adherent = new Adherent($db);
+	$adherent->fetch($ida);
+	$check = md5($adherent->email);
+	if ($check != $code) {
+		$return = $langs->trans('ErrorEmailDATAPOLICIES');
+	} elseif ($action == 1) {
+		$adherent->array_options['options_datapolicy_consentement'] = 1;
+		$adherent->array_options['options_datapolicy_opposition_traitement'] = 0;
+		$adherent->array_options['options_datapolicy_opposition_prospection'] = 0;
+		//$adherent->array_options['options_datapolicy_date'] = date('Y-m-d', time());
+		$return = $conf->global->$acc;
+	} elseif ($action == 2) {
+		$adherent->array_options['options_datapolicy_consentement'] = 0;
+		$adherent->array_options['options_datapolicy_opposition_traitement'] = 1;
+		$adherent->array_options['options_datapolicy_opposition_prospection'] = 1;
+		//$adherent->array_options['options_datapolicy_date'] = date('Y-m-d', time());
 
-        $return = $conf->global->$ref;
-    }
-    $newuser = new User($db);
-    $adherent->update($newuser);
+		$return = $conf->global->$ref;
+	}
+	$newuser = new User($db);
+	$adherent->update($newuser);
 }
 
 header("Content-type: text/html; charset=".$conf->file->character_set_client);
diff --git a/htdocs/dav/dav.class.php b/htdocs/dav/dav.class.php
index 195f8e800a7..3a73f61c70c 100644
--- a/htdocs/dav/dav.class.php
+++ b/htdocs/dav/dav.class.php
@@ -34,14 +34,14 @@ class CdavLib
 
 	private $langs;
 
-    /**
-     * Constructor
-     *
-     * @param   User        $user   user
-     * @param   DoliDB      $db     Database handler
-     * @param   Translate   $langs  translation
-     */
-    public function __construct($user, $db, $langs)
+	/**
+	 * Constructor
+	 *
+	 * @param   User        $user   user
+	 * @param   DoliDB      $db     Database handler
+	 * @param   Translate   $langs  translation
+	 */
+	public function __construct($user, $db, $langs)
 	{
 		$this->user = $user;
 		$this->db = $db;
@@ -231,15 +231,15 @@ class CdavLib
 		return $caldata;
 	}
 
-    /**
-     * getFullCalendarObjects
-     *
-     * @param int	 	$calendarId			Calendar id
-     * @param int		$bCalendarData		Add calendar data
-     * @return array|string[][]
-     */
-    public function getFullCalendarObjects($calendarId, $bCalendarData)
-    {
+	/**
+	 * getFullCalendarObjects
+	 *
+	 * @param int	 	$calendarId			Calendar id
+	 * @param int		$bCalendarData		Add calendar data
+	 * @return array|string[][]
+	 */
+	public function getFullCalendarObjects($calendarId, $bCalendarData)
+	{
 		$calid = ($calendarId * 1);
 		$calevents = array();
 
diff --git a/htdocs/dav/fileserver.php b/htdocs/dav/fileserver.php
index 18b8bc8b07c..bd6df769553 100644
--- a/htdocs/dav/fileserver.php
+++ b/htdocs/dav/fileserver.php
@@ -194,8 +194,8 @@ $server->addPlugin($lockPlugin);
 // Support for html frontend
 if (empty($conf->global->DAV_DISABLE_BROWSER))
 {
-    $browser = new \Sabre\DAV\Browser\Plugin();
-    $server->addPlugin($browser);
+	$browser = new \Sabre\DAV\Browser\Plugin();
+	$server->addPlugin($browser);
 }
 
 // Automatically guess (some) contenttypes, based on extension
diff --git a/htdocs/debugbar/class/DataCollector/DolConfigCollector.php b/htdocs/debugbar/class/DataCollector/DolConfigCollector.php
index a21693ef327..715d20abcf9 100644
--- a/htdocs/debugbar/class/DataCollector/DolConfigCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolConfigCollector.php
@@ -76,8 +76,8 @@ class DolConfigCollector extends ConfigCollector
 	 */
 	protected function objectToArray($obj)
 	{
-	    // phpcs:enable
-	    $arr = array();
+		// phpcs:enable
+		$arr = array();
 		$_arr = is_object($obj) ? get_object_vars($obj) : $obj;
 		foreach ($_arr as $key => $val) {
 			$val = (is_array($val) || is_object($val)) ? $this->objectToArray($val) : $val;
diff --git a/htdocs/debugbar/class/DataCollector/DolLogsCollector.php b/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
index 1ff336a16b8..626b4ec2613 100644
--- a/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
@@ -76,22 +76,22 @@ class DolLogsCollector extends MessagesCollector
 
 		if ($uselogfile)
 		{
-    		$this->getStorageLogs($this->path);
+			$this->getStorageLogs($this->path);
 		} else {
-    	    $log_levels = $this->getLevels();
+			$log_levels = $this->getLevels();
 
-    	    foreach ($conf->logbuffer as $line) {
-    	        if ($this->nboflines >= $this->maxnboflines)
-    	        {
-    	            break;
-    	        }
-    	        foreach ($log_levels as $level_key => $level) {
-    	            if (strpos(strtolower($line), strtolower($level_key)) == 20) {
-    	                $this->nboflines++;
-    	                $this->addMessage($line, $level, false);
-    	            }
-    	        }
-    	    }
+			foreach ($conf->logbuffer as $line) {
+				if ($this->nboflines >= $this->maxnboflines)
+				{
+					break;
+				}
+				foreach ($log_levels as $level_key => $level) {
+					if (strpos(strtolower($line), strtolower($level_key)) == 20) {
+						$this->nboflines++;
+						$this->addMessage($line, $level, false);
+					}
+				}
+			}
 		}
 
 		return parent::collect();
@@ -104,9 +104,9 @@ class DolLogsCollector extends MessagesCollector
 	 */
 	public function getLogsFile()
 	{
-	    // default dolibarr log file
-	    $path = DOL_DATA_ROOT.'/dolibarr.log';
-	    return $path;
+		// default dolibarr log file
+		$path = DOL_DATA_ROOT.'/dolibarr.log';
+		return $path;
 	}
 
 	/**
@@ -117,16 +117,16 @@ class DolLogsCollector extends MessagesCollector
 	 */
 	public function getStorageLogs($path)
 	{
-	    if (!file_exists($path)) {
-	        return;
-	    }
+		if (!file_exists($path)) {
+			return;
+		}
 
-	    // Load the latest lines
-	    $file = implode("", $this->tailFile($path, $this->maxnboflines));
+		// Load the latest lines
+		$file = implode("", $this->tailFile($path, $this->maxnboflines));
 
-	    foreach ($this->getLogs($file) as $log) {
-	        $this->addMessage($log['line'], $log['level'], false);
-	    }
+		foreach ($this->getLogs($file) as $log) {
+			$this->addMessage($log['line'], $log['level'], false);
+		}
 	}
 
 	/**
@@ -138,32 +138,32 @@ class DolLogsCollector extends MessagesCollector
 	 */
 	protected function tailFile($file, $lines)
 	{
-	    $handle = fopen($file, "r");
-	    $linecounter = $lines;
-	    $pos = -2;
-	    $beginning = false;
-	    $text = array();
-	    while ($linecounter > 0) {
-	        $t = " ";
-	        while ($t != "\n") {
-	            if (fseek($handle, $pos, SEEK_END) == -1) {
-	                $beginning = true;
-	                break;
-	            }
-	            $t = fgetc($handle);
-	            $pos--;
-	        }
-	        $linecounter--;
-	        if ($beginning) {
-	            rewind($handle);
-	        }
-	        $text[$lines - $linecounter - 1] = fgets($handle);
-	        if ($beginning) {
-	            break;
-	        }
-	    }
-	    fclose($handle);
-	    return array_reverse($text);
+		$handle = fopen($file, "r");
+		$linecounter = $lines;
+		$pos = -2;
+		$beginning = false;
+		$text = array();
+		while ($linecounter > 0) {
+			$t = " ";
+			while ($t != "\n") {
+				if (fseek($handle, $pos, SEEK_END) == -1) {
+					$beginning = true;
+					break;
+				}
+				$t = fgetc($handle);
+				$pos--;
+			}
+			$linecounter--;
+			if ($beginning) {
+				rewind($handle);
+			}
+			$text[$lines - $linecounter - 1] = fgets($handle);
+			if ($beginning) {
+				break;
+			}
+		}
+		fclose($handle);
+		return array_reverse($text);
 	}
 
 	/**
@@ -174,21 +174,21 @@ class DolLogsCollector extends MessagesCollector
 	 */
 	public function getLogs($file)
 	{
-	    $pattern = "/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.*/";
-	    $log_levels = $this->getLevels();
-	    preg_match_all($pattern, $file, $matches);
-	    $log = array();
-	    foreach ($matches as $lines) {
-	        foreach ($lines as $line) {
-	            foreach ($log_levels as $level_key => $level) {
-	                if (strpos(strtolower($line), strtolower($level_key)) == 20) {
-	                    $log[] = array('level' => $level, 'line' => $line);
-	                }
-	            }
-	        }
-	    }
-	    $log = array_reverse($log);
-	    return $log;
+		$pattern = "/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.*/";
+		$log_levels = $this->getLevels();
+		preg_match_all($pattern, $file, $matches);
+		$log = array();
+		foreach ($matches as $lines) {
+			foreach ($lines as $line) {
+				foreach ($log_levels as $level_key => $level) {
+					if (strpos(strtolower($line), strtolower($level_key)) == 20) {
+						$log[] = array('level' => $level, 'line' => $line);
+					}
+				}
+			}
+		}
+		$log = array_reverse($log);
+		return $log;
 	}
 
 	/**
diff --git a/htdocs/debugbar/class/DataCollector/DolMemoryCollector.php b/htdocs/debugbar/class/DataCollector/DolMemoryCollector.php
index b6525633481..b52ac8ff8c4 100644
--- a/htdocs/debugbar/class/DataCollector/DolMemoryCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolMemoryCollector.php
@@ -8,22 +8,22 @@ use \DebugBar\DataCollector\MemoryCollector;
 
 class DolMemoryCollector extends MemoryCollector
 {
-    /**
-     *	Return value of indicator
-     *
-     *  @return void
-     */
-    public function collect()
-    {
-        global $langs;
+	/**
+	 *	Return value of indicator
+	 *
+	 *  @return void
+	 */
+	public function collect()
+	{
+		global $conf, $langs;
 
-        $this->updatePeakUsage();
-        return array(
-            'peak_usage' => $this->peakUsage,
-            //'peak_usage_str' => $this->getDataFormatter()->formatBytes($this->peakUsage, 2)
-            'peak_usage_str' => $this->peakUsage.' '.$langs->trans("bytes")
-        );
-    }
+		$this->updatePeakUsage();
+		return array(
+			'peak_usage' => $this->peakUsage,
+			//'peak_usage_str' => $this->getDataFormatter()->formatBytes($this->peakUsage, 2)
+			'peak_usage_str' => (empty($conf->dol_optimize_smallscreen) ? dol_print_size($this->peakUsage, 0) : dol_print_size($this->peakUsage, 1))
+		);
+	}
 
 	/**
 	 *	Return widget settings
diff --git a/htdocs/debugbar/class/DataCollector/DolibarrCollector.php b/htdocs/debugbar/class/DataCollector/DolibarrCollector.php
index a03575f88e8..2e11887360f 100644
--- a/htdocs/debugbar/class/DataCollector/DolibarrCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolibarrCollector.php
@@ -59,14 +59,19 @@ class DolibarrCollector extends DataCollector implements Renderable, AssetProvid
 	protected function getDolibarrInfo()
 	{
 		global $conf, $langs;
+		global $dolibarr_main_prod, $dolibarr_nocsrfcheck;
 
 		$info  = $langs->trans('Version').': <strong>'.DOL_VERSION.'</strong><br>';
 		$info .= $langs->trans('Theme').': <strong>'.$conf->theme.'</strong><br>';
 		$info .= $langs->trans('Locale').': <strong>'.$conf->global->MAIN_LANG_DEFAULT.'</strong><br>';
 		$info .= $langs->trans('Currency').': <strong>'.$conf->currency.'</strong><br>';
-		$info .= $langs->trans('DolEntity').': <strong>'.$conf->entity.'</strong><br>';
-		$info .= $langs->trans('ListLimit').': <strong>'.($conf->liste_limit ?: $conf->global->MAIN_SIZE_LISTE_LIMIT).'</strong><br>';
-		$info .= $langs->trans('MaxSizeForUploadedFiles').': <strong>'.$conf->global->MAIN_UPLOAD_DOC.'</strong>';
+		$info .= $langs->trans('Entity').': <strong>'.$conf->entity.'</strong><br>';
+		$info .= $langs->trans('MaxSizeList').': <strong>'.($conf->liste_limit ?: $conf->global->MAIN_SIZE_LISTE_LIMIT).'</strong><br>';
+		$info .= $langs->trans('MaxSizeForUploadedFiles').': <strong>'.$conf->global->MAIN_UPLOAD_DOC.'</strong><br>';
+		$info .= '$dolibarr_main_prod = <strong>'.$dolibarr_main_prod.'</strong><br>';
+		$info .= '$dolibarr_nocsrfcheck = <strong>'.$dolibarr_nocsrfcheck.'</strong><br>';
+		$info .= 'MAIN_SECURITY_CSRF_WITH_TOKEN = <strong>'.$conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN.'</strong><br>';
+		$info .= 'MAIN_FEATURES_LEVEL = <strong>'.$conf->global->MAIN_FEATURES_LEVEL.'</strong><br>';
 
 		return $info;
 	}
@@ -79,14 +84,16 @@ class DolibarrCollector extends DataCollector implements Renderable, AssetProvid
 	protected function getMailInfo()
 	{
 		global $conf, $langs;
+		global $dolibarr_mailing_limit_sendbyweb;
 
 		$info  = $langs->trans('Method').': <strong>'.$conf->global->MAIN_MAIL_SENDMODE.'</strong><br>';
 		$info .= $langs->trans('Server').': <strong>'.$conf->global->MAIN_MAIL_SMTP_SERVER.'</strong><br>';
 		$info .= $langs->trans('Port').': <strong>'.$conf->global->MAIN_MAIL_SMTP_PORT.'</strong><br>';
 		$info .= $langs->trans('ID').': <strong>'.$conf->global->MAIN_MAIL_SMTPS_ID.'</strong><br>';
 		$info .= $langs->trans('Pwd').': <strong>'.preg_replace('/./', '*', $conf->global->MAIN_MAIL_SMTPS_PW).'</strong><br>';
-		$info .= $langs->trans('TLS/STARTTLS').': <strong>'.$conf->global->MAIN_MAIL_EMAIL_TLS.'</strong> / <strong>'.$conf->global->MAIN_MAIL_EMAIL_STARTTLS.'</strong><br>';
-		$info .= $langs->trans('MAIN_DISABLE_ALL_MAILS').': <strong>'.($conf->global->MAIN_DISABLE_ALL_MAILS ? $langs->trans('Yes') : $langs->trans('No')).'</strong>';
+		$info .= $langs->trans('TLS/STARTTLS').': <strong>'.(empty($conf->global->MAIN_MAIL_EMAIL_TLS) ? '' : $conf->global->MAIN_MAIL_EMAIL_TLS).'</strong> / <strong>'.(empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) ? '' : $conf->global->MAIN_MAIL_EMAIL_STARTTLS).'</strong><br>';
+		$info .= $langs->trans('MAIN_DISABLE_ALL_MAILS').': <strong>'.(empty($conf->global->MAIN_DISABLE_ALL_MAILS) ? $langs->trans('No') : $langs->trans('Yes')).'</strong><br>';
+		$info .= 'dolibarr_mailing_limit_sendbyweb = <strong>'.$dolibarr_mailing_limit_sendbyweb.'</strong><br>';
 
 		return $info;
 	}
diff --git a/htdocs/debugbar/class/TraceableDB.php b/htdocs/debugbar/class/TraceableDB.php
index 77c20325a9d..0cb380f39a1 100644
--- a/htdocs/debugbar/class/TraceableDB.php
+++ b/htdocs/debugbar/class/TraceableDB.php
@@ -72,7 +72,7 @@ class TraceableDB extends DoliDB
 	 */
 	public function fetch_row($resultset)
 	{
-	    // phpcs:enable
+		// phpcs:enable
 		return $this->db->fetch_row($resultset);
 	}
 
@@ -156,7 +156,7 @@ class TraceableDB extends DoliDB
 	 */
 	public function affected_rows($resultset)
 	{
-	    // phpcs:enable
+		// phpcs:enable
 		return $this->db->affected_rows($resultset);
 	}
 
@@ -224,7 +224,7 @@ class TraceableDB extends DoliDB
 	 */
 	public function fetch_array($resultset)
 	{
-	    // phpcs:enable
+		// phpcs:enable
 		return $this->db->fetch_array($resultset);
 	}
 
@@ -259,8 +259,8 @@ class TraceableDB extends DoliDB
 	 */
 	public function last_insert_id($tab, $fieldid = 'rowid')
 	{
-	    // phpcs:enable
-	    return $this->db->last_insert_id($tab, $fieldid);
+		// phpcs:enable
+		return $this->db->last_insert_id($tab, $fieldid);
 	}
 
 	/**
@@ -409,7 +409,7 @@ class TraceableDB extends DoliDB
 	 */
 	public function num_rows($resultset)
 	{
-	    // phpcs:enable
+		// phpcs:enable
 		return $this->db->num_rows($resultset);
 	}
 
@@ -588,7 +588,7 @@ class TraceableDB extends DoliDB
 	 */
 	public function jdate($string, $gm = false)
 	{
-	    // phpcs:enable
+		// phpcs:enable
 		return $this->db->jdate($string, $gm);
 	}
 
@@ -678,7 +678,7 @@ class TraceableDB extends DoliDB
 	 */
 	public function fetch_object($resultset)
 	{
-	    // phpcs:enable
+		// phpcs:enable
 		return $this->db->fetch_object($resultset);
 	}
 
@@ -691,7 +691,7 @@ class TraceableDB extends DoliDB
 	 */
 	public function select_db($database)
 	{
-	    // phpcs:enable
+		// phpcs:enable
 		return $this->db->select_db($database);
 	}
 }
diff --git a/htdocs/livraison/card.php b/htdocs/delivery/card.php
similarity index 78%
rename from htdocs/livraison/card.php
rename to htdocs/delivery/card.php
index 2a1646a5d80..8b0b53bd37d 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/delivery/card.php
@@ -22,14 +22,14 @@
  */
 
 /**
- *	\file       htdocs/livraison/card.php
+ *	\file       htdocs/delivery/card.php
  *	\ingroup    livraison
  *	\brief      Page to describe a delivery receipt
  */
 
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
+require_once DOL_DOCUMENT_ROOT.'/delivery/class/delivery.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/delivery/modules_delivery.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@@ -41,8 +41,8 @@ if (!empty($conf->expedition_bon->enabled))
 if (!empty($conf->stock->enabled))
 	require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 if (!empty($conf->projet->enabled)) {
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
 // Load translation files required by the page
@@ -57,9 +57,9 @@ $backtopage = GETPOST('backtopage', 'alpha');
 // Security check
 $id = GETPOST('id', 'int');
 if ($user->socid) $socid = $user->socid;
-$result = restrictedArea($user, 'expedition', $id, 'livraison', 'livraison');
+$result = restrictedArea($user, 'expedition', $id, 'delivery', 'delivery');
 
-$object = new Livraison($db);
+$object = new Delivery($db);
 $extrafields = new ExtraFields($db);
 
 // fetch optionals attributes and labels
@@ -74,6 +74,8 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('deliverycard', 'globalcard'));
 
+$error = 0;
+
 
 /*
  * Actions
@@ -86,18 +88,17 @@ if ($action == 'add')
 {
 	$db->begin();
 
-	$object->date_livraison   = time();
-	$object->note             = $_POST["note"];
-	$object->commande_id      = $_POST["commande_id"];
+	$object->date_delivery = dol_now();
+	$object->note          = GETPOST("note", 'restricthtml');
+	$object->note_private  = GETPOST("note", 'restricthtml');
+	$object->commande_id   = GETPOST("commande_id", 'int');
 	$object->fk_incoterms = GETPOST('incoterm_id', 'int');
 
-	if (!$conf->expedition_bon->enabled && !empty($conf->stock->enabled))
-	{
-		$expedition->entrepot_id = $_POST["entrepot_id"];
+	if (!$conf->expedition_bon->enabled && !empty($conf->stock->enabled)) {
+		$expedition->entrepot_id = GETPOST('entrepot_id');
 	}
 
-	// On boucle sur chaque ligne de commande pour completer objet livraison
-	// avec qte a livrer
+	// We loop on each line of order to complete object delivery with qty to delivery
 	$commande = new Commande($db);
 	$commande->fetch($object->commande_id);
 	$commande->fetch_lines();
@@ -106,15 +107,15 @@ if ($action == 'add')
 	{
 		$qty = "qtyl".$i;
 		$idl = "idl".$i;
-		if ($_POST[$qty] > 0)
+		$qtytouse = price2num(GETPOST($qty));
+		if ($qtytouse > 0)
 		{
-			$object->addline($_POST[$idl], $_POST[$qty]);
+			$object->addline(GETPOST($idl), price2num($qtytouse));
 		}
 	}
 
 	$ret = $object->create($user);
-	if ($ret > 0)
-	{
+	if ($ret > 0) {
 		$db->commit();
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
@@ -122,12 +123,11 @@ if ($action == 'add')
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 
-		$_GET["commande_id"] = $_POST["commande_id"];
 		$action = 'create';
 	}
 } elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
-    ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->livraison->creer))
-    || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->livraison_advance->validate)))
+	((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->delivery->creer))
+	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->delivery_advance->validate)))
 )
 {
 	$result = $object->valid($user);
@@ -151,7 +151,7 @@ if ($action == 'add')
 	}
 }
 
-if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expedition->livraison->supprimer)
+if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expedition->delivery->supprimer)
 {
 	$db->begin();
 	$result = $object->delete();
@@ -167,20 +167,20 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expeditio
 	}
 }
 
-if ($action == 'setdate_livraison' && $user->rights->expedition->livraison->creer)
+if ($action == 'setdate_delivery' && $user->rights->expedition->delivery->creer)
 {
-    $datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
-    $result = $object->set_date_livraison($user, $datedelivery);
-    if ($result < 0)
-    {
-        $mesg = '<div class="error">'.$object->error.'</div>';
-    }
+	$datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
+	$result = $object->setDeliveryDate($user, $datedelivery);
+	if ($result < 0)
+	{
+		$mesg = '<div class="error">'.$object->error.'</div>';
+	}
 }
 
 // Set incoterm
 elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
 {
-	$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+	$result = $object->setIncoterms((int) GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
 }
 
 // Update extrafields
@@ -276,7 +276,6 @@ if ($action == 'create')    // Create. Seems to no be used
 
 			$head = delivery_prepare_head($object);
 
-
 			print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="update_extras_line">';
@@ -284,7 +283,7 @@ if ($action == 'create')    // Create. Seems to no be used
 			print '<input type="hidden" name="id" value="'.$object->id.'">';
 			print '<input type="hidden" name="ref" value="'.$object->ref.'">';
 
-			dol_fiche_head($head, 'delivery', $langs->trans("Shipment"), -1, 'sending');
+			print dol_get_fiche_head($head, 'delivery', $langs->trans("Shipment"), -1, 'sending');
 
 			/*
 			 * Confirmation de la suppression
@@ -306,18 +305,18 @@ if ($action == 'create')    // Create. Seems to no be used
 
 
 			/*
-			 *   Livraison
+			 *   Delivery
 			 */
 
 			if ($typeobject == 'commande' && $expedition->origin_id > 0 && !empty($conf->commande->enabled))
 			{
-			    $objectsrc = new Commande($db);
-			    $objectsrc->fetch($expedition->origin_id);
+				$objectsrc = new Commande($db);
+				$objectsrc->fetch($expedition->origin_id);
 			}
 			if ($typeobject == 'propal' && $expedition->origin_id > 0 && !empty($conf->propal->enabled))
 			{
-			    $objectsrc = new Propal($db);
-			    $objectsrc->fetch($expedition->origin_id);
+				$objectsrc = new Propal($db);
+				$objectsrc->fetch($expedition->origin_id);
 			}
 
 			// Shipment card
@@ -332,39 +331,39 @@ if ($action == 'create')    // Create. Seems to no be used
 			$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$expedition->thirdparty->getNomUrl(1);
 			// Project
 			if (!empty($conf->projet->enabled)) {
-			    $langs->load("projects");
-			    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-			    if (0) {    // Do not change on shipment
-			        if ($action != 'classify') {
-			            $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$expedition->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-			        }
-			        if ($action == 'classify') {
-			            // $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $expedition->id, $expedition->socid, $expedition->fk_project, 'projectid', 0, 0, 1, 1);
-			            $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$expedition->id.'">';
-			            $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-			            $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-			            $morehtmlref .= $formproject->select_projects($expedition->socid, $expedition->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-			            $morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-			            $morehtmlref .= '</form>';
-			        } else {
-			            $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$expedition->id, $expedition->socid, $expedition->fk_project, 'none', 0, 0, 0, 1);
-			        }
-			    } else {
-			        $morehtmlref .= ' : ';
-			        if (!empty($objectsrc->fk_project)) {
-			            $proj = new Project($db);
-			            $proj->fetch($objectsrc->fk_project);
-			            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-			            $morehtmlref .= $proj->ref;
-			            $morehtmlref .= '</a>';
-			        } else {
-			            $morehtmlref .= '';
-			        }
-			    }
+				$langs->load("projects");
+				$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+				if (0) {    // Do not change on shipment
+					if ($action != 'classify') {
+						$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$expedition->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+					}
+					if ($action == 'classify') {
+						// $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $expedition->id, $expedition->socid, $expedition->fk_project, 'projectid', 0, 0, 1, 1);
+						$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$expedition->id.'">';
+						$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+						$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+						$morehtmlref .= $formproject->select_projects($expedition->socid, $expedition->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+						$morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+						$morehtmlref .= '</form>';
+					} else {
+						$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$expedition->id, $expedition->socid, $expedition->fk_project, 'none', 0, 0, 0, 1);
+					}
+				} else {
+					$morehtmlref .= ' : ';
+					if (!empty($objectsrc->fk_project)) {
+						$proj = new Project($db);
+						$proj->fetch($objectsrc->fk_project);
+						$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+						$morehtmlref .= $proj->ref;
+						$morehtmlref .= '</a>';
+					} else {
+						$morehtmlref .= '';
+					}
+				}
 			}
 			$morehtmlref .= '</div>';
 
-			$morehtmlright = $langs->trans("StatusReceipt").' : '.$object->getLibStatut(6).'<br>';
+			$morehtmlright = $langs->trans("StatusReceipt").' : '.$object->getLibStatut(6).'<br><br class="small">';
 
 			dol_banner_tab($expedition, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
 
@@ -372,7 +371,7 @@ if ($action == 'create')    // Create. Seems to no be used
 			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
 
-		    print '<table class="border tableforfield" width="100%">';
+			print '<table class="border tableforfield" width="100%">';
 
 			// Shipment
 			/*
@@ -434,15 +433,15 @@ if ($action == 'create')    // Create. Seems to no be used
 			print $langs->trans('DateReceived');
 			print '</td>';
 
-			if ($action != 'editdate_livraison') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
+			if ($action != 'editdate_delivery') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_delivery&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
 			print '</tr></table>';
 			print '</td><td colspan="2">';
-			if ($action == 'editdate_livraison')
+			if ($action == 'editdate_delivery')
 			{
-				print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+				print '<form name="setdate_delivery" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
-				print '<input type="hidden" name="action" value="setdate_livraison">';
-				print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 1);
+				print '<input type="hidden" name="action" value="setdate_delivery">';
+				print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_delivery", 1, 1);
 				print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 				print '</form>';
 			} else {
@@ -455,21 +454,21 @@ if ($action == 'create')    // Create. Seems to no be used
 			if (!empty($conf->incoterm->enabled))
 			{
 				print '<tr><td>';
-		        print '<table width="100%" class="nobordernopadding"><tr><td>';
-		        print $langs->trans('IncotermLabel');
-		        print '<td><td class="right">';
-		        if ($user->rights->expedition->livraison->creer) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/livraison/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
-		        else print '&nbsp;';
-		        print '</td></tr></table>';
-		        print '</td>';
-		        print '<td colspan="3">';
+				print '<table width="100%" class="nobordernopadding"><tr><td>';
+				print $langs->trans('IncotermLabel');
+				print '<td><td class="right">';
+				if ($user->rights->expedition->delivery->creer) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/delivery/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+				else print '&nbsp;';
+				print '</td></tr></table>';
+				print '</td>';
+				print '<td colspan="3">';
 				if ($action != 'editincoterm')
 				{
 					print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
 				} else {
 					print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 				}
-		        print '</td></tr>';
+				print '</td></tr>';
 			}
 
 			/* A delivery note should be just more properties of a shipment, so notes are on shipment
@@ -629,7 +628,7 @@ if ($action == 'create')    // Create. Seems to no be used
 
 			print "</table>\n";
 
-            dol_fiche_end();
+			print dol_get_fiche_end();
 
 			//if ($object->statut == 0)	// only if draft
 			//	print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
@@ -647,14 +646,14 @@ if ($action == 'create')    // Create. Seems to no be used
 
 				if ($object->statut == 0 && $num_prod > 0)
 				{
-					if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->livraison->creer))
-						|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->livraison_advance->validate)))
+					if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->delivery->creer))
+						|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->delivery_advance->validate)))
 					{
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
 					}
 				}
 
-				if ($user->rights->expedition->livraison->supprimer)
+				if ($user->rights->expedition->delivery->supprimer)
 				{
 					if ($conf->expedition_bon->enabled)
 					{
@@ -678,10 +677,10 @@ if ($action == 'create')    // Create. Seems to no be used
 			$filedir = $conf->expedition->dir_output."/receipt/".$objectref;
 			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 
-			$genallowed = $user->rights->expedition->livraison->lire;
-			$delallowed = $user->rights->expedition->livraison->creer;
+			$genallowed = $user->rights->expedition->delivery->lire;
+			$delallowed = $user->rights->expedition->delivery->creer;
 
-			print $formfile->showdocuments('livraison', $objectref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
+			print $formfile->showdocuments('delivery', $objectref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
 
 			/*
 		 	 * Linked object block (of linked shipment)
@@ -691,9 +690,9 @@ if ($action == 'create')    // Create. Seems to no be used
 				$shipment = new Expedition($db);
 				$shipment->fetch($object->origin_id);
 
-    			// Show links to link elements
-    			//$linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
-    			$somethingshown = $form->showLinkedObjectBlock($object, '');
+				// Show links to link elements
+				//$linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
+				$somethingshown = $form->showLinkedObjectBlock($object, '');
 			}
 
 
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/delivery/class/delivery.class.php
similarity index 73%
rename from htdocs/livraison/class/livraison.class.php
rename to htdocs/delivery/class/delivery.class.php
index c612dbf6fe2..9c1e9682a10 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/delivery/class/delivery.class.php
@@ -22,13 +22,14 @@
  */
 
 /**
- *  \file       htdocs/livraison/class/livraison.class.php
+ *  \file       htdocs/delivery/class/delivery.class.php
  *  \ingroup    delivery
  *  \brief      Delivery Order Management Class File
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonincoterm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 if (!empty($conf->propal->enabled))   require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 if (!empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
@@ -37,35 +38,48 @@ if (!empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/
 /**
  *  Class to manage receptions
  */
-class Livraison extends CommonObject
+class Delivery extends CommonObject
 {
+	use CommonIncoterm;
+
 	/**
 	 * @var string ID to identify managed object
 	 */
 	public $element = "delivery";
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
-	public $fk_element = "fk_livraison";
+	public $fk_element = "fk_delivery";
 
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element = "livraison";
+	public $table_element = "delivery";
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
-	public $table_element_line = "livraisondet";
+	public $table_element_line = "deliverydet";
 
 	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
 	public $picto = 'sending';
 
-	public $brouillon;
+	/**
+	 * @var int draft status
+	 */
+	public $draft;
+
+	/**
+	 * @var int thirdparty id
+	 */
 	public $socid;
+
+	/**
+	 * @var string ref custome
+	 */
 	public $ref_customer;
 
 	/**
@@ -74,8 +88,8 @@ class Livraison extends CommonObject
 	public $date_delivery;
 
 	/**
-     * @var integer|string date_creation
-     */
+	 * @var integer|string date_creation
+	 */
 	public $date_creation;
 
 	/**
@@ -83,20 +97,22 @@ class Livraison extends CommonObject
 	 */
 	public $date_valid;
 
-
+	/**
+	 * @var string model pdf
+	 */
 	public $model_pdf;
 
+	public $lines = array();
+
 
 	/**
 	 * Constructor
 	 *
 	 * @param	DoliDB	$db		Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		$this->db = $db;
-		$this->lines = array();
-		$this->products = array();
 
 		// List of short language codes for status
 		$this->statuts[-1] = 'StatusDeliveryCanceled';
@@ -108,28 +124,28 @@ class Livraison extends CommonObject
 	 *  Create delivery receipt in database
 	 *
 	 *  @param 	User	$user       Objet du user qui cree
-	 *  @return int         		<0 si erreur, id livraison cree si ok
+	 *  @return int         		<0 si erreur, id delivery cree si ok
 	 */
-    public function create($user)
+	public function create($user)
 	{
 		global $conf;
 
-		dol_syslog("Livraison::create");
+		dol_syslog("Delivery::create");
 
-		if (empty($this->model_pdf)) $this->model_pdf = $conf->global->LIVRAISON_ADDON_PDF;
+		if (empty($this->model_pdf)) $this->model_pdf = $conf->global->DELIVERY_ADDON_PDF;
 
 		$error = 0;
 
-        $now = dol_now();
+		$now = dol_now();
 
-		/* On positionne en mode brouillon le bon de livraison */
-		$this->brouillon = 1;
+		/* Delivery note as draft On positionne en mode draft le bon de livraison */
+		$this->draft = 1;
 
 		$this->user = $user;
 
 		$this->db->begin();
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."livraison (";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."delivery (";
 		$sql .= "ref";
 		$sql .= ", entity";
 		$sql .= ", fk_soc";
@@ -154,23 +170,23 @@ class Livraison extends CommonObject
 		$sql .= ", ".(!empty($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null");
 		$sql .= ", ".(!empty($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null");
 		$sql .= ", ".(!empty($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : "null");
-        $sql .= ", ".(int) $this->fk_incoterms;
-        $sql .= ", '".$this->db->escape($this->location_incoterms)."'";
+		$sql .= ", ".(int) $this->fk_incoterms;
+		$sql .= ", '".$this->db->escape($this->location_incoterms)."'";
 		$sql .= ")";
 
-		dol_syslog("Livraison::create", LOG_DEBUG);
+		dol_syslog("Delivery::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."livraison");
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."delivery");
 
 			$numref = "(PROV".$this->id.")";
 
-			$sql = "UPDATE ".MAIN_DB_PREFIX."livraison ";
+			$sql = "UPDATE ".MAIN_DB_PREFIX."delivery ";
 			$sql .= "SET ref = '".$this->db->escape($numref)."'";
 			$sql .= " WHERE rowid = ".$this->id;
 
-			dol_syslog("Livraison::create", LOG_DEBUG);
+			dol_syslog("Delivery::create", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
@@ -207,7 +223,7 @@ class Livraison extends CommonObject
 
 					if (!$conf->expedition_bon->enabled)
 					{
-						// TODO uniformiser les statuts
+						// TODO standardize status uniformiser les statuts
 						$ret = $this->setStatut(2, $this->origin_id, $this->origin);
 						if (!$ret)
 						{
@@ -240,7 +256,7 @@ class Livraison extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Create a line
 	 *
@@ -250,14 +266,14 @@ class Livraison extends CommonObject
 	 *	@param	string	$description			Description
 	 *	@return	int								<0 if KO, >0 if OK
 	 */
-    public function create_line($origin_id, $qty, $fk_product, $description)
-    {
-        // phpcs:enable
+	public function create_line($origin_id, $qty, $fk_product, $description)
+	{
+		// phpcs:enable
 		$error = 0;
 		$idprod = $fk_product;
 		$j = 0;
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."livraisondet (fk_livraison, fk_origin_line,";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."deliverydet (fk_delivery, fk_origin_line,";
 		$sql .= " fk_product, description, qty)";
 		$sql .= " VALUES (".$this->id.",".$origin_id.",";
 		$sql .= " ".($idprod > 0 ? $idprod : "null").",";
@@ -282,7 +298,7 @@ class Livraison extends CommonObject
 	 * 	@param	int		$id			Id of object to load
 	 * 	@return	integer
 	 */
-    public function fetch($id)
+	public function fetch($id)
 	{
 		global $conf;
 
@@ -290,9 +306,9 @@ class Livraison extends CommonObject
 		$sql .= " l.total_ht, l.fk_statut, l.fk_user_valid, l.note_private, l.note_public";
 		$sql .= ", l.date_delivery, l.fk_address, l.model_pdf";
 		$sql .= ", el.fk_source as origin_id, el.sourcetype as origin";
-        $sql .= ', l.fk_incoterms, l.location_incoterms';
-        $sql .= ", i.libelle as label_incoterms";
-		$sql .= " FROM ".MAIN_DB_PREFIX."livraison as l";
+		$sql .= ', l.fk_incoterms, l.location_incoterms';
+		$sql .= ", i.libelle as label_incoterms";
+		$sql .= " FROM ".MAIN_DB_PREFIX."delivery as l";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = l.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON l.fk_incoterms = i.rowid';
 		$sql .= " WHERE l.rowid = ".$id;
@@ -320,7 +336,7 @@ class Livraison extends CommonObject
 				$this->note_private         = $obj->note_private;
 				$this->note_public          = $obj->note_public;
 				$this->model_pdf            = $obj->model_pdf;
-				$this->modelpdf             = $obj->model_pdf;	// deprecated
+				$this->modelpdf             = $obj->model_pdf; // deprecated
 				$this->origin               = $obj->origin; // May be 'shipping'
 				$this->origin_id            = $obj->origin_id; // May be id of shipping
 
@@ -330,9 +346,9 @@ class Livraison extends CommonObject
 				$this->label_incoterms = $obj->label_incoterms;
 				$this->db->free($result);
 
-				if ($this->statut == 0) $this->brouillon = 1;
+				if ($this->statut == 0) $this->draft = 1;
 
-				// Retreive all extrafields
+				// Retrieve all extrafields
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
 
@@ -358,14 +374,14 @@ class Livraison extends CommonObject
 	/**
 	 *  Validate object and update stock if option enabled
 	 *
-     *  @param  User    $user       Object user that validate
-     *  @param  int     $notrigger  1=Does not execute triggers, 0= execute triggers
-     *  @return int
+	 *  @param  User    $user       Object user that validate
+	 *  @param  int     $notrigger  1=Does not execute triggers, 0= execute triggers
+	 *  @return int
 	 */
-    public function valid($user, $notrigger = 0)
+	public function valid($user, $notrigger = 0)
 	{
 		global $conf, $langs;
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		dol_syslog(get_class($this)."::valid begin");
 
@@ -373,17 +389,17 @@ class Livraison extends CommonObject
 
 		$error = 0;
 
-        if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->livraison->creer))
-       	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->livraison_advance->validate)))
+		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->delivery->creer))
+	   	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->delivery_advance->validate)))
 		{
-			if (!empty($conf->global->LIVRAISON_ADDON_NUMBER))
+			if (!empty($conf->global->DELIVERY_ADDON_NUMBER))
 			{
 				// Setting the command numbering module name
-				$modName = $conf->global->LIVRAISON_ADDON_NUMBER;
+				$modName = $conf->global->DELIVERY_ADDON_NUMBER;
 
-				if (is_readable(DOL_DOCUMENT_ROOT.'/core/modules/livraison/'.$modName.'.php'))
+				if (is_readable(DOL_DOCUMENT_ROOT.'/core/modules/delivery/'.$modName.'.php'))
 				{
-					require_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/'.$modName.'.php';
+					require_once DOL_DOCUMENT_ROOT.'/core/modules/delivery/'.$modName.'.php';
 
 					$now = dol_now();
 
@@ -393,16 +409,16 @@ class Livraison extends CommonObject
 					$soc->fetch($this->socid);
 
 					if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
-		            {
-		                $numref = $objMod->livraison_get_num($soc, $this);
-		            } else {
-		                $numref = $this->ref;
-		            }
-            		$this->newref = dol_sanitizeFileName($numref);
+					{
+						$numref = $objMod->delivery_get_num($soc, $this);
+					} else {
+						$numref = $this->ref;
+					}
+					$this->newref = dol_sanitizeFileName($numref);
 
 					// Test if is not already in valid status. If so, we stop to avoid decrementing the stock twice.
 					$sql = "SELECT ref";
-					$sql .= " FROM ".MAIN_DB_PREFIX."livraison";
+					$sql .= " FROM ".MAIN_DB_PREFIX."delivery";
 					$sql .= " WHERE ref = '".$this->db->escape($numref)."'";
 					$sql .= " AND fk_statut <> 0";
 					$sql .= " AND entity = ".$conf->entity;
@@ -417,7 +433,7 @@ class Livraison extends CommonObject
 						}
 					}
 
-					$sql = "UPDATE ".MAIN_DB_PREFIX."livraison SET";
+					$sql = "UPDATE ".MAIN_DB_PREFIX."delivery SET";
 					$sql .= " ref='".$this->db->escape($numref)."'";
 					$sql .= ", fk_statut = 1";
 					$sql .= ", date_valid = '".$this->db->idate($now)."'";
@@ -426,24 +442,24 @@ class Livraison extends CommonObject
 					$sql .= " AND fk_statut = 0";
 
 					$resql = $this->db->query($sql);
-			        if (!$resql)
-			        {
-			            dol_print_error($this->db);
-			            $this->error = $this->db->lasterror();
-			            $error++;
-			        }
+					if (!$resql)
+					{
+						dol_print_error($this->db);
+						$this->error = $this->db->lasterror();
+						$error++;
+					}
 
-			        if (!$error && !$notrigger)
-			        {
-			            // Call trigger
-			            $result = $this->call_trigger('DELIVERY_VALIDATE', $user);
-			            if ($result < 0) $error++;
-			            // End call triggers
-			        }
+					if (!$error && !$notrigger)
+					{
+						// Call trigger
+						$result = $this->call_trigger('DELIVERY_VALIDATE', $user);
+						if ($result < 0) $error++;
+						// End call triggers
+					}
 
 					if (!$error)
 					{
-			            $this->oldref = $this->ref;
+						$this->oldref = $this->ref;
 
 						// Rename directory if dir was a temporary ref
 						if (preg_match('/^[\(]?PROV/i', $this->ref))
@@ -465,17 +481,17 @@ class Livraison extends CommonObject
 
 								if (@rename($dirsource, $dirdest))
 								{
-			                        dol_syslog("Rename ok");
-			                        // Rename docs starting with $oldref with $newref
-			                        $listoffiles = dol_dir_list($conf->expedition->dir_output.'/receipt/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
-			                        foreach ($listoffiles as $fileentry)
-			                        {
-			                        	$dirsource = $fileentry['name'];
-			                        	$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
-			                        	$dirsource = $fileentry['path'].'/'.$dirsource;
-			                        	$dirdest = $fileentry['path'].'/'.$dirdest;
-			                        	@rename($dirsource, $dirdest);
-			                        }
+									dol_syslog("Rename ok");
+									// Rename docs starting with $oldref with $newref
+									$listoffiles = dol_dir_list($conf->expedition->dir_output.'/receipt/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+									foreach ($listoffiles as $fileentry)
+									{
+										$dirsource = $fileentry['name'];
+										$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+										$dirsource = $fileentry['path'].'/'.$dirsource;
+										$dirdest = $fileentry['path'].'/'.$dirdest;
+										@rename($dirsource, $dirdest);
+									}
 								}
 							}
 						}
@@ -490,14 +506,14 @@ class Livraison extends CommonObject
 						dol_syslog(get_class($this)."::valid ok");
 					}
 
-			        if (!$error)
-			        {
-			            $this->db->commit();
-			            return 1;
-			        } else {
-			            $this->db->rollback();
-			            return -1;
-			        }
+					if (!$error)
+					{
+						$this->db->commit();
+						return 1;
+					} else {
+						$this->db->rollback();
+						return -1;
+					}
 				}
 			}
 		} else {
@@ -507,7 +523,7 @@ class Livraison extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Creating the delivery slip from an existing shipment
 	 *
@@ -515,9 +531,9 @@ class Livraison extends CommonObject
 	 *	@param  int		$sending_id      Id of the expedition that serves as a model
 	 *	@return	integer
 	 */
-    public function create_from_sending($user, $sending_id)
+	public function create_from_sending($user, $sending_id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$expedition = new Expedition($this->db);
 		$result = $expedition->fetch($sending_id);
 
@@ -526,13 +542,12 @@ class Livraison extends CommonObject
 		$num = count($expedition->lines);
 		for ($i = 0; $i < $num; $i++)
 		{
-			$line = new LivraisonLigne($this->db);
+			$line = new DeliveryLine($this->db);
 			$line->origin_line_id    = $expedition->lines[$i]->origin_line_id;
-			$line->libelle           = $expedition->lines[$i]->libelle;
+			$line->label             = $expedition->lines[$i]->label;
 			$line->description       = $expedition->lines[$i]->description;
 			$line->qty               = $expedition->lines[$i]->qty_shipped;
 			$line->fk_product        = $expedition->lines[$i]->fk_product;
-			$line->ref               = $expedition->lines[$i]->ref;
 
 			$this->lines[$i] = $line;
 		}
@@ -545,7 +560,7 @@ class Livraison extends CommonObject
 		$this->date_delivery        = $expedition->date_delivery;
 		$this->fk_delivery_address  = $expedition->fk_delivery_address;
 		$this->socid                = $expedition->socid;
-		$this->ref_customer = $expedition->ref_customer;
+		$this->ref_customer         = $expedition->ref_customer;
 
 		//Incoterms
 		$this->fk_incoterms = $expedition->fk_incoterms;
@@ -554,7 +569,7 @@ class Livraison extends CommonObject
 		return $this->create($user);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Update a livraison line (only extrafields)
 	 *
@@ -562,22 +577,22 @@ class Livraison extends CommonObject
 	 * @param	array		$array_options		extrafields array
 	 * @return	int							<0 if KO, >0 if OK
 	 */
-    public function update_line($id, $array_options = 0)
+	public function update_line($id, $array_options = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		$error = 0;
 
 		if ($id > 0 && !$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) // For avoid conflicts if trigger used
 		{
-			$livraisonline = new LivraisonLigne($this->db);
-			$livraisonline->array_options = $array_options;
-			$livraisonline->id = $id;
-			$result = $livraisonline->insertExtraFields();
+			$line = new DeliveryLine($this->db);
+			$line->array_options = $array_options;
+			$line->id = $id;
+			$result = $line->insertExtraFields();
 
 			if ($result < 0)
 			{
-				$this->error[] = $livraisonline->error;
+				$this->error[] = $line->error;
 				$error++;
 			}
 		}
@@ -594,10 +609,10 @@ class Livraison extends CommonObject
 	 *	@param	int		$qty			Qty
 	 *	@return	void
 	 */
-    public function addline($origin_id, $qty)
+	public function addline($origin_id, $qty)
 	{
 		$num = count($this->lines);
-		$line = new LivraisonLigne($this->db);
+		$line = new DeliveryLine($this->db);
 
 		$line->origin_id = $origin_id;
 		$line->qty = $qty;
@@ -611,7 +626,7 @@ class Livraison extends CommonObject
 	 *	@param	int		$lineid		Line id
 	 *	@return	integer|null
 	 */
-    public function deleteline($lineid)
+	public function deleteline($lineid)
 	{
 		if ($this->statut == 0)
 		{
@@ -634,17 +649,17 @@ class Livraison extends CommonObject
 	 *
 	 * @return	integer
 	 */
-    public function delete()
+	public function delete()
 	{
 		global $conf, $langs, $user;
 
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		$this->db->begin();
 
 		$error = 0;
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."livraisondet";
-		$sql .= " WHERE fk_livraison = ".$this->id;
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."deliverydet";
+		$sql .= " WHERE fk_delivery = ".$this->id;
 		if ($this->db->query($sql))
 		{
 			// Delete linked object
@@ -653,13 +668,13 @@ class Livraison extends CommonObject
 
 			if (!$error)
 			{
-				$sql = "DELETE FROM ".MAIN_DB_PREFIX."livraison";
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."delivery";
 				$sql .= " WHERE rowid = ".$this->id;
 				if ($this->db->query($sql))
 				{
 					$this->db->commit();
 
-					// On efface le repertoire de pdf provisoire
+					// Deleting pdf folder's draft On efface le repertoire de pdf provisoire
 					$ref = dol_sanitizeFileName($this->ref);
 					if (!empty($conf->expedition->dir_output))
 					{
@@ -682,14 +697,14 @@ class Livraison extends CommonObject
 						}
 					}
 
-                    // Call trigger
-                    $result = $this->call_trigger('DELIVERY_DELETE', $user);
-                    if ($result < 0)
-                    {
-                        $this->db->rollback();
-                        return -4;
-                    }
-                    // End call triggers
+					// Call trigger
+					$result = $this->call_trigger('DELIVERY_DELETE', $user);
+					if ($result < 0)
+					{
+						$this->db->rollback();
+						return -4;
+					}
+					// End call triggers
 
 					return 1;
 				} else {
@@ -713,10 +728,10 @@ class Livraison extends CommonObject
 	 *	Return clicable name (with picto eventually)
 	 *
 	 *	@param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
-     *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string								Chaine avec URL
 	 */
-    public function getNomUrl($withpicto = 0, $save_lastsearch_value = -1)
+	public function getNomUrl($withpicto = 0, $save_lastsearch_value = -1)
 	{
 		global $langs;
 
@@ -725,18 +740,18 @@ class Livraison extends CommonObject
 		$label = img_picto('', $this->picto).' <u>'.$langs->trans("ShowReceiving").'</u>:<br>';
 		$label .= '<b>'.$langs->trans("Status").'</b>: '.$this->ref;
 
-		$url = DOL_URL_ROOT.'/livraison/card.php?id='.$this->id;
+		$url = DOL_URL_ROOT.'/delivery/card.php?id='.$this->id;
 
-        //if ($option !== 'nolink')
-        //{
-        	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-        	if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        //}
+		//if ($option !== 'nolink')
+		//{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		//}
 
 
-        $linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend = '</a>';
 
 		if ($withpicto) $result .= ($linkstart.img_object($label, $this->picto, 'class="classfortooltip"').$linkend);
@@ -745,25 +760,25 @@ class Livraison extends CommonObject
 		return $result;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Load lines
 	 *
 	 *	@return	void
 	 */
-    public function fetch_lines()
+	public function fetch_lines()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->lines = array();
 
 		$sql = "SELECT ld.rowid, ld.fk_product, ld.description, ld.subprice, ld.total_ht, ld.qty as qty_shipped, ld.fk_origin_line, ";
 		$sql .= " cd.qty as qty_asked, cd.label as custom_label, cd.fk_unit,";
 		$sql .= " p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc,";
 		$sql .= " p.weight, p.weight_units,  p.width, p.width_units, p.length, p.length_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units, p.tobatch as product_tobatch";
-		$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd, ".MAIN_DB_PREFIX."livraisondet as ld";
+		$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd, ".MAIN_DB_PREFIX."deliverydet as ld";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on p.rowid = ld.fk_product";
 		$sql .= " WHERE ld.fk_origin_line = cd.rowid";
-		$sql .= " AND ld.fk_livraison = ".$this->id;
+		$sql .= " AND ld.fk_delivery = ".$this->id;
 
 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -773,7 +788,7 @@ class Livraison extends CommonObject
 			$i = 0;
 			while ($i < $num)
 			{
-				$line = new LivraisonLigne($this->db);
+				$line = new DeliveryLine($this->db);
 
 				$obj = $this->db->fetch_object($resql);
 
@@ -810,6 +825,7 @@ class Livraison extends CommonObject
 				$line->volume_units   	= $obj->volume_units;
 
 				$line->fk_unit = $obj->fk_unit;
+				$line->fetch_optionals();
 
 				$this->lines[$i] = $line;
 
@@ -828,12 +844,12 @@ class Livraison extends CommonObject
 	 *  @param	int			$mode		Mode
 	 *  @return string      			Label
 	 */
-    public function getLibStatut($mode = 0)
+	public function getLibStatut($mode = 0)
 	{
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Renvoi le libelle d'un statut donne
 	 *
@@ -841,9 +857,9 @@ class Livraison extends CommonObject
 	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
 	 *  @return string					Label
 	 */
-    public function LibStatut($status, $mode)
+	public function LibStatut($status, $mode)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if (empty($this->labelStatus) || empty($this->labelStatusShort))
@@ -867,19 +883,19 @@ class Livraison extends CommonObject
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
 	 */
-    public function initAsSpecimen()
+	public function initAsSpecimen()
 	{
 		global $user, $langs, $conf;
 
 		$now = dol_now();
 
-        // Load array of products prodids
+		// Load array of products prodids
 		$num_prods = 0;
 		$prodids = array();
 		$sql = "SELECT rowid";
@@ -911,7 +927,7 @@ class Livraison extends CommonObject
 		$this->note_private = 'Private note';
 
 		$i = 0;
-		$line = new LivraisonLigne($this->db);
+		$line = new DeliveryLine($this->db);
 		$line->fk_product     = $prodids[0];
 		$line->qty_asked      = 10;
 		$line->qty_shipped    = 9;
@@ -930,17 +946,17 @@ class Livraison extends CommonObject
 	 *  @return     array		Product remaining to be delivered
 	 *  TODO use new function
 	 */
-    public function getRemainingDelivered()
+	public function getRemainingDelivered()
 	{
 		global $langs;
 
 		// Get the linked object
 		$this->fetchObjectLinked('', '', $this->id, $this->element);
-		//var_dump($this->linkedObjectIds);
+		//var_dump($this->linkedObjectsIds);
 		// Get the product ref and qty in source
 		$sqlSourceLine = "SELECT st.rowid, st.description, st.qty";
 		$sqlSourceLine .= ", p.ref, p.label";
-		$sqlSourceLine .= " FROM ".MAIN_DB_PREFIX.$this->linkedObjectIds[0]['type']."det as st";
+		$sqlSourceLine .= " FROM ".MAIN_DB_PREFIX.$this->linkedObjectsIds[0]['type']."det as st";
 		$sqlSourceLine .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON st.fk_product = p.rowid";
 		$sqlSourceLine .= " WHERE fk_".$this->linked_object[0]['type']." = ".$this->linked_object[0]['linkid'];
 
@@ -956,10 +972,10 @@ class Livraison extends CommonObject
 
 				// Get lines of sources alread delivered
 				$sql = "SELECT ld.fk_origin_line, sum(ld.qty) as qty";
-				$sql .= " FROM ".MAIN_DB_PREFIX."livraisondet as ld, ".MAIN_DB_PREFIX."livraison as l,";
+				$sql .= " FROM ".MAIN_DB_PREFIX."deliverydet as ld, ".MAIN_DB_PREFIX."delivery as l,";
 				$sql .= " ".MAIN_DB_PREFIX.$this->linked_object[0]['type']." as c";
 				$sql .= ", ".MAIN_DB_PREFIX.$this->linked_object[0]['type']."det as cd";
-				$sql .= " WHERE ld.fk_livraison = l.rowid";
+				$sql .= " WHERE ld.fk_delivery = l.rowid";
 				$sql .= " AND ld.fk_origin_line = cd.rowid";
 				$sql .= " AND cd.fk_".$this->linked_object[0]['type']." = c.rowid";
 				$sql .= " AND cd.fk_".$this->linked_object[0]['type']." = ".$this->linked_object[0]['linkid'];
@@ -996,28 +1012,26 @@ class Livraison extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Set the planned delivery date
 	 *
 	 *	@param      User			$user        		Objet utilisateur qui modifie
-	 *	@param      integer 		$date_livraison     Date de livraison
+	 *	@param      integer 		$delivery_date     Delivery date
 	 *	@return     int         						<0 if KO, >0 if OK
 	 */
-    public function set_date_livraison($user, $date_livraison)
+	public function setDeliveryDate($user, $delivery_date)
 	{
-        // phpcs:enable
 		if ($user->rights->expedition->creer)
 		{
-			$sql = "UPDATE ".MAIN_DB_PREFIX."livraison";
-			$sql .= " SET date_delivery = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
+			$sql = "UPDATE ".MAIN_DB_PREFIX."delivery";
+			$sql .= " SET date_delivery = ".($delivery_date ? "'".$this->db->idate($delivery_date)."'" : 'null');
 			$sql .= " WHERE rowid = ".$this->id;
 
-			dol_syslog(get_class($this)."::set_date_livraison", LOG_DEBUG);
+			dol_syslog(get_class($this)."::setDeliveryDate", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				$this->date_delivery = $date_livraison;
+				$this->date_delivery = $delivery_date;
 				return 1;
 			} else {
 				$this->error = $this->db->error();
@@ -1050,12 +1064,12 @@ class Livraison extends CommonObject
 
 			if ($this->model_pdf) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->LIVRAISON_ADDON_PDF)) {
-				$modele = $conf->global->LIVRAISON_ADDON_PDF;
+			} elseif (!empty($conf->global->DELIVERY_ADDON_PDF)) {
+				$modele = $conf->global->DELIVERY_ADDON_PDF;
 			}
 		}
 
-		$modelpath = "core/modules/livraison/doc/";
+		$modelpath = "core/modules/delivery/doc/";
 
 		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
@@ -1071,7 +1085,7 @@ class Livraison extends CommonObject
 	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
 	{
 		$tables = array(
-			'livraison'
+			'delivery'
 		);
 
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
@@ -1083,25 +1097,35 @@ class Livraison extends CommonObject
 /**
  *  Management class of delivery note lines
  */
-class LivraisonLigne extends CommonObjectLine
+class DeliveryLine extends CommonObjectLine
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    // From llx_expeditiondet
-    public $qty;
-    public $qty_asked;
-    public $qty_shipped;
-    public $price;
-    public $fk_product;
-    public $origin_id;
+	/**
+	 * @var string ID to identify managed object
+	 */
+	public $element = 'deliverydet';
 
-    /**
-     * @var string delivery note lines label
-     */
-    public $label;
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'deliverydet';
+
+	// From llx_expeditiondet
+	public $qty;
+	public $qty_asked;
+	public $qty_shipped;
+	public $price;
+	public $fk_product;
+	public $origin_id;
+
+	/**
+	 * @var string delivery note lines label
+	 */
+	public $label;
 
 	/**
 	 * @var string product description
@@ -1119,26 +1143,18 @@ class LivraisonLigne extends CommonObjectLine
 	 */
 	public $libelle;
 
+	public $origin_line_id;
+
 	public $product_ref;
 	public $product_label;
 
 	/**
-	 * @var string ID to identify managed object
+	 *	Constructor
+	 *
+	 *	@param	DoliDB	$db		Database handler
 	 */
-	public $element = 'livraisondet';
-
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element = 'livraisondet';
-
-    /**
-     *	Constructor
-     *
-     *	@param	DoliDB	$db		Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 }
diff --git a/htdocs/livraison/index.html b/htdocs/delivery/class/index.html
similarity index 100%
rename from htdocs/livraison/index.html
rename to htdocs/delivery/class/index.html
diff --git a/htdocs/delivery/index.html b/htdocs/delivery/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/document.php b/htdocs/document.php
index ab3ad20a8f8..060722e8d5b 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -153,7 +153,7 @@ if (isset($_GET["attachment"])) $attachment = GETPOST("attachment", 'alpha') ?tr
 if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment = false;
 
 // Define mime type
-$type = 'application/octet-stream';	// By default
+$type = 'application/octet-stream'; // By default
 if (GETPOST('type', 'alpha')) $type = GETPOST('type', 'alpha');
 else $type = dol_mimetype($original_file);
 // Security: Force to octet-stream if file is a dangerous file. For example when it is a .noexe file
@@ -173,7 +173,7 @@ $refname = basename(dirname($original_file)."/");
 if (empty($modulepart)) accessforbidden('Bad value for parameter modulepart');
 
 // Check security and set return info with full path of file
-$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, $refname);
+$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, $user, $refname);
 $accessallowed              = $check_access['accessallowed'];
 $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
 $fullpath_original_file     = $check_access['original_file']; // $fullpath_original_file is now a full path name
@@ -243,6 +243,23 @@ if (!file_exists($fullpath_original_file_osencoded))
 	exit;
 }
 
+// Hooks
+if (!is_object($hookmanager)) {
+	include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+	$hookmanager = new HookManager($this->db);
+}
+$hookmanager->initHooks(array('document'));
+$parameters = array('ecmfile' => $ecmfile, 'modulepart' => $modulepart, 'original_file' => $original_file,
+	'entity' => $entity, 'refname' => $refname, 'fullpath_original_file' => $fullpath_original_file,
+	'filename' => $filename, 'fullpath_original_file_osencoded' => $fullpath_original_file_osencoded);
+$reshook = $hookmanager->executeHooks('downloadDocument', $parameters); // Note that $action and $object may have been
+if ($reshook < 0) {
+	$errors = $hookmanager->error.(is_array($hookmanager->errors) ? (!empty($hookmanager->error) ? ', ' : '').join($separator, $hookmanager->errors) : '');
+	dol_syslog("document.php - Errors when executing the hook 'downloadDocument' : ".$errors);
+	print "ErrorDownloadDocumentHooks: ".$errors;
+	exit;
+}
+
 // Permissions are ok and file found, so we return it
 top_httphead($type);
 header('Content-Description: File Transfer');
@@ -261,10 +278,11 @@ if (!$attachment && !empty($conf->global->MAIN_USE_EXIF_ROTATION) && image_forma
 	$readfile = !$imgres;
 }
 
+if (is_object($db)) $db->close();
+
+// Send file now
 if ($readfile) {
 	header('Content-Length: '.dol_filesize($fullpath_original_file));
 
-	readfile($fullpath_original_file_osencoded);
+	readfileLowMemory($fullpath_original_file_osencoded);
 }
-
-if (is_object($db)) $db->close();
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index 6a28424d81b..78a3d50dfcc 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -51,33 +51,33 @@ $type = 'donation';
 
 if ($action == 'specimen')
 {
-    $modele = GETPOST('module', 'alpha');
+	$modele = GETPOST('module', 'alpha');
 
-    $don = new Don($db);
-    $don->initAsSpecimen();
+	$don = new Don($db);
+	$don->initAsSpecimen();
 
-    // Search template files
-    $dir = DOL_DOCUMENT_ROOT."/core/modules/dons/";
-    $file = $modele.".modules.php";
-    if (file_exists($dir.$file))
-    {
-        $classname = $modele;
-        require_once $dir.$file;
+	// Search template files
+	$dir = DOL_DOCUMENT_ROOT."/core/modules/dons/";
+	$file = $modele.".modules.php";
+	if (file_exists($dir.$file))
+	{
+		$classname = $modele;
+		require_once $dir.$file;
 
-        $obj = new $classname($db);
+		$obj = new $classname($db);
 
-        if ($obj->write_file($don, $langs) > 0)
-        {
-            header("Location: ".DOL_URL_ROOT."/document.php?modulepart=donation&file=SPECIMEN.html");
-            return;
-        } else {
-            setEventMessages($obj->error, $obj->errors, 'errors');
-            dol_syslog($obj->error, LOG_ERR);
-        }
-    } else {
-        setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-        dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
-    }
+		if ($obj->write_file($don, $langs) > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=donation&file=SPECIMEN.html");
+			return;
+		} else {
+			setEventMessages($obj->error, $obj->errors, 'errors');
+			dol_syslog($obj->error, LOG_ERR);
+		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
 }
 
 // Set default model
@@ -107,7 +107,7 @@ elseif ($action == 'set')
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->DON_ADDON_MODEL == "$value") dolibarr_del_const($db, 'DON_ADDON_MODEL', $conf->entity);
+		if ($conf->global->DON_ADDON_MODEL == "$value") dolibarr_del_const($db, 'DON_ADDON_MODEL', $conf->entity);
 	}
 }
 
@@ -116,32 +116,32 @@ if ($action == 'set_DONATION_ACCOUNTINGACCOUNT')
 {
 	$account = GETPOST('DONATION_ACCOUNTINGACCOUNT', 'alpha');
 
-    $res = dolibarr_set_const($db, "DONATION_ACCOUNTINGACCOUNT", $account, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "DONATION_ACCOUNTINGACCOUNT", $account, 'chaine', 0, '', $conf->entity);
 
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 if ($action == 'set_DONATION_MESSAGE')
 {
 	$freemessage = GETPOST('DONATION_MESSAGE', 'restricthtml'); // No alpha here, we want exact string
 
-    $res = dolibarr_set_const($db, "DONATION_MESSAGE", $freemessage, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "DONATION_MESSAGE", $freemessage, 'chaine', 0, '', $conf->entity);
 
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 /*
@@ -149,26 +149,26 @@ if ($action == 'set_DONATION_MESSAGE')
  */
 if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 {
-    $code = $reg[1];
-    if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
-    {
-        header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    } else {
-        dol_print_error($db);
-    }
+	$code = $reg[1];
+	if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	} else {
+		dol_print_error($db);
+	}
 }
 
 if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 {
-    $code = $reg[1];
-    if (dolibarr_del_const($db, $code, $conf->entity) > 0)
-    {
-        header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    } else {
-        dol_print_error($db);
-    }
+	$code = $reg[1];
+	if (dolibarr_del_const($db, $code, $conf->entity) > 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	} else {
+		dol_print_error($db);
+	}
 }
 
 /*
@@ -185,7 +185,7 @@ print load_fiche_titre($langs->trans("DonationsSetup"), $linkback, 'title_setup'
 
 $head = donation_admin_prepare_head();
 
-dol_fiche_head($head, 'general', $langs->trans("Donations"), -1, 'payment');
+print dol_get_fiche_head($head, 'general', $langs->trans("Donations"), -1, 'payment');
 
 
 // Document templates
@@ -332,10 +332,10 @@ print $form->textwithpicto($langs->trans("DonationUserThirdparties"), $langs->tr
 print '</td>';
 print '<td class="center">';
 if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('DONATION_USE_THIRDPARTIES');
+	print ajax_constantonoff('DONATION_USE_THIRDPARTIES');
 } else {
-    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("DONATION_USE_THIRDPARTIES", $arrval, $conf->global->DONATION_USE_THIRDPARTIES);
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $form->selectarray("DONATION_USE_THIRDPARTIES", $arrval, $conf->global->DONATION_USE_THIRDPARTIES);
 }
 print "</td>\n";
 print "</tr>\n";
@@ -387,34 +387,34 @@ if (preg_match('/fr/i', $conf->global->MAIN_INFO_SOCIETE_COUNTRY))
 	print '<tr class="oddeven">';
 	print '<td width="80%">'.$langs->trans("DONATION_ART200").'</td>';
 	print '<td class="center">';
-    if ($conf->use_javascript_ajax) {
-        print ajax_constantonoff('DONATION_ART200');
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("DONATION_ART200", $arrval, $conf->global->DONATION_ART200);
-    }
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('DONATION_ART200');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("DONATION_ART200", $arrval, $conf->global->DONATION_ART200);
+	}
 	print '</td></tr>';
 
 	print '<tr class="oddeven">';
 	print '<td width="80%">'.$langs->trans("DONATION_ART238").'</td>';
 	print '<td class="center">';
-    if ($conf->use_javascript_ajax) {
-        print ajax_constantonoff('DONATION_ART238');
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("DONATION_ART238", $arrval, $conf->global->DONATION_ART238);
-    }
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('DONATION_ART238');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("DONATION_ART238", $arrval, $conf->global->DONATION_ART238);
+	}
 	print '</td></tr>';
 
 	print '<tr class="oddeven">';
 	print '<td width="80%">'.$langs->trans("DONATION_ART978").'</td>';
 	print '<td class="center">';
-    if ($conf->use_javascript_ajax) {
-        print ajax_constantonoff('DONATION_ART978');
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("DONATION_ART978", $arrval, $conf->global->DONATION_ART978);
-    }
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('DONATION_ART978');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("DONATION_ART978", $arrval, $conf->global->DONATION_ART978);
+	}
 	print '</td></tr>';
 	print "</table>\n";
 }
diff --git a/htdocs/don/admin/donation_extrafields.php b/htdocs/don/admin/donation_extrafields.php
index ddf0e56933c..6062d4fca26 100644
--- a/htdocs/don/admin/donation_extrafields.php
+++ b/htdocs/don/admin/donation_extrafields.php
@@ -66,11 +66,11 @@ print load_fiche_titre($langs->trans("DonationsSetup"), $linkback, 'title_setup'
 
 $head = donation_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Donations"), -1, 'payment');
+print dol_get_fiche_head($head, 'attributes', $langs->trans("Donations"), -1, 'payment');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 95bebb3ef8d..c55751e913f 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2013       Florian Henry           <florian.henry@open-concept.pro>
  * Copyright (C) 2015-2016  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018-2019  Thibault FOUCART        <support@ptibogxiv.net>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric 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
@@ -39,8 +39,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 if (!empty($conf->projet->enabled)) {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
@@ -49,9 +49,12 @@ $langs->loadLangs(array("bills", "companies", "donations"));
 $id = GETPOST('rowid') ?GETPOST('rowid', 'int') : GETPOST('id', 'int');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
-$amount = GETPOST('amount');
+$confirm = GETPOST('confirm', 'alpha');
+
+$amount = price2num(GETPOST('amount', 'alphanohtml'), 'MT');
 $donation_date = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
 $projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
+$public_donation = (int) GETPOST("public", 'int');
 
 $object = new Don($db);
 $extrafields = new ExtraFields($db);
@@ -65,14 +68,52 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('doncard', 'globalcard'));
 
+$upload_dir = $conf->don->dir_output;
+$permissiontoadd = $user->rights->don->creer;
+
 
 /*
  * Actions
  */
 
+$parameters = array();
+
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
+// Action reopen object
+if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissiontoadd)
+{
+	$object->fetch($id);
+
+	$result = $object->reopen($user);
+	if ($result >= 0)
+	{
+		// Define output language
+		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (method_exists($object, 'generateDocument')) {
+				$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->model_pdf;
+				$ret = $object->fetch($id); // Reload to get new records
+
+				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			}
+		}
+
+		header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
+		exit;
+	} else {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+}
+
 if ($action == 'update')
 {
 	if (!empty($cancel))
@@ -83,12 +124,12 @@ if ($action == 'update')
 
 	$error = 0;
 
-    if (empty($donation_date))
-    {
-    	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
-        $action = "create";
-        $error++;
-    }
+	if (empty($donation_date))
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
+		$action = "create";
+		$error++;
+	}
 
 	if (empty($amount))
 	{
@@ -101,28 +142,27 @@ if ($action == 'update')
 	{
 		$object->fetch($id);
 
-		$object->firstname = GETPOST("firstname", 'alpha');
-		$object->lastname = GETPOST("lastname", 'alpha');
-		$object->societe = GETPOST("societe", 'alpha');
-		$object->address = GETPOST("address", 'alpha');
+		$object->firstname = (string) GETPOST("firstname", 'alpha');
+		$object->lastname = (string) GETPOST("lastname", 'alpha');
+		$object->societe = (string) GETPOST("societe", 'alpha');
+		$object->address = (string) GETPOST("address", 'alpha');
 		$object->amount = price2num(GETPOST("amount", 'alpha'));
-		$object->town = GETPOST("town", 'alpha');
-		$object->zip = GETPOST("zipcode", 'alpha');
-		$object->country_id = GETPOST('country_id', 'int');
-		$object->email = GETPOST("email", 'alpha');
+		$object->town = (string) GETPOST("town", 'alpha');
+		$object->zip = (string) GETPOST("zipcode", 'alpha');
+		$object->country_id = (int) GETPOST('country_id', 'int');
+		$object->email = (string) GETPOST("email", 'alpha');
 		$object->date = $donation_date;
-		$object->public = GETPOST("public", 'alpha');
-		$object->fk_project = GETPOST("fk_project", 'alpha');
-		$object->note_private = GETPOST("note_private", 'restricthtml');
-		$object->note_public = GETPOST("note_public", 'restricthtml');
-		$object->modepaymentid = GETPOST('modepayment', 'int');
+		$object->public = $public_donation;
+		$object->fk_project = (int) GETPOST("fk_project", 'int');
+		$object->note_private = (string) GETPOST("note_private", 'restricthtml');
+		$object->note_public = (string) GETPOST("note_public", 'restricthtml');
+		$object->modepaymentid = (int) GETPOST('modepayment', 'int');
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost(null, $object);
 		if ($ret < 0) $error++;
 
-		if ($object->update($user) > 0)
-		{
+		if ($object->update($user) > 0) {
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 			exit;
 		}
@@ -139,12 +179,12 @@ if ($action == 'add')
 
 	$error = 0;
 
-    if (empty($donation_date))
-    {
-    	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
-        $action = "create";
-        $error++;
-    }
+	if (empty($donation_date))
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
+		$action = "create";
+		$error++;
+	}
 
 	if (empty($amount))
 	{
@@ -155,30 +195,29 @@ if ($action == 'add')
 
 	if (!$error)
 	{
-        $object->socid = GETPOST("socid", 'int');
-		$object->firstname = GETPOST("firstname", 'alpha');
-		$object->lastname = GETPOST("lastname", 'alpha');
-		$object->societe = GETPOST("societe", 'alpha');
-		$object->address = GETPOST("address", 'alpha');
+		$object->socid = (int) GETPOST("socid", 'int');
+		$object->firstname = (string) GETPOST("firstname", 'alpha');
+		$object->lastname = (string) GETPOST("lastname", 'alpha');
+		$object->societe = (string) GETPOST("societe", 'alpha');
+		$object->address = (string) GETPOST("address", 'alpha');
 		$object->amount = price2num(GETPOST("amount", 'alpha'));
-		$object->zip = GETPOST("zipcode", 'alpha');
-		$object->town = GETPOST("town", 'alpha');
-		$object->country_id = GETPOST('country_id', 'int');
-		$object->email = GETPOST('email', 'alpha');
-        $object->date = $donation_date;
-		$object->note_private = GETPOST("note_private", 'restricthtml');
-		$object->note_public = GETPOST("note_public", 'restricthtml');
-		$object->public = GETPOST("public", 'alpha');
-		$object->fk_project = GETPOST("fk_project", 'alpha');
-		$object->modepaymentid = GETPOST('modepayment', 'int');
+		$object->zip = (string) GETPOST("zipcode", 'alpha');
+		$object->town = (string) GETPOST("town", 'alpha');
+		$object->country_id = (int) GETPOST('country_id', 'int');
+		$object->email = (string) GETPOST('email', 'alpha');
+		$object->date = $donation_date;
+		$object->note_private = (string) GETPOST("note_private", 'restricthtml');
+		$object->note_public = (string) GETPOST("note_public", 'restricthtml');
+		$object->public = $public_donation;
+		$object->fk_project = (int) GETPOST("fk_project", 'int');
+		$object->modepaymentid = (int) GETPOST('modepayment', 'int');
 
 		// Fill array 'array_options' with data from add form
-        $ret = $extrafields->setOptionalsFromPost(null, $object);
+		$ret = $extrafields->setOptionalsFromPost(null, $object);
 		if ($ret < 0) $error++;
 
 		$res = $object->create($user);
-		if ($res > 0)
-		{
+		if ($res > 0) {
 			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$res);
 			exit;
 		} else {
@@ -186,62 +225,47 @@ if ($action == 'add')
 		}
 	}
 }
-if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights->don->supprimer)
-{
-    $object->fetch($id);
-    $result = $object->delete($user);
-    if ($result > 0)
-    {
-        header("Location: index.php");
-        exit;
-    } else {
-        dol_syslog($object->error, LOG_DEBUG);
-        setEventMessages($object->error, $object->errors, 'errors');
-    }
-}
-if ($action == 'valid_promesse')
-{
+if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights->don->supprimer) {
 	$object->fetch($id);
-	if ($object->valid_promesse($id, $user->id) >= 0)
-	{
+	$result = $object->delete($user);
+	if ($result > 0) {
+		header("Location: index.php");
+		exit;
+	} else {
+		dol_syslog($object->error, LOG_DEBUG);
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+}
+if ($action == 'valid_promesse') {
+	$object->fetch($id);
+	if ($object->valid_promesse($id, $user->id) >= 0) {
 		setEventMessages($langs->trans("DonationValidated", $object->ref), null);
-
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-		exit;
+		$action = '';
 	} else {
-	    setEventMessages($object->error, $object->errors, 'errors');
-    }
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
 }
-if ($action == 'set_cancel')
-{
+if ($action == 'set_cancel') {
 	$object->fetch($id);
-	if ($object->set_cancel($id) >= 0)
-    {
-        header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-        exit;
-    } else {
-	    setEventMessages($object->error, $object->errors, 'errors');
-    }
-}
-if ($action == 'set_paid')
-{
-	$object->fetch($id);
-	if ($object->set_paid($id, $modepayment) >= 0)
-	{
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-		exit;
+	if ($object->set_cancel($id) >= 0) {
+		$action = '';
 	} else {
-	    setEventMessages($object->error, $object->errors, 'errors');
-    }
-} elseif ($action == 'classin' && $user->rights->don->creer)
-{
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+}
+if ($action == 'set_paid') {
+	$object->fetch($id);
+	if ($object->set_paid($id, $modepayment) >= 0) {
+		$action = '';
+	} else {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+} elseif ($action == 'classin' && $user->rights->don->creer) {
 	$object->fetch($id);
 	$object->setProject($projectid);
 }
 
 // Actions to build doc
-$upload_dir = $conf->don->dir_output;
-$permissiontoadd = $user->rights->don->creer;
 include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 
@@ -317,7 +341,7 @@ if ($action == 'create')
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 
-	dol_fiche_head('');
+	print dol_get_fiche_head('');
 
 	print '<table class="border centpercent">';
 	print '<tbody>';
@@ -351,11 +375,12 @@ if ($action == 'create')
 			print '<td colspan="2">';
 			print $form->select_company($soc->id, 'socid', '(s.client = 1 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 			// Option to reload page to retrieve customer informations. Note, this clear other input
-			if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
+			if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED))
 			{
 				print '<script type="text/javascript">
 				$(document).ready(function() {
 					$("#socid").change(function() {
+						console.log("We have changed the company - Reload page");
 						var socid = $(this).val();
 				        var fac_rec = $(\'#fac_rec\').val();
 						// reload page
@@ -380,7 +405,7 @@ if ($action == 'create')
 
 	// Public donation
 	print '<tr><td class="fieldrequired">'.$langs->trans("PublicDonation")."</td><td>";
-	print $form->selectyesno("public", isset($_POST["public"]) ? $_POST["public"] : 1, 1);
+	print $form->selectyesno("public", $public_donation, 1);
 	print "</td></tr>\n";
 
 	if (empty($conf->societe->enabled) || empty($conf->global->DONATION_USE_THIRDPARTIES))
@@ -393,9 +418,9 @@ if ($action == 'create')
 
 		// Zip / Town
 		print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
-		print $formcompany->select_ziptown((isset($_POST["zipcode"]) ? $_POST["zipcode"] : $object->zip), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
+		print $formcompany->select_ziptown((GETPOSTISSET("zipcode") ? GETPOST("zipcode") : $object->zip), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
 		print ' ';
-		print $formcompany->select_ziptown((isset($_POST["town"]) ? $_POST["town"] : $object->town), 'town', array('zipcode', 'selectcountry_id', 'state_id'));
+		print $formcompany->select_ziptown((GETPOSTISSET("town") ? GETPOST("town") : $object->town), 'town', array('zipcode', 'selectcountry_id', 'state_id'));
 		print '</tr>';
 
 		// Country
@@ -418,7 +443,7 @@ if ($action == 'create')
 	print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
 	print '<td>';
 
-    $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
 	print $doleditor->Create(1);
 	print '</td></tr>';
 
@@ -434,30 +459,30 @@ if ($action == 'create')
 	}
 
 	if (!empty($conf->projet->enabled))
-    {
-        print "<tr><td>".$langs->trans("Project")."</td><td>";
-        $formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');
+	{
+		print "<tr><td>".$langs->trans("Project")."</td><td>";
+		$formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');
 		print "</td></tr>\n";
-    }
+	}
 
-    // Other attributes
-    $parameters = array();
-    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-    if (empty($reshook))
-    {
+	// Other attributes
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	if (empty($reshook))
+	{
 		print $object->showOptionals($extrafields, 'edit', $parameters);
-    }
+	}
 
-    print '</tbody>';
+	print '</tbody>';
 	print "</table>\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
-	print '<input type="submit" class="button" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+	print '<input type="submit" class="button button-save" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" onClick="javascript:history.go(-1)">';
+	print '<input type="button" class="button button-cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" onClick="javascript:history.go(-1)">';
 	print '</div>';
 
 	print "</form>\n";
@@ -491,7 +516,7 @@ if (!empty($id) && $action == 'edit')
 	print '<input type="hidden" name="amount" value="'.$object->amount.'">';
 
 
-	dol_fiche_head($head, $hselected, $langs->trans("Donation"), 0, 'donation');
+	print dol_get_fiche_head($head, $hselected, $langs->trans("Donation"), 0, 'donation');
 
 	print '<table class="border centpercent">';
 
@@ -507,8 +532,7 @@ if (!empty($id) && $action == 'edit')
 	print '</td>';
 
 	// Amount
-	if ($object->statut == 0)
-	{
+	if ($object->statut == 0) {
 		print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10" value="'.price($object->amount).'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
 	} else {
 		print '<tr><td>'.$langs->trans("Amount").'</td><td>';
@@ -517,75 +541,74 @@ if (!empty($id) && $action == 'edit')
 	}
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("PublicDonation")."</td><td>";
-	print $form->selectyesno("public", 1, 1);
+	print $form->selectyesno("public", $object->public, 1);
 	print "</td>";
 	print "</tr>\n";
 
-    if ($object->socid && !empty($conf->societe->enabled) && !empty($conf->global->DONATION_USE_THIRDPARTIES)) {
-        $company = new Societe($db);
-        $result = $company->fetch($object->socid);
+	if ($object->socid && !empty($conf->societe->enabled) && !empty($conf->global->DONATION_USE_THIRDPARTIES)) {
+		$company = new Societe($db);
+		$result = $company->fetch($object->socid);
 
-        print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td colspan="2">'.$company->getNomUrl(1).'</td></tr>';
-    } else {
-        $langs->load("companies");
-        print '<tr><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" class="maxwidth200" value="'.dol_escape_htmltag($object->societe).'"></td></tr>';
-        print '<tr><td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" class="maxwidth200" value="'.dol_escape_htmltag($object->lastname).'"></td></tr>';
-        print '<tr><td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" class="maxwidth200" value="'.dol_escape_htmltag($object->firstname).'"></td></tr>';
-        print '<tr><td>'.$langs->trans("Address").'</td><td>';
-        print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag($object->address, 0, 1).'</textarea></td></tr>';
+		print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td colspan="2">'.$company->getNomUrl(1).'</td></tr>';
+	} else {
+		$langs->load("companies");
+		print '<tr><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" class="maxwidth200" value="'.dol_escape_htmltag($object->societe).'"></td></tr>';
+		print '<tr><td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" class="maxwidth200" value="'.dol_escape_htmltag($object->lastname).'"></td></tr>';
+		print '<tr><td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" class="maxwidth200" value="'.dol_escape_htmltag($object->firstname).'"></td></tr>';
+		print '<tr><td>'.$langs->trans("Address").'</td><td>';
+		print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag($object->address, 0, 1).'</textarea></td></tr>';
 
-        // Zip / Town
-        print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
-        print $formcompany->select_ziptown((isset($_POST["zipcode"]) ? $_POST["zipcode"] : $object->zip), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
-        print ' ';
-        print $formcompany->select_ziptown((isset($_POST["town"]) ? $_POST["town"] : $object->town), 'town', array('zipcode', 'selectcountry_id', 'state_id'));
-        print '</tr>';
+		// Zip / Town
+		print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
+		print $formcompany->select_ziptown((GETPOSTISSET("zipcode") ? GETPOSTISSET("zipcode") : $object->zip), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
+		print ' ';
+		print $formcompany->select_ziptown((GETPOSTISSET("town") ? GETPOST("town") : $object->town), 'town', array('zipcode', 'selectcountry_id', 'state_id'));
+		print '</tr>';
 
-        // Country
-        print '<tr><td class="titlefieldcreate">'.$langs->trans('Country').'</td><td>';
-        print $form->select_country((!empty($object->country_id) ? $object->country_id : $mysoc->country_code), 'country_id');
-        if ($user->admin) {
-            print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-        }
-        print '</td></tr>';
+		// Country
+		print '<tr><td class="titlefieldcreate">'.$langs->trans('Country').'</td><td>';
+		print $form->select_country((!empty($object->country_id) ? $object->country_id : $mysoc->country_code), 'country_id');
+		if ($user->admin) {
+			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		}
+		print '</td></tr>';
 
-        print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" class="maxwidth200" value="'.dol_escape_htmltag($object->email).'"></td></tr>';
-    }
-    // Payment mode
-    print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
-    if ($object->mode_reglement_id) $selected = $object->mode_reglement_id;
-    else $selected = '';
-    $form->select_types_paiements($selected, 'modepayment', 'CRDT', 0, 1);
-    print "</td></tr>\n";
+		print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" class="maxwidth200" value="'.dol_escape_htmltag($object->email).'"></td></tr>';
+	}
+	// Payment mode
+	print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
+	if ($object->mode_reglement_id) $selected = $object->mode_reglement_id;
+	else $selected = '';
+	$form->select_types_paiements($selected, 'modepayment', 'CRDT', 0, 1);
+	print "</td></tr>\n";
 
-    // Status
+	// Status
 	print "<tr>".'<td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
 
-    // Project
-    if (!empty($conf->projet->enabled))
-    {
-    	$formproject = new FormProjets($db);
+	// Project
+	if (!empty($conf->projet->enabled)) {
+		$formproject = new FormProjets($db);
 
-        $langs->load('projects');
-        print '<tr><td>'.$langs->trans('Project').'</td><td>';
+		$langs->load('projects');
+		print '<tr><td>'.$langs->trans('Project').'</td><td>';
 		$formproject->select_projects(-1, $object->fk_project, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');
-        print '</td></tr>';
-    }
+		print '</td></tr>';
+	}
 
-    // Other attributes
-    $parameters = array();
-    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-    if (empty($reshook))
-    {
-      	print $object->showOptionals($extrafields, 'edit', $parameters);
-    }
+	// Other attributes
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	if (empty($reshook))
+	{
+	  	print $object->showOptionals($extrafields, 'edit', $parameters);
+	}
 
 	print "</table>\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
-	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"> &nbsp; &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
+	print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'"> &nbsp; &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
 
 	print "</form>\n";
 }
@@ -600,11 +623,11 @@ if (!empty($id) && $action == 'edit')
 if (!empty($id) && $action != 'edit')
 {
 	// Confirmation delete
-    if ($action == 'delete')
-    {
-        $text = $langs->trans("ConfirmDeleteADonation");
-        print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("DeleteADonation"), $text, "confirm_delete", '', '', 1);
-    }
+	if ($action == 'delete')
+	{
+		$text = $langs->trans("ConfirmDeleteADonation");
+		print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("DeleteADonation"), $text, "confirm_delete", '', '', 1);
+	}
 
 	$result = $object->fetch($id);
 	if ($result < 0) {
@@ -618,7 +641,7 @@ if (!empty($id) && $action != 'edit')
 	$hselected = 'card';
 
 	$head = donation_prepare_head($object);
-	dol_fiche_head($head, $hselected, $langs->trans("Donation"), -1, 'donation');
+	print dol_get_fiche_head($head, $hselected, $langs->trans("Donation"), -1, 'donation');
 
 	// Print form confirm
 	print $formconfirm;
@@ -629,54 +652,54 @@ if (!empty($id) && $action != 'edit')
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= $langs->trans('Project').' ';
-	    if ($user->rights->don->creer)
-	    {
-	        if ($action != 'classify') {
-                $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-            }
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1, 0, 'maxwidth500');
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	            $morehtmlref .= $proj->ref;
-	            $morehtmlref .= '</a>';
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+		$langs->load("projects");
+		$morehtmlref .= $langs->trans('Project').' ';
+		if ($user->rights->don->creer)
+		{
+			if ($action != 'classify') {
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			}
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1, 0, 'maxwidth500');
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
 
-    dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
 
 
-    print '<div class="fichecenter">';
-    print '<div class="fichehalfleft">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border tableforfield" width="100%">';
+	print '<table class="border tableforfield" width="100%">';
 
 	// Date
 	print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td colspan="2">';
 	print dol_print_date($object->date, "day");
 	print "</td>";
 
-    print '<tr><td>'.$langs->trans("Amount").'</td><td colspan="2">';
+	print '<tr><td>'.$langs->trans("Amount").'</td><td colspan="2">';
 	print price($object->amount, 0, $langs, 0, 0, -1, $conf->currency);
 	print '</td></tr>';
 
@@ -684,16 +707,16 @@ if (!empty($id) && $action != 'edit')
 	print yn($object->public);
 	print '</td></tr>';
 
-    if ($object->socid) {
-        $company = new Societe($db);
-        $result = $company->fetch($object->socid);
+	if ($object->socid) {
+		$company = new Societe($db);
+		$result = $company->fetch($object->socid);
 
-        print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td colspan="2">'.$company->getNomUrl(1).'</td></tr>';
-    } else {
-        print '<tr><td>'.$langs->trans("Company").'</td><td colspan="2">'.$object->societe.'</td></tr>';
-        print '<tr><td>'.$langs->trans("Lastname").'</td><td colspan="2">'.$object->lastname.'</td></tr>';
-        print '<tr><td>'.$langs->trans("Firstname").'</td><td colspan="2">'.$object->firstname.'</td></tr>';
-    }
+		print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td colspan="2">'.$company->getNomUrl(1).'</td></tr>';
+	} else {
+		print '<tr><td>'.$langs->trans("Company").'</td><td colspan="2">'.$object->societe.'</td></tr>';
+		print '<tr><td>'.$langs->trans("Lastname").'</td><td colspan="2">'.$object->lastname.'</td></tr>';
+		print '<tr><td>'.$langs->trans("Firstname").'</td><td colspan="2">'.$object->firstname.'</td></tr>';
+	}
 
 	// Payment mode
 	print "<tr><td>".$langs->trans("PaymentMode")."</td><td>";
@@ -745,8 +768,8 @@ if (!empty($id) && $action != 'edit')
 			print '<tr class="oddeven"><td>';
 			print '<a href="'.DOL_URL_ROOT.'/don/payment/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"), "payment").' '.$objp->rowid.'</a></td>';
 			print '<td>'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
-		    $labeltype = $langs->trans("PaymentType".$objp->type_code) != ("PaymentType".$objp->type_code) ? $langs->trans("PaymentType".$objp->type_code) : $objp->paiement_type;
-            print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
+			$labeltype = $langs->trans("PaymentType".$objp->type_code) != ("PaymentType".$objp->type_code) ? $langs->trans("PaymentType".$objp->type_code) : $objp->paiement_type;
+			print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
 			print '<td class="right">'.price($objp->amount)."</td>\n";
 			print "</tr>";
 			$totalpaid += $objp->amount;
@@ -775,7 +798,7 @@ if (!empty($id) && $action != 'edit')
 
 	print '<div class="clearboth"></div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$remaintopay = $object->amount - $totalpaid;
 
@@ -783,20 +806,26 @@ if (!empty($id) && $action != 'edit')
 
 	print '<div class="tabsAction">';
 
+	// Re-open
+	if ($permissiontoadd && $object->statut == $object::STATUS_CANCELED)
+	{
+		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_reopen&confirm=yes&token='.newToken().'">'.$langs->trans("ReOpen").'</a>';
+	}
+
 	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$object->id.'">'.$langs->trans('Modify').'</a></div>';
 
-	if ($object->statut == 0)
+	if ($object->statut == $object::STATUS_DRAFT)
 	{
 		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=valid_promesse&token='.newToken().'">'.$langs->trans("ValidPromess").'</a></div>';
 	}
 
-    if (($object->statut == 0 || $object->statut == 1) && $totalpaid == 0 && $object->paid == 0)
-    {
-        print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=set_cancel&token='.newToken().'">'.$langs->trans("ClassifyCanceled")."</a></div>";
-    }
+	if (($object->statut == $object::STATUS_DRAFT || $object->statut == $object::STATUS_VALIDATED) && $totalpaid == 0 && $object->paid == 0)
+	{
+		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=set_cancel&token='.newToken().'">'.$langs->trans("ClassifyCanceled")."</a></div>";
+	}
 
 	// Create payment
-	if ($object->statut == 1 && $object->paid == 0 && $user->rights->don->creer)
+	if ($object->statut == $object::STATUS_VALIDATED && $object->paid == 0 && $user->rights->don->creer)
 	{
 		if ($remaintopay == 0)
 		{
@@ -807,7 +836,7 @@ if (!empty($id) && $action != 'edit')
 	}
 
 	// Classify 'paid'
-	if ($object->statut == 1 && round($remaintopay) == 0 && $object->paid == 0 && $user->rights->don->creer)
+	if ($object->statut == $object::STATUS_VALIDATED && round($remaintopay) == 0 && $object->paid == 0 && $user->rights->don->creer)
 	{
 		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=set_paid">'.$langs->trans("ClassifyPaid")."</a></div>";
 	}
@@ -815,7 +844,7 @@ if (!empty($id) && $action != 'edit')
 	// Delete
 	if ($user->rights->don->supprimer)
 	{
-		if ($object->statut == -1 || $object->statut == 0)
+		if ($object->statut == $object::STATUS_CANCELED || $object->statut == $object::STATUS_DRAFT)
 		{
 			print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete")."</a></div>";
 		} else {
@@ -828,7 +857,7 @@ if (!empty($id) && $action != 'edit')
 	print "</div>";
 
 
-    print '<div class="fichecenter"><div class="fichehalfleft">';
+	print '<div class="fichecenter"><div class="fichehalfleft">';
 
 	/*
 	 * Documents generes
diff --git a/htdocs/don/class/api_donations.class.php b/htdocs/don/class/api_donations.class.php
index 2d61241c738..18a8563fd89 100644
--- a/htdocs/don/class/api_donations.class.php
+++ b/htdocs/don/class/api_donations.class.php
@@ -29,48 +29,48 @@
 class Donations extends DolibarrApi
 {
 
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'socid'
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'socid'
+	);
 
-    /**
-     * @var Don $don {@type Don}
-     */
-    public $don;
+	/**
+	 * @var Don $don {@type Don}
+	 */
+	public $don;
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-        $this->don = new Don($this->db);
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->don = new Don($this->db);
+	}
 
-    /**
-     * Get properties of an donation object
-     *
-     * Return an array with donation informations
-     *
-     * @param       int         $id         ID of order
-     * @return 	array|mixed data without useless information
-     *
-     * @throws 	RestException
-     */
-    public function get($id)
-    {
+	/**
+	 * Get properties of an donation object
+	 *
+	 * Return an array with donation informations
+	 *
+	 * @param       int         $id         ID of order
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	public function get($id)
+	{
 		if (!DolibarrApiAccess::$user->rights->don->lire) {
 			throw new RestException(401);
 		}
 
-        $result = $this->don->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Donation not found');
-        }
+		$result = $this->don->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Donation not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('don', $this->don->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
@@ -84,107 +84,107 @@ class Donations extends DolibarrApi
 
 
 
-    /**
-     * List donations
-     *
-     * Get a list of donations
-     *
-     * @param string    $sortfield          Sort field
-     * @param string    $sortorder          Sort order
-     * @param int       $limit              Limit for list
-     * @param int       $page               Page number
-     * @param string    $thirdparty_ids     Thirdparty ids to filter orders of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
-     * @param string    $sqlfilters         Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-     * @return  array                       Array of order objects
-     *
-     * @throws RestException
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
-    {
-        global $db, $conf;
+	/**
+	 * List donations
+	 *
+	 * Get a list of donations
+	 *
+	 * @param string    $sortfield          Sort field
+	 * @param string    $sortorder          Sort order
+	 * @param int       $limit              Limit for list
+	 * @param int       $page               Page number
+	 * @param string    $thirdparty_ids     Thirdparty ids to filter orders of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
+	 * @param string    $sqlfilters         Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+	 * @return  array                       Array of order objects
+	 *
+	 * @throws RestException
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        // case of external user, $thirdparty_ids param is ignored and replaced by user's socid
-        $socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
+		// case of external user, $thirdparty_ids param is ignored and replaced by user's socid
+		$socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
 
-        $sql = "SELECT t.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids)) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql .= " FROM ".MAIN_DB_PREFIX."don as t";
+		$sql = "SELECT t.rowid";
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids)) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		$sql .= " FROM ".MAIN_DB_PREFIX."don as t";
 
-        $sql .= ' WHERE t.entity IN ('.getEntity('don').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids)) $sql .= " AND t.fk_soc = sc.fk_soc";
-        if ($thirdparty_ids) $sql .= " AND t.fk_soc = ".$thirdparty_ids." ";
+		$sql .= ' WHERE t.entity IN ('.getEntity('don').')';
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids)) $sql .= " AND t.fk_soc = sc.fk_soc";
+		if ($thirdparty_ids) $sql .= " AND t.fk_soc = ".$thirdparty_ids." ";
 
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        dol_syslog("API Rest request");
-        $result = $this->db->query($sql);
+		dol_syslog("API Rest request");
+		$result = $this->db->query($sql);
 
-        if ($result)
-        {
-        	$num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            $i = 0;
-            while ($i < $min)
-            {
-            	$obj = $this->db->fetch_object($result);
-            	$don_static = new Don($this->db);
-                if ($don_static->fetch($obj->rowid)) {
-                    // Add external contacts ids
-                    //$don_static->contacts_ids = $don_static->liste_contact(-1, 'external', 1);
-                    $obj_ret[] = $this->_cleanObjectDatas($don_static);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve donation list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No donation found');
-        }
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			$i = 0;
+			while ($i < $min)
+			{
+				$obj = $this->db->fetch_object($result);
+				$don_static = new Don($this->db);
+				if ($don_static->fetch($obj->rowid)) {
+					// Add external contacts ids
+					//$don_static->contacts_ids = $don_static->liste_contact(-1, 'external', 1);
+					$obj_ret[] = $this->_cleanObjectDatas($don_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve donation list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No donation found');
+		}
 
 		return $obj_ret;
-    }
+	}
 
-    /**
-     * Create donation object
-     *
-     * @param   array   $request_data   Request data
-     * @return  int     ID of order
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->don->creer) {
-            throw new RestException(401, "Insuffisant rights");
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+	/**
+	 * Create donation object
+	 *
+	 * @param   array   $request_data   Request data
+	 * @return  int     ID of order
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->don->creer) {
+			throw new RestException(401, "Insuffisant rights");
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        foreach ($request_data as $field => $value) {
-            $this->don->$field = $value;
-        }
-        /*if (isset($request_data["lines"])) {
+		foreach ($request_data as $field => $value) {
+			$this->don->$field = $value;
+		}
+		/*if (isset($request_data["lines"])) {
           $lines = array();
           foreach ($request_data["lines"] as $line) {
             array_push($lines, (object) $line);
@@ -192,111 +192,111 @@ class Donations extends DolibarrApi
           $this->don->lines = $lines;
         }*/
 
-        if ($this->don->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, "Error creating order", array_merge(array($this->don->error), $this->don->errors));
-        }
+		if ($this->don->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, "Error creating order", array_merge(array($this->don->error), $this->don->errors));
+		}
 
-        return $this->don->id;
-    }
+		return $this->don->id;
+	}
 
-    /**
-     * Update order general fields (won't touch lines of order)
-     *
-     * @param int   $id             Id of order to update
-     * @param array $request_data   Datas
-     *
-     * @return int
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->don->creer) {
+	/**
+	 * Update order general fields (won't touch lines of order)
+	 *
+	 * @param int   $id             Id of order to update
+	 * @param array $request_data   Datas
+	 *
+	 * @return int
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->don->creer) {
 			throw new RestException(401);
 		}
 
-        $result = $this->don->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Donation not found');
-        }
+		$result = $this->don->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Donation not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('donation', $this->don->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $this->don->$field = $value;
-        }
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$this->don->$field = $value;
+		}
 
-        if ($this->don->update(DolibarrApiAccess::$user) > 0)
-        {
-            return $this->get($id);
-        } else {
-        	throw new RestException(500, $this->don->error);
-        }
-    }
+		if ($this->don->update(DolibarrApiAccess::$user) > 0)
+		{
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $this->don->error);
+		}
+	}
 
-    /**
-     * Delete donation
-     *
-     * @param   int     $id         Order ID
-     * @return  array
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->don->supprimer) {
+	/**
+	 * Delete donation
+	 *
+	 * @param   int     $id         Order ID
+	 * @return  array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->don->supprimer) {
 			throw new RestException(401);
 		}
-        $result = $this->don->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Donation not found');
-        }
+		$result = $this->don->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Donation not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('donation', $this->don->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        if (!$this->don->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(500, 'Error when delete donation : '.$this->don->error);
-        }
+		if (!$this->don->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(500, 'Error when delete donation : '.$this->don->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Donation deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Donation deleted'
+			)
+		);
+	}
 
-    /**
-     * Validate an donation
-     *
+	/**
+	 * Validate an donation
+	 *
 	 * If you get a bad value for param notrigger check, provide this in body
-     * {
-     *   "idwarehouse": 0,
-     *   "notrigger": 0
-     * }
-     *
-     * @param   int $id             Order ID
-     * @param   int $idwarehouse    Warehouse ID
-     * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
-     *
-     * @url POST    {id}/validate
-     *
+	 * {
+	 *   "idwarehouse": 0,
+	 *   "notrigger": 0
+	 * }
+	 *
+	 * @param   int $id             Order ID
+	 * @param   int $idwarehouse    Warehouse ID
+	 * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
+	 *
+	 * @url POST    {id}/validate
+	 *
 	 * @throws RestException 304
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 500
-     *
-     * @return  array
-     */
-    public function validate($id, $idwarehouse = 0, $notrigger = 0)
-    {
-        if (!DolibarrApiAccess::$user->rights->don->creer) {
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 500
+	 *
+	 * @return  array
+	 */
+	public function validate($id, $idwarehouse = 0, $notrigger = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->don->creer) {
 			throw new RestException(401);
 		}
-        $result = $this->don->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Donation not found');
-        }
+		$result = $this->don->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Donation not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('don', $this->don->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
@@ -304,62 +304,62 @@ class Donations extends DolibarrApi
 
 		$result = $this->don->valid(DolibarrApiAccess::$user, $idwarehouse, $notrigger);
 		if ($result == 0) {
-		    throw new RestException(304, 'Error nothing done. May be object is already validated');
+			throw new RestException(304, 'Error nothing done. May be object is already validated');
 		}
 		if ($result < 0) {
-		    throw new RestException(500, 'Error when validating Order: '.$this->don->error);
+			throw new RestException(500, 'Error when validating Order: '.$this->don->error);
+		}
+		$result = $this->don->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
 		}
-        $result = $this->don->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Order not found');
-        }
 
-        if (!DolibarrApi::_checkAccessToResource('don', $this->don->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('don', $this->don->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $this->don->fetchObjectLinked();
+		$this->don->fetchObjectLinked();
 
-        return $this->_cleanObjectDatas($this->don);
-    }
+		return $this->_cleanObjectDatas($this->don);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->note);
-        unset($object->address);
-        unset($object->barcode_type);
-        unset($object->barcode_type_code);
-        unset($object->barcode_type_label);
-        unset($object->barcode_type_coder);
+		unset($object->note);
+		unset($object->address);
+		unset($object->barcode_type);
+		unset($object->barcode_type_code);
+		unset($object->barcode_type_label);
+		unset($object->barcode_type_coder);
 
-        return $object;
-    }
+		return $object;
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param   array           $data   Array with data to verify
-     * @return  array
-     * @throws  RestException
-     */
-    private function _validate($data)
-    {
-        $don = array();
-        foreach (Orders::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, $field." field missing");
-            $don[$field] = $data[$field];
-        }
-        return $don;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param   array           $data   Array with data to verify
+	 * @return  array
+	 * @throws  RestException
+	 */
+	private function _validate($data)
+	{
+		$don = array();
+		foreach (Orders::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, $field." field missing");
+			$don[$field] = $data[$field];
+		}
+		return $don;
+	}
 }
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 3ccaa573e8c..be9426415fe 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2015-2017 Alexandre Spangaro   <aspangaro@open-dsi.fr>
  * Copyright (C) 2016      Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2019      Thibault FOUCART     <support@ptibogxiv.net>
- * Copyright (C) 2019      Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2020 Frédéric 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
@@ -47,7 +47,7 @@ class Don extends CommonObject
 	public $table_element = 'don';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_donation';
 
@@ -97,6 +97,10 @@ class Don extends CommonObject
 	 * @var string Email
 	 */
 	public $email;
+
+	/**
+	 * @var int 0 or 1
+	 */
 	public $public;
 
 	/**
@@ -111,6 +115,10 @@ class Don extends CommonObject
 
 	public $num_payment;
 	public $date_valid;
+
+	/**
+	 * @var int payment mode id
+	 */
 	public $modepaymentid = 0;
 
 	/**
@@ -144,8 +152,8 @@ class Don extends CommonObject
 	/**
 	 * 	Returns the donation status label (draft, valid, abandoned, paid)
 	 *
-	 *  @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long
-	 *  @return string        		Libelle
+	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @return string        			Label of status
 	 */
 	public function getLibStatut($mode = 0)
 	{
@@ -156,9 +164,9 @@ class Don extends CommonObject
 	/**
 	 *  Return the label of a given status
 	 *
-	 *  @param	int		$status        	Id statut
-	 *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 *  @return string 			       	Libelle du statut
+	 *  @param	int		$status        Id statut
+	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @return string 			       Label of status
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
@@ -167,14 +175,14 @@ class Don extends CommonObject
 		{
 			global $langs;
 			$langs->load("donations");
-			$this->labelStatus[-1] = $langs->trans("Canceled");
-			$this->labelStatus[0] = $langs->trans("DonationStatusPromiseNotValidated");
-			$this->labelStatus[1] = $langs->trans("DonationStatusPromiseValidated");
-			$this->labelStatus[2] = $langs->trans("DonationStatusPaid");
-			$this->labelStatusShort[-1] = $langs->trans("Canceled");
-			$this->labelStatusShort[0] = $langs->trans("DonationStatusPromiseNotValidatedShort");
-			$this->labelStatusShort[1] = $langs->trans("DonationStatusPromiseValidatedShort");
-			$this->labelStatusShort[2] = $langs->trans("DonationStatusPaidShort");
+			$this->labelStatus[-1] = $langs->transnoentitiesnoconv("Canceled");
+			$this->labelStatus[0] = $langs->transnoentitiesnoconv("DonationStatusPromiseNotValidated");
+			$this->labelStatus[1] = $langs->transnoentitiesnoconv("DonationStatusPromiseValidated");
+			$this->labelStatus[2] = $langs->transnoentitiesnoconv("DonationStatusPaid");
+			$this->labelStatusShort[-1] = $langs->transnoentitiesnoconv("Canceled");
+			$this->labelStatusShort[0] = $langs->transnoentitiesnoconv("DonationStatusPromiseNotValidatedShort");
+			$this->labelStatusShort[1] = $langs->transnoentitiesnoconv("DonationStatusPromiseValidatedShort");
+			$this->labelStatusShort[2] = $langs->transnoentitiesnoconv("DonationStatusPaidShort");
 		}
 
 		$statusType = 'status'.$status;
@@ -230,7 +238,7 @@ class Don extends CommonObject
 		$this->socid = 1;
 		$this->date = $now;
 		$this->date_valid = $now;
-		$this->amount = 100;
+		$this->amount = 100.90;
 		$this->public = 1;
 		$this->societe = 'The Company';
 		$this->address = 'Twist road';
@@ -239,7 +247,8 @@ class Don extends CommonObject
 		$this->note_private = 'Private note';
 		$this->note_public = 'Public note';
 		$this->email = 'email@email.com';
-		$this->note = '';
+		$this->phone = '0123456789';
+		$this->phone_mobile = '0606060606';
 		$this->statut = 1;
 	}
 
@@ -392,17 +401,17 @@ class Don extends CommonObject
 		$sql .= ", '".$this->db->escape($this->address)."'";
 		$sql .= ", '".$this->db->escape($this->zip)."'";
 		$sql .= ", '".$this->db->escape($this->town)."'";
-		$sql .= ", ".($this->country_id > 0 ? $this->country_id : '0');
-		$sql .= ", ".((int) $this->public);
-		$sql .= ", ".($this->fk_project > 0 ? $this->fk_project : "null");
+		$sql .= ", ".(int) ($this->country_id > 0 ? $this->country_id : 0);
+		$sql .= ", ".(int) $this->public;
+		$sql .= ", ".($this->fk_project > 0 ? (int) $this->fk_project : "null");
 	   	$sql .= ", ".(!empty($this->note_private) ? ("'".$this->db->escape($this->note_private)."'") : "NULL");
 		$sql .= ", ".(!empty($this->note_public) ? ("'".$this->db->escape($this->note_public)."'") : "NULL");
 		$sql .= ", ".$user->id;
 		$sql .= ", null";
 		$sql .= ", '".$this->db->idate($this->date)."'";
-		$sql .= ", '".$this->db->escape($this->email)."'";
-		$sql .= ", '".$this->db->escape($this->phone)."'";
-		$sql .= ", '".$this->db->escape($this->phone_mobile)."'";
+		$sql .= ", '".$this->db->escape(trim($this->email))."'";
+		$sql .= ", '".$this->db->escape(trim($this->phone))."'";
+		$sql .= ", '".$this->db->escape(trim($this->phone_mobile))."'";
 		$sql .= ")";
 
 		$resql = $this->db->query($sql);
@@ -426,13 +435,9 @@ class Don extends CommonObject
 
 		// Update extrafield
 		if (!$error) {
-			if (!$error)
-			{
-				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
-					$error++;
-				}
+			$result = $this->insertExtraFields();
+			if ($result < 0) {
+				$error++;
 			}
 		}
 
@@ -490,9 +495,9 @@ class Don extends CommonObject
 		$sql .= ",note_public=".(!empty($this->note_public) ? ("'".$this->db->escape($this->note_public)."'") : "NULL");
 		$sql .= ",datedon='".$this->db->idate($this->date)."'";
 		$sql .= ",date_valid=".($this->date_valid ? "'".$this->db->idate($this->date)."'" : "null");
-		$sql .= ",email='".$this->db->escape($this->email)."'";
-		$sql .= ",phone='".$this->db->escape($this->phone)."'";
-		$sql .= ",phone_mobile='".$this->db->escape($this->phone_mobile)."'";
+		$sql .= ",email='".$this->db->escape(trim($this->email))."'";
+		$sql .= ",phone='".$this->db->escape(trim($this->phone))."'";
+		$sql .= ",phone_mobile='".$this->db->escape(trim($this->phone_mobile))."'";
 		$sql .= ",fk_statut=".$this->statut;
 		$sql .= " WHERE rowid = ".$this->id;
 
@@ -511,13 +516,10 @@ class Don extends CommonObject
 			// Update extrafield
 			if (!$error)
 			{
-			  	if (!$error)
+			   	$result = $this->insertExtraFields();
+			   	if ($result < 0)
 			   	{
-			   		$result = $this->insertExtraFields();
-			   		if ($result < 0)
-			   		{
-			   			$error++;
-			   		}
+			   		$error++;
 			   	}
 			}
 
@@ -555,18 +557,14 @@ class Don extends CommonObject
 
 		$this->db->begin();
 
-   		if (!$error)
-		{
-			if (!$notrigger)
-			{
-				// Call trigger
-				$result = $this->call_trigger('DON_DELETE', $user);
+   		if (!$error && !$notrigger) {
+			// Call trigger
+			$result = $this->call_trigger('DON_DELETE', $user);
 
-				if ($result < 0) {
-					$error++;
-				}
-				// End call triggers
+			if ($result < 0) {
+				$error++;
 			}
+			// End call triggers
 		}
 
 		// Delete donation
@@ -687,9 +685,9 @@ class Don extends CommonObject
 				$this->note_private	      = $obj->note_private;
 				$this->note_public = $obj->note_public;
 				$this->model_pdf          = $obj->model_pdf;
-				$this->modelpdf           = $obj->model_pdf;	// deprecated
+				$this->modelpdf           = $obj->model_pdf; // deprecated
 
-				// Retreive all extrafield
+				// Retrieve all extrafield
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
 			}
@@ -737,8 +735,7 @@ class Don extends CommonObject
 		{
 			if ($this->db->affected_rows($resql))
 			{
-				if (!$notrigger)
-				{
+				if (!$notrigger) {
 					// Call trigger
 					$result = $this->call_trigger('DON_VALIDATE', $user);
 					if ($result < 0) { $error++; }
@@ -750,8 +747,8 @@ class Don extends CommonObject
 			$this->error = $this->db->lasterror();
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
+			$this->statut = 1;
 			$this->db->commit();
 			return 1;
 		} else {
@@ -779,10 +776,9 @@ class Don extends CommonObject
 		$sql .= " WHERE rowid = ".$id." AND fk_statut = 1";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->affected_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->affected_rows($resql)) {
+				$this->statut = 2;
 				return 1;
 			} else {
 				return 0;
@@ -806,10 +802,9 @@ class Don extends CommonObject
 		$sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = -1 WHERE rowid = ".$id;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->affected_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->affected_rows($resql)) {
+				$this->statut = -1;
 				return 1;
 			} else {
 				return 0;
@@ -820,6 +815,30 @@ class Don extends CommonObject
 		}
 	}
 
+	/**
+	 *	Set cancel status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						<0 if KO, 0=Nothing done, >0 if OK
+	 */
+	public function reopen($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->statut != self::STATUS_CANCELED) {
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->bom->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->bom->bom_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_VALIDATED, $notrigger, 'DON_REOPEN');
+	}
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Sum of donations
@@ -899,9 +918,13 @@ class Don extends CommonObject
 		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
 		$result = '';
-		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Donation").'</u>';
+		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Donation").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
 		if (!empty($this->id)) {
 			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->id;
+			$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->date, 'day');
 		}
 		if ($moretitle) $label .= ' - '.$moretitle;
 
diff --git a/htdocs/don/class/donstats.class.php b/htdocs/don/class/donstats.class.php
index 5370bdcaf73..684c04ead44 100644
--- a/htdocs/don/class/donstats.class.php
+++ b/htdocs/don/class/donstats.class.php
@@ -40,43 +40,43 @@ class DonationStats extends Stats
 	public $table_element;
 
 	public $socid;
-    public $userid;
+	public $userid;
 
-    /**
-     * @var string FROM
-     */
-    public $from;
+	/**
+	 * @var string FROM
+	 */
+	public $from;
 
-    /**
-     * @var string field
-     */
+	/**
+	 * @var string field
+	 */
 	public $field;
 
 	/**
 	 * @var string WHERE
 	 */
-    public $where;
+	public $where;
 
 
-    /**
-     * Constructor
-     *
-     * @param	DoliDB	$db      	Database handler
+	/**
+	 * Constructor
+	 *
+	 * @param	DoliDB	$db      	Database handler
 	 * @param 	int		$socid	   	Id third party for filter
 	 * @param 	string	$mode	   	Option (not used)
 	 * @param   int		$userid    	Id user for filter (creation user)
-     */
-    public function __construct($db, $socid, $mode, $userid = 0)
-    {
+	 */
+	public function __construct($db, $socid, $mode, $userid = 0)
+	{
 		global $user, $conf;
 
 		$this->db = $db;
 
 		$this->socid = ($socid > 0 ? $socid : 0);
-        $this->userid = $userid;
+		$this->userid = $userid;
 		$this->cachefilesuffix = $mode;
 
-        $object = new Don($this->db);
+		$object = new Don($this->db);
 		$this->from = MAIN_DB_PREFIX.$object->table_element." as d";
 		//$this->from.= ", ".MAIN_DB_PREFIX."societe as s";
 		//$this->field='weight';	// Warning, unit of weight is NOT USED AND MUST BE
@@ -85,29 +85,29 @@ class DonationStats extends Stats
 		//$this->where.= " AND c.fk_soc = s.rowid AND c.entity = ".$conf->entity;
 		$this->where .= " AND d.entity = ".$conf->entity;
 		if ($this->userid > 0) $this->where .= ' WHERE c.fk_user_author = '.$this->userid;
-    }
+	}
 
-    /**
-     *  Return shipment number by month for a year
-     *
+	/**
+	 *  Return shipment number by month for a year
+	 *
 	 *  @param	int		$year		Year to scan
-     *  @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *  @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 *  @return	array				Array with number by month
-     */
-    public function getNbByMonth($year, $format = 0)
-    {
-        global $user;
+	 */
+	public function getNbByMonth($year, $format = 0)
+	{
+		global $user;
 
-        $sql = "SELECT date_format(d.datedon,'%m') as dm, COUNT(*) as nb";
+		$sql = "SELECT date_format(d.datedon,'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
 		$sql .= " WHERE d.datedon BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		$res = $this->_getNbByMonth($year, $sql, $format);
 		return $res;
-    }
+	}
 
 	/**
 	 * Return shipments number per year
@@ -123,26 +123,26 @@ class DonationStats extends Stats
 		$sql .= " FROM ".$this->from;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getNbByYear($sql);
 	}
 
-    /**
-     *  Return nb, total and average
-     *
-     *  @return	array	Array of values
-     */
-    public function getAllByYear()
-    {
-        global $user;
+	/**
+	 *  Return nb, total and average
+	 *
+	 *  @return	array	Array of values
+	 */
+	public function getAllByYear()
+	{
+		global $user;
 
-        $sql = "SELECT date_format(d.datedon,'%Y') as year, COUNT(*) as nb, SUM(d.".$this->field.") as total, AVG(".$this->field.") as avg";
-        $sql .= " FROM ".$this->from;
-        $sql .= " WHERE ".$this->where;
-        $sql .= " GROUP BY year";
-        $sql .= $this->db->order('year', 'DESC');
+		$sql = "SELECT date_format(d.datedon,'%Y') as year, COUNT(*) as nb, SUM(d.".$this->field.") as total, AVG(".$this->field.") as avg";
+		$sql .= " FROM ".$this->from;
+		$sql .= " WHERE ".$this->where;
+		$sql .= " GROUP BY year";
+		$sql .= $this->db->order('year', 'DESC');
 
-        return $this->_getAllByYear($sql);
-    }
+		return $this->_getAllByYear($sql);
+	}
 }
diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php
index e9a38c50bef..710e21f76b7 100644
--- a/htdocs/don/class/paymentdonation.class.php
+++ b/htdocs/don/class/paymentdonation.class.php
@@ -39,7 +39,7 @@ class PaymentDonation extends CommonObject
 	 */
 	public $table_element = 'payment_donation';
 
-    /**
+	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
 	public $picto = 'payment';
@@ -50,8 +50,8 @@ class PaymentDonation extends CommonObject
 	public $rowid;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_donation;
 
 	public $datec = '';
@@ -69,18 +69,18 @@ class PaymentDonation extends CommonObject
 	public $num_payment;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_bank;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_creat;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
 	/**
@@ -105,8 +105,8 @@ class PaymentDonation extends CommonObject
 
 	/**
 	 *  Create payment of donation into database.
-     *  Use this->amounts to have list of lines for the payment
-     *
+	 *  Use this->amounts to have list of lines for the payment
+	 *
 	 *  @param      User		$user			User making payment
 	 *  @param      bool 		$notrigger 		false=launch triggers after, true=disable triggers
 	 *  @return     int     					<0 if KO, id of payment if OK
@@ -117,9 +117,9 @@ class PaymentDonation extends CommonObject
 
 		$error = 0;
 
-        $now = dol_now();
+		$now = dol_now();
 
-        // Validate parameters
+		// Validate parameters
 		if (!$this->datepaid)
 		{
 			$this->error = 'ErrorBadValueForParameterCreatePaymentDonation';
@@ -127,26 +127,26 @@ class PaymentDonation extends CommonObject
 		}
 
 		// Clean parameters
-		if (isset($this->fk_donation)) 		$this->fk_donation    = (int) $this->fk_donation;
-		if (isset($this->amount))			$this->amount         = trim($this->amount);
+		if (isset($this->fk_donation)) 		$this->fk_donation = (int) $this->fk_donation;
+		if (isset($this->amount))			$this->amount = trim($this->amount);
 		if (isset($this->fk_typepayment))   $this->fk_typepayment = trim($this->fk_typepayment);
 		if (isset($this->num_payment))      $this->num_payment    = trim($this->num_payment);
-		if (isset($this->note_public))		$this->note_public    = trim($this->note_public);
-		if (isset($this->fk_bank))			$this->fk_bank        = (int) $this->fk_bank;
+		if (isset($this->note_public))		$this->note_public = trim($this->note_public);
+		if (isset($this->fk_bank))			$this->fk_bank = (int) $this->fk_bank;
 		if (isset($this->fk_user_creat))	$this->fk_user_creat  = (int) $this->fk_user_creat;
 		if (isset($this->fk_user_modif))	$this->fk_user_modif  = (int) $this->fk_user_modif;
 
-        $totalamount = 0;
-        foreach ($this->amounts as $key => $value)  // How payment is dispatch
-        {
-            $newvalue = price2num($value, 'MT');
-            $this->amounts[$key] = $newvalue;
-            $totalamount += $newvalue;
-        }
-        $totalamount = price2num($totalamount);
+		$totalamount = 0;
+		foreach ($this->amounts as $key => $value)  // How payment is dispatch
+		{
+			$newvalue = price2num($value, 'MT');
+			$this->amounts[$key] = $newvalue;
+			$totalamount += $newvalue;
+		}
+		$totalamount = price2num($totalamount);
 
-        // Check parameters
-        if ($totalamount == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
+		// Check parameters
+		if ($totalamount == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
 
 
 		$this->db->begin();
@@ -182,9 +182,9 @@ class PaymentDonation extends CommonObject
 
 		if ($totalamount != 0 && !$error)
 		{
-		    $this->amount = $totalamount;
-            $this->total = $totalamount; // deprecated
-		    $this->db->commit();
+			$this->amount = $totalamount;
+			$this->total = $totalamount; // deprecated
+			$this->db->commit();
 			return $this->id;
 		} else {
 			$this->error = $this->db->error();
@@ -307,9 +307,9 @@ class PaymentDonation extends CommonObject
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-            $error++;
-            $this->errors[] = "Error ".$this->db->lasterror();
-        }
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
+		}
 
 		if (!$error)
 		{
@@ -356,15 +356,15 @@ class PaymentDonation extends CommonObject
 
 		$this->db->begin();
 
-	    if (!$error)
-        {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url";
-            $sql .= " WHERE type='payment_donation' AND url_id=".(int) $this->id;
+		if (!$error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url";
+			$sql .= " WHERE type='payment_donation' AND url_id=".(int) $this->id;
 
-            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-        }
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		}
 
 		if (!$error)
 		{
@@ -471,10 +471,10 @@ class PaymentDonation extends CommonObject
 	 */
 	public function getLibStatut($mode = 0)
 	{
-	    return '';
+		return '';
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un statut donne
 	 *
@@ -482,21 +482,21 @@ class PaymentDonation extends CommonObject
 	 *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *  @return string 			       	Libelle du statut
 	 */
-    public function LibStatut($status, $mode = 0)
-    {
-        // phpcs:enable
-        global $langs;
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		global $langs;
 
-        return '';
-    }
+		return '';
+	}
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
 	 */
 	public function initAsSpecimen()
 	{
@@ -516,87 +516,87 @@ class PaymentDonation extends CommonObject
 	}
 
 
-    /**
-     *      Add record into bank for payment with links between this bank record and invoices of payment.
-     *      All payment properties must have been set first like after a call to create().
-     *
-     *      @param	User	$user               Object of user making payment
-     *      @param  string	$mode               'payment_donation'
-     *      @param  string	$label              Label to use in bank record
-     *      @param  int		$accountid          Id of bank account to do link with
-     *      @param  string	$emetteur_nom       Name of transmitter
-     *      @param  string	$emetteur_banque    Name of bank
-     *      @return int                 		<0 if KO, >0 if OK
-     */
-    public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
-    {
-        global $conf;
+	/**
+	 *      Add record into bank for payment with links between this bank record and invoices of payment.
+	 *      All payment properties must have been set first like after a call to create().
+	 *
+	 *      @param	User	$user               Object of user making payment
+	 *      @param  string	$mode               'payment_donation'
+	 *      @param  string	$label              Label to use in bank record
+	 *      @param  int		$accountid          Id of bank account to do link with
+	 *      @param  string	$emetteur_nom       Name of transmitter
+	 *      @param  string	$emetteur_banque    Name of bank
+	 *      @return int                 		<0 if KO, >0 if OK
+	 */
+	public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
+	{
+		global $conf;
 
-        $error = 0;
+		$error = 0;
 
-        if (!empty($conf->banque->enabled))
-        {
-            require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+		if (!empty($conf->banque->enabled))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-            $acc = new Account($this->db);
-            $acc->fetch($accountid);
+			$acc = new Account($this->db);
+			$acc->fetch($accountid);
 
-            $total = $this->total;
-            if ($mode == 'payment_donation') $amount = $total;
+			$total = $this->total;
+			if ($mode == 'payment_donation') $amount = $total;
 
-            // Insert payment into llx_bank
-            $bank_line_id = $acc->addline(
-                $this->datepaid,
-                $this->paymenttype, // Payment mode id or code ("CHQ or VIR for example")
-                $label,
-                $amount,
-                $this->num_payment,
-                '',
-                $user,
-                $emetteur_nom,
-                $emetteur_banque
-            );
+			// Insert payment into llx_bank
+			$bank_line_id = $acc->addline(
+				$this->datepaid,
+				$this->paymenttype, // Payment mode id or code ("CHQ or VIR for example")
+				$label,
+				$amount,
+				$this->num_payment,
+				'',
+				$user,
+				$emetteur_nom,
+				$emetteur_banque
+			);
 
-            // Update fk_bank in llx_paiement.
-            // On connait ainsi le paiement qui a genere l'ecriture bancaire
-            if ($bank_line_id > 0)
-            {
-                $result = $this->update_fk_bank($bank_line_id);
-                if ($result <= 0)
-                {
-                    $error++;
-                    dol_print_error($this->db);
-                }
+			// Update fk_bank in llx_paiement.
+			// On connait ainsi le paiement qui a genere l'ecriture bancaire
+			if ($bank_line_id > 0)
+			{
+				$result = $this->update_fk_bank($bank_line_id);
+				if ($result <= 0)
+				{
+					$error++;
+					dol_print_error($this->db);
+				}
 
-                // Add link 'payment', 'payment_supplier', 'payment_donation' in bank_url between payment and bank transaction
-                $url = '';
-                if ($mode == 'payment_donation') $url = DOL_URL_ROOT.'/don/payment/card.php?rowid=';
-                if ($url)
-                {
-                    $result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
-                    if ($result <= 0)
-                    {
-                        $error++;
-                        dol_print_error($this->db);
-                    }
-                }
-            } else {
-                $this->error = $acc->error;
-                $error++;
-            }
-        }
+				// Add link 'payment', 'payment_supplier', 'payment_donation' in bank_url between payment and bank transaction
+				$url = '';
+				if ($mode == 'payment_donation') $url = DOL_URL_ROOT.'/don/payment/card.php?rowid=';
+				if ($url)
+				{
+					$result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
+					if ($result <= 0)
+					{
+						$error++;
+						dol_print_error($this->db);
+					}
+				}
+			} else {
+				$this->error = $acc->error;
+				$error++;
+			}
+		}
 
-        if (!$error)
-        {
-            return 1;
-        } else {
-            return -1;
-        }
-    }
+		if (!$error)
+		{
+			return 1;
+		} else {
+			return -1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *  Update link between the donation payment and the generated line in llx_bank
 	 *
 	 *  @param	int		$id_bank         Id if bank
@@ -604,7 +604,7 @@ class PaymentDonation extends CommonObject
 	 */
 	public function update_fk_bank($id_bank)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."payment_donation SET fk_bank = ".(int) $id_bank." WHERE rowid = ".(int) $this->id;
 
 		dol_syslog(get_class($this)."::update_fk_bank", LOG_DEBUG);
@@ -622,8 +622,8 @@ class PaymentDonation extends CommonObject
 	 *  Return clicable name (with picto eventually)
 	 *
 	 *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
-	 * 	@param	int		$maxlen			Longueur max libelle
-	 *	@return	string					Chaine avec URL
+	 * 	@param	int		$maxlen			Max length
+	 *	@return	string					String with URL
 	 */
 	public function getNomUrl($withpicto = 0, $maxlen = 0)
 	{
@@ -631,14 +631,16 @@ class PaymentDonation extends CommonObject
 
 		$result = '';
 
-        $label = $langs->trans("ShowPayment").': '.$this->ref;
+		$label = '<u>'.$langs->trans("DonationPayment").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
 		if (!empty($this->id))
 		{
 			$link = '<a href="'.DOL_URL_ROOT.'/don/payment/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 			$linkend = '</a>';
 
-            if ($withpicto) $result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
+			if ($withpicto) $result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
 			if ($withpicto && $withpicto != 2) $result .= ' ';
 			if ($withpicto != 2) $result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
 		}
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index 9265692241d..9ff1fa98ea2 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -36,8 +36,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 if (!empty($conf->projet->enabled))
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
@@ -104,7 +104,7 @@ if ($object->id)
 
 	$head = donation_prepare_head($object);
 
-	dol_fiche_head($head, 'documents', $langs->trans("Donation"), -1, 'donation');
+	print dol_get_fiche_head($head, 'documents', $langs->trans("Donation"), -1, 'donation');
 
 
 	// Build file list
@@ -121,35 +121,35 @@ if ($object->id)
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= $langs->trans('Project').' ';
-	    if ($user->rights->don->creer)
-	    {
-            if ($action != 'classify') {
-                // $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-            }
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	            $morehtmlref .= $proj->ref;
-	            $morehtmlref .= '</a>';
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+		$langs->load("projects");
+		$morehtmlref .= $langs->trans('Project').' ';
+		if ($user->rights->don->creer)
+		{
+			if ($action != 'classify') {
+				// $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			}
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
@@ -159,7 +159,7 @@ if ($object->id)
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border tableforfield centpercent">';
+	print '<table class="border tableforfield centpercent">';
 
 	// Ref
 	/*
@@ -171,21 +171,21 @@ if ($object->id)
 	// Societe
 	//print "<tr><td>".$langs->trans("Company")."</td><td>".$object->client->getNomUrl(1)."</td></tr>";
 
-    print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-    print '</table>';
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    print '<div class="clearboth"></div>';
+	print '<div class="clearboth"></div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    $modulepart = 'don';
-    $permission = $user->rights->don->lire;
-    $permtoedit = $user->rights->don->creer;
-    $param = '&id='.$object->id;
-    include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	$modulepart = 'don';
+	$permission = $user->rights->don->lire;
+	$permtoedit = $user->rights->don->creer;
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
 	print $langs->trans("ErrorUnknown");
 }
diff --git a/htdocs/don/index.php b/htdocs/don/index.php
index 030d61d03de..ce47e6ca89b 100644
--- a/htdocs/don/index.php
+++ b/htdocs/don/index.php
@@ -69,20 +69,20 @@ $result = $db->query($sql);
 if ($result)
 {
 	$i = 0;
-    $num = $db->num_rows($result);
-    while ($i < $num)
-    {
-        $objp = $db->fetch_object($result);
+	$num = $db->num_rows($result);
+	while ($i < $num)
+	{
+		$objp = $db->fetch_object($result);
 
-        $somme[$objp->fk_statut] = $objp->somme;
-        $nb[$objp->fk_statut] = $objp->nb;
-        $total += $objp->somme;
+		$somme[$objp->fk_statut] = $objp->somme;
+		$nb[$objp->fk_statut] = $objp->nb;
+		$total += $objp->somme;
 
-        $i++;
-    }
-    $db->free($result);
+		$i++;
+	}
+	$db->free($result);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 print load_fiche_titre($langs->trans("DonationsArea"), '', 'object_donation');
@@ -92,30 +92,30 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-    if (!empty($conf->don->enabled) && $user->rights->don->lire)
-    {
-    	$listofsearchfields['search_donation'] = array('text'=>'Donation');
-    }
+	if (!empty($conf->don->enabled) && $user->rights->don->lire)
+	{
+		$listofsearchfields['search_donation'] = array('text'=>'Donation');
+	}
 
-    if (count($listofsearchfields))
-    {
-    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-    	print '<input type="hidden" name="token" value="'.newToken().'">';
-    	print '<table class="noborder nohover centpercent">';
-    	$i = 0;
-    	foreach ($listofsearchfields as $key => $value)
-    	{
-    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    		print '<tr '.$bc[false].'>';
-    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'"></td>';
-    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-    		print '</tr>';
-    		$i++;
-    	}
-    	print '</table>';
-    	print '</form>';
-    	print '<br>';
-    }
+	if (count($listofsearchfields))
+	{
+		print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<table class="noborder nohover centpercent">';
+		$i = 0;
+		foreach ($listofsearchfields as $key => $value)
+		{
+			if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+			print '<tr '.$bc[false].'>';
+			print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'"></td>';
+			if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+			print '</tr>';
+			$i++;
+		}
+		print '</table>';
+		print '</form>';
+		print '<br>';
+	}
 }
 
 $dataseries = array();
@@ -131,29 +131,29 @@ print "</tr>\n";
 $listofstatus = array(0, 1, -1, 2);
 foreach ($listofstatus as $status)
 {
-    $dataseries[] = array($donstatic->LibStatut($status, 1), (isset($nb[$status]) ? (int) $nb[$status] : 0));
-    if ($status == Don::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
-    if ($status == Don::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;
-    if ($status == Don::STATUS_CANCELED) $colorseries[$status] = $badgeStatus9;
-    if ($status == Don::STATUS_PAID) $colorseries[$status] = $badgeStatus6;
+	$dataseries[] = array($donstatic->LibStatut($status, 1), (isset($nb[$status]) ? (int) $nb[$status] : 0));
+	if ($status == Don::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
+	if ($status == Don::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;
+	if ($status == Don::STATUS_CANCELED) $colorseries[$status] = $badgeStatus9;
+	if ($status == Don::STATUS_PAID) $colorseries[$status] = $badgeStatus6;
 }
 
 if ($conf->use_javascript_ajax)
 {
-    print '<tr><td class="center" colspan="4">';
+	print '<tr><td class="center" colspan="4">';
 
-    include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
-    $dolgraph = new DolGraph();
-    $dolgraph->SetData($dataseries);
-    $dolgraph->SetDataColor(array_values($colorseries));
-    $dolgraph->setShowLegend(2);
-    $dolgraph->setShowPercent(1);
-    $dolgraph->SetType(array('pie'));
-    $dolgraph->setHeight('200');
-    $dolgraph->draw('idgraphstatus');
-    print $dolgraph->show($total ? 0 : 1);
+	include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+	$dolgraph = new DolGraph();
+	$dolgraph->SetData($dataseries);
+	$dolgraph->SetDataColor(array_values($colorseries));
+	$dolgraph->setShowLegend(2);
+	$dolgraph->setShowPercent(1);
+	$dolgraph->SetType(array('pie'));
+	$dolgraph->setHeight('200');
+	$dolgraph->draw('idgraphstatus');
+	print $dolgraph->show($total ? 0 : 1);
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 print '<tr class="liste_titre">';
@@ -167,14 +167,14 @@ $total = 0;
 $totalnb = 0;
 foreach ($listofstatus as $status)
 {
-    print '<tr class="oddeven">';
-    print '<td><a href="list.php?search_status='.$status.'">'.$donstatic->LibStatut($status, 4).'</a></td>';
-    print '<td class="right">'.(!empty($nb[$status]) ? $nb[$status] : '&nbsp;').'</td>';
-    print '<td class="right">'.(!empty($nb[$status]) ?price($somme[$status], 'MT') : '&nbsp;').'</td>';
-    print '<td class="right">'.(!empty($nb[$status]) ?price(price2num($somme[$status] / $nb[$status], 'MT')) : '&nbsp;').'</td>';
-    $totalnb += (!empty($nb[$status]) ? $nb[$status] : 0);
-    $total += (!empty($somme[$status]) ? $somme[$status] : 0);
-    print "</tr>";
+	print '<tr class="oddeven">';
+	print '<td><a href="list.php?search_status='.$status.'">'.$donstatic->LibStatut($status, 4).'</a></td>';
+	print '<td class="right">'.(!empty($nb[$status]) ? $nb[$status] : '&nbsp;').'</td>';
+	print '<td class="right">'.(!empty($nb[$status]) ?price($somme[$status], 'MT') : '&nbsp;').'</td>';
+	print '<td class="right">'.(!empty($nb[$status]) ?price(price2num($somme[$status] / $nb[$status], 'MT')) : '&nbsp;').'</td>';
+	$totalnb += (!empty($nb[$status]) ? $nb[$status] : 0);
+	$total += (!empty($somme[$status]) ? $somme[$status] : 0);
+	print "</tr>";
 }
 
 print '<tr class="liste_total">';
@@ -205,47 +205,47 @@ $sql .= $db->plimit($max, 0);
 $resql = $db->query($sql);
 if ($resql)
 {
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<th colspan="5">'.$langs->trans("LastModifiedDonations", $max).'</th></tr>';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<th colspan="5">'.$langs->trans("LastModifiedDonations", $max).'</th></tr>';
 
-    $num = $db->num_rows($resql);
-    if ($num)
-    {
-        $i = 0;
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($resql);
+	$num = $db->num_rows($resql);
+	if ($num)
+	{
+		$i = 0;
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
 
-            print '<tr class="oddeven">';
+			print '<tr class="oddeven">';
 
-            $donation_static->id = $obj->rowid;
-            $donation_static->ref = $obj->ref ? $obj->ref : $obj->rowid;
+			$donation_static->id = $obj->rowid;
+			$donation_static->ref = $obj->ref ? $obj->ref : $obj->rowid;
 
-            print '<td width="96" class="nobordernopadding nowrap">';
-            print $donation_static->getNomUrl(1);
-            print '</td>';
+			print '<td width="96" class="nobordernopadding nowrap">';
+			print $donation_static->getNomUrl(1);
+			print '</td>';
 
-            print '<td class="nobordernopadding">';
-            print $obj->societe;
-            print ($obj->societe && ($obj->lastname || $obj->firstname) ? ' / ' : '');
-            print dolGetFirstLastname($obj->lastname, $obj->firstname);
-            print '</td>';
+			print '<td class="nobordernopadding">';
+			print $obj->societe;
+			print ($obj->societe && ($obj->lastname || $obj->firstname) ? ' / ' : '');
+			print dolGetFirstLastname($obj->lastname, $obj->firstname);
+			print '</td>';
 
-            print '<td class="right nobordernopadding">';
-            print price($obj->amount, 1);
-            print '</td>';
+			print '<td class="right nobordernopadding">';
+			print price($obj->amount, 1);
+			print '</td>';
 
-            // Date
-            print '<td class="center">'.dol_print_date($db->jdate($obj->datem), 'day').'</td>';
+			// Date
+			print '<td class="center">'.dol_print_date($db->jdate($obj->datem), 'day').'</td>';
 
-            print '<td class="right">'.$donation_static->LibStatut($obj->fk_statut, 5).'</td>';
+			print '<td class="right">'.$donation_static->LibStatut($obj->fk_statut, 5).'</td>';
 
-            print '</tr>';
-            $i++;
-        }
-    }
-    print "</table><br>";
+			print '</tr>';
+			$i++;
+		}
+	}
+	print "</table><br>";
 } else dol_print_error($db);
 
 
diff --git a/htdocs/don/info.php b/htdocs/don/info.php
index 8a12e319ef8..1e7e18c9baf 100644
--- a/htdocs/don/info.php
+++ b/htdocs/don/info.php
@@ -27,8 +27,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 if (!empty($conf->projet->enabled))
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
 $langs->load("donations");
@@ -67,7 +67,7 @@ $object->info($id);
 
 $head = donation_prepare_head($object);
 
-dol_fiche_head($head, 'info', $langs->trans("Donation"), -1, 'donation');
+print dol_get_fiche_head($head, 'info', $langs->trans("Donation"), -1, 'donation');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/don/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
@@ -75,35 +75,35 @@ $morehtmlref = '<div class="refidno">';
 // Project
 if (!empty($conf->projet->enabled))
 {
-    $langs->load("projects");
-    $morehtmlref .= $langs->trans('Project').' ';
-    if ($user->rights->don->creer)
-    {
-        if ($action != 'classify') {
-            // $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-        }
-        if ($action == 'classify') {
-            //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-            $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-            $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-            $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-            $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-            $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-            $morehtmlref .= '</form>';
-        } else {
-            $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-        }
-    } else {
-        if (!empty($object->fk_project)) {
-            $proj = new Project($db);
-            $proj->fetch($object->fk_project);
-            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-            $morehtmlref .= $proj->ref;
-            $morehtmlref .= '</a>';
-        } else {
-            $morehtmlref .= '';
-        }
-    }
+	$langs->load("projects");
+	$morehtmlref .= $langs->trans('Project').' ';
+	if ($user->rights->don->creer)
+	{
+		if ($action != 'classify') {
+			// $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+		}
+		if ($action == 'classify') {
+			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+			$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			$morehtmlref .= '</form>';
+		} else {
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+		}
+	} else {
+		if (!empty($object->fk_project)) {
+			$proj = new Project($db);
+			$proj->fetch($object->fk_project);
+			$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+			$morehtmlref .= $proj->ref;
+			$morehtmlref .= '</a>';
+		} else {
+			$morehtmlref .= '';
+		}
+	}
 }
 $morehtmlref .= '</div>';
 
@@ -120,7 +120,7 @@ print '</td></tr></table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 llxFooter();
 $db->close();
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index c98f2f8a000..b81b5eaa231 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -58,7 +58,7 @@ if (!$user->rights->don->lire) accessforbidden();
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
 {
 	$search_all = "";
-    $search_ref = "";
+	$search_ref = "";
 	$search_company = "";
 	$search_name = "";
 	$search_amount = "";
@@ -71,10 +71,10 @@ $hookmanager->initHooks(array('orderlist'));
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-    'd.rowid'=>'Id',
-    'd.ref'=>'Ref',
-    'd.lastname'=>'Lastname',
-    'd.firstname'=>'Firstname',
+	'd.rowid'=>'Id',
+	'd.ref'=>'Ref',
+	'd.lastname'=>'Lastname',
+	'd.firstname'=>'Firstname',
 );
 
 
@@ -100,19 +100,19 @@ if ($search_status != '' && $search_status != '-4')
 }
 if (trim($search_ref) != '')
 {
-    $sql .= natural_search('d.ref', $search_ref);
+	$sql .= natural_search('d.ref', $search_ref);
 }
 if (trim($search_all) != '')
 {
-    $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
 if (trim($search_company) != '')
 {
-    $sql .= natural_search('d.societe', $search_company);
+	$sql .= natural_search('d.societe', $search_company);
 }
 if (trim($search_name) != '')
 {
-    $sql .= natural_search(array('d.lastname', 'd.firstname'), $search_name);
+	$sql .= natural_search(array('d.lastname', 'd.firstname'), $search_name);
 }
 if ($search_amount) $sql .= natural_search('d.amount', $search_amount, 1);
 
@@ -151,84 +151,84 @@ if ($resql)
 	$newcardbutton = '';
 	if ($user->rights->don->creer)
 	{
-        $newcardbutton .= dolGetButtonTitle($langs->trans('NewDonation'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/don/card.php?action=create');
+		$newcardbutton .= dolGetButtonTitle($langs->trans('NewDonation'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/don/card.php?action=create');
 	}
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
-    print '<input type="hidden" name="type" value="'.$type.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="type" value="'.$type.'">';
 
 	print_barre_liste($langs->trans("Donations"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'object_donation', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 	if ($search_all)
-    {
-        foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
-        print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
-    }
+	{
+		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+	}
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
-    // Filters lines
-    print '<tr class="liste_titre_filter">';
-    print '<td class="liste_titre">';
-    print '<input class="flat" size="10" type="text" name="search_ref" value="'.$search_ref.'">';
-    print '</td>';
-    if (!empty($conf->global->DONATION_USE_THIRDPARTIES)) {
-        print '<td class="liste_titre">';
-        print '<input class="flat" size="10" type="text" name="search_thirdparty" value="'.$search_thirdparty.'">';
-        print '</td>';
-    } else {
-        print '<td class="liste_titre">';
-        print '<input class="flat" size="10" type="text" name="search_company" value="'.$search_company.'">';
-        print '</td>';
-    }
-    print '<td class="liste_titre">';
-    print '<input class="flat" size="10" type="text" name="search_name" value="'.$search_name.'">';
-    print '</td>';
-    print '<td class="liste_titre left">';
-    print '&nbsp;';
-    print '</td>';
-    if (!empty($conf->projet->enabled))
-    {
-        print '<td class="liste_titre right">';
-        print '&nbsp;';
-        print '</td>';
-    }
-    print '<td class="liste_titre right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
-    print '<td class="liste_titre right">';
-    $liststatus = array(
-    	Don::STATUS_DRAFT=>$langs->trans("DonationStatusPromiseNotValidated"),
-    	Don::STATUS_VALIDATED=>$langs->trans("DonationStatusPromiseValidated"),
-    	Don::STATUS_PAID=>$langs->trans("DonationStatusPaid"),
-    	Don::STATUS_CANCELED=>$langs->trans("Canceled")
-    );
-    print $form->selectarray('search_status', $liststatus, $search_status, -4, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
-    print '</td>';
-    print '<td class="liste_titre maxwidthsearch">';
-    $searchpicto = $form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
-    print "</tr>\n";
+	// Filters lines
+	print '<tr class="liste_titre_filter">';
+	print '<td class="liste_titre">';
+	print '<input class="flat" size="10" type="text" name="search_ref" value="'.$search_ref.'">';
+	print '</td>';
+	if (!empty($conf->global->DONATION_USE_THIRDPARTIES)) {
+		print '<td class="liste_titre">';
+		print '<input class="flat" size="10" type="text" name="search_thirdparty" value="'.$search_thirdparty.'">';
+		print '</td>';
+	} else {
+		print '<td class="liste_titre">';
+		print '<input class="flat" size="10" type="text" name="search_company" value="'.$search_company.'">';
+		print '</td>';
+	}
+	print '<td class="liste_titre">';
+	print '<input class="flat" size="10" type="text" name="search_name" value="'.$search_name.'">';
+	print '</td>';
+	print '<td class="liste_titre left">';
+	print '&nbsp;';
+	print '</td>';
+	if (!empty($conf->projet->enabled))
+	{
+		print '<td class="liste_titre right">';
+		print '&nbsp;';
+		print '</td>';
+	}
+	print '<td class="liste_titre right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
+	print '<td class="liste_titre right">';
+	$liststatus = array(
+		Don::STATUS_DRAFT=>$langs->trans("DonationStatusPromiseNotValidated"),
+		Don::STATUS_VALIDATED=>$langs->trans("DonationStatusPromiseValidated"),
+		Don::STATUS_PAID=>$langs->trans("DonationStatusPaid"),
+		Don::STATUS_CANCELED=>$langs->trans("Canceled")
+	);
+	print $form->selectarray('search_status', $liststatus, $search_status, -4, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
+	print '</td>';
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
+	print '</td>';
+	print "</tr>\n";
 
-    print '<tr class="liste_titre">';
+	print '<tr class="liste_titre">';
 	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "d.rowid", "", $param, "", $sortfield, $sortorder);
-    if (!empty($conf->global->DONATION_USE_THIRDPARTIES)) {
-        print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "d.fk_soc", "", $param, "", $sortfield, $sortorder);
-    } else {
-        print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "d.societe", "", $param, "", $sortfield, $sortorder);
-    }
+	if (!empty($conf->global->DONATION_USE_THIRDPARTIES)) {
+		print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "d.fk_soc", "", $param, "", $sortfield, $sortorder);
+	} else {
+		print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "d.societe", "", $param, "", $sortfield, $sortorder);
+	}
 	print_liste_field_titre("Name", $_SERVER["PHP_SELF"], "d.lastname", "", $param, "", $sortfield, $sortorder);
 	print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "d.datedon", "", $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    print_liste_field_titre("Project", $_SERVER["PHP_SELF"], "d.fk_projet", "", $param, "", $sortfield, $sortorder);
+		$langs->load("projects");
+		print_liste_field_titre("Project", $_SERVER["PHP_SELF"], "d.fk_projet", "", $param, "", $sortfield, $sortorder);
 	}
 	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "d.amount", "", $param, '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "d.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
@@ -245,17 +245,17 @@ if ($resql)
 		$donationstatic->lastname = $objp->lastname;
 		$donationstatic->firstname = $objp->firstname;
 		print "<td>".$donationstatic->getNomUrl(1)."</td>";
-        if (!empty($conf->global->DONATION_USE_THIRDPARTIES)) {
-            $company = new Societe($db);
-            $result = $company->fetch($objp->socid);
-            if (!empty($objp->socid) && $company->id > 0) {
-                print "<td>".$company->getNomUrl(1)."</td>";
-            } else {
-                print "<td>".$objp->societe."</td>";
-            }
-        } else {
-            print "<td>".$objp->societe."</td>";
-        }
+		if (!empty($conf->global->DONATION_USE_THIRDPARTIES)) {
+			$company = new Societe($db);
+			$result = $company->fetch($objp->socid);
+			if (!empty($objp->socid) && $company->id > 0) {
+				print "<td>".$company->getNomUrl(1)."</td>";
+			} else {
+				print "<td>".$objp->societe."</td>";
+			}
+		} else {
+			print "<td>".$objp->societe."</td>";
+		}
 		print "<td>".$donationstatic->getFullName($langs)."</td>";
 		print '<td class="center">'.dol_print_date($db->jdate($objp->datedon), 'day').'</td>';
 		if (!empty($conf->projet->enabled))
@@ -274,16 +274,16 @@ if ($resql)
 		}
 		print '<td class="right">'.price($objp->amount).'</td>';
 		print '<td class="right">'.$donationstatic->LibStatut($objp->status, 5).'</td>';
-        print '<td></td>';
+		print '<td></td>';
 		print "</tr>";
 		$i++;
 	}
-    print "</table>";
-    print '</div>';
-    print "</form>\n";
-    $db->free($resql);
+	print "</table>";
+	print '</div>';
+	print "</form>\n";
+	$db->free($resql);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 llxFooter();
diff --git a/htdocs/don/note.php b/htdocs/don/note.php
index 6df77ad2bc1..d1bbd0642d9 100644
--- a/htdocs/don/note.php
+++ b/htdocs/don/note.php
@@ -31,8 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 if (!empty($conf->projet->enabled))
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
@@ -83,7 +83,7 @@ if ($id > 0 || !empty($ref))
 
 	$head = donation_prepare_head($object);
 
-	dol_fiche_head($head, 'note', $langs->trans("Donation"), -1, 'donation');
+	print dol_get_fiche_head($head, 'note', $langs->trans("Donation"), -1, 'donation');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/don/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
@@ -91,35 +91,35 @@ if ($id > 0 || !empty($ref))
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= $langs->trans('Project').' ';
-	    if ($user->rights->don->creer)
-	    {
-            if ($action != 'classify') {
-                // $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-            }
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	            $morehtmlref .= $proj->ref;
-	            $morehtmlref .= '</a>';
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+		$langs->load("projects");
+		$morehtmlref .= $langs->trans('Project').' ';
+		if ($user->rights->don->creer)
+		{
+			if ($action != 'classify') {
+				// $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			}
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
@@ -131,7 +131,7 @@ if ($id > 0 || !empty($ref))
 	$cssclass = "titlefield";
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 llxFooter();
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index 26f540969ee..c7c16ee970b 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 if (!empty($conf->banque->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("bills", "banks", "companies"));
+$langs->loadLangs(array("bills", "banks", "companies", "donations"));
 
 // Security check
 $id = GETPOST('rowid') ? GETPOST('rowid', 'int') : GETPOST('id', 'int');
@@ -58,46 +58,10 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->don->supp
 	$db->begin();
 
 	$result = $object->delete($user);
-	if ($result > 0)
-	{
-        $db->commit();
-        header("Location: ".DOL_URL_ROOT."/don/index.php");
-        exit;
-	} else {
-		setEventMessages($object->error, $object->errors, 'errors');
-        $db->rollback();
-	}
-}
-
-// Create payment
-if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->don->creer)
-{
-	$db->begin();
-
-	$result = $object->valide();
-
 	if ($result > 0)
 	{
 		$db->commit();
-
-		$donations = array(); // TODO Get all id of donation linked to this payment
-		foreach ($donations as $id)
-		{
-			$donation = new Don($db);
-			$donation->fetch($id);
-
-			$outputlangs = $langs;
-			if (!empty(GETPOST('lang_id')))
-			{
-				$outputlangs = new Translate("", $conf);
-				$outputlangs->setDefaultLang(GETPOST('lang_id'));
-			}
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-				$donation->generateDocument($donation->model_pdf, $outputlangs);
-			}
-		}
-
-		header('Location: card.php?id='.$object->id);
+		header("Location: ".DOL_URL_ROOT."/don/index.php");
 		exit;
 	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
@@ -106,6 +70,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->don->cree
 }
 
 
+
 /*
  * View
  */
@@ -117,12 +82,13 @@ $form = new Form($db);
 
 $h = 0;
 
+$head = array();
 $head[$h][0] = DOL_URL_ROOT.'/don/payment/card.php?id='.$id;
 $head[$h][1] = $langs->trans("DonationPayment");
 $hselected = $h;
 $h++;
 
-dol_fiche_head($head, $hselected, $langs->trans("DonationPayment"), -1, 'payment');
+print dol_get_fiche_head($head, $hselected, $langs->trans("DonationPayment"), -1, 'payment');
 
 /*
  * Confirm deleting of the payment
@@ -132,14 +98,6 @@ if ($action == 'delete')
 	print $form->formconfirm('card.php?id='.$object->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete', '', 0, 2);
 }
 
-/*
- * Confirm validation of the payment
- */
-if ($action == 'valide')
-{
-	print $form->formconfirm('card.php?id='.$object->id, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide', '', 0, 2);
-}
-
 
 dol_banner_tab($object, 'id', '', 1, 'rowid', 'id');
 
@@ -148,13 +106,6 @@ print '<div class="underbanner clearboth"></div>';
 
 print '<table class="border centpercent">';
 
-// Ref
-/*print '<tr><td class=">'.$langs->trans('Ref').'</td>';
-print '<td colspan="3">';
-print $form->showrefnav($object,'id','',1,'rowid','id');
-print '</td></tr>';
-*/
-
 // Date
 print '<tr><td class="titlefield">'.$langs->trans('Date').'</td><td>'.dol_print_date($object->datep, 'day').'</td></tr>';
 
@@ -162,7 +113,7 @@ print '<tr><td class="titlefield">'.$langs->trans('Date').'</td><td>'.dol_print_
 print '<tr><td>'.$langs->trans('Mode').'</td><td>'.$langs->trans("PaymentType".$object->type_code).'</td></tr>';
 
 // Number
-print '<tr><td>'.$langs->trans('Number').'</td><td>'.$object->num_payment.'</td></tr>';
+print '<tr><td>'.$langs->trans('Numero').'</td><td>'.$object->num_payment.'</td></tr>';
 
 // Amount
 print '<tr><td>'.$langs->trans('Amount').'</td><td>'.price($object->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
@@ -173,18 +124,18 @@ print '<tr><td>'.$langs->trans('Note').'</td><td>'.nl2br($object->note_public).'
 // Bank account
 if (!empty($conf->banque->enabled))
 {
-    if ($object->bank_account)
-    {
-    	$bankline = new AccountLine($db);
-    	$bankline->fetch($object->bank_line);
+	if ($object->bank_account)
+	{
+		$bankline = new AccountLine($db);
+		$bankline->fetch($object->bank_line);
 
-    	print '<tr>';
-    	print '<td>'.$langs->trans('BankTransactionLine').'</td>';
+		print '<tr>';
+		print '<td>'.$langs->trans('BankTransactionLine').'</td>';
 		print '<td>';
 		print $bankline->getNomUrl(1, 0, 'showall');
-    	print '</td>';
-    	print '</tr>';
-    }
+		print '</td>';
+		print '</tr>';
+	}
 }
 
 print '</table>';
@@ -212,7 +163,7 @@ if ($resql)
 	print '<br><table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans('Donation').'</td>';
-    print '<td class="right">'.$langs->trans('ExpectedToPay').'</td>';
+	print '<td class="right">'.$langs->trans('ExpectedToPay').'</td>';
 	print '<td class="center">'.$langs->trans('Status').'</td>';
 	print '<td class="right">'.$langs->trans('PayedByThisPayment').'</td>';
 	print "</tr>\n";
@@ -237,7 +188,7 @@ if ($resql)
 			print '<td class="right">'.price($objp->amount).'</td>';
 			print "</tr>\n";
 			if ($objp->paid == 1) {
-                // If at least one invoice is paid, disable delete
+				// If at least one invoice is paid, disable delete
 				$disable_delete = 1;
 			}
 			$total = $total + $objp->amount;
@@ -254,7 +205,7 @@ if ($resql)
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 /*
diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php
index 3983765d904..9f944fe65b3 100644
--- a/htdocs/don/payment/payment.php
+++ b/htdocs/don/payment/payment.php
@@ -69,11 +69,11 @@ if ($action == 'add_payment')
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
 		$error++;
 	}
-    if (!empty($conf->banque->enabled) && !$_POST["accountid"] > 0)
-    {
-    	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToCredit")), null, 'errors');
-        $error++;
-    }
+	if (!empty($conf->banque->enabled) && !$_POST["accountid"] > 0)
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToCredit")), null, 'errors');
+		$error++;
+	}
 
 	if (!$error)
 	{
@@ -89,58 +89,58 @@ if ($action == 'add_payment')
 			}
 		}
 
-        if (count($amounts) <= 0)
-        {
-            $error++;
-            $errmsg = 'ErrorNoPaymentDefined';
-            setEventMessages($errmsg, null, 'errors');
-        }
+		if (count($amounts) <= 0)
+		{
+			$error++;
+			$errmsg = 'ErrorNoPaymentDefined';
+			setEventMessages($errmsg, null, 'errors');
+		}
 
-        if (!$error)
-        {
-    		$db->begin();
+		if (!$error)
+		{
+			$db->begin();
 
-    		// Create a line of payments
-    		$payment = new PaymentDonation($db);
-    		$payment->chid         = $chid;
-    		$payment->datepaid     = $datepaid;
-    		$payment->amounts      = $amounts; // Tableau de montant
-    		$payment->paymenttype  = GETPOST("paymenttype", 'int');
-    		$payment->num_payment  = GETPOST("num_payment", 'alphanohtml');
-    		$payment->note_public  = GETPOST("note_public", 'restricthtml');
+			// Create a line of payments
+			$payment = new PaymentDonation($db);
+			$payment->chid         = $chid;
+			$payment->datepaid     = $datepaid;
+			$payment->amounts      = $amounts; // Tableau de montant
+			$payment->paymenttype  = GETPOST("paymenttype", 'int');
+			$payment->num_payment  = GETPOST("num_payment", 'alphanohtml');
+			$payment->note_public  = GETPOST("note_public", 'restricthtml');
 
-    		if (!$error)
-    		{
-    		    $paymentid = $payment->create($user);
-                if ($paymentid < 0)
-                {
-                    $errmsg = $payment->error;
-                    setEventMessages($errmsg, null, 'errors');
-                    $error++;
-                }
-    		}
+			if (!$error)
+			{
+				$paymentid = $payment->create($user);
+				if ($paymentid < 0)
+				{
+					$errmsg = $payment->error;
+					setEventMessages($errmsg, null, 'errors');
+					$error++;
+				}
+			}
 
-            if (!$error)
-            {
-                $result = $payment->addPaymentToBank($user, 'payment_donation', '(DonationPayment)', $_POST['accountid'], '', '');
-                if (!$result > 0)
-                {
-                    $errmsg = $payment->error;
-                    setEventMessages($errmsg, null, 'errors');
-                    $error++;
-                }
-            }
+			if (!$error)
+			{
+				$result = $payment->addPaymentToBank($user, 'payment_donation', '(DonationPayment)', $_POST['accountid'], '', '');
+				if (!$result > 0)
+				{
+					$errmsg = $payment->error;
+					setEventMessages($errmsg, null, 'errors');
+					$error++;
+				}
+			}
 
-    	    if (!$error)
-            {
-                $db->commit();
-                $loc = DOL_URL_ROOT.'/don/card.php?rowid='.$chid;
-                header('Location: '.$loc);
-                exit;
-            } else {
-                $db->rollback();
-            }
-        }
+			if (!$error)
+			{
+				$db->commit();
+				$loc = DOL_URL_ROOT.'/don/card.php?rowid='.$chid;
+				header('Location: '.$loc);
+				exit;
+			} else {
+				$db->rollback();
+			}
+		}
 	}
 
 	$action = 'create';
@@ -177,13 +177,26 @@ if ($action == 'create')
 
 	print load_fiche_titre($langs->trans("DoPayment"));
 
+	if (!empty($conf->use_javascript_ajax))
+	{
+		print "\n".'<script type="text/javascript" language="javascript">';
+		//Add js for AutoFill
+		print ' $(document).ready(function () {';
+		print ' 	$(".AutoFillAmout").on(\'click touchstart\', function(){
+							$("input[name="+$(this).data(\'rowname\')+"]").val($(this).data("value")).trigger("change");
+						});';
+		print '	});'."\n";
+
+		print '	</script>'."\n";
+	}
+
 	print '<form name="add_payment" action="'.$_SERVER['PHP_SELF'].'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="rowid" value="'.$chid.'">';
 	print '<input type="hidden" name="chid" value="'.$chid.'">';
 	print '<input type="hidden" name="action" value="add_payment">';
 
-    dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent tableforfieldcreate">';
 
@@ -202,7 +215,7 @@ if ($action == 'create')
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans('AccountToCredit').'</td>';
 	print '<td colspan="2">';
-	$form->select_comptes(GETPOSTISSET("accountid") ? GETPOST("accountid") : $object->accountid, "accountid", 0, '', 1); // Show open bank account list
+	$form->select_comptes(GETPOSTISSET("accountid") ? GETPOST("accountid") : $object->accountid, "accountid", 0, '', 2); // Show open bank account list
 	print '</td></tr>';
 
 	// Number
@@ -218,7 +231,7 @@ if ($action == 'create')
 
 	print '</table>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
 	/*
  	 * List of payments on donation
@@ -257,6 +270,8 @@ if ($action == 'create')
 		if ($sumpaid < $objp->amount)
 		{
 			$namef = "amount_".$objp->id;
+			if (!empty($conf->use_javascript_ajax))
+				print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".price($objp->amount - $sumpaid)."'");
 			print '<input type="text" size="8" name="'.$namef.'">';
 		} else {
 			print '-';
@@ -284,9 +299,9 @@ if ($action == 'create')
 	print "</table>";
 
 	print '<br><div class="center">';
-	print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+	print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print "</form>\n";
diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php
index bda437fa6b5..1f500207898 100644
--- a/htdocs/don/stats/index.php
+++ b/htdocs/don/stats/index.php
@@ -37,8 +37,8 @@ $socid = GETPOST('socid', 'int');
 // Security check
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $nowyear = strftime("%Y", dol_now());
@@ -74,34 +74,34 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filenamenb = $dir.'/shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
+	$filenamenb = $dir.'/shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
 } else {
-    $filenamenb = $dir.'/shipmentsnbinyear-'.$year.'.png';
+	$filenamenb = $dir.'/shipmentsnbinyear-'.$year.'.png';
 }
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
 if (!$mesg)
 {
-    $px1->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px1->SetLegend($legend);
-    $px1->SetMaxValue($px1->GetCeilMaxValue());
-    $px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
-    $px1->SetWidth($WIDTH);
-    $px1->SetHeight($HEIGHT);
-    $px1->SetYLabel($langs->trans("NbOfSendings"));
-    $px1->SetShading(3);
-    $px1->SetHorizTickIncrement(1);
-    $px1->mode = 'depth';
-    $px1->SetTitle($langs->trans("NumberOfShipmentsByMonth"));
+	$px1->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px1->SetLegend($legend);
+	$px1->SetMaxValue($px1->GetCeilMaxValue());
+	$px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
+	$px1->SetWidth($WIDTH);
+	$px1->SetHeight($HEIGHT);
+	$px1->SetYLabel($langs->trans("NbOfSendings"));
+	$px1->SetShading(3);
+	$px1->SetHorizTickIncrement(1);
+	$px1->mode = 'depth';
+	$px1->SetTitle($langs->trans("NumberOfShipmentsByMonth"));
 
-    $px1->draw($filenamenb, $fileurlnb);
+	$px1->draw($filenamenb, $fileurlnb);
 }
 
 // Build graphic amount of object
@@ -205,7 +205,7 @@ $type = 'donation_stats';
 
 complete_head_from_modules($conf, $langs, null, $head, $h, $type);
 
-dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
+print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
@@ -284,9 +284,9 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
 if ($mesg) { print $mesg; } else {
-    print $px1->show();
-    print "<br>\n";
-    /*print $px2->show();
+	print $px1->show();
+	print "<br>\n";
+	/*print $px2->show();
     print "<br>\n";
     print $px3->show();*/
 }
@@ -296,7 +296,7 @@ print '</td></tr></table>';
 print '</div></div></div>';
 print '<div style="clear:both"></div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 
diff --git a/htdocs/don/tpl/linkedobjectblock.tpl.php b/htdocs/don/tpl/linkedobjectblock.tpl.php
index 18c410ba4d0..9e2525b82b2 100644
--- a/htdocs/don/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/don/tpl/linkedobjectblock.tpl.php
@@ -32,18 +32,18 @@ $langs->load("donations");
 $total = 0;
 $ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink) {
-    $ilink++;
+	$ilink++;
 
-    $trclass = 'oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
-    print '<tr class="'.$trclass.'">';
-    print '<td>'.$langs->trans("Donation").'</td>';
-    print '<td>'.$objectlink->getNomUrl(1).'</td>';
-    print '<td class="center">'.$objectlink->ref_client.'</td>';
-    print '<td class="center">'.dol_print_date($objectlink->date, 'day').'</td>';
-    print '<td class="right">';
-    $total = $total + $objectlink->total_ht;
-    echo price($objectlink->total_ht);
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	print '<tr class="'.$trclass.'">';
+	print '<td>'.$langs->trans("Donation").'</td>';
+	print '<td>'.$objectlink->getNomUrl(1).'</td>';
+	print '<td class="center">'.$objectlink->ref_client.'</td>';
+	print '<td class="center">'.dol_print_date($objectlink->date, 'day').'</td>';
+	print '<td class="right">';
+	$total = $total + $objectlink->total_ht;
+	echo price($objectlink->total_ht);
 }
 print '</td>';
 print '<td class="right">'.$objectlink->getLibStatut(3).'</td>';
@@ -51,7 +51,7 @@ print '</tr>';
 
 if (count($linkedObjectBlock) > 1)
 {
-    ?>
+	?>
     <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
         <td><?php echo $langs->trans("Total"); ?></td>
         <td></td>
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index 8799af86017..ca2b9fec473 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -25,7 +25,7 @@
 /**
  *  Class to manage ECM directories
  */
-class EcmDirectory // extends CommonObject
+class EcmDirectory extends CommonObject
 {
 	/**
 	 * @var string ID to identify managed object
@@ -35,7 +35,7 @@ class EcmDirectory // extends CommonObject
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	//public $table_element='ecm_directories';
+	public $table_element = 'ecm_directories';
 
 	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
@@ -48,13 +48,13 @@ class EcmDirectory // extends CommonObject
 	public $id;
 
 	/**
-     * @var string ECM directories label
-     */
-    public $label;
+	 * @var string ECM directories label
+	 */
+	public $label;
 
-    /**
-     * @var int ID
-     */
+	/**
+	 * @var int ID
+	 */
 	public $fk_parent;
 
 	/**
@@ -62,18 +62,29 @@ class EcmDirectory // extends CommonObject
 	 */
 	public $description;
 
+	/**
+	 * @var int cache nb of doc
+	 */
 	public $cachenbofdoc = -1; // By default cache initialized with value 'not calculated'
+
+	/**
+	 * @var int date_c
+	 */
 	public $date_c;
+
+	/**
+	 * @var int date_m
+	 */
 	public $date_m;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_m;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_c;
 
 	/**
@@ -81,25 +92,31 @@ class EcmDirectory // extends CommonObject
 	 */
 	public $ref;
 
+	/**
+	 * @var array array of categories
+	 */
 	public $cats = array();
+
+	/**
+	 * @var array array of children categories
+	 */
 	public $motherof = array();
 
+	/**
+	 * @var array array of forbidden chars
+	 */
 	public $forbiddenchars = array('<', '>', ':', '/', '\\', '?', '*', '|', '"');
+
+	/**
+	 * @var array array of forbidden chars for dir
+	 */
 	public $forbiddencharsdir = array('<', '>', ':', '?', '*', '|', '"');
 
+	/**
+	 * @var int 1 if full arbo loaded
+	 */
 	public $full_arbo_loaded;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error;
-
-	/**
-	 * @var string[] Error codes (or messages)
-	 */
-	public $errors = array();
-
-
 	/**
 	 *	Constructor
 	 *
@@ -131,13 +148,14 @@ class EcmDirectory // extends CommonObject
 		$this->description = trim($this->description);
 		$this->date_c = $now;
 		$this->fk_user_c = $user->id;
-		if ($this->fk_parent <= 0) $this->fk_parent = 0;
+		if ($this->fk_parent <= 0) {
+			$this->fk_parent = 0;
+		}
 
 
 		// Check if same directory does not exists with this name
 		$relativepath = $this->label;
-		if ($this->fk_parent)
-		{
+		if ($this->fk_parent) {
 			$parent = new EcmDirectory($this->db);
 			$parent->fetch($this->fk_parent);
 			$relativepath = $parent->getRelativePath().$relativepath;
@@ -148,19 +166,16 @@ class EcmDirectory // extends CommonObject
 		$cat = new EcmDirectory($this->db);
 		$cate_arbo = $cat->get_full_arbo(1);
 		$pathfound = 0;
-		foreach ($cate_arbo as $key => $categ)
-		{
+		foreach ($cate_arbo as $key => $categ) {
 			$path = str_replace($this->forbiddencharsdir, '_', $categ['fullrelativename']);
 			//print $relativepath.' - '.$path.'<br>';
-			if ($path == $relativepath)
-			{
+			if ($path == $relativepath) {
 				$pathfound = 1;
 				break;
 			}
 		}
 
-		if ($pathfound)
-		{
+		if ($pathfound) {
 			$this->error = "ErrorDirAlreadyExists";
 			dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);
 			return -1;
@@ -188,21 +203,23 @@ class EcmDirectory // extends CommonObject
 
 			dol_syslog(get_class($this)."::create", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."ecm_directories");
 
 				$dir = $conf->ecm->dir_output.'/'.$this->getRelativePath();
 				$result = dol_mkdir($dir);
-				if ($result < 0) { $error++; $this->error = "ErrorFailedToCreateDir"; }
+				if ($result < 0) {
+					$error++; $this->error = "ErrorFailedToCreateDir";
+				}
 
-                // Call trigger
-                $result = $this->call_trigger('MYECMDIR_CREATE', $user);
-                if ($result < 0) { $error++; }
-                // End call triggers
+				// Call trigger
+				$result = $this->call_trigger('MYECMDIR_CREATE', $user);
+				if ($result < 0) {
+					$error++;
+				}
+				// End call triggers
 
-				if (!$error)
-				{
+				if (!$error) {
 					$this->db->commit();
 					return $this->id;
 				} else {
@@ -249,22 +266,21 @@ class EcmDirectory // extends CommonObject
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$error++;
 			$this->error = "Error ".$this->db->lasterror();
 		}
 
-		if (!$error && !$notrigger)
-		{
-            // Call trigger
-            $result = $this->call_trigger('MYECMDIR_MODIFY', $user);
-            if ($result < 0) { $error++; }
-            // End call triggers
+		if (!$error && !$notrigger) {
+			// Call trigger
+			$result = $this->call_trigger('MYECMDIR_MODIFY', $user);
+			if ($result < 0) {
+				$error++;
+			}
+			// End call triggers
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -284,20 +300,26 @@ class EcmDirectory // extends CommonObject
 	{
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."ecm_directories SET";
-		if (preg_match('/[0-9]+/', $value)) $sql .= " cachenbofdoc = ".(int) $value;
-		else $sql .= " cachenbofdoc = cachenbofdoc ".$value." 1";
+		if (preg_match('/[0-9]+/', $value)) {
+			$sql .= " cachenbofdoc = ".(int) $value;
+		} else {
+			$sql .= " cachenbofdoc = cachenbofdoc ".$value." 1";
+		}
 		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::changeNbOfFiles", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		} else {
-		    if (preg_match('/[0-9]+/', $value)) $this->cachenbofdoc = (int) $value;
-		    elseif ($value == '+') $this->cachenbofdoc++;
-		    elseif ($value == '-') $this->cachenbofdoc--;
+			if (preg_match('/[0-9]+/', $value)) {
+				$this->cachenbofdoc = (int) $value;
+			} elseif ($value == '+') {
+				$this->cachenbofdoc++;
+			} elseif ($value == '-') {
+				$this->cachenbofdoc--;
+			}
 		}
 
 		return 1;
@@ -327,11 +349,9 @@ class EcmDirectory // extends CommonObject
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
-			if ($obj)
-			{
+			if ($obj) {
 				$this->id    = $obj->rowid;
 				$this->ref   = $obj->rowid;
 
@@ -345,6 +365,10 @@ class EcmDirectory // extends CommonObject
 				$this->date_m = $this->db->jdate($obj->date_m);
 			}
 
+			// Retrieve all extrafields for ecm_files
+			// fetch optionals attributes and labels
+			$this->fetch_optionals();
+
 			$this->db->free($resql);
 
 			return $obj ? 1 : 0;
@@ -366,11 +390,13 @@ class EcmDirectory // extends CommonObject
 	public function delete($user, $mode = 'all', $deletedirrecursive = 0)
 	{
 		global $conf, $langs;
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$error = 0;
 
-		if ($mode != 'databaseonly') $relativepath = $this->getRelativePath(1); // Ex: dir1/dir2/dir3
+		if ($mode != 'databaseonly') {
+			$relativepath = $this->getRelativePath(1); // Ex: dir1/dir2/dir3
+		}
 
 		dol_syslog(get_class($this)."::delete remove directory id=".$this->id." mode=".$mode.(($mode == 'databaseonly') ? '' : ' relativepath='.$relativepath));
 
@@ -381,35 +407,30 @@ class EcmDirectory // extends CommonObject
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$this->db->rollback();
 			$this->error = "Error ".$this->db->lasterror();
 			return -2;
 		} else {
-            // Call trigger
-            $result = $this->call_trigger('MYECMDIR_DELETE', $user);
-            if ($result < 0)
-            {
-            	$this->db->rollback();
-            	return -2;
-            }
-            // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('MYECMDIR_DELETE', $user);
+			if ($result < 0) {
+				$this->db->rollback();
+				return -2;
+			}
+			// End call triggers
 		}
 
-		if ($mode != 'databaseonly')
-		{
+		if ($mode != 'databaseonly') {
 			$file = $conf->ecm->dir_output."/".$relativepath;
-			if ($deletedirrecursive)
-			{
+			if ($deletedirrecursive) {
 				$result = @dol_delete_dir_recursive($file, 0, 0);
 			} else {
 				$result = @dol_delete_dir($file, 0);
 			}
 		}
 
-		if ($result || !@is_dir(dol_osencode($file)))
-		{
+		if ($result || !@is_dir(dol_osencode($file))) {
 			$this->db->commit();
 		} else {
 			$this->error = 'ErrorFailToDeleteDir';
@@ -418,17 +439,20 @@ class EcmDirectory // extends CommonObject
 			$error++;
 		}
 
-		if (!$error) return 1;
-		else return -1;
+		if (!$error) {
+			return 1;
+		} else {
+			return -1;
+		}
 	}
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
 	 */
 	public function initAsSpecimen()
 	{
@@ -447,7 +471,7 @@ class EcmDirectory // extends CommonObject
 	 *  @param	string	$option			Sur quoi pointe le lien
 	 *  @param	int		$max			Max length
 	 *  @param	string	$more			Add more param on a link
-     *  @param	int		$notooltip		1=Disable tooltip
+	 *  @param	int		$notooltip		1=Disable tooltip
 	 *  @return	string					Chaine avec URL
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $max = 0, $more = '', $notooltip = 0)
@@ -455,23 +479,33 @@ class EcmDirectory // extends CommonObject
 		global $langs;
 
 		$result = '';
-        //$newref=str_replace('_',' ',$this->ref);
-        $newref = $this->ref;
-        $label = $langs->trans("ShowECMSection").': '.$newref;
-        $linkclose = '"'.($more ? ' '.$more : '').' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		//$newref=str_replace('_',' ',$this->ref);
+		$newref = $this->ref;
+		$label = $langs->trans("ShowECMSection").': '.$newref;
+		$linkclose = '"'.($more ? ' '.$more : '').' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 
-        $linkstart = '<a href="'.DOL_URL_ROOT.'/ecm/dir_card.php?section='.$this->id.$linkclose;
-        if ($option == 'index') $linkstart = '<a href="'.DOL_URL_ROOT.'/ecm/index.php?section='.$this->id.'&amp;sectionexpand=true'.$linkclose;
-        if ($option == 'indexexpanded') $linkstart = '<a href="'.DOL_URL_ROOT.'/ecm/index.php?section='.$this->id.'&amp;sectionexpand=false'.$linkclose;
-        if ($option == 'indexnotexpanded') $linkstart = '<a href="'.DOL_URL_ROOT.'/ecm/index.php?section='.$this->id.'&amp;sectionexpand=true'.$linkclose;
-        $linkend = '</a>';
+		$linkstart = '<a href="'.DOL_URL_ROOT.'/ecm/dir_card.php?section='.$this->id.$linkclose;
+		if ($option == 'index') {
+			$linkstart = '<a href="'.DOL_URL_ROOT.'/ecm/index.php?section='.$this->id.'&amp;sectionexpand=true'.$linkclose;
+		}
+		if ($option == 'indexexpanded') {
+			$linkstart = '<a href="'.DOL_URL_ROOT.'/ecm/index.php?section='.$this->id.'&amp;sectionexpand=false'.$linkclose;
+		}
+		if ($option == 'indexnotexpanded') {
+			$linkstart = '<a href="'.DOL_URL_ROOT.'/ecm/index.php?section='.$this->id.'&amp;sectionexpand=true'.$linkclose;
+		}
+		$linkend = '</a>';
 
 		//$picto=DOL_URL_ROOT.'/theme/common/treemenu/folder.gif';
 		$picto = 'dir';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= ($max ?dol_trunc($newref, $max, 'middle') : $newref);
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= ($max ?dol_trunc($newref, $max, 'middle') : $newref);
+		}
 		$result .= $linkend;
 
 		return $result;
@@ -493,18 +527,15 @@ class EcmDirectory // extends CommonObject
 		do {
 			// Get index cursor in this->cats for id_mere
 			$cursorindex = -1;
-			foreach ($this->cats as $key => $val)
-			{
-				if ($this->cats[$key]['id'] == $idtosearch)
-				{
+			foreach ($this->cats as $key => $val) {
+				if ($this->cats[$key]['id'] == $idtosearch) {
 					$cursorindex = $key;
 					break;
 				}
 			}
 			//print "c=".$idtosearch."-".$cursorindex;
 
-			if ($cursorindex >= 0)
-			{
+			if ($cursorindex >= 0) {
 				// Path is label sanitized (no space and no special char) and concatenated
 				$ret = dol_sanitizeFileName($this->cats[$cursorindex]['label']).'/'.$ret;
 
@@ -516,7 +547,7 @@ class EcmDirectory // extends CommonObject
 		return $ret;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Load this->motherof that is array(id_son=>id_parent, ...)
 	 *
@@ -524,7 +555,7 @@ class EcmDirectory // extends CommonObject
 	 */
 	public function load_motherof()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$this->motherof = array();
@@ -537,11 +568,9 @@ class EcmDirectory // extends CommonObject
 
 		dol_syslog(get_class($this)."::load_motherof", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			// This assignment in condition is not a bug. It allows walking the results.
-			while ($obj = $this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				$this->motherof[$obj->id_son] = $obj->id_parent;
 			}
 			return 1;
@@ -563,7 +592,7 @@ class EcmDirectory // extends CommonObject
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return the status
 	 *
@@ -573,13 +602,13 @@ class EcmDirectory // extends CommonObject
 	 */
 	public static function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		return '';
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Reconstruit l'arborescence des categories sous la forme d'un tableau à partir de la base de donnée
 	 *	Renvoi un tableau de tableau('id','id_mere',...) trie selon arbre et avec:
@@ -592,7 +621,7 @@ class EcmDirectory // extends CommonObject
 	 * 				fk_user_c           User creation
 	 *  			login_c             Login creation
 	 * 				fullpath	        Full path of id (Added by build_path_from_id_categ call)
-     *              fullrelativename    Full path name (Added by build_path_from_id_categ call)
+	 *              fullrelativename    Full path name (Added by build_path_from_id_categ call)
 	 * 				fulllabel	        Full label (Added by build_path_from_id_categ call)
 	 * 				level		        Level of line (Added by build_path_from_id_categ call)
 	 *
@@ -601,11 +630,10 @@ class EcmDirectory // extends CommonObject
 	 */
 	public function get_full_arbo($force = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
-		if (empty($force) && !empty($this->full_arbo_loaded))
-		{
+		if (empty($force) && !empty($this->full_arbo_loaded)) {
 			return $this->cats;
 		}
 
@@ -628,13 +656,11 @@ class EcmDirectory // extends CommonObject
 
 		dol_syslog(get_class($this)."::get_full_arbo", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->cats = array();
 			$i = 0;
 			// This assignment in condition is not a bug. It allows walking the results.
-			while ($obj = $this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				$this->cats[$obj->rowid]['id'] = $obj->rowid;
 				$this->cats[$obj->rowid]['id_mere'] = (isset($this->motherof[$obj->rowid]) ? $this->motherof[$obj->rowid] : '');
 				$this->cats[$obj->rowid]['label'] = $obj->label;
@@ -644,10 +670,8 @@ class EcmDirectory // extends CommonObject
 				$this->cats[$obj->rowid]['fk_user_c'] = $obj->fk_user_c;
 				$this->cats[$obj->rowid]['login_c'] = $obj->login_c;
 
-				if (!empty($obj->rowid_fille))
-				{
-					if (isset($this->cats[$obj->rowid]['id_children']) && is_array($this->cats[$obj->rowid]['id_children']))
-					{
+				if (!empty($obj->rowid_fille)) {
+					if (isset($this->cats[$obj->rowid]['id_children']) && is_array($this->cats[$obj->rowid]['id_children'])) {
 						$newelempos = count($this->cats[$obj->rowid]['id_children']);
 						//print "this->cats[$i]['id_children'] est deja un tableau de $newelem elements<br>";
 						$this->cats[$obj->rowid]['id_children'][$newelempos] = $obj->rowid_fille;
@@ -664,9 +688,10 @@ class EcmDirectory // extends CommonObject
 		}
 
 		// We add properties fullxxx to all elements
-		foreach ($this->cats as $key => $val)
-		{
-			if (isset($motherof[$key])) continue;
+		foreach ($this->cats as $key => $val) {
+			if (isset($motherof[$key])) {
+				continue;
+			}
 			$this->build_path_from_id_categ($key, 0);
 		}
 
@@ -676,7 +701,7 @@ class EcmDirectory // extends CommonObject
 		return $this->cats;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define properties fullpath, fullrelativename, fulllabel of a directory of array this->cats and all its childs.
 	 *  Separator between directories is always '/', whatever is OS.
@@ -687,19 +712,18 @@ class EcmDirectory // extends CommonObject
 	 */
 	public function build_path_from_id_categ($id_categ, $protection = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// Define fullpath
-		if (!empty($this->cats[$id_categ]['id_mere']))
-		{
+		if (!empty($this->cats[$id_categ]['id_mere'])) {
 			$this->cats[$id_categ]['fullpath'] = $this->cats[$this->cats[$id_categ]['id_mere']]['fullpath'];
 			$this->cats[$id_categ]['fullpath'] .= '_'.$id_categ;
-            $this->cats[$id_categ]['fullrelativename'] = $this->cats[$this->cats[$id_categ]['id_mere']]['fullrelativename'];
-            $this->cats[$id_categ]['fullrelativename'] .= '/'.$this->cats[$id_categ]['label'];
+			$this->cats[$id_categ]['fullrelativename'] = $this->cats[$this->cats[$id_categ]['id_mere']]['fullrelativename'];
+			$this->cats[$id_categ]['fullrelativename'] .= '/'.$this->cats[$id_categ]['label'];
 			$this->cats[$id_categ]['fulllabel'] = $this->cats[$this->cats[$id_categ]['id_mere']]['fulllabel'];
 			$this->cats[$id_categ]['fulllabel'] .= ' >> '.$this->cats[$id_categ]['label'];
 		} else {
 			$this->cats[$id_categ]['fullpath'] = '_'.$id_categ;
-            $this->cats[$id_categ]['fullrelativename'] = $this->cats[$id_categ]['label'];
+			$this->cats[$id_categ]['fullrelativename'] = $this->cats[$id_categ]['label'];
 			$this->cats[$id_categ]['fulllabel'] = $this->cats[$id_categ]['label'];
 		}
 		// We count number of _ to have level (we use strlen that is faster than dol_strlen)
@@ -707,11 +731,11 @@ class EcmDirectory // extends CommonObject
 
 		// Traite ces enfants
 		$protection++;
-		if ($protection > 20) return; // On ne traite pas plus de 20 niveaux
-		if (isset($this->cats[$id_categ]['id_children']) && is_array($this->cats[$id_categ]['id_children']))
-		{
-			foreach ($this->cats[$id_categ]['id_children'] as $key => $val)
-			{
+		if ($protection > 20) {
+			return; // On ne traite pas plus de 20 niveaux
+		}
+		if (isset($this->cats[$id_categ]['id_children']) && is_array($this->cats[$id_categ]['id_children'])) {
+			foreach ($this->cats[$id_categ]['id_children'] as $key => $val) {
 				$this->build_path_from_id_categ($val, $protection);
 			}
 		}
@@ -737,8 +761,7 @@ class EcmDirectory // extends CommonObject
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."ecm_directories SET";
 		$sql .= " cachenbofdoc = '".count($filelist)."'";
-		if (empty($all))  // By default
-		{
+		if (empty($all)) {  // By default
 			$sql .= " WHERE rowid = ".$this->id;
 		} else {
 			$sql .= " WHERE entity = ".$conf->entity;
@@ -746,8 +769,7 @@ class EcmDirectory // extends CommonObject
 
 		dol_syslog(get_class($this)."::refreshcachenboffile", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->cachenbofdoc = count($filelist);
 			return $this->cachenbofdoc;
 		} else {
@@ -756,35 +778,34 @@ class EcmDirectory // extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-     * Call trigger based on this instance.
-     * We implement it here because this class doe not extend CommonObject.
-     *
-     * NB1: Error from trigger are stacked in errors
-     * NB2: if trigger fail, action should be canceled.
-     * NB3: Should be deleted if EcmDirectory extend CommonObject
-     *
-     * @param   string    $triggerName   trigger's name to execute
-     * @param   User      $user           Object user
-     * @return  int                       Result of run_triggers
-     */
-    public function call_trigger($triggerName, $user)
-    {
-        // phpcs:enable
-        global $langs, $conf;
+	 * Call trigger based on this instance.
+	 * We implement it here because this class doe not extend CommonObject.
+	 *
+	 * NB1: Error from trigger are stacked in errors
+	 * NB2: if trigger fail, action should be canceled.
+	 * NB3: Should be deleted if EcmDirectory extend CommonObject
+	 *
+	 * @param   string    $triggerName   trigger's name to execute
+	 * @param   User      $user           Object user
+	 * @return  int                       Result of run_triggers
+	 */
+	public function call_trigger($triggerName, $user)
+	{
+		// phpcs:enable
+		global $langs, $conf;
 
-        include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
-        $interface = new Interfaces($this->db);
-        $result = $interface->run_triggers($triggerName, $this, $user, $langs, $conf);
-        if ($result < 0) {
-            if (!empty($this->errors))
-            {
-                $this->errors = array_merge($this->errors, $interface->errors);
-            } else {
-                $this->errors = $interface->errors;
-            }
-        }
-        return $result;
-    }
+		include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+		$interface = new Interfaces($this->db);
+		$result = $interface->run_triggers($triggerName, $this, $user, $langs, $conf);
+		if ($result < 0) {
+			if (!empty($this->errors)) {
+				$this->errors = array_merge($this->errors, $interface->errors);
+			} else {
+				$this->errors = $interface->errors;
+			}
+		}
+		return $result;
+	}
 }
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index c3cb0e5462b..c096bc27869 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -60,15 +60,29 @@ class EcmFiles extends CommonObject
 	 */
 	public $label;
 
-	public $share; // hash for file sharing, empty by default (example: getRandomPassword(true))
+	/**
+	 * @var string hash for file sharing, empty by default (example: getRandomPassword(true))
+	 */
+	public $share;
 
 	/**
 	 * @var int Entity
 	 */
 	public $entity;
 
-	public $filename;			// Note: Into ecm database record, the entry $filename never ends with .noexe
+	/**
+	 * @var string filename, Note: Into ecm database record, the entry $filename never ends with .noexe
+	 */
+	public $filename;
+
+	/**
+	 * @var string filepath
+	 */
 	public $filepath;
+
+	/**
+	 * @var string fullpath origin
+	 */
 	public $fullpath_orig;
 
 	/**
@@ -76,12 +90,39 @@ class EcmFiles extends CommonObject
 	 */
 	public $description;
 
+	/**
+	 * @var string keywords
+	 */
 	public $keywords;
+
+	/**
+	 * @var string cover
+	 */
 	public $cover;
+
+	/**
+	 * @var int position
+	 */
 	public $position;
-	public $gen_or_uploaded; // can be 'generated', 'uploaded', 'unknown'
+
+	/**
+	 * @var string can be 'generated', 'uploaded', 'unknown'
+	 */
+	public $gen_or_uploaded;
+
+	/**
+	 * @var string extraparams
+	 */
 	public $extraparams;
+
+	/**
+	 * @var int|string date create
+	 */
 	public $date_c = '';
+
+	/**
+	 * @var int|string date modify
+	 */
 	public $date_m = '';
 
 	/**
@@ -94,8 +135,19 @@ class EcmFiles extends CommonObject
 	 */
 	public $fk_user_m;
 
+	/**
+	 * @var string acl
+	 */
 	public $acl;
+
+	/**
+	 * @var string src object type
+	 */
 	public $src_object_type;
+
+	/**
+	 * @var int src object id
+	 */
 	public $src_object_id;
 
 
@@ -135,7 +187,7 @@ class EcmFiles extends CommonObject
 			$this->share = trim($this->share);
 		}
 		if (isset($this->entity)) {
-			$this->entity = trim($this->entity);
+			$this->entity = (int) $this->entity;
 		}
 		if (isset($this->filename)) {
 			$this->filename = preg_replace('/\.noexe$/', '', trim($this->filename));
@@ -163,10 +215,10 @@ class EcmFiles extends CommonObject
 			$this->extraparams = trim($this->extraparams);
 		}
 		if (isset($this->fk_user_c)) {
-			$this->fk_user_c = trim($this->fk_user_c);
+			$this->fk_user_c = (int) $this->fk_user_c;
 		}
 		if (isset($this->fk_user_m)) {
-			$this->fk_user_m = trim($this->fk_user_m);
+			$this->fk_user_m = (int) $this->fk_user_m;
 		}
 		if (isset($this->acl)) {
 			$this->acl = trim($this->acl);
@@ -174,13 +226,16 @@ class EcmFiles extends CommonObject
 		if (isset($this->src_object_type)) {
 			$this->src_object_type = trim($this->src_object_type);
 		}
-		if (empty($this->date_c)) $this->date_c = dol_now();
-		if (empty($this->date_m)) $this->date_m = dol_now();
+		if (empty($this->date_c)) {
+			$this->date_c = dol_now();
+		}
+		if (empty($this->date_m)) {
+			$this->date_m = dol_now();
+		}
 
 		// If ref not defined
 		$ref = '';
-		if (!empty($this->ref))
-		{
+		if (!empty($this->ref)) {
 			$ref = $this->ref;
 		} else {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
@@ -188,14 +243,13 @@ class EcmFiles extends CommonObject
 		}
 
 		$maxposition = 0;
-		if (empty($this->position))   // Get max used
-		{
+		if (empty($this->position)) {
+			// Get max used
 			$sql = "SELECT MAX(position) as maxposition FROM ".MAIN_DB_PREFIX.$this->table_element;
 			$sql .= " WHERE filepath ='".$this->db->escape($this->filepath)."'";
 
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$obj = $this->db->fetch_object($resql);
 				$maxposition = (int) $obj->maxposition;
 			} else {
@@ -208,13 +262,11 @@ class EcmFiles extends CommonObject
 		}
 
 		// Check parameters
-		if (empty($this->filename) || empty($this->filepath))
-		{
+		if (empty($this->filename) || empty($this->filepath)) {
 			$this->errors[] = 'Bad property filename or filepath';
 			return --$error;
 		}
-		if (!isset($this->entity))
-		{
+		if (!isset($this->entity)) {
 			$this->entity = $conf->entity;
 		}
 		// Put here code to add control on parameters values
@@ -278,11 +330,12 @@ class EcmFiles extends CommonObject
 			$this->position = $maxposition;
 
 			// Triggers
-			if (!$notrigger)
-			{
+			if (!$notrigger) {
 				// Call triggers
 				$result = $this->call_trigger(strtoupper(get_class($this)).'_CREATE', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 		}
@@ -307,7 +360,7 @@ class EcmFiles extends CommonObject
 	 * @param  string $relativepath    	Relative path of file from document directory. Example: 'path/path2/file' or 'path/path2/*'
 	 * @param  string $hashoffile      	Hash of file content. Take the first one found if same file is at different places. This hash will also change if file content is changed.
 	 * @param  string $hashforshare    	Hash of file sharing.
-	 * @param  string $src_object_type 	src_object_type to search
+	 * @param  string $src_object_type 	src_object_type to search (value of object->table_element)
 	 * @param  string $src_object_id 	src_object_id to search
 	 * @return int                 	   	<0 if KO, 0 if not found, >0 if OK
 	 */
@@ -346,7 +399,7 @@ class EcmFiles extends CommonObject
 		 $sql .= " AND entity IN (" . getEntity('ecmfiles') . ")";
 		 }*/
 		if ($relativepath) {
-			$relativepathwithnoexe = preg_replace('/\.noexe$/', '', $relativepath);		// We must never have the .noexe into the database
+			$relativepathwithnoexe = preg_replace('/\.noexe$/', '', $relativepath); // We must never have the .noexe into the database
 			$sql .= " AND t.filepath = '".$this->db->escape(dirname($relativepath))."'";
 			$filename = basename($relativepathwithnoexe);
 			if ($filename != '*') {
@@ -362,8 +415,7 @@ class EcmFiles extends CommonObject
 		} elseif (!empty($hashforshare)) {
 			$sql .= " AND t.share = '".$this->db->escape($hashforshare)."'";
 			//$sql .= " AND t.entity = ".$conf->entity;							// hashforshare already unique
-		} elseif ($src_object_type && $src_object_id)
-		{
+		} elseif ($src_object_type && $src_object_id) {
 			// Warning: May return several record, and only first one is returned !
 			$sql .= " AND t.src_object_type ='".$this->db->escape($src_object_type)."' AND t.src_object_id = ".$this->db->escape($src_object_id);
 			$sql .= " AND t.entity = ".$conf->entity;
@@ -403,9 +455,9 @@ class EcmFiles extends CommonObject
 				$this->src_object_id = $obj->src_object_id;
 			}
 
-			// Retrieve all extrafields for invoice
+			// Retrieve all extrafields for ecm_files
 			// fetch optionals attributes and labels
-			// $this->fetch_optionals();
+			$this->fetch_optionals();
 
 			// $this->fetch_lines();
 
@@ -563,7 +615,7 @@ class EcmFiles extends CommonObject
 		}
 		if (isset($this->filepath)) {
 			$this->filepath = trim($this->filepath);
-			$this->filepath = preg_replace('/[\\/]+$/', '', $this->filepath);		// Remove last /
+			$this->filepath = preg_replace('/[\\/]+$/', '', $this->filepath); // Remove last /
 		}
 		if (isset($this->fullpath_orig)) {
 			$this->fullpath_orig = trim($this->fullpath_orig);
@@ -629,11 +681,12 @@ class EcmFiles extends CommonObject
 		}
 
 		// Triggers
-		if (!$error && !$notrigger)
-		{
+		if (!$error && !$notrigger) {
 			// Call triggers
 			$result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $user);
-			if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail
+			if ($result < 0) {
+				$error++;
+			} //Do also here what you must do to rollback action if trigger fail
 			// End call triggers
 		}
 
@@ -666,11 +719,12 @@ class EcmFiles extends CommonObject
 		$this->db->begin();
 
 		// Triggers
-		if (!$notrigger)
-		{
+		if (!$notrigger) {
 			// Call triggers
 			$result = $this->call_trigger(strtoupper(get_class($this)).'_DELETE', $user);
-			if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail
+			if ($result < 0) {
+				$error++;
+			} //Do also here what you must do to rollback action if trigger fail
 			// End call triggers
 		}
 
@@ -765,7 +819,9 @@ class EcmFiles extends CommonObject
 		global $dolibarr_main_authentication, $dolibarr_main_demo;
 		global $menumanager;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 
@@ -776,25 +832,26 @@ class EcmFiles extends CommonObject
 		$url = DOL_URL_ROOT.'/ecm/'.$this->table_name.'_card.php?id='.$this->id;
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowProject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
-		if ($withpicto)
-		{
+		if ($withpicto) {
 			$result .= ($linkstart.img_object(($notooltip ? '' : $label), 'label', ($notooltip ? '' : 'class="classfortooltip"')).$linkend);
-			if ($withpicto != 2) $result .= ' ';
+			if ($withpicto != 2) {
+				$result .= ' ';
+			}
 		}
 		$result .= $linkstart.$this->ref.$linkend;
 		return $result;
@@ -838,16 +895,16 @@ class EcmFiles extends CommonObject
 		global $conf, $user;
 
 		$this->id = 0;
-
+		$this->specimen = 1;
 		$this->label = '0a1b2c3e4f59999999';
-		$this->entity = '1';
+		$this->entity = 1;
 		$this->filename = 'myspecimenfilefile.pdf';
 		$this->filepath = '/aaa/bbb';
 		$this->fullpath_orig = 'c:/file on my disk.pdf';
 		$this->description = 'This is a long description of file';
 		$this->keywords = 'key1,key2';
 		$this->cover = '1';
-		$this->position = '5';
+		$this->position = 5;
 		$this->gen_or_uploaded = 'uploaded';
 		$this->extraparams = '';
 		$this->date_c = (dol_now() - 3600 * 24 * 10);
diff --git a/htdocs/ecm/class/htmlecm.form.class.php b/htdocs/ecm/class/htmlecm.form.class.php
index 5c84cade8e4..5866ba16893 100644
--- a/htdocs/ecm/class/htmlecm.form.class.php
+++ b/htdocs/ecm/class/htmlecm.form.class.php
@@ -27,15 +27,15 @@ require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
  */
 class FormEcm
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 
 	/**
diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php
index a84beb605cb..8c13c377bd6 100644
--- a/htdocs/ecm/dir_add_card.php
+++ b/htdocs/ecm/dir_add_card.php
@@ -41,20 +41,22 @@ $confirm    = GETPOST('confirm', 'alpha');
 $module  = GETPOST('module', 'alpha');
 $website = GETPOST('website', 'alpha');
 $pageid  = GETPOST('pageid', 'int');
-if (empty($module)) $module = 'ecm';
+if (empty($module)) {
+	$module = 'ecm';
+}
 
 // Security check
-if ($user->socid > 0)
-{
-    $action = '';
-    $socid = $user->socid;
+if ($user->socid > 0) {
+	$action = '';
+	$socid = $user->socid;
 }
 
 $section = $urlsection = GETPOST('section', 'alpha');
-if (empty($urlsection)) $urlsection = 'misc';
+if (empty($urlsection)) {
+	$urlsection = 'misc';
+}
 
-if ($module == 'ecm')
-{
+if ($module == 'ecm') {
 	$upload_dir = $conf->ecm->dir_output.'/'.$urlsection;
 } else // For example $module == 'medias'
 {
@@ -65,19 +67,23 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "label";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "label";
+}
 
 $ecmdir = new EcmDirectory($db);
-if (!empty($section))
-{
+if (!empty($section)) {
 	$result = $ecmdir->fetch($section);
-	if (!$result > 0)
-	{
+	if (!$result > 0) {
 		dol_print_error($db, $ecmdir->error);
 		exit;
 	}
@@ -86,18 +92,18 @@ if (!empty($section))
 // Permissions
 $permtoadd = 0;
 $permtoupload = 0;
-if ($module == 'ecm')
-{
+if ($module == 'ecm') {
 	$permtoadd = $user->rights->ecm->setup;
 	$permtoupload = $user->rights->ecm->upload;
 }
-if ($module == 'medias')
-{
+if ($module == 'medias') {
 	$permtoadd = ($user->rights->mailing->creer || $user->rights->website->write);
 	$permtoupload = ($user->rights->mailing->creer || $user->rights->website->write);
 }
 
-if (!$permtoadd) accessforbidden();
+if (!$permtoadd) {
+	accessforbidden();
+}
 
 
 
@@ -106,12 +112,9 @@ if (!$permtoadd) accessforbidden();
  */
 
 // Action ajout d'un produit ou service
-if ($action == 'add' && $permtoadd)
-{
-	if ($cancel)
-	{
-		if (!empty($backtopage))
-		{
+if ($action == 'add' && $permtoadd) {
+	if ($cancel) {
+		if (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		} else {
@@ -120,33 +123,31 @@ if ($action == 'add' && $permtoadd)
 		}
 	}
 
-	$ref = GETPOST("ref", 'alpha');
-	$label = GETPOST("label", 'alpha');
-	$desc = GETPOST("desc", 'alpha');
+	$ref = (string) GETPOST("ref", 'alpha');
+	$label = (string) GETPOST("label", 'alpha');
+	$desc = (string) GETPOST("desc", 'alpha');
 	$catParent = GETPOST("catParent", 'alpha'); // Can be an int (with ECM) or a string (with generic filemanager)
-	if ($catParent == '-1') $catParent = 0;
+	if ($catParent == '-1') {
+		$catParent = 0;
+	}
 
 	$error = 0;
 
-	if (empty($label))
-	{
+	if (empty($label)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
 		$action = 'create';
 		$error++;
 	}
 
-	if (!$error)
-	{
-		if ($module == 'ecm')
-		{
+	if (!$error) {
+		if ($module == 'ecm') {
 			$ecmdir->ref            = $ref;
 			$ecmdir->label          = $label;
 			$ecmdir->description    = $desc;
 			$ecmdir->fk_parent      = (int) $catParent;
 
 			$id = $ecmdir->create($user);
-			if ($id <= 0)
-			{
+			if ($id <= 0) {
 				$error++;
 				$langs->load("errors");
 				setEventMessages($ecmdir->error, $ecmdir->errors, 'errors');
@@ -155,22 +156,18 @@ if ($action == 'add' && $permtoadd)
 		} else // For example $module == 'medias'
 		{
 			$dirfornewdir = '';
-			if ($module == 'medias')
-			{
+			if ($module == 'medias') {
 				$dirfornewdir = $conf->medias->multidir_output[$conf->entity];
 			}
-			if (empty($dirfornewdir))
-			{
+			if (empty($dirfornewdir)) {
 				$error++;
 				dol_print_error('', 'Bad value for module. Not supported.');
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$fullpathofdir = $dirfornewdir.'/'.($catParent ? $catParent.'/' : '').$label;
 				$result = dol_mkdir($fullpathofdir, DOL_DATA_ROOT);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					setEventMessages($langs->trans('ErrorFailToCreateDir', $label), null, 'errors');
 					$error++;
 				} else {
@@ -180,10 +177,8 @@ if ($action == 'add' && $permtoadd)
 		}
 	}
 
-	if (!$error)
-	{
-		if (!empty($backtopage))
-		{
+	if (!$error) {
+		if (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		} else {
@@ -194,8 +189,7 @@ if ($action == 'add' && $permtoadd)
 }
 
 // Deleting file
-elseif ($action == 'confirm_deletesection' && $confirm == 'yes')
-{
+elseif ($action == 'confirm_deletesection' && $confirm == 'yes') {
 	$result = $ecmdir->delete($user);
 	setEventMessages($langs->trans("ECMSectionWasRemoved", $ecmdir->label), null, 'mesgs');
 }
@@ -212,8 +206,7 @@ llxHeader('', $langs->trans("ECMNewSection"));
 $form = new Form($db);
 $formecm = new FormEcm($db);
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	//***********************
 	// Create
 	//***********************
@@ -222,13 +215,17 @@ if ($action == 'create')
 	print '<input type="hidden" name="action" value="add">';
 	print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
 	print '<input type="hidden" name="backtopage" value="'.dol_escape_htmltag($backtopage).'">';
-	if ($website) print '<input type="hidden" name="website" value="'.dol_escape_htmltag($website).'">';
-	if ($pageid)  print '<input type="hidden" name="pageid" value="'.dol_escape_htmltag($pageid).'">';
+	if ($website) {
+		print '<input type="hidden" name="website" value="'.dol_escape_htmltag($website).'">';
+	}
+	if ($pageid) {
+		print '<input type="hidden" name="pageid" value="'.dol_escape_htmltag($pageid).'">';
+	}
 
 	$title = $langs->trans("ECMNewSection");
 	print load_fiche_titre($title);
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">';
 
@@ -240,8 +237,7 @@ if ($action == 'create')
 	print '</td></tr>'."\n";
 
 	// Description
-	if ($module == 'ecm')
-	{
+	if ($module == 'ecm') {
 		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
 		print '<textarea name="desc" rows="4" class="quatrevingtpercent">';
 		print $ecmdir->description;
@@ -251,47 +247,42 @@ if ($action == 'create')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="create" value="'.$langs->trans("Create").'">';
 	print ' &nbsp; &nbsp; ';
-	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 	print '</form>';
 }
 
 
-if (empty($action) || $action == 'delete_section')
-{
+if (empty($action) || $action == 'delete_section') {
 	//***********************
 	// List
 	//***********************
 	print load_fiche_titre($langs->trans("ECMSectionOfDocuments"));
 	print '<br>';
 
-    /*
+	/*
 	$ecmdir->ref=$ecmdir->label;
 	print $langs->trans("ECMSection").': ';
 	print img_picto('','object_dir').' ';
 	print '<a href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php">'.$langs->trans("ECMRoot").'</a>';
 	//print ' -> <b>'.$ecmdir->getNomUrl(1).'</b><br>';
 	print "<br><br>";
-    */
+	*/
 
 	// Confirmation de la suppression d'une ligne categorie
-	if ($action == 'delete_section')
-	{
+	if ($action == 'delete_section') {
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section, $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection');
 	}
 
-	// Construit fiche  rubrique
-
 
 	// Actions buttons
 	print '<div class="tabsAction">';
-	if ($user->rights->ecm->setup)
-	{
+	if ($user->rights->ecm->setup) {
 		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=delete_section&token='.newToken().'">'.$langs->trans('Delete').'</a>';
 	} else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Delete').'</a>';
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index be481aa09bd..9dc6977f1e4 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -27,6 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Load translation files required by page
 $langs->loadLangs(array('ecm', 'companies', 'other'));
@@ -204,6 +205,16 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha'))
 		// Fetch was already done
 		$ecmdir->label = dol_sanitizeFileName(GETPOST("label"));
 		$ecmdir->description = GETPOST("description");
+		$ret = $extrafields->setOptionalsFromPost(null, $ecmdir);
+		if ($ret < 0) $error++;
+		if (!$error) {
+			// Actions on extra fields
+			$result = $ecmdir->insertExtraFields();
+			if ($result < 0) {
+				setEventMessages($ecmdir->error, $ecmdir->errors, 'errors');
+				$error++;
+			}
+		}
 		$result = $ecmdir->update($user);
 		if ($result > 0)
 		{
@@ -266,6 +277,10 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha'))
 $form = new Form($db);
 
 $object = new EcmDirectory($db); // Need to create a new one instance
+$extrafields = new ExtraFields($db);
+// fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
 
 if ($module == 'ecm')
 {
@@ -285,7 +300,7 @@ foreach ($filearray as $key => $file)
 
 
 $head = ecm_prepare_head($ecmdir, $module, $section);
-dol_fiche_head($head, 'card', $langs->trans("ECMSectionManual"), -1, 'dir');
+print dol_get_fiche_head($head, 'card', $langs->trans("ECMSectionManual"), -1, 'dir');
 
 
 if ($action == 'edit')
@@ -415,14 +430,15 @@ print '</td></tr>';
 print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>';
 print dol_print_size($totalsize);
 print '</td></tr>';
+print $object->showOptionals($extrafields, ($action == 'edit' ? 'edit' : 'view'));
 print '</table>';
 
 if ($action == 'edit')
 {
 	print '<br><div align="center">';
-	print '<input type="submit" class="button" name="submit" value="'.$langs->trans("Save").'">';
+	print '<input type="submit" class="button button-save" name="submit" value="'.$langs->trans("Save").'">';
 	print ' &nbsp; &nbsp; ';
-	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 }
 
@@ -432,7 +448,7 @@ if ($action == 'edit')
 	print '</form>';
 }
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index 40068e2e0a3..496afbf8568 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -27,6 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Load translation files required by page
 $langs->loadLangs(array('ecm', 'companies', 'other', 'users', 'orders', 'propal', 'bills', 'contracts', 'categories'));
@@ -43,8 +44,8 @@ $socid = GETPOST("socid", "int");
 // Security check
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -61,14 +62,14 @@ if (!$sortfield) $sortfield = "label";
 $section = GETPOST("section", 'alpha');
 if (!$section)
 {
-    dol_print_error('', 'Error, section parameter missing');
-    exit;
+	dol_print_error('', 'Error, section parameter missing');
+	exit;
 }
 $urlfile = GETPOST("urlfile");
 if (!$urlfile)
 {
-    dol_print_error('', "ErrorParamNotDefined");
-    exit;
+	dol_print_error('', "ErrorParamNotDefined");
+	exit;
 }
 
 // Load ecm object
@@ -76,8 +77,8 @@ $ecmdir = new EcmDirectory($db);
 $result = $ecmdir->fetch(GETPOST("section", 'alpha'));
 if (!$result > 0)
 {
-    dol_print_error($db, $ecmdir->error);
-    exit;
+	dol_print_error($db, $ecmdir->error);
+	exit;
 }
 $relativepath = $ecmdir->getRelativePath();
 $upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
@@ -94,6 +95,10 @@ $filepathtodocument = $relativetodocument.$file->label;
 
 // Try to load object from index
 $object = new ECMFiles($db);
+$extrafields = new ExtraFields($db);
+// fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
 $result = $object->fetch(0, '', $filepathtodocument);
 if ($result < 0)
 {
@@ -109,68 +114,67 @@ if ($result < 0)
 
 if ($cancel)
 {
-    $action = '';
-    if ($backtopage)
-    {
-        header("Location: ".$backtopage);
-        exit;
-    } else {
-    	header('Location: '.$_SERVER["PHP_SELF"].'?urlfile='.urlencode($urlfile).'&section='.urlencode($section).($module ? '&module='.urlencode($module) : ''));
-        exit;
-    }
+	$action = '';
+	if ($backtopage)
+	{
+		header("Location: ".$backtopage);
+		exit;
+	} else {
+		header('Location: '.$_SERVER["PHP_SELF"].'?urlfile='.urlencode($urlfile).'&section='.urlencode($section).($module ? '&module='.urlencode($module) : ''));
+		exit;
+	}
 }
 
 // Rename file
 if ($action == 'update')
 {
-    $error = 0;
+	$error = 0;
 
-    $oldlabel = GETPOST('urlfile', 'alpha');
-    $newlabel = dol_sanitizeFileName(GETPOST('label', 'alpha'));
+	$oldlabel = GETPOST('urlfile', 'alpha');
+	$newlabel = dol_sanitizeFileName(GETPOST('label', 'alpha'));
 	$shareenabled = GETPOST('shareenabled', 'alpha');
 
-    //$db->begin();
+	//$db->begin();
 
-    $olddir = $ecmdir->getRelativePath(0); // Relative to ecm
-    $olddirrelativetodocument = 'ecm/'.$olddir; // Relative to document
-    $newdirrelativetodocument = 'ecm/'.$olddir;
-    $olddir = $conf->ecm->dir_output.'/'.$olddir;
-    $newdir = $olddir;
+	$olddir = $ecmdir->getRelativePath(0); // Relative to ecm
+	$olddirrelativetodocument = 'ecm/'.$olddir; // Relative to document
+	$newdirrelativetodocument = 'ecm/'.$olddir;
+	$olddir = $conf->ecm->dir_output.'/'.$olddir;
+	$newdir = $olddir;
 
-    $oldfile = $olddir.$oldlabel;
-    $newfile = $newdir.$newlabel;
-    $newfileformove = $newfile;
-    // If old file end with .noexe, new file must also end with .noexe
-    if (preg_match('/\.noexe$/', $oldfile) && ! preg_match('/\.noexe$/', $newfileformove)) {
-    	$newfileformove .= '.noexe';
-    }
-    //var_dump($oldfile);var_dump($newfile);exit;
+	$oldfile = $olddir.$oldlabel;
+	$newfile = $newdir.$newlabel;
+	$newfileformove = $newfile;
+	// If old file end with .noexe, new file must also end with .noexe
+	if (preg_match('/\.noexe$/', $oldfile) && !preg_match('/\.noexe$/', $newfileformove)) {
+		$newfileformove .= '.noexe';
+	}
+	//var_dump($oldfile);var_dump($newfile);exit;
 
-    // Now we update index of file
-    $db->begin();
+	// Now we update index of file
+	$db->begin();
+	//print $oldfile.' - '.$newfile;
+	if ($newlabel != $oldlabel)
+	{
+		$result = dol_move($oldfile, $newfileformove); // This include update of database
+		if (!$result)
+		{
+			$langs->load('errors');
+			setEventMessages($langs->trans('ErrorFailToRenameFile', $oldfile, $newfile), null, 'errors');
+			$error++;
+		}
 
-    //print $oldfile.' - '.$newfile;
-    if ($newlabel != $oldlabel)
-    {
-    	$result = dol_move($oldfile, $newfileformove); // This include update of database
-        if (!$result)
-        {
-            $langs->load('errors');
-            setEventMessages($langs->trans('ErrorFailToRenameFile', $oldfile, $newfile), null, 'errors');
-            $error++;
-        }
+		// Reload object after the move
+		$result = $object->fetch(0, '', $newdirrelativetodocument.$newlabel);
+		if ($result < 0)
+		{
+			dol_print_error($db, $object->error, $object->errors);
+			exit;
+		}
+	}
 
-        // Reload object after the move
-        $result = $object->fetch(0, '', $newdirrelativetodocument.$newlabel);
-        if ($result < 0)
-        {
-        	dol_print_error($db, $object->error, $object->errors);
-        	exit;
-        }
-    }
-
-    if (!$error)
-    {
+	if (!$error)
+	{
 		if ($shareenabled)
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
@@ -181,6 +185,16 @@ if ($action == 'update')
 
 		if ($object->id > 0)
 		{
+			$ret = $extrafields->setOptionalsFromPost(null, $object);
+			if ($ret < 0) $error++;
+			if (!$error) {
+				// Actions on extra fields
+				$result = $object->insertExtraFields();
+				if ($result < 0) {
+					setEventMessages($object->error, $object->errors, 'errors');
+					$error++;
+				}
+			}
 			// Call update to set the share key
 			$result = $object->update($user);
 			if ($result < 0)
@@ -203,23 +217,23 @@ if ($action == 'update')
 				setEventMessages($object->error, $object->errors, 'warnings');
 			}
 		}
-    }
+	}
 
-    if (!$error)
-    {
-        $db->commit();
+	if (!$error)
+	{
+		$db->commit();
 
-        $urlfile = $newlabel;
-        // If old file end with .noexe, new file must also end with .noexe
-        if (preg_match('/\.noexe$/', $newfileformove)) {
-        	$urlfile .= '.noexe';
-        }
+		$urlfile = $newlabel;
+		// If old file end with .noexe, new file must also end with .noexe
+		if (preg_match('/\.noexe$/', $newfileformove)) {
+			$urlfile .= '.noexe';
+		}
 
-        header('Location: '.$_SERVER["PHP_SELF"].'?urlfile='.urlencode($urlfile).'&section='.urlencode($section));
-        exit;
-    } else {
-        $db->rollback();
-    }
+		header('Location: '.$_SERVER["PHP_SELF"].'?urlfile='.urlencode($urlfile).'&section='.urlencode($section));
+		exit;
+	} else {
+		$db->rollback();
+	}
 }
 
 
@@ -245,7 +259,7 @@ if ($action == 'edit')
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
 }
 
-dol_fiche_head($head, 'card', $langs->trans("File"), -1, 'generic');
+print dol_get_fiche_head($head, 'card', $langs->trans("File"), -1, 'generic');
 
 
 $s = '';
@@ -365,32 +379,33 @@ if (!empty($object->share))
 		print '<input type="checkbox" name="shareenabled"'.($object->share ? ' checked="checked"' : '').' /> ';
 	}
 }
-print '</td></tr>';
-
+print '</td>';
+print '</tr>';
+print $object->showOptionals($extrafields, ($action == 'edit' ? 'edit' : 'view'));
 print '</table>';
 print '</div>';
 
 print ajax_autoselect('downloadinternallink');
 print ajax_autoselect('downloadlink');
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 if ($action == 'edit')
 {
-    print '<div class="center">';
-    print '<input type="submit" class="button" name="submit" value="'.$langs->trans("Save").'">';
-    print ' &nbsp; &nbsp; ';
-    print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-    print '</div>';
+	print '<div class="center">';
+	print '<input type="submit" class="button button-save" name="submit" value="'.$langs->trans("Save").'">';
+	print ' &nbsp; &nbsp; ';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
 
-    print '</form>';
+	print '</form>';
 }
 
 
 // Confirmation de la suppression d'une ligne categorie
 if ($action == 'delete_file')
 {
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.urlencode($section), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile', $urlfile), 'confirm_deletefile', '', 1, 1);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.urlencode($section), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile', $urlfile), 'confirm_deletefile', '', 1, 1);
 }
 
 if ($action != 'edit')
@@ -398,11 +413,11 @@ if ($action != 'edit')
 	// Actions buttons
 	print '<div class="tabsAction">';
 
-    if ($user->rights->ecm->setup)
-    {
-        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&section='.urlencode($section).'&urlfile='.urlencode($urlfile).'">'.$langs->trans('Edit').'</a>';
-    }
-    /*
+	if ($user->rights->ecm->setup)
+	{
+		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&section='.urlencode($section).'&urlfile='.urlencode($urlfile).'">'.$langs->trans('Edit').'</a>';
+	}
+	/*
 	if ($user->rights->ecm->setup)
 	{
 		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=delete_file&token='.newToken().'&section='.$section.'&urlfile='.urlencode($urlfile).'">'.$langs->trans('Delete').'</a>';
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index d3ddb99fbdf..a5050889e09 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -86,7 +86,7 @@ $error = 0;
 if (GETPOST("sendit", 'alphanohtml') && !empty($conf->global->MAIN_UPLOAD_DOC))
 {
 	// Define relativepath and upload_dir
-    $relativepath = '';
+	$relativepath = '';
 	if ($ecmdir->id) $relativepath = $ecmdir->getRelativePath();
 	else $relativepath = $section_dir;
 	$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
@@ -111,10 +111,10 @@ if (GETPOST("sendit", 'alphanohtml') && !empty($conf->global->MAIN_UPLOAD_DOC))
 	{
 		$generatethumbs = 0;
 		$res = dol_add_file_process($upload_dir, 0, 1, 'userfile', '', null, '', $generatethumbs);
-	    if ($res > 0)
-	    {
-	        $result = $ecmdir->changeNbOfFiles('+');
-	    }
+		if ($res > 0)
+		{
+			$result = $ecmdir->changeNbOfFiles('+');
+		}
 	}
 }
 
@@ -169,7 +169,7 @@ if ($action == 'confirm_deletesection' && GETPOST('confirm', 'alpha') == 'yes')
 	$result = $ecmdir->delete($user);
 	setEventMessages($langs->trans("ECMSectionWasRemoved", $ecmdir->label), null, 'mesgs');
 
-    clearstatcache();
+	clearstatcache();
 }
 
 // Refresh directory view
@@ -177,130 +177,130 @@ if ($action == 'confirm_deletesection' && GETPOST('confirm', 'alpha') == 'yes')
 // To refresh content of dir with cache, just open the dir in edit mode.
 if ($action == 'refreshmanual')
 {
-    $ecmdirtmp = new EcmDirectory($db);
+	$ecmdirtmp = new EcmDirectory($db);
 
 	// This part of code is same than into file ecm/ajax/ecmdatabase.php TODO Remove duplicate
 	clearstatcache();
 
-    $diroutputslash = str_replace('\\', '/', $conf->ecm->dir_output);
-    $diroutputslash .= '/';
+	$diroutputslash = str_replace('\\', '/', $conf->ecm->dir_output);
+	$diroutputslash .= '/';
 
-    // Scan directory tree on disk
-    $disktree = dol_dir_list($conf->ecm->dir_output, 'directories', 1, '', '^temp$', '', '', 0);
+	// Scan directory tree on disk
+	$disktree = dol_dir_list($conf->ecm->dir_output, 'directories', 1, '', '^temp$', '', '', 0);
 
-    // Scan directory tree in database
-    $sqltree = $ecmdirstatic->get_full_arbo(0);
+	// Scan directory tree in database
+	$sqltree = $ecmdirstatic->get_full_arbo(0);
 
-    $adirwascreated = 0;
+	$adirwascreated = 0;
 
-    // Now we compare both trees to complete missing trees into database
-    //var_dump($disktree);
-    //var_dump($sqltree);
-    foreach ($disktree as $dirdesc)    // Loop on tree onto disk
-    {
-        $dirisindatabase = 0;
-        foreach ($sqltree as $dirsqldesc)
-        {
-            if ($conf->ecm->dir_output.'/'.$dirsqldesc['fullrelativename'] == $dirdesc['fullname'])
-            {
-                $dirisindatabase = 1;
-                break;
-            }
-        }
+	// Now we compare both trees to complete missing trees into database
+	//var_dump($disktree);
+	//var_dump($sqltree);
+	foreach ($disktree as $dirdesc)    // Loop on tree onto disk
+	{
+		$dirisindatabase = 0;
+		foreach ($sqltree as $dirsqldesc)
+		{
+			if ($conf->ecm->dir_output.'/'.$dirsqldesc['fullrelativename'] == $dirdesc['fullname'])
+			{
+				$dirisindatabase = 1;
+				break;
+			}
+		}
 
-        if (!$dirisindatabase)
-        {
-            $txt = "Directory found on disk ".$dirdesc['fullname'].", not found into database so we add it";
-            dol_syslog($txt);
-            //print $txt."<br>\n";
+		if (!$dirisindatabase)
+		{
+			$txt = "Directory found on disk ".$dirdesc['fullname'].", not found into database so we add it";
+			dol_syslog($txt);
+			//print $txt."<br>\n";
 
-            // We must first find the fk_parent of directory to create $dirdesc['fullname']
-            $fk_parent = -1;
-            $relativepathmissing = str_replace($diroutputslash, '', $dirdesc['fullname']);
-            $relativepathtosearchparent = $relativepathmissing;
-            //dol_syslog("Try to find parent id for directory ".$relativepathtosearchparent);
-            if (preg_match('/\//', $relativepathtosearchparent))
-            //while (preg_match('/\//',$relativepathtosearchparent))
-            {
-                $relativepathtosearchparent = preg_replace('/\/[^\/]*$/', '', $relativepathtosearchparent);
-                $txt = "Is relative parent path ".$relativepathtosearchparent." for ".$relativepathmissing." found in sql tree ?";
-                dol_syslog($txt);
-                //print $txt." -> ";
-                $parentdirisindatabase = 0;
-                foreach ($sqltree as $dirsqldesc)
-                {
-                    if ($dirsqldesc['fullrelativename'] == $relativepathtosearchparent)
-                    {
-                        $parentdirisindatabase = $dirsqldesc['id'];
-                        break;
-                    }
-                }
-                if ($parentdirisindatabase > 0)
-                {
-                    dol_syslog("Yes with id ".$parentdirisindatabase);
-                    //print "Yes with id ".$parentdirisindatabase."<br>\n";
-                    $fk_parent = $parentdirisindatabase;
-                    //break;  // We found parent, we can stop the while loop
-                } else {
-                    dol_syslog("No");
-                    //print "No<br>\n";
-                }
-            } else {
-                dol_syslog("Parent is root");
-                $fk_parent = 0; // Parent is root
-            }
+			// We must first find the fk_parent of directory to create $dirdesc['fullname']
+			$fk_parent = -1;
+			$relativepathmissing = str_replace($diroutputslash, '', $dirdesc['fullname']);
+			$relativepathtosearchparent = $relativepathmissing;
+			//dol_syslog("Try to find parent id for directory ".$relativepathtosearchparent);
+			if (preg_match('/\//', $relativepathtosearchparent))
+			//while (preg_match('/\//',$relativepathtosearchparent))
+			{
+				$relativepathtosearchparent = preg_replace('/\/[^\/]*$/', '', $relativepathtosearchparent);
+				$txt = "Is relative parent path ".$relativepathtosearchparent." for ".$relativepathmissing." found in sql tree ?";
+				dol_syslog($txt);
+				//print $txt." -> ";
+				$parentdirisindatabase = 0;
+				foreach ($sqltree as $dirsqldesc)
+				{
+					if ($dirsqldesc['fullrelativename'] == $relativepathtosearchparent)
+					{
+						$parentdirisindatabase = $dirsqldesc['id'];
+						break;
+					}
+				}
+				if ($parentdirisindatabase > 0)
+				{
+					dol_syslog("Yes with id ".$parentdirisindatabase);
+					//print "Yes with id ".$parentdirisindatabase."<br>\n";
+					$fk_parent = $parentdirisindatabase;
+					//break;  // We found parent, we can stop the while loop
+				} else {
+					dol_syslog("No");
+					//print "No<br>\n";
+				}
+			} else {
+				dol_syslog("Parent is root");
+				$fk_parent = 0; // Parent is root
+			}
 
-            if ($fk_parent >= 0)
-            {
-                $ecmdirtmp->ref                = 'NOTUSEDYET';
-                $ecmdirtmp->label              = dol_basename($dirdesc['fullname']);
-                $ecmdirtmp->description        = '';
-                $ecmdirtmp->fk_parent          = $fk_parent;
+			if ($fk_parent >= 0)
+			{
+				$ecmdirtmp->ref                = 'NOTUSEDYET';
+				$ecmdirtmp->label              = dol_basename($dirdesc['fullname']);
+				$ecmdirtmp->description        = '';
+				$ecmdirtmp->fk_parent          = $fk_parent;
 
-                $txt = "We create directory ".$ecmdirtmp->label." with parent ".$fk_parent;
-                dol_syslog($txt);
-                //print $ecmdirtmp->cachenbofdoc."<br>\n";exit;
-                $id = $ecmdirtmp->create($user);
-                if ($id > 0)
-                {
-                    $newdirsql = array('id'=>$id,
-                                     'id_mere'=>$ecmdirtmp->fk_parent,
-                                     'label'=>$ecmdirtmp->label,
-                                     'description'=>$ecmdirtmp->description,
-                                     'fullrelativename'=>$relativepathmissing);
-                    $sqltree[] = $newdirsql; // We complete fulltree for following loops
-                    //var_dump($sqltree);
-                    $adirwascreated = 1;
-                } else {
-                    dol_syslog("Failed to create directory ".$ecmdirtmp->label, LOG_ERR);
-                }
-            } else {
-                $txt = "Parent of ".$dirdesc['fullname']." not found";
-                dol_syslog($txt);
-                //print $txt."<br>\n";
-            }
-        }
-    }
+				$txt = "We create directory ".$ecmdirtmp->label." with parent ".$fk_parent;
+				dol_syslog($txt);
+				//print $ecmdirtmp->cachenbofdoc."<br>\n";exit;
+				$id = $ecmdirtmp->create($user);
+				if ($id > 0)
+				{
+					$newdirsql = array('id'=>$id,
+									 'id_mere'=>$ecmdirtmp->fk_parent,
+									 'label'=>$ecmdirtmp->label,
+									 'description'=>$ecmdirtmp->description,
+									 'fullrelativename'=>$relativepathmissing);
+					$sqltree[] = $newdirsql; // We complete fulltree for following loops
+					//var_dump($sqltree);
+					$adirwascreated = 1;
+				} else {
+					dol_syslog("Failed to create directory ".$ecmdirtmp->label, LOG_ERR);
+				}
+			} else {
+				$txt = "Parent of ".$dirdesc['fullname']." not found";
+				dol_syslog($txt);
+				//print $txt."<br>\n";
+			}
+		}
+	}
 
-    // Loop now on each sql tree to check if dir exists
-    foreach ($sqltree as $dirdesc)    // Loop on each sqltree to check dir is on disk
-    {
-    	$dirtotest = $conf->ecm->dir_output.'/'.$dirdesc['fullrelativename'];
+	// Loop now on each sql tree to check if dir exists
+	foreach ($sqltree as $dirdesc)    // Loop on each sqltree to check dir is on disk
+	{
+		$dirtotest = $conf->ecm->dir_output.'/'.$dirdesc['fullrelativename'];
 		if (!dol_is_dir($dirtotest))
 		{
 			$ecmdirtmp->id = $dirdesc['id'];
 			$ecmdirtmp->delete($user, 'databaseonly');
 			//exit;
 		}
-    }
+	}
 
-    $sql = "UPDATE ".MAIN_DB_PREFIX."ecm_directories set cachenbofdoc = -1 WHERE cachenbofdoc < 0"; // If pb into cahce counting, we set to value -1 = "unknown"
-    dol_syslog("sql = ".$sql);
-    $db->query($sql);
+	$sql = "UPDATE ".MAIN_DB_PREFIX."ecm_directories set cachenbofdoc = -1 WHERE cachenbofdoc < 0"; // If pb into cahce counting, we set to value -1 = "unknown"
+	dol_syslog("sql = ".$sql);
+	$db->query($sql);
 
-    // If a directory was added, the fulltree array is not correctly completed and sorted, so we clean
-    // it to be sure that fulltree array is not used without reloading it.
-    if ($adirwascreated) $sqltree = null;
+	// If a directory was added, the fulltree array is not correctly completed and sorted, so we clean
+	// it to be sure that fulltree array is not used without reloading it.
+	if ($adirwascreated) $sqltree = null;
 }
 
 
@@ -327,7 +327,7 @@ $moreheadjs .= '</script>'."\n";
 llxHeader($moreheadcss.$moreheadjs, $langs->trans("ECMArea"), '', '', '', '', $morejs, '', 0, 0);
 
 $head = ecm_prepare_dasboard_head('');
-dol_fiche_head($head, 'index', $langs->trans("ECMArea").' - '.$langs->trans("ECMFileManager"), -1, '');
+print dol_get_fiche_head($head, 'index', $langs->trans("ECMArea").' - '.$langs->trans("ECMFileManager"), -1, '');
 
 
 // Add filemanager component
@@ -335,7 +335,7 @@ $module = 'ecm';
 include DOL_DOCUMENT_ROOT.'/core/tpl/filemanager.tpl.php';
 
 // End of page
-dol_fiche_end();
+print dol_get_fiche_end();
 
 llxFooter();
 
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 05d454b8198..452f06efb0a 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -113,30 +113,30 @@ if ($action == 'add' && $user->rights->ecm->setup)
 // Remove file
 if ($action == 'confirm_deletefile')
 {
-    if (GETPOST('confirm') == 'yes')
-    {
-    	$langs->load("other");
-    	if ($section)
-    	{
-	    	$result = $ecmdir->fetch($section);
-	    	if (!($result > 0))
-	    	{
-	    		dol_print_error($db, $ecmdir->error);
-	    		exit;
-	    	}
-	    	$relativepath = $ecmdir->getRelativePath();
-    	} else $relativepath = '';
-    	$upload_dir = $conf->ecm->dir_output.($relativepath ? '/'.$relativepath : '');
-    	$file = $upload_dir."/".GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_POST are already decoded by PHP).
+	if (GETPOST('confirm') == 'yes')
+	{
+		$langs->load("other");
+		if ($section)
+		{
+			$result = $ecmdir->fetch($section);
+			if (!($result > 0))
+			{
+				dol_print_error($db, $ecmdir->error);
+				exit;
+			}
+			$relativepath = $ecmdir->getRelativePath();
+		} else $relativepath = '';
+		$upload_dir = $conf->ecm->dir_output.($relativepath ? '/'.$relativepath : '');
+		$file = $upload_dir."/".GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_POST are already decoded by PHP).
 
-    	$ret = dol_delete_file($file);
-    	if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
-    	else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+		$ret = dol_delete_file($file);
+		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
+		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
 
-    	$result = $ecmdir->changeNbOfFiles('-');
+		$result = $ecmdir->changeNbOfFiles('-');
 
-    	clearstatcache();
-    }
+		clearstatcache();
+	}
    	$action = 'file_manager';
 }
 
@@ -146,7 +146,7 @@ if ($action == 'confirm_deletesection' && GETPOST('confirm') == 'yes')
 	$result = $ecmdir->delete($user);
 	setEventMessages($langs->trans("ECMSectionWasRemoved", $ecmdir->label), null, 'mesgs');
 
-    clearstatcache();
+	clearstatcache();
 }
 
 // Refresh directory view
@@ -154,130 +154,130 @@ if ($action == 'confirm_deletesection' && GETPOST('confirm') == 'yes')
 // To refresh content of dir with cache, just open the dir in edit mode.
 if ($action == 'refreshmanual')
 {
-    $ecmdirtmp = new EcmDirectory($db);
+	$ecmdirtmp = new EcmDirectory($db);
 
 	// This part of code is same than into file ecm/ajax/ecmdatabase.php TODO Remove duplicate
 	clearstatcache();
 
-    $diroutputslash = str_replace('\\', '/', $conf->ecm->dir_output);
-    $diroutputslash .= '/';
+	$diroutputslash = str_replace('\\', '/', $conf->ecm->dir_output);
+	$diroutputslash .= '/';
 
-    // Scan directory tree on disk
-    $disktree = dol_dir_list($conf->ecm->dir_output, 'directories', 1, '', '^temp$', '', '', 0);
+	// Scan directory tree on disk
+	$disktree = dol_dir_list($conf->ecm->dir_output, 'directories', 1, '', '^temp$', '', '', 0);
 
-    // Scan directory tree in database
-    $sqltree = $ecmdirstatic->get_full_arbo(0);
+	// Scan directory tree in database
+	$sqltree = $ecmdirstatic->get_full_arbo(0);
 
-    $adirwascreated = 0;
+	$adirwascreated = 0;
 
-    // Now we compare both trees to complete missing trees into database
-    //var_dump($disktree);
-    //var_dump($sqltree);
-    foreach ($disktree as $dirdesc)    // Loop on tree onto disk
-    {
-        $dirisindatabase = 0;
-        foreach ($sqltree as $dirsqldesc)
-        {
-            if ($conf->ecm->dir_output.'/'.$dirsqldesc['fullrelativename'] == $dirdesc['fullname'])
-            {
-                $dirisindatabase = 1;
-                break;
-            }
-        }
+	// Now we compare both trees to complete missing trees into database
+	//var_dump($disktree);
+	//var_dump($sqltree);
+	foreach ($disktree as $dirdesc)    // Loop on tree onto disk
+	{
+		$dirisindatabase = 0;
+		foreach ($sqltree as $dirsqldesc)
+		{
+			if ($conf->ecm->dir_output.'/'.$dirsqldesc['fullrelativename'] == $dirdesc['fullname'])
+			{
+				$dirisindatabase = 1;
+				break;
+			}
+		}
 
-        if (!$dirisindatabase)
-        {
-            $txt = "Directory found on disk ".$dirdesc['fullname'].", not found into database so we add it";
-            dol_syslog($txt);
-            //print $txt."<br>\n";
+		if (!$dirisindatabase)
+		{
+			$txt = "Directory found on disk ".$dirdesc['fullname'].", not found into database so we add it";
+			dol_syslog($txt);
+			//print $txt."<br>\n";
 
-            // We must first find the fk_parent of directory to create $dirdesc['fullname']
-            $fk_parent = -1;
-            $relativepathmissing = str_replace($diroutputslash, '', $dirdesc['fullname']);
-            $relativepathtosearchparent = $relativepathmissing;
-            //dol_syslog("Try to find parent id for directory ".$relativepathtosearchparent);
-            if (preg_match('/\//', $relativepathtosearchparent))
-            //while (preg_match('/\//',$relativepathtosearchparent))
-            {
-                $relativepathtosearchparent = preg_replace('/\/[^\/]*$/', '', $relativepathtosearchparent);
-                $txt = "Is relative parent path ".$relativepathtosearchparent." for ".$relativepathmissing." found in sql tree ?";
-                dol_syslog($txt);
-                //print $txt." -> ";
-                $parentdirisindatabase = 0;
-                foreach ($sqltree as $dirsqldesc)
-                {
-                    if ($dirsqldesc['fullrelativename'] == $relativepathtosearchparent)
-                    {
-                        $parentdirisindatabase = $dirsqldesc['id'];
-                        break;
-                    }
-                }
-                if ($parentdirisindatabase > 0)
-                {
-                    dol_syslog("Yes with id ".$parentdirisindatabase);
-                    //print "Yes with id ".$parentdirisindatabase."<br>\n";
-                    $fk_parent = $parentdirisindatabase;
-                    //break;  // We found parent, we can stop the while loop
-                } else {
-                    dol_syslog("No");
-                    //print "No<br>\n";
-                }
-            } else {
-                dol_syslog("Parent is root");
-                $fk_parent = 0; // Parent is root
-            }
+			// We must first find the fk_parent of directory to create $dirdesc['fullname']
+			$fk_parent = -1;
+			$relativepathmissing = str_replace($diroutputslash, '', $dirdesc['fullname']);
+			$relativepathtosearchparent = $relativepathmissing;
+			//dol_syslog("Try to find parent id for directory ".$relativepathtosearchparent);
+			if (preg_match('/\//', $relativepathtosearchparent))
+			//while (preg_match('/\//',$relativepathtosearchparent))
+			{
+				$relativepathtosearchparent = preg_replace('/\/[^\/]*$/', '', $relativepathtosearchparent);
+				$txt = "Is relative parent path ".$relativepathtosearchparent." for ".$relativepathmissing." found in sql tree ?";
+				dol_syslog($txt);
+				//print $txt." -> ";
+				$parentdirisindatabase = 0;
+				foreach ($sqltree as $dirsqldesc)
+				{
+					if ($dirsqldesc['fullrelativename'] == $relativepathtosearchparent)
+					{
+						$parentdirisindatabase = $dirsqldesc['id'];
+						break;
+					}
+				}
+				if ($parentdirisindatabase > 0)
+				{
+					dol_syslog("Yes with id ".$parentdirisindatabase);
+					//print "Yes with id ".$parentdirisindatabase."<br>\n";
+					$fk_parent = $parentdirisindatabase;
+					//break;  // We found parent, we can stop the while loop
+				} else {
+					dol_syslog("No");
+					//print "No<br>\n";
+				}
+			} else {
+				dol_syslog("Parent is root");
+				$fk_parent = 0; // Parent is root
+			}
 
-            if ($fk_parent >= 0)
-            {
-                $ecmdirtmp->ref                = 'NOTUSEDYET';
-                $ecmdirtmp->label              = dol_basename($dirdesc['fullname']);
-                $ecmdirtmp->description        = '';
-                $ecmdirtmp->fk_parent          = $fk_parent;
+			if ($fk_parent >= 0)
+			{
+				$ecmdirtmp->ref                = 'NOTUSEDYET';
+				$ecmdirtmp->label              = dol_basename($dirdesc['fullname']);
+				$ecmdirtmp->description        = '';
+				$ecmdirtmp->fk_parent          = $fk_parent;
 
-                $txt = "We create directory ".$ecmdirtmp->label." with parent ".$fk_parent;
-                dol_syslog($txt);
-                //print $ecmdirtmp->cachenbofdoc."<br>\n";exit;
-                $id = $ecmdirtmp->create($user);
-                if ($id > 0)
-                {
-                    $newdirsql = array('id'=>$id,
-                                     'id_mere'=>$ecmdirtmp->fk_parent,
-                                     'label'=>$ecmdirtmp->label,
-                                     'description'=>$ecmdirtmp->description,
-                                     'fullrelativename'=>$relativepathmissing);
-                    $sqltree[] = $newdirsql; // We complete fulltree for following loops
-                    //var_dump($sqltree);
-                    $adirwascreated = 1;
-                } else {
-                    dol_syslog("Failed to create directory ".$ecmdirtmp->label, LOG_ERR);
-                }
-            } else {
-                $txt = "Parent of ".$dirdesc['fullname']." not found";
-                dol_syslog($txt);
-                //print $txt."<br>\n";
-            }
-        }
-    }
+				$txt = "We create directory ".$ecmdirtmp->label." with parent ".$fk_parent;
+				dol_syslog($txt);
+				//print $ecmdirtmp->cachenbofdoc."<br>\n";exit;
+				$id = $ecmdirtmp->create($user);
+				if ($id > 0)
+				{
+					$newdirsql = array('id'=>$id,
+									 'id_mere'=>$ecmdirtmp->fk_parent,
+									 'label'=>$ecmdirtmp->label,
+									 'description'=>$ecmdirtmp->description,
+									 'fullrelativename'=>$relativepathmissing);
+					$sqltree[] = $newdirsql; // We complete fulltree for following loops
+					//var_dump($sqltree);
+					$adirwascreated = 1;
+				} else {
+					dol_syslog("Failed to create directory ".$ecmdirtmp->label, LOG_ERR);
+				}
+			} else {
+				$txt = "Parent of ".$dirdesc['fullname']." not found";
+				dol_syslog($txt);
+				//print $txt."<br>\n";
+			}
+		}
+	}
 
-    // Loop now on each sql tree to check if dir exists
-    foreach ($sqltree as $dirdesc)    // Loop on each sqltree to check dir is on disk
-    {
-    	$dirtotest = $conf->ecm->dir_output.'/'.$dirdesc['fullrelativename'];
+	// Loop now on each sql tree to check if dir exists
+	foreach ($sqltree as $dirdesc)    // Loop on each sqltree to check dir is on disk
+	{
+		$dirtotest = $conf->ecm->dir_output.'/'.$dirdesc['fullrelativename'];
 		if (!dol_is_dir($dirtotest))
 		{
 			$ecmdirtmp->id = $dirdesc['id'];
 			$ecmdirtmp->delete($user, 'databaseonly');
 			//exit;
 		}
-    }
+	}
 
-    $sql = "UPDATE ".MAIN_DB_PREFIX."ecm_directories set cachenbofdoc = -1 WHERE cachenbofdoc < 0"; // If pb into cahce counting, we set to value -1 = "unknown"
-    dol_syslog("sql = ".$sql);
-    $db->query($sql);
+	$sql = "UPDATE ".MAIN_DB_PREFIX."ecm_directories set cachenbofdoc = -1 WHERE cachenbofdoc < 0"; // If pb into cahce counting, we set to value -1 = "unknown"
+	dol_syslog("sql = ".$sql);
+	$db->query($sql);
 
-    // If a directory was added, the fulltree array is not correctly completed and sorted, so we clean
-    // it to be sure that fulltree array is not used without reloading it.
-    if ($adirwascreated) $sqltree = null;
+	// If a directory was added, the fulltree array is not correctly completed and sorted, so we clean
+	// it to be sure that fulltree array is not used without reloading it.
+	if ($adirwascreated) $sqltree = null;
 }
 
 
@@ -310,27 +310,27 @@ $sectionauto = array();
 if (!empty($conf->global->ECM_AUTO_TREE_ENABLED))
 {
 	if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) { $langs->load("products"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'product', 'test'=>(!empty($conf->product->enabled) || !empty($conf->service->enabled)), 'label'=>$langs->trans("ProductsAndServices"), 'desc'=>$langs->trans("ECMDocsByProducts")); }
-	if (!empty($conf->societe->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'company', 'test'=>$conf->societe->enabled, 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsByThirdParties")); }
-	if (!empty($conf->propal->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'propal', 'test'=>$conf->propal->enabled, 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsByProposals")); }
-	if (!empty($conf->contrat->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'contract', 'test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsByContracts")); }
-	if (!empty($conf->commande->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order', 'test'=>$conf->commande->enabled, 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsByOrders")); }
-	if (!empty($conf->facture->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice', 'test'=>$conf->facture->enabled, 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsByInvoices")); }
-	if (!empty($conf->supplier_proposal->enabled)) { $langs->load("supplier_proposal"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'supplier_proposal', 'test'=>$conf->supplier_proposal->enabled, 'label'=>$langs->trans("SupplierProposals"), 'desc'=>$langs->trans("ECMDocsBySupplierProposals")); }
-	if (!empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersOrders"), 'desc'=>$langs->trans("ECMDocsByOrders")); }
-	if (!empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsByInvoices")); }
-	if (!empty($conf->tax->enabled)) { $langs->load("compta"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBySocialContributions")); }
-	if (!empty($conf->projet->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsByProjects")); }
-	if (!empty($conf->ficheinter->enabled)) { $langs->load("interventions"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsByInterventions")); }
-	if (!empty($conf->expensereport->enabled)) { $langs->load("trips"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'expensereport', 'test'=>$conf->expensereport->enabled, 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsByExpenseReports")); }
-	if (!empty($conf->holiday->enabled)) { $langs->load("holiday"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'holiday', 'test'=>$conf->holiday->enabled, 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsByHolidays")); }
-	if (!empty($conf->banque->enabled)) { $langs->load("banks"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'banque', 'test'=>$conf->banque->enabled, 'label'=>$langs->trans("BankAccount"), 'desc'=>$langs->trans("ECMDocsByBankAccount")); }
-	if (!empty($conf->mrp->enabled)) { $langs->load("mrp"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'mrp-mo', 'test'=>$conf->mrp->enabled, 'label'=>$langs->trans("MOs"), 'desc'=>$langs->trans("ECMDocsByMO")); }
-	if (!empty($conf->recruitment->enabled)) { $langs->load("recruitment"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'recruitment-recruitmentcandidature', 'test'=>$conf->recruitment->enabled, 'label'=>$langs->trans("Candidatures"), 'desc'=>$langs->trans("ECMDocsByCandidature")); }
-	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'user', 'test'=>1, 'label'=>$langs->trans("Users"), 'desc'=>$langs->trans("ECMDocsByUsers"));
+	if (!empty($conf->societe->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'company', 'test'=>$conf->societe->enabled, 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ThirdParties"))); }
+	if (!empty($conf->propal->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'propal', 'test'=>$conf->propal->enabled, 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Proposals"))); }
+	if (!empty($conf->contrat->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'contract', 'test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts"))); }
+	if (!empty($conf->commande->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order', 'test'=>$conf->commande->enabled, 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Orders"))); }
+	if (!empty($conf->facture->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice', 'test'=>$conf->facture->enabled, 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Invoices"))); }
+	if (!empty($conf->supplier_proposal->enabled)) { $langs->load("supplier_proposal"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'supplier_proposal', 'test'=>$conf->supplier_proposal->enabled, 'label'=>$langs->trans("SupplierProposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierProposals"))); }
+	if (!empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("PurchaseOrders"))); }
+	if (!empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierInvoices"))); }
+	if (!empty($conf->tax->enabled)) { $langs->load("compta"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SocialContributions"))); }
+	if (!empty($conf->projet->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Projects"))); }
+	if (!empty($conf->ficheinter->enabled)) { $langs->load("interventions"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Interventions"))); }
+	if (!empty($conf->expensereport->enabled)) { $langs->load("trips"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'expensereport', 'test'=>$conf->expensereport->enabled, 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ExpenseReports"))); }
+	if (!empty($conf->holiday->enabled)) { $langs->load("holiday"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'holiday', 'test'=>$conf->holiday->enabled, 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Holidays"))); }
+	if (!empty($conf->banque->enabled)) { $langs->load("banks"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'banque', 'test'=>$conf->banque->enabled, 'label'=>$langs->trans("BankAccount"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("BankAccount"))); }
+	if (!empty($conf->mrp->enabled)) { $langs->load("mrp"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'mrp-mo', 'test'=>$conf->mrp->enabled, 'label'=>$langs->trans("MOs"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ManufacturingOrders"))); }
+	if (!empty($conf->recruitment->enabled)) { $langs->load("recruitment"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'recruitment-recruitmentcandidature', 'test'=>$conf->recruitment->enabled, 'label'=>$langs->trans("Candidatures"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("JobApplications"))); }
+	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'user', 'test'=>1, 'label'=>$langs->trans("Users"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Users")));
 }
 
 $head = ecm_prepare_dasboard_head('');
-dol_fiche_head($head, 'index_auto', $langs->trans("ECMArea").' - '.$langs->trans("ECMFileManager"), -1, '');
+print dol_get_fiche_head($head, 'index_auto', $langs->trans("ECMArea").' - '.$langs->trans("ECMFileManager"), -1, '');
 
 
 
@@ -352,7 +352,7 @@ print '<div class="inline-block toolbarbutton centpercent">';
 
 // Toolbar
 $url = ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) ? '#' : ($_SERVER["PHP_SELF"].'?action=refreshmanual'.($module ? '&amp;module='.$module : '').($section ? '&amp;section='.$section : '')));
-print '<a href="'.$url.'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('Refresh')).'">';
+print '<a href="'.$url.'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans('Refresh')).'">';
 print '<img id="refreshbutton" class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/view-refresh.png">';
 print '</a>';
 
@@ -369,7 +369,7 @@ print '</div>';
 // Confirmation de la suppression d'une ligne categorie
 if ($action == 'delete_section')
 {
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section, $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection', '', '', 1);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section, $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection', '', '', 1);
 }
 // End confirm
 
@@ -380,12 +380,12 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $act
 
 	print '<!-- Title for auto directories -->'."\n";
 	print '<tr class="liste_titre">'."\n";
-    print '<th class="liste_titre" align="left" colspan="6">';
-    print '&nbsp;'.$langs->trans("ECMSections");
+	print '<th class="liste_titre" align="left" colspan="6">';
+	print '&nbsp;'.$langs->trans("ECMSections");
 	print '</th></tr>';
 
-    $showonrightsize = '';
-    // Auto section
+	$showonrightsize = '';
+	// Auto section
 	if (count($sectionauto))
 	{
 		$htmltooltip = $langs->trans("ECMAreaDesc2");
@@ -393,8 +393,8 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $act
 		$sectionauto = dol_sort_array($sectionauto, 'label', 'ASC', true, false);
 
 		print '<tr>';
-    	print '<td colspan="6">';
-	    print '<div id="filetreeauto" class="ecmfiletree"><ul class="ecmjqft">';
+		print '<td colspan="6">';
+		print '<div id="filetreeauto" class="ecmfiletree"><ul class="ecmjqft">';
 
 		$nbofentries = 0;
 		$oldvallevel = 0;
@@ -404,32 +404,32 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $act
 
 			$var = false;
 
-		    print '<li class="directory collapsed">';
+			print '<li class="directory collapsed">';
 			if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))
 			{
-			    print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.$val['module'].'">';
-			    print $val['label'];
-   			    print '</a>';
+				print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.$val['module'].'">';
+				print $val['label'];
+   				print '</a>';
 			} else {
-			    print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.$val['module'].'">';
-			    print $val['label'];
-			    print '</a>';
+				print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.$val['module'].'">';
+				print $val['label'];
+				print '</a>';
 			}
 
-		    print '<div class="ecmjqft">';
-		    // Info
-		    $htmltooltip = '<b>'.$langs->trans("ECMSection").'</b>: '.$val['label'].'<br>';
-		    $htmltooltip = '<b>'.$langs->trans("Type").'</b>: '.$langs->trans("ECMSectionAuto").'<br>';
-		    $htmltooltip .= '<b>'.$langs->trans("ECMCreationUser").'</b>: '.$langs->trans("ECMTypeAuto").'<br>';
-		    $htmltooltip .= '<b>'.$langs->trans("Description").'</b>: '.$val['desc'];
-		    print $form->textwithpicto('', $htmltooltip, 1, 'info');
-		    print '</div>';
-		    print '</li>';
+			print '<div class="ecmjqft">';
+			// Info
+			$htmltooltip = '<b>'.$langs->trans("ECMSection").'</b>: '.$val['label'].'<br>';
+			$htmltooltip = '<b>'.$langs->trans("Type").'</b>: '.$langs->trans("ECMSectionAuto").'<br>';
+			$htmltooltip .= '<b>'.$langs->trans("ECMCreationUser").'</b>: '.$langs->trans("ECMTypeAuto").'<br>';
+			$htmltooltip .= '<b>'.$langs->trans("Description").'</b>: '.$val['desc'];
+			print $form->textwithpicto('', $htmltooltip, 1, 'info');
+			print '</div>';
+			print '</li>';
 
-		    $nbofentries++;
+			$nbofentries++;
 		}
 
-	    print '</ul></div></td></tr>';
+		print '</ul></div></td></tr>';
 	}
 
 	print "</table>";
@@ -466,7 +466,7 @@ if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_
 }
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 llxFooter();
 
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index 8100ff46ba3..a3c242cb787 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -97,14 +97,23 @@ $userstatic = new User($db);
 // Ajout rubriques automatiques
 $rowspan = 0;
 $sectionauto = array();
-if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'product', 'test'=>$conf->product->enabled, 'label'=>$langs->trans("ProductsAndServices"), 'desc'=>$langs->trans("ECMDocsByProducts")); }
-if (!empty($conf->societe->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'company', 'test'=>$conf->societe->enabled, 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsByThirdParties")); }
-if (!empty($conf->propal->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'propal', 'test'=>$conf->propal->enabled, 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsByProposals")); }
-if (!empty($conf->contrat->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'contract', 'test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsByContracts")); }
-if (!empty($conf->commande->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order', 'test'=>$conf->commande->enabled, 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsByOrders")); }
-if (!empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsByOrders")); }
-if (!empty($conf->facture->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice', 'test'=>$conf->facture->enabled, 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsByInvoices")); }
-if (!empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersOrders"), 'desc'=>$langs->trans("ECMDocsByOrders")); }
+if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) { $langs->load("products"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'product', 'test'=>(!empty($conf->product->enabled) || !empty($conf->service->enabled)), 'label'=>$langs->trans("ProductsAndServices"), 'desc'=>$langs->trans("ECMDocsByProducts")); }
+if (!empty($conf->societe->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'company', 'test'=>$conf->societe->enabled, 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ThirdParties"))); }
+if (!empty($conf->propal->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'propal', 'test'=>$conf->propal->enabled, 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Proposals"))); }
+if (!empty($conf->contrat->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'contract', 'test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts"))); }
+if (!empty($conf->commande->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order', 'test'=>$conf->commande->enabled, 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Orders"))); }
+if (!empty($conf->facture->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice', 'test'=>$conf->facture->enabled, 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Invoices"))); }
+if (!empty($conf->supplier_proposal->enabled)) { $langs->load("supplier_proposal"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'supplier_proposal', 'test'=>$conf->supplier_proposal->enabled, 'label'=>$langs->trans("SupplierProposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierProposals"))); }
+if (!empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("PurchaseOrders"))); }
+if (!empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierInvoices"))); }
+if (!empty($conf->tax->enabled)) { $langs->load("compta"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SocialContributions"))); }
+if (!empty($conf->projet->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Projects"))); }
+if (!empty($conf->ficheinter->enabled)) { $langs->load("interventions"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Interventions"))); }
+if (!empty($conf->expensereport->enabled)) { $langs->load("trips"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'expensereport', 'test'=>$conf->expensereport->enabled, 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ExpenseReports"))); }
+if (!empty($conf->holiday->enabled)) { $langs->load("holiday"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'holiday', 'test'=>$conf->holiday->enabled, 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Holidays"))); }
+if (!empty($conf->banque->enabled)) { $langs->load("banks"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'banque', 'test'=>$conf->banque->enabled, 'label'=>$langs->trans("BankAccount"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("BankAccount"))); }
+if (!empty($conf->mrp->enabled)) { $langs->load("mrp"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'mrp-mo', 'test'=>$conf->mrp->enabled, 'label'=>$langs->trans("MOs"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ManufacturingOrders"))); }
+if (!empty($conf->recruitment->enabled)) { $langs->load("recruitment"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'recruitment-recruitmentcandidature', 'test'=>$conf->recruitment->enabled, 'label'=>$langs->trans("Candidatures"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("JobApplications"))); }
 
 
 //***********************
@@ -119,7 +128,7 @@ print $langs->trans("FeatureNotYetAvailable").'.<br><br>';
 
 // Tool bar
 $head = ecm_prepare_head_fm($ecmdir, $module, $section);
-//dol_fiche_head($head, 'search_form', '', 1);
+//print dol_get_fiche_head($head, 'search_form', '', 1);
 
 
 print '<table class="border centpercent"><tr><td width="40%" valign="top">';
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 943b7c73fb3..2c55b11f8d2 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -52,13 +52,14 @@ class EmailCollector extends CommonObject
 	 * @var int  Does emailcollector support extrafields ? 0=No, 1=Yes
 	 */
 	public $isextrafieldmanaged = 0;
+
 	/**
 	 * @var string String with name of icon for emailcollector. Must be the part after the 'object_' into object_emailcollector.png
 	 */
 	public $picto = 'generic';
 
 	/**
-	 * @var int    Field with ID of parent key if this field has a parent
+	 * @var string    Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_emailcollector';
 
@@ -158,7 +159,9 @@ class EmailCollector extends CommonObject
 	 */
 	public $date_creation;
 
-
+	/**
+	 * @var int timestamp
+	 */
 	public $tms;
 
 	/**
@@ -171,6 +174,9 @@ class EmailCollector extends CommonObject
 	 */
 	public $fk_user_modif;
 
+	/**
+	 * @var string import key
+	 */
 	public $import_key;
 
 
@@ -227,7 +233,7 @@ class EmailCollector extends CommonObject
 		// Translate some data of arrayofkeyval
 		foreach ($this->fields as $key => $val)
 		{
-			if (is_array($val['arrayofkeyval']))
+			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
 			{
 				foreach ($val['arrayofkeyval'] as $key2 => $val2)
 				{
@@ -1342,6 +1348,15 @@ class EmailCollector extends CommonObject
 							$trackid = $reg[1].$reg[2];
 
 							$objectid = $reg[2];
+							// See also list into interface_50_modAgenda_ActionsAuto
+							if ($reg[1] == 'thi')
+							{
+								$objectemail = new Societe($this->db);
+							}
+							if ($reg[1] == 'ctc')
+							{
+								$objectemail = new Contact($this->db);
+							}
 							if ($reg[1] == 'inv')
 							{
 								$objectemail = new Facture($this->db);
@@ -1350,14 +1365,14 @@ class EmailCollector extends CommonObject
 							{
 								$objectemail = new Project($this->db);
 							}
+							if ($reg[1] == 'tas')
+							{
+								$objectemail = new Task($this->db);
+							}
 							if ($reg[1] == 'con')
 							{
 								$objectemail = new Contact($this->db);
 							}
-							if ($reg[1] == 'thi')
-							{
-								$objectemail = new Societe($this->db);
-							}
 							if ($reg[1] == 'use')
 							{
 								$objectemail = new User($this->db);
@@ -1370,6 +1385,10 @@ class EmailCollector extends CommonObject
 							{
 								$objectemail = new RecruitmentCandidature($this->db);
 							}
+							if ($reg[1] == 'mem')
+							{
+								$objectemail = new Adherent($this->db);
+							}
 						} elseif (preg_match('/<(.*@.*)>/', $reference, $reg)) {
 							// This is an external reference, we check if we have it in our database
 							if (!is_object($objectemail)) {
diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php
index ed6942f34d6..58aaf9efdb7 100644
--- a/htdocs/emailcollector/class/emailcollectoraction.class.php
+++ b/htdocs/emailcollector/class/emailcollectoraction.class.php
@@ -32,259 +32,259 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
  */
 class EmailCollectorAction extends CommonObject
 {
-    /**
-     * @var string ID to identify managed object
-     */
-    public $element = 'emailcollectoraction';
+	/**
+	 * @var string ID to identify managed object
+	 */
+	public $element = 'emailcollectoraction';
 
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element = 'emailcollector_emailcollectoraction';
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'emailcollector_emailcollectoraction';
 
-    /**
-     * @var int  Does emailcollectoraction support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-     */
-    public $ismultientitymanaged = 0;
+	/**
+	 * @var int  Does emailcollectoraction support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	 */
+	public $ismultientitymanaged = 0;
 
-    /**
-     * @var int  Does emailcollectoraction support extrafields ? 0=No, 1=Yes
-     */
-    public $isextrafieldmanaged = 0;
+	/**
+	 * @var int  Does emailcollectoraction support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 0;
 
-    /**
-     * @var string String with name of icon for emailcollectoraction. Must be the part after the 'object_' into object_emailcollectoraction.png
-     */
-    public $picto = 'emailcollectoraction@emailcollector';
+	/**
+	 * @var string String with name of icon for emailcollectoraction. Must be the part after the 'object_' into object_emailcollectoraction.png
+	 */
+	public $picto = 'emailcollectoraction@emailcollector';
 
 
-    /**
-     *  'type' if the field format.
-     *  'label' the translation key.
-     *  'enabled' is a condition when the field must be managed.
-     *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only. Using a negative value means field is not shown by default on list but can be selected for viewing)
-     *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
-     *  'default' is a default value for creation (can still be replaced by the global setup of default values)
-     *  'index' if we want an index in database.
-     *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
-     *  'position' is the sort order of field.
-     *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
-     *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
-     *  'css' is the CSS style to use on field. For example: 'maxwidth200'
-     *  'help' is a string visible as a tooltip on field
-     *  'comment' is not used. You can store here any text of your choice. It is not used by application.
-     *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
-     *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
-     */
+	/**
+	 *  'type' if the field format.
+	 *  'label' the translation key.
+	 *  'enabled' is a condition when the field must be managed.
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only. Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+	 *  'default' is a default value for creation (can still be replaced by the global setup of default values)
+	 *  'index' if we want an index in database.
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'position' is the sort order of field.
+	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
+	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
+	 *  'help' is a string visible as a tooltip on field
+	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
+	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 */
 
-    // BEGIN MODULEBUILDER PROPERTIES
-    /**
-     * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
-     */
-    public $fields = array(
-        'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
-        'fk_emailcollector' => array('type'=>'integer', 'label'=>'Id of emailcollector', 'foreignkey'=>'emailcollector.rowid'),
-        'type' => array('type'=>'varchar(128)', 'label'=>'Type', 'enabled'=>1, 'visible'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1),
-        'actionparam' => array('type'=>'varchar(255)', 'label'=>'ParamForAction', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'notnull'=>-1),
-        'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>500, 'notnull'=>1,),
-        'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'position'=>501, 'notnull'=>1,),
-        'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'position'=>510, 'notnull'=>1, 'foreignkey'=>'llx_user.rowid',),
-        'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'position'=>511, 'notnull'=>-1,),
-        'position' => array('type'=>'integer', 'label'=>'Position', 'enabled'=>1, 'visible'=>1, 'position'=>600, 'default'=>'0',),
-        'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000, 'notnull'=>-1,),
-        'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'position'=>1000, 'notnull'=>1, 'default'=>1, 'arrayofkeyval'=>array('0'=>'Disabled', '1'=>'Enabled')),
-    );
-    public $rowid;
-    public $fk_emailcollector;
-    public $type;
-    public $actionparam;
+	// BEGIN MODULEBUILDER PROPERTIES
+	/**
+	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 */
+	public $fields = array(
+		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
+		'fk_emailcollector' => array('type'=>'integer', 'label'=>'Id of emailcollector', 'foreignkey'=>'emailcollector.rowid'),
+		'type' => array('type'=>'varchar(128)', 'label'=>'Type', 'enabled'=>1, 'visible'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1),
+		'actionparam' => array('type'=>'varchar(255)', 'label'=>'ParamForAction', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'notnull'=>-1),
+		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>500, 'notnull'=>1,),
+		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'position'=>501, 'notnull'=>1,),
+		'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'position'=>510, 'notnull'=>1, 'foreignkey'=>'llx_user.rowid',),
+		'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'position'=>511, 'notnull'=>-1,),
+		'position' => array('type'=>'integer', 'label'=>'Position', 'enabled'=>1, 'visible'=>1, 'position'=>600, 'default'=>'0',),
+		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000, 'notnull'=>-1,),
+		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'position'=>1000, 'notnull'=>1, 'default'=>1, 'arrayofkeyval'=>array('0'=>'Disabled', '1'=>'Enabled')),
+	);
+	public $rowid;
+	public $fk_emailcollector;
+	public $type;
+	public $actionparam;
 
-    /**
-     * @var integer|string date_creation
-     */
-    public $date_creation;
+	/**
+	 * @var integer|string date_creation
+	 */
+	public $date_creation;
 
 
-    public $tms;
-    public $fk_user_creat;
-    public $fk_user_modif;
-    public $position;
-    public $import_key;
-    public $status;
-    // END MODULEBUILDER PROPERTIES
+	public $tms;
+	public $fk_user_creat;
+	public $fk_user_modif;
+	public $position;
+	public $import_key;
+	public $status;
+	// END MODULEBUILDER PROPERTIES
 
 
 
-    // If this object has a subtable with lines
+	// If this object has a subtable with lines
 
-    // /**
-    //  * @var int    Name of subtable line
-    //  */
-    //public $table_element_line = 'emailcollectoractiondet';
+	// /**
+	//  * @var string    Name of subtable line
+	//  */
+	//public $table_element_line = 'emailcollectoractiondet';
 
-    // /**
-    //  * @var int    Field with ID of parent key if this field has a parent
-    //  */
-    //public $fk_element = 'fk_emailcollectoraction';
+	// /**
+	//  * @var string    Field with ID of parent key if this field has a parent
+	//  */
+	//public $fk_element = 'fk_emailcollectoraction';
 
-    // /**
-    //  * @var int    Name of subtable class that manage subtable lines
-    //  */
-    //public $class_element_line = 'EmailcollectorActionline';
+	// /**
+	//  * @var string    Name of subtable class that manage subtable lines
+	//  */
+	//public $class_element_line = 'EmailcollectorActionline';
 
-    // /**
-    //	* @var array	List of child tables. To test if we can delete object.
-    //  */
-    //protected $childtables=array();
+	// /**
+	//	* @var array	List of child tables. To test if we can delete object.
+	//  */
+	//protected $childtables=array();
 
-    // /**
-    //  * @var EmailcollectorActionLine[]     Array of subtable lines
-    //  */
-    //public $lines = array();
+	// /**
+	//  * @var EmailcollectorActionLine[]     Array of subtable lines
+	//  */
+	//public $lines = array();
 
 
 
-    /**
-     * Constructor
-     *
-     * @param DoliDb $db Database handler
-     */
-    public function __construct(DoliDB $db)
-    {
-        global $conf, $langs;
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		global $conf, $langs;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
-        if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
+		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
 
-        // Unset fields that are disabled
-        foreach ($this->fields as $key => $val)
-        {
-            if (isset($val['enabled']) && empty($val['enabled']))
-            {
-                unset($this->fields[$key]);
-            }
-        }
+		// Unset fields that are disabled
+		foreach ($this->fields as $key => $val)
+		{
+			if (isset($val['enabled']) && empty($val['enabled']))
+			{
+				unset($this->fields[$key]);
+			}
+		}
 
-        // Translate some data of arrayofkeyval
-        foreach ($this->fields as $key => $val)
-        {
-            if (is_array($val['arrayofkeyval']))
-            {
-                foreach ($val['arrayofkeyval'] as $key2 => $val2)
-                {
-                	$this->fields[$key]['arrayofkeyval'][$key2] = $langs->trans($val2);
-                }
-            }
-        }
-    }
+		// Translate some data of arrayofkeyval
+		foreach ($this->fields as $key => $val)
+		{
+			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
+			{
+				foreach ($val['arrayofkeyval'] as $key2 => $val2)
+				{
+					$this->fields[$key]['arrayofkeyval'][$key2] = $langs->trans($val2);
+				}
+			}
+		}
+	}
 
-    /**
-     * Create object into database
-     *
-     * @param  User $user      User that creates
-     * @param  bool $notrigger false=launch triggers after, true=disable triggers
-     * @return int             <0 if KO, Id of created object if OK
-     */
-    public function create(User $user, $notrigger = false)
-    {
-        global $langs;
-        if (empty($this->type))
-        {
-            $langs->load("errors");
-            $this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"));
-            return -1;
-        }
+	/**
+	 * Create object into database
+	 *
+	 * @param  User $user      User that creates
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, Id of created object if OK
+	 */
+	public function create(User $user, $notrigger = false)
+	{
+		global $langs;
+		if (empty($this->type))
+		{
+			$langs->load("errors");
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"));
+			return -1;
+		}
 
-        return $this->createCommon($user, $notrigger);
-    }
+		return $this->createCommon($user, $notrigger);
+	}
 
-    /**
-     * Clone and object into another one
-     *
-     * @param  	User 	$user      	User that creates
-     * @param  	int 	$fromid     Id of object to clone
-     * @return 	mixed 				New object created, <0 if KO
-     */
-    public function createFromClone(User $user, $fromid)
-    {
-        global $langs, $hookmanager, $extrafields;
-        $error = 0;
+	/**
+	 * Clone and object into another one
+	 *
+	 * @param  	User 	$user      	User that creates
+	 * @param  	int 	$fromid     Id of object to clone
+	 * @return 	mixed 				New object created, <0 if KO
+	 */
+	public function createFromClone(User $user, $fromid)
+	{
+		global $langs, $hookmanager, $extrafields;
+		$error = 0;
 
-        dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
-        $object = new self($this->db);
+		$object = new self($this->db);
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // Load source object
-        $object->fetchCommon($fromid);
-        // Reset some properties
-        unset($object->id);
-        unset($object->fk_user_creat);
-        unset($object->import_key);
+		// Load source object
+		$object->fetchCommon($fromid);
+		// Reset some properties
+		unset($object->id);
+		unset($object->fk_user_creat);
+		unset($object->import_key);
 
-        // Clear fields
-        $object->ref = "copy_of_".$object->ref;
-        $object->title = $langs->trans("CopyOf")." ".$object->title;
-        // ...
-        // Clear extrafields that are unique
-        if (is_array($object->array_options) && count($object->array_options) > 0)
-        {
-            $extrafields->fetch_name_optionals_label($this->table_element);
-            foreach ($object->array_options as $key => $option)
-            {
-                $shortkey = preg_replace('/options_/', '', $key);
-                if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
-                {
-                    //var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
-                    unset($object->array_options[$key]);
-                }
-            }
-        }
+		// Clear fields
+		$object->ref = "copy_of_".$object->ref;
+		$object->title = $langs->trans("CopyOf")." ".$object->title;
+		// ...
+		// Clear extrafields that are unique
+		if (is_array($object->array_options) && count($object->array_options) > 0)
+		{
+			$extrafields->fetch_name_optionals_label($this->table_element);
+			foreach ($object->array_options as $key => $option)
+			{
+				$shortkey = preg_replace('/options_/', '', $key);
+				if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
+				{
+					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					unset($object->array_options[$key]);
+				}
+			}
+		}
 
-        // Create clone
-        $object->context['createfromclone'] = 'createfromclone';
-        $result = $object->createCommon($user);
-        if ($result < 0) {
-            $error++;
-            $this->error = $object->error;
-            $this->errors = $object->errors;
-        }
+		// Create clone
+		$object->context['createfromclone'] = 'createfromclone';
+		$result = $object->createCommon($user);
+		if ($result < 0) {
+			$error++;
+			$this->error = $object->error;
+			$this->errors = $object->errors;
+		}
 
-        unset($object->context['createfromclone']);
+		unset($object->context['createfromclone']);
 
-        // End
-        if (!$error) {
-            $this->db->commit();
-            return $object;
-        } else {
-            $this->db->rollback();
-            return -1;
-        }
-    }
+		// End
+		if (!$error) {
+			$this->db->commit();
+			return $object;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
-    /**
-     * Load object in memory from the database
-     *
-     * @param int    $id   Id object
-     * @param string $ref  Ref
-     * @return int         <0 if KO, 0 if not found, >0 if OK
-     */
-    public function fetch($id, $ref = null)
-    {
-        $result = $this->fetchCommon($id, $ref);
-        if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
-        return $result;
-    }
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param int    $id   Id object
+	 * @param string $ref  Ref
+	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetch($id, $ref = null)
+	{
+		$result = $this->fetchCommon($id, $ref);
+		if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
+		return $result;
+	}
 
-    /**
-     * Load object lines in memory from the database
-     *
-     * @return int         <0 if KO, 0 if not found, >0 if OK
-     */
-    /*public function fetchLines()
+	/**
+	 * Load object lines in memory from the database
+	 *
+	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 */
+	/*public function fetchLines()
     {
         $this->lines=array();
 
@@ -293,222 +293,222 @@ class EmailCollectorAction extends CommonObject
         return count($this->lines)?1:0;
     }*/
 
-    /**
-     * Update object into database
-     *
-     * @param  User $user      User that modifies
-     * @param  bool $notrigger false=launch triggers after, true=disable triggers
-     * @return int             <0 if KO, >0 if OK
-     */
-    public function update(User $user, $notrigger = false)
-    {
-        return $this->updateCommon($user, $notrigger);
-    }
+	/**
+	 * Update object into database
+	 *
+	 * @param  User $user      User that modifies
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	public function update(User $user, $notrigger = false)
+	{
+		return $this->updateCommon($user, $notrigger);
+	}
 
-    /**
-     * Delete object in database
-     *
-     * @param User $user       User that deletes
-     * @param bool $notrigger  false=launch triggers after, true=disable triggers
-     * @return int             <0 if KO, >0 if OK
-     */
-    public function delete(User $user, $notrigger = false)
-    {
-        return $this->deleteCommon($user, $notrigger);
-    }
+	/**
+	 * Delete object in database
+	 *
+	 * @param User $user       User that deletes
+	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	public function delete(User $user, $notrigger = false)
+	{
+		return $this->deleteCommon($user, $notrigger);
+	}
 
-    /**
-     *  Return a link to the object card (with optionaly the picto)
-     *
-     *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-     *	@param	string	$option						On what the link point to ('nolink', ...)
-     *  @param	int  	$notooltip					1=Disable tooltip
-     *  @param  string  $morecss            		Add more css on link
-     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *	@return	string								String with URL
-     */
-    public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
-    {
-        global $db, $conf, $langs, $hookmanager;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
+	/**
+	 *  Return a link to the object card (with optionaly the picto)
+	 *
+	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+	 *	@param	string	$option						On what the link point to ('nolink', ...)
+	 *  @param	int  	$notooltip					1=Disable tooltip
+	 *  @param  string  $morecss            		Add more css on link
+	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return	string								String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
+		global $db, $conf, $langs, $hookmanager;
+		global $dolibarr_main_authentication, $dolibarr_main_demo;
+		global $menumanager;
 
-        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-        $result = '';
-        $companylink = '';
+		$result = '';
+		$companylink = '';
 
-        $label = '<u>'.$langs->trans("EmailcollectorAction").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label = '<u>'.$langs->trans("EmailcollectorAction").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-        $url = dol_buildpath('/emailcollector/emailcollectoraction_card.php', 1).'?id='.$this->id;
+		$url = dol_buildpath('/emailcollector/emailcollectoraction_card.php', 1).'?id='.$this->id;
 
-        if ($option != 'nolink')
-        {
-            // Add param to save lastsearch_values or not
-            $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-            if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-            if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option != 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label = $langs->trans("ShowEmailcollectorAction");
-                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowEmailcollectorAction");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 
-            /*
+			/*
              $hookmanager->initHooks(array('emailcollectoractiondao'));
              $parameters=array('id'=>$this->id);
              $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
              if ($reshook > 0) $linkclose = $hookmanager->resPrint;
              */
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart .= $linkclose.'>';
-        $linkend = '</a>';
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
-        $result .= $linkstart;
-        if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-        if ($withpicto != 2) $result .= $this->ref;
-        $result .= $linkend;
-        //if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+		$result .= $linkstart;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->ref;
+		$result .= $linkend;
+		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
-        global $action, $hookmanager;
-        $hookmanager->initHooks(array('emailcollectoractiondao'));
-        $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
-        $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-        if ($reshook > 0) $result = $hookmanager->resPrint;
-        else $result .= $hookmanager->resPrint;
+		global $action, $hookmanager;
+		$hookmanager->initHooks(array('emailcollectoractiondao'));
+		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+		if ($reshook > 0) $result = $hookmanager->resPrint;
+		else $result .= $hookmanager->resPrint;
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     *  Return label of the status
-     *
-     *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
-     *  @return	string 			       Label of status
-     */
-    public function getLibStatut($mode = 0)
-    {
-        return $this->LibStatut($this->status, $mode);
-    }
+	/**
+	 *  Return label of the status
+	 *
+	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @return	string 			       Label of status
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut($this->status, $mode);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return the status
-     *
-     *  @param	int		$status        Id status
-     *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
-     *  @return string 			       Label of status
-     */
-    public function LibStatut($status, $mode = 0)
-    {
-        // phpcs:enable
-        if (empty($this->labelStatus))
-        {
-            global $langs;
-            //$langs->load("emailcollector");
-            $this->labelStatus[1] = $langs->trans('Enabled');
-            $this->labelStatus[0] = $langs->trans('Disabled');
-        }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return the status
+	 *
+	 *  @param	int		$status        Id status
+	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @return string 			       Label of status
+	 */
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		if (empty($this->labelStatus))
+		{
+			global $langs;
+			//$langs->load("emailcollector");
+			$this->labelStatus[1] = $langs->trans('Enabled');
+			$this->labelStatus[0] = $langs->trans('Disabled');
+		}
 
-        if ($mode == 0)
-        {
-            return $this->labelStatus[$status];
-        } elseif ($mode == 1)
-        {
-            return $this->labelStatus[$status];
-        } elseif ($mode == 2)
-        {
-            if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-            elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-        } elseif ($mode == 3)
-        {
-            if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-            elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
-        } elseif ($mode == 4)
-        {
-            if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-            elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-        } elseif ($mode == 5)
-        {
-            if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-            elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
-        } elseif ($mode == 6)
-        {
-            if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-            elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
-        }
-    }
+		if ($mode == 0)
+		{
+			return $this->labelStatus[$status];
+		} elseif ($mode == 1)
+		{
+			return $this->labelStatus[$status];
+		} elseif ($mode == 2)
+		{
+			if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+			elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+		} elseif ($mode == 3)
+		{
+			if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+			elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+		} elseif ($mode == 4)
+		{
+			if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+			elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+		} elseif ($mode == 5)
+		{
+			if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+			elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+		} elseif ($mode == 6)
+		{
+			if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+			elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+		}
+	}
 
-    /**
-     *	Charge les informations d'ordre info dans l'objet commande
-     *
-     *	@param  int		$id       Id of order
-     *	@return	void
-     */
-    public function info($id)
-    {
-        $sql = 'SELECT rowid, date_creation as datec, tms as datem,';
-        $sql .= ' fk_user_creat, fk_user_modif';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-        $sql .= ' WHERE t.rowid = '.$id;
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
-                $this->id = $obj->rowid;
-                if ($obj->fk_user_author)
-                {
-                    $cuser = new User($this->db);
-                    $cuser->fetch($obj->fk_user_author);
-                    $this->user_creation = $cuser;
-                }
+	/**
+	 *	Charge les informations d'ordre info dans l'objet commande
+	 *
+	 *	@param  int		$id       Id of order
+	 *	@return	void
+	 */
+	public function info($id)
+	{
+		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
+		$sql .= ' fk_user_creat, fk_user_modif';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql .= ' WHERE t.rowid = '.$id;
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$this->id = $obj->rowid;
+				if ($obj->fk_user_author)
+				{
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
 
-                if ($obj->fk_user_valid)
-                {
-                    $vuser = new User($this->db);
-                    $vuser->fetch($obj->fk_user_valid);
-                    $this->user_validation = $vuser;
-                }
+				if ($obj->fk_user_valid)
+				{
+					$vuser = new User($this->db);
+					$vuser->fetch($obj->fk_user_valid);
+					$this->user_validation = $vuser;
+				}
 
-                if ($obj->fk_user_cloture)
-                {
-                    $cluser = new User($this->db);
-                    $cluser->fetch($obj->fk_user_cloture);
-                    $this->user_cloture = $cluser;
-                }
+				if ($obj->fk_user_cloture)
+				{
+					$cluser = new User($this->db);
+					$cluser->fetch($obj->fk_user_cloture);
+					$this->user_cloture = $cluser;
+				}
 
-                $this->date_creation     = $this->db->jdate($obj->datec);
-                $this->date_modification = $this->db->jdate($obj->datem);
-                $this->date_validation   = $this->db->jdate($obj->datev);
-            }
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->datem);
+				$this->date_validation   = $this->db->jdate($obj->datev);
+			}
 
-            $this->db->free($result);
-        } else {
-            dol_print_error($this->db);
-        }
-    }
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 
-    /**
-     * Initialise object with example values
-     * Id must be 0 if object instance is a specimen
-     *
-     * @return void
-     */
-    public function initAsSpecimen()
-    {
-        $this->initAsSpecimenCommon();
-    }
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->initAsSpecimenCommon();
+	}
 }
diff --git a/htdocs/emailcollector/class/emailcollectorfilter.class.php b/htdocs/emailcollector/class/emailcollectorfilter.class.php
index cb8db05fa34..71edce42d94 100644
--- a/htdocs/emailcollector/class/emailcollectorfilter.class.php
+++ b/htdocs/emailcollector/class/emailcollectorfilter.class.php
@@ -99,8 +99,8 @@ class EmailCollectorFilter extends CommonObject
 	public $rulevalue;
 
 	/**
-     * @var integer|string date_creation
-     */
+	 * @var integer|string date_creation
+	 */
 	public $date_creation;
 
 
@@ -139,7 +139,7 @@ class EmailCollectorFilter extends CommonObject
 		// Translate some data of arrayofkeyval
 		foreach ($this->fields as $key => $val)
 		{
-			if (is_array($val['arrayofkeyval']))
+			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
 			{
 				foreach ($val['arrayofkeyval'] as $key2 => $val2)
 				{
@@ -185,59 +185,59 @@ class EmailCollectorFilter extends CommonObject
 	public function createFromClone(User $user, $fromid)
 	{
 		global $langs, $hookmanager, $extrafields;
-	    $error = 0;
+		$error = 0;
 
-	    dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
-	    $object = new self($this->db);
+		$object = new self($this->db);
 
-	    $this->db->begin();
+		$this->db->begin();
 
-	    // Load source object
-	    $object->fetchCommon($fromid);
-	    // Reset some properties
-	    unset($object->id);
-	    unset($object->fk_user_creat);
-	    unset($object->import_key);
+		// Load source object
+		$object->fetchCommon($fromid);
+		// Reset some properties
+		unset($object->id);
+		unset($object->fk_user_creat);
+		unset($object->import_key);
 
-	    // Clear fields
-	    $object->ref = "copy_of_".$object->ref;
-	    $object->title = $langs->trans("CopyOf")." ".$object->title;
-	    // ...
-	    // Clear extrafields that are unique
-	    if (is_array($object->array_options) && count($object->array_options) > 0)
-	    {
-	    	$extrafields->fetch_name_optionals_label($this->table_element);
-	    	foreach ($object->array_options as $key => $option)
-	    	{
-	    		$shortkey = preg_replace('/options_/', '', $key);
-	    		if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
-	    		{
-	    			//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
-	    			unset($object->array_options[$key]);
-	    		}
-	    	}
-	    }
+		// Clear fields
+		$object->ref = "copy_of_".$object->ref;
+		$object->title = $langs->trans("CopyOf")." ".$object->title;
+		// ...
+		// Clear extrafields that are unique
+		if (is_array($object->array_options) && count($object->array_options) > 0)
+		{
+			$extrafields->fetch_name_optionals_label($this->table_element);
+			foreach ($object->array_options as $key => $option)
+			{
+				$shortkey = preg_replace('/options_/', '', $key);
+				if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
+				{
+					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					unset($object->array_options[$key]);
+				}
+			}
+		}
 
-	    // Create clone
+		// Create clone
 		$object->context['createfromclone'] = 'createfromclone';
-	    $result = $object->createCommon($user);
-	    if ($result < 0) {
-	        $error++;
-	        $this->error = $object->error;
-	        $this->errors = $object->errors;
-	    }
+		$result = $object->createCommon($user);
+		if ($result < 0) {
+			$error++;
+			$this->error = $object->error;
+			$this->errors = $object->errors;
+		}
 
-	    unset($object->context['createfromclone']);
+		unset($object->context['createfromclone']);
 
-	    // End
-	    if (!$error) {
-	        $this->db->commit();
-	        return $object;
-	    } else {
-	        $this->db->rollback();
-	        return -1;
-	    }
+		// End
+		if (!$error) {
+			$this->db->commit();
+			return $object;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
 	}
 
 	/**
@@ -297,54 +297,54 @@ class EmailCollectorFilter extends CommonObject
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option						On what the link point to ('nolink', ...)
-     *  @param	int  	$notooltip					1=Disable tooltip
-     *  @param  string  $morecss            		Add more css on link
-     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param	int  	$notooltip					1=Disable tooltip
+	 *  @param  string  $morecss            		Add more css on link
+	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string								String with URL
 	 */
-    public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
 	{
 		global $db, $conf, $langs, $hookmanager;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
+		global $dolibarr_main_authentication, $dolibarr_main_demo;
+		global $menumanager;
 
-        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-        $result = '';
-        $companylink = '';
+		$result = '';
+		$companylink = '';
 
-        $label = '<u>'.$langs->trans("EmailcollectorFilter").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label = '<u>'.$langs->trans("EmailcollectorFilter").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-        $url = dol_buildpath('/emailcollector/emailcollectorfilter_card.php', 1).'?id='.$this->id;
+		$url = dol_buildpath('/emailcollector/emailcollectorfilter_card.php', 1).'?id='.$this->id;
 
-        if ($option != 'nolink')
-        {
-	        // Add param to save lastsearch_values or not
-	        $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-	        if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-	        if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option != 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label = $langs->trans("ShowEmailcollectorFilter");
-                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowEmailcollectorFilter");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 
-            /*
+			/*
              $hookmanager->initHooks(array('emailcollectorfilterdao'));
              $parameters=array('id'=>$this->id);
              $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
              if ($reshook > 0) $linkclose = $hookmanager->resPrint;
              */
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -377,7 +377,7 @@ class EmailCollectorFilter extends CommonObject
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return the status
 	 *
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 86ec2ee5c38..5beeb013dbf 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -102,9 +102,11 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('expeditioncard', 'globalcard'));
 
-$permissiondellink = $user->rights->expedition->livraison->creer; // Used by the include of actions_dellink.inc.php
+$permissiondellink = $user->rights->expedition->delivery->creer; // Used by the include of actions_dellink.inc.php
 //var_dump($object->lines[0]->detail_batch);
 
+$date_delivery = dol_mktime(GETPOST('date_deliveryhour', 'int'), GETPOST('date_deliverymin', 'int'), 0, GETPOST('date_deliverymonth', 'int'), GETPOST('date_deliveryday', 'int'), GETPOST('date_deliveryyear', 'int'));
+
 
 /*
  * Actions
@@ -201,8 +203,6 @@ if (empty($reshook))
 		$object->size_units = GETPOST('size_units', 'int');
 		$object->weight_units = GETPOST('weight_units', 'int');
 
-		$date_delivery = dol_mktime(GETPOST('date_deliveryhour', 'int'), GETPOST('date_deliverymin', 'int'), 0, GETPOST('date_deliverymonth', 'int'), GETPOST('date_deliveryday', 'int'), GETPOST('date_deliveryyear', 'int'));
-
 		// We will loop on each line of the original document to complete the shipping object with various info and quantity to deliver
 		$classname = ucfirst($object->origin);
 		$objectsrc = new $classname($db);
@@ -240,7 +240,7 @@ if (empty($reshook))
 			$stockLocation = "ent1".$i."_0";
 			$qty = "qtyl".$i;
 
-			if ($objectsrc->lines[$i]->product_tobatch)      // If product need a batch number
+			if (!empty($conf->productbatch->enabled) && $objectsrc->lines[$i]->product_tobatch)      // If product need a batch number
 			{
 				if (GETPOSTISSET($batch))
 				{
@@ -275,27 +275,26 @@ if (empty($reshook))
 						setEventMessages($langs->trans("StockIsRequiredToChooseWhichLotToUse"), null, 'errors');
 					}
 				}
-			} elseif (GETPOSTISSET($stockLocation))
-			{
+			} elseif (GETPOSTISSET($stockLocation)) {
 				//shipment line from multiple stock locations
 				$qty .= '_'.$j;
 				while (GETPOSTISSET($stockLocation))
 				{
 					// save sub line of warehouse
-					$stockLine[$i][$j]['qty'] = GETPOST($qty, 'int');
+					$stockLine[$i][$j]['qty'] = price2num(GETPOST($qty, 'alpha'), 'MS');
 					$stockLine[$i][$j]['warehouse_id'] = GETPOST($stockLocation, 'int');
 					$stockLine[$i][$j]['ix_l'] = GETPOST($idl, 'int');
 
-					$totalqty += GETPOST($qty, 'int');
+					$totalqty += price2num(GETPOST($qty, 'alpha'), 'MS');
 
 					$j++;
 					$stockLocation = "ent1".$i."_".$j;
 					$qty = "qtyl".$i.'_'.$j;
 				}
 			} else {
-				//var_dump(GETPOST($qty,'int')); var_dump($_POST); var_dump($batch);exit;
+				//var_dump(GETPOST($qty,'alpha')); var_dump($_POST); var_dump($batch);exit;
 				//shipment line for product with no batch management and no multiple stock location
-				if (GETPOST($qty, 'int') > 0) $totalqty += GETPOST($qty, 'int');
+				if (GETPOST($qty, 'int') > 0) $totalqty += price2num(GETPOST($qty, 'alpha'), 'MS');
 			}
 
 			// Extrafields
@@ -399,12 +398,12 @@ if (empty($reshook))
 	/*
 	 * Build a receiving receipt
 	 */
-	elseif ($action == 'create_delivery' && $conf->livraison_bon->enabled && $user->rights->expedition->livraison->creer)
+	elseif ($action == 'create_delivery' && $conf->delivery_note->enabled && $user->rights->expedition->delivery->creer)
 	{
 		$result = $object->create_delivery($user);
 		if ($result > 0)
 		{
-			header("Location: ".DOL_URL_ROOT.'/livraison/card.php?action=create_delivery&id='.$result);
+			header("Location: ".DOL_URL_ROOT.'/delivery/card.php?action=create_delivery&id='.$result);
 			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -418,10 +417,8 @@ if (empty($reshook))
 
 		$result = $object->valid($user);
 
-		if ($result < 0)
-		{
-			$langs->load("errors");
-			setEventMessages($langs->trans($object->error), $object->errors, 'errors');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
 		} else {
 			// Define output language
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
@@ -479,7 +476,7 @@ if (empty($reshook))
 		$datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
 
 		$object->fetch($id);
-		$result = $object->set_date_livraison($user, $datedelivery);
+		$result = $object->setDeliveryDate($user, $datedelivery);
 		if ($result < 0)
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -804,7 +801,7 @@ if (empty($reshook))
 			header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // To redisplay the form being edited
 			exit();
 		}
-	} elseif ($action == 'updateline' && $user->rights->expedition->creer && GETPOST('cancel', 'alpha') == $langs->trans('Cancel')) {
+	} elseif ($action == 'updateline' && $user->rights->expedition->creer && GETPOST('cancel', 'alpha') == $langs->trans("Cancel")) {
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // To redisplay the form being edited
 		exit();
 	}
@@ -882,7 +879,7 @@ if ($action == 'create')
 				print '<input type="hidden" name="entrepot_id" value="'.GETPOST('entrepot_id', 'int').'">';
 			}
 
-			dol_fiche_head('');
+			print dol_get_fiche_head('');
 
 			print '<table class="border centpercent">';
 
@@ -890,13 +887,15 @@ if ($action == 'create')
 			print '<tr><td class="titlefieldcreate fieldrequired">';
 			if ($origin == 'commande' && !empty($conf->commande->enabled))
 			{
-				print $langs->trans("RefOrder").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/commande/card.php?id='.$object->id.'">'.img_object($langs->trans("ShowOrder"), 'order').' '.$object->ref;
+				print $langs->trans("RefOrder");
 			}
 			if ($origin == 'propal' && !empty($conf->propal->enabled))
 			{
-				print $langs->trans("RefProposal").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/comm/card.php?id='.$object->id.'">'.img_object($langs->trans("ShowProposal"), 'propal').' '.$object->ref;
+				print $langs->trans("RefProposal");
 			}
-			print '</a></td>';
+			print '</td><td colspan="3">';
+			print $object->getNomUrl(1);
+			print '</td>';
 			print "</tr>\n";
 
 			// Ref client
@@ -934,8 +933,7 @@ if ($action == 'create')
 			// Date delivery planned
 			print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
 			print '<td colspan="3">';
-			//print dol_print_date($object->date_livraison, "day");	// date_livraison come from order and will be stored into date_delivery planed.
-			$date_delivery = ($date_delivery ? $date_delivery : $object->date_livraison); // $date_delivery comes from GETPOST
+			$date_delivery = ($date_delivery ? $date_delivery : $object->delivery_date); // $date_delivery comes from GETPOST
 			print $form->selectDate($date_delivery ? $date_delivery : -1, 'date_delivery', 1, 1, 1);
 			print "</td>\n";
 			print '</tr>';
@@ -1028,7 +1026,7 @@ if ($action == 'create')
 
 			print "</table>";
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 
 			// Shipment lines
@@ -1046,7 +1044,7 @@ if ($action == 'create')
 				$i++;
 			}
 			print '});
-	            jQuery("#autoreset").click(function() {';
+	            jQuery("#autoreset").click(function() { console.log("Reset values to 0"); ';
 			$i = 0;
 			while ($i < $numAsked)
 			{
@@ -1074,12 +1072,12 @@ if ($action == 'create')
 				print '<td class="center">'.$langs->trans("QtyToShip");
 				if (empty($conf->productbatch->enabled))
 				{
-					print '<br><a href="#" id="autofill">'.$langs->trans("Fill").'</a>';
+					print '<br><a href="#" id="autofill" class="opacitymedium link cursor cursorpointer">'.$langs->trans("Fill").'</a>';
 					print ' / ';
 				} else {
 					print '<br>';
 				}
-				print '<a href="#" id="autoreset">'.$langs->trans("Reset").'</a>';
+				print '<span id="autoreset" class="opacitymedium link cursor cursorpointer">'.img_picto($langs->trans("Reset"), 'eraser').'</span>';
 				print '</td>';
 				if (!empty($conf->stock->enabled))
 				{
@@ -1113,7 +1111,7 @@ if ($action == 'create')
 					if (!empty($line->date_start)) $type = 1;
 					if (!empty($line->date_end)) $type = 1;
 
-					print '<!-- line '.$line->rowid.' for product -->'."\n";
+					print '<!-- line '.$line->id.' for product -->'."\n";
 					print '<tr class="oddeven">'."\n";
 
 					// Product label
@@ -1124,13 +1122,16 @@ if ($action == 'create')
 						//var_dump($product->stock_warehouse[1]);
 
 						print '<td>';
-						print '<a name="'.$line->rowid.'"></a>'; // ancre pour retourner sur la ligne
+						print '<a name="'.$line->id.'"></a>'; // ancre pour retourner sur la ligne
 
 						// Show product and description
 						$product_static->type = $line->fk_product_type;
 						$product_static->id = $line->fk_product;
 						$product_static->ref = $line->ref;
+						$product_static->status = $line->product_tosell;
+						$product_static->status_buy = $line->product_tobuy;
 						$product_static->status_batch = $line->product_tobatch;
+
 						$text = $product_static->getNomUrl(1);
 						$text .= ' - '.(!empty($line->label) ? $line->label : $line->product_label);
 						$description = ($conf->global->PRODUIT_DESC_IN_FORM ? '' : dol_htmlentitiesbr($line->desc));
@@ -1531,7 +1532,7 @@ if ($action == 'create')
 						$srcLine = new OrderLine($db);
 						$srcLine->id = $line->id;
 						$srcLine->fetch_optionals(); // fetch extrafields also available in orderline
-						$line->array_options = array_merge($line->array_options, $srcLine->array_options);
+						$expLine->array_options = array_merge($expLine->array_options, $srcLine->array_options);
 
 						print $expLine->showOptionals($extrafields, 'edit', array('style'=>'class="drag drop oddeven"', 'colspan'=>$colspan), $indiceAsked, '', 1);
 					}
@@ -1547,7 +1548,7 @@ if ($action == 'create')
 			print '<div class="center">';
 			print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
 			print '&nbsp; ';
-			print '<input type="'.($backtopage ? "submit" : "button").'" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
+			print '<input type="'.($backtopage ? "submit" : "button").'" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
 			print '</div>';
 
 			print '</form>';
@@ -1584,7 +1585,7 @@ if ($action == 'create')
 		$res = $object->fetch_optionals();
 
 		$head = shipping_prepare_head($object);
-		dol_fiche_head($head, 'shipping', $langs->trans("Shipment"), -1, 'sending');
+		print dol_get_fiche_head($head, 'shipping', $langs->trans("Shipment"), -1, 'sending');
 
 		$formconfirm = '';
 
@@ -1785,7 +1786,7 @@ if ($action == 'create')
 			print '<input id="trueWeight" name="trueWeight" value="'.$object->trueWeight.'" type="text" class="width50">';
 			print $formproduct->selectMeasuringUnits("weight_units", "weight", $object->weight_units, 0, 2);
 			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
-			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
+			print ' <input class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
 		} else {
 			print $object->trueWeight;
@@ -1818,7 +1819,7 @@ if ($action == 'create')
 			print '<input id="trueHeight" name="trueHeight" value="'.$object->trueHeight.'" type="text" class="width50">';
 			print $formproduct->selectMeasuringUnits("size_units", "size", $object->size_units, 0, 2);
 			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
-			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
+			print ' <input class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
 		} else {
 			print $object->trueHeight;
@@ -2046,13 +2047,13 @@ if ($action == 'create')
 			$sql = "SELECT obj.rowid, obj.fk_product, obj.label, obj.description, obj.product_type as fk_product_type, obj.qty as qty_asked, obj.date_start, obj.date_end";
 			$sql .= ", ed.rowid as shipmentline_id, ed.qty as qty_shipped, ed.fk_expedition as expedition_id, ed.fk_origin_line, ed.fk_entrepot";
 			$sql .= ", e.rowid as shipment_id, e.ref as shipment_ref, e.date_creation, e.date_valid, e.date_delivery, e.date_expedition";
-			//if ($conf->livraison_bon->enabled) $sql .= ", l.rowid as livraison_id, l.ref as livraison_ref, l.date_delivery, ld.qty as qty_received";
-			$sql .= ', p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.tobatch as product_tobatch';
+			//if ($conf->delivery_note->enabled) $sql .= ", l.rowid as livraison_id, l.ref as livraison_ref, l.date_delivery, ld.qty as qty_received";
+			$sql .= ', p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.tosell as product_tosell, p.tobuy as product_tobuy, p.tobatch as product_tobatch';
 			$sql .= ', p.description as product_desc';
 			$sql .= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed";
 			$sql .= ", ".MAIN_DB_PREFIX."expedition as e";
 			$sql .= ", ".MAIN_DB_PREFIX.$origin."det as obj";
-			//if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."livraisondet as ld ON ld.fk_livraison = l.rowid  AND obj.rowid = ld.fk_origin_line";
+			//if ($conf->delivery_note->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."deliverydet as ld ON ld.fk_delivery = l.rowid  AND obj.rowid = ld.fk_origin_line";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
 			$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
 			$sql .= " AND obj.fk_".$origin." = ".$origin_id;
@@ -2074,7 +2075,10 @@ if ($action == 'create')
 					if ($obj)
 					{
 						// $obj->rowid is rowid in $origin."det" table
-						$alreadysent[$obj->rowid][$obj->shipmentline_id] = array('shipment_ref'=>$obj->shipment_ref, 'shipment_id'=>$obj->shipment_id, 'warehouse'=>$obj->fk_entrepot, 'qty_shipped'=>$obj->qty_shipped, 'date_valid'=>$db->jdate($obj->date_valid), 'date_delivery'=>$db->jdate($obj->date_delivery));
+						$alreadysent[$obj->rowid][$obj->shipmentline_id] = array(
+							'shipment_ref'=>$obj->shipment_ref, 'shipment_id'=>$obj->shipment_id, 'warehouse'=>$obj->fk_entrepot, 'qty_shipped'=>$obj->qty_shipped,
+							'product_tosell'=>$obj->product_tosell, 'product_tobuy'=>$obj->product_tobuy, 'product_tobatch'=>$obj->product_tobatch,
+							'date_valid'=>$db->jdate($obj->date_valid), 'date_delivery'=>$db->jdate($obj->date_delivery));
 					}
 					$i++;
 				}
@@ -2083,6 +2087,7 @@ if ($action == 'create')
 		}
 
 		print '<tbody>';
+
 		// Loop on each product to send/sent
 		for ($i = 0; $i < $num_prod; $i++)
 		{
@@ -2118,6 +2123,8 @@ if ($action == 'create')
 					$product_static->type = $lines[$i]->fk_product_type;
 					$product_static->id = $lines[$i]->fk_product;
 					$product_static->ref = $lines[$i]->ref;
+					$product_static->status = $lines[$i]->product_tosell;
+					$product_static->status_buy = $lines[$i]->product_tobuy;
 					$product_static->status_batch = $lines[$i]->product_tobatch;
 
 					$product_static->weight = $lines[$i]->weight;
@@ -2350,8 +2357,8 @@ if ($action == 'create')
 				if ($action == 'editline' && $lines[$i]->id == $line_id)
 				{
 					print '<td class="center" colspan="2" valign="middle">';
-					print '<input type="submit" class="button" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'"><br>';
-					print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'"><br>';
+					print '<input type="submit" class="button button-save" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'"><br>';
+					print '<input type="submit" class="button button-cancel" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'"><br>';
 					print '</td>';
 				} elseif ($object->statut == Expedition::STATUS_DRAFT)
 				{
@@ -2401,7 +2408,7 @@ if ($action == 'create')
 	}
 
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	$object->fetchObjectLinked($object->id, $object->element);
@@ -2467,7 +2474,7 @@ if ($action == 'create')
 
 			// This is just to generate a delivery receipt
 			//var_dump($object->linkedObjectsIds['delivery']);
-			if ($conf->livraison_bon->enabled && ($object->statut == Expedition::STATUS_VALIDATED || $object->statut == Expedition::STATUS_CLOSED) && $user->rights->expedition->livraison->creer && empty($object->linkedObjectsIds['delivery']))
+			if ($conf->delivery_note->enabled && ($object->statut == Expedition::STATUS_VALIDATED || $object->statut == Expedition::STATUS_CLOSED) && $user->rights->expedition->delivery->creer && empty($object->linkedObjectsIds['delivery']))
 			{
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=create_delivery">'.$langs->trans("CreateDeliveryOrder").'</a>';
 			}
diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index 1f85ade883b..22acaeaa26b 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -29,194 +29,194 @@
 class Shipments extends DolibarrApi
 {
 
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'socid',
-        'origin_id',
-        'origin_type',
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'socid',
+		'origin_id',
+		'origin_type',
+	);
 
-    /**
-     * @var Expedition $shipment {@type Expedition}
-     */
-    public $shipment;
+	/**
+	 * @var Expedition $shipment {@type Expedition}
+	 */
+	public $shipment;
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-        $this->shipment = new Expedition($this->db);
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->shipment = new Expedition($this->db);
+	}
 
-    /**
-     * Get properties of a shipment object
-     *
-     * Return an array with shipment informations
-     *
-     * @param       int         $id         ID of shipment
-     * @return 	array|mixed data without useless information
-     *
-     * @throws 	RestException
-     */
-    public function get($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->expedition->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a shipment object
+	 *
+	 * Return an array with shipment informations
+	 *
+	 * @param       int         $id         ID of shipment
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->expedition->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->shipment->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Shipment not found');
-        }
+		$result = $this->shipment->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Shipment not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $this->shipment->fetchObjectLinked();
-        return $this->_cleanObjectDatas($this->shipment);
-    }
+		$this->shipment->fetchObjectLinked();
+		return $this->_cleanObjectDatas($this->shipment);
+	}
 
 
 
-    /**
-     * List shipments
-     *
-     * Get a list of shipments
-     *
-     * @param string	       $sortfield	        Sort field
-     * @param string	       $sortorder	        Sort order
-     * @param int		       $limit		        Limit for list
-     * @param int		       $page		        Page number
-     * @param string   	       $thirdparty_ids	    Thirdparty ids to filter shipments of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
-     * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-     * @return  array                               Array of shipment objects
-     *
-     * @throws RestException
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
-    {
-        global $db, $conf;
+	/**
+	 * List shipments
+	 *
+	 * Get a list of shipments
+	 *
+	 * @param string	       $sortfield	        Sort field
+	 * @param string	       $sortorder	        Sort order
+	 * @param int		       $limit		        Limit for list
+	 * @param int		       $page		        Page number
+	 * @param string   	       $thirdparty_ids	    Thirdparty ids to filter shipments of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
+	 * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+	 * @return  array                               Array of shipment objects
+	 *
+	 * @throws RestException
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        // case of external user, $thirdparty_ids param is ignored and replaced by user's socid
-        $socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
+		// case of external user, $thirdparty_ids param is ignored and replaced by user's socid
+		$socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
 
-        // If the internal user must only see his customers, force searching by him
-        $search_sale = 0;
-        if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+		// If the internal user must only see his customers, force searching by him
+		$search_sale = 0;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
 
-        $sql = "SELECT t.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql .= " FROM ".MAIN_DB_PREFIX."expedition as t";
+		$sql = "SELECT t.rowid";
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		$sql .= " FROM ".MAIN_DB_PREFIX."expedition as t";
 
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql .= ' WHERE t.entity IN ('.getEntity('expedition').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-        if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
-        if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
-        // Insert sale filter
-        if ($search_sale > 0)
-        {
-            $sql .= " AND sc.fk_user = ".$search_sale;
-        }
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		$sql .= ' WHERE t.entity IN ('.getEntity('expedition').')';
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
+		if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
+		if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		// Insert sale filter
+		if ($search_sale > 0)
+		{
+			$sql .= " AND sc.fk_user = ".$search_sale;
+		}
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        dol_syslog("API Rest request");
-        $result = $this->db->query($sql);
+		dol_syslog("API Rest request");
+		$result = $this->db->query($sql);
 
-        if ($result)
-        {
-        	$num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            $i = 0;
-            while ($i < $min)
-            {
-            	$obj = $this->db->fetch_object($result);
-            	$shipment_static = new Expedition($this->db);
-                if ($shipment_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($shipment_static);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve commande list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No shipment found');
-        }
-        return $obj_ret;
-    }
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			$i = 0;
+			while ($i < $min)
+			{
+				$obj = $this->db->fetch_object($result);
+				$shipment_static = new Expedition($this->db);
+				if ($shipment_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($shipment_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve commande list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No shipment found');
+		}
+		return $obj_ret;
+	}
 
-    /**
-     * Create shipment object
-     *
-     * @param   array   $request_data   Request data
-     * @return  int     ID of shipment
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->expedition->creer) {
-            throw new RestException(401, "Insuffisant rights");
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+	/**
+	 * Create shipment object
+	 *
+	 * @param   array   $request_data   Request data
+	 * @return  int     ID of shipment
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->expedition->creer) {
+			throw new RestException(401, "Insuffisant rights");
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        foreach ($request_data as $field => $value) {
-            $this->shipment->$field = $value;
-        }
-        if (isset($request_data["lines"])) {
-            $lines = array();
-            foreach ($request_data["lines"] as $line) {
-                array_push($lines, (object) $line);
-            }
-            $this->shipment->lines = $lines;
-        }
+		foreach ($request_data as $field => $value) {
+			$this->shipment->$field = $value;
+		}
+		if (isset($request_data["lines"])) {
+			$lines = array();
+			foreach ($request_data["lines"] as $line) {
+				array_push($lines, (object) $line);
+			}
+			$this->shipment->lines = $lines;
+		}
 
-        if ($this->shipment->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, "Error creating shipment", array_merge(array($this->shipment->error), $this->shipment->errors));
-        }
+		if ($this->shipment->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, "Error creating shipment", array_merge(array($this->shipment->error), $this->shipment->errors));
+		}
 
-        return $this->shipment->id;
-    }
+		return $this->shipment->id;
+	}
 
-    // /**
-    //  * Get lines of an shipment
-    //  *
-    //  * @param int   $id             Id of shipment
-    //  *
-    //  * @url	GET {id}/lines
-    //  *
-    //  * @return int
-    //  */
-    /*
+	// /**
+	//  * Get lines of an shipment
+	//  *
+	//  * @param int   $id             Id of shipment
+	//  *
+	//  * @url	GET {id}/lines
+	//  *
+	//  * @return int
+	//  */
+	/*
     public function getLines($id)
     {
         if(! DolibarrApiAccess::$user->rights->expedition->lire) {
@@ -240,17 +240,17 @@ class Shipments extends DolibarrApi
     }
     */
 
-    // /**
-    //  * Add a line to given shipment
-    //  *
-    //  * @param int   $id             Id of shipment to update
-    //  * @param array $request_data   ShipmentLine data
-    //  *
-    //  * @url	POST {id}/lines
-    //  *
-    //  * @return int
-    //  */
-    /*
+	// /**
+	//  * Add a line to given shipment
+	//  *
+	//  * @param int   $id             Id of shipment to update
+	//  * @param array $request_data   ShipmentLine data
+	//  *
+	//  * @url	POST {id}/lines
+	//  *
+	//  * @return int
+	//  */
+	/*
     public function postLine($id, $request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->expedition->creer) {
@@ -302,18 +302,18 @@ class Shipments extends DolibarrApi
         return false;
     }*/
 
-    // /**
-    //  * Update a line to given shipment
-    //  *
-    //  * @param int   $id             Id of shipment to update
-    //  * @param int   $lineid         Id of line to update
-    //  * @param array $request_data   ShipmentLine data
-    //  *
-    //  * @url	PUT {id}/lines/{lineid}
-    //  *
-    //  * @return object
-    //  */
-    /*
+	// /**
+	//  * Update a line to given shipment
+	//  *
+	//  * @param int   $id             Id of shipment to update
+	//  * @param int   $lineid         Id of line to update
+	//  * @param array $request_data   ShipmentLine data
+	//  *
+	//  * @url	PUT {id}/lines/{lineid}
+	//  *
+	//  * @return object
+	//  */
+	/*
     public function putLine($id, $lineid, $request_data = null)
     {
         if (! DolibarrApiAccess::$user->rights->expedition->creer) {
@@ -362,183 +362,183 @@ class Shipments extends DolibarrApi
         return false;
     }*/
 
-    /**
-     * Delete a line to given shipment
-     *
-     *
-     * @param int   $id             Id of shipment to update
-     * @param int   $lineid         Id of line to delete
-     *
-     * @url	DELETE {id}/lines/{lineid}
-     *
-     * @return int
-     *
-     * @throws RestException 401
-     * @throws RestException 404
-     */
-    public function deleteLine($id, $lineid)
-    {
-        if (!DolibarrApiAccess::$user->rights->expedition->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Delete a line to given shipment
+	 *
+	 *
+	 * @param int   $id             Id of shipment to update
+	 * @param int   $lineid         Id of line to delete
+	 *
+	 * @url	DELETE {id}/lines/{lineid}
+	 *
+	 * @return int
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 */
+	public function deleteLine($id, $lineid)
+	{
+		if (!DolibarrApiAccess::$user->rights->expedition->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->shipment->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Shipment not found');
-        }
+		$result = $this->shipment->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Shipment not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        // TODO Check the lineid $lineid is a line of ojbect
+		// TODO Check the lineid $lineid is a line of ojbect
 
-        $request_data = (object) $request_data;
-        $updateRes = $this->shipment->deleteline(DolibarrApiAccess::$user, $lineid);
-        if ($updateRes > 0) {
-            return $this->get($id);
-        } else {
-            throw new RestException(405, $this->shipment->error);
-        }
-    }
+		$request_data = (object) $request_data;
+		$updateRes = $this->shipment->deleteline(DolibarrApiAccess::$user, $lineid);
+		if ($updateRes > 0) {
+			return $this->get($id);
+		} else {
+			throw new RestException(405, $this->shipment->error);
+		}
+	}
 
-    /**
-     * Update shipment general fields (won't touch lines of shipment)
-     *
-     * @param int   $id             Id of shipment to update
-     * @param array $request_data   Datas
-     *
-     * @return int
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->expedition->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Update shipment general fields (won't touch lines of shipment)
+	 *
+	 * @param int   $id             Id of shipment to update
+	 * @param array $request_data   Datas
+	 *
+	 * @return int
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->expedition->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->shipment->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Shipment not found');
-        }
+		$result = $this->shipment->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Shipment not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $this->shipment->$field = $value;
-        }
+		if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$this->shipment->$field = $value;
+		}
 
-        if ($this->shipment->update(DolibarrApiAccess::$user) > 0)
-        {
-            return $this->get($id);
-        } else {
-            throw new RestException(500, $this->shipment->error);
-        }
-    }
+		if ($this->shipment->update(DolibarrApiAccess::$user) > 0)
+		{
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $this->shipment->error);
+		}
+	}
 
-    /**
-     * Delete shipment
-     *
-     * @param   int     $id         Shipment ID
-     *
-     * @return  array
-     */
-    public function delete($id)
-    {
-    	if (!DolibarrApiAccess::$user->rights->expedition->supprimer) {
-            throw new RestException(401);
-        }
-        $result = $this->shipment->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Shipment not found');
-        }
+	/**
+	 * Delete shipment
+	 *
+	 * @param   int     $id         Shipment ID
+	 *
+	 * @return  array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->expedition->supprimer) {
+			throw new RestException(401);
+		}
+		$result = $this->shipment->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Shipment not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if (!$this->shipment->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(500, 'Error when deleting shipment : '.$this->shipment->error);
-        }
+		if (!$this->shipment->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(500, 'Error when deleting shipment : '.$this->shipment->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Shipment deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Shipment deleted'
+			)
+		);
+	}
 
-    /**
-     * Validate a shipment
-     *
-     * This may record stock movements if module stock is enabled and option to
-     * decrease stock on shipment is on.
-     *
-     * @param   int $id             Shipment ID
-     * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
-     *
-     * @url POST    {id}/validate
-     *
-     * @return  array
-     * \todo An error 403 is returned if the request has an empty body.
-     * Error message: "Forbidden: Content type `text/plain` is not supported."
-     * Workaround: send this in the body
-     * {
-     *   "notrigger": 0
-     * }
-     */
-    public function validate($id, $notrigger = 0)
-    {
-        if (!DolibarrApiAccess::$user->rights->expedition->creer) {
-            throw new RestException(401);
-        }
-        $result = $this->shipment->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Shipment not found');
-        }
+	/**
+	 * Validate a shipment
+	 *
+	 * This may record stock movements if module stock is enabled and option to
+	 * decrease stock on shipment is on.
+	 *
+	 * @param   int $id             Shipment ID
+	 * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
+	 *
+	 * @url POST    {id}/validate
+	 *
+	 * @return  array
+	 * \todo An error 403 is returned if the request has an empty body.
+	 * Error message: "Forbidden: Content type `text/plain` is not supported."
+	 * Workaround: send this in the body
+	 * {
+	 *   "notrigger": 0
+	 * }
+	 */
+	public function validate($id, $notrigger = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->expedition->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->shipment->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Shipment not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $result = $this->shipment->valid(DolibarrApiAccess::$user, $notrigger);
-        if ($result == 0) {
-            throw new RestException(304, 'Error nothing done. May be object is already validated');
-        }
-        if ($result < 0) {
-            throw new RestException(500, 'Error when validating Shipment: '.$this->shipment->error);
-        }
-        $result = $this->shipment->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Shipment not found');
-        }
+		$result = $this->shipment->valid(DolibarrApiAccess::$user, $notrigger);
+		if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already validated');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when validating Shipment: '.$this->shipment->error);
+		}
+		$result = $this->shipment->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Shipment not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $this->shipment->fetchObjectLinked();
-        return $this->_cleanObjectDatas($this->shipment);
-    }
+		$this->shipment->fetchObjectLinked();
+		return $this->_cleanObjectDatas($this->shipment);
+	}
 
 
-    // /**
-    //  *  Classify the shipment as invoiced
-    //  *
-    //  * @param int   $id           Id of the shipment
-    //  *
-    //  * @url     POST {id}/setinvoiced
-    //  *
-    //  * @return int
-    //  *
-    //  * @throws RestException 400
-    //  * @throws RestException 401
-    //  * @throws RestException 404
-    //  * @throws RestException 405
-    //  */
-     /*
+	// /**
+	//  *  Classify the shipment as invoiced
+	//  *
+	//  * @param int   $id           Id of the shipment
+	//  *
+	//  * @url     POST {id}/setinvoiced
+	//  *
+	//  * @return int
+	//  *
+	//  * @throws RestException 400
+	//  * @throws RestException 401
+	//  * @throws RestException 404
+	//  * @throws RestException 405
+	//  */
+	 /*
     public function setinvoiced($id)
     {
 
@@ -562,20 +562,20 @@ class Shipments extends DolibarrApi
     */
 
 
-    //  /**
-    //  * Create a shipment using an existing order.
-    //  *
-    //  * @param int   $orderid       Id of the order
-    //  *
-    //  * @url     POST /createfromorder/{orderid}
-    //  *
-    //  * @return int
-    //  * @throws RestException 400
-    //  * @throws RestException 401
-    //  * @throws RestException 404
-    //  * @throws RestException 405
-    //  */
-    /*
+	//  /**
+	//  * Create a shipment using an existing order.
+	//  *
+	//  * @param int   $orderid       Id of the order
+	//  *
+	//  * @url     POST /createfromorder/{orderid}
+	//  *
+	//  * @return int
+	//  * @throws RestException 400
+	//  * @throws RestException 401
+	//  * @throws RestException 404
+	//  * @throws RestException 405
+	//  */
+	/*
     public function createShipmentFromOrder($orderid)
     {
 
@@ -606,60 +606,60 @@ class Shipments extends DolibarrApi
     }
     */
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->thirdparty); // id already returned
+		unset($object->thirdparty); // id already returned
 
-        unset($object->note);
-        unset($object->address);
-        unset($object->barcode_type);
-        unset($object->barcode_type_code);
-        unset($object->barcode_type_label);
-        unset($object->barcode_type_coder);
+		unset($object->note);
+		unset($object->address);
+		unset($object->barcode_type);
+		unset($object->barcode_type_code);
+		unset($object->barcode_type_label);
+		unset($object->barcode_type_coder);
 
-        if (!empty($object->lines) && is_array($object->lines))
-        {
-            foreach ($object->lines as $line)
-            {
-                unset($line->tva_tx);
-                unset($line->vat_src_code);
-                unset($line->total_ht);
-                unset($line->total_ttc);
-                unset($line->total_tva);
-                unset($line->total_localtax1);
-                unset($line->total_localtax2);
-                unset($line->remise_percent);
-            }
-        }
+		if (!empty($object->lines) && is_array($object->lines))
+		{
+			foreach ($object->lines as $line)
+			{
+				unset($line->tva_tx);
+				unset($line->vat_src_code);
+				unset($line->total_ht);
+				unset($line->total_ttc);
+				unset($line->total_tva);
+				unset($line->total_localtax1);
+				unset($line->total_localtax2);
+				unset($line->remise_percent);
+			}
+		}
 
-        return $object;
-    }
+		return $object;
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param   array           $data   Array with data to verify
-     * @return  array
-     * @throws  RestException
-     */
-    private function _validate($data)
-    {
-        $shipment = array();
-        foreach (Shipments::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $shipment[$field] = $data[$field];
-        }
-        return $shipment;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param   array           $data   Array with data to verify
+	 * @return  array
+	 * @throws  RestException
+	 */
+	private function _validate($data)
+	{
+		$shipment = array();
+		foreach (Shipments::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$shipment[$field] = $data[$field];
+		}
+		return $shipment;
+	}
 }
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 9b6a07a5435..e4722cabb4d 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2015       Claudio Aschieri        <c.aschieri@19.coop>
  * Copyright (C) 2016		Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2018       Nicolas ZABOURI			<info@inovea-conseil.com>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2020       Lenin Rivas         	<lenin@leninrivas.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -55,7 +55,7 @@ class Expedition extends CommonObject
 	public $element = "shipping";
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = "fk_expedition";
 
@@ -65,7 +65,7 @@ class Expedition extends CommonObject
 	public $table_element = "expedition";
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	public $table_element_line = "expeditiondet";
 
@@ -82,6 +82,13 @@ class Expedition extends CommonObject
 
 	public $socid;
 
+	/**
+	 * @var string Customer ref
+	 * @deprecated
+	 * @see $ref_customer
+	 */
+	public $ref_client;
+
 	/**
 	 * @var string Customer ref
 	 */
@@ -99,7 +106,6 @@ class Expedition extends CommonObject
 	 * @var int warehouse id
 	 */
 	public $entrepot_id;
-	public $lines = array();
 
 	/**
 	 * @var string Tracking number
@@ -152,8 +158,8 @@ class Expedition extends CommonObject
 	public $date_shipping;
 
 	/**
-     * @var integer|string date_creation
-     */
+	 * @var integer|string date_creation
+	 */
 	public $date_creation;
 
 	/**
@@ -164,7 +170,10 @@ class Expedition extends CommonObject
 	public $meths;
 	public $listmeths; // List of carriers
 
-    /**
+	public $lines = array();
+
+
+	/**
 	 * Draft status
 	 */
 	const STATUS_DRAFT = 0;
@@ -195,8 +204,6 @@ class Expedition extends CommonObject
 		global $conf;
 
 		$this->db = $db;
-		$this->lines = array();
-		$this->products = array();
 
 		// List of long language codes for status
 		$this->statuts = array();
@@ -331,10 +338,10 @@ class Expedition extends CommonObject
 		$sql .= ", ".($this->fk_delivery_address > 0 ? $this->fk_delivery_address : "null");
 		$sql .= ", ".($this->shipping_method_id > 0 ? $this->shipping_method_id : "null");
 		$sql .= ", '".$this->db->escape($this->tracking_number)."'";
-		$sql.= ", ".(is_numeric($this->weight)?$this->weight:'NULL');
-		$sql.= ", ".(is_numeric($this->sizeS)?$this->sizeS:'NULL');	// TODO Should use this->trueDepth
-		$sql.= ", ".(is_numeric($this->sizeW)?$this->sizeW:'NULL');	// TODO Should use this->trueWidth
-		$sql.= ", ".(is_numeric($this->sizeH)?$this->sizeH:'NULL');	// TODO Should use this->trueHeight
+		$sql .= ", ".(is_numeric($this->weight) ? $this->weight : 'NULL');
+		$sql .= ", ".(is_numeric($this->sizeS) ? $this->sizeS : 'NULL'); // TODO Should use this->trueDepth
+		$sql .= ", ".(is_numeric($this->sizeW) ? $this->sizeW : 'NULL'); // TODO Should use this->trueWidth
+		$sql .= ", ".(is_numeric($this->sizeH) ? $this->sizeH : 'NULL'); // TODO Should use this->trueHeight
 		$sql .= ", ".($this->weight_units != '' ? (int) $this->weight_units : 'NULL');
 		$sql .= ", ".($this->size_units != '' ? (int) $this->size_units : 'NULL');
 		$sql .= ", ".(!empty($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null");
@@ -434,7 +441,7 @@ class Expedition extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Create a expedition line
 	 *
@@ -466,7 +473,7 @@ class Expedition extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Create the detail (eat-by date) of the expedition line
 	 *
@@ -476,7 +483,7 @@ class Expedition extends CommonObject
 	 */
 	public function create_line_batch($line_ext, $array_options = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$error = 0;
 		$stockLocationQty = array(); // associated array with batch qty in stock location
 
@@ -530,7 +537,7 @@ class Expedition extends CommonObject
 		if (empty($id) && empty($ref) && empty($ref_ext)) return -1;
 
 		$sql = "SELECT e.rowid, e.entity, e.ref, e.fk_soc as socid, e.date_creation, e.ref_customer, e.ref_ext, e.ref_int, e.fk_user_author, e.fk_statut, e.fk_projet as fk_project, e.billed";
-        $sql .= ", e.date_valid";
+		$sql .= ", e.date_valid";
 		$sql .= ", e.weight, e.weight_units, e.size, e.size_units, e.width, e.height";
 		$sql .= ", e.date_expedition as date_expedition, e.model_pdf, e.fk_address, e.date_delivery";
 		$sql .= ", e.fk_shipping_method, e.tracking_number";
@@ -567,7 +574,7 @@ class Expedition extends CommonObject
 				$this->statut               = $obj->fk_statut;
 				$this->user_author_id       = $obj->fk_user_author;
 				$this->date_creation        = $this->db->jdate($obj->date_creation);
-                $this->date_valid = $this->db->jdate($obj->date_valid);
+				$this->date_valid = $this->db->jdate($obj->date_valid);
 				$this->date                 = $this->db->jdate($obj->date_expedition); // TODO deprecated
 				$this->date_expedition      = $this->db->jdate($obj->date_expedition); // TODO deprecated
 				$this->date_shipping        = $this->db->jdate($obj->date_expedition); // Date real
@@ -612,12 +619,10 @@ class Expedition extends CommonObject
 				// Tracking url
 				$this->getUrlTrackingStatus($obj->tracking_number);
 
-				/*
-				 * Thirdparty
-				 */
-				$result = $this->fetch_thirdparty();
+				// Thirdparty
+				$result = $this->fetch_thirdparty(); // TODO Remove this
 
-				// Retreive extrafields
+				// Retrieve extrafields
 				$this->fetch_optionals();
 
 				// Fix Get multicurrency param for transmited
@@ -861,7 +866,7 @@ class Expedition extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Create a delivery receipt from a shipment
 	 *
@@ -870,16 +875,16 @@ class Expedition extends CommonObject
 	 */
 	public function create_delivery($user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
-		if ($conf->livraison_bon->enabled)
+		if ($conf->delivery_note->enabled)
 		{
 			if ($this->statut == self::STATUS_VALIDATED || $this->statut == self::STATUS_CLOSED)
 			{
 				// Expedition validee
-				include_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php';
-				$delivery = new Livraison($this->db);
+				include_once DOL_DOCUMENT_ROOT.'/delivery/class/delivery.class.php';
+				$delivery = new Delivery($this->db);
 				$result = $delivery->create_from_sending($user, $this->id);
 				if ($result > 0)
 				{
@@ -912,6 +917,7 @@ class Expedition extends CommonObject
 
 		$line->entrepot_id = $entrepot_id;
 		$line->origin_line_id = $id;
+		$line->fk_origin_line = $id;
 		$line->qty = $qty;
 
 		$orderline = new OrderLine($this->db);
@@ -924,31 +930,38 @@ class Expedition extends CommonObject
 		{
 			$fk_product = $orderline->fk_product;
 
-			if (!($entrepot_id > 0) && empty($conf->global->STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS))
-			{
+			if (!($entrepot_id > 0) && empty($conf->global->STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS)) {
 				$langs->load("errors");
 				$this->error = $langs->trans("ErrorWarehouseRequiredIntoShipmentLine");
 				return -1;
 			}
 
-			if ($conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT)
-			{
-				// Check must be done for stock of product into warehouse if $entrepot_id defined
+			if ($conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT) {
 				$product = new Product($this->db);
-				$result = $product->fetch($fk_product);
+				$product->fetch($fk_product);
 
+				// Check must be done for stock of product into warehouse if $entrepot_id defined
 				if ($entrepot_id > 0) {
 					$product->load_stock('warehouseopen');
 					$product_stock = $product->stock_warehouse[$entrepot_id]->real;
-				} else $product_stock = $product->stock_reel;
+				} else {
+					$product_stock = $product->stock_reel;
+				}
 
 				$product_type = $product->type;
-				if ($product_type == 0 && $product_stock < $qty)
-				{
-					$langs->load("errors");
-					$this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnShipment', $product->ref);
-					$this->db->rollback();
-					return -3;
+				if ($product_type == 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+					$isavirtualproduct = ($product->hasFatherOrChild(1) > 0);
+					// The product is qualified for a check of quantity (must be enough in stock to be added into shipment).
+					if (!$isavirtualproduct || empty($conf->global->PRODUIT_SOUSPRODUITS) || ($isavirtualproduct && empty($conf->global->STOCK_EXCLUDE_VIRTUAL_PRODUCTS))) {  // If STOCK_EXCLUDE_VIRTUAL_PRODUCTS is set, we do not manage stock for kits/virtual products.
+						if ($product_stock < $qty) {
+							$langs->load("errors");
+							$this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnShipment', $product->ref);
+							$this->errorhidden = 'ErrorStockIsNotEnoughToAddProductOnShipment';
+
+							$this->db->rollback();
+							return -3;
+						}
+					}
 				}
 			}
 		}
@@ -967,7 +980,7 @@ class Expedition extends CommonObject
 		$this->lines[$num] = $line;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Add a shipment line with batch record
 	 *
@@ -977,7 +990,7 @@ class Expedition extends CommonObject
 	 */
 	public function addline_batch($dbatch, $array_options = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		$num = count($this->lines);
@@ -1053,13 +1066,13 @@ class Expedition extends CommonObject
 		// Clean parameters
 
 		if (isset($this->ref)) $this->ref = trim($this->ref);
-		if (isset($this->entity)) $this->entity = trim($this->entity);
+		if (isset($this->entity)) $this->entity = (int) $this->entity;
 		if (isset($this->ref_customer)) $this->ref_customer = trim($this->ref_customer);
-		if (isset($this->socid)) $this->socid = trim($this->socid);
-		if (isset($this->fk_user_author)) $this->fk_user_author = trim($this->fk_user_author);
-		if (isset($this->fk_user_valid)) $this->fk_user_valid = trim($this->fk_user_valid);
-		if (isset($this->fk_delivery_address)) $this->fk_delivery_address = trim($this->fk_delivery_address);
-		if (isset($this->shipping_method_id)) $this->shipping_method_id = trim($this->shipping_method_id);
+		if (isset($this->socid)) $this->socid = (int) $this->socid;
+		if (isset($this->fk_user_author)) $this->fk_user_author = (int) $this->fk_user_author;
+		if (isset($this->fk_user_valid)) $this->fk_user_valid = (int) $this->fk_user_valid;
+		if (isset($this->fk_delivery_address)) $this->fk_delivery_address = (int) $this->fk_delivery_address;
+		if (isset($this->shipping_method_id)) $this->shipping_method_id = (int) $this->shipping_method_id;
 		if (isset($this->tracking_number)) $this->tracking_number = trim($this->tracking_number);
 		if (isset($this->statut)) $this->statut = (int) $this->statut;
 		if (isset($this->trueDepth)) $this->trueDepth = trim($this->trueDepth);
@@ -1115,15 +1128,11 @@ class Expedition extends CommonObject
 		$resql = $this->db->query($sql);
 		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (!$error)
-		{
-			if (!$notrigger)
-			{
-				// Call trigger
-				$result = $this->call_trigger('SHIPPING_MODIFY', $user);
-				if ($result < 0) { $error++; }
-				// End call triggers
-			}
+		if (!$error && !$notrigger) {
+			// Call trigger
+			$result = $this->call_trigger('SHIPPING_MODIFY', $user);
+			if ($result < 0) { $error++; }
+			// End call triggers
 		}
 
 		// Commit or rollback
@@ -1147,7 +1156,7 @@ class Expedition extends CommonObject
 	 * 	Cancel shipment.
 	 *
 	 *  @param  int  $notrigger 			Disable triggers
-     *  @param  bool $also_update_stock  	true if the stock should be increased back (false by default)
+	 *  @param  bool $also_update_stock  	true if the stock should be increased back (false by default)
 	 * 	@return	int							>0 if OK, 0 if deletion done but failed to delete files, <0 if KO
 	 */
 	public function cancel($notrigger = 0, $also_update_stock = false)
@@ -1157,32 +1166,27 @@ class Expedition extends CommonObject
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
 
-		$error=0;
-		$this->error='';
+		$error = 0;
+		$this->error = '';
 
 		$this->db->begin();
 
 		// Add a protection to refuse deleting if shipment has at least one delivery
-		$this->fetchObjectLinked($this->id, 'shipping', 0, 'delivery');	// Get deliveries linked to this shipment
-		if (count($this->linkedObjectsIds) > 0)
-		{
-			$this->error='ErrorThereIsSomeDeliveries';
+		$this->fetchObjectLinked($this->id, 'shipping', 0, 'delivery'); // Get deliveries linked to this shipment
+		if (count($this->linkedObjectsIds) > 0) {
+			$this->error = 'ErrorThereIsSomeDeliveries';
 			$error++;
 		}
 
-		if (! $error)
-		{
-			if (! $notrigger)
-			{
-				// Call trigger
-				$result=$this->call_trigger('SHIPPING_CANCEL', $user);
-				if ($result < 0) { $error++; }
-				// End call triggers
-			}
+		if (!$error && !$notrigger) {
+			// Call trigger
+			$result = $this->call_trigger('SHIPPING_CANCEL', $user);
+			if ($result < 0) { $error++; }
+			// End call triggers
 		}
 
 		// Stock control
-		if (! $error && $conf->stock->enabled &&
+		if (!$error && $conf->stock->enabled &&
 			(($conf->global->STOCK_CALCULATE_ON_SHIPMENT && $this->statut > self::STATUS_DRAFT) ||
 			 ($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE && $this->statut == self::STATUS_CLOSED && $also_update_stock)))
 		{
@@ -1353,7 +1357,7 @@ class Expedition extends CommonObject
 	 * 	Warning, do not delete a shipment if a delivery is linked to (with table llx_element_element)
 	 *
 	 *  @param  int  $notrigger 			Disable triggers
-     *  @param  bool $also_update_stock  	true if the stock should be increased back (false by default)
+	 *  @param  bool $also_update_stock  	true if the stock should be increased back (false by default)
 	 * 	@return	int							>0 if OK, 0 if deletion done but failed to delete files, <0 if KO
 	 */
 	public function delete($notrigger = 0, $also_update_stock = false)
@@ -1376,15 +1380,11 @@ class Expedition extends CommonObject
 			$error++;
 		}
 
-		if (!$error)
-		{
-			if (!$notrigger)
-			{
-				// Call trigger
-				$result = $this->call_trigger('SHIPPING_DELETE', $user);
-				if ($result < 0) { $error++; }
-				// End call triggers
-			}
+		if (!$error && !$notrigger) {
+			// Call trigger
+			$result = $this->call_trigger('SHIPPING_DELETE', $user);
+			if ($result < 0) { $error++; }
+			// End call triggers
 		}
 
 		// Stock control
@@ -1467,9 +1467,9 @@ class Expedition extends CommonObject
 
 		if (!$error)
 		{
-                    $main = MAIN_DB_PREFIX.'expeditiondet';
-                    $ef = $main."_extrafields";
-                    $sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_expedition = ".$this->id.")";
+					$main = MAIN_DB_PREFIX.'expeditiondet';
+					$ef = $main."_extrafields";
+					$sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_expedition = ".$this->id.")";
 
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet";
 			$sql .= " WHERE fk_expedition = ".$this->id;
@@ -1480,9 +1480,9 @@ class Expedition extends CommonObject
 				$res = $this->deleteObjectLinked();
 				if ($res < 0) $error++;
 
-                                // delete extrafields
-                                $res = $this->deleteExtraFields();
-                                if ($res < 0) $error++;
+								// delete extrafields
+								$res = $this->deleteExtraFields();
+								if ($res < 0) $error++;
 
 				if (!$error)
 				{
@@ -1563,7 +1563,7 @@ class Expedition extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Load lines
 	 *
@@ -1571,7 +1571,7 @@ class Expedition extends CommonObject
 	 */
 	public function fetch_lines()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $mysoc;
 		// TODO: recuperer les champs du document associe a part
 		$this->lines = array();
@@ -1582,7 +1582,7 @@ class Expedition extends CommonObject
 		$sql .= ", cd.fk_multicurrency, cd.multicurrency_code, cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc, cd.rang";
 		$sql .= ", ed.rowid as line_id, ed.qty as qty_shipped, ed.fk_origin_line, ed.fk_entrepot";
 		$sql .= ", p.ref as product_ref, p.label as product_label, p.fk_product_type";
-		$sql .= ", p.weight, p.weight_units, p.length, p.length_units, p.surface, p.surface_units, p.volume, p.volume_units, p.tobatch as product_tobatch";
+		$sql .= ", p.weight, p.weight_units, p.length, p.length_units, p.surface, p.surface_units, p.volume, p.volume_units, p.tosell as product_tosell, p.tobuy as product_tobuy, p.tobatch as product_tobatch";
 		$sql .= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed, ".MAIN_DB_PREFIX."commandedet as cd";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = cd.fk_product";
 		$sql .= " WHERE ed.fk_expedition = ".$this->id;
@@ -1644,6 +1644,8 @@ class Expedition extends CommonObject
 				$line->product_ref = $obj->product_ref;
 				$line->product_label = $obj->product_label;
 				$line->libelle        	= $obj->product_label; // TODO deprecated
+				$line->product_tosell = $obj->product_tosell;
+				$line->product_tobuy = $obj->product_tobuy;
 				$line->product_tobatch = $obj->product_tobatch;
 				$line->label = $obj->custom_label;
 				$line->description    	= $obj->description;
@@ -1731,7 +1733,7 @@ class Expedition extends CommonObject
 					$line->total_ttc	 	+= $tabprice[2];
 					$line->total_tva	 	+= $tabprice[1];
 				}
-
+				$line->fetch_optionals();
 				$i++;
 				$originline = $obj->fk_origin_line;
 			}
@@ -1847,7 +1849,7 @@ class Expedition extends CommonObject
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return label of a status
 	 *
@@ -1857,8 +1859,8 @@ class Expedition extends CommonObject
 	 */
 	public function LibStatut($status, $mode)
 	{
-        // phpcs:enable
-        global $langs;
+		// phpcs:enable
+		global $langs;
 
 		$labelStatus = $langs->trans($this->statuts[$status]);
 		$labelStatusShort = $langs->trans($this->statutshorts[$status]);
@@ -1866,6 +1868,7 @@ class Expedition extends CommonObject
 		$statusType = 'status'.$status;
 		if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
 		if ($status == self::STATUS_CLOSED) $statusType = 'status6';
+		if ($status == self::STATUS_CANCELED) $statusType = 'status9';
 
 		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
 	}
@@ -1950,28 +1953,41 @@ class Expedition extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Set delivery date
+	 *
+	 *	@param      User 	$user        		Object user that modify
+	 *	@param      int		$delivery_date		Delivery date
+	 *	@return     int         				<0 if ko, >0 if ok
+	 *	@deprecated Use  setDeliveryDate
+	 */
+	public function set_date_livraison($user, $delivery_date)
+	{
+		// phpcs:enable
+		return $this->setDeliveryDate($user, $delivery_date);
+	}
+
 	/**
 	 *	Set the planned delivery date
 	 *
 	 *	@param      User			$user        		Objet user that modify
-	 *	@param      integer 		$date_livraison     Date of delivery
+	 *	@param      integer 		$delivery_date     Date of delivery
 	 *	@return     int         						<0 if KO, >0 if OK
 	 */
-	public function set_date_livraison($user, $date_livraison)
+	public function setDeliveryDate($user, $delivery_date)
 	{
-        // phpcs:enable
 		if ($user->rights->expedition->creer)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."expedition";
-			$sql .= " SET date_delivery = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
+			$sql .= " SET date_delivery = ".($delivery_date ? "'".$this->db->idate($delivery_date)."'" : 'null');
 			$sql .= " WHERE rowid = ".$this->id;
 
-			dol_syslog(get_class($this)."::set_date_livraison", LOG_DEBUG);
+			dol_syslog(get_class($this)."::setDeliveryDate", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				$this->date_delivery = $date_livraison;
+				$this->date_delivery = $delivery_date;
 				return 1;
 			} else {
 				$this->error = $this->db->error();
@@ -1982,7 +1998,7 @@ class Expedition extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Fetch deliveries method and return an array. Load array this->meths(rowid=>label).
 	 *
@@ -1990,7 +2006,7 @@ class Expedition extends CommonObject
 	 */
 	public function fetch_delivery_methods()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$this->meths = array();
 
@@ -2010,7 +2026,7 @@ class Expedition extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Fetch all deliveries method and return an array. Load array this->listmeths.
 	 *
@@ -2019,7 +2035,7 @@ class Expedition extends CommonObject
 	 */
 	public function list_delivery_methods($id = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$this->listmeths = array();
@@ -2046,7 +2062,7 @@ class Expedition extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Update/create delivery method.
 	 *
@@ -2056,7 +2072,7 @@ class Expedition extends CommonObject
 	 */
 	public function update_delivery_method($id = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if ($id == '')
 		{
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_shipment_mode (code, libelle, description, tracking)";
@@ -2074,7 +2090,7 @@ class Expedition extends CommonObject
 		if ($resql < 0) dol_print_error($this->db, '');
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Activate delivery method.
 	 *
@@ -2083,14 +2099,14 @@ class Expedition extends CommonObject
 	 */
 	public function activ_delivery_method($id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=1';
 		$sql .= ' WHERE rowid='.$id;
 
 		$resql = $this->db->query($sql);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  DesActivate delivery method.
 	 *
@@ -2100,7 +2116,7 @@ class Expedition extends CommonObject
 	 */
 	public function disable_delivery_method($id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=0';
 		$sql .= ' WHERE rowid='.$id;
 
@@ -2288,7 +2304,7 @@ class Expedition extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Classify the shipping as invoiced (used when WORKFLOW_BILL_ON_SHIPMENT is on)
 	 *
@@ -2296,7 +2312,7 @@ class Expedition extends CommonObject
 	 */
 	public function set_billed()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user;
 		$error = 0;
 
@@ -2430,13 +2446,13 @@ class Expedition extends CommonObject
 				}
 			}
 
-            if (!$error) {
+			if (!$error) {
 				// Call trigger
 				$result = $this->call_trigger('SHIPPING_REOPEN', $user);
 				if ($result < 0) {
 					$error++;
 				}
-            }
+			}
 		} else {
 			$error++;
 			$this->errors[] = $this->db->lasterror();
@@ -2462,20 +2478,21 @@ class Expedition extends CommonObject
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
-     *  @param      null|array  $moreparams     Array to provide more information
+	 *  @param      null|array  $moreparams     Array to provide more information
 	 *  @return     int         				0 if KO, 1 if OK
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
-		global $conf, $langs;
+		global $conf;
 
-		$langs->load("sendings");
 		$outputlangs->load("products");
 
 		if (!dol_strlen($modele)) {
 			$modele = 'rouget';
 
-			if ($this->modelpdf) {
+			if (!empty($this->model_pdf)) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($this->modelpdf)) {	// deprecated
 				$modele = $this->modelpdf;
 			} elseif (!empty($conf->global->EXPEDITION_ADDON_PDF)) {
 				$modele = $conf->global->EXPEDITION_ADDON_PDF;
@@ -2530,8 +2547,8 @@ class ExpeditionLigne extends CommonObjectLine
 	public $origin_line_id;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_origin_line;
 
 	/**
@@ -2540,42 +2557,42 @@ class ExpeditionLigne extends CommonObjectLine
 	public $fk_expedition;
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
-     * @var float qty asked From llx_expeditiondet
-     */
-    public $qty;
+	/**
+	 * @var float qty asked From llx_expeditiondet
+	 */
+	public $qty;
 
-    /**
-     * @var float qty shipped
-     */
-    public $qty_shipped;
+	/**
+	 * @var float qty shipped
+	 */
+	public $qty_shipped;
 
-    /**
-     * @var int Id of product
-     */
-    public $fk_product;
-    public $detail_batch;
+	/**
+	 * @var int Id of product
+	 */
+	public $fk_product;
+	public $detail_batch;
 
-    /**
-     * @var int Id of warehouse
-     */
+	/**
+	 * @var int Id of warehouse
+	 */
 	public $entrepot_id;
 
 
-    /**
-     * @var float qty asked From llx_commandedet or llx_propaldet
-     */
+	/**
+	 * @var float qty asked From llx_commandedet or llx_propaldet
+	 */
 	public $qty_asked;
 
-    /**
-     * @deprecated
-     * @see $product_ref
-     */
-    public $ref;
+	/**
+	 * @deprecated
+	 * @see $product_ref
+	 */
+	public $ref;
 
 	/**
 	 * @var string product ref
@@ -2588,87 +2605,87 @@ class ExpeditionLigne extends CommonObjectLine
 	 */
 	public $libelle;
 
-    /**
-     * @var string product label
-     */
+	/**
+	 * @var string product label
+	 */
 	public $product_label;
 
-    /**
-     * @var string product description
-     * @deprecated
-     * @see $product_desc
-     */
-    public $desc;
+	/**
+	 * @var string product description
+	 * @deprecated
+	 * @see $product_desc
+	 */
+	public $desc;
 
-    /**
-     * @var string product description
-     */
+	/**
+	 * @var string product description
+	 */
 	public $product_desc;
 
-    /**
-     * @var int rang of line
-     */
-    public $rang;
+	/**
+	 * @var int rang of line
+	 */
+	public $rang;
 
-    /**
-     * @var float weight
-     */
-    public $weight;
-    public $weight_units;
+	/**
+	 * @var float weight
+	 */
+	public $weight;
+	public $weight_units;
 
-    /**
-     * @var float weight
-     */
-    public $length;
-    public $length_units;
+	/**
+	 * @var float weight
+	 */
+	public $length;
+	public $length_units;
 
-    /**
-     * @var float weight
-     */
-    public $surface;
-    public $surface_units;
+	/**
+	 * @var float weight
+	 */
+	public $surface;
+	public $surface_units;
 
-    /**
-     * @var float weight
-     */
-    public $volume;
-    public $volume_units;
+	/**
+	 * @var float weight
+	 */
+	public $volume;
+	public $volume_units;
 
 	// Invoicing
 	public $remise_percent;
-    public $tva_tx;
+	public $tva_tx;
 
-    /**
-     * @var float total without tax
-     */
-    public $total_ht;
+	/**
+	 * @var float total without tax
+	 */
+	public $total_ht;
 
-    /**
-     * @var float total with tax
-     */
-    public $total_ttc;
+	/**
+	 * @var float total with tax
+	 */
+	public $total_ttc;
 
-    /**
-     * @var float total vat
-     */
-    public $total_tva;
+	/**
+	 * @var float total vat
+	 */
+	public $total_tva;
 
-    /**
-     * @var float total localtax 1
-     */
-    public $total_localtax1;
+	/**
+	 * @var float total localtax 1
+	 */
+	public $total_localtax1;
 
-    /**
-     * @var float total localtax 2
-     */
-    public $total_localtax2;
+	/**
+	 * @var float total localtax 2
+	 */
+	public $total_localtax2;
 
 
-    /**
-     *	Constructor
-     *
-     *  @param		DoliDB		$db      Database handler
-     */
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
 	public function __construct($db)
 	{
 		$this->db = $db;
diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionbatch.class.php
index 703d44e6896..637f9dd749c 100644
--- a/htdocs/expedition/class/expeditionbatch.class.php
+++ b/htdocs/expedition/class/expeditionbatch.class.php
@@ -44,15 +44,15 @@ class ExpeditionLineBatch extends CommonObject
 	public $fk_origin_stock;
 	public $fk_expeditiondet;
 
-    /**
-     *  Constructor
-     *
-     *  @param	DoliDb		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param	DoliDb		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 	/**
 	 * Fill object based on a product-warehouse-batch's record
@@ -130,14 +130,14 @@ class ExpeditionLineBatch extends CommonObject
 
 		if (!$error)
 		{
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.self::$_table_element);
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.self::$_table_element);
 			$this->fk_expeditiondet = $id_line_expdet;
 			return $this->id;
 		} else {
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
diff --git a/htdocs/expedition/class/expeditionstats.class.php b/htdocs/expedition/class/expeditionstats.class.php
index 82f619946b0..49d37179eda 100644
--- a/htdocs/expedition/class/expeditionstats.class.php
+++ b/htdocs/expedition/class/expeditionstats.class.php
@@ -34,38 +34,38 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
  */
 class ExpeditionStats extends Stats
 {
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element;
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element;
 
-    public $socid;
-    public $userid;
+	public $socid;
+	public $userid;
 
-    public $from;
-    public $field;
-    public $where;
+	public $from;
+	public $field;
+	public $where;
 
 
-    /**
-     * Constructor
-     *
-     * @param	DoliDB	$db      	Database handler
+	/**
+	 * Constructor
+	 *
+	 * @param	DoliDB	$db      	Database handler
 	 * @param 	int		$socid	   	Id third party for filter
 	 * @param 	string	$mode	   	Option (not used)
 	 * @param   int		$userid    	Id user for filter (creation user)
-     */
-    public function __construct($db, $socid, $mode, $userid = 0)
-    {
+	 */
+	public function __construct($db, $socid, $mode, $userid = 0)
+	{
 		global $user, $conf;
 
 		$this->db = $db;
 
 		$this->socid = ($socid > 0 ? $socid : 0);
-        $this->userid = $userid;
+		$this->userid = $userid;
 		$this->cachefilesuffix = $mode;
 
-        $object = new Expedition($this->db);
+		$object = new Expedition($this->db);
 		$this->from = MAIN_DB_PREFIX.$object->table_element." as c";
 		//$this->from.= ", ".MAIN_DB_PREFIX."societe as s";
 		$this->field = 'weight'; // Warning, unit of weight is NOT USED AND MUST BE
@@ -78,31 +78,31 @@ class ExpeditionStats extends Stats
 		{
 			$this->where .= " AND c.fk_soc = ".$this->socid;
 		}
-        if ($this->userid > 0) $this->where .= ' AND c.fk_user_author = '.$this->userid;
-    }
+		if ($this->userid > 0) $this->where .= ' AND c.fk_user_author = '.$this->userid;
+	}
 
-    /**
-     * Return shipment number by month for a year
-     *
+	/**
+	 * Return shipment number by month for a year
+	 *
 	 * @param	int		$year		Year to scan
-     *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 * @return	array				Array with number by month
-     */
-    public function getNbByMonth($year, $format = 0)
-    {
-        global $user;
+	 */
+	public function getNbByMonth($year, $format = 0)
+	{
+		global $user;
 
-        $sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb";
+		$sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		$res = $this->_getNbByMonth($year, $sql, $format);
 		return $res;
-    }
+	}
 
 	/**
 	 * Return shipments number per year
@@ -119,7 +119,7 @@ class ExpeditionStats extends Stats
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getNbByYear($sql);
 	}
@@ -138,7 +138,7 @@ class ExpeditionStats extends Stats
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY year";
-        $sql .= $this->db->order('year', 'DESC');
+		$sql .= $this->db->order('year', 'DESC');
 
 		return $this->_getAllByYear($sql);
 	}
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index 69c5080ea83..c6b10bd6967 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -30,8 +30,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 if (!empty($conf->projet->enabled)) {
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
 // Load translation files required by the page
@@ -48,27 +48,27 @@ $result = restrictedArea($user, 'expedition', $id, '');
 $object = new Expedition($db);
 if ($id > 0 || !empty($ref))
 {
-    $object->fetch($id, $ref);
-    $object->fetch_thirdparty();
+	$object->fetch($id, $ref);
+	$object->fetch_thirdparty();
 
-    if (!empty($object->origin))
-    {
-        $typeobject = $object->origin;
-        $origin = $object->origin;
-        $object->fetch_origin();
-    }
+	if (!empty($object->origin))
+	{
+		$typeobject = $object->origin;
+		$origin = $object->origin;
+		$object->fetch_origin();
+	}
 
-    // Linked documents
-    if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
-    {
-        $objectsrc = new Commande($db);
-        $objectsrc->fetch($object->$typeobject->id);
-    }
-    if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
-    {
-        $objectsrc = new Propal($db);
-        $objectsrc->fetch($object->$typeobject->id);
-    }
+	// Linked documents
+	if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
+	{
+		$objectsrc = new Commande($db);
+		$objectsrc->fetch($object->$typeobject->id);
+	}
+	if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
+	{
+		$objectsrc = new Propal($db);
+		$objectsrc->fetch($object->$typeobject->id);
+	}
 }
 
 
@@ -78,10 +78,10 @@ if ($id > 0 || !empty($ref))
 
 if ($action == 'addcontact' && $user->rights->expedition->creer)
 {
-    if ($result > 0 && $id > 0)
-    {
+	if ($result > 0 && $id > 0)
+	{
   		$result = $objectsrc->add_contact(GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'), $_POST["type"], $_POST["source"]);
-    }
+	}
 
 	if ($result >= 0)
 	{
@@ -103,7 +103,7 @@ if ($action == 'addcontact' && $user->rights->expedition->creer)
 // bascule du statut d'un contact
 elseif ($action == 'swapstatut' && $user->rights->expedition->creer)
 {
-    $result = $objectsrc->swapContactStatus(GETPOST('ligne'));
+	$result = $objectsrc->swapContactStatus(GETPOST('ligne'));
 }
 
 // Efface un contact
@@ -152,7 +152,7 @@ if ($id > 0 || !empty($ref))
 	$langs->trans("OrderCard");
 
 	$head = shipping_prepare_head($object);
-	dol_fiche_head($head, 'contact', $langs->trans("Shipment"), -1, 'sending');
+	print dol_get_fiche_head($head, 'contact', $langs->trans("Shipment"), -1, 'sending');
 
 
 	// Shipment card
@@ -163,41 +163,41 @@ if ($id > 0 || !empty($ref))
 	$morehtmlref .= $form->editfieldkey("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', 0, 1);
 	$morehtmlref .= $form->editfieldval("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', null, null, '', 1);
 	// Thirdparty
-    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-    // Project
-    if (!empty($conf->projet->enabled)) {
-        $langs->load("projects");
-        $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-        if (0) {    // Do not change on shipment
-            if ($action != 'classify') {
-                $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-            }
-            if ($action == 'classify') {
-                // $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-        } else {
-            // We don't have project on shipment, so we will use the project or source object instead
-            // TODO Add project on shipment
-            $morehtmlref .= ' : ';
-            if (!empty($objectsrc->fk_project)) {
-                $proj = new Project($db);
-                $proj->fetch($objectsrc->fk_project);
-                $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-                $morehtmlref .= $proj->ref;
-                $morehtmlref .= '</a>';
-            } else {
-                $morehtmlref .= '';
-            }
-        }
-    }
+	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+	// Project
+	if (!empty($conf->projet->enabled)) {
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if (0) {    // Do not change on shipment
+			if ($action != 'classify') {
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			}
+			if ($action == 'classify') {
+				// $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			// We don't have project on shipment, so we will use the project or source object instead
+			// TODO Add project on shipment
+			$morehtmlref .= ' : ';
+			if (!empty($objectsrc->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($objectsrc->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
 	$morehtmlref .= '</div>';
 
 
@@ -205,33 +205,33 @@ if ($id > 0 || !empty($ref))
 
 
 	print '<div class="fichecenter">';
-    //print '<div class="fichehalfleft">';
+	//print '<div class="fichehalfleft">';
 	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border centpercent tableforfield">';
+	print '<table class="border centpercent tableforfield">';
 
-    // Linked documents
+	// Linked documents
 	if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
 	{
-	    print '<tr><td class="titlefield">';
-	    $objectsrc = new Commande($db);
-	    $objectsrc->fetch($object->$typeobject->id);
-	    print $langs->trans("RefOrder").'</td>';
-	    print '<td colspan="3">';
-	    print $objectsrc->getNomUrl(1, 'commande');
-	    print "</td>\n";
-	    print '</tr>';
+		print '<tr><td class="titlefield">';
+		$objectsrc = new Commande($db);
+		$objectsrc->fetch($object->$typeobject->id);
+		print $langs->trans("RefOrder").'</td>';
+		print '<td colspan="3">';
+		print $objectsrc->getNomUrl(1, 'commande');
+		print "</td>\n";
+		print '</tr>';
 	}
 	if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
 	{
-	    print '<tr><td class="titlefield">';
-	    $objectsrc = new Propal($db);
-	    $objectsrc->fetch($object->$typeobject->id);
-	    print $langs->trans("RefProposal").'</td>';
-	    print '<td colspan="3">';
-	    print $objectsrc->getNomUrl(1, 'expedition');
-	    print "</td>\n";
-	    print '</tr>';
+		print '<tr><td class="titlefield">';
+		$objectsrc = new Propal($db);
+		$objectsrc->fetch($object->$typeobject->id);
+		print $langs->trans("RefProposal").'</td>';
+		print '<td colspan="3">';
+		print $objectsrc->getNomUrl(1, 'expedition');
+		print "</td>\n";
+		print '</tr>';
 	}
 
 	print "</table>";
@@ -250,7 +250,7 @@ if ($id > 0 || !empty($ref))
 	print '<div class="clearboth"></div>';
 
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	// Lines of contacts
 	echo '<br>';
@@ -260,8 +260,8 @@ if ($id > 0 || !empty($ref))
 	$preselectedtypeofcontact = dol_getIdFromCode($db, 'SHIPPING', 'c_type_contact', 'code', 'rowid');
 	foreach ($dirtpls as $reldir)
 	{
-	    $res = @include dol_buildpath($reldir.'/contacts.tpl.php');
-	    if ($res) break;
+		$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
+		if ($res) break;
 	}
 }
 
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index 69f59cb3385..a9b19ede7c3 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -94,14 +94,14 @@ if ($id > 0 || !empty($ref)) {
 		$upload_dir = $conf->expedition->dir_output.'/sending/'.dol_sanitizeFileName($object->ref);
 
 		$head = shipping_prepare_head($object);
-		dol_fiche_head($head, 'documents', $langs->trans("Shipment"), -1, 'sending');
+		print dol_get_fiche_head($head, 'documents', $langs->trans("Shipment"), -1, 'sending');
 
 
 		// Build file list
 		$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 		$totalsize = 0;
 		foreach ($filearray as $key => $file) {
-		    $totalsize += $file['size'];
+			$totalsize += $file['size'];
 		}
 
 		// Shipment card
@@ -169,7 +169,7 @@ if ($id > 0 || !empty($ref)) {
 
 		print "</div>\n";
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		$modulepart = 'expedition';
 		$permission = $user->rights->expedition->creer;
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index 6f21683cc69..4a84bfc6718 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -56,14 +56,14 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-    print '<form method="post" action="list.php">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder nohover centpercent">';
-    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    print '<tr class="oddeven"><td>';
-    print $langs->trans("Shipment").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-    print "</table></div></form><br>\n";
+	print '<form method="post" action="list.php">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder nohover centpercent">';
+	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("Shipment").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+	print "</table></div></form><br>\n";
 }
 
 /*
@@ -250,13 +250,13 @@ if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
 
-		    $orderstatic->id = $obj->rowid;
+			$orderstatic->id = $obj->rowid;
 			$orderstatic->ref = $obj->ref;
 			$orderstatic->ref_customer = $obj->ref_customer;
 			$orderstatic->statut = $obj->status;
-            $orderstatic->billed = $obj->billed;
+			$orderstatic->billed = $obj->billed;
 
-            $companystatic->name = $obj->name;
+			$companystatic->name = $obj->name;
 			$companystatic->id = $obj->socid;
 
 			print '<tr class="oddeven"><td>';
@@ -265,10 +265,10 @@ if ($resql)
 			print '<td>';
 			print $companystatic->getNomUrl(1, 'customer', 32);
 			print '</td>';
-            print '<td class="right">';
-            print $orderstatic->getLibStatut(3);
-            print '</td>';
-            print '</tr>';
+			print '<td class="right">';
+			print $orderstatic->getLibStatut(3);
+			print '</td>';
+			print '</tr>';
 			$i++;
 		}
 
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 3f9de5533fc..eaae2438b55 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -127,20 +127,14 @@ $arrayfields = array(
 	'e.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
 	'e.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
 	'e.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
-	'l.ref'=>array('label'=>$langs->trans("DeliveryRef"), 'checked'=>1, 'enabled'=>(empty($conf->livraison_bon->enabled) ? 0 : 1)),
-	'l.date_delivery'=>array('label'=>$langs->trans("DateReceived"), 'checked'=>1, 'enabled'=>(empty($conf->livraison_bon->enabled) ? 0 : 1)),
+	'l.ref'=>array('label'=>$langs->trans("DeliveryRef"), 'checked'=>1, 'enabled'=>(empty($conf->delivery_note->enabled) ? 0 : 1)),
+	'l.date_delivery'=>array('label'=>$langs->trans("DateReceived"), 'checked'=>1, 'enabled'=>(empty($conf->delivery_note->enabled) ? 0 : 1)),
 	'e.billed'=>array('label'=>$langs->trans("Billed"), 'checked'=>1, 'position'=>1000, 'enabled'=>(!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)))
 );
 
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
@@ -175,7 +169,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_state = "";
 	$search_type = '';
 	$search_country = '';
-	$search_tracking='';
+	$search_tracking = '';
 	$search_type_thirdparty = '';
 	$search_billed = '';
 	$search_datedelivery_start = '';
@@ -183,7 +177,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_datereceipt_start = '';
 	$search_datereceipt_end = '';
 	$search_status = '';
-    $toselect = '';
+	$toselect = '';
 	$search_array_options = array();
 	$search_categ_cus = 0;
 }
@@ -218,7 +212,7 @@ llxHeader('', $langs->trans('ListOfSendings'), $helpurl);
 
 $sql = 'SELECT';
 if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
-$sql .= " e.rowid, e.ref, e.ref_customer, e.date_expedition as date_expedition, e.weight, e.weight_units, e.date_delivery as date_livraison, l.date_delivery as date_reception, e.fk_statut, e.billed, e.tracking_number,";
+$sql .= " e.rowid, e.ref, e.ref_customer, e.date_expedition as date_expedition, e.weight, e.weight_units, e.date_delivery as delivery_date, l.date_delivery as date_reception, e.fk_statut, e.billed, e.tracking_number,";
 $sql .= " s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client, ";
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
@@ -246,7 +240,7 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as ee ON e.rowid = ee.fk_source AND ee.sourcetype = 'shipping' AND ee.targettype = 'delivery'";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.rowid = ee.fk_target";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.rowid = ee.fk_target";
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON e.fk_user_author = u.rowid';
 
 // We'll need this table joined to the select in order to filter by sale
@@ -277,7 +271,7 @@ if ($search_town)  $sql .= natural_search('s.town', $search_town);
 if ($search_zip)   $sql .= natural_search("s.zip", $search_zip);
 if ($search_state) $sql .= natural_search("state.nom", $search_state);
 if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
-if ($search_tracking)   $sql.= natural_search("e.tracking_number", $search_tracking);
+if ($search_tracking)   $sql .= natural_search("e.tracking_number", $search_tracking);
 if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
 if ($search_sale > 0)                        $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$search_sale;
 if ($search_ref_exp) $sql .= natural_search('e.ref', $search_ref_exp);
@@ -335,7 +329,7 @@ if ($resql)
 	if ($search_user > 0) 			$param .= '&search_user='.urlencode($search_user);
 	if ($search_sale > 0) 			$param .= '&search_sale='.urlencode($search_sale);
 	if ($search_company)   $param .= "&amp;search_company=".urlencode($search_company);
-	if ($search_tracking)   $param.= "&amp;search_tracking=".urlencode($search_tracking);
+	if ($search_tracking)   $param .= "&amp;search_tracking=".urlencode($search_tracking);
 	if ($search_town)      $param .= '&search_town='.urlencode($search_town);
 	if ($search_zip)       $param .= '&search_zip='.urlencode($search_zip);
 
@@ -408,7 +402,7 @@ if ($resql)
 	 	$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -417,7 +411,7 @@ if ($resql)
 		$moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter .= '</div>';
 	}
-	if (!empty($conf->categorie->enabled))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -514,7 +508,7 @@ if ($resql)
 		print '</td>';
 	}
 	// Tracking number
-	if (! empty($arrayfields['e.tracking_number']['checked']))
+	if (!empty($arrayfields['e.tracking_number']['checked']))
 	{
 		print '<td class="liste_titre center">';
 		print '<input class="flat" size="6" type="text" name="search_tracking" value="'.dol_escape_htmltag($search_tracking).'">';
@@ -592,7 +586,7 @@ if ($resql)
 	if (!empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($arrayfields['e.weight']['checked']))         print_liste_field_titre($arrayfields['e.weight']['label'], $_SERVER["PHP_SELF"], "e.weight", "", $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($arrayfields['e.date_delivery']['checked']))  print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"], "e.date_delivery", "", $param, '', $sortfield, $sortorder, 'center ');
-	if (! empty($arrayfields['e.tracking_number']['checked']))  print_liste_field_titre($arrayfields['e.tracking_number']['label'], $_SERVER["PHP_SELF"], "e.tracking_number", "", $param, '', $sortfield, $sortorder, 'center ');
+	if (!empty($arrayfields['e.tracking_number']['checked']))  print_liste_field_titre($arrayfields['e.tracking_number']['label'], $_SERVER["PHP_SELF"], "e.tracking_number", "", $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($arrayfields['l.ref']['checked']))            print_liste_field_titre($arrayfields['l.ref']['label'], $_SERVER["PHP_SELF"], "l.ref", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['l.date_delivery']['checked']))  print_liste_field_titre($arrayfields['l.date_delivery']['label'], $_SERVER["PHP_SELF"], "l.date_delivery", "", $param, '', $sortfield, $sortorder, 'center ');
 	// Extra fields
@@ -624,6 +618,7 @@ if ($resql)
 
 		$object = new Expedition($db);
 		$object->fetch($obj->rowid);
+
 		print '<tr class="oddeven">';
 
 		// Ref
@@ -711,7 +706,7 @@ if ($resql)
 		if (!empty($arrayfields['e.date_delivery']['checked']))
 		{
 			print '<td class="center">';
-			print dol_print_date($db->jdate($obj->date_livraison), "dayhour");
+			print dol_print_date($db->jdate($obj->delivery_date), "dayhour");
 			/*$now = time();
     		if ( ($now - $db->jdate($obj->date_expedition)) > $conf->warnings->lim && $obj->statutid == 1 )
     		{
@@ -719,10 +714,10 @@ if ($resql)
 			print "</td>\n";
 		}
 		// Tracking number
-		if (! empty($arrayfields['e.tracking_number']['checked']))
+		if (!empty($arrayfields['e.tracking_number']['checked']))
 		{
 			print '<td class="center">'.$obj->tracking_number."</td>\n";
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		if (!empty($arrayfields['l.ref']['checked']) || !empty($arrayfields['l.date_delivery']['checked']))
diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index 199782398a6..6397a301e59 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -28,8 +28,8 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
 if (!empty($conf->projet->enabled)) {
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
 // Load translation files required by the page
@@ -47,27 +47,27 @@ $result = restrictedArea($user, $origin, $origin_id);
 $object = new Expedition($db);
 if ($id > 0 || !empty($ref))
 {
-    $object->fetch($id, $ref);
-    $object->fetch_thirdparty();
+	$object->fetch($id, $ref);
+	$object->fetch_thirdparty();
 
-    if (!empty($object->origin))
-    {
-        $typeobject = $object->origin;
-        $origin = $object->origin;
-        $object->fetch_origin();
-    }
+	if (!empty($object->origin))
+	{
+		$typeobject = $object->origin;
+		$origin = $object->origin;
+		$object->fetch_origin();
+	}
 
-    // Linked documents
-    if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
-    {
-        $objectsrc = new Commande($db);
-        $objectsrc->fetch($object->$typeobject->id);
-    }
-    if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
-    {
-        $objectsrc = new Propal($db);
-        $objectsrc->fetch($object->$typeobject->id);
-    }
+	// Linked documents
+	if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
+	{
+		$objectsrc = new Commande($db);
+		$objectsrc->fetch($object->$typeobject->id);
+	}
+	if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
+	{
+		$objectsrc = new Propal($db);
+		$objectsrc->fetch($object->$typeobject->id);
+	}
 }
 
 $permissionnote = $user->rights->expedition->creer; // Used by the include of actions_setnotes.inc.php
@@ -91,7 +91,7 @@ $form = new Form($db);
 if ($id > 0 || !empty($ref))
 {
 	$head = shipping_prepare_head($object);
-	dol_fiche_head($head, 'note', $langs->trans("Shipment"), -1, 'sending');
+	print dol_get_fiche_head($head, 'note', $langs->trans("Shipment"), -1, 'sending');
 
 
 	// Shipment card
@@ -103,52 +103,52 @@ if ($id > 0 || !empty($ref))
 	$morehtmlref .= $form->editfieldval("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-    // Project
-    if (!empty($conf->projet->enabled)) {
-        $langs->load("projects");
-        $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-        if (0) {    // Do not change on shipment
-            if ($action != 'classify') {
-                $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-            }
-            if ($action == 'classify') {
-                // $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-        } else {
-            // We don't have project on shipment, so we will use the project or source object instead
-            // TODO Add project on shipment
-            $morehtmlref .= ' : ';
-            if (!empty($objectsrc->fk_project)) {
-                $proj = new Project($db);
-                $proj->fetch($objectsrc->fk_project);
-                $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-                $morehtmlref .= $proj->ref;
-                $morehtmlref .= '</a>';
-            } else {
-                $morehtmlref .= '';
-            }
-        }
-    }
-    $morehtmlref .= '</div>';
+	// Project
+	if (!empty($conf->projet->enabled)) {
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if (0) {    // Do not change on shipment
+			if ($action != 'classify') {
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			}
+			if ($action == 'classify') {
+				// $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			// We don't have project on shipment, so we will use the project or source object instead
+			// TODO Add project on shipment
+			$morehtmlref .= ' : ';
+			if (!empty($objectsrc->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($objectsrc->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
+	$morehtmlref .= '</div>';
 
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 
 	$cssclass = 'titlefield';
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 152dee7cd36..39772360227 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -78,43 +78,43 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Categorisation dans projet
-    if ($action == 'classin')
-    {
-    	$object = new Commande($db);
-    	$object->fetch($id);
-    	$object->setProject(GETPOST('projectid', 'int'));
-    }
-
-    if ($action == 'confirm_cloture' && GETPOST('confirm', 'alpha') == 'yes')
-    {
-    	$object = new Commande($db);
-    	$object->fetch($id);
-    	$result = $object->cloture($user);
-    }
-
-    // Positionne ref commande client
-    elseif ($action == 'setref_client' && $user->rights->commande->creer) {
-        $result = $object->set_ref_client($user, GETPOST('ref_client'));
-        if ($result < 0)
-        {
-            setEventMessages($object->error, $object->errors, 'errors');
-        }
-    }
-
-    if ($action == 'setdatedelivery' && $user->rights->commande->creer)
+	// Categorisation dans projet
+	if ($action == 'classin')
 	{
-	    //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
-	    $datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
-
-	    $object->fetch($id);
-	    $result = $object->set_date_livraison($user, $datedelivery);
-	    if ($result < 0)
-	    {
-	        setEventMessages($object->error, $object->errors, 'errors');
-	    }
+		$object = new Commande($db);
+		$object->fetch($id);
+		$object->setProject(GETPOST('projectid', 'int'));
 	}
-    /*
+
+	if ($action == 'confirm_cloture' && GETPOST('confirm', 'alpha') == 'yes')
+	{
+		$object = new Commande($db);
+		$object->fetch($id);
+		$result = $object->cloture($user);
+	}
+
+	// Positionne ref commande client
+	elseif ($action == 'setref_client' && $user->rights->commande->creer) {
+		$result = $object->set_ref_client($user, GETPOST('ref_client'));
+		if ($result < 0)
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+
+	if ($action == 'setdatedelivery' && $user->rights->commande->creer)
+	{
+		//print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
+		$datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
+
+		$object->fetch($id);
+		$result = $object->setDeliveryDate($user, $datedelivery);
+		if ($result < 0)
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+	/*
     if ($action == 'setdeliveryaddress' && $user->rights->commande->creer)
     {
     	$object = new Commande($db);
@@ -124,100 +124,100 @@ if (empty($reshook))
     		setEventMessages($object->error, $object->errors, 'errors');
     }
     */
-    if ($action == 'setmode' && $user->rights->commande->creer)
-    {
-    	$object = new Commande($db);
-    	$object->fetch($id);
-    	$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
-    	if ($result < 0)
-    		setEventMessages($object->error, $object->errors, 'errors');
-    }
+	if ($action == 'setmode' && $user->rights->commande->creer)
+	{
+		$object = new Commande($db);
+		$object->fetch($id);
+		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
+		if ($result < 0)
+			setEventMessages($object->error, $object->errors, 'errors');
+	}
 
-    if ($action == 'setavailability' && $user->rights->commande->creer) {
-        $object = new Commande($db);
-        $object->fetch($id);
-        $result = $object->availability(GETPOST('availability_id'));
-        if ($result < 0)
-            setEventMessages($object->error, $object->errors, 'errors');
-    }
+	if ($action == 'setavailability' && $user->rights->commande->creer) {
+		$object = new Commande($db);
+		$object->fetch($id);
+		$result = $object->availability(GETPOST('availability_id'));
+		if ($result < 0)
+			setEventMessages($object->error, $object->errors, 'errors');
+	}
 
-    if ($action == 'setdemandreason' && $user->rights->commande->creer) {
-        $object = new Commande($db);
-        $object->fetch($id);
-        $result = $object->demand_reason(GETPOST('demand_reason_id'));
-        if ($result < 0)
-            setEventMessages($object->error, $object->errors, 'errors');
-    }
+	if ($action == 'setdemandreason' && $user->rights->commande->creer) {
+		$object = new Commande($db);
+		$object->fetch($id);
+		$result = $object->demand_reason(GETPOST('demand_reason_id'));
+		if ($result < 0)
+			setEventMessages($object->error, $object->errors, 'errors');
+	}
 
-    if ($action == 'setconditions' && $user->rights->commande->creer)
-    {
-    	$object = new Commande($db);
-    	$object->fetch($id);
-    	$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
-    	if ($result < 0)
-    		setEventMessages($object->error, $object->errors, 'errors');
-    }
+	if ($action == 'setconditions' && $user->rights->commande->creer)
+	{
+		$object = new Commande($db);
+		$object->fetch($id);
+		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
+		if ($result < 0)
+			setEventMessages($object->error, $object->errors, 'errors');
+	}
 
-    // Set incoterm
-    elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
-    {
-    	$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
-    	if ($result < 0) {
-    		setEventMessages($object->error, $object->errors, 'errors');
-    	}
-    }
+	// Set incoterm
+	elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
+	{
+		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
 
-    // shipping method
-    if ($action == 'setshippingmethod' && $user->rights->commande->creer) {
-        $object = new Commande($db);
-        $object->fetch($id);
-        $result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
-    	if ($result < 0)
-    		setEventMessages($object->error, $object->errors, 'errors');
-    }
+	// shipping method
+	if ($action == 'setshippingmethod' && $user->rights->commande->creer) {
+		$object = new Commande($db);
+		$object->fetch($id);
+		$result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
+		if ($result < 0)
+			setEventMessages($object->error, $object->errors, 'errors');
+	}
 
-    // warehouse
-    if ($action == 'setwarehouse' && $user->rights->commande->creer) {
-        $object = new Commande($db);
-        $object->fetch($id);
-        $result = $object->setWarehouse(GETPOST('warehouse_id', 'int'));
-        if ($result < 0)
-            setEventMessages($object->error, $object->errors, 'errors');
-    }
+	// warehouse
+	if ($action == 'setwarehouse' && $user->rights->commande->creer) {
+		$object = new Commande($db);
+		$object->fetch($id);
+		$result = $object->setWarehouse(GETPOST('warehouse_id', 'int'));
+		if ($result < 0)
+			setEventMessages($object->error, $object->errors, 'errors');
+	}
 
-    if ($action == 'update_extras')
-    {
-    	$object->oldcopy = dol_clone($object);
+	if ($action == 'update_extras')
+	{
+		$object->oldcopy = dol_clone($object);
 
-    	// Fill array 'array_options' with data from update form
-        $ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
-        if ($ret < 0) $error++;
+		// Fill array 'array_options' with data from update form
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
+		if ($ret < 0) $error++;
 
-        if (!$error)
-        {
-            // Actions on extra fields
-            $result = $object->insertExtraFields('SHIPMENT_MODIFY');
+		if (!$error)
+		{
+			// Actions on extra fields
+			$result = $object->insertExtraFields('SHIPMENT_MODIFY');
 			if ($result < 0)
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
 			}
-        }
+		}
 
-        if ($error)
-            $action = 'edit_extras';
-    }
+		if ($error)
+			$action = 'edit_extras';
+	}
 
-    if ($action == 'set_thirdparty' && $user->rights->commande->creer)
-    {
-        $object->fetch($id);
-        $object->setValueFrom('fk_soc', $socid, '', '', 'date', '', $user, 'ORDER_MODIFY');
+	if ($action == 'set_thirdparty' && $user->rights->commande->creer)
+	{
+		$object->fetch($id);
+		$object->setValueFrom('fk_soc', $socid, '', '', 'date', '', $user, 'ORDER_MODIFY');
 
-        header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
-        exit();
-    }
+		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
+		exit();
+	}
 
-    include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 }
 
 /*
@@ -250,7 +250,7 @@ if ($id > 0 || !empty($ref))
 		$res = $object->fetch_optionals();
 
 		$head = commande_prepare_head($object);
-		dol_fiche_head($head, 'shipping', $langs->trans("CustomerOrder"), -1, 'order');
+		print dol_get_fiche_head($head, 'shipping', $langs->trans("CustomerOrder"), -1, 'order');
 
 
 		$formconfirm = '';
@@ -280,61 +280,61 @@ if ($id > 0 || !empty($ref))
 		// Ref customer
 		$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->commande->creer, 'string', '', 0, 1);
 		$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->commande->creer, 'string', '', null, null, '', 1);
-	    // Thirdparty
-	    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$soc->getNomUrl(1);
-	    // Project
-	    if (!empty($conf->projet->enabled))
-	    {
-	        $langs->load("projects");
-	        $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	        if ($user->rights->commande->creer)
-	        {
-	            if ($action != 'classify') {
+		// Thirdparty
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$soc->getNomUrl(1);
+		// Project
+		if (!empty($conf->projet->enabled))
+		{
+			$langs->load("projects");
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+			if ($user->rights->commande->creer)
+			{
+				if ($action != 'classify') {
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-                }
-                if ($action == 'classify') {
-                    //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                    $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                    $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                    $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                    $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                    $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                    $morehtmlref .= '</form>';
-                } else {
-                    $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-                }
-	        } else {
-	            if (!empty($object->fk_project)) {
-	                $proj = new Project($db);
-	                $proj->fetch($object->fk_project);
-	                $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	                $morehtmlref .= $proj->ref;
-	                $morehtmlref .= '</a>';
-	            } else {
-	                $morehtmlref .= '';
-	            }
-	        }
-	    }
-	    $morehtmlref .= '</div>';
+				}
+				if ($action == 'classify') {
+					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				if (!empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
+				} else {
+					$morehtmlref .= '';
+				}
+			}
+		}
+		$morehtmlref .= '</div>';
 
 
-	    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-	    print '<div class="fichecenter">';
-	    print '<div class="fichehalfleft">';
-	    print '<div class="underbanner clearboth"></div>';
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
+		print '<div class="underbanner clearboth"></div>';
 
-	    print '<table class="border centpercent tableforfield">';
+		print '<table class="border centpercent tableforfield">';
 
 		// Discounts for third party
-	    if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-	    	$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-	    	$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-	    } else {
-	    	$filterabsolutediscount = "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')";
-	    	$filtercreditnote = "fk_facture_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";
-	    }
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+			$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+		} else {
+			$filterabsolutediscount = "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')";
+			$filtercreditnote = "fk_facture_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";
+		}
 
 		print '<tr><td class="titlefield">'.$langs->trans('Discounts').'</td><td colspan="3">';
 
@@ -354,8 +354,8 @@ if ($id > 0 || !empty($ref))
 		print '<tr><td>'.$langs->trans('Date').'</td>';
 		print '<td colspan="2">';
 		print dol_print_date($object->date, 'day');
-		if ($object->hasDelay() && empty($object->date_livraison)) {
-		    print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
+		if ($object->hasDelay() && empty($object->delivery_date)) {
+			print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
 		}
 		print '</td>';
 		print '</tr>';
@@ -374,13 +374,13 @@ if ($id > 0 || !empty($ref))
 			print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setdatedelivery">';
-			print $form->selectDate($object->date_livraison ? $object->date_livraison : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
+			print $form->selectDate($object->delivery_date ? $object->delivery_date : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		} else {
-			print dol_print_date($object->date_livraison, 'dayhour');
-			if ($object->hasDelay() && !empty($object->date_livraison)) {
-			    print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
+			print dol_print_date($object->delivery_date, 'dayhour');
+			if ($object->hasDelay() && !empty($object->delivery_date)) {
+				print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
 			}
 		}
 		print '</td>';
@@ -390,43 +390,43 @@ if ($id > 0 || !empty($ref))
 		//print '</td>';
 		print '</tr>';
 
-        // Shipping Method
-        print '<tr><td>';
-        print '<table width="100%" class="nobordernopadding"><tr><td>';
-        print $langs->trans('SendingMethod');
-        print '</td>';
-        if ($action != 'editshippingmethod' && $user->rights->expedition->creer)
-            print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshippingmethod&amp;id='.$object->id.'">'.img_edit($langs->trans('SetShippingMode'), 1).'</a></td>';
-        print '</tr></table>';
-        print '</td><td colspan="2">';
-        if ($action == 'editshippingmethod') {
-            $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'shipping_method_id', 1);
-        } else {
-            $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'none');
-        }
-        print '</td>';
-        print '</tr>';
+		// Shipping Method
+		print '<tr><td>';
+		print '<table width="100%" class="nobordernopadding"><tr><td>';
+		print $langs->trans('SendingMethod');
+		print '</td>';
+		if ($action != 'editshippingmethod' && $user->rights->expedition->creer)
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshippingmethod&amp;id='.$object->id.'">'.img_edit($langs->trans('SetShippingMode'), 1).'</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="2">';
+		if ($action == 'editshippingmethod') {
+			$form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'shipping_method_id', 1);
+		} else {
+			$form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'none');
+		}
+		print '</td>';
+		print '</tr>';
 
-        // Warehouse
-        if (!empty($conf->stock->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
-            require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-            $formproduct = new FormProduct($db);
-            print '<tr><td>';
-            print '<table width="100%" class="nobordernopadding"><tr><td>';
-            print $langs->trans('Warehouse');
-            print '</td>';
-            if ($action != 'editwarehouse' && $user->rights->commande->creer)
-                print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editwarehouse&amp;id='.$object->id.'">'.img_edit($langs->trans('SetWarehouse'), 1).'</a></td>';
-            print '</tr></table>';
-            print '</td><td colspan="2">';
-            if ($action == 'editwarehouse') {
-                $formproduct->formSelectWarehouses($_SERVER['PHP_SELF'].'?id='.$object->id, $object->warehouse_id, 'warehouse_id', 1);
-            } else {
-                $formproduct->formSelectWarehouses($_SERVER['PHP_SELF'].'?id='.$object->id, $object->warehouse_id, 'none');
-            }
-            print '</td>';
-            print '</tr>';
-        }
+		// Warehouse
+		if (!empty($conf->stock->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
+			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+			$formproduct = new FormProduct($db);
+			print '<tr><td>';
+			print '<table width="100%" class="nobordernopadding"><tr><td>';
+			print $langs->trans('Warehouse');
+			print '</td>';
+			if ($action != 'editwarehouse' && $user->rights->commande->creer)
+				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editwarehouse&amp;id='.$object->id.'">'.img_edit($langs->trans('SetWarehouse'), 1).'</a></td>';
+			print '</tr></table>';
+			print '</td><td colspan="2">';
+			if ($action == 'editwarehouse') {
+				$formproduct->formSelectWarehouses($_SERVER['PHP_SELF'].'?id='.$object->id, $object->warehouse_id, 'warehouse_id', 1);
+			} else {
+				$formproduct->formSelectWarehouses($_SERVER['PHP_SELF'].'?id='.$object->id, $object->warehouse_id, 'none');
+			}
+			print '</td>';
+			print '</tr>';
+		}
 
 		// Terms of payment
 		/*
@@ -502,14 +502,14 @@ if ($id > 0 || !empty($ref))
 		$totalVolume = $tmparray['volume'];
 		if ($totalWeight || $totalVolume)
 		{
-		    print '<tr><td>'.$langs->trans("CalculatedWeight").'</td>';
-		    print '<td>';
-		    print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND) ? $conf->global->MAIN_WEIGHT_DEFAULT_ROUND : -1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? $conf->global->MAIN_WEIGHT_DEFAULT_UNIT : 'no');
-		    print '</td></tr>';
-		    print '<tr><td>'.$langs->trans("CalculatedVolume").'</td>';
-		    print '<td>';
-		    print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no');
-		    print '</td></tr>';
+			print '<tr><td>'.$langs->trans("CalculatedWeight").'</td>';
+			print '<td>';
+			print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND) ? $conf->global->MAIN_WEIGHT_DEFAULT_ROUND : -1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? $conf->global->MAIN_WEIGHT_DEFAULT_UNIT : 'no');
+			print '</td></tr>';
+			print '<tr><td>'.$langs->trans("CalculatedVolume").'</td>';
+			print '<td>';
+			print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no');
+			print '</td></tr>';
 		}
 
 		// TODO How record was recorded OrderMode (llx_c_input_method)
@@ -517,22 +517,22 @@ if ($id > 0 || !empty($ref))
 		// Incoterms
 		if (!empty($conf->incoterm->enabled))
 		{
-		    print '<tr><td>';
-		    print '<table width="100%" class="nobordernopadding"><tr><td>';
-		    print $langs->trans('IncotermLabel');
-		    print '<td><td class="right">';
-		    if ($user->rights->commande->creer) print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'/expedition/shipment.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
-		    else print '&nbsp;';
-		    print '</td></tr></table>';
-		    print '</td>';
-		    print '<td colspan="3">';
-		    if ($action != 'editincoterm')
-		    {
-		        print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-		    } else {
-		        print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
-		    }
-		    print '</td></tr>';
+			print '<tr><td>';
+			print '<table width="100%" class="nobordernopadding"><tr><td>';
+			print $langs->trans('IncotermLabel');
+			print '<td><td class="right">';
+			if ($user->rights->commande->creer) print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'/expedition/shipment.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+			else print '&nbsp;';
+			print '</td></tr></table>';
+			print '</td>';
+			print '<td colspan="3">';
+			if ($action != 'editincoterm')
+			{
+				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
+			} else {
+				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
+			}
+			print '</td></tr>';
 		}
 
 		$expe = new Expedition($db);
@@ -553,20 +553,20 @@ if ($id > 0 || !empty($ref))
 
 		if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
 		{
-		    // Multicurrency Amount HT
-		    print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).'</td>';
-		    print '<td class="nowrap">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
-		    print '</tr>';
+			// Multicurrency Amount HT
+			print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).'</td>';
+			print '<td class="nowrap">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+			print '</tr>';
 
-		    // Multicurrency Amount VAT
-		    print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0).'</td>';
-		    print '<td class="nowrap">'.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
-		    print '</tr>';
+			// Multicurrency Amount VAT
+			print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0).'</td>';
+			print '<td class="nowrap">'.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+			print '</tr>';
 
-		    // Multicurrency Amount TTC
-		    print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0).'</td>';
-		    print '<td class="nowrap">'.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
-		    print '</tr>';
+			// Multicurrency Amount TTC
+			print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0).'</td>';
+			print '<td class="nowrap">'.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+			print '</tr>';
 		}
 
 		// Total HT
@@ -581,13 +581,13 @@ if ($id > 0 || !empty($ref))
 		// Amount Local Taxes
 		if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) 		// Localtax1
 		{
-		    print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
-		    print '<td>'.price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
+			print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
+			print '<td>'.price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 		}
 		if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) 		// Localtax2 IRPF
 		{
-		    print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
-		    print '<td>'.price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
+			print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
+			print '<td>'.price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 		}
 
 		// Total TTC
@@ -676,8 +676,8 @@ if ($id > 0 || !empty($ref))
 							$object->fetch_thirdparty();
 
 							$prod = new Product($db);
-	                        $prod->id = $objp->fk_product;
-	                        $prod->entity = $objp->entity;
+							$prod->id = $objp->fk_product;
+							$prod->entity = $objp->entity;
 							$prod->getMultiLangs();
 
 							$outputlangs = $langs;
@@ -700,25 +700,25 @@ if ($id > 0 || !empty($ref))
 						$product_static->type = $type;
 						$product_static->id = $objp->fk_product;
 						$product_static->ref = $objp->ref;
-	                    $product_static->entity = $objp->entity;
+						$product_static->entity = $objp->entity;
 
-	                    $product_static->weight = $objp->weight;
-	                    $product_static->weight_units = $objp->weight_units;
-	                    $product_static->length = $objp->length;
-	                    $product_static->length_units = $objp->length_units;
-	                    $product_static->width = $objp->width;
-	                    $product_static->width_units = $objp->width_units;
-	                    $product_static->height = $objp->height;
-	                    $product_static->height_units = $objp->height_units;
-	                    $product_static->surface = $objp->surface;
-	                    $product_static->surface_units = $objp->surface_units;
-	                    $product_static->volume = $objp->volume;
-	                    $product_static->volume_units = $objp->volume_units;
+						$product_static->weight = $objp->weight;
+						$product_static->weight_units = $objp->weight_units;
+						$product_static->length = $objp->length;
+						$product_static->length_units = $objp->length_units;
+						$product_static->width = $objp->width;
+						$product_static->width_units = $objp->width_units;
+						$product_static->height = $objp->height;
+						$product_static->height_units = $objp->height_units;
+						$product_static->surface = $objp->surface;
+						$product_static->surface_units = $objp->surface_units;
+						$product_static->volume = $objp->volume;
+						$product_static->volume_units = $objp->volume_units;
 
 						$text = $product_static->getNomUrl(1);
 						$text .= ' - '.$label;
 						$description = ($conf->global->PRODUIT_DESC_IN_FORM ? '' : dol_htmlentitiesbr($objp->description)).'<br>';
-	                    $description .= $product_static->show_photos('product', $conf->product->multidir_output[$product_static->entity], 1, 1, 0, 0, 0, 80);
+						$description .= $product_static->show_photos('product', $conf->product->multidir_output[$product_static->entity], 1, 1, 0, 0, 0, 80);
 						print $form->textwithtooltip($text, $description, 3, '', '', $i);
 
 						// Show range
@@ -845,8 +845,8 @@ if ($id > 0 || !empty($ref))
 		{
 			print '<div class="tabsAction">';
 
-            // Bouton expedier sans gestion des stocks
-            if (empty($conf->stock->enabled) && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED))
+			// Bouton expedier sans gestion des stocks
+			if (empty($conf->stock->enabled) && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED))
 			{
 				if ($user->rights->expedition->creer)
 				{
@@ -863,24 +863,24 @@ if ($id > 0 || !empty($ref))
 		}
 
 
-        // Bouton expedier avec gestion des stocks
+		// Bouton expedier avec gestion des stocks
 
-        if (!empty($conf->stock->enabled) && $object->statut == Commande::STATUS_DRAFT)
-        {
-            print $langs->trans("ValidateOrderFirstBeforeShipment");
-        }
+		if (!empty($conf->stock->enabled) && $object->statut == Commande::STATUS_DRAFT)
+		{
+			print $langs->trans("ValidateOrderFirstBeforeShipment");
+		}
 
 		if (!empty($conf->stock->enabled) && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED))
 		{
 			if ($user->rights->expedition->creer)
 			{
 				//print load_fiche_titre($langs->trans("CreateShipment"));
-                print '<div class="tabsAction">';
+				print '<div class="tabsAction">';
 
 				print '<form method="GET" action="'.DOL_URL_ROOT.'/expedition/card.php">';
 				print '<input type="hidden" name="action" value="create">';
 				//print '<input type="hidden" name="id" value="'.$object->id.'">';
-                print '<input type="hidden" name="shipping_method_id" value="'.$object->shipping_method_id.'">';
+				print '<input type="hidden" name="shipping_method_id" value="'.$object->shipping_method_id.'">';
 				print '<input type="hidden" name="origin" value="commande">';
 				print '<input type="hidden" name="origin_id" value="'.$object->id.'">';
 				print '<input type="hidden" name="projectid" value="'.$object->fk_project.'">';
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index fcccb545a33..fcc0d26f81c 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -36,8 +36,8 @@ $socid = GETPOST('socid', 'int');
 // Security check
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $nowyear = strftime("%Y", dol_now());
@@ -73,34 +73,34 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filenamenb = $dir.'/shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
+	$filenamenb = $dir.'/shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
 } else {
-    $filenamenb = $dir.'/shipmentsnbinyear-'.$year.'.png';
+	$filenamenb = $dir.'/shipmentsnbinyear-'.$year.'.png';
 }
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
 if (!$mesg)
 {
-    $px1->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px1->SetLegend($legend);
-    $px1->SetMaxValue($px1->GetCeilMaxValue());
-    $px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
-    $px1->SetWidth($WIDTH);
-    $px1->SetHeight($HEIGHT);
-    $px1->SetYLabel($langs->trans("NbOfSendings"));
-    $px1->SetShading(3);
-    $px1->SetHorizTickIncrement(1);
-    $px1->mode = 'depth';
-    $px1->SetTitle($langs->trans("NumberOfShipmentsByMonth"));
+	$px1->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px1->SetLegend($legend);
+	$px1->SetMaxValue($px1->GetCeilMaxValue());
+	$px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
+	$px1->SetWidth($WIDTH);
+	$px1->SetHeight($HEIGHT);
+	$px1->SetYLabel($langs->trans("NbOfSendings"));
+	$px1->SetShading(3);
+	$px1->SetHorizTickIncrement(1);
+	$px1->mode = 'depth';
+	$px1->SetTitle($langs->trans("NumberOfShipmentsByMonth"));
 
-    $px1->draw($filenamenb, $fileurlnb);
+	$px1->draw($filenamenb, $fileurlnb);
 }
 
 // Build graphic amount of object
@@ -204,7 +204,7 @@ $type = 'shipment_stats';
 
 complete_head_from_modules($conf, $langs, null, $head, $h, $type);
 
-dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
+print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
@@ -269,8 +269,12 @@ foreach ($data as $val)
 
 	print '<tr class="oddeven" height="24">';
 	print '<td class="center">';
-	if ($year) print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'">'.$year.'</a>';
-	else print $langs->trans("ValidationDateNotDefinedEvenIfShipmentValidated");
+	if ($year) {
+		print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'">'.$year.'</a>';
+	} else {
+		// Technical error that should not happen
+		print 'Error: validation date of shipment is not defined. This looks strange because shipment is validated. Try to run /install/repair.php?standard=confirmed';
+	}
 	print '</td>';
 	print '<td class="right">'.$val['nb'].'</td>';
 	/*print '<td class="right">'.price(price2num($val['total'],'MT'),1).'</td>';
@@ -289,9 +293,9 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
 if ($mesg) { print $mesg; } else {
-    print $px1->show();
-    print "<br>\n";
-    /*print $px2->show();
+	print $px1->show();
+	print "<br>\n";
+	/*print $px2->show();
     print "<br>\n";
     print $px3->show();*/
 }
@@ -301,7 +305,7 @@ print '</td></tr></table>';
 print '</div></div></div>';
 print '<div style="clear:both"></div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 
diff --git a/htdocs/expedition/stats/month.php b/htdocs/expedition/stats/month.php
index e24480a3e0d..74455d7dca2 100644
--- a/htdocs/expedition/stats/month.php
+++ b/htdocs/expedition/stats/month.php
@@ -54,14 +54,14 @@ $fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=expeditionstats&file=expediti
 $px = new DolGraph();
 $mesg = $px->isGraphKo();
 if (!$mesg) {
-    $px->SetData($data);
-    $px->SetMaxValue($px->GetCeilMaxValue());
-    $px->SetWidth($WIDTH);
-    $px->SetHeight($HEIGHT);
-    $px->SetYLabel($langs->trans("NbOfSendings"));
-    $px->SetShading(3);
-    $px->SetHorizTickIncrement(1);
-    $px->draw($filename, $fileurl);
+	$px->SetData($data);
+	$px->SetMaxValue($px->GetCeilMaxValue());
+	$px->SetWidth($WIDTH);
+	$px->SetHeight($HEIGHT);
+	$px->SetYLabel($langs->trans("NbOfSendings"));
+	$px->SetShading(3);
+	$px->SetHorizTickIncrement(1);
+	$px->draw($filename, $fileurl);
 }
 
 print '<table class="border centpercent">';
diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
index fbc1763beb3..897e35b8813 100644
--- a/htdocs/expedition/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
@@ -39,36 +39,36 @@ $total = 0;
 $ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink)
 {
-    $ilink++;
+	$ilink++;
 
-    $trclass = 'oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
-    ?>
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	?>
     <tr class="<?php echo $trclass; ?>">
         <td><?php echo $langs->trans("Shipment"); ?></td>
         <td><?php echo $objectlink->getNomUrl(1); ?></td>
         <td></td>
     	<td class="center"><?php echo dol_print_date($objectlink->date_delivery, 'day'); ?></td>
     	<td class="right"><?php
-    	if ($user->rights->expedition->lire) {
-    		$total = $total + $objectlink->total_ht;
-    		echo price($objectlink->total_ht);
-    	} ?></td>
+		if ($user->rights->expedition->lire) {
+			$total = $total + $objectlink->total_ht;
+			echo price($objectlink->total_ht);
+		} ?></td>
     	<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
     	<td class="right">
     		<?php
-    		// For now, shipments must stay linked to order, so link is not deletable
-    		if ($object->element != 'commande') {
-    			?>
+			// For now, shipments must stay linked to order, so link is not deletable
+			if ($object->element != 'commande') {
+				?>
     			<a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
     			<?php
-    		}
-    		?>
+			}
+			?>
     </tr>
     <?php
 }
 if (count($linkedObjectBlock) > 1) {
-    ?>
+	?>
     <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
         <td><?php echo $langs->trans("Total"); ?></td>
         <td></td>
diff --git a/htdocs/expensereport/ajax/ajaxprojet.php b/htdocs/expensereport/ajax/ajaxprojet.php
index 49a7bd4201e..62ceb504dac 100644
--- a/htdocs/expensereport/ajax/ajaxprojet.php
+++ b/htdocs/expensereport/ajax/ajaxprojet.php
@@ -67,18 +67,18 @@ if (GETPOST('fk_projet') != '')
 	{
 		while ($row = $db->fetch_array($resql))
 		{
-		    $label = $row['ref'].' - '.$row['title'];
-		    $row_array['label'] = $label;
+			$label = $row['ref'].' - '.$row['title'];
+			$row_array['label'] = $label;
 			$row_array['value'] = $label;
-	        $row_array['key'] = $row['rowid'];
+			$row_array['key'] = $row['rowid'];
 
-	        array_push($return_arr, $row_array);
-	    }
+			array_push($return_arr, $row_array);
+		}
 
-	    echo json_encode($return_arr);
+		echo json_encode($return_arr);
 	} else {
-	    echo json_encode(array('nom'=>'Error', 'label'=>'Error', 'key'=>'Error', 'value'=>'Error'));
+		echo json_encode(array('nom'=>'Error', 'label'=>'Error', 'key'=>'Error', 'value'=>'Error'));
 	}
 } else {
-    echo json_encode(array('nom'=>'ErrorBadParameter', 'label'=>'ErrorBadParameter', 'key'=>'ErrorBadParameter', 'value'=>'ErrorBadParameter'));
+	echo json_encode(array('nom'=>'ErrorBadParameter', 'label'=>'ErrorBadParameter', 'key'=>'ErrorBadParameter', 'value'=>'ErrorBadParameter'));
 }
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 34c33f5aaab..83e1173fcb4 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -214,6 +214,8 @@ if (empty($reshook))
 
 	if ($action == 'add' && $user->rights->expensereport->creer)
 	{
+		$error = 0;
+
 		$object = new ExpenseReport($db);
 
 		$object->date_debut = $date_start;
@@ -222,10 +224,23 @@ if (empty($reshook))
 		$object->fk_user_author = GETPOST('fk_user_author', 'int');
 		if (!($object->fk_user_author > 0)) $object->fk_user_author = $user->id;
 
+		// Check that expense report is for a user inside the hierarchy or advanced permission for all is set
+		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->expensereport->creer)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->expensereport->writeall_advance))) {
+			$error++;
+			setEventMessages($langs->trans("NotEnoughPermission"), null, 'errors');
+		} else {
+			if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)) {
+				if (!in_array($object->fk_user_author, $childids)) {
+					$error++;
+					setEventMessages($langs->trans("UserNotInHierachy"), null, 'errors');
+				}
+			}
+		}
+
 		$fuser = new User($db);
 		$fuser->fetch($object->fk_user_author);
 
-		$object->fk_statut = 1;
+		$object->status = 1;
 		$object->fk_c_paiement = GETPOST('fk_c_paiement', 'int');
 		$object->fk_user_validator = GETPOST('fk_user_validator', 'int');
 		$object->note_public = GETPOST('note_public', 'restricthtml');
@@ -275,7 +290,7 @@ if (empty($reshook))
 		$object->date_debut = $date_start;
 		$object->date_fin = $date_end;
 
-		if ($object->fk_statut < 3)
+		if ($object->status < 3)
 		{
 			$object->fk_user_validator = GETPOST('fk_user_validator', 'int');
 		}
@@ -288,7 +303,7 @@ if (empty($reshook))
 		$result = $object->update($user);
 		if ($result > 0)
 		{
-			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$_POST['id']);
+			header("Location: ".$_SERVER["PHP_SELF"]."?id=".GETPOST('id', 'int'));
 			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -1354,6 +1369,7 @@ if (empty($reshook))
 
 $title = $langs->trans("ExpenseReport")." - ".$langs->trans("Card");
 $helpurl = "EN:Module_Expense_Reports";
+
 llxHeader("", $title, $helpurl);
 
 $form = new Form($db);
@@ -1374,7 +1390,7 @@ if ($action == 'create')
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 
-	dol_fiche_head('');
+	print dol_get_fiche_head('');
 
 	print '<table class="border centpercent">';
 	print '<tbody>';
@@ -1467,11 +1483,11 @@ if ($action == 'create')
 	print '<tbody>';
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" value="'.$langs->trans("AddTrip").'" name="bouton" class="button" />';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" value="'.$langs->trans("Cancel").'" class="button" onclick="history.go(-1)" />';
+	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" value="'.$langs->trans("Cancel").'" class="button button-cancel" onclick="history.go(-1)" />';
 	print '</div>';
 
 	print '</form>';
@@ -1505,15 +1521,15 @@ if ($action == 'create')
 
 			$head = expensereport_prepare_head($object);
 
-			if ($action == 'edit' && ($object->fk_statut < 3 || $object->fk_statut == 99))
+			if ($action == 'edit' && ($object->status < 3 || $object->status == 99))
 			{
 				print "<form name='update' action=\"".$_SERVER['PHP_SELF']."\" method=\"post\">\n";
 				print '<input type="hidden" name="token" value="'.newToken().'">';
 				print '<input type="hidden" name="id" value="'.$id.'">';
 
-				dol_fiche_head($head, 'card', $langs->trans("ExpenseReport"), 0, 'trip');
+				print dol_get_fiche_head($head, 'card', $langs->trans("ExpenseReport"), 0, 'trip');
 
-				if ($object->fk_statut == 99)
+				if ($object->status == 99)
 				{
 					print '<input type="hidden" name="action" value="updateFromRefuse">';
 				} else {
@@ -1563,7 +1579,7 @@ if ($action == 'create')
 					print '</tr>';
 				}
 
-				if ($object->fk_statut < 3)
+				if ($object->status < 3)
 				{
 					print '<tr>';
 					print '<td>'.$langs->trans("VALIDATOR").'</td>'; // Approbator
@@ -1583,7 +1599,7 @@ if ($action == 'create')
 					print '</td></tr>';
 				}
 
-				if ($object->fk_statut == 6)
+				if ($object->status == 6)
 				{
 					print '<tr>';
 					print '<td>'.$langs->trans("AUTHORPAIEMENT").'</td>';
@@ -1600,16 +1616,16 @@ if ($action == 'create')
 
 				print '</table>';
 
-				dol_fiche_end();
+				print dol_get_fiche_end();
 
 				print '<div class="center">';
 				print '<input type="submit" value="'.$langs->trans("Modify").'" name="bouton" class="button">';
-				print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" value="'.$langs->trans("Cancel").'" class="button" onclick="history.go(-1)" />';
+				print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" value="'.$langs->trans("Cancel").'" class="button button-cancel" onclick="history.go(-1)" />';
 				print '</div>';
 
 				print '</form>';
 			} else {
-				dol_fiche_head($head, 'card', $langs->trans("ExpenseReport"), -1, 'trip');
+				print dol_get_fiche_head($head, 'card', $langs->trans("ExpenseReport"), -1, 'trip');
 
 				// Clone confirmation
 				if ($action == 'clone') {
@@ -1618,7 +1634,7 @@ if ($action == 'create')
 					if (!empty($user->rights->expensereport->readall)) $criteriaforfilter = '';
 					$formquestion = array(
 						'text' => '',
-						array('type' => 'other', 'name' => 'fk_user_author', 'label' => $langs->trans("SelectTargetUser"), 'value' => $form->select_dolusers((GETPOST('fk_user_author', 'int') > 0 ? GETPOST('fk_user_author', 'int') : $user->id), 'fk_user_author', 0, null, 0, $criteriaforfilter))
+						array('type' => 'other', 'name' => 'fk_user_author', 'label' => $langs->trans("SelectTargetUser"), 'value' => $form->select_dolusers((GETPOST('fk_user_author', 'int') > 0 ? GETPOST('fk_user_author', 'int') : $user->id), 'fk_user_author', 0, null, 0, $criteriaforfilter, '', '0', 0, 0, '', 0, '', 'maxwidth150'))
 					);
 					// Paiement incomplet. On demande si motif = escompte ou autre
 					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneExpenseReport', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
@@ -1763,7 +1779,7 @@ if ($action == 'create')
 				print '</tr>';
 
 				// User to inform for approval
-				if ($object->fk_statut <= ExpenseReport::STATUS_VALIDATED)	// informed
+				if ($object->status <= ExpenseReport::STATUS_VALIDATED)	// informed
 				{
 					print '<tr>';
 					print '<td>'.$langs->trans("VALIDATOR").'</td>'; // approver
@@ -1780,7 +1796,7 @@ if ($action == 'create')
 						}
 					}
 					print '</td></tr>';
-				} elseif ($object->fk_statut == ExpenseReport::STATUS_CANCELED)
+				} elseif ($object->status == ExpenseReport::STATUS_CANCELED)
 				{
 					print '<tr>';
 					print '<td>'.$langs->trans("CANCEL_USER").'</span></td>';
@@ -1819,7 +1835,7 @@ if ($action == 'create')
 					print '</tr>';
 				}
 
-				if ($object->fk_statut == 99 || !empty($object->detail_refuse))
+				if ($object->status == 99 || !empty($object->detail_refuse))
 				{
 					print '<tr>';
 					print '<td>'.$langs->trans("REFUSEUR").'</td>';
@@ -1837,7 +1853,7 @@ if ($action == 'create')
 					print '</tr>';
 				}
 
-				if ($object->fk_statut == $object::STATUS_CLOSED)
+				if ($object->status == $object::STATUS_CLOSED)
 				{
 					/* TODO this fields are not yet filled
 					print '<tr>';
@@ -1872,11 +1888,11 @@ if ($action == 'create')
 				print '<td class="titlefieldmiddle">'.$langs->trans("AmountHT").'</td>';
 				print '<td class="nowrap amountcard">'.price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency).'</td>';
 				$rowspan = 5;
-				if ($object->fk_statut <= ExpenseReport::STATUS_VALIDATED) $rowspan++;
-				elseif ($object->fk_statut == ExpenseReport::STATUS_CANCELED) $rowspan += 2;
+				if ($object->status <= ExpenseReport::STATUS_VALIDATED) $rowspan++;
+				elseif ($object->status == ExpenseReport::STATUS_CANCELED) $rowspan += 2;
 				else $rowspan += 2;
-				if ($object->fk_statut == ExpenseReport::STATUS_REFUSED || !empty($object->detail_refuse)) $rowspan += 2;
-				if ($object->fk_statut == ExpenseReport::STATUS_CLOSED) $rowspan += 2;
+				if ($object->status == ExpenseReport::STATUS_REFUSED || !empty($object->detail_refuse)) $rowspan += 2;
+				if ($object->status == ExpenseReport::STATUS_CLOSED) $rowspan += 2;
 				print "</td>";
 				print '</tr>';
 
@@ -2010,7 +2026,7 @@ if ($action == 'create')
 				print '<div style="clear: both;"></div>';
 
 				$actiontouse = 'updateline';
-				if (($object->fk_statut == 0 || $object->fk_statut == 99) && $action != 'editline') $actiontouse = 'addline';
+				if (($object->status == 0 || $object->status == 99) && $action != 'editline') $actiontouse = 'addline';
 
 				print '<form name="expensereport" action="'.$_SERVER["PHP_SELF"].'" enctype="multipart/form-data" method="post" >';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -2046,7 +2062,7 @@ if ($action == 'create')
 					print '<td>';
 					print '</td>';
 					// Ajout des boutons de modification/suppression
-					if (($object->fk_statut < 2 || $object->fk_statut == 99) && $user->rights->expensereport->creer)
+					if (($object->status < 2 || $object->status == 99) && $user->rights->expensereport->creer)
 					{
 						print '<td class="right"></td>';
 					}
@@ -2195,7 +2211,7 @@ if ($action == 'create')
 							print '</td>';
 
 							// Ajout des boutons de modification/suppression
-							if (($object->fk_statut < ExpenseReport::STATUS_VALIDATED || $object->fk_statut == ExpenseReport::STATUS_REFUSED) && $user->rights->expensereport->creer)
+							if (($object->status < ExpenseReport::STATUS_VALIDATED || $object->status == ExpenseReport::STATUS_REFUSED) && $user->rights->expensereport->creer)
 							{
 								print '<td class="nowrap right">';
 
@@ -2337,8 +2353,8 @@ if ($action == 'create')
 
 							print '<td class="center">';
 							print '<input type="hidden" name="rowid" value="'.$line->rowid.'">';
-							print '<input type="submit" class="button" name="save" value="'.$langs->trans('Save').'">';
-							print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
+							print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+							print '<br><input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 							print '</td>';
 
 							print '</tr>';
@@ -2349,7 +2365,7 @@ if ($action == 'create')
 				}
 
 				// Add a new line
-				if (($object->fk_statut == ExpenseReport::STATUS_DRAFT || $object->fk_statut == ExpenseReport::STATUS_REFUSED)
+				if (($object->status == ExpenseReport::STATUS_DRAFT || $object->status == ExpenseReport::STATUS_REFUSED)
 					&& $action != 'editline'
 					&& $user->rights->expensereport->creer)
 				{
@@ -2527,7 +2543,7 @@ if ($action == 'create')
 
 				print '</form>';
 
-				dol_fiche_end();
+				print dol_get_fiche_end();
 			} // end edit or not edit
 		}	// end of if result
 		else {
@@ -2549,7 +2565,7 @@ if ($action != 'create' && $action != 'edit')
 
 	// Send
 	if (empty($user->socid)) {
-		if ($object->fk_statut > ExpenseReport::STATUS_DRAFT) {
+		if ($object->status > ExpenseReport::STATUS_DRAFT) {
 			//if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->expensereport->expensereport_advance->send)) {
 				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
 			//} else
@@ -2562,7 +2578,7 @@ if ($action != 'create' && $action != 'edit')
 	*	ET fk_user_author == user courant
 	* 	Afficher : "Enregistrer" / "Modifier" / "Supprimer"
 	*/
-	if ($user->rights->expensereport->creer && $object->fk_statut == ExpenseReport::STATUS_DRAFT)
+	if ($user->rights->expensereport->creer && $object->status == ExpenseReport::STATUS_DRAFT)
 	{
 		if (in_array($object->fk_user_author, $user->getAllChildIds(1)) || !empty($user->rights->expensereport->writeall_advance))
 		{
@@ -2582,7 +2598,7 @@ if ($action != 'create' && $action != 'edit')
 	 *	ET fk_user_author == user courant
 	 * 	Afficher : "Enregistrer" / "Modifier" / "Supprimer"
 	 */
-	if ($user->rights->expensereport->creer && $object->fk_statut == ExpenseReport::STATUS_REFUSED)
+	if ($user->rights->expensereport->creer && $object->status == ExpenseReport::STATUS_REFUSED)
 	{
 		if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid)
 		{
@@ -2596,7 +2612,7 @@ if ($action != 'create' && $action != 'edit')
 		}
 	}
 
-	if ($user->rights->expensereport->to_paid && $object->fk_statut == ExpenseReport::STATUS_APPROVED)
+	if ($user->rights->expensereport->to_paid && $object->status == ExpenseReport::STATUS_APPROVED)
 	{
 		if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid)
 		{
@@ -2610,7 +2626,7 @@ if ($action != 'create' && $action != 'edit')
 	 *	ET fk_user_validator == user courant
 	 *	Afficher : "Valider" / "Refuser" / "Supprimer"
 	 */
-	if ($object->fk_statut == ExpenseReport::STATUS_VALIDATED)
+	if ($object->status == ExpenseReport::STATUS_VALIDATED)
 	{
 		if (in_array($object->fk_user_author, $user->getAllChildIds(1)))
 		{
@@ -2619,7 +2635,7 @@ if ($action != 'create' && $action != 'edit')
 		}
 	}
 
-	if ($user->rights->expensereport->approve && $object->fk_statut == ExpenseReport::STATUS_VALIDATED)
+	if ($user->rights->expensereport->approve && $object->status == ExpenseReport::STATUS_VALIDATED)
 	{
 		//if($object->fk_user_validator==$user->id)
 		//{
@@ -2632,7 +2648,7 @@ if ($action != 'create' && $action != 'edit')
 		if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid)
 		{
 			// Cancel
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=cancel&id='.$object->id.'">'.$langs->trans('Cancel').'</a></div>';
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=cancel&id='.$object->id.'">'.$langs->trans("Cancel").'</a></div>';
 		}
 	}
 
@@ -2640,13 +2656,13 @@ if ($action != 'create' && $action != 'edit')
 	// If status is Approved
 	// ---------------------
 
-	if ($user->rights->expensereport->approve && $object->fk_statut == ExpenseReport::STATUS_APPROVED)
+	if ($user->rights->expensereport->approve && $object->status == ExpenseReport::STATUS_APPROVED)
 	{
 		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=refuse&id='.$object->id.'">'.$langs->trans('Deny').'</a></div>';
 	}
 
 	// If bank module is used
-	if ($user->rights->expensereport->to_paid && !empty($conf->banque->enabled) && $object->fk_statut == ExpenseReport::STATUS_APPROVED)
+	if ($user->rights->expensereport->to_paid && !empty($conf->banque->enabled) && $object->status == ExpenseReport::STATUS_APPROVED)
 	{
 		// Pay
 		if ($remaintopay == 0)
@@ -2658,7 +2674,7 @@ if ($action != 'create' && $action != 'edit')
 	}
 
 	// If bank module is not used
-	if (($user->rights->expensereport->to_paid || empty($conf->banque->enabled)) && $object->fk_statut == ExpenseReport::STATUS_APPROVED)
+	if (($user->rights->expensereport->to_paid || empty($conf->banque->enabled)) && $object->status == ExpenseReport::STATUS_APPROVED)
 	{
 		//if ((round($remaintopay) == 0 || empty($conf->banque->enabled)) && $object->paid == 0)
 		if ($object->paid == 0)
@@ -2667,20 +2683,20 @@ if ($action != 'create' && $action != 'edit')
 		}
 	}
 
-	if ($user->rights->expensereport->creer && ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid) && $object->fk_statut == ExpenseReport::STATUS_APPROVED)
+	if ($user->rights->expensereport->creer && ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid) && $object->status == ExpenseReport::STATUS_APPROVED)
 	{
 		// Cancel
-   		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=cancel&token='.newToken().'&id='.$object->id.'">'.$langs->trans('Cancel').'</a></div>';
+   		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=cancel&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Cancel").'</a></div>';
 	}
 
 	// TODO Replace this. It should be SetUnpaid and should go back to status unpaid not canceled.
-	if (($user->rights->expensereport->approve || $user->rights->expensereport->to_paid) && $object->fk_statut == ExpenseReport::STATUS_CLOSED)
+	if (($user->rights->expensereport->approve || $user->rights->expensereport->to_paid) && $object->status == ExpenseReport::STATUS_CLOSED)
 	{
 		// Cancel
-		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=cancel&token='.newToken().'&id='.$object->id.'">'.$langs->trans('Cancel').'</a></div>';
+		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=cancel&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Cancel").'</a></div>';
 	}
 
-	if ($user->rights->expensereport->to_paid && $object->paid && $object->fk_statut == ExpenseReport::STATUS_CLOSED)
+	if ($user->rights->expensereport->to_paid && $object->paid && $object->status == ExpenseReport::STATUS_CLOSED)
 	{
 		// Set unpaid
 		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=set_unpaid&token='.newToken().'&id='.$object->id.'">'.$langs->trans('ClassifyUnPaid').'</a></div>';
@@ -2692,11 +2708,11 @@ if ($action != 'create' && $action != 'edit')
 	}
 
 	/* If draft, validated, cancel, and user can create, he can always delete its card before it is approved */
-	if ($user->rights->expensereport->creer && $user->id == $object->fk_user_author && $object->fk_statut < ExpenseReport::STATUS_APPROVED)
+	if ($user->rights->expensereport->creer && $user->id == $object->fk_user_author && $object->status < ExpenseReport::STATUS_APPROVED)
 	{
 		// Delete
 		print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id.'">'.$langs->trans('Delete').'</a></div>';
-	} elseif ($user->rights->expensereport->supprimer && $object->fk_statut != ExpenseReport::STATUS_CLOSED)
+	} elseif ($user->rights->expensereport->supprimer && $object->status != ExpenseReport::STATUS_CLOSED)
 	{
 		// Delete
 		print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id.'">'.$langs->trans('Delete').'</a></div>';
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 405ba52be93..aa892e50fc0 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2016   Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2020		Frédéric 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
@@ -29,172 +30,171 @@
 class ExpenseReports extends DolibarrApi
 {
 
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'fk_user_author'
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'fk_user_author'
+	);
 
-    /**
-     * @var ExpenseReport $expensereport {@type ExpenseReport}
-     */
-    public $expensereport;
+	/**
+	 * @var ExpenseReport $expensereport {@type ExpenseReport}
+	 */
+	public $expensereport;
 
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-        $this->expensereport = new ExpenseReport($this->db);
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->expensereport = new ExpenseReport($this->db);
+	}
 
-    /**
-     * Get properties of a Expense Report object
-     *
-     * Return an array with Expense Report informations
-     *
-     * @param       int         $id         ID of Expense Report
-     * @return 	    array|mixed             Data without useless information
-     *
-     * @throws 	RestException
-     */
-    public function get($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->expensereport->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a Expense Report object
+	 *
+	 * Return an array with Expense Report informations
+	 *
+	 * @param       int         $id         ID of Expense Report
+	 * @return 	    array|mixed             Data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->expensereport->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->expensereport->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Expense report not found');
-        }
+		$result = $this->expensereport->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Expense report not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('expensereport', $this->expensereport->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('expensereport', $this->expensereport->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $this->expensereport->fetchObjectLinked();
-        return $this->_cleanObjectDatas($this->expensereport);
-    }
+		$this->expensereport->fetchObjectLinked();
+		return $this->_cleanObjectDatas($this->expensereport);
+	}
 
-    /**
-     * List Expense Reports
-     *
-     * Get a list of Expense Reports
-     *
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     * @param string   	$user_ids   User ids filter field. Example: '1' or '1,2,3'          {@pattern /^[0-9,]*$/i}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-     * @return  array               Array of Expense Report objects
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = 0, $sqlfilters = '')
-    {
-        global $db, $conf;
+	/**
+	 * List Expense Reports
+	 *
+	 * Get a list of Expense Reports
+	 *
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
+	 * @param string   	$user_ids   User ids filter field. Example: '1' or '1,2,3'          {@pattern /^[0-9,]*$/i}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+	 * @return  array               Array of Expense Report objects
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        // case of external user, $societe param is ignored and replaced by user's socid
-        //$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $societe;
+		// case of external user, $societe param is ignored and replaced by user's socid
+		//$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $societe;
 
-        $sql = "SELECT t.rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as t";
-        $sql .= ' WHERE t.entity IN ('.getEntity('expensereport').')';
-        if ($user_ids) $sql .= " AND t.fk_user_author IN (".$user_ids.")";
+		$sql = "SELECT t.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as t";
+		$sql .= ' WHERE t.entity IN ('.getEntity('expensereport').')';
+		if ($user_ids) $sql .= " AND t.fk_user_author IN (".$user_ids.")";
 
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        $result = $this->db->query($sql);
+		$result = $this->db->query($sql);
 
-        if ($result)
-        {
-        	$num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
-            	$obj = $this->db->fetch_object($result);
-                $expensereport_static = new ExpenseReport($this->db);
-                if ($expensereport_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($expensereport_static);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve Expense Report list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No Expense Report found');
-        }
-        return $obj_ret;
-    }
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			$i = 0;
+			while ($i < $min)
+			{
+				$obj = $this->db->fetch_object($result);
+				$expensereport_static = new ExpenseReport($this->db);
+				if ($expensereport_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($expensereport_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve Expense Report list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No Expense Report found');
+		}
+		return $obj_ret;
+	}
 
-    /**
-     * Create Expense Report object
-     *
-     * @param   array   $request_data   Request data
-     * @return  int                     ID of Expense Report
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->expensereport->creer) {
-            throw new RestException(401, "Insuffisant rights");
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+	/**
+	 * Create Expense Report object
+	 *
+	 * @param   array   $request_data   Request data
+	 * @return  int                     ID of Expense Report
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->expensereport->creer) {
+			throw new RestException(401, "Insuffisant rights");
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        foreach ($request_data as $field => $value) {
-            $this->expensereport->$field = $value;
-        }
-        /*if (isset($request_data["lines"])) {
+		foreach ($request_data as $field => $value) {
+			$this->expensereport->$field = $value;
+		}
+		/*if (isset($request_data["lines"])) {
           $lines = array();
           foreach ($request_data["lines"] as $line) {
             array_push($lines, (object) $line);
           }
           $this->expensereport->lines = $lines;
         }*/
-        if ($this->expensereport->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, "Error creating expensereport", array_merge(array($this->expensereport->error), $this->expensereport->errors));
-        }
+		if ($this->expensereport->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, "Error creating expensereport", array_merge(array($this->expensereport->error), $this->expensereport->errors));
+		}
 
-        return $this->expensereport->id;
-    }
+		return $this->expensereport->id;
+	}
 
-    /**
-     * Get lines of an Expense Report
-     *
-     * @param int   $id             Id of Expense Report
-     *
-     * @url	GET {id}/lines
-     *
-     * @return int
-     */
-    /*
+	/**
+	 * Get lines of an Expense Report
+	 *
+	 * @param int   $id             Id of Expense Report
+	 *
+	 * @url	GET {id}/lines
+	 *
+	 * @return int
+	 */
+	/*
     public function getLines($id)
     {
         if(! DolibarrApiAccess::$user->rights->expensereport->lire) {
@@ -218,17 +218,17 @@ class ExpenseReports extends DolibarrApi
     }
     */
 
-    /**
-     * Add a line to given Expense Report
-     *
-     * @param int   $id             Id of Expense Report to update
-     * @param array $request_data   Expense Report data
-     *
-     * @url	POST {id}/lines
-     *
-     * @return int
-     */
-    /*
+	/**
+	 * Add a line to given Expense Report
+	 *
+	 * @param int   $id             Id of Expense Report to update
+	 * @param array $request_data   Expense Report data
+	 *
+	 * @url	POST {id}/lines
+	 *
+	 * @return int
+	 */
+	/*
     public function postLine($id, $request_data = null)
     {
       if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
@@ -280,18 +280,18 @@ class ExpenseReports extends DolibarrApi
     }
     */
 
-    /**
-     * Update a line to given Expense Report
-     *
-     * @param int   $id             Id of Expense Report to update
-     * @param int   $lineid         Id of line to update
-     * @param array $request_data   Expense Report data
-     *
-     * @url	PUT {id}/lines/{lineid}
-     *
-     * @return object
-     */
-    /*
+	/**
+	 * Update a line to given Expense Report
+	 *
+	 * @param int   $id             Id of Expense Report to update
+	 * @param int   $lineid         Id of line to update
+	 * @param array $request_data   Expense Report data
+	 *
+	 * @url	PUT {id}/lines/{lineid}
+	 *
+	 * @return object
+	 */
+	/*
     public function putLine($id, $lineid, $request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
@@ -340,17 +340,17 @@ class ExpenseReports extends DolibarrApi
     }
     */
 
-    /**
-     * Delete a line of given Expense Report
-     *
-     * @param int   $id             Id of Expense Report to update
-     * @param int   $lineid         Id of line to delete
-     *
-     * @url	DELETE {id}/lines/{lineid}
-     *
-     * @return int
-     */
-    /*
+	/**
+	 * Delete a line of given Expense Report
+	 *
+	 * @param int   $id             Id of Expense Report to update
+	 * @param int   $lineid         Id of line to delete
+	 *
+	 * @url	DELETE {id}/lines/{lineid}
+	 *
+	 * @return int
+	 */
+	/*
     public function deleteLine($id, $lineid)
     {
       if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
@@ -376,94 +376,94 @@ class ExpenseReports extends DolibarrApi
     }
     */
 
-    /**
-     * Update Expense Report general fields (won't touch lines of expensereport)
-     *
-     * @param int   $id             Id of Expense Report to update
-     * @param array $request_data   Datas
-     *
-     * @return int
-     *
-     * @throws	RestException	401		Not allowed
-     * @throws  RestException	404		Expense report not found
-     * @throws	RestException	500
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->expensereport->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Update Expense Report general fields (won't touch lines of expensereport)
+	 *
+	 * @param int   $id             Id of Expense Report to update
+	 * @param array $request_data   Datas
+	 *
+	 * @return int
+	 *
+	 * @throws	RestException	401		Not allowed
+	 * @throws  RestException	404		Expense report not found
+	 * @throws	RestException	500
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->expensereport->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->expensereport->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'expensereport not found');
-        }
+		$result = $this->expensereport->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'expensereport not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('expensereport', $this->expensereport->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $this->expensereport->$field = $value;
-        }
+		if (!DolibarrApi::_checkAccessToResource('expensereport', $this->expensereport->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$this->expensereport->$field = $value;
+		}
 
-        if ($this->expensereport->update(DolibarrApiAccess::$user) > 0)
-        {
-            return $this->get($id);
-        } else {
-            throw new RestException(500, $this->expensereport->error);
-        }
-    }
+		if ($this->expensereport->update(DolibarrApiAccess::$user) > 0)
+		{
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $this->expensereport->error);
+		}
+	}
 
-    /**
-     * Delete Expense Report
-     *
-     * @param   int     $id         Expense Report ID
-     *
-     * @return  array
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->expensereport->supprimer) {
-            throw new RestException(401);
-        }
-        $result = $this->expensereport->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Expense Report not found');
-        }
+	/**
+	 * Delete Expense Report
+	 *
+	 * @param   int     $id         Expense Report ID
+	 *
+	 * @return  array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->expensereport->supprimer) {
+			throw new RestException(401);
+		}
+		$result = $this->expensereport->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Expense Report not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('expensereport', $this->expensereport->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('expensereport', $this->expensereport->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if (!$this->expensereport->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(500, 'Error when delete Expense Report : '.$this->expensereport->error);
-        }
+		if (!$this->expensereport->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(500, 'Error when delete Expense Report : '.$this->expensereport->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Expense Report deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Expense Report deleted'
+			)
+		);
+	}
 
-    /**
-     * Validate an Expense Report
-     *
-     * @param   int $id             Expense Report ID
-     *
-     * @url POST    {id}/validate
-     *
-     * @return  array
-     * FIXME An error 403 is returned if the request has an empty body.
-     * Error message: "Forbidden: Content type `text/plain` is not supported."
-     * Workaround: send this in the body
-     * {
-     *   "idwarehouse": 0
-     * }
-     */
-    /*
+	/**
+	 * Validate an Expense Report
+	 *
+	 * @param   int $id             Expense Report ID
+	 *
+	 * @url POST    {id}/validate
+	 *
+	 * @return  array
+	 * FIXME An error 403 is returned if the request has an empty body.
+	 * Error message: "Forbidden: Content type `text/plain` is not supported."
+	 * Workaround: send this in the body
+	 * {
+	 *   "idwarehouse": 0
+	 * }
+	 */
+	/*
     public function validate($id, $idwarehouse=0)
     {
         if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
@@ -490,75 +490,75 @@ class ExpenseReports extends DolibarrApi
         );
     }*/
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->fk_statut);
-        unset($object->statut);
-        unset($object->user);
-        unset($object->thirdparty);
+		unset($object->fk_statut);
+		unset($object->statut);
+		unset($object->user);
+		unset($object->thirdparty);
 
-        unset($object->cond_reglement);
-        unset($object->shipping_method_id);
+		unset($object->cond_reglement);
+		unset($object->shipping_method_id);
 
-        unset($object->barcode_type);
-        unset($object->barcode_type_code);
-        unset($object->barcode_type_label);
-        unset($object->barcode_type_coder);
+		unset($object->barcode_type);
+		unset($object->barcode_type_code);
+		unset($object->barcode_type_label);
+		unset($object->barcode_type_coder);
 
-        unset($object->code_paiement);
-        unset($object->code_statut);
-        unset($object->fk_c_paiement);
-        unset($object->fk_incoterms);
-        unset($object->label_incoterms);
-        unset($object->location_incoterms);
-        unset($object->mode_reglement_id);
-        unset($object->cond_reglement_id);
+		unset($object->code_paiement);
+		unset($object->code_statut);
+		unset($object->fk_c_paiement);
+		unset($object->fk_incoterms);
+		unset($object->label_incoterms);
+		unset($object->location_incoterms);
+		unset($object->mode_reglement_id);
+		unset($object->cond_reglement_id);
 
-        unset($object->name);
-        unset($object->lastname);
-        unset($object->firstname);
-        unset($object->civility_id);
-        unset($object->cond_reglement_id);
-        unset($object->contact);
-        unset($object->contact_id);
+		unset($object->name);
+		unset($object->lastname);
+		unset($object->firstname);
+		unset($object->civility_id);
+		unset($object->cond_reglement_id);
+		unset($object->contact);
+		unset($object->contact_id);
 
-        unset($object->state);
-        unset($object->state_id);
-        unset($object->state_code);
-        unset($object->country);
-        unset($object->country_id);
-        unset($object->country_code);
+		unset($object->state);
+		unset($object->state_id);
+		unset($object->state_code);
+		unset($object->country);
+		unset($object->country_id);
+		unset($object->country_code);
 
-        unset($object->note); // We already use note_public and note_pricate
+		unset($object->note); // We already use note_public and note_pricate
 
-        return $object;
-    }
+		return $object;
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param   array           $data   Array with data to verify
-     * @return  array
-     * @throws  RestException
-     */
-    private function _validate($data)
-    {
-        $expensereport = array();
-        foreach (ExpenseReports::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $expensereport[$field] = $data[$field];
-        }
-        return $expensereport;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param   array           $data   Array with data to verify
+	 * @return  array
+	 * @throws  RestException
+	 */
+	private function _validate($data)
+	{
+		$expensereport = array();
+		foreach (ExpenseReports::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$expensereport[$field] = $data[$field];
+		}
+		return $expensereport;
+	}
 }
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index b06e34eb92a..8d5cbd3c2cc 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2015 		Alexandre Spangaro  	<aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (c) 2018       Frédéric France         <frederic.france@netlogic.fr>
- * Copyright (C) 2016-2018 	Ferran Marcet       	<fmarcet@2byte.es>
+ * Copyright (C) 2016-2020 	Ferran Marcet       	<fmarcet@2byte.es>
  *
  * 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
@@ -44,7 +44,14 @@ class ExpenseReport extends CommonObject
 	 */
 	public $table_element = 'expensereport';
 
+	/**
+	 * @var string table element line name
+	 */
 	public $table_element_line = 'expensereport_det';
+
+	/**
+	 * @var string Fieldname with ID of parent key if this field has a parent
+	 */
 	public $fk_element = 'fk_expensereport';
 
 	/**
@@ -64,14 +71,25 @@ class ExpenseReport extends CommonObject
 	 * @var int		Status
 	 */
 	public $status;
+
+	/**
+	 * 0=draft, 2=validated (attente approb), 4=canceled, 5=approved, 6=payed, 99=denied
+	 *
+	 * @var int		Status
+	 * @deprecated
+	 */
 	public $fk_statut;
 
+	public $vat_src_code;
+
 	public $fk_c_paiement;
 	public $paid;
 
 	public $user_author_infos;
 	public $user_validator_infos;
 
+	public $rule_warning_message;
+
 	// ACTIONS
 
 	// Create
@@ -398,7 +416,7 @@ class ExpenseReport extends CommonObject
 		$this->id = 0;
 		$this->ref = '';
 		$this->status = 0;
-		$this->fk_statut = 0;
+		$this->fk_statut = 0; // deprecated
 
 		// Clear fields
 		$this->fk_user_author     = $fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for.
@@ -407,6 +425,15 @@ class ExpenseReport extends CommonObject
 		$this->date_creation      = '';
 		$this->date_validation    = '';
 
+		// Remove link on lines to a joined file
+		if (is_array($this->lines) && count($this->lines) > 0)
+		{
+			foreach ($this->lines as $key => $line)
+			{
+				$this->lines[$key]->fk_ecm_files = 0;
+			}
+		}
+
 		// Create clone
 		$this->context['createfromclone'] = 'createfromclone';
 		$result = $this->create($user);
@@ -516,7 +543,7 @@ class ExpenseReport extends CommonObject
 	{
 		global $conf;
 
-		$sql = "SELECT d.rowid, d.ref, d.note_public, d.note_private,"; // DEFAULT
+		$sql = "SELECT d.rowid, d.entity, d.ref, d.note_public, d.note_private,"; // DEFAULT
 		$sql .= " d.detail_refuse, d.detail_cancel, d.fk_user_refuse, d.fk_user_cancel,"; // ACTIONS
 		$sql .= " d.date_refuse, d.date_cancel,"; // ACTIONS
 		$sql .= " d.total_ht, d.total_ttc, d.total_tva,"; // TOTAUX (int)
@@ -538,6 +565,9 @@ class ExpenseReport extends CommonObject
 			{
 				$this->id           = $obj->rowid;
 				$this->ref          = $obj->ref;
+
+				$this->entity       = $obj->entity;
+
 				$this->total_ht     = $obj->total_ht;
 				$this->total_tva    = $obj->total_tva;
 				$this->total_ttc    = $obj->total_ttc;
@@ -578,14 +608,14 @@ class ExpenseReport extends CommonObject
 				$this->fk_c_paiement            = $obj->fk_c_paiement;
 				$this->paid                     = $obj->paid;
 
-				if ($this->fk_statut == self::STATUS_APPROVED || $this->fk_statut == self::STATUS_CLOSED)
+				if ($this->status == self::STATUS_APPROVED || $this->status == self::STATUS_CLOSED)
 				{
 					$user_valid = new User($this->db);
 					if ($this->fk_user_valid > 0) $user_valid->fetch($this->fk_user_valid);
 					$this->user_valid_infos = dolGetFirstLastname($user_valid->firstname, $user_valid->lastname);
 				}
 
-				$this->lines = array();
+				$this->fetch_optionals();
 
 				$result = $this->fetch_lines();
 
@@ -668,9 +698,9 @@ class ExpenseReport extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Returns the label of a statut
+	 *  Returns the label of a status
 	 *
-	 *  @param      int     $status     id statut
+	 *  @param      int     $status     ID status
 	 *  @param      int     $mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
 	 *  @return     string              Label
 	 */
@@ -779,6 +809,7 @@ class ExpenseReport extends CommonObject
 		$this->id = 0;
 		$this->ref = 'SPECIMEN';
 		$this->specimen = 1;
+		$this->entity = 1;
 		$this->date_create = $now;
 		$this->date_debut = $now;
 		$this->date_fin = $now;
@@ -857,7 +888,7 @@ class ExpenseReport extends CommonObject
 				{
 					$objp = $this->db->fetch_object($result);
 
-					$sql2 = "SELECT d.rowid, d.fk_user_author, d.ref, d.fk_statut";
+					$sql2 = "SELECT d.rowid, d.fk_user_author, d.ref, d.fk_statut as status";
 					$sql2 .= " FROM ".MAIN_DB_PREFIX."expensereport as d";
 					$sql2 .= " WHERE d.rowid = ".((int) $objp->fk_expensereport);
 
@@ -866,7 +897,7 @@ class ExpenseReport extends CommonObject
 
 					$objp->fk_user_author = $obj->fk_user_author;
 					$objp->ref = $obj->ref;
-					$objp->fk_c_expensereport_status = $obj->fk_statut;
+					$objp->fk_c_expensereport_status = $obj->status;
 					$objp->rowid = $obj->rowid;
 
 					$total_HT = $total_HT + $objp->total_ht;
@@ -1058,37 +1089,117 @@ class ExpenseReport extends CommonObject
 
 
 	/**
-	 * delete
+	 * Delete object in database
 	 *
-	 * @param   User    $fuser      User that delete
+	 * @param   User    $user       User that delete
+	 * @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
 	 * @return  int                 <0 if KO, >0 if OK
 	 */
-	public function delete(User $fuser = null)
+	public function delete(User $user = null, $notrigger = false)
 	{
-		global $user, $langs, $conf;
+		global $conf;
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		if (!$rowid) $rowid = $this->id;
+		$error = 0;
 
-		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element_line.' WHERE '.$this->fk_element.' = '.$rowid;
-		if ($this->db->query($sql))
-		{
-			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid = '.$rowid;
-			$resql = $this->db->query($sql);
-			if ($resql)
-			{
-				$this->db->commit();
-				return 1;
-			} else {
-				$this->error = $this->db->error()." sql=".$sql;
-				dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
-				$this->db->rollback();
-				return -6;
+		$this->db->begin();
+
+		if (!$notrigger) {
+			// Call trigger
+			$result = $this->call_trigger('EXPENSEREPORT_DELETE', $user);
+			if ($result < 0) { $error++; }
+			// End call triggers
+		}
+
+		// Delete extrafields of lines and lines
+		if (!$error && !empty($this->table_element_line)) {
+			$tabletodelete = $this->table_element_line;
+			//$sqlef = "DELETE FROM ".MAIN_DB_PREFIX.$tabletodelete."_extrafields WHERE fk_object IN (SELECT rowid FROM ".MAIN_DB_PREFIX.$tabletodelete." WHERE ".$this->fk_element." = ".$this->id.")";
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$tabletodelete." WHERE ".$this->fk_element." = ".$this->id;
+			if (!$this->db->query($sql)) {
+				$error++;
+				$this->error = $this->db->lasterror();
+				$this->errors[] = $this->error;
+				dol_syslog(get_class($this)."::delete error ".$this->error, LOG_ERR);
 			}
+		}
+
+		if (!$error) {
+			// Delete linked object
+			$res = $this->deleteObjectLinked();
+			if ($res < 0) $error++;
+		}
+
+		if (!$error) {
+			// Delete linked contacts
+			$res = $this->delete_linked_contact();
+			if ($res < 0) $error++;
+		}
+
+		// Removed extrafields of object
+		if (!$error) {
+			$result = $this->deleteExtraFields();
+			if ($result < 0) {
+				$error++;
+				dol_syslog(get_class($this)."::delete error ".$this->error, LOG_ERR);
+			}
+		}
+
+		// Delete main record
+		if (!$error) {
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element." WHERE rowid = ".$this->id;
+			$res = $this->db->query($sql);
+			if (!$res) {
+				$error++;
+				$this->error = $this->db->lasterror();
+				$this->errors[] = $this->error;
+				dol_syslog(get_class($this)."::delete error ".$this->error, LOG_ERR);
+			}
+		}
+
+		// Delete record into ECM index and physically
+		if (!$error) {
+			$res = $this->deleteEcmFiles(0); // Deleting files physically is done later with the dol_delete_dir_recursive
+			if (!$res) {
+				$error++;
+			}
+		}
+
+		if (!$error) {
+			// We remove directory
+			$ref = dol_sanitizeFileName($this->ref);
+			if ($conf->expensereport->multidir_output[$this->entity] && !empty($this->ref)) {
+				$dir = $conf->expensereport->multidir_output[$this->entity]."/".$ref;
+				$file = $dir."/".$ref.".pdf";
+				if (file_exists($file)) {
+					dol_delete_preview($this);
+
+					if (!dol_delete_file($file, 0, 0, 0, $this)) {
+						$this->error = 'ErrorFailToDeleteFile';
+						$this->errors[] = $this->error;
+						$this->db->rollback();
+						return 0;
+					}
+				}
+				if (file_exists($dir)) {
+					$res = @dol_delete_dir_recursive($dir);
+					if (!$res) {
+						$this->error = 'ErrorFailToDeleteDir';
+						$this->errors[] = $this->error;
+						$this->db->rollback();
+						return 0;
+					}
+				}
+			}
+		}
+
+		if (!$error) {
+			dol_syslog(get_class($this)."::delete ".$this->id." by ".$user->id, LOG_DEBUG);
+			$this->db->commit();
+			return 1;
 		} else {
-			$this->error = $this->db->error()." sql=".$sql;
-			dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
 			$this->db->rollback();
-			return -4;
+			return -1;
 		}
 	}
 
@@ -1107,7 +1218,7 @@ class ExpenseReport extends CommonObject
 		$now = dol_now();
 
 		// Protection
-		if ($this->statut == self::STATUS_VALIDATED)
+		if ($this->status == self::STATUS_VALIDATED)
 		{
 			dol_syslog(get_class($this)."::valid action abandonned: already validated", LOG_WARNING);
 			return 0;
@@ -1195,7 +1306,7 @@ class ExpenseReport extends CommonObject
 			if (!$error)
 			{
 				$this->ref = $num;
-				$this->statut = self::STATUS_VALIDATED;
+				$this->status = self::STATUS_VALIDATED;
 			}
 
 			if (empty($error))
@@ -1237,7 +1348,7 @@ class ExpenseReport extends CommonObject
 
 		$this->date_debut = $this->db->jdate($objp->date_debut);
 
-		if ($this->fk_statut != self::STATUS_VALIDATED)
+		if ($this->status != self::STATUS_VALIDATED)
 		{
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= " SET fk_statut = ".self::STATUS_VALIDATED;
@@ -1271,7 +1382,7 @@ class ExpenseReport extends CommonObject
 
 		// date approval
 		$this->date_approve = $now;
-		if ($this->fk_statut != self::STATUS_APPROVED)
+		if ($this->status != self::STATUS_APPROVED)
 		{
 			$this->db->begin();
 
@@ -1327,7 +1438,7 @@ class ExpenseReport extends CommonObject
 		$error = 0;
 
 		// date de refus
-		if ($this->fk_statut != self::STATUS_REFUSED)
+		if ($this->status != self::STATUS_REFUSED)
 		{
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= " SET ref = '".$this->db->escape($this->ref)."', fk_statut = ".self::STATUS_REFUSED.", fk_user_refuse = ".$fuser->id.",";
@@ -1337,7 +1448,8 @@ class ExpenseReport extends CommonObject
 			$sql .= ' WHERE rowid = '.$this->id;
 			if ($this->db->query($sql))
 			{
-				$this->fk_statut = 99;
+				$this->fk_statut = 99; // deprecated
+				$this->status = 99;
 				$this->fk_user_refuse = $fuser->id;
 				$this->detail_refuse = $details;
 				$this->date_refuse = $now;
@@ -1441,7 +1553,7 @@ class ExpenseReport extends CommonObject
 		// phpcs:enable
 		$error = 0;
 		$this->date_cancel = $this->db->idate(dol_now());
-		if ($this->fk_statut != self::STATUS_CANCELED)
+		if ($this->status != self::STATUS_CANCELED)
 		{
 			$this->db->begin();
 
@@ -1556,7 +1668,10 @@ class ExpenseReport extends CommonObject
 
 		if ($short) return $url;
 
-		$label = img_picto('', $this->picto).' <u>'.$langs->trans("ExpenseReport").'</u>';
+		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ExpenseReport").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
 		if (!empty($this->ref))
 			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 		if (!empty($this->total_ht))
@@ -1683,7 +1798,7 @@ class ExpenseReport extends CommonObject
 
 		dol_syslog(get_class($this)."::addline qty=$qty, up=$up, fk_c_type_fees=$fk_c_type_fees, vatrate=$vatrate, date=$date, fk_project=$fk_project, type=$type, comments=$comments", LOG_DEBUG);
 
-		if ($this->fk_statut == self::STATUS_DRAFT)
+		if ($this->status == self::STATUS_DRAFT)
 		{
 			if (empty($qty)) $qty = 0;
 			if (empty($fk_c_type_fees) || $fk_c_type_fees < 0) $fk_c_type_fees = 0;
@@ -1705,6 +1820,7 @@ class ExpenseReport extends CommonObject
 			$localtaxes_type = getLocalTaxesFromRate($vatrate, 0, $mysoc, $this->thirdparty);
 
 			$vat_src_code = '';
+			$reg = array();
 			if (preg_match('/\s*\((.*)\)/', $vatrate, $reg))
 			{
 				$vat_src_code = $reg[1];
@@ -1925,7 +2041,7 @@ class ExpenseReport extends CommonObject
 	{
 		global $user, $mysoc;
 
-		if ($this->fk_statut == 0 || $this->fk_statut == 99)
+		if ($this->status == self::STATUS_DRAFT || $this->status == self::STATUS_REFUSED)
 		{
 			$this->db->begin();
 
@@ -1938,6 +2054,7 @@ class ExpenseReport extends CommonObject
 			$localtaxes_type = getLocalTaxesFromRate($vatrate, 0, $buyer, $seller);
 
 			// Clean vat code
+			$reg = array();
 			$vat_src_code = '';
 			if (preg_match('/\((.*)\)/', $vatrate, $reg))
 			{
@@ -1953,10 +2070,6 @@ class ExpenseReport extends CommonObject
 
 			$tx_tva = $vatrate / 100;
 			$tx_tva = $tx_tva + 1;
-			$total_ht = price2num($total_ttc / $tx_tva, 'MT');
-
-			$total_tva = price2num($total_ttc - $total_ht, 'MT');
-			// fin calculs
 
 			$this->line = new ExpenseReportLine($this->db);
 			$this->line->comments        = $comments;
@@ -2161,23 +2274,27 @@ class ExpenseReport extends CommonObject
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
-		global $conf, $langs;
+		global $conf;
 
-		$langs->load("trips");
+		$outputlangs->load("trips");
 
 		if (!dol_strlen($modele)) {
-			$modele = 'standard';
-
-			if ($this->modelpdf) {
+			if (!empty($this->model_pdf)) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($this->modelpdf)) {	// deprecated
 				$modele = $this->modelpdf;
 			} elseif (!empty($conf->global->EXPENSEREPORT_ADDON_PDF)) {
 				$modele = $conf->global->EXPENSEREPORT_ADDON_PDF;
 			}
 		}
 
-		$modelpath = "core/modules/expensereport/doc/";
+		if (!empty($modele)) {
+			$modelpath = "core/modules/expensereport/doc/";
 
-		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+			return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+		} else {
+			return 0;
+		}
 	}
 
 	/**
@@ -2268,8 +2385,8 @@ class ExpenseReport extends CommonObject
 
 		$sql = "SELECT ex.rowid, ex.date_valid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as ex";
-		if ($option == 'toapprove') $sql .= " WHERE ex.fk_statut = 2";
-		else $sql .= " WHERE ex.fk_statut = 5";
+		if ($option == 'toapprove') $sql .= " WHERE ex.fk_statut = ".self::STATUS_VALIDATED;
+		else $sql .= " WHERE ex.fk_statut = ".self::STATUS_APPROVED;
 		$sql .= " AND ex.entity IN (".getEntity('expensereport').")";
 		if (empty($user->rights->expensereport->readall))
 		{
@@ -2289,12 +2406,12 @@ class ExpenseReport extends CommonObject
 				$response->warning_delay = $conf->expensereport->approve->warning_delay / 60 / 60 / 24;
 				$response->label = $langs->trans("ExpenseReportsToApprove");
 				$response->labelShort = $langs->trans("ToApprove");
-				$response->url = DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&amp;statut=2';
+				$response->url = DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&amp;statut='.self::STATUS_VALIDATED;
 			} else {
 				$response->warning_delay = $conf->expensereport->payment->warning_delay / 60 / 60 / 24;
 				$response->label = $langs->trans("ExpenseReportsToPay");
 				$response->labelShort = $langs->trans("StatusToPay");
-				$response->url = DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&amp;statut=5';
+				$response->url = DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&amp;statut='.self::STATUS_APPROVED;
 			}
 			$response->img = img_object('', "trip");
 
@@ -2344,7 +2461,7 @@ class ExpenseReport extends CommonObject
 	}
 
 	/**
-	 *	Return if an expensereport was dispatched into bookkeeping
+	 *	Return if object was dispatched into bookkeeping
 	 *
 	 *	@return     int         <0 if KO, 0=no, 1=yes
 	 */
@@ -2395,7 +2512,7 @@ class ExpenseReport extends CommonObject
 		{
 			$obj = $this->db->fetch_object($resql);
 			$this->db->free($resql);
-			return $obj->amount;
+			return (empty($obj->amount) ? 0 : $obj->amount);
 		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -2530,7 +2647,7 @@ class ExpenseReportLine
 	}
 
 	/**
-	 * insert
+	 * Insert a line of expense report
 	 *
 	 * @param   int     $notrigger      1=No trigger
 	 * @param   bool    $fromaddline    false=keep default behavior, true=exclude the update_price() of parent object
@@ -2542,11 +2659,11 @@ class ExpenseReportLine
 
 		$error = 0;
 
-		dol_syslog("ExpenseReportLine::Insert rang=".$this->rang, LOG_DEBUG);
+		dol_syslog("ExpenseReportLine::Insert", LOG_DEBUG);
 
 		// Clean parameters
 		$this->comments = trim($this->comments);
-		if (!$this->value_unit_HT) $this->value_unit_HT = 0;
+		if (empty($this->value_unit)) $this->value_unit = 0;
 		$this->qty = price2num($this->qty);
 		$this->vatrate = price2num($this->vatrate);
 		if (empty($this->fk_c_exp_tax_cat)) $this->fk_c_exp_tax_cat = 0;
@@ -2558,9 +2675,9 @@ class ExpenseReportLine
 		$sql .= ' tva_tx, vat_src_code, comments, qty, value_unit, total_ht, total_tva, total_ttc, date, rule_warning_message, fk_c_exp_tax_cat, fk_ecm_files)';
 		$sql .= " VALUES (".$this->db->escape($this->fk_expensereport).",";
 		$sql .= " ".$this->db->escape($this->fk_c_type_fees).",";
-		$sql .= " ".$this->db->escape($this->fk_project > 0 ? $this->fk_project : ($this->fk_projet > 0 ? $this->fk_projet : 'null')).",";
+		$sql .= " ".$this->db->escape((!empty($this->fk_project) && $this->fk_project > 0) ? $this->fk_project : ((!empty($this->fk_projet) && $this->fk_projet > 0) ? $this->fk_projet : 'null')).",";
 		$sql .= " ".$this->db->escape($this->vatrate).",";
-		$sql .= " '".$this->db->escape($this->vat_src_code)."',";
+		$sql .= " '".$this->db->escape(empty($this->vat_src_code) ? '' : $this->vat_src_code)."',";
 		$sql .= " '".$this->db->escape($this->comments)."',";
 		$sql .= " ".$this->db->escape($this->qty).",";
 		$sql .= " ".$this->db->escape($this->value_unit).",";
@@ -2568,7 +2685,7 @@ class ExpenseReportLine
 		$sql .= " ".$this->db->escape($this->total_tva).",";
 		$sql .= " ".$this->db->escape($this->total_ttc).",";
 		$sql .= " '".$this->db->idate($this->date)."',";
-		$sql .= " '".$this->db->escape($this->rule_warning_message)."',";
+		$sql .= " ".(empty($this->rule_warning_message) ? 'null' : "'".$this->db->escape($this->rule_warning_message)."'").",";
 		$sql .= " ".$this->db->escape($this->fk_c_exp_tax_cat).",";
 		$sql .= " ".($this->fk_ecm_files > 0 ? $this->fk_ecm_files : 'null');
 		$sql .= ")";
diff --git a/htdocs/expensereport/class/expensereport_ik.class.php b/htdocs/expensereport/class/expensereport_ik.class.php
index 59de531a662..55af1eb00ed 100644
--- a/htdocs/expensereport/class/expensereport_ik.class.php
+++ b/htdocs/expensereport/class/expensereport_ik.class.php
@@ -40,7 +40,7 @@ class ExpenseReportIk extends CoreObject
 	public $table_element = 'expensereport_ik';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_expense_ik';
 
@@ -68,28 +68,28 @@ class ExpenseReportIk extends CoreObject
 	 */
 	public $ikoffset;
 
-    /**
-     * Attribute object linked with database
-     * @var array
-     */
+	/**
+	 * Attribute object linked with database
+	 * @var array
+	 */
 	public $fields = array(
 		'rowid'=>array('type'=>'integer', 'index'=>true)
 		,'fk_c_exp_tax_cat'=>array('type'=>'integer', 'index'=>true)
-	    ,'fk_range'=>array('type'=>'integer', 'index'=>true)
+		,'fk_range'=>array('type'=>'integer', 'index'=>true)
 		,'coef'=>array('type'=>'double')
 		,'ikoffset'=>array('type'=>'double')
 	);
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB		$db      Database handler
-     */
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB		$db      Database handler
+	 */
 	public function __construct(DoliDB &$db)
 	{
 		global $conf;
 
-        parent::__construct($db);
+		parent::__construct($db);
 		parent::init();
 
 		$this->errors = array();
@@ -129,15 +129,15 @@ class ExpenseReportIk extends CoreObject
 		return $categories;
 	}
 
-    /**
-     * Return an array of ranges for a user
-     *
-     * @param User  $userauthor         user author id
-     * @param int   $fk_c_exp_tax_cat   category
-     * @return boolean|array
-     */
-    public static function getRangeByUser(User $userauthor, $fk_c_exp_tax_cat)
-    {
+	/**
+	 * Return an array of ranges for a user
+	 *
+	 * @param User  $userauthor         user author id
+	 * @param int   $fk_c_exp_tax_cat   category
+	 * @return boolean|array
+	 */
+	public static function getRangeByUser(User $userauthor, $fk_c_exp_tax_cat)
+	{
 		$default_range = (int) $userauthor->default_range; // if not defined, then 0
 		$ranges = self::getRangesByCategory($fk_c_exp_tax_cat);
 
diff --git a/htdocs/expensereport/class/expensereport_rule.class.php b/htdocs/expensereport/class/expensereport_rule.class.php
index 7ed3a5ecb09..9a172cd7563 100644
--- a/htdocs/expensereport/class/expensereport_rule.class.php
+++ b/htdocs/expensereport/class/expensereport_rule.class.php
@@ -40,7 +40,7 @@ class ExpenseReportRule extends CoreObject
 	public $table_element = 'expensereport_rules';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Fieldname with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_expense_rule';
 
diff --git a/htdocs/expensereport/class/expensereportstats.class.php b/htdocs/expensereport/class/expensereportstats.class.php
index 174c2be4ccf..c4167e3002f 100644
--- a/htdocs/expensereport/class/expensereportstats.class.php
+++ b/htdocs/expensereport/class/expensereportstats.class.php
@@ -30,19 +30,19 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
  */
 class ExpenseReportStats extends Stats
 {
-    /**
+	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element;
 
-    public $socid;
-    public $userid;
+	public $socid;
+	public $userid;
 
-    public $from;
-    public $field;
-    public $where;
+	public $from;
+	public $field;
+	public $where;
 
-    private $datetouse = 'date_valid';
+	private $datetouse = 'date_valid';
 
 
 	/**
@@ -50,7 +50,7 @@ class ExpenseReportStats extends Stats
 	 *
 	 * @param 	DoliDB		$db		   Database handler
 	 * @param 	int			$socid	   Id third party
-     * @param   int			$userid    Id user for filter
+	 * @param   int			$userid    Id user for filter
 	 * @return 	void
 	 */
 	public function __construct($db, $socid = 0, $userid = 0)
@@ -58,8 +58,8 @@ class ExpenseReportStats extends Stats
 		global $conf, $user;
 
 		$this->db = $db;
-        $this->socid = $socid;
-        $this->userid = $userid;
+		$this->socid = $socid;
+		$this->userid = $userid;
 
 		$object = new ExpenseReport($this->db);
 		$this->from = MAIN_DB_PREFIX.$object->table_element." as e";
@@ -107,7 +107,7 @@ class ExpenseReportStats extends Stats
 	 * 	Renvoie le nombre de facture par mois pour une annee donnee
 	 *
 	 *	@param	string	$year		Year to scan
-     *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 *	@return	array				Array of values
 	 */
 	public function getNbByMonth($year, $format = 0)
@@ -117,7 +117,7 @@ class ExpenseReportStats extends Stats
 		$sql .= " WHERE YEAR(e.".$this->datetouse.") = ".$year;
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		$res = $this->_getNbByMonth($year, $sql, $format);
 		//var_dump($res);print '<br>';
@@ -129,7 +129,7 @@ class ExpenseReportStats extends Stats
 	 * 	Renvoie le montant de facture par mois pour une annee donnee
 	 *
 	 *	@param	int		$year		Year to scan
-     *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 *	@return	array				Array of values
 	 */
 	public function getAmountByMonth($year, $format = 0)
@@ -159,7 +159,7 @@ class ExpenseReportStats extends Stats
 		$sql .= " WHERE date_format(".$this->db->ifsql('e.'.$this->datetouse.' IS NULL', 'e.date_create', 'e.'.$this->datetouse).",'%Y') = '".$this->db->escape($year)."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getAverageByMonth($year, $sql);
 	}
@@ -175,8 +175,8 @@ class ExpenseReportStats extends Stats
 		$sql .= " FROM ".$this->from;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY year";
-        $sql .= $this->db->order('year', 'DESC');
+		$sql .= $this->db->order('year', 'DESC');
 
-        return $this->_getAllByYear($sql);
-    }
+		return $this->_getAllByYear($sql);
+	}
 }
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index cad3d62420e..be8693f223e 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -40,7 +40,7 @@ class PaymentExpenseReport extends CommonObject
 	 */
 	public $table_element = 'payment_expensereport';
 
-    /**
+	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
 	public $picto = 'payment';
@@ -51,40 +51,40 @@ class PaymentExpenseReport extends CommonObject
 	public $rowid;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_expensereport;
 
 	public $datec = '';
 	public $tms = '';
 	public $datep = '';
-    public $amount; // Total amount of payment
-    public $amounts = array(); // Array of amounts
+	public $amount; // Total amount of payment
+	public $amounts = array(); // Array of amounts
 
-    /**
-     * @var int ID
-     */
+	/**
+	 * @var int ID
+	 */
 	public $fk_typepayment;
 
 	public $num_payment;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_bank;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_creat;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
-    public $type_code;
-    public $type_label;
+	public $type_code;
+	public $type_label;
 
 
 	/**
@@ -99,8 +99,8 @@ class PaymentExpenseReport extends CommonObject
 
 	/**
 	 *  Create payment of expense report into database.
-     *  Use this->amounts to have list of lines for the payment
-     *
+	 *  Use this->amounts to have list of lines for the payment
+	 *
 	 *  @param      User		$user   User making payment
 	 *  @return     int     			<0 if KO, id of payment if OK
 	 */
@@ -110,9 +110,9 @@ class PaymentExpenseReport extends CommonObject
 
 		$error = 0;
 
-        $now = dol_now();
+		$now = dol_now();
 
-        // Validate parameters
+		// Validate parameters
 		if (!$this->datepaid) {
 			$this->error = 'ErrorBadValueForParameterCreatePaymentExpenseReport';
 			return -1;
@@ -129,17 +129,17 @@ class PaymentExpenseReport extends CommonObject
 		if (isset($this->fk_user_creat))	$this->fk_user_creat = trim($this->fk_user_creat);
 		if (isset($this->fk_user_modif))	$this->fk_user_modif = trim($this->fk_user_modif);
 
-        $totalamount = 0;
-        foreach ($this->amounts as $key => $value)  // How payment is dispatch
-        {
-            $newvalue = price2num($value, 'MT');
-            $this->amounts[$key] = $newvalue;
-            $totalamount += $newvalue;
-        }
-        $totalamount = price2num($totalamount);
+		$totalamount = 0;
+		foreach ($this->amounts as $key => $value)  // How payment is dispatch
+		{
+			$newvalue = price2num($value, 'MT');
+			$this->amounts[$key] = $newvalue;
+			$totalamount += $newvalue;
+		}
+		$totalamount = price2num($totalamount);
 
-        // Check parameters
-        if ($totalamount == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
+		// Check parameters
+		if ($totalamount == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
 
 
 		$this->db->begin();
@@ -166,8 +166,8 @@ class PaymentExpenseReport extends CommonObject
 
 		if ($totalamount != 0 && !$error)
 		{
-		    $this->amount = $totalamount;
-		    $this->db->commit();
+			$this->amount = $totalamount;
+			$this->db->commit();
 			return $this->id;
 		} else {
 			$this->error = $this->db->error();
@@ -242,7 +242,7 @@ class PaymentExpenseReport extends CommonObject
 		}
 	}
 
-    // phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter
+	// phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter
 	/**
 	 *  Update database
 	 *
@@ -311,7 +311,7 @@ class PaymentExpenseReport extends CommonObject
 		}
 	}
 
-    // phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter
+	// phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter
 	/**
 	 *  Delete object in database
 	 *
@@ -327,15 +327,15 @@ class PaymentExpenseReport extends CommonObject
 
 		$this->db->begin();
 
-	    if (!$error)
-        {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url";
-            $sql .= " WHERE type='payment_expensereport' AND url_id=".$this->id;
+		if (!$error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url";
+			$sql .= " WHERE type='payment_expensereport' AND url_id=".$this->id;
 
-            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-        }
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		}
 
 		if (!$error)
 		{
@@ -345,9 +345,9 @@ class PaymentExpenseReport extends CommonObject
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-                $error++;
-                $this->errors[] = "Error ".$this->db->lasterror();
-            }
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
+			}
 		}
 
 		// Commit or rollback
@@ -424,10 +424,10 @@ class PaymentExpenseReport extends CommonObject
 	 */
 	public function getLibStatut($mode = 0)
 	{
-	    return '';
+		return '';
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un statut donne
 	 *
@@ -435,21 +435,21 @@ class PaymentExpenseReport extends CommonObject
 	 *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *  @return string 			       	Libelle du statut
 	 */
-    public function LibStatut($status, $mode = 0)
-    {
-        // phpcs:enable
-        global $langs;
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		global $langs;
 
-        return '';
-    }
+		return '';
+	}
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
 	 */
 	public function initAsSpecimen()
 	{
@@ -469,115 +469,115 @@ class PaymentExpenseReport extends CommonObject
 	}
 
 
-    /**
-     *      Add record into bank for payment with links between this bank record and invoices of payment.
-     *      All payment properties must have been set first like after a call to create().
-     *
-     *      @param	User	$user               Object of user making payment
-     *      @param  string	$mode               'payment_expensereport'
-     *      @param  string	$label              Label to use in bank record
-     *      @param  int		$accountid          Id of bank account to do link with
-     *      @param  string	$emetteur_nom       Name of transmitter
-     *      @param  string	$emetteur_banque    Name of bank
-     *      @return int                 		<0 if KO, >0 if OK
-     */
-    public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
-    {
-        global $langs, $conf;
+	/**
+	 *      Add record into bank for payment with links between this bank record and invoices of payment.
+	 *      All payment properties must have been set first like after a call to create().
+	 *
+	 *      @param	User	$user               Object of user making payment
+	 *      @param  string	$mode               'payment_expensereport'
+	 *      @param  string	$label              Label to use in bank record
+	 *      @param  int		$accountid          Id of bank account to do link with
+	 *      @param  string	$emetteur_nom       Name of transmitter
+	 *      @param  string	$emetteur_banque    Name of bank
+	 *      @return int                 		<0 if KO, >0 if OK
+	 */
+	public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
+	{
+		global $langs, $conf;
 
-        $error = 0;
+		$error = 0;
 
-        if (!empty($conf->banque->enabled))
-        {
-            include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+		if (!empty($conf->banque->enabled))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-            $acc = new Account($this->db);
-            $acc->fetch($accountid);
+			$acc = new Account($this->db);
+			$acc->fetch($accountid);
 
-            //Fix me field
-            $total = $this->amount;
+			//Fix me field
+			$total = $this->amount;
 
-            if ($mode == 'payment_expensereport') $amount = $total;
+			if ($mode == 'payment_expensereport') $amount = $total;
 
-            // Insert payment into llx_bank
-            $bank_line_id = $acc->addline(
-                $this->datepaid,
-                $this->fk_typepayment, // Payment mode id or code ("CHQ or VIR for example")
-                $label,
-                -$amount,
-                $this->num_payment,
-                '',
-                $user,
-                $emetteur_nom,
-                $emetteur_banque
-            );
+			// Insert payment into llx_bank
+			$bank_line_id = $acc->addline(
+				$this->datepaid,
+				$this->fk_typepayment, // Payment mode id or code ("CHQ or VIR for example")
+				$label,
+				-$amount,
+				$this->num_payment,
+				'',
+				$user,
+				$emetteur_nom,
+				$emetteur_banque
+			);
 
-            // Update fk_bank in llx_paiement.
-            // On connait ainsi le paiement qui a genere l'ecriture bancaire
-            if ($bank_line_id > 0)
-            {
-                $result = $this->update_fk_bank($bank_line_id);
-                if ($result <= 0)
-                {
-                    $error++;
-                    dol_print_error($this->db);
-                }
+			// Update fk_bank in llx_paiement.
+			// On connait ainsi le paiement qui a genere l'ecriture bancaire
+			if ($bank_line_id > 0)
+			{
+				$result = $this->update_fk_bank($bank_line_id);
+				if ($result <= 0)
+				{
+					$error++;
+					dol_print_error($this->db);
+				}
 
-                // Add link 'payment', 'payment_supplier', 'payment_expensereport' in bank_url between payment and bank transaction
-                $url = '';
-                if ($mode == 'payment_expensereport') $url = DOL_URL_ROOT.'/expensereport/payment/card.php?rowid=';
-                if ($url)
-                {
-                    $result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
-                    if ($result <= 0)
-                    {
-                        $error++;
-                        dol_print_error($this->db);
-                    }
-                }
+				// Add link 'payment', 'payment_supplier', 'payment_expensereport' in bank_url between payment and bank transaction
+				$url = '';
+				if ($mode == 'payment_expensereport') $url = DOL_URL_ROOT.'/expensereport/payment/card.php?rowid=';
+				if ($url)
+				{
+					$result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
+					if ($result <= 0)
+					{
+						$error++;
+						dol_print_error($this->db);
+					}
+				}
 
-                // Add link 'user' in bank_url between user and bank transaction
-                if (!$error)
-                {
-                    foreach ($this->amounts as $key => $value)  // We should have always same user but we loop in case of.
-                    {
-                    	if ($mode == 'payment_expensereport')
-                        {
-                        	$fuser = new User($this->db);
-                            $fuser->fetch($key);
+				// Add link 'user' in bank_url between user and bank transaction
+				if (!$error)
+				{
+					foreach ($this->amounts as $key => $value)  // We should have always same user but we loop in case of.
+					{
+						if ($mode == 'payment_expensereport')
+						{
+							$fuser = new User($this->db);
+							$fuser->fetch($key);
 
-                            $result = $acc->add_url_line(
-                                $bank_line_id,
-                                $fuser->id,
-                                DOL_URL_ROOT.'/user/card.php?id=',
-                                $fuser->getFullName($langs),
-                                'user'
-                            );
-                            if ($result <= 0)
-                            {
-                            	$this->error = $this->db->lasterror();
-                            	dol_syslog(get_class($this).'::addPaymentToBank '.$this->error);
-                            	$error++;
-                            }
-                        }
-                    }
-                }
-            } else {
-                $this->error = $acc->error;
-                $error++;
-            }
-        }
+							$result = $acc->add_url_line(
+								$bank_line_id,
+								$fuser->id,
+								DOL_URL_ROOT.'/user/card.php?id=',
+								$fuser->getFullName($langs),
+								'user'
+							);
+							if ($result <= 0)
+							{
+								$this->error = $this->db->lasterror();
+								dol_syslog(get_class($this).'::addPaymentToBank '.$this->error);
+								$error++;
+							}
+						}
+					}
+				}
+			} else {
+				$this->error = $acc->error;
+				$error++;
+			}
+		}
 
-        if (!$error)
-        {
-            return 1;
-        } else {
-            return -1;
-        }
-    }
+		if (!$error)
+		{
+			return 1;
+		} else {
+			return -1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Update link between the expense report payment and the generated line in llx_bank
 	 *
@@ -586,7 +586,7 @@ class PaymentExpenseReport extends CommonObject
 	 */
 	public function update_fk_bank($id_bank)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."payment_expensereport SET fk_bank = ".$id_bank." WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::update_fk_bank", LOG_DEBUG);
@@ -614,14 +614,14 @@ class PaymentExpenseReport extends CommonObject
 		$result = '';
 
 		if (empty($this->ref)) $this->ref = $this->label;
-        $label = $langs->trans("ShowPayment").': '.$this->ref;
+		$label = $langs->trans("ShowPayment").': '.$this->ref;
 
 		if (!empty($this->id))
 		{
 			$link = '<a href="'.DOL_URL_ROOT.'/expensereport/payment/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 			$linkend = '</a>';
 
-            if ($withpicto) $result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
+			if ($withpicto) $result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
 			if ($withpicto && $withpicto != 2) $result .= ' ';
 			if ($withpicto != 2) $result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
 		}
@@ -635,8 +635,8 @@ class PaymentExpenseReport extends CommonObject
 	 *    @param   int     $id      Payment id
 	 *    @return  void
 	 */
-    public function info($id)
-    {
+	public function info($id)
+	{
 		$sql = 'SELECT e.rowid, e.datec, e.fk_user_creat, e.fk_user_modif, e.tms';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'payment_expensereport as e';
 		$sql .= ' WHERE e.rowid = '.$id;
@@ -669,5 +669,5 @@ class PaymentExpenseReport extends CommonObject
 		} else {
 			dol_print_error($this->db);
 		}
-    }
+	}
 }
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index 6814c0a5b0d..55799b10589 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -110,7 +110,7 @@ if ($object->id)
 
 	$head = expensereport_prepare_head($object);
 
-	dol_fiche_head($head, 'documents', $langs->trans("ExpenseReport"), -1, 'trip');
+	print dol_get_fiche_head($head, 'documents', $langs->trans("ExpenseReport"), -1, 'trip');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
@@ -132,24 +132,24 @@ if ($object->id)
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border tableforfield centpercent">';
+	print '<table class="border tableforfield centpercent">';
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-    print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-    print '</table>';
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
 
-    $modulepart = 'expensereport';
-    $permission = $user->rights->expensereport->creer;
-    $permtoedit = $user->rights->expensereport->creer;
-    $param = '&id='.$object->id;
-    include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	$modulepart = 'expensereport';
+	$permission = $user->rights->expensereport->creer;
+	$permtoedit = $user->rights->expensereport->creer;
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
 	print $langs->trans("ErrorUnknown");
 }
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 3c30154f7f1..046bde4efa1 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -80,11 +80,11 @@ $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as d, ".MAIN_DB_PREFIX."expensere
 $sql .= " WHERE de.fk_expensereport = d.rowid AND d.entity IN (".getEntity('expensereport').") AND de.fk_c_type_fees = tf.id";
 // RESTRICT RIGHTS
 if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
-    && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)))
+	&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)))
 {
-    $childids = $user->getAllChildIds();
-    $childids[] = $user->id;
-    $sql .= " AND d.fk_user_author IN (".join(',', $childids).")\n";
+	$childids = $user->getAllChildIds();
+	$childids[] = $user->id;
+	$sql .= " AND d.fk_user_author IN (".join(',', $childids).")\n";
 }
 
 $sql .= " GROUP BY tf.code, tf.label";
@@ -92,22 +92,22 @@ $sql .= " GROUP BY tf.code, tf.label";
 $result = $db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
-    $i = 0;
-    while ($i < $num)
-    {
-        $objp = $db->fetch_object($result);
+	$num = $db->num_rows($result);
+	$i = 0;
+	while ($i < $num)
+	{
+		$objp = $db->fetch_object($result);
 
-        $somme[$objp->code] = $objp->km;
-        $nb[$objp->code] = $objp->nb;
-        $label[$objp->code] = $objp->label;
-        $totalnb += $objp->nb;
-        $totalsum += $objp->km;
-        $i++;
-    }
-    $db->free($result);
+		$somme[$objp->code] = $objp->km;
+		$nb[$objp->code] = $objp->nb;
+		$label[$objp->code] = $objp->label;
+		$totalnb += $objp->nb;
+		$totalsum += $objp->km;
+		$i++;
+	}
+	$db->free($result);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
@@ -125,26 +125,26 @@ print "</tr>\n";
 $listoftype = $tripandexpense_static->listOfTypes();
 foreach ($listoftype as $code => $label)
 {
-    $dataseries[] = array($label, (isset($somme[$code]) ? (int) $somme[$code] : 0));
+	$dataseries[] = array($label, (isset($somme[$code]) ? (int) $somme[$code] : 0));
 }
 
 if ($conf->use_javascript_ajax)
 {
-    print '<tr><td class="center" colspan="4">';
+	print '<tr><td class="center" colspan="4">';
 
-    include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
-    $dolgraph = new DolGraph();
-    $dolgraph->SetData($dataseries);
-    $dolgraph->setHeight(350);
-    $dolgraph->combine = empty($conf->global->MAIN_EXPENSEREPORT_COMBINE_GRAPH_STAT) ? 0.05 : $conf->global->MAIN_EXPENSEREPORT_COMBINE_GRAPH_STAT;
-    $dolgraph->setShowLegend(2);
-    $dolgraph->setShowPercent(1);
-    $dolgraph->SetType(array('pie'));
-    $dolgraph->setHeight('200');
-    $dolgraph->draw('idgraphstatus');
-    print $dolgraph->show($totalnb ? 0 : 1);
+	include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+	$dolgraph = new DolGraph();
+	$dolgraph->SetData($dataseries);
+	$dolgraph->setHeight(350);
+	$dolgraph->combine = empty($conf->global->MAIN_EXPENSEREPORT_COMBINE_GRAPH_STAT) ? 0.05 : $conf->global->MAIN_EXPENSEREPORT_COMBINE_GRAPH_STAT;
+	$dolgraph->setShowLegend(2);
+	$dolgraph->setShowPercent(1);
+	$dolgraph->SetType(array('pie'));
+	$dolgraph->setHeight('200');
+	$dolgraph->draw('idgraphstatus');
+	print $dolgraph->show($totalnb ? 0 : 1);
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 print '<tr class="liste_total">';
@@ -165,18 +165,18 @@ $max = 10;
 
 $langs->load("boxes");
 
-$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.statut, u.photo, u.email, u.admin";
-$sql .= ", d.rowid, d.ref, d.date_debut as dated, d.date_fin as datef, d.date_create as dm, d.total_ht, d.total_ttc, d.fk_statut as fk_status";
+$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.statut as user_status, u.photo, u.email, u.admin,";
+$sql .= " d.rowid, d.ref, d.date_debut as dated, d.date_fin as datef, d.date_create as dm, d.total_ht, d.total_ttc, d.fk_statut as status";
 $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as d, ".MAIN_DB_PREFIX."user as u";
 if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql .= " WHERE u.rowid = d.fk_user_author";
 // RESTRICT RIGHTS
 if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
-    && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)))
+	&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)))
 {
-    $childids = $user->getAllChildIds();
-    $childids[] = $user->id;
-    $sql .= " AND d.fk_user_author IN (".join(',', $childids).")\n";
+	$childids = $user->getAllChildIds();
+	$childids[] = $user->id;
+	$sql .= " AND d.fk_user_author IN (".join(',', $childids).")\n";
 }
 $sql .= ' AND d.entity IN ('.getEntity('expensereport').')';
 if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND d.fk_user_author = s.rowid AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
@@ -187,56 +187,60 @@ $sql .= $db->plimit($max, 0);
 $result = $db->query($sql);
 if ($result)
 {
-    $var = false;
-    $num = $db->num_rows($result);
+	$var = false;
+	$num = $db->num_rows($result);
 
-    $i = 0;
+	$i = 0;
 
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<th colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses", min($max, $num)).'</th>';
-    print '<th class="right">'.$langs->trans("AmountHT").'</th>';
-    print '<th class="right">'.$langs->trans("AmountTTC").'</th>';
-    print '<th class="right">'.$langs->trans("DateModificationShort").'</th>';
-    print '<th>&nbsp;</th>';
-    print '</tr>';
-    if ($num)
-    {
-        $total_ttc = $totalam = $total = 0;
+	print '<tr class="liste_titre">';
+	print '<th colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses", min($max, $num)).'</th>';
+	print '<th class="right">'.$langs->trans("AmountHT").'</th>';
+	print '<th class="right">'.$langs->trans("AmountTTC").'</th>';
+	print '<th class="right">'.$langs->trans("DateModificationShort").'</th>';
+	print '<th>&nbsp;</th>';
+	print '</tr>';
+	if ($num)
+	{
+		$total_ttc = $totalam = $total = 0;
 
-        $expensereportstatic = new ExpenseReport($db);
-        $userstatic = new User($db);
-        while ($i < $num && $i < $max)
-        {
-            $obj = $db->fetch_object($result);
-            $expensereportstatic->id = $obj->rowid;
-            $expensereportstatic->ref = $obj->ref;
-            $userstatic->id = $obj->uid;
-            $userstatic->admin = $obj->admin;
-            $userstatic->email = $obj->email;
-            $userstatic->lastname = $obj->lastname;
-            $userstatic->firstname = $obj->firstname;
-            $userstatic->login = $obj->login;
-            $userstatic->statut = $obj->statut;
-            $userstatic->photo = $obj->photo;
-            print '<tr class="oddeven">';
-            print '<td>'.$expensereportstatic->getNomUrl(1).'</td>';
-            print '<td>'.$userstatic->getNomUrl(-1).'</td>';
-            print '<td class="right">'.price($obj->total_ht).'</td>';
-            print '<td class="right">'.price($obj->total_ttc).'</td>';
-            print '<td class="right">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>';
-            print '<td class="right">';
-			print $expensereportstatic->LibStatut($obj->fk_status, 3);
-            print '</td>';
-            print '</tr>';
+		$expensereportstatic = new ExpenseReport($db);
+		$userstatic = new User($db);
+		while ($i < $num && $i < $max)
+		{
+			$obj = $db->fetch_object($result);
 
-            $i++;
-        }
-    } else {
-        print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-    }
-    print '</table></div><br>';
+			$expensereportstatic->id = $obj->rowid;
+			$expensereportstatic->ref = $obj->ref;
+			$expensereportstatic->status = $obj->status;
+
+			$userstatic->id = $obj->uid;
+			$userstatic->admin = $obj->admin;
+			$userstatic->email = $obj->email;
+			$userstatic->lastname = $obj->lastname;
+			$userstatic->firstname = $obj->firstname;
+			$userstatic->login = $obj->login;
+			$userstatic->statut = $obj->user_status;
+			$userstatic->photo = $obj->photo;
+
+			print '<tr class="oddeven">';
+			print '<td>'.$expensereportstatic->getNomUrl(1).'</td>';
+			print '<td>'.$userstatic->getNomUrl(-1).'</td>';
+			print '<td class="right">'.price($obj->total_ht).'</td>';
+			print '<td class="right">'.price($obj->total_ttc).'</td>';
+			print '<td class="right">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>';
+			print '<td class="right">';
+			print $expensereportstatic->getLibStatut(3);
+			print '</td>';
+			print '</tr>';
+
+			$i++;
+		}
+	} else {
+		print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+	}
+	print '</table></div><br>';
 } else dol_print_error($db);
 
 print '</div></div></div>';
diff --git a/htdocs/expensereport/info.php b/htdocs/expensereport/info.php
index 0b50a69071f..53d1531f4b9 100644
--- a/htdocs/expensereport/info.php
+++ b/htdocs/expensereport/info.php
@@ -77,7 +77,7 @@ if ($id > 0 || !empty($ref))
 
 	$head = expensereport_prepare_head($object);
 
-	dol_fiche_head($head, 'info', $langs->trans("ExpenseReport"), -1, 'trip');
+	print dol_get_fiche_head($head, 'info', $langs->trans("ExpenseReport"), -1, 'trip');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
@@ -98,7 +98,7 @@ if ($id > 0 || !empty($ref))
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 0a264c59a2a..440fc4524a6 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -60,14 +60,14 @@ $id = GETPOST('id', 'int');
 // If we are on the view of a specific user
 if ($id > 0)
 {
-    $canread = 0;
-    if ($id == $user->id) $canread = 1;
-    if (!empty($user->rights->expensereport->readall)) $canread = 1;
-    if (!empty($user->rights->expensereport->lire) && in_array($id, $childids)) $canread = 1;
-    if (!$canread)
-    {
-        accessforbidden();
-    }
+	$canread = 0;
+	if ($id == $user->id) $canread = 1;
+	if (!empty($user->rights->expensereport->readall)) $canread = 1;
+	if (!empty($user->rights->expensereport->lire) && in_array($id, $childids)) $canread = 1;
+	if (!$canread)
+	{
+		accessforbidden();
+	}
 }
 
 $diroutputmassaction = $conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id;
@@ -117,27 +117,27 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-    'd.ref'=>'Ref',
-    'd.note_public'=>"NotePublic",
-    'u.lastname'=>'Lastname',
-    'u.firstname'=>"Firstname",
-    'u.login'=>"Login",
+	'd.ref'=>'Ref',
+	'd.note_public'=>"NotePublic",
+	'u.lastname'=>'Lastname',
+	'u.firstname'=>"Firstname",
+	'u.login'=>"Login",
 );
 if (empty($user->socid)) $fieldstosearchall["d.note_private"] = "NotePrivate";
 
 $arrayfields = array(
-    'd.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-    'user'=>array('label'=>$langs->trans("User"), 'checked'=>1),
-    'd.date_debut'=>array('label'=>$langs->trans("DateStart"), 'checked'=>1),
-    'd.date_fin'=>array('label'=>$langs->trans("DateEnd"), 'checked'=>1),
-    'd.date_valid'=>array('label'=>$langs->trans("DateValidation"), 'checked'=>1),
-    'd.date_approve'=>array('label'=>$langs->trans("DateApprove"), 'checked'=>1),
-    'd.total_ht'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1),
-    'd.total_vat'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>1),
-    'd.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>1),
-    'd.date_create'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-    'd.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
-    'd.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
+	'd.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+	'user'=>array('label'=>$langs->trans("User"), 'checked'=>1),
+	'd.date_debut'=>array('label'=>$langs->trans("DateStart"), 'checked'=>1),
+	'd.date_fin'=>array('label'=>$langs->trans("DateEnd"), 'checked'=>1),
+	'd.date_valid'=>array('label'=>$langs->trans("DateValidation"), 'checked'=>1),
+	'd.date_approve'=>array('label'=>$langs->trans("DateApprove"), 'checked'=>1),
+	'd.total_ht'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1),
+	'd.total_vat'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>1),
+	'd.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>1),
+	'd.date_create'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
+	'd.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
+	'd.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
 );
 // Extra fields
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
@@ -173,19 +173,19 @@ if (empty($reshook))
 	// Purge search criteria
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 	{
-	    $search_ref = "";
-	    $search_user = "";
-	    $search_amount_ht = "";
-	    $search_amount_vat = "";
-	    $search_amount_ttc = "";
-	    $search_status = "";
-	    $month_start = "";
-	    $year_start = "";
-	    $month_end = "";
-	    $year_end = "";
-	    $day_end = "";
-	    $toselect = '';
-	    $search_array_options = array();
+		$search_ref = "";
+		$search_user = "";
+		$search_amount_ht = "";
+		$search_amount_vat = "";
+		$search_amount_ttc = "";
+		$search_status = "";
+		$month_start = "";
+		$year_start = "";
+		$month_end = "";
+		$year_end = "";
+		$day_end = "";
+		$toselect = '';
+		$search_array_options = array();
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
 		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
@@ -194,12 +194,12 @@ if (empty($reshook))
 	}
 
 	// Mass actions
-    $objectclass = 'ExpenseReport';
-    $objectlabel = 'ExpenseReport';
-    $permissiontoread = $user->rights->expensereport->lire;
-    $permissiontodelete = $user->rights->expensereport->supprimer;
-    $uploaddir = $conf->expensereport->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+	$objectclass = 'ExpenseReport';
+	$objectlabel = 'ExpenseReport';
+	$permissiontoread = $user->rights->expensereport->lire;
+	$permissiontodelete = $user->rights->expensereport->supprimer;
+	$uploaddir = $conf->expensereport->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 
@@ -265,7 +265,7 @@ if ($search_user != '' && $search_user >= 0) $sql .= " AND u.rowid = '".$db->esc
 if ($search_status != '' && $search_status >= 0) $sql .= " AND d.fk_statut IN (".$db->sanitize($db->escape($search_status)).")";
 // RESTRICT RIGHTS
 if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
-    && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)))
+	&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)))
 {
 	$sql .= " AND d.fk_user_author IN (".join(',', $childids).")\n";
 }
@@ -282,13 +282,13 @@ $sql .= $db->order($sortfield, $sortorder);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-    	$page = 0;
-    	$offset = 0;
-    }
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -302,7 +302,7 @@ if ($resql)
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
 	$param = '';
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 	if ($sall)					$param .= "&sall=".urlencode($sall);
 	if ($search_ref)			$param .= "&search_ref=".urlencode($search_ref);
@@ -317,8 +317,8 @@ if ($resql)
 	// List of mass actions available
 	$arrayofmassactions = array(
 		'generate_doc'=>$langs->trans("ReGeneratePDF"),
-	    'builddoc'=>$langs->trans("PDFMerge"),
-	    'presend'=>$langs->trans("SendByMail"),
+		'builddoc'=>$langs->trans("PDFMerge"),
+		'presend'=>$langs->trans("SendByMail"),
 	);
 	if ($user->rights->expensereport->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
@@ -326,12 +326,12 @@ if ($resql)
 
 	// Lines of title fields
 	print '<form id="searchFormList" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="'.($action == 'edit' ? 'update' : 'list').'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	if ($id > 0) print '<input type="hidden" name="id" value="'.$id.'">';
 
@@ -341,11 +341,11 @@ if ($resql)
 		$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 		$head = user_prepare_head($fuser);
 
-		dol_fiche_head($head, 'expensereport', $title, -1, 'user');
+		print dol_get_fiche_head($head, 'expensereport', $title, -1, 'user');
 
 		dol_banner_tab($fuser, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		if ($action != 'edit')
 		{
@@ -366,7 +366,7 @@ if ($resql)
 			print '</div>';
 		} else {
 			print '<div class="center">';
-			print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+			print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
 			print '</div><br>';
 		}
 	} else {
@@ -386,10 +386,10 @@ if ($resql)
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 	if ($sall)
-    {
-        foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
-        print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
-    }
+	{
+		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+	}
 
 	$moreforfilter = '';
 
@@ -400,90 +400,90 @@ if ($resql)
 
 	if (!empty($moreforfilter))
 	{
-	    print '<div class="liste_titre liste_titre_bydiv centpercent">';
-	    print $moreforfilter;
-	    print '</div>';
+		print '<div class="liste_titre liste_titre_bydiv centpercent">';
+		print $moreforfilter;
+		print '</div>';
 	}
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 	$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-    print '<div class="div-table-responsive">';
+	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	// Filters
 	print '<tr class="liste_titre_filter">';
 	if (!empty($arrayfields['d.ref']['checked']))
 	{
-    	print '<td class="liste_titre" align="left">';
-    	print '<input class="flat" size="15" type="text" name="search_ref" value="'.$search_ref.'">';
-        print '</td>';
+		print '<td class="liste_titre" align="left">';
+		print '<input class="flat" size="15" type="text" name="search_ref" value="'.$search_ref.'">';
+		print '</td>';
 	}
 	// User
 	if (!empty($arrayfields['user']['checked']))
 	{
-        if ($user->rights->expensereport->readall || $user->rights->expensereport->lire_tous)
-    	{
-    		print '<td class="liste_titre maxwidthonspartphone" align="left">';
-    		print $form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
-    		print '</td>';
-    	} else {
-    		print '<td class="liste_titre">&nbsp;</td>';
-    	}
+		if ($user->rights->expensereport->readall || $user->rights->expensereport->lire_tous)
+		{
+			print '<td class="liste_titre maxwidthonspartphone" align="left">';
+			print $form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
+			print '</td>';
+		} else {
+			print '<td class="liste_titre">&nbsp;</td>';
+		}
 	}
 	// Date start
 	if (!empty($arrayfields['d.date_debut']['checked']))
 	{
-    	print '<td class="liste_titre" align="center">';
-        if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
-            print '<input class="flat width25" type="text" maxlength="2" name="day_start" value="'.dol_escape_htmltag($day_start).'">';
-        }
+		print '<td class="liste_titre" align="center">';
+		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+			print '<input class="flat width25" type="text" maxlength="2" name="day_start" value="'.dol_escape_htmltag($day_start).'">';
+		}
 
-    	print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="month_start" value="'.$month_start.'">';
-    	$formother->select_year($year_start, 'year_start', 1, $min_year, $max_year);
-    	print '</td>';
+		print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="month_start" value="'.$month_start.'">';
+		$formother->select_year($year_start, 'year_start', 1, $min_year, $max_year);
+		print '</td>';
 	}
 	// Date end
 	if (!empty($arrayfields['d.date_fin']['checked']))
 	{
-    	print '<td class="liste_titre" align="center">';
+		print '<td class="liste_titre" align="center">';
 		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
 			print '<input class="flat width25" type="text" maxlength="2" name="day_end" value="'.dol_escape_htmltag($day_end).'">';
 		}
 		print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="month_end" value="'.$month_end.'">';
-    	$formother->select_year($year_end, 'year_end', 1, $min_year, $max_year);
-    	print '</td>';
-    }
+		$formother->select_year($year_end, 'year_end', 1, $min_year, $max_year);
+		print '</td>';
+	}
 	// Date valid
 	if (!empty($arrayfields['d.date_valid']['checked']))
 	{
-    	print '<td class="liste_titre" align="center">';
-    	//print '<input class="flat" type="text" size="1" maxlength="2" name="month_end" value="'.$month_end.'">';
-    	//$formother->select_year($year_end,'year_end',1, $min_year, $max_year);
-    	print '</td>';
-    }
+		print '<td class="liste_titre" align="center">';
+		//print '<input class="flat" type="text" size="1" maxlength="2" name="month_end" value="'.$month_end.'">';
+		//$formother->select_year($year_end,'year_end',1, $min_year, $max_year);
+		print '</td>';
+	}
 	// Date approve
 	if (!empty($arrayfields['d.date_approve']['checked']))
 	{
-    	print '<td class="liste_titre" align="center">';
-    	//print '<input class="flat" type="text" size="1" maxlength="2" name="month_end" value="'.$month_end.'">';
-    	//$formother->select_year($year_end,'year_end',1, $min_year, $max_year);
-    	print '</td>';
-    }
-    // Amount with no tax
+		print '<td class="liste_titre" align="center">';
+		//print '<input class="flat" type="text" size="1" maxlength="2" name="month_end" value="'.$month_end.'">';
+		//$formother->select_year($year_end,'year_end',1, $min_year, $max_year);
+		print '</td>';
+	}
+	// Amount with no tax
 	if (!empty($arrayfields['d.total_ht']['checked']))
 	{
-    	print '<td class="liste_titre right"><input class="flat" type="text" size="5" name="search_amount_ht" value="'.$search_amount_ht.'"></td>';
+		print '<td class="liste_titre right"><input class="flat" type="text" size="5" name="search_amount_ht" value="'.$search_amount_ht.'"></td>';
 	}
 	if (!empty($arrayfields['d.total_vat']['checked']))
 	{
-	    print '<td class="liste_titre right"><input class="flat" type="text" size="5" name="search_amount_vat" value="'.$search_amount_vat.'"></td>';
+		print '<td class="liste_titre right"><input class="flat" type="text" size="5" name="search_amount_vat" value="'.$search_amount_vat.'"></td>';
 	}
 	// Amount with all taxes
 	if (!empty($arrayfields['d.total_ttc']['checked']))
 	{
-	    print '<td class="liste_titre right"><input class="flat" type="text" size="5" name="search_amount_ttc" value="'.$search_amount_ttc.'"></td>';
+		print '<td class="liste_titre right"><input class="flat" type="text" size="5" name="search_amount_ttc" value="'.$search_amount_ttc.'"></td>';
 	}
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -495,21 +495,21 @@ if ($resql)
 	// Date creation
 	if (!empty($arrayfields['d.date_create']['checked']))
 	{
-	    print '<td class="liste_titre">';
-	    print '</td>';
+		print '<td class="liste_titre">';
+		print '</td>';
 	}
 	// Date modification
 	if (!empty($arrayfields['d.tms']['checked']))
 	{
-	    print '<td class="liste_titre">';
-	    print '</td>';
+		print '<td class="liste_titre">';
+		print '</td>';
 	}
 	// Status
 	if (!empty($arrayfields['d.fk_statut']['checked']))
 	{
-    	print '<td class="liste_titre right">';
-    	$formexpensereport->selectExpensereportStatus($search_status, 'search_status', 1, 1);
-    	print '</td>';
+		print '<td class="liste_titre right">';
+		$formexpensereport->selectExpensereportStatus($search_status, 'search_status', 1, 1);
+		print '</td>';
 	}
 	// Action column
 	print '<td class="liste_titre maxwidthsearch">';
@@ -550,9 +550,9 @@ if ($resql)
 
 	if ($num > 0)
 	{
-        $i = 0;
-    	$totalarray = array();
- 	    while ($i < min($num, $limit))
+		$i = 0;
+		$totalarray = array();
+ 		while ($i < min($num, $limit))
 		{
 			$obj = $db->fetch_object($resql);
 
@@ -572,130 +572,130 @@ if ($resql)
 			print '<tr class="oddeven">';
 			// Ref
 			if (!empty($arrayfields['d.ref']['checked'])) {
-    			print '<td>';
-                print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-                print '<td class="nobordernopadding nowrap">';
-    			print $expensereportstatic->getNomUrl(1);
-    			print '</td>';
-    			// Warning late icon and note
-        		print '<td class="nobordernopadding nowrap">';
-    			if ($expensereportstatic->status == 2 && $expensereportstatic->hasDelay('toappove')) print img_warning($langs->trans("Late"));
-    			if ($expensereportstatic->status == 5 && $expensereportstatic->hasDelay('topay')) print img_warning($langs->trans("Late"));
-    			if (!empty($obj->note_private) || !empty($obj->note_public))
-    			{
-    			    print ' <span class="note">';
-    			    print '<a href="'.DOL_URL_ROOT.'/expensereport/note.php?id='.$obj->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"), 'object_generic').'</a>';
-    			    print '</span>';
-    			}
-    			print '</td>';
-    			print '<td width="16" class="nobordernopadding hideonsmartphone right">';
-    			$filename = dol_sanitizeFileName($obj->ref);
-    			$filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($obj->ref);
-    			$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
-    			print $formfile->getDocumentsLink($expensereportstatic->element, $filename, $filedir);
-    			print '</td>';
-    			print '</tr></table>';
-    			print '</td>';
-    			if (!$i) $totalarray['nbfield']++;
+				print '<td>';
+				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+				print '<td class="nobordernopadding nowrap">';
+				print $expensereportstatic->getNomUrl(1);
+				print '</td>';
+				// Warning late icon and note
+				print '<td class="nobordernopadding nowrap">';
+				if ($expensereportstatic->status == 2 && $expensereportstatic->hasDelay('toappove')) print img_warning($langs->trans("Late"));
+				if ($expensereportstatic->status == 5 && $expensereportstatic->hasDelay('topay')) print img_warning($langs->trans("Late"));
+				if (!empty($obj->note_private) || !empty($obj->note_public))
+				{
+					print ' <span class="note">';
+					print '<a href="'.DOL_URL_ROOT.'/expensereport/note.php?id='.$obj->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"), 'object_generic').'</a>';
+					print '</span>';
+				}
+				print '</td>';
+				print '<td width="16" class="nobordernopadding hideonsmartphone right">';
+				$filename = dol_sanitizeFileName($obj->ref);
+				$filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($obj->ref);
+				$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
+				print $formfile->getDocumentsLink($expensereportstatic->element, $filename, $filedir);
+				print '</td>';
+				print '</tr></table>';
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 			// User
 			if (!empty($arrayfields['user']['checked'])) {
-			    print '<td class="left">';
-    			$usertmp->id = $obj->id_user;
-    			$usertmp->lastname = $obj->lastname;
-    			$usertmp->firstname = $obj->firstname;
-    			$usertmp->login = $obj->login;
-    			$usertmp->statut = $obj->statut;
-    			$usertmp->photo = $obj->photo;
-    			$usertmp->email = $obj->email;
-    			print $usertmp->getNomUrl(-1);
-    			print '</td>';
-    			if (!$i) $totalarray['nbfield']++;
+				print '<td class="left">';
+				$usertmp->id = $obj->id_user;
+				$usertmp->lastname = $obj->lastname;
+				$usertmp->firstname = $obj->firstname;
+				$usertmp->login = $obj->login;
+				$usertmp->statut = $obj->statut;
+				$usertmp->photo = $obj->photo;
+				$usertmp->email = $obj->email;
+				print $usertmp->getNomUrl(-1);
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 			// Start date
 			if (!empty($arrayfields['d.date_debut']['checked'])) {
-                print '<td class="center">'.($obj->date_debut > 0 ? dol_print_date($db->jdate($obj->date_debut), 'day') : '').'</td>';
-                if (!$i) $totalarray['nbfield']++;
-            }
-            // End date
+				print '<td class="center">'.($obj->date_debut > 0 ? dol_print_date($db->jdate($obj->date_debut), 'day') : '').'</td>';
+				if (!$i) $totalarray['nbfield']++;
+			}
+			// End date
 			if (!empty($arrayfields['d.date_fin']['checked'])) {
-			    print '<td class="center">'.($obj->date_fin > 0 ? dol_print_date($db->jdate($obj->date_fin), 'day') : '').'</td>';
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="center">'.($obj->date_fin > 0 ? dol_print_date($db->jdate($obj->date_fin), 'day') : '').'</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 			// Date validation
 			if (!empty($arrayfields['d.date_valid']['checked'])) {
-			    print '<td class="center">'.($obj->date_valid > 0 ? dol_print_date($db->jdate($obj->date_valid), 'day') : '').'</td>';
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="center">'.($obj->date_valid > 0 ? dol_print_date($db->jdate($obj->date_valid), 'day') : '').'</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 			// Date approval
 			if (!empty($arrayfields['d.date_approve']['checked'])) {
-			    print '<td class="center">'.($obj->date_approve > 0 ? dol_print_date($db->jdate($obj->date_approve), 'day') : '').'</td>';
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="center">'.($obj->date_approve > 0 ? dol_print_date($db->jdate($obj->date_approve), 'day') : '').'</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 			// Amount HT
-            if (!empty($arrayfields['d.total_ht']['checked']))
-            {
-    		      print '<td class="right">'.price($obj->total_ht)."</td>\n";
-    		      if (!$i) $totalarray['nbfield']++;
-    		      if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'd.total_ht';
-    		      $totalarray['val']['d.total_ht'] += $obj->total_ht;
-            }
-            // Amount VAT
-            if (!empty($arrayfields['d.total_vat']['checked']))
-            {
-                print '<td class="right">'.price($obj->total_tva)."</td>\n";
-                if (!$i) $totalarray['nbfield']++;
-                if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'd.total_tva';
-                $totalarray['val']['d.total_tva'] += $obj->total_tva;
-            }
-            // Amount TTC
-            if (!empty($arrayfields['d.total_ttc']['checked']))
-            {
-                print '<td class="right">'.price($obj->total_ttc)."</td>\n";
-                if (!$i) $totalarray['nbfield']++;
-                if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'd.total_ttc';
-                $totalarray['val']['d.total_ttc'] += $obj->total_ttc;
-            }
+			if (!empty($arrayfields['d.total_ht']['checked']))
+			{
+				  print '<td class="right">'.price($obj->total_ht)."</td>\n";
+				  if (!$i) $totalarray['nbfield']++;
+				  if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'd.total_ht';
+				  $totalarray['val']['d.total_ht'] += $obj->total_ht;
+			}
+			// Amount VAT
+			if (!empty($arrayfields['d.total_vat']['checked']))
+			{
+				print '<td class="right">'.price($obj->total_tva)."</td>\n";
+				if (!$i) $totalarray['nbfield']++;
+				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'd.total_tva';
+				$totalarray['val']['d.total_tva'] += $obj->total_tva;
+			}
+			// Amount TTC
+			if (!empty($arrayfields['d.total_ttc']['checked']))
+			{
+				print '<td class="right">'.price($obj->total_ttc)."</td>\n";
+				if (!$i) $totalarray['nbfield']++;
+				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'd.total_ttc';
+				$totalarray['val']['d.total_ttc'] += $obj->total_ttc;
+			}
 
-            // Extra fields
-            include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-            // Fields from hook
-            $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-            $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
-            print $hookmanager->resPrint;
+			// Extra fields
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+			// Fields from hook
+			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
 
-            // Date creation
-            if (!empty($arrayfields['d.date_create']['checked']))
-            {
-                print '<td class="nowrap center">';
-                print dol_print_date($db->jdate($obj->date_create), 'dayhour');
-                print '</td>';
-                if (!$i) $totalarray['nbfield']++;
-            }
-            // Date modification
-            if (!empty($arrayfields['d.tms']['checked']))
-            {
-                print '<td class="nowrap center">';
-                print dol_print_date($db->jdate($obj->date_modif), 'dayhour');
-                print '</td>';
-                if (!$i) $totalarray['nbfield']++;
-            }
-            // Status
-            if (!empty($arrayfields['d.fk_statut']['checked']))
-            {
-                print '<td class="nowrap right">'.$expensereportstatic->getLibStatut(5).'</td>';
-                if (!$i) $totalarray['nbfield']++;
-            }
-            // Action column
-            print '<td class="nowrap center">';
-            if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-            {
-                $selected = 0;
-                if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
-                print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
-            }
-            print '</td>';
-            if (!$i) $totalarray['nbfield']++;
+			// Date creation
+			if (!empty($arrayfields['d.date_create']['checked']))
+			{
+				print '<td class="nowrap center">';
+				print dol_print_date($db->jdate($obj->date_create), 'dayhour');
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
+			}
+			// Date modification
+			if (!empty($arrayfields['d.tms']['checked']))
+			{
+				print '<td class="nowrap center">';
+				print dol_print_date($db->jdate($obj->date_modif), 'dayhour');
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
+			}
+			// Status
+			if (!empty($arrayfields['d.fk_statut']['checked']))
+			{
+				print '<td class="nowrap right">'.$expensereportstatic->getLibStatut(5).'</td>';
+				if (!$i) $totalarray['nbfield']++;
+			}
+			// Action column
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			{
+				$selected = 0;
+				if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 
 			print "</tr>\n";
 
@@ -721,7 +721,7 @@ if ($resql)
 	print $hookmanager->resPrint;
 
 	print '</table>'."\n";
-    print '</div>';
+	print '</div>';
 
 	print '</form>'."\n";
 
diff --git a/htdocs/expensereport/note.php b/htdocs/expensereport/note.php
index 171e8980fab..ebb66ce42fd 100644
--- a/htdocs/expensereport/note.php
+++ b/htdocs/expensereport/note.php
@@ -90,7 +90,7 @@ if ($id > 0 || !empty($ref))
 
 	$head = expensereport_prepare_head($object);
 
-	dol_fiche_head($head, 'note', $langs->trans("ExpenseReport"), -1, 'trip');
+	print dol_get_fiche_head($head, 'note', $langs->trans("ExpenseReport"), -1, 'trip');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
@@ -108,7 +108,7 @@ if ($id > 0 || !empty($ref))
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index 9bc50341973..14c95f2d68a 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -59,46 +59,10 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expensere
 	$db->begin();
 
 	$result = $object->delete($user);
-	if ($result > 0)
-	{
-        $db->commit();
-        header("Location: ".DOL_URL_ROOT."/expensereport/index.php");
-        exit;
-	} else {
-		setEventMessages($object->error, $object->errors, 'errors');
-        $db->rollback();
-	}
-}
-
-// Create payment
-if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->expensereport->creer)
-{
-	$db->begin();
-
-	$result = $object->valide();
-
 	if ($result > 0)
 	{
 		$db->commit();
-
-		$factures = array(); // TODO Get all id of invoices linked to this payment
-		foreach ($factures as $invoiceid)
-		{
-			$fac = new Facture($db);
-			$fac->fetch($invoiceid);
-
-			$outputlangs = $langs;
-			if (!empty($_REQUEST['lang_id']))
-			{
-				$outputlangs = new Translate("", $conf);
-				$outputlangs->setDefaultLang($_REQUEST['lang_id']);
-			}
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-				$fac->generateDocument($fac->model_pdf, $outputlangs);
-			}
-		}
-
-		header('Location: card.php?id='.$object->id);
+		header("Location: ".DOL_URL_ROOT."/expensereport/index.php");
 		exit;
 	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
@@ -117,7 +81,7 @@ $form = new Form($db);
 
 $head = payment_expensereport_prepare_head($object);
 
-dol_fiche_head($head, 'payment', $langs->trans("ExpenseReportPayment"), -1, 'payment');
+print dol_get_fiche_head($head, 'payment', $langs->trans("ExpenseReportPayment"), -1, 'payment');
 
 /*
  * Confirm deleting of the payment
@@ -127,15 +91,6 @@ if ($action == 'delete')
 	print $form->formconfirm('card.php?id='.$object->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete', '', 0, 2);
 }
 
-/*
- * Confirm validation of the payment
- */
-if ($action == 'valide')
-{
-	$facid = $_GET['facid'];
-	print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide', '', 0, 2);
-}
-
 $linkback = '';
 // $linkback = '<a href="' . DOL_URL_ROOT . '/expensereport/payment/list.php">' . $langs->trans("BackToList") . '</a>';
 
@@ -165,39 +120,39 @@ $disable_delete = 0;
 // Bank account
 if (!empty($conf->banque->enabled))
 {
-    if ($object->bank_account)
-    {
-    	$bankline = new AccountLine($db);
-    	$bankline->fetch($object->bank_line);
-        if ($bankline->rappro)
-        {
-            $disable_delete = 1;
-            $title_button = dol_escape_htmltag($langs->transnoentitiesnoconv("CantRemoveConciliatedPayment"));
-        }
+	if ($object->bank_account)
+	{
+		$bankline = new AccountLine($db);
+		$bankline->fetch($object->bank_line);
+		if ($bankline->rappro)
+		{
+			$disable_delete = 1;
+			$title_button = dol_escape_htmltag($langs->transnoentitiesnoconv("CantRemoveConciliatedPayment"));
+		}
 
-    	print '<tr>';
-    	print '<td>'.$langs->trans('BankTransactionLine').'</td>';
+		print '<tr>';
+		print '<td>'.$langs->trans('BankTransactionLine').'</td>';
 		print '<td colspan="3">';
 		print $bankline->getNomUrl(1, 0, 'showconciliated');
-    	print '</td>';
-    	print '</tr>';
+		print '</td>';
+		print '</tr>';
 
-    	print '<tr>';
-    	print '<td>'.$langs->trans('BankAccount').'</td>';
+		print '<tr>';
+		print '<td>'.$langs->trans('BankAccount').'</td>';
 		print '<td colspan="3">';
 		$accountstatic = new Account($db);
 		$accountstatic->fetch($bankline->fk_account);
-        print $accountstatic->getNomUrl(1);
-    	print '</td>';
-    	print '</tr>';
-    }
+		print $accountstatic->getNomUrl(1);
+		print '</td>';
+		print '</tr>';
+	}
 }
 
 print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 /*
diff --git a/htdocs/expensereport/payment/info.php b/htdocs/expensereport/payment/info.php
index b548eb54be2..a654c77b6cd 100644
--- a/htdocs/expensereport/payment/info.php
+++ b/htdocs/expensereport/payment/info.php
@@ -56,7 +56,7 @@ $object->info($object->id);
 
 $head = payment_expensereport_prepare_head($object);
 
-dol_fiche_head($head, 'info', $langs->trans("ExpenseReportPayment"), -1, 'payment');
+print dol_get_fiche_head($head, 'info', $langs->trans("ExpenseReportPayment"), -1, 'payment');
 
 
 //$linkback = '<a href="' . DOL_URL_ROOT . '/expensereport/payment/list.php">' . $langs->trans("BackToList") . '</a>';
@@ -75,7 +75,7 @@ print '</td></tr></table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index c17f3ec10ee..fdaeaf68977 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -80,11 +80,11 @@ if ($action == 'add_payment')
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
 		$error++;
 	}
-    if (!empty($conf->banque->enabled) && !($accountid > 0))
-    {
-        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToDebit")), null, 'errors');
-        $error++;
-    }
+	if (!empty($conf->banque->enabled) && !($accountid > 0))
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToDebit")), null, 'errors');
+		$error++;
+	}
 
 	if (!$error)
 	{
@@ -101,67 +101,67 @@ if ($action == 'add_payment')
 			}
 		}
 
-        if (count($amounts) <= 0)
-        {
-            $error++;
-            $errmsg = 'ErrorNoPaymentDefined';
-        }
+		if (count($amounts) <= 0)
+		{
+			$error++;
+			$errmsg = 'ErrorNoPaymentDefined';
+		}
 
-        if (!$error)
-        {
-    		$db->begin();
+		if (!$error)
+		{
+			$db->begin();
 
-    		// Create a line of payments
-    		$payment = new PaymentExpenseReport($db);
-    		$payment->fk_expensereport = $expensereport->id;
-    		$payment->datepaid       = $datepaid;
-    		$payment->amounts        = $amounts; // Tableau de montant
-    		$payment->total          = $total;
-    		$payment->fk_typepayment = GETPOST("fk_typepayment", 'int');
-    		$payment->num_payment    = GETPOST("num_payment", 'alphanothtml');
-    		$payment->note_public    = GETPOST("note_public", 'restricthtml');
+			// Create a line of payments
+			$payment = new PaymentExpenseReport($db);
+			$payment->fk_expensereport = $expensereport->id;
+			$payment->datepaid       = $datepaid;
+			$payment->amounts        = $amounts; // Tableau de montant
+			$payment->total          = $total;
+			$payment->fk_typepayment = GETPOST("fk_typepayment", 'int');
+			$payment->num_payment    = GETPOST("num_payment", 'alphanothtml');
+			$payment->note_public    = GETPOST("note_public", 'restricthtml');
 
-    		if (!$error)
-    		{
-    		    $paymentid = $payment->create($user);
-                if ($paymentid < 0)
-                {
-                	setEventMessages($payment->error, $payment->errors, 'errors');
-                    $error++;
-                }
-    		}
+			if (!$error)
+			{
+				$paymentid = $payment->create($user);
+				if ($paymentid < 0)
+				{
+					setEventMessages($payment->error, $payment->errors, 'errors');
+					$error++;
+				}
+			}
 
-            if (!$error)
-            {
-                $result = $payment->addPaymentToBank($user, 'payment_expensereport', '(ExpenseReportPayment)', $accountid, '', '');
-                if (!$result > 0)
-                {
-                	setEventMessages($payment->error, $payment->errors, 'errors');
-                    $error++;
-                }
-            }
+			if (!$error)
+			{
+				$result = $payment->addPaymentToBank($user, 'payment_expensereport', '(ExpenseReportPayment)', $accountid, '', '');
+				if (!$result > 0)
+				{
+					setEventMessages($payment->error, $payment->errors, 'errors');
+					$error++;
+				}
+			}
 
-            if (!$error) {
-                $payment->fetch($paymentid);
-                if ($expensereport->total_ttc - $payment->amount == 0) {
-                    $result = $expensereport->set_paid($expensereport->id, $user);
-                    if (!$result > 0) {
-                    	setEventMessages($payment->error, $payment->errors, 'errors');
-                        $error++;
-                    }
-                }
-            }
+			if (!$error) {
+				$payment->fetch($paymentid);
+				if ($expensereport->total_ttc - $payment->amount == 0) {
+					$result = $expensereport->set_paid($expensereport->id, $user);
+					if (!$result > 0) {
+						setEventMessages($payment->error, $payment->errors, 'errors');
+						$error++;
+					}
+				}
+			}
 
-    	    if (!$error)
-            {
-                $db->commit();
-                $loc = DOL_URL_ROOT.'/expensereport/card.php?id='.$id;
-                header('Location: '.$loc);
-                exit;
-            } else {
-                $db->rollback();
-            }
-        }
+			if (!$error)
+			{
+				$db->commit();
+				$loc = DOL_URL_ROOT.'/expensereport/card.php?id='.$id;
+				header('Location: '.$loc);
+				exit;
+			} else {
+				$db->rollback();
+			}
+		}
 	}
 
 	$action = 'create';
@@ -194,9 +194,9 @@ if ($action == 'create' || empty($action))
                         var amount = $(this).data("value");
 						document.getElementById($(this).data(\'rowid\')).value = amount ;
 					});';
-        print "\t});\n";
-        print "</script>\n";
-    }
+		print "\t});\n";
+		print "</script>\n";
+	}
 
 	print load_fiche_titre($langs->trans("DoPayment"));
 
@@ -206,17 +206,17 @@ if ($action == 'create' || empty($action))
 	print '<input type="hidden" name="chid" value="'.$expensereport->id.'">';
 	print '<input type="hidden" name="action" value="add_payment">';
 
-    dol_fiche_head(null, '0', '', -1);
+	print dol_get_fiche_head(null, '0', '', -1);
 
-    $linkback = '';
-    // $linkback = '<a href="' . DOL_URL_ROOT . '/expensereport/payment/list.php">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '';
+	// $linkback = '<a href="' . DOL_URL_ROOT . '/expensereport/payment/list.php">' . $langs->trans("BackToList") . '</a>';
 
-    dol_banner_tab($expensereport, 'ref', $linkback, 1, 'ref', 'ref', '');
+	dol_banner_tab($expensereport, 'ref', $linkback, 1, 'ref', 'ref', '');
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border centpercent">'."\n";
+	print '<table class="border centpercent">'."\n";
 
 	print '<tr><td class="titlefield">'.$langs->trans("Period").'</td><td>'.get_date_range($expensereport->date_debut, $expensereport->date_fin, "", $langs, 0).'</td></tr>';
 	print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($expensereport->total_ttc, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
@@ -224,7 +224,7 @@ if ($action == 'create' || empty($action))
 	$sql = "SELECT sum(p.amount) as total";
 	$sql .= " FROM ".MAIN_DB_PREFIX."payment_expensereport as p, ".MAIN_DB_PREFIX."expensereport as e";
 	$sql .= " WHERE p.fk_expensereport = e.rowid AND p.fk_expensereport = ".$id;
-    $sql .= ' AND e.entity IN ('.getEntity('expensereport').')';
+	$sql .= ' AND e.entity IN ('.getEntity('expensereport').')';
 	$resql = $db->query($sql);
 	if ($resql)
 	{
@@ -235,20 +235,20 @@ if ($action == 'create' || empty($action))
 	print '<tr><td>'.$langs->trans("AlreadyPaid").'</td><td>'.price($sumpaid, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
 	print '<tr><td class="tdtop">'.$langs->trans("RemainderToPay").'</td><td>'.price($total - $sumpaid, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
 
-    print '</table>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    dol_fiche_head();
+	print dol_get_fiche_head();
 
-    print '<table class="border centpercent">'."\n";
+	print '<table class="border centpercent">'."\n";
 
-    print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Date").'</td><td colspan="2">';
+	print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Date").'</td><td colspan="2">';
 	$datepaid = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'));
-	$datepayment = empty($conf->global->MAIN_AUTOFILL_DATE) ? (empty($_POST["remonth"]) ?-1 : $datepaid) : 0;
-	print $form->selectDate($datepayment, '', '', '', '', "add_payment", 1, 1);
+	$datepayment = ($datepaid == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datepaid);
+	print $form->selectDate($datepayment, '', '', '', 0, "add_payment", 1, 1);
 	print "</td>";
 	print '</tr>';
 
@@ -259,11 +259,11 @@ if ($action == 'create' || empty($action))
 
 	if (!empty($conf->banque->enabled))
 	{
-    	print '<tr>';
-    	print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
-    	print '<td colspan="2">';
-    	$form->select_comptes(GETPOSTISSET("accountid") ? GETPOST("accountid", "int") : $expensereport->accountid, "accountid", 0, '', 1); // Show open bank account list
-    	print '</td></tr>';
+		print '<tr>';
+		print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
+		print '<td colspan="2">';
+		$form->select_comptes(GETPOSTISSET("accountid") ? GETPOST("accountid", "int") : $expensereport->accountid, "accountid", 0, '', 2); // Show open bank account list
+		print '</td></tr>';
 	}
 
 	// Number
@@ -279,7 +279,7 @@ if ($action == 'create' || empty($action))
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<br>';
 
@@ -346,9 +346,9 @@ if ($action == 'create' || empty($action))
 	print "</table>";
 
 	print '<br><div class="center">';
-	print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+	print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print "</form>\n";
diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
index 2079a2bf045..f3a3e263fa7 100644
--- a/htdocs/expensereport/stats/index.php
+++ b/htdocs/expensereport/stats/index.php
@@ -34,8 +34,8 @@ $langs->loadLangs(array('trips', 'companies'));
 $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
 $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
-$mode = GETPOST("mode") ?GETPOST("mode") : 'customer';
-$object_status = GETPOST('object_status');
+$mode = GETPOSTISSET("mode") ? GETPOST("mode", 'aZ09') : 'customer';
+$object_status = GETPOST('object_status', 'intcomma');
 
 $userid = GETPOST('userid', 'int');
 $socid = GETPOST('socid', 'int'); if ($socid < 0) $socid = 0;
@@ -51,7 +51,7 @@ if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'expensereport', $id, '');
 
 $nowyear = strftime("%Y", dol_now());
-$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
+$year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
 //$startyear=$year-2;
 $startyear = $year - 1;
 $endyear = $year;
@@ -148,38 +148,38 @@ $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	$filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
 } else {
-    $filename_avg = $dir.'/ordersaverage-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
+	$filename_avg = $dir.'/ordersaverage-'.$year.'.png';
+	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
+	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
 }
 
 $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
 if (!$mesg)
 {
-    $px3->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px3->SetLegend($legend);
-    $px3->SetYLabel($langs->trans("AmountAverage"));
-    $px3->SetMaxValue($px3->GetCeilMaxValue());
-    $px3->SetMinValue($px3->GetFloorMinValue());
-    $px3->SetWidth($WIDTH);
-    $px3->SetHeight($HEIGHT);
-    $px3->SetShading(3);
-    $px3->SetHorizTickIncrement(1);
-    $px3->mode = 'depth';
-    $px3->SetTitle($langs->trans("AmountAverage"));
+	$px3->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px3->SetLegend($legend);
+	$px3->SetYLabel($langs->trans("AmountAverage"));
+	$px3->SetMaxValue($px3->GetCeilMaxValue());
+	$px3->SetMinValue($px3->GetFloorMinValue());
+	$px3->SetWidth($WIDTH);
+	$px3->SetHeight($HEIGHT);
+	$px3->SetShading(3);
+	$px3->SetHorizTickIncrement(1);
+	$px3->mode = 'depth';
+	$px3->SetTitle($langs->trans("AmountAverage"));
 
-    $px3->draw($filename_avg, $fileurl_avg);
+	$px3->draw($filename_avg, $fileurl_avg);
 }
 
 
@@ -187,7 +187,7 @@ if (!$mesg)
 $data = $stats->getAllByYear();
 $arrayyears = array();
 foreach ($data as $val) {
-    $arrayyears[$val['year']] = $val['year'];
+	$arrayyears[$val['year']] = $val['year'];
 }
 if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;
 
@@ -201,7 +201,7 @@ $h++;
 
 complete_head_from_modules($conf, $langs, null, $head, $h, 'trip_stats');
 
-dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
+print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
@@ -229,7 +229,7 @@ print '</td></tr>';
 // Status
 print '<tr><td class="left">'.$langs->trans("Status").'</td><td class="left">';
 $liststatus = $tmpexpensereport->statuts;
-print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'int'), -4, 0, 0, '', 1);
+print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'intcomma'), -4, 0, 0, '', 1);
 print '</td></tr>';
 // Year
 print '<tr><td>';
@@ -288,11 +288,11 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
 if ($mesg) { print $mesg; } else {
-    print $px1->show();
+	print $px1->show();
 	print "<br>\n";
 	print $px2->show();
-    print "<br>\n";
-    print $px3->show();
+	print "<br>\n";
+	print $px3->show();
 }
 print '</td></tr></table>';
 
@@ -301,7 +301,7 @@ print '</div></div></div>';
 print '<div style="clear:both"></div>';
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/expensereport/tpl/expensereport_addfile.tpl.php b/htdocs/expensereport/tpl/expensereport_addfile.tpl.php
index c1e9a4e0d90..9b2cd49faec 100644
--- a/htdocs/expensereport/tpl/expensereport_addfile.tpl.php
+++ b/htdocs/expensereport/tpl/expensereport_addfile.tpl.php
@@ -11,30 +11,30 @@ $permission = $user->rights->expensereport->creer;
 $savingdocmask = '';
 if (empty($conf->global->MAIN_DISABLE_SUGGEST_REF_AS_PREFIX))
 {
-    //var_dump($modulepart);
-    if (in_array($modulepart, array('facture_fournisseur', 'commande_fournisseur', 'facture', 'commande', 'propal', 'supplier_proposal', 'ficheinter', 'contract', 'expedition', 'project', 'project_task', 'expensereport', 'tax', 'produit', 'product_batch')))
-    {
-        $savingdocmask = dol_sanitizeFileName($object->ref).'-__file__';
-    }
+	//var_dump($modulepart);
+	if (in_array($modulepart, array('facture_fournisseur', 'commande_fournisseur', 'facture', 'commande', 'propal', 'supplier_proposal', 'ficheinter', 'contract', 'expedition', 'project', 'project_task', 'expensereport', 'tax', 'produit', 'product_batch')))
+	{
+		$savingdocmask = dol_sanitizeFileName($object->ref).'-__file__';
+	}
 }
 
 // Show upload form (document and links)
 $formfile->form_attach_new_file(
-    $_SERVER["PHP_SELF"].'?id='.$object->id,
-    'none',
-    0,
-    0,
-    $permission,
-    $conf->browser->layout == 'phone' ? 40 : 60,
-    $object,
-    '',
-    1,
-    $savingdocmask,
-    0,
-    'formuserfile',
-    'accept',
-    '',
-    1
-    );
+	$_SERVER["PHP_SELF"].'?id='.$object->id,
+	'none',
+	0,
+	0,
+	$permission,
+	$conf->browser->layout == 'phone' ? 40 : 60,
+	$object,
+	'',
+	1,
+	$savingdocmask,
+	0,
+	'formuserfile',
+	'accept',
+	'',
+	1
+	);
 
 print '</td></tr>';
diff --git a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
index f4f460719a0..04bb2a71990 100644
--- a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
+++ b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
@@ -2,137 +2,137 @@
 // Add line to select existing file
 if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
 {
-    print '<!-- expensereport_linktofile.tpl.php -->'."\n";
+	print '<!-- expensereport_linktofile.tpl.php -->'."\n";
 
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    $upload_dir = $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref);
-    $arrayoffiles = dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png|'.preg_quote(dol_sanitizeFileName($object->ref.'.pdf'), '/').')$');
-    $nbFiles = count($arrayoffiles);
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref);
+	$arrayoffiles = dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png|'.preg_quote(dol_sanitizeFileName($object->ref.'.pdf'), '/').')$');
+	$nbFiles = count($arrayoffiles);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 
-    if ($nbFiles > 0)
-    {
-        print '<tr class="trattachnewfilenow'.(empty($tredited) ? ' oddeven nohover' : ' '.$tredited).'"'.(!GETPOSTISSET('sendit') && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display: none"' : '').'>';
-        print '<td colspan="'.$colspan.'">';
-        //print '<span class="opacitymedium">'.$langs->trans("AttachTheNewLineToTheDocument").'</span><br>';
-        $modulepart = 'expensereport'; $maxheightmini = 48;
-        $relativepath = (!empty($object->ref) ?dol_sanitizeFileName($object->ref) : '').'/';
-        $filei = 0;
-        foreach ($arrayoffiles as $file)
-        {
-            $urlforhref = array();
-            $filei++;
+	if ($nbFiles > 0)
+	{
+		print '<tr class="trattachnewfilenow'.(empty($tredited) ? ' oddeven nohover' : ' '.$tredited).'"'.(!GETPOSTISSET('sendit') && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display: none"' : '').'>';
+		print '<td colspan="'.$colspan.'">';
+		//print '<span class="opacitymedium">'.$langs->trans("AttachTheNewLineToTheDocument").'</span><br>';
+		$modulepart = 'expensereport'; $maxheightmini = 48;
+		$relativepath = (!empty($object->ref) ?dol_sanitizeFileName($object->ref) : '').'/';
+		$filei = 0;
+		foreach ($arrayoffiles as $file)
+		{
+			$urlforhref = array();
+			$filei++;
 
-            print '<div class="inline-block margintoponly marginleftonly marginrightonly center valigntop">';
-            $fileinfo = pathinfo($file['fullname']);
-            if (image_format_supported($file['name']) > 0)
-            {
-                $minifile = getImageFileNameForSize($file['name'], '_mini'); // For new thumbs using same ext (in lower case however) than original
-                //print $file['path'].'/'.$minifile.'<br>';
-                $urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
-                if (empty($urlforhref)) {
-                    $urlforhref = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($fileinfo['relativename'].'.'.strtolower($fileinfo['extension']));
-                    print '<a href="'.$urlforhref.'" class="aphoto" target="_blank">';
-                } else {
-                    print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
-                }
-                print '<div class="photoref backgroundblank">';
-                print '<img class="photoexpensereport photorefcenter" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$minifile).'" title="">';
-                print '</div>';
-                print '</a>';
-            } else {
-                $error = 0;
-                $thumbshown = '';
+			print '<div class="inline-block margintoponly marginleftonly marginrightonly center valigntop">';
+			$fileinfo = pathinfo($file['fullname']);
+			if (image_format_supported($file['name']) > 0)
+			{
+				$minifile = getImageFileNameForSize($file['name'], '_mini'); // For new thumbs using same ext (in lower case however) than original
+				//print $file['path'].'/'.$minifile.'<br>';
+				$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
+				if (empty($urlforhref)) {
+					$urlforhref = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($fileinfo['relativename'].'.'.strtolower($fileinfo['extension']));
+					print '<a href="'.$urlforhref.'" class="aphoto" target="_blank">';
+				} else {
+					print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
+				}
+				print '<div class="photoref backgroundblank">';
+				print '<img class="photoexpensereport photorefcenter" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$minifile).'" title="">';
+				print '</div>';
+				print '</a>';
+			} else {
+				$error = 0;
+				$thumbshown = '';
 
-                if (preg_match('/\.pdf$/i', $file['name']))
-                {
-                    $urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
+				if (preg_match('/\.pdf$/i', $file['name']))
+				{
+					$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
 
-                    $filepdf = $conf->expensereport->dir_output.'/'.$relativepath.$file['name'];
-                    $fileimage = $conf->expensereport->dir_output.'/'.$relativepath.$file['name'].'_preview.png';
-                    $relativepathimage = $relativepath.$file['name'].'_preview.png';
+					$filepdf = $conf->expensereport->dir_output.'/'.$relativepath.$file['name'];
+					$fileimage = $conf->expensereport->dir_output.'/'.$relativepath.$file['name'].'_preview.png';
+					$relativepathimage = $relativepath.$file['name'].'_preview.png';
 
-                    $pdfexists = file_exists($filepdf);
+					$pdfexists = file_exists($filepdf);
 
-                    if ($pdfexists)
-                    {
-                        // Conversion du PDF en image png si fichier png non existant
-                        if (!file_exists($fileimage) || (filemtime($fileimage) < filemtime($filepdf)))
-                        {
-                            if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS))		// If you experience trouble with pdf thumb generation and imagick, you can disable here.
-                            {
-                                include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-                                $ret = dol_convert_file($filepdf, 'png', $fileimage, '0'); // Convert first page of PDF into a file _preview.png
-                                if ($ret < 0) $error++;
-                            }
-                        }
-                    }
+					if ($pdfexists)
+					{
+						// Conversion du PDF en image png si fichier png non existant
+						if (!file_exists($fileimage) || (filemtime($fileimage) < filemtime($filepdf)))
+						{
+							if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS))		// If you experience trouble with pdf thumb generation and imagick, you can disable here.
+							{
+								include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+								$ret = dol_convert_file($filepdf, 'png', $fileimage, '0'); // Convert first page of PDF into a file _preview.png
+								if ($ret < 0) $error++;
+							}
+						}
+					}
 
-                    if ($pdfexists && !$error)
-                    {
-                        $heightforphotref = 70;
-                        if (!empty($conf->dol_optimize_smallscreen)) $heightforphotref = 60;
-                        // If the preview file is found
-                        if (file_exists($fileimage))
-                        {
-                            $thumbshown = '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
-                        }
-                    }
-                }
+					if ($pdfexists && !$error)
+					{
+						$heightforphotref = 70;
+						if (!empty($conf->dol_optimize_smallscreen)) $heightforphotref = 60;
+						// If the preview file is found
+						if (file_exists($fileimage))
+						{
+							$thumbshown = '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
+						}
+					}
+				}
 
-                if (empty($urlforhref) || empty($thumbshown)) {
-                    print '<a href="#" class="aphoto" target="_blank">';
-                } else {
-                    print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
-                }
-                print '<div class="photoref backgroundblank">';
+				if (empty($urlforhref) || empty($thumbshown)) {
+					print '<a href="#" class="aphoto" target="_blank">';
+				} else {
+					print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
+				}
+				print '<div class="photoref backgroundblank">';
 
-                print $thumbshown ? $thumbshown : img_mime($minifile);
+				print $thumbshown ? $thumbshown : img_mime($minifile);
 
-                print '</div></a>';
-            }
-            print '<br>';
-            $checked = '';
-            //var_dump(GETPOST($file['relativename'])); var_dump($file['relativename']); var_dump($_FILES['userfile']['name']);
-            // If a file was just uploaded, we check to preselect it
-            if (is_array($_FILES['userfile']['name'])) {
-	            foreach ($_FILES['userfile']['name'] as $tmpfile)
-	            {
-	                if ($file['relativename'] == (GETPOST('savingdocmask', 'alpha') ? dol_sanitizeFileName($object->ref.'-') : '').$tmpfile)
-	                {
-	                    $checked = ' checked';
-	                    break;
-	                } elseif ($file['relativename'] && in_array($file['relativename'], GETPOST('attachfile', 'array'))) {
-	                    $checked = ' checked';
-	                    break;
-	                }
-	            }
-            }
-            // If we edit a line already linked, then $filenamelinked is defined to the filename (without path) of linked file
-            if (!empty($filenamelinked) && $filenamelinked == $file['relativename'])
-            {
-                $checked = ' checked';
-            }
-            print '<div class="margintoponly maxwidth150"><input type="checkbox"'.$checked.' id="radio'.$filei.'" name="attachfile[]" class="checkboxattachfile" value="'.$file['relativename'].'">';
-            print '<label class="wordbreak checkboxattachfilelabel" for="radio'.$filei.'"> '.$file['relativename'].'</label>';
-            print '</div>';
+				print '</div></a>';
+			}
+			print '<br>';
+			$checked = '';
+			//var_dump(GETPOST($file['relativename'])); var_dump($file['relativename']); var_dump($_FILES['userfile']['name']);
+			// If a file was just uploaded, we check to preselect it
+			if (is_array($_FILES['userfile']['name'])) {
+				foreach ($_FILES['userfile']['name'] as $tmpfile)
+				{
+					if ($file['relativename'] == (GETPOST('savingdocmask', 'alpha') ? dol_sanitizeFileName($object->ref.'-') : '').$tmpfile)
+					{
+						$checked = ' checked';
+						break;
+					} elseif ($file['relativename'] && in_array($file['relativename'], GETPOST('attachfile', 'array'))) {
+						$checked = ' checked';
+						break;
+					}
+				}
+			}
+			// If we edit a line already linked, then $filenamelinked is defined to the filename (without path) of linked file
+			if (!empty($filenamelinked) && $filenamelinked == $file['relativename'])
+			{
+				$checked = ' checked';
+			}
+			print '<div class="margintoponly maxwidth150"><input type="checkbox"'.$checked.' id="radio'.$filei.'" name="attachfile[]" class="checkboxattachfile" value="'.$file['relativename'].'">';
+			print '<label class="wordbreak checkboxattachfilelabel" for="radio'.$filei.'"> '.$file['relativename'].'</label>';
+			print '</div>';
 
-            print '</div>';
-        }
+			print '</div>';
+		}
 
-        print '<script>';
-        print '$(document).ready(function() {';
-        print "$('.checkboxattachfile').on('change', function() { $('.checkboxattachfile').not(this).prop('checked', false); });";
-        print '});';
-        print '</script>';
+		print '<script>';
+		print '$(document).ready(function() {';
+		print "$('.checkboxattachfile').on('change', function() { $('.checkboxattachfile').not(this).prop('checked', false); });";
+		print '});';
+		print '</script>';
 
-        print '</td></tr>';
-    } else {
-        print '<tr class="oddeven nohover trattachnewfilenow"'.(!GETPOSTISSET('sendit') && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display: none"' : '').'>';
-        print '<td colspan="'.$colspan.'">';
-        print '<span class="opacitymedium">'.$langs->trans("NoFilesUploadedYet").'</span>';
-        print '</td></tr>';
-    }
+		print '</td></tr>';
+	} else {
+		print '<tr class="oddeven nohover trattachnewfilenow"'.(!GETPOSTISSET('sendit') && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display: none"' : '').'>';
+		print '<td colspan="'.$colspan.'">';
+		print '<span class="opacitymedium">'.$langs->trans("NoFilesUploadedYet").'</span>';
+		print '</td></tr>';
+	}
 }
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index 89ae2103476..e4725db3946 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -31,33 +31,36 @@
 class Export
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $array_export_code = array(); // Tableau de "idmodule_numlot"
-    public $array_export_module = array(); // Tableau de "nom de modules"
-    public $array_export_label = array(); // Tableau de "libelle de lots"
-    public $array_export_sql_start = array(); // Tableau des "requetes sql"
-    public $array_export_sql_end = array(); // Tableau des "requetes sql"
-    public $array_export_sql_order = array(); // Tableau des "requetes sql"
+	public $error;
 
-    public $array_export_fields = array(); // Tableau des listes de champ+libelle a exporter
-    public $array_export_TypeFields = array(); // Tableau des listes de champ+Type de filtre
-    public $array_export_FilterValue = array(); // Tableau des listes de champ+Valeur a filtrer
-    public $array_export_entities = array(); // Tableau des listes de champ+alias a exporter
-    public $array_export_dependencies = array(); // array of list of entities that must take care of the DISTINCT if a field is added into export
-    public $array_export_special = array(); // array of special operations to do on field
-    public $array_export_examplevalues = array(); // array with examples for fields
+	public $array_export_code = array(); // Tableau de "idmodule_numexportprofile"
+	public $array_export_code_for_sort = array(); // Tableau de "idmodule_numexportprofile"
+	public $array_export_module = array(); // Tableau de "nom de modules"
+	public $array_export_label = array(); // Tableau de "libelle de lots"
+	public $array_export_sql_start = array(); // Tableau des "requetes sql"
+	public $array_export_sql_end = array(); // Tableau des "requetes sql"
+	public $array_export_sql_order = array(); // Tableau des "requetes sql"
+
+	public $array_export_fields = array(); // Tableau des listes de champ+libelle a exporter
+	public $array_export_TypeFields = array(); // Tableau des listes de champ+Type de filtre
+	public $array_export_FilterValue = array(); // Tableau des listes de champ+Valeur a filtrer
+	public $array_export_entities = array(); // Tableau des listes de champ+alias a exporter
+	public $array_export_dependencies = array(); // array of list of entities that must take care of the DISTINCT if a field is added into export
+	public $array_export_special = array(); // array of special operations to do on field
+	public $array_export_examplevalues = array(); // array with examples for fields
 	public $array_export_help = array(); // array with tooltip help for fields
 
-    // To store export modules
-    public $hexa; // List of fields in the export profile
-    public $hexafiltervalue; // List of search criteria in the export profile
-    public $datatoexport;
-    public $model_name; // Name of export profile
+	// To store export modules
+	public $hexa; // List of fields in the export profile
+	public $hexafiltervalue; // List of search criteria in the export profile
+	public $datatoexport;
+	public $model_name; // Name of export profile
 
-    public $sqlusedforexport;
+	public $sqlusedforexport;
 
 
 	/**
@@ -65,13 +68,13 @@ class Export
 	 *
 	 *    @param  	DoliDB		$db		Database handler
 	 */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Load an exportable dataset
 	 *
@@ -79,19 +82,19 @@ class Export
 	 *    @param  	string		$filter    	Load a particular dataset only
 	 *    @return	int						<0 if KO, >0 if OK
 	 */
-    public function load_arrays($user, $filter = '')
-    {
-        // phpcs:enable
-        global $langs, $conf, $mysoc;
+	public function load_arrays($user, $filter = '')
+	{
+		// phpcs:enable
+		global $langs, $conf, $mysoc;
 
-        dol_syslog(get_class($this)."::load_arrays user=".$user->id." filter=".$filter);
+		dol_syslog(get_class($this)."::load_arrays user=".$user->id." filter=".$filter);
 
-        $i = 0;
+		$i = 0;
 
-        // Define list of modules directories into modulesdir
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		// Define list of modules directories into modulesdir
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-        $modulesdir = dolGetModulesDirs();
+		$modulesdir = dolGetModulesDirs();
 
 		foreach ($modulesdir as $dir)
 		{
@@ -99,9 +102,10 @@ class Export
 			$handle = @opendir(dol_osencode($dir));
 			if (is_resource($handle))
 			{
-                // Search module files
-			    while (($file = readdir($handle)) !== false)
+				// Search module files
+				while (($file = readdir($handle)) !== false)
 				{
+					$reg = array();
 					if (is_readable($dir.$file) && preg_match("/^(mod.*)\.class\.php$/i", $file, $reg))
 					{
 						$modulename = $reg[1];
@@ -122,30 +126,29 @@ class Export
 
 							if (isset($module->export_code) && is_array($module->export_code))
 							{
-							    foreach ($module->export_code as $r => $value)
+								foreach ($module->export_code as $r => $value)
 								{
-                                    //print $i.'-'.$filter.'-'.$modulename.'-'.join(',',$module->export_code).'<br>';
-								    if ($filter && ($filter != $module->export_code[$r])) continue;
+									//print $i.'-'.$filter.'-'.$modulename.'-'.join(',',$module->export_code).'<br>';
+									if ($filter && ($filter != $module->export_code[$r])) continue;
 
-                                    // Test if condition to show are ok
-                                    if (!empty($module->export_enabled[$r]) && !verifCond($module->export_enabled[$r])) continue;
+									// Test if condition to show are ok
+									if (!empty($module->export_enabled[$r]) && !verifCond($module->export_enabled[$r])) continue;
 
-                                    // Test if permissions are ok
+									// Test if permissions are ok
 									$bool = true;
 									if (isset($module->export_permission))
 									{
 										foreach ($module->export_permission[$r] as $val)
 										{
-	    									$perm = $val;
-	    									//print_r("$perm[0]-$perm[1]-$perm[2]<br>");
-	    									if (!empty($perm[2]))
-	    									{
-	    										$bool = $user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]};
-	    									} else {
-	    										$bool = $user->rights->{$perm[0]}->{$perm[1]};
-	    									}
-	    									if ($perm[0] == 'user' && $user->admin) $bool = true;
-	    									if (!$bool) break;
+											$perm = $val;
+											//print_r("$perm[0]-$perm[1]-$perm[2]<br>");
+											if (!empty($perm[2])) {
+												$bool = isset($user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]}) ? $user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]} : false;
+											} else {
+												$bool = isset($user->rights->{$perm[0]}->{$perm[1]}) ? $user->rights->{$perm[0]}->{$perm[1]} : false;
+											}
+											if ($perm[0] == 'user' && $user->admin) $bool = true;
+											if (!$bool) break;
 										}
 									}
 									//print $bool." $perm[0]"."<br>";
@@ -163,6 +166,7 @@ class Export
 										}
 									}
 
+
 									// Module
 									$this->array_export_module[$i] = $module;
 									// Permission
@@ -171,6 +175,8 @@ class Export
 									$this->array_export_icon[$i] = (isset($module->export_icon[$r]) ? $module->export_icon[$r] : $module->picto);
 									// Code du dataset export
 									$this->array_export_code[$i] = $module->export_code[$r];
+									// Define a key for sort
+									$this->array_export_code_for_sort[$i] = $module->module_position.'_'.$module->export_code[$r];	// Add a key into the module
 									// Libelle du dataset export
 									$this->array_export_label[$i] = $module->getExportDatasetLabel($r);
 									// Tableau des champ a exporter (cle=champ, valeur=libelle)
@@ -183,15 +189,15 @@ class Export
 									$this->array_export_dependencies[$i] = (!empty($module->export_dependencies_array[$r]) ? $module->export_dependencies_array[$r] : '');
 									// Tableau des operations speciales sur champ
 									$this->array_export_special[$i] = (!empty($module->export_special_array[$r]) ? $module->export_special_array[$r] : '');
-            						// Array of examples
-            						$this->array_export_examplevalues[$i] = $module->export_examplevalues_array[$r];
-            						// Array of help tooltips
-            						$this->array_export_help[$i] = (!empty($module->export_help_array[$r]) ? $module->export_help_array[$r] : '');
+									// Array of examples
+									$this->array_export_examplevalues[$i] = (!empty($module->export_examplevalues_array[$r]) ? $module->export_examplevalues_array[$r] : null);
+									// Array of help tooltips
+									$this->array_export_help[$i] = (!empty($module->export_help_array[$r]) ? $module->export_help_array[$r] : '');
 
 									// Requete sql du dataset
 									$this->array_export_sql_start[$i] = $module->export_sql_start[$r];
 									$this->array_export_sql_end[$i] = $module->export_sql_end[$r];
-									$this->array_export_sql_order[$i] = $module->export_sql_order[$r];
+									$this->array_export_sql_order[$i] = (!empty($module->export_sql_order[$r]) ? $module->export_sql_order[$r] : null);
 									//$this->array_export_sql[$i]=$module->export_sql[$r];
 
 									dol_syslog(get_class($this)."::load_arrays loaded for module ".$modulename." with index ".$i.", dataset=".$module->export_code[$r].", nb of fields=".(!empty($module->export_fields_code[$r]) ?count($module->export_fields_code[$r]) : ''));
@@ -202,15 +208,15 @@ class Export
 						}
 					}
 				}
-                closedir($handle);
+				closedir($handle);
 			}
 		}
 
 		return 1;
-    }
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Build the sql export request.
 	 *      Arrays this->array_export_xxx are already loaded for required datatoexport
@@ -220,9 +226,9 @@ class Export
 	 *      @param      array	$array_filterValue  Filter records on array of value for fields
 	 *      @return		string						SQL String. Example "select s.rowid as r_rowid, s.status as s_status from ..."
 	 */
-    public function build_sql($indice, $array_selected, $array_filterValue)
-    {
-        // phpcs:enable
+	public function build_sql($indice, $array_selected, $array_filterValue)
+	{
+		// phpcs:enable
 		// Build the sql request
 		$sql = $this->array_export_sql_start[$indice];
 		$i = 0;
@@ -231,7 +237,7 @@ class Export
 		foreach ($this->array_export_fields[$indice] as $key => $value)
 		{
 			if (!array_key_exists($key, $array_selected)) continue; // Field not selected
-            if (preg_match('/^none\./', $key)) continue; // A field that must not appears into SQL
+			if (preg_match('/^none\./', $key)) continue; // A field that must not appears into SQL
 			if ($i > 0) $sql .= ', ';
 			else $i++;
 
@@ -252,7 +258,7 @@ class Export
 			// Loop on each condition to add
 			foreach ($array_filterValue as $key => $value)
 			{
-			    if (preg_match('/GROUP_CONCAT/i', $key)) continue;
+				if (preg_match('/GROUP_CONCAT/i', $key)) continue;
 				if ($value != '') $sqlWhere .= " and ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
 			}
 			$sql .= $sqlWhere;
@@ -264,17 +270,17 @@ class Export
 		// Add the HAVING part.
 		if (is_array($array_filterValue) && !empty($array_filterValue))
 		{
-		    // Loop on each condition to add
-		    foreach ($array_filterValue as $key => $value)
-		    {
-		        if (preg_match('/GROUP_CONCAT/i', $key) and $value != '') $sql .= " HAVING ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
-		    }
+			// Loop on each condition to add
+			foreach ($array_filterValue as $key => $value)
+			{
+				if (preg_match('/GROUP_CONCAT/i', $key) and $value != '') $sql .= " HAVING ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
+			}
 		}
 
 		return $sql;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Build the conditionnal string from filter the query
 	 *
@@ -283,9 +289,9 @@ class Export
 	 *      @param		string	$ValueField		Value of the field for filter. Must not be ''
 	 *      @return		string					sql string of then field ex : "field='xxx'>"
 	 */
-    public function build_filterQuery($TypeField, $NameField, $ValueField)
-    {
-        // phpcs:enable
+	public function build_filterQuery($TypeField, $NameField, $ValueField)
+	{
+		// phpcs:enable
 		//print $TypeField." ".$NameField." ".$ValueField;
 		$InfoFieldList = explode(":", $TypeField);
 		// build the input field on depend of the type of file
@@ -332,13 +338,13 @@ class Export
 				if (is_numeric($ValueField))
 					$szFilterQuery = " ".$NameField."=".$ValueField;
 				else {
-                    if (!(strpos($ValueField, '%') === false))
-                        $szFilterQuery = " ".$NameField." LIKE '".$ValueField."'";
-                    else $szFilterQuery = " ".$NameField." = '".$ValueField."'";
+					if (!(strpos($ValueField, '%') === false))
+						$szFilterQuery = " ".$NameField." LIKE '".$ValueField."'";
+					else $szFilterQuery = " ".$NameField." = '".$ValueField."'";
 				}
 				break;
 			default:
-			    dol_syslog("Error we try to forge an sql export request with a condition on a field with type ".$InfoFieldList[0]." (defined into module descriptor) but this type is unknown/not supported. It looks like a bug into module descriptor.", LOG_ERR);
+				dol_syslog("Error we try to forge an sql export request with a condition on a field with type ".$InfoFieldList[0]." (defined into module descriptor) but this type is unknown/not supported. It looks like a bug into module descriptor.", LOG_ERR);
 		}
 
 		return $szFilterQuery;
@@ -352,16 +358,16 @@ class Export
 	 *  @param 	string	$Sens		Comparison operator
 	 *  @return string
 	 */
-    public function conditionDate($Field, $Value, $Sens)
-    {
+	public function conditionDate($Field, $Value, $Sens)
+	{
 		// TODO date_format is forbidden, not performant and not portable. Use instead BETWEEN
 		if (strlen($Value) == 4) $Condition = " date_format(".$Field.",'%Y') ".$Sens." '".$Value."'";
 		elseif (strlen($Value) == 6) $Condition = " date_format(".$Field.",'%Y%m') ".$Sens." '".$Value."'";
 		else $Condition = " date_format(".$Field.",'%Y%m%d') ".$Sens." ".$Value;
 		return $Condition;
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Build an input field used to filter the query
 	 *
@@ -370,9 +376,9 @@ class Export
 	 *      @param		string	$ValueField		Initial value of the field to filter
 	 *      @return		string					html string of the input field ex : "<input type=text name=... value=...>"
 	 */
-    public function build_filterField($TypeField, $NameField, $ValueField)
-    {
-        // phpcs:enable
+	public function build_filterField($TypeField, $NameField, $ValueField)
+	{
+		// phpcs:enable
 		global $conf, $langs;
 
 		$szFilterField = '';
@@ -389,7 +395,7 @@ class Export
 			case 'Numeric':
 			case 'Number':
 				// Must be a string text to allow to use comparison strings like "<= 999"
-			    $szFilterField = '<input type="text" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
+				$szFilterField = '<input type="text" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
 				break;
 			case 'Status':
 				$szFilterField = '<input type="number" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
@@ -476,17 +482,17 @@ class Export
 		}
 
 		return $szFilterField;
-    }
+	}
 
-    /**
-     *  Build an input field used to filter the query
-     *
-     *  @param      string  $TypeField      Type of Field to filter
-     *  @return     string                  html string of the input field ex : "<input type=text name=... value=...>"
-     */
-    public function genDocFilter($TypeField)
-    {
-        global $langs;
+	/**
+	 *  Build an input field used to filter the query
+	 *
+	 *  @param      string  $TypeField      Type of Field to filter
+	 *  @return     string                  html string of the input field ex : "<input type=text name=... value=...>"
+	 */
+	public function genDocFilter($TypeField)
+	{
+		global $langs;
 
 		$szMsg = '';
 		$InfoFieldList = explode(":", $TypeField);
@@ -511,7 +517,7 @@ class Export
 		return $szMsg;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Build export file.
 	 *      File is built into directory $conf->export->dir_temp.'/'.$user->id
@@ -525,9 +531,9 @@ class Export
 	 *      @param		string		$sqlquery			If set, transmit the sql request for select (otherwise, sql request is generated from arrays)
 	 *      @return		int								<0 if KO, >0 if OK
 	 */
-    public function build_file($user, $model, $datatoexport, $array_selected, $array_filterValue, $sqlquery = '')
-    {
-        // phpcs:enable
+	public function build_file($user, $model, $datatoexport, $array_selected, $array_filterValue, $sqlquery = '')
+	{
+		// phpcs:enable
 		global $conf, $langs, $mysoc;
 
 		$indice = 0;
@@ -551,7 +557,7 @@ class Export
 		$objmodel = new $classname($this->db);
 
 		if (!empty($sqlquery)) $sql = $sqlquery;
-        else {
+		else {
 			// Define value for indice from $datatoexport
 			$foundindice = 0;
 			foreach ($this->array_export_code as $key => $dataset)
@@ -569,7 +575,7 @@ class Export
 				$this->error = "ErrorBadParameter can't find dataset ".$datatoexport." into preload arrays this->array_export_code";
 				return -1;
 			}
-        	$sql = $this->build_sql($indice, $array_selected, $array_filterValue);
+			$sql = $this->build_sql($indice, $array_selected, $array_filterValue);
 		}
 
 		// Run the sql
@@ -579,9 +585,12 @@ class Export
 		if ($resql)
 		{
 			//$this->array_export_label[$indice]
-			if ($conf->global->EXPORT_PREFIX_SPEC)
+			if (!empty($conf->global->EXPORT_PREFIX_SPEC)) {
 				$filename = $conf->global->EXPORT_PREFIX_SPEC."_".$datatoexport;
-			else $filename = "export_".$datatoexport;
+			}
+			else {
+				$filename = "export_".$datatoexport;
+			}
 			$filename .= '.'.$objmodel->getDriverExtension();
 			$dirname = $conf->export->dir_temp.'/'.$user->id;
 
@@ -597,7 +606,7 @@ class Export
 				$objmodel->write_header($outputlangs);
 
 				// Genere ligne de titre
-				$objmodel->write_title($this->array_export_fields[$indice], $array_selected, $outputlangs, $this->array_export_TypeFields[$indice]);
+				$objmodel->write_title($this->array_export_fields[$indice], $array_selected, $outputlangs, isset($this->array_export_TypeFields[$indice]) ? $this->array_export_TypeFields[$indice] : null);
 
 				while ($obj = $this->db->fetch_object($resql))
 				{
@@ -637,31 +646,33 @@ class Export
 								$remaintopay = '';
 								if ($obj->f_rowid > 0)
 								{
-								    global $tmpobjforcomputecall;
-								    if (!is_object($tmpobjforcomputecall))
-								    {
-								        include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-								        $tmpobjforcomputecall = new Facture($this->db);
-								    }
-								    $tmpobjforcomputecall->id = $obj->f_rowid;
-								    $tmpobjforcomputecall->total_ttc = $obj->f_total_ttc;
-								    $tmpobjforcomputecall->close_code = $obj->f_close_code;
-								    $remaintopay = $tmpobjforcomputecall->getRemainToPay();
+									global $tmpobjforcomputecall;
+									if (!is_object($tmpobjforcomputecall))
+									{
+										include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+										$tmpobjforcomputecall = new Facture($this->db);
+									}
+									$tmpobjforcomputecall->id = $obj->f_rowid;
+									$tmpobjforcomputecall->total_ttc = $obj->f_total_ttc;
+									$tmpobjforcomputecall->close_code = $obj->f_close_code;
+									$remaintopay = $tmpobjforcomputecall->getRemainToPay();
 								}
 								$obj->$alias = $remaintopay;
 							} else {
-							    // TODO FIXME Export of compute field does not work. $obj containt $obj->alias_field and formulat will contains $obj->field
-							    $computestring = $this->array_export_special[$indice][$key];
-							    $tmp = dol_eval($computestring, 1, 0);
-							    $obj->$alias = $tmp;
+								// TODO FIXME
+								// Export of compute field does not work. $obj contains $obj->alias_field and formula may contains $obj->field
+								// Also the formula may contains objects of class that are not loaded.
+								$computestring = $this->array_export_special[$indice][$key];
+								//$tmp = dol_eval($computestring, 1, 0);
+								//$obj->$alias = $tmp;
 
-							    $this->error = "ERROPNOTSUPPORTED. Operation ".$this->array_export_special[$indice][$key]." not supported. Export of 'computed' extrafields is not yet supported, please remove field.";
-							    return -1;
+								$this->error = "ERROPNOTSUPPORTED. Operation ".$computestring." not supported. Export of 'computed' extrafields is not yet supported, please remove field.";
+								return -1;
 							}
 						}
 					}
 					// end of special operation processing
-					$objmodel->write_record($array_selected, $obj, $outputlangs, $this->array_export_TypeFields[$indice]);
+					$objmodel->write_record($array_selected, $obj, $outputlangs, isset($this->array_export_TypeFields[$indice]) ? $this->array_export_TypeFields[$indice] : null);
 				}
 
 				// Genere en-tete
@@ -670,7 +681,7 @@ class Export
 				// Close file
 				$objmodel->close_file();
 
-        		return 1;
+				return 1;
 			} else {
 				$this->error = $objmodel->error;
 				dol_syslog("Export::build_file Error: ".$this->error, LOG_ERR);
@@ -688,7 +699,7 @@ class Export
 	 *  @param		User	$user 	Object user that save
 	 *  @return		int				<0 if KO, >0 if OK
 	 */
-    public function create($user)
+	public function create($user)
 	{
 		global $conf;
 
@@ -732,8 +743,8 @@ class Export
 	 *  @param      int		$id		Id of profil to load
 	 *  @return     int				<0 if KO, >0 if OK
 	 */
-    public function fetch($id)
-    {
+	public function fetch($id)
+	{
 		$sql = 'SELECT em.rowid, em.label, em.type, em.field, em.filter';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'export_model as em';
 		$sql .= ' WHERE em.rowid = '.((int) $id);
@@ -801,16 +812,16 @@ class Export
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Output list all export models
 	 *  TODO Move this into a class htmlxxx.class.php
 	 *
 	 *	@return	void
 	 */
-    public function list_export_model()
-    {
-        // phpcs:enable
+	public function list_export_model()
+	{
+		// phpcs:enable
 		global $conf, $langs;
 
 		$sql = "SELECT em.rowid, em.field, em.label, em.type, em.filter";
@@ -852,8 +863,8 @@ class Export
 
 				$i++;
 			}
-        } else {
-            dol_print_error($this->db);
-        }
-    }
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 }
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 70e04d46cbb..b02ca2e10de 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -39,63 +39,64 @@ $langs->loadlangs(array('admin', 'exports', 'other', 'users', 'companies', 'proj
 //if (! $user->admin)
 //  accessforbidden();
 
+// Map icons, array duplicated in import.php, was not synchronized, TODO put it somewhere only once
 $entitytoicon = array(
 	'invoice'      => 'bill',
-    'invoice_line' => 'bill',
+	'invoice_line' => 'bill',
 	'order'        => 'order',
-    'order_line'   => 'order',
+	'order_line'   => 'order',
 	'propal'       => 'propal',
-    'propal_line'  => 'propal',
+	'propal_line'  => 'propal',
 	'intervention' => 'intervention',
-    'inter_line'   => 'intervention',
+	'inter_line'   => 'intervention',
 	'member'       => 'user',
-    'member_type'  => 'group',
-    'subscription' => 'payment',
-    'payment'      => 'payment',
+	'member_type'  => 'group',
+	'subscription' => 'payment',
+	'payment'      => 'payment',
 	'tax'          => 'generic',
     'tax_type'     => 'generic',
-    'stock'        => 'generic',
     'other'        => 'generic',
 	'account'      => 'account',
 	'product'      => 'product',
-    'virtualproduct'=>'product',
+	'virtualproduct'=>'product',
 	'subproduct'   => 'product',
 	'product_supplier_ref'      => 'product',
+    'stock'        => 'stock',
 	'warehouse'    => 'stock',
 	'batch'        => 'stock',
 	'stockbatch'   => 'stock',
 	'category'     => 'category',
 	'shipment'     => 'sending',
-    'shipment_line'=> 'sending',
-    'reception'=> 'sending',
-    'reception_line'=> 'sending',
+	'shipment_line'=> 'sending',
+	'reception'=> 'sending',
+	'reception_line'=> 'sending',
 	'expensereport'=> 'trip',
-    'expensereport_line'=> 'trip',
+	'expensereport_line'=> 'trip',
 	'holiday'      => 'holiday',
-    'contract_line' => 'contract',
-    'translation'  => 'generic',
-    'bomm'         => 'bom',
-    'bomline'      => 'bom'
+	'contract_line' => 'contract',
+	'translation'  => 'generic',
+	'bomm'         => 'bom',
+	'bomline'      => 'bom'
 );
 
-// Translation code
+// Translation code, array duplicated in import.php, was not synchronized, TODO put it somewhere only once
 $entitytolang = array(
 	'user'         => 'User',
 	'company'      => 'Company',
-    'contact'      => 'Contact',
+	'contact'      => 'Contact',
 	'invoice'      => 'Bill',
-    'invoice_line' => 'InvoiceLine',
+	'invoice_line' => 'InvoiceLine',
 	'order'        => 'Order',
-    'order_line'   => 'OrderLine',
-    'propal'       => 'Proposal',
-    'propal_line'  => 'ProposalLine',
+	'order_line'   => 'OrderLine',
+	'propal'       => 'Proposal',
+	'propal_line'  => 'ProposalLine',
 	'intervention' => 'Intervention',
-    'inter_line'   => 'InterLine',
+	'inter_line'   => 'InterLine',
 	'member'       => 'Member',
-    'member_type'  => 'MemberType',
-    'subscription' => 'Subscription',
+	'member_type'  => 'MemberType',
+	'subscription' => 'Subscription',
 	'tax'          => 'SocialContribution',
-    'tax_type'     => 'DictionarySocialContributions',
+	'tax_type'     => 'DictionarySocialContributions',
 	'account'      => 'BankTransactions',
 	'payment'      => 'Payment',
 	'product'      => 'Product',
@@ -103,28 +104,28 @@ $entitytolang = array(
 	'subproduct'      => 'SubProduct',
 	'product_supplier_ref'      => 'SupplierPrices',
 	'service'      => 'Service',
-    'stock'        => 'Stock',
+	'stock'        => 'Stock',
 	'movement'	   => 'StockMovement',
 	'batch'        => 'Batch',
 	'stockbatch'   => 'StockDetailPerBatch',
 	'warehouse'    => 'Warehouse',
 	'category'     => 'Category',
 	'other'        => 'Other',
-    'trip'         => 'TripsAndExpenses',
-    'shipment'     => 'Shipments',
-    'shipment_line'=> 'ShipmentLine',
-    'project'      => 'Projects',
-    'projecttask'  => 'Tasks',
-    'task_time'    => 'TaskTimeSpent',
+	'trip'         => 'TripsAndExpenses',
+	'shipment'     => 'Shipments',
+	'shipment_line'=> 'ShipmentLine',
+	'project'      => 'Projects',
+	'projecttask'  => 'Tasks',
+	'task_time'    => 'TaskTimeSpent',
 	'action'       => 'Event',
 	'expensereport'=> 'ExpenseReport',
 	'expensereport_line'=> 'ExpenseReportLine',
 	'holiday'      => 'TitreRequestCP',
 	'contract'     => 'Contract',
-    'contract_line'=> 'ContractLine',
-    'translation'  => 'Translation',
-    'bom'          => 'BOM',
-    'bomline'      => 'BOMLine'
+	'contract_line'=> 'ContractLine',
+	'translation'  => 'Translation',
+	'bom'          => 'BOM',
+	'bomline'      => 'BOMLine'
 );
 
 $array_selected = isset($_SESSION["export_selected_fields"]) ? $_SESSION["export_selected_fields"] : array();
@@ -162,121 +163,121 @@ if ($action == 'selectfield')     // Selection of field at step 2
 {
 	$fieldsarray = $objexport->array_export_fields[0];
 	$fieldsentitiesarray = $objexport->array_export_entities[0];
-    $fieldsdependenciesarray = $objexport->array_export_dependencies[0];
+	$fieldsdependenciesarray = $objexport->array_export_dependencies[0];
 
-    if ($field == 'all')
-    {
+	if ($field == 'all')
+	{
 		foreach ($fieldsarray as $key=>$val)
 		{
 			if (!empty($array_selected[$key])) continue; // If already selected, check next
 			$array_selected[$key] = count($array_selected) + 1;
-		    //print_r($array_selected);
-		    $_SESSION["export_selected_fields"] = $array_selected;
+			//print_r($array_selected);
+			$_SESSION["export_selected_fields"] = $array_selected;
 		}
-    } else {
-        $warnings = array();
+	} else {
+		$warnings = array();
 
-        $array_selected[$field] = count($array_selected) + 1; // We tag the key $field as "selected"
-        // We check if there is a dependency to activate
-        /*var_dump($field);
+		$array_selected[$field] = count($array_selected) + 1; // We tag the key $field as "selected"
+		// We check if there is a dependency to activate
+		/*var_dump($field);
         var_dump($fieldsentitiesarray[$field]);
         var_dump($fieldsdependenciesarray);*/
-        $listofdependencies = array();
-        if (!empty($fieldsentitiesarray[$field]) && !empty($fieldsdependenciesarray[$fieldsentitiesarray[$field]]))
-        {
-            // We found a dependency on the type of field
-            $tmp = $fieldsdependenciesarray[$fieldsentitiesarray[$field]]; // $fieldsdependenciesarray=array('element'=>'fd.rowid') or array('element'=>array('fd.rowid','ab.rowid'))
-            if (is_array($tmp)) $listofdependencies = $tmp;
-            else $listofdependencies = array($tmp);
-        } elseif (!empty($field) && !empty($fieldsdependenciesarray[$field]))
-        {
-            // We found a dependency on a dedicated field
-            $tmp = $fieldsdependenciesarray[$field]; // $fieldsdependenciesarray=array('fd.fieldx'=>'fd.rowid') or array('fd.fieldx'=>array('fd.rowid','ab.rowid'))
-            if (is_array($tmp)) $listofdependencies = $tmp;
-            else $listofdependencies = array($tmp);
-        }
+		$listofdependencies = array();
+		if (!empty($fieldsentitiesarray[$field]) && !empty($fieldsdependenciesarray[$fieldsentitiesarray[$field]]))
+		{
+			// We found a dependency on the type of field
+			$tmp = $fieldsdependenciesarray[$fieldsentitiesarray[$field]]; // $fieldsdependenciesarray=array('element'=>'fd.rowid') or array('element'=>array('fd.rowid','ab.rowid'))
+			if (is_array($tmp)) $listofdependencies = $tmp;
+			else $listofdependencies = array($tmp);
+		} elseif (!empty($field) && !empty($fieldsdependenciesarray[$field]))
+		{
+			// We found a dependency on a dedicated field
+			$tmp = $fieldsdependenciesarray[$field]; // $fieldsdependenciesarray=array('fd.fieldx'=>'fd.rowid') or array('fd.fieldx'=>array('fd.rowid','ab.rowid'))
+			if (is_array($tmp)) $listofdependencies = $tmp;
+			else $listofdependencies = array($tmp);
+		}
 
-        if (count($listofdependencies))
-        {
-            foreach ($listofdependencies as $fieldid)
-            {
-                if (empty($array_selected[$fieldid]))
-                {
-                    $array_selected[$fieldid] = count($array_selected) + 1; // We tag the key $fieldid as "selected"
-                    $warnings[] = $langs->trans("ExportFieldAutomaticallyAdded", $langs->transnoentitiesnoconv($fieldsarray[$fieldid]));
-                }
-            }
-        }
-	    //print_r($array_selected);
-	    $_SESSION["export_selected_fields"] = $array_selected;
+		if (count($listofdependencies))
+		{
+			foreach ($listofdependencies as $fieldid)
+			{
+				if (empty($array_selected[$fieldid]))
+				{
+					$array_selected[$fieldid] = count($array_selected) + 1; // We tag the key $fieldid as "selected"
+					$warnings[] = $langs->trans("ExportFieldAutomaticallyAdded", $langs->transnoentitiesnoconv($fieldsarray[$fieldid]));
+				}
+			}
+		}
+		//print_r($array_selected);
+		$_SESSION["export_selected_fields"] = $array_selected;
 
-	    setEventMessages($warnings, null, 'warnings');
-    }
+		setEventMessages($warnings, null, 'warnings');
+	}
 }
 if ($action == 'unselectfield')
 {
-    if ($_GET["field"] == 'all')
-    {
+	if ($_GET["field"] == 'all')
+	{
 		$array_selected = array();
 		$_SESSION["export_selected_fields"] = $array_selected;
-    } else {
-	    unset($array_selected[$_GET["field"]]);
-	    // Renumber fields of array_selected (from 1 to nb_elements)
-	    asort($array_selected);
-	    $i = 0;
-	    $array_selected_save = $array_selected;
-	    foreach ($array_selected as $code=>$value)
-	    {
-	        $i++;
-	        $array_selected[$code] = $i;
-	        //print "x $code x $i y<br>";
-	    }
-	    $_SESSION["export_selected_fields"] = $array_selected;
-    }
+	} else {
+		unset($array_selected[$_GET["field"]]);
+		// Renumber fields of array_selected (from 1 to nb_elements)
+		asort($array_selected);
+		$i = 0;
+		$array_selected_save = $array_selected;
+		foreach ($array_selected as $code=>$value)
+		{
+			$i++;
+			$array_selected[$code] = $i;
+			//print "x $code x $i y<br>";
+		}
+		$_SESSION["export_selected_fields"] = $array_selected;
+	}
 }
 
 if ($action == 'downfield' || $action == 'upfield')
 {
-    $pos = $array_selected[$_GET["field"]];
-    if ($action == 'downfield') $newpos = $pos + 1;
-    if ($action == 'upfield') $newpos = $pos - 1;
-    // Recherche code avec qui switcher
-    $newcode = "";
-    foreach ($array_selected as $code=>$value)
-    {
-        if ($value == $newpos)
-        {
-            $newcode = $code;
-            break;
-        }
-    }
-    //print("Switch pos=$pos (code=".$_GET["field"].") and newpos=$newpos (code=$newcode)");
-    if ($newcode)   // Si newcode trouve (protection contre resoumission de page)
-    {
-        $array_selected[$_GET["field"]] = $newpos;
-        $array_selected[$newcode] = $pos;
-        $_SESSION["export_selected_fields"] = $array_selected;
-    }
+	$pos = $array_selected[$_GET["field"]];
+	if ($action == 'downfield') $newpos = $pos + 1;
+	if ($action == 'upfield') $newpos = $pos - 1;
+	// Recherche code avec qui switcher
+	$newcode = "";
+	foreach ($array_selected as $code=>$value)
+	{
+		if ($value == $newpos)
+		{
+			$newcode = $code;
+			break;
+		}
+	}
+	//print("Switch pos=$pos (code=".$_GET["field"].") and newpos=$newpos (code=$newcode)");
+	if ($newcode)   // Si newcode trouve (protection contre resoumission de page)
+	{
+		$array_selected[$_GET["field"]] = $newpos;
+		$array_selected[$newcode] = $pos;
+		$_SESSION["export_selected_fields"] = $array_selected;
+	}
 }
 
 if ($step == 1 || $action == 'cleanselect')
 {
-    $_SESSION["export_selected_fields"] = array();
-    $_SESSION["export_filtered_fields"] = array();
-    $array_selected = array();
-    $array_filtervalue = array();
+	$_SESSION["export_selected_fields"] = array();
+	$_SESSION["export_filtered_fields"] = array();
+	$array_selected = array();
+	$array_filtervalue = array();
 }
 
 if ($action == 'builddoc')
 {
-    $max_execution_time_for_export = (empty($conf->global->EXPORT_MAX_EXECUTION_TIME) ? 300 : $conf->global->EXPORT_MAX_EXECUTION_TIME); // 5mn if not defined
-    $max_time = @ini_get("max_execution_time");
-    if ($max_time && $max_time < $max_execution_time_for_export)
-    {
-        @ini_set("max_execution_time", $max_execution_time_for_export); // This work only if safe mode is off. also web servers has timeout of 300
-    }
+	$max_execution_time_for_export = (empty($conf->global->EXPORT_MAX_EXECUTION_TIME) ? 300 : $conf->global->EXPORT_MAX_EXECUTION_TIME); // 5mn if not defined
+	$max_time = @ini_get("max_execution_time");
+	if ($max_time && $max_time < $max_execution_time_for_export)
+	{
+		@ini_set("max_execution_time", $max_execution_time_for_export); // This work only if safe mode is off. also web servers has timeout of 300
+	}
 
-    // Build export file
+	// Build export file
 	$result = $objexport->build_file($user, GETPOST('model', 'alpha'), $datatoexport, $array_selected, $array_filtervalue);
 	if ($result < 0)
 	{
@@ -284,8 +285,8 @@ if ($action == 'builddoc')
 		$sqlusedforexport = $objexport->sqlusedforexport;
 	} else {
 		setEventMessages($langs->trans("FileSuccessfullyBuilt"), null, 'mesgs');
-	    $sqlusedforexport = $objexport->sqlusedforexport;
-    }
+		$sqlusedforexport = $objexport->sqlusedforexport;
+	}
 }
 
 // Delete file
@@ -334,12 +335,12 @@ if ($action == 'add_export_model')
 			}
 		}
 
-	    $objexport->model_name = $export_name;
-	    $objexport->datatoexport = $datatoexport;
-	    $objexport->hexa = $hexa;
-	    $objexport->hexafiltervalue = $hexafiltervalue;
+		$objexport->model_name = $export_name;
+		$objexport->datatoexport = $datatoexport;
+		$objexport->hexa = $hexa;
+		$objexport->hexafiltervalue = $hexafiltervalue;
 
-	    $result = $objexport->create($user);
+		$result = $objexport->create($user);
 		if ($result >= 0)
 		{
 			setEventMessages($langs->trans("ExportModelSaved", $objexport->model_name), null, 'mesgs');
@@ -357,15 +358,15 @@ if ($action == 'add_export_model')
 // Reload a predefined export model
 if ($step == 2 && $action == 'select_model')
 {
-    $_SESSION["export_selected_fields"] = array();
-    $_SESSION["export_filtered_fields"] = array();
+	$_SESSION["export_selected_fields"] = array();
+	$_SESSION["export_filtered_fields"] = array();
 
-    $array_selected = array();
-    $array_filtervalue = array();
+	$array_selected = array();
+	$array_filtervalue = array();
 
-    $result = $objexport->fetch($exportmodelid);
-    if ($result > 0)
-    {
+	$result = $objexport->fetch($exportmodelid);
+	if ($result > 0)
+	{
 		$fieldsarray = preg_split("/,(?! [^(]*\))/", $objexport->hexa);
 		$i = 1;
 		foreach ($fieldsarray as $val)
@@ -384,7 +385,7 @@ if ($step == 2 && $action == 'select_model')
 			$i++;
 		}
 		$_SESSION["export_filtered_fields"] = $array_filtervalue;
-    }
+	}
 }
 
 // Get form with filters
@@ -419,143 +420,143 @@ if ($step == 4 && $action == 'submitFormField')
 
 if ($step == 1 || !$datatoexport)
 {
-    llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
+	llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
 
-    $h = 0;
+	$h = 0;
 
-    $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=1';
-    $head[$h][1] = $langs->trans("Step")." 1";
-    $hselected = $h;
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=1';
+	$head[$h][1] = $langs->trans("Step")." 1";
+	$hselected = $h;
+	$h++;
 
-    dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1);
+	print dol_get_fiche_head($head, $hselected, $langs->trans("NewExport"), -1);
 
 
-    print '<div class="opacitymedium">'.$langs->trans("SelectExportDataSet").'</div><br>';
+	print '<div class="opacitymedium">'.$langs->trans("SelectExportDataSet").'</div><br>';
 
-    // Affiche les modules d'exports
-    print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td>'.$langs->trans("Module").'</td>';
-    print '<td>'.$langs->trans("ExportableDatas").'</td>';
-    print '<td>&nbsp;</td>';
-    print '</tr>';
+	// Affiche les modules d'exports
+	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("Module").'</td>';
+	print '<td>'.$langs->trans("ExportableDatas").'</td>';
+	print '<td>&nbsp;</td>';
+	print '</tr>';
 
-    if (count($objexport->array_export_module))
-    {
-    	$sortedarrayofmodules = dol_sort_array($objexport->array_export_module, 'module_position', 'asc', 0, 0, 1);
-    	foreach ($sortedarrayofmodules as $key => $value)
-        {
-            print '<tr class="oddeven"><td nospan="nospan">';
-	        //print img_object($objexport->array_export_module[$key]->getName(),$export->array_export_module[$key]->picto).' ';
-            print $objexport->array_export_module[$key]->getName();
-            print '</td><td>';
-			$icon = preg_replace('/:.*$/', '', $objexport->array_export_icon[$key]);
+	if (count($objexport->array_export_module))
+	{
+		asort($objexport->array_export_code_for_sort);
+		//var_dump($objexport->array_export_code_for_sort);
+		//$sortedarrayofmodules = dol_sort_array($objexport->array_export_module, 'module_position', 'asc', 0, 0, 1);
+		foreach ($objexport->array_export_code_for_sort as $key => $value)
+		{
+			print '<tr class="oddeven"><td nospan="nospan">';
+			//print img_object($objexport->array_export_module[$key]->getName(),$export->array_export_module[$key]->picto).' ';
+			print $objexport->array_export_module[$key]->getName();
+			print '</td><td>';
+			$entity = preg_replace('/:.*$/', '', $objexport->array_export_icon[$key]);
+			$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
 			$label = $objexport->array_export_label[$key];
-            //print $value.'-'.$icon.'-'.$label."<br>";
-			print img_object($objexport->array_export_module[$key]->getName(), $icon).' ';
-            print $label;
-            print '</td><td class="right">';
-            if ($objexport->array_export_perms[$key])
-            {
-            	print '<a href="'.DOL_URL_ROOT.'/exports/export.php?step=2&module_position='.$objexport->array_export_module[$key]->module_position.'&datatoexport='.$objexport->array_export_code[$key].'">'.img_picto($langs->trans("NewExport"), 'filenew').'</a>';
-            } else {
-            	print $langs->trans("NotEnoughPermissions");
-            }
-           	print '</td></tr>';
-        }
-    } else {
-        print '<tr><td class="oddeven" colspan="3">'.$langs->trans("NoExportableData").'</td></tr>';
-    }
-    print '</table>';
-    print '</div>';
+			//print $value.'-'.$icon.'-'.$label."<br>";
+			print img_object($objexport->array_export_module[$key]->getName(), $entityicon).' ';
+			print $label;
+			print '</td><td class="right">';
+			if ($objexport->array_export_perms[$key]) {
+				print '<a href="'.DOL_URL_ROOT.'/exports/export.php?step=2&module_position='.$objexport->array_export_module[$key]->module_position.'&datatoexport='.$objexport->array_export_code[$key].'">'.img_picto($langs->trans("NewExport"), 'next', 'class="fa-15x"').'</a>';
+			} else {
+				print $langs->trans("NotEnoughPermissions");
+			}
+		   	print '</td></tr>';
+		}
+	} else {
+		print '<tr><td class="oddeven" colspan="3">'.$langs->trans("NoExportableData").'</td></tr>';
+	}
+	print '</table>';
+	print '</div>';
 
-    print '</div>';
+	print '</div>';
 }
 
 if ($step == 2 && $datatoexport)
 {
-    llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
+	llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
 
-    $h = 0;
+	$h = 0;
 
-    $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=1';
-    $head[$h][1] = $langs->trans("Step")." 1";
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=1';
+	$head[$h][1] = $langs->trans("Step")." 1";
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport;
-    $head[$h][1] = $langs->trans("Step")." 2";
-    $hselected = $h;
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport;
+	$head[$h][1] = $langs->trans("Step")." 2";
+	$hselected = $h;
+	$h++;
 
-    dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -2);
+	print dol_get_fiche_head($head, $hselected, $langs->trans("NewExport"), -2);
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table width="100%" class="border tableforfield">';
+	print '<table width="100%" class="border tableforfield">';
 
-    // Module
-    print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>';
-    print '<td>';
-    //print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' ';
-    print $objexport->array_export_module[0]->getName();
-    print '</td></tr>';
+	// Module
+	print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>';
+	print '<td>';
+	print $objexport->array_export_module[0]->getName();
+	print '</td></tr>';
 
     // Lot de donnees a exporter
     print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
     print '<td>';
-	$icon = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
-    $label = $objexport->array_export_label[0];
-    //print $value.'-'.$icon.'-'.$label."<br>";
-    print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
-    print $label;
+    $entity = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
+    $entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+    print img_object($objexport->array_export_module[0]->getName(), $entityicon).' ';
+    print $objexport->array_export_label[0];
     print '</td></tr>';
 
-    print '</table>';
-    print '</div>';
+	print '</table>';
+	print '</div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '<br>';
+	print '<br>';
 
-    // Combo list of export models
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="select_model">';
-    print '<input type="hidden" name="step" value="2">';
-    print '<input type="hidden" name="datatoexport" value="'.$datatoexport.'">';
-    print '<div class="valignmiddle marginbottomonly">';
-    print '<span class="opacitymedium">'.$langs->trans("SelectExportFields").'</span> ';
-    if (empty($conf->global->EXPORTS_SHARE_MODELS)) {
-    	$htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1, $user->id);
-    } else {
-    	$htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1);
-    }
-    print ' ';
-    print '<input type="submit" class="button" value="'.$langs->trans("Select").'">';
-    print '</div>';
-    print '</form>';
+	// Combo list of export models
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="select_model">';
+	print '<input type="hidden" name="step" value="2">';
+	print '<input type="hidden" name="datatoexport" value="'.$datatoexport.'">';
+	print '<div class="valignmiddle marginbottomonly">';
+	print '<span class="opacitymedium">'.$langs->trans("SelectExportFields").'</span> ';
+	if (empty($conf->global->EXPORTS_SHARE_MODELS)) {
+		$htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1, $user->id);
+	} else {
+		$htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1);
+	}
+	print ' ';
+	print '<input type="submit" class="button" value="'.$langs->trans("Select").'">';
+	print '</div>';
+	print '</form>';
 
 
-    print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
+	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Entities").'</td>';
-    print '<td>'.$langs->trans("ExportableFields").'</td>';
-    print '<td width="100" class="center">';
-    print '<a class="liste_titre commonlink" title='.$langs->trans("All").' alt='.$langs->trans("All").' href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=selectfield&field=all">'.$langs->trans("All")."</a>";
-    print ' / ';
-    print '<a class="liste_titre commonlink" title='.$langs->trans("None").' alt='.$langs->trans("None").' href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=unselectfield&field=all">'.$langs->trans("None")."</a>";
-    print '</td>';
-    print '<td width="44%">'.$langs->trans("ExportedFields").'</td>';
-    print '</tr>';
+	print '<td>'.$langs->trans("ExportableFields").'</td>';
+	print '<td width="100" class="center">';
+	print '<a class="liste_titre commonlink" title='.$langs->trans("All").' alt='.$langs->trans("All").' href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=selectfield&field=all">'.$langs->trans("All")."</a>";
+	print ' / ';
+	print '<a class="liste_titre commonlink" title='.$langs->trans("None").' alt='.$langs->trans("None").' href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=unselectfield&field=all">'.$langs->trans("None")."</a>";
+	print '</td>';
+	print '<td width="44%">'.$langs->trans("ExportedFields").'</td>';
+	print '</tr>';
 
-    // Champs exportables
-    $fieldsarray = $objexport->array_export_fields[0];
-    // Select request if all fields are selected
-    $sqlmaxforexport = $objexport->build_sql(0, array(), array());
+	// Champs exportables
+	$fieldsarray = $objexport->array_export_fields[0];
+	// Select request if all fields are selected
+	$sqlmaxforexport = $objexport->build_sql(0, array(), array());
 
 	//    $this->array_export_module[0]=$module;
 	//    $this->array_export_code[0]=$module->export_code[$r];
@@ -565,48 +566,48 @@ if ($step == 2 && $datatoexport)
 	//    $this->array_export_entities[0]=$module->export_fields_entities[$r];
 	//    $this->array_export_alias[0]=$module->export_fields_alias[$r];
 
-    $i = 0;
+	$i = 0;
 
-    foreach ($fieldsarray as $code=>$label)
-    {
-        print '<tr class="oddeven">';
+	foreach ($fieldsarray as $code=>$label)
+	{
+		print '<tr class="oddeven">';
 
-        $i++;
+		$i++;
 
-        $entity = (!empty($objexport->array_export_entities[0][$code]) ? $objexport->array_export_entities[0][$code] : $objexport->array_export_icon[0]);
-        $entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
-        $entitylang = (!empty($entitytolang[$entity]) ? $entitytolang[$entity] : $entity);
+		$entity = (!empty($objexport->array_export_entities[0][$code]) ? $objexport->array_export_entities[0][$code] : $objexport->array_export_icon[0]);
+		$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+		$entitylang = (!empty($entitytolang[$entity]) ? $entitytolang[$entity] : $entity);
 
-        print '<td class="nowrap">';
-        // If value of entityicon=entitylang='icon:Label'
-        //print $code.'-'.$label.'-'.$entity;
+		print '<td class="nowrap">';
+		// If value of entityicon=entitylang='icon:Label'
+		//print $code.'-'.$label.'-'.$entity;
 
-        $tmparray = explode(':', $entityicon);
-        if (count($tmparray) >= 2)
-        {
-            $entityicon = $tmparray[0];
-            $entitylang = $tmparray[1];
-        }
-        print img_object('', $entityicon).' '.$langs->trans($entitylang);
-        print '</td>';
+		$tmparray = explode(':', $entityicon);
+		if (count($tmparray) >= 2)
+		{
+			$entityicon = $tmparray[0];
+			$entitylang = $tmparray[1];
+		}
+		print img_object('', $entityicon).' '.$langs->trans($entitylang);
+		print '</td>';
 
-        $text = (empty($objexport->array_export_special[0][$code]) ? '' : '<i>').$langs->trans($label).(empty($objexport->array_export_special[0][$code]) ? '' : '</i>');
+		$text = (empty($objexport->array_export_special[0][$code]) ? '' : '<i>').$langs->trans($label).(empty($objexport->array_export_special[0][$code]) ? '' : '</i>');
 
-        $tablename = getablenamefromfield($code, $sqlmaxforexport);
-        $htmltext = '<b>'.$langs->trans("Name").":</b> ".$text.'<br>';
-        if (!empty($objexport->array_export_special[0][$code]))
-        {
-            $htmltext .= '<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
-        } else {
-            $htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
-        }
+		$tablename = getablenamefromfield($code, $sqlmaxforexport);
+		$htmltext = '<b>'.$langs->trans("Name").":</b> ".$text.'<br>';
+		if (!empty($objexport->array_export_special[0][$code]))
+		{
+			$htmltext .= '<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
+		} else {
+			$htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
+		}
    		if (!empty($objexport->array_export_examplevalues[0][$code]))
 		{
-		    $htmltext .= '<b>'.$langs->trans("SourceExample").':</b> '.$objexport->array_export_examplevalues[0][$code].'<br>';
+			$htmltext .= '<b>'.$langs->trans("SourceExample").':</b> '.$objexport->array_export_examplevalues[0][$code].'<br>';
 		}
-    	if (!empty($objexport->array_export_TypeFields[0][$code]))
+		if (!empty($objexport->array_export_TypeFields[0][$code]))
 		{
-		    $htmltext .= '<b>'.$langs->trans("Type").':</b> '.$objexport->array_export_TypeFields[0][$code].'<br>';
+			$htmltext .= '<b>'.$langs->trans("Type").':</b> '.$objexport->array_export_TypeFields[0][$code].'<br>';
 		}
 		if (!empty($objexport->array_export_help[0][$code]))
 		{
@@ -614,38 +615,38 @@ if ($step == 2 && $datatoexport)
 		}
 
 		if (isset($array_selected[$code]) && $array_selected[$code])
-        {
-            // Selected fields
-            print '<td>&nbsp;</td>';
-            print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=unselectfield&field='.$code.'">'.img_left('default', 0, 'style="max-width: 20px"').'</a></td>';
-            print '<td>';
-            //print $text.'-'.$htmltext."<br>";
-            print $form->textwithpicto($text, $htmltext);
-			//print ' ('.$code.')';
-            print '</td>';
-        } else {
-        	// Fields not selected
-            print '<td>';
+		{
+			// Selected fields
+			print '<td>&nbsp;</td>';
+			print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=unselectfield&field='.$code.'">'.img_left('default', 0, 'style="max-width: 20px"').'</a></td>';
+			print '<td>';
 			//print $text.'-'.$htmltext."<br>";
 			print $form->textwithpicto($text, $htmltext);
 			//print ' ('.$code.')';
-            print '</td>';
-            print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=selectfield&field='.$code.'">'.img_right('default', 0, 'style="max-width: 20px"').'</a></td>';
-            print '<td>&nbsp;</td>';
-        }
+			print '</td>';
+		} else {
+			// Fields not selected
+			print '<td>';
+			//print $text.'-'.$htmltext."<br>";
+			print $form->textwithpicto($text, $htmltext);
+			//print ' ('.$code.')';
+			print '</td>';
+			print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=selectfield&field='.$code.'">'.img_right('default', 0, 'style="max-width: 20px"').'</a></td>';
+			print '<td>&nbsp;</td>';
+		}
 
-        print '</tr>';
-    }
+		print '</tr>';
+	}
 
-    print '</table>';
-    print '</div>';
+	print '</table>';
+	print '</div>';
 
-    /*
+	/*
      * Barre d'action
      */
-    print '<div class="tabsAction tabsActionNoBottom">';
+	print '<div class="tabsAction tabsActionNoBottom">';
 
-    if (count($array_selected))
+	if (count($array_selected))
 	{
 		// If filters exist
 		if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
@@ -658,19 +659,19 @@ if ($step == 2 && $datatoexport)
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("SelectAtLeastOneField")).'">'.$langs->trans("NextStep").'</a>';
 	}
 
-    print '</div>';
+	print '</div>';
 }
 
 if ($step == 3 && $datatoexport)
 {
-    if (count($array_selected) < 1)      // This occurs when going back to page after sessecion expired
-    {
-        // Switch to step 2
-        header("Location: ".DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport);
-        exit;
-    }
+	if (count($array_selected) < 1)      // This occurs when going back to page after sessecion expired
+	{
+		// Switch to step 2
+		header("Location: ".DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport);
+		exit;
+	}
 
-    llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
+	llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
 
 	$h = 0;
 
@@ -687,10 +688,10 @@ if ($step == 3 && $datatoexport)
 	$hselected = $h;
 	$h++;
 
-	dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -2);
+	print dol_get_fiche_head($head, $hselected, $langs->trans("NewExport"), -2);
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table width="100%" class="border tableforfield">';
 
 	// Module
@@ -703,11 +704,10 @@ if ($step == 3 && $datatoexport)
 	// Lot de donnees a exporter
 	print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
 	print '<td>';
-	$icon = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
-	$label = $objexport->array_export_label[0];
-	//print $value.'-'.$icon.'-'.$label."<br>";
-	print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
-	print $label;
+	$entity = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
+	$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+	print img_object($objexport->array_export_module[0]->getName(), $entityicon).' ';
+	print $objexport->array_export_label[0];
 	print '</td></tr>';
 
 	// Nbre champs exportes
@@ -735,7 +735,7 @@ if ($step == 3 && $datatoexport)
 
 	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 
-    print '<table class="noborder centpercent">';
+	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Entities").'</td>';
 	//print '<td>'.$langs->trans("ExportableFields").'</td>';
@@ -782,19 +782,19 @@ if ($step == 3 && $datatoexport)
 
 		$tablename = getablenamefromfield($code, $sqlmaxforexport);
 		$htmltext = '<b>'.$langs->trans("Name").':</b> '.$text.'<br>';
-        if (!empty($objexport->array_export_special[0][$code]))
+		if (!empty($objexport->array_export_special[0][$code]))
 		{
-		    $htmltext .= '<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
+			$htmltext .= '<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
 		} else {
-		    $htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
+			$htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
 		}
 		if (!empty($objexport->array_export_examplevalues[0][$code]))
 		{
-		    $htmltext .= '<b>'.$langs->trans("SourceExample").':</b> '.$objexport->array_export_examplevalues[0][$code].'<br>';
+			$htmltext .= '<b>'.$langs->trans("SourceExample").':</b> '.$objexport->array_export_examplevalues[0][$code].'<br>';
 		}
 		if (!empty($objexport->array_export_TypeFields[0][$code]))
 		{
-		    $htmltext .= '<b>'.$langs->trans("Type").':</b> '.$objexport->array_export_TypeFields[0][$code].'<br>';
+			$htmltext .= '<b>'.$langs->trans("Type").':</b> '.$objexport->array_export_TypeFields[0][$code].'<br>';
 		}
 		if (!empty($objexport->array_export_help[0][$code]))
 		{
@@ -824,7 +824,7 @@ if ($step == 3 && $datatoexport)
 	}
 
 	print '</table>';
-    print '</div>';
+	print '</div>';
 
 	print '</div>';
 
@@ -839,214 +839,215 @@ if ($step == 3 && $datatoexport)
 
 if ($step == 4 && $datatoexport)
 {
-    if (count($array_selected) < 1)     // This occurs when going back to page after sessecion expired
-    {
-        // Switch to step 2
-        header("Location: ".DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport);
-        exit;
-    }
+	if (count($array_selected) < 1)     // This occurs when going back to page after sessecion expired
+	{
+		// Switch to step 2
+		header("Location: ".DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport);
+		exit;
+	}
 
-    asort($array_selected);
+	asort($array_selected);
 
-    llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
+	llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
 
-    $stepoffset = 0;
-    $h = 0;
+	$stepoffset = 0;
+	$h = 0;
 
-    $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=1';
-    $head[$h][1] = $langs->trans("Step")." 1";
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=1';
+	$head[$h][1] = $langs->trans("Step")." 1";
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport;
-    $head[$h][1] = $langs->trans("Step")." 2";
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport;
+	$head[$h][1] = $langs->trans("Step")." 2";
+	$h++;
 
-    // If filters exist
-    if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
-    {
-    	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=3&datatoexport='.$datatoexport;
-    	$head[$h][1] = $langs->trans("Step")." 3";
-    	$h++;
-    	$stepoffset++;
-    }
+	// If filters exist
+	if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
+	{
+		$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=3&datatoexport='.$datatoexport;
+		$head[$h][1] = $langs->trans("Step")." 3";
+		$h++;
+		$stepoffset++;
+	}
 
-    $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=4&datatoexport='.$datatoexport;
-    $head[$h][1] = $langs->trans("Step")." ".(3 + $stepoffset);
-    $hselected = $h;
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=4&datatoexport='.$datatoexport;
+	$head[$h][1] = $langs->trans("Step")." ".(3 + $stepoffset);
+	$hselected = $h;
+	$h++;
 
-    dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -2);
+	print dol_get_fiche_head($head, $hselected, $langs->trans("NewExport"), -2);
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
-    print '<table width="100%" class="border tableforfield">';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table width="100%" class="border tableforfield">';
 
-    // Module
-    print '<tr><td class="titlefield tableforfield">'.$langs->trans("Module").'</td>';
-    print '<td>';
-    //print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' ';
-    print $objexport->array_export_module[0]->getName();
-    print '</td></tr>';
+	// Module
+	print '<tr><td class="titlefield tableforfield">'.$langs->trans("Module").'</td>';
+	print '<td>';
+	//print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' ';
+	print $objexport->array_export_module[0]->getName();
+	print '</td></tr>';
 
     // Lot de donnees a exporter
     print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
     print '<td>';
-	$icon = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
-    print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
+	$entity = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
+	$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+    print img_object($objexport->array_export_module[0]->getName(), $entityicon).' ';
     print $objexport->array_export_label[0];
     print '</td></tr>';
 
-    // List of exported fields
-    print '<tr><td>'.$langs->trans("ExportedFields").'</td>';
-    $list = '';
-    foreach ($array_selected as $code=>$value)
-    {
-        $list .= (!empty($list) ? ', ' : '');
-        $list .= $langs->trans($objexport->array_export_fields[0][$code]);
-    }
-    print '<td>'.$list.'</td>';
-    print '</tr>';
+	// List of exported fields
+	print '<tr><td>'.$langs->trans("ExportedFields").'</td>';
+	$list = '';
+	foreach ($array_selected as $code=>$value)
+	{
+		$list .= (!empty($list) ? ', ' : '');
+		$list .= $langs->trans($objexport->array_export_fields[0][$code]);
+	}
+	print '<td>'.$list.'</td>';
+	print '</tr>';
 
-    // List of filtered fiels
-    if (isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
-    {
-    	print '<tr><td>'.$langs->trans("FilteredFields").'</td>';
-    	$list = '';
-    	if (!empty($array_filtervalue))
-    	{
-    		foreach ($array_filtervalue as $code=>$value)
-    		{
-    			if (isset($objexport->array_export_fields[0][$code]))
-    			{
-    				$list .= ($list ? ', ' : '');
-    				if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/', $array_filtervalue[$code])) $list .= $langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '');
-    				else $list .= $langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '')."'";
-    			}
-    		}
-    	}
-    	print '<td>'.(!empty($list) ? $list : '<span class="opacitymedium">'.$langs->trans("None").'</span>').'</td>';
-    	print '</tr>';
-    }
+	// List of filtered fiels
+	if (isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
+	{
+		print '<tr><td>'.$langs->trans("FilteredFields").'</td>';
+		$list = '';
+		if (!empty($array_filtervalue))
+		{
+			foreach ($array_filtervalue as $code=>$value)
+			{
+				if (isset($objexport->array_export_fields[0][$code]))
+				{
+					$list .= ($list ? ', ' : '');
+					if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/', $array_filtervalue[$code])) $list .= $langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '');
+					else $list .= $langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '')."'";
+				}
+			}
+		}
+		print '<td>'.(!empty($list) ? $list : '<span class="opacitymedium">'.$langs->trans("None").'</span>').'</td>';
+		print '</tr>';
+	}
 
-    print '</table>';
-    print '</div>';
+	print '</table>';
+	print '</div>';
 
-    print '<br>';
+	print '<br>';
 
-    // Select request if all fields are selected
-    $sqlmaxforexport = $objexport->build_sql(0, array(), array());
+	// Select request if all fields are selected
+	$sqlmaxforexport = $objexport->build_sql(0, array(), array());
 
-    print '<div class="marginbottomonly"><span class="opacitymedium">'.$langs->trans("ChooseFieldsOrdersAndTitle").'</span></div>';
+	print '<div class="marginbottomonly"><span class="opacitymedium">'.$langs->trans("ChooseFieldsOrdersAndTitle").'</span></div>';
 
-    print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td>'.$langs->trans("Entities").'</td>';
-    print '<td>'.$langs->trans("ExportedFields").'</td>';
-    print '<td class="right" colspan="2">'.$langs->trans("Position").'</td>';
-    //print '<td>&nbsp;</td>';
-    //print '<td>'.$langs->trans("FieldsTitle").'</td>';
-    print '</tr>';
+	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("Entities").'</td>';
+	print '<td>'.$langs->trans("ExportedFields").'</td>';
+	print '<td class="right" colspan="2">'.$langs->trans("Position").'</td>';
+	//print '<td>&nbsp;</td>';
+	//print '<td>'.$langs->trans("FieldsTitle").'</td>';
+	print '</tr>';
 
-    foreach ($array_selected as $code=>$value)
-    {
-        print '<tr class="oddeven">';
+	foreach ($array_selected as $code=>$value)
+	{
+		print '<tr class="oddeven">';
 
-        $entity = (!empty($objexport->array_export_entities[0][$code]) ? $objexport->array_export_entities[0][$code] : $objexport->array_export_icon[0]);
-        $entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
-        $entitylang = (!empty($entitytolang[$entity]) ? $entitytolang[$entity] : $entity);
+		$entity = (!empty($objexport->array_export_entities[0][$code]) ? $objexport->array_export_entities[0][$code] : $objexport->array_export_icon[0]);
+		$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+		$entitylang = (!empty($entitytolang[$entity]) ? $entitytolang[$entity] : $entity);
 
-        print '<td class="nowrap">';
-        // If value of entityicon=entitylang='icon:Label'
-        $tmparray = explode(':', $entityicon);
-        if (count($tmparray) >= 2)
-        {
-            $entityicon = $tmparray[0];
-            $entitylang = $tmparray[1];
-        }
-        print img_object('', $entityicon).' '.$langs->trans($entitylang);
-        print '</td>';
+		print '<td class="nowrap">';
+		// If value of entityicon=entitylang='icon:Label'
+		$tmparray = explode(':', $entityicon);
+		if (count($tmparray) >= 2)
+		{
+			$entityicon = $tmparray[0];
+			$entitylang = $tmparray[1];
+		}
+		print img_object('', $entityicon).' '.$langs->trans($entitylang);
+		print '</td>';
 
-        $labelName = $objexport->array_export_fields[0][$code];
+		$labelName = $objexport->array_export_fields[0][$code];
 
 		$text = (empty($objexport->array_export_special[0][$code]) ? '' : '<i>').$langs->trans($labelName).(empty($objexport->array_export_special[0][$code]) ? '' : '</i>');
 
-        $tablename = getablenamefromfield($code, $sqlmaxforexport);
-        $htmltext = '<b>'.$langs->trans("Name").':</b> '.$text.'<br>';
-        if (!empty($objexport->array_export_special[0][$code]))
-        {
-            $htmltext .= '<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
-        } else {
-            $htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
-        }
-        if (!empty($objexport->array_export_examplevalues[0][$code]))
-        {
-            $htmltext .= '<b>'.$langs->trans("SourceExample").':</b> '.$objexport->array_export_examplevalues[0][$code].'<br>';
-        }
-        if (!empty($objexport->array_export_TypeFields[0][$code]))
-        {
-            $htmltext .= '<b>'.$langs->trans("Type").':</b> '.$objexport->array_export_TypeFields[0][$code].'<br>';
-        }
-        if (!empty($objexport->array_export_help[0][$code]))
-        {
-        	$htmltext .= '<b>'.$langs->trans("Help").':</b> '.$langs->trans($objexport->array_export_help[0][$code]).'<br>';
-        }
+		$tablename = getablenamefromfield($code, $sqlmaxforexport);
+		$htmltext = '<b>'.$langs->trans("Name").':</b> '.$text.'<br>';
+		if (!empty($objexport->array_export_special[0][$code]))
+		{
+			$htmltext .= '<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
+		} else {
+			$htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
+		}
+		if (!empty($objexport->array_export_examplevalues[0][$code]))
+		{
+			$htmltext .= '<b>'.$langs->trans("SourceExample").':</b> '.$objexport->array_export_examplevalues[0][$code].'<br>';
+		}
+		if (!empty($objexport->array_export_TypeFields[0][$code]))
+		{
+			$htmltext .= '<b>'.$langs->trans("Type").':</b> '.$objexport->array_export_TypeFields[0][$code].'<br>';
+		}
+		if (!empty($objexport->array_export_help[0][$code]))
+		{
+			$htmltext .= '<b>'.$langs->trans("Help").':</b> '.$langs->trans($objexport->array_export_help[0][$code]).'<br>';
+		}
 
-        print '<td>';
-        print $form->textwithpicto($text, $htmltext);
+		print '<td>';
+		print $form->textwithpicto($text, $htmltext);
 		//print ' ('.$code.')';
-        print '</td>';
+		print '</td>';
 
-        print '<td class="right" width="100">';
-        print $value.' ';
-        print '</td><td class="center nowraponall" width="40">';
-        if ($value < count($array_selected)) print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=downfield&field='.$code.'">'.img_down().'</a>';
-        if ($value > 1) print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=upfield&field='.$code.'">'.img_up().'</a>';
-        print '</td>';
+		print '<td class="right" width="100">';
+		print $value.' ';
+		print '</td><td class="center nowraponall" width="40">';
+		if ($value < count($array_selected)) print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=downfield&field='.$code.'">'.img_down().'</a>';
+		if ($value > 1) print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=upfield&field='.$code.'">'.img_up().'</a>';
+		print '</td>';
 
-        //print '<td>&nbsp;</td>';
-        //print '<td>'.$langs->trans($objexport->array_export_fields[0][$code]).'</td>';
+		//print '<td>&nbsp;</td>';
+		//print '<td>'.$langs->trans($objexport->array_export_fields[0][$code]).'</td>';
 
-        print '</tr>';
-    }
+		print '</tr>';
+	}
 
-    print '</table>';
-    print '</div>';
+	print '</table>';
+	print '</div>';
 
-    print '</div>';
+	print '</div>';
 
-    /*
+	/*
      * Barre d'action
      *
      */
-    print '<div class="tabsAction">';
+	print '<div class="tabsAction">';
 
-    if (count($array_selected))
-    {
-        print '<a class="butAction" href="export.php?step='.($step + 1).'&datatoexport='.$datatoexport.'">'.$langs->trans("NextStep").'</a>';
-    }
+	if (count($array_selected))
+	{
+		print '<a class="butAction" href="export.php?step='.($step + 1).'&datatoexport='.$datatoexport.'">'.$langs->trans("NextStep").'</a>';
+	}
 
-    print '</div>';
+	print '</div>';
 
 
 	// Area for profils export
 	if (count($array_selected))
-    {
+	{
 		print '<br>';
 
 		print '<div class="marginbottomonly">';
-        print '<span class="opacitymedium">'.$langs->trans("SaveExportModel").'</span>';
-        print '</div>';
+		print '<span class="opacitymedium">'.$langs->trans("SaveExportModel").'</span>';
+		print '</div>';
 
 		print '<form class="nocellnopadd" action="export.php" method="post">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<input type="hidden" name="action" value="add_export_model">';
-        print '<input type="hidden" name="step" value="'.$step.'">';
-        print '<input type="hidden" name="datatoexport" value="'.$datatoexport.'">';
-        print '<input type="hidden" name="hexa" value="'.$hexa.'">';
+		print '<input type="hidden" name="action" value="add_export_model">';
+		print '<input type="hidden" name="step" value="'.$step.'">';
+		print '<input type="hidden" name="datatoexport" value="'.$datatoexport.'">';
+		print '<input type="hidden" name="hexa" value="'.$hexa.'">';
 
-        print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-        print '<table class="noborder centpercent">';
+		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("ExportModelName").'</td>';
 		print '<td>&nbsp;</td>';
@@ -1054,11 +1055,11 @@ if ($step == 4 && $datatoexport)
 
 		print '<tr class="oddeven">';
 		print '<td><input name="export_name" size="32" value=""></td><td class="right">';
-        print '<input type="submit" class="button reposition" value="'.$langs->trans("Save").'">';
-        print '</td></tr>';
+		print '<input type="submit" class="button reposition button-save" value="'.$langs->trans("Save").'">';
+		print '</td></tr>';
 
-        // List of existing export profils
-    	$sql = "SELECT rowid, label";
+		// List of existing export profils
+		$sql = "SELECT rowid, label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."export_model";
 		$sql .= " WHERE type = '".$db->escape($datatoexport)."'";
 		if (empty($conf->global->EXPORTS_SHARE_MODELS))$sql .= " AND fk_user=".$user->id;
@@ -1084,168 +1085,169 @@ if ($step == 4 && $datatoexport)
 			dol_print_error($db);
 		}
 
-        print '</table>';
-        print '</div>';
+		print '</table>';
+		print '</div>';
 
-        print '</form>';
-    }
+		print '</form>';
+	}
 }
 
 if ($step == 5 && $datatoexport)
 {
-    if (count($array_selected) < 1)      // This occurs when going back to page after sessecion expired
-    {
-        // Switch to step 2
-        header("Location: ".DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport);
-        exit;
-    }
+	if (count($array_selected) < 1)      // This occurs when going back to page after sessecion expired
+	{
+		// Switch to step 2
+		header("Location: ".DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport);
+		exit;
+	}
 
 	asort($array_selected);
 
-    llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
+	llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
 
-    $h = 0;
-    $stepoffset = 0;
+	$h = 0;
+	$stepoffset = 0;
 
-    $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=1';
-    $head[$h][1] = $langs->trans("Step")." 1";
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=1';
+	$head[$h][1] = $langs->trans("Step")." 1";
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport;
-    $head[$h][1] = $langs->trans("Step")." 2";
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport;
+	$head[$h][1] = $langs->trans("Step")." 2";
+	$h++;
 
-    // si le filtrage est parametre pour l'export ou pas
-    if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
-    {
-    	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=3&datatoexport='.$datatoexport;
-    	$head[$h][1] = $langs->trans("Step")." 3";
-    	$h++;
-    	$stepoffset++;
-    }
+	// si le filtrage est parametre pour l'export ou pas
+	if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
+	{
+		$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=3&datatoexport='.$datatoexport;
+		$head[$h][1] = $langs->trans("Step")." 3";
+		$h++;
+		$stepoffset++;
+	}
 
-    $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=4&datatoexport='.$datatoexport;
-    $head[$h][1] = $langs->trans("Step")." ".(3 + $stepoffset);
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=4&datatoexport='.$datatoexport;
+	$head[$h][1] = $langs->trans("Step")." ".(3 + $stepoffset);
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=5&datatoexport='.$datatoexport;
-    $head[$h][1] = $langs->trans("Step")." ".(4 + $stepoffset);
-    $hselected = $h;
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=5&datatoexport='.$datatoexport;
+	$head[$h][1] = $langs->trans("Step")." ".(4 + $stepoffset);
+	$hselected = $h;
+	$h++;
 
-    dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -2);
+	print dol_get_fiche_head($head, $hselected, $langs->trans("NewExport"), -2);
 
-    /*
+	/*
      * Confirmation suppression fichier
      */
-    if ($action == 'remove_file')
-    {
-    	print $form->formconfirm($_SERVER["PHP_SELF"].'?step=5&datatoexport='.$datatoexport.'&file='.urlencode(GETPOST("file")), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
-    }
+	if ($action == 'remove_file')
+	{
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?step=5&datatoexport='.$datatoexport.'&file='.urlencode(GETPOST("file")), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
+	}
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table width="100%" class="border tableforfield">';
+	print '<table width="100%" class="border tableforfield">';
 
-    // Module
-    print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>';
-    print '<td>';
-    //print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' ';
-    print $objexport->array_export_module[0]->getName();
-    print '</td></tr>';
+	// Module
+	print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>';
+	print '<td>';
+	//print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' ';
+	print $objexport->array_export_module[0]->getName();
+	print '</td></tr>';
 
     // Dataset to export
     print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
     print '<td>';
-	$icon = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
-    print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
+    $entity = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
+    $entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+    print img_object($objexport->array_export_module[0]->getName(), $entityicon).' ';
     print $objexport->array_export_label[0];
     print '</td></tr>';
 
-    // List of exported fields
-    print '<tr><td>'.$langs->trans("ExportedFields").'</td>';
-    $list = '';
-    foreach ($array_selected as $code=>$label)
-    {
-        $list .= (!empty($list) ? ', ' : '');
-        $list .= $langs->trans($objexport->array_export_fields[0][$code]);
-    }
-    print '<td>'.$list.'</td></tr>';
+	// List of exported fields
+	print '<tr><td>'.$langs->trans("ExportedFields").'</td>';
+	$list = '';
+	foreach ($array_selected as $code=>$label)
+	{
+		$list .= (!empty($list) ? ', ' : '');
+		$list .= $langs->trans($objexport->array_export_fields[0][$code]);
+	}
+	print '<td>'.$list.'</td></tr>';
 
-    // List of filtered fields
-    if (isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
-    {
-    	print '<tr><td>'.$langs->trans("FilteredFields").'</td>';
-    	$list = '';
-    	if (!empty($array_filtervalue))
-    	{
-    		foreach ($array_filtervalue as $code=>$value)
-    		{
-    			if (isset($objexport->array_export_fields[0][$code]))
-    			{
-    				$list .= ($list ? ', ' : '');
-    				if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/', $array_filtervalue[$code])) $list .= $langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '');
-    				else $list .= $langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '')."'";
-    			}
-    		}
-    	}
-    	print '<td>'.(!empty($list) ? $list : '<span class="opacitymedium">'.$langs->trans("None").'</span>').'</td>';
-    	print '</tr>';
-    }
+	// List of filtered fields
+	if (isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
+	{
+		print '<tr><td>'.$langs->trans("FilteredFields").'</td>';
+		$list = '';
+		if (!empty($array_filtervalue))
+		{
+			foreach ($array_filtervalue as $code=>$value)
+			{
+				if (isset($objexport->array_export_fields[0][$code]))
+				{
+					$list .= ($list ? ', ' : '');
+					if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/', $array_filtervalue[$code])) $list .= $langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '');
+					else $list .= $langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '')."'";
+				}
+			}
+		}
+		print '<td>'.(!empty($list) ? $list : '<span class="opacitymedium">'.$langs->trans("None").'</span>').'</td>';
+		print '</tr>';
+	}
 
-    print '</table>';
-    print '</div>';
+	print '</table>';
+	print '</div>';
 
-    print '<br>';
+	print '<br>';
 
-    // List of available export formats
-    $htmltabloflibs = '<table class="noborder centpercent">';
-    $htmltabloflibs .= '<tr class="liste_titre">';
-    $htmltabloflibs .= '<td>'.$langs->trans("AvailableFormats").'</td>';
-    $htmltabloflibs .= '<td>'.$langs->trans("LibraryUsed").'</td>';
-    $htmltabloflibs .= '<td class="right">'.$langs->trans("LibraryVersion").'</td>';
-    $htmltabloflibs .= '</tr>'."\n";
+	// List of available export formats
+	$htmltabloflibs = '<table class="noborder centpercent">';
+	$htmltabloflibs .= '<tr class="liste_titre">';
+	$htmltabloflibs .= '<td>'.$langs->trans("AvailableFormats").'</td>';
+	$htmltabloflibs .= '<td>'.$langs->trans("LibraryUsed").'</td>';
+	$htmltabloflibs .= '<td class="right">'.$langs->trans("LibraryVersion").'</td>';
+	$htmltabloflibs .= '</tr>'."\n";
 
-    $liste = $objmodelexport->liste_modeles($db);
-    $listeall = $liste;
-    foreach ($listeall as $key => $val)
-    {
-    	if (preg_match('/__\(Disabled\)__/', $listeall[$key]))
-    	{
-    		$listeall[$key] = preg_replace('/__\(Disabled\)__/', '('.$langs->transnoentitiesnoconv("Disabled").')', $listeall[$key]);
-    		unset($liste[$key]);
-    	}
+	$liste = $objmodelexport->liste_modeles($db);
+	$listeall = $liste;
+	foreach ($listeall as $key => $val)
+	{
+		if (preg_match('/__\(Disabled\)__/', $listeall[$key]))
+		{
+			$listeall[$key] = preg_replace('/__\(Disabled\)__/', '('.$langs->transnoentitiesnoconv("Disabled").')', $listeall[$key]);
+			unset($liste[$key]);
+		}
 
-    	$htmltabloflibs .= '<tr class="oddeven">';
-    	$htmltabloflibs .= '<td>'.img_picto_common($key, $objmodelexport->getPictoForKey($key)).' ';
-	    $text = $objmodelexport->getDriverDescForKey($key);
-	    $label = $listeall[$key];
-	    $htmltabloflibs .= $form->textwithpicto($label, $text).'</td>';
-	    $htmltabloflibs .= '<td>'.$objmodelexport->getLibLabelForKey($key).'</td>';
-	    $htmltabloflibs .= '<td class="right">'.$objmodelexport->getLibVersionForKey($key).'</td>';
-	    $htmltabloflibs .= '</tr>'."\n";
-    }
-    $htmltabloflibs .= '</table>';
+		$htmltabloflibs .= '<tr class="oddeven">';
+		$htmltabloflibs .= '<td>'.img_picto_common($key, $objmodelexport->getPictoForKey($key)).' ';
+		$text = $objmodelexport->getDriverDescForKey($key);
+		$label = $listeall[$key];
+		$htmltabloflibs .= $form->textwithpicto($label, $text).'</td>';
+		$htmltabloflibs .= '<td>'.$objmodelexport->getLibLabelForKey($key).'</td>';
+		$htmltabloflibs .= '<td class="right">'.$objmodelexport->getLibVersionForKey($key).'</td>';
+		$htmltabloflibs .= '</tr>'."\n";
+	}
+	$htmltabloflibs .= '</table>';
 
-    print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("NowClickToGenerateToBuildExportFile"), $htmltabloflibs, 1, 'help', '', 0, 2, 'helphonformat').'</span>';
-    //print $htmltabloflibs;
-    print '<br>';
+	print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("NowClickToGenerateToBuildExportFile"), $htmltabloflibs, 1, 'help', '', 0, 2, 'helphonformat').'</span>';
+	//print $htmltabloflibs;
+	print '<br>';
 
-    print '</div>';
+	print '</div>';
 
 
-    if ($sqlusedforexport && $user->admin)
-    {
-    	print info_admin($langs->trans("SQLUsedForExport").':<br> '.$sqlusedforexport, 0, 0, 1, '', 'TechnicalInformation');
-    }
+	if ($sqlusedforexport && $user->admin)
+	{
+		print info_admin($langs->trans("SQLUsedForExport").':<br> '.$sqlusedforexport, 0, 0, 1, '', 'TechnicalInformation');
+	}
 
 
-    if (!is_dir($conf->export->dir_temp)) dol_mkdir($conf->export->dir_temp);
+	if (!is_dir($conf->export->dir_temp)) dol_mkdir($conf->export->dir_temp);
 
-    // Show existing generated documents
-    // NB: La fonction show_documents rescanne les modules qd genallowed=1, sinon prend $liste
-    print $formfile->showdocuments('export', '', $upload_dir, $_SERVER["PHP_SELF"].'?step=5&datatoexport='.$datatoexport, $liste, 1, (!empty($_POST['model']) ? $_POST['model'] : 'csv'), 1, 1, 0, 0, 0, '', 'none', '', '', '');
+	// Show existing generated documents
+	// NB: La fonction show_documents rescanne les modules qd genallowed=1, sinon prend $liste
+	print $formfile->showdocuments('export', '', $upload_dir, $_SERVER["PHP_SELF"].'?step=5&datatoexport='.$datatoexport, $liste, 1, (!empty($_POST['model']) ? $_POST['model'] : 'csv'), 1, 1, 0, 0, 0, '', 'none', '', '', '');
 }
 
 llxFooter();
diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php
index 0210ee608b0..79655a19b2f 100644
--- a/htdocs/exports/index.php
+++ b/htdocs/exports/index.php
@@ -50,7 +50,7 @@ print '<br>';
 print '<div class="center">';
 if (count($export->array_export_code))
 {
-    print dolGetButtonTitle($langs->trans('NewExport'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/exports/export.php?leftmenu=export', '', $user->rights->export->creer);
+	print dolGetButtonTitle($langs->trans('NewExport'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/exports/export.php?leftmenu=export', '', $user->rights->export->creer);
 }
 print '</div>';
 print '<br>';
@@ -73,10 +73,10 @@ $liste = $model->liste_modeles($db); // This is not a static method for exports
 
 foreach ($liste as $key => $val)
 {
-    if (preg_match('/__\(Disabled\)__/', $liste[$key]))
-    {
-    	$liste[$key] = preg_replace('/__\(Disabled\)__/', '('.$langs->transnoentitiesnoconv("Disabled").')', $liste[$key]);
-    }
+	if (preg_match('/__\(Disabled\)__/', $liste[$key]))
+	{
+		$liste[$key] = preg_replace('/__\(Disabled\)__/', '('.$langs->transnoentitiesnoconv("Disabled").')', $liste[$key]);
+	}
 
 	print '<tr class="oddeven">';
 	print '<td width="16">'.img_picto_common($model->getDriverLabelForKey($key), $model->getPictoForKey($key)).'</td>';
diff --git a/htdocs/externalsite/admin/externalsite.php b/htdocs/externalsite/admin/externalsite.php
index cb73403356b..66c6d265dec 100644
--- a/htdocs/externalsite/admin/externalsite.php
+++ b/htdocs/externalsite/admin/externalsite.php
@@ -113,7 +113,7 @@ print "</table>";
 
 
 print '<br><div class="center">';
-print '<input type="submit" name="save" class="button" value="'.$langs->trans("Save").'">';
+print '<input type="submit" name="save" class="button button-save" value="'.$langs->trans("Save").'">';
 print '</div>';
 
 print "</form>\n";
diff --git a/htdocs/fichinter/admin/fichinter_extrafields.php b/htdocs/fichinter/admin/fichinter_extrafields.php
index c19bce3c9d1..0fa5a930f05 100644
--- a/htdocs/fichinter/admin/fichinter_extrafields.php
+++ b/htdocs/fichinter/admin/fichinter_extrafields.php
@@ -69,11 +69,11 @@ print load_fiche_titre($langs->trans("InterventionsSetup"), $linkback, 'title_se
 
 $head = fichinter_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Interventions"), -1, 'intervention');
+print dol_get_fiche_head($head, 'attributes', $langs->trans("Interventions"), -1, 'intervention');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/fichinter/admin/fichinterdet_extrafields.php b/htdocs/fichinter/admin/fichinterdet_extrafields.php
index 768de47cfd0..f648548c3b4 100644
--- a/htdocs/fichinter/admin/fichinterdet_extrafields.php
+++ b/htdocs/fichinter/admin/fichinterdet_extrafields.php
@@ -70,19 +70,19 @@ print load_fiche_titre($langs->trans("InterventionsSetup"), $linkback, 'title_se
 
 $head = fichinter_admin_prepare_head();
 
-dol_fiche_head($head, 'attributesdet', $langs->trans("Interventions"), -1, 'intervention');
+print dol_get_fiche_head($head, 'attributesdet', $langs->trans("Interventions"), -1, 'intervention');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -97,7 +97,7 @@ if ($action == 'create')
 	print '<br><div id="newattrib"></div>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -107,10 +107,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && !empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 llxFooter();
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index b8ff3714596..f245084f8db 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -256,7 +256,7 @@ if ($action == 'create') {
 		print '<input type="hidden" name="action" value="add">';
 		print '<input type="hidden" name="fichinterid" value="'.$object->id.'">';
 
-		dol_fiche_head();
+		print dol_get_fiche_head();
 
 		$rowspan = 4;
 		if (!empty($conf->projet->enabled) && $object->fk_project > 0) $rowspan++;
@@ -277,7 +277,7 @@ if ($action == 'create') {
 
 		// Title
 		print '<tr><td class="fieldrequired">'.$langs->trans("Title").'</td><td>';
-		print '<input class="flat" type="text" name="titre" size="24" value="'.$_POST["titre"].'">';
+		print '<input class="flat quatrevingtpercent" type="text" name="titre" value="'.dol_escape_htmltag(GETPOST("titre", "alphanohtml")).'">';
 		print '</td>';
 
 		// Note
@@ -417,11 +417,11 @@ if ($action == 'create') {
 
 		print "</table>\n";
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Create").'">';
 		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+		print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 		print '</div>';
 		print "</form>\n";
 	} else {
@@ -429,7 +429,7 @@ if ($action == 'create') {
 	}
 } elseif ($action == 'selsocforcreatefrommodel') {
 	print load_fiche_titre($langs->trans("CreateRepeatableIntervention"), '', 'intervention');
-	dol_fiche_head('');
+	print dol_get_fiche_head('');
 
 	print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
 	print '<table class="border centpercent">';
@@ -438,7 +438,7 @@ if ($action == 'create') {
 	print '</td></tr>';
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="hidden" name="action" value="createfrommodel">';
@@ -461,7 +461,7 @@ if ($action == 'create') {
 
 			$head = fichinter_rec_prepare_head($object);
 
-			dol_fiche_head($head, 'card', $langs->trans("PredefinedInterventional"), 0, 'intervention');
+			print dol_get_fiche_head($head, 'card', $langs->trans("PredefinedInterventional"), 0, 'intervention');
 
 			// Intervention card
 			$linkback = '<a href="card-rec.php">'.$langs->trans("BackToList").'</a>';
@@ -484,11 +484,11 @@ if ($action == 'create') {
 						$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
 						$morehtmlref .= '<input type="hidden" name="action" value="classin">';
 						$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                        $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+						$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
 						$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 						$morehtmlref .= '</form>';
 					} else {
-                        $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+						$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 					}
 				} else {
 					if (!empty($object->fk_project)) {
@@ -543,15 +543,15 @@ if ($action == 'create') {
 				print '</td><td>';
 				if ($action == 'contrat') {
 					$formcontract = new Formcontract($db);
-                    $formcontract->formSelectContract($_SERVER["PHP_SELF"].'?id='.$object->id, $object->socid, $object->fk_contrat, 'contratid', 0, 1);
+					$formcontract->formSelectContract($_SERVER["PHP_SELF"].'?id='.$object->id, $object->socid, $object->fk_contrat, 'contratid', 0, 1);
 				} else {
 					if ($object->fk_contrat) {
 						$contratstatic = new Contrat($db);
 						$contratstatic->fetch($object->fk_contrat);
 						print $contratstatic->getNomUrl(0, '', 1);
 					} else {
-                        print "&nbsp;";
-                    }
+						print "&nbsp;";
+					}
 				}
 				print '</td>';
 				print '</tr>';
@@ -633,7 +633,7 @@ if ($action == 'create') {
 			if ($object->frequency > 0) {
 				print '<br>';
 				if (empty($conf->cron->enabled)) {
-    				$txtinfoadmin = $langs->trans("EnableAndSetupModuleCron", $langs->transnoentitiesnoconv("Module2300Name"));
+					$txtinfoadmin = $langs->trans("EnableAndSetupModuleCron", $langs->transnoentitiesnoconv("Module2300Name"));
 					print info_admin($txtinfoadmin);
 				}
 				print '<div class="underbanner clearboth"></div>';
@@ -765,20 +765,20 @@ if ($action == 'create') {
 			$i = 0;
 			print '<table class="noborder centpercent">';
 			print '<tr class="liste_titre">';
-            print_liste_field_titre("Ref", $_SERVER['PHP_SELF'], "f.titre", "", "", 'width="200px"', $sortfield, $sortorder, 'left ');
-            print_liste_field_titre("Company", $_SERVER['PHP_SELF'], "s.nom", "", "", 'width="200px"', $sortfield, $sortorder, 'left ');
-            if (!empty($conf->contrat->enabled)) {
-                print_liste_field_titre("Contract", $_SERVER['PHP_SELF'], "f.fk_contrat", "", "", 'width="100px"', $sortfield, $sortorder, 'left ');
-            }
-            if (!empty($conf->projet->enabled)) {
-                print_liste_field_titre("Project", $_SERVER['PHP_SELF'], "f.fk_project", "", "", 'width="100px"', $sortfield, $sortorder, 'left ');
-            }
-            print_liste_field_titre("Duration", $_SERVER['PHP_SELF'], 'f.duree', '', '', 'width="50px"', $sortfield, $sortorder, 'right ');
-            // Recurring or not
-            print_liste_field_titre("Frequency", $_SERVER['PHP_SELF'], "f.frequency", "", "", 'width="100px"', $sortfield, $sortorder, 'center ');
-            print_liste_field_titre("NbOfGenerationDone", $_SERVER['PHP_SELF'], "f.nb_gen_done", "", "", 'width="100px"', $sortfield, $sortorder, 'center ');
-            print_liste_field_titre("DateLastGeneration", $_SERVER['PHP_SELF'], "f.date_last_gen", "", "", 'width="100px"', $sortfield, $sortorder, 'center ');
-            print_liste_field_titre("NextDateToIntervention", $_SERVER['PHP_SELF'], "f.date_when", "", "", 'width="100px"', $sortfield, $sortorder, 'center ');
+			print_liste_field_titre("Ref", $_SERVER['PHP_SELF'], "f.titre", "", "", 'width="200px"', $sortfield, $sortorder, 'left ');
+			print_liste_field_titre("Company", $_SERVER['PHP_SELF'], "s.nom", "", "", 'width="200px"', $sortfield, $sortorder, 'left ');
+			if (!empty($conf->contrat->enabled)) {
+				print_liste_field_titre("Contract", $_SERVER['PHP_SELF'], "f.fk_contrat", "", "", 'width="100px"', $sortfield, $sortorder, 'left ');
+			}
+			if (!empty($conf->projet->enabled)) {
+				print_liste_field_titre("Project", $_SERVER['PHP_SELF'], "f.fk_project", "", "", 'width="100px"', $sortfield, $sortorder, 'left ');
+			}
+			print_liste_field_titre("Duration", $_SERVER['PHP_SELF'], 'f.duree', '', '', 'width="50px"', $sortfield, $sortorder, 'right ');
+			// Recurring or not
+			print_liste_field_titre("Frequency", $_SERVER['PHP_SELF'], "f.frequency", "", "", 'width="100px"', $sortfield, $sortorder, 'center ');
+			print_liste_field_titre("NbOfGenerationDone", $_SERVER['PHP_SELF'], "f.nb_gen_done", "", "", 'width="100px"', $sortfield, $sortorder, 'center ');
+			print_liste_field_titre("DateLastGeneration", $_SERVER['PHP_SELF'], "f.date_last_gen", "", "", 'width="100px"', $sortfield, $sortorder, 'center ');
+			print_liste_field_titre("NextDateToIntervention", $_SERVER['PHP_SELF'], "f.date_when", "", "", 'width="100px"', $sortfield, $sortorder, 'center ');
 			print '<th width="100px"></th>';
 			print "</tr>\n";
 
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index b6d7ab39336..07c0146c2a8 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2014-2018  Charlene Benke          <charlies@patas-monkey.com>
  * Copyright (C) 2015-2016  Abbes Bahfir            <bafbes@gmail.com>
  * Copyright (C) 2018 		Philippe Grand       	<philippe.grand@atoo-net.com>
+ * Copyright (C) 2020       Frédéric 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
@@ -57,8 +58,8 @@ $langs->loadLangs(array('bills', 'companies', 'interventions'));
 
 $id			= GETPOST('id', 'int');
 $ref		= GETPOST('ref', 'alpha');
-$socid = GETPOST('socid', 'int');
-$contratid = GETPOST('contratid', 'int');
+$socid = (int) GETPOST('socid', 'int');
+$contratid = (int) GETPOST('contratid', 'int');
 $action		= GETPOST('action', 'alpha');
 $cancel		= GETPOST('cancel', 'alpha');
 $confirm	= GETPOST('confirm', 'alpha');
@@ -175,8 +176,7 @@ if (empty($reshook))
 		} else {
 			$mesg = $object->error;
 		}
-	} elseif ($action == 'confirm_modify' && $confirm == 'yes' && $user->rights->ficheinter->creer)
-	{
+	} elseif ($action == 'confirm_modify' && $confirm == 'yes' && $user->rights->ficheinter->creer) {
 		$result = $object->setDraft($user);
 		if ($result >= 0)
 		{
@@ -187,8 +187,7 @@ if (empty($reshook))
 				$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))
-				{
+				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
@@ -200,18 +199,17 @@ if (empty($reshook))
 		} else {
 			$mesg = $object->error;
 		}
-	} elseif ($action == 'add' && $user->rights->ficheinter->creer)
-	{
-	    $object->socid = $socid;
-	    $object->duration = GETPOST('duration', 'int');
-	    $object->fk_project		= GETPOST('projectid', 'int');
-	    $object->fk_contrat		= GETPOST('contratid', 'int');
-	    $object->author = $user->id;
-	    $object->description	= GETPOST('description', 'restricthtml');
-	    $object->ref = $ref;
-	    $object->model_pdf = GETPOST('model', 'alpha');
-	    $object->note_private = GETPOST('note_private', 'restricthtml');
-	    $object->note_public = GETPOST('note_public', 'restricthtml');
+	} elseif ($action == 'add' && $user->rights->ficheinter->creer) {
+		$object->socid = $socid;
+		$object->duration = (int) GETPOST('duration', 'int');
+		$object->fk_project = (int) GETPOST('projectid', 'int');
+		$object->fk_contrat = (int) GETPOST('contratid', 'int');
+		$object->author = $user->id;
+		$object->description = GETPOST('description', 'restricthtml');
+		$object->ref = $ref;
+		$object->model_pdf = GETPOST('model', 'alpha');
+		$object->note_private = GETPOST('note_private', 'restricthtml');
+		$object->note_public = GETPOST('note_public', 'restricthtml');
 
 		if ($object->socid > 0)
 		{
@@ -251,7 +249,7 @@ if (empty($reshook))
 				$extrafields = new ExtraFields($db);
 				$array_options = $extrafields->getOptionalsFromPost($object->table_element);
 
-		        $object->array_options = $array_options;
+				$object->array_options = $array_options;
 
 				$id = $object->create($user);
 
@@ -356,12 +354,12 @@ if (empty($reshook))
 
 									$result = $object->addline(
 										$user,
-				                        $id,
-				                        $desc,
-							            $date_intervention,
-		                 				$duration,
-		                 				$array_options
-				                    );
+										$id,
+										$desc,
+										$date_intervention,
+						 				$duration,
+						 				$array_options
+									);
 
 									if ($result < 0)
 									{
@@ -371,51 +369,50 @@ if (empty($reshook))
 								}
 							}
 						}
-		            } else {
+					} else {
 						$mesg = $srcobject->error;
-		                $error++;
-		            }
-		        } else {
+						$error++;
+					}
+				} else {
 					$mesg = $object->error;
-		            $error++;
-		        }
-		    } else {
-		    	// Fill array 'array_options' with data from add form
-		    	$ret = $extrafields->setOptionalsFromPost(null, $object);
-		    	if ($ret < 0) {
-		    		$error++;
-		    		$action = 'create';
-		    	}
+					$error++;
+				}
+			} else {
+				// Fill array 'array_options' with data from add form
+				$ret = $extrafields->setOptionalsFromPost(null, $object);
+				if ($ret < 0) {
+					$error++;
+					$action = 'create';
+				}
 
-		    	if (!$error)
-		    	{
-		    		// Extrafields
-		    		$array_options = $extrafields->getOptionalsFromPost($object->table_element);
+				if (!$error)
+				{
+					// Extrafields
+					$array_options = $extrafields->getOptionalsFromPost($object->table_element);
 
-		    		$object->array_options = $array_options;
+					$object->array_options = $array_options;
 
-		    		$result = $object->create($user);
-		    		if ($result > 0)
-		    		{
-		    			$id = $result; // Force raffraichissement sur fiche venant d'etre cree
-		    		} else {
-		    			$langs->load("errors");
-		    			setEventMessages($object->error, $object->errors, 'errors');
-		    			$action = 'create';
-		    		}
-		    	}
-	        }
-	    } else {
+					$result = $object->create($user);
+					if ($result > 0)
+					{
+						$id = $result; // Force raffraichissement sur fiche venant d'etre cree
+					} else {
+						$langs->load("errors");
+						setEventMessages($object->error, $object->errors, 'errors');
+						$action = 'create';
+					}
+				}
+			}
+		} else {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty"));
-	        $action = 'create';
-	    }
-	} elseif ($action == 'update' && $user->rights->ficheinter->creer)
-	{
+			$action = 'create';
+		}
+	} elseif ($action == 'update' && $user->rights->ficheinter->creer) {
 		$object->socid = $socid;
-		$object->fk_project		= GETPOST('projectid', 'int');
-		$object->fk_contrat		= GETPOST('contratid', 'int');
+		$object->fk_project = (int) GETPOST('projectid', 'int');
+		$object->fk_contrat = (int) GETPOST('contratid', 'int');
 		$object->author = $user->id;
-		$object->description	= GETPOST('description', 'restricthtml');
+		$object->description = GETPOST('description', 'restricthtml');
 		$object->ref = $ref;
 
 		$result = $object->update($user);
@@ -482,14 +479,14 @@ if (empty($reshook))
 			$extrafields->fetch_name_optionals_label($object->table_element_line);
 			$array_options = $extrafields->getOptionalsFromPost($object->table_element_line);
 
-        	$result = $object->addline(
+			$result = $object->addline(
 				$user,
-	            $id,
-	            $desc,
-	            $date_intervention,
-	            $duration,
-	            $array_options
-	        );
+				$id,
+				$desc,
+				$date_intervention,
+				$duration,
+				$array_options
+			);
 
 			// Define output language
 			$outputlangs = $langs;
@@ -520,8 +517,7 @@ if (empty($reshook))
 	elseif ($action == 'classifybilled' && $user->rights->ficheinter->creer)
 	{
 		$result = $object->setStatut(2);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		} else {
@@ -545,14 +541,14 @@ if (empty($reshook))
 	// Classify Done
 	elseif ($action == 'classifydone' && $user->rights->ficheinter->creer)
 	{
-	    $result = $object->setStatut(3);
-	    if ($result > 0)
-	    {
-	        header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-	        exit;
-	    } else {
-	        setEventMessages($object->error, $object->errors, 'errors');
-	    }
+		$result = $object->setStatut(3);
+		if ($result > 0)
+		{
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+			exit;
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	// Reopen
@@ -587,13 +583,13 @@ if (empty($reshook))
 		}
 		$object->fetch_thirdparty();
 
-		$desc = GETPOST('np_desc', 'alpha');
+		$desc = GETPOST('np_desc', 'restricthtml');
 		$date_inter = dol_mktime(GETPOST('dihour', 'int'), GETPOST('dimin', 'int'), 0, GETPOST('dimonth', 'int'), GETPOST('diday', 'int'), GETPOST('diyear', 'int'));
 		$duration = convertTime2Seconds(GETPOST('durationhour', 'int'), GETPOST('durationmin', 'int'));
 
-	    $objectline->datei = $date_inter;
-	    $objectline->desc = $desc;
-	    $objectline->duration = $duration;
+		$objectline->datei = $date_inter;
+		$objectline->desc = $desc;
+		$objectline->duration = $duration;
 
 		// Extrafields
 		$extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -601,11 +597,11 @@ if (empty($reshook))
 		$objectline->array_options = $array_options;
 
 		$result = $objectline->update($user);
-	    if ($result < 0)
-	    {
-	        dol_print_error($db);
-	        exit;
-	    }
+		if ($result < 0)
+		{
+			dol_print_error($db);
+			exit;
+		}
 
 		// Define output language
 		$outputlangs = $langs;
@@ -738,7 +734,8 @@ if (empty($reshook))
 			if ($result > 0 && $id > 0)
 			{
 				$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
-				$result = $object->add_contact($contactid, GETPOST('type', 'int'), GETPOST('source', 'alpha'));
+				$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+				$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 			}
 
 			if ($result >= 0)
@@ -817,11 +814,11 @@ if ($action == 'create')
 			$subelement = $regs[2];
 		}
 
-        if ($element == 'project')
-        {
-            $projectid = GETPOST('originid', 'int');
-        } else {
-            // For compatibility
+		if ($element == 'project')
+		{
+			$projectid = GETPOST('originid', 'int');
+		} else {
+			// For compatibility
 			if ($element == 'order' || $element == 'commande') {
 				$element = $subelement = 'commande';
 			}
@@ -882,7 +879,7 @@ if ($action == 'create')
 		print '<input type="hidden" name="socid" value='.$soc->id.'>';
 		print '<input type="hidden" name="action" value="add">';
 
-		dol_fiche_head('');
+		print dol_get_fiche_head('');
 
 		print '<table class="border centpercent">';
 
@@ -904,20 +901,20 @@ if ($action == 'create')
 
 			$langs->load("project");
 
-            print '<tr><td>'.$langs->trans("Project").'</td><td>';
-            /* Fix: If a project must be linked to any companies (suppliers or not), project must be not be set as limited to customer but must be not linked to any particular thirdparty
+			print '<tr><td>'.$langs->trans("Project").'</td><td>';
+			/* Fix: If a project must be linked to any companies (suppliers or not), project must be not be set as limited to customer but must be not linked to any particular thirdparty
             if ($societe->fournisseur==1)
             	$numprojet=select_projects(-1,$_POST["projectid"],'projectid');
             else
             	$numprojet=select_projects($societe->id,$_POST["projectid"],'projectid');
             	*/
-            $numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid');
-            if ($numprojet == 0)
-            {
-                print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddProject").'"></span></a>';
-            }
-            print '</td></tr>';
-        }
+			$numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid');
+			if ($numprojet == 0)
+			{
+				print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddProject").'"></span></a>';
+			}
+			print '</td></tr>';
+		}
 
 		// Contract
 		if ($conf->contrat->enabled)
@@ -932,53 +929,53 @@ if ($action == 'create')
 			print '</td></tr>';
 		}
 
-        // Model
-        print '<tr>';
-        print '<td>'.$langs->trans("DefaultModel").'</td>';
-        print '<td>';
-        $liste = ModelePDFFicheinter::liste_modeles($db);
-        print $form->selectarray('model', $liste, $conf->global->FICHEINTER_ADDON_PDF);
-        print "</td></tr>";
+		// Model
+		print '<tr>';
+		print '<td>'.$langs->trans("DefaultModel").'</td>';
+		print '<td>';
+		$liste = ModelePDFFicheinter::liste_modeles($db);
+		print $form->selectarray('model', $liste, $conf->global->FICHEINTER_ADDON_PDF);
+		print "</td></tr>";
 
-        // Public note
-        print '<tr>';
-        print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
-        print '<td>';
-        $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
-        print $doleditor->Create(1);
-        //print '<textarea name="note_public" cols="80" rows="'.ROWS_3.'">'.$note_public.'</textarea>';
-        print '</td></tr>';
+		// Public note
+		print '<tr>';
+		print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
+		print '<td>';
+		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+		print $doleditor->Create(1);
+		//print '<textarea name="note_public" cols="80" rows="'.ROWS_3.'">'.$note_public.'</textarea>';
+		print '</td></tr>';
 
-        // Private note
-        if (empty($user->socid))
-        {
-        	print '<tr>';
-        	print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
-        	print '<td>';
-        	$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
-        	print $doleditor->Create(1);
-        	//print '<textarea name="note_private" cols="80" rows="'.ROWS_3.'">'.$note_private.'</textarea>';
-        	print '</td></tr>';
-        }
+		// Private note
+		if (empty($user->socid))
+		{
+			print '<tr>';
+			print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
+			print '<td>';
+			$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+			print $doleditor->Create(1);
+			//print '<textarea name="note_private" cols="80" rows="'.ROWS_3.'">'.$note_private.'</textarea>';
+			print '</td></tr>';
+		}
 
-        // Other attributes
-        $parameters = array();
-        $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-        if (empty($reshook))
+		// Other attributes
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		if (empty($reshook))
 		{
 			print $object->showOptionals($extrafields, 'edit');
 		}
 
-        // Show link to origin object
-        if (!empty($origin) && !empty($originid) && is_object($objectsrc))
-        {
-        	$newclassname = $classname;
-        	if ($newclassname == 'Propal') $newclassname = 'CommercialProposal';
-        	print '<tr><td>'.$langs->trans($newclassname).'</td><td colspan="2">'.$objectsrc->getNomUrl(1).'</td></tr>';
+		// Show link to origin object
+		if (!empty($origin) && !empty($originid) && is_object($objectsrc))
+		{
+			$newclassname = $classname;
+			if ($newclassname == 'Propal') $newclassname = 'CommercialProposal';
+			print '<tr><td>'.$langs->trans($newclassname).'</td><td colspan="2">'.$objectsrc->getNomUrl(1).'</td></tr>';
 
-        	// Amount
-        	/* Hide amount because we only copy services so amount may differ than source
+			// Amount
+			/* Hide amount because we only copy services so amount may differ than source
         	print '<tr><td>' . $langs->trans('AmountHT') . '</td><td>' . price($objectsrc->total_ht) . '</td></tr>';
         	print '<tr><td>' . $langs->trans('AmountVAT') . '</td><td>' . price($objectsrc->total_tva) . "</td></tr>";
         	if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) 		// Localtax1 RE
@@ -1000,24 +997,24 @@ if ($action == 'create')
         		print '<tr><td>' . $langs->trans('MulticurrencyAmountTTC') . '</td><td>' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";
         	}
         	*/
-        }
+		}
 
-        print '</table>';
+		print '</table>';
 
-	    if (is_object($objectsrc))
-	    {
-	        print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
-	        print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
+		if (is_object($objectsrc))
+		{
+			print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
+			print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
 		} elseif ($origin == 'project' && !empty($projectid)) {
 			print '<input type="hidden" name="projectid" value="'.$projectid.'">';
 		}
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
 		print '<input type="submit" class="button" value="'.$langs->trans("CreateDraftIntervention").'">';
-    	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-    	print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+		print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 		print '</div>';
 
 		print '</form>';
@@ -1037,7 +1034,7 @@ if ($action == 'create')
 		print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 
-		dol_fiche_head('');
+		print dol_get_fiche_head('');
 
 		if (is_object($objectsrc))
 		{
@@ -1053,13 +1050,13 @@ if ($action == 'create')
 		print '</td></tr>';
 		print '</table>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
 		print '<input type="hidden" name="action" value="create">';
 		print '<input type="submit" class="button" value="'.$langs->trans("CreateDraftIntervention").'">';
-    	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-    	print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+		print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 		print '</div>';
 
 		print '</form>';
@@ -1084,7 +1081,7 @@ if ($action == 'create')
 
 	$head = fichinter_prepare_head($object);
 
-	dol_fiche_head($head, 'card', $langs->trans("InterventionCard"), -1, 'intervention');
+	print dol_get_fiche_head($head, 'card', $langs->trans("InterventionCard"), -1, 'intervention');
 
 	$formconfirm = '';
 
@@ -1172,46 +1169,46 @@ if ($action == 'create')
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    if ($user->rights->ficheinter->creer)
-	    {
-            if ($action != 'classify') {
-                $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-            }
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	            $morehtmlref .= $proj->ref;
-	            $morehtmlref .= '</a>';
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->ficheinter->creer)
+		{
+			if ($action != 'classify') {
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			}
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-    print '<div class="fichecenter">';
-    print '<div class="fichehalfleft">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border tableforfield" width="100%">';
+	print '<table class="border tableforfield" width="100%">';
 
 	if (!empty($conf->global->FICHINTER_USE_PLANNED_AND_DONE_DATES))
 	{
@@ -1269,47 +1266,47 @@ if ($action == 'create')
 			$formcontract->formSelectContract($_SERVER["PHP_SELF"].'?id='.$object->id, $object->socid, $object->fk_contrat, 'contratid', 0, 1, 1);
 		} else {
 			if ($object->fk_contrat)
-            {
-                $contratstatic = new Contrat($db);
-                $contratstatic->fetch($object->fk_contrat);
-                //print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$selected.'">'.$projet->title.'</a>';
-                print $contratstatic->getNomUrl(0, '', 1);
-            } else {
-                print "&nbsp;";
-            }
+			{
+				$contratstatic = new Contrat($db);
+				$contratstatic->fetch($object->fk_contrat);
+				//print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$selected.'">'.$projet->title.'</a>';
+				print $contratstatic->getNomUrl(0, '', 1);
+			} else {
+				print "&nbsp;";
+			}
 		}
 		print '</td>';
 		print '</tr>';
 	}
 
-    // Other attributes
-    $cols = 2;
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+	// Other attributes
+	$cols = 2;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
-    print '</table>';
+	print '</table>';
 
-    print '</div>';
-    print '<div class="fichehalfright">';
-    print '<div class="ficheaddleft">';
-    print '<div class="underbanner clearboth"></div>';
+	print '</div>';
+	print '<div class="fichehalfright">';
+	print '<div class="ficheaddleft">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border tableforfield centpercent">';
+	print '<table class="border tableforfield centpercent">';
 
-    if (empty($conf->global->FICHINTER_DISABLE_DETAILS))
-    {
-        // Duration
-        print '<tr><td class="titlefield">'.$langs->trans("TotalDuration").'</td>';
-        print '<td>'.convertSecondToTime($object->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).'</td>';
-        print '</tr>';
-    }
+	if (empty($conf->global->FICHINTER_DISABLE_DETAILS))
+	{
+		// Duration
+		print '<tr><td class="titlefield">'.$langs->trans("TotalDuration").'</td>';
+		print '<td>'.convertSecondToTime($object->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).'</td>';
+		print '</tr>';
+	}
 
 	print "</table>";
 
 	print '</div>';
-    print '</div>';
-    print '</div>';
+	print '</div>';
+	print '</div>';
 
-    print '<div class="clearboth"></div><br>';
+	print '<div class="clearboth"></div><br>';
 
 
 	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
@@ -1464,26 +1461,26 @@ if ($action == 'create')
 
 					// Date d'intervention
 					print '<td class="center nowrap">';
-                    if (!empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) {
-                        print $form->selectDate($db->jdate($objp->date_intervention), 'di', 0, 0, 0, "date_intervention");
-                    } else {
-                        print $form->selectDate($db->jdate($objp->date_intervention), 'di', 1, 1, 0, "date_intervention");
-                    }
+					if (!empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) {
+						print $form->selectDate($db->jdate($objp->date_intervention), 'di', 0, 0, 0, "date_intervention");
+					} else {
+						print $form->selectDate($db->jdate($objp->date_intervention), 'di', 1, 1, 0, "date_intervention");
+					}
 					print '</td>';
 
-                    // Duration
-                    print '<td class="right">';
-                    if (empty($conf->global->FICHINTER_WITHOUT_DURATION)) {
-                        $selectmode = 'select';
-                        if (!empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION))
-                            $selectmode = 'text';
-                        $form->select_duration('duration', $objp->duree, 0, $selectmode);
-                    }
-                    print '</td>';
+					// Duration
+					print '<td class="right">';
+					if (empty($conf->global->FICHINTER_WITHOUT_DURATION)) {
+						$selectmode = 'select';
+						if (!empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION))
+							$selectmode = 'text';
+						$form->select_duration('duration', $objp->duree, 0, $selectmode);
+					}
+					print '</td>';
 
-                    print '<td class="center" colspan="5" valign="center">';
-                    print '<input type="submit" class="button buttongen marginbottomonly" name="save" value="'.$langs->trans("Save").'">';
-					print '<input type="submit" class="button buttongen marginbottomonly" name="cancel" value="'.$langs->trans("Cancel").'"></td>';
+					print '<td class="center" colspan="5" valign="center">';
+					print '<input type="submit" class="button buttongen marginbottomonly button-save" name="save" value="'.$langs->trans("Save").'">';
+					print '<input type="submit" class="button buttongen marginbottomonly button-cancel" name="cancel" value="'.$langs->trans("Cancel").'"></td>';
 					print '</tr>'."\n";
 
 					$line = new FichinterLigne($db);
@@ -1514,13 +1511,13 @@ if ($action == 'create')
 						print '<td width="5" class="center linecolnum"></td>';
 					}
 
-    				print '<td>';
-    				print '<a name="add"></a>'; // ancre
-    				print $langs->trans('Description').'</td>';
-    				print '<td class="center">'.$langs->trans('Date').'</td>';
-    				print '<td class="right">'.(empty($conf->global->FICHINTER_WITHOUT_DURATION) ? $langs->trans('Duration') : '').'</td>';
-      				print '<td colspan="3">&nbsp;</td>';
-    				print "</tr>\n";
+					print '<td>';
+					print '<a name="add"></a>'; // ancre
+					print $langs->trans('Description').'</td>';
+					print '<td class="center">'.$langs->trans('Date').'</td>';
+					print '<td class="right">'.(empty($conf->global->FICHINTER_WITHOUT_DURATION) ? $langs->trans('Duration') : '').'</td>';
+	  				print '<td colspan="3">&nbsp;</td>';
+					print "</tr>\n";
 				}
 
 				print '<tr class="oddeven nohover">'."\n";
@@ -1530,43 +1527,43 @@ if ($action == 'create')
 					print '<td class="center linecolnum">'.($i + 1).'</td>';
 				}
 
-                print '<td>';
-                // editeur wysiwyg
-                if (empty($conf->global->FICHINTER_EMPTY_LINE_DESC)) {
-                    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-                    $doleditor = new DolEditor('np_desc', GETPOST('np_desc', 'alpha'), '', 100, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_DETAILS, ROWS_2, '90%');
-                    $doleditor->Create();
-                }
-                print '</td>';
+				print '<td>';
+				// editeur wysiwyg
+				if (empty($conf->global->FICHINTER_EMPTY_LINE_DESC)) {
+					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+					$doleditor = new DolEditor('np_desc', GETPOST('np_desc', 'restricthtml'), '', 100, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_DETAILS, ROWS_2, '90%');
+					$doleditor->Create();
+				}
+				print '</td>';
 
-                // Date intervention
-                print '<td class="center nowrap">';
+				// Date intervention
+				print '<td class="center nowrap">';
 				$now = dol_now();
 				$timearray = dol_getdate($now);
 				if (!GETPOST('diday', 'int')) {
-                    $timewithnohour = dol_mktime(0, 0, 0, $timearray['mon'], $timearray['mday'], $timearray['year']);
-                } else {
-                    $timewithnohour = dol_mktime(GETPOST('dihour', 'int'), GETPOST('dimin', 'int'), 0, GETPOST('dimonth', 'int'), GETPOST('diday', 'int'), GETPOST('diyear', 'int'));
-                }
-                if (!empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) {
-                    print $form->selectDate($timewithnohour, 'di', 0, 0, 0, "addinter");
-                } else {
-                    print $form->selectDate($timewithnohour, 'di', 1, 1, 0, "addinter");
-                }
+					$timewithnohour = dol_mktime(0, 0, 0, $timearray['mon'], $timearray['mday'], $timearray['year']);
+				} else {
+					$timewithnohour = dol_mktime(GETPOST('dihour', 'int'), GETPOST('dimin', 'int'), 0, GETPOST('dimonth', 'int'), GETPOST('diday', 'int'), GETPOST('diyear', 'int'));
+				}
+				if (!empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) {
+					print $form->selectDate($timewithnohour, 'di', 0, 0, 0, "addinter");
+				} else {
+					print $form->selectDate($timewithnohour, 'di', 1, 1, 0, "addinter");
+				}
 				print '</td>';
 
-                // Duration
-                print '<td class="right">';
-                if (empty($conf->global->FICHINTER_WITHOUT_DURATION)) {
-                    $selectmode = 'select';
-                    if (!empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) {
-                        $selectmode = 'text';
-                    }
-                    $form->select_duration('duration', (!GETPOST('durationhour', 'int') && !GETPOST('durationmin', 'int')) ? 3600 : (60 * 60 * GETPOST('durationhour', 'int') + 60 * GETPOST('durationmin', 'int')), 0, $selectmode);
-                }
-                print '</td>';
+				// Duration
+				print '<td class="right">';
+				if (empty($conf->global->FICHINTER_WITHOUT_DURATION)) {
+					$selectmode = 'select';
+					if (!empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) {
+						$selectmode = 'text';
+					}
+					$form->select_duration('duration', (!GETPOST('durationhour', 'int') && !GETPOST('durationmin', 'int')) ? 3600 : (60 * 60 * GETPOST('durationhour', 'int') + 60 * GETPOST('durationmin', 'int')), 0, $selectmode);
+				}
+				print '</td>';
 
-                print '<td class="center" valign="middle" colspan="3"><input type="submit" class="button" value="'.$langs->trans('Add').'" name="addline"></td>';
+				print '<td class="center" valign="middle" colspan="3"><input type="submit" class="button" value="'.$langs->trans('Add').'" name="addline"></td>';
 				print '</tr>';
 
 				//Line extrafield
@@ -1588,7 +1585,7 @@ if ($action == 'create')
 		print '</form>'."\n";
  	}
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print "\n";
 
@@ -1601,22 +1598,22 @@ if ($action == 'create')
 
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
-		                                                                                          // modified by hook
+																								  // modified by hook
 	if (empty($reshook))
 	{
 		if ($user->socid == 0)
 		{
-            if ($action != 'editdescription' && ($action != 'presend')) {
-                // Validate
-                if ($object->statut == Fichinter::STATUS_DRAFT && (count($object->lines) > 0 || !empty($conf->global->FICHINTER_DISABLE_DETAILS))) {
-                    if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->creer) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->ficheinter_advance->validate)) {
-                        print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id='.$object->id.'&action=validate"';
-                        print '>'.$langs->trans("Validate").'</a></div>';
-                    }
-                }
+			if ($action != 'editdescription' && ($action != 'presend')) {
+				// Validate
+				if ($object->statut == Fichinter::STATUS_DRAFT && (count($object->lines) > 0 || !empty($conf->global->FICHINTER_DISABLE_DETAILS))) {
+					if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->creer) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->ficheinter_advance->validate)) {
+						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id='.$object->id.'&action=validate"';
+						print '>'.$langs->trans("Validate").'</a></div>';
+					}
+				}
 
-                // Modify
-                if ($object->statut == Fichinter::STATUS_VALIDATED && ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->creer) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->ficheinter_advance->unvalidate)))
+				// Modify
+				if ($object->statut == Fichinter::STATUS_VALIDATED && ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->creer) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->ficheinter_advance->unvalidate)))
 				{
 					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id='.$object->id.'&action=modify">';
 					if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) print $langs->trans("Modify");
@@ -1625,7 +1622,7 @@ if ($action == 'create')
 				}
 
 				// Reopen
-				if ($object->statut > Fichinter::STATUS_CLOSED)
+				if ($object->statut >= Fichinter::STATUS_CLOSED)
 				{
 					if ($user->rights->ficheinter->creer)
 					{
@@ -1645,7 +1642,7 @@ if ($action == 'create')
 				}
 
 				// create intervention model
-				if ($conf->global->MAIN_FEATURES_LEVEL >= 2 && $object->statut == Fichinter::STATUS_DRAFT && $user->rights->ficheinter->creer && (count($object->lines) > 0)) {
+				if ($conf->global->MAIN_FEATURES_LEVEL >= 1 && $object->statut == Fichinter::STATUS_DRAFT && $user->rights->ficheinter->creer && (count($object->lines) > 0)) {
 					print '<div class="inline-block divButAction">';
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card-rec.php?id='.$object->id.'&action=create">'.$langs->trans("ChangeIntoRepeatableIntervention").'</a>';
 					print '</div>';
@@ -1684,7 +1681,7 @@ if ($action == 'create')
 				}
 
 				// Done
-            	if (empty($conf->global->FICHINTER_CLASSIFY_BILLED) && $object->statut > Fichinter::STATUS_DRAFT && $object->statut < Fichinter::STATUS_CLOSED)
+				if (empty($conf->global->FICHINTER_CLASSIFY_BILLED) && $object->statut > Fichinter::STATUS_DRAFT && $object->statut < Fichinter::STATUS_CLOSED)
 				{
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifydone">'.$langs->trans("InterventionClassifyDone").'</a></div>';
 				}
diff --git a/htdocs/fichinter/class/api_interventions.class.php b/htdocs/fichinter/class/api_interventions.class.php
index c2328e5cfd3..7046a61e2d5 100644
--- a/htdocs/fichinter/class/api_interventions.class.php
+++ b/htdocs/fichinter/class/api_interventions.class.php
@@ -29,193 +29,193 @@
 class Interventions extends DolibarrApi
 {
 
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-      'socid',
-      'fk_project',
-      'description',
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+	  'socid',
+	  'fk_project',
+	  'description',
+	);
 
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDSLINE = array(
-      'description',
-      'date',
-      'duree',
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDSLINE = array(
+	  'description',
+	  'date',
+	  'duree',
+	);
 
-    /**
-     * @var fichinter $fichinter {@type fichinter}
-     */
-    public $fichinter;
+	/**
+	 * @var fichinter $fichinter {@type fichinter}
+	 */
+	public $fichinter;
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-        $this->fichinter = new Fichinter($this->db);
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->fichinter = new Fichinter($this->db);
+	}
 
-    /**
-     * Get properties of a Expense Report object
-     *
-     * Return an array with Expense Report information
-     *
-     * @param       int         $id         ID of Expense Report
-     * @return 	    array|mixed             Data without useless information
-     *
-     * @throws 	RestException
-     */
-    public function get($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->ficheinter->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a Expense Report object
+	 *
+	 * Return an array with Expense Report information
+	 *
+	 * @param       int         $id         ID of Expense Report
+	 * @return 	    array|mixed             Data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->ficheinter->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->fichinter->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Intervention not found');
-        }
+		$result = $this->fichinter->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Intervention not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('fichinter', $this->fichinter->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('fichinter', $this->fichinter->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $this->fichinter->fetchObjectLinked();
-        return $this->_cleanObjectDatas($this->fichinter);
-    }
+		$this->fichinter->fetchObjectLinked();
+		return $this->_cleanObjectDatas($this->fichinter);
+	}
 
-    /**
-     * List of interventions
-     *
-     * Return a list of interventions
-     *
-     * @param string	       $sortfield	        Sort field
-     * @param string	       $sortorder	        Sort order
-     * @param int	       $limit		        Limit for list
-     * @param int	       $page		        Page number
-     * @param string   	       $thirdparty_ids	        Thirdparty ids to filter orders of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
-     * @param string           $sqlfilters              Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-     * @return  array                                   Array of order objects
-     *
-     * @throws RestException
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
-    {
-        global $db, $conf;
+	/**
+	 * List of interventions
+	 *
+	 * Return a list of interventions
+	 *
+	 * @param string	       $sortfield	        Sort field
+	 * @param string	       $sortorder	        Sort order
+	 * @param int	       $limit		        Limit for list
+	 * @param int	       $page		        Page number
+	 * @param string   	       $thirdparty_ids	        Thirdparty ids to filter orders of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
+	 * @param string           $sqlfilters              Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+	 * @return  array                                   Array of order objects
+	 *
+	 * @throws RestException
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        // case of external user, $thirdparty_ids param is ignored and replaced by user's socid
-        $socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
+		// case of external user, $thirdparty_ids param is ignored and replaced by user's socid
+		$socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
 
-        // If the internal user must only see his customers, force searching by him
-        $search_sale = 0;
-        if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+		// If the internal user must only see his customers, force searching by him
+		$search_sale = 0;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
 
-        $sql = "SELECT t.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql .= " FROM ".MAIN_DB_PREFIX."fichinter as t";
+		$sql = "SELECT t.rowid";
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		$sql .= " FROM ".MAIN_DB_PREFIX."fichinter as t";
 
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql .= ' WHERE t.entity IN ('.getEntity('intervention').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-        if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
-        if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
-        // Insert sale filter
-        if ($search_sale > 0) {
-            $sql .= " AND sc.fk_user = ".$search_sale;
-        }
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		$sql .= ' WHERE t.entity IN ('.getEntity('intervention').')';
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
+		if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
+		if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		// Insert sale filter
+		if ($search_sale > 0) {
+			$sql .= " AND sc.fk_user = ".$search_sale;
+		}
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        dol_syslog("API Rest request");
-        $result = $this->db->query($sql);
+		dol_syslog("API Rest request");
+		$result = $this->db->query($sql);
 
-        if ($result)
-        {
-        	$num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            $i = 0;
-            while ($i < $min)
-            {
-            	$obj = $this->db->fetch_object($result);
-            	$fichinter_static = new Fichinter($this->db);
-                if ($fichinter_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($fichinter_static);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve intervention list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No intervention found');
-        }
-        return $obj_ret;
-    }
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			$i = 0;
+			while ($i < $min)
+			{
+				$obj = $this->db->fetch_object($result);
+				$fichinter_static = new Fichinter($this->db);
+				if ($fichinter_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($fichinter_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve intervention list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No intervention found');
+		}
+		return $obj_ret;
+	}
 
-    /**
-     * Create intervention object
-     *
-     * @param   array   $request_data   Request data
-     * @return  int     ID of intervention
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->ficheinter->creer) {
-            throw new RestException(401, "Insuffisant rights");
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
-        foreach ($request_data as $field => $value) {
-            $this->fichinter->$field = $value;
-        }
+	/**
+	 * Create intervention object
+	 *
+	 * @param   array   $request_data   Request data
+	 * @return  int     ID of intervention
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->ficheinter->creer) {
+			throw new RestException(401, "Insuffisant rights");
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
+		foreach ($request_data as $field => $value) {
+			$this->fichinter->$field = $value;
+		}
 
-        if ($this->fichinter->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, "Error creating intervention", array_merge(array($this->fichinter->error), $this->fichinter->errors));
-        }
+		if ($this->fichinter->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, "Error creating intervention", array_merge(array($this->fichinter->error), $this->fichinter->errors));
+		}
 
-        return $this->fichinter->id;
-    }
+		return $this->fichinter->id;
+	}
 
 
-    /**
-     * Get lines of an intervention
-     *
-     * @param int   $id             Id of intervention
-     *
-     * @url	GET {id}/lines
-     *
-     * @return int
-     */
-    /* TODO
+	/**
+	 * Get lines of an intervention
+	 *
+	 * @param int   $id             Id of intervention
+	 *
+	 * @url	GET {id}/lines
+	 *
+	 * @return int
+	 */
+	/* TODO
     public function getLines($id)
     {
         if(! DolibarrApiAccess::$user->rights->ficheinter->lire) {
@@ -239,218 +239,218 @@ class Interventions extends DolibarrApi
     }
     */
 
-    /**
-     * Add a line to given intervention
-     *
-     * @param 	int   	$id             Id of intervention to update
-     * @param   array   $request_data   Request data
-     *
-     * @url     POST {id}/lines
-     *
-     * @return  int
-     */
-    public function postLine($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->ficheinter->creer) {
-            throw new RestException(401, "Insuffisant rights");
-        }
-        // Check mandatory fields
-        $result = $this->_validateLine($request_data);
+	/**
+	 * Add a line to given intervention
+	 *
+	 * @param 	int   	$id             Id of intervention to update
+	 * @param   array   $request_data   Request data
+	 *
+	 * @url     POST {id}/lines
+	 *
+	 * @return  int
+	 */
+	public function postLine($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->ficheinter->creer) {
+			throw new RestException(401, "Insuffisant rights");
+		}
+		// Check mandatory fields
+		$result = $this->_validateLine($request_data);
 
-        foreach ($request_data as $field => $value) {
-            $this->fichinter->$field = $value;
-        }
+		foreach ($request_data as $field => $value) {
+			$this->fichinter->$field = $value;
+		}
 
-        if (!$result) {
-            throw new RestException(404, 'Intervention not found');
-        }
+		if (!$result) {
+			throw new RestException(404, 'Intervention not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('fichinter', $this->fichinter->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('fichinter', $this->fichinter->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $updateRes = $this->fichinter->addLine(
-                DolibarrApiAccess::$user,
-                $id,
-                $this->fichinter->description,
-                $this->fichinter->date,
-                $this->fichinter->duree
-        );
+		$updateRes = $this->fichinter->addLine(
+				DolibarrApiAccess::$user,
+				$id,
+				$this->fichinter->description,
+				$this->fichinter->date,
+				$this->fichinter->duree
+		);
 
-        if ($updateRes > 0) {
-            return $updateRes;
-        } else {
-            throw new RestException(400, $this->fichinter->error);
-        }
-    }
+		if ($updateRes > 0) {
+			return $updateRes;
+		} else {
+			throw new RestException(400, $this->fichinter->error);
+		}
+	}
 
-    /**
-     * Delete order
-     *
-     * @param   int     $id         Order ID
-     * @return  array
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->ficheinter->supprimer) {
-            throw new RestException(401);
-        }
-        $result = $this->fichinter->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Intervention not found');
-        }
+	/**
+	 * Delete order
+	 *
+	 * @param   int     $id         Order ID
+	 * @return  array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->ficheinter->supprimer) {
+			throw new RestException(401);
+		}
+		$result = $this->fichinter->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Intervention not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('fichinter', $this->fichinter->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('fichinter', $this->fichinter->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if (!$this->fichinter->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(500, 'Error when delete intervention : '.$this->fichinter->error);
-        }
+		if (!$this->fichinter->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(500, 'Error when delete intervention : '.$this->fichinter->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Intervention deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Intervention deleted'
+			)
+		);
+	}
 
-    /**
-     * Validate an intervention
-     *
-     * If you get a bad value for param notrigger check, provide this in body
-     * {
-     *   "notrigger": 0
-     * }
-     *
-     * @param   int $id             Intervention ID
-     * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
-     *
-     * @url POST    {id}/validate
-     *
-     * @return  array
-     */
-    public function validate($id, $notrigger = 0)
-    {
-        if (!DolibarrApiAccess::$user->rights->ficheinter->creer) {
-            throw new RestException(401, "Insuffisant rights");
-        }
-        $result = $this->fichinter->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Intervention not found');
-        }
+	/**
+	 * Validate an intervention
+	 *
+	 * If you get a bad value for param notrigger check, provide this in body
+	 * {
+	 *   "notrigger": 0
+	 * }
+	 *
+	 * @param   int $id             Intervention ID
+	 * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
+	 *
+	 * @url POST    {id}/validate
+	 *
+	 * @return  array
+	 */
+	public function validate($id, $notrigger = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->ficheinter->creer) {
+			throw new RestException(401, "Insuffisant rights");
+		}
+		$result = $this->fichinter->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Intervention not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('fichinter', $this->fichinter->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('fichinter', $this->fichinter->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $result = $this->fichinter->setValid(DolibarrApiAccess::$user, $notrigger);
-        if ($result == 0) {
-            throw new RestException(304, 'Error nothing done. May be object is already validated');
-        }
-        if ($result < 0) {
-            throw new RestException(500, 'Error when validating Intervention: '.$this->commande->error);
-        }
+		$result = $this->fichinter->setValid(DolibarrApiAccess::$user, $notrigger);
+		if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already validated');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when validating Intervention: '.$this->commande->error);
+		}
 
-        $this->fichinter->fetchObjectLinked();
+		$this->fichinter->fetchObjectLinked();
 
-        return $this->_cleanObjectDatas($this->fichinter);
-    }
+		return $this->_cleanObjectDatas($this->fichinter);
+	}
 
-    /**
-     * Close an intervention
-     *
-     * @param   int 	$id             Intervention ID
-     *
-     * @url POST    {id}/close
-     *
-     * @return  array
-     */
-    public function closeFichinter($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->ficheinter->creer)
-        {
-            throw new RestException(401, "Insuffisant rights");
-        }
-        $result = $this->fichinter->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Intervention not found');
-        }
+	/**
+	 * Close an intervention
+	 *
+	 * @param   int 	$id             Intervention ID
+	 *
+	 * @url POST    {id}/close
+	 *
+	 * @return  array
+	 */
+	public function closeFichinter($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->ficheinter->creer)
+		{
+			throw new RestException(401, "Insuffisant rights");
+		}
+		$result = $this->fichinter->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Intervention not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('fichinter', $this->fichinter->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('fichinter', $this->fichinter->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $result = $this->fichinter->setStatut(3);
+		$result = $this->fichinter->setStatut(3);
 
-        if ($result == 0) {
-            throw new RestException(304, 'Error nothing done. May be object is already closed');
-        }
-        if ($result < 0) {
-            throw new RestException(500, 'Error when closing Intervention: '.$this->fichinter->error);
-        }
+		if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already closed');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when closing Intervention: '.$this->fichinter->error);
+		}
 
-        $this->fichinter->fetchObjectLinked();
+		$this->fichinter->fetchObjectLinked();
 
-        return $this->_cleanObjectDatas($this->fichinter);
-    }
+		return $this->_cleanObjectDatas($this->fichinter);
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param array $data   Data to validate
-     * @return array
-     *
-     * @throws RestException
-     */
-    private function _validate($data)
-    {
-        $fichinter = array();
-        foreach (Interventions::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $fichinter[$field] = $data[$field];
-        }
-        return $fichinter;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param array $data   Data to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	private function _validate($data)
+	{
+		$fichinter = array();
+		foreach (Interventions::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$fichinter[$field] = $data[$field];
+		}
+		return $fichinter;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->statuts_short);
-        unset($object->statuts_logo);
-        unset($object->statuts);
+		unset($object->statuts_short);
+		unset($object->statuts_logo);
+		unset($object->statuts);
 
-        return $object;
-    }
+		return $object;
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param array $data   Data to validate
-     * @return array
-     *
-     * @throws RestException
-     */
-    private function _validateLine($data)
-    {
-        $fichinter = array();
-        foreach (Interventions::$FIELDSLINE as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $fichinter[$field] = $data[$field];
-        }
-        return $fichinter;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param array $data   Data to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	private function _validateLine($data)
+	{
+		$fichinter = array();
+		foreach (Interventions::$FIELDSLINE as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$fichinter[$field] = $data[$field];
+		}
+		return $fichinter;
+	}
 }
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 930c6e07978..39ac094132a 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2015-2020 Charlene Benke       <charlie@patas-monkey.com>
  * Copyright (C) 2018      Nicolas ZABOURI	    <info@inovea-conseil.com>
- * Copyright (C) 2018-2019 Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020 Frédéric 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
@@ -76,7 +76,7 @@ class Fichinter extends CommonObject
 	public $table_element = 'fichinter';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_fichinter';
 
@@ -95,16 +95,19 @@ class Fichinter extends CommonObject
 	 */
 	protected $table_ref_field = 'ref';
 
-	public $socid; // Id client
+	/**
+	 * @var int Thirdparty Id
+	 */
+	public $socid;
 
 	public $author;
 
 	/**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
 	public $datev;
 	public $dateo;
@@ -112,13 +115,20 @@ class Fichinter extends CommonObject
 	public $datet;
 
 	/**
-     * Date modification record (tms)
-     *
-     * @var integer
-     */
-    public $datem;
+	 * Date modification record (tms)
+	 *
+	 * @var integer
+	 */
+	public $datem;
 
+	/**
+	 * @var int duration
+	 */
 	public $duration;
+
+	/**
+	 * @var int status
+	 */
 	public $statut = 0; // 0=draft, 1=validated, 2=invoiced, 3=Terminate
 
 	/**
@@ -127,17 +137,23 @@ class Fichinter extends CommonObject
 	public $description;
 
 	/**
-     * @var int ID
-     */
+	 * @var int Contract ID
+	 */
 	public $fk_contrat = 0;
 
 	/**
-     * @var int ID
-     */
+	 * @var int Project ID
+	 */
 	public $fk_project = 0;
 
+	/**
+	 * @var array extraparams
+	 */
 	public $extraparams = array();
 
+	/**
+	 * @var array lines
+	 */
 	public $lines = array();
 
 	/**
@@ -160,27 +176,26 @@ class Fichinter extends CommonObject
 	 */
 	const STATUS_CLOSED = 3;
 
+
 	/**
 	 *	Constructor
 	 *
 	 *  @param	DoliDB	$db		Database handler
 	 */
-    public function __construct($db)
-    {
+	public function __construct($db)
+	{
 		$this->db = $db;
+	}
 
-		$this->products = array();
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Load indicators into this->nb for board
 	 *
 	 *  @return     int         <0 if KO, >0 if OK
 	 */
-    public function load_state_board()
+	public function load_state_board()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user;
 
 		$this->nb = array();
@@ -220,11 +235,11 @@ class Fichinter extends CommonObject
 	 *	@param		int		$notrigger	Disable all triggers
 	 *	@return		int		<0 if KO, >0 if OK
 	 */
-    public function create($user, $notrigger = 0)
+	public function create($user, $notrigger = 0)
 	{
 		global $conf, $langs;
 
-        $error = 0;
+		$error = 0;
 
 		dol_syslog(get_class($this)."::create ref=".$this->ref);
 
@@ -328,8 +343,7 @@ class Fichinter extends CommonObject
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return $this->id;
 			} else {
@@ -352,9 +366,9 @@ class Fichinter extends CommonObject
 	 *	@param		int		$notrigger	Disable all triggers
 	 *	@return		int		<0 if KO, >0 if OK
 	 */
-    public function update($user, $notrigger = 0)
+	public function update($user, $notrigger = 0)
 	{
-        global $conf;
+		global $conf;
 
 	 	if (!is_numeric($this->duration)) {
 	 		$this->duration = 0;
@@ -412,7 +426,7 @@ class Fichinter extends CommonObject
 	 *	@param		string	$ref		Ref of intervention
 	 *	@return		int					<0 if KO, >0 if OK
 	 */
-    public function fetch($rowid, $ref = '')
+	public function fetch($rowid, $ref = '')
 	{
 		$sql = "SELECT f.rowid, f.ref, f.description, f.fk_soc, f.fk_statut,";
 		$sql .= " f.datec, f.dateo, f.datee, f.datet, f.fk_user_author,";
@@ -449,7 +463,7 @@ class Fichinter extends CommonObject
 				$this->note_public  = $obj->note_public;
 				$this->note_private = $obj->note_private;
 				$this->model_pdf    = $obj->model_pdf;
-				$this->modelpdf     = $obj->model_pdf;	// deprecated
+				$this->modelpdf     = $obj->model_pdf; // deprecated
 				$this->fk_contrat = $obj->fk_contrat;
 
 				$this->user_creation = $obj->fk_user_author;
@@ -484,7 +498,7 @@ class Fichinter extends CommonObject
 	 *	@param		User	$user	User that set draft
 	 *	@return		int			    <0 if KO, >0 if OK
 	 */
-    public function setDraft($user)
+	public function setDraft($user)
 	{
 		global $langs, $conf;
 
@@ -493,7 +507,7 @@ class Fichinter extends CommonObject
 		// Protection
 		if ($this->statut <= self::STATUS_DRAFT)
 		{
-		    return 0;
+			return 0;
 		}
 
 		dol_syslog(get_class($this)."::setDraft", LOG_DEBUG);
@@ -507,23 +521,23 @@ class Fichinter extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-		    if (!$error) {
-		        $this->oldcopy = clone $this;
-		    }
-
-		    if (!$error) {
-		        // Call trigger
-		        $result = $this->call_trigger('FICHINTER_UNVALIDATE', $user);
-		        if ($result < 0) $error++;
-		    }
+			if (!$error) {
+				$this->oldcopy = clone $this;
+			}
 
 			if (!$error) {
-			    $this->statut = self::STATUS_DRAFT;
-			    $this->db->commit();
-			    return 1;
+				// Call trigger
+				$result = $this->call_trigger('FICHINTER_UNVALIDATE', $user);
+				if ($result < 0) $error++;
+			}
+
+			if (!$error) {
+				$this->statut = self::STATUS_DRAFT;
+				$this->db->commit();
+				return 1;
 			} else {
-			    $this->db->rollback();
-			    return -1;
+				$this->db->rollback();
+				return -1;
 			}
 		} else {
 			$this->db->rollback();
@@ -539,7 +553,7 @@ class Fichinter extends CommonObject
 	 *  @param		int			$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return		int						<0 if KO, >0 if OK
 	 */
-    public function setValid($user, $notrigger = 0)
+	public function setValid($user, $notrigger = 0)
 	{
 		global $conf;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -635,10 +649,6 @@ class Fichinter extends CommonObject
 				$this->statut = 1;
 				$this->brouillon = 0;
 				$this->date_validation = $now;
-			}
-
-			if (!$error)
-			{
 				$this->db->commit();
 				return 1;
 			} else {
@@ -681,19 +691,21 @@ class Fichinter extends CommonObject
 	 *  @param      int                     $hidedetails    Hide details of lines
 	 *  @param      int                     $hidedesc       Hide description
 	 *  @param      int                     $hideref        Hide ref
-         *  @param   null|array  $moreparams     Array to provide more information
+	 *  @param   null|array  $moreparams     Array to provide more information
 	 *  @return     int                                     0 if KO, 1 if OK
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
-		global $conf, $langs;
+		global $conf;
 
-		$langs->load("interventions");
+		$outputlangs->load("interventions");
 
 		if (!dol_strlen($modele)) {
 			$modele = 'soleil';
 
-			if ($this->modelpdf) {
+			if (!empty($this->model_pdf)) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($this->modelpdf)) {	// deprecated
 				$modele = $this->modelpdf;
 			} elseif (!empty($conf->global->FICHEINTER_ADDON_PDF)) {
 				$modele = $conf->global->FICHEINTER_ADDON_PDF;
@@ -716,7 +728,7 @@ class Fichinter extends CommonObject
 		return $this->LibStatut((isset($this->statut) ? $this->statut : $this->status), $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Returns the label of a status
 	 *
@@ -726,21 +738,21 @@ class Fichinter extends CommonObject
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// Init/load array of translation of status
 		if (empty($this->statuts) || empty($this->statuts_short) || empty($this->statuts_logo))
 		{
 			global $langs;
 			$langs->load("fichinter");
 
-			$this->statuts[self::STATUS_DRAFT] = $langs->trans('Draft');
-			$this->statuts[self::STATUS_VALIDATED] = $langs->trans('Validated');
-			$this->statuts[self::STATUS_BILLED] = $langs->trans('StatusInterInvoiced');
-			$this->statuts[self::STATUS_CLOSED] = $langs->trans('Done');
-			$this->statuts_short[self::STATUS_DRAFT] = $langs->trans('Draft');
-			$this->statuts_short[self::STATUS_VALIDATED] = $langs->trans('Validated');
-			$this->statuts_short[self::STATUS_BILLED] = $langs->trans('StatusInterInvoiced');
-			$this->statuts_short[self::STATUS_CLOSED] = $langs->trans('Done');
+			$this->statuts[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+			$this->statuts[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
+			$this->statuts[self::STATUS_BILLED] = $langs->transnoentitiesnoconv('StatusInterInvoiced');
+			$this->statuts[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Done');
+			$this->statuts_short[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+			$this->statuts_short[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
+			$this->statuts_short[self::STATUS_BILLED] = $langs->transnoentitiesnoconv('StatusInterInvoiced');
+			$this->statuts_short[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Done');
 			$this->statuts_logo[self::STATUS_DRAFT] = 'status0';
 			$this->statuts_logo[self::STATUS_VALIDATED] = 'status1';
 			$this->statuts_logo[self::STATUS_BILLED] = 'status6';
@@ -765,11 +777,11 @@ class Fichinter extends CommonObject
 
 		$result = '';
 
-		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Intervention").'</u>';
-		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Intervention").'</u>';
 		if (isset($this->status)) {
-			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
+			$label .= ' '.$this->getLibStatut(5);
 		}
+		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
 		$url = DOL_URL_ROOT.'/fichinter/card.php?id='.$this->id;
 
@@ -970,14 +982,13 @@ class Fichinter extends CommonObject
 			}
 		}
 
-		if (!$error)
-                {
-				$main = MAIN_DB_PREFIX.'fichinterdet';
-				$ef = $main."_extrafields";
-				$sql = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_fichinter = ".$this->id.")";
+		if (!$error) {
+			$main = MAIN_DB_PREFIX.'fichinterdet';
+			$ef = $main."_extrafields";
+			$sql = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_fichinter = ".$this->id.")";
 
-				$resql = $this->db->query($sql);
-				if (!$resql) $error++;
+			$resql = $this->db->query($sql);
+			if (!$resql) $error++;
 		}
 
 		if (!$error)
@@ -1051,17 +1062,17 @@ class Fichinter extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Defines a delivery date of intervention
 	 *
 	 *  @param      User	$user				Object user who define
 	 *  @param      integer	$date_delivery   	date of delivery
 	 *  @return     int							<0 if ko, >0 if ok
-     */
-    public function set_date_delivery($user, $date_delivery)
-    {
-        // phpcs:enable
+	 */
+	public function set_date_delivery($user, $date_delivery)
+	{
+		// phpcs:enable
 		global $conf;
 
 		if ($user->rights->ficheinter->creer)
@@ -1083,7 +1094,7 @@ class Fichinter extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define the label of the intervention
 	 *
@@ -1091,9 +1102,9 @@ class Fichinter extends CommonObject
 	 *	@param      string	$description    description
 	 *	@return     int						<0 if KO, >0 if OK
 	 */
-    public function set_description($user, $description)
+	public function set_description($user, $description)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		if ($user->rights->ficheinter->creer)
@@ -1116,7 +1127,7 @@ class Fichinter extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Link intervention to a contract
 	 *
@@ -1124,9 +1135,9 @@ class Fichinter extends CommonObject
 	 *	@param      int		$contractid		Description
 	 *	@return     int						<0 if ko, >0 if ok
 	 */
-    public function set_contrat($user, $contractid)
-    {
-        // phpcs:enable
+	public function set_contrat($user, $contractid)
+	{
+		// phpcs:enable
 		global $conf;
 
 		if ($user->rights->ficheinter->creer)
@@ -1320,15 +1331,15 @@ class Fichinter extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Load array lines ->lines
 	 *
 	 *	@return		int		<0 if KO, >0 if OK
 	 */
-    public function fetch_lines()
-    {
-        // phpcs:enable
+	public function fetch_lines()
+	{
+		// phpcs:enable
 		$this->lines = array();
 
 		$sql = 'SELECT rowid, fk_fichinter, description, duree, date, rang';
@@ -1356,6 +1367,7 @@ class Fichinter extends CommonObject
 				$line->datei = $this->db->jdate($objp->date);
 				$line->rang	= $objp->rang;
 				$line->product_type = 1;
+				$line->fetch_optionals();
 
 				$this->lines[$i] = $line;
 
@@ -1394,9 +1406,9 @@ class Fichinter extends CommonObject
 class FichinterLigne extends CommonObjectLine
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -1405,8 +1417,8 @@ class FichinterLigne extends CommonObjectLine
 
 	// From llx_fichinterdet
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_fichinter;
 
 	public $desc; // Description ligne
@@ -1425,7 +1437,7 @@ class FichinterLigne extends CommonObjectLine
 	public $table_element = 'fichinterdet';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_fichinter';
 
@@ -1484,7 +1496,7 @@ class FichinterLigne extends CommonObjectLine
 	{
 		global $langs, $conf;
 
-        $error = 0;
+		$error = 0;
 
 		dol_syslog("FichinterLigne::insert rang=".$this->rang);
 
@@ -1576,9 +1588,9 @@ class FichinterLigne extends CommonObjectLine
 	{
 		global $langs, $conf;
 
-        $error = 0;
+		$error = 0;
 
-        $this->db->begin();
+		$this->db->begin();
 
 		// Mise a jour ligne en base
 		$sql = "UPDATE ".MAIN_DB_PREFIX."fichinterdet SET";
@@ -1629,7 +1641,7 @@ class FichinterLigne extends CommonObjectLine
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Update total duration into llx_fichinter
 	 *
@@ -1637,7 +1649,7 @@ class FichinterLigne extends CommonObjectLine
 	 */
 	public function update_total()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$this->db->begin();
@@ -1696,7 +1708,7 @@ class FichinterLigne extends CommonObjectLine
 			dol_syslog(get_class($this)."::deleteline lineid=".$this->id);
 			$this->db->begin();
 
-                        $result = $this->deleteExtraFields();
+						$result = $this->deleteExtraFields();
 			if ($result < 0) {
 				$error++;
 				$this->db->rollback();
diff --git a/htdocs/fichinter/class/fichinterrec.class.php b/htdocs/fichinter/class/fichinterrec.class.php
index 818c1763786..046d35b62ce 100644
--- a/htdocs/fichinter/class/fichinterrec.class.php
+++ b/htdocs/fichinter/class/fichinterrec.class.php
@@ -41,6 +41,10 @@ class FichinterRec extends Fichinter
 	public $element = 'fichinterrec';
 	public $table_element = 'fichinter_rec';
 	public $table_element_line = 'fichinter_rec';
+
+	/**
+	 * @var string Fieldname with ID of parent key if this field has a parent
+	 */
 	public $fk_element = 'fk_fichinter';
 
 	/**
@@ -53,6 +57,9 @@ class FichinterRec extends Fichinter
 	 */
 	public $picto = 'intervention';
 
+	/**
+	 * @var string title
+	 */
 	public $title;
 	public $number;
 	public $date;
@@ -60,14 +67,28 @@ class FichinterRec extends Fichinter
 	public $remise;
 	public $tva;
 	public $total;
-	public $db_table;
+
+	/**
+	 * @var int Proposal Id
+	 */
 	public $propalid;
 
 	public $date_last_gen;
 	public $date_when;
+
+	/**
+	 * @var int number of generation done
+	 */
 	public $nb_gen_done;
+
+	/**
+	 * @var int number of maximum generation
+	 */
 	public $nb_gen_max;
 
+	/**
+	 * int rank
+	 */
 	public $rang;
 	public $special_code;
 
@@ -250,12 +271,11 @@ class FichinterRec extends Fichinter
 	 */
 	public function fetch($rowid = 0, $ref = '', $ref_ext = '')
 	{
-		$sql = 'SELECT f.titre, f.fk_soc';
+		$sql = 'SELECT f.titre as title, f.fk_soc';
 		$sql .= ', f.datec, f.duree, f.fk_projet, f.fk_contrat, f.description';
 		$sql .= ', f.note_private, f.note_public, f.fk_user_author';
 		$sql .= ', f.frequency, f.unit_frequency, f.date_when, f.date_last_gen, f.nb_gen_done, f.nb_gen_max, f.auto_validate';
 		$sql .= ', f.note_private, f.note_public, f.fk_user_author';
-
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'fichinter_rec as f';
 		if ($rowid > 0) $sql .= ' WHERE f.rowid='.$rowid;
 		elseif ($ref) $sql .= " WHERE f.titre='".$this->db->escape($ref)."'";
@@ -268,8 +288,9 @@ class FichinterRec extends Fichinter
 				$obj = $this->db->fetch_object($result);
 
 				$this->id = $rowid;
-				$this->titre				= $obj->titre;
-				$this->ref = $obj->titre;
+				$this->titre				= $obj->title;
+				$this->title				= $obj->title;
+				$this->ref = $obj->title;
 				$this->description = $obj->description;
 				$this->datec				= $obj->datec;
 				$this->duration = $obj->duree;
@@ -281,7 +302,7 @@ class FichinterRec extends Fichinter
 				$this->note_public			= $obj->note_public;
 				$this->user_author			= $obj->fk_user_author;
 				$this->model_pdf			= $obj->model_pdf;
-				$this->modelpdf				= $obj->model_pdf;
+				$this->modelpdf				= $obj->model_pdf; // deprecated
 				$this->rang = $obj->rang;
 				$this->special_code = $obj->special_code;
 				$this->frequency			= $obj->frequency;
diff --git a/htdocs/fichinter/class/fichinterstats.class.php b/htdocs/fichinter/class/fichinterstats.class.php
index 1355c7a97cf..5df841bf6f2 100644
--- a/htdocs/fichinter/class/fichinterstats.class.php
+++ b/htdocs/fichinter/class/fichinterstats.class.php
@@ -33,182 +33,183 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
  */
 class FichinterStats extends Stats
 {
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element;
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element;
 
-    public $socid;
-    public $userid;
+	public $socid;
+	public $userid;
 
-    public $from;
-    public $field;
-    public $where;
+	public $from;
+	public $field;
+	public $where;
 
 
-    /**
-     * Constructor
-     *
-     * @param 	DoliDB	$db		   Database handler
-     * @param 	int		$socid	   Id third party for filter. This value must be forced during the new to external user company if user is an external user.
-     * @param 	string	$mode	   Option ('customer', 'supplier')
-     * @param   int		$userid    Id user for filter (creation user)
-     */
-    public function __construct($db, $socid, $mode, $userid = 0)
-    {
-        global $user, $conf;
+	/**
+	 * Constructor
+	 *
+	 * @param 	DoliDB	$db		   Database handler
+	 * @param 	int		$socid	   Id third party for filter. This value must be forced during the new to external user company if user is an external user.
+	 * @param 	string	$mode	   Option ('customer', 'supplier')
+	 * @param   int		$userid    Id user for filter (creation user)
+	 */
+	public function __construct($db, $socid, $mode, $userid = 0)
+	{
+		global $user, $conf;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->socid = ($socid > 0 ? $socid : 0);
-        $this->userid = $userid;
-        $this->cachefilesuffix = $mode;
+		$this->socid = ($socid > 0 ? $socid : 0);
+		$this->userid = $userid;
+		$this->cachefilesuffix = $mode;
 
-        $this->where .= " c.entity = ".$conf->entity;
-        if ($mode == 'customer')
-        {
-            $object = new Fichinter($this->db);
-            $this->from = MAIN_DB_PREFIX.$object->table_element." as c";
-            $this->from_line = MAIN_DB_PREFIX.$object->table_element_line." as tl";
-            $this->field = '0';
-            $this->field_line = '0';
-            //$this->where.= " AND c.fk_statut > 0";    // Not draft and not cancelled
-        }
-        if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
-        if ($this->socid)
-        {
-            $this->where .= " AND c.fk_soc = ".$this->socid;
-        }
-        if ($this->userid > 0) $this->where .= ' AND c.fk_user_author = '.$this->userid;
-    }
+		if ($mode == 'customer')
+		{
+			$object = new Fichinter($this->db);
+			$this->from = MAIN_DB_PREFIX.$object->table_element." as c";
+			$this->from_line = MAIN_DB_PREFIX.$object->table_element_line." as tl";
+			$this->field = '0';
+			$this->field_line = '0';
+			//$this->where.= " AND c.fk_statut > 0";    // Not draft and not cancelled
+		}
+		if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		$this->where .= ($this->where ? ' AND ' : '')."c.entity IN (".getEntity('fichinter').')';
 
-    /**
-     * Return intervention number by month for a year
-     *
-     * @param	int		$year		Year to scan
-     *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
-     * @return	array				Array with number by month
-     */
-    public function getNbByMonth($year, $format = 0)
-    {
-        global $user;
+		if ($this->socid)
+		{
+			$this->where .= " AND c.fk_soc = ".$this->socid;
+		}
+		if ($this->userid > 0) $this->where .= ' AND c.fk_user_author = '.$this->userid;
+	}
 
-        $sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb";
-        $sql .= " FROM ".$this->from;
-        if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
-        $sql .= " AND ".$this->where;
-        $sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+	/**
+	 * Return intervention number by month for a year
+	 *
+	 * @param	int		$year		Year to scan
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 * @return	array				Array with number by month
+	 */
+	public function getNbByMonth($year, $format = 0)
+	{
+		global $user;
 
-        $res = $this->_getNbByMonth($year, $sql, $format);
-        return $res;
-    }
+		$sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb";
+		$sql .= " FROM ".$this->from;
+		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
+		$sql .= " AND ".$this->where;
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
 
-    /**
-     * Return interventions number per year
-     *
-     * @return	array	Array with number by year
-     *
-     */
-    public function getNbByYear()
-    {
-        global $user;
+		$res = $this->_getNbByMonth($year, $sql, $format);
+		return $res;
+	}
 
-        $sql = "SELECT date_format(c.date_valid,'%Y') as dm, COUNT(*) as nb, 0";
-        $sql .= " FROM ".$this->from;
-        if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= " WHERE ".$this->where;
-        $sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+	/**
+	 * Return interventions number per year
+	 *
+	 * @return	array	Array with number by year
+	 *
+	 */
+	public function getNbByYear()
+	{
+		global $user;
 
-        return $this->_getNbByYear($sql);
-    }
+		$sql = "SELECT date_format(c.date_valid,'%Y') as dm, COUNT(*) as nb, 0";
+		$sql .= " FROM ".$this->from;
+		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql .= " WHERE ".$this->where;
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
 
-    /**
-     * Return the intervention amount by month for a year
-     *
-     * @param	int		$year		Year to scan
-     *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
-     * @return	array				Array with amount by month
-     */
-    public function getAmountByMonth($year, $format = 0)
-    {
-        global $user;
+		return $this->_getNbByYear($sql);
+	}
 
-        $sql = "SELECT date_format(c.date_valid,'%m') as dm, 0";
-        $sql .= " FROM ".$this->from;
-        if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
-        $sql .= " AND ".$this->where;
-        $sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+	/**
+	 * Return the intervention amount by month for a year
+	 *
+	 * @param	int		$year		Year to scan
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 * @return	array				Array with amount by month
+	 */
+	public function getAmountByMonth($year, $format = 0)
+	{
+		global $user;
 
-        $res = $this->_getAmountByMonth($year, $sql, $format);
-        return $res;
-    }
+		$sql = "SELECT date_format(c.date_valid,'%m') as dm, 0";
+		$sql .= " FROM ".$this->from;
+		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
+		$sql .= " AND ".$this->where;
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
 
-    /**
-     * Return the intervention amount average by month for a year
-     *
-     * @param	int		$year	year for stats
-     * @return	array			array with number by month
-     */
-    public function getAverageByMonth($year)
-    {
-        global $user;
+		$res = $this->_getAmountByMonth($year, $sql, $format);
+		return $res;
+	}
 
-        $sql = "SELECT date_format(c.date_valid,'%m') as dm, 0";
-        $sql .= " FROM ".$this->from;
-        if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
-        $sql .= " AND ".$this->where;
-        $sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+	/**
+	 * Return the intervention amount average by month for a year
+	 *
+	 * @param	int		$year	year for stats
+	 * @return	array			array with number by month
+	 */
+	public function getAverageByMonth($year)
+	{
+		global $user;
 
-        return $this->_getAverageByMonth($year, $sql);
-    }
+		$sql = "SELECT date_format(c.date_valid,'%m') as dm, 0";
+		$sql .= " FROM ".$this->from;
+		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
+		$sql .= " AND ".$this->where;
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
 
-    /**
-     *	Return nb, total and average
-     *
-     *	@return	array	Array of values
-     */
-    public function getAllByYear()
-    {
-        global $user;
+		return $this->_getAverageByMonth($year, $sql);
+	}
 
-        $sql = "SELECT date_format(c.date_valid,'%Y') as year, COUNT(*) as nb, 0 as total, 0 as avg";
-        $sql .= " FROM ".$this->from;
-        if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= " WHERE ".$this->where;
-        $sql .= " GROUP BY year";
-        $sql .= $this->db->order('year', 'DESC');
+	/**
+	 *	Return nb, total and average
+	 *
+	 *	@return	array	Array of values
+	 */
+	public function getAllByYear()
+	{
+		global $user;
 
-        return $this->_getAllByYear($sql);
-    }
+		$sql = "SELECT date_format(c.date_valid,'%Y') as year, COUNT(*) as nb, 0 as total, 0 as avg";
+		$sql .= " FROM ".$this->from;
+		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql .= " WHERE ".$this->where;
+		$sql .= " GROUP BY year";
+		$sql .= $this->db->order('year', 'DESC');
 
-    /**
-     *  Return nb, amount of predefined product for year
-     *
-     *  @param	int		$year			Year to scan
-     *  @param  int     $limit      	Limit
-     *  @return	array					Array of values
-     */
-    public function getAllByProduct($year, $limit = 0)
-    {
-        global $user;
+		return $this->_getAllByYear($sql);
+	}
 
-        $sql = "SELECT product.ref, COUNT(product.ref) as nb, 0 as total, 0 as avg";
-        $sql .= " FROM ".$this->from.", ".$this->from_line.", ".MAIN_DB_PREFIX."product as product";
-        //if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= " WHERE ".$this->where;
-        $sql .= " AND c.rowid = tl.fk_fichinter AND tl.fk_product = product.rowid";
-        $sql .= " AND c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year, 1, false))."' AND '".$this->db->idate(dol_get_last_day($year, 12, false))."'";
-        $sql .= " GROUP BY product.ref";
-        $sql .= $this->db->order('nb', 'DESC');
-        //$sql.= $this->db->plimit(20);
+	/**
+	 *  Return nb, amount of predefined product for year
+	 *
+	 *  @param	int		$year			Year to scan
+	 *  @param  int     $limit      	Limit
+	 *  @return	array					Array of values
+	 */
+	public function getAllByProduct($year, $limit = 0)
+	{
+		global $user;
 
-        return $this->_getAllByProduct($sql, $limit);
-    }
+		$sql = "SELECT product.ref, COUNT(product.ref) as nb, 0 as total, 0 as avg";
+		$sql .= " FROM ".$this->from.", ".$this->from_line.", ".MAIN_DB_PREFIX."product as product";
+		//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql .= " WHERE ".$this->where;
+		$sql .= " AND c.rowid = tl.fk_fichinter AND tl.fk_product = product.rowid";
+		$sql .= " AND c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year, 1, false))."' AND '".$this->db->idate(dol_get_last_day($year, 12, false))."'";
+		$sql .= " GROUP BY product.ref";
+		$sql .= $this->db->order('nb', 'DESC');
+		//$sql.= $this->db->plimit(20);
+
+		return $this->_getAllByProduct($sql, $limit);
+	}
 }
diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index 1eb0df5147a..bace3d10231 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -46,8 +46,8 @@ $object = new Fichinter($db);
 $result = $object->fetch($id, $ref);
 if (!$result)
 {
-    print 'Record not found';
-    exit;
+	print 'Record not found';
+	exit;
 }
 
 /*
@@ -56,11 +56,12 @@ if (!$result)
 
 if ($action == 'addcontact' && $user->rights->ficheinter->creer)
 {
-    if ($result > 0 && $id > 0)
-    {
-    	$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
-  		$result = $object->add_contact($contactid, GETPOST('type', 'int'), GETPOST('source', 'alpha'));
-    }
+	if ($result > 0 && $id > 0)
+	{
+		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
+	}
 
 	if ($result >= 0)
 	{
@@ -81,7 +82,7 @@ if ($action == 'addcontact' && $user->rights->ficheinter->creer)
 // Toggle the status of a contact
 elseif ($action == 'swapstatut' && $user->rights->ficheinter->creer)
 {
-    $result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+	$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
 }
 
 // Deletes a contact
@@ -118,7 +119,7 @@ if ($id > 0 || !empty($ref))
 	$object->fetch_thirdparty();
 
 	$head = fichinter_prepare_head($object);
-	dol_fiche_head($head, 'contact', $langs->trans("InterventionCard"), -1, 'intervention');
+	print dol_get_fiche_head($head, 'contact', $langs->trans("InterventionCard"), -1, 'intervention');
 
 
 	// Intervention card
@@ -134,42 +135,42 @@ if ($id > 0 || !empty($ref))
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    if ($user->rights->ficheinter->creer)
-	    {
-	        if ($action != 'classify') {
-                //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-                $morehtmlref .= ' : ';
-            }
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	            $morehtmlref .= $proj->ref;
-	            $morehtmlref .= '</a>';
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->ficheinter->creer)
+		{
+			if ($action != 'classify') {
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				$morehtmlref .= ' : ';
+			}
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<br>';
 
@@ -180,8 +181,8 @@ if ($id > 0 || !empty($ref))
 	$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
 	foreach ($dirtpls as $reldir)
 	{
-	    $res = @include dol_buildpath($reldir.'/contacts.tpl.php');
-	    if ($res) break;
+		$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
+		if ($res) break;
 	}
 }
 
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index 49988e27e78..1b9326468f4 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -92,7 +92,7 @@ if ($object->id)
 
 	$head = fichinter_prepare_head($object);
 
-	dol_fiche_head($head, 'documents', $langs->trans("InterventionCard"), -1, 'intervention');
+	print dol_get_fiche_head($head, 'documents', $langs->trans("InterventionCard"), -1, 'intervention');
 
 
 	// Build file list
@@ -117,59 +117,59 @@ if ($object->id)
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    if ($user->rights->commande->creer)
-	    {
-            if ($action != 'classify') {
-                //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-                $morehtmlref .= ' : ';
-            }
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-        } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	            $morehtmlref .= $proj->ref;
-	            $morehtmlref .= '</a>';
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->commande->creer)
+		{
+			if ($action != 'classify') {
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				$morehtmlref .= ' : ';
+			}
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border tableforfield centpercent">';
-    print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-    print '</table>';
+	print '<table class="border tableforfield centpercent">';
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    $modulepart = 'ficheinter';
-    $permission = $user->rights->ficheinter->creer;
-    $permtoedit = $user->rights->ficheinter->creer;
-    $param = '&id='.$object->id;
-    include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	$modulepart = 'ficheinter';
+	$permission = $user->rights->ficheinter->creer;
+	$permtoedit = $user->rights->ficheinter->creer;
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
 	print $langs->trans("ErrorUnknown");
 }
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index ccadf89f1e4..3ea69f8d185 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -68,16 +68,16 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-    // Search ficheinter
-    $var = false;
-    print '<form method="post" action="'.DOL_URL_ROOT.'/fichinter/list.php">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder nohover centpercent">';
-    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    print '<tr class="oddeven"><td>';
-    print $langs->trans("Intervention").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-    print "</table></div></form><br>\n";
+	// Search ficheinter
+	$var = false;
+	print '<form method="post" action="'.DOL_URL_ROOT.'/fichinter/list.php">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder nohover centpercent">';
+	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("Intervention").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+	print "</table></div></form><br>\n";
 }
 
 
@@ -97,90 +97,90 @@ $sql .= " GROUP BY f.fk_statut";
 $resql = $db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
-    $i = 0;
+	$num = $db->num_rows($resql);
+	$i = 0;
 
-    $total = 0;
-    $totalinprocess = 0;
-    $dataseries = array();
-    $vals = array();
-    $bool = false;
-    // -1=Canceled, 0=Draft, 1=Validated, 2=Accepted/On process, 3=Closed (Sent/Received, billed or not)
-    while ($i < $num)
-    {
-        $row = $db->fetch_row($resql);
-        if ($row)
-        {
-            //if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))
-            {
-                $bool = (!empty($row[2]) ?true:false);
-                if (!isset($vals[$row[1].$bool])) $vals[$row[1].$bool] = 0;
-                $vals[$row[1].$bool] += $row[0];
-                $totalinprocess += $row[0];
-            }
-            $total += $row[0];
-        }
-        $i++;
-    }
-    $db->free($resql);
+	$total = 0;
+	$totalinprocess = 0;
+	$dataseries = array();
+	$vals = array();
+	$bool = false;
+	// -1=Canceled, 0=Draft, 1=Validated, 2=Accepted/On process, 3=Closed (Sent/Received, billed or not)
+	while ($i < $num)
+	{
+		$row = $db->fetch_row($resql);
+		if ($row)
+		{
+			//if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))
+			{
+				$bool = (!empty($row[2]) ?true:false);
+				if (!isset($vals[$row[1].$bool])) $vals[$row[1].$bool] = 0;
+				$vals[$row[1].$bool] += $row[0];
+				$totalinprocess += $row[0];
+			}
+			$total += $row[0];
+		}
+		$i++;
+	}
+	$db->free($resql);
 
-    include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
+	include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
 
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder nohover centpercent">';
-    print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Interventions").'</th></tr>'."\n";
-    $listofstatus = array(0, 1, 3);
-    $bool = false;
-    foreach ($listofstatus as $status)
-    {
-        $dataseries[] = array($fichinterstatic->LibStatut($status, $bool, 1), (isset($vals[$status.$bool]) ? (int) $vals[$status.$bool] : 0));
-        if ($status == 3 && !$bool) $bool = true;
-        else $bool = false;
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder nohover centpercent">';
+	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Interventions").'</th></tr>'."\n";
+	$listofstatus = array(0, 1, 3);
+	$bool = false;
+	foreach ($listofstatus as $status)
+	{
+		$dataseries[] = array($fichinterstatic->LibStatut($status, $bool, 1), (isset($vals[$status.$bool]) ? (int) $vals[$status.$bool] : 0));
+		if ($status == 3 && !$bool) $bool = true;
+		else $bool = false;
 
-        if ($status == Fichinter::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
-        if ($status == Fichinter::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;
-        if ($status == Fichinter::STATUS_BILLED) $colorseries[$status] = $badgeStatus4;
-        if ($status == Fichinter::STATUS_CLOSED) $colorseries[$status] = $badgeStatus6;
-    }
-    if ($conf->use_javascript_ajax)
-    {
-        print '<tr class="impair"><td class="center" colspan="2">';
+		if ($status == Fichinter::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
+		if ($status == Fichinter::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;
+		if ($status == Fichinter::STATUS_BILLED) $colorseries[$status] = $badgeStatus4;
+		if ($status == Fichinter::STATUS_CLOSED) $colorseries[$status] = $badgeStatus6;
+	}
+	if ($conf->use_javascript_ajax)
+	{
+		print '<tr class="impair"><td class="center" colspan="2">';
 
-        include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
-        $dolgraph = new DolGraph();
-        $dolgraph->SetData($dataseries);
-        $dolgraph->SetDataColor(array_values($colorseries));
-        $dolgraph->setShowLegend(2);
-        $dolgraph->setShowPercent(1);
-        $dolgraph->SetType(array('pie'));
-        $dolgraph->setHeight('200');
-        $dolgraph->draw('idgraphstatus');
-        print $dolgraph->show($total ? 0 : 1);
+		include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+		$dolgraph = new DolGraph();
+		$dolgraph->SetData($dataseries);
+		$dolgraph->SetDataColor(array_values($colorseries));
+		$dolgraph->setShowLegend(2);
+		$dolgraph->setShowPercent(1);
+		$dolgraph->SetType(array('pie'));
+		$dolgraph->setHeight('200');
+		$dolgraph->draw('idgraphstatus');
+		print $dolgraph->show($total ? 0 : 1);
 
-        print '</td></tr>';
-    }
-    $bool = false;
-    foreach ($listofstatus as $status)
-    {
-        if (!$conf->use_javascript_ajax)
-        {
-            print '<tr class="oddeven">';
-            print '<td>'.$fichinterstatic->LibStatut($status, $bool, 0).'</td>';
-            print '<td class="right"><a href="list.php?search_status='.$status.'">'.(isset($vals[$status.$bool]) ? $vals[$status.$bool] : 0).' ';
-            print $fichinterstatic->LibStatut($status, $bool, 3);
-            print '</a>';
-            print '</td>';
-            print "</tr>\n";
-            if ($status == 3 && !$bool) $bool = true;
-            else $bool = false;
-        }
-    }
-    //if ($totalinprocess != $total)
-    //print '<tr class="liste_total"><td>'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')</td><td class="right">'.$totalinprocess.'</td></tr>';
-    print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
-    print "</table></div><br>";
+		print '</td></tr>';
+	}
+	$bool = false;
+	foreach ($listofstatus as $status)
+	{
+		if (!$conf->use_javascript_ajax)
+		{
+			print '<tr class="oddeven">';
+			print '<td>'.$fichinterstatic->LibStatut($status, $bool, 0).'</td>';
+			print '<td class="right"><a href="list.php?search_status='.$status.'">'.(isset($vals[$status.$bool]) ? $vals[$status.$bool] : 0).' ';
+			print $fichinterstatic->LibStatut($status, $bool, 3);
+			print '</a>';
+			print '</td>';
+			print "</tr>\n";
+			if ($status == 3 && !$bool) $bool = true;
+			else $bool = false;
+		}
+	}
+	//if ($totalinprocess != $total)
+	//print '<tr class="liste_total"><td>'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')</td><td class="right">'.$totalinprocess.'</td></tr>';
+	print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
+	print "</table></div><br>";
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
@@ -202,7 +202,7 @@ if (!empty($conf->ficheinter->enabled))
 	$resql = $db->query($sql);
 	if ($resql)
 	{
-        print '<div class="div-table-responsive-no-min">';
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print '<th colspan="2">'.$langs->trans("DraftFichinter").'</th></tr>';
@@ -251,7 +251,7 @@ $sql .= $db->plimit($max, 0);
 $resql = $db->query($sql);
 if ($resql)
 {
-    print '<div class="div-table-responsive-no-min">';
+	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<th colspan="4">'.$langs->trans("LastModifiedInterventions", $max).'</th></tr>';
@@ -321,7 +321,7 @@ if (!empty($conf->ficheinter->enabled))
 	{
 		$num = $db->num_rows($resql);
 
-        print '<div class="div-table-responsive-no-min">';
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print '<th colspan="3">'.$langs->trans("FichinterToProcess").' <a href="'.DOL_URL_ROOT.'/fichinter/list.php?search_status=1"><span class="badge">'.$num.'</span></a></th></tr>';
diff --git a/htdocs/fichinter/info.php b/htdocs/fichinter/info.php
index 02ef2ca19d0..a53c69b77bd 100644
--- a/htdocs/fichinter/info.php
+++ b/htdocs/fichinter/info.php
@@ -64,7 +64,7 @@ $object->fetch_thirdparty();
 $object->info($object->id);
 
 $head = fichinter_prepare_head($object);
-dol_fiche_head($head, 'info', $langs->trans('InterventionCard'), -1, 'intervention');
+print dol_get_fiche_head($head, 'info', $langs->trans('InterventionCard'), -1, 'intervention');
 
 // Intervention card
 $linkback = '<a href="'.DOL_URL_ROOT.'/fichinter/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
@@ -124,7 +124,7 @@ print '</td></tr></table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 llxFooter();
 $db->close();
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index f6b95678f9d..bdf60e121e7 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -180,10 +180,10 @@ $formfile = new FormFile($db);
 $objectstatic = new Fichinter($db);
 $companystatic = new Societe($db);
 if (!empty($conf->projet->enabled)) {
-    $projetstatic = new Project($db);
+	$projetstatic = new Project($db);
 }
 if (!empty($conf->contrat->enabled)) {
-    $contratstatic = new Contrat($db);
+	$contratstatic = new Contrat($db);
 }
 
 $title = $langs->trans("ListOfInterventions");
@@ -195,11 +195,11 @@ $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfi
 $atleastonefieldinlines = 0;
 foreach ($arrayfields as $tmpkey => $tmpval)
 {
-    if (preg_match('/^fd\./', $tmpkey) && !empty($arrayfields[$tmpkey]['checked']))
-    {
-        $atleastonefieldinlines++;
-        break;
-    }
+	if (preg_match('/^fd\./', $tmpkey) && !empty($arrayfields[$tmpkey]['checked']))
+	{
+		$atleastonefieldinlines++;
+		break;
+	}
 }
 
 $sql = "SELECT";
@@ -207,10 +207,10 @@ $sql .= " f.ref, f.rowid, f.fk_statut as status, f.description, f.datec as date_
 if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) $sql .= " fd.rowid as lineid, fd.description as descriptiondetail, fd.date as dp, fd.duree,";
 $sql .= " s.nom as name, s.rowid as socid, s.client, s.fournisseur, s.email, s.status as thirdpartystatus";
 if (!empty($conf->projet->enabled)) {
-    $sql .= ", pr.rowid as projet_id, pr.ref as projet_ref, pr.title as projet_title";
+	$sql .= ", pr.rowid as projet_id, pr.ref as projet_ref, pr.title as projet_title";
 }
 if (!empty($conf->contrat->enabled)) {
-    $sql .= ", c.rowid as contrat_id, c.ref as contrat_ref, c.ref_customer as contrat_ref_supplier, c.ref_supplier as contrat_ref_supplier";
+	$sql .= ", c.rowid as contrat_id, c.ref as contrat_ref, c.ref_customer as contrat_ref_supplier, c.ref_supplier as contrat_ref_supplier";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -222,10 +222,10 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // N
 $sql .= $hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."fichinter as f";
 if (!empty($conf->projet->enabled)) {
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as pr on f.fk_projet = pr.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as pr on f.fk_projet = pr.rowid";
 }
 if (!empty($conf->contrat->enabled)) {
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."contrat as c on f.fk_contrat = c.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."contrat as c on f.fk_contrat = c.rowid";
 }
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (f.rowid = ef.fk_object)";
 if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."fichinterdet as fd ON fd.fk_fichinter = f.rowid";
@@ -240,10 +240,10 @@ if ($search_company) {
 	$sql .= natural_search('s.nom', $search_company);
 }
 if ($search_projet_ref) {
-    $sql .= natural_search('pr.ref', $search_projet_ref);
+	$sql .= natural_search('pr.ref', $search_projet_ref);
 }
 if ($search_contrat_ref) {
-    $sql .= natural_search('c.ref', $search_contrat_ref);
+	$sql .= natural_search('c.ref', $search_contrat_ref);
 }
 if ($search_desc) {
 	if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) $sql .= natural_search(array('f.description', 'fd.description'), $search_desc);
@@ -315,7 +315,7 @@ if ($resql)
 	$arrayofmassactions = array(
 		'generate_doc'=>$langs->trans("ReGeneratePDF"),
 		'builddoc'=>$langs->trans("PDFMerge"),
-	    //'presend'=>$langs->trans("SendByMail"),
+		//'presend'=>$langs->trans("SendByMail"),
 	);
 	if ($user->rights->ficheinter->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
@@ -383,18 +383,18 @@ if ($resql)
 		print '<input type="text" class="flat" name="search_company" value="'.$search_company.'" size="10">';
 		print '</td>';
 	}
-    if (!empty($arrayfields['pr.ref']['checked']))
-    {
-        print '<td class="liste_titre">';
-        print '<input type="text" class="flat" name="search_projet_ref" value="'.$search_projet_ref.'" size="8">';
-        print '</td>';
-    }
-    if (!empty($arrayfields['c.ref']['checked']))
-    {
-        print '<td class="liste_titre">';
-        print '<input type="text" class="flat" name="search_contrat_ref" value="'.$search_contrat_ref.'" size="8">';
-        print '</td>';
-    }
+	if (!empty($arrayfields['pr.ref']['checked']))
+	{
+		print '<td class="liste_titre">';
+		print '<input type="text" class="flat" name="search_projet_ref" value="'.$search_projet_ref.'" size="8">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['c.ref']['checked']))
+	{
+		print '<td class="liste_titre">';
+		print '<input type="text" class="flat" name="search_contrat_ref" value="'.$search_contrat_ref.'" size="8">';
+		print '</td>';
+	}
 	if (!empty($arrayfields['f.description']['checked']))
 	{
 		print '<td class="liste_titre">';
@@ -442,18 +442,18 @@ if ($resql)
 		print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 1);
 		print '</td>';
 	}
-    // Fields of detail line
+	// Fields of detail line
 	if (!empty($arrayfields['fd.description']['checked']))
 	{
-	    print '<td class="liste_titre">&nbsp;</td>';
+		print '<td class="liste_titre">&nbsp;</td>';
 	}
 	if (!empty($arrayfields['fd.date']['checked']))
 	{
-	    print '<td class="liste_titre">&nbsp;</td>';
+		print '<td class="liste_titre">&nbsp;</td>';
 	}
 	if (!empty($arrayfields['fd.duree']['checked']))
 	{
-	    print '<td class="liste_titre">&nbsp;</td>';
+		print '<td class="liste_titre">&nbsp;</td>';
 	}
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons();
@@ -550,31 +550,31 @@ if ($resql)
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
-        if (!empty($arrayfields['pr.ref']['checked']))
-        {
-            print '<td>';
-            $projetstatic->id = $obj->projet_id;
-            $projetstatic->ref = $obj->projet_ref;
-            $projetstatic->title = $obj->projet_title;
-            if ($projetstatic->id > 0) {
-                print $projetstatic->getNomUrl(1, '');
-            }
-            print '</td>';
-            if (!$i) $totalarray['nbfield']++;
-        }
-        if (!empty($arrayfields['c.ref']['checked']))
-        {
-            print '<td>';
-            $contratstatic->id = $obj->contrat_id;
-            $contratstatic->ref = $obj->contrat_ref;
-            $contratstatic->ref_customer = $obj->contrat_ref_customer;
-            $contratstatic->ref_supplier = $obj->contrat_ref_supplier;
-            if ($contratstatic->id > 0) {
-                print $contratstatic->getNomUrl(1, '');
-                print '</td>';
-            }
-            if (!$i) $totalarray['nbfield']++;
-        }
+		if (!empty($arrayfields['pr.ref']['checked']))
+		{
+			print '<td>';
+			$projetstatic->id = $obj->projet_id;
+			$projetstatic->ref = $obj->projet_ref;
+			$projetstatic->title = $obj->projet_title;
+			if ($projetstatic->id > 0) {
+				print $projetstatic->getNomUrl(1, '');
+			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+		if (!empty($arrayfields['c.ref']['checked']))
+		{
+			print '<td>';
+			$contratstatic->id = $obj->contrat_id;
+			$contratstatic->ref = $obj->contrat_ref;
+			$contratstatic->ref_customer = $obj->contrat_ref_customer;
+			$contratstatic->ref_supplier = $obj->contrat_ref_supplier;
+			if ($contratstatic->id > 0) {
+				print $contratstatic->getNomUrl(1, '');
+				print '</td>';
+			}
+			if (!$i) $totalarray['nbfield']++;
+		}
 		if (!empty($arrayfields['f.description']['checked']))
 		{
 			print '<td>'.dol_trunc(dolGetFirstLineOfText($obj->description), 48).'</td>';
@@ -628,20 +628,20 @@ if ($resql)
 		// Fields of detail of line
 		if (!empty($arrayfields['fd.description']['checked']))
 		{
-		    print '<td>'.dolGetFirstLineOfText($obj->descriptiondetail).'</td>';
-		    if (!$i) $totalarray['nbfield']++;
+			print '<td>'.dolGetFirstLineOfText($obj->descriptiondetail).'</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 		if (!empty($arrayfields['fd.date']['checked']))
 		{
-		    print '<td class="center">'.dol_print_date($db->jdate($obj->dp), 'dayhour')."</td>\n";
-		    if (!$i) $totalarray['nbfield']++;
+			print '<td class="center">'.dol_print_date($db->jdate($obj->dp), 'dayhour')."</td>\n";
+			if (!$i) $totalarray['nbfield']++;
 		}
 		if (!empty($arrayfields['fd.duree']['checked']))
 		{
-		    print '<td class="right">'.convertSecondToTime($obj->duree, 'allhourmin').'</td>';
-		    if (!$i) $totalarray['nbfield']++;
-		    if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'fd.duree';
-		    $totalarray['val']['fd.duree'] += $obj->duree;
+			print '<td class="right">'.convertSecondToTime($obj->duree, 'allhourmin').'</td>';
+			if (!$i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'fd.duree';
+			$totalarray['val']['fd.duree'] += $obj->duree;
 		}
 		// Action column
 		print '<td class="nowrap center">';
diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php
index 42003b8a27a..dddbe79e33e 100644
--- a/htdocs/fichinter/note.php
+++ b/htdocs/fichinter/note.php
@@ -67,7 +67,7 @@ if ($id > 0 || !empty($ref))
 	$object->fetch_thirdparty();
 
 	$head = fichinter_prepare_head($object);
-	dol_fiche_head($head, 'note', $langs->trans('InterventionCard'), -1, 'intervention');
+	print dol_get_fiche_head($head, 'note', $langs->trans('InterventionCard'), -1, 'intervention');
 
 	// Intervention card
 	$linkback = '<a href="'.DOL_URL_ROOT.'/fichinter/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
@@ -82,40 +82,40 @@ if ($id > 0 || !empty($ref))
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    if ($user->rights->commande->creer)
-	    {
-            if ($action != 'classify') {
-                //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-                $morehtmlref .= ' : ';
-            }
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	            $morehtmlref .= $proj->ref;
-	            $morehtmlref .= '</a>';
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->commande->creer)
+		{
+			if ($action != 'classify') {
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				$morehtmlref .= ' : ';
+			}
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
@@ -125,7 +125,7 @@ if ($id > 0 || !empty($ref))
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 llxFooter();
diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php
index 90d9741fbc3..19e7f86d8a0 100644
--- a/htdocs/fichinter/stats/index.php
+++ b/htdocs/fichinter/stats/index.php
@@ -37,17 +37,17 @@ $socid = GETPOST('socid', 'int');
 // Security check
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $nowyear = strftime("%Y", dol_now());
-$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
+$year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
 //$startyear=$year-2;
 $startyear = $year - 1;
 $endyear = $year;
 
-$object_status = GETPOST('object_status');
+$object_status = GETPOST('object_status', 'intcomma');
 
 // Load translation files required by the page
 $langs->loadLangs(array('interventions', 'companies', 'other', 'suppliers'));
@@ -79,36 +79,36 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filenamenb = $dir.'/interventionsnbinyear-'.$user->id.'-'.$year.'.png';
-    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsnbinyear-'.$user->id.'-'.$year.'.png';
+	$filenamenb = $dir.'/interventionsnbinyear-'.$user->id.'-'.$year.'.png';
+	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsnbinyear-'.$user->id.'-'.$year.'.png';
 } else {
-    $filenamenb = $dir.'/interventionsnbinyear-'.$year.'.png';
-    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsnbinyear-'.$year.'.png';
+	$filenamenb = $dir.'/interventionsnbinyear-'.$year.'.png';
+	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsnbinyear-'.$year.'.png';
 }
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
 if (!$mesg)
 {
-    $px1->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px1->SetLegend($legend);
-    $px1->SetMaxValue($px1->GetCeilMaxValue());
-    $px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
-    $px1->SetWidth($WIDTH);
-    $px1->SetHeight($HEIGHT);
-    $px1->SetYLabel($langs->trans("NbOfIntervention"));
-    $px1->SetShading(3);
-    $px1->SetHorizTickIncrement(1);
-    $px1->mode = 'depth';
-    $px1->SetTitle($langs->trans("NumberOfInterventionsByMonth"));
+	$px1->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px1->SetLegend($legend);
+	$px1->SetMaxValue($px1->GetCeilMaxValue());
+	$px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
+	$px1->SetWidth($WIDTH);
+	$px1->SetHeight($HEIGHT);
+	$px1->SetYLabel($langs->trans("NbOfIntervention"));
+	$px1->SetShading(3);
+	$px1->SetHorizTickIncrement(1);
+	$px1->mode = 'depth';
+	$px1->SetTitle($langs->trans("NumberOfInterventionsByMonth"));
 
-    $px1->draw($filenamenb, $fileurlnb);
+	$px1->draw($filenamenb, $fileurlnb);
 }
 
 // Build graphic amount of object
@@ -117,36 +117,36 @@ $data = $stats->getAmountByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filenameamount = $dir.'/interventionsamountinyear-'.$user->id.'-'.$year.'.png';
-    $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsamountinyear-'.$user->id.'-'.$year.'.png';
+	$filenameamount = $dir.'/interventionsamountinyear-'.$user->id.'-'.$year.'.png';
+	$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsamountinyear-'.$user->id.'-'.$year.'.png';
 } else {
-    $filenameamount = $dir.'/interventionsamountinyear-'.$year.'.png';
-    $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsamountinyear-'.$year.'.png';
+	$filenameamount = $dir.'/interventionsamountinyear-'.$year.'.png';
+	$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsamountinyear-'.$year.'.png';
 }
 
 $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
 if (!$mesg)
 {
-    $px2->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px2->SetLegend($legend);
-    $px2->SetMaxValue($px2->GetCeilMaxValue());
-    $px2->SetMinValue(min(0, $px2->GetFloorMinValue()));
-    $px2->SetWidth($WIDTH);
-    $px2->SetHeight($HEIGHT);
-    $px2->SetYLabel($langs->trans("AmountOfinterventions"));
-    $px2->SetShading(3);
-    $px2->SetHorizTickIncrement(1);
-    $px2->mode = 'depth';
-    $px2->SetTitle($langs->trans("AmountOfinterventionsByMonthHT"));
+	$px2->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px2->SetLegend($legend);
+	$px2->SetMaxValue($px2->GetCeilMaxValue());
+	$px2->SetMinValue(min(0, $px2->GetFloorMinValue()));
+	$px2->SetWidth($WIDTH);
+	$px2->SetHeight($HEIGHT);
+	$px2->SetYLabel($langs->trans("AmountOfinterventions"));
+	$px2->SetShading(3);
+	$px2->SetHorizTickIncrement(1);
+	$px2->mode = 'depth';
+	$px2->SetTitle($langs->trans("AmountOfinterventionsByMonthHT"));
 
-    $px2->draw($filenameamount, $fileurlamount);
+	$px2->draw($filenameamount, $fileurlamount);
 }
 
 
@@ -154,36 +154,36 @@ $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filename_avg = $dir.'/interventionsaverage-'.$user->id.'-'.$year.'.png';
-    $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsaverage-'.$user->id.'-'.$year.'.png';
+	$filename_avg = $dir.'/interventionsaverage-'.$user->id.'-'.$year.'.png';
+	$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsaverage-'.$user->id.'-'.$year.'.png';
 } else {
-    $filename_avg = $dir.'/interventionsaverage-'.$year.'.png';
-    $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsaverage-'.$year.'.png';
+	$filename_avg = $dir.'/interventionsaverage-'.$year.'.png';
+	$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsaverage-'.$year.'.png';
 }
 
 $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
 if (!$mesg)
 {
-    $px3->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px3->SetLegend($legend);
-    $px3->SetYLabel($langs->trans("AmountAverage"));
-    $px3->SetMaxValue($px3->GetCeilMaxValue());
-    $px3->SetMinValue($px3->GetFloorMinValue());
-    $px3->SetWidth($WIDTH);
-    $px3->SetHeight($HEIGHT);
-    $px3->SetShading(3);
-    $px3->SetHorizTickIncrement(1);
-    $px3->mode = 'depth';
-    $px3->SetTitle($langs->trans("AmountAverage"));
+	$px3->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px3->SetLegend($legend);
+	$px3->SetYLabel($langs->trans("AmountAverage"));
+	$px3->SetMaxValue($px3->GetCeilMaxValue());
+	$px3->SetMinValue($px3->GetFloorMinValue());
+	$px3->SetWidth($WIDTH);
+	$px3->SetHeight($HEIGHT);
+	$px3->SetShading(3);
+	$px3->SetHorizTickIncrement(1);
+	$px3->mode = 'depth';
+	$px3->SetTitle($langs->trans("AmountAverage"));
 
-    $px3->draw($filename_avg, $fileurl_avg);
+	$px3->draw($filename_avg, $fileurl_avg);
 }
 
 
@@ -209,7 +209,7 @@ $type = 'fichinter_stats';
 
 complete_head_from_modules($conf, $langs, null, $head, $h, $type);
 
-dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
+print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
@@ -226,7 +226,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 	print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 	// Company
 	print '<tr><td class="left">'.$langs->trans("ThirdParty").'</td><td class="left">';
-    $filter = 's.client IN (1,2,3)';
+	$filter = 's.client IN (1,2,3)';
 	print $form->select_company($socid, 'socid', $filter, 1, 0, 0, array(), 0, '', 'style="width: 95%"');
 	print '</td></tr>';
 	// User
@@ -270,7 +270,7 @@ foreach ($data as $val)
 	$year = $val['year'];
 	while (!empty($year) && $oldyear > $year + 1)
 	{
-        // If we have empty year
+		// If we have empty year
 		$oldyear--;
 
 		print '<tr class="oddeven" height="24">';
@@ -308,8 +308,8 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
 if ($mesg) { print $mesg; } else {
-    print $px1->show();
-    /*print "<br>\n";
+	print $px1->show();
+	/*print "<br>\n";
     print $px2->show();
     print "<br>\n";
     print $px3->show();*/
@@ -320,7 +320,7 @@ print '</td></tr></table>';
 print '</div></div></div>';
 print '<div style="clear:both"></div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 llxFooter();
diff --git a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
index b9a4399200d..b483e877e5e 100644
--- a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
@@ -38,10 +38,10 @@ $linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1)
 $ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink)
 {
-    $ilink++;
+	$ilink++;
 
-    $trclass = 'oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
 	?>
     <tr class="<?php echo $trclass; ?>">
 		<td><?php echo $langs->trans("Intervention"); ?></td>
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 8912fd2a299..48c1d448097 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -31,7 +31,7 @@
  */
 
 if (!defined('DOL_APPLICATION_TITLE')) define('DOL_APPLICATION_TITLE', 'Dolibarr');
-if (!defined('DOL_VERSION')) define('DOL_VERSION', '13.0.0-alpha'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+if (!defined('DOL_VERSION')) define('DOL_VERSION', '13.0.0-beta'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 
 if (!defined('EURO')) define('EURO', chr(128));
 
@@ -75,34 +75,34 @@ $result = @include_once $conffile; // Keep @ because with some error reporting t
 
 if (!$result && !empty($_SERVER["GATEWAY_INTERFACE"]))    // If install not done and we are in a web session
 {
-    if (!empty($_SERVER["CONTEXT_PREFIX"]))    // CONTEXT_PREFIX and CONTEXT_DOCUMENT_ROOT are not defined on all apache versions
-    {
-        $path = $_SERVER["CONTEXT_PREFIX"]; // example '/dolibarr/' when using an apache alias.
-        if (!preg_match('/\/$/', $path)) $path .= '/';
-    }
-    elseif (preg_match('/index\.php/', $_SERVER['PHP_SELF']))
-    {
-        // When we ask index.php, we MUST BE SURE that $path is '' at the end. This is required to make install process
-        // when using apache alias like '/dolibarr/' that point to htdocs.
-    	// Note: If calling page was an index.php not into htdocs (ie comm/index.php, ...), then this redirect will fails,
-    	// but we don't want to change this because when URL is correct, we must be sure the redirect to install/index.php will be correct.
-        $path = '';
-    } else {
-        // If what we look is not index.php, we can try to guess location of root. May not work all the time.
-    	// There is no real solution, because the only way to know the apache url relative path is to have it into conf file.
-    	// If it fails to find correct $path, then only solution is to ask user to enter the correct URL to index.php or install/index.php
-        $TDir = explode('/', $_SERVER['PHP_SELF']);
-    	$path = '';
-    	$i = count($TDir);
-    	while ($i--)
-    	{
-    		if (empty($TDir[$i]) || $TDir[$i] == 'htdocs') break;
-            if ($TDir[$i] == 'dolibarr') break;
-            if (substr($TDir[$i], -4, 4) == '.php') continue;
+	if (!empty($_SERVER["CONTEXT_PREFIX"]))    // CONTEXT_PREFIX and CONTEXT_DOCUMENT_ROOT are not defined on all apache versions
+	{
+		$path = $_SERVER["CONTEXT_PREFIX"]; // example '/dolibarr/' when using an apache alias.
+		if (!preg_match('/\/$/', $path)) $path .= '/';
+	}
+	elseif (preg_match('/index\.php/', $_SERVER['PHP_SELF']))
+	{
+		// When we ask index.php, we MUST BE SURE that $path is '' at the end. This is required to make install process
+		// when using apache alias like '/dolibarr/' that point to htdocs.
+		// Note: If calling page was an index.php not into htdocs (ie comm/index.php, ...), then this redirect will fails,
+		// but we don't want to change this because when URL is correct, we must be sure the redirect to install/index.php will be correct.
+		$path = '';
+	} else {
+		// If what we look is not index.php, we can try to guess location of root. May not work all the time.
+		// There is no real solution, because the only way to know the apache url relative path is to have it into conf file.
+		// If it fails to find correct $path, then only solution is to ask user to enter the correct URL to index.php or install/index.php
+		$TDir = explode('/', $_SERVER['PHP_SELF']);
+		$path = '';
+		$i = count($TDir);
+		while ($i--)
+		{
+			if (empty($TDir[$i]) || $TDir[$i] == 'htdocs') break;
+			if ($TDir[$i] == 'dolibarr') break;
+			if (substr($TDir[$i], -4, 4) == '.php') continue;
 
-    		$path .= '../';
-    	}
-    }
+			$path .= '../';
+		}
+	}
 
 	header("Location: ".$path."install/index.php");
 	exit;
@@ -149,24 +149,24 @@ if (empty($dolibarr_strict_mode)) $dolibarr_strict_mode = 0; // For debug in php
 if (!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck))
 {
 	if (!empty($_SERVER['REQUEST_METHOD']) && !in_array($_SERVER['REQUEST_METHOD'], array('GET', 'HEAD')) && !empty($_SERVER['HTTP_HOST']))
-    {
-    	$csrfattack = false;
-    	if (empty($_SERVER['HTTP_REFERER'])) $csrfattack = true; // An evil browser was used
-    	else {
-    		$tmpa = parse_url($_SERVER['HTTP_HOST']);
-    		$tmpb = parse_url($_SERVER['HTTP_REFERER']);
-    		if ((empty($tmpa['host']) ? $tmpa['path'] : $tmpa['host']) != (empty($tmpb['host']) ? $tmpb['path'] : $tmpb['host'])) $csrfattack = true;
-    	}
-    	if ($csrfattack)
-    	{
-    		//print 'NOCSRFCHECK='.defined('NOCSRFCHECK').' REQUEST_METHOD='.$_SERVER['REQUEST_METHOD'].' HTTP_HOST='.$_SERVER['HTTP_HOST'].' HTTP_REFERER='.$_SERVER['HTTP_REFERER'];
-    		// Note: We can't use dol_escape_htmltag here to escape output because lib functions.lib.ph is not yet loaded.
-    		print "Access refused by CSRF protection in main.inc.php. Referer of form (".htmlentities($_SERVER['HTTP_REFERER'], ENT_COMPAT, 'UTF-8').") is outside the server that serve this page (with method = ".htmlentities($_SERVER['REQUEST_METHOD'], ENT_COMPAT, 'UTF-8').").\n";
-        	print "If you access your server behind a proxy using url rewriting, you might check that all HTTP headers are propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file to remove this security check).\n";
-    		die;
-    	}
-    }
-    // Another test is done later on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on.
+	{
+		$csrfattack = false;
+		if (empty($_SERVER['HTTP_REFERER'])) $csrfattack = true; // An evil browser was used
+		else {
+			$tmpa = parse_url($_SERVER['HTTP_HOST']);
+			$tmpb = parse_url($_SERVER['HTTP_REFERER']);
+			if ((empty($tmpa['host']) ? $tmpa['path'] : $tmpa['host']) != (empty($tmpb['host']) ? $tmpb['path'] : $tmpb['host'])) $csrfattack = true;
+		}
+		if ($csrfattack)
+		{
+			//print 'NOCSRFCHECK='.defined('NOCSRFCHECK').' REQUEST_METHOD='.$_SERVER['REQUEST_METHOD'].' HTTP_HOST='.$_SERVER['HTTP_HOST'].' HTTP_REFERER='.$_SERVER['HTTP_REFERER'];
+			// Note: We can't use dol_escape_htmltag here to escape output because lib functions.lib.ph is not yet loaded.
+			print "Access refused by CSRF protection in main.inc.php. Referer of form (".htmlentities($_SERVER['HTTP_REFERER'], ENT_COMPAT, 'UTF-8').") is outside the server that serve this page (with method = ".htmlentities($_SERVER['REQUEST_METHOD'], ENT_COMPAT, 'UTF-8').").\n";
+			print "If you access your server behind a proxy using url rewriting, you might check that all HTTP headers are propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file to remove this security check).\n";
+			die;
+		}
+	}
+	// Another test is done later on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on.
 }
 if (empty($dolibarr_main_db_host))
 {
@@ -197,27 +197,27 @@ $tmp = '';
 $found = 0;
 $real_dolibarr_main_document_root = str_replace('\\', '/', realpath($dolibarr_main_document_root)); // A) Value found into config file, to say where are store htdocs files. Ex: C:/xxx/dolibarr, C:/xxx/dolibarr/htdocs
 if (!empty($_SERVER["DOCUMENT_ROOT"])) {
-    $pathroot = $_SERVER["DOCUMENT_ROOT"]; // B) Value reported by web server setup (not defined on CLI mode), to say where is root of web server instance. Ex: C:/xxx/dolibarr, C:/xxx/dolibarr/htdocs
+	$pathroot = $_SERVER["DOCUMENT_ROOT"]; // B) Value reported by web server setup (not defined on CLI mode), to say where is root of web server instance. Ex: C:/xxx/dolibarr, C:/xxx/dolibarr/htdocs
 } else {
-    $pathroot = 'NOTDEFINED';
+	$pathroot = 'NOTDEFINED';
 }
 $paths = explode('/', str_replace('\\', '/', $_SERVER["SCRIPT_NAME"])); // C) Value reported by web server, to say full path on filesystem of a file. Ex: /dolibarr/htdocs/admin/system/phpinfo.php
 // Try to detect if $_SERVER["DOCUMENT_ROOT"]+start of $_SERVER["SCRIPT_NAME"] is $dolibarr_main_document_root. If yes, relative url to add before dol files is this start part.
 $concatpath = '';
 foreach ($paths as $tmppath)	// We check to find (B+start of C)=A
 {
-    if (empty($tmppath)) continue;
-    $concatpath .= '/'.$tmppath;
-    //if ($tmppath) $concatpath.='/'.$tmppath;
-    //print $_SERVER["SCRIPT_NAME"].'-'.$pathroot.'-'.$concatpath.'-'.$real_dolibarr_main_document_root.'-'.realpath($pathroot.$concatpath).'<br>';
-    if ($real_dolibarr_main_document_root == @realpath($pathroot.$concatpath))    // @ avoid warning when safe_mode is on.
-    {
-        //print "Found relative url = ".$concatpath;
-    	$tmp3 = $concatpath;
-        $found = 1;
-        break;
-    }
-    //else print "Not found yet for concatpath=".$concatpath."<br>\n";
+	if (empty($tmppath)) continue;
+	$concatpath .= '/'.$tmppath;
+	//if ($tmppath) $concatpath.='/'.$tmppath;
+	//print $_SERVER["SCRIPT_NAME"].'-'.$pathroot.'-'.$concatpath.'-'.$real_dolibarr_main_document_root.'-'.realpath($pathroot.$concatpath).'<br>';
+	if ($real_dolibarr_main_document_root == @realpath($pathroot.$concatpath))    // @ avoid warning when safe_mode is on.
+	{
+		//print "Found relative url = ".$concatpath;
+		$tmp3 = $concatpath;
+		$found = 1;
+		break;
+	}
+	//else print "Not found yet for concatpath=".$concatpath."<br>\n";
 }
 //print "found=".$found." dolibarr_main_url_root=".$dolibarr_main_url_root."\n";
 if (!$found) $tmp = $dolibarr_main_url_root; // If autodetect fails (Ie: when using apache alias that point outside default DOCUMENT_ROOT).
@@ -245,7 +245,6 @@ if (!defined('ADODB_PATH')) { define('ADODB_PATH', (!isset($dolibarr_lib_ADODB_P
 if (!defined('TCPDF_PATH')) { define('TCPDF_PATH', (empty($dolibarr_lib_TCPDF_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/tecnickcom/tcpdf/' : $dolibarr_lib_TCPDF_PATH.'/'); }
 if (!defined('TCPDI_PATH')) { define('TCPDI_PATH', (empty($dolibarr_lib_TCPDI_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/tcpdi/' : $dolibarr_lib_TCPDI_PATH.'/'); }
 if (!defined('NUSOAP_PATH')) { define('NUSOAP_PATH', (!isset($dolibarr_lib_NUSOAP_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/nusoap/lib/' : (empty($dolibarr_lib_NUSOAP_PATH) ? '' : $dolibarr_lib_NUSOAP_PATH.'/')); }
-if (!defined('PHPEXCEL_PATH')) { define('PHPEXCEL_PATH', (!isset($dolibarr_lib_PHPEXCEL_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/phpoffice/phpexcel/Classes/' : (empty($dolibarr_lib_PHPEXCEL_PATH) ? '' : $dolibarr_lib_PHPEXCEL_PATH.'/')); }
 if (!defined('PHPEXCELNEW_PATH')) { define('PHPEXCELNEW_PATH', (!isset($dolibarr_lib_PHPEXCELNEW_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/phpoffice/PhpSpreadsheet/' : (empty($dolibarr_lib_PHPEXCELNEW_PATH) ? '' : $dolibarr_lib_PHPEXCELNEW_PATH.'/')); }
 if (!defined('ODTPHP_PATH')) { define('ODTPHP_PATH', (!isset($dolibarr_lib_ODTPHP_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/odtphp/' : (empty($dolibarr_lib_ODTPHP_PATH) ? '' : $dolibarr_lib_ODTPHP_PATH.'/')); }
 if (!defined('ODTPHP_PATHTOPCLZIP')) { define('ODTPHP_PATHTOPCLZIP', (!isset($dolibarr_lib_ODTPHP_PATHTOPCLZIP)) ?DOL_DOCUMENT_ROOT.'/includes/odtphp/zip/pclzip/' : (empty($dolibarr_lib_ODTPHP_PATHTOPCLZIP) ? '' : $dolibarr_lib_ODTPHP_PATHTOPCLZIP.'/')); }
@@ -277,13 +276,12 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
 //print memory_get_usage();
 
 // If password is encoded, we decode it. Note: When page is called for install, $dolibarr_main_db_pass may not be defined yet.
-if (!empty($dolibarr_main_db_pass) && preg_match('/crypted:/i', $dolibarr_main_db_pass) || !empty($dolibarr_main_db_encrypted_pass))
-{
-	if (preg_match('/crypted:/i', $dolibarr_main_db_pass))
-	{
+if ((!empty($dolibarr_main_db_pass) && preg_match('/crypted:/i', $dolibarr_main_db_pass)) || !empty($dolibarr_main_db_encrypted_pass)) {
+	if (!empty($dolibarr_main_db_pass) && preg_match('/crypted:/i', $dolibarr_main_db_pass)) {
 		$dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);
 		$dolibarr_main_db_pass = dol_decode($dolibarr_main_db_pass);
 		$dolibarr_main_db_encrypted_pass = $dolibarr_main_db_pass; // We need to set this as it is used to know the password was initially crypted
+	} else {
+		$dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
 	}
-	else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
 }
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 1de6d30b681..f6162f1d9f8 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -65,6 +65,15 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('suppliercard', 'globalcard'));
 
+// Security check
+$result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', 0);
+
+if ($object->id > 0) {
+	if (!($object->fournisseur > 0) || empty($user->rights->fournisseur->lire)) {
+		accessforbidden();
+	}
+}
+
 
 /*
  * Action
@@ -85,8 +94,8 @@ if (empty($reshook))
 	{
 		$result = $object->fetch($id);
    		$object->code_compta_fournisseur = $_POST["supplieraccountancycode"];
-	    $result = $object->update($object->id, $user, 1, 0, 1);
-	    if ($result < 0)	setEventMessages($object->error, $object->errors, 'errors');
+		$result = $object->update($object->id, $user, 1, 0, 1);
+		if ($result < 0)	setEventMessages($object->error, $object->errors, 'errors');
 	}
 	// terms of the settlement
 	if ($action == 'setconditions' && $user->rights->societe->creer)
@@ -113,23 +122,23 @@ if (empty($reshook))
 	}
 
 	if ($action == 'update_extras') {
-        $object->fetch($id);
+		$object->fetch($id);
 
-        $object->oldcopy = dol_clone($object);
+		$object->oldcopy = dol_clone($object);
 
-        // Fill array 'array_options' with data from update form
-        $ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
+		// Fill array 'array_options' with data from update form
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
 
-        if ($ret < 0) $error++;
+		if ($ret < 0) $error++;
 
-        if (!$error)
-        {
-            $result = $object->insertExtraFields('COMPANY_MODIFY');
-            if ($result < 0) $error++;
-        }
+		if (!$error)
+		{
+			$result = $object->insertExtraFields('COMPANY_MODIFY');
+			if ($result < 0) $error++;
+		}
 
-        if ($error) $action = 'edit_extras';
-    }
+		if ($error) $action = 'edit_extras';
+	}
 }
 
 
@@ -159,7 +168,7 @@ if ($object->id > 0)
 	 */
 	$head = societe_prepare_head($object);
 
-	dol_fiche_head($head, 'supplier', $langs->trans("ThirdParty"), -1, 'company');
+	print dol_get_fiche_head($head, 'supplier', $langs->trans("ThirdParty"), -1, 'company');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -167,31 +176,31 @@ if ($object->id > 0)
 
 	print '<div class="fichecenter"><div class="fichehalfleft">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table width="100%" class="border">';
 
-    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-    {
-        print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
-    }
+	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+	{
+		print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+	}
 
 	if ($object->fournisseur)
 	{
 		print '<tr>';
-        print '<td class="titlefield">'.$langs->trans("SupplierCode").'</td><td>';
-        print $object->code_fournisseur;
-        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-        print '</td>';
-        print '</tr>';
+		print '<td class="titlefield">'.$langs->trans("SupplierCode").'</td><td>';
+		print $object->code_fournisseur;
+		if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		print '</td>';
+		print '</tr>';
 
 		$langs->load('compta');
-        print '<tr>';
-        print '<td>';
-        print $form->editfieldkey("SupplierAccountancyCode", 'supplieraccountancycode', $object->code_compta_fournisseur, $object, $user->rights->societe->creer);
-        print '</td><td>';
-        print $form->editfieldval("SupplierAccountancyCode", 'supplieraccountancycode', $object->code_compta_fournisseur, $object, $user->rights->societe->creer);
-        print '</td>';
-        print '</tr>';
+		print '<tr>';
+		print '<td>';
+		print $form->editfieldkey("SupplierAccountancyCode", 'supplieraccountancycode', $object->code_compta_fournisseur, $object, $user->rights->societe->creer);
+		print '</td><td>';
+		print $form->editfieldval("SupplierAccountancyCode", 'supplieraccountancycode', $object->code_compta_fournisseur, $object, $user->rights->societe->creer);
+		print '</td>';
+		print '</tr>';
 	}
 
 	// Assujetti a TVA ou pas
@@ -217,10 +226,10 @@ if ($object->id > 0)
 		print '</td></tr>';
 	}
 
-    // TVA Intra
-    print '<tr><td class="nowrap">'.$langs->trans('VATIntra').'</td><td>';
-    print $object->tva_intra;
-    print '</td></tr>';
+	// TVA Intra
+	print '<tr><td class="nowrap">'.$langs->trans('VATIntra').'</td><td>';
+	print $object->tva_intra;
+	print '</td></tr>';
 
 	// Default terms of the settlement
 	$langs->load('bills');
@@ -306,11 +315,11 @@ if ($object->id > 0)
 	// Categories
 	if (!empty($conf->categorie->enabled))
 	{
-	    $langs->load("categories");
-    	print '<tr><td>'.$langs->trans("SuppliersCategoriesShort").'</td>';
-    	print '<td>';
-    	print $form->showCategories($object->id, Categorie::TYPE_SUPPLIER, 1);
-    	print "</td></tr>";
+		$langs->load("categories");
+		print '<tr><td>'.$langs->trans("SuppliersCategoriesShort").'</td>';
+		print '<td>';
+		print $form->showCategories($object->id, Categorie::TYPE_SUPPLIER, 1);
+		print "</td></tr>";
 	}
 
 	// Other attributes
@@ -318,24 +327,24 @@ if ($object->id > 0)
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 	// Module Adherent
-    if (!empty($conf->adherent->enabled))
-    {
-        $langs->load("members");
-        $langs->load("users");
-        print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
-        print '<td>';
-        $adh = new Adherent($db);
-        $result = $adh->fetch('', '', $object->id);
-        if ($result > 0)
-        {
-            $adh->ref = $adh->getFullName($langs);
-            print $adh->getNomUrl(1);
-        } else {
-            print $langs->trans("ThirdpartyNotLinkedToMember");
-        }
-        print '</td>';
-        print "</tr>\n";
-    }
+	if (!empty($conf->adherent->enabled))
+	{
+		$langs->load("members");
+		$langs->load("users");
+		print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
+		print '<td>';
+		$adh = new Adherent($db);
+		$result = $adh->fetch('', '', $object->id);
+		if ($result > 0)
+		{
+			$adh->ref = $adh->getFullName($langs);
+			print $adh->getNomUrl(1);
+		} else {
+			print $langs->trans("ThirdpartyNotLinkedToMember");
+		}
+		print '</td>';
+		print "</tr>\n";
+	}
 
 	print '</table>';
 
@@ -356,67 +365,81 @@ if ($object->id > 0)
 
 	if ($conf->supplier_proposal->enabled)
 	{
-	    // Box proposals
-	    $tmp = $object->getOutstandingProposals('supplier');
-	    $outstandingOpened = $tmp['opened'];
-	    $outstandingTotal = $tmp['total_ht'];
-	    $outstandingTotalIncTax = $tmp['total_ttc'];
-	    $text = $langs->trans("OverAllSupplierProposals");
-	    $link = DOL_URL_ROOT.'/supplier_proposal/list.php?socid='.$object->id;
-	    $icon = 'bill';
-	    if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
-	    $boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
-	    $boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
-	    $boxstat .= '<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
-	    $boxstat .= '</div>';
-	    if ($link) $boxstat .= '</a>';
+		// Box proposals
+		$tmp = $object->getOutstandingProposals('supplier');
+		$outstandingOpened = $tmp['opened'];
+		$outstandingTotal = $tmp['total_ht'];
+		$outstandingTotalIncTax = $tmp['total_ttc'];
+		$text = $langs->trans("OverAllSupplierProposals");
+		$link = DOL_URL_ROOT.'/supplier_proposal/list.php?socid='.$object->id;
+		$icon = 'bill';
+		if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+		$boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
+		$boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
+		$boxstat .= '<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
+		$boxstat .= '</div>';
+		if ($link) $boxstat .= '</a>';
 	}
 
 	if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
 	{
-	    // Box proposals
-	    $tmp = $object->getOutstandingOrders('supplier');
-	    $outstandingOpened = $tmp['opened'];
-	    $outstandingTotal = $tmp['total_ht'];
-	    $outstandingTotalIncTax = $tmp['total_ttc'];
-	    $text = $langs->trans("OverAllOrders");
-	    $link = DOL_URL_ROOT.'/fourn/commande/list.php?socid='.$object->id;
-	    $icon = 'bill';
-	    if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
-	    $boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
-	    $boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
-	    $boxstat .= '<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
-	    $boxstat .= '</div>';
-	    if ($link) $boxstat .= '</a>';
+		// Box proposals
+		$tmp = $object->getOutstandingOrders('supplier');
+		$outstandingOpened = $tmp['opened'];
+		$outstandingTotal = $tmp['total_ht'];
+		$outstandingTotalIncTax = $tmp['total_ttc'];
+		$text = $langs->trans("OverAllOrders");
+		$link = DOL_URL_ROOT.'/fourn/commande/list.php?socid='.$object->id;
+		$icon = 'bill';
+		if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+		$boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
+		$boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
+		$boxstat .= '<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
+		$boxstat .= '</div>';
+		if ($link) $boxstat .= '</a>';
 	}
 
 	if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
 	{
-	    $tmp = $object->getOutstandingBills('supplier');
-	    $outstandingOpened = $tmp['opened'];
-	    $outstandingTotal = $tmp['total_ht'];
-	    $outstandingTotalIncTax = $tmp['total_ttc'];
+		$tmp = $object->getOutstandingBills('supplier');
+		$outstandingOpened = $tmp['opened'];
+		$outstandingTotal = $tmp['total_ht'];
+		$outstandingTotalIncTax = $tmp['total_ttc'];
 
-	    $text = $langs->trans("OverAllInvoices");
-	    $link = DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->id;
-	    $icon = 'bill';
-	    if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
-	    $boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
-	    $boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
-	    $boxstat .= '<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
-	    $boxstat .= '</div>';
-	    if ($link) $boxstat .= '</a>';
+		$text = $langs->trans("OverAllInvoices");
+		$link = DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->id;
+		$icon = 'bill';
+		if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+		$boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
+		$boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
+		$boxstat .= '<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
+		$boxstat .= '</div>';
+		if ($link) $boxstat .= '</a>';
 
-	    // Box outstanding bill
-	    $text = $langs->trans("CurrentOutstandingBill");
-	    $link = DOL_URL_ROOT.'/fourn/recap-fourn.php?socid='.$object->id;
-	    $icon = 'bill';
-	    if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
-	    $boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
-	    $boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
-	    $boxstat .= '<span class="boxstatsindicator'.($outstandingOpened > 0 ? ' amountremaintopay' : '').'">'.price($outstandingOpened, 1, $langs, 1, -1, -1, $conf->currency).$warn.'</span>';
-	    $boxstat .= '</div>';
-	    if ($link) $boxstat .= '</a>';
+		// Box outstanding bill
+		$text = $langs->trans("CurrentOutstandingBill");
+		$link = DOL_URL_ROOT.'/fourn/recap-fourn.php?socid='.$object->id;
+		$icon = 'bill';
+		if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+		$boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
+		$boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
+		$boxstat .= '<span class="boxstatsindicator'.($outstandingOpened > 0 ? ' amountremaintopay' : '').'">'.price($outstandingOpened, 1, $langs, 1, -1, -1, $conf->currency).$warn.'</span>';
+		$boxstat .= '</div>';
+		if ($link) $boxstat .= '</a>';
+
+		$tmp = $object->getOutstandingBills('supplier', 1);
+		$outstandingOpenedLate = $tmp['opened'];
+		if ($outstandingOpened != $outstandingOpenedLate && !empty($outstandingOpenedLate)) {
+			$text = $langs->trans("CurrentOutstandingBillLate");
+			$link = DOL_URL_ROOT.'/fourn/recap-fourn.php?socid='.$object->id;
+			$icon = 'bill';
+			if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+			$boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
+			$boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
+			$boxstat .= '<span class="boxstatsindicator'.($outstandingOpenedLate > 0 ? ' amountremaintopay' : '').'">'.price($outstandingOpenedLate, 1, $langs, 1, -1, -1, $conf->currency).$warn.'</span>';
+			$boxstat .= '</div>';
+			if ($link) $boxstat .= '</a>';
+		}
 	}
 
 	$boxstat .= '</td></tr>';
@@ -456,15 +479,15 @@ if ($object->id > 0)
 		$sql .= $db->plimit($MAXLIST);
 
 		$query = $db->query($sql);
-        if (!$query) dol_print_error($db);
+		if (!$query) dol_print_error($db);
 
-        $num = $db->num_rows($query);
+		$num = $db->num_rows($query);
 
-        print '<table class="noborder centpercent lastrecordtable">';
-        print '<tr class="liste_titre'.(($num == 0) ? ' nobottom' : '').'">';
-        print '<td colspan="3">'.$langs->trans("ProductsAndServices").'</td><td class="right">';
-        print '<a class="notasortlink" href="'.DOL_URL_ROOT.'/fourn/product/list.php?fourn_id='.$object->id.'">'.$langs->trans("AllProductReferencesOfSupplier").'<span class="badge marginleftonlyshort">'.$object->nbOfProductRefs().'</span>';
-        print '</a></td></tr>';
+		print '<table class="noborder centpercent lastrecordtable">';
+		print '<tr class="liste_titre'.(($num == 0) ? ' nobottom' : '').'">';
+		print '<td colspan="3">'.$langs->trans("ProductsAndServices").'</td><td class="right">';
+		print '<a class="notasortlink" href="'.DOL_URL_ROOT.'/fourn/product/list.php?fourn_id='.$object->id.'">'.$langs->trans("AllProductReferencesOfSupplier").'<span class="badge marginleftonlyshort">'.$object->nbOfProductRefs().'</span>';
+		print '</a></td></tr>';
 
 		$return = array();
 		if ($num > 0)
@@ -494,12 +517,12 @@ if ($object->id > 0)
 				//print (isset($objp->unitprice) ? price($objp->unitprice) : '');
 				if (isset($objp->price))
 				{
-    				print price($objp->price);
-				    if ($objp->quantity > 1)
-				    {
-    				    print ' / ';
-    				    print $objp->quantity;
-				    }
+					print price($objp->price);
+					if ($objp->quantity > 1)
+					{
+						print ' / ';
+						print $objp->quantity;
+					}
 				}
 				print '</td>';
 				print '</tr>';
@@ -517,63 +540,65 @@ if ($object->id > 0)
 
 	if ($user->rights->supplier_proposal->lire)
 	{
-	    $sql = "SELECT p.rowid, p.ref, p.date_valid as dc, p.fk_statut, p.total_ht, p.tva as total_tva, p.total as total_ttc";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p ";
-	    $sql .= " WHERE p.fk_soc =".$object->id;
-	    $sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
-	    $sql .= " ORDER BY p.date_valid DESC";
-	    $sql .= " ".$db->plimit($MAXLIST);
+		$langs->loadLangs(array("supplier_proposal"));
 
-	    $resql = $db->query($sql);
-	    if ($resql)
-	    {
-	        $i = 0;
-	        $num = $db->num_rows($resql);
+		$sql = "SELECT p.rowid, p.ref, p.date_valid as dc, p.fk_statut, p.total_ht, p.tva as total_tva, p.total as total_ttc";
+		$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p ";
+		$sql .= " WHERE p.fk_soc =".$object->id;
+		$sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
+		$sql .= " ORDER BY p.date_valid DESC";
+		$sql .= " ".$db->plimit($MAXLIST);
 
-	        if ($num > 0)
-	        {
-	            print '<table class="noborder centpercent lastrecordtable">';
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$i = 0;
+			$num = $db->num_rows($resql);
 
-	            print '<tr class="liste_titre">';
-	            print '<td colspan="3">';
-	            print '<table class="nobordernopadding centpercent"><tr><td>'.$langs->trans("LastSupplierProposals", ($num < $MAXLIST ? "" : $MAXLIST)).'</td>';
-	            print '<td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/supplier_proposal/list.php?socid='.$object->id.'">'.$langs->trans("AllPriceRequests").'<span class="badge marginleftonlyshort">'.$num.'</span></td>';
-	            print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/supplier_proposal/stats/index.php?mode=supplier&socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
-	            print '</tr></table>';
-	            print '</td></tr>';
-	        }
+			if ($num > 0)
+			{
+				print '<table class="noborder centpercent lastrecordtable">';
 
-	        while ($i < $num && $i <= $MAXLIST)
-	        {
-	            $obj = $db->fetch_object($resql);
+				print '<tr class="liste_titre">';
+				print '<td colspan="3">';
+				print '<table class="nobordernopadding centpercent"><tr><td>'.$langs->trans("LastSupplierProposals", ($num < $MAXLIST ? "" : $MAXLIST)).'</td>';
+				print '<td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/supplier_proposal/list.php?socid='.$object->id.'">'.$langs->trans("AllPriceRequests").'<span class="badge marginleftonlyshort">'.$num.'</span></td>';
+				print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/supplier_proposal/stats/index.php?mode=supplier&socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
+				print '</tr></table>';
+				print '</td></tr>';
+			}
 
-	            print '<tr class="oddeven">';
-	            print '<td class="nowrap">';
-	            $proposalstatic->id = $obj->rowid;
-	            $proposalstatic->ref = $obj->ref;
-	            $proposalstatic->total_ht = $obj->total_ht;
-	            $proposalstatic->total_tva = $obj->total_tva;
-	            $proposalstatic->total_ttc = $obj->total_ttc;
-	            print $proposalstatic->getNomUrl(1);
-	            print '</td>';
-	            print '<td class="center" width="80">';
-	            if ($obj->dc)
-	            {
-	                print dol_print_date($db->jdate($obj->dc), 'day');
-	            } else {
-	                print "-";
-	            }
-	            print '</td>';
-	            print '<td class="right" class="nowrap">'.$proposalstatic->LibStatut($obj->fk_statut, 5).'</td>';
-	            print '</tr>';
-	            $i++;
-	        }
-	        $db->free($resql);
+			while ($i < $num && $i <= $MAXLIST)
+			{
+				$obj = $db->fetch_object($resql);
 
-	        if ($num > 0) print "</table>";
-	    } else {
-	        dol_print_error($db);
-	    }
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">';
+				$proposalstatic->id = $obj->rowid;
+				$proposalstatic->ref = $obj->ref;
+				$proposalstatic->total_ht = $obj->total_ht;
+				$proposalstatic->total_tva = $obj->total_tva;
+				$proposalstatic->total_ttc = $obj->total_ttc;
+				print $proposalstatic->getNomUrl(1);
+				print '</td>';
+				print '<td class="center" width="80">';
+				if ($obj->dc)
+				{
+					print dol_print_date($db->jdate($obj->dc), 'day');
+				} else {
+					print "-";
+				}
+				print '</td>';
+				print '<td class="right" class="nowrap">'.$proposalstatic->LibStatut($obj->fk_statut, 5).'</td>';
+				print '</tr>';
+				$i++;
+			}
+			$db->free($resql);
+
+			if ($num > 0) print "</table>";
+		} else {
+			dol_print_error($db);
+		}
 	}
 
 	/*
@@ -595,7 +620,7 @@ if ($object->id > 0)
 		// Show orders we can bill
 		if (empty($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS))
 		{
-			$sql2 .= " AND c.fk_statut IN (".$db->sanitize(CommandeFournisseur::STATUS_RECEIVED_COMPLETELY).")"; //  Must match filter in htdocs/fourn/orderstoinvoice.php
+			$sql2 .= " AND c.fk_statut IN (".$db->sanitize(CommandeFournisseur::STATUS_RECEIVED_COMPLETELY).")"; //  Must match filter in htdocs/fourn/commande/list.php
 		} else {
 			// CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.", ".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY
 			$sql2 .= " AND c.fk_statut IN (".$db->sanitize($db->escape($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS)).")";
@@ -637,15 +662,15 @@ if ($object->id > 0)
 
 			if ($num > 0)
 			{
-			    print '<table class="noborder centpercent lastrecordtable">';
+				print '<table class="noborder centpercent lastrecordtable">';
 
-			    print '<tr class="liste_titre">';
-    			print '<td colspan="3">';
-    			print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans("LastSupplierOrders", ($num < $MAXLIST ? "" : $MAXLIST)).'</td>';
-    			print '<td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/fourn/commande/list.php?socid='.$object->id.'">'.$langs->trans("AllOrders").'<span class="badge marginleftonlyshort">'.$num.'</span></td>';
-                print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/commande/stats/index.php?mode=supplier&socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
-    			print '</tr></table>';
-    			print '</td></tr>';
+				print '<tr class="liste_titre">';
+				print '<td colspan="3">';
+				print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans("LastSupplierOrders", ($num < $MAXLIST ? "" : $MAXLIST)).'</td>';
+				print '<td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/fourn/commande/list.php?socid='.$object->id.'">'.$langs->trans("AllOrders").'<span class="badge marginleftonlyshort">'.$num.'</span></td>';
+				print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/commande/stats/index.php?mode=supplier&socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
+				print '</tr></table>';
+				print '</td></tr>';
 			}
 
 			while ($i < $num && $i < $MAXLIST)
@@ -653,14 +678,14 @@ if ($object->id > 0)
 				$obj = $db->fetch_object($resql);
 
 				print '<tr class="oddeven">';
-                print '<td class="nowrap">';
-                $orderstatic->id = $obj->rowid;
-                $orderstatic->ref = $obj->ref;
-                $orderstatic->total_ht = $obj->total_ht;
-                $orderstatic->total_tva = $obj->total_tva;
-                $orderstatic->total_ttc = $obj->total_ttc;
-                print $orderstatic->getNomUrl(1);
-                print '</td>';
+				print '<td class="nowrap">';
+				$orderstatic->id = $obj->rowid;
+				$orderstatic->ref = $obj->ref;
+				$orderstatic->total_ht = $obj->total_ht;
+				$orderstatic->total_tva = $obj->total_tva;
+				$orderstatic->total_ttc = $obj->total_ttc;
+				print $orderstatic->getNomUrl(1);
+				print '</td>';
 				print '<td class="center" width="80">';
 				if ($obj->dc)
 				{
@@ -706,14 +731,14 @@ if ($object->id > 0)
 			$num = $db->num_rows($resql);
 			if ($num > 0)
 			{
-			    print '<table class="noborder centpercent lastrecordtable">';
+				print '<table class="noborder centpercent lastrecordtable">';
 
-			    print '<tr class="liste_titre">';
-    			print '<td colspan="4">';
-    			print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans('LastSuppliersBills', ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->id.'">'.$langs->trans('AllBills').'<span class="badge marginleftonlyshort">'.$num.'</span></td>';
-                print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?mode=supplier&socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
-    			print '</tr></table>';
-    			print '</td></tr>';
+				print '<tr class="liste_titre">';
+				print '<td colspan="4">';
+				print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans('LastSuppliersBills', ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->id.'">'.$langs->trans('AllBills').'<span class="badge marginleftonlyshort">'.$num.'</span></td>';
+				print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?mode=supplier&socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
+				print '</tr></table>';
+				print '</td></tr>';
 			}
 
 			while ($i < min($num, $MAXLIST))
@@ -729,8 +754,8 @@ if ($object->id > 0)
 				$facturestatic->libelle = $obj->label; // deprecated
 				$facturestatic->label = $obj->label;
 				$facturestatic->total_ht = $obj->total_ht;
-                $facturestatic->total_tva = $obj->total_tva;
-                $facturestatic->total_ttc = $obj->total_ttc;
+				$facturestatic->total_tva = $obj->total_tva;
+				$facturestatic->total_ttc = $obj->total_ttc;
 				print $facturestatic->getNomUrl(1);
 				print $obj->ref_supplier ? ' - '.$obj->ref_supplier : '';
 				print ($obj->label ? ' - ' : '').dol_trunc($obj->label, 14);
@@ -753,7 +778,7 @@ if ($object->id > 0)
 	print '</div></div></div>';
 	print '<div style="clear:both"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	/*
@@ -766,37 +791,36 @@ if ($object->id > 0)
 	// modified by hook
 	if (empty($reshook))
 	{
-	    if ($object->status != 1)
-        {
-            print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("ThirdPartyIsClosed").'</a></div>';
-        }
+		if ($object->status != 1)
+		{
+			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("ThirdPartyIsClosed").'</a></div>';
+		}
 
 		if ($conf->supplier_proposal->enabled && $user->rights->supplier_proposal->creer)
 		{
 			$langs->load("supplier_proposal");
-	        if ($object->status == 1) {
-	            print '<a class="butAction" href="'.DOL_URL_ROOT.'/supplier_proposal/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddSupplierProposal").'</a>';
-	        } else {
-	            print '<a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("AddSupplierProposal").'</a>';
-	        }
+			if ($object->status == 1) {
+				print '<a class="butAction" href="'.DOL_URL_ROOT.'/supplier_proposal/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddSupplierProposal").'</a>';
+			} else {
+				print '<a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("AddSupplierProposal").'</a>';
+			}
 		}
 
-	    if ($user->rights->fournisseur->commande->creer)
+		if ($user->rights->fournisseur->commande->creer)
 		{
 			$langs->load("orders");
-	        if ($object->status == 1) {
-	            print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddOrder").'</a>';
-	        } else {
-	            print '<a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("AddOrder").'</a>';
-	        }
+			if ($object->status == 1) {
+				print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddOrder").'</a>';
+			} else {
+				print '<a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("AddOrder").'</a>';
+			}
 		}
 
 		if ($user->rights->fournisseur->facture->creer)
 		{
 			if (!empty($orders2invoice) && $orders2invoice > 0)
 			{
-				if ($object->status == 1)
-				{
+				if ($object->status == 1) {
 					// Company is open
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/list.php?socid='.$object->id.'&search_billed=0&autoselectall=1">'.$langs->trans("CreateInvoiceForThisSupplier").'</a></div>';
 				} else {
@@ -808,23 +832,23 @@ if ($object->id > 0)
 		if ($user->rights->fournisseur->facture->creer)
 		{
 			$langs->load("bills");
-	        if ($object->status == 1) {
-	            print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a>';
-	        } else {
-	            print '<a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("AddBill").'</a>';
-	        }
+			if ($object->status == 1) {
+				print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a>';
+			} else {
+				print '<a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("AddBill").'</a>';
+			}
 		}
 
-    	// Add action
-    	if (!empty($conf->agenda->enabled) && !empty($conf->global->MAIN_REPEATTASKONEACHTAB) && $object->status == 1)
-    	{
-        	if ($user->rights->agenda->myactions->create)
-        	{
-            	print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a>';
-        	} else {
-            	print '<a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a>';
-        	}
-    	}
+		// Add action
+		if (!empty($conf->agenda->enabled) && !empty($conf->global->MAIN_REPEATTASKONEACHTAB) && $object->status == 1)
+		{
+			if ($user->rights->agenda->myactions->create)
+			{
+				print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a>';
+			} else {
+				print '<a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a>';
+			}
+		}
 	}
 
 	print '</div>';
@@ -832,20 +856,20 @@ if ($object->id > 0)
 
 	if (!empty($conf->global->MAIN_DUPLICATE_CONTACTS_TAB_ON_MAIN_CARD))
 	{
-    	print '<br>';
-    	// List of contacts
-    	show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id);
+		print '<br>';
+		// List of contacts
+		show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id);
 	}
 
 	if (!empty($conf->global->MAIN_REPEATTASKONEACHTAB))
 	{
-    	print load_fiche_titre($langs->trans("ActionsOnCompany"), '', '');
+		print load_fiche_titre($langs->trans("ActionsOnCompany"), '', '');
 
-    	// List of todo actions
-    	show_actions_todo($conf, $langs, $db, $object);
+		// List of todo actions
+		show_actions_todo($conf, $langs, $db, $object);
 
-    	// List of done actions
-    	show_actions_done($conf, $langs, $db, $object);
+		// List of done actions
+		show_actions_done($conf, $langs, $db, $object);
 	}
 } else {
 	dol_print_error($db);
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 8c3ca0108e3..247434be7a8 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -677,8 +677,8 @@ class SupplierInvoices extends DolibarrApi
 	/**
 	 * Clean sensible object datas
 	 *
-	 * @param   Object  $object    Object to clean
-	 * @return  array              Array of cleaned object properties
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
 	 */
 	protected function _cleanObjectDatas($object)
 	{
diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index 0fd06790011..254e577f2f2 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -108,18 +108,18 @@ class SupplierOrders extends DolibarrApi
 
 		// If the internal user must only see his customers, force searching by him
 		$search_sale = 0;
-		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
 
 		$sql = "SELECT t.rowid";
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as t";
 
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
   		if (!empty($product_ids)) $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseurdet as cd"; // We need this table joined to the select in order to filter by product
 
 		$sql .= ' WHERE t.entity IN ('.getEntity('supplier_order').')';
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
 		if (!empty($product_ids)) $sql .= " AND cd.fk_commande = t.rowid AND cd.fk_product IN (".$product_ids.")";
 		if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
 		if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
@@ -339,8 +339,8 @@ class SupplierOrders extends DolibarrApi
 	/**
 	 * Clean sensible object datas
 	 *
-	 * @param   Object  $object    Object to clean
-	 * @return  array              Array of cleaned object properties
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
 	 */
 	protected function _cleanObjectDatas($object)
 	{
diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index e9ba334313c..4ca073a38c7 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -100,7 +100,7 @@ class Fournisseur extends Societe
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Load statistics indicators
 	 *
@@ -108,7 +108,7 @@ class Fournisseur extends Societe
 	 */
 	public function load_state_board()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $user;
 
 		$this->nb = array();
@@ -132,7 +132,7 @@ class Fournisseur extends Societe
 			{
 				$this->nb["suppliers"] = $obj->nb;
 			}
-            $this->db->free($resql);
+			$this->db->free($resql);
 			return 1;
 		} else {
 			dol_print_error($this->db);
@@ -141,7 +141,7 @@ class Fournisseur extends Societe
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Create a supplier category
 	 *
@@ -151,7 +151,7 @@ class Fournisseur extends Societe
 	 */
 	public function CreateCategory($user, $name)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie (label,visible,type)";
 		$sql .= " VALUES ";
 		$sql .= " ('".$this->db->escape($name)."',1,1)";
@@ -169,7 +169,7 @@ class Fournisseur extends Societe
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Return the suppliers list
 	 *
@@ -177,7 +177,7 @@ class Fournisseur extends Societe
 	 */
 	public function ListArray()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		global $user;
 
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 3d6d2c2f837..e2c061269d5 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2013       Cédric Salvador         <csalvador@gpcsolutions.fr>
  * Copyright (C) 2018       Nicolas ZABOURI			<info@inovea-conseil.com>
- * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2018       Ferran Marcet         	<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -53,12 +53,12 @@ class CommandeFournisseur extends CommonOrder
 	public $table_element = 'commande_fournisseur';
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	public $table_element_line = 'commande_fournisseurdet';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_commande';
 
@@ -115,10 +115,16 @@ class CommandeFournisseur extends CommonOrder
 	public $date_commande;
 
 	/**
-	 * Delivery date
+	 * @var int	Date expected for delivery
+	 * @deprecated		See delivery_date
 	 */
 	public $date_livraison;
 
+	/**
+	 *  @var int Date expected for delivery
+	 */
+	public $delivery_date;
+
 	public $total_ht;
 	public $total_tva;
 	public $total_localtax1; // Total Local tax 1
@@ -126,16 +132,6 @@ class CommandeFournisseur extends CommonOrder
 	public $total_ttc;
 	public $source;
 
-	/**
-	 * @deprecated
-	 * @see $note_private, $note_public
-	 */
-	public $note;
-
-	public $note_private;
-	public $note_public;
-	public $model_pdf;
-
 	/**
 	 * @var int ID
 	 */
@@ -290,8 +286,6 @@ class CommandeFournisseur extends CommonOrder
 	public function __construct($db)
 	{
 		$this->db = $db;
-
-		$this->products = array();
 	}
 
 
@@ -313,7 +307,7 @@ class CommandeFournisseur extends CommonOrder
 		$sql .= " c.localtax1, c.localtax2, ";
 		$sql .= " c.date_creation, c.date_valid, c.date_approve, c.date_approve2,";
 		$sql .= " c.fk_user_author, c.fk_user_valid, c.fk_user_approve, c.fk_user_approve2,";
-		$sql .= " c.date_commande as date_commande, c.date_livraison as date_livraison, c.fk_cond_reglement, c.fk_mode_reglement, c.fk_projet as fk_project, c.remise_percent, c.source, c.fk_input_method,";
+		$sql .= " c.date_commande as date_commande, c.date_livraison as delivery_date, c.fk_cond_reglement, c.fk_mode_reglement, c.fk_projet as fk_project, c.remise_percent, c.source, c.fk_input_method,";
 		$sql .= " c.fk_account,";
 		$sql .= " c.note_private, c.note_public, c.model_pdf, c.extraparams, c.billed,";
 		$sql .= " c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multicurrency_total_ht, c.multicurrency_total_tva, c.multicurrency_total_ttc,";
@@ -369,7 +363,8 @@ class CommandeFournisseur extends CommonOrder
 			$this->date_approve			= $this->db->jdate($obj->date_approve);
 			$this->date_approve2		= $this->db->jdate($obj->date_approve2);
 			$this->date_commande		= $this->db->jdate($obj->date_commande); // date we make the order to supplier
-			$this->date_livraison = $this->db->jdate($obj->date_livraison);
+			$this->date_livraison = $this->db->jdate($obj->delivery_date); // deprecated
+			$this->delivery_date = $this->db->jdate($obj->delivery_date);
 			$this->remise_percent = $obj->remise_percent;
 			$this->methode_commande_id = $obj->fk_input_method;
 			$this->methode_commande = $obj->methode_commande;
@@ -388,7 +383,7 @@ class CommandeFournisseur extends CommonOrder
 			$this->note_private = $obj->note_private;
 			$this->note_public = $obj->note_public;
 			$this->model_pdf = $obj->model_pdf;
-			$this->modelpdf = $obj->model_pdf;	// deprecated
+			$this->modelpdf = $obj->model_pdf; // deprecated
 
 			//Incoterms
 			$this->fk_incoterms = $obj->fk_incoterms;
@@ -407,7 +402,7 @@ class CommandeFournisseur extends CommonOrder
 
 			$this->db->free($resql);
 
-			// Retreive all extrafield
+			// Retrieve all extrafield
 			// fetch optionals attributes and labels
 			$this->fetch_optionals();
 
@@ -530,7 +525,7 @@ class CommandeFournisseur extends CommonOrder
 
 				$line->rang                = $objp->rang;
 
-				// Retreive all extrafield
+				// Retrieve all extrafield
 				// fetch optionals attributes and labels
 				$line->fetch_optionals();
 
@@ -763,17 +758,33 @@ class CommandeFournisseur extends CommonOrder
 		global $langs, $conf, $user;
 
 		$result = '';
-		$label = '<u>'.$langs->trans("PurchaseOrder").'</u>';
-		if (!empty($this->ref))
-			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-		if (!empty($this->ref_supplier))
-			$label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_supplier;
-		if (!empty($this->total_ht))
-			$label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
-		if (!empty($this->total_tva))
-			$label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
-		if (!empty($this->total_ttc))
-			$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+
+		$label = '';
+
+		if ($user->rights->fournisseur->commande->lire) {
+			$label = '<u class="paddingrightonly">'.$langs->trans("SupplierOrder").'</u>';
+			if (isset($this->statut)) {
+				$label .= ' '.$this->getLibStatut(5);
+			}
+			if (!empty($this->ref)) {
+				$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+			}
+			if (!empty($this->ref_supplier)) {
+				$label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_supplier;
+			}
+			if (!empty($this->total_ht)) {
+				$label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
+			}
+			if (!empty($this->total_tva)) {
+				$label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+			}
+			if (!empty($this->total_ttc)) {
+				$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+			}
+			if (!empty($this->delivery_date)) {
+				$label .= '<br><b>'.$langs->trans('DeliveryDate').':</b> '.dol_print_date($this->delivery_date, 'dayhour');
+			}
+		}
 
 		$picto = 'order';
 		$url = DOL_URL_ROOT.'/fourn/commande/card.php?id='.$this->id;
@@ -1242,9 +1253,10 @@ class CommandeFournisseur extends CommonOrder
 		$error = 0;
 		$now = dol_now();
 
-		// $date_commande is deprecated
+		// set tmp vars
 		$date = ($this->date_commande ? $this->date_commande : $this->date); // in case of date is set
 		if (empty($date)) $date = $now;
+		$delivery_date = empty($this->delivery_date) ? $this->date_livraison : $this->delivery_date;
 
 		// Clean parameters
 		if (empty($this->source)) $this->source = 0;
@@ -1292,8 +1304,8 @@ class CommandeFournisseur extends CommonOrder
 		$sql .= ", ".$conf->entity;
 		$sql .= ", ".$this->socid;
 		$sql .= ", ".($this->fk_project > 0 ? $this->fk_project : "null");
-		$sql .= ", '".$this->db->idate($now)."'";
-		$sql .= ", ".($this->date_livraison ? "'".$this->db->idate($this->date_livraison)."'" : "null");
+		$sql .= ", '".$this->db->idate($date)."'";
+		$sql .= ", ".($delivery_date ? "'".$this->db->idate($delivery_date)."'" : "null");
 		$sql .= ", ".$user->id;
 		$sql .= ", ".self::STATUS_DRAFT;
 		$sql .= ", ".$this->db->escape($this->source);
@@ -1368,7 +1380,7 @@ class CommandeFournisseur extends CommonOrder
 						}
 
 						// Add object linked
-						if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects))
+						if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects))
 						{
 							foreach ($this->linked_objects as $origin => $tmp_origin_id)
 							{
@@ -1554,7 +1566,7 @@ class CommandeFournisseur extends CommonOrder
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 			// Clean parameters
-			if (!$qty) $qty = 1;
+			if (empty($qty)) $qty = 0;
 			if (!$info_bits) $info_bits = 0;
 			if (empty($txtva)) $txtva = 0;
 			if (empty($txlocaltax1)) $txlocaltax1 = 0;
@@ -1660,19 +1672,19 @@ class CommandeFournisseur extends CommonOrder
 					{
 						$qty = $prod->packaging;
 					} else {
-						if (($qty % $prod->packaging) > 0)
+						if (!empty($prod->packaging) && ($qty % $prod->packaging) > 0)
 						{
 							$coeff = intval($qty / $prod->packaging) + 1;
 							$qty = $prod->packaging * $coeff;
-							setEventMessage($langs->trans('QtyRecalculatedWithPackaging'), 'mesgs');
 						}
 					}
+					setEventMessage($langs->trans('QtyRecalculatedWithPackaging'), 'mesgs');
 				}
 			} else {
 				$product_type = $type;
 			}
 
-			if ($conf->multicurrency->enabled && $pu_ht_devise > 0) {
+			if (!empty($conf->multicurrency->enabled) && $pu_ht_devise > 0) {
 				$pu = 0;
 			}
 
@@ -1709,8 +1721,6 @@ class CommandeFournisseur extends CommonOrder
 			$localtax1_type = $localtaxes_type[0];
 			$localtax2_type = $localtaxes_type[2];
 
-			$subprice = price2num($pu, 'MU');
-
 			$rangmax = $this->line_max();
 			$rang = $rangmax + 1;
 
@@ -2020,8 +2030,8 @@ class CommandeFournisseur extends CommonOrder
 
 		if (!$error)
 		{
-        	// Delete record into ECM index (Note that delete is also done when deleting files with the dol_delete_dir_recursive
-        	$this->deleteEcmFiles();
+			// Delete record into ECM index (Note that delete is also done when deleting files with the dol_delete_dir_recursive
+			$this->deleteEcmFiles();
 
 			// We remove directory
 			$ref = dol_sanitizeFileName($this->ref);
@@ -2210,8 +2220,7 @@ class CommandeFournisseur extends CommonOrder
 
 			// TODO LDR01 Add a control test to accept only if ALL predefined products are received (same qty).
 
-
-			if (!$error)
+			if (empty($error))
 			{
 				$this->db->begin();
 
@@ -2224,17 +2233,17 @@ class CommandeFournisseur extends CommonOrder
 				$resql = $this->db->query($sql);
 				if ($resql)
 				{
-					$result = 0;
+					$result = 1;
 					$old_statut = $this->statut;
 					$this->statut = $statut;
 					$this->actionmsg2 = $comment;
 
 					// Call trigger
-					$result = $this->call_trigger('ORDER_SUPPLIER_RECEIVE', $user);
-					if ($result < 0) $error++;
+					$result_trigger = $this->call_trigger('ORDER_SUPPLIER_RECEIVE', $user);
+					if ($result_trigger < 0) $error++;
 					// End call triggers
 
-					if (!$error)
+					if (empty($error))
 					{
 						$this->db->commit();
 					} else {
@@ -2259,17 +2268,31 @@ class CommandeFournisseur extends CommonOrder
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Set delivery date
+	 *
+	 *	@param      User 	$user        		Object user that modify
+	 *	@param      int		$delivery_date		Delivery date
+	 *  @param  	int		$notrigger			1=Does not execute triggers, 0= execute triggers
+	 *	@return     int         				<0 if ko, >0 if ok
+	 *	@deprecated Use  setDeliveryDate
+	 */
+	public function set_date_livraison($user, $delivery_date, $notrigger = 0)
+	{
+		// phpcs:enable
+		return $this->setDeliveryDate($user, $delivery_date, $notrigger);
+	}
+
 	/**
 	 *	Set the planned delivery date
 	 *
 	 *	@param      User			$user        		Objet user making change
-	 *	@param      integer  		$date_livraison     Planned delivery date
+	 *	@param      integer  		$delivery_date     Planned delivery date
 	 *  @param     	int				$notrigger			1=Does not execute triggers, 0= execute triggers
 	 *	@return     int         						<0 if KO, >0 if OK
 	 */
-	public function set_date_livraison($user, $date_livraison, $notrigger = 0)
+	public function setDeliveryDate($user, $delivery_date, $notrigger = 0)
 	{
-		// phpcs:enable
 		if ($user->rights->fournisseur->commande->creer)
 		{
 			$error = 0;
@@ -2277,7 +2300,7 @@ class CommandeFournisseur extends CommonOrder
 			$this->db->begin();
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
-			$sql .= " SET date_livraison = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
+			$sql .= " SET date_livraison = ".($delivery_date ? "'".$this->db->idate($delivery_date)."'" : 'null');
 			$sql .= " WHERE rowid = ".$this->id;
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
@@ -2291,7 +2314,8 @@ class CommandeFournisseur extends CommonOrder
 			if (!$error)
 			{
 				$this->oldcopy = clone $this;
-				$this->date_livraison = $date_livraison;
+				$this->date_livraison = $delivery_date;
+				$this->delivery_date = $delivery_date;
 			}
 
 			if (!$notrigger && empty($error))
@@ -2325,7 +2349,7 @@ class CommandeFournisseur extends CommonOrder
 	 *	Set the id projet
 	 *
 	 *	@param      User			$user        		Objet utilisateur qui modifie
-	 *	@param      int				$id_projet    	 	Date de livraison
+	 *	@param      int				$id_projet    	 	Delivery date
 	 *  @param     	int				$notrigger			1=Does not execute triggers, 0= execute triggers
 	 *	@return     int         						<0 si ko, >0 si ok
 	 */
@@ -2526,7 +2550,6 @@ class CommandeFournisseur extends CommonOrder
 
 			$remise_percent = price2num($remise_percent);
 			$qty = price2num($qty);
-			if (!$qty) $qty = 1;
 			$pu = price2num($pu);
 			$pu_ht_devise = price2num($pu_ht_devise);
 			$txtva = price2num($txtva);
@@ -2551,6 +2574,7 @@ class CommandeFournisseur extends CommonOrder
 			$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $mysoc, $this->thirdparty);
 
 			// Clean vat code
+			$reg = array();
 			$vat_src_code = '';
 			if (preg_match('/\((.*)\)/', $txtva, $reg))
 			{
@@ -2577,12 +2601,9 @@ class CommandeFournisseur extends CommonOrder
 			$localtax1_type = $localtaxes_type[0];
 			$localtax2_type = $localtaxes_type[2];
 
-			$subprice = price2num($pu_ht, 'MU');
-
 			//Fetch current line from the database and then clone the object and set it in $oldline property
 			$this->line = new CommandeFournisseurLigne($this->db);
 			$this->line->fetch($rowid);
-			$this->line->fetch_optionals();
 
 			$oldline = clone $this->line;
 			$this->line->oldline = $oldline;
@@ -2869,7 +2890,7 @@ class CommandeFournisseur extends CommonOrder
 		}
 		$sql .= $clause." c.entity = ".$conf->entity;
 		if ($mode === 'awaiting') {
-			$sql .= " AND c.fk_statut = ".self::STATUS_ORDERSENT;
+			$sql .= " AND c.fk_statut IN (".self::STATUS_ORDERSENT.", ".self::STATUS_RECEIVED_PARTIALLY.")";
 		} else {
 			$sql .= " AND c.fk_statut IN (".self::STATUS_VALIDATED.", ".self::STATUS_ACCEPTED.")";
 		}
@@ -2890,14 +2911,14 @@ class CommandeFournisseur extends CommonOrder
 			if ($mode === 'awaiting') {
 				$response->label = $langs->trans("SuppliersOrdersAwaitingReception");
 				$response->labelShort = $langs->trans("AwaitingReception");
-				$response->url = DOL_URL_ROOT.'/fourn/commande/list.php?statut=3&mainmenu=commercial&leftmenu=orders_suppliers';
+				$response->url = DOL_URL_ROOT.'/fourn/commande/list.php?statut=3,4&mainmenu=commercial&leftmenu=orders_suppliers';
 			}
 
 			while ($obj = $this->db->fetch_object($resql))
 			{
 				$response->nbtodo++;
 
-				$commandestatic->date_livraison = $this->db->jdate($obj->delivery_date);
+				$commandestatic->delivery_date = $this->db->jdate($obj->delivery_date);
 				$commandestatic->date_commande = $this->db->jdate($obj->date_commande);
 				$commandestatic->statut = $obj->fk_statut;
 
@@ -3050,12 +3071,12 @@ class CommandeFournisseur extends CommonOrder
 	{
 		global $conf;
 
-		if (empty($this->date_delivery) && !empty($this->date_livraison)) $this->date_delivery = $this->date_livraison; // For backward compatibility
+		if (empty($this->delivery_date) && !empty($this->date_livraison)) $this->delivery_date = $this->date_livraison; // For backward compatibility
 
 		$now = dol_now();
-		$date_to_test = empty($this->date_delivery) ? $this->date_commande : $this->date_delivery;
+		$date_to_test = empty($this->delivery_date) ? $this->date_commande : $this->delivery_date;
 
-		return ($this->statut > 0 && $this->statut < 4) && $date_to_test && $date_to_test < ($now - $conf->commande->fournisseur->warning_delay);
+		return ($this->statut > 0 && $this->statut < 5) && $date_to_test && $date_to_test < ($now - $conf->commande->fournisseur->warning_delay);
 	}
 
 	/**
@@ -3067,10 +3088,13 @@ class CommandeFournisseur extends CommonOrder
 	{
 		global $conf, $langs;
 
-		if (empty($this->date_delivery) && !empty($this->date_livraison)) $this->date_delivery = $this->date_livraison; // For backward compatibility
+		if (empty($this->delivery_date) && !empty($this->date_livraison)) $this->delivery_date = $this->date_livraison; // For backward compatibility
 
-		if (empty($this->date_delivery)) $text = $langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
-		else $text = $text = $langs->trans("DeliveryDate").' '.dol_print_date($this->date_delivery, 'day');
+		if (empty($this->delivery_date)) {
+			$text = $langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
+		} else {
+			$text = $langs->trans("DeliveryDate").' '.dol_print_date($this->delivery_date, 'day');
+		}
 		$text .= ' '.($conf->commande->fournisseur->warning_delay > 0 ? '+' : '-').' '.round(abs($conf->commande->fournisseur->warning_delay) / 3600 / 24, 1).' '.$langs->trans("days").' < '.$langs->trans("Today");
 
 		return $text;
@@ -3292,11 +3316,6 @@ class CommandeFournisseurLigne extends CommonOrderLine
 	 */
 	public $fk_facture;
 
-	/**
-	 * @var string supplier order line label
-	 */
-	public $label;
-
 	public $rang = 0;
 	public $special_code = 0;
 
@@ -3317,7 +3336,6 @@ class CommandeFournisseurLigne extends CommonOrderLine
 	 */
 	public $ref_supplier;
 	public $remise;
-	public $product_libelle;
 
 
 	/**
@@ -3345,7 +3363,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
 		$sql .= ' cd.remise, cd.remise_percent, cd.subprice,';
 		$sql .= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_ttc,';
 		$sql .= ' cd.total_localtax1, cd.total_localtax2,';
-		$sql .= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc,';
+		$sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc,';
 		$sql .= ' cd.date_start, cd.date_end, cd.fk_unit,';
 		$sql .= ' cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc';
 		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING))
@@ -3388,8 +3406,9 @@ class CommandeFournisseurLigne extends CommonOrderLine
 				$this->special_code     = $objp->special_code;
 
 				$this->ref = $objp->product_ref;
+
 				$this->product_ref      = $objp->product_ref;
-				$this->product_libelle  = $objp->product_libelle;
+				$this->product_label    = $objp->product_label;
 				$this->product_desc     = $objp->product_desc;
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING))
 				{
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 0c0e32a2055..e3b65d8a8de 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -38,6 +38,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commoninvoice.class.php';
 require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
+if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+
 /**
  *	Class to manage suppliers invoices
  */
@@ -54,12 +57,12 @@ class FactureFournisseur extends CommonInvoice
 	public $table_element = 'facture_fourn';
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	public $table_element_line = 'facture_fourn_det';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_facture_fourn';
 
@@ -95,12 +98,18 @@ class FactureFournisseur extends CommonInvoice
 	 */
 	public $ref;
 
-	public $label;
-	public $libelle; // @deprecated
-
-	public $product_ref;
+	/**
+	 * @var string Ref supplier
+	 */
 	public $ref_supplier;
+
+	/**
+	 * @var string Label of invoice
+	 */
+	public $label;
+
 	public $socid;
+
 	//Check constants for types
 	public $type = self::TYPE_STANDARD;
 
@@ -114,7 +123,6 @@ class FactureFournisseur extends CommonInvoice
 	/**
 	 * Set to 1 if the invoice is completely paid, otherwise is 0
 	 * @var int
-	 * @deprecated Use statuses stored in self::statut
 	 */
 	public $paye;
 
@@ -179,6 +187,8 @@ class FactureFournisseur extends CommonInvoice
 	public $mode_reglement_id;
 	public $mode_reglement_code;
 
+	public $extraparams = array();
+
 	/**
 	 * Invoice lines
 	 * @var SupplierInvoiceLine[]
@@ -190,8 +200,6 @@ class FactureFournisseur extends CommonInvoice
 	 */
 	public $fournisseur;
 
-	public $extraparams = array();
-
 	// Multicurrency
 	/**
 	 * @var int ID
@@ -323,14 +331,12 @@ class FactureFournisseur extends CommonInvoice
 	public function __construct($db)
 	{
 		$this->db = $db;
-
-		$this->products = array();
 	}
 
 	/**
 	 *    Create supplier invoice into database
 	 *
-	 *    @param      User		$user       object utilisateur qui cree
+	 *    @param      User		$user       user object that creates
 	 *    @return     int    	     		Id invoice created if OK, < 0 if KO
 	 */
 	public function create($user)
@@ -432,7 +438,7 @@ class FactureFournisseur extends CommonInvoice
 			}
 
 			// Add object linked
-			if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects))
+			if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects))
 			{
 				foreach ($this->linked_objects as $origin => $tmp_origin_id)
 				{
@@ -702,7 +708,7 @@ class FactureFournisseur extends CommonInvoice
 				$this->note_private			= $obj->note_private;
 				$this->note_public = $obj->note_public;
 				$this->model_pdf = $obj->model_pdf;
-				$this->modelpdf = $obj->model_pdf;	// deprecated
+				$this->modelpdf = $obj->model_pdf; // deprecated
 				$this->import_key = $obj->import_key;
 
 				//Incoterms
@@ -723,7 +729,7 @@ class FactureFournisseur extends CommonInvoice
 				$this->socid  = $obj->socid;
 				$this->socnom = $obj->socnom;
 
-				// Retreive all extrafield
+				// Retrieve all extrafield
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
 
@@ -765,7 +771,7 @@ class FactureFournisseur extends CommonInvoice
 		$sql .= ', f.localtax1_tx, f.localtax2_tx, f.localtax1_type, f.localtax2_type, f.total_localtax1, f.total_localtax2, f.fk_facture_fourn ';
 		$sql .= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line, f.fk_unit';
 		$sql .= ', p.rowid as product_id, p.ref as product_ref, p.label as label, p.description as product_desc';
-		$sql .= ', fk_code_ventilation, f.fk_multicurrency, f.multicurrency_code, f.multicurrency_subprice, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc';
+		$sql .= ', f.fk_code_ventilation, f.fk_multicurrency, f.multicurrency_code, f.multicurrency_subprice, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det as f';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON f.fk_product = p.rowid';
 		$sql .= ' WHERE fk_facture_fourn='.$this->id;
@@ -827,7 +833,7 @@ class FactureFournisseur extends CommonInvoice
 
 					// Accountancy
 					$line->code_ventilation = $obj->fk_code_ventilation;
-					$line->fk_accounting_account	= $obj->fk_code_ventilation;
+					$line->fk_accounting_account = $obj->fk_code_ventilation;
 
 					// Multicurrency
 					$line->fk_multicurrency = $obj->fk_multicurrency;
@@ -1245,8 +1251,8 @@ class FactureFournisseur extends CommonInvoice
 	 *  Tag invoice as a payed invoice
 	 *
 	 *	@param  User	$user       Object user
-	 *	@param  string	$close_code	Code renseigne si on classe a payee completement alors que paiement incomplet. Not implementd yet.
-	 *	@param  string	$close_note	Commentaire renseigne si on classe a payee alors que paiement incomplet. Not implementd yet.
+	 *	@param  string	$close_code	Code indicates whether the class has paid in full while payment is incomplete. Not implementd yet.
+	 *	@param  string	$close_note	Comment informs if the class has been paid while payment is incomplete. Not implementd yet.
 	 *	@return int         		<0 si ko, >0 si ok
 	 */
 	public function set_paid($user, $close_code = '', $close_note = '')
@@ -1288,9 +1294,9 @@ class FactureFournisseur extends CommonInvoice
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *	Tag la facture comme non payee completement + appel trigger BILL_UNPAYED
-	 *	Fonction utilisee quand un paiement prelevement est refuse,
-	 *	ou quand une facture annulee et reouverte.
+	 *	Tag the invoice as not fully paid + trigger call BILL_UNPAYED
+	 *	Function used when a direct debit payment is refused,
+	 *	or when the invoice was canceled and reopened.
 	 *
 	 *	@param      User	$user       Object user that change status
 	 *	@return     int         		<0 si ok, >0 si ok
@@ -1573,25 +1579,25 @@ class FactureFournisseur extends CommonInvoice
 
 
 	/**
-	 *	Ajoute une ligne de facture (associe a aucun produit/service predefini)
-	 *	Les parametres sont deja cense etre juste et avec valeurs finales a l'appel
-	 *	de cette methode. Aussi, pour le taux tva, il doit deja avoir ete defini
-	 *	par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,idprod)
-	 *	et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue).
+	 *	Adds an invoice line (associated with no predefined product/service)
+	 *	The parameters are already supposed to be correct and with final values when calling
+	 *	this method. Also, for the VAT rate, it must already have been defined by the caller by
+	 *	by the get_default_tva method(vendor_company, buying company, idprod) and the desc must
+	 *	already have the right value (the caller has to manage the multilanguage).
 	 *
-	 *	@param    	string	$desc            	Description de la ligne
-	 *	@param    	double	$pu              	Prix unitaire (HT ou TTC selon price_base_type, > 0 even for credit note)
+	 *	@param    	string	$desc            	Description of the line
+	 *	@param    	double	$pu              	Unit price (HT or TTC according to price_base_type, > 0 even for credit note)
 	 *	@param    	double	$txtva           	Force Vat rate to use, -1 for auto.
 	 *	@param		double	$txlocaltax1		LocalTax1 Rate
 	 *	@param		double	$txlocaltax2		LocalTax2 Rate
-	 *	@param    	double	$qty             	Quantite
+	 *	@param    	double	$qty             	Quantity
 	 *	@param    	int		$fk_product      	Product/Service ID predefined
 	 *	@param    	double	$remise_percent  	Percentage discount of the line
-	 *	@param    	integer	$date_start      	Date de debut de validite du service
-	 * 	@param    	integer	$date_end        	Date de fin de validite du service
-	 * 	@param    	string	$ventil          	Code de ventilation comptable
-	 *	@param    	int		$info_bits			Bits de type de lines
-	 *	@param    	string	$price_base_type 	HT ou TTC
+	 *	@param    	integer	$date_start      	Service start date
+	 * 	@param    	integer	$date_end        	Service expiry date
+	 * 	@param    	string	$ventil          	Accounting breakdown code
+	 *	@param    	int		$info_bits			Line type bits
+	 *	@param    	string	$price_base_type 	HT or TTC
 	 *	@param		int		$type				Type of line (0=product, 1=service)
 	 *  @param      int		$rang            	Position of line
 	 *  @param		int		$notrigger			Disable triggers
@@ -1626,11 +1632,11 @@ class FactureFournisseur extends CommonInvoice
 			$remise_percent = price2num($remise_percent);
 			$qty = price2num($qty);
 			$pu = price2num($pu);
-			$txlocaltax1 = price2num($txlocaltax1);
-			$txlocaltax2 = price2num($txlocaltax2);
 			if (!preg_match('/\((.*)\)/', $txtva)) {
 				$txtva = price2num($txtva); // $txtva can have format '5,1' or '5.1' or '5.1(XXX)', we must clean only if '5,1'
 			}
+			$txlocaltax1 = price2num($txlocaltax1);
+			$txlocaltax2 = price2num($txlocaltax2);
 
 			if ($date_start && $date_end && $date_start > $date_end) {
 				$langs->load("errors");
@@ -1699,7 +1705,7 @@ class FactureFournisseur extends CommonInvoice
 				$product_type = $type;
 			}
 
-			if ($conf->multicurrency->enabled && $pu_ht_devise > 0) {
+			if (!empty($conf->multicurrency->enabled) && $pu_ht_devise > 0) {
 				$pu = 0;
 			}
 
@@ -1876,8 +1882,6 @@ class FactureFournisseur extends CommonInvoice
 		$txlocaltax1 = price2num($txlocaltax1);
 		$txlocaltax2 = price2num($txlocaltax2);
 
-		$localtaxes_type = array($txlocaltax1, $txlocaltax2);
-
 		// Calcul du total TTC et de la TVA pour la ligne a partir de
 		// qty, pu, remise_percent et txtva
 		// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
@@ -2042,9 +2046,9 @@ class FactureFournisseur extends CommonInvoice
 
 
 	/**
-	 *	Charge les informations d'ordre info dans l'objet facture
+	 *	Loads the info order information into the invoice object
 	 *
-	 *	@param  int		$id       	Id de la facture a charger
+	 *	@param  int		$id       	Id of the invoice to load
 	 *	@return	void
 	 */
 	public function info($id)
@@ -2091,11 +2095,11 @@ class FactureFournisseur extends CommonInvoice
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *	Renvoi liste des factures remplacables
-	 *	Statut validee ou abandonnee pour raison autre + non payee + aucun paiement + pas deja remplacee
+	 *	Return list of replaceable invoices
+	 *	Status valid or abandoned for other reason + not paid + no payment + not already replaced
 	 *
-	 *	@param      int		$socid		Id societe
-	 *	@return    	array|int			Tableau des factures ('id'=>id, 'ref'=>ref, 'status'=>status, 'paymentornot'=>0/1)
+	 *	@param      int		$socid		Thirdparty id
+	 *	@return    	array|int			Table of invoices ('id'=>id, 'ref'=>ref, 'status'=>status, 'paymentornot'=>0/1)
 	 *                                  <0 if error
 	 */
 	public function list_replacable_supplier_invoices($socid = 0)
@@ -2140,12 +2144,12 @@ class FactureFournisseur extends CommonInvoice
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *	Renvoi liste des factures qualifiables pour correction par avoir
-	 *	Les factures qui respectent les regles suivantes sont retournees:
-	 *	(validee + paiement en cours) ou classee (payee completement ou payee partiellement) + pas deja remplacee + pas deja avoir
+	 *	Return list of qualifying invoices for correction by credit note
+	 *	Invoices that respect the following rules are returned:
+	 *	(validated + payment in progress) or classified (paid in full or paid in part) + not already replaced + not already having
 	 *
-	 *	@param		int		$socid		Id societe
-	 *	@return    	array|int			Tableau des factures ($id => array('ref'=>,'paymentornot'=>,'status'=>,'paye'=>)
+	 *	@param		int		$socid		Thirdparty id
+	 *	@return    	array|int			Table of invoices ($id => array('ref'=>,'paymentornot'=>,'status'=>,'paye'=>)
 	 *                                  <0 if error
 	 */
 	public function list_qualified_avoir_supplier_invoices($socid = 0)
@@ -2286,10 +2290,10 @@ class FactureFournisseur extends CommonInvoice
 		if ($this->type == self::TYPE_CREDIT_NOTE) $picto .= 'a'; // Credit note
 		if ($this->type == self::TYPE_DEPOSIT)     $picto .= 'd'; // Deposit invoice
 
-		$label = '<u>'.$langs->trans("SupplierInvoice").'</u>';
-		if ($this->type == self::TYPE_REPLACEMENT) $label = '<u>'.$langs->transnoentitiesnoconv("InvoiceReplace").'</u>';
-		elseif ($this->type == self::TYPE_CREDIT_NOTE) $label = '<u>'.$langs->transnoentitiesnoconv("CreditNote").'</u>';
-		elseif ($this->type == self::TYPE_DEPOSIT)     $label = '<u>'.$langs->transnoentitiesnoconv("Deposit").'</u>';
+		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("SupplierInvoice").'</u>';
+		if ($this->type == self::TYPE_REPLACEMENT) $label = '<u class="paddingrightonly">'.$langs->transnoentitiesnoconv("InvoiceReplace").'</u>';
+		elseif ($this->type == self::TYPE_CREDIT_NOTE) $label = '<u class="paddingrightonly">'.$langs->transnoentitiesnoconv("CreditNote").'</u>';
+		elseif ($this->type == self::TYPE_DEPOSIT)     $label = '<u class="paddingrightonly">'.$langs->transnoentitiesnoconv("Deposit").'</u>';
 		if (!empty($this->ref))
 			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 		if (!empty($this->ref_supplier))
@@ -2301,7 +2305,7 @@ class FactureFournisseur extends CommonInvoice
 		if (!empty($this->total_ht))
 			$label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
 		if (!empty($this->total_tva))
-			$label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+			$label .= '<br><b>'.$langs->trans('AmountVAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
 		if (!empty($this->total_ttc))
 			$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
 		if ($moretitle) $label .= ' - '.$moretitle;
@@ -2397,7 +2401,7 @@ class FactureFournisseur extends CommonInvoice
 			return $numref;
 		} else {
 			$this->error = $obj->error;
-			return false;
+			return -1;
 		}
 	}
 
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 8752d17a5d8..67343e549b2 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -39,240 +39,267 @@ require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.
  */
 class ProductFournisseur extends Product
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
-    public $product_fourn_price_id; // id of ligne product-supplier
+	public $product_fourn_price_id; // id of ligne product-supplier
 
-    /**
-     * @var int ID
-     */
-    public $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
 
-    /**
-     * @deprecated
-     * @see $ref_supplier
-     */
-    public $fourn_ref;
-    public $delivery_time_days;
-    public $ref_supplier; // ref supplier (can be set by get_buyprice)
-    public $desc_supplier;
-    public $vatrate_supplier; // default vat rate for this supplier/qty/product (can be set by get_buyprice)
+	/**
+	 * @deprecated
+	 * @see $ref_supplier
+	 */
+	public $fourn_ref;
 
-    public $fourn_id; //supplier id
-    public $fourn_qty; // quantity for price (can be set by get_buyprice)
-    public $fourn_pu; // unit price for quantity (can be set by get_buyprice)
+	public $delivery_time_days;
+	public $ref_supplier; // ref supplier (can be set by get_buyprice)
+	public $desc_supplier;
+	public $vatrate_supplier; // default vat rate for this supplier/qty/product (can be set by get_buyprice)
 
-    public $fourn_price; // price for quantity
-    public $fourn_remise_percent; // discount for quantity (percent)
-    public $fourn_remise; // discount for quantity (amount)
-    public $product_fourn_id; // product-supplier id
+	public $product_id;
+	public $product_ref;
 
-    /**
-     * @var int ID user_id - user who created/updated supplier price
-     */
-    public $user_id;
+	public $fourn_id; //supplier id
+	public $fourn_qty; // quantity for price (can be set by get_buyprice)
+	public $fourn_pu; // unit price for quantity (can be set by get_buyprice)
 
-    /**
-     * @var int ID availability delay - visible/used if option FOURN_PRODUCT_AVAILABILITY is on (duplicate information compared to delivery delay)
-     */
-    public $fk_availability;
+	public $fourn_price; // price for quantity
+	public $fourn_remise_percent; // discount for quantity (percent)
+	public $fourn_remise; // discount for quantity (amount)
 
-    public $fourn_unitprice;
-    public $fourn_tva_tx;
-    public $fourn_tva_npr;
+	public $product_fourn_id; // product-supplier id
+	public $product_fourn_entity;
 
-    /**
-     * @var int ID
-     */
-    public $fk_supplier_price_expression;
+	/**
+	 * @var int ID user_id - user who created/updated supplier price
+	 */
+	public $user_id;
 
-    public $supplier_reputation; // reputation of supplier
-    public $reputations = array(); // list of available supplier reputations
+	/**
+	 * @var int ID availability delay - visible/used if option FOURN_PRODUCT_AVAILABILITY is on (duplicate information compared to delivery delay)
+	 */
+	public $fk_availability;
 
-    // Multicurreny
-    public $fourn_multicurrency_id;
-    public $fourn_multicurrency_code;
-    public $fourn_multicurrency_tx;
-    public $fourn_multicurrency_price;
-    public $fourn_multicurrency_unitprice;
+	public $fourn_unitprice;
+	public $fourn_tva_tx;
+	public $fourn_tva_npr;
 
-    /**
-     *	Constructor
-     *
-     *  @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        global $langs;
+	/**
+	 * @var int ID
+	 */
+	public $fk_supplier_price_expression;
 
-        $this->db = $db;
-        $langs->load("suppliers");
-        $this->reputations = array('-1'=>'', 'FAVORITE'=>$langs->trans('Favorite'), 'NOTTHGOOD'=>$langs->trans('NotTheGoodQualitySupplier'), 'DONOTORDER'=>$langs->trans('DoNotOrderThisProductToThisSupplier'));
-    }
+	public $supplier_reputation; // reputation of supplier
+	public $reputations = array(); // list of available supplier reputations
+
+	// Multicurreny
+	public $fourn_multicurrency_id;
+	public $fourn_multicurrency_code;
+	public $fourn_multicurrency_tx;
+	public $fourn_multicurrency_price;
+	public $fourn_multicurrency_unitprice;
+
+	/**
+	 * @deprecated
+	 * @see $supplier_barcode
+	 */
+	public $fourn_barcode;
+
+	/**
+	 * @var string $supplier_barcode - Supplier barcode
+	 */
+	public $supplier_barcode;
+
+	/**
+	 * @deprecated
+	 * @see $supplier_fk_barcode_type
+	 */
+	public $fourn_fk_barcode_type;
+
+	/**
+	 * @var string $supplier_fk_barcode_type - Supplier barcode type
+	 */
+	public $supplier_fk_barcode_type;
 
 
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $langs;
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Remove all prices for this couple supplier-product
-     *
-     *    @param	int		$id_fourn   Supplier Id
-     *    @return   int         		< 0 if error, > 0 if ok
-     */
-    public function remove_fournisseur($id_fourn)
-    {
-        // phpcs:enable
-        $ok = 1;
+		$this->db = $db;
+		$langs->load("suppliers");
+		$this->reputations = array('-1'=>'', 'FAVORITE'=>$langs->trans('Favorite'), 'NOTTHGOOD'=>$langs->trans('NotTheGoodQualitySupplier'), 'DONOTORDER'=>$langs->trans('DoNotOrderThisProductToThisSupplier'));
+	}
 
-        $this->db->begin();
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Remove all prices for this couple supplier-product
+	 *
+	 *    @param	int		$id_fourn   Supplier Id
+	 *    @return   int         		< 0 if error, > 0 if ok
+	 */
+	public function remove_fournisseur($id_fourn)
+	{
+		// phpcs:enable
+		$ok = 1;
 
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
-        $sql .= " WHERE fk_product = ".$this->id." AND fk_soc = ".$id_fourn;
+		$this->db->begin();
 
-        dol_syslog(get_class($this)."::remove_fournisseur", LOG_DEBUG);
-        $resql2 = $this->db->query($sql);
-        if (!$resql2)
-        {
-            $this->error = $this->db->lasterror();
-            $ok = 0;
-        }
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
+		$sql .= " WHERE fk_product = ".$this->id." AND fk_soc = ".$id_fourn;
 
-        if ($ok)
-        {
-            $this->db->commit();
-            return 1;
-        } else {
-            $this->db->rollback();
-            return -1;
-        }
-    }
+		dol_syslog(get_class($this)."::remove_fournisseur", LOG_DEBUG);
+		$resql2 = $this->db->query($sql);
+		if (!$resql2)
+		{
+			$this->error = $this->db->lasterror();
+			$ok = 0;
+		}
+
+		if ($ok)
+		{
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * 	Remove a price for a couple supplier-product
-     *
-     * 	@param	int		$rowid		Line id of price
-     *	@return	int					<0 if KO, >0 if OK
-     */
-    public function remove_product_fournisseur_price($rowid)
-    {
-        // phpcs:enable
-        global $conf, $user;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * 	Remove a price for a couple supplier-product
+	 *
+	 * 	@param	int		$rowid		Line id of price
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
+	public function remove_product_fournisseur_price($rowid)
+	{
+		// phpcs:enable
+		global $conf, $user;
 
-        $error = 0;
+		$error = 0;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // Call trigger
-        $result = $this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_DELETE', $user);
-        if ($result < 0) $error++;
-        // End call triggers
+		// Call trigger
+		$result = $this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_DELETE', $user);
+		if ($result < 0) $error++;
+		// End call triggers
 
-        if (empty($error))
-        {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
-            $sql .= " WHERE rowid = ".$rowid;
+		if (empty($error))
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
+			$sql .= " WHERE rowid = ".$rowid;
 
-            dol_syslog(get_class($this)."::remove_product_fournisseur_price", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if (!$resql)
-            {
-                $this->error = $this->db->lasterror();
-                $error++;
-            }
-        }
+			dol_syslog(get_class($this)."::remove_product_fournisseur_price", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$this->error = $this->db->lasterror();
+				$error++;
+			}
+		}
 
-        if (empty($error)) {
-            $this->db->commit();
-            return 1;
-        } else {
-            $this->db->rollback();
-            return -1;
-        }
-    }
+		if (empty($error)) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Modify the purchase price for a supplier
-     *
-     *    @param  	float		$qty				            Min quantity for which price is valid
-     *    @param  	float		$buyprice			            Purchase price for the quantity min
-     *    @param  	User		$user				            Object user user made changes
-     *    @param  	string		$price_base_type	            HT or TTC
-     *    @param  	Societe		$fourn				            Supplier
-     *    @param  	int			$availability		            Product availability
-     *    @param	string		$ref_fourn			            Supplier ref
-     *    @param	float		$tva_tx				            New VAT Rate (For example 8.5. Should not be a string)
-     *    @param  	string		$charges			            costs affering to product
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Modify the purchase price for a supplier
+	 *
+	 *    @param  	float		$qty				            Min quantity for which price is valid
+	 *    @param  	float		$buyprice			            Purchase price for the quantity min
+	 *    @param  	User		$user				            Object user user made changes
+	 *    @param  	string		$price_base_type	            HT or TTC
+	 *    @param  	Societe		$fourn				            Supplier
+	 *    @param  	int			$availability		            Product availability
+	 *    @param	string		$ref_fourn			            Supplier ref
+	 *    @param	float		$tva_tx				            New VAT Rate (For example 8.5. Should not be a string)
+	 *    @param  	string		$charges			            costs affering to product
 	 *    @param  	float		$remise_percent		            Discount  regarding qty (percent)
 	 *    @param  	float		$remise				            Discount  regarding qty (amount)
 	 *    @param  	int			$newnpr				            Set NPR or not
 	 *    @param	int			$delivery_time_days	            Delay in days for delivery (max). May be '' if not defined.
 	 * 	  @param    string      $supplier_reputation            Reputation with this product to the defined supplier (empty, FAVORITE, DONOTORDER)
-     *	  @param    array		$localtaxes_array	            Array with localtaxes info array('0'=>type1,'1'=>rate1,'2'=>type2,'3'=>rate2) (loaded by getLocalTaxesFromRate(vatrate, 0, ...) function).
-     *    @param    string  	$newdefaultvatcode              Default vat code
-     *    @param  	float		$multicurrency_buyprice 	    Purchase price for the quantity min in currency
-     *    @param  	string		$multicurrency_price_base_type	HT or TTC in currency
-     *    @param  	float		$multicurrency_tx	            Rate currency
-     *    @param  	string		$multicurrency_code	            Currency code
-     *    @param  	string		$desc_fourn     	            Custom description for product_fourn_price
-     *    @param  	string		$barcode     	                Barcode
-     *    @param  	int		    $fk_barcode_type     	        Barcode type
-     *    @return	int											<0 if KO, >=0 if OK
-     */
-    public function update_buyprice($qty, $buyprice, $user, $price_base_type, $fourn, $availability, $ref_fourn, $tva_tx, $charges = 0, $remise_percent = 0, $remise = 0, $newnpr = 0, $delivery_time_days = 0, $supplier_reputation = '', $localtaxes_array = array(), $newdefaultvatcode = '', $multicurrency_buyprice = 0, $multicurrency_price_base_type = 'HT', $multicurrency_tx = 1, $multicurrency_code = '', $desc_fourn = '', $barcode = '', $fk_barcode_type = '')
-    {
-        // phpcs:enable
-        global $conf, $langs;
-        //global $mysoc;
+	 *	  @param    array		$localtaxes_array	            Array with localtaxes info array('0'=>type1,'1'=>rate1,'2'=>type2,'3'=>rate2) (loaded by getLocalTaxesFromRate(vatrate, 0, ...) function).
+	 *    @param    string  	$newdefaultvatcode              Default vat code
+	 *    @param  	float		$multicurrency_buyprice 	    Purchase price for the quantity min in currency
+	 *    @param  	string		$multicurrency_price_base_type	HT or TTC in currency
+	 *    @param  	float		$multicurrency_tx	            Rate currency
+	 *    @param  	string		$multicurrency_code	            Currency code
+	 *    @param  	string		$desc_fourn     	            Custom description for product_fourn_price
+	 *    @param  	string		$barcode     	                Barcode
+	 *    @param  	int		    $fk_barcode_type     	        Barcode type
+	 *    @return	int											<0 if KO, >=0 if OK
+	 */
+	public function update_buyprice($qty, $buyprice, $user, $price_base_type, $fourn, $availability, $ref_fourn, $tva_tx, $charges = 0, $remise_percent = 0, $remise = 0, $newnpr = 0, $delivery_time_days = 0, $supplier_reputation = '', $localtaxes_array = array(), $newdefaultvatcode = '', $multicurrency_buyprice = 0, $multicurrency_price_base_type = 'HT', $multicurrency_tx = 1, $multicurrency_code = '', $desc_fourn = '', $barcode = '', $fk_barcode_type = '')
+	{
+		// phpcs:enable
+		global $conf, $langs;
+		//global $mysoc;
 
-        // Clean parameter
-        if (empty($qty)) $qty = 0;
-        if (empty($buyprice)) $buyprice = 0;
-        if (empty($charges)) $charges = 0;
-        if (empty($availability)) $availability = 0;
-        if (empty($remise_percent)) $remise_percent = 0;
-	    if (empty($supplier_reputation) || $supplier_reputation == -1) $supplier_reputation = '';
-        if ($delivery_time_days != '' && !is_numeric($delivery_time_days)) $delivery_time_days = '';
-        if ($price_base_type == 'TTC')
-        {
-            $ttx = $tva_tx;
-            $buyprice = $buyprice / (1 + ($ttx / 100));
-        }
+		// Clean parameter
+		if (empty($qty)) $qty = 0;
+		if (empty($buyprice)) $buyprice = 0;
+		if (empty($charges)) $charges = 0;
+		if (empty($availability)) $availability = 0;
+		if (empty($remise_percent)) $remise_percent = 0;
+		if (empty($supplier_reputation) || $supplier_reputation == -1) $supplier_reputation = '';
+		if ($delivery_time_days != '' && !is_numeric($delivery_time_days)) $delivery_time_days = '';
+		if ($price_base_type == 'TTC')
+		{
+			$ttx = $tva_tx;
+			$buyprice = $buyprice / (1 + ($ttx / 100));
+		}
 
 		// Multicurrency
-        if ($conf->multicurrency->enabled) {
-            if (empty($multicurrency_tx)) $multicurrency_tx = 1;
-            if (empty($multicurrency_buyprice)) $multicurrency_buyprice = 0;
+		if (!empty($conf->multicurrency->enabled)) {
+			if (empty($multicurrency_tx)) $multicurrency_tx = 1;
+			if (empty($multicurrency_buyprice)) $multicurrency_buyprice = 0;
 
-            if (empty($multicurrency_buyprice)) $multicurrency_buyprice = 0;
-            if ($multicurrency_price_base_type == 'TTC')
-            {
-                $ttx = $tva_tx;
-                $multicurrency_buyprice = $multicurrency_buyprice / (1 + ($ttx / 100));
-            }
-            $multicurrency_buyprice = price2num($multicurrency_buyprice, 'MU');
-            $multicurrency_unitBuyPrice = price2num($multicurrency_buyprice / $qty, 'MU');
+			if (empty($multicurrency_buyprice)) $multicurrency_buyprice = 0;
+			if ($multicurrency_price_base_type == 'TTC')
+			{
+				$ttx = $tva_tx;
+				$multicurrency_buyprice = $multicurrency_buyprice / (1 + ($ttx / 100));
+			}
+			$multicurrency_buyprice = price2num($multicurrency_buyprice, 'MU');
+			$multicurrency_unitBuyPrice = price2num($multicurrency_buyprice / $qty, 'MU');
 
-            $buyprice = $multicurrency_buyprice / $multicurrency_tx;
-            $fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $multicurrency_code);
-        }
+			$buyprice = $multicurrency_buyprice / $multicurrency_tx;
+			$fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $multicurrency_code);
+		}
 
-        $buyprice = price2num($buyprice, 'MU');
+		$buyprice = price2num($buyprice, 'MU');
 		$charges = price2num($charges, 'MU');
-        $qty = price2num($qty, 'MS');
+		$qty = price2num($qty, 'MS');
 		$unitBuyPrice = price2num($buyprice / $qty, 'MU');
-		$packaging = ($this->packaging < $qty) ? $qty : $this->packaging;
+		$packaging = price2num((($this->packaging < $qty) ? $qty : $this->packaging), 'MS');
 
 		$error = 0;
 		$now = dol_now();
@@ -285,7 +312,7 @@ class ProductFournisseur extends Product
 			$localtax1 = $localtaxes_array['1'];
 			$localtaxtype2 = $localtaxes_array['2'];
 			$localtax2 = $localtaxes_array['3'];
-		} else // old method. deprecated because ot can't retreive type
+		} else // old method. deprecated because ot can't retrieve type
 		{
 			$localtaxtype1 = '0';
 			$localtax1 = get_localtax($newvat, 1);
@@ -300,50 +327,50 @@ class ProductFournisseur extends Product
 		{
 		}
 
-        $this->db->begin();
+		$this->db->begin();
 
-        if ($this->product_fourn_price_id > 0)
-        {
-            // check if price already logged, if not first log current price
-            $logPrices = $this->listProductFournisseurPriceLog($this->product_fourn_price_id);
-            if (is_array($logPrices) && count($logPrices) == 0)
-            {
-                $currentPfp = new self($this->db);
-                $result = $currentPfp->fetch_product_fournisseur_price($this->product_fourn_price_id);
-                if ($result > 0 && $currentPfp->fourn_price != 0)
-                {
-                    $currentPfpUser = new User($this->db);
-                    $result = $currentPfpUser->fetch($currentPfp->user_id);
-                    if ($result > 0) {
-                        $currentPfp->logPrice(
-                            $currentPfpUser,
-                            $currentPfp->date_creation,
-                            $currentPfp->fourn_price,
-                            $currentPfp->fourn_qty,
-                            $currentPfp->fourn_multicurrency_price,
-                            $currentPfp->fourn_multicurrency_unitprice,
-                            $currentPfp->fourn_multicurrency_tx,
-                            $currentPfp->fourn_multicurrency_id,
-                            $currentPfp->fourn_multicurrency_code
-                        );
-                    }
-                }
-            }
-            $sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price";
+		if ($this->product_fourn_price_id > 0)
+		{
+			// check if price already logged, if not first log current price
+			$logPrices = $this->listProductFournisseurPriceLog($this->product_fourn_price_id);
+			if (is_array($logPrices) && count($logPrices) == 0)
+			{
+				$currentPfp = new self($this->db);
+				$result = $currentPfp->fetch_product_fournisseur_price($this->product_fourn_price_id);
+				if ($result > 0 && $currentPfp->fourn_price != 0)
+				{
+					$currentPfpUser = new User($this->db);
+					$result = $currentPfpUser->fetch($currentPfp->user_id);
+					if ($result > 0) {
+						$currentPfp->logPrice(
+							$currentPfpUser,
+							$currentPfp->date_creation,
+							$currentPfp->fourn_price,
+							$currentPfp->fourn_qty,
+							$currentPfp->fourn_multicurrency_price,
+							$currentPfp->fourn_multicurrency_unitprice,
+							$currentPfp->fourn_multicurrency_tx,
+							$currentPfp->fourn_multicurrency_id,
+							$currentPfp->fourn_multicurrency_code
+						);
+					}
+				}
+			}
+			$sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price";
 			$sql .= " SET fk_user = ".$user->id." ,";
-            $sql .= " ref_fourn = '".$this->db->escape($ref_fourn)."',";
-            $sql .= " desc_fourn = '".$this->db->escape($desc_fourn)."',";
+			$sql .= " ref_fourn = '".$this->db->escape($ref_fourn)."',";
+			$sql .= " desc_fourn = '".$this->db->escape($desc_fourn)."',";
 			$sql .= " price = ".$buyprice.",";
 			$sql .= " quantity = ".$qty.",";
 			$sql .= " remise_percent = ".$remise_percent.",";
 			$sql .= " remise = ".$remise.",";
 			$sql .= " unitprice = ".$unitBuyPrice.",";
 			$sql .= " fk_availability = ".$availability.",";
-            $sql .= " multicurrency_price = ".(isset($multicurrency_buyprice) ? "'".$this->db->escape(price2num($multicurrency_buyprice))."'" : 'null').",";
-            $sql .= " multicurrency_unitprice = ".(isset($multicurrency_unitBuyPrice) ? "'".$this->db->escape(price2num($multicurrency_unitBuyPrice))."'" : 'null').",";
-            $sql .= " multicurrency_tx = ".(isset($multicurrency_tx) ? "'".$this->db->escape($multicurrency_tx)."'" : '1').",";
-            $sql .= " fk_multicurrency = ".(isset($fk_multicurrency) ? "'".$this->db->escape($fk_multicurrency)."'" : 'null').",";
-            $sql .= " multicurrency_code = ".(isset($multicurrency_code) ? "'".$this->db->escape($multicurrency_code)."'" : 'null').",";
+			$sql .= " multicurrency_price = ".(isset($multicurrency_buyprice) ? "'".$this->db->escape(price2num($multicurrency_buyprice))."'" : 'null').",";
+			$sql .= " multicurrency_unitprice = ".(isset($multicurrency_unitBuyPrice) ? "'".$this->db->escape(price2num($multicurrency_unitBuyPrice))."'" : 'null').",";
+			$sql .= " multicurrency_tx = ".(isset($multicurrency_tx) ? "'".$this->db->escape($multicurrency_tx)."'" : '1').",";
+			$sql .= " fk_multicurrency = ".(isset($fk_multicurrency) ? "'".$this->db->escape($fk_multicurrency)."'" : 'null').",";
+			$sql .= " multicurrency_code = ".(isset($multicurrency_code) ? "'".$this->db->escape($multicurrency_code)."'" : 'null').",";
 			$sql .= " entity = ".$conf->entity.",";
 			$sql .= " tva_tx = ".price2num($tva_tx).",";
 			// TODO Add localtax1 and localtax2
@@ -356,8 +383,8 @@ class ProductFournisseur extends Product
 			$sql .= " charges = ".$charges.","; // deprecated
 			$sql .= " delivery_time_days = ".($delivery_time_days != '' ? $delivery_time_days : 'null').",";
 			$sql .= " supplier_reputation = ".(empty($supplier_reputation) ? 'NULL' : "'".$this->db->escape($supplier_reputation)."'").",";
-            $sql .= " barcode = ".(empty($barcode) ? 'NULL' : "'".$this->db->escape($barcode)."'").",";
-            $sql .= " fk_barcode_type = ".(empty($fk_barcode_type) ? 'NULL' : "'".$this->db->escape($fk_barcode_type)."'");
+			$sql .= " barcode = ".(empty($barcode) ? 'NULL' : "'".$this->db->escape($barcode)."'").",";
+			$sql .= " fk_barcode_type = ".(empty($fk_barcode_type) ? 'NULL' : "'".$this->db->escape($fk_barcode_type)."'");
 			if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) $sql .= ", packaging = ".(empty($packaging) ? 1 : $packaging);
 			$sql .= " WHERE rowid = ".$this->product_fourn_price_id;
 			// TODO Add price_base_type and price_ttc
@@ -366,17 +393,17 @@ class ProductFournisseur extends Product
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-                // Call trigger
-                $result = $this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_UPDATE', $user);
-                if ($result < 0) $error++;
-                // End call triggers
-                if (!$error && empty($conf->global->PRODUCT_PRICE_SUPPLIER_NO_LOG))
-                {
-                    $result = $this->logPrice($user, $now, $buyprice, $qty, $multicurrency_buyprice, $multicurrency_unitBuyPrice, $multicurrency_tx, $fk_multicurrency, $multicurrency_code);
-                    if ($result < 0) {
-                        $error++;
-                    }
-                }
+				// Call trigger
+				$result = $this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_UPDATE', $user);
+				if ($result < 0) $error++;
+				// End call triggers
+				if (!$error && empty($conf->global->PRODUCT_PRICE_SUPPLIER_NO_LOG))
+				{
+					$result = $this->logPrice($user, $now, $buyprice, $qty, $multicurrency_buyprice, $multicurrency_unitBuyPrice, $multicurrency_tx, $fk_multicurrency, $multicurrency_code);
+					if ($result < 0) {
+						$error++;
+					}
+				}
 				if (empty($error))
 				{
 					$this->db->commit();
@@ -390,727 +417,745 @@ class ProductFournisseur extends Product
 				$this->db->rollback();
 				return -2;
 			}
-        } else {
-            dol_syslog(get_class($this).'::update_buyprice without knowing id of line, so we delete from company, quantity and supplier_ref and insert again', LOG_DEBUG);
+		} else {
+			dol_syslog(get_class($this).'::update_buyprice without knowing id of line, so we delete from company, quantity and supplier_ref and insert again', LOG_DEBUG);
 
-            // Delete price for this quantity
-            $sql = "DELETE FROM  ".MAIN_DB_PREFIX."product_fournisseur_price";
-            $sql .= " WHERE fk_soc = ".$fourn->id." AND ref_fourn = '".$this->db->escape($ref_fourn)."' AND quantity = ".$qty." AND entity = ".$conf->entity;
-            $resql = $this->db->query($sql);
-            if ($resql) {
-                // Add price for this quantity to supplier
-                $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price(";
-                $sql .= " multicurrency_price, multicurrency_unitprice, multicurrency_tx, fk_multicurrency, multicurrency_code,";
-                $sql .= "datec, fk_product, fk_soc, ref_fourn, desc_fourn, fk_user, price, quantity, remise_percent, remise, unitprice, tva_tx, charges, fk_availability, default_vat_code, info_bits, entity, delivery_time_days, supplier_reputation, barcode, fk_barcode_type)";
+			// Delete price for this quantity
+			$sql = "DELETE FROM  ".MAIN_DB_PREFIX."product_fournisseur_price";
+			$sql .= " WHERE fk_soc = ".$fourn->id." AND ref_fourn = '".$this->db->escape($ref_fourn)."' AND quantity = ".$qty." AND entity = ".$conf->entity;
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				// Add price for this quantity to supplier
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price(";
+				$sql .= " multicurrency_price, multicurrency_unitprice, multicurrency_tx, fk_multicurrency, multicurrency_code,";
+				$sql .= "datec, fk_product, fk_soc, ref_fourn, desc_fourn, fk_user, price, quantity, remise_percent, remise, unitprice, tva_tx, charges, fk_availability, default_vat_code, info_bits, entity, delivery_time_days, supplier_reputation, barcode, fk_barcode_type)";
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) $sql .= ", packaging";
-                $sql .= " values(";
-                $sql .= (isset($multicurrency_buyprice) ? "'".$this->db->escape(price2num($multicurrency_buyprice))."'" : 'null').",";
-                $sql .= (isset($multicurrency_unitBuyPrice) ? "'".$this->db->escape(price2num($multicurrency_unitBuyPrice))."'" : 'null').",";
-                $sql .= (isset($multicurrency_tx) ? "'".$this->db->escape($multicurrency_tx)."'" : '1').",";
-                $sql .= (isset($fk_multicurrency) ? "'".$this->db->escape($fk_multicurrency)."'" : 'null').",";
-                $sql .= (isset($multicurrency_code) ? "'".$this->db->escape($multicurrency_code)."'" : 'null').",";
-                $sql .= " '".$this->db->idate($now)."',";
-                $sql .= " ".$this->id.",";
-                $sql .= " ".$fourn->id.",";
-                $sql .= " '".$this->db->escape($ref_fourn)."',";
-                $sql .= " '".$this->db->escape($desc_fourn)."',";
-                $sql .= " ".$user->id.",";
-                $sql .= " ".$buyprice.",";
-                $sql .= " ".$qty.",";
-                $sql .= " ".$remise_percent.",";
-                $sql .= " ".$remise.",";
-                $sql .= " ".$unitBuyPrice.",";
-                $sql .= " ".$tva_tx.",";
-                $sql .= " ".$charges.",";
-                $sql .= " ".$availability.",";
-                $sql .= " ".($newdefaultvatcode ? "'".$this->db->escape($newdefaultvatcode)."'" : "null").",";
-                $sql .= " ".$newnpr.",";
-                $sql .= $conf->entity.",";
-                $sql .= ($delivery_time_days != '' ? $delivery_time_days : 'null').",";
-                $sql .= (empty($supplier_reputation) ? 'NULL' : "'".$this->db->escape($supplier_reputation)."'").",";
-                $sql .= (empty($barcode) ? 'NULL' : "'".$this->db->escape($barcode)."'").",";
-                $sql .= (empty($fk_barcode_type) ? 'NULL' : "'".$this->db->escape($fk_barcode_type)."'");
+				$sql .= " values(";
+				$sql .= (isset($multicurrency_buyprice) ? "'".$this->db->escape(price2num($multicurrency_buyprice))."'" : 'null').",";
+				$sql .= (isset($multicurrency_unitBuyPrice) ? "'".$this->db->escape(price2num($multicurrency_unitBuyPrice))."'" : 'null').",";
+				$sql .= (isset($multicurrency_tx) ? "'".$this->db->escape($multicurrency_tx)."'" : '1').",";
+				$sql .= (isset($fk_multicurrency) ? "'".$this->db->escape($fk_multicurrency)."'" : 'null').",";
+				$sql .= (isset($multicurrency_code) ? "'".$this->db->escape($multicurrency_code)."'" : 'null').",";
+				$sql .= " '".$this->db->idate($now)."',";
+				$sql .= " ".$this->id.",";
+				$sql .= " ".$fourn->id.",";
+				$sql .= " '".$this->db->escape($ref_fourn)."',";
+				$sql .= " '".$this->db->escape($desc_fourn)."',";
+				$sql .= " ".$user->id.",";
+				$sql .= " ".$buyprice.",";
+				$sql .= " ".$qty.",";
+				$sql .= " ".$remise_percent.",";
+				$sql .= " ".$remise.",";
+				$sql .= " ".$unitBuyPrice.",";
+				$sql .= " ".$tva_tx.",";
+				$sql .= " ".$charges.",";
+				$sql .= " ".$availability.",";
+				$sql .= " ".($newdefaultvatcode ? "'".$this->db->escape($newdefaultvatcode)."'" : "null").",";
+				$sql .= " ".$newnpr.",";
+				$sql .= $conf->entity.",";
+				$sql .= ($delivery_time_days != '' ? $delivery_time_days : 'null').",";
+				$sql .= (empty($supplier_reputation) ? 'NULL' : "'".$this->db->escape($supplier_reputation)."'").",";
+				$sql .= (empty($barcode) ? 'NULL' : "'".$this->db->escape($barcode)."'").",";
+				$sql .= (empty($fk_barcode_type) ? 'NULL' : "'".$this->db->escape($fk_barcode_type)."'");
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) $sql .= ", ".(empty($this->packaging) ? 1 : $this->db->escape($this->packaging));
-                $sql .= ")";
+				$sql .= ")";
 
 				$this->product_fourn_price_id = 0;
 
-                $resql = $this->db->query($sql);
-                if ($resql) {
-                    $this->product_fourn_price_id = $this->db->last_insert_id(MAIN_DB_PREFIX."product_fournisseur_price");
-                } else {
-                    $error++;
-                }
+				$resql = $this->db->query($sql);
+				if ($resql) {
+					$this->product_fourn_price_id = $this->db->last_insert_id(MAIN_DB_PREFIX."product_fournisseur_price");
+				} else {
+					$error++;
+				}
 
-                if (!$error && empty($conf->global->PRODUCT_PRICE_SUPPLIER_NO_LOG)) {
-                    // Add record into log table
+				if (!$error && empty($conf->global->PRODUCT_PRICE_SUPPLIER_NO_LOG)) {
+					// Add record into log table
 					// $this->product_fourn_price_id must be set
-                    $result = $this->logPrice($user, $now, $buyprice, $qty, $multicurrency_buyprice, $multicurrency_unitBuyPrice, $multicurrency_tx, $fk_multicurrency, $multicurrency_code);
-                    if ($result < 0) {
-                        $error++;
-                    }
-                }
+					$result = $this->logPrice($user, $now, $buyprice, $qty, $multicurrency_buyprice, $multicurrency_unitBuyPrice, $multicurrency_tx, $fk_multicurrency, $multicurrency_code);
+					if ($result < 0) {
+						$error++;
+					}
+				}
 
-                if (!$error) {
-                    // Call trigger
-                    $result = $this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_CREATE', $user);
-                    if ($result < 0)
-                        $error++;
-                        // End call triggers
+				if (!$error) {
+					// Call trigger
+					$result = $this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_CREATE', $user);
+					if ($result < 0)
+						$error++;
+						// End call triggers
 
-                    if (empty($error)) {
-                        $this->db->commit();
-                        return $this->product_fourn_price_id;
-                    } else {
-                        $this->db->rollback();
-                        return -1;
-                    }
-                } else {
-                    $this->error = $this->db->lasterror()." sql=".$sql;
-                    $this->db->rollback();
-                    return -2;
-                }
-            } else {
-                $this->error = $this->db->lasterror()." sql=".$sql;
-                $this->db->rollback();
-                return -1;
-            }
-        }
-    }
+					if (empty($error)) {
+						$this->db->commit();
+						return $this->product_fourn_price_id;
+					} else {
+						$this->db->rollback();
+						return -1;
+					}
+				} else {
+					$this->error = $this->db->lasterror()." sql=".$sql;
+					$this->db->rollback();
+					return -2;
+				}
+			} else {
+				$this->error = $this->db->lasterror()." sql=".$sql;
+				$this->db->rollback();
+				return -1;
+			}
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Loads the price information of a provider
-     *
-     *    @param    int     $rowid              Line id
-     *    @param    int     $ignore_expression  Ignores the math expression for calculating price and uses the db value instead
-     *    @return   int 					    < 0 if KO, 0 if OK but not found, > 0 if OK
-     */
-    public function fetch_product_fournisseur_price($rowid, $ignore_expression = 0)
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Loads the price information of a provider
+	 *
+	 *    @param    int     $rowid              Line id
+	 *    @param    int     $ignore_expression  Ignores the math expression for calculating price and uses the db value instead
+	 *    @return   int 					    < 0 if KO, 0 if OK but not found, > 0 if OK
+	 */
+	public function fetch_product_fournisseur_price($rowid, $ignore_expression = 0)
+	{
+		// phpcs:enable
+		global $conf;
 
-        $sql = "SELECT pfp.rowid, pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.default_vat_code, pfp.info_bits as fourn_tva_npr, pfp.fk_availability,";
-        $sql .= " pfp.fk_soc, pfp.ref_fourn, pfp.desc_fourn, pfp.fk_product, pfp.charges, pfp.fk_supplier_price_expression, pfp.delivery_time_days,";
-        $sql .= " pfp.supplier_reputation, pfp.fk_user, pfp.datec,";
-        $sql .= " pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code,";
-        $sql .= "  pfp.barcode, pfp.fk_barcode_type";
-		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) $sql .= ", pfp.packaging";
-        $sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
-        $sql .= " WHERE pfp.rowid = ".(int) $rowid;
+		$sql = "SELECT pfp.rowid, pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.default_vat_code, pfp.info_bits as fourn_tva_npr, pfp.fk_availability,";
+		$sql .= " pfp.fk_soc, pfp.ref_fourn, pfp.desc_fourn, pfp.fk_product, pfp.charges, pfp.fk_supplier_price_expression, pfp.delivery_time_days,";
+		$sql .= " pfp.supplier_reputation, pfp.fk_user, pfp.datec,";
+		$sql .= " pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code,";
+		$sql .= " pfp.barcode, pfp.fk_barcode_type, pfp.packaging,";
+		$sql .= " p.ref as product_ref";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp, ".MAIN_DB_PREFIX."product as p";
+		$sql .= " WHERE pfp.rowid = ".(int) $rowid;
+		$sql .= " AND pfp.fk_product = p.rowid";
 
-        dol_syslog(get_class($this)."::fetch_product_fournisseur_price", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            if ($obj)
-            {
-            	$this->product_fourn_price_id = $rowid;
-            	$this->id = $obj->fk_product;
-            	$this->fk_product				= $obj->fk_product;
-            	$this->product_id				= $obj->fk_product; // deprecated
-            	$this->fourn_id					= $obj->fk_soc;
-            	$this->fourn_ref				= $obj->ref_fourn; // deprecated
-	            $this->ref_supplier             = $obj->ref_fourn;
-	            $this->desc_supplier            = $obj->desc_fourn;
-            	$this->fourn_price = $obj->price;
-            	$this->fourn_charges            = $obj->charges; // deprecated
-            	$this->fourn_qty                = $obj->quantity;
-            	$this->fourn_remise_percent     = $obj->remise_percent;
-            	$this->fourn_remise             = $obj->remise;
-            	$this->fourn_unitprice          = $obj->unitprice;
-            	$this->fourn_tva_tx				= $obj->tva_tx;
-            	$this->fourn_tva_npr			= $obj->fourn_tva_npr;
-            	// Add also localtaxes
-            	$this->fk_availability = $obj->fk_availability;
+		dol_syslog(get_class($this)."::fetch_product_fournisseur_price", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($obj)
+			{
+				$this->product_fourn_price_id = $rowid;
+				$this->id = $obj->fk_product;
+
+				$this->fk_product				= $obj->fk_product;
+				$this->product_id				= $obj->fk_product;
+				$this->product_ref				= $obj->product_ref;
+
+				$this->fourn_id					= $obj->fk_soc;
+				$this->fourn_ref				= $obj->ref_fourn; // deprecated
+				$this->ref_supplier             = $obj->ref_fourn;
+				$this->desc_supplier            = $obj->desc_fourn;
+				$this->fourn_price = $obj->price;
+				$this->fourn_charges            = $obj->charges; // deprecated
+				$this->fourn_qty                = $obj->quantity;
+				$this->fourn_remise_percent     = $obj->remise_percent;
+				$this->fourn_remise             = $obj->remise;
+				$this->fourn_unitprice          = $obj->unitprice;
+				$this->fourn_tva_tx				= $obj->tva_tx;
+				$this->fourn_tva_npr			= $obj->fourn_tva_npr;
+				// Add also localtaxes
+				$this->fk_availability = $obj->fk_availability;
 				$this->delivery_time_days = $obj->delivery_time_days;
-                $this->fk_supplier_price_expression = $obj->fk_supplier_price_expression;
-                $this->supplier_reputation      = $obj->supplier_reputation;
-                $this->default_vat_code         = $obj->default_vat_code;
-                $this->user_id                  = $obj->fk_user;
-                $this->date_creation            = $this->db->jdate($obj->datec);
-                $this->fourn_multicurrency_price       = $obj->multicurrency_price;
-                $this->fourn_multicurrency_unitprice   = $obj->multicurrency_unitprice;
-                $this->fourn_multicurrency_tx          = $obj->multicurrency_tx;
-                $this->fourn_multicurrency_id          = $obj->fk_multicurrency;
-                $this->fourn_multicurrency_code        = $obj->multicurrency_code;
-                if ($conf->barcode->enabled) {
-                    $this->fourn_barcode = $obj->barcode;
-                    $this->fourn_fk_barcode_type = $obj->fk_barcode_type;
-                }
+				$this->fk_supplier_price_expression = $obj->fk_supplier_price_expression;
+				$this->supplier_reputation      = $obj->supplier_reputation;
+				$this->default_vat_code         = $obj->default_vat_code;
+				$this->user_id                  = $obj->fk_user;
+				$this->date_creation            = $this->db->jdate($obj->datec);
+				$this->fourn_multicurrency_price       = $obj->multicurrency_price;
+				$this->fourn_multicurrency_unitprice   = $obj->multicurrency_unitprice;
+				$this->fourn_multicurrency_tx          = $obj->multicurrency_tx;
+				$this->fourn_multicurrency_id          = $obj->fk_multicurrency;
+				$this->fourn_multicurrency_code        = $obj->multicurrency_code;
+				if ($conf->barcode->enabled) {
+					$this->fourn_barcode = $obj->barcode; // deprecated
+					$this->fourn_fk_barcode_type = $obj->fk_barcode_type; // deprecated
+					$this->supplier_barcode = $obj->barcode;
+					$this->supplier_fk_barcode_type = $obj->fk_barcode_type;
+				}
 
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
 					$this->packaging = $obj->packaging;
 					if ($this->packaging < $this->fourn_qty) $this->packaging = $this->fourn_qty;
 				}
 
-                if (empty($ignore_expression) && !empty($this->fk_supplier_price_expression))
-                {
-                    $priceparser = new PriceParser($this->db);
-                    $price_result = $priceparser->parseProductSupplier($this);
-                    if ($price_result >= 0) {
-                    	$this->fourn_price = $price_result;
-                    	//recalculation of unitprice, as probably the price changed...
-	                    if ($this->fourn_qty != 0)
-	                    {
-	                        $this->fourn_unitprice = price2num($this->fourn_price / $this->fourn_qty, 'MU');
-	                    } else {
-	                        $this->fourn_unitprice = "";
-	                    }
-                    }
-                }
+				if (empty($ignore_expression) && !empty($this->fk_supplier_price_expression))
+				{
+					$priceparser = new PriceParser($this->db);
+					$price_result = $priceparser->parseProductSupplier($this);
+					if ($price_result >= 0) {
+						$this->fourn_price = $price_result;
+						//recalculation of unitprice, as probably the price changed...
+						if ($this->fourn_qty != 0)
+						{
+							$this->fourn_unitprice = price2num($this->fourn_price / $this->fourn_qty, 'MU');
+						} else {
+							$this->fourn_unitprice = "";
+						}
+					}
+				}
 
-            	return 1;
-            } else {
-                return 0;
-            }
-        } else {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    List all supplier prices of a product
-     *
-     *    @param    int		$prodid	    Id of product
-     *    @param	string	$sortfield	Sort field
-     *    @param	string	$sortorder	Sort order
-     *    @param	int		$limit		Limit
-     *    @param	int		$offset		Offset
-     *    @return	array				Array of Products with new properties to define supplier price
-     */
-    public function list_product_fournisseur_price($prodid, $sortfield = '', $sortorder = '', $limit = 0, $offset = 0)
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    List all supplier prices of a product
+	 *
+	 *    @param    int		$prodid	    Id of product
+	 *    @param	string	$sortfield	Sort field
+	 *    @param	string	$sortorder	Sort order
+	 *    @param	int		$limit		Limit
+	 *    @param	int		$offset		Offset
+	 *    @return	array				Array of Products with new properties to define supplier price
+	 */
+	public function list_product_fournisseur_price($prodid, $sortfield = '', $sortorder = '', $limit = 0, $offset = 0)
+	{
+		// phpcs:enable
+		global $conf;
 
-        $sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id,";
-        $sql .= " pfp.rowid as product_fourn_pri_id, pfp.entity, pfp.ref_fourn, pfp.desc_fourn, pfp.fk_product as product_fourn_id, pfp.fk_supplier_price_expression,";
-        $sql .= " pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.fk_availability, pfp.charges, pfp.info_bits, pfp.delivery_time_days, pfp.supplier_reputation,";
-        $sql .= " pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code, pfp.datec, pfp.tms,";
-        $sql .= " pfp.barcode, pfp.fk_barcode_type";
+		$sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id, p.ref as product_ref,";
+		$sql .= " pfp.rowid as product_fourn_pri_id, pfp.entity, pfp.ref_fourn, pfp.desc_fourn, pfp.fk_product as product_fourn_id, pfp.fk_supplier_price_expression,";
+		$sql .= " pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.fk_availability, pfp.charges, pfp.info_bits, pfp.delivery_time_days, pfp.supplier_reputation,";
+		$sql .= " pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code, pfp.datec, pfp.tms,";
+		$sql .= " pfp.barcode, pfp.fk_barcode_type";
 		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) $sql .= ", pfp.packaging";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp, ".MAIN_DB_PREFIX."societe as s";
-        $sql .= " WHERE pfp.entity IN (".getEntity('productsupplierprice').")";
-        $sql .= " AND pfp.fk_soc = s.rowid";
-        $sql .= " AND s.status=1"; // only enabled company selected
-        $sql .= " AND pfp.fk_product = ".$prodid;
-        if (empty($sortfield)) $sql .= " ORDER BY s.nom, pfp.quantity, pfp.price";
-        else $sql .= $this->db->order($sortfield, $sortorder);
-        $sql .= $this->db->plimit($limit, $offset);
-        dol_syslog(get_class($this)."::list_product_fournisseur_price", LOG_DEBUG);
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp, ".MAIN_DB_PREFIX."product as p, ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " WHERE pfp.entity IN (".getEntity('productsupplierprice').")";
+		$sql .= " AND pfp.fk_soc = s.rowid AND pfp.fk_product = p.rowid";
+		$sql .= " AND s.status=1"; // only enabled company selected
+		$sql .= " AND pfp.fk_product = ".$prodid;
+		if (empty($sortfield)) $sql .= " ORDER BY s.nom, pfp.quantity, pfp.price";
+		else $sql .= $this->db->order($sortfield, $sortorder);
+		$sql .= $this->db->plimit($limit, $offset);
+		dol_syslog(get_class($this)."::list_product_fournisseur_price", LOG_DEBUG);
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $retarray = array();
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$retarray = array();
 
-            while ($record = $this->db->fetch_array($resql))
-            {
-                //define base attribute
-                $prodfourn = new ProductFournisseur($this->db);
+			while ($record = $this->db->fetch_array($resql))
+			{
+				//define base attribute
+				$prodfourn = new ProductFournisseur($this->db);
 
-                $prodfourn->product_fourn_price_id = $record["product_fourn_pri_id"];
-                $prodfourn->product_fourn_id = $record["product_fourn_id"];
-                $prodfourn->product_fourn_entity = $record["entity"];
-                $prodfourn->fourn_ref = $record["ref_fourn"];
-                $prodfourn->ref_supplier			= $record["ref_fourn"];
-                $prodfourn->desc_supplier = $record["desc_fourn"];
-                $prodfourn->fourn_price				= $record["price"];
-                $prodfourn->fourn_qty = $record["quantity"];
+				$prodfourn->product_ref = $record["product_ref"];
+				$prodfourn->product_fourn_price_id = $record["product_fourn_pri_id"];
+				$prodfourn->product_fourn_id = $record["product_fourn_id"];
+				$prodfourn->product_fourn_entity = $record["entity"];
+				$prodfourn->ref_supplier			= $record["ref_fourn"];
+				$prodfourn->fourn_ref = $record["ref_fourn"];
+				$prodfourn->desc_supplier = $record["desc_fourn"];
+				$prodfourn->fourn_price				= $record["price"];
+				$prodfourn->fourn_qty = $record["quantity"];
 				$prodfourn->fourn_remise_percent = $record["remise_percent"];
 				$prodfourn->fourn_remise = $record["remise"];
 				$prodfourn->fourn_unitprice = $record["unitprice"];
-				$prodfourn->fourn_charges           = $record["charges"]; // deprecated
-                $prodfourn->fourn_tva_tx = $record["tva_tx"];
-                $prodfourn->fourn_id				= $record["fourn_id"];
-                $prodfourn->fourn_name = $record["supplier_name"];
-                $prodfourn->fk_availability			= $record["fk_availability"];
-				$prodfourn->delivery_time_days		= $record["delivery_time_days"];
-                $prodfourn->id						= $prodid;
-                $prodfourn->fourn_tva_npr					= $record["info_bits"];
-                $prodfourn->fk_supplier_price_expression = $record["fk_supplier_price_expression"];
+				$prodfourn->fourn_charges = $record["charges"]; // deprecated
+				$prodfourn->fourn_tva_tx = $record["tva_tx"];
+				$prodfourn->fourn_id = $record["fourn_id"];
+				$prodfourn->fourn_name = $record["supplier_name"];
+				$prodfourn->fk_availability			= $record["fk_availability"];
+				$prodfourn->delivery_time_days = $record["delivery_time_days"];
+				$prodfourn->id = $prodid;
+				$prodfourn->fourn_tva_npr					= $record["info_bits"];
+				$prodfourn->fk_supplier_price_expression = $record["fk_supplier_price_expression"];
 				$prodfourn->supplier_reputation = $record["supplier_reputation"];
 				$prodfourn->fourn_date_creation          = $this->db->jdate($record['datec']);
 				$prodfourn->fourn_date_modification      = $this->db->jdate($record['tms']);
 
-                $prodfourn->fourn_multicurrency_price       = $record["multicurrency_price"];
-                $prodfourn->fourn_multicurrency_unitprice   = $record["multicurrency_unitprice"];
-                $prodfourn->fourn_multicurrency_tx          = $record["multicurrency_tx"];
-                $prodfourn->fourn_multicurrency_id          = $record["fk_multicurrency"];
-                $prodfourn->fourn_multicurrency_code        = $record["multicurrency_code"];
+				$prodfourn->fourn_multicurrency_price       = $record["multicurrency_price"];
+				$prodfourn->fourn_multicurrency_unitprice   = $record["multicurrency_unitprice"];
+				$prodfourn->fourn_multicurrency_tx          = $record["multicurrency_tx"];
+				$prodfourn->fourn_multicurrency_id          = $record["fk_multicurrency"];
+				$prodfourn->fourn_multicurrency_code        = $record["multicurrency_code"];
 
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
 					$prodfourn->packaging = $record["packaging"];
 					if ($prodfourn->packaging < $prodfourn->fourn_qty) $prodfourn->packaging = $prodfourn->fourn_qty;
 				}
 
-                if ($conf->barcode->enabled) {
-                    $prodfourn->barcode = $record["barcode"];
-                    $prodfourn->fk_barcode_type = $record["fk_barcode_type"];
-                }
+				if ($conf->barcode->enabled) {
+					$prodfourn->supplier_barcode = $record["barcode"];
+					$prodfourn->supplier_fk_barcode_type = $record["fk_barcode_type"];
+				}
 
-                if (!empty($conf->dynamicprices->enabled) && !empty($prodfourn->fk_supplier_price_expression)) {
-                    $priceparser = new PriceParser($this->db);
-                    $price_result = $priceparser->parseProductSupplier($prodfourn);
-                    if ($price_result >= 0) {
-                    	$prodfourn->fourn_price = $price_result;
-                    	$prodfourn->fourn_unitprice = null; //force recalculation of unitprice, as probably the price changed...
-                    }
-                }
+				if (!empty($conf->dynamicprices->enabled) && !empty($prodfourn->fk_supplier_price_expression)) {
+					$priceparser = new PriceParser($this->db);
+					$price_result = $priceparser->parseProductSupplier($prodfourn);
+					if ($price_result >= 0) {
+						$prodfourn->fourn_price = $price_result;
+						$prodfourn->fourn_unitprice = null; //force recalculation of unitprice, as probably the price changed...
+					}
+				}
 
-                if (!isset($prodfourn->fourn_unitprice))
-                {
-                    if ($prodfourn->fourn_qty != 0)
-                    {
-                        $prodfourn->fourn_unitprice = price2num($prodfourn->fourn_price / $prodfourn->fourn_qty, 'MU');
-                    } else {
-                        $prodfourn->fourn_unitprice = "";
-                    }
-                }
+				if (!isset($prodfourn->fourn_unitprice))
+				{
+					if ($prodfourn->fourn_qty != 0)
+					{
+						$prodfourn->fourn_unitprice = price2num($prodfourn->fourn_price / $prodfourn->fourn_qty, 'MU');
+					} else {
+						$prodfourn->fourn_unitprice = "";
+					}
+				}
 
-                $retarray[] = $prodfourn;
-            }
+				$retarray[] = $prodfourn;
+			}
 
-            $this->db->free($resql);
-            return $retarray;
-        } else {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+			$this->db->free($resql);
+			return $retarray;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Load properties for minimum price
-     *
-     *  @param	int		$prodid	    Product id
-     *  @param	int		$qty		Minimum quantity
-     *  @param	int		$socid		get min price for specific supplier
-     *  @return int					<0 if KO, 0=Not found of no product id provided, >0 if OK
-     */
-    public function find_min_price_product_fournisseur($prodid, $qty = 0, $socid = 0)
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Load properties for minimum price
+	 *
+	 *  @param	int		$prodid	    Product id
+	 *  @param	int		$qty		Minimum quantity
+	 *  @param	int		$socid		get min price for specific supplier
+	 *  @return int					<0 if KO, 0=Not found of no product id provided, >0 if OK
+	 */
+	public function find_min_price_product_fournisseur($prodid, $qty = 0, $socid = 0)
+	{
+		// phpcs:enable
+		global $conf;
 
-        if (empty($prodid))
-        {
-        	dol_syslog("Warning function find_min_price_product_fournisseur were called with prodid empty. May be a bug.", LOG_WARNING);
-        	return 0;
-        }
+		if (empty($prodid))
+		{
+			dol_syslog("Warning function find_min_price_product_fournisseur were called with prodid empty. May be a bug.", LOG_WARNING);
+			return 0;
+		}
 
-        $this->product_fourn_price_id = '';
-        $this->product_fourn_id       = '';
-        $this->fourn_ref              = '';
-        $this->fourn_price            = '';
-        $this->fourn_qty              = '';
-        $this->fourn_remise_percent   = '';
-        $this->fourn_remise           = '';
-        $this->fourn_unitprice        = '';
-        $this->fourn_id               = '';
-        $this->fourn_name             = '';
+		$this->product_fourn_price_id = '';
+		$this->product_fourn_id       = '';
+		$this->fourn_ref              = '';
+		$this->fourn_price            = '';
+		$this->fourn_qty              = '';
+		$this->fourn_remise_percent   = '';
+		$this->fourn_remise           = '';
+		$this->fourn_unitprice        = '';
+		$this->fourn_id               = '';
+		$this->fourn_name             = '';
 		$this->delivery_time_days = '';
-        $this->id                     = '';
+		$this->id                     = '';
 
-        $this->fourn_multicurrency_price       = '';
-        $this->fourn_multicurrency_unitprice   = '';
-        $this->fourn_multicurrency_tx          = '';
-        $this->fourn_multicurrency_id          = '';
-        $this->fourn_multicurrency_code        = '';
+		$this->fourn_multicurrency_price       = '';
+		$this->fourn_multicurrency_unitprice   = '';
+		$this->fourn_multicurrency_tx          = '';
+		$this->fourn_multicurrency_id          = '';
+		$this->fourn_multicurrency_code        = '';
 
-        $sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id,";
-        $sql .= " pfp.rowid as product_fourn_price_id, pfp.ref_fourn,";
-        $sql .= " pfp.price, pfp.quantity, pfp.unitprice, pfp.tva_tx, pfp.charges,";
-        $sql .= " pfp.remise, pfp.remise_percent, pfp.fk_supplier_price_expression, pfp.delivery_time_days";
-        $sql .= " ,pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code";
-        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
-        $sql .= " WHERE s.entity IN (".getEntity('societe').")";
-        $sql .= " AND pfp.entity = ".$conf->entity; // only current entity
-        $sql .= " AND pfp.fk_product = ".$prodid;
-        $sql .= " AND pfp.fk_soc = s.rowid";
-        $sql .= " AND s.status = 1"; // only enabled society
-        if ($qty > 0) $sql .= " AND pfp.quantity <= ".$qty;
+		$sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id,";
+		$sql .= " pfp.rowid as product_fourn_price_id, pfp.ref_fourn,";
+		$sql .= " pfp.price, pfp.quantity, pfp.unitprice, pfp.tva_tx, pfp.charges,";
+		$sql .= " pfp.remise, pfp.remise_percent, pfp.fk_supplier_price_expression, pfp.delivery_time_days";
+		$sql .= " ,pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
+		$sql .= " WHERE s.entity IN (".getEntity('societe').")";
+		$sql .= " AND pfp.entity = ".$conf->entity; // only current entity
+		$sql .= " AND pfp.fk_product = ".$prodid;
+		$sql .= " AND pfp.fk_soc = s.rowid";
+		$sql .= " AND s.status = 1"; // only enabled society
+		if ($qty > 0) $sql .= " AND pfp.quantity <= ".$qty;
 		if ($socid > 0) $sql .= ' AND pfp.fk_soc = '.$socid;
 
-        dol_syslog(get_class($this)."::find_min_price_product_fournisseur", LOG_DEBUG);
+		dol_syslog(get_class($this)."::find_min_price_product_fournisseur", LOG_DEBUG);
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $record_array = array();
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$record_array = array();
 
-            //Store each record to array for later search of min
-            while ($record = $this->db->fetch_array($resql))
-            {
-                $record_array[] = $record;
-            }
+			//Store each record to array for later search of min
+			while ($record = $this->db->fetch_array($resql))
+			{
+				$record_array[] = $record;
+			}
 
-            if (count($record_array) == 0)
-            {
-                $this->db->free($resql);
-                return 0;
-            } else {
-                $min = -1;
-                foreach ($record_array as $record)
-                {
-                    $fourn_price = $record["price"];
-                    // discount calculated buy price
-                    $fourn_unitprice = $record["unitprice"] * (1 - $record["remise_percent"] / 100) - $record["remise"];
-                    if (!empty($conf->dynamicprices->enabled) && !empty($record["fk_supplier_price_expression"])) {
-                        $prod_supplier = new ProductFournisseur($this->db);
-                        $prod_supplier->product_fourn_price_id = $record["product_fourn_price_id"];
-                        $prod_supplier->id = $prodid;
-                        $prod_supplier->fourn_qty = $record["quantity"];
-                        $prod_supplier->fourn_tva_tx = $record["tva_tx"];
-                        $prod_supplier->fk_supplier_price_expression = $record["fk_supplier_price_expression"];
-                        $priceparser = new PriceParser($this->db);
-                        $price_result = $priceparser->parseProductSupplier($prod_supplier);
-                        if ($price_result >= 0) {
-                            $fourn_price = price2num($price_result, 'MU');
-                            if ($record["quantity"] != 0)
-                            {
-                                $fourn_unitprice = price2num($fourn_price / $record["quantity"], 'MU');
-                            } else {
-                                $fourn_unitprice = $fourn_price;
-                            }
-                        }
-                    }
-                    if ($fourn_unitprice < $min || $min == -1)
-                    {
-                        $this->product_fourn_price_id   = $record["product_fourn_price_id"];
-                        $this->ref_supplier             = $record["ref_fourn"];
-                        $this->ref_fourn                = $record["ref_fourn"]; // deprecated
-                        $this->fourn_ref                = $record["ref_fourn"]; // deprecated
-                        $this->fourn_price              = $fourn_price;
-                        $this->fourn_qty                = $record["quantity"];
-                        $this->fourn_remise_percent     = $record["remise_percent"];
-                        $this->fourn_remise             = $record["remise"];
-                        $this->fourn_unitprice          = $record["unitprice"];
-                        $this->fourn_charges            = $record["charges"]; // deprecated
-                        $this->fourn_tva_tx             = $record["tva_tx"];
-                        $this->fourn_id                 = $record["fourn_id"];
-                        $this->fourn_name               = $record["supplier_name"];
+			if (count($record_array) == 0)
+			{
+				$this->db->free($resql);
+				return 0;
+			} else {
+				$min = -1;
+				foreach ($record_array as $record)
+				{
+					$fourn_price = $record["price"];
+					// discount calculated buy price
+					$fourn_unitprice = $record["unitprice"] * (1 - $record["remise_percent"] / 100) - $record["remise"];
+					if (!empty($conf->dynamicprices->enabled) && !empty($record["fk_supplier_price_expression"])) {
+						$prod_supplier = new ProductFournisseur($this->db);
+						$prod_supplier->product_fourn_price_id = $record["product_fourn_price_id"];
+						$prod_supplier->id = $prodid;
+						$prod_supplier->fourn_qty = $record["quantity"];
+						$prod_supplier->fourn_tva_tx = $record["tva_tx"];
+						$prod_supplier->fk_supplier_price_expression = $record["fk_supplier_price_expression"];
+						$priceparser = new PriceParser($this->db);
+						$price_result = $priceparser->parseProductSupplier($prod_supplier);
+						if ($price_result >= 0) {
+							$fourn_price = price2num($price_result, 'MU');
+							if ($record["quantity"] != 0)
+							{
+								$fourn_unitprice = price2num($fourn_price / $record["quantity"], 'MU');
+							} else {
+								$fourn_unitprice = $fourn_price;
+							}
+						}
+					}
+					if ($fourn_unitprice < $min || $min == -1)
+					{
+						$this->product_fourn_price_id   = $record["product_fourn_price_id"];
+						$this->ref_supplier             = $record["ref_fourn"];
+						$this->ref_fourn                = $record["ref_fourn"]; // deprecated
+						$this->fourn_ref                = $record["ref_fourn"]; // deprecated
+						$this->fourn_price              = $fourn_price;
+						$this->fourn_qty                = $record["quantity"];
+						$this->fourn_remise_percent     = $record["remise_percent"];
+						$this->fourn_remise             = $record["remise"];
+						$this->fourn_unitprice          = $record["unitprice"];
+						$this->fourn_charges            = $record["charges"]; // deprecated
+						$this->fourn_tva_tx             = $record["tva_tx"];
+						$this->fourn_id                 = $record["fourn_id"];
+						$this->fourn_name               = $record["supplier_name"];
 						$this->delivery_time_days = $record["delivery_time_days"];
-                        $this->fk_supplier_price_expression = $record["fk_supplier_price_expression"];
-                        $this->id                       = $prodid;
-                        $this->fourn_multicurrency_price       = $record["multicurrency_price"];
-                        $this->fourn_multicurrency_unitprice   = $record["multicurrency_unitprice"];
-                        $this->fourn_multicurrency_tx          = $record["multicurrency_tx"];
-                        $this->fourn_multicurrency_id          = $record["fk_multicurrency"];
-                        $this->fourn_multicurrency_code        = $record["multicurrency_code"];
-                        $min = $fourn_unitprice;
-                    }
-                }
-            }
+						$this->fk_supplier_price_expression = $record["fk_supplier_price_expression"];
+						$this->id                       = $prodid;
+						$this->fourn_multicurrency_price       = $record["multicurrency_price"];
+						$this->fourn_multicurrency_unitprice   = $record["multicurrency_unitprice"];
+						$this->fourn_multicurrency_tx          = $record["multicurrency_tx"];
+						$this->fourn_multicurrency_id          = $record["fk_multicurrency"];
+						$this->fourn_multicurrency_code        = $record["multicurrency_code"];
+						$min = $fourn_unitprice;
+					}
+				}
+			}
 
-            $this->db->free($resql);
-            return 1;
-        } else {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+			$this->db->free($resql);
+			return 1;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
-    /**
-     *  Sets the supplier price expression
-     *
-     *  @param  int     $expression_id	Expression
-     *  @return int                 	<0 if KO, >0 if OK
-     */
-    public function setSupplierPriceExpression($expression_id)
-    {
-        global $conf;
+	/**
+	 *  Sets the supplier price expression
+	 *
+	 *  @param  int     $expression_id	Expression
+	 *  @return int                 	<0 if KO, >0 if OK
+	 */
+	public function setSupplierPriceExpression($expression_id)
+	{
+		global $conf;
 
-        // Clean parameters
-        $this->db->begin();
-        $expression_id = $expression_id != 0 ? $expression_id : 'NULL';
+		// Clean parameters
+		$this->db->begin();
+		$expression_id = $expression_id != 0 ? $expression_id : 'NULL';
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price";
-        $sql .= " SET fk_supplier_price_expression = ".$expression_id;
-        $sql .= " WHERE rowid = ".$this->product_fourn_price_id;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price";
+		$sql .= " SET fk_supplier_price_expression = ".$expression_id;
+		$sql .= " WHERE rowid = ".$this->product_fourn_price_id;
 
-        dol_syslog(get_class($this)."::setSupplierPriceExpression", LOG_DEBUG);
+		dol_syslog(get_class($this)."::setSupplierPriceExpression", LOG_DEBUG);
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $this->db->commit();
-            return 1;
-        } else {
-            $this->error = $this->db->error()." sql=".$sql;
-            $this->db->rollback();
-            return -1;
-        }
-    }
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->error = $this->db->error()." sql=".$sql;
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
-    /**
-     *	Display supplier of product
-     *
-     *	@param	int		$withpicto		Add picto
-     *	@param	string	$option			Target of link ('', 'customer', 'prospect', 'supplier')
-     *	@param	int		$maxlen			Max length of name
-     *  @param	integer	$notooltip		1=Disable tooltip
-     *	@return	string					String with supplier price
+	/**
+	 *	Display supplier of product
+	 *
+	 *	@param	int		$withpicto		Add picto
+	 *	@param	string	$option			Target of link ('', 'customer', 'prospect', 'supplier')
+	 *	@param	int		$maxlen			Max length of name
+	 *  @param	integer	$notooltip		1=Disable tooltip
+	 *	@return	string					String with supplier price
 	 *  TODO Remove this method. Use getNomUrl directly.
-     */
-    public function getSocNomUrl($withpicto = 0, $option = 'supplier', $maxlen = 0, $notooltip = 0)
-    {
-        $thirdparty = new Fournisseur($this->db);
-        $thirdparty->fetch($this->fourn_id);
+	 */
+	public function getSocNomUrl($withpicto = 0, $option = 'supplier', $maxlen = 0, $notooltip = 0)
+	{
+		$thirdparty = new Fournisseur($this->db);
+		$thirdparty->fetch($this->fourn_id);
 
-        return $thirdparty->getNomUrl($withpicto, $option, $maxlen, $notooltip);
-    }
+		return $thirdparty->getNomUrl($withpicto, $option, $maxlen, $notooltip);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Display price of product
-     *
-     *  @param  int     $showunitprice    Show "Unit price" into output string
-     *  @param  int     $showsuptitle     Show "Supplier" into output string
-     *  @param  int     $maxlen           Max length of name
-     *  @param  integer $notooltip        1=Disable tooltip
-     *  @param  array   $productFournList list of ProductFournisseur objects
-     *                                    to display in table format.
-     *  @return string                    String with supplier price
-     */
-    public function display_price_product_fournisseur($showunitprice = 1, $showsuptitle = 1, $maxlen = 0, $notooltip = 0, $productFournList = array())
-    {
-        // phpcs:enable
-        global $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Display price of product
+	 *
+	 *  @param  int     $showunitprice    Show "Unit price" into output string
+	 *  @param  int     $showsuptitle     Show "Supplier" into output string
+	 *  @param  int     $maxlen           Max length of name
+	 *  @param  integer $notooltip        1=Disable tooltip
+	 *  @param  array   $productFournList list of ProductFournisseur objects
+	 *                                    to display in table format.
+	 *  @return string                    String with supplier price
+	 */
+	public function display_price_product_fournisseur($showunitprice = 1, $showsuptitle = 1, $maxlen = 0, $notooltip = 0, $productFournList = array())
+	{
+		// phpcs:enable
+		global $langs;
 
-        $out = '';
-        $langs->load("suppliers");
-        if (count($productFournList) > 0) {
-            $out .= '<table class="nobordernopadding" width="100%">';
-            $out .= '<tr><td class="liste_titre right">'.($showunitprice ? $langs->trans("Price").' '.$langs->trans("HT") : '').'</td>';
-            $out .= '<td class="liste_titre right">'.($showunitprice ? $langs->trans("QtyMin") : '').'</td>';
-            $out .= '<td class="liste_titre">'.$langs->trans("Supplier").'</td>';
-            $out .= '<td class="liste_titre">'.$langs->trans("SupplierRef").'</td></tr>';
-            foreach ($productFournList as $productFourn) {
-                $out .= '<tr><td class="right">'.($showunitprice ?price($productFourn->fourn_unitprice * (1 - $productFourn->fourn_remise_percent / 100) - $productFourn->fourn_remise) : '').'</td>';
-                $out .= '<td class="right">'.($showunitprice ? $productFourn->fourn_qty : '').'</td>';
-                $out .= '<td>'.$productFourn->getSocNomUrl(1, 'supplier', $maxlen, $notooltip).'</td>';
-                $out .= '<td>'.$productFourn->fourn_ref.'<td></tr>';
-            }
-            $out .= '</table>';
-        } else {
-            $out = ($showunitprice ?price($this->fourn_unitprice * (1 - $this->fourn_remise_percent / 100) + $this->fourn_remise).' '.$langs->trans("HT").' &nbsp; (' : '').($showsuptitle ? $langs->trans("Supplier").': ' : '').$this->getSocNomUrl(1, 'supplier', $maxlen, $notooltip).' / '.$langs->trans("SupplierRef").': '.$this->fourn_ref.($showunitprice ? ')' : '');
-        }
-        return $out;
-    }
+		$out = '';
+		$langs->load("suppliers");
+		if (count($productFournList) > 0) {
+			$out .= '<table class="nobordernopadding" width="100%">';
+			$out .= '<tr><td class="liste_titre right">'.($showunitprice ? $langs->trans("Price").' '.$langs->trans("HT") : '').'</td>';
+			$out .= '<td class="liste_titre right">'.($showunitprice ? $langs->trans("QtyMin") : '').'</td>';
+			$out .= '<td class="liste_titre">'.$langs->trans("Supplier").'</td>';
+			$out .= '<td class="liste_titre">'.$langs->trans("SupplierRef").'</td></tr>';
+			foreach ($productFournList as $productFourn) {
+				$out .= '<tr><td class="right">'.($showunitprice ?price($productFourn->fourn_unitprice * (1 - $productFourn->fourn_remise_percent / 100) - $productFourn->fourn_remise) : '').'</td>';
+				$out .= '<td class="right">'.($showunitprice ? $productFourn->fourn_qty : '').'</td>';
+				$out .= '<td>'.$productFourn->getSocNomUrl(1, 'supplier', $maxlen, $notooltip).'</td>';
+				$out .= '<td>'.$productFourn->fourn_ref.'<td></tr>';
+			}
+			$out .= '</table>';
+		} else {
+			$out = ($showunitprice ?price($this->fourn_unitprice * (1 - $this->fourn_remise_percent / 100) + $this->fourn_remise).' '.$langs->trans("HT").' &nbsp; (' : '').($showsuptitle ? $langs->trans("Supplier").': ' : '').$this->getSocNomUrl(1, 'supplier', $maxlen, $notooltip).' / '.$langs->trans("SupplierRef").': '.$this->fourn_ref.($showunitprice ? ')' : '');
+		}
+		return $out;
+	}
 
-    /**
-     * Function used to replace a thirdparty id with another one.
-     *
-     * @param DoliDB $db Database handler
-     * @param int $origin_id Old thirdparty id
-     * @param int $dest_id New thirdparty id
-     * @return bool
-     */
-    public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
-    {
-        $tables = array(
-            'product_fournisseur_price'
-        );
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old thirdparty id
+	 * @param int $dest_id New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'product_fournisseur_price'
+		);
 
-        return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
-    }
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
 
-    /**
-     *    List supplier prices log of a supplier price
-     *
-     *    @param    int     $product_fourn_price_id Id of supplier price
-     *    @param	string  $sortfield	            Sort field
-     *    @param	string  $sortorder              Sort order
-     *    @param	int     $limit                  Limit
-     *    @param	int     $offset                 Offset
-     *    @return	array   Array of Log prices
-     */
-    public function listProductFournisseurPriceLog($product_fourn_price_id, $sortfield = '', $sortorder = '', $limit = 0, $offset = 0)
-    {
-        $sql = "SELECT";
-        $sql .= " pfpl.rowid, pfp.ref_fourn as supplier_ref, pfpl.datec, u.lastname,";
-        $sql .= " pfpl.price, pfpl.quantity";
-        $sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price_log as pfpl";
-        $sql .= ", ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
-        $sql .= ", ".MAIN_DB_PREFIX."user as u";
-        $sql .= " WHERE pfp.entity IN (".getEntity('productprice').")";
-        $sql .= " AND pfpl.fk_user = u.rowid";
-        $sql .= " AND pfp.rowid = pfpl.fk_product_fournisseur";
-        $sql .= " AND pfpl.fk_product_fournisseur = ".$product_fourn_price_id;
-        if (empty($sortfield)) $sql .= " ORDER BY pfpl.datec";
-        else $sql .= $this->db->order($sortfield, $sortorder);
-        $sql .= $this->db->plimit($limit, $offset);
-        dol_syslog(get_class($this)."::list_product_fournisseur_price_log", LOG_DEBUG);
+	/**
+	 *    List supplier prices log of a supplier price
+	 *
+	 *    @param    int     $product_fourn_price_id Id of supplier price
+	 *    @param	string  $sortfield	            Sort field
+	 *    @param	string  $sortorder              Sort order
+	 *    @param	int     $limit                  Limit
+	 *    @param	int     $offset                 Offset
+	 *    @return	array   Array of Log prices
+	 */
+	public function listProductFournisseurPriceLog($product_fourn_price_id, $sortfield = '', $sortorder = '', $limit = 0, $offset = 0)
+	{
+		$sql = "SELECT";
+		$sql .= " u.lastname,";
+		$sql .= " pfpl.rowid, pfp.ref_fourn as supplier_ref, pfpl.datec,";
+		$sql .= " pfpl.price, pfpl.quantity,";
+		$sql .= " pfpl.fk_multicurrency, pfpl.multicurrency_code, pfpl.multicurrency_tx, pfpl.multicurrency_price, pfpl.multicurrency_unitprice";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price_log as pfpl,";
+		$sql .= " ".MAIN_DB_PREFIX."product_fournisseur_price as pfp,";
+		$sql .= " ".MAIN_DB_PREFIX."user as u";
+		$sql .= " WHERE pfp.entity IN (".getEntity('productprice').")";
+		$sql .= " AND pfpl.fk_user = u.rowid";
+		$sql .= " AND pfp.rowid = pfpl.fk_product_fournisseur";
+		$sql .= " AND pfpl.fk_product_fournisseur = ".$product_fourn_price_id;
+		if (empty($sortfield)) $sql .= " ORDER BY pfpl.datec";
+		else $sql .= $this->db->order($sortfield, $sortorder);
+		$sql .= $this->db->plimit($limit, $offset);
+		dol_syslog(get_class($this)."::list_product_fournisseur_price_log", LOG_DEBUG);
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $retarray = array();
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$retarray = array();
 
-            while ($obj = $this->db->fetch_object($resql))
-            {
-                $tmparray = array();
-                $tmparray['rowid'] = $obj->rowid;
-                $tmparray['supplier_ref'] = $obj->supplier_ref;
-                $tmparray['datec'] = $this->db->jdate($obj->datec);
-                $tmparray['lastname'] = $obj->lastname;
-                $tmparray['price'] = $obj->price;
-                $tmparray['quantity'] = $obj->quantity;
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$tmparray = array();
+				$tmparray['rowid'] = $obj->rowid;
+				$tmparray['supplier_ref'] = $obj->supplier_ref;
+				$tmparray['datec'] = $this->db->jdate($obj->datec);
+				$tmparray['lastname'] = $obj->lastname;
+				$tmparray['price'] = $obj->price;
+				$tmparray['quantity'] = $obj->quantity;
+				$tmparray['fk_multicurrency'] = $obj->fk_multicurrency;
+				$tmparray['multicurrency_code'] = $obj->multicurrency_code;
+				$tmparray['multicurrency_tx'] = $obj->multicurrency_tx;
+				$tmparray['multicurrency_price'] = $obj->multicurrency_price;
+				$tmparray['multicurrency_unitprice'] = $obj->multicurrency_unitprice;
 
-            	$retarray[] = $tmparray;
-            }
+				$retarray[] = $tmparray;
+			}
 
-            $this->db->free($resql);
-            return $retarray;
-        } else {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+			$this->db->free($resql);
+			return $retarray;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
-    /**
-     *	Display log price of product supplier price
-     *
-     *  @param  array   $productFournLogList    list of ProductFournisseur price log objects
-     *                                          to display in table format.
-     *  @return string  HTML String with supplier price
-     */
-    public function displayPriceProductFournisseurLog($productFournLogList = array())
-    {
-        global $langs;
+	/**
+	 *	Display log price of product supplier price
+	 *
+	 *  @param  array   $productFournLogList    list of ProductFournisseur price log objects
+	 *                                          to display in table format.
+	 *  @return string  HTML String with supplier price
+	 */
+	public function displayPriceProductFournisseurLog($productFournLogList = array())
+	{
+		global $conf, $langs;
 
-        $out = '';
-        $langs->load("suppliers");
-        if (count($productFournLogList) > 0) {
-            $out .= '<table class="nobordernopadding" width="100%">';
-            $out .= '<tr class="liste_titre"><td class="liste_titre">'.$langs->trans("Date").'</td>';
-            $out .= '<td class="liste_titre right">'.$langs->trans("Price").'</td>';
-            //$out .= '<td class="liste_titre right">'.$langs->trans("QtyMin").'</td>';
-            $out .= '<td class="liste_titre">'.$langs->trans("User").'</td></tr>';
-            foreach ($productFournLogList as $productFournLog) {
-                $out .= '<tr><td class="right">'.dol_print_date($productFournLog['datec'], 'dayhour', 'tzuser').'</td>';
-                $out .= '<td class="right">'.price($productFournLog['price']).'</td>';
-                //$out.= '<td class="right">'.$productFournLog['quantity'].'</td>';
-                $out .= '<td>'.$productFournLog['lastname'].'</td></tr>';
-            }
-            $out .= '</table>';
-        }
-        return $out;
-    }
+		$out = '';
+		$langs->load("suppliers");
+		if (count($productFournLogList) > 0) {
+			$out .= '<table class="noborder centpercent">';
+			$out .= '<tr class="liste_titre"><td class="liste_titre">'.$langs->trans("Date").'</td>';
+			$out .= '<td class="liste_titre right">'.$langs->trans("Price").'</td>';
+			//$out .= '<td class="liste_titre right">'.$langs->trans("QtyMin").'</td>';
+			$out .= '<td class="liste_titre">'.$langs->trans("User").'</td></tr>';
+			foreach ($productFournLogList as $productFournLog) {
+				$out .= '<tr><td class="right">'.dol_print_date($productFournLog['datec'], 'dayhour', 'tzuser').'</td>';
+				$out .= '<td class="right">'.price($productFournLog['price'], 0, $langs, 1, -1, -1, $conf->currency);
+				if ($productFournLog['multicurrency_code'] != $conf->currency) {
+					$out .= ' ('.price($productFournLog['multicurrency_price'], 0, $langs, 1, -1, -1, $productFournLog['multicurrency_code']).')';
+				}
+				$out .= '</td>';
+				//$out.= '<td class="right">'.$productFournLog['quantity'].'</td>';
+				$out .= '<td>'.$productFournLog['lastname'].'</td></tr>';
+			}
+			$out .= '</table>';
+		}
+		return $out;
+	}
 
 
-    /**
-     *  Return a link to the object card (with optionaly the picto).
-     *  Used getNomUrl of ProductFournisseur if a specific supplier ref is loaded. Otherwise use Product->getNomUrl().
-     *
-     *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-     *	@param	string	$option						On what the link point to ('nolink', ...)
-     *  @param	int  	$notooltip					1=Disable tooltip
-     *  @param  string  $morecss            		Add more css on link
-     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *	@return	string								String with URL
-     */
-    public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
-    {
-        global $db, $conf, $langs;
+	/**
+	 *  Return a link to the object card (with optionaly the picto).
+	 *  Used getNomUrl of ProductFournisseur if a specific supplier ref is loaded. Otherwise use Product->getNomUrl().
+	 *
+	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+	 *	@param	string	$option						On what the link point to ('nolink', ...)
+	 *  @param	int  	$notooltip					1=Disable tooltip
+	 *  @param  string  $morecss            		Add more css on link
+	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return	string								String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
+		global $db, $conf, $langs;
 
-        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-        $result = '';
+		$result = '';
 
-        $label = '<u>'.$langs->trans("SupplierRef").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Product').':</b> '.$this->ref;
-        $label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_supplier;
+		$label = '<u>'.$langs->trans("SupplierRef").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Product').':</b> '.$this->product_ref;
+		$label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_supplier;
 
-        $logPrices = $this->listProductFournisseurPriceLog($this->product_fourn_price_id, 'pfpl.datec', 'DESC'); // set sort order here
-        if (is_array($logPrices) && count($logPrices) > 0) {
-            $label .= '<br><br>';
-            $label .= '<u>'.$langs->trans("History").'</u>';
-            $label .= $this->displayPriceProductFournisseurLog($logPrices);
-        }
+		$logPrices = $this->listProductFournisseurPriceLog($this->product_fourn_price_id, 'pfpl.datec', 'DESC'); // set sort order here
+		if (is_array($logPrices) && count($logPrices) > 0) {
+			$label .= '<br><br>';
+			$label .= '<u>'.$langs->trans("History").'</u>';
+			$label .= $this->displayPriceProductFournisseurLog($logPrices);
+		}
 
-        $url = dol_buildpath('/product/fournisseurs.php', 1).'?id='.$this->id.'&action=add_price&socid='.$this->fourn_id.'&rowid='.$this->product_fourn_price_id;
+		$url = dol_buildpath('/product/fournisseurs.php', 1).'?id='.$this->id.'&action=add_price&socid='.$this->fourn_id.'&rowid='.$this->product_fourn_price_id;
 
-        if ($option != 'nolink')
-        {
-            // Add param to save lastsearch_values or not
-            $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-            if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-            if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option != 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label = $langs->trans("SupplierRef");
-                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("SupplierRef");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart .= $linkclose.'>';
-        $linkend = '</a>';
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
-        $result .= $linkstart;
-        if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-        if ($withpicto != 2) $result .= $this->ref.($this->ref_supplier ? ' ('.$this->ref_supplier.')' : '');
-        $result .= $linkend;
-        //if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+		$result .= $linkstart;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->ref.($this->ref_supplier ? ' ('.$this->ref_supplier.')' : '');
+		$result .= $linkend;
+		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Private function to log price history
-     *
-     * @param User      $user                           Object user who adds/changes price
-     * @param integer   $datec                          date create
-     * @param float     $buyprice                       price for qty
-     * @param float     $qty                            qty for price
-     * @param float     $multicurrency_buyprice         Purchase price for the quantity min in currency
-     * @param float     $multicurrency_unitBuyPrice     Unit Purchase price in currency
-     * @param float     $multicurrency_tx               Rate currency
-     * @param int       $fk_multicurrency               key multi currency
-     * @param string    $multicurrency_code	            Currency code
-     *
-     * @return int < 0 NOK > 0 OK
-     */
-    private function logPrice($user, $datec, $buyprice, $qty, $multicurrency_buyprice = null, $multicurrency_unitBuyPrice = null, $multicurrency_tx = null, $fk_multicurrency = null, $multicurrency_code = null)
-    {
-        // Add record into log table
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price_log(";
-        $sql .= " multicurrency_price, multicurrency_unitprice, multicurrency_tx, fk_multicurrency, multicurrency_code,";
-        $sql .= "datec, fk_product_fournisseur,fk_user,price,quantity)";
-        $sql .= "values(";
-        $sql .= (isset($multicurrency_buyprice) ? "'".$this->db->escape(price2num($multicurrency_buyprice))."'" : 'null').",";
-        $sql .= (isset($multicurrency_unitBuyPrice) ? "'".$this->db->escape(price2num($multicurrency_unitBuyPrice))."'" : 'null').",";
-        $sql .= (isset($multicurrency_tx) ? "'".$this->db->escape($multicurrency_tx)."'" : '1').",";
-        $sql .= (isset($fk_multicurrency) ? "'".$this->db->escape($fk_multicurrency)."'" : 'null').",";
-        $sql .= (isset($multicurrency_code) ? "'".$this->db->escape($multicurrency_code)."'" : 'null').",";
-        $sql .= "'".$this->db->idate($datec)."',";
-        $sql .= " ".$this->product_fourn_price_id.",";
-        $sql .= " ".$user->id.",";
-        $sql .= " ".price2num($buyprice).",";
-        $sql .= " ".$qty;
-        $sql .= ")";
+	/**
+	 * Private function to log price history
+	 *
+	 * @param User      $user                           Object user who adds/changes price
+	 * @param integer   $datec                          date create
+	 * @param float     $buyprice                       price for qty
+	 * @param float     $qty                            qty for price
+	 * @param float     $multicurrency_buyprice         Purchase price for the quantity min in currency
+	 * @param float     $multicurrency_unitBuyPrice     Unit Purchase price in currency
+	 * @param float     $multicurrency_tx               Rate currency
+	 * @param int       $fk_multicurrency               key multi currency
+	 * @param string    $multicurrency_code	            Currency code
+	 *
+	 * @return int < 0 NOK > 0 OK
+	 */
+	private function logPrice($user, $datec, $buyprice, $qty, $multicurrency_buyprice = null, $multicurrency_unitBuyPrice = null, $multicurrency_tx = null, $fk_multicurrency = null, $multicurrency_code = null)
+	{
+		// Add record into log table
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price_log(";
+		$sql .= " multicurrency_price, multicurrency_unitprice, multicurrency_tx, fk_multicurrency, multicurrency_code,";
+		$sql .= "datec, fk_product_fournisseur,fk_user,price,quantity)";
+		$sql .= "values(";
+		$sql .= (isset($multicurrency_buyprice) ? "'".$this->db->escape(price2num($multicurrency_buyprice))."'" : 'null').",";
+		$sql .= (isset($multicurrency_unitBuyPrice) ? "'".$this->db->escape(price2num($multicurrency_unitBuyPrice))."'" : 'null').",";
+		$sql .= (isset($multicurrency_tx) ? "'".$this->db->escape($multicurrency_tx)."'" : '1').",";
+		$sql .= (isset($fk_multicurrency) ? "'".$this->db->escape($fk_multicurrency)."'" : 'null').",";
+		$sql .= (isset($multicurrency_code) ? "'".$this->db->escape($multicurrency_code)."'" : 'null').",";
+		$sql .= "'".$this->db->idate($datec)."',";
+		$sql .= " ".$this->product_fourn_price_id.",";
+		$sql .= " ".$user->id.",";
+		$sql .= " ".price2num($buyprice).",";
+		$sql .= " ".$qty;
+		$sql .= ")";
 
-        $resql = $this->db->query($sql);
-        if (!$resql) {
-            return -1;
-        } else {
-            return 1;
-        }
-    }
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			return -1;
+		} else {
+			return 1;
+		}
+	}
 }
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 67133ed97b2..56d4af045f4 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -92,7 +92,7 @@ class PaiementFourn extends Paiement
 		$error = 0;
 
 		$sql = 'SELECT p.rowid, p.ref, p.entity, p.datep as dp, p.amount, p.statut, p.fk_bank, p.multicurrency_amount,';
-		$sql .= ' c.code as paiement_code, c.libelle as paiement_type,';
+		$sql .= ' c.code as payment_code, c.libelle as payment_type,';
 		$sql .= ' p.num_paiement as num_payment, p.note, b.fk_account';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn as p';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id';
@@ -120,17 +120,18 @@ class PaiementFourn extends Paiement
 				$this->date           = $this->db->jdate($obj->dp);
 				$this->datepaye       = $this->db->jdate($obj->dp);
 				$this->num_payment    = $obj->num_payment;
+				$this->numero         = $obj->num_payment;
 				$this->bank_account   = $obj->fk_account;
 				$this->fk_account     = $obj->fk_account;
 				$this->bank_line      = $obj->fk_bank;
-				$this->montant        = $obj->amount;		// deprecated
+				$this->montant        = $obj->amount; // deprecated
 				$this->amount         = $obj->amount;
 				$this->multicurrency_amount = $obj->multicurrency_amount;
-				$this->note           = $obj->note;
-				$this->note_private   = $obj->note;
-				$this->type_code      = $obj->paiement_code;
-				$this->type_label = $obj->paiement_type;
-				$this->statut         = $obj->statut;
+				$this->note                 = $obj->note;
+				$this->note_private         = $obj->note;
+				$this->type_code            = $obj->payment_code;
+				$this->type_label           = $obj->payment_type;
+				$this->statut               = $obj->statut;
 
 				$error = 1;
 			} else {
@@ -176,7 +177,7 @@ class PaiementFourn extends Paiement
 
 		foreach ($amounts as $key => $value)
 		{
-			$value_converted = Multicurrency::getAmountConversionFromInvoiceRate($key, $value? $value : 0, $way, 'facture_fourn');
+			$value_converted = Multicurrency::getAmountConversionFromInvoiceRate($key, $value ? $value : 0, $way, 'facture_fourn');
 			$totalamount_converted += $value_converted;
 			$amounts_to_update[$key] = price2num($value_converted, 'MT');
 
@@ -191,7 +192,7 @@ class PaiementFourn extends Paiement
 
 		if ($totalamount <> 0) // On accepte les montants negatifs
 		{
-		    $ref = $this->getNextNumRef(is_object($thirdparty) ? $thirdparty : '');
+			$ref = $this->getNextNumRef(is_object($thirdparty) ? $thirdparty : '');
 			$now = dol_now();
 
 			if ($way == 'dolibarr')
@@ -247,8 +248,8 @@ class PaiementFourn extends Paiement
 							// Regenerate documents of invoices
 							if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
 							{
-							    $newlang = '';
-							    $outputlangs = $langs;
+								$newlang = '';
+								$outputlangs = $langs;
 								if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $invoice->thirdparty->default_lang;
 								if (!empty($newlang)) {
 									$outputlangs = new Translate("", $conf);
@@ -491,7 +492,7 @@ class PaiementFourn extends Paiement
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Renvoi le libelle d'un statut donne
 	 *
@@ -501,7 +502,7 @@ class PaiementFourn extends Paiement
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$langs->load('compta');
@@ -550,7 +551,7 @@ class PaiementFourn extends Paiement
 	 *	@param		int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
 	 *	@param		string	$option			Sur quoi pointe le lien
 	 *  @param		string  $mode           'withlistofinvoices'=Include list of invoices into tooltip
-     *  @param		int  	$notooltip		1=Disable tooltip
+	 *  @param		int  	$notooltip		1=Disable tooltip
 	 *	@return		string					Chaine avec URL
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $mode = 'withlistofinvoices', $notooltip = 0)
@@ -695,7 +696,7 @@ class PaiementFourn extends Paiement
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
-         *  @param   null|array  $moreparams     Array to provide more information
+	 *  @param   null|array  $moreparams     Array to provide more information
 	 *  @return     int         				<0 if KO, 0 if nothing done, >0 if OK
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
@@ -753,7 +754,7 @@ class PaiementFourn extends Paiement
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Load the third party of object, from id into this->thirdparty
 	 *
@@ -762,7 +763,7 @@ class PaiementFourn extends Paiement
 	 */
 	public function fetch_thirdparty($force_thirdparty_id = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 
 		if (empty($force_thirdparty_id))
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 419d5c7a559..abb6245fa22 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -110,7 +110,7 @@ if ($id > 0 || !empty($ref))
 }
 
 // Common permissions
-$usercanread			= $user->rights->fournisseur->commande->lire;
+$usercanread = $user->rights->fournisseur->commande->lire;
 $usercancreate			= $user->rights->fournisseur->commande->creer;
 $usercandelete			= $user->rights->fournisseur->commande->supprimer;
 
@@ -119,14 +119,14 @@ $usercanvalidate		= ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($u
 
 // Additional area permissions
 $usercanapprove			= $user->rights->fournisseur->commande->approuver;
-$usercanapprovesecond	= $user->rights->fournisseur->commande->approve2;
-$usercanorder			= $user->rights->fournisseur->commande->commander;
+$usercanapprovesecond = $user->rights->fournisseur->commande->approve2;
+$usercanorder = $user->rights->fournisseur->commande->commander;
 $usercanreceived		= $user->rights->fournisseur->commande->receptionner;
 
 // Permissions for includes
 $permissionnote			= $usercancreate; // Used by the include of actions_setnotes.inc.php
-$permissiondellink		= $usercancreate; // Used by the include of actions_dellink.inc.php
-$permissiontoedit		= $usercancreate; // Used by the include of actions_lineupdown.inc.php
+$permissiondellink = $usercancreate; // Used by the include of actions_dellink.inc.php
+$permissiontoedit = $usercancreate; // Used by the include of actions_lineupdown.inc.php
 $permissiontoadd		= $usercancreate; // Used by the include of actions_addupdatedelete.inc.php
 
 
@@ -203,7 +203,7 @@ if (empty($reshook))
 	// date of delivery
 	if ($action == 'setdate_livraison' && $usercancreate)
 	{
-		$result = $object->set_date_livraison($user, $datelivraison);
+		$result = $object->setDeliveryDate($user, $datelivraison);
 		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 	}
 
@@ -406,7 +406,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), null, 'errors');
 			$error++;
 		}
-		if (!GETPOST('qty'))
+		if (GETPOST('qty', 'int') == '')
 		{
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
 			$error++;
@@ -666,7 +666,7 @@ if (empty($reshook))
 		$productsupplier = new ProductFournisseur($db);
 		if (!empty($conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY))
 		{
-			if ($line->fk_product > 0 && $productsupplier->get_buyprice(0, price2num($_POST['qty']), $line->fk_product, 'none', GETPOST('socid', 'int')) < 0)
+			if ($line->fk_product > 0 && $productsupplier->get_buyprice(0, price2num(GETPOST('qty', 'int')), $line->fk_product, 'none', GETPOST('socid', 'int')) < 0)
 			{
 				setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'warnings');
 			}
@@ -719,7 +719,7 @@ if (empty($reshook))
 			$lineid,
 			$_POST['product_desc'],
 			$ht,
-			$_POST['qty'],
+			GETPOST('qty', 'int'),
 			$_POST['remise_percent'],
 			$vat_rate,
 			$localtax1_rate,
@@ -872,7 +872,7 @@ if (empty($reshook))
 			$action = 'confirm_approve'; // can make standard or first level approval also if permission is set
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$db->commit();
 		} else {
 			$db->rollback();
@@ -1059,7 +1059,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Delivery")), null, 'errors');
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$db->commit();
 		} else {
 			$db->rollback();
@@ -1084,7 +1084,7 @@ if (empty($reshook))
 	// Actions to send emails
 	$triggersendname = 'ORDER_SUPPLIER_SENTBYMAIL';
 	$autocopy = 'MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO';
-	$trackid = 'sor'.$object->id;
+	$trackid = 'sord'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 	// Actions to build doc
@@ -1143,9 +1143,10 @@ if (empty($reshook))
 			$object->cond_reglement_id = GETPOST('cond_reglement_id');
 			$object->mode_reglement_id = GETPOST('mode_reglement_id');
 			$object->fk_account        = GETPOST('fk_account', 'int');
-			$object->note_private	= GETPOST('note_private', 'restricthtml');
+			$object->note_private = GETPOST('note_private', 'restricthtml');
 			$object->note_public   	= GETPOST('note_public', 'restricthtml');
-			$object->date_livraison = $datelivraison;
+			$object->date_livraison = $datelivraison; // deprecated
+			$object->delivery_date = $datelivraison;
 			$object->fk_incoterms = GETPOST('incoterm_id', 'int');
 			$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 			$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
@@ -1199,7 +1200,8 @@ if (empty($reshook))
 						$result = $srcobject->fetch($object->origin_id);
 						if ($result > 0)
 						{
-							$object->set_date_livraison($user, $srcobject->date_livraison);
+							$tmpdate = ($srcobject->delivery_date ? $srcobject->delivery_date : $srcobject->date_livraison);
+							$object->setDeliveryDate($user, $tmpdate);
 							$object->set_id_projet($user, $srcobject->fk_project);
 
 							$lines = $srcobject->lines;
@@ -1430,7 +1432,8 @@ if (empty($reshook))
 			if ($object->id > 0)
 			{
 				$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-				$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+				$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+				$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 			}
 
 			if ($result >= 0)
@@ -1551,7 +1554,7 @@ if ($action == 'create')
 		$remise_absolue		= (!empty($objectsrc->remise_absolue) ? $objectsrc->remise_absolue : (!empty($soc->remise_absolue) ? $soc->remise_absolue : 0));
 		$dateinvoice		= empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '';
 
-		$datedelivery = (!empty($objectsrc->date_livraison) ? $objectsrc->date_livraison : '');
+		$datedelivery = (!empty($objectsrc->date_livraison) ? $objectsrc->date_livraison : (!empty($objectsrc->delivery_date) ? $objectsrc->delivery_date : ''));
 
 		if (!empty($conf->multicurrency->enabled))
 		{
@@ -1587,7 +1590,7 @@ if ($action == 'create')
 	print '<input type="hidden" name="originid" value="'.$originid.'">';
 	if (!empty($currency_tx)) print '<input type="hidden" name="originmulticurrency_tx" value="'.$currency_tx.'">';
 
-	dol_fiche_head('');
+	print dol_get_fiche_head('');
 
 	print '<table class="border centpercent">';
 
@@ -1684,10 +1687,12 @@ if ($action == 'create')
 	// Incoterms
 	if (!empty($conf->incoterm->enabled))
 	{
+		$fkincoterms = (!empty($object->fk_incoterms) ? $object->fk_incoterms : ($socid > 0 ? $societe->fk_incoterms : ''));
+		$locincoterms = (!empty($object->location_incoterms) ? $object->location_incoterms : ($socid > 0 ? $societe->location_incoterms : ''));
 		print '<tr>';
 		print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $object->label_incoterms, 1).'</label></td>';
 		print '<td class="maxwidthonsmartphone">';
-		print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''));
+		print $form->select_incoterms($fkincoterms, $locincoterms);
 		print '</td></tr>';
 	}
 
@@ -1763,12 +1768,12 @@ if ($action == 'create')
 	// Bouton "Create Draft"
 	print "</table>\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="bouton" value="'.$langs->trans('CreateDraft').'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+	print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 	print '</div>';
 
 
@@ -1802,7 +1807,7 @@ if ($action == 'create')
 	$head = ordersupplier_prepare_head($object);
 
 	$title = $langs->trans("SupplierOrder");
-	dol_fiche_head($head, 'card', $title, -1, 'order');
+	print dol_get_fiche_head($head, 'card', $title, -1, 'order');
 
 
 	$formconfirm = '';
@@ -1998,9 +2003,9 @@ if ($action == 'create')
 	if ($object->methode_commande_id > 0)
 	{
 		print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td>';
-		if ($object->date_commande)
-		{
-			print dol_print_date($object->date_commande, "dayhour")."\n";
+		print $object->date_commande ? dol_print_date($object->date_commande, $usehourmin) : '';
+		if ($object->hasDelay() && !empty($object->date_delivery) && !empty($object->date_commande)) {
+			print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
 		}
 		print "</td></tr>";
 
@@ -2158,14 +2163,14 @@ if ($action == 'create')
 		print '<input type="hidden" name="action" value="setdate_livraison">';
 		$usehourmin = 0;
 		if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) $usehourmin = 1;
-		print $form->selectDate($object->date_livraison ? $object->date_livraison : -1, 'liv_', $usehourmin, $usehourmin, '', "setdate_livraison");
+		print $form->selectDate($object->delivery_date ? $object->delivery_date : -1, 'liv_', $usehourmin, $usehourmin, '', "setdate_livraison");
 		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 		print '</form>';
 	} else {
 		$usehourmin = 'day';
 		if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) $usehourmin = 'dayhour';
-		print $object->date_livraison ? dol_print_date($object->date_livraison, $usehourmin) : '&nbsp;';
-		if ($object->hasDelay() && !empty($object->date_livraison)) {
+		print $object->delivery_date ? dol_print_date($object->delivery_date, $usehourmin) : '&nbsp;';
+		if ($object->hasDelay() && !empty($object->delivery_date)) {
 			print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
 		}
 	}
@@ -2337,7 +2342,7 @@ if ($action == 'create')
 	print '</div>';
 	print '</form>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	/**
 	 * Boutons actions
@@ -2593,7 +2598,7 @@ if ($action == 'create')
 			print '<tr><td class="center" colspan="2">';
 			print '<input type="submit" name="makeorder" class="button" value="'.$langs->trans("ToOrder").'">';
 			print ' &nbsp; &nbsp; ';
-			print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
+			print '<input type="submit" name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'">';
 			print '</td></tr>';
 			print '</table>';
 
@@ -2713,7 +2718,7 @@ if ($action == 'create')
 				if ($error_occurred)
 				{
 					print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>";
-					print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+					print '<input class="button button-cancel" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 				} else {
 					$textinput_size = "50";
 					// Webservice url
@@ -2727,7 +2732,7 @@ if ($action == 'create')
 					print '<input class="button" type="submit" id="ws_submit" name="ws_submit" value="'.$langs->trans("CreateRemoteOrder").'">';
 					print ' &nbsp; &nbsp; ';
 					//Cancel button
-					print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+					print '<input class="button button-cancel" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 					print '</td></tr>';
 				}
 
@@ -2858,7 +2863,7 @@ if ($action == 'create')
 					print '<input class="button" type="submit" id="ws_submit" name="ws_submit" value="'.$langs->trans("Confirm").'">';
 					print ' &nbsp; &nbsp; ';
 				}
-				print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+				print '<input class="button button-cancel" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 				print '</form>';
 			}
 		}
@@ -2873,7 +2878,7 @@ if ($action == 'create')
 		$defaulttopic = 'SendOrderRef';
 		$diroutput = $conf->fournisseur->commande->dir_output;
 		$autocopy = 'MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO';
-		$trackid = 'sor'.$object->id;
+		$trackid = 'sord'.$object->id;
 
 		include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 	}
diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index 683658c791e..3e52f35d8bb 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -55,11 +55,12 @@ if ($action == 'addcontact' && $user->rights->fournisseur->commande->creer)
 {
 	$result = $object->fetch($id);
 
-    if ($result > 0 && $id > 0)
-    {
-    	$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
-    }
+	if ($result > 0 && $id > 0)
+	{
+		$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
+		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
+	}
 
 	if ($result >= 0)
 	{
@@ -81,7 +82,7 @@ elseif ($action == 'swapstatut' && $user->rights->fournisseur->commande->creer)
 {
 	if ($object->fetch($id))
 	{
-	    $result = $object->swapContactStatus(GETPOST('ligne'));
+		$result = $object->swapContactStatus(GETPOST('ligne'));
 	} else {
 		dol_print_error($db);
 	}
@@ -131,7 +132,7 @@ if ($id > 0 || !empty($ref))
 		$object->fetch_thirdparty();
 
 		$head = ordersupplier_prepare_head($object);
-		dol_fiche_head($head, 'contact', $langs->trans("SupplierOrder"), -1, 'order');
+		print dol_get_fiche_head($head, 'contact', $langs->trans("SupplierOrder"), -1, 'order');
 
 		// Supplier order card
 
@@ -146,43 +147,43 @@ if ($id > 0 || !empty($ref))
 		// Project
 		if (!empty($conf->projet->enabled))
 		{
-		    $langs->load("projects");
-		    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		    if ($user->rights->fournisseur->commande->creer)
-		    {
-		        if ($action != 'classify') {
-		        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			$langs->load("projects");
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+			if ($user->rights->fournisseur->commande->creer)
+			{
+				if ($action != 'classify') {
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
-                }
-	        	if ($action == 'classify') {
-	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-	                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-	                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref .= '</form>';
-	            } else {
-	                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-		    } else {
-		        if (!empty($object->fk_project)) {
-		            $proj = new Project($db);
-		            $proj->fetch($object->fk_project);
-		            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-		            $morehtmlref .= $proj->ref;
-		            $morehtmlref .= '</a>';
-		        } else {
-		            $morehtmlref .= '';
-		        }
-		    }
+				}
+				if ($action == 'classify') {
+					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				if (!empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
+				} else {
+					$morehtmlref .= '';
+				}
+			}
 		}
 		$morehtmlref .= '</div>';
 
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		// Contacts lines
 		include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 7a11d22aa53..d739f70e76e 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-require_once DOL_DOCUMENT_ROOT . '/product/stock/class/mouvementstock.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
 if (!empty($conf->projet->enabled))
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
@@ -276,7 +276,7 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 								$sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price";
 								$sql .= " SET unitprice='".GETPOST($pu)."'";
 								$sql .= ", price=".GETPOST($pu)."*quantity";
-								$sql .= ", remise_percent='".(!empty($dto)?$dto:0)."'";
+								$sql .= ", remise_percent='".(!empty($dto) ? $dto : 0)."'";
 								$sql .= " WHERE fk_soc=".$object->socid;
 								$sql .= " AND fk_product=".GETPOST($prod, 'int');
 
@@ -348,7 +348,7 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 								$sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price";
 								$sql .= " SET unitprice='".GETPOST($pu)."'";
 								$sql .= ", price=".GETPOST($pu)."*quantity";
-								$sql .= ", remise_percent='".(!empty($dto)?$dto:0)."'";
+								$sql .= ", remise_percent='".(!empty($dto) ? $dto : 0)."'";
 								$sql .= " WHERE fk_soc=".$object->socid;
 								$sql .= " AND fk_product=".GETPOST($prod, 'int');
 
@@ -419,16 +419,16 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->fourn
 	}
 	else {
 		// If module stock is enabled and the stock increase is done on purchase order dispatching
-		if ($entrepot > 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
+		if ($entrepot > 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
 		{
 			$mouv = new MouvementStock($db);
 			if ($product > 0)
 			{
 				$mouv->origin = &$object;
-				$result=$mouv->livraison($user, $product, $entrepot, $qty, $price, $comment, '', $eatby, $sellby, $batch);
+				$result = $mouv->livraison($user, $product, $entrepot, $qty, $price, $comment, '', $eatby, $sellby, $batch);
 				if ($result < 0)
 				{
-					$errors=$mouv->errors;
+					$errors = $mouv->errors;
 					$error++;
 				}
 			}
@@ -470,28 +470,28 @@ if ($action == 'updateline' && $user->rights->fournisseur->commande->receptionne
 	if ($result < 0)
 	{
 		$error++;
-		$errors=$supplierorderdispatch->errors;
+		$errors = $supplierorderdispatch->errors;
 	}
 	else {
 		// If module stock is enabled and the stock increase is done on purchase order dispatching
-		if ($entrepot > 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
+		if ($entrepot > 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
 		{
 			$mouv = new MouvementStock($db);
 			if ($product > 0)
 			{
 				$mouv->origin = &$object;
-				$result=$mouv->livraison($user, $product, $entrepot, $qty, $price, $comment, '', $eatby, $sellby, $batch);
+				$result = $mouv->livraison($user, $product, $entrepot, $qty, $price, $comment, '', $eatby, $sellby, $batch);
 				if ($result < 0)
 				{
-					$errors=$mouv->errors;
+					$errors = $mouv->errors;
 					$error++;
 				}
 				else {
 					$mouv->origin = &$object;
-					$result=$mouv->reception($user, $product, $supplierorderdispatch->fk_entrepot, $supplierorderdispatch->qty, $price, $comment, $eatby, $sellby, $batch);
+					$result = $mouv->reception($user, $product, $supplierorderdispatch->fk_entrepot, $supplierorderdispatch->qty, $price, $comment, $eatby, $sellby, $batch);
 					if ($result < 0)
 					{
-						$errors=$mouv->errors;
+						$errors = $mouv->errors;
 						$error++;
 					}
 				}
@@ -532,22 +532,22 @@ if ($id > 0 || !empty($ref)) {
 	$head = ordersupplier_prepare_head($object);
 
 	$title = $langs->trans("SupplierOrder");
-	dol_fiche_head($head, 'dispatch', $title, -1, 'order');
+	print dol_get_fiche_head($head, 'dispatch', $title, -1, 'order');
 
-	$formconfirm='';
+	$formconfirm = '';
 
 	// Confirmation to delete line
 	if ($action == 'ask_deleteline')
 	{
-		$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
 	}
 
 	// Call Hook formConfirm
 	$parameters = array('lineid' => $lineid);
 	// Note that $action and $object may be modified by hook
 	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action);
-	if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
-	elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
+	if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
+	elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
 
 	// Print form confirm
 	print $formconfirm;
@@ -652,7 +652,7 @@ if ($id > 0 || !empty($ref)) {
 		$formproduct = new FormProduct($db);
 		$formproduct->loadWarehouses();
 		$entrepot = new Entrepot($db);
-		$listwarehouses=$entrepot->list_array(1);
+		$listwarehouses = $entrepot->list_array(1);
 
 
 		if (empty($conf->reception->enabled))print '<form method="POST" action="dispatch.php?id='.$object->id.'">';
@@ -763,9 +763,9 @@ if ($id > 0 || !empty($ref)) {
 
 				// Select warehouse to force it everywhere
 				if (count($listwarehouses) > 1) {
-					print '<br>'.$langs->trans("ForceTo").' '.$form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 1, 0, 0, '', 0, 0, $disabled);
+					print '<br>'.$langs->trans("ForceTo").' '.$form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 1, 0, 0, '', 0, 0, $disabled, '', 'minwidth100 maxwidth300', 1);
 				} elseif (count($listwarehouses) == 1) {
-					print '<br>'.$langs->trans("ForceTo").' '.$form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 0, 0, 0, '', 0, 0, $disabled);
+					print '<br>'.$langs->trans("ForceTo").' '.$form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 0, 0, 0, '', 0, 0, $disabled, '', 'minwidth100 maxwidth300', 1);
 				}
 
 				print '</td>';
@@ -910,8 +910,8 @@ if ($id > 0 || !empty($ref)) {
 							print '</td>';
 							if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
 								print '<td class="nowraponall">';
-								$dlcdatesuffix = dol_mktime(0, 0, 0, GETPOST('dlc' . $suffix . 'month'), GETPOST('dlc' . $suffix . 'day'), GETPOST('dlc' . $suffix . 'year'));
-								print $form->selectDate($dlcdatesuffix, 'dlc' . $suffix, '', '', 1, '');
+								$dlcdatesuffix = dol_mktime(0, 0, 0, GETPOST('dlc'.$suffix.'month'), GETPOST('dlc'.$suffix.'day'), GETPOST('dlc'.$suffix.'year'));
+								print $form->selectDate($dlcdatesuffix, 'dlc'.$suffix, '', '', 1, '');
 								print '</td>';
 							}
 							if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
@@ -991,7 +991,7 @@ if ($id > 0 || !empty($ref)) {
 
 								// Discount
 								print '<td class="right">';
-								print '<input id="dto' . $suffix . '" name="dto' . $suffix . '" type="text" size="8" value="' . (GETPOST('dto' . $suffix) != '' ? GETPOST('dto' . $suffix) : '') . '">';
+								print '<input id="dto'.$suffix.'" name="dto'.$suffix.'" type="text" size="8" value="'.(GETPOST('dto'.$suffix) != '' ? GETPOST('dto'.$suffix) : '').'">';
 								print '</td>';
 
 								// Save price
@@ -1080,7 +1080,7 @@ if ($id > 0 || !empty($ref)) {
 		print '</form>';
 	}
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	// traitement entrepot par défaut
 	print '<script type="text/javascript">
@@ -1105,11 +1105,11 @@ if ($id > 0 || !empty($ref)) {
 	$sql = "SELECT p.rowid as pid, p.ref, p.label,";
 	$sql .= " e.rowid as warehouse_id, e.ref as entrepot,";
 	$sql .= " cfd.rowid as dispatchlineid, cfd.fk_product, cfd.qty, cfd.eatby, cfd.sellby, cfd.batch, cfd.comment, cfd.status, cfd.datec";
-	$sql.=" ,cd.rowid, cd.subprice";
+	$sql .= " ,cd.rowid, cd.subprice";
 	if ($conf->reception->enabled)$sql .= " ,cfd.fk_reception, r.date_delivery";
 	$sql .= " FROM ".MAIN_DB_PREFIX."product as p,";
 	$sql .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as cfd";
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "commande_fournisseurdet as cd ON cd.rowid = cfd.fk_commandefourndet";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseurdet as cd ON cd.rowid = cfd.fk_commandefourndet";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e ON cfd.fk_entrepot = e.rowid";
 	if ($conf->reception->enabled)$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."reception as r ON cfd.fk_reception = r.rowid";
 	$sql .= " WHERE cfd.fk_commande = ".$object->id;
@@ -1138,10 +1138,10 @@ if ($id > 0 || !empty($ref)) {
 			if (!empty($conf->productbatch->enabled)) {
 				print '<td class="dispatch_batch_number_title">'.$langs->trans("batch_number").'</td>';
 				if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
-					print '<td class="dispatch_dluo_title">' . $langs->trans("EatByDate") . '</td>';
+					print '<td class="dispatch_dluo_title">'.$langs->trans("EatByDate").'</td>';
 				}
 				if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
-					print '<td class="dispatch_dlc_title">' . $langs->trans("SellByDate") . '</td>';
+					print '<td class="dispatch_dlc_title">'.$langs->trans("SellByDate").'</td>';
 				}
 			}
 			print '<td class="right">'.$langs->trans("QtyDispatched").'</td>';
@@ -1164,14 +1164,14 @@ if ($id > 0 || !empty($ref)) {
 
 				if ($action == 'editline' && $lineid == $objp->dispatchlineid)
 				{
-					print '<form name="editdispatchedlines" id="editdispatchedlines" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '#line_' . GETPOST('lineid') . '" method="POST">
-					<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">
+					print '<form name="editdispatchedlines" id="editdispatchedlines" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'#line_'.GETPOST('lineid').'" method="POST">
+					<input type="hidden" name="token" value="'.newToken().'">
 					<input type="hidden" name="action" value="updateline">
 					<input type="hidden" name="mode" value="">
-					<input type="hidden" name="lineid" value="' . $objp->dispatchlineid . '">';
+					<input type="hidden" name="lineid" value="'.$objp->dispatchlineid.'">';
 				}
 
-				print '<tr ' . $bc[$var] . ' id="line_'.$objp->dispatchlineid.'" >';
+				print '<tr class="oddeven" id="line_'.$objp->dispatchlineid.'" >';
 
 				if (!empty($conf->reception->enabled)) {
 					print '<td>';
@@ -1194,14 +1194,14 @@ if ($id > 0 || !empty($ref)) {
 				if (!empty($conf->productbatch->enabled)) {
 					if ($objp->batch) {
 						include_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
-						$lot=new Productlot($db);
+						$lot = new Productlot($db);
 						$lot->fetch(0, $objp->pid, $objp->batch);
 						print '<td class="dispatch_batch_number">'.$lot->getNomUrl(1).'</td>';
 						if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
-							print '<td class="dispatch_dluo">' . dol_print_date($lot->eatby, 'day') . '</td>';
+							print '<td class="dispatch_dluo">'.dol_print_date($lot->eatby, 'day').'</td>';
 						}
 						if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
-							print '<td class="dispatch_dlc">' . dol_print_date($lot->sellby, 'day') . '</td>';
+							print '<td class="dispatch_dlc">'.dol_print_date($lot->sellby, 'day').'</td>';
 						}
 					} else {
 						print '<td class="dispatch_batch_number"></td>';
@@ -1214,7 +1214,7 @@ if ($id > 0 || !empty($ref)) {
 				print '<td class="right">';
 				if ($action == 'editline' && $lineid == $objp->dispatchlineid)
 				{
-					print '<input style="width: 50px;" type="number" min="1" name="qty" value="' . $objp->qty . '" />';
+					print '<input style="width: 50px;" type="number" min="1" name="qty" value="'.$objp->qty.'" />';
 				}
 				else {
 					print $objp->qty;
@@ -1227,9 +1227,9 @@ if ($id > 0 || !empty($ref)) {
 				if ($action == 'editline' && $lineid == $objp->dispatchlineid)
 				{
 					if (count($listwarehouses) > 1) {
-						print $formproduct->selectWarehouses(GETPOST("fk_entrepot")?GETPOST("fk_entrepot"):($objp->warehouse_id?$objp->warehouse_id:''), "fk_entrepot", '', 1, 0, $objp->fk_product, '', 1, 1, null, 'csswarehouse');
+						print $formproduct->selectWarehouses(GETPOST("fk_entrepot") ?GETPOST("fk_entrepot") : ($objp->warehouse_id ? $objp->warehouse_id : ''), "fk_entrepot", '', 1, 0, $objp->fk_product, '', 1, 1, null, 'csswarehouse');
 					} elseif (count($listwarehouses) == 1) {
-						print $formproduct->selectWarehouses(GETPOST("fk_entrepot")?GETPOST("fk_entrepot"):($objp->warehouse_id?$objp->warehouse_id:''), "fk_entrepot", '', 0, 0, $objp->fk_product, '', 1, 1, null, 'csswarehouse');
+						print $formproduct->selectWarehouses(GETPOST("fk_entrepot") ?GETPOST("fk_entrepot") : ($objp->warehouse_id ? $objp->warehouse_id : ''), "fk_entrepot", '', 0, 0, $objp->fk_product, '', 1, 1, null, 'csswarehouse');
 					} else {
 						$langs->load("errors");
 						print $langs->trans("ErrorNoWarehouseDefined");
@@ -1290,26 +1290,26 @@ if ($id > 0 || !empty($ref)) {
 					print '</td>';
 				}
 
-				if ($action != 'editline' ||  && $lineid != $objp->dispatchlineid)
+				if ($action != 'editline' || $lineid != $objp->dispatchlineid)
 				{
 					print '<td class="linecoledit center">';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;lineid=' . $objp->dispatchlineid .'#line_'. $objp->dispatchlineid . '">';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;lineid='.$objp->dispatchlineid.'#line_'.$objp->dispatchlineid.'">';
 					print img_edit();
 					print '</a>';
 					print '</td>';
 
 					print '<td class="linecoldelete center">';
-					print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=ask_deleteline&amp;lineid=' . $objp->dispatchlineid . '#dispatch_received_products">';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=ask_deleteline&amp;lineid='.$objp->dispatchlineid.'#dispatch_received_products">';
 					print img_delete();
 					print '</a>';
 					print '</td>';
 				}
 				else {
 					print '<td class="center valignmiddle">';
-					print '<input type="submit" class="button" id="savelinebutton" name="save" value="'.$langs->trans("Save").'" />';
+					print '<input type="submit" class="button button-save" id="savelinebutton" name="save" value="'.$langs->trans("Save").'" />';
 					print '</td>';
 					print '<td class="center valignmiddle">';
-					print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="'. $langs->trans("Cancel").'" />';
+					print '<input type="submit" class="button button-cancel" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'" />';
 					print '</td>';
 				}
 
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index e266a466e87..d5a4455db06 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -99,7 +99,7 @@ if ($object->id > 0)
 
 	$head = ordersupplier_prepare_head($object);
 
-	dol_fiche_head($head, 'documents', $langs->trans('SupplierOrder'), -1, 'order');
+	print dol_get_fiche_head($head, 'documents', $langs->trans('SupplierOrder'), -1, 'order');
 
 
 	// Build file list
@@ -123,36 +123,36 @@ if ($object->id > 0)
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    if ($user->rights->fournisseur->commande->creer)
-	    {
-	        if ($action != 'classify') {
-	        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->fournisseur->commande->creer)
+		{
+			if ($action != 'classify') {
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
-            }
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	            $morehtmlref .= $proj->ref;
-	            $morehtmlref .= '</a>';
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+			}
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
@@ -169,7 +169,7 @@ if ($object->id > 0)
 
 	print "</div>\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	$modulepart = 'commande_fournisseur';
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index 6891e3bdf92..1e9e69fb8cd 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -61,14 +61,14 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-    print '<form method="post" action="list.php">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder nohover centpercent">';
-    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    print '<tr class="oddeven"><td>';
-    print $langs->trans("SupplierOrder").':</td><td><input type="text" class="flat" name="search_all" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-    print "</table></div></form><br>\n";
+	print '<form method="post" action="list.php">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder nohover centpercent">';
+	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("SupplierOrder").':</td><td><input type="text" class="flat" name="search_all" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+	print "</table></div></form><br>\n";
 }
 
 
diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php
index 07c84a8fa12..a50cbbdad39 100644
--- a/htdocs/fourn/commande/info.php
+++ b/htdocs/fourn/commande/info.php
@@ -53,10 +53,10 @@ if (!$sortorder) $sortorder = 'DESC,DESC';
 
 if (GETPOST('actioncode', 'array'))
 {
-    $actioncode = GETPOST('actioncode', 'array', 3);
-    if (!count($actioncode)) $actioncode = '0';
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) $actioncode = '0';
 } else {
-    $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
@@ -81,8 +81,8 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 // Purge search criteria
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
 {
-    $actioncode = '';
-    $search_agenda_label = '';
+	$actioncode = '';
+	$search_agenda_label = '';
 }
 
 
@@ -96,9 +96,9 @@ $object = new CommandeFournisseur($db);
 
 if ($id > 0 || !empty($ref))
 {
-    $object->fetch($id, $ref);
-    $object->fetch_thirdparty();
-    $object->info($object->id);
+	$object->fetch($id, $ref);
+	$object->fetch_thirdparty();
+	$object->info($object->id);
 }
 
 $title = $langs->trans("SupplierOrder").' - '.$object->ref.' '.$object->name;
@@ -111,7 +111,7 @@ $now = dol_now();
 $head = ordersupplier_prepare_head($object);
 
 
-dol_fiche_head($head, 'info', $langs->trans("SupplierOrder"), -1, 'order');
+print dol_get_fiche_head($head, 'info', $langs->trans("SupplierOrder"), -1, 'order');
 
 
 // Supplier order card
@@ -127,36 +127,36 @@ $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->ge
 // Project
 if (!empty($conf->projet->enabled))
 {
-    $langs->load("projects");
-    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-    if ($user->rights->fournisseur->commande->creer)
-    {
-        if ($action != 'classify') {
-            //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-            $morehtmlref .= ' : ';
-        }
-        if ($action == 'classify') {
-            //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-            $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-            $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-            $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-            $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-            $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-            $morehtmlref .= '</form>';
-        } else {
-            $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-        }
-    } else {
-        if (!empty($object->fk_project)) {
-            $proj = new Project($db);
-            $proj->fetch($object->fk_project);
-            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-            $morehtmlref .= $proj->ref;
-            $morehtmlref .= '</a>';
-        } else {
-            $morehtmlref .= '';
-        }
-    }
+	$langs->load("projects");
+	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+	if ($user->rights->fournisseur->commande->creer)
+	{
+		if ($action != 'classify') {
+			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			$morehtmlref .= ' : ';
+		}
+		if ($action == 'classify') {
+			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+			$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			$morehtmlref .= '</form>';
+		} else {
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+		}
+	} else {
+		if (!empty($object->fk_project)) {
+			$proj = new Project($db);
+			$proj->fetch($object->fk_project);
+			$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+			$morehtmlref .= $proj->ref;
+			$morehtmlref .= '</a>';
+		} else {
+			$morehtmlref .= '';
+		}
+	}
 }
 $morehtmlref .= '</div>';
 
@@ -172,7 +172,7 @@ print '</div>';
 
 print '<div class="clearboth"></div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 
@@ -183,7 +183,7 @@ $out = '';
 $permok = $user->rights->agenda->myactions->create;
 if ($permok)
 {
-    $out .= '&originid='.$object->id.'&origin=order_supplier';
+	$out .= '&originid='.$object->id.'&origin=order_supplier';
 }
 
 
@@ -191,12 +191,12 @@ print '<div class="tabsAction">';
 
 if (!empty($conf->agenda->enabled))
 {
-    if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
-    {
-        print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.$langs->trans("AddAction").'</a>';
-    } else {
-        print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
-    }
+	if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
+	{
+		print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.$langs->trans("AddAction").'</a>';
+	} else {
+		print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
+	}
 }
 
 print '</div>';
@@ -204,27 +204,27 @@ print '</div>';
 
 if (!empty($object->id))
 {
-    $param = '&id='.$object->id;
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+	$param = '&id='.$object->id;
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
-    print load_fiche_titre($langs->trans("ActionsOnOrder"), '', '');
+	print load_fiche_titre($langs->trans("ActionsOnOrder"), '', '');
 
-    // List of actions on element
-    /*include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+	// List of actions on element
+	/*include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
     $formactions=new FormActions($db);
     $somethingshown = $formactions->showactions($object,'project',0);*/
 
-    // List of todo actions
-    //show_actions_todo($conf,$langs,$db,$object,null,0,$actioncode);
+	// List of todo actions
+	//show_actions_todo($conf,$langs,$db,$object,null,0,$actioncode);
 
-    // List of done actions
-    //show_actions_done($conf,$langs,$db,$object,null,0,$actioncode, '', $filters, $sortfield, $sortorder);
+	// List of done actions
+	//show_actions_done($conf,$langs,$db,$object,null,0,$actioncode, '', $filters, $sortfield, $sortorder);
 
-    // List of all actions
-    $filters = array();
-    $filters['search_agenda_label'] = $search_agenda_label;
-    show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
+	// List of all actions
+	$filters = array();
+	$filters['search_agenda_label'] = $search_agenda_label;
+	show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
 }
 
 // End of page
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 48613e67d43..12d3352205b 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2014      Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2016      Ferran Marcet        <fmarcet@2byte.es>
  * Copyright (C) 2018      Frédéric France      <frederic.france@netlogic.fr>
- * Copyright (C) 2018      Charlene Benke       <charlie@patas-monkey.com>
+ * Copyright (C) 2018-2020 Charlene Benke       <charlie@patas-monkey.com>
  * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -74,7 +74,6 @@ $search_user = GETPOST('search_user', 'int');
 $search_request_author = GETPOST('search_request_author', 'alpha');
 $search_ht = GETPOST('search_ht', 'alpha');
 $search_ttc = GETPOST('search_ttc', 'alpha');
-$search_status = (GETPOST('search_status', 'alpha') != '' ?GETPOST('search_status', 'alpha') : GETPOST('statut', 'alpha')); // alpha and not intbecause it can be '6,7'
 $optioncss = GETPOST('optioncss', 'alpha');
 $socid = GETPOST('socid', 'int');
 $search_sale = GETPOST('search_sale', 'int');
@@ -92,8 +91,11 @@ $search_project_ref = GETPOST('search_project_ref', 'alpha');
 $search_btn = GETPOST('button_search', 'alpha');
 $search_remove_btn = GETPOST('button_removefilter', 'alpha');
 
-$status = GETPOST('statut', 'alpha');
-$search_status = GETPOST('search_status');
+if (is_array(GETPOST('search_status', 'intcomma'))) {
+	$search_status = join(',', GETPOST('search_status', 'intcomma'));
+} else {
+	$search_status = (GETPOST('search_status', 'intcomma') != '' ? GETPOST('search_status', 'intcomma') : GETPOST('statut', 'intcomma'));
+}
 
 // Security check
 $orderid = GETPOST('orderid', 'int');
@@ -128,7 +130,7 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
 	'cf.ref'=>'Ref',
-	'cf.ref_supplier'=>'RefSupplierOrder',
+	'cf.ref_supplier'=>'RefOrderSupplier',
 	'pd.description'=>'Description',
 	's.nom'=>"ThirdParty",
 	's.name_alias'=>"AliasNameShort",
@@ -177,6 +179,7 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
+$error = 0;
 
 
 /*
@@ -364,30 +367,30 @@ if (empty($reshook))
 							{
 								$fk_parent_line = 0;
 							}
-                            $result = $objecttmp->addline(
+							$result = $objecttmp->addline(
 								$desc,
 								$lines[$i]->subprice,
 								$lines[$i]->tva_tx,
 								$lines[$i]->localtax1_tx,
 								$lines[$i]->localtax2_tx,
-                            	$lines[$i]->qty,
-                            	$lines[$i]->fk_product,
+								$lines[$i]->qty,
+								$lines[$i]->fk_product,
 								$lines[$i]->remise_percent,
 								$date_start,
 								$date_end,
 								0,
 								$lines[$i]->info_bits,
-                            	'HT',
-                            	$product_type,
-                            	$lines[$i]->rang,
-                            	false,
-                            	$lines[$i]->array_options,
-                            	$lines[$i]->fk_unit,
-                            	$objecttmp->origin_id,
-                            	$lines[$i]->pa_ht,
-                            	$lines[$i]->ref_supplier,
-                            	$lines[$i]->special_code,
-                            	$fk_parent_line
+								'HT',
+								$product_type,
+								$lines[$i]->rang,
+								false,
+								$lines[$i]->array_options,
+								$lines[$i]->fk_unit,
+								$objecttmp->origin_id,
+								$lines[$i]->pa_ht,
+								$lines[$i]->ref_supplier,
+								$lines[$i]->special_code,
+								$fk_parent_line
 							);
 							if ($result > 0)
 							{
@@ -501,19 +504,22 @@ $formorder = new FormOrder($db);
 $formother = new FormOther($db);
 $formcompany = new FormCompany($db);
 
-$title = $langs->trans("SuppliersOrders");
+$title = $langs->trans("ListOfSupplierOrders");
 if ($socid > 0)
 {
 	$fourn = new Fournisseur($db);
 	$fourn->fetch($socid);
 	$title .= ' - '.$fourn->name;
 }
-if ($status)
+
+/*if ($search_status)
 {
-	if ($status == '1,2,3') $title .= ' - '.$langs->trans("StatusOrderToProcessShort");
-	if ($status == '6,7') $title .= ' - '.$langs->trans("StatusOrderCanceled");
-	else $title .= ' - '.$commandestatic->LibStatut($status);
-}
+	if ($search_status == '1,2') $title .= ' - '.$langs->trans("SuppliersOrdersToProcess");
+	elseif ($search_status == '3,4') $title .= ' - '.$langs->trans("SuppliersOrdersAwaitingReception");
+	elseif ($search_status == '1,2,3') $title .= ' - '.$langs->trans("StatusOrderToProcessShort");
+	elseif ($search_status == '6,7') $title .= ' - '.$langs->trans("StatusOrderCanceled");
+	elseif (is_numeric($search_status) && $search_status >= 0) $title .= ' - '.$commandestatic->LibStatut($search_status);
+}*/
 if ($search_billed > 0) $title .= ' - '.$langs->trans("Billed");
 
 //$help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Pedidos_de_clientes";
@@ -537,7 +543,7 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 }
 // Add fields from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
@@ -556,6 +562,9 @@ if ($search_user > 0)
 	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
 	$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 $sql .= ' WHERE cf.fk_soc = s.rowid';
 $sql .= ' AND cf.entity IN ('.getEntity('supplier_order').')';
 if ($socid > 0) $sql .= " AND s.rowid = ".$socid;
@@ -569,8 +578,8 @@ if ($search_billed != '' && $search_billed >= 0) $sql .= " AND cf.billed = ".$db
 if ($search_product_category > 0) $sql .= " AND cp.fk_categorie = ".$search_product_category;
 //Required triple check because statut=0 means draft filter
 if (GETPOST('statut', 'intcomma') !== '')
-	$sql .= " AND cf.fk_statut IN (".$db->sanitize($db->escape(GETPOST('statut', 'intcomma'))).")";
-if ($search_status != '' && $search_status >= 0)
+	$sql .= " AND cf.fk_statut IN (".$db->sanitize($db->escape($db->escape(GETPOST('statut', 'intcomma')))).")";
+if ($search_status != '' && $search_status != '-1')
 	$sql .= " AND cf.fk_statut IN (".$db->sanitize($db->escape($search_status)).")";
 $sql .= dolSqlDateFilter("cf.date_commande", $search_orderday, $search_ordermonth, $search_orderyear);
 $sql .= dolSqlDateFilter("cf.date_livraison", $search_deliveryday, $search_deliverymonth, $search_deliveryyear);
@@ -595,7 +604,7 @@ if ($search_project_ref != '') $sql .= natural_search("p.ref", $search_project_r
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
 $sql .= $db->order($sortfield, $sortorder);
@@ -619,15 +628,6 @@ $sql .= $db->plimit($limit + 1, $offset);
 $resql = $db->query($sql);
 if ($resql)
 {
-	if ($socid > 0)
-	{
-		$soc = new Societe($db);
-		$soc->fetch($socid);
-		$title = $langs->trans('ListOfSupplierOrders').' - '.$soc->name;
-	} else {
-		$title = $langs->trans('ListOfSupplierOrders');
-	}
-
 	$num = $db->num_rows($resql);
 
 	$arrayofselected = is_array($toselect) ? $toselect : array();
@@ -667,7 +667,7 @@ if ($resql)
 	if ($search_multicurrency_montant_vat != '')  $param .= '&search_multicurrency_montant_vat='.urlencode($search_multicurrency_montant_vat);
 	if ($search_multicurrency_montant_ttc != '') $param .= '&search_multicurrency_montant_ttc='.urlencode($search_multicurrency_montant_ttc);
 	if ($search_refsupp) 		$param .= "&search_refsupp=".urlencode($search_refsupp);
-	if ($search_status >= 0)  	$param .= "&search_status=".urlencode($search_status);
+	if ($search_status != '' && $search_status != '-1') $param .= "&search_status=".urlencode($search_status);
 	if ($search_project_ref >= 0) $param .= "&search_project_ref=".urlencode($search_project_ref);
 	if ($search_billed != '')   $param .= "&search_billed=".urlencode($search_billed);
 	if ($show_files)            $param .= '&show_files='.urlencode($show_files);
@@ -675,11 +675,15 @@ if ($resql)
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
+	$param .= $hookmanager->resPrint;
+
 	// List of mass actions available
 	$arrayofmassactions = array(
 		'generate_doc'=>$langs->trans("ReGeneratePDF"),
 		'builddoc'=>$langs->trans("PDFMerge"),
-	    'presend'=>$langs->trans("SendByMail"),
+		'presend'=>$langs->trans("SendByMail"),
 	);
 	if ($user->rights->fournisseur->facture->creer) $arrayofmassactions['createbills'] = $langs->trans("CreateInvoiceForThisSupplier");
 	if ($user->rights->fournisseur->commande->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
@@ -744,7 +748,7 @@ if ($resql)
 		print '<br>';
 		print '<div class="center">';
 		print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('CreateInvoiceForThisCustomer').'">  ';
-		print '<input type="submit" class="button" id="cancel" name="cancel" value="'.$langs->trans('Cancel').'">';
+		print '<input type="submit" class="button button-cancel" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 		print '<br>';
 	}
@@ -775,7 +779,7 @@ if ($resql)
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -963,14 +967,14 @@ if ($resql)
 	if (!empty($arrayfields['cf.fk_statut']['checked']))
 	{
 		print '<td class="liste_titre right">';
-		$formorder->selectSupplierOrderStatus((strstr($search_status, ',') ?-1 : $search_status), 1, 'search_status');
+		$formorder->selectSupplierOrderStatus($search_status, 1, 'search_status');
 		print '</td>';
 	}
 	// Status billed
 	if (!empty($arrayfields['cf.billed']['checked']))
 	{
 		print '<td class="liste_titre center">';
-		print $form->selectyesno('search_billed', $search_billed, 1, 0, 1);
+		print $form->selectyesno('search_billed', $search_billed, 1, 0, 1, 1);
 		print '</td>';
 	}
 	// Action column
@@ -1044,6 +1048,7 @@ if ($resql)
 		$objectstatic->total_ht = $obj->total_ht;
 		$objectstatic->total_tva = $obj->total_tva;
 		$objectstatic->total_ttc = $obj->total_ttc;
+		$objectstatic->date_commande = $db->jdate($obj->date_commande);
 		$objectstatic->date_delivery = $db->jdate($obj->date_delivery);
 		$objectstatic->note_public = $obj->note_public;
 		$objectstatic->note_private = $obj->note_private;
@@ -1153,8 +1158,10 @@ if ($resql)
 		if (!empty($arrayfields['cf.date_commande']['checked']))
 		{
 			print '<td class="center">';
-			if ($obj->date_commande) print dol_print_date($db->jdate($obj->date_commande), 'day');
-			else print '';
+			print dol_print_date($db->jdate($obj->date_commande), 'day');
+			if ($objectstatic->hasDelay() && !empty($objectstatic->date_delivery)) {
+				print ' '.img_picto($langs->trans("Late").' : '.$objectstatic->showDelay(), "warning");
+			}
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
@@ -1286,14 +1293,14 @@ if ($resql)
 
 	$db->free($resql);
 
-    $parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-    $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
+	$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 
-    print '</table>'."\n";
-    print '</div>';
+	print '</table>'."\n";
+	print '</div>';
 
-    print '</form>'."\n";
+	print '</form>'."\n";
 
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index 53efd68faa6..dea5ad69afa 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -74,17 +74,17 @@ $now = dol_now();
 
 if ($id > 0 || !empty($ref))
 {
-    if ($result >= 0)
-    {
-        $object->fetch_thirdparty();
+	if ($result >= 0)
+	{
+		$object->fetch_thirdparty();
 
-        $author = new User($db);
-        $author->fetch($object->user_author_id);
+		$author = new User($db);
+		$author->fetch($object->user_author_id);
 
-        $head = ordersupplier_prepare_head($object);
+		$head = ordersupplier_prepare_head($object);
 
-        $title = $langs->trans("SupplierOrder");
-        dol_fiche_head($head, 'note', $title, -1, 'order');
+		$title = $langs->trans("SupplierOrder");
+		print dol_get_fiche_head($head, 'note', $title, -1, 'order');
 
 		// Supplier order card
 
@@ -99,36 +99,36 @@ if ($id > 0 || !empty($ref))
 		// Project
 		if (!empty($conf->projet->enabled))
 		{
-		    $langs->load("projects");
-		    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		    if ($user->rights->fournisseur->commande->creer)
-		    {
-		        if ($action != 'classify') {
-		        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			$langs->load("projects");
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+			if ($user->rights->fournisseur->commande->creer)
+			{
+				if ($action != 'classify') {
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
-                }
-	            if ($action == 'classify') {
-	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-	                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-	                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref .= '</form>';
-	            } else {
-	                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-		    } else {
-		        if (!empty($object->fk_project)) {
-		            $proj = new Project($db);
-		            $proj->fetch($object->fk_project);
-		            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-		            $morehtmlref .= $proj->ref;
-		            $morehtmlref .= '</a>';
-		        } else {
-		            $morehtmlref .= '';
-		        }
-		    }
+				}
+				if ($action == 'classify') {
+					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				if (!empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
+				} else {
+					$morehtmlref .= '';
+				}
+			}
 		}
 		$morehtmlref .= '</div>';
 
@@ -140,16 +140,16 @@ if ($id > 0 || !empty($ref))
 
 
 		$cssclass = "titlefield";
-        include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+		include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-        print '</div>';
+		print '</div>';
 
-        dol_fiche_end();
-    } else {
-        /* Order not found */
-        $langs->load("errors");
-        print $langs->trans("ErrorRecordNotFound");
-    }
+		print dol_get_fiche_end();
+	} else {
+		/* Order not found */
+		$langs->load("errors");
+		print $langs->trans("ErrorRecordNotFound");
+	}
 }
 
 // End of page
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
deleted file mode 100644
index 83dd50a32e0..00000000000
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ /dev/null
@@ -1,635 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 Rodolphe Quiedeville     <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013 Laurent Destailleur   	<eldy@users.sourceforge.net>
- * Copyright (C) 2005      Marc Barilley / Ocebo  	<marc@ocebo.com>
- * Copyright (C) 2005-2012 Regis Houssin          	<regis.houssin@inodbox.com>
- * Copyright (C) 2012	   Andreu Bisquerra Gaya  	<jove@bisquerra.com>
- * Copyright (C) 2012	   David Rodriguez Martinez <davidrm146@gmail.com>
- * Copyright (C) 2012-2017 Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2014	   Florian Henry			<florian.henry@open-concept.pro>
- * Copyright (C) 2015      Marcos García            <marcosgdf@gmail.com>
- * Copyright (C) 2018      Frédéric 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- * \file htdocs/fourn/commande/orderstoinvoice.php
- * \ingroup commande
- * \brief Page to invoice multiple supplier orders
- */
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
-if (!empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-}
-
-// Load translation files required by the page
-$langs->loadLangs(array("orders", "companies", "deliveries"));
-
-if (!$user->rights->fournisseur->facture->creer)
-	accessforbidden();
-
-$id = (GETPOST('id') ? GETPOST('id', 'int') : GETPOST("facid")); // For backward compatibility
-$ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'aZ09');
-$confirm = GETPOST('confirm', 'alpha');
-$sref = GETPOST('sref');
-$sref_client = GETPOST('sref_client');
-$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$socid = GETPOST('socid', 'int');
-$selected = GETPOST('orders_to_invoice');
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
-$search_status = GETPOST('search_status');
-
-if (!$sortfield)
-	$sortfield = 'c.rowid';
-if (!$sortorder)
-	$sortorder = 'DESC';
-
-$now = dol_now();
-$date_start = dol_mktime(0, 0, 0, $_REQUEST["date_startmonth"], $_REQUEST["date_startday"], $_REQUEST["date_startyear"]); // Date for local PHP server
-$date_end = dol_mktime(23, 59, 59, $_REQUEST["date_endmonth"], $_REQUEST["date_endday"], $_REQUEST["date_endyear"]);
-$date_starty = dol_mktime(0, 0, 0, $_REQUEST["date_start_delymonth"], $_REQUEST["date_start_delyday"], $_REQUEST["date_start_delyyear"]); // Date for local PHP server
-$date_endy = dol_mktime(23, 59, 59, $_REQUEST["date_end_delymonth"], $_REQUEST["date_end_delyday"], $_REQUEST["date_end_delyyear"]);
-
-$extrafields = new ExtraFields($db);
-
-$object = new FactureFournisseur($db);
-
-// fetch optionals attributes and labels
-$extrafields->fetch_name_optionals_label($object->table_element);
-
-if ($action == 'create')
-{
-	if (!GETPOST('createbill'))
-	{
-		$action = '';
-	} else {
-		if (!is_array($selected))
-		{
-			//$error++;
-			setEventMessages($langs->trans('Error_OrderNotChecked'), null, 'errors');
-			$action = '';
-		} else {
-			$origin = GETPOST('origin', 'alpha');
-			$originid = GETPOST('originid', 'int');
-		}
-	}
-}
-
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager = new HookManager($db);
-$hookmanager->initHooks(array('orderstoinvoicesupplier'));
-
-
-/*
- * Actions
- */
-
-if (($action == 'create' || $action == 'add') && !$error) {
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
-	if (!empty($conf->projet->enabled))
-		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-
-	// Load translation files required by the page
-    $langs->loadLangs(array("bills", "main", "products"));
-
-	if (isset($_GET['orders_to_invoice'])) {
-		$orders_id = GETPOST('orders_to_invoice', '', 1);
-		$n = count($orders_id);
-		$i = 0;
-
-		$originid = $orders_id[0];
-		$_GET['originid'] = $orders_id[0];
-	}
-	if (isset($_POST['orders_to_invoice'])) {
-		$orders_id = GETPOST('orders_to_invoice', '', 2);
-		$nn = count($orders_id);
-		$ii = 0;
-
-		$originid = $orders_id[0];
-		$_POST['originid'] = $orders_id[0];
-	}
-
-	$projectid = GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : 0;
-	$lineid = GETPOST('lineid', 'int');
-	$userid = GETPOST('userid', 'int');
-	$search_ref = GETPOST('sf_ref') ? GETPOST('sf_ref') : GETPOST('search_ref');
-
-	// Security check
-	if ($user->socid)
-		$socid = $user->socid;
-	$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
-
-	$usehm = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE;
-	$object = new FactureFournisseur($db);
-
-	// Insert new invoice in database
-	if ($action == 'add' && $user->rights->fournisseur->facture->creer) {
-		$object->socid = GETPOST('socid');
-		$db->begin();
-		$error = 0;
-
-		// Standard or deposit or proforma invoice
-		$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
-		if (empty($datefacture)) {
-			$datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
-		}
-		if (!$error) {
-			$object->ref = GETPOST('ref', 'nohtml');
-			$object->ref_supplier = GETPOST('ref_supplier', 'alpha');
-			$object->socid = GETPOST('socid', 'int');
-			$object->libelle = (GETPOSTISSET('libelle') ? GETPOST('libelle', 'nohtml') : GETPOST('label', 'nohtml'));
-			$object->label = (GETPOSTISSET('libelle') ? GETPOST('libelle', 'nohtml') : GETPOST('label', 'nohtml'));
-			$object->date = $datefacture;
-			$object->date_echeance = $datedue;
-			$object->note_public = GETPOST('note_public', 'restricthtml');
-			$object->note_private = GETPOST('note_private', 'restricthtml');
-			$object->cond_reglement_id = GETPOST('cond_reglement_id');
-			$object->mode_reglement_id = GETPOST('mode_reglement_id');
-			$projectid = GETPOST('projectid', 'int');
-			if ($projectid > 0)
-				$object->fk_project = $projectid;
-
-				// Auto calculation of date due if not filled by user
-			if (empty($object->date_echeance))
-				$object->date_echeance = $object->calculate_date_lim_reglement();
-
-			$ret = $extrafields->setOptionalsFromPost(null, $object);
-			if ($ret < 0) $error++;
-
-			if ($_POST['origin'] && $_POST['originid']) {
-				$linked_orders_ids = array();
-				foreach ($orders_id as $origin => $origin_id) {
-					$origin_id = (!empty($origin_id) ? $origin_id : $orders_id[$ii]);
-					$linked_orders_ids[] = $origin_id;
-				}
-				$object->linked_objects = array(GETPOST('origin')=>$linked_orders_ids);
-				$id = $object->create($user);
-
-				if ($id > 0) {
-					while ($ii < $nn) {
-						$objectsrc = new CommandeFournisseur($db);
-						dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
-						$result = $objectsrc->fetch($orders_id[$ii]);
-						if ($result > 0) {
-							$lines = $objectsrc->lines;
-							if (empty($lines) && method_exists($objectsrc, 'fetch_lines')) {
-								$objectsrc->fetch_lines();
-								$lines = $objectsrc->lines;
-							}
-							$fk_parent_line = 0;
-							$num = count($lines);
-							for ($i = 0; $i < $num; $i++) {
-								$desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
-
-								$desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
-								$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
-
-								// Dates
-								// TODO mutualiser
-								$date_start = $lines[$i]->date_debut_prevue;
-								if ($lines[$i]->date_debut_reel)
-									$date_start = $lines[$i]->date_debut_reel;
-								if ($lines[$i]->date_start)
-									$date_start = $lines[$i]->date_start;
-								$date_end = $lines[$i]->date_fin_prevue;
-								if ($lines[$i]->date_fin_reel)
-									$date_end = $lines[$i]->date_fin_reel;
-								if ($lines[$i]->date_end)
-									$date_end = $lines[$i]->date_end;
-
-									// Reset fk_parent_line for no child products and special product
-								if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9) {
-									$fk_parent_line = 0;
-								}
-								// FIXME Missing $lines[$i]->ref_supplier and $lines[$i]->label into addline and updateline methods. They are filled when coming from order for example.
-								$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->qty, $lines[$i]->fk_product, $lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, 'HT', $product_type, -1, false, 0, $lines[$i]->fk_unit, $line[$i]->id);
-
-								if ($result > 0) {
-									$lineid = $result;
-								} else {
-									$lineid = 0;
-									$error++;
-									break;
-								}
-								// Defined the new fk_parent_line
-								if ($result > 0 && $lines[$i]->product_type == 9) {
-									$fk_parent_line = $result;
-								}
-							}
-						} else {
-							$mesgs[] = $objectsrc->error;
-							$error++;
-						}
-						$ii++;
-					}
-				} else {
-					$mesgs[] = $object->error;
-					$error++;
-				}
-			}
-		}
-
-		// End of object creation, we show it
-		if ($id > 0 && !$error) {
-			foreach ($orders_id as $fk_supplier_order) {
-				$supplier_order = new CommandeFournisseur($db);
-				if ($supplier_order->fetch($fk_supplier_order) > 0 && $supplier_order->statut == 5)
-				{
-					if ($supplier_order->classifyBilled($user) < 0)
-					{
-						$db->rollback();
-						$action = 'create';
-						$_GET["origin"] = $_POST["origin"];
-						$_GET["originid"] = $_POST["originid"];
-						$mesgs[] = '<div class="error">'.$object->error.'</div>';
-
-						$error++;
-						break;
-					}
-				}
-			}
-
-			if (!$error) {
-				$db->commit();
-				header('Location: '.DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$id);
-				exit();
-			}
-		} else {
-			$db->rollback();
-			$action = 'create';
-			$_GET["origin"] = $_POST["origin"];
-			$_GET["originid"] = $_POST["originid"];
-			$mesgs[] = '<div class="error">'.$object->error.'</div>';
-		}
-	}
-}
-
-/*
- * View
- */
-
-$html = new Form($db);
-$htmlother = new FormOther($db);
-$formfile = new FormFile($db);
-
-// Mode creation
-if ($action == 'create' && !$error) {
-	llxHeader();
-	print load_fiche_titre($langs->trans('NewBill'));
-
-	$soc = new Societe($db);
-	if ($socid)
-		$res = $soc->fetch($socid);
-	if ($res) {
-        $cond_reglement_id = $soc->cond_reglement_supplier_id;
-        $mode_reglement_id = $soc->mode_reglement_supplier_id;
-	}
-	$dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE) ? -1 : '';
-
-    $objectsrc = new CommandeFournisseur($db);
-    $listoforders = array();
-    foreach ($selected as $sel) {
-        $result = $objectsrc->fetch($sel);
-        if ($result > 0) {
-            $listoforders[] = $objectsrc->ref;
-        }
-
-        if (empty($cond_reglement_id))  $cond_reglement_id = $objectsrc->cond_reglement_id;
-        if (empty($mode_reglement_id))  $mode_reglement_id = $objectsrc->mode_reglement_id;
-    }
-
-	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="action" value="add">';
-	print '<input type="hidden" name="socid" value="'.$soc->id.'">'."\n";
-	print '<input name="ref" type="hidden" value="provisoire">';
-	print '<input type="hidden" name="origin" value="'.GETPOST('origin').'">';
-	print '<input type="hidden" name="originid" value="'.GETPOST('originid').'">';
-	print '<input type="hidden" name="socid" value="'.$soc->id.'">';
-
-	print '<table class="border centpercent">';
-
-	// Ref
-	print '<tr><td class="fieldrequired">'.$langs->trans('Ref').'</td><td>'.$langs->trans('Draft').'</td></tr>';
-
-	// Ref supplier
-	print '<tr><td class="fieldrequired">'.$langs->trans('RefSupplier').'</td><td><input name="ref_supplier" value="'.dol_escape_htmltag(isset($_POST['ref_supplier']) ? GETPOST('ref_supplier', 'alpha', 2) : '').'" type="text"></td>';
-	print '</tr>';
-
-	// Date invoice
-	print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td>';
-	print $html->selectDate('', '', '', '', '', "add", 1, 1);
-	print '</td></tr>';
-	// Payment term
-	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
-	$html->select_conditions_paiements(isset($_POST['cond_reglement_id']) ? $_POST['cond_reglement_id'] : $cond_reglement_id, 'cond_reglement_id');
-	print '</td></tr>';
-	// Payment mode
-	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
-	$html->select_types_paiements(isset($_POST['mode_reglement_id']) ? $_POST['mode_reglement_id'] : $mode_reglement_id, 'mode_reglement_id');
-	print '</td></tr>';
-	// Project
-	if (!empty($conf->projet->enabled)) {
-		$formproject = new FormProjets($db);
-
-		$langs->load('projects');
-		print '<tr><td>'.$langs->trans('Project').'</td><td>';
-		$formproject->select_projects($soc->id, $projectid, 'projectid');
-		print '</td></tr>';
-	}
-
-	// Other attributes
-	$parameters = array(
-			'objectsrc' => $objectsrc,
-			'idsrc' => $listoforders
-	);
-	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-
-	if (empty($reshook))
-	{
-		$object = new FactureFournisseur($db);
-		print $object->showOptionals($extrafields, 'edit');
-	}
-
-	// Modele PDF
-	print '<tr><td>'.$langs->trans('Model').'</td>';
-	print '<td>';
-	$liste = ModelePDFSuppliersInvoices::liste_modeles($db);
-	print $html->selectarray('model', $liste, $conf->global->INVOICE_SUPPLIER_ADDON_PDF);
-	print "</td></tr>";
-
-	// Public note
-	print '<tr>';
-	print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
-	print '<td>';
-	print '<textarea name="note_public" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">';
-
-	print $langs->trans("Orders").": ".implode(', ', $listoforders);
-
-	print '</textarea></td></tr>';
-
-	// Private note
-	if (empty($user->socid)) {
-		print '<tr>';
-		print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
-		print '<td>';
-		print '<textarea name="note" wrap="soft" cols="70" rows="'.ROWS_3.'">';
-
-		print '</textarea></td></tr>';
-	}
-
-	print '</table>';
-
-	while ($i < $n) {
-		print '<input type="hidden" name="orders_to_invoice[]" value="'.$orders_id[$i].'">';
-
-		$i++;
-	}
-
-	// Button "Create Draft"
-	print '<br><div class="center"><input type="submit" class="button" name="bouton" value="'.$langs->trans('CreateDraft').'" /></div>';
-	print "</form>\n";
-
-	print '</td></tr>';
-	print "</table>\n";
-}
-
-// Mode liste
-if (($action != 'create' && $action != 'add') && !$error) {
-	llxHeader();
-	?>
-	<script type="text/javascript">
-		jQuery(document).ready(function() {
-		jQuery("#checkall").click(function() {
-			jQuery(".checkformerge").prop('checked', true);
-		});
-		jQuery("#checknone").click(function() {
-			jQuery(".checkformerge").prop('checked', false);
-		});
-	});
-	</script>
-	<?php
-
-	$sql = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_supplier,';
-	$sql .= ' c.date_valid, c.date_commande, c.date_livraison, c.fk_statut';
-	$sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
-	$sql .= ', '.MAIN_DB_PREFIX.'commande_fournisseur as c';
-	if (!$user->rights->societe->client->voir && !$socid)
-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql .= ' WHERE c.entity = '.$conf->entity;
-	$sql .= ' AND c.fk_soc = s.rowid';
-
-	// Show orders we can bill
-	if (empty($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS))
-	{
-		$sql .= " AND c.fk_statut IN (".$db->sanitize($db->escape(CommandeFournisseur::STATUS_RECEIVED_COMPLETELY)).")"; // Must match filter in htdocs/fourn/card.php
-	} else {
-		// CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.", ".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY
-		$sql .= " AND c.fk_statut IN (".$db->sanitize($db->escape($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS)).")";
-	}
-
-	$sql .= " AND c.billed = 0";
-
-	// Find order that are not already invoiced
-	//No need due to the billed status
-	//$sql .= " AND c.rowid NOT IN (SELECT fk_source FROM " . MAIN_DB_PREFIX . "element_element WHERE targettype='invoice_supplier')";
-
-	if ($socid)
-		$sql .= ' AND s.rowid = '.$socid;
-	if (!$user->rights->societe->client->voir && !$socid)
-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	if ($sref) {
-		$sql .= natural_search("c.ref", $sref);
-	}
-	if ($sall) {
-		$sql .= natural_search(array("c.ref", "c.note"), $sall);
-	}
-
-	// Date filter
-	//$sql.= dolSqlDateFilter("c.date_commande", GETPOST("date_startday", 'int'), GETPOST("date_startmonth", 'int'), GETPOST("date_startyear", 'int'));
-	//$sql.= dolSqlDateFilter("c.date_livraison", $search_deliveryday, $search_deliverymonth, $search_deliveryyear);
-	if ($date_start)
-		$sql .= " AND c.date_commande >= '".$db->idate($date_start)."'";
-	if ($date_end)
-		$sql .= " AND c.date_commande <= '".$db->idate($date_end)."'";
-	if ($date_starty)
-		$sql .= " AND c.date_livraison >= '".$db->idate($date_starty)."'";
-	if ($date_endy)
-		$sql .= "  AND c.date_livraison <= '".$db->idate($date_endy)."'";
-
-	if (!empty($sref_client)) {
-		$sql .= natural_search('c.ref_supplier', $sref_client);
-	}
-	$sql .= ' ORDER BY '.$sortfield.' '.$sortorder;
-	dol_syslog('fourn/commande/ordertoinvoice.php sql='.$sql);
-	$resql = $db->query($sql);
-
-	if ($resql) {
-		if ($socid) {
-			$soc = new Societe($db);
-			$soc->fetch($socid);
-		}
-		$title = $langs->trans('ListOfSupplierOrders');
-		$title .= ' - '.$langs->trans('StatusOrderReceivedAllShort');
-		$title .= ' - '.$soc->getNomUrl(1, 'supplier');
-
-		$num = $db->num_rows($resql);
-
-		print load_fiche_titre($title);
-
-		$i = 0;
-		$period = $html->selectDate($date_start, 'date_start', 0, 0, 1, '', 1, 0).' - '.$html->selectDate($date_end, 'date_end', 0, 0, 1, '', 1, 0);
-		$periodely = $html->selectDate($date_starty, 'date_start_dely', 0, 0, 1, '', 1, 0).' - '.$html->selectDate($date_endy, 'date_end_dely', 0, 0, 1, '', 1, 0);
-
-		print '<form name="orders2invoice" method="GET" action="orderstoinvoice.php">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="socid" value="'.$socid.'">';
-
-
-		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre">';
-		print_liste_field_titre('Ref', 'orderstoinvoice.php', 'c.ref', '', '&amp;socid='.$socid, '', $sortfield, $sortorder);
-		print_liste_field_titre('RefSupplier', 'orderstoinvoice.php', 'c.ref_supplier', '', '&amp;socid='.$socid, '', $sortfield, $sortorder);
-		print_liste_field_titre('OrderDate', 'orderstoinvoice.php', 'c.date_commande', '', '&amp;socid='.$socid, '', $sortfield, $sortorder, 'center ');
-		print_liste_field_titre('DeliveryDate', 'orderstoinvoice.php', 'c.date_livraison', '', '&amp;socid='.$socid, '', $sortfield, $sortorder, 'center ');
-		print_liste_field_titre('Status', '', '', '', '', '', '', '', 'right ');
-		print_liste_field_titre('GenerateBill', '', '', '', '', '', '', '', 'center ');
-		print "</tr>\n";
-
-		// Fields title search
-		print '<tr class="liste_titre">';
-
-		print '<td class="liste_titre">';
-		// REF
-		print '<input class="flat" size="10" type="text" name="sref" value="'.$sref.'">';
-		print '</td>';
-
-		// print '<td class="liste_titre">';
-		print '<td class="liste_titre left">';
-		print '<input class="flat" type="text" size="10" name="sref_client" value="'.$sref_client.'">';
-        print '</td>';
-
-		// DATE ORDER
-		print '<td class="liste_titre center">';
-		print $period;
-		print '</td>';
-
-		// DATE DELIVERY
-		print '<td class="liste_titre center">';
-		print $periodely;
-		print '</td>';
-
-		// SEARCH BUTTON
-		print '<td class="right liste_titre">';
-		print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', '', 1).'"  value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-		print '</td>';
-
-		// ALL/NONE
-		print '<td class="liste_titre center">';
-		if ($conf->use_javascript_ajax)
-			print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a>';
-		print '</td>';
-
-		print '</td></tr>';
-
-		$generic_commande = new CommandeFournisseur($db);
-
-		while ($i < $num) {
-			$objp = $db->fetch_object($resql);
-
-			print '<tr class="oddeven">';
-			print '<td class="nowrap">';
-
-			$generic_commande->id = $objp->rowid;
-			$generic_commande->ref = $objp->ref;
-
-			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-			print '<td class="nobordernopadding nowrap">';
-			print $generic_commande->getNomUrl(1, $objp->fk_statut);
-			print '</td>';
-
-			print '<td width="16" class="right nobordernopadding hideonsmartphone">';
-			$filename = dol_sanitizeFileName($objp->ref);
-			$filedir = $conf->fournisseur->commande->dir_output.'/'.dol_sanitizeFileName($objp->ref);
-			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objp->rowid;
-			print $formfile->getDocumentsLink($generic_commande->element, $filename, $filedir);
-			print '</td></tr></table>';
-			print '</td>';
-
-			print '<td>'.$objp->ref_supplier.'</td>';
-
-			// Order date
-			print '<td class="center nowrap">';
-			print dol_print_date($db->jdate($objp->date_commande), 'day');
-			print '</td>';
-
-			// Delivery date
-			print '<td class="center nowrap">';
-			print dol_print_date($db->jdate($objp->date_livraison), 'day');
-			print '</td>';
-
-			// Statut
-			print '<td class="right nowrap">'.$generic_commande->LibStatut($objp->fk_statut, 5).'</td>';
-
-			// Checkbox
-			print '<td class="center">';
-			print '<input class="flat checkformerge" type="checkbox" name="orders_to_invoice[]" value="'.$objp->rowid.'">';
-			print '</td>';
-
-			print '</tr>';
-
-			$total = $total + $objp->price;
-			$subtotal = $subtotal + $objp->price;
-			$i++;
-		}
-		print '</table>';
-
-		/*
-		 * Boutons actions
-		*/
-		print '<div class="center">';
-		print '<div class="right">';
-		print '<input type="hidden" name="socid" value="'.$socid.'">';
-		print '<input type="hidden" name="action" value="create">';
-		print '<input type="hidden" name="origin" value="order_supplier"><br>';
-		// print '<a class="butAction" href="index.php">'.$langs->trans("GoBack").'</a>';
-		print '<input type="submit" class="butAction" name="createbill" value="'.$langs->trans("GenerateBill").'">';
-		print '</div>';
-		print '</div>';
-
-		print '</form>';
-
-		$db->free($resql);
-	} else {
-		dol_print_error($db);
-	}
-}
-
-dol_htmloutput_mesg($mesg, $mesgs);
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
index 375cf10caa2..57dfb90e3fd 100644
--- a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
@@ -39,10 +39,10 @@ $total = 0;
 $ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink)
 {
-    $ilink++;
+	$ilink++;
 
-    $trclass = 'oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
 	?>
     <tr class="<?php echo $trclass; ?>">
         <td><?php echo $langs->trans("SupplierOrder"); ?></td>
@@ -50,10 +50,10 @@ foreach ($linkedObjectBlock as $key => $objectlink)
     	<td class="left"><?php echo $objectlink->ref_supplier; ?></td>
     	<td class="center"><?php echo dol_print_date($objectlink->date, 'day'); ?></td>
     	<td class="right"><?php
-    	if ($user->rights->fournisseur->commande->lire) {
-    		$total = $total + $objectlink->total_ht;
-    		echo price($objectlink->total_ht);
-    	} ?></td>
+		if ($user->rights->fournisseur->commande->lire) {
+			$total = $total + $objectlink->total_ht;
+			echo price($objectlink->total_ht);
+		} ?></td>
     	<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
     	<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
     </tr>
@@ -61,7 +61,7 @@ foreach ($linkedObjectBlock as $key => $objectlink)
 }
 if (count($linkedObjectBlock) > 1)
 {
-    ?>
+	?>
     <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
         <td><?php echo $langs->trans("Total"); ?></td>
         <td></td>
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index edcccbc6a88..781fd4b6e9a 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -37,8 +37,8 @@ llxHeader();
 // Security check
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -69,21 +69,21 @@ $sql .= " AND s.entity IN (".getEntity('societe').")";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 
 if (dol_strlen($stcomm)) {
-    $sql .= " AND s.fk_stcomm=$stcomm";
+	$sql .= " AND s.fk_stcomm=$stcomm";
 }
 
 if (dol_strlen($begin)) {
-    $sql .= " AND p.name LIKE '$begin%'";
+	$sql .= " AND p.name LIKE '$begin%'";
 }
 
 if ($contactname) {
-    $sql .= " AND p.name LIKE '%".strtolower($contactname)."%'";
-    $sortfield = "p.name";
-    $sortorder = "ASC";
+	$sql .= " AND p.name LIKE '%".strtolower($contactname)."%'";
+	$sortfield = "p.name";
+	$sortorder = "ASC";
 }
 
 if ($socid) {
-    $sql .= " AND s.rowid = ".$socid;
+	$sql .= " AND s.rowid = ".$socid;
 }
 
 $sql .= " ORDER BY $sortfield $sortorder ";
@@ -92,40 +92,40 @@ $sql .= $db->plimit($limit, $offset);
 $result = $db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
+	$num = $db->num_rows($result);
 
-    $title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses"));
-    print_barre_liste($title." (".$langs->trans("Suppliers").")", $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num);
+	$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses"));
+	print_barre_liste($title." (".$langs->trans("Suppliers").")", $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num);
 
-    print '<table class="liste centpercent">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Lastname", $_SERVER["PHP_SELF"], "p.name", $begin, "", "", $sortfield, $sortorder);
-    print_liste_field_titre("Firstname", $_SERVER["PHP_SELF"], "p.firstname", $begin, "", "", $sortfield, $sortorder);
-    print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", $begin, "", "", $sortfield, $sortorder);
-    print_liste_field_titre("Email");
-    print_liste_field_titre("Phone");
-    print "</tr>\n";
+	print '<table class="liste centpercent">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Lastname", $_SERVER["PHP_SELF"], "p.name", $begin, "", "", $sortfield, $sortorder);
+	print_liste_field_titre("Firstname", $_SERVER["PHP_SELF"], "p.firstname", $begin, "", "", $sortfield, $sortorder);
+	print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", $begin, "", "", $sortfield, $sortorder);
+	print_liste_field_titre("Email");
+	print_liste_field_titre("Phone");
+	print "</tr>\n";
 
-    $i = 0;
-    while ($i < min($num, $limit))
-    {
-        $obj = $db->fetch_object($result);
+	$i = 0;
+	while ($i < min($num, $limit))
+	{
+		$obj = $db->fetch_object($result);
 
-        print '<tr class="oddeven">';
+		print '<tr class="oddeven">';
 
-        print '<td><a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$obj->cidp.'">'.img_object($langs->trans("ShowContact"), "contact").' '.$obj->lastname.'</a></td>';
-        print '<td>'.$obj->firstname.'</td>';
-        print '<td><a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"), "company").' '.$obj->name.'</a></td>';
-        print '<td>'.$obj->email.'</td>';
-        print '<td>'.$obj->phone.'</td>';
+		print '<td><a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$obj->cidp.'">'.img_object($langs->trans("ShowContact"), "contact").' '.$obj->lastname.'</a></td>';
+		print '<td>'.$obj->firstname.'</td>';
+		print '<td><a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"), "company").' '.$obj->name.'</a></td>';
+		print '<td>'.$obj->email.'</td>';
+		print '<td>'.$obj->phone.'</td>';
 
-        print "</tr>\n";
-        $i++;
-    }
-    print "</table>";
-    $db->free($result);
+		print "</tr>\n";
+		$i++;
+	}
+	print "</table>";
+	$db->free($result);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // End of page
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index b0f178c6fc4..b439e5cad45 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -8,8 +8,8 @@
  * Copyright (C) 2013-2015	Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2014-2016  Marcos García			<marcosgdf@gmail.com>
- * Copyright (C) 2016-2017	Alexandre Spangaro		<aspangaro@open-dsi.fr>
- * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2016-2020	Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2019       Ferran Marcet	        <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -57,7 +57,7 @@ if (!empty($conf->variants->enabled)) {
 if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 
 
-$langs->loadLangs(array('bills', 'compta', 'suppliers', 'companies', 'products', 'banks'));
+$langs->loadLangs(array('bills', 'compta', 'suppliers', 'companies', 'products', 'banks', 'admin'));
 if (!empty($conf->incoterm->enabled)) $langs->load('incoterm');
 
 $id = (GETPOST('facid', 'int') ? GETPOST('facid', 'int') : GETPOST('id', 'int'));
@@ -101,18 +101,18 @@ $isdraft = (($object->statut == FactureFournisseur::STATUS_DRAFT) ? 1 : 0);
 $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture', 'fk_soc', 'rowid', $isdraft);
 
 // Common permissions
-$usercanread		= $user->rights->fournisseur->facture->lire;
+$usercanread = $user->rights->fournisseur->facture->lire;
 $usercancreate		= $user->rights->fournisseur->facture->creer;
 $usercandelete		= $user->rights->fournisseur->facture->supprimer;
 
 // Advanced permissions
-$usercanvalidate	= ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_invoice_advance->validate)));
-$usercansend		= (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->fournisseur->supplier_invoice_advance->send);
+$usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_invoice_advance->validate)));
+$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->fournisseur->supplier_invoice_advance->send);
 
 // Permissions for includes
 $permissionnote		= $usercancreate; // Used by the include of actions_setnotes.inc.php
-$permissiondellink	= $usercancreate; // Used by the include of actions_dellink.inc.php
-$permissiontoedit	= $usercancreate; // Used by the include of actions_lineupdown.inc.php
+$permissiondellink = $usercancreate; // Used by the include of actions_dellink.inc.php
+$permissiontoedit = $usercancreate; // Used by the include of actions_lineupdown.inc.php
 $permissiontoadd	= $usercancreate; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 
 
@@ -153,21 +153,21 @@ if (empty($reshook))
 	// Action clone object
 	if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd)
 	{
-	    $objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone. We use native clone to keep this->db valid.
+		$objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone. We use native clone to keep this->db valid.
 
-	    if (GETPOST('newsupplierref', 'alphanohtml')) $objectutil->ref_supplier = GETPOST('newsupplierref', 'alphanohtml');
-	    $objectutil->date = dol_mktime(12, 0, 0, GETPOST('newdatemonth', 'int'), GETPOST('newdateday', 'int'), GETPOST('newdateyear', 'int'));
+		if (GETPOST('newsupplierref', 'alphanohtml')) $objectutil->ref_supplier = GETPOST('newsupplierref', 'alphanohtml');
+		$objectutil->date = dol_mktime(12, 0, 0, GETPOST('newdatemonth', 'int'), GETPOST('newdateday', 'int'), GETPOST('newdateyear', 'int'));
 
-	    $result = $objectutil->createFromClone($user, $id);
-        if ($result > 0)
-        {
-        	header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
-        	exit;
-        } else {
-        	$langs->load("errors");
-        	setEventMessages($objectutil->error, $objectutil->errors, 'errors');
-        	$action = '';
-        }
+		$result = $objectutil->createFromClone($user, $id);
+		if ($result > 0)
+		{
+			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
+			exit;
+		} else {
+			$langs->load("errors");
+			setEventMessages($objectutil->error, $objectutil->errors, 'errors');
+			$action = '';
+		}
 	}	elseif ($action == 'confirm_valid' && $confirm == 'yes' && $usercanvalidate) {
 		$idwarehouse = GETPOST('idwarehouse');
 
@@ -227,7 +227,7 @@ if (empty($reshook))
 
 		$isErasable = $object->is_erasable();
 
-		if (($usercandelete && $isErasable > 0)	|| ($usercancreate && $isErasable == 1))
+		if (($usercandelete && $isErasable > 0) || ($usercancreate && $isErasable == 1))
 		{
 			$result = $object->delete($user);
 			if ($result > 0)
@@ -317,7 +317,39 @@ if (empty($reshook))
 	// payments conditions
 	if ($action == 'setconditions' && $usercancreate)
 	{
-		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
+		$object->fetch($id);
+		$object->cond_reglement_code = 0; // To clean property
+		$object->cond_reglement_id = 0; // To clean property
+
+		$error = 0;
+
+		$db->begin();
+
+		if (!$error) {
+			$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
+			if ($result < 0) {
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
+
+		if (!$error) {
+			$old_date_echeance = $object->date_echeance;
+			$new_date_echeance = $object->calculate_date_lim_reglement();
+			if ($new_date_echeance > $old_date_echeance) $object->date_echeance = $new_date_echeance;
+			if ($object->date_echeance < $object->date) $object->date_echeance = $object->date;
+			$result = $object->update($user);
+			if ($result < 0) {
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
+
+		if ($error) {
+			$db->rollback();
+		} else {
+			$db->commit();
+		}
 	}
 
 	// Set incoterm
@@ -347,6 +379,12 @@ if (empty($reshook))
 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
 	}
 
+	// transport mode
+	if ($action == 'settransportmode' && $user->rights->fournisseur->facture->creer)
+	{
+		$result = $object->setTransportMode(GETPOST('transport_mode_id', 'int'));
+	}
+
 	// Set label
 	elseif ($action == 'setlabel' && $usercancreate)
 	{
@@ -661,6 +699,7 @@ if (empty($reshook))
 				$object->location_incoterms	= GETPOST('location_incoterms', 'alpha');
 				$object->multicurrency_code	= GETPOST('multicurrency_code', 'alpha');
 				$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
+				$object->transport_mode_id	= GETPOST('transport_mode_id', 'int');
 
 				// Proprietes particulieres a facture de remplacement
 				$object->fk_facture_source = GETPOST('fac_replacement');
@@ -726,6 +765,7 @@ if (empty($reshook))
 				$object->location_incoterms	= GETPOST('location_incoterms', 'alpha');
 				$object->multicurrency_code	= GETPOST('multicurrency_code', 'alpha');
 				$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
+				$object->transport_mode_id	= GETPOST('transport_mode_id', 'int');
 
 				// Proprietes particulieres a facture avoir
 				$object->fk_facture_source = $sourceinvoice > 0 ? $sourceinvoice : '';
@@ -838,6 +878,7 @@ if (empty($reshook))
 				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
 				$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
+				$object->transport_mode_id = GETPOST('transport_mode_id');
 
 				// Auto calculation of date due if not filled by user
 				if (empty($object->date_echeance)) $object->date_echeance = $object->calculate_date_lim_reglement();
@@ -1041,7 +1082,7 @@ if (empty($reshook))
 		$object->fetch($id);
 		$object->fetch_thirdparty();
 
-        $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
+		$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 
 		if (GETPOST('price_ht') != '')
 		{
@@ -1077,17 +1118,17 @@ if (empty($reshook))
 		$date_start = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), GETPOST('date_startsec'), GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
 		$date_end = dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), GETPOST('date_endsec'), GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
 
-	    // Define info_bits
-	    $info_bits = 0;
-	    if (preg_match('/\*/', $tva_tx))
-	    	$info_bits |= 0x01;
+		// Define info_bits
+		$info_bits = 0;
+		if (preg_match('/\*/', $tva_tx))
+			$info_bits |= 0x01;
 
-	    // Define vat_rate
-	    $tva_tx = str_replace('*', '', $tva_tx);
-        $localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $object->thirdparty);
-        $localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $object->thirdparty);
+		// Define vat_rate
+		$tva_tx = str_replace('*', '', $tva_tx);
+		$localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $object->thirdparty);
+		$localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $object->thirdparty);
 
-        $remise_percent = GETPOST('remise_percent');
+		$remise_percent = GETPOST('remise_percent');
 		$pu_ht_devise = GETPOST('multicurrency_subprice');
 
 		// Extrafields Lines
@@ -1100,12 +1141,12 @@ if (empty($reshook))
 			}
 		}
 
-        $result = $object->updateline(GETPOST('lineid'), $label, $up, $tva_tx, $localtax1_tx, $localtax2_tx, GETPOST('qty'), GETPOST('productid'), $price_base_type, $info_bits, $type, $remise_percent, 0, $date_start, $date_end, $array_options, $_POST['units'], $pu_ht_devise, GETPOST('fourn_ref', 'alpha'));
-        if ($result >= 0)
-        {
-            unset($_POST['label']);
-            unset($_POST['fourn_ref']);
-            unset($_POST['date_starthour']);
+		$result = $object->updateline(GETPOST('lineid'), $label, $up, $tva_tx, $localtax1_tx, $localtax2_tx, GETPOST('qty'), GETPOST('productid'), $price_base_type, $info_bits, $type, $remise_percent, 0, $date_start, $date_end, $array_options, $_POST['units'], $pu_ht_devise, GETPOST('fourn_ref', 'alpha'));
+		if ($result >= 0)
+		{
+			unset($_POST['label']);
+			unset($_POST['fourn_ref']);
+			unset($_POST['date_starthour']);
 			unset($_POST['date_startmin']);
 			unset($_POST['date_startsec']);
 			unset($_POST['date_startday']);
@@ -1250,7 +1291,7 @@ if (empty($reshook))
 
 				// if we use supplier description of the products
 				if (!empty($productsupplier->desc_supplier) && !empty($conf->global->PRODUIT_FOURN_TEXTS)) {
-				    $desc = $productsupplier->desc_supplier;
+					$desc = $productsupplier->desc_supplier;
 				} else $desc = $productsupplier->description;
 
 				if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
@@ -1301,8 +1342,8 @@ if (empty($reshook))
 					$array_options,
 					$productsupplier->fk_unit,
 					0,
-                    $pu_ht_devise,
-                    $ref_supplier,
+					$pu_ht_devise,
+					$ref_supplier,
 					''
 				);
 			}
@@ -1430,34 +1471,34 @@ if (empty($reshook))
 
 		if (!$ventilExportCompta)
 		{
-		    // On verifie si aucun paiement n'a ete effectue
+			// 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');
+			{
+				$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))
@@ -1507,7 +1548,7 @@ if (empty($reshook))
 	$triggersendname = 'BILL_SUPPLIER_SENTBYMAIL';
 	$paramname = 'id';
 	$autocopy = 'MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO';
-	$trackid = 'sin'.$object->id;
+	$trackid = 'sinv'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 	// Actions to build doc
@@ -1563,7 +1604,8 @@ if (empty($reshook))
 			if ($result > 0 && $id > 0)
 			{
 				$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-				$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+				$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+				$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 			}
 
 			if ($result >= 0)
@@ -1687,6 +1729,7 @@ if ($action == 'create')
 		$remise_percent 	= (!empty($objectsrc->remise_percent) ? $objectsrc->remise_percent : (!empty($soc->remise_supplier_percent) ? $soc->remise_supplier_percent : 0));
 		$remise_absolue 	= (!empty($objectsrc->remise_absolue) ? $objectsrc->remise_absolue : (!empty($soc->remise_absolue) ? $soc->remise_absolue : 0));
 		$dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '';
+		$transport_mode_id = (!empty($objectsrc->transport_mode_id) ? $objectsrc->transport_mode_id : (!empty($soc->transport_mode_id) ? $soc->transport_mode_id : 0));
 
 		if (!empty($conf->multicurrency->enabled))
 		{
@@ -1705,6 +1748,7 @@ if ($action == 'create')
 	} else {
 		$cond_reglement_id 	= $societe->cond_reglement_supplier_id;
 		$mode_reglement_id 	= $societe->mode_reglement_supplier_id;
+		$transport_mode_id = $societe->transport_mode_supplier_id;
 		$fk_account         = $societe->fk_account;
 		$datetmp = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 		$dateinvoice = ($datetmp == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datetmp);
@@ -1724,8 +1768,8 @@ if ($action == 'create')
 		$mode_reglement_id = GETPOST("mode_reglement_id");
 	}
 
-	$note_public = $object->getDefaultCreateValueFor('note_public', ((! empty($origin) && ! empty($originid) && is_object($objectsrc) && !empty($conf->global->FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM))?$objectsrc->note_public:null));
-	$note_private = $object->getDefaultCreateValueFor('note_private', ((! empty($origin) && ! empty($originid) && is_object($objectsrc) && !empty($conf->global->FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM))?$objectsrc->note_private:null));
+	$note_public = $object->getDefaultCreateValueFor('note_public', ((!empty($origin) && !empty($originid) && is_object($objectsrc) && !empty($conf->global->FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM)) ? $objectsrc->note_public : null));
+	$note_private = $object->getDefaultCreateValueFor('note_private', ((!empty($origin) && !empty($originid) && is_object($objectsrc) && !empty($conf->global->FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM)) ? $objectsrc->note_private : null));
 
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -1735,7 +1779,7 @@ if ($action == 'create')
 	print '<input type="hidden" name="originid" value="'.$originid.'">';
 	if (!empty($currency_tx)) print '<input type="hidden" name="originmulticurrency_tx" value="'.$currency_tx.'">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">';
 
@@ -1771,9 +1815,9 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Ref supplier
-    print '<tr><td class="fieldrequired">'.$langs->trans('RefSupplier').'</td><td><input name="ref_supplier" value="'.(isset($_POST['ref_supplier']) ? $_POST['ref_supplier'] : $objectsrc->ref_supplier).'" type="text"';
-    if ($societe->id > 0) print ' autofocus';
-    print '></td>';
+	print '<tr><td class="fieldrequired">'.$langs->trans('RefSupplier').'</td><td><input name="ref_supplier" value="'.(isset($_POST['ref_supplier']) ? $_POST['ref_supplier'] : $objectsrc->ref_supplier).'" type="text"';
+	if ($societe->id > 0) print ' autofocus';
+	print '></td>';
 	print '</tr>';
 
 	print '<tr><td class="tdtop fieldrequired">'.$langs->trans('Type').'</td><td>';
@@ -2053,13 +2097,22 @@ if ($action == 'create')
 		print '</td></tr>';
 	}
 
+	// Intracomm report
+	if (!empty($conf->intracommreport->enabled))
+	{
+		$langs->loadLangs(array("intracommreport"));
+		print '<tr><td>'.$langs->trans('IntracommReportTransportMode').'</td><td>';
+		$form->selectModeTransport(isset($_POST['transport_mode_id']) ? $_POST['transport_mode_id'] : $transport_mode_id, 'transport_mode_id');
+		print '</td></tr>';
+	}
+
 	// Public note
 	print '<tr><td>'.$langs->trans('NotePublic').'</td>';
 	print '<td>';
 	$doleditor = new DolEditor('note_public', (GETPOSTISSET('note_public') ?GETPOST('note_public', 'restricthtml') : $note_public), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
 	print $doleditor->Create(1);
 	print '</td>';
-    // print '<td><textarea name="note" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea></td>';
+	// print '<td><textarea name="note" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea></td>';
 	print '</tr>';
 
 	// Private note
@@ -2109,7 +2162,7 @@ if ($action == 'create')
 			}
 		}
 
-		echo '</td></tr>';
+		print '</td></tr>';
 		print '<tr><td>'.$langs->trans('AmountHT').'</td><td>'.price($objectsrc->total_ht).'</td></tr>';
 		print '<tr><td>'.$langs->trans('AmountVAT').'</td><td>'.price($objectsrc->total_tva)."</td></tr>";
 		if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) //Localtax1
@@ -2139,12 +2192,12 @@ if ($action == 'create')
 	// Bouton "Create Draft"
 	print "</table>\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="bouton" value="'.$langs->trans('CreateDraft').'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+	print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 	print '</div>';
 
 	print "</form>\n";
@@ -2222,7 +2275,7 @@ if ($action == 'create')
 		$head = facturefourn_prepare_head($object);
 		$titre = $langs->trans('SupplierInvoice');
 
-		dol_fiche_head($head, 'card', $titre, -1, 'bill');
+		print dol_get_fiche_head($head, 'card', $titre, -1, 'bill');
 
 		$formconfirm = '';
 
@@ -2241,34 +2294,71 @@ if ($action == 'create')
 		{
 			// Create an array for form
 			$formquestion = array(
-			    array('type' => 'text', 'name' => 'newsupplierref', 'label' => $langs->trans("RefSupplier"), 'value' => $langs->trans("CopyOf").' '.$object->ref_supplier),
-			    array('type' => 'date', 'name' => 'newdate', 'label' => $langs->trans("Date"), 'value' => dol_now())
+				array('type' => 'text', 'name' => 'newsupplierref', 'label' => $langs->trans("RefSupplier"), 'value' => $langs->trans("CopyOf").' '.$object->ref_supplier),
+				array('type' => 'date', 'name' => 'newdate', 'label' => $langs->trans("Date"), 'value' => dol_now())
 			);
 			// Ask confirmation to clone
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneInvoice', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 250);
 		}
 
-		// Confirmation de la validation
+		// Confirmation of validation
 		if ($action == 'valid')
 		{
-			 // on verifie si l'objet est en numerotation provisoire
-			$objectref = substr($object->ref, 1, 4);
-			if ($objectref == 'PROV')
-			{
-				$savdate = $object->date;
+			// We check if number is temporary number
+			if (preg_match('/^[\(]?PROV/i', $object->ref) || empty($object->ref)) {
+				// empty should not happened, but when it occurs, the test save life
 				$numref = $object->getNextNumRef($societe);
 			} else {
 				$numref = $object->ref;
 			}
 
-			$text = $langs->trans('ConfirmValidateBill', $numref);
-			/*if (! empty($conf->notification->enabled))
-            {
-            	require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
-            	$notify=new Notify($db);
-            	$text.='<br>';
-            	$text.=$notify->confirmMessage('BILL_SUPPLIER_VALIDATE',$object->socid, $object);
-            }*/
+			if ($numref < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = '';
+			} else {
+				$text = $langs->trans('ConfirmValidateBill', $numref);
+				/*if (! empty($conf->notification->enabled))
+				 {
+				 require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
+				 $notify=new Notify($db);
+				 $text.='<br>';
+				 $text.=$notify->confirmMessage('BILL_SUPPLIER_VALIDATE',$object->socid, $object);
+				 }*/
+				$formquestion = array();
+
+				$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);
+				}
+
+				if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
+				{
+					$langs->load("stocks");
+					require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+					$formproduct = new FormProduct($db);
+					$warehouse = new Entrepot($db);
+					$warehouse_array = $warehouse->list_array();
+					if (count($warehouse_array) == 1) {
+						$label = $object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("WarehouseForStockDecrease", current($warehouse_array)) : $langs->trans("WarehouseForStockIncrease", current($warehouse_array));
+						$value = '<input type="hidden" id="idwarehouse" name="idwarehouse" value="'.key($warehouse_array).'">';
+					} else {
+						$label = $object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("SelectWarehouseForStockDecrease") : $langs->trans("SelectWarehouseForStockIncrease");
+						$value = $formproduct->selectWarehouses(GETPOST('idwarehouse') ?GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1);
+					}
+					$formquestion = array(
+						array('type' => 'other', 'name' => 'idwarehouse', 'label' => $label, 'value' => $value)
+					);
+				}
+
+				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateBill'), $text, 'confirm_valid', $formquestion, 1, 1);
+			}
+		}
+
+		// Confirmation edit (back to draft)
+		if ($action == 'edit')
+		{
 			$formquestion = array();
 
 			$qualified_for_stock_change = 0;
@@ -2278,60 +2368,25 @@ if ($action == 'create')
 			} else {
 				$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
-
-            if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
-            {
-                $langs->load("stocks");
-                require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-                $formproduct = new FormProduct($db);
-                $warehouse = new Entrepot($db);
-                $warehouse_array = $warehouse->list_array();
-                if (count($warehouse_array) == 1) {
-                    $label = $object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("WarehouseForStockDecrease", current($warehouse_array)) : $langs->trans("WarehouseForStockIncrease", current($warehouse_array));
-                    $value = '<input type="hidden" id="idwarehouse" name="idwarehouse" value="'.key($warehouse_array).'">';
-                } else {
-                    $label = $object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("SelectWarehouseForStockDecrease") : $langs->trans("SelectWarehouseForStockIncrease");
-                    $value = $formproduct->selectWarehouses(GETPOST('idwarehouse') ?GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1);
-                }
-                $formquestion = array(
-                    array('type' => 'other', 'name' => 'idwarehouse', 'label' => $label, 'value' => $value)
-                );
-            }
-
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateBill'), $text, 'confirm_valid', $formquestion, 1, 1);
-        }
-
-        // Confirmation edit (back to draft)
-        if ($action == 'edit')
-        {
-            $formquestion = array();
-
-            $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);
-            }
-            if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
-            {
-                $langs->load("stocks");
-                require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-                $formproduct = new FormProduct($db);
-                $warehouse = new Entrepot($db);
-                $warehouse_array = $warehouse->list_array();
-                if (count($warehouse_array) == 1) {
-                    $label = $object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("WarehouseForStockIncrease", current($warehouse_array)) : $langs->trans("WarehouseForStockDecrease", current($warehouse_array));
-                    $value = '<input type="hidden" id="idwarehouse" name="idwarehouse" value="'.key($warehouse_array).'">';
-                } else {
-                    $label = $object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("SelectWarehouseForStockIncrease") : $langs->trans("SelectWarehouseForStockDecrease");
-                    $value = $formproduct->selectWarehouses(GETPOST('idwarehouse') ?GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1);
-                }
-                $formquestion = array(
-                    array('type' => 'other', 'name' => 'idwarehouse', 'label' => $label, 'value' => $value)
-                );
-            }
-            $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('UnvalidateBill'), $langs->trans('ConfirmUnvalidateBill', $object->ref), 'confirm_edit', $formquestion, 1, 1);
+			if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
+			{
+				$langs->load("stocks");
+				require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+				$formproduct = new FormProduct($db);
+				$warehouse = new Entrepot($db);
+				$warehouse_array = $warehouse->list_array();
+				if (count($warehouse_array) == 1) {
+					$label = $object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("WarehouseForStockIncrease", current($warehouse_array)) : $langs->trans("WarehouseForStockDecrease", current($warehouse_array));
+					$value = '<input type="hidden" id="idwarehouse" name="idwarehouse" value="'.key($warehouse_array).'">';
+				} else {
+					$label = $object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("SelectWarehouseForStockIncrease") : $langs->trans("SelectWarehouseForStockDecrease");
+					$value = $formproduct->selectWarehouses(GETPOST('idwarehouse') ?GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1);
+				}
+				$formquestion = array(
+					array('type' => 'other', 'name' => 'idwarehouse', 'label' => $label, 'value' => $value)
+				);
+			}
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('UnvalidateBill'), $langs->trans('ConfirmUnvalidateBill', $object->ref), 'confirm_edit', $formquestion, 1, 1);
 		}
 
 		// Confirmation set paid
@@ -2369,109 +2424,111 @@ if ($action == 'create')
 		print $formconfirm;
 
 
-        // Supplier invoice card
-        $linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+		// Supplier invoice card
+		$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-    	$morehtmlref = '<div class="refidno">';
-    	// Ref supplier
-    	$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', 0, 1);
-    	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', null, null, '', 1);
-    	// Thirdparty
-    	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-    	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
-    	// Project
-    	if (!empty($conf->projet->enabled))
-    	{
-    	    $langs->load("projects");
-    	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-    	    if ($usercancreate)
-    	    {
-                if ($action != 'classify') {
-                    $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-                }
-                if ($action == 'classify') {
-                    //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                    $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                    $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                    $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                    $morehtmlref .= $formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                    $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                    $morehtmlref .= '</form>';
-                } else {
-                    $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-                }
-    	    } else {
-    	        if (!empty($object->fk_project)) {
-    	            $proj = new Project($db);
-    	            $proj->fetch($object->fk_project);
-    	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-    	            $morehtmlref .= $proj->ref;
-    	            $morehtmlref .= '</a>';
-    	        } else {
-    	            $morehtmlref .= '';
-    	        }
-    	    }
-    	}
-    	$morehtmlref .= '</div>';
+		$morehtmlref = '<div class="refidno">';
+		// Ref supplier
+		$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', null, null, '', 1);
+		// Thirdparty
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
+		// Project
+		if (!empty($conf->projet->enabled))
+		{
+			$langs->load("projects");
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+			if ($usercancreate)
+			{
+				if ($action != 'classify') {
+					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+				}
+				if ($action == 'classify') {
+					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				if (!empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
+				} else {
+					$morehtmlref .= '';
+				}
+			}
+		}
+		$morehtmlref .= '</div>';
 
-    	$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+		$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
-    	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-    	print '<div class="fichecenter">';
-    	print '<div class="fichehalfleft">';
-    	print '<div class="underbanner clearboth"></div>';
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
+		print '<div class="underbanner clearboth"></div>';
 
-    	print '<table class="border tableforfield" width="100%">';
+		print '<table class="border tableforfield" width="100%">';
 
-        // Type
-        print '<tr><td class="titlefield">'.$langs->trans('Type').'</td><td>';
-        print $object->getLibType();
-        if ($object->type == FactureFournisseur::TYPE_REPLACEMENT)
-        {
-            $facreplaced = new FactureFournisseur($db);
-            $facreplaced->fetch($object->fk_facture_source);
-            print ' ('.$langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1)).')';
-        }
-        if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE)
-        {
-            $facusing = new FactureFournisseur($db);
-            $facusing->fetch($object->fk_facture_source);
-            print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')';
-        }
+		// Type
+		print '<tr><td class="titlefield">'.$langs->trans('Type').'</td><td>';
+		print '<span class="badgeneutral">';
+		print $object->getLibType();
+		print '</span>';
+		if ($object->type == FactureFournisseur::TYPE_REPLACEMENT)
+		{
+			$facreplaced = new FactureFournisseur($db);
+			$facreplaced->fetch($object->fk_facture_source);
+			print ' ('.$langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1)).')';
+		}
+		if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE)
+		{
+			$facusing = new FactureFournisseur($db);
+			$facusing->fetch($object->fk_facture_source);
+			print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')';
+		}
 
-        $facidavoir = $object->getListIdAvoirFromInvoice();
-        if (count($facidavoir) > 0)
-        {
-            print ' ('.$langs->transnoentities("InvoiceHasAvoir");
-            $i = 0;
-            foreach ($facidavoir as $id)
-            {
-                if ($i == 0) print ' ';
-                else print ',';
-                $facavoir = new FactureFournisseur($db);
-                $facavoir->fetch($id);
-                print $facavoir->getNomUrl(1);
-            }
-            print ')';
-        }
-        if (isset($facidnext) && $facidnext > 0)
-        {
-            $facthatreplace = new FactureFournisseur($db);
-            $facthatreplace->fetch($facidnext);
-            print ' ('.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)).')';
-        }
-        if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT) {
-            $discount = new DiscountAbsolute($db);
-            $result = $discount->fetch(0, 0, $object->id);
-            if ($result > 0) {
-                print '. '.$langs->trans("CreditNoteConvertedIntoDiscount", $object->getLibType(1), $discount->getNomUrl(1, 'discount')).'<br>';
-            }
-        }
-        print '</td></tr>';
+		$facidavoir = $object->getListIdAvoirFromInvoice();
+		if (count($facidavoir) > 0)
+		{
+			print ' ('.$langs->transnoentities("InvoiceHasAvoir");
+			$i = 0;
+			foreach ($facidavoir as $id)
+			{
+				if ($i == 0) print ' ';
+				else print ',';
+				$facavoir = new FactureFournisseur($db);
+				$facavoir->fetch($id);
+				print $facavoir->getNomUrl(1);
+			}
+			print ')';
+		}
+		if (isset($facidnext) && $facidnext > 0)
+		{
+			$facthatreplace = new FactureFournisseur($db);
+			$facthatreplace->fetch($facidnext);
+			print ' ('.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)).')';
+		}
+		if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT) {
+			$discount = new DiscountAbsolute($db);
+			$result = $discount->fetch(0, 0, $object->id);
+			if ($result > 0) {
+				print ' '.$langs->trans("CreditNoteConvertedIntoDiscount", $object->getLibType(1), $discount->getNomUrl(1, 'discount')).'<br>';
+			}
+		}
+		print '</td></tr>';
 
 
-        // Relative and absolute discounts
+		// Relative and absolute discounts
 		print '<!-- Discounts --><tr><td>'.$langs->trans('Discounts');
 		print '</td><td>';
 
@@ -2482,18 +2539,18 @@ if ($action == 'create')
 
 		print '</td></tr>';
 
-        // Label
-        print '<tr>';
-        print '<td>'.$form->editfieldkey("Label", 'label', $object->label, $object, ($usercancreate)).'</td>';
-        print '<td>'.$form->editfieldval("Label", 'label', $object->label, $object, ($usercancreate)).'</td>';
-        print '</tr>';
+		// Label
+		print '<tr>';
+		print '<td>'.$form->editfieldkey("Label", 'label', $object->label, $object, ($usercancreate)).'</td>';
+		print '<td>'.$form->editfieldval("Label", 'label', $object->label, $object, ($usercancreate)).'</td>';
+		print '</tr>';
 
-	    $form_permission = ($object->statut < FactureFournisseur::STATUS_CLOSED) && $usercancreate && ($object->getSommePaiement() <= 0);
+		$form_permission = ($object->statut < FactureFournisseur::STATUS_CLOSED) && $usercancreate && ($object->getSommePaiement() <= 0);
 
-        // Date
-        print '<tr><td>'.$form->editfieldkey("DateInvoice", 'datef', $object->datep, $object, $form_permission, 'datepicker').'</td><td colspan="3">';
-        print $form->editfieldval("Date", 'datef', $object->datep, $object, $form_permission, 'datepicker');
-        print '</td>';
+		// Date
+		print '<tr><td>'.$form->editfieldkey("DateInvoice", 'datef', $object->datep, $object, $form_permission, 'datepicker').'</td><td colspan="3">';
+		print $form->editfieldval("Date", 'datef', $object->datep, $object, $form_permission, 'datepicker');
+		print '</td>';
 
 		// Default terms of the settlement
 		$langs->load('bills');
@@ -2632,6 +2689,30 @@ if ($action == 'create')
 			print '</td></tr>';
 		}
 
+		// Intracomm report
+		if (!empty($conf->intracommreport->enabled)) {
+			$langs->loadLangs(array("intracommreport"));
+			print '<tr><td class="nowrap">';
+			print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+			print $langs->trans('IntracommReportTransportMode');
+			print '</td>';
+			if ($action != 'editmode' && $user->rights->fournisseur->facture->creer) {
+				print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+			}
+			print '</tr></table>';
+			print '</td>';
+
+			print '<td>';
+			if ($action == 'editmode')
+			{
+				$form->formSelectTransportMode($_SERVER['PHP_SELF'].'?id='.$object->id, $object->transport_mode_id, 'transport_mode_id', 1, 1);
+			}
+			else {
+				$form->formSelectTransportMode($_SERVER['PHP_SELF'].'?id='.$object->id, $object->transport_mode_id, 'none');
+			}
+			print '</td></tr>';
+		}
+
 		// Other attributes
 		$cols = 2;
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
@@ -2824,10 +2905,12 @@ if ($action == 'create')
 		{
 			// Total already paid
 			print '<tr><td colspan="'.$nbcols.'" class="right">';
+			print '<span class="opacitymedium">';
 			if ($object->type != FactureFournisseur::TYPE_DEPOSIT)
 				print $langs->trans('AlreadyPaidNoCreditNotesNoDeposits');
 			else print $langs->trans('AlreadyPaid');
-			print ' :</td><td class="right"'.(($totalpaye > 0) ? ' class="amountalreadypaid"' : '').'>'.price($totalpaye).'</td><td>&nbsp;</td></tr>';
+			print '</span>';
+			print '</td><td class="right"'.(($totalpaye > 0) ? ' class="amountalreadypaid"' : '').'>'.price($totalpaye).'</td><td>&nbsp;</td></tr>';
 
 			//$resteapayer = $object->total_ttc - $totalpaye;
 			$resteapayeraffiche = $resteapayer;
@@ -2875,7 +2958,9 @@ if ($action == 'create')
 			// Paye partiellement 'escompte'
 			if (($object->statut == FactureFournisseur::STATUS_CLOSED || $object->statut == FactureFournisseur::STATUS_ABANDONED) && $object->close_code == 'discount_vat') {
 				print '<tr><td colspan="'.$nbcols.'" class="right nowrap">';
-				print $form->textwithpicto($langs->trans("Discount").':', $langs->trans("HelpEscompte"), - 1);
+				print '<span class="opacitymedium">';
+				print $form->textwithpicto($langs->trans("Discount"), $langs->trans("HelpEscompte"), - 1);
+				print '</span>';
 				print '</td><td class="right">'.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).'</td><td>&nbsp;</td></tr>';
 				$resteapayeraffiche = 0;
 				$cssforamountpaymentcomplete = 'amountpaymentneutral';
@@ -2883,7 +2968,9 @@ if ($action == 'create')
 			// Paye partiellement ou Abandon 'badsupplier'
 			if (($object->statut == FactureFournisseur::STATUS_CLOSED || $object->statut == FactureFournisseur::STATUS_ABANDONED) && $object->close_code == 'badsupplier') {
 				print '<tr><td colspan="'.$nbcols.'" class="right nowrap">';
-				print $form->textwithpicto($langs->trans("Abandoned").':', $langs->trans("HelpAbandonBadCustomer"), - 1);
+				print '<span class="opacitymedium">';
+				print $form->textwithpicto($langs->trans("Abandoned"), $langs->trans("HelpAbandonBadCustomer"), - 1);
+				print '</span>';
 				print '</td><td class="right">'.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).'</td><td>&nbsp;</td></tr>';
 				// $resteapayeraffiche=0;
 				$cssforamountpaymentcomplete = 'amountpaymentneutral';
@@ -2891,7 +2978,9 @@ if ($action == 'create')
 			// Paye partiellement ou Abandon 'product_returned'
 			if (($object->statut == FactureFournisseur::STATUS_CLOSED || $object->statut == FactureFournisseur::STATUS_ABANDONED) && $object->close_code == 'product_returned') {
 				print '<tr><td colspan="'.$nbcols.'" class="right nowrap">';
-				print $form->textwithpicto($langs->trans("ProductReturned").':', $langs->trans("HelpAbandonProductReturned"), - 1);
+				print '<span class="opacitymedium">';
+				print $form->textwithpicto($langs->trans("ProductReturned"), $langs->trans("HelpAbandonProductReturned"), - 1);
+				print '</span>';
 				print '</td><td class="right">'.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).'</td><td>&nbsp;</td></tr>';
 				$resteapayeraffiche = 0;
 				$cssforamountpaymentcomplete = 'amountpaymentneutral';
@@ -2902,21 +2991,29 @@ if ($action == 'create')
 				$text = $langs->trans("HelpAbandonOther");
 				if ($object->close_note)
 					$text .= '<br><br><b>'.$langs->trans("Reason").'</b>:'.$object->close_note;
-				print $form->textwithpicto($langs->trans("Abandoned").':', $text, - 1);
+				print '<span class="opacitymedium">';
+				print $form->textwithpicto($langs->trans("Abandoned"), $text, - 1);
+				print '</span>';
 				print '</td><td class="right">'.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).'</td><td>&nbsp;</td></tr>';
 				$resteapayeraffiche = 0;
 				$cssforamountpaymentcomplete = 'amountpaymentneutral';
 			}
 
 			// Billed
-			print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("Billed").' :</td><td class="right">'.price($object->total_ttc).'</td><td>&nbsp;</td></tr>';
+			print '<tr><td colspan="'.$nbcols.'" class="right">';
+			print '<span class="opacitymedium">';
+			print $langs->trans("Billed");
+			print '</span>';
+			print '</td><td class="right">'.price($object->total_ttc).'</td><td>&nbsp;</td></tr>';
 
 			// Remainder to pay
 			print '<tr><td colspan="'.$nbcols.'" class="right">';
+			print '<span class="opacitymedium">';
 			if ($resteapayeraffiche >= 0)
 				print $langs->trans('RemainderToPay');
 			else print $langs->trans('ExcessPaid');
-			print ' :</td>';
+			print '</span>';
+			print '</td>';
 			print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td>';
 			print '<td class="nowrap">&nbsp;</td></tr>';
 		} else // Credit note
@@ -2933,10 +3030,12 @@ if ($action == 'create')
 
 			// Remainder to pay back
 			print '<tr><td colspan="'.$nbcols.'" class="right">';
+			print '<span class="opacitymedium">';
 			if ($resteapayeraffiche <= 0)
 				print $langs->trans('RemainderToPayBack');
 			else print $langs->trans('ExcessPaid');
-			print ' :</td>';
+			print '</td>';
+			print '</span>';
 			print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($sign * $resteapayeraffiche).'</td>';
 			print '<td class="nowrap">&nbsp;</td></tr>';
 
@@ -3017,7 +3116,7 @@ if ($action == 'create')
 		print '</div>';
 		print '</form>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		if ($action != 'presend')
@@ -3033,7 +3132,7 @@ if ($action == 'create')
 																									  // modified by hook
 			if (empty($reshook))
 			{
-			    // Modify a validated invoice with no payments
+				// Modify a validated invoice with no payments
 				if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $action != 'confirm_edit' && $object->getSommePaiement() == 0 && $usercancreate)
 				{
 					// We check if lines of invoice are not already transfered into accountancy
@@ -3078,17 +3177,17 @@ if ($action == 'create')
 					}
 				}
 
-	            // Make payments
-	            if ($object->type != FactureFournisseur::TYPE_CREDIT_NOTE && $action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0)
-	            {
-	                print '<div class="inline-block divButAction"><a class="butAction" href="paiement.php?facid='.$object->id.'&amp;action=create'.($object->fk_account > 0 ? '&amp;accountid='.$object->fk_account : '').'">'.$langs->trans('DoPayment').'</a></div>'; // must use facid because id is for payment id not invoice
-	            }
+				// Make payments
+				if ($object->type != FactureFournisseur::TYPE_CREDIT_NOTE && $action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0)
+				{
+					print '<div class="inline-block divButAction"><a class="butAction" href="paiement.php?facid='.$object->id.'&amp;action=create'.($object->fk_account > 0 ? '&amp;accountid='.$object->fk_account : '').'">'.$langs->trans('DoPayment').'</a></div>'; // must use facid because id is for payment id not invoice
+				}
 
-	            // Classify paid
-	            if ($action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0)
-	            {
-	                print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=paid"';
-	                print '>'.$langs->trans('ClassifyPaid').'</a></div>';
+				// Classify paid
+				if ($action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0)
+				{
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=paid"';
+					print '>'.$langs->trans('ClassifyPaid').'</a></div>';
 
 					//print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=paid">'.$langs->trans('ClassifyPaid').'</a>';
 				}
@@ -3124,21 +3223,21 @@ if ($action == 'create')
 					}
 				}
 
-	            // Validate
-	            if ($action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_DRAFT)
-	            {
-	                if (count($object->lines))
-	                {
+				// Validate
+				if ($action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_DRAFT)
+				{
+					if (count($object->lines))
+					{
 						if ($usercanvalidate)
-	                    {
-	                        print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid"';
-	                        print '>'.$langs->trans('Validate').'</a></div>';
-	                    } else {
-	                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'"';
-	                        print '>'.$langs->trans('Validate').'</a></div>';
-	                    }
-	                }
-	            }
+						{
+							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid"';
+							print '>'.$langs->trans('Validate').'</a></div>';
+						} else {
+							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'"';
+							print '>'.$langs->trans('Validate').'</a></div>';
+						}
+					}
+				}
 
 				// Create event
 				/*if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 	// Add hidden condition because this is not a "workflow" action so should appears somewhere else on page.
@@ -3161,30 +3260,30 @@ if ($action == 'create')
 					}
 				}
 
-	            // Delete
+				// Delete
 				$isErasable = $object->is_erasable();
 				if ($action != 'confirm_edit' && ($user->rights->fournisseur->facture->supprimer || ($usercancreate && $isErasable == 1)))	// isErasable = 1 means draft with temporary ref (draft can always be deleted with no need of permissions)
-	            {
-	            	//var_dump($isErasable);
-	            	if ($isErasable == -4) {
-	            		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecausePayments").'">'.$langs->trans('Delete').'</a></div>';
-	            	} elseif ($isErasable == -3) {	// Should never happen with supplier invoice
-	            		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastSituationInvoice").'">'.$langs->trans('Delete').'</a></div>';
-	            	} elseif ($isErasable == -2) {	// Should never happen with supplier invoice
-	            		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastInvoice").'">'.$langs->trans('Delete').'</a></div>';
-	            	} elseif ($isErasable == -1) {
-	            		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Delete').'</a></div>';
-	            	} elseif ($isErasable <= 0)	// Any other cases
-	            	{
-	            		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotErasable").'">'.$langs->trans('Delete').'</a></div>';
-	            	} else {
-    	                print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a></div>';
-                    }
-	            }
-	            print '</div>';
+				{
+					//var_dump($isErasable);
+					if ($isErasable == -4) {
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecausePayments").'">'.$langs->trans('Delete').'</a></div>';
+					} elseif ($isErasable == -3) {	// Should never happen with supplier invoice
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastSituationInvoice").'">'.$langs->trans('Delete').'</a></div>';
+					} elseif ($isErasable == -2) {	// Should never happen with supplier invoice
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastInvoice").'">'.$langs->trans('Delete').'</a></div>';
+					} elseif ($isErasable == -1) {
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Delete').'</a></div>';
+					} elseif ($isErasable <= 0)	// Any other cases
+					{
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotErasable").'">'.$langs->trans('Delete').'</a></div>';
+					} else {
+						print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a></div>';
+					}
+				}
+				print '</div>';
 
-	            if ($action != 'confirm_edit')
-	            {
+				if ($action != 'confirm_edit')
+				{
 					print '<div class="fichecenter"><div class="fichehalfleft">';
 
 					/*
@@ -3230,7 +3329,7 @@ if ($action == 'create')
 		$defaulttopic = 'SendBillRef';
 		$diroutput = $conf->fournisseur->facture->dir_output;
 		$autocopy = 'MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO';
-		$trackid = 'sin'.$object->id;
+		$trackid = 'sinv'.$object->id;
 
 		include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 	}
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index 9be956b32ae..99010c977dc 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -55,11 +55,12 @@ if ($action == 'addcontact' && $user->rights->fournisseur->facture->creer)
 {
 	$result = $object->fetch($id, $ref);
 
-    if ($result > 0 && $id > 0)
-    {
-    	$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
-    }
+	if ($result > 0 && $id > 0)
+	{
+		$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
+		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
+	}
 
 	if ($result >= 0)
 	{
@@ -81,7 +82,7 @@ elseif ($action == 'swapstatut' && $user->rights->fournisseur->facture->creer)
 {
 	if ($object->fetch($id))
 	{
-	    $result = $object->swapContactStatus(GETPOST('ligne'));
+		$result = $object->swapContactStatus(GETPOST('ligne'));
 	} else {
 		dol_print_error($db);
 	}
@@ -133,18 +134,18 @@ if ($id > 0 || !empty($ref))
 
 		$head = facturefourn_prepare_head($object);
 
-		dol_fiche_head($head, 'contact', $langs->trans('SupplierInvoice'), -1, 'bill');
+		print dol_get_fiche_head($head, 'contact', $langs->trans('SupplierInvoice'), -1, 'bill');
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 		$morehtmlref = '<div class="refidno">';
-    	// Ref supplier
-    	$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
-    	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
-    	// Thirdparty
-    	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-    	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
-    	// Project
+		// Ref supplier
+		$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
+		// Thirdparty
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
+		// Project
 		if (!empty($conf->projet->enabled))
 		{
 			$langs->load("projects");
@@ -232,29 +233,29 @@ if ($id > 0 || !empty($ref))
 		print $form->editfieldval("Label", 'label', $object->label, $object, 0);
 		print '</td></tr>';
 
-        // Amount
-        print '<tr><td>'.$langs->trans('AmountHT').'</td><td>'.price($object->total_ht, 1, $langs, 0, -1, -1, $conf->currency).'</td></tr>';
-        print '<tr><td>'.$langs->trans('AmountVAT').'</td><td>'.price($object->total_tva, 1, $langs, 0, -1, -1, $conf->currency).'</td></tr>';
+		// Amount
+		print '<tr><td>'.$langs->trans('AmountHT').'</td><td>'.price($object->total_ht, 1, $langs, 0, -1, -1, $conf->currency).'</td></tr>';
+		print '<tr><td>'.$langs->trans('AmountVAT').'</td><td>'.price($object->total_tva, 1, $langs, 0, -1, -1, $conf->currency).'</td></tr>';
 
-        // Amount Local Taxes
-        //TODO: Place into a function to control showing by country or study better option
-        if ($societe->localtax1_assuj == "1") //Localtax1
-        {
-            print '<tr><td>'.$langs->transcountry("AmountLT1", $societe->country_code).'</td>';
-            print '<td>'.price($object->total_localtax1, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
-            print '</tr>';
-        }
-        if ($societe->localtax2_assuj == "1") //Localtax2
-        {
-            print '<tr><td>'.$langs->transcountry("AmountLT2", $societe->country_code).'</td>';
-            print '<td>'.price($object->total_localtax2, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
-            print '</tr>';
-        }
-        print '<tr><td>'.$langs->trans('AmountTTC').'</td><td>'.price($object->total_ttc, 1, $langs, 0, -1, -1, $conf->currency).'</td></tr>';
+		// Amount Local Taxes
+		//TODO: Place into a function to control showing by country or study better option
+		if ($societe->localtax1_assuj == "1") //Localtax1
+		{
+			print '<tr><td>'.$langs->transcountry("AmountLT1", $societe->country_code).'</td>';
+			print '<td>'.price($object->total_localtax1, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
+			print '</tr>';
+		}
+		if ($societe->localtax2_assuj == "1") //Localtax2
+		{
+			print '<tr><td>'.$langs->transcountry("AmountLT2", $societe->country_code).'</td>';
+			print '<td>'.price($object->total_localtax2, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
+			print '</tr>';
+		}
+		print '<tr><td>'.$langs->trans('AmountTTC').'</td><td>'.price($object->total_ttc, 1, $langs, 0, -1, -1, $conf->currency).'</td></tr>';
 
 		print "</table>";
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<br>';
 
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index dfbff2e1dda..d57abc67644 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -90,60 +90,60 @@ llxHeader('', $title, $helpurl);
 if ($object->id > 0)
 {
 	$head = facturefourn_prepare_head($object);
-	dol_fiche_head($head, 'documents', $langs->trans('SupplierInvoice'), -1, 'bill');
+	print dol_get_fiche_head($head, 'documents', $langs->trans('SupplierInvoice'), -1, 'bill');
 
 	$totalpaye = $object->getSommePaiement();
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-    $morehtmlref = '<div class="refidno">';
-    // Ref supplier
-    $morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
-    $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
-    // Thirdparty
-    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-    if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
-    // Project
-    if (!empty($conf->projet->enabled))
-    {
-    	$langs->load("projects");
-    	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-    	if ($user->rights->facture->creer)
-    	{
-    		if ($action != 'classify')
-    			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-    			$morehtmlref .= ' : ';
-    		if ($action == 'classify') {
-    			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-    			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-    			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
-    			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-    			$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-    			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-    			$morehtmlref .= '</form>';
-    		} else {
-    			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-    		}
-    	} else {
-    		if (!empty($object->fk_project)) {
-    			$proj = new Project($db);
-    			$proj->fetch($object->fk_project);
-    			$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-    			$morehtmlref .= $proj->ref;
-    			$morehtmlref .= '</a>';
-    		} else {
-    			$morehtmlref .= '';
-    		}
-    	}
-    }
-    $morehtmlref .= '</div>';
+	$morehtmlref = '<div class="refidno">';
+	// Ref supplier
+	$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
+	// Thirdparty
+	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
+	// Project
+	if (!empty($conf->projet->enabled))
+	{
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->facture->creer)
+		{
+			if ($action != 'classify')
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				$morehtmlref .= ' : ';
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
+	$morehtmlref .= '</div>';
 
-    $object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+	$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
@@ -215,15 +215,15 @@ if ($object->id > 0)
 
 	// Amount Local Taxes
 	//TODO: Place into a function to control showing by country or study better option
-	if ($societe->localtax1_assuj == "1") //Localtax1
+	if ($mysoc->localtax1_assuj == "1") //Localtax1
 	{
-		print '<tr><td>'.$langs->transcountry("AmountLT1", $societe->country_code).'</td>';
+		print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
 		print '<td>'.price($object->total_localtax1, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
 		print '</tr>';
 	}
-	if ($societe->localtax2_assuj == "1") //Localtax2
+	if ($mysoc->localtax2_assuj == "1") //Localtax2
 	{
-		print '<tr><td>'.$langs->transcountry("AmountLT2", $societe->country_code).'</td>';
+		print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
 		print '<td>'.price($object->total_localtax2, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
 		print '</tr>';
 	}
@@ -245,16 +245,33 @@ if ($object->id > 0)
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	$modulepart = 'facture_fournisseur';
 	$permission = $user->rights->fournisseur->facture->creer;
 	$permtoedit = $user->rights->fournisseur->facture->creer;
 	$param = '&facid='.$object->id;
-	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+
+	$defaulttpldir = '/core/tpl';
+	$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
+	foreach ($dirtpls as $module => $reldir)
+	{
+		if (!empty($module)) {
+			$tpl = dol_buildpath($reldir.'/document_actions_post_headers.tpl.php');
+		} else {
+			$tpl = DOL_DOCUMENT_ROOT.$reldir.'/document_actions_post_headers.tpl.php';
+		}
+
+		if (empty($conf->file->strict_mode)) {
+			$res = @include $tpl;
+		} else {
+			$res = include $tpl; // for debug
+		}
+		if ($res) break;
+	}
 } else {
-    print $langs->trans('ErrorUnknown');
+	print $langs->trans('ErrorUnknown');
 }
 
 // End of page
diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
index 804a78079d3..18c4bff9036 100644
--- a/htdocs/fourn/facture/impayees.php
+++ b/htdocs/fourn/facture/impayees.php
@@ -175,7 +175,7 @@ if ($user->rights->fournisseur->facture->lire)
 		$titre = ($socid ? $langs->trans("BillsSuppliersUnpaidForCompany", $soc->name) : $langs->trans("BillsSuppliersUnpaid"));
 
 		if ($option == 'late') $titre .= ' ('.$langs->trans("Late").')';
-	    else $titre .= ' ('.$langs->trans("All").')';
+		else $titre .= ' ('.$langs->trans("All").')';
 
 		$link = '';
 		if (empty($option)) $link = '<a href="'.$_SERVER["PHP_SELF"].'?option=late'.($socid ? '&socid='.$socid : '').'">'.$langs->trans("ShowUnpaidLateOnly").'</a>';
@@ -214,10 +214,10 @@ if ($user->rights->fournisseur->facture->lire)
 		print '</td><td class="liste_titre right">';
 		print '<input class="flat" type="text" size="8" name="search_amount_all_tax" value="'.$search_amount_all_tax.'">';
 		print '</td>';
-        print '<td class="liste_titre maxwidthsearch">';
-        $searchpicto = $form->showFilterAndCheckAddButtons(0);
-        print $searchpicto;
-        print '</td>';
+		print '<td class="liste_titre maxwidthsearch">';
+		$searchpicto = $form->showFilterAndCheckAddButtons(0);
+		print $searchpicto;
+		print '</td>';
 		print "</tr>\n";
 
 		if ($num > 0)
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index df32ee1b19a..494f5d2aa03 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -41,9 +41,9 @@ if (isset($user->socid) && $user->socid > 0)
 }
 
 // Maximum elements of the tables
-$maxDraftCount		= empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
-$maxLatestEditCount	= 5;
-$maxOpenCount		= empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
+$maxDraftCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
+$maxLatestEditCount = 5;
+$maxOpenCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
 
 /*
 * View
@@ -51,7 +51,7 @@ $maxOpenCount		= empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->glob
 
 llxHeader("", $langs->trans("SupplierInvoicesArea"), 'EN:Suppliers_Invoices|FR:FactureFournisseur|ES:Facturas_de_proveedores');
 
-print load_fiche_titre($langs->trans("SupplierInvoicesArea"), '', 'invoicing');
+print load_fiche_titre($langs->trans("SupplierInvoicesArea"), '', 'bill');
 
 print '<div class="fichecenter">';
 
@@ -193,10 +193,10 @@ function getPieChart($socid = 0)
 	{
 		$dolgraph = new DolGraph();
 		$dolgraph->SetData($dataseries);
-		$dolgraph->setShowLegend(1);
+		$dolgraph->setShowLegend(2);
 		$dolgraph->setShowPercent(1);
 		$dolgraph->SetType(['pie']);
-		$dolgraph->setWidth('100%');
+		$dolgraph->setHeight('200');
 		$dolgraph->draw('idgraphthirdparties');
 
 		$result .= '<tr>';
@@ -265,11 +265,11 @@ function getDraftTable($maxCount = 500, $socid = 0)
 		return $result;
 	}
 
-	$objectstatic	= new FactureFournisseur($db);
-	$companystatic	= new Societe($db);
-	$nbofloop		= min($num, $maxCount);
-	$total			= 0;
-	$i				= 0;
+	$objectstatic = new FactureFournisseur($db);
+	$companystatic = new Societe($db);
+	$nbofloop = min($num, $maxCount);
+	$total = 0;
+	$i = 0;
 
 	while ($i < $nbofloop)
 	{
@@ -357,10 +357,10 @@ function getLatestEditTable($maxCount = 5, $socid = 0)
 		return $result;
 	}
 
-	$objectstatic	= new FactureFournisseur($db);
-	$companystatic	= new Societe($db);
-	$formfile		= new FormFile($db);
-	$i				= 0;
+	$objectstatic = new FactureFournisseur($db);
+	$companystatic = new Societe($db);
+	$formfile = new FormFile($db);
+	$i = 0;
 
 	while ($i < $num)
 	{
@@ -459,13 +459,13 @@ function getOpenTable($maxCount = 500, $socid = 0)
 		return $result;
 	}
 
-	$objectstatic	= new FactureFournisseur($db);
-	$companystatic	= new Societe($db);
+	$objectstatic = new FactureFournisseur($db);
+	$companystatic = new Societe($db);
 	$formfile		= new FormFile($db);
 	$nbofloop		= min($num, $maxCount);
-	$now			= dol_now();
-	$total			= 0;
-	$i				= 0;
+	$now = dol_now();
+	$total = 0;
+	$i = 0;
 
 	while ($i < $nbofloop)
 	{
diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php
index 52b6730d9f1..f8522722e64 100644
--- a/htdocs/fourn/facture/info.php
+++ b/htdocs/fourn/facture/info.php
@@ -65,7 +65,7 @@ $alreadypaid = $object->getSommePaiement();
 
 $head = facturefourn_prepare_head($object);
 $titre = $langs->trans('SupplierInvoice');
-dol_fiche_head($head, 'info', $langs->trans('SupplierInvoice'), -1, 'bill');
+print dol_get_fiche_head($head, 'info', $langs->trans('SupplierInvoice'), -1, 'bill');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 66e94d461a4..d0dce03c87f 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -67,7 +67,7 @@ if ($user->socid > 0)
 	$socid = $user->socid;
 }
 
-$mode = GETPOST("mode");
+$mode = GETPOST("mode", 'aZ09');
 
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_label = GETPOST("search_label", "alpha");
@@ -92,6 +92,7 @@ $search_multicurrency_montant_vat = GETPOST('search_multicurrency_montant_vat',
 $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha');
 $search_status = GETPOST('search_status', 'int');
 $search_paymentmode = GETPOST('search_paymentmode', 'int');
+$search_paymentcond = GETPOST('search_paymentcond', 'int');
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
 $search_state = GETPOST("search_state");
@@ -108,6 +109,7 @@ $year_lim	= GETPOST('year_lim', 'int');
 $toselect = GETPOST('toselect', 'array');
 $search_btn = GETPOST('button_search', 'alpha');
 $search_remove_btn = GETPOST('button_removefilter', 'alpha');
+$search_categ_sup = trim(GETPOST("search_categ_sup", 'int'));
 
 $option = GETPOST('option');
 if ($option == 'late') {
@@ -165,7 +167,8 @@ $arrayfields = array(
 	'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0),
 	'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0),
 	'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers),
-	'f.fk_mode_reglement'=>array('label'=>$langs->trans("PaymentMode"), 'checked'=>1),
+	'f.fk_cond_reglement'=>array('label'=>$langs->trans("PaymentTerm"), 'checked'=>1, 'position'=>50),
+	'f.fk_mode_reglement'=>array('label'=>$langs->trans("PaymentMode"), 'checked'=>1, 'position'=>52),
 	'f.total_ht'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1, 'position'=>105),
 	'f.total_vat'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>0, 'position'=>110),
 	'f.total_localtax1'=>array('label'=>$langs->transcountry("AmountLT1", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax1_assuj == "1", 'position'=>95),
@@ -240,6 +243,7 @@ if (empty($reshook))
 		$search_multicurrency_montant_ttc = '';
 		$search_status = '';
 		$search_paymentmode = '';
+		$search_paymentcond = '';
 		$search_town = '';
 		$search_zip = "";
 		$search_state = "";
@@ -257,6 +261,7 @@ if (empty($reshook))
 		$filter = '';
 		$option = '';
 		$socid = "";
+		$search_categ_sup = 0;
 	}
 
 	// Mass actions
@@ -267,6 +272,96 @@ if (empty($reshook))
 	$permissiontodelete = $user->rights->fournisseur->facture->supprimer;
 	$uploaddir = $conf->fournisseur->facture->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+
+	if ($massaction == 'banktransfertrequest')
+	{
+		$langs->load("withdrawals");
+
+		if (!$user->rights->paymentbybanktransfer->create)
+		{
+			$error++;
+			setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
+		} else {
+			//Checking error
+			$error = 0;
+
+			$arrayofselected = is_array($toselect) ? $toselect : array();
+			$listofbills = array();
+			foreach ($arrayofselected as $toselectid)
+			{
+				$objecttmp = new FactureFournisseur($db);
+				$result = $objecttmp->fetch($toselectid);
+				if ($result > 0)
+				{
+					$totalpaye = $objecttmp->getSommePaiement();
+					$totalcreditnotes = $objecttmp->getSumCreditNotesUsed();
+					$totaldeposits = $objecttmp->getSumDepositsUsed();
+					$objecttmp->resteapayer = price2num($objecttmp->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+					if ($objecttmp->paye || $objecttmp->resteapayer == 0) {
+						$error++;
+						setEventMessages($objecttmp->ref.' '.$langs->trans("AlreadyPaid"), $objecttmp->errors, 'errors');
+					} elseif ($objecttmp->resteapayer < 0) {
+						$error++;
+						setEventMessages($objecttmp->ref.' '.$langs->trans("AmountMustBePositive"), $objecttmp->errors, 'errors');
+					}
+					if (!($objecttmp->statut > FactureFournisseur::STATUS_DRAFT)) {
+						$error++;
+						setEventMessages($objecttmp->ref.' '.$langs->trans("Draft"), $objecttmp->errors, 'errors');
+					}
+
+					$rsql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande as date_demande";
+					$rsql .= " , pfd.date_traite as date_traite";
+					$rsql .= " , pfd.amount";
+					$rsql .= " , u.rowid as user_id, u.lastname, u.firstname, u.login";
+					$rsql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+					$rsql .= " , ".MAIN_DB_PREFIX."user as u";
+					$rsql .= " WHERE fk_facture_fourn = ".$objecttmp->id;
+					$rsql .= " AND pfd.fk_user_demande = u.rowid";
+					$rsql .= " AND pfd.traite = 0";
+					$rsql .= " ORDER BY pfd.date_demande DESC";
+
+					$result_sql = $db->query($rsql);
+					if ($result_sql)
+					{
+						$numprlv = $db->num_rows($result_sql);
+					}
+
+					if ($numprlv > 0) {
+						$error++;
+						setEventMessages($objecttmp->ref.' '.$langs->trans("RequestAlreadyDone"), $objecttmp->errors, 'warnings');
+					} elseif (!empty($objecttmp->mode_reglement_code) && $objecttmp->mode_reglement_code != 'PRE') {
+						$error++;
+						setEventMessages($objecttmp->ref.' '.$langs->trans("BadPaymentMethod"), $objecttmp->errors, 'errors');
+					} else {
+						$listofbills[] = $objecttmp; // $listofbills will only contains invoices with good payment method and no request already done
+					}
+				}
+			}
+
+			//Massive withdraw request for request with no errors
+			if (!empty($listofbills))
+			{
+				$nbwithdrawrequestok = 0;
+				foreach ($listofbills as $aBill)
+				{
+					$db->begin();
+					$result = $aBill->demande_prelevement($user, $aBill->resteapayer, 'bank-transfer', 'supplier_invoice');
+					if ($result > 0)
+					{
+						$db->commit();
+						$nbwithdrawrequestok++;
+					} else {
+						$db->rollback();
+						setEventMessages($aBill->error, $aBill->errors, 'errors');
+					}
+				}
+				if ($nbwithdrawrequestok > 0)
+				{
+					setEventMessages($langs->trans("WithdrawRequestsDone", $nbwithdrawrequestok), null, 'mesgs');
+				}
+			}
+		}
+	}
 }
 
 
@@ -286,7 +381,7 @@ $thirdparty = new Societe($db);
 
 $sql = "SELECT";
 if ($search_all || $search_product_category > 0) $sql = 'SELECT DISTINCT';
-$sql .= " f.rowid as facid, f.ref, f.ref_supplier, f.type, f.datef, f.date_lim_reglement as datelimite, f.fk_mode_reglement,";
+$sql .= " f.rowid as facid, f.ref, f.ref_supplier, f.type, f.datef, f.date_lim_reglement as datelimite, f.fk_mode_reglement, f.fk_cond_reglement,";
 $sql .= " f.total_ht, f.total_ttc, f.total_tva as total_vat, f.paye as paye, f.fk_statut as fk_statut, f.libelle as label, f.datec as date_creation, f.tms as date_update,";
 $sql .= " f.localtax1 as total_localtax1, f.localtax2 as total_localtax2,";
 $sql .= ' f.fk_multicurrency, f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva as multicurrency_total_vat, f.multicurrency_total_ttc,';
@@ -301,6 +396,7 @@ $sql .= " u.login";
 // We need dynamount_payed to be able to sort on status (value is surely wrong because we can count several lines several times due to other left join or link with contacts. But what we need is just 0 or > 0)
 // TODO Better solution to be able to sort on already payed or remain to pay is to store amount_payed in a denormalized field.
 if (!$search_all) $sql .= ', SUM(pf.amount) as dynamount_payed';
+if ($search_categ_sup) $sql .= ", cs.fk_categorie, cs.fk_soc";
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
@@ -313,6 +409,8 @@ $sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
+if (!empty($search_categ_sup)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_fournisseur as cs ON s.rowid = cs.fk_soc";
+
 $sql .= ', '.MAIN_DB_PREFIX.'facture_fourn as f';
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (f.rowid = ef.fk_object)";
 if (!$search_all) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
@@ -367,11 +465,14 @@ if ($search_multicurrency_montant_vat != '') $sql .= natural_search('f.multicurr
 if ($search_multicurrency_montant_ttc != '') $sql .= natural_search('f.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
 if ($search_login) $sql .= natural_search('u.login', $search_login);
 if ($search_status != '' && $search_status >= 0) $sql .= " AND f.fk_statut = ".$db->escape($search_status);
-if ($search_paymentmode > 0) $sql .= " AND f.fk_mode_reglement = ".$search_paymentmode."";
+if ($search_paymentmode > 0) $sql .= " AND f.fk_mode_reglement = ".((int) $search_paymentmode);
+if ($search_paymentcond > 0) $sql .= " AND f.fk_cond_reglement = ".((int) $search_paymentcond);
 $sql .= dolSqlDateFilter("f.datef", $day, $month, $year);
 $sql .= dolSqlDateFilter("f.date_lim_reglement", $day_lim, $month_lim, $year_lim);
 if ($option == 'late') $sql .= " AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->fournisseur->warning_delay)."'";
 if ($search_label) $sql .= natural_search('f.libelle', $search_label);
+if ($search_categ_sup > 0) $sql .= " AND cs.fk_categorie = ".$db->escape($search_categ_sup);
+if ($search_categ_sup == -2)   $sql .= " AND cs.fk_categorie IS NULL";
 if ($search_status != '' && $search_status >= 0)
 {
 	$sql .= " AND f.fk_statut = ".$search_status;
@@ -385,7 +486,7 @@ if ($filter && $filter != -1)
 		$sql .= ' AND '.$db->escape(trim($filt[0])).' = '.$db->escape(trim($filt[1]));
 	}
 }
-if ($search_sale > 0) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$db->escape($search_sale);
+if ($search_sale > 0) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $search_sale);
 if ($search_user > 0)
 {
 	$sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='invoice_supplier' AND tc.source='internal' AND ec.element_id = f.rowid AND ec.fk_socpeople = ".$search_user;
@@ -399,7 +500,7 @@ $sql .= $hookmanager->resPrint;
 
 if (!$search_all)
 {
-	$sql .= " GROUP BY f.rowid, f.ref, f.ref_supplier, f.type, f.datef, f.date_lim_reglement, f.fk_mode_reglement,";
+	$sql .= " GROUP BY f.rowid, f.ref, f.ref_supplier, f.type, f.datef, f.date_lim_reglement, f.fk_mode_reglement, f.fk_cond_reglement,";
 	$sql .= " f.total_ht, f.total_ttc, f.total_tva, f.paye, f.fk_statut, f.libelle, f.datec, f.tms,";
 	$sql .= " f.localtax1, f.localtax2,";
 	$sql .= " f.note_public, f.note_private,";
@@ -493,6 +594,8 @@ if ($resql)
 	if ($show_files)            $param .= '&show_files='.urlencode($show_files);
 	if ($option)                $param .= "&option=".urlencode($option);
 	if ($optioncss != '')       $param .= '&optioncss='.urlencode($optioncss);
+	if ($search_categ_sup > 0) $param .= '&search_categ_sup='.urlencode($search_categ_sup);
+
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -501,9 +604,13 @@ if ($resql)
 		'validate'=>$langs->trans("Validate"),
 		'generate_doc'=>$langs->trans("ReGeneratePDF"),
 		//'builddoc'=>$langs->trans("PDFMerge"),
-	    //'presend'=>$langs->trans("SendByMail"),
+		//'presend'=>$langs->trans("SendByMail"),
 	);
 	//if($user->rights->fournisseur->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
+	if (!empty($conf->paymentbybanktransfer->enabled) && !empty($user->rights->paymentbybanktransfer->create)) {
+		$langs->load('withdrawals');
+		$arrayofmassactions['banktransfertrequest'] = $langs->trans("MakeBankTransferOrder");
+	}
 	if ($user->rights->fournisseur->facture->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 	if (in_array($massaction, array('presend', 'predelete', 'createbills'))) $arrayofmassactions = array();
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
@@ -565,7 +672,7 @@ if ($resql)
 		print '<br>';
 		print '<div class="center">';
 		print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('CreateInvoiceForThisCustomer').'">  ';
-		print '<input type="submit" class="button" id="cancel" name="cancel" value="'.$langs->trans('Cancel').'">';
+		print '<input type="submit" class="button button-cancel" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 		print '<br>';
 	}
@@ -595,7 +702,7 @@ if ($resql)
 	 	$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -604,6 +711,15 @@ if ($resql)
 		$moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter .= '</div>';
 	}
+
+	if (!empty($conf->categorie->enabled))
+	{
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+		$moreforfilter .= '<div class="divsearchfield">';
+		$moreforfilter .= $langs->trans('SuppliersCategoriesShort').': ';
+		$moreforfilter .= $formother->select_categories('supplier', $search_categ_sup, 'search_categ_sup', 1);
+		$moreforfilter .= '</div>';
+	}
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
@@ -649,7 +765,7 @@ if ($resql)
 				FactureFournisseur::TYPE_CREDIT_NOTE=>$langs->trans("InvoiceAvoir"),
 				FactureFournisseur::TYPE_DEPOSIT=>$langs->trans("InvoiceDeposit"),
 		);
-        /*
+		/*
 		if (! empty($conf->global->INVOICE_USE_SITUATION))
 		{
 			$listtype[Facture::TYPE_SITUATION] = $langs->trans("InvoiceSituation");
@@ -720,11 +836,18 @@ if ($resql)
 		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
 		print '</td>';
 	}
+	// Condition of payment
+	if (!empty($arrayfields['f.fk_cond_reglement']['checked']))
+	{
+		print '<td class="liste_titre left">';
+		$form->select_conditions_paiements($search_paymentcond, 'search_paymentcond', -1, 1, 1, 'maxwidth100');
+		print '</td>';
+	}
 	// Payment mode
 	if (!empty($arrayfields['f.fk_mode_reglement']['checked']))
 	{
 		print '<td class="liste_titre left">';
-		$form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 1, 1, 10);
+		$form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 1, 1, 20, 1, 'maxwidth100');
 		print '</td>';
 	}
 	if (!empty($arrayfields['f.total_ht']['checked']))
@@ -848,7 +971,7 @@ if ($resql)
 	{
 		print '<td class="liste_titre maxwidthonsmartphone right">';
 		$liststatus = array('0'=>$langs->trans("Draft"), '1'=>$langs->trans("Unpaid"), '2'=>$langs->trans("Paid"));
-		print $form->selectarray('search_status', $liststatus, $search_status, 1);
+		print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', '', 1);
 		print '</td>';
 	}
 	// Action column
@@ -873,6 +996,7 @@ if ($resql)
 	if (!empty($arrayfields['state.nom']['checked']))            print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['country.code_iso']['checked']))     print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($arrayfields['typent.code']['checked']))          print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
+	if (!empty($arrayfields['f.fk_cond_reglement']['checked']))  print_liste_field_titre($arrayfields['f.fk_cond_reglement']['label'], $_SERVER["PHP_SELF"], "f.fk_cond_reglement", "", $param, "", $sortfield, $sortorder);
 	if (!empty($arrayfields['f.fk_mode_reglement']['checked']))  print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "f.fk_mode_reglement", "", $param, "", $sortfield, $sortorder);
 	if (!empty($arrayfields['f.total_ht']['checked']))           print_liste_field_titre($arrayfields['f.total_ht']['label'], $_SERVER['PHP_SELF'], 'f.total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
 	if (!empty($arrayfields['f.total_vat']['checked']))          print_liste_field_titre($arrayfields['f.total_vat']['label'], $_SERVER['PHP_SELF'], 'f.tva', '', $param, '', $sortfield, $sortorder, 'right ');
@@ -957,12 +1081,12 @@ if ($resql)
 			$facturestatic->type = $obj->type;
 
 
-            //If invoice has been converted and the conversion has been used, we dont have remain to pay on invoice
-            if ($facturestatic->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
-                if ($facturestatic->isCreditNoteUsed()) {
-                    $remaintopay = -$facturestatic->getSumFromThisCreditNotesNotUsed();
-                }
-            }
+			//If invoice has been converted and the conversion has been used, we dont have remain to pay on invoice
+			if ($facturestatic->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
+				if ($facturestatic->isCreditNoteUsed()) {
+					$remaintopay = -$facturestatic->getSumFromThisCreditNotesNotUsed();
+				}
+			}
 
 			print '<tr class="oddeven">';
 			if (!empty($arrayfields['f.ref']['checked']))
@@ -1096,6 +1220,14 @@ if ($resql)
 				if (!$i) $totalarray['nbfield']++;
 			}
 
+			// Payment condition
+			if (!empty($arrayfields['f.fk_cond_reglement']['checked']))
+			{
+				print '<td>';
+				$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none', '', -1);
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
+			}
 			// Payment mode
 			if (!empty($arrayfields['f.fk_mode_reglement']['checked']))
 			{
@@ -1288,16 +1420,16 @@ if ($resql)
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
 
-    // Show list of available documents
-    $urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-    $urlsource .= str_replace('&amp;', '&', $param);
+	// Show list of available documents
+	$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource .= str_replace('&amp;', '&', $param);
 
-    $filedir = $diroutputmassaction;
-    $genallowed = $user->rights->facture->lire;
-    $delallowed = $user->rights->facture->creer;
-    $title = '';
+	$filedir = $diroutputmassaction;
+	$genallowed = $user->rights->facture->lire;
+	$delallowed = $user->rights->facture->creer;
+	$title = '';
 
-    print $formfile->showdocuments('massfilesarea_supplier_invoice', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+	print $formfile->showdocuments('massfilesarea_supplier_invoice', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 } else {
 	dol_print_error($db);
 }
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index 57a0cd103ab..c72e7b72710 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -82,65 +82,65 @@ if ($object->id > 0)
 
 	$head = facturefourn_prepare_head($object);
 	$titre = $langs->trans('SupplierInvoice');
-	dol_fiche_head($head, 'note', $titre, -1, 'bill');
+	print dol_get_fiche_head($head, 'note', $titre, -1, 'bill');
 
 
 	// Supplier invoice card
-    $linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-    $morehtmlref = '<div class="refidno">';
-    // Ref supplier
-    $morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
-    $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
-    // Thirdparty
-    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-    if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
-    // Project
-    if (!empty($conf->projet->enabled))
-    {
-        $langs->load("projects");
-        $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-    	if ($user->rights->fournisseur->commande->creer)
-    	{
-    	    if ($action != 'classify') {
-    	    	// $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	$morehtmlref = '<div class="refidno">';
+	// Ref supplier
+	$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
+	// Thirdparty
+	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
+	// Project
+	if (!empty($conf->projet->enabled))
+	{
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->fournisseur->commande->creer)
+		{
+			if ($action != 'classify') {
+				// $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
 			}
 			if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-    	} else {
-    	    if (!empty($object->fk_project)) {
-    	        $proj = new Project($db);
-    	        $proj->fetch($object->fk_project);
-    	        $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-    	        $morehtmlref .= $proj->ref;
-    	        $morehtmlref .= '</a>';
-    	    } else {
-    	        $morehtmlref .= '';
-    	    }
-    	}
-    }
-    $morehtmlref .= '</div>';
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
+	$morehtmlref .= '</div>';
 
-    $object->totalpaye = $alreadypaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+	$object->totalpaye = $alreadypaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
 	print '<table class="border centpercent tableforfield">';
 
-    // Type
+	// Type
 	print '<tr><td class="titlefield">'.$langs->trans('Type').'</td><td>';
 	print $object->getLibType();
 	if ($object->type == FactureFournisseur::TYPE_REPLACEMENT)
@@ -208,11 +208,11 @@ if ($object->id > 0)
 
 	print '<br>';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 	$cssclass = "titlefield";
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 65b8936a592..8a7e0cc8054 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -37,6 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'bills', 'banks', 'compta'));
@@ -80,7 +81,7 @@ $multicurrency_amountsresttopay = array();
 // Security check
 if ($user->socid > 0)
 {
-    $socid = $user->socid;
+	$socid = $user->socid;
 }
 
 $object = new PaiementFourn($db);
@@ -104,16 +105,16 @@ $arrayfields = array();
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-    $search_ref = "";
-    $search_account = "";
-    $search_amount = "";
-    $search_paymenttype = "";
-    $search_payment_num = "";
-    $search_company = "";
-    $day = '';
-    $year = '';
-    $month = '';
-    $search_array_options = array();
+	$search_ref = "";
+	$search_account = "";
+	$search_amount = "";
+	$search_paymenttype = "";
+	$search_payment_num = "";
+	$search_company = "";
+	$day = '';
+	$year = '';
+	$month = '';
+	$search_array_options = array();
 }
 
 $parameters = array('socid'=>$socid);
@@ -124,115 +125,115 @@ if (empty($reshook))
 {
 	if ($action == 'add_paiement' || ($action == 'confirm_paiement' && $confirm == 'yes'))
 	{
-	    $error = 0;
+		$error = 0;
 
-	    $datepaye = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-	    $paiement_id = 0;
-	    $totalpayment = 0;
+		$datepaye = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+		$paiement_id = 0;
+		$totalpayment = 0;
 		$atleastonepaymentnotnull = 0;
 		$multicurrency_totalpayment = 0;
 
-	    // Generate payment array and check if there is payment higher than invoice and payment date before invoice date
-	    $tmpinvoice = new FactureFournisseur($db);
-	    foreach ($_POST as $key => $value)
-	    {
-	        if (substr($key, 0, 7) == 'amount_')
-	        {
-	            $cursorfacid = substr($key, 7);
-	            $amounts[$cursorfacid] = price2num(GETPOST($key));
-	            if (!empty($amounts[$cursorfacid])) {
-	            	$atleastonepaymentnotnull++;
-	            	if (is_numeric($amounts[$cursorfacid])) {
-	            		$totalpayment = $totalpayment + $amounts[$cursorfacid];
-	            	} else {
-	            		setEventMessages($langs->transnoentities("InputValueIsNotAnNumber", GETPOST($key)), null, 'warnings');
-	            	}
-	            }
-	            $result = $tmpinvoice->fetch($cursorfacid);
-	            if ($result <= 0) dol_print_error($db);
-	            $amountsresttopay[$cursorfacid] = price2num($tmpinvoice->total_ttc - $tmpinvoice->getSommePaiement());
-	            if ($amounts[$cursorfacid])
-	            {
-		            // Check amount
-		            if ($amounts[$cursorfacid] && (abs($amounts[$cursorfacid]) > abs($amountsresttopay[$cursorfacid])))
-		            {
-		                $addwarning = 1;
-		                $formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPaySupplier")).' '.$langs->trans("HelpPaymentHigherThanReminderToPaySupplier");
-		            }
-		            // Check date
-		            if ($datepaye && ($datepaye < $tmpinvoice->date))
-		            {
-		            	$langs->load("errors");
-		                //$error++;
-		                setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye, 'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
-		            }
-	            }
+		// Generate payment array and check if there is payment higher than invoice and payment date before invoice date
+		$tmpinvoice = new FactureFournisseur($db);
+		foreach ($_POST as $key => $value)
+		{
+			if (substr($key, 0, 7) == 'amount_')
+			{
+				$cursorfacid = substr($key, 7);
+				$amounts[$cursorfacid] = price2num(GETPOST($key));
+				if (!empty($amounts[$cursorfacid])) {
+					$atleastonepaymentnotnull++;
+					if (is_numeric($amounts[$cursorfacid])) {
+						$totalpayment = $totalpayment + $amounts[$cursorfacid];
+					} else {
+						setEventMessages($langs->transnoentities("InputValueIsNotAnNumber", GETPOST($key)), null, 'warnings');
+					}
+				}
+				$result = $tmpinvoice->fetch($cursorfacid);
+				if ($result <= 0) dol_print_error($db);
+				$amountsresttopay[$cursorfacid] = price2num($tmpinvoice->total_ttc - $tmpinvoice->getSommePaiement());
+				if ($amounts[$cursorfacid])
+				{
+					// Check amount
+					if ($amounts[$cursorfacid] && (abs($amounts[$cursorfacid]) > abs($amountsresttopay[$cursorfacid])))
+					{
+						$addwarning = 1;
+						$formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPaySupplier")).' '.$langs->trans("HelpPaymentHigherThanReminderToPaySupplier");
+					}
+					// Check date
+					if ($datepaye && ($datepaye < $tmpinvoice->date))
+					{
+						$langs->load("errors");
+						//$error++;
+						setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye, 'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
+					}
+				}
 
-	            $formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => $_POST[$key]);
-	        } elseif (substr($key, 0, 21) == 'multicurrency_amount_')
+				$formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => $_POST[$key]);
+			} elseif (substr($key, 0, 21) == 'multicurrency_amount_')
 			{
 				$cursorfacid = substr($key, 21);
-	            $multicurrency_amounts[$cursorfacid] = (GETPOST($key) ? price2num(GETPOST($key)) : 0);
-	            $multicurrency_totalpayment += $multicurrency_amounts[$cursorfacid];
-	            if (!empty($multicurrency_amounts[$cursorfacid])) $atleastonepaymentnotnull++;
-	            $result = $tmpinvoice->fetch($cursorfacid);
-	            if ($result <= 0) dol_print_error($db);
-	            $multicurrency_amountsresttopay[$cursorfacid] = price2num($tmpinvoice->total_ttc - $tmpinvoice->getSommePaiement(1));
-	            if ($multicurrency_amounts[$cursorfacid])
-	            {
-		            // Check amount
-		            if ($multicurrency_amounts[$cursorfacid] && (abs($multicurrency_amounts[$cursorfacid]) > abs($multicurrency_amountsresttopay[$cursorfacid])))
-		            {
-		                $addwarning = 1;
-		                $formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPaySupplier")).' '.$langs->trans("HelpPaymentHigherThanReminderToPaySupplier");
-		            }
-		            // Check date
-		            if ($datepaye && ($datepaye < $tmpinvoice->date))
-		            {
-		            	$langs->load("errors");
-		                //$error++;
-		                setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye, 'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
-		            }
-	            }
+				$multicurrency_amounts[$cursorfacid] = (GETPOST($key) ? price2num(GETPOST($key)) : 0);
+				$multicurrency_totalpayment += $multicurrency_amounts[$cursorfacid];
+				if (!empty($multicurrency_amounts[$cursorfacid])) $atleastonepaymentnotnull++;
+				$result = $tmpinvoice->fetch($cursorfacid);
+				if ($result <= 0) dol_print_error($db);
+				$multicurrency_amountsresttopay[$cursorfacid] = price2num($tmpinvoice->total_ttc - $tmpinvoice->getSommePaiement(1));
+				if ($multicurrency_amounts[$cursorfacid])
+				{
+					// Check amount
+					if ($multicurrency_amounts[$cursorfacid] && (abs($multicurrency_amounts[$cursorfacid]) > abs($multicurrency_amountsresttopay[$cursorfacid])))
+					{
+						$addwarning = 1;
+						$formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPaySupplier")).' '.$langs->trans("HelpPaymentHigherThanReminderToPaySupplier");
+					}
+					// Check date
+					if ($datepaye && ($datepaye < $tmpinvoice->date))
+					{
+						$langs->load("errors");
+						//$error++;
+						setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye, 'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
+					}
+				}
 
-	            $formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => GETPOST($key, 'int'));
+				$formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => GETPOST($key, 'int'));
 			}
-	    }
+		}
 
-	    // Check parameters
-	    if ($_POST['paiementid'] <= 0)
-	    {
-	    	setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('PaymentMode')), null, 'errors');
-	        $error++;
-	    }
+		// Check parameters
+		if ($_POST['paiementid'] <= 0)
+		{
+			setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('PaymentMode')), null, 'errors');
+			$error++;
+		}
 
-	    if (!empty($conf->banque->enabled))
-	    {
-	        // If bank module is on, account is required to enter a payment
-	        if (GETPOST('accountid') <= 0)
-	        {
-	        	setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('AccountToCredit')), null, 'errors');
-	            $error++;
-	        }
-	    }
+		if (!empty($conf->banque->enabled))
+		{
+			// If bank module is on, account is required to enter a payment
+			if (GETPOST('accountid') <= 0)
+			{
+				setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('AccountToCredit')), null, 'errors');
+				$error++;
+			}
+		}
 
-	    if (empty($totalpayment) && empty($multicurrency_totalpayment) && empty($atleastonepaymentnotnull))
-	    {
-	    	setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->trans('PaymentAmount')), null, 'errors');
-	        $error++;
-	    }
+		if (empty($totalpayment) && empty($multicurrency_totalpayment) && empty($atleastonepaymentnotnull))
+		{
+			setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->trans('PaymentAmount')), null, 'errors');
+			$error++;
+		}
 
-	    if (empty($datepaye))
-	    {
-	    	setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('Date')), null, 'errors');
-	        $error++;
-	    }
+		if (empty($datepaye))
+		{
+			setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('Date')), null, 'errors');
+			$error++;
+		}
 
 		// Check if payments in both currency
 		if ($totalpayment > 0 && $multicurrency_totalpayment > 0)
 		{
 			setEventMessages($langs->transnoentities('ErrorPaymentInBothCurrency'), null, 'errors');
-	        $error++;
+			$error++;
 		}
 	}
 
@@ -241,11 +242,11 @@ if (empty($reshook))
 	 */
 	if ($action == 'add_paiement')
 	{
-	    if ($error)
-	    {
-	        $action = 'create';
-	    }
-	    // Le reste propre a cette action s'affiche en bas de page.
+		if ($error)
+		{
+			$action = 'create';
+		}
+		// All the next of this action is displayed at the page's bottom.
 	}
 
 
@@ -254,99 +255,99 @@ if (empty($reshook))
 	 */
 	if ($action == 'confirm_paiement' && $confirm == 'yes')
 	{
-	    $error = 0;
+		$error = 0;
 
-	    $datepaye = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$datepaye = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 
-        // Clean parameters amount if payment is for a credit note
-        foreach ($amounts as $key => $value)	// How payment is dispatched
-        {
-            $tmpinvoice = new FactureFournisseur($db);
-            $tmpinvoice->fetch($key);
-            if ($tmpinvoice->type == FactureFournisseur::TYPE_CREDIT_NOTE)
-            {
-                $newvalue = price2num($value, 'MT');
-                $amounts[$key] = - abs($newvalue);
-            }
-        }
+		// Clean parameters amount if payment is for a credit note
+		foreach ($amounts as $key => $value)	// How payment is dispatched
+		{
+			$tmpinvoice = new FactureFournisseur($db);
+			$tmpinvoice->fetch($key);
+			if ($tmpinvoice->type == FactureFournisseur::TYPE_CREDIT_NOTE)
+			{
+				$newvalue = price2num($value, 'MT');
+				$amounts[$key] = - abs($newvalue);
+			}
+		}
 
-        foreach ($multicurrency_amounts as $key => $value)	// How payment is dispatched
-        {
-            $tmpinvoice = new FactureFournisseur($db);
-            $tmpinvoice->fetch($key);
-            if ($tmpinvoice->type == FactureFournisseur::TYPE_CREDIT_NOTE)
-            {
-                $newvalue = price2num($value, 'MT');
-                $multicurrency_amounts[$key] = - abs($newvalue);
-            }
-        }
+		foreach ($multicurrency_amounts as $key => $value)	// How payment is dispatched
+		{
+			$tmpinvoice = new FactureFournisseur($db);
+			$tmpinvoice->fetch($key);
+			if ($tmpinvoice->type == FactureFournisseur::TYPE_CREDIT_NOTE)
+			{
+				$newvalue = price2num($value, 'MT');
+				$multicurrency_amounts[$key] = - abs($newvalue);
+			}
+		}
 
 		//var_dump($amounts);
-        //var_dump($multicurrency_amounts);
-        //exit;
+		//var_dump($multicurrency_amounts);
+		//exit;
 
-	    if (!$error)
-	    {
-	        $db->begin();
+		if (!$error)
+		{
+			$db->begin();
 
-	        $thirdparty = new Societe($db);
-            if ($socid > 0) $thirdparty->fetch($socid);
+			$thirdparty = new Societe($db);
+			if ($socid > 0) $thirdparty->fetch($socid);
 
-	        // Creation de la ligne paiement
-	        $paiement = new PaiementFourn($db);
-	        $paiement->datepaye     = $datepaye;
-	        $paiement->amounts      = $amounts; // Array of amounts
-	        $paiement->multicurrency_amounts = $multicurrency_amounts;
-	        $paiement->paiementid   = GETPOST('paiementid', 'int');
+			// Creation of payment line
+			$paiement = new PaiementFourn($db);
+			$paiement->datepaye     = $datepaye;
+			$paiement->amounts      = $amounts; // Array of amounts
+			$paiement->multicurrency_amounts = $multicurrency_amounts;
+			$paiement->paiementid   = GETPOST('paiementid', 'int');
 
-	        $paiement->num_payment  = GETPOST('num_paiement', 'alphanohtml');
-	        $paiement->note_private = GETPOST('comment', 'alpha');
-	        $paiement->num_payment = $paiement->num_payment;
-	        $paiement->note_private = $paiement->note_private;
+			$paiement->num_payment  = GETPOST('num_paiement', 'alphanohtml');
+			$paiement->note_private = GETPOST('comment', 'alpha');
+			$paiement->num_payment = $paiement->num_payment;
+			$paiement->note_private = $paiement->note_private;
 
-	        if (!$error)
-	        {
-	            $paiement_id = $paiement->create($user, (GETPOST('closepaidinvoices') == 'on' ? 1 : 0), $thirdparty);
-	            if ($paiement_id < 0)
-	            {
-	            	setEventMessages($paiement->error, $paiement->errors, 'errors');
-	                $error++;
-	            }
-	        }
+			if (!$error)
+			{
+				$paiement_id = $paiement->create($user, (GETPOST('closepaidinvoices') == 'on' ? 1 : 0), $thirdparty);
+				if ($paiement_id < 0)
+				{
+					setEventMessages($paiement->error, $paiement->errors, 'errors');
+					$error++;
+				}
+			}
 
-	        if (!$error)
-	        {
-	            $result = $paiement->addPaymentToBank($user, 'payment_supplier', '(SupplierInvoicePayment)', $accountid, '', '');
-	            if ($result < 0)
-	            {
-	            	setEventMessages($paiement->error, $paiement->errors, 'errors');
-	                $error++;
-	            }
-	        }
+			if (!$error)
+			{
+				$result = $paiement->addPaymentToBank($user, 'payment_supplier', '(SupplierInvoicePayment)', $accountid, '', '');
+				if ($result < 0)
+				{
+					setEventMessages($paiement->error, $paiement->errors, 'errors');
+					$error++;
+				}
+			}
 
-	        if (!$error)
-	        {
-	            $db->commit();
+			if (!$error)
+			{
+				$db->commit();
 
-	            // If payment dispatching on more than one invoice, we stay on summary page, otherwise go on invoice card
-	            $invoiceid = 0;
-	            foreach ($paiement->amounts as $key => $amount)
-	            {
-	                $facid = $key;
-	                if (is_numeric($amount) && $amount <> 0)
-	                {
-	                    if ($invoiceid != 0) $invoiceid = -1; // There is more than one invoice payed by this payment
-	                    else $invoiceid = $facid;
-	                }
-	            }
-	            if ($invoiceid > 0) $loc = DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$invoiceid;
-	            else $loc = DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$paiement_id;
-	            header('Location: '.$loc);
-	            exit;
-	        } else {
-	            $db->rollback();
-	        }
-	    }
+				// If payment dispatching on more than one invoice, we stay on summary page, otherwise go on invoice card
+				$invoiceid = 0;
+				foreach ($paiement->amounts as $key => $amount)
+				{
+					$facid = $key;
+					if (is_numeric($amount) && $amount <> 0)
+					{
+						if ($invoiceid != 0) $invoiceid = -1; // There is more than one invoice payed by this payment
+						else $invoiceid = $facid;
+					}
+				}
+				if ($invoiceid > 0) $loc = DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$invoiceid;
+				else $loc = DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$paiement_id;
+				header('Location: '.$loc);
+				exit;
+			} else {
+				$db->rollback();
+			}
+		}
 	}
 }
 
@@ -365,36 +366,36 @@ llxHeader('', $langs->trans('ListPayment'));
 
 if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paiement')
 {
-    $object = new FactureFournisseur($db);
-    $result = $object->fetch($facid);
+	$object = new FactureFournisseur($db);
+	$result = $object->fetch($facid);
 
-    $datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-    $dateinvoice = ($datefacture == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datefacture);
+	$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+	$dateinvoice = ($datefacture == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datefacture);
 
-    $sql = 'SELECT s.nom as name, s.rowid as socid,';
-    $sql .= ' f.rowid, f.ref, f.ref_supplier, f.total_ttc as total, f.fk_mode_reglement, f.fk_account';
-    if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
-    $sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'facture_fourn as f';
-    if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-    $sql .= ' WHERE f.fk_soc = s.rowid';
-    $sql .= ' AND f.rowid = '.$facid;
-    if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        if ($num)
-        {
-            $obj = $db->fetch_object($resql);
-            $total = $obj->total;
+	$sql = 'SELECT s.nom as name, s.rowid as socid,';
+	$sql .= ' f.rowid, f.ref, f.ref_supplier, f.total_ttc as total, f.fk_mode_reglement, f.fk_account';
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
+	$sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'facture_fourn as f';
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql .= ' WHERE f.fk_soc = s.rowid';
+	$sql .= ' AND f.rowid = '.$facid;
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		if ($num)
+		{
+			$obj = $db->fetch_object($resql);
+			$total = $obj->total;
 
-            print load_fiche_titre($langs->trans('DoPayment'));
+			print load_fiche_titre($langs->trans('DoPayment'));
 
-            // Add realtime total information
-            if (!empty($conf->use_javascript_ajax))
-            {
-            	print "\n".'<script type="text/javascript" language="javascript">';
-            	print '$(document).ready(function () {
+			// Add realtime total information
+			if (!empty($conf->use_javascript_ajax))
+			{
+				print "\n".'<script type="text/javascript" language="javascript">';
+				print '$(document).ready(function () {
 
 						function _elemToJson(selector)
 						{
@@ -452,56 +453,56 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 						});
 			';
 
-            	print '	});'."\n";
+				print '	});'."\n";
 
-            	//Add js for AutoFill
-            	print ' $(document).ready(function () {';
-            	print ' 	$(".AutoFillAmout").on(\'click touchstart\', function(){
+				//Add js for AutoFill
+				print ' $(document).ready(function () {';
+				print ' 	$(".AutoFillAmout").on(\'click touchstart\', function(){
 							$("input[name="+$(this).data(\'rowname\')+"]").val($(this).data("value")).trigger("change");
 						});';
-            	print '	});'."\n";
+				print '	});'."\n";
 
-            	print '	</script>'."\n";
-            }
+				print '	</script>'."\n";
+			}
 
-            print '<form id="payment_form" name="addpaiement" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            print '<input type="hidden" name="action" value="add_paiement">';
-            print '<input type="hidden" name="facid" value="'.$facid.'">';
-            print '<input type="hidden" name="ref_supplier" value="'.$obj->ref_supplier.'">';
-            print '<input type="hidden" name="socid" value="'.$obj->socid.'">';
-            print '<input type="hidden" name="type" id="invoice_type" value="'.$object->type.'">';
-            print '<input type="hidden" name="societe" value="'.$obj->name.'">';
+			print '<form id="payment_form" name="addpaiement" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="action" value="add_paiement">';
+			print '<input type="hidden" name="facid" value="'.$facid.'">';
+			print '<input type="hidden" name="ref_supplier" value="'.$obj->ref_supplier.'">';
+			print '<input type="hidden" name="socid" value="'.$obj->socid.'">';
+			print '<input type="hidden" name="type" id="invoice_type" value="'.$object->type.'">';
+			print '<input type="hidden" name="societe" value="'.$obj->name.'">';
 
-            dol_fiche_head(null);
+			print dol_get_fiche_head(null);
 
-            print '<table class="border centpercent">';
+			print '<table class="border centpercent">';
 
-            print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans('Company').'</td><td>';
-            $supplierstatic->id = $obj->socid;
-            $supplierstatic->name = $obj->name;
-            print $supplierstatic->getNomUrl(1, 'supplier');
-            print '</td></tr>';
-            print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td>';
-            print $form->selectDate($dateinvoice, '', '', '', 0, "addpaiement", 1, 1, 0, '', '', $object->date);
-            print '</td></tr>';
-            print '<tr><td class="fieldrequired">'.$langs->trans('PaymentMode').'</td><td>';
-            $form->select_types_paiements(empty($_POST['paiementid']) ? $obj->fk_mode_reglement : $_POST['paiementid'], 'paiementid');
-            print '</td>';
-            if (!empty($conf->banque->enabled))
-            {
-                print '<tr><td class="fieldrequired">'.$langs->trans('Account').'</td><td>';
-                $form->select_comptes(empty($accountid) ? $obj->fk_account : $accountid, 'accountid', 0, '', 2);
-                print '</td></tr>';
-            } else {
-                print '<tr><td>&nbsp;</td></tr>';
-            }
-            print '<tr><td>'.$langs->trans('Numero').'</td><td><input name="num_paiement" type="text" value="'.(empty($_POST['num_paiement']) ? '' : $_POST['num_paiement']).'"></td></tr>';
-            print '<tr><td>'.$langs->trans('Comments').'</td>';
-            print '<td class="tdtop">';
-            print '<textarea name="comment" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.(empty($_POST['comment']) ? '' : $_POST['comment']).'</textarea></td></tr>';
-            print '</table>';
-            dol_fiche_end();
+			print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans('Company').'</td><td>';
+			$supplierstatic->id = $obj->socid;
+			$supplierstatic->name = $obj->name;
+			print $supplierstatic->getNomUrl(1, 'supplier');
+			print '</td></tr>';
+			print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td>';
+			print $form->selectDate($dateinvoice, '', '', '', 0, "addpaiement", 1, 1, 0, '', '', $object->date);
+			print '</td></tr>';
+			print '<tr><td class="fieldrequired">'.$langs->trans('PaymentMode').'</td><td>';
+			$form->select_types_paiements(empty($_POST['paiementid']) ? $obj->fk_mode_reglement : $_POST['paiementid'], 'paiementid');
+			print '</td>';
+			if (!empty($conf->banque->enabled))
+			{
+				print '<tr><td class="fieldrequired">'.$langs->trans('Account').'</td><td>';
+				$form->select_comptes(empty($accountid) ? $obj->fk_account : $accountid, 'accountid', 0, '', 2);
+				print '</td></tr>';
+			} else {
+				print '<tr><td>&nbsp;</td></tr>';
+			}
+			print '<tr><td>'.$langs->trans('Numero').'</td><td><input name="num_paiement" type="text" value="'.(empty($_POST['num_paiement']) ? '' : $_POST['num_paiement']).'"></td></tr>';
+			print '<tr><td>'.$langs->trans('Comments').'</td>';
+			print '<td class="tdtop">';
+			print '<textarea name="comment" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.(empty($_POST['comment']) ? '' : $_POST['comment']).'</textarea></td></tr>';
+			print '</table>';
+			print dol_get_fiche_end();
 
 
 			$parameters = array('facid'=>$facid, 'ref'=>$ref, 'objcanvas'=>$objcanvas);
@@ -512,37 +513,37 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 				/*
 	             * All unpayed supplier invoices
 	             */
-	            $sql = 'SELECT f.rowid as facid, f.ref, f.ref_supplier, f.type, f.total_ht, f.total_ttc,';
-	            $sql .= ' f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc,';
-	            $sql .= ' f.datef as df, f.date_lim_reglement as dlr,';
-	            $sql .= ' SUM(pf.amount) as am, SUM(pf.multicurrency_amount) as multicurrency_am';
-	            $sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as f';
-	            $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
-	            $sql .= " WHERE f.entity = ".$conf->entity;
-	            $sql .= ' AND f.fk_soc = '.$object->socid;
-	            $sql .= ' AND f.paye = 0';
-	            $sql .= ' AND f.fk_statut = 1'; // Statut=0 => non validee, Statut=2 => annulee
-	            if ($object->type != FactureFournisseur::TYPE_CREDIT_NOTE)
-	            {
-	                $sql .= ' AND f.type IN (0,1,3,5)'; // Standard invoice, replacement, deposit, situation
-	            } else {
-	                $sql .= ' AND f.type = 2'; // If paying back a credit note, we show all credit notes
-	            }
-                // Group by because we have a total
-	            $sql .= ' GROUP BY f.datef, f.ref, f.ref_supplier, f.rowid, f.type, f.total_ht, f.total_ttc, f.multicurrency_total_ttc, f.datef, f.date_lim_reglement';
-	            // Sort invoices by date and serial number: the older one comes first
-	            $sql .= ' ORDER BY f.datef ASC, f.ref ASC';
+				$sql = 'SELECT f.rowid as facid, f.ref, f.ref_supplier, f.type, f.total_ht, f.total_ttc,';
+				$sql .= ' f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc,';
+				$sql .= ' f.datef as df, f.date_lim_reglement as dlr,';
+				$sql .= ' SUM(pf.amount) as am, SUM(pf.multicurrency_amount) as multicurrency_am';
+				$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as f';
+				$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
+				$sql .= " WHERE f.entity = ".$conf->entity;
+				$sql .= ' AND f.fk_soc = '.$object->socid;
+				$sql .= ' AND f.paye = 0';
+				$sql .= ' AND f.fk_statut = 1'; // Status=0 => unvalidated, Status=2 => canceled
+				if ($object->type != FactureFournisseur::TYPE_CREDIT_NOTE)
+				{
+					$sql .= ' AND f.type IN (0,1,3,5)'; // Standard invoice, replacement, deposit, situation
+				} else {
+					$sql .= ' AND f.type = 2'; // If paying back a credit note, we show all credit notes
+				}
+				// Group by because we have a total
+				$sql .= ' GROUP BY f.datef, f.ref, f.ref_supplier, f.rowid, f.type, f.total_ht, f.total_ttc, f.multicurrency_total_ttc, f.datef, f.date_lim_reglement';
+				// Sort invoices by date and serial number: the older one comes first
+				$sql .= ' ORDER BY f.datef ASC, f.ref ASC';
 
-	            $resql = $db->query($sql);
-	            if ($resql)
-	            {
-	                $num = $db->num_rows($resql);
-	                if ($num > 0)
-	                {
-	                    $i = 0;
-	                    print '<br>';
+				$resql = $db->query($sql);
+				if ($resql)
+				{
+					$num = $db->num_rows($resql);
+					if ($num > 0)
+					{
+						$i = 0;
+						print '<br>';
 
-	                    if (!empty($conf->use_javascript_ajax)) {
+						if (!empty($conf->use_javascript_ajax)) {
 							//Add js for AutoFill
 							print "\n".'<script type="text/javascript" language="javascript">';
 							print ' $(document).ready(function () {';
@@ -553,145 +554,145 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							print '	</script>'."\n";
 						}
 
-                        print '<div class="div-table-responsive-no-min">';
-                        print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+						print '<div class="div-table-responsive-no-min">';
+						print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 						print '<tr class="liste_titre">';
-	                    print '<td>'.$langs->trans('Invoice').'</td>';
-	                    print '<td>'.$langs->trans('RefSupplier').'</td>';
-	                    print '<td class="center">'.$langs->trans('Date').'</td>';
-	                    print '<td class="center">'.$langs->trans('DateMaxPayment').'</td>';
-	                    if (!empty($conf->multicurrency->enabled)) print '<td>'.$langs->trans('Currency').'</td>';
+						print '<td>'.$langs->trans('Invoice').'</td>';
+						print '<td>'.$langs->trans('RefSupplier').'</td>';
+						print '<td class="center">'.$langs->trans('Date').'</td>';
+						print '<td class="center">'.$langs->trans('DateMaxPayment').'</td>';
+						if (!empty($conf->multicurrency->enabled)) print '<td>'.$langs->trans('Currency').'</td>';
 						if (!empty($conf->multicurrency->enabled)) print '<td class="right">'.$langs->trans('MulticurrencyAmountTTC').'</td>';
 						if (!empty($conf->multicurrency->enabled)) print '<td class="right">'.$langs->trans('MulticurrencyAlreadyPaid').'</td>';
 						if (!empty($conf->multicurrency->enabled)) print '<td class="right">'.$langs->trans('MulticurrencyRemainderToPay').'</td>';
-	                    print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
-	                    print '<td class="right">'.$langs->trans('AlreadyPaid').'</td>';
-	                    print '<td class="right">'.$langs->trans('RemainderToPay').'</td>';
+						print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
+						print '<td class="right">'.$langs->trans('AlreadyPaid').'</td>';
+						print '<td class="right">'.$langs->trans('RemainderToPay').'</td>';
 						print '<td class="center">'.$langs->trans('PaymentAmount').'</td>';
 						if (!empty($conf->multicurrency->enabled)) print '<td class="center">'.$langs->trans('MulticurrencyPaymentAmount').'</td>';
-	                    print '</tr>';
+						print '</tr>';
 
-	                    $total = 0;
-	                    $total_ttc = 0;
-	                    $totalrecu = 0;
-	                    while ($i < $num)
-	                    {
-	                        $objp = $db->fetch_object($resql);
+						$total = 0;
+						$total_ttc = 0;
+						$totalrecu = 0;
+						while ($i < $num)
+						{
+							$objp = $db->fetch_object($resql);
 
-	                        $sign = 1;
-	                        if ($objp->type == FactureFournisseur::TYPE_CREDIT_NOTE) $sign = -1;
+							$sign = 1;
+							if ($objp->type == FactureFournisseur::TYPE_CREDIT_NOTE) $sign = -1;
 
-	                        $invoice = new FactureFournisseur($db);
-	                        $invoice->fetch($objp->facid);
+							$invoice = new FactureFournisseur($db);
+							$invoice->fetch($objp->facid);
 
-	                        $invoicesupplierstatic->ref = $objp->ref;
-	                        $invoicesupplierstatic->id = $objp->facid;
+							$invoicesupplierstatic->ref = $objp->ref;
+							$invoicesupplierstatic->id = $objp->facid;
 
-	                        $paiement = $invoice->getSommePaiement();
-	                        $creditnotes = $invoice->getSumCreditNotesUsed();
-	                        $deposits = $invoice->getSumDepositsUsed();
-	                        $alreadypayed = price2num($paiement + $creditnotes + $deposits, 'MT');
-	                        $remaintopay = price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits, 'MT');
+							$paiement = $invoice->getSommePaiement();
+							$creditnotes = $invoice->getSumCreditNotesUsed();
+							$deposits = $invoice->getSumDepositsUsed();
+							$alreadypayed = price2num($paiement + $creditnotes + $deposits, 'MT');
+							$remaintopay = price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits, 'MT');
 
-	                        // Multicurrency Price
-	                        if (!empty($conf->multicurrency->enabled))
-	                        {
-	                        	$multicurrency_payment = $invoice->getSommePaiement(1);
-	                        	$multicurrency_creditnotes = $invoice->getSumCreditNotesUsed(1);
-	                        	$multicurrency_deposits = $invoice->getSumDepositsUsed(1);
-	                        	$multicurrency_alreadypayed = price2num($multicurrency_payment + $multicurrency_creditnotes + $multicurrency_deposits, 'MT');
-	                        	$multicurrency_remaintopay = price2num($invoice->multicurrency_total_ttc - $multicurrency_payment - $multicurrency_creditnotes - $multicurrency_deposits, 'MT');
-	                        }
+							// Multicurrency Price
+							if (!empty($conf->multicurrency->enabled))
+							{
+								$multicurrency_payment = $invoice->getSommePaiement(1);
+								$multicurrency_creditnotes = $invoice->getSumCreditNotesUsed(1);
+								$multicurrency_deposits = $invoice->getSumDepositsUsed(1);
+								$multicurrency_alreadypayed = price2num($multicurrency_payment + $multicurrency_creditnotes + $multicurrency_deposits, 'MT');
+								$multicurrency_remaintopay = price2num($invoice->multicurrency_total_ttc - $multicurrency_payment - $multicurrency_creditnotes - $multicurrency_deposits, 'MT');
+							}
 
-	                        print '<tr class="oddeven'.(($invoice->id == $facid) ? ' highlight' : '').'">';
+							print '<tr class="oddeven'.(($invoice->id == $facid) ? ' highlight' : '').'">';
 
-	                        // Ref
-	                        print '<td class="nowraponall">';
-	                        print $invoicesupplierstatic->getNomUrl(1);
-	                        print '</td>';
+							// Ref
+							print '<td class="nowraponall">';
+							print $invoicesupplierstatic->getNomUrl(1);
+							print '</td>';
 
-	                        // Ref supplier
-	                        print '<td>'.$objp->ref_supplier.'</td>';
+							// Ref supplier
+							print '<td>'.$objp->ref_supplier.'</td>';
 
-	                        // Date
-	                        if ($objp->df > 0)
-	                        {
-	                            print '<td class="center nowraponall">';
-	                            print dol_print_date($db->jdate($objp->df), 'day').'</td>';
-	                        } else {
-	                            print '<td class="center"><b>!!!</b></td>';
-	                        }
+							// Date
+							if ($objp->df > 0)
+							{
+								print '<td class="center nowraponall">';
+								print dol_print_date($db->jdate($objp->df), 'day').'</td>';
+							} else {
+								print '<td class="center"><b>!!!</b></td>';
+							}
 
-	                        // Date Max Payment
-	                        if ($objp->dlr > 0)
-	                        {
-	                            print '<td class="center nowraponall">';
-	                            print dol_print_date($db->jdate($objp->dlr), 'day');
+							// Date Max Payment
+							if ($objp->dlr > 0)
+							{
+								print '<td class="center nowraponall">';
+								print dol_print_date($db->jdate($objp->dlr), 'day');
 
-	                            if ($invoice->hasDelay())
-	                            {
-	                                print img_warning($langs->trans('Late'));
-	                            }
+								if ($invoice->hasDelay())
+								{
+									print img_warning($langs->trans('Late'));
+								}
 
-	                            print '</td>';
-	                        } else {
-	                            print '<td class="center"><b>--</b></td>';
-	                        }
+								print '</td>';
+							} else {
+								print '<td class="center"><b>--</b></td>';
+							}
 
-	                        // Multicurrency
-	                        if (!empty($conf->multicurrency->enabled))
-	                        {
-    	                        // Currency
-	                            print '<td class="center">'.$objp->multicurrency_code."</td>\n";
+							// Multicurrency
+							if (!empty($conf->multicurrency->enabled))
+							{
+								// Currency
+								print '<td class="center">'.$objp->multicurrency_code."</td>\n";
 
-	                            print '<td class="right">';
-	                            if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
-	                            {
-	                                print price($objp->multicurrency_total_ttc);
-	                            }
-	                            print '</td>';
+								print '<td class="right">';
+								if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
+								{
+									print price($objp->multicurrency_total_ttc);
+								}
+								print '</td>';
 
-							    print '<td class="right">';
-							    if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
-						        {
-						            print price($objp->multicurrency_am);
-							    }
-							    print '</td>';
+								print '<td class="right">';
+								if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
+								{
+									print price($objp->multicurrency_am);
+								}
+								print '</td>';
 
-							    print '<td class="right">';
-							    if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
-						        {
-						            print price($objp->multicurrency_total_ttc - $objp->multicurrency_am);
-							    }
-							    print '</td>';
-	                        }
+								print '<td class="right">';
+								if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
+								{
+									print price($objp->multicurrency_total_ttc - $objp->multicurrency_am);
+								}
+								print '</td>';
+							}
 
-	                        print '<td class="right">'.price($sign * $objp->total_ttc).'</td>';
+							print '<td class="right">'.price($sign * $objp->total_ttc).'</td>';
 
-	                        print '<td class="right">'.price($sign * $objp->am);
+							print '<td class="right">'.price($sign * $objp->am);
 							if ($creditnotes) print '+'.price($creditnotes);
 							if ($deposits) print '+'.price($deposits);
 							print '</td>';
 
-	                        print '<td class="right">'.price($sign * $remaintopay).'</td>';
+							print '<td class="right">'.price($sign * $remaintopay).'</td>';
 
-	                        // Amount
-	                        print '<td class="center nowraponall">';
+							// Amount
+							print '<td class="center nowraponall">';
 
-	                        $namef = 'amount_'.$objp->facid;
-	                        $nameRemain = 'remain_'.$objp->facid;
+							$namef = 'amount_'.$objp->facid;
+							$nameRemain = 'remain_'.$objp->facid;
 
-	                        if ($action != 'add_paiement')
-	                        {
-	                        	if (!empty($conf->use_javascript_ajax))
-	                        		print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
-	                        		print '<input type="hidden" class="remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
-	                        		print '<input type="text" size="8" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
-	                        } else {
-	                        	print '<input type="text" size="8" name="'.$namef.'_disabled" value="'.dol_escape_htmltag(GETPOST($namef)).'" disabled>';
-	                        	print '<input type="hidden" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
-	                        }
+							if ($action != 'add_paiement')
+							{
+								if (!empty($conf->use_javascript_ajax))
+									print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
+									print '<input type="hidden" class="remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
+									print '<input type="text" size="8" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
+							} else {
+								print '<input type="text" size="8" name="'.$namef.'_disabled" value="'.dol_escape_htmltag(GETPOST($namef)).'" disabled>';
+								print '<input type="hidden" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
+							}
 							print "</td>";
 
 							// Multicurrency Price
@@ -720,18 +721,18 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							}
 
 							print "</tr>\n";
-	                        $total += $objp->total_ht;
-	                        $total_ttc += $objp->total_ttc;
-	                        $totalrecu += $objp->am;
+							$total += $objp->total_ht;
+							$total_ttc += $objp->total_ttc;
+							$totalrecu += $objp->am;
 							$totalrecucreditnote += $creditnotes;
 							$totalrecudeposits += $deposits;
-	                        $i++;
-	                    }
-	                    if ($i > 1)
-	                    {
-	                        // Print total
-	                        print '<tr class="liste_total">';
-	                        print '<td colspan="4" class="left">'.$langs->trans('TotalTTC').':</td>';
+							$i++;
+						}
+						if ($i > 1)
+						{
+							// Print total
+							print '<tr class="liste_total">';
+							print '<td colspan="4" class="left">'.$langs->trans('TotalTTC').':</td>';
 							if (!empty($conf->multicurrency->enabled)) print '<td>&nbsp;</td>';
 							if (!empty($conf->multicurrency->enabled)) print '<td>&nbsp;</td>';
 							if (!empty($conf->multicurrency->enabled)) print '<td>&nbsp;</td>';
@@ -742,298 +743,49 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							if ($totalrecudeposits) print '+'.price($totalrecudeposits);
 							print	'</b></td>';
 							print '<td class="right"><b>'.price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT')).'</b></td>';
-	                        print '<td class="center" id="result" style="font-weight: bold;"></td>'; // Autofilled
+							print '<td class="center" id="result" style="font-weight: bold;"></td>'; // Autofilled
 							if (!empty($conf->multicurrency->enabled)) print '<td class="right" id="multicurrency_result" style="font-weight: bold;"></td>';
-	                        print "</tr>\n";
-	                    }
-	                    print "</table>\n";
+							print "</tr>\n";
+						}
+						print "</table>\n";
 
-	                    print "</div>";
-	                }
-	                $db->free($resql);
-	            } else {
-	                dol_print_error($db);
-	            }
+						print "</div>";
+					}
+					$db->free($resql);
+				} else {
+					dol_print_error($db);
+				}
 			}
 
-	        // Bouton Enregistrer
-	        if ($action != 'add_paiement')
-	        {
+			// Save Button
+			if ($action != 'add_paiement')
+			{
 				print '<br><div class="center"><input type="checkbox" checked name="closepaidinvoices"> '.$langs->trans("ClosePaidInvoicesAutomatically");
 				print '<br><input type="submit" class="button" value="'.$langs->trans('ToMakePayment').'"></div>';
-	        }
+			}
 
-            // Form to confirm payment
-	        if ($action == 'add_paiement')
-	        {
-	            $preselectedchoice = $addwarning ? 'no' : 'yes';
+			// Form to confirm payment
+			if ($action == 'add_paiement')
+			{
+				$preselectedchoice = $addwarning ? 'no' : 'yes';
 
-	            print '<br>';
-	            if (!empty($totalpayment)) $text = $langs->trans('ConfirmSupplierPayment', price($totalpayment), $langs->trans("Currency".$conf->currency));
+				print '<br>';
+				if (!empty($totalpayment)) $text = $langs->trans('ConfirmSupplierPayment', price($totalpayment), $langs->trans("Currency".$conf->currency));
 				if (!empty($multicurrency_totalpayment))
 				{
 					$text .= '<br>'.$langs->trans('ConfirmSupplierPayment', price($multicurrency_totalpayment), $langs->trans("paymentInInvoiceCurrency"));
 				}
-	            if (GETPOST('closepaidinvoices'))
-	            {
-	                $text .= '<br>'.$langs->trans("AllCompletelyPayedInvoiceWillBeClosed");
-	                print '<input type="hidden" name="closepaidinvoices" value="'.GETPOST('closepaidinvoices').'">';
-	            }
-	            print $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$facture->id.'&socid='.$facture->socid.'&type='.$facture->type, $langs->trans('PayedSuppliersPayments'), $text, 'confirm_paiement', $formquestion, $preselectedchoice);
-	        }
+				if (GETPOST('closepaidinvoices'))
+				{
+					$text .= '<br>'.$langs->trans("AllCompletelyPayedInvoiceWillBeClosed");
+					print '<input type="hidden" name="closepaidinvoices" value="'.GETPOST('closepaidinvoices').'">';
+				}
+				print $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$facture->id.'&socid='.$facture->socid.'&type='.$facture->type, $langs->trans('PayedSuppliersPayments'), $text, 'confirm_paiement', $formquestion, $preselectedchoice);
+			}
 
-            print '</form>';
-        }
-    } else dol_print_error($db);
-}
-
-/*
- * Show list
- */
-if (empty($action) || $action == 'list')
-{
-    $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-    $sortfield = GETPOST("sortfield", 'alpha');
-    $sortorder = GETPOST("sortorder", 'alpha');
-    $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-    if (empty($page) || $page == -1) { $page = 0; }
-    $offset = $limit * $page;
-    $pageprev = $page - 1;
-    $pagenext = $page + 1;
-    if (!$sortorder) $sortorder = 'DESC';
-    if (!$sortfield) $sortfield = 'p.datep';
-
-    $sql = 'SELECT p.rowid as pid, p.ref, p.datep as dp, p.amount as pamount, p.num_paiement,';
-    $sql .= ' s.rowid as socid, s.nom as name,';
-    $sql .= ' c.code as paiement_type, c.libelle as paiement_libelle,';
-    $sql .= ' ba.rowid as bid, ba.label,';
-    if (!$user->rights->societe->client->voir) $sql .= ' sc.fk_soc, sc.fk_user,';
-    $sql .= ' SUM(pf.amount)';
-    $sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn AS p';
-    $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn AS pf ON p.rowid=pf.fk_paiementfourn';
-    $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn AS f ON f.rowid=pf.fk_facturefourn';
-    $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement AS c ON p.fk_paiement = c.id';
-    $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON s.rowid = f.fk_soc';
-    $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
-    $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
-    if (!$user->rights->societe->client->voir) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-    $sql .= " WHERE f.entity = ".$conf->entity;
-    if (!$user->rights->societe->client->voir) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-    if ($socid > 0) $sql .= ' AND f.fk_soc = '.$socid;
-    $sql .= dolSqlDateFilter('p.datep', $day, $month, $year);
-    if ($search_ref)       		    $sql .= natural_search('p.rowid', $search_ref);
-    if ($search_account > 0)      	$sql .= " AND b.fk_account=".$search_account;
-    if ($search_paymenttype != "")  $sql .= " AND c.code='".$db->escape($search_paymenttype)."'";
-    if ($search_payment_num != '')  $sql .= natural_search('p.num_paiement', $search_payment_num);
-    if ($search_amount)      		$sql .= natural_search('p.amount', $search_amount, 1);
-    if ($search_company)     		$sql .= natural_search('s.nom', $search_company);
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
-    $sql .= " GROUP BY p.rowid, p.datep, p.amount, p.num_paiement, s.rowid, s.nom, c.code, c.libelle, ba.rowid, ba.label";
-    if (!$user->rights->societe->client->voir) $sql .= ", sc.fk_soc, sc.fk_user";
-    // Add where from extra fields
-
-    $sql .= $db->order($sortfield, $sortorder);
-
-    $nbtotalofrecords = '';
-    if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-    {
-        $result = $db->query($sql);
-        $nbtotalofrecords = $db->num_rows($result);
-        if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-        {
-        	$page = 0;
-        	$offset = 0;
-        }
-    }
-
-    $sql .= $db->plimit($limit + 1, $offset);
-
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
-
-        $param = '';
-        if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-        if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-        if ($day)                   $param .= ($day ? "&day=".urlencode($day) : "");
-        if ($month)                 $param .= ($month ? "&month=".urlencode($month) : "");
-        if ($year)                  $param .= ($year ? "&year=".urlencode($year) : "");
-        if ($search_ref)            $param .= ($search_ref ? "&search_ref=".urlencode($search_ref) : "");
-        if ($search_company)        $param .= ($search_company ? "&search_company=".urlencode($search_company) : "");
-        if ($search_amount != '')   $param .= ($search_amount ? "&search_amount=".urlencode($search_amount) : "");
-        if ($search_payment_num)    $param .= ($search_payment_num ? "&search_payment_num=".urlencode($search_payment_num) : "");
-    	if ($optioncss != '')       $param .= '&optioncss='.urlencode($optioncss);
-    	// Add $param from extra fields
-    	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
-
-    	$massactionbutton = $form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
-
-        print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-        if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-        print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<input type="hidden" name="action" value="list">';
-        print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-        print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-        print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
-        print_barre_liste($langs->trans('SupplierPayments'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'supplier_invoice', 0, '', '', $limit, 0, 0, 1);
-
-        $moreforfilter = '';
-
-        $parameters = array();
-        $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
-    	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
-    	else $moreforfilter = $hookmanager->resPrint;
-
-        if ($moreforfilter)
-        {
-       		print '<div class="liste_titre liste_titre_bydiv centpercent">';
-            print $moreforfilter;
-            print '</div>';
-        }
-
-        $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-        $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
-
-        print '<div class="div-table-responsive">';
-        print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
-
-        // Lines for filters fields
-        print '<tr class="liste_titre_filter">';
-        print '<td  class="liste_titre left">';
-        print '<input class="flat" type="text" size="4" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
-        print '</td>';
-        print '<td class="liste_titre center">';
-        if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
-        print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month" value="'.dol_escape_htmltag($month).'">';
-        $formother->select_year($year ? $year : -1, 'year', 1, 20, 5);
-        print '</td>';
-        print '<td class="liste_titre">';
-        print '<input class="flat" type="text" size="6" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
-        print '</td>';
-        print '<td class="liste_titre">';
-        $form->select_types_paiements($search_paymenttype, 'search_paymenttype', '', 2, 1, 1);
-        print '</td>';
-        print '<td class="liste_titre">';
-        print '<input class="flat" type="text" size="4" name="search_payment_num" value="'.dol_escape_htmltag($search_payment_num).'">';
-        print '</td>';
-        if (!empty($conf->banque->enabled))
-        {
-            print '<td class="liste_titre">';
-	        $form->select_comptes($search_account, 'search_account', 0, '', 1);
-	        print '</td>';
-        }
-        print '<td class="liste_titre right">';
-        print '<input class="flat" type="text" size="4" name="search_amount" value="'.dol_escape_htmltag($search_amount).'">';
-        print '</td>';
-        print '<td class="liste_titre maxwidthsearch">';
-        $searchpicto = $form->showFilterAndCheckAddButtons(0);
-        print $searchpicto;
-        print '</td>';
-        print "</tr>\n";
-
-        print '<tr class="liste_titre">';
-        print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], 'p.rowid', '', $param, '', $sortfield, $sortorder);
-        print_liste_field_titre("Date", $_SERVER["PHP_SELF"], 'dp', '', $param, '', $sortfield, $sortorder, 'center ');
-        print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], 's.nom', '', $param, '', $sortfield, $sortorder);
-        print_liste_field_titre("Type", $_SERVER["PHP_SELF"], 'c.libelle', '', $param, '', $sortfield, $sortorder);
-        print_liste_field_titre("Numero", $_SERVER["PHP_SELF"], "p.num_paiement", "", $param, "", $sortfield, $sortorder);
-        if (!empty($conf->banque->enabled))
-        {
-            print_liste_field_titre("Account", $_SERVER["PHP_SELF"], 'ba.label', '', $param, '', $sortfield, $sortorder);
-        }
-        print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], 'p.amount', '', $param, '', $sortfield, $sortorder, 'right ');
-
-        $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
-        $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-
-        print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
-        print "</tr>\n";
-
-        $paymentfournstatic = new PaiementFourn($db);
-
-        $i = 0;
-        $totalarray = array();
-        while ($i < min($num, $limit))
-        {
-            $objp = $db->fetch_object($resql);
-
-            $paymentfournstatic->id = $objp->pid;
-            $paymentfournstatic->ref = $objp->ref;
-            $paymentfournstatic->datepaye = $objp->dp;
-
-            print '<tr class="oddeven">';
-
-            // Ref payment
-            print '<td class="nowrap">';
-            print $paymentfournstatic->getNomUrl(1);
-            print '</td>';
-            if (!$i) $totalarray['nbfield']++;
-
-            // Date
-            $dateformatforpayment = 'day';
-            if (!empty($conf->global->INVOICE_USE_HOURS_FOR_PAYMENT)) $dateformatforpayment = 'dayhour';
-            print '<td class="nowrap center">'.dol_print_date($db->jdate($objp->dp), $dateformatforpayment)."</td>\n";
-            if (!$i) $totalarray['nbfield']++;
-
-            // Thirdparty
-            print '<td>';
-            if ($objp->socid) print '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$objp->socid.'">'.img_object($langs->trans('ShowCompany'), 'company').' '.dol_trunc($objp->name, 32).'</a>';
-            else print '&nbsp;';
-            print '</td>';
-            if (!$i) $totalarray['nbfield']++;
-
-            // Type
-            $payment_type = $langs->trans("PaymentType".$objp->paiement_type) != ("PaymentType".$objp->paiement_type) ? $langs->trans("PaymentType".$objp->paiement_type) : $objp->paiement_libelle;
-            print '<td>'.$payment_type.' '.dol_trunc($objp->num_paiement, 32)."</td>\n";
-            if (!$i) $totalarray['nbfield']++;
-
-            // Payment number
-            print '<td>'.$objp->num_paiement.'</td>';
-            if (!$i) $totalarray['nbfield']++;
-
-            // Account
-            if (!empty($conf->banque->enabled))
-            {
-                print '<td>';
-	            if ($objp->bid) print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"), 'account').' '.dol_trunc($objp->label, 24).'</a>';
-    	        else print '&nbsp;';
-        	    print '</td>';
-            	if (!$i) $totalarray['nbfield']++;
-            }
-
-            // Amount
-            print '<td class="right">'.price($objp->pamount).'</td>';
-            if (!$i) $totalarray['nbfield']++;
-            if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'amount';
-            $totalarray['val']['amount'] += $objp->pamount;
-
-            // Ref invoice
-            /*$invoicesupplierstatic->ref=$objp->ref_supplier;
-            $invoicesupplierstatic->id=$objp->facid;
-            print '<td class="nowrap">';
-            print $invoicesupplierstatic->getNomUrl(1);
-            print '</td>';*/
-
-			print '<td></td>';
-			if (!$i) $totalarray['nbfield']++;
-
-            print '</tr>';
-            $i++;
-        }
-
-        // Show total line
-        include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
-
-        print "</table>";
-        print "</div>";
-        print "</form>\n";
-    } else {
-        dol_print_error($db);
-    }
+			print '</form>';
+		}
+	} else dol_print_error($db);
 }
 
 // End of page
diff --git a/htdocs/fourn/facture/rapport.php b/htdocs/fourn/facture/rapport.php
index 1c068e19b7d..9ae7970d7db 100644
--- a/htdocs/fourn/facture/rapport.php
+++ b/htdocs/fourn/facture/rapport.php
@@ -40,8 +40,8 @@ $action = GETPOST('action', 'aZ09');
 $socid = 0;
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $dir = $conf->fournisseur->facture->dir_output.'/payments';
@@ -57,27 +57,27 @@ if (!$year) { $year = date("Y"); }
 
 if ($action == 'builddoc')
 {
-    $rap = new pdf_paiement_fourn($db);
+	$rap = new pdf_paiement_fourn($db);
 
-    $outputlangs = $langs;
-    if (GETPOST('lang_id', 'aZ09'))
-    {
-        $outputlangs = new Translate("", $conf);
-        $outputlangs->setDefaultLang(GETPOST('lang_id', 'aZ09'));
-    }
+	$outputlangs = $langs;
+	if (GETPOST('lang_id', 'aZ09'))
+	{
+		$outputlangs = new Translate("", $conf);
+		$outputlangs->setDefaultLang(GETPOST('lang_id', 'aZ09'));
+	}
 
-    // We save charset_output to restore it because write_file can change it if needed for
-    // output format that does not support UTF8.
-    $sav_charset_output = $outputlangs->charset_output;
-    if ($rap->write_file($dir, GETPOST("remonth", 'int'), GETPOST("reyear", 'int'), $outputlangs) > 0)
-    {
-        $outputlangs->charset_output = $sav_charset_output;
-    } else {
-        $outputlangs->charset_output = $sav_charset_output;
-        dol_print_error($db, $obj->error);
-    }
+	// We save charset_output to restore it because write_file can change it if needed for
+	// output format that does not support UTF8.
+	$sav_charset_output = $outputlangs->charset_output;
+	if ($rap->write_file($dir, GETPOST("remonth", 'int'), GETPOST("reyear", 'int'), $outputlangs) > 0)
+	{
+		$outputlangs->charset_output = $sav_charset_output;
+	} else {
+		$outputlangs->charset_output = $sav_charset_output;
+		dol_print_error($db, $obj->error);
+	}
 
-    $year = GETPOST("reyear", 'int');
+	$year = GETPOST("reyear", 'int');
 }
 
 
@@ -116,58 +116,58 @@ $linkforyear = array();
 $found = 0;
 if (is_dir($dir))
 {
-    $handle = opendir($dir);
-    if (is_resource($handle))
-    {
-        while (($file = readdir($handle)) !== false)
-        {
-            if (is_dir($dir.'/'.$file) && !preg_match('/^\./', $file) && is_numeric($file))
-            {
-                $found = 1;
-                $linkforyear[] = $file;
-            }
-        }
-    }
+	$handle = opendir($dir);
+	if (is_resource($handle))
+	{
+		while (($file = readdir($handle)) !== false)
+		{
+			if (is_dir($dir.'/'.$file) && !preg_match('/^\./', $file) && is_numeric($file))
+			{
+				$found = 1;
+				$linkforyear[] = $file;
+			}
+		}
+	}
 }
 asort($linkforyear);
 foreach ($linkforyear as $cursoryear)
 {
-    print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$cursoryear.'">'.$cursoryear.'</a> &nbsp;';
+	print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$cursoryear.'">'.$cursoryear.'</a> &nbsp;';
 }
 
 if ($year)
 {
-    if (is_dir($dir.'/'.$year))
-    {
-        $handle = opendir($dir.'/'.$year);
+	if (is_dir($dir.'/'.$year))
+	{
+		$handle = opendir($dir.'/'.$year);
 
-        if ($found) print '<br>';
-        print '<br>';
-        print '<table width="100%" class="noborder">';
-        print '<tr class="liste_titre">';
-        print '<td>'.$langs->trans("Reporting").'</td>';
-        print '<td class="right">'.$langs->trans("Size").'</td>';
-        print '<td class="right">'.$langs->trans("Date").'</td>';
-        print '</tr>';
+		if ($found) print '<br>';
+		print '<br>';
+		print '<table width="100%" class="noborder">';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("Reporting").'</td>';
+		print '<td class="right">'.$langs->trans("Size").'</td>';
+		print '<td class="right">'.$langs->trans("Date").'</td>';
+		print '</tr>';
 
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (preg_match('/^supplier_payment/i', $file))
-                {
-                    $tfile = $dir.'/'.$year.'/'.$file;
-                    $relativepath = $year.'/'.$file;
-                    print '<tr class="oddeven"><td><a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart=facture_fournisseur&amp;file=payments/'.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a>'.$formfile->showPreview($file, 'facture_fournisseur', 'payments/'.$relativepath, 0).'</td>';
-                    print '<td class="right">'.dol_print_size(dol_filesize($tfile)).'</td>';
-                    print '<td class="right">'.dol_print_date(dol_filemtime($tfile), "dayhour").'</td></tr>';
-                }
-            }
-            closedir($handle);
-        }
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (preg_match('/^supplier_payment/i', $file))
+				{
+					$tfile = $dir.'/'.$year.'/'.$file;
+					$relativepath = $year.'/'.$file;
+					print '<tr class="oddeven"><td><a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart=facture_fournisseur&amp;file=payments/'.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a>'.$formfile->showPreview($file, 'facture_fournisseur', 'payments/'.$relativepath, 0).'</td>';
+					print '<td class="right">'.dol_print_size(dol_filesize($tfile)).'</td>';
+					print '<td class="right">'.dol_print_date(dol_filemtime($tfile), "dayhour").'</td></tr>';
+				}
+			}
+			closedir($handle);
+		}
 
-        print '</table>';
-    }
+		print '</table>';
+	}
 }
 
 // End of page
diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
index 0826a4ab200..4456d27c539 100644
--- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
@@ -40,29 +40,29 @@ $langs->load("bills");
 $total = 0; $ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink)
 {
-    $ilink++;
+	$ilink++;
 
-    $trclass = 'oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
-    ?>
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	?>
     <tr class="<?php echo $trclass; ?>">
         <td><?php echo $langs->trans("SupplierInvoice"); ?></td>
     	<td><a href="<?php echo DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$objectlink->id ?>"><?php echo img_object($langs->trans("ShowBill"), "bill").' '.$objectlink->ref; ?></a></td>
     	<td class="left"><?php echo $objectlink->ref_supplier; ?></td>
     	<td class="center"><?php echo dol_print_date($objectlink->date, 'day'); ?></td>
     	<td class="right"><?php
-    	if ($user->rights->fournisseur->facture->lire) {
-    	    $sign = 1;
-    		if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE) $sign = -1;
-    		if ($objectlink->statut != 3)
-    		{
+		if ($user->rights->fournisseur->facture->lire) {
+			$sign = 1;
+			if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE) $sign = -1;
+			if ($objectlink->statut != 3)
+			{
 				// If not abandonned
-    			$total = $total + $sign * $objectlink->total_ht;
-    			echo price($objectlink->total_ht);
-    		} else {
-    			echo '<strike>'.price($objectlink->total_ht).'</strike>';
-    		}
-    	} ?></td>
+				$total = $total + $sign * $objectlink->total_ht;
+				echo price($objectlink->total_ht);
+			} else {
+				echo '<strike>'.price($objectlink->total_ht).'</strike>';
+			}
+		} ?></td>
     	<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
     	<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
     </tr>
@@ -70,7 +70,7 @@ foreach ($linkedObjectBlock as $key => $objectlink)
 }
 if (count($linkedObjectBlock) > 1)
 {
-    ?>
+	?>
     <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
         <td><?php echo $langs->trans("Total"); ?></td>
         <td></td>
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index ffe4c95bf51..06cff4b5c9e 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -74,7 +74,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->fournisse
 	if ($result > 0)
 	{
 		$db->commit();
-		header('Location: '.DOL_URL_ROOT.'/fourn/facture/paiement.php');
+		header('Location: '.DOL_URL_ROOT.'/fourn/paiement/list.php');
 		exit;
 	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
@@ -82,7 +82,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->fournisse
 	}
 }
 
-if ($action == 'confirm_valide' && $confirm == 'yes' &&
+if ($action == 'confirm_validate' && $confirm == 'yes' &&
 	((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->facture->creer))
 	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_invoice_advance->validate)))
 )
@@ -90,7 +90,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' &&
 	$db->begin();
 
 	$object->fetch($id);
-	if ($object->valide() >= 0)
+	if ($object->validate() >= 0)
 	{
 		$db->commit();
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id);
@@ -128,7 +128,7 @@ if ($action == 'setdatep' && !empty($_POST['datepday']))
 
 // Build document
 $upload_dir = $conf->fournisseur->payment->dir_output;
-// TODO: get the appropriate permisson
+// TODO: get the appropriate permission
 $permissiontoadd = true;
 include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
@@ -146,12 +146,12 @@ $formfile = new FormFile($db);
 
 $head = payment_supplier_prepare_head($object);
 
-dol_fiche_head($head, 'payment', $langs->trans('SupplierPayment'), -1, 'payment');
+print dol_get_fiche_head($head, 'payment', $langs->trans('SupplierPayment'), -1, 'payment');
 
 if ($result > 0)
 {
 	/*
-	 * Confirmation de la suppression du paiement
+	 * Confirmation of payment's delete
 	 */
 	if ($action == 'delete')
 	{
@@ -159,14 +159,14 @@ if ($result > 0)
 	}
 
 	/*
-	 * Confirmation de la validation du paiement
+	 * Confirmation of payment's validation
 	 */
-	if ($action == 'valide')
+	if ($action == 'validate')
 	{
-		print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide');
+		print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_validate');
 	}
 
-	$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/paiement.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/paiement/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref');
@@ -181,7 +181,7 @@ if ($result > 0)
     print $form->showrefnav($object,'id','',1,'rowid','ref');
 	print '</td></tr>';*/
 
-	// Date payment
+	// Date of payment
 	print '<tr><td class="titlefield" colspan="2">'.$form->editfieldkey("Date", 'datep', $object->date, $object, $object->statut == 0 && $user->rights->fournisseur->facture->creer).'</td><td colspan="3">';
 	print $form->editfieldval("Date", 'datep', $object->date, $object, $object->statut == 0 && $user->rights->fournisseur->facture->creer, 'datehourpicker', '', null, $langs->trans('PaymentDateUpdateSucceeded'));
 	print '</td></tr>';
@@ -251,9 +251,10 @@ if ($result > 0)
 	print '<br>';
 
 	/**
-	 *	Liste des factures
+	 *	List of seller's invoices
 	 */
-	$sql = 'SELECT f.rowid, f.ref, f.ref_supplier, f.total_ttc, pf.amount, f.rowid as facid, f.paye, f.fk_statut, s.nom as name, s.rowid as socid';
+	$sql = 'SELECT f.rowid, f.rowid as facid, f.ref, f.ref_supplier, f.type, f.paye, f.total_ht, f.total_tva, f.total_ttc, f.datef as date, f.fk_statut as status,';
+	$sql .= ' pf.amount, s.nom as name, s.rowid as socid';
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf,'.MAIN_DB_PREFIX.'facture_fourn as f,'.MAIN_DB_PREFIX.'societe as s';
 	$sql .= ' WHERE pf.fk_facturefourn = f.rowid AND f.fk_soc = s.rowid';
 	$sql .= ' AND pf.fk_paiementfourn = '.$object->id;
@@ -264,10 +265,10 @@ if ($result > 0)
 
 		$i = 0;
 		$total = 0;
-		print '<b>'.$langs->trans("Invoices").'</b><br>';
+
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
-		print '<td>'.$langs->trans('Ref').'</td>';
+		print '<td>'.$langs->trans('Invoice').'</td>';
 		print '<td>'.$langs->trans('RefSupplier').'</td>';
 		print '<td>'.$langs->trans('Company').'</td>';
 		print '<td class="right">'.$langs->trans('ExpectedToPay').'</td>';
@@ -285,6 +286,13 @@ if ($result > 0)
 
 				$facturestatic->id = $objp->facid;
 				$facturestatic->ref = ($objp->ref ? $objp->ref : $objp->rowid);
+				$facturestatic->date = $db->jdate($objp->date);
+				$facturestatic->type = $objp->type;
+				$facturestatic->total_ht = $objp->total_ht;
+				$facturestatic->total_tva = $objp->total_tva;
+				$facturestatic->total_ttc = $objp->total_ttc;
+				$facturestatic->statut = $objp->status;
+				$facturestatic->alreadypaid = -1; // unknown
 
 				print '<tr class="oddeven">';
 				// Ref
@@ -300,7 +308,7 @@ if ($result > 0)
 				// Payed
 				print '<td class="right">'.price($objp->amount).'</td>';
 				// Status
-				print '<td class="right">'.$facturestatic->LibStatut($objp->paye, $objp->fk_statut, 6, 1).'</td>';
+				print '<td class="right">'.$facturestatic->LibStatut($objp->paye, $objp->status, 6, 1).'</td>';
 				print "</tr>\n";
 
 				if ($objp->paye == 1)
@@ -324,7 +332,7 @@ if ($result > 0)
 
 
 	/*
-	 * Boutons Actions
+	 * Actions Buttons
 	 */
 
 	print '<div class="tabsAction">';
@@ -335,7 +343,7 @@ if ($result > 0)
 			if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->facture->creer))
 		   	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_invoice_advance->validate)))
 			{
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=valide">'.$langs->trans('Valid').'</a>';
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=validate">'.$langs->trans('Valid').'</a>';
 			}
 		}
 	}
@@ -388,7 +396,7 @@ if ($result > 0)
 	print $langs->trans("ErrorRecordNotFound");
 }
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/fourn/paiement/info.php b/htdocs/fourn/paiement/info.php
index c2fbd32445a..97ac2343c23 100644
--- a/htdocs/fourn/paiement/info.php
+++ b/htdocs/fourn/paiement/info.php
@@ -45,11 +45,11 @@ llxHeader();
 
 $head = payment_supplier_prepare_head($object);
 
-dol_fiche_head($head, 'info', $langs->trans("SupplierPayment"), 0, 'payment');
+print dol_get_fiche_head($head, 'info', $langs->trans("SupplierPayment"), 0, 'payment');
 
 dol_banner_tab($object, 'id', $linkback, -1, 'rowid', 'ref');
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<table width="100%"><tr><td>';
 dol_print_object_info($object);
diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php
new file mode 100644
index 00000000000..3fca286eff0
--- /dev/null
+++ b/htdocs/fourn/paiement/list.php
@@ -0,0 +1,446 @@
+<?php
+/* Copyright (C) 2003-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004		Eric Seigne				<eric.seigne@ryxeo.com>
+ * Copyright (C) 2004-2020	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004		Christophe Combelles	<ccomb@free.fr>
+ * Copyright (C) 2005		Marc Barilley / Ocebo	<marc@ocebo.com>
+ * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2014		Teddy Andreotti			<125155@supinfo.com>
+ * Copyright (C) 2015		Marcos García			<marcosgdf@gmail.com>
+ * Copyright (C) 2015		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2017		Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2018		Frédéric France			<frederic.france@netlogic.fr>
+ * Copyright (C) 2020		Tobias Sekan			<tobias.sekan@startmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file		htdocs/fourn/paiment/list.php
+*	\ingroup	fournisseur,facture
+ *	\brief		Payment list for supplier invoices
+ */
+
+require '../../main.inc.php';
+
+// Security check
+if ($user->socid) $socid = $user->socid;
+
+// doesn't work :-(
+// restrictedArea($user, 'fournisseur');
+
+// doesn't work :-(
+// require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+// $object = new PaiementFourn($db);
+// restrictedArea($user, $object->element);
+
+if (!$user->rights->fournisseur->facture->lire) {
+	accessforbidden();
+}
+
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+
+
+// Load translation files required by the page
+$langs->loadLangs(array('companies', 'bills', 'banks', 'compta'));
+
+$action = GETPOST('action', 'alpha');
+$massaction				= GETPOST('massaction', 'alpha');
+$optioncss = GETPOST('optioncss', 'alpha');
+$contextpage			= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'vendorpaymentlist';
+
+$socid = GETPOST('socid', 'int');
+
+$search_ref				= GETPOST('search_ref', 'alpha');
+$search_day				= GETPOST('search_day', 'int');
+$search_month = GETPOST('search_month', 'int');
+$search_year			= GETPOST('search_year', 'int');
+$search_company = GETPOST('search_company', 'alpha');
+$search_payment_type	= GETPOST('search_payment_type');
+$search_cheque_num = GETPOST('search_cheque_num', 'alpha');
+$search_bank_account	= GETPOST('search_bank_account', 'int');
+$search_amount = GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x'
+
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield				= GETPOST('sortfield', 'alpha');
+$sortorder				= GETPOST('sortorder', 'alpha');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST('page', 'int');
+
+if (empty($page) || $page == -1) $page = 0; // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+if (!$sortorder) $sortorder = "DESC";
+if (!$sortfield) $sortfield = "p.datep";
+
+$search_all = trim(GETPOSTISSET("search_all") ? GETPOST("search_all", 'alpha') : GETPOST('sall'));
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array(
+	'p.ref'=>"RefPayment",
+	's.nom'=>"ThirdParty",
+	'p.num_paiement'=>"Numero",
+	'p.amount'=>"Amount",
+);
+
+$arrayfields = array(
+	'p.ref'				=>array('label'=>"RefPayment", 'checked'=>1, 'position'=>10),
+	'p.datep'			=>array('label'=>"Date", 'checked'=>1, 'position'=>20),
+	's.nom'				=>array('label'=>"ThirdParty", 'checked'=>1, 'position'=>30),
+	'c.libelle'			=>array('label'=>"Type", 'checked'=>1, 'position'=>40),
+	'p.num_paiement'	=>array('label'=>"Numero", 'checked'=>1, 'position'=>50, 'tooltip'=>"ChequeOrTransferNumber"),
+	'ba.label'			=>array('label'=>"Account", 'checked'=>1, 'position'=>60, 'enable'=>(!empty($conf->banque->enabled))),
+	'p.amount'			=>array('label'=>"Amount", 'checked'=>1, 'position'=>70),
+);
+$arrayfields = dol_sort_array($arrayfields, 'position');
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('paymentsupplierlist'));
+$object = new PaiementFourn($db);
+
+/*
+* Actions
+*/
+
+$parameters = array('socid'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) {
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {	// All tests are required to be compatible with all browsers
+		$search_ref = '';
+		$search_day = '';
+		$search_month = '';
+		$search_year = '';
+		$search_company = '';
+		$search_payment_type = '';
+		$search_cheque_num = '';
+		$search_bank_account = '';
+		$search_amount = '';
+	}
+}
+
+/*
+ * View
+ */
+
+llxHeader('', $langs->trans('ListPayment'));
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$companystatic = new Societe($db);
+$paymentfournstatic = new PaiementFourn($db);
+
+$sql = 'SELECT p.rowid, p.ref, p.datep, p.amount as pamount, p.num_paiement';
+$sql .= ', s.rowid as socid, s.nom as name, s.email';
+$sql .= ', c.code as paiement_type, c.libelle as paiement_libelle';
+$sql .= ', ba.rowid as bid, ba.label';
+if (!$user->rights->societe->client->voir) $sql .= ', sc.fk_soc, sc.fk_user';
+$sql .= ', SUM(pf.amount)';
+
+$sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn AS p';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn AS pf ON p.rowid=pf.fk_paiementfourn';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn AS f ON f.rowid=pf.fk_facturefourn';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement AS c ON p.fk_paiement = c.id';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON s.rowid = f.fk_soc';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
+if (!$user->rights->societe->client->voir) $sql .= ', '.MAIN_DB_PREFIX.'societe_commerciaux as sc';
+
+$sql .= ' WHERE f.entity = '.$conf->entity;
+if (!$user->rights->societe->client->voir) $sql .= ' AND s.rowid = sc.fk_soc AND sc.fk_user = '.$user->id;
+if ($socid > 0) $sql .= ' AND f.fk_soc = '.$socid;
+if ($search_ref)				$sql .= natural_search('p.ref', $search_ref);
+$sql .= dolSqlDateFilter('p.datep', $search_day, $search_month, $search_year);
+if ($search_company)			$sql .= natural_search('s.nom', $search_company);
+if ($search_payment_type != '')	$sql .= " AND c.code='".$db->escape($search_payment_type)."'";
+if ($search_cheque_num != '')	$sql .= natural_search('p.num_paiement', $search_cheque_num);
+if ($search_amount)				$sql .= natural_search('p.amount', $search_amount, 1);
+if ($search_bank_account > 0)	$sql .= ' AND b.fk_account='.$search_bank_account."'";
+
+if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+
+// Add where from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+
+$sql .= ' GROUP BY p.rowid, p.datep, p.amount, p.num_paiement, s.rowid, s.nom, c.code, c.libelle, ba.rowid, ba.label';
+if (!$user->rights->societe->client->voir) $sql .= ', sc.fk_soc, sc.fk_user';
+
+$sql .= $db->order($sortfield, $sortorder);
+
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords) {		// if total resultset is smaller then paging size (filtering), goto and load page 0
+		$page = 0;
+		$offset = 0;
+	}
+}
+
+$sql .= $db->plimit($limit + 1, $offset);
+
+$resql = $db->query($sql);
+if (!$resql) {
+	dol_print_error($db);
+	llxFooter();
+	$db->close();
+	exit;
+}
+
+$num = $db->num_rows($resql);
+$i = 0;
+
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER['PHP_SELF']) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+if ($optioncss != '')		$param .= '&optioncss='.urlencode($optioncss);
+
+if ($search_ref)			$param .= '&search_ref='.urlencode($search_ref);
+if ($saerch_day)			$param .= '&search_day='.urlencode($search_day);
+if ($saerch_month)			$param .= '&search_month='.urlencode($search_month);
+if ($search_year)			$param .= '&search_year='.urlencode($search_year);
+if ($search_company)		$param .= '&search_company='.urlencode($search_company);
+if ($search_payment_type)	$param .= '&search_company='.urlencode($search_payment_type);
+if ($search_cheque_num)		$param .= '&search_cheque_num='.urlencode($search_cheque_num);
+if ($search_amount)			$param .= '&search_amount='.urlencode($search_amount);
+
+// Add $param from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+
+print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+print_barre_liste($langs->trans('SupplierPayments'), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'supplier_invoice', 0, '', '', $limit, 0, 0, 1);
+
+if ($search_all)
+{
+	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+}
+
+$moreforfilter = '';
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
+else $moreforfilter = $hookmanager->resPrint;
+
+if ($moreforfilter) {
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+	print '</div>';
+}
+
+$varpage = empty($contextpage) ? $_SERVER['PHP_SELF'] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+
+print '<div class="div-table-responsive">';
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : '').'">';
+
+print '<tr class="liste_titre_filter">';
+
+// Filter: Ref
+if (!empty($arrayfields['p.ref']['checked'])) {
+	print '<td  class="liste_titre left">';
+	print '<input class="flat" type="text" size="4" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+	print '</td>';
+}
+
+// Filter: Date
+if (!empty($arrayfields['p.datep']['checked'])) {
+	print '<td class="liste_titre center">';
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_day" value="'.dol_escape_htmltag($search_day).'">';
+	print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_month" value="'.dol_escape_htmltag($search_month).'">';
+	$formother->select_year($search_year ? $search_year : -1, 'search_year', 1, 20, 5);
+	print '</td>';
+}
+
+// Filter: Thirdparty
+if (!empty($arrayfields['s.nom']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input class="flat" type="text" size="6" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
+	print '</td>';
+}
+
+// Filter: Payment type
+if (!empty($arrayfields['c.libelle']['checked'])) {
+	print '<td class="liste_titre">';
+	$form->select_types_paiements($search_payment_type, 'search_payment_type', '', 2, 1, 1);
+	print '</td>';
+}
+
+// Filter: Cheque number (fund transfer)
+if (!empty($arrayfields['p.num_paiement']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input class="flat" type="text" size="4" name="search_cheque_num" value="'.dol_escape_htmltag($search_cheque_num).'">';
+	print '</td>';
+}
+
+// Filter: Bank account
+if (!empty($arrayfields['ba.label']['checked'])) {
+	print '<td class="liste_titre">';
+	$form->select_comptes($search_bank_account, 'search_bank_account', 0, '', 1);
+	print '</td>';
+}
+
+// Filter: Amount
+if (!empty($arrayfields['p.amount']['checked'])) {
+	print '<td class="liste_titre right">';
+	print '<input class="flat" type="text" size="4" name="search_amount" value="'.dol_escape_htmltag($search_amount).'">';
+	print '</td>';
+}
+
+// Fields from hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+// Buttons
+print '<td class="liste_titre maxwidthsearch">';
+print $form->showFilterAndCheckAddButtons(0);
+print '</td>';
+
+print '</tr>';
+
+print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST))	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['p.ref']['checked']))				print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], 'p.rowid', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['p.datep']['checked']))				print_liste_field_titre($arrayfields['p.datep']['label'], $_SERVER["PHP_SELF"], 'p.datep', '', $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['s.nom']['checked']))				print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], 's.nom', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['c.libelle']['checked']))			print_liste_field_titre($arrayfields['c.libelle']['label'], $_SERVER["PHP_SELF"], 'c.libelle', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['p.num_paiement']['checked']))		print_liste_field_titre($arrayfields['p.num_paiement']['label'], $_SERVER["PHP_SELF"], "p.num_paiement", '', $param, '', $sortfield, $sortorder, '', $arrayfields['p.num_paiement']['tooltip']);
+if (!empty($arrayfields['ba.label']['checked']))			print_liste_field_titre($arrayfields['ba.label']['label'], $_SERVER["PHP_SELF"], 'ba.label', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['p.amount']['checked']))			print_liste_field_titre($arrayfields['p.amount']['label'], $_SERVER["PHP_SELF"], 'p.amount', '', $param, '', $sortfield, $sortorder, 'right ');
+
+// Hook fields
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print_liste_field_titre($selectedfields, $_SERVER['PHP_SELF'], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+print '</tr>';
+
+$checkedCount = 0;
+foreach ($arrayfields as $column) {
+	if ($column['checked']) {
+		$checkedCount++;
+	}
+}
+
+$i = 0;
+$totalarray = array();
+while ($i < min($num, $limit)) {
+	$objp = $db->fetch_object($resql);
+
+	$paymentfournstatic->id = $objp->rowid;
+	$paymentfournstatic->ref = $objp->ref;
+	$paymentfournstatic->datepaye = $objp->datep;
+
+	$companystatic->id = $objp->socid;
+	$companystatic->name = $objp->name;
+	$companystatic->email = $objp->email;
+
+	print '<tr class="oddeven">';
+
+	// No
+	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+		print '<td>'.(($offset * $limit) + $i).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Ref
+	if (!empty($arrayfields['p.ref']['checked'])) {
+		print '<td class="nowrap">'.$paymentfournstatic->getNomUrl(1).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Date
+	if (!empty($arrayfields['p.datep']['checked'])) {
+		$dateformatforpayment = 'day';
+		if (!empty($conf->global->INVOICE_USE_HOURS_FOR_PAYMENT)) $dateformatforpayment = 'dayhour';
+		print '<td class="nowrap center">'.dol_print_date($db->jdate($objp->datep), $dateformatforpayment).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Thirdparty
+	if (!empty($arrayfields['s.nom']['checked'])) {
+		print '<td>';
+		if ($objp->socid > 0) {
+			print $companystatic->getNomUrl(1, '', 24);
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Pyament type
+	if (!empty($arrayfields['c.libelle']['checked'])) {
+		$payment_type = $langs->trans("PaymentType".$objp->paiement_type) != ("PaymentType".$objp->paiement_type) ? $langs->trans("PaymentType".$objp->paiement_type) : $objp->paiement_libelle;
+		print '<td>'.$payment_type.' '.dol_trunc($objp->num_paiement, 32).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Cheque number (fund transfer)
+	if (!empty($arrayfields['p.num_paiement']['checked'])) {
+		print '<td>'.$objp->num_paiement.'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Account
+	if (!empty($arrayfields['ba.label']['checked']))
+	{
+		print '<td>';
+		if ($objp->bid) print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"), 'account').' '.dol_trunc($objp->label, 24).'</a>';
+		else print '&nbsp;';
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Amount
+	if (!empty($arrayfields['p.amount']['checked'])) {
+		print '<td class="right">'.price($objp->pamount).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+		$totalarray['pos'][$checkedCount] = 'amount';
+		$totalarray['val']['amount'] += $objp->pamount;
+	}
+
+	// Buttons
+	print '<td></td>';
+	if (!$i) $totalarray['nbfield']++;
+
+	print '</tr>';
+	$i++;
+}
+
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+print '</table>';
+print '</div>';
+print '</form>';
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index e3d2b5b91d2..468352c72fe 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -35,10 +35,10 @@ $langs->loadLangs(array("products", "suppliers"));
 
 if (!$user->rights->produit->lire && !$user->rights->service->lire) accessforbidden();
 
-$sref = GETPOST('sref');
+$sref = GETPOST('sref', 'alphanohtml');
 $sRefSupplier = GETPOST('srefsupplier');
-$snom = GETPOST('snom');
-$type = GETPOST('type');
+$snom = GETPOST('snom', 'alphanohtml');
+$type = GETPOST('type', 'alphanohtml');
 $optioncss = GETPOST('optioncss', 'alpha');
 
 // Load variable for pagination
@@ -81,22 +81,22 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-    	$sref = '';
-    	$sRefSupplier = '';
-    	$snom = '';
-        $search_field1 = '';
-        $search_field2 = '';
-        $search_date_creation = '';
-        $search_date_update = '';
-        $toselect = '';
-        $search_array_options = array();
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$sref = '';
+		$sRefSupplier = '';
+		$snom = '';
+		$search_field1 = '';
+		$search_field2 = '';
+		$search_date_creation = '';
+		$search_date_update = '';
+		$toselect = '';
+		$search_array_options = array();
+	}
 }
 
 /*
@@ -119,15 +119,15 @@ if ($fourn_id)
 
 $arrayofmassactions = array(
 	'generate_doc'=>$langs->trans("ReGeneratePDF"),
-    'builddoc'=>$langs->trans("PDFMerge"),
-    'presend'=>$langs->trans("SendByMail"),
+	'builddoc'=>$langs->trans("PDFMerge"),
+	'presend'=>$langs->trans("SendByMail"),
 );
 if ($user->rights->mymodule->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 
-$sql = "SELECT p.rowid, p.label, p.ref, p.fk_product_type, p.entity, tosell, tobuy,";
+$sql = "SELECT p.rowid, p.label, p.ref, p.fk_product_type, p.entity, p.tosell, p.tobuy, p.barcode, p.fk_barcode_type,";
 $sql .= " ppf.fk_soc, ppf.ref_fourn, ppf.price as price, ppf.quantity as qty, ppf.unitprice,";
 $sql .= " s.rowid as socid, s.nom as name";
 // Add fields to SELECT from hooks
@@ -177,13 +177,13 @@ $sql .= $db->order($sortfield, $sortorder);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-    	$page = 0;
-    	$offset = 0;
-    }
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -208,12 +208,10 @@ if ($resql)
 
 	llxHeader("", "", $texte);
 
-
-	$param = "&tobuy=".$tobuy."&sref=".$sref."&snom=".$snom."&fourn_id=".$fourn_id.(isset($type) ? "&amp;type=".$type : "").(empty($sRefSupplier) ? "" : "&amp;srefsupplier=".$sRefSupplier);
+	$param = "&sref=".$sref."&snom=".$snom."&fourn_id=".$fourn_id.(isset($type) ? "&amp;type=".$type : "").(empty($sRefSupplier) ? "" : "&amp;srefsupplier=".$sRefSupplier);
 	if ($optioncss != '') $param .= '&optioncss='.$optioncss;
 	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords);
 
-
 	if (!empty($catid))
 	{
 		print "<div id='ways'>";
@@ -224,12 +222,12 @@ if ($resql)
 	}
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	if ($fourn_id > 0) print '<input type="hidden" name="fourn_id" value="'.$fourn_id.'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="type" value="'.$type.'">';
 
 	$topicmail = "Information";
@@ -243,23 +241,23 @@ if ($resql)
 	// Fields title search
 	print '<tr class="liste_titre">';
 	print '<td class="liste_titre">';
-	print '<input class="flat" type="text" name="sref" value="'.$sref.'" size="12">';
+	print '<input class="flat maxwidth100" type="text" name="sref" value="'.$sref.'">';
 	print '</td>';
 	print '<td class="liste_titre">';
-	print '<input class="flat" type="text" name="srefsupplier" value="'.$sRefSupplier.'" size="12">';
+	print '<input class="flat maxwidth100" type="text" name="srefsupplier" value="'.$sRefSupplier.'">';
 	print '</td>';
 	print '<td class="liste_titre">';
-	print '<input class="flat" type="text" name="snom" value="'.$snom.'">';
+	print '<input class="flat maxwidth100" type="text" name="snom" value="'.$snom.'">';
 	print '</td>';
 	print '<td></td>';
 	print '<td></td>';
 	print '<td></td>';
 	print '<td></td>';
-    // add filters from hooks
-    $parameters = array();
-    $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action);
-    if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-    print $hookmanager->resPrint;
+	// add filters from hooks
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action);
+	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	print $hookmanager->resPrint;
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
@@ -276,28 +274,29 @@ if ($resql)
 	print_liste_field_titre("QtyMin", $_SERVER["PHP_SELF"], "ppf.quantity", $param, "", '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("UnitPrice", $_SERVER["PHP_SELF"], "ppf.unitprice", $param, "", '', $sortfield, $sortorder, 'right ');
 	// add header cells from hooks
-    $parameters = array();
-    $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action);
-    if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-    print $hookmanager->resPrint;
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action);
+	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	print $hookmanager->resPrint;
 	print_liste_field_titre('', $_SERVER["PHP_SELF"]);
 	print "</tr>\n";
 
-	$oldid = '';
-
 	while ($i < min($num, $limit))
 	{
 		$objp = $db->fetch_object($resql);
 
-		print '<tr class="oddeven">';
-
-		print '<td>';
 		$productstatic->id = $objp->rowid;
 		$productstatic->ref = $objp->ref;
 		$productstatic->type = $objp->fk_product_type;
 		$productstatic->entity = $objp->entity;
 		$productstatic->status = $objp->tosell;
 		$productstatic->status_buy = $objp->tobuy;
+		$productstatic->barcode = $objp->barcode;
+		$productstatic->barcode_type = $objp->fk_barcode_type;
+
+		print '<tr class="oddeven">';
+
+		print '<td>';
 		print $productstatic->getNomUrl(1, 'supplier');
 		print '</td>';
 
@@ -318,10 +317,10 @@ if ($resql)
 		print '<td class="right">'.(isset($objp->unitprice) ? price($objp->unitprice) : '').'</td>';
 
 		// add additional columns from hooks
-        $parameters = array();
-        $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objp, $action);
-        if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-        print $hookmanager->resPrint;
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objp, $action);
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		print $hookmanager->resPrint;
 
 		print '<td class="right"></td>';
 
diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php
index 540ed1cbc18..736a7bf4f90 100644
--- a/htdocs/fourn/recap-fourn.php
+++ b/htdocs/fourn/recap-fourn.php
@@ -34,8 +34,8 @@ $langs->loadLangs(array('bills', 'companies'));
 $socid = GETPOST("socid", 'int');
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 
@@ -53,138 +53,138 @@ llxHeader();
 
 if ($socid > 0)
 {
-    $societe = new Societe($db);
-    $societe->fetch($socid);
+	$societe = new Societe($db);
+	$societe->fetch($socid);
 
-    /*
+	/*
      * Affichage onglets
      */
-    $head = societe_prepare_head($societe);
+	$head = societe_prepare_head($societe);
 
-    dol_fiche_head($head, 'supplier', $langs->trans("ThirdParty"), 0, 'company');
+	print dol_get_fiche_head($head, 'supplier', $langs->trans("ThirdParty"), 0, 'company');
 	dol_banner_tab($societe, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
-    if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->facture->lire)
-    {
-        // Invoice list
-        print load_fiche_titre($langs->trans("SupplierPreview"));
+	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->facture->lire)
+	{
+		// Invoice list
+		print load_fiche_titre($langs->trans("SupplierPreview"));
 
-        print '<table class="noborder tagtable liste centpercent">';
+		print '<table class="noborder tagtable liste centpercent">';
 
-        $sql = "SELECT s.nom, s.rowid as socid, f.ref_supplier, f.datef as df,";
-        $sql .= " f.paye as paye, f.fk_statut as statut, f.rowid as facid,";
-        $sql .= " u.login, u.rowid as userid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_fourn as f,".MAIN_DB_PREFIX."user as u";
-        $sql .= " WHERE f.fk_soc = s.rowid AND s.rowid = ".$societe->id;
-        $sql .= " AND f.entity IN (".getEntity("facture_fourn").")"; // Recognition of the entity attributed to this invoice for Multicompany
-        $sql .= " AND f.fk_user_valid = u.rowid";
-        $sql .= " ORDER BY f.datef DESC";
+		$sql = "SELECT s.nom, s.rowid as socid, f.ref_supplier, f.datef as df,";
+		$sql .= " f.paye as paye, f.fk_statut as statut, f.rowid as facid,";
+		$sql .= " u.login, u.rowid as userid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_fourn as f,".MAIN_DB_PREFIX."user as u";
+		$sql .= " WHERE f.fk_soc = s.rowid AND s.rowid = ".$societe->id;
+		$sql .= " AND f.entity IN (".getEntity("facture_fourn").")"; // Recognition of the entity attributed to this invoice for Multicompany
+		$sql .= " AND f.fk_user_valid = u.rowid";
+		$sql .= " ORDER BY f.datef DESC";
 
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $num = $db->num_rows($resql);
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$num = $db->num_rows($resql);
 
-            print '<tr class="liste_titre">';
-            print '<td width="100" class="center">'.$langs->trans("Date").'</td>';
-            print '<td>&nbsp;</td>';
-            print '<td>'.$langs->trans("Status").'</td>';
-            print '<td class="right">'.$langs->trans("Debit").'</td>';
-            print '<td class="right">'.$langs->trans("Credit").'</td>';
-            print '<td class="right">'.$langs->trans("Balance").'</td>';
-            print '<td>&nbsp;</td>';
-            print '</tr>';
+			print '<tr class="liste_titre">';
+			print '<td width="100" class="center">'.$langs->trans("Date").'</td>';
+			print '<td>&nbsp;</td>';
+			print '<td>'.$langs->trans("Status").'</td>';
+			print '<td class="right">'.$langs->trans("Debit").'</td>';
+			print '<td class="right">'.$langs->trans("Credit").'</td>';
+			print '<td class="right">'.$langs->trans("Balance").'</td>';
+			print '<td>&nbsp;</td>';
+			print '</tr>';
 
-            if (!$num > 0)
-            {
-                print '<tr><td colspan="7">'.$langs->trans("NoInvoice").'</td></tr>';
-            }
+			if (!$num > 0)
+			{
+				print '<tr><td colspan="7">'.$langs->trans("NoInvoice").'</td></tr>';
+			}
 
-            $solde = 0;
+			$solde = 0;
 
-            // Boucle sur chaque facture
-            for ($i = 0; $i < $num; $i++)
-            {
-                $objf = $db->fetch_object($resql);
+			// Boucle sur chaque facture
+			for ($i = 0; $i < $num; $i++)
+			{
+				$objf = $db->fetch_object($resql);
 
-                $fac = new FactureFournisseur($db);
-                $ret = $fac->fetch($objf->facid);
-                if ($ret < 0)
-                {
-                    print $fac->error."<br>";
-                    continue;
-                }
-                $totalpaye = $fac->getSommePaiement();
+				$fac = new FactureFournisseur($db);
+				$ret = $fac->fetch($objf->facid);
+				if ($ret < 0)
+				{
+					print $fac->error."<br>";
+					continue;
+				}
+				$totalpaye = $fac->getSommePaiement();
 
-                print '<tr class="oddeven">';
+				print '<tr class="oddeven">';
 
-                print "<td class=\"center\">".dol_print_date($fac->date)."</td>\n";
-                print "<td><a href=\"facture/card.php?facid=$fac->id\">".img_object($langs->trans("ShowBill"), "bill")." ".$fac->ref."</a></td>\n";
+				print "<td class=\"center\">".dol_print_date($fac->date)."</td>\n";
+				print "<td><a href=\"facture/card.php?facid=$fac->id\">".img_object($langs->trans("ShowBill"), "bill")." ".$fac->ref."</a></td>\n";
 
-                print '<td class="left">'.$fac->getLibStatut(2, $totalpaye).'</td>';
-                print '<td class="right">'.price($fac->total_ttc)."</td>\n";
-                $solde = $solde + $fac->total_ttc;
+				print '<td class="left">'.$fac->getLibStatut(2, $totalpaye).'</td>';
+				print '<td class="right">'.price($fac->total_ttc)."</td>\n";
+				$solde = $solde + $fac->total_ttc;
 
-                print '<td class="right">&nbsp;</td>';
-                print '<td class="right">'.price($solde)."</td>\n";
+				print '<td class="right">&nbsp;</td>';
+				print '<td class="right">'.price($solde)."</td>\n";
 
-                // Author
-                print '<td class="nowrap" width="50"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$objf->userid.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$objf->login.'</a></td>';
+				// Author
+				print '<td class="nowrap" width="50"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$objf->userid.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$objf->login.'</a></td>';
 
-                print "</tr>\n";
+				print "</tr>\n";
 
-                // Payments
-                $sql = "SELECT p.rowid, p.datep as dp, pf.amount, p.statut,";
-                $sql .= " p.fk_user_author, u.login, u.rowid as userid";
-                $sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf,";
-                $sql .= " ".MAIN_DB_PREFIX."paiementfourn as p";
-                $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON p.fk_user_author = u.rowid";
-                $sql .= " WHERE pf.fk_paiementfourn = p.rowid";
-                $sql .= " AND pf.fk_facturefourn = ".$fac->id;
+				// Payments
+				$sql = "SELECT p.rowid, p.datep as dp, pf.amount, p.statut,";
+				$sql .= " p.fk_user_author, u.login, u.rowid as userid";
+				$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf,";
+				$sql .= " ".MAIN_DB_PREFIX."paiementfourn as p";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON p.fk_user_author = u.rowid";
+				$sql .= " WHERE pf.fk_paiementfourn = p.rowid";
+				$sql .= " AND pf.fk_facturefourn = ".$fac->id;
 
-                $resqlp = $db->query($sql);
-                if ($resqlp)
-                {
-                    $nump = $db->num_rows($resqlp);
-                    $j = 0;
+				$resqlp = $db->query($sql);
+				if ($resqlp)
+				{
+					$nump = $db->num_rows($resqlp);
+					$j = 0;
 
-                    while ($j < $nump)
-                    {
-                        $objp = $db->fetch_object($resqlp);
-                        //
-                        print '<tr class="oddeven">';
-                        print '<td class="center">'.dol_print_date($db->jdate($objp->dp))."</td>\n";
-                        print '<td>';
-                        print '&nbsp; &nbsp; &nbsp; '; // Decalage
-                        print '<a href="paiement/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowPayment"), "payment").' '.$langs->trans("Payment").' '.$objp->rowid.'</td>';
-                        print "<td>&nbsp;</td>\n";
-                        print "<td>&nbsp;</td>\n";
-                        print '<td class="right">'.price($objp->amount).'</td>';
-                        $solde = $solde - $objp->amount;
-                        print '<td class="right">'.price($solde)."</td>\n";
+					while ($j < $nump)
+					{
+						$objp = $db->fetch_object($resqlp);
+						//
+						print '<tr class="oddeven">';
+						print '<td class="center">'.dol_print_date($db->jdate($objp->dp))."</td>\n";
+						print '<td>';
+						print '&nbsp; &nbsp; &nbsp; '; // Decalage
+						print '<a href="paiement/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowPayment"), "payment").' '.$langs->trans("Payment").' '.$objp->rowid.'</td>';
+						print "<td>&nbsp;</td>\n";
+						print "<td>&nbsp;</td>\n";
+						print '<td class="right">'.price($objp->amount).'</td>';
+						$solde = $solde - $objp->amount;
+						print '<td class="right">'.price($solde)."</td>\n";
 
-                        // Auteur
-                        print '<td class="nowrap" width="50"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$objp->userid.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$objp->login.'</a></td>';
+						// Auteur
+						print '<td class="nowrap" width="50"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$objp->userid.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$objp->login.'</a></td>';
 
-                        print '</tr>';
+						print '</tr>';
 
-                        $j++;
-                    }
+						$j++;
+					}
 
-                    $db->free($resqlp);
-                } else {
-                    dol_print_error($db);
-                }
-            }
-        } else {
-            dol_print_error($db);
-        }
+					$db->free($resqlp);
+				} else {
+					dol_print_error($db);
+				}
+			}
+		} else {
+			dol_print_error($db);
+		}
 
-        print "</table>";
-    }
+		print "</table>";
+	}
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // End of page
diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php
index 70a96546fc2..6a51d6d0a88 100644
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -114,16 +114,16 @@ if (GETPOST('delete', 'alpha'))
 		if ($result4) $result5 = dolibarr_del_const($db, "FTP_NAME_".$entry, $conf->entity);
 		if ($result4) $result6 = dolibarr_del_const($db, "FTP_PASSIVE_".$entry, $conf->entity);
 
-        if ($result1 && $result2 && $result3 && $result4 && $result5 && $result6)
-        {
-            $db->commit();
-            header("Location: ".$_SERVER["PHP_SELF"]);
-            exit;
-        } else {
-            $db->rollback();
-            dol_print_error($db);
-        }
-    }
+		if ($result1 && $result2 && $result3 && $result4 && $result5 && $result6)
+		{
+			$db->commit();
+			header("Location: ".$_SERVER["PHP_SELF"]);
+			exit;
+		} else {
+			$db->rollback();
+			dol_print_error($db);
+		}
+	}
 }
 
 
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index 7c0eab0f352..51a8028e1f3 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -108,7 +108,7 @@ if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC))
 			{
 				setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
 			} elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload)) {
-                // Files infected by a virus
+				// Files infected by a virus
 				setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
 			} else // Known error
 			{
@@ -158,10 +158,10 @@ if ($action == 'confirm_deletefile' && GETPOST('confirm') == 'yes')
 		$newsection = $section;
 		if (!empty($conf->global->FTP_CONNECT_WITH_SFTP))
 		{
-			$newsection = ssh2_sftp_realpath($conn_id, ".").'/./';		// workaround for bug https://bugs.php.net/bug.php?id=64169
+			$newsection = ssh2_sftp_realpath($conn_id, ".").'/./'; // workaround for bug https://bugs.php.net/bug.php?id=64169
 		}
 
-	    $langs->load("other");
+		$langs->load("other");
 
 		// Remote file
 		$filename = $file;
@@ -210,14 +210,14 @@ if (GETPOST("const", 'array') && GETPOST("delete") && GETPOST("delete") == $lang
 		{
 			if ($const["check"])	// Is checkbox checked
 			{
-			    $langs->load("other");
+				$langs->load("other");
 
 				// Remote file
 				$file = $const["file"];
 				$newsection = $const["section"];
 				if (!empty($conf->global->FTP_CONNECT_WITH_SFTP))
 				{
-					$newsection = ssh2_sftp_realpath($conn_id, ".").'/./';		// workaround for bug https://bugs.php.net/bug.php?id=64169
+					$newsection = ssh2_sftp_realpath($conn_id, ".").'/./'; // workaround for bug https://bugs.php.net/bug.php?id=64169
 				}
 				$remotefile = $newsection.(preg_match('@[\\\/]$@', $newsection) ? '' : '/').$file;
 				$newremotefileiso = utf8_decode($remotefile);
@@ -265,7 +265,7 @@ if ($action == 'confirm_deletesection' && $confirm == 'yes')
 		$newsection = $section;
 		if (!empty($conf->global->FTP_CONNECT_WITH_SFTP))
 		{
-			$newsection = ssh2_sftp_realpath($conn_id, ".").'/./';		// workaround for bug https://bugs.php.net/bug.php?id=64169
+			$newsection = ssh2_sftp_realpath($conn_id, ".").'/./'; // workaround for bug https://bugs.php.net/bug.php?id=64169
 		}
 
 		// Remote file
@@ -314,7 +314,7 @@ if ($action == 'download')
 		$newsection = $section;
 		if (!empty($conf->global->FTP_CONNECT_WITH_SFTP))
 		{
-			$newsection = ssh2_sftp_realpath($conn_id, ".").'/./';		// workaround for bug https://bugs.php.net/bug.php?id=64169
+			$newsection = ssh2_sftp_realpath($conn_id, ".").'/./'; // workaround for bug https://bugs.php.net/bug.php?id=64169
 		}
 
 		// Remote file
@@ -323,7 +323,7 @@ if ($action == 'download')
 		$newremotefileiso = utf8_decode($remotefile);
 
 		if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
-			$result = fopen('ssh2.sftp://' . intval($conn_id) . $newremotefileiso, 'r');
+			$result = fopen('ssh2.sftp://'.intval($conn_id).$newremotefileiso, 'r');
 		} else {
 			$result = ftp_get($conn_id, $localfile, $newremotefileiso, FTP_BINARY);
 		}
@@ -415,7 +415,7 @@ if (!function_exists('ftp_connect'))
 {
 	print $langs->trans("FTPFeatureNotSupportedByYourPHP");
 } else {
-    if (!empty($ftp_server))
+	if (!empty($ftp_server))
 	{
 		// Confirm remove file
 		if ($action == 'delete')
@@ -432,9 +432,9 @@ if (!function_exists('ftp_connect'))
 		print $langs->trans("Server").': <b>'.$ftp_server.'</b><br>';
 		print $langs->trans("Port").': <b>'.$ftp_port.'</b> '.($ftp_passive ? "(Passive)" : "(Active)").'<br>';
 		print $langs->trans("User").': <b>'.$ftp_user.'</b><br>';
-        print $langs->trans("FTPs (FTP over SSH)").': <b>'.yn($conf->global->FTP_CONNECT_WITH_SSL).'</b><br>';
-        print $langs->trans("SFTP (FTP as a subsytem of SSH)").': <b>'.yn($conf->global->FTP_CONNECT_WITH_SFTP).'</b><br>';
-        print $langs->trans("Directory").': ';
+		print $langs->trans("FTPs (FTP over SSH)").': <b>'.yn($conf->global->FTP_CONNECT_WITH_SSL).'</b><br>';
+		print $langs->trans("SFTP (FTP as a subsytem of SSH)").': <b>'.yn($conf->global->FTP_CONNECT_WITH_SFTP).'</b><br>';
+		print $langs->trans("Directory").': ';
 		$sectionarray = preg_split('|[\/]|', $section);
 		// For /
 		$newsection = '/';
@@ -461,7 +461,7 @@ if (!function_exists('ftp_connect'))
 		print "<br>\n";
 
 		print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-        print '<input type="hidden" name="numero_ftp" value="'.$numero_ftp.'">';
+		print '<input type="hidden" name="numero_ftp" value="'.$numero_ftp.'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 
 
@@ -496,7 +496,7 @@ if (!function_exists('ftp_connect'))
 			//$type = ftp_systype($conn_id);
 
 			$newsection = $section;
-		    $newsectioniso = utf8_decode($section);
+			$newsectioniso = utf8_decode($section);
 			//$newsection='/home';
 
 			// List content of directory ($newsection = '/', '/home', ...)
@@ -504,23 +504,23 @@ if (!function_exists('ftp_connect'))
 			{
 				if ($newsection == '/') {
 					//$newsection = '/./';
-					$newsection = ssh2_sftp_realpath($conn_id, ".").'/./';		// workaround for bug https://bugs.php.net/bug.php?id=64169
+					$newsection = ssh2_sftp_realpath($conn_id, ".").'/./'; // workaround for bug https://bugs.php.net/bug.php?id=64169
 				}
-			    //$newsection='/';
-			    //$dirHandle = opendir("ssh2.sftp://$conn_id".$newsection);
+				//$newsection='/';
+				//$dirHandle = opendir("ssh2.sftp://$conn_id".$newsection);
 				//$dirHandle = opendir("ssh2.sftp://".intval($conn_id).ssh2_sftp_realpath($conn_id, ".").'/./');
-                $contents = scandir('ssh2.sftp://'.intval($conn_id).$newsection);
-                $buff = array();
-                foreach ($contents as $i => $key)
-                {
-                    $buff[$i] = "---------- - root root 1234 Aug 01 2000 ".$key;
-                }
-    		} else {
-                $buff = ftp_rawlist($conn_id, $newsectioniso);
-                $contents = ftp_nlist($conn_id, $newsectioniso); // Sometimes rawlist fails but never nlist
-        		//var_dump($contents);
-		        //var_dump($buff);
-    		}
+				$contents = scandir('ssh2.sftp://'.intval($conn_id).$newsection);
+				$buff = array();
+				foreach ($contents as $i => $key)
+				{
+					$buff[$i] = "---------- - root root 1234 Aug 01 2000 ".$key;
+				}
+			} else {
+				$buff = ftp_rawlist($conn_id, $newsectioniso);
+				$contents = ftp_nlist($conn_id, $newsectioniso); // Sometimes rawlist fails but never nlist
+				//var_dump($contents);
+				//var_dump($buff);
+			}
 
 			$nboflines = count($contents);
 			$rawlisthasfailed = false;
@@ -626,8 +626,8 @@ if (!function_exists('ftp_connect'))
 
 		if (!$ok)
 		{
-		      print $mesg.'<br>'."\n";
-		      setEventMessages($mesg, null, 'errors');
+			  print $mesg.'<br>'."\n";
+			  setEventMessages($mesg, null, 'errors');
 		}
 
 
@@ -661,12 +661,12 @@ if (!function_exists('ftp_connect'))
 			}
 			$i++;
 		}
-	    if (!$foundsetup)
-	    {
-            print $langs->trans("SetupOfFTPClientModuleNotComplete");
-	    } else {
-	        print $langs->trans("ChooseAFTPEntryIntoMenu");
-	    }
+		if (!$foundsetup)
+		{
+			print $langs->trans("SetupOfFTPClientModuleNotComplete");
+		} else {
+			print $langs->trans("ChooseAFTPEntryIntoMenu");
+		}
 	}
 }
 
@@ -675,14 +675,14 @@ print '<br>';
 // Close FTP connection
 if ($conn_id)
 {
-    if (!empty($conf->global->FTP_CONNECT_WITH_SFTP))
-    {
-    } elseif (!empty($conf->global->FTP_CONNECT_WITH_SSL))
-    {
-        ftp_close($conn_id);
-    } else {
-        ftp_close($conn_id);
-    }
+	if (!empty($conf->global->FTP_CONNECT_WITH_SFTP))
+	{
+	} elseif (!empty($conf->global->FTP_CONNECT_WITH_SSL))
+	{
+		ftp_close($conn_id);
+	} else {
+		ftp_close($conn_id);
+	}
 }
 
 // End of page
@@ -707,7 +707,7 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect
 	global $langs, $conf;
 
 	$ok = 1;
-    $conn_id = null;
+	$conn_id = null;
 
 	if (!is_numeric($ftp_port))
 	{
@@ -719,14 +719,14 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect
 	{
 		$connecttimeout = (empty($conf->global->FTP_CONNECT_TIMEOUT) ? 40 : $conf->global->FTP_CONNECT_TIMEOUT);
 		if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
-		    dol_syslog('Try to connect with ssh2_ftp');
-		    $tmp_conn_id = ssh2_connect($ftp_server, $ftp_port);
+			dol_syslog('Try to connect with ssh2_ftp');
+			$tmp_conn_id = ssh2_connect($ftp_server, $ftp_port);
 		} elseif (!empty($conf->global->FTP_CONNECT_WITH_SSL)) {
-		    dol_syslog('Try to connect with ftp_ssl_connect');
-		    $conn_id = ftp_ssl_connect($ftp_server, $ftp_port, $connecttimeout);
+			dol_syslog('Try to connect with ftp_ssl_connect');
+			$conn_id = ftp_ssl_connect($ftp_server, $ftp_port, $connecttimeout);
 		} else {
-		    dol_syslog('Try to connect with ftp_connect');
-		    $conn_id = ftp_connect($ftp_server, $ftp_port, $connecttimeout);
+			dol_syslog('Try to connect with ftp_connect');
+			$conn_id = ftp_connect($ftp_server, $ftp_port, $connecttimeout);
 		}
 		if ($conn_id || $tmp_conn_id)
 		{
@@ -735,46 +735,46 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect
 				if (!empty($conf->global->FTP_CONNECT_WITH_SFTP))
 				{
 					dol_syslog('Try to authenticate with ssh2_auth_password');
-				    if (ssh2_auth_password($tmp_conn_id, $ftp_user, $ftp_password))
-    				{
-    					// Turn on passive mode transfers (must be after a successful login
-    					//if ($ftp_passive) ftp_pasv($conn_id, true);
+					if (ssh2_auth_password($tmp_conn_id, $ftp_user, $ftp_password))
+					{
+						// Turn on passive mode transfers (must be after a successful login
+						//if ($ftp_passive) ftp_pasv($conn_id, true);
 
-    					// Change the dir
-    					$newsectioniso = utf8_decode($section);
-    					//ftp_chdir($conn_id, $newsectioniso);
-		                $conn_id = ssh2_sftp($tmp_conn_id);
-		                if (!$conn_id)
-		                {
-		                	dol_syslog('Failed to connect to SFTP after sssh authentication', LOG_DEBUG);
-        					$mesg = $langs->transnoentitiesnoconv("FailedToConnectToSFTPAfterSSHAuthentication");
-    	   				    $ok = 0;
-        				    $error++;
-		                }
-    				} else {
-    					dol_syslog('Failed to connect to FTP with login '.$ftp_user, LOG_DEBUG);
-    					$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
-	   				    $ok = 0;
-    				    $error++;
-    				}
+						// Change the dir
+						$newsectioniso = utf8_decode($section);
+						//ftp_chdir($conn_id, $newsectioniso);
+						$conn_id = ssh2_sftp($tmp_conn_id);
+						if (!$conn_id)
+						{
+							dol_syslog('Failed to connect to SFTP after sssh authentication', LOG_DEBUG);
+							$mesg = $langs->transnoentitiesnoconv("FailedToConnectToSFTPAfterSSHAuthentication");
+		   					$ok = 0;
+							$error++;
+						}
+					} else {
+						dol_syslog('Failed to connect to FTP with login '.$ftp_user, LOG_DEBUG);
+						$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
+	   					$ok = 0;
+						$error++;
+					}
 				} else {
-				    if (ftp_login($conn_id, $ftp_user, $ftp_password))
-    				{
-    					// Turn on passive mode transfers (must be after a successful login
-    					if ($ftp_passive) ftp_pasv($conn_id, true);
+					if (ftp_login($conn_id, $ftp_user, $ftp_password))
+					{
+						// Turn on passive mode transfers (must be after a successful login
+						if ($ftp_passive) ftp_pasv($conn_id, true);
 
-    					// Change the dir
-    					$newsectioniso = utf8_decode($section);
-    					ftp_chdir($conn_id, $newsectioniso);
-    				} else {
-    					$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
-	   				    $ok = 0;
-    				    $error++;
-    				}
+						// Change the dir
+						$newsectioniso = utf8_decode($section);
+						ftp_chdir($conn_id, $newsectioniso);
+					} else {
+						$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
+	   					$ok = 0;
+						$error++;
+					}
 				}
 			}
 		} else {
-		    dol_syslog('FailedToConnectToFTPServer '.$ftp_server.' '.$ftp_port, LOG_ERR);
+			dol_syslog('FailedToConnectToFTPServer '.$ftp_server.' '.$ftp_port, LOG_ERR);
 			$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServer", $ftp_server, $ftp_port);
 			$ok = 0;
 		}
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index d9bbe6607bf..4c88cdf53b3 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/holiday.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Get parameters
@@ -49,14 +49,14 @@ $ref = GETPOST('ref', 'alpha');
 $fuserid = (GETPOST('fuserid', 'int') ?GETPOST('fuserid', 'int') : $user->id);
 
 // Load translation files required by the page
-$langs->loadLangs(array("holiday", "mails"));
+$langs->loadLangs(array("other", "holiday", "mails"));
 
 $now = dol_now();
 
 $childids = $user->getAllChildIds(1);
 
-$morefilter = 'AND employee = 1';
-if (!empty($conf->global->HOLIDAY_FOR_NON_SALARIES_TOO)) $morefilter = '';
+$morefilter = '';
+if (!empty($conf->global->HOLIDAY_HIDE_FOR_NON_SALARIES)) $morefilter = 'AND employee = 1';
 
 $error = 0;
 
@@ -73,7 +73,7 @@ if (($id > 0) || $ref)
 
 	// Check current user can read this leave request
 	$canread = 0;
-	if (!empty($user->rights->holiday->read_all)) $canread = 1;
+	if (!empty($user->rights->holiday->readall)) $canread = 1;
 	if (!empty($user->rights->holiday->read) && in_array($object->fk_user, $childids)) $canread = 1;
 	if (!$canread)
 	{
@@ -82,7 +82,8 @@ if (($id > 0) || $ref)
 }
 
 $cancreate = 0;
-if (!empty($user->rights->holiday->write_all)) $cancreate = 1;
+
+if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->holiday->writeall_advance)) $cancreate = 1;
 if (!empty($user->rights->holiday->write) && in_array($fuserid, $childids)) $cancreate = 1;
 
 $candelete = 0;
@@ -146,12 +147,26 @@ if (empty($reshook))
 			$valideur = GETPOST('valideur', 'int');
 			$description = trim(GETPOST('description', 'restricthtml'));
 
+			// Check that leave is for a user inside the hierarchy or advanced permission for all is set
+			if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->holiday->write)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->holiday->writeall_advance))) {
+				$error++;
+				setEventMessages($langs->trans("NotEnoughPermission"), null, 'errors');
+			} else {
+				if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->holiday->writeall_advance)) {
+					if (!in_array($fuserid, $childids)) {
+						$error++;
+						setEventMessages($langs->trans("UserNotInHierachy"), null, 'errors');
+						$action = 'create';
+					}
+				}
+			}
+
 			// If no type
 			if ($type <= 0)
 			{
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
 				$error++;
-				$action = 'add';
+				$action = 'create';
 			}
 
 			// If no start date
@@ -159,21 +174,21 @@ if (empty($reshook))
 			{
 				setEventMessages($langs->trans("NoDateDebut"), null, 'errors');
 				$error++;
-				$action = 'add';
+				$action = 'create';
 			}
 			// If no end date
 			if (empty($date_fin))
 			{
 				setEventMessages($langs->trans("NoDateFin"), null, 'errors');
 				$error++;
-				$action = 'add';
+				$action = 'create';
 			}
 			// If start date after end date
 			if ($date_debut > $date_fin)
 			{
 				setEventMessages($langs->trans("ErrorEndDateCP"), null, 'errors');
 				$error++;
-				$action = 'add';
+				$action = 'create';
 			}
 
 			// Check if there is already holiday for this period
@@ -182,16 +197,16 @@ if (empty($reshook))
 			{
 				setEventMessages($langs->trans("alreadyCPexist"), null, 'errors');
 				$error++;
-				$action = 'add';
+				$action = 'create';
 			}
 
 			// If there is no Business Days within request
 			$nbopenedday = num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday);
 			if ($nbopenedday < 0.5)
 			{
-				setEventMessages($langs->trans("ErrorDureeCP"), null, 'errors');
+				setEventMessages($langs->trans("ErrorDureeCP"), null, 'errors'); // No working day
 				$error++;
-				$action = 'add';
+				$action = 'create';
 			}
 
 			// If no validator designated
@@ -388,7 +403,7 @@ if (empty($reshook))
 	{
 		$object->fetch($id);
 
-		// Si brouillon et créateur
+		// If draft and owner of leave
 		if ($object->statut == Holiday::STATUS_DRAFT && $cancreate)
 		{
 			$object->oldcopy = dol_clone($object);
@@ -415,7 +430,8 @@ if (empty($reshook))
 				// From
 				$expediteur = new User($db);
 				$expediteur->fetch($object->fk_user);
-				$emailFrom = $expediteur->email;
+				//$emailFrom = $expediteur->email;		Email of user can be an email into another company. Sending will fails, we must use the generic email.
+				$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
 
 				// Subject
 				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
@@ -426,6 +442,7 @@ if (empty($reshook))
 				// Content
 				$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
 				$message .= "\n";
+
 				$message .= $langs->transnoentities("HolidaysToValidateBody")."\n";
 
 				$delayForRequest = $object->getConfCP('delayForRequest');
@@ -510,7 +527,7 @@ if (empty($reshook))
 	{
 		$object->fetch($id);
 
-		// Si statut en attente de validation et valideur = utilisateur
+		// If status is waiting approval and approver is also user
 		if ($object->statut == Holiday::STATUS_VALIDATED && $user->id == $object->fk_validator)
 		{
 			$object->oldcopy = dol_clone($object);
@@ -567,7 +584,8 @@ if (empty($reshook))
 					// From
 					$expediteur = new User($db);
 					$expediteur->fetch($object->fk_validator);
-					$emailFrom = $expediteur->email;
+					//$emailFrom = $expediteur->email;		Email of user can be an email into another company. Sending will fails, we must use the generic email.
+					$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
 
 					// Subject
 					$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
@@ -578,6 +596,7 @@ if (empty($reshook))
 					// Content
 					$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
 					$message .= "\n";
+
 					$message .= $langs->transnoentities("HolidaysValidatedBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."\n";
 
 					$message .= "- ".$langs->transnoentitiesnoconv("ValidatedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
@@ -651,7 +670,8 @@ if (empty($reshook))
 						// From
 						$expediteur = new User($db);
 						$expediteur->fetch($object->fk_validator);
-						$emailFrom = $expediteur->email;
+						//$emailFrom = $expediteur->email;		Email of user can be an email into another company. Sending will fails, we must use the generic email.
+						$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
 
 						// Subject
 						$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
@@ -662,6 +682,7 @@ if (empty($reshook))
 						// Content
 						$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
 						$message .= "\n";
+
 						$message .= $langs->transnoentities("HolidaysRefusedBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."\n";
 						$message .= GETPOST('detail_refuse', 'alpha')."\n\n";
 
@@ -741,7 +762,8 @@ if (empty($reshook))
 		$object->fetch($id);
 
 		// Si statut en attente de validation et valideur = valideur ou utilisateur, ou droits de faire pour les autres
-		if (($object->statut == Holiday::STATUS_VALIDATED || $object->statut == Holiday::STATUS_APPROVED) && ($user->id == $object->fk_validator || in_array($object->fk_user, $childids) || !empty($user->rights->holiday->write_all)))
+		if (($object->statut == Holiday::STATUS_VALIDATED || $object->statut == Holiday::STATUS_APPROVED) && ($user->id == $object->fk_validator || in_array($object->fk_user, $childids)
+			|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->holiday->writeall_advance))))
 		{
 			$db->begin();
 
@@ -797,7 +819,8 @@ if (empty($reshook))
 				// From
 				$expediteur = new User($db);
 				$expediteur->fetch($object->fk_user_cancel);
-				$emailFrom = $expediteur->email;
+				//$emailFrom = $expediteur->email;		Email of user can be an email into another company. Sending will fails, we must use the generic email.
+				$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
 
 				// Subject
 				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
@@ -866,15 +889,15 @@ llxHeader('', $langs->trans('CPTitreMenu'));
 
 if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 {
-	// Si l'utilisateur n'a pas le droit de faire une demande
-	if (($fuserid == $user->id && empty($user->rights->holiday->write)) || ($fuserid != $user->id && empty($user->rights->holiday->write_all)))
+	// If user has no permission to create a leave
+	if ((in_array($fuserid, $childids) && empty($user->rights->holiday->write)) || (!in_array($fuserid, $childids) && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->holiday->writeall_advance))))
 	{
 		$errors[] = $langs->trans('CantCreateCP');
 	} else {
-		// Formulaire de demande de congés payés
+		// Form to add a leave request
 		print load_fiche_titre($langs->trans('MenuAddCP'), '', 'title_hrm.png');
 
-		// Si il y a une erreur
+		// Error management
 		if (GETPOST('error')) {
 			switch (GETPOST('error')) {
 				case 'datefin' :
@@ -946,9 +969,8 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 		print '<input type="hidden" name="token" value="'.newToken().'" />'."\n";
 		print '<input type="hidden" name="action" value="add" />'."\n";
 
-		if (empty($conf->global->HOLIDAY_HIDE_BALANCE))
-		{
-			dol_fiche_head('', '', '', -1);
+		if (empty($conf->global->HOLIDAY_HIDE_BALANCE)) {
+			print dol_get_fiche_head('', '', '', -1);
 
 			$out = '';
 			$typeleaves = $object->getTypes(1, 1);
@@ -957,19 +979,18 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 				$nb_type = $object->getCPforUser($user->id, $val['rowid']);
 				$nb_holiday += $nb_type;
 
-				$out .= ' - '.($langs->trans($val['code']) != $val['code'] ? $langs->trans($val['code']) : $val['label']).': <strong>'.($nb_type ?price2num($nb_type) : 0).'</strong><br>';
+				$out .= ' - '.($langs->trans($val['code']) != $val['code'] ? $langs->trans($val['code']) : $val['label']).': <strong>'.($nb_type ? price2num($nb_type) : 0).'</strong><br>';
 				//$out .= ' - '.$val['label'].': <strong>'.($nb_type ?price2num($nb_type) : 0).'</strong><br>';
 			}
 			print $langs->trans('SoldeCPUser', round($nb_holiday, 5)).'<br>';
 			print $out;
 
-			dol_fiche_end();
-		} elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE))
-		{
+			print dol_get_fiche_end();
+		} elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE)) {
 			print $langs->trans($conf->global->HOLIDAY_HIDE_BALANCE).'<br>';
 		}
 
-		dol_fiche_head();
+		print dol_get_fiche_head();
 
 		//print '<span>'.$langs->trans('DelayToRequestCP',$object->getConfCP('delayForRequest')).'</span><br><br>';
 
@@ -981,11 +1002,13 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 		print '<td class="titlefield fieldrequired">'.$langs->trans("User").'</td>';
 		print '<td>';
 
-		if (empty($user->rights->holiday->write_all))
+		if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->holiday->writeall_advance))
 		{
-			print $form->select_dolusers(($fuserid ? $fuserid : $user->id), 'fuserid', 0, '', 0, 'hierarchyme', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'maxwidth300');
+			print img_picto('', 'user').$form->select_dolusers(($fuserid ? $fuserid : $user->id), 'fuserid', 0, '', 0, 'hierarchyme', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'minwidth200 maxwidth500');
 			//print '<input type="hidden" name="fuserid" value="'.($fuserid?$fuserid:$user->id).'">';
-		} else print $form->select_dolusers(GETPOST('fuserid', 'int') ?GETPOST('fuserid', 'int') : $user->id, 'fuserid', 0, '', 0, '', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'maxwidth300');
+		} else {
+			print img_picto('', 'user').$form->select_dolusers(GETPOST('fuserid', 'int') ? GETPOST('fuserid', 'int') : $user->id, 'fuserid', 0, '', 0, '', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'minwidth200 maxwidth500');
+		}
 		print '</td>';
 		print '</tr>';
 
@@ -1001,7 +1024,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 			$labeltoshow .= ($val['delay'] > 0 ? ' ('.$langs->trans("NoticePeriod").': '.$val['delay'].' '.$langs->trans("days").')' : '');
 			$arraytypeleaves[$val['rowid']] = $labeltoshow;
 		}
-		print $form->selectarray('type', $arraytypeleaves, (GETPOST('type', 'alpha') ?GETPOST('type', 'alpha') : ''), 1);
+		print $form->selectarray('type', $arraytypeleaves, (GETPOST('type', 'alpha') ?GETPOST('type', 'alpha') : ''), 1, 0, 0, '', 0, 0, 0, '', '', true);
 		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		print '</td>';
 		print '</tr>';
@@ -1030,7 +1053,6 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 		print $form->textwithpicto($langs->trans("DateFinCP"), $langs->trans("LastDayOfHoliday"));
 		print '</td>';
 		print '<td>';
-		// Si la demande ne vient pas de l'agenda
 		if (!GETPOST('date_fin_')) {
 			print $form->selectDate(-1, 'date_fin_', 0, 0, 0, '', 1, 1);
 		} else {
@@ -1049,13 +1071,14 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 
 		$object = new Holiday($db);
 		$include_users = $object->fetch_users_approver_holiday();
-		if (empty($include_users)) print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateHolidays");
-		else {
+		if (empty($include_users)) {
+			print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateHolidays");
+		} else {
 			$defaultselectuser = (empty($user->fk_user_holiday_validator) ? $user->fk_user : $user->fk_user_holiday_validator); // Will work only if supervisor has permission to approve so is inside include_users
 			if (!empty($conf->global->HOLIDAY_DEFAULT_VALIDATOR)) $defaultselectuser = $conf->global->HOLIDAY_DEFAULT_VALIDATOR; // Can force default approver
 			if (GETPOST('valideur', 'int') > 0) $defaultselectuser = GETPOST('valideur', 'int');
-			$s = $form->select_dolusers($defaultselectuser, "valideur", 1, "", 0, $include_users);
-			print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
+			$s = $form->select_dolusers($defaultselectuser, "valideur", 1, '', 0, $include_users, '', '0,'.$conf->entity, 0, 0, '', 0, '', 'minwidth200 maxwidth500');
+			print img_picto('', 'user').$form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
 		}
 
 		//print $form->select_dolusers((GETPOST('valideur','int')>0?GETPOST('valideur','int'):$user->fk_user), "valideur", 1, ($user->admin ? '' : array($user->id)), 0, '', 0, 0, 0, 0, '', 0, '', '', 1);	// By default, hierarchical parent
@@ -1076,12 +1099,12 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 		print '</tbody>';
 		print '</table>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
 		print '<input type="submit" value="'.$langs->trans("SendRequestCP").'" name="bouton" class="button">';
 		print '&nbsp; &nbsp; ';
-		print '<input type="button" value="'.$langs->trans("Cancel").'" class="button" onclick="history.go(-1)">';
+		print '<input type="button" value="'.$langs->trans("Cancel").'" class="button button-cancel" onclick="history.go(-1)">';
 		print '</div>';
 
 		print '</from>'."\n";
@@ -1159,7 +1182,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 					print '<input type="hidden" name="id" value="'.$object->id.'" />'."\n";
 				}
 
-				dol_fiche_head($head, 'card', $langs->trans("CPTitreMenu"), -1, 'holiday');
+				print dol_get_fiche_head($head, 'card', $langs->trans("CPTitreMenu"), -1, 'holiday');
 
 				$linkback = '<a href="'.DOL_URL_ROOT.'/holiday/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -1338,8 +1361,8 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 					}
 					if ($action == 'editvalidator')
 					{
-						print '<input type="submit" class="button" name="savevalidator" value="'.$langs->trans("Save").'">';
-						print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+						print '<input type="submit" class="button button-save" name="savevalidator" value="'.$langs->trans("Save").'">';
+						print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 					}
 					print '</td>';
 					print '</tr>';
@@ -1376,7 +1399,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 
 				print '<div class="clearboth"></div>';
 
-				dol_fiche_end();
+				print dol_get_fiche_end();
 
 
 				// Confirmation messages
@@ -1426,7 +1449,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 						print '<div class="center">';
 						if ($cancreate && $object->statut == Holiday::STATUS_DRAFT)
 						{
-							print '<input type="submit" value="'.$langs->trans("Save").'" class="button">';
+							print '<input type="submit" value="'.$langs->trans("Save").'" class="button button-save">';
 						}
 						print '</div>';
 					}
@@ -1459,7 +1482,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 							print '<a href="#" class="butActionRefused classfortooltip" title="'.$langs->trans("NotTheAssignedApprover").'">'.$langs->trans("ActionRefuseCP").'</a>';
 						}
 					}
-					if (($user->id == $object->fk_validator || in_array($object->fk_user, $childids) || !empty($user->rights->holiday->write_all)) && ($object->statut == 2 || $object->statut == 3))	// Status validated or approved
+					if (($user->id == $object->fk_validator || in_array($object->fk_user, $childids) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->holiday->writeall_advance))) && ($object->statut == 2 || $object->statut == 3))	// Status validated or approved
 					{
 						if (($object->date_debut > dol_now()) || $user->admin) print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=cancel" class="butAction">'.$langs->trans("ActionCancelCP").'</a>';
 						else print '<a href="#" class="butActionRefused classfortooltip" title="'.$langs->trans("HolidayStarted").'">'.$langs->trans("ActionCancelCP").'</a>';
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index b702bbf5353..2030ab1d636 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -50,7 +50,7 @@ class Holiday extends CommonObject
 	public $ismultientitymanaged = 0;
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_holiday';
 
@@ -85,36 +85,36 @@ class Holiday extends CommonObject
 	public $statut = ''; // 1=draft, 2=validated, 3=approved
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_validator;
 
 	public $date_valid = '';
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_valid;
 
 	public $date_refuse = '';
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_refuse;
 
 	public $date_cancel = '';
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_cancel;
 
 	public $detail_refuse = '';
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_type;
 
 	public $holiday = array();
@@ -1102,7 +1102,7 @@ class Holiday extends CommonObject
 
 
 	/**
-	 *	Check that a user is not on holiday for a particular timestamp
+	 *	Check that a user is not on holiday for a particular timestamp. Can check approved leave requests and not into public holidays of company.
 	 *
 	 * 	@param 	int			$fk_user				Id user
 	 *  @param	integer	    $timestamp				Time stamp date for a day (YYYY-MM-DD) without hours  (= 12:00AM in english and not 12:00PM that is 12:00)
@@ -1117,6 +1117,7 @@ class Holiday extends CommonObject
 		$isavailablemorning = true;
 		$isavailableafternoon = true;
 
+		// Check into leave requests
 		$sql = "SELECT cp.rowid, cp.date_debut as date_start, cp.date_fin as date_end, cp.halfday, cp.statut";
 		$sql .= " FROM ".MAIN_DB_PREFIX."holiday as cp";
 		$sql .= " WHERE cp.entity IN (".getEntity('holiday').")";
@@ -1161,7 +1162,10 @@ class Holiday extends CommonObject
 			}
 		} else dol_print_error($this->db);
 
-		return array('morning'=>$isavailablemorning, 'afternoon'=>$isavailableafternoon);
+		$result = array('morning'=>$isavailablemorning, 'afternoon'=>$isavailableafternoon);
+		if (!$isavailablemorning) $result['morning_reason'] = 'leave_request';
+		if (!$isavailableafternoon) $result['afternoon_reason'] = 'leave_request';
+		return $result;
 	}
 
 
@@ -1178,11 +1182,11 @@ class Holiday extends CommonObject
 
 		$result = '';
 
-		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Holiday").'</u>';
-		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Holiday").'</u>';
 		if (isset($this->statut)) {
-			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
+			$label .= ' '.$this->getLibStatut(5);
 		}
+		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
 		$url = DOL_URL_ROOT.'/holiday/card.php?id='.$this->id;
 
@@ -1217,7 +1221,7 @@ class Holiday extends CommonObject
 		return $this->LibStatut($this->statut, $mode, $this->date_debut);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Returns the label of a status
 	 *
@@ -1263,8 +1267,8 @@ class Holiday extends CommonObject
 	 *   @param		string	$htmlname		Name of HTML select field
 	 *   @return    string					Show select of status
 	 */
-    public function selectStatutCP($selected = '', $htmlname = 'select_statut')
-    {
+	public function selectStatutCP($selected = '', $htmlname = 'select_statut')
+	{
 
 		global $langs;
 
@@ -1298,8 +1302,8 @@ class Holiday extends CommonObject
 	 *  @param	string	$value      vrai si mise à jour OK sinon faux
 	 *  @return boolean				ok or ko
 	 */
-    public function updateConfCP($name, $value)
-    {
+	public function updateConfCP($name, $value)
+	{
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."holiday_config SET";
 		$sql .= " value = '".$this->db->escape($value)."'";
@@ -1407,7 +1411,7 @@ class Holiday extends CommonObject
 
 				// Update each user counter
 				foreach ($users as $userCounter) {
-					$nbDaysToAdd = $typeleaves[$userCounter['type']]['newByMonth'];
+					$nbDaysToAdd = (isset($typeleaves[$userCounter['type']]['newByMonth']) ? $typeleaves[$userCounter['type']]['newByMonth'] : 0);
 					if (empty($nbDaysToAdd)) continue;
 
 					dol_syslog("We update leave type id ".$userCounter['type']." for user id ".$userCounter['rowid'], LOG_DEBUG);
@@ -1493,8 +1497,8 @@ class Holiday extends CommonObject
 	 *  @param	string	$name       name du paramètre de configuration
 	 *  @return string      		retourne checked si > 0
 	 */
-    public function getCheckOption($name)
-    {
+	public function getCheckOption($name)
+	{
 
 		$sql = "SELECT value";
 		$sql .= " FROM ".MAIN_DB_PREFIX."holiday_config";
@@ -1553,8 +1557,8 @@ class Holiday extends CommonObject
 	 *  @param	int		$user_id        ID de l'utilisateur à supprimer
 	 *  @return boolean      			Vrai si pas d'erreur, faut si Erreur
 	 */
-    public function deleteCPuser($user_id)
-    {
+	public function deleteCPuser($user_id)
+	{
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."holiday_users";
 		$sql .= " WHERE fk_user = ".((int) $user_id);
@@ -1800,7 +1804,7 @@ class Holiday extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return list of people with permission to validate leave requests.
 	 * Search for permission "approve leave requests"
@@ -1809,7 +1813,7 @@ class Holiday extends CommonObject
 	 */
 	public function fetch_users_approver_holiday()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$users_validator = array();
 
 		$sql = "SELECT DISTINCT ur.fk_user";
@@ -1862,8 +1866,8 @@ class Holiday extends CommonObject
 	 *
 	 *  @return     int      retourne le nombre d'utilisateur
 	 */
-    public function countActiveUsersWithoutCP()
-    {
+	public function countActiveUsersWithoutCP()
+	{
 
 		$sql = "SELECT count(u.rowid) as compteur";
 		$sql .= " FROM ".MAIN_DB_PREFIX."user as u LEFT OUTER JOIN ".MAIN_DB_PREFIX."holiday_users hu ON (hu.fk_user=u.rowid)";
@@ -2097,95 +2101,95 @@ class Holiday extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-     *      Load this->nb for dashboard
-     *
-     *      @return     int         <0 if KO, >0 if OK
-     */
-    public function load_state_board()
-    {
-        // phpcs:enable
+	 *      Load this->nb for dashboard
+	 *
+	 *      @return     int         <0 if KO, >0 if OK
+	 */
+	public function load_state_board()
+	{
+		// phpcs:enable
 		global $user;
 
-        $this->nb = array();
+		$this->nb = array();
 
-        $sql = "SELECT count(h.rowid) as nb";
-        $sql .= " FROM ".MAIN_DB_PREFIX."holiday as h";
-        $sql .= " WHERE h.statut > 1";
-        $sql .= " AND h.entity IN (".getEntity('holiday').")";
+		$sql = "SELECT count(h.rowid) as nb";
+		$sql .= " FROM ".MAIN_DB_PREFIX."holiday as h";
+		$sql .= " WHERE h.statut > 1";
+		$sql .= " AND h.entity IN (".getEntity('holiday').")";
+		if (empty($user->rights->expensereport->readall))
+		{
+			$userchildids = $user->getAllChildIds(1);
+			$sql .= " AND (h.fk_user IN (".join(',', $userchildids).")";
+			$sql .= " OR h.fk_validator IN (".join(',', $userchildids)."))";
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$this->nb["holidays"] = $obj->nb;
+			}
+			$this->db->free($resql);
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
+	 *
+	 *      @param	User	$user   		Objet user
+	 *      @return WorkboardResponse|int 	<0 if KO, WorkboardResponse if OK
+	 */
+	public function load_board($user)
+	{
+		// phpcs:enable
+		global $conf, $langs;
+
+		if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
+
+		$now = dol_now();
+
+		$sql = "SELECT h.rowid, h.date_debut";
+		$sql .= " FROM ".MAIN_DB_PREFIX."holiday as h";
+		$sql .= " WHERE h.statut = 2";
+		$sql .= " AND h.entity IN (".getEntity('holiday').")";
 		if (empty($user->rights->expensereport->read_all))
 		{
 			$userchildids = $user->getAllChildIds(1);
-			$sql.= " AND (h.fk_user IN (".join(',', $userchildids).")";
-			$sql.= " OR h.fk_validator IN (".join(',', $userchildids)."))";
+			$sql .= " AND (h.fk_user IN (".join(',', $userchildids).")";
+			$sql .= " OR h.fk_validator IN (".join(',', $userchildids)."))";
 		}
 
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            while ($obj = $this->db->fetch_object($resql)) {
-                $this->nb["holidays"] = $obj->nb;
-            }
-            $this->db->free($resql);
-            return 1;
-        } else {
-            dol_print_error($this->db);
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
-     *
-     *      @param	User	$user   		Objet user
-     *      @return WorkboardResponse|int 	<0 if KO, WorkboardResponse if OK
-     */
-    public function load_board($user)
-    {
-        // phpcs:enable
-        global $conf, $langs;
-
-        if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
-
-        $now = dol_now();
-
-        $sql = "SELECT h.rowid, h.date_debut";
-        $sql .= " FROM ".MAIN_DB_PREFIX."holiday as h";
-        $sql .= " WHERE h.statut = 2";
-        $sql .= " AND h.entity IN (".getEntity('holiday').")";
-		if (empty($user->rights->expensereport->read_all))
+		$resql = $this->db->query($sql);
+		if ($resql)
 		{
-			$userchildids = $user->getAllChildIds(1);
-			$sql.= " AND (h.fk_user IN (".join(',', $userchildids).")";
-			$sql.= " OR h.fk_validator IN (".join(',', $userchildids)."))";
+			$langs->load("members");
+
+			$response = new WorkboardResponse();
+			$response->warning_delay = $conf->holiday->approve->warning_delay / 60 / 60 / 24;
+			$response->label = $langs->trans("HolidaysToApprove");
+			$response->labelShort = $langs->trans("ToApprove");
+			$response->url = DOL_URL_ROOT.'/holiday/list.php?search_statut=2&amp;mainmenu=hrm&amp;leftmenu=holiday';
+			$response->img = img_object('', "holiday");
+
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$response->nbtodo++;
+
+				if ($this->db->jdate($obj->date_debut) < ($now - $conf->holiday->approve->warning_delay)) {
+					$response->nbtodolate++;
+				}
+			}
+
+			return $response;
+		} else {
+			dol_print_error($this->db);
+			$this->error = $this->db->error();
+			return -1;
 		}
-
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $langs->load("members");
-
-            $response = new WorkboardResponse();
-            $response->warning_delay = $conf->holiday->approve->warning_delay / 60 / 60 / 24;
-            $response->label = $langs->trans("HolidaysToApprove");
-            $response->labelShort = $langs->trans("ToApprove");
-            $response->url = DOL_URL_ROOT.'/holiday/list.php?search_statut=2&amp;mainmenu=hrm&amp;leftmenu=holiday';
-            $response->img = img_object('', "holiday");
-
-            while ($obj = $this->db->fetch_object($resql))
-            {
-                $response->nbtodo++;
-
-                if ($this->db->jdate($obj->date_debut) < ($now - $conf->holiday->approve->warning_delay)) {
-                    $response->nbtodolate++;
-                }
-            }
-
-            return $response;
-        } else {
-            dol_print_error($this->db);
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+	}
 }
diff --git a/htdocs/holiday/common.inc.php b/htdocs/holiday/common.inc.php
deleted file mode 100644
index 5fbab2c2700..00000000000
--- a/htdocs/holiday/common.inc.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/* Copyright (C) 2011	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2011	Dimitri Mouillard	<dmouillard@teclib.com>
- * Copyright (C) 2012	Regis Houssin		<regis.houssin@inodbox.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *   	\file       htdocs/holiday/common.inc.php
- *		\ingroup    holiday
- *		\brief      Common load of data
- */
-
-require_once realpath(__DIR__).'/../main.inc.php';
-if (!class_exists('Holiday')) {
-	require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
-}
-
-// Load translation files required by the page
-$langs->loadLangs(array('user', 'other', 'holiday'));
-
-if (empty($conf->holiday->enabled))
-{
-    llxHeader('', $langs->trans('CPTitreMenu'));
-    print '<div class="tabBar">';
-    print '<span style="color: #FF0000;">'.$langs->trans('NotActiveModCP').'</span>';
-    print '</div>';
-    llxFooter();
-    exit();
-}
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index af646984045..d3a2f23019f 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -28,10 +28,10 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 
 // Load translation files required by the page
-$langs->loadlangs(array('users', 'hrm'));
+$langs->loadlangs(array('users', 'other', 'holiday', 'hrm'));
 
 $action = GETPOST('action', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'defineholidaylist';
@@ -56,7 +56,7 @@ if (!$sortorder) $sortorder = "ASC";
 if ($user->socid > 0) accessforbidden();
 
 // If the user does not have perm to read the page
-if (!$user->rights->holiday->read) accessforbidden();
+if (empty($user->rights->holiday->read)) accessforbidden();
 
 
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
@@ -65,6 +65,17 @@ $extrafields = new ExtraFields($db);
 
 $holiday = new Holiday($db);
 
+if (empty($conf->holiday->enabled))
+{
+	llxHeader('', $langs->trans('CPTitreMenu'));
+	print '<div class="tabBar">';
+	print '<span style="color: #FF0000;">'.$langs->trans('NotActiveModCP').'</span>';
+	print '</div>';
+	llxFooter();
+	exit();
+}
+
+
 
 /*
  * Actions
@@ -79,20 +90,20 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $search_name = '';
-        $search_supervisor = '';
-        $toselect = '';
-        $search_array_options = array();
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$search_name = '';
+		$search_supervisor = '';
+		$toselect = '';
+		$search_array_options = array();
+	}
 
-    // Mass actions
-    /*
+	// Mass actions
+	/*
     $objectclass='Skeleton';
     $objectlabel='Skeleton';
     $permissiontoread = $user->rights->skeleton->read;
@@ -101,52 +112,52 @@ if (empty($reshook))
     include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
     */
 
-    // Si il y a une action de mise à jour
-    if ($action == 'update' && isset($_POST['update_cp']))
-    {
-    	$error = 0;
+	// Si il y a une action de mise à jour
+	if ($action == 'update' && isset($_POST['update_cp']))
+	{
+		$error = 0;
 
-    	$typeleaves = $holiday->getTypes(1, 1);
+		$typeleaves = $holiday->getTypes(1, 1);
 
-        $userID = array_keys($_POST['update_cp']);
-        $userID = $userID[0];
+		$userID = array_keys($_POST['update_cp']);
+		$userID = $userID[0];
 
-        foreach ($typeleaves as $key => $val)
-        {
-    	    $userValue = $_POST['nb_holiday_'.$val['rowid']];
-    	    $userValue = $userValue[$userID];
+		foreach ($typeleaves as $key => $val)
+		{
+			$userValue = $_POST['nb_holiday_'.$val['rowid']];
+			$userValue = $userValue[$userID];
 
-    	    if (!empty($userValue) || (string) $userValue == '0')
-    	    {
-    	        $userValue = price2num($userValue, 5);
-    	    } else {
-    	        $userValue = '';
-    	    }
+			if (!empty($userValue) || (string) $userValue == '0')
+			{
+				$userValue = price2num($userValue, 5);
+			} else {
+				$userValue = '';
+			}
 
-    	    //If the user set a comment, we add it to the log comment
-    	    $comment = ((isset($_POST['note_holiday'][$userID]) && !empty($_POST['note_holiday'][$userID])) ? ' ('.$_POST['note_holiday'][$userID].')' : '');
+			//If the user set a comment, we add it to the log comment
+			$comment = ((isset($_POST['note_holiday'][$userID]) && !empty($_POST['note_holiday'][$userID])) ? ' ('.$_POST['note_holiday'][$userID].')' : '');
 
-    	    //print 'holiday: '.$val['rowid'].'-'.$userValue;
-    		if ($userValue != '')
-    		{
-    			// We add the modification to the log (must be before update of sold because we read current value of sold)
-    		    $result = $holiday->addLogCP($user->id, $userID, $langs->transnoentitiesnoconv('ManualUpdate').$comment, $userValue, $val['rowid']);
-    			if ($result < 0)
-    			{
-    				setEventMessages($holiday->error, $holiday->errors, 'errors');
-    				$error++;
-    			}
+			//print 'holiday: '.$val['rowid'].'-'.$userValue;
+			if ($userValue != '')
+			{
+				// We add the modification to the log (must be before update of sold because we read current value of sold)
+				$result = $holiday->addLogCP($user->id, $userID, $langs->transnoentitiesnoconv('ManualUpdate').$comment, $userValue, $val['rowid']);
+				if ($result < 0)
+				{
+					setEventMessages($holiday->error, $holiday->errors, 'errors');
+					$error++;
+				}
 
-    			// Update of the days of the employee
-    		    $result = $holiday->updateSoldeCP($userID, $userValue, $val['rowid']);
-    			if ($result < 0)
-    			{
-    				setEventMessages($holiday->error, $holiday->errors, 'errors');
-    				$error++;
-    			}
+				// Update of the days of the employee
+				$result = $holiday->updateSoldeCP($userID, $userValue, $val['rowid']);
+				if ($result < 0)
+				{
+					setEventMessages($holiday->error, $holiday->errors, 'errors');
+					$error++;
+				}
 
-    		    // If it first update of balance, we set date to avoid to have sold incremented by new month
-    		    /*
+				// If it first update of balance, we set date to avoid to have sold incremented by new month
+				/*
     			$now=dol_now();
     		    $sql = "UPDATE ".MAIN_DB_PREFIX."holiday_config SET";
     		    $sql.= " value = '".dol_print_date($now,'%Y%m%d%H%M%S')."'";
@@ -154,11 +165,11 @@ if (empty($reshook))
     		    dol_syslog('define_holiday update lastUpdate entry', LOG_DEBUG);
     		    $result = $db->query($sql);
     		    */
-    		}
-        }
+			}
+		}
 
-        if (!$error) setEventMessages('UpdateConfCPOK', '', 'mesgs');
-    }
+		if (!$error) setEventMessages('UpdateConfCPOK', '', 'mesgs');
+	}
 }
 
 
@@ -194,10 +205,10 @@ print load_fiche_titre($langs->trans('MenuConfCP'), '', 'title_hrm.png');
 print '<div class="info">'.$langs->trans('LastUpdateCP').': '."\n";
 $lastUpdate = $holiday->getConfCP('lastUpdate');
 if ($lastUpdate) {
-    print '<strong>'.dol_print_date($db->jdate($lastUpdate), 'dayhour').'</strong>';
-    print '<br>'.$langs->trans("MonthOfLastMonthlyUpdate").': <strong>'.$langs->trans('Month'.substr($lastUpdate, 4, 2)).' '.substr($lastUpdate, 0, 4).'</strong>'."\n";
+	print '<strong>'.dol_print_date($db->jdate($lastUpdate), 'dayhour').'</strong>';
+	print '<br>'.$langs->trans("MonthOfLastMonthlyUpdate").': <strong>'.$langs->trans('Month'.substr($lastUpdate, 4, 2)).' '.substr($lastUpdate, 0, 4).'</strong>'."\n";
 } else {
-    print $langs->trans('None');
+	print $langs->trans('None');
 }
 print "</div><br>\n";
 
@@ -206,7 +217,7 @@ $filters = '';
 
 // Filter on array of ids of all childs
 $userchilds = array();
-if (empty($user->rights->holiday->read_all))
+if (empty($user->rights->holiday->readall))
 {
 	$userchilds = $user->getAllChildIds(1);
 	$filters .= ' AND u.rowid IN ('.join(', ', $userchilds).')';
@@ -220,7 +231,7 @@ $filters .= ' AND employee = 1'; // Only employee users are visible
 $listUsers = $holiday->fetchUsers(false, true, $filters);
 if (is_numeric($listUsers) && $listUsers < 0)
 {
-    setEventMessages($holiday->error, $holiday->errors, 'errors');
+	setEventMessages($holiday->error, $holiday->errors, 'errors');
 }
 
 $i = 0;
@@ -228,137 +239,137 @@ $i = 0;
 
 if (count($typeleaves) == 0)
 {
-    //print '<div class="info">';
-    print $langs->trans("NoLeaveWithCounterDefined")."<br>\n";
-    print $langs->trans("GoIntoDictionaryHolidayTypes");
-    //print '</div>';
+	//print '<div class="info">';
+	print $langs->trans("NoLeaveWithCounterDefined")."<br>\n";
+	print $langs->trans("GoIntoDictionaryHolidayTypes");
+	//print '</div>';
 } else {
-    $canedit = 0;
-    if (!empty($user->rights->holiday->define_holiday)) $canedit = 1;
+	$canedit = 0;
+	if (!empty($user->rights->holiday->define_holiday)) $canedit = 1;
 
-    $moreforfilter = '';
+	$moreforfilter = '';
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'" id="tablelines3">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'" id="tablelines3">'."\n";
 
-    print '<tr class="liste_titre_filter">';
+	print '<tr class="liste_titre_filter">';
 
-    // User
-    print '<td class="liste_titre"><input type="text" name="search_name" value="'.dol_escape_htmltag($search_name).'"></td>';
+	// User
+	print '<td class="liste_titre"><input type="text" name="search_name" value="'.dol_escape_htmltag($search_name).'"></td>';
 
-    // Supervisor
-    print '<td class="liste_titre">';
-    print $form->select_dolusers($search_supervisor, 'search_supervisor', 1, null, 0, null, null, 0, 0, 0, '', 0, '', 'maxwidth200');
-    print '</td>';
+	// Supervisor
+	print '<td class="liste_titre">';
+	print $form->select_dolusers($search_supervisor, 'search_supervisor', 1, null, 0, null, null, 0, 0, 0, '', 0, '', 'maxwidth200');
+	print '</td>';
 
-    // Type of leave request
-    if (count($typeleaves))
-    {
-        foreach ($typeleaves as $key => $val)
-        {
-            print '<td class="liste_titre" style="text-align:center"></td>';
-        }
-    } else {
-        print '<td class="liste_titre"></td>';
-    }
-    print '<td class="liste_titre"></td>';
+	// Type of leave request
+	if (count($typeleaves))
+	{
+		foreach ($typeleaves as $key => $val)
+		{
+			print '<td class="liste_titre" style="text-align:center"></td>';
+		}
+	} else {
+		print '<td class="liste_titre"></td>';
+	}
+	print '<td class="liste_titre"></td>';
 
-    // Action column
-    print '<td class="liste_titre maxwidthsearch center">';
-    $searchpicto = $form->showFilterButtons();
-    print $searchpicto;
-    print '</td>';
+	// Action column
+	print '<td class="liste_titre maxwidthsearch center">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
 
-    print '</tr>';
+	print '</tr>';
 
-    print '<tr class="liste_titre">';
-    print_liste_field_titre('Employee', $_SERVER["PHP_SELF"]);
-    print_liste_field_titre('Supervisor', $_SERVER["PHP_SELF"]);
-    if (count($typeleaves))
-    {
-        foreach ($typeleaves as $key => $val)
-        {
-        	$labeltype = ($langs->trans($val['code']) != $val['code']) ? $langs->trans($val['code']) : $langs->trans($val['label']);
-        	print_liste_field_titre($labeltype, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'center ');
-        }
-    } else {
-        print_liste_field_titre('NoLeaveWithCounterDefined', $_SERVER["PHP_SELF"], '', '', '', '');
-    }
-    print_liste_field_titre((empty($user->rights->holiday->define_holiday) ? '' : 'Note'), $_SERVER["PHP_SELF"]);
-    print_liste_field_titre('');
-    print '</tr>';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre('Employee', $_SERVER["PHP_SELF"]);
+	print_liste_field_titre('Supervisor', $_SERVER["PHP_SELF"]);
+	if (count($typeleaves))
+	{
+		foreach ($typeleaves as $key => $val)
+		{
+			$labeltype = ($langs->trans($val['code']) != $val['code']) ? $langs->trans($val['code']) : $langs->trans($val['label']);
+			print_liste_field_titre($labeltype, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'center ');
+		}
+	} else {
+		print_liste_field_titre('NoLeaveWithCounterDefined', $_SERVER["PHP_SELF"], '', '', '', '');
+	}
+	print_liste_field_titre((empty($user->rights->holiday->define_holiday) ? '' : 'Note'), $_SERVER["PHP_SELF"]);
+	print_liste_field_titre('');
+	print '</tr>';
 
-    $usersupervisor = new User($db);
+	$usersupervisor = new User($db);
 
-    foreach ($listUsers as $users)
-    {
-        // If user has not permission to edit/read all, we must see only subordinates
-        if (empty($user->rights->holiday->read_all))
-        {
-            if (($users['rowid'] != $user->id) && (!in_array($users['rowid'], $userchilds))) continue; // This user is not into hierarchy of current user, we hide it.
-        }
+	foreach ($listUsers as $users)
+	{
+		// If user has not permission to edit/read all, we must see only subordinates
+		if (empty($user->rights->holiday->readall))
+		{
+			if (($users['rowid'] != $user->id) && (!in_array($users['rowid'], $userchilds))) continue; // This user is not into hierarchy of current user, we hide it.
+		}
 
-        $userstatic->id = $users['rowid'];
-        $userstatic->lastname = $users['lastname'];
-        $userstatic->firstname = $users['firstname'];
-        $userstatic->gender = $users['gender'];
-        $userstatic->photo = $users['photo'];
-        $userstatic->statut = $users['status'];
-        $userstatic->employee = $users['employee'];
-        $userstatic->fk_user = $users['fk_user'];
+		$userstatic->id = $users['rowid'];
+		$userstatic->lastname = $users['lastname'];
+		$userstatic->firstname = $users['firstname'];
+		$userstatic->gender = $users['gender'];
+		$userstatic->photo = $users['photo'];
+		$userstatic->statut = $users['status'];
+		$userstatic->employee = $users['employee'];
+		$userstatic->fk_user = $users['fk_user'];
 
-        if ($userstatic->fk_user > 0) $usersupervisor->fetch($userstatic->fk_user);
+		if ($userstatic->fk_user > 0) $usersupervisor->fetch($userstatic->fk_user);
 
-        print '<tr class="oddeven">';
+		print '<tr class="oddeven">';
 
-        // User
-        print '<td>';
-        print $userstatic->getNomUrl(-1);
-        print '</td>';
+		// User
+		print '<td>';
+		print $userstatic->getNomUrl(-1);
+		print '</td>';
 
-        // Supervisor
-        print '<td>';
-        if ($userstatic->fk_user > 0) print $usersupervisor->getNomUrl(-1);
-        print '</td>';
+		// Supervisor
+		print '<td>';
+		if ($userstatic->fk_user > 0) print $usersupervisor->getNomUrl(-1);
+		print '</td>';
 
-        // Amount for each type
-        if (count($typeleaves))
-        {
-        	foreach ($typeleaves as $key => $val)
-        	{
-        		$nbtoshow = '';
-        		if ($holiday->getCPforUser($users['rowid'], $val['rowid']) != '') $nbtoshow = price2num($holiday->getCPforUser($users['rowid'], $val['rowid']), 5);
+		// Amount for each type
+		if (count($typeleaves))
+		{
+			foreach ($typeleaves as $key => $val)
+			{
+				$nbtoshow = '';
+				if ($holiday->getCPforUser($users['rowid'], $val['rowid']) != '') $nbtoshow = price2num($holiday->getCPforUser($users['rowid'], $val['rowid']), 5);
 
-        		//var_dump($users['rowid'].' - '.$val['rowid']);
-            	print '<td style="text-align:center">';
-            	if ($canedit) print '<input type="text"'.($canedit ? '' : ' disabled="disabled"').' value="'.$nbtoshow.'" name="nb_holiday_'.$val['rowid'].'['.$users['rowid'].']" size="5" style="text-align: center;"/>';
-            	else print $nbtoshow;
-        	    //print ' '.$langs->trans('days');
-            	print '</td>'."\n";
-        	}
-        } else {
-            print '<td></td>';
-        }
+				//var_dump($users['rowid'].' - '.$val['rowid']);
+				print '<td style="text-align:center">';
+				if ($canedit) print '<input type="text"'.($canedit ? '' : ' disabled="disabled"').' value="'.$nbtoshow.'" name="nb_holiday_'.$val['rowid'].'['.$users['rowid'].']" size="5" style="text-align: center;"/>';
+				else print $nbtoshow;
+				//print ' '.$langs->trans('days');
+				print '</td>'."\n";
+			}
+		} else {
+			print '<td></td>';
+		}
 
-        // Note
-        print '<td>';
-        if ($canedit) print '<input type="text"'.($canedit ? '' : ' disabled="disabled"').' class="maxwidthonsmartphone" value="" name="note_holiday['.$users['rowid'].']" size="30"/>';
-        print '</td>';
+		// Note
+		print '<td>';
+		if ($canedit) print '<input type="text"'.($canedit ? '' : ' disabled="disabled"').' class="maxwidthonsmartphone" value="" name="note_holiday['.$users['rowid'].']" size="30"/>';
+		print '</td>';
 
-        // Button modify
-        print '<td>';
-        if (!empty($user->rights->holiday->define_holiday))	// Allowed to set the balance of any user
-        {
-            print '<input type="submit" name="update_cp['.$users['rowid'].']" value="'.dol_escape_htmltag($langs->trans("Update")).'" class="button"/>';
-        }
-        print '</td>'."\n";
-        print '</tr>';
+		// Button modify
+		print '<td>';
+		if (!empty($user->rights->holiday->define_holiday))	// Allowed to set the balance of any user
+		{
+			print '<input type="submit" name="update_cp['.$users['rowid'].']" value="'.dol_escape_htmltag($langs->trans("Save")).'" class="button smallpaddingimp"/>';
+		}
+		print '</td>'."\n";
+		print '</tr>';
 
-        $i++;
-    }
+		$i++;
+	}
 
-    print '</table>';
-    print '</div>';
+	print '</table>';
+	print '</div>';
 }
 
 print '</form>';
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index bdd791e80f1..f366bb50c85 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -64,7 +64,7 @@ if (!$sortfield) $sortfield = "position_name";
 $object = new Holiday($db);
 $object->fetch($id, $ref);
 
-$upload_dir = $conf->holiday->dir_output.'/'.get_exdir($object->id, 0, 0, 0, $object, 'holiday').dol_sanitizeFileName($object->ref);
+$upload_dir = $conf->holiday->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, '');
 $modulepart = 'holiday';
 
 
@@ -96,7 +96,7 @@ if ($object->id)
 
 	$head = holiday_prepare_head($object);
 
-	dol_fiche_head($head, 'documents', $langs->trans("CPTitreMenu"), -1, 'holiday');
+	print dol_get_fiche_head($head, 'documents', $langs->trans("CPTitreMenu"), -1, 'holiday');
 
 
 	// Build file list
@@ -119,114 +119,114 @@ if ($object->id)
 
 	print '<table class="border tableforfield centpercent">';
 
-    print '<tr>';
-    print '<td class="titlefield">'.$langs->trans("User").'</td>';
+	print '<tr>';
+	print '<td class="titlefield">'.$langs->trans("User").'</td>';
 	print '<td>';
 	print $userRequest->getNomUrl(-1, 'leave');
 	print '</td></tr>';
 
-    // Type
-    print '<tr>';
-    print '<td>'.$langs->trans("Type").'</td>';
-    print '<td>';
-    $typeleaves = $object->getTypes(1, -1);
-    $labeltoshow = (($typeleaves[$object->fk_type]['code'] && $langs->trans($typeleaves[$object->fk_type]['code']) != $typeleaves[$object->fk_type]['code']) ? $langs->trans($typeleaves[$object->fk_type]['code']) : $typeleaves[$object->fk_type]['label']);
-    print empty($labeltoshow) ? $langs->trans("TypeWasDisabledOrRemoved", $object->fk_type) : $labeltoshow;
-    print '</td>';
-    print '</tr>';
+	// Type
+	print '<tr>';
+	print '<td>'.$langs->trans("Type").'</td>';
+	print '<td>';
+	$typeleaves = $object->getTypes(1, -1);
+	$labeltoshow = (($typeleaves[$object->fk_type]['code'] && $langs->trans($typeleaves[$object->fk_type]['code']) != $typeleaves[$object->fk_type]['code']) ? $langs->trans($typeleaves[$object->fk_type]['code']) : $typeleaves[$object->fk_type]['label']);
+	print empty($labeltoshow) ? $langs->trans("TypeWasDisabledOrRemoved", $object->fk_type) : $labeltoshow;
+	print '</td>';
+	print '</tr>';
 
-    $starthalfday = ($object->halfday == -1 || $object->halfday == 2) ? 'afternoon' : 'morning';
-    $endhalfday = ($object->halfday == 1 || $object->halfday == 2) ? 'morning' : 'afternoon';
+	$starthalfday = ($object->halfday == -1 || $object->halfday == 2) ? 'afternoon' : 'morning';
+	$endhalfday = ($object->halfday == 1 || $object->halfday == 2) ? 'morning' : 'afternoon';
 
-    if (!$edit)
-    {
-        print '<tr>';
-        print '<td>';
-        print $form->textwithpicto($langs->trans('DateDebCP'), $langs->trans("FirstDayOfHoliday"));
-        print '</td>';
-        print '<td>'.dol_print_date($object->date_debut, 'day');
-        print ' &nbsp; &nbsp; ';
-        print '<span class="opacitymedium">'.$langs->trans($listhalfday[$starthalfday]).'</span>';
-        print '</td>';
-        print '</tr>';
-    } else {
-        print '<tr>';
-        print '<td>';
-        print $form->textwithpicto($langs->trans('DateDebCP'), $langs->trans("FirstDayOfHoliday"));
-        print '</td>';
-        print '<td>';
-        print $form->selectDate($object->date_debut, 'date_debut_');
-        print ' &nbsp; &nbsp; ';
+	if (!$edit)
+	{
+		print '<tr>';
+		print '<td>';
+		print $form->textwithpicto($langs->trans('DateDebCP'), $langs->trans("FirstDayOfHoliday"));
+		print '</td>';
+		print '<td>'.dol_print_date($object->date_debut, 'day');
+		print ' &nbsp; &nbsp; ';
+		print '<span class="opacitymedium">'.$langs->trans($listhalfday[$starthalfday]).'</span>';
+		print '</td>';
+		print '</tr>';
+	} else {
+		print '<tr>';
+		print '<td>';
+		print $form->textwithpicto($langs->trans('DateDebCP'), $langs->trans("FirstDayOfHoliday"));
+		print '</td>';
+		print '<td>';
+		print $form->selectDate($object->date_debut, 'date_debut_');
+		print ' &nbsp; &nbsp; ';
 		print $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday') ?GETPOST('starthalfday') : $starthalfday));
-        print '</td>';
-        print '</tr>';
-    }
+		print '</td>';
+		print '</tr>';
+	}
 
-    if (!$edit)
-    {
-        print '<tr>';
-        print '<td>';
-        print $form->textwithpicto($langs->trans('DateFinCP'), $langs->trans("LastDayOfHoliday"));
-        print '</td>';
-        print '<td>'.dol_print_date($object->date_fin, 'day');
-        print ' &nbsp; &nbsp; ';
-        print '<span class="opacitymedium">'.$langs->trans($listhalfday[$endhalfday]).'</span>';
-        print '</td>';
-        print '</tr>';
-    } else {
-        print '<tr>';
-        print '<td>';
-        print $form->textwithpicto($langs->trans('DateFinCP'), $langs->trans("LastDayOfHoliday"));
-        print '</td>';
-        print '<td>';
-        print $form->selectDate($object->date_fin, 'date_fin_');
-        print ' &nbsp; &nbsp; ';
-        print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday') ?GETPOST('endhalfday') : $endhalfday));
-        print '</td>';
-        print '</tr>';
-    }
+	if (!$edit)
+	{
+		print '<tr>';
+		print '<td>';
+		print $form->textwithpicto($langs->trans('DateFinCP'), $langs->trans("LastDayOfHoliday"));
+		print '</td>';
+		print '<td>'.dol_print_date($object->date_fin, 'day');
+		print ' &nbsp; &nbsp; ';
+		print '<span class="opacitymedium">'.$langs->trans($listhalfday[$endhalfday]).'</span>';
+		print '</td>';
+		print '</tr>';
+	} else {
+		print '<tr>';
+		print '<td>';
+		print $form->textwithpicto($langs->trans('DateFinCP'), $langs->trans("LastDayOfHoliday"));
+		print '</td>';
+		print '<td>';
+		print $form->selectDate($object->date_fin, 'date_fin_');
+		print ' &nbsp; &nbsp; ';
+		print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday') ?GETPOST('endhalfday') : $endhalfday));
+		print '</td>';
+		print '</tr>';
+	}
 
-    // Nb days consumed
-    print '<tr>';
-    print '<td>';
-    $htmlhelp = $langs->trans('NbUseDaysCPHelp');
-    $includesaturday = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY : 1);
-    $includesunday   = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY : 1);
-    if ($includesaturday) $htmlhelp .= '<br>'.$langs->trans("DayIsANonWorkingDay", $langs->trans("Saturday"));
-    if ($includesunday) $htmlhelp .= '<br>'.$langs->trans("DayIsANonWorkingDay", $langs->trans("Sunday"));
-    print $form->textwithpicto($langs->trans('NbUseDaysCP'), $htmlhelp);
-    print '</td>';
-    print '<td>'.num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday).'</td>';
-    print '</tr>';
+	// Nb days consumed
+	print '<tr>';
+	print '<td>';
+	$htmlhelp = $langs->trans('NbUseDaysCPHelp');
+	$includesaturday = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY : 1);
+	$includesunday   = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY : 1);
+	if ($includesaturday) $htmlhelp .= '<br>'.$langs->trans("DayIsANonWorkingDay", $langs->trans("Saturday"));
+	if ($includesunday) $htmlhelp .= '<br>'.$langs->trans("DayIsANonWorkingDay", $langs->trans("Sunday"));
+	print $form->textwithpicto($langs->trans('NbUseDaysCP'), $htmlhelp);
+	print '</td>';
+	print '<td>'.num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday).'</td>';
+	print '</tr>';
 
-    if ($object->statut == 5)
-    {
-    	print '<tr>';
-    	print '<td>'.$langs->trans('DetailRefusCP').'</td>';
-    	print '<td>'.$object->detail_refuse.'</td>';
-    	print '</tr>';
-    }
+	if ($object->statut == 5)
+	{
+		print '<tr>';
+		print '<td>'.$langs->trans('DetailRefusCP').'</td>';
+		print '<td>'.$object->detail_refuse.'</td>';
+		print '</tr>';
+	}
 
-    // Description
-    if (!$edit)
-    {
-        print '<tr>';
-        print '<td>'.$langs->trans('DescCP').'</td>';
-        print '<td>'.nl2br($object->description).'</td>';
-        print '</tr>';
-    } else {
-        print '<tr>';
-        print '<td>'.$langs->trans('DescCP').'</td>';
-        print '<td><textarea name="description" class="flat" rows="'.ROWS_3.'" cols="70">'.$object->description.'</textarea></td>';
-        print '</tr>';
-    }
+	// Description
+	if (!$edit)
+	{
+		print '<tr>';
+		print '<td>'.$langs->trans('DescCP').'</td>';
+		print '<td>'.nl2br($object->description).'</td>';
+		print '</tr>';
+	} else {
+		print '<tr>';
+		print '<td>'.$langs->trans('DescCP').'</td>';
+		print '<td><textarea name="description" class="flat" rows="'.ROWS_3.'" cols="70">'.$object->description.'</textarea></td>';
+		print '</tr>';
+	}
 
-    print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+	print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
 
-    print '</tbody>';
-    print '</table>'."\n";
-    /*
+	print '</tbody>';
+	print '</table>'."\n";
+	/*
     print '</div>';
     print '<div class="fichehalfright">';
     print '<div class="ficheaddleft">';
@@ -288,19 +288,19 @@ if ($object->id)
 
     print '</div>';
     print '</div>'; */
-    print '</div>';
+	print '</div>';
 
-    print '<div class="clearboth"></div>';
+	print '<div class="clearboth"></div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 
-    $modulepart = 'holiday';
-    $permission = $user->rights->holiday->write;
-    $permtoedit = $user->rights->holiday->write;
-    $param = '&id='.$object->id;
-    include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	$modulepart = 'holiday';
+	$permission = $user->rights->holiday->write;
+	$permtoedit = $user->rights->holiday->write;
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
 	print $langs->trans("ErrorUnknown");
 }
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index ca83d9341f2..41ae8a6956f 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -32,12 +32,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
-require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('users', 'holiday', 'hrm'));
+$langs->loadLangs(array('users', 'other', 'holiday', 'hrm'));
 
 // Protection if external user
 if ($user->socid > 0) accessforbidden();
@@ -68,14 +68,14 @@ $result = restrictedArea($user, 'holiday', '', '');
 // If we are on the view of a specific user
 if ($id > 0)
 {
-    $canread = 0;
-    if ($id == $user->id) $canread = 1;
-    if (!empty($user->rights->holiday->read_all)) $canread = 1;
-    if (!empty($user->rights->holiday->read) && in_array($id, $childids)) $canread = 1;
-    if (!$canread)
-    {
-        accessforbidden();
-    }
+	$canread = 0;
+	if ($id == $user->id) $canread = 1;
+	if (!empty($user->rights->holiday->readall)) $canread = 1;
+	if (!empty($user->rights->holiday->read) && in_array($id, $childids)) $canread = 1;
+	if (!$canread)
+	{
+		accessforbidden();
+	}
 }
 
 $diroutputmassaction = $conf->holiday->dir_output.'/temp/massgeneration/'.$user->id;
@@ -122,9 +122,9 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
 	'cp.ref'=>'Ref',
-    'cp.description'=>'Description',
-    'uu.lastname'=>'EmployeeLastname',
-    'uu.firstname'=>'EmployeeFirstname',
+	'cp.description'=>'Description',
+	'uu.lastname'=>'EmployeeLastname',
+	'uu.firstname'=>'EmployeeFirstname',
 	'uu.login'=>'Login'
 );
 
@@ -152,6 +152,15 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 	}
 }
 
+if (empty($conf->holiday->enabled))
+{
+	llxHeader('', $langs->trans('CPTitreMenu'));
+	print '<div class="tabBar">';
+	print '<span style="color: #FF0000;">'.$langs->trans('NotActiveModCP').'</span>';
+	print '</div>';
+	llxFooter();
+	exit();
+}
 
 
 /*
@@ -176,7 +185,7 @@ if (empty($reshook))
 		$search_ref = "";
 		$search_month_create = "";
 		$search_year_create = "";
-	    $search_month_start = "";
+		$search_month_start = "";
 		$search_year_start = "";
 		$search_month_end = "";
 		$search_year_end = "";
@@ -318,7 +327,7 @@ if (!empty($search_status) && $search_status != -1) {
 	$sql .= " AND cp.statut = '".$db->escape($search_status)."'\n";
 }
 
-if (empty($user->rights->holiday->read_all)) $sql .= ' AND cp.fk_user IN ('.join(',', $childids).')';
+if (empty($user->rights->holiday->readall)) $sql .= ' AND cp.fk_user IN ('.join(',', $childids).')';
 if ($id > 0) $sql .= " AND cp.fk_user IN (".$id.")";
 
 // Add where from extra fields
@@ -402,26 +411,26 @@ if ($resql)
 		$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 		$head = user_prepare_head($fuser);
 
-		dol_fiche_head($head, 'paidholidays', $title, -1, 'user');
+		print dol_get_fiche_head($head, 'paidholidays', $title, -1, 'user');
 
-	    dol_banner_tab($fuser, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+		dol_banner_tab($fuser, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
 
 		if (empty($conf->global->HOLIDAY_HIDE_BALANCE))
 		{
-		    print '<div class="underbanner clearboth"></div>';
+			print '<div class="underbanner clearboth"></div>';
 
-		    print '<br>';
+			print '<br>';
 
-		    showMyBalance($object, $user_id);
+			showMyBalance($object, $user_id);
 		}
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		// Buttons for actions
 
 		print '<div class="tabsAction">';
 
-		$canedit = (($user->id == $user_id && $user->rights->holiday->write) || ($user->id != $user_id && $user->rights->holiday->write_all));
+		$canedit = (($user->id == $user_id && $user->rights->holiday->write) || ($user->id != $user_id && (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->holiday->writeall_advance))));
 
 		if ($canedit)
 		{
@@ -445,8 +454,8 @@ if ($resql)
 
 	if ($sall)
 	{
-	    foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
-	    print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 	}
 
 	$moreforfilter = '';
@@ -469,7 +478,7 @@ if ($resql)
 
 
 	$include = '';
-	if (empty($user->rights->holiday->read_all)) $include = 'hierarchyme'; // Can see only its hierarchyl
+	if (empty($user->rights->holiday->readall)) $include = 'hierarchyme'; // Can see only its hierarchyl
 
 	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
@@ -487,8 +496,8 @@ if ($resql)
 
 	if (!empty($arrayfields['cp.fk_user']['checked']))
 	{
-		$morefilter = 'AND employee = 1';
-		if (!empty($conf->global->HOLIDAY_FOR_NON_SALARIES_TOO)) $morefilter = '';
+		$morefilter = '';
+		if (!empty($conf->global->HOLIDAY_HIDE_FOR_NON_SALARIES)) $morefilter = 'AND employee = 1';
 
 		// User
 		$disabled = 0;
@@ -507,18 +516,18 @@ if ($resql)
 	// Approver
 	if (!empty($arrayfields['cp.fk_validator']['checked']))
 	{
-		if ($user->rights->holiday->read_all)
+		if ($user->rights->holiday->readall)
 		{
-		    print '<td class="liste_titre maxwidthonsmartphone left">';
-		    $validator = new UserGroup($db);
-		    $excludefilter = $user->admin ? '' : 'u.rowid <> '.$user->id;
-		    $valideurobjects = $validator->listUsersForGroup($excludefilter);
-		    $valideurarray = array();
-		    foreach ($valideurobjects as $val) $valideurarray[$val->id] = $val->id;
-		    print $form->select_dolusers($search_valideur, "search_valideur", 1, "", 0, $valideurarray, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth150');
-		    print '</td>';
+			print '<td class="liste_titre maxwidthonsmartphone left">';
+			$validator = new UserGroup($db);
+			$excludefilter = $user->admin ? '' : 'u.rowid <> '.$user->id;
+			$valideurobjects = $validator->listUsersForGroup($excludefilter);
+			$valideurarray = array();
+			foreach ($valideurobjects as $val) $valideurarray[$val->id] = $val->id;
+			print $form->select_dolusers($search_valideur, "search_valideur", 1, "", 0, $valideurarray, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth150');
+			print '</td>';
 		} else {
-		    print '<td class="liste_titre">&nbsp;</td>';
+			print '<td class="liste_titre">&nbsp;</td>';
 		}
 	}
 
@@ -631,15 +640,15 @@ if ($resql)
 
 
 	// If we ask a dedicated card and not allow to see it, we force on user.
-	if ($id && empty($user->rights->holiday->read_all) && !in_array($id, $childids)) {
+	if ($id && empty($user->rights->holiday->readall) && !in_array($id, $childids)) {
 		$langs->load("errors");
 		print '<tr class="oddeven opacitymediuem"><td colspan="10">'.$langs->trans("NotEnoughPermissions").'</td></tr>';
 		$result = 0;
 	} elseif ($num > 0 && !empty($mysoc->country_id))
 	{
-	    // Lines
-	    $userstatic = new User($db);
-	    $approbatorstatic = new User($db);
+		// Lines
+		$userstatic = new User($db);
+		$approbatorstatic = new User($db);
 
 		$typeleaves = $object->getTypes(1, -1);
 
@@ -756,14 +765,14 @@ if ($resql)
 				if (!$i) $totalarray['nbfield']++;
 			}
 
-		    // Action column
-		    print '<td class="nowrap center">';
+			// Action column
+			print '<td class="nowrap center">';
 			if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		    {
-			    $selected = 0;
+			{
+				$selected = 0;
 				if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
 				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
-		    }
+			}
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index baf444ce295..b83d957b27f 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -48,14 +48,17 @@ $massaction  = GETPOST('massaction', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ');
 $optioncss   = GETPOST('optioncss', 'aZ');
 
-$search_ref   = GETPOST('search_ref', 'alpha');
+$search_ref         = GETPOST('search_ref', 'alphanohtml');
+$search_employee    = GETPOST('search_employee', 'int');
+$search_type        = GETPOST('search_type', 'int');
+$search_description = GETPOST('search_description', 'alphanohtml');
 
 $limit       = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield   = GETPOST('sortfield', 'aZ09comma');
 $sortorder   = GETPOST('sortorder', 'alpha');
 
-if (! $sortfield) $sortfield = "cp.rowid";
-if (! $sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "cp.rowid";
+if (!$sortorder) $sortorder = "ASC";
 
 $hookmanager->initHooks(array('leavemovementlist'));
 
@@ -75,39 +78,42 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $search_ref = '';
-        $toselect = '';
-        $search_array_options = array();
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$search_ref = '';
+		$search_employee = '';
+		$search_type = '';
+		$search_description = '';
+		$toselect = '';
+		$search_array_options = array();
+	}
 
-    if (GETPOST('button_removefilter_x', 'alpha')
-        || GETPOST('button_removefilter.x', 'alpha')
-        || GETPOST('button_removefilter', 'alpha')
-        || GETPOST('button_search_x', 'alpha')
-        || GETPOST('button_search.x', 'alpha')
-        || GETPOST('button_search', 'alpha'))
-    {
-        $massaction = '';
-    }
+	if (GETPOST('button_removefilter_x', 'alpha')
+		|| GETPOST('button_removefilter.x', 'alpha')
+		|| GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha')
+		|| GETPOST('button_search.x', 'alpha')
+		|| GETPOST('button_search', 'alpha'))
+	{
+		$massaction = '';
+	}
 }
 
 $arrayfields = array(
-    'cp.ref'=>array('label'=>$langs->trans('Ref'), 'checked'=>1),
-    'cp.fk_user'=>array('label'=>$langs->trans('Employee'), 'checked'=>1),
-    'ct.label'=>array('label'=>$langs->trans('Type'), 'checked'=>1),
-    'cp.date_debut'=>array('label'=>$langs->trans('DateDebCP'), 'checked'=>1),
-    'cp.date_fin'=>array('label'=>$langs->trans('DateFinCP'), 'checked'=>1),
-    'used_days'=>array('label'=>$langs->trans('NbUseDaysCPShort'), 'checked'=>1),
-    'date_start_month'=>array('label'=>$langs->trans('DateStartInMonth'), 'checked'=>1),
-    'date_end_month'=>array('label'=>$langs->trans('DateEndInMonth'), 'checked'=>1),
-    'used_days_month'=>array('label'=>$langs->trans('NbUseDaysCPShortInMonth'), 'checked'=>1),
-    'cp.description'=>array('label'=>$langs->trans('DescCP'), 'checked'=>1),
+	'cp.ref'=>array('label'=>$langs->trans('Ref'), 'checked'=>1),
+	'cp.fk_user'=>array('label'=>$langs->trans('Employee'), 'checked'=>1),
+	'ct.label'=>array('label'=>$langs->trans('Type'), 'checked'=>1),
+	'cp.date_debut'=>array('label'=>$langs->trans('DateDebCP'), 'checked'=>1),
+	'cp.date_fin'=>array('label'=>$langs->trans('DateFinCP'), 'checked'=>1),
+	'used_days'=>array('label'=>$langs->trans('NbUseDaysCPShort'), 'checked'=>1),
+	'date_start_month'=>array('label'=>$langs->trans('DateStartInMonth'), 'checked'=>1),
+	'date_end_month'=>array('label'=>$langs->trans('DateEndInMonth'), 'checked'=>1),
+	'used_days_month'=>array('label'=>$langs->trans('NbUseDaysCPShortInMonth'), 'checked'=>1),
+	'cp.description'=>array('label'=>$langs->trans('DescCP'), 'checked'=>1),
 );
 
 
@@ -128,16 +134,19 @@ $search_year = GETPOST("reyear", 'int') ?GETPOST("reyear", 'int') : date("Y", ti
 $year_month = sprintf("%04d", $search_year).'-'.sprintf("%02d", $search_month);
 
 $sql = "SELECT cp.rowid, cp.ref, cp.fk_user, cp.date_debut, cp.date_fin, ct.label, cp.description, cp.halfday";
-$sql.= " FROM ".MAIN_DB_PREFIX."holiday cp";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user u ON cp.fk_user = u.rowid";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_holiday_types ct ON cp.fk_type = ct.rowid";
-$sql.= " WHERE cp.rowid > 0";
-$sql.= " AND cp.statut = 3"; // 3 = Approved
-$sql.= " AND (date_format(cp.date_debut, '%Y-%m') = '".$db->escape($year_month)."' OR date_format(cp.date_fin, '%Y-%m') = '".$db->escape($year_month)."')";
+$sql .= " FROM ".MAIN_DB_PREFIX."holiday cp";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user u ON cp.fk_user = u.rowid";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_holiday_types ct ON cp.fk_type = ct.rowid";
+$sql .= " WHERE cp.rowid > 0";
+$sql .= " AND cp.statut = 3"; // 3 = Approved
+$sql .= " AND (date_format(cp.date_debut, '%Y-%m') = '".$db->escape($year_month)."' OR date_format(cp.date_fin, '%Y-%m') = '".$db->escape($year_month)."')";
 
-if ($search_ref != '') $sql.= natural_search('cp.ref', $search_ref, 0);
+if (!empty($search_ref))            $sql .= natural_search('cp.ref', $search_ref);
+if (!empty($search_employee))       $sql .= " AND cp.fk_user = '".$db->escape($search_employee)."'";
+if (!empty($search_type))           $sql .= ' AND cp.fk_type IN ('.$db->escape($search_type).')';
+if (!empty($search_description))    $sql .= natural_search('cp.description', $search_description);
 
-$sql.= $db->order($sortfield, $sortorder);
+$sql .= $db->order($sortfield, $sortorder);
 
 $resql = $db->query($sql);
 if (empty($resql))
@@ -149,9 +158,12 @@ if (empty($resql))
 $num = $db->num_rows($resql);
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param.= '&limit='.urlencode($limit);
-if ($search_ref) $param = '&search_ref='.urlencode($search_ref);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"])   $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit)                     $param .= '&limit='.urlencode($limit);
+if (!empty($search_ref))                                            $param .= '&search_ref='.urlencode($search_ref);
+if (!empty($search_employee))                                       $param .= '&search_employee='.urlencode($search_employee);
+if (!empty($search_type))                                           $param .= '&search_type='.urlencode($search_type);
+if (!empty($search_description))                                    $param .= '&search_description='.urlencode($search_description);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -167,8 +179,8 @@ print load_fiche_titre($langs->trans('MenuReportMonth'), '', 'title_hrm');
 
 // Selection filter
 print '<div class="tabBar">';
-print $formother->select_month($search_month, 'remonth');
-print $formother->select_year($search_year, 'reyear');
+print $formother->select_month($search_month, 'remonth', 0, 0, 'minwidth50 maxwidth75imp valignmiddle', true);
+print $formother->selectyear($search_year, 'reyear', 0, 10, 5, 0, 0, '', 'valignmiddle width75', true);
 print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Search")).'" />';
 print '</div>';
 print '<br>';
@@ -178,22 +190,56 @@ $moreforfilter = '';
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = '';
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
-$selectedfields.= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
+$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
-if (!empty($arrayfields['cp.ref']['checked'])) print '<td class="liste_titre"><input type="text" class="maxwidth100" name="search_ref" value="'.$search_ref.'"></td>';
-if (!empty($arrayfields['cp.fk_user']['checked'])) print '<td class="liste_titre"></td>';
-if (!empty($arrayfields['ct.label']['checked'])) print '<td class="liste_titre"></td>';
+
+// Filter: Ref
+if (!empty($arrayfields['cp.ref']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input class="flat maxwidth100" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+	print '</td>';
+}
+
+// Filter: Employee
+if (!empty($arrayfields['cp.fk_user']['checked'])) {
+	print '<td class="liste_titre">';
+	print $form->select_dolusers($search_employee, "search_employee", 1, null, 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
+	print '</td>';
+}
+
+// Filter: Type
+if (!empty($arrayfields['ct.label']['checked'])) {
+	$typeleaves = $holidaystatic->getTypes(1, -1);
+	$arraytypeleaves = array();
+	foreach ($typeleaves as $key => $val)
+	{
+		$labeltoshow = ($langs->trans($val['code']) != $val['code'] ? $langs->trans($val['code']) : $val['label']);
+		$arraytypeleaves[$val['rowid']] = $labeltoshow;
+	}
+
+	print '<td class="liste_titre">';
+	print $form->selectarray('search_type', $arraytypeleaves, $search_type, 1, 0, 0, '', 0, 0, 0, '', '', 1);
+	print '</td>';
+}
+
 if (!empty($arrayfields['cp.date_debut']['checked'])) print '<td class="liste_titre"></td>';
 if (!empty($arrayfields['cp.date_fin']['checked'])) print '<td class="liste_titre"></td>';
 if (!empty($arrayfields['used_days']['checked'])) print '<td class="liste_titre"></td>';
 if (!empty($arrayfields['date_start_month']['checked'])) print '<td class="liste_titre"></td>';
 if (!empty($arrayfields['date_end_month']['checked'])) print '<td class="liste_titre"></td>';
 if (!empty($arrayfields['used_days_month']['checked'])) print '<td class="liste_titre"></td>';
-if (!empty($arrayfields['cp.description']['checked'])) print '<td class="liste_titre"></td>';
+
+// Filter: Description
+if (!empty($arrayfields['cp.description']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="maxwidth100" name="search_description" value="'.$search_description.'">';
+	print '</td>';
+}
+
 // Action column
 print '<td class="liste_titre maxwidthsearch">';
 $searchpicto = $form->showFilterButtons();
@@ -217,93 +263,93 @@ print '</tr>';
 
 if ($num == 0)
 {
-    print '<tr><td colspan="10" class="opacitymedium">'.$langs->trans('None').'</td></tr>';
+	print '<tr><td colspan="10" class="opacitymedium">'.$langs->trans('None').'</td></tr>';
 }
 else {
-    while ($obj = $db->fetch_object($resql))
-    {
-        $user = new User($db);
-        $user->fetch($obj->fk_user);
+	while ($obj = $db->fetch_object($resql))
+	{
+		$user = new User($db);
+		$user->fetch($obj->fk_user);
 
-        $date_start = $db->jdate($obj->date_debut, true);
-        $date_end = $db->jdate($obj->date_fin, true);
+		$date_start = $db->jdate($obj->date_debut, true);
+		$date_end = $db->jdate($obj->date_fin, true);
 
-        $tmpstart = dol_getdate($date_start);
-        $tmpend = dol_getdate($date_end);
+		$tmpstart = dol_getdate($date_start);
+		$tmpend = dol_getdate($date_end);
 
-        $starthalfday = ($obj->halfday == -1 || $obj->halfday == 2) ? 'afternoon' : 'morning';
-        $endhalfday = ($obj->halfday == 1 || $obj->halfday == 2) ? 'morning' : 'afternoon';
+		$starthalfday = ($obj->halfday == -1 || $obj->halfday == 2) ? 'afternoon' : 'morning';
+		$endhalfday = ($obj->halfday == 1 || $obj->halfday == 2) ? 'morning' : 'afternoon';
 
-        $halfdayinmonth = $obj->halfday;
-        $starthalfdayinmonth = $starthalfday;
-        $endhalfdayinmonth = $endhalfday;
+		$halfdayinmonth = $obj->halfday;
+		$starthalfdayinmonth = $starthalfday;
+		$endhalfdayinmonth = $endhalfday;
 
-        //0:Full days, 2:Start afternoon end morning, -1:Start afternoon end afternoon, 1:Start morning end morning
+		//0:Full days, 2:Start afternoon end morning, -1:Start afternoon end afternoon, 1:Start morning end morning
 
-        // Set date_start_gmt and date_end_gmt that are date to show for the selected month
-        $date_start_inmonth = $db->jdate($obj->date_debut, true);
-        $date_end_inmonth = $db->jdate($obj->date_fin, true);
-        if ($tmpstart['year'] < $search_year || $tmpstart['mon'] < $search_month)
-        {
-            $date_start_inmonth = dol_get_first_day($search_year, $search_month, true);
-            $starthalfdayinmonth = 'morning';
-            if ($halfdayinmonth == 2) $halfdayinmonth = 1;
-            if ($halfdayinmonth == -1) $halfdayinmonth = 0;
-        }
-        if ($tmpend['year'] > $search_year || $tmpend['mon'] > $search_month)
-        {
-            $date_end_inmonth = dol_get_last_day($search_year, $search_month, true) - ((24 * 3600) - 1);
-            $endhalfdayinmonth = 'afternoon';
-            if ($halfdayinmonth == 2) $halfdayinmonth = -1;
-            if ($halfdayinmonth == 1) $halfdayinmonth = 0;
-        }
+		// Set date_start_gmt and date_end_gmt that are date to show for the selected month
+		$date_start_inmonth = $db->jdate($obj->date_debut, true);
+		$date_end_inmonth = $db->jdate($obj->date_fin, true);
+		if ($tmpstart['year'] < $search_year || $tmpstart['mon'] < $search_month)
+		{
+			$date_start_inmonth = dol_get_first_day($search_year, $search_month, true);
+			$starthalfdayinmonth = 'morning';
+			if ($halfdayinmonth == 2) $halfdayinmonth = 1;
+			if ($halfdayinmonth == -1) $halfdayinmonth = 0;
+		}
+		if ($tmpend['year'] > $search_year || $tmpend['mon'] > $search_month)
+		{
+			$date_end_inmonth = dol_get_last_day($search_year, $search_month, true) - ((24 * 3600) - 1);
+			$endhalfdayinmonth = 'afternoon';
+			if ($halfdayinmonth == 2) $halfdayinmonth = -1;
+			if ($halfdayinmonth == 1) $halfdayinmonth = 0;
+		}
 
-        // Leave request
-        $holidaystatic->id = $obj->rowid;
-        $holidaystatic->ref = $obj->ref;
+		// Leave request
+		$holidaystatic->id = $obj->rowid;
+		$holidaystatic->ref = $obj->ref;
 
-        print '<tr class="oddeven">';
+		print '<tr class="oddeven">';
 
-        if (!empty($arrayfields['cp.ref']['checked'])) print '<td>'.$holidaystatic->getNomUrl(1, 1).'</td>';
-        if (!empty($arrayfields['cp.fk_user']['checked'])) print '<td>'.$user->getFullName($langs).'</td>';
-        if (!empty($arrayfields['ct.label']['checked'])) print '<td>'.$obj->label.'</td>';
+		if (!empty($arrayfields['cp.ref']['checked'])) print '<td>'.$holidaystatic->getNomUrl(1, 1).'</td>';
+		if (!empty($arrayfields['cp.fk_user']['checked'])) print '<td>'.$user->getFullName($langs).'</td>';
+		if (!empty($arrayfields['ct.label']['checked'])) print '<td>'.$obj->label.'</td>';
 
-        if (!empty($arrayfields['cp.date_debut']['checked']))
-        {
-            print '<td class="center">'.dol_print_date($db->jdate($obj->date_debut), 'day');
-            print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$starthalfday]).')</span>';
-            print '</td>';
-        }
+		if (!empty($arrayfields['cp.date_debut']['checked']))
+		{
+			print '<td class="center">'.dol_print_date($db->jdate($obj->date_debut), 'day');
+			print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$starthalfday]).')</span>';
+			print '</td>';
+		}
 
-        if (!empty($arrayfields['cp.date_fin']['checked']))
-        {
-            print '<td class="center">'.dol_print_date($db->jdate($obj->date_fin), 'day');
-            print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$endhalfday]).')</span>';
-            print '</td>';
-        }
+		if (!empty($arrayfields['cp.date_fin']['checked']))
+		{
+			print '<td class="center">'.dol_print_date($db->jdate($obj->date_fin), 'day');
+			print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$endhalfday]).')</span>';
+			print '</td>';
+		}
 
-        if (!empty($arrayfields['used_days']['checked'])) print '<td class="right">'.num_open_day($date_start, $date_end, 0, 1, $obj->halfday).'</td>';
+		if (!empty($arrayfields['used_days']['checked'])) print '<td class="right">'.num_open_day($date_start, $date_end, 0, 1, $obj->halfday).'</td>';
 
-        if (!empty($arrayfields['date_start_month']['checked']))
-        {
-            print '<td class="center">'.dol_print_date($date_start_inmonth, 'day');
-            print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$starthalfdayinmonth]).')</span>';
-            print '</td>';
-        }
+		if (!empty($arrayfields['date_start_month']['checked']))
+		{
+			print '<td class="center">'.dol_print_date($date_start_inmonth, 'day');
+			print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$starthalfdayinmonth]).')</span>';
+			print '</td>';
+		}
 
-        if (!empty($arrayfields['date_end_month']['checked']))
-        {
-            print '<td class="center">'.dol_print_date($date_end_inmonth, 'day');
-            print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$endhalfdayinmonth]).')</span>';
-            print '</td>';
-        }
+		if (!empty($arrayfields['date_end_month']['checked']))
+		{
+			print '<td class="center">'.dol_print_date($date_end_inmonth, 'day');
+			print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$endhalfdayinmonth]).')</span>';
+			print '</td>';
+		}
 
-        if (!empty($arrayfields['used_days_month']['checked'])) print '<td class="right">'.num_open_day($date_start_inmonth, $date_end_inmonth, 0, 1, $halfdayinmonth).'</td>';
-        if (!empty($arrayfields['cp.description']['checked'])) print '<td class="maxwidth300">'.dol_escape_htmltag(dolGetFirstLineOfText($obj->description)).'</td>';
+		if (!empty($arrayfields['used_days_month']['checked'])) print '<td class="right">'.num_open_day($date_start_inmonth, $date_end_inmonth, 0, 1, $halfdayinmonth).'</td>';
+		if (!empty($arrayfields['cp.description']['checked'])) print '<td class="maxwidth300">'.dol_escape_htmltag(dolGetFirstLineOfText($obj->description)).'</td>';
 
-        print '<td></td>';
-        print '</tr>';
-    }
+		print '<td></td>';
+		print '</tr>';
+	}
 }
 print '</table>';
 print '</div>';
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index 4ff8238648c..2f2e223c87c 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -25,30 +25,37 @@
  */
 
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-$action             = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';				// The action 'add', 'create', 'edit', 'update', 'view', ...
-$massaction         = GETPOST('massaction', 'alpha');												// The bulk action (combo box choice into lists)
-$show_files         = GETPOST('show_files', 'int');													// Show files area generated by bulk actions ?
-$confirm            = GETPOST('confirm', 'alpha');													// Result of a confirmation
-$cancel             = GETPOST('cancel', 'alpha');													// We click on a Cancel button
-$toselect           = GETPOST('toselect', 'array');													// Array of ids of elements selected into a list
-$contextpage        = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'myobjectlist';	// To manage different context of search
-$backtopage         = GETPOST('backtopage', 'alpha');												// Go back to a dedicated page
-$optioncss          = GETPOST('optioncss', 'aZ');													// Option for the css output (always '' except when 'print')
-
-$search_id          = GETPOST('search_id', 'alpha');
-$search_prev_solde  = GETPOST('search_prev_solde', 'alpha');
-$search_new_solde   = GETPOST('search_new_solde', 'alpha');
-$year               = GETPOST('year');
-if (empty($year))
-{
-    $tmpdate = dol_getdate(dol_now());
-    $year = $tmpdate['year'];
+// Security check (access forbidden for external user too)
+if (empty($user->rights->holiday->define_holiday) || $user->socid > 0) {
+	accessforbidden();
 }
 
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
+
+$action             = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$massaction         = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
+$show_files         = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$confirm            = GETPOST('confirm', 'alpha'); // Result of a confirmation
+$cancel             = GETPOST('cancel', 'alpha'); // We click on a Cancel button
+$toselect           = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
+$contextpage        = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'myobjectlist'; // To manage different context of search
+$backtopage         = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
+$optioncss          = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+
+$search_id          = GETPOST('search_id', 'alphanohtml');
+$search_month       = GETPOST('search_month', 'int');
+$search_year        = GETPOST('search_year', 'int');
+$search_employee    = GETPOST('search_employee', 'int');
+$search_validator   = GETPOST('search_validator', 'int');
+$search_description = GETPOST('search_description', 'alphanohtml');
+$search_type        = GETPOST('search_type', 'int');
+$search_prev_solde  = GETPOST('search_prev_solde', 'alphanohtml');
+$search_new_solde   = GETPOST('search_new_solde', 'alphanohtml');
+
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
@@ -58,18 +65,14 @@ if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST(
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield="cpl.rowid";
-if (! $sortorder) $sortorder="DESC";
-
-
-// Protection if external user
-if ($user->socid > 0) accessforbidden();
+if (!$sortfield) $sortfield = "cpl.rowid";
+if (!$sortorder) $sortorder = "DESC";
 
 // Si l'utilisateur n'a pas le droit de lire cette page
-if (!$user->rights->holiday->read_all) accessforbidden();
+if (!$user->rights->holiday->readall) accessforbidden();
 
 // Load translation files required by the page
-$langs->load('users');
+$langs->loadLangs(array('users', 'other', 'holiday'));
 
 // Initialize technical objects
 $object = new Holiday($db);
@@ -80,6 +83,16 @@ $hookmanager->initHooks(array('leavemovementlist')); // Note that conf->hooks_mo
 $arrayfields = array();
 $arrayofmassactions = array();
 
+if (empty($conf->holiday->enabled))
+{
+	llxHeader('', $langs->trans('CPTitreMenu'));
+	print '<div class="tabBar">';
+	print '<span style="color: #FF0000;">'.$langs->trans('NotActiveModCP').'</span>';
+	print '</div>';
+	llxFooter();
+	exit();
+}
+
 
 /*
  * Actions
@@ -92,81 +105,126 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook))
-{
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+if (empty($reshook)) {
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $search_id = '';
-        $toselect = '';
-        $search_array_options = array();
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+		$search_id = '';
+		$search_month = '';
+		$search_year = '';
+		$search_employee = '';
+		$search_validator = '';
+		$search_description = '';
+		$search_type = '';
+		$search_prev_solde = '';
+		$search_new_solde = '';
+		$toselect = '';
+		$search_array_options = array();
+	}
 
-    if (GETPOST('button_removefilter_x', 'alpha')
-        || GETPOST('button_removefilter.x', 'alpha')
-        || GETPOST('button_removefilter', 'alpha')
-        || GETPOST('button_search_x', 'alpha')
-        || GETPOST('button_search.x', 'alpha')
-        || GETPOST('button_search', 'alpha'))
-    {
-        $massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
-    }
+	if (GETPOST('button_removefilter_x', 'alpha')
+		|| GETPOST('button_removefilter.x', 'alpha')
+		|| GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha')
+		|| GETPOST('button_search.x', 'alpha')
+		|| GETPOST('button_search', 'alpha'))
+	{
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+	}
 
-    // Mass actions
-    /*$objectclass='MyObject';
-    $objectlabel='MyObject';
-    $permissiontoread = $user->rights->mymodule->read;
-    $permissiontodelete = $user->rights->mymodule->delete;
-    $uploaddir = $conf->mymodule->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-    */
+	// Mass actions
+	/*$objectclass='MyObject';
+	$objectlabel='MyObject';
+	$permissiontoread = $user->rights->mymodule->read;
+	$permissiontodelete = $user->rights->mymodule->delete;
+	$uploaddir = $conf->mymodule->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+	*/
 }
 
 
 // Definition of fields for lists
 $arrayfields = array(
-    'cpl.rowid'=>array('label'=>$langs->trans("ID"), 'checked'=>1),
-    'cpl.date_action'=>array('label'=>$langs->trans("Date"), 'checked'=>1),
-    'cpl.fk_user_action'=>array('label'=>$langs->trans("ActionByCP"), 'checked'=>1),
-    'cpl.fk_user_update'=>array('label'=>$langs->trans("UserUpdateCP"), 'checked'=>1),
-    'cpl.type_action'=>array('label'=>$langs->trans("Description"), 'checked'=>1),
-    'cpl.fk_type'=>array('label'=>$langs->trans("Type"), 'checked'=>1),
-    'cpl.prev_solde'=>array('label'=>$langs->trans("PrevSoldeCP"), 'checked'=>1),
-    'variation'=>array('label'=>$langs->trans("Variation"), 'checked'=>1),
-    'cpl.new_solde'=>array('label'=>$langs->trans("NewSoldeCP"), 'checked'=>1),
+	'cpl.rowid'=>array('label'=>$langs->trans("ID"), 'checked'=>1),
+	'cpl.date_action'=>array('label'=>$langs->trans("Date"), 'checked'=>1),
+	'cpl.fk_user_action'=>array('label'=>$langs->trans("ActionByCP"), 'checked'=>1),
+	'cpl.fk_user_update'=>array('label'=>$langs->trans("UserUpdateCP"), 'checked'=>1),
+	'cpl.type_action'=>array('label'=>$langs->trans("Description"), 'checked'=>1),
+	'cpl.fk_type'=>array('label'=>$langs->trans("Type"), 'checked'=>1),
+	'cpl.prev_solde'=>array('label'=>$langs->trans("PrevSoldeCP"), 'checked'=>1),
+	'variation'=>array('label'=>$langs->trans("Variation"), 'checked'=>1),
+	'cpl.new_solde'=>array('label'=>$langs->trans("NewSoldeCP"), 'checked'=>1),
 );
 
+
 /*
  * View
  */
 
 $form = new Form($db);
-
+$formother = new FormOther($db);
+$holidaylogstatic = new stdClass();
 $alltypeleaves = $object->getTypes(1, -1); // To have labels
 
-llxHeader('', $langs->trans('CPTitreMenu').' ('.$langs->trans("Year").' '.$year.')');
+llxHeader('', $langs->trans('CPTitreMenu'));
 
-$sqlwhere = " AND date_action BETWEEN ".
-$sqlwhere.= "'".$db->idate(dol_get_first_day($year, 1, 1))."'";
-$sqlwhere.= " AND ";
-$sqlwhere.= "'".$db->idate(dol_get_last_day($year, 12, 1))."'";
+$sqlwhere = '';
 
-if ($search_id != '')         $sqlwhere.= natural_search('rowid', $search_id, 1);
-if ($search_prev_solde != '') $sqlwhere.= natural_search('prev_solde', $search_prev_solde, 1);
-if ($search_new_solde != '')  $sqlwhere.= natural_search('new_solde', $search_new_solde, 1);
+if (!empty($search_year) && $search_year > 0) {
+	if (!empty($search_month) && $search_month > 0) {
+		$from_date  = dol_get_first_day($search_year, $search_month, 1);
+		$to_date    = dol_get_last_day($search_year, $search_month, 1);
+	} else {
+		$from_date  = dol_get_first_day($search_year, 1, 1);
+		$to_date    = dol_get_last_day($search_year, 12, 1);
+	}
+
+	$sqlwhere .= "AND date_action BETWEEN '".$db->idate($from_date)."' AND '".$db->idate($to_date)."'";
+}
+
+if (!empty($search_id) && $search_id > 0)                   $sqlwhere .= natural_search('rowid', $search_id, 1);
+if (!empty($search_validator) && $search_validator > 0)     $sqlwhere .= natural_search('fk_user_action', $search_validator, 1);
+if (!empty($search_employee) && $search_employee > 0)       $sqlwhere .= natural_search('fk_user_update', $search_employee, 1);
+if (!empty($search_description))                            $sqlwhere .= natural_search('type_action', $search_description);
+if (!empty($search_type) && $search_type > 0)               $sqlwhere .= natural_search('fk_type', $search_type, 1);
+if (!empty($search_prev_solde))                             $sqlwhere .= natural_search('prev_solde', $search_prev_solde, 1);
+if (!empty($search_new_solde))                              $sqlwhere .= natural_search('new_solde', $search_new_solde, 1);
 
 $sqlorder = $db->order($sortfield, $sortorder);
 
 // Recent changes are more important than old changes
 $log_holiday = $object->fetchLog($sqlorder, $sqlwhere); // Load $object->logs
 
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+	//TODO: $result = $db->query($sql);
+	//TODO: $nbtotalofrecords = $db->num_rows($result);
+	$nbtotalofrecords = is_array($object->logs) ? count($object->logs) : 0;
+
+	if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller then paging size (filtering), goto and load page 0
+		$page = 0;
+		$offset = 0;
+	}
+}
+
+// TODO: $num = $db->num_rows($resql);
+$num = is_array($object->logs) ? count($object->logs) : 0;
+
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-if ($search_id) $param = '&search_id='.urlencode($search_id);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"])   $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit)                     $param .= '&limit='.urlencode($limit);
+if (!empty($search_id))                                             $param .= '&search_statut='.urlencode($search_statut);
+if (!empty($search_month) && $search_month > 0)                     $param .= '&search_month='.urlencode($search_month);
+if (!empty($search_year) && $search_year > 0)                       $param .= '&search_year='.urlencode($search_year);
+if (!empty($search_validator) && $search_validator > 0)             $param .= '&search_validator='.urlencode($search_validator);
+if (!empty($search_employee) && $search_employee > 0)               $param .= '&search_employee='.urlencode($search_employee);
+if (!empty($search_description))                                    $param .= '&search_description='.urlencode($search_description);
+if (!empty($search_type) && $search_type > 0)                       $param .= '&search_type='.urlencode($search_type);
+if (!empty($search_prev_solde))                                     $param .= '&search_prev_solde='.urlencode($search_prev_solde);
+if (!empty($search_new_solde))                                      $param .= '&search_new_solde='.urlencode($search_new_solde);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -178,67 +236,110 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-$pagination = '<div class="pagination">';
-$pagination.= '<ul>';
-$pagination.= '<li class="pagination">';
+$newcardbutton = dolGetButtonTitle($langs->trans('MenuAddCP'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/holiday/card.php?action=request', '', $user->rights->holiday->write);
+print_barre_liste($langs->trans('LogCP'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_hrm', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
-$pagination.= '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year - 1).$param.'">';
-$pagination.= '<i class="fa fa-chevron-left" title="Previous"></i>';
-$pagination.= '</a>';
-
-$pagination.= '<li class="pagination">';
-$pagination.= '<span class="active">'.$langs->trans("Year").' '.$year.'</span>';
-$pagination.= '</li>';
-
-$pagination.= '<li class="pagination">';
-$pagination.= '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year + 1).$param.'">';
-$pagination.= '<i class="fa fa-chevron-right" title="Next"></i>';
-$pagination.= '</a>';
-$pagination.= '</li>';
-
-$pagination.= '</li>';
-$pagination.= '</ul>';
-$pagination.= '</div>';
-
-print load_fiche_titre($langs->trans('LogCP'), $pagination, 'title_hrm.png');
-
-print '<div class="info">'.$langs->trans('LastUpdateCP').': '."\n";
+print '<div class="info">'.$langs->trans('LastUpdateCP').': ';
 
 $lastUpdate = $object->getConfCP('lastUpdate');
-if ($lastUpdate)
-{
-    $monthLastUpdate = $lastUpdate[4].$lastUpdate[5];
-    $yearLastUpdate = $lastUpdate[0].$lastUpdate[1].$lastUpdate[2].$lastUpdate[3];
-    print '<strong>'.dol_print_date($db->jdate($object->getConfCP('lastUpdate')), 'dayhour', 'tzuser').'</strong>';
-    print '<br>'.$langs->trans("MonthOfLastMonthlyUpdate").': <strong>'.$yearLastUpdate.'-'.$monthLastUpdate.'</strong>'."\n";
+if ($lastUpdate) {
+	$monthLastUpdate = $lastUpdate[4].$lastUpdate[5];
+	$yearLastUpdate = $lastUpdate[0].$lastUpdate[1].$lastUpdate[2].$lastUpdate[3];
+	print '<strong>'.dol_print_date($db->jdate($object->getConfCP('lastUpdate')), 'dayhour', 'tzuser').'</strong>';
+	print '<br>';
+	print $langs->trans("MonthOfLastMonthlyUpdate").': <strong>'.$yearLastUpdate.'-'.$monthLastUpdate.'</strong>';
+} else {
+	print $langs->trans('None');
 }
-else {
-    print $langs->trans('None');
-}
-print "</div><br>\n";
+print '</div>';
+print '<br>';
 
 $moreforfilter = '';
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = '';
-$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-$selectedfields.=(count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
-print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'" id="tablelines3">'."\n";
+print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'" id="tablelines3">';
 
-print '<tbody>';
+print '<tr class="liste_titre_filter">';
+
+// Filter Id
+if (!empty($arrayfields['cpl.rowid']['checked'])) {
+	print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_id" value="'.$search_id.'"></td>';
+}
+
+// Filter: Date
+if (!empty($arrayfields['cpl.date_action']['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.dol_escape_htmltag($search_month).'">';
+	print $formother->selectyear($search_year, 'search_year', 1, 10, 5, 0, 0, '', 'valignmiddle width75', true);
+	print '</td>';
+}
+
+// Filter: Validator
+if (!empty($arrayfields['cpl.fk_user_action']['checked'])) {
+	$validator = new UserGroup($db);
+	$excludefilter = $user->admin ? '' : 'u.rowid <> '.$user->id;
+	$valideurobjects = $validator->listUsersForGroup($excludefilter);
+	$valideurarray = array();
+
+	foreach ($valideurobjects as $val) {
+		$valideurarray[$val->id] = $val->id;
+	}
+
+	print '<td class="liste_titre">';
+	print $form->select_dolusers($search_validator, "search_validator", 1, "", 0, $valideurarray, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth200');
+	print '</td>';
+}
+
+// Filter: User
+if (!empty($arrayfields['cpl.fk_user_update']['checked'])) {
+	print '<td class="liste_titre">';
+	print $form->select_dolusers($search_employee, "search_employee", 1, "", $disabled, $include, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth200');
+	print '</td>';
+}
+
+// Filter: Description
+if (!empty($arrayfields['cpl.type_action']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="maxwidth50" name="search_description" value="'.$search_description.'">';
+	print '</td>';
+}
+
+// Filter: Type
+if (!empty($arrayfields['cpl.fk_type']['checked'])) {
+	foreach ($alltypeleaves as $key => $val) {
+		$labeltoshow = ($langs->trans($val['code']) != $val['code'] ? $langs->trans($val['code']) : $val['label']);
+		$arraytypeleaves[$val['rowid']] = $labeltoshow;
+	}
+
+	print '<td class="liste_titre">';
+	print $form->selectarray('search_type', $arraytypeleaves, $search_type, 1, 0, 0, '', 0, 0, 0, '', '', 1);
+	print '</td>';
+}
+
+// Filter: Previous balance
+if (!empty($arrayfields['cpl.prev_solde']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="maxwidth50" name="search_prev_solde" value="'.$search_prev_solde.'">';
+	print '</td>';
+}
+
+// Filter: Variation (only placeholder)
+if (!empty($arrayfields['variation']['checked'])) {
+	print '<td class="liste_titre"></td>';
+}
+
+// Filter: New Balance
+if (!empty($arrayfields['cpl.new_solde']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="maxwidth50" name="search_new_solde" value="'.$search_new_solde.'">';
+	print '</td>';
+}
 
-print '<tr class="liste_titre">';
-if (!empty($arrayfields['cpl.rowid']['checked'])) print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_id" value="'.$search_id.'"></td>';
-if (!empty($arrayfields['cpl.date_action']['checked'])) print '<td class="liste_titre"></td>';
-if (!empty($arrayfields['cpl.fk_user_action']['checked'])) print '<td class="liste_titre"></td>';
-if (!empty($arrayfields['cpl.fk_user_update']['checked'])) print '<td class="liste_titre"></td>';
-if (!empty($arrayfields['cpl.type_action']['checked'])) print '<td class="liste_titre"></td>';
-if (!empty($arrayfields['cpl.fk_type']['checked'])) print '<td class="liste_titre"></td>';
-if (!empty($arrayfields['cpl.prev_solde']['checked'])) print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_prev_solde" value="'.$search_prev_solde.'"></td>';
-if (!empty($arrayfields['variation']['checked'])) print '<td class="liste_titre"></td>';
-if (!empty($arrayfields['cpl.new_solde']['checked'])) print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_new_solde" value="'.$search_new_solde.'"></td>';
 // Action column
 print '<td class="liste_titre maxwidthsearch">';
 $searchpicto = $form->showFilterButtons();
@@ -256,51 +357,102 @@ if (!empty($arrayfields['cpl.fk_type']['checked'])) print_liste_field_titre($arr
 if (!empty($arrayfields['cpl.prev_solde']['checked'])) print_liste_field_titre($arrayfields['cpl.prev_solde']['label'], $_SERVER["PHP_SELF"], 'prev_solde', '', '', '', $sortfield, $sortorder, 'right ');
 if (!empty($arrayfields['variation']['checked'])) print_liste_field_titre($arrayfields['variation']['label'], $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'right ');
 if (!empty($arrayfields['cpl.new_solde']['checked'])) print_liste_field_titre($arrayfields['cpl.new_solde']['label'], $_SERVER["PHP_SELF"], 'new_solde', '', '', '', $sortfield, $sortorder, 'right ');
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 print '</tr>';
 
+// TODO: $i = 0;
+$i = 1;
 
-foreach ($object->logs as $logs_CP)
+while ($i < min($num, $limit))
 {
-    $user_action = new User($db);
-    $user_action->fetch($logs_CP['fk_user_action']);
+	//TODO: $obj = $db->fetch_object($resql);
+	$obj = next($object->logs);
 
-    $user_update = new User($db);
-    $user_update->fetch($logs_CP['fk_user_update']);
+	$holidaylogstatic->id = $obj['rowid'];
+	$holidaylogstatic->date = $obj['date_action'];
+	$holidaylogstatic->validator		= $obj['fk_user_action'];
+	$holidaylogstatic->employee			= $obj['fk_user_update'];
+	$holidaylogstatic->description		= $obj['type_action'];
+	$holidaylogstatic->type = $obj['fk_type'];
+	$holidaylogstatic->balance_previous = $obj['prev_solde'];
+	$holidaylogstatic->balance_new		= $obj['new_solde'];
 
-    $delta = price2num($logs_CP['new_solde'] - $logs_CP['prev_solde'], 5);
-    $detasign = ($delta > 0 ? '+' : '');
+	print '<tr class="oddeven">';
 
-    print '<tr class="oddeven">';
-    if (!empty($arrayfields['cpl.rowid']['checked'])) print '<td>'.$logs_CP['rowid'].'</td>';
-    if (!empty($arrayfields['cpl.date_action']['checked'])) print '<td style="text-align: center;">'.$logs_CP['date_action'].'</td>';
-    if (!empty($arrayfields['cpl.fk_user_action']['checked'])) print '<td>'.$user_action->getNomUrl(-1).'</td>';
-    if (!empty($arrayfields['cpl.fk_user_update']['checked'])) print '<td>'.$user_update->getNomUrl(-1).'</td>';
-    if (!empty($arrayfields['cpl.type_action']['checked'])) print '<td>'.$logs_CP['type_action'].'</td>';
-    if (!empty($arrayfields['cpl.fk_type']['checked']))
-    {
-        print '<td>';
-        $label = (($alltypeleaves[$logs_CP['fk_type']]['code'] && $langs->trans($alltypeleaves[$logs_CP['fk_type']]['code']) != $alltypeleaves[$logs_CP['fk_type']]['code']) ? $langs->trans($alltypeleaves[$logs_CP['fk_type']]['code']) : $alltypeleaves[$logs_CP['fk_type']]['label']);
-        print $label ? $label : $logs_CP['fk_type'];
-        print '</td>';
-    }
+	// Id
+	if (!empty($arrayfields['cpl.rowid']['checked'])) {
+		print '<td>'.$holidaylogstatic->id.'</td>';
+	}
 
-    if (!empty($arrayfields['cpl.prev_solde']['checked'])) print '<td style="text-align: right;">'.price2num($logs_CP['prev_solde'], 5).' '.$langs->trans('days').'</td>';
-    if (!empty($arrayfields['variation']['checked'])) print '<td style="text-align: right;">'.$detasign.$delta.'</td>';
-    if (!empty($arrayfields['cpl.new_solde']['checked'])) print '<td style="text-align: right;">'.price2num($logs_CP['new_solde'], 5).' '.$langs->trans('days').'</td>';
-    print '<td></td>';
-    print '</tr>'."\n";
+	// Date
+	if (!empty($arrayfields['cpl.date_action']['checked'])) {
+		print '<td style="text-align: center">'.$holidaylogstatic->date.'</td>';
+	}
+
+	// Validator
+	if (!empty($arrayfields['cpl.fk_user_action']['checked'])) {
+		$user_action = new User($db);
+		$user_action->fetch($holidaylogstatic->validator);
+		print '<td>'.$user_action->getNomUrl(-1).'</td>';
+	}
+
+	// Emloyee
+	if (!empty($arrayfields['cpl.fk_user_update']['checked'])) {
+		$user_update = new User($db);
+		$user_update->fetch($holidaylogstatic->employee);
+		print '<td>'.$user_update->getNomUrl(-1).'</td>';
+	}
+
+	// Description
+	if (!empty($arrayfields['cpl.type_action']['checked'])) {
+		print '<td>'.$holidaylogstatic->description.'</td>';
+	}
+
+	// Type
+	if (!empty($arrayfields['cpl.fk_type']['checked'])) {
+		if ($alltypeleaves[$holidaylogstatic->type]['code'] && $langs->trans($alltypeleaves[$holidaylogstatic->type]['code']) != $alltypeleaves[$holidaylogstatic->type]['code']) {
+			$label = $langs->trans($alltypeleaves[$holidaylogstatic->type]['code']);
+		} else {
+			$label = $alltypeleaves[$holidaylogstatic->type]['label'];
+		}
+
+		print '<td>';
+		print $label ? $label : $holidaylogstatic->type;
+		print '</td>';
+	}
+
+	// Previous balance
+	if (!empty($arrayfields['cpl.prev_solde']['checked'])) {
+		print '<td style="text-align: right;">'.price2num($holidaylogstatic->balance_previous, 5).' '.$langs->trans('days').'</td>';
+	}
+
+	// Variation
+	if (!empty($arrayfields['variation']['checked'])) {
+		$delta = price2num($holidaylogstatic->balance_new - $holidaylogstatic->balance_previous, 5);
+		$detasign = ($delta > 0 ? '+' : '');
+		print '<td style="text-align: right;">'.$detasign.$delta.'</td>';
+	}
+
+	// New Balance
+	if (!empty($arrayfields['cpl.new_solde']['checked'])) {
+		print '<td style="text-align: right;">'.price2num($holidaylogstatic->balance_new, 5).' '.$langs->trans('days').'</td>';
+	}
+
+	// Buttons
+	print '<td></td>';
+
+	print '</tr>';
+
+	$i++;
 }
 
-if ($log_holiday == '2')
-{
-    print '<tr class="opacitymedium">';
-    print '<td colspan="10" class="opacitymedium">'.$langs->trans('NoRecordFound').'</td>';
-    print '</tr>';
+if ($log_holiday == '2') {
+	print '<tr class="opacitymedium">';
+	print '<td colspan="10" class="opacitymedium">'.$langs->trans('NoRecordFound').'</td>';
+	print '</tr>';
 }
 
-print '</tbody>'."\n";
-print '</table>'."\n";
+print '</table>';
 print '</div>';
 
 print '</form>';
diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index ea266a644e0..a777ada50f9 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -70,7 +70,7 @@ print load_fiche_titre($langs->trans("HRMSetup"), $linkback);
 
 // Configuration header
 $head = hrm_admin_prepare_head();
-dol_fiche_head($head, 'establishments', $langs->trans("HRM"), -1, "user");
+print dol_get_fiche_head($head, 'establishments', $langs->trans("HRM"), -1, "user");
 
 $sql = "SELECT e.rowid, e.label, e.address, e.zip, e.town, e.status";
 $sql .= " FROM ".MAIN_DB_PREFIX."establishment as e";
@@ -131,7 +131,7 @@ if ($result)
 	dol_print_error($db);
 }
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // Buttons
 print '<div class="tabsAction">';
diff --git a/htdocs/hrm/admin/admin_hrm.php b/htdocs/hrm/admin/admin_hrm.php
index 79bf11f7ec9..4648c2d690a 100644
--- a/htdocs/hrm/admin/admin_hrm.php
+++ b/htdocs/hrm/admin/admin_hrm.php
@@ -80,7 +80,7 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="update">';
 
-dol_fiche_head($head, 'parameters', $langs->trans("HRM"), -1, "user");
+print dol_get_fiche_head($head, 'parameters', $langs->trans("HRM"), -1, "user");
 
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
@@ -104,7 +104,7 @@ foreach ($list as $key) {
 
 print "</table>\n";
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
 
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index d2b53337abe..dc97787ae6e 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2015		Alexandre Spangaro	<aspangaro@open-dsi.fr>
- * Copyright (C) 2018       Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric 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
@@ -40,12 +40,12 @@ class Establishment extends CommonObject
 	public $table_element = 'establishment';
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	public $table_element_line = '';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_establishment';
 
@@ -75,6 +75,9 @@ class Establishment extends CommonObject
 	 */
 	public $rowid;
 
+	/**
+	 * @var string Label
+	 */
 	public $label;
 
 	/**
@@ -82,9 +85,21 @@ class Establishment extends CommonObject
 	 */
 	public $address;
 
+	/**
+	 * @var string Zip
+	 */
 	public $zip;
+
+	/**
+	 * @var string Town
+	 */
 	public $town;
 
+	/**
+	 * @var int country id
+	 */
+	public $country_id;
+
 	/**
 	 * @var int Status 0=open, 1=closed
 	 */
@@ -95,8 +110,20 @@ class Establishment extends CommonObject
 	 */
 	public $entity;
 
-	public $country_id;
+	/**
+	 * @var int user mod id
+	 */
+	public $fk_user_mod;
 
+	/**
+	 * @var int user author id
+	 */
+	public $fk_user_author;
+
+	/**
+	 * @var int date create
+	 */
+	public $datec;
 
 	const STATUS_OPEN = 1;
 	const STATUS_CLOSED = 0;
@@ -148,6 +175,7 @@ class Establishment extends CommonObject
 		$now = dol_now();
 
 		// Clean parameters
+		$this->label = trim($this->label);
 		$this->address = trim($this->address);
 		$this->zip = trim($this->zip);
 		$this->town = trim($this->town);
@@ -189,10 +217,6 @@ class Establishment extends CommonObject
 			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
-		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."establishment");
-		}
-
 		// Commit or rollback
 		if ($error) {
 			foreach ($this->errors as $errmsg) {
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index 1f43878babf..15fd44e2c3b 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -167,7 +167,7 @@ if ($action == 'create')
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">';
 
@@ -241,12 +241,12 @@ if ($action == 'create')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
-	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
+	print '<input class="button button-save" type="submit" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
@@ -262,7 +262,7 @@ if (($id || $ref) && $action == 'edit')
 
 		if ($action == 'edit')
 		{
-			dol_fiche_head($head, 'card', $langs->trans("Establishment"), 0, 'building');
+			print dol_get_fiche_head($head, 'card', $langs->trans("Establishment"), 0, 'building');
 
 			print '<form name="update" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
 			print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -324,12 +324,12 @@ if (($id || $ref) && $action == 'edit')
 
 			print '</table>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
-			print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+			print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-			print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
+			print '<input type="submit" name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'">';
 			print '</div>';
 
 			print '</form>';
@@ -342,7 +342,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$res = $object->fetch_optionals();
 
 	$head = establishment_prepare_head($object);
-	dol_fiche_head($head, 'card', $langs->trans("Establishment"), -1, 'building');
+	print dol_get_fiche_head($head, 'card', $langs->trans("Establishment"), -1, 'building');
 
 	// Confirmation to delete
 	if ($action == 'delete')
@@ -418,7 +418,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div><br>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	/*
      * Barre d'actions
diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php
index 7bd6c5727b7..3185f897958 100644
--- a/htdocs/hrm/establishment/info.php
+++ b/htdocs/hrm/establishment/info.php
@@ -118,7 +118,7 @@ if ($object->id > 0)
 	$head = establishment_prepare_head($object);
 
 
-	dol_fiche_head($head, 'info', $langs->trans("Establishment"), -1, 'building');
+	print dol_get_fiche_head($head, 'info', $langs->trans("Establishment"), -1, 'building');
 
 	// Object card
 	// ------------------------------------------------------------
@@ -175,7 +175,7 @@ if ($object->id > 0)
 
 	 print '</div>';
 
-	 dol_fiche_end();
+	 print dol_get_fiche_end();
 }
 
 
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index bcae66ca5bf..f0bbb442acc 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2013-2015	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2012-2014	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2015-2016	Alexandre Spangaro	<aspangaro@open-dsi.fr>
- * Copyright (C) 2019           Nicolas ZABOURI         <info@inovea-conseil.com>
+ * Copyright (C) 2019       Nicolas ZABOURI     <info@inovea-conseil.com>
  *
  * 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
@@ -35,6 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 if ($conf->deplacement->enabled) require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
 if ($conf->expensereport->enabled) require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentcandidature.class.php';
 require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 
 $hookmanager = new HookManager($db);
@@ -52,6 +53,7 @@ if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INF
 
 $holiday = new Holiday($db);
 $holidaystatic = new Holiday($db);
+$staticrecruitmentcandidature = new RecruitmentCandidature($db);
 
 $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
@@ -94,42 +96,42 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-    if (!empty($conf->holiday->enabled) && $user->rights->holiday->read)
-    {
-    	$langs->load("holiday");
-        $listofsearchfields['search_holiday'] = array('text'=>'TitreRequestCP');
-    }
-    if (!empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
-    {
-    	$langs->load("trips");
-        $listofsearchfields['search_deplacement'] = array('text'=>'ExpenseReport');
-    }
-    if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
-    {
-    	$langs->load("trips");
-        $listofsearchfields['search_expensereport'] = array('text'=>'ExpenseReport');
-    }
-    if (count($listofsearchfields))
-    {
-    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-    	print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<div class="div-table-responsive-no-min">';
-    	print '<table class="noborder nohover centpercent">';
-    	$i = 0;
-    	foreach ($listofsearchfields as $key => $value)
-    	{
-    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    		print '<tr '.$bc[false].'>';
-    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-    		print '</tr>';
-    		$i++;
-    	}
-    	print '</table>';
-        print '</div>';
-    	print '</form>';
-    	print '<br>';
-    }
+	if (!empty($conf->holiday->enabled) && $user->rights->holiday->read)
+	{
+		$langs->load("holiday");
+		$listofsearchfields['search_holiday'] = array('text'=>'TitreRequestCP');
+	}
+	if (!empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
+	{
+		$langs->load("trips");
+		$listofsearchfields['search_deplacement'] = array('text'=>'ExpenseReport');
+	}
+	if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
+	{
+		$langs->load("trips");
+		$listofsearchfields['search_expensereport'] = array('text'=>'ExpenseReport');
+	}
+	if (count($listofsearchfields))
+	{
+		print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder nohover centpercent">';
+		$i = 0;
+		foreach ($listofsearchfields as $key => $value)
+		{
+			if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+			print '<tr '.$bc[false].'>';
+			print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+			if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+			print '</tr>';
+			$i++;
+		}
+		print '</table>';
+		print '</div>';
+		print '</form>';
+		print '<br>';
+	}
 }
 
 
@@ -139,26 +141,26 @@ if (!empty($conf->holiday->enabled))
 	{
 		$user_id = $user->id;
 
-        print '<div class="div-table-responsive-no-min">';
-	    print '<table class="noborder nohover centpercent">';
-	    print '<tr class="liste_titre"><th colspan="3">'.$langs->trans("Holidays").'</th></tr>';
-	    print '<tr class="oddeven">';
-	    print '<td colspan="3">';
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder nohover centpercent">';
+		print '<tr class="liste_titre"><th colspan="3">'.$langs->trans("Holidays").'</th></tr>';
+		print '<tr class="oddeven">';
+		print '<td colspan="3">';
 
-	    $out = '';
-	    $typeleaves = $holiday->getTypes(1, 1);
-	    foreach ($typeleaves as $key => $val)
-	    {
-	    	$nb_type = $holiday->getCPforUser($user->id, $val['rowid']);
-	    	$nb_holiday += $nb_type;
-	    	$out .= ' - '.$val['label'].': <strong>'.($nb_type ?price2num($nb_type) : 0).'</strong><br>';
-	    }
-	    print $langs->trans('SoldeCPUser', round($nb_holiday, 5)).'<br>';
-	    print $out;
+		$out = '';
+		$typeleaves = $holiday->getTypes(1, 1);
+		foreach ($typeleaves as $key => $val)
+		{
+			$nb_type = $holiday->getCPforUser($user->id, $val['rowid']);
+			$nb_holiday += $nb_type;
+			$out .= ' - '.($langs->trans($val['code']) != $val['code'] ? $langs->trans($val['code']) : $val['label']).': <strong>'.($nb_type ? price2num($nb_type) : 0).'</strong><br>';
+		}
+		print $langs->trans('SoldeCPUser', round($nb_holiday, 5)).'<br>';
+		print $out;
 
-	    print '</td>';
-	    print '</tr>';
-	    print '</table></div><br>';
+		print '</td>';
+		print '</tr>';
+		print '</table></div><br>';
 	} elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE))
 	{
 		print $langs->trans($conf->global->HOLIDAY_HIDE_BALANCE).'<br>';
@@ -173,86 +175,88 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 // Latest leave requests
 if (!empty($conf->holiday->enabled) && $user->rights->holiday->read)
 {
-    $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.photo, u.statut, x.rowid, x.rowid as ref, x.fk_type, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.tms as dm, x.statut as status";
-    $sql .= " FROM ".MAIN_DB_PREFIX."holiday as x, ".MAIN_DB_PREFIX."user as u";
-    $sql .= " WHERE u.rowid = x.fk_user";
-    $sql .= " AND x.entity = ".$conf->entity;
-    if (empty($user->rights->holiday->read_all)) $sql .= ' AND x.fk_user IN ('.join(',', $childids).')';
-    //if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND x.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-    //if (!empty($socid)) $sql.= " AND x.fk_soc = ".$socid;
-    $sql .= $db->order("x.tms", "DESC");
-    $sql .= $db->plimit($max, 0);
+	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.photo, u.statut as user_status,";
+	$sql .= " x.rowid, x.rowid as ref, x.fk_type, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.tms as dm, x.statut as status";
+	$sql .= " FROM ".MAIN_DB_PREFIX."holiday as x, ".MAIN_DB_PREFIX."user as u";
+	$sql .= " WHERE u.rowid = x.fk_user";
+	$sql .= " AND x.entity = ".$conf->entity;
+	if (empty($user->rights->holiday->readall)) $sql .= ' AND x.fk_user IN ('.join(',', $childids).')';
+	//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND x.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	//if (!empty($socid)) $sql.= " AND x.fk_soc = ".$socid;
+	$sql .= $db->order("x.tms", "DESC");
+	$sql .= $db->plimit($max, 0);
 
-    $result = $db->query($sql);
-    if ($result)
-    {
-        $var = false;
-        $num = $db->num_rows($result);
+	$result = $db->query($sql);
+	if ($result)
+	{
+		$var = false;
+		$num = $db->num_rows($result);
 
-        $holidaystatic = new Holiday($db);
-        $userstatic = new User($db);
+		$holidaystatic = new Holiday($db);
+		$userstatic = new User($db);
 
-        $listhalfday = array('morning'=>$langs->trans("Morning"), "afternoon"=>$langs->trans("Afternoon"));
-        $typeleaves = $holidaystatic->getTypes(1, -1);
+		$listhalfday = array('morning'=>$langs->trans("Morning"), "afternoon"=>$langs->trans("Afternoon"));
+		$typeleaves = $holidaystatic->getTypes(1, -1);
 
-        $i = 0;
+		$i = 0;
 
-        print '<div class="div-table-responsive-no-min">';
-        print '<table class="noborder centpercent">';
-        print '<tr class="liste_titre">';
-        print '<th colspan="3">'.$langs->trans("BoxTitleLastLeaveRequests", min($max, $num)).'</th>';
-        print '<th>'.$langs->trans("from").'</th>';
-        print '<th>'.$langs->trans("to").'</th>';
-        print '<th class="right">'.$langs->trans("DateModificationShort").'</th>';
-        print '<th width="16">&nbsp;</th>';
-        print '</tr>';
-        if ($num)
-        {
-            while ($i < $num && $i < $max)
-            {
-                $obj = $db->fetch_object($result);
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print '<th colspan="3">'.$langs->trans("BoxTitleLastLeaveRequests", min($max, $num)).'</th>';
+		print '<th>'.$langs->trans("from").'</th>';
+		print '<th>'.$langs->trans("to").'</th>';
+		print '<th class="right" colspan="2"><a href="'.DOL_URL_ROOT.'/holiday/list.php?sortfield=cp.tms&sortorder=DESC">'.$langs->trans("FullList").'</th>';
+		print '</tr>';
+		if ($num)
+		{
+			while ($i < $num && $i < $max)
+			{
+				$obj = $db->fetch_object($result);
 
-                $holidaystatic->id = $obj->rowid;
-                $holidaystatic->ref = $obj->ref;
+				$holidaystatic->id = $obj->rowid;
+				$holidaystatic->ref = $obj->ref;
+				$holidaystatic->statut = $obj->status;
 
-                $userstatic->id = $obj->uid;
-                $userstatic->lastname = $obj->lastname;
-                $userstatic->firstname = $obj->firstname;
-                $userstatic->login = $obj->login;
-                $userstatic->photo = $obj->photo;
-                $userstatic->email = $obj->email;
-                $userstatic->statut = $obj->statut;
+				$userstatic->id = $obj->uid;
+				$userstatic->lastname = $obj->lastname;
+				$userstatic->firstname = $obj->firstname;
+				$userstatic->login = $obj->login;
+				$userstatic->photo = $obj->photo;
+				$userstatic->email = $obj->email;
+				$userstatic->statut = $obj->user_status;
 
-                print '<tr class="oddeven">';
-                print '<td class="nowraponall">'.$holidaystatic->getNomUrl(1).'</td>';
-                print '<td class="tdoverflowmax150">'.$userstatic->getNomUrl(-1, 'leave').'</td>';
-                print '<td>'.$typeleaves[$obj->fk_type]['label'].'</td>';
+				print '<tr class="oddeven">';
+				print '<td class="nowraponall">'.$holidaystatic->getNomUrl(1).'</td>';
+				print '<td class="tdoverflowmax150">'.$userstatic->getNomUrl(-1, 'leave').'</td>';
+				print '<td>'.$typeleaves[$obj->fk_type]['label'].'</td>';
 
-                $starthalfday = ($obj->halfday == -1 || $obj->halfday == 2) ? 'afternoon' : 'morning';
-                $endhalfday = ($obj->halfday == 1 || $obj->halfday == 2) ? 'morning' : 'afternoon';
+				$starthalfday = ($obj->halfday == -1 || $obj->halfday == 2) ? 'afternoon' : 'morning';
+				$endhalfday = ($obj->halfday == 1 || $obj->halfday == 2) ? 'morning' : 'afternoon';
 
-                print '<td>'.dol_print_date($db->jdate($obj->date_start), 'day').' '.$langs->trans($listhalfday[$starthalfday]);
-                print '<td>'.dol_print_date($db->jdate($obj->date_end), 'day').' '.$langs->trans($listhalfday[$endhalfday]);
-                print '<td class="right">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>';
-                print '<td>'.$holidaystatic->LibStatut($obj->status, 3).'</td>';
-                print '</tr>';
+				print '<td>'.dol_print_date($db->jdate($obj->date_start), 'day').' <span class="opacitymedium">'.$langs->trans($listhalfday[$starthalfday]).'</span>';
+				print '<td>'.dol_print_date($db->jdate($obj->date_end), 'day').' <span class="opacitymedium">'.$langs->trans($listhalfday[$endhalfday]).'</span>';
+				print '<td class="right">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>';
+				print '<td class="right nowrap" width="16">'.$holidaystatic->LibStatut($obj->status, 3).'</td>';
+				print '</tr>';
 
-                $i++;
-            }
-        } else {
-            print '<tr class="oddeven"><td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-        }
-        print '</table>';
-        print '</div>';
-        print '<br>';
-    } else dol_print_error($db);
+				$i++;
+			}
+		} else {
+			print '<tr class="oddeven"><td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+		}
+		print '</table>';
+		print '</div>';
+		print '<br>';
+	} else dol_print_error($db);
 }
 
 
 // Latest expense report
 if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
 {
-	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.statut, u.photo, x.rowid, x.ref, x.date_debut as date, x.tms as dm, x.total_ttc, x.fk_statut as status";
+	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.statut as user_status, u.photo,";
+	$sql .= " x.rowid, x.ref, x.date_debut as date, x.tms as dm, x.total_ttc, x.fk_statut as status";
 	$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as x, ".MAIN_DB_PREFIX."user as u";
 	//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql .= " WHERE u.rowid = x.fk_user_author";
@@ -275,8 +279,7 @@ if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
 		print '<tr class="liste_titre">';
 		print '<th colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses", min($max, $num)).'</th>';
 		print '<th class="right">'.$langs->trans("TotalTTC").'</th>';
-		print '<th class="right">'.$langs->trans("DateModificationShort").'</th>';
-		print '<th width="16">&nbsp;</th>';
+		print '<th class="right" colspan="2"><a href="'.DOL_URL_ROOT.'/expensereport/list.php?sortfield=d.tms&sortorder=DESC">'.$langs->trans("FullList").'</th>';
 		print '</tr>';
 		if ($num)
 		{
@@ -290,13 +293,15 @@ if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
 
 				$expensereportstatic->id = $obj->rowid;
 				$expensereportstatic->ref = $obj->ref;
+				$expensereportstatic->statut = $obj->status;
+				$expensereportstatic->status = $obj->status;
 
 				$userstatic->id = $obj->uid;
 				$userstatic->lastname = $obj->lastname;
 				$userstatic->firstname = $obj->firstname;
-                $userstatic->email = $obj->email;
+				$userstatic->email = $obj->email;
 				$userstatic->login = $obj->login;
-				$userstatic->statut = $obj->statut;
+				$userstatic->statut = $obj->user_status;
 				$userstatic->photo = $obj->photo;
 
 				print '<tr class="oddeven">';
@@ -304,7 +309,7 @@ if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
 				print '<td class="tdoverflowmax150">'.$userstatic->getNomUrl(-1).'</td>';
 				print '<td class="right">'.price($obj->total_ttc).'</td>';
 				print '<td class="right">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>';
-				print '<td>'.$expensereportstatic->LibStatut($obj->status, 3).'</td>';
+				print '<td class="right nowrap" width="16">'.$expensereportstatic->LibStatut($obj->status, 3).'</td>';
 				print '</tr>';
 
 				$i++;
@@ -314,10 +319,75 @@ if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
 		}
 		print '</table>';
 		print '</div>';
+		print '<br>';
 	} else dol_print_error($db);
 }
 
 
+// Last modified job position
+if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitmentjobposition->read)
+{
+	$sql = "SELECT rc.rowid, rc.ref, rc.email, rc.lastname, rc.firstname, rc.date_creation, rc.tms, rc.status";
+	$sql .= " FROM ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature as rc";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."recruitment_recruitmentjobposition as s ON rc.fk_recruitmentjobposition = s.rowid";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql .= " WHERE rc.entity IN (".getEntity($staticrecruitmentjobposition->element).")";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid)	$sql .= " AND s.fk_soc = $socid";
+	$sql .= " ORDER BY rc.tms DESC";
+	$sql .= $db->plimit($max, 0);
+
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print '<th colspan="2">';
+		print $langs->trans("BoxTitleLatestModifiedCandidatures", $max);
+		print '</th>';
+		print '<th class="right" colspan="2"><a href="'.DOL_URL_ROOT.'/recruitment/recruitmentcandidature_list.php?sortfield=t.tms&sortorder=DESC">'.$langs->trans("FullList").'</th>';
+		print '</tr>';
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$objp = $db->fetch_object($resql);
+				$staticrecruitmentcandidature->id = $objp->rowid;
+				$staticrecruitmentcandidature->ref = $objp->ref;
+				$staticrecruitmentcandidature->email = $objp->email;
+				$staticrecruitmentcandidature->status = $objp->status;
+				$staticrecruitmentcandidature->date_creation = $objp->date_creation;
+				$staticrecruitmentcandidature->firstname = $objp->firstname;
+				$staticrecruitmentcandidature->lastname = $objp->lastname;
+
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">'.$staticrecruitmentcandidature->getNomUrl(1, '').'</td>';
+				print '<td class="right nowrap">';
+				print "</td>";
+				print '<td class="right nowrap">'.dol_print_date($db->jdate($objp->tms), 'day')."</td>";
+				print '<td class="right nowrap" width="16">';
+				print $staticrecruitmentcandidature->getLibStatut(3);
+				print "</td>";
+				print '</tr>';
+				$i++;
+			}
+
+			$db->free($resql);
+		} else {
+			print '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+		}
+		print "</table>";
+		print "</div>";
+		print "<br>";
+	} else {
+		dol_print_error($db);
+	}
+}
+
 print '</div></div></div>';
 
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php
index 3684d4d2d7e..19b71cb8cd3 100644
--- a/htdocs/imports/class/import.class.php
+++ b/htdocs/imports/class/import.class.php
@@ -28,21 +28,21 @@
  */
 class Import
 {
-    public $array_import_module;
-    public $array_import_perms;
-    public $array_import_icon;
-    public $array_import_code;
-    public $array_import_label;
-    public $array_import_tables;
-    public $array_import_tables_creator;
-    public $array_import_fields;
-    public $array_import_fieldshidden;
-    public $array_import_entities;
-    public $array_import_regex;
-    public $array_import_updatekeys;
-    public $array_import_examplevalues;
-    public $array_import_convertvalue;
-    public $array_import_run_sql_after;
+	public $array_import_module;
+	public $array_import_perms;
+	public $array_import_icon;
+	public $array_import_code;
+	public $array_import_label;
+	public $array_import_tables;
+	public $array_import_tables_creator;
+	public $array_import_fields;
+	public $array_import_fieldshidden;
+	public $array_import_entities;
+	public $array_import_regex;
+	public $array_import_updatekeys;
+	public $array_import_examplevalues;
+	public $array_import_convertvalue;
+	public $array_import_run_sql_after;
 
 	/**
 	 * @var string Error code (or message)
@@ -55,40 +55,40 @@ class Import
 	public $errors = array();
 
 
-    /**
-     *    Constructor
-     *
-     *    @param  	DoliDB		$db		Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *    Constructor
+	 *
+	 *    @param  	DoliDB		$db		Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Load description int this->array_import_module, this->array_import_fields, ... of an importable dataset
 	 *
 	 *  @param		User	$user      	Object user making import
 	 *  @param  	string	$filter		Load a particular dataset only. Index will start to 0.
- 	 *  @return		int					<0 if KO, >0 if OK
+	 *  @return		int					<0 if KO, >0 if OK
 	 */
-    public function load_arrays($user, $filter = '')
+	public function load_arrays($user, $filter = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf;
 
 		dol_syslog(get_class($this)."::load_arrays user=".$user->id." filter=".$filter);
 
-        $i = 0;
+		$i = 0;
 
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-        $modulesdir = dolGetModulesDirs();
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$modulesdir = dolGetModulesDirs();
 
-        // Load list of modules
-        foreach ($modulesdir as $dir)
-        {
+		// Load list of modules
+		foreach ($modulesdir as $dir)
+		{
 			$handle = @opendir(dol_osencode($dir));
 			if (!is_resource($handle)) continue;
 
@@ -181,14 +181,14 @@ class Import
 					}
 				}
 			}
-	        closedir($handle);
+			closedir($handle);
 		}
 		return 1;
 	}
 
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Build an import example file.
 	 *  Arrays this->array_export_xxx are already loaded for required datatoexport
@@ -199,9 +199,9 @@ class Import
 	 *  @param		string	$datatoimport		Dataset to import
 	 *  @return		string						<0 if KO, >0 if OK
 	 */
-    public function build_example_file($model, $headerlinefields, $contentlinevalues, $datatoimport)
+	public function build_example_file($model, $headerlinefields, $contentlinevalues, $datatoimport)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		$indice = 0;
@@ -239,7 +239,7 @@ class Import
 	 *  @param		User	$user 	Object user that save
 	 *  @return		int				<0 if KO, >0 if OK
 	 */
-    public function create($user)
+	public function create($user)
 	{
 		global $conf;
 
@@ -277,7 +277,7 @@ class Import
 	 *  @param		int		$id		Id of profil to load
 	 *  @return		int				<0 if KO, >0 if OK
 	 */
-    public function fetch($id)
+	public function fetch($id)
 	{
 		$sql = 'SELECT em.rowid, em.field, em.label, em.type';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'import_model as em';
@@ -313,7 +313,7 @@ class Import
 	 *  @param      int		$notrigger	    0=launch triggers after, 1=disable triggers
 	 *	@return		int						<0 if KO, >0 if OK
 	 */
-    public function delete($user, $notrigger = 0)
+	public function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
 		$error = 0;
diff --git a/htdocs/imports/emptyexample.php b/htdocs/imports/emptyexample.php
index 9c5d8c12a0d..7e7cec1707e 100644
--- a/htdocs/imports/emptyexample.php
+++ b/htdocs/imports/emptyexample.php
@@ -21,7 +21,7 @@
  *      \brief      Show example of import file
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
 
 
 /**
@@ -32,7 +32,7 @@ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');				// Do not rol
  */
 function llxHeader()
 {
-    print '<html><title>Build an import example file</title><body>';
+	print '<html><title>Build an import example file</title><body>';
 }
 
 /**
@@ -43,7 +43,7 @@ function llxHeader()
  */
 function llxFooter()
 {
-    print '</body></html>';
+	print '</body></html>';
 }
 
 require '../main.inc.php';
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 71fad9dee9b..60134ab9b95 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -38,31 +38,93 @@ $langs->loadLangs(array('exports', 'compta', 'errors'));
 // Security check
 $result = restrictedArea($user, 'import');
 
+// Map icons, array duplicated in export.php, was not synchronized, TODO put it somewhere only once
 $entitytoicon = array(
-	'invoice'=>'bill', 'invoice_line'=>'bill',
-	'order'=>'order', 'order_line'=>'order',
-	'intervention'=>'intervention', 'inter_line'=>'intervention',
-	'member'=>'user', 'member_type'=>'group', 'subscription'=>'payment',
-	'tax'=>'bill', 'tax_type'=>'generic',
-	'account'=>'account',
-	'payment'=>'payment',
-	'product'=>'product', 'stock'=>'generic', 'warehouse'=>'stock',
-	'category'=>'generic',
-	'other'=>'generic'
+	'invoice'      => 'bill',
+    'invoice_line' => 'bill',
+	'order'        => 'order',
+    'order_line'   => 'order',
+	'propal'       => 'propal',
+    'propal_line'  => 'propal',
+	'intervention' => 'intervention',
+    'inter_line'   => 'intervention',
+	'member'       => 'user',
+    'member_type'  => 'group',
+    'subscription' => 'payment',
+    'payment'      => 'payment',
+	'tax'          => 'bill',
+    'tax_type'     => 'generic',
+    'other'        => 'generic',
+	'account'      => 'account',
+	'product'      => 'product',
+    'virtualproduct'=>'product',
+	'subproduct'   => 'product',
+	'product_supplier_ref'      => 'product',
+    'stock'        => 'stock',
+	'warehouse'    => 'stock',
+	'batch'        => 'stock',
+	'stockbatch'   => 'stock',
+	'category'     => 'category',
+	'shipment'     => 'sending',
+    'shipment_line'=> 'sending',
+    'reception'=> 'sending',
+    'reception_line'=> 'sending',
+	'expensereport'=> 'trip',
+    'expensereport_line'=> 'trip',
+	'holiday'      => 'holiday',
+    'contract_line' => 'contract',
+    'translation'  => 'generic',
+    'bomm'         => 'bom',
+    'bomline'      => 'bom'
 );
-$entitytolang = array(		// Translation code
-	'user'=>'User',
-	'company'=>'Company', 'contact'=>'Contact',
-	'invoice'=>'Bill', 'invoice_line'=>'InvoiceLine',
-	'order'=>'Order', 'order_line'=>'OrderLine',
-	'intervention'=>'Intervention', 'inter_line'=>'InterLine',
-	'member'=>'Member', 'member_type'=>'MemberType', 'subscription'=>'Subscription',
-	'tax'=>'SocialContribution', 'tax_type'=>'DictionarySocialContributions',
-	'account'=>'BankTransactions',
-	'payment'=>'Payment',
-	'product'=>'Product', 'stock'=>'Stock', 'warehouse'=>'Warehouse',
-	'category'=>'Category',
-	'other'=>'Other'
+
+// Translation code, array duplicated in export.php, was not synchronized, TODO put it somewhere only once
+$entitytolang = array(
+	'user'         => 'User',
+	'company'      => 'Company',
+    'contact'      => 'Contact',
+	'invoice'      => 'Bill',
+    'invoice_line' => 'InvoiceLine',
+	'order'        => 'Order',
+    'order_line'   => 'OrderLine',
+    'propal'       => 'Proposal',
+    'propal_line'  => 'ProposalLine',
+	'intervention' => 'Intervention',
+    'inter_line'   => 'InterLine',
+	'member'       => 'Member',
+    'member_type'  => 'MemberType',
+    'subscription' => 'Subscription',
+	'tax'          => 'SocialContribution',
+    'tax_type'     => 'DictionarySocialContributions',
+	'account'      => 'BankTransactions',
+	'payment'      => 'Payment',
+	'product'      => 'Product',
+	'virtualproduct'  => 'AssociatedProducts',
+	'subproduct'      => 'SubProduct',
+	'product_supplier_ref'      => 'SupplierPrices',
+	'service'      => 'Service',
+    'stock'        => 'Stock',
+	'movement'	   => 'StockMovement',
+	'batch'        => 'Batch',
+	'stockbatch'   => 'StockDetailPerBatch',
+	'warehouse'    => 'Warehouse',
+	'category'     => 'Category',
+	'other'        => 'Other',
+    'trip'         => 'TripsAndExpenses',
+    'shipment'     => 'Shipments',
+    'shipment_line'=> 'ShipmentLine',
+    'project'      => 'Projects',
+    'projecttask'  => 'Tasks',
+    'task_time'    => 'TaskTimeSpent',
+	'action'       => 'Event',
+	'expensereport'=> 'ExpenseReport',
+	'expensereport_line'=> 'ExpenseReportLine',
+	'holiday'      => 'TitreRequestCP',
+	'contract'     => 'Contract',
+    'contract_line'=> 'ContractLine',
+    'translation'  => 'Translation',
+    'bom'          => 'BOM',
+    'bomline'      => 'BOMLine'
 );
 
 $datatoimport		= GETPOST('datatoimport');
@@ -328,9 +390,9 @@ if ($step == 1 || !$datatoimport)
 
 	llxHeader('', $langs->trans("NewImport"), 'EN:Module_Imports_En|FR:Module_Imports|ES:M&oacute;dulo_Importaciones');
 
-    $head = import_prepare_head($param, 1);
+	$head = import_prepare_head($param, 1);
 
-	dol_fiche_head($head, 'step1', $langs->trans("NewImport"), -1);
+	print dol_get_fiche_head($head, 'step1', $langs->trans("NewImport"), -1);
 
 
 	print '<div class="opacitymedium">'.$langs->trans("SelectImportDataSet").'</div><br>';
@@ -356,12 +418,14 @@ if ($step == 1 || !$datatoimport)
 			if (in_array($objimport->array_import_code[$key], array('produit_supplierprices', 'produit_multiprice', 'produit_languages'))) $titleofmodule = $langs->trans("ProductOrService");
 			print $titleofmodule;
 			print '</td><td>';
-			print img_object($objimport->array_import_module[$key]['module']->getName(), $objimport->array_import_icon[$key]).' ';
+			$entity = preg_replace('/:.*$/', '', $objimport->array_import_icon[$key]);
+			$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+			print img_object($objimport->array_import_module[$key]['module']->getName(), $entityicon).' ';
 			print $objimport->array_import_label[$key];
-            print '</td><td style="text-align: right">';
+			print '</td><td style="text-align: right">';
 			if ($objimport->array_import_perms[$key])
 			{
-				print '<a href="'.DOL_URL_ROOT.'/imports/import.php?step=2&datatoimport='.$objimport->array_import_code[$key].$param.'">'.img_picto($langs->trans("NewImport"), 'filenew').'</a>';
+				print '<a href="'.DOL_URL_ROOT.'/imports/import.php?step=2&datatoimport='.$objimport->array_import_code[$key].$param.'">'.img_picto($langs->trans("NewImport"), 'next', 'class="fa-15x"').'</a>';
 			} else {
 				print $langs->trans("NotEnoughPermissions");
 			}
@@ -371,9 +435,9 @@ if ($step == 1 || !$datatoimport)
 		print '<tr><td class="oddeven" colspan="3">'.$langs->trans("NoImportableData").'</td></tr>';
 	}
 	print '</table>';
-    print '</div>';
+	print '</div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 
@@ -388,9 +452,9 @@ if ($step == 2 && $datatoimport)
 
 	llxHeader('', $langs->trans("NewImport"), 'EN:Module_Imports_En|FR:Module_Imports|ES:M&oacute;dulo_Importaciones');
 
-    $head = import_prepare_head($param, 2);
+	$head = import_prepare_head($param, 2);
 
-	dol_fiche_head($head, 'step2', $langs->trans("NewImport"), -2);
+	print dol_get_fiche_head($head, 'step2', $langs->trans("NewImport"), -2);
 
 	print '<div class="underbanner clearboth"></div>';
 	print '<div class="fichecenter">';
@@ -409,22 +473,26 @@ if ($step == 2 && $datatoimport)
 	// Lot de donnees a importer
 	print '<tr><td>'.$langs->trans("DatasetToImport").'</td>';
 	print '<td>';
-	print img_object($objimport->array_import_module[0]['module']->getName(), $objimport->array_import_icon[0]).' ';
+	$entity = preg_replace('/:.*$/', '', $objimport->array_import_icon[0]);
+	$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+	print img_object($objimport->array_import_module[0]['module']->getName(), $entityicon).' ';
 	print $objimport->array_import_label[0];
 	print '</td></tr>';
 
 	print '</table>';
-
 	print '</div>';
 
-	dol_fiche_end();
-
+	print dol_get_fiche_end();
 
 	print '<form name="userfile" action="'.$_SERVER["PHP_SELF"].'" enctype="multipart/form-data" METHOD="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="max_file_size" value="'.$conf->maxfilesize.'">';
 
-	print '<span class="opacitymedium">'.$langs->trans("ChooseFormatOfFileToImport", img_picto('', 'filenew')).'</span><br><br>';
+	print '<span class="opacitymedium">';
+	$s = $langs->trans("ChooseFormatOfFileToImport", '{s1}');
+	$s = str_replace('{s1}', img_picto('', 'next'), $s);
+	print $s;
+	print '</span><br><br>';
 
 	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 	print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
@@ -440,12 +508,12 @@ if ($step == 2 && $datatoimport)
 	{
 		print '<tr class="oddeven">';
 		print '<td width="16">'.img_picto_common($key, $objmodelimport->getPictoForKey($key)).'</td>';
-    	$text = $objmodelimport->getDriverDescForKey($key);
-    	print '<td>'.$form->textwithpicto($objmodelimport->getDriverLabelForKey($key), $text).'</td>';
+		$text = $objmodelimport->getDriverDescForKey($key);
+		print '<td>'.$form->textwithpicto($objmodelimport->getDriverLabelForKey($key), $text).'</td>';
 		print '<td style="text-align:center"><a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$key.$param.'" target="_blank">'.$langs->trans("DownloadEmptyExample").'</a></td>';
 		// Action button
 		print '<td style="text-align:right">';
-		print '<a href="'.DOL_URL_ROOT.'/imports/import.php?step=3&format='.$key.$param.'">'.img_picto($langs->trans("SelectFormat"), 'filenew').'</a>';
+		print '<a href="'.DOL_URL_ROOT.'/imports/import.php?step=3&format='.$key.$param.'">'.img_picto($langs->trans("SelectFormat"), 'next', 'class="fa-15x"').'</a>';
 		print '</td>';
 		print '</tr>';
 	}
@@ -470,9 +538,9 @@ if ($step == 3 && $datatoimport)
 
 	llxHeader('', $langs->trans("NewImport"), 'EN:Module_Imports_En|FR:Module_Imports|ES:M&oacute;dulo_Importaciones');
 
-    $head = import_prepare_head($param, 3);
+	$head = import_prepare_head($param, 3);
 
-	dol_fiche_head($head, 'step3', $langs->trans("NewImport"), -2);
+	print dol_get_fiche_head($head, 'step3', $langs->trans("NewImport"), -2);
 
 	/*
 	 * Confirm delete file
@@ -499,17 +567,17 @@ if ($step == 3 && $datatoimport)
 	// Lot de donnees a importer
 	print '<tr><td>'.$langs->trans("DatasetToImport").'</td>';
 	print '<td>';
-	print img_object($objimport->array_import_module[0]['module']->getName(), $objimport->array_import_icon[0]).' ';
+	$entity = preg_replace('/:.*$/', '', $objimport->array_import_icon[0]);
+	$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+	print img_object($objimport->array_import_module[0]['module']->getName(), $entityicon).' ';
 	print $objimport->array_import_label[0];
 	print '</td></tr>';
 
 	print '</table>';
 	print '</div>';
 
-
 	print load_fiche_titre($langs->trans("InformationOnSourceFile"), '', '');
 
-
 	print '<div class="underbanner clearboth"></div>';
 	print '<div class="fichecenter">';
 	print '<table width="100%" class="border tableforfield">';
@@ -517,16 +585,16 @@ if ($step == 3 && $datatoimport)
 	// Source file format
 	print '<tr><td class="titlefield">'.$langs->trans("SourceFileFormat").'</td>';
 	print '<td>';
-    $text = $objmodelimport->getDriverDescForKey($format);
-    print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format), $text);
-    print '</td><td style="text-align:right" class="nowrap"><a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$format.$param.'" target="_blank">'.$langs->trans("DownloadEmptyExample").'</a>';
+	$text = $objmodelimport->getDriverDescForKey($format);
+	print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format), $text);
+	print '</td><td style="text-align:right" class="nowrap"><a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$format.$param.'" target="_blank">'.$langs->trans("DownloadEmptyExample").'</a>';
 
 	print '</td></tr>';
 
 	print '</table>';
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	if ($format == 'xlsx' && !class_exists('XMLWriter')) {
@@ -535,21 +603,25 @@ if ($step == 3 && $datatoimport)
 	}
 
 
-    print '<br>';
+	print '<br>';
 
 	print '<form name="userfile" action="'.$_SERVER["PHP_SELF"].'" enctype="multipart/form-data" METHOD="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="max_file_size" value="'.$conf->maxfilesize.'">';
 
 	print '<input type="hidden" value="'.$step.'" name="step">';
-	print '<input type="hidden" value="'.$format.'" name="format">';
+	print '<input type="hidden" value="'.dol_escape_htmltag($format).'" name="format">';
 	print '<input type="hidden" value="'.$excludefirstline.'" name="excludefirstline">';
 	print '<input type="hidden" value="'.$endatlinenb.'" name="endatlinenb">';
 	print '<input type="hidden" value="'.dol_escape_htmltag($separator).'" name="separator">';
 	print '<input type="hidden" value="'.dol_escape_htmltag($enclosure).'" name="enclosure">';
-	print '<input type="hidden" value="'.$datatoimport.'" name="datatoimport">';
+	print '<input type="hidden" value="'.dol_escape_htmltag($datatoimport).'" name="datatoimport">';
 
-	print '<span class="opacitymedium">'.$langs->trans("ChooseFileToImport", img_picto('', 'filenew')).'</span><br><br>';
+	print '<span class="opacitymedium">';
+	$s = $langs->trans("ChooseFileToImport", '{s1}');
+	$s = str_replace('{s1}', img_picto('', 'next'), $s);
+	print $s;
+	print '</span><br><br>';
 
 	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 	print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
@@ -596,11 +668,11 @@ if ($step == 3 && $datatoimport)
 			}
 		}
 
-        $langs->load('other');
-        $out .= ' ';
-        $out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphptoshow), 1);
+		$langs->load('other');
+		$out .= ' ';
+		$out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphptoshow), 1);
 	} else {
-	    $out .= ' ('.$langs->trans("UploadDisabled").')';
+		$out .= ' ('.$langs->trans("UploadDisabled").')';
 	}
 	print $out;
 	print '</td>';
@@ -616,7 +688,7 @@ if ($step == 3 && $datatoimport)
 		$i = 0;
 		foreach ($filearray as $key => $val)
 		{
-		    $file = $val['name'];
+			$file = $val['name'];
 
 			// readdir return value in ISO and we want UTF8 in memory
 			if (!utf8_check($file)) $file = utf8_encode($file);
@@ -630,9 +702,9 @@ if ($step == 3 && $datatoimport)
 			print '<tr class="oddeven">';
 			print '<td width="16">'.img_mime($file).'</td>';
 			print '<td>';
-    		print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&file='.urlencode($relativepath).'&step=3'.$param.'" target="_blank">';
-    		print $file;
-    		print '</a>';
+			print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&file='.urlencode($relativepath).'&step=3'.$param.'" target="_blank">';
+			print $file;
+			print '</a>';
 			print '</td>';
 			// Affiche taille fichier
 			print '<td style="text-align:right">'.dol_print_size(dol_filesize($dir.'/'.$file)).'</td>';
@@ -643,7 +715,7 @@ if ($step == 3 && $datatoimport)
 			print '">'.img_delete().'</a></td>';
 			// Action button
 			print '<td style="text-align:right">';
-			print '<a href="'.$_SERVER['PHP_SELF'].'?step=4'.$param.'&filetoimport='.urlencode($relativepath).'">'.img_picto($langs->trans("NewImport"), 'filenew').'</a>';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?step=4'.$param.'&filetoimport='.urlencode($relativepath).'">'.img_picto($langs->trans("NewImport"), 'next', 'class="fa-15x"').'</a>';
 			print '</td>';
 			print '</tr>';
 		}
@@ -670,19 +742,19 @@ if ($step == 4 && $datatoimport)
 	$obj = new $classname($db, $datatoimport);
 	if ($model == 'csv')
 	{
-	    $obj->separator = $separator;
-	    $obj->enclosure = $enclosure;
+		$obj->separator = $separator;
+		$obj->enclosure = $enclosure;
+	}
+	if ($model == 'xlsx') {
+		if (!preg_match('/\.xlsx$/i', $filetoimport))
+		{
+			$langs->load("errors");
+			$param = '&datatoimport='.$datatoimport.'&format='.$format;
+			setEventMessages($langs->trans("ErrorFileMustHaveFormat", $model), null, 'errors');
+			header("Location: ".$_SERVER["PHP_SELF"].'?step=3'.$param.'&filetoimport='.urlencode($relativepath));
+			exit;
+		}
 	}
-    if ($model == 'xlsx') {
-        if (!preg_match('/\.xlsx$/i', $filetoimport))
-        {
-            $langs->load("errors");
-            $param = '&datatoimport='.$datatoimport.'&format='.$format;
-            setEventMessages($langs->trans("ErrorFileMustHaveFormat", $model), null, 'errors');
-            header("Location: ".$_SERVER["PHP_SELF"].'?step=3'.$param.'&filetoimport='.urlencode($relativepath));
-            exit;
-        }
-    }
 
 	if (GETPOST('update')) {
 		$array_match_file_to_database = array();
@@ -761,9 +833,9 @@ if ($step == 4 && $datatoimport)
 
 	llxHeader('', $langs->trans("NewImport"), 'EN:Module_Imports_En|FR:Module_Imports|ES:M&oacute;dulo_Importaciones');
 
-    $head = import_prepare_head($param, 4);
+	$head = import_prepare_head($param, 4);
 
-	dol_fiche_head($head, 'step4', $langs->trans("NewImport"), -2);
+	print dol_get_fiche_head($head, 'step4', $langs->trans("NewImport"), -2);
 
 	print '<div class="underbanner clearboth"></div>';
 	print '<div class="fichecenter">';
@@ -782,14 +854,15 @@ if ($step == 4 && $datatoimport)
 	// Lot de donnees a importer
 	print '<tr><td>'.$langs->trans("DatasetToImport").'</td>';
 	print '<td>';
-	print img_object($objimport->array_import_module[0]['module']->getName(), $objimport->array_import_icon[0]).' ';
+	$entity = preg_replace('/:.*$/', '', $objimport->array_import_icon[0]);
+	$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+	print img_object($objimport->array_import_module[0]['module']->getName(), $entityicon).' ';
 	print $objimport->array_import_label[0];
 	print '</td></tr>';
 
 	print '</table>';
 	print '</div>';
 
-
 	print load_fiche_titre($langs->trans("InformationOnSourceFile"), '', '');
 
 	print '<div class="underbanner clearboth"></div>';
@@ -799,12 +872,12 @@ if ($step == 4 && $datatoimport)
 	// Source file format
 	print '<tr><td class="titlefield">'.$langs->trans("SourceFileFormat").'</td>';
 	print '<td>';
-    $text = $objmodelimport->getDriverDescForKey($format);
-    print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format), $text);
+	$text = $objmodelimport->getDriverDescForKey($format);
+	print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format), $text);
 	print '</td></tr>';
 
 	// Separator and enclosure
-    if ($model == 'csv') {
+	if ($model == 'csv') {
 		print '<tr><td>'.$langs->trans("CsvOptions").'</td>';
 		print '<td>';
 		print '<form>';
@@ -822,50 +895,54 @@ if ($step == 4 && $datatoimport)
 		print '<input name="update" type="submit" value="'.$langs->trans('Update').'" class="button" />';
 		print '</form>';
 		print '</td></tr>';
-    }
+	}
 
 	// File to import
 	print '<tr><td>'.$langs->trans("FileToImport").'</td>';
 	print '<td>';
 	$modulepart = 'import';
 	$relativepath = GETPOST('filetoimport');
-    print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&file='.urlencode($relativepath).'&step=4'.$param.'" target="_blank">';
-    print $filetoimport;
-    print '</a>';
+	print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&file='.urlencode($relativepath).'&step=4'.$param.'" target="_blank">';
+	print $filetoimport;
+	print '</a>';
 	print '</td></tr>';
 
 	print '</table>';
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<br>'."\n";
 
 
-    // List of source fields
-    print '<!-- List of source fields -->'."\n";
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="select_model">';
-    print '<input type="hidden" name="step" value="4">';
-    print '<input type="hidden" name="format" value="'.$format.'">';
-    print '<input type="hidden" name="datatoimport" value="'.$datatoimport.'">';
-    print '<input type="hidden" name="filetoimport" value="'.$filetoimport.'">';
-    print '<input type="hidden" name="excludefirstline" value="'.$excludefirstline.'">';
-    print '<input type="hidden" name="endatlinenb" value="'.$endatlinenb.'">';
-    print '<input type="hidden" name="separator" value="'.dol_escape_htmltag($separator).'">';
-    print '<input type="hidden" name="enclosure" value="'.dol_escape_htmltag($enclosure).'">';
+	// List of source fields
+	print '<!-- List of source fields -->'."\n";
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="select_model">';
+	print '<input type="hidden" name="step" value="4">';
+	print '<input type="hidden" name="format" value="'.$format.'">';
+	print '<input type="hidden" name="datatoimport" value="'.$datatoimport.'">';
+	print '<input type="hidden" name="filetoimport" value="'.$filetoimport.'">';
+	print '<input type="hidden" name="excludefirstline" value="'.$excludefirstline.'">';
+	print '<input type="hidden" name="endatlinenb" value="'.$endatlinenb.'">';
+	print '<input type="hidden" name="separator" value="'.dol_escape_htmltag($separator).'">';
+	print '<input type="hidden" name="enclosure" value="'.dol_escape_htmltag($enclosure).'">';
 
-    print '<div class="marginbottomonly">';
-    print '<span class="opacitymedium">'.$langs->trans("SelectImportFields", img_picto('', 'grip_title', '', false, 0, 0, '', '', 0)).'</span> ';
-    $htmlother->select_import_model($importmodelid, 'importmodelid', $datatoimport, 1);
-    print '<input type="submit" class="button" value="'.$langs->trans("Select").'">';
-    print '</div>';
-    print '</form>';
+	print '<div class="marginbottomonly">';
+	print '<span class="opacitymedium">';
+	$s = $langs->trans("SelectImportFields", '{s1}');
+	$s = str_replace('{s1}', img_picto('', 'grip_title', '', false, 0, 0, '', '', 0), $s);
+	print $s;
+	print '</span> ';
+	$htmlother->select_import_model($importmodelid, 'importmodelid', $datatoimport, 1);
+	print '<input type="submit" class="button" value="'.$langs->trans("Select").'">';
+	print '</div>';
+	print '</form>';
 
 	// Title of array with fields
-    print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-    print '<table class="noborder centpercent">';
+	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("FieldsInSourceFile").'</td>';
 	print '<td>'.$langs->trans("FieldsInTargetDatabase").'</td>';
@@ -978,11 +1055,11 @@ if ($step == 4 && $datatoimport)
 		// Example
 		if (empty($objimport->array_import_convertvalue[0][$code]))	// If source file does not need convertion
 		{
-		    if ($example) $htmltext .= $langs->trans("SourceExample").': <b>'.$example.'</b><br>';
+			if ($example) $htmltext .= $langs->trans("SourceExample").': <b>'.$example.'</b><br>';
 		} else {
-		    if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromref')        $htmltext .= $langs->trans("SourceExample").': <b>'.$langs->transnoentitiesnoconv("ExampleAnyRefFoundIntoElement", $entitylang).($example ? ' ('.$langs->transnoentitiesnoconv("Example").': '.$example.')' : '').'</b><br>';
-		    elseif ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromcodeid') $htmltext .= $langs->trans("SourceExample").': <b>'.$langs->trans("ExampleAnyCodeOrIdFoundIntoDictionary", $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$code]['dict'])).($example ? ' ('.$langs->transnoentitiesnoconv("Example").': '.$example.')' : '').'</b><br>';
-		    elseif ($example) $htmltext .= $langs->trans("SourceExample").': <b>'.$example.'</b><br>';
+			if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromref')        $htmltext .= $langs->trans("SourceExample").': <b>'.$langs->transnoentitiesnoconv("ExampleAnyRefFoundIntoElement", $entitylang).($example ? ' ('.$langs->transnoentitiesnoconv("Example").': '.$example.')' : '').'</b><br>';
+			elseif ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromcodeid') $htmltext .= $langs->trans("SourceExample").': <b>'.$langs->trans("ExampleAnyCodeOrIdFoundIntoDictionary", $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$code]['dict'])).($example ? ' ('.$langs->transnoentitiesnoconv("Example").': '.$example.')' : '').'</b><br>';
+			elseif ($example) $htmltext .= $langs->trans("SourceExample").': <b>'.$example.'</b><br>';
 		}
 		// Format control rule
 		if (!empty($objimport->array_import_regex[0][$code]))
@@ -1055,13 +1132,13 @@ if ($step == 4 && $datatoimport)
 	print '</td></tr>';
 
 	print '</table>';
-    print '</div>';
+	print '</div>';
 
 
 	if ($conf->use_javascript_ajax)
 	{
-        print '<script type="text/javascript" language="javascript">';
-        print 'jQuery(function() {
+		print '<script type="text/javascript" language="javascript">';
+		print 'jQuery(function() {
                     jQuery("#left, #right").sortable({
                         /* placeholder: \'ui-state-highlight\', */
                         handle: \'.boxhandle\',
@@ -1075,24 +1152,24 @@ if ($step == 4 && $datatoimport)
                     });
                 });
         ';
-        print "\n";
-        print 'function updateOrder(){'."\n";
-        print 'var left_list = cleanSerialize(jQuery("#left").sortable("serialize" ));'."\n";
-        //print 'var right_list = cleanSerialize(jQuery("#right").sortable("serialize" ));'."\n";
-        print 'var boxorder = \'A:\' + left_list;'."\n";
-        //print 'var boxorder = \'A:\' + left_list + \'-B:\' + right_list;'."\n";
-        //print 'alert(\'boxorder=\' + boxorder);';
-        //print 'var userid = \''.$user->id.'\';'."\n";
-        //print 'var datatoimport = "'.$datatoimport.'";'."\n";
-        // print 'jQuery.ajax({ url: "ajaximport.php?step=4&boxorder=" + boxorder + "&userid=" + userid + "&datatoimport=" + datatoimport,
-        //                    async: false
-        //        });'."\n";
-        // Now reload page
-        print 'var newlocation= \''.$_SERVER["PHP_SELF"].'?step=4'.$param.'&action=saveorder&boxorder=\' + boxorder;'."\n";
-        //print 'alert(newlocation);';
-        print 'window.location.href=newlocation;'."\n";
-        print '}'."\n";
-        print '</script>'."\n";
+		print "\n";
+		print 'function updateOrder(){'."\n";
+		print 'var left_list = cleanSerialize(jQuery("#left").sortable("serialize" ));'."\n";
+		//print 'var right_list = cleanSerialize(jQuery("#right").sortable("serialize" ));'."\n";
+		print 'var boxorder = \'A:\' + left_list;'."\n";
+		//print 'var boxorder = \'A:\' + left_list + \'-B:\' + right_list;'."\n";
+		//print 'alert(\'boxorder=\' + boxorder);';
+		//print 'var userid = \''.$user->id.'\';'."\n";
+		//print 'var datatoimport = "'.$datatoimport.'";'."\n";
+		// print 'jQuery.ajax({ url: "ajaximport.php?step=4&boxorder=" + boxorder + "&userid=" + userid + "&datatoimport=" + datatoimport,
+		//                    async: false
+		//        });'."\n";
+		// Now reload page
+		print 'var newlocation= \''.$_SERVER["PHP_SELF"].'?step=4'.$param.'&action=saveorder&boxorder=\' + boxorder;'."\n";
+		//print 'alert(newlocation);';
+		print 'window.location.href=newlocation;'."\n";
+		print '}'."\n";
+		print '</script>'."\n";
 	}
 
 	/*
@@ -1126,12 +1203,12 @@ if ($step == 4 && $datatoimport)
 		print '<input type="hidden" name="step" value="'.$step.'">';
 		print '<input type="hidden" name="format" value="'.$format.'">';
 		print '<input type="hidden" name="datatoimport" value="'.$datatoimport.'">';
-    	print '<input type="hidden" name="filetoimport" value="'.$filetoimport.'">';
+		print '<input type="hidden" name="filetoimport" value="'.$filetoimport.'">';
 		print '<input type="hidden" name="hexa" value="'.$hexa.'">';
-    	print '<input type="hidden" name="excludefirstline" value="'.$excludefirstline.'">';
-    	print '<input type="hidden" name="endatlinenb" value="'.$endatlinenb.'">';
-    	print '<input type="hidden" value="'.dol_escape_htmltag($separator).'" name="separator">';
-    	print '<input type="hidden" value="'.dol_escape_htmltag($enclosure).'" name="enclosure">';
+		print '<input type="hidden" name="excludefirstline" value="'.$excludefirstline.'">';
+		print '<input type="hidden" name="endatlinenb" value="'.$endatlinenb.'">';
+		print '<input type="hidden" value="'.dol_escape_htmltag($separator).'" name="separator">';
+		print '<input type="hidden" value="'.dol_escape_htmltag($enclosure).'" name="enclosure">';
 
 		print '<table summary="selectofimportprofil" class="noborder centpercent">';
 		print '<tr class="liste_titre">';
@@ -1189,8 +1266,8 @@ if ($step == 5 && $datatoimport)
 	require_once $dir.$file;
 	$obj = new $classname($db, $datatoimport);
 	if ($model == 'csv') {
-	    $obj->separator = $separator;
-	    $obj->enclosure = $enclosure;
+		$obj->separator = $separator;
+		$obj->enclosure = $enclosure;
 	}
 
 	// Load source fields in input file
@@ -1221,15 +1298,15 @@ if ($step == 5 && $datatoimport)
 
 	llxHeader('', $langs->trans("NewImport"), 'EN:Module_Imports_En|FR:Module_Imports|ES:M&oacute;dulo_Importaciones');
 
-    $head = import_prepare_head($param, 5);
+	$head = import_prepare_head($param, 5);
 
 
-    print '<form action="'.$_SERVER["PHP_SELF"].'?'.$param2.'" method="POST">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="step" value="5">'; // step 5
-    print '<input type="hidden" name="action" value="launchsimu">'; // step 5
+	print '<form action="'.$_SERVER["PHP_SELF"].'?'.$param2.'" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="step" value="5">'; // step 5
+	print '<input type="hidden" name="action" value="launchsimu">'; // step 5
 
-	dol_fiche_head($head, 'step5', $langs->trans("NewImport"), -2);
+	print dol_get_fiche_head($head, 'step5', $langs->trans("NewImport"), -2);
 
 	print '<div class="underbanner clearboth"></div>';
 	print '<div class="fichecenter">';
@@ -1248,14 +1325,15 @@ if ($step == 5 && $datatoimport)
 	// Lot de donnees a importer
 	print '<tr><td>'.$langs->trans("DatasetToImport").'</td>';
 	print '<td>';
-	print img_object($objimport->array_import_module[0]['module']->getName(), $objimport->array_import_icon[0]).' ';
+	$entity = preg_replace('/:.*$/', '', $objimport->array_import_icon[0]);
+	$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+	print img_object($objimport->array_import_module[0]['module']->getName(), $entityicon).' ';
 	print $objimport->array_import_label[0];
 	print '</td></tr>';
 
 	print '</table>';
 	print '</div>';
 
-
 	print load_fiche_titre($langs->trans("InformationOnSourceFile"), '', '');
 
 	print '<div class="underbanner clearboth"></div>';
@@ -1265,17 +1343,17 @@ if ($step == 5 && $datatoimport)
 	// Source file format
 	print '<tr><td class="titlefield">'.$langs->trans("SourceFileFormat").'</td>';
 	print '<td>';
-    $text = $objmodelimport->getDriverDescForKey($format);
-    print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format), $text);
+	$text = $objmodelimport->getDriverDescForKey($format);
+	print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format), $text);
 	print '</td></tr>';
 
 	// Separator and enclosure
 	if ($model == 'csv') {
-	    print '<tr><td>'.$langs->trans("CsvOptions").'</td>';
-	    print '<td>';
-	    print $langs->trans("Separator").' : '.dol_escape_htmltag($separator);
-	    print '&nbsp;&nbsp;&nbsp;&nbsp;'.$langs->trans("Enclosure").' : '.dol_escape_htmltag($enclosure);
-	    print '</td></tr>';
+		print '<tr><td>'.$langs->trans("CsvOptions").'</td>';
+		print '<td>';
+		print $langs->trans("Separator").' : '.dol_escape_htmltag($separator);
+		print '&nbsp;&nbsp;&nbsp;&nbsp;'.$langs->trans("Enclosure").' : '.dol_escape_htmltag($enclosure);
+		print '</td></tr>';
 	}
 
 	// File to import
@@ -1283,10 +1361,10 @@ if ($step == 5 && $datatoimport)
 	print '<td>';
 	$modulepart = 'import';
 	$relativepath = GETPOST('filetoimport');
-    print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&file='.urlencode($relativepath).'&step=4'.$param.'" target="_blank">';
-    print $filetoimport;
-    print '</a>';
-    print '</td></tr>';
+	print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&file='.urlencode($relativepath).'&step=4'.$param.'" target="_blank">';
+	print $filetoimport;
+	print '</a>';
+	print '</td></tr>';
 
 	// Total lines in source file
 	print '<tr><td>';
@@ -1301,22 +1379,22 @@ if ($step == 5 && $datatoimport)
 	print '</td><td>';
 	if ($action == 'launchsimu')
 	{
-	    print '<input type="number" class="maxwidth50" name="excludefirstlinebis" disabled="disabled" value="'.$excludefirstline.'">';
-	    print '<input type="hidden" name="excludefirstline" value="'.$excludefirstline.'">';
+		print '<input type="number" class="maxwidth50" name="excludefirstlinebis" disabled="disabled" value="'.$excludefirstline.'">';
+		print '<input type="hidden" name="excludefirstline" value="'.$excludefirstline.'">';
 	} else {
-	    print '<input type="number" class="maxwidth50" name="excludefirstline" value="'.$excludefirstline.'">';
-	    print $form->textwithpicto("", $langs->trans("SetThisValueTo2ToExcludeFirstLine"));
+		print '<input type="number" class="maxwidth50" name="excludefirstline" value="'.$excludefirstline.'">';
+		print $form->textwithpicto("", $langs->trans("SetThisValueTo2ToExcludeFirstLine"));
 	}
 	print ' - ';
 	if ($action == 'launchsimu')
 	{
-	    print '<input type="text" class="maxwidth50" name="endatlinenbbis" disabled="disabled" value="'.$endatlinenb.'">';
-	    print '<input type="hidden" name="endatlinenb" value="'.$endatlinenb.'">';
+		print '<input type="text" class="maxwidth50" name="endatlinenbbis" disabled="disabled" value="'.$endatlinenb.'">';
+		print '<input type="hidden" name="endatlinenb" value="'.$endatlinenb.'">';
 	} else {
-	    print '<input type="text" class="maxwidth50" name="endatlinenb" value="'.$endatlinenb.'">';
-	    print $form->textwithpicto("", $langs->trans("KeepEmptyToGoToEndOfFile"));
+		print '<input type="text" class="maxwidth50" name="endatlinenb" value="'.$endatlinenb.'">';
+		print $form->textwithpicto("", $langs->trans("KeepEmptyToGoToEndOfFile"));
 	}
-    if ($action == 'launchsimu') print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'?step=5'.$param.'">'.$langs->trans("Modify").'</a>';
+	if ($action == 'launchsimu') print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'?step=5'.$param.'">'.$langs->trans("Modify").'</a>';
 	print '</td></tr>';
 
 	// Keys for data UPDATE (not INSERT of new data)
@@ -1336,7 +1414,7 @@ if ($step == 5 && $datatoimport)
 		print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'?step=5'.$param.'">'.$langs->trans("Modify").'</a>';
 	} else {
    		if (is_array($objimport->array_import_updatekeys[0]) && count($objimport->array_import_updatekeys[0]))
-        {   //TODO dropdown UL is created inside nested SPANS
+		{   //TODO dropdown UL is created inside nested SPANS
 			print $form->multiselectarray('updatekeys', $objimport->array_import_updatekeys[0], $updatekeys, 0, 0, '', 1, '80%');
 			print $form->textwithpicto("", $langs->trans("SelectPrimaryColumnsForUpdateAttempt"));
 		} else {
@@ -1421,186 +1499,186 @@ if ($step == 5 && $datatoimport)
 	print '</table>';
 	print '</div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
 
-    if ($action != 'launchsimu')
-    {
-        // Show import id
-        print '<br><span class="opacitymedium">';
-        print $langs->trans("NowClickToTestTheImport", $langs->transnoentitiesnoconv("RunSimulateImportFile")).'</span><br>';
-        print '<br>';
+	if ($action != 'launchsimu')
+	{
+		// Show import id
+		print '<br><span class="opacitymedium">';
+		print $langs->trans("NowClickToTestTheImport", $langs->transnoentitiesnoconv("RunSimulateImportFile")).'</span><br>';
+		print '<br>';
 
-        // Actions
-        print '<div class="center">';
-        if ($user->rights->import->run)
-        {
-            print '<input type="submit" class="butAction" value="'.$langs->trans("RunSimulateImportFile").'">';
-        } else {
-            print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("RunSimulateImportFile").'</a>';
-        }
-        print '</div>';
-    } else {
-        // Launch import
-        $arrayoferrors = array();
-        $arrayofwarnings = array();
-        $maxnboferrors = empty($conf->global->IMPORT_MAX_NB_OF_ERRORS) ? 50 : $conf->global->IMPORT_MAX_NB_OF_ERRORS;
-        $maxnbofwarnings = empty($conf->global->IMPORT_MAX_NB_OF_WARNINGS) ? 50 : $conf->global->IMPORT_MAX_NB_OF_WARNINGS;
-        $nboferrors = 0;
-        $nbofwarnings = 0;
+		// Actions
+		print '<div class="center">';
+		if ($user->rights->import->run)
+		{
+			print '<input type="submit" class="butAction" value="'.$langs->trans("RunSimulateImportFile").'">';
+		} else {
+			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("RunSimulateImportFile").'</a>';
+		}
+		print '</div>';
+	} else {
+		// Launch import
+		$arrayoferrors = array();
+		$arrayofwarnings = array();
+		$maxnboferrors = empty($conf->global->IMPORT_MAX_NB_OF_ERRORS) ? 50 : $conf->global->IMPORT_MAX_NB_OF_ERRORS;
+		$maxnbofwarnings = empty($conf->global->IMPORT_MAX_NB_OF_WARNINGS) ? 50 : $conf->global->IMPORT_MAX_NB_OF_WARNINGS;
+		$nboferrors = 0;
+		$nbofwarnings = 0;
 
-        $importid = dol_print_date(dol_now(), '%Y%m%d%H%M%S');
+		$importid = dol_print_date(dol_now(), '%Y%m%d%H%M%S');
 
-        //var_dump($array_match_file_to_database);
+		//var_dump($array_match_file_to_database);
 
-        $db->begin();
+		$db->begin();
 
-        // Open input file
-        $nbok = 0;
-        $pathfile = $conf->import->dir_temp.'/'.$filetoimport;
-        $result = $obj->import_open_file($pathfile, $langs);
-        if ($result > 0)
-        {
-            global $tablewithentity_cache;
-            $tablewithentity_cache = array();
-        	$sourcelinenb = 0; $endoffile = 0;
+		// Open input file
+		$nbok = 0;
+		$pathfile = $conf->import->dir_temp.'/'.$filetoimport;
+		$result = $obj->import_open_file($pathfile, $langs);
+		if ($result > 0)
+		{
+			global $tablewithentity_cache;
+			$tablewithentity_cache = array();
+			$sourcelinenb = 0; $endoffile = 0;
 
-            // Loop on each input file record
-            while (($sourcelinenb < $nboflines) && !$endoffile)
-            {
-                $sourcelinenb++;
-                // Read line and store it into $arrayrecord
-                //dol_syslog("line ".$sourcelinenb.' - '.$nboflines.' - '.$excludefirstline.' - '.$endatlinenb);
-                $arrayrecord = $obj->import_read_record();
-                if ($arrayrecord === false)
-                {
+			// Loop on each input file record
+			while (($sourcelinenb < $nboflines) && !$endoffile)
+			{
+				$sourcelinenb++;
+				// Read line and store it into $arrayrecord
+				//dol_syslog("line ".$sourcelinenb.' - '.$nboflines.' - '.$excludefirstline.' - '.$endatlinenb);
+				$arrayrecord = $obj->import_read_record();
+				if ($arrayrecord === false)
+				{
 					$arrayofwarnings[$sourcelinenb][0] = array('lib'=>'File has '.$nboflines.' lines. However we reach end of file after record '.$sourcelinenb.'. This may occurs when some records are split onto several lines. Ensure the complete string is delimited correctly when there is a separator character in the text string.', 'type'=>'EOF_RECORD_ON_SEVERAL_LINES');
-                	$endoffile++;
-                	continue;
-                }
-                if ($excludefirstline && ($sourcelinenb < $excludefirstline)) continue;
-                if ($endatlinenb && ($sourcelinenb > $endatlinenb)) break;
+					$endoffile++;
+					continue;
+				}
+				if ($excludefirstline && ($sourcelinenb < $excludefirstline)) continue;
+				if ($endatlinenb && ($sourcelinenb > $endatlinenb)) break;
 
-                // Run import
-                $result = $obj->import_insert($arrayrecord, $array_match_file_to_database, $objimport, count($fieldssource), $importid, $updatekeys);
+				// Run import
+				$result = $obj->import_insert($arrayrecord, $array_match_file_to_database, $objimport, count($fieldssource), $importid, $updatekeys);
 
-                if (count($obj->errors))   $arrayoferrors[$sourcelinenb] = $obj->errors;
-                if (count($obj->warnings)) $arrayofwarnings[$sourcelinenb] = $obj->warnings;
-                if (!count($obj->errors) && !count($obj->warnings)) $nbok++;
-            }
-            // Close file
-            $obj->import_close_file();
-        } else {
-            print $langs->trans("ErrorFailedToOpenFile", $pathfile);
-        }
+				if (count($obj->errors))   $arrayoferrors[$sourcelinenb] = $obj->errors;
+				if (count($obj->warnings)) $arrayofwarnings[$sourcelinenb] = $obj->warnings;
+				if (!count($obj->errors) && !count($obj->warnings)) $nbok++;
+			}
+			// Close file
+			$obj->import_close_file();
+		} else {
+			print $langs->trans("ErrorFailedToOpenFile", $pathfile);
+		}
 
-	    $error = 0;
+		$error = 0;
 
-	    // Run the sql after import if defined
-	    //var_dump($objimport->array_import_run_sql_after[0]);
-	    if (!empty($objimport->array_import_run_sql_after[0]) && is_array($objimport->array_import_run_sql_after[0]))
-	    {
-	        $i = 0;
-	        foreach ($objimport->array_import_run_sql_after[0] as $sqlafterimport)
-	        {
-	            $i++;
-	            $resqlafterimport = $db->query($sqlafterimport);
-	            if (!$resqlafterimport)
-	            {
-			        $arrayoferrors['none'][] = array('lib'=>$langs->trans("Error running final request: ".$sqlafterimport));
-	                $error++;
-	            }
-	        }
-	    }
+		// Run the sql after import if defined
+		//var_dump($objimport->array_import_run_sql_after[0]);
+		if (!empty($objimport->array_import_run_sql_after[0]) && is_array($objimport->array_import_run_sql_after[0]))
+		{
+			$i = 0;
+			foreach ($objimport->array_import_run_sql_after[0] as $sqlafterimport)
+			{
+				$i++;
+				$resqlafterimport = $db->query($sqlafterimport);
+				if (!$resqlafterimport)
+				{
+					$arrayoferrors['none'][] = array('lib'=>$langs->trans("Error running final request: ".$sqlafterimport));
+					$error++;
+				}
+			}
+		}
 
-        $db->rollback(); // We force rollback because this was just a simulation.
+		$db->rollback(); // We force rollback because this was just a simulation.
 
-        // Show OK
-        if (!count($arrayoferrors) && !count($arrayofwarnings)) {
-        	print '<div class="center">'.img_picto($langs->trans("OK"), 'tick').' <b>'.$langs->trans("NoError").'</b></div><br><br>';
+		// Show OK
+		if (!count($arrayoferrors) && !count($arrayofwarnings)) {
+			print '<div class="center">'.img_picto($langs->trans("OK"), 'tick').' <b>'.$langs->trans("NoError").'</b></div><br><br>';
 			print $langs->trans("NbInsert", $obj->nbinsert).'<br>';
 			print $langs->trans("NbUpdate", $obj->nbupdate).'<br><br>';
 		} else print $langs->trans("NbOfLinesOK", $nbok).'<br><br>';
 
-        // Show Errors
-        //var_dump($arrayoferrors);
-        if (count($arrayoferrors))
-        {
-            print img_error().' <b>'.$langs->trans("ErrorsOnXLines", count($arrayoferrors)).'</b><br>';
-            print '<table width="100%" class="border"><tr><td>';
-            foreach ($arrayoferrors as $key => $val)
-            {
-                $nboferrors++;
-                if ($nboferrors > $maxnboferrors)
-                {
-                    print $langs->trans("TooMuchErrors", (count($arrayoferrors) - $nboferrors))."<br>";
-                    break;
-                }
-                print '* '.$langs->trans("Line").' '.$key.'<br>';
-                foreach ($val as $i => $err)
-                {
-                    print ' &nbsp; &nbsp; > '.$err['lib'].'<br>';
-                }
-            }
-            print '</td></tr></table>';
-            print '<br>';
-        }
+		// Show Errors
+		//var_dump($arrayoferrors);
+		if (count($arrayoferrors))
+		{
+			print img_error().' <b>'.$langs->trans("ErrorsOnXLines", count($arrayoferrors)).'</b><br>';
+			print '<table width="100%" class="border"><tr><td>';
+			foreach ($arrayoferrors as $key => $val)
+			{
+				$nboferrors++;
+				if ($nboferrors > $maxnboferrors)
+				{
+					print $langs->trans("TooMuchErrors", (count($arrayoferrors) - $nboferrors))."<br>";
+					break;
+				}
+				print '* '.$langs->trans("Line").' '.$key.'<br>';
+				foreach ($val as $i => $err)
+				{
+					print ' &nbsp; &nbsp; > '.$err['lib'].'<br>';
+				}
+			}
+			print '</td></tr></table>';
+			print '<br>';
+		}
 
-        // Show Warnings
-        //var_dump($arrayoferrors);
-        if (count($arrayofwarnings))
-        {
-            print img_warning().' <b>'.$langs->trans("WarningsOnXLines", count($arrayofwarnings)).'</b><br>';
-            print '<table width="100%" class="border"><tr><td>';
-            foreach ($arrayofwarnings as $key => $val)
-            {
-                $nbofwarnings++;
-                if ($nbofwarnings > $maxnbofwarnings)
-                {
-                    print $langs->trans("TooMuchWarnings", (count($arrayofwarnings) - $nbofwarnings))."<br>";
-                    break;
-                }
-                print ' * '.$langs->trans("Line").' '.$key.'<br>';
-                foreach ($val as $i => $err)
-                {
-                    print ' &nbsp; &nbsp; > '.$err['lib'].'<br>';
-                }
-            }
-            print '</td></tr></table>';
-            print '<br>';
-        }
+		// Show Warnings
+		//var_dump($arrayoferrors);
+		if (count($arrayofwarnings))
+		{
+			print img_warning().' <b>'.$langs->trans("WarningsOnXLines", count($arrayofwarnings)).'</b><br>';
+			print '<table width="100%" class="border"><tr><td>';
+			foreach ($arrayofwarnings as $key => $val)
+			{
+				$nbofwarnings++;
+				if ($nbofwarnings > $maxnbofwarnings)
+				{
+					print $langs->trans("TooMuchWarnings", (count($arrayofwarnings) - $nbofwarnings))."<br>";
+					break;
+				}
+				print ' * '.$langs->trans("Line").' '.$key.'<br>';
+				foreach ($val as $i => $err)
+				{
+					print ' &nbsp; &nbsp; > '.$err['lib'].'<br>';
+				}
+			}
+			print '</td></tr></table>';
+			print '<br>';
+		}
 
-        // Show import id
-        $importid = dol_print_date(dol_now(), '%Y%m%d%H%M%S');
+		// Show import id
+		$importid = dol_print_date(dol_now(), '%Y%m%d%H%M%S');
 
-        print '<div class="center">';
-        print '<span class="opacitymedium">'.$langs->trans("NowClickToRunTheImport", $langs->transnoentitiesnoconv("RunImportFile")).'</span><br>';
-        if (empty($nboferrors)) print $langs->trans("DataLoadedWithId", $importid).'<br>';
-        print '</div>';
+		print '<div class="center">';
+		print '<span class="opacitymedium">'.$langs->trans("NowClickToRunTheImport", $langs->transnoentitiesnoconv("RunImportFile")).'</span><br>';
+		if (empty($nboferrors)) print $langs->trans("DataLoadedWithId", $importid).'<br>';
+		print '</div>';
 
-        print '<br>';
+		print '<br>';
 
-        // Actions
-        print '<div class="center">';
-        if ($user->rights->import->run)
-        {
-            if (empty($nboferrors))
-            {
-                print '<a class="butAction" href="'.DOL_URL_ROOT.'/imports/import.php?leftmenu=import&step=6&importid='.$importid.$param.'">'.$langs->trans("RunImportFile").'</a>';
-            } else {
-                //print '<input type="submit" class="butAction" value="'.dol_escape_htmltag($langs->trans("RunSimulateImportFile")).'">';
+		// Actions
+		print '<div class="center">';
+		if ($user->rights->import->run)
+		{
+			if (empty($nboferrors))
+			{
+				print '<a class="butAction" href="'.DOL_URL_ROOT.'/imports/import.php?leftmenu=import&step=6&importid='.$importid.$param.'">'.$langs->trans("RunImportFile").'</a>';
+			} else {
+				//print '<input type="submit" class="butAction" value="'.dol_escape_htmltag($langs->trans("RunSimulateImportFile")).'">';
 
-                print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("CorrectErrorBeforeRunningImport")).'">'.$langs->trans("RunImportFile").'</a>';
-            }
-        } else {
-            print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("RunSimulateImportFile").'</a>';
+				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("CorrectErrorBeforeRunningImport")).'">'.$langs->trans("RunImportFile").'</a>';
+			}
+		} else {
+			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("RunSimulateImportFile").'</a>';
 
-            print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("RunImportFile").'</a>';
-        }
-        print '</div>';
-    }
+			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("RunImportFile").'</a>';
+		}
+		print '</div>';
+	}
 
-    print '</form>';
+	print '</form>';
 }
 
 
@@ -1619,8 +1697,8 @@ if ($step == 6 && $datatoimport)
 	require_once $dir.$file;
 	$obj = new $classname($db, $datatoimport);
 	if ($model == 'csv') {
-	    $obj->separator = $separator;
-	    $obj->enclosure = $enclosure;
+		$obj->separator = $separator;
+		$obj->enclosure = $enclosure;
 	}
 
 	// Load source fields in input file
@@ -1650,9 +1728,9 @@ if ($step == 6 && $datatoimport)
 
 	llxHeader('', $langs->trans("NewImport"), 'EN:Module_Imports_En|FR:Module_Imports|ES:M&oacute;dulo_Importaciones');
 
-    $head = import_prepare_head($param, 6);
+	$head = import_prepare_head($param, 6);
 
-	dol_fiche_head($head, 'step6', $langs->trans("NewImport"), -1);
+	print dol_get_fiche_head($head, 'step6', $langs->trans("NewImport"), -1);
 
 	print '<div class="underbanner clearboth"></div>';
 	print '<div class="fichecenter">';
@@ -1671,14 +1749,15 @@ if ($step == 6 && $datatoimport)
 	// Lot de donnees a importer
 	print '<tr><td>'.$langs->trans("DatasetToImport").'</td>';
 	print '<td>';
-	print img_object($objimport->array_import_module[0]['module']->getName(), $objimport->array_import_icon[0]).' ';
+	$entity = preg_replace('/:.*$/', '', $objimport->array_import_icon[0]);
+	$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+	print img_object($objimport->array_import_module[0]['module']->getName(), $entityicon).' ';
 	print $objimport->array_import_label[0];
 	print '</td></tr>';
 
 	print '</table>';
 	print '</div>';
 
-
 	print load_fiche_titre($langs->trans("InformationOnSourceFile"), '', '');
 
 	print '<div class="underbanner clearboth"></div>';
@@ -1688,29 +1767,29 @@ if ($step == 6 && $datatoimport)
 	// Source file format
 	print '<tr><td class="titlefield">'.$langs->trans("SourceFileFormat").'</td>';
 	print '<td>';
-    $text = $objmodelimport->getDriverDescForKey($format);
-    print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format), $text);
+	$text = $objmodelimport->getDriverDescForKey($format);
+	print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format), $text);
 	print '</td></tr>';
 
 	// Separator and enclosure
 	if ($model == 'csv') {
-	    print '<tr><td>'.$langs->trans("CsvOptions").'</td>';
-	    print '<td>';
-	    print $langs->trans("Separator").' : ';
-	    print htmlentities($separator);
-	    print '&nbsp;&nbsp;&nbsp;&nbsp;'.$langs->trans("Enclosure").' : ';
-	    print htmlentities($enclosure);
-	    print '</td></tr>';
+		print '<tr><td>'.$langs->trans("CsvOptions").'</td>';
+		print '<td>';
+		print $langs->trans("Separator").' : ';
+		print htmlentities($separator);
+		print '&nbsp;&nbsp;&nbsp;&nbsp;'.$langs->trans("Enclosure").' : ';
+		print htmlentities($enclosure);
+		print '</td></tr>';
 	}
 
 	// File to import
 	print '<tr><td>'.$langs->trans("FileToImport").'</td>';
 	print '<td>';
 	$modulepart = 'import';
-    $relativepath = GETPOST('filetoimport');
-    print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&file='.urlencode($relativepath).'&step=4'.$param.'" target="_blank">';
-    print $filetoimport;
-    print '</a>';
+	$relativepath = GETPOST('filetoimport');
+	print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&file='.urlencode($relativepath).'&step=4'.$param.'" target="_blank">';
+	print $filetoimport;
+	print '</a>';
 	print '</td></tr>';
 
 	// Nb of fields
@@ -1731,7 +1810,7 @@ if ($step == 6 && $datatoimport)
 	print '<tr><td>';
 	print $langs->trans("EndAtLineNb");
 	print '</td><td>';
-    print '<input type="text" size="4" name="endatlinenb" disabled="disabled" value="'.$endatlinenb.'">';
+	print '<input type="text" size="4" name="endatlinenb" disabled="disabled" value="'.$endatlinenb.'">';
 	print '</td></tr>';
 
 	print '</table>';
@@ -1824,8 +1903,8 @@ if ($step == 6 && $datatoimport)
 	$result = $obj->import_open_file($pathfile, $langs);
 	if ($result > 0)
 	{
-        global $tablewithentity_cache;
-        $tablewithentity_cache = array();
+		global $tablewithentity_cache;
+		$tablewithentity_cache = array();
 		$sourcelinenb = 0; $endoffile = 0;
 
 		while ($sourcelinenb < $nboflines && !$endoffile)
@@ -1856,30 +1935,30 @@ if ($step == 6 && $datatoimport)
 
 	if (count($arrayoferrors) > 0) $db->rollback(); // We force rollback because this was errors.
 	else {
-	    $error = 0;
+		$error = 0;
 
 		// Run the sql after import if defined
-	    //var_dump($objimport->array_import_run_sql_after[0]);
-	    if (!empty($objimport->array_import_run_sql_after[0]) && is_array($objimport->array_import_run_sql_after[0]))
-	    {
-	        $i = 0;
-	        foreach ($objimport->array_import_run_sql_after[0] as $sqlafterimport)
-	        {
-	            $i++;
-	            $resqlafterimport = $db->query($sqlafterimport);
-	            if (!$resqlafterimport)
-	            {
-			        $arrayoferrors['none'][] = array('lib'=>$langs->trans("Error running final request: ".$sqlafterimport));
-	                $error++;
-	            }
-	        }
-	    }
+		//var_dump($objimport->array_import_run_sql_after[0]);
+		if (!empty($objimport->array_import_run_sql_after[0]) && is_array($objimport->array_import_run_sql_after[0]))
+		{
+			$i = 0;
+			foreach ($objimport->array_import_run_sql_after[0] as $sqlafterimport)
+			{
+				$i++;
+				$resqlafterimport = $db->query($sqlafterimport);
+				if (!$resqlafterimport)
+				{
+					$arrayoferrors['none'][] = array('lib'=>$langs->trans("Error running final request: ".$sqlafterimport));
+					$error++;
+				}
+			}
+		}
 
-	    if (!$error) $db->commit(); // We can commit if no errors.
-	    else $db->rollback();
+		if (!$error) $db->commit(); // We can commit if no errors.
+		else $db->rollback();
 	}
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	// Show result
@@ -1918,17 +1997,17 @@ function show_elem($fieldssource, $pos, $key, $var, $nostyle = '')
 
 	$height = '24px';
 
-    if ($key == 'none') {
-        //stop multiple duplicate ids with no number
-        print "\n\n<!-- Box_no-key start-->\n";
-        print '<div class="box boximport" style="padding:0;">'."\n";
-        print '<table summary="boxtable_no-key" width="100%" class="nobordernopadding">'."\n";
-    } else {
-        print "\n\n<!-- Box ".$pos." start -->\n";
-        print '<div class="box boximport" style="padding: 0;" id="boxto_'.$pos.'">'."\n";
+	if ($key == 'none') {
+		//stop multiple duplicate ids with no number
+		print "\n\n<!-- Box_no-key start-->\n";
+		print '<div class="box boximport" style="padding:0;">'."\n";
+		print '<table summary="boxtable_no-key" width="100%" class="nobordernopadding">'."\n";
+	} else {
+		print "\n\n<!-- Box ".$pos." start -->\n";
+		print '<div class="box boximport" style="padding: 0;" id="boxto_'.$pos.'">'."\n";
 
-        print '<table summary="boxtable'.$pos.'" width="100%" class="nobordernopadding">'."\n";
-    }
+		print '<table summary="boxtable'.$pos.'" width="100%" class="nobordernopadding">'."\n";
+	}
 
 	if ($pos && $pos > count($fieldssource))	// No fields
 	{
@@ -1962,8 +2041,8 @@ function show_elem($fieldssource, $pos, $key, $var, $nostyle = '')
 		$example = $fieldssource[$pos]['example1'];
 		if ($example)
 		{
-		    if (!utf8_check($example)) $example = utf8_encode($example);
-		    print ' (<i>'.$example.'</i>)';
+			if (!utf8_check($example)) $example = utf8_encode($example);
+			print ' (<i>'.$example.'</i>)';
 		}
 		print '</td>';
 		print '</tr>';
diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php
index bc68b53cfd0..4c556325b05 100644
--- a/htdocs/imports/index.php
+++ b/htdocs/imports/index.php
@@ -51,7 +51,7 @@ print '<br>';
 print '<div class="center">';
 if (count($import->array_import_code))
 {
-    print dolGetButtonTitle($langs->trans('NewImport'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/imports/import.php?leftmenu=import');
+	print dolGetButtonTitle($langs->trans('NewImport'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/imports/import.php?leftmenu=import');
 }
 print '</div>';
 print '<br>';
diff --git a/htdocs/includes/mike42/escpos-php/.gitignore b/htdocs/includes/mike42/escpos-php/.gitignore
index 8632f891ad4..2b6e1a8d17c 100644
--- a/htdocs/includes/mike42/escpos-php/.gitignore
+++ b/htdocs/includes/mike42/escpos-php/.gitignore
@@ -4,9 +4,7 @@
 .buildpath
 
 # doxygen files
-doc/html
-doc/latex
-doc/doxygen_sqlite3.db
+doc
 
 # composer files
 vendor/
diff --git a/htdocs/includes/mike42/escpos-php/autoload.php b/htdocs/includes/mike42/escpos-php/autoload.php
index 47ed7d9e9c3..7779486b824 100644
--- a/htdocs/includes/mike42/escpos-php/autoload.php
+++ b/htdocs/includes/mike42/escpos-php/autoload.php
@@ -1,26 +1,26 @@
 <?php
 /**
  * Users who do not have 'composer' to manage dependencies, include this
- * file to provide auto-loading of the classes in this library.
+ * file to provide auto-loading of the classes in this library. 
  */
-spl_autoload_register( function ($class) {
+spl_autoload_register ( function ($class) {
 	/*
 	 * PSR-4 autoloader, based on PHP Framework Interop Group snippet (Under MIT License.)
 	 * https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-4-autoloader-examples.md
 	 */
 	$prefix = "Mike42\\";
 	$base_dir = __DIR__ . "/src/Mike42/";
-
+	
 	/* Only continue for classes in this namespace */
-	$len = strlen($prefix);
-	if (strncmp($prefix, $class, $len) !== 0) {
+	$len = strlen ( $prefix );
+	if (strncmp ( $prefix, $class, $len ) !== 0) {
 		return;
 	}
-
+	
 	/* Require the file if it exists */
-	$relative_class = substr($class, $len);
-	$file = $base_dir . str_replace('\\', '/', $relative_class) . '.php';
-	if (file_exists($file)) {
+	$relative_class = substr ( $class, $len );
+	$file = $base_dir . str_replace ( '\\', '/', $relative_class ) . '.php';
+	if (file_exists ( $file )) {
 		require $file;
 	}
 } );
diff --git a/htdocs/includes/mike42/escpos-php/doc/FAQ.md b/htdocs/includes/mike42/escpos-php/doc/FAQ.md
deleted file mode 100644
index 6b7a6247bca..00000000000
--- a/htdocs/includes/mike42/escpos-php/doc/FAQ.md
+++ /dev/null
@@ -1,142 +0,0 @@
-# Frequently Asked Questions (FAQ)
-
-## Can I print to File Format X with this?
-
-If you are trying to generate XPS, PDF or DOCX or HTML files from PHP, then you are most likely in the wrong place.
-
-The purpose of this driver it to generate binary ESC/POS code, which is understood by many embedded thermal receipt and impact printers.
-
-## I have Printer X. Can I use this driver?
-
-If the printer understands ESC/POS, and you know how to get raw binary data to it, then yes. Otherwise, no.
-
-The [list of printers that are known to work](https://github.com/mike42/escpos-php/blob/development/README.md#printers) is crowd-sourced. We appreciate it when developers try out the driver, then [file information on the bug tracker](https://github.com/mike42/escpos-php/issues/new) with some information about which features worked on their model of printer.
-
-To see how well your printer works, first check that it supports ESC/POS, then begin by attempting to send the text "Hello World" to your printer on the command-line, from the computer that will run PHP.
-
-Once you solve this, [try to do the same from PHP](https://github.com/mike42/escpos-php/blob/development/README.md#basic-usage) using the default profile. Further details are in the [README](https://github.com/mike42/escpos-php/blob/development/README.md) file.
-
-## Can you add support for Printer X?
-
-Features vary between printers, so we collaborate on an ESC/POS printer compatibility database to collect known differences: [receipt-print-hq/escpos-printer-db](https://github.com/receipt-print-hq/escpos-printer-db).
-
-If you encounter garbage output when you try to print images or special characters, then please submit a test page and a link to vendor documentation to the `escpos-printer-db` project, so that support can be improved for future versions.
-
-## I have a printer that does not understand ESC/POS. Can I use this driver?
-
-No. The purpose of this driver it to generate binary ESC/POS code. If your printer doesn't understand that, then this code wont be much use to you.
-
-Some printers do have an emulation mode for ESC/POS. The vendor docs will tell if this is the case, and how to enable it.
-
-## Why do I get this error when I try to print?
-
-Start by testing that you can send text to your printer outside of escpos-php. The examples linked to in the README are commented with some commands to get you started.
-
-Generally, initial setup problems seem to have one of these causes:
-
-1. You are writing to the wrong place. Writing to `LPT1` does not output to parallel port on Linux, and `/dev/ttyS0` is not a serial printer on Windows.
-2. The printer has not been set up to accept printing the way you expect. This means permissions on Linux, network printers being configured, and shared printers having user accounts and firewalls set up correctly on the print server.
-3. Your printer actually doesn't work (rare but possible).
-
-To be clear, these are not escpos-php issues: No amount of PHP code can set up your printer for you. Instead, the driver relies on developers determining how their setup is going to work before using a connector to transport data to their printer.
-
-Once you have a working command to send text to your printer (from the PHP server), you are ready to use escpos-php. You can try to use a PrintConnector now, based on your operating system and printer interface. A table is located in the README to help you select the right one.
-
-The connectors are-
-
-- `FilePrintConnector` and `NetworkPrintConnector` directly use files or network sockets.
-- `WindowsPrintConnector` and `CupsPrintConnector` tie in with Windows and Unix system printing.
-- `DummyPrintConnector` does not connect to a real printer, and can be used to save ESC/POS receipts to a database, for example.
-
-At this point, you might find that the way you would like to print is not supported by escpos-php. You can post your printing command as a feature request on the issue tracker.
-
-Lastly, you may run in to the final common trap:
-
-4. Your PHP is not running with the same sort of permissions as your login account. Again, no amount of PHP code can fix this. For example, on LAMP, your `www-data` user needs to be in the `lp` group, while on WAMP, `Local Service` account may run in to problems. SELinux and firewalls are also worth a look.
-
-When printing fails, you can expect a PHP Exception that explains what went wrong. They are all clues:
-
-- `Warning: copy(\\pc\printer): failed to open stream: Permission denied`
-- `/dev/usb/lp0: Permission denied`
-- `User name or password is incorrect`
-
-Ensure that while you are developing, you configure PHP to show error messages, so that you can see these problems.
-
-Please file a bug if you think that there is a specific situation which escpos-php could provide better error messages for.
-
-## Can I print over the network?
-
-Certainly, as long as your printer is available over the network.
-
-- `NetworkPrintConnector` will speak directly to an Ethernet-connected printer on port 9100.
-
-For USB or Serial printers, you need to install the printer on a computer and then share it, so that it becomes network-accessible.
-
-- `WindowsPrintConnector` will connect to Windows shared printers from Windows or Linux (Linux users will need Samba).
-- `CupsPrintConnector` will connect to CUPS-shared printers from Linux or Mac.
-
-Always start by testing your shared printer setup outside of escpos-php. The examples linked to in the README are commented with some example commands to get you started. Typically, networks, firewalls and permissions need to be set up.
-
-Once you have a working command to send text to your printer (from the PHP server), you are ready to use escpos-php.
-
-If you have any issues at this stage, please ask on the issue tracker, and include the commands that you used to verify your setup.
-
-## Can I print from my server on the Internet?
-
-Since PHP is a server-side language, escpos-php is a server-side print library. The driver is able to transport data between a server and a printer in a few different ways, all of them server-side. For example, you may print to a USB printer *connected to the server running PHP*, or an Ethernet printer *on a network accessible to the server*.
-
-Many developers dream of having an application that is hosted on the public Internet, with POS terminals accessing it, and printing via a web browser. Because the webserver cannot see the printer in this sort of setup, a server-side print driver is not much use.
-
-Because of this, there are no cut-and-paste recipes available, but here are two top-level approaches you could take:
-
-1. Architect your application so that the server can see your printer
-2. Use an application which runs client-side to deliver print data instead
-
-### Option 1: Allow the server to print
-
-Server-side printing is viable if the server can get to the printer. Here are some ways it could work:
-
-- Run your server on the LAN instead, and read the section above about printing over the network
-- Set up a VPN so that your cloud-hosted server can also access the LAN
-- Expose the printer via some other secure tunnel to the server, via SSH or TLS
-
-Please do your own research to determine how these may apply to your setup- the escpos-php issue tracker is not a place where you should be requesting network support.
-
-### Option 2: Use client software to print
-
-If you aren't able to set up some network infrastructure to implement the above, then you cannot use a server-side print driver.
-
-Here are some browser-based printing tools which you may like to consider instead.
-
-- Use system printing with a vendor driver, and some good `@media print` CSS
-- [Chrome Raw Print](https://github.com/receipt-print-hq/chrome-raw-print) app
-- [qz](https://qz.io/)
-- [ePOS-Device SDK for JavaScript](https://reference.epson-biz.com/modules/ref_epos_device_js_en/index.php?content_id=139). Requires network interface card that supports ePOS (UB-E04/R04)
-
-Please direct queries about client-side printing products to the appropriate project.
-
-## Why is image printing slow?
-
-Three things tend to slow down the image processing:
-
-1. Slow PHP code
-2. Data link
-3. The printer itself
-
-First, ensure you have the Imagick plugin loaded. The driver will avoid a slower image processing implementation once you've got it.
-
-Next, connect over a faster interface. Serial printers have a low bit-rate, and the printer spends a lot of time waiting for data. If you have USB or Ethernet, then use it (note: storing graphics to the printer memory is not currently implemented).
-
-Lastly, the printer will go faster if you use less pixels. Since images are two-dimensional, scaling down by 50% removes 75% of the pixels. The driver can then print at a half the density, so that your lower resolution image appears the same size when printed.
-
-## How can I get the status of the printer?
-
-This feature is not implemented, but a solution for some Epson printers is planned.
-
-Only `FilePrintConnector` or `NetworkPrintConnector` will support reading from the printer, ensure that you migrate to those if you would like these features.
-
-## How do I produce this complex layout?
-
-ESC/POS "page mode" is not currently supported, which would allow some printers to render some more complex layouts natively
-
-Since the output is raster anyway, it is suggested that you render your output to an image and print that instead. The driver supports PDF printing via Imagick, and an example that uses `wkhtmltoimage` is available in the repository.
diff --git a/htdocs/includes/mike42/escpos-php/doc/Makefile b/htdocs/includes/mike42/escpos-php/doc/Makefile
deleted file mode 100644
index 4e01c2ac0a1..00000000000
--- a/htdocs/includes/mike42/escpos-php/doc/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-html: escpos.doxyfile
-	# Compile
-	doxygen escpos.doxyfile
-	# Filter out warnings on README.md- doxygen cannot handle image links that
-	# are used there: [![Caption](https://example.com/target)](https://example.com/image)
-	sed -i '/README.md\:/d' warnings.log
-	# Show warnings log
-	cat warnings.log
-	# Return failure if there were any doc warnings
-	[ ! -s warnings.log ]
-
-latex: html
-	# Do nothing
-
-xml: html
-	xsltproc xml/combine.xslt xml/index.xml > all.xml
-
-clean:
-	rm --preserve-root -Rf html latex xml doxygen_sqlite3.db all.xml warnings.log
-
diff --git a/htdocs/includes/mike42/escpos-php/doc/escpos.doxyfile b/htdocs/includes/mike42/escpos-php/doc/escpos.doxyfile
deleted file mode 100644
index 0c48656e15b..00000000000
--- a/htdocs/includes/mike42/escpos-php/doc/escpos.doxyfile
+++ /dev/null
@@ -1,2352 +0,0 @@
-# Doxyfile 1.8.8
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a double hash (##) is considered a comment and is placed in
-# front of the TAG it is preceding.
-#
-# All text after a single hash (#) is considered a comment and will be ignored.
-# The format is:
-# TAG = value [value, ...]
-# For lists, items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (\" \").
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all text
-# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
-# for the list of possible encodings.
-# The default value is: UTF-8.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
-# double-quotes, unless you are using Doxywizard) that should identify the
-# project for which the documentation is generated. This name is used in the
-# title of most generated pages and in a few other places.
-# The default value is: My Project.
-
-PROJECT_NAME           = "escpos-php"
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
-# could be handy for archiving the generated documentation or if some version
-# control system is used.
-
-PROJECT_NUMBER         =
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer a
-# quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF          =
-
-# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
-# the documentation. The maximum height of the logo should not exceed 55 pixels
-# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
-# to the output directory.
-
-PROJECT_LOGO           = ../example/resources/escpos-php-small.png
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
-# into which the generated documentation will be written. If a relative path is
-# entered, it will be relative to the location where doxygen was started. If
-# left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       =
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
-# option can be useful when feeding doxygen a huge amount of source files, where
-# putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
-# The default value is: NO.
-
-CREATE_SUBDIRS         = NO
-
-# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
-# characters to appear in the names of generated files. If set to NO, non-ASCII
-# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
-# U+3044.
-# The default value is: NO.
-
-ALLOW_UNICODE_NAMES    = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
-# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
-# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
-# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
-# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
-# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
-# Ukrainian and Vietnamese.
-# The default value is: English.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
-# descriptions after the members that are listed in the file and class
-# documentation (similar to Javadoc). Set to NO to disable this.
-# The default value is: YES.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
-# description of a member or function before the detailed description
-#
-# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-# The default value is: YES.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator that is
-# used to form the text in various listings. Each string in this list, if found
-# as the leading text of the brief description, will be stripped from the text
-# and the result, after processing the whole list, is used as the annotated
-# text. Otherwise, the brief description is used as-is. If left blank, the
-# following values are used ($name is automatically replaced with the name of
-# the entity):The $name class, The $name widget, The $name file, is, provides,
-# specifies, contains, represents, a, an and the.
-
-ABBREVIATE_BRIEF       =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# doxygen will generate a detailed section even if there is only a brief
-# description.
-# The default value is: NO.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-# The default value is: NO.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
-# before files name in the file list and in the header files. If set to NO the
-# shortest path that makes the file name unique will be used
-# The default value is: YES.
-
-FULL_PATH_NAMES        = YES
-
-# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
-# Stripping is only done if one of the specified strings matches the left-hand
-# part of the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the path to
-# strip.
-#
-# Note that you can specify absolute paths here, but also relative paths, which
-# will be relative from the directory where doxygen is started.
-# This tag requires that the tag FULL_PATH_NAMES is set to YES.
-
-STRIP_FROM_PATH        =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
-# path mentioned in the documentation of a class, which tells the reader which
-# header file to include in order to use a class. If left blank only the name of
-# the header file containing the class definition is used. Otherwise one should
-# specify the list of include paths that are normally passed to the compiler
-# using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
-# less readable) file names. This can be useful is your file systems doesn't
-# support long names like on DOS, Mac, or CD-ROM.
-# The default value is: NO.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
-# first line (until the first dot) of a Javadoc-style comment as the brief
-# description. If set to NO, the Javadoc-style will behave just like regular Qt-
-# style comments (thus requiring an explicit @brief command for a brief
-# description.)
-# The default value is: NO.
-
-JAVADOC_AUTOBRIEF      = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
-# line (until the first dot) of a Qt-style comment as the brief description. If
-# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
-# requiring an explicit \brief command for a brief description.)
-# The default value is: NO.
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
-# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
-# a brief description. This used to be the default behavior. The new default is
-# to treat a multi-line C++ comment block as a detailed description. Set this
-# tag to YES if you prefer the old behavior instead.
-#
-# Note that setting this tag to YES also means that rational rose comments are
-# not recognized any more.
-# The default value is: NO.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
-# documentation from any documented member that it re-implements.
-# The default value is: YES.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
-# new page for each member. If set to NO, the documentation of a member will be
-# part of the file/class/namespace that contains it.
-# The default value is: NO.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
-# uses this value to replace tabs by spaces in code fragments.
-# Minimum value: 1, maximum value: 16, default value: 4.
-
-TAB_SIZE               = 4
-
-# This tag can be used to specify a number of aliases that act as commands in
-# the documentation. An alias has the form:
-# name=value
-# For example adding
-# "sideeffect=@par Side Effects:\n"
-# will allow you to put the command \sideeffect (or @sideeffect) in the
-# documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines.
-
-ALIASES                =
-
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C. For
-# instance, some of the names that are used will be different. The list of all
-# members will be omitted, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
-# Python sources only. Doxygen will then generate output that is more tailored
-# for that language. For instance, namespaces will be presented as packages,
-# qualified scopes will look different, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources. Doxygen will then generate output that is tailored for Fortran.
-# The default value is: NO.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for VHDL.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given
-# extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
-# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
-# Fortran. In the later case the parser tries to guess whether the code is fixed
-# or free formatted code, this is the default for Fortran type files), VHDL. For
-# instance to make doxygen treat .inc files as Fortran files (default is PHP),
-# and .f files as C (default is Fortran), use: inc=Fortran f=C.
-#
-# Note For files without extension you can use no_extension as a placeholder.
-#
-# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen.
-
-EXTENSION_MAPPING      =
-
-# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
-# according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you can
-# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
-# case of backward compatibilities issues.
-# The default value is: YES.
-
-MARKDOWN_SUPPORT       = YES
-
-# When enabled doxygen tries to link words that correspond to documented
-# classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by by putting a % sign in front of the word
-# or globally by setting AUTOLINK_SUPPORT to NO.
-# The default value is: YES.
-
-AUTOLINK_SUPPORT       = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should set this
-# tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string);
-# versus func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-# The default value is: NO.
-
-BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-# The default value is: NO.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
-# will parse them like normal C++ but will assume all classes use public instead
-# of private inheritance when no explicit protection keyword is present.
-# The default value is: NO.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES will make
-# doxygen to replace the get and set methods by a property in the documentation.
-# This will only work if the methods are indeed getting or setting a simple
-# type. If this is not the case, or you want to show the methods anyway, you
-# should set this option to NO.
-# The default value is: YES.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-# The default value is: NO.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# Set the SUBGROUPING tag to YES to allow class member groups of the same type
-# (for instance a group of public functions) to be put as a subgroup of that
-# type (e.g. under the Public Functions section). Set it to NO to prevent
-# subgrouping. Alternatively, this can be done per class using the
-# \nosubgrouping command.
-# The default value is: YES.
-
-SUBGROUPING            = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
-# are shown inside the group in which they are included (e.g. using \ingroup)
-# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
-# and RTF).
-#
-# Note that this feature does not work in combination with
-# SEPARATE_MEMBER_PAGES.
-# The default value is: NO.
-
-INLINE_GROUPED_CLASSES = NO
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
-# with only public data fields or simple typedef fields will be shown inline in
-# the documentation of the scope in which they are defined (i.e. file,
-# namespace, or group documentation), provided this scope is documented. If set
-# to NO, structs, classes, and unions are shown on a separate page (for HTML and
-# Man pages) or section (for LaTeX and RTF).
-# The default value is: NO.
-
-INLINE_SIMPLE_STRUCTS  = NO
-
-# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
-# enum is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically be
-# useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-# The default value is: NO.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
-# cache is used to resolve symbols given their name and scope. Since this can be
-# an expensive process and often the same symbol appears multiple times in the
-# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
-# doxygen will become slower. If the cache is too large, memory is wasted. The
-# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
-# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
-# symbols. At the end of a run doxygen will report the cache usage and suggest
-# the optimal cache size from a speed point of view.
-# Minimum value: 0, maximum value: 9, default value: 0.
-
-LOOKUP_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available. Private
-# class members and static file members will be hidden unless the
-# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
-# Note: This will also disable the warnings about undocumented members that are
-# normally produced when WARNINGS is set to YES.
-# The default value is: NO.
-
-EXTRACT_ALL            = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
-# be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
-# scope will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PACKAGE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file will be
-# included in the documentation.
-# The default value is: NO.
-
-EXTRACT_STATIC         = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
-# locally in source files will be included in the documentation. If set to NO
-# only classes defined in header files are included. Does not have any effect
-# for Java sources.
-# The default value is: YES.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local methods,
-# which are defined in the implementation section but not in the interface are
-# included in the documentation. If set to NO only methods in the interface are
-# included.
-# The default value is: NO.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base name of
-# the file that contains the anonymous namespace. By default anonymous namespace
-# are hidden.
-# The default value is: NO.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
-# undocumented members inside documented classes or files. If set to NO these
-# members will be included in the various overviews, but no documentation
-# section is generated. This option has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy. If set
-# to NO these classes will be included in the various overviews. This option has
-# no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO these declarations will be
-# included in the documentation.
-# The default value is: NO.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
-# documentation blocks found inside the body of a function. If set to NO these
-# blocks will be appended to the function's detailed documentation block.
-# The default value is: NO.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation that is typed after a
-# \internal command is included. If the tag is set to NO then the documentation
-# will be excluded. Set it to YES to include the internal documentation.
-# The default value is: NO.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-# The default value is: system dependent.
-
-CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
-# their full class and namespace scopes in the documentation. If set to YES the
-# scope will be hidden.
-# The default value is: NO.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
-# the files that are included by a file in the documentation of that file.
-# The default value is: YES.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
-# grouped member an include statement to the documentation, telling the reader
-# which file to include in order to use the member.
-# The default value is: NO.
-
-SHOW_GROUPED_MEMB_INC  = NO
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
-# files with double quotes in the documentation rather than with sharp brackets.
-# The default value is: NO.
-
-FORCE_LOCAL_INCLUDES   = NO
-
-# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
-# documentation for inline members.
-# The default value is: YES.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
-# (detailed) documentation of file and class members alphabetically by member
-# name. If set to NO the members will appear in declaration order.
-# The default value is: YES.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
-# descriptions of file, namespace and class members alphabetically by member
-# name. If set to NO the members will appear in declaration order. Note that
-# this will also influence the order of the classes in the class list.
-# The default value is: NO.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
-# (brief and detailed) documentation of class members so that constructors and
-# destructors are listed first. If set to NO the constructors will appear in the
-# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
-# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
-# member documentation.
-# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
-# detailed member documentation.
-# The default value is: NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
-# of group names into alphabetical order. If set to NO the group names will
-# appear in their defined order.
-# The default value is: NO.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
-# fully-qualified names, including namespaces. If set to NO, the class list will
-# be sorted only by class name, not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the alphabetical
-# list.
-# The default value is: NO.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
-# type resolution of all parameters of a function it will reject a match between
-# the prototype and the implementation of a member function even if there is
-# only one candidate or it is obvious which candidate to choose by doing a
-# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
-# accept a match between prototype and implementation in such cases.
-# The default value is: NO.
-
-STRICT_PROTO_MATCHING  = NO
-
-# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the
-# todo list. This list is created by putting \todo commands in the
-# documentation.
-# The default value is: YES.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the
-# test list. This list is created by putting \test commands in the
-# documentation.
-# The default value is: YES.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug
-# list. This list is created by putting \bug commands in the documentation.
-# The default value is: YES.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO)
-# the deprecated list. This list is created by putting \deprecated commands in
-# the documentation.
-# The default value is: YES.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional documentation
-# sections, marked by \if <section_label> ... \endif and \cond <section_label>
-# ... \endcond blocks.
-
-ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
-# initial value of a variable or macro / define can have for it to appear in the
-# documentation. If the initializer consists of more lines than specified here
-# it will be hidden. Use a value of 0 to hide initializers completely. The
-# appearance of the value of individual variables and macros / defines can be
-# controlled using \showinitializer or \hideinitializer command in the
-# documentation regardless of this setting.
-# Minimum value: 0, maximum value: 10000, default value: 30.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
-# the bottom of the documentation of classes and structs. If set to YES the list
-# will mention the files that were used to generate the documentation.
-# The default value is: YES.
-
-SHOW_USED_FILES        = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
-# will remove the Files entry from the Quick Index and from the Folder Tree View
-# (if specified).
-# The default value is: YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
-# page. This will remove the Namespaces entry from the Quick Index and from the
-# Folder Tree View (if specified).
-# The default value is: YES.
-
-SHOW_NAMESPACES        = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command command input-file, where command is the value of the
-# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
-# by doxygen. Whatever the program writes to standard output is used as the file
-# version. For an example see the documentation.
-
-FILE_VERSION_FILTER    =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option. You can
-# optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
-#
-# Note that if you run doxygen from a directory containing a file called
-# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
-# tag is left empty.
-
-LAYOUT_FILE            =
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
-# the reference definitions. This must be a list of .bib files. The .bib
-# extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
-# For LaTeX the style of the bibliography can be controlled using
-# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
-# search path. See also \cite for info how to create references.
-
-CITE_BIB_FILES         =
-
-#---------------------------------------------------------------------------
-# Configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated to
-# standard output by doxygen. If QUIET is set to YES this implies that the
-# messages are off.
-# The default value is: NO.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
-# this implies that the warnings are on.
-#
-# Tip: Turn warnings on while writing the documentation.
-# The default value is: YES.
-
-WARNINGS               = YES
-
-# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate
-# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
-# will automatically be disabled.
-# The default value is: YES.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
-# The default value is: YES.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
-# are documented, but have no documentation for their parameters or return
-# value. If set to NO doxygen will only warn about wrong or incomplete parameter
-# documentation, but not about the absence of documentation.
-# The default value is: NO.
-
-WARN_NO_PARAMDOC       = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that doxygen
-# can produce. The string should contain the $file, $line, and $text tags, which
-# will be replaced by the file and line number from which the warning originated
-# and the warning text. Optionally the format may contain $version, which will
-# be replaced by the version of the file (if it could be obtained via
-# FILE_VERSION_FILTER)
-# The default value is: $file:$line: $text.
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning and error
-# messages should be written. If left blank the output is written to standard
-# error (stderr).
-
-WARN_LOGFILE           = warnings.log
-
-#---------------------------------------------------------------------------
-# Configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag is used to specify the files and/or directories that contain
-# documented source files. You may enter file names like myfile.cpp or
-# directories like /usr/src/myproject. Separate the files or directories with
-# spaces.
-# Note: If this tag is empty the current directory is searched.
-
-INPUT                  = ../src ../README.md ./
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
-# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: http://www.gnu.org/software/libiconv) for the list of
-# possible encodings.
-# The default value is: UTF-8.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank the
-# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
-# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
-# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
-# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
-# *.qsf, *.as and *.js.
-
-FILE_PATTERNS          = *.php *.md
-
-# The RECURSIVE tag can be used to specify whether or not subdirectories should
-# be searched for input files as well.
-# The default value is: NO.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-#
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE                =
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-# The default value is: NO.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       =
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
-
-EXCLUDE_SYMBOLS        =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or directories
-# that contain example code fragments that are included (see the \include
-# command).
-
-EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank all
-# files are included.
-
-EXAMPLE_PATTERNS       =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude commands
-# irrespective of the value of the RECURSIVE tag.
-# The default value is: NO.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or directories
-# that contain images that are to be included in the documentation (see the
-# \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command:
-#
-# <filter> <input-file>
-#
-# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
-# name of an input file. Doxygen will then use the output that the filter
-# program writes to standard output. If FILTER_PATTERNS is specified, this tag
-# will be ignored.
-#
-# Note that the filter must not add or remove lines; it is applied before the
-# code is scanned, but not when the output code is generated. If lines are added
-# or removed, the anchors will not be placed correctly.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form: pattern=filter
-# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
-# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
-# patterns match the file name, INPUT_FILTER is applied.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER ) will also be used to filter the input files that are used for
-# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
-# The default value is: NO.
-
-FILTER_SOURCE_FILES    = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
-# it is also possible to disable source filtering for a specific pattern using
-# *.ext= (so without naming a filter).
-# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
-
-FILTER_SOURCE_PATTERNS =
-
-# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
-# is part of the input, its contents will be placed on the main page
-# (index.html). This can be useful if you have a project on for instance GitHub
-# and want to reuse the introduction page also for the doxygen output.
-
-USE_MDFILE_AS_MAINPAGE = ../README.md
-
-#---------------------------------------------------------------------------
-# Configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
-# generated. Documented entities will be cross-referenced with these sources.
-#
-# Note: To get rid of all source code in the generated output, make sure that
-# also VERBATIM_HEADERS is set to NO.
-# The default value is: NO.
-
-SOURCE_BROWSER         = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
-# The default value is: NO.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
-# special comment blocks from generated source code fragments. Normal C, C++ and
-# Fortran comments will always remain visible.
-# The default value is: YES.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
-# The default value is: NO.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES then for each documented function
-# all documented entities called/used by that function will be listed.
-# The default value is: NO.
-
-REFERENCES_RELATION    = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
-# to YES, then the hyperlinks from functions in REFERENCES_RELATION and
-# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
-# link to the documentation.
-# The default value is: YES.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
-# source code will show a tooltip with additional information such as prototype,
-# brief description and links to the definition and documentation. Since this
-# will make the HTML file larger and loading of large files a bit slower, you
-# can opt to disable this feature.
-# The default value is: YES.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-SOURCE_TOOLTIPS        = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code will
-# point to the HTML generated by the htags(1) tool instead of doxygen built-in
-# source browser. The htags tool is part of GNU's global source tagging system
-# (see http://www.gnu.org/software/global/global.html). You will need version
-# 4.8.6 or higher.
-#
-# To use it do the following:
-# - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
-# - Make sure the INPUT points to the root of the source tree
-# - Run doxygen as normal
-#
-# Doxygen will invoke htags (and that will in turn invoke gtags), so these
-# tools must be available from the command line (i.e. in the search path).
-#
-# The result: instead of the source browser generated by doxygen, the links to
-# source code will now point to the output of htags.
-# The default value is: NO.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
-# verbatim copy of the header file for each class for which an include is
-# specified. Set to NO to disable this.
-# See also: Section \class.
-# The default value is: YES.
-
-VERBATIM_HEADERS       = YES
-
-# If the CLANG_ASSISTED_PARSING tag is set to YES, then doxygen will use the
-# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
-# cost of reduced performance. This can be particularly helpful with template
-# rich C++ code for which doxygen's built-in parser lacks the necessary type
-# information.
-# Note: The availability of this option depends on whether or not doxygen was
-# compiled with the --with-libclang option.
-# The default value is: NO.
-
-CLANG_ASSISTED_PARSING = NO
-
-# If clang assisted parsing is enabled you can provide the compiler with command
-# line options that you would normally use when invoking the compiler. Note that
-# the include paths will already be set by doxygen for the files and directories
-# specified with INPUT and INCLUDE_PATH.
-# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
-
-CLANG_OPTIONS          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
-# compounds will be generated. Enable this if the project contains a lot of
-# classes, structs, unions or interfaces.
-# The default value is: YES.
-
-ALPHABETICAL_INDEX     = YES
-
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output
-# The default value is: YES.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
-# generated HTML page (for example: .htm, .php, .asp).
-# The default value is: .html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
-# each generated HTML page. If the tag is left blank doxygen will generate a
-# standard header.
-#
-# To get valid HTML the header file that includes any scripts and style sheets
-# that doxygen needs, which is dependent on the configuration options used (e.g.
-# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
-# default header using
-# doxygen -w html new_header.html new_footer.html new_stylesheet.css
-# YourConfigFile
-# and then modify the file new_header.html. See also section "Doxygen usage"
-# for information on how to generate the default header that doxygen normally
-# uses.
-# Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of doxygen. For a description
-# of the possible markers and block names see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_HEADER            =
-
-# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
-# generated HTML page. If the tag is left blank doxygen will generate a standard
-# footer. See HTML_HEADER for more information on how to generate a default
-# footer and what special commands can be used inside the footer. See also
-# section "Doxygen usage" for information on how to generate the default footer
-# that doxygen normally uses.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FOOTER            =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
-# sheet that is used by each HTML page. It can be used to fine-tune the look of
-# the HTML output. If left blank doxygen will generate a default style sheet.
-# See also section "Doxygen usage" for information on how to generate the style
-# sheet that doxygen normally uses.
-# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
-# it is more robust and this tag (HTML_STYLESHEET) will in the future become
-# obsolete.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_STYLESHEET        =
-
-# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# cascading style sheets that are included after the standard style sheets
-# created by doxygen. Using this option one can overrule certain style aspects.
-# This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefor more robust against future updates.
-# Doxygen will copy the style sheet files to the output directory.
-# Note: The order of the extra stylesheet files is of importance (e.g. the last
-# stylesheet in the list overrules the setting of the previous ones in the
-# list). For an example see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_STYLESHEET  =
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
-# files will be copied as-is; there are no commands or markers available.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_FILES       =
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
-# will adjust the colors in the stylesheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
-# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
-# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
-# purple, and 360 is red again.
-# Minimum value: 0, maximum value: 359, default value: 220.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_HUE    = 220
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
-# value of 255 will produce the most vivid colors.
-# Minimum value: 0, maximum value: 255, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_SAT    = 100
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
-# luminance component of the colors in the HTML output. Values below 100
-# gradually make the output lighter, whereas values above 100 make the output
-# darker. The value divided by 100 is the actual gamma applied, so 80 represents
-# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
-# change the gamma.
-# Minimum value: 40, maximum value: 240, default value: 80.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_GAMMA  = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_SECTIONS  = NO
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
-# shown in the various tree structured indices initially; the user can expand
-# and collapse entries dynamically later on. Doxygen will expand the tree to
-# such a level that at most the specified number of entries are visible (unless
-# a fully collapsed tree already exceeds this amount). So setting the number of
-# entries 1 will produce a full collapsed tree by default. 0 is a special value
-# representing an infinite number of entries and will result in a full expanded
-# tree by default.
-# Minimum value: 0, maximum value: 9999, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files will be
-# generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: http://developer.apple.com/tools/xcode/), introduced with
-# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
-# Makefile in the HTML output directory. Running make will produce the docset in
-# that directory and running make install will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_DOCSET        = NO
-
-# This tag determines the name of the docset feed. A documentation feed provides
-# an umbrella under which multiple documentation sets from a single provider
-# (such as a company or product suite) can be grouped.
-# The default value is: Doxygen generated docs.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# This tag specifies a string that should uniquely identify the documentation
-# set bundle. This should be a reverse domain-name style string, e.g.
-# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
-# the documentation publisher. This should be a reverse domain-name style
-# string, e.g. com.mycompany.MyDocSet.documentation.
-# The default value is: org.doxygen.Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-
-# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
-# The default value is: Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_NAME  = Publisher
-
-# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
-# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
-# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
-# Windows.
-#
-# The HTML Help Workshop contains a compiler that can convert all HTML output
-# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
-# files are now used as the Windows 98 help format, and will replace the old
-# Windows help format (.hlp) on all Windows platforms in the future. Compressed
-# HTML files also contain an index, a table of contents, and you can search for
-# words in the documentation. The HTML workshop also contains a viewer for
-# compressed HTML files.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_HTMLHELP      = NO
-
-# The CHM_FILE tag can be used to specify the file name of the resulting .chm
-# file. You can add a path in front of the file if the result should not be
-# written to the html output directory.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_FILE               =
-
-# The HHC_LOCATION tag can be used to specify the location (absolute path
-# including file name) of the HTML help compiler ( hhc.exe). If non-empty
-# doxygen will try to run the HTML help compiler on the generated index.hhp.
-# The file has to be specified with full path.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-HHC_LOCATION           =
-
-# The GENERATE_CHI flag controls if a separate .chi index file is generated (
-# YES) or that it should be included in the master .chm file ( NO).
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-GENERATE_CHI           = NO
-
-# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc)
-# and project file content.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_INDEX_ENCODING     =
-
-# The BINARY_TOC flag controls whether a binary table of contents is generated (
-# YES) or a normal table of contents ( NO) in the .chm file. Furthermore it
-# enables the Previous and Next buttons.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members to
-# the table of contents of the HTML help documentation and to the tree view.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
-# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
-# (.qch) of the generated HTML documentation.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
-# the file name of the resulting .qch file. The path specified is relative to
-# the HTML output folder.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QCH_FILE               =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
-# Project output. For more information please see Qt Help Project / Namespace
-# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_NAMESPACE          = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
-# Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
-# folders).
-# The default value is: doc.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
-# filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_NAME   =
-
-# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_ATTRS  =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_SECT_FILTER_ATTRS  =
-
-# The QHG_LOCATION tag can be used to specify the location of Qt's
-# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
-# generated .qhp file.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHG_LOCATION           =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
-# generated, together with the HTML files, they form an Eclipse help plugin. To
-# install this plugin and make it available under the help contents menu in
-# Eclipse, the contents of the directory containing the HTML and XML files needs
-# to be copied into the plugins directory of eclipse. The name of the directory
-# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
-# After copying Eclipse needs to be restarted before the help appears.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the Eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have this
-# name. Each documentation set should have its own identifier.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
-
-ECLIPSE_DOC_ID         = org.doxygen.Project
-
-# If you want full control over the layout of the generated HTML pages it might
-# be necessary to disable the index and replace it with your own. The
-# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
-# of each HTML page. A value of NO enables the index and the value YES disables
-# it. Since the tabs in the index contain the same information as the navigation
-# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-DISABLE_INDEX          = NO
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information. If the tag
-# value is set to YES, a side panel will be generated containing a tree-like
-# index structure (just like the one that is generated for HTML Help). For this
-# to work a browser that supports JavaScript, DHTML, CSS and frames is required
-# (i.e. any modern browser). Windows users are probably better off using the
-# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_TREEVIEW      = NO
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
-# doxygen will group on one line in the generated HTML documentation.
-#
-# Note that a value of 0 will completely suppress the enum values from appearing
-# in the overview section.
-# Minimum value: 0, maximum value: 20, default value: 4.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
-# to set the initial width (in pixels) of the frame in which the tree is shown.
-# Minimum value: 0, maximum value: 1500, default value: 250.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-TREEVIEW_WIDTH         = 250
-
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to
-# external symbols imported via tag files in a separate window.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-EXT_LINKS_IN_WINDOW    = NO
-
-# Use this tag to change the font size of LaTeX formulas included as images in
-# the HTML documentation. When you change the font size after a successful
-# doxygen run you need to manually remove any form_*.png images from the HTML
-# output directory to force them to be regenerated.
-# Minimum value: 8, maximum value: 50, default value: 10.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_FONTSIZE       = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_TRANSPARENT    = YES
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
-# instead of using prerendered bitmaps. Use this if you do not have LaTeX
-# installed or if you want to formulas look prettier in the HTML output. When
-# enabled you may also need to install MathJax separately and configure the path
-# to it using the MATHJAX_RELPATH option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-USE_MATHJAX            = NO
-
-# When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/latest/output.html) for more details.
-# Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
-# The default value is: HTML-CSS.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_FORMAT         = HTML-CSS
-
-# When MathJax is enabled you need to specify the location relative to the HTML
-# output directory using the MATHJAX_RELPATH option. The destination directory
-# should contain the MathJax.js script. For instance, if the mathjax directory
-# is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
-# Content Delivery Network so you can quickly see the result without installing
-# MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from http://www.mathjax.org before deployment.
-# The default value is: http://cdn.mathjax.org/mathjax/latest.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
-# extension names that should be enabled during MathJax rendering. For example
-# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_EXTENSIONS     =
-
-# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
-# of code that will be used on startup of the MathJax code. See the MathJax site
-# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
-# example see the documentation.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_CODEFILE       =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
-# the HTML output. The underlying search engine uses javascript and DHTML and
-# should work on any modern browser. Note that when using HTML help
-# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
-# there is already a search function so this one should typically be disabled.
-# For large projects the javascript based search engine can be slow, then
-# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
-# search using the keyboard; to jump to the search box use <access key> + S
-# (what the <access key> is depends on the OS and browser, but it is typically
-# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
-# key> to jump into the search results window, the results can be navigated
-# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
-# the search. The filter options can be selected when the cursor is inside the
-# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
-# to select a filter and <Enter> or <escape> to activate or cancel the filter
-# option.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-SEARCHENGINE           = YES
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
-# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
-# setting. When disabled, doxygen will generate a PHP script for searching and
-# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
-# and searching needs to be provided by external tools. See the section
-# "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SERVER_BASED_SEARCH    = NO
-
-# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
-# script for searching. Instead the search results are written to an XML file
-# which needs to be processed by an external indexer. Doxygen will invoke an
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
-# search results.
-#
-# Doxygen ships with an example indexer ( doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/).
-#
-# See the section "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH        = NO
-
-# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-# which will return the search results when EXTERNAL_SEARCH is enabled.
-#
-# Doxygen ships with an example indexer ( doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/). See the section "External Indexing and
-# Searching" for details.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHENGINE_URL       =
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-# search data is written to a file for indexing by an external tool. With the
-# SEARCHDATA_FILE tag the name of this file can be specified.
-# The default file is: searchdata.xml.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHDATA_FILE        = searchdata.xml
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
-# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-# projects and redirect the results back to the right project.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH_ID     =
-
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-# projects other than the one defined by this configuration file, but that are
-# all added to the same external search index. Each project needs to have a
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
-# to a relative location where the documentation can be found. The format is:
-# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTRA_SEARCH_MAPPINGS  =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
-# The default value is: YES.
-
-GENERATE_LATEX         = YES
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked.
-#
-# Note that when enabling USE_PDFLATEX this option is only used for generating
-# bitmaps for formulas in the HTML output, but not in the Makefile that is
-# written to the output directory.
-# The default file is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
-# index for LaTeX.
-# The default file is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used by the
-# printer.
-# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
-# 14 inches) and executive (7.25 x 10.5 inches).
-# The default value is: a4.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PAPER_TYPE             = a4
-
-# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. To get the times font for
-# instance you can specify
-# EXTRA_PACKAGES=times
-# If left blank no extra packages will be included.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
-#
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empy string,
-# for the replacement values of the other commands the user is refered to
-# HTML_HEADER.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HEADER           =
-
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
-# LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_FOOTER           =
-
-# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the LATEX_OUTPUT output
-# directory. Note that the files will be copied as-is; there are no commands or
-# markers available.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_FILES      =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
-# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
-# contain links (just like the HTML output) instead of page references. This
-# makes the output suitable for online browsing using a PDF viewer.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PDF_HYPERLINKS         = YES
-
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES to get a
-# higher quality PDF documentation.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-USE_PDFLATEX           = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BATCHMODE        = NO
-
-# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
-# index chapters (such as File Index, Compound Index, etc.) in the output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HIDE_INDICES     = NO
-
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. See
-# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
-# The default value is: plain.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BIB_STYLE        = plain
-
-#---------------------------------------------------------------------------
-# Configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The
-# RTF output is optimized for Word 97 and may not look too pretty with other RTF
-# readers/editors.
-# The default value is: NO.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: rtf.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
-# contain hyperlink fields. The RTF file will contain links (just like the HTML
-# output) instead of page references. This makes the output suitable for online
-# browsing using Word or some other Word compatible readers that support those
-# fields.
-#
-# Note: WordPad (write) and others do not support links.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's config
-# file, i.e. a series of assignments. You only have to provide replacements,
-# missing definitions are set to their default value.
-#
-# See also section "Doxygen usage" for information on how to generate the
-# default style sheet that doxygen normally uses.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_EXTENSIONS_FILE    =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for
-# classes and files.
-# The default value is: NO.
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it. A directory man3 will be created inside the directory specified by
-# MAN_OUTPUT.
-# The default directory is: man.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to the generated
-# man pages. In case the manual section does not start with a number, the number
-# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
-# optional.
-# The default value is: .3.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_EXTENSION          = .3
-
-# The MAN_SUBDIR tag determines the name of the directory created within
-# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
-# MAN_EXTENSION with the initial . removed.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_SUBDIR             =
-
-# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
-# will generate one additional man file for each entity documented in the real
-# man page(s). These additional files only source the real man page, but without
-# them the man command would be unable to find the correct page.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that
-# captures the structure of the code including all documentation.
-# The default value is: NO.
-
-GENERATE_XML           = YES
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: xml.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_OUTPUT             = xml
-
-# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
-# listings (including syntax highlighting and cross-referencing information) to
-# the XML output. Note that enabling this will significantly increase the size
-# of the XML output.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the DOCBOOK output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files
-# that can be used to generate PDF.
-# The default value is: NO.
-
-GENERATE_DOCBOOK       = NO
-
-# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
-# front of it.
-# The default directory is: docbook.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_OUTPUT         = docbook
-
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
-#---------------------------------------------------------------------------
-# Configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen
-# Definitions (see http://autogen.sf.net) file that captures the structure of
-# the code including all documentation. Note that this feature is still
-# experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module
-# file that captures the structure of the code including all documentation.
-#
-# Note that this feature is still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary
-# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
-# output from the Perl module output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely
-# formatted so it can be parsed by a human reader. This is useful if you want to
-# understand what is going on. On the other hand, if this tag is set to NO the
-# size of the Perl module output will be much smaller and Perl will parse it
-# just the same.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file are
-# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
-# so different doxyrules.make files included by the same Makefile don't
-# overwrite each other's variables.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all
-# C-preprocessor directives found in the sources and include files.
-# The default value is: YES.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names
-# in the source code. If set to NO only conditional compilation will be
-# performed. Macro expansion can be done in a controlled way by setting
-# EXPAND_ONLY_PREDEF to YES.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
-# the macro expansion is limited to the macros specified with the PREDEFINED and
-# EXPAND_AS_DEFINED tags.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES the includes files in the
-# INCLUDE_PATH will be searched if a #include is found.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by the
-# preprocessor.
-# This tag requires that the tag SEARCH_INCLUDES is set to YES.
-
-INCLUDE_PATH           =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will be
-# used.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that are
-# defined before the preprocessor is started (similar to the -D option of e.g.
-# gcc). The argument of the tag is a list of macros of the form: name or
-# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
-# is assumed. To prevent a macro definition from being undefined via #undef or
-# recursively expanded use the := operator instead of the = operator.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-PREDEFINED             =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
-# tag can be used to specify a list of macro names that should be expanded. The
-# macro definition that is found in the sources will be used. Use the PREDEFINED
-# tag if you want to use a different macro definition that overrules the
-# definition found in the source code.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all references to function-like macros that are alone on a line, have
-# an all uppercase name, and do not end with a semicolon. Such function macros
-# are typically used for boiler-plate code, and will confuse the parser if not
-# removed.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES tag can be used to specify one or more tag files. For each tag
-# file the location of the external documentation should be added. The format of
-# a tag file without this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where loc1 and loc2 can be relative or absolute paths or URLs. See the
-# section "Linking to external documentation" for more information about the use
-# of tag files.
-# Note: Each tag file must have a unique name (where the name does NOT include
-# the path). If a tag file is not located in the directory in which doxygen is
-# run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
-# tag file that is based on the input files it reads. See section "Linking to
-# external documentation" for more information about the usage of tag files.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES all external class will be listed in the
-# class index. If set to NO only the inherited external classes will be listed.
-# The default value is: NO.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in
-# the modules index. If set to NO, only the current project's groups will be
-# listed.
-# The default value is: YES.
-
-EXTERNAL_GROUPS        = YES
-
-# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in
-# the related pages index. If set to NO, only the current project's pages will
-# be listed.
-# The default value is: YES.
-
-EXTERNAL_PAGES         = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see:
-# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            =
-
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-
-DIA_PATH               =
-
-# If set to YES, the inheritance and collaboration graphs will hide inheritance
-# and usage relations if the target is undocumented or is not a class.
-# The default value is: YES.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
-# Bell Labs. The other options in this section have no effect if this option is
-# set to NO
-# The default value is: YES.
-
-HAVE_DOT               = YES
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
-# to run in parallel. When set to 0 doxygen will base this on the number of
-# processors available in the system. You can set it explicitly to a value
-# larger than 0 to get control over the balance between CPU load and processing
-# speed.
-# Minimum value: 0, maximum value: 32, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_NUM_THREADS        = 0
-
-# When you want a differently looking font in the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTNAME           = Helvetica
-
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTPATH           =
-
-# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
-# graph for each documented class showing the direct and indirect implementation
-# dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LOOK               = NO
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
-# class node. If there are many fields or methods and many nodes the graph may
-# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
-# number of items for each type to make the size more manageable. Set this to 0
-# for no limit. Note that the threshold may be exceeded by 50% before the limit
-# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
-# but if the number exceeds 15, the total amount of fields shown is limited to
-# 10.
-# Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LIMIT_NUM_FIELDS   = 10
-
-# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
-# collaboration graphs will show the relations between templates and their
-# instances.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
-# YES then doxygen will generate a graph for each documented file showing the
-# direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDE_GRAPH          = YES
-
-# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
-# set to YES then doxygen will generate a graph for each documented file showing
-# the direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALL_GRAPH             = NO
-
-# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
-# hierarchy of all classes instead of a textual one.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
-# dependencies a directory has on other directories in a graphical way. The
-# dependency relations are determined by the #include relations between the
-# files in the directories.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot.
-# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
-# to make the SVG files visible in IE 9+ (other browsers do not have this
-# requirement).
-# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
-# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
-# gif:cairo:gd, gif:gd, gif:gd:gd and svg.
-# The default value is: png.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_IMAGE_FORMAT       = png
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-#
-# Note that this requires a modern browser other than Internet Explorer. Tested
-# and working are Firefox, Chrome, Safari, and Opera.
-# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
-# the SVG files visible. Older versions of IE do not have SVG support.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INTERACTIVE_SVG        = NO
-
-# The DOT_PATH tag can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the \dotfile
-# command).
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOTFILE_DIRS           =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
-
-MSCFILE_DIRS           =
-
-# The DIAFILE_DIRS tag can be used to specify one or more directories that
-# contain dia files that are included in the documentation (see the \diafile
-# command).
-
-DIAFILE_DIRS           =
-
-# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
-# path where java can find the plantuml.jar file. If left blank, it is assumed
-# PlantUML is not used or called during a preprocessing step. Doxygen will
-# generate a warning when it encounters a \startuml command in this case and
-# will not generate output for the diagram.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-PLANTUML_JAR_PATH      =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
-# that will be shown in the graph. If the number of nodes in a graph becomes
-# larger than this value, doxygen will truncate the graph, which is visualized
-# by representing a node as a red box. Note that doxygen if the number of direct
-# children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
-# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-# Minimum value: 0, maximum value: 10000, default value: 50.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
-# generated by dot. A depth value of 3 means that only nodes reachable from the
-# root by following a path via at most 3 edges will be shown. Nodes that lay
-# further from the root node will be omitted. Note that setting this option to 1
-# or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-# Minimum value: 0, maximum value: 1000, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10) support
-# this, this feature is disabled by default.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
-# explaining the meaning of the various boxes and arrows in the dot generated
-# graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot
-# files that are used to generate the various graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_CLEANUP            = YES
diff --git a/htdocs/includes/mike42/escpos-php/src/Mike42/Escpos/PrintConnectors/CupsPrintConnector.php b/htdocs/includes/mike42/escpos-php/src/Mike42/Escpos/PrintConnectors/CupsPrintConnector.php
index 64b48332199..045e8b9ce4c 100644
--- a/htdocs/includes/mike42/escpos-php/src/Mike42/Escpos/PrintConnectors/CupsPrintConnector.php
+++ b/htdocs/includes/mike42/escpos-php/src/Mike42/Escpos/PrintConnectors/CupsPrintConnector.php
@@ -78,7 +78,7 @@ class CupsPrintConnector implements PrintConnector
         
         // Build command to work on data
         $tmpfname = tempnam(sys_get_temp_dir(), 'print-');
-		if ($tmpfname==false) dol_syslog("CupsPrintConnector.php::Permission denied to write into target directory ".sys_get_temp_dir(), LOG_WARNING);
+        if ($tmpfname==false) dol_syslog("CupsPrintConnector.php::Permission denied to write into target directory ".sys_get_temp_dir(), LOG_WARNING);
         file_put_contents($tmpfname, $data);
         $cmd = sprintf(
             "lp -d %s %s",
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/.gitignore b/htdocs/includes/mobiledetect/mobiledetectlib/.gitignore
new file mode 100644
index 00000000000..2f88269126d
--- /dev/null
+++ b/htdocs/includes/mobiledetect/mobiledetectlib/.gitignore
@@ -0,0 +1 @@
+/docs
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/docs/CONTRIBUTING.md b/htdocs/includes/mobiledetect/mobiledetectlib/docs/CONTRIBUTING.md
deleted file mode 100644
index 01a266ed83c..00000000000
--- a/htdocs/includes/mobiledetect/mobiledetectlib/docs/CONTRIBUTING.md
+++ /dev/null
@@ -1,48 +0,0 @@
-**Reporting issues**
-
-1. Specify the User-agent by visiting [http://demo.mobiledetect.net](http://demo.mobiledetect.net).
-1. Specify the expected behaviour.
-
-**Developing**
-
-1. Fork Mobile Detect repository. See ["How to fork"](https://help.github.com/articles/fork-a-repo/#fork-an-example-repository) example.
-1. `git clone https://github.com/[yourname]/Mobile-Detect.git`
-1. `git add remote serbanghita https://github.com/serbanghita/Mobile-Detect.git`
-1. `git remote -v` - You should see:
-    ```
-    origin       git@github.com:serbanghita/Mobile-Detect.git
-    serbanghita  https://github.com/serbanghita/Mobile-Detect.git
-    ```
-1. `git checkout -b devel origin/devel`
-1. `composer install`
-1. Start working on your changes.
-    1. If you add new methods or make structural changes to the `Mobile_Detect.php` class
-    you need to add unit tests!
-    1. If you add new regexes make sure you commit the User-Agents in [`tests/providers/vendors`](https://github.com/serbanghita/Mobile-Detect/tree/master/tests/providers/vendors)
-1. Run tests `vendor/bin/phpunit -v -c tests/phpunit.xml --coverage-text --strict-coverage --stop-on-risky`
-1. `git status` or `git diff` - inspect your changes
-1  `git stage .`
-1. `git commit -m "[your commit message here]`
-1. `git push origin devel`
-1. Go to your repo on GitHub and ["Submit the PR"](https://help.github.com/articles/about-pull-requests/)
-
-**New module, plugin, plugin or port**
-
-[Submit new module, plugin, port](../../issues/new?title=New%203rd%20party%20module&body=Name,%20Link%20and%20Description%20of%20the%20module.)
- including the following information:
-* Module name
-* Description
-* Link
-* Author
-
-Or you can submit a PR against `README.md`.
-
-**Website updates**
-
-1. Our official website is hosted at [http://mobiledetect.net](http://mobiledetect.net).
-1. The files are found on the `gh-pages` branch.
-1. `git checkout gh-pages`
-1. `npm install -g browser-sync`
-1. `browser-sync start --s . --f . --port 3000 --reload-debounce 1500 --no-ui`
-1. Go to `http://localhost:3000` and make changes.
-1. Commit, push and submit the PR against `serbanghita:gh-pages`.
\ No newline at end of file
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/docs/HISTORY.md b/htdocs/includes/mobiledetect/mobiledetectlib/docs/HISTORY.md
deleted file mode 100644
index 3483985258e..00000000000
--- a/htdocs/includes/mobiledetect/mobiledetectlib/docs/HISTORY.md
+++ /dev/null
@@ -1,11 +0,0 @@
-The first version of the script was developed in 2009 and it was hosted at https://code.google.com/p/php-mobile-detect/, it was a small project with around 30 stars. (Original blog post by Victor: http://victorstanciu.ro/detectarea-platformelor-mobile-in-php/)
-
-In December 2011 it received a major update from the first version, an important number of issues were fixed, then 2.0 was launched. The new version marks a new mindset and also featuring tablet detection.
-
-Throughout 2012 the script has been updated constantly and we have received tons of feedback and requests. 
-
-In July 2012 we moved the repository from Google Code to GitHub in order to quickly accommodate the frequent updates and to involve more people.
-
-In August 2013 the library has 1800+ stargazers and support for: composer, PHPUnit tests, PSR standards and a new webpage http://mobiledetect.net
-
-Mobile Detect library and user contributions are <a href="https://github.com/serbanghita/Mobile-Detect/blob/master/LICENSE.txt">MIT Licensed</a>.
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/docs/ISSUE_TEMPLATE.md b/htdocs/includes/mobiledetect/mobiledetectlib/docs/ISSUE_TEMPLATE.md
deleted file mode 100644
index 8d6384fce89..00000000000
--- a/htdocs/includes/mobiledetect/mobiledetectlib/docs/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,15 +0,0 @@
--------------delete this message-------------
-* By submitting a new issue I acknowledge that I already read the README, CODE EXAMPLES and KNOWN LIMITATIONS. 
-* I understand that the current version `2.x` is only meant to detect `mobile` devices.
-* Please post your User-Agent string! On a real device/s, the library is expected to work correctly.
--------------delete this message-------------
-
-
-
-**Issue description**
-
-
-**User-Agent(s)**
-
-
-**Suggestions**
\ No newline at end of file
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/docs/KNOWN_LIMITATIONS.md b/htdocs/includes/mobiledetect/mobiledetectlib/docs/KNOWN_LIMITATIONS.md
deleted file mode 100644
index 5887092f1f8..00000000000
--- a/htdocs/includes/mobiledetect/mobiledetectlib/docs/KNOWN_LIMITATIONS.md
+++ /dev/null
@@ -1,12 +0,0 @@
-**Known limitations**
-
-* Mobile Detect script was designed to detect `mobile` devices. Implicitly other devices are considered to be `desktop`.
-* User-Agent and HTTP headers sniffing is a non reliable method of detecting a mobile device.
-* If the mobile browser is set on `Desktop mode`, the Mobile Detect script has no way of knowing that the device is `mobile`.
-* Some touchscreen devices (eg. Microsoft Surface) are tough to detect as mobile since they can be used in a laptop mode. See: [#32](https://github.com/serbanghita/Mobile-Detect/issues/32), [#461](https://github.com/serbanghita/Mobile-Detect/issues/461), [#667](https://github.com/serbanghita/Mobile-Detect/issues/667)
-* Some mobile devices (eg. IPadOS, Google Pixel Slate). See: [#795](https://github.com/serbanghita/Mobile-Detect/issues/795), [#788](https://github.com/serbanghita/Mobile-Detect/issues/788)
-* Detecting the device brand (eg. Apple, Samsung, HTC) is not 100% reliable.
-* We don't monitor the quality of the 3rd party tools based on Mobile Detect script. 
-We cannot guarantee that they are using the class properly or if they provide the latest version.
-* Version `2.x` is made to be PHP 5.3 compatible because of the backward compatibility changes of PHP.
-* There are hundreds of devices launched every month, we cannot keep a 100% up to date detection rate.
\ No newline at end of file
diff --git a/htdocs/includes/nnnick/chartjs/.gitignore b/htdocs/includes/nnnick/chartjs/.gitignore
index 6a066b92f38..8a4a4294d61 100644
--- a/htdocs/includes/nnnick/chartjs/.gitignore
+++ b/htdocs/includes/nnnick/chartjs/.gitignore
@@ -1,8 +1,13 @@
+.github
 /_book
 /coverage
 /custom
 /dist
-/docs/index.md
+/docs
+/samples
+/scripts
+/src
+/test
 /gh-pages
 /jsdoc
 /node_modules
diff --git a/htdocs/includes/nnnick/chartjs/.travis.yml b/htdocs/includes/nnnick/chartjs/.travis.yml
index beb8789b46b..6271892d310 100644
--- a/htdocs/includes/nnnick/chartjs/.travis.yml
+++ b/htdocs/includes/nnnick/chartjs/.travis.yml
@@ -1,6 +1,8 @@
 language: node_js
 node_js:
-  - lts/*
+# Using node 12.18.2 instead of lts
+# https://github.com/chartjs/Chart.js/issues/7863#issuecomment-705222874
+  - "12.18.2"
 
 before_install:
   - "export CHROME_BIN=/usr/bin/google-chrome"
diff --git a/htdocs/includes/nnnick/chartjs/dist/Chart.bundle.js b/htdocs/includes/nnnick/chartjs/dist/Chart.bundle.js
index 204156a8fc7..b5e956c38bf 100644
--- a/htdocs/includes/nnnick/chartjs/dist/Chart.bundle.js
+++ b/htdocs/includes/nnnick/chartjs/dist/Chart.bundle.js
@@ -1,7 +1,7 @@
 /*!
- * Chart.js v2.9.3
+ * Chart.js v2.9.4
  * https://www.chartjs.org
- * (c) 2019 Chart.js Contributors
+ * (c) 2020 Chart.js Contributors
  * Released under the MIT License
  */
 (function (global, factory) {
@@ -2107,6 +2107,10 @@ if (typeof window !== 'undefined') {
 
 var chartjsColor = Color;
 
+function isValidKey(key) {
+	return ['__proto__', 'prototype', 'constructor'].indexOf(key) === -1;
+}
+
 /**
  * @namespace Chart.helpers
  */
@@ -2282,7 +2286,7 @@ var helpers = {
 		}
 
 		if (helpers.isObject(source)) {
-			var target = {};
+			var target = Object.create(source);
 			var keys = Object.keys(source);
 			var klen = keys.length;
 			var k = 0;
@@ -2303,6 +2307,12 @@ var helpers = {
 	 * @private
 	 */
 	_merger: function(key, target, source, options) {
+		if (!isValidKey(key)) {
+			// We want to ensure we do not copy prototypes over
+			// as this can pollute global namespaces
+			return;
+		}
+
 		var tval = target[key];
 		var sval = source[key];
 
@@ -2318,6 +2328,12 @@ var helpers = {
 	 * @private
 	 */
 	_mergerIf: function(key, target, source) {
+		if (!isValidKey(key)) {
+			// We want to ensure we do not copy prototypes over
+			// as this can pollute global namespaces
+			return;
+		}
+
 		var tval = target[key];
 		var sval = source[key];
 
@@ -3816,7 +3832,7 @@ helpers$1.extend(DatasetController.prototype, {
 	 */
 	_configure: function() {
 		var me = this;
-		me._config = helpers$1.merge({}, [
+		me._config = helpers$1.merge(Object.create(null), [
 			me.chart.options.datasets[me._type],
 			me.getDataset(),
 		], {
@@ -7086,7 +7102,8 @@ function updateDims(chartArea, params, layout) {
 		chartArea.h = newHeight;
 
 		// return true if chart area changed in layout's direction
-		return layout.horizontal ? newWidth !== chartArea.w : newHeight !== chartArea.h;
+		var sizes = layout.horizontal ? [newWidth, chartArea.w] : [newHeight, chartArea.h];
+		return sizes[0] !== sizes[1] && (!isNaN(sizes[0]) || !isNaN(sizes[1]));
 	}
 }
 
@@ -8098,7 +8115,7 @@ var core_scaleService = {
 	},
 	getScaleDefaults: function(type) {
 		// Return the scale defaults merged with the global settings so that we always use the latest ones
-		return this.defaults.hasOwnProperty(type) ? helpers$1.merge({}, [core_defaults.scale, this.defaults[type]]) : {};
+		return this.defaults.hasOwnProperty(type) ? helpers$1.merge(Object.create(null), [core_defaults.scale, this.defaults[type]]) : {};
 	},
 	updateScaleDefaults: function(type, additions) {
 		var me = this;
@@ -9173,7 +9190,7 @@ core_defaults._set('global', {
  * returns a deep copy of the result, thus doesn't alter inputs.
  */
 function mergeScaleConfig(/* config objects ... */) {
-	return helpers$1.merge({}, [].slice.call(arguments), {
+	return helpers$1.merge(Object.create(null), [].slice.call(arguments), {
 		merger: function(key, target, source, options) {
 			if (key === 'xAxes' || key === 'yAxes') {
 				var slen = source[key].length;
@@ -9213,9 +9230,9 @@ function mergeScaleConfig(/* config objects ... */) {
  * a deep copy of the result, thus doesn't alter inputs.
  */
 function mergeConfig(/* config objects ... */) {
-	return helpers$1.merge({}, [].slice.call(arguments), {
+	return helpers$1.merge(Object.create(null), [].slice.call(arguments), {
 		merger: function(key, target, source, options) {
-			var tval = target[key] || {};
+			var tval = target[key] || Object.create(null);
 			var sval = source[key];
 
 			if (key === 'scales') {
@@ -9232,7 +9249,7 @@ function mergeConfig(/* config objects ... */) {
 }
 
 function initConfig(config) {
-	config = config || {};
+	config = config || Object.create(null);
 
 	// Do NOT use mergeConfig for the data object because this method merges arrays
 	// and so would change references to labels and datasets, preventing data updates.
@@ -11213,6 +11230,8 @@ function computeLabelSizes(ctx, tickFonts, ticks, caches) {
 	var widths = [];
 	var heights = [];
 	var offsets = [];
+	var widestLabelSize = 0;
+	var highestLabelSize = 0;
 	var i, j, jlen, label, tickFont, fontString, cache, lineHeight, width, height, nestedLabel, widest, highest;
 
 	for (i = 0; i < length; ++i) {
@@ -11240,11 +11259,13 @@ function computeLabelSizes(ctx, tickFonts, ticks, caches) {
 		widths.push(width);
 		heights.push(height);
 		offsets.push(lineHeight / 2);
+		widestLabelSize = Math.max(width, widestLabelSize);
+		highestLabelSize = Math.max(height, highestLabelSize);
 	}
 	garbageCollect(caches, length);
 
-	widest = widths.indexOf(Math.max.apply(null, widths));
-	highest = heights.indexOf(Math.max.apply(null, heights));
+	widest = widths.indexOf(widestLabelSize);
+	highest = heights.indexOf(highestLabelSize);
 
 	function valueAt(idx) {
 		return {
diff --git a/htdocs/includes/nnnick/chartjs/dist/Chart.bundle.min.js b/htdocs/includes/nnnick/chartjs/dist/Chart.bundle.min.js
index 55d9eb03f82..7134d267b67 100644
--- a/htdocs/includes/nnnick/chartjs/dist/Chart.bundle.min.js
+++ b/htdocs/includes/nnnick/chartjs/dist/Chart.bundle.min.js
@@ -1,7 +1,7 @@
 /*!
- * Chart.js v2.9.3
+ * Chart.js v2.9.4
  * https://www.chartjs.org
- * (c) 2019 Chart.js Contributors
+ * (c) 2020 Chart.js Contributors
  * Released under the MIT License
  */
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t=t||self).Chart=e()}(this,(function(){"use strict";"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self&&self;function t(){throw new Error("Dynamic requires are not currently supported by rollup-plugin-commonjs")}function e(t,e){return t(e={exports:{}},e.exports),e.exports}var n={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},i=e((function(t){var e={};for(var i in n)n.hasOwnProperty(i)&&(e[n[i]]=i);var a=t.exports={rgb:{channels:3,labels:"rgb"},hsl:{channels:3,labels:"hsl"},hsv:{channels:3,labels:"hsv"},hwb:{channels:3,labels:"hwb"},cmyk:{channels:4,labels:"cmyk"},xyz:{channels:3,labels:"xyz"},lab:{channels:3,labels:"lab"},lch:{channels:3,labels:"lch"},hex:{channels:1,labels:["hex"]},keyword:{channels:1,labels:["keyword"]},ansi16:{channels:1,labels:["ansi16"]},ansi256:{channels:1,labels:["ansi256"]},hcg:{channels:3,labels:["h","c","g"]},apple:{channels:3,labels:["r16","g16","b16"]},gray:{channels:1,labels:["gray"]}};for(var r in a)if(a.hasOwnProperty(r)){if(!("channels"in a[r]))throw new Error("missing channels property: "+r);if(!("labels"in a[r]))throw new Error("missing channel labels property: "+r);if(a[r].labels.length!==a[r].channels)throw new Error("channel and label counts mismatch: "+r);var o=a[r].channels,s=a[r].labels;delete a[r].channels,delete a[r].labels,Object.defineProperty(a[r],"channels",{value:o}),Object.defineProperty(a[r],"labels",{value:s})}a.rgb.hsl=function(t){var e,n,i=t[0]/255,a=t[1]/255,r=t[2]/255,o=Math.min(i,a,r),s=Math.max(i,a,r),l=s-o;return s===o?e=0:i===s?e=(a-r)/l:a===s?e=2+(r-i)/l:r===s&&(e=4+(i-a)/l),(e=Math.min(60*e,360))<0&&(e+=360),n=(o+s)/2,[e,100*(s===o?0:n<=.5?l/(s+o):l/(2-s-o)),100*n]},a.rgb.hsv=function(t){var e,n,i,a,r,o=t[0]/255,s=t[1]/255,l=t[2]/255,u=Math.max(o,s,l),d=u-Math.min(o,s,l),h=function(t){return(u-t)/6/d+.5};return 0===d?a=r=0:(r=d/u,e=h(o),n=h(s),i=h(l),o===u?a=i-n:s===u?a=1/3+e-i:l===u&&(a=2/3+n-e),a<0?a+=1:a>1&&(a-=1)),[360*a,100*r,100*u]},a.rgb.hwb=function(t){var e=t[0],n=t[1],i=t[2];return[a.rgb.hsl(t)[0],100*(1/255*Math.min(e,Math.min(n,i))),100*(i=1-1/255*Math.max(e,Math.max(n,i)))]},a.rgb.cmyk=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255;return[100*((1-n-(e=Math.min(1-n,1-i,1-a)))/(1-e)||0),100*((1-i-e)/(1-e)||0),100*((1-a-e)/(1-e)||0),100*e]},a.rgb.keyword=function(t){var i=e[t];if(i)return i;var a,r,o,s=1/0;for(var l in n)if(n.hasOwnProperty(l)){var u=n[l],d=(r=t,o=u,Math.pow(r[0]-o[0],2)+Math.pow(r[1]-o[1],2)+Math.pow(r[2]-o[2],2));d<s&&(s=d,a=l)}return a},a.keyword.rgb=function(t){return n[t]},a.rgb.xyz=function(t){var e=t[0]/255,n=t[1]/255,i=t[2]/255;return[100*(.4124*(e=e>.04045?Math.pow((e+.055)/1.055,2.4):e/12.92)+.3576*(n=n>.04045?Math.pow((n+.055)/1.055,2.4):n/12.92)+.1805*(i=i>.04045?Math.pow((i+.055)/1.055,2.4):i/12.92)),100*(.2126*e+.7152*n+.0722*i),100*(.0193*e+.1192*n+.9505*i)]},a.rgb.lab=function(t){var e=a.rgb.xyz(t),n=e[0],i=e[1],r=e[2];return i/=100,r/=108.883,n=(n/=95.047)>.008856?Math.pow(n,1/3):7.787*n+16/116,[116*(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116)-16,500*(n-i),200*(i-(r=r>.008856?Math.pow(r,1/3):7.787*r+16/116))]},a.hsl.rgb=function(t){var e,n,i,a,r,o=t[0]/360,s=t[1]/100,l=t[2]/100;if(0===s)return[r=255*l,r,r];e=2*l-(n=l<.5?l*(1+s):l+s-l*s),a=[0,0,0];for(var u=0;u<3;u++)(i=o+1/3*-(u-1))<0&&i++,i>1&&i--,r=6*i<1?e+6*(n-e)*i:2*i<1?n:3*i<2?e+(n-e)*(2/3-i)*6:e,a[u]=255*r;return a},a.hsl.hsv=function(t){var e=t[0],n=t[1]/100,i=t[2]/100,a=n,r=Math.max(i,.01);return n*=(i*=2)<=1?i:2-i,a*=r<=1?r:2-r,[e,100*(0===i?2*a/(r+a):2*n/(i+n)),100*((i+n)/2)]},a.hsv.rgb=function(t){var e=t[0]/60,n=t[1]/100,i=t[2]/100,a=Math.floor(e)%6,r=e-Math.floor(e),o=255*i*(1-n),s=255*i*(1-n*r),l=255*i*(1-n*(1-r));switch(i*=255,a){case 0:return[i,l,o];case 1:return[s,i,o];case 2:return[o,i,l];case 3:return[o,s,i];case 4:return[l,o,i];case 5:return[i,o,s]}},a.hsv.hsl=function(t){var e,n,i,a=t[0],r=t[1]/100,o=t[2]/100,s=Math.max(o,.01);return i=(2-r)*o,n=r*s,[a,100*(n=(n/=(e=(2-r)*s)<=1?e:2-e)||0),100*(i/=2)]},a.hwb.rgb=function(t){var e,n,i,a,r,o,s,l=t[0]/360,u=t[1]/100,d=t[2]/100,h=u+d;switch(h>1&&(u/=h,d/=h),i=6*l-(e=Math.floor(6*l)),0!=(1&e)&&(i=1-i),a=u+i*((n=1-d)-u),e){default:case 6:case 0:r=n,o=a,s=u;break;case 1:r=a,o=n,s=u;break;case 2:r=u,o=n,s=a;break;case 3:r=u,o=a,s=n;break;case 4:r=a,o=u,s=n;break;case 5:r=n,o=u,s=a}return[255*r,255*o,255*s]},a.cmyk.rgb=function(t){var e=t[0]/100,n=t[1]/100,i=t[2]/100,a=t[3]/100;return[255*(1-Math.min(1,e*(1-a)+a)),255*(1-Math.min(1,n*(1-a)+a)),255*(1-Math.min(1,i*(1-a)+a))]},a.xyz.rgb=function(t){var e,n,i,a=t[0]/100,r=t[1]/100,o=t[2]/100;return n=-.9689*a+1.8758*r+.0415*o,i=.0557*a+-.204*r+1.057*o,e=(e=3.2406*a+-1.5372*r+-.4986*o)>.0031308?1.055*Math.pow(e,1/2.4)-.055:12.92*e,n=n>.0031308?1.055*Math.pow(n,1/2.4)-.055:12.92*n,i=i>.0031308?1.055*Math.pow(i,1/2.4)-.055:12.92*i,[255*(e=Math.min(Math.max(0,e),1)),255*(n=Math.min(Math.max(0,n),1)),255*(i=Math.min(Math.max(0,i),1))]},a.xyz.lab=function(t){var e=t[0],n=t[1],i=t[2];return n/=100,i/=108.883,e=(e/=95.047)>.008856?Math.pow(e,1/3):7.787*e+16/116,[116*(n=n>.008856?Math.pow(n,1/3):7.787*n+16/116)-16,500*(e-n),200*(n-(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116))]},a.lab.xyz=function(t){var e,n,i,a=t[0];e=t[1]/500+(n=(a+16)/116),i=n-t[2]/200;var r=Math.pow(n,3),o=Math.pow(e,3),s=Math.pow(i,3);return n=r>.008856?r:(n-16/116)/7.787,e=o>.008856?o:(e-16/116)/7.787,i=s>.008856?s:(i-16/116)/7.787,[e*=95.047,n*=100,i*=108.883]},a.lab.lch=function(t){var e,n=t[0],i=t[1],a=t[2];return(e=360*Math.atan2(a,i)/2/Math.PI)<0&&(e+=360),[n,Math.sqrt(i*i+a*a),e]},a.lch.lab=function(t){var e,n=t[0],i=t[1];return e=t[2]/360*2*Math.PI,[n,i*Math.cos(e),i*Math.sin(e)]},a.rgb.ansi16=function(t){var e=t[0],n=t[1],i=t[2],r=1 in arguments?arguments[1]:a.rgb.hsv(t)[2];if(0===(r=Math.round(r/50)))return 30;var o=30+(Math.round(i/255)<<2|Math.round(n/255)<<1|Math.round(e/255));return 2===r&&(o+=60),o},a.hsv.ansi16=function(t){return a.rgb.ansi16(a.hsv.rgb(t),t[2])},a.rgb.ansi256=function(t){var e=t[0],n=t[1],i=t[2];return e===n&&n===i?e<8?16:e>248?231:Math.round((e-8)/247*24)+232:16+36*Math.round(e/255*5)+6*Math.round(n/255*5)+Math.round(i/255*5)},a.ansi16.rgb=function(t){var e=t%10;if(0===e||7===e)return t>50&&(e+=3.5),[e=e/10.5*255,e,e];var n=.5*(1+~~(t>50));return[(1&e)*n*255,(e>>1&1)*n*255,(e>>2&1)*n*255]},a.ansi256.rgb=function(t){if(t>=232){var e=10*(t-232)+8;return[e,e,e]}var n;return t-=16,[Math.floor(t/36)/5*255,Math.floor((n=t%36)/6)/5*255,n%6/5*255]},a.rgb.hex=function(t){var e=(((255&Math.round(t[0]))<<16)+((255&Math.round(t[1]))<<8)+(255&Math.round(t[2]))).toString(16).toUpperCase();return"000000".substring(e.length)+e},a.hex.rgb=function(t){var e=t.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);if(!e)return[0,0,0];var n=e[0];3===e[0].length&&(n=n.split("").map((function(t){return t+t})).join(""));var i=parseInt(n,16);return[i>>16&255,i>>8&255,255&i]},a.rgb.hcg=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255,r=Math.max(Math.max(n,i),a),o=Math.min(Math.min(n,i),a),s=r-o;return e=s<=0?0:r===n?(i-a)/s%6:r===i?2+(a-n)/s:4+(n-i)/s+4,e/=6,[360*(e%=1),100*s,100*(s<1?o/(1-s):0)]},a.hsl.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=1,a=0;return(i=n<.5?2*e*n:2*e*(1-n))<1&&(a=(n-.5*i)/(1-i)),[t[0],100*i,100*a]},a.hsv.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=e*n,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.hcg.rgb=function(t){var e=t[0]/360,n=t[1]/100,i=t[2]/100;if(0===n)return[255*i,255*i,255*i];var a,r=[0,0,0],o=e%1*6,s=o%1,l=1-s;switch(Math.floor(o)){case 0:r[0]=1,r[1]=s,r[2]=0;break;case 1:r[0]=l,r[1]=1,r[2]=0;break;case 2:r[0]=0,r[1]=1,r[2]=s;break;case 3:r[0]=0,r[1]=l,r[2]=1;break;case 4:r[0]=s,r[1]=0,r[2]=1;break;default:r[0]=1,r[1]=0,r[2]=l}return a=(1-n)*i,[255*(n*r[0]+a),255*(n*r[1]+a),255*(n*r[2]+a)]},a.hcg.hsv=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e),i=0;return n>0&&(i=e/n),[t[0],100*i,100*n]},a.hcg.hsl=function(t){var e=t[1]/100,n=t[2]/100*(1-e)+.5*e,i=0;return n>0&&n<.5?i=e/(2*n):n>=.5&&n<1&&(i=e/(2*(1-n))),[t[0],100*i,100*n]},a.hcg.hwb=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e);return[t[0],100*(n-e),100*(1-n)]},a.hwb.hcg=function(t){var e=t[1]/100,n=1-t[2]/100,i=n-e,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.apple.rgb=function(t){return[t[0]/65535*255,t[1]/65535*255,t[2]/65535*255]},a.rgb.apple=function(t){return[t[0]/255*65535,t[1]/255*65535,t[2]/255*65535]},a.gray.rgb=function(t){return[t[0]/100*255,t[0]/100*255,t[0]/100*255]},a.gray.hsl=a.gray.hsv=function(t){return[0,0,t[0]]},a.gray.hwb=function(t){return[0,100,t[0]]},a.gray.cmyk=function(t){return[0,0,0,t[0]]},a.gray.lab=function(t){return[t[0],0,0]},a.gray.hex=function(t){var e=255&Math.round(t[0]/100*255),n=((e<<16)+(e<<8)+e).toString(16).toUpperCase();return"000000".substring(n.length)+n},a.rgb.gray=function(t){return[(t[0]+t[1]+t[2])/3/255*100]}}));i.rgb,i.hsl,i.hsv,i.hwb,i.cmyk,i.xyz,i.lab,i.lch,i.hex,i.keyword,i.ansi16,i.ansi256,i.hcg,i.apple,i.gray;function a(t){var e=function(){for(var t={},e=Object.keys(i),n=e.length,a=0;a<n;a++)t[e[a]]={distance:-1,parent:null};return t}(),n=[t];for(e[t].distance=0;n.length;)for(var a=n.pop(),r=Object.keys(i[a]),o=r.length,s=0;s<o;s++){var l=r[s],u=e[l];-1===u.distance&&(u.distance=e[a].distance+1,u.parent=a,n.unshift(l))}return e}function r(t,e){return function(n){return e(t(n))}}function o(t,e){for(var n=[e[t].parent,t],a=i[e[t].parent][t],o=e[t].parent;e[o].parent;)n.unshift(e[o].parent),a=r(i[e[o].parent][o],a),o=e[o].parent;return a.conversion=n,a}var s={};Object.keys(i).forEach((function(t){s[t]={},Object.defineProperty(s[t],"channels",{value:i[t].channels}),Object.defineProperty(s[t],"labels",{value:i[t].labels});var e=function(t){for(var e=a(t),n={},i=Object.keys(e),r=i.length,s=0;s<r;s++){var l=i[s];null!==e[l].parent&&(n[l]=o(l,e))}return n}(t);Object.keys(e).forEach((function(n){var i=e[n];s[t][n]=function(t){var e=function(e){if(null==e)return e;arguments.length>1&&(e=Array.prototype.slice.call(arguments));var n=t(e);if("object"==typeof n)for(var i=n.length,a=0;a<i;a++)n[a]=Math.round(n[a]);return n};return"conversion"in t&&(e.conversion=t.conversion),e}(i),s[t][n].raw=function(t){var e=function(e){return null==e?e:(arguments.length>1&&(e=Array.prototype.slice.call(arguments)),t(e))};return"conversion"in t&&(e.conversion=t.conversion),e}(i)}))}));var l=s,u={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},d={getRgba:h,getHsla:c,getRgb:function(t){var e=h(t);return e&&e.slice(0,3)},getHsl:function(t){var e=c(t);return e&&e.slice(0,3)},getHwb:f,getAlpha:function(t){var e=h(t);if(e)return e[3];if(e=c(t))return e[3];if(e=f(t))return e[3]},hexString:function(t,e){e=void 0!==e&&3===t.length?e:t[3];return"#"+b(t[0])+b(t[1])+b(t[2])+(e>=0&&e<1?b(Math.round(255*e)):"")},rgbString:function(t,e){if(e<1||t[3]&&t[3]<1)return g(t,e);return"rgb("+t[0]+", "+t[1]+", "+t[2]+")"},rgbaString:g,percentString:function(t,e){if(e<1||t[3]&&t[3]<1)return m(t,e);var n=Math.round(t[0]/255*100),i=Math.round(t[1]/255*100),a=Math.round(t[2]/255*100);return"rgb("+n+"%, "+i+"%, "+a+"%)"},percentaString:m,hslString:function(t,e){if(e<1||t[3]&&t[3]<1)return p(t,e);return"hsl("+t[0]+", "+t[1]+"%, "+t[2]+"%)"},hslaString:p,hwbString:function(t,e){void 0===e&&(e=void 0!==t[3]?t[3]:1);return"hwb("+t[0]+", "+t[1]+"%, "+t[2]+"%"+(void 0!==e&&1!==e?", "+e:"")+")"},keyword:function(t){return y[t.slice(0,3)]}};function h(t){if(t){var e=[0,0,0],n=1,i=t.match(/^#([a-fA-F0-9]{3,4})$/i),a="";if(i){a=(i=i[1])[3];for(var r=0;r<e.length;r++)e[r]=parseInt(i[r]+i[r],16);a&&(n=Math.round(parseInt(a+a,16)/255*100)/100)}else if(i=t.match(/^#([a-fA-F0-9]{6}([a-fA-F0-9]{2})?)$/i)){a=i[2],i=i[1];for(r=0;r<e.length;r++)e[r]=parseInt(i.slice(2*r,2*r+2),16);a&&(n=Math.round(parseInt(a,16)/255*100)/100)}else if(i=t.match(/^rgba?\(\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=parseInt(i[r+1]);n=parseFloat(i[4])}else if(i=t.match(/^rgba?\(\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=Math.round(2.55*parseFloat(i[r+1]));n=parseFloat(i[4])}else if(i=t.match(/(\w+)/)){if("transparent"==i[1])return[0,0,0,0];if(!(e=u[i[1]]))return}for(r=0;r<e.length;r++)e[r]=v(e[r],0,255);return n=n||0==n?v(n,0,1):1,e[3]=n,e}}function c(t){if(t){var e=t.match(/^hsla?\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[v(parseInt(e[1]),0,360),v(parseFloat(e[2]),0,100),v(parseFloat(e[3]),0,100),v(isNaN(n)?1:n,0,1)]}}}function f(t){if(t){var e=t.match(/^hwb\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[v(parseInt(e[1]),0,360),v(parseFloat(e[2]),0,100),v(parseFloat(e[3]),0,100),v(isNaN(n)?1:n,0,1)]}}}function g(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"rgba("+t[0]+", "+t[1]+", "+t[2]+", "+e+")"}function m(t,e){return"rgba("+Math.round(t[0]/255*100)+"%, "+Math.round(t[1]/255*100)+"%, "+Math.round(t[2]/255*100)+"%, "+(e||t[3]||1)+")"}function p(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"hsla("+t[0]+", "+t[1]+"%, "+t[2]+"%, "+e+")"}function v(t,e,n){return Math.min(Math.max(e,t),n)}function b(t){var e=t.toString(16).toUpperCase();return e.length<2?"0"+e:e}var y={};for(var x in u)y[u[x]]=x;var _=function(t){return t instanceof _?t:this instanceof _?(this.valid=!1,this.values={rgb:[0,0,0],hsl:[0,0,0],hsv:[0,0,0],hwb:[0,0,0],cmyk:[0,0,0,0],alpha:1},void("string"==typeof t?(e=d.getRgba(t))?this.setValues("rgb",e):(e=d.getHsla(t))?this.setValues("hsl",e):(e=d.getHwb(t))&&this.setValues("hwb",e):"object"==typeof t&&(void 0!==(e=t).r||void 0!==e.red?this.setValues("rgb",e):void 0!==e.l||void 0!==e.lightness?this.setValues("hsl",e):void 0!==e.v||void 0!==e.value?this.setValues("hsv",e):void 0!==e.w||void 0!==e.whiteness?this.setValues("hwb",e):void 0===e.c&&void 0===e.cyan||this.setValues("cmyk",e)))):new _(t);var e};_.prototype={isValid:function(){return this.valid},rgb:function(){return this.setSpace("rgb",arguments)},hsl:function(){return this.setSpace("hsl",arguments)},hsv:function(){return this.setSpace("hsv",arguments)},hwb:function(){return this.setSpace("hwb",arguments)},cmyk:function(){return this.setSpace("cmyk",arguments)},rgbArray:function(){return this.values.rgb},hslArray:function(){return this.values.hsl},hsvArray:function(){return this.values.hsv},hwbArray:function(){var t=this.values;return 1!==t.alpha?t.hwb.concat([t.alpha]):t.hwb},cmykArray:function(){return this.values.cmyk},rgbaArray:function(){var t=this.values;return t.rgb.concat([t.alpha])},hslaArray:function(){var t=this.values;return t.hsl.concat([t.alpha])},alpha:function(t){return void 0===t?this.values.alpha:(this.setValues("alpha",t),this)},red:function(t){return this.setChannel("rgb",0,t)},green:function(t){return this.setChannel("rgb",1,t)},blue:function(t){return this.setChannel("rgb",2,t)},hue:function(t){return t&&(t=(t%=360)<0?360+t:t),this.setChannel("hsl",0,t)},saturation:function(t){return this.setChannel("hsl",1,t)},lightness:function(t){return this.setChannel("hsl",2,t)},saturationv:function(t){return this.setChannel("hsv",1,t)},whiteness:function(t){return this.setChannel("hwb",1,t)},blackness:function(t){return this.setChannel("hwb",2,t)},value:function(t){return this.setChannel("hsv",2,t)},cyan:function(t){return this.setChannel("cmyk",0,t)},magenta:function(t){return this.setChannel("cmyk",1,t)},yellow:function(t){return this.setChannel("cmyk",2,t)},black:function(t){return this.setChannel("cmyk",3,t)},hexString:function(){return d.hexString(this.values.rgb)},rgbString:function(){return d.rgbString(this.values.rgb,this.values.alpha)},rgbaString:function(){return d.rgbaString(this.values.rgb,this.values.alpha)},percentString:function(){return d.percentString(this.values.rgb,this.values.alpha)},hslString:function(){return d.hslString(this.values.hsl,this.values.alpha)},hslaString:function(){return d.hslaString(this.values.hsl,this.values.alpha)},hwbString:function(){return d.hwbString(this.values.hwb,this.values.alpha)},keyword:function(){return d.keyword(this.values.rgb,this.values.alpha)},rgbNumber:function(){var t=this.values.rgb;return t[0]<<16|t[1]<<8|t[2]},luminosity:function(){for(var t=this.values.rgb,e=[],n=0;n<t.length;n++){var i=t[n]/255;e[n]=i<=.03928?i/12.92:Math.pow((i+.055)/1.055,2.4)}return.2126*e[0]+.7152*e[1]+.0722*e[2]},contrast:function(t){var e=this.luminosity(),n=t.luminosity();return e>n?(e+.05)/(n+.05):(n+.05)/(e+.05)},level:function(t){var e=this.contrast(t);return e>=7.1?"AAA":e>=4.5?"AA":""},dark:function(){var t=this.values.rgb;return(299*t[0]+587*t[1]+114*t[2])/1e3<128},light:function(){return!this.dark()},negate:function(){for(var t=[],e=0;e<3;e++)t[e]=255-this.values.rgb[e];return this.setValues("rgb",t),this},lighten:function(t){var e=this.values.hsl;return e[2]+=e[2]*t,this.setValues("hsl",e),this},darken:function(t){var e=this.values.hsl;return e[2]-=e[2]*t,this.setValues("hsl",e),this},saturate:function(t){var e=this.values.hsl;return e[1]+=e[1]*t,this.setValues("hsl",e),this},desaturate:function(t){var e=this.values.hsl;return e[1]-=e[1]*t,this.setValues("hsl",e),this},whiten:function(t){var e=this.values.hwb;return e[1]+=e[1]*t,this.setValues("hwb",e),this},blacken:function(t){var e=this.values.hwb;return e[2]+=e[2]*t,this.setValues("hwb",e),this},greyscale:function(){var t=this.values.rgb,e=.3*t[0]+.59*t[1]+.11*t[2];return this.setValues("rgb",[e,e,e]),this},clearer:function(t){var e=this.values.alpha;return this.setValues("alpha",e-e*t),this},opaquer:function(t){var e=this.values.alpha;return this.setValues("alpha",e+e*t),this},rotate:function(t){var e=this.values.hsl,n=(e[0]+t)%360;return e[0]=n<0?360+n:n,this.setValues("hsl",e),this},mix:function(t,e){var n=t,i=void 0===e?.5:e,a=2*i-1,r=this.alpha()-n.alpha(),o=((a*r==-1?a:(a+r)/(1+a*r))+1)/2,s=1-o;return this.rgb(o*this.red()+s*n.red(),o*this.green()+s*n.green(),o*this.blue()+s*n.blue()).alpha(this.alpha()*i+n.alpha()*(1-i))},toJSON:function(){return this.rgb()},clone:function(){var t,e,n=new _,i=this.values,a=n.values;for(var r in i)i.hasOwnProperty(r)&&(t=i[r],"[object Array]"===(e={}.toString.call(t))?a[r]=t.slice(0):"[object Number]"===e?a[r]=t:console.error("unexpected color value:",t));return n}},_.prototype.spaces={rgb:["red","green","blue"],hsl:["hue","saturation","lightness"],hsv:["hue","saturation","value"],hwb:["hue","whiteness","blackness"],cmyk:["cyan","magenta","yellow","black"]},_.prototype.maxes={rgb:[255,255,255],hsl:[360,100,100],hsv:[360,100,100],hwb:[360,100,100],cmyk:[100,100,100,100]},_.prototype.getValues=function(t){for(var e=this.values,n={},i=0;i<t.length;i++)n[t.charAt(i)]=e[t][i];return 1!==e.alpha&&(n.a=e.alpha),n},_.prototype.setValues=function(t,e){var n,i,a=this.values,r=this.spaces,o=this.maxes,s=1;if(this.valid=!0,"alpha"===t)s=e;else if(e.length)a[t]=e.slice(0,t.length),s=e[t.length];else if(void 0!==e[t.charAt(0)]){for(n=0;n<t.length;n++)a[t][n]=e[t.charAt(n)];s=e.a}else if(void 0!==e[r[t][0]]){var u=r[t];for(n=0;n<t.length;n++)a[t][n]=e[u[n]];s=e.alpha}if(a.alpha=Math.max(0,Math.min(1,void 0===s?a.alpha:s)),"alpha"===t)return!1;for(n=0;n<t.length;n++)i=Math.max(0,Math.min(o[t][n],a[t][n])),a[t][n]=Math.round(i);for(var d in r)d!==t&&(a[d]=l[t][d](a[t]));return!0},_.prototype.setSpace=function(t,e){var n=e[0];return void 0===n?this.getValues(t):("number"==typeof n&&(n=Array.prototype.slice.call(e)),this.setValues(t,n),this)},_.prototype.setChannel=function(t,e,n){var i=this.values[t];return void 0===n?i[e]:n===i[e]?this:(i[e]=n,this.setValues(t,i),this)},"undefined"!=typeof window&&(window.Color=_);var w,k=_,M={noop:function(){},uid:(w=0,function(){return w++}),isNullOrUndef:function(t){return null==t},isArray:function(t){if(Array.isArray&&Array.isArray(t))return!0;var e=Object.prototype.toString.call(t);return"[object"===e.substr(0,7)&&"Array]"===e.substr(-6)},isObject:function(t){return null!==t&&"[object Object]"===Object.prototype.toString.call(t)},isFinite:function(t){return("number"==typeof t||t instanceof Number)&&isFinite(t)},valueOrDefault:function(t,e){return void 0===t?e:t},valueAtIndexOrDefault:function(t,e,n){return M.valueOrDefault(M.isArray(t)?t[e]:t,n)},callback:function(t,e,n){if(t&&"function"==typeof t.call)return t.apply(n,e)},each:function(t,e,n,i){var a,r,o;if(M.isArray(t))if(r=t.length,i)for(a=r-1;a>=0;a--)e.call(n,t[a],a);else for(a=0;a<r;a++)e.call(n,t[a],a);else if(M.isObject(t))for(r=(o=Object.keys(t)).length,a=0;a<r;a++)e.call(n,t[o[a]],o[a])},arrayEquals:function(t,e){var n,i,a,r;if(!t||!e||t.length!==e.length)return!1;for(n=0,i=t.length;n<i;++n)if(a=t[n],r=e[n],a instanceof Array&&r instanceof Array){if(!M.arrayEquals(a,r))return!1}else if(a!==r)return!1;return!0},clone:function(t){if(M.isArray(t))return t.map(M.clone);if(M.isObject(t)){for(var e={},n=Object.keys(t),i=n.length,a=0;a<i;++a)e[n[a]]=M.clone(t[n[a]]);return e}return t},_merger:function(t,e,n,i){var a=e[t],r=n[t];M.isObject(a)&&M.isObject(r)?M.merge(a,r,i):e[t]=M.clone(r)},_mergerIf:function(t,e,n){var i=e[t],a=n[t];M.isObject(i)&&M.isObject(a)?M.mergeIf(i,a):e.hasOwnProperty(t)||(e[t]=M.clone(a))},merge:function(t,e,n){var i,a,r,o,s,l=M.isArray(e)?e:[e],u=l.length;if(!M.isObject(t))return t;for(i=(n=n||{}).merger||M._merger,a=0;a<u;++a)if(e=l[a],M.isObject(e))for(s=0,o=(r=Object.keys(e)).length;s<o;++s)i(r[s],t,e,n);return t},mergeIf:function(t,e){return M.merge(t,e,{merger:M._mergerIf})},extend:Object.assign||function(t){return M.merge(t,[].slice.call(arguments,1),{merger:function(t,e,n){e[t]=n[t]}})},inherits:function(t){var e=this,n=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return e.apply(this,arguments)},i=function(){this.constructor=n};return i.prototype=e.prototype,n.prototype=new i,n.extend=M.inherits,t&&M.extend(n.prototype,t),n.__super__=e.prototype,n},_deprecated:function(t,e,n,i){void 0!==e&&console.warn(t+': "'+n+'" is deprecated. Please use "'+i+'" instead')}},S=M;M.callCallback=M.callback,M.indexOf=function(t,e,n){return Array.prototype.indexOf.call(t,e,n)},M.getValueOrDefault=M.valueOrDefault,M.getValueAtIndexOrDefault=M.valueAtIndexOrDefault;var D={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return(t-=1)*t*t+1},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-((t-=1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return t*t*t*t*t},easeOutQuint:function(t){return(t-=1)*t*t*t*t+1},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return 1-Math.cos(t*(Math.PI/2))},easeOutSine:function(t){return Math.sin(t*(Math.PI/2))},easeInOutSine:function(t){return-.5*(Math.cos(Math.PI*t)-1)},easeInExpo:function(t){return 0===t?0:Math.pow(2,10*(t-1))},easeOutExpo:function(t){return 1===t?1:1-Math.pow(2,-10*t)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(2-Math.pow(2,-10*--t))},easeInCirc:function(t){return t>=1?t:-(Math.sqrt(1-t*t)-1)},easeOutCirc:function(t){return Math.sqrt(1-(t-=1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),-i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n))},easeOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),i*Math.pow(2,-10*t)*Math.sin((t-e)*(2*Math.PI)/n)+1)},easeInOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:2==(t/=.5)?1:(n||(n=.45),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),t<1?i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*-.5:i*Math.pow(2,-10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*.5+1)},easeInBack:function(t){var e=1.70158;return t*t*((e+1)*t-e)},easeOutBack:function(t){var e=1.70158;return(t-=1)*t*((e+1)*t+e)+1},easeInOutBack:function(t){var e=1.70158;return(t/=.5)<1?t*t*((1+(e*=1.525))*t-e)*.5:.5*((t-=2)*t*((1+(e*=1.525))*t+e)+2)},easeInBounce:function(t){return 1-D.easeOutBounce(1-t)},easeOutBounce:function(t){return t<1/2.75?7.5625*t*t:t<2/2.75?7.5625*(t-=1.5/2.75)*t+.75:t<2.5/2.75?7.5625*(t-=2.25/2.75)*t+.9375:7.5625*(t-=2.625/2.75)*t+.984375},easeInOutBounce:function(t){return t<.5?.5*D.easeInBounce(2*t):.5*D.easeOutBounce(2*t-1)+.5}},C={effects:D};S.easingEffects=D;var P=Math.PI,T=P/180,O=2*P,A=P/2,F=P/4,I=2*P/3,L={clear:function(t){t.ctx.clearRect(0,0,t.width,t.height)},roundedRect:function(t,e,n,i,a,r){if(r){var o=Math.min(r,a/2,i/2),s=e+o,l=n+o,u=e+i-o,d=n+a-o;t.moveTo(e,l),s<u&&l<d?(t.arc(s,l,o,-P,-A),t.arc(u,l,o,-A,0),t.arc(u,d,o,0,A),t.arc(s,d,o,A,P)):s<u?(t.moveTo(s,n),t.arc(u,l,o,-A,A),t.arc(s,l,o,A,P+A)):l<d?(t.arc(s,l,o,-P,0),t.arc(s,d,o,0,P)):t.arc(s,l,o,-P,P),t.closePath(),t.moveTo(e,n)}else t.rect(e,n,i,a)},drawPoint:function(t,e,n,i,a,r){var o,s,l,u,d,h=(r||0)*T;if(e&&"object"==typeof e&&("[object HTMLImageElement]"===(o=e.toString())||"[object HTMLCanvasElement]"===o))return t.save(),t.translate(i,a),t.rotate(h),t.drawImage(e,-e.width/2,-e.height/2,e.width,e.height),void t.restore();if(!(isNaN(n)||n<=0)){switch(t.beginPath(),e){default:t.arc(i,a,n,0,O),t.closePath();break;case"triangle":t.moveTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=I,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=I,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),t.closePath();break;case"rectRounded":u=n-(d=.516*n),s=Math.cos(h+F)*u,l=Math.sin(h+F)*u,t.arc(i-s,a-l,d,h-P,h-A),t.arc(i+l,a-s,d,h-A,h),t.arc(i+s,a+l,d,h,h+A),t.arc(i-l,a+s,d,h+A,h+P),t.closePath();break;case"rect":if(!r){u=Math.SQRT1_2*n,t.rect(i-u,a-u,2*u,2*u);break}h+=F;case"rectRot":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+l,a-s),t.lineTo(i+s,a+l),t.lineTo(i-l,a+s),t.closePath();break;case"crossRot":h+=F;case"cross":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"star":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s),h+=F,s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"line":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l);break;case"dash":t.moveTo(i,a),t.lineTo(i+Math.cos(h)*n,a+Math.sin(h)*n)}t.fill(),t.stroke()}},_isPointInArea:function(t,e){return t.x>e.left-1e-6&&t.x<e.right+1e-6&&t.y>e.top-1e-6&&t.y<e.bottom+1e-6},clipArea:function(t,e){t.save(),t.beginPath(),t.rect(e.left,e.top,e.right-e.left,e.bottom-e.top),t.clip()},unclipArea:function(t){t.restore()},lineTo:function(t,e,n,i){var a=n.steppedLine;if(a){if("middle"===a){var r=(e.x+n.x)/2;t.lineTo(r,i?n.y:e.y),t.lineTo(r,i?e.y:n.y)}else"after"===a&&!i||"after"!==a&&i?t.lineTo(e.x,n.y):t.lineTo(n.x,e.y);t.lineTo(n.x,n.y)}else n.tension?t.bezierCurveTo(i?e.controlPointPreviousX:e.controlPointNextX,i?e.controlPointPreviousY:e.controlPointNextY,i?n.controlPointNextX:n.controlPointPreviousX,i?n.controlPointNextY:n.controlPointPreviousY,n.x,n.y):t.lineTo(n.x,n.y)}},R=L;S.clear=L.clear,S.drawRoundedRectangle=function(t){t.beginPath(),L.roundedRect.apply(L,arguments)};var N={_set:function(t,e){return S.merge(this[t]||(this[t]={}),e)}};N._set("global",{defaultColor:"rgba(0,0,0,0.1)",defaultFontColor:"#666",defaultFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",defaultFontSize:12,defaultFontStyle:"normal",defaultLineHeight:1.2,showLines:!0});var W=N,Y=S.valueOrDefault;var z={toLineHeight:function(t,e){var n=(""+t).match(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/);if(!n||"normal"===n[1])return 1.2*e;switch(t=+n[2],n[3]){case"px":return t;case"%":t/=100}return e*t},toPadding:function(t){var e,n,i,a;return S.isObject(t)?(e=+t.top||0,n=+t.right||0,i=+t.bottom||0,a=+t.left||0):e=n=i=a=+t||0,{top:e,right:n,bottom:i,left:a,height:e+i,width:a+n}},_parseFont:function(t){var e=W.global,n=Y(t.fontSize,e.defaultFontSize),i={family:Y(t.fontFamily,e.defaultFontFamily),lineHeight:S.options.toLineHeight(Y(t.lineHeight,e.defaultLineHeight),n),size:n,style:Y(t.fontStyle,e.defaultFontStyle),weight:null,string:""};return i.string=function(t){return!t||S.isNullOrUndef(t.size)||S.isNullOrUndef(t.family)?null:(t.style?t.style+" ":"")+(t.weight?t.weight+" ":"")+t.size+"px "+t.family}(i),i},resolve:function(t,e,n,i){var a,r,o,s=!0;for(a=0,r=t.length;a<r;++a)if(void 0!==(o=t[a])&&(void 0!==e&&"function"==typeof o&&(o=o(e),s=!1),void 0!==n&&S.isArray(o)&&(o=o[n],s=!1),void 0!==o))return i&&!s&&(i.cacheable=!1),o}},E={_factorize:function(t){var e,n=[],i=Math.sqrt(t);for(e=1;e<i;e++)t%e==0&&(n.push(e),n.push(t/e));return i===(0|i)&&n.push(i),n.sort((function(t,e){return t-e})).pop(),n},log10:Math.log10||function(t){var e=Math.log(t)*Math.LOG10E,n=Math.round(e);return t===Math.pow(10,n)?n:e}},V=E;S.log10=E.log10;var H=S,B=C,j=R,U=z,G=V,q={getRtlAdapter:function(t,e,n){return t?function(t,e){return{x:function(n){return t+t+e-n},setWidth:function(t){e=t},textAlign:function(t){return"center"===t?t:"right"===t?"left":"right"},xPlus:function(t,e){return t-e},leftForLtr:function(t,e){return t-e}}}(e,n):{x:function(t){return t},setWidth:function(t){},textAlign:function(t){return t},xPlus:function(t,e){return t+e},leftForLtr:function(t,e){return t}}},overrideTextDirection:function(t,e){var n,i;"ltr"!==e&&"rtl"!==e||(i=[(n=t.canvas.style).getPropertyValue("direction"),n.getPropertyPriority("direction")],n.setProperty("direction",e,"important"),t.prevTextDirection=i)},restoreTextDirection:function(t){var e=t.prevTextDirection;void 0!==e&&(delete t.prevTextDirection,t.canvas.style.setProperty("direction",e[0],e[1]))}};H.easing=B,H.canvas=j,H.options=U,H.math=G,H.rtl=q;var Z=function(t){H.extend(this,t),this.initialize.apply(this,arguments)};H.extend(Z.prototype,{_type:void 0,initialize:function(){this.hidden=!1},pivot:function(){var t=this;return t._view||(t._view=H.extend({},t._model)),t._start={},t},transition:function(t){var e=this,n=e._model,i=e._start,a=e._view;return n&&1!==t?(a||(a=e._view={}),i||(i=e._start={}),function(t,e,n,i){var a,r,o,s,l,u,d,h,c,f=Object.keys(n);for(a=0,r=f.length;a<r;++a)if(u=n[o=f[a]],e.hasOwnProperty(o)||(e[o]=u),(s=e[o])!==u&&"_"!==o[0]){if(t.hasOwnProperty(o)||(t[o]=s),(d=typeof u)===typeof(l=t[o]))if("string"===d){if((h=k(l)).valid&&(c=k(u)).valid){e[o]=c.mix(h,i).rgbString();continue}}else if(H.isFinite(l)&&H.isFinite(u)){e[o]=l+(u-l)*i;continue}e[o]=u}}(i,a,n,t),e):(e._view=H.extend({},n),e._start=null,e)},tooltipPosition:function(){return{x:this._model.x,y:this._model.y}},hasValue:function(){return H.isNumber(this._model.x)&&H.isNumber(this._model.y)}}),Z.extend=H.inherits;var $=Z,X=$.extend({chart:null,currentStep:0,numSteps:60,easing:"",render:null,onAnimationProgress:null,onAnimationComplete:null}),K=X;Object.defineProperty(X.prototype,"animationObject",{get:function(){return this}}),Object.defineProperty(X.prototype,"chartInstance",{get:function(){return this.chart},set:function(t){this.chart=t}}),W._set("global",{animation:{duration:1e3,easing:"easeOutQuart",onProgress:H.noop,onComplete:H.noop}});var J={animations:[],request:null,addAnimation:function(t,e,n,i){var a,r,o=this.animations;for(e.chart=t,e.startTime=Date.now(),e.duration=n,i||(t.animating=!0),a=0,r=o.length;a<r;++a)if(o[a].chart===t)return void(o[a]=e);o.push(e),1===o.length&&this.requestAnimationFrame()},cancelAnimation:function(t){var e=H.findIndex(this.animations,(function(e){return e.chart===t}));-1!==e&&(this.animations.splice(e,1),t.animating=!1)},requestAnimationFrame:function(){var t=this;null===t.request&&(t.request=H.requestAnimFrame.call(window,(function(){t.request=null,t.startDigest()})))},startDigest:function(){this.advance(),this.animations.length>0&&this.requestAnimationFrame()},advance:function(){for(var t,e,n,i,a=this.animations,r=0;r<a.length;)e=(t=a[r]).chart,n=t.numSteps,i=Math.floor((Date.now()-t.startTime)/t.duration*n)+1,t.currentStep=Math.min(i,n),H.callback(t.render,[e,t],e),H.callback(t.onAnimationProgress,[t],e),t.currentStep>=n?(H.callback(t.onAnimationComplete,[t],e),e.animating=!1,a.splice(r,1)):++r}},Q=H.options.resolve,tt=["push","pop","shift","splice","unshift"];function et(t,e){var n=t._chartjs;if(n){var i=n.listeners,a=i.indexOf(e);-1!==a&&i.splice(a,1),i.length>0||(tt.forEach((function(e){delete t[e]})),delete t._chartjs)}}var nt=function(t,e){this.initialize(t,e)};H.extend(nt.prototype,{datasetElementType:null,dataElementType:null,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth"],_dataElementOptions:["backgroundColor","borderColor","borderWidth","pointStyle"],initialize:function(t,e){var n=this;n.chart=t,n.index=e,n.linkScales(),n.addElements(),n._type=n.getMeta().type},updateIndex:function(t){this.index=t},linkScales:function(){var t=this.getMeta(),e=this.chart,n=e.scales,i=this.getDataset(),a=e.options.scales;null!==t.xAxisID&&t.xAxisID in n&&!i.xAxisID||(t.xAxisID=i.xAxisID||a.xAxes[0].id),null!==t.yAxisID&&t.yAxisID in n&&!i.yAxisID||(t.yAxisID=i.yAxisID||a.yAxes[0].id)},getDataset:function(){return this.chart.data.datasets[this.index]},getMeta:function(){return this.chart.getDatasetMeta(this.index)},getScaleForId:function(t){return this.chart.scales[t]},_getValueScaleId:function(){return this.getMeta().yAxisID},_getIndexScaleId:function(){return this.getMeta().xAxisID},_getValueScale:function(){return this.getScaleForId(this._getValueScaleId())},_getIndexScale:function(){return this.getScaleForId(this._getIndexScaleId())},reset:function(){this._update(!0)},destroy:function(){this._data&&et(this._data,this)},createMetaDataset:function(){var t=this.datasetElementType;return t&&new t({_chart:this.chart,_datasetIndex:this.index})},createMetaData:function(t){var e=this.dataElementType;return e&&new e({_chart:this.chart,_datasetIndex:this.index,_index:t})},addElements:function(){var t,e,n=this.getMeta(),i=this.getDataset().data||[],a=n.data;for(t=0,e=i.length;t<e;++t)a[t]=a[t]||this.createMetaData(t);n.dataset=n.dataset||this.createMetaDataset()},addElementAndReset:function(t){var e=this.createMetaData(t);this.getMeta().data.splice(t,0,e),this.updateElement(e,t,!0)},buildOrUpdateElements:function(){var t,e,n=this,i=n.getDataset(),a=i.data||(i.data=[]);n._data!==a&&(n._data&&et(n._data,n),a&&Object.isExtensible(a)&&(e=n,(t=a)._chartjs?t._chartjs.listeners.push(e):(Object.defineProperty(t,"_chartjs",{configurable:!0,enumerable:!1,value:{listeners:[e]}}),tt.forEach((function(e){var n="onData"+e.charAt(0).toUpperCase()+e.slice(1),i=t[e];Object.defineProperty(t,e,{configurable:!0,enumerable:!1,value:function(){var e=Array.prototype.slice.call(arguments),a=i.apply(this,e);return H.each(t._chartjs.listeners,(function(t){"function"==typeof t[n]&&t[n].apply(t,e)})),a}})})))),n._data=a),n.resyncElements()},_configure:function(){this._config=H.merge({},[this.chart.options.datasets[this._type],this.getDataset()],{merger:function(t,e,n){"_meta"!==t&&"data"!==t&&H._merger(t,e,n)}})},_update:function(t){this._configure(),this._cachedDataOpts=null,this.update(t)},update:H.noop,transition:function(t){for(var e=this.getMeta(),n=e.data||[],i=n.length,a=0;a<i;++a)n[a].transition(t);e.dataset&&e.dataset.transition(t)},draw:function(){var t=this.getMeta(),e=t.data||[],n=e.length,i=0;for(t.dataset&&t.dataset.draw();i<n;++i)e[i].draw()},getStyle:function(t){var e,n=this.getMeta(),i=n.dataset;return this._configure(),i&&void 0===t?e=this._resolveDatasetElementOptions(i||{}):(t=t||0,e=this._resolveDataElementOptions(n.data[t]||{},t)),!1!==e.fill&&null!==e.fill||(e.backgroundColor=e.borderColor),e},_resolveDatasetElementOptions:function(t,e){var n,i,a,r,o=this,s=o.chart,l=o._config,u=t.custom||{},d=s.options.elements[o.datasetElementType.prototype._type]||{},h=o._datasetElementOptions,c={},f={chart:s,dataset:o.getDataset(),datasetIndex:o.index,hover:e};for(n=0,i=h.length;n<i;++n)a=h[n],r=e?"hover"+a.charAt(0).toUpperCase()+a.slice(1):a,c[a]=Q([u[r],l[r],d[r]],f);return c},_resolveDataElementOptions:function(t,e){var n=this,i=t&&t.custom,a=n._cachedDataOpts;if(a&&!i)return a;var r,o,s,l,u=n.chart,d=n._config,h=u.options.elements[n.dataElementType.prototype._type]||{},c=n._dataElementOptions,f={},g={chart:u,dataIndex:e,dataset:n.getDataset(),datasetIndex:n.index},m={cacheable:!i};if(i=i||{},H.isArray(c))for(o=0,s=c.length;o<s;++o)f[l=c[o]]=Q([i[l],d[l],h[l]],g,e,m);else for(o=0,s=(r=Object.keys(c)).length;o<s;++o)f[l=r[o]]=Q([i[l],d[c[l]],d[l],h[l]],g,e,m);return m.cacheable&&(n._cachedDataOpts=Object.freeze(f)),f},removeHoverStyle:function(t){H.merge(t._model,t.$previousStyle||{}),delete t.$previousStyle},setHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],n=t._index,i=t.custom||{},a=t._model,r=H.getHoverColor;t.$previousStyle={backgroundColor:a.backgroundColor,borderColor:a.borderColor,borderWidth:a.borderWidth},a.backgroundColor=Q([i.hoverBackgroundColor,e.hoverBackgroundColor,r(a.backgroundColor)],void 0,n),a.borderColor=Q([i.hoverBorderColor,e.hoverBorderColor,r(a.borderColor)],void 0,n),a.borderWidth=Q([i.hoverBorderWidth,e.hoverBorderWidth,a.borderWidth],void 0,n)},_removeDatasetHoverStyle:function(){var t=this.getMeta().dataset;t&&this.removeHoverStyle(t)},_setDatasetHoverStyle:function(){var t,e,n,i,a,r,o=this.getMeta().dataset,s={};if(o){for(r=o._model,a=this._resolveDatasetElementOptions(o,!0),t=0,e=(i=Object.keys(a)).length;t<e;++t)s[n=i[t]]=r[n],r[n]=a[n];o.$previousStyle=s}},resyncElements:function(){var t=this.getMeta(),e=this.getDataset().data,n=t.data.length,i=e.length;i<n?t.data.splice(i,n-i):i>n&&this.insertElements(n,i-n)},insertElements:function(t,e){for(var n=0;n<e;++n)this.addElementAndReset(t+n)},onDataPush:function(){var t=arguments.length;this.insertElements(this.getDataset().data.length-t,t)},onDataPop:function(){this.getMeta().data.pop()},onDataShift:function(){this.getMeta().data.shift()},onDataSplice:function(t,e){this.getMeta().data.splice(t,e),this.insertElements(t,arguments.length-2)},onDataUnshift:function(){this.insertElements(0,arguments.length)}}),nt.extend=H.inherits;var it=nt,at=2*Math.PI;function rt(t,e){var n=e.startAngle,i=e.endAngle,a=e.pixelMargin,r=a/e.outerRadius,o=e.x,s=e.y;t.beginPath(),t.arc(o,s,e.outerRadius,n-r,i+r),e.innerRadius>a?(r=a/e.innerRadius,t.arc(o,s,e.innerRadius-a,i+r,n-r,!0)):t.arc(o,s,a,i+Math.PI/2,n-Math.PI/2),t.closePath(),t.clip()}function ot(t,e,n){var i="inner"===e.borderAlign;i?(t.lineWidth=2*e.borderWidth,t.lineJoin="round"):(t.lineWidth=e.borderWidth,t.lineJoin="bevel"),n.fullCircles&&function(t,e,n,i){var a,r=n.endAngle;for(i&&(n.endAngle=n.startAngle+at,rt(t,n),n.endAngle=r,n.endAngle===n.startAngle&&n.fullCircles&&(n.endAngle+=at,n.fullCircles--)),t.beginPath(),t.arc(n.x,n.y,n.innerRadius,n.startAngle+at,n.startAngle,!0),a=0;a<n.fullCircles;++a)t.stroke();for(t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.startAngle+at),a=0;a<n.fullCircles;++a)t.stroke()}(t,e,n,i),i&&rt(t,n),t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.endAngle),t.arc(n.x,n.y,n.innerRadius,n.endAngle,n.startAngle,!0),t.closePath(),t.stroke()}W._set("global",{elements:{arc:{backgroundColor:W.global.defaultColor,borderColor:"#fff",borderWidth:2,borderAlign:"center"}}});var st=$.extend({_type:"arc",inLabelRange:function(t){var e=this._view;return!!e&&Math.pow(t-e.x,2)<Math.pow(e.radius+e.hoverRadius,2)},inRange:function(t,e){var n=this._view;if(n){for(var i=H.getAngleFromPoint(n,{x:t,y:e}),a=i.angle,r=i.distance,o=n.startAngle,s=n.endAngle;s<o;)s+=at;for(;a>s;)a-=at;for(;a<o;)a+=at;var l=a>=o&&a<=s,u=r>=n.innerRadius&&r<=n.outerRadius;return l&&u}return!1},getCenterPoint:function(){var t=this._view,e=(t.startAngle+t.endAngle)/2,n=(t.innerRadius+t.outerRadius)/2;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},getArea:function(){var t=this._view;return Math.PI*((t.endAngle-t.startAngle)/(2*Math.PI))*(Math.pow(t.outerRadius,2)-Math.pow(t.innerRadius,2))},tooltipPosition:function(){var t=this._view,e=t.startAngle+(t.endAngle-t.startAngle)/2,n=(t.outerRadius-t.innerRadius)/2+t.innerRadius;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},draw:function(){var t,e=this._chart.ctx,n=this._view,i="inner"===n.borderAlign?.33:0,a={x:n.x,y:n.y,innerRadius:n.innerRadius,outerRadius:Math.max(n.outerRadius-i,0),pixelMargin:i,startAngle:n.startAngle,endAngle:n.endAngle,fullCircles:Math.floor(n.circumference/at)};if(e.save(),e.fillStyle=n.backgroundColor,e.strokeStyle=n.borderColor,a.fullCircles){for(a.endAngle=a.startAngle+at,e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),t=0;t<a.fullCircles;++t)e.fill();a.endAngle=a.startAngle+n.circumference%at}e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),e.fill(),n.borderWidth&&ot(e,n,a),e.restore()}}),lt=H.valueOrDefault,ut=W.global.defaultColor;W._set("global",{elements:{line:{tension:.4,backgroundColor:ut,borderWidth:3,borderColor:ut,borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",capBezierPoints:!0,fill:!0}}});var dt=$.extend({_type:"line",draw:function(){var t,e,n,i=this,a=i._view,r=i._chart.ctx,o=a.spanGaps,s=i._children.slice(),l=W.global,u=l.elements.line,d=-1,h=i._loop;if(s.length){if(i._loop){for(t=0;t<s.length;++t)if(e=H.previousItem(s,t),!s[t]._view.skip&&e._view.skip){s=s.slice(t).concat(s.slice(0,t)),h=o;break}h&&s.push(s[0])}for(r.save(),r.lineCap=a.borderCapStyle||u.borderCapStyle,r.setLineDash&&r.setLineDash(a.borderDash||u.borderDash),r.lineDashOffset=lt(a.borderDashOffset,u.borderDashOffset),r.lineJoin=a.borderJoinStyle||u.borderJoinStyle,r.lineWidth=lt(a.borderWidth,u.borderWidth),r.strokeStyle=a.borderColor||l.defaultColor,r.beginPath(),(n=s[0]._view).skip||(r.moveTo(n.x,n.y),d=0),t=1;t<s.length;++t)n=s[t]._view,e=-1===d?H.previousItem(s,t):s[d],n.skip||(d!==t-1&&!o||-1===d?r.moveTo(n.x,n.y):H.canvas.lineTo(r,e._view,n),d=t);h&&r.closePath(),r.stroke(),r.restore()}}}),ht=H.valueOrDefault,ct=W.global.defaultColor;function ft(t){var e=this._view;return!!e&&Math.abs(t-e.x)<e.radius+e.hitRadius}W._set("global",{elements:{point:{radius:3,pointStyle:"circle",backgroundColor:ct,borderColor:ct,borderWidth:1,hitRadius:1,hoverRadius:4,hoverBorderWidth:1}}});var gt=$.extend({_type:"point",inRange:function(t,e){var n=this._view;return!!n&&Math.pow(t-n.x,2)+Math.pow(e-n.y,2)<Math.pow(n.hitRadius+n.radius,2)},inLabelRange:ft,inXRange:ft,inYRange:function(t){var e=this._view;return!!e&&Math.abs(t-e.y)<e.radius+e.hitRadius},getCenterPoint:function(){var t=this._view;return{x:t.x,y:t.y}},getArea:function(){return Math.PI*Math.pow(this._view.radius,2)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y,padding:t.radius+t.borderWidth}},draw:function(t){var e=this._view,n=this._chart.ctx,i=e.pointStyle,a=e.rotation,r=e.radius,o=e.x,s=e.y,l=W.global,u=l.defaultColor;e.skip||(void 0===t||H.canvas._isPointInArea(e,t))&&(n.strokeStyle=e.borderColor||u,n.lineWidth=ht(e.borderWidth,l.elements.point.borderWidth),n.fillStyle=e.backgroundColor||u,H.canvas.drawPoint(n,i,r,o,s,a))}}),mt=W.global.defaultColor;function pt(t){return t&&void 0!==t.width}function vt(t){var e,n,i,a,r;return pt(t)?(r=t.width/2,e=t.x-r,n=t.x+r,i=Math.min(t.y,t.base),a=Math.max(t.y,t.base)):(r=t.height/2,e=Math.min(t.x,t.base),n=Math.max(t.x,t.base),i=t.y-r,a=t.y+r),{left:e,top:i,right:n,bottom:a}}function bt(t,e,n){return t===e?n:t===n?e:t}function yt(t,e,n){var i,a,r,o,s=t.borderWidth,l=function(t){var e=t.borderSkipped,n={};return e?(t.horizontal?t.base>t.x&&(e=bt(e,"left","right")):t.base<t.y&&(e=bt(e,"bottom","top")),n[e]=!0,n):n}(t);return H.isObject(s)?(i=+s.top||0,a=+s.right||0,r=+s.bottom||0,o=+s.left||0):i=a=r=o=+s||0,{t:l.top||i<0?0:i>n?n:i,r:l.right||a<0?0:a>e?e:a,b:l.bottom||r<0?0:r>n?n:r,l:l.left||o<0?0:o>e?e:o}}function xt(t,e,n){var i=null===e,a=null===n,r=!(!t||i&&a)&&vt(t);return r&&(i||e>=r.left&&e<=r.right)&&(a||n>=r.top&&n<=r.bottom)}W._set("global",{elements:{rectangle:{backgroundColor:mt,borderColor:mt,borderSkipped:"bottom",borderWidth:0}}});var _t=$.extend({_type:"rectangle",draw:function(){var t=this._chart.ctx,e=this._view,n=function(t){var e=vt(t),n=e.right-e.left,i=e.bottom-e.top,a=yt(t,n/2,i/2);return{outer:{x:e.left,y:e.top,w:n,h:i},inner:{x:e.left+a.l,y:e.top+a.t,w:n-a.l-a.r,h:i-a.t-a.b}}}(e),i=n.outer,a=n.inner;t.fillStyle=e.backgroundColor,t.fillRect(i.x,i.y,i.w,i.h),i.w===a.w&&i.h===a.h||(t.save(),t.beginPath(),t.rect(i.x,i.y,i.w,i.h),t.clip(),t.fillStyle=e.borderColor,t.rect(a.x,a.y,a.w,a.h),t.fill("evenodd"),t.restore())},height:function(){var t=this._view;return t.base-t.y},inRange:function(t,e){return xt(this._view,t,e)},inLabelRange:function(t,e){var n=this._view;return pt(n)?xt(n,t,null):xt(n,null,e)},inXRange:function(t){return xt(this._view,t,null)},inYRange:function(t){return xt(this._view,null,t)},getCenterPoint:function(){var t,e,n=this._view;return pt(n)?(t=n.x,e=(n.y+n.base)/2):(t=(n.x+n.base)/2,e=n.y),{x:t,y:e}},getArea:function(){var t=this._view;return pt(t)?t.width*Math.abs(t.y-t.base):t.height*Math.abs(t.x-t.base)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y}}}),wt={},kt=st,Mt=dt,St=gt,Dt=_t;wt.Arc=kt,wt.Line=Mt,wt.Point=St,wt.Rectangle=Dt;var Ct=H._deprecated,Pt=H.valueOrDefault;function Tt(t,e,n){var i,a,r=n.barThickness,o=e.stackCount,s=e.pixels[t],l=H.isNullOrUndef(r)?function(t,e){var n,i,a,r,o=t._length;for(a=1,r=e.length;a<r;++a)o=Math.min(o,Math.abs(e[a]-e[a-1]));for(a=0,r=t.getTicks().length;a<r;++a)i=t.getPixelForTick(a),o=a>0?Math.min(o,Math.abs(i-n)):o,n=i;return o}(e.scale,e.pixels):-1;return H.isNullOrUndef(r)?(i=l*n.categoryPercentage,a=n.barPercentage):(i=r*o,a=1),{chunk:i/o,ratio:a,start:s-i/2}}W._set("bar",{hover:{mode:"label"},scales:{xAxes:[{type:"category",offset:!0,gridLines:{offsetGridLines:!0}}],yAxes:[{type:"linear"}]}}),W._set("global",{datasets:{bar:{categoryPercentage:.8,barPercentage:.9}}});var Ot=it.extend({dataElementType:wt.Rectangle,_dataElementOptions:["backgroundColor","borderColor","borderSkipped","borderWidth","barPercentage","barThickness","categoryPercentage","maxBarThickness","minBarLength"],initialize:function(){var t,e,n=this;it.prototype.initialize.apply(n,arguments),(t=n.getMeta()).stack=n.getDataset().stack,t.bar=!0,e=n._getIndexScale().options,Ct("bar chart",e.barPercentage,"scales.[x/y]Axes.barPercentage","dataset.barPercentage"),Ct("bar chart",e.barThickness,"scales.[x/y]Axes.barThickness","dataset.barThickness"),Ct("bar chart",e.categoryPercentage,"scales.[x/y]Axes.categoryPercentage","dataset.categoryPercentage"),Ct("bar chart",n._getValueScale().options.minBarLength,"scales.[x/y]Axes.minBarLength","dataset.minBarLength"),Ct("bar chart",e.maxBarThickness,"scales.[x/y]Axes.maxBarThickness","dataset.maxBarThickness")},update:function(t){var e,n,i=this.getMeta().data;for(this._ruler=this.getRuler(),e=0,n=i.length;e<n;++e)this.updateElement(i[e],e,t)},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=i.getDataset(),o=i._resolveDataElementOptions(t,e);t._xScale=i.getScaleForId(a.xAxisID),t._yScale=i.getScaleForId(a.yAxisID),t._datasetIndex=i.index,t._index=e,t._model={backgroundColor:o.backgroundColor,borderColor:o.borderColor,borderSkipped:o.borderSkipped,borderWidth:o.borderWidth,datasetLabel:r.label,label:i.chart.data.labels[e]},H.isArray(r.data[e])&&(t._model.borderSkipped=null),i._updateElementGeometry(t,e,n,o),t.pivot()},_updateElementGeometry:function(t,e,n,i){var a=this,r=t._model,o=a._getValueScale(),s=o.getBasePixel(),l=o.isHorizontal(),u=a._ruler||a.getRuler(),d=a.calculateBarValuePixels(a.index,e,i),h=a.calculateBarIndexPixels(a.index,e,u,i);r.horizontal=l,r.base=n?s:d.base,r.x=l?n?s:d.head:h.center,r.y=l?h.center:n?s:d.head,r.height=l?h.size:void 0,r.width=l?void 0:h.size},_getStacks:function(t){var e,n,i=this._getIndexScale(),a=i._getMatchingVisibleMetas(this._type),r=i.options.stacked,o=a.length,s=[];for(e=0;e<o&&(n=a[e],(!1===r||-1===s.indexOf(n.stack)||void 0===r&&void 0===n.stack)&&s.push(n.stack),n.index!==t);++e);return s},getStackCount:function(){return this._getStacks().length},getStackIndex:function(t,e){var n=this._getStacks(t),i=void 0!==e?n.indexOf(e):-1;return-1===i?n.length-1:i},getRuler:function(){var t,e,n=this._getIndexScale(),i=[];for(t=0,e=this.getMeta().data.length;t<e;++t)i.push(n.getPixelForValue(null,t,this.index));return{pixels:i,start:n._startPixel,end:n._endPixel,stackCount:this.getStackCount(),scale:n}},calculateBarValuePixels:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._getValueScale(),c=h.isHorizontal(),f=d.data.datasets,g=h._getMatchingVisibleMetas(this._type),m=h._parseValue(f[t].data[e]),p=n.minBarLength,v=h.options.stacked,b=this.getMeta().stack,y=void 0===m.start?0:m.max>=0&&m.min>=0?m.min:m.max,x=void 0===m.start?m.end:m.max>=0&&m.min>=0?m.max-m.min:m.min-m.max,_=g.length;if(v||void 0===v&&void 0!==b)for(i=0;i<_&&(a=g[i]).index!==t;++i)a.stack===b&&(r=void 0===(u=h._parseValue(f[a.index].data[e])).start?u.end:u.min>=0&&u.max>=0?u.max:u.min,(m.min<0&&r<0||m.max>=0&&r>0)&&(y+=r));return o=h.getPixelForValue(y),l=(s=h.getPixelForValue(y+x))-o,void 0!==p&&Math.abs(l)<p&&(l=p,s=x>=0&&!c||x<0&&c?o-p:o+p),{size:l,base:o,head:s,center:s+l/2}},calculateBarIndexPixels:function(t,e,n,i){var a="flex"===i.barThickness?function(t,e,n){var i,a=e.pixels,r=a[t],o=t>0?a[t-1]:null,s=t<a.length-1?a[t+1]:null,l=n.categoryPercentage;return null===o&&(o=r-(null===s?e.end-e.start:s-r)),null===s&&(s=r+r-o),i=r-(r-Math.min(o,s))/2*l,{chunk:Math.abs(s-o)/2*l/e.stackCount,ratio:n.barPercentage,start:i}}(e,n,i):Tt(e,n,i),r=this.getStackIndex(t,this.getMeta().stack),o=a.start+a.chunk*r+a.chunk/2,s=Math.min(Pt(i.maxBarThickness,1/0),a.chunk*a.ratio);return{base:o-s/2,head:o+s/2,center:o,size:s}},draw:function(){var t=this.chart,e=this._getValueScale(),n=this.getMeta().data,i=this.getDataset(),a=n.length,r=0;for(H.canvas.clipArea(t.ctx,t.chartArea);r<a;++r){var o=e._parseValue(i.data[r]);isNaN(o.min)||isNaN(o.max)||n[r].draw()}H.canvas.unclipArea(t.ctx)},_resolveDataElementOptions:function(){var t=this,e=H.extend({},it.prototype._resolveDataElementOptions.apply(t,arguments)),n=t._getIndexScale().options,i=t._getValueScale().options;return e.barPercentage=Pt(n.barPercentage,e.barPercentage),e.barThickness=Pt(n.barThickness,e.barThickness),e.categoryPercentage=Pt(n.categoryPercentage,e.categoryPercentage),e.maxBarThickness=Pt(n.maxBarThickness,e.maxBarThickness),e.minBarLength=Pt(i.minBarLength,e.minBarLength),e}}),At=H.valueOrDefault,Ft=H.options.resolve;W._set("bubble",{hover:{mode:"single"},scales:{xAxes:[{type:"linear",position:"bottom",id:"x-axis-0"}],yAxes:[{type:"linear",position:"left",id:"y-axis-0"}]},tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.datasets[t.datasetIndex].label||"",i=e.datasets[t.datasetIndex].data[t.index];return n+": ("+t.xLabel+", "+t.yLabel+", "+i.r+")"}}}});var It=it.extend({dataElementType:wt.Point,_dataElementOptions:["backgroundColor","borderColor","borderWidth","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth","hoverRadius","hitRadius","pointStyle","rotation"],update:function(t){var e=this,n=e.getMeta().data;H.each(n,(function(n,i){e.updateElement(n,i,t)}))},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=t.custom||{},o=i.getScaleForId(a.xAxisID),s=i.getScaleForId(a.yAxisID),l=i._resolveDataElementOptions(t,e),u=i.getDataset().data[e],d=i.index,h=n?o.getPixelForDecimal(.5):o.getPixelForValue("object"==typeof u?u:NaN,e,d),c=n?s.getBasePixel():s.getPixelForValue(u,e,d);t._xScale=o,t._yScale=s,t._options=l,t._datasetIndex=d,t._index=e,t._model={backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,hitRadius:l.hitRadius,pointStyle:l.pointStyle,rotation:l.rotation,radius:n?0:l.radius,skip:r.skip||isNaN(h)||isNaN(c),x:h,y:c},t.pivot()},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=At(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=At(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=At(n.hoverBorderWidth,n.borderWidth),e.radius=n.radius+n.hoverRadius},_resolveDataElementOptions:function(t,e){var n=this,i=n.chart,a=n.getDataset(),r=t.custom||{},o=a.data[e]||{},s=it.prototype._resolveDataElementOptions.apply(n,arguments),l={chart:i,dataIndex:e,dataset:a,datasetIndex:n.index};return n._cachedDataOpts===s&&(s=H.extend({},s)),s.radius=Ft([r.radius,o.r,n._config.radius,i.options.elements.point.radius],l,e),s}}),Lt=H.valueOrDefault,Rt=Math.PI,Nt=2*Rt,Wt=Rt/2;W._set("doughnut",{animation:{animateRotate:!0,animateScale:!1},hover:{mode:"single"},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r]&&(a.data[r].hidden=!a.data[r].hidden);o.update()}},cutoutPercentage:50,rotation:-Wt,circumference:Nt,tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.labels[t.index],i=": "+e.datasets[t.datasetIndex].data[t.index];return H.isArray(n)?(n=n.slice())[0]+=i:n+=i,n}}}});var Yt=it.extend({dataElementType:wt.Arc,linkScales:H.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],getRingIndex:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&++e;return e},update:function(t){var e,n,i,a,r=this,o=r.chart,s=o.chartArea,l=o.options,u=1,d=1,h=0,c=0,f=r.getMeta(),g=f.data,m=l.cutoutPercentage/100||0,p=l.circumference,v=r._getRingWeight(r.index);if(p<Nt){var b=l.rotation%Nt,y=(b+=b>=Rt?-Nt:b<-Rt?Nt:0)+p,x=Math.cos(b),_=Math.sin(b),w=Math.cos(y),k=Math.sin(y),M=b<=0&&y>=0||y>=Nt,S=b<=Wt&&y>=Wt||y>=Nt+Wt,D=b<=-Wt&&y>=-Wt||y>=Rt+Wt,C=b===-Rt||y>=Rt?-1:Math.min(x,x*m,w,w*m),P=D?-1:Math.min(_,_*m,k,k*m),T=M?1:Math.max(x,x*m,w,w*m),O=S?1:Math.max(_,_*m,k,k*m);u=(T-C)/2,d=(O-P)/2,h=-(T+C)/2,c=-(O+P)/2}for(i=0,a=g.length;i<a;++i)g[i]._options=r._resolveDataElementOptions(g[i],i);for(o.borderWidth=r.getMaxBorderWidth(),e=(s.right-s.left-o.borderWidth)/u,n=(s.bottom-s.top-o.borderWidth)/d,o.outerRadius=Math.max(Math.min(e,n)/2,0),o.innerRadius=Math.max(o.outerRadius*m,0),o.radiusLength=(o.outerRadius-o.innerRadius)/(r._getVisibleDatasetWeightTotal()||1),o.offsetX=h*o.outerRadius,o.offsetY=c*o.outerRadius,f.total=r.calculateTotal(),r.outerRadius=o.outerRadius-o.radiusLength*r._getRingWeightOffset(r.index),r.innerRadius=Math.max(r.outerRadius-o.radiusLength*v,0),i=0,a=g.length;i<a;++i)r.updateElement(g[i],i,t)},updateElement:function(t,e,n){var i=this,a=i.chart,r=a.chartArea,o=a.options,s=o.animation,l=(r.left+r.right)/2,u=(r.top+r.bottom)/2,d=o.rotation,h=o.rotation,c=i.getDataset(),f=n&&s.animateRotate?0:t.hidden?0:i.calculateCircumference(c.data[e])*(o.circumference/Nt),g=n&&s.animateScale?0:i.innerRadius,m=n&&s.animateScale?0:i.outerRadius,p=t._options||{};H.extend(t,{_datasetIndex:i.index,_index:e,_model:{backgroundColor:p.backgroundColor,borderColor:p.borderColor,borderWidth:p.borderWidth,borderAlign:p.borderAlign,x:l+a.offsetX,y:u+a.offsetY,startAngle:d,endAngle:h,circumference:f,outerRadius:m,innerRadius:g,label:H.valueAtIndexOrDefault(c.label,e,a.data.labels[e])}});var v=t._model;n&&s.animateRotate||(v.startAngle=0===e?o.rotation:i.getMeta().data[e-1]._model.endAngle,v.endAngle=v.startAngle+v.circumference),t.pivot()},calculateTotal:function(){var t,e=this.getDataset(),n=this.getMeta(),i=0;return H.each(n.data,(function(n,a){t=e.data[a],isNaN(t)||n.hidden||(i+=Math.abs(t))})),i},calculateCircumference:function(t){var e=this.getMeta().total;return e>0&&!isNaN(t)?Nt*(Math.abs(t)/e):0},getMaxBorderWidth:function(t){var e,n,i,a,r,o,s,l,u=0,d=this.chart;if(!t)for(e=0,n=d.data.datasets.length;e<n;++e)if(d.isDatasetVisible(e)){t=(i=d.getDatasetMeta(e)).data,e!==this.index&&(r=i.controller);break}if(!t)return 0;for(e=0,n=t.length;e<n;++e)a=t[e],r?(r._configure(),o=r._resolveDataElementOptions(a,e)):o=a._options,"inner"!==o.borderAlign&&(s=o.borderWidth,u=(l=o.hoverBorderWidth)>(u=s>u?s:u)?l:u);return u},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=Lt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Lt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Lt(n.hoverBorderWidth,n.borderWidth)},_getRingWeightOffset:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&(e+=this._getRingWeight(n));return e},_getRingWeight:function(t){return Math.max(Lt(this.chart.data.datasets[t].weight,1),0)},_getVisibleDatasetWeightTotal:function(){return this._getRingWeightOffset(this.chart.data.datasets.length)}});W._set("horizontalBar",{hover:{mode:"index",axis:"y"},scales:{xAxes:[{type:"linear",position:"bottom"}],yAxes:[{type:"category",position:"left",offset:!0,gridLines:{offsetGridLines:!0}}]},elements:{rectangle:{borderSkipped:"left"}},tooltips:{mode:"index",axis:"y"}}),W._set("global",{datasets:{horizontalBar:{categoryPercentage:.8,barPercentage:.9}}});var zt=Ot.extend({_getValueScaleId:function(){return this.getMeta().xAxisID},_getIndexScaleId:function(){return this.getMeta().yAxisID}}),Et=H.valueOrDefault,Vt=H.options.resolve,Ht=H.canvas._isPointInArea;function Bt(t,e){var n=t&&t.options.ticks||{},i=n.reverse,a=void 0===n.min?e:0,r=void 0===n.max?e:0;return{start:i?r:a,end:i?a:r}}function jt(t,e,n){var i=n/2,a=Bt(t,i),r=Bt(e,i);return{top:r.end,right:a.end,bottom:r.start,left:a.start}}function Ut(t){var e,n,i,a;return H.isObject(t)?(e=t.top,n=t.right,i=t.bottom,a=t.left):e=n=i=a=t,{top:e,right:n,bottom:i,left:a}}W._set("line",{showLines:!0,spanGaps:!1,hover:{mode:"label"},scales:{xAxes:[{type:"category",id:"x-axis-0"}],yAxes:[{type:"linear",id:"y-axis-0"}]}});var Gt=it.extend({datasetElementType:wt.Line,dataElementType:wt.Point,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth","cubicInterpolationMode","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.options,l=i._config,u=i._showLine=Et(l.showLine,s.showLines);for(i._xScale=i.getScaleForId(a.xAxisID),i._yScale=i.getScaleForId(a.yAxisID),u&&(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=i._yScale,r._datasetIndex=i.index,r._children=o,r._model=i._resolveDatasetElementOptions(r),r.pivot()),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(u&&0!==r._model.tension&&i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i,a,r=this,o=r.getMeta(),s=t.custom||{},l=r.getDataset(),u=r.index,d=l.data[e],h=r._xScale,c=r._yScale,f=o.dataset._model,g=r._resolveDataElementOptions(t,e);i=h.getPixelForValue("object"==typeof d?d:NaN,e,u),a=n?c.getBasePixel():r.calculatePointY(d,e,u),t._xScale=h,t._yScale=c,t._options=g,t._datasetIndex=u,t._index=e,t._model={x:i,y:a,skip:s.skip||isNaN(i)||isNaN(a),radius:g.radius,pointStyle:g.pointStyle,rotation:g.rotation,backgroundColor:g.backgroundColor,borderColor:g.borderColor,borderWidth:g.borderWidth,tension:Et(s.tension,f?f.tension:0),steppedLine:!!f&&f.steppedLine,hitRadius:g.hitRadius}},_resolveDatasetElementOptions:function(t){var e=this,n=e._config,i=t.custom||{},a=e.chart.options,r=a.elements.line,o=it.prototype._resolveDatasetElementOptions.apply(e,arguments);return o.spanGaps=Et(n.spanGaps,a.spanGaps),o.tension=Et(n.lineTension,r.tension),o.steppedLine=Vt([i.steppedLine,n.steppedLine,r.stepped]),o.clip=Ut(Et(n.clip,jt(e._xScale,e._yScale,o.borderWidth))),o},calculatePointY:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._yScale,c=0,f=0;if(h.options.stacked){for(s=+h.getRightValue(t),u=(l=d._getSortedVisibleDatasetMetas()).length,i=0;i<u&&(r=l[i]).index!==n;++i)a=d.data.datasets[r.index],"line"===r.type&&r.yAxisID===h.id&&((o=+h.getRightValue(a.data[e]))<0?f+=o||0:c+=o||0);return s<0?h.getPixelForValue(f+s):h.getPixelForValue(c+s)}return h.getPixelForValue(t)},updateBezierControlPoints:function(){var t,e,n,i,a=this.chart,r=this.getMeta(),o=r.dataset._model,s=a.chartArea,l=r.data||[];function u(t,e,n){return Math.max(Math.min(t,n),e)}if(o.spanGaps&&(l=l.filter((function(t){return!t._model.skip}))),"monotone"===o.cubicInterpolationMode)H.splineCurveMonotone(l);else for(t=0,e=l.length;t<e;++t)n=l[t]._model,i=H.splineCurve(H.previousItem(l,t)._model,n,H.nextItem(l,t)._model,o.tension),n.controlPointPreviousX=i.previous.x,n.controlPointPreviousY=i.previous.y,n.controlPointNextX=i.next.x,n.controlPointNextY=i.next.y;if(a.options.elements.line.capBezierPoints)for(t=0,e=l.length;t<e;++t)n=l[t]._model,Ht(n,s)&&(t>0&&Ht(l[t-1]._model,s)&&(n.controlPointPreviousX=u(n.controlPointPreviousX,s.left,s.right),n.controlPointPreviousY=u(n.controlPointPreviousY,s.top,s.bottom)),t<l.length-1&&Ht(l[t+1]._model,s)&&(n.controlPointNextX=u(n.controlPointNextX,s.left,s.right),n.controlPointNextY=u(n.controlPointNextY,s.top,s.bottom)))},draw:function(){var t,e=this.chart,n=this.getMeta(),i=n.data||[],a=e.chartArea,r=e.canvas,o=0,s=i.length;for(this._showLine&&(t=n.dataset._model.clip,H.canvas.clipArea(e.ctx,{left:!1===t.left?0:a.left-t.left,right:!1===t.right?r.width:a.right+t.right,top:!1===t.top?0:a.top-t.top,bottom:!1===t.bottom?r.height:a.bottom+t.bottom}),n.dataset.draw(),H.canvas.unclipArea(e.ctx));o<s;++o)i[o].draw(a)},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Et(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Et(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Et(n.hoverBorderWidth,n.borderWidth),e.radius=Et(n.hoverRadius,n.radius)}}),qt=H.options.resolve;W._set("polarArea",{scale:{type:"radialLinear",angleLines:{display:!1},gridLines:{circular:!0},pointLabels:{display:!1},ticks:{beginAtZero:!0}},animation:{animateRotate:!0,animateScale:!0},startAngle:-.5*Math.PI,legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r].hidden=!a.data[r].hidden;o.update()}},tooltips:{callbacks:{title:function(){return""},label:function(t,e){return e.labels[t.index]+": "+t.yLabel}}}});var Zt=it.extend({dataElementType:wt.Arc,linkScales:H.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i,a=this,r=a.getDataset(),o=a.getMeta(),s=a.chart.options.startAngle||0,l=a._starts=[],u=a._angles=[],d=o.data;for(a._updateRadius(),o.count=a.countVisibleElements(),e=0,n=r.data.length;e<n;e++)l[e]=s,i=a._computeAngle(e),u[e]=i,s+=i;for(e=0,n=d.length;e<n;++e)d[e]._options=a._resolveDataElementOptions(d[e],e),a.updateElement(d[e],e,t)},_updateRadius:function(){var t=this,e=t.chart,n=e.chartArea,i=e.options,a=Math.min(n.right-n.left,n.bottom-n.top);e.outerRadius=Math.max(a/2,0),e.innerRadius=Math.max(i.cutoutPercentage?e.outerRadius/100*i.cutoutPercentage:1,0),e.radiusLength=(e.outerRadius-e.innerRadius)/e.getVisibleDatasetCount(),t.outerRadius=e.outerRadius-e.radiusLength*t.index,t.innerRadius=t.outerRadius-e.radiusLength},updateElement:function(t,e,n){var i=this,a=i.chart,r=i.getDataset(),o=a.options,s=o.animation,l=a.scale,u=a.data.labels,d=l.xCenter,h=l.yCenter,c=o.startAngle,f=t.hidden?0:l.getDistanceFromCenterForValue(r.data[e]),g=i._starts[e],m=g+(t.hidden?0:i._angles[e]),p=s.animateScale?0:l.getDistanceFromCenterForValue(r.data[e]),v=t._options||{};H.extend(t,{_datasetIndex:i.index,_index:e,_scale:l,_model:{backgroundColor:v.backgroundColor,borderColor:v.borderColor,borderWidth:v.borderWidth,borderAlign:v.borderAlign,x:d,y:h,innerRadius:0,outerRadius:n?p:f,startAngle:n&&s.animateRotate?c:g,endAngle:n&&s.animateRotate?c:m,label:H.valueAtIndexOrDefault(u,e,u[e])}}),t.pivot()},countVisibleElements:function(){var t=this.getDataset(),e=this.getMeta(),n=0;return H.each(e.data,(function(e,i){isNaN(t.data[i])||e.hidden||n++})),n},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor,a=H.valueOrDefault;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=a(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=a(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=a(n.hoverBorderWidth,n.borderWidth)},_computeAngle:function(t){var e=this,n=this.getMeta().count,i=e.getDataset(),a=e.getMeta();if(isNaN(i.data[t])||a.data[t].hidden)return 0;var r={chart:e.chart,dataIndex:t,dataset:i,datasetIndex:e.index};return qt([e.chart.options.elements.arc.angle,2*Math.PI/n],r,t)}});W._set("pie",H.clone(W.doughnut)),W._set("pie",{cutoutPercentage:0});var $t=Yt,Xt=H.valueOrDefault;W._set("radar",{spanGaps:!1,scale:{type:"radialLinear"},elements:{line:{fill:"start",tension:0}}});var Kt=it.extend({datasetElementType:wt.Line,dataElementType:wt.Point,linkScales:H.noop,_datasetElementOptions:["backgroundColor","borderWidth","borderColor","borderCapStyle","borderDash","borderDashOffset","borderJoinStyle","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.scale,l=i._config;for(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=s,r._datasetIndex=i.index,r._children=o,r._loop=!0,r._model=i._resolveDatasetElementOptions(r),r.pivot(),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i=this,a=t.custom||{},r=i.getDataset(),o=i.chart.scale,s=o.getPointPositionForValue(e,r.data[e]),l=i._resolveDataElementOptions(t,e),u=i.getMeta().dataset._model,d=n?o.xCenter:s.x,h=n?o.yCenter:s.y;t._scale=o,t._options=l,t._datasetIndex=i.index,t._index=e,t._model={x:d,y:h,skip:a.skip||isNaN(d)||isNaN(h),radius:l.radius,pointStyle:l.pointStyle,rotation:l.rotation,backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,tension:Xt(a.tension,u?u.tension:0),hitRadius:l.hitRadius}},_resolveDatasetElementOptions:function(){var t=this,e=t._config,n=t.chart.options,i=it.prototype._resolveDatasetElementOptions.apply(t,arguments);return i.spanGaps=Xt(e.spanGaps,n.spanGaps),i.tension=Xt(e.lineTension,n.elements.line.tension),i},updateBezierControlPoints:function(){var t,e,n,i,a=this.getMeta(),r=this.chart.chartArea,o=a.data||[];function s(t,e,n){return Math.max(Math.min(t,n),e)}for(a.dataset._model.spanGaps&&(o=o.filter((function(t){return!t._model.skip}))),t=0,e=o.length;t<e;++t)n=o[t]._model,i=H.splineCurve(H.previousItem(o,t,!0)._model,n,H.nextItem(o,t,!0)._model,n.tension),n.controlPointPreviousX=s(i.previous.x,r.left,r.right),n.controlPointPreviousY=s(i.previous.y,r.top,r.bottom),n.controlPointNextX=s(i.next.x,r.left,r.right),n.controlPointNextY=s(i.next.y,r.top,r.bottom)},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Xt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Xt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Xt(n.hoverBorderWidth,n.borderWidth),e.radius=Xt(n.hoverRadius,n.radius)}});W._set("scatter",{hover:{mode:"single"},scales:{xAxes:[{id:"x-axis-1",type:"linear",position:"bottom"}],yAxes:[{id:"y-axis-1",type:"linear",position:"left"}]},tooltips:{callbacks:{title:function(){return""},label:function(t){return"("+t.xLabel+", "+t.yLabel+")"}}}}),W._set("global",{datasets:{scatter:{showLine:!1}}});var Jt={bar:Ot,bubble:It,doughnut:Yt,horizontalBar:zt,line:Gt,polarArea:Zt,pie:$t,radar:Kt,scatter:Gt};function Qt(t,e){return t.native?{x:t.x,y:t.y}:H.getRelativePosition(t,e)}function te(t,e){var n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas();for(i=0,r=l.length;i<r;++i)for(a=0,o=(n=l[i].data).length;a<o;++a)(s=n[a])._view.skip||e(s)}function ee(t,e){var n=[];return te(t,(function(t){t.inRange(e.x,e.y)&&n.push(t)})),n}function ne(t,e,n,i){var a=Number.POSITIVE_INFINITY,r=[];return te(t,(function(t){if(!n||t.inRange(e.x,e.y)){var o=t.getCenterPoint(),s=i(e,o);s<a?(r=[t],a=s):s===a&&r.push(t)}})),r}function ie(t){var e=-1!==t.indexOf("x"),n=-1!==t.indexOf("y");return function(t,i){var a=e?Math.abs(t.x-i.x):0,r=n?Math.abs(t.y-i.y):0;return Math.sqrt(Math.pow(a,2)+Math.pow(r,2))}}function ae(t,e,n){var i=Qt(e,t);n.axis=n.axis||"x";var a=ie(n.axis),r=n.intersect?ee(t,i):ne(t,i,!1,a),o=[];return r.length?(t._getSortedVisibleDatasetMetas().forEach((function(t){var e=t.data[r[0]._index];e&&!e._view.skip&&o.push(e)})),o):[]}var re={modes:{single:function(t,e){var n=Qt(e,t),i=[];return te(t,(function(t){if(t.inRange(n.x,n.y))return i.push(t),i})),i.slice(0,1)},label:ae,index:ae,dataset:function(t,e,n){var i=Qt(e,t);n.axis=n.axis||"xy";var a=ie(n.axis),r=n.intersect?ee(t,i):ne(t,i,!1,a);return r.length>0&&(r=t.getDatasetMeta(r[0]._datasetIndex).data),r},"x-axis":function(t,e){return ae(t,e,{intersect:!1})},point:function(t,e){return ee(t,Qt(e,t))},nearest:function(t,e,n){var i=Qt(e,t);n.axis=n.axis||"xy";var a=ie(n.axis);return ne(t,i,n.intersect,a)},x:function(t,e,n){var i=Qt(e,t),a=[],r=!1;return te(t,(function(t){t.inXRange(i.x)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a},y:function(t,e,n){var i=Qt(e,t),a=[],r=!1;return te(t,(function(t){t.inYRange(i.y)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a}}},oe=H.extend;function se(t,e){return H.where(t,(function(t){return t.pos===e}))}function le(t,e){return t.sort((function(t,n){var i=e?n:t,a=e?t:n;return i.weight===a.weight?i.index-a.index:i.weight-a.weight}))}function ue(t,e,n,i){return Math.max(t[n],e[n])+Math.max(t[i],e[i])}function de(t,e,n){var i,a,r=n.box,o=t.maxPadding;if(n.size&&(t[n.pos]-=n.size),n.size=n.horizontal?r.height:r.width,t[n.pos]+=n.size,r.getPadding){var s=r.getPadding();o.top=Math.max(o.top,s.top),o.left=Math.max(o.left,s.left),o.bottom=Math.max(o.bottom,s.bottom),o.right=Math.max(o.right,s.right)}if(i=e.outerWidth-ue(o,t,"left","right"),a=e.outerHeight-ue(o,t,"top","bottom"),i!==t.w||a!==t.h)return t.w=i,t.h=a,n.horizontal?i!==t.w:a!==t.h}function he(t,e){var n=e.maxPadding;function i(t){var i={left:0,top:0,right:0,bottom:0};return t.forEach((function(t){i[t]=Math.max(e[t],n[t])})),i}return i(t?["left","right"]:["top","bottom"])}function ce(t,e,n){var i,a,r,o,s,l,u=[];for(i=0,a=t.length;i<a;++i)(o=(r=t[i]).box).update(r.width||e.w,r.height||e.h,he(r.horizontal,e)),de(e,n,r)&&(l=!0,u.length&&(s=!0)),o.fullWidth||u.push(r);return s&&ce(u,e,n)||l}function fe(t,e,n){var i,a,r,o,s=n.padding,l=e.x,u=e.y;for(i=0,a=t.length;i<a;++i)o=(r=t[i]).box,r.horizontal?(o.left=o.fullWidth?s.left:e.left,o.right=o.fullWidth?n.outerWidth-s.right:e.left+e.w,o.top=u,o.bottom=u+o.height,o.width=o.right-o.left,u=o.bottom):(o.left=l,o.right=l+o.width,o.top=e.top,o.bottom=e.top+e.h,o.height=o.bottom-o.top,l=o.right);e.x=l,e.y=u}W._set("global",{layout:{padding:{top:0,right:0,bottom:0,left:0}}});var ge,me={defaults:{},addBox:function(t,e){t.boxes||(t.boxes=[]),e.fullWidth=e.fullWidth||!1,e.position=e.position||"top",e.weight=e.weight||0,e._layers=e._layers||function(){return[{z:0,draw:function(){e.draw.apply(e,arguments)}}]},t.boxes.push(e)},removeBox:function(t,e){var n=t.boxes?t.boxes.indexOf(e):-1;-1!==n&&t.boxes.splice(n,1)},configure:function(t,e,n){for(var i,a=["fullWidth","position","weight"],r=a.length,o=0;o<r;++o)i=a[o],n.hasOwnProperty(i)&&(e[i]=n[i])},update:function(t,e,n){if(t){var i=t.options.layout||{},a=H.options.toPadding(i.padding),r=e-a.width,o=n-a.height,s=function(t){var e=function(t){var e,n,i,a=[];for(e=0,n=(t||[]).length;e<n;++e)i=t[e],a.push({index:e,box:i,pos:i.position,horizontal:i.isHorizontal(),weight:i.weight});return a}(t),n=le(se(e,"left"),!0),i=le(se(e,"right")),a=le(se(e,"top"),!0),r=le(se(e,"bottom"));return{leftAndTop:n.concat(a),rightAndBottom:i.concat(r),chartArea:se(e,"chartArea"),vertical:n.concat(i),horizontal:a.concat(r)}}(t.boxes),l=s.vertical,u=s.horizontal,d=Object.freeze({outerWidth:e,outerHeight:n,padding:a,availableWidth:r,vBoxMaxWidth:r/2/l.length,hBoxMaxHeight:o/2}),h=oe({maxPadding:oe({},a),w:r,h:o,x:a.left,y:a.top},a);!function(t,e){var n,i,a;for(n=0,i=t.length;n<i;++n)(a=t[n]).width=a.horizontal?a.box.fullWidth&&e.availableWidth:e.vBoxMaxWidth,a.height=a.horizontal&&e.hBoxMaxHeight}(l.concat(u),d),ce(l,h,d),ce(u,h,d)&&ce(l,h,d),function(t){var e=t.maxPadding;function n(n){var i=Math.max(e[n]-t[n],0);return t[n]+=i,i}t.y+=n("top"),t.x+=n("left"),n("right"),n("bottom")}(h),fe(s.leftAndTop,h,d),h.x+=h.w,h.y+=h.h,fe(s.rightAndBottom,h,d),t.chartArea={left:h.left,top:h.top,right:h.left+h.w,bottom:h.top+h.h},H.each(s.chartArea,(function(e){var n=e.box;oe(n,t.chartArea),n.update(h.w,h.h)}))}}},pe=(ge=Object.freeze({__proto__:null,default:"@keyframes chartjs-render-animation{from{opacity:.99}to{opacity:1}}.chartjs-render-monitor{animation:chartjs-render-animation 1ms}.chartjs-size-monitor,.chartjs-size-monitor-expand,.chartjs-size-monitor-shrink{position:absolute;direction:ltr;left:0;top:0;right:0;bottom:0;overflow:hidden;pointer-events:none;visibility:hidden;z-index:-1}.chartjs-size-monitor-expand>div{position:absolute;width:1000000px;height:1000000px;left:0;top:0}.chartjs-size-monitor-shrink>div{position:absolute;width:200%;height:200%;left:0;top:0}"}))&&ge.default||ge,ve="$chartjs",be="chartjs-size-monitor",ye="chartjs-render-monitor",xe="chartjs-render-animation",_e=["animationstart","webkitAnimationStart"],we={touchstart:"mousedown",touchmove:"mousemove",touchend:"mouseup",pointerenter:"mouseenter",pointerdown:"mousedown",pointermove:"mousemove",pointerup:"mouseup",pointerleave:"mouseout",pointerout:"mouseout"};function ke(t,e){var n=H.getStyle(t,e),i=n&&n.match(/^(\d+)(\.\d+)?px$/);return i?Number(i[1]):void 0}var Me=!!function(){var t=!1;try{var e=Object.defineProperty({},"passive",{get:function(){t=!0}});window.addEventListener("e",null,e)}catch(t){}return t}()&&{passive:!0};function Se(t,e,n){t.addEventListener(e,n,Me)}function De(t,e,n){t.removeEventListener(e,n,Me)}function Ce(t,e,n,i,a){return{type:t,chart:e,native:a||null,x:void 0!==n?n:null,y:void 0!==i?i:null}}function Pe(t){var e=document.createElement("div");return e.className=t||"",e}function Te(t,e,n){var i,a,r,o,s=t[ve]||(t[ve]={}),l=s.resizer=function(t){var e=Pe(be),n=Pe(be+"-expand"),i=Pe(be+"-shrink");n.appendChild(Pe()),i.appendChild(Pe()),e.appendChild(n),e.appendChild(i),e._reset=function(){n.scrollLeft=1e6,n.scrollTop=1e6,i.scrollLeft=1e6,i.scrollTop=1e6};var a=function(){e._reset(),t()};return Se(n,"scroll",a.bind(n,"expand")),Se(i,"scroll",a.bind(i,"shrink")),e}((i=function(){if(s.resizer){var i=n.options.maintainAspectRatio&&t.parentNode,a=i?i.clientWidth:0;e(Ce("resize",n)),i&&i.clientWidth<a&&n.canvas&&e(Ce("resize",n))}},r=!1,o=[],function(){o=Array.prototype.slice.call(arguments),a=a||this,r||(r=!0,H.requestAnimFrame.call(window,(function(){r=!1,i.apply(a,o)})))}));!function(t,e){var n=t[ve]||(t[ve]={}),i=n.renderProxy=function(t){t.animationName===xe&&e()};H.each(_e,(function(e){Se(t,e,i)})),n.reflow=!!t.offsetParent,t.classList.add(ye)}(t,(function(){if(s.resizer){var e=t.parentNode;e&&e!==l.parentNode&&e.insertBefore(l,e.firstChild),l._reset()}}))}function Oe(t){var e=t[ve]||{},n=e.resizer;delete e.resizer,function(t){var e=t[ve]||{},n=e.renderProxy;n&&(H.each(_e,(function(e){De(t,e,n)})),delete e.renderProxy),t.classList.remove(ye)}(t),n&&n.parentNode&&n.parentNode.removeChild(n)}var Ae={disableCSSInjection:!1,_enabled:"undefined"!=typeof window&&"undefined"!=typeof document,_ensureLoaded:function(t){if(!this.disableCSSInjection){var e=t.getRootNode?t.getRootNode():document;!function(t,e){var n=t[ve]||(t[ve]={});if(!n.containsStyles){n.containsStyles=!0,e="/* Chart.js */\n"+e;var i=document.createElement("style");i.setAttribute("type","text/css"),i.appendChild(document.createTextNode(e)),t.appendChild(i)}}(e.host?e:document.head,pe)}},acquireContext:function(t,e){"string"==typeof t?t=document.getElementById(t):t.length&&(t=t[0]),t&&t.canvas&&(t=t.canvas);var n=t&&t.getContext&&t.getContext("2d");return n&&n.canvas===t?(this._ensureLoaded(t),function(t,e){var n=t.style,i=t.getAttribute("height"),a=t.getAttribute("width");if(t[ve]={initial:{height:i,width:a,style:{display:n.display,height:n.height,width:n.width}}},n.display=n.display||"block",null===a||""===a){var r=ke(t,"width");void 0!==r&&(t.width=r)}if(null===i||""===i)if(""===t.style.height)t.height=t.width/(e.options.aspectRatio||2);else{var o=ke(t,"height");void 0!==r&&(t.height=o)}}(t,e),n):null},releaseContext:function(t){var e=t.canvas;if(e[ve]){var n=e[ve].initial;["height","width"].forEach((function(t){var i=n[t];H.isNullOrUndef(i)?e.removeAttribute(t):e.setAttribute(t,i)})),H.each(n.style||{},(function(t,n){e.style[n]=t})),e.width=e.width,delete e[ve]}},addEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=n[ve]||(n[ve]={});Se(i,e,(a.proxies||(a.proxies={}))[t.id+"_"+e]=function(e){n(function(t,e){var n=we[t.type]||t.type,i=H.getRelativePosition(t,e);return Ce(n,e,i.x,i.y,t)}(e,t))})}else Te(i,n,t)},removeEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=((n[ve]||{}).proxies||{})[t.id+"_"+e];a&&De(i,e,a)}else Oe(i)}};H.addEvent=Se,H.removeEvent=De;var Fe=Ae._enabled?Ae:{acquireContext:function(t){return t&&t.canvas&&(t=t.canvas),t&&t.getContext("2d")||null}},Ie=H.extend({initialize:function(){},acquireContext:function(){},releaseContext:function(){},addEventListener:function(){},removeEventListener:function(){}},Fe);W._set("global",{plugins:{}});var Le={_plugins:[],_cacheId:0,register:function(t){var e=this._plugins;[].concat(t).forEach((function(t){-1===e.indexOf(t)&&e.push(t)})),this._cacheId++},unregister:function(t){var e=this._plugins;[].concat(t).forEach((function(t){var n=e.indexOf(t);-1!==n&&e.splice(n,1)})),this._cacheId++},clear:function(){this._plugins=[],this._cacheId++},count:function(){return this._plugins.length},getAll:function(){return this._plugins},notify:function(t,e,n){var i,a,r,o,s,l=this.descriptors(t),u=l.length;for(i=0;i<u;++i)if("function"==typeof(s=(r=(a=l[i]).plugin)[e])&&((o=[t].concat(n||[])).push(a.options),!1===s.apply(r,o)))return!1;return!0},descriptors:function(t){var e=t.$plugins||(t.$plugins={});if(e.id===this._cacheId)return e.descriptors;var n=[],i=[],a=t&&t.config||{},r=a.options&&a.options.plugins||{};return this._plugins.concat(a.plugins||[]).forEach((function(t){if(-1===n.indexOf(t)){var e=t.id,a=r[e];!1!==a&&(!0===a&&(a=H.clone(W.global.plugins[e])),n.push(t),i.push({plugin:t,options:a||{}}))}})),e.descriptors=i,e.id=this._cacheId,i},_invalidate:function(t){delete t.$plugins}},Re={constructors:{},defaults:{},registerScaleType:function(t,e,n){this.constructors[t]=e,this.defaults[t]=H.clone(n)},getScaleConstructor:function(t){return this.constructors.hasOwnProperty(t)?this.constructors[t]:void 0},getScaleDefaults:function(t){return this.defaults.hasOwnProperty(t)?H.merge({},[W.scale,this.defaults[t]]):{}},updateScaleDefaults:function(t,e){this.defaults.hasOwnProperty(t)&&(this.defaults[t]=H.extend(this.defaults[t],e))},addScalesToLayout:function(t){H.each(t.scales,(function(e){e.fullWidth=e.options.fullWidth,e.position=e.options.position,e.weight=e.options.weight,me.addBox(t,e)}))}},Ne=H.valueOrDefault,We=H.rtl.getRtlAdapter;W._set("global",{tooltips:{enabled:!0,custom:null,mode:"nearest",position:"average",intersect:!0,backgroundColor:"rgba(0,0,0,0.8)",titleFontStyle:"bold",titleSpacing:2,titleMarginBottom:6,titleFontColor:"#fff",titleAlign:"left",bodySpacing:2,bodyFontColor:"#fff",bodyAlign:"left",footerFontStyle:"bold",footerSpacing:2,footerMarginTop:6,footerFontColor:"#fff",footerAlign:"left",yPadding:6,xPadding:6,caretPadding:2,caretSize:5,cornerRadius:6,multiKeyBackground:"#fff",displayColors:!0,borderColor:"rgba(0,0,0,0)",borderWidth:0,callbacks:{beforeTitle:H.noop,title:function(t,e){var n="",i=e.labels,a=i?i.length:0;if(t.length>0){var r=t[0];r.label?n=r.label:r.xLabel?n=r.xLabel:a>0&&r.index<a&&(n=i[r.index])}return n},afterTitle:H.noop,beforeBody:H.noop,beforeLabel:H.noop,label:function(t,e){var n=e.datasets[t.datasetIndex].label||"";return n&&(n+=": "),H.isNullOrUndef(t.value)?n+=t.yLabel:n+=t.value,n},labelColor:function(t,e){var n=e.getDatasetMeta(t.datasetIndex).data[t.index]._view;return{borderColor:n.borderColor,backgroundColor:n.backgroundColor}},labelTextColor:function(){return this._options.bodyFontColor},afterLabel:H.noop,afterBody:H.noop,beforeFooter:H.noop,footer:H.noop,afterFooter:H.noop}}});var Ye={average:function(t){if(!t.length)return!1;var e,n,i=0,a=0,r=0;for(e=0,n=t.length;e<n;++e){var o=t[e];if(o&&o.hasValue()){var s=o.tooltipPosition();i+=s.x,a+=s.y,++r}}return{x:i/r,y:a/r}},nearest:function(t,e){var n,i,a,r=e.x,o=e.y,s=Number.POSITIVE_INFINITY;for(n=0,i=t.length;n<i;++n){var l=t[n];if(l&&l.hasValue()){var u=l.getCenterPoint(),d=H.distanceBetweenPoints(e,u);d<s&&(s=d,a=l)}}if(a){var h=a.tooltipPosition();r=h.x,o=h.y}return{x:r,y:o}}};function ze(t,e){return e&&(H.isArray(e)?Array.prototype.push.apply(t,e):t.push(e)),t}function Ee(t){return("string"==typeof t||t instanceof String)&&t.indexOf("\n")>-1?t.split("\n"):t}function Ve(t){var e=W.global;return{xPadding:t.xPadding,yPadding:t.yPadding,xAlign:t.xAlign,yAlign:t.yAlign,rtl:t.rtl,textDirection:t.textDirection,bodyFontColor:t.bodyFontColor,_bodyFontFamily:Ne(t.bodyFontFamily,e.defaultFontFamily),_bodyFontStyle:Ne(t.bodyFontStyle,e.defaultFontStyle),_bodyAlign:t.bodyAlign,bodyFontSize:Ne(t.bodyFontSize,e.defaultFontSize),bodySpacing:t.bodySpacing,titleFontColor:t.titleFontColor,_titleFontFamily:Ne(t.titleFontFamily,e.defaultFontFamily),_titleFontStyle:Ne(t.titleFontStyle,e.defaultFontStyle),titleFontSize:Ne(t.titleFontSize,e.defaultFontSize),_titleAlign:t.titleAlign,titleSpacing:t.titleSpacing,titleMarginBottom:t.titleMarginBottom,footerFontColor:t.footerFontColor,_footerFontFamily:Ne(t.footerFontFamily,e.defaultFontFamily),_footerFontStyle:Ne(t.footerFontStyle,e.defaultFontStyle),footerFontSize:Ne(t.footerFontSize,e.defaultFontSize),_footerAlign:t.footerAlign,footerSpacing:t.footerSpacing,footerMarginTop:t.footerMarginTop,caretSize:t.caretSize,cornerRadius:t.cornerRadius,backgroundColor:t.backgroundColor,opacity:0,legendColorBackground:t.multiKeyBackground,displayColors:t.displayColors,borderColor:t.borderColor,borderWidth:t.borderWidth}}function He(t,e){return"center"===e?t.x+t.width/2:"right"===e?t.x+t.width-t.xPadding:t.x+t.xPadding}function Be(t){return ze([],Ee(t))}var je=$.extend({initialize:function(){this._model=Ve(this._options),this._lastActive=[]},getTitle:function(){var t=this,e=t._options,n=e.callbacks,i=n.beforeTitle.apply(t,arguments),a=n.title.apply(t,arguments),r=n.afterTitle.apply(t,arguments),o=[];return o=ze(o,Ee(i)),o=ze(o,Ee(a)),o=ze(o,Ee(r))},getBeforeBody:function(){return Be(this._options.callbacks.beforeBody.apply(this,arguments))},getBody:function(t,e){var n=this,i=n._options.callbacks,a=[];return H.each(t,(function(t){var r={before:[],lines:[],after:[]};ze(r.before,Ee(i.beforeLabel.call(n,t,e))),ze(r.lines,i.label.call(n,t,e)),ze(r.after,Ee(i.afterLabel.call(n,t,e))),a.push(r)})),a},getAfterBody:function(){return Be(this._options.callbacks.afterBody.apply(this,arguments))},getFooter:function(){var t=this,e=t._options.callbacks,n=e.beforeFooter.apply(t,arguments),i=e.footer.apply(t,arguments),a=e.afterFooter.apply(t,arguments),r=[];return r=ze(r,Ee(n)),r=ze(r,Ee(i)),r=ze(r,Ee(a))},update:function(t){var e,n,i,a,r,o,s,l,u,d,h=this,c=h._options,f=h._model,g=h._model=Ve(c),m=h._active,p=h._data,v={xAlign:f.xAlign,yAlign:f.yAlign},b={x:f.x,y:f.y},y={width:f.width,height:f.height},x={x:f.caretX,y:f.caretY};if(m.length){g.opacity=1;var _=[],w=[];x=Ye[c.position].call(h,m,h._eventPosition);var k=[];for(e=0,n=m.length;e<n;++e)k.push((i=m[e],a=void 0,r=void 0,o=void 0,s=void 0,l=void 0,u=void 0,d=void 0,a=i._xScale,r=i._yScale||i._scale,o=i._index,s=i._datasetIndex,l=i._chart.getDatasetMeta(s).controller,u=l._getIndexScale(),d=l._getValueScale(),{xLabel:a?a.getLabelForIndex(o,s):"",yLabel:r?r.getLabelForIndex(o,s):"",label:u?""+u.getLabelForIndex(o,s):"",value:d?""+d.getLabelForIndex(o,s):"",index:o,datasetIndex:s,x:i._model.x,y:i._model.y}));c.filter&&(k=k.filter((function(t){return c.filter(t,p)}))),c.itemSort&&(k=k.sort((function(t,e){return c.itemSort(t,e,p)}))),H.each(k,(function(t){_.push(c.callbacks.labelColor.call(h,t,h._chart)),w.push(c.callbacks.labelTextColor.call(h,t,h._chart))})),g.title=h.getTitle(k,p),g.beforeBody=h.getBeforeBody(k,p),g.body=h.getBody(k,p),g.afterBody=h.getAfterBody(k,p),g.footer=h.getFooter(k,p),g.x=x.x,g.y=x.y,g.caretPadding=c.caretPadding,g.labelColors=_,g.labelTextColors=w,g.dataPoints=k,y=function(t,e){var n=t._chart.ctx,i=2*e.yPadding,a=0,r=e.body,o=r.reduce((function(t,e){return t+e.before.length+e.lines.length+e.after.length}),0);o+=e.beforeBody.length+e.afterBody.length;var s=e.title.length,l=e.footer.length,u=e.titleFontSize,d=e.bodyFontSize,h=e.footerFontSize;i+=s*u,i+=s?(s-1)*e.titleSpacing:0,i+=s?e.titleMarginBottom:0,i+=o*d,i+=o?(o-1)*e.bodySpacing:0,i+=l?e.footerMarginTop:0,i+=l*h,i+=l?(l-1)*e.footerSpacing:0;var c=0,f=function(t){a=Math.max(a,n.measureText(t).width+c)};return n.font=H.fontString(u,e._titleFontStyle,e._titleFontFamily),H.each(e.title,f),n.font=H.fontString(d,e._bodyFontStyle,e._bodyFontFamily),H.each(e.beforeBody.concat(e.afterBody),f),c=e.displayColors?d+2:0,H.each(r,(function(t){H.each(t.before,f),H.each(t.lines,f),H.each(t.after,f)})),c=0,n.font=H.fontString(h,e._footerFontStyle,e._footerFontFamily),H.each(e.footer,f),{width:a+=2*e.xPadding,height:i}}(this,g),b=function(t,e,n,i){var a=t.x,r=t.y,o=t.caretSize,s=t.caretPadding,l=t.cornerRadius,u=n.xAlign,d=n.yAlign,h=o+s,c=l+s;return"right"===u?a-=e.width:"center"===u&&((a-=e.width/2)+e.width>i.width&&(a=i.width-e.width),a<0&&(a=0)),"top"===d?r+=h:r-="bottom"===d?e.height+h:e.height/2,"center"===d?"left"===u?a+=h:"right"===u&&(a-=h):"left"===u?a-=c:"right"===u&&(a+=c),{x:a,y:r}}(g,y,v=function(t,e){var n,i,a,r,o,s=t._model,l=t._chart,u=t._chart.chartArea,d="center",h="center";s.y<e.height?h="top":s.y>l.height-e.height&&(h="bottom");var c=(u.left+u.right)/2,f=(u.top+u.bottom)/2;"center"===h?(n=function(t){return t<=c},i=function(t){return t>c}):(n=function(t){return t<=e.width/2},i=function(t){return t>=l.width-e.width/2}),a=function(t){return t+e.width+s.caretSize+s.caretPadding>l.width},r=function(t){return t-e.width-s.caretSize-s.caretPadding<0},o=function(t){return t<=f?"top":"bottom"},n(s.x)?(d="left",a(s.x)&&(d="center",h=o(s.y))):i(s.x)&&(d="right",r(s.x)&&(d="center",h=o(s.y)));var g=t._options;return{xAlign:g.xAlign?g.xAlign:d,yAlign:g.yAlign?g.yAlign:h}}(this,y),h._chart)}else g.opacity=0;return g.xAlign=v.xAlign,g.yAlign=v.yAlign,g.x=b.x,g.y=b.y,g.width=y.width,g.height=y.height,g.caretX=x.x,g.caretY=x.y,h._model=g,t&&c.custom&&c.custom.call(h,g),h},drawCaret:function(t,e){var n=this._chart.ctx,i=this._view,a=this.getCaretPosition(t,e,i);n.lineTo(a.x1,a.y1),n.lineTo(a.x2,a.y2),n.lineTo(a.x3,a.y3)},getCaretPosition:function(t,e,n){var i,a,r,o,s,l,u=n.caretSize,d=n.cornerRadius,h=n.xAlign,c=n.yAlign,f=t.x,g=t.y,m=e.width,p=e.height;if("center"===c)s=g+p/2,"left"===h?(a=(i=f)-u,r=i,o=s+u,l=s-u):(a=(i=f+m)+u,r=i,o=s-u,l=s+u);else if("left"===h?(i=(a=f+d+u)-u,r=a+u):"right"===h?(i=(a=f+m-d-u)-u,r=a+u):(i=(a=n.caretX)-u,r=a+u),"top"===c)s=(o=g)-u,l=o;else{s=(o=g+p)+u,l=o;var v=r;r=i,i=v}return{x1:i,x2:a,x3:r,y1:o,y2:s,y3:l}},drawTitle:function(t,e,n){var i,a,r,o=e.title,s=o.length;if(s){var l=We(e.rtl,e.x,e.width);for(t.x=He(e,e._titleAlign),n.textAlign=l.textAlign(e._titleAlign),n.textBaseline="middle",i=e.titleFontSize,a=e.titleSpacing,n.fillStyle=e.titleFontColor,n.font=H.fontString(i,e._titleFontStyle,e._titleFontFamily),r=0;r<s;++r)n.fillText(o[r],l.x(t.x),t.y+i/2),t.y+=i+a,r+1===s&&(t.y+=e.titleMarginBottom-a)}},drawBody:function(t,e,n){var i,a,r,o,s,l,u,d,h=e.bodyFontSize,c=e.bodySpacing,f=e._bodyAlign,g=e.body,m=e.displayColors,p=0,v=m?He(e,"left"):0,b=We(e.rtl,e.x,e.width),y=function(e){n.fillText(e,b.x(t.x+p),t.y+h/2),t.y+=h+c},x=b.textAlign(f);for(n.textAlign=f,n.textBaseline="middle",n.font=H.fontString(h,e._bodyFontStyle,e._bodyFontFamily),t.x=He(e,x),n.fillStyle=e.bodyFontColor,H.each(e.beforeBody,y),p=m&&"right"!==x?"center"===f?h/2+1:h+2:0,s=0,u=g.length;s<u;++s){for(i=g[s],a=e.labelTextColors[s],r=e.labelColors[s],n.fillStyle=a,H.each(i.before,y),l=0,d=(o=i.lines).length;l<d;++l){if(m){var _=b.x(v);n.fillStyle=e.legendColorBackground,n.fillRect(b.leftForLtr(_,h),t.y,h,h),n.lineWidth=1,n.strokeStyle=r.borderColor,n.strokeRect(b.leftForLtr(_,h),t.y,h,h),n.fillStyle=r.backgroundColor,n.fillRect(b.leftForLtr(b.xPlus(_,1),h-2),t.y+1,h-2,h-2),n.fillStyle=a}y(o[l])}H.each(i.after,y)}p=0,H.each(e.afterBody,y),t.y-=c},drawFooter:function(t,e,n){var i,a,r=e.footer,o=r.length;if(o){var s=We(e.rtl,e.x,e.width);for(t.x=He(e,e._footerAlign),t.y+=e.footerMarginTop,n.textAlign=s.textAlign(e._footerAlign),n.textBaseline="middle",i=e.footerFontSize,n.fillStyle=e.footerFontColor,n.font=H.fontString(i,e._footerFontStyle,e._footerFontFamily),a=0;a<o;++a)n.fillText(r[a],s.x(t.x),t.y+i/2),t.y+=i+e.footerSpacing}},drawBackground:function(t,e,n,i){n.fillStyle=e.backgroundColor,n.strokeStyle=e.borderColor,n.lineWidth=e.borderWidth;var a=e.xAlign,r=e.yAlign,o=t.x,s=t.y,l=i.width,u=i.height,d=e.cornerRadius;n.beginPath(),n.moveTo(o+d,s),"top"===r&&this.drawCaret(t,i),n.lineTo(o+l-d,s),n.quadraticCurveTo(o+l,s,o+l,s+d),"center"===r&&"right"===a&&this.drawCaret(t,i),n.lineTo(o+l,s+u-d),n.quadraticCurveTo(o+l,s+u,o+l-d,s+u),"bottom"===r&&this.drawCaret(t,i),n.lineTo(o+d,s+u),n.quadraticCurveTo(o,s+u,o,s+u-d),"center"===r&&"left"===a&&this.drawCaret(t,i),n.lineTo(o,s+d),n.quadraticCurveTo(o,s,o+d,s),n.closePath(),n.fill(),e.borderWidth>0&&n.stroke()},draw:function(){var t=this._chart.ctx,e=this._view;if(0!==e.opacity){var n={width:e.width,height:e.height},i={x:e.x,y:e.y},a=Math.abs(e.opacity<.001)?0:e.opacity,r=e.title.length||e.beforeBody.length||e.body.length||e.afterBody.length||e.footer.length;this._options.enabled&&r&&(t.save(),t.globalAlpha=a,this.drawBackground(i,e,t,n),i.y+=e.yPadding,H.rtl.overrideTextDirection(t,e.textDirection),this.drawTitle(i,e,t),this.drawBody(i,e,t),this.drawFooter(i,e,t),H.rtl.restoreTextDirection(t,e.textDirection),t.restore())}},handleEvent:function(t){var e,n=this,i=n._options;return n._lastActive=n._lastActive||[],"mouseout"===t.type?n._active=[]:(n._active=n._chart.getElementsAtEventForMode(t,i.mode,i),i.reverse&&n._active.reverse()),(e=!H.arrayEquals(n._active,n._lastActive))&&(n._lastActive=n._active,(i.enabled||i.custom)&&(n._eventPosition={x:t.x,y:t.y},n.update(!0),n.pivot())),e}}),Ue=Ye,Ge=je;Ge.positioners=Ue;var qe=H.valueOrDefault;function Ze(){return H.merge({},[].slice.call(arguments),{merger:function(t,e,n,i){if("xAxes"===t||"yAxes"===t){var a,r,o,s=n[t].length;for(e[t]||(e[t]=[]),a=0;a<s;++a)o=n[t][a],r=qe(o.type,"xAxes"===t?"category":"linear"),a>=e[t].length&&e[t].push({}),!e[t][a].type||o.type&&o.type!==e[t][a].type?H.merge(e[t][a],[Re.getScaleDefaults(r),o]):H.merge(e[t][a],o)}else H._merger(t,e,n,i)}})}function $e(){return H.merge({},[].slice.call(arguments),{merger:function(t,e,n,i){var a=e[t]||{},r=n[t];"scales"===t?e[t]=Ze(a,r):"scale"===t?e[t]=H.merge(a,[Re.getScaleDefaults(r.type),r]):H._merger(t,e,n,i)}})}function Xe(t){var e=t.options;H.each(t.scales,(function(e){me.removeBox(t,e)})),e=$e(W.global,W[t.config.type],e),t.options=t.config.options=e,t.ensureScalesHaveIDs(),t.buildOrUpdateScales(),t.tooltip._options=e.tooltips,t.tooltip.initialize()}function Ke(t,e,n){var i,a=function(t){return t.id===i};do{i=e+n++}while(H.findIndex(t,a)>=0);return i}function Je(t){return"top"===t||"bottom"===t}function Qe(t,e){return function(n,i){return n[t]===i[t]?n[e]-i[e]:n[t]-i[t]}}W._set("global",{elements:{},events:["mousemove","mouseout","click","touchstart","touchmove"],hover:{onHover:null,mode:"nearest",intersect:!0,animationDuration:400},onClick:null,maintainAspectRatio:!0,responsive:!0,responsiveAnimationDuration:0});var tn=function(t,e){return this.construct(t,e),this};H.extend(tn.prototype,{construct:function(t,e){var n=this;e=function(t){var e=(t=t||{}).data=t.data||{};return e.datasets=e.datasets||[],e.labels=e.labels||[],t.options=$e(W.global,W[t.type],t.options||{}),t}(e);var i=Ie.acquireContext(t,e),a=i&&i.canvas,r=a&&a.height,o=a&&a.width;n.id=H.uid(),n.ctx=i,n.canvas=a,n.config=e,n.width=o,n.height=r,n.aspectRatio=r?o/r:null,n.options=e.options,n._bufferedRender=!1,n._layers=[],n.chart=n,n.controller=n,tn.instances[n.id]=n,Object.defineProperty(n,"data",{get:function(){return n.config.data},set:function(t){n.config.data=t}}),i&&a?(n.initialize(),n.update()):console.error("Failed to create chart: can't acquire context from the given item")},initialize:function(){var t=this;return Le.notify(t,"beforeInit"),H.retinaScale(t,t.options.devicePixelRatio),t.bindEvents(),t.options.responsive&&t.resize(!0),t.initToolTip(),Le.notify(t,"afterInit"),t},clear:function(){return H.canvas.clear(this),this},stop:function(){return J.cancelAnimation(this),this},resize:function(t){var e=this,n=e.options,i=e.canvas,a=n.maintainAspectRatio&&e.aspectRatio||null,r=Math.max(0,Math.floor(H.getMaximumWidth(i))),o=Math.max(0,Math.floor(a?r/a:H.getMaximumHeight(i)));if((e.width!==r||e.height!==o)&&(i.width=e.width=r,i.height=e.height=o,i.style.width=r+"px",i.style.height=o+"px",H.retinaScale(e,n.devicePixelRatio),!t)){var s={width:r,height:o};Le.notify(e,"resize",[s]),n.onResize&&n.onResize(e,s),e.stop(),e.update({duration:n.responsiveAnimationDuration})}},ensureScalesHaveIDs:function(){var t=this.options,e=t.scales||{},n=t.scale;H.each(e.xAxes,(function(t,n){t.id||(t.id=Ke(e.xAxes,"x-axis-",n))})),H.each(e.yAxes,(function(t,n){t.id||(t.id=Ke(e.yAxes,"y-axis-",n))})),n&&(n.id=n.id||"scale")},buildOrUpdateScales:function(){var t=this,e=t.options,n=t.scales||{},i=[],a=Object.keys(n).reduce((function(t,e){return t[e]=!1,t}),{});e.scales&&(i=i.concat((e.scales.xAxes||[]).map((function(t){return{options:t,dtype:"category",dposition:"bottom"}})),(e.scales.yAxes||[]).map((function(t){return{options:t,dtype:"linear",dposition:"left"}})))),e.scale&&i.push({options:e.scale,dtype:"radialLinear",isDefault:!0,dposition:"chartArea"}),H.each(i,(function(e){var i=e.options,r=i.id,o=qe(i.type,e.dtype);Je(i.position)!==Je(e.dposition)&&(i.position=e.dposition),a[r]=!0;var s=null;if(r in n&&n[r].type===o)(s=n[r]).options=i,s.ctx=t.ctx,s.chart=t;else{var l=Re.getScaleConstructor(o);if(!l)return;s=new l({id:r,type:o,options:i,ctx:t.ctx,chart:t}),n[s.id]=s}s.mergeTicksOptions(),e.isDefault&&(t.scale=s)})),H.each(a,(function(t,e){t||delete n[e]})),t.scales=n,Re.addScalesToLayout(this)},buildOrUpdateControllers:function(){var t,e,n=this,i=[],a=n.data.datasets;for(t=0,e=a.length;t<e;t++){var r=a[t],o=n.getDatasetMeta(t),s=r.type||n.config.type;if(o.type&&o.type!==s&&(n.destroyDatasetMeta(t),o=n.getDatasetMeta(t)),o.type=s,o.order=r.order||0,o.index=t,o.controller)o.controller.updateIndex(t),o.controller.linkScales();else{var l=Jt[o.type];if(void 0===l)throw new Error('"'+o.type+'" is not a chart type.');o.controller=new l(n,t),i.push(o.controller)}}return i},resetElements:function(){var t=this;H.each(t.data.datasets,(function(e,n){t.getDatasetMeta(n).controller.reset()}),t)},reset:function(){this.resetElements(),this.tooltip.initialize()},update:function(t){var e,n,i=this;if(t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]}),Xe(i),Le._invalidate(i),!1!==Le.notify(i,"beforeUpdate")){i.tooltip._data=i.data;var a=i.buildOrUpdateControllers();for(e=0,n=i.data.datasets.length;e<n;e++)i.getDatasetMeta(e).controller.buildOrUpdateElements();i.updateLayout(),i.options.animation&&i.options.animation.duration&&H.each(a,(function(t){t.reset()})),i.updateDatasets(),i.tooltip.initialize(),i.lastActive=[],Le.notify(i,"afterUpdate"),i._layers.sort(Qe("z","_idx")),i._bufferedRender?i._bufferedRequest={duration:t.duration,easing:t.easing,lazy:t.lazy}:i.render(t)}},updateLayout:function(){var t=this;!1!==Le.notify(t,"beforeLayout")&&(me.update(this,this.width,this.height),t._layers=[],H.each(t.boxes,(function(e){e._configure&&e._configure(),t._layers.push.apply(t._layers,e._layers())}),t),t._layers.forEach((function(t,e){t._idx=e})),Le.notify(t,"afterScaleUpdate"),Le.notify(t,"afterLayout"))},updateDatasets:function(){if(!1!==Le.notify(this,"beforeDatasetsUpdate")){for(var t=0,e=this.data.datasets.length;t<e;++t)this.updateDataset(t);Le.notify(this,"afterDatasetsUpdate")}},updateDataset:function(t){var e=this.getDatasetMeta(t),n={meta:e,index:t};!1!==Le.notify(this,"beforeDatasetUpdate",[n])&&(e.controller._update(),Le.notify(this,"afterDatasetUpdate",[n]))},render:function(t){var e=this;t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]});var n=e.options.animation,i=qe(t.duration,n&&n.duration),a=t.lazy;if(!1!==Le.notify(e,"beforeRender")){var r=function(t){Le.notify(e,"afterRender"),H.callback(n&&n.onComplete,[t],e)};if(n&&i){var o=new K({numSteps:i/16.66,easing:t.easing||n.easing,render:function(t,e){var n=H.easing.effects[e.easing],i=e.currentStep,a=i/e.numSteps;t.draw(n(a),a,i)},onAnimationProgress:n.onProgress,onAnimationComplete:r});J.addAnimation(e,o,i,a)}else e.draw(),r(new K({numSteps:0,chart:e}));return e}},draw:function(t){var e,n,i=this;if(i.clear(),H.isNullOrUndef(t)&&(t=1),i.transition(t),!(i.width<=0||i.height<=0)&&!1!==Le.notify(i,"beforeDraw",[t])){for(n=i._layers,e=0;e<n.length&&n[e].z<=0;++e)n[e].draw(i.chartArea);for(i.drawDatasets(t);e<n.length;++e)n[e].draw(i.chartArea);i._drawTooltip(t),Le.notify(i,"afterDraw",[t])}},transition:function(t){for(var e=0,n=(this.data.datasets||[]).length;e<n;++e)this.isDatasetVisible(e)&&this.getDatasetMeta(e).controller.transition(t);this.tooltip.transition(t)},_getSortedDatasetMetas:function(t){var e,n,i=[];for(e=0,n=(this.data.datasets||[]).length;e<n;++e)t&&!this.isDatasetVisible(e)||i.push(this.getDatasetMeta(e));return i.sort(Qe("order","index")),i},_getSortedVisibleDatasetMetas:function(){return this._getSortedDatasetMetas(!0)},drawDatasets:function(t){var e,n;if(!1!==Le.notify(this,"beforeDatasetsDraw",[t])){for(n=(e=this._getSortedVisibleDatasetMetas()).length-1;n>=0;--n)this.drawDataset(e[n],t);Le.notify(this,"afterDatasetsDraw",[t])}},drawDataset:function(t,e){var n={meta:t,index:t.index,easingValue:e};!1!==Le.notify(this,"beforeDatasetDraw",[n])&&(t.controller.draw(e),Le.notify(this,"afterDatasetDraw",[n]))},_drawTooltip:function(t){var e=this.tooltip,n={tooltip:e,easingValue:t};!1!==Le.notify(this,"beforeTooltipDraw",[n])&&(e.draw(),Le.notify(this,"afterTooltipDraw",[n]))},getElementAtEvent:function(t){return re.modes.single(this,t)},getElementsAtEvent:function(t){return re.modes.label(this,t,{intersect:!0})},getElementsAtXAxis:function(t){return re.modes["x-axis"](this,t,{intersect:!0})},getElementsAtEventForMode:function(t,e,n){var i=re.modes[e];return"function"==typeof i?i(this,t,n):[]},getDatasetAtEvent:function(t){return re.modes.dataset(this,t,{intersect:!0})},getDatasetMeta:function(t){var e=this.data.datasets[t];e._meta||(e._meta={});var n=e._meta[this.id];return n||(n=e._meta[this.id]={type:null,data:[],dataset:null,controller:null,hidden:null,xAxisID:null,yAxisID:null,order:e.order||0,index:t}),n},getVisibleDatasetCount:function(){for(var t=0,e=0,n=this.data.datasets.length;e<n;++e)this.isDatasetVisible(e)&&t++;return t},isDatasetVisible:function(t){var e=this.getDatasetMeta(t);return"boolean"==typeof e.hidden?!e.hidden:!this.data.datasets[t].hidden},generateLegend:function(){return this.options.legendCallback(this)},destroyDatasetMeta:function(t){var e=this.id,n=this.data.datasets[t],i=n._meta&&n._meta[e];i&&(i.controller.destroy(),delete n._meta[e])},destroy:function(){var t,e,n=this,i=n.canvas;for(n.stop(),t=0,e=n.data.datasets.length;t<e;++t)n.destroyDatasetMeta(t);i&&(n.unbindEvents(),H.canvas.clear(n),Ie.releaseContext(n.ctx),n.canvas=null,n.ctx=null),Le.notify(n,"destroy"),delete tn.instances[n.id]},toBase64Image:function(){return this.canvas.toDataURL.apply(this.canvas,arguments)},initToolTip:function(){var t=this;t.tooltip=new Ge({_chart:t,_chartInstance:t,_data:t.data,_options:t.options.tooltips},t)},bindEvents:function(){var t=this,e=t._listeners={},n=function(){t.eventHandler.apply(t,arguments)};H.each(t.options.events,(function(i){Ie.addEventListener(t,i,n),e[i]=n})),t.options.responsive&&(n=function(){t.resize()},Ie.addEventListener(t,"resize",n),e.resize=n)},unbindEvents:function(){var t=this,e=t._listeners;e&&(delete t._listeners,H.each(e,(function(e,n){Ie.removeEventListener(t,n,e)})))},updateHoverStyle:function(t,e,n){var i,a,r,o=n?"set":"remove";for(a=0,r=t.length;a<r;++a)(i=t[a])&&this.getDatasetMeta(i._datasetIndex).controller[o+"HoverStyle"](i);"dataset"===e&&this.getDatasetMeta(t[0]._datasetIndex).controller["_"+o+"DatasetHoverStyle"]()},eventHandler:function(t){var e=this,n=e.tooltip;if(!1!==Le.notify(e,"beforeEvent",[t])){e._bufferedRender=!0,e._bufferedRequest=null;var i=e.handleEvent(t);n&&(i=n._start?n.handleEvent(t):i|n.handleEvent(t)),Le.notify(e,"afterEvent",[t]);var a=e._bufferedRequest;return a?e.render(a):i&&!e.animating&&(e.stop(),e.render({duration:e.options.hover.animationDuration,lazy:!0})),e._bufferedRender=!1,e._bufferedRequest=null,e}},handleEvent:function(t){var e,n=this,i=n.options||{},a=i.hover;return n.lastActive=n.lastActive||[],"mouseout"===t.type?n.active=[]:n.active=n.getElementsAtEventForMode(t,a.mode,a),H.callback(i.onHover||i.hover.onHover,[t.native,n.active],n),"mouseup"!==t.type&&"click"!==t.type||i.onClick&&i.onClick.call(n,t.native,n.active),n.lastActive.length&&n.updateHoverStyle(n.lastActive,a.mode,!1),n.active.length&&a.mode&&n.updateHoverStyle(n.active,a.mode,!0),e=!H.arrayEquals(n.active,n.lastActive),n.lastActive=n.active,e}}),tn.instances={};var en=tn;tn.Controller=tn,tn.types={},H.configMerge=$e,H.scaleMerge=Ze;function nn(){throw new Error("This method is not implemented: either no adapter can be found or an incomplete integration was provided.")}function an(t){this.options=t||{}}H.extend(an.prototype,{formats:nn,parse:nn,format:nn,add:nn,diff:nn,startOf:nn,endOf:nn,_create:function(t){return t}}),an.override=function(t){H.extend(an.prototype,t)};var rn={_date:an},on={formatters:{values:function(t){return H.isArray(t)?t:""+t},linear:function(t,e,n){var i=n.length>3?n[2]-n[1]:n[1]-n[0];Math.abs(i)>1&&t!==Math.floor(t)&&(i=t-Math.floor(t));var a=H.log10(Math.abs(i)),r="";if(0!==t)if(Math.max(Math.abs(n[0]),Math.abs(n[n.length-1]))<1e-4){var o=H.log10(Math.abs(t)),s=Math.floor(o)-Math.floor(a);s=Math.max(Math.min(s,20),0),r=t.toExponential(s)}else{var l=-1*Math.floor(a);l=Math.max(Math.min(l,20),0),r=t.toFixed(l)}else r="0";return r},logarithmic:function(t,e,n){var i=t/Math.pow(10,Math.floor(H.log10(t)));return 0===t?"0":1===i||2===i||5===i||0===e||e===n.length-1?t.toExponential():""}}},sn=H.isArray,ln=H.isNullOrUndef,un=H.valueOrDefault,dn=H.valueAtIndexOrDefault;function hn(t,e,n){var i,a=t.getTicks().length,r=Math.min(e,a-1),o=t.getPixelForTick(r),s=t._startPixel,l=t._endPixel;if(!(n&&(i=1===a?Math.max(o-s,l-o):0===e?(t.getPixelForTick(1)-o)/2:(o-t.getPixelForTick(r-1))/2,(o+=r<e?i:-i)<s-1e-6||o>l+1e-6)))return o}function cn(t,e,n,i){var a,r,o,s,l,u,d,h,c,f,g,m,p,v=n.length,b=[],y=[],x=[];for(a=0;a<v;++a){if(s=n[a].label,l=n[a].major?e.major:e.minor,t.font=u=l.string,d=i[u]=i[u]||{data:{},gc:[]},h=l.lineHeight,c=f=0,ln(s)||sn(s)){if(sn(s))for(r=0,o=s.length;r<o;++r)g=s[r],ln(g)||sn(g)||(c=H.measureText(t,d.data,d.gc,c,g),f+=h)}else c=H.measureText(t,d.data,d.gc,c,s),f=h;b.push(c),y.push(f),x.push(h/2)}function _(t){return{width:b[t]||0,height:y[t]||0,offset:x[t]||0}}return function(t,e){H.each(t,(function(t){var n,i=t.gc,a=i.length/2;if(a>e){for(n=0;n<a;++n)delete t.data[i[n]];i.splice(0,a)}}))}(i,v),m=b.indexOf(Math.max.apply(null,b)),p=y.indexOf(Math.max.apply(null,y)),{first:_(0),last:_(v-1),widest:_(m),highest:_(p)}}function fn(t){return t.drawTicks?t.tickMarkLength:0}function gn(t){var e,n;return t.display?(e=H.options._parseFont(t),n=H.options.toPadding(t.padding),e.lineHeight+n.height):0}function mn(t,e){return H.extend(H.options._parseFont({fontFamily:un(e.fontFamily,t.fontFamily),fontSize:un(e.fontSize,t.fontSize),fontStyle:un(e.fontStyle,t.fontStyle),lineHeight:un(e.lineHeight,t.lineHeight)}),{color:H.options.resolve([e.fontColor,t.fontColor,W.global.defaultFontColor])})}function pn(t){var e=mn(t,t.minor);return{minor:e,major:t.major.enabled?mn(t,t.major):e}}function vn(t){var e,n,i,a=[];for(n=0,i=t.length;n<i;++n)void 0!==(e=t[n])._index&&a.push(e);return a}function bn(t,e,n,i){var a,r,o,s,l=un(n,0),u=Math.min(un(i,t.length),t.length),d=0;for(e=Math.ceil(e),i&&(e=(a=i-n)/Math.floor(a/e)),s=l;s<0;)d++,s=Math.round(l+d*e);for(r=Math.max(l,0);r<u;r++)o=t[r],r===s?(o._index=r,d++,s=Math.round(l+d*e)):delete o.label}W._set("scale",{display:!0,position:"left",offset:!1,gridLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,drawBorder:!0,drawOnChartArea:!0,drawTicks:!0,tickMarkLength:10,zeroLineWidth:1,zeroLineColor:"rgba(0,0,0,0.25)",zeroLineBorderDash:[],zeroLineBorderDashOffset:0,offsetGridLines:!1,borderDash:[],borderDashOffset:0},scaleLabel:{display:!1,labelString:"",padding:{top:4,bottom:4}},ticks:{beginAtZero:!1,minRotation:0,maxRotation:50,mirror:!1,padding:0,reverse:!1,display:!0,autoSkip:!0,autoSkipPadding:0,labelOffset:0,callback:on.formatters.values,minor:{},major:{}}});var yn=$.extend({zeroLineIndex:0,getPadding:function(){return{left:this.paddingLeft||0,top:this.paddingTop||0,right:this.paddingRight||0,bottom:this.paddingBottom||0}},getTicks:function(){return this._ticks},_getLabels:function(){var t=this.chart.data;return this.options.labels||(this.isHorizontal()?t.xLabels:t.yLabels)||t.labels||[]},mergeTicksOptions:function(){},beforeUpdate:function(){H.callback(this.options.beforeUpdate,[this])},update:function(t,e,n){var i,a,r,o,s,l=this,u=l.options.ticks,d=u.sampleSize;if(l.beforeUpdate(),l.maxWidth=t,l.maxHeight=e,l.margins=H.extend({left:0,right:0,top:0,bottom:0},n),l._ticks=null,l.ticks=null,l._labelSizes=null,l._maxLabelLines=0,l.longestLabelWidth=0,l.longestTextCache=l.longestTextCache||{},l._gridLineItems=null,l._labelItems=null,l.beforeSetDimensions(),l.setDimensions(),l.afterSetDimensions(),l.beforeDataLimits(),l.determineDataLimits(),l.afterDataLimits(),l.beforeBuildTicks(),o=l.buildTicks()||[],(!(o=l.afterBuildTicks(o)||o)||!o.length)&&l.ticks)for(o=[],i=0,a=l.ticks.length;i<a;++i)o.push({value:l.ticks[i],major:!1});return l._ticks=o,s=d<o.length,r=l._convertTicksToLabels(s?function(t,e){for(var n=[],i=t.length/e,a=0,r=t.length;a<r;a+=i)n.push(t[Math.floor(a)]);return n}(o,d):o),l._configure(),l.beforeCalculateTickRotation(),l.calculateTickRotation(),l.afterCalculateTickRotation(),l.beforeFit(),l.fit(),l.afterFit(),l._ticksToDraw=u.display&&(u.autoSkip||"auto"===u.source)?l._autoSkip(o):o,s&&(r=l._convertTicksToLabels(l._ticksToDraw)),l.ticks=r,l.afterUpdate(),l.minSize},_configure:function(){var t,e,n=this,i=n.options.ticks.reverse;n.isHorizontal()?(t=n.left,e=n.right):(t=n.top,e=n.bottom,i=!i),n._startPixel=t,n._endPixel=e,n._reversePixels=i,n._length=e-t},afterUpdate:function(){H.callback(this.options.afterUpdate,[this])},beforeSetDimensions:function(){H.callback(this.options.beforeSetDimensions,[this])},setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0},afterSetDimensions:function(){H.callback(this.options.afterSetDimensions,[this])},beforeDataLimits:function(){H.callback(this.options.beforeDataLimits,[this])},determineDataLimits:H.noop,afterDataLimits:function(){H.callback(this.options.afterDataLimits,[this])},beforeBuildTicks:function(){H.callback(this.options.beforeBuildTicks,[this])},buildTicks:H.noop,afterBuildTicks:function(t){var e=this;return sn(t)&&t.length?H.callback(e.options.afterBuildTicks,[e,t]):(e.ticks=H.callback(e.options.afterBuildTicks,[e,e.ticks])||e.ticks,t)},beforeTickToLabelConversion:function(){H.callback(this.options.beforeTickToLabelConversion,[this])},convertTicksToLabels:function(){var t=this.options.ticks;this.ticks=this.ticks.map(t.userCallback||t.callback,this)},afterTickToLabelConversion:function(){H.callback(this.options.afterTickToLabelConversion,[this])},beforeCalculateTickRotation:function(){H.callback(this.options.beforeCalculateTickRotation,[this])},calculateTickRotation:function(){var t,e,n,i,a,r,o,s=this,l=s.options,u=l.ticks,d=s.getTicks().length,h=u.minRotation||0,c=u.maxRotation,f=h;!s._isVisible()||!u.display||h>=c||d<=1||!s.isHorizontal()?s.labelRotation=h:(e=(t=s._getLabelSizes()).widest.width,n=t.highest.height-t.highest.offset,i=Math.min(s.maxWidth,s.chart.width-e),e+6>(a=l.offset?s.maxWidth/d:i/(d-1))&&(a=i/(d-(l.offset?.5:1)),r=s.maxHeight-fn(l.gridLines)-u.padding-gn(l.scaleLabel),o=Math.sqrt(e*e+n*n),f=H.toDegrees(Math.min(Math.asin(Math.min((t.highest.height+6)/a,1)),Math.asin(Math.min(r/o,1))-Math.asin(n/o))),f=Math.max(h,Math.min(c,f))),s.labelRotation=f)},afterCalculateTickRotation:function(){H.callback(this.options.afterCalculateTickRotation,[this])},beforeFit:function(){H.callback(this.options.beforeFit,[this])},fit:function(){var t=this,e=t.minSize={width:0,height:0},n=t.chart,i=t.options,a=i.ticks,r=i.scaleLabel,o=i.gridLines,s=t._isVisible(),l="bottom"===i.position,u=t.isHorizontal();if(u?e.width=t.maxWidth:s&&(e.width=fn(o)+gn(r)),u?s&&(e.height=fn(o)+gn(r)):e.height=t.maxHeight,a.display&&s){var d=pn(a),h=t._getLabelSizes(),c=h.first,f=h.last,g=h.widest,m=h.highest,p=.4*d.minor.lineHeight,v=a.padding;if(u){var b=0!==t.labelRotation,y=H.toRadians(t.labelRotation),x=Math.cos(y),_=Math.sin(y),w=_*g.width+x*(m.height-(b?m.offset:0))+(b?0:p);e.height=Math.min(t.maxHeight,e.height+w+v);var k,M,S=t.getPixelForTick(0)-t.left,D=t.right-t.getPixelForTick(t.getTicks().length-1);b?(k=l?x*c.width+_*c.offset:_*(c.height-c.offset),M=l?_*(f.height-f.offset):x*f.width+_*f.offset):(k=c.width/2,M=f.width/2),t.paddingLeft=Math.max((k-S)*t.width/(t.width-S),0)+3,t.paddingRight=Math.max((M-D)*t.width/(t.width-D),0)+3}else{var C=a.mirror?0:g.width+v+p;e.width=Math.min(t.maxWidth,e.width+C),t.paddingTop=c.height/2,t.paddingBottom=f.height/2}}t.handleMargins(),u?(t.width=t._length=n.width-t.margins.left-t.margins.right,t.height=e.height):(t.width=e.width,t.height=t._length=n.height-t.margins.top-t.margins.bottom)},handleMargins:function(){var t=this;t.margins&&(t.margins.left=Math.max(t.paddingLeft,t.margins.left),t.margins.top=Math.max(t.paddingTop,t.margins.top),t.margins.right=Math.max(t.paddingRight,t.margins.right),t.margins.bottom=Math.max(t.paddingBottom,t.margins.bottom))},afterFit:function(){H.callback(this.options.afterFit,[this])},isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},isFullWidth:function(){return this.options.fullWidth},getRightValue:function(t){if(ln(t))return NaN;if(("number"==typeof t||t instanceof Number)&&!isFinite(t))return NaN;if(t)if(this.isHorizontal()){if(void 0!==t.x)return this.getRightValue(t.x)}else if(void 0!==t.y)return this.getRightValue(t.y);return t},_convertTicksToLabels:function(t){var e,n,i,a=this;for(a.ticks=t.map((function(t){return t.value})),a.beforeTickToLabelConversion(),e=a.convertTicksToLabels(t)||a.ticks,a.afterTickToLabelConversion(),n=0,i=t.length;n<i;++n)t[n].label=e[n];return e},_getLabelSizes:function(){var t=this,e=t._labelSizes;return e||(t._labelSizes=e=cn(t.ctx,pn(t.options.ticks),t.getTicks(),t.longestTextCache),t.longestLabelWidth=e.widest.width),e},_parseValue:function(t){var e,n,i,a;return sn(t)?(e=+this.getRightValue(t[0]),n=+this.getRightValue(t[1]),i=Math.min(e,n),a=Math.max(e,n)):(e=void 0,n=t=+this.getRightValue(t),i=t,a=t),{min:i,max:a,start:e,end:n}},_getScaleLabel:function(t){var e=this._parseValue(t);return void 0!==e.start?"["+e.start+", "+e.end+"]":+this.getRightValue(t)},getLabelForIndex:H.noop,getPixelForValue:H.noop,getValueForPixel:H.noop,getPixelForTick:function(t){var e=this.options.offset,n=this._ticks.length,i=1/Math.max(n-(e?0:1),1);return t<0||t>n-1?null:this.getPixelForDecimal(t*i+(e?i/2:0))},getPixelForDecimal:function(t){return this._reversePixels&&(t=1-t),this._startPixel+t*this._length},getDecimalForPixel:function(t){var e=(t-this._startPixel)/this._length;return this._reversePixels?1-e:e},getBasePixel:function(){return this.getPixelForValue(this.getBaseValue())},getBaseValue:function(){var t=this.min,e=this.max;return this.beginAtZero?0:t<0&&e<0?e:t>0&&e>0?t:0},_autoSkip:function(t){var e,n,i,a,r=this.options.ticks,o=this._length,s=r.maxTicksLimit||o/this._tickSize()+1,l=r.major.enabled?function(t){var e,n,i=[];for(e=0,n=t.length;e<n;e++)t[e].major&&i.push(e);return i}(t):[],u=l.length,d=l[0],h=l[u-1];if(u>s)return function(t,e,n){var i,a,r=0,o=e[0];for(n=Math.ceil(n),i=0;i<t.length;i++)a=t[i],i===o?(a._index=i,o=e[++r*n]):delete a.label}(t,l,u/s),vn(t);if(i=function(t,e,n,i){var a,r,o,s,l=function(t){var e,n,i=t.length;if(i<2)return!1;for(n=t[0],e=1;e<i;++e)if(t[e]-t[e-1]!==n)return!1;return n}(t),u=(e.length-1)/i;if(!l)return Math.max(u,1);for(o=0,s=(a=H.math._factorize(l)).length-1;o<s;o++)if((r=a[o])>u)return r;return Math.max(u,1)}(l,t,0,s),u>0){for(e=0,n=u-1;e<n;e++)bn(t,i,l[e],l[e+1]);return a=u>1?(h-d)/(u-1):null,bn(t,i,H.isNullOrUndef(a)?0:d-a,d),bn(t,i,h,H.isNullOrUndef(a)?t.length:h+a),vn(t)}return bn(t,i),vn(t)},_tickSize:function(){var t=this.options.ticks,e=H.toRadians(this.labelRotation),n=Math.abs(Math.cos(e)),i=Math.abs(Math.sin(e)),a=this._getLabelSizes(),r=t.autoSkipPadding||0,o=a?a.widest.width+r:0,s=a?a.highest.height+r:0;return this.isHorizontal()?s*n>o*i?o/n:s/i:s*i<o*n?s/n:o/i},_isVisible:function(){var t,e,n,i=this.chart,a=this.options.display;if("auto"!==a)return!!a;for(t=0,e=i.data.datasets.length;t<e;++t)if(i.isDatasetVisible(t)&&((n=i.getDatasetMeta(t)).xAxisID===this.id||n.yAxisID===this.id))return!0;return!1},_computeGridLineItems:function(t){var e,n,i,a,r,o,s,l,u,d,h,c,f,g,m,p,v,b=this,y=b.chart,x=b.options,_=x.gridLines,w=x.position,k=_.offsetGridLines,M=b.isHorizontal(),S=b._ticksToDraw,D=S.length+(k?1:0),C=fn(_),P=[],T=_.drawBorder?dn(_.lineWidth,0,0):0,O=T/2,A=H._alignPixel,F=function(t){return A(y,t,T)};for("top"===w?(e=F(b.bottom),s=b.bottom-C,u=e-O,h=F(t.top)+O,f=t.bottom):"bottom"===w?(e=F(b.top),h=t.top,f=F(t.bottom)-O,s=e+O,u=b.top+C):"left"===w?(e=F(b.right),o=b.right-C,l=e-O,d=F(t.left)+O,c=t.right):(e=F(b.left),d=t.left,c=F(t.right)-O,o=e+O,l=b.left+C),n=0;n<D;++n)i=S[n]||{},ln(i.label)&&n<S.length||(n===b.zeroLineIndex&&x.offset===k?(g=_.zeroLineWidth,m=_.zeroLineColor,p=_.zeroLineBorderDash||[],v=_.zeroLineBorderDashOffset||0):(g=dn(_.lineWidth,n,1),m=dn(_.color,n,"rgba(0,0,0,0.1)"),p=_.borderDash||[],v=_.borderDashOffset||0),void 0!==(a=hn(b,i._index||n,k))&&(r=A(y,a,g),M?o=l=d=c=r:s=u=h=f=r,P.push({tx1:o,ty1:s,tx2:l,ty2:u,x1:d,y1:h,x2:c,y2:f,width:g,color:m,borderDash:p,borderDashOffset:v})));return P.ticksLength=D,P.borderValue=e,P},_computeLabelItems:function(){var t,e,n,i,a,r,o,s,l,u,d,h,c=this,f=c.options,g=f.ticks,m=f.position,p=g.mirror,v=c.isHorizontal(),b=c._ticksToDraw,y=pn(g),x=g.padding,_=fn(f.gridLines),w=-H.toRadians(c.labelRotation),k=[];for("top"===m?(r=c.bottom-_-x,o=w?"left":"center"):"bottom"===m?(r=c.top+_+x,o=w?"right":"center"):"left"===m?(a=c.right-(p?0:_)-x,o=p?"left":"right"):(a=c.left+(p?0:_)+x,o=p?"right":"left"),t=0,e=b.length;t<e;++t)i=(n=b[t]).label,ln(i)||(s=c.getPixelForTick(n._index||t)+g.labelOffset,u=(l=n.major?y.major:y.minor).lineHeight,d=sn(i)?i.length:1,v?(a=s,h="top"===m?((w?1:.5)-d)*u:(w?0:.5)*u):(r=s,h=(1-d)*u/2),k.push({x:a,y:r,rotation:w,label:i,font:l,textOffset:h,textAlign:o}));return k},_drawGrid:function(t){var e=this,n=e.options.gridLines;if(n.display){var i,a,r,o,s,l=e.ctx,u=e.chart,d=H._alignPixel,h=n.drawBorder?dn(n.lineWidth,0,0):0,c=e._gridLineItems||(e._gridLineItems=e._computeGridLineItems(t));for(r=0,o=c.length;r<o;++r)i=(s=c[r]).width,a=s.color,i&&a&&(l.save(),l.lineWidth=i,l.strokeStyle=a,l.setLineDash&&(l.setLineDash(s.borderDash),l.lineDashOffset=s.borderDashOffset),l.beginPath(),n.drawTicks&&(l.moveTo(s.tx1,s.ty1),l.lineTo(s.tx2,s.ty2)),n.drawOnChartArea&&(l.moveTo(s.x1,s.y1),l.lineTo(s.x2,s.y2)),l.stroke(),l.restore());if(h){var f,g,m,p,v=h,b=dn(n.lineWidth,c.ticksLength-1,1),y=c.borderValue;e.isHorizontal()?(f=d(u,e.left,v)-v/2,g=d(u,e.right,b)+b/2,m=p=y):(m=d(u,e.top,v)-v/2,p=d(u,e.bottom,b)+b/2,f=g=y),l.lineWidth=h,l.strokeStyle=dn(n.color,0),l.beginPath(),l.moveTo(f,m),l.lineTo(g,p),l.stroke()}}},_drawLabels:function(){var t=this;if(t.options.ticks.display){var e,n,i,a,r,o,s,l,u=t.ctx,d=t._labelItems||(t._labelItems=t._computeLabelItems());for(e=0,i=d.length;e<i;++e){if(o=(r=d[e]).font,u.save(),u.translate(r.x,r.y),u.rotate(r.rotation),u.font=o.string,u.fillStyle=o.color,u.textBaseline="middle",u.textAlign=r.textAlign,s=r.label,l=r.textOffset,sn(s))for(n=0,a=s.length;n<a;++n)u.fillText(""+s[n],0,l),l+=o.lineHeight;else u.fillText(s,0,l);u.restore()}}},_drawTitle:function(){var t=this,e=t.ctx,n=t.options,i=n.scaleLabel;if(i.display){var a,r,o=un(i.fontColor,W.global.defaultFontColor),s=H.options._parseFont(i),l=H.options.toPadding(i.padding),u=s.lineHeight/2,d=n.position,h=0;if(t.isHorizontal())a=t.left+t.width/2,r="bottom"===d?t.bottom-u-l.bottom:t.top+u+l.top;else{var c="left"===d;a=c?t.left+u+l.top:t.right-u-l.top,r=t.top+t.height/2,h=c?-.5*Math.PI:.5*Math.PI}e.save(),e.translate(a,r),e.rotate(h),e.textAlign="center",e.textBaseline="middle",e.fillStyle=o,e.font=s.string,e.fillText(i.labelString,0,0),e.restore()}},draw:function(t){this._isVisible()&&(this._drawGrid(t),this._drawTitle(),this._drawLabels())},_layers:function(){var t=this,e=t.options,n=e.ticks&&e.ticks.z||0,i=e.gridLines&&e.gridLines.z||0;return t._isVisible()&&n!==i&&t.draw===t._draw?[{z:i,draw:function(){t._drawGrid.apply(t,arguments),t._drawTitle.apply(t,arguments)}},{z:n,draw:function(){t._drawLabels.apply(t,arguments)}}]:[{z:n,draw:function(){t.draw.apply(t,arguments)}}]},_getMatchingVisibleMetas:function(t){var e=this,n=e.isHorizontal();return e.chart._getSortedVisibleDatasetMetas().filter((function(i){return(!t||i.type===t)&&(n?i.xAxisID===e.id:i.yAxisID===e.id)}))}});yn.prototype._draw=yn.prototype.draw;var xn=yn,_n=H.isNullOrUndef,wn=xn.extend({determineDataLimits:function(){var t,e=this,n=e._getLabels(),i=e.options.ticks,a=i.min,r=i.max,o=0,s=n.length-1;void 0!==a&&(t=n.indexOf(a))>=0&&(o=t),void 0!==r&&(t=n.indexOf(r))>=0&&(s=t),e.minIndex=o,e.maxIndex=s,e.min=n[o],e.max=n[s]},buildTicks:function(){var t=this._getLabels(),e=this.minIndex,n=this.maxIndex;this.ticks=0===e&&n===t.length-1?t:t.slice(e,n+1)},getLabelForIndex:function(t,e){var n=this.chart;return n.getDatasetMeta(e).controller._getValueScaleId()===this.id?this.getRightValue(n.data.datasets[e].data[t]):this._getLabels()[t]},_configure:function(){var t=this,e=t.options.offset,n=t.ticks;xn.prototype._configure.call(t),t.isHorizontal()||(t._reversePixels=!t._reversePixels),n&&(t._startValue=t.minIndex-(e?.5:0),t._valueRange=Math.max(n.length-(e?0:1),1))},getPixelForValue:function(t,e,n){var i,a,r,o=this;return _n(e)||_n(n)||(t=o.chart.data.datasets[n].data[e]),_n(t)||(i=o.isHorizontal()?t.x:t.y),(void 0!==i||void 0!==t&&isNaN(e))&&(a=o._getLabels(),t=H.valueOrDefault(i,t),e=-1!==(r=a.indexOf(t))?r:e,isNaN(e)&&(e=t)),o.getPixelForDecimal((e-o._startValue)/o._valueRange)},getPixelForTick:function(t){var e=this.ticks;return t<0||t>e.length-1?null:this.getPixelForValue(e[t],t+this.minIndex)},getValueForPixel:function(t){var e=Math.round(this._startValue+this.getDecimalForPixel(t)*this._valueRange);return Math.min(Math.max(e,0),this.ticks.length-1)},getBasePixel:function(){return this.bottom}}),kn={position:"bottom"};wn._defaults=kn;var Mn=H.noop,Sn=H.isNullOrUndef;var Dn=xn.extend({getRightValue:function(t){return"string"==typeof t?+t:xn.prototype.getRightValue.call(this,t)},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;if(e.beginAtZero){var n=H.sign(t.min),i=H.sign(t.max);n<0&&i<0?t.max=0:n>0&&i>0&&(t.min=0)}var a=void 0!==e.min||void 0!==e.suggestedMin,r=void 0!==e.max||void 0!==e.suggestedMax;void 0!==e.min?t.min=e.min:void 0!==e.suggestedMin&&(null===t.min?t.min=e.suggestedMin:t.min=Math.min(t.min,e.suggestedMin)),void 0!==e.max?t.max=e.max:void 0!==e.suggestedMax&&(null===t.max?t.max=e.suggestedMax:t.max=Math.max(t.max,e.suggestedMax)),a!==r&&t.min>=t.max&&(a?t.max=t.min+1:t.min=t.max-1),t.min===t.max&&(t.max++,e.beginAtZero||t.min--)},getTickLimit:function(){var t,e=this.options.ticks,n=e.stepSize,i=e.maxTicksLimit;return n?t=Math.ceil(this.max/n)-Math.floor(this.min/n)+1:(t=this._computeTickLimit(),i=i||11),i&&(t=Math.min(i,t)),t},_computeTickLimit:function(){return Number.POSITIVE_INFINITY},handleDirectionalChanges:Mn,buildTicks:function(){var t=this,e=t.options.ticks,n=t.getTickLimit(),i={maxTicks:n=Math.max(2,n),min:e.min,max:e.max,precision:e.precision,stepSize:H.valueOrDefault(e.fixedStepSize,e.stepSize)},a=t.ticks=function(t,e){var n,i,a,r,o=[],s=t.stepSize,l=s||1,u=t.maxTicks-1,d=t.min,h=t.max,c=t.precision,f=e.min,g=e.max,m=H.niceNum((g-f)/u/l)*l;if(m<1e-14&&Sn(d)&&Sn(h))return[f,g];(r=Math.ceil(g/m)-Math.floor(f/m))>u&&(m=H.niceNum(r*m/u/l)*l),s||Sn(c)?n=Math.pow(10,H._decimalPlaces(m)):(n=Math.pow(10,c),m=Math.ceil(m*n)/n),i=Math.floor(f/m)*m,a=Math.ceil(g/m)*m,s&&(!Sn(d)&&H.almostWhole(d/m,m/1e3)&&(i=d),!Sn(h)&&H.almostWhole(h/m,m/1e3)&&(a=h)),r=(a-i)/m,r=H.almostEquals(r,Math.round(r),m/1e3)?Math.round(r):Math.ceil(r),i=Math.round(i*n)/n,a=Math.round(a*n)/n,o.push(Sn(d)?i:d);for(var p=1;p<r;++p)o.push(Math.round((i+p*m)*n)/n);return o.push(Sn(h)?a:h),o}(i,t);t.handleDirectionalChanges(),t.max=H.max(a),t.min=H.min(a),e.reverse?(a.reverse(),t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max)},convertTicksToLabels:function(){var t=this;t.ticksAsNumbers=t.ticks.slice(),t.zeroLineIndex=t.ticks.indexOf(0),xn.prototype.convertTicksToLabels.call(t)},_configure:function(){var t,e=this,n=e.getTicks(),i=e.min,a=e.max;xn.prototype._configure.call(e),e.options.offset&&n.length&&(i-=t=(a-i)/Math.max(n.length-1,1)/2,a+=t),e._startValue=i,e._endValue=a,e._valueRange=a-i}}),Cn={position:"left",ticks:{callback:on.formatters.linear}};function Pn(t,e,n,i){var a,r,o=t.options,s=function(t,e,n){var i=[n.type,void 0===e&&void 0===n.stack?n.index:"",n.stack].join(".");return void 0===t[i]&&(t[i]={pos:[],neg:[]}),t[i]}(e,o.stacked,n),l=s.pos,u=s.neg,d=i.length;for(a=0;a<d;++a)r=t._parseValue(i[a]),isNaN(r.min)||isNaN(r.max)||n.data[a].hidden||(l[a]=l[a]||0,u[a]=u[a]||0,o.relativePoints?l[a]=100:r.min<0||r.max<0?u[a]+=r.min:l[a]+=r.max)}function Tn(t,e,n){var i,a,r=n.length;for(i=0;i<r;++i)a=t._parseValue(n[i]),isNaN(a.min)||isNaN(a.max)||e.data[i].hidden||(t.min=Math.min(t.min,a.min),t.max=Math.max(t.max,a.max))}var On=Dn.extend({determineDataLimits:function(){var t,e,n,i,a=this,r=a.options,o=a.chart.data.datasets,s=a._getMatchingVisibleMetas(),l=r.stacked,u={},d=s.length;if(a.min=Number.POSITIVE_INFINITY,a.max=Number.NEGATIVE_INFINITY,void 0===l)for(t=0;!l&&t<d;++t)l=void 0!==(e=s[t]).stack;for(t=0;t<d;++t)n=o[(e=s[t]).index].data,l?Pn(a,u,e,n):Tn(a,e,n);H.each(u,(function(t){i=t.pos.concat(t.neg),a.min=Math.min(a.min,H.min(i)),a.max=Math.max(a.max,H.max(i))})),a.min=H.isFinite(a.min)&&!isNaN(a.min)?a.min:0,a.max=H.isFinite(a.max)&&!isNaN(a.max)?a.max:1,a.handleTickRangeOptions()},_computeTickLimit:function(){var t;return this.isHorizontal()?Math.ceil(this.width/40):(t=H.options._parseFont(this.options.ticks),Math.ceil(this.height/t.lineHeight))},handleDirectionalChanges:function(){this.isHorizontal()||this.ticks.reverse()},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForValue:function(t){return this.getPixelForDecimal((+this.getRightValue(t)-this._startValue)/this._valueRange)},getValueForPixel:function(t){return this._startValue+this.getDecimalForPixel(t)*this._valueRange},getPixelForTick:function(t){var e=this.ticksAsNumbers;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])}}),An=Cn;On._defaults=An;var Fn=H.valueOrDefault,In=H.math.log10;var Ln={position:"left",ticks:{callback:on.formatters.logarithmic}};function Rn(t,e){return H.isFinite(t)&&t>=0?t:e}var Nn=xn.extend({determineDataLimits:function(){var t,e,n,i,a,r,o=this,s=o.options,l=o.chart,u=l.data.datasets,d=o.isHorizontal();function h(t){return d?t.xAxisID===o.id:t.yAxisID===o.id}o.min=Number.POSITIVE_INFINITY,o.max=Number.NEGATIVE_INFINITY,o.minNotZero=Number.POSITIVE_INFINITY;var c=s.stacked;if(void 0===c)for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e)&&void 0!==e.stack){c=!0;break}if(s.stacked||c){var f={};for(t=0;t<u.length;t++){var g=[(e=l.getDatasetMeta(t)).type,void 0===s.stacked&&void 0===e.stack?t:"",e.stack].join(".");if(l.isDatasetVisible(t)&&h(e))for(void 0===f[g]&&(f[g]=[]),a=0,r=(i=u[t].data).length;a<r;a++){var m=f[g];n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(m[a]=m[a]||0,m[a]+=n.max)}}H.each(f,(function(t){if(t.length>0){var e=H.min(t),n=H.max(t);o.min=Math.min(o.min,e),o.max=Math.max(o.max,n)}}))}else for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e))for(a=0,r=(i=u[t].data).length;a<r;a++)n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(o.min=Math.min(n.min,o.min),o.max=Math.max(n.max,o.max),0!==n.min&&(o.minNotZero=Math.min(n.min,o.minNotZero)));o.min=H.isFinite(o.min)?o.min:null,o.max=H.isFinite(o.max)?o.max:null,o.minNotZero=H.isFinite(o.minNotZero)?o.minNotZero:null,this.handleTickRangeOptions()},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;t.min=Rn(e.min,t.min),t.max=Rn(e.max,t.max),t.min===t.max&&(0!==t.min&&null!==t.min?(t.min=Math.pow(10,Math.floor(In(t.min))-1),t.max=Math.pow(10,Math.floor(In(t.max))+1)):(t.min=1,t.max=10)),null===t.min&&(t.min=Math.pow(10,Math.floor(In(t.max))-1)),null===t.max&&(t.max=0!==t.min?Math.pow(10,Math.floor(In(t.min))+1):10),null===t.minNotZero&&(t.min>0?t.minNotZero=t.min:t.max<1?t.minNotZero=Math.pow(10,Math.floor(In(t.max))):t.minNotZero=1)},buildTicks:function(){var t=this,e=t.options.ticks,n=!t.isHorizontal(),i={min:Rn(e.min),max:Rn(e.max)},a=t.ticks=function(t,e){var n,i,a=[],r=Fn(t.min,Math.pow(10,Math.floor(In(e.min)))),o=Math.floor(In(e.max)),s=Math.ceil(e.max/Math.pow(10,o));0===r?(n=Math.floor(In(e.minNotZero)),i=Math.floor(e.minNotZero/Math.pow(10,n)),a.push(r),r=i*Math.pow(10,n)):(n=Math.floor(In(r)),i=Math.floor(r/Math.pow(10,n)));var l=n<0?Math.pow(10,Math.abs(n)):1;do{a.push(r),10===++i&&(i=1,l=++n>=0?1:l),r=Math.round(i*Math.pow(10,n)*l)/l}while(n<o||n===o&&i<s);var u=Fn(t.max,r);return a.push(u),a}(i,t);t.max=H.max(a),t.min=H.min(a),e.reverse?(n=!n,t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max),n&&a.reverse()},convertTicksToLabels:function(){this.tickValues=this.ticks.slice(),xn.prototype.convertTicksToLabels.call(this)},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForTick:function(t){var e=this.tickValues;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])},_getFirstTickValue:function(t){var e=Math.floor(In(t));return Math.floor(t/Math.pow(10,e))*Math.pow(10,e)},_configure:function(){var t=this,e=t.min,n=0;xn.prototype._configure.call(t),0===e&&(e=t._getFirstTickValue(t.minNotZero),n=Fn(t.options.ticks.fontSize,W.global.defaultFontSize)/t._length),t._startValue=In(e),t._valueOffset=n,t._valueRange=(In(t.max)-In(e))/(1-n)},getPixelForValue:function(t){var e=this,n=0;return(t=+e.getRightValue(t))>e.min&&t>0&&(n=(In(t)-e._startValue)/e._valueRange+e._valueOffset),e.getPixelForDecimal(n)},getValueForPixel:function(t){var e=this,n=e.getDecimalForPixel(t);return 0===n&&0===e.min?0:Math.pow(10,e._startValue+(n-e._valueOffset)*e._valueRange)}}),Wn=Ln;Nn._defaults=Wn;var Yn=H.valueOrDefault,zn=H.valueAtIndexOrDefault,En=H.options.resolve,Vn={display:!0,animate:!0,position:"chartArea",angleLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,borderDash:[],borderDashOffset:0},gridLines:{circular:!1},ticks:{showLabelBackdrop:!0,backdropColor:"rgba(255,255,255,0.75)",backdropPaddingY:2,backdropPaddingX:2,callback:on.formatters.linear},pointLabels:{display:!0,fontSize:10,callback:function(t){return t}}};function Hn(t){var e=t.ticks;return e.display&&t.display?Yn(e.fontSize,W.global.defaultFontSize)+2*e.backdropPaddingY:0}function Bn(t,e,n,i,a){return t===i||t===a?{start:e-n/2,end:e+n/2}:t<i||t>a?{start:e-n,end:e}:{start:e,end:e+n}}function jn(t){return 0===t||180===t?"center":t<180?"left":"right"}function Un(t,e,n,i){var a,r,o=n.y+i/2;if(H.isArray(e))for(a=0,r=e.length;a<r;++a)t.fillText(e[a],n.x,o),o+=i;else t.fillText(e,n.x,o)}function Gn(t,e,n){90===t||270===t?n.y-=e.h/2:(t>270||t<90)&&(n.y-=e.h)}function qn(t){return H.isNumber(t)?t:0}var Zn=Dn.extend({setDimensions:function(){var t=this;t.width=t.maxWidth,t.height=t.maxHeight,t.paddingTop=Hn(t.options)/2,t.xCenter=Math.floor(t.width/2),t.yCenter=Math.floor((t.height-t.paddingTop)/2),t.drawingArea=Math.min(t.height-t.paddingTop,t.width)/2},determineDataLimits:function(){var t=this,e=t.chart,n=Number.POSITIVE_INFINITY,i=Number.NEGATIVE_INFINITY;H.each(e.data.datasets,(function(a,r){if(e.isDatasetVisible(r)){var o=e.getDatasetMeta(r);H.each(a.data,(function(e,a){var r=+t.getRightValue(e);isNaN(r)||o.data[a].hidden||(n=Math.min(r,n),i=Math.max(r,i))}))}})),t.min=n===Number.POSITIVE_INFINITY?0:n,t.max=i===Number.NEGATIVE_INFINITY?0:i,t.handleTickRangeOptions()},_computeTickLimit:function(){return Math.ceil(this.drawingArea/Hn(this.options))},convertTicksToLabels:function(){var t=this;Dn.prototype.convertTicksToLabels.call(t),t.pointLabels=t.chart.data.labels.map((function(){var e=H.callback(t.options.pointLabels.callback,arguments,t);return e||0===e?e:""}))},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},fit:function(){var t=this.options;t.display&&t.pointLabels.display?function(t){var e,n,i,a=H.options._parseFont(t.options.pointLabels),r={l:0,r:t.width,t:0,b:t.height-t.paddingTop},o={};t.ctx.font=a.string,t._pointLabelSizes=[];var s,l,u,d=t.chart.data.labels.length;for(e=0;e<d;e++){i=t.getPointPosition(e,t.drawingArea+5),s=t.ctx,l=a.lineHeight,u=t.pointLabels[e],n=H.isArray(u)?{w:H.longestText(s,s.font,u),h:u.length*l}:{w:s.measureText(u).width,h:l},t._pointLabelSizes[e]=n;var h=t.getIndexAngle(e),c=H.toDegrees(h)%360,f=Bn(c,i.x,n.w,0,180),g=Bn(c,i.y,n.h,90,270);f.start<r.l&&(r.l=f.start,o.l=h),f.end>r.r&&(r.r=f.end,o.r=h),g.start<r.t&&(r.t=g.start,o.t=h),g.end>r.b&&(r.b=g.end,o.b=h)}t.setReductions(t.drawingArea,r,o)}(this):this.setCenterPoint(0,0,0,0)},setReductions:function(t,e,n){var i=this,a=e.l/Math.sin(n.l),r=Math.max(e.r-i.width,0)/Math.sin(n.r),o=-e.t/Math.cos(n.t),s=-Math.max(e.b-(i.height-i.paddingTop),0)/Math.cos(n.b);a=qn(a),r=qn(r),o=qn(o),s=qn(s),i.drawingArea=Math.min(Math.floor(t-(a+r)/2),Math.floor(t-(o+s)/2)),i.setCenterPoint(a,r,o,s)},setCenterPoint:function(t,e,n,i){var a=this,r=a.width-e-a.drawingArea,o=t+a.drawingArea,s=n+a.drawingArea,l=a.height-a.paddingTop-i-a.drawingArea;a.xCenter=Math.floor((o+r)/2+a.left),a.yCenter=Math.floor((s+l)/2+a.top+a.paddingTop)},getIndexAngle:function(t){var e=this.chart,n=(t*(360/e.data.labels.length)+((e.options||{}).startAngle||0))%360;return(n<0?n+360:n)*Math.PI*2/360},getDistanceFromCenterForValue:function(t){var e=this;if(H.isNullOrUndef(t))return NaN;var n=e.drawingArea/(e.max-e.min);return e.options.ticks.reverse?(e.max-t)*n:(t-e.min)*n},getPointPosition:function(t,e){var n=this.getIndexAngle(t)-Math.PI/2;return{x:Math.cos(n)*e+this.xCenter,y:Math.sin(n)*e+this.yCenter}},getPointPositionForValue:function(t,e){return this.getPointPosition(t,this.getDistanceFromCenterForValue(e))},getBasePosition:function(t){var e=this.min,n=this.max;return this.getPointPositionForValue(t||0,this.beginAtZero?0:e<0&&n<0?n:e>0&&n>0?e:0)},_drawGrid:function(){var t,e,n,i=this,a=i.ctx,r=i.options,o=r.gridLines,s=r.angleLines,l=Yn(s.lineWidth,o.lineWidth),u=Yn(s.color,o.color);if(r.pointLabels.display&&function(t){var e=t.ctx,n=t.options,i=n.pointLabels,a=Hn(n),r=t.getDistanceFromCenterForValue(n.ticks.reverse?t.min:t.max),o=H.options._parseFont(i);e.save(),e.font=o.string,e.textBaseline="middle";for(var s=t.chart.data.labels.length-1;s>=0;s--){var l=0===s?a/2:0,u=t.getPointPosition(s,r+l+5),d=zn(i.fontColor,s,W.global.defaultFontColor);e.fillStyle=d;var h=t.getIndexAngle(s),c=H.toDegrees(h);e.textAlign=jn(c),Gn(c,t._pointLabelSizes[s],u),Un(e,t.pointLabels[s],u,o.lineHeight)}e.restore()}(i),o.display&&H.each(i.ticks,(function(t,n){0!==n&&(e=i.getDistanceFromCenterForValue(i.ticksAsNumbers[n]),function(t,e,n,i){var a,r=t.ctx,o=e.circular,s=t.chart.data.labels.length,l=zn(e.color,i-1),u=zn(e.lineWidth,i-1);if((o||s)&&l&&u){if(r.save(),r.strokeStyle=l,r.lineWidth=u,r.setLineDash&&(r.setLineDash(e.borderDash||[]),r.lineDashOffset=e.borderDashOffset||0),r.beginPath(),o)r.arc(t.xCenter,t.yCenter,n,0,2*Math.PI);else{a=t.getPointPosition(0,n),r.moveTo(a.x,a.y);for(var d=1;d<s;d++)a=t.getPointPosition(d,n),r.lineTo(a.x,a.y)}r.closePath(),r.stroke(),r.restore()}}(i,o,e,n))})),s.display&&l&&u){for(a.save(),a.lineWidth=l,a.strokeStyle=u,a.setLineDash&&(a.setLineDash(En([s.borderDash,o.borderDash,[]])),a.lineDashOffset=En([s.borderDashOffset,o.borderDashOffset,0])),t=i.chart.data.labels.length-1;t>=0;t--)e=i.getDistanceFromCenterForValue(r.ticks.reverse?i.min:i.max),n=i.getPointPosition(t,e),a.beginPath(),a.moveTo(i.xCenter,i.yCenter),a.lineTo(n.x,n.y),a.stroke();a.restore()}},_drawLabels:function(){var t=this,e=t.ctx,n=t.options.ticks;if(n.display){var i,a,r=t.getIndexAngle(0),o=H.options._parseFont(n),s=Yn(n.fontColor,W.global.defaultFontColor);e.save(),e.font=o.string,e.translate(t.xCenter,t.yCenter),e.rotate(r),e.textAlign="center",e.textBaseline="middle",H.each(t.ticks,(function(r,l){(0!==l||n.reverse)&&(i=t.getDistanceFromCenterForValue(t.ticksAsNumbers[l]),n.showLabelBackdrop&&(a=e.measureText(r).width,e.fillStyle=n.backdropColor,e.fillRect(-a/2-n.backdropPaddingX,-i-o.size/2-n.backdropPaddingY,a+2*n.backdropPaddingX,o.size+2*n.backdropPaddingY)),e.fillStyle=s,e.fillText(r,0,-i))})),e.restore()}},_drawTitle:H.noop}),$n=Vn;Zn._defaults=$n;var Xn=H._deprecated,Kn=H.options.resolve,Jn=H.valueOrDefault,Qn=Number.MIN_SAFE_INTEGER||-9007199254740991,ti=Number.MAX_SAFE_INTEGER||9007199254740991,ei={millisecond:{common:!0,size:1,steps:1e3},second:{common:!0,size:1e3,steps:60},minute:{common:!0,size:6e4,steps:60},hour:{common:!0,size:36e5,steps:24},day:{common:!0,size:864e5,steps:30},week:{common:!1,size:6048e5,steps:4},month:{common:!0,size:2628e6,steps:12},quarter:{common:!1,size:7884e6,steps:4},year:{common:!0,size:3154e7}},ni=Object.keys(ei);function ii(t,e){return t-e}function ai(t){return H.valueOrDefault(t.time.min,t.ticks.min)}function ri(t){return H.valueOrDefault(t.time.max,t.ticks.max)}function oi(t,e,n,i){var a=function(t,e,n){for(var i,a,r,o=0,s=t.length-1;o>=0&&o<=s;){if(a=t[(i=o+s>>1)-1]||null,r=t[i],!a)return{lo:null,hi:r};if(r[e]<n)o=i+1;else{if(!(a[e]>n))return{lo:a,hi:r};s=i-1}}return{lo:r,hi:null}}(t,e,n),r=a.lo?a.hi?a.lo:t[t.length-2]:t[0],o=a.lo?a.hi?a.hi:t[t.length-1]:t[1],s=o[e]-r[e],l=s?(n-r[e])/s:0,u=(o[i]-r[i])*l;return r[i]+u}function si(t,e){var n=t._adapter,i=t.options.time,a=i.parser,r=a||i.format,o=e;return"function"==typeof a&&(o=a(o)),H.isFinite(o)||(o="string"==typeof r?n.parse(o,r):n.parse(o)),null!==o?+o:(a||"function"!=typeof r||(o=r(e),H.isFinite(o)||(o=n.parse(o))),o)}function li(t,e){if(H.isNullOrUndef(e))return null;var n=t.options.time,i=si(t,t.getRightValue(e));return null===i?i:(n.round&&(i=+t._adapter.startOf(i,n.round)),i)}function ui(t,e,n,i){var a,r,o,s=ni.length;for(a=ni.indexOf(t);a<s-1;++a)if(o=(r=ei[ni[a]]).steps?r.steps:ti,r.common&&Math.ceil((n-e)/(o*r.size))<=i)return ni[a];return ni[s-1]}function di(t,e,n){var i,a,r=[],o={},s=e.length;for(i=0;i<s;++i)o[a=e[i]]=i,r.push({value:a,major:!1});return 0!==s&&n?function(t,e,n,i){var a,r,o=t._adapter,s=+o.startOf(e[0].value,i),l=e[e.length-1].value;for(a=s;a<=l;a=+o.add(a,1,i))(r=n[a])>=0&&(e[r].major=!0);return e}(t,r,o,n):r}var hi=xn.extend({initialize:function(){this.mergeTicksOptions(),xn.prototype.initialize.call(this)},update:function(){var t=this,e=t.options,n=e.time||(e.time={}),i=t._adapter=new rn._date(e.adapters.date);return Xn("time scale",n.format,"time.format","time.parser"),Xn("time scale",n.min,"time.min","ticks.min"),Xn("time scale",n.max,"time.max","ticks.max"),H.mergeIf(n.displayFormats,i.formats()),xn.prototype.update.apply(t,arguments)},getRightValue:function(t){return t&&void 0!==t.t&&(t=t.t),xn.prototype.getRightValue.call(this,t)},determineDataLimits:function(){var t,e,n,i,a,r,o,s=this,l=s.chart,u=s._adapter,d=s.options,h=d.time.unit||"day",c=ti,f=Qn,g=[],m=[],p=[],v=s._getLabels();for(t=0,n=v.length;t<n;++t)p.push(li(s,v[t]));for(t=0,n=(l.data.datasets||[]).length;t<n;++t)if(l.isDatasetVisible(t))if(a=l.data.datasets[t].data,H.isObject(a[0]))for(m[t]=[],e=0,i=a.length;e<i;++e)r=li(s,a[e]),g.push(r),m[t][e]=r;else m[t]=p.slice(0),o||(g=g.concat(p),o=!0);else m[t]=[];p.length&&(c=Math.min(c,p[0]),f=Math.max(f,p[p.length-1])),g.length&&(g=n>1?function(t){var e,n,i,a={},r=[];for(e=0,n=t.length;e<n;++e)a[i=t[e]]||(a[i]=!0,r.push(i));return r}(g).sort(ii):g.sort(ii),c=Math.min(c,g[0]),f=Math.max(f,g[g.length-1])),c=li(s,ai(d))||c,f=li(s,ri(d))||f,c=c===ti?+u.startOf(Date.now(),h):c,f=f===Qn?+u.endOf(Date.now(),h)+1:f,s.min=Math.min(c,f),s.max=Math.max(c+1,f),s._table=[],s._timestamps={data:g,datasets:m,labels:p}},buildTicks:function(){var t,e,n,i=this,a=i.min,r=i.max,o=i.options,s=o.ticks,l=o.time,u=i._timestamps,d=[],h=i.getLabelCapacity(a),c=s.source,f=o.distribution;for(u="data"===c||"auto"===c&&"series"===f?u.data:"labels"===c?u.labels:function(t,e,n,i){var a,r=t._adapter,o=t.options,s=o.time,l=s.unit||ui(s.minUnit,e,n,i),u=Kn([s.stepSize,s.unitStepSize,1]),d="week"===l&&s.isoWeekday,h=e,c=[];if(d&&(h=+r.startOf(h,"isoWeek",d)),h=+r.startOf(h,d?"day":l),r.diff(n,e,l)>1e5*u)throw e+" and "+n+" are too far apart with stepSize of "+u+" "+l;for(a=h;a<n;a=+r.add(a,u,l))c.push(a);return a!==n&&"ticks"!==o.bounds||c.push(a),c}(i,a,r,h),"ticks"===o.bounds&&u.length&&(a=u[0],r=u[u.length-1]),a=li(i,ai(o))||a,r=li(i,ri(o))||r,t=0,e=u.length;t<e;++t)(n=u[t])>=a&&n<=r&&d.push(n);return i.min=a,i.max=r,i._unit=l.unit||(s.autoSkip?ui(l.minUnit,i.min,i.max,h):function(t,e,n,i,a){var r,o;for(r=ni.length-1;r>=ni.indexOf(n);r--)if(o=ni[r],ei[o].common&&t._adapter.diff(a,i,o)>=e-1)return o;return ni[n?ni.indexOf(n):0]}(i,d.length,l.minUnit,i.min,i.max)),i._majorUnit=s.major.enabled&&"year"!==i._unit?function(t){for(var e=ni.indexOf(t)+1,n=ni.length;e<n;++e)if(ei[ni[e]].common)return ni[e]}(i._unit):void 0,i._table=function(t,e,n,i){if("linear"===i||!t.length)return[{time:e,pos:0},{time:n,pos:1}];var a,r,o,s,l,u=[],d=[e];for(a=0,r=t.length;a<r;++a)(s=t[a])>e&&s<n&&d.push(s);for(d.push(n),a=0,r=d.length;a<r;++a)l=d[a+1],o=d[a-1],s=d[a],void 0!==o&&void 0!==l&&Math.round((l+o)/2)===s||u.push({time:s,pos:a/(r-1)});return u}(i._timestamps.data,a,r,f),i._offsets=function(t,e,n,i,a){var r,o,s=0,l=0;return a.offset&&e.length&&(r=oi(t,"time",e[0],"pos"),s=1===e.length?1-r:(oi(t,"time",e[1],"pos")-r)/2,o=oi(t,"time",e[e.length-1],"pos"),l=1===e.length?o:(o-oi(t,"time",e[e.length-2],"pos"))/2),{start:s,end:l,factor:1/(s+1+l)}}(i._table,d,0,0,o),s.reverse&&d.reverse(),di(i,d,i._majorUnit)},getLabelForIndex:function(t,e){var n=this,i=n._adapter,a=n.chart.data,r=n.options.time,o=a.labels&&t<a.labels.length?a.labels[t]:"",s=a.datasets[e].data[t];return H.isObject(s)&&(o=n.getRightValue(s)),r.tooltipFormat?i.format(si(n,o),r.tooltipFormat):"string"==typeof o?o:i.format(si(n,o),r.displayFormats.datetime)},tickFormatFunction:function(t,e,n,i){var a=this._adapter,r=this.options,o=r.time.displayFormats,s=o[this._unit],l=this._majorUnit,u=o[l],d=n[e],h=r.ticks,c=l&&u&&d&&d.major,f=a.format(t,i||(c?u:s)),g=c?h.major:h.minor,m=Kn([g.callback,g.userCallback,h.callback,h.userCallback]);return m?m(f,e,n):f},convertTicksToLabels:function(t){var e,n,i=[];for(e=0,n=t.length;e<n;++e)i.push(this.tickFormatFunction(t[e].value,e,t));return i},getPixelForOffset:function(t){var e=this._offsets,n=oi(this._table,"time",t,"pos");return this.getPixelForDecimal((e.start+n)*e.factor)},getPixelForValue:function(t,e,n){var i=null;if(void 0!==e&&void 0!==n&&(i=this._timestamps.datasets[n][e]),null===i&&(i=li(this,t)),null!==i)return this.getPixelForOffset(i)},getPixelForTick:function(t){var e=this.getTicks();return t>=0&&t<e.length?this.getPixelForOffset(e[t].value):null},getValueForPixel:function(t){var e=this._offsets,n=this.getDecimalForPixel(t)/e.factor-e.end,i=oi(this._table,"pos",n,"time");return this._adapter._create(i)},_getLabelSize:function(t){var e=this.options.ticks,n=this.ctx.measureText(t).width,i=H.toRadians(this.isHorizontal()?e.maxRotation:e.minRotation),a=Math.cos(i),r=Math.sin(i),o=Jn(e.fontSize,W.global.defaultFontSize);return{w:n*a+o*r,h:n*r+o*a}},getLabelWidth:function(t){return this._getLabelSize(t).w},getLabelCapacity:function(t){var e=this,n=e.options.time,i=n.displayFormats,a=i[n.unit]||i.millisecond,r=e.tickFormatFunction(t,0,di(e,[t],e._majorUnit),a),o=e._getLabelSize(r),s=Math.floor(e.isHorizontal()?e.width/o.w:e.height/o.h);return e.options.offset&&s--,s>0?s:1}}),ci={position:"bottom",distribution:"linear",bounds:"data",adapters:{},time:{parser:!1,unit:!1,round:!1,displayFormat:!1,isoWeekday:!1,minUnit:"millisecond",displayFormats:{}},ticks:{autoSkip:!1,source:"auto",major:{enabled:!1}}};hi._defaults=ci;var fi={category:wn,linear:On,logarithmic:Nn,radialLinear:Zn,time:hi},gi=e((function(e,n){e.exports=function(){var n,i;function a(){return n.apply(null,arguments)}function r(t){return t instanceof Array||"[object Array]"===Object.prototype.toString.call(t)}function o(t){return null!=t&&"[object Object]"===Object.prototype.toString.call(t)}function s(t){return void 0===t}function l(t){return"number"==typeof t||"[object Number]"===Object.prototype.toString.call(t)}function u(t){return t instanceof Date||"[object Date]"===Object.prototype.toString.call(t)}function d(t,e){var n,i=[];for(n=0;n<t.length;++n)i.push(e(t[n],n));return i}function h(t,e){return Object.prototype.hasOwnProperty.call(t,e)}function c(t,e){for(var n in e)h(e,n)&&(t[n]=e[n]);return h(e,"toString")&&(t.toString=e.toString),h(e,"valueOf")&&(t.valueOf=e.valueOf),t}function f(t,e,n,i){return Ie(t,e,n,i,!0).utc()}function g(t){return null==t._pf&&(t._pf={empty:!1,unusedTokens:[],unusedInput:[],overflow:-2,charsLeftOver:0,nullInput:!1,invalidMonth:null,invalidFormat:!1,userInvalidated:!1,iso:!1,parsedDateParts:[],meridiem:null,rfc2822:!1,weekdayMismatch:!1}),t._pf}function m(t){if(null==t._isValid){var e=g(t),n=i.call(e.parsedDateParts,(function(t){return null!=t})),a=!isNaN(t._d.getTime())&&e.overflow<0&&!e.empty&&!e.invalidMonth&&!e.invalidWeekday&&!e.weekdayMismatch&&!e.nullInput&&!e.invalidFormat&&!e.userInvalidated&&(!e.meridiem||e.meridiem&&n);if(t._strict&&(a=a&&0===e.charsLeftOver&&0===e.unusedTokens.length&&void 0===e.bigHour),null!=Object.isFrozen&&Object.isFrozen(t))return a;t._isValid=a}return t._isValid}function p(t){var e=f(NaN);return null!=t?c(g(e),t):g(e).userInvalidated=!0,e}i=Array.prototype.some?Array.prototype.some:function(t){for(var e=Object(this),n=e.length>>>0,i=0;i<n;i++)if(i in e&&t.call(this,e[i],i,e))return!0;return!1};var v=a.momentProperties=[];function b(t,e){var n,i,a;if(s(e._isAMomentObject)||(t._isAMomentObject=e._isAMomentObject),s(e._i)||(t._i=e._i),s(e._f)||(t._f=e._f),s(e._l)||(t._l=e._l),s(e._strict)||(t._strict=e._strict),s(e._tzm)||(t._tzm=e._tzm),s(e._isUTC)||(t._isUTC=e._isUTC),s(e._offset)||(t._offset=e._offset),s(e._pf)||(t._pf=g(e)),s(e._locale)||(t._locale=e._locale),v.length>0)for(n=0;n<v.length;n++)s(a=e[i=v[n]])||(t[i]=a);return t}var y=!1;function x(t){b(this,t),this._d=new Date(null!=t._d?t._d.getTime():NaN),this.isValid()||(this._d=new Date(NaN)),!1===y&&(y=!0,a.updateOffset(this),y=!1)}function _(t){return t instanceof x||null!=t&&null!=t._isAMomentObject}function w(t){return t<0?Math.ceil(t)||0:Math.floor(t)}function k(t){var e=+t,n=0;return 0!==e&&isFinite(e)&&(n=w(e)),n}function M(t,e,n){var i,a=Math.min(t.length,e.length),r=Math.abs(t.length-e.length),o=0;for(i=0;i<a;i++)(n&&t[i]!==e[i]||!n&&k(t[i])!==k(e[i]))&&o++;return o+r}function S(t){!1===a.suppressDeprecationWarnings&&"undefined"!=typeof console&&console.warn&&console.warn("Deprecation warning: "+t)}function D(t,e){var n=!0;return c((function(){if(null!=a.deprecationHandler&&a.deprecationHandler(null,t),n){for(var i,r=[],o=0;o<arguments.length;o++){if(i="","object"==typeof arguments[o]){for(var s in i+="\n["+o+"] ",arguments[0])i+=s+": "+arguments[0][s]+", ";i=i.slice(0,-2)}else i=arguments[o];r.push(i)}S(t+"\nArguments: "+Array.prototype.slice.call(r).join("")+"\n"+(new Error).stack),n=!1}return e.apply(this,arguments)}),e)}var C,P={};function T(t,e){null!=a.deprecationHandler&&a.deprecationHandler(t,e),P[t]||(S(e),P[t]=!0)}function O(t){return t instanceof Function||"[object Function]"===Object.prototype.toString.call(t)}function A(t,e){var n,i=c({},t);for(n in e)h(e,n)&&(o(t[n])&&o(e[n])?(i[n]={},c(i[n],t[n]),c(i[n],e[n])):null!=e[n]?i[n]=e[n]:delete i[n]);for(n in t)h(t,n)&&!h(e,n)&&o(t[n])&&(i[n]=c({},i[n]));return i}function F(t){null!=t&&this.set(t)}a.suppressDeprecationWarnings=!1,a.deprecationHandler=null,C=Object.keys?Object.keys:function(t){var e,n=[];for(e in t)h(t,e)&&n.push(e);return n};var I={};function L(t,e){var n=t.toLowerCase();I[n]=I[n+"s"]=I[e]=t}function R(t){return"string"==typeof t?I[t]||I[t.toLowerCase()]:void 0}function N(t){var e,n,i={};for(n in t)h(t,n)&&(e=R(n))&&(i[e]=t[n]);return i}var W={};function Y(t,e){W[t]=e}function z(t,e,n){var i=""+Math.abs(t),a=e-i.length;return(t>=0?n?"+":"":"-")+Math.pow(10,Math.max(0,a)).toString().substr(1)+i}var E=/(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g,V=/(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g,H={},B={};function j(t,e,n,i){var a=i;"string"==typeof i&&(a=function(){return this[i]()}),t&&(B[t]=a),e&&(B[e[0]]=function(){return z(a.apply(this,arguments),e[1],e[2])}),n&&(B[n]=function(){return this.localeData().ordinal(a.apply(this,arguments),t)})}function U(t,e){return t.isValid()?(e=G(e,t.localeData()),H[e]=H[e]||function(t){var e,n,i,a=t.match(E);for(e=0,n=a.length;e<n;e++)B[a[e]]?a[e]=B[a[e]]:a[e]=(i=a[e]).match(/\[[\s\S]/)?i.replace(/^\[|\]$/g,""):i.replace(/\\/g,"");return function(e){var i,r="";for(i=0;i<n;i++)r+=O(a[i])?a[i].call(e,t):a[i];return r}}(e),H[e](t)):t.localeData().invalidDate()}function G(t,e){var n=5;function i(t){return e.longDateFormat(t)||t}for(V.lastIndex=0;n>=0&&V.test(t);)t=t.replace(V,i),V.lastIndex=0,n-=1;return t}var q=/\d/,Z=/\d\d/,$=/\d{3}/,X=/\d{4}/,K=/[+-]?\d{6}/,J=/\d\d?/,Q=/\d\d\d\d?/,tt=/\d\d\d\d\d\d?/,et=/\d{1,3}/,nt=/\d{1,4}/,it=/[+-]?\d{1,6}/,at=/\d+/,rt=/[+-]?\d+/,ot=/Z|[+-]\d\d:?\d\d/gi,st=/Z|[+-]\d\d(?::?\d\d)?/gi,lt=/[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFF07\uFF10-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i,ut={};function dt(t,e,n){ut[t]=O(e)?e:function(t,i){return t&&n?n:e}}function ht(t,e){return h(ut,t)?ut[t](e._strict,e._locale):new RegExp(ct(t.replace("\\","").replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,(function(t,e,n,i,a){return e||n||i||a}))))}function ct(t){return t.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}var ft={};function gt(t,e){var n,i=e;for("string"==typeof t&&(t=[t]),l(e)&&(i=function(t,n){n[e]=k(t)}),n=0;n<t.length;n++)ft[t[n]]=i}function mt(t,e){gt(t,(function(t,n,i,a){i._w=i._w||{},e(t,i._w,i,a)}))}function pt(t,e,n){null!=e&&h(ft,t)&&ft[t](e,n._a,n,t)}var vt=0,bt=1,yt=2,xt=3,_t=4,wt=5,kt=6,Mt=7,St=8;function Dt(t){return Ct(t)?366:365}function Ct(t){return t%4==0&&t%100!=0||t%400==0}j("Y",0,0,(function(){var t=this.year();return t<=9999?""+t:"+"+t})),j(0,["YY",2],0,(function(){return this.year()%100})),j(0,["YYYY",4],0,"year"),j(0,["YYYYY",5],0,"year"),j(0,["YYYYYY",6,!0],0,"year"),L("year","y"),Y("year",1),dt("Y",rt),dt("YY",J,Z),dt("YYYY",nt,X),dt("YYYYY",it,K),dt("YYYYYY",it,K),gt(["YYYYY","YYYYYY"],vt),gt("YYYY",(function(t,e){e[vt]=2===t.length?a.parseTwoDigitYear(t):k(t)})),gt("YY",(function(t,e){e[vt]=a.parseTwoDigitYear(t)})),gt("Y",(function(t,e){e[vt]=parseInt(t,10)})),a.parseTwoDigitYear=function(t){return k(t)+(k(t)>68?1900:2e3)};var Pt,Tt=Ot("FullYear",!0);function Ot(t,e){return function(n){return null!=n?(Ft(this,t,n),a.updateOffset(this,e),this):At(this,t)}}function At(t,e){return t.isValid()?t._d["get"+(t._isUTC?"UTC":"")+e]():NaN}function Ft(t,e,n){t.isValid()&&!isNaN(n)&&("FullYear"===e&&Ct(t.year())&&1===t.month()&&29===t.date()?t._d["set"+(t._isUTC?"UTC":"")+e](n,t.month(),It(n,t.month())):t._d["set"+(t._isUTC?"UTC":"")+e](n))}function It(t,e){if(isNaN(t)||isNaN(e))return NaN;var n=function(t,e){return(t%e+e)%e}(e,12);return t+=(e-n)/12,1===n?Ct(t)?29:28:31-n%7%2}Pt=Array.prototype.indexOf?Array.prototype.indexOf:function(t){var e;for(e=0;e<this.length;++e)if(this[e]===t)return e;return-1},j("M",["MM",2],"Mo",(function(){return this.month()+1})),j("MMM",0,0,(function(t){return this.localeData().monthsShort(this,t)})),j("MMMM",0,0,(function(t){return this.localeData().months(this,t)})),L("month","M"),Y("month",8),dt("M",J),dt("MM",J,Z),dt("MMM",(function(t,e){return e.monthsShortRegex(t)})),dt("MMMM",(function(t,e){return e.monthsRegex(t)})),gt(["M","MM"],(function(t,e){e[bt]=k(t)-1})),gt(["MMM","MMMM"],(function(t,e,n,i){var a=n._locale.monthsParse(t,i,n._strict);null!=a?e[bt]=a:g(n).invalidMonth=t}));var Lt=/D[oD]?(\[[^\[\]]*\]|\s)+MMMM?/,Rt="January_February_March_April_May_June_July_August_September_October_November_December".split("_"),Nt="Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_");function Wt(t,e,n){var i,a,r,o=t.toLocaleLowerCase();if(!this._monthsParse)for(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[],i=0;i<12;++i)r=f([2e3,i]),this._shortMonthsParse[i]=this.monthsShort(r,"").toLocaleLowerCase(),this._longMonthsParse[i]=this.months(r,"").toLocaleLowerCase();return n?"MMM"===e?-1!==(a=Pt.call(this._shortMonthsParse,o))?a:null:-1!==(a=Pt.call(this._longMonthsParse,o))?a:null:"MMM"===e?-1!==(a=Pt.call(this._shortMonthsParse,o))?a:-1!==(a=Pt.call(this._longMonthsParse,o))?a:null:-1!==(a=Pt.call(this._longMonthsParse,o))?a:-1!==(a=Pt.call(this._shortMonthsParse,o))?a:null}function Yt(t,e){var n;if(!t.isValid())return t;if("string"==typeof e)if(/^\d+$/.test(e))e=k(e);else if(!l(e=t.localeData().monthsParse(e)))return t;return n=Math.min(t.date(),It(t.year(),e)),t._d["set"+(t._isUTC?"UTC":"")+"Month"](e,n),t}function zt(t){return null!=t?(Yt(this,t),a.updateOffset(this,!0),this):At(this,"Month")}var Et=lt,Vt=lt;function Ht(){function t(t,e){return e.length-t.length}var e,n,i=[],a=[],r=[];for(e=0;e<12;e++)n=f([2e3,e]),i.push(this.monthsShort(n,"")),a.push(this.months(n,"")),r.push(this.months(n,"")),r.push(this.monthsShort(n,""));for(i.sort(t),a.sort(t),r.sort(t),e=0;e<12;e++)i[e]=ct(i[e]),a[e]=ct(a[e]);for(e=0;e<24;e++)r[e]=ct(r[e]);this._monthsRegex=new RegExp("^("+r.join("|")+")","i"),this._monthsShortRegex=this._monthsRegex,this._monthsStrictRegex=new RegExp("^("+a.join("|")+")","i"),this._monthsShortStrictRegex=new RegExp("^("+i.join("|")+")","i")}function Bt(t,e,n,i,a,r,o){var s;return t<100&&t>=0?(s=new Date(t+400,e,n,i,a,r,o),isFinite(s.getFullYear())&&s.setFullYear(t)):s=new Date(t,e,n,i,a,r,o),s}function jt(t){var e;if(t<100&&t>=0){var n=Array.prototype.slice.call(arguments);n[0]=t+400,e=new Date(Date.UTC.apply(null,n)),isFinite(e.getUTCFullYear())&&e.setUTCFullYear(t)}else e=new Date(Date.UTC.apply(null,arguments));return e}function Ut(t,e,n){var i=7+e-n;return-(7+jt(t,0,i).getUTCDay()-e)%7+i-1}function Gt(t,e,n,i,a){var r,o,s=1+7*(e-1)+(7+n-i)%7+Ut(t,i,a);return s<=0?o=Dt(r=t-1)+s:s>Dt(t)?(r=t+1,o=s-Dt(t)):(r=t,o=s),{year:r,dayOfYear:o}}function qt(t,e,n){var i,a,r=Ut(t.year(),e,n),o=Math.floor((t.dayOfYear()-r-1)/7)+1;return o<1?i=o+Zt(a=t.year()-1,e,n):o>Zt(t.year(),e,n)?(i=o-Zt(t.year(),e,n),a=t.year()+1):(a=t.year(),i=o),{week:i,year:a}}function Zt(t,e,n){var i=Ut(t,e,n),a=Ut(t+1,e,n);return(Dt(t)-i+a)/7}function $t(t,e){return t.slice(e,7).concat(t.slice(0,e))}j("w",["ww",2],"wo","week"),j("W",["WW",2],"Wo","isoWeek"),L("week","w"),L("isoWeek","W"),Y("week",5),Y("isoWeek",5),dt("w",J),dt("ww",J,Z),dt("W",J),dt("WW",J,Z),mt(["w","ww","W","WW"],(function(t,e,n,i){e[i.substr(0,1)]=k(t)})),j("d",0,"do","day"),j("dd",0,0,(function(t){return this.localeData().weekdaysMin(this,t)})),j("ddd",0,0,(function(t){return this.localeData().weekdaysShort(this,t)})),j("dddd",0,0,(function(t){return this.localeData().weekdays(this,t)})),j("e",0,0,"weekday"),j("E",0,0,"isoWeekday"),L("day","d"),L("weekday","e"),L("isoWeekday","E"),Y("day",11),Y("weekday",11),Y("isoWeekday",11),dt("d",J),dt("e",J),dt("E",J),dt("dd",(function(t,e){return e.weekdaysMinRegex(t)})),dt("ddd",(function(t,e){return e.weekdaysShortRegex(t)})),dt("dddd",(function(t,e){return e.weekdaysRegex(t)})),mt(["dd","ddd","dddd"],(function(t,e,n,i){var a=n._locale.weekdaysParse(t,i,n._strict);null!=a?e.d=a:g(n).invalidWeekday=t})),mt(["d","e","E"],(function(t,e,n,i){e[i]=k(t)}));var Xt="Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),Kt="Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),Jt="Su_Mo_Tu_We_Th_Fr_Sa".split("_");function Qt(t,e,n){var i,a,r,o=t.toLocaleLowerCase();if(!this._weekdaysParse)for(this._weekdaysParse=[],this._shortWeekdaysParse=[],this._minWeekdaysParse=[],i=0;i<7;++i)r=f([2e3,1]).day(i),this._minWeekdaysParse[i]=this.weekdaysMin(r,"").toLocaleLowerCase(),this._shortWeekdaysParse[i]=this.weekdaysShort(r,"").toLocaleLowerCase(),this._weekdaysParse[i]=this.weekdays(r,"").toLocaleLowerCase();return n?"dddd"===e?-1!==(a=Pt.call(this._weekdaysParse,o))?a:null:"ddd"===e?-1!==(a=Pt.call(this._shortWeekdaysParse,o))?a:null:-1!==(a=Pt.call(this._minWeekdaysParse,o))?a:null:"dddd"===e?-1!==(a=Pt.call(this._weekdaysParse,o))?a:-1!==(a=Pt.call(this._shortWeekdaysParse,o))?a:-1!==(a=Pt.call(this._minWeekdaysParse,o))?a:null:"ddd"===e?-1!==(a=Pt.call(this._shortWeekdaysParse,o))?a:-1!==(a=Pt.call(this._weekdaysParse,o))?a:-1!==(a=Pt.call(this._minWeekdaysParse,o))?a:null:-1!==(a=Pt.call(this._minWeekdaysParse,o))?a:-1!==(a=Pt.call(this._weekdaysParse,o))?a:-1!==(a=Pt.call(this._shortWeekdaysParse,o))?a:null}var te=lt,ee=lt,ne=lt;function ie(){function t(t,e){return e.length-t.length}var e,n,i,a,r,o=[],s=[],l=[],u=[];for(e=0;e<7;e++)n=f([2e3,1]).day(e),i=this.weekdaysMin(n,""),a=this.weekdaysShort(n,""),r=this.weekdays(n,""),o.push(i),s.push(a),l.push(r),u.push(i),u.push(a),u.push(r);for(o.sort(t),s.sort(t),l.sort(t),u.sort(t),e=0;e<7;e++)s[e]=ct(s[e]),l[e]=ct(l[e]),u[e]=ct(u[e]);this._weekdaysRegex=new RegExp("^("+u.join("|")+")","i"),this._weekdaysShortRegex=this._weekdaysRegex,this._weekdaysMinRegex=this._weekdaysRegex,this._weekdaysStrictRegex=new RegExp("^("+l.join("|")+")","i"),this._weekdaysShortStrictRegex=new RegExp("^("+s.join("|")+")","i"),this._weekdaysMinStrictRegex=new RegExp("^("+o.join("|")+")","i")}function ae(){return this.hours()%12||12}function re(t,e){j(t,0,0,(function(){return this.localeData().meridiem(this.hours(),this.minutes(),e)}))}function oe(t,e){return e._meridiemParse}j("H",["HH",2],0,"hour"),j("h",["hh",2],0,ae),j("k",["kk",2],0,(function(){return this.hours()||24})),j("hmm",0,0,(function(){return""+ae.apply(this)+z(this.minutes(),2)})),j("hmmss",0,0,(function(){return""+ae.apply(this)+z(this.minutes(),2)+z(this.seconds(),2)})),j("Hmm",0,0,(function(){return""+this.hours()+z(this.minutes(),2)})),j("Hmmss",0,0,(function(){return""+this.hours()+z(this.minutes(),2)+z(this.seconds(),2)})),re("a",!0),re("A",!1),L("hour","h"),Y("hour",13),dt("a",oe),dt("A",oe),dt("H",J),dt("h",J),dt("k",J),dt("HH",J,Z),dt("hh",J,Z),dt("kk",J,Z),dt("hmm",Q),dt("hmmss",tt),dt("Hmm",Q),dt("Hmmss",tt),gt(["H","HH"],xt),gt(["k","kk"],(function(t,e,n){var i=k(t);e[xt]=24===i?0:i})),gt(["a","A"],(function(t,e,n){n._isPm=n._locale.isPM(t),n._meridiem=t})),gt(["h","hh"],(function(t,e,n){e[xt]=k(t),g(n).bigHour=!0})),gt("hmm",(function(t,e,n){var i=t.length-2;e[xt]=k(t.substr(0,i)),e[_t]=k(t.substr(i)),g(n).bigHour=!0})),gt("hmmss",(function(t,e,n){var i=t.length-4,a=t.length-2;e[xt]=k(t.substr(0,i)),e[_t]=k(t.substr(i,2)),e[wt]=k(t.substr(a)),g(n).bigHour=!0})),gt("Hmm",(function(t,e,n){var i=t.length-2;e[xt]=k(t.substr(0,i)),e[_t]=k(t.substr(i))})),gt("Hmmss",(function(t,e,n){var i=t.length-4,a=t.length-2;e[xt]=k(t.substr(0,i)),e[_t]=k(t.substr(i,2)),e[wt]=k(t.substr(a))}));var se,le=Ot("Hours",!0),ue={calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},longDateFormat:{LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},invalidDate:"Invalid date",ordinal:"%d",dayOfMonthOrdinalParse:/\d{1,2}/,relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},months:Rt,monthsShort:Nt,week:{dow:0,doy:6},weekdays:Xt,weekdaysMin:Jt,weekdaysShort:Kt,meridiemParse:/[ap]\.?m?\.?/i},de={},he={};function ce(t){return t?t.toLowerCase().replace("_","-"):t}function fe(n){var i=null;if(!de[n]&&e&&e.exports)try{i=se._abbr,t(),ge(i)}catch(t){}return de[n]}function ge(t,e){var n;return t&&((n=s(e)?pe(t):me(t,e))?se=n:"undefined"!=typeof console&&console.warn&&console.warn("Locale "+t+" not found. Did you forget to load it?")),se._abbr}function me(t,e){if(null!==e){var n,i=ue;if(e.abbr=t,null!=de[t])T("defineLocaleOverride","use moment.updateLocale(localeName, config) to change an existing locale. moment.defineLocale(localeName, config) should only be used for creating a new locale See http://momentjs.com/guides/#/warnings/define-locale/ for more info."),i=de[t]._config;else if(null!=e.parentLocale)if(null!=de[e.parentLocale])i=de[e.parentLocale]._config;else{if(null==(n=fe(e.parentLocale)))return he[e.parentLocale]||(he[e.parentLocale]=[]),he[e.parentLocale].push({name:t,config:e}),null;i=n._config}return de[t]=new F(A(i,e)),he[t]&&he[t].forEach((function(t){me(t.name,t.config)})),ge(t),de[t]}return delete de[t],null}function pe(t){var e;if(t&&t._locale&&t._locale._abbr&&(t=t._locale._abbr),!t)return se;if(!r(t)){if(e=fe(t))return e;t=[t]}return function(t){for(var e,n,i,a,r=0;r<t.length;){for(e=(a=ce(t[r]).split("-")).length,n=(n=ce(t[r+1]))?n.split("-"):null;e>0;){if(i=fe(a.slice(0,e).join("-")))return i;if(n&&n.length>=e&&M(a,n,!0)>=e-1)break;e--}r++}return se}(t)}function ve(t){var e,n=t._a;return n&&-2===g(t).overflow&&(e=n[bt]<0||n[bt]>11?bt:n[yt]<1||n[yt]>It(n[vt],n[bt])?yt:n[xt]<0||n[xt]>24||24===n[xt]&&(0!==n[_t]||0!==n[wt]||0!==n[kt])?xt:n[_t]<0||n[_t]>59?_t:n[wt]<0||n[wt]>59?wt:n[kt]<0||n[kt]>999?kt:-1,g(t)._overflowDayOfYear&&(e<vt||e>yt)&&(e=yt),g(t)._overflowWeeks&&-1===e&&(e=Mt),g(t)._overflowWeekday&&-1===e&&(e=St),g(t).overflow=e),t}function be(t,e,n){return null!=t?t:null!=e?e:n}function ye(t){var e,n,i,r,o,s=[];if(!t._d){for(i=function(t){var e=new Date(a.now());return t._useUTC?[e.getUTCFullYear(),e.getUTCMonth(),e.getUTCDate()]:[e.getFullYear(),e.getMonth(),e.getDate()]}(t),t._w&&null==t._a[yt]&&null==t._a[bt]&&function(t){var e,n,i,a,r,o,s,l;if(null!=(e=t._w).GG||null!=e.W||null!=e.E)r=1,o=4,n=be(e.GG,t._a[vt],qt(Le(),1,4).year),i=be(e.W,1),((a=be(e.E,1))<1||a>7)&&(l=!0);else{r=t._locale._week.dow,o=t._locale._week.doy;var u=qt(Le(),r,o);n=be(e.gg,t._a[vt],u.year),i=be(e.w,u.week),null!=e.d?((a=e.d)<0||a>6)&&(l=!0):null!=e.e?(a=e.e+r,(e.e<0||e.e>6)&&(l=!0)):a=r}i<1||i>Zt(n,r,o)?g(t)._overflowWeeks=!0:null!=l?g(t)._overflowWeekday=!0:(s=Gt(n,i,a,r,o),t._a[vt]=s.year,t._dayOfYear=s.dayOfYear)}(t),null!=t._dayOfYear&&(o=be(t._a[vt],i[vt]),(t._dayOfYear>Dt(o)||0===t._dayOfYear)&&(g(t)._overflowDayOfYear=!0),n=jt(o,0,t._dayOfYear),t._a[bt]=n.getUTCMonth(),t._a[yt]=n.getUTCDate()),e=0;e<3&&null==t._a[e];++e)t._a[e]=s[e]=i[e];for(;e<7;e++)t._a[e]=s[e]=null==t._a[e]?2===e?1:0:t._a[e];24===t._a[xt]&&0===t._a[_t]&&0===t._a[wt]&&0===t._a[kt]&&(t._nextDay=!0,t._a[xt]=0),t._d=(t._useUTC?jt:Bt).apply(null,s),r=t._useUTC?t._d.getUTCDay():t._d.getDay(),null!=t._tzm&&t._d.setUTCMinutes(t._d.getUTCMinutes()-t._tzm),t._nextDay&&(t._a[xt]=24),t._w&&void 0!==t._w.d&&t._w.d!==r&&(g(t).weekdayMismatch=!0)}}var xe=/^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,_e=/^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,we=/Z|[+-]\d\d(?::?\d\d)?/,ke=[["YYYYYY-MM-DD",/[+-]\d{6}-\d\d-\d\d/],["YYYY-MM-DD",/\d{4}-\d\d-\d\d/],["GGGG-[W]WW-E",/\d{4}-W\d\d-\d/],["GGGG-[W]WW",/\d{4}-W\d\d/,!1],["YYYY-DDD",/\d{4}-\d{3}/],["YYYY-MM",/\d{4}-\d\d/,!1],["YYYYYYMMDD",/[+-]\d{10}/],["YYYYMMDD",/\d{8}/],["GGGG[W]WWE",/\d{4}W\d{3}/],["GGGG[W]WW",/\d{4}W\d{2}/,!1],["YYYYDDD",/\d{7}/]],Me=[["HH:mm:ss.SSSS",/\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss,SSSS",/\d\d:\d\d:\d\d,\d+/],["HH:mm:ss",/\d\d:\d\d:\d\d/],["HH:mm",/\d\d:\d\d/],["HHmmss.SSSS",/\d\d\d\d\d\d\.\d+/],["HHmmss,SSSS",/\d\d\d\d\d\d,\d+/],["HHmmss",/\d\d\d\d\d\d/],["HHmm",/\d\d\d\d/],["HH",/\d\d/]],Se=/^\/?Date\((\-?\d+)/i;function De(t){var e,n,i,a,r,o,s=t._i,l=xe.exec(s)||_e.exec(s);if(l){for(g(t).iso=!0,e=0,n=ke.length;e<n;e++)if(ke[e][1].exec(l[1])){a=ke[e][0],i=!1!==ke[e][2];break}if(null==a)return void(t._isValid=!1);if(l[3]){for(e=0,n=Me.length;e<n;e++)if(Me[e][1].exec(l[3])){r=(l[2]||" ")+Me[e][0];break}if(null==r)return void(t._isValid=!1)}if(!i&&null!=r)return void(t._isValid=!1);if(l[4]){if(!we.exec(l[4]))return void(t._isValid=!1);o="Z"}t._f=a+(r||"")+(o||""),Ae(t)}else t._isValid=!1}var Ce=/^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\s)?(\d{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\d{2,4})\s(\d\d):(\d\d)(?::(\d\d))?\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|([+-]\d{4}))$/;function Pe(t){var e=parseInt(t,10);return e<=49?2e3+e:e<=999?1900+e:e}var Te={UT:0,GMT:0,EDT:-240,EST:-300,CDT:-300,CST:-360,MDT:-360,MST:-420,PDT:-420,PST:-480};function Oe(t){var e,n,i,a,r,o,s,l=Ce.exec(t._i.replace(/\([^)]*\)|[\n\t]/g," ").replace(/(\s\s+)/g," ").replace(/^\s\s*/,"").replace(/\s\s*$/,""));if(l){var u=(e=l[4],n=l[3],i=l[2],a=l[5],r=l[6],o=l[7],s=[Pe(e),Nt.indexOf(n),parseInt(i,10),parseInt(a,10),parseInt(r,10)],o&&s.push(parseInt(o,10)),s);if(!function(t,e,n){return!t||Kt.indexOf(t)===new Date(e[0],e[1],e[2]).getDay()||(g(n).weekdayMismatch=!0,n._isValid=!1,!1)}(l[1],u,t))return;t._a=u,t._tzm=function(t,e,n){if(t)return Te[t];if(e)return 0;var i=parseInt(n,10),a=i%100;return(i-a)/100*60+a}(l[8],l[9],l[10]),t._d=jt.apply(null,t._a),t._d.setUTCMinutes(t._d.getUTCMinutes()-t._tzm),g(t).rfc2822=!0}else t._isValid=!1}function Ae(t){if(t._f!==a.ISO_8601)if(t._f!==a.RFC_2822){t._a=[],g(t).empty=!0;var e,n,i,r,o,s=""+t._i,l=s.length,u=0;for(i=G(t._f,t._locale).match(E)||[],e=0;e<i.length;e++)r=i[e],(n=(s.match(ht(r,t))||[])[0])&&((o=s.substr(0,s.indexOf(n))).length>0&&g(t).unusedInput.push(o),s=s.slice(s.indexOf(n)+n.length),u+=n.length),B[r]?(n?g(t).empty=!1:g(t).unusedTokens.push(r),pt(r,n,t)):t._strict&&!n&&g(t).unusedTokens.push(r);g(t).charsLeftOver=l-u,s.length>0&&g(t).unusedInput.push(s),t._a[xt]<=12&&!0===g(t).bigHour&&t._a[xt]>0&&(g(t).bigHour=void 0),g(t).parsedDateParts=t._a.slice(0),g(t).meridiem=t._meridiem,t._a[xt]=function(t,e,n){var i;return null==n?e:null!=t.meridiemHour?t.meridiemHour(e,n):null!=t.isPM?((i=t.isPM(n))&&e<12&&(e+=12),i||12!==e||(e=0),e):e}(t._locale,t._a[xt],t._meridiem),ye(t),ve(t)}else Oe(t);else De(t)}function Fe(t){var e=t._i,n=t._f;return t._locale=t._locale||pe(t._l),null===e||void 0===n&&""===e?p({nullInput:!0}):("string"==typeof e&&(t._i=e=t._locale.preparse(e)),_(e)?new x(ve(e)):(u(e)?t._d=e:r(n)?function(t){var e,n,i,a,r;if(0===t._f.length)return g(t).invalidFormat=!0,void(t._d=new Date(NaN));for(a=0;a<t._f.length;a++)r=0,e=b({},t),null!=t._useUTC&&(e._useUTC=t._useUTC),e._f=t._f[a],Ae(e),m(e)&&(r+=g(e).charsLeftOver,r+=10*g(e).unusedTokens.length,g(e).score=r,(null==i||r<i)&&(i=r,n=e));c(t,n||e)}(t):n?Ae(t):function(t){var e=t._i;s(e)?t._d=new Date(a.now()):u(e)?t._d=new Date(e.valueOf()):"string"==typeof e?function(t){var e=Se.exec(t._i);null===e?(De(t),!1===t._isValid&&(delete t._isValid,Oe(t),!1===t._isValid&&(delete t._isValid,a.createFromInputFallback(t)))):t._d=new Date(+e[1])}(t):r(e)?(t._a=d(e.slice(0),(function(t){return parseInt(t,10)})),ye(t)):o(e)?function(t){if(!t._d){var e=N(t._i);t._a=d([e.year,e.month,e.day||e.date,e.hour,e.minute,e.second,e.millisecond],(function(t){return t&&parseInt(t,10)})),ye(t)}}(t):l(e)?t._d=new Date(e):a.createFromInputFallback(t)}(t),m(t)||(t._d=null),t))}function Ie(t,e,n,i,a){var s,l={};return!0!==n&&!1!==n||(i=n,n=void 0),(o(t)&&function(t){if(Object.getOwnPropertyNames)return 0===Object.getOwnPropertyNames(t).length;var e;for(e in t)if(t.hasOwnProperty(e))return!1;return!0}(t)||r(t)&&0===t.length)&&(t=void 0),l._isAMomentObject=!0,l._useUTC=l._isUTC=a,l._l=n,l._i=t,l._f=e,l._strict=i,(s=new x(ve(Fe(l))))._nextDay&&(s.add(1,"d"),s._nextDay=void 0),s}function Le(t,e,n,i){return Ie(t,e,n,i,!1)}a.createFromInputFallback=D("value provided is not in a recognized RFC2822 or ISO format. moment construction falls back to js Date(), which is not reliable across all browsers and versions. Non RFC2822/ISO date formats are discouraged and will be removed in an upcoming major release. Please refer to http://momentjs.com/guides/#/warnings/js-date/ for more info.",(function(t){t._d=new Date(t._i+(t._useUTC?" UTC":""))})),a.ISO_8601=function(){},a.RFC_2822=function(){};var Re=D("moment().min is deprecated, use moment.max instead. http://momentjs.com/guides/#/warnings/min-max/",(function(){var t=Le.apply(null,arguments);return this.isValid()&&t.isValid()?t<this?this:t:p()})),Ne=D("moment().max is deprecated, use moment.min instead. http://momentjs.com/guides/#/warnings/min-max/",(function(){var t=Le.apply(null,arguments);return this.isValid()&&t.isValid()?t>this?this:t:p()}));function We(t,e){var n,i;if(1===e.length&&r(e[0])&&(e=e[0]),!e.length)return Le();for(n=e[0],i=1;i<e.length;++i)e[i].isValid()&&!e[i][t](n)||(n=e[i]);return n}var Ye=["year","quarter","month","week","day","hour","minute","second","millisecond"];function ze(t){var e=N(t),n=e.year||0,i=e.quarter||0,a=e.month||0,r=e.week||e.isoWeek||0,o=e.day||0,s=e.hour||0,l=e.minute||0,u=e.second||0,d=e.millisecond||0;this._isValid=function(t){for(var e in t)if(-1===Pt.call(Ye,e)||null!=t[e]&&isNaN(t[e]))return!1;for(var n=!1,i=0;i<Ye.length;++i)if(t[Ye[i]]){if(n)return!1;parseFloat(t[Ye[i]])!==k(t[Ye[i]])&&(n=!0)}return!0}(e),this._milliseconds=+d+1e3*u+6e4*l+1e3*s*60*60,this._days=+o+7*r,this._months=+a+3*i+12*n,this._data={},this._locale=pe(),this._bubble()}function Ee(t){return t instanceof ze}function Ve(t){return t<0?-1*Math.round(-1*t):Math.round(t)}function He(t,e){j(t,0,0,(function(){var t=this.utcOffset(),n="+";return t<0&&(t=-t,n="-"),n+z(~~(t/60),2)+e+z(~~t%60,2)}))}He("Z",":"),He("ZZ",""),dt("Z",st),dt("ZZ",st),gt(["Z","ZZ"],(function(t,e,n){n._useUTC=!0,n._tzm=je(st,t)}));var Be=/([\+\-]|\d\d)/gi;function je(t,e){var n=(e||"").match(t);if(null===n)return null;var i=((n[n.length-1]||[])+"").match(Be)||["-",0,0],a=60*i[1]+k(i[2]);return 0===a?0:"+"===i[0]?a:-a}function Ue(t,e){var n,i;return e._isUTC?(n=e.clone(),i=(_(t)||u(t)?t.valueOf():Le(t).valueOf())-n.valueOf(),n._d.setTime(n._d.valueOf()+i),a.updateOffset(n,!1),n):Le(t).local()}function Ge(t){return 15*-Math.round(t._d.getTimezoneOffset()/15)}function qe(){return!!this.isValid()&&this._isUTC&&0===this._offset}a.updateOffset=function(){};var Ze=/^(\-|\+)?(?:(\d*)[. ])?(\d+)\:(\d+)(?:\:(\d+)(\.\d*)?)?$/,$e=/^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/;function Xe(t,e){var n,i,a,r,o,s,u=t,d=null;return Ee(t)?u={ms:t._milliseconds,d:t._days,M:t._months}:l(t)?(u={},e?u[e]=t:u.milliseconds=t):(d=Ze.exec(t))?(n="-"===d[1]?-1:1,u={y:0,d:k(d[yt])*n,h:k(d[xt])*n,m:k(d[_t])*n,s:k(d[wt])*n,ms:k(Ve(1e3*d[kt]))*n}):(d=$e.exec(t))?(n="-"===d[1]?-1:1,u={y:Ke(d[2],n),M:Ke(d[3],n),w:Ke(d[4],n),d:Ke(d[5],n),h:Ke(d[6],n),m:Ke(d[7],n),s:Ke(d[8],n)}):null==u?u={}:"object"==typeof u&&("from"in u||"to"in u)&&(r=Le(u.from),o=Le(u.to),a=r.isValid()&&o.isValid()?(o=Ue(o,r),r.isBefore(o)?s=Je(r,o):((s=Je(o,r)).milliseconds=-s.milliseconds,s.months=-s.months),s):{milliseconds:0,months:0},(u={}).ms=a.milliseconds,u.M=a.months),i=new ze(u),Ee(t)&&h(t,"_locale")&&(i._locale=t._locale),i}function Ke(t,e){var n=t&&parseFloat(t.replace(",","."));return(isNaN(n)?0:n)*e}function Je(t,e){var n={};return n.months=e.month()-t.month()+12*(e.year()-t.year()),t.clone().add(n.months,"M").isAfter(e)&&--n.months,n.milliseconds=+e-+t.clone().add(n.months,"M"),n}function Qe(t,e){return function(n,i){var a;return null===i||isNaN(+i)||(T(e,"moment()."+e+"(period, number) is deprecated. Please use moment()."+e+"(number, period). See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info."),a=n,n=i,i=a),tn(this,Xe(n="string"==typeof n?+n:n,i),t),this}}function tn(t,e,n,i){var r=e._milliseconds,o=Ve(e._days),s=Ve(e._months);t.isValid()&&(i=null==i||i,s&&Yt(t,At(t,"Month")+s*n),o&&Ft(t,"Date",At(t,"Date")+o*n),r&&t._d.setTime(t._d.valueOf()+r*n),i&&a.updateOffset(t,o||s))}Xe.fn=ze.prototype,Xe.invalid=function(){return Xe(NaN)};var en=Qe(1,"add"),nn=Qe(-1,"subtract");function an(t,e){var n=12*(e.year()-t.year())+(e.month()-t.month()),i=t.clone().add(n,"months");return-(n+(e-i<0?(e-i)/(i-t.clone().add(n-1,"months")):(e-i)/(t.clone().add(n+1,"months")-i)))||0}function rn(t){var e;return void 0===t?this._locale._abbr:(null!=(e=pe(t))&&(this._locale=e),this)}a.defaultFormat="YYYY-MM-DDTHH:mm:ssZ",a.defaultFormatUtc="YYYY-MM-DDTHH:mm:ss[Z]";var on=D("moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.",(function(t){return void 0===t?this.localeData():this.locale(t)}));function sn(){return this._locale}var ln=1e3,un=60*ln,dn=60*un,hn=3506328*dn;function cn(t,e){return(t%e+e)%e}function fn(t,e,n){return t<100&&t>=0?new Date(t+400,e,n)-hn:new Date(t,e,n).valueOf()}function gn(t,e,n){return t<100&&t>=0?Date.UTC(t+400,e,n)-hn:Date.UTC(t,e,n)}function mn(t,e){j(0,[t,t.length],0,e)}function pn(t,e,n,i,a){var r;return null==t?qt(this,i,a).year:(e>(r=Zt(t,i,a))&&(e=r),vn.call(this,t,e,n,i,a))}function vn(t,e,n,i,a){var r=Gt(t,e,n,i,a),o=jt(r.year,0,r.dayOfYear);return this.year(o.getUTCFullYear()),this.month(o.getUTCMonth()),this.date(o.getUTCDate()),this}j(0,["gg",2],0,(function(){return this.weekYear()%100})),j(0,["GG",2],0,(function(){return this.isoWeekYear()%100})),mn("gggg","weekYear"),mn("ggggg","weekYear"),mn("GGGG","isoWeekYear"),mn("GGGGG","isoWeekYear"),L("weekYear","gg"),L("isoWeekYear","GG"),Y("weekYear",1),Y("isoWeekYear",1),dt("G",rt),dt("g",rt),dt("GG",J,Z),dt("gg",J,Z),dt("GGGG",nt,X),dt("gggg",nt,X),dt("GGGGG",it,K),dt("ggggg",it,K),mt(["gggg","ggggg","GGGG","GGGGG"],(function(t,e,n,i){e[i.substr(0,2)]=k(t)})),mt(["gg","GG"],(function(t,e,n,i){e[i]=a.parseTwoDigitYear(t)})),j("Q",0,"Qo","quarter"),L("quarter","Q"),Y("quarter",7),dt("Q",q),gt("Q",(function(t,e){e[bt]=3*(k(t)-1)})),j("D",["DD",2],"Do","date"),L("date","D"),Y("date",9),dt("D",J),dt("DD",J,Z),dt("Do",(function(t,e){return t?e._dayOfMonthOrdinalParse||e._ordinalParse:e._dayOfMonthOrdinalParseLenient})),gt(["D","DD"],yt),gt("Do",(function(t,e){e[yt]=k(t.match(J)[0])}));var bn=Ot("Date",!0);j("DDD",["DDDD",3],"DDDo","dayOfYear"),L("dayOfYear","DDD"),Y("dayOfYear",4),dt("DDD",et),dt("DDDD",$),gt(["DDD","DDDD"],(function(t,e,n){n._dayOfYear=k(t)})),j("m",["mm",2],0,"minute"),L("minute","m"),Y("minute",14),dt("m",J),dt("mm",J,Z),gt(["m","mm"],_t);var yn=Ot("Minutes",!1);j("s",["ss",2],0,"second"),L("second","s"),Y("second",15),dt("s",J),dt("ss",J,Z),gt(["s","ss"],wt);var xn,_n=Ot("Seconds",!1);for(j("S",0,0,(function(){return~~(this.millisecond()/100)})),j(0,["SS",2],0,(function(){return~~(this.millisecond()/10)})),j(0,["SSS",3],0,"millisecond"),j(0,["SSSS",4],0,(function(){return 10*this.millisecond()})),j(0,["SSSSS",5],0,(function(){return 100*this.millisecond()})),j(0,["SSSSSS",6],0,(function(){return 1e3*this.millisecond()})),j(0,["SSSSSSS",7],0,(function(){return 1e4*this.millisecond()})),j(0,["SSSSSSSS",8],0,(function(){return 1e5*this.millisecond()})),j(0,["SSSSSSSSS",9],0,(function(){return 1e6*this.millisecond()})),L("millisecond","ms"),Y("millisecond",16),dt("S",et,q),dt("SS",et,Z),dt("SSS",et,$),xn="SSSS";xn.length<=9;xn+="S")dt(xn,at);function wn(t,e){e[kt]=k(1e3*("0."+t))}for(xn="S";xn.length<=9;xn+="S")gt(xn,wn);var kn=Ot("Milliseconds",!1);j("z",0,0,"zoneAbbr"),j("zz",0,0,"zoneName");var Mn=x.prototype;function Sn(t){return t}Mn.add=en,Mn.calendar=function(t,e){var n=t||Le(),i=Ue(n,this).startOf("day"),r=a.calendarFormat(this,i)||"sameElse",o=e&&(O(e[r])?e[r].call(this,n):e[r]);return this.format(o||this.localeData().calendar(r,this,Le(n)))},Mn.clone=function(){return new x(this)},Mn.diff=function(t,e,n){var i,a,r;if(!this.isValid())return NaN;if(!(i=Ue(t,this)).isValid())return NaN;switch(a=6e4*(i.utcOffset()-this.utcOffset()),e=R(e)){case"year":r=an(this,i)/12;break;case"month":r=an(this,i);break;case"quarter":r=an(this,i)/3;break;case"second":r=(this-i)/1e3;break;case"minute":r=(this-i)/6e4;break;case"hour":r=(this-i)/36e5;break;case"day":r=(this-i-a)/864e5;break;case"week":r=(this-i-a)/6048e5;break;default:r=this-i}return n?r:w(r)},Mn.endOf=function(t){var e;if(void 0===(t=R(t))||"millisecond"===t||!this.isValid())return this;var n=this._isUTC?gn:fn;switch(t){case"year":e=n(this.year()+1,0,1)-1;break;case"quarter":e=n(this.year(),this.month()-this.month()%3+3,1)-1;break;case"month":e=n(this.year(),this.month()+1,1)-1;break;case"week":e=n(this.year(),this.month(),this.date()-this.weekday()+7)-1;break;case"isoWeek":e=n(this.year(),this.month(),this.date()-(this.isoWeekday()-1)+7)-1;break;case"day":case"date":e=n(this.year(),this.month(),this.date()+1)-1;break;case"hour":e=this._d.valueOf(),e+=dn-cn(e+(this._isUTC?0:this.utcOffset()*un),dn)-1;break;case"minute":e=this._d.valueOf(),e+=un-cn(e,un)-1;break;case"second":e=this._d.valueOf(),e+=ln-cn(e,ln)-1}return this._d.setTime(e),a.updateOffset(this,!0),this},Mn.format=function(t){t||(t=this.isUtc()?a.defaultFormatUtc:a.defaultFormat);var e=U(this,t);return this.localeData().postformat(e)},Mn.from=function(t,e){return this.isValid()&&(_(t)&&t.isValid()||Le(t).isValid())?Xe({to:this,from:t}).locale(this.locale()).humanize(!e):this.localeData().invalidDate()},Mn.fromNow=function(t){return this.from(Le(),t)},Mn.to=function(t,e){return this.isValid()&&(_(t)&&t.isValid()||Le(t).isValid())?Xe({from:this,to:t}).locale(this.locale()).humanize(!e):this.localeData().invalidDate()},Mn.toNow=function(t){return this.to(Le(),t)},Mn.get=function(t){return O(this[t=R(t)])?this[t]():this},Mn.invalidAt=function(){return g(this).overflow},Mn.isAfter=function(t,e){var n=_(t)?t:Le(t);return!(!this.isValid()||!n.isValid())&&("millisecond"===(e=R(e)||"millisecond")?this.valueOf()>n.valueOf():n.valueOf()<this.clone().startOf(e).valueOf())},Mn.isBefore=function(t,e){var n=_(t)?t:Le(t);return!(!this.isValid()||!n.isValid())&&("millisecond"===(e=R(e)||"millisecond")?this.valueOf()<n.valueOf():this.clone().endOf(e).valueOf()<n.valueOf())},Mn.isBetween=function(t,e,n,i){var a=_(t)?t:Le(t),r=_(e)?e:Le(e);return!!(this.isValid()&&a.isValid()&&r.isValid())&&("("===(i=i||"()")[0]?this.isAfter(a,n):!this.isBefore(a,n))&&(")"===i[1]?this.isBefore(r,n):!this.isAfter(r,n))},Mn.isSame=function(t,e){var n,i=_(t)?t:Le(t);return!(!this.isValid()||!i.isValid())&&("millisecond"===(e=R(e)||"millisecond")?this.valueOf()===i.valueOf():(n=i.valueOf(),this.clone().startOf(e).valueOf()<=n&&n<=this.clone().endOf(e).valueOf()))},Mn.isSameOrAfter=function(t,e){return this.isSame(t,e)||this.isAfter(t,e)},Mn.isSameOrBefore=function(t,e){return this.isSame(t,e)||this.isBefore(t,e)},Mn.isValid=function(){return m(this)},Mn.lang=on,Mn.locale=rn,Mn.localeData=sn,Mn.max=Ne,Mn.min=Re,Mn.parsingFlags=function(){return c({},g(this))},Mn.set=function(t,e){if("object"==typeof t)for(var n=function(t){var e=[];for(var n in t)e.push({unit:n,priority:W[n]});return e.sort((function(t,e){return t.priority-e.priority})),e}(t=N(t)),i=0;i<n.length;i++)this[n[i].unit](t[n[i].unit]);else if(O(this[t=R(t)]))return this[t](e);return this},Mn.startOf=function(t){var e;if(void 0===(t=R(t))||"millisecond"===t||!this.isValid())return this;var n=this._isUTC?gn:fn;switch(t){case"year":e=n(this.year(),0,1);break;case"quarter":e=n(this.year(),this.month()-this.month()%3,1);break;case"month":e=n(this.year(),this.month(),1);break;case"week":e=n(this.year(),this.month(),this.date()-this.weekday());break;case"isoWeek":e=n(this.year(),this.month(),this.date()-(this.isoWeekday()-1));break;case"day":case"date":e=n(this.year(),this.month(),this.date());break;case"hour":e=this._d.valueOf(),e-=cn(e+(this._isUTC?0:this.utcOffset()*un),dn);break;case"minute":e=this._d.valueOf(),e-=cn(e,un);break;case"second":e=this._d.valueOf(),e-=cn(e,ln)}return this._d.setTime(e),a.updateOffset(this,!0),this},Mn.subtract=nn,Mn.toArray=function(){var t=this;return[t.year(),t.month(),t.date(),t.hour(),t.minute(),t.second(),t.millisecond()]},Mn.toObject=function(){var t=this;return{years:t.year(),months:t.month(),date:t.date(),hours:t.hours(),minutes:t.minutes(),seconds:t.seconds(),milliseconds:t.milliseconds()}},Mn.toDate=function(){return new Date(this.valueOf())},Mn.toISOString=function(t){if(!this.isValid())return null;var e=!0!==t,n=e?this.clone().utc():this;return n.year()<0||n.year()>9999?U(n,e?"YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]":"YYYYYY-MM-DD[T]HH:mm:ss.SSSZ"):O(Date.prototype.toISOString)?e?this.toDate().toISOString():new Date(this.valueOf()+60*this.utcOffset()*1e3).toISOString().replace("Z",U(n,"Z")):U(n,e?"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]":"YYYY-MM-DD[T]HH:mm:ss.SSSZ")},Mn.inspect=function(){if(!this.isValid())return"moment.invalid(/* "+this._i+" */)";var t="moment",e="";this.isLocal()||(t=0===this.utcOffset()?"moment.utc":"moment.parseZone",e="Z");var n="["+t+'("]',i=0<=this.year()&&this.year()<=9999?"YYYY":"YYYYYY",a=e+'[")]';return this.format(n+i+"-MM-DD[T]HH:mm:ss.SSS"+a)},Mn.toJSON=function(){return this.isValid()?this.toISOString():null},Mn.toString=function(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},Mn.unix=function(){return Math.floor(this.valueOf()/1e3)},Mn.valueOf=function(){return this._d.valueOf()-6e4*(this._offset||0)},Mn.creationData=function(){return{input:this._i,format:this._f,locale:this._locale,isUTC:this._isUTC,strict:this._strict}},Mn.year=Tt,Mn.isLeapYear=function(){return Ct(this.year())},Mn.weekYear=function(t){return pn.call(this,t,this.week(),this.weekday(),this.localeData()._week.dow,this.localeData()._week.doy)},Mn.isoWeekYear=function(t){return pn.call(this,t,this.isoWeek(),this.isoWeekday(),1,4)},Mn.quarter=Mn.quarters=function(t){return null==t?Math.ceil((this.month()+1)/3):this.month(3*(t-1)+this.month()%3)},Mn.month=zt,Mn.daysInMonth=function(){return It(this.year(),this.month())},Mn.week=Mn.weeks=function(t){var e=this.localeData().week(this);return null==t?e:this.add(7*(t-e),"d")},Mn.isoWeek=Mn.isoWeeks=function(t){var e=qt(this,1,4).week;return null==t?e:this.add(7*(t-e),"d")},Mn.weeksInYear=function(){var t=this.localeData()._week;return Zt(this.year(),t.dow,t.doy)},Mn.isoWeeksInYear=function(){return Zt(this.year(),1,4)},Mn.date=bn,Mn.day=Mn.days=function(t){if(!this.isValid())return null!=t?this:NaN;var e=this._isUTC?this._d.getUTCDay():this._d.getDay();return null!=t?(t=function(t,e){return"string"!=typeof t?t:isNaN(t)?"number"==typeof(t=e.weekdaysParse(t))?t:null:parseInt(t,10)}(t,this.localeData()),this.add(t-e,"d")):e},Mn.weekday=function(t){if(!this.isValid())return null!=t?this:NaN;var e=(this.day()+7-this.localeData()._week.dow)%7;return null==t?e:this.add(t-e,"d")},Mn.isoWeekday=function(t){if(!this.isValid())return null!=t?this:NaN;if(null!=t){var e=function(t,e){return"string"==typeof t?e.weekdaysParse(t)%7||7:isNaN(t)?null:t}(t,this.localeData());return this.day(this.day()%7?e:e-7)}return this.day()||7},Mn.dayOfYear=function(t){var e=Math.round((this.clone().startOf("day")-this.clone().startOf("year"))/864e5)+1;return null==t?e:this.add(t-e,"d")},Mn.hour=Mn.hours=le,Mn.minute=Mn.minutes=yn,Mn.second=Mn.seconds=_n,Mn.millisecond=Mn.milliseconds=kn,Mn.utcOffset=function(t,e,n){var i,r=this._offset||0;if(!this.isValid())return null!=t?this:NaN;if(null!=t){if("string"==typeof t){if(null===(t=je(st,t)))return this}else Math.abs(t)<16&&!n&&(t*=60);return!this._isUTC&&e&&(i=Ge(this)),this._offset=t,this._isUTC=!0,null!=i&&this.add(i,"m"),r!==t&&(!e||this._changeInProgress?tn(this,Xe(t-r,"m"),1,!1):this._changeInProgress||(this._changeInProgress=!0,a.updateOffset(this,!0),this._changeInProgress=null)),this}return this._isUTC?r:Ge(this)},Mn.utc=function(t){return this.utcOffset(0,t)},Mn.local=function(t){return this._isUTC&&(this.utcOffset(0,t),this._isUTC=!1,t&&this.subtract(Ge(this),"m")),this},Mn.parseZone=function(){if(null!=this._tzm)this.utcOffset(this._tzm,!1,!0);else if("string"==typeof this._i){var t=je(ot,this._i);null!=t?this.utcOffset(t):this.utcOffset(0,!0)}return this},Mn.hasAlignedHourOffset=function(t){return!!this.isValid()&&(t=t?Le(t).utcOffset():0,(this.utcOffset()-t)%60==0)},Mn.isDST=function(){return this.utcOffset()>this.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()},Mn.isLocal=function(){return!!this.isValid()&&!this._isUTC},Mn.isUtcOffset=function(){return!!this.isValid()&&this._isUTC},Mn.isUtc=qe,Mn.isUTC=qe,Mn.zoneAbbr=function(){return this._isUTC?"UTC":""},Mn.zoneName=function(){return this._isUTC?"Coordinated Universal Time":""},Mn.dates=D("dates accessor is deprecated. Use date instead.",bn),Mn.months=D("months accessor is deprecated. Use month instead",zt),Mn.years=D("years accessor is deprecated. Use year instead",Tt),Mn.zone=D("moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/",(function(t,e){return null!=t?("string"!=typeof t&&(t=-t),this.utcOffset(t,e),this):-this.utcOffset()})),Mn.isDSTShifted=D("isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information",(function(){if(!s(this._isDSTShifted))return this._isDSTShifted;var t={};if(b(t,this),(t=Fe(t))._a){var e=t._isUTC?f(t._a):Le(t._a);this._isDSTShifted=this.isValid()&&M(t._a,e.toArray())>0}else this._isDSTShifted=!1;return this._isDSTShifted}));var Dn=F.prototype;function Cn(t,e,n,i){var a=pe(),r=f().set(i,e);return a[n](r,t)}function Pn(t,e,n){if(l(t)&&(e=t,t=void 0),t=t||"",null!=e)return Cn(t,e,n,"month");var i,a=[];for(i=0;i<12;i++)a[i]=Cn(t,i,n,"month");return a}function Tn(t,e,n,i){"boolean"==typeof t?(l(e)&&(n=e,e=void 0),e=e||""):(n=e=t,t=!1,l(e)&&(n=e,e=void 0),e=e||"");var a,r=pe(),o=t?r._week.dow:0;if(null!=n)return Cn(e,(n+o)%7,i,"day");var s=[];for(a=0;a<7;a++)s[a]=Cn(e,(a+o)%7,i,"day");return s}Dn.calendar=function(t,e,n){var i=this._calendar[t]||this._calendar.sameElse;return O(i)?i.call(e,n):i},Dn.longDateFormat=function(t){var e=this._longDateFormat[t],n=this._longDateFormat[t.toUpperCase()];return e||!n?e:(this._longDateFormat[t]=n.replace(/MMMM|MM|DD|dddd/g,(function(t){return t.slice(1)})),this._longDateFormat[t])},Dn.invalidDate=function(){return this._invalidDate},Dn.ordinal=function(t){return this._ordinal.replace("%d",t)},Dn.preparse=Sn,Dn.postformat=Sn,Dn.relativeTime=function(t,e,n,i){var a=this._relativeTime[n];return O(a)?a(t,e,n,i):a.replace(/%d/i,t)},Dn.pastFuture=function(t,e){var n=this._relativeTime[t>0?"future":"past"];return O(n)?n(e):n.replace(/%s/i,e)},Dn.set=function(t){var e,n;for(n in t)O(e=t[n])?this[n]=e:this["_"+n]=e;this._config=t,this._dayOfMonthOrdinalParseLenient=new RegExp((this._dayOfMonthOrdinalParse.source||this._ordinalParse.source)+"|"+/\d{1,2}/.source)},Dn.months=function(t,e){return t?r(this._months)?this._months[t.month()]:this._months[(this._months.isFormat||Lt).test(e)?"format":"standalone"][t.month()]:r(this._months)?this._months:this._months.standalone},Dn.monthsShort=function(t,e){return t?r(this._monthsShort)?this._monthsShort[t.month()]:this._monthsShort[Lt.test(e)?"format":"standalone"][t.month()]:r(this._monthsShort)?this._monthsShort:this._monthsShort.standalone},Dn.monthsParse=function(t,e,n){var i,a,r;if(this._monthsParseExact)return Wt.call(this,t,e,n);for(this._monthsParse||(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[]),i=0;i<12;i++){if(a=f([2e3,i]),n&&!this._longMonthsParse[i]&&(this._longMonthsParse[i]=new RegExp("^"+this.months(a,"").replace(".","")+"$","i"),this._shortMonthsParse[i]=new RegExp("^"+this.monthsShort(a,"").replace(".","")+"$","i")),n||this._monthsParse[i]||(r="^"+this.months(a,"")+"|^"+this.monthsShort(a,""),this._monthsParse[i]=new RegExp(r.replace(".",""),"i")),n&&"MMMM"===e&&this._longMonthsParse[i].test(t))return i;if(n&&"MMM"===e&&this._shortMonthsParse[i].test(t))return i;if(!n&&this._monthsParse[i].test(t))return i}},Dn.monthsRegex=function(t){return this._monthsParseExact?(h(this,"_monthsRegex")||Ht.call(this),t?this._monthsStrictRegex:this._monthsRegex):(h(this,"_monthsRegex")||(this._monthsRegex=Vt),this._monthsStrictRegex&&t?this._monthsStrictRegex:this._monthsRegex)},Dn.monthsShortRegex=function(t){return this._monthsParseExact?(h(this,"_monthsRegex")||Ht.call(this),t?this._monthsShortStrictRegex:this._monthsShortRegex):(h(this,"_monthsShortRegex")||(this._monthsShortRegex=Et),this._monthsShortStrictRegex&&t?this._monthsShortStrictRegex:this._monthsShortRegex)},Dn.week=function(t){return qt(t,this._week.dow,this._week.doy).week},Dn.firstDayOfYear=function(){return this._week.doy},Dn.firstDayOfWeek=function(){return this._week.dow},Dn.weekdays=function(t,e){var n=r(this._weekdays)?this._weekdays:this._weekdays[t&&!0!==t&&this._weekdays.isFormat.test(e)?"format":"standalone"];return!0===t?$t(n,this._week.dow):t?n[t.day()]:n},Dn.weekdaysMin=function(t){return!0===t?$t(this._weekdaysMin,this._week.dow):t?this._weekdaysMin[t.day()]:this._weekdaysMin},Dn.weekdaysShort=function(t){return!0===t?$t(this._weekdaysShort,this._week.dow):t?this._weekdaysShort[t.day()]:this._weekdaysShort},Dn.weekdaysParse=function(t,e,n){var i,a,r;if(this._weekdaysParseExact)return Qt.call(this,t,e,n);for(this._weekdaysParse||(this._weekdaysParse=[],this._minWeekdaysParse=[],this._shortWeekdaysParse=[],this._fullWeekdaysParse=[]),i=0;i<7;i++){if(a=f([2e3,1]).day(i),n&&!this._fullWeekdaysParse[i]&&(this._fullWeekdaysParse[i]=new RegExp("^"+this.weekdays(a,"").replace(".","\\.?")+"$","i"),this._shortWeekdaysParse[i]=new RegExp("^"+this.weekdaysShort(a,"").replace(".","\\.?")+"$","i"),this._minWeekdaysParse[i]=new RegExp("^"+this.weekdaysMin(a,"").replace(".","\\.?")+"$","i")),this._weekdaysParse[i]||(r="^"+this.weekdays(a,"")+"|^"+this.weekdaysShort(a,"")+"|^"+this.weekdaysMin(a,""),this._weekdaysParse[i]=new RegExp(r.replace(".",""),"i")),n&&"dddd"===e&&this._fullWeekdaysParse[i].test(t))return i;if(n&&"ddd"===e&&this._shortWeekdaysParse[i].test(t))return i;if(n&&"dd"===e&&this._minWeekdaysParse[i].test(t))return i;if(!n&&this._weekdaysParse[i].test(t))return i}},Dn.weekdaysRegex=function(t){return this._weekdaysParseExact?(h(this,"_weekdaysRegex")||ie.call(this),t?this._weekdaysStrictRegex:this._weekdaysRegex):(h(this,"_weekdaysRegex")||(this._weekdaysRegex=te),this._weekdaysStrictRegex&&t?this._weekdaysStrictRegex:this._weekdaysRegex)},Dn.weekdaysShortRegex=function(t){return this._weekdaysParseExact?(h(this,"_weekdaysRegex")||ie.call(this),t?this._weekdaysShortStrictRegex:this._weekdaysShortRegex):(h(this,"_weekdaysShortRegex")||(this._weekdaysShortRegex=ee),this._weekdaysShortStrictRegex&&t?this._weekdaysShortStrictRegex:this._weekdaysShortRegex)},Dn.weekdaysMinRegex=function(t){return this._weekdaysParseExact?(h(this,"_weekdaysRegex")||ie.call(this),t?this._weekdaysMinStrictRegex:this._weekdaysMinRegex):(h(this,"_weekdaysMinRegex")||(this._weekdaysMinRegex=ne),this._weekdaysMinStrictRegex&&t?this._weekdaysMinStrictRegex:this._weekdaysMinRegex)},Dn.isPM=function(t){return"p"===(t+"").toLowerCase().charAt(0)},Dn.meridiem=function(t,e,n){return t>11?n?"pm":"PM":n?"am":"AM"},ge("en",{dayOfMonthOrdinalParse:/\d{1,2}(th|st|nd|rd)/,ordinal:function(t){var e=t%10;return t+(1===k(t%100/10)?"th":1===e?"st":2===e?"nd":3===e?"rd":"th")}}),a.lang=D("moment.lang is deprecated. Use moment.locale instead.",ge),a.langData=D("moment.langData is deprecated. Use moment.localeData instead.",pe);var On=Math.abs;function An(t,e,n,i){var a=Xe(e,n);return t._milliseconds+=i*a._milliseconds,t._days+=i*a._days,t._months+=i*a._months,t._bubble()}function Fn(t){return t<0?Math.floor(t):Math.ceil(t)}function In(t){return 4800*t/146097}function Ln(t){return 146097*t/4800}function Rn(t){return function(){return this.as(t)}}var Nn=Rn("ms"),Wn=Rn("s"),Yn=Rn("m"),zn=Rn("h"),En=Rn("d"),Vn=Rn("w"),Hn=Rn("M"),Bn=Rn("Q"),jn=Rn("y");function Un(t){return function(){return this.isValid()?this._data[t]:NaN}}var Gn=Un("milliseconds"),qn=Un("seconds"),Zn=Un("minutes"),$n=Un("hours"),Xn=Un("days"),Kn=Un("months"),Jn=Un("years"),Qn=Math.round,ti={ss:44,s:45,m:45,h:22,d:26,M:11};function ei(t,e,n,i,a){return a.relativeTime(e||1,!!n,t,i)}var ni=Math.abs;function ii(t){return(t>0)-(t<0)||+t}function ai(){if(!this.isValid())return this.localeData().invalidDate();var t,e,n=ni(this._milliseconds)/1e3,i=ni(this._days),a=ni(this._months);t=w(n/60),e=w(t/60),n%=60,t%=60;var r=w(a/12),o=a%=12,s=i,l=e,u=t,d=n?n.toFixed(3).replace(/\.?0+$/,""):"",h=this.asSeconds();if(!h)return"P0D";var c=h<0?"-":"",f=ii(this._months)!==ii(h)?"-":"",g=ii(this._days)!==ii(h)?"-":"",m=ii(this._milliseconds)!==ii(h)?"-":"";return c+"P"+(r?f+r+"Y":"")+(o?f+o+"M":"")+(s?g+s+"D":"")+(l||u||d?"T":"")+(l?m+l+"H":"")+(u?m+u+"M":"")+(d?m+d+"S":"")}var ri=ze.prototype;return ri.isValid=function(){return this._isValid},ri.abs=function(){var t=this._data;return this._milliseconds=On(this._milliseconds),this._days=On(this._days),this._months=On(this._months),t.milliseconds=On(t.milliseconds),t.seconds=On(t.seconds),t.minutes=On(t.minutes),t.hours=On(t.hours),t.months=On(t.months),t.years=On(t.years),this},ri.add=function(t,e){return An(this,t,e,1)},ri.subtract=function(t,e){return An(this,t,e,-1)},ri.as=function(t){if(!this.isValid())return NaN;var e,n,i=this._milliseconds;if("month"===(t=R(t))||"quarter"===t||"year"===t)switch(e=this._days+i/864e5,n=this._months+In(e),t){case"month":return n;case"quarter":return n/3;case"year":return n/12}else switch(e=this._days+Math.round(Ln(this._months)),t){case"week":return e/7+i/6048e5;case"day":return e+i/864e5;case"hour":return 24*e+i/36e5;case"minute":return 1440*e+i/6e4;case"second":return 86400*e+i/1e3;case"millisecond":return Math.floor(864e5*e)+i;default:throw new Error("Unknown unit "+t)}},ri.asMilliseconds=Nn,ri.asSeconds=Wn,ri.asMinutes=Yn,ri.asHours=zn,ri.asDays=En,ri.asWeeks=Vn,ri.asMonths=Hn,ri.asQuarters=Bn,ri.asYears=jn,ri.valueOf=function(){return this.isValid()?this._milliseconds+864e5*this._days+this._months%12*2592e6+31536e6*k(this._months/12):NaN},ri._bubble=function(){var t,e,n,i,a,r=this._milliseconds,o=this._days,s=this._months,l=this._data;return r>=0&&o>=0&&s>=0||r<=0&&o<=0&&s<=0||(r+=864e5*Fn(Ln(s)+o),o=0,s=0),l.milliseconds=r%1e3,t=w(r/1e3),l.seconds=t%60,e=w(t/60),l.minutes=e%60,n=w(e/60),l.hours=n%24,o+=w(n/24),a=w(In(o)),s+=a,o-=Fn(Ln(a)),i=w(s/12),s%=12,l.days=o,l.months=s,l.years=i,this},ri.clone=function(){return Xe(this)},ri.get=function(t){return t=R(t),this.isValid()?this[t+"s"]():NaN},ri.milliseconds=Gn,ri.seconds=qn,ri.minutes=Zn,ri.hours=$n,ri.days=Xn,ri.weeks=function(){return w(this.days()/7)},ri.months=Kn,ri.years=Jn,ri.humanize=function(t){if(!this.isValid())return this.localeData().invalidDate();var e=this.localeData(),n=function(t,e,n){var i=Xe(t).abs(),a=Qn(i.as("s")),r=Qn(i.as("m")),o=Qn(i.as("h")),s=Qn(i.as("d")),l=Qn(i.as("M")),u=Qn(i.as("y")),d=a<=ti.ss&&["s",a]||a<ti.s&&["ss",a]||r<=1&&["m"]||r<ti.m&&["mm",r]||o<=1&&["h"]||o<ti.h&&["hh",o]||s<=1&&["d"]||s<ti.d&&["dd",s]||l<=1&&["M"]||l<ti.M&&["MM",l]||u<=1&&["y"]||["yy",u];return d[2]=e,d[3]=+t>0,d[4]=n,ei.apply(null,d)}(this,!t,e);return t&&(n=e.pastFuture(+this,n)),e.postformat(n)},ri.toISOString=ai,ri.toString=ai,ri.toJSON=ai,ri.locale=rn,ri.localeData=sn,ri.toIsoString=D("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",ai),ri.lang=on,j("X",0,0,"unix"),j("x",0,0,"valueOf"),dt("x",rt),dt("X",/[+-]?\d+(\.\d{1,3})?/),gt("X",(function(t,e,n){n._d=new Date(1e3*parseFloat(t,10))})),gt("x",(function(t,e,n){n._d=new Date(k(t))})),a.version="2.24.0",n=Le,a.fn=Mn,a.min=function(){return We("isBefore",[].slice.call(arguments,0))},a.max=function(){return We("isAfter",[].slice.call(arguments,0))},a.now=function(){return Date.now?Date.now():+new Date},a.utc=f,a.unix=function(t){return Le(1e3*t)},a.months=function(t,e){return Pn(t,e,"months")},a.isDate=u,a.locale=ge,a.invalid=p,a.duration=Xe,a.isMoment=_,a.weekdays=function(t,e,n){return Tn(t,e,n,"weekdays")},a.parseZone=function(){return Le.apply(null,arguments).parseZone()},a.localeData=pe,a.isDuration=Ee,a.monthsShort=function(t,e){return Pn(t,e,"monthsShort")},a.weekdaysMin=function(t,e,n){return Tn(t,e,n,"weekdaysMin")},a.defineLocale=me,a.updateLocale=function(t,e){if(null!=e){var n,i,a=ue;null!=(i=fe(t))&&(a=i._config),e=A(a,e),(n=new F(e)).parentLocale=de[t],de[t]=n,ge(t)}else null!=de[t]&&(null!=de[t].parentLocale?de[t]=de[t].parentLocale:null!=de[t]&&delete de[t]);return de[t]},a.locales=function(){return C(de)},a.weekdaysShort=function(t,e,n){return Tn(t,e,n,"weekdaysShort")},a.normalizeUnits=R,a.relativeTimeRounding=function(t){return void 0===t?Qn:"function"==typeof t&&(Qn=t,!0)},a.relativeTimeThreshold=function(t,e){return void 0!==ti[t]&&(void 0===e?ti[t]:(ti[t]=e,"s"===t&&(ti.ss=e-1),!0))},a.calendarFormat=function(t,e){var n=t.diff(e,"days",!0);return n<-6?"sameElse":n<-1?"lastWeek":n<0?"lastDay":n<1?"sameDay":n<2?"nextDay":n<7?"nextWeek":"sameElse"},a.prototype=Mn,a.HTML5_FMT={DATETIME_LOCAL:"YYYY-MM-DDTHH:mm",DATETIME_LOCAL_SECONDS:"YYYY-MM-DDTHH:mm:ss",DATETIME_LOCAL_MS:"YYYY-MM-DDTHH:mm:ss.SSS",DATE:"YYYY-MM-DD",TIME:"HH:mm",TIME_SECONDS:"HH:mm:ss",TIME_MS:"HH:mm:ss.SSS",WEEK:"GGGG-[W]WW",MONTH:"YYYY-MM"},a}()})),mi={datetime:"MMM D, YYYY, h:mm:ss a",millisecond:"h:mm:ss.SSS a",second:"h:mm:ss a",minute:"h:mm a",hour:"hA",day:"MMM D",week:"ll",month:"MMM YYYY",quarter:"[Q]Q - YYYY",year:"YYYY"};rn._date.override("function"==typeof gi?{_id:"moment",formats:function(){return mi},parse:function(t,e){return"string"==typeof t&&"string"==typeof e?t=gi(t,e):t instanceof gi||(t=gi(t)),t.isValid()?t.valueOf():null},format:function(t,e){return gi(t).format(e)},add:function(t,e,n){return gi(t).add(e,n).valueOf()},diff:function(t,e,n){return gi(t).diff(gi(e),n)},startOf:function(t,e,n){return t=gi(t),"isoWeek"===e?t.isoWeekday(n).valueOf():t.startOf(e).valueOf()},endOf:function(t,e){return gi(t).endOf(e).valueOf()},_create:function(t){return gi(t)}}:{}),W._set("global",{plugins:{filler:{propagate:!0}}});var pi={dataset:function(t){var e=t.fill,n=t.chart,i=n.getDatasetMeta(e),a=i&&n.isDatasetVisible(e)&&i.dataset._children||[],r=a.length||0;return r?function(t,e){return e<r&&a[e]._view||null}:null},boundary:function(t){var e=t.boundary,n=e?e.x:null,i=e?e.y:null;return H.isArray(e)?function(t,n){return e[n]}:function(t){return{x:null===n?t.x:n,y:null===i?t.y:i}}}};function vi(t,e,n){var i,a=t._model||{},r=a.fill;if(void 0===r&&(r=!!a.backgroundColor),!1===r||null===r)return!1;if(!0===r)return"origin";if(i=parseFloat(r,10),isFinite(i)&&Math.floor(i)===i)return"-"!==r[0]&&"+"!==r[0]||(i=e+i),!(i===e||i<0||i>=n)&&i;switch(r){case"bottom":return"start";case"top":return"end";case"zero":return"origin";case"origin":case"start":case"end":return r;default:return!1}}function bi(t){return(t.el._scale||{}).getPointPositionForValue?function(t){var e,n,i,a,r,o=t.el._scale,s=o.options,l=o.chart.data.labels.length,u=t.fill,d=[];if(!l)return null;for(e=s.ticks.reverse?o.max:o.min,n=s.ticks.reverse?o.min:o.max,i=o.getPointPositionForValue(0,e),a=0;a<l;++a)r="start"===u||"end"===u?o.getPointPositionForValue(a,"start"===u?e:n):o.getBasePosition(a),s.gridLines.circular&&(r.cx=i.x,r.cy=i.y,r.angle=o.getIndexAngle(a)-Math.PI/2),d.push(r);return d}(t):function(t){var e,n=t.el._model||{},i=t.el._scale||{},a=t.fill,r=null;if(isFinite(a))return null;if("start"===a?r=void 0===n.scaleBottom?i.bottom:n.scaleBottom:"end"===a?r=void 0===n.scaleTop?i.top:n.scaleTop:void 0!==n.scaleZero?r=n.scaleZero:i.getBasePixel&&(r=i.getBasePixel()),null!=r){if(void 0!==r.x&&void 0!==r.y)return r;if(H.isFinite(r))return{x:(e=i.isHorizontal())?r:null,y:e?null:r}}return null}(t)}function yi(t,e,n){var i,a=t[e].fill,r=[e];if(!n)return a;for(;!1!==a&&-1===r.indexOf(a);){if(!isFinite(a))return a;if(!(i=t[a]))return!1;if(i.visible)return a;r.push(a),a=i.fill}return!1}function xi(t){var e=t.fill,n="dataset";return!1===e?null:(isFinite(e)||(n="boundary"),pi[n](t))}function _i(t){return t&&!t.skip}function wi(t,e,n,i,a){var r,o,s,l;if(i&&a){for(t.moveTo(e[0].x,e[0].y),r=1;r<i;++r)H.canvas.lineTo(t,e[r-1],e[r]);if(void 0===n[0].angle)for(t.lineTo(n[a-1].x,n[a-1].y),r=a-1;r>0;--r)H.canvas.lineTo(t,n[r],n[r-1],!0);else for(o=n[0].cx,s=n[0].cy,l=Math.sqrt(Math.pow(n[0].x-o,2)+Math.pow(n[0].y-s,2)),r=a-1;r>0;--r)t.arc(o,s,l,n[r].angle,n[r-1].angle,!0)}}function ki(t,e,n,i,a,r){var o,s,l,u,d,h,c,f,g=e.length,m=i.spanGaps,p=[],v=[],b=0,y=0;for(t.beginPath(),o=0,s=g;o<s;++o)d=n(u=e[l=o%g]._view,l,i),h=_i(u),c=_i(d),r&&void 0===f&&h&&(s=g+(f=o+1)),h&&c?(b=p.push(u),y=v.push(d)):b&&y&&(m?(h&&p.push(u),c&&v.push(d)):(wi(t,p,v,b,y),b=y=0,p=[],v=[]));wi(t,p,v,b,y),t.closePath(),t.fillStyle=a,t.fill()}var Mi={id:"filler",afterDatasetsUpdate:function(t,e){var n,i,a,r,o=(t.data.datasets||[]).length,s=e.propagate,l=[];for(i=0;i<o;++i)r=null,(a=(n=t.getDatasetMeta(i)).dataset)&&a._model&&a instanceof wt.Line&&(r={visible:t.isDatasetVisible(i),fill:vi(a,i,o),chart:t,el:a}),n.$filler=r,l.push(r);for(i=0;i<o;++i)(r=l[i])&&(r.fill=yi(l,i,s),r.boundary=bi(r),r.mapper=xi(r))},beforeDatasetsDraw:function(t){var e,n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas(),u=t.ctx;for(n=l.length-1;n>=0;--n)(e=l[n].$filler)&&e.visible&&(a=(i=e.el)._view,r=i._children||[],o=e.mapper,s=a.backgroundColor||W.global.defaultColor,o&&s&&r.length&&(H.canvas.clipArea(u,t.chartArea),ki(u,r,o,a,s,i._loop),H.canvas.unclipArea(u)))}},Si=H.rtl.getRtlAdapter,Di=H.noop,Ci=H.valueOrDefault;function Pi(t,e){return t.usePointStyle&&t.boxWidth>e?e:t.boxWidth}W._set("global",{legend:{display:!0,position:"top",align:"center",fullWidth:!0,reverse:!1,weight:1e3,onClick:function(t,e){var n=e.datasetIndex,i=this.chart,a=i.getDatasetMeta(n);a.hidden=null===a.hidden?!i.data.datasets[n].hidden:null,i.update()},onHover:null,onLeave:null,labels:{boxWidth:40,padding:10,generateLabels:function(t){var e=t.data.datasets,n=t.options.legend||{},i=n.labels&&n.labels.usePointStyle;return t._getSortedDatasetMetas().map((function(n){var a=n.controller.getStyle(i?0:void 0);return{text:e[n.index].label,fillStyle:a.backgroundColor,hidden:!t.isDatasetVisible(n.index),lineCap:a.borderCapStyle,lineDash:a.borderDash,lineDashOffset:a.borderDashOffset,lineJoin:a.borderJoinStyle,lineWidth:a.borderWidth,strokeStyle:a.borderColor,pointStyle:a.pointStyle,rotation:a.rotation,datasetIndex:n.index}}),this)}}},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data.datasets;for(a.setAttribute("class",t.id+"-legend"),e=0,n=r.length;e<n;e++)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=r[e].backgroundColor,r[e].label&&i.appendChild(document.createTextNode(r[e].label));return a.outerHTML}});var Ti=$.extend({initialize:function(t){H.extend(this,t),this.legendHitBoxes=[],this._hoveredItem=null,this.doughnutMode=!1},beforeUpdate:Di,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Di,beforeSetDimensions:Di,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Di,beforeBuildLabels:Di,buildLabels:function(){var t=this,e=t.options.labels||{},n=H.callback(e.generateLabels,[t.chart],t)||[];e.filter&&(n=n.filter((function(n){return e.filter(n,t.chart.data)}))),t.options.reverse&&n.reverse(),t.legendItems=n},afterBuildLabels:Di,beforeFit:Di,fit:function(){var t=this,e=t.options,n=e.labels,i=e.display,a=t.ctx,r=H.options._parseFont(n),o=r.size,s=t.legendHitBoxes=[],l=t.minSize,u=t.isHorizontal();if(u?(l.width=t.maxWidth,l.height=i?10:0):(l.width=i?10:0,l.height=t.maxHeight),i){if(a.font=r.string,u){var d=t.lineWidths=[0],h=0;a.textAlign="left",a.textBaseline="middle",H.each(t.legendItems,(function(t,e){var i=Pi(n,o)+o/2+a.measureText(t.text).width;(0===e||d[d.length-1]+i+2*n.padding>l.width)&&(h+=o+n.padding,d[d.length-(e>0?0:1)]=0),s[e]={left:0,top:0,width:i,height:o},d[d.length-1]+=i+n.padding})),l.height+=h}else{var c=n.padding,f=t.columnWidths=[],g=t.columnHeights=[],m=n.padding,p=0,v=0;H.each(t.legendItems,(function(t,e){var i=Pi(n,o)+o/2+a.measureText(t.text).width;e>0&&v+o+2*c>l.height&&(m+=p+n.padding,f.push(p),g.push(v),p=0,v=0),p=Math.max(p,i),v+=o+c,s[e]={left:0,top:0,width:i,height:o}})),m+=p,f.push(p),g.push(v),l.width+=m}t.width=l.width,t.height=l.height}else t.width=l.width=t.height=l.height=0},afterFit:Di,isHorizontal:function(){return"top"===this.options.position||"bottom"===this.options.position},draw:function(){var t=this,e=t.options,n=e.labels,i=W.global,a=i.defaultColor,r=i.elements.line,o=t.height,s=t.columnHeights,l=t.width,u=t.lineWidths;if(e.display){var d,h=Si(e.rtl,t.left,t.minSize.width),c=t.ctx,f=Ci(n.fontColor,i.defaultFontColor),g=H.options._parseFont(n),m=g.size;c.textAlign=h.textAlign("left"),c.textBaseline="middle",c.lineWidth=.5,c.strokeStyle=f,c.fillStyle=f,c.font=g.string;var p=Pi(n,m),v=t.legendHitBoxes,b=function(t,i){switch(e.align){case"start":return n.padding;case"end":return t-i;default:return(t-i+n.padding)/2}},y=t.isHorizontal();d=y?{x:t.left+b(l,u[0]),y:t.top+n.padding,line:0}:{x:t.left+n.padding,y:t.top+b(o,s[0]),line:0},H.rtl.overrideTextDirection(t.ctx,e.textDirection);var x=m+n.padding;H.each(t.legendItems,(function(e,i){var f=c.measureText(e.text).width,g=p+m/2+f,_=d.x,w=d.y;h.setWidth(t.minSize.width),y?i>0&&_+g+n.padding>t.left+t.minSize.width&&(w=d.y+=x,d.line++,_=d.x=t.left+b(l,u[d.line])):i>0&&w+x>t.top+t.minSize.height&&(_=d.x=_+t.columnWidths[d.line]+n.padding,d.line++,w=d.y=t.top+b(o,s[d.line]));var k=h.x(_);!function(t,e,i){if(!(isNaN(p)||p<=0)){c.save();var o=Ci(i.lineWidth,r.borderWidth);if(c.fillStyle=Ci(i.fillStyle,a),c.lineCap=Ci(i.lineCap,r.borderCapStyle),c.lineDashOffset=Ci(i.lineDashOffset,r.borderDashOffset),c.lineJoin=Ci(i.lineJoin,r.borderJoinStyle),c.lineWidth=o,c.strokeStyle=Ci(i.strokeStyle,a),c.setLineDash&&c.setLineDash(Ci(i.lineDash,r.borderDash)),n&&n.usePointStyle){var s=p*Math.SQRT2/2,l=h.xPlus(t,p/2),u=e+m/2;H.canvas.drawPoint(c,i.pointStyle,s,l,u,i.rotation)}else c.fillRect(h.leftForLtr(t,p),e,p,m),0!==o&&c.strokeRect(h.leftForLtr(t,p),e,p,m);c.restore()}}(k,w,e),v[i].left=h.leftForLtr(k,v[i].width),v[i].top=w,function(t,e,n,i){var a=m/2,r=h.xPlus(t,p+a),o=e+a;c.fillText(n.text,r,o),n.hidden&&(c.beginPath(),c.lineWidth=2,c.moveTo(r,o),c.lineTo(h.xPlus(r,i),o),c.stroke())}(k,w,e,f),y?d.x+=g+n.padding:d.y+=x})),H.rtl.restoreTextDirection(t.ctx,e.textDirection)}},_getLegendItemAt:function(t,e){var n,i,a,r=this;if(t>=r.left&&t<=r.right&&e>=r.top&&e<=r.bottom)for(a=r.legendHitBoxes,n=0;n<a.length;++n)if(t>=(i=a[n]).left&&t<=i.left+i.width&&e>=i.top&&e<=i.top+i.height)return r.legendItems[n];return null},handleEvent:function(t){var e,n=this,i=n.options,a="mouseup"===t.type?"click":t.type;if("mousemove"===a){if(!i.onHover&&!i.onLeave)return}else{if("click"!==a)return;if(!i.onClick)return}e=n._getLegendItemAt(t.x,t.y),"click"===a?e&&i.onClick&&i.onClick.call(n,t.native,e):(i.onLeave&&e!==n._hoveredItem&&(n._hoveredItem&&i.onLeave.call(n,t.native,n._hoveredItem),n._hoveredItem=e),i.onHover&&e&&i.onHover.call(n,t.native,e))}});function Oi(t,e){var n=new Ti({ctx:t.ctx,options:e,chart:t});me.configure(t,n,e),me.addBox(t,n),t.legend=n}var Ai={id:"legend",_element:Ti,beforeInit:function(t){var e=t.options.legend;e&&Oi(t,e)},beforeUpdate:function(t){var e=t.options.legend,n=t.legend;e?(H.mergeIf(e,W.global.legend),n?(me.configure(t,n,e),n.options=e):Oi(t,e)):n&&(me.removeBox(t,n),delete t.legend)},afterEvent:function(t,e){var n=t.legend;n&&n.handleEvent(e)}},Fi=H.noop;W._set("global",{title:{display:!1,fontStyle:"bold",fullWidth:!0,padding:10,position:"top",text:"",weight:2e3}});var Ii=$.extend({initialize:function(t){H.extend(this,t),this.legendHitBoxes=[]},beforeUpdate:Fi,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Fi,beforeSetDimensions:Fi,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Fi,beforeBuildLabels:Fi,buildLabels:Fi,afterBuildLabels:Fi,beforeFit:Fi,fit:function(){var t,e=this,n=e.options,i=e.minSize={},a=e.isHorizontal();n.display?(t=(H.isArray(n.text)?n.text.length:1)*H.options._parseFont(n).lineHeight+2*n.padding,e.width=i.width=a?e.maxWidth:t,e.height=i.height=a?t:e.maxHeight):e.width=i.width=e.height=i.height=0},afterFit:Fi,isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},draw:function(){var t=this,e=t.ctx,n=t.options;if(n.display){var i,a,r,o=H.options._parseFont(n),s=o.lineHeight,l=s/2+n.padding,u=0,d=t.top,h=t.left,c=t.bottom,f=t.right;e.fillStyle=H.valueOrDefault(n.fontColor,W.global.defaultFontColor),e.font=o.string,t.isHorizontal()?(a=h+(f-h)/2,r=d+l,i=f-h):(a="left"===n.position?h+l:f-l,r=d+(c-d)/2,i=c-d,u=Math.PI*("left"===n.position?-.5:.5)),e.save(),e.translate(a,r),e.rotate(u),e.textAlign="center",e.textBaseline="middle";var g=n.text;if(H.isArray(g))for(var m=0,p=0;p<g.length;++p)e.fillText(g[p],0,m,i),m+=s;else e.fillText(g,0,0,i);e.restore()}}});function Li(t,e){var n=new Ii({ctx:t.ctx,options:e,chart:t});me.configure(t,n,e),me.addBox(t,n),t.titleBlock=n}var Ri={},Ni=Mi,Wi=Ai,Yi={id:"title",_element:Ii,beforeInit:function(t){var e=t.options.title;e&&Li(t,e)},beforeUpdate:function(t){var e=t.options.title,n=t.titleBlock;e?(H.mergeIf(e,W.global.title),n?(me.configure(t,n,e),n.options=e):Li(t,e)):n&&(me.removeBox(t,n),delete t.titleBlock)}};for(var zi in Ri.filler=Ni,Ri.legend=Wi,Ri.title=Yi,en.helpers=H,function(){function t(t,e,n){var i;return"string"==typeof t?(i=parseInt(t,10),-1!==t.indexOf("%")&&(i=i/100*e.parentNode[n])):i=t,i}function e(t){return null!=t&&"none"!==t}function n(n,i,a){var r=document.defaultView,o=H._getParentNode(n),s=r.getComputedStyle(n)[i],l=r.getComputedStyle(o)[i],u=e(s),d=e(l),h=Number.POSITIVE_INFINITY;return u||d?Math.min(u?t(s,n,a):h,d?t(l,o,a):h):"none"}H.where=function(t,e){if(H.isArray(t)&&Array.prototype.filter)return t.filter(e);var n=[];return H.each(t,(function(t){e(t)&&n.push(t)})),n},H.findIndex=Array.prototype.findIndex?function(t,e,n){return t.findIndex(e,n)}:function(t,e,n){n=void 0===n?t:n;for(var i=0,a=t.length;i<a;++i)if(e.call(n,t[i],i,t))return i;return-1},H.findNextWhere=function(t,e,n){H.isNullOrUndef(n)&&(n=-1);for(var i=n+1;i<t.length;i++){var a=t[i];if(e(a))return a}},H.findPreviousWhere=function(t,e,n){H.isNullOrUndef(n)&&(n=t.length);for(var i=n-1;i>=0;i--){var a=t[i];if(e(a))return a}},H.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},H.almostEquals=function(t,e,n){return Math.abs(t-e)<n},H.almostWhole=function(t,e){var n=Math.round(t);return n-e<=t&&n+e>=t},H.max=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.max(t,e)}),Number.NEGATIVE_INFINITY)},H.min=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.min(t,e)}),Number.POSITIVE_INFINITY)},H.sign=Math.sign?function(t){return Math.sign(t)}:function(t){return 0===(t=+t)||isNaN(t)?t:t>0?1:-1},H.toRadians=function(t){return t*(Math.PI/180)},H.toDegrees=function(t){return t*(180/Math.PI)},H._decimalPlaces=function(t){if(H.isFinite(t)){for(var e=1,n=0;Math.round(t*e)/e!==t;)e*=10,n++;return n}},H.getAngleFromPoint=function(t,e){var n=e.x-t.x,i=e.y-t.y,a=Math.sqrt(n*n+i*i),r=Math.atan2(i,n);return r<-.5*Math.PI&&(r+=2*Math.PI),{angle:r,distance:a}},H.distanceBetweenPoints=function(t,e){return Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2))},H.aliasPixel=function(t){return t%2==0?0:.5},H._alignPixel=function(t,e,n){var i=t.currentDevicePixelRatio,a=n/2;return Math.round((e-a)*i)/i+a},H.splineCurve=function(t,e,n,i){var a=t.skip?e:t,r=e,o=n.skip?e:n,s=Math.sqrt(Math.pow(r.x-a.x,2)+Math.pow(r.y-a.y,2)),l=Math.sqrt(Math.pow(o.x-r.x,2)+Math.pow(o.y-r.y,2)),u=s/(s+l),d=l/(s+l),h=i*(u=isNaN(u)?0:u),c=i*(d=isNaN(d)?0:d);return{previous:{x:r.x-h*(o.x-a.x),y:r.y-h*(o.y-a.y)},next:{x:r.x+c*(o.x-a.x),y:r.y+c*(o.y-a.y)}}},H.EPSILON=Number.EPSILON||1e-14,H.splineCurveMonotone=function(t){var e,n,i,a,r,o,s,l,u,d=(t||[]).map((function(t){return{model:t._model,deltaK:0,mK:0}})),h=d.length;for(e=0;e<h;++e)if(!(i=d[e]).model.skip){if(n=e>0?d[e-1]:null,(a=e<h-1?d[e+1]:null)&&!a.model.skip){var c=a.model.x-i.model.x;i.deltaK=0!==c?(a.model.y-i.model.y)/c:0}!n||n.model.skip?i.mK=i.deltaK:!a||a.model.skip?i.mK=n.deltaK:this.sign(n.deltaK)!==this.sign(i.deltaK)?i.mK=0:i.mK=(n.deltaK+i.deltaK)/2}for(e=0;e<h-1;++e)i=d[e],a=d[e+1],i.model.skip||a.model.skip||(H.almostEquals(i.deltaK,0,this.EPSILON)?i.mK=a.mK=0:(r=i.mK/i.deltaK,o=a.mK/i.deltaK,(l=Math.pow(r,2)+Math.pow(o,2))<=9||(s=3/Math.sqrt(l),i.mK=r*s*i.deltaK,a.mK=o*s*i.deltaK)));for(e=0;e<h;++e)(i=d[e]).model.skip||(n=e>0?d[e-1]:null,a=e<h-1?d[e+1]:null,n&&!n.model.skip&&(u=(i.model.x-n.model.x)/3,i.model.controlPointPreviousX=i.model.x-u,i.model.controlPointPreviousY=i.model.y-u*i.mK),a&&!a.model.skip&&(u=(a.model.x-i.model.x)/3,i.model.controlPointNextX=i.model.x+u,i.model.controlPointNextY=i.model.y+u*i.mK))},H.nextItem=function(t,e,n){return n?e>=t.length-1?t[0]:t[e+1]:e>=t.length-1?t[t.length-1]:t[e+1]},H.previousItem=function(t,e,n){return n?e<=0?t[t.length-1]:t[e-1]:e<=0?t[0]:t[e-1]},H.niceNum=function(t,e){var n=Math.floor(H.log10(t)),i=t/Math.pow(10,n);return(e?i<1.5?1:i<3?2:i<7?5:10:i<=1?1:i<=2?2:i<=5?5:10)*Math.pow(10,n)},H.requestAnimFrame="undefined"==typeof window?function(t){t()}:window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)},H.getRelativePosition=function(t,e){var n,i,a=t.originalEvent||t,r=t.target||t.srcElement,o=r.getBoundingClientRect(),s=a.touches;s&&s.length>0?(n=s[0].clientX,i=s[0].clientY):(n=a.clientX,i=a.clientY);var l=parseFloat(H.getStyle(r,"padding-left")),u=parseFloat(H.getStyle(r,"padding-top")),d=parseFloat(H.getStyle(r,"padding-right")),h=parseFloat(H.getStyle(r,"padding-bottom")),c=o.right-o.left-l-d,f=o.bottom-o.top-u-h;return{x:n=Math.round((n-o.left-l)/c*r.width/e.currentDevicePixelRatio),y:i=Math.round((i-o.top-u)/f*r.height/e.currentDevicePixelRatio)}},H.getConstraintWidth=function(t){return n(t,"max-width","clientWidth")},H.getConstraintHeight=function(t){return n(t,"max-height","clientHeight")},H._calculatePadding=function(t,e,n){return(e=H.getStyle(t,e)).indexOf("%")>-1?n*parseInt(e,10)/100:parseInt(e,10)},H._getParentNode=function(t){var e=t.parentNode;return e&&"[object ShadowRoot]"===e.toString()&&(e=e.host),e},H.getMaximumWidth=function(t){var e=H._getParentNode(t);if(!e)return t.clientWidth;var n=e.clientWidth,i=n-H._calculatePadding(e,"padding-left",n)-H._calculatePadding(e,"padding-right",n),a=H.getConstraintWidth(t);return isNaN(a)?i:Math.min(i,a)},H.getMaximumHeight=function(t){var e=H._getParentNode(t);if(!e)return t.clientHeight;var n=e.clientHeight,i=n-H._calculatePadding(e,"padding-top",n)-H._calculatePadding(e,"padding-bottom",n),a=H.getConstraintHeight(t);return isNaN(a)?i:Math.min(i,a)},H.getStyle=function(t,e){return t.currentStyle?t.currentStyle[e]:document.defaultView.getComputedStyle(t,null).getPropertyValue(e)},H.retinaScale=function(t,e){var n=t.currentDevicePixelRatio=e||"undefined"!=typeof window&&window.devicePixelRatio||1;if(1!==n){var i=t.canvas,a=t.height,r=t.width;i.height=a*n,i.width=r*n,t.ctx.scale(n,n),i.style.height||i.style.width||(i.style.height=a+"px",i.style.width=r+"px")}},H.fontString=function(t,e,n){return e+" "+t+"px "+n},H.longestText=function(t,e,n,i){var a=(i=i||{}).data=i.data||{},r=i.garbageCollect=i.garbageCollect||[];i.font!==e&&(a=i.data={},r=i.garbageCollect=[],i.font=e),t.font=e;var o,s,l,u,d,h=0,c=n.length;for(o=0;o<c;o++)if(null!=(u=n[o])&&!0!==H.isArray(u))h=H.measureText(t,a,r,h,u);else if(H.isArray(u))for(s=0,l=u.length;s<l;s++)null==(d=u[s])||H.isArray(d)||(h=H.measureText(t,a,r,h,d));var f=r.length/2;if(f>n.length){for(o=0;o<f;o++)delete a[r[o]];r.splice(0,f)}return h},H.measureText=function(t,e,n,i,a){var r=e[a];return r||(r=e[a]=t.measureText(a).width,n.push(a)),r>i&&(i=r),i},H.numberOfLabelLines=function(t){var e=1;return H.each(t,(function(t){H.isArray(t)&&t.length>e&&(e=t.length)})),e},H.color=k?function(t){return t instanceof CanvasGradient&&(t=W.global.defaultColor),k(t)}:function(t){return console.error("Color.js not found!"),t},H.getHoverColor=function(t){return t instanceof CanvasPattern||t instanceof CanvasGradient?t:H.color(t).saturate(.5).darken(.1).rgbString()}}(),en._adapters=rn,en.Animation=K,en.animationService=J,en.controllers=Jt,en.DatasetController=it,en.defaults=W,en.Element=$,en.elements=wt,en.Interaction=re,en.layouts=me,en.platform=Ie,en.plugins=Le,en.Scale=xn,en.scaleService=Re,en.Ticks=on,en.Tooltip=Ge,en.helpers.each(fi,(function(t,e){en.scaleService.registerScaleType(e,t,t._defaults)})),Ri)Ri.hasOwnProperty(zi)&&en.plugins.register(Ri[zi]);en.platform.initialize();var Ei=en;return"undefined"!=typeof window&&(window.Chart=en),en.Chart=en,en.Legend=Ri.legend._element,en.Title=Ri.title._element,en.pluginService=en.plugins,en.PluginBase=en.Element.extend({}),en.canvasHelpers=en.helpers.canvas,en.layoutService=en.layouts,en.LinearScaleBase=Dn,en.helpers.each(["Bar","Bubble","Doughnut","Line","PolarArea","Radar","Scatter"],(function(t){en[t]=function(e,n){return new en(e,en.helpers.merge(n||{},{type:t.charAt(0).toLowerCase()+t.slice(1)}))}})),Ei}));
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t=t||self).Chart=e()}(this,(function(){"use strict";"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self&&self;function t(){throw new Error("Dynamic requires are not currently supported by rollup-plugin-commonjs")}function e(t,e){return t(e={exports:{}},e.exports),e.exports}var n={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},i=e((function(t){var e={};for(var i in n)n.hasOwnProperty(i)&&(e[n[i]]=i);var a=t.exports={rgb:{channels:3,labels:"rgb"},hsl:{channels:3,labels:"hsl"},hsv:{channels:3,labels:"hsv"},hwb:{channels:3,labels:"hwb"},cmyk:{channels:4,labels:"cmyk"},xyz:{channels:3,labels:"xyz"},lab:{channels:3,labels:"lab"},lch:{channels:3,labels:"lch"},hex:{channels:1,labels:["hex"]},keyword:{channels:1,labels:["keyword"]},ansi16:{channels:1,labels:["ansi16"]},ansi256:{channels:1,labels:["ansi256"]},hcg:{channels:3,labels:["h","c","g"]},apple:{channels:3,labels:["r16","g16","b16"]},gray:{channels:1,labels:["gray"]}};for(var r in a)if(a.hasOwnProperty(r)){if(!("channels"in a[r]))throw new Error("missing channels property: "+r);if(!("labels"in a[r]))throw new Error("missing channel labels property: "+r);if(a[r].labels.length!==a[r].channels)throw new Error("channel and label counts mismatch: "+r);var o=a[r].channels,s=a[r].labels;delete a[r].channels,delete a[r].labels,Object.defineProperty(a[r],"channels",{value:o}),Object.defineProperty(a[r],"labels",{value:s})}a.rgb.hsl=function(t){var e,n,i=t[0]/255,a=t[1]/255,r=t[2]/255,o=Math.min(i,a,r),s=Math.max(i,a,r),l=s-o;return s===o?e=0:i===s?e=(a-r)/l:a===s?e=2+(r-i)/l:r===s&&(e=4+(i-a)/l),(e=Math.min(60*e,360))<0&&(e+=360),n=(o+s)/2,[e,100*(s===o?0:n<=.5?l/(s+o):l/(2-s-o)),100*n]},a.rgb.hsv=function(t){var e,n,i,a,r,o=t[0]/255,s=t[1]/255,l=t[2]/255,u=Math.max(o,s,l),d=u-Math.min(o,s,l),h=function(t){return(u-t)/6/d+.5};return 0===d?a=r=0:(r=d/u,e=h(o),n=h(s),i=h(l),o===u?a=i-n:s===u?a=1/3+e-i:l===u&&(a=2/3+n-e),a<0?a+=1:a>1&&(a-=1)),[360*a,100*r,100*u]},a.rgb.hwb=function(t){var e=t[0],n=t[1],i=t[2];return[a.rgb.hsl(t)[0],100*(1/255*Math.min(e,Math.min(n,i))),100*(i=1-1/255*Math.max(e,Math.max(n,i)))]},a.rgb.cmyk=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255;return[100*((1-n-(e=Math.min(1-n,1-i,1-a)))/(1-e)||0),100*((1-i-e)/(1-e)||0),100*((1-a-e)/(1-e)||0),100*e]},a.rgb.keyword=function(t){var i=e[t];if(i)return i;var a,r,o,s=1/0;for(var l in n)if(n.hasOwnProperty(l)){var u=n[l],d=(r=t,o=u,Math.pow(r[0]-o[0],2)+Math.pow(r[1]-o[1],2)+Math.pow(r[2]-o[2],2));d<s&&(s=d,a=l)}return a},a.keyword.rgb=function(t){return n[t]},a.rgb.xyz=function(t){var e=t[0]/255,n=t[1]/255,i=t[2]/255;return[100*(.4124*(e=e>.04045?Math.pow((e+.055)/1.055,2.4):e/12.92)+.3576*(n=n>.04045?Math.pow((n+.055)/1.055,2.4):n/12.92)+.1805*(i=i>.04045?Math.pow((i+.055)/1.055,2.4):i/12.92)),100*(.2126*e+.7152*n+.0722*i),100*(.0193*e+.1192*n+.9505*i)]},a.rgb.lab=function(t){var e=a.rgb.xyz(t),n=e[0],i=e[1],r=e[2];return i/=100,r/=108.883,n=(n/=95.047)>.008856?Math.pow(n,1/3):7.787*n+16/116,[116*(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116)-16,500*(n-i),200*(i-(r=r>.008856?Math.pow(r,1/3):7.787*r+16/116))]},a.hsl.rgb=function(t){var e,n,i,a,r,o=t[0]/360,s=t[1]/100,l=t[2]/100;if(0===s)return[r=255*l,r,r];e=2*l-(n=l<.5?l*(1+s):l+s-l*s),a=[0,0,0];for(var u=0;u<3;u++)(i=o+1/3*-(u-1))<0&&i++,i>1&&i--,r=6*i<1?e+6*(n-e)*i:2*i<1?n:3*i<2?e+(n-e)*(2/3-i)*6:e,a[u]=255*r;return a},a.hsl.hsv=function(t){var e=t[0],n=t[1]/100,i=t[2]/100,a=n,r=Math.max(i,.01);return n*=(i*=2)<=1?i:2-i,a*=r<=1?r:2-r,[e,100*(0===i?2*a/(r+a):2*n/(i+n)),100*((i+n)/2)]},a.hsv.rgb=function(t){var e=t[0]/60,n=t[1]/100,i=t[2]/100,a=Math.floor(e)%6,r=e-Math.floor(e),o=255*i*(1-n),s=255*i*(1-n*r),l=255*i*(1-n*(1-r));switch(i*=255,a){case 0:return[i,l,o];case 1:return[s,i,o];case 2:return[o,i,l];case 3:return[o,s,i];case 4:return[l,o,i];case 5:return[i,o,s]}},a.hsv.hsl=function(t){var e,n,i,a=t[0],r=t[1]/100,o=t[2]/100,s=Math.max(o,.01);return i=(2-r)*o,n=r*s,[a,100*(n=(n/=(e=(2-r)*s)<=1?e:2-e)||0),100*(i/=2)]},a.hwb.rgb=function(t){var e,n,i,a,r,o,s,l=t[0]/360,u=t[1]/100,d=t[2]/100,h=u+d;switch(h>1&&(u/=h,d/=h),i=6*l-(e=Math.floor(6*l)),0!=(1&e)&&(i=1-i),a=u+i*((n=1-d)-u),e){default:case 6:case 0:r=n,o=a,s=u;break;case 1:r=a,o=n,s=u;break;case 2:r=u,o=n,s=a;break;case 3:r=u,o=a,s=n;break;case 4:r=a,o=u,s=n;break;case 5:r=n,o=u,s=a}return[255*r,255*o,255*s]},a.cmyk.rgb=function(t){var e=t[0]/100,n=t[1]/100,i=t[2]/100,a=t[3]/100;return[255*(1-Math.min(1,e*(1-a)+a)),255*(1-Math.min(1,n*(1-a)+a)),255*(1-Math.min(1,i*(1-a)+a))]},a.xyz.rgb=function(t){var e,n,i,a=t[0]/100,r=t[1]/100,o=t[2]/100;return n=-.9689*a+1.8758*r+.0415*o,i=.0557*a+-.204*r+1.057*o,e=(e=3.2406*a+-1.5372*r+-.4986*o)>.0031308?1.055*Math.pow(e,1/2.4)-.055:12.92*e,n=n>.0031308?1.055*Math.pow(n,1/2.4)-.055:12.92*n,i=i>.0031308?1.055*Math.pow(i,1/2.4)-.055:12.92*i,[255*(e=Math.min(Math.max(0,e),1)),255*(n=Math.min(Math.max(0,n),1)),255*(i=Math.min(Math.max(0,i),1))]},a.xyz.lab=function(t){var e=t[0],n=t[1],i=t[2];return n/=100,i/=108.883,e=(e/=95.047)>.008856?Math.pow(e,1/3):7.787*e+16/116,[116*(n=n>.008856?Math.pow(n,1/3):7.787*n+16/116)-16,500*(e-n),200*(n-(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116))]},a.lab.xyz=function(t){var e,n,i,a=t[0];e=t[1]/500+(n=(a+16)/116),i=n-t[2]/200;var r=Math.pow(n,3),o=Math.pow(e,3),s=Math.pow(i,3);return n=r>.008856?r:(n-16/116)/7.787,e=o>.008856?o:(e-16/116)/7.787,i=s>.008856?s:(i-16/116)/7.787,[e*=95.047,n*=100,i*=108.883]},a.lab.lch=function(t){var e,n=t[0],i=t[1],a=t[2];return(e=360*Math.atan2(a,i)/2/Math.PI)<0&&(e+=360),[n,Math.sqrt(i*i+a*a),e]},a.lch.lab=function(t){var e,n=t[0],i=t[1];return e=t[2]/360*2*Math.PI,[n,i*Math.cos(e),i*Math.sin(e)]},a.rgb.ansi16=function(t){var e=t[0],n=t[1],i=t[2],r=1 in arguments?arguments[1]:a.rgb.hsv(t)[2];if(0===(r=Math.round(r/50)))return 30;var o=30+(Math.round(i/255)<<2|Math.round(n/255)<<1|Math.round(e/255));return 2===r&&(o+=60),o},a.hsv.ansi16=function(t){return a.rgb.ansi16(a.hsv.rgb(t),t[2])},a.rgb.ansi256=function(t){var e=t[0],n=t[1],i=t[2];return e===n&&n===i?e<8?16:e>248?231:Math.round((e-8)/247*24)+232:16+36*Math.round(e/255*5)+6*Math.round(n/255*5)+Math.round(i/255*5)},a.ansi16.rgb=function(t){var e=t%10;if(0===e||7===e)return t>50&&(e+=3.5),[e=e/10.5*255,e,e];var n=.5*(1+~~(t>50));return[(1&e)*n*255,(e>>1&1)*n*255,(e>>2&1)*n*255]},a.ansi256.rgb=function(t){if(t>=232){var e=10*(t-232)+8;return[e,e,e]}var n;return t-=16,[Math.floor(t/36)/5*255,Math.floor((n=t%36)/6)/5*255,n%6/5*255]},a.rgb.hex=function(t){var e=(((255&Math.round(t[0]))<<16)+((255&Math.round(t[1]))<<8)+(255&Math.round(t[2]))).toString(16).toUpperCase();return"000000".substring(e.length)+e},a.hex.rgb=function(t){var e=t.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);if(!e)return[0,0,0];var n=e[0];3===e[0].length&&(n=n.split("").map((function(t){return t+t})).join(""));var i=parseInt(n,16);return[i>>16&255,i>>8&255,255&i]},a.rgb.hcg=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255,r=Math.max(Math.max(n,i),a),o=Math.min(Math.min(n,i),a),s=r-o;return e=s<=0?0:r===n?(i-a)/s%6:r===i?2+(a-n)/s:4+(n-i)/s+4,e/=6,[360*(e%=1),100*s,100*(s<1?o/(1-s):0)]},a.hsl.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=1,a=0;return(i=n<.5?2*e*n:2*e*(1-n))<1&&(a=(n-.5*i)/(1-i)),[t[0],100*i,100*a]},a.hsv.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=e*n,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.hcg.rgb=function(t){var e=t[0]/360,n=t[1]/100,i=t[2]/100;if(0===n)return[255*i,255*i,255*i];var a,r=[0,0,0],o=e%1*6,s=o%1,l=1-s;switch(Math.floor(o)){case 0:r[0]=1,r[1]=s,r[2]=0;break;case 1:r[0]=l,r[1]=1,r[2]=0;break;case 2:r[0]=0,r[1]=1,r[2]=s;break;case 3:r[0]=0,r[1]=l,r[2]=1;break;case 4:r[0]=s,r[1]=0,r[2]=1;break;default:r[0]=1,r[1]=0,r[2]=l}return a=(1-n)*i,[255*(n*r[0]+a),255*(n*r[1]+a),255*(n*r[2]+a)]},a.hcg.hsv=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e),i=0;return n>0&&(i=e/n),[t[0],100*i,100*n]},a.hcg.hsl=function(t){var e=t[1]/100,n=t[2]/100*(1-e)+.5*e,i=0;return n>0&&n<.5?i=e/(2*n):n>=.5&&n<1&&(i=e/(2*(1-n))),[t[0],100*i,100*n]},a.hcg.hwb=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e);return[t[0],100*(n-e),100*(1-n)]},a.hwb.hcg=function(t){var e=t[1]/100,n=1-t[2]/100,i=n-e,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.apple.rgb=function(t){return[t[0]/65535*255,t[1]/65535*255,t[2]/65535*255]},a.rgb.apple=function(t){return[t[0]/255*65535,t[1]/255*65535,t[2]/255*65535]},a.gray.rgb=function(t){return[t[0]/100*255,t[0]/100*255,t[0]/100*255]},a.gray.hsl=a.gray.hsv=function(t){return[0,0,t[0]]},a.gray.hwb=function(t){return[0,100,t[0]]},a.gray.cmyk=function(t){return[0,0,0,t[0]]},a.gray.lab=function(t){return[t[0],0,0]},a.gray.hex=function(t){var e=255&Math.round(t[0]/100*255),n=((e<<16)+(e<<8)+e).toString(16).toUpperCase();return"000000".substring(n.length)+n},a.rgb.gray=function(t){return[(t[0]+t[1]+t[2])/3/255*100]}}));i.rgb,i.hsl,i.hsv,i.hwb,i.cmyk,i.xyz,i.lab,i.lch,i.hex,i.keyword,i.ansi16,i.ansi256,i.hcg,i.apple,i.gray;function a(t){var e=function(){for(var t={},e=Object.keys(i),n=e.length,a=0;a<n;a++)t[e[a]]={distance:-1,parent:null};return t}(),n=[t];for(e[t].distance=0;n.length;)for(var a=n.pop(),r=Object.keys(i[a]),o=r.length,s=0;s<o;s++){var l=r[s],u=e[l];-1===u.distance&&(u.distance=e[a].distance+1,u.parent=a,n.unshift(l))}return e}function r(t,e){return function(n){return e(t(n))}}function o(t,e){for(var n=[e[t].parent,t],a=i[e[t].parent][t],o=e[t].parent;e[o].parent;)n.unshift(e[o].parent),a=r(i[e[o].parent][o],a),o=e[o].parent;return a.conversion=n,a}var s={};Object.keys(i).forEach((function(t){s[t]={},Object.defineProperty(s[t],"channels",{value:i[t].channels}),Object.defineProperty(s[t],"labels",{value:i[t].labels});var e=function(t){for(var e=a(t),n={},i=Object.keys(e),r=i.length,s=0;s<r;s++){var l=i[s];null!==e[l].parent&&(n[l]=o(l,e))}return n}(t);Object.keys(e).forEach((function(n){var i=e[n];s[t][n]=function(t){var e=function(e){if(null==e)return e;arguments.length>1&&(e=Array.prototype.slice.call(arguments));var n=t(e);if("object"==typeof n)for(var i=n.length,a=0;a<i;a++)n[a]=Math.round(n[a]);return n};return"conversion"in t&&(e.conversion=t.conversion),e}(i),s[t][n].raw=function(t){var e=function(e){return null==e?e:(arguments.length>1&&(e=Array.prototype.slice.call(arguments)),t(e))};return"conversion"in t&&(e.conversion=t.conversion),e}(i)}))}));var l=s,u={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},d={getRgba:h,getHsla:c,getRgb:function(t){var e=h(t);return e&&e.slice(0,3)},getHsl:function(t){var e=c(t);return e&&e.slice(0,3)},getHwb:f,getAlpha:function(t){var e=h(t);if(e)return e[3];if(e=c(t))return e[3];if(e=f(t))return e[3]},hexString:function(t,e){e=void 0!==e&&3===t.length?e:t[3];return"#"+b(t[0])+b(t[1])+b(t[2])+(e>=0&&e<1?b(Math.round(255*e)):"")},rgbString:function(t,e){if(e<1||t[3]&&t[3]<1)return g(t,e);return"rgb("+t[0]+", "+t[1]+", "+t[2]+")"},rgbaString:g,percentString:function(t,e){if(e<1||t[3]&&t[3]<1)return m(t,e);var n=Math.round(t[0]/255*100),i=Math.round(t[1]/255*100),a=Math.round(t[2]/255*100);return"rgb("+n+"%, "+i+"%, "+a+"%)"},percentaString:m,hslString:function(t,e){if(e<1||t[3]&&t[3]<1)return p(t,e);return"hsl("+t[0]+", "+t[1]+"%, "+t[2]+"%)"},hslaString:p,hwbString:function(t,e){void 0===e&&(e=void 0!==t[3]?t[3]:1);return"hwb("+t[0]+", "+t[1]+"%, "+t[2]+"%"+(void 0!==e&&1!==e?", "+e:"")+")"},keyword:function(t){return y[t.slice(0,3)]}};function h(t){if(t){var e=[0,0,0],n=1,i=t.match(/^#([a-fA-F0-9]{3,4})$/i),a="";if(i){a=(i=i[1])[3];for(var r=0;r<e.length;r++)e[r]=parseInt(i[r]+i[r],16);a&&(n=Math.round(parseInt(a+a,16)/255*100)/100)}else if(i=t.match(/^#([a-fA-F0-9]{6}([a-fA-F0-9]{2})?)$/i)){a=i[2],i=i[1];for(r=0;r<e.length;r++)e[r]=parseInt(i.slice(2*r,2*r+2),16);a&&(n=Math.round(parseInt(a,16)/255*100)/100)}else if(i=t.match(/^rgba?\(\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=parseInt(i[r+1]);n=parseFloat(i[4])}else if(i=t.match(/^rgba?\(\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=Math.round(2.55*parseFloat(i[r+1]));n=parseFloat(i[4])}else if(i=t.match(/(\w+)/)){if("transparent"==i[1])return[0,0,0,0];if(!(e=u[i[1]]))return}for(r=0;r<e.length;r++)e[r]=v(e[r],0,255);return n=n||0==n?v(n,0,1):1,e[3]=n,e}}function c(t){if(t){var e=t.match(/^hsla?\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[v(parseInt(e[1]),0,360),v(parseFloat(e[2]),0,100),v(parseFloat(e[3]),0,100),v(isNaN(n)?1:n,0,1)]}}}function f(t){if(t){var e=t.match(/^hwb\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[v(parseInt(e[1]),0,360),v(parseFloat(e[2]),0,100),v(parseFloat(e[3]),0,100),v(isNaN(n)?1:n,0,1)]}}}function g(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"rgba("+t[0]+", "+t[1]+", "+t[2]+", "+e+")"}function m(t,e){return"rgba("+Math.round(t[0]/255*100)+"%, "+Math.round(t[1]/255*100)+"%, "+Math.round(t[2]/255*100)+"%, "+(e||t[3]||1)+")"}function p(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"hsla("+t[0]+", "+t[1]+"%, "+t[2]+"%, "+e+")"}function v(t,e,n){return Math.min(Math.max(e,t),n)}function b(t){var e=t.toString(16).toUpperCase();return e.length<2?"0"+e:e}var y={};for(var x in u)y[u[x]]=x;var _=function(t){return t instanceof _?t:this instanceof _?(this.valid=!1,this.values={rgb:[0,0,0],hsl:[0,0,0],hsv:[0,0,0],hwb:[0,0,0],cmyk:[0,0,0,0],alpha:1},void("string"==typeof t?(e=d.getRgba(t))?this.setValues("rgb",e):(e=d.getHsla(t))?this.setValues("hsl",e):(e=d.getHwb(t))&&this.setValues("hwb",e):"object"==typeof t&&(void 0!==(e=t).r||void 0!==e.red?this.setValues("rgb",e):void 0!==e.l||void 0!==e.lightness?this.setValues("hsl",e):void 0!==e.v||void 0!==e.value?this.setValues("hsv",e):void 0!==e.w||void 0!==e.whiteness?this.setValues("hwb",e):void 0===e.c&&void 0===e.cyan||this.setValues("cmyk",e)))):new _(t);var e};_.prototype={isValid:function(){return this.valid},rgb:function(){return this.setSpace("rgb",arguments)},hsl:function(){return this.setSpace("hsl",arguments)},hsv:function(){return this.setSpace("hsv",arguments)},hwb:function(){return this.setSpace("hwb",arguments)},cmyk:function(){return this.setSpace("cmyk",arguments)},rgbArray:function(){return this.values.rgb},hslArray:function(){return this.values.hsl},hsvArray:function(){return this.values.hsv},hwbArray:function(){var t=this.values;return 1!==t.alpha?t.hwb.concat([t.alpha]):t.hwb},cmykArray:function(){return this.values.cmyk},rgbaArray:function(){var t=this.values;return t.rgb.concat([t.alpha])},hslaArray:function(){var t=this.values;return t.hsl.concat([t.alpha])},alpha:function(t){return void 0===t?this.values.alpha:(this.setValues("alpha",t),this)},red:function(t){return this.setChannel("rgb",0,t)},green:function(t){return this.setChannel("rgb",1,t)},blue:function(t){return this.setChannel("rgb",2,t)},hue:function(t){return t&&(t=(t%=360)<0?360+t:t),this.setChannel("hsl",0,t)},saturation:function(t){return this.setChannel("hsl",1,t)},lightness:function(t){return this.setChannel("hsl",2,t)},saturationv:function(t){return this.setChannel("hsv",1,t)},whiteness:function(t){return this.setChannel("hwb",1,t)},blackness:function(t){return this.setChannel("hwb",2,t)},value:function(t){return this.setChannel("hsv",2,t)},cyan:function(t){return this.setChannel("cmyk",0,t)},magenta:function(t){return this.setChannel("cmyk",1,t)},yellow:function(t){return this.setChannel("cmyk",2,t)},black:function(t){return this.setChannel("cmyk",3,t)},hexString:function(){return d.hexString(this.values.rgb)},rgbString:function(){return d.rgbString(this.values.rgb,this.values.alpha)},rgbaString:function(){return d.rgbaString(this.values.rgb,this.values.alpha)},percentString:function(){return d.percentString(this.values.rgb,this.values.alpha)},hslString:function(){return d.hslString(this.values.hsl,this.values.alpha)},hslaString:function(){return d.hslaString(this.values.hsl,this.values.alpha)},hwbString:function(){return d.hwbString(this.values.hwb,this.values.alpha)},keyword:function(){return d.keyword(this.values.rgb,this.values.alpha)},rgbNumber:function(){var t=this.values.rgb;return t[0]<<16|t[1]<<8|t[2]},luminosity:function(){for(var t=this.values.rgb,e=[],n=0;n<t.length;n++){var i=t[n]/255;e[n]=i<=.03928?i/12.92:Math.pow((i+.055)/1.055,2.4)}return.2126*e[0]+.7152*e[1]+.0722*e[2]},contrast:function(t){var e=this.luminosity(),n=t.luminosity();return e>n?(e+.05)/(n+.05):(n+.05)/(e+.05)},level:function(t){var e=this.contrast(t);return e>=7.1?"AAA":e>=4.5?"AA":""},dark:function(){var t=this.values.rgb;return(299*t[0]+587*t[1]+114*t[2])/1e3<128},light:function(){return!this.dark()},negate:function(){for(var t=[],e=0;e<3;e++)t[e]=255-this.values.rgb[e];return this.setValues("rgb",t),this},lighten:function(t){var e=this.values.hsl;return e[2]+=e[2]*t,this.setValues("hsl",e),this},darken:function(t){var e=this.values.hsl;return e[2]-=e[2]*t,this.setValues("hsl",e),this},saturate:function(t){var e=this.values.hsl;return e[1]+=e[1]*t,this.setValues("hsl",e),this},desaturate:function(t){var e=this.values.hsl;return e[1]-=e[1]*t,this.setValues("hsl",e),this},whiten:function(t){var e=this.values.hwb;return e[1]+=e[1]*t,this.setValues("hwb",e),this},blacken:function(t){var e=this.values.hwb;return e[2]+=e[2]*t,this.setValues("hwb",e),this},greyscale:function(){var t=this.values.rgb,e=.3*t[0]+.59*t[1]+.11*t[2];return this.setValues("rgb",[e,e,e]),this},clearer:function(t){var e=this.values.alpha;return this.setValues("alpha",e-e*t),this},opaquer:function(t){var e=this.values.alpha;return this.setValues("alpha",e+e*t),this},rotate:function(t){var e=this.values.hsl,n=(e[0]+t)%360;return e[0]=n<0?360+n:n,this.setValues("hsl",e),this},mix:function(t,e){var n=t,i=void 0===e?.5:e,a=2*i-1,r=this.alpha()-n.alpha(),o=((a*r==-1?a:(a+r)/(1+a*r))+1)/2,s=1-o;return this.rgb(o*this.red()+s*n.red(),o*this.green()+s*n.green(),o*this.blue()+s*n.blue()).alpha(this.alpha()*i+n.alpha()*(1-i))},toJSON:function(){return this.rgb()},clone:function(){var t,e,n=new _,i=this.values,a=n.values;for(var r in i)i.hasOwnProperty(r)&&(t=i[r],"[object Array]"===(e={}.toString.call(t))?a[r]=t.slice(0):"[object Number]"===e?a[r]=t:console.error("unexpected color value:",t));return n}},_.prototype.spaces={rgb:["red","green","blue"],hsl:["hue","saturation","lightness"],hsv:["hue","saturation","value"],hwb:["hue","whiteness","blackness"],cmyk:["cyan","magenta","yellow","black"]},_.prototype.maxes={rgb:[255,255,255],hsl:[360,100,100],hsv:[360,100,100],hwb:[360,100,100],cmyk:[100,100,100,100]},_.prototype.getValues=function(t){for(var e=this.values,n={},i=0;i<t.length;i++)n[t.charAt(i)]=e[t][i];return 1!==e.alpha&&(n.a=e.alpha),n},_.prototype.setValues=function(t,e){var n,i,a=this.values,r=this.spaces,o=this.maxes,s=1;if(this.valid=!0,"alpha"===t)s=e;else if(e.length)a[t]=e.slice(0,t.length),s=e[t.length];else if(void 0!==e[t.charAt(0)]){for(n=0;n<t.length;n++)a[t][n]=e[t.charAt(n)];s=e.a}else if(void 0!==e[r[t][0]]){var u=r[t];for(n=0;n<t.length;n++)a[t][n]=e[u[n]];s=e.alpha}if(a.alpha=Math.max(0,Math.min(1,void 0===s?a.alpha:s)),"alpha"===t)return!1;for(n=0;n<t.length;n++)i=Math.max(0,Math.min(o[t][n],a[t][n])),a[t][n]=Math.round(i);for(var d in r)d!==t&&(a[d]=l[t][d](a[t]));return!0},_.prototype.setSpace=function(t,e){var n=e[0];return void 0===n?this.getValues(t):("number"==typeof n&&(n=Array.prototype.slice.call(e)),this.setValues(t,n),this)},_.prototype.setChannel=function(t,e,n){var i=this.values[t];return void 0===n?i[e]:n===i[e]?this:(i[e]=n,this.setValues(t,i),this)},"undefined"!=typeof window&&(window.Color=_);var w=_;function k(t){return-1===["__proto__","prototype","constructor"].indexOf(t)}var M,S={noop:function(){},uid:(M=0,function(){return M++}),isNullOrUndef:function(t){return null==t},isArray:function(t){if(Array.isArray&&Array.isArray(t))return!0;var e=Object.prototype.toString.call(t);return"[object"===e.substr(0,7)&&"Array]"===e.substr(-6)},isObject:function(t){return null!==t&&"[object Object]"===Object.prototype.toString.call(t)},isFinite:function(t){return("number"==typeof t||t instanceof Number)&&isFinite(t)},valueOrDefault:function(t,e){return void 0===t?e:t},valueAtIndexOrDefault:function(t,e,n){return S.valueOrDefault(S.isArray(t)?t[e]:t,n)},callback:function(t,e,n){if(t&&"function"==typeof t.call)return t.apply(n,e)},each:function(t,e,n,i){var a,r,o;if(S.isArray(t))if(r=t.length,i)for(a=r-1;a>=0;a--)e.call(n,t[a],a);else for(a=0;a<r;a++)e.call(n,t[a],a);else if(S.isObject(t))for(r=(o=Object.keys(t)).length,a=0;a<r;a++)e.call(n,t[o[a]],o[a])},arrayEquals:function(t,e){var n,i,a,r;if(!t||!e||t.length!==e.length)return!1;for(n=0,i=t.length;n<i;++n)if(a=t[n],r=e[n],a instanceof Array&&r instanceof Array){if(!S.arrayEquals(a,r))return!1}else if(a!==r)return!1;return!0},clone:function(t){if(S.isArray(t))return t.map(S.clone);if(S.isObject(t)){for(var e=Object.create(t),n=Object.keys(t),i=n.length,a=0;a<i;++a)e[n[a]]=S.clone(t[n[a]]);return e}return t},_merger:function(t,e,n,i){if(k(t)){var a=e[t],r=n[t];S.isObject(a)&&S.isObject(r)?S.merge(a,r,i):e[t]=S.clone(r)}},_mergerIf:function(t,e,n){if(k(t)){var i=e[t],a=n[t];S.isObject(i)&&S.isObject(a)?S.mergeIf(i,a):e.hasOwnProperty(t)||(e[t]=S.clone(a))}},merge:function(t,e,n){var i,a,r,o,s,l=S.isArray(e)?e:[e],u=l.length;if(!S.isObject(t))return t;for(i=(n=n||{}).merger||S._merger,a=0;a<u;++a)if(e=l[a],S.isObject(e))for(s=0,o=(r=Object.keys(e)).length;s<o;++s)i(r[s],t,e,n);return t},mergeIf:function(t,e){return S.merge(t,e,{merger:S._mergerIf})},extend:Object.assign||function(t){return S.merge(t,[].slice.call(arguments,1),{merger:function(t,e,n){e[t]=n[t]}})},inherits:function(t){var e=this,n=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return e.apply(this,arguments)},i=function(){this.constructor=n};return i.prototype=e.prototype,n.prototype=new i,n.extend=S.inherits,t&&S.extend(n.prototype,t),n.__super__=e.prototype,n},_deprecated:function(t,e,n,i){void 0!==e&&console.warn(t+': "'+n+'" is deprecated. Please use "'+i+'" instead')}},D=S;S.callCallback=S.callback,S.indexOf=function(t,e,n){return Array.prototype.indexOf.call(t,e,n)},S.getValueOrDefault=S.valueOrDefault,S.getValueAtIndexOrDefault=S.valueAtIndexOrDefault;var C={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return(t-=1)*t*t+1},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-((t-=1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return t*t*t*t*t},easeOutQuint:function(t){return(t-=1)*t*t*t*t+1},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return 1-Math.cos(t*(Math.PI/2))},easeOutSine:function(t){return Math.sin(t*(Math.PI/2))},easeInOutSine:function(t){return-.5*(Math.cos(Math.PI*t)-1)},easeInExpo:function(t){return 0===t?0:Math.pow(2,10*(t-1))},easeOutExpo:function(t){return 1===t?1:1-Math.pow(2,-10*t)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(2-Math.pow(2,-10*--t))},easeInCirc:function(t){return t>=1?t:-(Math.sqrt(1-t*t)-1)},easeOutCirc:function(t){return Math.sqrt(1-(t-=1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),-i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n))},easeOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),i*Math.pow(2,-10*t)*Math.sin((t-e)*(2*Math.PI)/n)+1)},easeInOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:2==(t/=.5)?1:(n||(n=.45),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),t<1?i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*-.5:i*Math.pow(2,-10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*.5+1)},easeInBack:function(t){var e=1.70158;return t*t*((e+1)*t-e)},easeOutBack:function(t){var e=1.70158;return(t-=1)*t*((e+1)*t+e)+1},easeInOutBack:function(t){var e=1.70158;return(t/=.5)<1?t*t*((1+(e*=1.525))*t-e)*.5:.5*((t-=2)*t*((1+(e*=1.525))*t+e)+2)},easeInBounce:function(t){return 1-C.easeOutBounce(1-t)},easeOutBounce:function(t){return t<1/2.75?7.5625*t*t:t<2/2.75?7.5625*(t-=1.5/2.75)*t+.75:t<2.5/2.75?7.5625*(t-=2.25/2.75)*t+.9375:7.5625*(t-=2.625/2.75)*t+.984375},easeInOutBounce:function(t){return t<.5?.5*C.easeInBounce(2*t):.5*C.easeOutBounce(2*t-1)+.5}},P={effects:C};D.easingEffects=C;var T=Math.PI,O=T/180,A=2*T,F=T/2,I=T/4,L=2*T/3,R={clear:function(t){t.ctx.clearRect(0,0,t.width,t.height)},roundedRect:function(t,e,n,i,a,r){if(r){var o=Math.min(r,a/2,i/2),s=e+o,l=n+o,u=e+i-o,d=n+a-o;t.moveTo(e,l),s<u&&l<d?(t.arc(s,l,o,-T,-F),t.arc(u,l,o,-F,0),t.arc(u,d,o,0,F),t.arc(s,d,o,F,T)):s<u?(t.moveTo(s,n),t.arc(u,l,o,-F,F),t.arc(s,l,o,F,T+F)):l<d?(t.arc(s,l,o,-T,0),t.arc(s,d,o,0,T)):t.arc(s,l,o,-T,T),t.closePath(),t.moveTo(e,n)}else t.rect(e,n,i,a)},drawPoint:function(t,e,n,i,a,r){var o,s,l,u,d,h=(r||0)*O;if(e&&"object"==typeof e&&("[object HTMLImageElement]"===(o=e.toString())||"[object HTMLCanvasElement]"===o))return t.save(),t.translate(i,a),t.rotate(h),t.drawImage(e,-e.width/2,-e.height/2,e.width,e.height),void t.restore();if(!(isNaN(n)||n<=0)){switch(t.beginPath(),e){default:t.arc(i,a,n,0,A),t.closePath();break;case"triangle":t.moveTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=L,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=L,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),t.closePath();break;case"rectRounded":u=n-(d=.516*n),s=Math.cos(h+I)*u,l=Math.sin(h+I)*u,t.arc(i-s,a-l,d,h-T,h-F),t.arc(i+l,a-s,d,h-F,h),t.arc(i+s,a+l,d,h,h+F),t.arc(i-l,a+s,d,h+F,h+T),t.closePath();break;case"rect":if(!r){u=Math.SQRT1_2*n,t.rect(i-u,a-u,2*u,2*u);break}h+=I;case"rectRot":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+l,a-s),t.lineTo(i+s,a+l),t.lineTo(i-l,a+s),t.closePath();break;case"crossRot":h+=I;case"cross":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"star":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s),h+=I,s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"line":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l);break;case"dash":t.moveTo(i,a),t.lineTo(i+Math.cos(h)*n,a+Math.sin(h)*n)}t.fill(),t.stroke()}},_isPointInArea:function(t,e){return t.x>e.left-1e-6&&t.x<e.right+1e-6&&t.y>e.top-1e-6&&t.y<e.bottom+1e-6},clipArea:function(t,e){t.save(),t.beginPath(),t.rect(e.left,e.top,e.right-e.left,e.bottom-e.top),t.clip()},unclipArea:function(t){t.restore()},lineTo:function(t,e,n,i){var a=n.steppedLine;if(a){if("middle"===a){var r=(e.x+n.x)/2;t.lineTo(r,i?n.y:e.y),t.lineTo(r,i?e.y:n.y)}else"after"===a&&!i||"after"!==a&&i?t.lineTo(e.x,n.y):t.lineTo(n.x,e.y);t.lineTo(n.x,n.y)}else n.tension?t.bezierCurveTo(i?e.controlPointPreviousX:e.controlPointNextX,i?e.controlPointPreviousY:e.controlPointNextY,i?n.controlPointNextX:n.controlPointPreviousX,i?n.controlPointNextY:n.controlPointPreviousY,n.x,n.y):t.lineTo(n.x,n.y)}},N=R;D.clear=R.clear,D.drawRoundedRectangle=function(t){t.beginPath(),R.roundedRect.apply(R,arguments)};var W={_set:function(t,e){return D.merge(this[t]||(this[t]={}),e)}};W._set("global",{defaultColor:"rgba(0,0,0,0.1)",defaultFontColor:"#666",defaultFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",defaultFontSize:12,defaultFontStyle:"normal",defaultLineHeight:1.2,showLines:!0});var Y=W,z=D.valueOrDefault;var E={toLineHeight:function(t,e){var n=(""+t).match(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/);if(!n||"normal"===n[1])return 1.2*e;switch(t=+n[2],n[3]){case"px":return t;case"%":t/=100}return e*t},toPadding:function(t){var e,n,i,a;return D.isObject(t)?(e=+t.top||0,n=+t.right||0,i=+t.bottom||0,a=+t.left||0):e=n=i=a=+t||0,{top:e,right:n,bottom:i,left:a,height:e+i,width:a+n}},_parseFont:function(t){var e=Y.global,n=z(t.fontSize,e.defaultFontSize),i={family:z(t.fontFamily,e.defaultFontFamily),lineHeight:D.options.toLineHeight(z(t.lineHeight,e.defaultLineHeight),n),size:n,style:z(t.fontStyle,e.defaultFontStyle),weight:null,string:""};return i.string=function(t){return!t||D.isNullOrUndef(t.size)||D.isNullOrUndef(t.family)?null:(t.style?t.style+" ":"")+(t.weight?t.weight+" ":"")+t.size+"px "+t.family}(i),i},resolve:function(t,e,n,i){var a,r,o,s=!0;for(a=0,r=t.length;a<r;++a)if(void 0!==(o=t[a])&&(void 0!==e&&"function"==typeof o&&(o=o(e),s=!1),void 0!==n&&D.isArray(o)&&(o=o[n],s=!1),void 0!==o))return i&&!s&&(i.cacheable=!1),o}},V={_factorize:function(t){var e,n=[],i=Math.sqrt(t);for(e=1;e<i;e++)t%e==0&&(n.push(e),n.push(t/e));return i===(0|i)&&n.push(i),n.sort((function(t,e){return t-e})).pop(),n},log10:Math.log10||function(t){var e=Math.log(t)*Math.LOG10E,n=Math.round(e);return t===Math.pow(10,n)?n:e}},H=V;D.log10=V.log10;var B=D,j=P,U=N,G=E,q=H,Z={getRtlAdapter:function(t,e,n){return t?function(t,e){return{x:function(n){return t+t+e-n},setWidth:function(t){e=t},textAlign:function(t){return"center"===t?t:"right"===t?"left":"right"},xPlus:function(t,e){return t-e},leftForLtr:function(t,e){return t-e}}}(e,n):{x:function(t){return t},setWidth:function(t){},textAlign:function(t){return t},xPlus:function(t,e){return t+e},leftForLtr:function(t,e){return t}}},overrideTextDirection:function(t,e){var n,i;"ltr"!==e&&"rtl"!==e||(i=[(n=t.canvas.style).getPropertyValue("direction"),n.getPropertyPriority("direction")],n.setProperty("direction",e,"important"),t.prevTextDirection=i)},restoreTextDirection:function(t){var e=t.prevTextDirection;void 0!==e&&(delete t.prevTextDirection,t.canvas.style.setProperty("direction",e[0],e[1]))}};B.easing=j,B.canvas=U,B.options=G,B.math=q,B.rtl=Z;var $=function(t){B.extend(this,t),this.initialize.apply(this,arguments)};B.extend($.prototype,{_type:void 0,initialize:function(){this.hidden=!1},pivot:function(){var t=this;return t._view||(t._view=B.extend({},t._model)),t._start={},t},transition:function(t){var e=this,n=e._model,i=e._start,a=e._view;return n&&1!==t?(a||(a=e._view={}),i||(i=e._start={}),function(t,e,n,i){var a,r,o,s,l,u,d,h,c,f=Object.keys(n);for(a=0,r=f.length;a<r;++a)if(u=n[o=f[a]],e.hasOwnProperty(o)||(e[o]=u),(s=e[o])!==u&&"_"!==o[0]){if(t.hasOwnProperty(o)||(t[o]=s),(d=typeof u)===typeof(l=t[o]))if("string"===d){if((h=w(l)).valid&&(c=w(u)).valid){e[o]=c.mix(h,i).rgbString();continue}}else if(B.isFinite(l)&&B.isFinite(u)){e[o]=l+(u-l)*i;continue}e[o]=u}}(i,a,n,t),e):(e._view=B.extend({},n),e._start=null,e)},tooltipPosition:function(){return{x:this._model.x,y:this._model.y}},hasValue:function(){return B.isNumber(this._model.x)&&B.isNumber(this._model.y)}}),$.extend=B.inherits;var X=$,K=X.extend({chart:null,currentStep:0,numSteps:60,easing:"",render:null,onAnimationProgress:null,onAnimationComplete:null}),J=K;Object.defineProperty(K.prototype,"animationObject",{get:function(){return this}}),Object.defineProperty(K.prototype,"chartInstance",{get:function(){return this.chart},set:function(t){this.chart=t}}),Y._set("global",{animation:{duration:1e3,easing:"easeOutQuart",onProgress:B.noop,onComplete:B.noop}});var Q={animations:[],request:null,addAnimation:function(t,e,n,i){var a,r,o=this.animations;for(e.chart=t,e.startTime=Date.now(),e.duration=n,i||(t.animating=!0),a=0,r=o.length;a<r;++a)if(o[a].chart===t)return void(o[a]=e);o.push(e),1===o.length&&this.requestAnimationFrame()},cancelAnimation:function(t){var e=B.findIndex(this.animations,(function(e){return e.chart===t}));-1!==e&&(this.animations.splice(e,1),t.animating=!1)},requestAnimationFrame:function(){var t=this;null===t.request&&(t.request=B.requestAnimFrame.call(window,(function(){t.request=null,t.startDigest()})))},startDigest:function(){this.advance(),this.animations.length>0&&this.requestAnimationFrame()},advance:function(){for(var t,e,n,i,a=this.animations,r=0;r<a.length;)e=(t=a[r]).chart,n=t.numSteps,i=Math.floor((Date.now()-t.startTime)/t.duration*n)+1,t.currentStep=Math.min(i,n),B.callback(t.render,[e,t],e),B.callback(t.onAnimationProgress,[t],e),t.currentStep>=n?(B.callback(t.onAnimationComplete,[t],e),e.animating=!1,a.splice(r,1)):++r}},tt=B.options.resolve,et=["push","pop","shift","splice","unshift"];function nt(t,e){var n=t._chartjs;if(n){var i=n.listeners,a=i.indexOf(e);-1!==a&&i.splice(a,1),i.length>0||(et.forEach((function(e){delete t[e]})),delete t._chartjs)}}var it=function(t,e){this.initialize(t,e)};B.extend(it.prototype,{datasetElementType:null,dataElementType:null,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth"],_dataElementOptions:["backgroundColor","borderColor","borderWidth","pointStyle"],initialize:function(t,e){var n=this;n.chart=t,n.index=e,n.linkScales(),n.addElements(),n._type=n.getMeta().type},updateIndex:function(t){this.index=t},linkScales:function(){var t=this.getMeta(),e=this.chart,n=e.scales,i=this.getDataset(),a=e.options.scales;null!==t.xAxisID&&t.xAxisID in n&&!i.xAxisID||(t.xAxisID=i.xAxisID||a.xAxes[0].id),null!==t.yAxisID&&t.yAxisID in n&&!i.yAxisID||(t.yAxisID=i.yAxisID||a.yAxes[0].id)},getDataset:function(){return this.chart.data.datasets[this.index]},getMeta:function(){return this.chart.getDatasetMeta(this.index)},getScaleForId:function(t){return this.chart.scales[t]},_getValueScaleId:function(){return this.getMeta().yAxisID},_getIndexScaleId:function(){return this.getMeta().xAxisID},_getValueScale:function(){return this.getScaleForId(this._getValueScaleId())},_getIndexScale:function(){return this.getScaleForId(this._getIndexScaleId())},reset:function(){this._update(!0)},destroy:function(){this._data&&nt(this._data,this)},createMetaDataset:function(){var t=this.datasetElementType;return t&&new t({_chart:this.chart,_datasetIndex:this.index})},createMetaData:function(t){var e=this.dataElementType;return e&&new e({_chart:this.chart,_datasetIndex:this.index,_index:t})},addElements:function(){var t,e,n=this.getMeta(),i=this.getDataset().data||[],a=n.data;for(t=0,e=i.length;t<e;++t)a[t]=a[t]||this.createMetaData(t);n.dataset=n.dataset||this.createMetaDataset()},addElementAndReset:function(t){var e=this.createMetaData(t);this.getMeta().data.splice(t,0,e),this.updateElement(e,t,!0)},buildOrUpdateElements:function(){var t,e,n=this,i=n.getDataset(),a=i.data||(i.data=[]);n._data!==a&&(n._data&&nt(n._data,n),a&&Object.isExtensible(a)&&(e=n,(t=a)._chartjs?t._chartjs.listeners.push(e):(Object.defineProperty(t,"_chartjs",{configurable:!0,enumerable:!1,value:{listeners:[e]}}),et.forEach((function(e){var n="onData"+e.charAt(0).toUpperCase()+e.slice(1),i=t[e];Object.defineProperty(t,e,{configurable:!0,enumerable:!1,value:function(){var e=Array.prototype.slice.call(arguments),a=i.apply(this,e);return B.each(t._chartjs.listeners,(function(t){"function"==typeof t[n]&&t[n].apply(t,e)})),a}})})))),n._data=a),n.resyncElements()},_configure:function(){this._config=B.merge(Object.create(null),[this.chart.options.datasets[this._type],this.getDataset()],{merger:function(t,e,n){"_meta"!==t&&"data"!==t&&B._merger(t,e,n)}})},_update:function(t){this._configure(),this._cachedDataOpts=null,this.update(t)},update:B.noop,transition:function(t){for(var e=this.getMeta(),n=e.data||[],i=n.length,a=0;a<i;++a)n[a].transition(t);e.dataset&&e.dataset.transition(t)},draw:function(){var t=this.getMeta(),e=t.data||[],n=e.length,i=0;for(t.dataset&&t.dataset.draw();i<n;++i)e[i].draw()},getStyle:function(t){var e,n=this.getMeta(),i=n.dataset;return this._configure(),i&&void 0===t?e=this._resolveDatasetElementOptions(i||{}):(t=t||0,e=this._resolveDataElementOptions(n.data[t]||{},t)),!1!==e.fill&&null!==e.fill||(e.backgroundColor=e.borderColor),e},_resolveDatasetElementOptions:function(t,e){var n,i,a,r,o=this,s=o.chart,l=o._config,u=t.custom||{},d=s.options.elements[o.datasetElementType.prototype._type]||{},h=o._datasetElementOptions,c={},f={chart:s,dataset:o.getDataset(),datasetIndex:o.index,hover:e};for(n=0,i=h.length;n<i;++n)a=h[n],r=e?"hover"+a.charAt(0).toUpperCase()+a.slice(1):a,c[a]=tt([u[r],l[r],d[r]],f);return c},_resolveDataElementOptions:function(t,e){var n=this,i=t&&t.custom,a=n._cachedDataOpts;if(a&&!i)return a;var r,o,s,l,u=n.chart,d=n._config,h=u.options.elements[n.dataElementType.prototype._type]||{},c=n._dataElementOptions,f={},g={chart:u,dataIndex:e,dataset:n.getDataset(),datasetIndex:n.index},m={cacheable:!i};if(i=i||{},B.isArray(c))for(o=0,s=c.length;o<s;++o)f[l=c[o]]=tt([i[l],d[l],h[l]],g,e,m);else for(o=0,s=(r=Object.keys(c)).length;o<s;++o)f[l=r[o]]=tt([i[l],d[c[l]],d[l],h[l]],g,e,m);return m.cacheable&&(n._cachedDataOpts=Object.freeze(f)),f},removeHoverStyle:function(t){B.merge(t._model,t.$previousStyle||{}),delete t.$previousStyle},setHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],n=t._index,i=t.custom||{},a=t._model,r=B.getHoverColor;t.$previousStyle={backgroundColor:a.backgroundColor,borderColor:a.borderColor,borderWidth:a.borderWidth},a.backgroundColor=tt([i.hoverBackgroundColor,e.hoverBackgroundColor,r(a.backgroundColor)],void 0,n),a.borderColor=tt([i.hoverBorderColor,e.hoverBorderColor,r(a.borderColor)],void 0,n),a.borderWidth=tt([i.hoverBorderWidth,e.hoverBorderWidth,a.borderWidth],void 0,n)},_removeDatasetHoverStyle:function(){var t=this.getMeta().dataset;t&&this.removeHoverStyle(t)},_setDatasetHoverStyle:function(){var t,e,n,i,a,r,o=this.getMeta().dataset,s={};if(o){for(r=o._model,a=this._resolveDatasetElementOptions(o,!0),t=0,e=(i=Object.keys(a)).length;t<e;++t)s[n=i[t]]=r[n],r[n]=a[n];o.$previousStyle=s}},resyncElements:function(){var t=this.getMeta(),e=this.getDataset().data,n=t.data.length,i=e.length;i<n?t.data.splice(i,n-i):i>n&&this.insertElements(n,i-n)},insertElements:function(t,e){for(var n=0;n<e;++n)this.addElementAndReset(t+n)},onDataPush:function(){var t=arguments.length;this.insertElements(this.getDataset().data.length-t,t)},onDataPop:function(){this.getMeta().data.pop()},onDataShift:function(){this.getMeta().data.shift()},onDataSplice:function(t,e){this.getMeta().data.splice(t,e),this.insertElements(t,arguments.length-2)},onDataUnshift:function(){this.insertElements(0,arguments.length)}}),it.extend=B.inherits;var at=it,rt=2*Math.PI;function ot(t,e){var n=e.startAngle,i=e.endAngle,a=e.pixelMargin,r=a/e.outerRadius,o=e.x,s=e.y;t.beginPath(),t.arc(o,s,e.outerRadius,n-r,i+r),e.innerRadius>a?(r=a/e.innerRadius,t.arc(o,s,e.innerRadius-a,i+r,n-r,!0)):t.arc(o,s,a,i+Math.PI/2,n-Math.PI/2),t.closePath(),t.clip()}function st(t,e,n){var i="inner"===e.borderAlign;i?(t.lineWidth=2*e.borderWidth,t.lineJoin="round"):(t.lineWidth=e.borderWidth,t.lineJoin="bevel"),n.fullCircles&&function(t,e,n,i){var a,r=n.endAngle;for(i&&(n.endAngle=n.startAngle+rt,ot(t,n),n.endAngle=r,n.endAngle===n.startAngle&&n.fullCircles&&(n.endAngle+=rt,n.fullCircles--)),t.beginPath(),t.arc(n.x,n.y,n.innerRadius,n.startAngle+rt,n.startAngle,!0),a=0;a<n.fullCircles;++a)t.stroke();for(t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.startAngle+rt),a=0;a<n.fullCircles;++a)t.stroke()}(t,e,n,i),i&&ot(t,n),t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.endAngle),t.arc(n.x,n.y,n.innerRadius,n.endAngle,n.startAngle,!0),t.closePath(),t.stroke()}Y._set("global",{elements:{arc:{backgroundColor:Y.global.defaultColor,borderColor:"#fff",borderWidth:2,borderAlign:"center"}}});var lt=X.extend({_type:"arc",inLabelRange:function(t){var e=this._view;return!!e&&Math.pow(t-e.x,2)<Math.pow(e.radius+e.hoverRadius,2)},inRange:function(t,e){var n=this._view;if(n){for(var i=B.getAngleFromPoint(n,{x:t,y:e}),a=i.angle,r=i.distance,o=n.startAngle,s=n.endAngle;s<o;)s+=rt;for(;a>s;)a-=rt;for(;a<o;)a+=rt;var l=a>=o&&a<=s,u=r>=n.innerRadius&&r<=n.outerRadius;return l&&u}return!1},getCenterPoint:function(){var t=this._view,e=(t.startAngle+t.endAngle)/2,n=(t.innerRadius+t.outerRadius)/2;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},getArea:function(){var t=this._view;return Math.PI*((t.endAngle-t.startAngle)/(2*Math.PI))*(Math.pow(t.outerRadius,2)-Math.pow(t.innerRadius,2))},tooltipPosition:function(){var t=this._view,e=t.startAngle+(t.endAngle-t.startAngle)/2,n=(t.outerRadius-t.innerRadius)/2+t.innerRadius;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},draw:function(){var t,e=this._chart.ctx,n=this._view,i="inner"===n.borderAlign?.33:0,a={x:n.x,y:n.y,innerRadius:n.innerRadius,outerRadius:Math.max(n.outerRadius-i,0),pixelMargin:i,startAngle:n.startAngle,endAngle:n.endAngle,fullCircles:Math.floor(n.circumference/rt)};if(e.save(),e.fillStyle=n.backgroundColor,e.strokeStyle=n.borderColor,a.fullCircles){for(a.endAngle=a.startAngle+rt,e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),t=0;t<a.fullCircles;++t)e.fill();a.endAngle=a.startAngle+n.circumference%rt}e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),e.fill(),n.borderWidth&&st(e,n,a),e.restore()}}),ut=B.valueOrDefault,dt=Y.global.defaultColor;Y._set("global",{elements:{line:{tension:.4,backgroundColor:dt,borderWidth:3,borderColor:dt,borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",capBezierPoints:!0,fill:!0}}});var ht=X.extend({_type:"line",draw:function(){var t,e,n,i=this,a=i._view,r=i._chart.ctx,o=a.spanGaps,s=i._children.slice(),l=Y.global,u=l.elements.line,d=-1,h=i._loop;if(s.length){if(i._loop){for(t=0;t<s.length;++t)if(e=B.previousItem(s,t),!s[t]._view.skip&&e._view.skip){s=s.slice(t).concat(s.slice(0,t)),h=o;break}h&&s.push(s[0])}for(r.save(),r.lineCap=a.borderCapStyle||u.borderCapStyle,r.setLineDash&&r.setLineDash(a.borderDash||u.borderDash),r.lineDashOffset=ut(a.borderDashOffset,u.borderDashOffset),r.lineJoin=a.borderJoinStyle||u.borderJoinStyle,r.lineWidth=ut(a.borderWidth,u.borderWidth),r.strokeStyle=a.borderColor||l.defaultColor,r.beginPath(),(n=s[0]._view).skip||(r.moveTo(n.x,n.y),d=0),t=1;t<s.length;++t)n=s[t]._view,e=-1===d?B.previousItem(s,t):s[d],n.skip||(d!==t-1&&!o||-1===d?r.moveTo(n.x,n.y):B.canvas.lineTo(r,e._view,n),d=t);h&&r.closePath(),r.stroke(),r.restore()}}}),ct=B.valueOrDefault,ft=Y.global.defaultColor;function gt(t){var e=this._view;return!!e&&Math.abs(t-e.x)<e.radius+e.hitRadius}Y._set("global",{elements:{point:{radius:3,pointStyle:"circle",backgroundColor:ft,borderColor:ft,borderWidth:1,hitRadius:1,hoverRadius:4,hoverBorderWidth:1}}});var mt=X.extend({_type:"point",inRange:function(t,e){var n=this._view;return!!n&&Math.pow(t-n.x,2)+Math.pow(e-n.y,2)<Math.pow(n.hitRadius+n.radius,2)},inLabelRange:gt,inXRange:gt,inYRange:function(t){var e=this._view;return!!e&&Math.abs(t-e.y)<e.radius+e.hitRadius},getCenterPoint:function(){var t=this._view;return{x:t.x,y:t.y}},getArea:function(){return Math.PI*Math.pow(this._view.radius,2)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y,padding:t.radius+t.borderWidth}},draw:function(t){var e=this._view,n=this._chart.ctx,i=e.pointStyle,a=e.rotation,r=e.radius,o=e.x,s=e.y,l=Y.global,u=l.defaultColor;e.skip||(void 0===t||B.canvas._isPointInArea(e,t))&&(n.strokeStyle=e.borderColor||u,n.lineWidth=ct(e.borderWidth,l.elements.point.borderWidth),n.fillStyle=e.backgroundColor||u,B.canvas.drawPoint(n,i,r,o,s,a))}}),pt=Y.global.defaultColor;function vt(t){return t&&void 0!==t.width}function bt(t){var e,n,i,a,r;return vt(t)?(r=t.width/2,e=t.x-r,n=t.x+r,i=Math.min(t.y,t.base),a=Math.max(t.y,t.base)):(r=t.height/2,e=Math.min(t.x,t.base),n=Math.max(t.x,t.base),i=t.y-r,a=t.y+r),{left:e,top:i,right:n,bottom:a}}function yt(t,e,n){return t===e?n:t===n?e:t}function xt(t,e,n){var i,a,r,o,s=t.borderWidth,l=function(t){var e=t.borderSkipped,n={};return e?(t.horizontal?t.base>t.x&&(e=yt(e,"left","right")):t.base<t.y&&(e=yt(e,"bottom","top")),n[e]=!0,n):n}(t);return B.isObject(s)?(i=+s.top||0,a=+s.right||0,r=+s.bottom||0,o=+s.left||0):i=a=r=o=+s||0,{t:l.top||i<0?0:i>n?n:i,r:l.right||a<0?0:a>e?e:a,b:l.bottom||r<0?0:r>n?n:r,l:l.left||o<0?0:o>e?e:o}}function _t(t,e,n){var i=null===e,a=null===n,r=!(!t||i&&a)&&bt(t);return r&&(i||e>=r.left&&e<=r.right)&&(a||n>=r.top&&n<=r.bottom)}Y._set("global",{elements:{rectangle:{backgroundColor:pt,borderColor:pt,borderSkipped:"bottom",borderWidth:0}}});var wt=X.extend({_type:"rectangle",draw:function(){var t=this._chart.ctx,e=this._view,n=function(t){var e=bt(t),n=e.right-e.left,i=e.bottom-e.top,a=xt(t,n/2,i/2);return{outer:{x:e.left,y:e.top,w:n,h:i},inner:{x:e.left+a.l,y:e.top+a.t,w:n-a.l-a.r,h:i-a.t-a.b}}}(e),i=n.outer,a=n.inner;t.fillStyle=e.backgroundColor,t.fillRect(i.x,i.y,i.w,i.h),i.w===a.w&&i.h===a.h||(t.save(),t.beginPath(),t.rect(i.x,i.y,i.w,i.h),t.clip(),t.fillStyle=e.borderColor,t.rect(a.x,a.y,a.w,a.h),t.fill("evenodd"),t.restore())},height:function(){var t=this._view;return t.base-t.y},inRange:function(t,e){return _t(this._view,t,e)},inLabelRange:function(t,e){var n=this._view;return vt(n)?_t(n,t,null):_t(n,null,e)},inXRange:function(t){return _t(this._view,t,null)},inYRange:function(t){return _t(this._view,null,t)},getCenterPoint:function(){var t,e,n=this._view;return vt(n)?(t=n.x,e=(n.y+n.base)/2):(t=(n.x+n.base)/2,e=n.y),{x:t,y:e}},getArea:function(){var t=this._view;return vt(t)?t.width*Math.abs(t.y-t.base):t.height*Math.abs(t.x-t.base)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y}}}),kt={},Mt=lt,St=ht,Dt=mt,Ct=wt;kt.Arc=Mt,kt.Line=St,kt.Point=Dt,kt.Rectangle=Ct;var Pt=B._deprecated,Tt=B.valueOrDefault;function Ot(t,e,n){var i,a,r=n.barThickness,o=e.stackCount,s=e.pixels[t],l=B.isNullOrUndef(r)?function(t,e){var n,i,a,r,o=t._length;for(a=1,r=e.length;a<r;++a)o=Math.min(o,Math.abs(e[a]-e[a-1]));for(a=0,r=t.getTicks().length;a<r;++a)i=t.getPixelForTick(a),o=a>0?Math.min(o,Math.abs(i-n)):o,n=i;return o}(e.scale,e.pixels):-1;return B.isNullOrUndef(r)?(i=l*n.categoryPercentage,a=n.barPercentage):(i=r*o,a=1),{chunk:i/o,ratio:a,start:s-i/2}}Y._set("bar",{hover:{mode:"label"},scales:{xAxes:[{type:"category",offset:!0,gridLines:{offsetGridLines:!0}}],yAxes:[{type:"linear"}]}}),Y._set("global",{datasets:{bar:{categoryPercentage:.8,barPercentage:.9}}});var At=at.extend({dataElementType:kt.Rectangle,_dataElementOptions:["backgroundColor","borderColor","borderSkipped","borderWidth","barPercentage","barThickness","categoryPercentage","maxBarThickness","minBarLength"],initialize:function(){var t,e,n=this;at.prototype.initialize.apply(n,arguments),(t=n.getMeta()).stack=n.getDataset().stack,t.bar=!0,e=n._getIndexScale().options,Pt("bar chart",e.barPercentage,"scales.[x/y]Axes.barPercentage","dataset.barPercentage"),Pt("bar chart",e.barThickness,"scales.[x/y]Axes.barThickness","dataset.barThickness"),Pt("bar chart",e.categoryPercentage,"scales.[x/y]Axes.categoryPercentage","dataset.categoryPercentage"),Pt("bar chart",n._getValueScale().options.minBarLength,"scales.[x/y]Axes.minBarLength","dataset.minBarLength"),Pt("bar chart",e.maxBarThickness,"scales.[x/y]Axes.maxBarThickness","dataset.maxBarThickness")},update:function(t){var e,n,i=this.getMeta().data;for(this._ruler=this.getRuler(),e=0,n=i.length;e<n;++e)this.updateElement(i[e],e,t)},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=i.getDataset(),o=i._resolveDataElementOptions(t,e);t._xScale=i.getScaleForId(a.xAxisID),t._yScale=i.getScaleForId(a.yAxisID),t._datasetIndex=i.index,t._index=e,t._model={backgroundColor:o.backgroundColor,borderColor:o.borderColor,borderSkipped:o.borderSkipped,borderWidth:o.borderWidth,datasetLabel:r.label,label:i.chart.data.labels[e]},B.isArray(r.data[e])&&(t._model.borderSkipped=null),i._updateElementGeometry(t,e,n,o),t.pivot()},_updateElementGeometry:function(t,e,n,i){var a=this,r=t._model,o=a._getValueScale(),s=o.getBasePixel(),l=o.isHorizontal(),u=a._ruler||a.getRuler(),d=a.calculateBarValuePixels(a.index,e,i),h=a.calculateBarIndexPixels(a.index,e,u,i);r.horizontal=l,r.base=n?s:d.base,r.x=l?n?s:d.head:h.center,r.y=l?h.center:n?s:d.head,r.height=l?h.size:void 0,r.width=l?void 0:h.size},_getStacks:function(t){var e,n,i=this._getIndexScale(),a=i._getMatchingVisibleMetas(this._type),r=i.options.stacked,o=a.length,s=[];for(e=0;e<o&&(n=a[e],(!1===r||-1===s.indexOf(n.stack)||void 0===r&&void 0===n.stack)&&s.push(n.stack),n.index!==t);++e);return s},getStackCount:function(){return this._getStacks().length},getStackIndex:function(t,e){var n=this._getStacks(t),i=void 0!==e?n.indexOf(e):-1;return-1===i?n.length-1:i},getRuler:function(){var t,e,n=this._getIndexScale(),i=[];for(t=0,e=this.getMeta().data.length;t<e;++t)i.push(n.getPixelForValue(null,t,this.index));return{pixels:i,start:n._startPixel,end:n._endPixel,stackCount:this.getStackCount(),scale:n}},calculateBarValuePixels:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._getValueScale(),c=h.isHorizontal(),f=d.data.datasets,g=h._getMatchingVisibleMetas(this._type),m=h._parseValue(f[t].data[e]),p=n.minBarLength,v=h.options.stacked,b=this.getMeta().stack,y=void 0===m.start?0:m.max>=0&&m.min>=0?m.min:m.max,x=void 0===m.start?m.end:m.max>=0&&m.min>=0?m.max-m.min:m.min-m.max,_=g.length;if(v||void 0===v&&void 0!==b)for(i=0;i<_&&(a=g[i]).index!==t;++i)a.stack===b&&(r=void 0===(u=h._parseValue(f[a.index].data[e])).start?u.end:u.min>=0&&u.max>=0?u.max:u.min,(m.min<0&&r<0||m.max>=0&&r>0)&&(y+=r));return o=h.getPixelForValue(y),l=(s=h.getPixelForValue(y+x))-o,void 0!==p&&Math.abs(l)<p&&(l=p,s=x>=0&&!c||x<0&&c?o-p:o+p),{size:l,base:o,head:s,center:s+l/2}},calculateBarIndexPixels:function(t,e,n,i){var a="flex"===i.barThickness?function(t,e,n){var i,a=e.pixels,r=a[t],o=t>0?a[t-1]:null,s=t<a.length-1?a[t+1]:null,l=n.categoryPercentage;return null===o&&(o=r-(null===s?e.end-e.start:s-r)),null===s&&(s=r+r-o),i=r-(r-Math.min(o,s))/2*l,{chunk:Math.abs(s-o)/2*l/e.stackCount,ratio:n.barPercentage,start:i}}(e,n,i):Ot(e,n,i),r=this.getStackIndex(t,this.getMeta().stack),o=a.start+a.chunk*r+a.chunk/2,s=Math.min(Tt(i.maxBarThickness,1/0),a.chunk*a.ratio);return{base:o-s/2,head:o+s/2,center:o,size:s}},draw:function(){var t=this.chart,e=this._getValueScale(),n=this.getMeta().data,i=this.getDataset(),a=n.length,r=0;for(B.canvas.clipArea(t.ctx,t.chartArea);r<a;++r){var o=e._parseValue(i.data[r]);isNaN(o.min)||isNaN(o.max)||n[r].draw()}B.canvas.unclipArea(t.ctx)},_resolveDataElementOptions:function(){var t=this,e=B.extend({},at.prototype._resolveDataElementOptions.apply(t,arguments)),n=t._getIndexScale().options,i=t._getValueScale().options;return e.barPercentage=Tt(n.barPercentage,e.barPercentage),e.barThickness=Tt(n.barThickness,e.barThickness),e.categoryPercentage=Tt(n.categoryPercentage,e.categoryPercentage),e.maxBarThickness=Tt(n.maxBarThickness,e.maxBarThickness),e.minBarLength=Tt(i.minBarLength,e.minBarLength),e}}),Ft=B.valueOrDefault,It=B.options.resolve;Y._set("bubble",{hover:{mode:"single"},scales:{xAxes:[{type:"linear",position:"bottom",id:"x-axis-0"}],yAxes:[{type:"linear",position:"left",id:"y-axis-0"}]},tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.datasets[t.datasetIndex].label||"",i=e.datasets[t.datasetIndex].data[t.index];return n+": ("+t.xLabel+", "+t.yLabel+", "+i.r+")"}}}});var Lt=at.extend({dataElementType:kt.Point,_dataElementOptions:["backgroundColor","borderColor","borderWidth","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth","hoverRadius","hitRadius","pointStyle","rotation"],update:function(t){var e=this,n=e.getMeta().data;B.each(n,(function(n,i){e.updateElement(n,i,t)}))},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=t.custom||{},o=i.getScaleForId(a.xAxisID),s=i.getScaleForId(a.yAxisID),l=i._resolveDataElementOptions(t,e),u=i.getDataset().data[e],d=i.index,h=n?o.getPixelForDecimal(.5):o.getPixelForValue("object"==typeof u?u:NaN,e,d),c=n?s.getBasePixel():s.getPixelForValue(u,e,d);t._xScale=o,t._yScale=s,t._options=l,t._datasetIndex=d,t._index=e,t._model={backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,hitRadius:l.hitRadius,pointStyle:l.pointStyle,rotation:l.rotation,radius:n?0:l.radius,skip:r.skip||isNaN(h)||isNaN(c),x:h,y:c},t.pivot()},setHoverStyle:function(t){var e=t._model,n=t._options,i=B.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Ft(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Ft(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Ft(n.hoverBorderWidth,n.borderWidth),e.radius=n.radius+n.hoverRadius},_resolveDataElementOptions:function(t,e){var n=this,i=n.chart,a=n.getDataset(),r=t.custom||{},o=a.data[e]||{},s=at.prototype._resolveDataElementOptions.apply(n,arguments),l={chart:i,dataIndex:e,dataset:a,datasetIndex:n.index};return n._cachedDataOpts===s&&(s=B.extend({},s)),s.radius=It([r.radius,o.r,n._config.radius,i.options.elements.point.radius],l,e),s}}),Rt=B.valueOrDefault,Nt=Math.PI,Wt=2*Nt,Yt=Nt/2;Y._set("doughnut",{animation:{animateRotate:!0,animateScale:!1},hover:{mode:"single"},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r]&&(a.data[r].hidden=!a.data[r].hidden);o.update()}},cutoutPercentage:50,rotation:-Yt,circumference:Wt,tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.labels[t.index],i=": "+e.datasets[t.datasetIndex].data[t.index];return B.isArray(n)?(n=n.slice())[0]+=i:n+=i,n}}}});var zt=at.extend({dataElementType:kt.Arc,linkScales:B.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],getRingIndex:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&++e;return e},update:function(t){var e,n,i,a,r=this,o=r.chart,s=o.chartArea,l=o.options,u=1,d=1,h=0,c=0,f=r.getMeta(),g=f.data,m=l.cutoutPercentage/100||0,p=l.circumference,v=r._getRingWeight(r.index);if(p<Wt){var b=l.rotation%Wt,y=(b+=b>=Nt?-Wt:b<-Nt?Wt:0)+p,x=Math.cos(b),_=Math.sin(b),w=Math.cos(y),k=Math.sin(y),M=b<=0&&y>=0||y>=Wt,S=b<=Yt&&y>=Yt||y>=Wt+Yt,D=b<=-Yt&&y>=-Yt||y>=Nt+Yt,C=b===-Nt||y>=Nt?-1:Math.min(x,x*m,w,w*m),P=D?-1:Math.min(_,_*m,k,k*m),T=M?1:Math.max(x,x*m,w,w*m),O=S?1:Math.max(_,_*m,k,k*m);u=(T-C)/2,d=(O-P)/2,h=-(T+C)/2,c=-(O+P)/2}for(i=0,a=g.length;i<a;++i)g[i]._options=r._resolveDataElementOptions(g[i],i);for(o.borderWidth=r.getMaxBorderWidth(),e=(s.right-s.left-o.borderWidth)/u,n=(s.bottom-s.top-o.borderWidth)/d,o.outerRadius=Math.max(Math.min(e,n)/2,0),o.innerRadius=Math.max(o.outerRadius*m,0),o.radiusLength=(o.outerRadius-o.innerRadius)/(r._getVisibleDatasetWeightTotal()||1),o.offsetX=h*o.outerRadius,o.offsetY=c*o.outerRadius,f.total=r.calculateTotal(),r.outerRadius=o.outerRadius-o.radiusLength*r._getRingWeightOffset(r.index),r.innerRadius=Math.max(r.outerRadius-o.radiusLength*v,0),i=0,a=g.length;i<a;++i)r.updateElement(g[i],i,t)},updateElement:function(t,e,n){var i=this,a=i.chart,r=a.chartArea,o=a.options,s=o.animation,l=(r.left+r.right)/2,u=(r.top+r.bottom)/2,d=o.rotation,h=o.rotation,c=i.getDataset(),f=n&&s.animateRotate?0:t.hidden?0:i.calculateCircumference(c.data[e])*(o.circumference/Wt),g=n&&s.animateScale?0:i.innerRadius,m=n&&s.animateScale?0:i.outerRadius,p=t._options||{};B.extend(t,{_datasetIndex:i.index,_index:e,_model:{backgroundColor:p.backgroundColor,borderColor:p.borderColor,borderWidth:p.borderWidth,borderAlign:p.borderAlign,x:l+a.offsetX,y:u+a.offsetY,startAngle:d,endAngle:h,circumference:f,outerRadius:m,innerRadius:g,label:B.valueAtIndexOrDefault(c.label,e,a.data.labels[e])}});var v=t._model;n&&s.animateRotate||(v.startAngle=0===e?o.rotation:i.getMeta().data[e-1]._model.endAngle,v.endAngle=v.startAngle+v.circumference),t.pivot()},calculateTotal:function(){var t,e=this.getDataset(),n=this.getMeta(),i=0;return B.each(n.data,(function(n,a){t=e.data[a],isNaN(t)||n.hidden||(i+=Math.abs(t))})),i},calculateCircumference:function(t){var e=this.getMeta().total;return e>0&&!isNaN(t)?Wt*(Math.abs(t)/e):0},getMaxBorderWidth:function(t){var e,n,i,a,r,o,s,l,u=0,d=this.chart;if(!t)for(e=0,n=d.data.datasets.length;e<n;++e)if(d.isDatasetVisible(e)){t=(i=d.getDatasetMeta(e)).data,e!==this.index&&(r=i.controller);break}if(!t)return 0;for(e=0,n=t.length;e<n;++e)a=t[e],r?(r._configure(),o=r._resolveDataElementOptions(a,e)):o=a._options,"inner"!==o.borderAlign&&(s=o.borderWidth,u=(l=o.hoverBorderWidth)>(u=s>u?s:u)?l:u);return u},setHoverStyle:function(t){var e=t._model,n=t._options,i=B.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=Rt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Rt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Rt(n.hoverBorderWidth,n.borderWidth)},_getRingWeightOffset:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&(e+=this._getRingWeight(n));return e},_getRingWeight:function(t){return Math.max(Rt(this.chart.data.datasets[t].weight,1),0)},_getVisibleDatasetWeightTotal:function(){return this._getRingWeightOffset(this.chart.data.datasets.length)}});Y._set("horizontalBar",{hover:{mode:"index",axis:"y"},scales:{xAxes:[{type:"linear",position:"bottom"}],yAxes:[{type:"category",position:"left",offset:!0,gridLines:{offsetGridLines:!0}}]},elements:{rectangle:{borderSkipped:"left"}},tooltips:{mode:"index",axis:"y"}}),Y._set("global",{datasets:{horizontalBar:{categoryPercentage:.8,barPercentage:.9}}});var Et=At.extend({_getValueScaleId:function(){return this.getMeta().xAxisID},_getIndexScaleId:function(){return this.getMeta().yAxisID}}),Vt=B.valueOrDefault,Ht=B.options.resolve,Bt=B.canvas._isPointInArea;function jt(t,e){var n=t&&t.options.ticks||{},i=n.reverse,a=void 0===n.min?e:0,r=void 0===n.max?e:0;return{start:i?r:a,end:i?a:r}}function Ut(t,e,n){var i=n/2,a=jt(t,i),r=jt(e,i);return{top:r.end,right:a.end,bottom:r.start,left:a.start}}function Gt(t){var e,n,i,a;return B.isObject(t)?(e=t.top,n=t.right,i=t.bottom,a=t.left):e=n=i=a=t,{top:e,right:n,bottom:i,left:a}}Y._set("line",{showLines:!0,spanGaps:!1,hover:{mode:"label"},scales:{xAxes:[{type:"category",id:"x-axis-0"}],yAxes:[{type:"linear",id:"y-axis-0"}]}});var qt=at.extend({datasetElementType:kt.Line,dataElementType:kt.Point,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth","cubicInterpolationMode","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.options,l=i._config,u=i._showLine=Vt(l.showLine,s.showLines);for(i._xScale=i.getScaleForId(a.xAxisID),i._yScale=i.getScaleForId(a.yAxisID),u&&(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=i._yScale,r._datasetIndex=i.index,r._children=o,r._model=i._resolveDatasetElementOptions(r),r.pivot()),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(u&&0!==r._model.tension&&i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i,a,r=this,o=r.getMeta(),s=t.custom||{},l=r.getDataset(),u=r.index,d=l.data[e],h=r._xScale,c=r._yScale,f=o.dataset._model,g=r._resolveDataElementOptions(t,e);i=h.getPixelForValue("object"==typeof d?d:NaN,e,u),a=n?c.getBasePixel():r.calculatePointY(d,e,u),t._xScale=h,t._yScale=c,t._options=g,t._datasetIndex=u,t._index=e,t._model={x:i,y:a,skip:s.skip||isNaN(i)||isNaN(a),radius:g.radius,pointStyle:g.pointStyle,rotation:g.rotation,backgroundColor:g.backgroundColor,borderColor:g.borderColor,borderWidth:g.borderWidth,tension:Vt(s.tension,f?f.tension:0),steppedLine:!!f&&f.steppedLine,hitRadius:g.hitRadius}},_resolveDatasetElementOptions:function(t){var e=this,n=e._config,i=t.custom||{},a=e.chart.options,r=a.elements.line,o=at.prototype._resolveDatasetElementOptions.apply(e,arguments);return o.spanGaps=Vt(n.spanGaps,a.spanGaps),o.tension=Vt(n.lineTension,r.tension),o.steppedLine=Ht([i.steppedLine,n.steppedLine,r.stepped]),o.clip=Gt(Vt(n.clip,Ut(e._xScale,e._yScale,o.borderWidth))),o},calculatePointY:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._yScale,c=0,f=0;if(h.options.stacked){for(s=+h.getRightValue(t),u=(l=d._getSortedVisibleDatasetMetas()).length,i=0;i<u&&(r=l[i]).index!==n;++i)a=d.data.datasets[r.index],"line"===r.type&&r.yAxisID===h.id&&((o=+h.getRightValue(a.data[e]))<0?f+=o||0:c+=o||0);return s<0?h.getPixelForValue(f+s):h.getPixelForValue(c+s)}return h.getPixelForValue(t)},updateBezierControlPoints:function(){var t,e,n,i,a=this.chart,r=this.getMeta(),o=r.dataset._model,s=a.chartArea,l=r.data||[];function u(t,e,n){return Math.max(Math.min(t,n),e)}if(o.spanGaps&&(l=l.filter((function(t){return!t._model.skip}))),"monotone"===o.cubicInterpolationMode)B.splineCurveMonotone(l);else for(t=0,e=l.length;t<e;++t)n=l[t]._model,i=B.splineCurve(B.previousItem(l,t)._model,n,B.nextItem(l,t)._model,o.tension),n.controlPointPreviousX=i.previous.x,n.controlPointPreviousY=i.previous.y,n.controlPointNextX=i.next.x,n.controlPointNextY=i.next.y;if(a.options.elements.line.capBezierPoints)for(t=0,e=l.length;t<e;++t)n=l[t]._model,Bt(n,s)&&(t>0&&Bt(l[t-1]._model,s)&&(n.controlPointPreviousX=u(n.controlPointPreviousX,s.left,s.right),n.controlPointPreviousY=u(n.controlPointPreviousY,s.top,s.bottom)),t<l.length-1&&Bt(l[t+1]._model,s)&&(n.controlPointNextX=u(n.controlPointNextX,s.left,s.right),n.controlPointNextY=u(n.controlPointNextY,s.top,s.bottom)))},draw:function(){var t,e=this.chart,n=this.getMeta(),i=n.data||[],a=e.chartArea,r=e.canvas,o=0,s=i.length;for(this._showLine&&(t=n.dataset._model.clip,B.canvas.clipArea(e.ctx,{left:!1===t.left?0:a.left-t.left,right:!1===t.right?r.width:a.right+t.right,top:!1===t.top?0:a.top-t.top,bottom:!1===t.bottom?r.height:a.bottom+t.bottom}),n.dataset.draw(),B.canvas.unclipArea(e.ctx));o<s;++o)i[o].draw(a)},setHoverStyle:function(t){var e=t._model,n=t._options,i=B.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Vt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Vt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Vt(n.hoverBorderWidth,n.borderWidth),e.radius=Vt(n.hoverRadius,n.radius)}}),Zt=B.options.resolve;Y._set("polarArea",{scale:{type:"radialLinear",angleLines:{display:!1},gridLines:{circular:!0},pointLabels:{display:!1},ticks:{beginAtZero:!0}},animation:{animateRotate:!0,animateScale:!0},startAngle:-.5*Math.PI,legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r].hidden=!a.data[r].hidden;o.update()}},tooltips:{callbacks:{title:function(){return""},label:function(t,e){return e.labels[t.index]+": "+t.yLabel}}}});var $t=at.extend({dataElementType:kt.Arc,linkScales:B.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i,a=this,r=a.getDataset(),o=a.getMeta(),s=a.chart.options.startAngle||0,l=a._starts=[],u=a._angles=[],d=o.data;for(a._updateRadius(),o.count=a.countVisibleElements(),e=0,n=r.data.length;e<n;e++)l[e]=s,i=a._computeAngle(e),u[e]=i,s+=i;for(e=0,n=d.length;e<n;++e)d[e]._options=a._resolveDataElementOptions(d[e],e),a.updateElement(d[e],e,t)},_updateRadius:function(){var t=this,e=t.chart,n=e.chartArea,i=e.options,a=Math.min(n.right-n.left,n.bottom-n.top);e.outerRadius=Math.max(a/2,0),e.innerRadius=Math.max(i.cutoutPercentage?e.outerRadius/100*i.cutoutPercentage:1,0),e.radiusLength=(e.outerRadius-e.innerRadius)/e.getVisibleDatasetCount(),t.outerRadius=e.outerRadius-e.radiusLength*t.index,t.innerRadius=t.outerRadius-e.radiusLength},updateElement:function(t,e,n){var i=this,a=i.chart,r=i.getDataset(),o=a.options,s=o.animation,l=a.scale,u=a.data.labels,d=l.xCenter,h=l.yCenter,c=o.startAngle,f=t.hidden?0:l.getDistanceFromCenterForValue(r.data[e]),g=i._starts[e],m=g+(t.hidden?0:i._angles[e]),p=s.animateScale?0:l.getDistanceFromCenterForValue(r.data[e]),v=t._options||{};B.extend(t,{_datasetIndex:i.index,_index:e,_scale:l,_model:{backgroundColor:v.backgroundColor,borderColor:v.borderColor,borderWidth:v.borderWidth,borderAlign:v.borderAlign,x:d,y:h,innerRadius:0,outerRadius:n?p:f,startAngle:n&&s.animateRotate?c:g,endAngle:n&&s.animateRotate?c:m,label:B.valueAtIndexOrDefault(u,e,u[e])}}),t.pivot()},countVisibleElements:function(){var t=this.getDataset(),e=this.getMeta(),n=0;return B.each(e.data,(function(e,i){isNaN(t.data[i])||e.hidden||n++})),n},setHoverStyle:function(t){var e=t._model,n=t._options,i=B.getHoverColor,a=B.valueOrDefault;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=a(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=a(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=a(n.hoverBorderWidth,n.borderWidth)},_computeAngle:function(t){var e=this,n=this.getMeta().count,i=e.getDataset(),a=e.getMeta();if(isNaN(i.data[t])||a.data[t].hidden)return 0;var r={chart:e.chart,dataIndex:t,dataset:i,datasetIndex:e.index};return Zt([e.chart.options.elements.arc.angle,2*Math.PI/n],r,t)}});Y._set("pie",B.clone(Y.doughnut)),Y._set("pie",{cutoutPercentage:0});var Xt=zt,Kt=B.valueOrDefault;Y._set("radar",{spanGaps:!1,scale:{type:"radialLinear"},elements:{line:{fill:"start",tension:0}}});var Jt=at.extend({datasetElementType:kt.Line,dataElementType:kt.Point,linkScales:B.noop,_datasetElementOptions:["backgroundColor","borderWidth","borderColor","borderCapStyle","borderDash","borderDashOffset","borderJoinStyle","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.scale,l=i._config;for(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=s,r._datasetIndex=i.index,r._children=o,r._loop=!0,r._model=i._resolveDatasetElementOptions(r),r.pivot(),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i=this,a=t.custom||{},r=i.getDataset(),o=i.chart.scale,s=o.getPointPositionForValue(e,r.data[e]),l=i._resolveDataElementOptions(t,e),u=i.getMeta().dataset._model,d=n?o.xCenter:s.x,h=n?o.yCenter:s.y;t._scale=o,t._options=l,t._datasetIndex=i.index,t._index=e,t._model={x:d,y:h,skip:a.skip||isNaN(d)||isNaN(h),radius:l.radius,pointStyle:l.pointStyle,rotation:l.rotation,backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,tension:Kt(a.tension,u?u.tension:0),hitRadius:l.hitRadius}},_resolveDatasetElementOptions:function(){var t=this,e=t._config,n=t.chart.options,i=at.prototype._resolveDatasetElementOptions.apply(t,arguments);return i.spanGaps=Kt(e.spanGaps,n.spanGaps),i.tension=Kt(e.lineTension,n.elements.line.tension),i},updateBezierControlPoints:function(){var t,e,n,i,a=this.getMeta(),r=this.chart.chartArea,o=a.data||[];function s(t,e,n){return Math.max(Math.min(t,n),e)}for(a.dataset._model.spanGaps&&(o=o.filter((function(t){return!t._model.skip}))),t=0,e=o.length;t<e;++t)n=o[t]._model,i=B.splineCurve(B.previousItem(o,t,!0)._model,n,B.nextItem(o,t,!0)._model,n.tension),n.controlPointPreviousX=s(i.previous.x,r.left,r.right),n.controlPointPreviousY=s(i.previous.y,r.top,r.bottom),n.controlPointNextX=s(i.next.x,r.left,r.right),n.controlPointNextY=s(i.next.y,r.top,r.bottom)},setHoverStyle:function(t){var e=t._model,n=t._options,i=B.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Kt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Kt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Kt(n.hoverBorderWidth,n.borderWidth),e.radius=Kt(n.hoverRadius,n.radius)}});Y._set("scatter",{hover:{mode:"single"},scales:{xAxes:[{id:"x-axis-1",type:"linear",position:"bottom"}],yAxes:[{id:"y-axis-1",type:"linear",position:"left"}]},tooltips:{callbacks:{title:function(){return""},label:function(t){return"("+t.xLabel+", "+t.yLabel+")"}}}}),Y._set("global",{datasets:{scatter:{showLine:!1}}});var Qt={bar:At,bubble:Lt,doughnut:zt,horizontalBar:Et,line:qt,polarArea:$t,pie:Xt,radar:Jt,scatter:qt};function te(t,e){return t.native?{x:t.x,y:t.y}:B.getRelativePosition(t,e)}function ee(t,e){var n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas();for(i=0,r=l.length;i<r;++i)for(a=0,o=(n=l[i].data).length;a<o;++a)(s=n[a])._view.skip||e(s)}function ne(t,e){var n=[];return ee(t,(function(t){t.inRange(e.x,e.y)&&n.push(t)})),n}function ie(t,e,n,i){var a=Number.POSITIVE_INFINITY,r=[];return ee(t,(function(t){if(!n||t.inRange(e.x,e.y)){var o=t.getCenterPoint(),s=i(e,o);s<a?(r=[t],a=s):s===a&&r.push(t)}})),r}function ae(t){var e=-1!==t.indexOf("x"),n=-1!==t.indexOf("y");return function(t,i){var a=e?Math.abs(t.x-i.x):0,r=n?Math.abs(t.y-i.y):0;return Math.sqrt(Math.pow(a,2)+Math.pow(r,2))}}function re(t,e,n){var i=te(e,t);n.axis=n.axis||"x";var a=ae(n.axis),r=n.intersect?ne(t,i):ie(t,i,!1,a),o=[];return r.length?(t._getSortedVisibleDatasetMetas().forEach((function(t){var e=t.data[r[0]._index];e&&!e._view.skip&&o.push(e)})),o):[]}var oe={modes:{single:function(t,e){var n=te(e,t),i=[];return ee(t,(function(t){if(t.inRange(n.x,n.y))return i.push(t),i})),i.slice(0,1)},label:re,index:re,dataset:function(t,e,n){var i=te(e,t);n.axis=n.axis||"xy";var a=ae(n.axis),r=n.intersect?ne(t,i):ie(t,i,!1,a);return r.length>0&&(r=t.getDatasetMeta(r[0]._datasetIndex).data),r},"x-axis":function(t,e){return re(t,e,{intersect:!1})},point:function(t,e){return ne(t,te(e,t))},nearest:function(t,e,n){var i=te(e,t);n.axis=n.axis||"xy";var a=ae(n.axis);return ie(t,i,n.intersect,a)},x:function(t,e,n){var i=te(e,t),a=[],r=!1;return ee(t,(function(t){t.inXRange(i.x)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a},y:function(t,e,n){var i=te(e,t),a=[],r=!1;return ee(t,(function(t){t.inYRange(i.y)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a}}},se=B.extend;function le(t,e){return B.where(t,(function(t){return t.pos===e}))}function ue(t,e){return t.sort((function(t,n){var i=e?n:t,a=e?t:n;return i.weight===a.weight?i.index-a.index:i.weight-a.weight}))}function de(t,e,n,i){return Math.max(t[n],e[n])+Math.max(t[i],e[i])}function he(t,e,n){var i,a,r=n.box,o=t.maxPadding;if(n.size&&(t[n.pos]-=n.size),n.size=n.horizontal?r.height:r.width,t[n.pos]+=n.size,r.getPadding){var s=r.getPadding();o.top=Math.max(o.top,s.top),o.left=Math.max(o.left,s.left),o.bottom=Math.max(o.bottom,s.bottom),o.right=Math.max(o.right,s.right)}if(i=e.outerWidth-de(o,t,"left","right"),a=e.outerHeight-de(o,t,"top","bottom"),i!==t.w||a!==t.h){t.w=i,t.h=a;var l=n.horizontal?[i,t.w]:[a,t.h];return!(l[0]===l[1]||isNaN(l[0])&&isNaN(l[1]))}}function ce(t,e){var n=e.maxPadding;function i(t){var i={left:0,top:0,right:0,bottom:0};return t.forEach((function(t){i[t]=Math.max(e[t],n[t])})),i}return i(t?["left","right"]:["top","bottom"])}function fe(t,e,n){var i,a,r,o,s,l,u=[];for(i=0,a=t.length;i<a;++i)(o=(r=t[i]).box).update(r.width||e.w,r.height||e.h,ce(r.horizontal,e)),he(e,n,r)&&(l=!0,u.length&&(s=!0)),o.fullWidth||u.push(r);return s&&fe(u,e,n)||l}function ge(t,e,n){var i,a,r,o,s=n.padding,l=e.x,u=e.y;for(i=0,a=t.length;i<a;++i)o=(r=t[i]).box,r.horizontal?(o.left=o.fullWidth?s.left:e.left,o.right=o.fullWidth?n.outerWidth-s.right:e.left+e.w,o.top=u,o.bottom=u+o.height,o.width=o.right-o.left,u=o.bottom):(o.left=l,o.right=l+o.width,o.top=e.top,o.bottom=e.top+e.h,o.height=o.bottom-o.top,l=o.right);e.x=l,e.y=u}Y._set("global",{layout:{padding:{top:0,right:0,bottom:0,left:0}}});var me,pe={defaults:{},addBox:function(t,e){t.boxes||(t.boxes=[]),e.fullWidth=e.fullWidth||!1,e.position=e.position||"top",e.weight=e.weight||0,e._layers=e._layers||function(){return[{z:0,draw:function(){e.draw.apply(e,arguments)}}]},t.boxes.push(e)},removeBox:function(t,e){var n=t.boxes?t.boxes.indexOf(e):-1;-1!==n&&t.boxes.splice(n,1)},configure:function(t,e,n){for(var i,a=["fullWidth","position","weight"],r=a.length,o=0;o<r;++o)i=a[o],n.hasOwnProperty(i)&&(e[i]=n[i])},update:function(t,e,n){if(t){var i=t.options.layout||{},a=B.options.toPadding(i.padding),r=e-a.width,o=n-a.height,s=function(t){var e=function(t){var e,n,i,a=[];for(e=0,n=(t||[]).length;e<n;++e)i=t[e],a.push({index:e,box:i,pos:i.position,horizontal:i.isHorizontal(),weight:i.weight});return a}(t),n=ue(le(e,"left"),!0),i=ue(le(e,"right")),a=ue(le(e,"top"),!0),r=ue(le(e,"bottom"));return{leftAndTop:n.concat(a),rightAndBottom:i.concat(r),chartArea:le(e,"chartArea"),vertical:n.concat(i),horizontal:a.concat(r)}}(t.boxes),l=s.vertical,u=s.horizontal,d=Object.freeze({outerWidth:e,outerHeight:n,padding:a,availableWidth:r,vBoxMaxWidth:r/2/l.length,hBoxMaxHeight:o/2}),h=se({maxPadding:se({},a),w:r,h:o,x:a.left,y:a.top},a);!function(t,e){var n,i,a;for(n=0,i=t.length;n<i;++n)(a=t[n]).width=a.horizontal?a.box.fullWidth&&e.availableWidth:e.vBoxMaxWidth,a.height=a.horizontal&&e.hBoxMaxHeight}(l.concat(u),d),fe(l,h,d),fe(u,h,d)&&fe(l,h,d),function(t){var e=t.maxPadding;function n(n){var i=Math.max(e[n]-t[n],0);return t[n]+=i,i}t.y+=n("top"),t.x+=n("left"),n("right"),n("bottom")}(h),ge(s.leftAndTop,h,d),h.x+=h.w,h.y+=h.h,ge(s.rightAndBottom,h,d),t.chartArea={left:h.left,top:h.top,right:h.left+h.w,bottom:h.top+h.h},B.each(s.chartArea,(function(e){var n=e.box;se(n,t.chartArea),n.update(h.w,h.h)}))}}},ve=(me=Object.freeze({__proto__:null,default:"@keyframes chartjs-render-animation{from{opacity:.99}to{opacity:1}}.chartjs-render-monitor{animation:chartjs-render-animation 1ms}.chartjs-size-monitor,.chartjs-size-monitor-expand,.chartjs-size-monitor-shrink{position:absolute;direction:ltr;left:0;top:0;right:0;bottom:0;overflow:hidden;pointer-events:none;visibility:hidden;z-index:-1}.chartjs-size-monitor-expand>div{position:absolute;width:1000000px;height:1000000px;left:0;top:0}.chartjs-size-monitor-shrink>div{position:absolute;width:200%;height:200%;left:0;top:0}"}))&&me.default||me,be="$chartjs",ye="chartjs-size-monitor",xe="chartjs-render-monitor",_e="chartjs-render-animation",we=["animationstart","webkitAnimationStart"],ke={touchstart:"mousedown",touchmove:"mousemove",touchend:"mouseup",pointerenter:"mouseenter",pointerdown:"mousedown",pointermove:"mousemove",pointerup:"mouseup",pointerleave:"mouseout",pointerout:"mouseout"};function Me(t,e){var n=B.getStyle(t,e),i=n&&n.match(/^(\d+)(\.\d+)?px$/);return i?Number(i[1]):void 0}var Se=!!function(){var t=!1;try{var e=Object.defineProperty({},"passive",{get:function(){t=!0}});window.addEventListener("e",null,e)}catch(t){}return t}()&&{passive:!0};function De(t,e,n){t.addEventListener(e,n,Se)}function Ce(t,e,n){t.removeEventListener(e,n,Se)}function Pe(t,e,n,i,a){return{type:t,chart:e,native:a||null,x:void 0!==n?n:null,y:void 0!==i?i:null}}function Te(t){var e=document.createElement("div");return e.className=t||"",e}function Oe(t,e,n){var i,a,r,o,s=t[be]||(t[be]={}),l=s.resizer=function(t){var e=Te(ye),n=Te(ye+"-expand"),i=Te(ye+"-shrink");n.appendChild(Te()),i.appendChild(Te()),e.appendChild(n),e.appendChild(i),e._reset=function(){n.scrollLeft=1e6,n.scrollTop=1e6,i.scrollLeft=1e6,i.scrollTop=1e6};var a=function(){e._reset(),t()};return De(n,"scroll",a.bind(n,"expand")),De(i,"scroll",a.bind(i,"shrink")),e}((i=function(){if(s.resizer){var i=n.options.maintainAspectRatio&&t.parentNode,a=i?i.clientWidth:0;e(Pe("resize",n)),i&&i.clientWidth<a&&n.canvas&&e(Pe("resize",n))}},r=!1,o=[],function(){o=Array.prototype.slice.call(arguments),a=a||this,r||(r=!0,B.requestAnimFrame.call(window,(function(){r=!1,i.apply(a,o)})))}));!function(t,e){var n=t[be]||(t[be]={}),i=n.renderProxy=function(t){t.animationName===_e&&e()};B.each(we,(function(e){De(t,e,i)})),n.reflow=!!t.offsetParent,t.classList.add(xe)}(t,(function(){if(s.resizer){var e=t.parentNode;e&&e!==l.parentNode&&e.insertBefore(l,e.firstChild),l._reset()}}))}function Ae(t){var e=t[be]||{},n=e.resizer;delete e.resizer,function(t){var e=t[be]||{},n=e.renderProxy;n&&(B.each(we,(function(e){Ce(t,e,n)})),delete e.renderProxy),t.classList.remove(xe)}(t),n&&n.parentNode&&n.parentNode.removeChild(n)}var Fe={disableCSSInjection:!1,_enabled:"undefined"!=typeof window&&"undefined"!=typeof document,_ensureLoaded:function(t){if(!this.disableCSSInjection){var e=t.getRootNode?t.getRootNode():document;!function(t,e){var n=t[be]||(t[be]={});if(!n.containsStyles){n.containsStyles=!0,e="/* Chart.js */\n"+e;var i=document.createElement("style");i.setAttribute("type","text/css"),i.appendChild(document.createTextNode(e)),t.appendChild(i)}}(e.host?e:document.head,ve)}},acquireContext:function(t,e){"string"==typeof t?t=document.getElementById(t):t.length&&(t=t[0]),t&&t.canvas&&(t=t.canvas);var n=t&&t.getContext&&t.getContext("2d");return n&&n.canvas===t?(this._ensureLoaded(t),function(t,e){var n=t.style,i=t.getAttribute("height"),a=t.getAttribute("width");if(t[be]={initial:{height:i,width:a,style:{display:n.display,height:n.height,width:n.width}}},n.display=n.display||"block",null===a||""===a){var r=Me(t,"width");void 0!==r&&(t.width=r)}if(null===i||""===i)if(""===t.style.height)t.height=t.width/(e.options.aspectRatio||2);else{var o=Me(t,"height");void 0!==r&&(t.height=o)}}(t,e),n):null},releaseContext:function(t){var e=t.canvas;if(e[be]){var n=e[be].initial;["height","width"].forEach((function(t){var i=n[t];B.isNullOrUndef(i)?e.removeAttribute(t):e.setAttribute(t,i)})),B.each(n.style||{},(function(t,n){e.style[n]=t})),e.width=e.width,delete e[be]}},addEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=n[be]||(n[be]={});De(i,e,(a.proxies||(a.proxies={}))[t.id+"_"+e]=function(e){n(function(t,e){var n=ke[t.type]||t.type,i=B.getRelativePosition(t,e);return Pe(n,e,i.x,i.y,t)}(e,t))})}else Oe(i,n,t)},removeEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=((n[be]||{}).proxies||{})[t.id+"_"+e];a&&Ce(i,e,a)}else Ae(i)}};B.addEvent=De,B.removeEvent=Ce;var Ie=Fe._enabled?Fe:{acquireContext:function(t){return t&&t.canvas&&(t=t.canvas),t&&t.getContext("2d")||null}},Le=B.extend({initialize:function(){},acquireContext:function(){},releaseContext:function(){},addEventListener:function(){},removeEventListener:function(){}},Ie);Y._set("global",{plugins:{}});var Re={_plugins:[],_cacheId:0,register:function(t){var e=this._plugins;[].concat(t).forEach((function(t){-1===e.indexOf(t)&&e.push(t)})),this._cacheId++},unregister:function(t){var e=this._plugins;[].concat(t).forEach((function(t){var n=e.indexOf(t);-1!==n&&e.splice(n,1)})),this._cacheId++},clear:function(){this._plugins=[],this._cacheId++},count:function(){return this._plugins.length},getAll:function(){return this._plugins},notify:function(t,e,n){var i,a,r,o,s,l=this.descriptors(t),u=l.length;for(i=0;i<u;++i)if("function"==typeof(s=(r=(a=l[i]).plugin)[e])&&((o=[t].concat(n||[])).push(a.options),!1===s.apply(r,o)))return!1;return!0},descriptors:function(t){var e=t.$plugins||(t.$plugins={});if(e.id===this._cacheId)return e.descriptors;var n=[],i=[],a=t&&t.config||{},r=a.options&&a.options.plugins||{};return this._plugins.concat(a.plugins||[]).forEach((function(t){if(-1===n.indexOf(t)){var e=t.id,a=r[e];!1!==a&&(!0===a&&(a=B.clone(Y.global.plugins[e])),n.push(t),i.push({plugin:t,options:a||{}}))}})),e.descriptors=i,e.id=this._cacheId,i},_invalidate:function(t){delete t.$plugins}},Ne={constructors:{},defaults:{},registerScaleType:function(t,e,n){this.constructors[t]=e,this.defaults[t]=B.clone(n)},getScaleConstructor:function(t){return this.constructors.hasOwnProperty(t)?this.constructors[t]:void 0},getScaleDefaults:function(t){return this.defaults.hasOwnProperty(t)?B.merge(Object.create(null),[Y.scale,this.defaults[t]]):{}},updateScaleDefaults:function(t,e){this.defaults.hasOwnProperty(t)&&(this.defaults[t]=B.extend(this.defaults[t],e))},addScalesToLayout:function(t){B.each(t.scales,(function(e){e.fullWidth=e.options.fullWidth,e.position=e.options.position,e.weight=e.options.weight,pe.addBox(t,e)}))}},We=B.valueOrDefault,Ye=B.rtl.getRtlAdapter;Y._set("global",{tooltips:{enabled:!0,custom:null,mode:"nearest",position:"average",intersect:!0,backgroundColor:"rgba(0,0,0,0.8)",titleFontStyle:"bold",titleSpacing:2,titleMarginBottom:6,titleFontColor:"#fff",titleAlign:"left",bodySpacing:2,bodyFontColor:"#fff",bodyAlign:"left",footerFontStyle:"bold",footerSpacing:2,footerMarginTop:6,footerFontColor:"#fff",footerAlign:"left",yPadding:6,xPadding:6,caretPadding:2,caretSize:5,cornerRadius:6,multiKeyBackground:"#fff",displayColors:!0,borderColor:"rgba(0,0,0,0)",borderWidth:0,callbacks:{beforeTitle:B.noop,title:function(t,e){var n="",i=e.labels,a=i?i.length:0;if(t.length>0){var r=t[0];r.label?n=r.label:r.xLabel?n=r.xLabel:a>0&&r.index<a&&(n=i[r.index])}return n},afterTitle:B.noop,beforeBody:B.noop,beforeLabel:B.noop,label:function(t,e){var n=e.datasets[t.datasetIndex].label||"";return n&&(n+=": "),B.isNullOrUndef(t.value)?n+=t.yLabel:n+=t.value,n},labelColor:function(t,e){var n=e.getDatasetMeta(t.datasetIndex).data[t.index]._view;return{borderColor:n.borderColor,backgroundColor:n.backgroundColor}},labelTextColor:function(){return this._options.bodyFontColor},afterLabel:B.noop,afterBody:B.noop,beforeFooter:B.noop,footer:B.noop,afterFooter:B.noop}}});var ze={average:function(t){if(!t.length)return!1;var e,n,i=0,a=0,r=0;for(e=0,n=t.length;e<n;++e){var o=t[e];if(o&&o.hasValue()){var s=o.tooltipPosition();i+=s.x,a+=s.y,++r}}return{x:i/r,y:a/r}},nearest:function(t,e){var n,i,a,r=e.x,o=e.y,s=Number.POSITIVE_INFINITY;for(n=0,i=t.length;n<i;++n){var l=t[n];if(l&&l.hasValue()){var u=l.getCenterPoint(),d=B.distanceBetweenPoints(e,u);d<s&&(s=d,a=l)}}if(a){var h=a.tooltipPosition();r=h.x,o=h.y}return{x:r,y:o}}};function Ee(t,e){return e&&(B.isArray(e)?Array.prototype.push.apply(t,e):t.push(e)),t}function Ve(t){return("string"==typeof t||t instanceof String)&&t.indexOf("\n")>-1?t.split("\n"):t}function He(t){var e=Y.global;return{xPadding:t.xPadding,yPadding:t.yPadding,xAlign:t.xAlign,yAlign:t.yAlign,rtl:t.rtl,textDirection:t.textDirection,bodyFontColor:t.bodyFontColor,_bodyFontFamily:We(t.bodyFontFamily,e.defaultFontFamily),_bodyFontStyle:We(t.bodyFontStyle,e.defaultFontStyle),_bodyAlign:t.bodyAlign,bodyFontSize:We(t.bodyFontSize,e.defaultFontSize),bodySpacing:t.bodySpacing,titleFontColor:t.titleFontColor,_titleFontFamily:We(t.titleFontFamily,e.defaultFontFamily),_titleFontStyle:We(t.titleFontStyle,e.defaultFontStyle),titleFontSize:We(t.titleFontSize,e.defaultFontSize),_titleAlign:t.titleAlign,titleSpacing:t.titleSpacing,titleMarginBottom:t.titleMarginBottom,footerFontColor:t.footerFontColor,_footerFontFamily:We(t.footerFontFamily,e.defaultFontFamily),_footerFontStyle:We(t.footerFontStyle,e.defaultFontStyle),footerFontSize:We(t.footerFontSize,e.defaultFontSize),_footerAlign:t.footerAlign,footerSpacing:t.footerSpacing,footerMarginTop:t.footerMarginTop,caretSize:t.caretSize,cornerRadius:t.cornerRadius,backgroundColor:t.backgroundColor,opacity:0,legendColorBackground:t.multiKeyBackground,displayColors:t.displayColors,borderColor:t.borderColor,borderWidth:t.borderWidth}}function Be(t,e){return"center"===e?t.x+t.width/2:"right"===e?t.x+t.width-t.xPadding:t.x+t.xPadding}function je(t){return Ee([],Ve(t))}var Ue=X.extend({initialize:function(){this._model=He(this._options),this._lastActive=[]},getTitle:function(){var t=this,e=t._options,n=e.callbacks,i=n.beforeTitle.apply(t,arguments),a=n.title.apply(t,arguments),r=n.afterTitle.apply(t,arguments),o=[];return o=Ee(o,Ve(i)),o=Ee(o,Ve(a)),o=Ee(o,Ve(r))},getBeforeBody:function(){return je(this._options.callbacks.beforeBody.apply(this,arguments))},getBody:function(t,e){var n=this,i=n._options.callbacks,a=[];return B.each(t,(function(t){var r={before:[],lines:[],after:[]};Ee(r.before,Ve(i.beforeLabel.call(n,t,e))),Ee(r.lines,i.label.call(n,t,e)),Ee(r.after,Ve(i.afterLabel.call(n,t,e))),a.push(r)})),a},getAfterBody:function(){return je(this._options.callbacks.afterBody.apply(this,arguments))},getFooter:function(){var t=this,e=t._options.callbacks,n=e.beforeFooter.apply(t,arguments),i=e.footer.apply(t,arguments),a=e.afterFooter.apply(t,arguments),r=[];return r=Ee(r,Ve(n)),r=Ee(r,Ve(i)),r=Ee(r,Ve(a))},update:function(t){var e,n,i,a,r,o,s,l,u,d,h=this,c=h._options,f=h._model,g=h._model=He(c),m=h._active,p=h._data,v={xAlign:f.xAlign,yAlign:f.yAlign},b={x:f.x,y:f.y},y={width:f.width,height:f.height},x={x:f.caretX,y:f.caretY};if(m.length){g.opacity=1;var _=[],w=[];x=ze[c.position].call(h,m,h._eventPosition);var k=[];for(e=0,n=m.length;e<n;++e)k.push((i=m[e],a=void 0,r=void 0,o=void 0,s=void 0,l=void 0,u=void 0,d=void 0,a=i._xScale,r=i._yScale||i._scale,o=i._index,s=i._datasetIndex,l=i._chart.getDatasetMeta(s).controller,u=l._getIndexScale(),d=l._getValueScale(),{xLabel:a?a.getLabelForIndex(o,s):"",yLabel:r?r.getLabelForIndex(o,s):"",label:u?""+u.getLabelForIndex(o,s):"",value:d?""+d.getLabelForIndex(o,s):"",index:o,datasetIndex:s,x:i._model.x,y:i._model.y}));c.filter&&(k=k.filter((function(t){return c.filter(t,p)}))),c.itemSort&&(k=k.sort((function(t,e){return c.itemSort(t,e,p)}))),B.each(k,(function(t){_.push(c.callbacks.labelColor.call(h,t,h._chart)),w.push(c.callbacks.labelTextColor.call(h,t,h._chart))})),g.title=h.getTitle(k,p),g.beforeBody=h.getBeforeBody(k,p),g.body=h.getBody(k,p),g.afterBody=h.getAfterBody(k,p),g.footer=h.getFooter(k,p),g.x=x.x,g.y=x.y,g.caretPadding=c.caretPadding,g.labelColors=_,g.labelTextColors=w,g.dataPoints=k,y=function(t,e){var n=t._chart.ctx,i=2*e.yPadding,a=0,r=e.body,o=r.reduce((function(t,e){return t+e.before.length+e.lines.length+e.after.length}),0);o+=e.beforeBody.length+e.afterBody.length;var s=e.title.length,l=e.footer.length,u=e.titleFontSize,d=e.bodyFontSize,h=e.footerFontSize;i+=s*u,i+=s?(s-1)*e.titleSpacing:0,i+=s?e.titleMarginBottom:0,i+=o*d,i+=o?(o-1)*e.bodySpacing:0,i+=l?e.footerMarginTop:0,i+=l*h,i+=l?(l-1)*e.footerSpacing:0;var c=0,f=function(t){a=Math.max(a,n.measureText(t).width+c)};return n.font=B.fontString(u,e._titleFontStyle,e._titleFontFamily),B.each(e.title,f),n.font=B.fontString(d,e._bodyFontStyle,e._bodyFontFamily),B.each(e.beforeBody.concat(e.afterBody),f),c=e.displayColors?d+2:0,B.each(r,(function(t){B.each(t.before,f),B.each(t.lines,f),B.each(t.after,f)})),c=0,n.font=B.fontString(h,e._footerFontStyle,e._footerFontFamily),B.each(e.footer,f),{width:a+=2*e.xPadding,height:i}}(this,g),b=function(t,e,n,i){var a=t.x,r=t.y,o=t.caretSize,s=t.caretPadding,l=t.cornerRadius,u=n.xAlign,d=n.yAlign,h=o+s,c=l+s;return"right"===u?a-=e.width:"center"===u&&((a-=e.width/2)+e.width>i.width&&(a=i.width-e.width),a<0&&(a=0)),"top"===d?r+=h:r-="bottom"===d?e.height+h:e.height/2,"center"===d?"left"===u?a+=h:"right"===u&&(a-=h):"left"===u?a-=c:"right"===u&&(a+=c),{x:a,y:r}}(g,y,v=function(t,e){var n,i,a,r,o,s=t._model,l=t._chart,u=t._chart.chartArea,d="center",h="center";s.y<e.height?h="top":s.y>l.height-e.height&&(h="bottom");var c=(u.left+u.right)/2,f=(u.top+u.bottom)/2;"center"===h?(n=function(t){return t<=c},i=function(t){return t>c}):(n=function(t){return t<=e.width/2},i=function(t){return t>=l.width-e.width/2}),a=function(t){return t+e.width+s.caretSize+s.caretPadding>l.width},r=function(t){return t-e.width-s.caretSize-s.caretPadding<0},o=function(t){return t<=f?"top":"bottom"},n(s.x)?(d="left",a(s.x)&&(d="center",h=o(s.y))):i(s.x)&&(d="right",r(s.x)&&(d="center",h=o(s.y)));var g=t._options;return{xAlign:g.xAlign?g.xAlign:d,yAlign:g.yAlign?g.yAlign:h}}(this,y),h._chart)}else g.opacity=0;return g.xAlign=v.xAlign,g.yAlign=v.yAlign,g.x=b.x,g.y=b.y,g.width=y.width,g.height=y.height,g.caretX=x.x,g.caretY=x.y,h._model=g,t&&c.custom&&c.custom.call(h,g),h},drawCaret:function(t,e){var n=this._chart.ctx,i=this._view,a=this.getCaretPosition(t,e,i);n.lineTo(a.x1,a.y1),n.lineTo(a.x2,a.y2),n.lineTo(a.x3,a.y3)},getCaretPosition:function(t,e,n){var i,a,r,o,s,l,u=n.caretSize,d=n.cornerRadius,h=n.xAlign,c=n.yAlign,f=t.x,g=t.y,m=e.width,p=e.height;if("center"===c)s=g+p/2,"left"===h?(a=(i=f)-u,r=i,o=s+u,l=s-u):(a=(i=f+m)+u,r=i,o=s-u,l=s+u);else if("left"===h?(i=(a=f+d+u)-u,r=a+u):"right"===h?(i=(a=f+m-d-u)-u,r=a+u):(i=(a=n.caretX)-u,r=a+u),"top"===c)s=(o=g)-u,l=o;else{s=(o=g+p)+u,l=o;var v=r;r=i,i=v}return{x1:i,x2:a,x3:r,y1:o,y2:s,y3:l}},drawTitle:function(t,e,n){var i,a,r,o=e.title,s=o.length;if(s){var l=Ye(e.rtl,e.x,e.width);for(t.x=Be(e,e._titleAlign),n.textAlign=l.textAlign(e._titleAlign),n.textBaseline="middle",i=e.titleFontSize,a=e.titleSpacing,n.fillStyle=e.titleFontColor,n.font=B.fontString(i,e._titleFontStyle,e._titleFontFamily),r=0;r<s;++r)n.fillText(o[r],l.x(t.x),t.y+i/2),t.y+=i+a,r+1===s&&(t.y+=e.titleMarginBottom-a)}},drawBody:function(t,e,n){var i,a,r,o,s,l,u,d,h=e.bodyFontSize,c=e.bodySpacing,f=e._bodyAlign,g=e.body,m=e.displayColors,p=0,v=m?Be(e,"left"):0,b=Ye(e.rtl,e.x,e.width),y=function(e){n.fillText(e,b.x(t.x+p),t.y+h/2),t.y+=h+c},x=b.textAlign(f);for(n.textAlign=f,n.textBaseline="middle",n.font=B.fontString(h,e._bodyFontStyle,e._bodyFontFamily),t.x=Be(e,x),n.fillStyle=e.bodyFontColor,B.each(e.beforeBody,y),p=m&&"right"!==x?"center"===f?h/2+1:h+2:0,s=0,u=g.length;s<u;++s){for(i=g[s],a=e.labelTextColors[s],r=e.labelColors[s],n.fillStyle=a,B.each(i.before,y),l=0,d=(o=i.lines).length;l<d;++l){if(m){var _=b.x(v);n.fillStyle=e.legendColorBackground,n.fillRect(b.leftForLtr(_,h),t.y,h,h),n.lineWidth=1,n.strokeStyle=r.borderColor,n.strokeRect(b.leftForLtr(_,h),t.y,h,h),n.fillStyle=r.backgroundColor,n.fillRect(b.leftForLtr(b.xPlus(_,1),h-2),t.y+1,h-2,h-2),n.fillStyle=a}y(o[l])}B.each(i.after,y)}p=0,B.each(e.afterBody,y),t.y-=c},drawFooter:function(t,e,n){var i,a,r=e.footer,o=r.length;if(o){var s=Ye(e.rtl,e.x,e.width);for(t.x=Be(e,e._footerAlign),t.y+=e.footerMarginTop,n.textAlign=s.textAlign(e._footerAlign),n.textBaseline="middle",i=e.footerFontSize,n.fillStyle=e.footerFontColor,n.font=B.fontString(i,e._footerFontStyle,e._footerFontFamily),a=0;a<o;++a)n.fillText(r[a],s.x(t.x),t.y+i/2),t.y+=i+e.footerSpacing}},drawBackground:function(t,e,n,i){n.fillStyle=e.backgroundColor,n.strokeStyle=e.borderColor,n.lineWidth=e.borderWidth;var a=e.xAlign,r=e.yAlign,o=t.x,s=t.y,l=i.width,u=i.height,d=e.cornerRadius;n.beginPath(),n.moveTo(o+d,s),"top"===r&&this.drawCaret(t,i),n.lineTo(o+l-d,s),n.quadraticCurveTo(o+l,s,o+l,s+d),"center"===r&&"right"===a&&this.drawCaret(t,i),n.lineTo(o+l,s+u-d),n.quadraticCurveTo(o+l,s+u,o+l-d,s+u),"bottom"===r&&this.drawCaret(t,i),n.lineTo(o+d,s+u),n.quadraticCurveTo(o,s+u,o,s+u-d),"center"===r&&"left"===a&&this.drawCaret(t,i),n.lineTo(o,s+d),n.quadraticCurveTo(o,s,o+d,s),n.closePath(),n.fill(),e.borderWidth>0&&n.stroke()},draw:function(){var t=this._chart.ctx,e=this._view;if(0!==e.opacity){var n={width:e.width,height:e.height},i={x:e.x,y:e.y},a=Math.abs(e.opacity<.001)?0:e.opacity,r=e.title.length||e.beforeBody.length||e.body.length||e.afterBody.length||e.footer.length;this._options.enabled&&r&&(t.save(),t.globalAlpha=a,this.drawBackground(i,e,t,n),i.y+=e.yPadding,B.rtl.overrideTextDirection(t,e.textDirection),this.drawTitle(i,e,t),this.drawBody(i,e,t),this.drawFooter(i,e,t),B.rtl.restoreTextDirection(t,e.textDirection),t.restore())}},handleEvent:function(t){var e,n=this,i=n._options;return n._lastActive=n._lastActive||[],"mouseout"===t.type?n._active=[]:(n._active=n._chart.getElementsAtEventForMode(t,i.mode,i),i.reverse&&n._active.reverse()),(e=!B.arrayEquals(n._active,n._lastActive))&&(n._lastActive=n._active,(i.enabled||i.custom)&&(n._eventPosition={x:t.x,y:t.y},n.update(!0),n.pivot())),e}}),Ge=ze,qe=Ue;qe.positioners=Ge;var Ze=B.valueOrDefault;function $e(){return B.merge(Object.create(null),[].slice.call(arguments),{merger:function(t,e,n,i){if("xAxes"===t||"yAxes"===t){var a,r,o,s=n[t].length;for(e[t]||(e[t]=[]),a=0;a<s;++a)o=n[t][a],r=Ze(o.type,"xAxes"===t?"category":"linear"),a>=e[t].length&&e[t].push({}),!e[t][a].type||o.type&&o.type!==e[t][a].type?B.merge(e[t][a],[Ne.getScaleDefaults(r),o]):B.merge(e[t][a],o)}else B._merger(t,e,n,i)}})}function Xe(){return B.merge(Object.create(null),[].slice.call(arguments),{merger:function(t,e,n,i){var a=e[t]||Object.create(null),r=n[t];"scales"===t?e[t]=$e(a,r):"scale"===t?e[t]=B.merge(a,[Ne.getScaleDefaults(r.type),r]):B._merger(t,e,n,i)}})}function Ke(t){var e=t.options;B.each(t.scales,(function(e){pe.removeBox(t,e)})),e=Xe(Y.global,Y[t.config.type],e),t.options=t.config.options=e,t.ensureScalesHaveIDs(),t.buildOrUpdateScales(),t.tooltip._options=e.tooltips,t.tooltip.initialize()}function Je(t,e,n){var i,a=function(t){return t.id===i};do{i=e+n++}while(B.findIndex(t,a)>=0);return i}function Qe(t){return"top"===t||"bottom"===t}function tn(t,e){return function(n,i){return n[t]===i[t]?n[e]-i[e]:n[t]-i[t]}}Y._set("global",{elements:{},events:["mousemove","mouseout","click","touchstart","touchmove"],hover:{onHover:null,mode:"nearest",intersect:!0,animationDuration:400},onClick:null,maintainAspectRatio:!0,responsive:!0,responsiveAnimationDuration:0});var en=function(t,e){return this.construct(t,e),this};B.extend(en.prototype,{construct:function(t,e){var n=this;e=function(t){var e=(t=t||Object.create(null)).data=t.data||{};return e.datasets=e.datasets||[],e.labels=e.labels||[],t.options=Xe(Y.global,Y[t.type],t.options||{}),t}(e);var i=Le.acquireContext(t,e),a=i&&i.canvas,r=a&&a.height,o=a&&a.width;n.id=B.uid(),n.ctx=i,n.canvas=a,n.config=e,n.width=o,n.height=r,n.aspectRatio=r?o/r:null,n.options=e.options,n._bufferedRender=!1,n._layers=[],n.chart=n,n.controller=n,en.instances[n.id]=n,Object.defineProperty(n,"data",{get:function(){return n.config.data},set:function(t){n.config.data=t}}),i&&a?(n.initialize(),n.update()):console.error("Failed to create chart: can't acquire context from the given item")},initialize:function(){var t=this;return Re.notify(t,"beforeInit"),B.retinaScale(t,t.options.devicePixelRatio),t.bindEvents(),t.options.responsive&&t.resize(!0),t.initToolTip(),Re.notify(t,"afterInit"),t},clear:function(){return B.canvas.clear(this),this},stop:function(){return Q.cancelAnimation(this),this},resize:function(t){var e=this,n=e.options,i=e.canvas,a=n.maintainAspectRatio&&e.aspectRatio||null,r=Math.max(0,Math.floor(B.getMaximumWidth(i))),o=Math.max(0,Math.floor(a?r/a:B.getMaximumHeight(i)));if((e.width!==r||e.height!==o)&&(i.width=e.width=r,i.height=e.height=o,i.style.width=r+"px",i.style.height=o+"px",B.retinaScale(e,n.devicePixelRatio),!t)){var s={width:r,height:o};Re.notify(e,"resize",[s]),n.onResize&&n.onResize(e,s),e.stop(),e.update({duration:n.responsiveAnimationDuration})}},ensureScalesHaveIDs:function(){var t=this.options,e=t.scales||{},n=t.scale;B.each(e.xAxes,(function(t,n){t.id||(t.id=Je(e.xAxes,"x-axis-",n))})),B.each(e.yAxes,(function(t,n){t.id||(t.id=Je(e.yAxes,"y-axis-",n))})),n&&(n.id=n.id||"scale")},buildOrUpdateScales:function(){var t=this,e=t.options,n=t.scales||{},i=[],a=Object.keys(n).reduce((function(t,e){return t[e]=!1,t}),{});e.scales&&(i=i.concat((e.scales.xAxes||[]).map((function(t){return{options:t,dtype:"category",dposition:"bottom"}})),(e.scales.yAxes||[]).map((function(t){return{options:t,dtype:"linear",dposition:"left"}})))),e.scale&&i.push({options:e.scale,dtype:"radialLinear",isDefault:!0,dposition:"chartArea"}),B.each(i,(function(e){var i=e.options,r=i.id,o=Ze(i.type,e.dtype);Qe(i.position)!==Qe(e.dposition)&&(i.position=e.dposition),a[r]=!0;var s=null;if(r in n&&n[r].type===o)(s=n[r]).options=i,s.ctx=t.ctx,s.chart=t;else{var l=Ne.getScaleConstructor(o);if(!l)return;s=new l({id:r,type:o,options:i,ctx:t.ctx,chart:t}),n[s.id]=s}s.mergeTicksOptions(),e.isDefault&&(t.scale=s)})),B.each(a,(function(t,e){t||delete n[e]})),t.scales=n,Ne.addScalesToLayout(this)},buildOrUpdateControllers:function(){var t,e,n=this,i=[],a=n.data.datasets;for(t=0,e=a.length;t<e;t++){var r=a[t],o=n.getDatasetMeta(t),s=r.type||n.config.type;if(o.type&&o.type!==s&&(n.destroyDatasetMeta(t),o=n.getDatasetMeta(t)),o.type=s,o.order=r.order||0,o.index=t,o.controller)o.controller.updateIndex(t),o.controller.linkScales();else{var l=Qt[o.type];if(void 0===l)throw new Error('"'+o.type+'" is not a chart type.');o.controller=new l(n,t),i.push(o.controller)}}return i},resetElements:function(){var t=this;B.each(t.data.datasets,(function(e,n){t.getDatasetMeta(n).controller.reset()}),t)},reset:function(){this.resetElements(),this.tooltip.initialize()},update:function(t){var e,n,i=this;if(t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]}),Ke(i),Re._invalidate(i),!1!==Re.notify(i,"beforeUpdate")){i.tooltip._data=i.data;var a=i.buildOrUpdateControllers();for(e=0,n=i.data.datasets.length;e<n;e++)i.getDatasetMeta(e).controller.buildOrUpdateElements();i.updateLayout(),i.options.animation&&i.options.animation.duration&&B.each(a,(function(t){t.reset()})),i.updateDatasets(),i.tooltip.initialize(),i.lastActive=[],Re.notify(i,"afterUpdate"),i._layers.sort(tn("z","_idx")),i._bufferedRender?i._bufferedRequest={duration:t.duration,easing:t.easing,lazy:t.lazy}:i.render(t)}},updateLayout:function(){var t=this;!1!==Re.notify(t,"beforeLayout")&&(pe.update(this,this.width,this.height),t._layers=[],B.each(t.boxes,(function(e){e._configure&&e._configure(),t._layers.push.apply(t._layers,e._layers())}),t),t._layers.forEach((function(t,e){t._idx=e})),Re.notify(t,"afterScaleUpdate"),Re.notify(t,"afterLayout"))},updateDatasets:function(){if(!1!==Re.notify(this,"beforeDatasetsUpdate")){for(var t=0,e=this.data.datasets.length;t<e;++t)this.updateDataset(t);Re.notify(this,"afterDatasetsUpdate")}},updateDataset:function(t){var e=this.getDatasetMeta(t),n={meta:e,index:t};!1!==Re.notify(this,"beforeDatasetUpdate",[n])&&(e.controller._update(),Re.notify(this,"afterDatasetUpdate",[n]))},render:function(t){var e=this;t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]});var n=e.options.animation,i=Ze(t.duration,n&&n.duration),a=t.lazy;if(!1!==Re.notify(e,"beforeRender")){var r=function(t){Re.notify(e,"afterRender"),B.callback(n&&n.onComplete,[t],e)};if(n&&i){var o=new J({numSteps:i/16.66,easing:t.easing||n.easing,render:function(t,e){var n=B.easing.effects[e.easing],i=e.currentStep,a=i/e.numSteps;t.draw(n(a),a,i)},onAnimationProgress:n.onProgress,onAnimationComplete:r});Q.addAnimation(e,o,i,a)}else e.draw(),r(new J({numSteps:0,chart:e}));return e}},draw:function(t){var e,n,i=this;if(i.clear(),B.isNullOrUndef(t)&&(t=1),i.transition(t),!(i.width<=0||i.height<=0)&&!1!==Re.notify(i,"beforeDraw",[t])){for(n=i._layers,e=0;e<n.length&&n[e].z<=0;++e)n[e].draw(i.chartArea);for(i.drawDatasets(t);e<n.length;++e)n[e].draw(i.chartArea);i._drawTooltip(t),Re.notify(i,"afterDraw",[t])}},transition:function(t){for(var e=0,n=(this.data.datasets||[]).length;e<n;++e)this.isDatasetVisible(e)&&this.getDatasetMeta(e).controller.transition(t);this.tooltip.transition(t)},_getSortedDatasetMetas:function(t){var e,n,i=[];for(e=0,n=(this.data.datasets||[]).length;e<n;++e)t&&!this.isDatasetVisible(e)||i.push(this.getDatasetMeta(e));return i.sort(tn("order","index")),i},_getSortedVisibleDatasetMetas:function(){return this._getSortedDatasetMetas(!0)},drawDatasets:function(t){var e,n;if(!1!==Re.notify(this,"beforeDatasetsDraw",[t])){for(n=(e=this._getSortedVisibleDatasetMetas()).length-1;n>=0;--n)this.drawDataset(e[n],t);Re.notify(this,"afterDatasetsDraw",[t])}},drawDataset:function(t,e){var n={meta:t,index:t.index,easingValue:e};!1!==Re.notify(this,"beforeDatasetDraw",[n])&&(t.controller.draw(e),Re.notify(this,"afterDatasetDraw",[n]))},_drawTooltip:function(t){var e=this.tooltip,n={tooltip:e,easingValue:t};!1!==Re.notify(this,"beforeTooltipDraw",[n])&&(e.draw(),Re.notify(this,"afterTooltipDraw",[n]))},getElementAtEvent:function(t){return oe.modes.single(this,t)},getElementsAtEvent:function(t){return oe.modes.label(this,t,{intersect:!0})},getElementsAtXAxis:function(t){return oe.modes["x-axis"](this,t,{intersect:!0})},getElementsAtEventForMode:function(t,e,n){var i=oe.modes[e];return"function"==typeof i?i(this,t,n):[]},getDatasetAtEvent:function(t){return oe.modes.dataset(this,t,{intersect:!0})},getDatasetMeta:function(t){var e=this.data.datasets[t];e._meta||(e._meta={});var n=e._meta[this.id];return n||(n=e._meta[this.id]={type:null,data:[],dataset:null,controller:null,hidden:null,xAxisID:null,yAxisID:null,order:e.order||0,index:t}),n},getVisibleDatasetCount:function(){for(var t=0,e=0,n=this.data.datasets.length;e<n;++e)this.isDatasetVisible(e)&&t++;return t},isDatasetVisible:function(t){var e=this.getDatasetMeta(t);return"boolean"==typeof e.hidden?!e.hidden:!this.data.datasets[t].hidden},generateLegend:function(){return this.options.legendCallback(this)},destroyDatasetMeta:function(t){var e=this.id,n=this.data.datasets[t],i=n._meta&&n._meta[e];i&&(i.controller.destroy(),delete n._meta[e])},destroy:function(){var t,e,n=this,i=n.canvas;for(n.stop(),t=0,e=n.data.datasets.length;t<e;++t)n.destroyDatasetMeta(t);i&&(n.unbindEvents(),B.canvas.clear(n),Le.releaseContext(n.ctx),n.canvas=null,n.ctx=null),Re.notify(n,"destroy"),delete en.instances[n.id]},toBase64Image:function(){return this.canvas.toDataURL.apply(this.canvas,arguments)},initToolTip:function(){var t=this;t.tooltip=new qe({_chart:t,_chartInstance:t,_data:t.data,_options:t.options.tooltips},t)},bindEvents:function(){var t=this,e=t._listeners={},n=function(){t.eventHandler.apply(t,arguments)};B.each(t.options.events,(function(i){Le.addEventListener(t,i,n),e[i]=n})),t.options.responsive&&(n=function(){t.resize()},Le.addEventListener(t,"resize",n),e.resize=n)},unbindEvents:function(){var t=this,e=t._listeners;e&&(delete t._listeners,B.each(e,(function(e,n){Le.removeEventListener(t,n,e)})))},updateHoverStyle:function(t,e,n){var i,a,r,o=n?"set":"remove";for(a=0,r=t.length;a<r;++a)(i=t[a])&&this.getDatasetMeta(i._datasetIndex).controller[o+"HoverStyle"](i);"dataset"===e&&this.getDatasetMeta(t[0]._datasetIndex).controller["_"+o+"DatasetHoverStyle"]()},eventHandler:function(t){var e=this,n=e.tooltip;if(!1!==Re.notify(e,"beforeEvent",[t])){e._bufferedRender=!0,e._bufferedRequest=null;var i=e.handleEvent(t);n&&(i=n._start?n.handleEvent(t):i|n.handleEvent(t)),Re.notify(e,"afterEvent",[t]);var a=e._bufferedRequest;return a?e.render(a):i&&!e.animating&&(e.stop(),e.render({duration:e.options.hover.animationDuration,lazy:!0})),e._bufferedRender=!1,e._bufferedRequest=null,e}},handleEvent:function(t){var e,n=this,i=n.options||{},a=i.hover;return n.lastActive=n.lastActive||[],"mouseout"===t.type?n.active=[]:n.active=n.getElementsAtEventForMode(t,a.mode,a),B.callback(i.onHover||i.hover.onHover,[t.native,n.active],n),"mouseup"!==t.type&&"click"!==t.type||i.onClick&&i.onClick.call(n,t.native,n.active),n.lastActive.length&&n.updateHoverStyle(n.lastActive,a.mode,!1),n.active.length&&a.mode&&n.updateHoverStyle(n.active,a.mode,!0),e=!B.arrayEquals(n.active,n.lastActive),n.lastActive=n.active,e}}),en.instances={};var nn=en;en.Controller=en,en.types={},B.configMerge=Xe,B.scaleMerge=$e;function an(){throw new Error("This method is not implemented: either no adapter can be found or an incomplete integration was provided.")}function rn(t){this.options=t||{}}B.extend(rn.prototype,{formats:an,parse:an,format:an,add:an,diff:an,startOf:an,endOf:an,_create:function(t){return t}}),rn.override=function(t){B.extend(rn.prototype,t)};var on={_date:rn},sn={formatters:{values:function(t){return B.isArray(t)?t:""+t},linear:function(t,e,n){var i=n.length>3?n[2]-n[1]:n[1]-n[0];Math.abs(i)>1&&t!==Math.floor(t)&&(i=t-Math.floor(t));var a=B.log10(Math.abs(i)),r="";if(0!==t)if(Math.max(Math.abs(n[0]),Math.abs(n[n.length-1]))<1e-4){var o=B.log10(Math.abs(t)),s=Math.floor(o)-Math.floor(a);s=Math.max(Math.min(s,20),0),r=t.toExponential(s)}else{var l=-1*Math.floor(a);l=Math.max(Math.min(l,20),0),r=t.toFixed(l)}else r="0";return r},logarithmic:function(t,e,n){var i=t/Math.pow(10,Math.floor(B.log10(t)));return 0===t?"0":1===i||2===i||5===i||0===e||e===n.length-1?t.toExponential():""}}},ln=B.isArray,un=B.isNullOrUndef,dn=B.valueOrDefault,hn=B.valueAtIndexOrDefault;function cn(t,e,n){var i,a=t.getTicks().length,r=Math.min(e,a-1),o=t.getPixelForTick(r),s=t._startPixel,l=t._endPixel;if(!(n&&(i=1===a?Math.max(o-s,l-o):0===e?(t.getPixelForTick(1)-o)/2:(o-t.getPixelForTick(r-1))/2,(o+=r<e?i:-i)<s-1e-6||o>l+1e-6)))return o}function fn(t,e,n,i){var a,r,o,s,l,u,d,h,c,f,g,m,p,v=n.length,b=[],y=[],x=[],_=0,w=0;for(a=0;a<v;++a){if(s=n[a].label,l=n[a].major?e.major:e.minor,t.font=u=l.string,d=i[u]=i[u]||{data:{},gc:[]},h=l.lineHeight,c=f=0,un(s)||ln(s)){if(ln(s))for(r=0,o=s.length;r<o;++r)g=s[r],un(g)||ln(g)||(c=B.measureText(t,d.data,d.gc,c,g),f+=h)}else c=B.measureText(t,d.data,d.gc,c,s),f=h;b.push(c),y.push(f),x.push(h/2),_=Math.max(c,_),w=Math.max(f,w)}function k(t){return{width:b[t]||0,height:y[t]||0,offset:x[t]||0}}return function(t,e){B.each(t,(function(t){var n,i=t.gc,a=i.length/2;if(a>e){for(n=0;n<a;++n)delete t.data[i[n]];i.splice(0,a)}}))}(i,v),m=b.indexOf(_),p=y.indexOf(w),{first:k(0),last:k(v-1),widest:k(m),highest:k(p)}}function gn(t){return t.drawTicks?t.tickMarkLength:0}function mn(t){var e,n;return t.display?(e=B.options._parseFont(t),n=B.options.toPadding(t.padding),e.lineHeight+n.height):0}function pn(t,e){return B.extend(B.options._parseFont({fontFamily:dn(e.fontFamily,t.fontFamily),fontSize:dn(e.fontSize,t.fontSize),fontStyle:dn(e.fontStyle,t.fontStyle),lineHeight:dn(e.lineHeight,t.lineHeight)}),{color:B.options.resolve([e.fontColor,t.fontColor,Y.global.defaultFontColor])})}function vn(t){var e=pn(t,t.minor);return{minor:e,major:t.major.enabled?pn(t,t.major):e}}function bn(t){var e,n,i,a=[];for(n=0,i=t.length;n<i;++n)void 0!==(e=t[n])._index&&a.push(e);return a}function yn(t,e,n,i){var a,r,o,s,l=dn(n,0),u=Math.min(dn(i,t.length),t.length),d=0;for(e=Math.ceil(e),i&&(e=(a=i-n)/Math.floor(a/e)),s=l;s<0;)d++,s=Math.round(l+d*e);for(r=Math.max(l,0);r<u;r++)o=t[r],r===s?(o._index=r,d++,s=Math.round(l+d*e)):delete o.label}Y._set("scale",{display:!0,position:"left",offset:!1,gridLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,drawBorder:!0,drawOnChartArea:!0,drawTicks:!0,tickMarkLength:10,zeroLineWidth:1,zeroLineColor:"rgba(0,0,0,0.25)",zeroLineBorderDash:[],zeroLineBorderDashOffset:0,offsetGridLines:!1,borderDash:[],borderDashOffset:0},scaleLabel:{display:!1,labelString:"",padding:{top:4,bottom:4}},ticks:{beginAtZero:!1,minRotation:0,maxRotation:50,mirror:!1,padding:0,reverse:!1,display:!0,autoSkip:!0,autoSkipPadding:0,labelOffset:0,callback:sn.formatters.values,minor:{},major:{}}});var xn=X.extend({zeroLineIndex:0,getPadding:function(){return{left:this.paddingLeft||0,top:this.paddingTop||0,right:this.paddingRight||0,bottom:this.paddingBottom||0}},getTicks:function(){return this._ticks},_getLabels:function(){var t=this.chart.data;return this.options.labels||(this.isHorizontal()?t.xLabels:t.yLabels)||t.labels||[]},mergeTicksOptions:function(){},beforeUpdate:function(){B.callback(this.options.beforeUpdate,[this])},update:function(t,e,n){var i,a,r,o,s,l=this,u=l.options.ticks,d=u.sampleSize;if(l.beforeUpdate(),l.maxWidth=t,l.maxHeight=e,l.margins=B.extend({left:0,right:0,top:0,bottom:0},n),l._ticks=null,l.ticks=null,l._labelSizes=null,l._maxLabelLines=0,l.longestLabelWidth=0,l.longestTextCache=l.longestTextCache||{},l._gridLineItems=null,l._labelItems=null,l.beforeSetDimensions(),l.setDimensions(),l.afterSetDimensions(),l.beforeDataLimits(),l.determineDataLimits(),l.afterDataLimits(),l.beforeBuildTicks(),o=l.buildTicks()||[],(!(o=l.afterBuildTicks(o)||o)||!o.length)&&l.ticks)for(o=[],i=0,a=l.ticks.length;i<a;++i)o.push({value:l.ticks[i],major:!1});return l._ticks=o,s=d<o.length,r=l._convertTicksToLabels(s?function(t,e){for(var n=[],i=t.length/e,a=0,r=t.length;a<r;a+=i)n.push(t[Math.floor(a)]);return n}(o,d):o),l._configure(),l.beforeCalculateTickRotation(),l.calculateTickRotation(),l.afterCalculateTickRotation(),l.beforeFit(),l.fit(),l.afterFit(),l._ticksToDraw=u.display&&(u.autoSkip||"auto"===u.source)?l._autoSkip(o):o,s&&(r=l._convertTicksToLabels(l._ticksToDraw)),l.ticks=r,l.afterUpdate(),l.minSize},_configure:function(){var t,e,n=this,i=n.options.ticks.reverse;n.isHorizontal()?(t=n.left,e=n.right):(t=n.top,e=n.bottom,i=!i),n._startPixel=t,n._endPixel=e,n._reversePixels=i,n._length=e-t},afterUpdate:function(){B.callback(this.options.afterUpdate,[this])},beforeSetDimensions:function(){B.callback(this.options.beforeSetDimensions,[this])},setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0},afterSetDimensions:function(){B.callback(this.options.afterSetDimensions,[this])},beforeDataLimits:function(){B.callback(this.options.beforeDataLimits,[this])},determineDataLimits:B.noop,afterDataLimits:function(){B.callback(this.options.afterDataLimits,[this])},beforeBuildTicks:function(){B.callback(this.options.beforeBuildTicks,[this])},buildTicks:B.noop,afterBuildTicks:function(t){var e=this;return ln(t)&&t.length?B.callback(e.options.afterBuildTicks,[e,t]):(e.ticks=B.callback(e.options.afterBuildTicks,[e,e.ticks])||e.ticks,t)},beforeTickToLabelConversion:function(){B.callback(this.options.beforeTickToLabelConversion,[this])},convertTicksToLabels:function(){var t=this.options.ticks;this.ticks=this.ticks.map(t.userCallback||t.callback,this)},afterTickToLabelConversion:function(){B.callback(this.options.afterTickToLabelConversion,[this])},beforeCalculateTickRotation:function(){B.callback(this.options.beforeCalculateTickRotation,[this])},calculateTickRotation:function(){var t,e,n,i,a,r,o,s=this,l=s.options,u=l.ticks,d=s.getTicks().length,h=u.minRotation||0,c=u.maxRotation,f=h;!s._isVisible()||!u.display||h>=c||d<=1||!s.isHorizontal()?s.labelRotation=h:(e=(t=s._getLabelSizes()).widest.width,n=t.highest.height-t.highest.offset,i=Math.min(s.maxWidth,s.chart.width-e),e+6>(a=l.offset?s.maxWidth/d:i/(d-1))&&(a=i/(d-(l.offset?.5:1)),r=s.maxHeight-gn(l.gridLines)-u.padding-mn(l.scaleLabel),o=Math.sqrt(e*e+n*n),f=B.toDegrees(Math.min(Math.asin(Math.min((t.highest.height+6)/a,1)),Math.asin(Math.min(r/o,1))-Math.asin(n/o))),f=Math.max(h,Math.min(c,f))),s.labelRotation=f)},afterCalculateTickRotation:function(){B.callback(this.options.afterCalculateTickRotation,[this])},beforeFit:function(){B.callback(this.options.beforeFit,[this])},fit:function(){var t=this,e=t.minSize={width:0,height:0},n=t.chart,i=t.options,a=i.ticks,r=i.scaleLabel,o=i.gridLines,s=t._isVisible(),l="bottom"===i.position,u=t.isHorizontal();if(u?e.width=t.maxWidth:s&&(e.width=gn(o)+mn(r)),u?s&&(e.height=gn(o)+mn(r)):e.height=t.maxHeight,a.display&&s){var d=vn(a),h=t._getLabelSizes(),c=h.first,f=h.last,g=h.widest,m=h.highest,p=.4*d.minor.lineHeight,v=a.padding;if(u){var b=0!==t.labelRotation,y=B.toRadians(t.labelRotation),x=Math.cos(y),_=Math.sin(y),w=_*g.width+x*(m.height-(b?m.offset:0))+(b?0:p);e.height=Math.min(t.maxHeight,e.height+w+v);var k,M,S=t.getPixelForTick(0)-t.left,D=t.right-t.getPixelForTick(t.getTicks().length-1);b?(k=l?x*c.width+_*c.offset:_*(c.height-c.offset),M=l?_*(f.height-f.offset):x*f.width+_*f.offset):(k=c.width/2,M=f.width/2),t.paddingLeft=Math.max((k-S)*t.width/(t.width-S),0)+3,t.paddingRight=Math.max((M-D)*t.width/(t.width-D),0)+3}else{var C=a.mirror?0:g.width+v+p;e.width=Math.min(t.maxWidth,e.width+C),t.paddingTop=c.height/2,t.paddingBottom=f.height/2}}t.handleMargins(),u?(t.width=t._length=n.width-t.margins.left-t.margins.right,t.height=e.height):(t.width=e.width,t.height=t._length=n.height-t.margins.top-t.margins.bottom)},handleMargins:function(){var t=this;t.margins&&(t.margins.left=Math.max(t.paddingLeft,t.margins.left),t.margins.top=Math.max(t.paddingTop,t.margins.top),t.margins.right=Math.max(t.paddingRight,t.margins.right),t.margins.bottom=Math.max(t.paddingBottom,t.margins.bottom))},afterFit:function(){B.callback(this.options.afterFit,[this])},isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},isFullWidth:function(){return this.options.fullWidth},getRightValue:function(t){if(un(t))return NaN;if(("number"==typeof t||t instanceof Number)&&!isFinite(t))return NaN;if(t)if(this.isHorizontal()){if(void 0!==t.x)return this.getRightValue(t.x)}else if(void 0!==t.y)return this.getRightValue(t.y);return t},_convertTicksToLabels:function(t){var e,n,i,a=this;for(a.ticks=t.map((function(t){return t.value})),a.beforeTickToLabelConversion(),e=a.convertTicksToLabels(t)||a.ticks,a.afterTickToLabelConversion(),n=0,i=t.length;n<i;++n)t[n].label=e[n];return e},_getLabelSizes:function(){var t=this,e=t._labelSizes;return e||(t._labelSizes=e=fn(t.ctx,vn(t.options.ticks),t.getTicks(),t.longestTextCache),t.longestLabelWidth=e.widest.width),e},_parseValue:function(t){var e,n,i,a;return ln(t)?(e=+this.getRightValue(t[0]),n=+this.getRightValue(t[1]),i=Math.min(e,n),a=Math.max(e,n)):(e=void 0,n=t=+this.getRightValue(t),i=t,a=t),{min:i,max:a,start:e,end:n}},_getScaleLabel:function(t){var e=this._parseValue(t);return void 0!==e.start?"["+e.start+", "+e.end+"]":+this.getRightValue(t)},getLabelForIndex:B.noop,getPixelForValue:B.noop,getValueForPixel:B.noop,getPixelForTick:function(t){var e=this.options.offset,n=this._ticks.length,i=1/Math.max(n-(e?0:1),1);return t<0||t>n-1?null:this.getPixelForDecimal(t*i+(e?i/2:0))},getPixelForDecimal:function(t){return this._reversePixels&&(t=1-t),this._startPixel+t*this._length},getDecimalForPixel:function(t){var e=(t-this._startPixel)/this._length;return this._reversePixels?1-e:e},getBasePixel:function(){return this.getPixelForValue(this.getBaseValue())},getBaseValue:function(){var t=this.min,e=this.max;return this.beginAtZero?0:t<0&&e<0?e:t>0&&e>0?t:0},_autoSkip:function(t){var e,n,i,a,r=this.options.ticks,o=this._length,s=r.maxTicksLimit||o/this._tickSize()+1,l=r.major.enabled?function(t){var e,n,i=[];for(e=0,n=t.length;e<n;e++)t[e].major&&i.push(e);return i}(t):[],u=l.length,d=l[0],h=l[u-1];if(u>s)return function(t,e,n){var i,a,r=0,o=e[0];for(n=Math.ceil(n),i=0;i<t.length;i++)a=t[i],i===o?(a._index=i,o=e[++r*n]):delete a.label}(t,l,u/s),bn(t);if(i=function(t,e,n,i){var a,r,o,s,l=function(t){var e,n,i=t.length;if(i<2)return!1;for(n=t[0],e=1;e<i;++e)if(t[e]-t[e-1]!==n)return!1;return n}(t),u=(e.length-1)/i;if(!l)return Math.max(u,1);for(o=0,s=(a=B.math._factorize(l)).length-1;o<s;o++)if((r=a[o])>u)return r;return Math.max(u,1)}(l,t,0,s),u>0){for(e=0,n=u-1;e<n;e++)yn(t,i,l[e],l[e+1]);return a=u>1?(h-d)/(u-1):null,yn(t,i,B.isNullOrUndef(a)?0:d-a,d),yn(t,i,h,B.isNullOrUndef(a)?t.length:h+a),bn(t)}return yn(t,i),bn(t)},_tickSize:function(){var t=this.options.ticks,e=B.toRadians(this.labelRotation),n=Math.abs(Math.cos(e)),i=Math.abs(Math.sin(e)),a=this._getLabelSizes(),r=t.autoSkipPadding||0,o=a?a.widest.width+r:0,s=a?a.highest.height+r:0;return this.isHorizontal()?s*n>o*i?o/n:s/i:s*i<o*n?s/n:o/i},_isVisible:function(){var t,e,n,i=this.chart,a=this.options.display;if("auto"!==a)return!!a;for(t=0,e=i.data.datasets.length;t<e;++t)if(i.isDatasetVisible(t)&&((n=i.getDatasetMeta(t)).xAxisID===this.id||n.yAxisID===this.id))return!0;return!1},_computeGridLineItems:function(t){var e,n,i,a,r,o,s,l,u,d,h,c,f,g,m,p,v,b=this,y=b.chart,x=b.options,_=x.gridLines,w=x.position,k=_.offsetGridLines,M=b.isHorizontal(),S=b._ticksToDraw,D=S.length+(k?1:0),C=gn(_),P=[],T=_.drawBorder?hn(_.lineWidth,0,0):0,O=T/2,A=B._alignPixel,F=function(t){return A(y,t,T)};for("top"===w?(e=F(b.bottom),s=b.bottom-C,u=e-O,h=F(t.top)+O,f=t.bottom):"bottom"===w?(e=F(b.top),h=t.top,f=F(t.bottom)-O,s=e+O,u=b.top+C):"left"===w?(e=F(b.right),o=b.right-C,l=e-O,d=F(t.left)+O,c=t.right):(e=F(b.left),d=t.left,c=F(t.right)-O,o=e+O,l=b.left+C),n=0;n<D;++n)i=S[n]||{},un(i.label)&&n<S.length||(n===b.zeroLineIndex&&x.offset===k?(g=_.zeroLineWidth,m=_.zeroLineColor,p=_.zeroLineBorderDash||[],v=_.zeroLineBorderDashOffset||0):(g=hn(_.lineWidth,n,1),m=hn(_.color,n,"rgba(0,0,0,0.1)"),p=_.borderDash||[],v=_.borderDashOffset||0),void 0!==(a=cn(b,i._index||n,k))&&(r=A(y,a,g),M?o=l=d=c=r:s=u=h=f=r,P.push({tx1:o,ty1:s,tx2:l,ty2:u,x1:d,y1:h,x2:c,y2:f,width:g,color:m,borderDash:p,borderDashOffset:v})));return P.ticksLength=D,P.borderValue=e,P},_computeLabelItems:function(){var t,e,n,i,a,r,o,s,l,u,d,h,c=this,f=c.options,g=f.ticks,m=f.position,p=g.mirror,v=c.isHorizontal(),b=c._ticksToDraw,y=vn(g),x=g.padding,_=gn(f.gridLines),w=-B.toRadians(c.labelRotation),k=[];for("top"===m?(r=c.bottom-_-x,o=w?"left":"center"):"bottom"===m?(r=c.top+_+x,o=w?"right":"center"):"left"===m?(a=c.right-(p?0:_)-x,o=p?"left":"right"):(a=c.left+(p?0:_)+x,o=p?"right":"left"),t=0,e=b.length;t<e;++t)i=(n=b[t]).label,un(i)||(s=c.getPixelForTick(n._index||t)+g.labelOffset,u=(l=n.major?y.major:y.minor).lineHeight,d=ln(i)?i.length:1,v?(a=s,h="top"===m?((w?1:.5)-d)*u:(w?0:.5)*u):(r=s,h=(1-d)*u/2),k.push({x:a,y:r,rotation:w,label:i,font:l,textOffset:h,textAlign:o}));return k},_drawGrid:function(t){var e=this,n=e.options.gridLines;if(n.display){var i,a,r,o,s,l=e.ctx,u=e.chart,d=B._alignPixel,h=n.drawBorder?hn(n.lineWidth,0,0):0,c=e._gridLineItems||(e._gridLineItems=e._computeGridLineItems(t));for(r=0,o=c.length;r<o;++r)i=(s=c[r]).width,a=s.color,i&&a&&(l.save(),l.lineWidth=i,l.strokeStyle=a,l.setLineDash&&(l.setLineDash(s.borderDash),l.lineDashOffset=s.borderDashOffset),l.beginPath(),n.drawTicks&&(l.moveTo(s.tx1,s.ty1),l.lineTo(s.tx2,s.ty2)),n.drawOnChartArea&&(l.moveTo(s.x1,s.y1),l.lineTo(s.x2,s.y2)),l.stroke(),l.restore());if(h){var f,g,m,p,v=h,b=hn(n.lineWidth,c.ticksLength-1,1),y=c.borderValue;e.isHorizontal()?(f=d(u,e.left,v)-v/2,g=d(u,e.right,b)+b/2,m=p=y):(m=d(u,e.top,v)-v/2,p=d(u,e.bottom,b)+b/2,f=g=y),l.lineWidth=h,l.strokeStyle=hn(n.color,0),l.beginPath(),l.moveTo(f,m),l.lineTo(g,p),l.stroke()}}},_drawLabels:function(){var t=this;if(t.options.ticks.display){var e,n,i,a,r,o,s,l,u=t.ctx,d=t._labelItems||(t._labelItems=t._computeLabelItems());for(e=0,i=d.length;e<i;++e){if(o=(r=d[e]).font,u.save(),u.translate(r.x,r.y),u.rotate(r.rotation),u.font=o.string,u.fillStyle=o.color,u.textBaseline="middle",u.textAlign=r.textAlign,s=r.label,l=r.textOffset,ln(s))for(n=0,a=s.length;n<a;++n)u.fillText(""+s[n],0,l),l+=o.lineHeight;else u.fillText(s,0,l);u.restore()}}},_drawTitle:function(){var t=this,e=t.ctx,n=t.options,i=n.scaleLabel;if(i.display){var a,r,o=dn(i.fontColor,Y.global.defaultFontColor),s=B.options._parseFont(i),l=B.options.toPadding(i.padding),u=s.lineHeight/2,d=n.position,h=0;if(t.isHorizontal())a=t.left+t.width/2,r="bottom"===d?t.bottom-u-l.bottom:t.top+u+l.top;else{var c="left"===d;a=c?t.left+u+l.top:t.right-u-l.top,r=t.top+t.height/2,h=c?-.5*Math.PI:.5*Math.PI}e.save(),e.translate(a,r),e.rotate(h),e.textAlign="center",e.textBaseline="middle",e.fillStyle=o,e.font=s.string,e.fillText(i.labelString,0,0),e.restore()}},draw:function(t){this._isVisible()&&(this._drawGrid(t),this._drawTitle(),this._drawLabels())},_layers:function(){var t=this,e=t.options,n=e.ticks&&e.ticks.z||0,i=e.gridLines&&e.gridLines.z||0;return t._isVisible()&&n!==i&&t.draw===t._draw?[{z:i,draw:function(){t._drawGrid.apply(t,arguments),t._drawTitle.apply(t,arguments)}},{z:n,draw:function(){t._drawLabels.apply(t,arguments)}}]:[{z:n,draw:function(){t.draw.apply(t,arguments)}}]},_getMatchingVisibleMetas:function(t){var e=this,n=e.isHorizontal();return e.chart._getSortedVisibleDatasetMetas().filter((function(i){return(!t||i.type===t)&&(n?i.xAxisID===e.id:i.yAxisID===e.id)}))}});xn.prototype._draw=xn.prototype.draw;var _n=xn,wn=B.isNullOrUndef,kn=_n.extend({determineDataLimits:function(){var t,e=this,n=e._getLabels(),i=e.options.ticks,a=i.min,r=i.max,o=0,s=n.length-1;void 0!==a&&(t=n.indexOf(a))>=0&&(o=t),void 0!==r&&(t=n.indexOf(r))>=0&&(s=t),e.minIndex=o,e.maxIndex=s,e.min=n[o],e.max=n[s]},buildTicks:function(){var t=this._getLabels(),e=this.minIndex,n=this.maxIndex;this.ticks=0===e&&n===t.length-1?t:t.slice(e,n+1)},getLabelForIndex:function(t,e){var n=this.chart;return n.getDatasetMeta(e).controller._getValueScaleId()===this.id?this.getRightValue(n.data.datasets[e].data[t]):this._getLabels()[t]},_configure:function(){var t=this,e=t.options.offset,n=t.ticks;_n.prototype._configure.call(t),t.isHorizontal()||(t._reversePixels=!t._reversePixels),n&&(t._startValue=t.minIndex-(e?.5:0),t._valueRange=Math.max(n.length-(e?0:1),1))},getPixelForValue:function(t,e,n){var i,a,r,o=this;return wn(e)||wn(n)||(t=o.chart.data.datasets[n].data[e]),wn(t)||(i=o.isHorizontal()?t.x:t.y),(void 0!==i||void 0!==t&&isNaN(e))&&(a=o._getLabels(),t=B.valueOrDefault(i,t),e=-1!==(r=a.indexOf(t))?r:e,isNaN(e)&&(e=t)),o.getPixelForDecimal((e-o._startValue)/o._valueRange)},getPixelForTick:function(t){var e=this.ticks;return t<0||t>e.length-1?null:this.getPixelForValue(e[t],t+this.minIndex)},getValueForPixel:function(t){var e=Math.round(this._startValue+this.getDecimalForPixel(t)*this._valueRange);return Math.min(Math.max(e,0),this.ticks.length-1)},getBasePixel:function(){return this.bottom}}),Mn={position:"bottom"};kn._defaults=Mn;var Sn=B.noop,Dn=B.isNullOrUndef;var Cn=_n.extend({getRightValue:function(t){return"string"==typeof t?+t:_n.prototype.getRightValue.call(this,t)},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;if(e.beginAtZero){var n=B.sign(t.min),i=B.sign(t.max);n<0&&i<0?t.max=0:n>0&&i>0&&(t.min=0)}var a=void 0!==e.min||void 0!==e.suggestedMin,r=void 0!==e.max||void 0!==e.suggestedMax;void 0!==e.min?t.min=e.min:void 0!==e.suggestedMin&&(null===t.min?t.min=e.suggestedMin:t.min=Math.min(t.min,e.suggestedMin)),void 0!==e.max?t.max=e.max:void 0!==e.suggestedMax&&(null===t.max?t.max=e.suggestedMax:t.max=Math.max(t.max,e.suggestedMax)),a!==r&&t.min>=t.max&&(a?t.max=t.min+1:t.min=t.max-1),t.min===t.max&&(t.max++,e.beginAtZero||t.min--)},getTickLimit:function(){var t,e=this.options.ticks,n=e.stepSize,i=e.maxTicksLimit;return n?t=Math.ceil(this.max/n)-Math.floor(this.min/n)+1:(t=this._computeTickLimit(),i=i||11),i&&(t=Math.min(i,t)),t},_computeTickLimit:function(){return Number.POSITIVE_INFINITY},handleDirectionalChanges:Sn,buildTicks:function(){var t=this,e=t.options.ticks,n=t.getTickLimit(),i={maxTicks:n=Math.max(2,n),min:e.min,max:e.max,precision:e.precision,stepSize:B.valueOrDefault(e.fixedStepSize,e.stepSize)},a=t.ticks=function(t,e){var n,i,a,r,o=[],s=t.stepSize,l=s||1,u=t.maxTicks-1,d=t.min,h=t.max,c=t.precision,f=e.min,g=e.max,m=B.niceNum((g-f)/u/l)*l;if(m<1e-14&&Dn(d)&&Dn(h))return[f,g];(r=Math.ceil(g/m)-Math.floor(f/m))>u&&(m=B.niceNum(r*m/u/l)*l),s||Dn(c)?n=Math.pow(10,B._decimalPlaces(m)):(n=Math.pow(10,c),m=Math.ceil(m*n)/n),i=Math.floor(f/m)*m,a=Math.ceil(g/m)*m,s&&(!Dn(d)&&B.almostWhole(d/m,m/1e3)&&(i=d),!Dn(h)&&B.almostWhole(h/m,m/1e3)&&(a=h)),r=(a-i)/m,r=B.almostEquals(r,Math.round(r),m/1e3)?Math.round(r):Math.ceil(r),i=Math.round(i*n)/n,a=Math.round(a*n)/n,o.push(Dn(d)?i:d);for(var p=1;p<r;++p)o.push(Math.round((i+p*m)*n)/n);return o.push(Dn(h)?a:h),o}(i,t);t.handleDirectionalChanges(),t.max=B.max(a),t.min=B.min(a),e.reverse?(a.reverse(),t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max)},convertTicksToLabels:function(){var t=this;t.ticksAsNumbers=t.ticks.slice(),t.zeroLineIndex=t.ticks.indexOf(0),_n.prototype.convertTicksToLabels.call(t)},_configure:function(){var t,e=this,n=e.getTicks(),i=e.min,a=e.max;_n.prototype._configure.call(e),e.options.offset&&n.length&&(i-=t=(a-i)/Math.max(n.length-1,1)/2,a+=t),e._startValue=i,e._endValue=a,e._valueRange=a-i}}),Pn={position:"left",ticks:{callback:sn.formatters.linear}};function Tn(t,e,n,i){var a,r,o=t.options,s=function(t,e,n){var i=[n.type,void 0===e&&void 0===n.stack?n.index:"",n.stack].join(".");return void 0===t[i]&&(t[i]={pos:[],neg:[]}),t[i]}(e,o.stacked,n),l=s.pos,u=s.neg,d=i.length;for(a=0;a<d;++a)r=t._parseValue(i[a]),isNaN(r.min)||isNaN(r.max)||n.data[a].hidden||(l[a]=l[a]||0,u[a]=u[a]||0,o.relativePoints?l[a]=100:r.min<0||r.max<0?u[a]+=r.min:l[a]+=r.max)}function On(t,e,n){var i,a,r=n.length;for(i=0;i<r;++i)a=t._parseValue(n[i]),isNaN(a.min)||isNaN(a.max)||e.data[i].hidden||(t.min=Math.min(t.min,a.min),t.max=Math.max(t.max,a.max))}var An=Cn.extend({determineDataLimits:function(){var t,e,n,i,a=this,r=a.options,o=a.chart.data.datasets,s=a._getMatchingVisibleMetas(),l=r.stacked,u={},d=s.length;if(a.min=Number.POSITIVE_INFINITY,a.max=Number.NEGATIVE_INFINITY,void 0===l)for(t=0;!l&&t<d;++t)l=void 0!==(e=s[t]).stack;for(t=0;t<d;++t)n=o[(e=s[t]).index].data,l?Tn(a,u,e,n):On(a,e,n);B.each(u,(function(t){i=t.pos.concat(t.neg),a.min=Math.min(a.min,B.min(i)),a.max=Math.max(a.max,B.max(i))})),a.min=B.isFinite(a.min)&&!isNaN(a.min)?a.min:0,a.max=B.isFinite(a.max)&&!isNaN(a.max)?a.max:1,a.handleTickRangeOptions()},_computeTickLimit:function(){var t;return this.isHorizontal()?Math.ceil(this.width/40):(t=B.options._parseFont(this.options.ticks),Math.ceil(this.height/t.lineHeight))},handleDirectionalChanges:function(){this.isHorizontal()||this.ticks.reverse()},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForValue:function(t){return this.getPixelForDecimal((+this.getRightValue(t)-this._startValue)/this._valueRange)},getValueForPixel:function(t){return this._startValue+this.getDecimalForPixel(t)*this._valueRange},getPixelForTick:function(t){var e=this.ticksAsNumbers;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])}}),Fn=Pn;An._defaults=Fn;var In=B.valueOrDefault,Ln=B.math.log10;var Rn={position:"left",ticks:{callback:sn.formatters.logarithmic}};function Nn(t,e){return B.isFinite(t)&&t>=0?t:e}var Wn=_n.extend({determineDataLimits:function(){var t,e,n,i,a,r,o=this,s=o.options,l=o.chart,u=l.data.datasets,d=o.isHorizontal();function h(t){return d?t.xAxisID===o.id:t.yAxisID===o.id}o.min=Number.POSITIVE_INFINITY,o.max=Number.NEGATIVE_INFINITY,o.minNotZero=Number.POSITIVE_INFINITY;var c=s.stacked;if(void 0===c)for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e)&&void 0!==e.stack){c=!0;break}if(s.stacked||c){var f={};for(t=0;t<u.length;t++){var g=[(e=l.getDatasetMeta(t)).type,void 0===s.stacked&&void 0===e.stack?t:"",e.stack].join(".");if(l.isDatasetVisible(t)&&h(e))for(void 0===f[g]&&(f[g]=[]),a=0,r=(i=u[t].data).length;a<r;a++){var m=f[g];n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(m[a]=m[a]||0,m[a]+=n.max)}}B.each(f,(function(t){if(t.length>0){var e=B.min(t),n=B.max(t);o.min=Math.min(o.min,e),o.max=Math.max(o.max,n)}}))}else for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e))for(a=0,r=(i=u[t].data).length;a<r;a++)n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(o.min=Math.min(n.min,o.min),o.max=Math.max(n.max,o.max),0!==n.min&&(o.minNotZero=Math.min(n.min,o.minNotZero)));o.min=B.isFinite(o.min)?o.min:null,o.max=B.isFinite(o.max)?o.max:null,o.minNotZero=B.isFinite(o.minNotZero)?o.minNotZero:null,this.handleTickRangeOptions()},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;t.min=Nn(e.min,t.min),t.max=Nn(e.max,t.max),t.min===t.max&&(0!==t.min&&null!==t.min?(t.min=Math.pow(10,Math.floor(Ln(t.min))-1),t.max=Math.pow(10,Math.floor(Ln(t.max))+1)):(t.min=1,t.max=10)),null===t.min&&(t.min=Math.pow(10,Math.floor(Ln(t.max))-1)),null===t.max&&(t.max=0!==t.min?Math.pow(10,Math.floor(Ln(t.min))+1):10),null===t.minNotZero&&(t.min>0?t.minNotZero=t.min:t.max<1?t.minNotZero=Math.pow(10,Math.floor(Ln(t.max))):t.minNotZero=1)},buildTicks:function(){var t=this,e=t.options.ticks,n=!t.isHorizontal(),i={min:Nn(e.min),max:Nn(e.max)},a=t.ticks=function(t,e){var n,i,a=[],r=In(t.min,Math.pow(10,Math.floor(Ln(e.min)))),o=Math.floor(Ln(e.max)),s=Math.ceil(e.max/Math.pow(10,o));0===r?(n=Math.floor(Ln(e.minNotZero)),i=Math.floor(e.minNotZero/Math.pow(10,n)),a.push(r),r=i*Math.pow(10,n)):(n=Math.floor(Ln(r)),i=Math.floor(r/Math.pow(10,n)));var l=n<0?Math.pow(10,Math.abs(n)):1;do{a.push(r),10===++i&&(i=1,l=++n>=0?1:l),r=Math.round(i*Math.pow(10,n)*l)/l}while(n<o||n===o&&i<s);var u=In(t.max,r);return a.push(u),a}(i,t);t.max=B.max(a),t.min=B.min(a),e.reverse?(n=!n,t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max),n&&a.reverse()},convertTicksToLabels:function(){this.tickValues=this.ticks.slice(),_n.prototype.convertTicksToLabels.call(this)},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForTick:function(t){var e=this.tickValues;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])},_getFirstTickValue:function(t){var e=Math.floor(Ln(t));return Math.floor(t/Math.pow(10,e))*Math.pow(10,e)},_configure:function(){var t=this,e=t.min,n=0;_n.prototype._configure.call(t),0===e&&(e=t._getFirstTickValue(t.minNotZero),n=In(t.options.ticks.fontSize,Y.global.defaultFontSize)/t._length),t._startValue=Ln(e),t._valueOffset=n,t._valueRange=(Ln(t.max)-Ln(e))/(1-n)},getPixelForValue:function(t){var e=this,n=0;return(t=+e.getRightValue(t))>e.min&&t>0&&(n=(Ln(t)-e._startValue)/e._valueRange+e._valueOffset),e.getPixelForDecimal(n)},getValueForPixel:function(t){var e=this,n=e.getDecimalForPixel(t);return 0===n&&0===e.min?0:Math.pow(10,e._startValue+(n-e._valueOffset)*e._valueRange)}}),Yn=Rn;Wn._defaults=Yn;var zn=B.valueOrDefault,En=B.valueAtIndexOrDefault,Vn=B.options.resolve,Hn={display:!0,animate:!0,position:"chartArea",angleLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,borderDash:[],borderDashOffset:0},gridLines:{circular:!1},ticks:{showLabelBackdrop:!0,backdropColor:"rgba(255,255,255,0.75)",backdropPaddingY:2,backdropPaddingX:2,callback:sn.formatters.linear},pointLabels:{display:!0,fontSize:10,callback:function(t){return t}}};function Bn(t){var e=t.ticks;return e.display&&t.display?zn(e.fontSize,Y.global.defaultFontSize)+2*e.backdropPaddingY:0}function jn(t,e,n,i,a){return t===i||t===a?{start:e-n/2,end:e+n/2}:t<i||t>a?{start:e-n,end:e}:{start:e,end:e+n}}function Un(t){return 0===t||180===t?"center":t<180?"left":"right"}function Gn(t,e,n,i){var a,r,o=n.y+i/2;if(B.isArray(e))for(a=0,r=e.length;a<r;++a)t.fillText(e[a],n.x,o),o+=i;else t.fillText(e,n.x,o)}function qn(t,e,n){90===t||270===t?n.y-=e.h/2:(t>270||t<90)&&(n.y-=e.h)}function Zn(t){return B.isNumber(t)?t:0}var $n=Cn.extend({setDimensions:function(){var t=this;t.width=t.maxWidth,t.height=t.maxHeight,t.paddingTop=Bn(t.options)/2,t.xCenter=Math.floor(t.width/2),t.yCenter=Math.floor((t.height-t.paddingTop)/2),t.drawingArea=Math.min(t.height-t.paddingTop,t.width)/2},determineDataLimits:function(){var t=this,e=t.chart,n=Number.POSITIVE_INFINITY,i=Number.NEGATIVE_INFINITY;B.each(e.data.datasets,(function(a,r){if(e.isDatasetVisible(r)){var o=e.getDatasetMeta(r);B.each(a.data,(function(e,a){var r=+t.getRightValue(e);isNaN(r)||o.data[a].hidden||(n=Math.min(r,n),i=Math.max(r,i))}))}})),t.min=n===Number.POSITIVE_INFINITY?0:n,t.max=i===Number.NEGATIVE_INFINITY?0:i,t.handleTickRangeOptions()},_computeTickLimit:function(){return Math.ceil(this.drawingArea/Bn(this.options))},convertTicksToLabels:function(){var t=this;Cn.prototype.convertTicksToLabels.call(t),t.pointLabels=t.chart.data.labels.map((function(){var e=B.callback(t.options.pointLabels.callback,arguments,t);return e||0===e?e:""}))},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},fit:function(){var t=this.options;t.display&&t.pointLabels.display?function(t){var e,n,i,a=B.options._parseFont(t.options.pointLabels),r={l:0,r:t.width,t:0,b:t.height-t.paddingTop},o={};t.ctx.font=a.string,t._pointLabelSizes=[];var s,l,u,d=t.chart.data.labels.length;for(e=0;e<d;e++){i=t.getPointPosition(e,t.drawingArea+5),s=t.ctx,l=a.lineHeight,u=t.pointLabels[e],n=B.isArray(u)?{w:B.longestText(s,s.font,u),h:u.length*l}:{w:s.measureText(u).width,h:l},t._pointLabelSizes[e]=n;var h=t.getIndexAngle(e),c=B.toDegrees(h)%360,f=jn(c,i.x,n.w,0,180),g=jn(c,i.y,n.h,90,270);f.start<r.l&&(r.l=f.start,o.l=h),f.end>r.r&&(r.r=f.end,o.r=h),g.start<r.t&&(r.t=g.start,o.t=h),g.end>r.b&&(r.b=g.end,o.b=h)}t.setReductions(t.drawingArea,r,o)}(this):this.setCenterPoint(0,0,0,0)},setReductions:function(t,e,n){var i=this,a=e.l/Math.sin(n.l),r=Math.max(e.r-i.width,0)/Math.sin(n.r),o=-e.t/Math.cos(n.t),s=-Math.max(e.b-(i.height-i.paddingTop),0)/Math.cos(n.b);a=Zn(a),r=Zn(r),o=Zn(o),s=Zn(s),i.drawingArea=Math.min(Math.floor(t-(a+r)/2),Math.floor(t-(o+s)/2)),i.setCenterPoint(a,r,o,s)},setCenterPoint:function(t,e,n,i){var a=this,r=a.width-e-a.drawingArea,o=t+a.drawingArea,s=n+a.drawingArea,l=a.height-a.paddingTop-i-a.drawingArea;a.xCenter=Math.floor((o+r)/2+a.left),a.yCenter=Math.floor((s+l)/2+a.top+a.paddingTop)},getIndexAngle:function(t){var e=this.chart,n=(t*(360/e.data.labels.length)+((e.options||{}).startAngle||0))%360;return(n<0?n+360:n)*Math.PI*2/360},getDistanceFromCenterForValue:function(t){var e=this;if(B.isNullOrUndef(t))return NaN;var n=e.drawingArea/(e.max-e.min);return e.options.ticks.reverse?(e.max-t)*n:(t-e.min)*n},getPointPosition:function(t,e){var n=this.getIndexAngle(t)-Math.PI/2;return{x:Math.cos(n)*e+this.xCenter,y:Math.sin(n)*e+this.yCenter}},getPointPositionForValue:function(t,e){return this.getPointPosition(t,this.getDistanceFromCenterForValue(e))},getBasePosition:function(t){var e=this.min,n=this.max;return this.getPointPositionForValue(t||0,this.beginAtZero?0:e<0&&n<0?n:e>0&&n>0?e:0)},_drawGrid:function(){var t,e,n,i=this,a=i.ctx,r=i.options,o=r.gridLines,s=r.angleLines,l=zn(s.lineWidth,o.lineWidth),u=zn(s.color,o.color);if(r.pointLabels.display&&function(t){var e=t.ctx,n=t.options,i=n.pointLabels,a=Bn(n),r=t.getDistanceFromCenterForValue(n.ticks.reverse?t.min:t.max),o=B.options._parseFont(i);e.save(),e.font=o.string,e.textBaseline="middle";for(var s=t.chart.data.labels.length-1;s>=0;s--){var l=0===s?a/2:0,u=t.getPointPosition(s,r+l+5),d=En(i.fontColor,s,Y.global.defaultFontColor);e.fillStyle=d;var h=t.getIndexAngle(s),c=B.toDegrees(h);e.textAlign=Un(c),qn(c,t._pointLabelSizes[s],u),Gn(e,t.pointLabels[s],u,o.lineHeight)}e.restore()}(i),o.display&&B.each(i.ticks,(function(t,n){0!==n&&(e=i.getDistanceFromCenterForValue(i.ticksAsNumbers[n]),function(t,e,n,i){var a,r=t.ctx,o=e.circular,s=t.chart.data.labels.length,l=En(e.color,i-1),u=En(e.lineWidth,i-1);if((o||s)&&l&&u){if(r.save(),r.strokeStyle=l,r.lineWidth=u,r.setLineDash&&(r.setLineDash(e.borderDash||[]),r.lineDashOffset=e.borderDashOffset||0),r.beginPath(),o)r.arc(t.xCenter,t.yCenter,n,0,2*Math.PI);else{a=t.getPointPosition(0,n),r.moveTo(a.x,a.y);for(var d=1;d<s;d++)a=t.getPointPosition(d,n),r.lineTo(a.x,a.y)}r.closePath(),r.stroke(),r.restore()}}(i,o,e,n))})),s.display&&l&&u){for(a.save(),a.lineWidth=l,a.strokeStyle=u,a.setLineDash&&(a.setLineDash(Vn([s.borderDash,o.borderDash,[]])),a.lineDashOffset=Vn([s.borderDashOffset,o.borderDashOffset,0])),t=i.chart.data.labels.length-1;t>=0;t--)e=i.getDistanceFromCenterForValue(r.ticks.reverse?i.min:i.max),n=i.getPointPosition(t,e),a.beginPath(),a.moveTo(i.xCenter,i.yCenter),a.lineTo(n.x,n.y),a.stroke();a.restore()}},_drawLabels:function(){var t=this,e=t.ctx,n=t.options.ticks;if(n.display){var i,a,r=t.getIndexAngle(0),o=B.options._parseFont(n),s=zn(n.fontColor,Y.global.defaultFontColor);e.save(),e.font=o.string,e.translate(t.xCenter,t.yCenter),e.rotate(r),e.textAlign="center",e.textBaseline="middle",B.each(t.ticks,(function(r,l){(0!==l||n.reverse)&&(i=t.getDistanceFromCenterForValue(t.ticksAsNumbers[l]),n.showLabelBackdrop&&(a=e.measureText(r).width,e.fillStyle=n.backdropColor,e.fillRect(-a/2-n.backdropPaddingX,-i-o.size/2-n.backdropPaddingY,a+2*n.backdropPaddingX,o.size+2*n.backdropPaddingY)),e.fillStyle=s,e.fillText(r,0,-i))})),e.restore()}},_drawTitle:B.noop}),Xn=Hn;$n._defaults=Xn;var Kn=B._deprecated,Jn=B.options.resolve,Qn=B.valueOrDefault,ti=Number.MIN_SAFE_INTEGER||-9007199254740991,ei=Number.MAX_SAFE_INTEGER||9007199254740991,ni={millisecond:{common:!0,size:1,steps:1e3},second:{common:!0,size:1e3,steps:60},minute:{common:!0,size:6e4,steps:60},hour:{common:!0,size:36e5,steps:24},day:{common:!0,size:864e5,steps:30},week:{common:!1,size:6048e5,steps:4},month:{common:!0,size:2628e6,steps:12},quarter:{common:!1,size:7884e6,steps:4},year:{common:!0,size:3154e7}},ii=Object.keys(ni);function ai(t,e){return t-e}function ri(t){return B.valueOrDefault(t.time.min,t.ticks.min)}function oi(t){return B.valueOrDefault(t.time.max,t.ticks.max)}function si(t,e,n,i){var a=function(t,e,n){for(var i,a,r,o=0,s=t.length-1;o>=0&&o<=s;){if(a=t[(i=o+s>>1)-1]||null,r=t[i],!a)return{lo:null,hi:r};if(r[e]<n)o=i+1;else{if(!(a[e]>n))return{lo:a,hi:r};s=i-1}}return{lo:r,hi:null}}(t,e,n),r=a.lo?a.hi?a.lo:t[t.length-2]:t[0],o=a.lo?a.hi?a.hi:t[t.length-1]:t[1],s=o[e]-r[e],l=s?(n-r[e])/s:0,u=(o[i]-r[i])*l;return r[i]+u}function li(t,e){var n=t._adapter,i=t.options.time,a=i.parser,r=a||i.format,o=e;return"function"==typeof a&&(o=a(o)),B.isFinite(o)||(o="string"==typeof r?n.parse(o,r):n.parse(o)),null!==o?+o:(a||"function"!=typeof r||(o=r(e),B.isFinite(o)||(o=n.parse(o))),o)}function ui(t,e){if(B.isNullOrUndef(e))return null;var n=t.options.time,i=li(t,t.getRightValue(e));return null===i?i:(n.round&&(i=+t._adapter.startOf(i,n.round)),i)}function di(t,e,n,i){var a,r,o,s=ii.length;for(a=ii.indexOf(t);a<s-1;++a)if(o=(r=ni[ii[a]]).steps?r.steps:ei,r.common&&Math.ceil((n-e)/(o*r.size))<=i)return ii[a];return ii[s-1]}function hi(t,e,n){var i,a,r=[],o={},s=e.length;for(i=0;i<s;++i)o[a=e[i]]=i,r.push({value:a,major:!1});return 0!==s&&n?function(t,e,n,i){var a,r,o=t._adapter,s=+o.startOf(e[0].value,i),l=e[e.length-1].value;for(a=s;a<=l;a=+o.add(a,1,i))(r=n[a])>=0&&(e[r].major=!0);return e}(t,r,o,n):r}var ci=_n.extend({initialize:function(){this.mergeTicksOptions(),_n.prototype.initialize.call(this)},update:function(){var t=this,e=t.options,n=e.time||(e.time={}),i=t._adapter=new on._date(e.adapters.date);return Kn("time scale",n.format,"time.format","time.parser"),Kn("time scale",n.min,"time.min","ticks.min"),Kn("time scale",n.max,"time.max","ticks.max"),B.mergeIf(n.displayFormats,i.formats()),_n.prototype.update.apply(t,arguments)},getRightValue:function(t){return t&&void 0!==t.t&&(t=t.t),_n.prototype.getRightValue.call(this,t)},determineDataLimits:function(){var t,e,n,i,a,r,o,s=this,l=s.chart,u=s._adapter,d=s.options,h=d.time.unit||"day",c=ei,f=ti,g=[],m=[],p=[],v=s._getLabels();for(t=0,n=v.length;t<n;++t)p.push(ui(s,v[t]));for(t=0,n=(l.data.datasets||[]).length;t<n;++t)if(l.isDatasetVisible(t))if(a=l.data.datasets[t].data,B.isObject(a[0]))for(m[t]=[],e=0,i=a.length;e<i;++e)r=ui(s,a[e]),g.push(r),m[t][e]=r;else m[t]=p.slice(0),o||(g=g.concat(p),o=!0);else m[t]=[];p.length&&(c=Math.min(c,p[0]),f=Math.max(f,p[p.length-1])),g.length&&(g=n>1?function(t){var e,n,i,a={},r=[];for(e=0,n=t.length;e<n;++e)a[i=t[e]]||(a[i]=!0,r.push(i));return r}(g).sort(ai):g.sort(ai),c=Math.min(c,g[0]),f=Math.max(f,g[g.length-1])),c=ui(s,ri(d))||c,f=ui(s,oi(d))||f,c=c===ei?+u.startOf(Date.now(),h):c,f=f===ti?+u.endOf(Date.now(),h)+1:f,s.min=Math.min(c,f),s.max=Math.max(c+1,f),s._table=[],s._timestamps={data:g,datasets:m,labels:p}},buildTicks:function(){var t,e,n,i=this,a=i.min,r=i.max,o=i.options,s=o.ticks,l=o.time,u=i._timestamps,d=[],h=i.getLabelCapacity(a),c=s.source,f=o.distribution;for(u="data"===c||"auto"===c&&"series"===f?u.data:"labels"===c?u.labels:function(t,e,n,i){var a,r=t._adapter,o=t.options,s=o.time,l=s.unit||di(s.minUnit,e,n,i),u=Jn([s.stepSize,s.unitStepSize,1]),d="week"===l&&s.isoWeekday,h=e,c=[];if(d&&(h=+r.startOf(h,"isoWeek",d)),h=+r.startOf(h,d?"day":l),r.diff(n,e,l)>1e5*u)throw e+" and "+n+" are too far apart with stepSize of "+u+" "+l;for(a=h;a<n;a=+r.add(a,u,l))c.push(a);return a!==n&&"ticks"!==o.bounds||c.push(a),c}(i,a,r,h),"ticks"===o.bounds&&u.length&&(a=u[0],r=u[u.length-1]),a=ui(i,ri(o))||a,r=ui(i,oi(o))||r,t=0,e=u.length;t<e;++t)(n=u[t])>=a&&n<=r&&d.push(n);return i.min=a,i.max=r,i._unit=l.unit||(s.autoSkip?di(l.minUnit,i.min,i.max,h):function(t,e,n,i,a){var r,o;for(r=ii.length-1;r>=ii.indexOf(n);r--)if(o=ii[r],ni[o].common&&t._adapter.diff(a,i,o)>=e-1)return o;return ii[n?ii.indexOf(n):0]}(i,d.length,l.minUnit,i.min,i.max)),i._majorUnit=s.major.enabled&&"year"!==i._unit?function(t){for(var e=ii.indexOf(t)+1,n=ii.length;e<n;++e)if(ni[ii[e]].common)return ii[e]}(i._unit):void 0,i._table=function(t,e,n,i){if("linear"===i||!t.length)return[{time:e,pos:0},{time:n,pos:1}];var a,r,o,s,l,u=[],d=[e];for(a=0,r=t.length;a<r;++a)(s=t[a])>e&&s<n&&d.push(s);for(d.push(n),a=0,r=d.length;a<r;++a)l=d[a+1],o=d[a-1],s=d[a],void 0!==o&&void 0!==l&&Math.round((l+o)/2)===s||u.push({time:s,pos:a/(r-1)});return u}(i._timestamps.data,a,r,f),i._offsets=function(t,e,n,i,a){var r,o,s=0,l=0;return a.offset&&e.length&&(r=si(t,"time",e[0],"pos"),s=1===e.length?1-r:(si(t,"time",e[1],"pos")-r)/2,o=si(t,"time",e[e.length-1],"pos"),l=1===e.length?o:(o-si(t,"time",e[e.length-2],"pos"))/2),{start:s,end:l,factor:1/(s+1+l)}}(i._table,d,0,0,o),s.reverse&&d.reverse(),hi(i,d,i._majorUnit)},getLabelForIndex:function(t,e){var n=this,i=n._adapter,a=n.chart.data,r=n.options.time,o=a.labels&&t<a.labels.length?a.labels[t]:"",s=a.datasets[e].data[t];return B.isObject(s)&&(o=n.getRightValue(s)),r.tooltipFormat?i.format(li(n,o),r.tooltipFormat):"string"==typeof o?o:i.format(li(n,o),r.displayFormats.datetime)},tickFormatFunction:function(t,e,n,i){var a=this._adapter,r=this.options,o=r.time.displayFormats,s=o[this._unit],l=this._majorUnit,u=o[l],d=n[e],h=r.ticks,c=l&&u&&d&&d.major,f=a.format(t,i||(c?u:s)),g=c?h.major:h.minor,m=Jn([g.callback,g.userCallback,h.callback,h.userCallback]);return m?m(f,e,n):f},convertTicksToLabels:function(t){var e,n,i=[];for(e=0,n=t.length;e<n;++e)i.push(this.tickFormatFunction(t[e].value,e,t));return i},getPixelForOffset:function(t){var e=this._offsets,n=si(this._table,"time",t,"pos");return this.getPixelForDecimal((e.start+n)*e.factor)},getPixelForValue:function(t,e,n){var i=null;if(void 0!==e&&void 0!==n&&(i=this._timestamps.datasets[n][e]),null===i&&(i=ui(this,t)),null!==i)return this.getPixelForOffset(i)},getPixelForTick:function(t){var e=this.getTicks();return t>=0&&t<e.length?this.getPixelForOffset(e[t].value):null},getValueForPixel:function(t){var e=this._offsets,n=this.getDecimalForPixel(t)/e.factor-e.end,i=si(this._table,"pos",n,"time");return this._adapter._create(i)},_getLabelSize:function(t){var e=this.options.ticks,n=this.ctx.measureText(t).width,i=B.toRadians(this.isHorizontal()?e.maxRotation:e.minRotation),a=Math.cos(i),r=Math.sin(i),o=Qn(e.fontSize,Y.global.defaultFontSize);return{w:n*a+o*r,h:n*r+o*a}},getLabelWidth:function(t){return this._getLabelSize(t).w},getLabelCapacity:function(t){var e=this,n=e.options.time,i=n.displayFormats,a=i[n.unit]||i.millisecond,r=e.tickFormatFunction(t,0,hi(e,[t],e._majorUnit),a),o=e._getLabelSize(r),s=Math.floor(e.isHorizontal()?e.width/o.w:e.height/o.h);return e.options.offset&&s--,s>0?s:1}}),fi={position:"bottom",distribution:"linear",bounds:"data",adapters:{},time:{parser:!1,unit:!1,round:!1,displayFormat:!1,isoWeekday:!1,minUnit:"millisecond",displayFormats:{}},ticks:{autoSkip:!1,source:"auto",major:{enabled:!1}}};ci._defaults=fi;var gi={category:kn,linear:An,logarithmic:Wn,radialLinear:$n,time:ci},mi=e((function(e,n){e.exports=function(){var n,i;function a(){return n.apply(null,arguments)}function r(t){return t instanceof Array||"[object Array]"===Object.prototype.toString.call(t)}function o(t){return null!=t&&"[object Object]"===Object.prototype.toString.call(t)}function s(t){return void 0===t}function l(t){return"number"==typeof t||"[object Number]"===Object.prototype.toString.call(t)}function u(t){return t instanceof Date||"[object Date]"===Object.prototype.toString.call(t)}function d(t,e){var n,i=[];for(n=0;n<t.length;++n)i.push(e(t[n],n));return i}function h(t,e){return Object.prototype.hasOwnProperty.call(t,e)}function c(t,e){for(var n in e)h(e,n)&&(t[n]=e[n]);return h(e,"toString")&&(t.toString=e.toString),h(e,"valueOf")&&(t.valueOf=e.valueOf),t}function f(t,e,n,i){return Ie(t,e,n,i,!0).utc()}function g(t){return null==t._pf&&(t._pf={empty:!1,unusedTokens:[],unusedInput:[],overflow:-2,charsLeftOver:0,nullInput:!1,invalidMonth:null,invalidFormat:!1,userInvalidated:!1,iso:!1,parsedDateParts:[],meridiem:null,rfc2822:!1,weekdayMismatch:!1}),t._pf}function m(t){if(null==t._isValid){var e=g(t),n=i.call(e.parsedDateParts,(function(t){return null!=t})),a=!isNaN(t._d.getTime())&&e.overflow<0&&!e.empty&&!e.invalidMonth&&!e.invalidWeekday&&!e.weekdayMismatch&&!e.nullInput&&!e.invalidFormat&&!e.userInvalidated&&(!e.meridiem||e.meridiem&&n);if(t._strict&&(a=a&&0===e.charsLeftOver&&0===e.unusedTokens.length&&void 0===e.bigHour),null!=Object.isFrozen&&Object.isFrozen(t))return a;t._isValid=a}return t._isValid}function p(t){var e=f(NaN);return null!=t?c(g(e),t):g(e).userInvalidated=!0,e}i=Array.prototype.some?Array.prototype.some:function(t){for(var e=Object(this),n=e.length>>>0,i=0;i<n;i++)if(i in e&&t.call(this,e[i],i,e))return!0;return!1};var v=a.momentProperties=[];function b(t,e){var n,i,a;if(s(e._isAMomentObject)||(t._isAMomentObject=e._isAMomentObject),s(e._i)||(t._i=e._i),s(e._f)||(t._f=e._f),s(e._l)||(t._l=e._l),s(e._strict)||(t._strict=e._strict),s(e._tzm)||(t._tzm=e._tzm),s(e._isUTC)||(t._isUTC=e._isUTC),s(e._offset)||(t._offset=e._offset),s(e._pf)||(t._pf=g(e)),s(e._locale)||(t._locale=e._locale),v.length>0)for(n=0;n<v.length;n++)s(a=e[i=v[n]])||(t[i]=a);return t}var y=!1;function x(t){b(this,t),this._d=new Date(null!=t._d?t._d.getTime():NaN),this.isValid()||(this._d=new Date(NaN)),!1===y&&(y=!0,a.updateOffset(this),y=!1)}function _(t){return t instanceof x||null!=t&&null!=t._isAMomentObject}function w(t){return t<0?Math.ceil(t)||0:Math.floor(t)}function k(t){var e=+t,n=0;return 0!==e&&isFinite(e)&&(n=w(e)),n}function M(t,e,n){var i,a=Math.min(t.length,e.length),r=Math.abs(t.length-e.length),o=0;for(i=0;i<a;i++)(n&&t[i]!==e[i]||!n&&k(t[i])!==k(e[i]))&&o++;return o+r}function S(t){!1===a.suppressDeprecationWarnings&&"undefined"!=typeof console&&console.warn&&console.warn("Deprecation warning: "+t)}function D(t,e){var n=!0;return c((function(){if(null!=a.deprecationHandler&&a.deprecationHandler(null,t),n){for(var i,r=[],o=0;o<arguments.length;o++){if(i="","object"==typeof arguments[o]){for(var s in i+="\n["+o+"] ",arguments[0])i+=s+": "+arguments[0][s]+", ";i=i.slice(0,-2)}else i=arguments[o];r.push(i)}S(t+"\nArguments: "+Array.prototype.slice.call(r).join("")+"\n"+(new Error).stack),n=!1}return e.apply(this,arguments)}),e)}var C,P={};function T(t,e){null!=a.deprecationHandler&&a.deprecationHandler(t,e),P[t]||(S(e),P[t]=!0)}function O(t){return t instanceof Function||"[object Function]"===Object.prototype.toString.call(t)}function A(t,e){var n,i=c({},t);for(n in e)h(e,n)&&(o(t[n])&&o(e[n])?(i[n]={},c(i[n],t[n]),c(i[n],e[n])):null!=e[n]?i[n]=e[n]:delete i[n]);for(n in t)h(t,n)&&!h(e,n)&&o(t[n])&&(i[n]=c({},i[n]));return i}function F(t){null!=t&&this.set(t)}a.suppressDeprecationWarnings=!1,a.deprecationHandler=null,C=Object.keys?Object.keys:function(t){var e,n=[];for(e in t)h(t,e)&&n.push(e);return n};var I={};function L(t,e){var n=t.toLowerCase();I[n]=I[n+"s"]=I[e]=t}function R(t){return"string"==typeof t?I[t]||I[t.toLowerCase()]:void 0}function N(t){var e,n,i={};for(n in t)h(t,n)&&(e=R(n))&&(i[e]=t[n]);return i}var W={};function Y(t,e){W[t]=e}function z(t,e,n){var i=""+Math.abs(t),a=e-i.length;return(t>=0?n?"+":"":"-")+Math.pow(10,Math.max(0,a)).toString().substr(1)+i}var E=/(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g,V=/(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g,H={},B={};function j(t,e,n,i){var a=i;"string"==typeof i&&(a=function(){return this[i]()}),t&&(B[t]=a),e&&(B[e[0]]=function(){return z(a.apply(this,arguments),e[1],e[2])}),n&&(B[n]=function(){return this.localeData().ordinal(a.apply(this,arguments),t)})}function U(t,e){return t.isValid()?(e=G(e,t.localeData()),H[e]=H[e]||function(t){var e,n,i,a=t.match(E);for(e=0,n=a.length;e<n;e++)B[a[e]]?a[e]=B[a[e]]:a[e]=(i=a[e]).match(/\[[\s\S]/)?i.replace(/^\[|\]$/g,""):i.replace(/\\/g,"");return function(e){var i,r="";for(i=0;i<n;i++)r+=O(a[i])?a[i].call(e,t):a[i];return r}}(e),H[e](t)):t.localeData().invalidDate()}function G(t,e){var n=5;function i(t){return e.longDateFormat(t)||t}for(V.lastIndex=0;n>=0&&V.test(t);)t=t.replace(V,i),V.lastIndex=0,n-=1;return t}var q=/\d/,Z=/\d\d/,$=/\d{3}/,X=/\d{4}/,K=/[+-]?\d{6}/,J=/\d\d?/,Q=/\d\d\d\d?/,tt=/\d\d\d\d\d\d?/,et=/\d{1,3}/,nt=/\d{1,4}/,it=/[+-]?\d{1,6}/,at=/\d+/,rt=/[+-]?\d+/,ot=/Z|[+-]\d\d:?\d\d/gi,st=/Z|[+-]\d\d(?::?\d\d)?/gi,lt=/[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFF07\uFF10-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i,ut={};function dt(t,e,n){ut[t]=O(e)?e:function(t,i){return t&&n?n:e}}function ht(t,e){return h(ut,t)?ut[t](e._strict,e._locale):new RegExp(ct(t.replace("\\","").replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,(function(t,e,n,i,a){return e||n||i||a}))))}function ct(t){return t.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}var ft={};function gt(t,e){var n,i=e;for("string"==typeof t&&(t=[t]),l(e)&&(i=function(t,n){n[e]=k(t)}),n=0;n<t.length;n++)ft[t[n]]=i}function mt(t,e){gt(t,(function(t,n,i,a){i._w=i._w||{},e(t,i._w,i,a)}))}function pt(t,e,n){null!=e&&h(ft,t)&&ft[t](e,n._a,n,t)}var vt=0,bt=1,yt=2,xt=3,_t=4,wt=5,kt=6,Mt=7,St=8;function Dt(t){return Ct(t)?366:365}function Ct(t){return t%4==0&&t%100!=0||t%400==0}j("Y",0,0,(function(){var t=this.year();return t<=9999?""+t:"+"+t})),j(0,["YY",2],0,(function(){return this.year()%100})),j(0,["YYYY",4],0,"year"),j(0,["YYYYY",5],0,"year"),j(0,["YYYYYY",6,!0],0,"year"),L("year","y"),Y("year",1),dt("Y",rt),dt("YY",J,Z),dt("YYYY",nt,X),dt("YYYYY",it,K),dt("YYYYYY",it,K),gt(["YYYYY","YYYYYY"],vt),gt("YYYY",(function(t,e){e[vt]=2===t.length?a.parseTwoDigitYear(t):k(t)})),gt("YY",(function(t,e){e[vt]=a.parseTwoDigitYear(t)})),gt("Y",(function(t,e){e[vt]=parseInt(t,10)})),a.parseTwoDigitYear=function(t){return k(t)+(k(t)>68?1900:2e3)};var Pt,Tt=Ot("FullYear",!0);function Ot(t,e){return function(n){return null!=n?(Ft(this,t,n),a.updateOffset(this,e),this):At(this,t)}}function At(t,e){return t.isValid()?t._d["get"+(t._isUTC?"UTC":"")+e]():NaN}function Ft(t,e,n){t.isValid()&&!isNaN(n)&&("FullYear"===e&&Ct(t.year())&&1===t.month()&&29===t.date()?t._d["set"+(t._isUTC?"UTC":"")+e](n,t.month(),It(n,t.month())):t._d["set"+(t._isUTC?"UTC":"")+e](n))}function It(t,e){if(isNaN(t)||isNaN(e))return NaN;var n=function(t,e){return(t%e+e)%e}(e,12);return t+=(e-n)/12,1===n?Ct(t)?29:28:31-n%7%2}Pt=Array.prototype.indexOf?Array.prototype.indexOf:function(t){var e;for(e=0;e<this.length;++e)if(this[e]===t)return e;return-1},j("M",["MM",2],"Mo",(function(){return this.month()+1})),j("MMM",0,0,(function(t){return this.localeData().monthsShort(this,t)})),j("MMMM",0,0,(function(t){return this.localeData().months(this,t)})),L("month","M"),Y("month",8),dt("M",J),dt("MM",J,Z),dt("MMM",(function(t,e){return e.monthsShortRegex(t)})),dt("MMMM",(function(t,e){return e.monthsRegex(t)})),gt(["M","MM"],(function(t,e){e[bt]=k(t)-1})),gt(["MMM","MMMM"],(function(t,e,n,i){var a=n._locale.monthsParse(t,i,n._strict);null!=a?e[bt]=a:g(n).invalidMonth=t}));var Lt=/D[oD]?(\[[^\[\]]*\]|\s)+MMMM?/,Rt="January_February_March_April_May_June_July_August_September_October_November_December".split("_"),Nt="Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_");function Wt(t,e,n){var i,a,r,o=t.toLocaleLowerCase();if(!this._monthsParse)for(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[],i=0;i<12;++i)r=f([2e3,i]),this._shortMonthsParse[i]=this.monthsShort(r,"").toLocaleLowerCase(),this._longMonthsParse[i]=this.months(r,"").toLocaleLowerCase();return n?"MMM"===e?-1!==(a=Pt.call(this._shortMonthsParse,o))?a:null:-1!==(a=Pt.call(this._longMonthsParse,o))?a:null:"MMM"===e?-1!==(a=Pt.call(this._shortMonthsParse,o))?a:-1!==(a=Pt.call(this._longMonthsParse,o))?a:null:-1!==(a=Pt.call(this._longMonthsParse,o))?a:-1!==(a=Pt.call(this._shortMonthsParse,o))?a:null}function Yt(t,e){var n;if(!t.isValid())return t;if("string"==typeof e)if(/^\d+$/.test(e))e=k(e);else if(!l(e=t.localeData().monthsParse(e)))return t;return n=Math.min(t.date(),It(t.year(),e)),t._d["set"+(t._isUTC?"UTC":"")+"Month"](e,n),t}function zt(t){return null!=t?(Yt(this,t),a.updateOffset(this,!0),this):At(this,"Month")}var Et=lt,Vt=lt;function Ht(){function t(t,e){return e.length-t.length}var e,n,i=[],a=[],r=[];for(e=0;e<12;e++)n=f([2e3,e]),i.push(this.monthsShort(n,"")),a.push(this.months(n,"")),r.push(this.months(n,"")),r.push(this.monthsShort(n,""));for(i.sort(t),a.sort(t),r.sort(t),e=0;e<12;e++)i[e]=ct(i[e]),a[e]=ct(a[e]);for(e=0;e<24;e++)r[e]=ct(r[e]);this._monthsRegex=new RegExp("^("+r.join("|")+")","i"),this._monthsShortRegex=this._monthsRegex,this._monthsStrictRegex=new RegExp("^("+a.join("|")+")","i"),this._monthsShortStrictRegex=new RegExp("^("+i.join("|")+")","i")}function Bt(t,e,n,i,a,r,o){var s;return t<100&&t>=0?(s=new Date(t+400,e,n,i,a,r,o),isFinite(s.getFullYear())&&s.setFullYear(t)):s=new Date(t,e,n,i,a,r,o),s}function jt(t){var e;if(t<100&&t>=0){var n=Array.prototype.slice.call(arguments);n[0]=t+400,e=new Date(Date.UTC.apply(null,n)),isFinite(e.getUTCFullYear())&&e.setUTCFullYear(t)}else e=new Date(Date.UTC.apply(null,arguments));return e}function Ut(t,e,n){var i=7+e-n;return-(7+jt(t,0,i).getUTCDay()-e)%7+i-1}function Gt(t,e,n,i,a){var r,o,s=1+7*(e-1)+(7+n-i)%7+Ut(t,i,a);return s<=0?o=Dt(r=t-1)+s:s>Dt(t)?(r=t+1,o=s-Dt(t)):(r=t,o=s),{year:r,dayOfYear:o}}function qt(t,e,n){var i,a,r=Ut(t.year(),e,n),o=Math.floor((t.dayOfYear()-r-1)/7)+1;return o<1?i=o+Zt(a=t.year()-1,e,n):o>Zt(t.year(),e,n)?(i=o-Zt(t.year(),e,n),a=t.year()+1):(a=t.year(),i=o),{week:i,year:a}}function Zt(t,e,n){var i=Ut(t,e,n),a=Ut(t+1,e,n);return(Dt(t)-i+a)/7}function $t(t,e){return t.slice(e,7).concat(t.slice(0,e))}j("w",["ww",2],"wo","week"),j("W",["WW",2],"Wo","isoWeek"),L("week","w"),L("isoWeek","W"),Y("week",5),Y("isoWeek",5),dt("w",J),dt("ww",J,Z),dt("W",J),dt("WW",J,Z),mt(["w","ww","W","WW"],(function(t,e,n,i){e[i.substr(0,1)]=k(t)})),j("d",0,"do","day"),j("dd",0,0,(function(t){return this.localeData().weekdaysMin(this,t)})),j("ddd",0,0,(function(t){return this.localeData().weekdaysShort(this,t)})),j("dddd",0,0,(function(t){return this.localeData().weekdays(this,t)})),j("e",0,0,"weekday"),j("E",0,0,"isoWeekday"),L("day","d"),L("weekday","e"),L("isoWeekday","E"),Y("day",11),Y("weekday",11),Y("isoWeekday",11),dt("d",J),dt("e",J),dt("E",J),dt("dd",(function(t,e){return e.weekdaysMinRegex(t)})),dt("ddd",(function(t,e){return e.weekdaysShortRegex(t)})),dt("dddd",(function(t,e){return e.weekdaysRegex(t)})),mt(["dd","ddd","dddd"],(function(t,e,n,i){var a=n._locale.weekdaysParse(t,i,n._strict);null!=a?e.d=a:g(n).invalidWeekday=t})),mt(["d","e","E"],(function(t,e,n,i){e[i]=k(t)}));var Xt="Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),Kt="Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),Jt="Su_Mo_Tu_We_Th_Fr_Sa".split("_");function Qt(t,e,n){var i,a,r,o=t.toLocaleLowerCase();if(!this._weekdaysParse)for(this._weekdaysParse=[],this._shortWeekdaysParse=[],this._minWeekdaysParse=[],i=0;i<7;++i)r=f([2e3,1]).day(i),this._minWeekdaysParse[i]=this.weekdaysMin(r,"").toLocaleLowerCase(),this._shortWeekdaysParse[i]=this.weekdaysShort(r,"").toLocaleLowerCase(),this._weekdaysParse[i]=this.weekdays(r,"").toLocaleLowerCase();return n?"dddd"===e?-1!==(a=Pt.call(this._weekdaysParse,o))?a:null:"ddd"===e?-1!==(a=Pt.call(this._shortWeekdaysParse,o))?a:null:-1!==(a=Pt.call(this._minWeekdaysParse,o))?a:null:"dddd"===e?-1!==(a=Pt.call(this._weekdaysParse,o))?a:-1!==(a=Pt.call(this._shortWeekdaysParse,o))?a:-1!==(a=Pt.call(this._minWeekdaysParse,o))?a:null:"ddd"===e?-1!==(a=Pt.call(this._shortWeekdaysParse,o))?a:-1!==(a=Pt.call(this._weekdaysParse,o))?a:-1!==(a=Pt.call(this._minWeekdaysParse,o))?a:null:-1!==(a=Pt.call(this._minWeekdaysParse,o))?a:-1!==(a=Pt.call(this._weekdaysParse,o))?a:-1!==(a=Pt.call(this._shortWeekdaysParse,o))?a:null}var te=lt,ee=lt,ne=lt;function ie(){function t(t,e){return e.length-t.length}var e,n,i,a,r,o=[],s=[],l=[],u=[];for(e=0;e<7;e++)n=f([2e3,1]).day(e),i=this.weekdaysMin(n,""),a=this.weekdaysShort(n,""),r=this.weekdays(n,""),o.push(i),s.push(a),l.push(r),u.push(i),u.push(a),u.push(r);for(o.sort(t),s.sort(t),l.sort(t),u.sort(t),e=0;e<7;e++)s[e]=ct(s[e]),l[e]=ct(l[e]),u[e]=ct(u[e]);this._weekdaysRegex=new RegExp("^("+u.join("|")+")","i"),this._weekdaysShortRegex=this._weekdaysRegex,this._weekdaysMinRegex=this._weekdaysRegex,this._weekdaysStrictRegex=new RegExp("^("+l.join("|")+")","i"),this._weekdaysShortStrictRegex=new RegExp("^("+s.join("|")+")","i"),this._weekdaysMinStrictRegex=new RegExp("^("+o.join("|")+")","i")}function ae(){return this.hours()%12||12}function re(t,e){j(t,0,0,(function(){return this.localeData().meridiem(this.hours(),this.minutes(),e)}))}function oe(t,e){return e._meridiemParse}j("H",["HH",2],0,"hour"),j("h",["hh",2],0,ae),j("k",["kk",2],0,(function(){return this.hours()||24})),j("hmm",0,0,(function(){return""+ae.apply(this)+z(this.minutes(),2)})),j("hmmss",0,0,(function(){return""+ae.apply(this)+z(this.minutes(),2)+z(this.seconds(),2)})),j("Hmm",0,0,(function(){return""+this.hours()+z(this.minutes(),2)})),j("Hmmss",0,0,(function(){return""+this.hours()+z(this.minutes(),2)+z(this.seconds(),2)})),re("a",!0),re("A",!1),L("hour","h"),Y("hour",13),dt("a",oe),dt("A",oe),dt("H",J),dt("h",J),dt("k",J),dt("HH",J,Z),dt("hh",J,Z),dt("kk",J,Z),dt("hmm",Q),dt("hmmss",tt),dt("Hmm",Q),dt("Hmmss",tt),gt(["H","HH"],xt),gt(["k","kk"],(function(t,e,n){var i=k(t);e[xt]=24===i?0:i})),gt(["a","A"],(function(t,e,n){n._isPm=n._locale.isPM(t),n._meridiem=t})),gt(["h","hh"],(function(t,e,n){e[xt]=k(t),g(n).bigHour=!0})),gt("hmm",(function(t,e,n){var i=t.length-2;e[xt]=k(t.substr(0,i)),e[_t]=k(t.substr(i)),g(n).bigHour=!0})),gt("hmmss",(function(t,e,n){var i=t.length-4,a=t.length-2;e[xt]=k(t.substr(0,i)),e[_t]=k(t.substr(i,2)),e[wt]=k(t.substr(a)),g(n).bigHour=!0})),gt("Hmm",(function(t,e,n){var i=t.length-2;e[xt]=k(t.substr(0,i)),e[_t]=k(t.substr(i))})),gt("Hmmss",(function(t,e,n){var i=t.length-4,a=t.length-2;e[xt]=k(t.substr(0,i)),e[_t]=k(t.substr(i,2)),e[wt]=k(t.substr(a))}));var se,le=Ot("Hours",!0),ue={calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},longDateFormat:{LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},invalidDate:"Invalid date",ordinal:"%d",dayOfMonthOrdinalParse:/\d{1,2}/,relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},months:Rt,monthsShort:Nt,week:{dow:0,doy:6},weekdays:Xt,weekdaysMin:Jt,weekdaysShort:Kt,meridiemParse:/[ap]\.?m?\.?/i},de={},he={};function ce(t){return t?t.toLowerCase().replace("_","-"):t}function fe(n){var i=null;if(!de[n]&&e&&e.exports)try{i=se._abbr,t(),ge(i)}catch(t){}return de[n]}function ge(t,e){var n;return t&&((n=s(e)?pe(t):me(t,e))?se=n:"undefined"!=typeof console&&console.warn&&console.warn("Locale "+t+" not found. Did you forget to load it?")),se._abbr}function me(t,e){if(null!==e){var n,i=ue;if(e.abbr=t,null!=de[t])T("defineLocaleOverride","use moment.updateLocale(localeName, config) to change an existing locale. moment.defineLocale(localeName, config) should only be used for creating a new locale See http://momentjs.com/guides/#/warnings/define-locale/ for more info."),i=de[t]._config;else if(null!=e.parentLocale)if(null!=de[e.parentLocale])i=de[e.parentLocale]._config;else{if(null==(n=fe(e.parentLocale)))return he[e.parentLocale]||(he[e.parentLocale]=[]),he[e.parentLocale].push({name:t,config:e}),null;i=n._config}return de[t]=new F(A(i,e)),he[t]&&he[t].forEach((function(t){me(t.name,t.config)})),ge(t),de[t]}return delete de[t],null}function pe(t){var e;if(t&&t._locale&&t._locale._abbr&&(t=t._locale._abbr),!t)return se;if(!r(t)){if(e=fe(t))return e;t=[t]}return function(t){for(var e,n,i,a,r=0;r<t.length;){for(e=(a=ce(t[r]).split("-")).length,n=(n=ce(t[r+1]))?n.split("-"):null;e>0;){if(i=fe(a.slice(0,e).join("-")))return i;if(n&&n.length>=e&&M(a,n,!0)>=e-1)break;e--}r++}return se}(t)}function ve(t){var e,n=t._a;return n&&-2===g(t).overflow&&(e=n[bt]<0||n[bt]>11?bt:n[yt]<1||n[yt]>It(n[vt],n[bt])?yt:n[xt]<0||n[xt]>24||24===n[xt]&&(0!==n[_t]||0!==n[wt]||0!==n[kt])?xt:n[_t]<0||n[_t]>59?_t:n[wt]<0||n[wt]>59?wt:n[kt]<0||n[kt]>999?kt:-1,g(t)._overflowDayOfYear&&(e<vt||e>yt)&&(e=yt),g(t)._overflowWeeks&&-1===e&&(e=Mt),g(t)._overflowWeekday&&-1===e&&(e=St),g(t).overflow=e),t}function be(t,e,n){return null!=t?t:null!=e?e:n}function ye(t){var e,n,i,r,o,s=[];if(!t._d){for(i=function(t){var e=new Date(a.now());return t._useUTC?[e.getUTCFullYear(),e.getUTCMonth(),e.getUTCDate()]:[e.getFullYear(),e.getMonth(),e.getDate()]}(t),t._w&&null==t._a[yt]&&null==t._a[bt]&&function(t){var e,n,i,a,r,o,s,l;if(null!=(e=t._w).GG||null!=e.W||null!=e.E)r=1,o=4,n=be(e.GG,t._a[vt],qt(Le(),1,4).year),i=be(e.W,1),((a=be(e.E,1))<1||a>7)&&(l=!0);else{r=t._locale._week.dow,o=t._locale._week.doy;var u=qt(Le(),r,o);n=be(e.gg,t._a[vt],u.year),i=be(e.w,u.week),null!=e.d?((a=e.d)<0||a>6)&&(l=!0):null!=e.e?(a=e.e+r,(e.e<0||e.e>6)&&(l=!0)):a=r}i<1||i>Zt(n,r,o)?g(t)._overflowWeeks=!0:null!=l?g(t)._overflowWeekday=!0:(s=Gt(n,i,a,r,o),t._a[vt]=s.year,t._dayOfYear=s.dayOfYear)}(t),null!=t._dayOfYear&&(o=be(t._a[vt],i[vt]),(t._dayOfYear>Dt(o)||0===t._dayOfYear)&&(g(t)._overflowDayOfYear=!0),n=jt(o,0,t._dayOfYear),t._a[bt]=n.getUTCMonth(),t._a[yt]=n.getUTCDate()),e=0;e<3&&null==t._a[e];++e)t._a[e]=s[e]=i[e];for(;e<7;e++)t._a[e]=s[e]=null==t._a[e]?2===e?1:0:t._a[e];24===t._a[xt]&&0===t._a[_t]&&0===t._a[wt]&&0===t._a[kt]&&(t._nextDay=!0,t._a[xt]=0),t._d=(t._useUTC?jt:Bt).apply(null,s),r=t._useUTC?t._d.getUTCDay():t._d.getDay(),null!=t._tzm&&t._d.setUTCMinutes(t._d.getUTCMinutes()-t._tzm),t._nextDay&&(t._a[xt]=24),t._w&&void 0!==t._w.d&&t._w.d!==r&&(g(t).weekdayMismatch=!0)}}var xe=/^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,_e=/^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,we=/Z|[+-]\d\d(?::?\d\d)?/,ke=[["YYYYYY-MM-DD",/[+-]\d{6}-\d\d-\d\d/],["YYYY-MM-DD",/\d{4}-\d\d-\d\d/],["GGGG-[W]WW-E",/\d{4}-W\d\d-\d/],["GGGG-[W]WW",/\d{4}-W\d\d/,!1],["YYYY-DDD",/\d{4}-\d{3}/],["YYYY-MM",/\d{4}-\d\d/,!1],["YYYYYYMMDD",/[+-]\d{10}/],["YYYYMMDD",/\d{8}/],["GGGG[W]WWE",/\d{4}W\d{3}/],["GGGG[W]WW",/\d{4}W\d{2}/,!1],["YYYYDDD",/\d{7}/]],Me=[["HH:mm:ss.SSSS",/\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss,SSSS",/\d\d:\d\d:\d\d,\d+/],["HH:mm:ss",/\d\d:\d\d:\d\d/],["HH:mm",/\d\d:\d\d/],["HHmmss.SSSS",/\d\d\d\d\d\d\.\d+/],["HHmmss,SSSS",/\d\d\d\d\d\d,\d+/],["HHmmss",/\d\d\d\d\d\d/],["HHmm",/\d\d\d\d/],["HH",/\d\d/]],Se=/^\/?Date\((\-?\d+)/i;function De(t){var e,n,i,a,r,o,s=t._i,l=xe.exec(s)||_e.exec(s);if(l){for(g(t).iso=!0,e=0,n=ke.length;e<n;e++)if(ke[e][1].exec(l[1])){a=ke[e][0],i=!1!==ke[e][2];break}if(null==a)return void(t._isValid=!1);if(l[3]){for(e=0,n=Me.length;e<n;e++)if(Me[e][1].exec(l[3])){r=(l[2]||" ")+Me[e][0];break}if(null==r)return void(t._isValid=!1)}if(!i&&null!=r)return void(t._isValid=!1);if(l[4]){if(!we.exec(l[4]))return void(t._isValid=!1);o="Z"}t._f=a+(r||"")+(o||""),Ae(t)}else t._isValid=!1}var Ce=/^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\s)?(\d{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\d{2,4})\s(\d\d):(\d\d)(?::(\d\d))?\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|([+-]\d{4}))$/;function Pe(t){var e=parseInt(t,10);return e<=49?2e3+e:e<=999?1900+e:e}var Te={UT:0,GMT:0,EDT:-240,EST:-300,CDT:-300,CST:-360,MDT:-360,MST:-420,PDT:-420,PST:-480};function Oe(t){var e,n,i,a,r,o,s,l=Ce.exec(t._i.replace(/\([^)]*\)|[\n\t]/g," ").replace(/(\s\s+)/g," ").replace(/^\s\s*/,"").replace(/\s\s*$/,""));if(l){var u=(e=l[4],n=l[3],i=l[2],a=l[5],r=l[6],o=l[7],s=[Pe(e),Nt.indexOf(n),parseInt(i,10),parseInt(a,10),parseInt(r,10)],o&&s.push(parseInt(o,10)),s);if(!function(t,e,n){return!t||Kt.indexOf(t)===new Date(e[0],e[1],e[2]).getDay()||(g(n).weekdayMismatch=!0,n._isValid=!1,!1)}(l[1],u,t))return;t._a=u,t._tzm=function(t,e,n){if(t)return Te[t];if(e)return 0;var i=parseInt(n,10),a=i%100;return(i-a)/100*60+a}(l[8],l[9],l[10]),t._d=jt.apply(null,t._a),t._d.setUTCMinutes(t._d.getUTCMinutes()-t._tzm),g(t).rfc2822=!0}else t._isValid=!1}function Ae(t){if(t._f!==a.ISO_8601)if(t._f!==a.RFC_2822){t._a=[],g(t).empty=!0;var e,n,i,r,o,s=""+t._i,l=s.length,u=0;for(i=G(t._f,t._locale).match(E)||[],e=0;e<i.length;e++)r=i[e],(n=(s.match(ht(r,t))||[])[0])&&((o=s.substr(0,s.indexOf(n))).length>0&&g(t).unusedInput.push(o),s=s.slice(s.indexOf(n)+n.length),u+=n.length),B[r]?(n?g(t).empty=!1:g(t).unusedTokens.push(r),pt(r,n,t)):t._strict&&!n&&g(t).unusedTokens.push(r);g(t).charsLeftOver=l-u,s.length>0&&g(t).unusedInput.push(s),t._a[xt]<=12&&!0===g(t).bigHour&&t._a[xt]>0&&(g(t).bigHour=void 0),g(t).parsedDateParts=t._a.slice(0),g(t).meridiem=t._meridiem,t._a[xt]=function(t,e,n){var i;return null==n?e:null!=t.meridiemHour?t.meridiemHour(e,n):null!=t.isPM?((i=t.isPM(n))&&e<12&&(e+=12),i||12!==e||(e=0),e):e}(t._locale,t._a[xt],t._meridiem),ye(t),ve(t)}else Oe(t);else De(t)}function Fe(t){var e=t._i,n=t._f;return t._locale=t._locale||pe(t._l),null===e||void 0===n&&""===e?p({nullInput:!0}):("string"==typeof e&&(t._i=e=t._locale.preparse(e)),_(e)?new x(ve(e)):(u(e)?t._d=e:r(n)?function(t){var e,n,i,a,r;if(0===t._f.length)return g(t).invalidFormat=!0,void(t._d=new Date(NaN));for(a=0;a<t._f.length;a++)r=0,e=b({},t),null!=t._useUTC&&(e._useUTC=t._useUTC),e._f=t._f[a],Ae(e),m(e)&&(r+=g(e).charsLeftOver,r+=10*g(e).unusedTokens.length,g(e).score=r,(null==i||r<i)&&(i=r,n=e));c(t,n||e)}(t):n?Ae(t):function(t){var e=t._i;s(e)?t._d=new Date(a.now()):u(e)?t._d=new Date(e.valueOf()):"string"==typeof e?function(t){var e=Se.exec(t._i);null===e?(De(t),!1===t._isValid&&(delete t._isValid,Oe(t),!1===t._isValid&&(delete t._isValid,a.createFromInputFallback(t)))):t._d=new Date(+e[1])}(t):r(e)?(t._a=d(e.slice(0),(function(t){return parseInt(t,10)})),ye(t)):o(e)?function(t){if(!t._d){var e=N(t._i);t._a=d([e.year,e.month,e.day||e.date,e.hour,e.minute,e.second,e.millisecond],(function(t){return t&&parseInt(t,10)})),ye(t)}}(t):l(e)?t._d=new Date(e):a.createFromInputFallback(t)}(t),m(t)||(t._d=null),t))}function Ie(t,e,n,i,a){var s,l={};return!0!==n&&!1!==n||(i=n,n=void 0),(o(t)&&function(t){if(Object.getOwnPropertyNames)return 0===Object.getOwnPropertyNames(t).length;var e;for(e in t)if(t.hasOwnProperty(e))return!1;return!0}(t)||r(t)&&0===t.length)&&(t=void 0),l._isAMomentObject=!0,l._useUTC=l._isUTC=a,l._l=n,l._i=t,l._f=e,l._strict=i,(s=new x(ve(Fe(l))))._nextDay&&(s.add(1,"d"),s._nextDay=void 0),s}function Le(t,e,n,i){return Ie(t,e,n,i,!1)}a.createFromInputFallback=D("value provided is not in a recognized RFC2822 or ISO format. moment construction falls back to js Date(), which is not reliable across all browsers and versions. Non RFC2822/ISO date formats are discouraged and will be removed in an upcoming major release. Please refer to http://momentjs.com/guides/#/warnings/js-date/ for more info.",(function(t){t._d=new Date(t._i+(t._useUTC?" UTC":""))})),a.ISO_8601=function(){},a.RFC_2822=function(){};var Re=D("moment().min is deprecated, use moment.max instead. http://momentjs.com/guides/#/warnings/min-max/",(function(){var t=Le.apply(null,arguments);return this.isValid()&&t.isValid()?t<this?this:t:p()})),Ne=D("moment().max is deprecated, use moment.min instead. http://momentjs.com/guides/#/warnings/min-max/",(function(){var t=Le.apply(null,arguments);return this.isValid()&&t.isValid()?t>this?this:t:p()}));function We(t,e){var n,i;if(1===e.length&&r(e[0])&&(e=e[0]),!e.length)return Le();for(n=e[0],i=1;i<e.length;++i)e[i].isValid()&&!e[i][t](n)||(n=e[i]);return n}var Ye=["year","quarter","month","week","day","hour","minute","second","millisecond"];function ze(t){var e=N(t),n=e.year||0,i=e.quarter||0,a=e.month||0,r=e.week||e.isoWeek||0,o=e.day||0,s=e.hour||0,l=e.minute||0,u=e.second||0,d=e.millisecond||0;this._isValid=function(t){for(var e in t)if(-1===Pt.call(Ye,e)||null!=t[e]&&isNaN(t[e]))return!1;for(var n=!1,i=0;i<Ye.length;++i)if(t[Ye[i]]){if(n)return!1;parseFloat(t[Ye[i]])!==k(t[Ye[i]])&&(n=!0)}return!0}(e),this._milliseconds=+d+1e3*u+6e4*l+1e3*s*60*60,this._days=+o+7*r,this._months=+a+3*i+12*n,this._data={},this._locale=pe(),this._bubble()}function Ee(t){return t instanceof ze}function Ve(t){return t<0?-1*Math.round(-1*t):Math.round(t)}function He(t,e){j(t,0,0,(function(){var t=this.utcOffset(),n="+";return t<0&&(t=-t,n="-"),n+z(~~(t/60),2)+e+z(~~t%60,2)}))}He("Z",":"),He("ZZ",""),dt("Z",st),dt("ZZ",st),gt(["Z","ZZ"],(function(t,e,n){n._useUTC=!0,n._tzm=je(st,t)}));var Be=/([\+\-]|\d\d)/gi;function je(t,e){var n=(e||"").match(t);if(null===n)return null;var i=((n[n.length-1]||[])+"").match(Be)||["-",0,0],a=60*i[1]+k(i[2]);return 0===a?0:"+"===i[0]?a:-a}function Ue(t,e){var n,i;return e._isUTC?(n=e.clone(),i=(_(t)||u(t)?t.valueOf():Le(t).valueOf())-n.valueOf(),n._d.setTime(n._d.valueOf()+i),a.updateOffset(n,!1),n):Le(t).local()}function Ge(t){return 15*-Math.round(t._d.getTimezoneOffset()/15)}function qe(){return!!this.isValid()&&this._isUTC&&0===this._offset}a.updateOffset=function(){};var Ze=/^(\-|\+)?(?:(\d*)[. ])?(\d+)\:(\d+)(?:\:(\d+)(\.\d*)?)?$/,$e=/^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/;function Xe(t,e){var n,i,a,r,o,s,u=t,d=null;return Ee(t)?u={ms:t._milliseconds,d:t._days,M:t._months}:l(t)?(u={},e?u[e]=t:u.milliseconds=t):(d=Ze.exec(t))?(n="-"===d[1]?-1:1,u={y:0,d:k(d[yt])*n,h:k(d[xt])*n,m:k(d[_t])*n,s:k(d[wt])*n,ms:k(Ve(1e3*d[kt]))*n}):(d=$e.exec(t))?(n="-"===d[1]?-1:1,u={y:Ke(d[2],n),M:Ke(d[3],n),w:Ke(d[4],n),d:Ke(d[5],n),h:Ke(d[6],n),m:Ke(d[7],n),s:Ke(d[8],n)}):null==u?u={}:"object"==typeof u&&("from"in u||"to"in u)&&(r=Le(u.from),o=Le(u.to),a=r.isValid()&&o.isValid()?(o=Ue(o,r),r.isBefore(o)?s=Je(r,o):((s=Je(o,r)).milliseconds=-s.milliseconds,s.months=-s.months),s):{milliseconds:0,months:0},(u={}).ms=a.milliseconds,u.M=a.months),i=new ze(u),Ee(t)&&h(t,"_locale")&&(i._locale=t._locale),i}function Ke(t,e){var n=t&&parseFloat(t.replace(",","."));return(isNaN(n)?0:n)*e}function Je(t,e){var n={};return n.months=e.month()-t.month()+12*(e.year()-t.year()),t.clone().add(n.months,"M").isAfter(e)&&--n.months,n.milliseconds=+e-+t.clone().add(n.months,"M"),n}function Qe(t,e){return function(n,i){var a;return null===i||isNaN(+i)||(T(e,"moment()."+e+"(period, number) is deprecated. Please use moment()."+e+"(number, period). See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info."),a=n,n=i,i=a),tn(this,Xe(n="string"==typeof n?+n:n,i),t),this}}function tn(t,e,n,i){var r=e._milliseconds,o=Ve(e._days),s=Ve(e._months);t.isValid()&&(i=null==i||i,s&&Yt(t,At(t,"Month")+s*n),o&&Ft(t,"Date",At(t,"Date")+o*n),r&&t._d.setTime(t._d.valueOf()+r*n),i&&a.updateOffset(t,o||s))}Xe.fn=ze.prototype,Xe.invalid=function(){return Xe(NaN)};var en=Qe(1,"add"),nn=Qe(-1,"subtract");function an(t,e){var n=12*(e.year()-t.year())+(e.month()-t.month()),i=t.clone().add(n,"months");return-(n+(e-i<0?(e-i)/(i-t.clone().add(n-1,"months")):(e-i)/(t.clone().add(n+1,"months")-i)))||0}function rn(t){var e;return void 0===t?this._locale._abbr:(null!=(e=pe(t))&&(this._locale=e),this)}a.defaultFormat="YYYY-MM-DDTHH:mm:ssZ",a.defaultFormatUtc="YYYY-MM-DDTHH:mm:ss[Z]";var on=D("moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.",(function(t){return void 0===t?this.localeData():this.locale(t)}));function sn(){return this._locale}var ln=1e3,un=60*ln,dn=60*un,hn=3506328*dn;function cn(t,e){return(t%e+e)%e}function fn(t,e,n){return t<100&&t>=0?new Date(t+400,e,n)-hn:new Date(t,e,n).valueOf()}function gn(t,e,n){return t<100&&t>=0?Date.UTC(t+400,e,n)-hn:Date.UTC(t,e,n)}function mn(t,e){j(0,[t,t.length],0,e)}function pn(t,e,n,i,a){var r;return null==t?qt(this,i,a).year:(e>(r=Zt(t,i,a))&&(e=r),vn.call(this,t,e,n,i,a))}function vn(t,e,n,i,a){var r=Gt(t,e,n,i,a),o=jt(r.year,0,r.dayOfYear);return this.year(o.getUTCFullYear()),this.month(o.getUTCMonth()),this.date(o.getUTCDate()),this}j(0,["gg",2],0,(function(){return this.weekYear()%100})),j(0,["GG",2],0,(function(){return this.isoWeekYear()%100})),mn("gggg","weekYear"),mn("ggggg","weekYear"),mn("GGGG","isoWeekYear"),mn("GGGGG","isoWeekYear"),L("weekYear","gg"),L("isoWeekYear","GG"),Y("weekYear",1),Y("isoWeekYear",1),dt("G",rt),dt("g",rt),dt("GG",J,Z),dt("gg",J,Z),dt("GGGG",nt,X),dt("gggg",nt,X),dt("GGGGG",it,K),dt("ggggg",it,K),mt(["gggg","ggggg","GGGG","GGGGG"],(function(t,e,n,i){e[i.substr(0,2)]=k(t)})),mt(["gg","GG"],(function(t,e,n,i){e[i]=a.parseTwoDigitYear(t)})),j("Q",0,"Qo","quarter"),L("quarter","Q"),Y("quarter",7),dt("Q",q),gt("Q",(function(t,e){e[bt]=3*(k(t)-1)})),j("D",["DD",2],"Do","date"),L("date","D"),Y("date",9),dt("D",J),dt("DD",J,Z),dt("Do",(function(t,e){return t?e._dayOfMonthOrdinalParse||e._ordinalParse:e._dayOfMonthOrdinalParseLenient})),gt(["D","DD"],yt),gt("Do",(function(t,e){e[yt]=k(t.match(J)[0])}));var bn=Ot("Date",!0);j("DDD",["DDDD",3],"DDDo","dayOfYear"),L("dayOfYear","DDD"),Y("dayOfYear",4),dt("DDD",et),dt("DDDD",$),gt(["DDD","DDDD"],(function(t,e,n){n._dayOfYear=k(t)})),j("m",["mm",2],0,"minute"),L("minute","m"),Y("minute",14),dt("m",J),dt("mm",J,Z),gt(["m","mm"],_t);var yn=Ot("Minutes",!1);j("s",["ss",2],0,"second"),L("second","s"),Y("second",15),dt("s",J),dt("ss",J,Z),gt(["s","ss"],wt);var xn,_n=Ot("Seconds",!1);for(j("S",0,0,(function(){return~~(this.millisecond()/100)})),j(0,["SS",2],0,(function(){return~~(this.millisecond()/10)})),j(0,["SSS",3],0,"millisecond"),j(0,["SSSS",4],0,(function(){return 10*this.millisecond()})),j(0,["SSSSS",5],0,(function(){return 100*this.millisecond()})),j(0,["SSSSSS",6],0,(function(){return 1e3*this.millisecond()})),j(0,["SSSSSSS",7],0,(function(){return 1e4*this.millisecond()})),j(0,["SSSSSSSS",8],0,(function(){return 1e5*this.millisecond()})),j(0,["SSSSSSSSS",9],0,(function(){return 1e6*this.millisecond()})),L("millisecond","ms"),Y("millisecond",16),dt("S",et,q),dt("SS",et,Z),dt("SSS",et,$),xn="SSSS";xn.length<=9;xn+="S")dt(xn,at);function wn(t,e){e[kt]=k(1e3*("0."+t))}for(xn="S";xn.length<=9;xn+="S")gt(xn,wn);var kn=Ot("Milliseconds",!1);j("z",0,0,"zoneAbbr"),j("zz",0,0,"zoneName");var Mn=x.prototype;function Sn(t){return t}Mn.add=en,Mn.calendar=function(t,e){var n=t||Le(),i=Ue(n,this).startOf("day"),r=a.calendarFormat(this,i)||"sameElse",o=e&&(O(e[r])?e[r].call(this,n):e[r]);return this.format(o||this.localeData().calendar(r,this,Le(n)))},Mn.clone=function(){return new x(this)},Mn.diff=function(t,e,n){var i,a,r;if(!this.isValid())return NaN;if(!(i=Ue(t,this)).isValid())return NaN;switch(a=6e4*(i.utcOffset()-this.utcOffset()),e=R(e)){case"year":r=an(this,i)/12;break;case"month":r=an(this,i);break;case"quarter":r=an(this,i)/3;break;case"second":r=(this-i)/1e3;break;case"minute":r=(this-i)/6e4;break;case"hour":r=(this-i)/36e5;break;case"day":r=(this-i-a)/864e5;break;case"week":r=(this-i-a)/6048e5;break;default:r=this-i}return n?r:w(r)},Mn.endOf=function(t){var e;if(void 0===(t=R(t))||"millisecond"===t||!this.isValid())return this;var n=this._isUTC?gn:fn;switch(t){case"year":e=n(this.year()+1,0,1)-1;break;case"quarter":e=n(this.year(),this.month()-this.month()%3+3,1)-1;break;case"month":e=n(this.year(),this.month()+1,1)-1;break;case"week":e=n(this.year(),this.month(),this.date()-this.weekday()+7)-1;break;case"isoWeek":e=n(this.year(),this.month(),this.date()-(this.isoWeekday()-1)+7)-1;break;case"day":case"date":e=n(this.year(),this.month(),this.date()+1)-1;break;case"hour":e=this._d.valueOf(),e+=dn-cn(e+(this._isUTC?0:this.utcOffset()*un),dn)-1;break;case"minute":e=this._d.valueOf(),e+=un-cn(e,un)-1;break;case"second":e=this._d.valueOf(),e+=ln-cn(e,ln)-1}return this._d.setTime(e),a.updateOffset(this,!0),this},Mn.format=function(t){t||(t=this.isUtc()?a.defaultFormatUtc:a.defaultFormat);var e=U(this,t);return this.localeData().postformat(e)},Mn.from=function(t,e){return this.isValid()&&(_(t)&&t.isValid()||Le(t).isValid())?Xe({to:this,from:t}).locale(this.locale()).humanize(!e):this.localeData().invalidDate()},Mn.fromNow=function(t){return this.from(Le(),t)},Mn.to=function(t,e){return this.isValid()&&(_(t)&&t.isValid()||Le(t).isValid())?Xe({from:this,to:t}).locale(this.locale()).humanize(!e):this.localeData().invalidDate()},Mn.toNow=function(t){return this.to(Le(),t)},Mn.get=function(t){return O(this[t=R(t)])?this[t]():this},Mn.invalidAt=function(){return g(this).overflow},Mn.isAfter=function(t,e){var n=_(t)?t:Le(t);return!(!this.isValid()||!n.isValid())&&("millisecond"===(e=R(e)||"millisecond")?this.valueOf()>n.valueOf():n.valueOf()<this.clone().startOf(e).valueOf())},Mn.isBefore=function(t,e){var n=_(t)?t:Le(t);return!(!this.isValid()||!n.isValid())&&("millisecond"===(e=R(e)||"millisecond")?this.valueOf()<n.valueOf():this.clone().endOf(e).valueOf()<n.valueOf())},Mn.isBetween=function(t,e,n,i){var a=_(t)?t:Le(t),r=_(e)?e:Le(e);return!!(this.isValid()&&a.isValid()&&r.isValid())&&("("===(i=i||"()")[0]?this.isAfter(a,n):!this.isBefore(a,n))&&(")"===i[1]?this.isBefore(r,n):!this.isAfter(r,n))},Mn.isSame=function(t,e){var n,i=_(t)?t:Le(t);return!(!this.isValid()||!i.isValid())&&("millisecond"===(e=R(e)||"millisecond")?this.valueOf()===i.valueOf():(n=i.valueOf(),this.clone().startOf(e).valueOf()<=n&&n<=this.clone().endOf(e).valueOf()))},Mn.isSameOrAfter=function(t,e){return this.isSame(t,e)||this.isAfter(t,e)},Mn.isSameOrBefore=function(t,e){return this.isSame(t,e)||this.isBefore(t,e)},Mn.isValid=function(){return m(this)},Mn.lang=on,Mn.locale=rn,Mn.localeData=sn,Mn.max=Ne,Mn.min=Re,Mn.parsingFlags=function(){return c({},g(this))},Mn.set=function(t,e){if("object"==typeof t)for(var n=function(t){var e=[];for(var n in t)e.push({unit:n,priority:W[n]});return e.sort((function(t,e){return t.priority-e.priority})),e}(t=N(t)),i=0;i<n.length;i++)this[n[i].unit](t[n[i].unit]);else if(O(this[t=R(t)]))return this[t](e);return this},Mn.startOf=function(t){var e;if(void 0===(t=R(t))||"millisecond"===t||!this.isValid())return this;var n=this._isUTC?gn:fn;switch(t){case"year":e=n(this.year(),0,1);break;case"quarter":e=n(this.year(),this.month()-this.month()%3,1);break;case"month":e=n(this.year(),this.month(),1);break;case"week":e=n(this.year(),this.month(),this.date()-this.weekday());break;case"isoWeek":e=n(this.year(),this.month(),this.date()-(this.isoWeekday()-1));break;case"day":case"date":e=n(this.year(),this.month(),this.date());break;case"hour":e=this._d.valueOf(),e-=cn(e+(this._isUTC?0:this.utcOffset()*un),dn);break;case"minute":e=this._d.valueOf(),e-=cn(e,un);break;case"second":e=this._d.valueOf(),e-=cn(e,ln)}return this._d.setTime(e),a.updateOffset(this,!0),this},Mn.subtract=nn,Mn.toArray=function(){var t=this;return[t.year(),t.month(),t.date(),t.hour(),t.minute(),t.second(),t.millisecond()]},Mn.toObject=function(){var t=this;return{years:t.year(),months:t.month(),date:t.date(),hours:t.hours(),minutes:t.minutes(),seconds:t.seconds(),milliseconds:t.milliseconds()}},Mn.toDate=function(){return new Date(this.valueOf())},Mn.toISOString=function(t){if(!this.isValid())return null;var e=!0!==t,n=e?this.clone().utc():this;return n.year()<0||n.year()>9999?U(n,e?"YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]":"YYYYYY-MM-DD[T]HH:mm:ss.SSSZ"):O(Date.prototype.toISOString)?e?this.toDate().toISOString():new Date(this.valueOf()+60*this.utcOffset()*1e3).toISOString().replace("Z",U(n,"Z")):U(n,e?"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]":"YYYY-MM-DD[T]HH:mm:ss.SSSZ")},Mn.inspect=function(){if(!this.isValid())return"moment.invalid(/* "+this._i+" */)";var t="moment",e="";this.isLocal()||(t=0===this.utcOffset()?"moment.utc":"moment.parseZone",e="Z");var n="["+t+'("]',i=0<=this.year()&&this.year()<=9999?"YYYY":"YYYYYY",a=e+'[")]';return this.format(n+i+"-MM-DD[T]HH:mm:ss.SSS"+a)},Mn.toJSON=function(){return this.isValid()?this.toISOString():null},Mn.toString=function(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},Mn.unix=function(){return Math.floor(this.valueOf()/1e3)},Mn.valueOf=function(){return this._d.valueOf()-6e4*(this._offset||0)},Mn.creationData=function(){return{input:this._i,format:this._f,locale:this._locale,isUTC:this._isUTC,strict:this._strict}},Mn.year=Tt,Mn.isLeapYear=function(){return Ct(this.year())},Mn.weekYear=function(t){return pn.call(this,t,this.week(),this.weekday(),this.localeData()._week.dow,this.localeData()._week.doy)},Mn.isoWeekYear=function(t){return pn.call(this,t,this.isoWeek(),this.isoWeekday(),1,4)},Mn.quarter=Mn.quarters=function(t){return null==t?Math.ceil((this.month()+1)/3):this.month(3*(t-1)+this.month()%3)},Mn.month=zt,Mn.daysInMonth=function(){return It(this.year(),this.month())},Mn.week=Mn.weeks=function(t){var e=this.localeData().week(this);return null==t?e:this.add(7*(t-e),"d")},Mn.isoWeek=Mn.isoWeeks=function(t){var e=qt(this,1,4).week;return null==t?e:this.add(7*(t-e),"d")},Mn.weeksInYear=function(){var t=this.localeData()._week;return Zt(this.year(),t.dow,t.doy)},Mn.isoWeeksInYear=function(){return Zt(this.year(),1,4)},Mn.date=bn,Mn.day=Mn.days=function(t){if(!this.isValid())return null!=t?this:NaN;var e=this._isUTC?this._d.getUTCDay():this._d.getDay();return null!=t?(t=function(t,e){return"string"!=typeof t?t:isNaN(t)?"number"==typeof(t=e.weekdaysParse(t))?t:null:parseInt(t,10)}(t,this.localeData()),this.add(t-e,"d")):e},Mn.weekday=function(t){if(!this.isValid())return null!=t?this:NaN;var e=(this.day()+7-this.localeData()._week.dow)%7;return null==t?e:this.add(t-e,"d")},Mn.isoWeekday=function(t){if(!this.isValid())return null!=t?this:NaN;if(null!=t){var e=function(t,e){return"string"==typeof t?e.weekdaysParse(t)%7||7:isNaN(t)?null:t}(t,this.localeData());return this.day(this.day()%7?e:e-7)}return this.day()||7},Mn.dayOfYear=function(t){var e=Math.round((this.clone().startOf("day")-this.clone().startOf("year"))/864e5)+1;return null==t?e:this.add(t-e,"d")},Mn.hour=Mn.hours=le,Mn.minute=Mn.minutes=yn,Mn.second=Mn.seconds=_n,Mn.millisecond=Mn.milliseconds=kn,Mn.utcOffset=function(t,e,n){var i,r=this._offset||0;if(!this.isValid())return null!=t?this:NaN;if(null!=t){if("string"==typeof t){if(null===(t=je(st,t)))return this}else Math.abs(t)<16&&!n&&(t*=60);return!this._isUTC&&e&&(i=Ge(this)),this._offset=t,this._isUTC=!0,null!=i&&this.add(i,"m"),r!==t&&(!e||this._changeInProgress?tn(this,Xe(t-r,"m"),1,!1):this._changeInProgress||(this._changeInProgress=!0,a.updateOffset(this,!0),this._changeInProgress=null)),this}return this._isUTC?r:Ge(this)},Mn.utc=function(t){return this.utcOffset(0,t)},Mn.local=function(t){return this._isUTC&&(this.utcOffset(0,t),this._isUTC=!1,t&&this.subtract(Ge(this),"m")),this},Mn.parseZone=function(){if(null!=this._tzm)this.utcOffset(this._tzm,!1,!0);else if("string"==typeof this._i){var t=je(ot,this._i);null!=t?this.utcOffset(t):this.utcOffset(0,!0)}return this},Mn.hasAlignedHourOffset=function(t){return!!this.isValid()&&(t=t?Le(t).utcOffset():0,(this.utcOffset()-t)%60==0)},Mn.isDST=function(){return this.utcOffset()>this.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()},Mn.isLocal=function(){return!!this.isValid()&&!this._isUTC},Mn.isUtcOffset=function(){return!!this.isValid()&&this._isUTC},Mn.isUtc=qe,Mn.isUTC=qe,Mn.zoneAbbr=function(){return this._isUTC?"UTC":""},Mn.zoneName=function(){return this._isUTC?"Coordinated Universal Time":""},Mn.dates=D("dates accessor is deprecated. Use date instead.",bn),Mn.months=D("months accessor is deprecated. Use month instead",zt),Mn.years=D("years accessor is deprecated. Use year instead",Tt),Mn.zone=D("moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/",(function(t,e){return null!=t?("string"!=typeof t&&(t=-t),this.utcOffset(t,e),this):-this.utcOffset()})),Mn.isDSTShifted=D("isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information",(function(){if(!s(this._isDSTShifted))return this._isDSTShifted;var t={};if(b(t,this),(t=Fe(t))._a){var e=t._isUTC?f(t._a):Le(t._a);this._isDSTShifted=this.isValid()&&M(t._a,e.toArray())>0}else this._isDSTShifted=!1;return this._isDSTShifted}));var Dn=F.prototype;function Cn(t,e,n,i){var a=pe(),r=f().set(i,e);return a[n](r,t)}function Pn(t,e,n){if(l(t)&&(e=t,t=void 0),t=t||"",null!=e)return Cn(t,e,n,"month");var i,a=[];for(i=0;i<12;i++)a[i]=Cn(t,i,n,"month");return a}function Tn(t,e,n,i){"boolean"==typeof t?(l(e)&&(n=e,e=void 0),e=e||""):(n=e=t,t=!1,l(e)&&(n=e,e=void 0),e=e||"");var a,r=pe(),o=t?r._week.dow:0;if(null!=n)return Cn(e,(n+o)%7,i,"day");var s=[];for(a=0;a<7;a++)s[a]=Cn(e,(a+o)%7,i,"day");return s}Dn.calendar=function(t,e,n){var i=this._calendar[t]||this._calendar.sameElse;return O(i)?i.call(e,n):i},Dn.longDateFormat=function(t){var e=this._longDateFormat[t],n=this._longDateFormat[t.toUpperCase()];return e||!n?e:(this._longDateFormat[t]=n.replace(/MMMM|MM|DD|dddd/g,(function(t){return t.slice(1)})),this._longDateFormat[t])},Dn.invalidDate=function(){return this._invalidDate},Dn.ordinal=function(t){return this._ordinal.replace("%d",t)},Dn.preparse=Sn,Dn.postformat=Sn,Dn.relativeTime=function(t,e,n,i){var a=this._relativeTime[n];return O(a)?a(t,e,n,i):a.replace(/%d/i,t)},Dn.pastFuture=function(t,e){var n=this._relativeTime[t>0?"future":"past"];return O(n)?n(e):n.replace(/%s/i,e)},Dn.set=function(t){var e,n;for(n in t)O(e=t[n])?this[n]=e:this["_"+n]=e;this._config=t,this._dayOfMonthOrdinalParseLenient=new RegExp((this._dayOfMonthOrdinalParse.source||this._ordinalParse.source)+"|"+/\d{1,2}/.source)},Dn.months=function(t,e){return t?r(this._months)?this._months[t.month()]:this._months[(this._months.isFormat||Lt).test(e)?"format":"standalone"][t.month()]:r(this._months)?this._months:this._months.standalone},Dn.monthsShort=function(t,e){return t?r(this._monthsShort)?this._monthsShort[t.month()]:this._monthsShort[Lt.test(e)?"format":"standalone"][t.month()]:r(this._monthsShort)?this._monthsShort:this._monthsShort.standalone},Dn.monthsParse=function(t,e,n){var i,a,r;if(this._monthsParseExact)return Wt.call(this,t,e,n);for(this._monthsParse||(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[]),i=0;i<12;i++){if(a=f([2e3,i]),n&&!this._longMonthsParse[i]&&(this._longMonthsParse[i]=new RegExp("^"+this.months(a,"").replace(".","")+"$","i"),this._shortMonthsParse[i]=new RegExp("^"+this.monthsShort(a,"").replace(".","")+"$","i")),n||this._monthsParse[i]||(r="^"+this.months(a,"")+"|^"+this.monthsShort(a,""),this._monthsParse[i]=new RegExp(r.replace(".",""),"i")),n&&"MMMM"===e&&this._longMonthsParse[i].test(t))return i;if(n&&"MMM"===e&&this._shortMonthsParse[i].test(t))return i;if(!n&&this._monthsParse[i].test(t))return i}},Dn.monthsRegex=function(t){return this._monthsParseExact?(h(this,"_monthsRegex")||Ht.call(this),t?this._monthsStrictRegex:this._monthsRegex):(h(this,"_monthsRegex")||(this._monthsRegex=Vt),this._monthsStrictRegex&&t?this._monthsStrictRegex:this._monthsRegex)},Dn.monthsShortRegex=function(t){return this._monthsParseExact?(h(this,"_monthsRegex")||Ht.call(this),t?this._monthsShortStrictRegex:this._monthsShortRegex):(h(this,"_monthsShortRegex")||(this._monthsShortRegex=Et),this._monthsShortStrictRegex&&t?this._monthsShortStrictRegex:this._monthsShortRegex)},Dn.week=function(t){return qt(t,this._week.dow,this._week.doy).week},Dn.firstDayOfYear=function(){return this._week.doy},Dn.firstDayOfWeek=function(){return this._week.dow},Dn.weekdays=function(t,e){var n=r(this._weekdays)?this._weekdays:this._weekdays[t&&!0!==t&&this._weekdays.isFormat.test(e)?"format":"standalone"];return!0===t?$t(n,this._week.dow):t?n[t.day()]:n},Dn.weekdaysMin=function(t){return!0===t?$t(this._weekdaysMin,this._week.dow):t?this._weekdaysMin[t.day()]:this._weekdaysMin},Dn.weekdaysShort=function(t){return!0===t?$t(this._weekdaysShort,this._week.dow):t?this._weekdaysShort[t.day()]:this._weekdaysShort},Dn.weekdaysParse=function(t,e,n){var i,a,r;if(this._weekdaysParseExact)return Qt.call(this,t,e,n);for(this._weekdaysParse||(this._weekdaysParse=[],this._minWeekdaysParse=[],this._shortWeekdaysParse=[],this._fullWeekdaysParse=[]),i=0;i<7;i++){if(a=f([2e3,1]).day(i),n&&!this._fullWeekdaysParse[i]&&(this._fullWeekdaysParse[i]=new RegExp("^"+this.weekdays(a,"").replace(".","\\.?")+"$","i"),this._shortWeekdaysParse[i]=new RegExp("^"+this.weekdaysShort(a,"").replace(".","\\.?")+"$","i"),this._minWeekdaysParse[i]=new RegExp("^"+this.weekdaysMin(a,"").replace(".","\\.?")+"$","i")),this._weekdaysParse[i]||(r="^"+this.weekdays(a,"")+"|^"+this.weekdaysShort(a,"")+"|^"+this.weekdaysMin(a,""),this._weekdaysParse[i]=new RegExp(r.replace(".",""),"i")),n&&"dddd"===e&&this._fullWeekdaysParse[i].test(t))return i;if(n&&"ddd"===e&&this._shortWeekdaysParse[i].test(t))return i;if(n&&"dd"===e&&this._minWeekdaysParse[i].test(t))return i;if(!n&&this._weekdaysParse[i].test(t))return i}},Dn.weekdaysRegex=function(t){return this._weekdaysParseExact?(h(this,"_weekdaysRegex")||ie.call(this),t?this._weekdaysStrictRegex:this._weekdaysRegex):(h(this,"_weekdaysRegex")||(this._weekdaysRegex=te),this._weekdaysStrictRegex&&t?this._weekdaysStrictRegex:this._weekdaysRegex)},Dn.weekdaysShortRegex=function(t){return this._weekdaysParseExact?(h(this,"_weekdaysRegex")||ie.call(this),t?this._weekdaysShortStrictRegex:this._weekdaysShortRegex):(h(this,"_weekdaysShortRegex")||(this._weekdaysShortRegex=ee),this._weekdaysShortStrictRegex&&t?this._weekdaysShortStrictRegex:this._weekdaysShortRegex)},Dn.weekdaysMinRegex=function(t){return this._weekdaysParseExact?(h(this,"_weekdaysRegex")||ie.call(this),t?this._weekdaysMinStrictRegex:this._weekdaysMinRegex):(h(this,"_weekdaysMinRegex")||(this._weekdaysMinRegex=ne),this._weekdaysMinStrictRegex&&t?this._weekdaysMinStrictRegex:this._weekdaysMinRegex)},Dn.isPM=function(t){return"p"===(t+"").toLowerCase().charAt(0)},Dn.meridiem=function(t,e,n){return t>11?n?"pm":"PM":n?"am":"AM"},ge("en",{dayOfMonthOrdinalParse:/\d{1,2}(th|st|nd|rd)/,ordinal:function(t){var e=t%10;return t+(1===k(t%100/10)?"th":1===e?"st":2===e?"nd":3===e?"rd":"th")}}),a.lang=D("moment.lang is deprecated. Use moment.locale instead.",ge),a.langData=D("moment.langData is deprecated. Use moment.localeData instead.",pe);var On=Math.abs;function An(t,e,n,i){var a=Xe(e,n);return t._milliseconds+=i*a._milliseconds,t._days+=i*a._days,t._months+=i*a._months,t._bubble()}function Fn(t){return t<0?Math.floor(t):Math.ceil(t)}function In(t){return 4800*t/146097}function Ln(t){return 146097*t/4800}function Rn(t){return function(){return this.as(t)}}var Nn=Rn("ms"),Wn=Rn("s"),Yn=Rn("m"),zn=Rn("h"),En=Rn("d"),Vn=Rn("w"),Hn=Rn("M"),Bn=Rn("Q"),jn=Rn("y");function Un(t){return function(){return this.isValid()?this._data[t]:NaN}}var Gn=Un("milliseconds"),qn=Un("seconds"),Zn=Un("minutes"),$n=Un("hours"),Xn=Un("days"),Kn=Un("months"),Jn=Un("years"),Qn=Math.round,ti={ss:44,s:45,m:45,h:22,d:26,M:11};function ei(t,e,n,i,a){return a.relativeTime(e||1,!!n,t,i)}var ni=Math.abs;function ii(t){return(t>0)-(t<0)||+t}function ai(){if(!this.isValid())return this.localeData().invalidDate();var t,e,n=ni(this._milliseconds)/1e3,i=ni(this._days),a=ni(this._months);t=w(n/60),e=w(t/60),n%=60,t%=60;var r=w(a/12),o=a%=12,s=i,l=e,u=t,d=n?n.toFixed(3).replace(/\.?0+$/,""):"",h=this.asSeconds();if(!h)return"P0D";var c=h<0?"-":"",f=ii(this._months)!==ii(h)?"-":"",g=ii(this._days)!==ii(h)?"-":"",m=ii(this._milliseconds)!==ii(h)?"-":"";return c+"P"+(r?f+r+"Y":"")+(o?f+o+"M":"")+(s?g+s+"D":"")+(l||u||d?"T":"")+(l?m+l+"H":"")+(u?m+u+"M":"")+(d?m+d+"S":"")}var ri=ze.prototype;return ri.isValid=function(){return this._isValid},ri.abs=function(){var t=this._data;return this._milliseconds=On(this._milliseconds),this._days=On(this._days),this._months=On(this._months),t.milliseconds=On(t.milliseconds),t.seconds=On(t.seconds),t.minutes=On(t.minutes),t.hours=On(t.hours),t.months=On(t.months),t.years=On(t.years),this},ri.add=function(t,e){return An(this,t,e,1)},ri.subtract=function(t,e){return An(this,t,e,-1)},ri.as=function(t){if(!this.isValid())return NaN;var e,n,i=this._milliseconds;if("month"===(t=R(t))||"quarter"===t||"year"===t)switch(e=this._days+i/864e5,n=this._months+In(e),t){case"month":return n;case"quarter":return n/3;case"year":return n/12}else switch(e=this._days+Math.round(Ln(this._months)),t){case"week":return e/7+i/6048e5;case"day":return e+i/864e5;case"hour":return 24*e+i/36e5;case"minute":return 1440*e+i/6e4;case"second":return 86400*e+i/1e3;case"millisecond":return Math.floor(864e5*e)+i;default:throw new Error("Unknown unit "+t)}},ri.asMilliseconds=Nn,ri.asSeconds=Wn,ri.asMinutes=Yn,ri.asHours=zn,ri.asDays=En,ri.asWeeks=Vn,ri.asMonths=Hn,ri.asQuarters=Bn,ri.asYears=jn,ri.valueOf=function(){return this.isValid()?this._milliseconds+864e5*this._days+this._months%12*2592e6+31536e6*k(this._months/12):NaN},ri._bubble=function(){var t,e,n,i,a,r=this._milliseconds,o=this._days,s=this._months,l=this._data;return r>=0&&o>=0&&s>=0||r<=0&&o<=0&&s<=0||(r+=864e5*Fn(Ln(s)+o),o=0,s=0),l.milliseconds=r%1e3,t=w(r/1e3),l.seconds=t%60,e=w(t/60),l.minutes=e%60,n=w(e/60),l.hours=n%24,o+=w(n/24),a=w(In(o)),s+=a,o-=Fn(Ln(a)),i=w(s/12),s%=12,l.days=o,l.months=s,l.years=i,this},ri.clone=function(){return Xe(this)},ri.get=function(t){return t=R(t),this.isValid()?this[t+"s"]():NaN},ri.milliseconds=Gn,ri.seconds=qn,ri.minutes=Zn,ri.hours=$n,ri.days=Xn,ri.weeks=function(){return w(this.days()/7)},ri.months=Kn,ri.years=Jn,ri.humanize=function(t){if(!this.isValid())return this.localeData().invalidDate();var e=this.localeData(),n=function(t,e,n){var i=Xe(t).abs(),a=Qn(i.as("s")),r=Qn(i.as("m")),o=Qn(i.as("h")),s=Qn(i.as("d")),l=Qn(i.as("M")),u=Qn(i.as("y")),d=a<=ti.ss&&["s",a]||a<ti.s&&["ss",a]||r<=1&&["m"]||r<ti.m&&["mm",r]||o<=1&&["h"]||o<ti.h&&["hh",o]||s<=1&&["d"]||s<ti.d&&["dd",s]||l<=1&&["M"]||l<ti.M&&["MM",l]||u<=1&&["y"]||["yy",u];return d[2]=e,d[3]=+t>0,d[4]=n,ei.apply(null,d)}(this,!t,e);return t&&(n=e.pastFuture(+this,n)),e.postformat(n)},ri.toISOString=ai,ri.toString=ai,ri.toJSON=ai,ri.locale=rn,ri.localeData=sn,ri.toIsoString=D("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",ai),ri.lang=on,j("X",0,0,"unix"),j("x",0,0,"valueOf"),dt("x",rt),dt("X",/[+-]?\d+(\.\d{1,3})?/),gt("X",(function(t,e,n){n._d=new Date(1e3*parseFloat(t,10))})),gt("x",(function(t,e,n){n._d=new Date(k(t))})),a.version="2.24.0",n=Le,a.fn=Mn,a.min=function(){return We("isBefore",[].slice.call(arguments,0))},a.max=function(){return We("isAfter",[].slice.call(arguments,0))},a.now=function(){return Date.now?Date.now():+new Date},a.utc=f,a.unix=function(t){return Le(1e3*t)},a.months=function(t,e){return Pn(t,e,"months")},a.isDate=u,a.locale=ge,a.invalid=p,a.duration=Xe,a.isMoment=_,a.weekdays=function(t,e,n){return Tn(t,e,n,"weekdays")},a.parseZone=function(){return Le.apply(null,arguments).parseZone()},a.localeData=pe,a.isDuration=Ee,a.monthsShort=function(t,e){return Pn(t,e,"monthsShort")},a.weekdaysMin=function(t,e,n){return Tn(t,e,n,"weekdaysMin")},a.defineLocale=me,a.updateLocale=function(t,e){if(null!=e){var n,i,a=ue;null!=(i=fe(t))&&(a=i._config),e=A(a,e),(n=new F(e)).parentLocale=de[t],de[t]=n,ge(t)}else null!=de[t]&&(null!=de[t].parentLocale?de[t]=de[t].parentLocale:null!=de[t]&&delete de[t]);return de[t]},a.locales=function(){return C(de)},a.weekdaysShort=function(t,e,n){return Tn(t,e,n,"weekdaysShort")},a.normalizeUnits=R,a.relativeTimeRounding=function(t){return void 0===t?Qn:"function"==typeof t&&(Qn=t,!0)},a.relativeTimeThreshold=function(t,e){return void 0!==ti[t]&&(void 0===e?ti[t]:(ti[t]=e,"s"===t&&(ti.ss=e-1),!0))},a.calendarFormat=function(t,e){var n=t.diff(e,"days",!0);return n<-6?"sameElse":n<-1?"lastWeek":n<0?"lastDay":n<1?"sameDay":n<2?"nextDay":n<7?"nextWeek":"sameElse"},a.prototype=Mn,a.HTML5_FMT={DATETIME_LOCAL:"YYYY-MM-DDTHH:mm",DATETIME_LOCAL_SECONDS:"YYYY-MM-DDTHH:mm:ss",DATETIME_LOCAL_MS:"YYYY-MM-DDTHH:mm:ss.SSS",DATE:"YYYY-MM-DD",TIME:"HH:mm",TIME_SECONDS:"HH:mm:ss",TIME_MS:"HH:mm:ss.SSS",WEEK:"GGGG-[W]WW",MONTH:"YYYY-MM"},a}()})),pi={datetime:"MMM D, YYYY, h:mm:ss a",millisecond:"h:mm:ss.SSS a",second:"h:mm:ss a",minute:"h:mm a",hour:"hA",day:"MMM D",week:"ll",month:"MMM YYYY",quarter:"[Q]Q - YYYY",year:"YYYY"};on._date.override("function"==typeof mi?{_id:"moment",formats:function(){return pi},parse:function(t,e){return"string"==typeof t&&"string"==typeof e?t=mi(t,e):t instanceof mi||(t=mi(t)),t.isValid()?t.valueOf():null},format:function(t,e){return mi(t).format(e)},add:function(t,e,n){return mi(t).add(e,n).valueOf()},diff:function(t,e,n){return mi(t).diff(mi(e),n)},startOf:function(t,e,n){return t=mi(t),"isoWeek"===e?t.isoWeekday(n).valueOf():t.startOf(e).valueOf()},endOf:function(t,e){return mi(t).endOf(e).valueOf()},_create:function(t){return mi(t)}}:{}),Y._set("global",{plugins:{filler:{propagate:!0}}});var vi={dataset:function(t){var e=t.fill,n=t.chart,i=n.getDatasetMeta(e),a=i&&n.isDatasetVisible(e)&&i.dataset._children||[],r=a.length||0;return r?function(t,e){return e<r&&a[e]._view||null}:null},boundary:function(t){var e=t.boundary,n=e?e.x:null,i=e?e.y:null;return B.isArray(e)?function(t,n){return e[n]}:function(t){return{x:null===n?t.x:n,y:null===i?t.y:i}}}};function bi(t,e,n){var i,a=t._model||{},r=a.fill;if(void 0===r&&(r=!!a.backgroundColor),!1===r||null===r)return!1;if(!0===r)return"origin";if(i=parseFloat(r,10),isFinite(i)&&Math.floor(i)===i)return"-"!==r[0]&&"+"!==r[0]||(i=e+i),!(i===e||i<0||i>=n)&&i;switch(r){case"bottom":return"start";case"top":return"end";case"zero":return"origin";case"origin":case"start":case"end":return r;default:return!1}}function yi(t){return(t.el._scale||{}).getPointPositionForValue?function(t){var e,n,i,a,r,o=t.el._scale,s=o.options,l=o.chart.data.labels.length,u=t.fill,d=[];if(!l)return null;for(e=s.ticks.reverse?o.max:o.min,n=s.ticks.reverse?o.min:o.max,i=o.getPointPositionForValue(0,e),a=0;a<l;++a)r="start"===u||"end"===u?o.getPointPositionForValue(a,"start"===u?e:n):o.getBasePosition(a),s.gridLines.circular&&(r.cx=i.x,r.cy=i.y,r.angle=o.getIndexAngle(a)-Math.PI/2),d.push(r);return d}(t):function(t){var e,n=t.el._model||{},i=t.el._scale||{},a=t.fill,r=null;if(isFinite(a))return null;if("start"===a?r=void 0===n.scaleBottom?i.bottom:n.scaleBottom:"end"===a?r=void 0===n.scaleTop?i.top:n.scaleTop:void 0!==n.scaleZero?r=n.scaleZero:i.getBasePixel&&(r=i.getBasePixel()),null!=r){if(void 0!==r.x&&void 0!==r.y)return r;if(B.isFinite(r))return{x:(e=i.isHorizontal())?r:null,y:e?null:r}}return null}(t)}function xi(t,e,n){var i,a=t[e].fill,r=[e];if(!n)return a;for(;!1!==a&&-1===r.indexOf(a);){if(!isFinite(a))return a;if(!(i=t[a]))return!1;if(i.visible)return a;r.push(a),a=i.fill}return!1}function _i(t){var e=t.fill,n="dataset";return!1===e?null:(isFinite(e)||(n="boundary"),vi[n](t))}function wi(t){return t&&!t.skip}function ki(t,e,n,i,a){var r,o,s,l;if(i&&a){for(t.moveTo(e[0].x,e[0].y),r=1;r<i;++r)B.canvas.lineTo(t,e[r-1],e[r]);if(void 0===n[0].angle)for(t.lineTo(n[a-1].x,n[a-1].y),r=a-1;r>0;--r)B.canvas.lineTo(t,n[r],n[r-1],!0);else for(o=n[0].cx,s=n[0].cy,l=Math.sqrt(Math.pow(n[0].x-o,2)+Math.pow(n[0].y-s,2)),r=a-1;r>0;--r)t.arc(o,s,l,n[r].angle,n[r-1].angle,!0)}}function Mi(t,e,n,i,a,r){var o,s,l,u,d,h,c,f,g=e.length,m=i.spanGaps,p=[],v=[],b=0,y=0;for(t.beginPath(),o=0,s=g;o<s;++o)d=n(u=e[l=o%g]._view,l,i),h=wi(u),c=wi(d),r&&void 0===f&&h&&(s=g+(f=o+1)),h&&c?(b=p.push(u),y=v.push(d)):b&&y&&(m?(h&&p.push(u),c&&v.push(d)):(ki(t,p,v,b,y),b=y=0,p=[],v=[]));ki(t,p,v,b,y),t.closePath(),t.fillStyle=a,t.fill()}var Si={id:"filler",afterDatasetsUpdate:function(t,e){var n,i,a,r,o=(t.data.datasets||[]).length,s=e.propagate,l=[];for(i=0;i<o;++i)r=null,(a=(n=t.getDatasetMeta(i)).dataset)&&a._model&&a instanceof kt.Line&&(r={visible:t.isDatasetVisible(i),fill:bi(a,i,o),chart:t,el:a}),n.$filler=r,l.push(r);for(i=0;i<o;++i)(r=l[i])&&(r.fill=xi(l,i,s),r.boundary=yi(r),r.mapper=_i(r))},beforeDatasetsDraw:function(t){var e,n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas(),u=t.ctx;for(n=l.length-1;n>=0;--n)(e=l[n].$filler)&&e.visible&&(a=(i=e.el)._view,r=i._children||[],o=e.mapper,s=a.backgroundColor||Y.global.defaultColor,o&&s&&r.length&&(B.canvas.clipArea(u,t.chartArea),Mi(u,r,o,a,s,i._loop),B.canvas.unclipArea(u)))}},Di=B.rtl.getRtlAdapter,Ci=B.noop,Pi=B.valueOrDefault;function Ti(t,e){return t.usePointStyle&&t.boxWidth>e?e:t.boxWidth}Y._set("global",{legend:{display:!0,position:"top",align:"center",fullWidth:!0,reverse:!1,weight:1e3,onClick:function(t,e){var n=e.datasetIndex,i=this.chart,a=i.getDatasetMeta(n);a.hidden=null===a.hidden?!i.data.datasets[n].hidden:null,i.update()},onHover:null,onLeave:null,labels:{boxWidth:40,padding:10,generateLabels:function(t){var e=t.data.datasets,n=t.options.legend||{},i=n.labels&&n.labels.usePointStyle;return t._getSortedDatasetMetas().map((function(n){var a=n.controller.getStyle(i?0:void 0);return{text:e[n.index].label,fillStyle:a.backgroundColor,hidden:!t.isDatasetVisible(n.index),lineCap:a.borderCapStyle,lineDash:a.borderDash,lineDashOffset:a.borderDashOffset,lineJoin:a.borderJoinStyle,lineWidth:a.borderWidth,strokeStyle:a.borderColor,pointStyle:a.pointStyle,rotation:a.rotation,datasetIndex:n.index}}),this)}}},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data.datasets;for(a.setAttribute("class",t.id+"-legend"),e=0,n=r.length;e<n;e++)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=r[e].backgroundColor,r[e].label&&i.appendChild(document.createTextNode(r[e].label));return a.outerHTML}});var Oi=X.extend({initialize:function(t){B.extend(this,t),this.legendHitBoxes=[],this._hoveredItem=null,this.doughnutMode=!1},beforeUpdate:Ci,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Ci,beforeSetDimensions:Ci,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Ci,beforeBuildLabels:Ci,buildLabels:function(){var t=this,e=t.options.labels||{},n=B.callback(e.generateLabels,[t.chart],t)||[];e.filter&&(n=n.filter((function(n){return e.filter(n,t.chart.data)}))),t.options.reverse&&n.reverse(),t.legendItems=n},afterBuildLabels:Ci,beforeFit:Ci,fit:function(){var t=this,e=t.options,n=e.labels,i=e.display,a=t.ctx,r=B.options._parseFont(n),o=r.size,s=t.legendHitBoxes=[],l=t.minSize,u=t.isHorizontal();if(u?(l.width=t.maxWidth,l.height=i?10:0):(l.width=i?10:0,l.height=t.maxHeight),i){if(a.font=r.string,u){var d=t.lineWidths=[0],h=0;a.textAlign="left",a.textBaseline="middle",B.each(t.legendItems,(function(t,e){var i=Ti(n,o)+o/2+a.measureText(t.text).width;(0===e||d[d.length-1]+i+2*n.padding>l.width)&&(h+=o+n.padding,d[d.length-(e>0?0:1)]=0),s[e]={left:0,top:0,width:i,height:o},d[d.length-1]+=i+n.padding})),l.height+=h}else{var c=n.padding,f=t.columnWidths=[],g=t.columnHeights=[],m=n.padding,p=0,v=0;B.each(t.legendItems,(function(t,e){var i=Ti(n,o)+o/2+a.measureText(t.text).width;e>0&&v+o+2*c>l.height&&(m+=p+n.padding,f.push(p),g.push(v),p=0,v=0),p=Math.max(p,i),v+=o+c,s[e]={left:0,top:0,width:i,height:o}})),m+=p,f.push(p),g.push(v),l.width+=m}t.width=l.width,t.height=l.height}else t.width=l.width=t.height=l.height=0},afterFit:Ci,isHorizontal:function(){return"top"===this.options.position||"bottom"===this.options.position},draw:function(){var t=this,e=t.options,n=e.labels,i=Y.global,a=i.defaultColor,r=i.elements.line,o=t.height,s=t.columnHeights,l=t.width,u=t.lineWidths;if(e.display){var d,h=Di(e.rtl,t.left,t.minSize.width),c=t.ctx,f=Pi(n.fontColor,i.defaultFontColor),g=B.options._parseFont(n),m=g.size;c.textAlign=h.textAlign("left"),c.textBaseline="middle",c.lineWidth=.5,c.strokeStyle=f,c.fillStyle=f,c.font=g.string;var p=Ti(n,m),v=t.legendHitBoxes,b=function(t,i){switch(e.align){case"start":return n.padding;case"end":return t-i;default:return(t-i+n.padding)/2}},y=t.isHorizontal();d=y?{x:t.left+b(l,u[0]),y:t.top+n.padding,line:0}:{x:t.left+n.padding,y:t.top+b(o,s[0]),line:0},B.rtl.overrideTextDirection(t.ctx,e.textDirection);var x=m+n.padding;B.each(t.legendItems,(function(e,i){var f=c.measureText(e.text).width,g=p+m/2+f,_=d.x,w=d.y;h.setWidth(t.minSize.width),y?i>0&&_+g+n.padding>t.left+t.minSize.width&&(w=d.y+=x,d.line++,_=d.x=t.left+b(l,u[d.line])):i>0&&w+x>t.top+t.minSize.height&&(_=d.x=_+t.columnWidths[d.line]+n.padding,d.line++,w=d.y=t.top+b(o,s[d.line]));var k=h.x(_);!function(t,e,i){if(!(isNaN(p)||p<=0)){c.save();var o=Pi(i.lineWidth,r.borderWidth);if(c.fillStyle=Pi(i.fillStyle,a),c.lineCap=Pi(i.lineCap,r.borderCapStyle),c.lineDashOffset=Pi(i.lineDashOffset,r.borderDashOffset),c.lineJoin=Pi(i.lineJoin,r.borderJoinStyle),c.lineWidth=o,c.strokeStyle=Pi(i.strokeStyle,a),c.setLineDash&&c.setLineDash(Pi(i.lineDash,r.borderDash)),n&&n.usePointStyle){var s=p*Math.SQRT2/2,l=h.xPlus(t,p/2),u=e+m/2;B.canvas.drawPoint(c,i.pointStyle,s,l,u,i.rotation)}else c.fillRect(h.leftForLtr(t,p),e,p,m),0!==o&&c.strokeRect(h.leftForLtr(t,p),e,p,m);c.restore()}}(k,w,e),v[i].left=h.leftForLtr(k,v[i].width),v[i].top=w,function(t,e,n,i){var a=m/2,r=h.xPlus(t,p+a),o=e+a;c.fillText(n.text,r,o),n.hidden&&(c.beginPath(),c.lineWidth=2,c.moveTo(r,o),c.lineTo(h.xPlus(r,i),o),c.stroke())}(k,w,e,f),y?d.x+=g+n.padding:d.y+=x})),B.rtl.restoreTextDirection(t.ctx,e.textDirection)}},_getLegendItemAt:function(t,e){var n,i,a,r=this;if(t>=r.left&&t<=r.right&&e>=r.top&&e<=r.bottom)for(a=r.legendHitBoxes,n=0;n<a.length;++n)if(t>=(i=a[n]).left&&t<=i.left+i.width&&e>=i.top&&e<=i.top+i.height)return r.legendItems[n];return null},handleEvent:function(t){var e,n=this,i=n.options,a="mouseup"===t.type?"click":t.type;if("mousemove"===a){if(!i.onHover&&!i.onLeave)return}else{if("click"!==a)return;if(!i.onClick)return}e=n._getLegendItemAt(t.x,t.y),"click"===a?e&&i.onClick&&i.onClick.call(n,t.native,e):(i.onLeave&&e!==n._hoveredItem&&(n._hoveredItem&&i.onLeave.call(n,t.native,n._hoveredItem),n._hoveredItem=e),i.onHover&&e&&i.onHover.call(n,t.native,e))}});function Ai(t,e){var n=new Oi({ctx:t.ctx,options:e,chart:t});pe.configure(t,n,e),pe.addBox(t,n),t.legend=n}var Fi={id:"legend",_element:Oi,beforeInit:function(t){var e=t.options.legend;e&&Ai(t,e)},beforeUpdate:function(t){var e=t.options.legend,n=t.legend;e?(B.mergeIf(e,Y.global.legend),n?(pe.configure(t,n,e),n.options=e):Ai(t,e)):n&&(pe.removeBox(t,n),delete t.legend)},afterEvent:function(t,e){var n=t.legend;n&&n.handleEvent(e)}},Ii=B.noop;Y._set("global",{title:{display:!1,fontStyle:"bold",fullWidth:!0,padding:10,position:"top",text:"",weight:2e3}});var Li=X.extend({initialize:function(t){B.extend(this,t),this.legendHitBoxes=[]},beforeUpdate:Ii,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Ii,beforeSetDimensions:Ii,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Ii,beforeBuildLabels:Ii,buildLabels:Ii,afterBuildLabels:Ii,beforeFit:Ii,fit:function(){var t,e=this,n=e.options,i=e.minSize={},a=e.isHorizontal();n.display?(t=(B.isArray(n.text)?n.text.length:1)*B.options._parseFont(n).lineHeight+2*n.padding,e.width=i.width=a?e.maxWidth:t,e.height=i.height=a?t:e.maxHeight):e.width=i.width=e.height=i.height=0},afterFit:Ii,isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},draw:function(){var t=this,e=t.ctx,n=t.options;if(n.display){var i,a,r,o=B.options._parseFont(n),s=o.lineHeight,l=s/2+n.padding,u=0,d=t.top,h=t.left,c=t.bottom,f=t.right;e.fillStyle=B.valueOrDefault(n.fontColor,Y.global.defaultFontColor),e.font=o.string,t.isHorizontal()?(a=h+(f-h)/2,r=d+l,i=f-h):(a="left"===n.position?h+l:f-l,r=d+(c-d)/2,i=c-d,u=Math.PI*("left"===n.position?-.5:.5)),e.save(),e.translate(a,r),e.rotate(u),e.textAlign="center",e.textBaseline="middle";var g=n.text;if(B.isArray(g))for(var m=0,p=0;p<g.length;++p)e.fillText(g[p],0,m,i),m+=s;else e.fillText(g,0,0,i);e.restore()}}});function Ri(t,e){var n=new Li({ctx:t.ctx,options:e,chart:t});pe.configure(t,n,e),pe.addBox(t,n),t.titleBlock=n}var Ni={},Wi=Si,Yi=Fi,zi={id:"title",_element:Li,beforeInit:function(t){var e=t.options.title;e&&Ri(t,e)},beforeUpdate:function(t){var e=t.options.title,n=t.titleBlock;e?(B.mergeIf(e,Y.global.title),n?(pe.configure(t,n,e),n.options=e):Ri(t,e)):n&&(pe.removeBox(t,n),delete t.titleBlock)}};for(var Ei in Ni.filler=Wi,Ni.legend=Yi,Ni.title=zi,nn.helpers=B,function(){function t(t,e,n){var i;return"string"==typeof t?(i=parseInt(t,10),-1!==t.indexOf("%")&&(i=i/100*e.parentNode[n])):i=t,i}function e(t){return null!=t&&"none"!==t}function n(n,i,a){var r=document.defaultView,o=B._getParentNode(n),s=r.getComputedStyle(n)[i],l=r.getComputedStyle(o)[i],u=e(s),d=e(l),h=Number.POSITIVE_INFINITY;return u||d?Math.min(u?t(s,n,a):h,d?t(l,o,a):h):"none"}B.where=function(t,e){if(B.isArray(t)&&Array.prototype.filter)return t.filter(e);var n=[];return B.each(t,(function(t){e(t)&&n.push(t)})),n},B.findIndex=Array.prototype.findIndex?function(t,e,n){return t.findIndex(e,n)}:function(t,e,n){n=void 0===n?t:n;for(var i=0,a=t.length;i<a;++i)if(e.call(n,t[i],i,t))return i;return-1},B.findNextWhere=function(t,e,n){B.isNullOrUndef(n)&&(n=-1);for(var i=n+1;i<t.length;i++){var a=t[i];if(e(a))return a}},B.findPreviousWhere=function(t,e,n){B.isNullOrUndef(n)&&(n=t.length);for(var i=n-1;i>=0;i--){var a=t[i];if(e(a))return a}},B.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},B.almostEquals=function(t,e,n){return Math.abs(t-e)<n},B.almostWhole=function(t,e){var n=Math.round(t);return n-e<=t&&n+e>=t},B.max=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.max(t,e)}),Number.NEGATIVE_INFINITY)},B.min=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.min(t,e)}),Number.POSITIVE_INFINITY)},B.sign=Math.sign?function(t){return Math.sign(t)}:function(t){return 0===(t=+t)||isNaN(t)?t:t>0?1:-1},B.toRadians=function(t){return t*(Math.PI/180)},B.toDegrees=function(t){return t*(180/Math.PI)},B._decimalPlaces=function(t){if(B.isFinite(t)){for(var e=1,n=0;Math.round(t*e)/e!==t;)e*=10,n++;return n}},B.getAngleFromPoint=function(t,e){var n=e.x-t.x,i=e.y-t.y,a=Math.sqrt(n*n+i*i),r=Math.atan2(i,n);return r<-.5*Math.PI&&(r+=2*Math.PI),{angle:r,distance:a}},B.distanceBetweenPoints=function(t,e){return Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2))},B.aliasPixel=function(t){return t%2==0?0:.5},B._alignPixel=function(t,e,n){var i=t.currentDevicePixelRatio,a=n/2;return Math.round((e-a)*i)/i+a},B.splineCurve=function(t,e,n,i){var a=t.skip?e:t,r=e,o=n.skip?e:n,s=Math.sqrt(Math.pow(r.x-a.x,2)+Math.pow(r.y-a.y,2)),l=Math.sqrt(Math.pow(o.x-r.x,2)+Math.pow(o.y-r.y,2)),u=s/(s+l),d=l/(s+l),h=i*(u=isNaN(u)?0:u),c=i*(d=isNaN(d)?0:d);return{previous:{x:r.x-h*(o.x-a.x),y:r.y-h*(o.y-a.y)},next:{x:r.x+c*(o.x-a.x),y:r.y+c*(o.y-a.y)}}},B.EPSILON=Number.EPSILON||1e-14,B.splineCurveMonotone=function(t){var e,n,i,a,r,o,s,l,u,d=(t||[]).map((function(t){return{model:t._model,deltaK:0,mK:0}})),h=d.length;for(e=0;e<h;++e)if(!(i=d[e]).model.skip){if(n=e>0?d[e-1]:null,(a=e<h-1?d[e+1]:null)&&!a.model.skip){var c=a.model.x-i.model.x;i.deltaK=0!==c?(a.model.y-i.model.y)/c:0}!n||n.model.skip?i.mK=i.deltaK:!a||a.model.skip?i.mK=n.deltaK:this.sign(n.deltaK)!==this.sign(i.deltaK)?i.mK=0:i.mK=(n.deltaK+i.deltaK)/2}for(e=0;e<h-1;++e)i=d[e],a=d[e+1],i.model.skip||a.model.skip||(B.almostEquals(i.deltaK,0,this.EPSILON)?i.mK=a.mK=0:(r=i.mK/i.deltaK,o=a.mK/i.deltaK,(l=Math.pow(r,2)+Math.pow(o,2))<=9||(s=3/Math.sqrt(l),i.mK=r*s*i.deltaK,a.mK=o*s*i.deltaK)));for(e=0;e<h;++e)(i=d[e]).model.skip||(n=e>0?d[e-1]:null,a=e<h-1?d[e+1]:null,n&&!n.model.skip&&(u=(i.model.x-n.model.x)/3,i.model.controlPointPreviousX=i.model.x-u,i.model.controlPointPreviousY=i.model.y-u*i.mK),a&&!a.model.skip&&(u=(a.model.x-i.model.x)/3,i.model.controlPointNextX=i.model.x+u,i.model.controlPointNextY=i.model.y+u*i.mK))},B.nextItem=function(t,e,n){return n?e>=t.length-1?t[0]:t[e+1]:e>=t.length-1?t[t.length-1]:t[e+1]},B.previousItem=function(t,e,n){return n?e<=0?t[t.length-1]:t[e-1]:e<=0?t[0]:t[e-1]},B.niceNum=function(t,e){var n=Math.floor(B.log10(t)),i=t/Math.pow(10,n);return(e?i<1.5?1:i<3?2:i<7?5:10:i<=1?1:i<=2?2:i<=5?5:10)*Math.pow(10,n)},B.requestAnimFrame="undefined"==typeof window?function(t){t()}:window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)},B.getRelativePosition=function(t,e){var n,i,a=t.originalEvent||t,r=t.target||t.srcElement,o=r.getBoundingClientRect(),s=a.touches;s&&s.length>0?(n=s[0].clientX,i=s[0].clientY):(n=a.clientX,i=a.clientY);var l=parseFloat(B.getStyle(r,"padding-left")),u=parseFloat(B.getStyle(r,"padding-top")),d=parseFloat(B.getStyle(r,"padding-right")),h=parseFloat(B.getStyle(r,"padding-bottom")),c=o.right-o.left-l-d,f=o.bottom-o.top-u-h;return{x:n=Math.round((n-o.left-l)/c*r.width/e.currentDevicePixelRatio),y:i=Math.round((i-o.top-u)/f*r.height/e.currentDevicePixelRatio)}},B.getConstraintWidth=function(t){return n(t,"max-width","clientWidth")},B.getConstraintHeight=function(t){return n(t,"max-height","clientHeight")},B._calculatePadding=function(t,e,n){return(e=B.getStyle(t,e)).indexOf("%")>-1?n*parseInt(e,10)/100:parseInt(e,10)},B._getParentNode=function(t){var e=t.parentNode;return e&&"[object ShadowRoot]"===e.toString()&&(e=e.host),e},B.getMaximumWidth=function(t){var e=B._getParentNode(t);if(!e)return t.clientWidth;var n=e.clientWidth,i=n-B._calculatePadding(e,"padding-left",n)-B._calculatePadding(e,"padding-right",n),a=B.getConstraintWidth(t);return isNaN(a)?i:Math.min(i,a)},B.getMaximumHeight=function(t){var e=B._getParentNode(t);if(!e)return t.clientHeight;var n=e.clientHeight,i=n-B._calculatePadding(e,"padding-top",n)-B._calculatePadding(e,"padding-bottom",n),a=B.getConstraintHeight(t);return isNaN(a)?i:Math.min(i,a)},B.getStyle=function(t,e){return t.currentStyle?t.currentStyle[e]:document.defaultView.getComputedStyle(t,null).getPropertyValue(e)},B.retinaScale=function(t,e){var n=t.currentDevicePixelRatio=e||"undefined"!=typeof window&&window.devicePixelRatio||1;if(1!==n){var i=t.canvas,a=t.height,r=t.width;i.height=a*n,i.width=r*n,t.ctx.scale(n,n),i.style.height||i.style.width||(i.style.height=a+"px",i.style.width=r+"px")}},B.fontString=function(t,e,n){return e+" "+t+"px "+n},B.longestText=function(t,e,n,i){var a=(i=i||{}).data=i.data||{},r=i.garbageCollect=i.garbageCollect||[];i.font!==e&&(a=i.data={},r=i.garbageCollect=[],i.font=e),t.font=e;var o,s,l,u,d,h=0,c=n.length;for(o=0;o<c;o++)if(null!=(u=n[o])&&!0!==B.isArray(u))h=B.measureText(t,a,r,h,u);else if(B.isArray(u))for(s=0,l=u.length;s<l;s++)null==(d=u[s])||B.isArray(d)||(h=B.measureText(t,a,r,h,d));var f=r.length/2;if(f>n.length){for(o=0;o<f;o++)delete a[r[o]];r.splice(0,f)}return h},B.measureText=function(t,e,n,i,a){var r=e[a];return r||(r=e[a]=t.measureText(a).width,n.push(a)),r>i&&(i=r),i},B.numberOfLabelLines=function(t){var e=1;return B.each(t,(function(t){B.isArray(t)&&t.length>e&&(e=t.length)})),e},B.color=w?function(t){return t instanceof CanvasGradient&&(t=Y.global.defaultColor),w(t)}:function(t){return console.error("Color.js not found!"),t},B.getHoverColor=function(t){return t instanceof CanvasPattern||t instanceof CanvasGradient?t:B.color(t).saturate(.5).darken(.1).rgbString()}}(),nn._adapters=on,nn.Animation=J,nn.animationService=Q,nn.controllers=Qt,nn.DatasetController=at,nn.defaults=Y,nn.Element=X,nn.elements=kt,nn.Interaction=oe,nn.layouts=pe,nn.platform=Le,nn.plugins=Re,nn.Scale=_n,nn.scaleService=Ne,nn.Ticks=sn,nn.Tooltip=qe,nn.helpers.each(gi,(function(t,e){nn.scaleService.registerScaleType(e,t,t._defaults)})),Ni)Ni.hasOwnProperty(Ei)&&nn.plugins.register(Ni[Ei]);nn.platform.initialize();var Vi=nn;return"undefined"!=typeof window&&(window.Chart=nn),nn.Chart=nn,nn.Legend=Ni.legend._element,nn.Title=Ni.title._element,nn.pluginService=nn.plugins,nn.PluginBase=nn.Element.extend({}),nn.canvasHelpers=nn.helpers.canvas,nn.layoutService=nn.layouts,nn.LinearScaleBase=Cn,nn.helpers.each(["Bar","Bubble","Doughnut","Line","PolarArea","Radar","Scatter"],(function(t){nn[t]=function(e,n){return new nn(e,nn.helpers.merge(n||{},{type:t.charAt(0).toLowerCase()+t.slice(1)}))}})),Vi}));
diff --git a/htdocs/includes/nnnick/chartjs/dist/Chart.js b/htdocs/includes/nnnick/chartjs/dist/Chart.js
index 44972b6ee7b..68a81cf3484 100644
--- a/htdocs/includes/nnnick/chartjs/dist/Chart.js
+++ b/htdocs/includes/nnnick/chartjs/dist/Chart.js
@@ -1,7 +1,7 @@
 /*!
- * Chart.js v2.9.3
+ * Chart.js v2.9.4
  * https://www.chartjs.org
- * (c) 2019 Chart.js Contributors
+ * (c) 2020 Chart.js Contributors
  * Released under the MIT License
  */
 (function (global, factory) {
@@ -2103,6 +2103,10 @@ if (typeof window !== 'undefined') {
 
 var chartjsColor = Color;
 
+function isValidKey(key) {
+	return ['__proto__', 'prototype', 'constructor'].indexOf(key) === -1;
+}
+
 /**
  * @namespace Chart.helpers
  */
@@ -2278,7 +2282,7 @@ var helpers = {
 		}
 
 		if (helpers.isObject(source)) {
-			var target = {};
+			var target = Object.create(source);
 			var keys = Object.keys(source);
 			var klen = keys.length;
 			var k = 0;
@@ -2299,6 +2303,12 @@ var helpers = {
 	 * @private
 	 */
 	_merger: function(key, target, source, options) {
+		if (!isValidKey(key)) {
+			// We want to ensure we do not copy prototypes over
+			// as this can pollute global namespaces
+			return;
+		}
+
 		var tval = target[key];
 		var sval = source[key];
 
@@ -2314,6 +2324,12 @@ var helpers = {
 	 * @private
 	 */
 	_mergerIf: function(key, target, source) {
+		if (!isValidKey(key)) {
+			// We want to ensure we do not copy prototypes over
+			// as this can pollute global namespaces
+			return;
+		}
+
 		var tval = target[key];
 		var sval = source[key];
 
@@ -3812,7 +3828,7 @@ helpers$1.extend(DatasetController.prototype, {
 	 */
 	_configure: function() {
 		var me = this;
-		me._config = helpers$1.merge({}, [
+		me._config = helpers$1.merge(Object.create(null), [
 			me.chart.options.datasets[me._type],
 			me.getDataset(),
 		], {
@@ -7082,7 +7098,8 @@ function updateDims(chartArea, params, layout) {
 		chartArea.h = newHeight;
 
 		// return true if chart area changed in layout's direction
-		return layout.horizontal ? newWidth !== chartArea.w : newHeight !== chartArea.h;
+		var sizes = layout.horizontal ? [newWidth, chartArea.w] : [newHeight, chartArea.h];
+		return sizes[0] !== sizes[1] && (!isNaN(sizes[0]) || !isNaN(sizes[1]));
 	}
 }
 
@@ -8094,7 +8111,7 @@ var core_scaleService = {
 	},
 	getScaleDefaults: function(type) {
 		// Return the scale defaults merged with the global settings so that we always use the latest ones
-		return this.defaults.hasOwnProperty(type) ? helpers$1.merge({}, [core_defaults.scale, this.defaults[type]]) : {};
+		return this.defaults.hasOwnProperty(type) ? helpers$1.merge(Object.create(null), [core_defaults.scale, this.defaults[type]]) : {};
 	},
 	updateScaleDefaults: function(type, additions) {
 		var me = this;
@@ -9169,7 +9186,7 @@ core_defaults._set('global', {
  * returns a deep copy of the result, thus doesn't alter inputs.
  */
 function mergeScaleConfig(/* config objects ... */) {
-	return helpers$1.merge({}, [].slice.call(arguments), {
+	return helpers$1.merge(Object.create(null), [].slice.call(arguments), {
 		merger: function(key, target, source, options) {
 			if (key === 'xAxes' || key === 'yAxes') {
 				var slen = source[key].length;
@@ -9209,9 +9226,9 @@ function mergeScaleConfig(/* config objects ... */) {
  * a deep copy of the result, thus doesn't alter inputs.
  */
 function mergeConfig(/* config objects ... */) {
-	return helpers$1.merge({}, [].slice.call(arguments), {
+	return helpers$1.merge(Object.create(null), [].slice.call(arguments), {
 		merger: function(key, target, source, options) {
-			var tval = target[key] || {};
+			var tval = target[key] || Object.create(null);
 			var sval = source[key];
 
 			if (key === 'scales') {
@@ -9228,7 +9245,7 @@ function mergeConfig(/* config objects ... */) {
 }
 
 function initConfig(config) {
-	config = config || {};
+	config = config || Object.create(null);
 
 	// Do NOT use mergeConfig for the data object because this method merges arrays
 	// and so would change references to labels and datasets, preventing data updates.
@@ -11209,6 +11226,8 @@ function computeLabelSizes(ctx, tickFonts, ticks, caches) {
 	var widths = [];
 	var heights = [];
 	var offsets = [];
+	var widestLabelSize = 0;
+	var highestLabelSize = 0;
 	var i, j, jlen, label, tickFont, fontString, cache, lineHeight, width, height, nestedLabel, widest, highest;
 
 	for (i = 0; i < length; ++i) {
@@ -11236,11 +11255,13 @@ function computeLabelSizes(ctx, tickFonts, ticks, caches) {
 		widths.push(width);
 		heights.push(height);
 		offsets.push(lineHeight / 2);
+		widestLabelSize = Math.max(width, widestLabelSize);
+		highestLabelSize = Math.max(height, highestLabelSize);
 	}
 	garbageCollect(caches, length);
 
-	widest = widths.indexOf(Math.max.apply(null, widths));
-	highest = heights.indexOf(Math.max.apply(null, heights));
+	widest = widths.indexOf(widestLabelSize);
+	highest = heights.indexOf(highestLabelSize);
 
 	function valueAt(idx) {
 		return {
diff --git a/htdocs/includes/nnnick/chartjs/dist/Chart.min.js b/htdocs/includes/nnnick/chartjs/dist/Chart.min.js
index 7c16b0d1287..a87f61443e1 100644
--- a/htdocs/includes/nnnick/chartjs/dist/Chart.min.js
+++ b/htdocs/includes/nnnick/chartjs/dist/Chart.min.js
@@ -1,7 +1,7 @@
 /*!
- * Chart.js v2.9.3
+ * Chart.js v2.9.4
  * https://www.chartjs.org
- * (c) 2019 Chart.js Contributors
+ * (c) 2020 Chart.js Contributors
  * Released under the MIT License
  */
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(function(){try{return require("moment")}catch(t){}}()):"function"==typeof define&&define.amd?define(["require"],(function(t){return e(function(){try{return t("moment")}catch(t){}}())})):(t=t||self).Chart=e(t.moment)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var e={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},n=function(t,e){return t(e={exports:{}},e.exports),e.exports}((function(t){var n={};for(var i in e)e.hasOwnProperty(i)&&(n[e[i]]=i);var a=t.exports={rgb:{channels:3,labels:"rgb"},hsl:{channels:3,labels:"hsl"},hsv:{channels:3,labels:"hsv"},hwb:{channels:3,labels:"hwb"},cmyk:{channels:4,labels:"cmyk"},xyz:{channels:3,labels:"xyz"},lab:{channels:3,labels:"lab"},lch:{channels:3,labels:"lch"},hex:{channels:1,labels:["hex"]},keyword:{channels:1,labels:["keyword"]},ansi16:{channels:1,labels:["ansi16"]},ansi256:{channels:1,labels:["ansi256"]},hcg:{channels:3,labels:["h","c","g"]},apple:{channels:3,labels:["r16","g16","b16"]},gray:{channels:1,labels:["gray"]}};for(var r in a)if(a.hasOwnProperty(r)){if(!("channels"in a[r]))throw new Error("missing channels property: "+r);if(!("labels"in a[r]))throw new Error("missing channel labels property: "+r);if(a[r].labels.length!==a[r].channels)throw new Error("channel and label counts mismatch: "+r);var o=a[r].channels,s=a[r].labels;delete a[r].channels,delete a[r].labels,Object.defineProperty(a[r],"channels",{value:o}),Object.defineProperty(a[r],"labels",{value:s})}a.rgb.hsl=function(t){var e,n,i=t[0]/255,a=t[1]/255,r=t[2]/255,o=Math.min(i,a,r),s=Math.max(i,a,r),l=s-o;return s===o?e=0:i===s?e=(a-r)/l:a===s?e=2+(r-i)/l:r===s&&(e=4+(i-a)/l),(e=Math.min(60*e,360))<0&&(e+=360),n=(o+s)/2,[e,100*(s===o?0:n<=.5?l/(s+o):l/(2-s-o)),100*n]},a.rgb.hsv=function(t){var e,n,i,a,r,o=t[0]/255,s=t[1]/255,l=t[2]/255,u=Math.max(o,s,l),d=u-Math.min(o,s,l),h=function(t){return(u-t)/6/d+.5};return 0===d?a=r=0:(r=d/u,e=h(o),n=h(s),i=h(l),o===u?a=i-n:s===u?a=1/3+e-i:l===u&&(a=2/3+n-e),a<0?a+=1:a>1&&(a-=1)),[360*a,100*r,100*u]},a.rgb.hwb=function(t){var e=t[0],n=t[1],i=t[2];return[a.rgb.hsl(t)[0],100*(1/255*Math.min(e,Math.min(n,i))),100*(i=1-1/255*Math.max(e,Math.max(n,i)))]},a.rgb.cmyk=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255;return[100*((1-n-(e=Math.min(1-n,1-i,1-a)))/(1-e)||0),100*((1-i-e)/(1-e)||0),100*((1-a-e)/(1-e)||0),100*e]},a.rgb.keyword=function(t){var i=n[t];if(i)return i;var a,r,o,s=1/0;for(var l in e)if(e.hasOwnProperty(l)){var u=e[l],d=(r=t,o=u,Math.pow(r[0]-o[0],2)+Math.pow(r[1]-o[1],2)+Math.pow(r[2]-o[2],2));d<s&&(s=d,a=l)}return a},a.keyword.rgb=function(t){return e[t]},a.rgb.xyz=function(t){var e=t[0]/255,n=t[1]/255,i=t[2]/255;return[100*(.4124*(e=e>.04045?Math.pow((e+.055)/1.055,2.4):e/12.92)+.3576*(n=n>.04045?Math.pow((n+.055)/1.055,2.4):n/12.92)+.1805*(i=i>.04045?Math.pow((i+.055)/1.055,2.4):i/12.92)),100*(.2126*e+.7152*n+.0722*i),100*(.0193*e+.1192*n+.9505*i)]},a.rgb.lab=function(t){var e=a.rgb.xyz(t),n=e[0],i=e[1],r=e[2];return i/=100,r/=108.883,n=(n/=95.047)>.008856?Math.pow(n,1/3):7.787*n+16/116,[116*(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116)-16,500*(n-i),200*(i-(r=r>.008856?Math.pow(r,1/3):7.787*r+16/116))]},a.hsl.rgb=function(t){var e,n,i,a,r,o=t[0]/360,s=t[1]/100,l=t[2]/100;if(0===s)return[r=255*l,r,r];e=2*l-(n=l<.5?l*(1+s):l+s-l*s),a=[0,0,0];for(var u=0;u<3;u++)(i=o+1/3*-(u-1))<0&&i++,i>1&&i--,r=6*i<1?e+6*(n-e)*i:2*i<1?n:3*i<2?e+(n-e)*(2/3-i)*6:e,a[u]=255*r;return a},a.hsl.hsv=function(t){var e=t[0],n=t[1]/100,i=t[2]/100,a=n,r=Math.max(i,.01);return n*=(i*=2)<=1?i:2-i,a*=r<=1?r:2-r,[e,100*(0===i?2*a/(r+a):2*n/(i+n)),100*((i+n)/2)]},a.hsv.rgb=function(t){var e=t[0]/60,n=t[1]/100,i=t[2]/100,a=Math.floor(e)%6,r=e-Math.floor(e),o=255*i*(1-n),s=255*i*(1-n*r),l=255*i*(1-n*(1-r));switch(i*=255,a){case 0:return[i,l,o];case 1:return[s,i,o];case 2:return[o,i,l];case 3:return[o,s,i];case 4:return[l,o,i];case 5:return[i,o,s]}},a.hsv.hsl=function(t){var e,n,i,a=t[0],r=t[1]/100,o=t[2]/100,s=Math.max(o,.01);return i=(2-r)*o,n=r*s,[a,100*(n=(n/=(e=(2-r)*s)<=1?e:2-e)||0),100*(i/=2)]},a.hwb.rgb=function(t){var e,n,i,a,r,o,s,l=t[0]/360,u=t[1]/100,d=t[2]/100,h=u+d;switch(h>1&&(u/=h,d/=h),i=6*l-(e=Math.floor(6*l)),0!=(1&e)&&(i=1-i),a=u+i*((n=1-d)-u),e){default:case 6:case 0:r=n,o=a,s=u;break;case 1:r=a,o=n,s=u;break;case 2:r=u,o=n,s=a;break;case 3:r=u,o=a,s=n;break;case 4:r=a,o=u,s=n;break;case 5:r=n,o=u,s=a}return[255*r,255*o,255*s]},a.cmyk.rgb=function(t){var e=t[0]/100,n=t[1]/100,i=t[2]/100,a=t[3]/100;return[255*(1-Math.min(1,e*(1-a)+a)),255*(1-Math.min(1,n*(1-a)+a)),255*(1-Math.min(1,i*(1-a)+a))]},a.xyz.rgb=function(t){var e,n,i,a=t[0]/100,r=t[1]/100,o=t[2]/100;return n=-.9689*a+1.8758*r+.0415*o,i=.0557*a+-.204*r+1.057*o,e=(e=3.2406*a+-1.5372*r+-.4986*o)>.0031308?1.055*Math.pow(e,1/2.4)-.055:12.92*e,n=n>.0031308?1.055*Math.pow(n,1/2.4)-.055:12.92*n,i=i>.0031308?1.055*Math.pow(i,1/2.4)-.055:12.92*i,[255*(e=Math.min(Math.max(0,e),1)),255*(n=Math.min(Math.max(0,n),1)),255*(i=Math.min(Math.max(0,i),1))]},a.xyz.lab=function(t){var e=t[0],n=t[1],i=t[2];return n/=100,i/=108.883,e=(e/=95.047)>.008856?Math.pow(e,1/3):7.787*e+16/116,[116*(n=n>.008856?Math.pow(n,1/3):7.787*n+16/116)-16,500*(e-n),200*(n-(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116))]},a.lab.xyz=function(t){var e,n,i,a=t[0];e=t[1]/500+(n=(a+16)/116),i=n-t[2]/200;var r=Math.pow(n,3),o=Math.pow(e,3),s=Math.pow(i,3);return n=r>.008856?r:(n-16/116)/7.787,e=o>.008856?o:(e-16/116)/7.787,i=s>.008856?s:(i-16/116)/7.787,[e*=95.047,n*=100,i*=108.883]},a.lab.lch=function(t){var e,n=t[0],i=t[1],a=t[2];return(e=360*Math.atan2(a,i)/2/Math.PI)<0&&(e+=360),[n,Math.sqrt(i*i+a*a),e]},a.lch.lab=function(t){var e,n=t[0],i=t[1];return e=t[2]/360*2*Math.PI,[n,i*Math.cos(e),i*Math.sin(e)]},a.rgb.ansi16=function(t){var e=t[0],n=t[1],i=t[2],r=1 in arguments?arguments[1]:a.rgb.hsv(t)[2];if(0===(r=Math.round(r/50)))return 30;var o=30+(Math.round(i/255)<<2|Math.round(n/255)<<1|Math.round(e/255));return 2===r&&(o+=60),o},a.hsv.ansi16=function(t){return a.rgb.ansi16(a.hsv.rgb(t),t[2])},a.rgb.ansi256=function(t){var e=t[0],n=t[1],i=t[2];return e===n&&n===i?e<8?16:e>248?231:Math.round((e-8)/247*24)+232:16+36*Math.round(e/255*5)+6*Math.round(n/255*5)+Math.round(i/255*5)},a.ansi16.rgb=function(t){var e=t%10;if(0===e||7===e)return t>50&&(e+=3.5),[e=e/10.5*255,e,e];var n=.5*(1+~~(t>50));return[(1&e)*n*255,(e>>1&1)*n*255,(e>>2&1)*n*255]},a.ansi256.rgb=function(t){if(t>=232){var e=10*(t-232)+8;return[e,e,e]}var n;return t-=16,[Math.floor(t/36)/5*255,Math.floor((n=t%36)/6)/5*255,n%6/5*255]},a.rgb.hex=function(t){var e=(((255&Math.round(t[0]))<<16)+((255&Math.round(t[1]))<<8)+(255&Math.round(t[2]))).toString(16).toUpperCase();return"000000".substring(e.length)+e},a.hex.rgb=function(t){var e=t.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);if(!e)return[0,0,0];var n=e[0];3===e[0].length&&(n=n.split("").map((function(t){return t+t})).join(""));var i=parseInt(n,16);return[i>>16&255,i>>8&255,255&i]},a.rgb.hcg=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255,r=Math.max(Math.max(n,i),a),o=Math.min(Math.min(n,i),a),s=r-o;return e=s<=0?0:r===n?(i-a)/s%6:r===i?2+(a-n)/s:4+(n-i)/s+4,e/=6,[360*(e%=1),100*s,100*(s<1?o/(1-s):0)]},a.hsl.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=1,a=0;return(i=n<.5?2*e*n:2*e*(1-n))<1&&(a=(n-.5*i)/(1-i)),[t[0],100*i,100*a]},a.hsv.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=e*n,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.hcg.rgb=function(t){var e=t[0]/360,n=t[1]/100,i=t[2]/100;if(0===n)return[255*i,255*i,255*i];var a,r=[0,0,0],o=e%1*6,s=o%1,l=1-s;switch(Math.floor(o)){case 0:r[0]=1,r[1]=s,r[2]=0;break;case 1:r[0]=l,r[1]=1,r[2]=0;break;case 2:r[0]=0,r[1]=1,r[2]=s;break;case 3:r[0]=0,r[1]=l,r[2]=1;break;case 4:r[0]=s,r[1]=0,r[2]=1;break;default:r[0]=1,r[1]=0,r[2]=l}return a=(1-n)*i,[255*(n*r[0]+a),255*(n*r[1]+a),255*(n*r[2]+a)]},a.hcg.hsv=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e),i=0;return n>0&&(i=e/n),[t[0],100*i,100*n]},a.hcg.hsl=function(t){var e=t[1]/100,n=t[2]/100*(1-e)+.5*e,i=0;return n>0&&n<.5?i=e/(2*n):n>=.5&&n<1&&(i=e/(2*(1-n))),[t[0],100*i,100*n]},a.hcg.hwb=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e);return[t[0],100*(n-e),100*(1-n)]},a.hwb.hcg=function(t){var e=t[1]/100,n=1-t[2]/100,i=n-e,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.apple.rgb=function(t){return[t[0]/65535*255,t[1]/65535*255,t[2]/65535*255]},a.rgb.apple=function(t){return[t[0]/255*65535,t[1]/255*65535,t[2]/255*65535]},a.gray.rgb=function(t){return[t[0]/100*255,t[0]/100*255,t[0]/100*255]},a.gray.hsl=a.gray.hsv=function(t){return[0,0,t[0]]},a.gray.hwb=function(t){return[0,100,t[0]]},a.gray.cmyk=function(t){return[0,0,0,t[0]]},a.gray.lab=function(t){return[t[0],0,0]},a.gray.hex=function(t){var e=255&Math.round(t[0]/100*255),n=((e<<16)+(e<<8)+e).toString(16).toUpperCase();return"000000".substring(n.length)+n},a.rgb.gray=function(t){return[(t[0]+t[1]+t[2])/3/255*100]}}));n.rgb,n.hsl,n.hsv,n.hwb,n.cmyk,n.xyz,n.lab,n.lch,n.hex,n.keyword,n.ansi16,n.ansi256,n.hcg,n.apple,n.gray;function i(t){var e=function(){for(var t={},e=Object.keys(n),i=e.length,a=0;a<i;a++)t[e[a]]={distance:-1,parent:null};return t}(),i=[t];for(e[t].distance=0;i.length;)for(var a=i.pop(),r=Object.keys(n[a]),o=r.length,s=0;s<o;s++){var l=r[s],u=e[l];-1===u.distance&&(u.distance=e[a].distance+1,u.parent=a,i.unshift(l))}return e}function a(t,e){return function(n){return e(t(n))}}function r(t,e){for(var i=[e[t].parent,t],r=n[e[t].parent][t],o=e[t].parent;e[o].parent;)i.unshift(e[o].parent),r=a(n[e[o].parent][o],r),o=e[o].parent;return r.conversion=i,r}var o={};Object.keys(n).forEach((function(t){o[t]={},Object.defineProperty(o[t],"channels",{value:n[t].channels}),Object.defineProperty(o[t],"labels",{value:n[t].labels});var e=function(t){for(var e=i(t),n={},a=Object.keys(e),o=a.length,s=0;s<o;s++){var l=a[s];null!==e[l].parent&&(n[l]=r(l,e))}return n}(t);Object.keys(e).forEach((function(n){var i=e[n];o[t][n]=function(t){var e=function(e){if(null==e)return e;arguments.length>1&&(e=Array.prototype.slice.call(arguments));var n=t(e);if("object"==typeof n)for(var i=n.length,a=0;a<i;a++)n[a]=Math.round(n[a]);return n};return"conversion"in t&&(e.conversion=t.conversion),e}(i),o[t][n].raw=function(t){var e=function(e){return null==e?e:(arguments.length>1&&(e=Array.prototype.slice.call(arguments)),t(e))};return"conversion"in t&&(e.conversion=t.conversion),e}(i)}))}));var s=o,l={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},u={getRgba:d,getHsla:h,getRgb:function(t){var e=d(t);return e&&e.slice(0,3)},getHsl:function(t){var e=h(t);return e&&e.slice(0,3)},getHwb:c,getAlpha:function(t){var e=d(t);if(e)return e[3];if(e=h(t))return e[3];if(e=c(t))return e[3]},hexString:function(t,e){e=void 0!==e&&3===t.length?e:t[3];return"#"+v(t[0])+v(t[1])+v(t[2])+(e>=0&&e<1?v(Math.round(255*e)):"")},rgbString:function(t,e){if(e<1||t[3]&&t[3]<1)return f(t,e);return"rgb("+t[0]+", "+t[1]+", "+t[2]+")"},rgbaString:f,percentString:function(t,e){if(e<1||t[3]&&t[3]<1)return g(t,e);var n=Math.round(t[0]/255*100),i=Math.round(t[1]/255*100),a=Math.round(t[2]/255*100);return"rgb("+n+"%, "+i+"%, "+a+"%)"},percentaString:g,hslString:function(t,e){if(e<1||t[3]&&t[3]<1)return p(t,e);return"hsl("+t[0]+", "+t[1]+"%, "+t[2]+"%)"},hslaString:p,hwbString:function(t,e){void 0===e&&(e=void 0!==t[3]?t[3]:1);return"hwb("+t[0]+", "+t[1]+"%, "+t[2]+"%"+(void 0!==e&&1!==e?", "+e:"")+")"},keyword:function(t){return b[t.slice(0,3)]}};function d(t){if(t){var e=[0,0,0],n=1,i=t.match(/^#([a-fA-F0-9]{3,4})$/i),a="";if(i){a=(i=i[1])[3];for(var r=0;r<e.length;r++)e[r]=parseInt(i[r]+i[r],16);a&&(n=Math.round(parseInt(a+a,16)/255*100)/100)}else if(i=t.match(/^#([a-fA-F0-9]{6}([a-fA-F0-9]{2})?)$/i)){a=i[2],i=i[1];for(r=0;r<e.length;r++)e[r]=parseInt(i.slice(2*r,2*r+2),16);a&&(n=Math.round(parseInt(a,16)/255*100)/100)}else if(i=t.match(/^rgba?\(\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=parseInt(i[r+1]);n=parseFloat(i[4])}else if(i=t.match(/^rgba?\(\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=Math.round(2.55*parseFloat(i[r+1]));n=parseFloat(i[4])}else if(i=t.match(/(\w+)/)){if("transparent"==i[1])return[0,0,0,0];if(!(e=l[i[1]]))return}for(r=0;r<e.length;r++)e[r]=m(e[r],0,255);return n=n||0==n?m(n,0,1):1,e[3]=n,e}}function h(t){if(t){var e=t.match(/^hsla?\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[m(parseInt(e[1]),0,360),m(parseFloat(e[2]),0,100),m(parseFloat(e[3]),0,100),m(isNaN(n)?1:n,0,1)]}}}function c(t){if(t){var e=t.match(/^hwb\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[m(parseInt(e[1]),0,360),m(parseFloat(e[2]),0,100),m(parseFloat(e[3]),0,100),m(isNaN(n)?1:n,0,1)]}}}function f(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"rgba("+t[0]+", "+t[1]+", "+t[2]+", "+e+")"}function g(t,e){return"rgba("+Math.round(t[0]/255*100)+"%, "+Math.round(t[1]/255*100)+"%, "+Math.round(t[2]/255*100)+"%, "+(e||t[3]||1)+")"}function p(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"hsla("+t[0]+", "+t[1]+"%, "+t[2]+"%, "+e+")"}function m(t,e,n){return Math.min(Math.max(e,t),n)}function v(t){var e=t.toString(16).toUpperCase();return e.length<2?"0"+e:e}var b={};for(var x in l)b[l[x]]=x;var y=function(t){return t instanceof y?t:this instanceof y?(this.valid=!1,this.values={rgb:[0,0,0],hsl:[0,0,0],hsv:[0,0,0],hwb:[0,0,0],cmyk:[0,0,0,0],alpha:1},void("string"==typeof t?(e=u.getRgba(t))?this.setValues("rgb",e):(e=u.getHsla(t))?this.setValues("hsl",e):(e=u.getHwb(t))&&this.setValues("hwb",e):"object"==typeof t&&(void 0!==(e=t).r||void 0!==e.red?this.setValues("rgb",e):void 0!==e.l||void 0!==e.lightness?this.setValues("hsl",e):void 0!==e.v||void 0!==e.value?this.setValues("hsv",e):void 0!==e.w||void 0!==e.whiteness?this.setValues("hwb",e):void 0===e.c&&void 0===e.cyan||this.setValues("cmyk",e)))):new y(t);var e};y.prototype={isValid:function(){return this.valid},rgb:function(){return this.setSpace("rgb",arguments)},hsl:function(){return this.setSpace("hsl",arguments)},hsv:function(){return this.setSpace("hsv",arguments)},hwb:function(){return this.setSpace("hwb",arguments)},cmyk:function(){return this.setSpace("cmyk",arguments)},rgbArray:function(){return this.values.rgb},hslArray:function(){return this.values.hsl},hsvArray:function(){return this.values.hsv},hwbArray:function(){var t=this.values;return 1!==t.alpha?t.hwb.concat([t.alpha]):t.hwb},cmykArray:function(){return this.values.cmyk},rgbaArray:function(){var t=this.values;return t.rgb.concat([t.alpha])},hslaArray:function(){var t=this.values;return t.hsl.concat([t.alpha])},alpha:function(t){return void 0===t?this.values.alpha:(this.setValues("alpha",t),this)},red:function(t){return this.setChannel("rgb",0,t)},green:function(t){return this.setChannel("rgb",1,t)},blue:function(t){return this.setChannel("rgb",2,t)},hue:function(t){return t&&(t=(t%=360)<0?360+t:t),this.setChannel("hsl",0,t)},saturation:function(t){return this.setChannel("hsl",1,t)},lightness:function(t){return this.setChannel("hsl",2,t)},saturationv:function(t){return this.setChannel("hsv",1,t)},whiteness:function(t){return this.setChannel("hwb",1,t)},blackness:function(t){return this.setChannel("hwb",2,t)},value:function(t){return this.setChannel("hsv",2,t)},cyan:function(t){return this.setChannel("cmyk",0,t)},magenta:function(t){return this.setChannel("cmyk",1,t)},yellow:function(t){return this.setChannel("cmyk",2,t)},black:function(t){return this.setChannel("cmyk",3,t)},hexString:function(){return u.hexString(this.values.rgb)},rgbString:function(){return u.rgbString(this.values.rgb,this.values.alpha)},rgbaString:function(){return u.rgbaString(this.values.rgb,this.values.alpha)},percentString:function(){return u.percentString(this.values.rgb,this.values.alpha)},hslString:function(){return u.hslString(this.values.hsl,this.values.alpha)},hslaString:function(){return u.hslaString(this.values.hsl,this.values.alpha)},hwbString:function(){return u.hwbString(this.values.hwb,this.values.alpha)},keyword:function(){return u.keyword(this.values.rgb,this.values.alpha)},rgbNumber:function(){var t=this.values.rgb;return t[0]<<16|t[1]<<8|t[2]},luminosity:function(){for(var t=this.values.rgb,e=[],n=0;n<t.length;n++){var i=t[n]/255;e[n]=i<=.03928?i/12.92:Math.pow((i+.055)/1.055,2.4)}return.2126*e[0]+.7152*e[1]+.0722*e[2]},contrast:function(t){var e=this.luminosity(),n=t.luminosity();return e>n?(e+.05)/(n+.05):(n+.05)/(e+.05)},level:function(t){var e=this.contrast(t);return e>=7.1?"AAA":e>=4.5?"AA":""},dark:function(){var t=this.values.rgb;return(299*t[0]+587*t[1]+114*t[2])/1e3<128},light:function(){return!this.dark()},negate:function(){for(var t=[],e=0;e<3;e++)t[e]=255-this.values.rgb[e];return this.setValues("rgb",t),this},lighten:function(t){var e=this.values.hsl;return e[2]+=e[2]*t,this.setValues("hsl",e),this},darken:function(t){var e=this.values.hsl;return e[2]-=e[2]*t,this.setValues("hsl",e),this},saturate:function(t){var e=this.values.hsl;return e[1]+=e[1]*t,this.setValues("hsl",e),this},desaturate:function(t){var e=this.values.hsl;return e[1]-=e[1]*t,this.setValues("hsl",e),this},whiten:function(t){var e=this.values.hwb;return e[1]+=e[1]*t,this.setValues("hwb",e),this},blacken:function(t){var e=this.values.hwb;return e[2]+=e[2]*t,this.setValues("hwb",e),this},greyscale:function(){var t=this.values.rgb,e=.3*t[0]+.59*t[1]+.11*t[2];return this.setValues("rgb",[e,e,e]),this},clearer:function(t){var e=this.values.alpha;return this.setValues("alpha",e-e*t),this},opaquer:function(t){var e=this.values.alpha;return this.setValues("alpha",e+e*t),this},rotate:function(t){var e=this.values.hsl,n=(e[0]+t)%360;return e[0]=n<0?360+n:n,this.setValues("hsl",e),this},mix:function(t,e){var n=t,i=void 0===e?.5:e,a=2*i-1,r=this.alpha()-n.alpha(),o=((a*r==-1?a:(a+r)/(1+a*r))+1)/2,s=1-o;return this.rgb(o*this.red()+s*n.red(),o*this.green()+s*n.green(),o*this.blue()+s*n.blue()).alpha(this.alpha()*i+n.alpha()*(1-i))},toJSON:function(){return this.rgb()},clone:function(){var t,e,n=new y,i=this.values,a=n.values;for(var r in i)i.hasOwnProperty(r)&&(t=i[r],"[object Array]"===(e={}.toString.call(t))?a[r]=t.slice(0):"[object Number]"===e?a[r]=t:console.error("unexpected color value:",t));return n}},y.prototype.spaces={rgb:["red","green","blue"],hsl:["hue","saturation","lightness"],hsv:["hue","saturation","value"],hwb:["hue","whiteness","blackness"],cmyk:["cyan","magenta","yellow","black"]},y.prototype.maxes={rgb:[255,255,255],hsl:[360,100,100],hsv:[360,100,100],hwb:[360,100,100],cmyk:[100,100,100,100]},y.prototype.getValues=function(t){for(var e=this.values,n={},i=0;i<t.length;i++)n[t.charAt(i)]=e[t][i];return 1!==e.alpha&&(n.a=e.alpha),n},y.prototype.setValues=function(t,e){var n,i,a=this.values,r=this.spaces,o=this.maxes,l=1;if(this.valid=!0,"alpha"===t)l=e;else if(e.length)a[t]=e.slice(0,t.length),l=e[t.length];else if(void 0!==e[t.charAt(0)]){for(n=0;n<t.length;n++)a[t][n]=e[t.charAt(n)];l=e.a}else if(void 0!==e[r[t][0]]){var u=r[t];for(n=0;n<t.length;n++)a[t][n]=e[u[n]];l=e.alpha}if(a.alpha=Math.max(0,Math.min(1,void 0===l?a.alpha:l)),"alpha"===t)return!1;for(n=0;n<t.length;n++)i=Math.max(0,Math.min(o[t][n],a[t][n])),a[t][n]=Math.round(i);for(var d in r)d!==t&&(a[d]=s[t][d](a[t]));return!0},y.prototype.setSpace=function(t,e){var n=e[0];return void 0===n?this.getValues(t):("number"==typeof n&&(n=Array.prototype.slice.call(e)),this.setValues(t,n),this)},y.prototype.setChannel=function(t,e,n){var i=this.values[t];return void 0===n?i[e]:n===i[e]?this:(i[e]=n,this.setValues(t,i),this)},"undefined"!=typeof window&&(window.Color=y);var _,k=y,w={noop:function(){},uid:(_=0,function(){return _++}),isNullOrUndef:function(t){return null==t},isArray:function(t){if(Array.isArray&&Array.isArray(t))return!0;var e=Object.prototype.toString.call(t);return"[object"===e.substr(0,7)&&"Array]"===e.substr(-6)},isObject:function(t){return null!==t&&"[object Object]"===Object.prototype.toString.call(t)},isFinite:function(t){return("number"==typeof t||t instanceof Number)&&isFinite(t)},valueOrDefault:function(t,e){return void 0===t?e:t},valueAtIndexOrDefault:function(t,e,n){return w.valueOrDefault(w.isArray(t)?t[e]:t,n)},callback:function(t,e,n){if(t&&"function"==typeof t.call)return t.apply(n,e)},each:function(t,e,n,i){var a,r,o;if(w.isArray(t))if(r=t.length,i)for(a=r-1;a>=0;a--)e.call(n,t[a],a);else for(a=0;a<r;a++)e.call(n,t[a],a);else if(w.isObject(t))for(r=(o=Object.keys(t)).length,a=0;a<r;a++)e.call(n,t[o[a]],o[a])},arrayEquals:function(t,e){var n,i,a,r;if(!t||!e||t.length!==e.length)return!1;for(n=0,i=t.length;n<i;++n)if(a=t[n],r=e[n],a instanceof Array&&r instanceof Array){if(!w.arrayEquals(a,r))return!1}else if(a!==r)return!1;return!0},clone:function(t){if(w.isArray(t))return t.map(w.clone);if(w.isObject(t)){for(var e={},n=Object.keys(t),i=n.length,a=0;a<i;++a)e[n[a]]=w.clone(t[n[a]]);return e}return t},_merger:function(t,e,n,i){var a=e[t],r=n[t];w.isObject(a)&&w.isObject(r)?w.merge(a,r,i):e[t]=w.clone(r)},_mergerIf:function(t,e,n){var i=e[t],a=n[t];w.isObject(i)&&w.isObject(a)?w.mergeIf(i,a):e.hasOwnProperty(t)||(e[t]=w.clone(a))},merge:function(t,e,n){var i,a,r,o,s,l=w.isArray(e)?e:[e],u=l.length;if(!w.isObject(t))return t;for(i=(n=n||{}).merger||w._merger,a=0;a<u;++a)if(e=l[a],w.isObject(e))for(s=0,o=(r=Object.keys(e)).length;s<o;++s)i(r[s],t,e,n);return t},mergeIf:function(t,e){return w.merge(t,e,{merger:w._mergerIf})},extend:Object.assign||function(t){return w.merge(t,[].slice.call(arguments,1),{merger:function(t,e,n){e[t]=n[t]}})},inherits:function(t){var e=this,n=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return e.apply(this,arguments)},i=function(){this.constructor=n};return i.prototype=e.prototype,n.prototype=new i,n.extend=w.inherits,t&&w.extend(n.prototype,t),n.__super__=e.prototype,n},_deprecated:function(t,e,n,i){void 0!==e&&console.warn(t+': "'+n+'" is deprecated. Please use "'+i+'" instead')}},M=w;w.callCallback=w.callback,w.indexOf=function(t,e,n){return Array.prototype.indexOf.call(t,e,n)},w.getValueOrDefault=w.valueOrDefault,w.getValueAtIndexOrDefault=w.valueAtIndexOrDefault;var S={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return(t-=1)*t*t+1},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-((t-=1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return t*t*t*t*t},easeOutQuint:function(t){return(t-=1)*t*t*t*t+1},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return 1-Math.cos(t*(Math.PI/2))},easeOutSine:function(t){return Math.sin(t*(Math.PI/2))},easeInOutSine:function(t){return-.5*(Math.cos(Math.PI*t)-1)},easeInExpo:function(t){return 0===t?0:Math.pow(2,10*(t-1))},easeOutExpo:function(t){return 1===t?1:1-Math.pow(2,-10*t)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(2-Math.pow(2,-10*--t))},easeInCirc:function(t){return t>=1?t:-(Math.sqrt(1-t*t)-1)},easeOutCirc:function(t){return Math.sqrt(1-(t-=1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),-i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n))},easeOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),i*Math.pow(2,-10*t)*Math.sin((t-e)*(2*Math.PI)/n)+1)},easeInOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:2==(t/=.5)?1:(n||(n=.45),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),t<1?i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*-.5:i*Math.pow(2,-10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*.5+1)},easeInBack:function(t){var e=1.70158;return t*t*((e+1)*t-e)},easeOutBack:function(t){var e=1.70158;return(t-=1)*t*((e+1)*t+e)+1},easeInOutBack:function(t){var e=1.70158;return(t/=.5)<1?t*t*((1+(e*=1.525))*t-e)*.5:.5*((t-=2)*t*((1+(e*=1.525))*t+e)+2)},easeInBounce:function(t){return 1-S.easeOutBounce(1-t)},easeOutBounce:function(t){return t<1/2.75?7.5625*t*t:t<2/2.75?7.5625*(t-=1.5/2.75)*t+.75:t<2.5/2.75?7.5625*(t-=2.25/2.75)*t+.9375:7.5625*(t-=2.625/2.75)*t+.984375},easeInOutBounce:function(t){return t<.5?.5*S.easeInBounce(2*t):.5*S.easeOutBounce(2*t-1)+.5}},C={effects:S};M.easingEffects=S;var P=Math.PI,A=P/180,D=2*P,T=P/2,I=P/4,F=2*P/3,L={clear:function(t){t.ctx.clearRect(0,0,t.width,t.height)},roundedRect:function(t,e,n,i,a,r){if(r){var o=Math.min(r,a/2,i/2),s=e+o,l=n+o,u=e+i-o,d=n+a-o;t.moveTo(e,l),s<u&&l<d?(t.arc(s,l,o,-P,-T),t.arc(u,l,o,-T,0),t.arc(u,d,o,0,T),t.arc(s,d,o,T,P)):s<u?(t.moveTo(s,n),t.arc(u,l,o,-T,T),t.arc(s,l,o,T,P+T)):l<d?(t.arc(s,l,o,-P,0),t.arc(s,d,o,0,P)):t.arc(s,l,o,-P,P),t.closePath(),t.moveTo(e,n)}else t.rect(e,n,i,a)},drawPoint:function(t,e,n,i,a,r){var o,s,l,u,d,h=(r||0)*A;if(e&&"object"==typeof e&&("[object HTMLImageElement]"===(o=e.toString())||"[object HTMLCanvasElement]"===o))return t.save(),t.translate(i,a),t.rotate(h),t.drawImage(e,-e.width/2,-e.height/2,e.width,e.height),void t.restore();if(!(isNaN(n)||n<=0)){switch(t.beginPath(),e){default:t.arc(i,a,n,0,D),t.closePath();break;case"triangle":t.moveTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=F,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=F,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),t.closePath();break;case"rectRounded":u=n-(d=.516*n),s=Math.cos(h+I)*u,l=Math.sin(h+I)*u,t.arc(i-s,a-l,d,h-P,h-T),t.arc(i+l,a-s,d,h-T,h),t.arc(i+s,a+l,d,h,h+T),t.arc(i-l,a+s,d,h+T,h+P),t.closePath();break;case"rect":if(!r){u=Math.SQRT1_2*n,t.rect(i-u,a-u,2*u,2*u);break}h+=I;case"rectRot":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+l,a-s),t.lineTo(i+s,a+l),t.lineTo(i-l,a+s),t.closePath();break;case"crossRot":h+=I;case"cross":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"star":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s),h+=I,s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"line":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l);break;case"dash":t.moveTo(i,a),t.lineTo(i+Math.cos(h)*n,a+Math.sin(h)*n)}t.fill(),t.stroke()}},_isPointInArea:function(t,e){return t.x>e.left-1e-6&&t.x<e.right+1e-6&&t.y>e.top-1e-6&&t.y<e.bottom+1e-6},clipArea:function(t,e){t.save(),t.beginPath(),t.rect(e.left,e.top,e.right-e.left,e.bottom-e.top),t.clip()},unclipArea:function(t){t.restore()},lineTo:function(t,e,n,i){var a=n.steppedLine;if(a){if("middle"===a){var r=(e.x+n.x)/2;t.lineTo(r,i?n.y:e.y),t.lineTo(r,i?e.y:n.y)}else"after"===a&&!i||"after"!==a&&i?t.lineTo(e.x,n.y):t.lineTo(n.x,e.y);t.lineTo(n.x,n.y)}else n.tension?t.bezierCurveTo(i?e.controlPointPreviousX:e.controlPointNextX,i?e.controlPointPreviousY:e.controlPointNextY,i?n.controlPointNextX:n.controlPointPreviousX,i?n.controlPointNextY:n.controlPointPreviousY,n.x,n.y):t.lineTo(n.x,n.y)}},O=L;M.clear=L.clear,M.drawRoundedRectangle=function(t){t.beginPath(),L.roundedRect.apply(L,arguments)};var R={_set:function(t,e){return M.merge(this[t]||(this[t]={}),e)}};R._set("global",{defaultColor:"rgba(0,0,0,0.1)",defaultFontColor:"#666",defaultFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",defaultFontSize:12,defaultFontStyle:"normal",defaultLineHeight:1.2,showLines:!0});var z=R,N=M.valueOrDefault;var B={toLineHeight:function(t,e){var n=(""+t).match(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/);if(!n||"normal"===n[1])return 1.2*e;switch(t=+n[2],n[3]){case"px":return t;case"%":t/=100}return e*t},toPadding:function(t){var e,n,i,a;return M.isObject(t)?(e=+t.top||0,n=+t.right||0,i=+t.bottom||0,a=+t.left||0):e=n=i=a=+t||0,{top:e,right:n,bottom:i,left:a,height:e+i,width:a+n}},_parseFont:function(t){var e=z.global,n=N(t.fontSize,e.defaultFontSize),i={family:N(t.fontFamily,e.defaultFontFamily),lineHeight:M.options.toLineHeight(N(t.lineHeight,e.defaultLineHeight),n),size:n,style:N(t.fontStyle,e.defaultFontStyle),weight:null,string:""};return i.string=function(t){return!t||M.isNullOrUndef(t.size)||M.isNullOrUndef(t.family)?null:(t.style?t.style+" ":"")+(t.weight?t.weight+" ":"")+t.size+"px "+t.family}(i),i},resolve:function(t,e,n,i){var a,r,o,s=!0;for(a=0,r=t.length;a<r;++a)if(void 0!==(o=t[a])&&(void 0!==e&&"function"==typeof o&&(o=o(e),s=!1),void 0!==n&&M.isArray(o)&&(o=o[n],s=!1),void 0!==o))return i&&!s&&(i.cacheable=!1),o}},E={_factorize:function(t){var e,n=[],i=Math.sqrt(t);for(e=1;e<i;e++)t%e==0&&(n.push(e),n.push(t/e));return i===(0|i)&&n.push(i),n.sort((function(t,e){return t-e})).pop(),n},log10:Math.log10||function(t){var e=Math.log(t)*Math.LOG10E,n=Math.round(e);return t===Math.pow(10,n)?n:e}},W=E;M.log10=E.log10;var V=M,H=C,j=O,q=B,U=W,Y={getRtlAdapter:function(t,e,n){return t?function(t,e){return{x:function(n){return t+t+e-n},setWidth:function(t){e=t},textAlign:function(t){return"center"===t?t:"right"===t?"left":"right"},xPlus:function(t,e){return t-e},leftForLtr:function(t,e){return t-e}}}(e,n):{x:function(t){return t},setWidth:function(t){},textAlign:function(t){return t},xPlus:function(t,e){return t+e},leftForLtr:function(t,e){return t}}},overrideTextDirection:function(t,e){var n,i;"ltr"!==e&&"rtl"!==e||(i=[(n=t.canvas.style).getPropertyValue("direction"),n.getPropertyPriority("direction")],n.setProperty("direction",e,"important"),t.prevTextDirection=i)},restoreTextDirection:function(t){var e=t.prevTextDirection;void 0!==e&&(delete t.prevTextDirection,t.canvas.style.setProperty("direction",e[0],e[1]))}};V.easing=H,V.canvas=j,V.options=q,V.math=U,V.rtl=Y;var G=function(t){V.extend(this,t),this.initialize.apply(this,arguments)};V.extend(G.prototype,{_type:void 0,initialize:function(){this.hidden=!1},pivot:function(){var t=this;return t._view||(t._view=V.extend({},t._model)),t._start={},t},transition:function(t){var e=this,n=e._model,i=e._start,a=e._view;return n&&1!==t?(a||(a=e._view={}),i||(i=e._start={}),function(t,e,n,i){var a,r,o,s,l,u,d,h,c,f=Object.keys(n);for(a=0,r=f.length;a<r;++a)if(u=n[o=f[a]],e.hasOwnProperty(o)||(e[o]=u),(s=e[o])!==u&&"_"!==o[0]){if(t.hasOwnProperty(o)||(t[o]=s),(d=typeof u)===typeof(l=t[o]))if("string"===d){if((h=k(l)).valid&&(c=k(u)).valid){e[o]=c.mix(h,i).rgbString();continue}}else if(V.isFinite(l)&&V.isFinite(u)){e[o]=l+(u-l)*i;continue}e[o]=u}}(i,a,n,t),e):(e._view=V.extend({},n),e._start=null,e)},tooltipPosition:function(){return{x:this._model.x,y:this._model.y}},hasValue:function(){return V.isNumber(this._model.x)&&V.isNumber(this._model.y)}}),G.extend=V.inherits;var X=G,K=X.extend({chart:null,currentStep:0,numSteps:60,easing:"",render:null,onAnimationProgress:null,onAnimationComplete:null}),Z=K;Object.defineProperty(K.prototype,"animationObject",{get:function(){return this}}),Object.defineProperty(K.prototype,"chartInstance",{get:function(){return this.chart},set:function(t){this.chart=t}}),z._set("global",{animation:{duration:1e3,easing:"easeOutQuart",onProgress:V.noop,onComplete:V.noop}});var $={animations:[],request:null,addAnimation:function(t,e,n,i){var a,r,o=this.animations;for(e.chart=t,e.startTime=Date.now(),e.duration=n,i||(t.animating=!0),a=0,r=o.length;a<r;++a)if(o[a].chart===t)return void(o[a]=e);o.push(e),1===o.length&&this.requestAnimationFrame()},cancelAnimation:function(t){var e=V.findIndex(this.animations,(function(e){return e.chart===t}));-1!==e&&(this.animations.splice(e,1),t.animating=!1)},requestAnimationFrame:function(){var t=this;null===t.request&&(t.request=V.requestAnimFrame.call(window,(function(){t.request=null,t.startDigest()})))},startDigest:function(){this.advance(),this.animations.length>0&&this.requestAnimationFrame()},advance:function(){for(var t,e,n,i,a=this.animations,r=0;r<a.length;)e=(t=a[r]).chart,n=t.numSteps,i=Math.floor((Date.now()-t.startTime)/t.duration*n)+1,t.currentStep=Math.min(i,n),V.callback(t.render,[e,t],e),V.callback(t.onAnimationProgress,[t],e),t.currentStep>=n?(V.callback(t.onAnimationComplete,[t],e),e.animating=!1,a.splice(r,1)):++r}},J=V.options.resolve,Q=["push","pop","shift","splice","unshift"];function tt(t,e){var n=t._chartjs;if(n){var i=n.listeners,a=i.indexOf(e);-1!==a&&i.splice(a,1),i.length>0||(Q.forEach((function(e){delete t[e]})),delete t._chartjs)}}var et=function(t,e){this.initialize(t,e)};V.extend(et.prototype,{datasetElementType:null,dataElementType:null,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth"],_dataElementOptions:["backgroundColor","borderColor","borderWidth","pointStyle"],initialize:function(t,e){var n=this;n.chart=t,n.index=e,n.linkScales(),n.addElements(),n._type=n.getMeta().type},updateIndex:function(t){this.index=t},linkScales:function(){var t=this.getMeta(),e=this.chart,n=e.scales,i=this.getDataset(),a=e.options.scales;null!==t.xAxisID&&t.xAxisID in n&&!i.xAxisID||(t.xAxisID=i.xAxisID||a.xAxes[0].id),null!==t.yAxisID&&t.yAxisID in n&&!i.yAxisID||(t.yAxisID=i.yAxisID||a.yAxes[0].id)},getDataset:function(){return this.chart.data.datasets[this.index]},getMeta:function(){return this.chart.getDatasetMeta(this.index)},getScaleForId:function(t){return this.chart.scales[t]},_getValueScaleId:function(){return this.getMeta().yAxisID},_getIndexScaleId:function(){return this.getMeta().xAxisID},_getValueScale:function(){return this.getScaleForId(this._getValueScaleId())},_getIndexScale:function(){return this.getScaleForId(this._getIndexScaleId())},reset:function(){this._update(!0)},destroy:function(){this._data&&tt(this._data,this)},createMetaDataset:function(){var t=this.datasetElementType;return t&&new t({_chart:this.chart,_datasetIndex:this.index})},createMetaData:function(t){var e=this.dataElementType;return e&&new e({_chart:this.chart,_datasetIndex:this.index,_index:t})},addElements:function(){var t,e,n=this.getMeta(),i=this.getDataset().data||[],a=n.data;for(t=0,e=i.length;t<e;++t)a[t]=a[t]||this.createMetaData(t);n.dataset=n.dataset||this.createMetaDataset()},addElementAndReset:function(t){var e=this.createMetaData(t);this.getMeta().data.splice(t,0,e),this.updateElement(e,t,!0)},buildOrUpdateElements:function(){var t,e,n=this,i=n.getDataset(),a=i.data||(i.data=[]);n._data!==a&&(n._data&&tt(n._data,n),a&&Object.isExtensible(a)&&(e=n,(t=a)._chartjs?t._chartjs.listeners.push(e):(Object.defineProperty(t,"_chartjs",{configurable:!0,enumerable:!1,value:{listeners:[e]}}),Q.forEach((function(e){var n="onData"+e.charAt(0).toUpperCase()+e.slice(1),i=t[e];Object.defineProperty(t,e,{configurable:!0,enumerable:!1,value:function(){var e=Array.prototype.slice.call(arguments),a=i.apply(this,e);return V.each(t._chartjs.listeners,(function(t){"function"==typeof t[n]&&t[n].apply(t,e)})),a}})})))),n._data=a),n.resyncElements()},_configure:function(){this._config=V.merge({},[this.chart.options.datasets[this._type],this.getDataset()],{merger:function(t,e,n){"_meta"!==t&&"data"!==t&&V._merger(t,e,n)}})},_update:function(t){this._configure(),this._cachedDataOpts=null,this.update(t)},update:V.noop,transition:function(t){for(var e=this.getMeta(),n=e.data||[],i=n.length,a=0;a<i;++a)n[a].transition(t);e.dataset&&e.dataset.transition(t)},draw:function(){var t=this.getMeta(),e=t.data||[],n=e.length,i=0;for(t.dataset&&t.dataset.draw();i<n;++i)e[i].draw()},getStyle:function(t){var e,n=this.getMeta(),i=n.dataset;return this._configure(),i&&void 0===t?e=this._resolveDatasetElementOptions(i||{}):(t=t||0,e=this._resolveDataElementOptions(n.data[t]||{},t)),!1!==e.fill&&null!==e.fill||(e.backgroundColor=e.borderColor),e},_resolveDatasetElementOptions:function(t,e){var n,i,a,r,o=this,s=o.chart,l=o._config,u=t.custom||{},d=s.options.elements[o.datasetElementType.prototype._type]||{},h=o._datasetElementOptions,c={},f={chart:s,dataset:o.getDataset(),datasetIndex:o.index,hover:e};for(n=0,i=h.length;n<i;++n)a=h[n],r=e?"hover"+a.charAt(0).toUpperCase()+a.slice(1):a,c[a]=J([u[r],l[r],d[r]],f);return c},_resolveDataElementOptions:function(t,e){var n=this,i=t&&t.custom,a=n._cachedDataOpts;if(a&&!i)return a;var r,o,s,l,u=n.chart,d=n._config,h=u.options.elements[n.dataElementType.prototype._type]||{},c=n._dataElementOptions,f={},g={chart:u,dataIndex:e,dataset:n.getDataset(),datasetIndex:n.index},p={cacheable:!i};if(i=i||{},V.isArray(c))for(o=0,s=c.length;o<s;++o)f[l=c[o]]=J([i[l],d[l],h[l]],g,e,p);else for(o=0,s=(r=Object.keys(c)).length;o<s;++o)f[l=r[o]]=J([i[l],d[c[l]],d[l],h[l]],g,e,p);return p.cacheable&&(n._cachedDataOpts=Object.freeze(f)),f},removeHoverStyle:function(t){V.merge(t._model,t.$previousStyle||{}),delete t.$previousStyle},setHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],n=t._index,i=t.custom||{},a=t._model,r=V.getHoverColor;t.$previousStyle={backgroundColor:a.backgroundColor,borderColor:a.borderColor,borderWidth:a.borderWidth},a.backgroundColor=J([i.hoverBackgroundColor,e.hoverBackgroundColor,r(a.backgroundColor)],void 0,n),a.borderColor=J([i.hoverBorderColor,e.hoverBorderColor,r(a.borderColor)],void 0,n),a.borderWidth=J([i.hoverBorderWidth,e.hoverBorderWidth,a.borderWidth],void 0,n)},_removeDatasetHoverStyle:function(){var t=this.getMeta().dataset;t&&this.removeHoverStyle(t)},_setDatasetHoverStyle:function(){var t,e,n,i,a,r,o=this.getMeta().dataset,s={};if(o){for(r=o._model,a=this._resolveDatasetElementOptions(o,!0),t=0,e=(i=Object.keys(a)).length;t<e;++t)s[n=i[t]]=r[n],r[n]=a[n];o.$previousStyle=s}},resyncElements:function(){var t=this.getMeta(),e=this.getDataset().data,n=t.data.length,i=e.length;i<n?t.data.splice(i,n-i):i>n&&this.insertElements(n,i-n)},insertElements:function(t,e){for(var n=0;n<e;++n)this.addElementAndReset(t+n)},onDataPush:function(){var t=arguments.length;this.insertElements(this.getDataset().data.length-t,t)},onDataPop:function(){this.getMeta().data.pop()},onDataShift:function(){this.getMeta().data.shift()},onDataSplice:function(t,e){this.getMeta().data.splice(t,e),this.insertElements(t,arguments.length-2)},onDataUnshift:function(){this.insertElements(0,arguments.length)}}),et.extend=V.inherits;var nt=et,it=2*Math.PI;function at(t,e){var n=e.startAngle,i=e.endAngle,a=e.pixelMargin,r=a/e.outerRadius,o=e.x,s=e.y;t.beginPath(),t.arc(o,s,e.outerRadius,n-r,i+r),e.innerRadius>a?(r=a/e.innerRadius,t.arc(o,s,e.innerRadius-a,i+r,n-r,!0)):t.arc(o,s,a,i+Math.PI/2,n-Math.PI/2),t.closePath(),t.clip()}function rt(t,e,n){var i="inner"===e.borderAlign;i?(t.lineWidth=2*e.borderWidth,t.lineJoin="round"):(t.lineWidth=e.borderWidth,t.lineJoin="bevel"),n.fullCircles&&function(t,e,n,i){var a,r=n.endAngle;for(i&&(n.endAngle=n.startAngle+it,at(t,n),n.endAngle=r,n.endAngle===n.startAngle&&n.fullCircles&&(n.endAngle+=it,n.fullCircles--)),t.beginPath(),t.arc(n.x,n.y,n.innerRadius,n.startAngle+it,n.startAngle,!0),a=0;a<n.fullCircles;++a)t.stroke();for(t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.startAngle+it),a=0;a<n.fullCircles;++a)t.stroke()}(t,e,n,i),i&&at(t,n),t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.endAngle),t.arc(n.x,n.y,n.innerRadius,n.endAngle,n.startAngle,!0),t.closePath(),t.stroke()}z._set("global",{elements:{arc:{backgroundColor:z.global.defaultColor,borderColor:"#fff",borderWidth:2,borderAlign:"center"}}});var ot=X.extend({_type:"arc",inLabelRange:function(t){var e=this._view;return!!e&&Math.pow(t-e.x,2)<Math.pow(e.radius+e.hoverRadius,2)},inRange:function(t,e){var n=this._view;if(n){for(var i=V.getAngleFromPoint(n,{x:t,y:e}),a=i.angle,r=i.distance,o=n.startAngle,s=n.endAngle;s<o;)s+=it;for(;a>s;)a-=it;for(;a<o;)a+=it;var l=a>=o&&a<=s,u=r>=n.innerRadius&&r<=n.outerRadius;return l&&u}return!1},getCenterPoint:function(){var t=this._view,e=(t.startAngle+t.endAngle)/2,n=(t.innerRadius+t.outerRadius)/2;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},getArea:function(){var t=this._view;return Math.PI*((t.endAngle-t.startAngle)/(2*Math.PI))*(Math.pow(t.outerRadius,2)-Math.pow(t.innerRadius,2))},tooltipPosition:function(){var t=this._view,e=t.startAngle+(t.endAngle-t.startAngle)/2,n=(t.outerRadius-t.innerRadius)/2+t.innerRadius;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},draw:function(){var t,e=this._chart.ctx,n=this._view,i="inner"===n.borderAlign?.33:0,a={x:n.x,y:n.y,innerRadius:n.innerRadius,outerRadius:Math.max(n.outerRadius-i,0),pixelMargin:i,startAngle:n.startAngle,endAngle:n.endAngle,fullCircles:Math.floor(n.circumference/it)};if(e.save(),e.fillStyle=n.backgroundColor,e.strokeStyle=n.borderColor,a.fullCircles){for(a.endAngle=a.startAngle+it,e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),t=0;t<a.fullCircles;++t)e.fill();a.endAngle=a.startAngle+n.circumference%it}e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),e.fill(),n.borderWidth&&rt(e,n,a),e.restore()}}),st=V.valueOrDefault,lt=z.global.defaultColor;z._set("global",{elements:{line:{tension:.4,backgroundColor:lt,borderWidth:3,borderColor:lt,borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",capBezierPoints:!0,fill:!0}}});var ut=X.extend({_type:"line",draw:function(){var t,e,n,i=this,a=i._view,r=i._chart.ctx,o=a.spanGaps,s=i._children.slice(),l=z.global,u=l.elements.line,d=-1,h=i._loop;if(s.length){if(i._loop){for(t=0;t<s.length;++t)if(e=V.previousItem(s,t),!s[t]._view.skip&&e._view.skip){s=s.slice(t).concat(s.slice(0,t)),h=o;break}h&&s.push(s[0])}for(r.save(),r.lineCap=a.borderCapStyle||u.borderCapStyle,r.setLineDash&&r.setLineDash(a.borderDash||u.borderDash),r.lineDashOffset=st(a.borderDashOffset,u.borderDashOffset),r.lineJoin=a.borderJoinStyle||u.borderJoinStyle,r.lineWidth=st(a.borderWidth,u.borderWidth),r.strokeStyle=a.borderColor||l.defaultColor,r.beginPath(),(n=s[0]._view).skip||(r.moveTo(n.x,n.y),d=0),t=1;t<s.length;++t)n=s[t]._view,e=-1===d?V.previousItem(s,t):s[d],n.skip||(d!==t-1&&!o||-1===d?r.moveTo(n.x,n.y):V.canvas.lineTo(r,e._view,n),d=t);h&&r.closePath(),r.stroke(),r.restore()}}}),dt=V.valueOrDefault,ht=z.global.defaultColor;function ct(t){var e=this._view;return!!e&&Math.abs(t-e.x)<e.radius+e.hitRadius}z._set("global",{elements:{point:{radius:3,pointStyle:"circle",backgroundColor:ht,borderColor:ht,borderWidth:1,hitRadius:1,hoverRadius:4,hoverBorderWidth:1}}});var ft=X.extend({_type:"point",inRange:function(t,e){var n=this._view;return!!n&&Math.pow(t-n.x,2)+Math.pow(e-n.y,2)<Math.pow(n.hitRadius+n.radius,2)},inLabelRange:ct,inXRange:ct,inYRange:function(t){var e=this._view;return!!e&&Math.abs(t-e.y)<e.radius+e.hitRadius},getCenterPoint:function(){var t=this._view;return{x:t.x,y:t.y}},getArea:function(){return Math.PI*Math.pow(this._view.radius,2)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y,padding:t.radius+t.borderWidth}},draw:function(t){var e=this._view,n=this._chart.ctx,i=e.pointStyle,a=e.rotation,r=e.radius,o=e.x,s=e.y,l=z.global,u=l.defaultColor;e.skip||(void 0===t||V.canvas._isPointInArea(e,t))&&(n.strokeStyle=e.borderColor||u,n.lineWidth=dt(e.borderWidth,l.elements.point.borderWidth),n.fillStyle=e.backgroundColor||u,V.canvas.drawPoint(n,i,r,o,s,a))}}),gt=z.global.defaultColor;function pt(t){return t&&void 0!==t.width}function mt(t){var e,n,i,a,r;return pt(t)?(r=t.width/2,e=t.x-r,n=t.x+r,i=Math.min(t.y,t.base),a=Math.max(t.y,t.base)):(r=t.height/2,e=Math.min(t.x,t.base),n=Math.max(t.x,t.base),i=t.y-r,a=t.y+r),{left:e,top:i,right:n,bottom:a}}function vt(t,e,n){return t===e?n:t===n?e:t}function bt(t,e,n){var i,a,r,o,s=t.borderWidth,l=function(t){var e=t.borderSkipped,n={};return e?(t.horizontal?t.base>t.x&&(e=vt(e,"left","right")):t.base<t.y&&(e=vt(e,"bottom","top")),n[e]=!0,n):n}(t);return V.isObject(s)?(i=+s.top||0,a=+s.right||0,r=+s.bottom||0,o=+s.left||0):i=a=r=o=+s||0,{t:l.top||i<0?0:i>n?n:i,r:l.right||a<0?0:a>e?e:a,b:l.bottom||r<0?0:r>n?n:r,l:l.left||o<0?0:o>e?e:o}}function xt(t,e,n){var i=null===e,a=null===n,r=!(!t||i&&a)&&mt(t);return r&&(i||e>=r.left&&e<=r.right)&&(a||n>=r.top&&n<=r.bottom)}z._set("global",{elements:{rectangle:{backgroundColor:gt,borderColor:gt,borderSkipped:"bottom",borderWidth:0}}});var yt=X.extend({_type:"rectangle",draw:function(){var t=this._chart.ctx,e=this._view,n=function(t){var e=mt(t),n=e.right-e.left,i=e.bottom-e.top,a=bt(t,n/2,i/2);return{outer:{x:e.left,y:e.top,w:n,h:i},inner:{x:e.left+a.l,y:e.top+a.t,w:n-a.l-a.r,h:i-a.t-a.b}}}(e),i=n.outer,a=n.inner;t.fillStyle=e.backgroundColor,t.fillRect(i.x,i.y,i.w,i.h),i.w===a.w&&i.h===a.h||(t.save(),t.beginPath(),t.rect(i.x,i.y,i.w,i.h),t.clip(),t.fillStyle=e.borderColor,t.rect(a.x,a.y,a.w,a.h),t.fill("evenodd"),t.restore())},height:function(){var t=this._view;return t.base-t.y},inRange:function(t,e){return xt(this._view,t,e)},inLabelRange:function(t,e){var n=this._view;return pt(n)?xt(n,t,null):xt(n,null,e)},inXRange:function(t){return xt(this._view,t,null)},inYRange:function(t){return xt(this._view,null,t)},getCenterPoint:function(){var t,e,n=this._view;return pt(n)?(t=n.x,e=(n.y+n.base)/2):(t=(n.x+n.base)/2,e=n.y),{x:t,y:e}},getArea:function(){var t=this._view;return pt(t)?t.width*Math.abs(t.y-t.base):t.height*Math.abs(t.x-t.base)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y}}}),_t={},kt=ot,wt=ut,Mt=ft,St=yt;_t.Arc=kt,_t.Line=wt,_t.Point=Mt,_t.Rectangle=St;var Ct=V._deprecated,Pt=V.valueOrDefault;function At(t,e,n){var i,a,r=n.barThickness,o=e.stackCount,s=e.pixels[t],l=V.isNullOrUndef(r)?function(t,e){var n,i,a,r,o=t._length;for(a=1,r=e.length;a<r;++a)o=Math.min(o,Math.abs(e[a]-e[a-1]));for(a=0,r=t.getTicks().length;a<r;++a)i=t.getPixelForTick(a),o=a>0?Math.min(o,Math.abs(i-n)):o,n=i;return o}(e.scale,e.pixels):-1;return V.isNullOrUndef(r)?(i=l*n.categoryPercentage,a=n.barPercentage):(i=r*o,a=1),{chunk:i/o,ratio:a,start:s-i/2}}z._set("bar",{hover:{mode:"label"},scales:{xAxes:[{type:"category",offset:!0,gridLines:{offsetGridLines:!0}}],yAxes:[{type:"linear"}]}}),z._set("global",{datasets:{bar:{categoryPercentage:.8,barPercentage:.9}}});var Dt=nt.extend({dataElementType:_t.Rectangle,_dataElementOptions:["backgroundColor","borderColor","borderSkipped","borderWidth","barPercentage","barThickness","categoryPercentage","maxBarThickness","minBarLength"],initialize:function(){var t,e,n=this;nt.prototype.initialize.apply(n,arguments),(t=n.getMeta()).stack=n.getDataset().stack,t.bar=!0,e=n._getIndexScale().options,Ct("bar chart",e.barPercentage,"scales.[x/y]Axes.barPercentage","dataset.barPercentage"),Ct("bar chart",e.barThickness,"scales.[x/y]Axes.barThickness","dataset.barThickness"),Ct("bar chart",e.categoryPercentage,"scales.[x/y]Axes.categoryPercentage","dataset.categoryPercentage"),Ct("bar chart",n._getValueScale().options.minBarLength,"scales.[x/y]Axes.minBarLength","dataset.minBarLength"),Ct("bar chart",e.maxBarThickness,"scales.[x/y]Axes.maxBarThickness","dataset.maxBarThickness")},update:function(t){var e,n,i=this.getMeta().data;for(this._ruler=this.getRuler(),e=0,n=i.length;e<n;++e)this.updateElement(i[e],e,t)},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=i.getDataset(),o=i._resolveDataElementOptions(t,e);t._xScale=i.getScaleForId(a.xAxisID),t._yScale=i.getScaleForId(a.yAxisID),t._datasetIndex=i.index,t._index=e,t._model={backgroundColor:o.backgroundColor,borderColor:o.borderColor,borderSkipped:o.borderSkipped,borderWidth:o.borderWidth,datasetLabel:r.label,label:i.chart.data.labels[e]},V.isArray(r.data[e])&&(t._model.borderSkipped=null),i._updateElementGeometry(t,e,n,o),t.pivot()},_updateElementGeometry:function(t,e,n,i){var a=this,r=t._model,o=a._getValueScale(),s=o.getBasePixel(),l=o.isHorizontal(),u=a._ruler||a.getRuler(),d=a.calculateBarValuePixels(a.index,e,i),h=a.calculateBarIndexPixels(a.index,e,u,i);r.horizontal=l,r.base=n?s:d.base,r.x=l?n?s:d.head:h.center,r.y=l?h.center:n?s:d.head,r.height=l?h.size:void 0,r.width=l?void 0:h.size},_getStacks:function(t){var e,n,i=this._getIndexScale(),a=i._getMatchingVisibleMetas(this._type),r=i.options.stacked,o=a.length,s=[];for(e=0;e<o&&(n=a[e],(!1===r||-1===s.indexOf(n.stack)||void 0===r&&void 0===n.stack)&&s.push(n.stack),n.index!==t);++e);return s},getStackCount:function(){return this._getStacks().length},getStackIndex:function(t,e){var n=this._getStacks(t),i=void 0!==e?n.indexOf(e):-1;return-1===i?n.length-1:i},getRuler:function(){var t,e,n=this._getIndexScale(),i=[];for(t=0,e=this.getMeta().data.length;t<e;++t)i.push(n.getPixelForValue(null,t,this.index));return{pixels:i,start:n._startPixel,end:n._endPixel,stackCount:this.getStackCount(),scale:n}},calculateBarValuePixels:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._getValueScale(),c=h.isHorizontal(),f=d.data.datasets,g=h._getMatchingVisibleMetas(this._type),p=h._parseValue(f[t].data[e]),m=n.minBarLength,v=h.options.stacked,b=this.getMeta().stack,x=void 0===p.start?0:p.max>=0&&p.min>=0?p.min:p.max,y=void 0===p.start?p.end:p.max>=0&&p.min>=0?p.max-p.min:p.min-p.max,_=g.length;if(v||void 0===v&&void 0!==b)for(i=0;i<_&&(a=g[i]).index!==t;++i)a.stack===b&&(r=void 0===(u=h._parseValue(f[a.index].data[e])).start?u.end:u.min>=0&&u.max>=0?u.max:u.min,(p.min<0&&r<0||p.max>=0&&r>0)&&(x+=r));return o=h.getPixelForValue(x),l=(s=h.getPixelForValue(x+y))-o,void 0!==m&&Math.abs(l)<m&&(l=m,s=y>=0&&!c||y<0&&c?o-m:o+m),{size:l,base:o,head:s,center:s+l/2}},calculateBarIndexPixels:function(t,e,n,i){var a="flex"===i.barThickness?function(t,e,n){var i,a=e.pixels,r=a[t],o=t>0?a[t-1]:null,s=t<a.length-1?a[t+1]:null,l=n.categoryPercentage;return null===o&&(o=r-(null===s?e.end-e.start:s-r)),null===s&&(s=r+r-o),i=r-(r-Math.min(o,s))/2*l,{chunk:Math.abs(s-o)/2*l/e.stackCount,ratio:n.barPercentage,start:i}}(e,n,i):At(e,n,i),r=this.getStackIndex(t,this.getMeta().stack),o=a.start+a.chunk*r+a.chunk/2,s=Math.min(Pt(i.maxBarThickness,1/0),a.chunk*a.ratio);return{base:o-s/2,head:o+s/2,center:o,size:s}},draw:function(){var t=this.chart,e=this._getValueScale(),n=this.getMeta().data,i=this.getDataset(),a=n.length,r=0;for(V.canvas.clipArea(t.ctx,t.chartArea);r<a;++r){var o=e._parseValue(i.data[r]);isNaN(o.min)||isNaN(o.max)||n[r].draw()}V.canvas.unclipArea(t.ctx)},_resolveDataElementOptions:function(){var t=this,e=V.extend({},nt.prototype._resolveDataElementOptions.apply(t,arguments)),n=t._getIndexScale().options,i=t._getValueScale().options;return e.barPercentage=Pt(n.barPercentage,e.barPercentage),e.barThickness=Pt(n.barThickness,e.barThickness),e.categoryPercentage=Pt(n.categoryPercentage,e.categoryPercentage),e.maxBarThickness=Pt(n.maxBarThickness,e.maxBarThickness),e.minBarLength=Pt(i.minBarLength,e.minBarLength),e}}),Tt=V.valueOrDefault,It=V.options.resolve;z._set("bubble",{hover:{mode:"single"},scales:{xAxes:[{type:"linear",position:"bottom",id:"x-axis-0"}],yAxes:[{type:"linear",position:"left",id:"y-axis-0"}]},tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.datasets[t.datasetIndex].label||"",i=e.datasets[t.datasetIndex].data[t.index];return n+": ("+t.xLabel+", "+t.yLabel+", "+i.r+")"}}}});var Ft=nt.extend({dataElementType:_t.Point,_dataElementOptions:["backgroundColor","borderColor","borderWidth","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth","hoverRadius","hitRadius","pointStyle","rotation"],update:function(t){var e=this,n=e.getMeta().data;V.each(n,(function(n,i){e.updateElement(n,i,t)}))},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=t.custom||{},o=i.getScaleForId(a.xAxisID),s=i.getScaleForId(a.yAxisID),l=i._resolveDataElementOptions(t,e),u=i.getDataset().data[e],d=i.index,h=n?o.getPixelForDecimal(.5):o.getPixelForValue("object"==typeof u?u:NaN,e,d),c=n?s.getBasePixel():s.getPixelForValue(u,e,d);t._xScale=o,t._yScale=s,t._options=l,t._datasetIndex=d,t._index=e,t._model={backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,hitRadius:l.hitRadius,pointStyle:l.pointStyle,rotation:l.rotation,radius:n?0:l.radius,skip:r.skip||isNaN(h)||isNaN(c),x:h,y:c},t.pivot()},setHoverStyle:function(t){var e=t._model,n=t._options,i=V.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Tt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Tt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Tt(n.hoverBorderWidth,n.borderWidth),e.radius=n.radius+n.hoverRadius},_resolveDataElementOptions:function(t,e){var n=this,i=n.chart,a=n.getDataset(),r=t.custom||{},o=a.data[e]||{},s=nt.prototype._resolveDataElementOptions.apply(n,arguments),l={chart:i,dataIndex:e,dataset:a,datasetIndex:n.index};return n._cachedDataOpts===s&&(s=V.extend({},s)),s.radius=It([r.radius,o.r,n._config.radius,i.options.elements.point.radius],l,e),s}}),Lt=V.valueOrDefault,Ot=Math.PI,Rt=2*Ot,zt=Ot/2;z._set("doughnut",{animation:{animateRotate:!0,animateScale:!1},hover:{mode:"single"},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r]&&(a.data[r].hidden=!a.data[r].hidden);o.update()}},cutoutPercentage:50,rotation:-zt,circumference:Rt,tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.labels[t.index],i=": "+e.datasets[t.datasetIndex].data[t.index];return V.isArray(n)?(n=n.slice())[0]+=i:n+=i,n}}}});var Nt=nt.extend({dataElementType:_t.Arc,linkScales:V.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],getRingIndex:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&++e;return e},update:function(t){var e,n,i,a,r=this,o=r.chart,s=o.chartArea,l=o.options,u=1,d=1,h=0,c=0,f=r.getMeta(),g=f.data,p=l.cutoutPercentage/100||0,m=l.circumference,v=r._getRingWeight(r.index);if(m<Rt){var b=l.rotation%Rt,x=(b+=b>=Ot?-Rt:b<-Ot?Rt:0)+m,y=Math.cos(b),_=Math.sin(b),k=Math.cos(x),w=Math.sin(x),M=b<=0&&x>=0||x>=Rt,S=b<=zt&&x>=zt||x>=Rt+zt,C=b<=-zt&&x>=-zt||x>=Ot+zt,P=b===-Ot||x>=Ot?-1:Math.min(y,y*p,k,k*p),A=C?-1:Math.min(_,_*p,w,w*p),D=M?1:Math.max(y,y*p,k,k*p),T=S?1:Math.max(_,_*p,w,w*p);u=(D-P)/2,d=(T-A)/2,h=-(D+P)/2,c=-(T+A)/2}for(i=0,a=g.length;i<a;++i)g[i]._options=r._resolveDataElementOptions(g[i],i);for(o.borderWidth=r.getMaxBorderWidth(),e=(s.right-s.left-o.borderWidth)/u,n=(s.bottom-s.top-o.borderWidth)/d,o.outerRadius=Math.max(Math.min(e,n)/2,0),o.innerRadius=Math.max(o.outerRadius*p,0),o.radiusLength=(o.outerRadius-o.innerRadius)/(r._getVisibleDatasetWeightTotal()||1),o.offsetX=h*o.outerRadius,o.offsetY=c*o.outerRadius,f.total=r.calculateTotal(),r.outerRadius=o.outerRadius-o.radiusLength*r._getRingWeightOffset(r.index),r.innerRadius=Math.max(r.outerRadius-o.radiusLength*v,0),i=0,a=g.length;i<a;++i)r.updateElement(g[i],i,t)},updateElement:function(t,e,n){var i=this,a=i.chart,r=a.chartArea,o=a.options,s=o.animation,l=(r.left+r.right)/2,u=(r.top+r.bottom)/2,d=o.rotation,h=o.rotation,c=i.getDataset(),f=n&&s.animateRotate?0:t.hidden?0:i.calculateCircumference(c.data[e])*(o.circumference/Rt),g=n&&s.animateScale?0:i.innerRadius,p=n&&s.animateScale?0:i.outerRadius,m=t._options||{};V.extend(t,{_datasetIndex:i.index,_index:e,_model:{backgroundColor:m.backgroundColor,borderColor:m.borderColor,borderWidth:m.borderWidth,borderAlign:m.borderAlign,x:l+a.offsetX,y:u+a.offsetY,startAngle:d,endAngle:h,circumference:f,outerRadius:p,innerRadius:g,label:V.valueAtIndexOrDefault(c.label,e,a.data.labels[e])}});var v=t._model;n&&s.animateRotate||(v.startAngle=0===e?o.rotation:i.getMeta().data[e-1]._model.endAngle,v.endAngle=v.startAngle+v.circumference),t.pivot()},calculateTotal:function(){var t,e=this.getDataset(),n=this.getMeta(),i=0;return V.each(n.data,(function(n,a){t=e.data[a],isNaN(t)||n.hidden||(i+=Math.abs(t))})),i},calculateCircumference:function(t){var e=this.getMeta().total;return e>0&&!isNaN(t)?Rt*(Math.abs(t)/e):0},getMaxBorderWidth:function(t){var e,n,i,a,r,o,s,l,u=0,d=this.chart;if(!t)for(e=0,n=d.data.datasets.length;e<n;++e)if(d.isDatasetVisible(e)){t=(i=d.getDatasetMeta(e)).data,e!==this.index&&(r=i.controller);break}if(!t)return 0;for(e=0,n=t.length;e<n;++e)a=t[e],r?(r._configure(),o=r._resolveDataElementOptions(a,e)):o=a._options,"inner"!==o.borderAlign&&(s=o.borderWidth,u=(l=o.hoverBorderWidth)>(u=s>u?s:u)?l:u);return u},setHoverStyle:function(t){var e=t._model,n=t._options,i=V.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=Lt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Lt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Lt(n.hoverBorderWidth,n.borderWidth)},_getRingWeightOffset:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&(e+=this._getRingWeight(n));return e},_getRingWeight:function(t){return Math.max(Lt(this.chart.data.datasets[t].weight,1),0)},_getVisibleDatasetWeightTotal:function(){return this._getRingWeightOffset(this.chart.data.datasets.length)}});z._set("horizontalBar",{hover:{mode:"index",axis:"y"},scales:{xAxes:[{type:"linear",position:"bottom"}],yAxes:[{type:"category",position:"left",offset:!0,gridLines:{offsetGridLines:!0}}]},elements:{rectangle:{borderSkipped:"left"}},tooltips:{mode:"index",axis:"y"}}),z._set("global",{datasets:{horizontalBar:{categoryPercentage:.8,barPercentage:.9}}});var Bt=Dt.extend({_getValueScaleId:function(){return this.getMeta().xAxisID},_getIndexScaleId:function(){return this.getMeta().yAxisID}}),Et=V.valueOrDefault,Wt=V.options.resolve,Vt=V.canvas._isPointInArea;function Ht(t,e){var n=t&&t.options.ticks||{},i=n.reverse,a=void 0===n.min?e:0,r=void 0===n.max?e:0;return{start:i?r:a,end:i?a:r}}function jt(t,e,n){var i=n/2,a=Ht(t,i),r=Ht(e,i);return{top:r.end,right:a.end,bottom:r.start,left:a.start}}function qt(t){var e,n,i,a;return V.isObject(t)?(e=t.top,n=t.right,i=t.bottom,a=t.left):e=n=i=a=t,{top:e,right:n,bottom:i,left:a}}z._set("line",{showLines:!0,spanGaps:!1,hover:{mode:"label"},scales:{xAxes:[{type:"category",id:"x-axis-0"}],yAxes:[{type:"linear",id:"y-axis-0"}]}});var Ut=nt.extend({datasetElementType:_t.Line,dataElementType:_t.Point,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth","cubicInterpolationMode","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.options,l=i._config,u=i._showLine=Et(l.showLine,s.showLines);for(i._xScale=i.getScaleForId(a.xAxisID),i._yScale=i.getScaleForId(a.yAxisID),u&&(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=i._yScale,r._datasetIndex=i.index,r._children=o,r._model=i._resolveDatasetElementOptions(r),r.pivot()),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(u&&0!==r._model.tension&&i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i,a,r=this,o=r.getMeta(),s=t.custom||{},l=r.getDataset(),u=r.index,d=l.data[e],h=r._xScale,c=r._yScale,f=o.dataset._model,g=r._resolveDataElementOptions(t,e);i=h.getPixelForValue("object"==typeof d?d:NaN,e,u),a=n?c.getBasePixel():r.calculatePointY(d,e,u),t._xScale=h,t._yScale=c,t._options=g,t._datasetIndex=u,t._index=e,t._model={x:i,y:a,skip:s.skip||isNaN(i)||isNaN(a),radius:g.radius,pointStyle:g.pointStyle,rotation:g.rotation,backgroundColor:g.backgroundColor,borderColor:g.borderColor,borderWidth:g.borderWidth,tension:Et(s.tension,f?f.tension:0),steppedLine:!!f&&f.steppedLine,hitRadius:g.hitRadius}},_resolveDatasetElementOptions:function(t){var e=this,n=e._config,i=t.custom||{},a=e.chart.options,r=a.elements.line,o=nt.prototype._resolveDatasetElementOptions.apply(e,arguments);return o.spanGaps=Et(n.spanGaps,a.spanGaps),o.tension=Et(n.lineTension,r.tension),o.steppedLine=Wt([i.steppedLine,n.steppedLine,r.stepped]),o.clip=qt(Et(n.clip,jt(e._xScale,e._yScale,o.borderWidth))),o},calculatePointY:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._yScale,c=0,f=0;if(h.options.stacked){for(s=+h.getRightValue(t),u=(l=d._getSortedVisibleDatasetMetas()).length,i=0;i<u&&(r=l[i]).index!==n;++i)a=d.data.datasets[r.index],"line"===r.type&&r.yAxisID===h.id&&((o=+h.getRightValue(a.data[e]))<0?f+=o||0:c+=o||0);return s<0?h.getPixelForValue(f+s):h.getPixelForValue(c+s)}return h.getPixelForValue(t)},updateBezierControlPoints:function(){var t,e,n,i,a=this.chart,r=this.getMeta(),o=r.dataset._model,s=a.chartArea,l=r.data||[];function u(t,e,n){return Math.max(Math.min(t,n),e)}if(o.spanGaps&&(l=l.filter((function(t){return!t._model.skip}))),"monotone"===o.cubicInterpolationMode)V.splineCurveMonotone(l);else for(t=0,e=l.length;t<e;++t)n=l[t]._model,i=V.splineCurve(V.previousItem(l,t)._model,n,V.nextItem(l,t)._model,o.tension),n.controlPointPreviousX=i.previous.x,n.controlPointPreviousY=i.previous.y,n.controlPointNextX=i.next.x,n.controlPointNextY=i.next.y;if(a.options.elements.line.capBezierPoints)for(t=0,e=l.length;t<e;++t)n=l[t]._model,Vt(n,s)&&(t>0&&Vt(l[t-1]._model,s)&&(n.controlPointPreviousX=u(n.controlPointPreviousX,s.left,s.right),n.controlPointPreviousY=u(n.controlPointPreviousY,s.top,s.bottom)),t<l.length-1&&Vt(l[t+1]._model,s)&&(n.controlPointNextX=u(n.controlPointNextX,s.left,s.right),n.controlPointNextY=u(n.controlPointNextY,s.top,s.bottom)))},draw:function(){var t,e=this.chart,n=this.getMeta(),i=n.data||[],a=e.chartArea,r=e.canvas,o=0,s=i.length;for(this._showLine&&(t=n.dataset._model.clip,V.canvas.clipArea(e.ctx,{left:!1===t.left?0:a.left-t.left,right:!1===t.right?r.width:a.right+t.right,top:!1===t.top?0:a.top-t.top,bottom:!1===t.bottom?r.height:a.bottom+t.bottom}),n.dataset.draw(),V.canvas.unclipArea(e.ctx));o<s;++o)i[o].draw(a)},setHoverStyle:function(t){var e=t._model,n=t._options,i=V.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Et(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Et(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Et(n.hoverBorderWidth,n.borderWidth),e.radius=Et(n.hoverRadius,n.radius)}}),Yt=V.options.resolve;z._set("polarArea",{scale:{type:"radialLinear",angleLines:{display:!1},gridLines:{circular:!0},pointLabels:{display:!1},ticks:{beginAtZero:!0}},animation:{animateRotate:!0,animateScale:!0},startAngle:-.5*Math.PI,legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r].hidden=!a.data[r].hidden;o.update()}},tooltips:{callbacks:{title:function(){return""},label:function(t,e){return e.labels[t.index]+": "+t.yLabel}}}});var Gt=nt.extend({dataElementType:_t.Arc,linkScales:V.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i,a=this,r=a.getDataset(),o=a.getMeta(),s=a.chart.options.startAngle||0,l=a._starts=[],u=a._angles=[],d=o.data;for(a._updateRadius(),o.count=a.countVisibleElements(),e=0,n=r.data.length;e<n;e++)l[e]=s,i=a._computeAngle(e),u[e]=i,s+=i;for(e=0,n=d.length;e<n;++e)d[e]._options=a._resolveDataElementOptions(d[e],e),a.updateElement(d[e],e,t)},_updateRadius:function(){var t=this,e=t.chart,n=e.chartArea,i=e.options,a=Math.min(n.right-n.left,n.bottom-n.top);e.outerRadius=Math.max(a/2,0),e.innerRadius=Math.max(i.cutoutPercentage?e.outerRadius/100*i.cutoutPercentage:1,0),e.radiusLength=(e.outerRadius-e.innerRadius)/e.getVisibleDatasetCount(),t.outerRadius=e.outerRadius-e.radiusLength*t.index,t.innerRadius=t.outerRadius-e.radiusLength},updateElement:function(t,e,n){var i=this,a=i.chart,r=i.getDataset(),o=a.options,s=o.animation,l=a.scale,u=a.data.labels,d=l.xCenter,h=l.yCenter,c=o.startAngle,f=t.hidden?0:l.getDistanceFromCenterForValue(r.data[e]),g=i._starts[e],p=g+(t.hidden?0:i._angles[e]),m=s.animateScale?0:l.getDistanceFromCenterForValue(r.data[e]),v=t._options||{};V.extend(t,{_datasetIndex:i.index,_index:e,_scale:l,_model:{backgroundColor:v.backgroundColor,borderColor:v.borderColor,borderWidth:v.borderWidth,borderAlign:v.borderAlign,x:d,y:h,innerRadius:0,outerRadius:n?m:f,startAngle:n&&s.animateRotate?c:g,endAngle:n&&s.animateRotate?c:p,label:V.valueAtIndexOrDefault(u,e,u[e])}}),t.pivot()},countVisibleElements:function(){var t=this.getDataset(),e=this.getMeta(),n=0;return V.each(e.data,(function(e,i){isNaN(t.data[i])||e.hidden||n++})),n},setHoverStyle:function(t){var e=t._model,n=t._options,i=V.getHoverColor,a=V.valueOrDefault;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=a(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=a(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=a(n.hoverBorderWidth,n.borderWidth)},_computeAngle:function(t){var e=this,n=this.getMeta().count,i=e.getDataset(),a=e.getMeta();if(isNaN(i.data[t])||a.data[t].hidden)return 0;var r={chart:e.chart,dataIndex:t,dataset:i,datasetIndex:e.index};return Yt([e.chart.options.elements.arc.angle,2*Math.PI/n],r,t)}});z._set("pie",V.clone(z.doughnut)),z._set("pie",{cutoutPercentage:0});var Xt=Nt,Kt=V.valueOrDefault;z._set("radar",{spanGaps:!1,scale:{type:"radialLinear"},elements:{line:{fill:"start",tension:0}}});var Zt=nt.extend({datasetElementType:_t.Line,dataElementType:_t.Point,linkScales:V.noop,_datasetElementOptions:["backgroundColor","borderWidth","borderColor","borderCapStyle","borderDash","borderDashOffset","borderJoinStyle","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.scale,l=i._config;for(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=s,r._datasetIndex=i.index,r._children=o,r._loop=!0,r._model=i._resolveDatasetElementOptions(r),r.pivot(),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i=this,a=t.custom||{},r=i.getDataset(),o=i.chart.scale,s=o.getPointPositionForValue(e,r.data[e]),l=i._resolveDataElementOptions(t,e),u=i.getMeta().dataset._model,d=n?o.xCenter:s.x,h=n?o.yCenter:s.y;t._scale=o,t._options=l,t._datasetIndex=i.index,t._index=e,t._model={x:d,y:h,skip:a.skip||isNaN(d)||isNaN(h),radius:l.radius,pointStyle:l.pointStyle,rotation:l.rotation,backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,tension:Kt(a.tension,u?u.tension:0),hitRadius:l.hitRadius}},_resolveDatasetElementOptions:function(){var t=this,e=t._config,n=t.chart.options,i=nt.prototype._resolveDatasetElementOptions.apply(t,arguments);return i.spanGaps=Kt(e.spanGaps,n.spanGaps),i.tension=Kt(e.lineTension,n.elements.line.tension),i},updateBezierControlPoints:function(){var t,e,n,i,a=this.getMeta(),r=this.chart.chartArea,o=a.data||[];function s(t,e,n){return Math.max(Math.min(t,n),e)}for(a.dataset._model.spanGaps&&(o=o.filter((function(t){return!t._model.skip}))),t=0,e=o.length;t<e;++t)n=o[t]._model,i=V.splineCurve(V.previousItem(o,t,!0)._model,n,V.nextItem(o,t,!0)._model,n.tension),n.controlPointPreviousX=s(i.previous.x,r.left,r.right),n.controlPointPreviousY=s(i.previous.y,r.top,r.bottom),n.controlPointNextX=s(i.next.x,r.left,r.right),n.controlPointNextY=s(i.next.y,r.top,r.bottom)},setHoverStyle:function(t){var e=t._model,n=t._options,i=V.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Kt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Kt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Kt(n.hoverBorderWidth,n.borderWidth),e.radius=Kt(n.hoverRadius,n.radius)}});z._set("scatter",{hover:{mode:"single"},scales:{xAxes:[{id:"x-axis-1",type:"linear",position:"bottom"}],yAxes:[{id:"y-axis-1",type:"linear",position:"left"}]},tooltips:{callbacks:{title:function(){return""},label:function(t){return"("+t.xLabel+", "+t.yLabel+")"}}}}),z._set("global",{datasets:{scatter:{showLine:!1}}});var $t={bar:Dt,bubble:Ft,doughnut:Nt,horizontalBar:Bt,line:Ut,polarArea:Gt,pie:Xt,radar:Zt,scatter:Ut};function Jt(t,e){return t.native?{x:t.x,y:t.y}:V.getRelativePosition(t,e)}function Qt(t,e){var n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas();for(i=0,r=l.length;i<r;++i)for(a=0,o=(n=l[i].data).length;a<o;++a)(s=n[a])._view.skip||e(s)}function te(t,e){var n=[];return Qt(t,(function(t){t.inRange(e.x,e.y)&&n.push(t)})),n}function ee(t,e,n,i){var a=Number.POSITIVE_INFINITY,r=[];return Qt(t,(function(t){if(!n||t.inRange(e.x,e.y)){var o=t.getCenterPoint(),s=i(e,o);s<a?(r=[t],a=s):s===a&&r.push(t)}})),r}function ne(t){var e=-1!==t.indexOf("x"),n=-1!==t.indexOf("y");return function(t,i){var a=e?Math.abs(t.x-i.x):0,r=n?Math.abs(t.y-i.y):0;return Math.sqrt(Math.pow(a,2)+Math.pow(r,2))}}function ie(t,e,n){var i=Jt(e,t);n.axis=n.axis||"x";var a=ne(n.axis),r=n.intersect?te(t,i):ee(t,i,!1,a),o=[];return r.length?(t._getSortedVisibleDatasetMetas().forEach((function(t){var e=t.data[r[0]._index];e&&!e._view.skip&&o.push(e)})),o):[]}var ae={modes:{single:function(t,e){var n=Jt(e,t),i=[];return Qt(t,(function(t){if(t.inRange(n.x,n.y))return i.push(t),i})),i.slice(0,1)},label:ie,index:ie,dataset:function(t,e,n){var i=Jt(e,t);n.axis=n.axis||"xy";var a=ne(n.axis),r=n.intersect?te(t,i):ee(t,i,!1,a);return r.length>0&&(r=t.getDatasetMeta(r[0]._datasetIndex).data),r},"x-axis":function(t,e){return ie(t,e,{intersect:!1})},point:function(t,e){return te(t,Jt(e,t))},nearest:function(t,e,n){var i=Jt(e,t);n.axis=n.axis||"xy";var a=ne(n.axis);return ee(t,i,n.intersect,a)},x:function(t,e,n){var i=Jt(e,t),a=[],r=!1;return Qt(t,(function(t){t.inXRange(i.x)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a},y:function(t,e,n){var i=Jt(e,t),a=[],r=!1;return Qt(t,(function(t){t.inYRange(i.y)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a}}},re=V.extend;function oe(t,e){return V.where(t,(function(t){return t.pos===e}))}function se(t,e){return t.sort((function(t,n){var i=e?n:t,a=e?t:n;return i.weight===a.weight?i.index-a.index:i.weight-a.weight}))}function le(t,e,n,i){return Math.max(t[n],e[n])+Math.max(t[i],e[i])}function ue(t,e,n){var i,a,r=n.box,o=t.maxPadding;if(n.size&&(t[n.pos]-=n.size),n.size=n.horizontal?r.height:r.width,t[n.pos]+=n.size,r.getPadding){var s=r.getPadding();o.top=Math.max(o.top,s.top),o.left=Math.max(o.left,s.left),o.bottom=Math.max(o.bottom,s.bottom),o.right=Math.max(o.right,s.right)}if(i=e.outerWidth-le(o,t,"left","right"),a=e.outerHeight-le(o,t,"top","bottom"),i!==t.w||a!==t.h)return t.w=i,t.h=a,n.horizontal?i!==t.w:a!==t.h}function de(t,e){var n=e.maxPadding;function i(t){var i={left:0,top:0,right:0,bottom:0};return t.forEach((function(t){i[t]=Math.max(e[t],n[t])})),i}return i(t?["left","right"]:["top","bottom"])}function he(t,e,n){var i,a,r,o,s,l,u=[];for(i=0,a=t.length;i<a;++i)(o=(r=t[i]).box).update(r.width||e.w,r.height||e.h,de(r.horizontal,e)),ue(e,n,r)&&(l=!0,u.length&&(s=!0)),o.fullWidth||u.push(r);return s&&he(u,e,n)||l}function ce(t,e,n){var i,a,r,o,s=n.padding,l=e.x,u=e.y;for(i=0,a=t.length;i<a;++i)o=(r=t[i]).box,r.horizontal?(o.left=o.fullWidth?s.left:e.left,o.right=o.fullWidth?n.outerWidth-s.right:e.left+e.w,o.top=u,o.bottom=u+o.height,o.width=o.right-o.left,u=o.bottom):(o.left=l,o.right=l+o.width,o.top=e.top,o.bottom=e.top+e.h,o.height=o.bottom-o.top,l=o.right);e.x=l,e.y=u}z._set("global",{layout:{padding:{top:0,right:0,bottom:0,left:0}}});var fe,ge={defaults:{},addBox:function(t,e){t.boxes||(t.boxes=[]),e.fullWidth=e.fullWidth||!1,e.position=e.position||"top",e.weight=e.weight||0,e._layers=e._layers||function(){return[{z:0,draw:function(){e.draw.apply(e,arguments)}}]},t.boxes.push(e)},removeBox:function(t,e){var n=t.boxes?t.boxes.indexOf(e):-1;-1!==n&&t.boxes.splice(n,1)},configure:function(t,e,n){for(var i,a=["fullWidth","position","weight"],r=a.length,o=0;o<r;++o)i=a[o],n.hasOwnProperty(i)&&(e[i]=n[i])},update:function(t,e,n){if(t){var i=t.options.layout||{},a=V.options.toPadding(i.padding),r=e-a.width,o=n-a.height,s=function(t){var e=function(t){var e,n,i,a=[];for(e=0,n=(t||[]).length;e<n;++e)i=t[e],a.push({index:e,box:i,pos:i.position,horizontal:i.isHorizontal(),weight:i.weight});return a}(t),n=se(oe(e,"left"),!0),i=se(oe(e,"right")),a=se(oe(e,"top"),!0),r=se(oe(e,"bottom"));return{leftAndTop:n.concat(a),rightAndBottom:i.concat(r),chartArea:oe(e,"chartArea"),vertical:n.concat(i),horizontal:a.concat(r)}}(t.boxes),l=s.vertical,u=s.horizontal,d=Object.freeze({outerWidth:e,outerHeight:n,padding:a,availableWidth:r,vBoxMaxWidth:r/2/l.length,hBoxMaxHeight:o/2}),h=re({maxPadding:re({},a),w:r,h:o,x:a.left,y:a.top},a);!function(t,e){var n,i,a;for(n=0,i=t.length;n<i;++n)(a=t[n]).width=a.horizontal?a.box.fullWidth&&e.availableWidth:e.vBoxMaxWidth,a.height=a.horizontal&&e.hBoxMaxHeight}(l.concat(u),d),he(l,h,d),he(u,h,d)&&he(l,h,d),function(t){var e=t.maxPadding;function n(n){var i=Math.max(e[n]-t[n],0);return t[n]+=i,i}t.y+=n("top"),t.x+=n("left"),n("right"),n("bottom")}(h),ce(s.leftAndTop,h,d),h.x+=h.w,h.y+=h.h,ce(s.rightAndBottom,h,d),t.chartArea={left:h.left,top:h.top,right:h.left+h.w,bottom:h.top+h.h},V.each(s.chartArea,(function(e){var n=e.box;re(n,t.chartArea),n.update(h.w,h.h)}))}}},pe=(fe=Object.freeze({__proto__:null,default:"@keyframes chartjs-render-animation{from{opacity:.99}to{opacity:1}}.chartjs-render-monitor{animation:chartjs-render-animation 1ms}.chartjs-size-monitor,.chartjs-size-monitor-expand,.chartjs-size-monitor-shrink{position:absolute;direction:ltr;left:0;top:0;right:0;bottom:0;overflow:hidden;pointer-events:none;visibility:hidden;z-index:-1}.chartjs-size-monitor-expand>div{position:absolute;width:1000000px;height:1000000px;left:0;top:0}.chartjs-size-monitor-shrink>div{position:absolute;width:200%;height:200%;left:0;top:0}"}))&&fe.default||fe,me="$chartjs",ve="chartjs-size-monitor",be="chartjs-render-monitor",xe="chartjs-render-animation",ye=["animationstart","webkitAnimationStart"],_e={touchstart:"mousedown",touchmove:"mousemove",touchend:"mouseup",pointerenter:"mouseenter",pointerdown:"mousedown",pointermove:"mousemove",pointerup:"mouseup",pointerleave:"mouseout",pointerout:"mouseout"};function ke(t,e){var n=V.getStyle(t,e),i=n&&n.match(/^(\d+)(\.\d+)?px$/);return i?Number(i[1]):void 0}var we=!!function(){var t=!1;try{var e=Object.defineProperty({},"passive",{get:function(){t=!0}});window.addEventListener("e",null,e)}catch(t){}return t}()&&{passive:!0};function Me(t,e,n){t.addEventListener(e,n,we)}function Se(t,e,n){t.removeEventListener(e,n,we)}function Ce(t,e,n,i,a){return{type:t,chart:e,native:a||null,x:void 0!==n?n:null,y:void 0!==i?i:null}}function Pe(t){var e=document.createElement("div");return e.className=t||"",e}function Ae(t,e,n){var i,a,r,o,s=t[me]||(t[me]={}),l=s.resizer=function(t){var e=Pe(ve),n=Pe(ve+"-expand"),i=Pe(ve+"-shrink");n.appendChild(Pe()),i.appendChild(Pe()),e.appendChild(n),e.appendChild(i),e._reset=function(){n.scrollLeft=1e6,n.scrollTop=1e6,i.scrollLeft=1e6,i.scrollTop=1e6};var a=function(){e._reset(),t()};return Me(n,"scroll",a.bind(n,"expand")),Me(i,"scroll",a.bind(i,"shrink")),e}((i=function(){if(s.resizer){var i=n.options.maintainAspectRatio&&t.parentNode,a=i?i.clientWidth:0;e(Ce("resize",n)),i&&i.clientWidth<a&&n.canvas&&e(Ce("resize",n))}},r=!1,o=[],function(){o=Array.prototype.slice.call(arguments),a=a||this,r||(r=!0,V.requestAnimFrame.call(window,(function(){r=!1,i.apply(a,o)})))}));!function(t,e){var n=t[me]||(t[me]={}),i=n.renderProxy=function(t){t.animationName===xe&&e()};V.each(ye,(function(e){Me(t,e,i)})),n.reflow=!!t.offsetParent,t.classList.add(be)}(t,(function(){if(s.resizer){var e=t.parentNode;e&&e!==l.parentNode&&e.insertBefore(l,e.firstChild),l._reset()}}))}function De(t){var e=t[me]||{},n=e.resizer;delete e.resizer,function(t){var e=t[me]||{},n=e.renderProxy;n&&(V.each(ye,(function(e){Se(t,e,n)})),delete e.renderProxy),t.classList.remove(be)}(t),n&&n.parentNode&&n.parentNode.removeChild(n)}var Te={disableCSSInjection:!1,_enabled:"undefined"!=typeof window&&"undefined"!=typeof document,_ensureLoaded:function(t){if(!this.disableCSSInjection){var e=t.getRootNode?t.getRootNode():document;!function(t,e){var n=t[me]||(t[me]={});if(!n.containsStyles){n.containsStyles=!0,e="/* Chart.js */\n"+e;var i=document.createElement("style");i.setAttribute("type","text/css"),i.appendChild(document.createTextNode(e)),t.appendChild(i)}}(e.host?e:document.head,pe)}},acquireContext:function(t,e){"string"==typeof t?t=document.getElementById(t):t.length&&(t=t[0]),t&&t.canvas&&(t=t.canvas);var n=t&&t.getContext&&t.getContext("2d");return n&&n.canvas===t?(this._ensureLoaded(t),function(t,e){var n=t.style,i=t.getAttribute("height"),a=t.getAttribute("width");if(t[me]={initial:{height:i,width:a,style:{display:n.display,height:n.height,width:n.width}}},n.display=n.display||"block",null===a||""===a){var r=ke(t,"width");void 0!==r&&(t.width=r)}if(null===i||""===i)if(""===t.style.height)t.height=t.width/(e.options.aspectRatio||2);else{var o=ke(t,"height");void 0!==r&&(t.height=o)}}(t,e),n):null},releaseContext:function(t){var e=t.canvas;if(e[me]){var n=e[me].initial;["height","width"].forEach((function(t){var i=n[t];V.isNullOrUndef(i)?e.removeAttribute(t):e.setAttribute(t,i)})),V.each(n.style||{},(function(t,n){e.style[n]=t})),e.width=e.width,delete e[me]}},addEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=n[me]||(n[me]={});Me(i,e,(a.proxies||(a.proxies={}))[t.id+"_"+e]=function(e){n(function(t,e){var n=_e[t.type]||t.type,i=V.getRelativePosition(t,e);return Ce(n,e,i.x,i.y,t)}(e,t))})}else Ae(i,n,t)},removeEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=((n[me]||{}).proxies||{})[t.id+"_"+e];a&&Se(i,e,a)}else De(i)}};V.addEvent=Me,V.removeEvent=Se;var Ie=Te._enabled?Te:{acquireContext:function(t){return t&&t.canvas&&(t=t.canvas),t&&t.getContext("2d")||null}},Fe=V.extend({initialize:function(){},acquireContext:function(){},releaseContext:function(){},addEventListener:function(){},removeEventListener:function(){}},Ie);z._set("global",{plugins:{}});var Le={_plugins:[],_cacheId:0,register:function(t){var e=this._plugins;[].concat(t).forEach((function(t){-1===e.indexOf(t)&&e.push(t)})),this._cacheId++},unregister:function(t){var e=this._plugins;[].concat(t).forEach((function(t){var n=e.indexOf(t);-1!==n&&e.splice(n,1)})),this._cacheId++},clear:function(){this._plugins=[],this._cacheId++},count:function(){return this._plugins.length},getAll:function(){return this._plugins},notify:function(t,e,n){var i,a,r,o,s,l=this.descriptors(t),u=l.length;for(i=0;i<u;++i)if("function"==typeof(s=(r=(a=l[i]).plugin)[e])&&((o=[t].concat(n||[])).push(a.options),!1===s.apply(r,o)))return!1;return!0},descriptors:function(t){var e=t.$plugins||(t.$plugins={});if(e.id===this._cacheId)return e.descriptors;var n=[],i=[],a=t&&t.config||{},r=a.options&&a.options.plugins||{};return this._plugins.concat(a.plugins||[]).forEach((function(t){if(-1===n.indexOf(t)){var e=t.id,a=r[e];!1!==a&&(!0===a&&(a=V.clone(z.global.plugins[e])),n.push(t),i.push({plugin:t,options:a||{}}))}})),e.descriptors=i,e.id=this._cacheId,i},_invalidate:function(t){delete t.$plugins}},Oe={constructors:{},defaults:{},registerScaleType:function(t,e,n){this.constructors[t]=e,this.defaults[t]=V.clone(n)},getScaleConstructor:function(t){return this.constructors.hasOwnProperty(t)?this.constructors[t]:void 0},getScaleDefaults:function(t){return this.defaults.hasOwnProperty(t)?V.merge({},[z.scale,this.defaults[t]]):{}},updateScaleDefaults:function(t,e){this.defaults.hasOwnProperty(t)&&(this.defaults[t]=V.extend(this.defaults[t],e))},addScalesToLayout:function(t){V.each(t.scales,(function(e){e.fullWidth=e.options.fullWidth,e.position=e.options.position,e.weight=e.options.weight,ge.addBox(t,e)}))}},Re=V.valueOrDefault,ze=V.rtl.getRtlAdapter;z._set("global",{tooltips:{enabled:!0,custom:null,mode:"nearest",position:"average",intersect:!0,backgroundColor:"rgba(0,0,0,0.8)",titleFontStyle:"bold",titleSpacing:2,titleMarginBottom:6,titleFontColor:"#fff",titleAlign:"left",bodySpacing:2,bodyFontColor:"#fff",bodyAlign:"left",footerFontStyle:"bold",footerSpacing:2,footerMarginTop:6,footerFontColor:"#fff",footerAlign:"left",yPadding:6,xPadding:6,caretPadding:2,caretSize:5,cornerRadius:6,multiKeyBackground:"#fff",displayColors:!0,borderColor:"rgba(0,0,0,0)",borderWidth:0,callbacks:{beforeTitle:V.noop,title:function(t,e){var n="",i=e.labels,a=i?i.length:0;if(t.length>0){var r=t[0];r.label?n=r.label:r.xLabel?n=r.xLabel:a>0&&r.index<a&&(n=i[r.index])}return n},afterTitle:V.noop,beforeBody:V.noop,beforeLabel:V.noop,label:function(t,e){var n=e.datasets[t.datasetIndex].label||"";return n&&(n+=": "),V.isNullOrUndef(t.value)?n+=t.yLabel:n+=t.value,n},labelColor:function(t,e){var n=e.getDatasetMeta(t.datasetIndex).data[t.index]._view;return{borderColor:n.borderColor,backgroundColor:n.backgroundColor}},labelTextColor:function(){return this._options.bodyFontColor},afterLabel:V.noop,afterBody:V.noop,beforeFooter:V.noop,footer:V.noop,afterFooter:V.noop}}});var Ne={average:function(t){if(!t.length)return!1;var e,n,i=0,a=0,r=0;for(e=0,n=t.length;e<n;++e){var o=t[e];if(o&&o.hasValue()){var s=o.tooltipPosition();i+=s.x,a+=s.y,++r}}return{x:i/r,y:a/r}},nearest:function(t,e){var n,i,a,r=e.x,o=e.y,s=Number.POSITIVE_INFINITY;for(n=0,i=t.length;n<i;++n){var l=t[n];if(l&&l.hasValue()){var u=l.getCenterPoint(),d=V.distanceBetweenPoints(e,u);d<s&&(s=d,a=l)}}if(a){var h=a.tooltipPosition();r=h.x,o=h.y}return{x:r,y:o}}};function Be(t,e){return e&&(V.isArray(e)?Array.prototype.push.apply(t,e):t.push(e)),t}function Ee(t){return("string"==typeof t||t instanceof String)&&t.indexOf("\n")>-1?t.split("\n"):t}function We(t){var e=z.global;return{xPadding:t.xPadding,yPadding:t.yPadding,xAlign:t.xAlign,yAlign:t.yAlign,rtl:t.rtl,textDirection:t.textDirection,bodyFontColor:t.bodyFontColor,_bodyFontFamily:Re(t.bodyFontFamily,e.defaultFontFamily),_bodyFontStyle:Re(t.bodyFontStyle,e.defaultFontStyle),_bodyAlign:t.bodyAlign,bodyFontSize:Re(t.bodyFontSize,e.defaultFontSize),bodySpacing:t.bodySpacing,titleFontColor:t.titleFontColor,_titleFontFamily:Re(t.titleFontFamily,e.defaultFontFamily),_titleFontStyle:Re(t.titleFontStyle,e.defaultFontStyle),titleFontSize:Re(t.titleFontSize,e.defaultFontSize),_titleAlign:t.titleAlign,titleSpacing:t.titleSpacing,titleMarginBottom:t.titleMarginBottom,footerFontColor:t.footerFontColor,_footerFontFamily:Re(t.footerFontFamily,e.defaultFontFamily),_footerFontStyle:Re(t.footerFontStyle,e.defaultFontStyle),footerFontSize:Re(t.footerFontSize,e.defaultFontSize),_footerAlign:t.footerAlign,footerSpacing:t.footerSpacing,footerMarginTop:t.footerMarginTop,caretSize:t.caretSize,cornerRadius:t.cornerRadius,backgroundColor:t.backgroundColor,opacity:0,legendColorBackground:t.multiKeyBackground,displayColors:t.displayColors,borderColor:t.borderColor,borderWidth:t.borderWidth}}function Ve(t,e){return"center"===e?t.x+t.width/2:"right"===e?t.x+t.width-t.xPadding:t.x+t.xPadding}function He(t){return Be([],Ee(t))}var je=X.extend({initialize:function(){this._model=We(this._options),this._lastActive=[]},getTitle:function(){var t=this,e=t._options,n=e.callbacks,i=n.beforeTitle.apply(t,arguments),a=n.title.apply(t,arguments),r=n.afterTitle.apply(t,arguments),o=[];return o=Be(o,Ee(i)),o=Be(o,Ee(a)),o=Be(o,Ee(r))},getBeforeBody:function(){return He(this._options.callbacks.beforeBody.apply(this,arguments))},getBody:function(t,e){var n=this,i=n._options.callbacks,a=[];return V.each(t,(function(t){var r={before:[],lines:[],after:[]};Be(r.before,Ee(i.beforeLabel.call(n,t,e))),Be(r.lines,i.label.call(n,t,e)),Be(r.after,Ee(i.afterLabel.call(n,t,e))),a.push(r)})),a},getAfterBody:function(){return He(this._options.callbacks.afterBody.apply(this,arguments))},getFooter:function(){var t=this,e=t._options.callbacks,n=e.beforeFooter.apply(t,arguments),i=e.footer.apply(t,arguments),a=e.afterFooter.apply(t,arguments),r=[];return r=Be(r,Ee(n)),r=Be(r,Ee(i)),r=Be(r,Ee(a))},update:function(t){var e,n,i,a,r,o,s,l,u,d,h=this,c=h._options,f=h._model,g=h._model=We(c),p=h._active,m=h._data,v={xAlign:f.xAlign,yAlign:f.yAlign},b={x:f.x,y:f.y},x={width:f.width,height:f.height},y={x:f.caretX,y:f.caretY};if(p.length){g.opacity=1;var _=[],k=[];y=Ne[c.position].call(h,p,h._eventPosition);var w=[];for(e=0,n=p.length;e<n;++e)w.push((i=p[e],a=void 0,r=void 0,o=void 0,s=void 0,l=void 0,u=void 0,d=void 0,a=i._xScale,r=i._yScale||i._scale,o=i._index,s=i._datasetIndex,l=i._chart.getDatasetMeta(s).controller,u=l._getIndexScale(),d=l._getValueScale(),{xLabel:a?a.getLabelForIndex(o,s):"",yLabel:r?r.getLabelForIndex(o,s):"",label:u?""+u.getLabelForIndex(o,s):"",value:d?""+d.getLabelForIndex(o,s):"",index:o,datasetIndex:s,x:i._model.x,y:i._model.y}));c.filter&&(w=w.filter((function(t){return c.filter(t,m)}))),c.itemSort&&(w=w.sort((function(t,e){return c.itemSort(t,e,m)}))),V.each(w,(function(t){_.push(c.callbacks.labelColor.call(h,t,h._chart)),k.push(c.callbacks.labelTextColor.call(h,t,h._chart))})),g.title=h.getTitle(w,m),g.beforeBody=h.getBeforeBody(w,m),g.body=h.getBody(w,m),g.afterBody=h.getAfterBody(w,m),g.footer=h.getFooter(w,m),g.x=y.x,g.y=y.y,g.caretPadding=c.caretPadding,g.labelColors=_,g.labelTextColors=k,g.dataPoints=w,x=function(t,e){var n=t._chart.ctx,i=2*e.yPadding,a=0,r=e.body,o=r.reduce((function(t,e){return t+e.before.length+e.lines.length+e.after.length}),0);o+=e.beforeBody.length+e.afterBody.length;var s=e.title.length,l=e.footer.length,u=e.titleFontSize,d=e.bodyFontSize,h=e.footerFontSize;i+=s*u,i+=s?(s-1)*e.titleSpacing:0,i+=s?e.titleMarginBottom:0,i+=o*d,i+=o?(o-1)*e.bodySpacing:0,i+=l?e.footerMarginTop:0,i+=l*h,i+=l?(l-1)*e.footerSpacing:0;var c=0,f=function(t){a=Math.max(a,n.measureText(t).width+c)};return n.font=V.fontString(u,e._titleFontStyle,e._titleFontFamily),V.each(e.title,f),n.font=V.fontString(d,e._bodyFontStyle,e._bodyFontFamily),V.each(e.beforeBody.concat(e.afterBody),f),c=e.displayColors?d+2:0,V.each(r,(function(t){V.each(t.before,f),V.each(t.lines,f),V.each(t.after,f)})),c=0,n.font=V.fontString(h,e._footerFontStyle,e._footerFontFamily),V.each(e.footer,f),{width:a+=2*e.xPadding,height:i}}(this,g),b=function(t,e,n,i){var a=t.x,r=t.y,o=t.caretSize,s=t.caretPadding,l=t.cornerRadius,u=n.xAlign,d=n.yAlign,h=o+s,c=l+s;return"right"===u?a-=e.width:"center"===u&&((a-=e.width/2)+e.width>i.width&&(a=i.width-e.width),a<0&&(a=0)),"top"===d?r+=h:r-="bottom"===d?e.height+h:e.height/2,"center"===d?"left"===u?a+=h:"right"===u&&(a-=h):"left"===u?a-=c:"right"===u&&(a+=c),{x:a,y:r}}(g,x,v=function(t,e){var n,i,a,r,o,s=t._model,l=t._chart,u=t._chart.chartArea,d="center",h="center";s.y<e.height?h="top":s.y>l.height-e.height&&(h="bottom");var c=(u.left+u.right)/2,f=(u.top+u.bottom)/2;"center"===h?(n=function(t){return t<=c},i=function(t){return t>c}):(n=function(t){return t<=e.width/2},i=function(t){return t>=l.width-e.width/2}),a=function(t){return t+e.width+s.caretSize+s.caretPadding>l.width},r=function(t){return t-e.width-s.caretSize-s.caretPadding<0},o=function(t){return t<=f?"top":"bottom"},n(s.x)?(d="left",a(s.x)&&(d="center",h=o(s.y))):i(s.x)&&(d="right",r(s.x)&&(d="center",h=o(s.y)));var g=t._options;return{xAlign:g.xAlign?g.xAlign:d,yAlign:g.yAlign?g.yAlign:h}}(this,x),h._chart)}else g.opacity=0;return g.xAlign=v.xAlign,g.yAlign=v.yAlign,g.x=b.x,g.y=b.y,g.width=x.width,g.height=x.height,g.caretX=y.x,g.caretY=y.y,h._model=g,t&&c.custom&&c.custom.call(h,g),h},drawCaret:function(t,e){var n=this._chart.ctx,i=this._view,a=this.getCaretPosition(t,e,i);n.lineTo(a.x1,a.y1),n.lineTo(a.x2,a.y2),n.lineTo(a.x3,a.y3)},getCaretPosition:function(t,e,n){var i,a,r,o,s,l,u=n.caretSize,d=n.cornerRadius,h=n.xAlign,c=n.yAlign,f=t.x,g=t.y,p=e.width,m=e.height;if("center"===c)s=g+m/2,"left"===h?(a=(i=f)-u,r=i,o=s+u,l=s-u):(a=(i=f+p)+u,r=i,o=s-u,l=s+u);else if("left"===h?(i=(a=f+d+u)-u,r=a+u):"right"===h?(i=(a=f+p-d-u)-u,r=a+u):(i=(a=n.caretX)-u,r=a+u),"top"===c)s=(o=g)-u,l=o;else{s=(o=g+m)+u,l=o;var v=r;r=i,i=v}return{x1:i,x2:a,x3:r,y1:o,y2:s,y3:l}},drawTitle:function(t,e,n){var i,a,r,o=e.title,s=o.length;if(s){var l=ze(e.rtl,e.x,e.width);for(t.x=Ve(e,e._titleAlign),n.textAlign=l.textAlign(e._titleAlign),n.textBaseline="middle",i=e.titleFontSize,a=e.titleSpacing,n.fillStyle=e.titleFontColor,n.font=V.fontString(i,e._titleFontStyle,e._titleFontFamily),r=0;r<s;++r)n.fillText(o[r],l.x(t.x),t.y+i/2),t.y+=i+a,r+1===s&&(t.y+=e.titleMarginBottom-a)}},drawBody:function(t,e,n){var i,a,r,o,s,l,u,d,h=e.bodyFontSize,c=e.bodySpacing,f=e._bodyAlign,g=e.body,p=e.displayColors,m=0,v=p?Ve(e,"left"):0,b=ze(e.rtl,e.x,e.width),x=function(e){n.fillText(e,b.x(t.x+m),t.y+h/2),t.y+=h+c},y=b.textAlign(f);for(n.textAlign=f,n.textBaseline="middle",n.font=V.fontString(h,e._bodyFontStyle,e._bodyFontFamily),t.x=Ve(e,y),n.fillStyle=e.bodyFontColor,V.each(e.beforeBody,x),m=p&&"right"!==y?"center"===f?h/2+1:h+2:0,s=0,u=g.length;s<u;++s){for(i=g[s],a=e.labelTextColors[s],r=e.labelColors[s],n.fillStyle=a,V.each(i.before,x),l=0,d=(o=i.lines).length;l<d;++l){if(p){var _=b.x(v);n.fillStyle=e.legendColorBackground,n.fillRect(b.leftForLtr(_,h),t.y,h,h),n.lineWidth=1,n.strokeStyle=r.borderColor,n.strokeRect(b.leftForLtr(_,h),t.y,h,h),n.fillStyle=r.backgroundColor,n.fillRect(b.leftForLtr(b.xPlus(_,1),h-2),t.y+1,h-2,h-2),n.fillStyle=a}x(o[l])}V.each(i.after,x)}m=0,V.each(e.afterBody,x),t.y-=c},drawFooter:function(t,e,n){var i,a,r=e.footer,o=r.length;if(o){var s=ze(e.rtl,e.x,e.width);for(t.x=Ve(e,e._footerAlign),t.y+=e.footerMarginTop,n.textAlign=s.textAlign(e._footerAlign),n.textBaseline="middle",i=e.footerFontSize,n.fillStyle=e.footerFontColor,n.font=V.fontString(i,e._footerFontStyle,e._footerFontFamily),a=0;a<o;++a)n.fillText(r[a],s.x(t.x),t.y+i/2),t.y+=i+e.footerSpacing}},drawBackground:function(t,e,n,i){n.fillStyle=e.backgroundColor,n.strokeStyle=e.borderColor,n.lineWidth=e.borderWidth;var a=e.xAlign,r=e.yAlign,o=t.x,s=t.y,l=i.width,u=i.height,d=e.cornerRadius;n.beginPath(),n.moveTo(o+d,s),"top"===r&&this.drawCaret(t,i),n.lineTo(o+l-d,s),n.quadraticCurveTo(o+l,s,o+l,s+d),"center"===r&&"right"===a&&this.drawCaret(t,i),n.lineTo(o+l,s+u-d),n.quadraticCurveTo(o+l,s+u,o+l-d,s+u),"bottom"===r&&this.drawCaret(t,i),n.lineTo(o+d,s+u),n.quadraticCurveTo(o,s+u,o,s+u-d),"center"===r&&"left"===a&&this.drawCaret(t,i),n.lineTo(o,s+d),n.quadraticCurveTo(o,s,o+d,s),n.closePath(),n.fill(),e.borderWidth>0&&n.stroke()},draw:function(){var t=this._chart.ctx,e=this._view;if(0!==e.opacity){var n={width:e.width,height:e.height},i={x:e.x,y:e.y},a=Math.abs(e.opacity<.001)?0:e.opacity,r=e.title.length||e.beforeBody.length||e.body.length||e.afterBody.length||e.footer.length;this._options.enabled&&r&&(t.save(),t.globalAlpha=a,this.drawBackground(i,e,t,n),i.y+=e.yPadding,V.rtl.overrideTextDirection(t,e.textDirection),this.drawTitle(i,e,t),this.drawBody(i,e,t),this.drawFooter(i,e,t),V.rtl.restoreTextDirection(t,e.textDirection),t.restore())}},handleEvent:function(t){var e,n=this,i=n._options;return n._lastActive=n._lastActive||[],"mouseout"===t.type?n._active=[]:(n._active=n._chart.getElementsAtEventForMode(t,i.mode,i),i.reverse&&n._active.reverse()),(e=!V.arrayEquals(n._active,n._lastActive))&&(n._lastActive=n._active,(i.enabled||i.custom)&&(n._eventPosition={x:t.x,y:t.y},n.update(!0),n.pivot())),e}}),qe=Ne,Ue=je;Ue.positioners=qe;var Ye=V.valueOrDefault;function Ge(){return V.merge({},[].slice.call(arguments),{merger:function(t,e,n,i){if("xAxes"===t||"yAxes"===t){var a,r,o,s=n[t].length;for(e[t]||(e[t]=[]),a=0;a<s;++a)o=n[t][a],r=Ye(o.type,"xAxes"===t?"category":"linear"),a>=e[t].length&&e[t].push({}),!e[t][a].type||o.type&&o.type!==e[t][a].type?V.merge(e[t][a],[Oe.getScaleDefaults(r),o]):V.merge(e[t][a],o)}else V._merger(t,e,n,i)}})}function Xe(){return V.merge({},[].slice.call(arguments),{merger:function(t,e,n,i){var a=e[t]||{},r=n[t];"scales"===t?e[t]=Ge(a,r):"scale"===t?e[t]=V.merge(a,[Oe.getScaleDefaults(r.type),r]):V._merger(t,e,n,i)}})}function Ke(t){var e=t.options;V.each(t.scales,(function(e){ge.removeBox(t,e)})),e=Xe(z.global,z[t.config.type],e),t.options=t.config.options=e,t.ensureScalesHaveIDs(),t.buildOrUpdateScales(),t.tooltip._options=e.tooltips,t.tooltip.initialize()}function Ze(t,e,n){var i,a=function(t){return t.id===i};do{i=e+n++}while(V.findIndex(t,a)>=0);return i}function $e(t){return"top"===t||"bottom"===t}function Je(t,e){return function(n,i){return n[t]===i[t]?n[e]-i[e]:n[t]-i[t]}}z._set("global",{elements:{},events:["mousemove","mouseout","click","touchstart","touchmove"],hover:{onHover:null,mode:"nearest",intersect:!0,animationDuration:400},onClick:null,maintainAspectRatio:!0,responsive:!0,responsiveAnimationDuration:0});var Qe=function(t,e){return this.construct(t,e),this};V.extend(Qe.prototype,{construct:function(t,e){var n=this;e=function(t){var e=(t=t||{}).data=t.data||{};return e.datasets=e.datasets||[],e.labels=e.labels||[],t.options=Xe(z.global,z[t.type],t.options||{}),t}(e);var i=Fe.acquireContext(t,e),a=i&&i.canvas,r=a&&a.height,o=a&&a.width;n.id=V.uid(),n.ctx=i,n.canvas=a,n.config=e,n.width=o,n.height=r,n.aspectRatio=r?o/r:null,n.options=e.options,n._bufferedRender=!1,n._layers=[],n.chart=n,n.controller=n,Qe.instances[n.id]=n,Object.defineProperty(n,"data",{get:function(){return n.config.data},set:function(t){n.config.data=t}}),i&&a?(n.initialize(),n.update()):console.error("Failed to create chart: can't acquire context from the given item")},initialize:function(){var t=this;return Le.notify(t,"beforeInit"),V.retinaScale(t,t.options.devicePixelRatio),t.bindEvents(),t.options.responsive&&t.resize(!0),t.initToolTip(),Le.notify(t,"afterInit"),t},clear:function(){return V.canvas.clear(this),this},stop:function(){return $.cancelAnimation(this),this},resize:function(t){var e=this,n=e.options,i=e.canvas,a=n.maintainAspectRatio&&e.aspectRatio||null,r=Math.max(0,Math.floor(V.getMaximumWidth(i))),o=Math.max(0,Math.floor(a?r/a:V.getMaximumHeight(i)));if((e.width!==r||e.height!==o)&&(i.width=e.width=r,i.height=e.height=o,i.style.width=r+"px",i.style.height=o+"px",V.retinaScale(e,n.devicePixelRatio),!t)){var s={width:r,height:o};Le.notify(e,"resize",[s]),n.onResize&&n.onResize(e,s),e.stop(),e.update({duration:n.responsiveAnimationDuration})}},ensureScalesHaveIDs:function(){var t=this.options,e=t.scales||{},n=t.scale;V.each(e.xAxes,(function(t,n){t.id||(t.id=Ze(e.xAxes,"x-axis-",n))})),V.each(e.yAxes,(function(t,n){t.id||(t.id=Ze(e.yAxes,"y-axis-",n))})),n&&(n.id=n.id||"scale")},buildOrUpdateScales:function(){var t=this,e=t.options,n=t.scales||{},i=[],a=Object.keys(n).reduce((function(t,e){return t[e]=!1,t}),{});e.scales&&(i=i.concat((e.scales.xAxes||[]).map((function(t){return{options:t,dtype:"category",dposition:"bottom"}})),(e.scales.yAxes||[]).map((function(t){return{options:t,dtype:"linear",dposition:"left"}})))),e.scale&&i.push({options:e.scale,dtype:"radialLinear",isDefault:!0,dposition:"chartArea"}),V.each(i,(function(e){var i=e.options,r=i.id,o=Ye(i.type,e.dtype);$e(i.position)!==$e(e.dposition)&&(i.position=e.dposition),a[r]=!0;var s=null;if(r in n&&n[r].type===o)(s=n[r]).options=i,s.ctx=t.ctx,s.chart=t;else{var l=Oe.getScaleConstructor(o);if(!l)return;s=new l({id:r,type:o,options:i,ctx:t.ctx,chart:t}),n[s.id]=s}s.mergeTicksOptions(),e.isDefault&&(t.scale=s)})),V.each(a,(function(t,e){t||delete n[e]})),t.scales=n,Oe.addScalesToLayout(this)},buildOrUpdateControllers:function(){var t,e,n=this,i=[],a=n.data.datasets;for(t=0,e=a.length;t<e;t++){var r=a[t],o=n.getDatasetMeta(t),s=r.type||n.config.type;if(o.type&&o.type!==s&&(n.destroyDatasetMeta(t),o=n.getDatasetMeta(t)),o.type=s,o.order=r.order||0,o.index=t,o.controller)o.controller.updateIndex(t),o.controller.linkScales();else{var l=$t[o.type];if(void 0===l)throw new Error('"'+o.type+'" is not a chart type.');o.controller=new l(n,t),i.push(o.controller)}}return i},resetElements:function(){var t=this;V.each(t.data.datasets,(function(e,n){t.getDatasetMeta(n).controller.reset()}),t)},reset:function(){this.resetElements(),this.tooltip.initialize()},update:function(t){var e,n,i=this;if(t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]}),Ke(i),Le._invalidate(i),!1!==Le.notify(i,"beforeUpdate")){i.tooltip._data=i.data;var a=i.buildOrUpdateControllers();for(e=0,n=i.data.datasets.length;e<n;e++)i.getDatasetMeta(e).controller.buildOrUpdateElements();i.updateLayout(),i.options.animation&&i.options.animation.duration&&V.each(a,(function(t){t.reset()})),i.updateDatasets(),i.tooltip.initialize(),i.lastActive=[],Le.notify(i,"afterUpdate"),i._layers.sort(Je("z","_idx")),i._bufferedRender?i._bufferedRequest={duration:t.duration,easing:t.easing,lazy:t.lazy}:i.render(t)}},updateLayout:function(){var t=this;!1!==Le.notify(t,"beforeLayout")&&(ge.update(this,this.width,this.height),t._layers=[],V.each(t.boxes,(function(e){e._configure&&e._configure(),t._layers.push.apply(t._layers,e._layers())}),t),t._layers.forEach((function(t,e){t._idx=e})),Le.notify(t,"afterScaleUpdate"),Le.notify(t,"afterLayout"))},updateDatasets:function(){if(!1!==Le.notify(this,"beforeDatasetsUpdate")){for(var t=0,e=this.data.datasets.length;t<e;++t)this.updateDataset(t);Le.notify(this,"afterDatasetsUpdate")}},updateDataset:function(t){var e=this.getDatasetMeta(t),n={meta:e,index:t};!1!==Le.notify(this,"beforeDatasetUpdate",[n])&&(e.controller._update(),Le.notify(this,"afterDatasetUpdate",[n]))},render:function(t){var e=this;t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]});var n=e.options.animation,i=Ye(t.duration,n&&n.duration),a=t.lazy;if(!1!==Le.notify(e,"beforeRender")){var r=function(t){Le.notify(e,"afterRender"),V.callback(n&&n.onComplete,[t],e)};if(n&&i){var o=new Z({numSteps:i/16.66,easing:t.easing||n.easing,render:function(t,e){var n=V.easing.effects[e.easing],i=e.currentStep,a=i/e.numSteps;t.draw(n(a),a,i)},onAnimationProgress:n.onProgress,onAnimationComplete:r});$.addAnimation(e,o,i,a)}else e.draw(),r(new Z({numSteps:0,chart:e}));return e}},draw:function(t){var e,n,i=this;if(i.clear(),V.isNullOrUndef(t)&&(t=1),i.transition(t),!(i.width<=0||i.height<=0)&&!1!==Le.notify(i,"beforeDraw",[t])){for(n=i._layers,e=0;e<n.length&&n[e].z<=0;++e)n[e].draw(i.chartArea);for(i.drawDatasets(t);e<n.length;++e)n[e].draw(i.chartArea);i._drawTooltip(t),Le.notify(i,"afterDraw",[t])}},transition:function(t){for(var e=0,n=(this.data.datasets||[]).length;e<n;++e)this.isDatasetVisible(e)&&this.getDatasetMeta(e).controller.transition(t);this.tooltip.transition(t)},_getSortedDatasetMetas:function(t){var e,n,i=[];for(e=0,n=(this.data.datasets||[]).length;e<n;++e)t&&!this.isDatasetVisible(e)||i.push(this.getDatasetMeta(e));return i.sort(Je("order","index")),i},_getSortedVisibleDatasetMetas:function(){return this._getSortedDatasetMetas(!0)},drawDatasets:function(t){var e,n;if(!1!==Le.notify(this,"beforeDatasetsDraw",[t])){for(n=(e=this._getSortedVisibleDatasetMetas()).length-1;n>=0;--n)this.drawDataset(e[n],t);Le.notify(this,"afterDatasetsDraw",[t])}},drawDataset:function(t,e){var n={meta:t,index:t.index,easingValue:e};!1!==Le.notify(this,"beforeDatasetDraw",[n])&&(t.controller.draw(e),Le.notify(this,"afterDatasetDraw",[n]))},_drawTooltip:function(t){var e=this.tooltip,n={tooltip:e,easingValue:t};!1!==Le.notify(this,"beforeTooltipDraw",[n])&&(e.draw(),Le.notify(this,"afterTooltipDraw",[n]))},getElementAtEvent:function(t){return ae.modes.single(this,t)},getElementsAtEvent:function(t){return ae.modes.label(this,t,{intersect:!0})},getElementsAtXAxis:function(t){return ae.modes["x-axis"](this,t,{intersect:!0})},getElementsAtEventForMode:function(t,e,n){var i=ae.modes[e];return"function"==typeof i?i(this,t,n):[]},getDatasetAtEvent:function(t){return ae.modes.dataset(this,t,{intersect:!0})},getDatasetMeta:function(t){var e=this.data.datasets[t];e._meta||(e._meta={});var n=e._meta[this.id];return n||(n=e._meta[this.id]={type:null,data:[],dataset:null,controller:null,hidden:null,xAxisID:null,yAxisID:null,order:e.order||0,index:t}),n},getVisibleDatasetCount:function(){for(var t=0,e=0,n=this.data.datasets.length;e<n;++e)this.isDatasetVisible(e)&&t++;return t},isDatasetVisible:function(t){var e=this.getDatasetMeta(t);return"boolean"==typeof e.hidden?!e.hidden:!this.data.datasets[t].hidden},generateLegend:function(){return this.options.legendCallback(this)},destroyDatasetMeta:function(t){var e=this.id,n=this.data.datasets[t],i=n._meta&&n._meta[e];i&&(i.controller.destroy(),delete n._meta[e])},destroy:function(){var t,e,n=this,i=n.canvas;for(n.stop(),t=0,e=n.data.datasets.length;t<e;++t)n.destroyDatasetMeta(t);i&&(n.unbindEvents(),V.canvas.clear(n),Fe.releaseContext(n.ctx),n.canvas=null,n.ctx=null),Le.notify(n,"destroy"),delete Qe.instances[n.id]},toBase64Image:function(){return this.canvas.toDataURL.apply(this.canvas,arguments)},initToolTip:function(){var t=this;t.tooltip=new Ue({_chart:t,_chartInstance:t,_data:t.data,_options:t.options.tooltips},t)},bindEvents:function(){var t=this,e=t._listeners={},n=function(){t.eventHandler.apply(t,arguments)};V.each(t.options.events,(function(i){Fe.addEventListener(t,i,n),e[i]=n})),t.options.responsive&&(n=function(){t.resize()},Fe.addEventListener(t,"resize",n),e.resize=n)},unbindEvents:function(){var t=this,e=t._listeners;e&&(delete t._listeners,V.each(e,(function(e,n){Fe.removeEventListener(t,n,e)})))},updateHoverStyle:function(t,e,n){var i,a,r,o=n?"set":"remove";for(a=0,r=t.length;a<r;++a)(i=t[a])&&this.getDatasetMeta(i._datasetIndex).controller[o+"HoverStyle"](i);"dataset"===e&&this.getDatasetMeta(t[0]._datasetIndex).controller["_"+o+"DatasetHoverStyle"]()},eventHandler:function(t){var e=this,n=e.tooltip;if(!1!==Le.notify(e,"beforeEvent",[t])){e._bufferedRender=!0,e._bufferedRequest=null;var i=e.handleEvent(t);n&&(i=n._start?n.handleEvent(t):i|n.handleEvent(t)),Le.notify(e,"afterEvent",[t]);var a=e._bufferedRequest;return a?e.render(a):i&&!e.animating&&(e.stop(),e.render({duration:e.options.hover.animationDuration,lazy:!0})),e._bufferedRender=!1,e._bufferedRequest=null,e}},handleEvent:function(t){var e,n=this,i=n.options||{},a=i.hover;return n.lastActive=n.lastActive||[],"mouseout"===t.type?n.active=[]:n.active=n.getElementsAtEventForMode(t,a.mode,a),V.callback(i.onHover||i.hover.onHover,[t.native,n.active],n),"mouseup"!==t.type&&"click"!==t.type||i.onClick&&i.onClick.call(n,t.native,n.active),n.lastActive.length&&n.updateHoverStyle(n.lastActive,a.mode,!1),n.active.length&&a.mode&&n.updateHoverStyle(n.active,a.mode,!0),e=!V.arrayEquals(n.active,n.lastActive),n.lastActive=n.active,e}}),Qe.instances={};var tn=Qe;Qe.Controller=Qe,Qe.types={},V.configMerge=Xe,V.scaleMerge=Ge;function en(){throw new Error("This method is not implemented: either no adapter can be found or an incomplete integration was provided.")}function nn(t){this.options=t||{}}V.extend(nn.prototype,{formats:en,parse:en,format:en,add:en,diff:en,startOf:en,endOf:en,_create:function(t){return t}}),nn.override=function(t){V.extend(nn.prototype,t)};var an={_date:nn},rn={formatters:{values:function(t){return V.isArray(t)?t:""+t},linear:function(t,e,n){var i=n.length>3?n[2]-n[1]:n[1]-n[0];Math.abs(i)>1&&t!==Math.floor(t)&&(i=t-Math.floor(t));var a=V.log10(Math.abs(i)),r="";if(0!==t)if(Math.max(Math.abs(n[0]),Math.abs(n[n.length-1]))<1e-4){var o=V.log10(Math.abs(t)),s=Math.floor(o)-Math.floor(a);s=Math.max(Math.min(s,20),0),r=t.toExponential(s)}else{var l=-1*Math.floor(a);l=Math.max(Math.min(l,20),0),r=t.toFixed(l)}else r="0";return r},logarithmic:function(t,e,n){var i=t/Math.pow(10,Math.floor(V.log10(t)));return 0===t?"0":1===i||2===i||5===i||0===e||e===n.length-1?t.toExponential():""}}},on=V.isArray,sn=V.isNullOrUndef,ln=V.valueOrDefault,un=V.valueAtIndexOrDefault;function dn(t,e,n){var i,a=t.getTicks().length,r=Math.min(e,a-1),o=t.getPixelForTick(r),s=t._startPixel,l=t._endPixel;if(!(n&&(i=1===a?Math.max(o-s,l-o):0===e?(t.getPixelForTick(1)-o)/2:(o-t.getPixelForTick(r-1))/2,(o+=r<e?i:-i)<s-1e-6||o>l+1e-6)))return o}function hn(t,e,n,i){var a,r,o,s,l,u,d,h,c,f,g,p,m,v=n.length,b=[],x=[],y=[];for(a=0;a<v;++a){if(s=n[a].label,l=n[a].major?e.major:e.minor,t.font=u=l.string,d=i[u]=i[u]||{data:{},gc:[]},h=l.lineHeight,c=f=0,sn(s)||on(s)){if(on(s))for(r=0,o=s.length;r<o;++r)g=s[r],sn(g)||on(g)||(c=V.measureText(t,d.data,d.gc,c,g),f+=h)}else c=V.measureText(t,d.data,d.gc,c,s),f=h;b.push(c),x.push(f),y.push(h/2)}function _(t){return{width:b[t]||0,height:x[t]||0,offset:y[t]||0}}return function(t,e){V.each(t,(function(t){var n,i=t.gc,a=i.length/2;if(a>e){for(n=0;n<a;++n)delete t.data[i[n]];i.splice(0,a)}}))}(i,v),p=b.indexOf(Math.max.apply(null,b)),m=x.indexOf(Math.max.apply(null,x)),{first:_(0),last:_(v-1),widest:_(p),highest:_(m)}}function cn(t){return t.drawTicks?t.tickMarkLength:0}function fn(t){var e,n;return t.display?(e=V.options._parseFont(t),n=V.options.toPadding(t.padding),e.lineHeight+n.height):0}function gn(t,e){return V.extend(V.options._parseFont({fontFamily:ln(e.fontFamily,t.fontFamily),fontSize:ln(e.fontSize,t.fontSize),fontStyle:ln(e.fontStyle,t.fontStyle),lineHeight:ln(e.lineHeight,t.lineHeight)}),{color:V.options.resolve([e.fontColor,t.fontColor,z.global.defaultFontColor])})}function pn(t){var e=gn(t,t.minor);return{minor:e,major:t.major.enabled?gn(t,t.major):e}}function mn(t){var e,n,i,a=[];for(n=0,i=t.length;n<i;++n)void 0!==(e=t[n])._index&&a.push(e);return a}function vn(t,e,n,i){var a,r,o,s,l=ln(n,0),u=Math.min(ln(i,t.length),t.length),d=0;for(e=Math.ceil(e),i&&(e=(a=i-n)/Math.floor(a/e)),s=l;s<0;)d++,s=Math.round(l+d*e);for(r=Math.max(l,0);r<u;r++)o=t[r],r===s?(o._index=r,d++,s=Math.round(l+d*e)):delete o.label}z._set("scale",{display:!0,position:"left",offset:!1,gridLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,drawBorder:!0,drawOnChartArea:!0,drawTicks:!0,tickMarkLength:10,zeroLineWidth:1,zeroLineColor:"rgba(0,0,0,0.25)",zeroLineBorderDash:[],zeroLineBorderDashOffset:0,offsetGridLines:!1,borderDash:[],borderDashOffset:0},scaleLabel:{display:!1,labelString:"",padding:{top:4,bottom:4}},ticks:{beginAtZero:!1,minRotation:0,maxRotation:50,mirror:!1,padding:0,reverse:!1,display:!0,autoSkip:!0,autoSkipPadding:0,labelOffset:0,callback:rn.formatters.values,minor:{},major:{}}});var bn=X.extend({zeroLineIndex:0,getPadding:function(){return{left:this.paddingLeft||0,top:this.paddingTop||0,right:this.paddingRight||0,bottom:this.paddingBottom||0}},getTicks:function(){return this._ticks},_getLabels:function(){var t=this.chart.data;return this.options.labels||(this.isHorizontal()?t.xLabels:t.yLabels)||t.labels||[]},mergeTicksOptions:function(){},beforeUpdate:function(){V.callback(this.options.beforeUpdate,[this])},update:function(t,e,n){var i,a,r,o,s,l=this,u=l.options.ticks,d=u.sampleSize;if(l.beforeUpdate(),l.maxWidth=t,l.maxHeight=e,l.margins=V.extend({left:0,right:0,top:0,bottom:0},n),l._ticks=null,l.ticks=null,l._labelSizes=null,l._maxLabelLines=0,l.longestLabelWidth=0,l.longestTextCache=l.longestTextCache||{},l._gridLineItems=null,l._labelItems=null,l.beforeSetDimensions(),l.setDimensions(),l.afterSetDimensions(),l.beforeDataLimits(),l.determineDataLimits(),l.afterDataLimits(),l.beforeBuildTicks(),o=l.buildTicks()||[],(!(o=l.afterBuildTicks(o)||o)||!o.length)&&l.ticks)for(o=[],i=0,a=l.ticks.length;i<a;++i)o.push({value:l.ticks[i],major:!1});return l._ticks=o,s=d<o.length,r=l._convertTicksToLabels(s?function(t,e){for(var n=[],i=t.length/e,a=0,r=t.length;a<r;a+=i)n.push(t[Math.floor(a)]);return n}(o,d):o),l._configure(),l.beforeCalculateTickRotation(),l.calculateTickRotation(),l.afterCalculateTickRotation(),l.beforeFit(),l.fit(),l.afterFit(),l._ticksToDraw=u.display&&(u.autoSkip||"auto"===u.source)?l._autoSkip(o):o,s&&(r=l._convertTicksToLabels(l._ticksToDraw)),l.ticks=r,l.afterUpdate(),l.minSize},_configure:function(){var t,e,n=this,i=n.options.ticks.reverse;n.isHorizontal()?(t=n.left,e=n.right):(t=n.top,e=n.bottom,i=!i),n._startPixel=t,n._endPixel=e,n._reversePixels=i,n._length=e-t},afterUpdate:function(){V.callback(this.options.afterUpdate,[this])},beforeSetDimensions:function(){V.callback(this.options.beforeSetDimensions,[this])},setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0},afterSetDimensions:function(){V.callback(this.options.afterSetDimensions,[this])},beforeDataLimits:function(){V.callback(this.options.beforeDataLimits,[this])},determineDataLimits:V.noop,afterDataLimits:function(){V.callback(this.options.afterDataLimits,[this])},beforeBuildTicks:function(){V.callback(this.options.beforeBuildTicks,[this])},buildTicks:V.noop,afterBuildTicks:function(t){var e=this;return on(t)&&t.length?V.callback(e.options.afterBuildTicks,[e,t]):(e.ticks=V.callback(e.options.afterBuildTicks,[e,e.ticks])||e.ticks,t)},beforeTickToLabelConversion:function(){V.callback(this.options.beforeTickToLabelConversion,[this])},convertTicksToLabels:function(){var t=this.options.ticks;this.ticks=this.ticks.map(t.userCallback||t.callback,this)},afterTickToLabelConversion:function(){V.callback(this.options.afterTickToLabelConversion,[this])},beforeCalculateTickRotation:function(){V.callback(this.options.beforeCalculateTickRotation,[this])},calculateTickRotation:function(){var t,e,n,i,a,r,o,s=this,l=s.options,u=l.ticks,d=s.getTicks().length,h=u.minRotation||0,c=u.maxRotation,f=h;!s._isVisible()||!u.display||h>=c||d<=1||!s.isHorizontal()?s.labelRotation=h:(e=(t=s._getLabelSizes()).widest.width,n=t.highest.height-t.highest.offset,i=Math.min(s.maxWidth,s.chart.width-e),e+6>(a=l.offset?s.maxWidth/d:i/(d-1))&&(a=i/(d-(l.offset?.5:1)),r=s.maxHeight-cn(l.gridLines)-u.padding-fn(l.scaleLabel),o=Math.sqrt(e*e+n*n),f=V.toDegrees(Math.min(Math.asin(Math.min((t.highest.height+6)/a,1)),Math.asin(Math.min(r/o,1))-Math.asin(n/o))),f=Math.max(h,Math.min(c,f))),s.labelRotation=f)},afterCalculateTickRotation:function(){V.callback(this.options.afterCalculateTickRotation,[this])},beforeFit:function(){V.callback(this.options.beforeFit,[this])},fit:function(){var t=this,e=t.minSize={width:0,height:0},n=t.chart,i=t.options,a=i.ticks,r=i.scaleLabel,o=i.gridLines,s=t._isVisible(),l="bottom"===i.position,u=t.isHorizontal();if(u?e.width=t.maxWidth:s&&(e.width=cn(o)+fn(r)),u?s&&(e.height=cn(o)+fn(r)):e.height=t.maxHeight,a.display&&s){var d=pn(a),h=t._getLabelSizes(),c=h.first,f=h.last,g=h.widest,p=h.highest,m=.4*d.minor.lineHeight,v=a.padding;if(u){var b=0!==t.labelRotation,x=V.toRadians(t.labelRotation),y=Math.cos(x),_=Math.sin(x),k=_*g.width+y*(p.height-(b?p.offset:0))+(b?0:m);e.height=Math.min(t.maxHeight,e.height+k+v);var w,M,S=t.getPixelForTick(0)-t.left,C=t.right-t.getPixelForTick(t.getTicks().length-1);b?(w=l?y*c.width+_*c.offset:_*(c.height-c.offset),M=l?_*(f.height-f.offset):y*f.width+_*f.offset):(w=c.width/2,M=f.width/2),t.paddingLeft=Math.max((w-S)*t.width/(t.width-S),0)+3,t.paddingRight=Math.max((M-C)*t.width/(t.width-C),0)+3}else{var P=a.mirror?0:g.width+v+m;e.width=Math.min(t.maxWidth,e.width+P),t.paddingTop=c.height/2,t.paddingBottom=f.height/2}}t.handleMargins(),u?(t.width=t._length=n.width-t.margins.left-t.margins.right,t.height=e.height):(t.width=e.width,t.height=t._length=n.height-t.margins.top-t.margins.bottom)},handleMargins:function(){var t=this;t.margins&&(t.margins.left=Math.max(t.paddingLeft,t.margins.left),t.margins.top=Math.max(t.paddingTop,t.margins.top),t.margins.right=Math.max(t.paddingRight,t.margins.right),t.margins.bottom=Math.max(t.paddingBottom,t.margins.bottom))},afterFit:function(){V.callback(this.options.afterFit,[this])},isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},isFullWidth:function(){return this.options.fullWidth},getRightValue:function(t){if(sn(t))return NaN;if(("number"==typeof t||t instanceof Number)&&!isFinite(t))return NaN;if(t)if(this.isHorizontal()){if(void 0!==t.x)return this.getRightValue(t.x)}else if(void 0!==t.y)return this.getRightValue(t.y);return t},_convertTicksToLabels:function(t){var e,n,i,a=this;for(a.ticks=t.map((function(t){return t.value})),a.beforeTickToLabelConversion(),e=a.convertTicksToLabels(t)||a.ticks,a.afterTickToLabelConversion(),n=0,i=t.length;n<i;++n)t[n].label=e[n];return e},_getLabelSizes:function(){var t=this,e=t._labelSizes;return e||(t._labelSizes=e=hn(t.ctx,pn(t.options.ticks),t.getTicks(),t.longestTextCache),t.longestLabelWidth=e.widest.width),e},_parseValue:function(t){var e,n,i,a;return on(t)?(e=+this.getRightValue(t[0]),n=+this.getRightValue(t[1]),i=Math.min(e,n),a=Math.max(e,n)):(e=void 0,n=t=+this.getRightValue(t),i=t,a=t),{min:i,max:a,start:e,end:n}},_getScaleLabel:function(t){var e=this._parseValue(t);return void 0!==e.start?"["+e.start+", "+e.end+"]":+this.getRightValue(t)},getLabelForIndex:V.noop,getPixelForValue:V.noop,getValueForPixel:V.noop,getPixelForTick:function(t){var e=this.options.offset,n=this._ticks.length,i=1/Math.max(n-(e?0:1),1);return t<0||t>n-1?null:this.getPixelForDecimal(t*i+(e?i/2:0))},getPixelForDecimal:function(t){return this._reversePixels&&(t=1-t),this._startPixel+t*this._length},getDecimalForPixel:function(t){var e=(t-this._startPixel)/this._length;return this._reversePixels?1-e:e},getBasePixel:function(){return this.getPixelForValue(this.getBaseValue())},getBaseValue:function(){var t=this.min,e=this.max;return this.beginAtZero?0:t<0&&e<0?e:t>0&&e>0?t:0},_autoSkip:function(t){var e,n,i,a,r=this.options.ticks,o=this._length,s=r.maxTicksLimit||o/this._tickSize()+1,l=r.major.enabled?function(t){var e,n,i=[];for(e=0,n=t.length;e<n;e++)t[e].major&&i.push(e);return i}(t):[],u=l.length,d=l[0],h=l[u-1];if(u>s)return function(t,e,n){var i,a,r=0,o=e[0];for(n=Math.ceil(n),i=0;i<t.length;i++)a=t[i],i===o?(a._index=i,o=e[++r*n]):delete a.label}(t,l,u/s),mn(t);if(i=function(t,e,n,i){var a,r,o,s,l=function(t){var e,n,i=t.length;if(i<2)return!1;for(n=t[0],e=1;e<i;++e)if(t[e]-t[e-1]!==n)return!1;return n}(t),u=(e.length-1)/i;if(!l)return Math.max(u,1);for(o=0,s=(a=V.math._factorize(l)).length-1;o<s;o++)if((r=a[o])>u)return r;return Math.max(u,1)}(l,t,0,s),u>0){for(e=0,n=u-1;e<n;e++)vn(t,i,l[e],l[e+1]);return a=u>1?(h-d)/(u-1):null,vn(t,i,V.isNullOrUndef(a)?0:d-a,d),vn(t,i,h,V.isNullOrUndef(a)?t.length:h+a),mn(t)}return vn(t,i),mn(t)},_tickSize:function(){var t=this.options.ticks,e=V.toRadians(this.labelRotation),n=Math.abs(Math.cos(e)),i=Math.abs(Math.sin(e)),a=this._getLabelSizes(),r=t.autoSkipPadding||0,o=a?a.widest.width+r:0,s=a?a.highest.height+r:0;return this.isHorizontal()?s*n>o*i?o/n:s/i:s*i<o*n?s/n:o/i},_isVisible:function(){var t,e,n,i=this.chart,a=this.options.display;if("auto"!==a)return!!a;for(t=0,e=i.data.datasets.length;t<e;++t)if(i.isDatasetVisible(t)&&((n=i.getDatasetMeta(t)).xAxisID===this.id||n.yAxisID===this.id))return!0;return!1},_computeGridLineItems:function(t){var e,n,i,a,r,o,s,l,u,d,h,c,f,g,p,m,v,b=this,x=b.chart,y=b.options,_=y.gridLines,k=y.position,w=_.offsetGridLines,M=b.isHorizontal(),S=b._ticksToDraw,C=S.length+(w?1:0),P=cn(_),A=[],D=_.drawBorder?un(_.lineWidth,0,0):0,T=D/2,I=V._alignPixel,F=function(t){return I(x,t,D)};for("top"===k?(e=F(b.bottom),s=b.bottom-P,u=e-T,h=F(t.top)+T,f=t.bottom):"bottom"===k?(e=F(b.top),h=t.top,f=F(t.bottom)-T,s=e+T,u=b.top+P):"left"===k?(e=F(b.right),o=b.right-P,l=e-T,d=F(t.left)+T,c=t.right):(e=F(b.left),d=t.left,c=F(t.right)-T,o=e+T,l=b.left+P),n=0;n<C;++n)i=S[n]||{},sn(i.label)&&n<S.length||(n===b.zeroLineIndex&&y.offset===w?(g=_.zeroLineWidth,p=_.zeroLineColor,m=_.zeroLineBorderDash||[],v=_.zeroLineBorderDashOffset||0):(g=un(_.lineWidth,n,1),p=un(_.color,n,"rgba(0,0,0,0.1)"),m=_.borderDash||[],v=_.borderDashOffset||0),void 0!==(a=dn(b,i._index||n,w))&&(r=I(x,a,g),M?o=l=d=c=r:s=u=h=f=r,A.push({tx1:o,ty1:s,tx2:l,ty2:u,x1:d,y1:h,x2:c,y2:f,width:g,color:p,borderDash:m,borderDashOffset:v})));return A.ticksLength=C,A.borderValue=e,A},_computeLabelItems:function(){var t,e,n,i,a,r,o,s,l,u,d,h,c=this,f=c.options,g=f.ticks,p=f.position,m=g.mirror,v=c.isHorizontal(),b=c._ticksToDraw,x=pn(g),y=g.padding,_=cn(f.gridLines),k=-V.toRadians(c.labelRotation),w=[];for("top"===p?(r=c.bottom-_-y,o=k?"left":"center"):"bottom"===p?(r=c.top+_+y,o=k?"right":"center"):"left"===p?(a=c.right-(m?0:_)-y,o=m?"left":"right"):(a=c.left+(m?0:_)+y,o=m?"right":"left"),t=0,e=b.length;t<e;++t)i=(n=b[t]).label,sn(i)||(s=c.getPixelForTick(n._index||t)+g.labelOffset,u=(l=n.major?x.major:x.minor).lineHeight,d=on(i)?i.length:1,v?(a=s,h="top"===p?((k?1:.5)-d)*u:(k?0:.5)*u):(r=s,h=(1-d)*u/2),w.push({x:a,y:r,rotation:k,label:i,font:l,textOffset:h,textAlign:o}));return w},_drawGrid:function(t){var e=this,n=e.options.gridLines;if(n.display){var i,a,r,o,s,l=e.ctx,u=e.chart,d=V._alignPixel,h=n.drawBorder?un(n.lineWidth,0,0):0,c=e._gridLineItems||(e._gridLineItems=e._computeGridLineItems(t));for(r=0,o=c.length;r<o;++r)i=(s=c[r]).width,a=s.color,i&&a&&(l.save(),l.lineWidth=i,l.strokeStyle=a,l.setLineDash&&(l.setLineDash(s.borderDash),l.lineDashOffset=s.borderDashOffset),l.beginPath(),n.drawTicks&&(l.moveTo(s.tx1,s.ty1),l.lineTo(s.tx2,s.ty2)),n.drawOnChartArea&&(l.moveTo(s.x1,s.y1),l.lineTo(s.x2,s.y2)),l.stroke(),l.restore());if(h){var f,g,p,m,v=h,b=un(n.lineWidth,c.ticksLength-1,1),x=c.borderValue;e.isHorizontal()?(f=d(u,e.left,v)-v/2,g=d(u,e.right,b)+b/2,p=m=x):(p=d(u,e.top,v)-v/2,m=d(u,e.bottom,b)+b/2,f=g=x),l.lineWidth=h,l.strokeStyle=un(n.color,0),l.beginPath(),l.moveTo(f,p),l.lineTo(g,m),l.stroke()}}},_drawLabels:function(){var t=this;if(t.options.ticks.display){var e,n,i,a,r,o,s,l,u=t.ctx,d=t._labelItems||(t._labelItems=t._computeLabelItems());for(e=0,i=d.length;e<i;++e){if(o=(r=d[e]).font,u.save(),u.translate(r.x,r.y),u.rotate(r.rotation),u.font=o.string,u.fillStyle=o.color,u.textBaseline="middle",u.textAlign=r.textAlign,s=r.label,l=r.textOffset,on(s))for(n=0,a=s.length;n<a;++n)u.fillText(""+s[n],0,l),l+=o.lineHeight;else u.fillText(s,0,l);u.restore()}}},_drawTitle:function(){var t=this,e=t.ctx,n=t.options,i=n.scaleLabel;if(i.display){var a,r,o=ln(i.fontColor,z.global.defaultFontColor),s=V.options._parseFont(i),l=V.options.toPadding(i.padding),u=s.lineHeight/2,d=n.position,h=0;if(t.isHorizontal())a=t.left+t.width/2,r="bottom"===d?t.bottom-u-l.bottom:t.top+u+l.top;else{var c="left"===d;a=c?t.left+u+l.top:t.right-u-l.top,r=t.top+t.height/2,h=c?-.5*Math.PI:.5*Math.PI}e.save(),e.translate(a,r),e.rotate(h),e.textAlign="center",e.textBaseline="middle",e.fillStyle=o,e.font=s.string,e.fillText(i.labelString,0,0),e.restore()}},draw:function(t){this._isVisible()&&(this._drawGrid(t),this._drawTitle(),this._drawLabels())},_layers:function(){var t=this,e=t.options,n=e.ticks&&e.ticks.z||0,i=e.gridLines&&e.gridLines.z||0;return t._isVisible()&&n!==i&&t.draw===t._draw?[{z:i,draw:function(){t._drawGrid.apply(t,arguments),t._drawTitle.apply(t,arguments)}},{z:n,draw:function(){t._drawLabels.apply(t,arguments)}}]:[{z:n,draw:function(){t.draw.apply(t,arguments)}}]},_getMatchingVisibleMetas:function(t){var e=this,n=e.isHorizontal();return e.chart._getSortedVisibleDatasetMetas().filter((function(i){return(!t||i.type===t)&&(n?i.xAxisID===e.id:i.yAxisID===e.id)}))}});bn.prototype._draw=bn.prototype.draw;var xn=bn,yn=V.isNullOrUndef,_n=xn.extend({determineDataLimits:function(){var t,e=this,n=e._getLabels(),i=e.options.ticks,a=i.min,r=i.max,o=0,s=n.length-1;void 0!==a&&(t=n.indexOf(a))>=0&&(o=t),void 0!==r&&(t=n.indexOf(r))>=0&&(s=t),e.minIndex=o,e.maxIndex=s,e.min=n[o],e.max=n[s]},buildTicks:function(){var t=this._getLabels(),e=this.minIndex,n=this.maxIndex;this.ticks=0===e&&n===t.length-1?t:t.slice(e,n+1)},getLabelForIndex:function(t,e){var n=this.chart;return n.getDatasetMeta(e).controller._getValueScaleId()===this.id?this.getRightValue(n.data.datasets[e].data[t]):this._getLabels()[t]},_configure:function(){var t=this,e=t.options.offset,n=t.ticks;xn.prototype._configure.call(t),t.isHorizontal()||(t._reversePixels=!t._reversePixels),n&&(t._startValue=t.minIndex-(e?.5:0),t._valueRange=Math.max(n.length-(e?0:1),1))},getPixelForValue:function(t,e,n){var i,a,r,o=this;return yn(e)||yn(n)||(t=o.chart.data.datasets[n].data[e]),yn(t)||(i=o.isHorizontal()?t.x:t.y),(void 0!==i||void 0!==t&&isNaN(e))&&(a=o._getLabels(),t=V.valueOrDefault(i,t),e=-1!==(r=a.indexOf(t))?r:e,isNaN(e)&&(e=t)),o.getPixelForDecimal((e-o._startValue)/o._valueRange)},getPixelForTick:function(t){var e=this.ticks;return t<0||t>e.length-1?null:this.getPixelForValue(e[t],t+this.minIndex)},getValueForPixel:function(t){var e=Math.round(this._startValue+this.getDecimalForPixel(t)*this._valueRange);return Math.min(Math.max(e,0),this.ticks.length-1)},getBasePixel:function(){return this.bottom}}),kn={position:"bottom"};_n._defaults=kn;var wn=V.noop,Mn=V.isNullOrUndef;var Sn=xn.extend({getRightValue:function(t){return"string"==typeof t?+t:xn.prototype.getRightValue.call(this,t)},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;if(e.beginAtZero){var n=V.sign(t.min),i=V.sign(t.max);n<0&&i<0?t.max=0:n>0&&i>0&&(t.min=0)}var a=void 0!==e.min||void 0!==e.suggestedMin,r=void 0!==e.max||void 0!==e.suggestedMax;void 0!==e.min?t.min=e.min:void 0!==e.suggestedMin&&(null===t.min?t.min=e.suggestedMin:t.min=Math.min(t.min,e.suggestedMin)),void 0!==e.max?t.max=e.max:void 0!==e.suggestedMax&&(null===t.max?t.max=e.suggestedMax:t.max=Math.max(t.max,e.suggestedMax)),a!==r&&t.min>=t.max&&(a?t.max=t.min+1:t.min=t.max-1),t.min===t.max&&(t.max++,e.beginAtZero||t.min--)},getTickLimit:function(){var t,e=this.options.ticks,n=e.stepSize,i=e.maxTicksLimit;return n?t=Math.ceil(this.max/n)-Math.floor(this.min/n)+1:(t=this._computeTickLimit(),i=i||11),i&&(t=Math.min(i,t)),t},_computeTickLimit:function(){return Number.POSITIVE_INFINITY},handleDirectionalChanges:wn,buildTicks:function(){var t=this,e=t.options.ticks,n=t.getTickLimit(),i={maxTicks:n=Math.max(2,n),min:e.min,max:e.max,precision:e.precision,stepSize:V.valueOrDefault(e.fixedStepSize,e.stepSize)},a=t.ticks=function(t,e){var n,i,a,r,o=[],s=t.stepSize,l=s||1,u=t.maxTicks-1,d=t.min,h=t.max,c=t.precision,f=e.min,g=e.max,p=V.niceNum((g-f)/u/l)*l;if(p<1e-14&&Mn(d)&&Mn(h))return[f,g];(r=Math.ceil(g/p)-Math.floor(f/p))>u&&(p=V.niceNum(r*p/u/l)*l),s||Mn(c)?n=Math.pow(10,V._decimalPlaces(p)):(n=Math.pow(10,c),p=Math.ceil(p*n)/n),i=Math.floor(f/p)*p,a=Math.ceil(g/p)*p,s&&(!Mn(d)&&V.almostWhole(d/p,p/1e3)&&(i=d),!Mn(h)&&V.almostWhole(h/p,p/1e3)&&(a=h)),r=(a-i)/p,r=V.almostEquals(r,Math.round(r),p/1e3)?Math.round(r):Math.ceil(r),i=Math.round(i*n)/n,a=Math.round(a*n)/n,o.push(Mn(d)?i:d);for(var m=1;m<r;++m)o.push(Math.round((i+m*p)*n)/n);return o.push(Mn(h)?a:h),o}(i,t);t.handleDirectionalChanges(),t.max=V.max(a),t.min=V.min(a),e.reverse?(a.reverse(),t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max)},convertTicksToLabels:function(){var t=this;t.ticksAsNumbers=t.ticks.slice(),t.zeroLineIndex=t.ticks.indexOf(0),xn.prototype.convertTicksToLabels.call(t)},_configure:function(){var t,e=this,n=e.getTicks(),i=e.min,a=e.max;xn.prototype._configure.call(e),e.options.offset&&n.length&&(i-=t=(a-i)/Math.max(n.length-1,1)/2,a+=t),e._startValue=i,e._endValue=a,e._valueRange=a-i}}),Cn={position:"left",ticks:{callback:rn.formatters.linear}};function Pn(t,e,n,i){var a,r,o=t.options,s=function(t,e,n){var i=[n.type,void 0===e&&void 0===n.stack?n.index:"",n.stack].join(".");return void 0===t[i]&&(t[i]={pos:[],neg:[]}),t[i]}(e,o.stacked,n),l=s.pos,u=s.neg,d=i.length;for(a=0;a<d;++a)r=t._parseValue(i[a]),isNaN(r.min)||isNaN(r.max)||n.data[a].hidden||(l[a]=l[a]||0,u[a]=u[a]||0,o.relativePoints?l[a]=100:r.min<0||r.max<0?u[a]+=r.min:l[a]+=r.max)}function An(t,e,n){var i,a,r=n.length;for(i=0;i<r;++i)a=t._parseValue(n[i]),isNaN(a.min)||isNaN(a.max)||e.data[i].hidden||(t.min=Math.min(t.min,a.min),t.max=Math.max(t.max,a.max))}var Dn=Sn.extend({determineDataLimits:function(){var t,e,n,i,a=this,r=a.options,o=a.chart.data.datasets,s=a._getMatchingVisibleMetas(),l=r.stacked,u={},d=s.length;if(a.min=Number.POSITIVE_INFINITY,a.max=Number.NEGATIVE_INFINITY,void 0===l)for(t=0;!l&&t<d;++t)l=void 0!==(e=s[t]).stack;for(t=0;t<d;++t)n=o[(e=s[t]).index].data,l?Pn(a,u,e,n):An(a,e,n);V.each(u,(function(t){i=t.pos.concat(t.neg),a.min=Math.min(a.min,V.min(i)),a.max=Math.max(a.max,V.max(i))})),a.min=V.isFinite(a.min)&&!isNaN(a.min)?a.min:0,a.max=V.isFinite(a.max)&&!isNaN(a.max)?a.max:1,a.handleTickRangeOptions()},_computeTickLimit:function(){var t;return this.isHorizontal()?Math.ceil(this.width/40):(t=V.options._parseFont(this.options.ticks),Math.ceil(this.height/t.lineHeight))},handleDirectionalChanges:function(){this.isHorizontal()||this.ticks.reverse()},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForValue:function(t){return this.getPixelForDecimal((+this.getRightValue(t)-this._startValue)/this._valueRange)},getValueForPixel:function(t){return this._startValue+this.getDecimalForPixel(t)*this._valueRange},getPixelForTick:function(t){var e=this.ticksAsNumbers;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])}}),Tn=Cn;Dn._defaults=Tn;var In=V.valueOrDefault,Fn=V.math.log10;var Ln={position:"left",ticks:{callback:rn.formatters.logarithmic}};function On(t,e){return V.isFinite(t)&&t>=0?t:e}var Rn=xn.extend({determineDataLimits:function(){var t,e,n,i,a,r,o=this,s=o.options,l=o.chart,u=l.data.datasets,d=o.isHorizontal();function h(t){return d?t.xAxisID===o.id:t.yAxisID===o.id}o.min=Number.POSITIVE_INFINITY,o.max=Number.NEGATIVE_INFINITY,o.minNotZero=Number.POSITIVE_INFINITY;var c=s.stacked;if(void 0===c)for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e)&&void 0!==e.stack){c=!0;break}if(s.stacked||c){var f={};for(t=0;t<u.length;t++){var g=[(e=l.getDatasetMeta(t)).type,void 0===s.stacked&&void 0===e.stack?t:"",e.stack].join(".");if(l.isDatasetVisible(t)&&h(e))for(void 0===f[g]&&(f[g]=[]),a=0,r=(i=u[t].data).length;a<r;a++){var p=f[g];n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(p[a]=p[a]||0,p[a]+=n.max)}}V.each(f,(function(t){if(t.length>0){var e=V.min(t),n=V.max(t);o.min=Math.min(o.min,e),o.max=Math.max(o.max,n)}}))}else for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e))for(a=0,r=(i=u[t].data).length;a<r;a++)n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(o.min=Math.min(n.min,o.min),o.max=Math.max(n.max,o.max),0!==n.min&&(o.minNotZero=Math.min(n.min,o.minNotZero)));o.min=V.isFinite(o.min)?o.min:null,o.max=V.isFinite(o.max)?o.max:null,o.minNotZero=V.isFinite(o.minNotZero)?o.minNotZero:null,this.handleTickRangeOptions()},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;t.min=On(e.min,t.min),t.max=On(e.max,t.max),t.min===t.max&&(0!==t.min&&null!==t.min?(t.min=Math.pow(10,Math.floor(Fn(t.min))-1),t.max=Math.pow(10,Math.floor(Fn(t.max))+1)):(t.min=1,t.max=10)),null===t.min&&(t.min=Math.pow(10,Math.floor(Fn(t.max))-1)),null===t.max&&(t.max=0!==t.min?Math.pow(10,Math.floor(Fn(t.min))+1):10),null===t.minNotZero&&(t.min>0?t.minNotZero=t.min:t.max<1?t.minNotZero=Math.pow(10,Math.floor(Fn(t.max))):t.minNotZero=1)},buildTicks:function(){var t=this,e=t.options.ticks,n=!t.isHorizontal(),i={min:On(e.min),max:On(e.max)},a=t.ticks=function(t,e){var n,i,a=[],r=In(t.min,Math.pow(10,Math.floor(Fn(e.min)))),o=Math.floor(Fn(e.max)),s=Math.ceil(e.max/Math.pow(10,o));0===r?(n=Math.floor(Fn(e.minNotZero)),i=Math.floor(e.minNotZero/Math.pow(10,n)),a.push(r),r=i*Math.pow(10,n)):(n=Math.floor(Fn(r)),i=Math.floor(r/Math.pow(10,n)));var l=n<0?Math.pow(10,Math.abs(n)):1;do{a.push(r),10===++i&&(i=1,l=++n>=0?1:l),r=Math.round(i*Math.pow(10,n)*l)/l}while(n<o||n===o&&i<s);var u=In(t.max,r);return a.push(u),a}(i,t);t.max=V.max(a),t.min=V.min(a),e.reverse?(n=!n,t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max),n&&a.reverse()},convertTicksToLabels:function(){this.tickValues=this.ticks.slice(),xn.prototype.convertTicksToLabels.call(this)},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForTick:function(t){var e=this.tickValues;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])},_getFirstTickValue:function(t){var e=Math.floor(Fn(t));return Math.floor(t/Math.pow(10,e))*Math.pow(10,e)},_configure:function(){var t=this,e=t.min,n=0;xn.prototype._configure.call(t),0===e&&(e=t._getFirstTickValue(t.minNotZero),n=In(t.options.ticks.fontSize,z.global.defaultFontSize)/t._length),t._startValue=Fn(e),t._valueOffset=n,t._valueRange=(Fn(t.max)-Fn(e))/(1-n)},getPixelForValue:function(t){var e=this,n=0;return(t=+e.getRightValue(t))>e.min&&t>0&&(n=(Fn(t)-e._startValue)/e._valueRange+e._valueOffset),e.getPixelForDecimal(n)},getValueForPixel:function(t){var e=this,n=e.getDecimalForPixel(t);return 0===n&&0===e.min?0:Math.pow(10,e._startValue+(n-e._valueOffset)*e._valueRange)}}),zn=Ln;Rn._defaults=zn;var Nn=V.valueOrDefault,Bn=V.valueAtIndexOrDefault,En=V.options.resolve,Wn={display:!0,animate:!0,position:"chartArea",angleLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,borderDash:[],borderDashOffset:0},gridLines:{circular:!1},ticks:{showLabelBackdrop:!0,backdropColor:"rgba(255,255,255,0.75)",backdropPaddingY:2,backdropPaddingX:2,callback:rn.formatters.linear},pointLabels:{display:!0,fontSize:10,callback:function(t){return t}}};function Vn(t){var e=t.ticks;return e.display&&t.display?Nn(e.fontSize,z.global.defaultFontSize)+2*e.backdropPaddingY:0}function Hn(t,e,n,i,a){return t===i||t===a?{start:e-n/2,end:e+n/2}:t<i||t>a?{start:e-n,end:e}:{start:e,end:e+n}}function jn(t){return 0===t||180===t?"center":t<180?"left":"right"}function qn(t,e,n,i){var a,r,o=n.y+i/2;if(V.isArray(e))for(a=0,r=e.length;a<r;++a)t.fillText(e[a],n.x,o),o+=i;else t.fillText(e,n.x,o)}function Un(t,e,n){90===t||270===t?n.y-=e.h/2:(t>270||t<90)&&(n.y-=e.h)}function Yn(t){return V.isNumber(t)?t:0}var Gn=Sn.extend({setDimensions:function(){var t=this;t.width=t.maxWidth,t.height=t.maxHeight,t.paddingTop=Vn(t.options)/2,t.xCenter=Math.floor(t.width/2),t.yCenter=Math.floor((t.height-t.paddingTop)/2),t.drawingArea=Math.min(t.height-t.paddingTop,t.width)/2},determineDataLimits:function(){var t=this,e=t.chart,n=Number.POSITIVE_INFINITY,i=Number.NEGATIVE_INFINITY;V.each(e.data.datasets,(function(a,r){if(e.isDatasetVisible(r)){var o=e.getDatasetMeta(r);V.each(a.data,(function(e,a){var r=+t.getRightValue(e);isNaN(r)||o.data[a].hidden||(n=Math.min(r,n),i=Math.max(r,i))}))}})),t.min=n===Number.POSITIVE_INFINITY?0:n,t.max=i===Number.NEGATIVE_INFINITY?0:i,t.handleTickRangeOptions()},_computeTickLimit:function(){return Math.ceil(this.drawingArea/Vn(this.options))},convertTicksToLabels:function(){var t=this;Sn.prototype.convertTicksToLabels.call(t),t.pointLabels=t.chart.data.labels.map((function(){var e=V.callback(t.options.pointLabels.callback,arguments,t);return e||0===e?e:""}))},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},fit:function(){var t=this.options;t.display&&t.pointLabels.display?function(t){var e,n,i,a=V.options._parseFont(t.options.pointLabels),r={l:0,r:t.width,t:0,b:t.height-t.paddingTop},o={};t.ctx.font=a.string,t._pointLabelSizes=[];var s,l,u,d=t.chart.data.labels.length;for(e=0;e<d;e++){i=t.getPointPosition(e,t.drawingArea+5),s=t.ctx,l=a.lineHeight,u=t.pointLabels[e],n=V.isArray(u)?{w:V.longestText(s,s.font,u),h:u.length*l}:{w:s.measureText(u).width,h:l},t._pointLabelSizes[e]=n;var h=t.getIndexAngle(e),c=V.toDegrees(h)%360,f=Hn(c,i.x,n.w,0,180),g=Hn(c,i.y,n.h,90,270);f.start<r.l&&(r.l=f.start,o.l=h),f.end>r.r&&(r.r=f.end,o.r=h),g.start<r.t&&(r.t=g.start,o.t=h),g.end>r.b&&(r.b=g.end,o.b=h)}t.setReductions(t.drawingArea,r,o)}(this):this.setCenterPoint(0,0,0,0)},setReductions:function(t,e,n){var i=this,a=e.l/Math.sin(n.l),r=Math.max(e.r-i.width,0)/Math.sin(n.r),o=-e.t/Math.cos(n.t),s=-Math.max(e.b-(i.height-i.paddingTop),0)/Math.cos(n.b);a=Yn(a),r=Yn(r),o=Yn(o),s=Yn(s),i.drawingArea=Math.min(Math.floor(t-(a+r)/2),Math.floor(t-(o+s)/2)),i.setCenterPoint(a,r,o,s)},setCenterPoint:function(t,e,n,i){var a=this,r=a.width-e-a.drawingArea,o=t+a.drawingArea,s=n+a.drawingArea,l=a.height-a.paddingTop-i-a.drawingArea;a.xCenter=Math.floor((o+r)/2+a.left),a.yCenter=Math.floor((s+l)/2+a.top+a.paddingTop)},getIndexAngle:function(t){var e=this.chart,n=(t*(360/e.data.labels.length)+((e.options||{}).startAngle||0))%360;return(n<0?n+360:n)*Math.PI*2/360},getDistanceFromCenterForValue:function(t){var e=this;if(V.isNullOrUndef(t))return NaN;var n=e.drawingArea/(e.max-e.min);return e.options.ticks.reverse?(e.max-t)*n:(t-e.min)*n},getPointPosition:function(t,e){var n=this.getIndexAngle(t)-Math.PI/2;return{x:Math.cos(n)*e+this.xCenter,y:Math.sin(n)*e+this.yCenter}},getPointPositionForValue:function(t,e){return this.getPointPosition(t,this.getDistanceFromCenterForValue(e))},getBasePosition:function(t){var e=this.min,n=this.max;return this.getPointPositionForValue(t||0,this.beginAtZero?0:e<0&&n<0?n:e>0&&n>0?e:0)},_drawGrid:function(){var t,e,n,i=this,a=i.ctx,r=i.options,o=r.gridLines,s=r.angleLines,l=Nn(s.lineWidth,o.lineWidth),u=Nn(s.color,o.color);if(r.pointLabels.display&&function(t){var e=t.ctx,n=t.options,i=n.pointLabels,a=Vn(n),r=t.getDistanceFromCenterForValue(n.ticks.reverse?t.min:t.max),o=V.options._parseFont(i);e.save(),e.font=o.string,e.textBaseline="middle";for(var s=t.chart.data.labels.length-1;s>=0;s--){var l=0===s?a/2:0,u=t.getPointPosition(s,r+l+5),d=Bn(i.fontColor,s,z.global.defaultFontColor);e.fillStyle=d;var h=t.getIndexAngle(s),c=V.toDegrees(h);e.textAlign=jn(c),Un(c,t._pointLabelSizes[s],u),qn(e,t.pointLabels[s],u,o.lineHeight)}e.restore()}(i),o.display&&V.each(i.ticks,(function(t,n){0!==n&&(e=i.getDistanceFromCenterForValue(i.ticksAsNumbers[n]),function(t,e,n,i){var a,r=t.ctx,o=e.circular,s=t.chart.data.labels.length,l=Bn(e.color,i-1),u=Bn(e.lineWidth,i-1);if((o||s)&&l&&u){if(r.save(),r.strokeStyle=l,r.lineWidth=u,r.setLineDash&&(r.setLineDash(e.borderDash||[]),r.lineDashOffset=e.borderDashOffset||0),r.beginPath(),o)r.arc(t.xCenter,t.yCenter,n,0,2*Math.PI);else{a=t.getPointPosition(0,n),r.moveTo(a.x,a.y);for(var d=1;d<s;d++)a=t.getPointPosition(d,n),r.lineTo(a.x,a.y)}r.closePath(),r.stroke(),r.restore()}}(i,o,e,n))})),s.display&&l&&u){for(a.save(),a.lineWidth=l,a.strokeStyle=u,a.setLineDash&&(a.setLineDash(En([s.borderDash,o.borderDash,[]])),a.lineDashOffset=En([s.borderDashOffset,o.borderDashOffset,0])),t=i.chart.data.labels.length-1;t>=0;t--)e=i.getDistanceFromCenterForValue(r.ticks.reverse?i.min:i.max),n=i.getPointPosition(t,e),a.beginPath(),a.moveTo(i.xCenter,i.yCenter),a.lineTo(n.x,n.y),a.stroke();a.restore()}},_drawLabels:function(){var t=this,e=t.ctx,n=t.options.ticks;if(n.display){var i,a,r=t.getIndexAngle(0),o=V.options._parseFont(n),s=Nn(n.fontColor,z.global.defaultFontColor);e.save(),e.font=o.string,e.translate(t.xCenter,t.yCenter),e.rotate(r),e.textAlign="center",e.textBaseline="middle",V.each(t.ticks,(function(r,l){(0!==l||n.reverse)&&(i=t.getDistanceFromCenterForValue(t.ticksAsNumbers[l]),n.showLabelBackdrop&&(a=e.measureText(r).width,e.fillStyle=n.backdropColor,e.fillRect(-a/2-n.backdropPaddingX,-i-o.size/2-n.backdropPaddingY,a+2*n.backdropPaddingX,o.size+2*n.backdropPaddingY)),e.fillStyle=s,e.fillText(r,0,-i))})),e.restore()}},_drawTitle:V.noop}),Xn=Wn;Gn._defaults=Xn;var Kn=V._deprecated,Zn=V.options.resolve,$n=V.valueOrDefault,Jn=Number.MIN_SAFE_INTEGER||-9007199254740991,Qn=Number.MAX_SAFE_INTEGER||9007199254740991,ti={millisecond:{common:!0,size:1,steps:1e3},second:{common:!0,size:1e3,steps:60},minute:{common:!0,size:6e4,steps:60},hour:{common:!0,size:36e5,steps:24},day:{common:!0,size:864e5,steps:30},week:{common:!1,size:6048e5,steps:4},month:{common:!0,size:2628e6,steps:12},quarter:{common:!1,size:7884e6,steps:4},year:{common:!0,size:3154e7}},ei=Object.keys(ti);function ni(t,e){return t-e}function ii(t){return V.valueOrDefault(t.time.min,t.ticks.min)}function ai(t){return V.valueOrDefault(t.time.max,t.ticks.max)}function ri(t,e,n,i){var a=function(t,e,n){for(var i,a,r,o=0,s=t.length-1;o>=0&&o<=s;){if(a=t[(i=o+s>>1)-1]||null,r=t[i],!a)return{lo:null,hi:r};if(r[e]<n)o=i+1;else{if(!(a[e]>n))return{lo:a,hi:r};s=i-1}}return{lo:r,hi:null}}(t,e,n),r=a.lo?a.hi?a.lo:t[t.length-2]:t[0],o=a.lo?a.hi?a.hi:t[t.length-1]:t[1],s=o[e]-r[e],l=s?(n-r[e])/s:0,u=(o[i]-r[i])*l;return r[i]+u}function oi(t,e){var n=t._adapter,i=t.options.time,a=i.parser,r=a||i.format,o=e;return"function"==typeof a&&(o=a(o)),V.isFinite(o)||(o="string"==typeof r?n.parse(o,r):n.parse(o)),null!==o?+o:(a||"function"!=typeof r||(o=r(e),V.isFinite(o)||(o=n.parse(o))),o)}function si(t,e){if(V.isNullOrUndef(e))return null;var n=t.options.time,i=oi(t,t.getRightValue(e));return null===i?i:(n.round&&(i=+t._adapter.startOf(i,n.round)),i)}function li(t,e,n,i){var a,r,o,s=ei.length;for(a=ei.indexOf(t);a<s-1;++a)if(o=(r=ti[ei[a]]).steps?r.steps:Qn,r.common&&Math.ceil((n-e)/(o*r.size))<=i)return ei[a];return ei[s-1]}function ui(t,e,n){var i,a,r=[],o={},s=e.length;for(i=0;i<s;++i)o[a=e[i]]=i,r.push({value:a,major:!1});return 0!==s&&n?function(t,e,n,i){var a,r,o=t._adapter,s=+o.startOf(e[0].value,i),l=e[e.length-1].value;for(a=s;a<=l;a=+o.add(a,1,i))(r=n[a])>=0&&(e[r].major=!0);return e}(t,r,o,n):r}var di=xn.extend({initialize:function(){this.mergeTicksOptions(),xn.prototype.initialize.call(this)},update:function(){var t=this,e=t.options,n=e.time||(e.time={}),i=t._adapter=new an._date(e.adapters.date);return Kn("time scale",n.format,"time.format","time.parser"),Kn("time scale",n.min,"time.min","ticks.min"),Kn("time scale",n.max,"time.max","ticks.max"),V.mergeIf(n.displayFormats,i.formats()),xn.prototype.update.apply(t,arguments)},getRightValue:function(t){return t&&void 0!==t.t&&(t=t.t),xn.prototype.getRightValue.call(this,t)},determineDataLimits:function(){var t,e,n,i,a,r,o,s=this,l=s.chart,u=s._adapter,d=s.options,h=d.time.unit||"day",c=Qn,f=Jn,g=[],p=[],m=[],v=s._getLabels();for(t=0,n=v.length;t<n;++t)m.push(si(s,v[t]));for(t=0,n=(l.data.datasets||[]).length;t<n;++t)if(l.isDatasetVisible(t))if(a=l.data.datasets[t].data,V.isObject(a[0]))for(p[t]=[],e=0,i=a.length;e<i;++e)r=si(s,a[e]),g.push(r),p[t][e]=r;else p[t]=m.slice(0),o||(g=g.concat(m),o=!0);else p[t]=[];m.length&&(c=Math.min(c,m[0]),f=Math.max(f,m[m.length-1])),g.length&&(g=n>1?function(t){var e,n,i,a={},r=[];for(e=0,n=t.length;e<n;++e)a[i=t[e]]||(a[i]=!0,r.push(i));return r}(g).sort(ni):g.sort(ni),c=Math.min(c,g[0]),f=Math.max(f,g[g.length-1])),c=si(s,ii(d))||c,f=si(s,ai(d))||f,c=c===Qn?+u.startOf(Date.now(),h):c,f=f===Jn?+u.endOf(Date.now(),h)+1:f,s.min=Math.min(c,f),s.max=Math.max(c+1,f),s._table=[],s._timestamps={data:g,datasets:p,labels:m}},buildTicks:function(){var t,e,n,i=this,a=i.min,r=i.max,o=i.options,s=o.ticks,l=o.time,u=i._timestamps,d=[],h=i.getLabelCapacity(a),c=s.source,f=o.distribution;for(u="data"===c||"auto"===c&&"series"===f?u.data:"labels"===c?u.labels:function(t,e,n,i){var a,r=t._adapter,o=t.options,s=o.time,l=s.unit||li(s.minUnit,e,n,i),u=Zn([s.stepSize,s.unitStepSize,1]),d="week"===l&&s.isoWeekday,h=e,c=[];if(d&&(h=+r.startOf(h,"isoWeek",d)),h=+r.startOf(h,d?"day":l),r.diff(n,e,l)>1e5*u)throw e+" and "+n+" are too far apart with stepSize of "+u+" "+l;for(a=h;a<n;a=+r.add(a,u,l))c.push(a);return a!==n&&"ticks"!==o.bounds||c.push(a),c}(i,a,r,h),"ticks"===o.bounds&&u.length&&(a=u[0],r=u[u.length-1]),a=si(i,ii(o))||a,r=si(i,ai(o))||r,t=0,e=u.length;t<e;++t)(n=u[t])>=a&&n<=r&&d.push(n);return i.min=a,i.max=r,i._unit=l.unit||(s.autoSkip?li(l.minUnit,i.min,i.max,h):function(t,e,n,i,a){var r,o;for(r=ei.length-1;r>=ei.indexOf(n);r--)if(o=ei[r],ti[o].common&&t._adapter.diff(a,i,o)>=e-1)return o;return ei[n?ei.indexOf(n):0]}(i,d.length,l.minUnit,i.min,i.max)),i._majorUnit=s.major.enabled&&"year"!==i._unit?function(t){for(var e=ei.indexOf(t)+1,n=ei.length;e<n;++e)if(ti[ei[e]].common)return ei[e]}(i._unit):void 0,i._table=function(t,e,n,i){if("linear"===i||!t.length)return[{time:e,pos:0},{time:n,pos:1}];var a,r,o,s,l,u=[],d=[e];for(a=0,r=t.length;a<r;++a)(s=t[a])>e&&s<n&&d.push(s);for(d.push(n),a=0,r=d.length;a<r;++a)l=d[a+1],o=d[a-1],s=d[a],void 0!==o&&void 0!==l&&Math.round((l+o)/2)===s||u.push({time:s,pos:a/(r-1)});return u}(i._timestamps.data,a,r,f),i._offsets=function(t,e,n,i,a){var r,o,s=0,l=0;return a.offset&&e.length&&(r=ri(t,"time",e[0],"pos"),s=1===e.length?1-r:(ri(t,"time",e[1],"pos")-r)/2,o=ri(t,"time",e[e.length-1],"pos"),l=1===e.length?o:(o-ri(t,"time",e[e.length-2],"pos"))/2),{start:s,end:l,factor:1/(s+1+l)}}(i._table,d,0,0,o),s.reverse&&d.reverse(),ui(i,d,i._majorUnit)},getLabelForIndex:function(t,e){var n=this,i=n._adapter,a=n.chart.data,r=n.options.time,o=a.labels&&t<a.labels.length?a.labels[t]:"",s=a.datasets[e].data[t];return V.isObject(s)&&(o=n.getRightValue(s)),r.tooltipFormat?i.format(oi(n,o),r.tooltipFormat):"string"==typeof o?o:i.format(oi(n,o),r.displayFormats.datetime)},tickFormatFunction:function(t,e,n,i){var a=this._adapter,r=this.options,o=r.time.displayFormats,s=o[this._unit],l=this._majorUnit,u=o[l],d=n[e],h=r.ticks,c=l&&u&&d&&d.major,f=a.format(t,i||(c?u:s)),g=c?h.major:h.minor,p=Zn([g.callback,g.userCallback,h.callback,h.userCallback]);return p?p(f,e,n):f},convertTicksToLabels:function(t){var e,n,i=[];for(e=0,n=t.length;e<n;++e)i.push(this.tickFormatFunction(t[e].value,e,t));return i},getPixelForOffset:function(t){var e=this._offsets,n=ri(this._table,"time",t,"pos");return this.getPixelForDecimal((e.start+n)*e.factor)},getPixelForValue:function(t,e,n){var i=null;if(void 0!==e&&void 0!==n&&(i=this._timestamps.datasets[n][e]),null===i&&(i=si(this,t)),null!==i)return this.getPixelForOffset(i)},getPixelForTick:function(t){var e=this.getTicks();return t>=0&&t<e.length?this.getPixelForOffset(e[t].value):null},getValueForPixel:function(t){var e=this._offsets,n=this.getDecimalForPixel(t)/e.factor-e.end,i=ri(this._table,"pos",n,"time");return this._adapter._create(i)},_getLabelSize:function(t){var e=this.options.ticks,n=this.ctx.measureText(t).width,i=V.toRadians(this.isHorizontal()?e.maxRotation:e.minRotation),a=Math.cos(i),r=Math.sin(i),o=$n(e.fontSize,z.global.defaultFontSize);return{w:n*a+o*r,h:n*r+o*a}},getLabelWidth:function(t){return this._getLabelSize(t).w},getLabelCapacity:function(t){var e=this,n=e.options.time,i=n.displayFormats,a=i[n.unit]||i.millisecond,r=e.tickFormatFunction(t,0,ui(e,[t],e._majorUnit),a),o=e._getLabelSize(r),s=Math.floor(e.isHorizontal()?e.width/o.w:e.height/o.h);return e.options.offset&&s--,s>0?s:1}}),hi={position:"bottom",distribution:"linear",bounds:"data",adapters:{},time:{parser:!1,unit:!1,round:!1,displayFormat:!1,isoWeekday:!1,minUnit:"millisecond",displayFormats:{}},ticks:{autoSkip:!1,source:"auto",major:{enabled:!1}}};di._defaults=hi;var ci={category:_n,linear:Dn,logarithmic:Rn,radialLinear:Gn,time:di},fi={datetime:"MMM D, YYYY, h:mm:ss a",millisecond:"h:mm:ss.SSS a",second:"h:mm:ss a",minute:"h:mm a",hour:"hA",day:"MMM D",week:"ll",month:"MMM YYYY",quarter:"[Q]Q - YYYY",year:"YYYY"};an._date.override("function"==typeof t?{_id:"moment",formats:function(){return fi},parse:function(e,n){return"string"==typeof e&&"string"==typeof n?e=t(e,n):e instanceof t||(e=t(e)),e.isValid()?e.valueOf():null},format:function(e,n){return t(e).format(n)},add:function(e,n,i){return t(e).add(n,i).valueOf()},diff:function(e,n,i){return t(e).diff(t(n),i)},startOf:function(e,n,i){return e=t(e),"isoWeek"===n?e.isoWeekday(i).valueOf():e.startOf(n).valueOf()},endOf:function(e,n){return t(e).endOf(n).valueOf()},_create:function(e){return t(e)}}:{}),z._set("global",{plugins:{filler:{propagate:!0}}});var gi={dataset:function(t){var e=t.fill,n=t.chart,i=n.getDatasetMeta(e),a=i&&n.isDatasetVisible(e)&&i.dataset._children||[],r=a.length||0;return r?function(t,e){return e<r&&a[e]._view||null}:null},boundary:function(t){var e=t.boundary,n=e?e.x:null,i=e?e.y:null;return V.isArray(e)?function(t,n){return e[n]}:function(t){return{x:null===n?t.x:n,y:null===i?t.y:i}}}};function pi(t,e,n){var i,a=t._model||{},r=a.fill;if(void 0===r&&(r=!!a.backgroundColor),!1===r||null===r)return!1;if(!0===r)return"origin";if(i=parseFloat(r,10),isFinite(i)&&Math.floor(i)===i)return"-"!==r[0]&&"+"!==r[0]||(i=e+i),!(i===e||i<0||i>=n)&&i;switch(r){case"bottom":return"start";case"top":return"end";case"zero":return"origin";case"origin":case"start":case"end":return r;default:return!1}}function mi(t){return(t.el._scale||{}).getPointPositionForValue?function(t){var e,n,i,a,r,o=t.el._scale,s=o.options,l=o.chart.data.labels.length,u=t.fill,d=[];if(!l)return null;for(e=s.ticks.reverse?o.max:o.min,n=s.ticks.reverse?o.min:o.max,i=o.getPointPositionForValue(0,e),a=0;a<l;++a)r="start"===u||"end"===u?o.getPointPositionForValue(a,"start"===u?e:n):o.getBasePosition(a),s.gridLines.circular&&(r.cx=i.x,r.cy=i.y,r.angle=o.getIndexAngle(a)-Math.PI/2),d.push(r);return d}(t):function(t){var e,n=t.el._model||{},i=t.el._scale||{},a=t.fill,r=null;if(isFinite(a))return null;if("start"===a?r=void 0===n.scaleBottom?i.bottom:n.scaleBottom:"end"===a?r=void 0===n.scaleTop?i.top:n.scaleTop:void 0!==n.scaleZero?r=n.scaleZero:i.getBasePixel&&(r=i.getBasePixel()),null!=r){if(void 0!==r.x&&void 0!==r.y)return r;if(V.isFinite(r))return{x:(e=i.isHorizontal())?r:null,y:e?null:r}}return null}(t)}function vi(t,e,n){var i,a=t[e].fill,r=[e];if(!n)return a;for(;!1!==a&&-1===r.indexOf(a);){if(!isFinite(a))return a;if(!(i=t[a]))return!1;if(i.visible)return a;r.push(a),a=i.fill}return!1}function bi(t){var e=t.fill,n="dataset";return!1===e?null:(isFinite(e)||(n="boundary"),gi[n](t))}function xi(t){return t&&!t.skip}function yi(t,e,n,i,a){var r,o,s,l;if(i&&a){for(t.moveTo(e[0].x,e[0].y),r=1;r<i;++r)V.canvas.lineTo(t,e[r-1],e[r]);if(void 0===n[0].angle)for(t.lineTo(n[a-1].x,n[a-1].y),r=a-1;r>0;--r)V.canvas.lineTo(t,n[r],n[r-1],!0);else for(o=n[0].cx,s=n[0].cy,l=Math.sqrt(Math.pow(n[0].x-o,2)+Math.pow(n[0].y-s,2)),r=a-1;r>0;--r)t.arc(o,s,l,n[r].angle,n[r-1].angle,!0)}}function _i(t,e,n,i,a,r){var o,s,l,u,d,h,c,f,g=e.length,p=i.spanGaps,m=[],v=[],b=0,x=0;for(t.beginPath(),o=0,s=g;o<s;++o)d=n(u=e[l=o%g]._view,l,i),h=xi(u),c=xi(d),r&&void 0===f&&h&&(s=g+(f=o+1)),h&&c?(b=m.push(u),x=v.push(d)):b&&x&&(p?(h&&m.push(u),c&&v.push(d)):(yi(t,m,v,b,x),b=x=0,m=[],v=[]));yi(t,m,v,b,x),t.closePath(),t.fillStyle=a,t.fill()}var ki={id:"filler",afterDatasetsUpdate:function(t,e){var n,i,a,r,o=(t.data.datasets||[]).length,s=e.propagate,l=[];for(i=0;i<o;++i)r=null,(a=(n=t.getDatasetMeta(i)).dataset)&&a._model&&a instanceof _t.Line&&(r={visible:t.isDatasetVisible(i),fill:pi(a,i,o),chart:t,el:a}),n.$filler=r,l.push(r);for(i=0;i<o;++i)(r=l[i])&&(r.fill=vi(l,i,s),r.boundary=mi(r),r.mapper=bi(r))},beforeDatasetsDraw:function(t){var e,n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas(),u=t.ctx;for(n=l.length-1;n>=0;--n)(e=l[n].$filler)&&e.visible&&(a=(i=e.el)._view,r=i._children||[],o=e.mapper,s=a.backgroundColor||z.global.defaultColor,o&&s&&r.length&&(V.canvas.clipArea(u,t.chartArea),_i(u,r,o,a,s,i._loop),V.canvas.unclipArea(u)))}},wi=V.rtl.getRtlAdapter,Mi=V.noop,Si=V.valueOrDefault;function Ci(t,e){return t.usePointStyle&&t.boxWidth>e?e:t.boxWidth}z._set("global",{legend:{display:!0,position:"top",align:"center",fullWidth:!0,reverse:!1,weight:1e3,onClick:function(t,e){var n=e.datasetIndex,i=this.chart,a=i.getDatasetMeta(n);a.hidden=null===a.hidden?!i.data.datasets[n].hidden:null,i.update()},onHover:null,onLeave:null,labels:{boxWidth:40,padding:10,generateLabels:function(t){var e=t.data.datasets,n=t.options.legend||{},i=n.labels&&n.labels.usePointStyle;return t._getSortedDatasetMetas().map((function(n){var a=n.controller.getStyle(i?0:void 0);return{text:e[n.index].label,fillStyle:a.backgroundColor,hidden:!t.isDatasetVisible(n.index),lineCap:a.borderCapStyle,lineDash:a.borderDash,lineDashOffset:a.borderDashOffset,lineJoin:a.borderJoinStyle,lineWidth:a.borderWidth,strokeStyle:a.borderColor,pointStyle:a.pointStyle,rotation:a.rotation,datasetIndex:n.index}}),this)}}},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data.datasets;for(a.setAttribute("class",t.id+"-legend"),e=0,n=r.length;e<n;e++)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=r[e].backgroundColor,r[e].label&&i.appendChild(document.createTextNode(r[e].label));return a.outerHTML}});var Pi=X.extend({initialize:function(t){V.extend(this,t),this.legendHitBoxes=[],this._hoveredItem=null,this.doughnutMode=!1},beforeUpdate:Mi,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Mi,beforeSetDimensions:Mi,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Mi,beforeBuildLabels:Mi,buildLabels:function(){var t=this,e=t.options.labels||{},n=V.callback(e.generateLabels,[t.chart],t)||[];e.filter&&(n=n.filter((function(n){return e.filter(n,t.chart.data)}))),t.options.reverse&&n.reverse(),t.legendItems=n},afterBuildLabels:Mi,beforeFit:Mi,fit:function(){var t=this,e=t.options,n=e.labels,i=e.display,a=t.ctx,r=V.options._parseFont(n),o=r.size,s=t.legendHitBoxes=[],l=t.minSize,u=t.isHorizontal();if(u?(l.width=t.maxWidth,l.height=i?10:0):(l.width=i?10:0,l.height=t.maxHeight),i){if(a.font=r.string,u){var d=t.lineWidths=[0],h=0;a.textAlign="left",a.textBaseline="middle",V.each(t.legendItems,(function(t,e){var i=Ci(n,o)+o/2+a.measureText(t.text).width;(0===e||d[d.length-1]+i+2*n.padding>l.width)&&(h+=o+n.padding,d[d.length-(e>0?0:1)]=0),s[e]={left:0,top:0,width:i,height:o},d[d.length-1]+=i+n.padding})),l.height+=h}else{var c=n.padding,f=t.columnWidths=[],g=t.columnHeights=[],p=n.padding,m=0,v=0;V.each(t.legendItems,(function(t,e){var i=Ci(n,o)+o/2+a.measureText(t.text).width;e>0&&v+o+2*c>l.height&&(p+=m+n.padding,f.push(m),g.push(v),m=0,v=0),m=Math.max(m,i),v+=o+c,s[e]={left:0,top:0,width:i,height:o}})),p+=m,f.push(m),g.push(v),l.width+=p}t.width=l.width,t.height=l.height}else t.width=l.width=t.height=l.height=0},afterFit:Mi,isHorizontal:function(){return"top"===this.options.position||"bottom"===this.options.position},draw:function(){var t=this,e=t.options,n=e.labels,i=z.global,a=i.defaultColor,r=i.elements.line,o=t.height,s=t.columnHeights,l=t.width,u=t.lineWidths;if(e.display){var d,h=wi(e.rtl,t.left,t.minSize.width),c=t.ctx,f=Si(n.fontColor,i.defaultFontColor),g=V.options._parseFont(n),p=g.size;c.textAlign=h.textAlign("left"),c.textBaseline="middle",c.lineWidth=.5,c.strokeStyle=f,c.fillStyle=f,c.font=g.string;var m=Ci(n,p),v=t.legendHitBoxes,b=function(t,i){switch(e.align){case"start":return n.padding;case"end":return t-i;default:return(t-i+n.padding)/2}},x=t.isHorizontal();d=x?{x:t.left+b(l,u[0]),y:t.top+n.padding,line:0}:{x:t.left+n.padding,y:t.top+b(o,s[0]),line:0},V.rtl.overrideTextDirection(t.ctx,e.textDirection);var y=p+n.padding;V.each(t.legendItems,(function(e,i){var f=c.measureText(e.text).width,g=m+p/2+f,_=d.x,k=d.y;h.setWidth(t.minSize.width),x?i>0&&_+g+n.padding>t.left+t.minSize.width&&(k=d.y+=y,d.line++,_=d.x=t.left+b(l,u[d.line])):i>0&&k+y>t.top+t.minSize.height&&(_=d.x=_+t.columnWidths[d.line]+n.padding,d.line++,k=d.y=t.top+b(o,s[d.line]));var w=h.x(_);!function(t,e,i){if(!(isNaN(m)||m<=0)){c.save();var o=Si(i.lineWidth,r.borderWidth);if(c.fillStyle=Si(i.fillStyle,a),c.lineCap=Si(i.lineCap,r.borderCapStyle),c.lineDashOffset=Si(i.lineDashOffset,r.borderDashOffset),c.lineJoin=Si(i.lineJoin,r.borderJoinStyle),c.lineWidth=o,c.strokeStyle=Si(i.strokeStyle,a),c.setLineDash&&c.setLineDash(Si(i.lineDash,r.borderDash)),n&&n.usePointStyle){var s=m*Math.SQRT2/2,l=h.xPlus(t,m/2),u=e+p/2;V.canvas.drawPoint(c,i.pointStyle,s,l,u,i.rotation)}else c.fillRect(h.leftForLtr(t,m),e,m,p),0!==o&&c.strokeRect(h.leftForLtr(t,m),e,m,p);c.restore()}}(w,k,e),v[i].left=h.leftForLtr(w,v[i].width),v[i].top=k,function(t,e,n,i){var a=p/2,r=h.xPlus(t,m+a),o=e+a;c.fillText(n.text,r,o),n.hidden&&(c.beginPath(),c.lineWidth=2,c.moveTo(r,o),c.lineTo(h.xPlus(r,i),o),c.stroke())}(w,k,e,f),x?d.x+=g+n.padding:d.y+=y})),V.rtl.restoreTextDirection(t.ctx,e.textDirection)}},_getLegendItemAt:function(t,e){var n,i,a,r=this;if(t>=r.left&&t<=r.right&&e>=r.top&&e<=r.bottom)for(a=r.legendHitBoxes,n=0;n<a.length;++n)if(t>=(i=a[n]).left&&t<=i.left+i.width&&e>=i.top&&e<=i.top+i.height)return r.legendItems[n];return null},handleEvent:function(t){var e,n=this,i=n.options,a="mouseup"===t.type?"click":t.type;if("mousemove"===a){if(!i.onHover&&!i.onLeave)return}else{if("click"!==a)return;if(!i.onClick)return}e=n._getLegendItemAt(t.x,t.y),"click"===a?e&&i.onClick&&i.onClick.call(n,t.native,e):(i.onLeave&&e!==n._hoveredItem&&(n._hoveredItem&&i.onLeave.call(n,t.native,n._hoveredItem),n._hoveredItem=e),i.onHover&&e&&i.onHover.call(n,t.native,e))}});function Ai(t,e){var n=new Pi({ctx:t.ctx,options:e,chart:t});ge.configure(t,n,e),ge.addBox(t,n),t.legend=n}var Di={id:"legend",_element:Pi,beforeInit:function(t){var e=t.options.legend;e&&Ai(t,e)},beforeUpdate:function(t){var e=t.options.legend,n=t.legend;e?(V.mergeIf(e,z.global.legend),n?(ge.configure(t,n,e),n.options=e):Ai(t,e)):n&&(ge.removeBox(t,n),delete t.legend)},afterEvent:function(t,e){var n=t.legend;n&&n.handleEvent(e)}},Ti=V.noop;z._set("global",{title:{display:!1,fontStyle:"bold",fullWidth:!0,padding:10,position:"top",text:"",weight:2e3}});var Ii=X.extend({initialize:function(t){V.extend(this,t),this.legendHitBoxes=[]},beforeUpdate:Ti,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Ti,beforeSetDimensions:Ti,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Ti,beforeBuildLabels:Ti,buildLabels:Ti,afterBuildLabels:Ti,beforeFit:Ti,fit:function(){var t,e=this,n=e.options,i=e.minSize={},a=e.isHorizontal();n.display?(t=(V.isArray(n.text)?n.text.length:1)*V.options._parseFont(n).lineHeight+2*n.padding,e.width=i.width=a?e.maxWidth:t,e.height=i.height=a?t:e.maxHeight):e.width=i.width=e.height=i.height=0},afterFit:Ti,isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},draw:function(){var t=this,e=t.ctx,n=t.options;if(n.display){var i,a,r,o=V.options._parseFont(n),s=o.lineHeight,l=s/2+n.padding,u=0,d=t.top,h=t.left,c=t.bottom,f=t.right;e.fillStyle=V.valueOrDefault(n.fontColor,z.global.defaultFontColor),e.font=o.string,t.isHorizontal()?(a=h+(f-h)/2,r=d+l,i=f-h):(a="left"===n.position?h+l:f-l,r=d+(c-d)/2,i=c-d,u=Math.PI*("left"===n.position?-.5:.5)),e.save(),e.translate(a,r),e.rotate(u),e.textAlign="center",e.textBaseline="middle";var g=n.text;if(V.isArray(g))for(var p=0,m=0;m<g.length;++m)e.fillText(g[m],0,p,i),p+=s;else e.fillText(g,0,0,i);e.restore()}}});function Fi(t,e){var n=new Ii({ctx:t.ctx,options:e,chart:t});ge.configure(t,n,e),ge.addBox(t,n),t.titleBlock=n}var Li={},Oi=ki,Ri=Di,zi={id:"title",_element:Ii,beforeInit:function(t){var e=t.options.title;e&&Fi(t,e)},beforeUpdate:function(t){var e=t.options.title,n=t.titleBlock;e?(V.mergeIf(e,z.global.title),n?(ge.configure(t,n,e),n.options=e):Fi(t,e)):n&&(ge.removeBox(t,n),delete t.titleBlock)}};for(var Ni in Li.filler=Oi,Li.legend=Ri,Li.title=zi,tn.helpers=V,function(){function t(t,e,n){var i;return"string"==typeof t?(i=parseInt(t,10),-1!==t.indexOf("%")&&(i=i/100*e.parentNode[n])):i=t,i}function e(t){return null!=t&&"none"!==t}function n(n,i,a){var r=document.defaultView,o=V._getParentNode(n),s=r.getComputedStyle(n)[i],l=r.getComputedStyle(o)[i],u=e(s),d=e(l),h=Number.POSITIVE_INFINITY;return u||d?Math.min(u?t(s,n,a):h,d?t(l,o,a):h):"none"}V.where=function(t,e){if(V.isArray(t)&&Array.prototype.filter)return t.filter(e);var n=[];return V.each(t,(function(t){e(t)&&n.push(t)})),n},V.findIndex=Array.prototype.findIndex?function(t,e,n){return t.findIndex(e,n)}:function(t,e,n){n=void 0===n?t:n;for(var i=0,a=t.length;i<a;++i)if(e.call(n,t[i],i,t))return i;return-1},V.findNextWhere=function(t,e,n){V.isNullOrUndef(n)&&(n=-1);for(var i=n+1;i<t.length;i++){var a=t[i];if(e(a))return a}},V.findPreviousWhere=function(t,e,n){V.isNullOrUndef(n)&&(n=t.length);for(var i=n-1;i>=0;i--){var a=t[i];if(e(a))return a}},V.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},V.almostEquals=function(t,e,n){return Math.abs(t-e)<n},V.almostWhole=function(t,e){var n=Math.round(t);return n-e<=t&&n+e>=t},V.max=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.max(t,e)}),Number.NEGATIVE_INFINITY)},V.min=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.min(t,e)}),Number.POSITIVE_INFINITY)},V.sign=Math.sign?function(t){return Math.sign(t)}:function(t){return 0===(t=+t)||isNaN(t)?t:t>0?1:-1},V.toRadians=function(t){return t*(Math.PI/180)},V.toDegrees=function(t){return t*(180/Math.PI)},V._decimalPlaces=function(t){if(V.isFinite(t)){for(var e=1,n=0;Math.round(t*e)/e!==t;)e*=10,n++;return n}},V.getAngleFromPoint=function(t,e){var n=e.x-t.x,i=e.y-t.y,a=Math.sqrt(n*n+i*i),r=Math.atan2(i,n);return r<-.5*Math.PI&&(r+=2*Math.PI),{angle:r,distance:a}},V.distanceBetweenPoints=function(t,e){return Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2))},V.aliasPixel=function(t){return t%2==0?0:.5},V._alignPixel=function(t,e,n){var i=t.currentDevicePixelRatio,a=n/2;return Math.round((e-a)*i)/i+a},V.splineCurve=function(t,e,n,i){var a=t.skip?e:t,r=e,o=n.skip?e:n,s=Math.sqrt(Math.pow(r.x-a.x,2)+Math.pow(r.y-a.y,2)),l=Math.sqrt(Math.pow(o.x-r.x,2)+Math.pow(o.y-r.y,2)),u=s/(s+l),d=l/(s+l),h=i*(u=isNaN(u)?0:u),c=i*(d=isNaN(d)?0:d);return{previous:{x:r.x-h*(o.x-a.x),y:r.y-h*(o.y-a.y)},next:{x:r.x+c*(o.x-a.x),y:r.y+c*(o.y-a.y)}}},V.EPSILON=Number.EPSILON||1e-14,V.splineCurveMonotone=function(t){var e,n,i,a,r,o,s,l,u,d=(t||[]).map((function(t){return{model:t._model,deltaK:0,mK:0}})),h=d.length;for(e=0;e<h;++e)if(!(i=d[e]).model.skip){if(n=e>0?d[e-1]:null,(a=e<h-1?d[e+1]:null)&&!a.model.skip){var c=a.model.x-i.model.x;i.deltaK=0!==c?(a.model.y-i.model.y)/c:0}!n||n.model.skip?i.mK=i.deltaK:!a||a.model.skip?i.mK=n.deltaK:this.sign(n.deltaK)!==this.sign(i.deltaK)?i.mK=0:i.mK=(n.deltaK+i.deltaK)/2}for(e=0;e<h-1;++e)i=d[e],a=d[e+1],i.model.skip||a.model.skip||(V.almostEquals(i.deltaK,0,this.EPSILON)?i.mK=a.mK=0:(r=i.mK/i.deltaK,o=a.mK/i.deltaK,(l=Math.pow(r,2)+Math.pow(o,2))<=9||(s=3/Math.sqrt(l),i.mK=r*s*i.deltaK,a.mK=o*s*i.deltaK)));for(e=0;e<h;++e)(i=d[e]).model.skip||(n=e>0?d[e-1]:null,a=e<h-1?d[e+1]:null,n&&!n.model.skip&&(u=(i.model.x-n.model.x)/3,i.model.controlPointPreviousX=i.model.x-u,i.model.controlPointPreviousY=i.model.y-u*i.mK),a&&!a.model.skip&&(u=(a.model.x-i.model.x)/3,i.model.controlPointNextX=i.model.x+u,i.model.controlPointNextY=i.model.y+u*i.mK))},V.nextItem=function(t,e,n){return n?e>=t.length-1?t[0]:t[e+1]:e>=t.length-1?t[t.length-1]:t[e+1]},V.previousItem=function(t,e,n){return n?e<=0?t[t.length-1]:t[e-1]:e<=0?t[0]:t[e-1]},V.niceNum=function(t,e){var n=Math.floor(V.log10(t)),i=t/Math.pow(10,n);return(e?i<1.5?1:i<3?2:i<7?5:10:i<=1?1:i<=2?2:i<=5?5:10)*Math.pow(10,n)},V.requestAnimFrame="undefined"==typeof window?function(t){t()}:window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)},V.getRelativePosition=function(t,e){var n,i,a=t.originalEvent||t,r=t.target||t.srcElement,o=r.getBoundingClientRect(),s=a.touches;s&&s.length>0?(n=s[0].clientX,i=s[0].clientY):(n=a.clientX,i=a.clientY);var l=parseFloat(V.getStyle(r,"padding-left")),u=parseFloat(V.getStyle(r,"padding-top")),d=parseFloat(V.getStyle(r,"padding-right")),h=parseFloat(V.getStyle(r,"padding-bottom")),c=o.right-o.left-l-d,f=o.bottom-o.top-u-h;return{x:n=Math.round((n-o.left-l)/c*r.width/e.currentDevicePixelRatio),y:i=Math.round((i-o.top-u)/f*r.height/e.currentDevicePixelRatio)}},V.getConstraintWidth=function(t){return n(t,"max-width","clientWidth")},V.getConstraintHeight=function(t){return n(t,"max-height","clientHeight")},V._calculatePadding=function(t,e,n){return(e=V.getStyle(t,e)).indexOf("%")>-1?n*parseInt(e,10)/100:parseInt(e,10)},V._getParentNode=function(t){var e=t.parentNode;return e&&"[object ShadowRoot]"===e.toString()&&(e=e.host),e},V.getMaximumWidth=function(t){var e=V._getParentNode(t);if(!e)return t.clientWidth;var n=e.clientWidth,i=n-V._calculatePadding(e,"padding-left",n)-V._calculatePadding(e,"padding-right",n),a=V.getConstraintWidth(t);return isNaN(a)?i:Math.min(i,a)},V.getMaximumHeight=function(t){var e=V._getParentNode(t);if(!e)return t.clientHeight;var n=e.clientHeight,i=n-V._calculatePadding(e,"padding-top",n)-V._calculatePadding(e,"padding-bottom",n),a=V.getConstraintHeight(t);return isNaN(a)?i:Math.min(i,a)},V.getStyle=function(t,e){return t.currentStyle?t.currentStyle[e]:document.defaultView.getComputedStyle(t,null).getPropertyValue(e)},V.retinaScale=function(t,e){var n=t.currentDevicePixelRatio=e||"undefined"!=typeof window&&window.devicePixelRatio||1;if(1!==n){var i=t.canvas,a=t.height,r=t.width;i.height=a*n,i.width=r*n,t.ctx.scale(n,n),i.style.height||i.style.width||(i.style.height=a+"px",i.style.width=r+"px")}},V.fontString=function(t,e,n){return e+" "+t+"px "+n},V.longestText=function(t,e,n,i){var a=(i=i||{}).data=i.data||{},r=i.garbageCollect=i.garbageCollect||[];i.font!==e&&(a=i.data={},r=i.garbageCollect=[],i.font=e),t.font=e;var o,s,l,u,d,h=0,c=n.length;for(o=0;o<c;o++)if(null!=(u=n[o])&&!0!==V.isArray(u))h=V.measureText(t,a,r,h,u);else if(V.isArray(u))for(s=0,l=u.length;s<l;s++)null==(d=u[s])||V.isArray(d)||(h=V.measureText(t,a,r,h,d));var f=r.length/2;if(f>n.length){for(o=0;o<f;o++)delete a[r[o]];r.splice(0,f)}return h},V.measureText=function(t,e,n,i,a){var r=e[a];return r||(r=e[a]=t.measureText(a).width,n.push(a)),r>i&&(i=r),i},V.numberOfLabelLines=function(t){var e=1;return V.each(t,(function(t){V.isArray(t)&&t.length>e&&(e=t.length)})),e},V.color=k?function(t){return t instanceof CanvasGradient&&(t=z.global.defaultColor),k(t)}:function(t){return console.error("Color.js not found!"),t},V.getHoverColor=function(t){return t instanceof CanvasPattern||t instanceof CanvasGradient?t:V.color(t).saturate(.5).darken(.1).rgbString()}}(),tn._adapters=an,tn.Animation=Z,tn.animationService=$,tn.controllers=$t,tn.DatasetController=nt,tn.defaults=z,tn.Element=X,tn.elements=_t,tn.Interaction=ae,tn.layouts=ge,tn.platform=Fe,tn.plugins=Le,tn.Scale=xn,tn.scaleService=Oe,tn.Ticks=rn,tn.Tooltip=Ue,tn.helpers.each(ci,(function(t,e){tn.scaleService.registerScaleType(e,t,t._defaults)})),Li)Li.hasOwnProperty(Ni)&&tn.plugins.register(Li[Ni]);tn.platform.initialize();var Bi=tn;return"undefined"!=typeof window&&(window.Chart=tn),tn.Chart=tn,tn.Legend=Li.legend._element,tn.Title=Li.title._element,tn.pluginService=tn.plugins,tn.PluginBase=tn.Element.extend({}),tn.canvasHelpers=tn.helpers.canvas,tn.layoutService=tn.layouts,tn.LinearScaleBase=Sn,tn.helpers.each(["Bar","Bubble","Doughnut","Line","PolarArea","Radar","Scatter"],(function(t){tn[t]=function(e,n){return new tn(e,tn.helpers.merge(n||{},{type:t.charAt(0).toLowerCase()+t.slice(1)}))}})),Bi}));
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(function(){try{return require("moment")}catch(t){}}()):"function"==typeof define&&define.amd?define(["require"],(function(t){return e(function(){try{return t("moment")}catch(t){}}())})):(t=t||self).Chart=e(t.moment)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var e={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},n=function(t,e){return t(e={exports:{}},e.exports),e.exports}((function(t){var n={};for(var i in e)e.hasOwnProperty(i)&&(n[e[i]]=i);var a=t.exports={rgb:{channels:3,labels:"rgb"},hsl:{channels:3,labels:"hsl"},hsv:{channels:3,labels:"hsv"},hwb:{channels:3,labels:"hwb"},cmyk:{channels:4,labels:"cmyk"},xyz:{channels:3,labels:"xyz"},lab:{channels:3,labels:"lab"},lch:{channels:3,labels:"lch"},hex:{channels:1,labels:["hex"]},keyword:{channels:1,labels:["keyword"]},ansi16:{channels:1,labels:["ansi16"]},ansi256:{channels:1,labels:["ansi256"]},hcg:{channels:3,labels:["h","c","g"]},apple:{channels:3,labels:["r16","g16","b16"]},gray:{channels:1,labels:["gray"]}};for(var r in a)if(a.hasOwnProperty(r)){if(!("channels"in a[r]))throw new Error("missing channels property: "+r);if(!("labels"in a[r]))throw new Error("missing channel labels property: "+r);if(a[r].labels.length!==a[r].channels)throw new Error("channel and label counts mismatch: "+r);var o=a[r].channels,s=a[r].labels;delete a[r].channels,delete a[r].labels,Object.defineProperty(a[r],"channels",{value:o}),Object.defineProperty(a[r],"labels",{value:s})}a.rgb.hsl=function(t){var e,n,i=t[0]/255,a=t[1]/255,r=t[2]/255,o=Math.min(i,a,r),s=Math.max(i,a,r),l=s-o;return s===o?e=0:i===s?e=(a-r)/l:a===s?e=2+(r-i)/l:r===s&&(e=4+(i-a)/l),(e=Math.min(60*e,360))<0&&(e+=360),n=(o+s)/2,[e,100*(s===o?0:n<=.5?l/(s+o):l/(2-s-o)),100*n]},a.rgb.hsv=function(t){var e,n,i,a,r,o=t[0]/255,s=t[1]/255,l=t[2]/255,u=Math.max(o,s,l),d=u-Math.min(o,s,l),h=function(t){return(u-t)/6/d+.5};return 0===d?a=r=0:(r=d/u,e=h(o),n=h(s),i=h(l),o===u?a=i-n:s===u?a=1/3+e-i:l===u&&(a=2/3+n-e),a<0?a+=1:a>1&&(a-=1)),[360*a,100*r,100*u]},a.rgb.hwb=function(t){var e=t[0],n=t[1],i=t[2];return[a.rgb.hsl(t)[0],100*(1/255*Math.min(e,Math.min(n,i))),100*(i=1-1/255*Math.max(e,Math.max(n,i)))]},a.rgb.cmyk=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255;return[100*((1-n-(e=Math.min(1-n,1-i,1-a)))/(1-e)||0),100*((1-i-e)/(1-e)||0),100*((1-a-e)/(1-e)||0),100*e]},a.rgb.keyword=function(t){var i=n[t];if(i)return i;var a,r,o,s=1/0;for(var l in e)if(e.hasOwnProperty(l)){var u=e[l],d=(r=t,o=u,Math.pow(r[0]-o[0],2)+Math.pow(r[1]-o[1],2)+Math.pow(r[2]-o[2],2));d<s&&(s=d,a=l)}return a},a.keyword.rgb=function(t){return e[t]},a.rgb.xyz=function(t){var e=t[0]/255,n=t[1]/255,i=t[2]/255;return[100*(.4124*(e=e>.04045?Math.pow((e+.055)/1.055,2.4):e/12.92)+.3576*(n=n>.04045?Math.pow((n+.055)/1.055,2.4):n/12.92)+.1805*(i=i>.04045?Math.pow((i+.055)/1.055,2.4):i/12.92)),100*(.2126*e+.7152*n+.0722*i),100*(.0193*e+.1192*n+.9505*i)]},a.rgb.lab=function(t){var e=a.rgb.xyz(t),n=e[0],i=e[1],r=e[2];return i/=100,r/=108.883,n=(n/=95.047)>.008856?Math.pow(n,1/3):7.787*n+16/116,[116*(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116)-16,500*(n-i),200*(i-(r=r>.008856?Math.pow(r,1/3):7.787*r+16/116))]},a.hsl.rgb=function(t){var e,n,i,a,r,o=t[0]/360,s=t[1]/100,l=t[2]/100;if(0===s)return[r=255*l,r,r];e=2*l-(n=l<.5?l*(1+s):l+s-l*s),a=[0,0,0];for(var u=0;u<3;u++)(i=o+1/3*-(u-1))<0&&i++,i>1&&i--,r=6*i<1?e+6*(n-e)*i:2*i<1?n:3*i<2?e+(n-e)*(2/3-i)*6:e,a[u]=255*r;return a},a.hsl.hsv=function(t){var e=t[0],n=t[1]/100,i=t[2]/100,a=n,r=Math.max(i,.01);return n*=(i*=2)<=1?i:2-i,a*=r<=1?r:2-r,[e,100*(0===i?2*a/(r+a):2*n/(i+n)),100*((i+n)/2)]},a.hsv.rgb=function(t){var e=t[0]/60,n=t[1]/100,i=t[2]/100,a=Math.floor(e)%6,r=e-Math.floor(e),o=255*i*(1-n),s=255*i*(1-n*r),l=255*i*(1-n*(1-r));switch(i*=255,a){case 0:return[i,l,o];case 1:return[s,i,o];case 2:return[o,i,l];case 3:return[o,s,i];case 4:return[l,o,i];case 5:return[i,o,s]}},a.hsv.hsl=function(t){var e,n,i,a=t[0],r=t[1]/100,o=t[2]/100,s=Math.max(o,.01);return i=(2-r)*o,n=r*s,[a,100*(n=(n/=(e=(2-r)*s)<=1?e:2-e)||0),100*(i/=2)]},a.hwb.rgb=function(t){var e,n,i,a,r,o,s,l=t[0]/360,u=t[1]/100,d=t[2]/100,h=u+d;switch(h>1&&(u/=h,d/=h),i=6*l-(e=Math.floor(6*l)),0!=(1&e)&&(i=1-i),a=u+i*((n=1-d)-u),e){default:case 6:case 0:r=n,o=a,s=u;break;case 1:r=a,o=n,s=u;break;case 2:r=u,o=n,s=a;break;case 3:r=u,o=a,s=n;break;case 4:r=a,o=u,s=n;break;case 5:r=n,o=u,s=a}return[255*r,255*o,255*s]},a.cmyk.rgb=function(t){var e=t[0]/100,n=t[1]/100,i=t[2]/100,a=t[3]/100;return[255*(1-Math.min(1,e*(1-a)+a)),255*(1-Math.min(1,n*(1-a)+a)),255*(1-Math.min(1,i*(1-a)+a))]},a.xyz.rgb=function(t){var e,n,i,a=t[0]/100,r=t[1]/100,o=t[2]/100;return n=-.9689*a+1.8758*r+.0415*o,i=.0557*a+-.204*r+1.057*o,e=(e=3.2406*a+-1.5372*r+-.4986*o)>.0031308?1.055*Math.pow(e,1/2.4)-.055:12.92*e,n=n>.0031308?1.055*Math.pow(n,1/2.4)-.055:12.92*n,i=i>.0031308?1.055*Math.pow(i,1/2.4)-.055:12.92*i,[255*(e=Math.min(Math.max(0,e),1)),255*(n=Math.min(Math.max(0,n),1)),255*(i=Math.min(Math.max(0,i),1))]},a.xyz.lab=function(t){var e=t[0],n=t[1],i=t[2];return n/=100,i/=108.883,e=(e/=95.047)>.008856?Math.pow(e,1/3):7.787*e+16/116,[116*(n=n>.008856?Math.pow(n,1/3):7.787*n+16/116)-16,500*(e-n),200*(n-(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116))]},a.lab.xyz=function(t){var e,n,i,a=t[0];e=t[1]/500+(n=(a+16)/116),i=n-t[2]/200;var r=Math.pow(n,3),o=Math.pow(e,3),s=Math.pow(i,3);return n=r>.008856?r:(n-16/116)/7.787,e=o>.008856?o:(e-16/116)/7.787,i=s>.008856?s:(i-16/116)/7.787,[e*=95.047,n*=100,i*=108.883]},a.lab.lch=function(t){var e,n=t[0],i=t[1],a=t[2];return(e=360*Math.atan2(a,i)/2/Math.PI)<0&&(e+=360),[n,Math.sqrt(i*i+a*a),e]},a.lch.lab=function(t){var e,n=t[0],i=t[1];return e=t[2]/360*2*Math.PI,[n,i*Math.cos(e),i*Math.sin(e)]},a.rgb.ansi16=function(t){var e=t[0],n=t[1],i=t[2],r=1 in arguments?arguments[1]:a.rgb.hsv(t)[2];if(0===(r=Math.round(r/50)))return 30;var o=30+(Math.round(i/255)<<2|Math.round(n/255)<<1|Math.round(e/255));return 2===r&&(o+=60),o},a.hsv.ansi16=function(t){return a.rgb.ansi16(a.hsv.rgb(t),t[2])},a.rgb.ansi256=function(t){var e=t[0],n=t[1],i=t[2];return e===n&&n===i?e<8?16:e>248?231:Math.round((e-8)/247*24)+232:16+36*Math.round(e/255*5)+6*Math.round(n/255*5)+Math.round(i/255*5)},a.ansi16.rgb=function(t){var e=t%10;if(0===e||7===e)return t>50&&(e+=3.5),[e=e/10.5*255,e,e];var n=.5*(1+~~(t>50));return[(1&e)*n*255,(e>>1&1)*n*255,(e>>2&1)*n*255]},a.ansi256.rgb=function(t){if(t>=232){var e=10*(t-232)+8;return[e,e,e]}var n;return t-=16,[Math.floor(t/36)/5*255,Math.floor((n=t%36)/6)/5*255,n%6/5*255]},a.rgb.hex=function(t){var e=(((255&Math.round(t[0]))<<16)+((255&Math.round(t[1]))<<8)+(255&Math.round(t[2]))).toString(16).toUpperCase();return"000000".substring(e.length)+e},a.hex.rgb=function(t){var e=t.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);if(!e)return[0,0,0];var n=e[0];3===e[0].length&&(n=n.split("").map((function(t){return t+t})).join(""));var i=parseInt(n,16);return[i>>16&255,i>>8&255,255&i]},a.rgb.hcg=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255,r=Math.max(Math.max(n,i),a),o=Math.min(Math.min(n,i),a),s=r-o;return e=s<=0?0:r===n?(i-a)/s%6:r===i?2+(a-n)/s:4+(n-i)/s+4,e/=6,[360*(e%=1),100*s,100*(s<1?o/(1-s):0)]},a.hsl.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=1,a=0;return(i=n<.5?2*e*n:2*e*(1-n))<1&&(a=(n-.5*i)/(1-i)),[t[0],100*i,100*a]},a.hsv.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=e*n,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.hcg.rgb=function(t){var e=t[0]/360,n=t[1]/100,i=t[2]/100;if(0===n)return[255*i,255*i,255*i];var a,r=[0,0,0],o=e%1*6,s=o%1,l=1-s;switch(Math.floor(o)){case 0:r[0]=1,r[1]=s,r[2]=0;break;case 1:r[0]=l,r[1]=1,r[2]=0;break;case 2:r[0]=0,r[1]=1,r[2]=s;break;case 3:r[0]=0,r[1]=l,r[2]=1;break;case 4:r[0]=s,r[1]=0,r[2]=1;break;default:r[0]=1,r[1]=0,r[2]=l}return a=(1-n)*i,[255*(n*r[0]+a),255*(n*r[1]+a),255*(n*r[2]+a)]},a.hcg.hsv=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e),i=0;return n>0&&(i=e/n),[t[0],100*i,100*n]},a.hcg.hsl=function(t){var e=t[1]/100,n=t[2]/100*(1-e)+.5*e,i=0;return n>0&&n<.5?i=e/(2*n):n>=.5&&n<1&&(i=e/(2*(1-n))),[t[0],100*i,100*n]},a.hcg.hwb=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e);return[t[0],100*(n-e),100*(1-n)]},a.hwb.hcg=function(t){var e=t[1]/100,n=1-t[2]/100,i=n-e,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.apple.rgb=function(t){return[t[0]/65535*255,t[1]/65535*255,t[2]/65535*255]},a.rgb.apple=function(t){return[t[0]/255*65535,t[1]/255*65535,t[2]/255*65535]},a.gray.rgb=function(t){return[t[0]/100*255,t[0]/100*255,t[0]/100*255]},a.gray.hsl=a.gray.hsv=function(t){return[0,0,t[0]]},a.gray.hwb=function(t){return[0,100,t[0]]},a.gray.cmyk=function(t){return[0,0,0,t[0]]},a.gray.lab=function(t){return[t[0],0,0]},a.gray.hex=function(t){var e=255&Math.round(t[0]/100*255),n=((e<<16)+(e<<8)+e).toString(16).toUpperCase();return"000000".substring(n.length)+n},a.rgb.gray=function(t){return[(t[0]+t[1]+t[2])/3/255*100]}}));n.rgb,n.hsl,n.hsv,n.hwb,n.cmyk,n.xyz,n.lab,n.lch,n.hex,n.keyword,n.ansi16,n.ansi256,n.hcg,n.apple,n.gray;function i(t){var e=function(){for(var t={},e=Object.keys(n),i=e.length,a=0;a<i;a++)t[e[a]]={distance:-1,parent:null};return t}(),i=[t];for(e[t].distance=0;i.length;)for(var a=i.pop(),r=Object.keys(n[a]),o=r.length,s=0;s<o;s++){var l=r[s],u=e[l];-1===u.distance&&(u.distance=e[a].distance+1,u.parent=a,i.unshift(l))}return e}function a(t,e){return function(n){return e(t(n))}}function r(t,e){for(var i=[e[t].parent,t],r=n[e[t].parent][t],o=e[t].parent;e[o].parent;)i.unshift(e[o].parent),r=a(n[e[o].parent][o],r),o=e[o].parent;return r.conversion=i,r}var o={};Object.keys(n).forEach((function(t){o[t]={},Object.defineProperty(o[t],"channels",{value:n[t].channels}),Object.defineProperty(o[t],"labels",{value:n[t].labels});var e=function(t){for(var e=i(t),n={},a=Object.keys(e),o=a.length,s=0;s<o;s++){var l=a[s];null!==e[l].parent&&(n[l]=r(l,e))}return n}(t);Object.keys(e).forEach((function(n){var i=e[n];o[t][n]=function(t){var e=function(e){if(null==e)return e;arguments.length>1&&(e=Array.prototype.slice.call(arguments));var n=t(e);if("object"==typeof n)for(var i=n.length,a=0;a<i;a++)n[a]=Math.round(n[a]);return n};return"conversion"in t&&(e.conversion=t.conversion),e}(i),o[t][n].raw=function(t){var e=function(e){return null==e?e:(arguments.length>1&&(e=Array.prototype.slice.call(arguments)),t(e))};return"conversion"in t&&(e.conversion=t.conversion),e}(i)}))}));var s=o,l={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},u={getRgba:d,getHsla:h,getRgb:function(t){var e=d(t);return e&&e.slice(0,3)},getHsl:function(t){var e=h(t);return e&&e.slice(0,3)},getHwb:c,getAlpha:function(t){var e=d(t);if(e)return e[3];if(e=h(t))return e[3];if(e=c(t))return e[3]},hexString:function(t,e){e=void 0!==e&&3===t.length?e:t[3];return"#"+v(t[0])+v(t[1])+v(t[2])+(e>=0&&e<1?v(Math.round(255*e)):"")},rgbString:function(t,e){if(e<1||t[3]&&t[3]<1)return f(t,e);return"rgb("+t[0]+", "+t[1]+", "+t[2]+")"},rgbaString:f,percentString:function(t,e){if(e<1||t[3]&&t[3]<1)return g(t,e);var n=Math.round(t[0]/255*100),i=Math.round(t[1]/255*100),a=Math.round(t[2]/255*100);return"rgb("+n+"%, "+i+"%, "+a+"%)"},percentaString:g,hslString:function(t,e){if(e<1||t[3]&&t[3]<1)return p(t,e);return"hsl("+t[0]+", "+t[1]+"%, "+t[2]+"%)"},hslaString:p,hwbString:function(t,e){void 0===e&&(e=void 0!==t[3]?t[3]:1);return"hwb("+t[0]+", "+t[1]+"%, "+t[2]+"%"+(void 0!==e&&1!==e?", "+e:"")+")"},keyword:function(t){return b[t.slice(0,3)]}};function d(t){if(t){var e=[0,0,0],n=1,i=t.match(/^#([a-fA-F0-9]{3,4})$/i),a="";if(i){a=(i=i[1])[3];for(var r=0;r<e.length;r++)e[r]=parseInt(i[r]+i[r],16);a&&(n=Math.round(parseInt(a+a,16)/255*100)/100)}else if(i=t.match(/^#([a-fA-F0-9]{6}([a-fA-F0-9]{2})?)$/i)){a=i[2],i=i[1];for(r=0;r<e.length;r++)e[r]=parseInt(i.slice(2*r,2*r+2),16);a&&(n=Math.round(parseInt(a,16)/255*100)/100)}else if(i=t.match(/^rgba?\(\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=parseInt(i[r+1]);n=parseFloat(i[4])}else if(i=t.match(/^rgba?\(\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=Math.round(2.55*parseFloat(i[r+1]));n=parseFloat(i[4])}else if(i=t.match(/(\w+)/)){if("transparent"==i[1])return[0,0,0,0];if(!(e=l[i[1]]))return}for(r=0;r<e.length;r++)e[r]=m(e[r],0,255);return n=n||0==n?m(n,0,1):1,e[3]=n,e}}function h(t){if(t){var e=t.match(/^hsla?\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[m(parseInt(e[1]),0,360),m(parseFloat(e[2]),0,100),m(parseFloat(e[3]),0,100),m(isNaN(n)?1:n,0,1)]}}}function c(t){if(t){var e=t.match(/^hwb\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[m(parseInt(e[1]),0,360),m(parseFloat(e[2]),0,100),m(parseFloat(e[3]),0,100),m(isNaN(n)?1:n,0,1)]}}}function f(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"rgba("+t[0]+", "+t[1]+", "+t[2]+", "+e+")"}function g(t,e){return"rgba("+Math.round(t[0]/255*100)+"%, "+Math.round(t[1]/255*100)+"%, "+Math.round(t[2]/255*100)+"%, "+(e||t[3]||1)+")"}function p(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"hsla("+t[0]+", "+t[1]+"%, "+t[2]+"%, "+e+")"}function m(t,e,n){return Math.min(Math.max(e,t),n)}function v(t){var e=t.toString(16).toUpperCase();return e.length<2?"0"+e:e}var b={};for(var x in l)b[l[x]]=x;var y=function(t){return t instanceof y?t:this instanceof y?(this.valid=!1,this.values={rgb:[0,0,0],hsl:[0,0,0],hsv:[0,0,0],hwb:[0,0,0],cmyk:[0,0,0,0],alpha:1},void("string"==typeof t?(e=u.getRgba(t))?this.setValues("rgb",e):(e=u.getHsla(t))?this.setValues("hsl",e):(e=u.getHwb(t))&&this.setValues("hwb",e):"object"==typeof t&&(void 0!==(e=t).r||void 0!==e.red?this.setValues("rgb",e):void 0!==e.l||void 0!==e.lightness?this.setValues("hsl",e):void 0!==e.v||void 0!==e.value?this.setValues("hsv",e):void 0!==e.w||void 0!==e.whiteness?this.setValues("hwb",e):void 0===e.c&&void 0===e.cyan||this.setValues("cmyk",e)))):new y(t);var e};y.prototype={isValid:function(){return this.valid},rgb:function(){return this.setSpace("rgb",arguments)},hsl:function(){return this.setSpace("hsl",arguments)},hsv:function(){return this.setSpace("hsv",arguments)},hwb:function(){return this.setSpace("hwb",arguments)},cmyk:function(){return this.setSpace("cmyk",arguments)},rgbArray:function(){return this.values.rgb},hslArray:function(){return this.values.hsl},hsvArray:function(){return this.values.hsv},hwbArray:function(){var t=this.values;return 1!==t.alpha?t.hwb.concat([t.alpha]):t.hwb},cmykArray:function(){return this.values.cmyk},rgbaArray:function(){var t=this.values;return t.rgb.concat([t.alpha])},hslaArray:function(){var t=this.values;return t.hsl.concat([t.alpha])},alpha:function(t){return void 0===t?this.values.alpha:(this.setValues("alpha",t),this)},red:function(t){return this.setChannel("rgb",0,t)},green:function(t){return this.setChannel("rgb",1,t)},blue:function(t){return this.setChannel("rgb",2,t)},hue:function(t){return t&&(t=(t%=360)<0?360+t:t),this.setChannel("hsl",0,t)},saturation:function(t){return this.setChannel("hsl",1,t)},lightness:function(t){return this.setChannel("hsl",2,t)},saturationv:function(t){return this.setChannel("hsv",1,t)},whiteness:function(t){return this.setChannel("hwb",1,t)},blackness:function(t){return this.setChannel("hwb",2,t)},value:function(t){return this.setChannel("hsv",2,t)},cyan:function(t){return this.setChannel("cmyk",0,t)},magenta:function(t){return this.setChannel("cmyk",1,t)},yellow:function(t){return this.setChannel("cmyk",2,t)},black:function(t){return this.setChannel("cmyk",3,t)},hexString:function(){return u.hexString(this.values.rgb)},rgbString:function(){return u.rgbString(this.values.rgb,this.values.alpha)},rgbaString:function(){return u.rgbaString(this.values.rgb,this.values.alpha)},percentString:function(){return u.percentString(this.values.rgb,this.values.alpha)},hslString:function(){return u.hslString(this.values.hsl,this.values.alpha)},hslaString:function(){return u.hslaString(this.values.hsl,this.values.alpha)},hwbString:function(){return u.hwbString(this.values.hwb,this.values.alpha)},keyword:function(){return u.keyword(this.values.rgb,this.values.alpha)},rgbNumber:function(){var t=this.values.rgb;return t[0]<<16|t[1]<<8|t[2]},luminosity:function(){for(var t=this.values.rgb,e=[],n=0;n<t.length;n++){var i=t[n]/255;e[n]=i<=.03928?i/12.92:Math.pow((i+.055)/1.055,2.4)}return.2126*e[0]+.7152*e[1]+.0722*e[2]},contrast:function(t){var e=this.luminosity(),n=t.luminosity();return e>n?(e+.05)/(n+.05):(n+.05)/(e+.05)},level:function(t){var e=this.contrast(t);return e>=7.1?"AAA":e>=4.5?"AA":""},dark:function(){var t=this.values.rgb;return(299*t[0]+587*t[1]+114*t[2])/1e3<128},light:function(){return!this.dark()},negate:function(){for(var t=[],e=0;e<3;e++)t[e]=255-this.values.rgb[e];return this.setValues("rgb",t),this},lighten:function(t){var e=this.values.hsl;return e[2]+=e[2]*t,this.setValues("hsl",e),this},darken:function(t){var e=this.values.hsl;return e[2]-=e[2]*t,this.setValues("hsl",e),this},saturate:function(t){var e=this.values.hsl;return e[1]+=e[1]*t,this.setValues("hsl",e),this},desaturate:function(t){var e=this.values.hsl;return e[1]-=e[1]*t,this.setValues("hsl",e),this},whiten:function(t){var e=this.values.hwb;return e[1]+=e[1]*t,this.setValues("hwb",e),this},blacken:function(t){var e=this.values.hwb;return e[2]+=e[2]*t,this.setValues("hwb",e),this},greyscale:function(){var t=this.values.rgb,e=.3*t[0]+.59*t[1]+.11*t[2];return this.setValues("rgb",[e,e,e]),this},clearer:function(t){var e=this.values.alpha;return this.setValues("alpha",e-e*t),this},opaquer:function(t){var e=this.values.alpha;return this.setValues("alpha",e+e*t),this},rotate:function(t){var e=this.values.hsl,n=(e[0]+t)%360;return e[0]=n<0?360+n:n,this.setValues("hsl",e),this},mix:function(t,e){var n=t,i=void 0===e?.5:e,a=2*i-1,r=this.alpha()-n.alpha(),o=((a*r==-1?a:(a+r)/(1+a*r))+1)/2,s=1-o;return this.rgb(o*this.red()+s*n.red(),o*this.green()+s*n.green(),o*this.blue()+s*n.blue()).alpha(this.alpha()*i+n.alpha()*(1-i))},toJSON:function(){return this.rgb()},clone:function(){var t,e,n=new y,i=this.values,a=n.values;for(var r in i)i.hasOwnProperty(r)&&(t=i[r],"[object Array]"===(e={}.toString.call(t))?a[r]=t.slice(0):"[object Number]"===e?a[r]=t:console.error("unexpected color value:",t));return n}},y.prototype.spaces={rgb:["red","green","blue"],hsl:["hue","saturation","lightness"],hsv:["hue","saturation","value"],hwb:["hue","whiteness","blackness"],cmyk:["cyan","magenta","yellow","black"]},y.prototype.maxes={rgb:[255,255,255],hsl:[360,100,100],hsv:[360,100,100],hwb:[360,100,100],cmyk:[100,100,100,100]},y.prototype.getValues=function(t){for(var e=this.values,n={},i=0;i<t.length;i++)n[t.charAt(i)]=e[t][i];return 1!==e.alpha&&(n.a=e.alpha),n},y.prototype.setValues=function(t,e){var n,i,a=this.values,r=this.spaces,o=this.maxes,l=1;if(this.valid=!0,"alpha"===t)l=e;else if(e.length)a[t]=e.slice(0,t.length),l=e[t.length];else if(void 0!==e[t.charAt(0)]){for(n=0;n<t.length;n++)a[t][n]=e[t.charAt(n)];l=e.a}else if(void 0!==e[r[t][0]]){var u=r[t];for(n=0;n<t.length;n++)a[t][n]=e[u[n]];l=e.alpha}if(a.alpha=Math.max(0,Math.min(1,void 0===l?a.alpha:l)),"alpha"===t)return!1;for(n=0;n<t.length;n++)i=Math.max(0,Math.min(o[t][n],a[t][n])),a[t][n]=Math.round(i);for(var d in r)d!==t&&(a[d]=s[t][d](a[t]));return!0},y.prototype.setSpace=function(t,e){var n=e[0];return void 0===n?this.getValues(t):("number"==typeof n&&(n=Array.prototype.slice.call(e)),this.setValues(t,n),this)},y.prototype.setChannel=function(t,e,n){var i=this.values[t];return void 0===n?i[e]:n===i[e]?this:(i[e]=n,this.setValues(t,i),this)},"undefined"!=typeof window&&(window.Color=y);var _=y;function k(t){return-1===["__proto__","prototype","constructor"].indexOf(t)}var w,M={noop:function(){},uid:(w=0,function(){return w++}),isNullOrUndef:function(t){return null==t},isArray:function(t){if(Array.isArray&&Array.isArray(t))return!0;var e=Object.prototype.toString.call(t);return"[object"===e.substr(0,7)&&"Array]"===e.substr(-6)},isObject:function(t){return null!==t&&"[object Object]"===Object.prototype.toString.call(t)},isFinite:function(t){return("number"==typeof t||t instanceof Number)&&isFinite(t)},valueOrDefault:function(t,e){return void 0===t?e:t},valueAtIndexOrDefault:function(t,e,n){return M.valueOrDefault(M.isArray(t)?t[e]:t,n)},callback:function(t,e,n){if(t&&"function"==typeof t.call)return t.apply(n,e)},each:function(t,e,n,i){var a,r,o;if(M.isArray(t))if(r=t.length,i)for(a=r-1;a>=0;a--)e.call(n,t[a],a);else for(a=0;a<r;a++)e.call(n,t[a],a);else if(M.isObject(t))for(r=(o=Object.keys(t)).length,a=0;a<r;a++)e.call(n,t[o[a]],o[a])},arrayEquals:function(t,e){var n,i,a,r;if(!t||!e||t.length!==e.length)return!1;for(n=0,i=t.length;n<i;++n)if(a=t[n],r=e[n],a instanceof Array&&r instanceof Array){if(!M.arrayEquals(a,r))return!1}else if(a!==r)return!1;return!0},clone:function(t){if(M.isArray(t))return t.map(M.clone);if(M.isObject(t)){for(var e=Object.create(t),n=Object.keys(t),i=n.length,a=0;a<i;++a)e[n[a]]=M.clone(t[n[a]]);return e}return t},_merger:function(t,e,n,i){if(k(t)){var a=e[t],r=n[t];M.isObject(a)&&M.isObject(r)?M.merge(a,r,i):e[t]=M.clone(r)}},_mergerIf:function(t,e,n){if(k(t)){var i=e[t],a=n[t];M.isObject(i)&&M.isObject(a)?M.mergeIf(i,a):e.hasOwnProperty(t)||(e[t]=M.clone(a))}},merge:function(t,e,n){var i,a,r,o,s,l=M.isArray(e)?e:[e],u=l.length;if(!M.isObject(t))return t;for(i=(n=n||{}).merger||M._merger,a=0;a<u;++a)if(e=l[a],M.isObject(e))for(s=0,o=(r=Object.keys(e)).length;s<o;++s)i(r[s],t,e,n);return t},mergeIf:function(t,e){return M.merge(t,e,{merger:M._mergerIf})},extend:Object.assign||function(t){return M.merge(t,[].slice.call(arguments,1),{merger:function(t,e,n){e[t]=n[t]}})},inherits:function(t){var e=this,n=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return e.apply(this,arguments)},i=function(){this.constructor=n};return i.prototype=e.prototype,n.prototype=new i,n.extend=M.inherits,t&&M.extend(n.prototype,t),n.__super__=e.prototype,n},_deprecated:function(t,e,n,i){void 0!==e&&console.warn(t+': "'+n+'" is deprecated. Please use "'+i+'" instead')}},S=M;M.callCallback=M.callback,M.indexOf=function(t,e,n){return Array.prototype.indexOf.call(t,e,n)},M.getValueOrDefault=M.valueOrDefault,M.getValueAtIndexOrDefault=M.valueAtIndexOrDefault;var C={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return(t-=1)*t*t+1},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-((t-=1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return t*t*t*t*t},easeOutQuint:function(t){return(t-=1)*t*t*t*t+1},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return 1-Math.cos(t*(Math.PI/2))},easeOutSine:function(t){return Math.sin(t*(Math.PI/2))},easeInOutSine:function(t){return-.5*(Math.cos(Math.PI*t)-1)},easeInExpo:function(t){return 0===t?0:Math.pow(2,10*(t-1))},easeOutExpo:function(t){return 1===t?1:1-Math.pow(2,-10*t)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(2-Math.pow(2,-10*--t))},easeInCirc:function(t){return t>=1?t:-(Math.sqrt(1-t*t)-1)},easeOutCirc:function(t){return Math.sqrt(1-(t-=1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),-i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n))},easeOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),i*Math.pow(2,-10*t)*Math.sin((t-e)*(2*Math.PI)/n)+1)},easeInOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:2==(t/=.5)?1:(n||(n=.45),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),t<1?i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*-.5:i*Math.pow(2,-10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*.5+1)},easeInBack:function(t){var e=1.70158;return t*t*((e+1)*t-e)},easeOutBack:function(t){var e=1.70158;return(t-=1)*t*((e+1)*t+e)+1},easeInOutBack:function(t){var e=1.70158;return(t/=.5)<1?t*t*((1+(e*=1.525))*t-e)*.5:.5*((t-=2)*t*((1+(e*=1.525))*t+e)+2)},easeInBounce:function(t){return 1-C.easeOutBounce(1-t)},easeOutBounce:function(t){return t<1/2.75?7.5625*t*t:t<2/2.75?7.5625*(t-=1.5/2.75)*t+.75:t<2.5/2.75?7.5625*(t-=2.25/2.75)*t+.9375:7.5625*(t-=2.625/2.75)*t+.984375},easeInOutBounce:function(t){return t<.5?.5*C.easeInBounce(2*t):.5*C.easeOutBounce(2*t-1)+.5}},P={effects:C};S.easingEffects=C;var A=Math.PI,D=A/180,T=2*A,I=A/2,F=A/4,O=2*A/3,L={clear:function(t){t.ctx.clearRect(0,0,t.width,t.height)},roundedRect:function(t,e,n,i,a,r){if(r){var o=Math.min(r,a/2,i/2),s=e+o,l=n+o,u=e+i-o,d=n+a-o;t.moveTo(e,l),s<u&&l<d?(t.arc(s,l,o,-A,-I),t.arc(u,l,o,-I,0),t.arc(u,d,o,0,I),t.arc(s,d,o,I,A)):s<u?(t.moveTo(s,n),t.arc(u,l,o,-I,I),t.arc(s,l,o,I,A+I)):l<d?(t.arc(s,l,o,-A,0),t.arc(s,d,o,0,A)):t.arc(s,l,o,-A,A),t.closePath(),t.moveTo(e,n)}else t.rect(e,n,i,a)},drawPoint:function(t,e,n,i,a,r){var o,s,l,u,d,h=(r||0)*D;if(e&&"object"==typeof e&&("[object HTMLImageElement]"===(o=e.toString())||"[object HTMLCanvasElement]"===o))return t.save(),t.translate(i,a),t.rotate(h),t.drawImage(e,-e.width/2,-e.height/2,e.width,e.height),void t.restore();if(!(isNaN(n)||n<=0)){switch(t.beginPath(),e){default:t.arc(i,a,n,0,T),t.closePath();break;case"triangle":t.moveTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=O,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=O,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),t.closePath();break;case"rectRounded":u=n-(d=.516*n),s=Math.cos(h+F)*u,l=Math.sin(h+F)*u,t.arc(i-s,a-l,d,h-A,h-I),t.arc(i+l,a-s,d,h-I,h),t.arc(i+s,a+l,d,h,h+I),t.arc(i-l,a+s,d,h+I,h+A),t.closePath();break;case"rect":if(!r){u=Math.SQRT1_2*n,t.rect(i-u,a-u,2*u,2*u);break}h+=F;case"rectRot":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+l,a-s),t.lineTo(i+s,a+l),t.lineTo(i-l,a+s),t.closePath();break;case"crossRot":h+=F;case"cross":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"star":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s),h+=F,s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"line":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l);break;case"dash":t.moveTo(i,a),t.lineTo(i+Math.cos(h)*n,a+Math.sin(h)*n)}t.fill(),t.stroke()}},_isPointInArea:function(t,e){return t.x>e.left-1e-6&&t.x<e.right+1e-6&&t.y>e.top-1e-6&&t.y<e.bottom+1e-6},clipArea:function(t,e){t.save(),t.beginPath(),t.rect(e.left,e.top,e.right-e.left,e.bottom-e.top),t.clip()},unclipArea:function(t){t.restore()},lineTo:function(t,e,n,i){var a=n.steppedLine;if(a){if("middle"===a){var r=(e.x+n.x)/2;t.lineTo(r,i?n.y:e.y),t.lineTo(r,i?e.y:n.y)}else"after"===a&&!i||"after"!==a&&i?t.lineTo(e.x,n.y):t.lineTo(n.x,e.y);t.lineTo(n.x,n.y)}else n.tension?t.bezierCurveTo(i?e.controlPointPreviousX:e.controlPointNextX,i?e.controlPointPreviousY:e.controlPointNextY,i?n.controlPointNextX:n.controlPointPreviousX,i?n.controlPointNextY:n.controlPointPreviousY,n.x,n.y):t.lineTo(n.x,n.y)}},R=L;S.clear=L.clear,S.drawRoundedRectangle=function(t){t.beginPath(),L.roundedRect.apply(L,arguments)};var z={_set:function(t,e){return S.merge(this[t]||(this[t]={}),e)}};z._set("global",{defaultColor:"rgba(0,0,0,0.1)",defaultFontColor:"#666",defaultFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",defaultFontSize:12,defaultFontStyle:"normal",defaultLineHeight:1.2,showLines:!0});var N=z,B=S.valueOrDefault;var E={toLineHeight:function(t,e){var n=(""+t).match(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/);if(!n||"normal"===n[1])return 1.2*e;switch(t=+n[2],n[3]){case"px":return t;case"%":t/=100}return e*t},toPadding:function(t){var e,n,i,a;return S.isObject(t)?(e=+t.top||0,n=+t.right||0,i=+t.bottom||0,a=+t.left||0):e=n=i=a=+t||0,{top:e,right:n,bottom:i,left:a,height:e+i,width:a+n}},_parseFont:function(t){var e=N.global,n=B(t.fontSize,e.defaultFontSize),i={family:B(t.fontFamily,e.defaultFontFamily),lineHeight:S.options.toLineHeight(B(t.lineHeight,e.defaultLineHeight),n),size:n,style:B(t.fontStyle,e.defaultFontStyle),weight:null,string:""};return i.string=function(t){return!t||S.isNullOrUndef(t.size)||S.isNullOrUndef(t.family)?null:(t.style?t.style+" ":"")+(t.weight?t.weight+" ":"")+t.size+"px "+t.family}(i),i},resolve:function(t,e,n,i){var a,r,o,s=!0;for(a=0,r=t.length;a<r;++a)if(void 0!==(o=t[a])&&(void 0!==e&&"function"==typeof o&&(o=o(e),s=!1),void 0!==n&&S.isArray(o)&&(o=o[n],s=!1),void 0!==o))return i&&!s&&(i.cacheable=!1),o}},W={_factorize:function(t){var e,n=[],i=Math.sqrt(t);for(e=1;e<i;e++)t%e==0&&(n.push(e),n.push(t/e));return i===(0|i)&&n.push(i),n.sort((function(t,e){return t-e})).pop(),n},log10:Math.log10||function(t){var e=Math.log(t)*Math.LOG10E,n=Math.round(e);return t===Math.pow(10,n)?n:e}},V=W;S.log10=W.log10;var H=S,j=P,q=R,U=E,Y=V,G={getRtlAdapter:function(t,e,n){return t?function(t,e){return{x:function(n){return t+t+e-n},setWidth:function(t){e=t},textAlign:function(t){return"center"===t?t:"right"===t?"left":"right"},xPlus:function(t,e){return t-e},leftForLtr:function(t,e){return t-e}}}(e,n):{x:function(t){return t},setWidth:function(t){},textAlign:function(t){return t},xPlus:function(t,e){return t+e},leftForLtr:function(t,e){return t}}},overrideTextDirection:function(t,e){var n,i;"ltr"!==e&&"rtl"!==e||(i=[(n=t.canvas.style).getPropertyValue("direction"),n.getPropertyPriority("direction")],n.setProperty("direction",e,"important"),t.prevTextDirection=i)},restoreTextDirection:function(t){var e=t.prevTextDirection;void 0!==e&&(delete t.prevTextDirection,t.canvas.style.setProperty("direction",e[0],e[1]))}};H.easing=j,H.canvas=q,H.options=U,H.math=Y,H.rtl=G;var X=function(t){H.extend(this,t),this.initialize.apply(this,arguments)};H.extend(X.prototype,{_type:void 0,initialize:function(){this.hidden=!1},pivot:function(){var t=this;return t._view||(t._view=H.extend({},t._model)),t._start={},t},transition:function(t){var e=this,n=e._model,i=e._start,a=e._view;return n&&1!==t?(a||(a=e._view={}),i||(i=e._start={}),function(t,e,n,i){var a,r,o,s,l,u,d,h,c,f=Object.keys(n);for(a=0,r=f.length;a<r;++a)if(u=n[o=f[a]],e.hasOwnProperty(o)||(e[o]=u),(s=e[o])!==u&&"_"!==o[0]){if(t.hasOwnProperty(o)||(t[o]=s),(d=typeof u)===typeof(l=t[o]))if("string"===d){if((h=_(l)).valid&&(c=_(u)).valid){e[o]=c.mix(h,i).rgbString();continue}}else if(H.isFinite(l)&&H.isFinite(u)){e[o]=l+(u-l)*i;continue}e[o]=u}}(i,a,n,t),e):(e._view=H.extend({},n),e._start=null,e)},tooltipPosition:function(){return{x:this._model.x,y:this._model.y}},hasValue:function(){return H.isNumber(this._model.x)&&H.isNumber(this._model.y)}}),X.extend=H.inherits;var K=X,Z=K.extend({chart:null,currentStep:0,numSteps:60,easing:"",render:null,onAnimationProgress:null,onAnimationComplete:null}),$=Z;Object.defineProperty(Z.prototype,"animationObject",{get:function(){return this}}),Object.defineProperty(Z.prototype,"chartInstance",{get:function(){return this.chart},set:function(t){this.chart=t}}),N._set("global",{animation:{duration:1e3,easing:"easeOutQuart",onProgress:H.noop,onComplete:H.noop}});var J={animations:[],request:null,addAnimation:function(t,e,n,i){var a,r,o=this.animations;for(e.chart=t,e.startTime=Date.now(),e.duration=n,i||(t.animating=!0),a=0,r=o.length;a<r;++a)if(o[a].chart===t)return void(o[a]=e);o.push(e),1===o.length&&this.requestAnimationFrame()},cancelAnimation:function(t){var e=H.findIndex(this.animations,(function(e){return e.chart===t}));-1!==e&&(this.animations.splice(e,1),t.animating=!1)},requestAnimationFrame:function(){var t=this;null===t.request&&(t.request=H.requestAnimFrame.call(window,(function(){t.request=null,t.startDigest()})))},startDigest:function(){this.advance(),this.animations.length>0&&this.requestAnimationFrame()},advance:function(){for(var t,e,n,i,a=this.animations,r=0;r<a.length;)e=(t=a[r]).chart,n=t.numSteps,i=Math.floor((Date.now()-t.startTime)/t.duration*n)+1,t.currentStep=Math.min(i,n),H.callback(t.render,[e,t],e),H.callback(t.onAnimationProgress,[t],e),t.currentStep>=n?(H.callback(t.onAnimationComplete,[t],e),e.animating=!1,a.splice(r,1)):++r}},Q=H.options.resolve,tt=["push","pop","shift","splice","unshift"];function et(t,e){var n=t._chartjs;if(n){var i=n.listeners,a=i.indexOf(e);-1!==a&&i.splice(a,1),i.length>0||(tt.forEach((function(e){delete t[e]})),delete t._chartjs)}}var nt=function(t,e){this.initialize(t,e)};H.extend(nt.prototype,{datasetElementType:null,dataElementType:null,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth"],_dataElementOptions:["backgroundColor","borderColor","borderWidth","pointStyle"],initialize:function(t,e){var n=this;n.chart=t,n.index=e,n.linkScales(),n.addElements(),n._type=n.getMeta().type},updateIndex:function(t){this.index=t},linkScales:function(){var t=this.getMeta(),e=this.chart,n=e.scales,i=this.getDataset(),a=e.options.scales;null!==t.xAxisID&&t.xAxisID in n&&!i.xAxisID||(t.xAxisID=i.xAxisID||a.xAxes[0].id),null!==t.yAxisID&&t.yAxisID in n&&!i.yAxisID||(t.yAxisID=i.yAxisID||a.yAxes[0].id)},getDataset:function(){return this.chart.data.datasets[this.index]},getMeta:function(){return this.chart.getDatasetMeta(this.index)},getScaleForId:function(t){return this.chart.scales[t]},_getValueScaleId:function(){return this.getMeta().yAxisID},_getIndexScaleId:function(){return this.getMeta().xAxisID},_getValueScale:function(){return this.getScaleForId(this._getValueScaleId())},_getIndexScale:function(){return this.getScaleForId(this._getIndexScaleId())},reset:function(){this._update(!0)},destroy:function(){this._data&&et(this._data,this)},createMetaDataset:function(){var t=this.datasetElementType;return t&&new t({_chart:this.chart,_datasetIndex:this.index})},createMetaData:function(t){var e=this.dataElementType;return e&&new e({_chart:this.chart,_datasetIndex:this.index,_index:t})},addElements:function(){var t,e,n=this.getMeta(),i=this.getDataset().data||[],a=n.data;for(t=0,e=i.length;t<e;++t)a[t]=a[t]||this.createMetaData(t);n.dataset=n.dataset||this.createMetaDataset()},addElementAndReset:function(t){var e=this.createMetaData(t);this.getMeta().data.splice(t,0,e),this.updateElement(e,t,!0)},buildOrUpdateElements:function(){var t,e,n=this,i=n.getDataset(),a=i.data||(i.data=[]);n._data!==a&&(n._data&&et(n._data,n),a&&Object.isExtensible(a)&&(e=n,(t=a)._chartjs?t._chartjs.listeners.push(e):(Object.defineProperty(t,"_chartjs",{configurable:!0,enumerable:!1,value:{listeners:[e]}}),tt.forEach((function(e){var n="onData"+e.charAt(0).toUpperCase()+e.slice(1),i=t[e];Object.defineProperty(t,e,{configurable:!0,enumerable:!1,value:function(){var e=Array.prototype.slice.call(arguments),a=i.apply(this,e);return H.each(t._chartjs.listeners,(function(t){"function"==typeof t[n]&&t[n].apply(t,e)})),a}})})))),n._data=a),n.resyncElements()},_configure:function(){this._config=H.merge(Object.create(null),[this.chart.options.datasets[this._type],this.getDataset()],{merger:function(t,e,n){"_meta"!==t&&"data"!==t&&H._merger(t,e,n)}})},_update:function(t){this._configure(),this._cachedDataOpts=null,this.update(t)},update:H.noop,transition:function(t){for(var e=this.getMeta(),n=e.data||[],i=n.length,a=0;a<i;++a)n[a].transition(t);e.dataset&&e.dataset.transition(t)},draw:function(){var t=this.getMeta(),e=t.data||[],n=e.length,i=0;for(t.dataset&&t.dataset.draw();i<n;++i)e[i].draw()},getStyle:function(t){var e,n=this.getMeta(),i=n.dataset;return this._configure(),i&&void 0===t?e=this._resolveDatasetElementOptions(i||{}):(t=t||0,e=this._resolveDataElementOptions(n.data[t]||{},t)),!1!==e.fill&&null!==e.fill||(e.backgroundColor=e.borderColor),e},_resolveDatasetElementOptions:function(t,e){var n,i,a,r,o=this,s=o.chart,l=o._config,u=t.custom||{},d=s.options.elements[o.datasetElementType.prototype._type]||{},h=o._datasetElementOptions,c={},f={chart:s,dataset:o.getDataset(),datasetIndex:o.index,hover:e};for(n=0,i=h.length;n<i;++n)a=h[n],r=e?"hover"+a.charAt(0).toUpperCase()+a.slice(1):a,c[a]=Q([u[r],l[r],d[r]],f);return c},_resolveDataElementOptions:function(t,e){var n=this,i=t&&t.custom,a=n._cachedDataOpts;if(a&&!i)return a;var r,o,s,l,u=n.chart,d=n._config,h=u.options.elements[n.dataElementType.prototype._type]||{},c=n._dataElementOptions,f={},g={chart:u,dataIndex:e,dataset:n.getDataset(),datasetIndex:n.index},p={cacheable:!i};if(i=i||{},H.isArray(c))for(o=0,s=c.length;o<s;++o)f[l=c[o]]=Q([i[l],d[l],h[l]],g,e,p);else for(o=0,s=(r=Object.keys(c)).length;o<s;++o)f[l=r[o]]=Q([i[l],d[c[l]],d[l],h[l]],g,e,p);return p.cacheable&&(n._cachedDataOpts=Object.freeze(f)),f},removeHoverStyle:function(t){H.merge(t._model,t.$previousStyle||{}),delete t.$previousStyle},setHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],n=t._index,i=t.custom||{},a=t._model,r=H.getHoverColor;t.$previousStyle={backgroundColor:a.backgroundColor,borderColor:a.borderColor,borderWidth:a.borderWidth},a.backgroundColor=Q([i.hoverBackgroundColor,e.hoverBackgroundColor,r(a.backgroundColor)],void 0,n),a.borderColor=Q([i.hoverBorderColor,e.hoverBorderColor,r(a.borderColor)],void 0,n),a.borderWidth=Q([i.hoverBorderWidth,e.hoverBorderWidth,a.borderWidth],void 0,n)},_removeDatasetHoverStyle:function(){var t=this.getMeta().dataset;t&&this.removeHoverStyle(t)},_setDatasetHoverStyle:function(){var t,e,n,i,a,r,o=this.getMeta().dataset,s={};if(o){for(r=o._model,a=this._resolveDatasetElementOptions(o,!0),t=0,e=(i=Object.keys(a)).length;t<e;++t)s[n=i[t]]=r[n],r[n]=a[n];o.$previousStyle=s}},resyncElements:function(){var t=this.getMeta(),e=this.getDataset().data,n=t.data.length,i=e.length;i<n?t.data.splice(i,n-i):i>n&&this.insertElements(n,i-n)},insertElements:function(t,e){for(var n=0;n<e;++n)this.addElementAndReset(t+n)},onDataPush:function(){var t=arguments.length;this.insertElements(this.getDataset().data.length-t,t)},onDataPop:function(){this.getMeta().data.pop()},onDataShift:function(){this.getMeta().data.shift()},onDataSplice:function(t,e){this.getMeta().data.splice(t,e),this.insertElements(t,arguments.length-2)},onDataUnshift:function(){this.insertElements(0,arguments.length)}}),nt.extend=H.inherits;var it=nt,at=2*Math.PI;function rt(t,e){var n=e.startAngle,i=e.endAngle,a=e.pixelMargin,r=a/e.outerRadius,o=e.x,s=e.y;t.beginPath(),t.arc(o,s,e.outerRadius,n-r,i+r),e.innerRadius>a?(r=a/e.innerRadius,t.arc(o,s,e.innerRadius-a,i+r,n-r,!0)):t.arc(o,s,a,i+Math.PI/2,n-Math.PI/2),t.closePath(),t.clip()}function ot(t,e,n){var i="inner"===e.borderAlign;i?(t.lineWidth=2*e.borderWidth,t.lineJoin="round"):(t.lineWidth=e.borderWidth,t.lineJoin="bevel"),n.fullCircles&&function(t,e,n,i){var a,r=n.endAngle;for(i&&(n.endAngle=n.startAngle+at,rt(t,n),n.endAngle=r,n.endAngle===n.startAngle&&n.fullCircles&&(n.endAngle+=at,n.fullCircles--)),t.beginPath(),t.arc(n.x,n.y,n.innerRadius,n.startAngle+at,n.startAngle,!0),a=0;a<n.fullCircles;++a)t.stroke();for(t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.startAngle+at),a=0;a<n.fullCircles;++a)t.stroke()}(t,e,n,i),i&&rt(t,n),t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.endAngle),t.arc(n.x,n.y,n.innerRadius,n.endAngle,n.startAngle,!0),t.closePath(),t.stroke()}N._set("global",{elements:{arc:{backgroundColor:N.global.defaultColor,borderColor:"#fff",borderWidth:2,borderAlign:"center"}}});var st=K.extend({_type:"arc",inLabelRange:function(t){var e=this._view;return!!e&&Math.pow(t-e.x,2)<Math.pow(e.radius+e.hoverRadius,2)},inRange:function(t,e){var n=this._view;if(n){for(var i=H.getAngleFromPoint(n,{x:t,y:e}),a=i.angle,r=i.distance,o=n.startAngle,s=n.endAngle;s<o;)s+=at;for(;a>s;)a-=at;for(;a<o;)a+=at;var l=a>=o&&a<=s,u=r>=n.innerRadius&&r<=n.outerRadius;return l&&u}return!1},getCenterPoint:function(){var t=this._view,e=(t.startAngle+t.endAngle)/2,n=(t.innerRadius+t.outerRadius)/2;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},getArea:function(){var t=this._view;return Math.PI*((t.endAngle-t.startAngle)/(2*Math.PI))*(Math.pow(t.outerRadius,2)-Math.pow(t.innerRadius,2))},tooltipPosition:function(){var t=this._view,e=t.startAngle+(t.endAngle-t.startAngle)/2,n=(t.outerRadius-t.innerRadius)/2+t.innerRadius;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},draw:function(){var t,e=this._chart.ctx,n=this._view,i="inner"===n.borderAlign?.33:0,a={x:n.x,y:n.y,innerRadius:n.innerRadius,outerRadius:Math.max(n.outerRadius-i,0),pixelMargin:i,startAngle:n.startAngle,endAngle:n.endAngle,fullCircles:Math.floor(n.circumference/at)};if(e.save(),e.fillStyle=n.backgroundColor,e.strokeStyle=n.borderColor,a.fullCircles){for(a.endAngle=a.startAngle+at,e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),t=0;t<a.fullCircles;++t)e.fill();a.endAngle=a.startAngle+n.circumference%at}e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),e.fill(),n.borderWidth&&ot(e,n,a),e.restore()}}),lt=H.valueOrDefault,ut=N.global.defaultColor;N._set("global",{elements:{line:{tension:.4,backgroundColor:ut,borderWidth:3,borderColor:ut,borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",capBezierPoints:!0,fill:!0}}});var dt=K.extend({_type:"line",draw:function(){var t,e,n,i=this,a=i._view,r=i._chart.ctx,o=a.spanGaps,s=i._children.slice(),l=N.global,u=l.elements.line,d=-1,h=i._loop;if(s.length){if(i._loop){for(t=0;t<s.length;++t)if(e=H.previousItem(s,t),!s[t]._view.skip&&e._view.skip){s=s.slice(t).concat(s.slice(0,t)),h=o;break}h&&s.push(s[0])}for(r.save(),r.lineCap=a.borderCapStyle||u.borderCapStyle,r.setLineDash&&r.setLineDash(a.borderDash||u.borderDash),r.lineDashOffset=lt(a.borderDashOffset,u.borderDashOffset),r.lineJoin=a.borderJoinStyle||u.borderJoinStyle,r.lineWidth=lt(a.borderWidth,u.borderWidth),r.strokeStyle=a.borderColor||l.defaultColor,r.beginPath(),(n=s[0]._view).skip||(r.moveTo(n.x,n.y),d=0),t=1;t<s.length;++t)n=s[t]._view,e=-1===d?H.previousItem(s,t):s[d],n.skip||(d!==t-1&&!o||-1===d?r.moveTo(n.x,n.y):H.canvas.lineTo(r,e._view,n),d=t);h&&r.closePath(),r.stroke(),r.restore()}}}),ht=H.valueOrDefault,ct=N.global.defaultColor;function ft(t){var e=this._view;return!!e&&Math.abs(t-e.x)<e.radius+e.hitRadius}N._set("global",{elements:{point:{radius:3,pointStyle:"circle",backgroundColor:ct,borderColor:ct,borderWidth:1,hitRadius:1,hoverRadius:4,hoverBorderWidth:1}}});var gt=K.extend({_type:"point",inRange:function(t,e){var n=this._view;return!!n&&Math.pow(t-n.x,2)+Math.pow(e-n.y,2)<Math.pow(n.hitRadius+n.radius,2)},inLabelRange:ft,inXRange:ft,inYRange:function(t){var e=this._view;return!!e&&Math.abs(t-e.y)<e.radius+e.hitRadius},getCenterPoint:function(){var t=this._view;return{x:t.x,y:t.y}},getArea:function(){return Math.PI*Math.pow(this._view.radius,2)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y,padding:t.radius+t.borderWidth}},draw:function(t){var e=this._view,n=this._chart.ctx,i=e.pointStyle,a=e.rotation,r=e.radius,o=e.x,s=e.y,l=N.global,u=l.defaultColor;e.skip||(void 0===t||H.canvas._isPointInArea(e,t))&&(n.strokeStyle=e.borderColor||u,n.lineWidth=ht(e.borderWidth,l.elements.point.borderWidth),n.fillStyle=e.backgroundColor||u,H.canvas.drawPoint(n,i,r,o,s,a))}}),pt=N.global.defaultColor;function mt(t){return t&&void 0!==t.width}function vt(t){var e,n,i,a,r;return mt(t)?(r=t.width/2,e=t.x-r,n=t.x+r,i=Math.min(t.y,t.base),a=Math.max(t.y,t.base)):(r=t.height/2,e=Math.min(t.x,t.base),n=Math.max(t.x,t.base),i=t.y-r,a=t.y+r),{left:e,top:i,right:n,bottom:a}}function bt(t,e,n){return t===e?n:t===n?e:t}function xt(t,e,n){var i,a,r,o,s=t.borderWidth,l=function(t){var e=t.borderSkipped,n={};return e?(t.horizontal?t.base>t.x&&(e=bt(e,"left","right")):t.base<t.y&&(e=bt(e,"bottom","top")),n[e]=!0,n):n}(t);return H.isObject(s)?(i=+s.top||0,a=+s.right||0,r=+s.bottom||0,o=+s.left||0):i=a=r=o=+s||0,{t:l.top||i<0?0:i>n?n:i,r:l.right||a<0?0:a>e?e:a,b:l.bottom||r<0?0:r>n?n:r,l:l.left||o<0?0:o>e?e:o}}function yt(t,e,n){var i=null===e,a=null===n,r=!(!t||i&&a)&&vt(t);return r&&(i||e>=r.left&&e<=r.right)&&(a||n>=r.top&&n<=r.bottom)}N._set("global",{elements:{rectangle:{backgroundColor:pt,borderColor:pt,borderSkipped:"bottom",borderWidth:0}}});var _t=K.extend({_type:"rectangle",draw:function(){var t=this._chart.ctx,e=this._view,n=function(t){var e=vt(t),n=e.right-e.left,i=e.bottom-e.top,a=xt(t,n/2,i/2);return{outer:{x:e.left,y:e.top,w:n,h:i},inner:{x:e.left+a.l,y:e.top+a.t,w:n-a.l-a.r,h:i-a.t-a.b}}}(e),i=n.outer,a=n.inner;t.fillStyle=e.backgroundColor,t.fillRect(i.x,i.y,i.w,i.h),i.w===a.w&&i.h===a.h||(t.save(),t.beginPath(),t.rect(i.x,i.y,i.w,i.h),t.clip(),t.fillStyle=e.borderColor,t.rect(a.x,a.y,a.w,a.h),t.fill("evenodd"),t.restore())},height:function(){var t=this._view;return t.base-t.y},inRange:function(t,e){return yt(this._view,t,e)},inLabelRange:function(t,e){var n=this._view;return mt(n)?yt(n,t,null):yt(n,null,e)},inXRange:function(t){return yt(this._view,t,null)},inYRange:function(t){return yt(this._view,null,t)},getCenterPoint:function(){var t,e,n=this._view;return mt(n)?(t=n.x,e=(n.y+n.base)/2):(t=(n.x+n.base)/2,e=n.y),{x:t,y:e}},getArea:function(){var t=this._view;return mt(t)?t.width*Math.abs(t.y-t.base):t.height*Math.abs(t.x-t.base)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y}}}),kt={},wt=st,Mt=dt,St=gt,Ct=_t;kt.Arc=wt,kt.Line=Mt,kt.Point=St,kt.Rectangle=Ct;var Pt=H._deprecated,At=H.valueOrDefault;function Dt(t,e,n){var i,a,r=n.barThickness,o=e.stackCount,s=e.pixels[t],l=H.isNullOrUndef(r)?function(t,e){var n,i,a,r,o=t._length;for(a=1,r=e.length;a<r;++a)o=Math.min(o,Math.abs(e[a]-e[a-1]));for(a=0,r=t.getTicks().length;a<r;++a)i=t.getPixelForTick(a),o=a>0?Math.min(o,Math.abs(i-n)):o,n=i;return o}(e.scale,e.pixels):-1;return H.isNullOrUndef(r)?(i=l*n.categoryPercentage,a=n.barPercentage):(i=r*o,a=1),{chunk:i/o,ratio:a,start:s-i/2}}N._set("bar",{hover:{mode:"label"},scales:{xAxes:[{type:"category",offset:!0,gridLines:{offsetGridLines:!0}}],yAxes:[{type:"linear"}]}}),N._set("global",{datasets:{bar:{categoryPercentage:.8,barPercentage:.9}}});var Tt=it.extend({dataElementType:kt.Rectangle,_dataElementOptions:["backgroundColor","borderColor","borderSkipped","borderWidth","barPercentage","barThickness","categoryPercentage","maxBarThickness","minBarLength"],initialize:function(){var t,e,n=this;it.prototype.initialize.apply(n,arguments),(t=n.getMeta()).stack=n.getDataset().stack,t.bar=!0,e=n._getIndexScale().options,Pt("bar chart",e.barPercentage,"scales.[x/y]Axes.barPercentage","dataset.barPercentage"),Pt("bar chart",e.barThickness,"scales.[x/y]Axes.barThickness","dataset.barThickness"),Pt("bar chart",e.categoryPercentage,"scales.[x/y]Axes.categoryPercentage","dataset.categoryPercentage"),Pt("bar chart",n._getValueScale().options.minBarLength,"scales.[x/y]Axes.minBarLength","dataset.minBarLength"),Pt("bar chart",e.maxBarThickness,"scales.[x/y]Axes.maxBarThickness","dataset.maxBarThickness")},update:function(t){var e,n,i=this.getMeta().data;for(this._ruler=this.getRuler(),e=0,n=i.length;e<n;++e)this.updateElement(i[e],e,t)},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=i.getDataset(),o=i._resolveDataElementOptions(t,e);t._xScale=i.getScaleForId(a.xAxisID),t._yScale=i.getScaleForId(a.yAxisID),t._datasetIndex=i.index,t._index=e,t._model={backgroundColor:o.backgroundColor,borderColor:o.borderColor,borderSkipped:o.borderSkipped,borderWidth:o.borderWidth,datasetLabel:r.label,label:i.chart.data.labels[e]},H.isArray(r.data[e])&&(t._model.borderSkipped=null),i._updateElementGeometry(t,e,n,o),t.pivot()},_updateElementGeometry:function(t,e,n,i){var a=this,r=t._model,o=a._getValueScale(),s=o.getBasePixel(),l=o.isHorizontal(),u=a._ruler||a.getRuler(),d=a.calculateBarValuePixels(a.index,e,i),h=a.calculateBarIndexPixels(a.index,e,u,i);r.horizontal=l,r.base=n?s:d.base,r.x=l?n?s:d.head:h.center,r.y=l?h.center:n?s:d.head,r.height=l?h.size:void 0,r.width=l?void 0:h.size},_getStacks:function(t){var e,n,i=this._getIndexScale(),a=i._getMatchingVisibleMetas(this._type),r=i.options.stacked,o=a.length,s=[];for(e=0;e<o&&(n=a[e],(!1===r||-1===s.indexOf(n.stack)||void 0===r&&void 0===n.stack)&&s.push(n.stack),n.index!==t);++e);return s},getStackCount:function(){return this._getStacks().length},getStackIndex:function(t,e){var n=this._getStacks(t),i=void 0!==e?n.indexOf(e):-1;return-1===i?n.length-1:i},getRuler:function(){var t,e,n=this._getIndexScale(),i=[];for(t=0,e=this.getMeta().data.length;t<e;++t)i.push(n.getPixelForValue(null,t,this.index));return{pixels:i,start:n._startPixel,end:n._endPixel,stackCount:this.getStackCount(),scale:n}},calculateBarValuePixels:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._getValueScale(),c=h.isHorizontal(),f=d.data.datasets,g=h._getMatchingVisibleMetas(this._type),p=h._parseValue(f[t].data[e]),m=n.minBarLength,v=h.options.stacked,b=this.getMeta().stack,x=void 0===p.start?0:p.max>=0&&p.min>=0?p.min:p.max,y=void 0===p.start?p.end:p.max>=0&&p.min>=0?p.max-p.min:p.min-p.max,_=g.length;if(v||void 0===v&&void 0!==b)for(i=0;i<_&&(a=g[i]).index!==t;++i)a.stack===b&&(r=void 0===(u=h._parseValue(f[a.index].data[e])).start?u.end:u.min>=0&&u.max>=0?u.max:u.min,(p.min<0&&r<0||p.max>=0&&r>0)&&(x+=r));return o=h.getPixelForValue(x),l=(s=h.getPixelForValue(x+y))-o,void 0!==m&&Math.abs(l)<m&&(l=m,s=y>=0&&!c||y<0&&c?o-m:o+m),{size:l,base:o,head:s,center:s+l/2}},calculateBarIndexPixels:function(t,e,n,i){var a="flex"===i.barThickness?function(t,e,n){var i,a=e.pixels,r=a[t],o=t>0?a[t-1]:null,s=t<a.length-1?a[t+1]:null,l=n.categoryPercentage;return null===o&&(o=r-(null===s?e.end-e.start:s-r)),null===s&&(s=r+r-o),i=r-(r-Math.min(o,s))/2*l,{chunk:Math.abs(s-o)/2*l/e.stackCount,ratio:n.barPercentage,start:i}}(e,n,i):Dt(e,n,i),r=this.getStackIndex(t,this.getMeta().stack),o=a.start+a.chunk*r+a.chunk/2,s=Math.min(At(i.maxBarThickness,1/0),a.chunk*a.ratio);return{base:o-s/2,head:o+s/2,center:o,size:s}},draw:function(){var t=this.chart,e=this._getValueScale(),n=this.getMeta().data,i=this.getDataset(),a=n.length,r=0;for(H.canvas.clipArea(t.ctx,t.chartArea);r<a;++r){var o=e._parseValue(i.data[r]);isNaN(o.min)||isNaN(o.max)||n[r].draw()}H.canvas.unclipArea(t.ctx)},_resolveDataElementOptions:function(){var t=this,e=H.extend({},it.prototype._resolveDataElementOptions.apply(t,arguments)),n=t._getIndexScale().options,i=t._getValueScale().options;return e.barPercentage=At(n.barPercentage,e.barPercentage),e.barThickness=At(n.barThickness,e.barThickness),e.categoryPercentage=At(n.categoryPercentage,e.categoryPercentage),e.maxBarThickness=At(n.maxBarThickness,e.maxBarThickness),e.minBarLength=At(i.minBarLength,e.minBarLength),e}}),It=H.valueOrDefault,Ft=H.options.resolve;N._set("bubble",{hover:{mode:"single"},scales:{xAxes:[{type:"linear",position:"bottom",id:"x-axis-0"}],yAxes:[{type:"linear",position:"left",id:"y-axis-0"}]},tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.datasets[t.datasetIndex].label||"",i=e.datasets[t.datasetIndex].data[t.index];return n+": ("+t.xLabel+", "+t.yLabel+", "+i.r+")"}}}});var Ot=it.extend({dataElementType:kt.Point,_dataElementOptions:["backgroundColor","borderColor","borderWidth","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth","hoverRadius","hitRadius","pointStyle","rotation"],update:function(t){var e=this,n=e.getMeta().data;H.each(n,(function(n,i){e.updateElement(n,i,t)}))},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=t.custom||{},o=i.getScaleForId(a.xAxisID),s=i.getScaleForId(a.yAxisID),l=i._resolveDataElementOptions(t,e),u=i.getDataset().data[e],d=i.index,h=n?o.getPixelForDecimal(.5):o.getPixelForValue("object"==typeof u?u:NaN,e,d),c=n?s.getBasePixel():s.getPixelForValue(u,e,d);t._xScale=o,t._yScale=s,t._options=l,t._datasetIndex=d,t._index=e,t._model={backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,hitRadius:l.hitRadius,pointStyle:l.pointStyle,rotation:l.rotation,radius:n?0:l.radius,skip:r.skip||isNaN(h)||isNaN(c),x:h,y:c},t.pivot()},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=It(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=It(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=It(n.hoverBorderWidth,n.borderWidth),e.radius=n.radius+n.hoverRadius},_resolveDataElementOptions:function(t,e){var n=this,i=n.chart,a=n.getDataset(),r=t.custom||{},o=a.data[e]||{},s=it.prototype._resolveDataElementOptions.apply(n,arguments),l={chart:i,dataIndex:e,dataset:a,datasetIndex:n.index};return n._cachedDataOpts===s&&(s=H.extend({},s)),s.radius=Ft([r.radius,o.r,n._config.radius,i.options.elements.point.radius],l,e),s}}),Lt=H.valueOrDefault,Rt=Math.PI,zt=2*Rt,Nt=Rt/2;N._set("doughnut",{animation:{animateRotate:!0,animateScale:!1},hover:{mode:"single"},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r]&&(a.data[r].hidden=!a.data[r].hidden);o.update()}},cutoutPercentage:50,rotation:-Nt,circumference:zt,tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.labels[t.index],i=": "+e.datasets[t.datasetIndex].data[t.index];return H.isArray(n)?(n=n.slice())[0]+=i:n+=i,n}}}});var Bt=it.extend({dataElementType:kt.Arc,linkScales:H.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],getRingIndex:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&++e;return e},update:function(t){var e,n,i,a,r=this,o=r.chart,s=o.chartArea,l=o.options,u=1,d=1,h=0,c=0,f=r.getMeta(),g=f.data,p=l.cutoutPercentage/100||0,m=l.circumference,v=r._getRingWeight(r.index);if(m<zt){var b=l.rotation%zt,x=(b+=b>=Rt?-zt:b<-Rt?zt:0)+m,y=Math.cos(b),_=Math.sin(b),k=Math.cos(x),w=Math.sin(x),M=b<=0&&x>=0||x>=zt,S=b<=Nt&&x>=Nt||x>=zt+Nt,C=b<=-Nt&&x>=-Nt||x>=Rt+Nt,P=b===-Rt||x>=Rt?-1:Math.min(y,y*p,k,k*p),A=C?-1:Math.min(_,_*p,w,w*p),D=M?1:Math.max(y,y*p,k,k*p),T=S?1:Math.max(_,_*p,w,w*p);u=(D-P)/2,d=(T-A)/2,h=-(D+P)/2,c=-(T+A)/2}for(i=0,a=g.length;i<a;++i)g[i]._options=r._resolveDataElementOptions(g[i],i);for(o.borderWidth=r.getMaxBorderWidth(),e=(s.right-s.left-o.borderWidth)/u,n=(s.bottom-s.top-o.borderWidth)/d,o.outerRadius=Math.max(Math.min(e,n)/2,0),o.innerRadius=Math.max(o.outerRadius*p,0),o.radiusLength=(o.outerRadius-o.innerRadius)/(r._getVisibleDatasetWeightTotal()||1),o.offsetX=h*o.outerRadius,o.offsetY=c*o.outerRadius,f.total=r.calculateTotal(),r.outerRadius=o.outerRadius-o.radiusLength*r._getRingWeightOffset(r.index),r.innerRadius=Math.max(r.outerRadius-o.radiusLength*v,0),i=0,a=g.length;i<a;++i)r.updateElement(g[i],i,t)},updateElement:function(t,e,n){var i=this,a=i.chart,r=a.chartArea,o=a.options,s=o.animation,l=(r.left+r.right)/2,u=(r.top+r.bottom)/2,d=o.rotation,h=o.rotation,c=i.getDataset(),f=n&&s.animateRotate?0:t.hidden?0:i.calculateCircumference(c.data[e])*(o.circumference/zt),g=n&&s.animateScale?0:i.innerRadius,p=n&&s.animateScale?0:i.outerRadius,m=t._options||{};H.extend(t,{_datasetIndex:i.index,_index:e,_model:{backgroundColor:m.backgroundColor,borderColor:m.borderColor,borderWidth:m.borderWidth,borderAlign:m.borderAlign,x:l+a.offsetX,y:u+a.offsetY,startAngle:d,endAngle:h,circumference:f,outerRadius:p,innerRadius:g,label:H.valueAtIndexOrDefault(c.label,e,a.data.labels[e])}});var v=t._model;n&&s.animateRotate||(v.startAngle=0===e?o.rotation:i.getMeta().data[e-1]._model.endAngle,v.endAngle=v.startAngle+v.circumference),t.pivot()},calculateTotal:function(){var t,e=this.getDataset(),n=this.getMeta(),i=0;return H.each(n.data,(function(n,a){t=e.data[a],isNaN(t)||n.hidden||(i+=Math.abs(t))})),i},calculateCircumference:function(t){var e=this.getMeta().total;return e>0&&!isNaN(t)?zt*(Math.abs(t)/e):0},getMaxBorderWidth:function(t){var e,n,i,a,r,o,s,l,u=0,d=this.chart;if(!t)for(e=0,n=d.data.datasets.length;e<n;++e)if(d.isDatasetVisible(e)){t=(i=d.getDatasetMeta(e)).data,e!==this.index&&(r=i.controller);break}if(!t)return 0;for(e=0,n=t.length;e<n;++e)a=t[e],r?(r._configure(),o=r._resolveDataElementOptions(a,e)):o=a._options,"inner"!==o.borderAlign&&(s=o.borderWidth,u=(l=o.hoverBorderWidth)>(u=s>u?s:u)?l:u);return u},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=Lt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Lt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Lt(n.hoverBorderWidth,n.borderWidth)},_getRingWeightOffset:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&(e+=this._getRingWeight(n));return e},_getRingWeight:function(t){return Math.max(Lt(this.chart.data.datasets[t].weight,1),0)},_getVisibleDatasetWeightTotal:function(){return this._getRingWeightOffset(this.chart.data.datasets.length)}});N._set("horizontalBar",{hover:{mode:"index",axis:"y"},scales:{xAxes:[{type:"linear",position:"bottom"}],yAxes:[{type:"category",position:"left",offset:!0,gridLines:{offsetGridLines:!0}}]},elements:{rectangle:{borderSkipped:"left"}},tooltips:{mode:"index",axis:"y"}}),N._set("global",{datasets:{horizontalBar:{categoryPercentage:.8,barPercentage:.9}}});var Et=Tt.extend({_getValueScaleId:function(){return this.getMeta().xAxisID},_getIndexScaleId:function(){return this.getMeta().yAxisID}}),Wt=H.valueOrDefault,Vt=H.options.resolve,Ht=H.canvas._isPointInArea;function jt(t,e){var n=t&&t.options.ticks||{},i=n.reverse,a=void 0===n.min?e:0,r=void 0===n.max?e:0;return{start:i?r:a,end:i?a:r}}function qt(t,e,n){var i=n/2,a=jt(t,i),r=jt(e,i);return{top:r.end,right:a.end,bottom:r.start,left:a.start}}function Ut(t){var e,n,i,a;return H.isObject(t)?(e=t.top,n=t.right,i=t.bottom,a=t.left):e=n=i=a=t,{top:e,right:n,bottom:i,left:a}}N._set("line",{showLines:!0,spanGaps:!1,hover:{mode:"label"},scales:{xAxes:[{type:"category",id:"x-axis-0"}],yAxes:[{type:"linear",id:"y-axis-0"}]}});var Yt=it.extend({datasetElementType:kt.Line,dataElementType:kt.Point,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth","cubicInterpolationMode","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.options,l=i._config,u=i._showLine=Wt(l.showLine,s.showLines);for(i._xScale=i.getScaleForId(a.xAxisID),i._yScale=i.getScaleForId(a.yAxisID),u&&(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=i._yScale,r._datasetIndex=i.index,r._children=o,r._model=i._resolveDatasetElementOptions(r),r.pivot()),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(u&&0!==r._model.tension&&i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i,a,r=this,o=r.getMeta(),s=t.custom||{},l=r.getDataset(),u=r.index,d=l.data[e],h=r._xScale,c=r._yScale,f=o.dataset._model,g=r._resolveDataElementOptions(t,e);i=h.getPixelForValue("object"==typeof d?d:NaN,e,u),a=n?c.getBasePixel():r.calculatePointY(d,e,u),t._xScale=h,t._yScale=c,t._options=g,t._datasetIndex=u,t._index=e,t._model={x:i,y:a,skip:s.skip||isNaN(i)||isNaN(a),radius:g.radius,pointStyle:g.pointStyle,rotation:g.rotation,backgroundColor:g.backgroundColor,borderColor:g.borderColor,borderWidth:g.borderWidth,tension:Wt(s.tension,f?f.tension:0),steppedLine:!!f&&f.steppedLine,hitRadius:g.hitRadius}},_resolveDatasetElementOptions:function(t){var e=this,n=e._config,i=t.custom||{},a=e.chart.options,r=a.elements.line,o=it.prototype._resolveDatasetElementOptions.apply(e,arguments);return o.spanGaps=Wt(n.spanGaps,a.spanGaps),o.tension=Wt(n.lineTension,r.tension),o.steppedLine=Vt([i.steppedLine,n.steppedLine,r.stepped]),o.clip=Ut(Wt(n.clip,qt(e._xScale,e._yScale,o.borderWidth))),o},calculatePointY:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._yScale,c=0,f=0;if(h.options.stacked){for(s=+h.getRightValue(t),u=(l=d._getSortedVisibleDatasetMetas()).length,i=0;i<u&&(r=l[i]).index!==n;++i)a=d.data.datasets[r.index],"line"===r.type&&r.yAxisID===h.id&&((o=+h.getRightValue(a.data[e]))<0?f+=o||0:c+=o||0);return s<0?h.getPixelForValue(f+s):h.getPixelForValue(c+s)}return h.getPixelForValue(t)},updateBezierControlPoints:function(){var t,e,n,i,a=this.chart,r=this.getMeta(),o=r.dataset._model,s=a.chartArea,l=r.data||[];function u(t,e,n){return Math.max(Math.min(t,n),e)}if(o.spanGaps&&(l=l.filter((function(t){return!t._model.skip}))),"monotone"===o.cubicInterpolationMode)H.splineCurveMonotone(l);else for(t=0,e=l.length;t<e;++t)n=l[t]._model,i=H.splineCurve(H.previousItem(l,t)._model,n,H.nextItem(l,t)._model,o.tension),n.controlPointPreviousX=i.previous.x,n.controlPointPreviousY=i.previous.y,n.controlPointNextX=i.next.x,n.controlPointNextY=i.next.y;if(a.options.elements.line.capBezierPoints)for(t=0,e=l.length;t<e;++t)n=l[t]._model,Ht(n,s)&&(t>0&&Ht(l[t-1]._model,s)&&(n.controlPointPreviousX=u(n.controlPointPreviousX,s.left,s.right),n.controlPointPreviousY=u(n.controlPointPreviousY,s.top,s.bottom)),t<l.length-1&&Ht(l[t+1]._model,s)&&(n.controlPointNextX=u(n.controlPointNextX,s.left,s.right),n.controlPointNextY=u(n.controlPointNextY,s.top,s.bottom)))},draw:function(){var t,e=this.chart,n=this.getMeta(),i=n.data||[],a=e.chartArea,r=e.canvas,o=0,s=i.length;for(this._showLine&&(t=n.dataset._model.clip,H.canvas.clipArea(e.ctx,{left:!1===t.left?0:a.left-t.left,right:!1===t.right?r.width:a.right+t.right,top:!1===t.top?0:a.top-t.top,bottom:!1===t.bottom?r.height:a.bottom+t.bottom}),n.dataset.draw(),H.canvas.unclipArea(e.ctx));o<s;++o)i[o].draw(a)},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Wt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Wt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Wt(n.hoverBorderWidth,n.borderWidth),e.radius=Wt(n.hoverRadius,n.radius)}}),Gt=H.options.resolve;N._set("polarArea",{scale:{type:"radialLinear",angleLines:{display:!1},gridLines:{circular:!0},pointLabels:{display:!1},ticks:{beginAtZero:!0}},animation:{animateRotate:!0,animateScale:!0},startAngle:-.5*Math.PI,legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r].hidden=!a.data[r].hidden;o.update()}},tooltips:{callbacks:{title:function(){return""},label:function(t,e){return e.labels[t.index]+": "+t.yLabel}}}});var Xt=it.extend({dataElementType:kt.Arc,linkScales:H.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i,a=this,r=a.getDataset(),o=a.getMeta(),s=a.chart.options.startAngle||0,l=a._starts=[],u=a._angles=[],d=o.data;for(a._updateRadius(),o.count=a.countVisibleElements(),e=0,n=r.data.length;e<n;e++)l[e]=s,i=a._computeAngle(e),u[e]=i,s+=i;for(e=0,n=d.length;e<n;++e)d[e]._options=a._resolveDataElementOptions(d[e],e),a.updateElement(d[e],e,t)},_updateRadius:function(){var t=this,e=t.chart,n=e.chartArea,i=e.options,a=Math.min(n.right-n.left,n.bottom-n.top);e.outerRadius=Math.max(a/2,0),e.innerRadius=Math.max(i.cutoutPercentage?e.outerRadius/100*i.cutoutPercentage:1,0),e.radiusLength=(e.outerRadius-e.innerRadius)/e.getVisibleDatasetCount(),t.outerRadius=e.outerRadius-e.radiusLength*t.index,t.innerRadius=t.outerRadius-e.radiusLength},updateElement:function(t,e,n){var i=this,a=i.chart,r=i.getDataset(),o=a.options,s=o.animation,l=a.scale,u=a.data.labels,d=l.xCenter,h=l.yCenter,c=o.startAngle,f=t.hidden?0:l.getDistanceFromCenterForValue(r.data[e]),g=i._starts[e],p=g+(t.hidden?0:i._angles[e]),m=s.animateScale?0:l.getDistanceFromCenterForValue(r.data[e]),v=t._options||{};H.extend(t,{_datasetIndex:i.index,_index:e,_scale:l,_model:{backgroundColor:v.backgroundColor,borderColor:v.borderColor,borderWidth:v.borderWidth,borderAlign:v.borderAlign,x:d,y:h,innerRadius:0,outerRadius:n?m:f,startAngle:n&&s.animateRotate?c:g,endAngle:n&&s.animateRotate?c:p,label:H.valueAtIndexOrDefault(u,e,u[e])}}),t.pivot()},countVisibleElements:function(){var t=this.getDataset(),e=this.getMeta(),n=0;return H.each(e.data,(function(e,i){isNaN(t.data[i])||e.hidden||n++})),n},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor,a=H.valueOrDefault;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=a(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=a(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=a(n.hoverBorderWidth,n.borderWidth)},_computeAngle:function(t){var e=this,n=this.getMeta().count,i=e.getDataset(),a=e.getMeta();if(isNaN(i.data[t])||a.data[t].hidden)return 0;var r={chart:e.chart,dataIndex:t,dataset:i,datasetIndex:e.index};return Gt([e.chart.options.elements.arc.angle,2*Math.PI/n],r,t)}});N._set("pie",H.clone(N.doughnut)),N._set("pie",{cutoutPercentage:0});var Kt=Bt,Zt=H.valueOrDefault;N._set("radar",{spanGaps:!1,scale:{type:"radialLinear"},elements:{line:{fill:"start",tension:0}}});var $t=it.extend({datasetElementType:kt.Line,dataElementType:kt.Point,linkScales:H.noop,_datasetElementOptions:["backgroundColor","borderWidth","borderColor","borderCapStyle","borderDash","borderDashOffset","borderJoinStyle","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.scale,l=i._config;for(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=s,r._datasetIndex=i.index,r._children=o,r._loop=!0,r._model=i._resolveDatasetElementOptions(r),r.pivot(),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i=this,a=t.custom||{},r=i.getDataset(),o=i.chart.scale,s=o.getPointPositionForValue(e,r.data[e]),l=i._resolveDataElementOptions(t,e),u=i.getMeta().dataset._model,d=n?o.xCenter:s.x,h=n?o.yCenter:s.y;t._scale=o,t._options=l,t._datasetIndex=i.index,t._index=e,t._model={x:d,y:h,skip:a.skip||isNaN(d)||isNaN(h),radius:l.radius,pointStyle:l.pointStyle,rotation:l.rotation,backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,tension:Zt(a.tension,u?u.tension:0),hitRadius:l.hitRadius}},_resolveDatasetElementOptions:function(){var t=this,e=t._config,n=t.chart.options,i=it.prototype._resolveDatasetElementOptions.apply(t,arguments);return i.spanGaps=Zt(e.spanGaps,n.spanGaps),i.tension=Zt(e.lineTension,n.elements.line.tension),i},updateBezierControlPoints:function(){var t,e,n,i,a=this.getMeta(),r=this.chart.chartArea,o=a.data||[];function s(t,e,n){return Math.max(Math.min(t,n),e)}for(a.dataset._model.spanGaps&&(o=o.filter((function(t){return!t._model.skip}))),t=0,e=o.length;t<e;++t)n=o[t]._model,i=H.splineCurve(H.previousItem(o,t,!0)._model,n,H.nextItem(o,t,!0)._model,n.tension),n.controlPointPreviousX=s(i.previous.x,r.left,r.right),n.controlPointPreviousY=s(i.previous.y,r.top,r.bottom),n.controlPointNextX=s(i.next.x,r.left,r.right),n.controlPointNextY=s(i.next.y,r.top,r.bottom)},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Zt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Zt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Zt(n.hoverBorderWidth,n.borderWidth),e.radius=Zt(n.hoverRadius,n.radius)}});N._set("scatter",{hover:{mode:"single"},scales:{xAxes:[{id:"x-axis-1",type:"linear",position:"bottom"}],yAxes:[{id:"y-axis-1",type:"linear",position:"left"}]},tooltips:{callbacks:{title:function(){return""},label:function(t){return"("+t.xLabel+", "+t.yLabel+")"}}}}),N._set("global",{datasets:{scatter:{showLine:!1}}});var Jt={bar:Tt,bubble:Ot,doughnut:Bt,horizontalBar:Et,line:Yt,polarArea:Xt,pie:Kt,radar:$t,scatter:Yt};function Qt(t,e){return t.native?{x:t.x,y:t.y}:H.getRelativePosition(t,e)}function te(t,e){var n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas();for(i=0,r=l.length;i<r;++i)for(a=0,o=(n=l[i].data).length;a<o;++a)(s=n[a])._view.skip||e(s)}function ee(t,e){var n=[];return te(t,(function(t){t.inRange(e.x,e.y)&&n.push(t)})),n}function ne(t,e,n,i){var a=Number.POSITIVE_INFINITY,r=[];return te(t,(function(t){if(!n||t.inRange(e.x,e.y)){var o=t.getCenterPoint(),s=i(e,o);s<a?(r=[t],a=s):s===a&&r.push(t)}})),r}function ie(t){var e=-1!==t.indexOf("x"),n=-1!==t.indexOf("y");return function(t,i){var a=e?Math.abs(t.x-i.x):0,r=n?Math.abs(t.y-i.y):0;return Math.sqrt(Math.pow(a,2)+Math.pow(r,2))}}function ae(t,e,n){var i=Qt(e,t);n.axis=n.axis||"x";var a=ie(n.axis),r=n.intersect?ee(t,i):ne(t,i,!1,a),o=[];return r.length?(t._getSortedVisibleDatasetMetas().forEach((function(t){var e=t.data[r[0]._index];e&&!e._view.skip&&o.push(e)})),o):[]}var re={modes:{single:function(t,e){var n=Qt(e,t),i=[];return te(t,(function(t){if(t.inRange(n.x,n.y))return i.push(t),i})),i.slice(0,1)},label:ae,index:ae,dataset:function(t,e,n){var i=Qt(e,t);n.axis=n.axis||"xy";var a=ie(n.axis),r=n.intersect?ee(t,i):ne(t,i,!1,a);return r.length>0&&(r=t.getDatasetMeta(r[0]._datasetIndex).data),r},"x-axis":function(t,e){return ae(t,e,{intersect:!1})},point:function(t,e){return ee(t,Qt(e,t))},nearest:function(t,e,n){var i=Qt(e,t);n.axis=n.axis||"xy";var a=ie(n.axis);return ne(t,i,n.intersect,a)},x:function(t,e,n){var i=Qt(e,t),a=[],r=!1;return te(t,(function(t){t.inXRange(i.x)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a},y:function(t,e,n){var i=Qt(e,t),a=[],r=!1;return te(t,(function(t){t.inYRange(i.y)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a}}},oe=H.extend;function se(t,e){return H.where(t,(function(t){return t.pos===e}))}function le(t,e){return t.sort((function(t,n){var i=e?n:t,a=e?t:n;return i.weight===a.weight?i.index-a.index:i.weight-a.weight}))}function ue(t,e,n,i){return Math.max(t[n],e[n])+Math.max(t[i],e[i])}function de(t,e,n){var i,a,r=n.box,o=t.maxPadding;if(n.size&&(t[n.pos]-=n.size),n.size=n.horizontal?r.height:r.width,t[n.pos]+=n.size,r.getPadding){var s=r.getPadding();o.top=Math.max(o.top,s.top),o.left=Math.max(o.left,s.left),o.bottom=Math.max(o.bottom,s.bottom),o.right=Math.max(o.right,s.right)}if(i=e.outerWidth-ue(o,t,"left","right"),a=e.outerHeight-ue(o,t,"top","bottom"),i!==t.w||a!==t.h){t.w=i,t.h=a;var l=n.horizontal?[i,t.w]:[a,t.h];return!(l[0]===l[1]||isNaN(l[0])&&isNaN(l[1]))}}function he(t,e){var n=e.maxPadding;function i(t){var i={left:0,top:0,right:0,bottom:0};return t.forEach((function(t){i[t]=Math.max(e[t],n[t])})),i}return i(t?["left","right"]:["top","bottom"])}function ce(t,e,n){var i,a,r,o,s,l,u=[];for(i=0,a=t.length;i<a;++i)(o=(r=t[i]).box).update(r.width||e.w,r.height||e.h,he(r.horizontal,e)),de(e,n,r)&&(l=!0,u.length&&(s=!0)),o.fullWidth||u.push(r);return s&&ce(u,e,n)||l}function fe(t,e,n){var i,a,r,o,s=n.padding,l=e.x,u=e.y;for(i=0,a=t.length;i<a;++i)o=(r=t[i]).box,r.horizontal?(o.left=o.fullWidth?s.left:e.left,o.right=o.fullWidth?n.outerWidth-s.right:e.left+e.w,o.top=u,o.bottom=u+o.height,o.width=o.right-o.left,u=o.bottom):(o.left=l,o.right=l+o.width,o.top=e.top,o.bottom=e.top+e.h,o.height=o.bottom-o.top,l=o.right);e.x=l,e.y=u}N._set("global",{layout:{padding:{top:0,right:0,bottom:0,left:0}}});var ge,pe={defaults:{},addBox:function(t,e){t.boxes||(t.boxes=[]),e.fullWidth=e.fullWidth||!1,e.position=e.position||"top",e.weight=e.weight||0,e._layers=e._layers||function(){return[{z:0,draw:function(){e.draw.apply(e,arguments)}}]},t.boxes.push(e)},removeBox:function(t,e){var n=t.boxes?t.boxes.indexOf(e):-1;-1!==n&&t.boxes.splice(n,1)},configure:function(t,e,n){for(var i,a=["fullWidth","position","weight"],r=a.length,o=0;o<r;++o)i=a[o],n.hasOwnProperty(i)&&(e[i]=n[i])},update:function(t,e,n){if(t){var i=t.options.layout||{},a=H.options.toPadding(i.padding),r=e-a.width,o=n-a.height,s=function(t){var e=function(t){var e,n,i,a=[];for(e=0,n=(t||[]).length;e<n;++e)i=t[e],a.push({index:e,box:i,pos:i.position,horizontal:i.isHorizontal(),weight:i.weight});return a}(t),n=le(se(e,"left"),!0),i=le(se(e,"right")),a=le(se(e,"top"),!0),r=le(se(e,"bottom"));return{leftAndTop:n.concat(a),rightAndBottom:i.concat(r),chartArea:se(e,"chartArea"),vertical:n.concat(i),horizontal:a.concat(r)}}(t.boxes),l=s.vertical,u=s.horizontal,d=Object.freeze({outerWidth:e,outerHeight:n,padding:a,availableWidth:r,vBoxMaxWidth:r/2/l.length,hBoxMaxHeight:o/2}),h=oe({maxPadding:oe({},a),w:r,h:o,x:a.left,y:a.top},a);!function(t,e){var n,i,a;for(n=0,i=t.length;n<i;++n)(a=t[n]).width=a.horizontal?a.box.fullWidth&&e.availableWidth:e.vBoxMaxWidth,a.height=a.horizontal&&e.hBoxMaxHeight}(l.concat(u),d),ce(l,h,d),ce(u,h,d)&&ce(l,h,d),function(t){var e=t.maxPadding;function n(n){var i=Math.max(e[n]-t[n],0);return t[n]+=i,i}t.y+=n("top"),t.x+=n("left"),n("right"),n("bottom")}(h),fe(s.leftAndTop,h,d),h.x+=h.w,h.y+=h.h,fe(s.rightAndBottom,h,d),t.chartArea={left:h.left,top:h.top,right:h.left+h.w,bottom:h.top+h.h},H.each(s.chartArea,(function(e){var n=e.box;oe(n,t.chartArea),n.update(h.w,h.h)}))}}},me=(ge=Object.freeze({__proto__:null,default:"@keyframes chartjs-render-animation{from{opacity:.99}to{opacity:1}}.chartjs-render-monitor{animation:chartjs-render-animation 1ms}.chartjs-size-monitor,.chartjs-size-monitor-expand,.chartjs-size-monitor-shrink{position:absolute;direction:ltr;left:0;top:0;right:0;bottom:0;overflow:hidden;pointer-events:none;visibility:hidden;z-index:-1}.chartjs-size-monitor-expand>div{position:absolute;width:1000000px;height:1000000px;left:0;top:0}.chartjs-size-monitor-shrink>div{position:absolute;width:200%;height:200%;left:0;top:0}"}))&&ge.default||ge,ve="$chartjs",be="chartjs-size-monitor",xe="chartjs-render-monitor",ye="chartjs-render-animation",_e=["animationstart","webkitAnimationStart"],ke={touchstart:"mousedown",touchmove:"mousemove",touchend:"mouseup",pointerenter:"mouseenter",pointerdown:"mousedown",pointermove:"mousemove",pointerup:"mouseup",pointerleave:"mouseout",pointerout:"mouseout"};function we(t,e){var n=H.getStyle(t,e),i=n&&n.match(/^(\d+)(\.\d+)?px$/);return i?Number(i[1]):void 0}var Me=!!function(){var t=!1;try{var e=Object.defineProperty({},"passive",{get:function(){t=!0}});window.addEventListener("e",null,e)}catch(t){}return t}()&&{passive:!0};function Se(t,e,n){t.addEventListener(e,n,Me)}function Ce(t,e,n){t.removeEventListener(e,n,Me)}function Pe(t,e,n,i,a){return{type:t,chart:e,native:a||null,x:void 0!==n?n:null,y:void 0!==i?i:null}}function Ae(t){var e=document.createElement("div");return e.className=t||"",e}function De(t,e,n){var i,a,r,o,s=t[ve]||(t[ve]={}),l=s.resizer=function(t){var e=Ae(be),n=Ae(be+"-expand"),i=Ae(be+"-shrink");n.appendChild(Ae()),i.appendChild(Ae()),e.appendChild(n),e.appendChild(i),e._reset=function(){n.scrollLeft=1e6,n.scrollTop=1e6,i.scrollLeft=1e6,i.scrollTop=1e6};var a=function(){e._reset(),t()};return Se(n,"scroll",a.bind(n,"expand")),Se(i,"scroll",a.bind(i,"shrink")),e}((i=function(){if(s.resizer){var i=n.options.maintainAspectRatio&&t.parentNode,a=i?i.clientWidth:0;e(Pe("resize",n)),i&&i.clientWidth<a&&n.canvas&&e(Pe("resize",n))}},r=!1,o=[],function(){o=Array.prototype.slice.call(arguments),a=a||this,r||(r=!0,H.requestAnimFrame.call(window,(function(){r=!1,i.apply(a,o)})))}));!function(t,e){var n=t[ve]||(t[ve]={}),i=n.renderProxy=function(t){t.animationName===ye&&e()};H.each(_e,(function(e){Se(t,e,i)})),n.reflow=!!t.offsetParent,t.classList.add(xe)}(t,(function(){if(s.resizer){var e=t.parentNode;e&&e!==l.parentNode&&e.insertBefore(l,e.firstChild),l._reset()}}))}function Te(t){var e=t[ve]||{},n=e.resizer;delete e.resizer,function(t){var e=t[ve]||{},n=e.renderProxy;n&&(H.each(_e,(function(e){Ce(t,e,n)})),delete e.renderProxy),t.classList.remove(xe)}(t),n&&n.parentNode&&n.parentNode.removeChild(n)}var Ie={disableCSSInjection:!1,_enabled:"undefined"!=typeof window&&"undefined"!=typeof document,_ensureLoaded:function(t){if(!this.disableCSSInjection){var e=t.getRootNode?t.getRootNode():document;!function(t,e){var n=t[ve]||(t[ve]={});if(!n.containsStyles){n.containsStyles=!0,e="/* Chart.js */\n"+e;var i=document.createElement("style");i.setAttribute("type","text/css"),i.appendChild(document.createTextNode(e)),t.appendChild(i)}}(e.host?e:document.head,me)}},acquireContext:function(t,e){"string"==typeof t?t=document.getElementById(t):t.length&&(t=t[0]),t&&t.canvas&&(t=t.canvas);var n=t&&t.getContext&&t.getContext("2d");return n&&n.canvas===t?(this._ensureLoaded(t),function(t,e){var n=t.style,i=t.getAttribute("height"),a=t.getAttribute("width");if(t[ve]={initial:{height:i,width:a,style:{display:n.display,height:n.height,width:n.width}}},n.display=n.display||"block",null===a||""===a){var r=we(t,"width");void 0!==r&&(t.width=r)}if(null===i||""===i)if(""===t.style.height)t.height=t.width/(e.options.aspectRatio||2);else{var o=we(t,"height");void 0!==r&&(t.height=o)}}(t,e),n):null},releaseContext:function(t){var e=t.canvas;if(e[ve]){var n=e[ve].initial;["height","width"].forEach((function(t){var i=n[t];H.isNullOrUndef(i)?e.removeAttribute(t):e.setAttribute(t,i)})),H.each(n.style||{},(function(t,n){e.style[n]=t})),e.width=e.width,delete e[ve]}},addEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=n[ve]||(n[ve]={});Se(i,e,(a.proxies||(a.proxies={}))[t.id+"_"+e]=function(e){n(function(t,e){var n=ke[t.type]||t.type,i=H.getRelativePosition(t,e);return Pe(n,e,i.x,i.y,t)}(e,t))})}else De(i,n,t)},removeEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=((n[ve]||{}).proxies||{})[t.id+"_"+e];a&&Ce(i,e,a)}else Te(i)}};H.addEvent=Se,H.removeEvent=Ce;var Fe=Ie._enabled?Ie:{acquireContext:function(t){return t&&t.canvas&&(t=t.canvas),t&&t.getContext("2d")||null}},Oe=H.extend({initialize:function(){},acquireContext:function(){},releaseContext:function(){},addEventListener:function(){},removeEventListener:function(){}},Fe);N._set("global",{plugins:{}});var Le={_plugins:[],_cacheId:0,register:function(t){var e=this._plugins;[].concat(t).forEach((function(t){-1===e.indexOf(t)&&e.push(t)})),this._cacheId++},unregister:function(t){var e=this._plugins;[].concat(t).forEach((function(t){var n=e.indexOf(t);-1!==n&&e.splice(n,1)})),this._cacheId++},clear:function(){this._plugins=[],this._cacheId++},count:function(){return this._plugins.length},getAll:function(){return this._plugins},notify:function(t,e,n){var i,a,r,o,s,l=this.descriptors(t),u=l.length;for(i=0;i<u;++i)if("function"==typeof(s=(r=(a=l[i]).plugin)[e])&&((o=[t].concat(n||[])).push(a.options),!1===s.apply(r,o)))return!1;return!0},descriptors:function(t){var e=t.$plugins||(t.$plugins={});if(e.id===this._cacheId)return e.descriptors;var n=[],i=[],a=t&&t.config||{},r=a.options&&a.options.plugins||{};return this._plugins.concat(a.plugins||[]).forEach((function(t){if(-1===n.indexOf(t)){var e=t.id,a=r[e];!1!==a&&(!0===a&&(a=H.clone(N.global.plugins[e])),n.push(t),i.push({plugin:t,options:a||{}}))}})),e.descriptors=i,e.id=this._cacheId,i},_invalidate:function(t){delete t.$plugins}},Re={constructors:{},defaults:{},registerScaleType:function(t,e,n){this.constructors[t]=e,this.defaults[t]=H.clone(n)},getScaleConstructor:function(t){return this.constructors.hasOwnProperty(t)?this.constructors[t]:void 0},getScaleDefaults:function(t){return this.defaults.hasOwnProperty(t)?H.merge(Object.create(null),[N.scale,this.defaults[t]]):{}},updateScaleDefaults:function(t,e){this.defaults.hasOwnProperty(t)&&(this.defaults[t]=H.extend(this.defaults[t],e))},addScalesToLayout:function(t){H.each(t.scales,(function(e){e.fullWidth=e.options.fullWidth,e.position=e.options.position,e.weight=e.options.weight,pe.addBox(t,e)}))}},ze=H.valueOrDefault,Ne=H.rtl.getRtlAdapter;N._set("global",{tooltips:{enabled:!0,custom:null,mode:"nearest",position:"average",intersect:!0,backgroundColor:"rgba(0,0,0,0.8)",titleFontStyle:"bold",titleSpacing:2,titleMarginBottom:6,titleFontColor:"#fff",titleAlign:"left",bodySpacing:2,bodyFontColor:"#fff",bodyAlign:"left",footerFontStyle:"bold",footerSpacing:2,footerMarginTop:6,footerFontColor:"#fff",footerAlign:"left",yPadding:6,xPadding:6,caretPadding:2,caretSize:5,cornerRadius:6,multiKeyBackground:"#fff",displayColors:!0,borderColor:"rgba(0,0,0,0)",borderWidth:0,callbacks:{beforeTitle:H.noop,title:function(t,e){var n="",i=e.labels,a=i?i.length:0;if(t.length>0){var r=t[0];r.label?n=r.label:r.xLabel?n=r.xLabel:a>0&&r.index<a&&(n=i[r.index])}return n},afterTitle:H.noop,beforeBody:H.noop,beforeLabel:H.noop,label:function(t,e){var n=e.datasets[t.datasetIndex].label||"";return n&&(n+=": "),H.isNullOrUndef(t.value)?n+=t.yLabel:n+=t.value,n},labelColor:function(t,e){var n=e.getDatasetMeta(t.datasetIndex).data[t.index]._view;return{borderColor:n.borderColor,backgroundColor:n.backgroundColor}},labelTextColor:function(){return this._options.bodyFontColor},afterLabel:H.noop,afterBody:H.noop,beforeFooter:H.noop,footer:H.noop,afterFooter:H.noop}}});var Be={average:function(t){if(!t.length)return!1;var e,n,i=0,a=0,r=0;for(e=0,n=t.length;e<n;++e){var o=t[e];if(o&&o.hasValue()){var s=o.tooltipPosition();i+=s.x,a+=s.y,++r}}return{x:i/r,y:a/r}},nearest:function(t,e){var n,i,a,r=e.x,o=e.y,s=Number.POSITIVE_INFINITY;for(n=0,i=t.length;n<i;++n){var l=t[n];if(l&&l.hasValue()){var u=l.getCenterPoint(),d=H.distanceBetweenPoints(e,u);d<s&&(s=d,a=l)}}if(a){var h=a.tooltipPosition();r=h.x,o=h.y}return{x:r,y:o}}};function Ee(t,e){return e&&(H.isArray(e)?Array.prototype.push.apply(t,e):t.push(e)),t}function We(t){return("string"==typeof t||t instanceof String)&&t.indexOf("\n")>-1?t.split("\n"):t}function Ve(t){var e=N.global;return{xPadding:t.xPadding,yPadding:t.yPadding,xAlign:t.xAlign,yAlign:t.yAlign,rtl:t.rtl,textDirection:t.textDirection,bodyFontColor:t.bodyFontColor,_bodyFontFamily:ze(t.bodyFontFamily,e.defaultFontFamily),_bodyFontStyle:ze(t.bodyFontStyle,e.defaultFontStyle),_bodyAlign:t.bodyAlign,bodyFontSize:ze(t.bodyFontSize,e.defaultFontSize),bodySpacing:t.bodySpacing,titleFontColor:t.titleFontColor,_titleFontFamily:ze(t.titleFontFamily,e.defaultFontFamily),_titleFontStyle:ze(t.titleFontStyle,e.defaultFontStyle),titleFontSize:ze(t.titleFontSize,e.defaultFontSize),_titleAlign:t.titleAlign,titleSpacing:t.titleSpacing,titleMarginBottom:t.titleMarginBottom,footerFontColor:t.footerFontColor,_footerFontFamily:ze(t.footerFontFamily,e.defaultFontFamily),_footerFontStyle:ze(t.footerFontStyle,e.defaultFontStyle),footerFontSize:ze(t.footerFontSize,e.defaultFontSize),_footerAlign:t.footerAlign,footerSpacing:t.footerSpacing,footerMarginTop:t.footerMarginTop,caretSize:t.caretSize,cornerRadius:t.cornerRadius,backgroundColor:t.backgroundColor,opacity:0,legendColorBackground:t.multiKeyBackground,displayColors:t.displayColors,borderColor:t.borderColor,borderWidth:t.borderWidth}}function He(t,e){return"center"===e?t.x+t.width/2:"right"===e?t.x+t.width-t.xPadding:t.x+t.xPadding}function je(t){return Ee([],We(t))}var qe=K.extend({initialize:function(){this._model=Ve(this._options),this._lastActive=[]},getTitle:function(){var t=this,e=t._options,n=e.callbacks,i=n.beforeTitle.apply(t,arguments),a=n.title.apply(t,arguments),r=n.afterTitle.apply(t,arguments),o=[];return o=Ee(o,We(i)),o=Ee(o,We(a)),o=Ee(o,We(r))},getBeforeBody:function(){return je(this._options.callbacks.beforeBody.apply(this,arguments))},getBody:function(t,e){var n=this,i=n._options.callbacks,a=[];return H.each(t,(function(t){var r={before:[],lines:[],after:[]};Ee(r.before,We(i.beforeLabel.call(n,t,e))),Ee(r.lines,i.label.call(n,t,e)),Ee(r.after,We(i.afterLabel.call(n,t,e))),a.push(r)})),a},getAfterBody:function(){return je(this._options.callbacks.afterBody.apply(this,arguments))},getFooter:function(){var t=this,e=t._options.callbacks,n=e.beforeFooter.apply(t,arguments),i=e.footer.apply(t,arguments),a=e.afterFooter.apply(t,arguments),r=[];return r=Ee(r,We(n)),r=Ee(r,We(i)),r=Ee(r,We(a))},update:function(t){var e,n,i,a,r,o,s,l,u,d,h=this,c=h._options,f=h._model,g=h._model=Ve(c),p=h._active,m=h._data,v={xAlign:f.xAlign,yAlign:f.yAlign},b={x:f.x,y:f.y},x={width:f.width,height:f.height},y={x:f.caretX,y:f.caretY};if(p.length){g.opacity=1;var _=[],k=[];y=Be[c.position].call(h,p,h._eventPosition);var w=[];for(e=0,n=p.length;e<n;++e)w.push((i=p[e],a=void 0,r=void 0,o=void 0,s=void 0,l=void 0,u=void 0,d=void 0,a=i._xScale,r=i._yScale||i._scale,o=i._index,s=i._datasetIndex,l=i._chart.getDatasetMeta(s).controller,u=l._getIndexScale(),d=l._getValueScale(),{xLabel:a?a.getLabelForIndex(o,s):"",yLabel:r?r.getLabelForIndex(o,s):"",label:u?""+u.getLabelForIndex(o,s):"",value:d?""+d.getLabelForIndex(o,s):"",index:o,datasetIndex:s,x:i._model.x,y:i._model.y}));c.filter&&(w=w.filter((function(t){return c.filter(t,m)}))),c.itemSort&&(w=w.sort((function(t,e){return c.itemSort(t,e,m)}))),H.each(w,(function(t){_.push(c.callbacks.labelColor.call(h,t,h._chart)),k.push(c.callbacks.labelTextColor.call(h,t,h._chart))})),g.title=h.getTitle(w,m),g.beforeBody=h.getBeforeBody(w,m),g.body=h.getBody(w,m),g.afterBody=h.getAfterBody(w,m),g.footer=h.getFooter(w,m),g.x=y.x,g.y=y.y,g.caretPadding=c.caretPadding,g.labelColors=_,g.labelTextColors=k,g.dataPoints=w,x=function(t,e){var n=t._chart.ctx,i=2*e.yPadding,a=0,r=e.body,o=r.reduce((function(t,e){return t+e.before.length+e.lines.length+e.after.length}),0);o+=e.beforeBody.length+e.afterBody.length;var s=e.title.length,l=e.footer.length,u=e.titleFontSize,d=e.bodyFontSize,h=e.footerFontSize;i+=s*u,i+=s?(s-1)*e.titleSpacing:0,i+=s?e.titleMarginBottom:0,i+=o*d,i+=o?(o-1)*e.bodySpacing:0,i+=l?e.footerMarginTop:0,i+=l*h,i+=l?(l-1)*e.footerSpacing:0;var c=0,f=function(t){a=Math.max(a,n.measureText(t).width+c)};return n.font=H.fontString(u,e._titleFontStyle,e._titleFontFamily),H.each(e.title,f),n.font=H.fontString(d,e._bodyFontStyle,e._bodyFontFamily),H.each(e.beforeBody.concat(e.afterBody),f),c=e.displayColors?d+2:0,H.each(r,(function(t){H.each(t.before,f),H.each(t.lines,f),H.each(t.after,f)})),c=0,n.font=H.fontString(h,e._footerFontStyle,e._footerFontFamily),H.each(e.footer,f),{width:a+=2*e.xPadding,height:i}}(this,g),b=function(t,e,n,i){var a=t.x,r=t.y,o=t.caretSize,s=t.caretPadding,l=t.cornerRadius,u=n.xAlign,d=n.yAlign,h=o+s,c=l+s;return"right"===u?a-=e.width:"center"===u&&((a-=e.width/2)+e.width>i.width&&(a=i.width-e.width),a<0&&(a=0)),"top"===d?r+=h:r-="bottom"===d?e.height+h:e.height/2,"center"===d?"left"===u?a+=h:"right"===u&&(a-=h):"left"===u?a-=c:"right"===u&&(a+=c),{x:a,y:r}}(g,x,v=function(t,e){var n,i,a,r,o,s=t._model,l=t._chart,u=t._chart.chartArea,d="center",h="center";s.y<e.height?h="top":s.y>l.height-e.height&&(h="bottom");var c=(u.left+u.right)/2,f=(u.top+u.bottom)/2;"center"===h?(n=function(t){return t<=c},i=function(t){return t>c}):(n=function(t){return t<=e.width/2},i=function(t){return t>=l.width-e.width/2}),a=function(t){return t+e.width+s.caretSize+s.caretPadding>l.width},r=function(t){return t-e.width-s.caretSize-s.caretPadding<0},o=function(t){return t<=f?"top":"bottom"},n(s.x)?(d="left",a(s.x)&&(d="center",h=o(s.y))):i(s.x)&&(d="right",r(s.x)&&(d="center",h=o(s.y)));var g=t._options;return{xAlign:g.xAlign?g.xAlign:d,yAlign:g.yAlign?g.yAlign:h}}(this,x),h._chart)}else g.opacity=0;return g.xAlign=v.xAlign,g.yAlign=v.yAlign,g.x=b.x,g.y=b.y,g.width=x.width,g.height=x.height,g.caretX=y.x,g.caretY=y.y,h._model=g,t&&c.custom&&c.custom.call(h,g),h},drawCaret:function(t,e){var n=this._chart.ctx,i=this._view,a=this.getCaretPosition(t,e,i);n.lineTo(a.x1,a.y1),n.lineTo(a.x2,a.y2),n.lineTo(a.x3,a.y3)},getCaretPosition:function(t,e,n){var i,a,r,o,s,l,u=n.caretSize,d=n.cornerRadius,h=n.xAlign,c=n.yAlign,f=t.x,g=t.y,p=e.width,m=e.height;if("center"===c)s=g+m/2,"left"===h?(a=(i=f)-u,r=i,o=s+u,l=s-u):(a=(i=f+p)+u,r=i,o=s-u,l=s+u);else if("left"===h?(i=(a=f+d+u)-u,r=a+u):"right"===h?(i=(a=f+p-d-u)-u,r=a+u):(i=(a=n.caretX)-u,r=a+u),"top"===c)s=(o=g)-u,l=o;else{s=(o=g+m)+u,l=o;var v=r;r=i,i=v}return{x1:i,x2:a,x3:r,y1:o,y2:s,y3:l}},drawTitle:function(t,e,n){var i,a,r,o=e.title,s=o.length;if(s){var l=Ne(e.rtl,e.x,e.width);for(t.x=He(e,e._titleAlign),n.textAlign=l.textAlign(e._titleAlign),n.textBaseline="middle",i=e.titleFontSize,a=e.titleSpacing,n.fillStyle=e.titleFontColor,n.font=H.fontString(i,e._titleFontStyle,e._titleFontFamily),r=0;r<s;++r)n.fillText(o[r],l.x(t.x),t.y+i/2),t.y+=i+a,r+1===s&&(t.y+=e.titleMarginBottom-a)}},drawBody:function(t,e,n){var i,a,r,o,s,l,u,d,h=e.bodyFontSize,c=e.bodySpacing,f=e._bodyAlign,g=e.body,p=e.displayColors,m=0,v=p?He(e,"left"):0,b=Ne(e.rtl,e.x,e.width),x=function(e){n.fillText(e,b.x(t.x+m),t.y+h/2),t.y+=h+c},y=b.textAlign(f);for(n.textAlign=f,n.textBaseline="middle",n.font=H.fontString(h,e._bodyFontStyle,e._bodyFontFamily),t.x=He(e,y),n.fillStyle=e.bodyFontColor,H.each(e.beforeBody,x),m=p&&"right"!==y?"center"===f?h/2+1:h+2:0,s=0,u=g.length;s<u;++s){for(i=g[s],a=e.labelTextColors[s],r=e.labelColors[s],n.fillStyle=a,H.each(i.before,x),l=0,d=(o=i.lines).length;l<d;++l){if(p){var _=b.x(v);n.fillStyle=e.legendColorBackground,n.fillRect(b.leftForLtr(_,h),t.y,h,h),n.lineWidth=1,n.strokeStyle=r.borderColor,n.strokeRect(b.leftForLtr(_,h),t.y,h,h),n.fillStyle=r.backgroundColor,n.fillRect(b.leftForLtr(b.xPlus(_,1),h-2),t.y+1,h-2,h-2),n.fillStyle=a}x(o[l])}H.each(i.after,x)}m=0,H.each(e.afterBody,x),t.y-=c},drawFooter:function(t,e,n){var i,a,r=e.footer,o=r.length;if(o){var s=Ne(e.rtl,e.x,e.width);for(t.x=He(e,e._footerAlign),t.y+=e.footerMarginTop,n.textAlign=s.textAlign(e._footerAlign),n.textBaseline="middle",i=e.footerFontSize,n.fillStyle=e.footerFontColor,n.font=H.fontString(i,e._footerFontStyle,e._footerFontFamily),a=0;a<o;++a)n.fillText(r[a],s.x(t.x),t.y+i/2),t.y+=i+e.footerSpacing}},drawBackground:function(t,e,n,i){n.fillStyle=e.backgroundColor,n.strokeStyle=e.borderColor,n.lineWidth=e.borderWidth;var a=e.xAlign,r=e.yAlign,o=t.x,s=t.y,l=i.width,u=i.height,d=e.cornerRadius;n.beginPath(),n.moveTo(o+d,s),"top"===r&&this.drawCaret(t,i),n.lineTo(o+l-d,s),n.quadraticCurveTo(o+l,s,o+l,s+d),"center"===r&&"right"===a&&this.drawCaret(t,i),n.lineTo(o+l,s+u-d),n.quadraticCurveTo(o+l,s+u,o+l-d,s+u),"bottom"===r&&this.drawCaret(t,i),n.lineTo(o+d,s+u),n.quadraticCurveTo(o,s+u,o,s+u-d),"center"===r&&"left"===a&&this.drawCaret(t,i),n.lineTo(o,s+d),n.quadraticCurveTo(o,s,o+d,s),n.closePath(),n.fill(),e.borderWidth>0&&n.stroke()},draw:function(){var t=this._chart.ctx,e=this._view;if(0!==e.opacity){var n={width:e.width,height:e.height},i={x:e.x,y:e.y},a=Math.abs(e.opacity<.001)?0:e.opacity,r=e.title.length||e.beforeBody.length||e.body.length||e.afterBody.length||e.footer.length;this._options.enabled&&r&&(t.save(),t.globalAlpha=a,this.drawBackground(i,e,t,n),i.y+=e.yPadding,H.rtl.overrideTextDirection(t,e.textDirection),this.drawTitle(i,e,t),this.drawBody(i,e,t),this.drawFooter(i,e,t),H.rtl.restoreTextDirection(t,e.textDirection),t.restore())}},handleEvent:function(t){var e,n=this,i=n._options;return n._lastActive=n._lastActive||[],"mouseout"===t.type?n._active=[]:(n._active=n._chart.getElementsAtEventForMode(t,i.mode,i),i.reverse&&n._active.reverse()),(e=!H.arrayEquals(n._active,n._lastActive))&&(n._lastActive=n._active,(i.enabled||i.custom)&&(n._eventPosition={x:t.x,y:t.y},n.update(!0),n.pivot())),e}}),Ue=Be,Ye=qe;Ye.positioners=Ue;var Ge=H.valueOrDefault;function Xe(){return H.merge(Object.create(null),[].slice.call(arguments),{merger:function(t,e,n,i){if("xAxes"===t||"yAxes"===t){var a,r,o,s=n[t].length;for(e[t]||(e[t]=[]),a=0;a<s;++a)o=n[t][a],r=Ge(o.type,"xAxes"===t?"category":"linear"),a>=e[t].length&&e[t].push({}),!e[t][a].type||o.type&&o.type!==e[t][a].type?H.merge(e[t][a],[Re.getScaleDefaults(r),o]):H.merge(e[t][a],o)}else H._merger(t,e,n,i)}})}function Ke(){return H.merge(Object.create(null),[].slice.call(arguments),{merger:function(t,e,n,i){var a=e[t]||Object.create(null),r=n[t];"scales"===t?e[t]=Xe(a,r):"scale"===t?e[t]=H.merge(a,[Re.getScaleDefaults(r.type),r]):H._merger(t,e,n,i)}})}function Ze(t){var e=t.options;H.each(t.scales,(function(e){pe.removeBox(t,e)})),e=Ke(N.global,N[t.config.type],e),t.options=t.config.options=e,t.ensureScalesHaveIDs(),t.buildOrUpdateScales(),t.tooltip._options=e.tooltips,t.tooltip.initialize()}function $e(t,e,n){var i,a=function(t){return t.id===i};do{i=e+n++}while(H.findIndex(t,a)>=0);return i}function Je(t){return"top"===t||"bottom"===t}function Qe(t,e){return function(n,i){return n[t]===i[t]?n[e]-i[e]:n[t]-i[t]}}N._set("global",{elements:{},events:["mousemove","mouseout","click","touchstart","touchmove"],hover:{onHover:null,mode:"nearest",intersect:!0,animationDuration:400},onClick:null,maintainAspectRatio:!0,responsive:!0,responsiveAnimationDuration:0});var tn=function(t,e){return this.construct(t,e),this};H.extend(tn.prototype,{construct:function(t,e){var n=this;e=function(t){var e=(t=t||Object.create(null)).data=t.data||{};return e.datasets=e.datasets||[],e.labels=e.labels||[],t.options=Ke(N.global,N[t.type],t.options||{}),t}(e);var i=Oe.acquireContext(t,e),a=i&&i.canvas,r=a&&a.height,o=a&&a.width;n.id=H.uid(),n.ctx=i,n.canvas=a,n.config=e,n.width=o,n.height=r,n.aspectRatio=r?o/r:null,n.options=e.options,n._bufferedRender=!1,n._layers=[],n.chart=n,n.controller=n,tn.instances[n.id]=n,Object.defineProperty(n,"data",{get:function(){return n.config.data},set:function(t){n.config.data=t}}),i&&a?(n.initialize(),n.update()):console.error("Failed to create chart: can't acquire context from the given item")},initialize:function(){var t=this;return Le.notify(t,"beforeInit"),H.retinaScale(t,t.options.devicePixelRatio),t.bindEvents(),t.options.responsive&&t.resize(!0),t.initToolTip(),Le.notify(t,"afterInit"),t},clear:function(){return H.canvas.clear(this),this},stop:function(){return J.cancelAnimation(this),this},resize:function(t){var e=this,n=e.options,i=e.canvas,a=n.maintainAspectRatio&&e.aspectRatio||null,r=Math.max(0,Math.floor(H.getMaximumWidth(i))),o=Math.max(0,Math.floor(a?r/a:H.getMaximumHeight(i)));if((e.width!==r||e.height!==o)&&(i.width=e.width=r,i.height=e.height=o,i.style.width=r+"px",i.style.height=o+"px",H.retinaScale(e,n.devicePixelRatio),!t)){var s={width:r,height:o};Le.notify(e,"resize",[s]),n.onResize&&n.onResize(e,s),e.stop(),e.update({duration:n.responsiveAnimationDuration})}},ensureScalesHaveIDs:function(){var t=this.options,e=t.scales||{},n=t.scale;H.each(e.xAxes,(function(t,n){t.id||(t.id=$e(e.xAxes,"x-axis-",n))})),H.each(e.yAxes,(function(t,n){t.id||(t.id=$e(e.yAxes,"y-axis-",n))})),n&&(n.id=n.id||"scale")},buildOrUpdateScales:function(){var t=this,e=t.options,n=t.scales||{},i=[],a=Object.keys(n).reduce((function(t,e){return t[e]=!1,t}),{});e.scales&&(i=i.concat((e.scales.xAxes||[]).map((function(t){return{options:t,dtype:"category",dposition:"bottom"}})),(e.scales.yAxes||[]).map((function(t){return{options:t,dtype:"linear",dposition:"left"}})))),e.scale&&i.push({options:e.scale,dtype:"radialLinear",isDefault:!0,dposition:"chartArea"}),H.each(i,(function(e){var i=e.options,r=i.id,o=Ge(i.type,e.dtype);Je(i.position)!==Je(e.dposition)&&(i.position=e.dposition),a[r]=!0;var s=null;if(r in n&&n[r].type===o)(s=n[r]).options=i,s.ctx=t.ctx,s.chart=t;else{var l=Re.getScaleConstructor(o);if(!l)return;s=new l({id:r,type:o,options:i,ctx:t.ctx,chart:t}),n[s.id]=s}s.mergeTicksOptions(),e.isDefault&&(t.scale=s)})),H.each(a,(function(t,e){t||delete n[e]})),t.scales=n,Re.addScalesToLayout(this)},buildOrUpdateControllers:function(){var t,e,n=this,i=[],a=n.data.datasets;for(t=0,e=a.length;t<e;t++){var r=a[t],o=n.getDatasetMeta(t),s=r.type||n.config.type;if(o.type&&o.type!==s&&(n.destroyDatasetMeta(t),o=n.getDatasetMeta(t)),o.type=s,o.order=r.order||0,o.index=t,o.controller)o.controller.updateIndex(t),o.controller.linkScales();else{var l=Jt[o.type];if(void 0===l)throw new Error('"'+o.type+'" is not a chart type.');o.controller=new l(n,t),i.push(o.controller)}}return i},resetElements:function(){var t=this;H.each(t.data.datasets,(function(e,n){t.getDatasetMeta(n).controller.reset()}),t)},reset:function(){this.resetElements(),this.tooltip.initialize()},update:function(t){var e,n,i=this;if(t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]}),Ze(i),Le._invalidate(i),!1!==Le.notify(i,"beforeUpdate")){i.tooltip._data=i.data;var a=i.buildOrUpdateControllers();for(e=0,n=i.data.datasets.length;e<n;e++)i.getDatasetMeta(e).controller.buildOrUpdateElements();i.updateLayout(),i.options.animation&&i.options.animation.duration&&H.each(a,(function(t){t.reset()})),i.updateDatasets(),i.tooltip.initialize(),i.lastActive=[],Le.notify(i,"afterUpdate"),i._layers.sort(Qe("z","_idx")),i._bufferedRender?i._bufferedRequest={duration:t.duration,easing:t.easing,lazy:t.lazy}:i.render(t)}},updateLayout:function(){var t=this;!1!==Le.notify(t,"beforeLayout")&&(pe.update(this,this.width,this.height),t._layers=[],H.each(t.boxes,(function(e){e._configure&&e._configure(),t._layers.push.apply(t._layers,e._layers())}),t),t._layers.forEach((function(t,e){t._idx=e})),Le.notify(t,"afterScaleUpdate"),Le.notify(t,"afterLayout"))},updateDatasets:function(){if(!1!==Le.notify(this,"beforeDatasetsUpdate")){for(var t=0,e=this.data.datasets.length;t<e;++t)this.updateDataset(t);Le.notify(this,"afterDatasetsUpdate")}},updateDataset:function(t){var e=this.getDatasetMeta(t),n={meta:e,index:t};!1!==Le.notify(this,"beforeDatasetUpdate",[n])&&(e.controller._update(),Le.notify(this,"afterDatasetUpdate",[n]))},render:function(t){var e=this;t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]});var n=e.options.animation,i=Ge(t.duration,n&&n.duration),a=t.lazy;if(!1!==Le.notify(e,"beforeRender")){var r=function(t){Le.notify(e,"afterRender"),H.callback(n&&n.onComplete,[t],e)};if(n&&i){var o=new $({numSteps:i/16.66,easing:t.easing||n.easing,render:function(t,e){var n=H.easing.effects[e.easing],i=e.currentStep,a=i/e.numSteps;t.draw(n(a),a,i)},onAnimationProgress:n.onProgress,onAnimationComplete:r});J.addAnimation(e,o,i,a)}else e.draw(),r(new $({numSteps:0,chart:e}));return e}},draw:function(t){var e,n,i=this;if(i.clear(),H.isNullOrUndef(t)&&(t=1),i.transition(t),!(i.width<=0||i.height<=0)&&!1!==Le.notify(i,"beforeDraw",[t])){for(n=i._layers,e=0;e<n.length&&n[e].z<=0;++e)n[e].draw(i.chartArea);for(i.drawDatasets(t);e<n.length;++e)n[e].draw(i.chartArea);i._drawTooltip(t),Le.notify(i,"afterDraw",[t])}},transition:function(t){for(var e=0,n=(this.data.datasets||[]).length;e<n;++e)this.isDatasetVisible(e)&&this.getDatasetMeta(e).controller.transition(t);this.tooltip.transition(t)},_getSortedDatasetMetas:function(t){var e,n,i=[];for(e=0,n=(this.data.datasets||[]).length;e<n;++e)t&&!this.isDatasetVisible(e)||i.push(this.getDatasetMeta(e));return i.sort(Qe("order","index")),i},_getSortedVisibleDatasetMetas:function(){return this._getSortedDatasetMetas(!0)},drawDatasets:function(t){var e,n;if(!1!==Le.notify(this,"beforeDatasetsDraw",[t])){for(n=(e=this._getSortedVisibleDatasetMetas()).length-1;n>=0;--n)this.drawDataset(e[n],t);Le.notify(this,"afterDatasetsDraw",[t])}},drawDataset:function(t,e){var n={meta:t,index:t.index,easingValue:e};!1!==Le.notify(this,"beforeDatasetDraw",[n])&&(t.controller.draw(e),Le.notify(this,"afterDatasetDraw",[n]))},_drawTooltip:function(t){var e=this.tooltip,n={tooltip:e,easingValue:t};!1!==Le.notify(this,"beforeTooltipDraw",[n])&&(e.draw(),Le.notify(this,"afterTooltipDraw",[n]))},getElementAtEvent:function(t){return re.modes.single(this,t)},getElementsAtEvent:function(t){return re.modes.label(this,t,{intersect:!0})},getElementsAtXAxis:function(t){return re.modes["x-axis"](this,t,{intersect:!0})},getElementsAtEventForMode:function(t,e,n){var i=re.modes[e];return"function"==typeof i?i(this,t,n):[]},getDatasetAtEvent:function(t){return re.modes.dataset(this,t,{intersect:!0})},getDatasetMeta:function(t){var e=this.data.datasets[t];e._meta||(e._meta={});var n=e._meta[this.id];return n||(n=e._meta[this.id]={type:null,data:[],dataset:null,controller:null,hidden:null,xAxisID:null,yAxisID:null,order:e.order||0,index:t}),n},getVisibleDatasetCount:function(){for(var t=0,e=0,n=this.data.datasets.length;e<n;++e)this.isDatasetVisible(e)&&t++;return t},isDatasetVisible:function(t){var e=this.getDatasetMeta(t);return"boolean"==typeof e.hidden?!e.hidden:!this.data.datasets[t].hidden},generateLegend:function(){return this.options.legendCallback(this)},destroyDatasetMeta:function(t){var e=this.id,n=this.data.datasets[t],i=n._meta&&n._meta[e];i&&(i.controller.destroy(),delete n._meta[e])},destroy:function(){var t,e,n=this,i=n.canvas;for(n.stop(),t=0,e=n.data.datasets.length;t<e;++t)n.destroyDatasetMeta(t);i&&(n.unbindEvents(),H.canvas.clear(n),Oe.releaseContext(n.ctx),n.canvas=null,n.ctx=null),Le.notify(n,"destroy"),delete tn.instances[n.id]},toBase64Image:function(){return this.canvas.toDataURL.apply(this.canvas,arguments)},initToolTip:function(){var t=this;t.tooltip=new Ye({_chart:t,_chartInstance:t,_data:t.data,_options:t.options.tooltips},t)},bindEvents:function(){var t=this,e=t._listeners={},n=function(){t.eventHandler.apply(t,arguments)};H.each(t.options.events,(function(i){Oe.addEventListener(t,i,n),e[i]=n})),t.options.responsive&&(n=function(){t.resize()},Oe.addEventListener(t,"resize",n),e.resize=n)},unbindEvents:function(){var t=this,e=t._listeners;e&&(delete t._listeners,H.each(e,(function(e,n){Oe.removeEventListener(t,n,e)})))},updateHoverStyle:function(t,e,n){var i,a,r,o=n?"set":"remove";for(a=0,r=t.length;a<r;++a)(i=t[a])&&this.getDatasetMeta(i._datasetIndex).controller[o+"HoverStyle"](i);"dataset"===e&&this.getDatasetMeta(t[0]._datasetIndex).controller["_"+o+"DatasetHoverStyle"]()},eventHandler:function(t){var e=this,n=e.tooltip;if(!1!==Le.notify(e,"beforeEvent",[t])){e._bufferedRender=!0,e._bufferedRequest=null;var i=e.handleEvent(t);n&&(i=n._start?n.handleEvent(t):i|n.handleEvent(t)),Le.notify(e,"afterEvent",[t]);var a=e._bufferedRequest;return a?e.render(a):i&&!e.animating&&(e.stop(),e.render({duration:e.options.hover.animationDuration,lazy:!0})),e._bufferedRender=!1,e._bufferedRequest=null,e}},handleEvent:function(t){var e,n=this,i=n.options||{},a=i.hover;return n.lastActive=n.lastActive||[],"mouseout"===t.type?n.active=[]:n.active=n.getElementsAtEventForMode(t,a.mode,a),H.callback(i.onHover||i.hover.onHover,[t.native,n.active],n),"mouseup"!==t.type&&"click"!==t.type||i.onClick&&i.onClick.call(n,t.native,n.active),n.lastActive.length&&n.updateHoverStyle(n.lastActive,a.mode,!1),n.active.length&&a.mode&&n.updateHoverStyle(n.active,a.mode,!0),e=!H.arrayEquals(n.active,n.lastActive),n.lastActive=n.active,e}}),tn.instances={};var en=tn;tn.Controller=tn,tn.types={},H.configMerge=Ke,H.scaleMerge=Xe;function nn(){throw new Error("This method is not implemented: either no adapter can be found or an incomplete integration was provided.")}function an(t){this.options=t||{}}H.extend(an.prototype,{formats:nn,parse:nn,format:nn,add:nn,diff:nn,startOf:nn,endOf:nn,_create:function(t){return t}}),an.override=function(t){H.extend(an.prototype,t)};var rn={_date:an},on={formatters:{values:function(t){return H.isArray(t)?t:""+t},linear:function(t,e,n){var i=n.length>3?n[2]-n[1]:n[1]-n[0];Math.abs(i)>1&&t!==Math.floor(t)&&(i=t-Math.floor(t));var a=H.log10(Math.abs(i)),r="";if(0!==t)if(Math.max(Math.abs(n[0]),Math.abs(n[n.length-1]))<1e-4){var o=H.log10(Math.abs(t)),s=Math.floor(o)-Math.floor(a);s=Math.max(Math.min(s,20),0),r=t.toExponential(s)}else{var l=-1*Math.floor(a);l=Math.max(Math.min(l,20),0),r=t.toFixed(l)}else r="0";return r},logarithmic:function(t,e,n){var i=t/Math.pow(10,Math.floor(H.log10(t)));return 0===t?"0":1===i||2===i||5===i||0===e||e===n.length-1?t.toExponential():""}}},sn=H.isArray,ln=H.isNullOrUndef,un=H.valueOrDefault,dn=H.valueAtIndexOrDefault;function hn(t,e,n){var i,a=t.getTicks().length,r=Math.min(e,a-1),o=t.getPixelForTick(r),s=t._startPixel,l=t._endPixel;if(!(n&&(i=1===a?Math.max(o-s,l-o):0===e?(t.getPixelForTick(1)-o)/2:(o-t.getPixelForTick(r-1))/2,(o+=r<e?i:-i)<s-1e-6||o>l+1e-6)))return o}function cn(t,e,n,i){var a,r,o,s,l,u,d,h,c,f,g,p,m,v=n.length,b=[],x=[],y=[],_=0,k=0;for(a=0;a<v;++a){if(s=n[a].label,l=n[a].major?e.major:e.minor,t.font=u=l.string,d=i[u]=i[u]||{data:{},gc:[]},h=l.lineHeight,c=f=0,ln(s)||sn(s)){if(sn(s))for(r=0,o=s.length;r<o;++r)g=s[r],ln(g)||sn(g)||(c=H.measureText(t,d.data,d.gc,c,g),f+=h)}else c=H.measureText(t,d.data,d.gc,c,s),f=h;b.push(c),x.push(f),y.push(h/2),_=Math.max(c,_),k=Math.max(f,k)}function w(t){return{width:b[t]||0,height:x[t]||0,offset:y[t]||0}}return function(t,e){H.each(t,(function(t){var n,i=t.gc,a=i.length/2;if(a>e){for(n=0;n<a;++n)delete t.data[i[n]];i.splice(0,a)}}))}(i,v),p=b.indexOf(_),m=x.indexOf(k),{first:w(0),last:w(v-1),widest:w(p),highest:w(m)}}function fn(t){return t.drawTicks?t.tickMarkLength:0}function gn(t){var e,n;return t.display?(e=H.options._parseFont(t),n=H.options.toPadding(t.padding),e.lineHeight+n.height):0}function pn(t,e){return H.extend(H.options._parseFont({fontFamily:un(e.fontFamily,t.fontFamily),fontSize:un(e.fontSize,t.fontSize),fontStyle:un(e.fontStyle,t.fontStyle),lineHeight:un(e.lineHeight,t.lineHeight)}),{color:H.options.resolve([e.fontColor,t.fontColor,N.global.defaultFontColor])})}function mn(t){var e=pn(t,t.minor);return{minor:e,major:t.major.enabled?pn(t,t.major):e}}function vn(t){var e,n,i,a=[];for(n=0,i=t.length;n<i;++n)void 0!==(e=t[n])._index&&a.push(e);return a}function bn(t,e,n,i){var a,r,o,s,l=un(n,0),u=Math.min(un(i,t.length),t.length),d=0;for(e=Math.ceil(e),i&&(e=(a=i-n)/Math.floor(a/e)),s=l;s<0;)d++,s=Math.round(l+d*e);for(r=Math.max(l,0);r<u;r++)o=t[r],r===s?(o._index=r,d++,s=Math.round(l+d*e)):delete o.label}N._set("scale",{display:!0,position:"left",offset:!1,gridLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,drawBorder:!0,drawOnChartArea:!0,drawTicks:!0,tickMarkLength:10,zeroLineWidth:1,zeroLineColor:"rgba(0,0,0,0.25)",zeroLineBorderDash:[],zeroLineBorderDashOffset:0,offsetGridLines:!1,borderDash:[],borderDashOffset:0},scaleLabel:{display:!1,labelString:"",padding:{top:4,bottom:4}},ticks:{beginAtZero:!1,minRotation:0,maxRotation:50,mirror:!1,padding:0,reverse:!1,display:!0,autoSkip:!0,autoSkipPadding:0,labelOffset:0,callback:on.formatters.values,minor:{},major:{}}});var xn=K.extend({zeroLineIndex:0,getPadding:function(){return{left:this.paddingLeft||0,top:this.paddingTop||0,right:this.paddingRight||0,bottom:this.paddingBottom||0}},getTicks:function(){return this._ticks},_getLabels:function(){var t=this.chart.data;return this.options.labels||(this.isHorizontal()?t.xLabels:t.yLabels)||t.labels||[]},mergeTicksOptions:function(){},beforeUpdate:function(){H.callback(this.options.beforeUpdate,[this])},update:function(t,e,n){var i,a,r,o,s,l=this,u=l.options.ticks,d=u.sampleSize;if(l.beforeUpdate(),l.maxWidth=t,l.maxHeight=e,l.margins=H.extend({left:0,right:0,top:0,bottom:0},n),l._ticks=null,l.ticks=null,l._labelSizes=null,l._maxLabelLines=0,l.longestLabelWidth=0,l.longestTextCache=l.longestTextCache||{},l._gridLineItems=null,l._labelItems=null,l.beforeSetDimensions(),l.setDimensions(),l.afterSetDimensions(),l.beforeDataLimits(),l.determineDataLimits(),l.afterDataLimits(),l.beforeBuildTicks(),o=l.buildTicks()||[],(!(o=l.afterBuildTicks(o)||o)||!o.length)&&l.ticks)for(o=[],i=0,a=l.ticks.length;i<a;++i)o.push({value:l.ticks[i],major:!1});return l._ticks=o,s=d<o.length,r=l._convertTicksToLabels(s?function(t,e){for(var n=[],i=t.length/e,a=0,r=t.length;a<r;a+=i)n.push(t[Math.floor(a)]);return n}(o,d):o),l._configure(),l.beforeCalculateTickRotation(),l.calculateTickRotation(),l.afterCalculateTickRotation(),l.beforeFit(),l.fit(),l.afterFit(),l._ticksToDraw=u.display&&(u.autoSkip||"auto"===u.source)?l._autoSkip(o):o,s&&(r=l._convertTicksToLabels(l._ticksToDraw)),l.ticks=r,l.afterUpdate(),l.minSize},_configure:function(){var t,e,n=this,i=n.options.ticks.reverse;n.isHorizontal()?(t=n.left,e=n.right):(t=n.top,e=n.bottom,i=!i),n._startPixel=t,n._endPixel=e,n._reversePixels=i,n._length=e-t},afterUpdate:function(){H.callback(this.options.afterUpdate,[this])},beforeSetDimensions:function(){H.callback(this.options.beforeSetDimensions,[this])},setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0},afterSetDimensions:function(){H.callback(this.options.afterSetDimensions,[this])},beforeDataLimits:function(){H.callback(this.options.beforeDataLimits,[this])},determineDataLimits:H.noop,afterDataLimits:function(){H.callback(this.options.afterDataLimits,[this])},beforeBuildTicks:function(){H.callback(this.options.beforeBuildTicks,[this])},buildTicks:H.noop,afterBuildTicks:function(t){var e=this;return sn(t)&&t.length?H.callback(e.options.afterBuildTicks,[e,t]):(e.ticks=H.callback(e.options.afterBuildTicks,[e,e.ticks])||e.ticks,t)},beforeTickToLabelConversion:function(){H.callback(this.options.beforeTickToLabelConversion,[this])},convertTicksToLabels:function(){var t=this.options.ticks;this.ticks=this.ticks.map(t.userCallback||t.callback,this)},afterTickToLabelConversion:function(){H.callback(this.options.afterTickToLabelConversion,[this])},beforeCalculateTickRotation:function(){H.callback(this.options.beforeCalculateTickRotation,[this])},calculateTickRotation:function(){var t,e,n,i,a,r,o,s=this,l=s.options,u=l.ticks,d=s.getTicks().length,h=u.minRotation||0,c=u.maxRotation,f=h;!s._isVisible()||!u.display||h>=c||d<=1||!s.isHorizontal()?s.labelRotation=h:(e=(t=s._getLabelSizes()).widest.width,n=t.highest.height-t.highest.offset,i=Math.min(s.maxWidth,s.chart.width-e),e+6>(a=l.offset?s.maxWidth/d:i/(d-1))&&(a=i/(d-(l.offset?.5:1)),r=s.maxHeight-fn(l.gridLines)-u.padding-gn(l.scaleLabel),o=Math.sqrt(e*e+n*n),f=H.toDegrees(Math.min(Math.asin(Math.min((t.highest.height+6)/a,1)),Math.asin(Math.min(r/o,1))-Math.asin(n/o))),f=Math.max(h,Math.min(c,f))),s.labelRotation=f)},afterCalculateTickRotation:function(){H.callback(this.options.afterCalculateTickRotation,[this])},beforeFit:function(){H.callback(this.options.beforeFit,[this])},fit:function(){var t=this,e=t.minSize={width:0,height:0},n=t.chart,i=t.options,a=i.ticks,r=i.scaleLabel,o=i.gridLines,s=t._isVisible(),l="bottom"===i.position,u=t.isHorizontal();if(u?e.width=t.maxWidth:s&&(e.width=fn(o)+gn(r)),u?s&&(e.height=fn(o)+gn(r)):e.height=t.maxHeight,a.display&&s){var d=mn(a),h=t._getLabelSizes(),c=h.first,f=h.last,g=h.widest,p=h.highest,m=.4*d.minor.lineHeight,v=a.padding;if(u){var b=0!==t.labelRotation,x=H.toRadians(t.labelRotation),y=Math.cos(x),_=Math.sin(x),k=_*g.width+y*(p.height-(b?p.offset:0))+(b?0:m);e.height=Math.min(t.maxHeight,e.height+k+v);var w,M,S=t.getPixelForTick(0)-t.left,C=t.right-t.getPixelForTick(t.getTicks().length-1);b?(w=l?y*c.width+_*c.offset:_*(c.height-c.offset),M=l?_*(f.height-f.offset):y*f.width+_*f.offset):(w=c.width/2,M=f.width/2),t.paddingLeft=Math.max((w-S)*t.width/(t.width-S),0)+3,t.paddingRight=Math.max((M-C)*t.width/(t.width-C),0)+3}else{var P=a.mirror?0:g.width+v+m;e.width=Math.min(t.maxWidth,e.width+P),t.paddingTop=c.height/2,t.paddingBottom=f.height/2}}t.handleMargins(),u?(t.width=t._length=n.width-t.margins.left-t.margins.right,t.height=e.height):(t.width=e.width,t.height=t._length=n.height-t.margins.top-t.margins.bottom)},handleMargins:function(){var t=this;t.margins&&(t.margins.left=Math.max(t.paddingLeft,t.margins.left),t.margins.top=Math.max(t.paddingTop,t.margins.top),t.margins.right=Math.max(t.paddingRight,t.margins.right),t.margins.bottom=Math.max(t.paddingBottom,t.margins.bottom))},afterFit:function(){H.callback(this.options.afterFit,[this])},isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},isFullWidth:function(){return this.options.fullWidth},getRightValue:function(t){if(ln(t))return NaN;if(("number"==typeof t||t instanceof Number)&&!isFinite(t))return NaN;if(t)if(this.isHorizontal()){if(void 0!==t.x)return this.getRightValue(t.x)}else if(void 0!==t.y)return this.getRightValue(t.y);return t},_convertTicksToLabels:function(t){var e,n,i,a=this;for(a.ticks=t.map((function(t){return t.value})),a.beforeTickToLabelConversion(),e=a.convertTicksToLabels(t)||a.ticks,a.afterTickToLabelConversion(),n=0,i=t.length;n<i;++n)t[n].label=e[n];return e},_getLabelSizes:function(){var t=this,e=t._labelSizes;return e||(t._labelSizes=e=cn(t.ctx,mn(t.options.ticks),t.getTicks(),t.longestTextCache),t.longestLabelWidth=e.widest.width),e},_parseValue:function(t){var e,n,i,a;return sn(t)?(e=+this.getRightValue(t[0]),n=+this.getRightValue(t[1]),i=Math.min(e,n),a=Math.max(e,n)):(e=void 0,n=t=+this.getRightValue(t),i=t,a=t),{min:i,max:a,start:e,end:n}},_getScaleLabel:function(t){var e=this._parseValue(t);return void 0!==e.start?"["+e.start+", "+e.end+"]":+this.getRightValue(t)},getLabelForIndex:H.noop,getPixelForValue:H.noop,getValueForPixel:H.noop,getPixelForTick:function(t){var e=this.options.offset,n=this._ticks.length,i=1/Math.max(n-(e?0:1),1);return t<0||t>n-1?null:this.getPixelForDecimal(t*i+(e?i/2:0))},getPixelForDecimal:function(t){return this._reversePixels&&(t=1-t),this._startPixel+t*this._length},getDecimalForPixel:function(t){var e=(t-this._startPixel)/this._length;return this._reversePixels?1-e:e},getBasePixel:function(){return this.getPixelForValue(this.getBaseValue())},getBaseValue:function(){var t=this.min,e=this.max;return this.beginAtZero?0:t<0&&e<0?e:t>0&&e>0?t:0},_autoSkip:function(t){var e,n,i,a,r=this.options.ticks,o=this._length,s=r.maxTicksLimit||o/this._tickSize()+1,l=r.major.enabled?function(t){var e,n,i=[];for(e=0,n=t.length;e<n;e++)t[e].major&&i.push(e);return i}(t):[],u=l.length,d=l[0],h=l[u-1];if(u>s)return function(t,e,n){var i,a,r=0,o=e[0];for(n=Math.ceil(n),i=0;i<t.length;i++)a=t[i],i===o?(a._index=i,o=e[++r*n]):delete a.label}(t,l,u/s),vn(t);if(i=function(t,e,n,i){var a,r,o,s,l=function(t){var e,n,i=t.length;if(i<2)return!1;for(n=t[0],e=1;e<i;++e)if(t[e]-t[e-1]!==n)return!1;return n}(t),u=(e.length-1)/i;if(!l)return Math.max(u,1);for(o=0,s=(a=H.math._factorize(l)).length-1;o<s;o++)if((r=a[o])>u)return r;return Math.max(u,1)}(l,t,0,s),u>0){for(e=0,n=u-1;e<n;e++)bn(t,i,l[e],l[e+1]);return a=u>1?(h-d)/(u-1):null,bn(t,i,H.isNullOrUndef(a)?0:d-a,d),bn(t,i,h,H.isNullOrUndef(a)?t.length:h+a),vn(t)}return bn(t,i),vn(t)},_tickSize:function(){var t=this.options.ticks,e=H.toRadians(this.labelRotation),n=Math.abs(Math.cos(e)),i=Math.abs(Math.sin(e)),a=this._getLabelSizes(),r=t.autoSkipPadding||0,o=a?a.widest.width+r:0,s=a?a.highest.height+r:0;return this.isHorizontal()?s*n>o*i?o/n:s/i:s*i<o*n?s/n:o/i},_isVisible:function(){var t,e,n,i=this.chart,a=this.options.display;if("auto"!==a)return!!a;for(t=0,e=i.data.datasets.length;t<e;++t)if(i.isDatasetVisible(t)&&((n=i.getDatasetMeta(t)).xAxisID===this.id||n.yAxisID===this.id))return!0;return!1},_computeGridLineItems:function(t){var e,n,i,a,r,o,s,l,u,d,h,c,f,g,p,m,v,b=this,x=b.chart,y=b.options,_=y.gridLines,k=y.position,w=_.offsetGridLines,M=b.isHorizontal(),S=b._ticksToDraw,C=S.length+(w?1:0),P=fn(_),A=[],D=_.drawBorder?dn(_.lineWidth,0,0):0,T=D/2,I=H._alignPixel,F=function(t){return I(x,t,D)};for("top"===k?(e=F(b.bottom),s=b.bottom-P,u=e-T,h=F(t.top)+T,f=t.bottom):"bottom"===k?(e=F(b.top),h=t.top,f=F(t.bottom)-T,s=e+T,u=b.top+P):"left"===k?(e=F(b.right),o=b.right-P,l=e-T,d=F(t.left)+T,c=t.right):(e=F(b.left),d=t.left,c=F(t.right)-T,o=e+T,l=b.left+P),n=0;n<C;++n)i=S[n]||{},ln(i.label)&&n<S.length||(n===b.zeroLineIndex&&y.offset===w?(g=_.zeroLineWidth,p=_.zeroLineColor,m=_.zeroLineBorderDash||[],v=_.zeroLineBorderDashOffset||0):(g=dn(_.lineWidth,n,1),p=dn(_.color,n,"rgba(0,0,0,0.1)"),m=_.borderDash||[],v=_.borderDashOffset||0),void 0!==(a=hn(b,i._index||n,w))&&(r=I(x,a,g),M?o=l=d=c=r:s=u=h=f=r,A.push({tx1:o,ty1:s,tx2:l,ty2:u,x1:d,y1:h,x2:c,y2:f,width:g,color:p,borderDash:m,borderDashOffset:v})));return A.ticksLength=C,A.borderValue=e,A},_computeLabelItems:function(){var t,e,n,i,a,r,o,s,l,u,d,h,c=this,f=c.options,g=f.ticks,p=f.position,m=g.mirror,v=c.isHorizontal(),b=c._ticksToDraw,x=mn(g),y=g.padding,_=fn(f.gridLines),k=-H.toRadians(c.labelRotation),w=[];for("top"===p?(r=c.bottom-_-y,o=k?"left":"center"):"bottom"===p?(r=c.top+_+y,o=k?"right":"center"):"left"===p?(a=c.right-(m?0:_)-y,o=m?"left":"right"):(a=c.left+(m?0:_)+y,o=m?"right":"left"),t=0,e=b.length;t<e;++t)i=(n=b[t]).label,ln(i)||(s=c.getPixelForTick(n._index||t)+g.labelOffset,u=(l=n.major?x.major:x.minor).lineHeight,d=sn(i)?i.length:1,v?(a=s,h="top"===p?((k?1:.5)-d)*u:(k?0:.5)*u):(r=s,h=(1-d)*u/2),w.push({x:a,y:r,rotation:k,label:i,font:l,textOffset:h,textAlign:o}));return w},_drawGrid:function(t){var e=this,n=e.options.gridLines;if(n.display){var i,a,r,o,s,l=e.ctx,u=e.chart,d=H._alignPixel,h=n.drawBorder?dn(n.lineWidth,0,0):0,c=e._gridLineItems||(e._gridLineItems=e._computeGridLineItems(t));for(r=0,o=c.length;r<o;++r)i=(s=c[r]).width,a=s.color,i&&a&&(l.save(),l.lineWidth=i,l.strokeStyle=a,l.setLineDash&&(l.setLineDash(s.borderDash),l.lineDashOffset=s.borderDashOffset),l.beginPath(),n.drawTicks&&(l.moveTo(s.tx1,s.ty1),l.lineTo(s.tx2,s.ty2)),n.drawOnChartArea&&(l.moveTo(s.x1,s.y1),l.lineTo(s.x2,s.y2)),l.stroke(),l.restore());if(h){var f,g,p,m,v=h,b=dn(n.lineWidth,c.ticksLength-1,1),x=c.borderValue;e.isHorizontal()?(f=d(u,e.left,v)-v/2,g=d(u,e.right,b)+b/2,p=m=x):(p=d(u,e.top,v)-v/2,m=d(u,e.bottom,b)+b/2,f=g=x),l.lineWidth=h,l.strokeStyle=dn(n.color,0),l.beginPath(),l.moveTo(f,p),l.lineTo(g,m),l.stroke()}}},_drawLabels:function(){var t=this;if(t.options.ticks.display){var e,n,i,a,r,o,s,l,u=t.ctx,d=t._labelItems||(t._labelItems=t._computeLabelItems());for(e=0,i=d.length;e<i;++e){if(o=(r=d[e]).font,u.save(),u.translate(r.x,r.y),u.rotate(r.rotation),u.font=o.string,u.fillStyle=o.color,u.textBaseline="middle",u.textAlign=r.textAlign,s=r.label,l=r.textOffset,sn(s))for(n=0,a=s.length;n<a;++n)u.fillText(""+s[n],0,l),l+=o.lineHeight;else u.fillText(s,0,l);u.restore()}}},_drawTitle:function(){var t=this,e=t.ctx,n=t.options,i=n.scaleLabel;if(i.display){var a,r,o=un(i.fontColor,N.global.defaultFontColor),s=H.options._parseFont(i),l=H.options.toPadding(i.padding),u=s.lineHeight/2,d=n.position,h=0;if(t.isHorizontal())a=t.left+t.width/2,r="bottom"===d?t.bottom-u-l.bottom:t.top+u+l.top;else{var c="left"===d;a=c?t.left+u+l.top:t.right-u-l.top,r=t.top+t.height/2,h=c?-.5*Math.PI:.5*Math.PI}e.save(),e.translate(a,r),e.rotate(h),e.textAlign="center",e.textBaseline="middle",e.fillStyle=o,e.font=s.string,e.fillText(i.labelString,0,0),e.restore()}},draw:function(t){this._isVisible()&&(this._drawGrid(t),this._drawTitle(),this._drawLabels())},_layers:function(){var t=this,e=t.options,n=e.ticks&&e.ticks.z||0,i=e.gridLines&&e.gridLines.z||0;return t._isVisible()&&n!==i&&t.draw===t._draw?[{z:i,draw:function(){t._drawGrid.apply(t,arguments),t._drawTitle.apply(t,arguments)}},{z:n,draw:function(){t._drawLabels.apply(t,arguments)}}]:[{z:n,draw:function(){t.draw.apply(t,arguments)}}]},_getMatchingVisibleMetas:function(t){var e=this,n=e.isHorizontal();return e.chart._getSortedVisibleDatasetMetas().filter((function(i){return(!t||i.type===t)&&(n?i.xAxisID===e.id:i.yAxisID===e.id)}))}});xn.prototype._draw=xn.prototype.draw;var yn=xn,_n=H.isNullOrUndef,kn=yn.extend({determineDataLimits:function(){var t,e=this,n=e._getLabels(),i=e.options.ticks,a=i.min,r=i.max,o=0,s=n.length-1;void 0!==a&&(t=n.indexOf(a))>=0&&(o=t),void 0!==r&&(t=n.indexOf(r))>=0&&(s=t),e.minIndex=o,e.maxIndex=s,e.min=n[o],e.max=n[s]},buildTicks:function(){var t=this._getLabels(),e=this.minIndex,n=this.maxIndex;this.ticks=0===e&&n===t.length-1?t:t.slice(e,n+1)},getLabelForIndex:function(t,e){var n=this.chart;return n.getDatasetMeta(e).controller._getValueScaleId()===this.id?this.getRightValue(n.data.datasets[e].data[t]):this._getLabels()[t]},_configure:function(){var t=this,e=t.options.offset,n=t.ticks;yn.prototype._configure.call(t),t.isHorizontal()||(t._reversePixels=!t._reversePixels),n&&(t._startValue=t.minIndex-(e?.5:0),t._valueRange=Math.max(n.length-(e?0:1),1))},getPixelForValue:function(t,e,n){var i,a,r,o=this;return _n(e)||_n(n)||(t=o.chart.data.datasets[n].data[e]),_n(t)||(i=o.isHorizontal()?t.x:t.y),(void 0!==i||void 0!==t&&isNaN(e))&&(a=o._getLabels(),t=H.valueOrDefault(i,t),e=-1!==(r=a.indexOf(t))?r:e,isNaN(e)&&(e=t)),o.getPixelForDecimal((e-o._startValue)/o._valueRange)},getPixelForTick:function(t){var e=this.ticks;return t<0||t>e.length-1?null:this.getPixelForValue(e[t],t+this.minIndex)},getValueForPixel:function(t){var e=Math.round(this._startValue+this.getDecimalForPixel(t)*this._valueRange);return Math.min(Math.max(e,0),this.ticks.length-1)},getBasePixel:function(){return this.bottom}}),wn={position:"bottom"};kn._defaults=wn;var Mn=H.noop,Sn=H.isNullOrUndef;var Cn=yn.extend({getRightValue:function(t){return"string"==typeof t?+t:yn.prototype.getRightValue.call(this,t)},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;if(e.beginAtZero){var n=H.sign(t.min),i=H.sign(t.max);n<0&&i<0?t.max=0:n>0&&i>0&&(t.min=0)}var a=void 0!==e.min||void 0!==e.suggestedMin,r=void 0!==e.max||void 0!==e.suggestedMax;void 0!==e.min?t.min=e.min:void 0!==e.suggestedMin&&(null===t.min?t.min=e.suggestedMin:t.min=Math.min(t.min,e.suggestedMin)),void 0!==e.max?t.max=e.max:void 0!==e.suggestedMax&&(null===t.max?t.max=e.suggestedMax:t.max=Math.max(t.max,e.suggestedMax)),a!==r&&t.min>=t.max&&(a?t.max=t.min+1:t.min=t.max-1),t.min===t.max&&(t.max++,e.beginAtZero||t.min--)},getTickLimit:function(){var t,e=this.options.ticks,n=e.stepSize,i=e.maxTicksLimit;return n?t=Math.ceil(this.max/n)-Math.floor(this.min/n)+1:(t=this._computeTickLimit(),i=i||11),i&&(t=Math.min(i,t)),t},_computeTickLimit:function(){return Number.POSITIVE_INFINITY},handleDirectionalChanges:Mn,buildTicks:function(){var t=this,e=t.options.ticks,n=t.getTickLimit(),i={maxTicks:n=Math.max(2,n),min:e.min,max:e.max,precision:e.precision,stepSize:H.valueOrDefault(e.fixedStepSize,e.stepSize)},a=t.ticks=function(t,e){var n,i,a,r,o=[],s=t.stepSize,l=s||1,u=t.maxTicks-1,d=t.min,h=t.max,c=t.precision,f=e.min,g=e.max,p=H.niceNum((g-f)/u/l)*l;if(p<1e-14&&Sn(d)&&Sn(h))return[f,g];(r=Math.ceil(g/p)-Math.floor(f/p))>u&&(p=H.niceNum(r*p/u/l)*l),s||Sn(c)?n=Math.pow(10,H._decimalPlaces(p)):(n=Math.pow(10,c),p=Math.ceil(p*n)/n),i=Math.floor(f/p)*p,a=Math.ceil(g/p)*p,s&&(!Sn(d)&&H.almostWhole(d/p,p/1e3)&&(i=d),!Sn(h)&&H.almostWhole(h/p,p/1e3)&&(a=h)),r=(a-i)/p,r=H.almostEquals(r,Math.round(r),p/1e3)?Math.round(r):Math.ceil(r),i=Math.round(i*n)/n,a=Math.round(a*n)/n,o.push(Sn(d)?i:d);for(var m=1;m<r;++m)o.push(Math.round((i+m*p)*n)/n);return o.push(Sn(h)?a:h),o}(i,t);t.handleDirectionalChanges(),t.max=H.max(a),t.min=H.min(a),e.reverse?(a.reverse(),t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max)},convertTicksToLabels:function(){var t=this;t.ticksAsNumbers=t.ticks.slice(),t.zeroLineIndex=t.ticks.indexOf(0),yn.prototype.convertTicksToLabels.call(t)},_configure:function(){var t,e=this,n=e.getTicks(),i=e.min,a=e.max;yn.prototype._configure.call(e),e.options.offset&&n.length&&(i-=t=(a-i)/Math.max(n.length-1,1)/2,a+=t),e._startValue=i,e._endValue=a,e._valueRange=a-i}}),Pn={position:"left",ticks:{callback:on.formatters.linear}};function An(t,e,n,i){var a,r,o=t.options,s=function(t,e,n){var i=[n.type,void 0===e&&void 0===n.stack?n.index:"",n.stack].join(".");return void 0===t[i]&&(t[i]={pos:[],neg:[]}),t[i]}(e,o.stacked,n),l=s.pos,u=s.neg,d=i.length;for(a=0;a<d;++a)r=t._parseValue(i[a]),isNaN(r.min)||isNaN(r.max)||n.data[a].hidden||(l[a]=l[a]||0,u[a]=u[a]||0,o.relativePoints?l[a]=100:r.min<0||r.max<0?u[a]+=r.min:l[a]+=r.max)}function Dn(t,e,n){var i,a,r=n.length;for(i=0;i<r;++i)a=t._parseValue(n[i]),isNaN(a.min)||isNaN(a.max)||e.data[i].hidden||(t.min=Math.min(t.min,a.min),t.max=Math.max(t.max,a.max))}var Tn=Cn.extend({determineDataLimits:function(){var t,e,n,i,a=this,r=a.options,o=a.chart.data.datasets,s=a._getMatchingVisibleMetas(),l=r.stacked,u={},d=s.length;if(a.min=Number.POSITIVE_INFINITY,a.max=Number.NEGATIVE_INFINITY,void 0===l)for(t=0;!l&&t<d;++t)l=void 0!==(e=s[t]).stack;for(t=0;t<d;++t)n=o[(e=s[t]).index].data,l?An(a,u,e,n):Dn(a,e,n);H.each(u,(function(t){i=t.pos.concat(t.neg),a.min=Math.min(a.min,H.min(i)),a.max=Math.max(a.max,H.max(i))})),a.min=H.isFinite(a.min)&&!isNaN(a.min)?a.min:0,a.max=H.isFinite(a.max)&&!isNaN(a.max)?a.max:1,a.handleTickRangeOptions()},_computeTickLimit:function(){var t;return this.isHorizontal()?Math.ceil(this.width/40):(t=H.options._parseFont(this.options.ticks),Math.ceil(this.height/t.lineHeight))},handleDirectionalChanges:function(){this.isHorizontal()||this.ticks.reverse()},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForValue:function(t){return this.getPixelForDecimal((+this.getRightValue(t)-this._startValue)/this._valueRange)},getValueForPixel:function(t){return this._startValue+this.getDecimalForPixel(t)*this._valueRange},getPixelForTick:function(t){var e=this.ticksAsNumbers;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])}}),In=Pn;Tn._defaults=In;var Fn=H.valueOrDefault,On=H.math.log10;var Ln={position:"left",ticks:{callback:on.formatters.logarithmic}};function Rn(t,e){return H.isFinite(t)&&t>=0?t:e}var zn=yn.extend({determineDataLimits:function(){var t,e,n,i,a,r,o=this,s=o.options,l=o.chart,u=l.data.datasets,d=o.isHorizontal();function h(t){return d?t.xAxisID===o.id:t.yAxisID===o.id}o.min=Number.POSITIVE_INFINITY,o.max=Number.NEGATIVE_INFINITY,o.minNotZero=Number.POSITIVE_INFINITY;var c=s.stacked;if(void 0===c)for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e)&&void 0!==e.stack){c=!0;break}if(s.stacked||c){var f={};for(t=0;t<u.length;t++){var g=[(e=l.getDatasetMeta(t)).type,void 0===s.stacked&&void 0===e.stack?t:"",e.stack].join(".");if(l.isDatasetVisible(t)&&h(e))for(void 0===f[g]&&(f[g]=[]),a=0,r=(i=u[t].data).length;a<r;a++){var p=f[g];n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(p[a]=p[a]||0,p[a]+=n.max)}}H.each(f,(function(t){if(t.length>0){var e=H.min(t),n=H.max(t);o.min=Math.min(o.min,e),o.max=Math.max(o.max,n)}}))}else for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e))for(a=0,r=(i=u[t].data).length;a<r;a++)n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(o.min=Math.min(n.min,o.min),o.max=Math.max(n.max,o.max),0!==n.min&&(o.minNotZero=Math.min(n.min,o.minNotZero)));o.min=H.isFinite(o.min)?o.min:null,o.max=H.isFinite(o.max)?o.max:null,o.minNotZero=H.isFinite(o.minNotZero)?o.minNotZero:null,this.handleTickRangeOptions()},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;t.min=Rn(e.min,t.min),t.max=Rn(e.max,t.max),t.min===t.max&&(0!==t.min&&null!==t.min?(t.min=Math.pow(10,Math.floor(On(t.min))-1),t.max=Math.pow(10,Math.floor(On(t.max))+1)):(t.min=1,t.max=10)),null===t.min&&(t.min=Math.pow(10,Math.floor(On(t.max))-1)),null===t.max&&(t.max=0!==t.min?Math.pow(10,Math.floor(On(t.min))+1):10),null===t.minNotZero&&(t.min>0?t.minNotZero=t.min:t.max<1?t.minNotZero=Math.pow(10,Math.floor(On(t.max))):t.minNotZero=1)},buildTicks:function(){var t=this,e=t.options.ticks,n=!t.isHorizontal(),i={min:Rn(e.min),max:Rn(e.max)},a=t.ticks=function(t,e){var n,i,a=[],r=Fn(t.min,Math.pow(10,Math.floor(On(e.min)))),o=Math.floor(On(e.max)),s=Math.ceil(e.max/Math.pow(10,o));0===r?(n=Math.floor(On(e.minNotZero)),i=Math.floor(e.minNotZero/Math.pow(10,n)),a.push(r),r=i*Math.pow(10,n)):(n=Math.floor(On(r)),i=Math.floor(r/Math.pow(10,n)));var l=n<0?Math.pow(10,Math.abs(n)):1;do{a.push(r),10===++i&&(i=1,l=++n>=0?1:l),r=Math.round(i*Math.pow(10,n)*l)/l}while(n<o||n===o&&i<s);var u=Fn(t.max,r);return a.push(u),a}(i,t);t.max=H.max(a),t.min=H.min(a),e.reverse?(n=!n,t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max),n&&a.reverse()},convertTicksToLabels:function(){this.tickValues=this.ticks.slice(),yn.prototype.convertTicksToLabels.call(this)},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForTick:function(t){var e=this.tickValues;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])},_getFirstTickValue:function(t){var e=Math.floor(On(t));return Math.floor(t/Math.pow(10,e))*Math.pow(10,e)},_configure:function(){var t=this,e=t.min,n=0;yn.prototype._configure.call(t),0===e&&(e=t._getFirstTickValue(t.minNotZero),n=Fn(t.options.ticks.fontSize,N.global.defaultFontSize)/t._length),t._startValue=On(e),t._valueOffset=n,t._valueRange=(On(t.max)-On(e))/(1-n)},getPixelForValue:function(t){var e=this,n=0;return(t=+e.getRightValue(t))>e.min&&t>0&&(n=(On(t)-e._startValue)/e._valueRange+e._valueOffset),e.getPixelForDecimal(n)},getValueForPixel:function(t){var e=this,n=e.getDecimalForPixel(t);return 0===n&&0===e.min?0:Math.pow(10,e._startValue+(n-e._valueOffset)*e._valueRange)}}),Nn=Ln;zn._defaults=Nn;var Bn=H.valueOrDefault,En=H.valueAtIndexOrDefault,Wn=H.options.resolve,Vn={display:!0,animate:!0,position:"chartArea",angleLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,borderDash:[],borderDashOffset:0},gridLines:{circular:!1},ticks:{showLabelBackdrop:!0,backdropColor:"rgba(255,255,255,0.75)",backdropPaddingY:2,backdropPaddingX:2,callback:on.formatters.linear},pointLabels:{display:!0,fontSize:10,callback:function(t){return t}}};function Hn(t){var e=t.ticks;return e.display&&t.display?Bn(e.fontSize,N.global.defaultFontSize)+2*e.backdropPaddingY:0}function jn(t,e,n,i,a){return t===i||t===a?{start:e-n/2,end:e+n/2}:t<i||t>a?{start:e-n,end:e}:{start:e,end:e+n}}function qn(t){return 0===t||180===t?"center":t<180?"left":"right"}function Un(t,e,n,i){var a,r,o=n.y+i/2;if(H.isArray(e))for(a=0,r=e.length;a<r;++a)t.fillText(e[a],n.x,o),o+=i;else t.fillText(e,n.x,o)}function Yn(t,e,n){90===t||270===t?n.y-=e.h/2:(t>270||t<90)&&(n.y-=e.h)}function Gn(t){return H.isNumber(t)?t:0}var Xn=Cn.extend({setDimensions:function(){var t=this;t.width=t.maxWidth,t.height=t.maxHeight,t.paddingTop=Hn(t.options)/2,t.xCenter=Math.floor(t.width/2),t.yCenter=Math.floor((t.height-t.paddingTop)/2),t.drawingArea=Math.min(t.height-t.paddingTop,t.width)/2},determineDataLimits:function(){var t=this,e=t.chart,n=Number.POSITIVE_INFINITY,i=Number.NEGATIVE_INFINITY;H.each(e.data.datasets,(function(a,r){if(e.isDatasetVisible(r)){var o=e.getDatasetMeta(r);H.each(a.data,(function(e,a){var r=+t.getRightValue(e);isNaN(r)||o.data[a].hidden||(n=Math.min(r,n),i=Math.max(r,i))}))}})),t.min=n===Number.POSITIVE_INFINITY?0:n,t.max=i===Number.NEGATIVE_INFINITY?0:i,t.handleTickRangeOptions()},_computeTickLimit:function(){return Math.ceil(this.drawingArea/Hn(this.options))},convertTicksToLabels:function(){var t=this;Cn.prototype.convertTicksToLabels.call(t),t.pointLabels=t.chart.data.labels.map((function(){var e=H.callback(t.options.pointLabels.callback,arguments,t);return e||0===e?e:""}))},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},fit:function(){var t=this.options;t.display&&t.pointLabels.display?function(t){var e,n,i,a=H.options._parseFont(t.options.pointLabels),r={l:0,r:t.width,t:0,b:t.height-t.paddingTop},o={};t.ctx.font=a.string,t._pointLabelSizes=[];var s,l,u,d=t.chart.data.labels.length;for(e=0;e<d;e++){i=t.getPointPosition(e,t.drawingArea+5),s=t.ctx,l=a.lineHeight,u=t.pointLabels[e],n=H.isArray(u)?{w:H.longestText(s,s.font,u),h:u.length*l}:{w:s.measureText(u).width,h:l},t._pointLabelSizes[e]=n;var h=t.getIndexAngle(e),c=H.toDegrees(h)%360,f=jn(c,i.x,n.w,0,180),g=jn(c,i.y,n.h,90,270);f.start<r.l&&(r.l=f.start,o.l=h),f.end>r.r&&(r.r=f.end,o.r=h),g.start<r.t&&(r.t=g.start,o.t=h),g.end>r.b&&(r.b=g.end,o.b=h)}t.setReductions(t.drawingArea,r,o)}(this):this.setCenterPoint(0,0,0,0)},setReductions:function(t,e,n){var i=this,a=e.l/Math.sin(n.l),r=Math.max(e.r-i.width,0)/Math.sin(n.r),o=-e.t/Math.cos(n.t),s=-Math.max(e.b-(i.height-i.paddingTop),0)/Math.cos(n.b);a=Gn(a),r=Gn(r),o=Gn(o),s=Gn(s),i.drawingArea=Math.min(Math.floor(t-(a+r)/2),Math.floor(t-(o+s)/2)),i.setCenterPoint(a,r,o,s)},setCenterPoint:function(t,e,n,i){var a=this,r=a.width-e-a.drawingArea,o=t+a.drawingArea,s=n+a.drawingArea,l=a.height-a.paddingTop-i-a.drawingArea;a.xCenter=Math.floor((o+r)/2+a.left),a.yCenter=Math.floor((s+l)/2+a.top+a.paddingTop)},getIndexAngle:function(t){var e=this.chart,n=(t*(360/e.data.labels.length)+((e.options||{}).startAngle||0))%360;return(n<0?n+360:n)*Math.PI*2/360},getDistanceFromCenterForValue:function(t){var e=this;if(H.isNullOrUndef(t))return NaN;var n=e.drawingArea/(e.max-e.min);return e.options.ticks.reverse?(e.max-t)*n:(t-e.min)*n},getPointPosition:function(t,e){var n=this.getIndexAngle(t)-Math.PI/2;return{x:Math.cos(n)*e+this.xCenter,y:Math.sin(n)*e+this.yCenter}},getPointPositionForValue:function(t,e){return this.getPointPosition(t,this.getDistanceFromCenterForValue(e))},getBasePosition:function(t){var e=this.min,n=this.max;return this.getPointPositionForValue(t||0,this.beginAtZero?0:e<0&&n<0?n:e>0&&n>0?e:0)},_drawGrid:function(){var t,e,n,i=this,a=i.ctx,r=i.options,o=r.gridLines,s=r.angleLines,l=Bn(s.lineWidth,o.lineWidth),u=Bn(s.color,o.color);if(r.pointLabels.display&&function(t){var e=t.ctx,n=t.options,i=n.pointLabels,a=Hn(n),r=t.getDistanceFromCenterForValue(n.ticks.reverse?t.min:t.max),o=H.options._parseFont(i);e.save(),e.font=o.string,e.textBaseline="middle";for(var s=t.chart.data.labels.length-1;s>=0;s--){var l=0===s?a/2:0,u=t.getPointPosition(s,r+l+5),d=En(i.fontColor,s,N.global.defaultFontColor);e.fillStyle=d;var h=t.getIndexAngle(s),c=H.toDegrees(h);e.textAlign=qn(c),Yn(c,t._pointLabelSizes[s],u),Un(e,t.pointLabels[s],u,o.lineHeight)}e.restore()}(i),o.display&&H.each(i.ticks,(function(t,n){0!==n&&(e=i.getDistanceFromCenterForValue(i.ticksAsNumbers[n]),function(t,e,n,i){var a,r=t.ctx,o=e.circular,s=t.chart.data.labels.length,l=En(e.color,i-1),u=En(e.lineWidth,i-1);if((o||s)&&l&&u){if(r.save(),r.strokeStyle=l,r.lineWidth=u,r.setLineDash&&(r.setLineDash(e.borderDash||[]),r.lineDashOffset=e.borderDashOffset||0),r.beginPath(),o)r.arc(t.xCenter,t.yCenter,n,0,2*Math.PI);else{a=t.getPointPosition(0,n),r.moveTo(a.x,a.y);for(var d=1;d<s;d++)a=t.getPointPosition(d,n),r.lineTo(a.x,a.y)}r.closePath(),r.stroke(),r.restore()}}(i,o,e,n))})),s.display&&l&&u){for(a.save(),a.lineWidth=l,a.strokeStyle=u,a.setLineDash&&(a.setLineDash(Wn([s.borderDash,o.borderDash,[]])),a.lineDashOffset=Wn([s.borderDashOffset,o.borderDashOffset,0])),t=i.chart.data.labels.length-1;t>=0;t--)e=i.getDistanceFromCenterForValue(r.ticks.reverse?i.min:i.max),n=i.getPointPosition(t,e),a.beginPath(),a.moveTo(i.xCenter,i.yCenter),a.lineTo(n.x,n.y),a.stroke();a.restore()}},_drawLabels:function(){var t=this,e=t.ctx,n=t.options.ticks;if(n.display){var i,a,r=t.getIndexAngle(0),o=H.options._parseFont(n),s=Bn(n.fontColor,N.global.defaultFontColor);e.save(),e.font=o.string,e.translate(t.xCenter,t.yCenter),e.rotate(r),e.textAlign="center",e.textBaseline="middle",H.each(t.ticks,(function(r,l){(0!==l||n.reverse)&&(i=t.getDistanceFromCenterForValue(t.ticksAsNumbers[l]),n.showLabelBackdrop&&(a=e.measureText(r).width,e.fillStyle=n.backdropColor,e.fillRect(-a/2-n.backdropPaddingX,-i-o.size/2-n.backdropPaddingY,a+2*n.backdropPaddingX,o.size+2*n.backdropPaddingY)),e.fillStyle=s,e.fillText(r,0,-i))})),e.restore()}},_drawTitle:H.noop}),Kn=Vn;Xn._defaults=Kn;var Zn=H._deprecated,$n=H.options.resolve,Jn=H.valueOrDefault,Qn=Number.MIN_SAFE_INTEGER||-9007199254740991,ti=Number.MAX_SAFE_INTEGER||9007199254740991,ei={millisecond:{common:!0,size:1,steps:1e3},second:{common:!0,size:1e3,steps:60},minute:{common:!0,size:6e4,steps:60},hour:{common:!0,size:36e5,steps:24},day:{common:!0,size:864e5,steps:30},week:{common:!1,size:6048e5,steps:4},month:{common:!0,size:2628e6,steps:12},quarter:{common:!1,size:7884e6,steps:4},year:{common:!0,size:3154e7}},ni=Object.keys(ei);function ii(t,e){return t-e}function ai(t){return H.valueOrDefault(t.time.min,t.ticks.min)}function ri(t){return H.valueOrDefault(t.time.max,t.ticks.max)}function oi(t,e,n,i){var a=function(t,e,n){for(var i,a,r,o=0,s=t.length-1;o>=0&&o<=s;){if(a=t[(i=o+s>>1)-1]||null,r=t[i],!a)return{lo:null,hi:r};if(r[e]<n)o=i+1;else{if(!(a[e]>n))return{lo:a,hi:r};s=i-1}}return{lo:r,hi:null}}(t,e,n),r=a.lo?a.hi?a.lo:t[t.length-2]:t[0],o=a.lo?a.hi?a.hi:t[t.length-1]:t[1],s=o[e]-r[e],l=s?(n-r[e])/s:0,u=(o[i]-r[i])*l;return r[i]+u}function si(t,e){var n=t._adapter,i=t.options.time,a=i.parser,r=a||i.format,o=e;return"function"==typeof a&&(o=a(o)),H.isFinite(o)||(o="string"==typeof r?n.parse(o,r):n.parse(o)),null!==o?+o:(a||"function"!=typeof r||(o=r(e),H.isFinite(o)||(o=n.parse(o))),o)}function li(t,e){if(H.isNullOrUndef(e))return null;var n=t.options.time,i=si(t,t.getRightValue(e));return null===i?i:(n.round&&(i=+t._adapter.startOf(i,n.round)),i)}function ui(t,e,n,i){var a,r,o,s=ni.length;for(a=ni.indexOf(t);a<s-1;++a)if(o=(r=ei[ni[a]]).steps?r.steps:ti,r.common&&Math.ceil((n-e)/(o*r.size))<=i)return ni[a];return ni[s-1]}function di(t,e,n){var i,a,r=[],o={},s=e.length;for(i=0;i<s;++i)o[a=e[i]]=i,r.push({value:a,major:!1});return 0!==s&&n?function(t,e,n,i){var a,r,o=t._adapter,s=+o.startOf(e[0].value,i),l=e[e.length-1].value;for(a=s;a<=l;a=+o.add(a,1,i))(r=n[a])>=0&&(e[r].major=!0);return e}(t,r,o,n):r}var hi=yn.extend({initialize:function(){this.mergeTicksOptions(),yn.prototype.initialize.call(this)},update:function(){var t=this,e=t.options,n=e.time||(e.time={}),i=t._adapter=new rn._date(e.adapters.date);return Zn("time scale",n.format,"time.format","time.parser"),Zn("time scale",n.min,"time.min","ticks.min"),Zn("time scale",n.max,"time.max","ticks.max"),H.mergeIf(n.displayFormats,i.formats()),yn.prototype.update.apply(t,arguments)},getRightValue:function(t){return t&&void 0!==t.t&&(t=t.t),yn.prototype.getRightValue.call(this,t)},determineDataLimits:function(){var t,e,n,i,a,r,o,s=this,l=s.chart,u=s._adapter,d=s.options,h=d.time.unit||"day",c=ti,f=Qn,g=[],p=[],m=[],v=s._getLabels();for(t=0,n=v.length;t<n;++t)m.push(li(s,v[t]));for(t=0,n=(l.data.datasets||[]).length;t<n;++t)if(l.isDatasetVisible(t))if(a=l.data.datasets[t].data,H.isObject(a[0]))for(p[t]=[],e=0,i=a.length;e<i;++e)r=li(s,a[e]),g.push(r),p[t][e]=r;else p[t]=m.slice(0),o||(g=g.concat(m),o=!0);else p[t]=[];m.length&&(c=Math.min(c,m[0]),f=Math.max(f,m[m.length-1])),g.length&&(g=n>1?function(t){var e,n,i,a={},r=[];for(e=0,n=t.length;e<n;++e)a[i=t[e]]||(a[i]=!0,r.push(i));return r}(g).sort(ii):g.sort(ii),c=Math.min(c,g[0]),f=Math.max(f,g[g.length-1])),c=li(s,ai(d))||c,f=li(s,ri(d))||f,c=c===ti?+u.startOf(Date.now(),h):c,f=f===Qn?+u.endOf(Date.now(),h)+1:f,s.min=Math.min(c,f),s.max=Math.max(c+1,f),s._table=[],s._timestamps={data:g,datasets:p,labels:m}},buildTicks:function(){var t,e,n,i=this,a=i.min,r=i.max,o=i.options,s=o.ticks,l=o.time,u=i._timestamps,d=[],h=i.getLabelCapacity(a),c=s.source,f=o.distribution;for(u="data"===c||"auto"===c&&"series"===f?u.data:"labels"===c?u.labels:function(t,e,n,i){var a,r=t._adapter,o=t.options,s=o.time,l=s.unit||ui(s.minUnit,e,n,i),u=$n([s.stepSize,s.unitStepSize,1]),d="week"===l&&s.isoWeekday,h=e,c=[];if(d&&(h=+r.startOf(h,"isoWeek",d)),h=+r.startOf(h,d?"day":l),r.diff(n,e,l)>1e5*u)throw e+" and "+n+" are too far apart with stepSize of "+u+" "+l;for(a=h;a<n;a=+r.add(a,u,l))c.push(a);return a!==n&&"ticks"!==o.bounds||c.push(a),c}(i,a,r,h),"ticks"===o.bounds&&u.length&&(a=u[0],r=u[u.length-1]),a=li(i,ai(o))||a,r=li(i,ri(o))||r,t=0,e=u.length;t<e;++t)(n=u[t])>=a&&n<=r&&d.push(n);return i.min=a,i.max=r,i._unit=l.unit||(s.autoSkip?ui(l.minUnit,i.min,i.max,h):function(t,e,n,i,a){var r,o;for(r=ni.length-1;r>=ni.indexOf(n);r--)if(o=ni[r],ei[o].common&&t._adapter.diff(a,i,o)>=e-1)return o;return ni[n?ni.indexOf(n):0]}(i,d.length,l.minUnit,i.min,i.max)),i._majorUnit=s.major.enabled&&"year"!==i._unit?function(t){for(var e=ni.indexOf(t)+1,n=ni.length;e<n;++e)if(ei[ni[e]].common)return ni[e]}(i._unit):void 0,i._table=function(t,e,n,i){if("linear"===i||!t.length)return[{time:e,pos:0},{time:n,pos:1}];var a,r,o,s,l,u=[],d=[e];for(a=0,r=t.length;a<r;++a)(s=t[a])>e&&s<n&&d.push(s);for(d.push(n),a=0,r=d.length;a<r;++a)l=d[a+1],o=d[a-1],s=d[a],void 0!==o&&void 0!==l&&Math.round((l+o)/2)===s||u.push({time:s,pos:a/(r-1)});return u}(i._timestamps.data,a,r,f),i._offsets=function(t,e,n,i,a){var r,o,s=0,l=0;return a.offset&&e.length&&(r=oi(t,"time",e[0],"pos"),s=1===e.length?1-r:(oi(t,"time",e[1],"pos")-r)/2,o=oi(t,"time",e[e.length-1],"pos"),l=1===e.length?o:(o-oi(t,"time",e[e.length-2],"pos"))/2),{start:s,end:l,factor:1/(s+1+l)}}(i._table,d,0,0,o),s.reverse&&d.reverse(),di(i,d,i._majorUnit)},getLabelForIndex:function(t,e){var n=this,i=n._adapter,a=n.chart.data,r=n.options.time,o=a.labels&&t<a.labels.length?a.labels[t]:"",s=a.datasets[e].data[t];return H.isObject(s)&&(o=n.getRightValue(s)),r.tooltipFormat?i.format(si(n,o),r.tooltipFormat):"string"==typeof o?o:i.format(si(n,o),r.displayFormats.datetime)},tickFormatFunction:function(t,e,n,i){var a=this._adapter,r=this.options,o=r.time.displayFormats,s=o[this._unit],l=this._majorUnit,u=o[l],d=n[e],h=r.ticks,c=l&&u&&d&&d.major,f=a.format(t,i||(c?u:s)),g=c?h.major:h.minor,p=$n([g.callback,g.userCallback,h.callback,h.userCallback]);return p?p(f,e,n):f},convertTicksToLabels:function(t){var e,n,i=[];for(e=0,n=t.length;e<n;++e)i.push(this.tickFormatFunction(t[e].value,e,t));return i},getPixelForOffset:function(t){var e=this._offsets,n=oi(this._table,"time",t,"pos");return this.getPixelForDecimal((e.start+n)*e.factor)},getPixelForValue:function(t,e,n){var i=null;if(void 0!==e&&void 0!==n&&(i=this._timestamps.datasets[n][e]),null===i&&(i=li(this,t)),null!==i)return this.getPixelForOffset(i)},getPixelForTick:function(t){var e=this.getTicks();return t>=0&&t<e.length?this.getPixelForOffset(e[t].value):null},getValueForPixel:function(t){var e=this._offsets,n=this.getDecimalForPixel(t)/e.factor-e.end,i=oi(this._table,"pos",n,"time");return this._adapter._create(i)},_getLabelSize:function(t){var e=this.options.ticks,n=this.ctx.measureText(t).width,i=H.toRadians(this.isHorizontal()?e.maxRotation:e.minRotation),a=Math.cos(i),r=Math.sin(i),o=Jn(e.fontSize,N.global.defaultFontSize);return{w:n*a+o*r,h:n*r+o*a}},getLabelWidth:function(t){return this._getLabelSize(t).w},getLabelCapacity:function(t){var e=this,n=e.options.time,i=n.displayFormats,a=i[n.unit]||i.millisecond,r=e.tickFormatFunction(t,0,di(e,[t],e._majorUnit),a),o=e._getLabelSize(r),s=Math.floor(e.isHorizontal()?e.width/o.w:e.height/o.h);return e.options.offset&&s--,s>0?s:1}}),ci={position:"bottom",distribution:"linear",bounds:"data",adapters:{},time:{parser:!1,unit:!1,round:!1,displayFormat:!1,isoWeekday:!1,minUnit:"millisecond",displayFormats:{}},ticks:{autoSkip:!1,source:"auto",major:{enabled:!1}}};hi._defaults=ci;var fi={category:kn,linear:Tn,logarithmic:zn,radialLinear:Xn,time:hi},gi={datetime:"MMM D, YYYY, h:mm:ss a",millisecond:"h:mm:ss.SSS a",second:"h:mm:ss a",minute:"h:mm a",hour:"hA",day:"MMM D",week:"ll",month:"MMM YYYY",quarter:"[Q]Q - YYYY",year:"YYYY"};rn._date.override("function"==typeof t?{_id:"moment",formats:function(){return gi},parse:function(e,n){return"string"==typeof e&&"string"==typeof n?e=t(e,n):e instanceof t||(e=t(e)),e.isValid()?e.valueOf():null},format:function(e,n){return t(e).format(n)},add:function(e,n,i){return t(e).add(n,i).valueOf()},diff:function(e,n,i){return t(e).diff(t(n),i)},startOf:function(e,n,i){return e=t(e),"isoWeek"===n?e.isoWeekday(i).valueOf():e.startOf(n).valueOf()},endOf:function(e,n){return t(e).endOf(n).valueOf()},_create:function(e){return t(e)}}:{}),N._set("global",{plugins:{filler:{propagate:!0}}});var pi={dataset:function(t){var e=t.fill,n=t.chart,i=n.getDatasetMeta(e),a=i&&n.isDatasetVisible(e)&&i.dataset._children||[],r=a.length||0;return r?function(t,e){return e<r&&a[e]._view||null}:null},boundary:function(t){var e=t.boundary,n=e?e.x:null,i=e?e.y:null;return H.isArray(e)?function(t,n){return e[n]}:function(t){return{x:null===n?t.x:n,y:null===i?t.y:i}}}};function mi(t,e,n){var i,a=t._model||{},r=a.fill;if(void 0===r&&(r=!!a.backgroundColor),!1===r||null===r)return!1;if(!0===r)return"origin";if(i=parseFloat(r,10),isFinite(i)&&Math.floor(i)===i)return"-"!==r[0]&&"+"!==r[0]||(i=e+i),!(i===e||i<0||i>=n)&&i;switch(r){case"bottom":return"start";case"top":return"end";case"zero":return"origin";case"origin":case"start":case"end":return r;default:return!1}}function vi(t){return(t.el._scale||{}).getPointPositionForValue?function(t){var e,n,i,a,r,o=t.el._scale,s=o.options,l=o.chart.data.labels.length,u=t.fill,d=[];if(!l)return null;for(e=s.ticks.reverse?o.max:o.min,n=s.ticks.reverse?o.min:o.max,i=o.getPointPositionForValue(0,e),a=0;a<l;++a)r="start"===u||"end"===u?o.getPointPositionForValue(a,"start"===u?e:n):o.getBasePosition(a),s.gridLines.circular&&(r.cx=i.x,r.cy=i.y,r.angle=o.getIndexAngle(a)-Math.PI/2),d.push(r);return d}(t):function(t){var e,n=t.el._model||{},i=t.el._scale||{},a=t.fill,r=null;if(isFinite(a))return null;if("start"===a?r=void 0===n.scaleBottom?i.bottom:n.scaleBottom:"end"===a?r=void 0===n.scaleTop?i.top:n.scaleTop:void 0!==n.scaleZero?r=n.scaleZero:i.getBasePixel&&(r=i.getBasePixel()),null!=r){if(void 0!==r.x&&void 0!==r.y)return r;if(H.isFinite(r))return{x:(e=i.isHorizontal())?r:null,y:e?null:r}}return null}(t)}function bi(t,e,n){var i,a=t[e].fill,r=[e];if(!n)return a;for(;!1!==a&&-1===r.indexOf(a);){if(!isFinite(a))return a;if(!(i=t[a]))return!1;if(i.visible)return a;r.push(a),a=i.fill}return!1}function xi(t){var e=t.fill,n="dataset";return!1===e?null:(isFinite(e)||(n="boundary"),pi[n](t))}function yi(t){return t&&!t.skip}function _i(t,e,n,i,a){var r,o,s,l;if(i&&a){for(t.moveTo(e[0].x,e[0].y),r=1;r<i;++r)H.canvas.lineTo(t,e[r-1],e[r]);if(void 0===n[0].angle)for(t.lineTo(n[a-1].x,n[a-1].y),r=a-1;r>0;--r)H.canvas.lineTo(t,n[r],n[r-1],!0);else for(o=n[0].cx,s=n[0].cy,l=Math.sqrt(Math.pow(n[0].x-o,2)+Math.pow(n[0].y-s,2)),r=a-1;r>0;--r)t.arc(o,s,l,n[r].angle,n[r-1].angle,!0)}}function ki(t,e,n,i,a,r){var o,s,l,u,d,h,c,f,g=e.length,p=i.spanGaps,m=[],v=[],b=0,x=0;for(t.beginPath(),o=0,s=g;o<s;++o)d=n(u=e[l=o%g]._view,l,i),h=yi(u),c=yi(d),r&&void 0===f&&h&&(s=g+(f=o+1)),h&&c?(b=m.push(u),x=v.push(d)):b&&x&&(p?(h&&m.push(u),c&&v.push(d)):(_i(t,m,v,b,x),b=x=0,m=[],v=[]));_i(t,m,v,b,x),t.closePath(),t.fillStyle=a,t.fill()}var wi={id:"filler",afterDatasetsUpdate:function(t,e){var n,i,a,r,o=(t.data.datasets||[]).length,s=e.propagate,l=[];for(i=0;i<o;++i)r=null,(a=(n=t.getDatasetMeta(i)).dataset)&&a._model&&a instanceof kt.Line&&(r={visible:t.isDatasetVisible(i),fill:mi(a,i,o),chart:t,el:a}),n.$filler=r,l.push(r);for(i=0;i<o;++i)(r=l[i])&&(r.fill=bi(l,i,s),r.boundary=vi(r),r.mapper=xi(r))},beforeDatasetsDraw:function(t){var e,n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas(),u=t.ctx;for(n=l.length-1;n>=0;--n)(e=l[n].$filler)&&e.visible&&(a=(i=e.el)._view,r=i._children||[],o=e.mapper,s=a.backgroundColor||N.global.defaultColor,o&&s&&r.length&&(H.canvas.clipArea(u,t.chartArea),ki(u,r,o,a,s,i._loop),H.canvas.unclipArea(u)))}},Mi=H.rtl.getRtlAdapter,Si=H.noop,Ci=H.valueOrDefault;function Pi(t,e){return t.usePointStyle&&t.boxWidth>e?e:t.boxWidth}N._set("global",{legend:{display:!0,position:"top",align:"center",fullWidth:!0,reverse:!1,weight:1e3,onClick:function(t,e){var n=e.datasetIndex,i=this.chart,a=i.getDatasetMeta(n);a.hidden=null===a.hidden?!i.data.datasets[n].hidden:null,i.update()},onHover:null,onLeave:null,labels:{boxWidth:40,padding:10,generateLabels:function(t){var e=t.data.datasets,n=t.options.legend||{},i=n.labels&&n.labels.usePointStyle;return t._getSortedDatasetMetas().map((function(n){var a=n.controller.getStyle(i?0:void 0);return{text:e[n.index].label,fillStyle:a.backgroundColor,hidden:!t.isDatasetVisible(n.index),lineCap:a.borderCapStyle,lineDash:a.borderDash,lineDashOffset:a.borderDashOffset,lineJoin:a.borderJoinStyle,lineWidth:a.borderWidth,strokeStyle:a.borderColor,pointStyle:a.pointStyle,rotation:a.rotation,datasetIndex:n.index}}),this)}}},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data.datasets;for(a.setAttribute("class",t.id+"-legend"),e=0,n=r.length;e<n;e++)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=r[e].backgroundColor,r[e].label&&i.appendChild(document.createTextNode(r[e].label));return a.outerHTML}});var Ai=K.extend({initialize:function(t){H.extend(this,t),this.legendHitBoxes=[],this._hoveredItem=null,this.doughnutMode=!1},beforeUpdate:Si,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Si,beforeSetDimensions:Si,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Si,beforeBuildLabels:Si,buildLabels:function(){var t=this,e=t.options.labels||{},n=H.callback(e.generateLabels,[t.chart],t)||[];e.filter&&(n=n.filter((function(n){return e.filter(n,t.chart.data)}))),t.options.reverse&&n.reverse(),t.legendItems=n},afterBuildLabels:Si,beforeFit:Si,fit:function(){var t=this,e=t.options,n=e.labels,i=e.display,a=t.ctx,r=H.options._parseFont(n),o=r.size,s=t.legendHitBoxes=[],l=t.minSize,u=t.isHorizontal();if(u?(l.width=t.maxWidth,l.height=i?10:0):(l.width=i?10:0,l.height=t.maxHeight),i){if(a.font=r.string,u){var d=t.lineWidths=[0],h=0;a.textAlign="left",a.textBaseline="middle",H.each(t.legendItems,(function(t,e){var i=Pi(n,o)+o/2+a.measureText(t.text).width;(0===e||d[d.length-1]+i+2*n.padding>l.width)&&(h+=o+n.padding,d[d.length-(e>0?0:1)]=0),s[e]={left:0,top:0,width:i,height:o},d[d.length-1]+=i+n.padding})),l.height+=h}else{var c=n.padding,f=t.columnWidths=[],g=t.columnHeights=[],p=n.padding,m=0,v=0;H.each(t.legendItems,(function(t,e){var i=Pi(n,o)+o/2+a.measureText(t.text).width;e>0&&v+o+2*c>l.height&&(p+=m+n.padding,f.push(m),g.push(v),m=0,v=0),m=Math.max(m,i),v+=o+c,s[e]={left:0,top:0,width:i,height:o}})),p+=m,f.push(m),g.push(v),l.width+=p}t.width=l.width,t.height=l.height}else t.width=l.width=t.height=l.height=0},afterFit:Si,isHorizontal:function(){return"top"===this.options.position||"bottom"===this.options.position},draw:function(){var t=this,e=t.options,n=e.labels,i=N.global,a=i.defaultColor,r=i.elements.line,o=t.height,s=t.columnHeights,l=t.width,u=t.lineWidths;if(e.display){var d,h=Mi(e.rtl,t.left,t.minSize.width),c=t.ctx,f=Ci(n.fontColor,i.defaultFontColor),g=H.options._parseFont(n),p=g.size;c.textAlign=h.textAlign("left"),c.textBaseline="middle",c.lineWidth=.5,c.strokeStyle=f,c.fillStyle=f,c.font=g.string;var m=Pi(n,p),v=t.legendHitBoxes,b=function(t,i){switch(e.align){case"start":return n.padding;case"end":return t-i;default:return(t-i+n.padding)/2}},x=t.isHorizontal();d=x?{x:t.left+b(l,u[0]),y:t.top+n.padding,line:0}:{x:t.left+n.padding,y:t.top+b(o,s[0]),line:0},H.rtl.overrideTextDirection(t.ctx,e.textDirection);var y=p+n.padding;H.each(t.legendItems,(function(e,i){var f=c.measureText(e.text).width,g=m+p/2+f,_=d.x,k=d.y;h.setWidth(t.minSize.width),x?i>0&&_+g+n.padding>t.left+t.minSize.width&&(k=d.y+=y,d.line++,_=d.x=t.left+b(l,u[d.line])):i>0&&k+y>t.top+t.minSize.height&&(_=d.x=_+t.columnWidths[d.line]+n.padding,d.line++,k=d.y=t.top+b(o,s[d.line]));var w=h.x(_);!function(t,e,i){if(!(isNaN(m)||m<=0)){c.save();var o=Ci(i.lineWidth,r.borderWidth);if(c.fillStyle=Ci(i.fillStyle,a),c.lineCap=Ci(i.lineCap,r.borderCapStyle),c.lineDashOffset=Ci(i.lineDashOffset,r.borderDashOffset),c.lineJoin=Ci(i.lineJoin,r.borderJoinStyle),c.lineWidth=o,c.strokeStyle=Ci(i.strokeStyle,a),c.setLineDash&&c.setLineDash(Ci(i.lineDash,r.borderDash)),n&&n.usePointStyle){var s=m*Math.SQRT2/2,l=h.xPlus(t,m/2),u=e+p/2;H.canvas.drawPoint(c,i.pointStyle,s,l,u,i.rotation)}else c.fillRect(h.leftForLtr(t,m),e,m,p),0!==o&&c.strokeRect(h.leftForLtr(t,m),e,m,p);c.restore()}}(w,k,e),v[i].left=h.leftForLtr(w,v[i].width),v[i].top=k,function(t,e,n,i){var a=p/2,r=h.xPlus(t,m+a),o=e+a;c.fillText(n.text,r,o),n.hidden&&(c.beginPath(),c.lineWidth=2,c.moveTo(r,o),c.lineTo(h.xPlus(r,i),o),c.stroke())}(w,k,e,f),x?d.x+=g+n.padding:d.y+=y})),H.rtl.restoreTextDirection(t.ctx,e.textDirection)}},_getLegendItemAt:function(t,e){var n,i,a,r=this;if(t>=r.left&&t<=r.right&&e>=r.top&&e<=r.bottom)for(a=r.legendHitBoxes,n=0;n<a.length;++n)if(t>=(i=a[n]).left&&t<=i.left+i.width&&e>=i.top&&e<=i.top+i.height)return r.legendItems[n];return null},handleEvent:function(t){var e,n=this,i=n.options,a="mouseup"===t.type?"click":t.type;if("mousemove"===a){if(!i.onHover&&!i.onLeave)return}else{if("click"!==a)return;if(!i.onClick)return}e=n._getLegendItemAt(t.x,t.y),"click"===a?e&&i.onClick&&i.onClick.call(n,t.native,e):(i.onLeave&&e!==n._hoveredItem&&(n._hoveredItem&&i.onLeave.call(n,t.native,n._hoveredItem),n._hoveredItem=e),i.onHover&&e&&i.onHover.call(n,t.native,e))}});function Di(t,e){var n=new Ai({ctx:t.ctx,options:e,chart:t});pe.configure(t,n,e),pe.addBox(t,n),t.legend=n}var Ti={id:"legend",_element:Ai,beforeInit:function(t){var e=t.options.legend;e&&Di(t,e)},beforeUpdate:function(t){var e=t.options.legend,n=t.legend;e?(H.mergeIf(e,N.global.legend),n?(pe.configure(t,n,e),n.options=e):Di(t,e)):n&&(pe.removeBox(t,n),delete t.legend)},afterEvent:function(t,e){var n=t.legend;n&&n.handleEvent(e)}},Ii=H.noop;N._set("global",{title:{display:!1,fontStyle:"bold",fullWidth:!0,padding:10,position:"top",text:"",weight:2e3}});var Fi=K.extend({initialize:function(t){H.extend(this,t),this.legendHitBoxes=[]},beforeUpdate:Ii,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Ii,beforeSetDimensions:Ii,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Ii,beforeBuildLabels:Ii,buildLabels:Ii,afterBuildLabels:Ii,beforeFit:Ii,fit:function(){var t,e=this,n=e.options,i=e.minSize={},a=e.isHorizontal();n.display?(t=(H.isArray(n.text)?n.text.length:1)*H.options._parseFont(n).lineHeight+2*n.padding,e.width=i.width=a?e.maxWidth:t,e.height=i.height=a?t:e.maxHeight):e.width=i.width=e.height=i.height=0},afterFit:Ii,isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},draw:function(){var t=this,e=t.ctx,n=t.options;if(n.display){var i,a,r,o=H.options._parseFont(n),s=o.lineHeight,l=s/2+n.padding,u=0,d=t.top,h=t.left,c=t.bottom,f=t.right;e.fillStyle=H.valueOrDefault(n.fontColor,N.global.defaultFontColor),e.font=o.string,t.isHorizontal()?(a=h+(f-h)/2,r=d+l,i=f-h):(a="left"===n.position?h+l:f-l,r=d+(c-d)/2,i=c-d,u=Math.PI*("left"===n.position?-.5:.5)),e.save(),e.translate(a,r),e.rotate(u),e.textAlign="center",e.textBaseline="middle";var g=n.text;if(H.isArray(g))for(var p=0,m=0;m<g.length;++m)e.fillText(g[m],0,p,i),p+=s;else e.fillText(g,0,0,i);e.restore()}}});function Oi(t,e){var n=new Fi({ctx:t.ctx,options:e,chart:t});pe.configure(t,n,e),pe.addBox(t,n),t.titleBlock=n}var Li={},Ri=wi,zi=Ti,Ni={id:"title",_element:Fi,beforeInit:function(t){var e=t.options.title;e&&Oi(t,e)},beforeUpdate:function(t){var e=t.options.title,n=t.titleBlock;e?(H.mergeIf(e,N.global.title),n?(pe.configure(t,n,e),n.options=e):Oi(t,e)):n&&(pe.removeBox(t,n),delete t.titleBlock)}};for(var Bi in Li.filler=Ri,Li.legend=zi,Li.title=Ni,en.helpers=H,function(){function t(t,e,n){var i;return"string"==typeof t?(i=parseInt(t,10),-1!==t.indexOf("%")&&(i=i/100*e.parentNode[n])):i=t,i}function e(t){return null!=t&&"none"!==t}function n(n,i,a){var r=document.defaultView,o=H._getParentNode(n),s=r.getComputedStyle(n)[i],l=r.getComputedStyle(o)[i],u=e(s),d=e(l),h=Number.POSITIVE_INFINITY;return u||d?Math.min(u?t(s,n,a):h,d?t(l,o,a):h):"none"}H.where=function(t,e){if(H.isArray(t)&&Array.prototype.filter)return t.filter(e);var n=[];return H.each(t,(function(t){e(t)&&n.push(t)})),n},H.findIndex=Array.prototype.findIndex?function(t,e,n){return t.findIndex(e,n)}:function(t,e,n){n=void 0===n?t:n;for(var i=0,a=t.length;i<a;++i)if(e.call(n,t[i],i,t))return i;return-1},H.findNextWhere=function(t,e,n){H.isNullOrUndef(n)&&(n=-1);for(var i=n+1;i<t.length;i++){var a=t[i];if(e(a))return a}},H.findPreviousWhere=function(t,e,n){H.isNullOrUndef(n)&&(n=t.length);for(var i=n-1;i>=0;i--){var a=t[i];if(e(a))return a}},H.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},H.almostEquals=function(t,e,n){return Math.abs(t-e)<n},H.almostWhole=function(t,e){var n=Math.round(t);return n-e<=t&&n+e>=t},H.max=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.max(t,e)}),Number.NEGATIVE_INFINITY)},H.min=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.min(t,e)}),Number.POSITIVE_INFINITY)},H.sign=Math.sign?function(t){return Math.sign(t)}:function(t){return 0===(t=+t)||isNaN(t)?t:t>0?1:-1},H.toRadians=function(t){return t*(Math.PI/180)},H.toDegrees=function(t){return t*(180/Math.PI)},H._decimalPlaces=function(t){if(H.isFinite(t)){for(var e=1,n=0;Math.round(t*e)/e!==t;)e*=10,n++;return n}},H.getAngleFromPoint=function(t,e){var n=e.x-t.x,i=e.y-t.y,a=Math.sqrt(n*n+i*i),r=Math.atan2(i,n);return r<-.5*Math.PI&&(r+=2*Math.PI),{angle:r,distance:a}},H.distanceBetweenPoints=function(t,e){return Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2))},H.aliasPixel=function(t){return t%2==0?0:.5},H._alignPixel=function(t,e,n){var i=t.currentDevicePixelRatio,a=n/2;return Math.round((e-a)*i)/i+a},H.splineCurve=function(t,e,n,i){var a=t.skip?e:t,r=e,o=n.skip?e:n,s=Math.sqrt(Math.pow(r.x-a.x,2)+Math.pow(r.y-a.y,2)),l=Math.sqrt(Math.pow(o.x-r.x,2)+Math.pow(o.y-r.y,2)),u=s/(s+l),d=l/(s+l),h=i*(u=isNaN(u)?0:u),c=i*(d=isNaN(d)?0:d);return{previous:{x:r.x-h*(o.x-a.x),y:r.y-h*(o.y-a.y)},next:{x:r.x+c*(o.x-a.x),y:r.y+c*(o.y-a.y)}}},H.EPSILON=Number.EPSILON||1e-14,H.splineCurveMonotone=function(t){var e,n,i,a,r,o,s,l,u,d=(t||[]).map((function(t){return{model:t._model,deltaK:0,mK:0}})),h=d.length;for(e=0;e<h;++e)if(!(i=d[e]).model.skip){if(n=e>0?d[e-1]:null,(a=e<h-1?d[e+1]:null)&&!a.model.skip){var c=a.model.x-i.model.x;i.deltaK=0!==c?(a.model.y-i.model.y)/c:0}!n||n.model.skip?i.mK=i.deltaK:!a||a.model.skip?i.mK=n.deltaK:this.sign(n.deltaK)!==this.sign(i.deltaK)?i.mK=0:i.mK=(n.deltaK+i.deltaK)/2}for(e=0;e<h-1;++e)i=d[e],a=d[e+1],i.model.skip||a.model.skip||(H.almostEquals(i.deltaK,0,this.EPSILON)?i.mK=a.mK=0:(r=i.mK/i.deltaK,o=a.mK/i.deltaK,(l=Math.pow(r,2)+Math.pow(o,2))<=9||(s=3/Math.sqrt(l),i.mK=r*s*i.deltaK,a.mK=o*s*i.deltaK)));for(e=0;e<h;++e)(i=d[e]).model.skip||(n=e>0?d[e-1]:null,a=e<h-1?d[e+1]:null,n&&!n.model.skip&&(u=(i.model.x-n.model.x)/3,i.model.controlPointPreviousX=i.model.x-u,i.model.controlPointPreviousY=i.model.y-u*i.mK),a&&!a.model.skip&&(u=(a.model.x-i.model.x)/3,i.model.controlPointNextX=i.model.x+u,i.model.controlPointNextY=i.model.y+u*i.mK))},H.nextItem=function(t,e,n){return n?e>=t.length-1?t[0]:t[e+1]:e>=t.length-1?t[t.length-1]:t[e+1]},H.previousItem=function(t,e,n){return n?e<=0?t[t.length-1]:t[e-1]:e<=0?t[0]:t[e-1]},H.niceNum=function(t,e){var n=Math.floor(H.log10(t)),i=t/Math.pow(10,n);return(e?i<1.5?1:i<3?2:i<7?5:10:i<=1?1:i<=2?2:i<=5?5:10)*Math.pow(10,n)},H.requestAnimFrame="undefined"==typeof window?function(t){t()}:window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)},H.getRelativePosition=function(t,e){var n,i,a=t.originalEvent||t,r=t.target||t.srcElement,o=r.getBoundingClientRect(),s=a.touches;s&&s.length>0?(n=s[0].clientX,i=s[0].clientY):(n=a.clientX,i=a.clientY);var l=parseFloat(H.getStyle(r,"padding-left")),u=parseFloat(H.getStyle(r,"padding-top")),d=parseFloat(H.getStyle(r,"padding-right")),h=parseFloat(H.getStyle(r,"padding-bottom")),c=o.right-o.left-l-d,f=o.bottom-o.top-u-h;return{x:n=Math.round((n-o.left-l)/c*r.width/e.currentDevicePixelRatio),y:i=Math.round((i-o.top-u)/f*r.height/e.currentDevicePixelRatio)}},H.getConstraintWidth=function(t){return n(t,"max-width","clientWidth")},H.getConstraintHeight=function(t){return n(t,"max-height","clientHeight")},H._calculatePadding=function(t,e,n){return(e=H.getStyle(t,e)).indexOf("%")>-1?n*parseInt(e,10)/100:parseInt(e,10)},H._getParentNode=function(t){var e=t.parentNode;return e&&"[object ShadowRoot]"===e.toString()&&(e=e.host),e},H.getMaximumWidth=function(t){var e=H._getParentNode(t);if(!e)return t.clientWidth;var n=e.clientWidth,i=n-H._calculatePadding(e,"padding-left",n)-H._calculatePadding(e,"padding-right",n),a=H.getConstraintWidth(t);return isNaN(a)?i:Math.min(i,a)},H.getMaximumHeight=function(t){var e=H._getParentNode(t);if(!e)return t.clientHeight;var n=e.clientHeight,i=n-H._calculatePadding(e,"padding-top",n)-H._calculatePadding(e,"padding-bottom",n),a=H.getConstraintHeight(t);return isNaN(a)?i:Math.min(i,a)},H.getStyle=function(t,e){return t.currentStyle?t.currentStyle[e]:document.defaultView.getComputedStyle(t,null).getPropertyValue(e)},H.retinaScale=function(t,e){var n=t.currentDevicePixelRatio=e||"undefined"!=typeof window&&window.devicePixelRatio||1;if(1!==n){var i=t.canvas,a=t.height,r=t.width;i.height=a*n,i.width=r*n,t.ctx.scale(n,n),i.style.height||i.style.width||(i.style.height=a+"px",i.style.width=r+"px")}},H.fontString=function(t,e,n){return e+" "+t+"px "+n},H.longestText=function(t,e,n,i){var a=(i=i||{}).data=i.data||{},r=i.garbageCollect=i.garbageCollect||[];i.font!==e&&(a=i.data={},r=i.garbageCollect=[],i.font=e),t.font=e;var o,s,l,u,d,h=0,c=n.length;for(o=0;o<c;o++)if(null!=(u=n[o])&&!0!==H.isArray(u))h=H.measureText(t,a,r,h,u);else if(H.isArray(u))for(s=0,l=u.length;s<l;s++)null==(d=u[s])||H.isArray(d)||(h=H.measureText(t,a,r,h,d));var f=r.length/2;if(f>n.length){for(o=0;o<f;o++)delete a[r[o]];r.splice(0,f)}return h},H.measureText=function(t,e,n,i,a){var r=e[a];return r||(r=e[a]=t.measureText(a).width,n.push(a)),r>i&&(i=r),i},H.numberOfLabelLines=function(t){var e=1;return H.each(t,(function(t){H.isArray(t)&&t.length>e&&(e=t.length)})),e},H.color=_?function(t){return t instanceof CanvasGradient&&(t=N.global.defaultColor),_(t)}:function(t){return console.error("Color.js not found!"),t},H.getHoverColor=function(t){return t instanceof CanvasPattern||t instanceof CanvasGradient?t:H.color(t).saturate(.5).darken(.1).rgbString()}}(),en._adapters=rn,en.Animation=$,en.animationService=J,en.controllers=Jt,en.DatasetController=it,en.defaults=N,en.Element=K,en.elements=kt,en.Interaction=re,en.layouts=pe,en.platform=Oe,en.plugins=Le,en.Scale=yn,en.scaleService=Re,en.Ticks=on,en.Tooltip=Ye,en.helpers.each(fi,(function(t,e){en.scaleService.registerScaleType(e,t,t._defaults)})),Li)Li.hasOwnProperty(Bi)&&en.plugins.register(Li[Bi]);en.platform.initialize();var Ei=en;return"undefined"!=typeof window&&(window.Chart=en),en.Chart=en,en.Legend=Li.legend._element,en.Title=Li.title._element,en.pluginService=en.plugins,en.PluginBase=en.Element.extend({}),en.canvasHelpers=en.helpers.canvas,en.layoutService=en.layouts,en.LinearScaleBase=Cn,en.helpers.each(["Bar","Bubble","Doughnut","Line","PolarArea","Radar","Scatter"],(function(t){en[t]=function(e,n){return new en(e,en.helpers.merge(n||{},{type:t.charAt(0).toLowerCase()+t.slice(1)}))}})),Ei}));
diff --git a/htdocs/includes/nnnick/chartjs/package-lock.json b/htdocs/includes/nnnick/chartjs/package-lock.json
index b6259567a6e..6b78d4b0ece 100644
--- a/htdocs/includes/nnnick/chartjs/package-lock.json
+++ b/htdocs/includes/nnnick/chartjs/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "chart.js",
-  "version": "2.9.3",
+  "version": "2.9.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/htdocs/includes/nnnick/chartjs/package.json b/htdocs/includes/nnnick/chartjs/package.json
index afb129b7dcd..678715f2e20 100644
--- a/htdocs/includes/nnnick/chartjs/package.json
+++ b/htdocs/includes/nnnick/chartjs/package.json
@@ -2,7 +2,7 @@
   "name": "chart.js",
   "homepage": "https://www.chartjs.org",
   "description": "Simple HTML5 charts using the canvas element.",
-  "version": "2.9.3",
+  "version": "2.9.4",
   "license": "MIT",
   "jsdelivr": "dist/Chart.min.js",
   "unpkg": "dist/Chart.min.js",
diff --git a/htdocs/includes/nusoap/lib/class.nusoap_base.php b/htdocs/includes/nusoap/lib/class.nusoap_base.php
index 8c1afbdc8dd..4a33d7e491b 100644
--- a/htdocs/includes/nusoap/lib/class.nusoap_base.php
+++ b/htdocs/includes/nusoap/lib/class.nusoap_base.php
@@ -219,7 +219,7 @@ class nusoap_base {
 	*
 	* @access	public
 	*/
-	function nusoap_base() {
+	function __construct() {
 		$this->debugLevel = $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];
 	}
 
diff --git a/htdocs/includes/nusoap/lib/class.soap_fault.php b/htdocs/includes/nusoap/lib/class.soap_fault.php
index 86274203783..9dca5160c9b 100644
--- a/htdocs/includes/nusoap/lib/class.soap_fault.php
+++ b/htdocs/includes/nusoap/lib/class.soap_fault.php
@@ -44,8 +44,8 @@ class nusoap_fault extends nusoap_base {
     * @param string $faultstring human readable error message
     * @param mixed $faultdetail detail, typically a string or array of string
 	*/
-	function nusoap_fault($faultcode,$faultactor='',$faultstring='',$faultdetail=''){
-		parent::nusoap_base();
+	function __construct($faultcode,$faultactor='',$faultstring='',$faultdetail=''){
+		parent::__construct();
 		$this->faultcode = $faultcode;
 		$this->faultactor = $faultactor;
 		$this->faultstring = $faultstring;
diff --git a/htdocs/includes/nusoap/lib/class.soap_parser.php b/htdocs/includes/nusoap/lib/class.soap_parser.php
index 6bfa341b67f..db0342af83c 100644
--- a/htdocs/includes/nusoap/lib/class.soap_parser.php
+++ b/htdocs/includes/nusoap/lib/class.soap_parser.php
@@ -56,8 +56,8 @@ class nusoap_parser extends nusoap_base {
 	* @param    string $decode_utf8 whether to decode UTF-8 to ISO-8859-1
 	* @access   public
 	*/
-	function nusoap_parser($xml,$encoding='UTF-8',$method='',$decode_utf8=true){
-		parent::nusoap_base();
+	function __construct($xml,$encoding='UTF-8',$method='',$decode_utf8=true){
+		parent::__construct();
 		$this->xml = $xml;
 		$this->xml_encoding = $encoding;
 		$this->method = $method;
@@ -316,7 +316,7 @@ class nusoap_parser extends nusoap_base {
 			// get unqualified name
 			$name = substr(strstr($name,':'),1);
 		}
-		
+
 		// build to native type
 		if(isset($this->body_position) && $pos > $this->body_position){
 			// deal w/ multirefs
@@ -378,7 +378,7 @@ class nusoap_parser extends nusoap_base {
 				*/
 			}
 		}
-		
+
         // for doclit
         if($this->status == 'header'){
         	if ($this->root_header != $pos) {
diff --git a/htdocs/includes/nusoap/lib/class.soap_server.php b/htdocs/includes/nusoap/lib/class.soap_server.php
index 34c2269ffe9..8145219acdb 100644
--- a/htdocs/includes/nusoap/lib/class.soap_server.php
+++ b/htdocs/includes/nusoap/lib/class.soap_server.php
@@ -169,8 +169,8 @@ class nusoap_server extends nusoap_base {
     * @param mixed $wsdl file path or URL (string), or wsdl instance (object)
 	* @access   public
 	*/
-	function nusoap_server($wsdl=false){
-		parent::nusoap_base();
+	function __construct($wsdl=false){
+		parent::__construct();
 		// turn on debugging?
 		global $debug;
 		global $HTTP_SERVER_VARS;
@@ -776,7 +776,7 @@ class nusoap_server extends nusoap_base {
 		//begin code to compress payload - by John
 		// NOTE: there is no way to know whether the Web server will also compress
 		// this data.
-		if (strlen($payload) > 1024 && isset($this->headers) && isset($this->headers['accept-encoding'])) {	
+		if (strlen($payload) > 1024 && isset($this->headers) && isset($this->headers['accept-encoding'])) {
 			if (strstr($this->headers['accept-encoding'], 'gzip')) {
 				if (function_exists('gzencode')) {
 					if (isset($this->debug_flag) && $this->debug_flag) {
@@ -903,7 +903,7 @@ class nusoap_server extends nusoap_base {
 	function getHTTPBody($soapmsg) {
 		return $soapmsg;
 	}
-	
+
 	/**
 	* gets the HTTP content type for the current response.
 	*
@@ -915,7 +915,7 @@ class nusoap_server extends nusoap_base {
 	function getHTTPContentType() {
 		return 'text/xml';
 	}
-	
+
 	/**
 	* gets the HTTP content type charset for the current response.
 	* returns false for non-text content types.
@@ -1074,7 +1074,7 @@ class nusoap_server extends nusoap_base {
         if(false == $namespace) {
             $namespace = "http://$SERVER_NAME/soap/$serviceName";
         }
-        
+
         if(false == $endpoint) {
         	if ($HTTPS == '1' || $HTTPS == 'on') {
         		$SCHEME = 'https';
@@ -1083,11 +1083,11 @@ class nusoap_server extends nusoap_base {
         	}
             $endpoint = "$SCHEME://$SERVER_NAME$SERVER_PORT$SCRIPT_NAME";
         }
-        
+
         if(false == $schemaTargetNamespace) {
             $schemaTargetNamespace = $namespace;
         }
-        
+
 		$this->wsdl = new wsdl;
 		$this->wsdl->serviceName = $serviceName;
         $this->wsdl->endpoint = $endpoint;
diff --git a/htdocs/includes/nusoap/lib/class.soap_transport_http.php b/htdocs/includes/nusoap/lib/class.soap_transport_http.php
index 8141d4f655e..4ff49345083 100644
--- a/htdocs/includes/nusoap/lib/class.soap_transport_http.php
+++ b/htdocs/includes/nusoap/lib/class.soap_transport_http.php
@@ -56,8 +56,8 @@ class soap_transport_http extends nusoap_base {
 	* @param boolean $use_curl Whether to try to force cURL use
 	* @access public
 	*/
-	function soap_transport_http($url, $curl_options = NULL, $use_curl = false){
-		parent::nusoap_base();
+	function __construct($url, $curl_options = NULL, $use_curl = false){
+		parent::__construct();
 		$this->debug("ctor url=$url use_curl=$use_curl curl_options:");
 		$this->appendDebug($this->varDump($curl_options));
 		$this->setURL($url);
@@ -121,12 +121,12 @@ class soap_transport_http extends nusoap_base {
 			$this->debug("parsed URL $k = $v");
 			$this->$k = $v;
 		}
-		
+
 		// add any GET params to path
 		if(isset($u['query']) && $u['query'] != ''){
             $this->path .= '?' . $u['query'];
 		}
-		
+
 		// set default port
 		if(!isset($u['port'])){
 			if($u['scheme'] == 'https'){
@@ -135,10 +135,10 @@ class soap_transport_http extends nusoap_base {
 				$this->port = 80;
 			}
 		}
-		
+
 		$this->uri = $this->path;
 		$this->digest_uri = $this->uri;
-		
+
 		// build headers
 		if (!isset($u['port'])) {
 			$this->setHeader('Host', $this->host);
@@ -218,7 +218,7 @@ class soap_transport_http extends nusoap_base {
 		} else {
 			$this->fp = @fsockopen( $host, $this->port, $this->errno, $this->error_str);
 		}
-		
+
 		// test pointer
 		if(!$this->fp) {
 			$msg = 'Couldn\'t open socket connection to server ' . $this->url;
@@ -231,7 +231,7 @@ class soap_transport_http extends nusoap_base {
 			$this->setError($msg);
 			return false;
 		}
-		
+
 		// set response timeout
 		$this->debug('set response timeout to ' . $response_timeout);
 		socket_set_timeout( $this->fp, $response_timeout);
@@ -320,10 +320,10 @@ class soap_transport_http extends nusoap_base {
 			// recent versions of cURL turn on peer/host checking by default,
 			// while PHP binaries are not compiled with a default location for the
 			// CA cert bundle, so disable peer/host checking.
-			//$this->setCurlOption(CURLOPT_CAINFO, 'f:\php-4.3.2-win32\extensions\curl-ca-bundle.crt');		
+			//$this->setCurlOption(CURLOPT_CAINFO, 'f:\php-4.3.2-win32\extensions\curl-ca-bundle.crt');
 			$this->setCurlOption(CURLOPT_SSL_VERIFYPEER, 0);
 			$this->setCurlOption(CURLOPT_SSL_VERIFYHOST, 0);
-	
+
 			// support client certificates (thanks Tobias Boes, Doug Anarino, Eryan Ariobowo)
 			if ($this->authtype == 'certificate') {
 				$this->debug('set cURL certificate options');
@@ -410,7 +410,7 @@ class soap_transport_http extends nusoap_base {
 	* @access   public
 	*/
 	function send($data, $timeout=0, $response_timeout=30, $cookies=NULL) {
-		
+
 		$this->debug('entered send() with data of length: '.strlen($data));
 
 		$this->tryagain = true;
@@ -422,18 +422,18 @@ class soap_transport_http extends nusoap_base {
 				if (!$this->connect($timeout, $response_timeout)){
 					return false;
 				}
-				
+
 				// send request
 				if (!$this->sendRequest($data, $cookies)){
 					return false;
 				}
-				
+
 				// get response
 				$respdata = $this->getResponse();
 			} else {
 				$this->setError("Too many tries to get an OK response ($this->response_status_line)");
 			}
-		}		
+		}
 		$this->debug('end of send()');
 		return $respdata;
 	}
@@ -453,7 +453,7 @@ class soap_transport_http extends nusoap_base {
 	function sendHTTPS($data, $timeout=0, $response_timeout=30, $cookies) {
 		return $this->send($data, $timeout, $response_timeout, $cookies);
 	}
-	
+
 	/**
 	* if authenticating, set user credentials here
 	*
@@ -475,21 +475,21 @@ class soap_transport_http extends nusoap_base {
 		} elseif ($authtype == 'digest') {
 			if (isset($digestRequest['nonce'])) {
 				$digestRequest['nc'] = isset($digestRequest['nc']) ? $digestRequest['nc']++ : 1;
-				
+
 				// calculate the Digest hashes (calculate code based on digest implementation found at: http://www.rassoc.com/gregr/weblog/stories/2002/07/09/webServicesSecurityHttpDigestAuthenticationWithoutActiveDirectory.html)
-	
+
 				// A1 = unq(username-value) ":" unq(realm-value) ":" passwd
 				$A1 = $username. ':' . (isset($digestRequest['realm']) ? $digestRequest['realm'] : '') . ':' . $password;
-	
+
 				// H(A1) = MD5(A1)
 				$HA1 = md5($A1);
-	
+
 				// A2 = Method ":" digest-uri-value
 				$A2 = $this->request_method . ':' . $this->digest_uri;
-	
+
 				// H(A2)
 				$HA2 =  md5($A2);
-	
+
 				// KD(secret, data) = H(concat(secret, ":", data))
 				// if qop == auth:
 				// request-digest  = <"> < KD ( H(A1),     unq(nonce-value)
@@ -500,7 +500,7 @@ class soap_transport_http extends nusoap_base {
 				//                            ) <">
 				// if qop is missing,
 				// request-digest  = <"> < KD ( H(A1), unq(nonce-value) ":" H(A2) ) > <">
-	
+
 				$unhashedDigest = '';
 				$nonce = isset($digestRequest['nonce']) ? $digestRequest['nonce'] : '';
 				$cnonce = $nonce;
@@ -509,10 +509,10 @@ class soap_transport_http extends nusoap_base {
 				} else {
 					$unhashedDigest = $HA1 . ':' . $nonce . ':' . $HA2;
 				}
-	
+
 				$hashedDigest = md5($unhashedDigest);
-	
-				$opaque = '';	
+
+				$opaque = '';
 				if (isset($digestRequest['opaque'])) {
 					$opaque = ', opaque="' . $digestRequest['opaque'] . '"';
 				}
@@ -531,7 +531,7 @@ class soap_transport_http extends nusoap_base {
 		$this->authtype = $authtype;
 		$this->digestRequest = $digestRequest;
 	}
-	
+
 	/**
 	* set the soapaction value
 	*
@@ -541,7 +541,7 @@ class soap_transport_http extends nusoap_base {
 	function setSOAPAction($soapaction) {
 		$this->setHeader('SOAPAction', '"' . $soapaction . '"');
 	}
-	
+
 	/**
 	* use http encoding
 	*
@@ -561,7 +561,7 @@ class soap_transport_http extends nusoap_base {
 			$this->encoding = $enc;
 		}
 	}
-	
+
 	/**
 	* set proxy info here
 	*
@@ -590,7 +590,7 @@ class soap_transport_http extends nusoap_base {
 			unsetHeader('Proxy-Authorization');
 		}
 	}
-	
+
 
 	/**
 	 * Test if the given string starts with a header that is to be skipped.
@@ -631,7 +631,7 @@ class soap_transport_http extends nusoap_base {
 		// length := 0
 		$length = 0;
 		$new = '';
-		
+
 		// read chunk-size, chunk-extension (if any) and CRLF
 		// get the position of the linebreak
 		$chunkend = strpos($buffer, $lb);
@@ -646,7 +646,7 @@ class soap_transport_http extends nusoap_base {
 		while ($chunk_size > 0) {
 			$this->debug("chunkstart: $chunkstart chunk_size: $chunk_size");
 			$chunkend = strpos( $buffer, $lb, $chunkstart + $chunk_size);
-		  	
+
 			// Just in case we got a broken connection
 		  	if ($chunkend == FALSE) {
 		  	    $chunk = substr($buffer,$chunkstart);
@@ -655,7 +655,7 @@ class soap_transport_http extends nusoap_base {
 		  	    $length += strlen($chunk);
 		  	    break;
 			}
-			
+
 		  	// read chunk-data and CRLF
 		  	$chunk = substr($buffer,$chunkstart,$chunkend-$chunkstart);
 		  	// append chunk-data to entity-body
@@ -664,7 +664,7 @@ class soap_transport_http extends nusoap_base {
 		  	$length += strlen($chunk);
 		  	// read chunk-size and CRLF
 		  	$chunkstart = $chunkend + strlen($lb);
-			
+
 		  	$chunkend = strpos($buffer, $lb, $chunkstart) + strlen($lb);
 			if ($chunkend == FALSE) {
 				break; //Just in case we got a broken connection
@@ -675,7 +675,7 @@ class soap_transport_http extends nusoap_base {
 		}
 		return $new;
 	}
-	
+
 	/**
 	 * Writes the payload, including HTTP headers, to $this->outgoing_payload.
 	 *
@@ -720,7 +720,7 @@ class soap_transport_http extends nusoap_base {
 
 		// header/body separator
 		$this->outgoing_payload .= "\r\n";
-		
+
 		// add data
 		$this->outgoing_payload .= $data;
 	}
@@ -792,7 +792,7 @@ class soap_transport_http extends nusoap_base {
 	*/
 	function getResponse(){
 		$this->incoming_payload = '';
-	    
+
 	  if ($this->io_method() == 'socket') {
 	    // loop until headers have been retrieved
 	    $data = '';
@@ -863,7 +863,7 @@ class soap_transport_http extends nusoap_base {
 				$this->incoming_headers[$header_name] .= $lb . ' ' . $header_line;
 			}
 		}
-		
+
 		// loop until msg has been received
 		if (isset($this->incoming_headers['transfer-encoding']) && strtolower($this->incoming_headers['transfer-encoding']) == 'chunked') {
 			$content_length =  2147483647;	// ignore any content-length header
@@ -929,22 +929,22 @@ class soap_transport_http extends nusoap_base {
 		$this->debug('read body of length ' . strlen($data));
 		$this->incoming_payload .= $data;
 		$this->debug('received a total of '.strlen($this->incoming_payload).' bytes of data from server');
-		
+
 		// close filepointer
 		if(
-			(isset($this->incoming_headers['connection']) && strtolower($this->incoming_headers['connection']) == 'close') || 
+			(isset($this->incoming_headers['connection']) && strtolower($this->incoming_headers['connection']) == 'close') ||
 			(! $this->persistentConnection) || feof($this->fp)){
 			fclose($this->fp);
 			$this->fp = false;
 			$this->debug('closed socket');
 		}
-		
+
 		// connection was closed unexpectedly
 		if($this->incoming_payload == ''){
 			$this->setError('no response from server');
 			return false;
 		}
-		
+
 		// decode transfer-encoding
 //		if(isset($this->incoming_headers['transfer-encoding']) && strtolower($this->incoming_headers['transfer-encoding']) == 'chunked'){
 //			if(!$data = $this->decodeChunked($data, $lb)){
@@ -955,7 +955,7 @@ class soap_transport_http extends nusoap_base {
 			// set decoded payload
 //			$this->incoming_payload = $header_data.$lb.$lb.$data;
 //		}
-	
+
 	  } else if ($this->io_method() == 'curl') {
 		// send and receive
 		$this->debug('send and receive with cURL');
@@ -981,7 +981,7 @@ class soap_transport_http extends nusoap_base {
 		// close curl
 		$this->debug('No cURL error, closing cURL');
 		curl_close($this->ch);
-		
+
 		// try removing skippable headers
 		$savedata = $data;
 		while ($this->isSkippableCurlHeader($data)) {
@@ -1004,7 +1004,7 @@ class soap_transport_http extends nusoap_base {
 				}
 			}
 		}
-		
+
 		// separate content from HTTP headers
 		if ($pos = strpos($data,"\r\n\r\n")) {
 			$lb = "\r\n";
@@ -1064,7 +1064,7 @@ class soap_transport_http extends nusoap_base {
  				$this->debug('Server wants digest authentication');
  				// remove "Digest " from our elements
  				$digestString = str_replace('Digest ', '', $this->incoming_headers['www-authenticate']);
- 				
+
  				// parse elements into array
  				$digestElements = explode(',', $digestString);
  				foreach ($digestElements as $val) {
@@ -1083,7 +1083,7 @@ class soap_transport_http extends nusoap_base {
 			$this->setError('HTTP authentication failed');
 			return false;
  		}
-		
+
 		if (
 			($http_status >= 300 && $http_status <= 307) ||
 			($http_status >= 400 && $http_status <= 417) ||
@@ -1151,13 +1151,13 @@ class soap_transport_http extends nusoap_base {
 		} else {
 			$this->debug('No Content-Encoding header');
 		}
-		
+
 		if(strlen($data) == 0){
 			$this->debug('no data after headers!');
 			$this->setError('no data present after HTTP headers');
 			return false;
 		}
-		
+
 		return $data;
 	}
 
@@ -1229,7 +1229,7 @@ class soap_transport_http extends nusoap_base {
 		} else {
 			$path = '/';
 		}
-						
+
 		$cookie_param = ';secure;';
 		if (strpos($cookie_str, $cookie_param) !== FALSE) {
 			$secure = true;
@@ -1248,12 +1248,12 @@ class soap_transport_http extends nusoap_base {
 							'path' => $path,
 							'expires' => $expires,
 							'secure' => $secure
-							);		
+							);
 			return $cookie;
 		}
 		return false;
 	}
-  
+
 	/**
 	 * sort out cookies for the current request
 	 *
diff --git a/htdocs/includes/nusoap/lib/class.soap_val.php b/htdocs/includes/nusoap/lib/class.soap_val.php
index cc2e515e4e1..003375fda84 100644
--- a/htdocs/includes/nusoap/lib/class.soap_val.php
+++ b/htdocs/includes/nusoap/lib/class.soap_val.php
@@ -68,8 +68,8 @@ class soapval extends nusoap_base {
 	* @param	mixed $attributes associative array of attributes to add to element serialization
 	* @access   public
 	*/
-  	function soapval($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) {
-		parent::nusoap_base();
+	function __construct($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) {
+		parent::__construct();
 		$this->name = $name;
 		$this->type = $type;
 		$this->value = $value;
diff --git a/htdocs/includes/nusoap/lib/class.soapclient.php b/htdocs/includes/nusoap/lib/class.soapclient.php
index 9d9533b22b3..de0ca3c9882 100644
--- a/htdocs/includes/nusoap/lib/class.soapclient.php
+++ b/htdocs/includes/nusoap/lib/class.soapclient.php
@@ -94,8 +94,8 @@ class nusoap_client extends nusoap_base  {
 	* @param	string $portName optional portName in WSDL document
 	* @access   public
 	*/
-	function nusoap_client($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = ''){
-		parent::nusoap_base();
+	function __construct($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = ''){
+		parent::__construct();
 		$this->endpoint = $endpoint;
 		$this->proxyhost = $proxyhost;
 		$this->proxyport = $proxyport;
@@ -163,7 +163,7 @@ class nusoap_client extends nusoap_base  {
 		$this->faultstring = '';
 		$this->faultcode = '';
 		$this->opData = array();
-		
+
 		$this->debug("call: operation=$operation, namespace=$namespace, soapAction=$soapAction, rpcParams=$rpcParams, style=$style, use=$use, endpointType=$this->endpointType");
 		$this->appendDebug('params=' . $this->varDump($params));
 		$this->appendDebug('headers=' . $this->varDump($headers));
@@ -234,7 +234,7 @@ class nusoap_client extends nusoap_base  {
 			// no WSDL
 			//$this->namespaces['ns1'] = $namespace;
 			$nsPrefix = 'ns' . rand(1000, 9999);
-			// serialize 
+			// serialize
 			$payload = '';
 			if (is_string($params)) {
 				$this->debug("serializing param string for operation $operation");
@@ -294,7 +294,7 @@ class nusoap_client extends nusoap_base  {
 			$this->return = $return;
 			$this->debug('sent message successfully and got a(n) '.gettype($return));
            	$this->appendDebug('return=' . $this->varDump($return));
-			
+
 			// fault?
 			if(is_array($return) && isset($return['faultcode'])){
 				$this->debug('got fault');
@@ -463,7 +463,7 @@ class nusoap_client extends nusoap_base  {
 						$this->persistentConnection = $http;
 					}
 				}
-				
+
 				if($err = $http->getError()){
 					$this->setError('HTTP Error: '.$err);
 					return false;
@@ -627,7 +627,7 @@ class nusoap_client extends nusoap_base  {
 		$this->authtype = $authtype;
 		$this->certRequest = $certRequest;
 	}
-	
+
 	/**
 	* use HTTP encoding
 	*
@@ -638,7 +638,7 @@ class nusoap_client extends nusoap_base  {
 		$this->debug("setHTTPEncoding(\"$enc\")");
 		$this->http_encoding = $enc;
 	}
-	
+
 	/**
 	* Set whether to try to use cURL connections if possible
 	*
@@ -659,7 +659,7 @@ class nusoap_client extends nusoap_base  {
 		$this->debug("useHTTPPersistentConnection");
 		$this->persistentConnection = true;
 	}
-	
+
 	/**
 	* gets the default RPC parameter setting.
 	* If true, default is that call params are like RPC even for document style.
@@ -689,7 +689,7 @@ class nusoap_client extends nusoap_base  {
 	function setDefaultRpcParams($rpcParams) {
 		$this->defaultRpcParams = $rpcParams;
 	}
-	
+
 	/**
 	* dynamically creates an instance of a proxy class,
 	* allowing user to directly call methods from wsdl
@@ -819,7 +819,7 @@ class nusoap_client extends nusoap_base  {
 	function getHTTPBody($soapmsg) {
 		return $soapmsg;
 	}
-	
+
 	/**
 	* gets the HTTP content type for the current request.
 	*
@@ -831,7 +831,7 @@ class nusoap_client extends nusoap_base  {
 	function getHTTPContentType() {
 		return 'text/xml';
 	}
-	
+
 	/**
 	* gets the HTTP content type charset for the current request.
 	* returns false for non-text content types.
diff --git a/htdocs/includes/nusoap/lib/class.wsdl.php b/htdocs/includes/nusoap/lib/class.wsdl.php
index 5c701700bff..691426a2a0f 100644
--- a/htdocs/includes/nusoap/lib/class.wsdl.php
+++ b/htdocs/includes/nusoap/lib/class.wsdl.php
@@ -6,14 +6,14 @@
 /**
 * parses a WSDL file, allows access to it's data, other utility methods.
 * also builds WSDL structures programmatically.
-* 
+*
 * @author   Dietrich Ayala <dietrich@ganx4.com>
 * @author   Scott Nichol <snichol@users.sourceforge.net>
-* @access public 
+* @access public
 */
 class wsdl extends nusoap_base {
 	// URL or filename of the root of this WSDL
-    var $wsdl; 
+    var $wsdl;
     // define internal arrays of bindings, ports, operations, messages, etc.
     var $schemas = array();
     var $currentSchema;
@@ -31,9 +31,9 @@ class wsdl extends nusoap_base {
     var $opData = array();
     var $status = '';
     var $documentation = false;
-    var $endpoint = ''; 
+    var $endpoint = '';
     // array of wsdl docs to import
-    var $import = array(); 
+    var $import = array();
     // parser vars
     var $parser;
     var $position = 0;
@@ -56,7 +56,7 @@ class wsdl extends nusoap_base {
 
     /**
      * constructor
-     * 
+     *
      * @param string $wsdl WSDL document URL
 	 * @param string $proxyhost
 	 * @param string $proxyport
@@ -66,10 +66,10 @@ class wsdl extends nusoap_base {
 	 * @param integer $response_timeout set the response timeout
 	 * @param array $curl_options user-specified cURL options
 	 * @param boolean $use_curl try to use cURL
-     * @access public 
+     * @access public
      */
-    function wsdl($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){
-		parent::nusoap_base();
+	function __construct($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){
+		parent::__construct();
 		$this->debug("ctor wsdl=$wsdl timeout=$timeout response_timeout=$response_timeout");
         $this->proxyhost = $proxyhost;
         $this->proxyport = $proxyport;
@@ -126,7 +126,7 @@ class wsdl extends nusoap_base {
 								}
 							}
 						}
-		            } 
+		            }
     			}
     		}
     		// WSDL imports
@@ -152,18 +152,18 @@ class wsdl extends nusoap_base {
 						}
 					}
 				}
-            } 
+            }
 		}
         // add new data to operation data
         foreach($this->bindings as $binding => $bindingData) {
             if (isset($bindingData['operations']) && is_array($bindingData['operations'])) {
                 foreach($bindingData['operations'] as $operation => $data) {
                     $this->debug('post-parse data gathering for ' . $operation);
-                    $this->bindings[$binding]['operations'][$operation]['input'] = 
-						isset($this->bindings[$binding]['operations'][$operation]['input']) ? 
+                    $this->bindings[$binding]['operations'][$operation]['input'] =
+						isset($this->bindings[$binding]['operations'][$operation]['input']) ?
 						array_merge($this->bindings[$binding]['operations'][$operation]['input'], $this->portTypes[ $bindingData['portType'] ][$operation]['input']) :
 						$this->portTypes[ $bindingData['portType'] ][$operation]['input'];
-                    $this->bindings[$binding]['operations'][$operation]['output'] = 
+                    $this->bindings[$binding]['operations'][$operation]['output'] =
 						isset($this->bindings[$binding]['operations'][$operation]['output']) ?
 						array_merge($this->bindings[$binding]['operations'][$operation]['output'], $this->portTypes[ $bindingData['portType'] ][$operation]['output']) :
 						$this->portTypes[ $bindingData['portType'] ][$operation]['output'];
@@ -180,16 +180,16 @@ class wsdl extends nusoap_base {
                     $this->bindings[$binding]['operations'][$operation]['transport'] = isset($bindingData['transport']) ? $bindingData['transport'] : '';
                     $this->bindings[$binding]['operations'][$operation]['documentation'] = isset($this->portTypes[ $bindingData['portType'] ][$operation]['documentation']) ? $this->portTypes[ $bindingData['portType'] ][$operation]['documentation'] : '';
                     $this->bindings[$binding]['operations'][$operation]['endpoint'] = isset($bindingData['endpoint']) ? $bindingData['endpoint'] : '';
-                } 
-            } 
+                }
+            }
         }
 	}
 
     /**
      * parses the wsdl document
-     * 
+     *
      * @param string $wsdl path or URL
-     * @access private 
+     * @access private
      */
     function parseWSDL($wsdl = '') {
 		$this->debug("parse WSDL at path=$wsdl");
@@ -199,7 +199,7 @@ class wsdl extends nusoap_base {
             $this->setError('no wsdl passed to parseWSDL()!!');
             return false;
         }
-        
+
         // parse $wsdl for url format
         $wsdl_props = parse_url($wsdl);
 
@@ -242,24 +242,24 @@ class wsdl extends nusoap_base {
                 $wsdl_string = '';
                 while ($data = fread($fp, 32768)) {
                     $wsdl_string .= $data;
-                } 
+                }
                 fclose($fp);
             } else {
             	$errstr = "Bad path to WSDL file $path";
             	$this->debug($errstr);
                 $this->setError($errstr);
                 return false;
-            } 
+            }
         }
         $this->debug('Parse WSDL');
         // end new code added
         // Create an XML parser.
-        $this->parser = xml_parser_create(); 
+        $this->parser = xml_parser_create();
         // Set the options for parsing the XML data.
         // xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
-        xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0); 
+        xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);
         // Set the object for the parser.
-        xml_set_object($this->parser, $this); 
+        xml_set_object($this->parser, $this);
         // Set the element handlers for the parser.
         xml_set_element_handler($this->parser, 'start_element', 'end_element');
         xml_set_character_data_handler($this->parser, 'character_data');
@@ -276,7 +276,7 @@ class wsdl extends nusoap_base {
 			$this->debug("XML payload:\n" . $wsdl_string);
             $this->setError($errstr);
             return false;
-        } 
+        }
 		// free the parser
         xml_parser_free($this->parser);
         $this->debug('Parsing WSDL done');
@@ -285,15 +285,15 @@ class wsdl extends nusoap_base {
 			return false;
 		}
         return true;
-    } 
+    }
 
     /**
      * start-element handler
-     * 
+     *
      * @param string $parser XML parser object
      * @param string $name element name
      * @param string $attrs associative array of attributes
-     * @access private 
+     * @access private
      */
     function start_element($parser, $name, $attrs)
     {
@@ -312,10 +312,10 @@ class wsdl extends nusoap_base {
         } else {
             // position in the total number of elements, starting from 0
             $pos = $this->position++;
-            $depth = $this->depth++; 
+            $depth = $this->depth++;
             // set self as current value for this depth
             $this->depth_array[$depth] = $pos;
-            $this->message[$pos] = array('cdata' => ''); 
+            $this->message[$pos] = array('cdata' => '');
             // process attributes
             if (count($attrs) > 0) {
 				// register namespace declarations
@@ -325,11 +325,11 @@ class wsdl extends nusoap_base {
                             $this->namespaces[$ns_prefix] = $v;
                         } else {
                             $this->namespaces['ns' . (count($this->namespaces) + 1)] = $v;
-                        } 
+                        }
                         if ($v == 'http://www.w3.org/2001/XMLSchema' || $v == 'http://www.w3.org/1999/XMLSchema' || $v == 'http://www.w3.org/2000/10/XMLSchema') {
                             $this->XMLSchemaVersion = $v;
                             $this->namespaces['xsi'] = $v . '-instance';
-                        } 
+                        }
                     }
                 }
                 // expand each attribute prefix to its namespace
@@ -337,22 +337,22 @@ class wsdl extends nusoap_base {
                     $k = strpos($k, ':') ? $this->expandQname($k) : $k;
                     if ($k != 'location' && $k != 'soapAction' && $k != 'namespace') {
                         $v = strpos($v, ':') ? $this->expandQname($v) : $v;
-                    } 
+                    }
                     $eAttrs[$k] = $v;
-                } 
+                }
                 $attrs = $eAttrs;
             } else {
                 $attrs = array();
-            } 
+            }
             // get element prefix, namespace and name
             if (preg_match('/:/', $name)) {
                 // get ns prefix
-                $prefix = substr($name, 0, strpos($name, ':')); 
+                $prefix = substr($name, 0, strpos($name, ':'));
                 // get ns
-                $namespace = isset($this->namespaces[$prefix]) ? $this->namespaces[$prefix] : ''; 
+                $namespace = isset($this->namespaces[$prefix]) ? $this->namespaces[$prefix] : '';
                 // get unqualified name
                 $name = substr(strstr($name, ':'), 1);
-            } 
+            }
 			// process attributes, expanding any prefixes to namespaces
             // find status, register data
             switch ($this->status) {
@@ -361,12 +361,12 @@ class wsdl extends nusoap_base {
 			            if (isset($attrs['type'])) {
 		                    $this->debug("msg " . $this->currentMessage . ": found part (with type) $attrs[name]: " . implode(',', $attrs));
 		                    $this->messages[$this->currentMessage][$attrs['name']] = $attrs['type'];
-            			} 
+            			}
 			            if (isset($attrs['element'])) {
 		                    $this->debug("msg " . $this->currentMessage . ": found part (with element) $attrs[name]: " . implode(',', $attrs));
 			                $this->messages[$this->currentMessage][$attrs['name']] = $attrs['element'] . '^';
-			            } 
-        			} 
+			            }
+        			}
         			break;
 			    case 'portType':
 			        switch ($name) {
@@ -375,25 +375,25 @@ class wsdl extends nusoap_base {
 			                $this->debug("portType $this->currentPortType operation: $this->currentPortOperation");
 			                if (isset($attrs['parameterOrder'])) {
 			                	$this->portTypes[$this->currentPortType][$attrs['name']]['parameterOrder'] = $attrs['parameterOrder'];
-			        		} 
+			        		}
 			        		break;
 					    case 'documentation':
 					        $this->documentation = true;
-					        break; 
+					        break;
 					    // merge input/output data
 					    default:
 					        $m = isset($attrs['message']) ? $this->getLocalPart($attrs['message']) : '';
 					        $this->portTypes[$this->currentPortType][$this->currentPortOperation][$name]['message'] = $m;
 					        break;
-					} 
+					}
 			    	break;
 				case 'binding':
 				    switch ($name) {
-				        case 'binding': 
+				        case 'binding':
 				            // get ns prefix
 				            if (isset($attrs['style'])) {
 				            $this->bindings[$this->currentBinding]['prefix'] = $prefix;
-					    	} 
+					    	}
 					    	$this->bindings[$this->currentBinding] = array_merge($this->bindings[$this->currentBinding], $attrs);
 					    	break;
 						case 'header':
@@ -402,17 +402,17 @@ class wsdl extends nusoap_base {
 						case 'operation':
 						    if (isset($attrs['soapAction'])) {
 						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['soapAction'] = $attrs['soapAction'];
-						    } 
+						    }
 						    if (isset($attrs['style'])) {
 						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['style'] = $attrs['style'];
-						    } 
+						    }
 						    if (isset($attrs['name'])) {
 						        $this->currentOperation = $attrs['name'];
 						        $this->debug("current binding operation: $this->currentOperation");
 						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['name'] = $attrs['name'];
 						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['binding'] = $this->currentBinding;
 						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['endpoint'] = isset($this->bindings[$this->currentBinding]['endpoint']) ? $this->bindings[$this->currentBinding]['endpoint'] : '';
-						    } 
+						    }
 						    break;
 						case 'input':
 						    $this->opStatus = 'input';
@@ -425,9 +425,9 @@ class wsdl extends nusoap_base {
 						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus] = array_merge($this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus], $attrs);
 						    } else {
 						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus] = $attrs;
-						    } 
+						    }
 						    break;
-					} 
+					}
 					break;
 				case 'service':
 					switch ($name) {
@@ -435,7 +435,7 @@ class wsdl extends nusoap_base {
 					        $this->currentPort = $attrs['name'];
 					        $this->debug('current port: ' . $this->currentPort);
 					        $this->ports[$this->currentPort]['binding'] = $this->getLocalPart($attrs['binding']);
-					
+
 					        break;
 					    case 'address':
 					        $this->ports[$this->currentPort]['location'] = $attrs['location'];
@@ -443,9 +443,9 @@ class wsdl extends nusoap_base {
 					        $this->bindings[ $this->ports[$this->currentPort]['binding'] ]['bindingType'] = $namespace;
 					        $this->bindings[ $this->ports[$this->currentPort]['binding'] ]['endpoint'] = $attrs['location'];
 					        break;
-					} 
+					}
 					break;
-			} 
+			}
 		// set status
 		switch ($name) {
 			case 'import':
@@ -481,11 +481,11 @@ class wsdl extends nusoap_base {
 			    		$this->currentBinding = $this->getLocalPart($attrs['name']);
 					} else {
 			    		$this->currentBinding = $attrs['name'];
-					} 
+					}
 					$this->status = 'binding';
 					$this->bindings[$this->currentBinding]['portType'] = $this->getLocalPart($attrs['type']);
 					$this->debug("current binding: $this->currentBinding of portType: " . $attrs['type']);
-				} 
+				}
 				break;
 			case 'service':
 				$this->serviceName = $attrs['name'];
@@ -495,20 +495,20 @@ class wsdl extends nusoap_base {
 			case 'definitions':
 				foreach ($attrs as $name => $value) {
 					$this->wsdl_info[$name] = $value;
-				} 
+				}
 				break;
-			} 
-		} 
-	} 
+			}
+		}
+	}
 
 	/**
 	* end-element handler
-	* 
+	*
 	* @param string $parser XML parser object
 	* @param string $name element name
-	* @access private 
+	* @access private
 	*/
-	function end_element($parser, $name){ 
+	function end_element($parser, $name){
 		// unset schema status
 		if (/*preg_match('/types$/', $name) ||*/ preg_match('/schema$/', $name)) {
 			$this->status = "";
@@ -516,38 +516,38 @@ class wsdl extends nusoap_base {
             $this->currentSchema->clearDebug();
 			$this->schemas[$this->currentSchema->schemaTargetNamespace][] = $this->currentSchema;
         	$this->debug('Parsing WSDL schema done');
-		} 
+		}
 		if ($this->status == 'schema') {
 			$this->currentSchema->schemaEndElement($parser, $name);
 		} else {
 			// bring depth down a notch
 			$this->depth--;
-		} 
+		}
 		// end documentation
 		if ($this->documentation) {
 			//TODO: track the node to which documentation should be assigned; it can be a part, message, etc.
 			//$this->portTypes[$this->currentPortType][$this->currentPortOperation]['documentation'] = $this->documentation;
 			$this->documentation = false;
-		} 
-	} 
+		}
+	}
 
 	/**
 	 * element content handler
-	 * 
+	 *
 	 * @param string $parser XML parser object
 	 * @param string $data element content
-	 * @access private 
+	 * @access private
 	 */
 	function character_data($parser, $data)
 	{
 		$pos = isset($this->depth_array[$this->depth]) ? $this->depth_array[$this->depth] : 0;
 		if (isset($this->message[$pos]['cdata'])) {
 			$this->message[$pos]['cdata'] .= $data;
-		} 
+		}
 		if ($this->documentation) {
 			$this->documentation .= $data;
-		} 
-	} 
+		}
+	}
 
 	/**
 	* if authenticating, set user credentials here
@@ -566,21 +566,21 @@ class wsdl extends nusoap_base {
 		$this->authtype = $authtype;
 		$this->certRequest = $certRequest;
 	}
-	
+
 	function getBindingData($binding)
 	{
 		if (is_array($this->bindings[$binding])) {
 			return $this->bindings[$binding];
-		} 
+		}
 	}
-	
+
 	/**
 	 * returns an assoc array of operation names => operation data
-	 * 
+	 *
 	 * @param string $portName WSDL port name
 	 * @param string $bindingType eg: soap, smtp, dime (only soap and soap12 are currently supported)
-	 * @return array 
-	 * @access public 
+	 * @return array
+	 * @access public
 	 */
 	function getOperations($portName = '', $bindingType = 'soap') {
 		$ops = array();
@@ -612,15 +612,15 @@ class wsdl extends nusoap_base {
 			$this->debug("getOperations found no operations for port '$portName' bindingType $bindingType");
 		}
 		return $ops;
-	} 
-	
+	}
+
 	/**
 	 * returns an associative array of data necessary for calling an operation
-	 * 
+	 *
 	 * @param string $operation name of operation
 	 * @param string $bindingType type of binding eg: soap, soap12
-	 * @return array 
-	 * @access public 
+	 * @return array
+	 * @access public
 	 */
 	function getOperationData($operation, $bindingType = 'soap')
 	{
@@ -640,19 +640,19 @@ class wsdl extends nusoap_base {
 					if ($operation == $bOperation) {
 						$opData = $this->bindings[ $portData['binding'] ]['operations'][$operation];
 					    return $opData;
-					} 
-				} 
+					}
+				}
 			}
-		} 
+		}
 	}
-	
+
 	/**
 	 * returns an associative array of data necessary for calling an operation
-	 * 
+	 *
 	 * @param string $soapAction soapAction for operation
 	 * @param string $bindingType type of binding eg: soap, soap12
-	 * @return array 
-	 * @access public 
+	 * @return array
+	 * @access public
 	 */
 	function getOperationDataForSoapAction($soapAction, $bindingType = 'soap') {
 		if ($bindingType == 'soap') {
@@ -668,12 +668,12 @@ class wsdl extends nusoap_base {
 				foreach ($this->bindings[ $portData['binding'] ]['operations'] as $bOperation => $opData) {
 					if ($opData['soapAction'] == $soapAction) {
 					    return $opData;
-					} 
-				} 
+					}
+				}
 			}
-		} 
+		}
 	}
-	
+
 	/**
     * returns an array of information about a given type
     * returns false if no type exists by the given name
@@ -884,7 +884,7 @@ class wsdl extends nusoap_base {
 	*
 	* @param mixed $debug whether to put debug=1 in endpoint URL
 	* @return string serialization of WSDL
-	* @access public 
+	* @access public
 	*/
 	function serialize($debug = 0)
 	{
@@ -892,15 +892,15 @@ class wsdl extends nusoap_base {
 		$xml .= "\n<definitions";
 		foreach($this->namespaces as $k => $v) {
 			$xml .= " xmlns:$k=\"$v\"";
-		} 
+		}
 		// 10.9.02 - add poulter fix for wsdl and tns declarations
 		if (isset($this->namespaces['wsdl'])) {
 			$xml .= " xmlns=\"" . $this->namespaces['wsdl'] . "\"";
-		} 
+		}
 		if (isset($this->namespaces['tns'])) {
 			$xml .= " targetNamespace=\"" . $this->namespaces['tns'] . "\"";
-		} 
-		$xml .= '>'; 
+		}
+		$xml .= '>';
 		// imports
 		if (sizeof($this->import) > 0) {
 			foreach($this->import as $ns => $list) {
@@ -911,8 +911,8 @@ class wsdl extends nusoap_base {
 						$xml .= '<import namespace="' . $ns . '" />';
 					}
 				}
-			} 
-		} 
+			}
+		}
 		// types
 		if (count($this->schemas)>=1) {
 			$xml .= "\n<types>\n";
@@ -922,7 +922,7 @@ class wsdl extends nusoap_base {
 				}
 			}
 			$xml .= '</types>';
-		} 
+		}
 		// messages
 		if (count($this->messages) >= 1) {
 			foreach($this->messages as $msgName => $msgParts) {
@@ -939,11 +939,11 @@ class wsdl extends nusoap_base {
 						    foreach($this->typemap as $ns => $types) {
 						        if (isset($types[$partType])) {
 						            $typePrefix = $this->getPrefixFromNamespace($ns);
-						        } 
-						    } 
+						        }
+						    }
 						    if (!isset($typePrefix)) {
 						        die("$partType has no namespace!");
-						    } 
+						    }
 						}
 						$ns = $this->getNamespaceFromPrefix($typePrefix);
 						$localPart = $this->getLocalPart($partType);
@@ -960,8 +960,8 @@ class wsdl extends nusoap_base {
 					}
 				}
 				$xml .= '</message>';
-			} 
-		} 
+			}
+		}
 		// bindings & porttypes
 		if (count($this->bindings) >= 1) {
 			$binding_xml = '';
@@ -989,7 +989,7 @@ class wsdl extends nusoap_base {
 					$portType_xml .= "\n" . '  <operation name="' . $opParts['name'] . '"';
 					if (isset($opParts['parameterOrder'])) {
 					    $portType_xml .= ' parameterOrder="' . $opParts['parameterOrder'] . '"';
-					} 
+					}
 					$portType_xml .= '>';
 					if(isset($opParts['documentation']) && $opParts['documentation'] != '') {
 						$portType_xml .= "\n" . '    <documentation>' . htmlspecialchars($opParts['documentation']) . '</documentation>';
@@ -997,12 +997,12 @@ class wsdl extends nusoap_base {
 					$portType_xml .= "\n" . '    <input message="tns:' . $opParts['input']['message'] . '"/>';
 					$portType_xml .= "\n" . '    <output message="tns:' . $opParts['output']['message'] . '"/>';
 					$portType_xml .= "\n" . '  </operation>';
-				} 
+				}
 				$portType_xml .= "\n" . '</portType>';
 				$binding_xml .= "\n" . '</binding>';
-			} 
+			}
 			$xml .= $portType_xml . $binding_xml;
-		} 
+		}
 		// services
 		$xml .= "\n<service name=\"" . $this->serviceName . '">';
 		if (count($this->ports) >= 1) {
@@ -1010,11 +1010,11 @@ class wsdl extends nusoap_base {
 				$xml .= "\n" . '  <port name="' . $pName . '" binding="tns:' . $attrs['binding'] . '">';
 				$xml .= "\n" . '    <soap:address location="' . $attrs['location'] . ($debug ? '?debug=1' : '') . '"/>';
 				$xml .= "\n" . '  </port>';
-			} 
-		} 
+			}
+		}
 		$xml .= "\n" . '</service>';
 		return $xml . "\n</definitions>";
-	} 
+	}
 
 	/**
 	 * determine whether a set of parameters are unwrapped
@@ -1059,7 +1059,7 @@ class wsdl extends nusoap_base {
 		$phpType = $typeDef['phpType'];
 		$arrayType = (isset($typeDef['arrayType']) ? $typeDef['arrayType'] : '');
 		$this->debug("in parametersMatchWrapped: uqType: $uqType, ns: $ns, phptype: $phpType, arrayType: $arrayType");
-		
+
 		// we expect a complexType or element of complexType
 		if ($phpType != 'struct') {
 			$this->debug("in parametersMatchWrapped: not a struct");
@@ -1100,7 +1100,7 @@ class wsdl extends nusoap_base {
 	 * TODO
 	 * - multi-ref serialization
 	 * - validate PHP values against type definitions, return errors if invalid
-	 * 
+	 *
 	 * @param string $operation operation name
 	 * @param string $direction (input|output)
 	 * @param mixed $parameters parameter value(s)
@@ -1111,12 +1111,12 @@ class wsdl extends nusoap_base {
 	function serializeRPCParameters($operation, $direction, $parameters, $bindingType = 'soap') {
 		$this->debug("in serializeRPCParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion, bindingType=$bindingType");
 		$this->appendDebug('parameters=' . $this->varDump($parameters));
-		
+
 		if ($direction != 'input' && $direction != 'output') {
 			$this->debug('The value of the \$direction argument needs to be either "input" or "output"');
 			$this->setError('The value of the \$direction argument needs to be either "input" or "output"');
 			return false;
-		} 
+		}
 		if (!$opData = $this->getOperationData($operation, $bindingType)) {
 			$this->debug('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType);
 			$this->setError('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType);
@@ -1167,7 +1167,7 @@ class wsdl extends nusoap_base {
 					$this->debug("serializing part $name of type $type");
 					// Track encoding style
 					if (isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {
-						$encodingStyle = $opData[$direction]['encodingStyle'];			
+						$encodingStyle = $opData[$direction]['encodingStyle'];
 						$enc_style = $encodingStyle;
 					} else {
 						$enc_style = false;
@@ -1193,15 +1193,15 @@ class wsdl extends nusoap_base {
 		}
 		$this->debug("serializeRPCParameters returning: $xml");
 		return $xml;
-	} 
-	
+	}
+
 	/**
 	 * serialize a PHP value according to a WSDL message definition
-	 * 
+	 *
 	 * TODO
 	 * - multi-ref serialization
 	 * - validate PHP values against type definitions, return errors if invalid
-	 * 
+	 *
 	 * @param string $operation operation name
 	 * @param string $direction (input|output)
 	 * @param mixed $parameters parameter value(s)
@@ -1211,14 +1211,14 @@ class wsdl extends nusoap_base {
 	 */
 	function serializeParameters($operation, $direction, $parameters)
 	{
-		$this->debug("in serializeParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion"); 
+		$this->debug("in serializeParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion");
 		$this->appendDebug('parameters=' . $this->varDump($parameters));
-		
+
 		if ($direction != 'input' && $direction != 'output') {
 			$this->debug('The value of the \$direction argument needs to be either "input" or "output"');
 			$this->setError('The value of the \$direction argument needs to be either "input" or "output"');
 			return false;
-		} 
+		}
 		if (!$opData = $this->getOperationData($operation)) {
 			$this->debug('Unable to retrieve WSDL data for operation: ' . $operation);
 			$this->setError('Unable to retrieve WSDL data for operation: ' . $operation);
@@ -1226,18 +1226,18 @@ class wsdl extends nusoap_base {
 		}
 		$this->debug('opData:');
 		$this->appendDebug($this->varDump($opData));
-		
+
 		// Get encoding style for output and set to current
 		$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
 		if(($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {
 			$encodingStyle = $opData['output']['encodingStyle'];
 			$enc_style = $encodingStyle;
 		}
-		
+
 		// set input params
 		$xml = '';
 		if (isset($opData[$direction]['parts']) && sizeof($opData[$direction]['parts']) > 0) {
-			
+
 			$use = $opData[$direction]['use'];
 			$this->debug("use=$use");
 			$this->debug('got ' . count($opData[$direction]['parts']) . ' part(s)');
@@ -1248,7 +1248,7 @@ class wsdl extends nusoap_base {
 					$this->debug('serializing part "'.$name.'" of type "'.$type.'"');
 					// Track encoding style
 					if(isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {
-						$encodingStyle = $opData[$direction]['encodingStyle'];			
+						$encodingStyle = $opData[$direction]['encodingStyle'];
 						$enc_style = $encodingStyle;
 					} else {
 						$enc_style = false;
@@ -1274,11 +1274,11 @@ class wsdl extends nusoap_base {
 		}
 		$this->debug("serializeParameters returning: $xml");
 		return $xml;
-	} 
-	
+	}
+
 	/**
 	 * serializes a PHP value according a given type definition
-	 * 
+	 *
 	 * @param string $name name of value (part or element)
 	 * @param string $type XML schema type of value (type or element)
 	 * @param mixed $value a native PHP value (parameter value)
@@ -1364,7 +1364,7 @@ class wsdl extends nusoap_base {
 					} else {
 						$value = 'true';
 					}
-				} 
+				}
 				if ($uqType == 'string' && gettype($value) == 'string') {
 					$value = $this->expandEntities($value);
 				}
@@ -1445,7 +1445,7 @@ class wsdl extends nusoap_base {
 			return false;
 		}
 		$phpType = $typeDef['phpType'];
-		$this->debug("in serializeType: uqType: $uqType, ns: $ns, phptype: $phpType, arrayType: " . (isset($typeDef['arrayType']) ? $typeDef['arrayType'] : '') ); 
+		$this->debug("in serializeType: uqType: $uqType, ns: $ns, phptype: $phpType, arrayType: " . (isset($typeDef['arrayType']) ? $typeDef['arrayType'] : '') );
 		// if php type == struct, map value to the <all> element names
 		if ($phpType == 'struct') {
 			if (isset($typeDef['typeClass']) && $typeDef['typeClass'] == 'element') {
@@ -1537,11 +1537,11 @@ class wsdl extends nusoap_base {
 				foreach($value as $v) {
 					$cols = ',' . sizeof($v);
 					$nv = array_merge($nv, $v);
-				} 
+				}
 				$value = $nv;
 			} else {
 				$cols = '';
-			} 
+			}
 			if (is_array($value) && sizeof($value) >= 1) {
 				$rows = sizeof($value);
 				$contents = '';
@@ -1552,7 +1552,7 @@ class wsdl extends nusoap_base {
 					    $contents .= $this->serializeType('item', $typeDef['arrayType'], $v, $use);
 					} else {
 					    $contents .= $this->serialize_val($v, 'item', $typeDef['arrayType'], null, $this->XMLSchemaVersion, false, $use);
-					} 
+					}
 				}
 			} else {
 				$rows = 0;
@@ -1596,7 +1596,7 @@ class wsdl extends nusoap_base {
 		$this->debug("in serializeType: returning: $xml");
 		return $xml;
 	}
-	
+
 	/**
 	 * serializes the attributes for a complexType
 	 *
@@ -1651,7 +1651,7 @@ class wsdl extends nusoap_base {
 				if ($xname) {
 					$xml .=  " $aName=\"" . $this->expandEntities($xvalue[$xname]) . "\"";
 				}
-			} 
+			}
 		} else {
 			$this->debug("no attributes to serialize for XML Schema type $ns:$uqType");
 		}
@@ -1709,7 +1709,7 @@ class wsdl extends nusoap_base {
 				}
 				// if user took advantage of a minOccurs=0, then only serialize named parameters
 				if (isset($optionals)
-				    && (!isset($xvalue[$eName])) 
+				    && (!isset($xvalue[$eName]))
 					&& ( (!isset($attrs['nillable'])) || $attrs['nillable'] != 'true')
 					){
 					if (isset($attrs['minOccurs']) && $attrs['minOccurs'] <> '0') {
@@ -1757,7 +1757,7 @@ class wsdl extends nusoap_base {
 						}
 					}
 				}
-			} 
+			}
 		} else {
 			$this->debug("no elements to serialize for XML Schema type $ns:$uqType");
 		}
@@ -1793,7 +1793,7 @@ class wsdl extends nusoap_base {
 	    	}
 	    	$elements = $eElements;
 		}
-		
+
 		if (count($attrs) > 0) {
 	    	foreach($attrs as $n => $a){
 	            // expand each attribute
@@ -1846,7 +1846,7 @@ class wsdl extends nusoap_base {
 
 	/**
 	* register an operation with the server
-	* 
+	*
 	* @param string $name operation (method) name
 	* @param array $in assoc array of input values: key = param name, value = param type
 	* @param array $out assoc array of output values: key = param name, value = param type
@@ -1856,7 +1856,7 @@ class wsdl extends nusoap_base {
 	* @param string $use (encoded|literal) optional The use for the parameters (cannot mix right now)
 	* @param string $documentation optional The description to include in the WSDL
 	* @param string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)
-	* @access public 
+	* @access public
 	*/
 	function addOperation($name, $in = false, $out = false, $namespace = false, $soapaction = false, $style = 'rpc', $use = 'encoded', $documentation = '', $encodingStyle = ''){
 		if ($use == 'encoded' && $encodingStyle == '') {
@@ -1903,7 +1903,7 @@ class wsdl extends nusoap_base {
 			'parts' => $out),
 		'namespace' => $namespace,
 		'transport' => 'http://schemas.xmlsoap.org/soap/http',
-		'documentation' => $documentation); 
+		'documentation' => $documentation);
 		// add portTypes
 		// add messages
 		if($in)
@@ -1931,7 +1931,7 @@ class wsdl extends nusoap_base {
             $this->messages[$name.'Response']= '0';
         }
 		return true;
-	} 
+	}
 }
 
 ?>
\ No newline at end of file
diff --git a/htdocs/includes/nusoap/lib/class.wsdlcache.php b/htdocs/includes/nusoap/lib/class.wsdlcache.php
index 0d3e1796953..8468850eb90 100644
--- a/htdocs/includes/nusoap/lib/class.wsdlcache.php
+++ b/htdocs/includes/nusoap/lib/class.wsdlcache.php
@@ -9,10 +9,10 @@ nusoap-general@lists.sourceforge.net
 
 /**
 * caches instances of the wsdl class
-* 
+*
 * @author   Scott Nichol <snichol@users.sourceforge.net>
 * @author	Ingo Fischer <ingo@apollon.de>
-* @access public 
+* @access public
 */
 class nusoap_wsdlcache {
 	/**
@@ -43,7 +43,7 @@ class nusoap_wsdlcache {
 	* @param integer $cache_lifetime lifetime for caching-files in seconds or 0 for unlimited
 	* @access public
 	*/
-	function nusoap_wsdlcache($cache_dir='.', $cache_lifetime=0) {
+	function __construct($cache_dir='.', $cache_lifetime=0) {
 		$this->fplock = array();
 		$this->cache_dir = $cache_dir != '' ? $cache_dir : '.';
 		$this->cache_lifetime = $cache_lifetime;
diff --git a/htdocs/includes/nusoap/lib/class.xmlschema.php b/htdocs/includes/nusoap/lib/class.xmlschema.php
index 87858fadb43..3934453f8d2 100644
--- a/htdocs/includes/nusoap/lib/class.xmlschema.php
+++ b/htdocs/includes/nusoap/lib/class.xmlschema.php
@@ -12,7 +12,7 @@
 * @access   public
 */
 class nusoap_xmlschema extends nusoap_base  {
-	
+
 	// files
 	var $schema = '';
 	var $xml = '';
@@ -41,7 +41,7 @@ class nusoap_xmlschema extends nusoap_base  {
 	var $depth_array = array();
 	var $message = array();
 	var $defaultNamespace = array();
-    
+
 	/**
 	* constructor
 	*
@@ -50,8 +50,8 @@ class nusoap_xmlschema extends nusoap_base  {
 	* @param	string $namespaces namespaces defined in enclosing XML
 	* @access   public
 	*/
-	function nusoap_xmlschema($schema='',$xml='',$namespaces=array()){
-		parent::nusoap_base();
+	function __construct($schema='',$xml='',$namespaces=array()){
+		parent::__construct();
 		$this->debug('nusoap_xmlschema class instantiated, inside constructor');
 		// files
 		$this->schema = $schema;
@@ -141,7 +141,7 @@ class nusoap_xmlschema extends nusoap_base  {
 				$this->debug("XML payload:\n" . $xml);
 				$this->setError($errstr);
 	    	}
-            
+
 			xml_parser_free($this->parser);
 		} else{
 			$this->debug('no xml passed to parseString()!!');
@@ -163,7 +163,7 @@ class nusoap_xmlschema extends nusoap_base  {
 		}
 		return $scope . $ename . '_ContainedType';
 	}
-	
+
 	/**
 	* start-element handler
 	*
@@ -173,13 +173,13 @@ class nusoap_xmlschema extends nusoap_base  {
 	* @access   private
 	*/
 	function schemaStartElement($parser, $name, $attrs) {
-		
+
 		// position in the total number of elements, starting from 0
 		$pos = $this->position++;
 		$depth = $this->depth++;
 		// set self as current value for this depth
 		$this->depth_array[$depth] = $pos;
-		$this->message[$pos] = array('cdata' => ''); 
+		$this->message[$pos] = array('cdata' => '');
 		if ($depth > 0) {
 			$this->defaultNamespace[$pos] = $this->defaultNamespace[$this->depth_array[$depth - 1]];
 		} else {
@@ -193,7 +193,7 @@ class nusoap_xmlschema extends nusoap_base  {
 		} else {
         	$prefix = '';
         }
-		
+
         // loop thru attributes, expanding, and registering namespace declarations
         if(count($attrs) > 0){
         	foreach($attrs as $k => $v){
@@ -269,7 +269,7 @@ class nusoap_xmlschema extends nusoap_base  {
 					$aname = $attrs['ref'];
                     $this->attributes[$attrs['ref']] = $attrs;
 				}
-                
+
 				if($this->currentComplexType){	// This should *always* be
 					$this->complexTypes[$this->currentComplexType]['attrs'][$aname] = $attrs;
 				}
@@ -562,8 +562,8 @@ class nusoap_xmlschema extends nusoap_base  {
 						$xml .= " <$schemaPrefix:import namespace=\"" . $ns . "\" />\n";
 					}
 				}
-			} 
-		} 
+			}
+		}
 		// complex types
 		foreach($this->complexTypes as $typeName => $attrs){
 			$contentStr = '';
@@ -860,12 +860,12 @@ class nusoap_xmlschema extends nusoap_base  {
 		}
 		return $buffer;
 	}
-	
+
 	/**
 	* adds a complex type to the schema
-	* 
+	*
 	* example: array
-	* 
+	*
 	* addType(
 	* 	'ArrayOfstring',
 	* 	'complexType',
@@ -875,9 +875,9 @@ class nusoap_xmlschema extends nusoap_base  {
 	* 	array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'string[]'),
 	* 	'xsd:string'
 	* );
-	* 
+	*
 	* example: PHP associative array ( SOAP Struct )
-	* 
+	*
 	* addType(
 	* 	'SOAPStruct',
 	* 	'complexType',
@@ -885,7 +885,7 @@ class nusoap_xmlschema extends nusoap_base  {
 	* 	'all',
 	* 	array('myVar'=> array('name'=>'myVar','type'=>'string')
 	* );
-	* 
+	*
 	* @param name
 	* @param typeClass (complexType|simpleType|attribute)
 	* @param phpType: currently supported are array and struct (php assoc array)
@@ -913,11 +913,11 @@ class nusoap_xmlschema extends nusoap_base  {
 	    'attrs'		=> $attrs,
 	    'arrayType'	=> $arrayType
 		);
-		
+
 		$this->xdebug("addComplexType $name:");
 		$this->appendDebug($this->varDump($this->complexTypes[$name]));
 	}
-	
+
 	/**
 	* adds a simple type to the schema
 	*
@@ -938,7 +938,7 @@ class nusoap_xmlschema extends nusoap_base  {
 	    'type'			=> $restrictionBase,
 	    'enumeration'	=> $enumeration
 		);
-		
+
 		$this->xdebug("addSimpleType $name:");
 		$this->appendDebug($this->varDump($this->simpleTypes[$name]));
 	}
@@ -956,7 +956,7 @@ class nusoap_xmlschema extends nusoap_base  {
 		}
 		$this->elements[ $attrs['name'] ] = $attrs;
 		$this->elements[ $attrs['name'] ]['typeClass'] = 'element';
-		
+
 		$this->xdebug("addElement " . $attrs['name']);
 		$this->appendDebug($this->varDump($this->elements[ $attrs['name'] ]));
 	}
diff --git a/htdocs/includes/nusoap/lib/nusoap.php b/htdocs/includes/nusoap/lib/nusoap.php
index 1846884a7d1..a1fbd00051d 100644
--- a/htdocs/includes/nusoap/lib/nusoap.php
+++ b/htdocs/includes/nusoap/lib/nusoap.php
@@ -219,7 +219,7 @@ class nusoap_base {
 	*
 	* @access	public
 	*/
-	function nusoap_base() {
+	function __construct() {
 		$this->debugLevel = $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];
 	}
 
@@ -1037,8 +1037,8 @@ class nusoap_fault extends nusoap_base {
     * @param string $faultstring human readable error message
     * @param mixed $faultdetail detail, typically a string or array of string
 	*/
-	function nusoap_fault($faultcode,$faultactor='',$faultstring='',$faultdetail=''){
-		parent::nusoap_base();
+	function __construct($faultcode,$faultactor='',$faultstring='',$faultdetail=''){
+		parent::__construct();
 		$this->faultcode = $faultcode;
 		$this->faultactor = $faultactor;
 		$this->faultstring = $faultstring;
@@ -1129,8 +1129,8 @@ class nusoap_xmlschema extends nusoap_base  {
 	* @param	string $namespaces namespaces defined in enclosing XML
 	* @access   public
 	*/
-	function nusoap_xmlschema($schema='',$xml='',$namespaces=array()){
-		parent::nusoap_base();
+	function __construct($schema='',$xml='',$namespaces=array()){
+		parent::__construct();
 		$this->debug('nusoap_xmlschema class instantiated, inside constructor');
 		// files
 		$this->schema = $schema;
@@ -2116,8 +2116,8 @@ class soapval extends nusoap_base {
 	* @param	mixed $attributes associative array of attributes to add to element serialization
 	* @access   public
 	*/
-  	function soapval($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) {
-		parent::nusoap_base();
+	function __construct($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) {
+		parent::__construct();
 		$this->name = $name;
 		$this->type = $type;
 		$this->value = $value;
@@ -2207,8 +2207,8 @@ class soap_transport_http extends nusoap_base {
 	* @param boolean $use_curl Whether to try to force cURL use
 	* @access public
 	*/
-	function soap_transport_http($url, $curl_options = NULL, $use_curl = false){
-		parent::nusoap_base();
+	function __construct($url, $curl_options = NULL, $use_curl = false){
+		parent::__construct();
 		$this->debug("ctor url=$url use_curl=$use_curl curl_options:");
 		$this->appendDebug($this->varDump($curl_options));
 		$this->setURL($url);
@@ -3623,8 +3623,8 @@ class nusoap_server extends nusoap_base {
     * @param mixed $wsdl file path or URL (string), or wsdl instance (object)
 	* @access   public
 	*/
-	function nusoap_server($wsdl=false){
-		parent::nusoap_base();
+	function __construct($wsdl=false) {
+		parent::__construct();
 		// turn on debugging?
 		global $debug;
 		global $HTTP_SERVER_VARS;
@@ -4645,8 +4645,8 @@ class wsdl extends nusoap_base {
 	 * @param boolean $use_curl try to use cURL
      * @access public
      */
-    function wsdl($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){
-		parent::nusoap_base();
+	function __construct($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){
+		parent::__construct();
 		$this->debug("ctor wsdl=$wsdl timeout=$timeout response_timeout=$response_timeout");
         $this->proxyhost = $proxyhost;
         $this->proxyport = $proxyport;
@@ -6572,8 +6572,8 @@ class nusoap_parser extends nusoap_base {
 	* @param    string $decode_utf8 whether to decode UTF-8 to ISO-8859-1
 	* @access   public
 	*/
-	function nusoap_parser($xml,$encoding='UTF-8',$method='',$decode_utf8=true){
-		parent::nusoap_base();
+	function __construct($xml,$encoding='UTF-8',$method='',$decode_utf8=true){
+		parent::__construct();
 		$this->xml = $xml;
 		$this->xml_encoding = $encoding;
 		$this->method = $method;
@@ -7249,8 +7249,8 @@ class nusoap_client extends nusoap_base  {
 	* @param	string $portName optional portName in WSDL document
 	* @access   public
 	*/
-	function nusoap_client($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = ''){
-		parent::nusoap_base();
+	function __construct($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = ''){
+		parent::__construct();
 		$this->endpoint = $endpoint;
 		$this->proxyhost = $proxyhost;
 		$this->proxyport = $proxyport;
diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index 5ec9b8f8870..5012337daf8 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -142,7 +142,7 @@ class Odf
 		}
 
 		$this->vars[$tag] = $this->convertVarToOdf($value, $encode, $charset);
-		
+
 		return $this;
 	}
 
@@ -156,6 +156,7 @@ class Odf
      */
 	public function convertVarToOdf($value, $encode = true, $charset = 'ISO-8859')
 	{
+		$value = $encode ? htmlspecialchars($value) : $value;
 		$value = ($charset == 'ISO-8859') ? utf8_encode($value) : $value;
 		$convertedValue = $value;
 
@@ -170,9 +171,9 @@ class Odf
 				'<style:style style:name="subText" style:family="text"><style:text-properties style:text-position="sub 58%" /></style:style>',
 				'<style:style style:name="supText" style:family="text"><style:text-properties style:text-position="super 58%" /></style:style>'
 			);
-	
+
 			$convertedValue = $this->_replaceHtmlWithOdtTag($this->_getDataFromHtml($value), $customStyles, $fontDeclarations);
-	
+
 			foreach ($customStyles as $key => $val) {
 				array_push($automaticStyles, '<style:style style:name="customStyle' . $key . '" style:family="text">' . $val . '</style:style>');
 			}
@@ -399,7 +400,7 @@ class Odf
 	public function htmlToUTFAndPreOdf($value)
 	{
 		// We decode into utf8, entities
-		$value=dol_html_entity_decode($value, ENT_QUOTES);
+		$value=dol_html_entity_decode($value, ENT_QUOTES|ENT_HTML5);
 
 		// We convert html tags
 		$ishtml=dol_textishtml($value);
diff --git a/htdocs/includes/odtphp/zip/pclzip/LICENSE b/htdocs/includes/odtphp/zip/pclzip/LICENSE
new file mode 100644
index 00000000000..dbbe3558157
--- /dev/null
+++ b/htdocs/includes/odtphp/zip/pclzip/LICENSE
@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
diff --git a/htdocs/includes/odtphp/zip/pclzip/composer.json b/htdocs/includes/odtphp/zip/pclzip/composer.json
new file mode 100644
index 00000000000..fd36bfbfed3
--- /dev/null
+++ b/htdocs/includes/odtphp/zip/pclzip/composer.json
@@ -0,0 +1,20 @@
+{
+    "name": "chamilo/pclzip",
+    "type": "library",
+    "description": "A PHP library that offers compression and extraction functions for Zip formatted archives",
+    "keywords": ["php", "zip"],
+    "homepage": "https://github.com/chamilo/pclzip",
+    "license": ["LGPL-2.1"],
+    "authors": [
+        {
+            "name": "Vincent Blavet"
+        }
+    ],
+    "replace": {
+        "pclzip/pclzip": "^2.8"
+    },
+    "autoload": {
+        "classmap": ["pclzip.lib.php"]
+    }
+}
+
diff --git a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt
index 82fc70b870e..583509c7efb 100644
--- a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt
+++ b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt
@@ -1,8 +1,8 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
+          GNU LESSER GENERAL PUBLIC LICENSE
+               Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -10,7 +10,7 @@
  as the successor of the GNU Library Public License, version 2, hence
  the version number 2.1.]
 
-			    Preamble
+                Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -55,7 +55,7 @@ modified by someone else and passed on, the recipients should know
 that what they have is not the original version, so that the original
 author's reputation will not be affected by problems that might be
 introduced by others.
-
+
   Finally, software patents pose a constant threat to the existence of
 any free program.  We wish to make sure that a company cannot
 effectively restrict the users of a free program by obtaining a
@@ -111,8 +111,8 @@ modification follow.  Pay close attention to the difference between a
 "work based on the library" and a "work that uses the library".  The
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
+
+          GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library or other
@@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-  
+
   1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
@@ -158,7 +158,7 @@ Library.
   You may charge a fee for the physical act of transferring a copy,
 and you may at your option offer warranty protection in exchange for a
 fee.
-
+
   2. You may modify your copy or copies of the Library or any portion
 of it, thus forming a work based on the Library, and copy and
 distribute such modifications or work under the terms of Section 1
@@ -216,7 +216,7 @@ instead of to this License.  (If a newer version than version 2 of the
 ordinary GNU General Public License has appeared, then you can specify
 that version instead if you wish.)  Do not make any other change in
 these notices.
-
+
   Once this change is made in a given copy, it is irreversible for
 that copy, so the ordinary GNU General Public License applies to all
 subsequent copies and derivative works made from that copy.
@@ -267,7 +267,7 @@ Library will still fall under Section 6.)
 distribute the object code for the work under the terms of Section 6.
 Any executables containing that work also fall under Section 6,
 whether or not they are linked directly with the Library itself.
-
+
   6. As an exception to the Sections above, you may also combine or
 link a "work that uses the Library" with the Library to produce a
 work containing portions of the Library, and distribute that work
@@ -329,7 +329,7 @@ restrictions of other proprietary libraries that do not normally
 accompany the operating system.  Such a contradiction means you cannot
 use both them and the Library together in an executable that you
 distribute.
-
+
   7. You may place library facilities that are a work based on the
 Library side-by-side in a single library together with other library
 facilities not covered by this License, and distribute such a combined
@@ -370,7 +370,7 @@ subject to these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties with
 this License.
-
+
   11. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
@@ -422,7 +422,7 @@ conditions either of that version or of any later version published by
 the Free Software Foundation.  If the Library does not specify a
 license version number, you may choose any version ever published by
 the Free Software Foundation.
-
+
   14. If you wish to incorporate parts of the Library into other free
 programs whose distribution conditions are incompatible with these,
 write to the author to ask for permission.  For software which is
@@ -432,7 +432,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-			    NO WARRANTY
+                NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -455,8 +455,8 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
-
+             END OF TERMS AND CONDITIONS
+
            How to Apply These Terms to Your New Libraries
 
   If you develop a new library, and you want it to be of the greatest
@@ -484,7 +484,8 @@ convey the exclusion of warranty; and each file should have at least the
     Lesser General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public
-    License along with this library; If not, see <https://www.gnu.org/licenses/>.
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 Also add information on how to contact you by electronic and paper mail.
 
diff --git a/htdocs/includes/odtphp/zip/pclzip/pclzip.lib.php b/htdocs/includes/odtphp/zip/pclzip/pclzip.lib.php
index 8cc5ca828bf..2a1a2b8d798 100644
--- a/htdocs/includes/odtphp/zip/pclzip/pclzip.lib.php
+++ b/htdocs/includes/odtphp/zip/pclzip/pclzip.lib.php
@@ -1,9 +1,10 @@
 <?php
 // --------------------------------------------------------------------------------
-// PhpConcept Library - Zip Module 2.8.2
+// PhpConcept Library - Zip Module 2.8.4
 // --------------------------------------------------------------------------------
 // License GNU/LGPL - Vincent Blavet - August 2009
-// http://www.phpconcept.net
+// Originaly http://www.phpconcept.net
+// Now       https://github.com/chamilo/pclzip
 // --------------------------------------------------------------------------------
 //
 // Presentation :
@@ -24,4926 +25,2241 @@
 // --------------------------------------------------------------------------------
 // --------------------------------------------------------------------------------
 
-  // ----- Constants
-  if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
-    define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );
-  }
-  
-  // ----- File list separator
-  // In version 1.x of PclZip, the separator for file list is a space
-  // (which is not a very smart choice, specifically for windows paths !).
-  // A better separator should be a comma (,). This constant gives you the
-  // abilty to change that.
-  // However notice that changing this value, may have impact on existing
-  // scripts, using space separated filenames.
-  // Recommanded values for compatibility with older versions :
-  //define( 'PCLZIP_SEPARATOR', ' ' );
-  // Recommanded values for smart separation of filenames.
-  if (!defined('PCLZIP_SEPARATOR')) {
-    define( 'PCLZIP_SEPARATOR', ',' );
-  }
+// ----- Constants
+if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
+    define('PCLZIP_READ_BLOCK_SIZE', 2048);
+}
 
-  // ----- Error configuration
-  // 0 : PclZip Class integrated error handling
-  // 1 : PclError external library error handling. By enabling this
-  //     you must ensure that you have included PclError library.
-  // [2,...] : reserved for futur use
-  if (!defined('PCLZIP_ERROR_EXTERNAL')) {
-    define( 'PCLZIP_ERROR_EXTERNAL', 0 );
-  }
+// ----- File list separator
+// In version 1.x of PclZip, the separator for file list is a space
+// (which is not a very smart choice, specifically for windows paths !).
+// A better separator should be a comma (,). This constant gives you the
+// abilty to change that.
+// However notice that changing this value, may have impact on existing
+// scripts, using space separated filenames.
+// Recommanded values for compatibility with older versions :
+//define( 'PCLZIP_SEPARATOR', ' ' );
+// Recommanded values for smart separation of filenames.
+if (!defined('PCLZIP_SEPARATOR')) {
+    define('PCLZIP_SEPARATOR', ',');
+}
 
-  // ----- Optional static temporary directory
-  //       By default temporary files are generated in the script current
-  //       path.
-  //       If defined :
-  //       - MUST BE terminated by a '/'.
-  //       - MUST be a valid, already created directory
-  //       Samples :
-  // define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
-  // define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
-  if (!defined('PCLZIP_TEMPORARY_DIR')) {
-    define( 'PCLZIP_TEMPORARY_DIR', '' );
-  }
+// ----- Error configuration
+// 0 : PclZip Class integrated error handling
+// 1 : PclError external library error handling. By enabling this
+//     you must ensure that you have included PclError library.
+// [2,...] : reserved for futur use
+if (!defined('PCLZIP_ERROR_EXTERNAL')) {
+    define('PCLZIP_ERROR_EXTERNAL', 0);
+}
 
-  // ----- Optional threshold ratio for use of temporary files
-  //       Pclzip sense the size of the file to add/extract and decide to
-  //       use or not temporary file. The algorythm is looking for 
-  //       memory_limit of PHP and apply a ratio.
-  //       threshold = memory_limit * ratio.
-  //       Recommended values are under 0.5. Default 0.47.
-  //       Samples :
-  // define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );
-  if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
-    define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.47 );
-  }
+// ----- Optional static temporary directory
+//       By default temporary files are generated in the script current
+//       path.
+//       If defined :
+//       - MUST BE terminated by a '/'.
+//       - MUST be a valid, already created directory
+//       Samples :
+// define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
+// define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
+if (!defined('PCLZIP_TEMPORARY_DIR')) {
+    define('PCLZIP_TEMPORARY_DIR', '');
+}
+
+// ----- Optional threshold ratio for use of temporary files
+//       Pclzip sense the size of the file to add/extract and decide to
+//       use or not temporary file. The algorythm is looking for
+//       memory_limit of PHP and apply a ratio.
+//       threshold = memory_limit * ratio.
+//       Recommended values are under 0.5. Default 0.47.
+//       Samples :
+// define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );
+if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
+    define('PCLZIP_TEMPORARY_FILE_RATIO', 0.47);
+}
 
 // --------------------------------------------------------------------------------
 // ***** UNDER THIS LINE NOTHING NEEDS TO BE MODIFIED *****
 // --------------------------------------------------------------------------------
 
-  // ----- Global variables
-  $g_pclzip_version = "2.8.2";
+// ----- Global variables
+$g_pclzip_version = "2.8.2";
 
-  // ----- Error codes
-  //   -1 : Unable to open file in binary write mode
-  //   -2 : Unable to open file in binary read mode
-  //   -3 : Invalid parameters
-  //   -4 : File does not exist
-  //   -5 : Filename is too long (max. 255)
-  //   -6 : Not a valid zip file
-  //   -7 : Invalid extracted file size
-  //   -8 : Unable to create directory
-  //   -9 : Invalid archive extension
-  //  -10 : Invalid archive format
-  //  -11 : Unable to delete file (unlink)
-  //  -12 : Unable to rename file (rename)
-  //  -13 : Invalid header checksum
-  //  -14 : Invalid archive size
-  define( 'PCLZIP_ERR_USER_ABORTED', 2 );
-  define( 'PCLZIP_ERR_NO_ERROR', 0 );
-  define( 'PCLZIP_ERR_WRITE_OPEN_FAIL', -1 );
-  define( 'PCLZIP_ERR_READ_OPEN_FAIL', -2 );
-  define( 'PCLZIP_ERR_INVALID_PARAMETER', -3 );
-  define( 'PCLZIP_ERR_MISSING_FILE', -4 );
-  define( 'PCLZIP_ERR_FILENAME_TOO_LONG', -5 );
-  define( 'PCLZIP_ERR_INVALID_ZIP', -6 );
-  define( 'PCLZIP_ERR_BAD_EXTRACTED_FILE', -7 );
-  define( 'PCLZIP_ERR_DIR_CREATE_FAIL', -8 );
-  define( 'PCLZIP_ERR_BAD_EXTENSION', -9 );
-  define( 'PCLZIP_ERR_BAD_FORMAT', -10 );
-  define( 'PCLZIP_ERR_DELETE_FILE_FAIL', -11 );
-  define( 'PCLZIP_ERR_RENAME_FILE_FAIL', -12 );
-  define( 'PCLZIP_ERR_BAD_CHECKSUM', -13 );
-  define( 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14 );
-  define( 'PCLZIP_ERR_MISSING_OPTION_VALUE', -15 );
-  define( 'PCLZIP_ERR_INVALID_OPTION_VALUE', -16 );
-  define( 'PCLZIP_ERR_ALREADY_A_DIRECTORY', -17 );
-  define( 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18 );
-  define( 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19 );
-  define( 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20 );
-  define( 'PCLZIP_ERR_DIRECTORY_RESTRICTION', -21 );
+// ----- Error codes
+//   -1 : Unable to open file in binary write mode
+//   -2 : Unable to open file in binary read mode
+//   -3 : Invalid parameters
+//   -4 : File does not exist
+//   -5 : Filename is too long (max. 255)
+//   -6 : Not a valid zip file
+//   -7 : Invalid extracted file size
+//   -8 : Unable to create directory
+//   -9 : Invalid archive extension
+//  -10 : Invalid archive format
+//  -11 : Unable to delete file (unlink)
+//  -12 : Unable to rename file (rename)
+//  -13 : Invalid header checksum
+//  -14 : Invalid archive size
+define('PCLZIP_ERR_USER_ABORTED', 2);
+define('PCLZIP_ERR_NO_ERROR', 0);
+define('PCLZIP_ERR_WRITE_OPEN_FAIL', -1);
+define('PCLZIP_ERR_READ_OPEN_FAIL', -2);
+define('PCLZIP_ERR_INVALID_PARAMETER', -3);
+define('PCLZIP_ERR_MISSING_FILE', -4);
+define('PCLZIP_ERR_FILENAME_TOO_LONG', -5);
+define('PCLZIP_ERR_INVALID_ZIP', -6);
+define('PCLZIP_ERR_BAD_EXTRACTED_FILE', -7);
+define('PCLZIP_ERR_DIR_CREATE_FAIL', -8);
+define('PCLZIP_ERR_BAD_EXTENSION', -9);
+define('PCLZIP_ERR_BAD_FORMAT', -10);
+define('PCLZIP_ERR_DELETE_FILE_FAIL', -11);
+define('PCLZIP_ERR_RENAME_FILE_FAIL', -12);
+define('PCLZIP_ERR_BAD_CHECKSUM', -13);
+define('PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14);
+define('PCLZIP_ERR_MISSING_OPTION_VALUE', -15);
+define('PCLZIP_ERR_INVALID_OPTION_VALUE', -16);
+define('PCLZIP_ERR_ALREADY_A_DIRECTORY', -17);
+define('PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18);
+define('PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19);
+define('PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20);
+define('PCLZIP_ERR_DIRECTORY_RESTRICTION', -21);
 
-  // ----- Options values
-  define( 'PCLZIP_OPT_PATH', 77001 );
-  define( 'PCLZIP_OPT_ADD_PATH', 77002 );
-  define( 'PCLZIP_OPT_REMOVE_PATH', 77003 );
-  define( 'PCLZIP_OPT_REMOVE_ALL_PATH', 77004 );
-  define( 'PCLZIP_OPT_SET_CHMOD', 77005 );
-  define( 'PCLZIP_OPT_EXTRACT_AS_STRING', 77006 );
-  define( 'PCLZIP_OPT_NO_COMPRESSION', 77007 );
-  define( 'PCLZIP_OPT_BY_NAME', 77008 );
-  define( 'PCLZIP_OPT_BY_INDEX', 77009 );
-  define( 'PCLZIP_OPT_BY_EREG', 77010 );
-  define( 'PCLZIP_OPT_BY_PREG', 77011 );
-  define( 'PCLZIP_OPT_COMMENT', 77012 );
-  define( 'PCLZIP_OPT_ADD_COMMENT', 77013 );
-  define( 'PCLZIP_OPT_PREPEND_COMMENT', 77014 );
-  define( 'PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015 );
-  define( 'PCLZIP_OPT_REPLACE_NEWER', 77016 );
-  define( 'PCLZIP_OPT_STOP_ON_ERROR', 77017 );
-  // Having big trouble with crypt. Need to multiply 2 long int
-  // which is not correctly supported by PHP ...
-  //define( 'PCLZIP_OPT_CRYPT', 77018 );
-  define( 'PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019 );
-  define( 'PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020 ); // alias
-  define( 'PCLZIP_OPT_TEMP_FILE_ON', 77021 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021 ); // alias
-  define( 'PCLZIP_OPT_TEMP_FILE_OFF', 77022 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022 ); // alias
-  
-  // ----- File description attributes
-  define( 'PCLZIP_ATT_FILE_NAME', 79001 );
-  define( 'PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002 );
-  define( 'PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003 );
-  define( 'PCLZIP_ATT_FILE_MTIME', 79004 );
-  define( 'PCLZIP_ATT_FILE_CONTENT', 79005 );
-  define( 'PCLZIP_ATT_FILE_COMMENT', 79006 );
+// ----- Options values
+define('PCLZIP_OPT_PATH', 77001);
+define('PCLZIP_OPT_ADD_PATH', 77002);
+define('PCLZIP_OPT_REMOVE_PATH', 77003);
+define('PCLZIP_OPT_REMOVE_ALL_PATH', 77004);
+define('PCLZIP_OPT_SET_CHMOD', 77005);
+define('PCLZIP_OPT_EXTRACT_AS_STRING', 77006);
+define('PCLZIP_OPT_NO_COMPRESSION', 77007);
+define('PCLZIP_OPT_BY_NAME', 77008);
+define('PCLZIP_OPT_BY_INDEX', 77009);
+define('PCLZIP_OPT_BY_EREG', 77010);
+define('PCLZIP_OPT_BY_PREG', 77011);
+define('PCLZIP_OPT_COMMENT', 77012);
+define('PCLZIP_OPT_ADD_COMMENT', 77013);
+define('PCLZIP_OPT_PREPEND_COMMENT', 77014);
+define('PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015);
+define('PCLZIP_OPT_REPLACE_NEWER', 77016);
+define('PCLZIP_OPT_STOP_ON_ERROR', 77017);
+// Having big trouble with crypt. Need to multiply 2 long int
+// which is not correctly supported by PHP ...
+//define( 'PCLZIP_OPT_CRYPT', 77018 );
+define('PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019);
+define('PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020);
+define('PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020); // alias
+define('PCLZIP_OPT_TEMP_FILE_ON', 77021);
+define('PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021); // alias
+define('PCLZIP_OPT_TEMP_FILE_OFF', 77022);
+define('PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022); // alias
 
-  // ----- Call backs values
-  define( 'PCLZIP_CB_PRE_EXTRACT', 78001 );
-  define( 'PCLZIP_CB_POST_EXTRACT', 78002 );
-  define( 'PCLZIP_CB_PRE_ADD', 78003 );
-  define( 'PCLZIP_CB_POST_ADD', 78004 );
-  /* For futur use
-  define( 'PCLZIP_CB_PRE_LIST', 78005 );
-  define( 'PCLZIP_CB_POST_LIST', 78006 );
-  define( 'PCLZIP_CB_PRE_DELETE', 78007 );
-  define( 'PCLZIP_CB_POST_DELETE', 78008 );
-  */
+// ----- File description attributes
+define('PCLZIP_ATT_FILE_NAME', 79001);
+define('PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002);
+define('PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003);
+define('PCLZIP_ATT_FILE_MTIME', 79004);
+define('PCLZIP_ATT_FILE_CONTENT', 79005);
+define('PCLZIP_ATT_FILE_COMMENT', 79006);
 
-  // --------------------------------------------------------------------------------
-  // Class : PclZip
-  // Description :
-  //   PclZip is the class that represent a Zip archive.
-  //   The public methods allow the manipulation of the archive.
-  // Attributes :
-  //   Attributes must not be accessed directly.
-  // Methods :
-  //   PclZip() : Object creator
-  //   create() : Creates the Zip archive
-  //   listContent() : List the content of the Zip archive
-  //   extract() : Extract the content of the archive
-  //   properties() : List the properties of the archive
-  // --------------------------------------------------------------------------------
-  class PclZip
-  {
+// ----- Call backs values
+define('PCLZIP_CB_PRE_EXTRACT', 78001);
+define('PCLZIP_CB_POST_EXTRACT', 78002);
+define('PCLZIP_CB_PRE_ADD', 78003);
+define('PCLZIP_CB_POST_ADD', 78004);
+/* For futur use
+define( 'PCLZIP_CB_PRE_LIST', 78005 );
+define( 'PCLZIP_CB_POST_LIST', 78006 );
+define( 'PCLZIP_CB_PRE_DELETE', 78007 );
+define( 'PCLZIP_CB_POST_DELETE', 78008 );
+*/
+
+// --------------------------------------------------------------------------------
+// Class : PclZip
+// Description :
+//   PclZip is the class that represent a Zip archive.
+//   The public methods allow the manipulation of the archive.
+// Attributes :
+//   Attributes must not be accessed directly.
+// Methods :
+//   PclZip() : Object creator
+//   create() : Creates the Zip archive
+//   listContent() : List the content of the Zip archive
+//   extract() : Extract the content of the archive
+//   properties() : List the properties of the archive
+// --------------------------------------------------------------------------------
+class PclZip
+{
     // ----- Filename of the zip file
-    var $zipname = '';
+    public $zipname = '';
 
     // ----- File descriptor of the zip file
-    var $zip_fd = 0;
+    public $zip_fd = 0;
 
     // ----- Internal error handling
-    var $error_code = 1;
-    var $error_string = '';
-    
+    public $error_code = 1;
+    public $error_string = '';
+
     // ----- Current status of the magic_quotes_runtime
     // This value store the php configuration for magic_quotes
     // The class can then disable the magic_quotes and reset it after
-    var $magic_quotes_status;
+    public $magic_quotes_status;
 
-  // --------------------------------------------------------------------------------
-  // Function : PclZip()
-  // Description :
-  //   Creates a PclZip object and set the name of the associated Zip archive
-  //   filename.
-  //   Note that no real action is taken, if the archive does not exist it is not
-  //   created. Use create() for that.
-  // --------------------------------------------------------------------------------
-  function PclZip($p_zipname)
-  {
-
-    // ----- Tests the zlib
-    if (!function_exists('gzopen'))
+    // --------------------------------------------------------------------------------
+    // Function : PclZip()
+    // Description :
+    //   Creates a PclZip object and set the name of the associated Zip archive
+    //   filename.
+    //   Note that no real action is taken, if the archive does not exist it is not
+    //   created. Use create() for that.
+    // --------------------------------------------------------------------------------
+    public function __construct($p_zipname)
     {
-      die('Abort '.basename(__FILE__).' : Missing zlib extensions');
-    }
 
-    // ----- Set the attributes
-    $this->zipname = $p_zipname;
-    $this->zip_fd = 0;
-    $this->magic_quotes_status = -1;
-
-    // ----- Return
-    return;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   create($p_filelist, $p_add_dir="", $p_remove_dir="")
-  //   create($p_filelist, $p_option, $p_option_value, ...)
-  // Description :
-  //   This method supports two different synopsis. The first one is historical.
-  //   This method creates a Zip Archive. The Zip file is created in the
-  //   filesystem. The files and directories indicated in $p_filelist
-  //   are added in the archive. See the parameters description for the
-  //   supported format of $p_filelist.
-  //   When a directory is in the list, the directory and its content is added
-  //   in the archive.
-  //   In this synopsis, the function takes an optional variable list of
-  //   options. See bellow the supported options.
-  // Parameters :
-  //   $p_filelist : An array containing file or directory names, or
-  //                 a string containing one filename or one directory name, or
-  //                 a string containing a list of filenames and/or directory
-  //                 names separated by spaces.
-  //   $p_add_dir : A path to add before the real path of the archived file,
-  //                in order to have it memorized in the archive.
-  //   $p_remove_dir : A path to remove from the real path of the file to archive,
-  //                   in order to have a shorter path memorized in the archive.
-  //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
-  //                   is removed first, before $p_add_dir is added.
-  // Options :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_OPT_COMMENT :
-  //   PCLZIP_CB_PRE_ADD :
-  //   PCLZIP_CB_POST_ADD :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the added files, with a status of the add action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function create($p_filelist)
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Set default values
-    $v_options = array();
-    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove from the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_ADD => 'optional',
-                                                   PCLZIP_CB_POST_ADD => 'optional',
-                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
-                                                   PCLZIP_OPT_COMMENT => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                                                   //, PCLZIP_OPT_CRYPT => 'optional'
-                                             ));
-        if ($v_result != 1) {
-          return 0;
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_options[PCLZIP_OPT_ADD_PATH] = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                       "Invalid number / type of arguments");
-          return 0;
-        }
-      }
-    }
-    
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Init
-    $v_string_list = array();
-    $v_att_list = array();
-    $v_filedescr_list = array();
-    $p_result_list = array();
-    
-    // ----- Look if the $p_filelist is really an array
-    if (is_array($p_filelist)) {
-    
-      // ----- Look if the first element is also an array
-      //       This will mean that this is a file description entry
-      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
-        $v_att_list = $p_filelist;
-      }
-      
-      // ----- The list is a list of string names
-      else {
-        $v_string_list = $p_filelist;
-      }
-    }
-
-    // ----- Look if the $p_filelist is a string
-    else if (is_string($p_filelist)) {
-      // ----- Create a list from the string
-      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
-    }
-
-    // ----- Invalid variable type for $p_filelist
-    else {
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");
-      return 0;
-    }
-    
-    // ----- Reformat the string list
-    if (sizeof($v_string_list) != 0) {
-      foreach ($v_string_list as $v_string) {
-        if ($v_string != '') {
-          $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-        }
-        else {
-        }
-      }
-    }
-    
-    // ----- For each file in the list check the attributes
-    $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
-             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_MTIME => 'optional'
-             ,PCLZIP_ATT_FILE_CONTENT => 'optional'
-             ,PCLZIP_ATT_FILE_COMMENT => 'optional'
-						);
-    foreach ($v_att_list as $v_entry) {
-      $v_result = $this->privFileDescrParseAtt($v_entry,
-                                               $v_filedescr_list[],
-                                               $v_options,
-                                               $v_supported_attributes);
-      if ($v_result != 1) {
-        return 0;
-      }
-    }
-
-    // ----- Expand the filelist (expand directories)
-    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Call the create fct
-    $v_result = $this->privCreate($v_filedescr_list, $p_result_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Return
-    return $p_result_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   add($p_filelist, $p_add_dir="", $p_remove_dir="")
-  //   add($p_filelist, $p_option, $p_option_value, ...)
-  // Description :
-  //   This method supports two synopsis. The first one is historical.
-  //   This methods add the list of files in an existing archive.
-  //   If a file with the same name already exists, it is added at the end of the
-  //   archive, the first one is still present.
-  //   If the archive does not exist, it is created.
-  // Parameters :
-  //   $p_filelist : An array containing file or directory names, or
-  //                 a string containing one filename or one directory name, or
-  //                 a string containing a list of filenames and/or directory
-  //                 names separated by spaces.
-  //   $p_add_dir : A path to add before the real path of the archived file,
-  //                in order to have it memorized in the archive.
-  //   $p_remove_dir : A path to remove from the real path of the file to archive,
-  //                   in order to have a shorter path memorized in the archive.
-  //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
-  //                   is removed first, before $p_add_dir is added.
-  // Options :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_OPT_COMMENT :
-  //   PCLZIP_OPT_ADD_COMMENT :
-  //   PCLZIP_OPT_PREPEND_COMMENT :
-  //   PCLZIP_CB_PRE_ADD :
-  //   PCLZIP_CB_POST_ADD :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the added files, with a status of the add action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function add($p_filelist)
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Set default values
-    $v_options = array();
-    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove form the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_ADD => 'optional',
-                                                   PCLZIP_CB_POST_ADD => 'optional',
-                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
-                                                   PCLZIP_OPT_COMMENT => 'optional',
-                                                   PCLZIP_OPT_ADD_COMMENT => 'optional',
-                                                   PCLZIP_OPT_PREPEND_COMMENT => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                                                   //, PCLZIP_OPT_CRYPT => 'optional'
-												   ));
-        if ($v_result != 1) {
-          return 0;
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_options[PCLZIP_OPT_ADD_PATH] = $v_add_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
-
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Init
-    $v_string_list = array();
-    $v_att_list = array();
-    $v_filedescr_list = array();
-    $p_result_list = array();
-    
-    // ----- Look if the $p_filelist is really an array
-    if (is_array($p_filelist)) {
-    
-      // ----- Look if the first element is also an array
-      //       This will mean that this is a file description entry
-      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
-        $v_att_list = $p_filelist;
-      }
-      
-      // ----- The list is a list of string names
-      else {
-        $v_string_list = $p_filelist;
-      }
-    }
-
-    // ----- Look if the $p_filelist is a string
-    else if (is_string($p_filelist)) {
-      // ----- Create a list from the string
-      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
-    }
-
-    // ----- Invalid variable type for $p_filelist
-    else {
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '".gettype($p_filelist)."' for p_filelist");
-      return 0;
-    }
-    
-    // ----- Reformat the string list
-    if (sizeof($v_string_list) != 0) {
-      foreach ($v_string_list as $v_string) {
-        $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-      }
-    }
-    
-    // ----- For each file in the list check the attributes
-    $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
-             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_MTIME => 'optional'
-             ,PCLZIP_ATT_FILE_CONTENT => 'optional'
-             ,PCLZIP_ATT_FILE_COMMENT => 'optional'
-						);
-    foreach ($v_att_list as $v_entry) {
-      $v_result = $this->privFileDescrParseAtt($v_entry,
-                                               $v_filedescr_list[],
-                                               $v_options,
-                                               $v_supported_attributes);
-      if ($v_result != 1) {
-        return 0;
-      }
-    }
-
-    // ----- Expand the filelist (expand directories)
-    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Call the create fct
-    $v_result = $this->privAdd($v_filedescr_list, $p_result_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Return
-    return $p_result_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : listContent()
-  // Description :
-  //   This public method, gives the list of the files and directories, with their
-  //   properties.
-  //   The properties of each entries in the list are (used also in other functions) :
-  //     filename : Name of the file. For a create or add action it is the filename
-  //                given by the user. For an extract function it is the filename
-  //                of the extracted file.
-  //     stored_filename : Name of the file / directory stored in the archive.
-  //     size : Size of the stored file.
-  //     compressed_size : Size of the file's data compressed in the archive
-  //                       (without the headers overhead)
-  //     mtime : Last known modification date of the file (UNIX timestamp)
-  //     comment : Comment associated with the file
-  //     folder : true | false
-  //     index : index of the file in the archive
-  //     status : status of the action (depending of the action) :
-  //              Values are :
-  //                ok : OK !
-  //                filtered : the file / dir is not extracted (filtered by user)
-  //                already_a_directory : the file can not be extracted because a
-  //                                      directory with the same name already exists
-  //                write_protected : the file can not be extracted because a file
-  //                                  with the same name already exists and is
-  //                                  write protected
-  //                newer_exist : the file was not extracted because a newer file exists
-  //                path_creation_fail : the file is not extracted because the folder
-  //                                     does not exist and can not be created
-  //                write_error : the file was not extracted because there was a
-  //                              error while writing the file
-  //                read_error : the file was not extracted because there was a error
-  //                             while reading the file
-  //                invalid_header : the file was not extracted because of an archive
-  //                                 format error (bad file header)
-  //   Note that each time a method can continue operating when there
-  //   is an action error on a file, the error is only logged in the file status.
-  // Return Values :
-  //   0 on an unrecoverable failure,
-  //   The list of the files in the archive.
-  // --------------------------------------------------------------------------------
-  function listContent()
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Call the extracting fct
-    $p_list = array();
-    if (($v_result = $this->privList($p_list)) != 1)
-    {
-      unset($p_list);
-      return(0);
-    }
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   extract($p_path="./", $p_remove_path="")
-  //   extract([$p_option, $p_option_value, ...])
-  // Description :
-  //   This method supports two synopsis. The first one is historical.
-  //   This method extract all the files / directories from the archive to the
-  //   folder indicated in $p_path.
-  //   If you want to ignore the 'root' part of path of the memorized files
-  //   you can indicate this in the optional $p_remove_path parameter.
-  //   By default, if a newer file with the same name already exists, the
-  //   file is not extracted.
-  //
-  //   If both PCLZIP_OPT_PATH and PCLZIP_OPT_ADD_PATH aoptions
-  //   are used, the path indicated in PCLZIP_OPT_ADD_PATH is append
-  //   at the end of the path value of PCLZIP_OPT_PATH.
-  // Parameters :
-  //   $p_path : Path where the files and directories are to be extracted
-  //   $p_remove_path : First part ('root' part) of the memorized path
-  //                    (if any similar) to remove while extracting.
-  // Options :
-  //   PCLZIP_OPT_PATH :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_CB_PRE_EXTRACT :
-  //   PCLZIP_CB_POST_EXTRACT :
-  // Return Values :
-  //   0 or a negative value on failure,
-  //   The list of the extracted files, with a status of the action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function extract()
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Set default values
-    $v_options = array();
-//    $v_path = "./";
-    $v_path = '';
-    $v_remove_path = "";
-    $v_remove_all_path = false;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Default values for option
-    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-
-    // ----- Look for arguments
-    if ($v_size > 0) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
-                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
-                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
-                                                   PCLZIP_OPT_BY_NAME => 'optional',
-                                                   PCLZIP_OPT_BY_EREG => 'optional',
-                                                   PCLZIP_OPT_BY_PREG => 'optional',
-                                                   PCLZIP_OPT_BY_INDEX => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
-                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
-                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
-                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-												    ));
-        if ($v_result != 1) {
-          return 0;
+        // ----- Tests the zlib
+        if (!function_exists('gzopen')) {
+            die('Abort ' . basename(__FILE__) . ' : Missing zlib extensions');
         }
 
-        // ----- Set the arguments
-        if (isset($v_options[PCLZIP_OPT_PATH])) {
-          $v_path = $v_options[PCLZIP_OPT_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
-          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
-          // ----- Check for '/' in last path char
-          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
-            $v_path .= '/';
-          }
-          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
-
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Trace
-
-    // ----- Call the extracting fct
-    $p_list = array();
-    $v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path,
-	                                     $v_remove_all_path, $v_options);
-    if ($v_result < 1) {
-      unset($p_list);
-      return(0);
-    }
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   extractByIndex($p_index, $p_path="./", $p_remove_path="")
-  //   extractByIndex($p_index, [$p_option, $p_option_value, ...])
-  // Description :
-  //   This method supports two synopsis. The first one is historical.
-  //   This method is doing a partial extract of the archive.
-  //   The extracted files or folders are identified by their index in the
-  //   archive (from 0 to n).
-  //   Note that if the index identify a folder, only the folder entry is
-  //   extracted, not all the files included in the archive.
-  // Parameters :
-  //   $p_index : A single index (integer) or a string of indexes of files to
-  //              extract. The form of the string is "0,4-6,8-12" with only numbers
-  //              and '-' for range or ',' to separate ranges. No spaces or ';'
-  //              are allowed.
-  //   $p_path : Path where the files and directories are to be extracted
-  //   $p_remove_path : First part ('root' part) of the memorized path
-  //                    (if any similar) to remove while extracting.
-  // Options :
-  //   PCLZIP_OPT_PATH :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_OPT_EXTRACT_AS_STRING : The files are extracted as strings and
-  //     not as files.
-  //     The resulting content is in a new field 'content' in the file
-  //     structure.
-  //     This option must be used alone (any other options are ignored).
-  //   PCLZIP_CB_PRE_EXTRACT :
-  //   PCLZIP_CB_POST_EXTRACT :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the extracted files, with a status of the action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  //function extractByIndex($p_index, options...)
-  function extractByIndex($p_index)
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Set default values
-    $v_options = array();
-//    $v_path = "./";
-    $v_path = '';
-    $v_remove_path = "";
-    $v_remove_all_path = false;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Default values for option
-    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove form the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
-                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
-                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
-                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
-                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
-                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-												   ));
-        if ($v_result != 1) {
-          return 0;
-        }
-
-        // ----- Set the arguments
-        if (isset($v_options[PCLZIP_OPT_PATH])) {
-          $v_path = $v_options[PCLZIP_OPT_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
-          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
-          // ----- Check for '/' in last path char
-          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
-            $v_path .= '/';
-          }
-          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
-        }
-        if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
-          $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-        }
-        else {
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
-
-    // ----- Trace
-
-    // ----- Trick
-    // Here I want to reuse extractByRule(), so I need to parse the $p_index
-    // with privParseOptions()
-    $v_arg_trick = array (PCLZIP_OPT_BY_INDEX, $p_index);
-    $v_options_trick = array();
-    $v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick,
-                                        array (PCLZIP_OPT_BY_INDEX => 'optional' ));
-    if ($v_result != 1) {
-        return 0;
-    }
-    $v_options[PCLZIP_OPT_BY_INDEX] = $v_options_trick[PCLZIP_OPT_BY_INDEX];
-
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Call the extracting fct
-    if (($v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options)) < 1) {
-        return(0);
-    }
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   delete([$p_option, $p_option_value, ...])
-  // Description :
-  //   This method removes files from the archive.
-  //   If no parameters are given, then all the archive is emptied.
-  // Parameters :
-  //   None or optional arguments.
-  // Options :
-  //   PCLZIP_OPT_BY_INDEX :
-  //   PCLZIP_OPT_BY_NAME :
-  //   PCLZIP_OPT_BY_EREG : 
-  //   PCLZIP_OPT_BY_PREG :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the files which are still present in the archive.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function delete()
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Set default values
-    $v_options = array();
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 0) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Parse the options
-      $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                        array (PCLZIP_OPT_BY_NAME => 'optional',
-                                               PCLZIP_OPT_BY_EREG => 'optional',
-                                               PCLZIP_OPT_BY_PREG => 'optional',
-                                               PCLZIP_OPT_BY_INDEX => 'optional' ));
-      if ($v_result != 1) {
-          return 0;
-      }
-    }
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Call the delete fct
-    $v_list = array();
-    if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) {
-      $this->privSwapBackMagicQuotes();
-      unset($v_list);
-      return(0);
-    }
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : deleteByIndex()
-  // Description :
-  //   ***** Deprecated *****
-  //   delete(PCLZIP_OPT_BY_INDEX, $p_index) should be prefered.
-  // --------------------------------------------------------------------------------
-  function deleteByIndex($p_index)
-  {
-    
-    $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : properties()
-  // Description :
-  //   This method gives the properties of the archive.
-  //   The properties are :
-  //     nb : Number of files in the archive
-  //     comment : Comment associated with the archive file
-  //     status : not_exist, ok
-  // Parameters :
-  //   None
-  // Return Values :
-  //   0 on failure,
-  //   An array with the archive properties.
-  // --------------------------------------------------------------------------------
-  function properties()
-  {
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      $this->privSwapBackMagicQuotes();
-      return(0);
-    }
-
-    // ----- Default properties
-    $v_prop = array();
-    $v_prop['comment'] = '';
-    $v_prop['nb'] = 0;
-    $v_prop['status'] = 'not_exist';
-
-    // ----- Look if file exists
-    if (@is_file($this->zipname))
-    {
-      // ----- Open the zip file
-      if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
-      {
-        $this->privSwapBackMagicQuotes();
-        
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
+        // ----- Set the attributes
+        $this->zipname             = $p_zipname;
+        $this->zip_fd              = 0;
+        $this->magic_quotes_status = -1;
 
         // ----- Return
-        return 0;
-      }
-
-      // ----- Read the central directory informations
-      $v_central_dir = array();
-      if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-      {
-        $this->privSwapBackMagicQuotes();
-        return 0;
-      }
-
-      // ----- Close the zip file
-      $this->privCloseFd();
-
-      // ----- Set the user attributes
-      $v_prop['comment'] = $v_central_dir['comment'];
-      $v_prop['nb'] = $v_central_dir['entries'];
-      $v_prop['status'] = 'ok';
+        return;
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_prop;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : duplicate()
-  // Description :
-  //   This method creates an archive by copying the content of an other one. If
-  //   the archive already exist, it is replaced by the new one without any warning.
-  // Parameters :
-  //   $p_archive : The filename of a valid archive, or
-  //                a valid PclZip object.
-  // Return Values :
-  //   1 on success.
-  //   0 or a negative value on error (error code).
-  // --------------------------------------------------------------------------------
-  function duplicate($p_archive)
-  {
-    $v_result = 1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Look if the $p_archive is a PclZip object
-    if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip'))
+    // --------------------------------------------------------------------------------
+    // Function :
+    //   create($p_filelist, $p_add_dir="", $p_remove_dir="")
+    //   create($p_filelist, $p_option, $p_option_value, ...)
+    // Description :
+    //   This method supports two different synopsis. The first one is historical.
+    //   This method creates a Zip Archive. The Zip file is created in the
+    //   filesystem. The files and directories indicated in $p_filelist
+    //   are added in the archive. See the parameters description for the
+    //   supported format of $p_filelist.
+    //   When a directory is in the list, the directory and its content is added
+    //   in the archive.
+    //   In this synopsis, the function takes an optional variable list of
+    //   options. See bellow the supported options.
+    // Parameters :
+    //   $p_filelist : An array containing file or directory names, or
+    //                 a string containing one filename or one directory name, or
+    //                 a string containing a list of filenames and/or directory
+    //                 names separated by spaces.
+    //   $p_add_dir : A path to add before the real path of the archived file,
+    //                in order to have it memorized in the archive.
+    //   $p_remove_dir : A path to remove from the real path of the file to archive,
+    //                   in order to have a shorter path memorized in the archive.
+    //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
+    //                   is removed first, before $p_add_dir is added.
+    // Options :
+    //   PCLZIP_OPT_ADD_PATH :
+    //   PCLZIP_OPT_REMOVE_PATH :
+    //   PCLZIP_OPT_REMOVE_ALL_PATH :
+    //   PCLZIP_OPT_COMMENT :
+    //   PCLZIP_CB_PRE_ADD :
+    //   PCLZIP_CB_POST_ADD :
+    // Return Values :
+    //   0 on failure,
+    //   The list of the added files, with a status of the add action.
+    //   (see PclZip::listContent() for list entry format)
+    // --------------------------------------------------------------------------------
+    public function create($p_filelist)
     {
-
-      // ----- Duplicate the archive
-      $v_result = $this->privDuplicate($p_archive->zipname);
-    }
-
-    // ----- Look if the $p_archive is a string (so a filename)
-    else if (is_string($p_archive))
-    {
-
-      // ----- Check that $p_archive is a valid zip file
-      // TBC : Should also check the archive format
-      if (!is_file($p_archive)) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
-        $v_result = PCLZIP_ERR_MISSING_FILE;
-      }
-      else {
-        // ----- Duplicate the archive
-        $v_result = $this->privDuplicate($p_archive);
-      }
-    }
-
-    // ----- Invalid variable
-    else
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
-      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : merge()
-  // Description :
-  //   This method merge the $p_archive_to_add archive at the end of the current
-  //   one ($this).
-  //   If the archive ($this) does not exist, the merge becomes a duplicate.
-  //   If the $p_archive_to_add archive does not exist, the merge is a success.
-  // Parameters :
-  //   $p_archive_to_add : It can be directly the filename of a valid zip archive,
-  //                       or a PclZip object archive.
-  // Return Values :
-  //   1 on success,
-  //   0 or negative values on error (see below).
-  // --------------------------------------------------------------------------------
-  function merge($p_archive_to_add)
-  {
-    $v_result = 1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Look if the $p_archive_to_add is a PclZip object
-    if ((is_object($p_archive_to_add)) && (get_class($p_archive_to_add) == 'pclzip'))
-    {
-
-      // ----- Merge the archive
-      $v_result = $this->privMerge($p_archive_to_add);
-    }
-
-    // ----- Look if the $p_archive_to_add is a string (so a filename)
-    else if (is_string($p_archive_to_add))
-    {
-
-      // ----- Create a temporary archive
-      $v_object_archive = new PclZip($p_archive_to_add);
-
-      // ----- Merge the archive
-      $v_result = $this->privMerge($v_object_archive);
-    }
-
-    // ----- Invalid variable
-    else
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
-      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-
-
-  // --------------------------------------------------------------------------------
-  // Function : errorCode()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function errorCode()
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      return(PclErrorCode());
-    }
-    else {
-      return($this->error_code);
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : errorName()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function errorName($p_with_code=false)
-  {
-    $v_name = array ( PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
-                      PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
-                      PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
-                      PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
-                      PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE',
-                      PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG',
-                      PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP',
-                      PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE',
-                      PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL',
-                      PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION',
-                      PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT',
-                      PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL',
-                      PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL',
-                      PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM',
-                      PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP',
-                      PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE',
-                      PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE',
-                      PCLZIP_ERR_UNSUPPORTED_COMPRESSION => 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION',
-                      PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION'
-                      ,PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE'
-                      ,PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION'
-                    );
-
-    if (isset($v_name[$this->error_code])) {
-      $v_value = $v_name[$this->error_code];
-    }
-    else {
-      $v_value = 'NoName';
-    }
-
-    if ($p_with_code) {
-      return($v_value.' ('.$this->error_code.')');
-    }
-    else {
-      return($v_value);
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : errorInfo()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function errorInfo($p_full=false)
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      return(PclErrorString());
-    }
-    else {
-      if ($p_full) {
-        return($this->errorName(true)." : ".$this->error_string);
-      }
-      else {
-        return($this->error_string." [code ".$this->error_code."]");
-      }
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-
-// --------------------------------------------------------------------------------
-// ***** UNDER THIS LINE ARE DEFINED PRIVATE INTERNAL FUNCTIONS *****
-// *****                                                        *****
-// *****       THESES FUNCTIONS MUST NOT BE USED DIRECTLY       *****
-// --------------------------------------------------------------------------------
-
-
-
-  // --------------------------------------------------------------------------------
-  // Function : privCheckFormat()
-  // Description :
-  //   This method check that the archive exists and is a valid zip archive.
-  //   Several level of check exists. (futur)
-  // Parameters :
-  //   $p_level : Level of check. Default 0.
-  //              0 : Check the first bytes (magic codes) (default value))
-  //              1 : 0 + Check the central directory (futur)
-  //              2 : 1 + Check each file header (futur)
-  // Return Values :
-  //   true on success,
-  //   false on error, the error code is set.
-  // --------------------------------------------------------------------------------
-  function privCheckFormat($p_level=0)
-  {
-    $v_result = true;
-
-	// ----- Reset the file system cache
-    clearstatcache();
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Look if the file exits
-    if (!is_file($this->zipname)) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'");
-      return(false);
-    }
-
-    // ----- Check that the file is readeable
-    if (!is_readable($this->zipname)) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");
-      return(false);
-    }
-
-    // ----- Check the magic code
-    // TBC
-
-    // ----- Check the central header
-    // TBC
-
-    // ----- Check each file header
-    // TBC
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privParseOptions()
-  // Description :
-  //   This internal methods reads the variable list of arguments ($p_options_list,
-  //   $p_size) and generate an array with the options and values ($v_result_list).
-  //   $v_requested_options contains the options that can be present and those that
-  //   must be present.
-  //   $v_requested_options is an array, with the option value as key, and 'optional',
-  //   or 'mandatory' as value.
-  // Parameters :
-  //   See above.
-  // Return Values :
-  //   1 on success.
-  //   0 on failure.
-  // --------------------------------------------------------------------------------
-  function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options=false)
-  {
-    $v_result=1;
-    
-    // ----- Read the options
-    $i=0;
-    while ($i<$p_size) {
-
-      // ----- Check if the option is supported
-      if (!isset($v_requested_options[$p_options_list[$i]])) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '".$p_options_list[$i]."' for this method");
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Look for next option
-      switch ($p_options_list[$i]) {
-        // ----- Look for options that request a path value
-        case PCLZIP_OPT_PATH :
-        case PCLZIP_OPT_REMOVE_PATH :
-        case PCLZIP_OPT_ADD_PATH :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
-          $i++;
-        break;
-
-        case PCLZIP_OPT_TEMP_FILE_THRESHOLD :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-            return PclZip::errorCode();
-          }
-          
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
-            return PclZip::errorCode();
-          }
-          
-          // ----- Check the value
-          $v_value = $p_options_list[$i+1];
-          if ((!is_integer($v_value)) || ($v_value<0)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value (and convert it in bytes)
-          $v_result_list[$p_options_list[$i]] = $v_value*1048576;
-          $i++;
-        break;
-
-        case PCLZIP_OPT_TEMP_FILE_ON :
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
-            return PclZip::errorCode();
-          }
-          
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
-
-        case PCLZIP_OPT_TEMP_FILE_OFF :
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_ON])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");
-            return PclZip::errorCode();
-          }
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
-            return PclZip::errorCode();
-          }
-          
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
-
-        case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (   is_string($p_options_list[$i+1])
-              && ($p_options_list[$i+1] != '')) {
-            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
-            $i++;
-          }
-          else {
-          }
-        break;
-
-        // ----- Look for options that request an array of string for value
-        case PCLZIP_OPT_BY_NAME :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];
-          }
-          else if (is_array($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that request an EREG or PREG expression
-        case PCLZIP_OPT_BY_EREG :
-          // ereg() is deprecated starting with PHP 5.3. Move PCLZIP_OPT_BY_EREG
-          // to PCLZIP_OPT_BY_PREG
-          $p_options_list[$i] = PCLZIP_OPT_BY_PREG;
-        case PCLZIP_OPT_BY_PREG :
-        //case PCLZIP_OPT_CRYPT :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that takes a string
-        case PCLZIP_OPT_COMMENT :
-        case PCLZIP_OPT_ADD_COMMENT :
-        case PCLZIP_OPT_PREPEND_COMMENT :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE,
-			                     "Missing parameter value for option '"
-								 .PclZipUtilOptionText($p_options_list[$i])
-								 ."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE,
-			                     "Wrong parameter value for option '"
-								 .PclZipUtilOptionText($p_options_list[$i])
-								 ."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that request an array of index
-        case PCLZIP_OPT_BY_INDEX :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_work_list = array();
-          if (is_string($p_options_list[$i+1])) {
-
-              // ----- Remove spaces
-              $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');
-
-              // ----- Parse items
-              $v_work_list = explode(",", $p_options_list[$i+1]);
-          }
-          else if (is_integer($p_options_list[$i+1])) {
-              $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1];
-          }
-          else if (is_array($p_options_list[$i+1])) {
-              $v_work_list = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          
-          // ----- Reduce the index list
-          // each index item in the list must be a couple with a start and
-          // an end value : [0,3], [5-5], [8-10], ...
-          // ----- Check the format of each item
-          $v_sort_flag=false;
-          $v_sort_value=0;
-          for ($j=0; $j<sizeof($v_work_list); $j++) {
-              // ----- Explode the item
-              $v_item_list = explode("-", $v_work_list[$j]);
-              $v_size_item_list = sizeof($v_item_list);
-              
-              // ----- TBC : Here we might check that each item is a
-              // real integer ...
-              
-              // ----- Look for single value
-              if ($v_size_item_list == 1) {
-                  // ----- Set the option value
-                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
-                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[0];
-              }
-              elseif ($v_size_item_list == 2) {
-                  // ----- Set the option value
-                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
-                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[1];
-              }
-              else {
-                  // ----- Error log
-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-                  // ----- Return
-                  return PclZip::errorCode();
-              }
-
-
-              // ----- Look for list sort
-              if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
-                  $v_sort_flag=true;
-
-                  // ----- TBC : An automatic sort should be writen ...
-                  // ----- Error log
-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-                  // ----- Return
-                  return PclZip::errorCode();
-              }
-              $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
-          }
-          
-          // ----- Sort the items
-          if ($v_sort_flag) {
-              // TBC : To Be Completed
-          }
-
-          // ----- Next option
-          $i++;
-        break;
-
-        // ----- Look for options that request no value
-        case PCLZIP_OPT_REMOVE_ALL_PATH :
-        case PCLZIP_OPT_EXTRACT_AS_STRING :
-        case PCLZIP_OPT_NO_COMPRESSION :
-        case PCLZIP_OPT_EXTRACT_IN_OUTPUT :
-        case PCLZIP_OPT_REPLACE_NEWER :
-        case PCLZIP_OPT_STOP_ON_ERROR :
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
-
-        // ----- Look for options that request an octal value
-        case PCLZIP_OPT_SET_CHMOD :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          $i++;
-        break;
-
-        // ----- Look for options that request a call-back
-        case PCLZIP_CB_PRE_EXTRACT :
-        case PCLZIP_CB_POST_EXTRACT :
-        case PCLZIP_CB_PRE_ADD :
-        case PCLZIP_CB_POST_ADD :
-        /* for futur use
-        case PCLZIP_CB_PRE_DELETE :
-        case PCLZIP_CB_POST_DELETE :
-        case PCLZIP_CB_PRE_LIST :
-        case PCLZIP_CB_POST_LIST :
-        */
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_function_name = $p_options_list[$i+1];
-
-          // ----- Check that the value is a valid existing function
-          if (!function_exists($v_function_name)) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '".$v_function_name."()' is not an existing function for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Set the attribute
-          $v_result_list[$p_options_list[$i]] = $v_function_name;
-          $i++;
-        break;
-
-        default :
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                       "Unknown parameter '"
-							   .$p_options_list[$i]."'");
-
-          // ----- Return
-          return PclZip::errorCode();
-      }
-
-      // ----- Next options
-      $i++;
-    }
-
-    // ----- Look for mandatory options
-    if ($v_requested_options !== false) {
-      for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
-        // ----- Look for mandatory option
-        if ($v_requested_options[$key] == 'mandatory') {
-          // ----- Look if present
-          if (!isset($v_result_list[$key])) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-        }
-      }
-    }
-    
-    // ----- Look for default values
-    if (!isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
-      
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privOptionDefaultThreshold()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privOptionDefaultThreshold(&$p_options)
-  {
-    $v_result=1;
-    
-    if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-        || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
-      return $v_result;
-    }
-    
-    // ----- Get 'memory_limit' configuration value
-    $v_memory_limit = ini_get('memory_limit');
-    $v_memory_limit = trim($v_memory_limit);
-    $last = strtolower(substr($v_memory_limit, -1));
- 
-    if($last == 'g')
-        //$v_memory_limit = $v_memory_limit*1024*1024*1024;
-        $v_memory_limit = $v_memory_limit*1073741824;
-    if($last == 'm')
-        //$v_memory_limit = $v_memory_limit*1024*1024;
-        $v_memory_limit = $v_memory_limit*1048576;
-    if($last == 'k')
-        $v_memory_limit = $v_memory_limit*1024;
-            
-    $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit*PCLZIP_TEMPORARY_FILE_RATIO);
-    
-
-    // ----- Sanity check : No threshold if value lower than 1M
-    if ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] < 1048576) {
-      unset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]);
-    }
-          
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privFileDescrParseAtt()
-  // Description :
-  // Parameters :
-  // Return Values :
-  //   1 on success.
-  //   0 on failure.
-  // --------------------------------------------------------------------------------
-  function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options=false)
-  {
-    $v_result=1;
-    
-    // ----- For each file in the list check the attributes
-    foreach ($p_file_list as $v_key => $v_value) {
-    
-      // ----- Check if the option is supported
-      if (!isset($v_requested_options[$v_key])) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '".$v_key."' for this file");
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Look for attribute
-      switch ($v_key) {
-        case PCLZIP_ATT_FILE_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
-          
-          if ($p_filedescr['filename'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-        break;
-
-        case PCLZIP_ATT_FILE_NEW_SHORT_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
-
-          if ($p_filedescr['new_short_name'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-        break;
-
-        case PCLZIP_ATT_FILE_NEW_FULL_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
-
-          if ($p_filedescr['new_full_name'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-        break;
-
-        // ----- Look for options that takes a string
-        case PCLZIP_ATT_FILE_COMMENT :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['comment'] = $v_value;
-        break;
-
-        case PCLZIP_ATT_FILE_MTIME :
-          if (!is_integer($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". Integer expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['mtime'] = $v_value;
-        break;
-
-        case PCLZIP_ATT_FILE_CONTENT :
-          $p_filedescr['content'] = $v_value;
-        break;
-
-        default :
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                           "Unknown parameter '".$v_key."'");
-
-          // ----- Return
-          return PclZip::errorCode();
-      }
-
-      // ----- Look for mandatory options
-      if ($v_requested_options !== false) {
-        for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
-          // ----- Look for mandatory option
-          if ($v_requested_options[$key] == 'mandatory') {
-            // ----- Look if present
-            if (!isset($p_file_list[$key])) {
-              PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
-              return PclZip::errorCode();
-            }
-          }
-        }
-      }
-    
-    // end foreach
-    }
-    
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privFileDescrExpand()
-  // Description :
-  //   This method look for each item of the list to see if its a file, a folder
-  //   or a string to be added as file. For any other type of files (link, other)
-  //   just ignore the item.
-  //   Then prepare the information that will be stored for that file.
-  //   When its a folder, expand the folder with all the files that are in that 
-  //   folder (recursively).
-  // Parameters :
-  // Return Values :
-  //   1 on success.
-  //   0 on failure.
-  // --------------------------------------------------------------------------------
-  function privFileDescrExpand(&$p_filedescr_list, &$p_options)
-  {
-    $v_result=1;
-    
-    // ----- Create a result list
-    $v_result_list = array();
-    
-    // ----- Look each entry
-    for ($i=0; $i<sizeof($p_filedescr_list); $i++) {
-      
-      // ----- Get filedescr
-      $v_descr = $p_filedescr_list[$i];
-      
-      // ----- Reduce the filename
-      $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename'], false);
-      $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
-      
-      // ----- Look for real file or folder
-      if (file_exists($v_descr['filename'])) {
-        if (@is_file($v_descr['filename'])) {
-          $v_descr['type'] = 'file';
-        }
-        else if (@is_dir($v_descr['filename'])) {
-          $v_descr['type'] = 'folder';
-        }
-        else if (@is_link($v_descr['filename'])) {
-          // skip
-          continue;
-        }
-        else {
-          // skip
-          continue;
-        }
-      }
-      
-      // ----- Look for string added as file
-      else if (isset($v_descr['content'])) {
-        $v_descr['type'] = 'virtual_file';
-      }
-      
-      // ----- Missing file
-      else {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$v_descr['filename']."' does not exist");
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-      
-      // ----- Calculate the stored filename
-      $this->privCalculateStoredFilename($v_descr, $p_options);
-      
-      // ----- Add the descriptor in result list
-      $v_result_list[sizeof($v_result_list)] = $v_descr;
-      
-      // ----- Look for folder
-      if ($v_descr['type'] == 'folder') {
-        // ----- List of items in folder
-        $v_dirlist_descr = array();
-        $v_dirlist_nb = 0;
-        if ($v_folder_handler = @opendir($v_descr['filename'])) {
-          while (($v_item_handler = @readdir($v_folder_handler)) !== false) {
-
-            // ----- Skip '.' and '..'
-            if (($v_item_handler == '.') || ($v_item_handler == '..')) {
-                continue;
-            }
-            
-            // ----- Compose the full filename
-            $v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'].'/'.$v_item_handler;
-            
-            // ----- Look for different stored filename
-            // Because the name of the folder was changed, the name of the
-            // files/sub-folders also change
-            if (($v_descr['stored_filename'] != $v_descr['filename'])
-                 && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
-              if ($v_descr['stored_filename'] != '') {
-                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'].'/'.$v_item_handler;
-              }
-              else {
-                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
-              }
-            }
-      
-            $v_dirlist_nb++;
-          }
-          
-          @closedir($v_folder_handler);
-        }
-        else {
-          // TBC : unable to open folder in read mode
-        }
-        
-        // ----- Expand each element of the list
-        if ($v_dirlist_nb != 0) {
-          // ----- Expand
-          if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, $p_options)) != 1) {
-            return $v_result;
-          }
-          
-          // ----- Concat the resulting list
-          $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
-        }
-        else {
-        }
-          
-        // ----- Free local array
-        unset($v_dirlist_descr);
-      }
-    }
-    
-    // ----- Get the result list
-    $p_filedescr_list = $v_result_list;
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCreate()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_list_detail = array();
-    
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Open the file in write mode
-    if (($v_result = $this->privOpenFd('wb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Add the list of files
-    $v_result = $this->privAddList($p_filedescr_list, $p_result_list, $p_options);
-
-    // ----- Close
-    $this->privCloseFd();
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAdd()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_list_detail = array();
-
-    // ----- Look if the archive exists or is empty
-    if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0))
-    {
-
-      // ----- Do a create
-      $v_result = $this->privCreate($p_filedescr_list, $p_result_list, $p_options);
-
-      // ----- Return
-      return $v_result;
-    }
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Magic quotes trick
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
-
-    // ----- Creates a temporay file
-    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
-
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
-    {
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
-
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = $v_central_dir['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Swap the file descriptor
-    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
-    // the following methods on the temporary fil and not the real archive
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Add the files
-    $v_header_list = array();
-    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
-    {
-      fclose($v_zip_temp_fd);
-      $this->privCloseFd();
-      @unlink($v_zip_temp_name);
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($this->zip_fd);
-
-    // ----- Copy the block of file headers from the old archive
-    $v_size = $v_central_dir['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_zip_temp_fd, $v_read_size);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Create the Central Dir files header
-    for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++)
-    {
-      // ----- Create the file header
-      if ($v_header_list[$i]['status'] == 'ok') {
-        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-          fclose($v_zip_temp_fd);
-          $this->privCloseFd();
-          @unlink($v_zip_temp_name);
-          $this->privSwapBackMagicQuotes();
-
-          // ----- Return
-          return $v_result;
-        }
-        $v_count++;
-      }
-
-      // ----- Transform the header to a 'usable' info
-      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-    }
-
-    // ----- Zip file comment
-    $v_comment = $v_central_dir['comment'];
-    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-    }
-    if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) {
-      $v_comment = $v_comment.$p_options[PCLZIP_OPT_ADD_COMMENT];
-    }
-    if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT].$v_comment;
-    }
-
-    // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
-
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_count+$v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)
-    {
-      // ----- Reset the file list
-      unset($v_header_list);
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Swap back the file descriptor
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Close
-    $this->privCloseFd();
-
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Delete the zip file
-    // TBC : I should test the result ...
-    @unlink($this->zipname);
-
-    // ----- Rename the temporary file
-    // TBC : I should test the result ...
-    //@rename($v_zip_temp_name, $this->zipname);
-    PclZipUtilRename($v_zip_temp_name, $this->zipname);
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privOpenFd()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privOpenFd($p_mode)
-  {
-    $v_result=1;
-
-    // ----- Look if already open
-    if ($this->zip_fd != 0)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \''.$this->zipname.'\' already open');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Open the zip file
-    if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in '.$p_mode.' mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCloseFd()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privCloseFd()
-  {
-    $v_result=1;
-
-    if ($this->zip_fd != 0)
-      @fclose($this->zip_fd);
-    $this->zip_fd = 0;
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddList()
-  // Description :
-  //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
-  //   different from the real path of the file. This is usefull if you want to have PclTar
-  //   running in any directory, and memorize relative path from an other directory.
-  // Parameters :
-  //   $p_list : An array containing the file or directory names to add in the tar
-  //   $p_result_list : list of added files with their properties (specially the status field)
-  //   $p_add_dir : Path to add in the filename path archived
-  //   $p_remove_dir : Path to remove in the filename path archived
-  // Return Values :
-  // --------------------------------------------------------------------------------
-//  function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
-  function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Add the files
-    $v_header_list = array();
-    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($this->zip_fd);
-
-    // ----- Create the Central Dir files header
-    for ($i=0,$v_count=0; $i<sizeof($v_header_list); $i++)
-    {
-      // ----- Create the file header
-      if ($v_header_list[$i]['status'] == 'ok') {
-        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-          // ----- Return
-          return $v_result;
-        }
-        $v_count++;
-      }
-
-      // ----- Transform the header to a 'usable' info
-      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-    }
-
-    // ----- Zip file comment
-    $v_comment = '';
-    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-    }
-
-    // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
-
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1)
-    {
-      // ----- Reset the file list
-      unset($v_header_list);
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddFileList()
-  // Description :
-  // Parameters :
-  //   $p_filedescr_list : An array containing the file description 
-  //                      or directory names to add in the zip
-  //   $p_result_list : list of added files with their properties (specially the status field)
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_header = array();
-
-    // ----- Recuperate the current number of elt in list
-    $v_nb = sizeof($p_result_list);
-
-    // ----- Loop on the files
-    for ($j=0; ($j<sizeof($p_filedescr_list)) && ($v_result==1); $j++) {
-      // ----- Format the filename
-      $p_filedescr_list[$j]['filename']
-      = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
-      
-
-      // ----- Skip empty file names
-      // TBC : Can this be possible ? not checked in DescrParseAtt ?
-      if ($p_filedescr_list[$j]['filename'] == "") {
-        continue;
-      }
-
-      // ----- Check the filename
-      if (   ($p_filedescr_list[$j]['type'] != 'virtual_file')
-          && (!file_exists($p_filedescr_list[$j]['filename']))) {
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$p_filedescr_list[$j]['filename']."' does not exist");
-        return PclZip::errorCode();
-      }
-
-      // ----- Look if it is a file or a dir with no all path remove option
-      // or a dir with all its path removed
-//      if (   (is_file($p_filedescr_list[$j]['filename']))
-//          || (   is_dir($p_filedescr_list[$j]['filename'])
-      if (   ($p_filedescr_list[$j]['type'] == 'file')
-          || ($p_filedescr_list[$j]['type'] == 'virtual_file')
-          || (   ($p_filedescr_list[$j]['type'] == 'folder')
-              && (   !isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])
-                  || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))
-          ) {
-
-        // ----- Add the file
-        $v_result = $this->privAddFile($p_filedescr_list[$j], $v_header,
-                                       $p_options);
-        if ($v_result != 1) {
-          return $v_result;
-        }
-
-        // ----- Store the file infos
-        $p_result_list[$v_nb++] = $v_header;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAddFile($p_filedescr, &$p_header, &$p_options)
-  {
-    $v_result=1;
-    
-    // ----- Working variable
-    $p_filename = $p_filedescr['filename'];
-
-    // TBC : Already done in the fileAtt check ... ?
-    if ($p_filename == "") {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-  
-    // ----- Look for a stored different filename 
-    /* TBC : Removed
-    if (isset($p_filedescr['stored_filename'])) {
-      $v_stored_filename = $p_filedescr['stored_filename'];
-    }
-    else {
-      $v_stored_filename = $p_filedescr['stored_filename'];
-    }
-    */
-
-    // ----- Set the file properties
-    clearstatcache();
-    $p_header['version'] = 20;
-    $p_header['version_extracted'] = 10;
-    $p_header['flag'] = 0;
-    $p_header['compression'] = 0;
-    $p_header['crc'] = 0;
-    $p_header['compressed_size'] = 0;
-    $p_header['filename_len'] = strlen($p_filename);
-    $p_header['extra_len'] = 0;
-    $p_header['disk'] = 0;
-    $p_header['internal'] = 0;
-    $p_header['offset'] = 0;
-    $p_header['filename'] = $p_filename;
-// TBC : Removed    $p_header['stored_filename'] = $v_stored_filename;
-    $p_header['stored_filename'] = $p_filedescr['stored_filename'];
-    $p_header['extra'] = '';
-    $p_header['status'] = 'ok';
-    $p_header['index'] = -1;
-
-    // ----- Look for regular file
-    if ($p_filedescr['type']=='file') {
-      $p_header['external'] = 0x00000000;
-      $p_header['size'] = filesize($p_filename);
-    }
-    
-    // ----- Look for regular folder
-    else if ($p_filedescr['type']=='folder') {
-      $p_header['external'] = 0x00000010;
-      $p_header['mtime'] = filemtime($p_filename);
-      $p_header['size'] = filesize($p_filename);
-    }
-    
-    // ----- Look for virtual file
-    else if ($p_filedescr['type'] == 'virtual_file') {
-      $p_header['external'] = 0x00000000;
-      $p_header['size'] = strlen($p_filedescr['content']);
-    }
-    
-
-    // ----- Look for filetime
-    if (isset($p_filedescr['mtime'])) {
-      $p_header['mtime'] = $p_filedescr['mtime'];
-    }
-    else if ($p_filedescr['type'] == 'virtual_file') {
-      $p_header['mtime'] = time();
-    }
-    else {
-      $p_header['mtime'] = filemtime($p_filename);
-    }
-
-    // ------ Look for file comment
-    if (isset($p_filedescr['comment'])) {
-      $p_header['comment_len'] = strlen($p_filedescr['comment']);
-      $p_header['comment'] = $p_filedescr['comment'];
-    }
-    else {
-      $p_header['comment_len'] = 0;
-      $p_header['comment'] = '';
-    }
-
-    // ----- Look for pre-add callback
-    if (isset($p_options[PCLZIP_CB_PRE_ADD])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_ADD].'(PCLZIP_CB_PRE_ADD, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_ADD](PCLZIP_CB_PRE_ADD, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_header['status'] = "skipped";
         $v_result = 1;
-      }
 
-      // ----- Update the informations
-      // Only some fields can be modified
-      if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
-        $p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
-      }
-    }
+        // ----- Reset the error handler
+        $this->privErrorReset();
 
-    // ----- Look for empty stored filename
-    if ($p_header['stored_filename'] == "") {
-      $p_header['status'] = "filtered";
-    }
-    
-    // ----- Check the path length
-    if (strlen($p_header['stored_filename']) > 0xFF) {
-      $p_header['status'] = 'filename_too_long';
-    }
+        // ----- Set default values
+        $v_options                            = array();
+        $v_options[PCLZIP_OPT_NO_COMPRESSION] = false;
 
-    // ----- Look if no error, or file not skipped
-    if ($p_header['status'] == 'ok') {
+        // ----- Look for variable options arguments
+        $v_size = func_num_args();
 
-      // ----- Look for a file
-      if ($p_filedescr['type'] == 'file') {
-        // ----- Look for using temporary file to zip
-        if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) 
-            && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
-                || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                    && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])) ) ) {
-          $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);
-          if ($v_result < PCLZIP_ERR_NO_ERROR) {
-            return $v_result;
-          }
-        }
-        
-        // ----- Use "in memory" zip algo
-        else {
+        // ----- Look for arguments
+        if ($v_size > 1) {
+            // ----- Get the arguments
+            $v_arg_list = func_get_args();
 
-        // ----- Open the source file
-        if (($v_file = @fopen($p_filename, "rb")) == 0) {
-          PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
-          return PclZip::errorCode();
+            // ----- Remove from the options list the first argument
+            array_shift($v_arg_list);
+            $v_size--;
+
+            // ----- Look for first arg
+            if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+                // ----- Parse the options
+                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
+                    PCLZIP_OPT_REMOVE_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                    PCLZIP_OPT_ADD_PATH => 'optional',
+                    PCLZIP_CB_PRE_ADD => 'optional',
+                    PCLZIP_CB_POST_ADD => 'optional',
+                    PCLZIP_OPT_NO_COMPRESSION => 'optional',
+                    PCLZIP_OPT_COMMENT => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+                    //, PCLZIP_OPT_CRYPT => 'optional'
+                ));
+                if ($v_result != 1) {
+                    return 0;
+                }
+
+            // ----- Look for 2 args
+            // Here we need to support the first historic synopsis of the
+            // method.
+            } else {
+
+                // ----- Get the first argument
+                $v_options[PCLZIP_OPT_ADD_PATH] = $v_arg_list[0];
+
+                // ----- Look for the optional second argument
+                if ($v_size == 2) {
+                    $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
+                } elseif ($v_size > 2) {
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+                    return 0;
+                }
+            }
         }
 
-        // ----- Read the file content
-        $v_content = @fread($v_file, $p_header['size']);
+        // ----- Look for default option values
+        $this->privOptionDefaultThreshold($v_options);
 
-        // ----- Close the file
-        @fclose($v_file);
+        // ----- Init
+        $v_string_list    = array();
+        $v_att_list       = array();
+        $v_filedescr_list = array();
+        $p_result_list    = array();
 
-        // ----- Calculate the CRC
-        $p_header['crc'] = @crc32($v_content);
-        
-        // ----- Look for no compression
-        if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
-          // ----- Set header parameters
-          $p_header['compressed_size'] = $p_header['size'];
-          $p_header['compression'] = 0;
-        }
-        
-        // ----- Look for normal compression
-        else {
-          // ----- Compress the content
-          $v_content = @gzdeflate($v_content);
+        // ----- Look if the $p_filelist is really an array
+        if (is_array($p_filelist)) {
 
-          // ----- Set header parameters
-          $p_header['compressed_size'] = strlen($v_content);
-          $p_header['compression'] = 8;
-        }
-        
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-          @fclose($v_file);
-          return $v_result;
+            // ----- Look if the first element is also an array
+            //       This will mean that this is a file description entry
+            if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
+                $v_att_list = $p_filelist;
+
+            // ----- The list is a list of string names
+            } else {
+                $v_string_list = $p_filelist;
+            }
+
+        // ----- Look if the $p_filelist is a string
+        } elseif (is_string($p_filelist)) {
+            // ----- Create a list from the string
+            $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
+
+        // ----- Invalid variable type for $p_filelist
+        } else {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");
+
+            return 0;
         }
 
-        // ----- Write the compressed (or not) content
-        @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
-
+        // ----- Reformat the string list
+        if (sizeof($v_string_list) != 0) {
+            foreach ($v_string_list as $v_string) {
+                if ($v_string != '') {
+                    $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
+                } else {
+                }
+            }
         }
 
-      }
-
-      // ----- Look for a virtual file (a file from string)
-      else if ($p_filedescr['type'] == 'virtual_file') {
-          
-        $v_content = $p_filedescr['content'];
-
-        // ----- Calculate the CRC
-        $p_header['crc'] = @crc32($v_content);
-        
-        // ----- Look for no compression
-        if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
-          // ----- Set header parameters
-          $p_header['compressed_size'] = $p_header['size'];
-          $p_header['compression'] = 0;
-        }
-        
-        // ----- Look for normal compression
-        else {
-          // ----- Compress the content
-          $v_content = @gzdeflate($v_content);
-
-          // ----- Set header parameters
-          $p_header['compressed_size'] = strlen($v_content);
-          $p_header['compression'] = 8;
-        }
-        
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-          @fclose($v_file);
-          return $v_result;
+        // ----- For each file in the list check the attributes
+        $v_supported_attributes = array(
+            PCLZIP_ATT_FILE_NAME => 'mandatory',
+            PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional',
+            PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional',
+            PCLZIP_ATT_FILE_MTIME => 'optional',
+            PCLZIP_ATT_FILE_CONTENT => 'optional',
+            PCLZIP_ATT_FILE_COMMENT => 'optional'
+        );
+        foreach ($v_att_list as $v_entry) {
+            $v_result = $this->privFileDescrParseAtt($v_entry, $v_filedescr_list[], $v_options, $v_supported_attributes);
+            if ($v_result != 1) {
+                return 0;
+            }
         }
 
-        // ----- Write the compressed (or not) content
-        @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
-      }
-
-      // ----- Look for a directory
-      else if ($p_filedescr['type'] == 'folder') {
-        // ----- Look for directory last '/'
-        if (@substr($p_header['stored_filename'], -1) != '/') {
-          $p_header['stored_filename'] .= '/';
+        // ----- Expand the filelist (expand directories)
+        $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
+        if ($v_result != 1) {
+            return 0;
         }
 
-        // ----- Set the file properties
-        $p_header['size'] = 0;
-        //$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
-        $p_header['external'] = 0x00000010;   // Value for a folder : to be checked
-
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1)
-        {
-          return $v_result;
+        // ----- Call the create fct
+        $v_result = $this->privCreate($v_filedescr_list, $p_result_list, $v_options);
+        if ($v_result != 1) {
+            return 0;
         }
-      }
-    }
-
-    // ----- Look for post-add callback
-    if (isset($p_options[PCLZIP_CB_POST_ADD])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_ADD].'(PCLZIP_CB_POST_ADD, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_ADD](PCLZIP_CB_POST_ADD, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Ignored
-        $v_result = 1;
-      }
-
-      // ----- Update the informations
-      // Nothing can be modified
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddFileUsingTempFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
-  {
-    $v_result=PCLZIP_ERR_NO_ERROR;
-    
-    // ----- Working variable
-    $p_filename = $p_filedescr['filename'];
-
-
-    // ----- Open the source file
-    if (($v_file = @fopen($p_filename, "rb")) == 0) {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
-      return PclZip::errorCode();
-    }
-
-    // ----- Creates a compressed temporary file
-    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
-    if (($v_file_compressed = @gzopen($v_gzip_temp_name, "wb")) == 0) {
-      fclose($v_file);
-      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = filesize($p_filename);
-    while ($v_size != 0) {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_file, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @gzputs($v_file_compressed, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Close the file
-    @fclose($v_file);
-    @gzclose($v_file_compressed);
-
-    // ----- Check the minimum file size
-    if (filesize($v_gzip_temp_name) < 18) {
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \''.$v_gzip_temp_name.'\' has invalid filesize - should be minimum 18 bytes');
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the compressed attributes
-    if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the gzip file header
-    $v_binary_data = @fread($v_file_compressed, 10);
-    $v_data_header = unpack('a1id1/a1id2/a1cm/a1flag/Vmtime/a1xfl/a1os', $v_binary_data);
-
-    // ----- Check some parameters
-    $v_data_header['os'] = bin2hex($v_data_header['os']);
-
-    // ----- Read the gzip file footer
-    @fseek($v_file_compressed, filesize($v_gzip_temp_name)-8);
-    $v_binary_data = @fread($v_file_compressed, 8);
-    $v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);
-
-    // ----- Set the attributes
-    $p_header['compression'] = ord($v_data_header['cm']);
-    //$p_header['mtime'] = $v_data_header['mtime'];
-    $p_header['crc'] = $v_data_footer['crc'];
-    $p_header['compressed_size'] = filesize($v_gzip_temp_name)-18;
-
-    // ----- Close the file
-    @fclose($v_file_compressed);
-
-    // ----- Call the header generation
-    if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-      return $v_result;
-    }
-
-    // ----- Add the compressed data
-    if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0)
-    {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    fseek($v_file_compressed, 10);
-    $v_size = $p_header['compressed_size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_file_compressed, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Close the file
-    @fclose($v_file_compressed);
-
-    // ----- Unlink the temporary file
-    @unlink($v_gzip_temp_name);
-    
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCalculateStoredFilename()
-  // Description :
-  //   Based on file descriptor properties and global options, this method
-  //   calculate the filename that will be stored in the archive.
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privCalculateStoredFilename(&$p_filedescr, &$p_options)
-  {
-    $v_result=1;
-    
-    // ----- Working variables
-    $p_filename = $p_filedescr['filename'];
-    if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
-      $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
-    }
-    else {
-      $p_add_dir = '';
-    }
-    if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
-      $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
-    }
-    else {
-      $p_remove_dir = '';
-    }
-    if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-      $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-    }
-    else {
-      $p_remove_all_dir = 0;
-    }
-
-
-    // ----- Look for full name change
-    if (isset($p_filedescr['new_full_name'])) {
-      // ----- Remove drive letter if any
-      $v_stored_filename = PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);
-    }
-    
-    // ----- Look for path and/or short name change
-    else {
-
-      // ----- Look for short name change
-      // Its when we cahnge just the filename but not the path
-      if (isset($p_filedescr['new_short_name'])) {
-        $v_path_info = pathinfo($p_filename);
-        $v_dir = '';
-        if ($v_path_info['dirname'] != '') {
-          $v_dir = $v_path_info['dirname'].'/';
-        }
-        $v_stored_filename = $v_dir.$p_filedescr['new_short_name'];
-      }
-      else {
-        // ----- Calculate the stored filename
-        $v_stored_filename = $p_filename;
-      }
-
-      // ----- Look for all path to remove
-      if ($p_remove_all_dir) {
-        $v_stored_filename = basename($p_filename);
-      }
-      // ----- Look for partial path remove
-      else if ($p_remove_dir != "") {
-        if (substr($p_remove_dir, -1) != '/')
-          $p_remove_dir .= "/";
-
-        if (   (substr($p_filename, 0, 2) == "./")
-            || (substr($p_remove_dir, 0, 2) == "./")) {
-            
-          if (   (substr($p_filename, 0, 2) == "./")
-              && (substr($p_remove_dir, 0, 2) != "./")) {
-            $p_remove_dir = "./".$p_remove_dir;
-          }
-          if (   (substr($p_filename, 0, 2) != "./")
-              && (substr($p_remove_dir, 0, 2) == "./")) {
-            $p_remove_dir = substr($p_remove_dir, 2);
-          }
-        }
-
-        $v_compare = PclZipUtilPathInclusion($p_remove_dir,
-                                             $v_stored_filename);
-        if ($v_compare > 0) {
-          if ($v_compare == 2) {
-            $v_stored_filename = "";
-          }
-          else {
-            $v_stored_filename = substr($v_stored_filename,
-                                        strlen($p_remove_dir));
-          }
-        }
-      }
-      
-      // ----- Remove drive letter if any
-      $v_stored_filename = PclZipUtilTranslateWinPath($v_stored_filename);
-      
-      // ----- Look for path to add
-      if ($p_add_dir != "") {
-        if (substr($p_add_dir, -1) == "/")
-          $v_stored_filename = $p_add_dir.$v_stored_filename;
-        else
-          $v_stored_filename = $p_add_dir."/".$v_stored_filename;
-      }
-    }
-
-    // ----- Filename (reduce the path of stored name)
-    $v_stored_filename = PclZipUtilPathReduction($v_stored_filename);
-    $p_filedescr['stored_filename'] = $v_stored_filename;
-    
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privWriteFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privWriteFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // ----- Store the offset position of the file
-    $p_header['offset'] = ftell($this->zip_fd);
-
-    // ----- Transform UNIX mtime to DOS format mdate/mtime
-    $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
-
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50,
-	                      $p_header['version_extracted'], $p_header['flag'],
-                          $p_header['compression'], $v_mtime, $v_mdate,
-                          $p_header['crc'], $p_header['compressed_size'],
-						  $p_header['size'],
-                          strlen($p_header['stored_filename']),
-						  $p_header['extra_len']);
-
-    // ----- Write the first 148 bytes of the header in the archive
-    fputs($this->zip_fd, $v_binary_data, 30);
-
-    // ----- Write the variable fields
-    if (strlen($p_header['stored_filename']) != 0)
-    {
-      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
-    }
-    if ($p_header['extra_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privWriteCentralFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privWriteCentralFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // TBC
-    //for(reset($p_header); $key = key($p_header); next($p_header)) {
-    //}
-
-    // ----- Transform UNIX mtime to DOS format mdate/mtime
-    $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
-
-
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50,
-	                      $p_header['version'], $p_header['version_extracted'],
-                          $p_header['flag'], $p_header['compression'],
-						  $v_mtime, $v_mdate, $p_header['crc'],
-                          $p_header['compressed_size'], $p_header['size'],
-                          strlen($p_header['stored_filename']),
-						  $p_header['extra_len'], $p_header['comment_len'],
-                          $p_header['disk'], $p_header['internal'],
-						  $p_header['external'], $p_header['offset']);
-
-    // ----- Write the 42 bytes of the header in the zip file
-    fputs($this->zip_fd, $v_binary_data, 46);
-
-    // ----- Write the variable fields
-    if (strlen($p_header['stored_filename']) != 0)
-    {
-      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
-    }
-    if ($p_header['extra_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
-    }
-    if ($p_header['comment_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']);
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privWriteCentralHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
-  {
-    $v_result=1;
-
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries,
-	                      $p_nb_entries, $p_size,
-						  $p_offset, strlen($p_comment));
-
-    // ----- Write the 22 bytes of the header in the zip file
-    fputs($this->zip_fd, $v_binary_data, 22);
-
-    // ----- Write the variable fields
-    if (strlen($p_comment) != 0)
-    {
-      fputs($this->zip_fd, $p_comment, strlen($p_comment));
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privList()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privList(&$p_list)
-  {
-    $v_result=1;
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Open the zip file
-    if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
-    {
-      // ----- Magic quotes trick
-      $this->privSwapBackMagicQuotes();
-      
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of Central Dir
-    @rewind($this->zip_fd);
-    if (@fseek($this->zip_fd, $v_central_dir['offset']))
-    {
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read each entry
-    for ($i=0; $i<$v_central_dir['entries']; $i++)
-    {
-      // ----- Read the file header
-      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
-      {
-        $this->privSwapBackMagicQuotes();
-        return $v_result;
-      }
-      $v_header['index'] = $i;
-
-      // ----- Get the only interesting attributes
-      $this->privConvertHeader2FileInfo($v_header, $p_list[$i]);
-      unset($v_header);
-    }
-
-    // ----- Close the zip file
-    $this->privCloseFd();
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privConvertHeader2FileInfo()
-  // Description :
-  //   This function takes the file informations from the central directory
-  //   entries and extract the interesting parameters that will be given back.
-  //   The resulting file infos are set in the array $p_info
-  //     $p_info['filename'] : Filename with full path. Given by user (add),
-  //                           extracted in the filesystem (extract).
-  //     $p_info['stored_filename'] : Stored filename in the archive.
-  //     $p_info['size'] = Size of the file.
-  //     $p_info['compressed_size'] = Compressed size of the file.
-  //     $p_info['mtime'] = Last modification date of the file.
-  //     $p_info['comment'] = Comment associated with the file.
-  //     $p_info['folder'] = true/false : indicates if the entry is a folder or not.
-  //     $p_info['status'] = status of the action on the file.
-  //     $p_info['crc'] = CRC of the file content.
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privConvertHeader2FileInfo($p_header, &$p_info)
-  {
-    $v_result=1;
-
-    // ----- Get the interesting attributes
-    $v_temp_path = PclZipUtilPathReduction($p_header['filename']);
-    $p_info['filename'] = $v_temp_path;
-    $v_temp_path = PclZipUtilPathReduction($p_header['stored_filename']);
-    $p_info['stored_filename'] = $v_temp_path;
-    $p_info['size'] = $p_header['size'];
-    $p_info['compressed_size'] = $p_header['compressed_size'];
-    $p_info['mtime'] = $p_header['mtime'];
-    $p_info['comment'] = $p_header['comment'];
-    $p_info['folder'] = (($p_header['external']&0x00000010)==0x00000010);
-    $p_info['index'] = $p_header['index'];
-    $p_info['status'] = $p_header['status'];
-    $p_info['crc'] = $p_header['crc'];
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractByRule()
-  // Description :
-  //   Extract a file or directory depending of rules (by index, by name, ...)
-  // Parameters :
-  //   $p_file_list : An array where will be placed the properties of each
-  //                  extracted file
-  //   $p_path : Path to add while writing the extracted files
-  //   $p_remove_path : Path to remove (from the file memorized path) while writing the
-  //                    extracted files. If the path does not match the file path,
-  //                    the file is extracted with its memorized path.
-  //                    $p_remove_path does not apply to 'list' mode.
-  //                    $p_path and $p_remove_path are commulative.
-  // Return Values :
-  //   1 on success,0 or less on error (see error code list)
-  // --------------------------------------------------------------------------------
-  function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Check the path
-    if (   ($p_path == "")
-	    || (   (substr($p_path, 0, 1) != "/")
-		    && (substr($p_path, 0, 3) != "../")
-			&& (substr($p_path,1,2)!=":/")))
-      $p_path = "./".$p_path;
-
-    // ----- Reduce the path last (and duplicated) '/'
-    if (($p_path != "./") && ($p_path != "/"))
-    {
-      // ----- Look for the path end '/'
-      while (substr($p_path, -1) == "/")
-      {
-        $p_path = substr($p_path, 0, strlen($p_path)-1);
-      }
-    }
-
-    // ----- Look for path to remove format (should end by /)
-    if (($p_remove_path != "") && (substr($p_remove_path, -1) != '/'))
-    {
-      $p_remove_path .= '/';
-    }
-    $p_remove_path_size = strlen($p_remove_path);
-
-    // ----- Open the zip file
-    if (($v_result = $this->privOpenFd('rb')) != 1)
-    {
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      // ----- Close the zip file
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
-
-      return $v_result;
-    }
-
-    // ----- Start at beginning of Central Dir
-    $v_pos_entry = $v_central_dir['offset'];
-
-    // ----- Read each entry
-    $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
-    {
-
-      // ----- Read next Central dir entry
-      @rewind($this->zip_fd);
-      if (@fseek($this->zip_fd, $v_pos_entry))
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-        $this->privSwapBackMagicQuotes();
-
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
 
         // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Read the file header
-      $v_header = array();
-      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-        $this->privSwapBackMagicQuotes();
-
-        return $v_result;
-      }
-
-      // ----- Store the index
-      $v_header['index'] = $i;
-
-      // ----- Store the file position
-      $v_pos_entry = ftell($this->zip_fd);
-
-      // ----- Look for the specific extract rules
-      $v_extract = false;
-
-      // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
-          && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
-
-          // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
-
-              // ----- Look for a directory
-              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
-
-                  // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
-                      && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_extract = true;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
-                  $v_extract = true;
-              }
-          }
-      }
-
-      // ----- Look for extract by ereg rule
-      // ereg() is deprecated with PHP 5.3
-      /* 
-      else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
-               && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
-
-          if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header['stored_filename'])) {
-              $v_extract = true;
-          }
-      }
-      */
-
-      // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
-               && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
-
-          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
-              $v_extract = true;
-          }
-      }
-
-      // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
-               && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
-          
-          // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
-
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
-                  $v_extract = true;
-              }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
-              }
-
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
-                  break;
-              }
-          }
-      }
-
-      // ----- Look for no rule, which means extract all the archive
-      else {
-          $v_extract = true;
-      }
-
-	  // ----- Check compression method
-	  if (   ($v_extract)
-	      && (   ($v_header['compression'] != 8)
-		      && ($v_header['compression'] != 0))) {
-          $v_header['status'] = 'unsupported_compression';
-
-          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-              $this->privSwapBackMagicQuotes();
-              
-              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION,
-			                       "Filename '".$v_header['stored_filename']."' is "
-				  	    	  	   ."compressed by an unsupported compression "
-				  	    	  	   ."method (".$v_header['compression'].") ");
-
-              return PclZip::errorCode();
-		  }
-	  }
-	  
-	  // ----- Check encrypted files
-	  if (($v_extract) && (($v_header['flag'] & 1) == 1)) {
-          $v_header['status'] = 'unsupported_encryption';
-
-          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-              $this->privSwapBackMagicQuotes();
-
-              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION,
-			                       "Unsupported encryption for "
-				  	    	  	   ." filename '".$v_header['stored_filename']
-								   ."'");
-
-              return PclZip::errorCode();
-		  }
+        return $p_result_list;
     }
+    // --------------------------------------------------------------------------------
 
-      // ----- Look for real extraction
-      if (($v_extract) && ($v_header['status'] != 'ok')) {
-          $v_result = $this->privConvertHeader2FileInfo($v_header,
-		                                        $p_file_list[$v_nb_extracted++]);
-          if ($v_result != 1) {
-              $this->privCloseFd();
-              $this->privSwapBackMagicQuotes();
-              return $v_result;
-          }
-
-          $v_extract = false;
-      }
-      
-      // ----- Look for real extraction
-      if ($v_extract)
-      {
-
-        // ----- Go to the file position
-        @rewind($this->zip_fd);
-        if (@fseek($this->zip_fd, $v_header['offset']))
-        {
-          // ----- Close the zip file
-          $this->privCloseFd();
-
-          $this->privSwapBackMagicQuotes();
-
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-          // ----- Return
-          return PclZip::errorCode();
-        }
-
-        // ----- Look for extraction as string
-        if ($p_options[PCLZIP_OPT_EXTRACT_AS_STRING]) {
-
-          $v_string = '';
-
-          // ----- Extracting the file
-          $v_result1 = $this->privExtractFileAsString($v_header, $v_string, $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
-
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1)
-          {
-            // ----- Close the zip file
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-
-            return $v_result;
-          }
-
-          // ----- Set the file content
-          $p_file_list[$v_nb_extracted]['content'] = $v_string;
-
-          // ----- Next extracted file
-          $v_nb_extracted++;
-          
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-          	break;
-          }
-        }
-        // ----- Look for extraction in standard output
-        elseif (   (isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))
-		        && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
-          // ----- Extracting the file in standard output
-          $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
-
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result;
-          }
-
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-          	break;
-          }
-        }
-        // ----- Look for normal extraction
-        else {
-          // ----- Extracting the file
-          $v_result1 = $this->privExtractFile($v_header,
-		                                      $p_path, $p_remove_path,
-											  $p_remove_all_path,
-											  $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
-
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1)
-          {
-            // ----- Close the zip file
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-
-            return $v_result;
-          }
-
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-          	break;
-          }
-        }
-      }
-    }
-
-    // ----- Close the zip file
-    $this->privCloseFd();
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  //
-  // 1 : ... ?
-  // PCLZIP_ERR_USER_ABORTED(2) : User ask for extraction stop in callback
-  // --------------------------------------------------------------------------------
-  function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Read the file header
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1)
+    // --------------------------------------------------------------------------------
+    // Function :
+    //   add($p_filelist, $p_add_dir="", $p_remove_dir="")
+    //   add($p_filelist, $p_option, $p_option_value, ...)
+    // Description :
+    //   This method supports two synopsis. The first one is historical.
+    //   This methods add the list of files in an existing archive.
+    //   If a file with the same name already exists, it is added at the end of the
+    //   archive, the first one is still present.
+    //   If the archive does not exist, it is created.
+    // Parameters :
+    //   $p_filelist : An array containing file or directory names, or
+    //                 a string containing one filename or one directory name, or
+    //                 a string containing a list of filenames and/or directory
+    //                 names separated by spaces.
+    //   $p_add_dir : A path to add before the real path of the archived file,
+    //                in order to have it memorized in the archive.
+    //   $p_remove_dir : A path to remove from the real path of the file to archive,
+    //                   in order to have a shorter path memorized in the archive.
+    //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
+    //                   is removed first, before $p_add_dir is added.
+    // Options :
+    //   PCLZIP_OPT_ADD_PATH :
+    //   PCLZIP_OPT_REMOVE_PATH :
+    //   PCLZIP_OPT_REMOVE_ALL_PATH :
+    //   PCLZIP_OPT_COMMENT :
+    //   PCLZIP_OPT_ADD_COMMENT :
+    //   PCLZIP_OPT_PREPEND_COMMENT :
+    //   PCLZIP_CB_PRE_ADD :
+    //   PCLZIP_CB_POST_ADD :
+    // Return Values :
+    //   0 on failure,
+    //   The list of the added files, with a status of the add action.
+    //   (see PclZip::listContent() for list entry format)
+    // --------------------------------------------------------------------------------
+    public function add($p_filelist)
     {
-      // ----- Return
-      return $v_result;
-    }
+        $v_result = 1;
 
+        // ----- Reset the error handler
+        $this->privErrorReset();
 
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
+        // ----- Set default values
+        $v_options                            = array();
+        $v_options[PCLZIP_OPT_NO_COMPRESSION] = false;
 
-    // ----- Look for all path to remove
-    if ($p_remove_all_path == true) {
-        // ----- Look for folder entry that not need to be extracted
-        if (($p_entry['external']&0x00000010)==0x00000010) {
+        // ----- Look for variable options arguments
+        $v_size = func_num_args();
 
-            $p_entry['status'] = "filtered";
+        // ----- Look for arguments
+        if ($v_size > 1) {
+            // ----- Get the arguments
+            $v_arg_list = func_get_args();
 
-            return $v_result;
+            // ----- Remove form the options list the first argument
+            array_shift($v_arg_list);
+            $v_size--;
+
+            // ----- Look for first arg
+            if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+                // ----- Parse the options
+                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
+                    PCLZIP_OPT_REMOVE_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                    PCLZIP_OPT_ADD_PATH => 'optional',
+                    PCLZIP_CB_PRE_ADD => 'optional',
+                    PCLZIP_CB_POST_ADD => 'optional',
+                    PCLZIP_OPT_NO_COMPRESSION => 'optional',
+                    PCLZIP_OPT_COMMENT => 'optional',
+                    PCLZIP_OPT_ADD_COMMENT => 'optional',
+                    PCLZIP_OPT_PREPEND_COMMENT => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+                    //, PCLZIP_OPT_CRYPT => 'optional'
+                ));
+                if ($v_result != 1) {
+                    return 0;
+                }
+
+            // ----- Look for 2 args
+            // Here we need to support the first historic synopsis of the
+            // method.
+            } else {
+
+                // ----- Get the first argument
+                $v_options[PCLZIP_OPT_ADD_PATH] = $v_add_path = $v_arg_list[0];
+
+                // ----- Look for the optional second argument
+                if ($v_size == 2) {
+                    $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
+                } elseif ($v_size > 2) {
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+                    // ----- Return
+                    return 0;
+                }
+            }
         }
 
-        // ----- Get the basename of the path
-        $p_entry['filename'] = basename($p_entry['filename']);
-    }
+        // ----- Look for default option values
+        $this->privOptionDefaultThreshold($v_options);
 
-    // ----- Look for path to remove
-    else if ($p_remove_path != "")
-    {
-      if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2)
-      {
+        // ----- Init
+        $v_string_list    = array();
+        $v_att_list       = array();
+        $v_filedescr_list = array();
+        $p_result_list    = array();
 
-        // ----- Change the file status
-        $p_entry['status'] = "filtered";
+        // ----- Look if the $p_filelist is really an array
+        if (is_array($p_filelist)) {
+
+            // ----- Look if the first element is also an array
+            //       This will mean that this is a file description entry
+            if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
+                $v_att_list = $p_filelist;
+
+            // ----- The list is a list of string names
+            } else {
+                $v_string_list = $p_filelist;
+            }
+
+        // ----- Look if the $p_filelist is a string
+        } elseif (is_string($p_filelist)) {
+            // ----- Create a list from the string
+            $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
+
+        // ----- Invalid variable type for $p_filelist
+        } else {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '" . gettype($p_filelist) . "' for p_filelist");
+
+            return 0;
+        }
+
+        // ----- Reformat the string list
+        if (sizeof($v_string_list) != 0) {
+            foreach ($v_string_list as $v_string) {
+                $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
+            }
+        }
+
+        // ----- For each file in the list check the attributes
+        $v_supported_attributes = array(
+            PCLZIP_ATT_FILE_NAME => 'mandatory',
+            PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional',
+            PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional',
+            PCLZIP_ATT_FILE_MTIME => 'optional',
+            PCLZIP_ATT_FILE_CONTENT => 'optional',
+            PCLZIP_ATT_FILE_COMMENT => 'optional'
+        );
+        foreach ($v_att_list as $v_entry) {
+            $v_result = $this->privFileDescrParseAtt($v_entry, $v_filedescr_list[], $v_options, $v_supported_attributes);
+            if ($v_result != 1) {
+                return 0;
+            }
+        }
+
+        // ----- Expand the filelist (expand directories)
+        $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
+        if ($v_result != 1) {
+            return 0;
+        }
+
+        // ----- Call the create fct
+        $v_result = $this->privAdd($v_filedescr_list, $p_result_list, $v_options);
+        if ($v_result != 1) {
+            return 0;
+        }
 
         // ----- Return
-        return $v_result;
-      }
-
-      $p_remove_path_size = strlen($p_remove_path);
-      if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path)
-      {
-
-        // ----- Remove the path
-        $p_entry['filename'] = substr($p_entry['filename'], $p_remove_path_size);
-
-      }
+        return $p_result_list;
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Add the path
-    if ($p_path != '') {
-      $p_entry['filename'] = $p_path."/".$p_entry['filename'];
-    }
-    
-    // ----- Check a base_dir_restriction
-    if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
-      $v_inclusion
-      = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION],
-                                $p_entry['filename']); 
-      if ($v_inclusion == 0) {
-
-        PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION,
-			                     "Filename '".$p_entry['filename']."' is "
-								 ."outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
-
-        return PclZip::errorCode();
-      }
-    }
-
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
-        $v_result = 1;
-      }
-      
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
-
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-    // ----- Look for specific actions while the file exist
-    if (file_exists($p_entry['filename']))
+    // --------------------------------------------------------------------------------
+    // Function : listContent()
+    // Description :
+    //   This public method, gives the list of the files and directories, with their
+    //   properties.
+    //   The properties of each entries in the list are (used also in other functions) :
+    //     filename : Name of the file. For a create or add action it is the filename
+    //                given by the user. For an extract function it is the filename
+    //                of the extracted file.
+    //     stored_filename : Name of the file / directory stored in the archive.
+    //     size : Size of the stored file.
+    //     compressed_size : Size of the file's data compressed in the archive
+    //                       (without the headers overhead)
+    //     mtime : Last known modification date of the file (UNIX timestamp)
+    //     comment : Comment associated with the file
+    //     folder : true | false
+    //     index : index of the file in the archive
+    //     status : status of the action (depending of the action) :
+    //              Values are :
+    //                ok : OK !
+    //                filtered : the file / dir is not extracted (filtered by user)
+    //                already_a_directory : the file can not be extracted because a
+    //                                      directory with the same name already exists
+    //                write_protected : the file can not be extracted because a file
+    //                                  with the same name already exists and is
+    //                                  write protected
+    //                newer_exist : the file was not extracted because a newer file exists
+    //                path_creation_fail : the file is not extracted because the folder
+    //                                     does not exist and can not be created
+    //                write_error : the file was not extracted because there was a
+    //                              error while writing the file
+    //                read_error : the file was not extracted because there was a error
+    //                             while reading the file
+    //                invalid_header : the file was not extracted because of an archive
+    //                                 format error (bad file header)
+    //   Note that each time a method can continue operating when there
+    //   is an action error on a file, the error is only logged in the file status.
+    // Return Values :
+    //   0 on an unrecoverable failure,
+    //   The list of the files in the archive.
+    // --------------------------------------------------------------------------------
+    public function listContent()
     {
-
-      // ----- Look if file is a directory
-      if (is_dir($p_entry['filename']))
-      {
-
-        // ----- Change the file status
-        $p_entry['status'] = "already_a_directory";
-        
-        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-        // For historical reason first PclZip implementation does not stop
-        // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-            PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY,
-			                     "Filename '".$p_entry['filename']."' is "
-								 ."already used by an existing directory");
-
-            return PclZip::errorCode();
-		    }
-      }
-      // ----- Look if file is write protected
-      else if (!is_writeable($p_entry['filename']))
-      {
-
-        // ----- Change the file status
-        $p_entry['status'] = "write_protected";
-
-        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-        // For historical reason first PclZip implementation does not stop
-        // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
-			                     "Filename '".$p_entry['filename']."' exists "
-								 ."and is write protected");
-
-            return PclZip::errorCode();
-		    }
-      }
-
-      // ----- Look if the extracted file is older
-      else if (filemtime($p_entry['filename']) > $p_entry['mtime'])
-      {
-        // ----- Change the file status
-        if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
-		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {
-	  	  }
-		    else {
-            $p_entry['status'] = "newer_exist";
-
-            // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-            // For historical reason first PclZip implementation does not stop
-            // when this kind of error occurs.
-            if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		        && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-                PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
-			             "Newer version of '".$p_entry['filename']."' exists "
-					    ."and option PCLZIP_OPT_REPLACE_NEWER is not selected");
-
-                return PclZip::errorCode();
-		      }
-		    }
-      }
-      else {
-      }
-    }
-
-    // ----- Check the directory availability and create it if necessary
-    else {
-      if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/'))
-        $v_dir_to_check = $p_entry['filename'];
-      else if (!strstr($p_entry['filename'], "/"))
-        $v_dir_to_check = "";
-      else
-        $v_dir_to_check = dirname($p_entry['filename']);
-
-        if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
-  
-          // ----- Change the file status
-          $p_entry['status'] = "path_creation_fail";
-  
-          // ----- Return
-          //return $v_result;
-          $v_result = 1;
-        }
-      }
-    }
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010))
-      {
-        // ----- Look for not compressed file
-        if ($p_entry['compression'] == 0) {
-
-    		  // ----- Opening destination file
-          if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0)
-          {
-
-            // ----- Change the file status
-            $p_entry['status'] = "write_error";
-
-            // ----- Return
-            return $v_result;
-          }
-
-
-          // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-          $v_size = $p_entry['compressed_size'];
-          while ($v_size != 0)
-          {
-            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-            $v_buffer = @fread($this->zip_fd, $v_read_size);
-            /* Try to speed up the code
-            $v_binary_data = pack('a'.$v_read_size, $v_buffer);
-            @fwrite($v_dest_file, $v_binary_data, $v_read_size);
-            */
-            @fwrite($v_dest_file, $v_buffer, $v_read_size);            
-            $v_size -= $v_read_size;
-          }
-
-          // ----- Closing the destination file
-          fclose($v_dest_file);
-
-          // ----- Change the file mtime
-          touch($p_entry['filename'], $p_entry['mtime']);
-          
-
-        }
-        else {
-          // ----- TBC
-          // Need to be finished
-          if (($p_entry['flag'] & 1) == 1) {
-            PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \''.$p_entry['filename'].'\' is encrypted. Encrypted files are not supported.');
-            return PclZip::errorCode();
-          }
-
-
-          // ----- Look for using temporary file to unzip
-          if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) 
-              && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
-                  || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                      && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])) ) ) {
-            $v_result = $this->privExtractFileUsingTempFile($p_entry, $p_options);
-            if ($v_result < PCLZIP_ERR_NO_ERROR) {
-              return $v_result;
-            }
-          }
-          
-          // ----- Look for extract in memory
-          else {
-
-          
-            // ----- Read the compressed file in a buffer (one shot)
-            $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-            
-            // ----- Decompress the file
-            $v_file_content = @gzinflate($v_buffer);
-            unset($v_buffer);
-            if ($v_file_content === FALSE) {
-  
-              // ----- Change the file status
-              // TBC
-              $p_entry['status'] = "error";
-              
-              return $v_result;
-            }
-            
-            // ----- Opening destination file
-            if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
-  
-              // ----- Change the file status
-              $p_entry['status'] = "write_error";
-  
-              return $v_result;
-            }
-  
-            // ----- Write the uncompressed data
-            @fwrite($v_dest_file, $v_file_content, $p_entry['size']);
-            unset($v_file_content);
-  
-            // ----- Closing the destination file
-            @fclose($v_dest_file);
-            
-          }
-
-          // ----- Change the file mtime
-          @touch($p_entry['filename'], $p_entry['mtime']);
-        }
-
-        // ----- Look for chmod option
-        if (isset($p_options[PCLZIP_OPT_SET_CHMOD])) {
-
-          // ----- Change the mode of the file
-          @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);
-        }
-
-      }
-    }
-
-  	// ----- Change abort status
-  	if ($p_entry['status'] == "aborted") {
-        $p_entry['status'] = "skipped";
-  	}
-	
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFileUsingTempFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privExtractFileUsingTempFile(&$p_entry, &$p_options)
-  {
-    $v_result=1;
-        
-    // ----- Creates a temporary file
-    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
-    if (($v_dest_file = @fopen($v_gzip_temp_name, "wb")) == 0) {
-      fclose($v_file);
-      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
-      return PclZip::errorCode();
-    }
-
-
-    // ----- Write gz file format header
-    $v_binary_data = pack('va1a1Va1a1', 0x8b1f, Chr($p_entry['compression']), Chr(0x00), time(), Chr(0x00), Chr(3));
-    @fwrite($v_dest_file, $v_binary_data, 10);
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = $p_entry['compressed_size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($this->zip_fd, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($v_dest_file, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Write gz file format footer
-    $v_binary_data = pack('VV', $p_entry['crc'], $p_entry['size']);
-    @fwrite($v_dest_file, $v_binary_data, 8);
-
-    // ----- Close the temporary file
-    @fclose($v_dest_file);
-
-    // ----- Opening destination file
-    if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
-      $p_entry['status'] = "write_error";
-      return $v_result;
-    }
-
-    // ----- Open the temporary gz file
-    if (($v_src_file = @gzopen($v_gzip_temp_name, 'rb')) == 0) {
-      @fclose($v_dest_file);
-      $p_entry['status'] = "read_error";
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
-
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = $p_entry['size'];
-    while ($v_size != 0) {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @gzread($v_src_file, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($v_dest_file, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-    @fclose($v_dest_file);
-    @gzclose($v_src_file);
-
-    // ----- Delete the temporary file
-    @unlink($v_gzip_temp_name);
-    
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFileInOutput()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privExtractFileInOutput(&$p_entry, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Read the file header
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
-      return $v_result;
-    }
-
-
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
-
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
         $v_result = 1;
-      }
 
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
+        // ----- Reset the error handler
+        $this->privErrorReset();
 
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
-
-    // ----- Trace
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
-        // ----- Look for not compressed file
-        if ($p_entry['compressed_size'] == $p_entry['size']) {
-
-          // ----- Read the file in a buffer (one shot)
-          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-
-          // ----- Send the file to the output
-          echo $v_buffer;
-          unset($v_buffer);
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            return (0);
         }
-        else {
 
-          // ----- Read the compressed file in a buffer (one shot)
-          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-          
-          // ----- Decompress the file
-          $v_file_content = gzinflate($v_buffer);
-          unset($v_buffer);
+        // ----- Call the extracting fct
+        $p_list = array();
+        if (($v_result = $this->privList($p_list)) != 1) {
+            unset($p_list);
 
-          // ----- Send the file to the output
-          echo $v_file_content;
-          unset($v_file_content);
+            return (0);
         }
-      }
+
+        // ----- Return
+        return $p_list;
     }
+    // --------------------------------------------------------------------------------
 
-	// ----- Change abort status
-	if ($p_entry['status'] == "aborted") {
-      $p_entry['status'] = "skipped";
-	}
-
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
-
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFileAsString()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Read the file header
-    $v_header = array();
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1)
+    // --------------------------------------------------------------------------------
+    // Function :
+    //   extract($p_path="./", $p_remove_path="")
+    //   extract([$p_option, $p_option_value, ...])
+    // Description :
+    //   This method supports two synopsis. The first one is historical.
+    //   This method extract all the files / directories from the archive to the
+    //   folder indicated in $p_path.
+    //   If you want to ignore the 'root' part of path of the memorized files
+    //   you can indicate this in the optional $p_remove_path parameter.
+    //   By default, if a newer file with the same name already exists, the
+    //   file is not extracted.
+    //
+    //   If both PCLZIP_OPT_PATH and PCLZIP_OPT_ADD_PATH aoptions
+    //   are used, the path indicated in PCLZIP_OPT_ADD_PATH is append
+    //   at the end of the path value of PCLZIP_OPT_PATH.
+    // Parameters :
+    //   $p_path : Path where the files and directories are to be extracted
+    //   $p_remove_path : First part ('root' part) of the memorized path
+    //                    (if any similar) to remove while extracting.
+    // Options :
+    //   PCLZIP_OPT_PATH :
+    //   PCLZIP_OPT_ADD_PATH :
+    //   PCLZIP_OPT_REMOVE_PATH :
+    //   PCLZIP_OPT_REMOVE_ALL_PATH :
+    //   PCLZIP_CB_PRE_EXTRACT :
+    //   PCLZIP_CB_POST_EXTRACT :
+    // Return Values :
+    //   0 or a negative value on failure,
+    //   The list of the extracted files, with a status of the action.
+    //   (see PclZip::listContent() for list entry format)
+    // --------------------------------------------------------------------------------
+    public function extract()
     {
-      // ----- Return
-      return $v_result;
-    }
-
-
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
-
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
         $v_result = 1;
-      }
-      
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
 
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
+        // ----- Reset the error handler
+        $this->privErrorReset();
 
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
-        // ----- Look for not compressed file
-  //      if ($p_entry['compressed_size'] == $p_entry['size'])
-        if ($p_entry['compression'] == 0) {
-  
-          // ----- Reading the file
-          $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            return (0);
         }
-        else {
-  
-          // ----- Reading the file
-          $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
-          
-          // ----- Decompress the file
-          if (($p_string = @gzinflate($v_data)) === FALSE) {
-              // TBC
-          }
+
+        // ----- Set default values
+        $v_options         = array();
+        //    $v_path = "./";
+        $v_path            = '';
+        $v_remove_path     = "";
+        $v_remove_all_path = false;
+
+        // ----- Look for variable options arguments
+        $v_size = func_num_args();
+
+        // ----- Default values for option
+        $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = false;
+
+        // ----- Look for arguments
+        if ($v_size > 0) {
+            // ----- Get the arguments
+            $v_arg_list = func_get_args();
+
+            // ----- Look for first arg
+            if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+                // ----- Parse the options
+                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
+                    PCLZIP_OPT_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                    PCLZIP_OPT_ADD_PATH => 'optional',
+                    PCLZIP_CB_PRE_EXTRACT => 'optional',
+                    PCLZIP_CB_POST_EXTRACT => 'optional',
+                    PCLZIP_OPT_SET_CHMOD => 'optional',
+                    PCLZIP_OPT_BY_NAME => 'optional',
+                    PCLZIP_OPT_BY_EREG => 'optional',
+                    PCLZIP_OPT_BY_PREG => 'optional',
+                    PCLZIP_OPT_BY_INDEX => 'optional',
+                    PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
+                    PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
+                    PCLZIP_OPT_REPLACE_NEWER => 'optional',
+                    PCLZIP_OPT_STOP_ON_ERROR => 'optional',
+                    PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+                ));
+                if ($v_result != 1) {
+                    return 0;
+                }
+
+                // ----- Set the arguments
+                if (isset($v_options[PCLZIP_OPT_PATH])) {
+                    $v_path = $v_options[PCLZIP_OPT_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
+                    $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+                    $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
+                    // ----- Check for '/' in last path char
+                    if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
+                        $v_path .= '/';
+                    }
+                    $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
+                }
+
+            // ----- Look for 2 args
+            // Here we need to support the first historic synopsis of the
+            // method.
+            } else {
+
+                // ----- Get the first argument
+                $v_path = $v_arg_list[0];
+
+                // ----- Look for the optional second argument
+                if ($v_size == 2) {
+                    $v_remove_path = $v_arg_list[1];
+                } elseif ($v_size > 2) {
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+                    // ----- Return
+                    return 0;
+                }
+            }
         }
-  
+
+        // ----- Look for default option values
+        $this->privOptionDefaultThreshold($v_options);
+
         // ----- Trace
-      }
-      else {
-          // TBC : error : can not extract a folder in a string
-      }
-      
-    }
 
-  	// ----- Change abort status
-  	if ($p_entry['status'] == "aborted") {
-        $p_entry['status'] = "skipped";
-  	}
-	
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+        // ----- Call the extracting fct
+        $p_list   = array();
+        $v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options);
+        if ($v_result < 1) {
+            unset($p_list);
 
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-      
-      // ----- Swap the content to header
-      $v_local_header['content'] = $p_string;
-      $p_string = '';
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
-
-      // ----- Swap back the content to header
-      $p_string = $v_local_header['content'];
-      unset($v_local_header['content']);
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privReadFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privReadFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // ----- Read the 4 bytes signature
-    $v_binary_data = @fread($this->zip_fd, 4);
-    $v_data = unpack('Vid', $v_binary_data);
-
-    // ----- Check signature
-    if ($v_data['id'] != 0x04034b50)
-    {
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the first 42 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 26);
-
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 26)
-    {
-      $p_header['filename'] = "";
-      $p_header['status'] = "invalid_header";
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the values
-    $v_data = unpack('vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $v_binary_data);
-
-    // ----- Get filename
-    $p_header['filename'] = fread($this->zip_fd, $v_data['filename_len']);
-
-    // ----- Get extra_fields
-    if ($v_data['extra_len'] != 0) {
-      $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
-    }
-    else {
-      $p_header['extra'] = '';
-    }
-
-    // ----- Extract properties
-    $p_header['version_extracted'] = $v_data['version'];
-    $p_header['compression'] = $v_data['compression'];
-    $p_header['size'] = $v_data['size'];
-    $p_header['compressed_size'] = $v_data['compressed_size'];
-    $p_header['crc'] = $v_data['crc'];
-    $p_header['flag'] = $v_data['flag'];
-    $p_header['filename_len'] = $v_data['filename_len'];
-
-    // ----- Recuperate date in UNIX format
-    $p_header['mdate'] = $v_data['mdate'];
-    $p_header['mtime'] = $v_data['mtime'];
-    if ($p_header['mdate'] && $p_header['mtime'])
-    {
-      // ----- Extract time
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
-
-      // ----- Extract date
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
-      $v_day = $p_header['mdate'] & 0x001F;
-
-      // ----- Get UNIX date format
-      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
-
-    }
-    else
-    {
-      $p_header['mtime'] = time();
-    }
-
-    // TBC
-    //for(reset($v_data); $key = key($v_data); next($v_data)) {
-    //}
-
-    // ----- Set the stored filename
-    $p_header['stored_filename'] = $p_header['filename'];
-
-    // ----- Set the status field
-    $p_header['status'] = "ok";
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privReadCentralFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privReadCentralFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // ----- Read the 4 bytes signature
-    $v_binary_data = @fread($this->zip_fd, 4);
-    $v_data = unpack('Vid', $v_binary_data);
-
-    // ----- Check signature
-    if ($v_data['id'] != 0x02014b50)
-    {
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the first 42 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 42);
-
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 42)
-    {
-      $p_header['filename'] = "";
-      $p_header['status'] = "invalid_header";
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the values
-    $p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data);
-
-    // ----- Get filename
-    if ($p_header['filename_len'] != 0)
-      $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
-    else
-      $p_header['filename'] = '';
-
-    // ----- Get extra
-    if ($p_header['extra_len'] != 0)
-      $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
-    else
-      $p_header['extra'] = '';
-
-    // ----- Get comment
-    if ($p_header['comment_len'] != 0)
-      $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
-    else
-      $p_header['comment'] = '';
-
-    // ----- Extract properties
-
-    // ----- Recuperate date in UNIX format
-    //if ($p_header['mdate'] && $p_header['mtime'])
-    // TBC : bug : this was ignoring time with 0/0/0
-    if (1)
-    {
-      // ----- Extract time
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
-
-      // ----- Extract date
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
-      $v_day = $p_header['mdate'] & 0x001F;
-
-      // ----- Get UNIX date format
-      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
-
-    }
-    else
-    {
-      $p_header['mtime'] = time();
-    }
-
-    // ----- Set the stored filename
-    $p_header['stored_filename'] = $p_header['filename'];
-
-    // ----- Set default status to ok
-    $p_header['status'] = 'ok';
-
-    // ----- Look if it is a directory
-    if (substr($p_header['filename'], -1) == '/') {
-      //$p_header['external'] = 0x41FF0010;
-      $p_header['external'] = 0x00000010;
-    }
-
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCheckFileHeaders()
-  // Description :
-  // Parameters :
-  // Return Values :
-  //   1 on success,
-  //   0 on error;
-  // --------------------------------------------------------------------------------
-  function privCheckFileHeaders(&$p_local_header, &$p_central_header)
-  {
-    $v_result=1;
-
-  	// ----- Check the static values
-  	// TBC
-  	if ($p_local_header['filename'] != $p_central_header['filename']) {
-  	}
-  	if ($p_local_header['version_extracted'] != $p_central_header['version_extracted']) {
-  	}
-  	if ($p_local_header['flag'] != $p_central_header['flag']) {
-  	}
-  	if ($p_local_header['compression'] != $p_central_header['compression']) {
-  	}
-  	if ($p_local_header['mtime'] != $p_central_header['mtime']) {
-  	}
-  	if ($p_local_header['filename_len'] != $p_central_header['filename_len']) {
-  	}
-  
-  	// ----- Look for flag bit 3
-  	if (($p_local_header['flag'] & 8) == 8) {
-          $p_local_header['size'] = $p_central_header['size'];
-          $p_local_header['compressed_size'] = $p_central_header['compressed_size'];
-          $p_local_header['crc'] = $p_central_header['crc'];
-  	}
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privReadEndCentralDir()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privReadEndCentralDir(&$p_central_dir)
-  {
-    $v_result=1;
-
-    // ----- Go to the end of the zip file
-    $v_size = filesize($this->zipname);
-    @fseek($this->zip_fd, $v_size);
-    if (@ftell($this->zip_fd) != $v_size)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \''.$this->zipname.'\'');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- First try : look if this is an archive with no commentaries (most of the time)
-    // in this case the end of central dir is at 22 bytes of the file end
-    $v_found = 0;
-    if ($v_size > 26) {
-      @fseek($this->zip_fd, $v_size-22);
-      if (($v_pos = @ftell($this->zip_fd)) != ($v_size-22))
-      {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Read for bytes
-      $v_binary_data = @fread($this->zip_fd, 4);
-      $v_data = @unpack('Vid', $v_binary_data);
-
-      // ----- Check signature
-      if ($v_data['id'] == 0x06054b50) {
-        $v_found = 1;
-      }
-
-      $v_pos = ftell($this->zip_fd);
-    }
-
-    // ----- Go back to the maximum possible size of the Central Dir End Record
-    if (!$v_found) {
-      $v_maximum_size = 65557; // 0xFFFF + 22;
-      if ($v_maximum_size > $v_size)
-        $v_maximum_size = $v_size;
-      @fseek($this->zip_fd, $v_size-$v_maximum_size);
-      if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size))
-      {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Read byte per byte in order to find the signature
-      $v_pos = ftell($this->zip_fd);
-      $v_bytes = 0x00000000;
-      while ($v_pos < $v_size)
-      {
-        // ----- Read a byte
-        $v_byte = @fread($this->zip_fd, 1);
-
-        // -----  Add the byte
-        //$v_bytes = ($v_bytes << 8) | Ord($v_byte);
-        // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number 
-        // Otherwise on systems where we have 64bit integers the check below for the magic number will fail. 
-        $v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte); 
-
-        // ----- Compare the bytes
-        if ($v_bytes == 0x504b0506)
-        {
-          $v_pos++;
-          break;
+            return (0);
         }
 
-        $v_pos++;
-      }
-
-      // ----- Look if not found end of central dir
-      if ($v_pos == $v_size)
-      {
-
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Unable to find End of Central Dir Record signature");
-
         // ----- Return
-        return PclZip::errorCode();
-      }
+        return $p_list;
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Read the first 18 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 18);
 
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 18)
+    // --------------------------------------------------------------------------------
+    // Function :
+    //   extractByIndex($p_index, $p_path="./", $p_remove_path="")
+    //   extractByIndex($p_index, [$p_option, $p_option_value, ...])
+    // Description :
+    //   This method supports two synopsis. The first one is historical.
+    //   This method is doing a partial extract of the archive.
+    //   The extracted files or folders are identified by their index in the
+    //   archive (from 0 to n).
+    //   Note that if the index identify a folder, only the folder entry is
+    //   extracted, not all the files included in the archive.
+    // Parameters :
+    //   $p_index : A single index (integer) or a string of indexes of files to
+    //              extract. The form of the string is "0,4-6,8-12" with only numbers
+    //              and '-' for range or ',' to separate ranges. No spaces or ';'
+    //              are allowed.
+    //   $p_path : Path where the files and directories are to be extracted
+    //   $p_remove_path : First part ('root' part) of the memorized path
+    //                    (if any similar) to remove while extracting.
+    // Options :
+    //   PCLZIP_OPT_PATH :
+    //   PCLZIP_OPT_ADD_PATH :
+    //   PCLZIP_OPT_REMOVE_PATH :
+    //   PCLZIP_OPT_REMOVE_ALL_PATH :
+    //   PCLZIP_OPT_EXTRACT_AS_STRING : The files are extracted as strings and
+    //     not as files.
+    //     The resulting content is in a new field 'content' in the file
+    //     structure.
+    //     This option must be used alone (any other options are ignored).
+    //   PCLZIP_CB_PRE_EXTRACT :
+    //   PCLZIP_CB_POST_EXTRACT :
+    // Return Values :
+    //   0 on failure,
+    //   The list of the extracted files, with a status of the action.
+    //   (see PclZip::listContent() for list entry format)
+    // --------------------------------------------------------------------------------
+    //function extractByIndex($p_index, options...)
+    public function extractByIndex($p_index)
     {
+        $v_result = 1;
 
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : ".strlen($v_binary_data));
+        // ----- Reset the error handler
+        $this->privErrorReset();
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the values
-    $v_data = unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size', $v_binary_data);
-
-    // ----- Check the global size
-    if (($v_pos + $v_data['comment_size'] + 18) != $v_size) {
-
-	  // ----- Removed in release 2.2 see readme file
-	  // The check of the file size is a little too strict.
-	  // Some bugs where found when a zip is encrypted/decrypted with 'crypt'.
-	  // While decrypted, zip has training 0 bytes
-	  if (0) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT,
-	                       'The central dir is not at the end of the archive.'
-						   .' Some trailing bytes exists after the archive.');
-
-      // ----- Return
-      return PclZip::errorCode();
-	  }
-    }
-
-    // ----- Get comment
-    if ($v_data['comment_size'] != 0) {
-      $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);
-    }
-    else
-      $p_central_dir['comment'] = '';
-
-    $p_central_dir['entries'] = $v_data['entries'];
-    $p_central_dir['disk_entries'] = $v_data['disk_entries'];
-    $p_central_dir['offset'] = $v_data['offset'];
-    $p_central_dir['size'] = $v_data['size'];
-    $p_central_dir['disk'] = $v_data['disk'];
-    $p_central_dir['disk_start'] = $v_data['disk_start'];
-
-    // TBC
-    //for(reset($p_central_dir); $key = key($p_central_dir); next($p_central_dir)) {
-    //}
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDeleteByRule()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privDeleteByRule(&$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_list_detail = array();
-
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
-
-    // ----- Scan all the files
-    // ----- Start at beginning of Central Dir
-    $v_pos_entry = $v_central_dir['offset'];
-    @rewind($this->zip_fd);
-    if (@fseek($this->zip_fd, $v_pos_entry))
-    {
-      // ----- Close the zip file
-      $this->privCloseFd();
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read each entry
-    $v_header_list = array();
-    $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
-    {
-
-      // ----- Read the file header
-      $v_header_list[$v_nb_extracted] = array();
-      if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1)
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-
-        return $v_result;
-      }
-
-
-      // ----- Store the index
-      $v_header_list[$v_nb_extracted]['index'] = $i;
-
-      // ----- Look for the specific extract rules
-      $v_found = false;
-
-      // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
-          && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
-
-          // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
-
-              // ----- Look for a directory
-              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
-
-                  // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
-                      && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_found = true;
-                  }
-                  elseif (   (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */
-                          && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_found = true;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
-                  $v_found = true;
-              }
-          }
-      }
-
-      // ----- Look for extract by ereg rule
-      // ereg() is deprecated with PHP 5.3
-      /*
-      else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
-               && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
-
-          if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
-              $v_found = true;
-          }
-      }
-      */
-
-      // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
-               && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
-
-          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
-              $v_found = true;
-          }
-      }
-
-      // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
-               && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
-
-          // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
-
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
-                  $v_found = true;
-              }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
-              }
-
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
-                  break;
-              }
-          }
-      }
-      else {
-      	$v_found = true;
-      }
-
-      // ----- Look for deletion
-      if ($v_found)
-      {
-        unset($v_header_list[$v_nb_extracted]);
-      }
-      else
-      {
-        $v_nb_extracted++;
-      }
-    }
-
-    // ----- Look if something need to be deleted
-    if ($v_nb_extracted > 0) {
-
-        // ----- Creates a temporay file
-        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
-
-        // ----- Creates a temporary zip archive
-        $v_temp_zip = new PclZip($v_zip_temp_name);
-
-        // ----- Open the temporary zip file in write mode
-        if (($v_result = $v_temp_zip->privOpenFd('wb')) != 1) {
-            $this->privCloseFd();
-
-            // ----- Return
-            return $v_result;
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            return (0);
         }
 
-        // ----- Look which file need to be kept
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
+        // ----- Set default values
+        $v_options         = array();
+        //    $v_path = "./";
+        $v_path            = '';
+        $v_remove_path     = "";
+        $v_remove_all_path = false;
 
-            // ----- Calculate the position of the header
-            @rewind($this->zip_fd);
-            if (@fseek($this->zip_fd,  $v_header_list[$i]['offset'])) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
+        // ----- Look for variable options arguments
+        $v_size = func_num_args();
+
+        // ----- Default values for option
+        $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = false;
+
+        // ----- Look for arguments
+        if ($v_size > 1) {
+            // ----- Get the arguments
+            $v_arg_list = func_get_args();
+
+            // ----- Remove form the options list the first argument
+            array_shift($v_arg_list);
+            $v_size--;
+
+            // ----- Look for first arg
+            if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+                // ----- Parse the options
+                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
+                    PCLZIP_OPT_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                    PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
+                    PCLZIP_OPT_ADD_PATH => 'optional',
+                    PCLZIP_CB_PRE_EXTRACT => 'optional',
+                    PCLZIP_CB_POST_EXTRACT => 'optional',
+                    PCLZIP_OPT_SET_CHMOD => 'optional',
+                    PCLZIP_OPT_REPLACE_NEWER => 'optional',
+                    PCLZIP_OPT_STOP_ON_ERROR => 'optional',
+                    PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+                ));
+                if ($v_result != 1) {
+                    return 0;
+                }
+
+                // ----- Set the arguments
+                if (isset($v_options[PCLZIP_OPT_PATH])) {
+                    $v_path = $v_options[PCLZIP_OPT_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
+                    $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+                    $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
+                    // ----- Check for '/' in last path char
+                    if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
+                        $v_path .= '/';
+                    }
+                    $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
+                }
+                if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
+                    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = false;
+                } else {
+                }
+
+            // ----- Look for 2 args
+            // Here we need to support the first historic synopsis of the
+            // method.
+            } else {
+
+                // ----- Get the first argument
+                $v_path = $v_arg_list[0];
+
+                // ----- Look for the optional second argument
+                if ($v_size == 2) {
+                    $v_remove_path = $v_arg_list[1];
+                } elseif ($v_size > 2) {
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+                    // ----- Return
+                    return 0;
+                }
+            }
+        }
+
+        // ----- Trace
+
+        // ----- Trick
+        // Here I want to reuse extractByRule(), so I need to parse the $p_index
+        // with privParseOptions()
+        $v_arg_trick     = array(
+            PCLZIP_OPT_BY_INDEX,
+            $p_index
+        );
+        $v_options_trick = array();
+        $v_result        = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick, array(
+            PCLZIP_OPT_BY_INDEX => 'optional'
+        ));
+        if ($v_result != 1) {
+            return 0;
+        }
+        $v_options[PCLZIP_OPT_BY_INDEX] = $v_options_trick[PCLZIP_OPT_BY_INDEX];
+
+        // ----- Look for default option values
+        $this->privOptionDefaultThreshold($v_options);
+
+        // ----- Call the extracting fct
+        if (($v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options)) < 1) {
+            return (0);
+        }
+
+        // ----- Return
+        return $p_list;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function :
+    //   delete([$p_option, $p_option_value, ...])
+    // Description :
+    //   This method removes files from the archive.
+    //   If no parameters are given, then all the archive is emptied.
+    // Parameters :
+    //   None or optional arguments.
+    // Options :
+    //   PCLZIP_OPT_BY_INDEX :
+    //   PCLZIP_OPT_BY_NAME :
+    //   PCLZIP_OPT_BY_EREG :
+    //   PCLZIP_OPT_BY_PREG :
+    // Return Values :
+    //   0 on failure,
+    //   The list of the files which are still present in the archive.
+    //   (see PclZip::listContent() for list entry format)
+    // --------------------------------------------------------------------------------
+    public function delete()
+    {
+        $v_result = 1;
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            return (0);
+        }
+
+        // ----- Set default values
+        $v_options = array();
+
+        // ----- Look for variable options arguments
+        $v_size = func_num_args();
+
+        // ----- Look for arguments
+        if ($v_size > 0) {
+            // ----- Get the arguments
+            $v_arg_list = func_get_args();
+
+            // ----- Parse the options
+            $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
+                PCLZIP_OPT_BY_NAME => 'optional',
+                PCLZIP_OPT_BY_EREG => 'optional',
+                PCLZIP_OPT_BY_PREG => 'optional',
+                PCLZIP_OPT_BY_INDEX => 'optional'
+            ));
+            if ($v_result != 1) {
+                return 0;
+            }
+        }
+
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Call the delete fct
+        $v_list = array();
+        if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) {
+            $this->privSwapBackMagicQuotes();
+            unset($v_list);
+
+            return (0);
+        }
+
+        // ----- Magic quotes trick
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Return
+        return $v_list;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : deleteByIndex()
+    // Description :
+    //   ***** Deprecated *****
+    //   delete(PCLZIP_OPT_BY_INDEX, $p_index) should be prefered.
+    // --------------------------------------------------------------------------------
+    public function deleteByIndex($p_index)
+    {
+
+        $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
+
+        // ----- Return
+        return $p_list;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : properties()
+    // Description :
+    //   This method gives the properties of the archive.
+    //   The properties are :
+    //     nb : Number of files in the archive
+    //     comment : Comment associated with the archive file
+    //     status : not_exist, ok
+    // Parameters :
+    //   None
+    // Return Values :
+    //   0 on failure,
+    //   An array with the archive properties.
+    // --------------------------------------------------------------------------------
+    public function properties()
+    {
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            $this->privSwapBackMagicQuotes();
+
+            return (0);
+        }
+
+        // ----- Default properties
+        $v_prop            = array();
+        $v_prop['comment'] = '';
+        $v_prop['nb']      = 0;
+        $v_prop['status']  = 'not_exist';
+
+        // ----- Look if file exists
+        if (@is_file($this->zipname)) {
+            // ----- Open the zip file
+            if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0) {
+                $this->privSwapBackMagicQuotes();
 
                 // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+                PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in binary read mode');
+
+                // ----- Return
+                return 0;
+            }
+
+            // ----- Read the central directory informations
+            $v_central_dir = array();
+            if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+                $this->privSwapBackMagicQuotes();
+
+                return 0;
+            }
+
+            // ----- Close the zip file
+            $this->privCloseFd();
+
+            // ----- Set the user attributes
+            $v_prop['comment'] = $v_central_dir['comment'];
+            $v_prop['nb']      = $v_central_dir['entries'];
+            $v_prop['status']  = 'ok';
+        }
+
+        // ----- Magic quotes trick
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Return
+        return $v_prop;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : duplicate()
+    // Description :
+    //   This method creates an archive by copying the content of an other one. If
+    //   the archive already exist, it is replaced by the new one without any warning.
+    // Parameters :
+    //   $p_archive : The filename of a valid archive, or
+    //                a valid PclZip object.
+    // Return Values :
+    //   1 on success.
+    //   0 or a negative value on error (error code).
+    // --------------------------------------------------------------------------------
+    public function duplicate($p_archive)
+    {
+        $v_result = 1;
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Look if the $p_archive is a PclZip object
+        if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip')) {
+
+            // ----- Duplicate the archive
+            $v_result = $this->privDuplicate($p_archive->zipname);
+
+        // ----- Look if the $p_archive is a string (so a filename)
+        } elseif (is_string($p_archive)) {
+
+            // ----- Check that $p_archive is a valid zip file
+            // TBC : Should also check the archive format
+            if (!is_file($p_archive)) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '" . $p_archive . "'");
+                $v_result = PCLZIP_ERR_MISSING_FILE;
+            } else {
+                // ----- Duplicate the archive
+                $v_result = $this->privDuplicate($p_archive);
+            }
+
+        // ----- Invalid variable
+        } else {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
+            $v_result = PCLZIP_ERR_INVALID_PARAMETER;
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : merge()
+    // Description :
+    //   This method merge the $p_archive_to_add archive at the end of the current
+    //   one ($this).
+    //   If the archive ($this) does not exist, the merge becomes a duplicate.
+    //   If the $p_archive_to_add archive does not exist, the merge is a success.
+    // Parameters :
+    //   $p_archive_to_add : It can be directly the filename of a valid zip archive,
+    //                       or a PclZip object archive.
+    // Return Values :
+    //   1 on success,
+    //   0 or negative values on error (see below).
+    // --------------------------------------------------------------------------------
+    public function merge($p_archive_to_add)
+    {
+        $v_result = 1;
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            return (0);
+        }
+
+        // ----- Look if the $p_archive_to_add is a PclZip object
+        if ((is_object($p_archive_to_add)) && (get_class($p_archive_to_add) == 'pclzip')) {
+
+            // ----- Merge the archive
+            $v_result = $this->privMerge($p_archive_to_add);
+
+        // ----- Look if the $p_archive_to_add is a string (so a filename)
+        } elseif (is_string($p_archive_to_add)) {
+
+            // ----- Create a temporary archive
+            $v_object_archive = new PclZip($p_archive_to_add);
+
+            // ----- Merge the archive
+            $v_result = $this->privMerge($v_object_archive);
+
+        // ----- Invalid variable
+        } else {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
+            $v_result = PCLZIP_ERR_INVALID_PARAMETER;
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : errorCode()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function errorCode()
+    {
+        if (PCLZIP_ERROR_EXTERNAL == 1) {
+            return (PclErrorCode());
+        } else {
+            return ($this->error_code);
+        }
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : errorName()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function errorName($p_with_code = false)
+    {
+        $v_name = array(
+            PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
+            PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
+            PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
+            PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
+            PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE',
+            PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG',
+            PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP',
+            PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE',
+            PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL',
+            PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION',
+            PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT',
+            PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL',
+            PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL',
+            PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM',
+            PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP',
+            PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE',
+            PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE',
+            PCLZIP_ERR_UNSUPPORTED_COMPRESSION => 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION',
+            PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION',
+            PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE',
+            PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION'
+        );
+
+        if (isset($v_name[$this->error_code])) {
+            $v_value = $v_name[$this->error_code];
+        } else {
+            $v_value = 'NoName';
+        }
+
+        if ($p_with_code) {
+            return ($v_value . ' (' . $this->error_code . ')');
+        } else {
+            return ($v_value);
+        }
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : errorInfo()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function errorInfo($p_full = false)
+    {
+        if (PCLZIP_ERROR_EXTERNAL == 1) {
+            return (PclErrorString());
+        } else {
+            if ($p_full) {
+                return ($this->errorName(true) . " : " . $this->error_string);
+            } else {
+                return ($this->error_string . " [code " . $this->error_code . "]");
+            }
+        }
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // ***** UNDER THIS LINE ARE DEFINED PRIVATE INTERNAL FUNCTIONS *****
+    // *****                                                        *****
+    // *****       THESES FUNCTIONS MUST NOT BE USED DIRECTLY       *****
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privCheckFormat()
+    // Description :
+    //   This method check that the archive exists and is a valid zip archive.
+    //   Several level of check exists. (futur)
+    // Parameters :
+    //   $p_level : Level of check. Default 0.
+    //              0 : Check the first bytes (magic codes) (default value))
+    //              1 : 0 + Check the central directory (futur)
+    //              2 : 1 + Check each file header (futur)
+    // Return Values :
+    //   true on success,
+    //   false on error, the error code is set.
+    // --------------------------------------------------------------------------------
+    public function privCheckFormat($p_level = 0)
+    {
+        $v_result = true;
+
+        // ----- Reset the file system cache
+        clearstatcache();
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Look if the file exits
+        if (!is_file($this->zipname)) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '" . $this->zipname . "'");
+
+            return (false);
+        }
+
+        // ----- Check that the file is readeable
+        if (!is_readable($this->zipname)) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '" . $this->zipname . "'");
+
+            return (false);
+        }
+
+        // ----- Check the magic code
+        // TBC
+
+        // ----- Check the central header
+        // TBC
+
+        // ----- Check each file header
+        // TBC
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privParseOptions()
+    // Description :
+    //   This internal methods reads the variable list of arguments ($p_options_list,
+    //   $p_size) and generate an array with the options and values ($v_result_list).
+    //   $v_requested_options contains the options that can be present and those that
+    //   must be present.
+    //   $v_requested_options is an array, with the option value as key, and 'optional',
+    //   or 'mandatory' as value.
+    // Parameters :
+    //   See above.
+    // Return Values :
+    //   1 on success.
+    //   0 on failure.
+    // --------------------------------------------------------------------------------
+    public function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options = false)
+    {
+        $v_result = 1;
+
+        // ----- Read the options
+        $i = 0;
+        while ($i < $p_size) {
+
+            // ----- Check if the option is supported
+            if (!isset($v_requested_options[$p_options_list[$i]])) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '" . $p_options_list[$i] . "' for this method");
 
                 // ----- Return
                 return PclZip::errorCode();
             }
 
-            // ----- Read the file header
-            $v_local_header = array();
-            if (($v_result = $this->privReadFileHeader($v_local_header)) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
+            // ----- Look for next option
+            switch ($p_options_list[$i]) {
+                // ----- Look for options that request a path value
+                case PCLZIP_OPT_PATH:
+                case PCLZIP_OPT_REMOVE_PATH:
+                case PCLZIP_OPT_ADD_PATH:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i + 1], false);
+                    $i++;
+                    break;
+
+                case PCLZIP_OPT_TEMP_FILE_THRESHOLD:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Check for incompatible options
+                    if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Check the value
+                    $v_value = $p_options_list[$i + 1];
+                    if ((!is_integer($v_value)) || ($v_value < 0)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value (and convert it in bytes)
+                    $v_result_list[$p_options_list[$i]] = $v_value * 1048576;
+                    $i++;
+                    break;
+
+                case PCLZIP_OPT_TEMP_FILE_ON:
+                    // ----- Check for incompatible options
+                    if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $v_result_list[$p_options_list[$i]] = true;
+                    break;
+
+                case PCLZIP_OPT_TEMP_FILE_OFF:
+                    // ----- Check for incompatible options
+                    if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_ON])) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");
+
+                        return PclZip::errorCode();
+                    }
+                    // ----- Check for incompatible options
+                    if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $v_result_list[$p_options_list[$i]] = true;
+                    break;
+
+                case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    if (is_string($p_options_list[$i + 1]) && ($p_options_list[$i + 1] != '')) {
+                        $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i + 1], false);
+                        $i++;
+                    } else {
+                    }
+                    break;
+
+                // ----- Look for options that request an array of string for value
+                case PCLZIP_OPT_BY_NAME:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    if (is_string($p_options_list[$i + 1])) {
+                        $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i + 1];
+                    } elseif (is_array($p_options_list[$i + 1])) {
+                        $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
+                    } else {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+                    $i++;
+                    break;
+
+                // ----- Look for options that request an EREG or PREG expression
+                case PCLZIP_OPT_BY_EREG:
+                    $p_options_list[$i] = PCLZIP_OPT_BY_PREG;
+                    // ereg() is deprecated starting with PHP 5.3. Move PCLZIP_OPT_BY_EREG
+                    // to PCLZIP_OPT_BY_PREG
+                case PCLZIP_OPT_BY_PREG:
+                    //case PCLZIP_OPT_CRYPT :
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    if (is_string($p_options_list[$i + 1])) {
+                        $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
+                    } else {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+                    $i++;
+                    break;
+
+                // ----- Look for options that takes a string
+                case PCLZIP_OPT_COMMENT:
+                case PCLZIP_OPT_ADD_COMMENT:
+                case PCLZIP_OPT_PREPEND_COMMENT:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    if (is_string($p_options_list[$i + 1])) {
+                        $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
+                    } else {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+                    $i++;
+                    break;
+
+                // ----- Look for options that request an array of index
+                case PCLZIP_OPT_BY_INDEX:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    $v_work_list = array();
+                    if (is_string($p_options_list[$i + 1])) {
+
+                        // ----- Remove spaces
+                        $p_options_list[$i + 1] = strtr($p_options_list[$i + 1], ' ', '');
+
+                        // ----- Parse items
+                        $v_work_list = explode(",", $p_options_list[$i + 1]);
+                    } elseif (is_integer($p_options_list[$i + 1])) {
+                        $v_work_list[0] = $p_options_list[$i + 1] . '-' . $p_options_list[$i + 1];
+                    } elseif (is_array($p_options_list[$i + 1])) {
+                        $v_work_list = $p_options_list[$i + 1];
+                    } else {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Reduce the index list
+                    // each index item in the list must be a couple with a start and
+                    // an end value : [0,3], [5-5], [8-10], ...
+                    // ----- Check the format of each item
+                    $v_sort_flag  = false;
+                    $v_sort_value = 0;
+                    for ($j = 0; $j < sizeof($v_work_list); $j++) {
+                        // ----- Explode the item
+                        $v_item_list      = explode("-", $v_work_list[$j]);
+                        $v_size_item_list = sizeof($v_item_list);
+
+                        // ----- TBC : Here we might check that each item is a
+                        // real integer ...
+
+                        // ----- Look for single value
+                        if ($v_size_item_list == 1) {
+                            // ----- Set the option value
+                            $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
+                            $v_result_list[$p_options_list[$i]][$j]['end']   = $v_item_list[0];
+                        } elseif ($v_size_item_list == 2) {
+                            // ----- Set the option value
+                            $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
+                            $v_result_list[$p_options_list[$i]][$j]['end']   = $v_item_list[1];
+                        } else {
+                            // ----- Error log
+                            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                            // ----- Return
+                            return PclZip::errorCode();
+                        }
+
+                        // ----- Look for list sort
+                        if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
+                            $v_sort_flag = true;
+
+                            // ----- TBC : An automatic sort should be writen ...
+                            // ----- Error log
+                            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                            // ----- Return
+                            return PclZip::errorCode();
+                        }
+                        $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
+                    }
+
+                    // ----- Sort the items
+                    if ($v_sort_flag) {
+                        // TBC : To Be Completed
+                    }
+
+                    // ----- Next option
+                    $i++;
+                    break;
+
+                // ----- Look for options that request no value
+                case PCLZIP_OPT_REMOVE_ALL_PATH:
+                case PCLZIP_OPT_EXTRACT_AS_STRING:
+                case PCLZIP_OPT_NO_COMPRESSION:
+                case PCLZIP_OPT_EXTRACT_IN_OUTPUT:
+                case PCLZIP_OPT_REPLACE_NEWER:
+                case PCLZIP_OPT_STOP_ON_ERROR:
+                    $v_result_list[$p_options_list[$i]] = true;
+                    break;
+
+                // ----- Look for options that request an octal value
+                case PCLZIP_OPT_SET_CHMOD:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
+                    $i++;
+                    break;
+
+                // ----- Look for options that request a call-back
+                case PCLZIP_CB_PRE_EXTRACT:
+                case PCLZIP_CB_POST_EXTRACT:
+                case PCLZIP_CB_PRE_ADD:
+                case PCLZIP_CB_POST_ADD:
+                    /* for futur use
+                    case PCLZIP_CB_PRE_DELETE :
+                    case PCLZIP_CB_POST_DELETE :
+                    case PCLZIP_CB_PRE_LIST :
+                    case PCLZIP_CB_POST_LIST :
+                    */
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    $v_function_name = $p_options_list[$i + 1];
+
+                    // ----- Check that the value is a valid existing function
+                    if (!function_exists($v_function_name)) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '" . $v_function_name . "()' is not an existing function for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Set the attribute
+                    $v_result_list[$p_options_list[$i]] = $v_function_name;
+                    $i++;
+                    break;
+
+                default:
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Unknown parameter '" . $p_options_list[$i] . "'");
+
+                    // ----- Return
+                    return PclZip::errorCode();
+            }
+
+            // ----- Next options
+            $i++;
+        }
+
+        // ----- Look for mandatory options
+        if ($v_requested_options !== false) {
+            for ($key = reset($v_requested_options); $key = key($v_requested_options); $key = next($v_requested_options)) {
+                // ----- Look for mandatory option
+                if ($v_requested_options[$key] == 'mandatory') {
+                    // ----- Look if present
+                    if (!isset($v_result_list[$key])) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter " . PclZipUtilOptionText($key) . "(" . $key . ")");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+                }
+            }
+        }
+
+        // ----- Look for default values
+        if (!isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
+
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privOptionDefaultThreshold()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privOptionDefaultThreshold(&$p_options)
+    {
+        $v_result = 1;
+
+        if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]) || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
+            return $v_result;
+        }
+
+        // ----- Get 'memory_limit' configuration value
+        $v_memory_limit = ini_get('memory_limit');
+        $v_memory_limit = trim($v_memory_limit);
+        $last           = strtolower(substr($v_memory_limit, -1));
+        $v_memory_limit = preg_replace('/\s*[KkMmGg]$/', '', $v_memory_limit);
+
+        if ($last == 'g') {
+            //$v_memory_limit = $v_memory_limit*1024*1024*1024;
+            $v_memory_limit = $v_memory_limit * 1073741824;
+        }
+        if ($last == 'm') {
+            //$v_memory_limit = $v_memory_limit*1024*1024;
+            $v_memory_limit = $v_memory_limit * 1048576;
+        }
+        if ($last == 'k') {
+            $v_memory_limit = $v_memory_limit * 1024;
+        }
+
+        $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit * PCLZIP_TEMPORARY_FILE_RATIO);
+
+        // ----- Sanity check : No threshold if value lower than 1M
+        if ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] < 1048576) {
+            unset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]);
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privFileDescrParseAtt()
+    // Description :
+    // Parameters :
+    // Return Values :
+    //   1 on success.
+    //   0 on failure.
+    // --------------------------------------------------------------------------------
+    public function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options = false)
+    {
+        $v_result = 1;
+
+        // ----- For each file in the list check the attributes
+        foreach ($p_file_list as $v_key => $v_value) {
+
+            // ----- Check if the option is supported
+            if (!isset($v_requested_options[$v_key])) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '" . $v_key . "' for this file");
 
                 // ----- Return
-                return $v_result;
+                return PclZip::errorCode();
             }
-            
-            // ----- Check that local file header is same as central file header
-            if ($this->privCheckFileHeaders($v_local_header,
-			                                $v_header_list[$i]) != 1) {
-                // TBC
-            }
-            unset($v_local_header);
 
-            // ----- Write the file header
-            if (($v_result = $v_temp_zip->privWriteFileHeader($v_header_list[$i])) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
+            // ----- Look for attribute
+            switch ($v_key) {
+                case PCLZIP_ATT_FILE_NAME:
+                    if (!is_string($v_value)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
+
+                    if ($p_filedescr['filename'] == '') {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    break;
+
+                case PCLZIP_ATT_FILE_NEW_SHORT_NAME:
+                    if (!is_string($v_value)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
+
+                    if ($p_filedescr['new_short_name'] == '') {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+                    break;
+
+                case PCLZIP_ATT_FILE_NEW_FULL_NAME:
+                    if (!is_string($v_value)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
+
+                    if ($p_filedescr['new_full_name'] == '') {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+                    break;
+
+                // ----- Look for options that takes a string
+                case PCLZIP_ATT_FILE_COMMENT:
+                    if (!is_string($v_value)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $p_filedescr['comment'] = $v_value;
+                    break;
+
+                case PCLZIP_ATT_FILE_MTIME:
+                    if (!is_integer($v_value)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". Integer expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $p_filedescr['mtime'] = $v_value;
+                    break;
+
+                case PCLZIP_ATT_FILE_CONTENT:
+                    $p_filedescr['content'] = $v_value;
+                    break;
+
+                default:
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Unknown parameter '" . $v_key . "'");
+
+                    // ----- Return
+                    return PclZip::errorCode();
+            }
+
+            // ----- Look for mandatory options
+            if ($v_requested_options !== false) {
+                for ($key = reset($v_requested_options); $key = key($v_requested_options); $key = next($v_requested_options)) {
+                    // ----- Look for mandatory option
+                    if ($v_requested_options[$key] == 'mandatory') {
+                        // ----- Look if present
+                        if (!isset($p_file_list[$key])) {
+                            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter " . PclZipUtilOptionText($key) . "(" . $key . ")");
+
+                            return PclZip::errorCode();
+                        }
+                    }
+                }
+            }
+
+            // end foreach
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privFileDescrExpand()
+    // Description :
+    //   This method look for each item of the list to see if its a file, a folder
+    //   or a string to be added as file. For any other type of files (link, other)
+    //   just ignore the item.
+    //   Then prepare the information that will be stored for that file.
+    //   When its a folder, expand the folder with all the files that are in that
+    //   folder (recursively).
+    // Parameters :
+    // Return Values :
+    //   1 on success.
+    //   0 on failure.
+    // --------------------------------------------------------------------------------
+    public function privFileDescrExpand(&$p_filedescr_list, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Create a result list
+        $v_result_list = array();
+
+        // ----- Look each entry
+        for ($i = 0; $i < sizeof($p_filedescr_list); $i++) {
+
+            // ----- Get filedescr
+            $v_descr = $p_filedescr_list[$i];
+
+            // ----- Reduce the filename
+            $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename'], false);
+            $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
+
+            // ----- Look for real file or folder
+            if (file_exists($v_descr['filename'])) {
+                if (@is_file($v_descr['filename'])) {
+                    $v_descr['type'] = 'file';
+                } elseif (@is_dir($v_descr['filename'])) {
+                    $v_descr['type'] = 'folder';
+                } elseif (@is_link($v_descr['filename'])) {
+                    // skip
+                    continue;
+                } else {
+                    // skip
+                    continue;
+                }
+
+            // ----- Look for string added as file
+            } elseif (isset($v_descr['content'])) {
+                $v_descr['type'] = 'virtual_file';
+
+            // ----- Missing file
+            } else {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '" . $v_descr['filename'] . "' does not exist");
 
                 // ----- Return
-                return $v_result;
+                return PclZip::errorCode();
             }
 
-            // ----- Read/write the data block
-            if (($v_result = PclZipUtilCopyBlock($this->zip_fd, $v_temp_zip->zip_fd, $v_header_list[$i]['compressed_size'])) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
+            // ----- Calculate the stored filename
+            $this->privCalculateStoredFilename($v_descr, $p_options);
 
-                // ----- Return
-                return $v_result;
+            // ----- Add the descriptor in result list
+            $v_result_list[sizeof($v_result_list)] = $v_descr;
+
+            // ----- Look for folder
+            if ($v_descr['type'] == 'folder') {
+                // ----- List of items in folder
+                $v_dirlist_descr = array();
+                $v_dirlist_nb    = 0;
+                if ($v_folder_handler = @opendir($v_descr['filename'])) {
+                    while (($v_item_handler = @readdir($v_folder_handler)) !== false) {
+
+                        // ----- Skip '.' and '..'
+                        if (($v_item_handler == '.') || ($v_item_handler == '..')) {
+                            continue;
+                        }
+
+                        // ----- Compose the full filename
+                        $v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'] . '/' . $v_item_handler;
+
+                        // ----- Look for different stored filename
+                        // Because the name of the folder was changed, the name of the
+                        // files/sub-folders also change
+                        if (($v_descr['stored_filename'] != $v_descr['filename']) && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
+                            if ($v_descr['stored_filename'] != '') {
+                                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'] . '/' . $v_item_handler;
+                            } else {
+                                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
+                            }
+                        }
+
+                        $v_dirlist_nb++;
+                    }
+
+                    @closedir($v_folder_handler);
+                } else {
+                    // TBC : unable to open folder in read mode
+                }
+
+                // ----- Expand each element of the list
+                if ($v_dirlist_nb != 0) {
+                    // ----- Expand
+                    if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, $p_options)) != 1) {
+                        return $v_result;
+                    }
+
+                    // ----- Concat the resulting list
+                    $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
+                } else {
+                }
+
+                // ----- Free local array
+                unset($v_dirlist_descr);
             }
         }
 
+        // ----- Get the result list
+        $p_filedescr_list = $v_result_list;
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privCreate()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
+    {
+        $v_result      = 1;
+        $v_list_detail = array();
+
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Open the file in write mode
+        if (($v_result = $this->privOpenFd('wb')) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Add the list of files
+        $v_result = $this->privAddList($p_filedescr_list, $p_result_list, $p_options);
+
+        // ----- Close
+        $this->privCloseFd();
+
+        // ----- Magic quotes trick
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privAdd()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
+    {
+        $v_result      = 1;
+        $v_list_detail = array();
+
+        // ----- Look if the archive exists or is empty
+        if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0)) {
+
+            // ----- Do a create
+            $v_result = $this->privCreate($p_filedescr_list, $p_result_list, $p_options);
+
+            // ----- Return
+            return $v_result;
+        }
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Open the zip file
+        if (($v_result = $this->privOpenFd('rb')) != 1) {
+            // ----- Magic quotes trick
+            $this->privSwapBackMagicQuotes();
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir = array();
+        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+
+            return $v_result;
+        }
+
+        // ----- Go to beginning of File
+        @rewind($this->zip_fd);
+
+        // ----- Creates a temporay file
+        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.tmp';
+
+        // ----- Open the temporary file in write mode
+        if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0) {
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_zip_temp_name . '\' in binary write mode');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Copy the files from the archive to the temporary file
+        // TBC : Here I should better append the file and go back to erase the central dir
+        $v_size = $v_central_dir['offset'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = fread($this->zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Swap the file descriptor
+        // Here is a trick : I swap the temporary fd with the zip fd, in order to use
+        // the following methods on the temporary fil and not the real archive
+        $v_swap        = $this->zip_fd;
+        $this->zip_fd  = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
+
+        // ----- Add the files
+        $v_header_list = array();
+        if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1) {
+            fclose($v_zip_temp_fd);
+            $this->privCloseFd();
+            @unlink($v_zip_temp_name);
+            $this->privSwapBackMagicQuotes();
+
+            // ----- Return
+            return $v_result;
+        }
+
         // ----- Store the offset of the central dir
-        $v_offset = @ftell($v_temp_zip->zip_fd);
+        $v_offset = @ftell($this->zip_fd);
 
-        // ----- Re-Create the Central Dir files header
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
+        // ----- Copy the block of file headers from the old archive
+        $v_size = $v_central_dir['size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($v_zip_temp_fd, $v_read_size);
+            @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Create the Central Dir files header
+        for ($i = 0, $v_count = 0; $i < sizeof($v_header_list); $i++) {
             // ----- Create the file header
-            if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-                $v_temp_zip->privCloseFd();
-                $this->privCloseFd();
-                @unlink($v_zip_temp_name);
+            if ($v_header_list[$i]['status'] == 'ok') {
+                if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+                    fclose($v_zip_temp_fd);
+                    $this->privCloseFd();
+                    @unlink($v_zip_temp_name);
+                    $this->privSwapBackMagicQuotes();
 
-                // ----- Return
-                return $v_result;
+                    // ----- Return
+                    return $v_result;
+                }
+                $v_count++;
             }
 
             // ----- Transform the header to a 'usable' info
-            $v_temp_zip->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+            $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
         }
 
-
         // ----- Zip file comment
-        $v_comment = '';
+        $v_comment = $v_central_dir['comment'];
         if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-          $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+            $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+        }
+        if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) {
+            $v_comment = $v_comment . $p_options[PCLZIP_OPT_ADD_COMMENT];
+        }
+        if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) {
+            $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT] . $v_comment;
         }
 
         // ----- Calculate the size of the central header
-        $v_size = @ftell($v_temp_zip->zip_fd)-$v_offset;
+        $v_size = @ftell($this->zip_fd) - $v_offset;
 
         // ----- Create the central dir footer
-        if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
+        if (($v_result = $this->privWriteCentralHeader($v_count + $v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1) {
             // ----- Reset the file list
             unset($v_header_list);
-            $v_temp_zip->privCloseFd();
-            $this->privCloseFd();
-            @unlink($v_zip_temp_name);
+            $this->privSwapBackMagicQuotes();
 
             // ----- Return
             return $v_result;
         }
 
+        // ----- Swap back the file descriptor
+        $v_swap        = $this->zip_fd;
+        $this->zip_fd  = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
+
         // ----- Close
-        $v_temp_zip->privCloseFd();
         $this->privCloseFd();
 
+        // ----- Close the temporary file
+        @fclose($v_zip_temp_fd);
+
+        // ----- Magic quotes trick
+        $this->privSwapBackMagicQuotes();
+
         // ----- Delete the zip file
         // TBC : I should test the result ...
         @unlink($this->zipname);
@@ -4952,545 +2268,2965 @@
         // TBC : I should test the result ...
         //@rename($v_zip_temp_name, $this->zipname);
         PclZipUtilRename($v_zip_temp_name, $this->zipname);
-    
-        // ----- Destroy the temporary archive
-        unset($v_temp_zip);
+
+        // ----- Return
+        return $v_result;
     }
-    
-    // ----- Remove every files : reset the file
-    else if ($v_central_dir['entries'] != 0) {
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privOpenFd()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function privOpenFd($p_mode)
+    {
+        $v_result = 1;
+
+        // ----- Look if already open
+        if ($this->zip_fd != 0) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \'' . $this->zipname . '\' already open');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Open the zip file
+        if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in ' . $p_mode . ' mode');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privCloseFd()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function privCloseFd()
+    {
+        $v_result = 1;
+
+        if ($this->zip_fd != 0) {
+            @fclose($this->zip_fd);
+        }
+        $this->zip_fd = 0;
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privAddList()
+    // Description :
+    //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
+    //   different from the real path of the file. This is usefull if you want to have PclTar
+    //   running in any directory, and memorize relative path from an other directory.
+    // Parameters :
+    //   $p_list : An array containing the file or directory names to add in the tar
+    //   $p_result_list : list of added files with their properties (specially the status field)
+    //   $p_add_dir : Path to add in the filename path archived
+    //   $p_remove_dir : Path to remove in the filename path archived
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    //  function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
+    public function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Add the files
+        $v_header_list = array();
+        if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Store the offset of the central dir
+        $v_offset = @ftell($this->zip_fd);
+
+        // ----- Create the Central Dir files header
+        for ($i = 0, $v_count = 0; $i < sizeof($v_header_list); $i++) {
+            // ----- Create the file header
+            if ($v_header_list[$i]['status'] == 'ok') {
+                if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+                    // ----- Return
+                    return $v_result;
+                }
+                $v_count++;
+            }
+
+            // ----- Transform the header to a 'usable' info
+            $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+        }
+
+        // ----- Zip file comment
+        $v_comment = '';
+        if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+            $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+        }
+
+        // ----- Calculate the size of the central header
+        $v_size = @ftell($this->zip_fd) - $v_offset;
+
+        // ----- Create the central dir footer
+        if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1) {
+            // ----- Reset the file list
+            unset($v_header_list);
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privAddFileList()
+    // Description :
+    // Parameters :
+    //   $p_filedescr_list : An array containing the file description
+    //                      or directory names to add in the zip
+    //   $p_result_list : list of added files with their properties (specially the status field)
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
+    {
+        $v_result = 1;
+        $v_header = array();
+
+        // ----- Recuperate the current number of elt in list
+        $v_nb = sizeof($p_result_list);
+
+        // ----- Loop on the files
+        for ($j = 0; ($j < sizeof($p_filedescr_list)) && ($v_result == 1); $j++) {
+            // ----- Format the filename
+            $p_filedescr_list[$j]['filename'] = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
+
+            // ----- Skip empty file names
+            // TBC : Can this be possible ? not checked in DescrParseAtt ?
+            if ($p_filedescr_list[$j]['filename'] == "") {
+                continue;
+            }
+
+            // ----- Check the filename
+            if (($p_filedescr_list[$j]['type'] != 'virtual_file') && (!file_exists($p_filedescr_list[$j]['filename']))) {
+                PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '" . $p_filedescr_list[$j]['filename'] . "' does not exist");
+
+                return PclZip::errorCode();
+            }
+
+            // ----- Look if it is a file or a dir with no all path remove option
+            // or a dir with all its path removed
+            //      if (   (is_file($p_filedescr_list[$j]['filename']))
+            //          || (   is_dir($p_filedescr_list[$j]['filename'])
+            if (($p_filedescr_list[$j]['type'] == 'file') || ($p_filedescr_list[$j]['type'] == 'virtual_file') || (($p_filedescr_list[$j]['type'] == 'folder') && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]) || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
+
+                // ----- Add the file
+                $v_result = $this->privAddFile($p_filedescr_list[$j], $v_header, $p_options);
+                if ($v_result != 1) {
+                    return $v_result;
+                }
+
+                // ----- Store the file infos
+                $p_result_list[$v_nb++] = $v_header;
+            }
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privAddFile()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privAddFile($p_filedescr, &$p_header, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Working variable
+        $p_filename = $p_filedescr['filename'];
+
+        // TBC : Already done in the fileAtt check ... ?
+        if ($p_filename == "") {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Look for a stored different filename
+        /* TBC : Removed
+        if (isset($p_filedescr['stored_filename'])) {
+        $v_stored_filename = $p_filedescr['stored_filename'];
+        } else {
+        $v_stored_filename = $p_filedescr['stored_filename'];
+        }
+        */
+
+        // ----- Set the file properties
+        clearstatcache();
+        $p_header['version']           = 20;
+        $p_header['version_extracted'] = 10;
+        $p_header['flag']              = 0;
+        $p_header['compression']       = 0;
+        $p_header['crc']               = 0;
+        $p_header['compressed_size']   = 0;
+        $p_header['filename_len']      = strlen($p_filename);
+        $p_header['extra_len']         = 0;
+        $p_header['disk']              = 0;
+        $p_header['internal']          = 0;
+        $p_header['offset']            = 0;
+        $p_header['filename']          = $p_filename;
+        // TBC : Removed    $p_header['stored_filename'] = $v_stored_filename;
+        $p_header['stored_filename']   = $p_filedescr['stored_filename'];
+        $p_header['extra']             = '';
+        $p_header['status']            = 'ok';
+        $p_header['index']             = -1;
+
+        // ----- Look for regular file
+        if ($p_filedescr['type'] == 'file') {
+            $p_header['external'] = 0x00000000;
+            $p_header['size']     = filesize($p_filename);
+
+        // ----- Look for regular folder
+        } elseif ($p_filedescr['type'] == 'folder') {
+            $p_header['external'] = 0x00000010;
+            $p_header['mtime']    = filemtime($p_filename);
+            $p_header['size']     = filesize($p_filename);
+
+        // ----- Look for virtual file
+        } elseif ($p_filedescr['type'] == 'virtual_file') {
+            $p_header['external'] = 0x00000000;
+            $p_header['size']     = strlen($p_filedescr['content']);
+        }
+
+        // ----- Look for filetime
+        if (isset($p_filedescr['mtime'])) {
+            $p_header['mtime'] = $p_filedescr['mtime'];
+        } elseif ($p_filedescr['type'] == 'virtual_file') {
+            $p_header['mtime'] = time();
+        } else {
+            $p_header['mtime'] = filemtime($p_filename);
+        }
+
+        // ------ Look for file comment
+        if (isset($p_filedescr['comment'])) {
+            $p_header['comment_len'] = strlen($p_filedescr['comment']);
+            $p_header['comment']     = $p_filedescr['comment'];
+        } else {
+            $p_header['comment_len'] = 0;
+            $p_header['comment']     = '';
+        }
+
+        // ----- Look for pre-add callback
+        if (isset($p_options[PCLZIP_CB_PRE_ADD])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_header, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_ADD].'(PCLZIP_CB_PRE_ADD, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_PRE_ADD](PCLZIP_CB_PRE_ADD, $v_local_header);
+            if ($v_result == 0) {
+                // ----- Change the file status
+                $p_header['status'] = "skipped";
+                $v_result           = 1;
+            }
+
+            // ----- Update the informations
+            // Only some fields can be modified
+            if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
+                $p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
+            }
+        }
+
+        // ----- Look for empty stored filename
+        if ($p_header['stored_filename'] == "") {
+            $p_header['status'] = "filtered";
+        }
+
+        // ----- Check the path length
+        if (strlen($p_header['stored_filename']) > 0xFF) {
+            $p_header['status'] = 'filename_too_long';
+        }
+
+        // ----- Look if no error, or file not skipped
+        if ($p_header['status'] == 'ok') {
+
+            // ----- Look for a file
+            if ($p_filedescr['type'] == 'file') {
+                // ----- Look for using temporary file to zip
+                if ((!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON]) || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]) && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])))) {
+                    $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);
+                    if ($v_result < PCLZIP_ERR_NO_ERROR) {
+                        return $v_result;
+                    }
+
+                // ----- Use "in memory" zip algo
+                } else {
+
+                    // ----- Open the source file
+                    if (($v_file = @fopen($p_filename, "rb")) == 0) {
+                        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
+
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Read the file content
+                    $v_content = @fread($v_file, $p_header['size']);
+
+                    // ----- Close the file
+                    @fclose($v_file);
+
+                    // ----- Calculate the CRC
+                    $p_header['crc'] = @crc32($v_content);
+
+                    // ----- Look for no compression
+                    if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
+                        // ----- Set header parameters
+                        $p_header['compressed_size'] = $p_header['size'];
+                        $p_header['compression']     = 0;
+
+                    // ----- Look for normal compression
+                    } else {
+                        // ----- Compress the content
+                        $v_content = @gzdeflate($v_content);
+
+                        // ----- Set header parameters
+                        $p_header['compressed_size'] = strlen($v_content);
+                        $p_header['compression']     = 8;
+                    }
+
+                    // ----- Call the header generation
+                    if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+                        @fclose($v_file);
+
+                        return $v_result;
+                    }
+
+                    // ----- Write the compressed (or not) content
+                    @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
+
+                }
+
+            // ----- Look for a virtual file (a file from string)
+            } elseif ($p_filedescr['type'] == 'virtual_file') {
+
+                $v_content = $p_filedescr['content'];
+
+                // ----- Calculate the CRC
+                $p_header['crc'] = @crc32($v_content);
+
+                // ----- Look for no compression
+                if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
+                    // ----- Set header parameters
+                    $p_header['compressed_size'] = $p_header['size'];
+                    $p_header['compression']     = 0;
+
+                // ----- Look for normal compression
+                } else {
+                    // ----- Compress the content
+                    $v_content = @gzdeflate($v_content);
+
+                    // ----- Set header parameters
+                    $p_header['compressed_size'] = strlen($v_content);
+                    $p_header['compression']     = 8;
+                }
+
+                // ----- Call the header generation
+                if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+                    @fclose($v_file);
+
+                    return $v_result;
+                }
+
+                // ----- Write the compressed (or not) content
+                @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
+
+            // ----- Look for a directory
+            } elseif ($p_filedescr['type'] == 'folder') {
+                // ----- Look for directory last '/'
+                if (@substr($p_header['stored_filename'], -1) != '/') {
+                    $p_header['stored_filename'] .= '/';
+                }
+
+                // ----- Set the file properties
+                $p_header['size']     = 0;
+                //$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
+                $p_header['external'] = 0x00000010; // Value for a folder : to be checked
+
+                // ----- Call the header generation
+                if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+                    return $v_result;
+                }
+            }
+        }
+
+        // ----- Look for post-add callback
+        if (isset($p_options[PCLZIP_CB_POST_ADD])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_header, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_ADD].'(PCLZIP_CB_POST_ADD, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_POST_ADD](PCLZIP_CB_POST_ADD, $v_local_header);
+            if ($v_result == 0) {
+                // ----- Ignored
+                $v_result = 1;
+            }
+
+            // ----- Update the informations
+            // Nothing can be modified
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privAddFileUsingTempFile()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
+    {
+        $v_result = PCLZIP_ERR_NO_ERROR;
+
+        // ----- Working variable
+        $p_filename = $p_filedescr['filename'];
+
+        // ----- Open the source file
+        if (($v_file = @fopen($p_filename, "rb")) == 0) {
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Creates a compressed temporary file
+        $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.gz';
+        if (($v_file_compressed = @gzopen($v_gzip_temp_name, "wb")) == 0) {
+            fclose($v_file);
+            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary write mode');
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+        $v_size = filesize($p_filename);
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($v_file, $v_read_size);
+            //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+            @gzputs($v_file_compressed, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Close the file
+        @fclose($v_file);
+        @gzclose($v_file_compressed);
+
+        // ----- Check the minimum file size
+        if (filesize($v_gzip_temp_name) < 18) {
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \'' . $v_gzip_temp_name . '\' has invalid filesize - should be minimum 18 bytes');
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Extract the compressed attributes
+        if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary read mode');
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the gzip file header
+        $v_binary_data = @fread($v_file_compressed, 10);
+        $v_data_header = unpack('a1id1/a1id2/a1cm/a1flag/Vmtime/a1xfl/a1os', $v_binary_data);
+
+        // ----- Check some parameters
+        $v_data_header['os'] = bin2hex($v_data_header['os']);
+
+        // ----- Read the gzip file footer
+        @fseek($v_file_compressed, filesize($v_gzip_temp_name) - 8);
+        $v_binary_data = @fread($v_file_compressed, 8);
+        $v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);
+
+        // ----- Set the attributes
+        $p_header['compression']     = ord($v_data_header['cm']);
+        //$p_header['mtime'] = $v_data_header['mtime'];
+        $p_header['crc']             = $v_data_footer['crc'];
+        $p_header['compressed_size'] = filesize($v_gzip_temp_name) - 18;
+
+        // ----- Close the file
+        @fclose($v_file_compressed);
+
+        // ----- Call the header generation
+        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+            return $v_result;
+        }
+
+        // ----- Add the compressed data
+        if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary read mode');
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+        fseek($v_file_compressed, 10);
+        $v_size = $p_header['compressed_size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($v_file_compressed, $v_read_size);
+            //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+            @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Close the file
+        @fclose($v_file_compressed);
+
+        // ----- Unlink the temporary file
+        @unlink($v_gzip_temp_name);
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privCalculateStoredFilename()
+    // Description :
+    //   Based on file descriptor properties and global options, this method
+    //   calculate the filename that will be stored in the archive.
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privCalculateStoredFilename(&$p_filedescr, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Working variables
+        $p_filename = $p_filedescr['filename'];
+        if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
+            $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
+        } else {
+            $p_add_dir = '';
+        }
+        if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
+            $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
+        } else {
+            $p_remove_dir = '';
+        }
+        if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+            $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+        } else {
+            $p_remove_all_dir = 0;
+        }
+
+        // ----- Look for full name change
+        if (isset($p_filedescr['new_full_name'])) {
+            // ----- Remove drive letter if any
+            $v_stored_filename = PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);
+
+        // ----- Look for path and/or short name change
+        } else {
+
+            // ----- Look for short name change
+            // Its when we cahnge just the filename but not the path
+            if (isset($p_filedescr['new_short_name'])) {
+                $v_path_info = pathinfo($p_filename);
+                $v_dir       = '';
+                if ($v_path_info['dirname'] != '') {
+                    $v_dir = $v_path_info['dirname'] . '/';
+                }
+                $v_stored_filename = $v_dir . $p_filedescr['new_short_name'];
+            } else {
+                // ----- Calculate the stored filename
+                $v_stored_filename = $p_filename;
+            }
+
+            // ----- Look for all path to remove
+            if ($p_remove_all_dir) {
+                $v_stored_filename = basename($p_filename);
+
+            // ----- Look for partial path remove
+            } elseif ($p_remove_dir != "") {
+                if (substr($p_remove_dir, -1) != '/') {
+                    $p_remove_dir .= "/";
+                }
+
+                if ((substr($p_filename, 0, 2) == "./") || (substr($p_remove_dir, 0, 2) == "./")) {
+
+                    if ((substr($p_filename, 0, 2) == "./") && (substr($p_remove_dir, 0, 2) != "./")) {
+                        $p_remove_dir = "./" . $p_remove_dir;
+                    }
+                    if ((substr($p_filename, 0, 2) != "./") && (substr($p_remove_dir, 0, 2) == "./")) {
+                        $p_remove_dir = substr($p_remove_dir, 2);
+                    }
+                }
+
+                $v_compare = PclZipUtilPathInclusion($p_remove_dir, $v_stored_filename);
+                if ($v_compare > 0) {
+                    if ($v_compare == 2) {
+                        $v_stored_filename = "";
+                    } else {
+                        $v_stored_filename = substr($v_stored_filename, strlen($p_remove_dir));
+                    }
+                }
+            }
+
+            // ----- Remove drive letter if any
+            $v_stored_filename = PclZipUtilTranslateWinPath($v_stored_filename);
+
+            // ----- Look for path to add
+            if ($p_add_dir != "") {
+                if (substr($p_add_dir, -1) == "/") {
+                    $v_stored_filename = $p_add_dir . $v_stored_filename;
+                } else {
+                    $v_stored_filename = $p_add_dir . "/" . $v_stored_filename;
+                }
+            }
+        }
+
+        // ----- Filename (reduce the path of stored name)
+        $v_stored_filename              = PclZipUtilPathReduction($v_stored_filename);
+        $p_filedescr['stored_filename'] = $v_stored_filename;
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privWriteFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privWriteFileHeader(&$p_header)
+    {
+        $v_result = 1;
+
+        // ----- Store the offset position of the file
+        $p_header['offset'] = ftell($this->zip_fd);
+
+        // ----- Transform UNIX mtime to DOS format mdate/mtime
+        $v_date  = getdate($p_header['mtime']);
+        $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
+        $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
+
+        // ----- Packed data
+        $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50, $p_header['version_extracted'], $p_header['flag'], $p_header['compression'], $v_mtime, $v_mdate, $p_header['crc'], $p_header['compressed_size'], $p_header['size'], strlen($p_header['stored_filename']), $p_header['extra_len']);
+
+        // ----- Write the first 148 bytes of the header in the archive
+        fputs($this->zip_fd, $v_binary_data, 30);
+
+        // ----- Write the variable fields
+        if (strlen($p_header['stored_filename']) != 0) {
+            fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
+        }
+        if ($p_header['extra_len'] != 0) {
+            fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privWriteCentralFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privWriteCentralFileHeader(&$p_header)
+    {
+        $v_result = 1;
+
+        // TBC
+        //for (reset($p_header); $key = key($p_header); next($p_header)) {
+        //}
+
+        // ----- Transform UNIX mtime to DOS format mdate/mtime
+        $v_date  = getdate($p_header['mtime']);
+        $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
+        $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
+
+        // ----- Packed data
+        $v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50, $p_header['version'], $p_header['version_extracted'], $p_header['flag'], $p_header['compression'], $v_mtime, $v_mdate, $p_header['crc'], $p_header['compressed_size'], $p_header['size'], strlen($p_header['stored_filename']), $p_header['extra_len'], $p_header['comment_len'], $p_header['disk'], $p_header['internal'], $p_header['external'], $p_header['offset']);
+
+        // ----- Write the 42 bytes of the header in the zip file
+        fputs($this->zip_fd, $v_binary_data, 46);
+
+        // ----- Write the variable fields
+        if (strlen($p_header['stored_filename']) != 0) {
+            fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
+        }
+        if ($p_header['extra_len'] != 0) {
+            fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
+        }
+        if ($p_header['comment_len'] != 0) {
+            fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']);
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privWriteCentralHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
+    {
+        $v_result = 1;
+
+        // ----- Packed data
+        $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries, $p_nb_entries, $p_size, $p_offset, strlen($p_comment));
+
+        // ----- Write the 22 bytes of the header in the zip file
+        fputs($this->zip_fd, $v_binary_data, 22);
+
+        // ----- Write the variable fields
+        if (strlen($p_comment) != 0) {
+            fputs($this->zip_fd, $p_comment, strlen($p_comment));
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privList()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privList(&$p_list)
+    {
+        $v_result = 1;
+
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Open the zip file
+        if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0) {
+            // ----- Magic quotes trick
+            $this->privSwapBackMagicQuotes();
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in binary read mode');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir = array();
+        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+            $this->privSwapBackMagicQuotes();
+
+            return $v_result;
+        }
+
+        // ----- Go to beginning of Central Dir
+        @rewind($this->zip_fd);
+        if (@fseek($this->zip_fd, $v_central_dir['offset'])) {
+            $this->privSwapBackMagicQuotes();
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Read each entry
+        for ($i = 0; $i < $v_central_dir['entries']; $i++) {
+            // ----- Read the file header
+            if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1) {
+                $this->privSwapBackMagicQuotes();
+
+                return $v_result;
+            }
+            $v_header['index'] = $i;
+
+            // ----- Get the only interesting attributes
+            $this->privConvertHeader2FileInfo($v_header, $p_list[$i]);
+            unset($v_header);
+        }
+
+        // ----- Close the zip file
         $this->privCloseFd();
 
+        // ----- Magic quotes trick
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privConvertHeader2FileInfo()
+    // Description :
+    //   This function takes the file informations from the central directory
+    //   entries and extract the interesting parameters that will be given back.
+    //   The resulting file infos are set in the array $p_info
+    //     $p_info['filename'] : Filename with full path. Given by user (add),
+    //                           extracted in the filesystem (extract).
+    //     $p_info['stored_filename'] : Stored filename in the archive.
+    //     $p_info['size'] = Size of the file.
+    //     $p_info['compressed_size'] = Compressed size of the file.
+    //     $p_info['mtime'] = Last modification date of the file.
+    //     $p_info['comment'] = Comment associated with the file.
+    //     $p_info['folder'] = true/false : indicates if the entry is a folder or not.
+    //     $p_info['status'] = status of the action on the file.
+    //     $p_info['crc'] = CRC of the file content.
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privConvertHeader2FileInfo($p_header, &$p_info)
+    {
+        $v_result = 1;
+
+        // ----- Get the interesting attributes
+        $v_temp_path               = PclZipUtilPathReduction($p_header['filename']);
+        $p_info['filename']        = $v_temp_path;
+        $v_temp_path               = PclZipUtilPathReduction($p_header['stored_filename']);
+        $p_info['stored_filename'] = $v_temp_path;
+        $p_info['size']            = $p_header['size'];
+        $p_info['compressed_size'] = $p_header['compressed_size'];
+        $p_info['mtime']           = $p_header['mtime'];
+        $p_info['comment']         = $p_header['comment'];
+        $p_info['folder']          = (($p_header['external'] & 0x00000010) == 0x00000010);
+        $p_info['index']           = $p_header['index'];
+        $p_info['status']          = $p_header['status'];
+        $p_info['crc']             = $p_header['crc'];
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privExtractByRule()
+    // Description :
+    //   Extract a file or directory depending of rules (by index, by name, ...)
+    // Parameters :
+    //   $p_file_list : An array where will be placed the properties of each
+    //                  extracted file
+    //   $p_path : Path to add while writing the extracted files
+    //   $p_remove_path : Path to remove (from the file memorized path) while writing the
+    //                    extracted files. If the path does not match the file path,
+    //                    the file is extracted with its memorized path.
+    //                    $p_remove_path does not apply to 'list' mode.
+    //                    $p_path and $p_remove_path are commulative.
+    // Return Values :
+    //   1 on success,0 or less on error (see error code list)
+    // --------------------------------------------------------------------------------
+    public function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Check the path
+        if (($p_path == "") || ((substr($p_path, 0, 1) != "/") && (substr($p_path, 0, 3) != "../") && (substr($p_path, 1, 2) != ":/"))) {
+            $p_path = "./" . $p_path;
+        }
+
+        // ----- Reduce the path last (and duplicated) '/'
+        if (($p_path != "./") && ($p_path != "/")) {
+            // ----- Look for the path end '/'
+            while (substr($p_path, -1) == "/") {
+                $p_path = substr($p_path, 0, strlen($p_path) - 1);
+            }
+        }
+
+        // ----- Look for path to remove format (should end by /)
+        if (($p_remove_path != "") && (substr($p_remove_path, -1) != '/')) {
+            $p_remove_path .= '/';
+        }
+        $p_remove_path_size = strlen($p_remove_path);
+
+        // ----- Open the zip file
+        if (($v_result = $this->privOpenFd('rb')) != 1) {
+            $this->privSwapBackMagicQuotes();
+
+            return $v_result;
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir = array();
+        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+            // ----- Close the zip file
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+
+            return $v_result;
+        }
+
+        // ----- Start at beginning of Central Dir
+        $v_pos_entry = $v_central_dir['offset'];
+
+        // ----- Read each entry
+        $j_start = 0;
+        for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++) {
+
+            // ----- Read next Central dir entry
+            @rewind($this->zip_fd);
+            if (@fseek($this->zip_fd, $v_pos_entry)) {
+                // ----- Close the zip file
+                $this->privCloseFd();
+                $this->privSwapBackMagicQuotes();
+
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+
+            // ----- Read the file header
+            $v_header = array();
+            if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1) {
+                // ----- Close the zip file
+                $this->privCloseFd();
+                $this->privSwapBackMagicQuotes();
+
+                return $v_result;
+            }
+
+            // ----- Store the index
+            $v_header['index'] = $i;
+
+            // ----- Store the file position
+            $v_pos_entry = ftell($this->zip_fd);
+
+            // ----- Look for the specific extract rules
+            $v_extract = false;
+
+            // ----- Look for extract by name rule
+            if ((isset($p_options[PCLZIP_OPT_BY_NAME])) && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
+
+                // ----- Look if the filename is in the list
+                for ($j = 0; ($j < sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
+
+                    // ----- Look for a directory
+                    if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
+
+                        // ----- Look if the directory is in the filename path
+                        if ((strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+                            $v_extract = true;
+                        }
+
+                    // ----- Look for a filename
+                    } elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
+                        $v_extract = true;
+                    }
+                }
+            // ----- Look for extract by ereg rule
+            // ereg() is deprecated with PHP 5.3
+            /*
+            elseif (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
+            && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
+
+            if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header['stored_filename'])) {
+            $v_extract = true;
+            }
+            }
+            */
+
+            // ----- Look for extract by preg rule
+            } elseif ((isset($p_options[PCLZIP_OPT_BY_PREG])) && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
+
+                if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
+                    $v_extract = true;
+                }
+
+            // ----- Look for extract by index rule
+            } elseif ((isset($p_options[PCLZIP_OPT_BY_INDEX])) && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
+
+                // ----- Look if the index is in the list
+                for ($j = $j_start; ($j < sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
+
+                    if (($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i <= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+                        $v_extract = true;
+                    }
+                    if ($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+                        $j_start = $j + 1;
+                    }
+
+                    if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start'] > $i) {
+                        break;
+                    }
+                }
+
+            // ----- Look for no rule, which means extract all the archive
+            } else {
+                $v_extract = true;
+            }
+
+            // ----- Check compression method
+            if (($v_extract) && (($v_header['compression'] != 8) && ($v_header['compression'] != 0))) {
+                $v_header['status'] = 'unsupported_compression';
+
+                // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+                if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+
+                    $this->privSwapBackMagicQuotes();
+
+                    PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION, "Filename '" . $v_header['stored_filename'] . "' is " . "compressed by an unsupported compression " . "method (" . $v_header['compression'] . ") ");
+
+                    return PclZip::errorCode();
+                }
+            }
+
+            // ----- Check encrypted files
+            if (($v_extract) && (($v_header['flag'] & 1) == 1)) {
+                $v_header['status'] = 'unsupported_encryption';
+
+                // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+                if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+
+                    $this->privSwapBackMagicQuotes();
+
+                    PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, "Unsupported encryption for " . " filename '" . $v_header['stored_filename'] . "'");
+
+                    return PclZip::errorCode();
+                }
+            }
+
+            // ----- Look for real extraction
+            if (($v_extract) && ($v_header['status'] != 'ok')) {
+                $v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++]);
+                if ($v_result != 1) {
+                    $this->privCloseFd();
+                    $this->privSwapBackMagicQuotes();
+
+                    return $v_result;
+                }
+
+                $v_extract = false;
+            }
+
+            // ----- Look for real extraction
+            if ($v_extract) {
+
+                // ----- Go to the file position
+                @rewind($this->zip_fd);
+                if (@fseek($this->zip_fd, $v_header['offset'])) {
+                    // ----- Close the zip file
+                    $this->privCloseFd();
+
+                    $this->privSwapBackMagicQuotes();
+
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+                    // ----- Return
+                    return PclZip::errorCode();
+                }
+
+                // ----- Look for extraction as string
+                if ($p_options[PCLZIP_OPT_EXTRACT_AS_STRING]) {
+
+                    $v_string = '';
+
+                    // ----- Extracting the file
+                    $v_result1 = $this->privExtractFileAsString($v_header, $v_string, $p_options);
+                    if ($v_result1 < 1) {
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+
+                        return $v_result1;
+                    }
+
+                    // ----- Get the only interesting attributes
+                    if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1) {
+                        // ----- Close the zip file
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+
+                        return $v_result;
+                    }
+
+                    // ----- Set the file content
+                    $p_file_list[$v_nb_extracted]['content'] = $v_string;
+
+                    // ----- Next extracted file
+                    $v_nb_extracted++;
+
+                    // ----- Look for user callback abort
+                    if ($v_result1 == 2) {
+                        break;
+                    }
+
+                // ----- Look for extraction in standard output
+                } elseif ((isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
+                    // ----- Extracting the file in standard output
+                    $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
+                    if ($v_result1 < 1) {
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+
+                        return $v_result1;
+                    }
+
+                    // ----- Get the only interesting attributes
+                    if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+
+                        return $v_result;
+                    }
+
+                    // ----- Look for user callback abort
+                    if ($v_result1 == 2) {
+                        break;
+                    }
+
+                // ----- Look for normal extraction
+                } else {
+                    // ----- Extracting the file
+                    $v_result1 = $this->privExtractFile($v_header, $p_path, $p_remove_path, $p_remove_all_path, $p_options);
+                    if ($v_result1 < 1) {
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+
+                        return $v_result1;
+                    }
+
+                    // ----- Get the only interesting attributes
+                    if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
+                        // ----- Close the zip file
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+
+                        return $v_result;
+                    }
+
+                    // ----- Look for user callback abort
+                    if ($v_result1 == 2) {
+                        break;
+                    }
+                }
+            }
+        }
+
+        // ----- Close the zip file
+        $this->privCloseFd();
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privExtractFile()
+    // Description :
+    // Parameters :
+    // Return Values :
+    //
+    // 1 : ... ?
+    // PCLZIP_ERR_USER_ABORTED(2) : User ask for extraction stop in callback
+    // --------------------------------------------------------------------------------
+    public function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Read the file header
+        if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Check that the file header is coherent with $p_entry info
+        if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+            // TBC
+        }
+
+        // ----- Look for all path to remove
+        if ($p_remove_all_path == true) {
+            // ----- Look for folder entry that not need to be extracted
+            if (($p_entry['external'] & 0x00000010) == 0x00000010) {
+
+                $p_entry['status'] = "filtered";
+
+                return $v_result;
+            }
+
+            // ----- Get the basename of the path
+            $p_entry['filename'] = basename($p_entry['filename']);
+
+        // ----- Look for path to remove
+        } elseif ($p_remove_path != "") {
+            if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2) {
+
+                // ----- Change the file status
+                $p_entry['status'] = "filtered";
+
+                // ----- Return
+                return $v_result;
+            }
+
+            $p_remove_path_size = strlen($p_remove_path);
+            if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path) {
+
+                // ----- Remove the path
+                $p_entry['filename'] = substr($p_entry['filename'], $p_remove_path_size);
+
+            }
+        }
+
+        // ----- Add the path
+        if ($p_path != '') {
+            $p_entry['filename'] = $p_path . "/" . $p_entry['filename'];
+        }
+
+        // ----- Check a base_dir_restriction
+        if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
+            $v_inclusion = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION], $p_entry['filename']);
+            if ($v_inclusion == 0) {
+
+                PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION, "Filename '" . $p_entry['filename'] . "' is " . "outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
+
+                return PclZip::errorCode();
+            }
+        }
+
+        // ----- Look for pre-extract callback
+        if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+            if ($v_result == 0) {
+                // ----- Change the file status
+                $p_entry['status'] = "skipped";
+                $v_result          = 1;
+            }
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                // ----- This status is internal and will be changed in 'skipped'
+                $p_entry['status'] = "aborted";
+                $v_result          = PCLZIP_ERR_USER_ABORTED;
+            }
+
+            // ----- Update the informations
+            // Only some fields can be modified
+            $p_entry['filename'] = $v_local_header['filename'];
+        }
+
+        // ----- Look if extraction should be done
+        if ($p_entry['status'] == 'ok') {
+
+            // ----- Look for specific actions while the file exist
+            if (file_exists($p_entry['filename'])) {
+
+                // ----- Look if file is a directory
+                if (is_dir($p_entry['filename'])) {
+
+                    // ----- Change the file status
+                    $p_entry['status'] = "already_a_directory";
+
+                    // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+                    // For historical reason first PclZip implementation does not stop
+                    // when this kind of error occurs.
+                    if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+
+                        PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY, "Filename '" . $p_entry['filename'] . "' is " . "already used by an existing directory");
+
+                        return PclZip::errorCode();
+                    }
+
+                // ----- Look if file is write protected
+                } elseif (!is_writeable($p_entry['filename'])) {
+
+                    // ----- Change the file status
+                    $p_entry['status'] = "write_protected";
+
+                    // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+                    // For historical reason first PclZip implementation does not stop
+                    // when this kind of error occurs.
+                    if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+
+                        PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, "Filename '" . $p_entry['filename'] . "' exists " . "and is write protected");
+
+                        return PclZip::errorCode();
+                    }
+
+                // ----- Look if the extracted file is older
+                } elseif (filemtime($p_entry['filename']) > $p_entry['mtime']) {
+                    // ----- Change the file status
+                    if ((isset($p_options[PCLZIP_OPT_REPLACE_NEWER])) && ($p_options[PCLZIP_OPT_REPLACE_NEWER] === true)) {
+                    } else {
+                        $p_entry['status'] = "newer_exist";
+
+                        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+                        // For historical reason first PclZip implementation does not stop
+                        // when this kind of error occurs.
+                        if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+
+                            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, "Newer version of '" . $p_entry['filename'] . "' exists " . "and option PCLZIP_OPT_REPLACE_NEWER is not selected");
+
+                            return PclZip::errorCode();
+                        }
+                    }
+                } else {
+                }
+
+            // ----- Check the directory availability and create it if necessary
+            } else {
+                if ((($p_entry['external'] & 0x00000010) == 0x00000010) || (substr($p_entry['filename'], -1) == '/')) {
+                    $v_dir_to_check = $p_entry['filename'];
+                } elseif (!strstr($p_entry['filename'], "/")) {
+                    $v_dir_to_check = "";
+                } else {
+                    $v_dir_to_check = dirname($p_entry['filename']);
+                }
+
+                if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external'] & 0x00000010) == 0x00000010))) != 1) {
+
+                    // ----- Change the file status
+                    $p_entry['status'] = "path_creation_fail";
+
+                    // ----- Return
+                    //return $v_result;
+                    $v_result = 1;
+                }
+            }
+        }
+
+        // ----- Look if extraction should be done
+        if ($p_entry['status'] == 'ok') {
+
+            // ----- Do the extraction (if not a folder)
+            if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
+                // ----- Look for not compressed file
+                if ($p_entry['compression'] == 0) {
+
+                    // ----- Opening destination file
+                    if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+
+                        // ----- Change the file status
+                        $p_entry['status'] = "write_error";
+
+                        // ----- Return
+                        return $v_result;
+                    }
+
+                    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+                    $v_size = $p_entry['compressed_size'];
+                    while ($v_size != 0) {
+                        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+                        $v_buffer    = @fread($this->zip_fd, $v_read_size);
+                        /* Try to speed up the code
+                        $v_binary_data = pack('a'.$v_read_size, $v_buffer);
+                        @fwrite($v_dest_file, $v_binary_data, $v_read_size);
+                        */
+                        @fwrite($v_dest_file, $v_buffer, $v_read_size);
+                        $v_size -= $v_read_size;
+                    }
+
+                    // ----- Closing the destination file
+                    fclose($v_dest_file);
+
+                    // ----- Change the file mtime
+                    touch($p_entry['filename'], $p_entry['mtime']);
+
+                } else {
+                    // ----- TBC
+                    // Need to be finished
+                    if (($p_entry['flag'] & 1) == 1) {
+                        PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \'' . $p_entry['filename'] . '\' is encrypted. Encrypted files are not supported.');
+
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Look for using temporary file to unzip
+                    if ((!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON]) || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]) && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])))) {
+                        $v_result = $this->privExtractFileUsingTempFile($p_entry, $p_options);
+                        if ($v_result < PCLZIP_ERR_NO_ERROR) {
+                            return $v_result;
+                        }
+
+                    // ----- Look for extract in memory
+                    } else {
+
+                        // ----- Read the compressed file in a buffer (one shot)
+                        $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+                        // ----- Decompress the file
+                        $v_file_content = @gzinflate($v_buffer);
+                        unset($v_buffer);
+                        if ($v_file_content === false) {
+
+                            // ----- Change the file status
+                            // TBC
+                            $p_entry['status'] = "error";
+
+                            return $v_result;
+                        }
+
+                        // ----- Opening destination file
+                        if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+
+                            // ----- Change the file status
+                            $p_entry['status'] = "write_error";
+
+                            return $v_result;
+                        }
+
+                        // ----- Write the uncompressed data
+                        @fwrite($v_dest_file, $v_file_content, $p_entry['size']);
+                        unset($v_file_content);
+
+                        // ----- Closing the destination file
+                        @fclose($v_dest_file);
+
+                    }
+
+                    // ----- Change the file mtime
+                    @touch($p_entry['filename'], $p_entry['mtime']);
+                }
+
+                // ----- Look for chmod option
+                if (isset($p_options[PCLZIP_OPT_SET_CHMOD])) {
+
+                    // ----- Change the mode of the file
+                    @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);
+                }
+
+            }
+        }
+
+        // ----- Change abort status
+        if ($p_entry['status'] == "aborted") {
+            $p_entry['status'] = "skipped";
+
+        // ----- Look for post-extract callback
+        } elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                $v_result = PCLZIP_ERR_USER_ABORTED;
+            }
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privExtractFileUsingTempFile()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privExtractFileUsingTempFile(&$p_entry, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Creates a temporary file
+        $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.gz';
+        if (($v_dest_file = @fopen($v_gzip_temp_name, "wb")) == 0) {
+            fclose($v_file);
+            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary write mode');
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Write gz file format header
+        $v_binary_data = pack('va1a1Va1a1', 0x8b1f, Chr($p_entry['compression']), Chr(0x00), time(), Chr(0x00), Chr(3));
+        @fwrite($v_dest_file, $v_binary_data, 10);
+
+        // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+        $v_size = $p_entry['compressed_size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($this->zip_fd, $v_read_size);
+            //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+            @fwrite($v_dest_file, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Write gz file format footer
+        $v_binary_data = pack('VV', $p_entry['crc'], $p_entry['size']);
+        @fwrite($v_dest_file, $v_binary_data, 8);
+
+        // ----- Close the temporary file
+        @fclose($v_dest_file);
+
+        // ----- Opening destination file
+        if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+            $p_entry['status'] = "write_error";
+
+            return $v_result;
+        }
+
+        // ----- Open the temporary gz file
+        if (($v_src_file = @gzopen($v_gzip_temp_name, 'rb')) == 0) {
+            @fclose($v_dest_file);
+            $p_entry['status'] = "read_error";
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary read mode');
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+        $v_size = $p_entry['size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @gzread($v_src_file, $v_read_size);
+            //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+            @fwrite($v_dest_file, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+        @fclose($v_dest_file);
+        @gzclose($v_src_file);
+
+        // ----- Delete the temporary file
+        @unlink($v_gzip_temp_name);
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privExtractFileInOutput()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privExtractFileInOutput(&$p_entry, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Read the file header
+        if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
+            return $v_result;
+        }
+
+        // ----- Check that the file header is coherent with $p_entry info
+        if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+            // TBC
+        }
+
+        // ----- Look for pre-extract callback
+        if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+            if ($v_result == 0) {
+                // ----- Change the file status
+                $p_entry['status'] = "skipped";
+                $v_result          = 1;
+            }
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                // ----- This status is internal and will be changed in 'skipped'
+                $p_entry['status'] = "aborted";
+                $v_result          = PCLZIP_ERR_USER_ABORTED;
+            }
+
+            // ----- Update the informations
+            // Only some fields can be modified
+            $p_entry['filename'] = $v_local_header['filename'];
+        }
+
+        // ----- Trace
+
+        // ----- Look if extraction should be done
+        if ($p_entry['status'] == 'ok') {
+
+            // ----- Do the extraction (if not a folder)
+            if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
+                // ----- Look for not compressed file
+                if ($p_entry['compressed_size'] == $p_entry['size']) {
+
+                    // ----- Read the file in a buffer (one shot)
+                    $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+                    // ----- Send the file to the output
+                    echo $v_buffer;
+                    unset($v_buffer);
+                } else {
+
+                    // ----- Read the compressed file in a buffer (one shot)
+                    $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+                    // ----- Decompress the file
+                    $v_file_content = gzinflate($v_buffer);
+                    unset($v_buffer);
+
+                    // ----- Send the file to the output
+                    echo $v_file_content;
+                    unset($v_file_content);
+                }
+            }
+        }
+
+        // ----- Change abort status
+        if ($p_entry['status'] == "aborted") {
+            $p_entry['status'] = "skipped";
+
+        // ----- Look for post-extract callback
+        } elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                $v_result = PCLZIP_ERR_USER_ABORTED;
+            }
+        }
+
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privExtractFileAsString()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Read the file header
+        $v_header = array();
+        if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Check that the file header is coherent with $p_entry info
+        if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+            // TBC
+        }
+
+        // ----- Look for pre-extract callback
+        if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+            if ($v_result == 0) {
+                // ----- Change the file status
+                $p_entry['status'] = "skipped";
+                $v_result          = 1;
+            }
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                // ----- This status is internal and will be changed in 'skipped'
+                $p_entry['status'] = "aborted";
+                $v_result          = PCLZIP_ERR_USER_ABORTED;
+            }
+
+            // ----- Update the informations
+            // Only some fields can be modified
+            $p_entry['filename'] = $v_local_header['filename'];
+        }
+
+        // ----- Look if extraction should be done
+        if ($p_entry['status'] == 'ok') {
+
+            // ----- Do the extraction (if not a folder)
+            if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
+                // ----- Look for not compressed file
+                //      if ($p_entry['compressed_size'] == $p_entry['size'])
+                if ($p_entry['compression'] == 0) {
+
+                    // ----- Reading the file
+                    $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
+                } else {
+
+                    // ----- Reading the file
+                    $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+                    // ----- Decompress the file
+                    if (($p_string = @gzinflate($v_data)) === false) {
+                        // TBC
+                    }
+                }
+
+                // ----- Trace
+            } else {
+                // TBC : error : can not extract a folder in a string
+            }
+
+        }
+
+        // ----- Change abort status
+        if ($p_entry['status'] == "aborted") {
+            $p_entry['status'] = "skipped";
+
+        // ----- Look for post-extract callback
+        } elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Swap the content to header
+            $v_local_header['content'] = $p_string;
+            $p_string                  = '';
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+
+            // ----- Swap back the content to header
+            $p_string = $v_local_header['content'];
+            unset($v_local_header['content']);
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                $v_result = PCLZIP_ERR_USER_ABORTED;
+            }
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privReadFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privReadFileHeader(&$p_header)
+    {
+        $v_result = 1;
+
+        // ----- Read the 4 bytes signature
+        $v_binary_data = @fread($this->zip_fd, 4);
+        $v_data        = unpack('Vid', $v_binary_data);
+
+        // ----- Check signature
+        if ($v_data['id'] != 0x04034b50) {
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the first 42 bytes of the header
+        $v_binary_data = fread($this->zip_fd, 26);
+
+        // ----- Look for invalid block size
+        if (strlen($v_binary_data) != 26) {
+            $p_header['filename'] = "";
+            $p_header['status']   = "invalid_header";
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : " . strlen($v_binary_data));
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Extract the values
+        $v_data = unpack('vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $v_binary_data);
+
+        // ----- Get filename
+        $p_header['filename'] = fread($this->zip_fd, $v_data['filename_len']);
+
+        // ----- Get extra_fields
+        if ($v_data['extra_len'] != 0) {
+            $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
+        } else {
+            $p_header['extra'] = '';
+        }
+
+        // ----- Extract properties
+        $p_header['version_extracted'] = $v_data['version'];
+        $p_header['compression']       = $v_data['compression'];
+        $p_header['size']              = $v_data['size'];
+        $p_header['compressed_size']   = $v_data['compressed_size'];
+        $p_header['crc']               = $v_data['crc'];
+        $p_header['flag']              = $v_data['flag'];
+        $p_header['filename_len']      = $v_data['filename_len'];
+
+        // ----- Recuperate date in UNIX format
+        $p_header['mdate'] = $v_data['mdate'];
+        $p_header['mtime'] = $v_data['mtime'];
+        if ($p_header['mdate'] && $p_header['mtime']) {
+            // ----- Extract time
+            $v_hour    = ($p_header['mtime'] & 0xF800) >> 11;
+            $v_minute  = ($p_header['mtime'] & 0x07E0) >> 5;
+            $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
+
+            // ----- Extract date
+            $v_year  = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
+            $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
+            $v_day   = $p_header['mdate'] & 0x001F;
+
+            // ----- Get UNIX date format
+            $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
+
+        } else {
+            $p_header['mtime'] = time();
+        }
+
+        // TBC
+        //for (reset($v_data); $key = key($v_data); next($v_data)) {
+        //}
+
+        // ----- Set the stored filename
+        $p_header['stored_filename'] = $p_header['filename'];
+
+        // ----- Set the status field
+        $p_header['status'] = "ok";
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privReadCentralFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privReadCentralFileHeader(&$p_header)
+    {
+        $v_result = 1;
+
+        // ----- Read the 4 bytes signature
+        $v_binary_data = @fread($this->zip_fd, 4);
+        $v_data        = unpack('Vid', $v_binary_data);
+
+        // ----- Check signature
+        if ($v_data['id'] != 0x02014b50) {
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the first 42 bytes of the header
+        $v_binary_data = fread($this->zip_fd, 42);
+
+        // ----- Look for invalid block size
+        if (strlen($v_binary_data) != 42) {
+            $p_header['filename'] = "";
+            $p_header['status']   = "invalid_header";
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : " . strlen($v_binary_data));
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Extract the values
+        $p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data);
+
+        // ----- Get filename
+        if ($p_header['filename_len'] != 0) {
+            $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
+        } else {
+            $p_header['filename'] = '';
+        }
+
+        // ----- Get extra
+        if ($p_header['extra_len'] != 0) {
+            $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
+        } else {
+            $p_header['extra'] = '';
+        }
+
+        // ----- Get comment
+        if ($p_header['comment_len'] != 0) {
+            $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
+        } else {
+            $p_header['comment'] = '';
+        }
+
+        // ----- Extract properties
+
+        // ----- Recuperate date in UNIX format
+        //if ($p_header['mdate'] && $p_header['mtime'])
+        // TBC : bug : this was ignoring time with 0/0/0
+        if (1) {
+            // ----- Extract time
+            $v_hour    = ($p_header['mtime'] & 0xF800) >> 11;
+            $v_minute  = ($p_header['mtime'] & 0x07E0) >> 5;
+            $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
+
+            // ----- Extract date
+            $v_year  = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
+            $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
+            $v_day   = $p_header['mdate'] & 0x001F;
+
+            // ----- Get UNIX date format
+            $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
+
+        } else {
+            $p_header['mtime'] = time();
+        }
+
+        // ----- Set the stored filename
+        $p_header['stored_filename'] = $p_header['filename'];
+
+        // ----- Set default status to ok
+        $p_header['status'] = 'ok';
+
+        // ----- Look if it is a directory
+        if (substr($p_header['filename'], -1) == '/') {
+            //$p_header['external'] = 0x41FF0010;
+            $p_header['external'] = 0x00000010;
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privCheckFileHeaders()
+    // Description :
+    // Parameters :
+    // Return Values :
+    //   1 on success,
+    //   0 on error;
+    // --------------------------------------------------------------------------------
+    public function privCheckFileHeaders(&$p_local_header, &$p_central_header)
+    {
+        $v_result = 1;
+
+        // ----- Check the static values
+        // TBC
+        if ($p_local_header['filename'] != $p_central_header['filename']) {
+        }
+        if ($p_local_header['version_extracted'] != $p_central_header['version_extracted']) {
+        }
+        if ($p_local_header['flag'] != $p_central_header['flag']) {
+        }
+        if ($p_local_header['compression'] != $p_central_header['compression']) {
+        }
+        if ($p_local_header['mtime'] != $p_central_header['mtime']) {
+        }
+        if ($p_local_header['filename_len'] != $p_central_header['filename_len']) {
+        }
+
+        // ----- Look for flag bit 3
+        if (($p_local_header['flag'] & 8) == 8) {
+            $p_local_header['size']            = $p_central_header['size'];
+            $p_local_header['compressed_size'] = $p_central_header['compressed_size'];
+            $p_local_header['crc']             = $p_central_header['crc'];
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privReadEndCentralDir()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privReadEndCentralDir(&$p_central_dir)
+    {
+        $v_result = 1;
+
+        // ----- Go to the end of the zip file
+        $v_size = filesize($this->zipname);
+        @fseek($this->zip_fd, $v_size);
+        if (@ftell($this->zip_fd) != $v_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \'' . $this->zipname . '\'');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- First try : look if this is an archive with no commentaries (most of the time)
+        // in this case the end of central dir is at 22 bytes of the file end
+        $v_found = 0;
+        if ($v_size > 26) {
+            @fseek($this->zip_fd, $v_size - 22);
+            if (($v_pos = @ftell($this->zip_fd)) != ($v_size - 22)) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \'' . $this->zipname . '\'');
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+
+            // ----- Read for bytes
+            $v_binary_data = @fread($this->zip_fd, 4);
+            $v_data        = @unpack('Vid', $v_binary_data);
+
+            // ----- Check signature
+            if ($v_data['id'] == 0x06054b50) {
+                $v_found = 1;
+            }
+
+            $v_pos = ftell($this->zip_fd);
+        }
+
+        // ----- Go back to the maximum possible size of the Central Dir End Record
+        if (!$v_found) {
+            $v_maximum_size = 65557; // 0xFFFF + 22;
+            if ($v_maximum_size > $v_size) {
+                $v_maximum_size = $v_size;
+            }
+            @fseek($this->zip_fd, $v_size - $v_maximum_size);
+            if (@ftell($this->zip_fd) != ($v_size - $v_maximum_size)) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \'' . $this->zipname . '\'');
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+
+            // ----- Read byte per byte in order to find the signature
+            $v_pos   = ftell($this->zip_fd);
+            $v_bytes = 0x00000000;
+            while ($v_pos < $v_size) {
+                // ----- Read a byte
+                $v_byte = @fread($this->zip_fd, 1);
+
+                // -----  Add the byte
+                //$v_bytes = ($v_bytes << 8) | Ord($v_byte);
+                // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number
+                // Otherwise on systems where we have 64bit integers the check below for the magic number will fail.
+                $v_bytes = (($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte);
+
+                // ----- Compare the bytes
+                if ($v_bytes == 0x504b0506) {
+                    $v_pos++;
+                    break;
+                }
+
+                $v_pos++;
+            }
+
+            // ----- Look if not found end of central dir
+            if ($v_pos == $v_size) {
+
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Unable to find End of Central Dir Record signature");
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+        }
+
+        // ----- Read the first 18 bytes of the header
+        $v_binary_data = fread($this->zip_fd, 18);
+
+        // ----- Look for invalid block size
+        if (strlen($v_binary_data) != 18) {
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : " . strlen($v_binary_data));
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Extract the values
+        $v_data = unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size', $v_binary_data);
+
+        // ----- Check the global size
+        if (($v_pos + $v_data['comment_size'] + 18) != $v_size) {
+
+            // ----- Removed in release 2.2 see readme file
+            // The check of the file size is a little too strict.
+            // Some bugs where found when a zip is encrypted/decrypted with 'crypt'.
+            // While decrypted, zip has training 0 bytes
+            if (0) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'The central dir is not at the end of the archive.' . ' Some trailing bytes exists after the archive.');
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+        }
+
+        // ----- Get comment
+        if ($v_data['comment_size'] != 0) {
+            $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);
+        } else {
+            $p_central_dir['comment'] = '';
+        }
+
+        $p_central_dir['entries']      = $v_data['entries'];
+        $p_central_dir['disk_entries'] = $v_data['disk_entries'];
+        $p_central_dir['offset']       = $v_data['offset'];
+        $p_central_dir['size']         = $v_data['size'];
+        $p_central_dir['disk']         = $v_data['disk'];
+        $p_central_dir['disk_start']   = $v_data['disk_start'];
+
+        // TBC
+        //for (reset($p_central_dir); $key = key($p_central_dir); next($p_central_dir)) {
+        //}
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privDeleteByRule()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privDeleteByRule(&$p_result_list, &$p_options)
+    {
+        $v_result      = 1;
+        $v_list_detail = array();
+
+        // ----- Open the zip file
+        if (($v_result = $this->privOpenFd('rb')) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir = array();
+        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+            $this->privCloseFd();
+
+            return $v_result;
+        }
+
+        // ----- Go to beginning of File
+        @rewind($this->zip_fd);
+
+        // ----- Scan all the files
+        // ----- Start at beginning of Central Dir
+        $v_pos_entry = $v_central_dir['offset'];
+        @rewind($this->zip_fd);
+        if (@fseek($this->zip_fd, $v_pos_entry)) {
+            // ----- Close the zip file
+            $this->privCloseFd();
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Read each entry
+        $v_header_list = array();
+        $j_start       = 0;
+        for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++) {
+
+            // ----- Read the file header
+            $v_header_list[$v_nb_extracted] = array();
+            if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1) {
+                // ----- Close the zip file
+                $this->privCloseFd();
+
+                return $v_result;
+            }
+
+            // ----- Store the index
+            $v_header_list[$v_nb_extracted]['index'] = $i;
+
+            // ----- Look for the specific extract rules
+            $v_found = false;
+
+            // ----- Look for extract by name rule
+            if ((isset($p_options[PCLZIP_OPT_BY_NAME])) && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
+
+                // ----- Look if the filename is in the list
+                for ($j = 0; ($j < sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
+
+                    // ----- Look for a directory
+                    if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
+
+                        // ----- Look if the directory is in the filename path
+                        if ((strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+                            $v_found = true;
+                        } elseif ((($v_header_list[$v_nb_extracted]['external'] & 0x00000010) == 0x00000010) /* Indicates a folder */ && ($v_header_list[$v_nb_extracted]['stored_filename'] . '/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+                            $v_found = true;
+                        }
+
+                    // ----- Look for a filename
+                    } elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
+                        $v_found = true;
+                    }
+                }
+
+            // ----- Look for extract by ereg rule
+            // ereg() is deprecated with PHP 5.3
+            /*
+            elseif (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
+            && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
+
+            if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
+            $v_found = true;
+            }
+            }
+            */
+
+            // ----- Look for extract by preg rule
+            } elseif ((isset($p_options[PCLZIP_OPT_BY_PREG])) && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
+
+                if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
+                    $v_found = true;
+                }
+
+            // ----- Look for extract by index rule
+            } elseif ((isset($p_options[PCLZIP_OPT_BY_INDEX])) && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
+
+                // ----- Look if the index is in the list
+                for ($j = $j_start; ($j < sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
+
+                    if (($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i <= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+                        $v_found = true;
+                    }
+                    if ($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+                        $j_start = $j + 1;
+                    }
+
+                    if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start'] > $i) {
+                        break;
+                    }
+                }
+            } else {
+                $v_found = true;
+            }
+
+            // ----- Look for deletion
+            if ($v_found) {
+                unset($v_header_list[$v_nb_extracted]);
+            } else {
+                $v_nb_extracted++;
+            }
+        }
+
+        // ----- Look if something need to be deleted
+        if ($v_nb_extracted > 0) {
+
+            // ----- Creates a temporay file
+            $v_zip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.tmp';
+
+            // ----- Creates a temporary zip archive
+            $v_temp_zip = new PclZip($v_zip_temp_name);
+
+            // ----- Open the temporary zip file in write mode
+            if (($v_result = $v_temp_zip->privOpenFd('wb')) != 1) {
+                $this->privCloseFd();
+
+                // ----- Return
+                return $v_result;
+            }
+
+            // ----- Look which file need to be kept
+            for ($i = 0; $i < sizeof($v_header_list); $i++) {
+
+                // ----- Calculate the position of the header
+                @rewind($this->zip_fd);
+                if (@fseek($this->zip_fd, $v_header_list[$i]['offset'])) {
+                    // ----- Close the zip file
+                    $this->privCloseFd();
+                    $v_temp_zip->privCloseFd();
+                    @unlink($v_zip_temp_name);
+
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+                    // ----- Return
+                    return PclZip::errorCode();
+                }
+
+                // ----- Read the file header
+                $v_local_header = array();
+                if (($v_result = $this->privReadFileHeader($v_local_header)) != 1) {
+                    // ----- Close the zip file
+                    $this->privCloseFd();
+                    $v_temp_zip->privCloseFd();
+                    @unlink($v_zip_temp_name);
+
+                    // ----- Return
+                    return $v_result;
+                }
+
+                // ----- Check that local file header is same as central file header
+                if ($this->privCheckFileHeaders($v_local_header, $v_header_list[$i]) != 1) {
+                    // TBC
+                }
+                unset($v_local_header);
+
+                // ----- Write the file header
+                if (($v_result = $v_temp_zip->privWriteFileHeader($v_header_list[$i])) != 1) {
+                    // ----- Close the zip file
+                    $this->privCloseFd();
+                    $v_temp_zip->privCloseFd();
+                    @unlink($v_zip_temp_name);
+
+                    // ----- Return
+                    return $v_result;
+                }
+
+                // ----- Read/write the data block
+                if (($v_result = PclZipUtilCopyBlock($this->zip_fd, $v_temp_zip->zip_fd, $v_header_list[$i]['compressed_size'])) != 1) {
+                    // ----- Close the zip file
+                    $this->privCloseFd();
+                    $v_temp_zip->privCloseFd();
+                    @unlink($v_zip_temp_name);
+
+                    // ----- Return
+                    return $v_result;
+                }
+            }
+
+            // ----- Store the offset of the central dir
+            $v_offset = @ftell($v_temp_zip->zip_fd);
+
+            // ----- Re-Create the Central Dir files header
+            for ($i = 0; $i < sizeof($v_header_list); $i++) {
+                // ----- Create the file header
+                if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+                    $v_temp_zip->privCloseFd();
+                    $this->privCloseFd();
+                    @unlink($v_zip_temp_name);
+
+                    // ----- Return
+                    return $v_result;
+                }
+
+                // ----- Transform the header to a 'usable' info
+                $v_temp_zip->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+            }
+
+            // ----- Zip file comment
+            $v_comment = '';
+            if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+                $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+            }
+
+            // ----- Calculate the size of the central header
+            $v_size = @ftell($v_temp_zip->zip_fd) - $v_offset;
+
+            // ----- Create the central dir footer
+            if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
+                // ----- Reset the file list
+                unset($v_header_list);
+                $v_temp_zip->privCloseFd();
+                $this->privCloseFd();
+                @unlink($v_zip_temp_name);
+
+                // ----- Return
+                return $v_result;
+            }
+
+            // ----- Close
+            $v_temp_zip->privCloseFd();
+            $this->privCloseFd();
+
+            // ----- Delete the zip file
+            // TBC : I should test the result ...
+            @unlink($this->zipname);
+
+            // ----- Rename the temporary file
+            // TBC : I should test the result ...
+            //@rename($v_zip_temp_name, $this->zipname);
+            PclZipUtilRename($v_zip_temp_name, $this->zipname);
+
+            // ----- Destroy the temporary archive
+            unset($v_temp_zip);
+
+        // ----- Remove every files : reset the file
+        } elseif ($v_central_dir['entries'] != 0) {
+            $this->privCloseFd();
+
+            if (($v_result = $this->privOpenFd('wb')) != 1) {
+                return $v_result;
+            }
+
+            if (($v_result = $this->privWriteCentralHeader(0, 0, 0, '')) != 1) {
+                return $v_result;
+            }
+
+            $this->privCloseFd();
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privDirCheck()
+    // Description :
+    //   Check if a directory exists, if not it creates it and all the parents directory
+    //   which may be useful.
+    // Parameters :
+    //   $p_dir : Directory path to check.
+    // Return Values :
+    //    1 : OK
+    //   -1 : Unable to create directory
+    // --------------------------------------------------------------------------------
+    public function privDirCheck($p_dir, $p_is_dir = false)
+    {
+        $v_result = 1;
+
+        // ----- Remove the final '/'
+        if (($p_is_dir) && (substr($p_dir, -1) == '/')) {
+            $p_dir = substr($p_dir, 0, strlen($p_dir) - 1);
+        }
+
+        // ----- Check the directory availability
+        if ((is_dir($p_dir)) || ($p_dir == "")) {
+            return 1;
+        }
+
+        // ----- Extract parent directory
+        $p_parent_dir = dirname($p_dir);
+
+        // ----- Just a check
+        if ($p_parent_dir != $p_dir) {
+            // ----- Look for parent directory
+            if ($p_parent_dir != "") {
+                if (($v_result = $this->privDirCheck($p_parent_dir)) != 1) {
+                    return $v_result;
+                }
+            }
+        }
+
+        // ----- Create the directory
+        if (!@mkdir($p_dir, 0777)) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privMerge()
+    // Description :
+    //   If $p_archive_to_add does not exist, the function exit with a success result.
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privMerge(&$p_archive_to_add)
+    {
+        $v_result = 1;
+
+        // ----- Look if the archive_to_add exists
+        if (!is_file($p_archive_to_add->zipname)) {
+
+            // ----- Nothing to merge, so merge is a success
+            $v_result = 1;
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Look if the archive exists
+        if (!is_file($this->zipname)) {
+
+            // ----- Do a duplicate
+            $v_result = $this->privDuplicate($p_archive_to_add->zipname);
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Open the zip file
+        if (($v_result = $this->privOpenFd('rb')) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir = array();
+        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+            $this->privCloseFd();
+
+            return $v_result;
+        }
+
+        // ----- Go to beginning of File
+        @rewind($this->zip_fd);
+
+        // ----- Open the archive_to_add file
+        if (($v_result = $p_archive_to_add->privOpenFd('rb')) != 1) {
+            $this->privCloseFd();
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir_to_add = array();
+        if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1) {
+            $this->privCloseFd();
+            $p_archive_to_add->privCloseFd();
+
+            return $v_result;
+        }
+
+        // ----- Go to beginning of File
+        @rewind($p_archive_to_add->zip_fd);
+
+        // ----- Creates a temporay file
+        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.tmp';
+
+        // ----- Open the temporary file in write mode
+        if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0) {
+            $this->privCloseFd();
+            $p_archive_to_add->privCloseFd();
+
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_zip_temp_name . '\' in binary write mode');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Copy the files from the archive to the temporary file
+        // TBC : Here I should better append the file and go back to erase the central dir
+        $v_size = $v_central_dir['offset'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = fread($this->zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Copy the files from the archive_to_add into the temporary file
+        $v_size = $v_central_dir_to_add['offset'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = fread($p_archive_to_add->zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Store the offset of the central dir
+        $v_offset = @ftell($v_zip_temp_fd);
+
+        // ----- Copy the block of file headers from the old archive
+        $v_size = $v_central_dir['size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($this->zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Copy the block of file headers from the archive_to_add
+        $v_size = $v_central_dir_to_add['size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($p_archive_to_add->zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Merge the file comments
+        $v_comment = $v_central_dir['comment'] . ' ' . $v_central_dir_to_add['comment'];
+
+        // ----- Calculate the size of the (new) central header
+        $v_size = @ftell($v_zip_temp_fd) - $v_offset;
+
+        // ----- Swap the file descriptor
+        // Here is a trick : I swap the temporary fd with the zip fd, in order to use
+        // the following methods on the temporary fil and not the real archive fd
+        $v_swap        = $this->zip_fd;
+        $this->zip_fd  = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
+
+        // ----- Create the central dir footer
+        if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries'] + $v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1) {
+            $this->privCloseFd();
+            $p_archive_to_add->privCloseFd();
+            @fclose($v_zip_temp_fd);
+            $this->zip_fd = null;
+
+            // ----- Reset the file list
+            unset($v_header_list);
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Swap back the file descriptor
+        $v_swap        = $this->zip_fd;
+        $this->zip_fd  = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
+
+        // ----- Close
+        $this->privCloseFd();
+        $p_archive_to_add->privCloseFd();
+
+        // ----- Close the temporary file
+        @fclose($v_zip_temp_fd);
+
+        // ----- Delete the zip file
+        // TBC : I should test the result ...
+        @unlink($this->zipname);
+
+        // ----- Rename the temporary file
+        // TBC : I should test the result ...
+        //@rename($v_zip_temp_name, $this->zipname);
+        PclZipUtilRename($v_zip_temp_name, $this->zipname);
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privDuplicate()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privDuplicate($p_archive_filename)
+    {
+        $v_result = 1;
+
+        // ----- Look if the $p_archive_filename exists
+        if (!is_file($p_archive_filename)) {
+
+            // ----- Nothing to duplicate, so duplicate is a success.
+            $v_result = 1;
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Open the zip file
         if (($v_result = $this->privOpenFd('wb')) != 1) {
-          return $v_result;
+            // ----- Return
+            return $v_result;
         }
 
-        if (($v_result = $this->privWriteCentralHeader(0, 0, 0, '')) != 1) {
-          return $v_result;
+        // ----- Open the temporary file in write mode
+        if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0) {
+            $this->privCloseFd();
+
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \'' . $p_archive_filename . '\' in binary write mode');
+
+            // ----- Return
+            return PclZip::errorCode();
         }
 
+        // ----- Copy the files from the archive to the temporary file
+        // TBC : Here I should better append the file and go back to erase the central dir
+        $v_size = filesize($p_archive_filename);
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = fread($v_zip_temp_fd, $v_read_size);
+            @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Close
         $this->privCloseFd();
+
+        // ----- Close the temporary file
+        @fclose($v_zip_temp_fd);
+
+        // ----- Return
+        return $v_result;
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDirCheck()
-  // Description :
-  //   Check if a directory exists, if not it creates it and all the parents directory
-  //   which may be useful.
-  // Parameters :
-  //   $p_dir : Directory path to check.
-  // Return Values :
-  //    1 : OK
-  //   -1 : Unable to create directory
-  // --------------------------------------------------------------------------------
-  function privDirCheck($p_dir, $p_is_dir=false)
-  {
-    $v_result = 1;
-
-
-    // ----- Remove the final '/'
-    if (($p_is_dir) && (substr($p_dir, -1)=='/'))
+    // --------------------------------------------------------------------------------
+    // Function : privErrorLog()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function privErrorLog($p_error_code = 0, $p_error_string = '')
     {
-      $p_dir = substr($p_dir, 0, strlen($p_dir)-1);
-    }
-
-    // ----- Check the directory availability
-    if ((is_dir($p_dir)) || ($p_dir == ""))
-    {
-      return 1;
-    }
-
-    // ----- Extract parent directory
-    $p_parent_dir = dirname($p_dir);
-
-    // ----- Just a check
-    if ($p_parent_dir != $p_dir)
-    {
-      // ----- Look for parent directory
-      if ($p_parent_dir != "")
-      {
-        if (($v_result = $this->privDirCheck($p_parent_dir)) != 1)
-        {
-          return $v_result;
+        if (PCLZIP_ERROR_EXTERNAL == 1) {
+            PclError($p_error_code, $p_error_string);
+        } else {
+            $this->error_code   = $p_error_code;
+            $this->error_string = $p_error_string;
         }
-      }
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Create the directory
-    if (!@mkdir($p_dir, 0777))
+    // --------------------------------------------------------------------------------
+    // Function : privErrorReset()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function privErrorReset()
     {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");
-
-      // ----- Return
-      return PclZip::errorCode();
+        if (PCLZIP_ERROR_EXTERNAL == 1) {
+            PclErrorReset();
+        } else {
+            $this->error_code   = 0;
+            $this->error_string = '';
+        }
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privMerge()
-  // Description :
-  //   If $p_archive_to_add does not exist, the function exit with a success result.
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privMerge(&$p_archive_to_add)
-  {
-    $v_result=1;
-
-    // ----- Look if the archive_to_add exists
-    if (!is_file($p_archive_to_add->zipname))
+    // --------------------------------------------------------------------------------
+    // Function : privDisableMagicQuotes()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privDisableMagicQuotes()
     {
+        $v_result = 1;
 
-      // ----- Nothing to merge, so merge is a success
-      $v_result = 1;
+        // ----- Look if function exists
+        if ((!function_exists("get_magic_quotes_runtime")) || (!function_exists("set_magic_quotes_runtime"))) {
+            return $v_result;
+        }
 
-      // ----- Return
-      return $v_result;
+        // ----- Look if already done
+        if ($this->magic_quotes_status != -1) {
+            return $v_result;
+        }
+
+        // ----- Get and memorize the magic_quote value
+        $this->magic_quotes_status = @get_magic_quotes_runtime();
+
+        // ----- Disable magic_quotes
+        if ($this->magic_quotes_status == 1) {
+            @set_magic_quotes_runtime(0);
+        }
+
+        // ----- Return
+        return $v_result;
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Look if the archive exists
-    if (!is_file($this->zipname))
+    // --------------------------------------------------------------------------------
+    // Function : privSwapBackMagicQuotes()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privSwapBackMagicQuotes()
     {
+        $v_result = 1;
 
-      // ----- Do a duplicate
-      $v_result = $this->privDuplicate($p_archive_to_add->zipname);
+        // ----- Look if function exists
+        if ((!function_exists("get_magic_quotes_runtime")) || (!function_exists("set_magic_quotes_runtime"))) {
+            return $v_result;
+        }
 
-      // ----- Return
-      return $v_result;
+        // ----- Look if something to do
+        if ($this->magic_quotes_status != -1) {
+            return $v_result;
+        }
+
+        // ----- Swap back magic_quotes
+        if ($this->magic_quotes_status == 1) {
+            @set_magic_quotes_runtime($this->magic_quotes_status);
+        }
+
+        // ----- Return
+        return $v_result;
     }
+    // --------------------------------------------------------------------------------
+}
 
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
+// End of class
+// --------------------------------------------------------------------------------
 
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
-
-    // ----- Open the archive_to_add file
-    if (($v_result=$p_archive_to_add->privOpenFd('rb')) != 1)
-    {
-      $this->privCloseFd();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir_to_add = array();
-    if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
-
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($p_archive_to_add->zip_fd);
-
-    // ----- Creates a temporay file
-    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
-
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
-
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = $v_central_dir['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Copy the files from the archive_to_add into the temporary file
-    $v_size = $v_central_dir_to_add['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($p_archive_to_add->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($v_zip_temp_fd);
-
-    // ----- Copy the block of file headers from the old archive
-    $v_size = $v_central_dir['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Copy the block of file headers from the archive_to_add
-    $v_size = $v_central_dir_to_add['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($p_archive_to_add->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Merge the file comments
-    $v_comment = $v_central_dir['comment'].' '.$v_central_dir_to_add['comment'];
-
-    // ----- Calculate the size of the (new) central header
-    $v_size = @ftell($v_zip_temp_fd)-$v_offset;
-
-    // ----- Swap the file descriptor
-    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
-    // the following methods on the temporary fil and not the real archive fd
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries']+$v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
-      @fclose($v_zip_temp_fd);
-      $this->zip_fd = null;
-
-      // ----- Reset the file list
-      unset($v_header_list);
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Swap back the file descriptor
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Close
-    $this->privCloseFd();
-    $p_archive_to_add->privCloseFd();
-
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
-
-    // ----- Delete the zip file
-    // TBC : I should test the result ...
-    @unlink($this->zipname);
-
-    // ----- Rename the temporary file
-    // TBC : I should test the result ...
-    //@rename($v_zip_temp_name, $this->zipname);
-    PclZipUtilRename($v_zip_temp_name, $this->zipname);
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDuplicate()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privDuplicate($p_archive_filename)
-  {
-    $v_result=1;
-
-    // ----- Look if the $p_archive_filename exists
-    if (!is_file($p_archive_filename))
-    {
-
-      // ----- Nothing to duplicate, so duplicate is a success.
-      $v_result = 1;
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('wb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0)
-    {
-      $this->privCloseFd();
-
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \''.$p_archive_filename.'\' in binary write mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = filesize($p_archive_filename);
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($v_zip_temp_fd, $v_read_size);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Close
-    $this->privCloseFd();
-
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privErrorLog()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privErrorLog($p_error_code=0, $p_error_string='')
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      PclError($p_error_code, $p_error_string);
-    }
-    else {
-      $this->error_code = $p_error_code;
-      $this->error_string = $p_error_string;
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privErrorReset()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privErrorReset()
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      PclErrorReset();
-    }
-    else {
-      $this->error_code = 0;
-      $this->error_string = '';
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDisableMagicQuotes()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privDisableMagicQuotes()
-  {
-    $v_result=1;
-
-    // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
-	    || (!function_exists("set_magic_quotes_runtime"))) {
-      return $v_result;
-	}
-
-    // ----- Look if already done
-    if ($this->magic_quotes_status != -1) {
-      return $v_result;
-	}
-
-	// ----- Get and memorize the magic_quote value
-	$this->magic_quotes_status = @get_magic_quotes_runtime();
-
-	// ----- Disable magic_quotes
-	if ($this->magic_quotes_status == 1) {
-	  @set_magic_quotes_runtime(0);
-	}
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privSwapBackMagicQuotes()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privSwapBackMagicQuotes()
-  {
-    $v_result=1;
-
-    // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
-	    || (!function_exists("set_magic_quotes_runtime"))) {
-      return $v_result;
-	}
-
-    // ----- Look if something to do
-    if ($this->magic_quotes_status != -1) {
-      return $v_result;
-	}
-
-	// ----- Swap back magic_quotes
-	if ($this->magic_quotes_status == 1) {
-  	  @set_magic_quotes_runtime($this->magic_quotes_status);
-	}
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  }
-  // End of class
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilPathReduction()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function PclZipUtilPathReduction($p_dir)
-  {
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilPathReduction()
+// Description :
+// Parameters :
+// Return Values :
+// --------------------------------------------------------------------------------
+function PclZipUtilPathReduction($p_dir)
+{
     $v_result = "";
 
     // ----- Look for not empty path
     if ($p_dir != "") {
-      // ----- Explode path by directory names
-      $v_list = explode("/", $p_dir);
+        // ----- Explode path by directory names
+        $v_list = explode("/", $p_dir);
 
-      // ----- Study directories from last to first
-      $v_skip = 0;
-      for ($i=sizeof($v_list)-1; $i>=0; $i--) {
-        // ----- Look for current path
-        if ($v_list[$i] == ".") {
-          // ----- Ignore this directory
-          // Should be the first $i=0, but no check is done
+        // ----- Study directories from last to first
+        $v_skip = 0;
+        for ($i = sizeof($v_list) - 1; $i >= 0; $i--) {
+            // ----- Look for current path
+            if ($v_list[$i] == ".") {
+                // ----- Ignore this directory
+                // Should be the first $i=0, but no check is done
+            } elseif ($v_list[$i] == "..") {
+                $v_skip++;
+            } elseif ($v_list[$i] == "") {
+                // ----- First '/' i.e. root slash
+                if ($i == 0) {
+                    $v_result = "/" . $v_result;
+                    if ($v_skip > 0) {
+                        // ----- It is an invalid path, so the path is not modified
+                        // TBC
+                        $v_result = $p_dir;
+                        $v_skip   = 0;
+                    }
+
+                // ----- Last '/' i.e. indicates a directory
+                } elseif ($i == (sizeof($v_list) - 1)) {
+                    $v_result = $v_list[$i];
+
+                // ----- Double '/' inside the path
+                } else {
+                    // ----- Ignore only the double '//' in path,
+                    // but not the first and last '/'
+                }
+            } else {
+                // ----- Look for item to skip
+                if ($v_skip > 0) {
+                    $v_skip--;
+                } else {
+                    $v_result = $v_list[$i] . ($i != (sizeof($v_list) - 1) ? "/" . $v_result : "");
+                }
+            }
         }
-        else if ($v_list[$i] == "..") {
-		  $v_skip++;
+
+        // ----- Look for skip
+        if ($v_skip > 0) {
+            while ($v_skip > 0) {
+                $v_result = '../' . $v_result;
+                $v_skip--;
+            }
         }
-        else if ($v_list[$i] == "") {
-		  // ----- First '/' i.e. root slash
-		  if ($i == 0) {
-            $v_result = "/".$v_result;
-		    if ($v_skip > 0) {
-		        // ----- It is an invalid path, so the path is not modified
-		        // TBC
-		        $v_result = $p_dir;
-                $v_skip = 0;
-		    }
-		  }
-		  // ----- Last '/' i.e. indicates a directory
-		  else if ($i == (sizeof($v_list)-1)) {
-            $v_result = $v_list[$i];
-		  }
-		  // ----- Double '/' inside the path
-		  else {
-            // ----- Ignore only the double '//' in path,
-            // but not the first and last '/'
-		  }
-        }
-        else {
-		  // ----- Look for item to skip
-		  if ($v_skip > 0) {
-		    $v_skip--;
-		  }
-		  else {
-            $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:"");
-		  }
-        }
-      }
-      
-      // ----- Look for skip
-      if ($v_skip > 0) {
-        while ($v_skip > 0) {
-            $v_result = '../'.$v_result;
-            $v_skip--;
-        }
-      }
     }
 
     // ----- Return
     return $v_result;
-  }
-  // --------------------------------------------------------------------------------
+}
+// --------------------------------------------------------------------------------
 
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilPathInclusion()
-  // Description :
-  //   This function indicates if the path $p_path is under the $p_dir tree. Or,
-  //   said in an other way, if the file or sub-dir $p_path is inside the dir
-  //   $p_dir.
-  //   The function indicates also if the path is exactly the same as the dir.
-  //   This function supports path with duplicated '/' like '//', but does not
-  //   support '.' or '..' statements.
-  // Parameters :
-  // Return Values :
-  //   0 if $p_path is not inside directory $p_dir
-  //   1 if $p_path is inside directory $p_dir
-  //   2 if $p_path is exactly the same as $p_dir
-  // --------------------------------------------------------------------------------
-  function PclZipUtilPathInclusion($p_dir, $p_path)
-  {
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilPathInclusion()
+// Description :
+//   This function indicates if the path $p_path is under the $p_dir tree. Or,
+//   said in an other way, if the file or sub-dir $p_path is inside the dir
+//   $p_dir.
+//   The function indicates also if the path is exactly the same as the dir.
+//   This function supports path with duplicated '/' like '//', but does not
+//   support '.' or '..' statements.
+// Parameters :
+// Return Values :
+//   0 if $p_path is not inside directory $p_dir
+//   1 if $p_path is inside directory $p_dir
+//   2 if $p_path is exactly the same as $p_dir
+// --------------------------------------------------------------------------------
+function PclZipUtilPathInclusion($p_dir, $p_path)
+{
     $v_result = 1;
-    
+
     // ----- Look for path beginning by ./
-    if (   ($p_dir == '.')
-        || ((strlen($p_dir) >=2) && (substr($p_dir, 0, 2) == './'))) {
-      $p_dir = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_dir, 1);
+    if (($p_dir == '.') || ((strlen($p_dir) >= 2) && (substr($p_dir, 0, 2) == './'))) {
+        $p_dir = PclZipUtilTranslateWinPath(getcwd(), false) . '/' . substr($p_dir, 1);
     }
-    if (   ($p_path == '.')
-        || ((strlen($p_path) >=2) && (substr($p_path, 0, 2) == './'))) {
-      $p_path = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_path, 1);
+    if (($p_path == '.') || ((strlen($p_path) >= 2) && (substr($p_path, 0, 2) == './'))) {
+        $p_path = PclZipUtilTranslateWinPath(getcwd(), false) . '/' . substr($p_path, 1);
     }
 
     // ----- Explode dir and path by directory separator
-    $v_list_dir = explode("/", $p_dir);
-    $v_list_dir_size = sizeof($v_list_dir);
-    $v_list_path = explode("/", $p_path);
+    $v_list_dir       = explode("/", $p_dir);
+    $v_list_dir_size  = sizeof($v_list_dir);
+    $v_list_path      = explode("/", $p_path);
     $v_list_path_size = sizeof($v_list_path);
 
     // ----- Study directories paths
@@ -5498,196 +5234,182 @@
     $j = 0;
     while (($i < $v_list_dir_size) && ($j < $v_list_path_size) && ($v_result)) {
 
-      // ----- Look for empty dir (path reduction)
-      if ($v_list_dir[$i] == '') {
+        // ----- Look for empty dir (path reduction)
+        if ($v_list_dir[$i] == '') {
+            $i++;
+            continue;
+        }
+        if ($v_list_path[$j] == '') {
+            $j++;
+            continue;
+        }
+
+        // ----- Compare the items
+        if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ($v_list_path[$j] != '')) {
+            $v_result = 0;
+        }
+
+        // ----- Next items
         $i++;
-        continue;
-      }
-      if ($v_list_path[$j] == '') {
         $j++;
-        continue;
-      }
-
-      // ----- Compare the items
-      if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ( $v_list_path[$j] != ''))  {
-        $v_result = 0;
-      }
-
-      // ----- Next items
-      $i++;
-      $j++;
     }
 
     // ----- Look if everything seems to be the same
     if ($v_result) {
-      // ----- Skip all the empty items
-      while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) $j++;
-      while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) $i++;
+        // ----- Skip all the empty items
+        while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) {
+            $j++;
+        }
+        while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) {
+            $i++;
+        }
 
-      if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {
-        // ----- There are exactly the same
-        $v_result = 2;
-      }
-      else if ($i < $v_list_dir_size) {
-        // ----- The path is shorter than the dir
-        $v_result = 0;
-      }
+        if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {
+            // ----- There are exactly the same
+            $v_result = 2;
+        } elseif ($i < $v_list_dir_size) {
+            // ----- The path is shorter than the dir
+            $v_result = 0;
+        }
     }
 
     // ----- Return
     return $v_result;
-  }
-  // --------------------------------------------------------------------------------
+}
+// --------------------------------------------------------------------------------
 
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilCopyBlock()
-  // Description :
-  // Parameters :
-  //   $p_mode : read/write compression mode
-  //             0 : src & dest normal
-  //             1 : src gzip, dest normal
-  //             2 : src normal, dest gzip
-  //             3 : src & dest gzip
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
-  {
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilCopyBlock()
+// Description :
+// Parameters :
+//   $p_mode : read/write compression mode
+//             0 : src & dest normal
+//             1 : src gzip, dest normal
+//             2 : src normal, dest gzip
+//             3 : src & dest gzip
+// Return Values :
+// --------------------------------------------------------------------------------
+function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode = 0)
+{
     $v_result = 1;
 
-    if ($p_mode==0)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @fread($p_src, $v_read_size);
-        @fwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==1)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @gzread($p_src, $v_read_size);
-        @fwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==2)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @fread($p_src, $v_read_size);
-        @gzwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==3)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @gzread($p_src, $v_read_size);
-        @gzwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
+    if ($p_mode == 0) {
+        while ($p_size != 0) {
+            $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($p_src, $v_read_size);
+            @fwrite($p_dest, $v_buffer, $v_read_size);
+            $p_size -= $v_read_size;
+        }
+    } elseif ($p_mode == 1) {
+        while ($p_size != 0) {
+            $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @gzread($p_src, $v_read_size);
+            @fwrite($p_dest, $v_buffer, $v_read_size);
+            $p_size -= $v_read_size;
+        }
+    } elseif ($p_mode == 2) {
+        while ($p_size != 0) {
+            $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($p_src, $v_read_size);
+            @gzwrite($p_dest, $v_buffer, $v_read_size);
+            $p_size -= $v_read_size;
+        }
+    } elseif ($p_mode == 3) {
+        while ($p_size != 0) {
+            $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @gzread($p_src, $v_read_size);
+            @gzwrite($p_dest, $v_buffer, $v_read_size);
+            $p_size -= $v_read_size;
+        }
     }
 
     // ----- Return
     return $v_result;
-  }
-  // --------------------------------------------------------------------------------
+}
+// --------------------------------------------------------------------------------
 
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilRename()
-  // Description :
-  //   This function tries to do a simple rename() function. If it fails, it
-  //   tries to copy the $p_src file in a new $p_dest file and then unlink the
-  //   first one.
-  // Parameters :
-  //   $p_src : Old filename
-  //   $p_dest : New filename
-  // Return Values :
-  //   1 on success, 0 on failure.
-  // --------------------------------------------------------------------------------
-  function PclZipUtilRename($p_src, $p_dest)
-  {
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilRename()
+// Description :
+//   This function tries to do a simple rename() function. If it fails, it
+//   tries to copy the $p_src file in a new $p_dest file and then unlink the
+//   first one.
+// Parameters :
+//   $p_src : Old filename
+//   $p_dest : New filename
+// Return Values :
+//   1 on success, 0 on failure.
+// --------------------------------------------------------------------------------
+function PclZipUtilRename($p_src, $p_dest)
+{
     $v_result = 1;
 
     // ----- Try to rename the files
     if (!@rename($p_src, $p_dest)) {
 
-      // ----- Try to copy & unlink the src
-      if (!@copy($p_src, $p_dest)) {
-        $v_result = 0;
-      }
-      else if (!@unlink($p_src)) {
-        $v_result = 0;
-      }
+        // ----- Try to copy & unlink the src
+        if (!@copy($p_src, $p_dest)) {
+            $v_result = 0;
+        } elseif (!@unlink($p_src)) {
+            $v_result = 0;
+        }
     }
 
     // ----- Return
     return $v_result;
-  }
-  // --------------------------------------------------------------------------------
+}
+// --------------------------------------------------------------------------------
+
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilOptionText()
+// Description :
+//   Translate option value in text. Mainly for debug purpose.
+// Parameters :
+//   $p_option : the option value.
+// Return Values :
+//   The option text value.
+// --------------------------------------------------------------------------------
+function PclZipUtilOptionText($p_option)
+{
 
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilOptionText()
-  // Description :
-  //   Translate option value in text. Mainly for debug purpose.
-  // Parameters :
-  //   $p_option : the option value.
-  // Return Values :
-  //   The option text value.
-  // --------------------------------------------------------------------------------
-  function PclZipUtilOptionText($p_option)
-  {
-    
     $v_list = get_defined_constants();
     for (reset($v_list); $v_key = key($v_list); next($v_list)) {
-	    $v_prefix = substr($v_key, 0, 10);
-	    if ((   ($v_prefix == 'PCLZIP_OPT')
-           || ($v_prefix == 'PCLZIP_CB_')
-           || ($v_prefix == 'PCLZIP_ATT'))
-	        && ($v_list[$v_key] == $p_option)) {
-        return $v_key;
-	    }
+        $v_prefix = substr($v_key, 0, 10);
+        if ((($v_prefix == 'PCLZIP_OPT') || ($v_prefix == 'PCLZIP_CB_') || ($v_prefix == 'PCLZIP_ATT')) && ($v_list[$v_key] == $p_option)) {
+            return $v_key;
+        }
     }
-    
+
     $v_result = 'Unknown';
 
     return $v_result;
-  }
-  // --------------------------------------------------------------------------------
+}
+// --------------------------------------------------------------------------------
 
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilTranslateWinPath()
-  // Description :
-  //   Translate windows path by replacing '\' by '/' and optionally removing
-  //   drive letter.
-  // Parameters :
-  //   $p_path : path to translate.
-  //   $p_remove_disk_letter : true | false
-  // Return Values :
-  //   The path translated.
-  // --------------------------------------------------------------------------------
-  function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter=true)
-  {
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilTranslateWinPath()
+// Description :
+//   Translate windows path by replacing '\' by '/' and optionally removing
+//   drive letter.
+// Parameters :
+//   $p_path : path to translate.
+//   $p_remove_disk_letter : true | false
+// Return Values :
+//   The path translated.
+// --------------------------------------------------------------------------------
+function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter = true)
+{
     if (stristr(php_uname(), 'windows')) {
-      // ----- Look for potential disk letter
-      if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
-          $p_path = substr($p_path, $v_position+1);
-      }
-      // ----- Change potential windows directory separator
-      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
-          $p_path = strtr($p_path, '\\', '/');
-      }
+        // ----- Look for potential disk letter
+        if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
+            $p_path = substr($p_path, $v_position + 1);
+        }
+        // ----- Change potential windows directory separator
+        if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1) == '\\')) {
+            $p_path = strtr($p_path, '\\', '/');
+        }
     }
+
     return $p_path;
-  }
-  // --------------------------------------------------------------------------------
-
-
-?>
+}
+// --------------------------------------------------------------------------------
diff --git a/htdocs/includes/odtphp/zip/pclzip/readme.txt b/htdocs/includes/odtphp/zip/pclzip/readme.txt
index c5d2486d3ef..f0281349345 100644
--- a/htdocs/includes/odtphp/zip/pclzip/readme.txt
+++ b/htdocs/includes/odtphp/zip/pclzip/readme.txt
@@ -1,15 +1,14 @@
 // --------------------------------------------------------------------------------
-// PclZip 2.8.2 - readme.txt
+// PclZip 2.8.4 - readme.txt
 // --------------------------------------------------------------------------------
 // License GNU/LGPL - August 2009
 // Vincent Blavet - vincent@phpconcept.net
 // http://www.phpconcept.net
 // --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
 
 
 
-0 - Sommaire
+0 - Summary
 ============
     1 - Introduction
     2 - What's new
@@ -31,12 +30,18 @@
 2 - What's new
 ==============
 
+  Version 2.8.4 :
+    - Update composer.json to indicate that pclzip/pclzip is replaced
+
+  Version 2.8.3 :
+    - Fix compatibility with PHP v7.1
+    
   Version 2.8.2 :
-    - PCLZIP_CB_PRE_EXTRACT and PCLZIP_CB_POST_EXTRACT are now supported with 
+    - PCLZIP_CB_PRE_EXTRACT and PCLZIP_CB_POST_EXTRACT are now supported with
       extraction as a string (PCLZIP_OPT_EXTRACT_AS_STRING). The string
       can also be modified in the post-extract call back.
     **Bugs correction :
-    - PCLZIP_OPT_REMOVE_ALL_PATH was not working correctly    
+    - PCLZIP_OPT_REMOVE_ALL_PATH was not working correctly
     - Remove use of eval() and do direct call to callback functions
     - Correct support of 64bits systems (Thanks to WordPress team)
 
@@ -44,7 +49,7 @@
     - Move option PCLZIP_OPT_BY_EREG to PCLZIP_OPT_BY_PREG because ereg() is
       deprecated in PHP 5.3. When using option PCLZIP_OPT_BY_EREG, PclZip will
       automatically replace it by PCLZIP_OPT_BY_PREG.
-  
+
   Version 2.8 :
     - Improve extraction of zip archive for large files by using temporary files
       This feature is working like the one defined in r2.7.
@@ -61,7 +66,7 @@
       when large file is suspected.
       This feature can also ne triggered by manual options in create() and add()
       methods. 'PCLZIP_OPT_ADD_TEMP_FILE_ON' force the use of temporary files,
-      'PCLZIP_OPT_ADD_TEMP_FILE_OFF' disable the autosense technic, 
+      'PCLZIP_OPT_ADD_TEMP_FILE_OFF' disable the autosense technic,
       'PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD' allow for configuration of a size
       threshold to use temporary files.
       Using "temporary files" rather than "memory" might take more time, but
@@ -78,7 +83,7 @@
     - Code optimisation
     - New attributes PCLZIP_ATT_FILE_COMMENT gives the ability to
       add a comment for a specific file. (Don't really know if this is usefull)
-    - New attribute PCLZIP_ATT_FILE_CONTENT gives the ability to add a string 
+    - New attribute PCLZIP_ATT_FILE_CONTENT gives the ability to add a string
       as a file.
     - New attribute PCLZIP_ATT_FILE_MTIME modify the timestamp associated with
       a file.
@@ -88,12 +93,12 @@
       action.
     - Add missing closedir() statement.
     - When adding a folder, and removing the path of this folder, files were
-      incorrectly added with a '/' at the beginning. Which means files are 
+      incorrectly added with a '/' at the beginning. Which means files are
       related to root in unix systems. Corrected.
     - Add conditional if before constant definition. This will allow users
       to redefine constants without changing the file, and then improve
       upgrade of pclzip code for new versions.
-  
+
   Version 2.5 :
     - Introduce the ability to add file/folder with individual properties (file descriptor).
       This gives for example the ability to change the filename of a zipped file.
@@ -111,19 +116,19 @@
     - New error code : PCLZIP_ERR_DIRECTORY_RESTRICTION
     - Modification in PclZipUtilPathInclusion() : dir and path beginning with ./ will be prepend
       by current path (getcwd())
-  
+
   Version 2.4 :
     - Code improvment : try to speed up the code by removing unusefull call to pack()
     - Correct bug in delete() : delete() should be called with no argument. This was not
       the case in 2.3. This is corrected in 2.4.
     - Correct a bug in path_inclusion function. When the path has several '../../', the
       result was bad.
-    - Add a check for magic_quotes_runtime configuration. If enabled, PclZip will 
+    - Add a check for magic_quotes_runtime configuration. If enabled, PclZip will
       disable it while working and det it back to its original value.
       This resolve a lots of bad formated archive errors.
     - Bug correction : PclZip now correctly unzip file in some specific situation,
       when compressed content has same size as uncompressed content.
-    - Bug correction : When selecting option 'PCLZIP_OPT_REMOVE_ALL_PATH', 
+    - Bug correction : When selecting option 'PCLZIP_OPT_REMOVE_ALL_PATH',
       directories are not any more created.
     - Code improvment : correct unclosed opendir(), better handling of . and .. in
       loops.
@@ -174,7 +179,7 @@
     - Add support for parameters PCLZIP_OPT_COMMENT, PCLZIP_OPT_ADD_COMMENT,
       PCLZIP_OPT_PREPEND_COMMENT. This will create, replace, add, or prepend comments
       in the zip archive.
-    - When merging two archives, the comments are not any more lost, but merged, with a 
+    - When merging two archives, the comments are not any more lost, but merged, with a
       blank space separator.
     - Corrected bug : Files are not deleted when all files are asked to be deleted.
     - Corrected bug : Folders with name '0' made PclZip to abort the create or add feature.
@@ -183,12 +188,12 @@
   Version 2.0 :
     ***** Warning : Some new features may break the backward compatibility for your scripts.
                     Please carefully read the readme file.
-    - Add the ability to delete by Index, name and regular expression. This feature is 
+    - Add the ability to delete by Index, name and regular expression. This feature is
       performed by the method delete(), which uses the optional parameters
       PCLZIP_OPT_BY_INDEX, PCLZIP_OPT_BY_NAME, PCLZIP_OPT_BY_EREG or PCLZIP_OPT_BY_PREG.
     - Add the ability to extract by regular expression. To extract by regexp you must use the method
-      extract(), with the option PCLZIP_OPT_BY_EREG or PCLZIP_OPT_BY_PREG 
-      (depending if you want to use ereg() or preg_match() syntax) followed by the 
+      extract(), with the option PCLZIP_OPT_BY_EREG or PCLZIP_OPT_BY_PREG
+      (depending if you want to use ereg() or preg_match() syntax) followed by the
       regular expression pattern.
     - Add the ability to extract by index, directly with the extract() method. This is a
       code improvment of the extractByIndex() method.
@@ -204,7 +209,7 @@
       The default separator is now a comma (,) and not any more a blank space.
       THIS BREAK THE BACKWARD COMPATIBILITY : Please check if this may have an impact with
       your script.
-    - Improve algorythm performance by removing the use of temporary files when adding or 
+    - Improve algorythm performance by removing the use of temporary files when adding or
       extracting files in an archive.
     - Add (correct) detection of empty filename zipping. This can occurs when the removed
       path is the same
@@ -299,7 +304,7 @@
 
   Corrected in Version 2.0 :
     - Corrected : During an extraction, if a call-back fucntion is used and try to skip
-                  a file, all the extraction process is stopped. 
+                  a file, all the extraction process is stopped.
 
   Corrected in Version 1.3 :
     - Corrected : Support of static synopsis for method extract() is broken.
@@ -344,7 +349,7 @@
   In Version 2.x :
     - PclZip does only support file uncompressed or compressed with deflate (compression method 8)
     - PclZip does not support password protected zip archive
-    - Some concern were seen when changing mtime of a file while archiving. 
+    - Some concern were seen when changing mtime of a file while archiving.
       Seems to be linked to Daylight Saving Time (PclTest_changing_mtime).
 
   In Version 1.2 :
diff --git a/htdocs/includes/phpoffice/phpexcel/.gitattributes b/htdocs/includes/phpoffice/phpexcel/.gitattributes
deleted file mode 100644
index 1bc28be4bde..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/.gitattributes
+++ /dev/null
@@ -1,4 +0,0 @@
-/Build export-ignore
-/Documentation export-ignore
-/Tests export-ignore
-README.md export-ignore
diff --git a/htdocs/includes/phpoffice/phpexcel/.gitignore b/htdocs/includes/phpoffice/phpexcel/.gitignore
deleted file mode 100644
index dea03b5e112..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-build/PHPExcel.phar
-unitTests/codeCoverage
-analysis
-
-## IDE support
-*.buildpath
-*.project
-/.settings
-/.idea
diff --git a/htdocs/includes/phpoffice/phpexcel/.travis.yml b/htdocs/includes/phpoffice/phpexcel/.travis.yml
deleted file mode 100644
index c35625b132f..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/.travis.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-language: php
-
-php:
-  - 5.2
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
- 
-matrix:
-    allow_failures:
-        - php: hhvm
-
-script:
- - phpunit -c ./unitTests/
-
-notifications:
-  email: false
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel.php
deleted file mode 100644
index d27de51a2b3..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel.php
+++ /dev/null
@@ -1,1139 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/');
-    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/**
- * PHPExcel
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel
-{
-    /**
-     * Unique ID
-     *
-     * @var string
-     */
-    private $_uniqueID;
-
-    /**
-     * Document properties
-     *
-     * @var PHPExcel_DocumentProperties
-     */
-    private $_properties;
-
-    /**
-     * Document security
-     *
-     * @var PHPExcel_DocumentSecurity
-     */
-    private $_security;
-
-    /**
-     * Collection of Worksheet objects
-     *
-     * @var PHPExcel_Worksheet[]
-     */
-    private $_workSheetCollection = array();
-
-    /**
-	 * Calculation Engine
-	 *
-	 * @var PHPExcel_Calculation
-	 */
-	private $_calculationEngine = NULL;
-
-    /**
-     * Active sheet index
-     *
-     * @var int
-     */
-    private $_activeSheetIndex = 0;
-
-    /**
-     * Named ranges
-     *
-     * @var PHPExcel_NamedRange[]
-     */
-    private $_namedRanges = array();
-
-    /**
-     * CellXf supervisor
-     *
-     * @var PHPExcel_Style
-     */
-    private $_cellXfSupervisor;
-
-    /**
-     * CellXf collection
-     *
-     * @var PHPExcel_Style[]
-     */
-    private $_cellXfCollection = array();
-
-    /**
-     * CellStyleXf collection
-     *
-     * @var PHPExcel_Style[]
-     */
-    private $_cellStyleXfCollection = array();
-
-	/**
-	* _hasMacros : this workbook have macros ?
-	*
-	* @var bool
-	*/
-	private $_hasMacros = FALSE;
-
-	/**
-	* _macrosCode : all macros code (the vbaProject.bin file, this include form, code,  etc.), NULL if no macro
-	*
-	* @var binary
-	*/
-	private $_macrosCode=NULL;
-	/**
-	* _macrosCertificate : if macros are signed, contains vbaProjectSignature.bin file, NULL if not signed
-	*
-	* @var binary
-	*/
-	private $_macrosCertificate=NULL;
-
-	/**
-	* _ribbonXMLData : NULL if workbook is'nt Excel 2007 or not contain a customized UI
-	*
-	* @var NULL|string
-	*/
-	private $_ribbonXMLData=NULL;
-
-	/**
-	* _ribbonBinObjects : NULL if workbook is'nt Excel 2007 or not contain embedded objects (picture(s)) for Ribbon Elements
-	* ignored if $_ribbonXMLData is null
-	*
-	* @var NULL|array
-	*/
-	private $_ribbonBinObjects=NULL;
-
-	/**
-	* The workbook has macros ?
-	*
-	* @return true if workbook has macros, false if not
-	*/
-	public function hasMacros(){
-		return $this->_hasMacros;
-	}
-
-	/**
-	* Define if a workbook has macros
-	*
-	* @param true|false
-	*/
-	public function setHasMacros($hasMacros=false){
-		$this->_hasMacros=(bool)$hasMacros;
-	}
-
-	/**
-	* Set the macros code
-	*
-	* @param binary string|null
-	*/
-	public function setMacrosCode($MacrosCode){
-		$this->_macrosCode=$MacrosCode;
-		$this->setHasMacros(!is_null($MacrosCode));
-	}
-
-	/**
-	* Return the macros code
-	*
-	* @return binary|null
-	*/
-	public function getMacrosCode(){
-		return $this->_macrosCode;
-	}
-
-	/**
-	* Set the macros certificate
-	*
-	* @param binary|null
-	*/
-	public function setMacrosCertificate($Certificate=NULL){
-		$this->_macrosCertificate=$Certificate;
-	}
-
-	/**
-	* Is the project signed ?
-	*
-	* @return true|false
-	*/
-	public function hasMacrosCertificate(){
-		return !is_null($this->_macrosCertificate);
-	}
-
-	/**
-	* Return the macros certificate
-	*
-	* @return binary|null
-	*/
-	public function getMacrosCertificate(){
-		return $this->_macrosCertificate;
-	}
-
-	/**
-	* Remove all macros, certificate from spreadsheet
-	*
-	* @param none
-	* @return void
-	*/
-	public function discardMacros(){
-		$this->_hasMacros=false;
-		$this->_macrosCode=NULL;
-		$this->_macrosCertificate=NULL;
-	}
-
-	/**
-	* set ribbon XML data
-	*
-	*/
-	public function setRibbonXMLData($Target=NULL, $XMLData=NULL){
-		if(!is_null($Target) && !is_null($XMLData)){
-			$this->_ribbonXMLData=array('target'=>$Target, 'data'=>$XMLData);
-		}else{
-			$this->_ribbonXMLData=NULL;
-		}
-	}
-
-	/**
-	* retrieve ribbon XML Data
-	*
-	* return string|null|array
-	*/
-	public function getRibbonXMLData($What='all'){//we need some constants here...
-		$ReturnData=NULL;
-		$What=strtolower($What);
-		switch($What){
-		case 'all':
-			$ReturnData=$this->_ribbonXMLData;
-			break;
-		case 'target':
-		case 'data':
-			if(is_array($this->_ribbonXMLData) && array_key_exists($What,$this->_ribbonXMLData)){
-				$ReturnData=$this->_ribbonXMLData[$What];
-			}//else $ReturnData stay at null
-			break;
-		}//default: $ReturnData at null
-		return $ReturnData;
-	}
-
-	/**
-	* store binaries ribbon objects (pictures)
-	*
-	*/
-	public function setRibbonBinObjects($BinObjectsNames=NULL, $BinObjectsData=NULL){
-		if(!is_null($BinObjectsNames) && !is_null($BinObjectsData)){
-			$this->_ribbonBinObjects=array('names'=>$BinObjectsNames, 'data'=>$BinObjectsData);
-		}else{
-			$this->_ribbonBinObjects=NULL;
-		}
-	}
-	/**
-	* return the extension of a filename. Internal use for a array_map callback (php<5.3 don't like lambda function)
-	*
-	*/
-	private function _getExtensionOnly($ThePath){
-		return pathinfo($ThePath, PATHINFO_EXTENSION);
-	}
-
-	/**
-	* retrieve Binaries Ribbon Objects
-	*
-	*/
-	public function getRibbonBinObjects($What='all'){
-		$ReturnData=NULL;
-		$What=strtolower($What);
-		switch($What){
-		case 'all':
-			return $this->_ribbonBinObjects;
-			break;
-		case 'names':
-		case 'data':
-			if(is_array($this->_ribbonBinObjects) && array_key_exists($What, $this->_ribbonBinObjects)){
-				$ReturnData=$this->_ribbonBinObjects[$What];
-			}
-			break;
-		case 'types':
-			if(is_array($this->_ribbonBinObjects) && array_key_exists('data', $this->_ribbonBinObjects) && is_array($this->_ribbonBinObjects['data'])){
-				$tmpTypes=array_keys($this->_ribbonBinObjects['data']);
-				$ReturnData=array_unique(array_map(array($this,'_getExtensionOnly'), $tmpTypes));
-			}else
-				$ReturnData=array();//the caller want an array... not null if empty
-			break;
-		}
-		return $ReturnData;
-	}
-
-	/**
-	* This workbook have a custom UI ?
-	*
-	* @return true|false
-	*/
-	public function hasRibbon(){
-		return !is_null($this->_ribbonXMLData);
-	}
-
-	/**
-	* This workbook have additionnal object for the ribbon ?
-	*
-	* @return true|false
-	*/
-	public function hasRibbonBinObjects(){
-		return !is_null($this->_ribbonBinObjects);
-	}
-
-	/**
-     * Check if a sheet with a specified code name already exists
-     *
-     * @param string $pSheetCodeName  Name of the worksheet to check
-     * @return boolean
-     */
-    public function sheetCodeNameExists($pSheetCodeName)
-    {
-		return ($this->getSheetByCodeName($pSheetCodeName) !== NULL);
-    }
-
-	/**
-	 * Get sheet by code name. Warning : sheet don't have always a code name !
-	 *
-	 * @param string $pName Sheet name
-	 * @return PHPExcel_Worksheet
-	 */
-	public function getSheetByCodeName($pName = '')
-	{
-		$worksheetCount = count($this->_workSheetCollection);
-		for ($i = 0; $i < $worksheetCount; ++$i) {
-			if ($this->_workSheetCollection[$i]->getCodeName() == $pName) {
-				return $this->_workSheetCollection[$i];
-			}
-		}
-
-		return null;
-	}
-
-	 /**
-	 * Create a new PHPExcel with one Worksheet
-	 */
-	public function __construct()
-	{
-		$this->_uniqueID = uniqid();
-		$this->_calculationEngine	= PHPExcel_Calculation::getInstance($this);
-
-		// Initialise worksheet collection and add one worksheet
-		$this->_workSheetCollection = array();
-		$this->_workSheetCollection[] = new PHPExcel_Worksheet($this);
-		$this->_activeSheetIndex = 0;
-
-        // Create document properties
-        $this->_properties = new PHPExcel_DocumentProperties();
-
-        // Create document security
-        $this->_security = new PHPExcel_DocumentSecurity();
-
-        // Set named ranges
-        $this->_namedRanges = array();
-
-        // Create the cellXf supervisor
-        $this->_cellXfSupervisor = new PHPExcel_Style(true);
-        $this->_cellXfSupervisor->bindParent($this);
-
-        // Create the default style
-        $this->addCellXf(new PHPExcel_Style);
-        $this->addCellStyleXf(new PHPExcel_Style);
-    }
-
-    /**
-     * Code to execute when this worksheet is unset()
-     *
-     */
-    public function __destruct() {
-        PHPExcel_Calculation::unsetInstance($this);
-        $this->disconnectWorksheets();
-    }    //    function __destruct()
-
-    /**
-     * Disconnect all worksheets from this PHPExcel workbook object,
-     *    typically so that the PHPExcel object can be unset
-     *
-     */
-    public function disconnectWorksheets()
-    {
-    	$worksheet = NULL;
-        foreach($this->_workSheetCollection as $k => &$worksheet) {
-            $worksheet->disconnectCells();
-            $this->_workSheetCollection[$k] = null;
-        }
-        unset($worksheet);
-        $this->_workSheetCollection = array();
-    }
-
-	/**
-	 * Return the calculation engine for this worksheet
-	 *
-	 * @return PHPExcel_Calculation
-	 */
-	public function getCalculationEngine()
-	{
-		return $this->_calculationEngine;
-	}	//	function getCellCacheController()
-
-    /**
-     * Get properties
-     *
-     * @return PHPExcel_DocumentProperties
-     */
-    public function getProperties()
-    {
-        return $this->_properties;
-    }
-
-    /**
-     * Set properties
-     *
-     * @param PHPExcel_DocumentProperties    $pValue
-     */
-    public function setProperties(PHPExcel_DocumentProperties $pValue)
-    {
-        $this->_properties = $pValue;
-    }
-
-    /**
-     * Get security
-     *
-     * @return PHPExcel_DocumentSecurity
-     */
-    public function getSecurity()
-    {
-        return $this->_security;
-    }
-
-    /**
-     * Set security
-     *
-     * @param PHPExcel_DocumentSecurity    $pValue
-     */
-    public function setSecurity(PHPExcel_DocumentSecurity $pValue)
-    {
-        $this->_security = $pValue;
-    }
-
-    /**
-     * Get active sheet
-     *
-     * @return PHPExcel_Worksheet
-     *
-     * @throws PHPExcel_Exception
-     */
-    public function getActiveSheet()
-    {
-        return $this->getSheet($this->_activeSheetIndex);
-    }
-
-    /**
-     * Create sheet and add it to this workbook
-     *
-     * @param  int|null $iSheetIndex Index where sheet should go (0,1,..., or null for last)
-     * @return PHPExcel_Worksheet
-     * @throws PHPExcel_Exception
-     */
-    public function createSheet($iSheetIndex = NULL)
-    {
-        $newSheet = new PHPExcel_Worksheet($this);
-        $this->addSheet($newSheet, $iSheetIndex);
-        return $newSheet;
-    }
-
-    /**
-     * Check if a sheet with a specified name already exists
-     *
-     * @param  string $pSheetName  Name of the worksheet to check
-     * @return boolean
-     */
-    public function sheetNameExists($pSheetName)
-    {
-        return ($this->getSheetByName($pSheetName) !== NULL);
-    }
-
-    /**
-     * Add sheet
-     *
-     * @param  PHPExcel_Worksheet $pSheet
-     * @param  int|null $iSheetIndex Index where sheet should go (0,1,..., or null for last)
-     * @return PHPExcel_Worksheet
-     * @throws PHPExcel_Exception
-     */
-    public function addSheet(PHPExcel_Worksheet $pSheet, $iSheetIndex = NULL)
-    {
-        if ($this->sheetNameExists($pSheet->getTitle())) {
-            throw new PHPExcel_Exception(
-            	"Workbook already contains a worksheet named '{$pSheet->getTitle()}'. Rename this worksheet first."
-            );
-        }
-
-        if($iSheetIndex === NULL) {
-            if ($this->_activeSheetIndex < 0) {
-                $this->_activeSheetIndex = 0;
-            }
-            $this->_workSheetCollection[] = $pSheet;
-        } else {
-            // Insert the sheet at the requested index
-            array_splice(
-                $this->_workSheetCollection,
-                $iSheetIndex,
-                0,
-                array($pSheet)
-                );
-
-            // Adjust active sheet index if necessary
-            if ($this->_activeSheetIndex >= $iSheetIndex) {
-                ++$this->_activeSheetIndex;
-            }
-        }
-
-        if ($pSheet->getParent() === null) {
-            $pSheet->rebindParent($this);
-        }
-
-        return $pSheet;
-    }
-
-    /**
-     * Remove sheet by index
-     *
-     * @param  int $pIndex Active sheet index
-     * @throws PHPExcel_Exception
-     */
-    public function removeSheetByIndex($pIndex = 0)
-    {
-
-        $numSheets = count($this->_workSheetCollection);
-
-        if ($pIndex > $numSheets - 1) {
-            throw new PHPExcel_Exception(
-            	"You tried to remove a sheet by the out of bounds index: {$pIndex}. The actual number of sheets is {$numSheets}."
-            );
-        } else {
-            array_splice($this->_workSheetCollection, $pIndex, 1);
-        }
-        // Adjust active sheet index if necessary
-        if (($this->_activeSheetIndex >= $pIndex) &&
-            ($pIndex > count($this->_workSheetCollection) - 1)) {
-            --$this->_activeSheetIndex;
-        }
-
-    }
-
-    /**
-     * Get sheet by index
-     *
-     * @param  int $pIndex Sheet index
-     * @return PHPExcel_Worksheet
-     * @throws PHPExcel_Exception
-     */
-    public function getSheet($pIndex = 0)
-    {
-        if (!isset($this->_workSheetCollection[$pIndex])) {
-            $numSheets = $this->getSheetCount();
-            throw new PHPExcel_Exception(
-                "Your requested sheet index: {$pIndex} is out of bounds. The actual number of sheets is {$numSheets}."
-            );
-        }
-
-        return $this->_workSheetCollection[$pIndex];
-    }
-
-    /**
-     * Get all sheets
-     *
-     * @return PHPExcel_Worksheet[]
-     */
-    public function getAllSheets()
-    {
-        return $this->_workSheetCollection;
-    }
-
-    /**
-     * Get sheet by name
-     *
-     * @param  string $pName Sheet name
-     * @return PHPExcel_Worksheet
-     */
-    public function getSheetByName($pName = '')
-    {
-        $worksheetCount = count($this->_workSheetCollection);
-        for ($i = 0; $i < $worksheetCount; ++$i) {
-            if ($this->_workSheetCollection[$i]->getTitle() === $pName) {
-                return $this->_workSheetCollection[$i];
-            }
-        }
-
-        return NULL;
-    }
-
-    /**
-     * Get index for sheet
-     *
-     * @param  PHPExcel_Worksheet $pSheet
-     * @return Sheet index
-     * @throws PHPExcel_Exception
-     */
-    public function getIndex(PHPExcel_Worksheet $pSheet)
-    {
-        foreach ($this->_workSheetCollection as $key => $value) {
-            if ($value->getHashCode() == $pSheet->getHashCode()) {
-                return $key;
-            }
-        }
-
-        throw new PHPExcel_Exception("Sheet does not exist.");
-    }
-
-    /**
-     * Set index for sheet by sheet name.
-     *
-     * @param  string $sheetName Sheet name to modify index for
-     * @param  int $newIndex New index for the sheet
-     * @return New sheet index
-     * @throws PHPExcel_Exception
-     */
-    public function setIndexByName($sheetName, $newIndex)
-    {
-        $oldIndex = $this->getIndex($this->getSheetByName($sheetName));
-        $pSheet = array_splice(
-            $this->_workSheetCollection,
-            $oldIndex,
-            1
-        );
-        array_splice(
-            $this->_workSheetCollection,
-            $newIndex,
-            0,
-            $pSheet
-        );
-        return $newIndex;
-    }
-
-    /**
-     * Get sheet count
-     *
-     * @return int
-     */
-    public function getSheetCount()
-    {
-        return count($this->_workSheetCollection);
-    }
-
-    /**
-     * Get active sheet index
-     *
-     * @return int Active sheet index
-     */
-    public function getActiveSheetIndex()
-    {
-        return $this->_activeSheetIndex;
-    }
-
-    /**
-     * Set active sheet index
-     *
-     * @param  int $pIndex Active sheet index
-     * @throws PHPExcel_Exception
-     * @return PHPExcel_Worksheet
-     */
-    public function setActiveSheetIndex($pIndex = 0)
-    {
-        $numSheets = count($this->_workSheetCollection);
-
-        if ($pIndex > $numSheets - 1) {
-            throw new PHPExcel_Exception(
-            	"You tried to set a sheet active by the out of bounds index: {$pIndex}. The actual number of sheets is {$numSheets}."
-            );
-        } else {
-            $this->_activeSheetIndex = $pIndex;
-        }
-        return $this->getActiveSheet();
-    }
-
-    /**
-     * Set active sheet index by name
-     *
-     * @param  string $pValue Sheet title
-     * @return PHPExcel_Worksheet
-     * @throws PHPExcel_Exception
-     */
-    public function setActiveSheetIndexByName($pValue = '')
-    {
-        if (($worksheet = $this->getSheetByName($pValue)) instanceof PHPExcel_Worksheet) {
-            $this->setActiveSheetIndex($this->getIndex($worksheet));
-            return $worksheet;
-        }
-
-        throw new PHPExcel_Exception('Workbook does not contain sheet:' . $pValue);
-    }
-
-    /**
-     * Get sheet names
-     *
-     * @return string[]
-     */
-    public function getSheetNames()
-    {
-        $returnValue = array();
-        $worksheetCount = $this->getSheetCount();
-        for ($i = 0; $i < $worksheetCount; ++$i) {
-            $returnValue[] = $this->getSheet($i)->getTitle();
-        }
-
-        return $returnValue;
-    }
-
-    /**
-     * Add external sheet
-     *
-     * @param  PHPExcel_Worksheet $pSheet External sheet to add
-     * @param  int|null $iSheetIndex Index where sheet should go (0,1,..., or null for last)
-     * @throws PHPExcel_Exception
-     * @return PHPExcel_Worksheet
-     */
-    public function addExternalSheet(PHPExcel_Worksheet $pSheet, $iSheetIndex = null) {
-        if ($this->sheetNameExists($pSheet->getTitle())) {
-            throw new PHPExcel_Exception("Workbook already contains a worksheet named '{$pSheet->getTitle()}'. Rename the external sheet first.");
-        }
-
-        // count how many cellXfs there are in this workbook currently, we will need this below
-        $countCellXfs = count($this->_cellXfCollection);
-
-        // copy all the shared cellXfs from the external workbook and append them to the current
-        foreach ($pSheet->getParent()->getCellXfCollection() as $cellXf) {
-            $this->addCellXf(clone $cellXf);
-        }
-
-        // move sheet to this workbook
-        $pSheet->rebindParent($this);
-
-        // update the cellXfs
-        foreach ($pSheet->getCellCollection(false) as $cellID) {
-            $cell = $pSheet->getCell($cellID);
-            $cell->setXfIndex( $cell->getXfIndex() + $countCellXfs );
-        }
-
-        return $this->addSheet($pSheet, $iSheetIndex);
-    }
-
-    /**
-     * Get named ranges
-     *
-     * @return PHPExcel_NamedRange[]
-     */
-    public function getNamedRanges() {
-        return $this->_namedRanges;
-    }
-
-    /**
-     * Add named range
-     *
-     * @param  PHPExcel_NamedRange $namedRange
-     * @return PHPExcel
-     */
-    public function addNamedRange(PHPExcel_NamedRange $namedRange) {
-        if ($namedRange->getScope() == null) {
-            // global scope
-            $this->_namedRanges[$namedRange->getName()] = $namedRange;
-        } else {
-            // local scope
-            $this->_namedRanges[$namedRange->getScope()->getTitle().'!'.$namedRange->getName()] = $namedRange;
-        }
-        return true;
-    }
-
-    /**
-     * Get named range
-     *
-     * @param  string $namedRange
-     * @param  PHPExcel_Worksheet|null $pSheet Scope. Use null for global scope
-     * @return PHPExcel_NamedRange|null
-     */
-    public function getNamedRange($namedRange, PHPExcel_Worksheet $pSheet = null) {
-        $returnValue = null;
-
-        if ($namedRange != '' && ($namedRange !== NULL)) {
-            // first look for global defined name
-            if (isset($this->_namedRanges[$namedRange])) {
-                $returnValue = $this->_namedRanges[$namedRange];
-            }
-
-            // then look for local defined name (has priority over global defined name if both names exist)
-            if (($pSheet !== NULL) && isset($this->_namedRanges[$pSheet->getTitle() . '!' . $namedRange])) {
-                $returnValue = $this->_namedRanges[$pSheet->getTitle() . '!' . $namedRange];
-            }
-        }
-
-        return $returnValue;
-    }
-
-    /**
-     * Remove named range
-     *
-     * @param  string  $namedRange
-     * @param  PHPExcel_Worksheet|null  $pSheet  Scope: use null for global scope.
-     * @return PHPExcel
-     */
-    public function removeNamedRange($namedRange, PHPExcel_Worksheet $pSheet = null) {
-        if ($pSheet === NULL) {
-            if (isset($this->_namedRanges[$namedRange])) {
-                unset($this->_namedRanges[$namedRange]);
-            }
-        } else {
-            if (isset($this->_namedRanges[$pSheet->getTitle() . '!' . $namedRange])) {
-                unset($this->_namedRanges[$pSheet->getTitle() . '!' . $namedRange]);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Get worksheet iterator
-     *
-     * @return PHPExcel_WorksheetIterator
-     */
-    public function getWorksheetIterator() {
-        return new PHPExcel_WorksheetIterator($this);
-    }
-
-    /**
-     * Copy workbook (!= clone!)
-     *
-     * @return PHPExcel
-     */
-    public function copy() {
-        $copied = clone $this;
-
-        $worksheetCount = count($this->_workSheetCollection);
-        for ($i = 0; $i < $worksheetCount; ++$i) {
-            $this->_workSheetCollection[$i] = $this->_workSheetCollection[$i]->copy();
-            $this->_workSheetCollection[$i]->rebindParent($this);
-        }
-
-        return $copied;
-    }
-
-    /**
-     * Implement PHP __clone to create a deep clone, not just a shallow copy.
-     */
-    public function __clone() {
-        foreach($this as $key => $val) {
-            if (is_object($val) || (is_array($val))) {
-                $this->{$key} = unserialize(serialize($val));
-            }
-        }
-    }
-
-    /**
-     * Get the workbook collection of cellXfs
-     *
-     * @return PHPExcel_Style[]
-     */
-    public function getCellXfCollection()
-    {
-        return $this->_cellXfCollection;
-    }
-
-    /**
-     * Get cellXf by index
-     *
-     * @param  int $pIndex
-     * @return PHPExcel_Style
-     */
-    public function getCellXfByIndex($pIndex = 0)
-    {
-        return $this->_cellXfCollection[$pIndex];
-    }
-
-    /**
-     * Get cellXf by hash code
-     *
-     * @param  string $pValue
-     * @return PHPExcel_Style|false
-     */
-    public function getCellXfByHashCode($pValue = '')
-    {
-        foreach ($this->_cellXfCollection as $cellXf) {
-            if ($cellXf->getHashCode() == $pValue) {
-                return $cellXf;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Check if style exists in style collection
-     *
-     * @param  PHPExcel_Style $pCellStyle
-     * @return boolean
-     */
-    public function cellXfExists($pCellStyle = null)
-    {
-        return in_array($pCellStyle, $this->_cellXfCollection, true);
-    }
-
-    /**
-     * Get default style
-     *
-     * @return PHPExcel_Style
-     * @throws PHPExcel_Exception
-     */
-    public function getDefaultStyle()
-    {
-        if (isset($this->_cellXfCollection[0])) {
-            return $this->_cellXfCollection[0];
-        }
-        throw new PHPExcel_Exception('No default style found for this workbook');
-    }
-
-    /**
-     * Add a cellXf to the workbook
-     *
-     * @param PHPExcel_Style $style
-     */
-    public function addCellXf(PHPExcel_Style $style)
-    {
-        $this->_cellXfCollection[] = $style;
-        $style->setIndex(count($this->_cellXfCollection) - 1);
-    }
-
-    /**
-     * Remove cellXf by index. It is ensured that all cells get their xf index updated.
-     *
-     * @param  int $pIndex Index to cellXf
-     * @throws PHPExcel_Exception
-     */
-    public function removeCellXfByIndex($pIndex = 0)
-    {
-        if ($pIndex > count($this->_cellXfCollection) - 1) {
-            throw new PHPExcel_Exception("CellXf index is out of bounds.");
-        } else {
-            // first remove the cellXf
-            array_splice($this->_cellXfCollection, $pIndex, 1);
-
-            // then update cellXf indexes for cells
-            foreach ($this->_workSheetCollection as $worksheet) {
-                foreach ($worksheet->getCellCollection(false) as $cellID) {
-                    $cell = $worksheet->getCell($cellID);
-                    $xfIndex = $cell->getXfIndex();
-                    if ($xfIndex > $pIndex ) {
-                        // decrease xf index by 1
-                        $cell->setXfIndex($xfIndex - 1);
-                    } else if ($xfIndex == $pIndex) {
-                        // set to default xf index 0
-                        $cell->setXfIndex(0);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Get the cellXf supervisor
-     *
-     * @return PHPExcel_Style
-     */
-    public function getCellXfSupervisor()
-    {
-        return $this->_cellXfSupervisor;
-    }
-
-    /**
-     * Get the workbook collection of cellStyleXfs
-     *
-     * @return PHPExcel_Style[]
-     */
-    public function getCellStyleXfCollection()
-    {
-        return $this->_cellStyleXfCollection;
-    }
-
-    /**
-     * Get cellStyleXf by index
-     *
-     * @param  int $pIndex
-     * @return PHPExcel_Style
-     */
-    public function getCellStyleXfByIndex($pIndex = 0)
-    {
-        return $this->_cellStyleXfCollection[$pIndex];
-    }
-
-    /**
-     * Get cellStyleXf by hash code
-     *
-     * @param  string $pValue
-     * @return PHPExcel_Style|false
-     */
-    public function getCellStyleXfByHashCode($pValue = '')
-    {
-        foreach ($this->_cellStyleXfCollection as $cellStyleXf) {
-            if ($cellStyleXf->getHashCode() == $pValue) {
-                return $cellStyleXf;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Add a cellStyleXf to the workbook
-     *
-     * @param PHPExcel_Style $pStyle
-     */
-    public function addCellStyleXf(PHPExcel_Style $pStyle)
-    {
-        $this->_cellStyleXfCollection[] = $pStyle;
-        $pStyle->setIndex(count($this->_cellStyleXfCollection) - 1);
-    }
-
-    /**
-     * Remove cellStyleXf by index
-     *
-     * @param int $pIndex
-     * @throws PHPExcel_Exception
-     */
-    public function removeCellStyleXfByIndex($pIndex = 0)
-    {
-        if ($pIndex > count($this->_cellStyleXfCollection) - 1) {
-            throw new PHPExcel_Exception("CellStyleXf index is out of bounds.");
-        } else {
-            array_splice($this->_cellStyleXfCollection, $pIndex, 1);
-        }
-    }
-
-    /**
-     * Eliminate all unneeded cellXf and afterwards update the xfIndex for all cells
-     * and columns in the workbook
-     */
-    public function garbageCollect()
-    {
-        // how many references are there to each cellXf ?
-        $countReferencesCellXf = array();
-        foreach ($this->_cellXfCollection as $index => $cellXf) {
-            $countReferencesCellXf[$index] = 0;
-        }
-
-        foreach ($this->getWorksheetIterator() as $sheet) {
-
-            // from cells
-            foreach ($sheet->getCellCollection(false) as $cellID) {
-                $cell = $sheet->getCell($cellID);
-                ++$countReferencesCellXf[$cell->getXfIndex()];
-            }
-
-            // from row dimensions
-            foreach ($sheet->getRowDimensions() as $rowDimension) {
-                if ($rowDimension->getXfIndex() !== null) {
-                    ++$countReferencesCellXf[$rowDimension->getXfIndex()];
-                }
-            }
-
-            // from column dimensions
-            foreach ($sheet->getColumnDimensions() as $columnDimension) {
-                ++$countReferencesCellXf[$columnDimension->getXfIndex()];
-            }
-        }
-
-        // remove cellXfs without references and create mapping so we can update xfIndex
-        // for all cells and columns
-        $countNeededCellXfs = 0;
-        foreach ($this->_cellXfCollection as $index => $cellXf) {
-            if ($countReferencesCellXf[$index] > 0 || $index == 0) { // we must never remove the first cellXf
-                ++$countNeededCellXfs;
-            } else {
-                unset($this->_cellXfCollection[$index]);
-            }
-            $map[$index] = $countNeededCellXfs - 1;
-        }
-        $this->_cellXfCollection = array_values($this->_cellXfCollection);
-
-        // update the index for all cellXfs
-        foreach ($this->_cellXfCollection as $i => $cellXf) {
-            $cellXf->setIndex($i);
-        }
-
-        // make sure there is always at least one cellXf (there should be)
-        if (empty($this->_cellXfCollection)) {
-            $this->_cellXfCollection[] = new PHPExcel_Style();
-        }
-
-        // update the xfIndex for all cells, row dimensions, column dimensions
-        foreach ($this->getWorksheetIterator() as $sheet) {
-
-            // for all cells
-            foreach ($sheet->getCellCollection(false) as $cellID) {
-                $cell = $sheet->getCell($cellID);
-                $cell->setXfIndex( $map[$cell->getXfIndex()] );
-            }
-
-            // for all row dimensions
-            foreach ($sheet->getRowDimensions() as $rowDimension) {
-                if ($rowDimension->getXfIndex() !== null) {
-                    $rowDimension->setXfIndex( $map[$rowDimension->getXfIndex()] );
-                }
-            }
-
-            // for all column dimensions
-            foreach ($sheet->getColumnDimensions() as $columnDimension) {
-                $columnDimension->setXfIndex( $map[$columnDimension->getXfIndex()] );
-            }
-
-			// also do garbage collection for all the sheets
-            $sheet->garbageCollect();
-        }
-    }
-
-    /**
-     * Return the unique ID value assigned to this spreadsheet workbook
-     *
-     * @return string
-     */
-    public function getID() {
-        return $this->_uniqueID;
-    }
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Autoloader.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Autoloader.php
deleted file mode 100644
index f0b2251636f..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Autoloader.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-PHPExcel_Autoloader::Register();
-//    As we always try to run the autoloader before anything else, we can use it to do a few
-//        simple checks and initialisations
-//PHPExcel_Shared_ZipStreamWrapper::register();
-// check mbstring.func_overload
-if (ini_get('mbstring.func_overload') & 2) {
-    throw new PHPExcel_Exception('Multibyte function overloading in PHP must be disabled for string functions (2).');
-}
-PHPExcel_Shared_String::buildCharacterSets();
-
-
-/**
- * PHPExcel_Autoloader
- *
- * @category    PHPExcel
- * @package     PHPExcel
- * @copyright   Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Autoloader
-{
-    /**
-     * Register the Autoloader with SPL
-     *
-     */
-    public static function Register() {
-        if (function_exists('__autoload')) {
-            //    Register any existing autoloader function with SPL, so we don't get any clashes
-            spl_autoload_register('__autoload');
-        }
-        //    Register ourselves with SPL
-        if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
-            return spl_autoload_register(array('PHPExcel_Autoloader', 'Load'), true, true);
-        } else {
-            return spl_autoload_register(array('PHPExcel_Autoloader', 'Load'));
-        }
-    }   //    function Register()
-
-
-    /**
-     * Autoload a class identified by name
-     *
-     * @param    string    $pClassName        Name of the object to load
-     */
-    public static function Load($pClassName){
-        if ((class_exists($pClassName,FALSE)) || (strpos($pClassName, 'PHPExcel') !== 0)) {
-            //    Either already loaded, or not a PHPExcel class request
-            return FALSE;
-        }
-
-        $pClassFilePath = PHPEXCEL_ROOT .
-                          str_replace('_',DIRECTORY_SEPARATOR,$pClassName) .
-                          '.php';
-
-        if ((file_exists($pClassFilePath) === FALSE) || (is_readable($pClassFilePath) === FALSE)) {
-            //    Can't load
-            return FALSE;
-        }
-
-        require($pClassFilePath);
-    }   //    function Load()
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/APC.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/APC.php
deleted file mode 100644
index 8bde7fe3e57..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/APC.php
+++ /dev/null
@@ -1,295 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_APC
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-    /**
-     * Prefix used to uniquely identify cache data for this worksheet
-     *
-     * @access    private
-     * @var string
-     */
-    private $_cachePrefix = null;
-
-    /**
-     * Cache timeout
-     *
-     * @access    private
-     * @var integer
-     */
-    private $_cacheTime = 600;
-
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-     * @access  private
-     * @return  void
-     * @throws  PHPExcel_Exception
-     */
-    protected function _storeData() {
-        if ($this->_currentCellIsDirty && !empty($this->_currentObjectID)) {
-            $this->_currentObject->detach();
-
-            if (!apc_store($this->_cachePrefix.$this->_currentObjectID.'.cache',serialize($this->_currentObject),$this->_cacheTime)) {
-                $this->__destruct();
-                throw new PHPExcel_Exception('Failed to store cell '.$this->_currentObjectID.' in APC');
-            }
-            $this->_currentCellIsDirty = false;
-        }
-        $this->_currentObjectID = $this->_currentObject = null;
-    }    //    function _storeData()
-
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @access  public
-     * @param   string         $pCoord  Coordinate address of the cell to update
-     * @param   PHPExcel_Cell  $cell    Cell to update
-     * @return  PHPExcel_Cell
-     * @throws  PHPExcel_Exception
-     */
-    public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-        if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-            $this->_storeData();
-        }
-        $this->_cellCache[$pCoord] = true;
-
-        $this->_currentObjectID = $pCoord;
-        $this->_currentObject = $cell;
-        $this->_currentCellIsDirty = true;
-
-        return $cell;
-    }    //    function addCacheData()
-
-
-    /**
-     * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
-     *
-     * @access  public
-     * @param   string  $pCoord  Coordinate address of the cell to check
-     * @throws  PHPExcel_Exception
-     * @return  boolean
-     */
-    public function isDataSet($pCoord) {
-        //    Check if the requested entry is the current object, or exists in the cache
-        if (parent::isDataSet($pCoord)) {
-            if ($this->_currentObjectID == $pCoord) {
-                return true;
-            }
-            //    Check if the requested entry still exists in apc
-            $success = apc_fetch($this->_cachePrefix.$pCoord.'.cache');
-            if ($success === FALSE) {
-                //    Entry no longer exists in APC, so clear it from the cache array
-                parent::deleteCacheData($pCoord);
-                throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in APC cache');
-            }
-            return true;
-        }
-        return false;
-    }    //    function isDataSet()
-
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @access  public
-     * @param   string         $pCoord  Coordinate of the cell
-     * @throws  PHPExcel_Exception
-     * @return  PHPExcel_Cell  Cell that was found, or null if not found
-     */
-    public function getCacheData($pCoord) {
-        if ($pCoord === $this->_currentObjectID) {
-            return $this->_currentObject;
-        }
-        $this->_storeData();
-
-        //    Check if the entry that has been requested actually exists
-        if (parent::isDataSet($pCoord)) {
-            $obj = apc_fetch($this->_cachePrefix.$pCoord.'.cache');
-            if ($obj === FALSE) {
-                //    Entry no longer exists in APC, so clear it from the cache array
-                parent::deleteCacheData($pCoord);
-                throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in APC cache');
-            }
-        } else {
-            //    Return null if requested entry doesn't exist in cache
-            return null;
-        }
-
-        //    Set current entry to the requested entry
-        $this->_currentObjectID = $pCoord;
-        $this->_currentObject = unserialize($obj);
-        //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
-
-        //    Return requested entry
-        return $this->_currentObject;
-    }    //    function getCacheData()
-
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return  string[]
-	 */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
-		}
-
-		return parent::getCellList();
-	}
-
-
-    /**
-     * Delete a cell in cache identified by coordinate address
-     *
-     * @access  public
-     * @param   string  $pCoord  Coordinate address of the cell to delete
-     * @throws  PHPExcel_Exception
-     */
-    public function deleteCacheData($pCoord) {
-        //    Delete the entry from APC
-        apc_delete($this->_cachePrefix.$pCoord.'.cache');
-
-        //    Delete the entry from our cell address array
-        parent::deleteCacheData($pCoord);
-    }    //    function deleteCacheData()
-
-
-    /**
-     * Clone the cell collection
-     *
-     * @access  public
-     * @param   PHPExcel_Worksheet  $parent  The new worksheet
-     * @throws  PHPExcel_Exception
-     * @return  void
-     */
-    public function copyCellCollection(PHPExcel_Worksheet $parent) {
-        parent::copyCellCollection($parent);
-        //    Get a new id for the new file name
-        $baseUnique = $this->_getUniqueID();
-        $newCachePrefix = substr(md5($baseUnique),0,8).'.';
-        $cacheList = $this->getCellList();
-        foreach($cacheList as $cellID) {
-            if ($cellID != $this->_currentObjectID) {
-                $obj = apc_fetch($this->_cachePrefix.$cellID.'.cache');
-                if ($obj === FALSE) {
-                    //    Entry no longer exists in APC, so clear it from the cache array
-                    parent::deleteCacheData($cellID);
-                    throw new PHPExcel_Exception('Cell entry '.$cellID.' no longer exists in APC');
-                }
-                if (!apc_store($newCachePrefix.$cellID.'.cache',$obj,$this->_cacheTime)) {
-                    $this->__destruct();
-                    throw new PHPExcel_Exception('Failed to store cell '.$cellID.' in APC');
-                }
-            }
-        }
-        $this->_cachePrefix = $newCachePrefix;
-    }    //    function copyCellCollection()
-
-
-    /**
-     * Clear the cell collection and disconnect from our parent
-     *
-     * @return  void
-     */
-    public function unsetWorksheetCells() {
-        if ($this->_currentObject !== NULL) {
-            $this->_currentObject->detach();
-            $this->_currentObject = $this->_currentObjectID = null;
-        }
-
-        //    Flush the APC cache
-        $this->__destruct();
-
-        $this->_cellCache = array();
-
-        //    detach ourself from the worksheet, so that it can then delete this object successfully
-        $this->_parent = null;
-    }    //    function unsetWorksheetCells()
-
-
-    /**
-     * Initialise this new cell collection
-     *
-     * @param  PHPExcel_Worksheet  $parent     The worksheet for this cell collection
-     * @param  array of mixed      $arguments  Additional initialisation arguments
-     */
-    public function __construct(PHPExcel_Worksheet $parent, $arguments) {
-        $cacheTime = (isset($arguments['cacheTime'])) ? $arguments['cacheTime'] : 600;
-
-        if ($this->_cachePrefix === NULL) {
-            $baseUnique = $this->_getUniqueID();
-            $this->_cachePrefix = substr(md5($baseUnique),0,8).'.';
-            $this->_cacheTime = $cacheTime;
-
-            parent::__construct($parent);
-        }
-    }    //    function __construct()
-
-
-    /**
-     * Destroy this cell collection
-     */
-    public function __destruct() {
-        $cacheList = $this->getCellList();
-        foreach($cacheList as $cellID) {
-            apc_delete($this->_cachePrefix.$cellID.'.cache');
-        }
-    }    //    function __destruct()
-
-
-    /**
-     * Identify whether the caching method is currently available
-     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-     *
-     * @return  boolean
-     */
-    public static function cacheMethodIsAvailable() {
-        if (!function_exists('apc_store')) {
-            return FALSE;
-        }
-        if (apc_sma_info() === FALSE) {
-            return FALSE;
-        }
-
-        return TRUE;
-    }
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/CacheBase.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/CacheBase.php
deleted file mode 100644
index ab2bf4ea718..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/CacheBase.php
+++ /dev/null
@@ -1,376 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_CacheBase
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-abstract class PHPExcel_CachedObjectStorage_CacheBase {
-
-	/**
-	 * Parent worksheet
-	 *
-	 * @var PHPExcel_Worksheet
-	 */
-	protected $_parent;
-
-	/**
-	 * The currently active Cell
-	 *
-	 * @var PHPExcel_Cell
-	 */
-	protected $_currentObject = null;
-
-	/**
-	 * Coordinate address of the currently active Cell
-	 *
-	 * @var string
-	 */
-	protected $_currentObjectID = null;
-
-
-	/**
-	 * Flag indicating whether the currently active Cell requires saving
-	 *
-	 * @var boolean
-	 */
-	protected $_currentCellIsDirty = true;
-
-	/**
-	 * An array of cells or cell pointers for the worksheet cells held in this cache,
-	 *		and indexed by their coordinate address within the worksheet
-	 *
-	 * @var array of mixed
-	 */
-	protected $_cellCache = array();
-
-
-	/**
-	 * Initialise this new cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
-	 */
-	public function __construct(PHPExcel_Worksheet $parent) {
-		//	Set our parent worksheet.
-		//	This is maintained within the cache controller to facilitate re-attaching it to PHPExcel_Cell objects when
-		//		they are woken from a serialized state
-		$this->_parent = $parent;
-	}	//	function __construct()
-
-
-	/**
-	 * Return the parent worksheet for this cell collection
-	 *
-	 * @return	PHPExcel_Worksheet
-	 */
-	public function getParent()
-	{
-		return $this->_parent;
-	}
-
-	/**
-	 * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
-	 *
-	 * @param	string		$pCoord		Coordinate address of the cell to check
-	 * @return	boolean
-	 */
-	public function isDataSet($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return true;
-		}
-		//	Check if the requested entry exists in the cache
-		return isset($this->_cellCache[$pCoord]);
-	}	//	function isDataSet()
-
-
-	/**
-	 * Move a cell object from one address to another
-	 *
-	 * @param	string		$fromAddress	Current address of the cell to move
-	 * @param	string		$toAddress		Destination address of the cell to move
-	 * @return	boolean
-	 */
-	public function moveCell($fromAddress, $toAddress) {
-		if ($fromAddress === $this->_currentObjectID) {
-			$this->_currentObjectID = $toAddress;
-		}
-		$this->_currentCellIsDirty = true;
-		if (isset($this->_cellCache[$fromAddress])) {
-			$this->_cellCache[$toAddress] = &$this->_cellCache[$fromAddress];
-			unset($this->_cellCache[$fromAddress]);
-		}
-
-		return TRUE;
-	}	//	function moveCell()
-
-
-    /**
-     * Add or Update a cell in cache
-     *
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	PHPExcel_Cell
-     * @throws	PHPExcel_Exception
-     */
-	public function updateCacheData(PHPExcel_Cell $cell) {
-		return $this->addCacheData($cell->getCoordinate(),$cell);
-	}	//	function updateCacheData()
-
-
-    /**
-     * Delete a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to delete
-     * @throws	PHPExcel_Exception
-     */
-	public function deleteCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID && !is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObjectID = $this->_currentObject = null;
-		}
-
-		if (is_object($this->_cellCache[$pCoord])) {
-			$this->_cellCache[$pCoord]->detach();
-			unset($this->_cellCache[$pCoord]);
-		}
-		$this->_currentCellIsDirty = false;
-	}	//	function deleteCacheData()
-
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return	string[]
-	 */
-	public function getCellList() {
-		return array_keys($this->_cellCache);
-	}	//	function getCellList()
-
-
-	/**
-	 * Sort the list of all cell addresses currently held in cache by row and column
-	 *
-	 * @return	string[]
-	 */
-	public function getSortedCellList() {
-		$sortKeys = array();
-		foreach ($this->getCellList() as $coord) {
-			sscanf($coord,'%[A-Z]%d', $column, $row);
-			$sortKeys[sprintf('%09d%3s',$row,$column)] = $coord;
-		}
-		ksort($sortKeys);
-
-		return array_values($sortKeys);
-	}	//	function sortCellList()
-
-
-
-	/**
-	 * Get highest worksheet column and highest row that have cell records
-	 *
-	 * @return array Highest column name and highest row number
-	 */
-	public function getHighestRowAndColumn()
-	{
-		// Lookup highest column and highest row
-		$col = array('A' => '1A');
-		$row = array(1);
-		foreach ($this->getCellList() as $coord) {
-			sscanf($coord,'%[A-Z]%d', $c, $r);
-			$row[$r] = $r;
-			$col[$c] = strlen($c).$c;
- 		}
-		if (!empty($row)) {
-			// Determine highest column and row
-			$highestRow = max($row);
-			$highestColumn = substr(max($col),1);
-		}
-
-		return array( 'row'	   => $highestRow,
-					  'column' => $highestColumn
-					);
-	}
-
-
-	/**
-	 * Return the cell address of the currently active cell object
-	 *
-	 * @return	string
-	 */
-	public function getCurrentAddress()
-	{
-		return $this->_currentObjectID;
-	}
-
-	/**
-	 * Return the column address of the currently active cell object
-	 *
-	 * @return	string
-	 */
-	public function getCurrentColumn()
-	{
-		sscanf($this->_currentObjectID, '%[A-Z]%d', $column, $row);
-		return $column;
-	}
-
-	/**
-	 * Return the row address of the currently active cell object
-	 *
-	 * @return	integer
-	 */
-	public function getCurrentRow()
-	{
-		sscanf($this->_currentObjectID, '%[A-Z]%d', $column, $row);
-		return (integer) $row;
-	}
-
-	/**
-	 * Get highest worksheet column
-	 *
-     * @param   string     $row        Return the highest column for the specified row,
-     *                                     or the highest column of any row if no row number is passed
-	 * @return  string     Highest column name
-	 */
-	public function getHighestColumn($row = null)
-	{
-        if ($row == null) {
-    		$colRow = $this->getHighestRowAndColumn();
-	    	return $colRow['column'];
-        }
-
-        $columnList = array(1);
-        foreach ($this->getCellList() as $coord) {
-            sscanf($coord,'%[A-Z]%d', $c, $r);
-            if ($r != $row) {
-                continue;
-            }
-            $columnList[] = PHPExcel_Cell::columnIndexFromString($c);
-        }
-        return PHPExcel_Cell::stringFromColumnIndex(max($columnList) - 1);
-    }
-
-	/**
-	 * Get highest worksheet row
-	 *
-     * @param   string     $column     Return the highest row for the specified column,
-     *                                     or the highest row of any column if no column letter is passed
-	 * @return  int        Highest row number
-	 */
-	public function getHighestRow($column = null)
-	{
-        if ($column == null) {
-	    	$colRow = $this->getHighestRowAndColumn();
-    		return $colRow['row'];
-        }
-
-        $rowList = array(0);
-        foreach ($this->getCellList() as $coord) {
-            sscanf($coord,'%[A-Z]%d', $c, $r);
-            if ($c != $column) {
-                continue;
-            }
-            $rowList[] = $r;
-        }
-
-        return max($rowList);
-	}
-
-
-	/**
-	 * Generate a unique ID for cache referencing
-	 *
-	 * @return string Unique Reference
-	 */
-	protected function _getUniqueID() {
-		if (function_exists('posix_getpid')) {
-			$baseUnique = posix_getpid();
-		} else {
-			$baseUnique = mt_rand();
-		}
-		return uniqid($baseUnique,true);
-	}
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		$this->_currentCellIsDirty;
-        $this->_storeData();
-
-		$this->_parent = $parent;
-		if (($this->_currentObject !== NULL) && (is_object($this->_currentObject))) {
-			$this->_currentObject->attach($this);
-		}
-	}	//	function copyCellCollection()
-
-    /**
-     * Remove a row, deleting all cells in that row
-     *
-     * @param string    $row    Row number to remove
-     * @return void
-     */
-    public function removeRow($row) {
-        foreach ($this->getCellList() as $coord) {
-            sscanf($coord,'%[A-Z]%d', $c, $r);
-            if ($r == $row) {
-                $this->deleteCacheData($coord);
-            }
-        }
-    }
-
-    /**
-     * Remove a column, deleting all cells in that column
-     *
-     * @param string    $column    Column ID to remove
-     * @return void
-     */
-    public function removeColumn($column) {
-        foreach ($this->getCellList() as $coord) {
-            sscanf($coord,'%[A-Z]%d', $c, $r);
-            if ($c == $column) {
-                $this->deleteCacheData($coord);
-            }
-        }
-    }
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable() {
-		return true;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/DiscISAM.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/DiscISAM.php
deleted file mode 100644
index c0e2ebcbdc8..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/DiscISAM.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_DiscISAM
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_DiscISAM extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-	/**
-	 * Name of the file for this cache
-	 *
-	 * @var string
-	 */
-	private $_fileName = NULL;
-
-	/**
-	 * File handle for this cache file
-	 *
-	 * @var resource
-	 */
-	private $_fileHandle = NULL;
-
-	/**
-	 * Directory/Folder where the cache file is located
-	 *
-	 * @var string
-	 */
-	private $_cacheDirectory = NULL;
-
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @return	void
-     * @throws	PHPExcel_Exception
-     */
-	protected function _storeData() {
-		if ($this->_currentCellIsDirty && !empty($this->_currentObjectID)) {
-			$this->_currentObject->detach();
-
-			fseek($this->_fileHandle,0,SEEK_END);
-
-			$this->_cellCache[$this->_currentObjectID] = array(
-                'ptr' => ftell($this->_fileHandle),
-				'sz'  => fwrite($this->_fileHandle, serialize($this->_currentObject))
-			);
-			$this->_currentCellIsDirty = false;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	PHPExcel_Cell
-     * @throws	PHPExcel_Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	PHPExcel_Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		//	Check if the entry that has been requested actually exists
-		if (!isset($this->_cellCache[$pCoord])) {
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		fseek($this->_fileHandle, $this->_cellCache[$pCoord]['ptr']);
-		$this->_currentObject = unserialize(fread($this->_fileHandle, $this->_cellCache[$pCoord]['sz']));
-        //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return  string[]
-	 */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
-		}
-
-		return parent::getCellList();
-	}
-
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		parent::copyCellCollection($parent);
-		//	Get a new id for the new file name
-		$baseUnique = $this->_getUniqueID();
-		$newFileName = $this->_cacheDirectory.'/PHPExcel.'.$baseUnique.'.cache';
-		//	Copy the existing cell cache file
-		copy ($this->_fileName,$newFileName);
-		$this->_fileName = $newFileName;
-		//	Open the copied cell cache file
-		$this->_fileHandle = fopen($this->_fileName,'a+');
-	}	//	function copyCellCollection()
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-		$this->_cellCache = array();
-
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-
-		//	Close down the temporary cache file
-		$this->__destruct();
-	}	//	function unsetWorksheetCells()
-
-
-	/**
-	 * Initialise this new cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
-	 * @param	array of mixed		$arguments	Additional initialisation arguments
-	 */
-	public function __construct(PHPExcel_Worksheet $parent, $arguments) {
-		$this->_cacheDirectory	= ((isset($arguments['dir'])) && ($arguments['dir'] !== NULL))
-									? $arguments['dir']
-									: PHPExcel_Shared_File::sys_get_temp_dir();
-
-		parent::__construct($parent);
-		if (is_null($this->_fileHandle)) {
-			$baseUnique = $this->_getUniqueID();
-			$this->_fileName = $this->_cacheDirectory.'/PHPExcel.'.$baseUnique.'.cache';
-			$this->_fileHandle = fopen($this->_fileName,'a+');
-		}
-	}	//	function __construct()
-
-
-	/**
-	 * Destroy this cell collection
-	 */
-	public function __destruct() {
-		if (!is_null($this->_fileHandle)) {
-			fclose($this->_fileHandle);
-			unlink($this->_fileName);
-		}
-		$this->_fileHandle = null;
-	}	//	function __destruct()
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/ICache.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/ICache.php
deleted file mode 100644
index 220905cd46a..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/ICache.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_ICache
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-interface PHPExcel_CachedObjectStorage_ICache
-{
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	PHPExcel_Cell
-     * @throws	PHPExcel_Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell);
-
-    /**
-     * Add or Update a cell in cache
-     *
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	PHPExcel_Cell
-     * @throws	PHPExcel_Exception
-     */
-	public function updateCacheData(PHPExcel_Cell $cell);
-
-    /**
-     * Fetch a cell from cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to retrieve
-     * @return PHPExcel_Cell 	Cell that was found, or null if not found
-     * @throws	PHPExcel_Exception
-     */
-	public function getCacheData($pCoord);
-
-    /**
-     * Delete a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to delete
-     * @throws	PHPExcel_Exception
-     */
-	public function deleteCacheData($pCoord);
-
-	/**
-	 * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
-	 *
-	 * @param	string		$pCoord		Coordinate address of the cell to check
-	 * @return	boolean
-	 */
-	public function isDataSet($pCoord);
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return	string[]
-	 */
-	public function getCellList();
-
-	/**
-	 * Get the list of all cell addresses currently held in cache sorted by column and row
-	 *
-	 * @return	string[]
-	 */
-	public function getSortedCellList();
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent);
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable();
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Igbinary.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Igbinary.php
deleted file mode 100644
index 0258511f92e..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Igbinary.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_Igbinary
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_Igbinary extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @return	void
-     * @throws	PHPExcel_Exception
-     */
-	protected function _storeData() {
-		if ($this->_currentCellIsDirty && !empty($this->_currentObjectID)) {
-			$this->_currentObject->detach();
-
-			$this->_cellCache[$this->_currentObjectID] = igbinary_serialize($this->_currentObject);
-			$this->_currentCellIsDirty = false;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	PHPExcel_Cell
-     * @throws	PHPExcel_Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	PHPExcel_Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		//	Check if the entry that has been requested actually exists
-		if (!isset($this->_cellCache[$pCoord])) {
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = igbinary_unserialize($this->_cellCache[$pCoord]);
-        //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return  string[]
-	 */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
-		}
-
-		return parent::getCellList();
-	}
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-		$this->_cellCache = array();
-
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-	}	//	function unsetWorksheetCells()
-
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable() {
-		if (!function_exists('igbinary_serialize')) {
-			return false;
-		}
-
-		return true;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memcache.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memcache.php
deleted file mode 100644
index 4b959dbde1f..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memcache.php
+++ /dev/null
@@ -1,312 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_Memcache
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-	/**
-	 * Prefix used to uniquely identify cache data for this worksheet
-	 *
-	 * @var string
-	 */
-	private $_cachePrefix = null;
-
-	/**
-	 * Cache timeout
-	 *
-	 * @var integer
-	 */
-	private $_cacheTime = 600;
-
-	/**
-	 * Memcache interface
-	 *
-	 * @var resource
-	 */
-	private $_memcache = null;
-
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @return	void
-     * @throws	PHPExcel_Exception
-     */
-	protected function _storeData() {
-		if ($this->_currentCellIsDirty && !empty($this->_currentObjectID)) {
-			$this->_currentObject->detach();
-
-			$obj = serialize($this->_currentObject);
-			if (!$this->_memcache->replace($this->_cachePrefix.$this->_currentObjectID.'.cache',$obj,NULL,$this->_cacheTime)) {
-				if (!$this->_memcache->add($this->_cachePrefix.$this->_currentObjectID.'.cache',$obj,NULL,$this->_cacheTime)) {
-					$this->__destruct();
-					throw new PHPExcel_Exception('Failed to store cell '.$this->_currentObjectID.' in MemCache');
-				}
-			}
-			$this->_currentCellIsDirty = false;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	PHPExcel_Cell
-     * @throws	PHPExcel_Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-		$this->_cellCache[$pCoord] = true;
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-	/**
-	 * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
-	 *
-	 * @param	string		$pCoord		Coordinate address of the cell to check
-	 * @return	boolean
-	 * @return	boolean
-	 */
-	public function isDataSet($pCoord) {
-		//	Check if the requested entry is the current object, or exists in the cache
-		if (parent::isDataSet($pCoord)) {
-			if ($this->_currentObjectID == $pCoord) {
-				return true;
-			}
-			//	Check if the requested entry still exists in Memcache
-			$success = $this->_memcache->get($this->_cachePrefix.$pCoord.'.cache');
-			if ($success === false) {
-				//	Entry no longer exists in Memcache, so clear it from the cache array
-				parent::deleteCacheData($pCoord);
-				throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in MemCache');
-			}
-			return true;
-		}
-		return false;
-	}	//	function isDataSet()
-
-
-	/**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	PHPExcel_Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		//	Check if the entry that has been requested actually exists
-		if (parent::isDataSet($pCoord)) {
-			$obj = $this->_memcache->get($this->_cachePrefix.$pCoord.'.cache');
-			if ($obj === false) {
-				//	Entry no longer exists in Memcache, so clear it from the cache array
-				parent::deleteCacheData($pCoord);
-				throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in MemCache');
-			}
-		} else {
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = unserialize($obj);
-        //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return  string[]
-	 */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
-		}
-
-		return parent::getCellList();
-	}
-
-
-    /**
-     * Delete a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to delete
-     * @throws	PHPExcel_Exception
-     */
-	public function deleteCacheData($pCoord) {
-		//	Delete the entry from Memcache
-		$this->_memcache->delete($this->_cachePrefix.$pCoord.'.cache');
-
-		//	Delete the entry from our cell address array
-		parent::deleteCacheData($pCoord);
-	}	//	function deleteCacheData()
-
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		parent::copyCellCollection($parent);
-		//	Get a new id for the new file name
-		$baseUnique = $this->_getUniqueID();
-		$newCachePrefix = substr(md5($baseUnique),0,8).'.';
-		$cacheList = $this->getCellList();
-		foreach($cacheList as $cellID) {
-			if ($cellID != $this->_currentObjectID) {
-				$obj = $this->_memcache->get($this->_cachePrefix.$cellID.'.cache');
-				if ($obj === false) {
-					//	Entry no longer exists in Memcache, so clear it from the cache array
-					parent::deleteCacheData($cellID);
-					throw new PHPExcel_Exception('Cell entry '.$cellID.' no longer exists in MemCache');
-				}
-				if (!$this->_memcache->add($newCachePrefix.$cellID.'.cache',$obj,NULL,$this->_cacheTime)) {
-					$this->__destruct();
-					throw new PHPExcel_Exception('Failed to store cell '.$cellID.' in MemCache');
-				}
-			}
-		}
-		$this->_cachePrefix = $newCachePrefix;
-	}	//	function copyCellCollection()
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-
-		//	Flush the Memcache cache
-		$this->__destruct();
-
-		$this->_cellCache = array();
-
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-	}	//	function unsetWorksheetCells()
-
-
-	/**
-	 * Initialise this new cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
-	 * @param	array of mixed		$arguments	Additional initialisation arguments
-	 */
-	public function __construct(PHPExcel_Worksheet $parent, $arguments) {
-		$memcacheServer	= (isset($arguments['memcacheServer']))	? $arguments['memcacheServer']	: 'localhost';
-		$memcachePort	= (isset($arguments['memcachePort']))	? $arguments['memcachePort']	: 11211;
-		$cacheTime		= (isset($arguments['cacheTime']))		? $arguments['cacheTime']		: 600;
-
-		if (is_null($this->_cachePrefix)) {
-			$baseUnique = $this->_getUniqueID();
-			$this->_cachePrefix = substr(md5($baseUnique),0,8).'.';
-
-			//	Set a new Memcache object and connect to the Memcache server
-			$this->_memcache = new Memcache();
-			if (!$this->_memcache->addServer($memcacheServer, $memcachePort, false, 50, 5, 5, true, array($this, 'failureCallback'))) {
-				throw new PHPExcel_Exception('Could not connect to MemCache server at '.$memcacheServer.':'.$memcachePort);
-			}
-			$this->_cacheTime = $cacheTime;
-
-			parent::__construct($parent);
-		}
-	}	//	function __construct()
-
-
-	/**
-	 * Memcache error handler
-	 *
-	 * @param	string	$host		Memcache server
-	 * @param	integer	$port		Memcache port
-     * @throws	PHPExcel_Exception
-	 */
-	public function failureCallback($host, $port) {
-		throw new PHPExcel_Exception('memcache '.$host.':'.$port.' failed');
-	}
-
-
-	/**
-	 * Destroy this cell collection
-	 */
-	public function __destruct() {
-		$cacheList = $this->getCellList();
-		foreach($cacheList as $cellID) {
-			$this->_memcache->delete($this->_cachePrefix.$cellID.'.cache');
-		}
-	}	//	function __destruct()
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable() {
-		if (!function_exists('memcache_add')) {
-			return false;
-		}
-
-		return true;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memory.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memory.php
deleted file mode 100644
index bedcfeca5a1..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memory.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_Memory
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_Memory extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-    /**
-     * Dummy method callable from CacheBase, but unused by Memory cache
-     *
-	 * @return	void
-     */
-	protected function _storeData() {
-	}	//	function _storeData()
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	PHPExcel_Cell
-     * @throws	PHPExcel_Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		$this->_cellCache[$pCoord] = $cell;
-
-		//	Set current entry to the new/updated entry
-		$this->_currentObjectID = $pCoord;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	PHPExcel_Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		//	Check if the entry that has been requested actually exists
-		if (!isset($this->_cellCache[$pCoord])) {
-			$this->_currentObjectID = NULL;
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-
-		//	Return requested entry
-		return $this->_cellCache[$pCoord];
-	}	//	function getCacheData()
-
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		parent::copyCellCollection($parent);
-
-		$newCollection = array();
-		foreach($this->_cellCache as $k => &$cell) {
-			$newCollection[$k] = clone $cell;
-			$newCollection[$k]->attach($this);
-		}
-
-		$this->_cellCache = $newCollection;
-	}
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		//	Because cells are all stored as intact objects in memory, we need to detach each one from the parent
-		foreach($this->_cellCache as $k => &$cell) {
-			$cell->detach();
-			$this->_cellCache[$k] = null;
-		}
-		unset($cell);
-
-		$this->_cellCache = array();
-
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-	}	//	function unsetWorksheetCells()
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemoryGZip.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemoryGZip.php
deleted file mode 100644
index 5a0227f7184..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemoryGZip.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_MemoryGZip
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_MemoryGZip extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @return	void
-     * @throws	PHPExcel_Exception
-     */
-	protected function _storeData() {
-		if ($this->_currentCellIsDirty && !empty($this->_currentObjectID)) {
-			$this->_currentObject->detach();
-
-			$this->_cellCache[$this->_currentObjectID] = gzdeflate(serialize($this->_currentObject));
-			$this->_currentCellIsDirty = false;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	PHPExcel_Cell
-     * @throws	PHPExcel_Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	PHPExcel_Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		//	Check if the entry that has been requested actually exists
-		if (!isset($this->_cellCache[$pCoord])) {
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = unserialize(gzinflate($this->_cellCache[$pCoord]));
-        //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return  string[]
-	 */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
-		}
-
-		return parent::getCellList();
-	}
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-		$this->_cellCache = array();
-
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-	}	//	function unsetWorksheetCells()
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemorySerialized.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemorySerialized.php
deleted file mode 100644
index a922b19a17c..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemorySerialized.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_MemorySerialized
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_MemorySerialized extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @return	void
-     * @throws	PHPExcel_Exception
-     */
-	protected function _storeData() {
-		if ($this->_currentCellIsDirty && !empty($this->_currentObjectID)) {
-			$this->_currentObject->detach();
-
-			$this->_cellCache[$this->_currentObjectID] = serialize($this->_currentObject);
-			$this->_currentCellIsDirty = false;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	PHPExcel_Cell
-     * @throws	PHPExcel_Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	PHPExcel_Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		//	Check if the entry that has been requested actually exists
-		if (!isset($this->_cellCache[$pCoord])) {
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = unserialize($this->_cellCache[$pCoord]);
-        //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return  string[]
-	 */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
-		}
-
-		return parent::getCellList();
-	}
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-		$this->_cellCache = array();
-
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-	}	//	function unsetWorksheetCells()
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/PHPTemp.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/PHPTemp.php
deleted file mode 100644
index 8a6364aed3e..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/PHPTemp.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_PHPTemp
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_PHPTemp extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-	/**
-	 * Name of the file for this cache
-	 *
-	 * @var string
-	 */
-	private $_fileHandle = null;
-
-	/**
-	 * Memory limit to use before reverting to file cache
-	 *
-	 * @var integer
-	 */
-	private $_memoryCacheSize = null;
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @return	void
-     * @throws	PHPExcel_Exception
-     */
-	protected function _storeData() {
-		if ($this->_currentCellIsDirty && !empty($this->_currentObjectID)) {
-			$this->_currentObject->detach();
-
-			fseek($this->_fileHandle,0,SEEK_END);
-
-			$this->_cellCache[$this->_currentObjectID] = array(
-                'ptr' => ftell($this->_fileHandle),
-				'sz'  => fwrite($this->_fileHandle, serialize($this->_currentObject))
-			);
-			$this->_currentCellIsDirty = false;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	PHPExcel_Cell
-     * @throws	PHPExcel_Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	PHPExcel_Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		//	Check if the entry that has been requested actually exists
-		if (!isset($this->_cellCache[$pCoord])) {
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		fseek($this->_fileHandle,$this->_cellCache[$pCoord]['ptr']);
-		$this->_currentObject = unserialize(fread($this->_fileHandle,$this->_cellCache[$pCoord]['sz']));
-        //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return  string[]
-	 */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
-		}
-
-		return parent::getCellList();
-	}
-
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		parent::copyCellCollection($parent);
-		//	Open a new stream for the cell cache data
-		$newFileHandle = fopen('php://temp/maxmemory:'.$this->_memoryCacheSize,'a+');
-		//	Copy the existing cell cache data to the new stream
-		fseek($this->_fileHandle,0);
-		while (!feof($this->_fileHandle)) {
-			fwrite($newFileHandle,fread($this->_fileHandle, 1024));
-		}
-		$this->_fileHandle = $newFileHandle;
-	}	//	function copyCellCollection()
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-		$this->_cellCache = array();
-
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-
-		//	Close down the php://temp file
-		$this->__destruct();
-	}	//	function unsetWorksheetCells()
-
-
-	/**
-	 * Initialise this new cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
-	 * @param	array of mixed		$arguments	Additional initialisation arguments
-	 */
-	public function __construct(PHPExcel_Worksheet $parent, $arguments) {
-		$this->_memoryCacheSize	= (isset($arguments['memoryCacheSize']))	? $arguments['memoryCacheSize']	: '1MB';
-
-		parent::__construct($parent);
-		if (is_null($this->_fileHandle)) {
-			$this->_fileHandle = fopen('php://temp/maxmemory:'.$this->_memoryCacheSize,'a+');
-		}
-	}	//	function __construct()
-
-
-	/**
-	 * Destroy this cell collection
-	 */
-	public function __destruct() {
-		if (!is_null($this->_fileHandle)) {
-			fclose($this->_fileHandle);
-		}
-		$this->_fileHandle = null;
-	}	//	function __destruct()
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite.php
deleted file mode 100644
index e752e853e5c..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite.php
+++ /dev/null
@@ -1,306 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_SQLite
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_SQLite extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-	/**
-	 * Database table name
-	 *
-	 * @var string
-	 */
-	private $_TableName = null;
-
-	/**
-	 * Database handle
-	 *
-	 * @var resource
-	 */
-	private $_DBHandle = null;
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @return	void
-     * @throws	PHPExcel_Exception
-     */
-	protected function _storeData() {
-		if ($this->_currentCellIsDirty && !empty($this->_currentObjectID)) {
-			$this->_currentObject->detach();
-
-			if (!$this->_DBHandle->queryExec("INSERT OR REPLACE INTO kvp_".$this->_TableName." VALUES('".$this->_currentObjectID."','".sqlite_escape_string(serialize($this->_currentObject))."')"))
-				throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
-			$this->_currentCellIsDirty = false;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	PHPExcel_Cell
-     * @throws	PHPExcel_Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	PHPExcel_Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		$query = "SELECT value FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
-		$cellResultSet = $this->_DBHandle->query($query,SQLITE_ASSOC);
-		if ($cellResultSet === false) {
-			throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
-		} elseif ($cellResultSet->numRows() == 0) {
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-
-		$cellResult = $cellResultSet->fetchSingle();
-		$this->_currentObject = unserialize($cellResult);
-        //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-	/**
-	 * Is a value set for an indexed cell?
-	 *
-	 * @param	string		$pCoord		Coordinate address of the cell to check
-	 * @return	boolean
-	 */
-	public function isDataSet($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return true;
-		}
-
-		//	Check if the requested entry exists in the cache
-		$query = "SELECT id FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
-		$cellResultSet = $this->_DBHandle->query($query,SQLITE_ASSOC);
-		if ($cellResultSet === false) {
-			throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
-		} elseif ($cellResultSet->numRows() == 0) {
-			//	Return null if requested entry doesn't exist in cache
-			return false;
-		}
-		return true;
-	}	//	function isDataSet()
-
-
-    /**
-     * Delete a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to delete
-     * @throws	PHPExcel_Exception
-     */
-	public function deleteCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			$this->_currentObject->detach();
-			$this->_currentObjectID = $this->_currentObject = null;
-		}
-
-		//	Check if the requested entry exists in the cache
-		$query = "DELETE FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
-		if (!$this->_DBHandle->queryExec($query))
-			throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
-
-		$this->_currentCellIsDirty = false;
-	}	//	function deleteCacheData()
-
-
-	/**
-	 * Move a cell object from one address to another
-	 *
-	 * @param	string		$fromAddress	Current address of the cell to move
-	 * @param	string		$toAddress		Destination address of the cell to move
-	 * @return	boolean
-	 */
-	public function moveCell($fromAddress, $toAddress) {
-		if ($fromAddress === $this->_currentObjectID) {
-			$this->_currentObjectID = $toAddress;
-		}
-
-		$query = "DELETE FROM kvp_".$this->_TableName." WHERE id='".$toAddress."'";
-		$result = $this->_DBHandle->exec($query);
-		if ($result === false)
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-
-		$query = "UPDATE kvp_".$this->_TableName." SET id='".$toAddress."' WHERE id='".$fromAddress."'";
-		$result = $this->_DBHandle->exec($query);
-		if ($result === false)
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-
-		return TRUE;
-	}	//	function moveCell()
-
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return	string[]
-	 */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
-		}
-
-		$query = "SELECT id FROM kvp_".$this->_TableName;
-		$cellIdsResult = $this->_DBHandle->unbufferedQuery($query,SQLITE_ASSOC);
-		if ($cellIdsResult === false)
-			throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
-
-		$cellKeys = array();
-		foreach($cellIdsResult as $row) {
-			$cellKeys[] = $row['id'];
-		}
-
-		return $cellKeys;
-	}	//	function getCellList()
-
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		$this->_currentCellIsDirty;
-        $this->_storeData();
-
-		//	Get a new id for the new table name
-		$tableName = str_replace('.','_',$this->_getUniqueID());
-		if (!$this->_DBHandle->queryExec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
-													AS SELECT * FROM kvp_'.$this->_TableName))
-			throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
-
-		//	Copy the existing cell cache file
-		$this->_TableName = $tableName;
-	}	//	function copyCellCollection()
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-
-		//	Close down the temporary cache file
-		$this->__destruct();
-	}	//	function unsetWorksheetCells()
-
-
-	/**
-	 * Initialise this new cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
-	 */
-	public function __construct(PHPExcel_Worksheet $parent) {
-		parent::__construct($parent);
-		if (is_null($this->_DBHandle)) {
-			$this->_TableName = str_replace('.','_',$this->_getUniqueID());
-			$_DBName = ':memory:';
-
-			$this->_DBHandle = new SQLiteDatabase($_DBName);
-			if ($this->_DBHandle === false)
-				throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
-			if (!$this->_DBHandle->queryExec('CREATE TABLE kvp_'.$this->_TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)'))
-				throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
-		}
-	}	//	function __construct()
-
-
-	/**
-	 * Destroy this cell collection
-	 */
-	public function __destruct() {
-		if (!is_null($this->_DBHandle)) {
-			$this->_DBHandle->queryExec('DROP TABLE kvp_'.$this->_TableName);
-		}
-		$this->_DBHandle = null;
-	}	//	function __destruct()
-
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable() {
-		if (!function_exists('sqlite_open')) {
-			return false;
-		}
-
-		return true;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite3.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite3.php
deleted file mode 100644
index 4f38c0319b1..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite3.php
+++ /dev/null
@@ -1,345 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_SQLite3
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-	/**
-	 * Database table name
-	 *
-	 * @var string
-	 */
-	private $_TableName = null;
-
-	/**
-	 * Database handle
-	 *
-	 * @var resource
-	 */
-	private $_DBHandle = null;
-
-	/**
-	 * Prepared statement for a SQLite3 select query
-	 *
-	 * @var SQLite3Stmt
-	 */
-	private $_selectQuery;
-
-	/**
-	 * Prepared statement for a SQLite3 insert query
-	 *
-	 * @var SQLite3Stmt
-	 */
-	private $_insertQuery;
-
-	/**
-	 * Prepared statement for a SQLite3 update query
-	 *
-	 * @var SQLite3Stmt
-	 */
-	private $_updateQuery;
-
-	/**
-	 * Prepared statement for a SQLite3 delete query
-	 *
-	 * @var SQLite3Stmt
-	 */
-	private $_deleteQuery;
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @return	void
-     * @throws	PHPExcel_Exception
-     */
-	protected function _storeData() {
-		if ($this->_currentCellIsDirty && !empty($this->_currentObjectID)) {
-			$this->_currentObject->detach();
-
-			$this->_insertQuery->bindValue('id',$this->_currentObjectID,SQLITE3_TEXT);
-			$this->_insertQuery->bindValue('data',serialize($this->_currentObject),SQLITE3_BLOB);
-			$result = $this->_insertQuery->execute();
-			if ($result === false)
-				throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-			$this->_currentCellIsDirty = false;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	PHPExcel_Cell
-     * @throws	PHPExcel_Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	PHPExcel_Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		$this->_selectQuery->bindValue('id',$pCoord,SQLITE3_TEXT);
-		$cellResult = $this->_selectQuery->execute();
-		if ($cellResult === FALSE) {
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-		}
-		$cellData = $cellResult->fetchArray(SQLITE3_ASSOC);
-		if ($cellData === FALSE) {
-			//	Return null if requested entry doesn't exist in cache
-			return NULL;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-
-		$this->_currentObject = unserialize($cellData['value']);
-        //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-	/**
-	 *	Is a value set for an indexed cell?
-	 *
-	 * @param	string		$pCoord		Coordinate address of the cell to check
-	 * @return	boolean
-	 */
-	public function isDataSet($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return TRUE;
-		}
-
-		//	Check if the requested entry exists in the cache
-		$this->_selectQuery->bindValue('id',$pCoord,SQLITE3_TEXT);
-		$cellResult = $this->_selectQuery->execute();
-		if ($cellResult === FALSE) {
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-		}
-		$cellData = $cellResult->fetchArray(SQLITE3_ASSOC);
-
-		return ($cellData === FALSE) ? FALSE : TRUE;
-	}	//	function isDataSet()
-
-
-    /**
-     *	Delete a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to delete
-     * @throws	PHPExcel_Exception
-     */
-	public function deleteCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			$this->_currentObject->detach();
-			$this->_currentObjectID = $this->_currentObject = NULL;
-		}
-
-		//	Check if the requested entry exists in the cache
-		$this->_deleteQuery->bindValue('id',$pCoord,SQLITE3_TEXT);
-		$result = $this->_deleteQuery->execute();
-		if ($result === FALSE)
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-
-		$this->_currentCellIsDirty = FALSE;
-	}	//	function deleteCacheData()
-
-
-	/**
-	 * Move a cell object from one address to another
-	 *
-	 * @param	string		$fromAddress	Current address of the cell to move
-	 * @param	string		$toAddress		Destination address of the cell to move
-	 * @return	boolean
-	 */
-	public function moveCell($fromAddress, $toAddress) {
-		if ($fromAddress === $this->_currentObjectID) {
-			$this->_currentObjectID = $toAddress;
-		}
-
-		$this->_deleteQuery->bindValue('id',$toAddress,SQLITE3_TEXT);
-		$result = $this->_deleteQuery->execute();
-		if ($result === false)
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-
-		$this->_updateQuery->bindValue('toid',$toAddress,SQLITE3_TEXT);
-		$this->_updateQuery->bindValue('fromid',$fromAddress,SQLITE3_TEXT);
-		$result = $this->_updateQuery->execute();
-		if ($result === false)
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-
-		return TRUE;
-	}	//	function moveCell()
-
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return	string[]
-	 */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
-		}
-
-		$query = "SELECT id FROM kvp_".$this->_TableName;
-		$cellIdsResult = $this->_DBHandle->query($query);
-		if ($cellIdsResult === false)
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-
-		$cellKeys = array();
-		while ($row = $cellIdsResult->fetchArray(SQLITE3_ASSOC)) {
-			$cellKeys[] = $row['id'];
-		}
-
-		return $cellKeys;
-	}	//	function getCellList()
-
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		$this->_currentCellIsDirty;
-        $this->_storeData();
-
-		//	Get a new id for the new table name
-		$tableName = str_replace('.','_',$this->_getUniqueID());
-		if (!$this->_DBHandle->exec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
-		                                       AS SELECT * FROM kvp_'.$this->_TableName))
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-
-		//	Copy the existing cell cache file
-		$this->_TableName = $tableName;
-	}	//	function copyCellCollection()
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-
-		//	Close down the temporary cache file
-		$this->__destruct();
-	}	//	function unsetWorksheetCells()
-
-
-	/**
-	 * Initialise this new cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
-	 */
-	public function __construct(PHPExcel_Worksheet $parent) {
-		parent::__construct($parent);
-		if (is_null($this->_DBHandle)) {
-			$this->_TableName = str_replace('.','_',$this->_getUniqueID());
-			$_DBName = ':memory:';
-
-			$this->_DBHandle = new SQLite3($_DBName);
-			if ($this->_DBHandle === false)
-				throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-			if (!$this->_DBHandle->exec('CREATE TABLE kvp_'.$this->_TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)'))
-				throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-		}
-
-		$this->_selectQuery = $this->_DBHandle->prepare("SELECT value FROM kvp_".$this->_TableName." WHERE id = :id");
-		$this->_insertQuery = $this->_DBHandle->prepare("INSERT OR REPLACE INTO kvp_".$this->_TableName." VALUES(:id,:data)");
-		$this->_updateQuery = $this->_DBHandle->prepare("UPDATE kvp_".$this->_TableName." SET id=:toId WHERE id=:fromId");
-		$this->_deleteQuery = $this->_DBHandle->prepare("DELETE FROM kvp_".$this->_TableName." WHERE id = :id");
-	}	//	function __construct()
-
-
-	/**
-	 * Destroy this cell collection
-	 */
-	public function __destruct() {
-		if (!is_null($this->_DBHandle)) {
-			$this->_DBHandle->exec('DROP TABLE kvp_'.$this->_TableName);
-			$this->_DBHandle->close();
-		}
-		$this->_DBHandle = null;
-	}	//	function __destruct()
-
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable() {
-		if (!class_exists('SQLite3',FALSE)) {
-			return false;
-		}
-
-		return true;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Wincache.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Wincache.php
deleted file mode 100644
index ed475dfba7e..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Wincache.php
+++ /dev/null
@@ -1,294 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_Wincache
- *
- * @category   PHPExcel
- * @package	PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-	/**
-	 * Prefix used to uniquely identify cache data for this worksheet
-	 *
-	 * @var string
-	 */
-	private $_cachePrefix = null;
-
-	/**
-	 * Cache timeout
-	 *
-	 * @var integer
-	 */
-	private $_cacheTime = 600;
-
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @return	void
-     * @throws	PHPExcel_Exception
-     */
-	protected function _storeData() {
-		if ($this->_currentCellIsDirty && !empty($this->_currentObjectID)) {
-			$this->_currentObject->detach();
-
-			$obj = serialize($this->_currentObject);
-			if (wincache_ucache_exists($this->_cachePrefix.$this->_currentObjectID.'.cache')) {
-				if (!wincache_ucache_set($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime)) {
-					$this->__destruct();
-					throw new PHPExcel_Exception('Failed to store cell '.$this->_currentObjectID.' in WinCache');
-				}
-			} else {
-				if (!wincache_ucache_add($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime)) {
-					$this->__destruct();
-					throw new PHPExcel_Exception('Failed to store cell '.$this->_currentObjectID.' in WinCache');
-				}
-			}
-			$this->_currentCellIsDirty = false;
-		}
-
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-	/**
-	 * Add or Update a cell in cache identified by coordinate address
-	 *
-	 * @param	string			$pCoord		Coordinate address of the cell to update
-	 * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	PHPExcel_Cell
-	 * @throws	PHPExcel_Exception
-	 */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-		$this->_cellCache[$pCoord] = true;
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-	/**
-	 * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
-	 *
-	 * @param	string		$pCoord		Coordinate address of the cell to check
-	 * @return	boolean
-	 */
-	public function isDataSet($pCoord) {
-		//	Check if the requested entry is the current object, or exists in the cache
-		if (parent::isDataSet($pCoord)) {
-			if ($this->_currentObjectID == $pCoord) {
-				return true;
-			}
-			//	Check if the requested entry still exists in cache
-			$success = wincache_ucache_exists($this->_cachePrefix.$pCoord.'.cache');
-			if ($success === false) {
-				//	Entry no longer exists in Wincache, so clear it from the cache array
-				parent::deleteCacheData($pCoord);
-				throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in WinCache');
-			}
-			return true;
-		}
-		return false;
-	}	//	function isDataSet()
-
-
-	/**
-	 * Get cell at a specific coordinate
-	 *
-	 * @param	string			$pCoord		Coordinate of the cell
-	 * @throws	PHPExcel_Exception
-	 * @return	PHPExcel_Cell	Cell that was found, or null if not found
-	 */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		//	Check if the entry that has been requested actually exists
-		$obj = null;
-		if (parent::isDataSet($pCoord)) {
-			$success = false;
-			$obj = wincache_ucache_get($this->_cachePrefix.$pCoord.'.cache', $success);
-			if ($success === false) {
-				//	Entry no longer exists in WinCache, so clear it from the cache array
-				parent::deleteCacheData($pCoord);
-				throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in WinCache');
-			}
-		} else {
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = unserialize($obj);
-        //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return  string[]
-	 */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
-		}
-
-		return parent::getCellList();
-	}
-
-
-	/**
-	 * Delete a cell in cache identified by coordinate address
-	 *
-	 * @param	string			$pCoord		Coordinate address of the cell to delete
-	 * @throws	PHPExcel_Exception
-	 */
-	public function deleteCacheData($pCoord) {
-		//	Delete the entry from Wincache
-		wincache_ucache_delete($this->_cachePrefix.$pCoord.'.cache');
-
-		//	Delete the entry from our cell address array
-		parent::deleteCacheData($pCoord);
-	}	//	function deleteCacheData()
-
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		parent::copyCellCollection($parent);
-		//	Get a new id for the new file name
-		$baseUnique = $this->_getUniqueID();
-		$newCachePrefix = substr(md5($baseUnique),0,8).'.';
-		$cacheList = $this->getCellList();
-		foreach($cacheList as $cellID) {
-			if ($cellID != $this->_currentObjectID) {
-				$success = false;
-				$obj = wincache_ucache_get($this->_cachePrefix.$cellID.'.cache', $success);
-				if ($success === false) {
-					//	Entry no longer exists in WinCache, so clear it from the cache array
-					parent::deleteCacheData($cellID);
-					throw new PHPExcel_Exception('Cell entry '.$cellID.' no longer exists in Wincache');
-				}
-				if (!wincache_ucache_add($newCachePrefix.$cellID.'.cache', $obj, $this->_cacheTime)) {
-					$this->__destruct();
-					throw new PHPExcel_Exception('Failed to store cell '.$cellID.' in Wincache');
-				}
-			}
-		}
-		$this->_cachePrefix = $newCachePrefix;
-	}	//	function copyCellCollection()
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-
-		//	Flush the WinCache cache
-		$this->__destruct();
-
-		$this->_cellCache = array();
-
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-	}	//	function unsetWorksheetCells()
-
-
-	/**
-	 * Initialise this new cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
-	 * @param	array of mixed		$arguments	Additional initialisation arguments
-	 */
-	public function __construct(PHPExcel_Worksheet $parent, $arguments) {
-		$cacheTime	= (isset($arguments['cacheTime']))	? $arguments['cacheTime']	: 600;
-
-		if (is_null($this->_cachePrefix)) {
-			$baseUnique = $this->_getUniqueID();
-			$this->_cachePrefix = substr(md5($baseUnique),0,8).'.';
-			$this->_cacheTime = $cacheTime;
-
-			parent::__construct($parent);
-		}
-	}	//	function __construct()
-
-
-	/**
-	 * Destroy this cell collection
-	 */
-	public function __destruct() {
-		$cacheList = $this->getCellList();
-		foreach($cacheList as $cellID) {
-			wincache_ucache_delete($this->_cachePrefix.$cellID.'.cache');
-		}
-	}	//	function __destruct()
-
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable() {
-		if (!function_exists('wincache_ucache_add')) {
-			return false;
-		}
-
-		return true;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorageFactory.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorageFactory.php
deleted file mode 100644
index 2da92346e93..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorageFactory.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<?php
-
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorageFactory
- *
- * @category    PHPExcel
- * @package        PHPExcel_CachedObjectStorage
- * @copyright    Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorageFactory
-{
-    const cache_in_memory               = 'Memory';
-    const cache_in_memory_gzip          = 'MemoryGZip';
-    const cache_in_memory_serialized    = 'MemorySerialized';
-    const cache_igbinary                = 'Igbinary';
-    const cache_to_discISAM             = 'DiscISAM';
-    const cache_to_apc                  = 'APC';
-    const cache_to_memcache             = 'Memcache';
-    const cache_to_phpTemp              = 'PHPTemp';
-    const cache_to_wincache             = 'Wincache';
-    const cache_to_sqlite               = 'SQLite';
-    const cache_to_sqlite3              = 'SQLite3';
-
-
-    /**
-     * Name of the method used for cell cacheing
-     *
-     * @var string
-     */
-    private static $_cacheStorageMethod = NULL;
-
-    /**
-     * Name of the class used for cell cacheing
-     *
-     * @var string
-     */
-    private static $_cacheStorageClass = NULL;
-
-
-    /**
-     * List of all possible cache storage methods
-     *
-     * @var string[]
-     */
-    private static $_storageMethods = array(
-        self::cache_in_memory,
-        self::cache_in_memory_gzip,
-        self::cache_in_memory_serialized,
-        self::cache_igbinary,
-        self::cache_to_phpTemp,
-        self::cache_to_discISAM,
-        self::cache_to_apc,
-        self::cache_to_memcache,
-        self::cache_to_wincache,
-        self::cache_to_sqlite,
-        self::cache_to_sqlite3,
-    );
-
-
-    /**
-     * Default arguments for each cache storage method
-     *
-     * @var array of mixed array
-     */
-    private static $_storageMethodDefaultParameters = array(
-        self::cache_in_memory               => array(
-                                                    ),
-        self::cache_in_memory_gzip          => array(
-                                                    ),
-        self::cache_in_memory_serialized    => array(
-                                                    ),
-        self::cache_igbinary                => array(
-                                                    ),
-        self::cache_to_phpTemp              => array( 'memoryCacheSize' => '1MB'
-                                                    ),
-        self::cache_to_discISAM             => array( 'dir'             => NULL
-                                                    ),
-        self::cache_to_apc                  => array( 'cacheTime'       => 600
-                                                    ),
-        self::cache_to_memcache             => array( 'memcacheServer'  => 'localhost',
-                                                      'memcachePort'    => 11211,
-                                                      'cacheTime'       => 600
-                                                    ),
-        self::cache_to_wincache             => array( 'cacheTime'       => 600
-                                                    ),
-        self::cache_to_sqlite               => array(
-                                                    ),
-        self::cache_to_sqlite3              => array(
-                                                    ),
-    );
-
-
-    /**
-     * Arguments for the active cache storage method
-     *
-     * @var array of mixed array
-     */
-    private static $_storageMethodParameters = array();
-
-
-    /**
-     * Return the current cache storage method
-     *
-     * @return string|NULL
-     **/
-    public static function getCacheStorageMethod()
-    {
-        return self::$_cacheStorageMethod;
-    }   //    function getCacheStorageMethod()
-
-
-    /**
-     * Return the current cache storage class
-     *
-     * @return PHPExcel_CachedObjectStorage_ICache|NULL
-     **/
-    public static function getCacheStorageClass()
-    {
-        return self::$_cacheStorageClass;
-    }   //    function getCacheStorageClass()
-
-
-    /**
-     * Return the list of all possible cache storage methods
-     *
-     * @return string[]
-     **/
-    public static function getAllCacheStorageMethods()
-    {
-        return self::$_storageMethods;
-    }   //    function getCacheStorageMethods()
-
-
-    /**
-     * Return the list of all available cache storage methods
-     *
-     * @return string[]
-     **/
-    public static function getCacheStorageMethods()
-    {
-        $activeMethods = array();
-        foreach(self::$_storageMethods as $storageMethod) {
-            $cacheStorageClass = 'PHPExcel_CachedObjectStorage_' . $storageMethod;
-            if (call_user_func(array($cacheStorageClass, 'cacheMethodIsAvailable'))) {
-                $activeMethods[] = $storageMethod;
-            }
-        }
-        return $activeMethods;
-    }   //    function getCacheStorageMethods()
-
-
-    /**
-     * Identify the cache storage method to use
-     *
-     * @param    string            $method        Name of the method to use for cell cacheing
-     * @param    array of mixed    $arguments    Additional arguments to pass to the cell caching class
-     *                                        when instantiating
-     * @return boolean
-     **/
-    public static function initialize($method = self::cache_in_memory, $arguments = array())
-    {
-        if (!in_array($method,self::$_storageMethods)) {
-            return FALSE;
-        }
-
-        $cacheStorageClass = 'PHPExcel_CachedObjectStorage_'.$method;
-        if (!call_user_func(array( $cacheStorageClass,
-                                   'cacheMethodIsAvailable'))) {
-            return FALSE;
-        }
-
-        self::$_storageMethodParameters[$method] = self::$_storageMethodDefaultParameters[$method];
-        foreach($arguments as $k => $v) {
-            if (array_key_exists($k, self::$_storageMethodParameters[$method])) {
-                self::$_storageMethodParameters[$method][$k] = $v;
-            }
-        }
-
-        if (self::$_cacheStorageMethod === NULL) {
-            self::$_cacheStorageClass = 'PHPExcel_CachedObjectStorage_' . $method;
-            self::$_cacheStorageMethod = $method;
-        }
-        return TRUE;
-    }   //    function initialize()
-
-
-    /**
-     * Initialise the cache storage
-     *
-     * @param    PHPExcel_Worksheet     $parent        Enable cell caching for this worksheet
-     * @return    PHPExcel_CachedObjectStorage_ICache
-     **/
-    public static function getInstance(PHPExcel_Worksheet $parent)
-    {
-        $cacheMethodIsAvailable = TRUE;
-        if (self::$_cacheStorageMethod === NULL) {
-            $cacheMethodIsAvailable = self::initialize();
-        }
-
-        if ($cacheMethodIsAvailable) {
-            $instance = new self::$_cacheStorageClass( $parent,
-                                                       self::$_storageMethodParameters[self::$_cacheStorageMethod]
-                                                     );
-            if ($instance !== NULL) {
-                return $instance;
-            }
-        }
-
-        return FALSE;
-    }   //    function getInstance()
-
-
-    /**
-     * Clear the cache storage
-     *
-     **/
-	public static function finalize()
-	{
-		self::$_cacheStorageMethod = NULL;
-		self::$_cacheStorageClass = NULL;
-		self::$_storageMethodParameters = array();
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/CyclicReferenceStack.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/CyclicReferenceStack.php
deleted file mode 100644
index 5cd0b909e47..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/CyclicReferenceStack.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CalcEngine_CyclicReferenceStack
- *
- * @category	PHPExcel_CalcEngine_CyclicReferenceStack
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CalcEngine_CyclicReferenceStack {
-
-	/**
-	 *  The call stack for calculated cells
-	 *
-	 *  @var mixed[]
-	 */
-	private $_stack = array();
-
-
-	/**
-	 * Return the number of entries on the stack
-	 *
-	 * @return  integer
-	 */
-	public function count() {
-		return count($this->_stack);
-	}
-
-	/**
-	 * Push a new entry onto the stack
-	 *
-	 * @param  mixed  $value
-	 */
-	public function push($value) {
-		$this->_stack[$value] = $value;
-	}
-
-	/**
-	 * Pop the last entry from the stack
-	 *
-	 * @return  mixed
-	 */
-	public function pop() {
-		return array_pop($this->_stack);
-	}
-
-	/**
-	 * Test to see if a specified entry exists on the stack
-	 *
-	 * @param  mixed  $value  The value to test
-	 */
-	public function onStack($value) {
-		return isset($this->_stack[$value]);
-	}
-
-	/**
-	 * Clear the stack
-	 */
-	public function clear() {
-		$this->_stack = array();
-	}
-
-	/**
-	 * Return an array of all entries on the stack
-	 *
-	 * @return  mixed[]
-	 */
-	public function showStack() {
-		return $this->_stack;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/Logger.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/Logger.php
deleted file mode 100644
index fe43ae4f67d..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/Logger.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_CalcEngine_Logger
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CalcEngine_Logger {
-
-	/**
-	 * Flag to determine whether a debug log should be generated by the calculation engine
-	 *		If true, then a debug log will be generated
-	 *		If false, then a debug log will not be generated
-	 *
-	 * @var boolean
-	 */
-	private $_writeDebugLog = FALSE;
-
-	/**
-	 * Flag to determine whether a debug log should be echoed by the calculation engine
-	 *		If true, then a debug log will be echoed
-	 *		If false, then a debug log will not be echoed
-	 * A debug log can only be echoed if it is generated
-	 *
-	 * @var boolean
-	 */
-	private $_echoDebugLog = FALSE;
-
-	/**
-	 * The debug log generated by the calculation engine
-	 *
-	 * @var string[]
-	 */
-	private $_debugLog = array();
-
-	/**
-	 * The calculation engine cell reference stack
-	 *
-	 * @var PHPExcel_CalcEngine_CyclicReferenceStack
-	 */
-	private $_cellStack;
-
-	
-	/**
-	 * Instantiate a Calculation engine logger
-	 *
-	 * @param  PHPExcel_CalcEngine_CyclicReferenceStack $stack
-	 */
-	public function __construct(PHPExcel_CalcEngine_CyclicReferenceStack $stack) {
-		$this->_cellStack = $stack;
-	}
-
-	/**
-	 * Enable/Disable Calculation engine logging
-	 *
-	 * @param  boolean $pValue
-	 */
-	public function setWriteDebugLog($pValue = FALSE) {
-		$this->_writeDebugLog = $pValue;
-	}
-
-	/**
-	 * Return whether calculation engine logging is enabled or disabled
-	 *
-	 * @return  boolean
-	 */
-	public function getWriteDebugLog() {
-		return $this->_writeDebugLog;
-	}
-
-	/**
-	 * Enable/Disable echoing of debug log information
-	 *
-	 * @param  boolean $pValue
-	 */
-	public function setEchoDebugLog($pValue = FALSE) {
-		$this->_echoDebugLog = $pValue;
-	}
-
-	/**
-	 * Return whether echoing of debug log information is enabled or disabled
-	 *
-	 * @return  boolean
-	 */
-	public function getEchoDebugLog() {
-		return $this->_echoDebugLog;
-	}
-
-	/**
-	 * Write an entry to the calculation engine debug log
-	 */
-	public function writeDebugLog() {
-		//	Only write the debug log if logging is enabled
-		if ($this->_writeDebugLog) {
-			$message = implode(func_get_args());
-			$cellReference = implode(' -> ', $this->_cellStack->showStack());
-			if ($this->_echoDebugLog) {
-				echo $cellReference, 
-					($this->_cellStack->count() > 0 ? ' => ' : ''), 
-					$message, 
-					PHP_EOL;
-			}
-			$this->_debugLog[] = $cellReference . 
-				($this->_cellStack->count() > 0 ? ' => ' : '') . 
-				$message;
-		}
-	}	//	function _writeDebug()
-
-	/**
-	 * Clear the calculation engine debug log
-	 */
-	public function clearLog() {
-		$this->_debugLog = array();
-	}	//	function flushLogger()
-
-	/**
-	 * Return the calculation engine debug log
-	 *
-	 * @return  string[]
-	 */
-	public function getLog() {
-		return $this->_debugLog;
-	}	//	function flushLogger()
-
-}	//	class PHPExcel_CalcEngine_Logger
-
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation.php
deleted file mode 100644
index 48fb4a422f2..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation.php
+++ /dev/null
@@ -1,3952 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-if (!defined('CALCULATION_REGEXP_CELLREF')) {
-	//	Test for support of \P (multibyte options) in PCRE
-	if(defined('PREG_BAD_UTF8_ERROR')) {
-		//	Cell reference (cell or range of cells, with or without a sheet reference)
-		define('CALCULATION_REGEXP_CELLREF','((([^\s,!&%^\/\*\+<>=-]*)|(\'[^\']*\')|(\"[^\"]*\"))!)?\$?([a-z]{1,3})\$?(\d{1,7})');
-		//	Named Range of cells
-		define('CALCULATION_REGEXP_NAMEDRANGE','((([^\s,!&%^\/\*\+<>=-]*)|(\'[^\']*\')|(\"[^\"]*\"))!)?([_A-Z][_A-Z0-9\.]*)');
-	} else {
-		//	Cell reference (cell or range of cells, with or without a sheet reference)
-		define('CALCULATION_REGEXP_CELLREF','(((\w*)|(\'[^\']*\')|(\"[^\"]*\"))!)?\$?([a-z]{1,3})\$?(\d+)');
-		//	Named Range of cells
-		define('CALCULATION_REGEXP_NAMEDRANGE','(((\w*)|(\'.*\')|(\".*\"))!)?([_A-Z][_A-Z0-9\.]*)');
-	}
-}
-
-
-/**
- * PHPExcel_Calculation (Multiton)
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation {
-
-	/** Constants				*/
-	/** Regular Expressions		*/
-	//	Numeric operand
-	const CALCULATION_REGEXP_NUMBER		= '[-+]?\d*\.?\d+(e[-+]?\d+)?';
-	//	String operand
-	const CALCULATION_REGEXP_STRING		= '"(?:[^"]|"")*"';
-	//	Opening bracket
-	const CALCULATION_REGEXP_OPENBRACE	= '\(';
-	//	Function (allow for the old @ symbol that could be used to prefix a function, but we'll ignore it)
-	const CALCULATION_REGEXP_FUNCTION	= '@?([A-Z][A-Z0-9\.]*)[\s]*\(';
-	//	Cell reference (cell or range of cells, with or without a sheet reference)
-	const CALCULATION_REGEXP_CELLREF	= CALCULATION_REGEXP_CELLREF;
-	//	Named Range of cells
-	const CALCULATION_REGEXP_NAMEDRANGE	= CALCULATION_REGEXP_NAMEDRANGE;
-	//	Error
-	const CALCULATION_REGEXP_ERROR		= '\#[A-Z][A-Z0_\/]*[!\?]?';
-
-
-	/** constants */
-	const RETURN_ARRAY_AS_ERROR = 'error';
-	const RETURN_ARRAY_AS_VALUE = 'value';
-	const RETURN_ARRAY_AS_ARRAY = 'array';
-
-	private static $returnArrayAsType	= self::RETURN_ARRAY_AS_VALUE;
-
-
-	/**
-	 * Instance of this class
-	 *
-	 * @access	private
-	 * @var PHPExcel_Calculation
-	 */
-	private static $_instance;
-
-
-	/**
-	 * Instance of the workbook this Calculation Engine is using
-	 *
-	 * @access	private
-	 * @var PHPExcel
-	 */
-    private $_workbook;
-
-	/**
-	 * List of instances of the calculation engine that we've instantiated for individual workbooks
-	 *
-	 * @access	private
-	 * @var PHPExcel_Calculation[]
-	 */
-    private static $_workbookSets;
-
-	/**
-	 * Calculation cache
-	 *
-	 * @access	private
-	 * @var array
-	 */
-	private $_calculationCache = array ();
-
-
-	/**
-	 * Calculation cache enabled
-	 *
-	 * @access	private
-	 * @var boolean
-	 */
-	private $_calculationCacheEnabled = TRUE;
-
-
-	/**
-	 * List of operators that can be used within formulae
-	 * The true/false value indicates whether it is a binary operator or a unary operator
-	 *
-	 * @access	private
-	 * @var array
-	 */
-	private static $_operators			= array('+' => TRUE,	'-' => TRUE,	'*' => TRUE,	'/' => TRUE,
-												'^' => TRUE,	'&' => TRUE,	'%' => FALSE,	'~' => FALSE,
-												'>' => TRUE,	'<' => TRUE,	'=' => TRUE,	'>=' => TRUE,
-												'<=' => TRUE,	'<>' => TRUE,	'|' => TRUE,	':' => TRUE
-											   );
-
-
-	/**
-	 * List of binary operators (those that expect two operands)
-	 *
-	 * @access	private
-	 * @var array
-	 */
-	private static $_binaryOperators	= array('+' => TRUE,	'-' => TRUE,	'*' => TRUE,	'/' => TRUE,
-												'^' => TRUE,	'&' => TRUE,	'>' => TRUE,	'<' => TRUE,
-												'=' => TRUE,	'>=' => TRUE,	'<=' => TRUE,	'<>' => TRUE,
-												'|' => TRUE,	':' => TRUE
-											   );
-
-	/**
-	 * The debug log generated by the calculation engine
-	 *
-	 * @access	private
-	 * @var PHPExcel_CalcEngine_Logger
-	 *
-	 */
-	private $debugLog;
-
-	/**
-	 * Flag to determine how formula errors should be handled
-	 *		If true, then a user error will be triggered
-	 *		If false, then an exception will be thrown
-	 *
-	 * @access	public
-	 * @var boolean
-	 *
-	 */
-	public $suppressFormulaErrors = FALSE;
-
-	/**
-	 * Error message for any error that was raised/thrown by the calculation engine
-	 *
-	 * @access	public
-	 * @var string
-	 *
-	 */
-	public $formulaError = NULL;
-
-	/**
-	 * An array of the nested cell references accessed by the calculation engine, used for the debug log
-	 *
-	 * @access	private
-	 * @var array of string
-	 *
-	 */
-	private $_cyclicReferenceStack;
-
-	private $_cellStack = array();
-
-	/**
-	 * Current iteration counter for cyclic formulae
-	 * If the value is 0 (or less) then cyclic formulae will throw an exception,
-	 *    otherwise they will iterate to the limit defined here before returning a result
-	 *
-	 * @var integer
-	 *
-	 */
-	private $_cyclicFormulaCount = 1;
-
-	private $_cyclicFormulaCell = '';
-
-	/**
-	 * Number of iterations for cyclic formulae
-	 *
-	 * @var integer
-	 *
-	 */
-	public $cyclicFormulaCount = 1;
-
-	/**
-	 * Precision used for calculations
-	 *
-	 * @var integer
-	 *
-	 */
-	private $_savedPrecision	= 14;
-
-
-	/**
-	 * The current locale setting
-	 *
-	 * @var string
-	 *
-	 */
-	private static $_localeLanguage = 'en_us';					//	US English	(default locale)
-
-	/**
-	 * List of available locale settings
-	 * Note that this is read for the locale subdirectory only when requested
-	 *
-	 * @var string[]
-	 *
-	 */
-	private static $_validLocaleLanguages = array(	'en'		//	English		(default language)
-												 );
-	/**
-	 * Locale-specific argument separator for function arguments
-	 *
-	 * @var string
-	 *
-	 */
-	private static $_localeArgumentSeparator = ',';
-	private static $_localeFunctions = array();
-
-	/**
-	 * Locale-specific translations for Excel constants (True, False and Null)
-	 *
-	 * @var string[]
-	 *
-	 */
-	public static $_localeBoolean = array(	'TRUE'	=> 'TRUE',
-											'FALSE'	=> 'FALSE',
-											'NULL'	=> 'NULL'
-										  );
-
-
-	/**
-	 * Excel constant string translations to their PHP equivalents
-	 * Constant conversion from text name/value to actual (datatyped) value
-	 *
-	 * @var string[]
-	 *
-	 */
-	private static $_ExcelConstants = array('TRUE'	=> TRUE,
-											'FALSE'	=> FALSE,
-											'NULL'	=> NULL
-										   );
-
-	//	PHPExcel functions
-	private static $_PHPExcelFunctions = array(	// PHPExcel functions
-				'ABS'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'abs',
-												 'argumentCount'	=>	'1'
-												),
-				'ACCRINT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::ACCRINT',
-												 'argumentCount'	=>	'4-7'
-												),
-				'ACCRINTM'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::ACCRINTM',
-												 'argumentCount'	=>	'3-5'
-												),
-				'ACOS'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'acos',
-												 'argumentCount'	=>	'1'
-												),
-				'ACOSH'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'acosh',
-												 'argumentCount'	=>	'1'
-												),
-				'ADDRESS'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::CELL_ADDRESS',
-												 'argumentCount'	=>	'2-5'
-												),
-				'AMORDEGRC'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::AMORDEGRC',
-												 'argumentCount'	=>	'6,7'
-												),
-				'AMORLINC'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::AMORLINC',
-												 'argumentCount'	=>	'6,7'
-												),
-				'AND'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOGICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Logical::LOGICAL_AND',
-												 'argumentCount'	=>	'1+'
-												),
-				'AREAS'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'1'
-												),
-				'ASC'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'1'
-												),
-				'ASIN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'asin',
-												 'argumentCount'	=>	'1'
-												),
-				'ASINH'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'asinh',
-												 'argumentCount'	=>	'1'
-												),
-				'ATAN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'atan',
-												 'argumentCount'	=>	'1'
-												),
-				'ATAN2'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::ATAN2',
-												 'argumentCount'	=>	'2'
-												),
-				'ATANH'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'atanh',
-												 'argumentCount'	=>	'1'
-												),
-				'AVEDEV'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::AVEDEV',
-												 'argumentCount'	=>	'1+'
-												),
-				'AVERAGE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::AVERAGE',
-												 'argumentCount'	=>	'1+'
-												),
-				'AVERAGEA'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::AVERAGEA',
-												 'argumentCount'	=>	'1+'
-												),
-				'AVERAGEIF'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::AVERAGEIF',
-												 'argumentCount'	=>	'2,3'
-												),
-				'AVERAGEIFS'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'3+'
-												),
-				'BAHTTEXT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'1'
-												),
-				'BESSELI'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::BESSELI',
-												 'argumentCount'	=>	'2'
-												),
-				'BESSELJ'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::BESSELJ',
-												 'argumentCount'	=>	'2'
-												),
-				'BESSELK'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::BESSELK',
-												 'argumentCount'	=>	'2'
-												),
-				'BESSELY'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::BESSELY',
-												 'argumentCount'	=>	'2'
-												),
-				'BETADIST'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::BETADIST',
-												 'argumentCount'	=>	'3-5'
-												),
-				'BETAINV'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::BETAINV',
-												 'argumentCount'	=>	'3-5'
-												),
-				'BIN2DEC'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::BINTODEC',
-												 'argumentCount'	=>	'1'
-												),
-				'BIN2HEX'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::BINTOHEX',
-												 'argumentCount'	=>	'1,2'
-												),
-				'BIN2OCT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::BINTOOCT',
-												 'argumentCount'	=>	'1,2'
-												),
-				'BINOMDIST'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::BINOMDIST',
-												 'argumentCount'	=>	'4'
-												),
-				'CEILING'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::CEILING',
-												 'argumentCount'	=>	'2'
-												),
-				'CELL'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'1,2'
-												),
-				'CHAR'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::CHARACTER',
-												 'argumentCount'	=>	'1'
-												),
-				'CHIDIST'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::CHIDIST',
-												 'argumentCount'	=>	'2'
-												),
-				'CHIINV'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::CHIINV',
-												 'argumentCount'	=>	'2'
-												),
-				'CHITEST'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'2'
-												),
-				'CHOOSE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::CHOOSE',
-												 'argumentCount'	=>	'2+'
-												),
-				'CLEAN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::TRIMNONPRINTABLE',
-												 'argumentCount'	=>	'1'
-												),
-				'CODE'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::ASCIICODE',
-												 'argumentCount'	=>	'1'
-												),
-				'COLUMN'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::COLUMN',
-												 'argumentCount'	=>	'-1',
-												 'passByReference'	=>	array(TRUE)
-												),
-				'COLUMNS'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::COLUMNS',
-												 'argumentCount'	=>	'1'
-												),
-				'COMBIN'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::COMBIN',
-												 'argumentCount'	=>	'2'
-												),
-				'COMPLEX'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::COMPLEX',
-												 'argumentCount'	=>	'2,3'
-												),
-				'CONCATENATE'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::CONCATENATE',
-												 'argumentCount'	=>	'1+'
-												),
-				'CONFIDENCE'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::CONFIDENCE',
-												 'argumentCount'	=>	'3'
-												),
-				'CONVERT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::CONVERTUOM',
-												 'argumentCount'	=>	'3'
-												),
-				'CORREL'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::CORREL',
-												 'argumentCount'	=>	'2'
-												),
-				'COS'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'cos',
-												 'argumentCount'	=>	'1'
-												),
-				'COSH'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'cosh',
-												 'argumentCount'	=>	'1'
-												),
-				'COUNT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::COUNT',
-												 'argumentCount'	=>	'1+'
-												),
-				'COUNTA'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::COUNTA',
-												 'argumentCount'	=>	'1+'
-												),
-				'COUNTBLANK'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::COUNTBLANK',
-												 'argumentCount'	=>	'1'
-												),
-				'COUNTIF'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::COUNTIF',
-												 'argumentCount'	=>	'2'
-												),
-				'COUNTIFS'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'2'
-												),
-				'COUPDAYBS'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::COUPDAYBS',
-												 'argumentCount'	=>	'3,4'
-												),
-				'COUPDAYS'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::COUPDAYS',
-												 'argumentCount'	=>	'3,4'
-												),
-				'COUPDAYSNC'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::COUPDAYSNC',
-												 'argumentCount'	=>	'3,4'
-												),
-				'COUPNCD'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::COUPNCD',
-												 'argumentCount'	=>	'3,4'
-												),
-				'COUPNUM'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::COUPNUM',
-												 'argumentCount'	=>	'3,4'
-												),
-				'COUPPCD'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::COUPPCD',
-												 'argumentCount'	=>	'3,4'
-												),
-				'COVAR'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::COVAR',
-												 'argumentCount'	=>	'2'
-												),
-				'CRITBINOM'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::CRITBINOM',
-												 'argumentCount'	=>	'3'
-												),
-				'CUBEKPIMEMBER'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_CUBE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'?'
-												),
-				'CUBEMEMBER'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_CUBE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'?'
-												),
-				'CUBEMEMBERPROPERTY'	=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_CUBE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'?'
-												),
-				'CUBERANKEDMEMBER'		=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_CUBE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'?'
-												),
-				'CUBESET'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_CUBE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'?'
-												),
-				'CUBESETCOUNT'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_CUBE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'?'
-												),
-				'CUBEVALUE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_CUBE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'?'
-												),
-				'CUMIPMT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::CUMIPMT',
-												 'argumentCount'	=>	'6'
-												),
-				'CUMPRINC'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::CUMPRINC',
-												 'argumentCount'	=>	'6'
-												),
-				'DATE'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::DATE',
-												 'argumentCount'	=>	'3'
-												),
-				'DATEDIF'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::DATEDIF',
-												 'argumentCount'	=>	'2,3'
-												),
-				'DATEVALUE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::DATEVALUE',
-												 'argumentCount'	=>	'1'
-												),
-				'DAVERAGE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATABASE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Database::DAVERAGE',
-												 'argumentCount'	=>	'3'
-												),
-				'DAY'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::DAYOFMONTH',
-												 'argumentCount'	=>	'1'
-												),
-				'DAYS360'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::DAYS360',
-												 'argumentCount'	=>	'2,3'
-												),
-				'DB'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::DB',
-												 'argumentCount'	=>	'4,5'
-												),
-				'DCOUNT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATABASE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Database::DCOUNT',
-												 'argumentCount'	=>	'3'
-												),
-				'DCOUNTA'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATABASE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Database::DCOUNTA',
-												 'argumentCount'	=>	'3'
-												),
-				'DDB'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::DDB',
-												 'argumentCount'	=>	'4,5'
-												),
-				'DEC2BIN'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::DECTOBIN',
-												 'argumentCount'	=>	'1,2'
-												),
-				'DEC2HEX'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::DECTOHEX',
-												 'argumentCount'	=>	'1,2'
-												),
-				'DEC2OCT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::DECTOOCT',
-												 'argumentCount'	=>	'1,2'
-												),
-				'DEGREES'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'rad2deg',
-												 'argumentCount'	=>	'1'
-												),
-				'DELTA'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::DELTA',
-												 'argumentCount'	=>	'1,2'
-												),
-				'DEVSQ'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::DEVSQ',
-												 'argumentCount'	=>	'1+'
-												),
-				'DGET'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATABASE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Database::DGET',
-												 'argumentCount'	=>	'3'
-												),
-				'DISC'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::DISC',
-												 'argumentCount'	=>	'4,5'
-												),
-				'DMAX'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATABASE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Database::DMAX',
-												 'argumentCount'	=>	'3'
-												),
-				'DMIN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATABASE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Database::DMIN',
-												 'argumentCount'	=>	'3'
-												),
-				'DOLLAR'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::DOLLAR',
-												 'argumentCount'	=>	'1,2'
-												),
-				'DOLLARDE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::DOLLARDE',
-												 'argumentCount'	=>	'2'
-												),
-				'DOLLARFR'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::DOLLARFR',
-												 'argumentCount'	=>	'2'
-												),
-				'DPRODUCT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATABASE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Database::DPRODUCT',
-												 'argumentCount'	=>	'3'
-												),
-				'DSTDEV'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATABASE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Database::DSTDEV',
-												 'argumentCount'	=>	'3'
-												),
-				'DSTDEVP'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATABASE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Database::DSTDEVP',
-												 'argumentCount'	=>	'3'
-												),
-				'DSUM'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATABASE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Database::DSUM',
-												 'argumentCount'	=>	'3'
-												),
-				'DURATION'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'5,6'
-												),
-				'DVAR'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATABASE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Database::DVAR',
-												 'argumentCount'	=>	'3'
-												),
-				'DVARP'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATABASE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Database::DVARP',
-												 'argumentCount'	=>	'3'
-												),
-				'EDATE'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::EDATE',
-												 'argumentCount'	=>	'2'
-												),
-				'EFFECT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::EFFECT',
-												 'argumentCount'	=>	'2'
-												),
-				'EOMONTH'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::EOMONTH',
-												 'argumentCount'	=>	'2'
-												),
-				'ERF'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::ERF',
-												 'argumentCount'	=>	'1,2'
-												),
-				'ERFC'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::ERFC',
-												 'argumentCount'	=>	'1'
-												),
-				'ERROR.TYPE'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::ERROR_TYPE',
-												 'argumentCount'	=>	'1'
-												),
-				'EVEN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::EVEN',
-												 'argumentCount'	=>	'1'
-												),
-				'EXACT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'2'
-												),
-				'EXP'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'exp',
-												 'argumentCount'	=>	'1'
-												),
-				'EXPONDIST'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::EXPONDIST',
-												 'argumentCount'	=>	'3'
-												),
-				'FACT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::FACT',
-												 'argumentCount'	=>	'1'
-												),
-				'FACTDOUBLE'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::FACTDOUBLE',
-												 'argumentCount'	=>	'1'
-												),
-				'FALSE'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOGICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Logical::FALSE',
-												 'argumentCount'	=>	'0'
-												),
-				'FDIST'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'3'
-												),
-				'FIND'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::SEARCHSENSITIVE',
-												 'argumentCount'	=>	'2,3'
-												),
-				'FINDB'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::SEARCHSENSITIVE',
-												 'argumentCount'	=>	'2,3'
-												),
-				'FINV'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'3'
-												),
-				'FISHER'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::FISHER',
-												 'argumentCount'	=>	'1'
-												),
-				'FISHERINV'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::FISHERINV',
-												 'argumentCount'	=>	'1'
-												),
-				'FIXED'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::FIXEDFORMAT',
-												 'argumentCount'	=>	'1-3'
-												),
-				'FLOOR'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::FLOOR',
-												 'argumentCount'	=>	'2'
-												),
-				'FORECAST'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::FORECAST',
-												 'argumentCount'	=>	'3'
-												),
-				'FREQUENCY'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'2'
-												),
-				'FTEST'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'2'
-												),
-				'FV'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::FV',
-												 'argumentCount'	=>	'3-5'
-												),
-				'FVSCHEDULE'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::FVSCHEDULE',
-												 'argumentCount'	=>	'2'
-												),
-				'GAMMADIST'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::GAMMADIST',
-												 'argumentCount'	=>	'4'
-												),
-				'GAMMAINV'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::GAMMAINV',
-												 'argumentCount'	=>	'3'
-												),
-				'GAMMALN'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::GAMMALN',
-												 'argumentCount'	=>	'1'
-												),
-				'GCD'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::GCD',
-												 'argumentCount'	=>	'1+'
-												),
-				'GEOMEAN'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::GEOMEAN',
-												 'argumentCount'	=>	'1+'
-												),
-				'GESTEP'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::GESTEP',
-												 'argumentCount'	=>	'1,2'
-												),
-				'GETPIVOTDATA'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'2+'
-												),
-				'GROWTH'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::GROWTH',
-												 'argumentCount'	=>	'1-4'
-												),
-				'HARMEAN'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::HARMEAN',
-												 'argumentCount'	=>	'1+'
-												),
-				'HEX2BIN'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::HEXTOBIN',
-												 'argumentCount'	=>	'1,2'
-												),
-				'HEX2DEC'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::HEXTODEC',
-												 'argumentCount'	=>	'1'
-												),
-				'HEX2OCT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::HEXTOOCT',
-												 'argumentCount'	=>	'1,2'
-												),
-				'HLOOKUP'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::HLOOKUP',
-												 'argumentCount'	=>	'3,4'
-												),
-				'HOUR'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::HOUROFDAY',
-												 'argumentCount'	=>	'1'
-												),
-				'HYPERLINK'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::HYPERLINK',
-												 'argumentCount'	=>	'1,2',
-												 'passCellReference'=>	TRUE
-												),
-				'HYPGEOMDIST'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::HYPGEOMDIST',
-												 'argumentCount'	=>	'4'
-												),
-				'IF'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOGICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Logical::STATEMENT_IF',
-												 'argumentCount'	=>	'1-3'
-												),
-				'IFERROR'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOGICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Logical::IFERROR',
-												 'argumentCount'	=>	'2'
-												),
-				'IMABS'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMABS',
-												 'argumentCount'	=>	'1'
-												),
-				'IMAGINARY'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMAGINARY',
-												 'argumentCount'	=>	'1'
-												),
-				'IMARGUMENT'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMARGUMENT',
-												 'argumentCount'	=>	'1'
-												),
-				'IMCONJUGATE'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMCONJUGATE',
-												 'argumentCount'	=>	'1'
-												),
-				'IMCOS'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMCOS',
-												 'argumentCount'	=>	'1'
-												),
-				'IMDIV'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMDIV',
-												 'argumentCount'	=>	'2'
-												),
-				'IMEXP'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMEXP',
-												 'argumentCount'	=>	'1'
-												),
-				'IMLN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMLN',
-												 'argumentCount'	=>	'1'
-												),
-				'IMLOG10'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMLOG10',
-												 'argumentCount'	=>	'1'
-												),
-				'IMLOG2'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMLOG2',
-												 'argumentCount'	=>	'1'
-												),
-				'IMPOWER'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMPOWER',
-												 'argumentCount'	=>	'2'
-												),
-				'IMPRODUCT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMPRODUCT',
-												 'argumentCount'	=>	'1+'
-												),
-				'IMREAL'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMREAL',
-												 'argumentCount'	=>	'1'
-												),
-				'IMSIN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMSIN',
-												 'argumentCount'	=>	'1'
-												),
-				'IMSQRT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMSQRT',
-												 'argumentCount'	=>	'1'
-												),
-				'IMSUB'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMSUB',
-												 'argumentCount'	=>	'2'
-												),
-				'IMSUM'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMSUM',
-												 'argumentCount'	=>	'1+'
-												),
-				'INDEX'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::INDEX',
-												 'argumentCount'	=>	'1-4'
-												),
-				'INDIRECT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::INDIRECT',
-												 'argumentCount'	=>	'1,2',
-												 'passCellReference'=>	TRUE
-												),
-				'INFO'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'1'
-												),
-				'INT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::INT',
-												 'argumentCount'	=>	'1'
-												),
-				'INTERCEPT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::INTERCEPT',
-												 'argumentCount'	=>	'2'
-												),
-				'INTRATE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::INTRATE',
-												 'argumentCount'	=>	'4,5'
-												),
-				'IPMT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::IPMT',
-												 'argumentCount'	=>	'4-6'
-												),
-				'IRR'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::IRR',
-												 'argumentCount'	=>	'1,2'
-												),
-				'ISBLANK'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::IS_BLANK',
-												 'argumentCount'	=>	'1'
-												),
-				'ISERR'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::IS_ERR',
-												 'argumentCount'	=>	'1'
-												),
-				'ISERROR'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::IS_ERROR',
-												 'argumentCount'	=>	'1'
-												),
-				'ISEVEN'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::IS_EVEN',
-												 'argumentCount'	=>	'1'
-												),
-				'ISLOGICAL'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::IS_LOGICAL',
-												 'argumentCount'	=>	'1'
-												),
-				'ISNA'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::IS_NA',
-												 'argumentCount'	=>	'1'
-												),
-				'ISNONTEXT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::IS_NONTEXT',
-												 'argumentCount'	=>	'1'
-												),
-				'ISNUMBER'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::IS_NUMBER',
-												 'argumentCount'	=>	'1'
-												),
-				'ISODD'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::IS_ODD',
-												 'argumentCount'	=>	'1'
-												),
-				'ISPMT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::ISPMT',
-												 'argumentCount'	=>	'4'
-												),
-				'ISREF'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'1'
-												),
-				'ISTEXT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::IS_TEXT',
-												 'argumentCount'	=>	'1'
-												),
-				'JIS'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'1'
-												),
-				'KURT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::KURT',
-												 'argumentCount'	=>	'1+'
-												),
-				'LARGE'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::LARGE',
-												 'argumentCount'	=>	'2'
-												),
-				'LCM'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::LCM',
-												 'argumentCount'	=>	'1+'
-												),
-				'LEFT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::LEFT',
-												 'argumentCount'	=>	'1,2'
-												),
-				'LEFTB'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::LEFT',
-												 'argumentCount'	=>	'1,2'
-												),
-				'LEN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::STRINGLENGTH',
-												 'argumentCount'	=>	'1'
-												),
-				'LENB'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::STRINGLENGTH',
-												 'argumentCount'	=>	'1'
-												),
-				'LINEST'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::LINEST',
-												 'argumentCount'	=>	'1-4'
-												),
-				'LN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'log',
-												 'argumentCount'	=>	'1'
-												),
-				'LOG'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::LOG_BASE',
-												 'argumentCount'	=>	'1,2'
-												),
-				'LOG10'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'log10',
-												 'argumentCount'	=>	'1'
-												),
-				'LOGEST'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::LOGEST',
-												 'argumentCount'	=>	'1-4'
-												),
-				'LOGINV'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::LOGINV',
-												 'argumentCount'	=>	'3'
-												),
-				'LOGNORMDIST'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::LOGNORMDIST',
-												 'argumentCount'	=>	'3'
-												),
-				'LOOKUP'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::LOOKUP',
-												 'argumentCount'	=>	'2,3'
-												),
-				'LOWER'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::LOWERCASE',
-												 'argumentCount'	=>	'1'
-												),
-				'MATCH'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::MATCH',
-												 'argumentCount'	=>	'2,3'
-												),
-				'MAX'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::MAX',
-												 'argumentCount'	=>	'1+'
-												),
-				'MAXA'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::MAXA',
-												 'argumentCount'	=>	'1+'
-												),
-				'MAXIF'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::MAXIF',
-												 'argumentCount'	=>	'2+'
-												),
-				'MDETERM'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::MDETERM',
-												 'argumentCount'	=>	'1'
-												),
-				'MDURATION'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'5,6'
-												),
-				'MEDIAN'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::MEDIAN',
-												 'argumentCount'	=>	'1+'
-												),
-				'MEDIANIF'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'2+'
-												),
-				'MID'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::MID',
-												 'argumentCount'	=>	'3'
-												),
-				'MIDB'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::MID',
-												 'argumentCount'	=>	'3'
-												),
-				'MIN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::MIN',
-												 'argumentCount'	=>	'1+'
-												),
-				'MINA'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::MINA',
-												 'argumentCount'	=>	'1+'
-												),
-				'MINIF'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::MINIF',
-												 'argumentCount'	=>	'2+'
-												),
-				'MINUTE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::MINUTEOFHOUR',
-												 'argumentCount'	=>	'1'
-												),
-				'MINVERSE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::MINVERSE',
-												 'argumentCount'	=>	'1'
-												),
-				'MIRR'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::MIRR',
-												 'argumentCount'	=>	'3'
-												),
-				'MMULT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::MMULT',
-												 'argumentCount'	=>	'2'
-												),
-				'MOD'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::MOD',
-												 'argumentCount'	=>	'2'
-												),
-				'MODE'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::MODE',
-												 'argumentCount'	=>	'1+'
-												),
-				'MONTH'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::MONTHOFYEAR',
-												 'argumentCount'	=>	'1'
-												),
-				'MROUND'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::MROUND',
-												 'argumentCount'	=>	'2'
-												),
-				'MULTINOMIAL'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::MULTINOMIAL',
-												 'argumentCount'	=>	'1+'
-												),
-				'N'						=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::N',
-												 'argumentCount'	=>	'1'
-												),
-				'NA'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::NA',
-												 'argumentCount'	=>	'0'
-												),
-				'NEGBINOMDIST'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::NEGBINOMDIST',
-												 'argumentCount'	=>	'3'
-												),
-				'NETWORKDAYS'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::NETWORKDAYS',
-												 'argumentCount'	=>	'2+'
-												),
-				'NOMINAL'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::NOMINAL',
-												 'argumentCount'	=>	'2'
-												),
-				'NORMDIST'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::NORMDIST',
-												 'argumentCount'	=>	'4'
-												),
-				'NORMINV'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::NORMINV',
-												 'argumentCount'	=>	'3'
-												),
-				'NORMSDIST'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::NORMSDIST',
-												 'argumentCount'	=>	'1'
-												),
-				'NORMSINV'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::NORMSINV',
-												 'argumentCount'	=>	'1'
-												),
-				'NOT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOGICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Logical::NOT',
-												 'argumentCount'	=>	'1'
-												),
-				'NOW'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::DATETIMENOW',
-												 'argumentCount'	=>	'0'
-												),
-				'NPER'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::NPER',
-												 'argumentCount'	=>	'3-5'
-												),
-				'NPV'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::NPV',
-												 'argumentCount'	=>	'2+'
-												),
-				'OCT2BIN'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::OCTTOBIN',
-												 'argumentCount'	=>	'1,2'
-												),
-				'OCT2DEC'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::OCTTODEC',
-												 'argumentCount'	=>	'1'
-												),
-				'OCT2HEX'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::OCTTOHEX',
-												 'argumentCount'	=>	'1,2'
-												),
-				'ODD'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::ODD',
-												 'argumentCount'	=>	'1'
-												),
-				'ODDFPRICE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'8,9'
-												),
-				'ODDFYIELD'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'8,9'
-												),
-				'ODDLPRICE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'7,8'
-												),
-				'ODDLYIELD'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'7,8'
-												),
-				'OFFSET'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::OFFSET',
-												 'argumentCount'	=>	'3,5',
-												 'passCellReference'=>	TRUE,
-												 'passByReference'	=>	array(TRUE)
-												),
-				'OR'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOGICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Logical::LOGICAL_OR',
-												 'argumentCount'	=>	'1+'
-												),
-				'PEARSON'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::CORREL',
-												 'argumentCount'	=>	'2'
-												),
-				'PERCENTILE'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::PERCENTILE',
-												 'argumentCount'	=>	'2'
-												),
-				'PERCENTRANK'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::PERCENTRANK',
-												 'argumentCount'	=>	'2,3'
-												),
-				'PERMUT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::PERMUT',
-												 'argumentCount'	=>	'2'
-												),
-				'PHONETIC'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'1'
-												),
-				'PI'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'pi',
-												 'argumentCount'	=>	'0'
-												),
-				'PMT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::PMT',
-												 'argumentCount'	=>	'3-5'
-												),
-				'POISSON'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::POISSON',
-												 'argumentCount'	=>	'3'
-												),
-				'POWER'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::POWER',
-												 'argumentCount'	=>	'2'
-												),
-				'PPMT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::PPMT',
-												 'argumentCount'	=>	'4-6'
-												),
-				'PRICE'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::PRICE',
-												 'argumentCount'	=>	'6,7'
-												),
-				'PRICEDISC'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::PRICEDISC',
-												 'argumentCount'	=>	'4,5'
-												),
-				'PRICEMAT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::PRICEMAT',
-												 'argumentCount'	=>	'5,6'
-												),
-				'PROB'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'3,4'
-												),
-				'PRODUCT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::PRODUCT',
-												 'argumentCount'	=>	'1+'
-												),
-				'PROPER'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::PROPERCASE',
-												 'argumentCount'	=>	'1'
-												),
-				'PV'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::PV',
-												 'argumentCount'	=>	'3-5'
-												),
-				'QUARTILE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::QUARTILE',
-												 'argumentCount'	=>	'2'
-												),
-				'QUOTIENT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::QUOTIENT',
-												 'argumentCount'	=>	'2'
-												),
-				'RADIANS'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'deg2rad',
-												 'argumentCount'	=>	'1'
-												),
-				'RAND'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::RAND',
-												 'argumentCount'	=>	'0'
-												),
-				'RANDBETWEEN'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::RAND',
-												 'argumentCount'	=>	'2'
-												),
-				'RANK'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::RANK',
-												 'argumentCount'	=>	'2,3'
-												),
-				'RATE'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::RATE',
-												 'argumentCount'	=>	'3-6'
-												),
-				'RECEIVED'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::RECEIVED',
-												 'argumentCount'	=>	'4-5'
-												),
-				'REPLACE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::REPLACE',
-												 'argumentCount'	=>	'4'
-												),
-				'REPLACEB'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::REPLACE',
-												 'argumentCount'	=>	'4'
-												),
-				'REPT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'str_repeat',
-												 'argumentCount'	=>	'2'
-												),
-				'RIGHT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::RIGHT',
-												 'argumentCount'	=>	'1,2'
-												),
-				'RIGHTB'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::RIGHT',
-												 'argumentCount'	=>	'1,2'
-												),
-				'ROMAN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::ROMAN',
-												 'argumentCount'	=>	'1,2'
-												),
-				'ROUND'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'round',
-												 'argumentCount'	=>	'2'
-												),
-				'ROUNDDOWN'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::ROUNDDOWN',
-												 'argumentCount'	=>	'2'
-												),
-				'ROUNDUP'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::ROUNDUP',
-												 'argumentCount'	=>	'2'
-												),
-				'ROW'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::ROW',
-												 'argumentCount'	=>	'-1',
-												 'passByReference'	=>	array(TRUE)
-												),
-				'ROWS'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::ROWS',
-												 'argumentCount'	=>	'1'
-												),
-				'RSQ'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::RSQ',
-												 'argumentCount'	=>	'2'
-												),
-				'RTD'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'1+'
-												),
-				'SEARCH'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::SEARCHINSENSITIVE',
-												 'argumentCount'	=>	'2,3'
-												),
-				'SEARCHB'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::SEARCHINSENSITIVE',
-												 'argumentCount'	=>	'2,3'
-												),
-				'SECOND'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::SECONDOFMINUTE',
-												 'argumentCount'	=>	'1'
-												),
-				'SERIESSUM'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::SERIESSUM',
-												 'argumentCount'	=>	'4'
-												),
-				'SIGN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::SIGN',
-												 'argumentCount'	=>	'1'
-												),
-				'SIN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'sin',
-												 'argumentCount'	=>	'1'
-												),
-				'SINH'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'sinh',
-												 'argumentCount'	=>	'1'
-												),
-				'SKEW'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::SKEW',
-												 'argumentCount'	=>	'1+'
-												),
-				'SLN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::SLN',
-												 'argumentCount'	=>	'3'
-												),
-				'SLOPE'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::SLOPE',
-												 'argumentCount'	=>	'2'
-												),
-				'SMALL'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::SMALL',
-												 'argumentCount'	=>	'2'
-												),
-				'SQRT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'sqrt',
-												 'argumentCount'	=>	'1'
-												),
-				'SQRTPI'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::SQRTPI',
-												 'argumentCount'	=>	'1'
-												),
-				'STANDARDIZE'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::STANDARDIZE',
-												 'argumentCount'	=>	'3'
-												),
-				'STDEV'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::STDEV',
-												 'argumentCount'	=>	'1+'
-												),
-				'STDEVA'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::STDEVA',
-												 'argumentCount'	=>	'1+'
-												),
-				'STDEVP'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::STDEVP',
-												 'argumentCount'	=>	'1+'
-												),
-				'STDEVPA'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::STDEVPA',
-												 'argumentCount'	=>	'1+'
-												),
-				'STEYX'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::STEYX',
-												 'argumentCount'	=>	'2'
-												),
-				'SUBSTITUTE'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::SUBSTITUTE',
-												 'argumentCount'	=>	'3,4'
-												),
-				'SUBTOTAL'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::SUBTOTAL',
-												 'argumentCount'	=>	'2+'
-												),
-				'SUM'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::SUM',
-												 'argumentCount'	=>	'1+'
-												),
-				'SUMIF'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::SUMIF',
-												 'argumentCount'	=>	'2,3'
-												),
-				'SUMIFS'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'?'
-												),
-				'SUMPRODUCT'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::SUMPRODUCT',
-												 'argumentCount'	=>	'1+'
-												),
-				'SUMSQ'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::SUMSQ',
-												 'argumentCount'	=>	'1+'
-												),
-				'SUMX2MY2'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::SUMX2MY2',
-												 'argumentCount'	=>	'2'
-												),
-				'SUMX2PY2'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::SUMX2PY2',
-												 'argumentCount'	=>	'2'
-												),
-				'SUMXMY2'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::SUMXMY2',
-												 'argumentCount'	=>	'2'
-												),
-				'SYD'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::SYD',
-												 'argumentCount'	=>	'4'
-												),
-				'T'						=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::RETURNSTRING',
-												 'argumentCount'	=>	'1'
-												),
-				'TAN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'tan',
-												 'argumentCount'	=>	'1'
-												),
-				'TANH'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'tanh',
-												 'argumentCount'	=>	'1'
-												),
-				'TBILLEQ'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::TBILLEQ',
-												 'argumentCount'	=>	'3'
-												),
-				'TBILLPRICE'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::TBILLPRICE',
-												 'argumentCount'	=>	'3'
-												),
-				'TBILLYIELD'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::TBILLYIELD',
-												 'argumentCount'	=>	'3'
-												),
-				'TDIST'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::TDIST',
-												 'argumentCount'	=>	'3'
-												),
-				'TEXT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::TEXTFORMAT',
-												 'argumentCount'	=>	'2'
-												),
-				'TIME'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::TIME',
-												 'argumentCount'	=>	'3'
-												),
-				'TIMEVALUE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::TIMEVALUE',
-												 'argumentCount'	=>	'1'
-												),
-				'TINV'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::TINV',
-												 'argumentCount'	=>	'2'
-												),
-				'TODAY'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::DATENOW',
-												 'argumentCount'	=>	'0'
-												),
-				'TRANSPOSE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::TRANSPOSE',
-												 'argumentCount'	=>	'1'
-												),
-				'TREND'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::TREND',
-												 'argumentCount'	=>	'1-4'
-												),
-				'TRIM'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::TRIMSPACES',
-												 'argumentCount'	=>	'1'
-												),
-				'TRIMMEAN'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::TRIMMEAN',
-												 'argumentCount'	=>	'2'
-												),
-				'TRUE'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOGICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Logical::TRUE',
-												 'argumentCount'	=>	'0'
-												),
-				'TRUNC'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::TRUNC',
-												 'argumentCount'	=>	'1,2'
-												),
-				'TTEST'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'4'
-												),
-				'TYPE'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::TYPE',
-												 'argumentCount'	=>	'1'
-												),
-				'UPPER'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::UPPERCASE',
-												 'argumentCount'	=>	'1'
-												),
-				'USDOLLAR'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'2'
-												),
-				'VALUE'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::VALUE',
-												 'argumentCount'	=>	'1'
-												),
-				'VAR'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::VARFunc',
-												 'argumentCount'	=>	'1+'
-												),
-				'VARA'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::VARA',
-												 'argumentCount'	=>	'1+'
-												),
-				'VARP'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::VARP',
-												 'argumentCount'	=>	'1+'
-												),
-				'VARPA'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::VARPA',
-												 'argumentCount'	=>	'1+'
-												),
-				'VDB'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'5-7'
-												),
-				'VERSION'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::VERSION',
-												 'argumentCount'	=>	'0'
-												),
-				'VLOOKUP'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::VLOOKUP',
-												 'argumentCount'	=>	'3,4'
-												),
-				'WEEKDAY'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::DAYOFWEEK',
-												 'argumentCount'	=>	'1,2'
-												),
-				'WEEKNUM'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::WEEKOFYEAR',
-												 'argumentCount'	=>	'1,2'
-												),
-				'WEIBULL'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::WEIBULL',
-												 'argumentCount'	=>	'4'
-												),
-				'WORKDAY'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::WORKDAY',
-												 'argumentCount'	=>	'2+'
-												),
-				'XIRR'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::XIRR',
-												 'argumentCount'	=>	'2,3'
-												),
-				'XNPV'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::XNPV',
-												 'argumentCount'	=>	'3'
-												),
-				'YEAR'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::YEAR',
-												 'argumentCount'	=>	'1'
-												),
-				'YEARFRAC'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::YEARFRAC',
-												 'argumentCount'	=>	'2,3'
-												),
-				'YIELD'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'6,7'
-												),
-				'YIELDDISC'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::YIELDDISC',
-												 'argumentCount'	=>	'4,5'
-												),
-				'YIELDMAT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::YIELDMAT',
-												 'argumentCount'	=>	'5,6'
-												),
-				'ZTEST'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::ZTEST',
-												 'argumentCount'	=>	'2-3'
-												)
-			);
-
-
-	//	Internal functions used for special control purposes
-	private static $_controlFunctions = array(
-				'MKMATRIX'	=> array('argumentCount'	=>	'*',
-									 'functionCall'		=>	'self::_mkMatrix'
-									)
-			);
-
-
-
-
-	private function __construct(PHPExcel $workbook = NULL) {
-		$setPrecision = (PHP_INT_SIZE == 4) ? 14 : 16;
-		$this->_savedPrecision = ini_get('precision');
-		if ($this->_savedPrecision < $setPrecision) {
-			ini_set('precision',$setPrecision);
-		}
-		$this->delta = 1 * pow(10, -$setPrecision);
-
-		if ($workbook !== NULL) {
-			self::$_workbookSets[$workbook->getID()] = $this;
-		}
-
-		$this->_workbook = $workbook;
-		$this->_cyclicReferenceStack = new PHPExcel_CalcEngine_CyclicReferenceStack();
-	    $this->_debugLog = new PHPExcel_CalcEngine_Logger($this->_cyclicReferenceStack);
-	}	//	function __construct()
-
-
-	public function __destruct() {
-		if ($this->_savedPrecision != ini_get('precision')) {
-			ini_set('precision',$this->_savedPrecision);
-		}
-	}
-
-	private static function _loadLocales() {
-		$localeFileDirectory = PHPEXCEL_ROOT.'PHPExcel/locale/';
-		foreach (glob($localeFileDirectory.'/*',GLOB_ONLYDIR) as $filename) {
-			$filename = substr($filename,strlen($localeFileDirectory)+1);
-			if ($filename != 'en') {
-				self::$_validLocaleLanguages[] = $filename;
-			}
-		}
-	}
-
-	/**
-	 * Get an instance of this class
-	 *
-	 * @access	public
-	 * @param   PHPExcel $workbook  Injected workbook for working with a PHPExcel object,
-	 *									or NULL to create a standalone claculation engine
-	 * @return PHPExcel_Calculation
-	 */
-	public static function getInstance(PHPExcel $workbook = NULL) {
-		if ($workbook !== NULL) {
-    		if (isset(self::$_workbookSets[$workbook->getID()])) {
-    			return self::$_workbookSets[$workbook->getID()];
-    		}
-			return new PHPExcel_Calculation($workbook);
-		}
-
-		if (!isset(self::$_instance) || (self::$_instance === NULL)) {
-			self::$_instance = new PHPExcel_Calculation();
-		}
-
-		return self::$_instance;
-	}	//	function getInstance()
-
-	/**
-	 * Unset an instance of this class
-	 *
-	 * @access	public
-	 * @param   PHPExcel $workbook  Injected workbook identifying the instance to unset
-	 */
-	public static function unsetInstance(PHPExcel $workbook = NULL) {
-		if ($workbook !== NULL) {
-    		if (isset(self::$_workbookSets[$workbook->getID()])) {
-    			unset(self::$_workbookSets[$workbook->getID()]);
-    		}
-		}
-    }
-
-	/**
-	 * Flush the calculation cache for any existing instance of this class
-	 *		but only if a PHPExcel_Calculation instance exists
-	 *
-	 * @access	public
-	 * @return null
-	 */
-	public function flushInstance() {
-		$this->clearCalculationCache();
-	}	//	function flushInstance()
-
-
-	/**
-	 * Get the debuglog for this claculation engine instance
-	 *
-	 * @access	public
-	 * @return PHPExcel_CalcEngine_Logger
-	 */
-	public function getDebugLog() {
-		return $this->_debugLog;
-	}
-
-	/**
-	 * __clone implementation. Cloning should not be allowed in a Singleton!
-	 *
-	 * @access	public
-	 * @throws	PHPExcel_Calculation_Exception
-	 */
-	public final function __clone() {
-		throw new PHPExcel_Calculation_Exception ('Cloning the calculation engine is not allowed!');
-	}	//	function __clone()
-
-
-	/**
-	 * Return the locale-specific translation of TRUE
-	 *
-	 * @access	public
-	 * @return	 string		locale-specific translation of TRUE
-	 */
-	public static function getTRUE() {
-		return self::$_localeBoolean['TRUE'];
-	}
-
-	/**
-	 * Return the locale-specific translation of FALSE
-	 *
-	 * @access	public
-	 * @return	 string		locale-specific translation of FALSE
-	 */
-	public static function getFALSE() {
-		return self::$_localeBoolean['FALSE'];
-	}
-
-	/**
-	 * Set the Array Return Type (Array or Value of first element in the array)
-	 *
-	 * @access	public
-	 * @param	 string	$returnType			Array return type
-	 * @return	 boolean					Success or failure
-	 */
-	public static function setArrayReturnType($returnType) {
-		if (($returnType == self::RETURN_ARRAY_AS_VALUE) ||
-			($returnType == self::RETURN_ARRAY_AS_ERROR) ||
-			($returnType == self::RETURN_ARRAY_AS_ARRAY)) {
-			self::$returnArrayAsType = $returnType;
-			return TRUE;
-		}
-		return FALSE;
-	}	//	function setArrayReturnType()
-
-
-	/**
-	 * Return the Array Return Type (Array or Value of first element in the array)
-	 *
-	 * @access	public
-	 * @return	 string		$returnType			Array return type
-	 */
-	public static function getArrayReturnType() {
-		return self::$returnArrayAsType;
-	}	//	function getArrayReturnType()
-
-
-	/**
-	 * Is calculation caching enabled?
-	 *
-	 * @access	public
-	 * @return boolean
-	 */
-	public function getCalculationCacheEnabled() {
-		return $this->_calculationCacheEnabled;
-	}	//	function getCalculationCacheEnabled()
-
-	/**
-	 * Enable/disable calculation cache
-	 *
-	 * @access	public
-	 * @param boolean $pValue
-	 */
-	public function setCalculationCacheEnabled($pValue = TRUE) {
-		$this->_calculationCacheEnabled = $pValue;
-		$this->clearCalculationCache();
-	}	//	function setCalculationCacheEnabled()
-
-
-	/**
-	 * Enable calculation cache
-	 */
-	public function enableCalculationCache() {
-		$this->setCalculationCacheEnabled(TRUE);
-	}	//	function enableCalculationCache()
-
-
-	/**
-	 * Disable calculation cache
-	 */
-	public function disableCalculationCache() {
-		$this->setCalculationCacheEnabled(FALSE);
-	}	//	function disableCalculationCache()
-
-
-	/**
-	 * Clear calculation cache
-	 */
-	public function clearCalculationCache() {
-		$this->_calculationCache = array();
-	}	//	function clearCalculationCache()
-
-	/**
-	 * Clear calculation cache for a specified worksheet
-	 *
-	 * @param string $worksheetName
-	 */
-	public function clearCalculationCacheForWorksheet($worksheetName) {
-		if (isset($this->_calculationCache[$worksheetName])) {
-			unset($this->_calculationCache[$worksheetName]);
-		}
-	}	//	function clearCalculationCacheForWorksheet()
-
-	/**
-	 * Rename calculation cache for a specified worksheet
-	 *
-	 * @param string $fromWorksheetName
-	 * @param string $toWorksheetName
-	 */
-	public function renameCalculationCacheForWorksheet($fromWorksheetName, $toWorksheetName) {
-		if (isset($this->_calculationCache[$fromWorksheetName])) {
-			$this->_calculationCache[$toWorksheetName] = &$this->_calculationCache[$fromWorksheetName];
-			unset($this->_calculationCache[$fromWorksheetName]);
-		}
-	}	//	function renameCalculationCacheForWorksheet()
-
-
-	/**
-	 * Get the currently defined locale code
-	 *
-	 * @return string
-	 */
-	public function getLocale() {
-		return self::$_localeLanguage;
-	}	//	function getLocale()
-
-
-	/**
-	 * Set the locale code
-	 *
-	 * @param string $locale  The locale to use for formula translation
-	 * @return boolean
-	 */
-	public function setLocale($locale = 'en_us') {
-		//	Identify our locale and language
-		$language = $locale = strtolower($locale);
-		if (strpos($locale,'_') !== FALSE) {
-			list($language) = explode('_',$locale);
-		}
-
-		if (count(self::$_validLocaleLanguages) == 1)
-			self::_loadLocales();
-
-		//	Test whether we have any language data for this language (any locale)
-		if (in_array($language,self::$_validLocaleLanguages)) {
-			//	initialise language/locale settings
-			self::$_localeFunctions = array();
-			self::$_localeArgumentSeparator = ',';
-			self::$_localeBoolean = array('TRUE' => 'TRUE', 'FALSE' => 'FALSE', 'NULL' => 'NULL');
-			//	Default is English, if user isn't requesting english, then read the necessary data from the locale files
-			if ($locale != 'en_us') {
-				//	Search for a file with a list of function names for locale
-				$functionNamesFile = PHPEXCEL_ROOT . 'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.str_replace('_',DIRECTORY_SEPARATOR,$locale).DIRECTORY_SEPARATOR.'functions';
-				if (!file_exists($functionNamesFile)) {
-					//	If there isn't a locale specific function file, look for a language specific function file
-					$functionNamesFile = PHPEXCEL_ROOT . 'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.$language.DIRECTORY_SEPARATOR.'functions';
-					if (!file_exists($functionNamesFile)) {
-						return FALSE;
-					}
-				}
-				//	Retrieve the list of locale or language specific function names
-				$localeFunctions = file($functionNamesFile,FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-				foreach ($localeFunctions as $localeFunction) {
-					list($localeFunction) = explode('##',$localeFunction);	//	Strip out comments
-					if (strpos($localeFunction,'=') !== FALSE) {
-						list($fName,$lfName) = explode('=',$localeFunction);
-						$fName = trim($fName);
-						$lfName = trim($lfName);
-						if ((isset(self::$_PHPExcelFunctions[$fName])) && ($lfName != '') && ($fName != $lfName)) {
-							self::$_localeFunctions[$fName] = $lfName;
-						}
-					}
-				}
-				//	Default the TRUE and FALSE constants to the locale names of the TRUE() and FALSE() functions
-				if (isset(self::$_localeFunctions['TRUE'])) { self::$_localeBoolean['TRUE'] = self::$_localeFunctions['TRUE']; }
-				if (isset(self::$_localeFunctions['FALSE'])) { self::$_localeBoolean['FALSE'] = self::$_localeFunctions['FALSE']; }
-
-				$configFile = PHPEXCEL_ROOT . 'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.str_replace('_',DIRECTORY_SEPARATOR,$locale).DIRECTORY_SEPARATOR.'config';
-				if (!file_exists($configFile)) {
-					$configFile = PHPEXCEL_ROOT . 'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.$language.DIRECTORY_SEPARATOR.'config';
-				}
-				if (file_exists($configFile)) {
-					$localeSettings = file($configFile,FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-					foreach ($localeSettings as $localeSetting) {
-						list($localeSetting) = explode('##',$localeSetting);	//	Strip out comments
-						if (strpos($localeSetting,'=') !== FALSE) {
-							list($settingName,$settingValue) = explode('=',$localeSetting);
-							$settingName = strtoupper(trim($settingName));
-							switch ($settingName) {
-								case 'ARGUMENTSEPARATOR' :
-									self::$_localeArgumentSeparator = trim($settingValue);
-									break;
-							}
-						}
-					}
-				}
-			}
-
-			self::$functionReplaceFromExcel = self::$functionReplaceToExcel =
-			self::$functionReplaceFromLocale = self::$functionReplaceToLocale = NULL;
-			self::$_localeLanguage = $locale;
-			return TRUE;
-		}
-		return FALSE;
-	}	//	function setLocale()
-
-
-
-	public static function _translateSeparator($fromSeparator,$toSeparator,$formula,&$inBraces) {
-		$strlen = mb_strlen($formula);
-		for ($i = 0; $i < $strlen; ++$i) {
-			$chr = mb_substr($formula,$i,1);
-			switch ($chr) {
-				case '{' :	$inBraces = TRUE;
-							break;
-				case '}' :	$inBraces = FALSE;
-							break;
-				case $fromSeparator :
-							if (!$inBraces) {
-								$formula = mb_substr($formula,0,$i).$toSeparator.mb_substr($formula,$i+1);
-							}
-			}
-		}
-		return $formula;
-	}
-
-	private static function _translateFormula($from,$to,$formula,$fromSeparator,$toSeparator) {
-		//	Convert any Excel function names to the required language
-		if (self::$_localeLanguage !== 'en_us') {
-			$inBraces = FALSE;
-			//	If there is the possibility of braces within a quoted string, then we don't treat those as matrix indicators
-			if (strpos($formula,'"') !== FALSE) {
-				//	So instead we skip replacing in any quoted strings by only replacing in every other array element after we've exploded
-				//		the formula
-				$temp = explode('"',$formula);
-				$i = FALSE;
-				foreach($temp as &$value) {
-					//	Only count/replace in alternating array entries
-					if ($i = !$i) {
-						$value = preg_replace($from,$to,$value);
-						$value = self::_translateSeparator($fromSeparator,$toSeparator,$value,$inBraces);
-					}
-				}
-				unset($value);
-				//	Then rebuild the formula string
-				$formula = implode('"',$temp);
-			} else {
-				//	If there's no quoted strings, then we do a simple count/replace
-				$formula = preg_replace($from,$to,$formula);
-				$formula = self::_translateSeparator($fromSeparator,$toSeparator,$formula,$inBraces);
-			}
-		}
-
-		return $formula;
-	}
-
-	private static $functionReplaceFromExcel	= NULL;
-	private static $functionReplaceToLocale		= NULL;
-
-	public function _translateFormulaToLocale($formula) {
-		if (self::$functionReplaceFromExcel === NULL) {
-			self::$functionReplaceFromExcel = array();
-			foreach(array_keys(self::$_localeFunctions) as $excelFunctionName) {
-				self::$functionReplaceFromExcel[] = '/(@?[^\w\.])'.preg_quote($excelFunctionName).'([\s]*\()/Ui';
-			}
-			foreach(array_keys(self::$_localeBoolean) as $excelBoolean) {
-				self::$functionReplaceFromExcel[] = '/(@?[^\w\.])'.preg_quote($excelBoolean).'([^\w\.])/Ui';
-			}
-
-		}
-
-		if (self::$functionReplaceToLocale === NULL) {
-			self::$functionReplaceToLocale = array();
-			foreach(array_values(self::$_localeFunctions) as $localeFunctionName) {
-				self::$functionReplaceToLocale[] = '$1'.trim($localeFunctionName).'$2';
-			}
-			foreach(array_values(self::$_localeBoolean) as $localeBoolean) {
-				self::$functionReplaceToLocale[] = '$1'.trim($localeBoolean).'$2';
-			}
-		}
-
-		return self::_translateFormula(self::$functionReplaceFromExcel,self::$functionReplaceToLocale,$formula,',',self::$_localeArgumentSeparator);
-	}	//	function _translateFormulaToLocale()
-
-
-	private static $functionReplaceFromLocale	= NULL;
-	private static $functionReplaceToExcel		= NULL;
-
-	public function _translateFormulaToEnglish($formula) {
-		if (self::$functionReplaceFromLocale === NULL) {
-			self::$functionReplaceFromLocale = array();
-			foreach(array_values(self::$_localeFunctions) as $localeFunctionName) {
-				self::$functionReplaceFromLocale[] = '/(@?[^\w\.])'.preg_quote($localeFunctionName).'([\s]*\()/Ui';
-			}
-			foreach(array_values(self::$_localeBoolean) as $excelBoolean) {
-				self::$functionReplaceFromLocale[] = '/(@?[^\w\.])'.preg_quote($excelBoolean).'([^\w\.])/Ui';
-			}
-		}
-
-		if (self::$functionReplaceToExcel === NULL) {
-			self::$functionReplaceToExcel = array();
-			foreach(array_keys(self::$_localeFunctions) as $excelFunctionName) {
-				self::$functionReplaceToExcel[] = '$1'.trim($excelFunctionName).'$2';
-			}
-			foreach(array_keys(self::$_localeBoolean) as $excelBoolean) {
-				self::$functionReplaceToExcel[] = '$1'.trim($excelBoolean).'$2';
-			}
-		}
-
-		return self::_translateFormula(self::$functionReplaceFromLocale,self::$functionReplaceToExcel,$formula,self::$_localeArgumentSeparator,',');
-	}	//	function _translateFormulaToEnglish()
-
-
-	public static function _localeFunc($function) {
-		if (self::$_localeLanguage !== 'en_us') {
-			$functionName = trim($function,'(');
-			if (isset(self::$_localeFunctions[$functionName])) {
-				$brace = ($functionName != $function);
-				$function = self::$_localeFunctions[$functionName];
-				if ($brace) { $function .= '('; }
-			}
-		}
-		return $function;
-	}
-
-
-
-
-	/**
-	 * Wrap string values in quotes
-	 *
-	 * @param mixed $value
-	 * @return mixed
-	 */
-	public static function _wrapResult($value) {
-		if (is_string($value)) {
-			//	Error values cannot be "wrapped"
-			if (preg_match('/^'.self::CALCULATION_REGEXP_ERROR.'$/i', $value, $match)) {
-				//	Return Excel errors "as is"
-				return $value;
-			}
-			//	Return strings wrapped in quotes
-			return '"'.$value.'"';
-		//	Convert numeric errors to NaN error
-		} else if((is_float($value)) && ((is_nan($value)) || (is_infinite($value)))) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		return $value;
-	}	//	function _wrapResult()
-
-
-	/**
-	 * Remove quotes used as a wrapper to identify string values
-	 *
-	 * @param mixed $value
-	 * @return mixed
-	 */
-	public static function _unwrapResult($value) {
-		if (is_string($value)) {
-			if ((isset($value{0})) && ($value{0} == '"') && (substr($value,-1) == '"')) {
-				return substr($value,1,-1);
-			}
-		//	Convert numeric errors to NaN error
-		} else if((is_float($value)) && ((is_nan($value)) || (is_infinite($value)))) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		return $value;
-	}	//	function _unwrapResult()
-
-
-
-
-	/**
-	 * Calculate cell value (using formula from a cell ID)
-	 * Retained for backward compatibility
-	 *
-	 * @access	public
-	 * @param	PHPExcel_Cell	$pCell	Cell to calculate
-	 * @return	mixed
-	 * @throws	PHPExcel_Calculation_Exception
-	 */
-	public function calculate(PHPExcel_Cell $pCell = NULL) {
-		try {
-			return $this->calculateCellValue($pCell);
-		} catch (PHPExcel_Exception $e) {
-			throw new PHPExcel_Calculation_Exception($e->getMessage());
-		}
-	}	//	function calculate()
-
-
-	/**
-	 * Calculate the value of a cell formula
-	 *
-	 * @access	public
-	 * @param	PHPExcel_Cell	$pCell		Cell to calculate
-	 * @param	Boolean			$resetLog	Flag indicating whether the debug log should be reset or not
-	 * @return	mixed
-	 * @throws	PHPExcel_Calculation_Exception
-	 */
-	public function calculateCellValue(PHPExcel_Cell $pCell = NULL, $resetLog = TRUE) {
-		if ($pCell === NULL) {
-			return NULL;
-		}
-
-		$returnArrayAsType = self::$returnArrayAsType;
-		if ($resetLog) {
-			//	Initialise the logging settings if requested
-			$this->formulaError = null;
-			$this->_debugLog->clearLog();
-			$this->_cyclicReferenceStack->clear();
-			$this->_cyclicFormulaCount = 1;
-
-			self::$returnArrayAsType = self::RETURN_ARRAY_AS_ARRAY;
-		}
-
-		//	Execute the calculation for the cell formula
-        $this->_cellStack[] = array(
-            'sheet' => $pCell->getWorksheet()->getTitle(),
-            'cell' => $pCell->getCoordinate(),
-        );
-		try {
-			$result = self::_unwrapResult($this->_calculateFormulaValue($pCell->getValue(), $pCell->getCoordinate(), $pCell));
-            $cellAddress = array_pop($this->_cellStack);
-            $this->_workbook->getSheetByName($cellAddress['sheet'])->getCell($cellAddress['cell']);
-		} catch (PHPExcel_Exception $e) {
-            $cellAddress = array_pop($this->_cellStack);
-            $this->_workbook->getSheetByName($cellAddress['sheet'])->getCell($cellAddress['cell']);
-			throw new PHPExcel_Calculation_Exception($e->getMessage());
-		}
-
-		if ((is_array($result)) && (self::$returnArrayAsType != self::RETURN_ARRAY_AS_ARRAY)) {
-			self::$returnArrayAsType = $returnArrayAsType;
-			$testResult = PHPExcel_Calculation_Functions::flattenArray($result);
-			if (self::$returnArrayAsType == self::RETURN_ARRAY_AS_ERROR) {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-			//	If there's only a single cell in the array, then we allow it
-			if (count($testResult) != 1) {
-				//	If keys are numeric, then it's a matrix result rather than a cell range result, so we permit it
-				$r = array_keys($result);
-				$r = array_shift($r);
-				if (!is_numeric($r)) { return PHPExcel_Calculation_Functions::VALUE(); }
-				if (is_array($result[$r])) {
-					$c = array_keys($result[$r]);
-					$c = array_shift($c);
-					if (!is_numeric($c)) {
-						return PHPExcel_Calculation_Functions::VALUE();
-					}
-				}
-			}
-			$result = array_shift($testResult);
-		}
-		self::$returnArrayAsType = $returnArrayAsType;
-
-
-		if ($result === NULL) {
-			return 0;
-		} elseif((is_float($result)) && ((is_nan($result)) || (is_infinite($result)))) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		return $result;
-	}	//	function calculateCellValue(
-
-
-	/**
-	 * Validate and parse a formula string
-	 *
-	 * @param	string		$formula		Formula to parse
-	 * @return	array
-	 * @throws	PHPExcel_Calculation_Exception
-	 */
-	public function parseFormula($formula) {
-		//	Basic validation that this is indeed a formula
-		//	We return an empty array if not
-		$formula = trim($formula);
-		if ((!isset($formula{0})) || ($formula{0} != '=')) return array();
-		$formula = ltrim(substr($formula,1));
-		if (!isset($formula{0})) return array();
-
-		//	Parse the formula and return the token stack
-		return $this->_parseFormula($formula);
-	}	//	function parseFormula()
-
-
-	/**
-	 * Calculate the value of a formula
-	 *
-	 * @param	string			$formula	Formula to parse
-	 * @param	string			$cellID		Address of the cell to calculate
-	 * @param	PHPExcel_Cell	$pCell		Cell to calculate
-	 * @return	mixed
-	 * @throws	PHPExcel_Calculation_Exception
-	 */
-	public function calculateFormula($formula, $cellID=NULL, PHPExcel_Cell $pCell = NULL) {
-		//	Initialise the logging settings
-		$this->formulaError = null;
-		$this->_debugLog->clearLog();
-		$this->_cyclicReferenceStack->clear();
-
-		//	Disable calculation cacheing because it only applies to cell calculations, not straight formulae
-		//	But don't actually flush any cache
-		$resetCache = $this->getCalculationCacheEnabled();
-		$this->_calculationCacheEnabled = FALSE;
-		//	Execute the calculation
-		try {
-			$result = self::_unwrapResult($this->_calculateFormulaValue($formula, $cellID, $pCell));
-		} catch (PHPExcel_Exception $e) {
-			throw new PHPExcel_Calculation_Exception($e->getMessage());
-		}
-
-		//	Reset calculation cacheing to its previous state
-		$this->_calculationCacheEnabled = $resetCache;
-
-		return $result;
-	}	//	function calculateFormula()
-
-
-    public function getValueFromCache($cellReference, &$cellValue) {
-		// Is calculation cacheing enabled?
-		// Is the value present in calculation cache?
-		$this->_debugLog->writeDebugLog('Testing cache value for cell ', $cellReference);
-		if (($this->_calculationCacheEnabled) && (isset($this->_calculationCache[$cellReference]))) {
-			$this->_debugLog->writeDebugLog('Retrieving value for cell ', $cellReference, ' from cache');
-			// Return the cached result
-			$cellValue = $this->_calculationCache[$cellReference];
-			return TRUE;
-		}
-		return FALSE;
-    }
-
-    public function saveValueToCache($cellReference, $cellValue) {
-		if ($this->_calculationCacheEnabled) {
-			$this->_calculationCache[$cellReference] = $cellValue;
-		}
-	}
-
-	/**
-	 * Parse a cell formula and calculate its value
-	 *
-	 * @param	string			$formula	The formula to parse and calculate
-	 * @param	string			$cellID		The ID (e.g. A3) of the cell that we are calculating
-	 * @param	PHPExcel_Cell	$pCell		Cell to calculate
-	 * @return	mixed
-	 * @throws	PHPExcel_Calculation_Exception
-	 */
-	public function _calculateFormulaValue($formula, $cellID=null, PHPExcel_Cell $pCell = null) {
-		$cellValue = null;
-
-		//	Basic validation that this is indeed a formula
-		//	We simply return the cell value if not
-		$formula = trim($formula);
-		if ($formula{0} != '=') return self::_wrapResult($formula);
-		$formula = ltrim(substr($formula, 1));
-		if (!isset($formula{0})) return self::_wrapResult($formula);
-
-		$pCellParent = ($pCell !== NULL) ? $pCell->getWorksheet() : NULL;
-		$wsTitle = ($pCellParent !== NULL) ? $pCellParent->getTitle() : "\x00Wrk";
-        $wsCellReference = $wsTitle . '!' . $cellID;
-
-		if (($cellID !== NULL) && ($this->getValueFromCache($wsCellReference, $cellValue))) {
-			return $cellValue;
-		}
-
-		if (($wsTitle{0} !== "\x00") && ($this->_cyclicReferenceStack->onStack($wsCellReference))) {
-            if ($this->cyclicFormulaCount <= 0) {
-                $this->_cyclicFormulaCell = '';
-				return $this->_raiseFormulaError('Cyclic Reference in Formula');
-			} elseif ($this->_cyclicFormulaCell === $wsCellReference) {
-				++$this->_cyclicFormulaCount;
-				if ($this->_cyclicFormulaCount >= $this->cyclicFormulaCount) {
-                    $this->_cyclicFormulaCell = '';
-					return $cellValue;
-				}
-			} elseif ($this->_cyclicFormulaCell == '') {
-				if ($this->_cyclicFormulaCount >= $this->cyclicFormulaCount) {
-					return $cellValue;
-				}
-				$this->_cyclicFormulaCell = $wsCellReference;
-			}
-		}
-
-		//	Parse the formula onto the token stack and calculate the value
-		$this->_cyclicReferenceStack->push($wsCellReference);
-		$cellValue = $this->_processTokenStack($this->_parseFormula($formula, $pCell), $cellID, $pCell);
-		$this->_cyclicReferenceStack->pop();
-
-		// Save to calculation cache
-		if ($cellID !== NULL) {
-			$this->saveValueToCache($wsCellReference, $cellValue);
-		}
-
-		//	Return the calculated value
-		return $cellValue;
-	}	//	function _calculateFormulaValue()
-
-
-	/**
-	 * Ensure that paired matrix operands are both matrices and of the same size
-	 *
-	 * @param	mixed		&$operand1	First matrix operand
-	 * @param	mixed		&$operand2	Second matrix operand
-	 * @param	integer		$resize		Flag indicating whether the matrices should be resized to match
-	 *										and (if so), whether the smaller dimension should grow or the
-	 *										larger should shrink.
-	 *											0 = no resize
-	 *											1 = shrink to fit
-	 *											2 = extend to fit
-	 */
-	private static function _checkMatrixOperands(&$operand1,&$operand2,$resize = 1) {
-		//	Examine each of the two operands, and turn them into an array if they aren't one already
-		//	Note that this function should only be called if one or both of the operand is already an array
-		if (!is_array($operand1)) {
-			list($matrixRows,$matrixColumns) = self::_getMatrixDimensions($operand2);
-			$operand1 = array_fill(0,$matrixRows,array_fill(0,$matrixColumns,$operand1));
-			$resize = 0;
-		} elseif (!is_array($operand2)) {
-			list($matrixRows,$matrixColumns) = self::_getMatrixDimensions($operand1);
-			$operand2 = array_fill(0,$matrixRows,array_fill(0,$matrixColumns,$operand2));
-			$resize = 0;
-		}
-
-		list($matrix1Rows,$matrix1Columns) = self::_getMatrixDimensions($operand1);
-		list($matrix2Rows,$matrix2Columns) = self::_getMatrixDimensions($operand2);
-		if (($matrix1Rows == $matrix2Columns) && ($matrix2Rows == $matrix1Columns)) {
-			$resize = 1;
-		}
-
-		if ($resize == 2) {
-			//	Given two matrices of (potentially) unequal size, convert the smaller in each dimension to match the larger
-			self::_resizeMatricesExtend($operand1,$operand2,$matrix1Rows,$matrix1Columns,$matrix2Rows,$matrix2Columns);
-		} elseif ($resize == 1) {
-			//	Given two matrices of (potentially) unequal size, convert the larger in each dimension to match the smaller
-			self::_resizeMatricesShrink($operand1,$operand2,$matrix1Rows,$matrix1Columns,$matrix2Rows,$matrix2Columns);
-		}
-		return array( $matrix1Rows,$matrix1Columns,$matrix2Rows,$matrix2Columns);
-	}	//	function _checkMatrixOperands()
-
-
-	/**
-	 * Read the dimensions of a matrix, and re-index it with straight numeric keys starting from row 0, column 0
-	 *
-	 * @param	mixed		&$matrix		matrix operand
-	 * @return	array		An array comprising the number of rows, and number of columns
-	 */
-	public static function _getMatrixDimensions(&$matrix) {
-		$matrixRows = count($matrix);
-		$matrixColumns = 0;
-		foreach($matrix as $rowKey => $rowValue) {
-			$matrixColumns = max(count($rowValue),$matrixColumns);
-			if (!is_array($rowValue)) {
-				$matrix[$rowKey] = array($rowValue);
-			} else {
-				$matrix[$rowKey] = array_values($rowValue);
-			}
-		}
-		$matrix = array_values($matrix);
-		return array($matrixRows,$matrixColumns);
-	}	//	function _getMatrixDimensions()
-
-
-	/**
-	 * Ensure that paired matrix operands are both matrices of the same size
-	 *
-	 * @param	mixed		&$matrix1		First matrix operand
-	 * @param	mixed		&$matrix2		Second matrix operand
-	 * @param	integer		$matrix1Rows	Row size of first matrix operand
-	 * @param	integer		$matrix1Columns	Column size of first matrix operand
-	 * @param	integer		$matrix2Rows	Row size of second matrix operand
-	 * @param	integer		$matrix2Columns	Column size of second matrix operand
-	 */
-	private static function _resizeMatricesShrink(&$matrix1,&$matrix2,$matrix1Rows,$matrix1Columns,$matrix2Rows,$matrix2Columns) {
-		if (($matrix2Columns < $matrix1Columns) || ($matrix2Rows < $matrix1Rows)) {
-			if ($matrix2Rows < $matrix1Rows) {
-				for ($i = $matrix2Rows; $i < $matrix1Rows; ++$i) {
-					unset($matrix1[$i]);
-				}
-			}
-			if ($matrix2Columns < $matrix1Columns) {
-				for ($i = 0; $i < $matrix1Rows; ++$i) {
-					for ($j = $matrix2Columns; $j < $matrix1Columns; ++$j) {
-						unset($matrix1[$i][$j]);
-					}
-				}
-			}
-		}
-
-		if (($matrix1Columns < $matrix2Columns) || ($matrix1Rows < $matrix2Rows)) {
-			if ($matrix1Rows < $matrix2Rows) {
-				for ($i = $matrix1Rows; $i < $matrix2Rows; ++$i) {
-					unset($matrix2[$i]);
-				}
-			}
-			if ($matrix1Columns < $matrix2Columns) {
-				for ($i = 0; $i < $matrix2Rows; ++$i) {
-					for ($j = $matrix1Columns; $j < $matrix2Columns; ++$j) {
-						unset($matrix2[$i][$j]);
-					}
-				}
-			}
-		}
-	}	//	function _resizeMatricesShrink()
-
-
-	/**
-	 * Ensure that paired matrix operands are both matrices of the same size
-	 *
-	 * @param	mixed		&$matrix1	First matrix operand
-	 * @param	mixed		&$matrix2	Second matrix operand
-	 * @param	integer		$matrix1Rows	Row size of first matrix operand
-	 * @param	integer		$matrix1Columns	Column size of first matrix operand
-	 * @param	integer		$matrix2Rows	Row size of second matrix operand
-	 * @param	integer		$matrix2Columns	Column size of second matrix operand
-	 */
-	private static function _resizeMatricesExtend(&$matrix1,&$matrix2,$matrix1Rows,$matrix1Columns,$matrix2Rows,$matrix2Columns) {
-		if (($matrix2Columns < $matrix1Columns) || ($matrix2Rows < $matrix1Rows)) {
-			if ($matrix2Columns < $matrix1Columns) {
-				for ($i = 0; $i < $matrix2Rows; ++$i) {
-					$x = $matrix2[$i][$matrix2Columns-1];
-					for ($j = $matrix2Columns; $j < $matrix1Columns; ++$j) {
-						$matrix2[$i][$j] = $x;
-					}
-				}
-			}
-			if ($matrix2Rows < $matrix1Rows) {
-				$x = $matrix2[$matrix2Rows-1];
-				for ($i = 0; $i < $matrix1Rows; ++$i) {
-					$matrix2[$i] = $x;
-				}
-			}
-		}
-
-		if (($matrix1Columns < $matrix2Columns) || ($matrix1Rows < $matrix2Rows)) {
-			if ($matrix1Columns < $matrix2Columns) {
-				for ($i = 0; $i < $matrix1Rows; ++$i) {
-					$x = $matrix1[$i][$matrix1Columns-1];
-					for ($j = $matrix1Columns; $j < $matrix2Columns; ++$j) {
-						$matrix1[$i][$j] = $x;
-					}
-				}
-			}
-			if ($matrix1Rows < $matrix2Rows) {
-				$x = $matrix1[$matrix1Rows-1];
-				for ($i = 0; $i < $matrix2Rows; ++$i) {
-					$matrix1[$i] = $x;
-				}
-			}
-		}
-	}	//	function _resizeMatricesExtend()
-
-
-	/**
-	 * Format details of an operand for display in the log (based on operand type)
-	 *
-	 * @param	mixed		$value	First matrix operand
-	 * @return	mixed
-	 */
-	private function _showValue($value) {
-		if ($this->_debugLog->getWriteDebugLog()) {
-			$testArray = PHPExcel_Calculation_Functions::flattenArray($value);
-			if (count($testArray) == 1) {
-				$value = array_pop($testArray);
-			}
-
-			if (is_array($value)) {
-				$returnMatrix = array();
-				$pad = $rpad = ', ';
-				foreach($value as $row) {
-					if (is_array($row)) {
-						$returnMatrix[] = implode($pad,array_map(array($this,'_showValue'),$row));
-						$rpad = '; ';
-					} else {
-						$returnMatrix[] = $this->_showValue($row);
-					}
-				}
-				return '{ '.implode($rpad,$returnMatrix).' }';
-			} elseif(is_string($value) && (trim($value,'"') == $value)) {
-				return '"'.$value.'"';
-			} elseif(is_bool($value)) {
-				return ($value) ? self::$_localeBoolean['TRUE'] : self::$_localeBoolean['FALSE'];
-			}
-		}
-		return PHPExcel_Calculation_Functions::flattenSingleValue($value);
-	}	//	function _showValue()
-
-
-	/**
-	 * Format type and details of an operand for display in the log (based on operand type)
-	 *
-	 * @param	mixed		$value	First matrix operand
-	 * @return	mixed
-	 */
-	private function _showTypeDetails($value) {
-		if ($this->_debugLog->getWriteDebugLog()) {
-			$testArray = PHPExcel_Calculation_Functions::flattenArray($value);
-			if (count($testArray) == 1) {
-				$value = array_pop($testArray);
-			}
-
-			if ($value === NULL) {
-				return 'a NULL value';
-			} elseif (is_float($value)) {
-				$typeString = 'a floating point number';
-			} elseif(is_int($value)) {
-				$typeString = 'an integer number';
-			} elseif(is_bool($value)) {
-				$typeString = 'a boolean';
-			} elseif(is_array($value)) {
-				$typeString = 'a matrix';
-			} else {
-				if ($value == '') {
-					return 'an empty string';
-				} elseif ($value{0} == '#') {
-					return 'a '.$value.' error';
-				} else {
-					$typeString = 'a string';
-				}
-			}
-			return $typeString.' with a value of '.$this->_showValue($value);
-		}
-	}	//	function _showTypeDetails()
-
-
-	private function _convertMatrixReferences($formula) {
-		static $matrixReplaceFrom = array('{',';','}');
-		static $matrixReplaceTo = array('MKMATRIX(MKMATRIX(','),MKMATRIX(','))');
-
-		//	Convert any Excel matrix references to the MKMATRIX() function
-		if (strpos($formula,'{') !== FALSE) {
-			//	If there is the possibility of braces within a quoted string, then we don't treat those as matrix indicators
-			if (strpos($formula,'"') !== FALSE) {
-				//	So instead we skip replacing in any quoted strings by only replacing in every other array element after we've exploded
-				//		the formula
-				$temp = explode('"',$formula);
-				//	Open and Closed counts used for trapping mismatched braces in the formula
-				$openCount = $closeCount = 0;
-				$i = FALSE;
-				foreach($temp as &$value) {
-					//	Only count/replace in alternating array entries
-					if ($i = !$i) {
-						$openCount += substr_count($value,'{');
-						$closeCount += substr_count($value,'}');
-						$value = str_replace($matrixReplaceFrom,$matrixReplaceTo,$value);
-					}
-				}
-				unset($value);
-				//	Then rebuild the formula string
-				$formula = implode('"',$temp);
-			} else {
-				//	If there's no quoted strings, then we do a simple count/replace
-				$openCount = substr_count($formula,'{');
-				$closeCount = substr_count($formula,'}');
-				$formula = str_replace($matrixReplaceFrom,$matrixReplaceTo,$formula);
-			}
-			//	Trap for mismatched braces and trigger an appropriate error
-			if ($openCount < $closeCount) {
-				if ($openCount > 0) {
-					return $this->_raiseFormulaError("Formula Error: Mismatched matrix braces '}'");
-				} else {
-					return $this->_raiseFormulaError("Formula Error: Unexpected '}' encountered");
-				}
-			} elseif ($openCount > $closeCount) {
-				if ($closeCount > 0) {
-					return $this->_raiseFormulaError("Formula Error: Mismatched matrix braces '{'");
-				} else {
-					return $this->_raiseFormulaError("Formula Error: Unexpected '{' encountered");
-				}
-			}
-		}
-
-		return $formula;
-	}	//	function _convertMatrixReferences()
-
-
-	private static function _mkMatrix() {
-		return func_get_args();
-	}	//	function _mkMatrix()
-
-
-	//	Binary Operators
-	//	These operators always work on two values
-	//	Array key is the operator, the value indicates whether this is a left or right associative operator
-	private static $_operatorAssociativity	= array(
-		'^' => 0,															//	Exponentiation
-		'*' => 0, '/' => 0, 												//	Multiplication and Division
-		'+' => 0, '-' => 0,													//	Addition and Subtraction
-		'&' => 0,															//	Concatenation
-		'|' => 0, ':' => 0,													//	Intersect and Range
-		'>' => 0, '<' => 0, '=' => 0, '>=' => 0, '<=' => 0, '<>' => 0		//	Comparison
-	);
-
-	//	Comparison (Boolean) Operators
-	//	These operators work on two values, but always return a boolean result
-	private static $_comparisonOperators	= array('>' => TRUE, '<' => TRUE, '=' => TRUE, '>=' => TRUE, '<=' => TRUE, '<>' => TRUE);
-
-	//	Operator Precedence
-	//	This list includes all valid operators, whether binary (including boolean) or unary (such as %)
-	//	Array key is the operator, the value is its precedence
-	private static $_operatorPrecedence	= array(
-		':' => 8,																//	Range
-		'|' => 7,																//	Intersect
-		'~' => 6,																//	Negation
-		'%' => 5,																//	Percentage
-		'^' => 4,																//	Exponentiation
-		'*' => 3, '/' => 3, 													//	Multiplication and Division
-		'+' => 2, '-' => 2,														//	Addition and Subtraction
-		'&' => 1,																//	Concatenation
-		'>' => 0, '<' => 0, '=' => 0, '>=' => 0, '<=' => 0, '<>' => 0			//	Comparison
-	);
-
-	// Convert infix to postfix notation
-	private function _parseFormula($formula, PHPExcel_Cell $pCell = NULL) {
-		if (($formula = $this->_convertMatrixReferences(trim($formula))) === FALSE) {
-			return FALSE;
-		}
-
-		//	If we're using cell caching, then $pCell may well be flushed back to the cache (which detaches the parent worksheet),
-		//		so we store the parent worksheet so that we can re-attach it when necessary
-		$pCellParent = ($pCell !== NULL) ? $pCell->getWorksheet() : NULL;
-
-		$regexpMatchString = '/^('.self::CALCULATION_REGEXP_FUNCTION.
-							   '|'.self::CALCULATION_REGEXP_CELLREF.
-							   '|'.self::CALCULATION_REGEXP_NUMBER.
-							   '|'.self::CALCULATION_REGEXP_STRING.
-							   '|'.self::CALCULATION_REGEXP_OPENBRACE.
-							   '|'.self::CALCULATION_REGEXP_NAMEDRANGE.
-							   '|'.self::CALCULATION_REGEXP_ERROR.
-							 ')/si';
-
-		//	Start with initialisation
-		$index = 0;
-		$stack = new PHPExcel_Calculation_Token_Stack;
-		$output = array();
-		$expectingOperator = FALSE;					//	We use this test in syntax-checking the expression to determine when a
-													//		- is a negation or + is a positive operator rather than an operation
-		$expectingOperand = FALSE;					//	We use this test in syntax-checking the expression to determine whether an operand
-													//		should be null in a function call
-		//	The guts of the lexical parser
-		//	Loop through the formula extracting each operator and operand in turn
-		while(TRUE) {
-//echo 'Assessing Expression '.substr($formula, $index),PHP_EOL;
-			$opCharacter = $formula{$index};	//	Get the first character of the value at the current index position
-//echo 'Initial character of expression block is '.$opCharacter,PHP_EOL;
-			if ((isset(self::$_comparisonOperators[$opCharacter])) && (strlen($formula) > $index) && (isset(self::$_comparisonOperators[$formula{$index+1}]))) {
-				$opCharacter .= $formula{++$index};
-//echo 'Initial character of expression block is comparison operator '.$opCharacter.PHP_EOL;
-			}
-
-			//	Find out if we're currently at the beginning of a number, variable, cell reference, function, parenthesis or operand
-			$isOperandOrFunction = preg_match($regexpMatchString, substr($formula, $index), $match);
-//echo '$isOperandOrFunction is '.(($isOperandOrFunction) ? 'True' : 'False').PHP_EOL;
-//var_dump($match);
-
-			if ($opCharacter == '-' && !$expectingOperator) {				//	Is it a negation instead of a minus?
-//echo 'Element is a Negation operator',PHP_EOL;
-				$stack->push('Unary Operator','~');							//	Put a negation on the stack
-				++$index;													//		and drop the negation symbol
-			} elseif ($opCharacter == '%' && $expectingOperator) {
-//echo 'Element is a Percentage operator',PHP_EOL;
-				$stack->push('Unary Operator','%');							//	Put a percentage on the stack
-				++$index;
-			} elseif ($opCharacter == '+' && !$expectingOperator) {			//	Positive (unary plus rather than binary operator plus) can be discarded?
-//echo 'Element is a Positive number, not Plus operator',PHP_EOL;
-				++$index;													//	Drop the redundant plus symbol
-			} elseif ((($opCharacter == '~') || ($opCharacter == '|')) && (!$isOperandOrFunction)) {	//	We have to explicitly deny a tilde or pipe, because they are legal
-				return $this->_raiseFormulaError("Formula Error: Illegal character '~'");				//		on the stack but not in the input expression
-
-			} elseif ((isset(self::$_operators[$opCharacter]) or $isOperandOrFunction) && $expectingOperator) {	//	Are we putting an operator on the stack?
-//echo 'Element with value '.$opCharacter.' is an Operator',PHP_EOL;
-				while($stack->count() > 0 &&
-					($o2 = $stack->last()) &&
-					isset(self::$_operators[$o2['value']]) &&
-					@(self::$_operatorAssociativity[$opCharacter] ? self::$_operatorPrecedence[$opCharacter] < self::$_operatorPrecedence[$o2['value']] : self::$_operatorPrecedence[$opCharacter] <= self::$_operatorPrecedence[$o2['value']])) {
-					$output[] = $stack->pop();								//	Swap operands and higher precedence operators from the stack to the output
-				}
-				$stack->push('Binary Operator',$opCharacter);	//	Finally put our current operator onto the stack
-				++$index;
-				$expectingOperator = FALSE;
-
-			} elseif ($opCharacter == ')' && $expectingOperator) {			//	Are we expecting to close a parenthesis?
-//echo 'Element is a Closing bracket',PHP_EOL;
-				$expectingOperand = FALSE;
-				while (($o2 = $stack->pop()) && $o2['value'] != '(') {		//	Pop off the stack back to the last (
-					if ($o2 === NULL) return $this->_raiseFormulaError('Formula Error: Unexpected closing brace ")"');
-					else $output[] = $o2;
-				}
-				$d = $stack->last(2);
-				if (preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $d['value'], $matches)) {	//	Did this parenthesis just close a function?
-					$functionName = $matches[1];										//	Get the function name
-//echo 'Closed Function is '.$functionName,PHP_EOL;
-					$d = $stack->pop();
-					$argumentCount = $d['value'];		//	See how many arguments there were (argument count is the next value stored on the stack)
-//if ($argumentCount == 0) {
-//	echo 'With no arguments',PHP_EOL;
-//} elseif ($argumentCount == 1) {
-//	echo 'With 1 argument',PHP_EOL;
-//} else {
-//	echo 'With '.$argumentCount.' arguments',PHP_EOL;
-//}
-					$output[] = $d;						//	Dump the argument count on the output
-					$output[] = $stack->pop();			//	Pop the function and push onto the output
-					if (isset(self::$_controlFunctions[$functionName])) {
-//echo 'Built-in function '.$functionName,PHP_EOL;
-						$expectedArgumentCount = self::$_controlFunctions[$functionName]['argumentCount'];
-						$functionCall = self::$_controlFunctions[$functionName]['functionCall'];
-					} elseif (isset(self::$_PHPExcelFunctions[$functionName])) {
-//echo 'PHPExcel function '.$functionName,PHP_EOL;
-						$expectedArgumentCount = self::$_PHPExcelFunctions[$functionName]['argumentCount'];
-						$functionCall = self::$_PHPExcelFunctions[$functionName]['functionCall'];
-					} else {	// did we somehow push a non-function on the stack? this should never happen
-						return $this->_raiseFormulaError("Formula Error: Internal error, non-function on stack");
-					}
-					//	Check the argument count
-					$argumentCountError = FALSE;
-					if (is_numeric($expectedArgumentCount)) {
-						if ($expectedArgumentCount < 0) {
-//echo '$expectedArgumentCount is between 0 and '.abs($expectedArgumentCount),PHP_EOL;
-							if ($argumentCount > abs($expectedArgumentCount)) {
-								$argumentCountError = TRUE;
-								$expectedArgumentCountString = 'no more than '.abs($expectedArgumentCount);
-							}
-						} else {
-//echo '$expectedArgumentCount is numeric '.$expectedArgumentCount,PHP_EOL;
-							if ($argumentCount != $expectedArgumentCount) {
-								$argumentCountError = TRUE;
-								$expectedArgumentCountString = $expectedArgumentCount;
-							}
-						}
-					} elseif ($expectedArgumentCount != '*') {
-						$isOperandOrFunction = preg_match('/(\d*)([-+,])(\d*)/',$expectedArgumentCount,$argMatch);
-//print_r($argMatch);
-//echo PHP_EOL;
-						switch ($argMatch[2]) {
-							case '+' :
-								if ($argumentCount < $argMatch[1]) {
-									$argumentCountError = TRUE;
-									$expectedArgumentCountString = $argMatch[1].' or more ';
-								}
-								break;
-							case '-' :
-								if (($argumentCount < $argMatch[1]) || ($argumentCount > $argMatch[3])) {
-									$argumentCountError = TRUE;
-									$expectedArgumentCountString = 'between '.$argMatch[1].' and '.$argMatch[3];
-								}
-								break;
-							case ',' :
-								if (($argumentCount != $argMatch[1]) && ($argumentCount != $argMatch[3])) {
-									$argumentCountError = TRUE;
-									$expectedArgumentCountString = 'either '.$argMatch[1].' or '.$argMatch[3];
-								}
-								break;
-						}
-					}
-					if ($argumentCountError) {
-						return $this->_raiseFormulaError("Formula Error: Wrong number of arguments for $functionName() function: $argumentCount given, ".$expectedArgumentCountString." expected");
-					}
-				}
-				++$index;
-
-			} elseif ($opCharacter == ',') {			//	Is this the separator for function arguments?
-//echo 'Element is a Function argument separator',PHP_EOL;
-				while (($o2 = $stack->pop()) && $o2['value'] != '(') {		//	Pop off the stack back to the last (
-					if ($o2 === NULL) return $this->_raiseFormulaError("Formula Error: Unexpected ,");
-					else $output[] = $o2;	// pop the argument expression stuff and push onto the output
-				}
-				//	If we've a comma when we're expecting an operand, then what we actually have is a null operand;
-				//		so push a null onto the stack
-				if (($expectingOperand) || (!$expectingOperator)) {
-					$output[] = array('type' => 'NULL Value', 'value' => self::$_ExcelConstants['NULL'], 'reference' => NULL);
-				}
-				// make sure there was a function
-				$d = $stack->last(2);
-				if (!preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $d['value'], $matches))
-					return $this->_raiseFormulaError("Formula Error: Unexpected ,");
-				$d = $stack->pop();
-				$stack->push($d['type'],++$d['value'],$d['reference']);	// increment the argument count
-				$stack->push('Brace', '(');	// put the ( back on, we'll need to pop back to it again
-				$expectingOperator = FALSE;
-				$expectingOperand = TRUE;
-				++$index;
-
-			} elseif ($opCharacter == '(' && !$expectingOperator) {
-//				echo 'Element is an Opening Bracket<br />';
-				$stack->push('Brace', '(');
-				++$index;
-
-			} elseif ($isOperandOrFunction && !$expectingOperator) {	// do we now have a function/variable/number?
-				$expectingOperator = TRUE;
-				$expectingOperand = FALSE;
-				$val = $match[1];
-				$length = strlen($val);
-//				echo 'Element with value '.$val.' is an Operand, Variable, Constant, String, Number, Cell Reference or Function<br />';
-
-				if (preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $val, $matches)) {
-					$val = preg_replace('/\s/u','',$val);
-//					echo 'Element '.$val.' is a Function<br />';
-					if (isset(self::$_PHPExcelFunctions[strtoupper($matches[1])]) || isset(self::$_controlFunctions[strtoupper($matches[1])])) {	// it's a function
-						$stack->push('Function', strtoupper($val));
-						$ax = preg_match('/^\s*(\s*\))/ui', substr($formula, $index+$length), $amatch);
-						if ($ax) {
-							$stack->push('Operand Count for Function '.strtoupper($val).')', 0);
-							$expectingOperator = TRUE;
-						} else {
-							$stack->push('Operand Count for Function '.strtoupper($val).')', 1);
-							$expectingOperator = FALSE;
-						}
-						$stack->push('Brace', '(');
-					} else {	// it's a var w/ implicit multiplication
-						$output[] = array('type' => 'Value', 'value' => $matches[1], 'reference' => NULL);
-					}
-				} elseif (preg_match('/^'.self::CALCULATION_REGEXP_CELLREF.'$/i', $val, $matches)) {
-//					echo 'Element '.$val.' is a Cell reference<br />';
-					//	Watch for this case-change when modifying to allow cell references in different worksheets...
-					//	Should only be applied to the actual cell column, not the worksheet name
-
-					//	If the last entry on the stack was a : operator, then we have a cell range reference
-					$testPrevOp = $stack->last(1);
-					if ($testPrevOp['value'] == ':') {
-						//	If we have a worksheet reference, then we're playing with a 3D reference
-						if ($matches[2] == '') {
-							//	Otherwise, we 'inherit' the worksheet reference from the start cell reference
-							//	The start of the cell range reference should be the last entry in $output
-							$startCellRef = $output[count($output)-1]['value'];
-							preg_match('/^'.self::CALCULATION_REGEXP_CELLREF.'$/i', $startCellRef, $startMatches);
-							if ($startMatches[2] > '') {
-								$val = $startMatches[2].'!'.$val;
-							}
-						} else {
-							return $this->_raiseFormulaError("3D Range references are not yet supported");
-						}
-					}
-
-					$output[] = array('type' => 'Cell Reference', 'value' => $val, 'reference' => $val);
-//					$expectingOperator = FALSE;
-				} else {	// it's a variable, constant, string, number or boolean
-//					echo 'Element is a Variable, Constant, String, Number or Boolean<br />';
-					//	If the last entry on the stack was a : operator, then we may have a row or column range reference
-					$testPrevOp = $stack->last(1);
-					if ($testPrevOp['value'] == ':') {
-						$startRowColRef = $output[count($output)-1]['value'];
-						$rangeWS1 = '';
-						if (strpos('!',$startRowColRef) !== FALSE) {
-							list($rangeWS1,$startRowColRef) = explode('!',$startRowColRef);
-						}
-						if ($rangeWS1 != '') $rangeWS1 .= '!';
-						$rangeWS2 = $rangeWS1;
-						if (strpos('!',$val) !== FALSE) {
-							list($rangeWS2,$val) = explode('!',$val);
-						}
-						if ($rangeWS2 != '') $rangeWS2 .= '!';
-						if ((is_integer($startRowColRef)) && (ctype_digit($val)) &&
-							($startRowColRef <= 1048576) && ($val <= 1048576)) {
-							//	Row range
-							$endRowColRef = ($pCellParent !== NULL) ? $pCellParent->getHighestColumn() : 'XFD';	//	Max 16,384 columns for Excel2007
-							$output[count($output)-1]['value'] = $rangeWS1.'A'.$startRowColRef;
-							$val = $rangeWS2.$endRowColRef.$val;
-						} elseif ((ctype_alpha($startRowColRef)) && (ctype_alpha($val)) &&
-							(strlen($startRowColRef) <= 3) && (strlen($val) <= 3)) {
-							//	Column range
-							$endRowColRef = ($pCellParent !== NULL) ? $pCellParent->getHighestRow() : 1048576;		//	Max 1,048,576 rows for Excel2007
-							$output[count($output)-1]['value'] = $rangeWS1.strtoupper($startRowColRef).'1';
-							$val = $rangeWS2.$val.$endRowColRef;
-						}
-					}
-
-					$localeConstant = FALSE;
-					if ($opCharacter == '"') {
-//						echo 'Element is a String<br />';
-						//	UnEscape any quotes within the string
-						$val = self::_wrapResult(str_replace('""','"',self::_unwrapResult($val)));
-					} elseif (is_numeric($val)) {
-//						echo 'Element is a Number<br />';
-						if ((strpos($val,'.') !== FALSE) || (stripos($val,'e') !== FALSE) || ($val > PHP_INT_MAX) || ($val < -PHP_INT_MAX)) {
-//							echo 'Casting '.$val.' to float<br />';
-							$val = (float) $val;
-						} else {
-//							echo 'Casting '.$val.' to integer<br />';
-							$val = (integer) $val;
-						}
-					} elseif (isset(self::$_ExcelConstants[trim(strtoupper($val))])) {
-						$excelConstant = trim(strtoupper($val));
-//						echo 'Element '.$excelConstant.' is an Excel Constant<br />';
-						$val = self::$_ExcelConstants[$excelConstant];
-					} elseif (($localeConstant = array_search(trim(strtoupper($val)), self::$_localeBoolean)) !== FALSE) {
-//						echo 'Element '.$localeConstant.' is an Excel Constant<br />';
-						$val = self::$_ExcelConstants[$localeConstant];
-					}
-					$details = array('type' => 'Value', 'value' => $val, 'reference' => NULL);
-					if ($localeConstant) { $details['localeValue'] = $localeConstant; }
-					$output[] = $details;
-				}
-				$index += $length;
-
-			} elseif ($opCharacter == '$') {	// absolute row or column range
-				++$index;
-			} elseif ($opCharacter == ')') {	// miscellaneous error checking
-				if ($expectingOperand) {
-					$output[] = array('type' => 'NULL Value', 'value' => self::$_ExcelConstants['NULL'], 'reference' => NULL);
-					$expectingOperand = FALSE;
-					$expectingOperator = TRUE;
-				} else {
-					return $this->_raiseFormulaError("Formula Error: Unexpected ')'");
-				}
-			} elseif (isset(self::$_operators[$opCharacter]) && !$expectingOperator) {
-				return $this->_raiseFormulaError("Formula Error: Unexpected operator '$opCharacter'");
-			} else {	// I don't even want to know what you did to get here
-				return $this->_raiseFormulaError("Formula Error: An unexpected error occured");
-			}
-			//	Test for end of formula string
-			if ($index == strlen($formula)) {
-				//	Did we end with an operator?.
-				//	Only valid for the % unary operator
-				if ((isset(self::$_operators[$opCharacter])) && ($opCharacter != '%')) {
-					return $this->_raiseFormulaError("Formula Error: Operator '$opCharacter' has no operands");
-				} else {
-					break;
-				}
-			}
-			//	Ignore white space
-			while (($formula{$index} == "\n") || ($formula{$index} == "\r")) {
-				++$index;
-			}
-			if ($formula{$index} == ' ') {
-				while ($formula{$index} == ' ') {
-					++$index;
-				}
-				//	If we're expecting an operator, but only have a space between the previous and next operands (and both are
-				//		Cell References) then we have an INTERSECTION operator
-//				echo 'Possible Intersect Operator<br />';
-				if (($expectingOperator) && (preg_match('/^'.self::CALCULATION_REGEXP_CELLREF.'.*/Ui', substr($formula, $index), $match)) &&
-					($output[count($output)-1]['type'] == 'Cell Reference')) {
-//					echo 'Element is an Intersect Operator<br />';
-					while($stack->count() > 0 &&
-						($o2 = $stack->last()) &&
-						isset(self::$_operators[$o2['value']]) &&
-						@(self::$_operatorAssociativity[$opCharacter] ? self::$_operatorPrecedence[$opCharacter] < self::$_operatorPrecedence[$o2['value']] : self::$_operatorPrecedence[$opCharacter] <= self::$_operatorPrecedence[$o2['value']])) {
-						$output[] = $stack->pop();								//	Swap operands and higher precedence operators from the stack to the output
-					}
-					$stack->push('Binary Operator','|');	//	Put an Intersect Operator on the stack
-					$expectingOperator = FALSE;
-				}
-			}
-		}
-
-		while (($op = $stack->pop()) !== NULL) {	// pop everything off the stack and push onto output
-			if ((is_array($op) && $op['value'] == '(') || ($op === '('))
-				return $this->_raiseFormulaError("Formula Error: Expecting ')'");	// if there are any opening braces on the stack, then braces were unbalanced
-			$output[] = $op;
-		}
-		return $output;
-	}	//	function _parseFormula()
-
-
-	private static function _dataTestReference(&$operandData)
-	{
-		$operand = $operandData['value'];
-		if (($operandData['reference'] === NULL) && (is_array($operand))) {
-			$rKeys = array_keys($operand);
-			$rowKey = array_shift($rKeys);
-			$cKeys = array_keys(array_keys($operand[$rowKey]));
-			$colKey = array_shift($cKeys);
-			if (ctype_upper($colKey)) {
-				$operandData['reference'] = $colKey.$rowKey;
-			}
-		}
-		return $operand;
-	}
-
-	// evaluate postfix notation
-	private function _processTokenStack($tokens, $cellID = NULL, PHPExcel_Cell $pCell = NULL) {
-		if ($tokens == FALSE) return FALSE;
-
-		//	If we're using cell caching, then $pCell may well be flushed back to the cache (which detaches the parent cell collection),
-		//		so we store the parent cell collection so that we can re-attach it when necessary
-		$pCellWorksheet = ($pCell !== NULL) ? $pCell->getWorksheet() : NULL;
-		$pCellParent = ($pCell !== NULL) ? $pCell->getParent() : null;
-		$stack = new PHPExcel_Calculation_Token_Stack;
-
-		//	Loop through each token in turn
-		foreach ($tokens as $tokenData) {
-//			print_r($tokenData);
-//			echo '<br />';
-			$token = $tokenData['value'];
-//			echo '<b>Token is '.$token.'</b><br />';
-			// if the token is a binary operator, pop the top two values off the stack, do the operation, and push the result back on the stack
-			if (isset(self::$_binaryOperators[$token])) {
-//				echo 'Token is a binary operator<br />';
-				//	We must have two operands, error if we don't
-				if (($operand2Data = $stack->pop()) === NULL) return $this->_raiseFormulaError('Internal error - Operand value missing from stack');
-				if (($operand1Data = $stack->pop()) === NULL) return $this->_raiseFormulaError('Internal error - Operand value missing from stack');
-
-				$operand1 = self::_dataTestReference($operand1Data);
-				$operand2 = self::_dataTestReference($operand2Data);
-
-				//	Log what we're doing
-				if ($token == ':') {
-					$this->_debugLog->writeDebugLog('Evaluating Range ', $this->_showValue($operand1Data['reference']), ' ', $token, ' ', $this->_showValue($operand2Data['reference']));
-				} else {
-					$this->_debugLog->writeDebugLog('Evaluating ', $this->_showValue($operand1), ' ', $token, ' ', $this->_showValue($operand2));
-				}
-
-				//	Process the operation in the appropriate manner
-				switch ($token) {
-					//	Comparison (Boolean) Operators
-					case '>'	:			//	Greater than
-					case '<'	:			//	Less than
-					case '>='	:			//	Greater than or Equal to
-					case '<='	:			//	Less than or Equal to
-					case '='	:			//	Equality
-					case '<>'	:			//	Inequality
-						$this->_executeBinaryComparisonOperation($cellID,$operand1,$operand2,$token,$stack);
-						break;
-					//	Binary Operators
-					case ':'	:			//	Range
-						$sheet1 = $sheet2 = '';
-						if (strpos($operand1Data['reference'],'!') !== FALSE) {
-							list($sheet1,$operand1Data['reference']) = explode('!',$operand1Data['reference']);
-						} else {
-							$sheet1 = ($pCellParent !== NULL) ? $pCellWorksheet->getTitle() : '';
-						}
-						if (strpos($operand2Data['reference'],'!') !== FALSE) {
-							list($sheet2,$operand2Data['reference']) = explode('!',$operand2Data['reference']);
-						} else {
-							$sheet2 = $sheet1;
-						}
-						if ($sheet1 == $sheet2) {
-							if ($operand1Data['reference'] === NULL) {
-								if ((trim($operand1Data['value']) != '') && (is_numeric($operand1Data['value']))) {
-									$operand1Data['reference'] = $pCell->getColumn().$operand1Data['value'];
-								} elseif (trim($operand1Data['reference']) == '') {
-									$operand1Data['reference'] = $pCell->getCoordinate();
-								} else {
-									$operand1Data['reference'] = $operand1Data['value'].$pCell->getRow();
-								}
-							}
-							if ($operand2Data['reference'] === NULL) {
-								if ((trim($operand2Data['value']) != '') && (is_numeric($operand2Data['value']))) {
-									$operand2Data['reference'] = $pCell->getColumn().$operand2Data['value'];
-								} elseif (trim($operand2Data['reference']) == '') {
-									$operand2Data['reference'] = $pCell->getCoordinate();
-								} else {
-									$operand2Data['reference'] = $operand2Data['value'].$pCell->getRow();
-								}
-							}
-
-							$oData = array_merge(explode(':',$operand1Data['reference']),explode(':',$operand2Data['reference']));
-							$oCol = $oRow = array();
-							foreach($oData as $oDatum) {
-								$oCR = PHPExcel_Cell::coordinateFromString($oDatum);
-								$oCol[] = PHPExcel_Cell::columnIndexFromString($oCR[0]) - 1;
-								$oRow[] = $oCR[1];
-							}
-							$cellRef = PHPExcel_Cell::stringFromColumnIndex(min($oCol)).min($oRow).':'.PHPExcel_Cell::stringFromColumnIndex(max($oCol)).max($oRow);
-							if ($pCellParent !== NULL) {
-								$cellValue = $this->extractCellRange($cellRef, $this->_workbook->getSheetByName($sheet1), FALSE);
-							} else {
-								return $this->_raiseFormulaError('Unable to access Cell Reference');
-							}
-							$stack->push('Cell Reference',$cellValue,$cellRef);
-						} else {
-							$stack->push('Error',PHPExcel_Calculation_Functions::REF(),NULL);
-						}
-
-						break;
-					case '+'	:			//	Addition
-						$this->_executeNumericBinaryOperation($cellID,$operand1,$operand2,$token,'plusEquals',$stack);
-						break;
-					case '-'	:			//	Subtraction
-						$this->_executeNumericBinaryOperation($cellID,$operand1,$operand2,$token,'minusEquals',$stack);
-						break;
-					case '*'	:			//	Multiplication
-						$this->_executeNumericBinaryOperation($cellID,$operand1,$operand2,$token,'arrayTimesEquals',$stack);
-						break;
-					case '/'	:			//	Division
-						$this->_executeNumericBinaryOperation($cellID,$operand1,$operand2,$token,'arrayRightDivide',$stack);
-						break;
-					case '^'	:			//	Exponential
-						$this->_executeNumericBinaryOperation($cellID,$operand1,$operand2,$token,'power',$stack);
-						break;
-					case '&'	:			//	Concatenation
-						//	If either of the operands is a matrix, we need to treat them both as matrices
-						//		(converting the other operand to a matrix if need be); then perform the required
-						//		matrix operation
-						if (is_bool($operand1)) {
-							$operand1 = ($operand1) ? self::$_localeBoolean['TRUE'] : self::$_localeBoolean['FALSE'];
-						}
-						if (is_bool($operand2)) {
-							$operand2 = ($operand2) ? self::$_localeBoolean['TRUE'] : self::$_localeBoolean['FALSE'];
-						}
-						if ((is_array($operand1)) || (is_array($operand2))) {
-							//	Ensure that both operands are arrays/matrices
-							self::_checkMatrixOperands($operand1,$operand2,2);
-							try {
-								//	Convert operand 1 from a PHP array to a matrix
-								$matrix = new PHPExcel_Shared_JAMA_Matrix($operand1);
-								//	Perform the required operation against the operand 1 matrix, passing in operand 2
-								$matrixResult = $matrix->concat($operand2);
-								$result = $matrixResult->getArray();
-							} catch (PHPExcel_Exception $ex) {
-								$this->_debugLog->writeDebugLog('JAMA Matrix Exception: ', $ex->getMessage());
-								$result = '#VALUE!';
-							}
-						} else {
-							$result = '"'.str_replace('""','"',self::_unwrapResult($operand1,'"').self::_unwrapResult($operand2,'"')).'"';
-						}
-						$this->_debugLog->writeDebugLog('Evaluation Result is ', $this->_showTypeDetails($result));
-						$stack->push('Value',$result);
-						break;
-					case '|'	:			//	Intersect
-						$rowIntersect = array_intersect_key($operand1,$operand2);
-						$cellIntersect = $oCol = $oRow = array();
-						foreach(array_keys($rowIntersect) as $row) {
-							$oRow[] = $row;
-							foreach($rowIntersect[$row] as $col => $data) {
-								$oCol[] = PHPExcel_Cell::columnIndexFromString($col) - 1;
-								$cellIntersect[$row] = array_intersect_key($operand1[$row],$operand2[$row]);
-							}
-						}
-						$cellRef = PHPExcel_Cell::stringFromColumnIndex(min($oCol)).min($oRow).':'.PHPExcel_Cell::stringFromColumnIndex(max($oCol)).max($oRow);
-						$this->_debugLog->writeDebugLog('Evaluation Result is ', $this->_showTypeDetails($cellIntersect));
-						$stack->push('Value',$cellIntersect,$cellRef);
-						break;
-				}
-
-			// if the token is a unary operator, pop one value off the stack, do the operation, and push it back on
-			} elseif (($token === '~') || ($token === '%')) {
-//				echo 'Token is a unary operator<br />';
-				if (($arg = $stack->pop()) === NULL) return $this->_raiseFormulaError('Internal error - Operand value missing from stack');
-				$arg = $arg['value'];
-				if ($token === '~') {
-//					echo 'Token is a negation operator<br />';
-					$this->_debugLog->writeDebugLog('Evaluating Negation of ', $this->_showValue($arg));
-					$multiplier = -1;
-				} else {
-//					echo 'Token is a percentile operator<br />';
-					$this->_debugLog->writeDebugLog('Evaluating Percentile of ', $this->_showValue($arg));
-					$multiplier = 0.01;
-				}
-				if (is_array($arg)) {
-					self::_checkMatrixOperands($arg,$multiplier,2);
-					try {
-						$matrix1 = new PHPExcel_Shared_JAMA_Matrix($arg);
-						$matrixResult = $matrix1->arrayTimesEquals($multiplier);
-						$result = $matrixResult->getArray();
-					} catch (PHPExcel_Exception $ex) {
-						$this->_debugLog->writeDebugLog('JAMA Matrix Exception: ', $ex->getMessage());
-						$result = '#VALUE!';
-					}
-					$this->_debugLog->writeDebugLog('Evaluation Result is ', $this->_showTypeDetails($result));
-					$stack->push('Value',$result);
-				} else {
-					$this->_executeNumericBinaryOperation($cellID,$multiplier,$arg,'*','arrayTimesEquals',$stack);
-				}
-
-			} elseif (preg_match('/^'.self::CALCULATION_REGEXP_CELLREF.'$/i', $token, $matches)) {
-				$cellRef = NULL;
-//				echo 'Element '.$token.' is a Cell reference<br />';
-				if (isset($matches[8])) {
-//					echo 'Reference is a Range of cells<br />';
-					if ($pCell === NULL) {
-//						We can't access the range, so return a REF error
-						$cellValue = PHPExcel_Calculation_Functions::REF();
-					} else {
-						$cellRef = $matches[6].$matches[7].':'.$matches[9].$matches[10];
-						if ($matches[2] > '') {
-							$matches[2] = trim($matches[2],"\"'");
-							if ((strpos($matches[2],'[') !== FALSE) || (strpos($matches[2],']') !== FALSE)) {
-								//	It's a Reference to an external workbook (not currently supported)
-								return $this->_raiseFormulaError('Unable to access External Workbook');
-							}
-							$matches[2] = trim($matches[2],"\"'");
-//							echo '$cellRef='.$cellRef.' in worksheet '.$matches[2].'<br />';
-							$this->_debugLog->writeDebugLog('Evaluating Cell Range ', $cellRef, ' in worksheet ', $matches[2]);
-							if ($pCellParent !== NULL) {
-								$cellValue = $this->extractCellRange($cellRef, $this->_workbook->getSheetByName($matches[2]), FALSE);
-							} else {
-								return $this->_raiseFormulaError('Unable to access Cell Reference');
-							}
-							$this->_debugLog->writeDebugLog('Evaluation Result for cells ', $cellRef, ' in worksheet ', $matches[2], ' is ', $this->_showTypeDetails($cellValue));
-//							$cellRef = $matches[2].'!'.$cellRef;
-						} else {
-//							echo '$cellRef='.$cellRef.' in current worksheet<br />';
-							$this->_debugLog->writeDebugLog('Evaluating Cell Range ', $cellRef, ' in current worksheet');
-							if ($pCellParent !== NULL) {
-								$cellValue = $this->extractCellRange($cellRef, $pCellWorksheet, FALSE);
-							} else {
-								return $this->_raiseFormulaError('Unable to access Cell Reference');
-							}
-							$this->_debugLog->writeDebugLog('Evaluation Result for cells ', $cellRef, ' is ', $this->_showTypeDetails($cellValue));
-						}
-					}
-				} else {
-//					echo 'Reference is a single Cell<br />';
-					if ($pCell === NULL) {
-//						We can't access the cell, so return a REF error
-						$cellValue = PHPExcel_Calculation_Functions::REF();
-					} else {
-						$cellRef = $matches[6].$matches[7];
-						if ($matches[2] > '') {
-							$matches[2] = trim($matches[2],"\"'");
-							if ((strpos($matches[2],'[') !== FALSE) || (strpos($matches[2],']') !== FALSE)) {
-								//	It's a Reference to an external workbook (not currently supported)
-								return $this->_raiseFormulaError('Unable to access External Workbook');
-							}
-//							echo '$cellRef='.$cellRef.' in worksheet '.$matches[2].'<br />';
-							$this->_debugLog->writeDebugLog('Evaluating Cell ', $cellRef, ' in worksheet ', $matches[2]);
-							if ($pCellParent !== NULL) {
-								$cellSheet = $this->_workbook->getSheetByName($matches[2]);
-								if ($cellSheet && $cellSheet->cellExists($cellRef)) {
-									$cellValue = $this->extractCellRange($cellRef, $this->_workbook->getSheetByName($matches[2]), FALSE);
-									$pCell->attach($pCellParent);
-								} else {
-									$cellValue = NULL;
-								}
-							} else {
-								return $this->_raiseFormulaError('Unable to access Cell Reference');
-							}
-							$this->_debugLog->writeDebugLog('Evaluation Result for cell ', $cellRef, ' in worksheet ', $matches[2], ' is ', $this->_showTypeDetails($cellValue));
-//							$cellRef = $matches[2].'!'.$cellRef;
-						} else {
-//							echo '$cellRef='.$cellRef.' in current worksheet<br />';
-							$this->_debugLog->writeDebugLog('Evaluating Cell ', $cellRef, ' in current worksheet');
-							if ($pCellParent->isDataSet($cellRef)) {
-								$cellValue = $this->extractCellRange($cellRef, $pCellWorksheet, FALSE);
-								$pCell->attach($pCellParent);
-							} else {
-								$cellValue = NULL;
-							}
-							$this->_debugLog->writeDebugLog('Evaluation Result for cell ', $cellRef, ' is ', $this->_showTypeDetails($cellValue));
-						}
-					}
-				}
-				$stack->push('Value',$cellValue,$cellRef);
-
-			// if the token is a function, pop arguments off the stack, hand them to the function, and push the result back on
-			} elseif (preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $token, $matches)) {
-//				echo 'Token is a function<br />';
-				$functionName = $matches[1];
-				$argCount = $stack->pop();
-				$argCount = $argCount['value'];
-				if ($functionName != 'MKMATRIX') {
-					$this->_debugLog->writeDebugLog('Evaluating Function ', self::_localeFunc($functionName), '() with ', (($argCount == 0) ? 'no' : $argCount), ' argument', (($argCount == 1) ? '' : 's'));
-				}
-				if ((isset(self::$_PHPExcelFunctions[$functionName])) || (isset(self::$_controlFunctions[$functionName]))) {	// function
-					if (isset(self::$_PHPExcelFunctions[$functionName])) {
-						$functionCall = self::$_PHPExcelFunctions[$functionName]['functionCall'];
-						$passByReference = isset(self::$_PHPExcelFunctions[$functionName]['passByReference']);
-						$passCellReference = isset(self::$_PHPExcelFunctions[$functionName]['passCellReference']);
-					} elseif (isset(self::$_controlFunctions[$functionName])) {
-						$functionCall = self::$_controlFunctions[$functionName]['functionCall'];
-						$passByReference = isset(self::$_controlFunctions[$functionName]['passByReference']);
-						$passCellReference = isset(self::$_controlFunctions[$functionName]['passCellReference']);
-					}
-					// get the arguments for this function
-//					echo 'Function '.$functionName.' expects '.$argCount.' arguments<br />';
-					$args = $argArrayVals = array();
-					for ($i = 0; $i < $argCount; ++$i) {
-						$arg = $stack->pop();
-						$a = $argCount - $i - 1;
-						if (($passByReference) &&
-							(isset(self::$_PHPExcelFunctions[$functionName]['passByReference'][$a])) &&
-							(self::$_PHPExcelFunctions[$functionName]['passByReference'][$a])) {
-							if ($arg['reference'] === NULL) {
-								$args[] = $cellID;
-								if ($functionName != 'MKMATRIX') { $argArrayVals[] = $this->_showValue($cellID); }
-							} else {
-								$args[] = $arg['reference'];
-								if ($functionName != 'MKMATRIX') { $argArrayVals[] = $this->_showValue($arg['reference']); }
-							}
-						} else {
-							$args[] = self::_unwrapResult($arg['value']);
-							if ($functionName != 'MKMATRIX') { $argArrayVals[] = $this->_showValue($arg['value']); }
-						}
-					}
-					//	Reverse the order of the arguments
-					krsort($args);
-					if (($passByReference) && ($argCount == 0)) {
-						$args[] = $cellID;
-						$argArrayVals[] = $this->_showValue($cellID);
-					}
-//					echo 'Arguments are: ';
-//					print_r($args);
-//					echo '<br />';
-					if ($functionName != 'MKMATRIX') {
-						if ($this->_debugLog->getWriteDebugLog()) {
-							krsort($argArrayVals);
-							$this->_debugLog->writeDebugLog('Evaluating ', self::_localeFunc($functionName), '( ', implode(self::$_localeArgumentSeparator.' ',PHPExcel_Calculation_Functions::flattenArray($argArrayVals)), ' )');
-						}
-					}
-					//	Process each argument in turn, building the return value as an array
-//					if (($argCount == 1) && (is_array($args[1])) && ($functionName != 'MKMATRIX')) {
-//						$operand1 = $args[1];
-//						$this->_debugLog->writeDebugLog('Argument is a matrix: ', $this->_showValue($operand1));
-//						$result = array();
-//						$row = 0;
-//						foreach($operand1 as $args) {
-//							if (is_array($args)) {
-//								foreach($args as $arg) {
-//									$this->_debugLog->writeDebugLog('Evaluating ', self::_localeFunc($functionName), '( ', $this->_showValue($arg), ' )');
-//									$r = call_user_func_array($functionCall,$arg);
-//									$this->_debugLog->writeDebugLog('Evaluation Result for ', self::_localeFunc($functionName), '() function call is ', $this->_showTypeDetails($r));
-//									$result[$row][] = $r;
-//								}
-//								++$row;
-//							} else {
-//								$this->_debugLog->writeDebugLog('Evaluating ', self::_localeFunc($functionName), '( ', $this->_showValue($args), ' )');
-//								$r = call_user_func_array($functionCall,$args);
-//								$this->_debugLog->writeDebugLog('Evaluation Result for ', self::_localeFunc($functionName), '() function call is ', $this->_showTypeDetails($r));
-//								$result[] = $r;
-//							}
-//						}
-//					} else {
-					//	Process the argument with the appropriate function call
-						if ($passCellReference) {
-							$args[] = $pCell;
-						}
-						if (strpos($functionCall,'::') !== FALSE) {
-							$result = call_user_func_array(explode('::',$functionCall),$args);
-						} else {
-							foreach($args as &$arg) {
-								$arg = PHPExcel_Calculation_Functions::flattenSingleValue($arg);
-							}
-							unset($arg);
-							$result = call_user_func_array($functionCall,$args);
-						}
-//					}
-					if ($functionName != 'MKMATRIX') {
-						$this->_debugLog->writeDebugLog('Evaluation Result for ', self::_localeFunc($functionName), '() function call is ', $this->_showTypeDetails($result));
-					}
-					$stack->push('Value',self::_wrapResult($result));
-				}
-
-			} else {
-				// if the token is a number, boolean, string or an Excel error, push it onto the stack
-				if (isset(self::$_ExcelConstants[strtoupper($token)])) {
-					$excelConstant = strtoupper($token);
-//					echo 'Token is a PHPExcel constant: '.$excelConstant.'<br />';
-					$stack->push('Constant Value',self::$_ExcelConstants[$excelConstant]);
-					$this->_debugLog->writeDebugLog('Evaluating Constant ', $excelConstant, ' as ', $this->_showTypeDetails(self::$_ExcelConstants[$excelConstant]));
-				} elseif ((is_numeric($token)) || ($token === NULL) || (is_bool($token)) || ($token == '') || ($token{0} == '"') || ($token{0} == '#')) {
-//					echo 'Token is a number, boolean, string, null or an Excel error<br />';
-					$stack->push('Value',$token);
-				// if the token is a named range, push the named range name onto the stack
-				} elseif (preg_match('/^'.self::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $token, $matches)) {
-//					echo 'Token is a named range<br />';
-					$namedRange = $matches[6];
-//					echo 'Named Range is '.$namedRange.'<br />';
-					$this->_debugLog->writeDebugLog('Evaluating Named Range ', $namedRange);
-					$cellValue = $this->extractNamedRange($namedRange, ((NULL !== $pCell) ? $pCellWorksheet : NULL), FALSE);
-					$pCell->attach($pCellParent);
-					$this->_debugLog->writeDebugLog('Evaluation Result for named range ', $namedRange, ' is ', $this->_showTypeDetails($cellValue));
-					$stack->push('Named Range',$cellValue,$namedRange);
-				} else {
-					return $this->_raiseFormulaError("undefined variable '$token'");
-				}
-			}
-		}
-		// when we're out of tokens, the stack should have a single element, the final result
-		if ($stack->count() != 1) return $this->_raiseFormulaError("internal error");
-		$output = $stack->pop();
-		$output = $output['value'];
-
-//		if ((is_array($output)) && (self::$returnArrayAsType != self::RETURN_ARRAY_AS_ARRAY)) {
-//			return array_shift(PHPExcel_Calculation_Functions::flattenArray($output));
-//		}
-		return $output;
-	}	//	function _processTokenStack()
-
-
-	private function _validateBinaryOperand($cellID, &$operand, &$stack) {
-		if (is_array($operand)) {
-			if ((count($operand, COUNT_RECURSIVE) - count($operand)) == 1) {
-				do {
-					$operand = array_pop($operand);
-				} while (is_array($operand));
-			}
-		}
-		//	Numbers, matrices and booleans can pass straight through, as they're already valid
-		if (is_string($operand)) {
-			//	We only need special validations for the operand if it is a string
-			//	Start by stripping off the quotation marks we use to identify true excel string values internally
-			if ($operand > '' && $operand{0} == '"') { $operand = self::_unwrapResult($operand); }
-			//	If the string is a numeric value, we treat it as a numeric, so no further testing
-			if (!is_numeric($operand)) {
-				//	If not a numeric, test to see if the value is an Excel error, and so can't be used in normal binary operations
-				if ($operand > '' && $operand{0} == '#') {
-					$stack->push('Value', $operand);
-					$this->_debugLog->writeDebugLog('Evaluation Result is ', $this->_showTypeDetails($operand));
-					return FALSE;
-				} elseif (!PHPExcel_Shared_String::convertToNumberIfFraction($operand)) {
-					//	If not a numeric or a fraction, then it's a text string, and so can't be used in mathematical binary operations
-					$stack->push('Value', '#VALUE!');
-					$this->_debugLog->writeDebugLog('Evaluation Result is a ', $this->_showTypeDetails('#VALUE!'));
-					return FALSE;
-				}
-			}
-		}
-
-		//	return a true if the value of the operand is one that we can use in normal binary operations
-		return TRUE;
-	}	//	function _validateBinaryOperand()
-
-
-	private function _executeBinaryComparisonOperation($cellID, $operand1, $operand2, $operation, &$stack, $recursingArrays=FALSE) {
-		//	If we're dealing with matrix operations, we want a matrix result
-		if ((is_array($operand1)) || (is_array($operand2))) {
-			$result = array();
-			if ((is_array($operand1)) && (!is_array($operand2))) {
-				foreach($operand1 as $x => $operandData) {
-					$this->_debugLog->writeDebugLog('Evaluating Comparison ', $this->_showValue($operandData), ' ', $operation, ' ', $this->_showValue($operand2));
-					$this->_executeBinaryComparisonOperation($cellID,$operandData,$operand2,$operation,$stack);
-					$r = $stack->pop();
-					$result[$x] = $r['value'];
-				}
-			} elseif ((!is_array($operand1)) && (is_array($operand2))) {
-				foreach($operand2 as $x => $operandData) {
-					$this->_debugLog->writeDebugLog('Evaluating Comparison ', $this->_showValue($operand1), ' ', $operation, ' ', $this->_showValue($operandData));
-					$this->_executeBinaryComparisonOperation($cellID,$operand1,$operandData,$operation,$stack);
-					$r = $stack->pop();
-					$result[$x] = $r['value'];
-				}
-			} else {
-				if (!$recursingArrays) { self::_checkMatrixOperands($operand1,$operand2,2); }
-				foreach($operand1 as $x => $operandData) {
-					$this->_debugLog->writeDebugLog('Evaluating Comparison ', $this->_showValue($operandData), ' ', $operation, ' ', $this->_showValue($operand2[$x]));
-					$this->_executeBinaryComparisonOperation($cellID,$operandData,$operand2[$x],$operation,$stack,TRUE);
-					$r = $stack->pop();
-					$result[$x] = $r['value'];
-				}
-			}
-			//	Log the result details
-			$this->_debugLog->writeDebugLog('Comparison Evaluation Result is ', $this->_showTypeDetails($result));
-			//	And push the result onto the stack
-			$stack->push('Array',$result);
-			return TRUE;
-		}
-
-		//	Simple validate the two operands if they are string values
-		if (is_string($operand1) && $operand1 > '' && $operand1{0} == '"') { $operand1 = self::_unwrapResult($operand1); }
-		if (is_string($operand2) && $operand2 > '' && $operand2{0} == '"') { $operand2 = self::_unwrapResult($operand2); }
-
-		// Use case insensitive comparaison if not OpenOffice mode
-		if (PHPExcel_Calculation_Functions::getCompatibilityMode() != PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE)
-		{
-			if (is_string($operand1)) {
-				$operand1 = strtoupper($operand1);
-			}
-
-			if (is_string($operand2)) {
-				$operand2 = strtoupper($operand2);
-			}
-		}
-
-		$useLowercaseFirstComparison = is_string($operand1) && is_string($operand2) && PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE;
-
-		//	execute the necessary operation
-		switch ($operation) {
-			//	Greater than
-			case '>':
-				if ($useLowercaseFirstComparison) {
-					$result = $this->strcmpLowercaseFirst($operand1, $operand2) > 0;
-				} else {
-					$result = ($operand1 > $operand2);
-				}
-				break;
-			//	Less than
-			case '<':
-				if ($useLowercaseFirstComparison) {
-					$result = $this->strcmpLowercaseFirst($operand1, $operand2) < 0;
-				} else {
-					$result = ($operand1 < $operand2);
-				}
-				break;
-			//	Equality
-			case '=':
-                if (is_numeric($operand1) && is_numeric($operand2)) {
-                    $result = (abs($operand1 - $operand2) < $this->delta);
-                } else {
-                    $result = strcmp($operand1, $operand2) == 0;
-                }
-				break;
-			//	Greater than or equal
-			case '>=':
-                if (is_numeric($operand1) && is_numeric($operand2)) {
-                    $result = ((abs($operand1 - $operand2) < $this->delta) || ($operand1 > $operand2));
-				} elseif ($useLowercaseFirstComparison) {
-					$result = $this->strcmpLowercaseFirst($operand1, $operand2) >= 0;
-				} else {
-					$result = strcmp($operand1, $operand2) >= 0;
-				}
-				break;
-			//	Less than or equal
-			case '<=':
-                if (is_numeric($operand1) && is_numeric($operand2)) {
-                    $result = ((abs($operand1 - $operand2) < $this->delta) || ($operand1 < $operand2));
-                } elseif ($useLowercaseFirstComparison) {
-					$result = $this->strcmpLowercaseFirst($operand1, $operand2) <= 0;
-				} else {
-					$result = strcmp($operand1, $operand2) <= 0;
-				}
-				break;
-			//	Inequality
-			case '<>':
-                if (is_numeric($operand1) && is_numeric($operand2)) {
-                    $result = (abs($operand1 - $operand2) > 1E-14);
-                } else {
-                    $result = strcmp($operand1, $operand2) != 0;
-                }
-				break;
-		}
-
-		//	Log the result details
-		$this->_debugLog->writeDebugLog('Evaluation Result is ', $this->_showTypeDetails($result));
-		//	And push the result onto the stack
-		$stack->push('Value',$result);
-		return true;
-	}
-
-	/**
-	 * Compare two strings in the same way as strcmp() except that lowercase come before uppercase letters
-	 * @param    string    $str1    First string value for the comparison
-	 * @param    string    $str2    Second string value for the comparison
-	 * @return   integer
-	 */
-	private function strcmpLowercaseFirst($str1, $str2)
-	{
-        $inversedStr1 = PHPExcel_Shared_String::StrCaseReverse($str1);
-        $inversedStr2 = PHPExcel_Shared_String::StrCaseReverse($str2);
-
-		return strcmp($inversedStr1, $inversedStr2);
-	}
-
-	private function _executeNumericBinaryOperation($cellID,$operand1,$operand2,$operation,$matrixFunction,&$stack) {
-		//	Validate the two operands
-		if (!$this->_validateBinaryOperand($cellID,$operand1,$stack)) return FALSE;
-		if (!$this->_validateBinaryOperand($cellID,$operand2,$stack)) return FALSE;
-
-		//	If either of the operands is a matrix, we need to treat them both as matrices
-		//		(converting the other operand to a matrix if need be); then perform the required
-		//		matrix operation
-		if ((is_array($operand1)) || (is_array($operand2))) {
-			//	Ensure that both operands are arrays/matrices of the same size
-			self::_checkMatrixOperands($operand1, $operand2, 2);
-
-			try {
-				//	Convert operand 1 from a PHP array to a matrix
-				$matrix = new PHPExcel_Shared_JAMA_Matrix($operand1);
-				//	Perform the required operation against the operand 1 matrix, passing in operand 2
-				$matrixResult = $matrix->$matrixFunction($operand2);
-				$result = $matrixResult->getArray();
-			} catch (PHPExcel_Exception $ex) {
-				$this->_debugLog->writeDebugLog('JAMA Matrix Exception: ', $ex->getMessage());
-				$result = '#VALUE!';
-			}
-		} else {
-			if ((PHPExcel_Calculation_Functions::getCompatibilityMode() != PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) &&
-				((is_string($operand1) && !is_numeric($operand1) && strlen($operand1)>0) || 
-                 (is_string($operand2) && !is_numeric($operand2) && strlen($operand2)>0))) {
-				$result = PHPExcel_Calculation_Functions::VALUE();
-			} else {
-				//	If we're dealing with non-matrix operations, execute the necessary operation
-				switch ($operation) {
-					//	Addition
-					case '+':
-						$result = $operand1 + $operand2;
-						break;
-					//	Subtraction
-					case '-':
-						$result = $operand1 - $operand2;
-						break;
-					//	Multiplication
-					case '*':
-						$result = $operand1 * $operand2;
-						break;
-					//	Division
-					case '/':
-						if ($operand2 == 0) {
-							//	Trap for Divide by Zero error
-							$stack->push('Value','#DIV/0!');
-							$this->_debugLog->writeDebugLog('Evaluation Result is ', $this->_showTypeDetails('#DIV/0!'));
-							return FALSE;
-						} else {
-							$result = $operand1 / $operand2;
-						}
-						break;
-					//	Power
-					case '^':
-						$result = pow($operand1, $operand2);
-						break;
-				}
-			}
-		}
-
-		//	Log the result details
-		$this->_debugLog->writeDebugLog('Evaluation Result is ', $this->_showTypeDetails($result));
-		//	And push the result onto the stack
-		$stack->push('Value',$result);
-		return TRUE;
-	}	//	function _executeNumericBinaryOperation()
-
-
-	// trigger an error, but nicely, if need be
-	protected function _raiseFormulaError($errorMessage) {
-		$this->formulaError = $errorMessage;
-		$this->_cyclicReferenceStack->clear();
-		if (!$this->suppressFormulaErrors) throw new PHPExcel_Calculation_Exception($errorMessage);
-		trigger_error($errorMessage, E_USER_ERROR);
-	}	//	function _raiseFormulaError()
-
-
-	/**
-	 * Extract range values
-	 *
-	 * @param	string				&$pRange	String based range representation
-	 * @param	PHPExcel_Worksheet	$pSheet		Worksheet
-	 * @param	boolean				$resetLog	Flag indicating whether calculation log should be reset or not
-	 * @return  mixed				Array of values in range if range contains more than one element. Otherwise, a single value is returned.
-	 * @throws	PHPExcel_Calculation_Exception
-	 */
-	public function extractCellRange(&$pRange = 'A1', PHPExcel_Worksheet $pSheet = NULL, $resetLog = TRUE) {
-		// Return value
-		$returnValue = array ();
-
-//		echo 'extractCellRange('.$pRange.')',PHP_EOL;
-		if ($pSheet !== NULL) {
-			$pSheetName = $pSheet->getTitle();
-//			echo 'Passed sheet name is '.$pSheetName.PHP_EOL;
-//			echo 'Range reference is '.$pRange.PHP_EOL;
-			if (strpos ($pRange, '!') !== false) {
-//				echo '$pRange reference includes sheet reference',PHP_EOL;
-				list($pSheetName,$pRange) = PHPExcel_Worksheet::extractSheetTitle($pRange, true);
-//				echo 'New sheet name is '.$pSheetName,PHP_EOL;
-//				echo 'Adjusted Range reference is '.$pRange,PHP_EOL;
-				$pSheet = $this->_workbook->getSheetByName($pSheetName);
-			}
-
-			// Extract range
-			$aReferences = PHPExcel_Cell::extractAllCellReferencesInRange($pRange);
-			$pRange = $pSheetName.'!'.$pRange;
-			if (!isset($aReferences[1])) {
-				//	Single cell in range
-				sscanf($aReferences[0],'%[A-Z]%d', $currentCol, $currentRow);
-				$cellValue = NULL;
-				if ($pSheet->cellExists($aReferences[0])) {
-					$returnValue[$currentRow][$currentCol] = $pSheet->getCell($aReferences[0])->getCalculatedValue($resetLog);
-				} else {
-					$returnValue[$currentRow][$currentCol] = NULL;
-				}
-			} else {
-				// Extract cell data for all cells in the range
-				foreach ($aReferences as $reference) {
-					// Extract range
-					sscanf($reference,'%[A-Z]%d', $currentCol, $currentRow);
-					$cellValue = NULL;
-					if ($pSheet->cellExists($reference)) {
-						$returnValue[$currentRow][$currentCol] = $pSheet->getCell($reference)->getCalculatedValue($resetLog);
-					} else {
-						$returnValue[$currentRow][$currentCol] = NULL;
-					}
-				}
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function extractCellRange()
-
-
-	/**
-	 * Extract range values
-	 *
-	 * @param	string				&$pRange	String based range representation
-	 * @param	PHPExcel_Worksheet	$pSheet		Worksheet
-	 * @return  mixed				Array of values in range if range contains more than one element. Otherwise, a single value is returned.
-	 * @param	boolean				$resetLog	Flag indicating whether calculation log should be reset or not
-	 * @throws	PHPExcel_Calculation_Exception
-	 */
-	public function extractNamedRange(&$pRange = 'A1', PHPExcel_Worksheet $pSheet = NULL, $resetLog = TRUE) {
-		// Return value
-		$returnValue = array ();
-
-//		echo 'extractNamedRange('.$pRange.')<br />';
-		if ($pSheet !== NULL) {
-			$pSheetName = $pSheet->getTitle();
-//			echo 'Current sheet name is '.$pSheetName.'<br />';
-//			echo 'Range reference is '.$pRange.'<br />';
-			if (strpos ($pRange, '!') !== false) {
-//				echo '$pRange reference includes sheet reference',PHP_EOL;
-				list($pSheetName,$pRange) = PHPExcel_Worksheet::extractSheetTitle($pRange, true);
-//				echo 'New sheet name is '.$pSheetName,PHP_EOL;
-//				echo 'Adjusted Range reference is '.$pRange,PHP_EOL;
-				$pSheet = $this->_workbook->getSheetByName($pSheetName);
-			}
-
-			// Named range?
-			$namedRange = PHPExcel_NamedRange::resolveRange($pRange, $pSheet);
-			if ($namedRange !== NULL) {
-				$pSheet = $namedRange->getWorksheet();
-//				echo 'Named Range '.$pRange.' (';
-				$pRange = $namedRange->getRange();
-				$splitRange = PHPExcel_Cell::splitRange($pRange);
-				//	Convert row and column references
-				if (ctype_alpha($splitRange[0][0])) {
-					$pRange = $splitRange[0][0] . '1:' . $splitRange[0][1] . $namedRange->getWorksheet()->getHighestRow();
-				} elseif(ctype_digit($splitRange[0][0])) {
-					$pRange = 'A' . $splitRange[0][0] . ':' . $namedRange->getWorksheet()->getHighestColumn() . $splitRange[0][1];
-				}
-//				echo $pRange.') is in sheet '.$namedRange->getWorksheet()->getTitle().'<br />';
-
-//				if ($pSheet->getTitle() != $namedRange->getWorksheet()->getTitle()) {
-//					if (!$namedRange->getLocalOnly()) {
-//						$pSheet = $namedRange->getWorksheet();
-//					} else {
-//						return $returnValue;
-//					}
-//				}
-			} else {
-				return PHPExcel_Calculation_Functions::REF();
-			}
-
-			// Extract range
-			$aReferences = PHPExcel_Cell::extractAllCellReferencesInRange($pRange);
-//			var_dump($aReferences);
-			if (!isset($aReferences[1])) {
-				//	Single cell (or single column or row) in range
-				list($currentCol,$currentRow) = PHPExcel_Cell::coordinateFromString($aReferences[0]);
-				$cellValue = NULL;
-				if ($pSheet->cellExists($aReferences[0])) {
-					$returnValue[$currentRow][$currentCol] = $pSheet->getCell($aReferences[0])->getCalculatedValue($resetLog);
-				} else {
-					$returnValue[$currentRow][$currentCol] = NULL;
-				}
-			} else {
-				// Extract cell data for all cells in the range
-				foreach ($aReferences as $reference) {
-					// Extract range
-					list($currentCol,$currentRow) = PHPExcel_Cell::coordinateFromString($reference);
-//					echo 'NAMED RANGE: $currentCol='.$currentCol.' $currentRow='.$currentRow.'<br />';
-					$cellValue = NULL;
-					if ($pSheet->cellExists($reference)) {
-						$returnValue[$currentRow][$currentCol] = $pSheet->getCell($reference)->getCalculatedValue($resetLog);
-					} else {
-						$returnValue[$currentRow][$currentCol] = NULL;
-					}
-				}
-			}
-//				print_r($returnValue);
-//			echo '<br />';
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function extractNamedRange()
-
-
-	/**
-	 * Is a specific function implemented?
-	 *
-	 * @param	string	$pFunction	Function Name
-	 * @return	boolean
-	 */
-	public function isImplemented($pFunction = '') {
-		$pFunction = strtoupper ($pFunction);
-		if (isset(self::$_PHPExcelFunctions[$pFunction])) {
-			return (self::$_PHPExcelFunctions[$pFunction]['functionCall'] != 'PHPExcel_Calculation_Functions::DUMMY');
-		} else {
-			return FALSE;
-		}
-	}	//	function isImplemented()
-
-
-	/**
-	 * Get a list of all implemented functions as an array of function objects
-	 *
-	 * @return	array of PHPExcel_Calculation_Function
-	 */
-	public function listFunctions() {
-		// Return value
-		$returnValue = array();
-		// Loop functions
-		foreach(self::$_PHPExcelFunctions as $functionName => $function) {
-			if ($function['functionCall'] != 'PHPExcel_Calculation_Functions::DUMMY') {
-				$returnValue[$functionName] = new PHPExcel_Calculation_Function($function['category'],
-																				$functionName,
-																				$function['functionCall']
-																			   );
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function listFunctions()
-
-
-	/**
-	 * Get a list of all Excel function names
-	 *
-	 * @return	array
-	 */
-	public function listAllFunctionNames() {
-		return array_keys(self::$_PHPExcelFunctions);
-	}	//	function listAllFunctionNames()
-
-	/**
-	 * Get a list of implemented Excel function names
-	 *
-	 * @return	array
-	 */
-	public function listFunctionNames() {
-		// Return value
-		$returnValue = array();
-		// Loop functions
-		foreach(self::$_PHPExcelFunctions as $functionName => $function) {
-			if ($function['functionCall'] != 'PHPExcel_Calculation_Functions::DUMMY') {
-				$returnValue[] = $functionName;
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function listFunctionNames()
-
-}	//	class PHPExcel_Calculation
-
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Database.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Database.php
deleted file mode 100644
index 908decfc471..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Database.php
+++ /dev/null
@@ -1,725 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/**
- * PHPExcel_Calculation_Database
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Database {
-
-
-	/**
-	 * __fieldExtract
-	 *
-	 * Extracts the column ID to use for the data field.
-	 *
-	 * @access	private
-	 * @param	mixed[]		$database		The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	mixed		$field			Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @return	string|NULL
-	 *
-	 */
-	private static function __fieldExtract($database,$field) {
-		$field = strtoupper(PHPExcel_Calculation_Functions::flattenSingleValue($field));
-		$fieldNames = array_map('strtoupper',array_shift($database));
-
-		if (is_numeric($field)) {
-			$keys = array_keys($fieldNames);
-			return $keys[$field-1];
-		}
-		$key = array_search($field,$fieldNames);
-		return ($key) ? $key : NULL;
-	}
-
-	/**
-	 * __filter
-	 *
-	 * Parses the selection criteria, extracts the database rows that match those criteria, and
-	 * returns that subset of rows.
-	 *
-	 * @access	private
-	 * @param	mixed[]		$database		The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	mixed[]		$criteria		The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	array of mixed
-	 *
-	 */
-	private static function __filter($database,$criteria) {
-		$fieldNames = array_shift($database);
-		$criteriaNames = array_shift($criteria);
-
-		//	Convert the criteria into a set of AND/OR conditions with [:placeholders]
-		$testConditions = $testValues = array();
-		$testConditionsCount = 0;
-		foreach($criteriaNames as $key => $criteriaName) {
-			$testCondition = array();
-			$testConditionCount = 0;
-			foreach($criteria as $row => $criterion) {
-				if ($criterion[$key] > '') {
-					$testCondition[] = '[:'.$criteriaName.']'.PHPExcel_Calculation_Functions::_ifCondition($criterion[$key]);
-					$testConditionCount++;
-				}
-			}
-			if ($testConditionCount > 1) {
-				$testConditions[] = 'OR('.implode(',',$testCondition).')';
-				$testConditionsCount++;
-			} elseif($testConditionCount == 1) {
-				$testConditions[] = $testCondition[0];
-				$testConditionsCount++;
-			}
-		}
-
-		if ($testConditionsCount > 1) {
-			$testConditionSet = 'AND('.implode(',',$testConditions).')';
-		} elseif($testConditionsCount == 1) {
-			$testConditionSet = $testConditions[0];
-		}
-
-		//	Loop through each row of the database
-		foreach($database as $dataRow => $dataValues) {
-			//	Substitute actual values from the database row for our [:placeholders]
-			$testConditionList = $testConditionSet;
-			foreach($criteriaNames as $key => $criteriaName) {
-				$k = array_search($criteriaName,$fieldNames);
-				if (isset($dataValues[$k])) {
-					$dataValue = $dataValues[$k];
-					$dataValue = (is_string($dataValue)) ? PHPExcel_Calculation::_wrapResult(strtoupper($dataValue)) : $dataValue;
-					$testConditionList = str_replace('[:'.$criteriaName.']',$dataValue,$testConditionList);
-				}
-			}
-			//	evaluate the criteria against the row data
-			$result = PHPExcel_Calculation::getInstance()->_calculateFormulaValue('='.$testConditionList);
-			//	If the row failed to meet the criteria, remove it from the database
-			if (!$result) {
-				unset($database[$dataRow]);
-			}
-		}
-
-		return $database;
-	}
-
-
-	/**
-	 * DAVERAGE
-	 *
-	 * Averages the values in a column of a list or database that match conditions you specify.
-	 *
-	 * Excel Function:
-	 *		DAVERAGE(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	float
-	 *
-	 */
-	public static function DAVERAGE($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_Statistical::AVERAGE($colData);
-	}	//	function DAVERAGE()
-
-
-	/**
-	 * DCOUNT
-	 *
-	 * Counts the cells that contain numbers in a column of a list or database that match conditions
-	 * that you specify.
-	 *
-	 * Excel Function:
-	 *		DCOUNT(database,[field],criteria)
-	 *
-	 * Excel Function:
-	 *		DAVERAGE(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	integer
-	 *
-	 * @TODO	The field argument is optional. If field is omitted, DCOUNT counts all records in the
-	 *			database that match the criteria.
-	 *
-	 */
-	public static function DCOUNT($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_Statistical::COUNT($colData);
-	}	//	function DCOUNT()
-
-
-	/**
-	 * DCOUNTA
-	 *
-	 * Counts the nonblank cells in a column of a list or database that match conditions that you specify.
-	 *
-	 * Excel Function:
-	 *		DCOUNTA(database,[field],criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	integer
-	 *
-	 * @TODO	The field argument is optional. If field is omitted, DCOUNTA counts all records in the
-	 *			database that match the criteria.
-	 *
-	 */
-	public static function DCOUNTA($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_Statistical::COUNTA($colData);
-	}	//	function DCOUNTA()
-
-
-	/**
-	 * DGET
-	 *
-	 * Extracts a single value from a column of a list or database that matches conditions that you
-	 * specify.
-	 *
-	 * Excel Function:
-	 *		DGET(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	mixed
-	 *
-	 */
-	public static function DGET($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		if (count($colData) > 1) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		return $colData[0];
-	}	//	function DGET()
-
-
-	/**
-	 * DMAX
-	 *
-	 * Returns the largest number in a column of a list or database that matches conditions you that
-	 * specify.
-	 *
-	 * Excel Function:
-	 *		DMAX(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	float
-	 *
-	 */
-	public static function DMAX($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_Statistical::MAX($colData);
-	}	//	function DMAX()
-
-
-	/**
-	 * DMIN
-	 *
-	 * Returns the smallest number in a column of a list or database that matches conditions you that
-	 * specify.
-	 *
-	 * Excel Function:
-	 *		DMIN(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	float
-	 *
-	 */
-	public static function DMIN($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_Statistical::MIN($colData);
-	}	//	function DMIN()
-
-
-	/**
-	 * DPRODUCT
-	 *
-	 * Multiplies the values in a column of a list or database that match conditions that you specify.
-	 *
-	 * Excel Function:
-	 *		DPRODUCT(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	float
-	 *
-	 */
-	public static function DPRODUCT($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_MathTrig::PRODUCT($colData);
-	}	//	function DPRODUCT()
-
-
-	/**
-	 * DSTDEV
-	 *
-	 * Estimates the standard deviation of a population based on a sample by using the numbers in a
-	 * column of a list or database that match conditions that you specify.
-	 *
-	 * Excel Function:
-	 *		DSTDEV(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	float
-	 *
-	 */
-	public static function DSTDEV($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_Statistical::STDEV($colData);
-	}	//	function DSTDEV()
-
-
-	/**
-	 * DSTDEVP
-	 *
-	 * Calculates the standard deviation of a population based on the entire population by using the
-	 * numbers in a column of a list or database that match conditions that you specify.
-	 *
-	 * Excel Function:
-	 *		DSTDEVP(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	float
-	 *
-	 */
-	public static function DSTDEVP($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_Statistical::STDEVP($colData);
-	}	//	function DSTDEVP()
-
-
-	/**
-	 * DSUM
-	 *
-	 * Adds the numbers in a column of a list or database that match conditions that you specify.
-	 *
-	 * Excel Function:
-	 *		DSUM(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	float
-	 *
-	 */
-	public static function DSUM($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_MathTrig::SUM($colData);
-	}	//	function DSUM()
-
-
-	/**
-	 * DVAR
-	 *
-	 * Estimates the variance of a population based on a sample by using the numbers in a column
-	 * of a list or database that match conditions that you specify.
-	 *
-	 * Excel Function:
-	 *		DVAR(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	float
-	 *
-	 */
-	public static function DVAR($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_Statistical::VARFunc($colData);
-	}	//	function DVAR()
-
-
-	/**
-	 * DVARP
-	 *
-	 * Calculates the variance of a population based on the entire population by using the numbers
-	 * in a column of a list or database that match conditions that you specify.
-	 *
-	 * Excel Function:
-	 *		DVARP(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	float
-	 *
-	 */
-	public static function DVARP($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_Statistical::VARP($colData);
-	}	//	function DVARP()
-
-
-}	//	class PHPExcel_Calculation_Database
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/DateTime.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/DateTime.php
deleted file mode 100644
index 56c14079ae4..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/DateTime.php
+++ /dev/null
@@ -1,1485 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/**
- * PHPExcel_Calculation_DateTime
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_DateTime {
-
-	/**
-	 * Identify if a year is a leap year or not
-	 *
-	 * @param	integer	$year	The year to test
-	 * @return	boolean			TRUE if the year is a leap year, otherwise FALSE
-	 */
-	public static function _isLeapYear($year) {
-		return ((($year % 4) == 0) && (($year % 100) != 0) || (($year % 400) == 0));
-	}	//	function _isLeapYear()
-
-
-	/**
-	 * Return the number of days between two dates based on a 360 day calendar
-	 *
-	 * @param	integer	$startDay		Day of month of the start date
-	 * @param	integer	$startMonth		Month of the start date
-	 * @param	integer	$startYear		Year of the start date
-	 * @param	integer	$endDay			Day of month of the start date
-	 * @param	integer	$endMonth		Month of the start date
-	 * @param	integer	$endYear		Year of the start date
-	 * @param	boolean $methodUS		Whether to use the US method or the European method of calculation
-	 * @return	integer	Number of days between the start date and the end date
-	 */
-	private static function _dateDiff360($startDay, $startMonth, $startYear, $endDay, $endMonth, $endYear, $methodUS) {
-		if ($startDay == 31) {
-			--$startDay;
-		} elseif ($methodUS && ($startMonth == 2 && ($startDay == 29 || ($startDay == 28 && !self::_isLeapYear($startYear))))) {
-			$startDay = 30;
-		}
-		if ($endDay == 31) {
-			if ($methodUS && $startDay != 30) {
-				$endDay = 1;
-				if ($endMonth == 12) {
-					++$endYear;
-					$endMonth = 1;
-				} else {
-					++$endMonth;
-				}
-			} else {
-				$endDay = 30;
-			}
-		}
-
-		return $endDay + $endMonth * 30 + $endYear * 360 - $startDay - $startMonth * 30 - $startYear * 360;
-	}	//	function _dateDiff360()
-
-
-	/**
-	 * _getDateValue
-	 *
-	 * @param	string	$dateValue
-	 * @return	mixed	Excel date/time serial value, or string if error
-	 */
-	public static function _getDateValue($dateValue) {
-		if (!is_numeric($dateValue)) {
-			if ((is_string($dateValue)) &&
-				(PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC)) {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-			if ((is_object($dateValue)) && ($dateValue instanceof DateTime)) {
-				$dateValue = PHPExcel_Shared_Date::PHPToExcel($dateValue);
-			} else {
-				$saveReturnDateType = PHPExcel_Calculation_Functions::getReturnDateType();
-				PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_EXCEL);
-				$dateValue = self::DATEVALUE($dateValue);
-				PHPExcel_Calculation_Functions::setReturnDateType($saveReturnDateType);
-			}
-		}
-		return $dateValue;
-	}	//	function _getDateValue()
-
-
-	/**
-	 * _getTimeValue
-	 *
-	 * @param	string	$timeValue
-	 * @return	mixed	Excel date/time serial value, or string if error
-	 */
-	private static function _getTimeValue($timeValue) {
-		$saveReturnDateType = PHPExcel_Calculation_Functions::getReturnDateType();
-		PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_EXCEL);
-		$timeValue = self::TIMEVALUE($timeValue);
-		PHPExcel_Calculation_Functions::setReturnDateType($saveReturnDateType);
-		return $timeValue;
-	}	//	function _getTimeValue()
-
-
-	private static function _adjustDateByMonths($dateValue = 0, $adjustmentMonths = 0) {
-		// Execute function
-		$PHPDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($dateValue);
-		$oMonth = (int) $PHPDateObject->format('m');
-		$oYear = (int) $PHPDateObject->format('Y');
-
-		$adjustmentMonthsString = (string) $adjustmentMonths;
-		if ($adjustmentMonths > 0) {
-			$adjustmentMonthsString = '+'.$adjustmentMonths;
-		}
-		if ($adjustmentMonths != 0) {
-			$PHPDateObject->modify($adjustmentMonthsString.' months');
-		}
-		$nMonth = (int) $PHPDateObject->format('m');
-		$nYear = (int) $PHPDateObject->format('Y');
-
-		$monthDiff = ($nMonth - $oMonth) + (($nYear - $oYear) * 12);
-		if ($monthDiff != $adjustmentMonths) {
-			$adjustDays = (int) $PHPDateObject->format('d');
-			$adjustDaysString = '-'.$adjustDays.' days';
-			$PHPDateObject->modify($adjustDaysString);
-		}
-		return $PHPDateObject;
-	}	//	function _adjustDateByMonths()
-
-
-	/**
-	 * DATETIMENOW
-	 *
-	 * Returns the current date and time.
-	 * The NOW function is useful when you need to display the current date and time on a worksheet or
-	 * calculate a value based on the current date and time, and have that value updated each time you
-	 * open the worksheet.
-	 *
-	 * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the date
-	 * and time format of your regional settings. PHPExcel does not change cell formatting in this way.
-	 *
-	 * Excel Function:
-	 *		NOW()
-	 *
-	 * @access	public
-	 * @category Date/Time Functions
-	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-	 *						depending on the value of the ReturnDateType flag
-	 */
-	public static function DATETIMENOW() {
-		$saveTimeZone = date_default_timezone_get();
-		date_default_timezone_set('UTC');
-		$retValue = False;
-		switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
-			case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL :
-					$retValue = (float) PHPExcel_Shared_Date::PHPToExcel(time());
-					break;
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC :
-					$retValue = (integer) time();
-					break;
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT :
-					$retValue = new DateTime();
-					break;
-		}
-		date_default_timezone_set($saveTimeZone);
-
-		return $retValue;
-	}	//	function DATETIMENOW()
-
-
-	/**
-	 * DATENOW
-	 *
-	 * Returns the current date.
-	 * The NOW function is useful when you need to display the current date and time on a worksheet or
-	 * calculate a value based on the current date and time, and have that value updated each time you
-	 * open the worksheet.
-	 *
-	 * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the date
-	 * and time format of your regional settings. PHPExcel does not change cell formatting in this way.
-	 *
-	 * Excel Function:
-	 *		TODAY()
-	 *
-	 * @access	public
-	 * @category Date/Time Functions
-	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-	 *						depending on the value of the ReturnDateType flag
-	 */
-	public static function DATENOW() {
-		$saveTimeZone = date_default_timezone_get();
-		date_default_timezone_set('UTC');
-		$retValue = False;
-		$excelDateTime = floor(PHPExcel_Shared_Date::PHPToExcel(time()));
-		switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
-			case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL :
-					$retValue = (float) $excelDateTime;
-					break;
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC :
-					$retValue = (integer) PHPExcel_Shared_Date::ExcelToPHP($excelDateTime);
-					break;
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT :
-					$retValue = PHPExcel_Shared_Date::ExcelToPHPObject($excelDateTime);
-					break;
-		}
-		date_default_timezone_set($saveTimeZone);
-
-		return $retValue;
-	}	//	function DATENOW()
-
-
-	/**
-	 * DATE
-	 *
-	 * The DATE function returns a value that represents a particular date.
-	 *
-	 * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the date
-	 * format of your regional settings. PHPExcel does not change cell formatting in this way.
-	 *
-	 * Excel Function:
-	 *		DATE(year,month,day)
-	 *
-	 * PHPExcel is a lot more forgiving than MS Excel when passing non numeric values to this function.
-	 * A Month name or abbreviation (English only at this point) such as 'January' or 'Jan' will still be accepted,
-	 *     as will a day value with a suffix (e.g. '21st' rather than simply 21); again only English language.
-	 *
-	 * @access	public
-	 * @category Date/Time Functions
-	 * @param	integer		$year	The value of the year argument can include one to four digits.
-	 *								Excel interprets the year argument according to the configured
-	 *								date system: 1900 or 1904.
-	 *								If year is between 0 (zero) and 1899 (inclusive), Excel adds that
-	 *								value to 1900 to calculate the year. For example, DATE(108,1,2)
-	 *								returns January 2, 2008 (1900+108).
-	 *								If year is between 1900 and 9999 (inclusive), Excel uses that
-	 *								value as the year. For example, DATE(2008,1,2) returns January 2,
-	 *								2008.
-	 *								If year is less than 0 or is 10000 or greater, Excel returns the
-	 *								#NUM! error value.
-	 * @param	integer		$month	A positive or negative integer representing the month of the year
-	 *								from 1 to 12 (January to December).
-	 *								If month is greater than 12, month adds that number of months to
-	 *								the first month in the year specified. For example, DATE(2008,14,2)
-	 *								returns the serial number representing February 2, 2009.
-	 *								If month is less than 1, month subtracts the magnitude of that
-	 *								number of months, plus 1, from the first month in the year
-	 *								specified. For example, DATE(2008,-3,2) returns the serial number
-	 *								representing September 2, 2007.
-	 * @param	integer		$day	A positive or negative integer representing the day of the month
-	 *								from 1 to 31.
-	 *								If day is greater than the number of days in the month specified,
-	 *								day adds that number of days to the first day in the month. For
-	 *								example, DATE(2008,1,35) returns the serial number representing
-	 *								February 4, 2008.
-	 *								If day is less than 1, day subtracts the magnitude that number of
-	 *								days, plus one, from the first day of the month specified. For
-	 *								example, DATE(2008,1,-15) returns the serial number representing
-	 *								December 16, 2007.
-	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-	 *						depending on the value of the ReturnDateType flag
-	 */
-	public static function DATE($year = 0, $month = 1, $day = 1) {
-		$year	= PHPExcel_Calculation_Functions::flattenSingleValue($year);
-		$month	= PHPExcel_Calculation_Functions::flattenSingleValue($month);
-		$day	= PHPExcel_Calculation_Functions::flattenSingleValue($day);
-
-		if (($month !== NULL) && (!is_numeric($month))) {
-            $month = PHPExcel_Shared_Date::monthStringToNumber($month);
-		}
-
-		if (($day !== NULL) && (!is_numeric($day))) {
-            $day = PHPExcel_Shared_Date::dayStringToNumber($day);
-		}
-
-		$year	= ($year !== NULL)	? PHPExcel_Shared_String::testStringAsNumeric($year) : 0;
-		$month	= ($month !== NULL)	? PHPExcel_Shared_String::testStringAsNumeric($month) : 0;
-		$day	= ($day !== NULL)	? PHPExcel_Shared_String::testStringAsNumeric($day) : 0;
-		if ((!is_numeric($year)) ||
-			(!is_numeric($month)) ||
-			(!is_numeric($day))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$year	= (integer) $year;
-		$month	= (integer) $month;
-		$day	= (integer) $day;
-
-		$baseYear = PHPExcel_Shared_Date::getExcelCalendar();
-		// Validate parameters
-		if ($year < ($baseYear-1900)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		if ((($baseYear-1900) != 0) && ($year < $baseYear) && ($year >= 1900)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		if (($year < $baseYear) && ($year >= ($baseYear-1900))) {
-			$year += 1900;
-		}
-
-		if ($month < 1) {
-			//	Handle year/month adjustment if month < 1
-			--$month;
-			$year += ceil($month / 12) - 1;
-			$month = 13 - abs($month % 12);
-		} elseif ($month > 12) {
-			//	Handle year/month adjustment if month > 12
-			$year += floor($month / 12);
-			$month = ($month % 12);
-		}
-
-		// Re-validate the year parameter after adjustments
-		if (($year < $baseYear) || ($year >= 10000)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		// Execute function
-		$excelDateValue = PHPExcel_Shared_Date::FormattedPHPToExcel($year, $month, $day);
-		switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
-			case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL :
-					return (float) $excelDateValue;
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC :
-					return (integer) PHPExcel_Shared_Date::ExcelToPHP($excelDateValue);
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT :
-					return PHPExcel_Shared_Date::ExcelToPHPObject($excelDateValue);
-		}
-	}	//	function DATE()
-
-
-	/**
-	 * TIME
-	 *
-	 * The TIME function returns a value that represents a particular time.
-	 *
-	 * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the time
-	 * format of your regional settings. PHPExcel does not change cell formatting in this way.
-	 *
-	 * Excel Function:
-	 *		TIME(hour,minute,second)
-	 *
-	 * @access	public
-	 * @category Date/Time Functions
-	 * @param	integer		$hour		A number from 0 (zero) to 32767 representing the hour.
-	 *									Any value greater than 23 will be divided by 24 and the remainder
-	 *									will be treated as the hour value. For example, TIME(27,0,0) =
-	 *									TIME(3,0,0) = .125 or 3:00 AM.
-	 * @param	integer		$minute		A number from 0 to 32767 representing the minute.
-	 *									Any value greater than 59 will be converted to hours and minutes.
-	 *									For example, TIME(0,750,0) = TIME(12,30,0) = .520833 or 12:30 PM.
-	 * @param	integer		$second		A number from 0 to 32767 representing the second.
-	 *									Any value greater than 59 will be converted to hours, minutes,
-	 *									and seconds. For example, TIME(0,0,2000) = TIME(0,33,22) = .023148
-	 *									or 12:33:20 AM
-	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-	 *						depending on the value of the ReturnDateType flag
-	 */
-	public static function TIME($hour = 0, $minute = 0, $second = 0) {
-		$hour	= PHPExcel_Calculation_Functions::flattenSingleValue($hour);
-		$minute	= PHPExcel_Calculation_Functions::flattenSingleValue($minute);
-		$second	= PHPExcel_Calculation_Functions::flattenSingleValue($second);
-
-		if ($hour == '') { $hour = 0; }
-		if ($minute == '') { $minute = 0; }
-		if ($second == '') { $second = 0; }
-
-		if ((!is_numeric($hour)) || (!is_numeric($minute)) || (!is_numeric($second))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$hour	= (integer) $hour;
-		$minute	= (integer) $minute;
-		$second	= (integer) $second;
-
-		if ($second < 0) {
-			$minute += floor($second / 60);
-			$second = 60 - abs($second % 60);
-			if ($second == 60) { $second = 0; }
-		} elseif ($second >= 60) {
-			$minute += floor($second / 60);
-			$second = $second % 60;
-		}
-		if ($minute < 0) {
-			$hour += floor($minute / 60);
-			$minute = 60 - abs($minute % 60);
-			if ($minute == 60) { $minute = 0; }
-		} elseif ($minute >= 60) {
-			$hour += floor($minute / 60);
-			$minute = $minute % 60;
-		}
-
-		if ($hour > 23) {
-			$hour = $hour % 24;
-		} elseif ($hour < 0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		// Execute function
-		switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
-			case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL :
-					$date = 0;
-					$calendar = PHPExcel_Shared_Date::getExcelCalendar();
-					if ($calendar != PHPExcel_Shared_Date::CALENDAR_WINDOWS_1900) {
-						$date = 1;
-					}
-					return (float) PHPExcel_Shared_Date::FormattedPHPToExcel($calendar, 1, $date, $hour, $minute, $second);
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC :
-					return (integer) PHPExcel_Shared_Date::ExcelToPHP(PHPExcel_Shared_Date::FormattedPHPToExcel(1970, 1, 1, $hour, $minute, $second));	// -2147468400; //	-2147472000 + 3600
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT :
-					$dayAdjust = 0;
-					if ($hour < 0) {
-						$dayAdjust = floor($hour / 24);
-						$hour = 24 - abs($hour % 24);
-						if ($hour == 24) { $hour = 0; }
-					} elseif ($hour >= 24) {
-						$dayAdjust = floor($hour / 24);
-						$hour = $hour % 24;
-					}
-					$phpDateObject = new DateTime('1900-01-01 '.$hour.':'.$minute.':'.$second);
-					if ($dayAdjust != 0) {
-						$phpDateObject->modify($dayAdjust.' days');
-					}
-					return $phpDateObject;
-		}
-	}	//	function TIME()
-
-
-	/**
-	 * DATEVALUE
-	 *
-	 * Returns a value that represents a particular date.
-	 * Use DATEVALUE to convert a date represented by a text string to an Excel or PHP date/time stamp
-	 * value.
-	 *
-	 * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the date
-	 * format of your regional settings. PHPExcel does not change cell formatting in this way.
-	 *
-	 * Excel Function:
-	 *		DATEVALUE(dateValue)
-	 *
-	 * @access	public
-	 * @category Date/Time Functions
-	 * @param	string	$dateValue		Text that represents a date in a Microsoft Excel date format.
-	 *									For example, "1/30/2008" or "30-Jan-2008" are text strings within
-	 *									quotation marks that represent dates. Using the default date
-	 *									system in Excel for Windows, date_text must represent a date from
-	 *									January 1, 1900, to December 31, 9999. Using the default date
-	 *									system in Excel for the Macintosh, date_text must represent a date
-	 *									from January 1, 1904, to December 31, 9999. DATEVALUE returns the
-	 *									#VALUE! error value if date_text is out of this range.
-	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-	 *						depending on the value of the ReturnDateType flag
-	 */
-	public static function DATEVALUE($dateValue = 1) {
-		$dateValue = trim(PHPExcel_Calculation_Functions::flattenSingleValue($dateValue),'"');
-		//	Strip any ordinals because they're allowed in Excel (English only)
-		$dateValue = preg_replace('/(\d)(st|nd|rd|th)([ -\/])/Ui','$1$3',$dateValue);
-		//	Convert separators (/ . or space) to hyphens (should also handle dot used for ordinals in some countries, e.g. Denmark, Germany)
-		$dateValue	= str_replace(array('/','.','-','  '),array(' ',' ',' ',' '),$dateValue);
-
-		$yearFound = false;
-		$t1 = explode(' ',$dateValue);
-		foreach($t1 as &$t) {
-			if ((is_numeric($t)) && ($t > 31)) {
-				if ($yearFound) {
-					return PHPExcel_Calculation_Functions::VALUE();
-				} else {
-					if ($t < 100) { $t += 1900; }
-					$yearFound = true;
-				}
-			}
-		}
-		if ((count($t1) == 1) && (strpos($t,':') != false)) {
-			//	We've been fed a time value without any date
-			return 0.0;
-		} elseif (count($t1) == 2) {
-			//	We only have two parts of the date: either day/month or month/year
-			if ($yearFound) {
-				array_unshift($t1,1);
-			} else {
-				array_push($t1,date('Y'));
-			}
-		}
-		unset($t);
-		$dateValue = implode(' ',$t1);
-
-		$PHPDateArray = date_parse($dateValue);
-		if (($PHPDateArray === False) || ($PHPDateArray['error_count'] > 0)) {
-			$testVal1 = strtok($dateValue,'- ');
-			if ($testVal1 !== False) {
-				$testVal2 = strtok('- ');
-				if ($testVal2 !== False) {
-					$testVal3 = strtok('- ');
-					if ($testVal3 === False) {
-						$testVal3 = strftime('%Y');
-					}
-				} else {
-					return PHPExcel_Calculation_Functions::VALUE();
-				}
-			} else {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-			$PHPDateArray = date_parse($testVal1.'-'.$testVal2.'-'.$testVal3);
-			if (($PHPDateArray === False) || ($PHPDateArray['error_count'] > 0)) {
-				$PHPDateArray = date_parse($testVal2.'-'.$testVal1.'-'.$testVal3);
-				if (($PHPDateArray === False) || ($PHPDateArray['error_count'] > 0)) {
-					return PHPExcel_Calculation_Functions::VALUE();
-				}
-			}
-		}
-
-		if (($PHPDateArray !== False) && ($PHPDateArray['error_count'] == 0)) {
-			// Execute function
-			if ($PHPDateArray['year'] == '')	{ $PHPDateArray['year'] = strftime('%Y'); }
-			if ($PHPDateArray['year'] < 1900)
-				return PHPExcel_Calculation_Functions::VALUE();
-			if ($PHPDateArray['month'] == '')	{ $PHPDateArray['month'] = strftime('%m'); }
-			if ($PHPDateArray['day'] == '')		{ $PHPDateArray['day'] = strftime('%d'); }
-			$excelDateValue = floor(PHPExcel_Shared_Date::FormattedPHPToExcel($PHPDateArray['year'],$PHPDateArray['month'],$PHPDateArray['day'],$PHPDateArray['hour'],$PHPDateArray['minute'],$PHPDateArray['second']));
-
-			switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
-				case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL :
-						return (float) $excelDateValue;
-				case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC :
-						return (integer) PHPExcel_Shared_Date::ExcelToPHP($excelDateValue);
-				case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT :
-						return new DateTime($PHPDateArray['year'].'-'.$PHPDateArray['month'].'-'.$PHPDateArray['day'].' 00:00:00');
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function DATEVALUE()
-
-
-	/**
-	 * TIMEVALUE
-	 *
-	 * Returns a value that represents a particular time.
-	 * Use TIMEVALUE to convert a time represented by a text string to an Excel or PHP date/time stamp
-	 * value.
-	 *
-	 * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the time
-	 * format of your regional settings. PHPExcel does not change cell formatting in this way.
-	 *
-	 * Excel Function:
-	 *		TIMEVALUE(timeValue)
-	 *
-	 * @access	public
-	 * @category Date/Time Functions
-	 * @param	string	$timeValue		A text string that represents a time in any one of the Microsoft
-	 *									Excel time formats; for example, "6:45 PM" and "18:45" text strings
-	 *									within quotation marks that represent time.
-	 *									Date information in time_text is ignored.
-	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-	 *						depending on the value of the ReturnDateType flag
-	 */
-	public static function TIMEVALUE($timeValue) {
-		$timeValue = trim(PHPExcel_Calculation_Functions::flattenSingleValue($timeValue),'"');
-		$timeValue	= str_replace(array('/','.'),array('-','-'),$timeValue);
-
-		$PHPDateArray = date_parse($timeValue);
-		if (($PHPDateArray !== False) && ($PHPDateArray['error_count'] == 0)) {
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
-				$excelDateValue = PHPExcel_Shared_Date::FormattedPHPToExcel($PHPDateArray['year'],$PHPDateArray['month'],$PHPDateArray['day'],$PHPDateArray['hour'],$PHPDateArray['minute'],$PHPDateArray['second']);
-			} else {
-				$excelDateValue = PHPExcel_Shared_Date::FormattedPHPToExcel(1900,1,1,$PHPDateArray['hour'],$PHPDateArray['minute'],$PHPDateArray['second']) - 1;
-			}
-
-			switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
-				case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL :
-						return (float) $excelDateValue;
-				case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC :
-						return (integer) $phpDateValue = PHPExcel_Shared_Date::ExcelToPHP($excelDateValue+25569) - 3600;;
-				case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT :
-						return new DateTime('1900-01-01 '.$PHPDateArray['hour'].':'.$PHPDateArray['minute'].':'.$PHPDateArray['second']);
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function TIMEVALUE()
-
-
-	/**
-	 * DATEDIF
-	 *
-	 * @param	mixed	$startDate		Excel date serial value, PHP date/time stamp, PHP DateTime object
-	 *									or a standard date string
-	 * @param	mixed	$endDate		Excel date serial value, PHP date/time stamp, PHP DateTime object
-	 *									or a standard date string
-	 * @param	string	$unit
-	 * @return	integer	Interval between the dates
-	 */
-	public static function DATEDIF($startDate = 0, $endDate = 0, $unit = 'D') {
-		$startDate	= PHPExcel_Calculation_Functions::flattenSingleValue($startDate);
-		$endDate	= PHPExcel_Calculation_Functions::flattenSingleValue($endDate);
-		$unit		= strtoupper(PHPExcel_Calculation_Functions::flattenSingleValue($unit));
-
-		if (is_string($startDate = self::_getDateValue($startDate))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		if (is_string($endDate = self::_getDateValue($endDate))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		// Validate parameters
-		if ($startDate >= $endDate) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		// Execute function
-		$difference = $endDate - $startDate;
-
-		$PHPStartDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($startDate);
-		$startDays = $PHPStartDateObject->format('j');
-		$startMonths = $PHPStartDateObject->format('n');
-		$startYears = $PHPStartDateObject->format('Y');
-
-		$PHPEndDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($endDate);
-		$endDays = $PHPEndDateObject->format('j');
-		$endMonths = $PHPEndDateObject->format('n');
-		$endYears = $PHPEndDateObject->format('Y');
-
-		$retVal = PHPExcel_Calculation_Functions::NaN();
-		switch ($unit) {
-			case 'D':
-				$retVal = intval($difference);
-				break;
-			case 'M':
-				$retVal = intval($endMonths - $startMonths) + (intval($endYears - $startYears) * 12);
-				//	We're only interested in full months
-				if ($endDays < $startDays) {
-					--$retVal;
-				}
-				break;
-			case 'Y':
-				$retVal = intval($endYears - $startYears);
-				//	We're only interested in full months
-				if ($endMonths < $startMonths) {
-					--$retVal;
-				} elseif (($endMonths == $startMonths) && ($endDays < $startDays)) {
-					--$retVal;
-				}
-				break;
-			case 'MD':
-				if ($endDays < $startDays) {
-					$retVal = $endDays;
-					$PHPEndDateObject->modify('-'.$endDays.' days');
-					$adjustDays = $PHPEndDateObject->format('j');
-					if ($adjustDays > $startDays) {
-						$retVal += ($adjustDays - $startDays);
-					}
-				} else {
-					$retVal = $endDays - $startDays;
-				}
-				break;
-			case 'YM':
-				$retVal = intval($endMonths - $startMonths);
-				if ($retVal < 0) $retVal = 12 + $retVal;
-				//	We're only interested in full months
-				if ($endDays < $startDays) {
-					--$retVal;
-				}
-				break;
-			case 'YD':
-				$retVal = intval($difference);
-				if ($endYears > $startYears) {
-					while ($endYears > $startYears) {
-						$PHPEndDateObject->modify('-1 year');
-						$endYears = $PHPEndDateObject->format('Y');
-					}
-					$retVal = $PHPEndDateObject->format('z') - $PHPStartDateObject->format('z');
-					if ($retVal < 0) { $retVal += 365; }
-				}
-				break;
-			default:
-				$retVal = PHPExcel_Calculation_Functions::NaN();
-		}
-		return $retVal;
-	}	//	function DATEDIF()
-
-
-	/**
-	 * DAYS360
-	 *
-	 * Returns the number of days between two dates based on a 360-day year (twelve 30-day months),
-	 * which is used in some accounting calculations. Use this function to help compute payments if
-	 * your accounting system is based on twelve 30-day months.
-	 *
-	 * Excel Function:
-	 *		DAYS360(startDate,endDate[,method])
-	 *
-	 * @access	public
-	 * @category Date/Time Functions
-	 * @param	mixed		$startDate		Excel date serial value (float), PHP date timestamp (integer),
-	 *										PHP DateTime object, or a standard date string
-	 * @param	mixed		$endDate		Excel date serial value (float), PHP date timestamp (integer),
-	 *										PHP DateTime object, or a standard date string
-	 * @param	boolean		$method			US or European Method
-	 *										FALSE or omitted: U.S. (NASD) method. If the starting date is
-	 *										the last day of a month, it becomes equal to the 30th of the
-	 *										same month. If the ending date is the last day of a month and
-	 *										the starting date is earlier than the 30th of a month, the
-	 *										ending date becomes equal to the 1st of the next month;
-	 *										otherwise the ending date becomes equal to the 30th of the
-	 *										same month.
-	 *										TRUE: European method. Starting dates and ending dates that
-	 *										occur on the 31st of a month become equal to the 30th of the
-	 *										same month.
-	 * @return	integer		Number of days between start date and end date
-	 */
-	public static function DAYS360($startDate = 0, $endDate = 0, $method = false) {
-		$startDate	= PHPExcel_Calculation_Functions::flattenSingleValue($startDate);
-		$endDate	= PHPExcel_Calculation_Functions::flattenSingleValue($endDate);
-
-		if (is_string($startDate = self::_getDateValue($startDate))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		if (is_string($endDate = self::_getDateValue($endDate))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (!is_bool($method)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		// Execute function
-		$PHPStartDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($startDate);
-		$startDay = $PHPStartDateObject->format('j');
-		$startMonth = $PHPStartDateObject->format('n');
-		$startYear = $PHPStartDateObject->format('Y');
-
-		$PHPEndDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($endDate);
-		$endDay = $PHPEndDateObject->format('j');
-		$endMonth = $PHPEndDateObject->format('n');
-		$endYear = $PHPEndDateObject->format('Y');
-
-		return self::_dateDiff360($startDay, $startMonth, $startYear, $endDay, $endMonth, $endYear, !$method);
-	}	//	function DAYS360()
-
-
-	/**
-	 * YEARFRAC
-	 *
-	 * Calculates the fraction of the year represented by the number of whole days between two dates
-	 * (the start_date and the end_date).
-	 * Use the YEARFRAC worksheet function to identify the proportion of a whole year's benefits or
-	 * obligations to assign to a specific term.
-	 *
-	 * Excel Function:
-	 *		YEARFRAC(startDate,endDate[,method])
-	 *
-	 * @access	public
-	 * @category Date/Time Functions
-	 * @param	mixed	$startDate		Excel date serial value (float), PHP date timestamp (integer),
-	 *									PHP DateTime object, or a standard date string
-	 * @param	mixed	$endDate		Excel date serial value (float), PHP date timestamp (integer),
-	 *									PHP DateTime object, or a standard date string
-	 * @param	integer	$method			Method used for the calculation
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float	fraction of the year
-	 */
-	public static function YEARFRAC($startDate = 0, $endDate = 0, $method = 0) {
-		$startDate	= PHPExcel_Calculation_Functions::flattenSingleValue($startDate);
-		$endDate	= PHPExcel_Calculation_Functions::flattenSingleValue($endDate);
-		$method		= PHPExcel_Calculation_Functions::flattenSingleValue($method);
-
-		if (is_string($startDate = self::_getDateValue($startDate))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		if (is_string($endDate = self::_getDateValue($endDate))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (((is_numeric($method)) && (!is_string($method))) || ($method == '')) {
-			switch($method) {
-				case 0	:
-					return self::DAYS360($startDate,$endDate) / 360;
-				case 1	:
-					$days = self::DATEDIF($startDate,$endDate);
-					$startYear = self::YEAR($startDate);
-					$endYear = self::YEAR($endDate);
-					$years = $endYear - $startYear + 1;
-					$leapDays = 0;
-					if ($years == 1) {
-						if (self::_isLeapYear($endYear)) {
-							$startMonth = self::MONTHOFYEAR($startDate);
-							$endMonth = self::MONTHOFYEAR($endDate);
-							$endDay = self::DAYOFMONTH($endDate);
-							if (($startMonth < 3) ||
-								(($endMonth * 100 + $endDay) >= (2 * 100 + 29))) {
-				     			$leapDays += 1;
-							}
-						}
-					} else {
-						for($year = $startYear; $year <= $endYear; ++$year) {
-							if ($year == $startYear) {
-								$startMonth = self::MONTHOFYEAR($startDate);
-								$startDay = self::DAYOFMONTH($startDate);
-								if ($startMonth < 3) {
-									$leapDays += (self::_isLeapYear($year)) ? 1 : 0;
-								}
-							} elseif($year == $endYear) {
-								$endMonth = self::MONTHOFYEAR($endDate);
-								$endDay = self::DAYOFMONTH($endDate);
-								if (($endMonth * 100 + $endDay) >= (2 * 100 + 29)) {
-									$leapDays += (self::_isLeapYear($year)) ? 1 : 0;
-								}
-							} else {
-								$leapDays += (self::_isLeapYear($year)) ? 1 : 0;
-							}
-						}
-						if ($years == 2) {
-							if (($leapDays == 0) && (self::_isLeapYear($startYear)) && ($days > 365)) {
-								$leapDays = 1;
-							} elseif ($days < 366) {
-								$years = 1;
-							}
-						}
-						$leapDays /= $years;
-					}
-					return $days / (365 + $leapDays);
-				case 2	:
-					return self::DATEDIF($startDate,$endDate) / 360;
-				case 3	:
-					return self::DATEDIF($startDate,$endDate) / 365;
-				case 4	:
-					return self::DAYS360($startDate,$endDate,True) / 360;
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function YEARFRAC()
-
-
-	/**
-	 * NETWORKDAYS
-	 *
-	 * Returns the number of whole working days between start_date and end_date. Working days
-	 * exclude weekends and any dates identified in holidays.
-	 * Use NETWORKDAYS to calculate employee benefits that accrue based on the number of days
-	 * worked during a specific term.
-	 *
-	 * Excel Function:
-	 *		NETWORKDAYS(startDate,endDate[,holidays[,holiday[,...]]])
-	 *
-	 * @access	public
-	 * @category Date/Time Functions
-	 * @param	mixed			$startDate		Excel date serial value (float), PHP date timestamp (integer),
-	 *											PHP DateTime object, or a standard date string
-	 * @param	mixed			$endDate		Excel date serial value (float), PHP date timestamp (integer),
-	 *											PHP DateTime object, or a standard date string
-	 * @param	mixed			$holidays,...	Optional series of Excel date serial value (float), PHP date
-	 *											timestamp (integer), PHP DateTime object, or a standard date
-	 *											strings that will be excluded from the working calendar, such
-	 *											as state and federal holidays and floating holidays.
-	 * @return	integer			Interval between the dates
-	 */
-	public static function NETWORKDAYS($startDate,$endDate) {
-		//	Retrieve the mandatory start and end date that are referenced in the function definition
-		$startDate	= PHPExcel_Calculation_Functions::flattenSingleValue($startDate);
-		$endDate	= PHPExcel_Calculation_Functions::flattenSingleValue($endDate);
-		//	Flush the mandatory start and end date that are referenced in the function definition, and get the optional days
-		$dateArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		array_shift($dateArgs);
-		array_shift($dateArgs);
-
-		//	Validate the start and end dates
-		if (is_string($startDate = $sDate = self::_getDateValue($startDate))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$startDate = (float) floor($startDate);
-		if (is_string($endDate = $eDate = self::_getDateValue($endDate))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$endDate = (float) floor($endDate);
-
-		if ($sDate > $eDate) {
-			$startDate = $eDate;
-			$endDate = $sDate;
-		}
-
-		// Execute function
-		$startDoW = 6 - self::DAYOFWEEK($startDate,2);
-		if ($startDoW < 0) { $startDoW = 0; }
-		$endDoW = self::DAYOFWEEK($endDate,2);
-		if ($endDoW >= 6) { $endDoW = 0; }
-
-		$wholeWeekDays = floor(($endDate - $startDate) / 7) * 5;
-		$partWeekDays = $endDoW + $startDoW;
-		if ($partWeekDays > 5) {
-			$partWeekDays -= 5;
-		}
-
-		//	Test any extra holiday parameters
-		$holidayCountedArray = array();
-		foreach ($dateArgs as $holidayDate) {
-			if (is_string($holidayDate = self::_getDateValue($holidayDate))) {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-			if (($holidayDate >= $startDate) && ($holidayDate <= $endDate)) {
-				if ((self::DAYOFWEEK($holidayDate,2) < 6) && (!in_array($holidayDate,$holidayCountedArray))) {
-					--$partWeekDays;
-					$holidayCountedArray[] = $holidayDate;
-				}
-			}
-		}
-
-		if ($sDate > $eDate) {
-			return 0 - ($wholeWeekDays + $partWeekDays);
-		}
-		return $wholeWeekDays + $partWeekDays;
-	}	//	function NETWORKDAYS()
-
-
-	/**
-	 * WORKDAY
-	 *
-	 * Returns the date that is the indicated number of working days before or after a date (the
-	 * starting date). Working days exclude weekends and any dates identified as holidays.
-	 * Use WORKDAY to exclude weekends or holidays when you calculate invoice due dates, expected
-	 * delivery times, or the number of days of work performed.
-	 *
-	 * Excel Function:
-	 *		WORKDAY(startDate,endDays[,holidays[,holiday[,...]]])
-	 *
-	 * @access	public
-	 * @category Date/Time Functions
-	 * @param	mixed		$startDate		Excel date serial value (float), PHP date timestamp (integer),
-	 *										PHP DateTime object, or a standard date string
-	 * @param	integer		$endDays		The number of nonweekend and nonholiday days before or after
-	 *										startDate. A positive value for days yields a future date; a
-	 *										negative value yields a past date.
-	 * @param	mixed		$holidays,...	Optional series of Excel date serial value (float), PHP date
-	 *										timestamp (integer), PHP DateTime object, or a standard date
-	 *										strings that will be excluded from the working calendar, such
-	 *										as state and federal holidays and floating holidays.
-	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-	 *						depending on the value of the ReturnDateType flag
-	 */
-	public static function WORKDAY($startDate,$endDays) {
-		//	Retrieve the mandatory start date and days that are referenced in the function definition
-		$startDate	= PHPExcel_Calculation_Functions::flattenSingleValue($startDate);
-		$endDays	= PHPExcel_Calculation_Functions::flattenSingleValue($endDays);
-		//	Flush the mandatory start date and days that are referenced in the function definition, and get the optional days
-		$dateArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		array_shift($dateArgs);
-		array_shift($dateArgs);
-
-		if ((is_string($startDate = self::_getDateValue($startDate))) || (!is_numeric($endDays))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$startDate = (float) floor($startDate);
-		$endDays = (int) floor($endDays);
-		//	If endDays is 0, we always return startDate
-		if ($endDays == 0) { return $startDate; }
-
-		$decrementing = ($endDays < 0) ? True : False;
-
-		//	Adjust the start date if it falls over a weekend
-
-		$startDoW = self::DAYOFWEEK($startDate,3);
-		if (self::DAYOFWEEK($startDate,3) >= 5) {
-			$startDate += ($decrementing) ? -$startDoW + 4: 7 - $startDoW;
-			($decrementing) ? $endDays++ : $endDays--;
-		}
-
-		//	Add endDays
-		$endDate = (float) $startDate + (intval($endDays / 5) * 7) + ($endDays % 5);
-
-		//	Adjust the calculated end date if it falls over a weekend
-		$endDoW = self::DAYOFWEEK($endDate,3);
-		if ($endDoW >= 5) {
-			$endDate += ($decrementing) ? -$endDoW + 4: 7 - $endDoW;
-		}
-
-		//	Test any extra holiday parameters
-		if (!empty($dateArgs)) {
-			$holidayCountedArray = $holidayDates = array();
-			foreach ($dateArgs as $holidayDate) {
-				if (($holidayDate !== NULL) && (trim($holidayDate) > '')) {
-					if (is_string($holidayDate = self::_getDateValue($holidayDate))) {
-						return PHPExcel_Calculation_Functions::VALUE();
-					}
-					if (self::DAYOFWEEK($holidayDate,3) < 5) {
-						$holidayDates[] = $holidayDate;
-					}
-				}
-			}
-			if ($decrementing) {
-				rsort($holidayDates, SORT_NUMERIC);
-			} else {
-				sort($holidayDates, SORT_NUMERIC);
-			}
-			foreach ($holidayDates as $holidayDate) {
-				if ($decrementing) {
-					if (($holidayDate <= $startDate) && ($holidayDate >= $endDate)) {
-						if (!in_array($holidayDate,$holidayCountedArray)) {
-							--$endDate;
-							$holidayCountedArray[] = $holidayDate;
-						}
-					}
-				} else {
-					if (($holidayDate >= $startDate) && ($holidayDate <= $endDate)) {
-						if (!in_array($holidayDate,$holidayCountedArray)) {
-							++$endDate;
-							$holidayCountedArray[] = $holidayDate;
-						}
-					}
-				}
-				//	Adjust the calculated end date if it falls over a weekend
-				$endDoW = self::DAYOFWEEK($endDate,3);
-				if ($endDoW >= 5) {
-					$endDate += ($decrementing) ? -$endDoW + 4: 7 - $endDoW;
-				}
-
-			}
-		}
-
-		switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
-			case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL :
-					return (float) $endDate;
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC :
-					return (integer) PHPExcel_Shared_Date::ExcelToPHP($endDate);
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT :
-					return PHPExcel_Shared_Date::ExcelToPHPObject($endDate);
-		}
-	}	//	function WORKDAY()
-
-
-	/**
-	 * DAYOFMONTH
-	 *
-	 * Returns the day of the month, for a specified date. The day is given as an integer
-	 * ranging from 1 to 31.
-	 *
-	 * Excel Function:
-	 *		DAY(dateValue)
-	 *
-	 * @param	mixed	$dateValue		Excel date serial value (float), PHP date timestamp (integer),
-	 *									PHP DateTime object, or a standard date string
-	 * @return	int		Day of the month
-	 */
-	public static function DAYOFMONTH($dateValue = 1) {
-		$dateValue	= PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
-
-		if ($dateValue === null) {
-            $dateValue = 1;
-		} elseif (is_string($dateValue = self::_getDateValue($dateValue))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		} elseif ($dateValue == 0.0) {
-			return 0;
-		} elseif ($dateValue < 0.0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		// Execute function
-		$PHPDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($dateValue);
-
-		return (int) $PHPDateObject->format('j');
-	}	//	function DAYOFMONTH()
-
-
-	/**
-	 * DAYOFWEEK
-	 *
-	 * Returns the day of the week for a specified date. The day is given as an integer
-	 * ranging from 0 to 7 (dependent on the requested style).
-	 *
-	 * Excel Function:
-	 *		WEEKDAY(dateValue[,style])
-	 *
-	 * @param	mixed	$dateValue		Excel date serial value (float), PHP date timestamp (integer),
-	 *									PHP DateTime object, or a standard date string
-	 * @param	int		$style			A number that determines the type of return value
-	 *										1 or omitted	Numbers 1 (Sunday) through 7 (Saturday).
-	 *										2				Numbers 1 (Monday) through 7 (Sunday).
-	 *										3				Numbers 0 (Monday) through 6 (Sunday).
-	 * @return	int		Day of the week value
-	 */
-	public static function DAYOFWEEK($dateValue = 1, $style = 1) {
-		$dateValue	= PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
-		$style		= PHPExcel_Calculation_Functions::flattenSingleValue($style);
-
-		if (!is_numeric($style)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		} elseif (($style < 1) || ($style > 3)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		$style = floor($style);
-
-		if ($dateValue === null) {
-            $dateValue = 1;
-		} elseif (is_string($dateValue = self::_getDateValue($dateValue))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		} elseif ($dateValue < 0.0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		// Execute function
-		$PHPDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($dateValue);
-		$DoW = $PHPDateObject->format('w');
-
-		$firstDay = 1;
-		switch ($style) {
-			case 1: ++$DoW;
-					break;
-			case 2: if ($DoW == 0) { $DoW = 7; }
-					break;
-			case 3: if ($DoW == 0) { $DoW = 7; }
-					$firstDay = 0;
-					--$DoW;
-					break;
-		}
-		if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_EXCEL) {
-			//	Test for Excel's 1900 leap year, and introduce the error as required
-			if (($PHPDateObject->format('Y') == 1900) && ($PHPDateObject->format('n') <= 2)) {
-				--$DoW;
-				if ($DoW < $firstDay) {
-					$DoW += 7;
-				}
-			}
-		}
-
-		return (int) $DoW;
-	}	//	function DAYOFWEEK()
-
-
-	/**
-	 * WEEKOFYEAR
-	 *
-	 * Returns the week of the year for a specified date.
-	 * The WEEKNUM function considers the week containing January 1 to be the first week of the year.
-	 * However, there is a European standard that defines the first week as the one with the majority
-	 * of days (four or more) falling in the new year. This means that for years in which there are
-	 * three days or less in the first week of January, the WEEKNUM function returns week numbers
-	 * that are incorrect according to the European standard.
-	 *
-	 * Excel Function:
-	 *		WEEKNUM(dateValue[,style])
-	 *
-	 * @param	mixed	$dateValue		Excel date serial value (float), PHP date timestamp (integer),
-	 *									PHP DateTime object, or a standard date string
-	 * @param	boolean	$method			Week begins on Sunday or Monday
-	 *										1 or omitted	Week begins on Sunday.
-	 *										2				Week begins on Monday.
-	 * @return	int		Week Number
-	 */
-	public static function WEEKOFYEAR($dateValue = 1, $method = 1) {
-		$dateValue	= PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
-		$method		= PHPExcel_Calculation_Functions::flattenSingleValue($method);
-
-		if (!is_numeric($method)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		} elseif (($method < 1) || ($method > 2)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		$method = floor($method);
-
-		if ($dateValue === null) {
-            $dateValue = 1;
-		} elseif (is_string($dateValue = self::_getDateValue($dateValue))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		} elseif ($dateValue < 0.0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		// Execute function
-		$PHPDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($dateValue);
-		$dayOfYear = $PHPDateObject->format('z');
-		$dow = $PHPDateObject->format('w');
-		$PHPDateObject->modify('-'.$dayOfYear.' days');
-		$dow = $PHPDateObject->format('w');
-		$daysInFirstWeek = 7 - (($dow + (2 - $method)) % 7);
-		$dayOfYear -= $daysInFirstWeek;
-		$weekOfYear = ceil($dayOfYear / 7) + 1;
-
-		return (int) $weekOfYear;
-	}	//	function WEEKOFYEAR()
-
-
-	/**
-	 * MONTHOFYEAR
-	 *
-	 * Returns the month of a date represented by a serial number.
-	 * The month is given as an integer, ranging from 1 (January) to 12 (December).
-	 *
-	 * Excel Function:
-	 *		MONTH(dateValue)
-	 *
-	 * @param	mixed	$dateValue		Excel date serial value (float), PHP date timestamp (integer),
-	 *									PHP DateTime object, or a standard date string
-	 * @return	int		Month of the year
-	 */
-	public static function MONTHOFYEAR($dateValue = 1) {
-		$dateValue	= PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
-
-		if ($dateValue === null) {
-            $dateValue = 1;
-		} elseif (is_string($dateValue = self::_getDateValue($dateValue))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		} elseif ($dateValue < 0.0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		// Execute function
-		$PHPDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($dateValue);
-
-		return (int) $PHPDateObject->format('n');
-	}	//	function MONTHOFYEAR()
-
-
-	/**
-	 * YEAR
-	 *
-	 * Returns the year corresponding to a date.
-	 * The year is returned as an integer in the range 1900-9999.
-	 *
-	 * Excel Function:
-	 *		YEAR(dateValue)
-	 *
-	 * @param	mixed	$dateValue		Excel date serial value (float), PHP date timestamp (integer),
-	 *									PHP DateTime object, or a standard date string
-	 * @return	int		Year
-	 */
-	public static function YEAR($dateValue = 1) {
-		$dateValue	= PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
-
-		if ($dateValue === null) {
-            $dateValue = 1;
-		} elseif (is_string($dateValue = self::_getDateValue($dateValue))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		} elseif ($dateValue < 0.0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		// Execute function
-		$PHPDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($dateValue);
-
-		return (int) $PHPDateObject->format('Y');
-	}	//	function YEAR()
-
-
-	/**
-	 * HOUROFDAY
-	 *
-	 * Returns the hour of a time value.
-	 * The hour is given as an integer, ranging from 0 (12:00 A.M.) to 23 (11:00 P.M.).
-	 *
-	 * Excel Function:
-	 *		HOUR(timeValue)
-	 *
-	 * @param	mixed	$timeValue		Excel date serial value (float), PHP date timestamp (integer),
-	 *									PHP DateTime object, or a standard time string
-	 * @return	int		Hour
-	 */
-	public static function HOUROFDAY($timeValue = 0) {
-		$timeValue	= PHPExcel_Calculation_Functions::flattenSingleValue($timeValue);
-
-		if (!is_numeric($timeValue)) {
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
-				$testVal = strtok($timeValue,'/-: ');
-				if (strlen($testVal) < strlen($timeValue)) {
-					return PHPExcel_Calculation_Functions::VALUE();
-				}
-			}
-			$timeValue = self::_getTimeValue($timeValue);
-			if (is_string($timeValue)) {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-		}
-		// Execute function
-		if ($timeValue >= 1) {
-			$timeValue = fmod($timeValue,1);
-		} elseif ($timeValue < 0.0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		$timeValue = PHPExcel_Shared_Date::ExcelToPHP($timeValue);
-
-		return (int) gmdate('G',$timeValue);
-	}	//	function HOUROFDAY()
-
-
-	/**
-	 * MINUTEOFHOUR
-	 *
-	 * Returns the minutes of a time value.
-	 * The minute is given as an integer, ranging from 0 to 59.
-	 *
-	 * Excel Function:
-	 *		MINUTE(timeValue)
-	 *
-	 * @param	mixed	$timeValue		Excel date serial value (float), PHP date timestamp (integer),
-	 *									PHP DateTime object, or a standard time string
-	 * @return	int		Minute
-	 */
-	public static function MINUTEOFHOUR($timeValue = 0) {
-		$timeValue = $timeTester	= PHPExcel_Calculation_Functions::flattenSingleValue($timeValue);
-
-		if (!is_numeric($timeValue)) {
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
-				$testVal = strtok($timeValue,'/-: ');
-				if (strlen($testVal) < strlen($timeValue)) {
-					return PHPExcel_Calculation_Functions::VALUE();
-				}
-			}
-			$timeValue = self::_getTimeValue($timeValue);
-			if (is_string($timeValue)) {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-		}
-		// Execute function
-		if ($timeValue >= 1) {
-			$timeValue = fmod($timeValue,1);
-		} elseif ($timeValue < 0.0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		$timeValue = PHPExcel_Shared_Date::ExcelToPHP($timeValue);
-
-		return (int) gmdate('i',$timeValue);
-	}	//	function MINUTEOFHOUR()
-
-
-	/**
-	 * SECONDOFMINUTE
-	 *
-	 * Returns the seconds of a time value.
-	 * The second is given as an integer in the range 0 (zero) to 59.
-	 *
-	 * Excel Function:
-	 *		SECOND(timeValue)
-	 *
-	 * @param	mixed	$timeValue		Excel date serial value (float), PHP date timestamp (integer),
-	 *									PHP DateTime object, or a standard time string
-	 * @return	int		Second
-	 */
-	public static function SECONDOFMINUTE($timeValue = 0) {
-		$timeValue	= PHPExcel_Calculation_Functions::flattenSingleValue($timeValue);
-
-		if (!is_numeric($timeValue)) {
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
-				$testVal = strtok($timeValue,'/-: ');
-				if (strlen($testVal) < strlen($timeValue)) {
-					return PHPExcel_Calculation_Functions::VALUE();
-				}
-			}
-			$timeValue = self::_getTimeValue($timeValue);
-			if (is_string($timeValue)) {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-		}
-		// Execute function
-		if ($timeValue >= 1) {
-			$timeValue = fmod($timeValue,1);
-		} elseif ($timeValue < 0.0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		$timeValue = PHPExcel_Shared_Date::ExcelToPHP($timeValue);
-
-		return (int) gmdate('s',$timeValue);
-	}	//	function SECONDOFMINUTE()
-
-
-	/**
-	 * EDATE
-	 *
-	 * Returns the serial number that represents the date that is the indicated number of months
-	 * before or after a specified date (the start_date).
-	 * Use EDATE to calculate maturity dates or due dates that fall on the same day of the month
-	 * as the date of issue.
-	 *
-	 * Excel Function:
-	 *		EDATE(dateValue,adjustmentMonths)
-	 *
-	 * @param	mixed	$dateValue			Excel date serial value (float), PHP date timestamp (integer),
-	 *										PHP DateTime object, or a standard date string
-	 * @param	int		$adjustmentMonths	The number of months before or after start_date.
-	 *										A positive value for months yields a future date;
-	 *										a negative value yields a past date.
-	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-	 *						depending on the value of the ReturnDateType flag
-	 */
-	public static function EDATE($dateValue = 1, $adjustmentMonths = 0) {
-		$dateValue			= PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
-		$adjustmentMonths	= PHPExcel_Calculation_Functions::flattenSingleValue($adjustmentMonths);
-
-		if (!is_numeric($adjustmentMonths)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$adjustmentMonths = floor($adjustmentMonths);
-
-		if (is_string($dateValue = self::_getDateValue($dateValue))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		// Execute function
-		$PHPDateObject = self::_adjustDateByMonths($dateValue,$adjustmentMonths);
-
-		switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
-			case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL :
-					return (float) PHPExcel_Shared_Date::PHPToExcel($PHPDateObject);
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC :
-					return (integer) PHPExcel_Shared_Date::ExcelToPHP(PHPExcel_Shared_Date::PHPToExcel($PHPDateObject));
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT :
-					return $PHPDateObject;
-		}
-	}	//	function EDATE()
-
-
-	/**
-	 * EOMONTH
-	 *
-	 * Returns the date value for the last day of the month that is the indicated number of months
-	 * before or after start_date.
-	 * Use EOMONTH to calculate maturity dates or due dates that fall on the last day of the month.
-	 *
-	 * Excel Function:
-	 *		EOMONTH(dateValue,adjustmentMonths)
-	 *
-	 * @param	mixed	$dateValue			Excel date serial value (float), PHP date timestamp (integer),
-	 *										PHP DateTime object, or a standard date string
-	 * @param	int		$adjustmentMonths	The number of months before or after start_date.
-	 *										A positive value for months yields a future date;
-	 *										a negative value yields a past date.
-	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-	 *						depending on the value of the ReturnDateType flag
-	 */
-	public static function EOMONTH($dateValue = 1, $adjustmentMonths = 0) {
-		$dateValue			= PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
-		$adjustmentMonths	= PHPExcel_Calculation_Functions::flattenSingleValue($adjustmentMonths);
-
-		if (!is_numeric($adjustmentMonths)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$adjustmentMonths = floor($adjustmentMonths);
-
-		if (is_string($dateValue = self::_getDateValue($dateValue))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		// Execute function
-		$PHPDateObject = self::_adjustDateByMonths($dateValue,$adjustmentMonths+1);
-		$adjustDays = (int) $PHPDateObject->format('d');
-		$adjustDaysString = '-'.$adjustDays.' days';
-		$PHPDateObject->modify($adjustDaysString);
-
-		switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
-			case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL :
-					return (float) PHPExcel_Shared_Date::PHPToExcel($PHPDateObject);
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC :
-					return (integer) PHPExcel_Shared_Date::ExcelToPHP(PHPExcel_Shared_Date::PHPToExcel($PHPDateObject));
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT :
-					return $PHPDateObject;
-		}
-	}	//	function EOMONTH()
-
-}	//	class PHPExcel_Calculation_DateTime
-
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Engineering.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Engineering.php
deleted file mode 100644
index b60163e5684..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Engineering.php
+++ /dev/null
@@ -1,2505 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/** EULER */
-define('EULER', 2.71828182845904523536);
-
-
-/**
- * PHPExcel_Calculation_Engineering
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Engineering {
-
-	/**
-	 * Details of the Units of measure that can be used in CONVERTUOM()
-	 *
-	 * @var mixed[]
-	 */
-	private static $_conversionUnits = array( 'g'		=> array(	'Group'	=> 'Mass',			'Unit Name'	=> 'Gram',						'AllowPrefix'	=> True		),
-											  'sg'		=> array(	'Group'	=> 'Mass',			'Unit Name'	=> 'Slug',						'AllowPrefix'	=> False	),
-											  'lbm'		=> array(	'Group'	=> 'Mass',			'Unit Name'	=> 'Pound mass (avoirdupois)',	'AllowPrefix'	=> False	),
-											  'u'		=> array(	'Group'	=> 'Mass',			'Unit Name'	=> 'U (atomic mass unit)',		'AllowPrefix'	=> True		),
-											  'ozm'		=> array(	'Group'	=> 'Mass',			'Unit Name'	=> 'Ounce mass (avoirdupois)',	'AllowPrefix'	=> False	),
-											  'm'		=> array(	'Group'	=> 'Distance',		'Unit Name'	=> 'Meter',						'AllowPrefix'	=> True		),
-											  'mi'		=> array(	'Group'	=> 'Distance',		'Unit Name'	=> 'Statute mile',				'AllowPrefix'	=> False	),
-											  'Nmi'		=> array(	'Group'	=> 'Distance',		'Unit Name'	=> 'Nautical mile',				'AllowPrefix'	=> False	),
-											  'in'		=> array(	'Group'	=> 'Distance',		'Unit Name'	=> 'Inch',						'AllowPrefix'	=> False	),
-											  'ft'		=> array(	'Group'	=> 'Distance',		'Unit Name'	=> 'Foot',						'AllowPrefix'	=> False	),
-											  'yd'		=> array(	'Group'	=> 'Distance',		'Unit Name'	=> 'Yard',						'AllowPrefix'	=> False	),
-											  'ang'		=> array(	'Group'	=> 'Distance',		'Unit Name'	=> 'Angstrom',					'AllowPrefix'	=> True		),
-											  'Pica'	=> array(	'Group'	=> 'Distance',		'Unit Name'	=> 'Pica (1/72 in)',			'AllowPrefix'	=> False	),
-											  'yr'		=> array(	'Group'	=> 'Time',			'Unit Name'	=> 'Year',						'AllowPrefix'	=> False	),
-											  'day'		=> array(	'Group'	=> 'Time',			'Unit Name'	=> 'Day',						'AllowPrefix'	=> False	),
-											  'hr'		=> array(	'Group'	=> 'Time',			'Unit Name'	=> 'Hour',						'AllowPrefix'	=> False	),
-											  'mn'		=> array(	'Group'	=> 'Time',			'Unit Name'	=> 'Minute',					'AllowPrefix'	=> False	),
-											  'sec'		=> array(	'Group'	=> 'Time',			'Unit Name'	=> 'Second',					'AllowPrefix'	=> True		),
-											  'Pa'		=> array(	'Group'	=> 'Pressure',		'Unit Name'	=> 'Pascal',					'AllowPrefix'	=> True		),
-											  'p'		=> array(	'Group'	=> 'Pressure',		'Unit Name'	=> 'Pascal',					'AllowPrefix'	=> True		),
-											  'atm'		=> array(	'Group'	=> 'Pressure',		'Unit Name'	=> 'Atmosphere',				'AllowPrefix'	=> True		),
-											  'at'		=> array(	'Group'	=> 'Pressure',		'Unit Name'	=> 'Atmosphere',				'AllowPrefix'	=> True		),
-											  'mmHg'	=> array(	'Group'	=> 'Pressure',		'Unit Name'	=> 'mm of Mercury',				'AllowPrefix'	=> True		),
-											  'N'		=> array(	'Group'	=> 'Force',			'Unit Name'	=> 'Newton',					'AllowPrefix'	=> True		),
-											  'dyn'		=> array(	'Group'	=> 'Force',			'Unit Name'	=> 'Dyne',						'AllowPrefix'	=> True		),
-											  'dy'		=> array(	'Group'	=> 'Force',			'Unit Name'	=> 'Dyne',						'AllowPrefix'	=> True		),
-											  'lbf'		=> array(	'Group'	=> 'Force',			'Unit Name'	=> 'Pound force',				'AllowPrefix'	=> False	),
-											  'J'		=> array(	'Group'	=> 'Energy',		'Unit Name'	=> 'Joule',						'AllowPrefix'	=> True		),
-											  'e'		=> array(	'Group'	=> 'Energy',		'Unit Name'	=> 'Erg',						'AllowPrefix'	=> True		),
-											  'c'		=> array(	'Group'	=> 'Energy',		'Unit Name'	=> 'Thermodynamic calorie',		'AllowPrefix'	=> True		),
-											  'cal'		=> array(	'Group'	=> 'Energy',		'Unit Name'	=> 'IT calorie',				'AllowPrefix'	=> True		),
-											  'eV'		=> array(	'Group'	=> 'Energy',		'Unit Name'	=> 'Electron volt',				'AllowPrefix'	=> True		),
-											  'ev'		=> array(	'Group'	=> 'Energy',		'Unit Name'	=> 'Electron volt',				'AllowPrefix'	=> True		),
-											  'HPh'		=> array(	'Group'	=> 'Energy',		'Unit Name'	=> 'Horsepower-hour',			'AllowPrefix'	=> False	),
-											  'hh'		=> array(	'Group'	=> 'Energy',		'Unit Name'	=> 'Horsepower-hour',			'AllowPrefix'	=> False	),
-											  'Wh'		=> array(	'Group'	=> 'Energy',		'Unit Name'	=> 'Watt-hour',					'AllowPrefix'	=> True		),
-											  'wh'		=> array(	'Group'	=> 'Energy',		'Unit Name'	=> 'Watt-hour',					'AllowPrefix'	=> True		),
-											  'flb'		=> array(	'Group'	=> 'Energy',		'Unit Name'	=> 'Foot-pound',				'AllowPrefix'	=> False	),
-											  'BTU'		=> array(	'Group'	=> 'Energy',		'Unit Name'	=> 'BTU',						'AllowPrefix'	=> False	),
-											  'btu'		=> array(	'Group'	=> 'Energy',		'Unit Name'	=> 'BTU',						'AllowPrefix'	=> False	),
-											  'HP'		=> array(	'Group'	=> 'Power',			'Unit Name'	=> 'Horsepower',				'AllowPrefix'	=> False	),
-											  'h'		=> array(	'Group'	=> 'Power',			'Unit Name'	=> 'Horsepower',				'AllowPrefix'	=> False	),
-											  'W'		=> array(	'Group'	=> 'Power',			'Unit Name'	=> 'Watt',						'AllowPrefix'	=> True		),
-											  'w'		=> array(	'Group'	=> 'Power',			'Unit Name'	=> 'Watt',						'AllowPrefix'	=> True		),
-											  'T'		=> array(	'Group'	=> 'Magnetism',		'Unit Name'	=> 'Tesla',						'AllowPrefix'	=> True		),
-											  'ga'		=> array(	'Group'	=> 'Magnetism',		'Unit Name'	=> 'Gauss',						'AllowPrefix'	=> True		),
-											  'C'		=> array(	'Group'	=> 'Temperature',	'Unit Name'	=> 'Celsius',					'AllowPrefix'	=> False	),
-											  'cel'		=> array(	'Group'	=> 'Temperature',	'Unit Name'	=> 'Celsius',					'AllowPrefix'	=> False	),
-											  'F'		=> array(	'Group'	=> 'Temperature',	'Unit Name'	=> 'Fahrenheit',				'AllowPrefix'	=> False	),
-											  'fah'		=> array(	'Group'	=> 'Temperature',	'Unit Name'	=> 'Fahrenheit',				'AllowPrefix'	=> False	),
-											  'K'		=> array(	'Group'	=> 'Temperature',	'Unit Name'	=> 'Kelvin',					'AllowPrefix'	=> False	),
-											  'kel'		=> array(	'Group'	=> 'Temperature',	'Unit Name'	=> 'Kelvin',					'AllowPrefix'	=> False	),
-											  'tsp'		=> array(	'Group'	=> 'Liquid',		'Unit Name'	=> 'Teaspoon',					'AllowPrefix'	=> False	),
-											  'tbs'		=> array(	'Group'	=> 'Liquid',		'Unit Name'	=> 'Tablespoon',				'AllowPrefix'	=> False	),
-											  'oz'		=> array(	'Group'	=> 'Liquid',		'Unit Name'	=> 'Fluid Ounce',				'AllowPrefix'	=> False	),
-											  'cup'		=> array(	'Group'	=> 'Liquid',		'Unit Name'	=> 'Cup',						'AllowPrefix'	=> False	),
-											  'pt'		=> array(	'Group'	=> 'Liquid',		'Unit Name'	=> 'U.S. Pint',					'AllowPrefix'	=> False	),
-											  'us_pt'	=> array(	'Group'	=> 'Liquid',		'Unit Name'	=> 'U.S. Pint',					'AllowPrefix'	=> False	),
-											  'uk_pt'	=> array(	'Group'	=> 'Liquid',		'Unit Name'	=> 'U.K. Pint',					'AllowPrefix'	=> False	),
-											  'qt'		=> array(	'Group'	=> 'Liquid',		'Unit Name'	=> 'Quart',						'AllowPrefix'	=> False	),
-											  'gal'		=> array(	'Group'	=> 'Liquid',		'Unit Name'	=> 'Gallon',					'AllowPrefix'	=> False	),
-											  'l'		=> array(	'Group'	=> 'Liquid',		'Unit Name'	=> 'Litre',						'AllowPrefix'	=> True		),
-											  'lt'		=> array(	'Group'	=> 'Liquid',		'Unit Name'	=> 'Litre',						'AllowPrefix'	=> True		)
-											);
-
-	/**
-	 * Details of the Multiplier prefixes that can be used with Units of Measure in CONVERTUOM()
-	 *
-	 * @var mixed[]
-	 */
-	private static $_conversionMultipliers = array(	'Y'	=> array(	'multiplier'	=> 1E24,	'name'	=> 'yotta'	),
-													'Z'	=> array(	'multiplier'	=> 1E21,	'name'	=> 'zetta'	),
-													'E'	=> array(	'multiplier'	=> 1E18,	'name'	=> 'exa'	),
-													'P'	=> array(	'multiplier'	=> 1E15,	'name'	=> 'peta'	),
-													'T'	=> array(	'multiplier'	=> 1E12,	'name'	=> 'tera'	),
-													'G'	=> array(	'multiplier'	=> 1E9,		'name'	=> 'giga'	),
-													'M'	=> array(	'multiplier'	=> 1E6,		'name'	=> 'mega'	),
-													'k'	=> array(	'multiplier'	=> 1E3,		'name'	=> 'kilo'	),
-													'h'	=> array(	'multiplier'	=> 1E2,		'name'	=> 'hecto'	),
-													'e'	=> array(	'multiplier'	=> 1E1,		'name'	=> 'deka'	),
-													'd'	=> array(	'multiplier'	=> 1E-1,	'name'	=> 'deci'	),
-													'c'	=> array(	'multiplier'	=> 1E-2,	'name'	=> 'centi'	),
-													'm'	=> array(	'multiplier'	=> 1E-3,	'name'	=> 'milli'	),
-													'u'	=> array(	'multiplier'	=> 1E-6,	'name'	=> 'micro'	),
-													'n'	=> array(	'multiplier'	=> 1E-9,	'name'	=> 'nano'	),
-													'p'	=> array(	'multiplier'	=> 1E-12,	'name'	=> 'pico'	),
-													'f'	=> array(	'multiplier'	=> 1E-15,	'name'	=> 'femto'	),
-													'a'	=> array(	'multiplier'	=> 1E-18,	'name'	=> 'atto'	),
-													'z'	=> array(	'multiplier'	=> 1E-21,	'name'	=> 'zepto'	),
-													'y'	=> array(	'multiplier'	=> 1E-24,	'name'	=> 'yocto'	)
-												 );
-
-	/**
-	 * Details of the Units of measure conversion factors, organised by group
-	 *
-	 * @var mixed[]
-	 */
-	private static $_unitConversions = array(	'Mass'		=> array(	'g'		=> array(	'g'		=> 1.0,
-																							'sg'	=> 6.85220500053478E-05,
-																							'lbm'	=> 2.20462291469134E-03,
-																							'u'		=> 6.02217000000000E+23,
-																							'ozm'	=> 3.52739718003627E-02
-																						),
-																		'sg'	=> array(	'g'		=> 1.45938424189287E+04,
-																							'sg'	=> 1.0,
-																							'lbm'	=> 3.21739194101647E+01,
-																							'u'		=> 8.78866000000000E+27,
-																							'ozm'	=> 5.14782785944229E+02
-																						),
-																		'lbm'	=> array(	'g'		=> 4.5359230974881148E+02,
-																							'sg'	=> 3.10810749306493E-02,
-																							'lbm'	=> 1.0,
-																							'u'		=> 2.73161000000000E+26,
-																							'ozm'	=> 1.60000023429410E+01
-																						),
-																		'u'		=> array(	'g'		=> 1.66053100460465E-24,
-																							'sg'	=> 1.13782988532950E-28,
-																							'lbm'	=> 3.66084470330684E-27,
-																							'u'		=> 1.0,
-																							'ozm'	=> 5.85735238300524E-26
-																						),
-																		'ozm'	=> array(	'g'		=> 2.83495152079732E+01,
-																							'sg'	=> 1.94256689870811E-03,
-																							'lbm'	=> 6.24999908478882E-02,
-																							'u'		=> 1.70725600000000E+25,
-																							'ozm'	=> 1.0
-																						)
-																	),
-												'Distance'	=> array(	'm'		=> array(	'm'		=> 1.0,
-																							'mi'	=> 6.21371192237334E-04,
-																							'Nmi'	=> 5.39956803455724E-04,
-																							'in'	=> 3.93700787401575E+01,
-																							'ft'	=> 3.28083989501312E+00,
-																							'yd'	=> 1.09361329797891E+00,
-																							'ang'	=> 1.00000000000000E+10,
-																							'Pica'	=> 2.83464566929116E+03
-																						),
-																		'mi'	=> array(	'm'		=> 1.60934400000000E+03,
-																							'mi'	=> 1.0,
-																							'Nmi'	=> 8.68976241900648E-01,
-																							'in'	=> 6.33600000000000E+04,
-																							'ft'	=> 5.28000000000000E+03,
-																							'yd'	=> 1.76000000000000E+03,
-																							'ang'	=> 1.60934400000000E+13,
-																							'Pica'	=> 4.56191999999971E+06
-																						),
-																		'Nmi'	=> array(	'm'		=> 1.85200000000000E+03,
-																							'mi'	=> 1.15077944802354E+00,
-																							'Nmi'	=> 1.0,
-																							'in'	=> 7.29133858267717E+04,
-																							'ft'	=> 6.07611548556430E+03,
-																							'yd'	=> 2.02537182785694E+03,
-																							'ang'	=> 1.85200000000000E+13,
-																							'Pica'	=> 5.24976377952723E+06
-																						),
-																		'in'	=> array(	'm'		=> 2.54000000000000E-02,
-																							'mi'	=> 1.57828282828283E-05,
-																							'Nmi'	=> 1.37149028077754E-05,
-																							'in'	=> 1.0,
-																							'ft'	=> 8.33333333333333E-02,
-																							'yd'	=> 2.77777777686643E-02,
-																							'ang'	=> 2.54000000000000E+08,
-																							'Pica'	=> 7.19999999999955E+01
-																						),
-																		'ft'	=> array(	'm'		=> 3.04800000000000E-01,
-																							'mi'	=> 1.89393939393939E-04,
-																							'Nmi'	=> 1.64578833693305E-04,
-																							'in'	=> 1.20000000000000E+01,
-																							'ft'	=> 1.0,
-																							'yd'	=> 3.33333333223972E-01,
-																							'ang'	=> 3.04800000000000E+09,
-																							'Pica'	=> 8.63999999999946E+02
-																						),
-																		'yd'	=> array(	'm'		=> 9.14400000300000E-01,
-																							'mi'	=> 5.68181818368230E-04,
-																							'Nmi'	=> 4.93736501241901E-04,
-																							'in'	=> 3.60000000118110E+01,
-																							'ft'	=> 3.00000000000000E+00,
-																							'yd'	=> 1.0,
-																							'ang'	=> 9.14400000300000E+09,
-																							'Pica'	=> 2.59200000085023E+03
-																						),
-																		'ang'	=> array(	'm'		=> 1.00000000000000E-10,
-																							'mi'	=> 6.21371192237334E-14,
-																							'Nmi'	=> 5.39956803455724E-14,
-																							'in'	=> 3.93700787401575E-09,
-																							'ft'	=> 3.28083989501312E-10,
-																							'yd'	=> 1.09361329797891E-10,
-																							'ang'	=> 1.0,
-																							'Pica'	=> 2.83464566929116E-07
-																						),
-																		'Pica'	=> array(	'm'		=> 3.52777777777800E-04,
-																							'mi'	=> 2.19205948372629E-07,
-																							'Nmi'	=> 1.90484761219114E-07,
-																							'in'	=> 1.38888888888898E-02,
-																							'ft'	=> 1.15740740740748E-03,
-																							'yd'	=> 3.85802469009251E-04,
-																							'ang'	=> 3.52777777777800E+06,
-																							'Pica'	=> 1.0
-																						)
-																	),
-												'Time'		=> array(	'yr'	=> array(	'yr'		=> 1.0,
-																							'day'		=> 365.25,
-																							'hr'		=> 8766.0,
-																							'mn'		=> 525960.0,
-																							'sec'		=> 31557600.0
-																						),
-																		'day'	=> array(	'yr'		=> 2.73785078713210E-03,
-																							'day'		=> 1.0,
-																							'hr'		=> 24.0,
-																							'mn'		=> 1440.0,
-																							'sec'		=> 86400.0
-																						),
-																		'hr'	=> array(	'yr'		=> 1.14077116130504E-04,
-																							'day'		=> 4.16666666666667E-02,
-																							'hr'		=> 1.0,
-																							'mn'		=> 60.0,
-																							'sec'		=> 3600.0
-																						),
-																		'mn'	=> array(	'yr'		=> 1.90128526884174E-06,
-																							'day'		=> 6.94444444444444E-04,
-																							'hr'		=> 1.66666666666667E-02,
-																							'mn'		=> 1.0,
-																							'sec'		=> 60.0
-																						),
-																		'sec'	=> array(	'yr'		=> 3.16880878140289E-08,
-																							'day'		=> 1.15740740740741E-05,
-																							'hr'		=> 2.77777777777778E-04,
-																							'mn'		=> 1.66666666666667E-02,
-																							'sec'		=> 1.0
-																						)
-																	),
-												'Pressure'	=> array(	'Pa'	=> array(	'Pa'		=> 1.0,
-																							'p'			=> 1.0,
-																							'atm'		=> 9.86923299998193E-06,
-																							'at'		=> 9.86923299998193E-06,
-																							'mmHg'		=> 7.50061707998627E-03
-																						),
-																		'p'		=> array(	'Pa'		=> 1.0,
-																							'p'			=> 1.0,
-																							'atm'		=> 9.86923299998193E-06,
-																							'at'		=> 9.86923299998193E-06,
-																							'mmHg'		=> 7.50061707998627E-03
-																						),
-																		'atm'	=> array(	'Pa'		=> 1.01324996583000E+05,
-																							'p'			=> 1.01324996583000E+05,
-																							'atm'		=> 1.0,
-																							'at'		=> 1.0,
-																							'mmHg'		=> 760.0
-																						),
-																		'at'	=> array(	'Pa'		=> 1.01324996583000E+05,
-																							'p'			=> 1.01324996583000E+05,
-																							'atm'		=> 1.0,
-																							'at'		=> 1.0,
-																							'mmHg'		=> 760.0
-																						),
-																		'mmHg'	=> array(	'Pa'		=> 1.33322363925000E+02,
-																							'p'			=> 1.33322363925000E+02,
-																							'atm'		=> 1.31578947368421E-03,
-																							'at'		=> 1.31578947368421E-03,
-																							'mmHg'		=> 1.0
-																						)
-																	),
-												'Force'		=> array(	'N'		=> array(	'N'			=> 1.0,
-																							'dyn'		=> 1.0E+5,
-																							'dy'		=> 1.0E+5,
-																							'lbf'		=> 2.24808923655339E-01
-																						),
-																		'dyn'	=> array(	'N'			=> 1.0E-5,
-																							'dyn'		=> 1.0,
-																							'dy'		=> 1.0,
-																							'lbf'		=> 2.24808923655339E-06
-																						),
-																		'dy'	=> array(	'N'			=> 1.0E-5,
-																							'dyn'		=> 1.0,
-																							'dy'		=> 1.0,
-																							'lbf'		=> 2.24808923655339E-06
-																						),
-																		'lbf'	=> array(	'N'			=> 4.448222,
-																							'dyn'		=> 4.448222E+5,
-																							'dy'		=> 4.448222E+5,
-																							'lbf'		=> 1.0
-																						)
-																	),
-												'Energy'	=> array(	'J'		=> array(	'J'			=> 1.0,
-																							'e'			=> 9.99999519343231E+06,
-																							'c'			=> 2.39006249473467E-01,
-																							'cal'		=> 2.38846190642017E-01,
-																							'eV'		=> 6.24145700000000E+18,
-																							'ev'		=> 6.24145700000000E+18,
-																							'HPh'		=> 3.72506430801000E-07,
-																							'hh'		=> 3.72506430801000E-07,
-																							'Wh'		=> 2.77777916238711E-04,
-																							'wh'		=> 2.77777916238711E-04,
-																							'flb'		=> 2.37304222192651E+01,
-																							'BTU'		=> 9.47815067349015E-04,
-																							'btu'		=> 9.47815067349015E-04
-																						),
-																		'e'		=> array(	'J'			=> 1.00000048065700E-07,
-																							'e'			=> 1.0,
-																							'c'			=> 2.39006364353494E-08,
-																							'cal'		=> 2.38846305445111E-08,
-																							'eV'		=> 6.24146000000000E+11,
-																							'ev'		=> 6.24146000000000E+11,
-																							'HPh'		=> 3.72506609848824E-14,
-																							'hh'		=> 3.72506609848824E-14,
-																							'Wh'		=> 2.77778049754611E-11,
-																							'wh'		=> 2.77778049754611E-11,
-																							'flb'		=> 2.37304336254586E-06,
-																							'BTU'		=> 9.47815522922962E-11,
-																							'btu'		=> 9.47815522922962E-11
-																						),
-																		'c'		=> array(	'J'			=> 4.18399101363672E+00,
-																							'e'			=> 4.18398900257312E+07,
-																							'c'			=> 1.0,
-																							'cal'		=> 9.99330315287563E-01,
-																							'eV'		=> 2.61142000000000E+19,
-																							'ev'		=> 2.61142000000000E+19,
-																							'HPh'		=> 1.55856355899327E-06,
-																							'hh'		=> 1.55856355899327E-06,
-																							'Wh'		=> 1.16222030532950E-03,
-																							'wh'		=> 1.16222030532950E-03,
-																							'flb'		=> 9.92878733152102E+01,
-																							'BTU'		=> 3.96564972437776E-03,
-																							'btu'		=> 3.96564972437776E-03
-																						),
-																		'cal'	=> array(	'J'			=> 4.18679484613929E+00,
-																							'e'			=> 4.18679283372801E+07,
-																							'c'			=> 1.00067013349059E+00,
-																							'cal'		=> 1.0,
-																							'eV'		=> 2.61317000000000E+19,
-																							'ev'		=> 2.61317000000000E+19,
-																							'HPh'		=> 1.55960800463137E-06,
-																							'hh'		=> 1.55960800463137E-06,
-																							'Wh'		=> 1.16299914807955E-03,
-																							'wh'		=> 1.16299914807955E-03,
-																							'flb'		=> 9.93544094443283E+01,
-																							'BTU'		=> 3.96830723907002E-03,
-																							'btu'		=> 3.96830723907002E-03
-																						),
-																		'eV'	=> array(	'J'			=> 1.60219000146921E-19,
-																							'e'			=> 1.60218923136574E-12,
-																							'c'			=> 3.82933423195043E-20,
-																							'cal'		=> 3.82676978535648E-20,
-																							'eV'		=> 1.0,
-																							'ev'		=> 1.0,
-																							'HPh'		=> 5.96826078912344E-26,
-																							'hh'		=> 5.96826078912344E-26,
-																							'Wh'		=> 4.45053000026614E-23,
-																							'wh'		=> 4.45053000026614E-23,
-																							'flb'		=> 3.80206452103492E-18,
-																							'BTU'		=> 1.51857982414846E-22,
-																							'btu'		=> 1.51857982414846E-22
-																						),
-																		'ev'	=> array(	'J'			=> 1.60219000146921E-19,
-																							'e'			=> 1.60218923136574E-12,
-																							'c'			=> 3.82933423195043E-20,
-																							'cal'		=> 3.82676978535648E-20,
-																							'eV'		=> 1.0,
-																							'ev'		=> 1.0,
-																							'HPh'		=> 5.96826078912344E-26,
-																							'hh'		=> 5.96826078912344E-26,
-																							'Wh'		=> 4.45053000026614E-23,
-																							'wh'		=> 4.45053000026614E-23,
-																							'flb'		=> 3.80206452103492E-18,
-																							'BTU'		=> 1.51857982414846E-22,
-																							'btu'		=> 1.51857982414846E-22
-																						),
-																		'HPh'	=> array(	'J'			=> 2.68451741316170E+06,
-																							'e'			=> 2.68451612283024E+13,
-																							'c'			=> 6.41616438565991E+05,
-																							'cal'		=> 6.41186757845835E+05,
-																							'eV'		=> 1.67553000000000E+25,
-																							'ev'		=> 1.67553000000000E+25,
-																							'HPh'		=> 1.0,
-																							'hh'		=> 1.0,
-																							'Wh'		=> 7.45699653134593E+02,
-																							'wh'		=> 7.45699653134593E+02,
-																							'flb'		=> 6.37047316692964E+07,
-																							'BTU'		=> 2.54442605275546E+03,
-																							'btu'		=> 2.54442605275546E+03
-																						),
-																		'hh'	=> array(	'J'			=> 2.68451741316170E+06,
-																							'e'			=> 2.68451612283024E+13,
-																							'c'			=> 6.41616438565991E+05,
-																							'cal'		=> 6.41186757845835E+05,
-																							'eV'		=> 1.67553000000000E+25,
-																							'ev'		=> 1.67553000000000E+25,
-																							'HPh'		=> 1.0,
-																							'hh'		=> 1.0,
-																							'Wh'		=> 7.45699653134593E+02,
-																							'wh'		=> 7.45699653134593E+02,
-																							'flb'		=> 6.37047316692964E+07,
-																							'BTU'		=> 2.54442605275546E+03,
-																							'btu'		=> 2.54442605275546E+03
-																						),
-																		'Wh'	=> array(	'J'			=> 3.59999820554720E+03,
-																							'e'			=> 3.59999647518369E+10,
-																							'c'			=> 8.60422069219046E+02,
-																							'cal'		=> 8.59845857713046E+02,
-																							'eV'		=> 2.24692340000000E+22,
-																							'ev'		=> 2.24692340000000E+22,
-																							'HPh'		=> 1.34102248243839E-03,
-																							'hh'		=> 1.34102248243839E-03,
-																							'Wh'		=> 1.0,
-																							'wh'		=> 1.0,
-																							'flb'		=> 8.54294774062316E+04,
-																							'BTU'		=> 3.41213254164705E+00,
-																							'btu'		=> 3.41213254164705E+00
-																						),
-																		'wh'	=> array(	'J'			=> 3.59999820554720E+03,
-																							'e'			=> 3.59999647518369E+10,
-																							'c'			=> 8.60422069219046E+02,
-																							'cal'		=> 8.59845857713046E+02,
-																							'eV'		=> 2.24692340000000E+22,
-																							'ev'		=> 2.24692340000000E+22,
-																							'HPh'		=> 1.34102248243839E-03,
-																							'hh'		=> 1.34102248243839E-03,
-																							'Wh'		=> 1.0,
-																							'wh'		=> 1.0,
-																							'flb'		=> 8.54294774062316E+04,
-																							'BTU'		=> 3.41213254164705E+00,
-																							'btu'		=> 3.41213254164705E+00
-																						),
-																		'flb'	=> array(	'J'			=> 4.21400003236424E-02,
-																							'e'			=> 4.21399800687660E+05,
-																							'c'			=> 1.00717234301644E-02,
-																							'cal'		=> 1.00649785509554E-02,
-																							'eV'		=> 2.63015000000000E+17,
-																							'ev'		=> 2.63015000000000E+17,
-																							'HPh'		=> 1.56974211145130E-08,
-																							'hh'		=> 1.56974211145130E-08,
-																							'Wh'		=> 1.17055614802000E-05,
-																							'wh'		=> 1.17055614802000E-05,
-																							'flb'		=> 1.0,
-																							'BTU'		=> 3.99409272448406E-05,
-																							'btu'		=> 3.99409272448406E-05
-																						),
-																		'BTU'	=> array(	'J'			=> 1.05505813786749E+03,
-																							'e'			=> 1.05505763074665E+10,
-																							'c'			=> 2.52165488508168E+02,
-																							'cal'		=> 2.51996617135510E+02,
-																							'eV'		=> 6.58510000000000E+21,
-																							'ev'		=> 6.58510000000000E+21,
-																							'HPh'		=> 3.93015941224568E-04,
-																							'hh'		=> 3.93015941224568E-04,
-																							'Wh'		=> 2.93071851047526E-01,
-																							'wh'		=> 2.93071851047526E-01,
-																							'flb'		=> 2.50369750774671E+04,
-																							'BTU'		=> 1.0,
-																							'btu'		=> 1.0,
-																						),
-																		'btu'	=> array(	'J'			=> 1.05505813786749E+03,
-																							'e'			=> 1.05505763074665E+10,
-																							'c'			=> 2.52165488508168E+02,
-																							'cal'		=> 2.51996617135510E+02,
-																							'eV'		=> 6.58510000000000E+21,
-																							'ev'		=> 6.58510000000000E+21,
-																							'HPh'		=> 3.93015941224568E-04,
-																							'hh'		=> 3.93015941224568E-04,
-																							'Wh'		=> 2.93071851047526E-01,
-																							'wh'		=> 2.93071851047526E-01,
-																							'flb'		=> 2.50369750774671E+04,
-																							'BTU'		=> 1.0,
-																							'btu'		=> 1.0,
-																						)
-																	),
-												'Power'		=> array(	'HP'	=> array(	'HP'		=> 1.0,
-																							'h'			=> 1.0,
-																							'W'			=> 7.45701000000000E+02,
-																							'w'			=> 7.45701000000000E+02
-																						),
-																		'h'		=> array(	'HP'		=> 1.0,
-																							'h'			=> 1.0,
-																							'W'			=> 7.45701000000000E+02,
-																							'w'			=> 7.45701000000000E+02
-																						),
-																		'W'		=> array(	'HP'		=> 1.34102006031908E-03,
-																							'h'			=> 1.34102006031908E-03,
-																							'W'			=> 1.0,
-																							'w'			=> 1.0
-																						),
-																		'w'		=> array(	'HP'		=> 1.34102006031908E-03,
-																							'h'			=> 1.34102006031908E-03,
-																							'W'			=> 1.0,
-																							'w'			=> 1.0
-																						)
-																	),
-												'Magnetism'	=> array(	'T'		=> array(	'T'			=> 1.0,
-																							'ga'		=> 10000.0
-																						),
-																		'ga'	=> array(	'T'			=> 0.0001,
-																							'ga'		=> 1.0
-																						)
-																	),
-												'Liquid'	=> array(	'tsp'	=> array(	'tsp'		=> 1.0,
-																							'tbs'		=> 3.33333333333333E-01,
-																							'oz'		=> 1.66666666666667E-01,
-																							'cup'		=> 2.08333333333333E-02,
-																							'pt'		=> 1.04166666666667E-02,
-																							'us_pt'		=> 1.04166666666667E-02,
-																							'uk_pt'		=> 8.67558516821960E-03,
-																							'qt'		=> 5.20833333333333E-03,
-																							'gal'		=> 1.30208333333333E-03,
-																							'l'			=> 4.92999408400710E-03,
-																							'lt'		=> 4.92999408400710E-03
-																						),
-																		'tbs'	=> array(	'tsp'		=> 3.00000000000000E+00,
-																							'tbs'		=> 1.0,
-																							'oz'		=> 5.00000000000000E-01,
-																							'cup'		=> 6.25000000000000E-02,
-																							'pt'		=> 3.12500000000000E-02,
-																							'us_pt'		=> 3.12500000000000E-02,
-																							'uk_pt'		=> 2.60267555046588E-02,
-																							'qt'		=> 1.56250000000000E-02,
-																							'gal'		=> 3.90625000000000E-03,
-																							'l'			=> 1.47899822520213E-02,
-																							'lt'		=> 1.47899822520213E-02
-																						),
-																		'oz'	=> array(	'tsp'		=> 6.00000000000000E+00,
-																							'tbs'		=> 2.00000000000000E+00,
-																							'oz'		=> 1.0,
-																							'cup'		=> 1.25000000000000E-01,
-																							'pt'		=> 6.25000000000000E-02,
-																							'us_pt'		=> 6.25000000000000E-02,
-																							'uk_pt'		=> 5.20535110093176E-02,
-																							'qt'		=> 3.12500000000000E-02,
-																							'gal'		=> 7.81250000000000E-03,
-																							'l'			=> 2.95799645040426E-02,
-																							'lt'		=> 2.95799645040426E-02
-																						),
-																		'cup'	=> array(	'tsp'		=> 4.80000000000000E+01,
-																							'tbs'		=> 1.60000000000000E+01,
-																							'oz'		=> 8.00000000000000E+00,
-																							'cup'		=> 1.0,
-																							'pt'		=> 5.00000000000000E-01,
-																							'us_pt'		=> 5.00000000000000E-01,
-																							'uk_pt'		=> 4.16428088074541E-01,
-																							'qt'		=> 2.50000000000000E-01,
-																							'gal'		=> 6.25000000000000E-02,
-																							'l'			=> 2.36639716032341E-01,
-																							'lt'		=> 2.36639716032341E-01
-																						),
-																		'pt'	=> array(	'tsp'		=> 9.60000000000000E+01,
-																							'tbs'		=> 3.20000000000000E+01,
-																							'oz'		=> 1.60000000000000E+01,
-																							'cup'		=> 2.00000000000000E+00,
-																							'pt'		=> 1.0,
-																							'us_pt'		=> 1.0,
-																							'uk_pt'		=> 8.32856176149081E-01,
-																							'qt'		=> 5.00000000000000E-01,
-																							'gal'		=> 1.25000000000000E-01,
-																							'l'			=> 4.73279432064682E-01,
-																							'lt'		=> 4.73279432064682E-01
-																						),
-																		'us_pt'	=> array(	'tsp'		=> 9.60000000000000E+01,
-																							'tbs'		=> 3.20000000000000E+01,
-																							'oz'		=> 1.60000000000000E+01,
-																							'cup'		=> 2.00000000000000E+00,
-																							'pt'		=> 1.0,
-																							'us_pt'		=> 1.0,
-																							'uk_pt'		=> 8.32856176149081E-01,
-																							'qt'		=> 5.00000000000000E-01,
-																							'gal'		=> 1.25000000000000E-01,
-																							'l'			=> 4.73279432064682E-01,
-																							'lt'		=> 4.73279432064682E-01
-																						),
-																		'uk_pt'	=> array(	'tsp'		=> 1.15266000000000E+02,
-																							'tbs'		=> 3.84220000000000E+01,
-																							'oz'		=> 1.92110000000000E+01,
-																							'cup'		=> 2.40137500000000E+00,
-																							'pt'		=> 1.20068750000000E+00,
-																							'us_pt'		=> 1.20068750000000E+00,
-																							'uk_pt'		=> 1.0,
-																							'qt'		=> 6.00343750000000E-01,
-																							'gal'		=> 1.50085937500000E-01,
-																							'l'			=> 5.68260698087162E-01,
-																							'lt'		=> 5.68260698087162E-01
-																						),
-																		'qt'	=> array(	'tsp'		=> 1.92000000000000E+02,
-																							'tbs'		=> 6.40000000000000E+01,
-																							'oz'		=> 3.20000000000000E+01,
-																							'cup'		=> 4.00000000000000E+00,
-																							'pt'		=> 2.00000000000000E+00,
-																							'us_pt'		=> 2.00000000000000E+00,
-																							'uk_pt'		=> 1.66571235229816E+00,
-																							'qt'		=> 1.0,
-																							'gal'		=> 2.50000000000000E-01,
-																							'l'			=> 9.46558864129363E-01,
-																							'lt'		=> 9.46558864129363E-01
-																						),
-																		'gal'	=> array(	'tsp'		=> 7.68000000000000E+02,
-																							'tbs'		=> 2.56000000000000E+02,
-																							'oz'		=> 1.28000000000000E+02,
-																							'cup'		=> 1.60000000000000E+01,
-																							'pt'		=> 8.00000000000000E+00,
-																							'us_pt'		=> 8.00000000000000E+00,
-																							'uk_pt'		=> 6.66284940919265E+00,
-																							'qt'		=> 4.00000000000000E+00,
-																							'gal'		=> 1.0,
-																							'l'			=> 3.78623545651745E+00,
-																							'lt'		=> 3.78623545651745E+00
-																						),
-																		'l'		=> array(	'tsp'		=> 2.02840000000000E+02,
-																							'tbs'		=> 6.76133333333333E+01,
-																							'oz'		=> 3.38066666666667E+01,
-																							'cup'		=> 4.22583333333333E+00,
-																							'pt'		=> 2.11291666666667E+00,
-																							'us_pt'		=> 2.11291666666667E+00,
-																							'uk_pt'		=> 1.75975569552166E+00,
-																							'qt'		=> 1.05645833333333E+00,
-																							'gal'		=> 2.64114583333333E-01,
-																							'l'			=> 1.0,
-																							'lt'		=> 1.0
-																						),
-																		'lt'	=> array(	'tsp'		=> 2.02840000000000E+02,
-																							'tbs'		=> 6.76133333333333E+01,
-																							'oz'		=> 3.38066666666667E+01,
-																							'cup'		=> 4.22583333333333E+00,
-																							'pt'		=> 2.11291666666667E+00,
-																							'us_pt'		=> 2.11291666666667E+00,
-																							'uk_pt'		=> 1.75975569552166E+00,
-																							'qt'		=> 1.05645833333333E+00,
-																							'gal'		=> 2.64114583333333E-01,
-																							'l'			=> 1.0,
-																							'lt'		=> 1.0
-																						)
-																	)
-											);
-
-
-	/**
-	 * _parseComplex
-	 *
-	 * Parses a complex number into its real and imaginary parts, and an I or J suffix
-	 *
-	 * @param	string		$complexNumber	The complex number
-	 * @return	string[]	Indexed on "real", "imaginary" and "suffix"
-	 */
-	public static function _parseComplex($complexNumber) {
-		$workString = (string) $complexNumber;
-
-		$realNumber = $imaginary = 0;
-		//	Extract the suffix, if there is one
-		$suffix = substr($workString,-1);
-		if (!is_numeric($suffix)) {
-			$workString = substr($workString,0,-1);
-		} else {
-			$suffix = '';
-		}
-
-		//	Split the input into its Real and Imaginary components
-		$leadingSign = 0;
-		if (strlen($workString) > 0) {
-			$leadingSign = (($workString{0} == '+') || ($workString{0} == '-')) ? 1 : 0;
-		}
-		$power = '';
-		$realNumber = strtok($workString, '+-');
-		if (strtoupper(substr($realNumber,-1)) == 'E') {
-			$power = strtok('+-');
-			++$leadingSign;
-		}
-
-		$realNumber = substr($workString,0,strlen($realNumber)+strlen($power)+$leadingSign);
-
-		if ($suffix != '') {
-			$imaginary = substr($workString,strlen($realNumber));
-
-			if (($imaginary == '') && (($realNumber == '') || ($realNumber == '+') || ($realNumber == '-'))) {
-				$imaginary = $realNumber.'1';
-				$realNumber = '0';
-			} else if ($imaginary == '') {
-				$imaginary = $realNumber;
-				$realNumber = '0';
-			} elseif (($imaginary == '+') || ($imaginary == '-')) {
-				$imaginary .= '1';
-			}
-		}
-
-		return array( 'real'		=> $realNumber,
-					  'imaginary'	=> $imaginary,
-					  'suffix'		=> $suffix
-					);
-	}	//	function _parseComplex()
-
-
-	/**
-	 * Cleans the leading characters in a complex number string
-	 *
-	 * @param	string		$complexNumber	The complex number to clean
-	 * @return	string		The "cleaned" complex number
-	 */
-	private static function _cleanComplex($complexNumber) {
-		if ($complexNumber{0} == '+') $complexNumber = substr($complexNumber,1);
-		if ($complexNumber{0} == '0') $complexNumber = substr($complexNumber,1);
-		if ($complexNumber{0} == '.') $complexNumber = '0'.$complexNumber;
-		if ($complexNumber{0} == '+') $complexNumber = substr($complexNumber,1);
-		return $complexNumber;
-	}
-
-	/**
-	 * Formats a number base string value with leading zeroes
-	 *
-	 * @param	string		$xVal		The "number" to pad
-	 * @param	integer		$places		The length that we want to pad this value
-	 * @return	string		The padded "number"
-	 */
-	private static function _nbrConversionFormat($xVal, $places) {
-		if (!is_null($places)) {
-			if (strlen($xVal) <= $places) {
-				return substr(str_pad($xVal, $places, '0', STR_PAD_LEFT), -10);
-			} else {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-		}
-
-		return substr($xVal, -10);
-	}	//	function _nbrConversionFormat()
-
-	/**
-	 *	BESSELI
-	 *
-	 *	Returns the modified Bessel function In(x), which is equivalent to the Bessel function evaluated
-	 *		for purely imaginary arguments
-	 *
-	 *	Excel Function:
-	 *		BESSELI(x,ord)
-	 *
-	 *	@access	public
-	 *	@category Engineering Functions
-	 *	@param	float		$x		The value at which to evaluate the function.
-	 *								If x is nonnumeric, BESSELI returns the #VALUE! error value.
-	 *	@param	integer		$ord	The order of the Bessel function.
-	 *								If ord is not an integer, it is truncated.
-	 *								If $ord is nonnumeric, BESSELI returns the #VALUE! error value.
-	 *								If $ord < 0, BESSELI returns the #NUM! error value.
-	 *	@return	float
-	 *
-	 */
-	public static function BESSELI($x, $ord) {
-		$x	= (is_null($x))	? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$ord	= (is_null($ord))	? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($ord);
-
-		if ((is_numeric($x)) && (is_numeric($ord))) {
-			$ord	= floor($ord);
-			if ($ord < 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-
-			if (abs($x) <= 30) {
-				$fResult = $fTerm = pow($x / 2, $ord) / PHPExcel_Calculation_MathTrig::FACT($ord);
-				$ordK = 1;
-				$fSqrX = ($x * $x) / 4;
-				do {
-					$fTerm *= $fSqrX;
-					$fTerm /= ($ordK * ($ordK + $ord));
-					$fResult += $fTerm;
-				} while ((abs($fTerm) > 1e-12) && (++$ordK < 100));
-			} else {
-				$f_2_PI = 2 * M_PI;
-
-				$fXAbs = abs($x);
-				$fResult = exp($fXAbs) / sqrt($f_2_PI * $fXAbs);
-				if (($ord & 1) && ($x < 0)) {
-					$fResult = -$fResult;
-				}
-			}
-			return (is_nan($fResult)) ? PHPExcel_Calculation_Functions::NaN() : $fResult;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function BESSELI()
-
-
-	/**
-	 *	BESSELJ
-	 *
-	 *	Returns the Bessel function
-	 *
-	 *	Excel Function:
-	 *		BESSELJ(x,ord)
-	 *
-	 *	@access	public
-	 *	@category Engineering Functions
-	 *	@param	float		$x		The value at which to evaluate the function.
-	 *								If x is nonnumeric, BESSELJ returns the #VALUE! error value.
-	 *	@param	integer		$ord	The order of the Bessel function. If n is not an integer, it is truncated.
-	 *								If $ord is nonnumeric, BESSELJ returns the #VALUE! error value.
-	 *								If $ord < 0, BESSELJ returns the #NUM! error value.
-	 *	@return	float
-	 *
-	 */
-	public static function BESSELJ($x, $ord) {
-		$x	= (is_null($x))	? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$ord	= (is_null($ord))	? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($ord);
-
-		if ((is_numeric($x)) && (is_numeric($ord))) {
-			$ord	= floor($ord);
-			if ($ord < 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-
-			$fResult = 0;
-			if (abs($x) <= 30) {
-				$fResult = $fTerm = pow($x / 2, $ord) / PHPExcel_Calculation_MathTrig::FACT($ord);
-				$ordK = 1;
-				$fSqrX = ($x * $x) / -4;
-				do {
-					$fTerm *= $fSqrX;
-					$fTerm /= ($ordK * ($ordK + $ord));
-					$fResult += $fTerm;
-				} while ((abs($fTerm) > 1e-12) && (++$ordK < 100));
-			} else {
-				$f_PI_DIV_2 = M_PI / 2;
-				$f_PI_DIV_4 = M_PI / 4;
-
-				$fXAbs = abs($x);
-				$fResult = sqrt(M_2DIVPI / $fXAbs) * cos($fXAbs - $ord * $f_PI_DIV_2 - $f_PI_DIV_4);
-				if (($ord & 1) && ($x < 0)) {
-					$fResult = -$fResult;
-				}
-			}
-			return (is_nan($fResult)) ? PHPExcel_Calculation_Functions::NaN() : $fResult;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function BESSELJ()
-
-
-	private static function _Besselk0($fNum) {
-		if ($fNum <= 2) {
-			$fNum2 = $fNum * 0.5;
-			$y = ($fNum2 * $fNum2);
-			$fRet = -log($fNum2) * self::BESSELI($fNum, 0) +
-					(-0.57721566 + $y * (0.42278420 + $y * (0.23069756 + $y * (0.3488590e-1 + $y * (0.262698e-2 + $y *
-					(0.10750e-3 + $y * 0.74e-5))))));
-		} else {
-			$y = 2 / $fNum;
-			$fRet = exp(-$fNum) / sqrt($fNum) *
-					(1.25331414 + $y * (-0.7832358e-1 + $y * (0.2189568e-1 + $y * (-0.1062446e-1 + $y *
-					(0.587872e-2 + $y * (-0.251540e-2 + $y * 0.53208e-3))))));
-		}
-		return $fRet;
-	}	//	function _Besselk0()
-
-
-	private static function _Besselk1($fNum) {
-		if ($fNum <= 2) {
-			$fNum2 = $fNum * 0.5;
-			$y = ($fNum2 * $fNum2);
-			$fRet = log($fNum2) * self::BESSELI($fNum, 1) +
-					(1 + $y * (0.15443144 + $y * (-0.67278579 + $y * (-0.18156897 + $y * (-0.1919402e-1 + $y *
-					(-0.110404e-2 + $y * (-0.4686e-4))))))) / $fNum;
-		} else {
-			$y = 2 / $fNum;
-			$fRet = exp(-$fNum) / sqrt($fNum) *
-					(1.25331414 + $y * (0.23498619 + $y * (-0.3655620e-1 + $y * (0.1504268e-1 + $y * (-0.780353e-2 + $y *
-					(0.325614e-2 + $y * (-0.68245e-3)))))));
-		}
-		return $fRet;
-	}	//	function _Besselk1()
-
-
-	/**
-	 *	BESSELK
-	 *
-	 *	Returns the modified Bessel function Kn(x), which is equivalent to the Bessel functions evaluated
-	 *		for purely imaginary arguments.
-	 *
-	 *	Excel Function:
-	 *		BESSELK(x,ord)
-	 *
-	 *	@access	public
-	 *	@category Engineering Functions
-	 *	@param	float		$x		The value at which to evaluate the function.
-	 *								If x is nonnumeric, BESSELK returns the #VALUE! error value.
-	 *	@param	integer		$ord	The order of the Bessel function. If n is not an integer, it is truncated.
-	 *								If $ord is nonnumeric, BESSELK returns the #VALUE! error value.
-	 *								If $ord < 0, BESSELK returns the #NUM! error value.
-	 *	@return	float
-	 *
-	 */
-	public static function BESSELK($x, $ord) {
-		$x		= (is_null($x))		? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$ord	= (is_null($ord))	? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($ord);
-
-		if ((is_numeric($x)) && (is_numeric($ord))) {
-			if (($ord < 0) || ($x == 0.0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-
-			switch(floor($ord)) {
-				case 0 :	return self::_Besselk0($x);
-							break;
-				case 1 :	return self::_Besselk1($x);
-							break;
-				default :	$fTox	= 2 / $x;
-							$fBkm	= self::_Besselk0($x);
-							$fBk	= self::_Besselk1($x);
-							for ($n = 1; $n < $ord; ++$n) {
-								$fBkp	= $fBkm + $n * $fTox * $fBk;
-								$fBkm	= $fBk;
-								$fBk	= $fBkp;
-							}
-			}
-			return (is_nan($fBk)) ? PHPExcel_Calculation_Functions::NaN() : $fBk;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function BESSELK()
-
-
-	private static function _Bessely0($fNum) {
-		if ($fNum < 8.0) {
-			$y = ($fNum * $fNum);
-			$f1 = -2957821389.0 + $y * (7062834065.0 + $y * (-512359803.6 + $y * (10879881.29 + $y * (-86327.92757 + $y * 228.4622733))));
-			$f2 = 40076544269.0 + $y * (745249964.8 + $y * (7189466.438 + $y * (47447.26470 + $y * (226.1030244 + $y))));
-			$fRet = $f1 / $f2 + 0.636619772 * self::BESSELJ($fNum, 0) * log($fNum);
-		} else {
-			$z = 8.0 / $fNum;
-			$y = ($z * $z);
-			$xx = $fNum - 0.785398164;
-			$f1 = 1 + $y * (-0.1098628627e-2 + $y * (0.2734510407e-4 + $y * (-0.2073370639e-5 + $y * 0.2093887211e-6)));
-			$f2 = -0.1562499995e-1 + $y * (0.1430488765e-3 + $y * (-0.6911147651e-5 + $y * (0.7621095161e-6 + $y * (-0.934945152e-7))));
-			$fRet = sqrt(0.636619772 / $fNum) * (sin($xx) * $f1 + $z * cos($xx) * $f2);
-		}
-		return $fRet;
-	}	//	function _Bessely0()
-
-
-	private static function _Bessely1($fNum) {
-		if ($fNum < 8.0) {
-			$y = ($fNum * $fNum);
-			$f1 = $fNum * (-0.4900604943e13 + $y * (0.1275274390e13 + $y * (-0.5153438139e11 + $y * (0.7349264551e9 + $y *
-				(-0.4237922726e7 + $y * 0.8511937935e4)))));
-			$f2 = 0.2499580570e14 + $y * (0.4244419664e12 + $y * (0.3733650367e10 + $y * (0.2245904002e8 + $y *
-				(0.1020426050e6 + $y * (0.3549632885e3 + $y)))));
-			$fRet = $f1 / $f2 + 0.636619772 * ( self::BESSELJ($fNum, 1) * log($fNum) - 1 / $fNum);
-		} else {
-			$fRet = sqrt(0.636619772 / $fNum) * sin($fNum - 2.356194491);
-		}
-		return $fRet;
-	}	//	function _Bessely1()
-
-
-	/**
-	 *	BESSELY
-	 *
-	 *	Returns the Bessel function, which is also called the Weber function or the Neumann function.
-	 *
-	 *	Excel Function:
-	 *		BESSELY(x,ord)
-	 *
-	 *	@access	public
-	 *	@category Engineering Functions
-	 *	@param	float		$x		The value at which to evaluate the function.
-	 *								If x is nonnumeric, BESSELK returns the #VALUE! error value.
-	 *	@param	integer		$ord	The order of the Bessel function. If n is not an integer, it is truncated.
-	 *								If $ord is nonnumeric, BESSELK returns the #VALUE! error value.
-	 *								If $ord < 0, BESSELK returns the #NUM! error value.
-	 *
-	 *	@return	float
-	 */
-	public static function BESSELY($x, $ord) {
-		$x		= (is_null($x))		? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$ord	= (is_null($ord))	? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($ord);
-
-		if ((is_numeric($x)) && (is_numeric($ord))) {
-			if (($ord < 0) || ($x == 0.0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-
-			switch(floor($ord)) {
-				case 0 :	return self::_Bessely0($x);
-							break;
-				case 1 :	return self::_Bessely1($x);
-							break;
-				default:	$fTox	= 2 / $x;
-							$fBym	= self::_Bessely0($x);
-							$fBy	= self::_Bessely1($x);
-							for ($n = 1; $n < $ord; ++$n) {
-								$fByp	= $n * $fTox * $fBy - $fBym;
-								$fBym	= $fBy;
-								$fBy	= $fByp;
-							}
-			}
-			return (is_nan($fBy)) ? PHPExcel_Calculation_Functions::NaN() : $fBy;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function BESSELY()
-
-
-	/**
-	 * BINTODEC
-	 *
-	 * Return a binary value as decimal.
-	 *
-	 * Excel Function:
-	 *		BIN2DEC(x)
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$x		The binary number (as a string) that you want to convert. The number
-	 *								cannot contain more than 10 characters (10 bits). The most significant
-	 *								bit of number is the sign bit. The remaining 9 bits are magnitude bits.
-	 *								Negative numbers are represented using two's-complement notation.
-	 *								If number is not a valid binary number, or if number contains more than
-	 *								10 characters (10 bits), BIN2DEC returns the #NUM! error value.
-	 * @return	string
-	 */
-	public static function BINTODEC($x) {
-		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
-
-		if (is_bool($x)) {
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
-				$x = (int) $x;
-			} else {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-		}
-		if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
-			$x = floor($x);
-		}
-		$x = (string) $x;
-		if (strlen($x) > preg_match_all('/[01]/',$x,$out)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		if (strlen($x) > 10) {
-			return PHPExcel_Calculation_Functions::NaN();
-		} elseif (strlen($x) == 10) {
-			//	Two's Complement
-			$x = substr($x,-9);
-			return '-'.(512-bindec($x));
-		}
-		return bindec($x);
-	}	//	function BINTODEC()
-
-
-	/**
-	 * BINTOHEX
-	 *
-	 * Return a binary value as hex.
-	 *
-	 * Excel Function:
-	 *		BIN2HEX(x[,places])
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$x		The binary number (as a string) that you want to convert. The number
-	 *								cannot contain more than 10 characters (10 bits). The most significant
-	 *								bit of number is the sign bit. The remaining 9 bits are magnitude bits.
-	 *								Negative numbers are represented using two's-complement notation.
-	 *								If number is not a valid binary number, or if number contains more than
-	 *								10 characters (10 bits), BIN2HEX returns the #NUM! error value.
-	 * @param	integer		$places	The number of characters to use. If places is omitted, BIN2HEX uses the
-	 *								minimum number of characters necessary. Places is useful for padding the
-	 *								return value with leading 0s (zeros).
-	 *								If places is not an integer, it is truncated.
-	 *								If places is nonnumeric, BIN2HEX returns the #VALUE! error value.
-	 *								If places is negative, BIN2HEX returns the #NUM! error value.
-	 * @return	string
-	 */
-	public static function BINTOHEX($x, $places=NULL) {
-		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$places	= PHPExcel_Calculation_Functions::flattenSingleValue($places);
-
-		if (is_bool($x)) {
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
-				$x = (int) $x;
-			} else {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-		}
-		if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
-			$x = floor($x);
-		}
-		$x = (string) $x;
-		if (strlen($x) > preg_match_all('/[01]/',$x,$out)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		if (strlen($x) > 10) {
-			return PHPExcel_Calculation_Functions::NaN();
-		} elseif (strlen($x) == 10) {
-			//	Two's Complement
-			return str_repeat('F',8).substr(strtoupper(dechex(bindec(substr($x,-9)))),-2);
-		}
-		$hexVal = (string) strtoupper(dechex(bindec($x)));
-
-		return self::_nbrConversionFormat($hexVal,$places);
-	}	//	function BINTOHEX()
-
-
-	/**
-	 * BINTOOCT
-	 *
-	 * Return a binary value as octal.
-	 *
-	 * Excel Function:
-	 *		BIN2OCT(x[,places])
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$x		The binary number (as a string) that you want to convert. The number
-	 *								cannot contain more than 10 characters (10 bits). The most significant
-	 *								bit of number is the sign bit. The remaining 9 bits are magnitude bits.
-	 *								Negative numbers are represented using two's-complement notation.
-	 *								If number is not a valid binary number, or if number contains more than
-	 *								10 characters (10 bits), BIN2OCT returns the #NUM! error value.
-	 * @param	integer		$places	The number of characters to use. If places is omitted, BIN2OCT uses the
-	 *								minimum number of characters necessary. Places is useful for padding the
-	 *								return value with leading 0s (zeros).
-	 *								If places is not an integer, it is truncated.
-	 *								If places is nonnumeric, BIN2OCT returns the #VALUE! error value.
-	 *								If places is negative, BIN2OCT returns the #NUM! error value.
-	 * @return	string
-	 */
-	public static function BINTOOCT($x, $places=NULL) {
-		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$places	= PHPExcel_Calculation_Functions::flattenSingleValue($places);
-
-		if (is_bool($x)) {
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
-				$x = (int) $x;
-			} else {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-		}
-		if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
-			$x = floor($x);
-		}
-		$x = (string) $x;
-		if (strlen($x) > preg_match_all('/[01]/',$x,$out)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		if (strlen($x) > 10) {
-			return PHPExcel_Calculation_Functions::NaN();
-		} elseif (strlen($x) == 10) {
-			//	Two's Complement
-			return str_repeat('7',7).substr(strtoupper(decoct(bindec(substr($x,-9)))),-3);
-		}
-		$octVal = (string) decoct(bindec($x));
-
-		return self::_nbrConversionFormat($octVal,$places);
-	}	//	function BINTOOCT()
-
-
-	/**
-	 * DECTOBIN
-	 *
-	 * Return a decimal value as binary.
-	 *
-	 * Excel Function:
-	 *		DEC2BIN(x[,places])
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$x		The decimal integer you want to convert. If number is negative,
-	 *								valid place values are ignored and DEC2BIN returns a 10-character
-	 *								(10-bit) binary number in which the most significant bit is the sign
-	 *								bit. The remaining 9 bits are magnitude bits. Negative numbers are
-	 *								represented using two's-complement notation.
-	 *								If number < -512 or if number > 511, DEC2BIN returns the #NUM! error
-	 *								value.
-	 *								If number is nonnumeric, DEC2BIN returns the #VALUE! error value.
-	 *								If DEC2BIN requires more than places characters, it returns the #NUM!
-	 *								error value.
-	 * @param	integer		$places	The number of characters to use. If places is omitted, DEC2BIN uses
-	 *								the minimum number of characters necessary. Places is useful for
-	 *								padding the return value with leading 0s (zeros).
-	 *								If places is not an integer, it is truncated.
-	 *								If places is nonnumeric, DEC2BIN returns the #VALUE! error value.
-	 *								If places is zero or negative, DEC2BIN returns the #NUM! error value.
-	 * @return	string
-	 */
-	public static function DECTOBIN($x, $places=NULL) {
-		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$places	= PHPExcel_Calculation_Functions::flattenSingleValue($places);
-
-		if (is_bool($x)) {
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
-				$x = (int) $x;
-			} else {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-		}
-		$x = (string) $x;
-		if (strlen($x) > preg_match_all('/[-0123456789.]/',$x,$out)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$x = (string) floor($x);
-		$r = decbin($x);
-		if (strlen($r) == 32) {
-			//	Two's Complement
-			$r = substr($r,-10);
-		} elseif (strlen($r) > 11) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		return self::_nbrConversionFormat($r,$places);
-	}	//	function DECTOBIN()
-
-
-	/**
-	 * DECTOHEX
-	 *
-	 * Return a decimal value as hex.
-	 *
-	 * Excel Function:
-	 *		DEC2HEX(x[,places])
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$x		The decimal integer you want to convert. If number is negative,
-	 *								places is ignored and DEC2HEX returns a 10-character (40-bit)
-	 *								hexadecimal number in which the most significant bit is the sign
-	 *								bit. The remaining 39 bits are magnitude bits. Negative numbers
-	 *								are represented using two's-complement notation.
-	 *								If number < -549,755,813,888 or if number > 549,755,813,887,
-	 *								DEC2HEX returns the #NUM! error value.
-	 *								If number is nonnumeric, DEC2HEX returns the #VALUE! error value.
-	 *								If DEC2HEX requires more than places characters, it returns the
-	 *								#NUM! error value.
-	 * @param	integer		$places	The number of characters to use. If places is omitted, DEC2HEX uses
-	 *								the minimum number of characters necessary. Places is useful for
-	 *								padding the return value with leading 0s (zeros).
-	 *								If places is not an integer, it is truncated.
-	 *								If places is nonnumeric, DEC2HEX returns the #VALUE! error value.
-	 *								If places is zero or negative, DEC2HEX returns the #NUM! error value.
-	 * @return	string
-	 */
-	public static function DECTOHEX($x, $places=null) {
-		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$places	= PHPExcel_Calculation_Functions::flattenSingleValue($places);
-
-		if (is_bool($x)) {
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
-				$x = (int) $x;
-			} else {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-		}
-		$x = (string) $x;
-		if (strlen($x) > preg_match_all('/[-0123456789.]/',$x,$out)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$x = (string) floor($x);
-		$r = strtoupper(dechex($x));
-		if (strlen($r) == 8) {
-			//	Two's Complement
-			$r = 'FF'.$r;
-		}
-
-		return self::_nbrConversionFormat($r,$places);
-	}	//	function DECTOHEX()
-
-
-	/**
-	 * DECTOOCT
-	 *
-	 * Return an decimal value as octal.
-	 *
-	 * Excel Function:
-	 *		DEC2OCT(x[,places])
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$x		The decimal integer you want to convert. If number is negative,
-	 *								places is ignored and DEC2OCT returns a 10-character (30-bit)
-	 *								octal number in which the most significant bit is the sign bit.
-	 *								The remaining 29 bits are magnitude bits. Negative numbers are
-	 *								represented using two's-complement notation.
-	 *								If number < -536,870,912 or if number > 536,870,911, DEC2OCT
-	 *								returns the #NUM! error value.
-	 *								If number is nonnumeric, DEC2OCT returns the #VALUE! error value.
-	 *								If DEC2OCT requires more than places characters, it returns the
-	 *								#NUM! error value.
-	 * @param	integer		$places	The number of characters to use. If places is omitted, DEC2OCT uses
-	 *								the minimum number of characters necessary. Places is useful for
-	 *								padding the return value with leading 0s (zeros).
-	 *								If places is not an integer, it is truncated.
-	 *								If places is nonnumeric, DEC2OCT returns the #VALUE! error value.
-	 *								If places is zero or negative, DEC2OCT returns the #NUM! error value.
-	 * @return	string
-	 */
-	public static function DECTOOCT($x, $places=null) {
-		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$places	= PHPExcel_Calculation_Functions::flattenSingleValue($places);
-
-		if (is_bool($x)) {
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
-				$x = (int) $x;
-			} else {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-		}
-		$x = (string) $x;
-		if (strlen($x) > preg_match_all('/[-0123456789.]/',$x,$out)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$x = (string) floor($x);
-		$r = decoct($x);
-		if (strlen($r) == 11) {
-			//	Two's Complement
-			$r = substr($r,-10);
-		}
-
-		return self::_nbrConversionFormat($r,$places);
-	}	//	function DECTOOCT()
-
-
-	/**
-	 * HEXTOBIN
-	 *
-	 * Return a hex value as binary.
-	 *
-	 * Excel Function:
-	 *		HEX2BIN(x[,places])
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$x			the hexadecimal number you want to convert. Number cannot
-	 *									contain more than 10 characters. The most significant bit of
-	 *									number is the sign bit (40th bit from the right). The remaining
-	 *									9 bits are magnitude bits. Negative numbers are represented
-	 *									using two's-complement notation.
-	 *									If number is negative, HEX2BIN ignores places and returns a
-	 *									10-character binary number.
-	 *									If number is negative, it cannot be less than FFFFFFFE00, and
-	 *									if number is positive, it cannot be greater than 1FF.
-	 *									If number is not a valid hexadecimal number, HEX2BIN returns
-	 *									the #NUM! error value.
-	 *									If HEX2BIN requires more than places characters, it returns
-	 *									the #NUM! error value.
-	 * @param	integer		$places		The number of characters to use. If places is omitted,
-	 *									HEX2BIN uses the minimum number of characters necessary. Places
-	 *									is useful for padding the return value with leading 0s (zeros).
-	 *									If places is not an integer, it is truncated.
-	 *									If places is nonnumeric, HEX2BIN returns the #VALUE! error value.
-	 *									If places is negative, HEX2BIN returns the #NUM! error value.
-	 * @return	string
-	 */
-	public static function HEXTOBIN($x, $places=null) {
-		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$places	= PHPExcel_Calculation_Functions::flattenSingleValue($places);
-
-		if (is_bool($x)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$x = (string) $x;
-		if (strlen($x) > preg_match_all('/[0123456789ABCDEF]/',strtoupper($x),$out)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		$binVal = decbin(hexdec($x));
-
-		return substr(self::_nbrConversionFormat($binVal,$places),-10);
-	}	//	function HEXTOBIN()
-
-
-	/**
-	 * HEXTODEC
-	 *
-	 * Return a hex value as decimal.
-	 *
-	 * Excel Function:
-	 *		HEX2DEC(x)
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$x		The hexadecimal number you want to convert. This number cannot
-	 *								contain more than 10 characters (40 bits). The most significant
-	 *								bit of number is the sign bit. The remaining 39 bits are magnitude
-	 *								bits. Negative numbers are represented using two's-complement
-	 *								notation.
-	 *								If number is not a valid hexadecimal number, HEX2DEC returns the
-	 *								#NUM! error value.
-	 * @return	string
-	 */
-	public static function HEXTODEC($x) {
-		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
-
-		if (is_bool($x)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$x = (string) $x;
-		if (strlen($x) > preg_match_all('/[0123456789ABCDEF]/',strtoupper($x),$out)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		return hexdec($x);
-	}	//	function HEXTODEC()
-
-
-	/**
-	 * HEXTOOCT
-	 *
-	 * Return a hex value as octal.
-	 *
-	 * Excel Function:
-	 *		HEX2OCT(x[,places])
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$x			The hexadecimal number you want to convert. Number cannot
-	 *									contain more than 10 characters. The most significant bit of
-	 *									number is the sign bit. The remaining 39 bits are magnitude
-	 *									bits. Negative numbers are represented using two's-complement
-	 *									notation.
-	 *									If number is negative, HEX2OCT ignores places and returns a
-	 *									10-character octal number.
-	 *									If number is negative, it cannot be less than FFE0000000, and
-	 *									if number is positive, it cannot be greater than 1FFFFFFF.
-	 *									If number is not a valid hexadecimal number, HEX2OCT returns
-	 *									the #NUM! error value.
-	 *									If HEX2OCT requires more than places characters, it returns
-	 *									the #NUM! error value.
-	 * @param	integer		$places		The number of characters to use. If places is omitted, HEX2OCT
-	 *									uses the minimum number of characters necessary. Places is
-	 *									useful for padding the return value with leading 0s (zeros).
-	 *									If places is not an integer, it is truncated.
-	 *									If places is nonnumeric, HEX2OCT returns the #VALUE! error
-	 *									value.
-	 *									If places is negative, HEX2OCT returns the #NUM! error value.
-	 * @return	string
-	 */
-	public static function HEXTOOCT($x, $places=null) {
-		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$places	= PHPExcel_Calculation_Functions::flattenSingleValue($places);
-
-		if (is_bool($x)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$x = (string) $x;
-		if (strlen($x) > preg_match_all('/[0123456789ABCDEF]/',strtoupper($x),$out)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		$octVal = decoct(hexdec($x));
-
-		return self::_nbrConversionFormat($octVal,$places);
-	}	//	function HEXTOOCT()
-
-
-	/**
-	 * OCTTOBIN
-	 *
-	 * Return an octal value as binary.
-	 *
-	 * Excel Function:
-	 *		OCT2BIN(x[,places])
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$x			The octal number you want to convert. Number may not
-	 *									contain more than 10 characters. The most significant
-	 *									bit of number is the sign bit. The remaining 29 bits
-	 *									are magnitude bits. Negative numbers are represented
-	 *									using two's-complement notation.
-	 *									If number is negative, OCT2BIN ignores places and returns
-	 *									a 10-character binary number.
-	 *									If number is negative, it cannot be less than 7777777000,
-	 *									and if number is positive, it cannot be greater than 777.
-	 *									If number is not a valid octal number, OCT2BIN returns
-	 *									the #NUM! error value.
-	 *									If OCT2BIN requires more than places characters, it
-	 *									returns the #NUM! error value.
-	 * @param	integer		$places		The number of characters to use. If places is omitted,
-	 *									OCT2BIN uses the minimum number of characters necessary.
-	 *									Places is useful for padding the return value with
-	 *									leading 0s (zeros).
-	 *									If places is not an integer, it is truncated.
-	 *									If places is nonnumeric, OCT2BIN returns the #VALUE!
-	 *									error value.
-	 *									If places is negative, OCT2BIN returns the #NUM! error
-	 *									value.
-	 * @return	string
-	 */
-	public static function OCTTOBIN($x, $places=null) {
-		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$places	= PHPExcel_Calculation_Functions::flattenSingleValue($places);
-
-		if (is_bool($x)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$x = (string) $x;
-		if (preg_match_all('/[01234567]/',$x,$out) != strlen($x)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		$r = decbin(octdec($x));
-
-		return self::_nbrConversionFormat($r,$places);
-	}	//	function OCTTOBIN()
-
-
-	/**
-	 * OCTTODEC
-	 *
-	 * Return an octal value as decimal.
-	 *
-	 * Excel Function:
-	 *		OCT2DEC(x)
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$x		The octal number you want to convert. Number may not contain
-	 *								more than 10 octal characters (30 bits). The most significant
-	 *								bit of number is the sign bit. The remaining 29 bits are
-	 *								magnitude bits. Negative numbers are represented using
-	 *								two's-complement notation.
-	 *								If number is not a valid octal number, OCT2DEC returns the
-	 *								#NUM! error value.
-	 * @return	string
-	 */
-	public static function OCTTODEC($x) {
-		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
-
-		if (is_bool($x)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$x = (string) $x;
-		if (preg_match_all('/[01234567]/',$x,$out) != strlen($x)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		return octdec($x);
-	}	//	function OCTTODEC()
-
-
-	/**
-	 * OCTTOHEX
-	 *
-	 * Return an octal value as hex.
-	 *
-	 * Excel Function:
-	 *		OCT2HEX(x[,places])
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$x			The octal number you want to convert. Number may not contain
-	 *									more than 10 octal characters (30 bits). The most significant
-	 *									bit of number is the sign bit. The remaining 29 bits are
-	 *									magnitude bits. Negative numbers are represented using
-	 *									two's-complement notation.
-	 *									If number is negative, OCT2HEX ignores places and returns a
-	 *									10-character hexadecimal number.
-	 *									If number is not a valid octal number, OCT2HEX returns the
-	 *									#NUM! error value.
-	 *									If OCT2HEX requires more than places characters, it returns
-	 *									the #NUM! error value.
-	 * @param	integer		$places		The number of characters to use. If places is omitted, OCT2HEX
-	 *									uses the minimum number of characters necessary. Places is useful
-	 *									for padding the return value with leading 0s (zeros).
-	 *									If places is not an integer, it is truncated.
-	 *									If places is nonnumeric, OCT2HEX returns the #VALUE! error value.
-	 *									If places is negative, OCT2HEX returns the #NUM! error value.
-	 * @return	string
-	 */
-	public static function OCTTOHEX($x, $places=null) {
-		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$places	= PHPExcel_Calculation_Functions::flattenSingleValue($places);
-
-		if (is_bool($x)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$x = (string) $x;
-		if (preg_match_all('/[01234567]/',$x,$out) != strlen($x)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		$hexVal = strtoupper(dechex(octdec($x)));
-
-		return self::_nbrConversionFormat($hexVal,$places);
-	}	//	function OCTTOHEX()
-
-
-	/**
-	 * COMPLEX
-	 *
-	 * Converts real and imaginary coefficients into a complex number of the form x + yi or x + yj.
-	 *
-	 * Excel Function:
-	 *		COMPLEX(realNumber,imaginary[,places])
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	float		$realNumber		The real coefficient of the complex number.
-	 * @param	float		$imaginary		The imaginary coefficient of the complex number.
-	 * @param	string		$suffix			The suffix for the imaginary component of the complex number.
-	 *										If omitted, the suffix is assumed to be "i".
-	 * @return	string
-	 */
-	public static function COMPLEX($realNumber=0.0, $imaginary=0.0, $suffix='i') {
-		$realNumber	= (is_null($realNumber))	? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($realNumber);
-		$imaginary	= (is_null($imaginary))		? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($imaginary);
-		$suffix		= (is_null($suffix))		? 'i' :	PHPExcel_Calculation_Functions::flattenSingleValue($suffix);
-
-		if (((is_numeric($realNumber)) && (is_numeric($imaginary))) &&
-			(($suffix == 'i') || ($suffix == 'j') || ($suffix == ''))) {
-			$realNumber	= (float) $realNumber;
-			$imaginary	= (float) $imaginary;
-
-			if ($suffix == '') $suffix = 'i';
-			if ($realNumber == 0.0) {
-				if ($imaginary == 0.0) {
-					return (string) '0';
-				} elseif ($imaginary == 1.0) {
-					return (string) $suffix;
-				} elseif ($imaginary == -1.0) {
-					return (string) '-'.$suffix;
-				}
-				return (string) $imaginary.$suffix;
-			} elseif ($imaginary == 0.0) {
-				return (string) $realNumber;
-			} elseif ($imaginary == 1.0) {
-				return (string) $realNumber.'+'.$suffix;
-			} elseif ($imaginary == -1.0) {
-				return (string) $realNumber.'-'.$suffix;
-			}
-			if ($imaginary > 0) { $imaginary = (string) '+'.$imaginary; }
-			return (string) $realNumber.$imaginary.$suffix;
-		}
-
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function COMPLEX()
-
-
-	/**
-	 * IMAGINARY
-	 *
-	 * Returns the imaginary coefficient of a complex number in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMAGINARY(complexNumber)
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$complexNumber	The complex number for which you want the imaginary
-	 * 										coefficient.
-	 * @return	float
-	 */
-	public static function IMAGINARY($complexNumber) {
-		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
-
-		$parsedComplex = self::_parseComplex($complexNumber);
-		return $parsedComplex['imaginary'];
-	}	//	function IMAGINARY()
-
-
-	/**
-	 * IMREAL
-	 *
-	 * Returns the real coefficient of a complex number in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMREAL(complexNumber)
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$complexNumber	The complex number for which you want the real coefficient.
-	 * @return	float
-	 */
-	public static function IMREAL($complexNumber) {
-		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
-
-		$parsedComplex = self::_parseComplex($complexNumber);
-		return $parsedComplex['real'];
-	}	//	function IMREAL()
-
-
-	/**
-	 * IMABS
-	 *
-	 * Returns the absolute value (modulus) of a complex number in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMABS(complexNumber)
-	 *
-	 * @param	string		$complexNumber	The complex number for which you want the absolute value.
-	 * @return	float
-	 */
-	public static function IMABS($complexNumber) {
-		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
-
-		$parsedComplex = self::_parseComplex($complexNumber);
-
-		return sqrt(($parsedComplex['real'] * $parsedComplex['real']) + ($parsedComplex['imaginary'] * $parsedComplex['imaginary']));
-	}	//	function IMABS()
-
-
-	/**
-	 * IMARGUMENT
-	 *
-	 * Returns the argument theta of a complex number, i.e. the angle in radians from the real
-	 * axis to the representation of the number in polar coordinates.
-	 *
-	 * Excel Function:
-	 *		IMARGUMENT(complexNumber)
-	 *
-	 * @param	string		$complexNumber	The complex number for which you want the argument theta.
-	 * @return	float
-	 */
-	public static function IMARGUMENT($complexNumber) {
-		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
-
-		$parsedComplex = self::_parseComplex($complexNumber);
-
-		if ($parsedComplex['real'] == 0.0) {
-			if ($parsedComplex['imaginary'] == 0.0) {
-				return 0.0;
-			} elseif($parsedComplex['imaginary'] < 0.0) {
-				return M_PI / -2;
-			} else {
-				return M_PI / 2;
-			}
-		} elseif ($parsedComplex['real'] > 0.0) {
-			return atan($parsedComplex['imaginary'] / $parsedComplex['real']);
-		} elseif ($parsedComplex['imaginary'] < 0.0) {
-			return 0 - (M_PI - atan(abs($parsedComplex['imaginary']) / abs($parsedComplex['real'])));
-		} else {
-			return M_PI - atan($parsedComplex['imaginary'] / abs($parsedComplex['real']));
-		}
-	}	//	function IMARGUMENT()
-
-
-	/**
-	 * IMCONJUGATE
-	 *
-	 * Returns the complex conjugate of a complex number in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMCONJUGATE(complexNumber)
-	 *
-	 * @param	string		$complexNumber	The complex number for which you want the conjugate.
-	 * @return	string
-	 */
-	public static function IMCONJUGATE($complexNumber) {
-		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
-
-		$parsedComplex = self::_parseComplex($complexNumber);
-
-		if ($parsedComplex['imaginary'] == 0.0) {
-			return $parsedComplex['real'];
-		} else {
-			return self::_cleanComplex( self::COMPLEX( $parsedComplex['real'],
-													   0 - $parsedComplex['imaginary'],
-													   $parsedComplex['suffix']
-													 )
-									  );
-		}
-	}	//	function IMCONJUGATE()
-
-
-	/**
-	 * IMCOS
-	 *
-	 * Returns the cosine of a complex number in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMCOS(complexNumber)
-	 *
-	 * @param	string		$complexNumber	The complex number for which you want the cosine.
-	 * @return	string|float
-	 */
-	public static function IMCOS($complexNumber) {
-		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
-
-		$parsedComplex = self::_parseComplex($complexNumber);
-
-		if ($parsedComplex['imaginary'] == 0.0) {
-			return cos($parsedComplex['real']);
-		} else {
-			return self::IMCONJUGATE(self::COMPLEX(cos($parsedComplex['real']) * cosh($parsedComplex['imaginary']),sin($parsedComplex['real']) * sinh($parsedComplex['imaginary']),$parsedComplex['suffix']));
-		}
-	}	//	function IMCOS()
-
-
-	/**
-	 * IMSIN
-	 *
-	 * Returns the sine of a complex number in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMSIN(complexNumber)
-	 *
-	 * @param	string		$complexNumber	The complex number for which you want the sine.
-	 * @return	string|float
-	 */
-	public static function IMSIN($complexNumber) {
-		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
-
-		$parsedComplex = self::_parseComplex($complexNumber);
-
-		if ($parsedComplex['imaginary'] == 0.0) {
-			return sin($parsedComplex['real']);
-		} else {
-			return self::COMPLEX(sin($parsedComplex['real']) * cosh($parsedComplex['imaginary']),cos($parsedComplex['real']) * sinh($parsedComplex['imaginary']),$parsedComplex['suffix']);
-		}
-	}	//	function IMSIN()
-
-
-	/**
-	 * IMSQRT
-	 *
-	 * Returns the square root of a complex number in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMSQRT(complexNumber)
-	 *
-	 * @param	string		$complexNumber	The complex number for which you want the square root.
-	 * @return	string
-	 */
-	public static function IMSQRT($complexNumber) {
-		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
-
-		$parsedComplex = self::_parseComplex($complexNumber);
-
-		$theta = self::IMARGUMENT($complexNumber);
-		$d1 = cos($theta / 2);
-		$d2 = sin($theta / 2);
-		$r = sqrt(sqrt(($parsedComplex['real'] * $parsedComplex['real']) + ($parsedComplex['imaginary'] * $parsedComplex['imaginary'])));
-
-		if ($parsedComplex['suffix'] == '') {
-			return self::COMPLEX($d1 * $r,$d2 * $r);
-		} else {
-			return self::COMPLEX($d1 * $r,$d2 * $r,$parsedComplex['suffix']);
-		}
-	}	//	function IMSQRT()
-
-
-	/**
-	 * IMLN
-	 *
-	 * Returns the natural logarithm of a complex number in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMLN(complexNumber)
-	 *
-	 * @param	string		$complexNumber	The complex number for which you want the natural logarithm.
-	 * @return	string
-	 */
-	public static function IMLN($complexNumber) {
-		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
-
-		$parsedComplex = self::_parseComplex($complexNumber);
-
-		if (($parsedComplex['real'] == 0.0) && ($parsedComplex['imaginary'] == 0.0)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		$logR = log(sqrt(($parsedComplex['real'] * $parsedComplex['real']) + ($parsedComplex['imaginary'] * $parsedComplex['imaginary'])));
-		$t = self::IMARGUMENT($complexNumber);
-
-		if ($parsedComplex['suffix'] == '') {
-			return self::COMPLEX($logR,$t);
-		} else {
-			return self::COMPLEX($logR,$t,$parsedComplex['suffix']);
-		}
-	}	//	function IMLN()
-
-
-	/**
-	 * IMLOG10
-	 *
-	 * Returns the common logarithm (base 10) of a complex number in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMLOG10(complexNumber)
-	 *
-	 * @param	string		$complexNumber	The complex number for which you want the common logarithm.
-	 * @return	string
-	 */
-	public static function IMLOG10($complexNumber) {
-		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
-
-		$parsedComplex = self::_parseComplex($complexNumber);
-
-		if (($parsedComplex['real'] == 0.0) && ($parsedComplex['imaginary'] == 0.0)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		} elseif (($parsedComplex['real'] > 0.0) && ($parsedComplex['imaginary'] == 0.0)) {
-			return log10($parsedComplex['real']);
-		}
-
-		return self::IMPRODUCT(log10(EULER),self::IMLN($complexNumber));
-	}	//	function IMLOG10()
-
-
-	/**
-	 * IMLOG2
-	 *
-	 * Returns the base-2 logarithm of a complex number in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMLOG2(complexNumber)
-	 *
-	 * @param	string		$complexNumber	The complex number for which you want the base-2 logarithm.
-	 * @return	string
-	 */
-	public static function IMLOG2($complexNumber) {
-		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
-
-		$parsedComplex = self::_parseComplex($complexNumber);
-
-		if (($parsedComplex['real'] == 0.0) && ($parsedComplex['imaginary'] == 0.0)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		} elseif (($parsedComplex['real'] > 0.0) && ($parsedComplex['imaginary'] == 0.0)) {
-			return log($parsedComplex['real'],2);
-		}
-
-		return self::IMPRODUCT(log(EULER,2),self::IMLN($complexNumber));
-	}	//	function IMLOG2()
-
-
-	/**
-	 * IMEXP
-	 *
-	 * Returns the exponential of a complex number in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMEXP(complexNumber)
-	 *
-	 * @param	string		$complexNumber	The complex number for which you want the exponential.
-	 * @return	string
-	 */
-	public static function IMEXP($complexNumber) {
-		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
-
-		$parsedComplex = self::_parseComplex($complexNumber);
-
-		if (($parsedComplex['real'] == 0.0) && ($parsedComplex['imaginary'] == 0.0)) {
-			return '1';
-		}
-
-		$e = exp($parsedComplex['real']);
-		$eX = $e * cos($parsedComplex['imaginary']);
-		$eY = $e * sin($parsedComplex['imaginary']);
-
-		if ($parsedComplex['suffix'] == '') {
-			return self::COMPLEX($eX,$eY);
-		} else {
-			return self::COMPLEX($eX,$eY,$parsedComplex['suffix']);
-		}
-	}	//	function IMEXP()
-
-
-	/**
-	 * IMPOWER
-	 *
-	 * Returns a complex number in x + yi or x + yj text format raised to a power.
-	 *
-	 * Excel Function:
-	 *		IMPOWER(complexNumber,realNumber)
-	 *
-	 * @param	string		$complexNumber	The complex number you want to raise to a power.
-	 * @param	float		$realNumber		The power to which you want to raise the complex number.
-	 * @return	string
-	 */
-	public static function IMPOWER($complexNumber,$realNumber) {
-		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
-		$realNumber		= PHPExcel_Calculation_Functions::flattenSingleValue($realNumber);
-
-		if (!is_numeric($realNumber)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		$parsedComplex = self::_parseComplex($complexNumber);
-
-		$r = sqrt(($parsedComplex['real'] * $parsedComplex['real']) + ($parsedComplex['imaginary'] * $parsedComplex['imaginary']));
-		$rPower = pow($r,$realNumber);
-		$theta = self::IMARGUMENT($complexNumber) * $realNumber;
-		if ($theta == 0) {
-			return 1;
-		} elseif ($parsedComplex['imaginary'] == 0.0) {
-			return self::COMPLEX($rPower * cos($theta),$rPower * sin($theta),$parsedComplex['suffix']);
-		} else {
-			return self::COMPLEX($rPower * cos($theta),$rPower * sin($theta),$parsedComplex['suffix']);
-		}
-	}	//	function IMPOWER()
-
-
-	/**
-	 * IMDIV
-	 *
-	 * Returns the quotient of two complex numbers in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMDIV(complexDividend,complexDivisor)
-	 *
-	 * @param	string		$complexDividend	The complex numerator or dividend.
-	 * @param	string		$complexDivisor		The complex denominator or divisor.
-	 * @return	string
-	 */
-	public static function IMDIV($complexDividend,$complexDivisor) {
-		$complexDividend	= PHPExcel_Calculation_Functions::flattenSingleValue($complexDividend);
-		$complexDivisor	= PHPExcel_Calculation_Functions::flattenSingleValue($complexDivisor);
-
-		$parsedComplexDividend = self::_parseComplex($complexDividend);
-		$parsedComplexDivisor = self::_parseComplex($complexDivisor);
-
-		if (($parsedComplexDividend['suffix'] != '') && ($parsedComplexDivisor['suffix'] != '') &&
-			($parsedComplexDividend['suffix'] != $parsedComplexDivisor['suffix'])) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		if (($parsedComplexDividend['suffix'] != '') && ($parsedComplexDivisor['suffix'] == '')) {
-			$parsedComplexDivisor['suffix'] = $parsedComplexDividend['suffix'];
-		}
-
-		$d1 = ($parsedComplexDividend['real'] * $parsedComplexDivisor['real']) + ($parsedComplexDividend['imaginary'] * $parsedComplexDivisor['imaginary']);
-		$d2 = ($parsedComplexDividend['imaginary'] * $parsedComplexDivisor['real']) - ($parsedComplexDividend['real'] * $parsedComplexDivisor['imaginary']);
-		$d3 = ($parsedComplexDivisor['real'] * $parsedComplexDivisor['real']) + ($parsedComplexDivisor['imaginary'] * $parsedComplexDivisor['imaginary']);
-
-		$r = $d1/$d3;
-		$i = $d2/$d3;
-
-		if ($i > 0.0) {
-			return self::_cleanComplex($r.'+'.$i.$parsedComplexDivisor['suffix']);
-		} elseif ($i < 0.0) {
-			return self::_cleanComplex($r.$i.$parsedComplexDivisor['suffix']);
-		} else {
-			return $r;
-		}
-	}	//	function IMDIV()
-
-
-	/**
-	 * IMSUB
-	 *
-	 * Returns the difference of two complex numbers in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMSUB(complexNumber1,complexNumber2)
-	 *
-	 * @param	string		$complexNumber1		The complex number from which to subtract complexNumber2.
-	 * @param	string		$complexNumber2		The complex number to subtract from complexNumber1.
-	 * @return	string
-	 */
-	public static function IMSUB($complexNumber1,$complexNumber2) {
-		$complexNumber1	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber1);
-		$complexNumber2	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber2);
-
-		$parsedComplex1 = self::_parseComplex($complexNumber1);
-		$parsedComplex2 = self::_parseComplex($complexNumber2);
-
-		if ((($parsedComplex1['suffix'] != '') && ($parsedComplex2['suffix'] != '')) &&
-			($parsedComplex1['suffix'] != $parsedComplex2['suffix'])) {
-			return PHPExcel_Calculation_Functions::NaN();
-		} elseif (($parsedComplex1['suffix'] == '') && ($parsedComplex2['suffix'] != '')) {
-			$parsedComplex1['suffix'] = $parsedComplex2['suffix'];
-		}
-
-		$d1 = $parsedComplex1['real'] - $parsedComplex2['real'];
-		$d2 = $parsedComplex1['imaginary'] - $parsedComplex2['imaginary'];
-
-		return self::COMPLEX($d1,$d2,$parsedComplex1['suffix']);
-	}	//	function IMSUB()
-
-
-	/**
-	 * IMSUM
-	 *
-	 * Returns the sum of two or more complex numbers in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMSUM(complexNumber[,complexNumber[,...]])
-	 *
-	 * @param	string		$complexNumber,...	Series of complex numbers to add
-	 * @return	string
-	 */
-	public static function IMSUM() {
-		// Return value
-		$returnValue = self::_parseComplex('0');
-		$activeSuffix = '';
-
-		// Loop through the arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		foreach ($aArgs as $arg) {
-			$parsedComplex = self::_parseComplex($arg);
-
-			if ($activeSuffix == '') {
-				$activeSuffix = $parsedComplex['suffix'];
-			} elseif (($parsedComplex['suffix'] != '') && ($activeSuffix != $parsedComplex['suffix'])) {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-
-			$returnValue['real'] += $parsedComplex['real'];
-			$returnValue['imaginary'] += $parsedComplex['imaginary'];
-		}
-
-		if ($returnValue['imaginary'] == 0.0) { $activeSuffix = ''; }
-		return self::COMPLEX($returnValue['real'],$returnValue['imaginary'],$activeSuffix);
-	}	//	function IMSUM()
-
-
-	/**
-	 * IMPRODUCT
-	 *
-	 * Returns the product of two or more complex numbers in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMPRODUCT(complexNumber[,complexNumber[,...]])
-	 *
-	 * @param	string		$complexNumber,...	Series of complex numbers to multiply
-	 * @return	string
-	 */
-	public static function IMPRODUCT() {
-		// Return value
-		$returnValue = self::_parseComplex('1');
-		$activeSuffix = '';
-
-		// Loop through the arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		foreach ($aArgs as $arg) {
-			$parsedComplex = self::_parseComplex($arg);
-
-			$workValue = $returnValue;
-			if (($parsedComplex['suffix'] != '') && ($activeSuffix == '')) {
-				$activeSuffix = $parsedComplex['suffix'];
-			} elseif (($parsedComplex['suffix'] != '') && ($activeSuffix != $parsedComplex['suffix'])) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$returnValue['real'] = ($workValue['real'] * $parsedComplex['real']) - ($workValue['imaginary'] * $parsedComplex['imaginary']);
-			$returnValue['imaginary'] = ($workValue['real'] * $parsedComplex['imaginary']) + ($workValue['imaginary'] * $parsedComplex['real']);
-		}
-
-		if ($returnValue['imaginary'] == 0.0) { $activeSuffix = ''; }
-		return self::COMPLEX($returnValue['real'],$returnValue['imaginary'],$activeSuffix);
-	}	//	function IMPRODUCT()
-
-
-	/**
-	 *	DELTA
-	 *
-	 *	Tests whether two values are equal. Returns 1 if number1 = number2; returns 0 otherwise.
-	 *	Use this function to filter a set of values. For example, by summing several DELTA
-	 *	functions you calculate the count of equal pairs. This function is also known as the
-	 *	Kronecker Delta function.
-	 *
-	 *	Excel Function:
-	 *		DELTA(a[,b])
-	 *
-	 *	@param	float		$a	The first number.
-	 *	@param	float		$b	The second number. If omitted, b is assumed to be zero.
-	 *	@return	int
-	 */
-	public static function DELTA($a, $b=0) {
-		$a	= PHPExcel_Calculation_Functions::flattenSingleValue($a);
-		$b	= PHPExcel_Calculation_Functions::flattenSingleValue($b);
-
-		return (int) ($a == $b);
-	}	//	function DELTA()
-
-
-	/**
-	 *	GESTEP
-	 *
-	 *	Excel Function:
-	 *		GESTEP(number[,step])
-	 *
-	 *	Returns 1 if number >= step; returns 0 (zero) otherwise
-	 *	Use this function to filter a set of values. For example, by summing several GESTEP
-	 *	functions you calculate the count of values that exceed a threshold.
-	 *
-	 *	@param	float		$number		The value to test against step.
-	 *	@param	float		$step		The threshold value.
-	 *									If you omit a value for step, GESTEP uses zero.
-	 *	@return	int
-	 */
-	public static function GESTEP($number, $step=0) {
-		$number	= PHPExcel_Calculation_Functions::flattenSingleValue($number);
-		$step	= PHPExcel_Calculation_Functions::flattenSingleValue($step);
-
-		return (int) ($number >= $step);
-	}	//	function GESTEP()
-
-
-	//
-	//	Private method to calculate the erf value
-	//
-	private static $_two_sqrtpi = 1.128379167095512574;
-
-	public static function _erfVal($x) {
-		if (abs($x) > 2.2) {
-			return 1 - self::_erfcVal($x);
-		}
-		$sum = $term = $x;
-		$xsqr = ($x * $x);
-		$j = 1;
-		do {
-			$term *= $xsqr / $j;
-			$sum -= $term / (2 * $j + 1);
-			++$j;
-			$term *= $xsqr / $j;
-			$sum += $term / (2 * $j + 1);
-			++$j;
-			if ($sum == 0.0) {
-				break;
-			}
-		} while (abs($term / $sum) > PRECISION);
-		return self::$_two_sqrtpi * $sum;
-	}	//	function _erfVal()
-
-
-	/**
-	 *	ERF
-	 *
-	 *	Returns the error function integrated between the lower and upper bound arguments.
-	 *
-	 *	Note: In Excel 2007 or earlier, if you input a negative value for the upper or lower bound arguments,
-	 *			the function would return a #NUM! error. However, in Excel 2010, the function algorithm was
-	 *			improved, so that it can now calculate the function for both positive and negative ranges.
-	 *			PHPExcel follows Excel 2010 behaviour, and accepts nagative arguments.
-	 *
-	 *	Excel Function:
-	 *		ERF(lower[,upper])
-	 *
-	 *	@param	float		$lower	lower bound for integrating ERF
-	 *	@param	float		$upper	upper bound for integrating ERF.
-	 *								If omitted, ERF integrates between zero and lower_limit
-	 *	@return	float
-	 */
-	public static function ERF($lower, $upper = NULL) {
-		$lower	= PHPExcel_Calculation_Functions::flattenSingleValue($lower);
-		$upper	= PHPExcel_Calculation_Functions::flattenSingleValue($upper);
-
-		if (is_numeric($lower)) {
-			if (is_null($upper)) {
-				return self::_erfVal($lower);
-			}
-			if (is_numeric($upper)) {
-				return self::_erfVal($upper) - self::_erfVal($lower);
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function ERF()
-
-
-	//
-	//	Private method to calculate the erfc value
-	//
-	private static $_one_sqrtpi = 0.564189583547756287;
-
-	private static function _erfcVal($x) {
-		if (abs($x) < 2.2) {
-			return 1 - self::_erfVal($x);
-		}
-		if ($x < 0) {
-			return 2 - self::ERFC(-$x);
-		}
-		$a = $n = 1;
-		$b = $c = $x;
-		$d = ($x * $x) + 0.5;
-		$q1 = $q2 = $b / $d;
-		$t = 0;
-		do {
-			$t = $a * $n + $b * $x;
-			$a = $b;
-			$b = $t;
-			$t = $c * $n + $d * $x;
-			$c = $d;
-			$d = $t;
-			$n += 0.5;
-			$q1 = $q2;
-			$q2 = $b / $d;
-		} while ((abs($q1 - $q2) / $q2) > PRECISION);
-		return self::$_one_sqrtpi * exp(-$x * $x) * $q2;
-	}	//	function _erfcVal()
-
-
-	/**
-	 *	ERFC
-	 *
-	 *	Returns the complementary ERF function integrated between x and infinity
-	 *
-	 *	Note: In Excel 2007 or earlier, if you input a negative value for the lower bound argument,
-	 *		the function would return a #NUM! error. However, in Excel 2010, the function algorithm was
-	 *		improved, so that it can now calculate the function for both positive and negative x values.
-	 *			PHPExcel follows Excel 2010 behaviour, and accepts nagative arguments.
-	 *
-	 *	Excel Function:
-	 *		ERFC(x)
-	 *
-	 *	@param	float	$x	The lower bound for integrating ERFC
-	 *	@return	float
-	 */
-	public static function ERFC($x) {
-		$x = PHPExcel_Calculation_Functions::flattenSingleValue($x);
-
-		if (is_numeric($x)) {
-			return self::_erfcVal($x);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function ERFC()
-
-
-	/**
-	 *	getConversionGroups
-	 *	Returns a list of the different conversion groups for UOM conversions
-	 *
-	 *	@return	array
-	 */
-	public static function getConversionGroups() {
-		$conversionGroups = array();
-		foreach(self::$_conversionUnits as $conversionUnit) {
-			$conversionGroups[] = $conversionUnit['Group'];
-		}
-		return array_merge(array_unique($conversionGroups));
-	}	//	function getConversionGroups()
-
-
-	/**
-	 *	getConversionGroupUnits
-	 *	Returns an array of units of measure, for a specified conversion group, or for all groups
-	 *
-	 *	@param	string	$group	The group whose units of measure you want to retrieve
-	 *	@return	array
-	 */
-	public static function getConversionGroupUnits($group = NULL) {
-		$conversionGroups = array();
-		foreach(self::$_conversionUnits as $conversionUnit => $conversionGroup) {
-			if ((is_null($group)) || ($conversionGroup['Group'] == $group)) {
-				$conversionGroups[$conversionGroup['Group']][] = $conversionUnit;
-			}
-		}
-		return $conversionGroups;
-	}	//	function getConversionGroupUnits()
-
-
-	/**
-	 *	getConversionGroupUnitDetails
-	 *
-	 *	@param	string	$group	The group whose units of measure you want to retrieve
-	 *	@return	array
-	 */
-	public static function getConversionGroupUnitDetails($group = NULL) {
-		$conversionGroups = array();
-		foreach(self::$_conversionUnits as $conversionUnit => $conversionGroup) {
-			if ((is_null($group)) || ($conversionGroup['Group'] == $group)) {
-				$conversionGroups[$conversionGroup['Group']][] = array(	'unit'			=> $conversionUnit,
-																		'description'	=> $conversionGroup['Unit Name']
-																	  );
-			}
-		}
-		return $conversionGroups;
-	}	//	function getConversionGroupUnitDetails()
-
-
-	/**
-	 *	getConversionMultipliers
-	 *	Returns an array of the Multiplier prefixes that can be used with Units of Measure in CONVERTUOM()
-	 *
-	 *	@return	array of mixed
-	 */
-	public static function getConversionMultipliers() {
-		return self::$_conversionMultipliers;
-	}	//	function getConversionGroups()
-
-
-	/**
-	 *	CONVERTUOM
-	 *
-	 *	Converts a number from one measurement system to another.
-	 *	For example, CONVERT can translate a table of distances in miles to a table of distances
-	 *	in kilometers.
-	 *
-	 *	Excel Function:
-	 *		CONVERT(value,fromUOM,toUOM)
-	 *
-	 *	@param	float		$value		The value in fromUOM to convert.
-	 *	@param	string		$fromUOM	The units for value.
-	 *	@param	string		$toUOM		The units for the result.
-	 *
-	 *	@return	float
-	 */
-	public static function CONVERTUOM($value, $fromUOM, $toUOM) {
-		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$fromUOM	= PHPExcel_Calculation_Functions::flattenSingleValue($fromUOM);
-		$toUOM		= PHPExcel_Calculation_Functions::flattenSingleValue($toUOM);
-
-		if (!is_numeric($value)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$fromMultiplier = 1.0;
-		if (isset(self::$_conversionUnits[$fromUOM])) {
-			$unitGroup1 = self::$_conversionUnits[$fromUOM]['Group'];
-		} else {
-			$fromMultiplier = substr($fromUOM,0,1);
-			$fromUOM = substr($fromUOM,1);
-			if (isset(self::$_conversionMultipliers[$fromMultiplier])) {
-				$fromMultiplier = self::$_conversionMultipliers[$fromMultiplier]['multiplier'];
-			} else {
-				return PHPExcel_Calculation_Functions::NA();
-			}
-			if ((isset(self::$_conversionUnits[$fromUOM])) && (self::$_conversionUnits[$fromUOM]['AllowPrefix'])) {
-				$unitGroup1 = self::$_conversionUnits[$fromUOM]['Group'];
-			} else {
-				return PHPExcel_Calculation_Functions::NA();
-			}
-		}
-		$value *= $fromMultiplier;
-
-		$toMultiplier = 1.0;
-		if (isset(self::$_conversionUnits[$toUOM])) {
-			$unitGroup2 = self::$_conversionUnits[$toUOM]['Group'];
-		} else {
-			$toMultiplier = substr($toUOM,0,1);
-			$toUOM = substr($toUOM,1);
-			if (isset(self::$_conversionMultipliers[$toMultiplier])) {
-				$toMultiplier = self::$_conversionMultipliers[$toMultiplier]['multiplier'];
-			} else {
-				return PHPExcel_Calculation_Functions::NA();
-			}
-			if ((isset(self::$_conversionUnits[$toUOM])) && (self::$_conversionUnits[$toUOM]['AllowPrefix'])) {
-				$unitGroup2 = self::$_conversionUnits[$toUOM]['Group'];
-			} else {
-				return PHPExcel_Calculation_Functions::NA();
-			}
-		}
-		if ($unitGroup1 != $unitGroup2) {
-			return PHPExcel_Calculation_Functions::NA();
-		}
-
-		if (($fromUOM == $toUOM) && ($fromMultiplier == $toMultiplier)) {
-			//	We've already factored $fromMultiplier into the value, so we need
-			//		to reverse it again
-			return $value / $fromMultiplier;
-		} elseif ($unitGroup1 == 'Temperature') {
-			if (($fromUOM == 'F') || ($fromUOM == 'fah')) {
-				if (($toUOM == 'F') || ($toUOM == 'fah')) {
-					return $value;
-				} else {
-					$value = (($value - 32) / 1.8);
-					if (($toUOM == 'K') || ($toUOM == 'kel')) {
-						$value += 273.15;
-					}
-					return $value;
-				}
-			} elseif ((($fromUOM == 'K') || ($fromUOM == 'kel')) &&
-					  (($toUOM == 'K') || ($toUOM == 'kel'))) {
-						return $value;
-			} elseif ((($fromUOM == 'C') || ($fromUOM == 'cel')) &&
-					  (($toUOM == 'C') || ($toUOM == 'cel'))) {
-					return $value;
-			}
-			if (($toUOM == 'F') || ($toUOM == 'fah')) {
-				if (($fromUOM == 'K') || ($fromUOM == 'kel')) {
-					$value -= 273.15;
-				}
-				return ($value * 1.8) + 32;
-			}
-			if (($toUOM == 'C') || ($toUOM == 'cel')) {
-				return $value - 273.15;
-			}
-			return $value + 273.15;
-		}
-		return ($value * self::$_unitConversions[$unitGroup1][$fromUOM][$toUOM]) / $toMultiplier;
-	}	//	function CONVERTUOM()
-
-}	//	class PHPExcel_Calculation_Engineering
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Exception.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Exception.php
deleted file mode 100644
index 2ddf666df8d..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Exception.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Calculation_Exception
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Exception extends PHPExcel_Exception {
-	/**
-	 * Error handler callback
-	 *
-	 * @param mixed $code
-	 * @param mixed $string
-	 * @param mixed $file
-	 * @param mixed $line
-	 * @param mixed $context
-	 */
-	public static function errorHandlerCallback($code, $string, $file, $line, $context) {
-		$e = new self($string, $code);
-		$e->line = $line;
-		$e->file = $file;
-		throw $e;
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/ExceptionHandler.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/ExceptionHandler.php
deleted file mode 100644
index 41c42d7ac70..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/ExceptionHandler.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Calculation_ExceptionHandler
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_ExceptionHandler {
-	/**
-	 * Register errorhandler
-	 */
-	public function __construct() {
-		set_error_handler(array('PHPExcel_Calculation_Exception', 'errorHandlerCallback'), E_ALL);
-	}
-
-	/**
-	 * Unregister errorhandler
-	 */
-	public function __destruct() {
-		restore_error_handler();
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Financial.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Financial.php
deleted file mode 100644
index 912a26961ae..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Financial.php
+++ /dev/null
@@ -1,2292 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/** FINANCIAL_MAX_ITERATIONS */
-define('FINANCIAL_MAX_ITERATIONS', 128);
-
-/** FINANCIAL_PRECISION */
-define('FINANCIAL_PRECISION', 1.0e-08);
-
-
-/**
- * PHPExcel_Calculation_Financial
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Financial {
-
-	/**
-	 * _lastDayOfMonth
-	 *
-	 * Returns a boolean TRUE/FALSE indicating if this date is the last date of the month
-	 *
-	 * @param	DateTime	$testDate	The date for testing
-	 * @return	boolean
-	 */
-	private static function _lastDayOfMonth($testDate)
-	{
-		return ($testDate->format('d') == $testDate->format('t'));
-	}	//	function _lastDayOfMonth()
-
-
-	/**
-	 * _firstDayOfMonth
-	 *
-	 * Returns a boolean TRUE/FALSE indicating if this date is the first date of the month
-	 *
-	 * @param	DateTime	$testDate	The date for testing
-	 * @return	boolean
-	 */
-	private static function _firstDayOfMonth($testDate)
-	{
-		return ($testDate->format('d') == 1);
-	}	//	function _firstDayOfMonth()
-
-
-	private static function _coupFirstPeriodDate($settlement, $maturity, $frequency, $next)
-	{
-		$months = 12 / $frequency;
-
-		$result = PHPExcel_Shared_Date::ExcelToPHPObject($maturity);
-		$eom = self::_lastDayOfMonth($result);
-
-		while ($settlement < PHPExcel_Shared_Date::PHPToExcel($result)) {
-			$result->modify('-'.$months.' months');
-		}
-		if ($next) {
-			$result->modify('+'.$months.' months');
-		}
-
-		if ($eom) {
-			$result->modify('-1 day');
-		}
-
-		return PHPExcel_Shared_Date::PHPToExcel($result);
-	}	//	function _coupFirstPeriodDate()
-
-
-	private static function _validFrequency($frequency)
-	{
-		if (($frequency == 1) || ($frequency == 2) || ($frequency == 4)) {
-			return true;
-		}
-		if ((PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) &&
-			(($frequency == 6) || ($frequency == 12))) {
-			return true;
-		}
-		return false;
-	}	//	function _validFrequency()
-
-
-	/**
-	 * _daysPerYear
-	 *
-	 * Returns the number of days in a specified year, as defined by the "basis" value
-	 *
-	 * @param	integer		$year	The year against which we're testing
-	 * @param   integer		$basis	The type of day count:
-	 *									0 or omitted US (NASD)	360
-	 *									1						Actual (365 or 366 in a leap year)
-	 *									2						360
-	 *									3						365
-	 *									4						European 360
-	 * @return	integer
-	 */
-	private static function _daysPerYear($year, $basis=0)
-	{
-		switch ($basis) {
-			case 0 :
-			case 2 :
-			case 4 :
-				$daysPerYear = 360;
-				break;
-			case 3 :
-				$daysPerYear = 365;
-				break;
-			case 1 :
-				$daysPerYear = (PHPExcel_Calculation_DateTime::_isLeapYear($year)) ? 366 : 365;
-				break;
-			default	:
-				return PHPExcel_Calculation_Functions::NaN();
-		}
-		return $daysPerYear;
-	}	//	function _daysPerYear()
-
-
-	private static function _interestAndPrincipal($rate=0, $per=0, $nper=0, $pv=0, $fv=0, $type=0)
-	{
-		$pmt = self::PMT($rate, $nper, $pv, $fv, $type);
-		$capital = $pv;
-		for ($i = 1; $i<= $per; ++$i) {
-			$interest = ($type && $i == 1) ? 0 : -$capital * $rate;
-			$principal = $pmt - $interest;
-			$capital += $principal;
-		}
-		return array($interest, $principal);
-	}	//	function _interestAndPrincipal()
-
-
-	/**
-	 * ACCRINT
-	 *
-	 * Returns the accrued interest for a security that pays periodic interest.
-	 *
-	 * Excel Function:
-	 *		ACCRINT(issue,firstinterest,settlement,rate,par,frequency[,basis])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	mixed	$issue			The security's issue date.
-	 * @param	mixed	$firstinterest	The security's first interest date.
-	 * @param	mixed	$settlement		The security's settlement date.
-	 *									The security settlement date is the date after the issue date
-	 *									when the security is traded to the buyer.
-	 * @param	float	$rate			The security's annual coupon rate.
-	 * @param	float	$par			The security's par value.
-	 *									If you omit par, ACCRINT uses $1,000.
-	 * @param	integer	$frequency		the number of coupon payments per year.
-	 *									Valid frequency values are:
-	 *										1	Annual
-	 *										2	Semi-Annual
-	 *										4	Quarterly
-	 *									If working in Gnumeric Mode, the following frequency options are
-	 *									also available
-	 *										6	Bimonthly
-	 *										12	Monthly
-	 * @param	integer	$basis			The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function ACCRINT($issue, $firstinterest, $settlement, $rate, $par=1000, $frequency=1, $basis=0)
-	{
-		$issue		= PHPExcel_Calculation_Functions::flattenSingleValue($issue);
-		$firstinterest	= PHPExcel_Calculation_Functions::flattenSingleValue($firstinterest);
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$rate		= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$par		= (is_null($par))		? 1000 :	PHPExcel_Calculation_Functions::flattenSingleValue($par);
-		$frequency	= (is_null($frequency))	? 1	: 		PHPExcel_Calculation_Functions::flattenSingleValue($frequency);
-		$basis		= (is_null($basis))		? 0	:		PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		//	Validate
-		if ((is_numeric($rate)) && (is_numeric($par))) {
-			$rate	= (float) $rate;
-			$par	= (float) $par;
-			if (($rate <= 0) || ($par <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$daysBetweenIssueAndSettlement = PHPExcel_Calculation_DateTime::YEARFRAC($issue, $settlement, $basis);
-			if (!is_numeric($daysBetweenIssueAndSettlement)) {
-				//	return date error
-				return $daysBetweenIssueAndSettlement;
-			}
-
-			return $par * $rate * $daysBetweenIssueAndSettlement;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function ACCRINT()
-
-
-	/**
-	 * ACCRINTM
-	 *
-	 * Returns the accrued interest for a security that pays interest at maturity.
-	 *
-	 * Excel Function:
-	 *		ACCRINTM(issue,settlement,rate[,par[,basis]])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	mixed	issue		The security's issue date.
-	 * @param	mixed	settlement	The security's settlement (or maturity) date.
-	 * @param	float	rate		The security's annual coupon rate.
-	 * @param	float	par			The security's par value.
-	 *									If you omit par, ACCRINT uses $1,000.
-	 * @param	integer	basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function ACCRINTM($issue, $settlement, $rate, $par=1000, $basis=0) {
-		$issue		= PHPExcel_Calculation_Functions::flattenSingleValue($issue);
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$rate		= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$par		= (is_null($par))	? 1000 :	PHPExcel_Calculation_Functions::flattenSingleValue($par);
-		$basis		= (is_null($basis))	? 0 :		PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		//	Validate
-		if ((is_numeric($rate)) && (is_numeric($par))) {
-			$rate	= (float) $rate;
-			$par	= (float) $par;
-			if (($rate <= 0) || ($par <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$daysBetweenIssueAndSettlement = PHPExcel_Calculation_DateTime::YEARFRAC($issue, $settlement, $basis);
-			if (!is_numeric($daysBetweenIssueAndSettlement)) {
-				//	return date error
-				return $daysBetweenIssueAndSettlement;
-			}
-			return $par * $rate * $daysBetweenIssueAndSettlement;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function ACCRINTM()
-
-
-	/**
-	 * AMORDEGRC
-	 *
-	 * Returns the depreciation for each accounting period.
-	 * This function is provided for the French accounting system. If an asset is purchased in
-	 * the middle of the accounting period, the prorated depreciation is taken into account.
-	 * The function is similar to AMORLINC, except that a depreciation coefficient is applied in
-	 * the calculation depending on the life of the assets.
-	 * This function will return the depreciation until the last period of the life of the assets
-	 * or until the cumulated value of depreciation is greater than the cost of the assets minus
-	 * the salvage value.
-	 *
-	 * Excel Function:
-	 *		AMORDEGRC(cost,purchased,firstPeriod,salvage,period,rate[,basis])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	float	cost		The cost of the asset.
-	 * @param	mixed	purchased	Date of the purchase of the asset.
-	 * @param	mixed	firstPeriod	Date of the end of the first period.
-	 * @param	mixed	salvage		The salvage value at the end of the life of the asset.
-	 * @param	float	period		The period.
-	 * @param	float	rate		Rate of depreciation.
-	 * @param	integer	basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function AMORDEGRC($cost, $purchased, $firstPeriod, $salvage, $period, $rate, $basis=0) {
-		$cost			= PHPExcel_Calculation_Functions::flattenSingleValue($cost);
-		$purchased		= PHPExcel_Calculation_Functions::flattenSingleValue($purchased);
-		$firstPeriod	= PHPExcel_Calculation_Functions::flattenSingleValue($firstPeriod);
-		$salvage		= PHPExcel_Calculation_Functions::flattenSingleValue($salvage);
-		$period			= floor(PHPExcel_Calculation_Functions::flattenSingleValue($period));
-		$rate			= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$basis			= (is_null($basis))	? 0 :	(int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		//	The depreciation coefficients are:
-		//	Life of assets (1/rate)		Depreciation coefficient
-		//	Less than 3 years			1
-		//	Between 3 and 4 years		1.5
-		//	Between 5 and 6 years		2
-		//	More than 6 years			2.5
-		$fUsePer = 1.0 / $rate;
-		if ($fUsePer < 3.0) {
-			$amortiseCoeff = 1.0;
-		} elseif ($fUsePer < 5.0) {
-			$amortiseCoeff = 1.5;
-		} elseif ($fUsePer <= 6.0) {
-			$amortiseCoeff = 2.0;
-		} else {
-			$amortiseCoeff = 2.5;
-		}
-
-		$rate *= $amortiseCoeff;
-		$fNRate = round(PHPExcel_Calculation_DateTime::YEARFRAC($purchased, $firstPeriod, $basis) * $rate * $cost,0);
-		$cost -= $fNRate;
-		$fRest = $cost - $salvage;
-
-		for ($n = 0; $n < $period; ++$n) {
-			$fNRate = round($rate * $cost,0);
-			$fRest -= $fNRate;
-
-			if ($fRest < 0.0) {
-				switch ($period - $n) {
-					case 0	:
-					case 1	: return round($cost * 0.5, 0);
-							  break;
-					default	: return 0.0;
-							  break;
-				}
-			}
-			$cost -= $fNRate;
-		}
-		return $fNRate;
-	}	//	function AMORDEGRC()
-
-
-	/**
-	 * AMORLINC
-	 *
-	 * Returns the depreciation for each accounting period.
-	 * This function is provided for the French accounting system. If an asset is purchased in
-	 * the middle of the accounting period, the prorated depreciation is taken into account.
-	 *
-	 * Excel Function:
-	 *		AMORLINC(cost,purchased,firstPeriod,salvage,period,rate[,basis])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	float	cost		The cost of the asset.
-	 * @param	mixed	purchased	Date of the purchase of the asset.
-	 * @param	mixed	firstPeriod	Date of the end of the first period.
-	 * @param	mixed	salvage		The salvage value at the end of the life of the asset.
-	 * @param	float	period		The period.
-	 * @param	float	rate		Rate of depreciation.
-	 * @param	integer	basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function AMORLINC($cost, $purchased, $firstPeriod, $salvage, $period, $rate, $basis=0) {
-		$cost			= PHPExcel_Calculation_Functions::flattenSingleValue($cost);
-		$purchased		= PHPExcel_Calculation_Functions::flattenSingleValue($purchased);
-		$firstPeriod	= PHPExcel_Calculation_Functions::flattenSingleValue($firstPeriod);
-		$salvage		= PHPExcel_Calculation_Functions::flattenSingleValue($salvage);
-		$period			= PHPExcel_Calculation_Functions::flattenSingleValue($period);
-		$rate			= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$basis			= (is_null($basis))	? 0 :	(int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		$fOneRate = $cost * $rate;
-		$fCostDelta = $cost - $salvage;
-		//	Note, quirky variation for leap years on the YEARFRAC for this function
-		$purchasedYear = PHPExcel_Calculation_DateTime::YEAR($purchased);
-		$yearFrac = PHPExcel_Calculation_DateTime::YEARFRAC($purchased, $firstPeriod, $basis);
-
-		if (($basis == 1) && ($yearFrac < 1) && (PHPExcel_Calculation_DateTime::_isLeapYear($purchasedYear))) {
-			$yearFrac *= 365 / 366;
-		}
-
-		$f0Rate = $yearFrac * $rate * $cost;
-		$nNumOfFullPeriods = intval(($cost - $salvage - $f0Rate) / $fOneRate);
-
-		if ($period == 0) {
-			return $f0Rate;
-		} elseif ($period <= $nNumOfFullPeriods) {
-			return $fOneRate;
-		} elseif ($period == ($nNumOfFullPeriods + 1)) {
-            return ($fCostDelta - $fOneRate * $nNumOfFullPeriods - $f0Rate);
-		} else {
-			return 0.0;
-		}
-	}	//	function AMORLINC()
-
-
-	/**
-	 * COUPDAYBS
-	 *
-	 * Returns the number of days from the beginning of the coupon period to the settlement date.
-	 *
-	 * Excel Function:
-	 *		COUPDAYBS(settlement,maturity,frequency[,basis])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	mixed	settlement	The security's settlement date.
-	 *								The security settlement date is the date after the issue
-	 *								date when the security is traded to the buyer.
-	 * @param	mixed	maturity	The security's maturity date.
-	 *								The maturity date is the date when the security expires.
-	 * @param	mixed	frequency	the number of coupon payments per year.
-	 *									Valid frequency values are:
-	 *										1	Annual
-	 *										2	Semi-Annual
-	 *										4	Quarterly
-	 *									If working in Gnumeric Mode, the following frequency options are
-	 *									also available
-	 *										6	Bimonthly
-	 *										12	Monthly
-	 * @param	integer		basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function COUPDAYBS($settlement, $maturity, $frequency, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$frequency	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($frequency);
-		$basis		= (is_null($basis))	? 0 :	(int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		if (is_string($settlement = PHPExcel_Calculation_DateTime::_getDateValue($settlement))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		if (is_string($maturity = PHPExcel_Calculation_DateTime::_getDateValue($maturity))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (($settlement > $maturity) ||
-			(!self::_validFrequency($frequency)) ||
-			(($basis < 0) || ($basis > 4))) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		$daysPerYear = self::_daysPerYear(PHPExcel_Calculation_DateTime::YEAR($settlement),$basis);
-		$prev = self::_coupFirstPeriodDate($settlement, $maturity, $frequency, False);
-
-		return PHPExcel_Calculation_DateTime::YEARFRAC($prev, $settlement, $basis) * $daysPerYear;
-	}	//	function COUPDAYBS()
-
-
-	/**
-	 * COUPDAYS
-	 *
-	 * Returns the number of days in the coupon period that contains the settlement date.
-	 *
-	 * Excel Function:
-	 *		COUPDAYS(settlement,maturity,frequency[,basis])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	mixed	settlement	The security's settlement date.
-	 *								The security settlement date is the date after the issue
-	 *								date when the security is traded to the buyer.
-	 * @param	mixed	maturity	The security's maturity date.
-	 *								The maturity date is the date when the security expires.
-	 * @param	mixed	frequency	the number of coupon payments per year.
-	 *									Valid frequency values are:
-	 *										1	Annual
-	 *										2	Semi-Annual
-	 *										4	Quarterly
-	 *									If working in Gnumeric Mode, the following frequency options are
-	 *									also available
-	 *										6	Bimonthly
-	 *										12	Monthly
-	 * @param	integer		basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function COUPDAYS($settlement, $maturity, $frequency, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$frequency	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($frequency);
-		$basis		= (is_null($basis))	? 0 :	(int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		if (is_string($settlement = PHPExcel_Calculation_DateTime::_getDateValue($settlement))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		if (is_string($maturity = PHPExcel_Calculation_DateTime::_getDateValue($maturity))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (($settlement > $maturity) ||
-			(!self::_validFrequency($frequency)) ||
-			(($basis < 0) || ($basis > 4))) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		switch ($basis) {
-			case 3: // Actual/365
-					return 365 / $frequency;
-			case 1: // Actual/actual
-					if ($frequency == 1) {
-						$daysPerYear = self::_daysPerYear(PHPExcel_Calculation_DateTime::YEAR($maturity),$basis);
-						return ($daysPerYear / $frequency);
-					} else {
-						$prev = self::_coupFirstPeriodDate($settlement, $maturity, $frequency, False);
-						$next = self::_coupFirstPeriodDate($settlement, $maturity, $frequency, True);
-						return ($next - $prev);
-					}
-			default: // US (NASD) 30/360, Actual/360 or European 30/360
-					return 360 / $frequency;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function COUPDAYS()
-
-
-	/**
-	 * COUPDAYSNC
-	 *
-	 * Returns the number of days from the settlement date to the next coupon date.
-	 *
-	 * Excel Function:
-	 *		COUPDAYSNC(settlement,maturity,frequency[,basis])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	mixed	settlement	The security's settlement date.
-	 *								The security settlement date is the date after the issue
-	 *								date when the security is traded to the buyer.
-	 * @param	mixed	maturity	The security's maturity date.
-	 *								The maturity date is the date when the security expires.
-	 * @param	mixed	frequency	the number of coupon payments per year.
-	 *									Valid frequency values are:
-	 *										1	Annual
-	 *										2	Semi-Annual
-	 *										4	Quarterly
-	 *									If working in Gnumeric Mode, the following frequency options are
-	 *									also available
-	 *										6	Bimonthly
-	 *										12	Monthly
-	 * @param	integer		basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function COUPDAYSNC($settlement, $maturity, $frequency, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$frequency	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($frequency);
-		$basis		= (is_null($basis))	? 0 :	(int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		if (is_string($settlement = PHPExcel_Calculation_DateTime::_getDateValue($settlement))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		if (is_string($maturity = PHPExcel_Calculation_DateTime::_getDateValue($maturity))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (($settlement > $maturity) ||
-			(!self::_validFrequency($frequency)) ||
-			(($basis < 0) || ($basis > 4))) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		$daysPerYear = self::_daysPerYear(PHPExcel_Calculation_DateTime::YEAR($settlement),$basis);
-		$next = self::_coupFirstPeriodDate($settlement, $maturity, $frequency, True);
-
-		return PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $next, $basis) * $daysPerYear;
-	}	//	function COUPDAYSNC()
-
-
-	/**
-	 * COUPNCD
-	 *
-	 * Returns the next coupon date after the settlement date.
-	 *
-	 * Excel Function:
-	 *		COUPNCD(settlement,maturity,frequency[,basis])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	mixed	settlement	The security's settlement date.
-	 *								The security settlement date is the date after the issue
-	 *								date when the security is traded to the buyer.
-	 * @param	mixed	maturity	The security's maturity date.
-	 *								The maturity date is the date when the security expires.
-	 * @param	mixed	frequency	the number of coupon payments per year.
-	 *									Valid frequency values are:
-	 *										1	Annual
-	 *										2	Semi-Annual
-	 *										4	Quarterly
-	 *									If working in Gnumeric Mode, the following frequency options are
-	 *									also available
-	 *										6	Bimonthly
-	 *										12	Monthly
-	 * @param	integer		basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-	 *						depending on the value of the ReturnDateType flag
-	 */
-	public static function COUPNCD($settlement, $maturity, $frequency, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$frequency	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($frequency);
-		$basis		= (is_null($basis))	? 0 :	(int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		if (is_string($settlement = PHPExcel_Calculation_DateTime::_getDateValue($settlement))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		if (is_string($maturity = PHPExcel_Calculation_DateTime::_getDateValue($maturity))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (($settlement > $maturity) ||
-			(!self::_validFrequency($frequency)) ||
-			(($basis < 0) || ($basis > 4))) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		return self::_coupFirstPeriodDate($settlement, $maturity, $frequency, True);
-	}	//	function COUPNCD()
-
-
-	/**
-	 * COUPNUM
-	 *
-	 * Returns the number of coupons payable between the settlement date and maturity date,
-	 * rounded up to the nearest whole coupon.
-	 *
-	 * Excel Function:
-	 *		COUPNUM(settlement,maturity,frequency[,basis])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	mixed	settlement	The security's settlement date.
-	 *								The security settlement date is the date after the issue
-	 *								date when the security is traded to the buyer.
-	 * @param	mixed	maturity	The security's maturity date.
-	 *								The maturity date is the date when the security expires.
-	 * @param	mixed	frequency	the number of coupon payments per year.
-	 *									Valid frequency values are:
-	 *										1	Annual
-	 *										2	Semi-Annual
-	 *										4	Quarterly
-	 *									If working in Gnumeric Mode, the following frequency options are
-	 *									also available
-	 *										6	Bimonthly
-	 *										12	Monthly
-	 * @param	integer		basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	integer
-	 */
-	public static function COUPNUM($settlement, $maturity, $frequency, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$frequency	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($frequency);
-		$basis		= (is_null($basis))	? 0 :	(int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		if (is_string($settlement = PHPExcel_Calculation_DateTime::_getDateValue($settlement))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		if (is_string($maturity = PHPExcel_Calculation_DateTime::_getDateValue($maturity))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (($settlement > $maturity) ||
-			(!self::_validFrequency($frequency)) ||
-			(($basis < 0) || ($basis > 4))) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		$settlement = self::_coupFirstPeriodDate($settlement, $maturity, $frequency, True);
-		$daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity, $basis) * 365;
-
-		switch ($frequency) {
-			case 1: // annual payments
-					return ceil($daysBetweenSettlementAndMaturity / 360);
-			case 2: // half-yearly
-					return ceil($daysBetweenSettlementAndMaturity / 180);
-			case 4: // quarterly
-					return ceil($daysBetweenSettlementAndMaturity / 90);
-			case 6: // bimonthly
-					return ceil($daysBetweenSettlementAndMaturity / 60);
-			case 12: // monthly
-					return ceil($daysBetweenSettlementAndMaturity / 30);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function COUPNUM()
-
-
-	/**
-	 * COUPPCD
-	 *
-	 * Returns the previous coupon date before the settlement date.
-	 *
-	 * Excel Function:
-	 *		COUPPCD(settlement,maturity,frequency[,basis])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	mixed	settlement	The security's settlement date.
-	 *								The security settlement date is the date after the issue
-	 *								date when the security is traded to the buyer.
-	 * @param	mixed	maturity	The security's maturity date.
-	 *								The maturity date is the date when the security expires.
-	 * @param	mixed	frequency	the number of coupon payments per year.
-	 *									Valid frequency values are:
-	 *										1	Annual
-	 *										2	Semi-Annual
-	 *										4	Quarterly
-	 *									If working in Gnumeric Mode, the following frequency options are
-	 *									also available
-	 *										6	Bimonthly
-	 *										12	Monthly
-	 * @param	integer		basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-	 *						depending on the value of the ReturnDateType flag
-	 */
-	public static function COUPPCD($settlement, $maturity, $frequency, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$frequency	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($frequency);
-		$basis		= (is_null($basis))	? 0 :	(int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		if (is_string($settlement = PHPExcel_Calculation_DateTime::_getDateValue($settlement))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		if (is_string($maturity = PHPExcel_Calculation_DateTime::_getDateValue($maturity))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (($settlement > $maturity) ||
-			(!self::_validFrequency($frequency)) ||
-			(($basis < 0) || ($basis > 4))) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		return self::_coupFirstPeriodDate($settlement, $maturity, $frequency, False);
-	}	//	function COUPPCD()
-
-
-	/**
-	 * CUMIPMT
-	 *
-	 * Returns the cumulative interest paid on a loan between the start and end periods.
-	 *
-	 * Excel Function:
-	 *		CUMIPMT(rate,nper,pv,start,end[,type])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	float	$rate	The Interest rate
-	 * @param	integer	$nper	The total number of payment periods
-	 * @param	float	$pv		Present Value
-	 * @param	integer	$start	The first period in the calculation.
-	 *							Payment periods are numbered beginning with 1.
-	 * @param	integer	$end	The last period in the calculation.
-	 * @param	integer	$type	A number 0 or 1 and indicates when payments are due:
-	 *								0 or omitted	At the end of the period.
-	 *								1				At the beginning of the period.
-	 * @return	float
-	 */
-	public static function CUMIPMT($rate, $nper, $pv, $start, $end, $type = 0) {
-		$rate	= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$nper	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($nper);
-		$pv		= PHPExcel_Calculation_Functions::flattenSingleValue($pv);
-		$start	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($start);
-		$end	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($end);
-		$type	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($type);
-
-		// Validate parameters
-		if ($type != 0 && $type != 1) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		if ($start < 1 || $start > $end) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		// Calculate
-		$interest = 0;
-		for ($per = $start; $per <= $end; ++$per) {
-			$interest += self::IPMT($rate, $per, $nper, $pv, 0, $type);
-		}
-
-		return $interest;
-	}	//	function CUMIPMT()
-
-
-	/**
-	 * CUMPRINC
-	 *
-	 * Returns the cumulative principal paid on a loan between the start and end periods.
-	 *
-	 * Excel Function:
-	 *		CUMPRINC(rate,nper,pv,start,end[,type])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	float	$rate	The Interest rate
-	 * @param	integer	$nper	The total number of payment periods
-	 * @param	float	$pv		Present Value
-	 * @param	integer	$start	The first period in the calculation.
-	 *							Payment periods are numbered beginning with 1.
-	 * @param	integer	$end	The last period in the calculation.
-	 * @param	integer	$type	A number 0 or 1 and indicates when payments are due:
-	 *								0 or omitted	At the end of the period.
-	 *								1				At the beginning of the period.
-	 * @return	float
-	 */
-	public static function CUMPRINC($rate, $nper, $pv, $start, $end, $type = 0) {
-		$rate	= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$nper	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($nper);
-		$pv		= PHPExcel_Calculation_Functions::flattenSingleValue($pv);
-		$start	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($start);
-		$end	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($end);
-		$type	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($type);
-
-		// Validate parameters
-		if ($type != 0 && $type != 1) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		if ($start < 1 || $start > $end) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		// Calculate
-		$principal = 0;
-		for ($per = $start; $per <= $end; ++$per) {
-			$principal += self::PPMT($rate, $per, $nper, $pv, 0, $type);
-		}
-
-		return $principal;
-	}	//	function CUMPRINC()
-
-
-	/**
-	 * DB
-	 *
-	 * Returns the depreciation of an asset for a specified period using the
-	 * fixed-declining balance method.
-	 * This form of depreciation is used if you want to get a higher depreciation value
-	 * at the beginning of the depreciation (as opposed to linear depreciation). The
-	 * depreciation value is reduced with every depreciation period by the depreciation
-	 * already deducted from the initial cost.
-	 *
-	 * Excel Function:
-	 *		DB(cost,salvage,life,period[,month])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	float	cost		Initial cost of the asset.
-	 * @param	float	salvage		Value at the end of the depreciation.
-	 *								(Sometimes called the salvage value of the asset)
-	 * @param	integer	life		Number of periods over which the asset is depreciated.
-	 *								(Sometimes called the useful life of the asset)
-	 * @param	integer	period		The period for which you want to calculate the
-	 *								depreciation. Period must use the same units as life.
-	 * @param	integer	month		Number of months in the first year. If month is omitted,
-	 *								it defaults to 12.
-	 * @return	float
-	 */
-	public static function DB($cost, $salvage, $life, $period, $month=12) {
-		$cost		= PHPExcel_Calculation_Functions::flattenSingleValue($cost);
-		$salvage	= PHPExcel_Calculation_Functions::flattenSingleValue($salvage);
-		$life		= PHPExcel_Calculation_Functions::flattenSingleValue($life);
-		$period		= PHPExcel_Calculation_Functions::flattenSingleValue($period);
-		$month		= PHPExcel_Calculation_Functions::flattenSingleValue($month);
-
-		//	Validate
-		if ((is_numeric($cost)) && (is_numeric($salvage)) && (is_numeric($life)) && (is_numeric($period)) && (is_numeric($month))) {
-			$cost		= (float) $cost;
-			$salvage	= (float) $salvage;
-			$life		= (int) $life;
-			$period		= (int) $period;
-			$month		= (int) $month;
-			if ($cost == 0) {
-				return 0.0;
-			} elseif (($cost < 0) || (($salvage / $cost) < 0) || ($life <= 0) || ($period < 1) || ($month < 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			//	Set Fixed Depreciation Rate
-			$fixedDepreciationRate = 1 - pow(($salvage / $cost), (1 / $life));
-			$fixedDepreciationRate = round($fixedDepreciationRate, 3);
-
-			//	Loop through each period calculating the depreciation
-			$previousDepreciation = 0;
-			for ($per = 1; $per <= $period; ++$per) {
-				if ($per == 1) {
-					$depreciation = $cost * $fixedDepreciationRate * $month / 12;
-				} elseif ($per == ($life + 1)) {
-					$depreciation = ($cost - $previousDepreciation) * $fixedDepreciationRate * (12 - $month) / 12;
-				} else {
-					$depreciation = ($cost - $previousDepreciation) * $fixedDepreciationRate;
-				}
-				$previousDepreciation += $depreciation;
-			}
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
-				$depreciation = round($depreciation,2);
-			}
-			return $depreciation;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function DB()
-
-
-	/**
-	 * DDB
-	 *
-	 * Returns the depreciation of an asset for a specified period using the
-	 * double-declining balance method or some other method you specify.
-	 *
-	 * Excel Function:
-	 *		DDB(cost,salvage,life,period[,factor])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	float	cost		Initial cost of the asset.
-	 * @param	float	salvage		Value at the end of the depreciation.
-	 *								(Sometimes called the salvage value of the asset)
-	 * @param	integer	life		Number of periods over which the asset is depreciated.
-	 *								(Sometimes called the useful life of the asset)
-	 * @param	integer	period		The period for which you want to calculate the
-	 *								depreciation. Period must use the same units as life.
-	 * @param	float	factor		The rate at which the balance declines.
-	 *								If factor is omitted, it is assumed to be 2 (the
-	 *								double-declining balance method).
-	 * @return	float
-	 */
-	public static function DDB($cost, $salvage, $life, $period, $factor=2.0) {
-		$cost		= PHPExcel_Calculation_Functions::flattenSingleValue($cost);
-		$salvage	= PHPExcel_Calculation_Functions::flattenSingleValue($salvage);
-		$life		= PHPExcel_Calculation_Functions::flattenSingleValue($life);
-		$period		= PHPExcel_Calculation_Functions::flattenSingleValue($period);
-		$factor		= PHPExcel_Calculation_Functions::flattenSingleValue($factor);
-
-		//	Validate
-		if ((is_numeric($cost)) && (is_numeric($salvage)) && (is_numeric($life)) && (is_numeric($period)) && (is_numeric($factor))) {
-			$cost		= (float) $cost;
-			$salvage	= (float) $salvage;
-			$life		= (int) $life;
-			$period		= (int) $period;
-			$factor		= (float) $factor;
-			if (($cost <= 0) || (($salvage / $cost) < 0) || ($life <= 0) || ($period < 1) || ($factor <= 0.0) || ($period > $life)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			//	Set Fixed Depreciation Rate
-			$fixedDepreciationRate = 1 - pow(($salvage / $cost), (1 / $life));
-			$fixedDepreciationRate = round($fixedDepreciationRate, 3);
-
-			//	Loop through each period calculating the depreciation
-			$previousDepreciation = 0;
-			for ($per = 1; $per <= $period; ++$per) {
-				$depreciation = min( ($cost - $previousDepreciation) * ($factor / $life), ($cost - $salvage - $previousDepreciation) );
-				$previousDepreciation += $depreciation;
-			}
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
-				$depreciation = round($depreciation,2);
-			}
-			return $depreciation;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function DDB()
-
-
-	/**
-	 * DISC
-	 *
-	 * Returns the discount rate for a security.
-	 *
-	 * Excel Function:
-	 *		DISC(settlement,maturity,price,redemption[,basis])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	mixed	settlement	The security's settlement date.
-	 *								The security settlement date is the date after the issue
-	 *								date when the security is traded to the buyer.
-	 * @param	mixed	maturity	The security's maturity date.
-	 *								The maturity date is the date when the security expires.
-	 * @param	integer	price		The security's price per $100 face value.
-	 * @param	integer	redemption	The security's redemption value per $100 face value.
-	 * @param	integer	basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function DISC($settlement, $maturity, $price, $redemption, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$price		= PHPExcel_Calculation_Functions::flattenSingleValue($price);
-		$redemption	= PHPExcel_Calculation_Functions::flattenSingleValue($redemption);
-		$basis		= PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		//	Validate
-		if ((is_numeric($price)) && (is_numeric($redemption)) && (is_numeric($basis))) {
-			$price		= (float) $price;
-			$redemption	= (float) $redemption;
-			$basis		= (int) $basis;
-			if (($price <= 0) || ($redemption <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity, $basis);
-			if (!is_numeric($daysBetweenSettlementAndMaturity)) {
-				//	return date error
-				return $daysBetweenSettlementAndMaturity;
-			}
-
-			return ((1 - $price / $redemption) / $daysBetweenSettlementAndMaturity);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function DISC()
-
-
-	/**
-	 * DOLLARDE
-	 *
-	 * Converts a dollar price expressed as an integer part and a fraction
-	 *		part into a dollar price expressed as a decimal number.
-	 * Fractional dollar numbers are sometimes used for security prices.
-	 *
-	 * Excel Function:
-	 *		DOLLARDE(fractional_dollar,fraction)
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	float	$fractional_dollar	Fractional Dollar
-	 * @param	integer	$fraction			Fraction
-	 * @return	float
-	 */
-	public static function DOLLARDE($fractional_dollar = Null, $fraction = 0) {
-		$fractional_dollar	= PHPExcel_Calculation_Functions::flattenSingleValue($fractional_dollar);
-		$fraction			= (int)PHPExcel_Calculation_Functions::flattenSingleValue($fraction);
-
-		// Validate parameters
-		if (is_null($fractional_dollar) || $fraction < 0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		if ($fraction == 0) {
-			return PHPExcel_Calculation_Functions::DIV0();
-		}
-
-		$dollars = floor($fractional_dollar);
-		$cents = fmod($fractional_dollar,1);
-		$cents /= $fraction;
-		$cents *= pow(10,ceil(log10($fraction)));
-		return $dollars + $cents;
-	}	//	function DOLLARDE()
-
-
-	/**
-	 * DOLLARFR
-	 *
-	 * Converts a dollar price expressed as a decimal number into a dollar price
-	 *		expressed as a fraction.
-	 * Fractional dollar numbers are sometimes used for security prices.
-	 *
-	 * Excel Function:
-	 *		DOLLARFR(decimal_dollar,fraction)
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	float	$decimal_dollar		Decimal Dollar
-	 * @param	integer	$fraction			Fraction
-	 * @return	float
-	 */
-	public static function DOLLARFR($decimal_dollar = Null, $fraction = 0) {
-		$decimal_dollar	= PHPExcel_Calculation_Functions::flattenSingleValue($decimal_dollar);
-		$fraction		= (int)PHPExcel_Calculation_Functions::flattenSingleValue($fraction);
-
-		// Validate parameters
-		if (is_null($decimal_dollar) || $fraction < 0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		if ($fraction == 0) {
-			return PHPExcel_Calculation_Functions::DIV0();
-		}
-
-		$dollars = floor($decimal_dollar);
-		$cents = fmod($decimal_dollar,1);
-		$cents *= $fraction;
-		$cents *= pow(10,-ceil(log10($fraction)));
-		return $dollars + $cents;
-	}	//	function DOLLARFR()
-
-
-	/**
-	 * EFFECT
-	 *
-	 * Returns the effective interest rate given the nominal rate and the number of
-	 *		compounding payments per year.
-	 *
-	 * Excel Function:
-	 *		EFFECT(nominal_rate,npery)
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	float	$nominal_rate		Nominal interest rate
-	 * @param	integer	$npery				Number of compounding payments per year
-	 * @return	float
-	 */
-	public static function EFFECT($nominal_rate = 0, $npery = 0) {
-		$nominal_rate	= PHPExcel_Calculation_Functions::flattenSingleValue($nominal_rate);
-		$npery			= (int)PHPExcel_Calculation_Functions::flattenSingleValue($npery);
-
-		// Validate parameters
-		if ($nominal_rate <= 0 || $npery < 1) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		return pow((1 + $nominal_rate / $npery), $npery) - 1;
-	}	//	function EFFECT()
-
-
-	/**
-	 * FV
-	 *
-	 * Returns the Future Value of a cash flow with constant payments and interest rate (annuities).
-	 *
-	 * Excel Function:
-	 *		FV(rate,nper,pmt[,pv[,type]])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	float	$rate	The interest rate per period
-	 * @param	int		$nper	Total number of payment periods in an annuity
-	 * @param	float	$pmt	The payment made each period: it cannot change over the
-	 *							life of the annuity. Typically, pmt contains principal
-	 *							and interest but no other fees or taxes.
-	 * @param	float	$pv		Present Value, or the lump-sum amount that a series of
-	 *							future payments is worth right now.
-	 * @param	integer	$type	A number 0 or 1 and indicates when payments are due:
-	 *								0 or omitted	At the end of the period.
-	 *								1				At the beginning of the period.
-	 * @return	float
-	 */
-	public static function FV($rate = 0, $nper = 0, $pmt = 0, $pv = 0, $type = 0) {
-		$rate	= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$nper	= PHPExcel_Calculation_Functions::flattenSingleValue($nper);
-		$pmt	= PHPExcel_Calculation_Functions::flattenSingleValue($pmt);
-		$pv		= PHPExcel_Calculation_Functions::flattenSingleValue($pv);
-		$type	= PHPExcel_Calculation_Functions::flattenSingleValue($type);
-
-		// Validate parameters
-		if ($type != 0 && $type != 1) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		// Calculate
-		if (!is_null($rate) && $rate != 0) {
-			return -$pv * pow(1 + $rate, $nper) - $pmt * (1 + $rate * $type) * (pow(1 + $rate, $nper) - 1) / $rate;
-		} else {
-			return -$pv - $pmt * $nper;
-		}
-	}	//	function FV()
-
-
-	/**
-	 * FVSCHEDULE
-	 *
-	 * Returns the future value of an initial principal after applying a series of compound interest rates.
-	 * Use FVSCHEDULE to calculate the future value of an investment with a variable or adjustable rate.
-	 *
-	 * Excel Function:
-	 *		FVSCHEDULE(principal,schedule)
-	 *
-	 * @param	float	$principal	The present value.
-	 * @param	float[]	$schedule	An array of interest rates to apply.
-	 * @return	float
-	 */
-	public static function FVSCHEDULE($principal, $schedule) {
-		$principal	= PHPExcel_Calculation_Functions::flattenSingleValue($principal);
-		$schedule	= PHPExcel_Calculation_Functions::flattenArray($schedule);
-
-		foreach($schedule as $rate) {
-			$principal *= 1 + $rate;
-		}
-
-		return $principal;
-	}	//	function FVSCHEDULE()
-
-
-	/**
-	 * INTRATE
-	 *
-	 * Returns the interest rate for a fully invested security.
-	 *
-	 * Excel Function:
-	 *		INTRATE(settlement,maturity,investment,redemption[,basis])
-	 *
-	 * @param	mixed	$settlement	The security's settlement date.
-	 *								The security settlement date is the date after the issue date when the security is traded to the buyer.
-	 * @param	mixed	$maturity	The security's maturity date.
-	 *								The maturity date is the date when the security expires.
-	 * @param	integer	$investment	The amount invested in the security.
-	 * @param	integer	$redemption	The amount to be received at maturity.
-	 * @param	integer	$basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function INTRATE($settlement, $maturity, $investment, $redemption, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$investment	= PHPExcel_Calculation_Functions::flattenSingleValue($investment);
-		$redemption	= PHPExcel_Calculation_Functions::flattenSingleValue($redemption);
-		$basis		= PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		//	Validate
-		if ((is_numeric($investment)) && (is_numeric($redemption)) && (is_numeric($basis))) {
-			$investment	= (float) $investment;
-			$redemption	= (float) $redemption;
-			$basis		= (int) $basis;
-			if (($investment <= 0) || ($redemption <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity, $basis);
-			if (!is_numeric($daysBetweenSettlementAndMaturity)) {
-				//	return date error
-				return $daysBetweenSettlementAndMaturity;
-			}
-
-			return (($redemption / $investment) - 1) / ($daysBetweenSettlementAndMaturity);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function INTRATE()
-
-
-	/**
-	 * IPMT
-	 *
-	 * Returns the interest payment for a given period for an investment based on periodic, constant payments and a constant interest rate.
-	 *
-	 * Excel Function:
-	 *		IPMT(rate,per,nper,pv[,fv][,type])
-	 *
-	 * @param	float	$rate	Interest rate per period
-	 * @param	int		$per	Period for which we want to find the interest
-	 * @param	int		$nper	Number of periods
-	 * @param	float	$pv		Present Value
-	 * @param	float	$fv		Future Value
-	 * @param	int		$type	Payment type: 0 = at the end of each period, 1 = at the beginning of each period
-	 * @return	float
-	 */
-	public static function IPMT($rate, $per, $nper, $pv, $fv = 0, $type = 0) {
-		$rate	= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$per	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($per);
-		$nper	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($nper);
-		$pv		= PHPExcel_Calculation_Functions::flattenSingleValue($pv);
-		$fv		= PHPExcel_Calculation_Functions::flattenSingleValue($fv);
-		$type	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($type);
-
-		// Validate parameters
-		if ($type != 0 && $type != 1) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		if ($per <= 0 || $per > $nper) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		// Calculate
-		$interestAndPrincipal = self::_interestAndPrincipal($rate, $per, $nper, $pv, $fv, $type);
-		return $interestAndPrincipal[0];
-	}	//	function IPMT()
-
-	/**
-	 * IRR
-	 *
-	 * Returns the internal rate of return for a series of cash flows represented by the numbers in values. 
-	 * These cash flows do not have to be even, as they would be for an annuity. However, the cash flows must occur 
-	 * at regular intervals, such as monthly or annually. The internal rate of return is the interest rate received
-	 * for an investment consisting of payments (negative values) and income (positive values) that occur at regular 
-	 * periods.
-	 *
-	 * Excel Function:
-	 *		IRR(values[,guess])
-	 *
-	 * @param	float[]	$values		An array or a reference to cells that contain numbers for which you want
-	 *									to calculate the internal rate of return.
-	 *								Values must contain at least one positive value and one negative value to 
-	 *									calculate the internal rate of return.
-	 * @param	float	$guess		A number that you guess is close to the result of IRR
-	 * @return	float
-	 */
-	public static function IRR($values, $guess = 0.1) {
-		if (!is_array($values)) return PHPExcel_Calculation_Functions::VALUE();
-		$values = PHPExcel_Calculation_Functions::flattenArray($values);
-		$guess = PHPExcel_Calculation_Functions::flattenSingleValue($guess);
-
-		// create an initial range, with a root somewhere between 0 and guess
-		$x1 = 0.0;
-		$x2 = $guess;
-		$f1 = self::NPV($x1, $values);
-		$f2 = self::NPV($x2, $values);
-		for ($i = 0; $i < FINANCIAL_MAX_ITERATIONS; ++$i) {
-			if (($f1 * $f2) < 0.0) break;
-			if (abs($f1) < abs($f2)) {
-				$f1 = self::NPV($x1 += 1.6 * ($x1 - $x2), $values);
-			} else {
-				$f2 = self::NPV($x2 += 1.6 * ($x2 - $x1), $values);
-			}
-		}
-		if (($f1 * $f2) > 0.0) return PHPExcel_Calculation_Functions::VALUE();
-
-		$f = self::NPV($x1, $values);
-		if ($f < 0.0) {
-			$rtb = $x1;
-			$dx = $x2 - $x1;
-		} else {
-			$rtb = $x2;
-			$dx = $x1 - $x2;
-		}
-
-		for ($i = 0;  $i < FINANCIAL_MAX_ITERATIONS; ++$i) {
-			$dx *= 0.5;
-			$x_mid = $rtb + $dx;
-			$f_mid = self::NPV($x_mid, $values);
-			if ($f_mid <= 0.0) 
-				$rtb = $x_mid;
-			if ((abs($f_mid) < FINANCIAL_PRECISION) || (abs($dx) < FINANCIAL_PRECISION)) 
-				return $x_mid;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function IRR()
-
-
-	/**
-	 * ISPMT
-	 *
-	 * Returns the interest payment for an investment based on an interest rate and a constant payment schedule.
-	 *
-	 * Excel Function:
-	 *     =ISPMT(interest_rate, period, number_payments, PV)
-	 *
-	 * interest_rate is the interest rate for the investment
-	 *
-	 * period is the period to calculate the interest rate.  It must be betweeen 1 and number_payments.
-	 *
-	 * number_payments is the number of payments for the annuity
-	 *
-	 * PV is the loan amount or present value of the payments
-	 */
-	public static function ISPMT() {
-		// Return value
-		$returnValue = 0;
-
-		// Get the parameters
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		$interestRate = array_shift($aArgs);
-		$period = array_shift($aArgs);
-		$numberPeriods = array_shift($aArgs);
-		$principleRemaining = array_shift($aArgs);
-
-		// Calculate
-		$principlePayment = ($principleRemaining * 1.0) / ($numberPeriods * 1.0);
-		for($i=0; $i <= $period; ++$i) {
-			$returnValue = $interestRate * $principleRemaining * -1;
-			$principleRemaining -= $principlePayment;
-			// principle needs to be 0 after the last payment, don't let floating point screw it up
-			if($i == $numberPeriods) {
-				$returnValue = 0;
-			}
-		}
-		return($returnValue);
-	}	//	function ISPMT()
-
-
-	/**
-	 * MIRR
-	 *
-	 * Returns the modified internal rate of return for a series of periodic cash flows. MIRR considers both 
-	 *		the cost of the investment and the interest received on reinvestment of cash.
-	 *
-	 * Excel Function:
-	 *		MIRR(values,finance_rate, reinvestment_rate)
-	 *
-	 * @param	float[]	$values				An array or a reference to cells that contain a series of payments and
-	 *											income occurring at regular intervals.
-	 *										Payments are negative value, income is positive values.
-	 * @param	float	$finance_rate		The interest rate you pay on the money used in the cash flows
-	 * @param	float	$reinvestment_rate	The interest rate you receive on the cash flows as you reinvest them
-	 * @return	float
-	 */
-	public static function MIRR($values, $finance_rate, $reinvestment_rate) {
-		if (!is_array($values)) return PHPExcel_Calculation_Functions::VALUE();
-		$values				= PHPExcel_Calculation_Functions::flattenArray($values);
-		$finance_rate		= PHPExcel_Calculation_Functions::flattenSingleValue($finance_rate);
-		$reinvestment_rate	= PHPExcel_Calculation_Functions::flattenSingleValue($reinvestment_rate);
-		$n = count($values);
-
-		$rr = 1.0 + $reinvestment_rate;
-		$fr = 1.0 + $finance_rate;
-
-		$npv_pos = $npv_neg = 0.0;
-		foreach($values as $i => $v) {
-			if ($v >= 0) {
-				$npv_pos += $v / pow($rr, $i);
-			} else {
-				$npv_neg += $v / pow($fr, $i);
-			}
-		}
-
-		if (($npv_neg == 0) || ($npv_pos == 0) || ($reinvestment_rate <= -1)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		$mirr = pow((-$npv_pos * pow($rr, $n))
-				/ ($npv_neg * ($rr)), (1.0 / ($n - 1))) - 1.0;
-
-		return (is_finite($mirr) ? $mirr : PHPExcel_Calculation_Functions::VALUE());
-	}	//	function MIRR()
-
-
-	/**
-	 * NOMINAL
-	 *
-	 * Returns the nominal interest rate given the effective rate and the number of compounding payments per year.
-	 *
-	 * @param	float	$effect_rate	Effective interest rate
-	 * @param	int		$npery			Number of compounding payments per year
-	 * @return	float
-	 */
-	public static function NOMINAL($effect_rate = 0, $npery = 0) {
-		$effect_rate	= PHPExcel_Calculation_Functions::flattenSingleValue($effect_rate);
-		$npery			= (int)PHPExcel_Calculation_Functions::flattenSingleValue($npery);
-
-		// Validate parameters
-		if ($effect_rate <= 0 || $npery < 1) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		// Calculate
-		return $npery * (pow($effect_rate + 1, 1 / $npery) - 1);
-	}	//	function NOMINAL()
-
-
-	/**
-	 * NPER
-	 *
-	 * Returns the number of periods for a cash flow with constant periodic payments (annuities), and interest rate.
-	 *
-	 * @param	float	$rate	Interest rate per period
-	 * @param	int		$pmt	Periodic payment (annuity)
-	 * @param	float	$pv		Present Value
-	 * @param	float	$fv		Future Value
-	 * @param	int		$type	Payment type: 0 = at the end of each period, 1 = at the beginning of each period
-	 * @return	float
-	 */
-	public static function NPER($rate = 0, $pmt = 0, $pv = 0, $fv = 0, $type = 0) {
-		$rate	= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$pmt	= PHPExcel_Calculation_Functions::flattenSingleValue($pmt);
-		$pv		= PHPExcel_Calculation_Functions::flattenSingleValue($pv);
-		$fv		= PHPExcel_Calculation_Functions::flattenSingleValue($fv);
-		$type	= PHPExcel_Calculation_Functions::flattenSingleValue($type);
-
-		// Validate parameters
-		if ($type != 0 && $type != 1) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		// Calculate
-		if (!is_null($rate) && $rate != 0) {
-			if ($pmt == 0 && $pv == 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return log(($pmt * (1 + $rate * $type) / $rate - $fv) / ($pv + $pmt * (1 + $rate * $type) / $rate)) / log(1 + $rate);
-		} else {
-			if ($pmt == 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return (-$pv -$fv) / $pmt;
-		}
-	}	//	function NPER()
-
-	/**
-	 * NPV
-	 *
-	 * Returns the Net Present Value of a cash flow series given a discount rate.
-	 *
-	 * @return	float
-	 */
-	public static function NPV() {
-		// Return value
-		$returnValue = 0;
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-
-		// Calculate
-		$rate = array_shift($aArgs);
-		for ($i = 1; $i <= count($aArgs); ++$i) {
-			// Is it a numeric value?
-			if (is_numeric($aArgs[$i - 1])) {
-				$returnValue += $aArgs[$i - 1] / pow(1 + $rate, $i);
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function NPV()
-
-	/**
-	 * PMT
-	 *
-	 * Returns the constant payment (annuity) for a cash flow with a constant interest rate.
-	 *
-	 * @param	float	$rate	Interest rate per period
-	 * @param	int		$nper	Number of periods
-	 * @param	float	$pv		Present Value
-	 * @param	float	$fv		Future Value
-	 * @param	int		$type	Payment type: 0 = at the end of each period, 1 = at the beginning of each period
-	 * @return	float
-	 */
-	public static function PMT($rate = 0, $nper = 0, $pv = 0, $fv = 0, $type = 0) {
-		$rate	= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$nper	= PHPExcel_Calculation_Functions::flattenSingleValue($nper);
-		$pv		= PHPExcel_Calculation_Functions::flattenSingleValue($pv);
-		$fv		= PHPExcel_Calculation_Functions::flattenSingleValue($fv);
-		$type	= PHPExcel_Calculation_Functions::flattenSingleValue($type);
-
-		// Validate parameters
-		if ($type != 0 && $type != 1) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		// Calculate
-		if (!is_null($rate) && $rate != 0) {
-			return (-$fv - $pv * pow(1 + $rate, $nper)) / (1 + $rate * $type) / ((pow(1 + $rate, $nper) - 1) / $rate);
-		} else {
-			return (-$pv - $fv) / $nper;
-		}
-	}	//	function PMT()
-
-
-	/**
-	 * PPMT
-	 *
-	 * Returns the interest payment for a given period for an investment based on periodic, constant payments and a constant interest rate.
-	 *
-	 * @param	float	$rate	Interest rate per period
-	 * @param	int		$per	Period for which we want to find the interest
-	 * @param	int		$nper	Number of periods
-	 * @param	float	$pv		Present Value
-	 * @param	float	$fv		Future Value
-	 * @param	int		$type	Payment type: 0 = at the end of each period, 1 = at the beginning of each period
-	 * @return	float
-	 */
-	public static function PPMT($rate, $per, $nper, $pv, $fv = 0, $type = 0) {
-		$rate	= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$per	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($per);
-		$nper	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($nper);
-		$pv		= PHPExcel_Calculation_Functions::flattenSingleValue($pv);
-		$fv		= PHPExcel_Calculation_Functions::flattenSingleValue($fv);
-		$type	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($type);
-
-		// Validate parameters
-		if ($type != 0 && $type != 1) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		if ($per <= 0 || $per > $nper) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		// Calculate
-		$interestAndPrincipal = self::_interestAndPrincipal($rate, $per, $nper, $pv, $fv, $type);
-		return $interestAndPrincipal[1];
-	}	//	function PPMT()
-
-
-	public static function PRICE($settlement, $maturity, $rate, $yield, $redemption, $frequency, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$rate		= (float) PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$yield		= (float) PHPExcel_Calculation_Functions::flattenSingleValue($yield);
-		$redemption	= (float) PHPExcel_Calculation_Functions::flattenSingleValue($redemption);
-		$frequency	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($frequency);
-		$basis		= (is_null($basis))	? 0 :	(int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		if (is_string($settlement = PHPExcel_Calculation_DateTime::_getDateValue($settlement))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		if (is_string($maturity = PHPExcel_Calculation_DateTime::_getDateValue($maturity))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (($settlement > $maturity) ||
-			(!self::_validFrequency($frequency)) ||
-			(($basis < 0) || ($basis > 4))) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		$dsc = self::COUPDAYSNC($settlement, $maturity, $frequency, $basis);
-		$e = self::COUPDAYS($settlement, $maturity, $frequency, $basis);
-		$n = self::COUPNUM($settlement, $maturity, $frequency, $basis);
-		$a = self::COUPDAYBS($settlement, $maturity, $frequency, $basis);
-
-		$baseYF	= 1.0 + ($yield / $frequency);
-		$rfp	= 100 * ($rate / $frequency);
-		$de	= $dsc / $e;
-
-		$result = $redemption / pow($baseYF, (--$n + $de));
-		for($k = 0; $k <= $n; ++$k) {
-			$result += $rfp / (pow($baseYF, ($k + $de)));
-		}
-		$result -= $rfp * ($a / $e);
-
-		return $result;
-	}	//	function PRICE()
-
-
-	/**
-	 * PRICEDISC
-	 *
-	 * Returns the price per $100 face value of a discounted security.
-	 *
-	 * @param	mixed	settlement	The security's settlement date.
-	 *								The security settlement date is the date after the issue date when the security is traded to the buyer.
-	 * @param	mixed	maturity	The security's maturity date.
-	 *								The maturity date is the date when the security expires.
-	 * @param	int		discount	The security's discount rate.
-	 * @param	int		redemption	The security's redemption value per $100 face value.
-	 * @param	int		basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function PRICEDISC($settlement, $maturity, $discount, $redemption, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$discount	= (float) PHPExcel_Calculation_Functions::flattenSingleValue($discount);
-		$redemption	= (float) PHPExcel_Calculation_Functions::flattenSingleValue($redemption);
-		$basis		= (int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		//	Validate
-		if ((is_numeric($discount)) && (is_numeric($redemption)) && (is_numeric($basis))) {
-			if (($discount <= 0) || ($redemption <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity, $basis);
-			if (!is_numeric($daysBetweenSettlementAndMaturity)) {
-				//	return date error
-				return $daysBetweenSettlementAndMaturity;
-			}
-
-			return $redemption * (1 - $discount * $daysBetweenSettlementAndMaturity);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function PRICEDISC()
-
-
-	/**
-	 * PRICEMAT
-	 *
-	 * Returns the price per $100 face value of a security that pays interest at maturity.
-	 *
-	 * @param	mixed	settlement	The security's settlement date.
-	 *								The security's settlement date is the date after the issue date when the security is traded to the buyer.
-	 * @param	mixed	maturity	The security's maturity date.
-	 *								The maturity date is the date when the security expires.
-	 * @param	mixed	issue		The security's issue date.
-	 * @param	int		rate		The security's interest rate at date of issue.
-	 * @param	int		yield		The security's annual yield.
-	 * @param	int		basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function PRICEMAT($settlement, $maturity, $issue, $rate, $yield, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$issue		= PHPExcel_Calculation_Functions::flattenSingleValue($issue);
-		$rate		= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$yield		= PHPExcel_Calculation_Functions::flattenSingleValue($yield);
-		$basis		= (int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		//	Validate
-		if (is_numeric($rate) && is_numeric($yield)) {
-			if (($rate <= 0) || ($yield <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$daysPerYear = self::_daysPerYear(PHPExcel_Calculation_DateTime::YEAR($settlement),$basis);
-			if (!is_numeric($daysPerYear)) {
-				return $daysPerYear;
-			}
-			$daysBetweenIssueAndSettlement = PHPExcel_Calculation_DateTime::YEARFRAC($issue, $settlement, $basis);
-			if (!is_numeric($daysBetweenIssueAndSettlement)) {
-				//	return date error
-				return $daysBetweenIssueAndSettlement;
-			}
-			$daysBetweenIssueAndSettlement *= $daysPerYear;
-			$daysBetweenIssueAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($issue, $maturity, $basis);
-			if (!is_numeric($daysBetweenIssueAndMaturity)) {
-				//	return date error
-				return $daysBetweenIssueAndMaturity;
-			}
-			$daysBetweenIssueAndMaturity *= $daysPerYear;
-			$daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity, $basis);
-			if (!is_numeric($daysBetweenSettlementAndMaturity)) {
-				//	return date error
-				return $daysBetweenSettlementAndMaturity;
-			}
-			$daysBetweenSettlementAndMaturity *= $daysPerYear;
-
-			return ((100 + (($daysBetweenIssueAndMaturity / $daysPerYear) * $rate * 100)) /
-				   (1 + (($daysBetweenSettlementAndMaturity / $daysPerYear) * $yield)) -
-				   (($daysBetweenIssueAndSettlement / $daysPerYear) * $rate * 100));
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function PRICEMAT()
-
-
-	/**
-	 * PV
-	 *
-	 * Returns the Present Value of a cash flow with constant payments and interest rate (annuities).
-	 *
-	 * @param	float	$rate	Interest rate per period
-	 * @param	int		$nper	Number of periods
-	 * @param	float	$pmt	Periodic payment (annuity)
-	 * @param	float	$fv		Future Value
-	 * @param	int		$type	Payment type: 0 = at the end of each period, 1 = at the beginning of each period
-	 * @return	float
-	 */
-	public static function PV($rate = 0, $nper = 0, $pmt = 0, $fv = 0, $type = 0) {
-		$rate	= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$nper	= PHPExcel_Calculation_Functions::flattenSingleValue($nper);
-		$pmt	= PHPExcel_Calculation_Functions::flattenSingleValue($pmt);
-		$fv		= PHPExcel_Calculation_Functions::flattenSingleValue($fv);
-		$type	= PHPExcel_Calculation_Functions::flattenSingleValue($type);
-
-		// Validate parameters
-		if ($type != 0 && $type != 1) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		// Calculate
-		if (!is_null($rate) && $rate != 0) {
-			return (-$pmt * (1 + $rate * $type) * ((pow(1 + $rate, $nper) - 1) / $rate) - $fv) / pow(1 + $rate, $nper);
-		} else {
-			return -$fv - $pmt * $nper;
-		}
-	}	//	function PV()
-
-
-	/**
-	 * RATE
-	 *
-	 * Returns the interest rate per period of an annuity.
-	 * RATE is calculated by iteration and can have zero or more solutions.
-	 * If the successive results of RATE do not converge to within 0.0000001 after 20 iterations,
-	 * RATE returns the #NUM! error value.
-	 *
-	 * Excel Function:
-	 *		RATE(nper,pmt,pv[,fv[,type[,guess]]])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	float	nper		The total number of payment periods in an annuity.
-	 * @param	float	pmt			The payment made each period and cannot change over the life
-	 *									of the annuity.
-	 *								Typically, pmt includes principal and interest but no other
-	 *									fees or taxes.
-	 * @param	float	pv			The present value - the total amount that a series of future
-	 *									payments is worth now.
-	 * @param	float	fv			The future value, or a cash balance you want to attain after
-	 *									the last payment is made. If fv is omitted, it is assumed
-	 *									to be 0 (the future value of a loan, for example, is 0).
-	 * @param	integer	type		A number 0 or 1 and indicates when payments are due:
-	 *										0 or omitted	At the end of the period.
-	 *										1				At the beginning of the period.
-	 * @param	float	guess		Your guess for what the rate will be.
-	 *									If you omit guess, it is assumed to be 10 percent.
-	 * @return	float
-	 **/
-	public static function RATE($nper, $pmt, $pv, $fv = 0.0, $type = 0, $guess = 0.1) {
-		$nper	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($nper);
-		$pmt	= PHPExcel_Calculation_Functions::flattenSingleValue($pmt);
-		$pv		= PHPExcel_Calculation_Functions::flattenSingleValue($pv);
-		$fv		= (is_null($fv))	? 0.0	:	PHPExcel_Calculation_Functions::flattenSingleValue($fv);
-		$type	= (is_null($type))	? 0		:	(int) PHPExcel_Calculation_Functions::flattenSingleValue($type);
-		$guess	= (is_null($guess))	? 0.1	:	PHPExcel_Calculation_Functions::flattenSingleValue($guess);
-
-		$rate = $guess;
-		if (abs($rate) < FINANCIAL_PRECISION) {
-			$y = $pv * (1 + $nper * $rate) + $pmt * (1 + $rate * $type) * $nper + $fv;
-		} else {
-			$f = exp($nper * log(1 + $rate));
-			$y = $pv * $f + $pmt * (1 / $rate + $type) * ($f - 1) + $fv;
-		}
-		$y0 = $pv + $pmt * $nper + $fv;
-		$y1 = $pv * $f + $pmt * (1 / $rate + $type) * ($f - 1) + $fv;
-
-		// find root by secant method
-		$i  = $x0 = 0.0;
-		$x1 = $rate;
-		while ((abs($y0 - $y1) > FINANCIAL_PRECISION) && ($i < FINANCIAL_MAX_ITERATIONS)) {
-			$rate = ($y1 * $x0 - $y0 * $x1) / ($y1 - $y0);
-			$x0 = $x1;
-			$x1 = $rate;
-			if (($nper * abs($pmt)) > ($pv - $fv))
-				$x1 = abs($x1);
-
-			if (abs($rate) < FINANCIAL_PRECISION) {
-				$y = $pv * (1 + $nper * $rate) + $pmt * (1 + $rate * $type) * $nper + $fv;
-			} else {
-				$f = exp($nper * log(1 + $rate));
-				$y = $pv * $f + $pmt * (1 / $rate + $type) * ($f - 1) + $fv;
-			}
-
-			$y0 = $y1;
-			$y1 = $y;
-			++$i;
-		}
-		return $rate;
-	}	//	function RATE()
-
-
-	/**
-	 * RECEIVED
-	 *
-	 * Returns the price per $100 face value of a discounted security.
-	 *
-	 * @param	mixed	settlement	The security's settlement date.
-	 *								The security settlement date is the date after the issue date when the security is traded to the buyer.
-	 * @param	mixed	maturity	The security's maturity date.
-	 *								The maturity date is the date when the security expires.
-	 * @param	int		investment	The amount invested in the security.
-	 * @param	int		discount	The security's discount rate.
-	 * @param	int		basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function RECEIVED($settlement, $maturity, $investment, $discount, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$investment	= (float) PHPExcel_Calculation_Functions::flattenSingleValue($investment);
-		$discount	= (float) PHPExcel_Calculation_Functions::flattenSingleValue($discount);
-		$basis		= (int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		//	Validate
-		if ((is_numeric($investment)) && (is_numeric($discount)) && (is_numeric($basis))) {
-			if (($investment <= 0) || ($discount <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity, $basis);
-			if (!is_numeric($daysBetweenSettlementAndMaturity)) {
-				//	return date error
-				return $daysBetweenSettlementAndMaturity;
-			}
-
-			return $investment / ( 1 - ($discount * $daysBetweenSettlementAndMaturity));
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function RECEIVED()
-
-
-	/**
-	 * SLN
-	 *
-	 * Returns the straight-line depreciation of an asset for one period
-	 *
-	 * @param	cost		Initial cost of the asset
-	 * @param	salvage		Value at the end of the depreciation
-	 * @param	life		Number of periods over which the asset is depreciated
-	 * @return	float
-	 */
-	public static function SLN($cost, $salvage, $life) {
-		$cost		= PHPExcel_Calculation_Functions::flattenSingleValue($cost);
-		$salvage	= PHPExcel_Calculation_Functions::flattenSingleValue($salvage);
-		$life		= PHPExcel_Calculation_Functions::flattenSingleValue($life);
-
-		// Calculate
-		if ((is_numeric($cost)) && (is_numeric($salvage)) && (is_numeric($life))) {
-			if ($life < 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return ($cost - $salvage) / $life;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function SLN()
-
-
-	/**
-	 * SYD
-	 *
-	 * Returns the sum-of-years' digits depreciation of an asset for a specified period.
-	 *
-	 * @param	cost		Initial cost of the asset
-	 * @param	salvage		Value at the end of the depreciation
-	 * @param	life		Number of periods over which the asset is depreciated
-	 * @param	period		Period
-	 * @return	float
-	 */
-	public static function SYD($cost, $salvage, $life, $period) {
-		$cost		= PHPExcel_Calculation_Functions::flattenSingleValue($cost);
-		$salvage	= PHPExcel_Calculation_Functions::flattenSingleValue($salvage);
-		$life		= PHPExcel_Calculation_Functions::flattenSingleValue($life);
-		$period		= PHPExcel_Calculation_Functions::flattenSingleValue($period);
-
-		// Calculate
-		if ((is_numeric($cost)) && (is_numeric($salvage)) && (is_numeric($life)) && (is_numeric($period))) {
-			if (($life < 1) || ($period > $life)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return (($cost - $salvage) * ($life - $period + 1) * 2) / ($life * ($life + 1));
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function SYD()
-
-
-	/**
-	 * TBILLEQ
-	 *
-	 * Returns the bond-equivalent yield for a Treasury bill.
-	 *
-	 * @param	mixed	settlement	The Treasury bill's settlement date.
-	 *								The Treasury bill's settlement date is the date after the issue date when the Treasury bill is traded to the buyer.
-	 * @param	mixed	maturity	The Treasury bill's maturity date.
-	 *								The maturity date is the date when the Treasury bill expires.
-	 * @param	int		discount	The Treasury bill's discount rate.
-	 * @return	float
-	 */
-	public static function TBILLEQ($settlement, $maturity, $discount) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$discount	= PHPExcel_Calculation_Functions::flattenSingleValue($discount);
-
-		//	Use TBILLPRICE for validation
-		$testValue = self::TBILLPRICE($settlement, $maturity, $discount);
-		if (is_string($testValue)) {
-			return $testValue;
-		}
-
-		if (is_string($maturity = PHPExcel_Calculation_DateTime::_getDateValue($maturity))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
-			++$maturity;
-			$daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity) * 360;
-		} else {
-			$daysBetweenSettlementAndMaturity = (PHPExcel_Calculation_DateTime::_getDateValue($maturity) - PHPExcel_Calculation_DateTime::_getDateValue($settlement));
-		}
-
-		return (365 * $discount) / (360 - $discount * $daysBetweenSettlementAndMaturity);
-	}	//	function TBILLEQ()
-
-
-	/**
-	 * TBILLPRICE
-	 *
-	 * Returns the yield for a Treasury bill.
-	 *
-	 * @param	mixed	settlement	The Treasury bill's settlement date.
-	 *								The Treasury bill's settlement date is the date after the issue date when the Treasury bill is traded to the buyer.
-	 * @param	mixed	maturity	The Treasury bill's maturity date.
-	 *								The maturity date is the date when the Treasury bill expires.
-	 * @param	int		discount	The Treasury bill's discount rate.
-	 * @return	float
-	 */
-	public static function TBILLPRICE($settlement, $maturity, $discount) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$discount	= PHPExcel_Calculation_Functions::flattenSingleValue($discount);
-
-		if (is_string($maturity = PHPExcel_Calculation_DateTime::_getDateValue($maturity))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		//	Validate
-		if (is_numeric($discount)) {
-			if ($discount <= 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
-				++$maturity;
-				$daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity) * 360;
-				if (!is_numeric($daysBetweenSettlementAndMaturity)) {
-					//	return date error
-					return $daysBetweenSettlementAndMaturity;
-				}
-			} else {
-				$daysBetweenSettlementAndMaturity = (PHPExcel_Calculation_DateTime::_getDateValue($maturity) - PHPExcel_Calculation_DateTime::_getDateValue($settlement));
-			}
-
-			if ($daysBetweenSettlementAndMaturity > 360) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-
-			$price = 100 * (1 - (($discount * $daysBetweenSettlementAndMaturity) / 360));
-			if ($price <= 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return $price;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function TBILLPRICE()
-
-
-	/**
-	 * TBILLYIELD
-	 *
-	 * Returns the yield for a Treasury bill.
-	 *
-	 * @param	mixed	settlement	The Treasury bill's settlement date.
-	 *								The Treasury bill's settlement date is the date after the issue date when the Treasury bill is traded to the buyer.
-	 * @param	mixed	maturity	The Treasury bill's maturity date.
-	 *								The maturity date is the date when the Treasury bill expires.
-	 * @param	int		price		The Treasury bill's price per $100 face value.
-	 * @return	float
-	 */
-	public static function TBILLYIELD($settlement, $maturity, $price) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$price		= PHPExcel_Calculation_Functions::flattenSingleValue($price);
-
-		//	Validate
-		if (is_numeric($price)) {
-			if ($price <= 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
-				++$maturity;
-				$daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity) * 360;
-				if (!is_numeric($daysBetweenSettlementAndMaturity)) {
-					//	return date error
-					return $daysBetweenSettlementAndMaturity;
-				}
-			} else {
-				$daysBetweenSettlementAndMaturity = (PHPExcel_Calculation_DateTime::_getDateValue($maturity) - PHPExcel_Calculation_DateTime::_getDateValue($settlement));
-			}
-
-			if ($daysBetweenSettlementAndMaturity > 360) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-
-			return ((100 - $price) / $price) * (360 / $daysBetweenSettlementAndMaturity);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function TBILLYIELD()
-
-
-	public static function XIRR($values, $dates, $guess = 0.1) {
-		if ((!is_array($values)) && (!is_array($dates))) return PHPExcel_Calculation_Functions::VALUE();
-		$values	= PHPExcel_Calculation_Functions::flattenArray($values);
-		$dates	= PHPExcel_Calculation_Functions::flattenArray($dates);
-		$guess = PHPExcel_Calculation_Functions::flattenSingleValue($guess);
-		if (count($values) != count($dates)) return PHPExcel_Calculation_Functions::NaN();
-
-		// create an initial range, with a root somewhere between 0 and guess
-		$x1 = 0.0;
-		$x2 = $guess;
-		$f1 = self::XNPV($x1, $values, $dates);
-		$f2 = self::XNPV($x2, $values, $dates);
-		for ($i = 0; $i < FINANCIAL_MAX_ITERATIONS; ++$i) {
-			if (($f1 * $f2) < 0.0) break;
-			if (abs($f1) < abs($f2)) {
-				$f1 = self::XNPV($x1 += 1.6 * ($x1 - $x2), $values, $dates);
-			} else {
-				$f2 = self::XNPV($x2 += 1.6 * ($x2 - $x1), $values, $dates);
-			}
-		}
-		if (($f1 * $f2) > 0.0) return PHPExcel_Calculation_Functions::VALUE();
-
-		$f = self::XNPV($x1, $values, $dates);
-		if ($f < 0.0) {
-			$rtb = $x1;
-			$dx = $x2 - $x1;
-		} else {
-			$rtb = $x2;
-			$dx = $x1 - $x2;
-		}
-
-		for ($i = 0;  $i < FINANCIAL_MAX_ITERATIONS; ++$i) {
-			$dx *= 0.5;
-			$x_mid = $rtb + $dx;
-			$f_mid = self::XNPV($x_mid, $values, $dates);
-			if ($f_mid <= 0.0) $rtb = $x_mid;
-			if ((abs($f_mid) < FINANCIAL_PRECISION) || (abs($dx) < FINANCIAL_PRECISION)) return $x_mid;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}
-
-
-	/**
-	 * XNPV
-	 *
-	 * Returns the net present value for a schedule of cash flows that is not necessarily periodic.
-	 * To calculate the net present value for a series of cash flows that is periodic, use the NPV function.
-	 *
-	 * Excel Function:
-	 *		=XNPV(rate,values,dates)
-	 *
-	 * @param	float			$rate		The discount rate to apply to the cash flows.
-	 * @param	array of float	$values		A series of cash flows that corresponds to a schedule of payments in dates. The first payment is optional and corresponds to a cost or payment that occurs at the beginning of the investment. If the first value is a cost or payment, it must be a negative value. All succeeding payments are discounted based on a 365-day year. The series of values must contain at least one positive value and one negative value.
-	 * @param	array of mixed	$dates		A schedule of payment dates that corresponds to the cash flow payments. The first payment date indicates the beginning of the schedule of payments. All other dates must be later than this date, but they may occur in any order.
-	 * @return	float
-	 */
-	public static function XNPV($rate, $values, $dates) {
-		$rate = PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		if (!is_numeric($rate)) return PHPExcel_Calculation_Functions::VALUE();
-		if ((!is_array($values)) || (!is_array($dates))) return PHPExcel_Calculation_Functions::VALUE();
-		$values	= PHPExcel_Calculation_Functions::flattenArray($values);
-		$dates	= PHPExcel_Calculation_Functions::flattenArray($dates);
-		$valCount = count($values);
-		if ($valCount != count($dates)) return PHPExcel_Calculation_Functions::NaN();
-		if ((min($values) > 0) || (max($values) < 0)) return PHPExcel_Calculation_Functions::VALUE();
-
-		$xnpv = 0.0;
-		for ($i = 0; $i < $valCount; ++$i) {
-			if (!is_numeric($values[$i])) return PHPExcel_Calculation_Functions::VALUE();
-			$xnpv += $values[$i] / pow(1 + $rate, PHPExcel_Calculation_DateTime::DATEDIF($dates[0],$dates[$i],'d') / 365);
-		}
-		return (is_finite($xnpv)) ? $xnpv : PHPExcel_Calculation_Functions::VALUE();
-	}	//	function XNPV()
-
-
-	/**
-	 * YIELDDISC
-	 *
-	 * Returns the annual yield of a security that pays interest at maturity.
-	 *
-	 * @param	mixed	settlement	The security's settlement date.
-	 *								The security's settlement date is the date after the issue date when the security is traded to the buyer.
-	 * @param	mixed	maturity	The security's maturity date.
-	 *								The maturity date is the date when the security expires.
-	 * @param	int		price		The security's price per $100 face value.
-	 * @param	int		redemption	The security's redemption value per $100 face value.
-	 * @param	int		basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function YIELDDISC($settlement, $maturity, $price, $redemption, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$price		= PHPExcel_Calculation_Functions::flattenSingleValue($price);
-		$redemption	= PHPExcel_Calculation_Functions::flattenSingleValue($redemption);
-		$basis		= (int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		//	Validate
-		if (is_numeric($price) && is_numeric($redemption)) {
-			if (($price <= 0) || ($redemption <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$daysPerYear = self::_daysPerYear(PHPExcel_Calculation_DateTime::YEAR($settlement),$basis);
-			if (!is_numeric($daysPerYear)) {
-				return $daysPerYear;
-			}
-			$daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity,$basis);
-			if (!is_numeric($daysBetweenSettlementAndMaturity)) {
-				//	return date error
-				return $daysBetweenSettlementAndMaturity;
-			}
-			$daysBetweenSettlementAndMaturity *= $daysPerYear;
-
-			return (($redemption - $price) / $price) * ($daysPerYear / $daysBetweenSettlementAndMaturity);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function YIELDDISC()
-
-
-	/**
-	 * YIELDMAT
-	 *
-	 * Returns the annual yield of a security that pays interest at maturity.
-	 *
-	 * @param	mixed	settlement	The security's settlement date.
-	 *								The security's settlement date is the date after the issue date when the security is traded to the buyer.
-	 * @param	mixed	maturity	The security's maturity date.
-	 *								The maturity date is the date when the security expires.
-	 * @param	mixed	issue		The security's issue date.
-	 * @param	int		rate		The security's interest rate at date of issue.
-	 * @param	int		price		The security's price per $100 face value.
-	 * @param	int		basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function YIELDMAT($settlement, $maturity, $issue, $rate, $price, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$issue		= PHPExcel_Calculation_Functions::flattenSingleValue($issue);
-		$rate		= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$price		= PHPExcel_Calculation_Functions::flattenSingleValue($price);
-		$basis		= (int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		//	Validate
-		if (is_numeric($rate) && is_numeric($price)) {
-			if (($rate <= 0) || ($price <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$daysPerYear = self::_daysPerYear(PHPExcel_Calculation_DateTime::YEAR($settlement),$basis);
-			if (!is_numeric($daysPerYear)) {
-				return $daysPerYear;
-			}
-			$daysBetweenIssueAndSettlement = PHPExcel_Calculation_DateTime::YEARFRAC($issue, $settlement, $basis);
-			if (!is_numeric($daysBetweenIssueAndSettlement)) {
-				//	return date error
-				return $daysBetweenIssueAndSettlement;
-			}
-			$daysBetweenIssueAndSettlement *= $daysPerYear;
-			$daysBetweenIssueAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($issue, $maturity, $basis);
-			if (!is_numeric($daysBetweenIssueAndMaturity)) {
-				//	return date error
-				return $daysBetweenIssueAndMaturity;
-			}
-			$daysBetweenIssueAndMaturity *= $daysPerYear;
-			$daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity, $basis);
-			if (!is_numeric($daysBetweenSettlementAndMaturity)) {
-				//	return date error
-				return $daysBetweenSettlementAndMaturity;
-			}
-			$daysBetweenSettlementAndMaturity *= $daysPerYear;
-
-			return ((1 + (($daysBetweenIssueAndMaturity / $daysPerYear) * $rate) - (($price / 100) + (($daysBetweenIssueAndSettlement / $daysPerYear) * $rate))) /
-				   (($price / 100) + (($daysBetweenIssueAndSettlement / $daysPerYear) * $rate))) *
-				   ($daysPerYear / $daysBetweenSettlementAndMaturity);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function YIELDMAT()
-
-}	//	class PHPExcel_Calculation_Financial
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaParser.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaParser.php
deleted file mode 100644
index 3884fd20aaa..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaParser.php
+++ /dev/null
@@ -1,614 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/*
-PARTLY BASED ON:
-	Copyright (c) 2007 E. W. Bachtal, Inc.
-
-	Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-	and associated documentation files (the "Software"), to deal in the Software without restriction,
-	including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-	and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-	subject to the following conditions:
-
-	  The above copyright notice and this permission notice shall be included in all copies or substantial
-	  portions of the Software.
-
-	The software is provided "as is", without warranty of any kind, express or implied, including but not
-	limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In
-	no event shall the authors or copyright holders be liable for any claim, damages or other liability,
-	whether in an action of contract, tort or otherwise, arising from, out of or in connection with the
-	software or the use or other dealings in the software.
-
-	http://ewbi.blogs.com/develops/2007/03/excel_formula_p.html
-	http://ewbi.blogs.com/develops/2004/12/excel_formula_p.html
-*/
-
-/**
- * PHPExcel_Calculation_FormulaParser
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_FormulaParser {
-	/* Character constants */
-	const QUOTE_DOUBLE  = '"';
-	const QUOTE_SINGLE  = '\'';
-	const BRACKET_CLOSE = ']';
-	const BRACKET_OPEN  = '[';
-	const BRACE_OPEN    = '{';
-	const BRACE_CLOSE   = '}';
-	const PAREN_OPEN    = '(';
-	const PAREN_CLOSE   = ')';
-	const SEMICOLON     = ';';
-	const WHITESPACE    = ' ';
-	const COMMA         = ',';
-	const ERROR_START   = '#';
-
-	const OPERATORS_SN 			= "+-";
-	const OPERATORS_INFIX 		= "+-*/^&=><";
-	const OPERATORS_POSTFIX 	= "%";
-
-	/**
-	 * Formula
-	 *
-	 * @var string
-	 */
-	private $_formula;
-
-	/**
-	 * Tokens
-	 *
-	 * @var PHPExcel_Calculation_FormulaToken[]
-	 */
-	private $_tokens = array();
-
-    /**
-     * Create a new PHPExcel_Calculation_FormulaParser
-     *
-     * @param 	string		$pFormula	Formula to parse
-     * @throws 	PHPExcel_Calculation_Exception
-     */
-    public function __construct($pFormula = '')
-    {
-    	// Check parameters
-    	if (is_null($pFormula)) {
-    		throw new PHPExcel_Calculation_Exception("Invalid parameter passed: formula");
-    	}
-
-    	// Initialise values
-    	$this->_formula = trim($pFormula);
-    	// Parse!
-    	$this->_parseToTokens();
-    }
-
-    /**
-     * Get Formula
-     *
-     * @return string
-     */
-    public function getFormula() {
-    	return $this->_formula;
-    }
-
-    /**
-     * Get Token
-     *
-     * @param 	int		$pId	Token id
-     * @return	string
-     * @throws  PHPExcel_Calculation_Exception
-     */
-    public function getToken($pId = 0) {
-    	if (isset($this->_tokens[$pId])) {
-    		return $this->_tokens[$pId];
-    	} else {
-    		throw new PHPExcel_Calculation_Exception("Token with id $pId does not exist.");
-    	}
-    }
-
-    /**
-     * Get Token count
-     *
-     * @return string
-     */
-    public function getTokenCount() {
-    	return count($this->_tokens);
-    }
-
-    /**
-     * Get Tokens
-     *
-     * @return PHPExcel_Calculation_FormulaToken[]
-     */
-    public function getTokens() {
-    	return $this->_tokens;
-    }
-
-    /**
-     * Parse to tokens
-     */
-    private function _parseToTokens() {
-		// No attempt is made to verify formulas; assumes formulas are derived from Excel, where
-		// they can only exist if valid; stack overflows/underflows sunk as nulls without exceptions.
-
-		// Check if the formula has a valid starting =
-		$formulaLength = strlen($this->_formula);
-		if ($formulaLength < 2 || $this->_formula{0} != '=') return;
-
-		// Helper variables
-		$tokens1	= $tokens2 	= $stack = array();
-		$inString	= $inPath 	= $inRange 	= $inError = false;
-		$token		= $previousToken	= $nextToken	= null;
-
-		$index	= 1;
-		$value	= '';
-
-		$ERRORS 			= array("#NULL!", "#DIV/0!", "#VALUE!", "#REF!", "#NAME?", "#NUM!", "#N/A");
-		$COMPARATORS_MULTI 	= array(">=", "<=", "<>");
-
-		while ($index < $formulaLength) {
-			// state-dependent character evaluation (order is important)
-
-			// double-quoted strings
-			// embeds are doubled
-			// end marks token
-			if ($inString) {
-				if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE) {
-					if ((($index + 2) <= $formulaLength) && ($this->_formula{$index + 1} == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE)) {
-						$value .= PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE;
-						++$index;
-					} else {
-						$inString = false;
-						$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_TEXT);
-						$value = "";
-					}
-				} else {
-					$value .= $this->_formula{$index};
-				}
-				++$index;
-				continue;
-			}
-
-			// single-quoted strings (links)
-			// embeds are double
-			// end does not mark a token
-			if ($inPath) {
-				if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE) {
-					if ((($index + 2) <= $formulaLength) && ($this->_formula{$index + 1} == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE)) {
-						$value .= PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE;
-						++$index;
-					} else {
-						$inPath = false;
-					}
-				} else {
-					$value .= $this->_formula{$index};
-				}
-				++$index;
-				continue;
-			}
-
-			// bracked strings (R1C1 range index or linked workbook name)
-			// no embeds (changed to "()" by Excel)
-			// end does not mark a token
-			if ($inRange) {
-				if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::BRACKET_CLOSE) {
-					$inRange = false;
-				}
-				$value .= $this->_formula{$index};
-				++$index;
-				continue;
-			}
-
-			// error values
-			// end marks a token, determined from absolute list of values
-			if ($inError) {
-				$value .= $this->_formula{$index};
-				++$index;
-				if (in_array($value, $ERRORS)) {
-					$inError = false;
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_ERROR);
-					$value = "";
-				}
-				continue;
-			}
-
-			// scientific notation check
-			if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_SN, $this->_formula{$index}) !== false) {
-				if (strlen($value) > 1) {
-					if (preg_match("/^[1-9]{1}(\.[0-9]+)?E{1}$/", $this->_formula{$index}) != 0) {
-						$value .= $this->_formula{$index};
-						++$index;
-						continue;
-					}
-				}
-			}
-
-			// independent character evaluation (order not important)
-
-			// establish state-dependent character evaluations
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE) {
-				if (strlen($value > 0)) {  // unexpected
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN);
-					$value = "";
-				}
-				$inString = true;
-				++$index;
-				continue;
- 			}
-
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE) {
-				if (strlen($value) > 0) { // unexpected
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN);
-					$value = "";
-				}
-				$inPath = true;
-				++$index;
-				continue;
-			}
-
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::BRACKET_OPEN) {
-				$inRange = true;
-				$value .= PHPExcel_Calculation_FormulaParser::BRACKET_OPEN;
-				++$index;
-				continue;
-			}
-
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::ERROR_START) {
-				if (strlen($value) > 0) { // unexpected
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN);
-					$value = "";
-				}
-				$inError = true;
-				$value .= PHPExcel_Calculation_FormulaParser::ERROR_START;
-				++$index;
-				continue;
-			}
-
-			// mark start and end of arrays and array rows
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::BRACE_OPEN) {
-				if (strlen($value) > 0) { // unexpected
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN);
-					$value = "";
-				}
-
-				$tmp = new PHPExcel_Calculation_FormulaToken("ARRAY", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START);
-				$tokens1[] = $tmp;
-				$stack[] = clone $tmp;
-
-				$tmp = new PHPExcel_Calculation_FormulaToken("ARRAYROW", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START);
-				$tokens1[] = $tmp;
-				$stack[] = clone $tmp;
-
-				++$index;
-				continue;
-			}
-
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::SEMICOLON) {
-				if (strlen($value) > 0) {
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
-					$value = "";
-				}
-
-				$tmp = array_pop($stack);
-				$tmp->setValue("");
-				$tmp->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP);
-				$tokens1[] = $tmp;
-
-				$tmp = new PHPExcel_Calculation_FormulaToken(",", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_ARGUMENT);
-				$tokens1[] = $tmp;
-
-				$tmp = new PHPExcel_Calculation_FormulaToken("ARRAYROW", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START);
-				$tokens1[] = $tmp;
-				$stack[] = clone $tmp;
-
-				++$index;
-				continue;
-			}
-
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::BRACE_CLOSE) {
-				if (strlen($value) > 0) {
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
-					$value = "";
-				}
-
-				$tmp = array_pop($stack);
-				$tmp->setValue("");
-				$tmp->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP);
-				$tokens1[] = $tmp;
-
-				$tmp = array_pop($stack);
-				$tmp->setValue("");
-				$tmp->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP);
-				$tokens1[] = $tmp;
-
-				++$index;
-				continue;
-			}
-
-			// trim white-space
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::WHITESPACE) {
-				if (strlen($value) > 0) {
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
-					$value = "";
-				}
-				$tokens1[] = new PHPExcel_Calculation_FormulaToken("", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_WHITESPACE);
-				++$index;
-				while (($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::WHITESPACE) && ($index < $formulaLength)) {
-					++$index;
-				}
-				continue;
-			}
-
-			// multi-character comparators
-			if (($index + 2) <= $formulaLength) {
-				if (in_array(substr($this->_formula, $index, 2), $COMPARATORS_MULTI)) {
-					if (strlen($value) > 0) {
-						$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
-						$value = "";
-					}
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken(substr($this->_formula, $index, 2), PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_LOGICAL);
-					$index += 2;
-					continue;
-				}
-			}
-
-			// standard infix operators
-			if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_INFIX, $this->_formula{$index}) !== false) {
-				if (strlen($value) > 0) {
-					$tokens1[] =new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
-					$value = "";
-				}
-				$tokens1[] = new PHPExcel_Calculation_FormulaToken($this->_formula{$index}, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX);
-				++$index;
-				continue;
-			}
-
-			// standard postfix operators (only one)
-			if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_POSTFIX, $this->_formula{$index}) !== false) {
-				if (strlen($value) > 0) {
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
-					$value = "";
-				}
-				$tokens1[] = new PHPExcel_Calculation_FormulaToken($this->_formula{$index}, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX);
-				++$index;
-				continue;
-			}
-
-			// start subexpression or function
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::PAREN_OPEN) {
-				if (strlen($value) > 0) {
-					$tmp = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START);
-					$tokens1[] = $tmp;
-					$stack[] = clone $tmp;
-					$value = "";
-				} else {
-					$tmp = new PHPExcel_Calculation_FormulaToken("", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_SUBEXPRESSION, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START);
-					$tokens1[] = $tmp;
-					$stack[] = clone $tmp;
-				}
-				++$index;
-				continue;
-			}
-
-			// function, subexpression, or array parameters, or operand unions
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::COMMA) {
-				if (strlen($value) > 0) {
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
-					$value = "";
-				}
-
-				$tmp = array_pop($stack);
-				$tmp->setValue("");
-				$tmp->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP);
-				$stack[] = $tmp;
-
-				if ($tmp->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) {
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken(",", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_UNION);
-				} else {
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken(",", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_ARGUMENT);
-				}
-				++$index;
-				continue;
-			}
-
-			// stop subexpression
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::PAREN_CLOSE) {
-				if (strlen($value) > 0) {
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
-					$value = "";
-				}
-
-				$tmp = array_pop($stack);
-				$tmp->setValue("");
-				$tmp->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP);
-				$tokens1[] = $tmp;
-
-				++$index;
-				continue;
-			}
-
-        	// token accumulation
-			$value .= $this->_formula{$index};
-			++$index;
-		}
-
-		// dump remaining accumulation
-		if (strlen($value) > 0) {
-			$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
-		}
-
-		// move tokenList to new set, excluding unnecessary white-space tokens and converting necessary ones to intersections
-		$tokenCount = count($tokens1);
-		for ($i = 0; $i < $tokenCount; ++$i) {
-			$token = $tokens1[$i];
-			if (isset($tokens1[$i - 1])) {
-				$previousToken = $tokens1[$i - 1];
-			} else {
-				$previousToken = null;
-			}
-			if (isset($tokens1[$i + 1])) {
-				$nextToken = $tokens1[$i + 1];
-			} else {
-				$nextToken = null;
-			}
-
-			if (is_null($token)) {
-				continue;
-			}
-
-			if ($token->getTokenType() != PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_WHITESPACE) {
-				$tokens2[] = $token;
-				continue;
-			}
-
-			if (is_null($previousToken)) {
-				continue;
-			}
-
-			if (! (
-					(($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) && ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-					(($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-					($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND)
-				  ) ) {
-				continue;
-			}
-
-			if (is_null($nextToken)) {
-				continue;
-			}
-
-			if (! (
-					(($nextToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) && ($nextToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START)) ||
-					(($nextToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($nextToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START)) ||
-					($nextToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND)
-				  ) ) {
-				continue;
-			}
-
-			$tokens2[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_INTERSECTION);
-		}
-
-		// move tokens to final list, switching infix "-" operators to prefix when appropriate, switching infix "+" operators
-		// to noop when appropriate, identifying operand and infix-operator subtypes, and pulling "@" from function names
-		$this->_tokens = array();
-
-		$tokenCount = count($tokens2);
-		for ($i = 0; $i < $tokenCount; ++$i) {
-			$token = $tokens2[$i];
-			if (isset($tokens2[$i - 1])) {
-				$previousToken = $tokens2[$i - 1];
-			} else {
-				$previousToken = null;
-			}
-			if (isset($tokens2[$i + 1])) {
-				$nextToken = $tokens2[$i + 1];
-			} else {
-				$nextToken = null;
-			}
-
-			if (is_null($token)) {
-				continue;
-			}
-
-			if ($token->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX && $token->getValue() == "-") {
-				if ($i == 0) {
-					$token->setTokenType(PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPREFIX);
-				} else if (
-							(($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) && ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-							(($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-							($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX) ||
-							($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND)
-						) {
-					$token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_MATH);
-				} else {
-					$token->setTokenType(PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPREFIX);
-				}
-
-				$this->_tokens[] = $token;
-				continue;
-			}
-
-			if ($token->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX && $token->getValue() == "+") {
-				if ($i == 0) {
-					continue;
-				} else if (
-							(($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) && ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-							(($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-							($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX) ||
-							($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND)
-						) {
-					$token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_MATH);
-				} else {
-					continue;
-				}
-
-				$this->_tokens[] = $token;
-				continue;
-			}
-
-			if ($token->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX && $token->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING) {
-				if (strpos("<>=", substr($token->getValue(), 0, 1)) !== false) {
-					$token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_LOGICAL);
-				} else if ($token->getValue() == "&") {
-					$token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_CONCATENATION);
-				} else {
-					$token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_MATH);
-				}
-
-				$this->_tokens[] = $token;
-				continue;
-			}
-
-			if ($token->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND && $token->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING) {
-				if (!is_numeric($token->getValue())) {
-					if (strtoupper($token->getValue()) == "TRUE" || strtoupper($token->getValue() == "FALSE")) {
-						$token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_LOGICAL);
-					} else {
-						$token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_RANGE);
-					}
-				} else {
-					$token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NUMBER);
-				}
-
-				$this->_tokens[] = $token;
-				continue;
-			}
-
-			if ($token->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) {
-				if (strlen($token->getValue() > 0)) {
-					if (substr($token->getValue(), 0, 1) == "@") {
-						$token->setValue(substr($token->getValue(), 1));
-					}
-				}
-			}
-
-        	$this->_tokens[] = $token;
-		}
-    }
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaToken.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaToken.php
deleted file mode 100644
index ad10c00a2fb..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaToken.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/*
-PARTLY BASED ON:
-	Copyright (c) 2007 E. W. Bachtal, Inc.
-
-	Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-	and associated documentation files (the "Software"), to deal in the Software without restriction,
-	including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-	and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-	subject to the following conditions:
-
-	  The above copyright notice and this permission notice shall be included in all copies or substantial
-	  portions of the Software.
-
-	The software is provided "as is", without warranty of any kind, express or implied, including but not
-	limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In
-	no event shall the authors or copyright holders be liable for any claim, damages or other liability,
-	whether in an action of contract, tort or otherwise, arising from, out of or in connection with the
-	software or the use or other dealings in the software.
-
-	http://ewbi.blogs.com/develops/2007/03/excel_formula_p.html
-	http://ewbi.blogs.com/develops/2004/12/excel_formula_p.html
-*/
-
-
-/**
- * PHPExcel_Calculation_FormulaToken
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_FormulaToken {
-	/* Token types */
-	const TOKEN_TYPE_NOOP					= 'Noop';
-	const TOKEN_TYPE_OPERAND				= 'Operand';
-	const TOKEN_TYPE_FUNCTION				= 'Function';
-	const TOKEN_TYPE_SUBEXPRESSION			= 'Subexpression';
-	const TOKEN_TYPE_ARGUMENT				= 'Argument';
-	const TOKEN_TYPE_OPERATORPREFIX			= 'OperatorPrefix';
-	const TOKEN_TYPE_OPERATORINFIX			= 'OperatorInfix';
-	const TOKEN_TYPE_OPERATORPOSTFIX		= 'OperatorPostfix';
-	const TOKEN_TYPE_WHITESPACE				= 'Whitespace';
-	const TOKEN_TYPE_UNKNOWN				= 'Unknown';
-
-	/* Token subtypes */
-	const TOKEN_SUBTYPE_NOTHING				= 'Nothing';
-	const TOKEN_SUBTYPE_START				= 'Start';
-	const TOKEN_SUBTYPE_STOP				= 'Stop';
-	const TOKEN_SUBTYPE_TEXT				= 'Text';
-	const TOKEN_SUBTYPE_NUMBER				= 'Number';
-	const TOKEN_SUBTYPE_LOGICAL				= 'Logical';
-	const TOKEN_SUBTYPE_ERROR				= 'Error';
-	const TOKEN_SUBTYPE_RANGE				= 'Range';
-	const TOKEN_SUBTYPE_MATH				= 'Math';
-	const TOKEN_SUBTYPE_CONCATENATION		= 'Concatenation';
-	const TOKEN_SUBTYPE_INTERSECTION		= 'Intersection';
-	const TOKEN_SUBTYPE_UNION				= 'Union';
-
-	/**
-	 * Value
-	 *
-	 * @var string
-	 */
-	private $_value;
-
-	/**
-	 * Token Type (represented by TOKEN_TYPE_*)
-	 *
-	 * @var string
-	 */
-	private $_tokenType;
-
-	/**
-	 * Token SubType (represented by TOKEN_SUBTYPE_*)
-	 *
-	 * @var string
-	 */
-	private $_tokenSubType;
-
-    /**
-     * Create a new PHPExcel_Calculation_FormulaToken
-     *
-     * @param string	$pValue
-     * @param string	$pTokenType 	Token type (represented by TOKEN_TYPE_*)
-     * @param string	$pTokenSubType 	Token Subtype (represented by TOKEN_SUBTYPE_*)
-     */
-    public function __construct($pValue, $pTokenType = PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN, $pTokenSubType = PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING)
-    {
-    	// Initialise values
-    	$this->_value				= $pValue;
-    	$this->_tokenType			= $pTokenType;
-    	$this->_tokenSubType 		= $pTokenSubType;
-    }
-
-    /**
-     * Get Value
-     *
-     * @return string
-     */
-    public function getValue() {
-    	return $this->_value;
-    }
-
-    /**
-     * Set Value
-     *
-     * @param string	$value
-     */
-    public function setValue($value) {
-    	$this->_value = $value;
-    }
-
-    /**
-     * Get Token Type (represented by TOKEN_TYPE_*)
-     *
-     * @return string
-     */
-    public function getTokenType() {
-    	return $this->_tokenType;
-    }
-
-    /**
-     * Set Token Type
-     *
-     * @param string	$value
-     */
-    public function setTokenType($value = PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN) {
-    	$this->_tokenType = $value;
-    }
-
-    /**
-     * Get Token SubType (represented by TOKEN_SUBTYPE_*)
-     *
-     * @return string
-     */
-    public function getTokenSubType() {
-    	return $this->_tokenSubType;
-    }
-
-    /**
-     * Set Token SubType
-     *
-     * @param string	$value
-     */
-    public function setTokenSubType($value = PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING) {
-    	$this->_tokenSubType = $value;
-    }
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Function.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Function.php
deleted file mode 100644
index 1301cd096cf..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Function.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Calculation_Function
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Function {
-	/* Function categories */
-	const CATEGORY_CUBE						= 'Cube';
-	const CATEGORY_DATABASE					= 'Database';
-	const CATEGORY_DATE_AND_TIME			= 'Date and Time';
-	const CATEGORY_ENGINEERING				= 'Engineering';
-	const CATEGORY_FINANCIAL				= 'Financial';
-	const CATEGORY_INFORMATION				= 'Information';
-	const CATEGORY_LOGICAL					= 'Logical';
-	const CATEGORY_LOOKUP_AND_REFERENCE		= 'Lookup and Reference';
-	const CATEGORY_MATH_AND_TRIG			= 'Math and Trig';
-	const CATEGORY_STATISTICAL				= 'Statistical';
-	const CATEGORY_TEXT_AND_DATA			= 'Text and Data';
-
-	/**
-	 * Category (represented by CATEGORY_*)
-	 *
-	 * @var string
-	 */
-	private $_category;
-
-	/**
-	 * Excel name
-	 *
-	 * @var string
-	 */
-	private $_excelName;
-
-	/**
-	 * PHPExcel name
-	 *
-	 * @var string
-	 */
-	private $_phpExcelName;
-
-    /**
-     * Create a new PHPExcel_Calculation_Function
-     *
-     * @param 	string		$pCategory 		Category (represented by CATEGORY_*)
-     * @param 	string		$pExcelName		Excel function name
-     * @param 	string		$pPHPExcelName	PHPExcel function mapping
-     * @throws 	PHPExcel_Calculation_Exception
-     */
-    public function __construct($pCategory = NULL, $pExcelName = NULL, $pPHPExcelName = NULL)
-    {
-    	if (($pCategory !== NULL) && ($pExcelName !== NULL) && ($pPHPExcelName !== NULL)) {
-    		// Initialise values
-    		$this->_category 		= $pCategory;
-    		$this->_excelName 		= $pExcelName;
-    		$this->_phpExcelName 	= $pPHPExcelName;
-    	} else {
-    		throw new PHPExcel_Calculation_Exception("Invalid parameters passed.");
-    	}
-    }
-
-    /**
-     * Get Category (represented by CATEGORY_*)
-     *
-     * @return string
-     */
-    public function getCategory() {
-    	return $this->_category;
-    }
-
-    /**
-     * Set Category (represented by CATEGORY_*)
-     *
-     * @param 	string		$value
-     * @throws 	PHPExcel_Calculation_Exception
-     */
-    public function setCategory($value = null) {
-    	if (!is_null($value)) {
-    		$this->_category = $value;
-    	} else {
-    		throw new PHPExcel_Calculation_Exception("Invalid parameter passed.");
-    	}
-    }
-
-    /**
-     * Get Excel name
-     *
-     * @return string
-     */
-    public function getExcelName() {
-    	return $this->_excelName;
-    }
-
-    /**
-     * Set Excel name
-     *
-     * @param string	$value
-     */
-    public function setExcelName($value) {
-    	$this->_excelName = $value;
-    }
-
-    /**
-     * Get PHPExcel name
-     *
-     * @return string
-     */
-    public function getPHPExcelName() {
-    	return $this->_phpExcelName;
-    }
-
-    /**
-     * Set PHPExcel name
-     *
-     * @param string	$value
-     */
-    public function setPHPExcelName($value) {
-    	$this->_phpExcelName = $value;
-    }
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Functions.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Functions.php
deleted file mode 100644
index dea1503b8ec..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Functions.php
+++ /dev/null
@@ -1,725 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/** MAX_VALUE */
-define('MAX_VALUE', 1.2e308);
-
-/** 2 / PI */
-define('M_2DIVPI', 0.63661977236758134307553505349006);
-
-/** MAX_ITERATIONS */
-define('MAX_ITERATIONS', 256);
-
-/** PRECISION */
-define('PRECISION', 8.88E-016);
-
-
-/**
- * PHPExcel_Calculation_Functions
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Functions {
-
-	/** constants */
-	const COMPATIBILITY_EXCEL		= 'Excel';
-	const COMPATIBILITY_GNUMERIC	= 'Gnumeric';
-	const COMPATIBILITY_OPENOFFICE	= 'OpenOfficeCalc';
-
-	const RETURNDATE_PHP_NUMERIC	= 'P';
-	const RETURNDATE_PHP_OBJECT		= 'O';
-	const RETURNDATE_EXCEL			= 'E';
-
-
-	/**
-	 * Compatibility mode to use for error checking and responses
-	 *
-	 * @access	private
-	 * @var string
-	 */
-	protected static $compatibilityMode	= self::COMPATIBILITY_EXCEL;
-
-	/**
-	 * Data Type to use when returning date values
-	 *
-	 * @access	private
-	 * @var string
-	 */
-	protected static $ReturnDateType	= self::RETURNDATE_EXCEL;
-
-	/**
-	 * List of error codes
-	 *
-	 * @access	private
-	 * @var array
-	 */
-	protected static $_errorCodes	= array( 'null'				=> '#NULL!',
-											 'divisionbyzero'	=> '#DIV/0!',
-											 'value'			=> '#VALUE!',
-											 'reference'		=> '#REF!',
-											 'name'				=> '#NAME?',
-											 'num'				=> '#NUM!',
-											 'na'				=> '#N/A',
-											 'gettingdata'		=> '#GETTING_DATA'
-										   );
-
-
-	/**
-	 * Set the Compatibility Mode
-	 *
-	 * @access	public
-	 * @category Function Configuration
-	 * @param	 string		$compatibilityMode		Compatibility Mode
-	 *												Permitted values are:
-	 *													PHPExcel_Calculation_Functions::COMPATIBILITY_EXCEL			'Excel'
-	 *													PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC		'Gnumeric'
-	 *													PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE	'OpenOfficeCalc'
-	 * @return	 boolean	(Success or Failure)
-	 */
-	public static function setCompatibilityMode($compatibilityMode) {
-		if (($compatibilityMode == self::COMPATIBILITY_EXCEL) ||
-			($compatibilityMode == self::COMPATIBILITY_GNUMERIC) ||
-			($compatibilityMode == self::COMPATIBILITY_OPENOFFICE)) {
-			self::$compatibilityMode = $compatibilityMode;
-			return True;
-		}
-		return False;
-	}	//	function setCompatibilityMode()
-
-
-	/**
-	 * Return the current Compatibility Mode
-	 *
-	 * @access	public
-	 * @category Function Configuration
-	 * @return	 string		Compatibility Mode
-	 *							Possible Return values are:
-	 *								PHPExcel_Calculation_Functions::COMPATIBILITY_EXCEL			'Excel'
-	 *								PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC		'Gnumeric'
-	 *								PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE	'OpenOfficeCalc'
-	 */
-	public static function getCompatibilityMode() {
-		return self::$compatibilityMode;
-	}	//	function getCompatibilityMode()
-
-
-	/**
-	 * Set the Return Date Format used by functions that return a date/time (Excel, PHP Serialized Numeric or PHP Object)
-	 *
-	 * @access	public
-	 * @category Function Configuration
-	 * @param	 string	$returnDateType			Return Date Format
-	 *												Permitted values are:
-	 *													PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC		'P'
-	 *													PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT		'O'
-	 *													PHPExcel_Calculation_Functions::RETURNDATE_EXCEL			'E'
-	 * @return	 boolean							Success or failure
-	 */
-	public static function setReturnDateType($returnDateType) {
-		if (($returnDateType == self::RETURNDATE_PHP_NUMERIC) ||
-			($returnDateType == self::RETURNDATE_PHP_OBJECT) ||
-			($returnDateType == self::RETURNDATE_EXCEL)) {
-			self::$ReturnDateType = $returnDateType;
-			return True;
-		}
-		return False;
-	}	//	function setReturnDateType()
-
-
-	/**
-	 * Return the current Return Date Format for functions that return a date/time (Excel, PHP Serialized Numeric or PHP Object)
-	 *
-	 * @access	public
-	 * @category Function Configuration
-	 * @return	 string		Return Date Format
-	 *							Possible Return values are:
-	 *								PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC		'P'
-	 *								PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT		'O'
-	 *								PHPExcel_Calculation_Functions::RETURNDATE_EXCEL			'E'
-	 */
-	public static function getReturnDateType() {
-		return self::$ReturnDateType;
-	}	//	function getReturnDateType()
-
-
-	/**
-	 * DUMMY
-	 *
-	 * @access	public
-	 * @category Error Returns
-	 * @return	string	#Not Yet Implemented
-	 */
-	public static function DUMMY() {
-		return '#Not Yet Implemented';
-	}	//	function DUMMY()
-
-
-	/**
-	 * DIV0
-	 *
-	 * @access	public
-	 * @category Error Returns
-	 * @return	string	#Not Yet Implemented
-	 */
-	public static function DIV0() {
-		return self::$_errorCodes['divisionbyzero'];
-	}	//	function DIV0()
-
-
-	/**
-	 * NA
-	 *
-	 * Excel Function:
-	 *		=NA()
-	 *
-	 * Returns the error value #N/A
-	 *		#N/A is the error value that means "no value is available."
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @return	string	#N/A!
-	 */
-	public static function NA() {
-		return self::$_errorCodes['na'];
-	}	//	function NA()
-
-
-	/**
-	 * NaN
-	 *
-	 * Returns the error value #NUM!
-	 *
-	 * @access	public
-	 * @category Error Returns
-	 * @return	string	#NUM!
-	 */
-	public static function NaN() {
-		return self::$_errorCodes['num'];
-	}	//	function NaN()
-
-
-	/**
-	 * NAME
-	 *
-	 * Returns the error value #NAME?
-	 *
-	 * @access	public
-	 * @category Error Returns
-	 * @return	string	#NAME?
-	 */
-	public static function NAME() {
-		return self::$_errorCodes['name'];
-	}	//	function NAME()
-
-
-	/**
-	 * REF
-	 *
-	 * Returns the error value #REF!
-	 *
-	 * @access	public
-	 * @category Error Returns
-	 * @return	string	#REF!
-	 */
-	public static function REF() {
-		return self::$_errorCodes['reference'];
-	}	//	function REF()
-
-
-	/**
-	 * NULL
-	 *
-	 * Returns the error value #NULL!
-	 *
-	 * @access	public
-	 * @category Error Returns
-	 * @return	string	#NULL!
-	 */
-	public static function NULL() {
-		return self::$_errorCodes['null'];
-	}	//	function NULL()
-
-
-	/**
-	 * VALUE
-	 *
-	 * Returns the error value #VALUE!
-	 *
-	 * @access	public
-	 * @category Error Returns
-	 * @return	string	#VALUE!
-	 */
-	public static function VALUE() {
-		return self::$_errorCodes['value'];
-	}	//	function VALUE()
-
-
-	public static function isMatrixValue($idx) {
-		return ((substr_count($idx,'.') <= 1) || (preg_match('/\.[A-Z]/',$idx) > 0));
-	}
-
-
-	public static function isValue($idx) {
-		return (substr_count($idx,'.') == 0);
-	}
-
-
-	public static function isCellValue($idx) {
-		return (substr_count($idx,'.') > 1);
-	}
-
-
-	public static function _ifCondition($condition) {
-		$condition	= PHPExcel_Calculation_Functions::flattenSingleValue($condition);
-		if (!isset($condition{0}))
-			$condition = '=""';
-		if (!in_array($condition{0},array('>', '<', '='))) {
-			if (!is_numeric($condition)) { $condition = PHPExcel_Calculation::_wrapResult(strtoupper($condition)); }
-			return '='.$condition;
-		} else {
-			preg_match('/([<>=]+)(.*)/',$condition,$matches);
-			list(,$operator,$operand) = $matches;
-
-			if (!is_numeric($operand)) {
-				$operand = str_replace('"', '""', $operand);
-				$operand = PHPExcel_Calculation::_wrapResult(strtoupper($operand));
-			}
-
-			return $operator.$operand;
-		}
-	}	//	function _ifCondition()
-
-
-	/**
-	 * ERROR_TYPE
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	boolean
-	 */
-	public static function ERROR_TYPE($value = '') {
-		$value	= self::flattenSingleValue($value);
-
-		$i = 1;
-		foreach(self::$_errorCodes as $errorCode) {
-			if ($value === $errorCode) {
-				return $i;
-			}
-			++$i;
-		}
-		return self::NA();
-	}	//	function ERROR_TYPE()
-
-
-	/**
-	 * IS_BLANK
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	boolean
-	 */
-	public static function IS_BLANK($value = NULL) {
-		if (!is_null($value)) {
-			$value	= self::flattenSingleValue($value);
-		}
-
-		return is_null($value);
-	}	//	function IS_BLANK()
-
-
-	/**
-	 * IS_ERR
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	boolean
-	 */
-	public static function IS_ERR($value = '') {
-		$value		= self::flattenSingleValue($value);
-
-		return self::IS_ERROR($value) && (!self::IS_NA($value));
-	}	//	function IS_ERR()
-
-
-	/**
-	 * IS_ERROR
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	boolean
-	 */
-	public static function IS_ERROR($value = '') {
-		$value		= self::flattenSingleValue($value);
-
-		if (!is_string($value))
-			return false;
-		return in_array($value, array_values(self::$_errorCodes));
-	}	//	function IS_ERROR()
-
-
-	/**
-	 * IS_NA
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	boolean
-	 */
-	public static function IS_NA($value = '') {
-		$value		= self::flattenSingleValue($value);
-
-		return ($value === self::NA());
-	}	//	function IS_NA()
-
-
-	/**
-	 * IS_EVEN
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	boolean
-	 */
-	public static function IS_EVEN($value = NULL) {
-		$value = self::flattenSingleValue($value);
-
-		if ($value === NULL)
-			return self::NAME();
-		if ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value))))
-			return self::VALUE();
-		return ($value % 2 == 0);
-	}	//	function IS_EVEN()
-
-
-	/**
-	 * IS_ODD
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	boolean
-	 */
-	public static function IS_ODD($value = NULL) {
-		$value = self::flattenSingleValue($value);
-
-		if ($value === NULL)
-			return self::NAME();
-		if ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value))))
-			return self::VALUE();
-		return (abs($value) % 2 == 1);
-	}	//	function IS_ODD()
-
-
-	/**
-	 * IS_NUMBER
-	 *
-	 * @param	mixed	$value		Value to check
-	 * @return	boolean
-	 */
-	public static function IS_NUMBER($value = NULL) {
-		$value		= self::flattenSingleValue($value);
-
-		if (is_string($value)) {
-			return False;
-		}
-		return is_numeric($value);
-	}	//	function IS_NUMBER()
-
-
-	/**
-	 * IS_LOGICAL
-	 *
-	 * @param	mixed	$value		Value to check
-	 * @return	boolean
-	 */
-	public static function IS_LOGICAL($value = NULL) {
-		$value		= self::flattenSingleValue($value);
-
-		return is_bool($value);
-	}	//	function IS_LOGICAL()
-
-
-	/**
-	 * IS_TEXT
-	 *
-	 * @param	mixed	$value		Value to check
-	 * @return	boolean
-	 */
-	public static function IS_TEXT($value = NULL) {
-		$value		= self::flattenSingleValue($value);
-
-		return (is_string($value) && !self::IS_ERROR($value));
-	}	//	function IS_TEXT()
-
-
-	/**
-	 * IS_NONTEXT
-	 *
-	 * @param	mixed	$value		Value to check
-	 * @return	boolean
-	 */
-	public static function IS_NONTEXT($value = NULL) {
-		return !self::IS_TEXT($value);
-	}	//	function IS_NONTEXT()
-
-
-	/**
-	 * VERSION
-	 *
-	 * @return	string	Version information
-	 */
-	public static function VERSION() {
-		return 'PHPExcel 1.8.1, 2015-04-30';
-	}	//	function VERSION()
-
-
-	/**
-	 * N
-	 *
-	 * Returns a value converted to a number
-	 *
-	 * @param	value		The value you want converted
-	 * @return	number		N converts values listed in the following table
-	 *		If value is or refers to N returns
-	 *		A number			That number
-	 *		A date				The serial number of that date
-	 *		TRUE				1
-	 *		FALSE				0
-	 *		An error value		The error value
-	 *		Anything else		0
-	 */
-	public static function N($value = NULL) {
-		while (is_array($value)) {
-			$value = array_shift($value);
-		}
-
-		switch (gettype($value)) {
-			case 'double'	:
-			case 'float'	:
-			case 'integer'	:
-				return $value;
-				break;
-			case 'boolean'	:
-				return (integer) $value;
-				break;
-			case 'string'	:
-				//	Errors
-				if ((strlen($value) > 0) && ($value{0} == '#')) {
-					return $value;
-				}
-				break;
-		}
-		return 0;
-	}	//	function N()
-
-
-	/**
-	 * TYPE
-	 *
-	 * Returns a number that identifies the type of a value
-	 *
-	 * @param	value		The value you want tested
-	 * @return	number		N converts values listed in the following table
-	 *		If value is or refers to N returns
-	 *		A number			1
-	 *		Text				2
-	 *		Logical Value		4
-	 *		An error value		16
-	 *		Array or Matrix		64
-	 */
-	public static function TYPE($value = NULL) {
-		$value	= self::flattenArrayIndexed($value);
-		if (is_array($value) && (count($value) > 1)) {
-			$a = array_keys($value);
-			$a = array_pop($a);
-			//	Range of cells is an error
-			if (self::isCellValue($a)) {
-				return 16;
-			//	Test for Matrix
-			} elseif (self::isMatrixValue($a)) {
-				return 64;
-			}
-		} elseif(empty($value)) {
-			//	Empty Cell
-			return 1;
-		}
-		$value	= self::flattenSingleValue($value);
-
-		if (($value === NULL) || (is_float($value)) || (is_int($value))) {
-				return 1;
-		} elseif(is_bool($value)) {
-				return 4;
-		} elseif(is_array($value)) {
-				return 64;
-		} elseif(is_string($value)) {
-			//	Errors
-			if ((strlen($value) > 0) && ($value{0} == '#')) {
-				return 16;
-			}
-			return 2;
-		}
-		return 0;
-	}	//	function TYPE()
-
-
-	/**
-	 * Convert a multi-dimensional array to a simple 1-dimensional array
-	 *
-	 * @param	array	$array	Array to be flattened
-	 * @return	array	Flattened array
-	 */
-	public static function flattenArray($array) {
-		if (!is_array($array)) {
-			return (array) $array;
-		}
-
-		$arrayValues = array();
-		foreach ($array as $value) {
-			if (is_array($value)) {
-				foreach ($value as $val) {
-					if (is_array($val)) {
-						foreach ($val as $v) {
-							$arrayValues[] = $v;
-						}
-					} else {
-						$arrayValues[] = $val;
-					}
-				}
-			} else {
-				$arrayValues[] = $value;
-			}
-		}
-
-		return $arrayValues;
-	}	//	function flattenArray()
-
-
-	/**
-	 * Convert a multi-dimensional array to a simple 1-dimensional array, but retain an element of indexing
-	 *
-	 * @param	array	$array	Array to be flattened
-	 * @return	array	Flattened array
-	 */
-	public static function flattenArrayIndexed($array) {
-		if (!is_array($array)) {
-			return (array) $array;
-		}
-
-		$arrayValues = array();
-		foreach ($array as $k1 => $value) {
-			if (is_array($value)) {
-				foreach ($value as $k2 => $val) {
-					if (is_array($val)) {
-						foreach ($val as $k3 => $v) {
-							$arrayValues[$k1.'.'.$k2.'.'.$k3] = $v;
-						}
-					} else {
-						$arrayValues[$k1.'.'.$k2] = $val;
-					}
-				}
-			} else {
-				$arrayValues[$k1] = $value;
-			}
-		}
-
-		return $arrayValues;
-	}	//	function flattenArrayIndexed()
-
-
-	/**
-	 * Convert an array to a single scalar value by extracting the first element
-	 *
-	 * @param	mixed		$value		Array or scalar value
-	 * @return	mixed
-	 */
-	public static function flattenSingleValue($value = '') {
-		while (is_array($value)) {
-			$value = array_pop($value);
-		}
-
-		return $value;
-	}	//	function flattenSingleValue()
-
-}	//	class PHPExcel_Calculation_Functions
-
-
-//
-//	There are a few mathematical functions that aren't available on all versions of PHP for all platforms
-//	These functions aren't available in Windows implementations of PHP prior to version 5.3.0
-//	So we test if they do exist for this version of PHP/operating platform; and if not we create them
-//
-if (!function_exists('acosh')) {
-	function acosh($x) {
-		return 2 * log(sqrt(($x + 1) / 2) + sqrt(($x - 1) / 2));
-	}	//	function acosh()
-}
-
-if (!function_exists('asinh')) {
-	function asinh($x) {
-		return log($x + sqrt(1 + $x * $x));
-	}	//	function asinh()
-}
-
-if (!function_exists('atanh')) {
-	function atanh($x) {
-		return (log(1 + $x) - log(1 - $x)) / 2;
-	}	//	function atanh()
-}
-
-
-//
-//	Strangely, PHP doesn't have a mb_str_replace multibyte function
-//	As we'll only ever use this function with UTF-8 characters, we can simply "hard-code" the character set
-//
-if ((!function_exists('mb_str_replace')) &&
-	(function_exists('mb_substr')) && (function_exists('mb_strlen')) && (function_exists('mb_strpos'))) {
-	function mb_str_replace($search, $replace, $subject) {
-		if(is_array($subject)) {
-			$ret = array();
-			foreach($subject as $key => $val) {
-				$ret[$key] = mb_str_replace($search, $replace, $val);
-			}
-			return $ret;
-		}
-
-		foreach((array) $search as $key => $s) {
-			if($s == '' && $s !== 0) {
-				continue;
-			}
-			$r = !is_array($replace) ? $replace : (array_key_exists($key, $replace) ? $replace[$key] : '');
-			$pos = mb_strpos($subject, $s, 0, 'UTF-8');
-			while($pos !== false) {
-				$subject = mb_substr($subject, 0, $pos, 'UTF-8') . $r . mb_substr($subject, $pos + mb_strlen($s, 'UTF-8'), 65535, 'UTF-8');
-				$pos = mb_strpos($subject, $s, $pos + mb_strlen($r, 'UTF-8'), 'UTF-8');
-			}
-		}
-		return $subject;
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Logical.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Logical.php
deleted file mode 100644
index 48fdb17f4e2..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Logical.php
+++ /dev/null
@@ -1,288 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/**
- * PHPExcel_Calculation_Logical
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Logical {
-
-	/**
-	 * TRUE
-	 *
-	 * Returns the boolean TRUE.
-	 *
-	 * Excel Function:
-	 *		=TRUE()
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @return	boolean		True
-	 */
-	public static function TRUE() {
-		return TRUE;
-	}	//	function TRUE()
-
-
-	/**
-	 * FALSE
-	 *
-	 * Returns the boolean FALSE.
-	 *
-	 * Excel Function:
-	 *		=FALSE()
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @return	boolean		False
-	 */
-	public static function FALSE() {
-		return FALSE;
-	}	//	function FALSE()
-
-
-	/**
-	 * LOGICAL_AND
-	 *
-	 * Returns boolean TRUE if all its arguments are TRUE; returns FALSE if one or more argument is FALSE.
-	 *
-	 * Excel Function:
-	 *		=AND(logical1[,logical2[, ...]])
-	 *
-	 *		The arguments must evaluate to logical values such as TRUE or FALSE, or the arguments must be arrays
-	 *			or references that contain logical values.
-	 *
-	 *		Boolean arguments are treated as True or False as appropriate
-	 *		Integer or floating point arguments are treated as True, except for 0 or 0.0 which are False
-	 *		If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string holds
-	 *			the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	boolean		The logical AND of the arguments.
-	 */
-	public static function LOGICAL_AND() {
-		// Return value
-		$returnValue = TRUE;
-
-		// Loop through the arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		$argCount = -1;
-		foreach ($aArgs as $argCount => $arg) {
-			// Is it a boolean value?
-			if (is_bool($arg)) {
-				$returnValue = $returnValue && $arg;
-			} elseif ((is_numeric($arg)) && (!is_string($arg))) {
-				$returnValue = $returnValue && ($arg != 0);
-			} elseif (is_string($arg)) {
-				$arg = strtoupper($arg);
-				if (($arg == 'TRUE') || ($arg == PHPExcel_Calculation::getTRUE())) {
-					$arg = TRUE;
-				} elseif (($arg == 'FALSE') || ($arg == PHPExcel_Calculation::getFALSE())) {
-					$arg = FALSE;
-				} else {
-					return PHPExcel_Calculation_Functions::VALUE();
-				}
-				$returnValue = $returnValue && ($arg != 0);
-			}
-		}
-
-		// Return
-		if ($argCount < 0) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		return $returnValue;
-	}	//	function LOGICAL_AND()
-
-
-	/**
-	 * LOGICAL_OR
-	 *
-	 * Returns boolean TRUE if any argument is TRUE; returns FALSE if all arguments are FALSE.
-	 *
-	 * Excel Function:
-	 *		=OR(logical1[,logical2[, ...]])
-	 *
-	 *		The arguments must evaluate to logical values such as TRUE or FALSE, or the arguments must be arrays
-	 *			or references that contain logical values.
-	 *
-	 *		Boolean arguments are treated as True or False as appropriate
-	 *		Integer or floating point arguments are treated as True, except for 0 or 0.0 which are False
-	 *		If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string holds
-	 *			the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	boolean		The logical OR of the arguments.
-	 */
-	public static function LOGICAL_OR() {
-		// Return value
-		$returnValue = FALSE;
-
-		// Loop through the arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		$argCount = -1;
-		foreach ($aArgs as $argCount => $arg) {
-			// Is it a boolean value?
-			if (is_bool($arg)) {
-				$returnValue = $returnValue || $arg;
-			} elseif ((is_numeric($arg)) && (!is_string($arg))) {
-				$returnValue = $returnValue || ($arg != 0);
-			} elseif (is_string($arg)) {
-				$arg = strtoupper($arg);
-				if (($arg == 'TRUE') || ($arg == PHPExcel_Calculation::getTRUE())) {
-					$arg = TRUE;
-				} elseif (($arg == 'FALSE') || ($arg == PHPExcel_Calculation::getFALSE())) {
-					$arg = FALSE;
-				} else {
-					return PHPExcel_Calculation_Functions::VALUE();
-				}
-				$returnValue = $returnValue || ($arg != 0);
-			}
-		}
-
-		// Return
-		if ($argCount < 0) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		return $returnValue;
-	}	//	function LOGICAL_OR()
-
-
-	/**
-	 * NOT
-	 *
-	 * Returns the boolean inverse of the argument.
-	 *
-	 * Excel Function:
-	 *		=NOT(logical)
-	 *
-	 *		The argument must evaluate to a logical value such as TRUE or FALSE
-	 *
-	 *		Boolean arguments are treated as True or False as appropriate
-	 *		Integer or floating point arguments are treated as True, except for 0 or 0.0 which are False
-	 *		If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string holds
-	 *			the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @param	mixed		$logical	A value or expression that can be evaluated to TRUE or FALSE
-	 * @return	boolean		The boolean inverse of the argument.
-	 */
-	public static function NOT($logical=FALSE) {
-		$logical = PHPExcel_Calculation_Functions::flattenSingleValue($logical);
-		if (is_string($logical)) {
-			$logical = strtoupper($logical);
-			if (($logical == 'TRUE') || ($logical == PHPExcel_Calculation::getTRUE())) {
-				return FALSE;
-			} elseif (($logical == 'FALSE') || ($logical == PHPExcel_Calculation::getFALSE())) {
-				return TRUE;
-			} else {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-		}
-
-		return !$logical;
-	}	//	function NOT()
-
-	/**
-	 * STATEMENT_IF
-	 *
-	 * Returns one value if a condition you specify evaluates to TRUE and another value if it evaluates to FALSE.
-	 *
-	 * Excel Function:
-	 *		=IF(condition[,returnIfTrue[,returnIfFalse]])
-	 *
-	 *		Condition is any value or expression that can be evaluated to TRUE or FALSE.
-	 *			For example, A10=100 is a logical expression; if the value in cell A10 is equal to 100,
-	 *			the expression evaluates to TRUE. Otherwise, the expression evaluates to FALSE.
-	 *			This argument can use any comparison calculation operator.
-	 *		ReturnIfTrue is the value that is returned if condition evaluates to TRUE.
-	 *			For example, if this argument is the text string "Within budget" and the condition argument evaluates to TRUE,
-	 *			then the IF function returns the text "Within budget"
-	 *			If condition is TRUE and ReturnIfTrue is blank, this argument returns 0 (zero). To display the word TRUE, use
-	 *			the logical value TRUE for this argument.
-	 *			ReturnIfTrue can be another formula.
-	 *		ReturnIfFalse is the value that is returned if condition evaluates to FALSE.
-	 *			For example, if this argument is the text string "Over budget" and the condition argument evaluates to FALSE,
-	 *			then the IF function returns the text "Over budget".
-	 *			If condition is FALSE and ReturnIfFalse is omitted, then the logical value FALSE is returned.
-	 *			If condition is FALSE and ReturnIfFalse is blank, then the value 0 (zero) is returned.
-	 *			ReturnIfFalse can be another formula.
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @param	mixed	$condition		Condition to evaluate
-	 * @param	mixed	$returnIfTrue	Value to return when condition is true
-	 * @param	mixed	$returnIfFalse	Optional value to return when condition is false
-	 * @return	mixed	The value of returnIfTrue or returnIfFalse determined by condition
-	 */
-	public static function STATEMENT_IF($condition = TRUE, $returnIfTrue = 0, $returnIfFalse = FALSE) {
-		$condition		= (is_null($condition))		? TRUE :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($condition);
-		$returnIfTrue	= (is_null($returnIfTrue))	? 0 :		PHPExcel_Calculation_Functions::flattenSingleValue($returnIfTrue);
-		$returnIfFalse	= (is_null($returnIfFalse))	? FALSE :	PHPExcel_Calculation_Functions::flattenSingleValue($returnIfFalse);
-
-		return ($condition) ? $returnIfTrue : $returnIfFalse;
-	}	//	function STATEMENT_IF()
-
-
-	/**
-	 * IFERROR
-	 *
-	 * Excel Function:
-	 *		=IFERROR(testValue,errorpart)
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @param	mixed	$testValue	Value to check, is also the value returned when no error
-	 * @param	mixed	$errorpart	Value to return when testValue is an error condition
-	 * @return	mixed	The value of errorpart or testValue determined by error condition
-	 */
-	public static function IFERROR($testValue = '', $errorpart = '') {
-		$testValue	= (is_null($testValue))	? '' :	PHPExcel_Calculation_Functions::flattenSingleValue($testValue);
-		$errorpart	= (is_null($errorpart))	? '' :	PHPExcel_Calculation_Functions::flattenSingleValue($errorpart);
-
-		return self::STATEMENT_IF(PHPExcel_Calculation_Functions::IS_ERROR($testValue), $errorpart, $testValue);
-	}	//	function IFERROR()
-
-}	//	class PHPExcel_Calculation_Logical
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/LookupRef.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/LookupRef.php
deleted file mode 100644
index 75e7f69cee5..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/LookupRef.php
+++ /dev/null
@@ -1,876 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/**
- * PHPExcel_Calculation_LookupRef
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_LookupRef {
-
-
-	/**
-	 * CELL_ADDRESS
-	 *
-	 * Creates a cell address as text, given specified row and column numbers.
-	 *
-	 * Excel Function:
-	 *		=ADDRESS(row, column, [relativity], [referenceStyle], [sheetText])
-	 *
-	 * @param	row				Row number to use in the cell reference
-	 * @param	column			Column number to use in the cell reference
-	 * @param	relativity		Flag indicating the type of reference to return
-	 *								1 or omitted	Absolute
-	 *								2				Absolute row; relative column
-	 *								3				Relative row; absolute column
-	 *								4				Relative
-	 * @param	referenceStyle	A logical value that specifies the A1 or R1C1 reference style.
-	 *								TRUE or omitted		CELL_ADDRESS returns an A1-style reference
-	 *								FALSE				CELL_ADDRESS returns an R1C1-style reference
-	 * @param	sheetText		Optional Name of worksheet to use
-	 * @return	string
-	 */
-	public static function CELL_ADDRESS($row, $column, $relativity=1, $referenceStyle=True, $sheetText='') {
-		$row		= PHPExcel_Calculation_Functions::flattenSingleValue($row);
-		$column		= PHPExcel_Calculation_Functions::flattenSingleValue($column);
-		$relativity	= PHPExcel_Calculation_Functions::flattenSingleValue($relativity);
-		$sheetText	= PHPExcel_Calculation_Functions::flattenSingleValue($sheetText);
-
-		if (($row < 1) || ($column < 1)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if ($sheetText > '') {
-			if (strpos($sheetText,' ') !== False) { $sheetText = "'".$sheetText."'"; }
-			$sheetText .='!';
-		}
-		if ((!is_bool($referenceStyle)) || $referenceStyle) {
-			$rowRelative = $columnRelative = '$';
-			$column = PHPExcel_Cell::stringFromColumnIndex($column-1);
-			if (($relativity == 2) || ($relativity == 4)) { $columnRelative = ''; }
-			if (($relativity == 3) || ($relativity == 4)) { $rowRelative = ''; }
-			return $sheetText.$columnRelative.$column.$rowRelative.$row;
-		} else {
-			if (($relativity == 2) || ($relativity == 4)) { $column = '['.$column.']'; }
-			if (($relativity == 3) || ($relativity == 4)) { $row = '['.$row.']'; }
-			return $sheetText.'R'.$row.'C'.$column;
-		}
-	}	//	function CELL_ADDRESS()
-
-
-	/**
-	 * COLUMN
-	 *
-	 * Returns the column number of the given cell reference
-	 * If the cell reference is a range of cells, COLUMN returns the column numbers of each column in the reference as a horizontal array.
-	 * If cell reference is omitted, and the function is being called through the calculation engine, then it is assumed to be the
-	 *		reference of the cell in which the COLUMN function appears; otherwise this function returns 0.
-	 *
-	 * Excel Function:
-	 *		=COLUMN([cellAddress])
-	 *
-	 * @param	cellAddress		A reference to a range of cells for which you want the column numbers
-	 * @return	integer or array of integer
-	 */
-	public static function COLUMN($cellAddress=Null) {
-		if (is_null($cellAddress) || trim($cellAddress) === '') { return 0; }
-
-		if (is_array($cellAddress)) {
-			foreach($cellAddress as $columnKey => $value) {
-				$columnKey = preg_replace('/[^a-z]/i','',$columnKey);
-				return (integer) PHPExcel_Cell::columnIndexFromString($columnKey);
-			}
-		} else {
-			if (strpos($cellAddress,'!') !== false) {
-				list($sheet,$cellAddress) = explode('!',$cellAddress);
-			}
-			if (strpos($cellAddress,':') !== false) {
-				list($startAddress,$endAddress) = explode(':',$cellAddress);
-				$startAddress = preg_replace('/[^a-z]/i','',$startAddress);
-				$endAddress = preg_replace('/[^a-z]/i','',$endAddress);
-				$returnValue = array();
-				do {
-					$returnValue[] = (integer) PHPExcel_Cell::columnIndexFromString($startAddress);
-				} while ($startAddress++ != $endAddress);
-				return $returnValue;
-			} else {
-				$cellAddress = preg_replace('/[^a-z]/i','',$cellAddress);
-				return (integer) PHPExcel_Cell::columnIndexFromString($cellAddress);
-			}
-		}
-	}	//	function COLUMN()
-
-
-	/**
-	 * COLUMNS
-	 *
-	 * Returns the number of columns in an array or reference.
-	 *
-	 * Excel Function:
-	 *		=COLUMNS(cellAddress)
-	 *
-	 * @param	cellAddress		An array or array formula, or a reference to a range of cells for which you want the number of columns
-	 * @return	integer			The number of columns in cellAddress
-	 */
-	public static function COLUMNS($cellAddress=Null) {
-		if (is_null($cellAddress) || $cellAddress === '') {
-			return 1;
-		} elseif (!is_array($cellAddress)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		$x = array_keys($cellAddress);
-		$x = array_shift($x);
-		$isMatrix = (is_numeric($x));
-		list($columns,$rows) = PHPExcel_Calculation::_getMatrixDimensions($cellAddress);
-
-		if ($isMatrix) {
-			return $rows;
-		} else {
-			return $columns;
-		}
-	}	//	function COLUMNS()
-
-
-	/**
-	 * ROW
-	 *
-	 * Returns the row number of the given cell reference
-	 * If the cell reference is a range of cells, ROW returns the row numbers of each row in the reference as a vertical array.
-	 * If cell reference is omitted, and the function is being called through the calculation engine, then it is assumed to be the
-	 *		reference of the cell in which the ROW function appears; otherwise this function returns 0.
-	 *
-	 * Excel Function:
-	 *		=ROW([cellAddress])
-	 *
-	 * @param	cellAddress		A reference to a range of cells for which you want the row numbers
-	 * @return	integer or array of integer
-	 */
-	public static function ROW($cellAddress=Null) {
-		if (is_null($cellAddress) || trim($cellAddress) === '') { return 0; }
-
-		if (is_array($cellAddress)) {
-			foreach($cellAddress as $columnKey => $rowValue) {
-				foreach($rowValue as $rowKey => $cellValue) {
-					return (integer) preg_replace('/[^0-9]/i','',$rowKey);
-				}
-			}
-		} else {
-			if (strpos($cellAddress,'!') !== false) {
-				list($sheet,$cellAddress) = explode('!',$cellAddress);
-			}
-			if (strpos($cellAddress,':') !== false) {
-				list($startAddress,$endAddress) = explode(':',$cellAddress);
-				$startAddress = preg_replace('/[^0-9]/','',$startAddress);
-				$endAddress = preg_replace('/[^0-9]/','',$endAddress);
-				$returnValue = array();
-				do {
-					$returnValue[][] = (integer) $startAddress;
-				} while ($startAddress++ != $endAddress);
-				return $returnValue;
-			} else {
-				list($cellAddress) = explode(':',$cellAddress);
-				return (integer) preg_replace('/[^0-9]/','',$cellAddress);
-			}
-		}
-	}	//	function ROW()
-
-
-	/**
-	 * ROWS
-	 *
-	 * Returns the number of rows in an array or reference.
-	 *
-	 * Excel Function:
-	 *		=ROWS(cellAddress)
-	 *
-	 * @param	cellAddress		An array or array formula, or a reference to a range of cells for which you want the number of rows
-	 * @return	integer			The number of rows in cellAddress
-	 */
-	public static function ROWS($cellAddress=Null) {
-		if (is_null($cellAddress) || $cellAddress === '') {
-			return 1;
-		} elseif (!is_array($cellAddress)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		$i = array_keys($cellAddress);
-		$isMatrix = (is_numeric(array_shift($i)));
-		list($columns,$rows) = PHPExcel_Calculation::_getMatrixDimensions($cellAddress);
-
-		if ($isMatrix) {
-			return $columns;
-		} else {
-			return $rows;
-		}
-	}	//	function ROWS()
-
-
-	/**
-	 * HYPERLINK
-	 *
-	 * Excel Function:
-	 *		=HYPERLINK(linkURL,displayName)
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @param	string			$linkURL		Value to check, is also the value returned when no error
-	 * @param	string			$displayName	Value to return when testValue is an error condition
-	 * @param	PHPExcel_Cell	$pCell			The cell to set the hyperlink in
-	 * @return	mixed	The value of $displayName (or $linkURL if $displayName was blank)
-	 */
-	public static function HYPERLINK($linkURL = '', $displayName = null, PHPExcel_Cell $pCell = null) {
-		$args = func_get_args();
-		$pCell = array_pop($args);
-
-		$linkURL		= (is_null($linkURL))		? '' :	PHPExcel_Calculation_Functions::flattenSingleValue($linkURL);
-		$displayName	= (is_null($displayName))	? '' :	PHPExcel_Calculation_Functions::flattenSingleValue($displayName);
-
-		if ((!is_object($pCell)) || (trim($linkURL) == '')) {
-			return PHPExcel_Calculation_Functions::REF();
-		}
-
-		if ((is_object($displayName)) || trim($displayName) == '') {
-			$displayName = $linkURL;
-		}
-
-		$pCell->getHyperlink()->setUrl($linkURL);
-
-		return $displayName;
-	}	//	function HYPERLINK()
-
-
-	/**
-	 * INDIRECT
-	 *
-	 * Returns the reference specified by a text string.
-	 * References are immediately evaluated to display their contents.
-	 *
-	 * Excel Function:
-	 *		=INDIRECT(cellAddress)
-	 *
-	 * NOTE - INDIRECT() does not yet support the optional a1 parameter introduced in Excel 2010
-	 *
-	 * @param	cellAddress		$cellAddress	The cell address of the current cell (containing this formula)
-	 * @param	PHPExcel_Cell	$pCell			The current cell (containing this formula)
-	 * @return	mixed			The cells referenced by cellAddress
-	 *
-	 * @todo	Support for the optional a1 parameter introduced in Excel 2010
-	 *
-	 */
-	public static function INDIRECT($cellAddress = NULL, PHPExcel_Cell $pCell = NULL) {
-		$cellAddress	= PHPExcel_Calculation_Functions::flattenSingleValue($cellAddress);
-		if (is_null($cellAddress) || $cellAddress === '') {
-			return PHPExcel_Calculation_Functions::REF();
-		}
-
-		$cellAddress1 = $cellAddress;
-		$cellAddress2 = NULL;
-		if (strpos($cellAddress,':') !== false) {
-			list($cellAddress1,$cellAddress2) = explode(':',$cellAddress);
-		}
-
-		if ((!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $cellAddress1, $matches)) ||
-			((!is_null($cellAddress2)) && (!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $cellAddress2, $matches)))) {
-			if (!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $cellAddress1, $matches)) {
-				return PHPExcel_Calculation_Functions::REF();
-			}
-
-			if (strpos($cellAddress,'!') !== FALSE) {
-				list($sheetName, $cellAddress) = explode('!',$cellAddress);
-				$sheetName = trim($sheetName, "'");
-				$pSheet = $pCell->getWorksheet()->getParent()->getSheetByName($sheetName);
-			} else {
-				$pSheet = $pCell->getWorksheet();
-			}
-
-			return PHPExcel_Calculation::getInstance()->extractNamedRange($cellAddress, $pSheet, FALSE);
-		}
-
-		if (strpos($cellAddress,'!') !== FALSE) {
-			list($sheetName,$cellAddress) = explode('!',$cellAddress);
-			$sheetName = trim($sheetName, "'");
-			$pSheet = $pCell->getWorksheet()->getParent()->getSheetByName($sheetName);
-		} else {
-			$pSheet = $pCell->getWorksheet();
-		}
-
-		return PHPExcel_Calculation::getInstance()->extractCellRange($cellAddress, $pSheet, FALSE);
-	}	//	function INDIRECT()
-
-
-	/**
-	 * OFFSET
-	 *
-	 * Returns a reference to a range that is a specified number of rows and columns from a cell or range of cells.
-	 * The reference that is returned can be a single cell or a range of cells. You can specify the number of rows and
-	 * the number of columns to be returned.
-	 *
-	 * Excel Function:
-	 *		=OFFSET(cellAddress, rows, cols, [height], [width])
-	 *
-	 * @param	cellAddress		The reference from which you want to base the offset. Reference must refer to a cell or
-	 *								range of adjacent cells; otherwise, OFFSET returns the #VALUE! error value.
-	 * @param	rows			The number of rows, up or down, that you want the upper-left cell to refer to.
-	 *								Using 5 as the rows argument specifies that the upper-left cell in the reference is
-	 *								five rows below reference. Rows can be positive (which means below the starting reference)
-	 *								or negative (which means above the starting reference).
-	 * @param	cols			The number of columns, to the left or right, that you want the upper-left cell of the result
-	 *								to refer to. Using 5 as the cols argument specifies that the upper-left cell in the
-	 *								reference is five columns to the right of reference. Cols can be positive (which means
-	 *								to the right of the starting reference) or negative (which means to the left of the
-	 *								starting reference).
-	 * @param	height			The height, in number of rows, that you want the returned reference to be. Height must be a positive number.
-	 * @param	width			The width, in number of columns, that you want the returned reference to be. Width must be a positive number.
-	 * @return	string			A reference to a cell or range of cells
-	 */
-	public static function OFFSET($cellAddress=Null,$rows=0,$columns=0,$height=null,$width=null) {
-		$rows		= PHPExcel_Calculation_Functions::flattenSingleValue($rows);
-		$columns	= PHPExcel_Calculation_Functions::flattenSingleValue($columns);
-		$height		= PHPExcel_Calculation_Functions::flattenSingleValue($height);
-		$width		= PHPExcel_Calculation_Functions::flattenSingleValue($width);
-		if ($cellAddress == Null) {
-			return 0;
-		}
-
-		$args = func_get_args();
-		$pCell = array_pop($args);
-		if (!is_object($pCell)) {
-			return PHPExcel_Calculation_Functions::REF();
-		}
-
-		$sheetName = NULL;
-		if (strpos($cellAddress,"!")) {
-			list($sheetName,$cellAddress) = explode("!",$cellAddress);
-			$sheetName = trim($sheetName, "'");
-		}
-		if (strpos($cellAddress,":")) {
-			list($startCell,$endCell) = explode(":",$cellAddress);
-		} else {
-			$startCell = $endCell = $cellAddress;
-		}
-		list($startCellColumn,$startCellRow) = PHPExcel_Cell::coordinateFromString($startCell);
-		list($endCellColumn,$endCellRow) = PHPExcel_Cell::coordinateFromString($endCell);
-
-		$startCellRow += $rows;
-		$startCellColumn = PHPExcel_Cell::columnIndexFromString($startCellColumn) - 1;
-		$startCellColumn += $columns;
-
-		if (($startCellRow <= 0) || ($startCellColumn < 0)) {
-			return PHPExcel_Calculation_Functions::REF();
-		}
-		$endCellColumn = PHPExcel_Cell::columnIndexFromString($endCellColumn) - 1;
-		if (($width != null) && (!is_object($width))) {
-			$endCellColumn = $startCellColumn + $width - 1;
-		} else {
-			$endCellColumn += $columns;
-		}
-		$startCellColumn = PHPExcel_Cell::stringFromColumnIndex($startCellColumn);
-
-		if (($height != null) && (!is_object($height))) {
-			$endCellRow = $startCellRow + $height - 1;
-		} else {
-			$endCellRow += $rows;
-		}
-
-		if (($endCellRow <= 0) || ($endCellColumn < 0)) {
-			return PHPExcel_Calculation_Functions::REF();
-		}
-		$endCellColumn = PHPExcel_Cell::stringFromColumnIndex($endCellColumn);
-
-		$cellAddress = $startCellColumn.$startCellRow;
-		if (($startCellColumn != $endCellColumn) || ($startCellRow != $endCellRow)) {
-			$cellAddress .= ':'.$endCellColumn.$endCellRow;
-		}
-
-		if ($sheetName !== NULL) {
-			$pSheet = $pCell->getWorksheet()->getParent()->getSheetByName($sheetName);
-		} else {
-			$pSheet = $pCell->getWorksheet();
-		}
-
-		return PHPExcel_Calculation::getInstance()->extractCellRange($cellAddress, $pSheet, False);
-	}	//	function OFFSET()
-
-
-	/**
-	 * CHOOSE
-	 *
-	 * Uses lookup_value to return a value from the list of value arguments.
-	 * Use CHOOSE to select one of up to 254 values based on the lookup_value.
-	 *
-	 * Excel Function:
-	 *		=CHOOSE(index_num, value1, [value2], ...)
-	 *
-	 * @param	index_num		Specifies which value argument is selected.
-	 *							Index_num must be a number between 1 and 254, or a formula or reference to a cell containing a number
-	 *								between 1 and 254.
-	 * @param	value1...		Value1 is required, subsequent values are optional.
-	 *							Between 1 to 254 value arguments from which CHOOSE selects a value or an action to perform based on
-	 *								index_num. The arguments can be numbers, cell references, defined names, formulas, functions, or
-	 *								text.
-	 * @return	mixed			The selected value
-	 */
-	public static function CHOOSE() {
-		$chooseArgs = func_get_args();
-		$chosenEntry = PHPExcel_Calculation_Functions::flattenArray(array_shift($chooseArgs));
-		$entryCount = count($chooseArgs) - 1;
-
-		if(is_array($chosenEntry)) {
-			$chosenEntry = array_shift($chosenEntry);
-		}
-		if ((is_numeric($chosenEntry)) && (!is_bool($chosenEntry))) {
-			--$chosenEntry;
-		} else {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$chosenEntry = floor($chosenEntry);
-		if (($chosenEntry < 0) || ($chosenEntry > $entryCount)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (is_array($chooseArgs[$chosenEntry])) {
-			return PHPExcel_Calculation_Functions::flattenArray($chooseArgs[$chosenEntry]);
-		} else {
-			return $chooseArgs[$chosenEntry];
-		}
-	}	//	function CHOOSE()
-
-
-	/**
-	 * MATCH
-	 *
-	 * The MATCH function searches for a specified item in a range of cells
-	 *
-	 * Excel Function:
-	 *		=MATCH(lookup_value, lookup_array, [match_type])
-	 *
-	 * @param	lookup_value	The value that you want to match in lookup_array
-	 * @param	lookup_array	The range of cells being searched
-	 * @param	match_type		The number -1, 0, or 1. -1 means above, 0 means exact match, 1 means below. If match_type is 1 or -1, the list has to be ordered.
-	 * @return	integer			The relative position of the found item
-	 */
-	public static function MATCH($lookup_value, $lookup_array, $match_type=1) {
-		$lookup_array = PHPExcel_Calculation_Functions::flattenArray($lookup_array);
-		$lookup_value = PHPExcel_Calculation_Functions::flattenSingleValue($lookup_value);
-		$match_type	= (is_null($match_type)) ? 1 : (int) PHPExcel_Calculation_Functions::flattenSingleValue($match_type);
-		//	MATCH is not case sensitive
-		$lookup_value = strtolower($lookup_value);
-
-		//	lookup_value type has to be number, text, or logical values
-		if ((!is_numeric($lookup_value)) && (!is_string($lookup_value)) && (!is_bool($lookup_value))) {
-			return PHPExcel_Calculation_Functions::NA();
-		}
-
-		//	match_type is 0, 1 or -1
-		if (($match_type !== 0) && ($match_type !== -1) && ($match_type !== 1)) {
-			return PHPExcel_Calculation_Functions::NA();
-		}
-
-		//	lookup_array should not be empty
-		$lookupArraySize = count($lookup_array);
-		if ($lookupArraySize <= 0) {
-			return PHPExcel_Calculation_Functions::NA();
-		}
-
-		//	lookup_array should contain only number, text, or logical values, or empty (null) cells
-		foreach($lookup_array as $i => $lookupArrayValue) {
-			//	check the type of the value
-			if ((!is_numeric($lookupArrayValue)) && (!is_string($lookupArrayValue)) &&
-				(!is_bool($lookupArrayValue)) && (!is_null($lookupArrayValue))) {
-				return PHPExcel_Calculation_Functions::NA();
-			}
-			//	convert strings to lowercase for case-insensitive testing
-			if (is_string($lookupArrayValue)) {
-				$lookup_array[$i] = strtolower($lookupArrayValue);
-			}
-			if ((is_null($lookupArrayValue)) && (($match_type == 1) || ($match_type == -1))) {
-				$lookup_array = array_slice($lookup_array,0,$i-1);
-			}
-		}
-
-		// if match_type is 1 or -1, the list has to be ordered
-		if ($match_type == 1) {
-			asort($lookup_array);
-			$keySet = array_keys($lookup_array);
-		} elseif($match_type == -1) {
-			arsort($lookup_array);
-			$keySet = array_keys($lookup_array);
-		}
-
-		// **
-		// find the match
-		// **
-		// loop on the cells
-//		var_dump($lookup_array);
-//		echo '<br />';
-		foreach($lookup_array as $i => $lookupArrayValue) {
-			if (($match_type == 0) && ($lookupArrayValue == $lookup_value)) {
-				//	exact match
-				return ++$i;
-			} elseif (($match_type == -1) && ($lookupArrayValue <= $lookup_value)) {
-//				echo '$i = '.$i.' => ';
-//				var_dump($lookupArrayValue);
-//				echo '<br />';
-//				echo 'Keyset = ';
-//				var_dump($keySet);
-//				echo '<br />';
-				$i = array_search($i,$keySet);
-//				echo '$i='.$i.'<br />';
-				// if match_type is -1 <=> find the smallest value that is greater than or equal to lookup_value
-				if ($i < 1){
-					// 1st cell was allready smaller than the lookup_value
-					break;
-				} else {
-					// the previous cell was the match
-					return $keySet[$i-1]+1;
-				}
-			} elseif (($match_type == 1) && ($lookupArrayValue >= $lookup_value)) {
-//				echo '$i = '.$i.' => ';
-//				var_dump($lookupArrayValue);
-//				echo '<br />';
-//				echo 'Keyset = ';
-//				var_dump($keySet);
-//				echo '<br />';
-				$i = array_search($i,$keySet);
-//				echo '$i='.$i.'<br />';
-				// if match_type is 1 <=> find the largest value that is less than or equal to lookup_value
-				if ($i < 1){
-					// 1st cell was allready bigger than the lookup_value
-					break;
-				} else {
-					// the previous cell was the match
-					return $keySet[$i-1]+1;
-				}
-			}
-		}
-
-		//	unsuccessful in finding a match, return #N/A error value
-		return PHPExcel_Calculation_Functions::NA();
-	}	//	function MATCH()
-
-
-	/**
-	 * INDEX
-	 *
-	 * Uses an index to choose a value from a reference or array
-	 *
-	 * Excel Function:
-	 *		=INDEX(range_array, row_num, [column_num])
-	 *
-	 * @param	range_array		A range of cells or an array constant
-	 * @param	row_num			The row in array from which to return a value. If row_num is omitted, column_num is required.
-	 * @param	column_num		The column in array from which to return a value. If column_num is omitted, row_num is required.
-	 * @return	mixed			the value of a specified cell or array of cells
-	 */
-	public static function INDEX($arrayValues,$rowNum = 0,$columnNum = 0) {
-
-		if (($rowNum < 0) || ($columnNum < 0)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (!is_array($arrayValues)) {
-			return PHPExcel_Calculation_Functions::REF();
-		}
-
-		$rowKeys = array_keys($arrayValues);
-		$columnKeys = @array_keys($arrayValues[$rowKeys[0]]);
-
-		if ($columnNum > count($columnKeys)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		} elseif ($columnNum == 0) {
-			if ($rowNum == 0) {
-				return $arrayValues;
-			}
-			$rowNum = $rowKeys[--$rowNum];
-			$returnArray = array();
-			foreach($arrayValues as $arrayColumn) {
-				if (is_array($arrayColumn)) {
-					if (isset($arrayColumn[$rowNum])) {
-						$returnArray[] = $arrayColumn[$rowNum];
-					} else {
-						return $arrayValues[$rowNum];
-					}
-				} else {
-					return $arrayValues[$rowNum];
-				}
-			}
-			return $returnArray;
-		}
-		$columnNum = $columnKeys[--$columnNum];
-		if ($rowNum > count($rowKeys)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		} elseif ($rowNum == 0) {
-			return $arrayValues[$columnNum];
-		}
-		$rowNum = $rowKeys[--$rowNum];
-
-		return $arrayValues[$rowNum][$columnNum];
-	}	//	function INDEX()
-
-
-	/**
-	 * TRANSPOSE
-	 *
-	 * @param	array	$matrixData	A matrix of values
-	 * @return	array
-	 *
-	 * Unlike the Excel TRANSPOSE function, which will only work on a single row or column, this function will transpose a full matrix.
-	 */
-	public static function TRANSPOSE($matrixData) {
-		$returnMatrix = array();
-		if (!is_array($matrixData)) { $matrixData = array(array($matrixData)); }
-
-		$column = 0;
-		foreach($matrixData as $matrixRow) {
-			$row = 0;
-			foreach($matrixRow as $matrixCell) {
-				$returnMatrix[$row][$column] = $matrixCell;
-				++$row;
-			}
-			++$column;
-		}
-		return $returnMatrix;
-	}	//	function TRANSPOSE()
-
-
-	private static function _vlookupSort($a,$b) {
-		$f = array_keys($a);
-		$firstColumn = array_shift($f);
-		if (strtolower($a[$firstColumn]) == strtolower($b[$firstColumn])) {
-			return 0;
-		}
-		return (strtolower($a[$firstColumn]) < strtolower($b[$firstColumn])) ? -1 : 1;
-	}	//	function _vlookupSort()
-
-
-	/**
-	* VLOOKUP
-	* The VLOOKUP function searches for value in the left-most column of lookup_array and returns the value in the same row based on the index_number.
-	* @param	lookup_value	The value that you want to match in lookup_array
-	* @param	lookup_array	The range of cells being searched
-	* @param	index_number	The column number in table_array from which the matching value must be returned. The first column is 1.
-	* @param	not_exact_match	Determines if you are looking for an exact match based on lookup_value.
-	* @return	mixed			The value of the found cell
-	*/
-	public static function VLOOKUP($lookup_value, $lookup_array, $index_number, $not_exact_match=true) {
-		$lookup_value	= PHPExcel_Calculation_Functions::flattenSingleValue($lookup_value);
-		$index_number	= PHPExcel_Calculation_Functions::flattenSingleValue($index_number);
-		$not_exact_match	= PHPExcel_Calculation_Functions::flattenSingleValue($not_exact_match);
-
-		// index_number must be greater than or equal to 1
-		if ($index_number < 1) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		// index_number must be less than or equal to the number of columns in lookup_array
-		if ((!is_array($lookup_array)) || (empty($lookup_array))) {
-			return PHPExcel_Calculation_Functions::REF();
-		} else {
-			$f = array_keys($lookup_array);
-			$firstRow = array_pop($f);
-			if ((!is_array($lookup_array[$firstRow])) || ($index_number > count($lookup_array[$firstRow]))) {
-				return PHPExcel_Calculation_Functions::REF();
-			} else {
-				$columnKeys = array_keys($lookup_array[$firstRow]);
-				$returnColumn = $columnKeys[--$index_number];
-				$firstColumn = array_shift($columnKeys);
-			}
-		}
-
-		if (!$not_exact_match) {
-			uasort($lookup_array,array('self','_vlookupSort'));
-		}
-
-		$rowNumber = $rowValue = False;
-		foreach($lookup_array as $rowKey => $rowData) {
-			if ((is_numeric($lookup_value) && is_numeric($rowData[$firstColumn]) && ($rowData[$firstColumn] > $lookup_value)) ||
-				(!is_numeric($lookup_value) && !is_numeric($rowData[$firstColumn]) && (strtolower($rowData[$firstColumn]) > strtolower($lookup_value)))) {
-				break;
-			}
-			$rowNumber = $rowKey;
-			$rowValue = $rowData[$firstColumn];
-		}
-
-		if ($rowNumber !== false) {
-			if ((!$not_exact_match) && ($rowValue != $lookup_value)) {
-				//	if an exact match is required, we have what we need to return an appropriate response
-				return PHPExcel_Calculation_Functions::NA();
-			} else {
-				//	otherwise return the appropriate value
-				return $lookup_array[$rowNumber][$returnColumn];
-			}
-		}
-
-		return PHPExcel_Calculation_Functions::NA();
-	}	//	function VLOOKUP()
-
-
-/**
-    * HLOOKUP
-    * The HLOOKUP function searches for value in the top-most row of lookup_array and returns the value in the same column based on the index_number.
-    * @param    lookup_value    The value that you want to match in lookup_array
-    * @param    lookup_array    The range of cells being searched
-    * @param    index_number    The row number in table_array from which the matching value must be returned. The first row is 1.
-    * @param    not_exact_match Determines if you are looking for an exact match based on lookup_value.
-    * @return   mixed           The value of the found cell
-    */
-    public static function HLOOKUP($lookup_value, $lookup_array, $index_number, $not_exact_match=true) {
-        $lookup_value   = PHPExcel_Calculation_Functions::flattenSingleValue($lookup_value);
-        $index_number   = PHPExcel_Calculation_Functions::flattenSingleValue($index_number);
-        $not_exact_match    = PHPExcel_Calculation_Functions::flattenSingleValue($not_exact_match);
-
-        // index_number must be greater than or equal to 1
-        if ($index_number < 1) {
-            return PHPExcel_Calculation_Functions::VALUE();
-        }
-
-        // index_number must be less than or equal to the number of columns in lookup_array
-        if ((!is_array($lookup_array)) || (empty($lookup_array))) {
-            return PHPExcel_Calculation_Functions::REF();
-        } else {
-            $f = array_keys($lookup_array);
-            $firstRow = array_pop($f);
-            if ((!is_array($lookup_array[$firstRow])) || ($index_number > count($lookup_array[$firstRow]))) {
-                return PHPExcel_Calculation_Functions::REF();
-            } else {
-                $columnKeys = array_keys($lookup_array[$firstRow]);
-                                $firstkey = $f[0] - 1;
-                $returnColumn = $firstkey + $index_number;
-                $firstColumn = array_shift($f);
-            }
-        }
-
-        if (!$not_exact_match) {
-            $firstRowH = asort($lookup_array[$firstColumn]);
-        }
-
-        $rowNumber = $rowValue = False;
-        foreach($lookup_array[$firstColumn] as $rowKey => $rowData) {
-			if ((is_numeric($lookup_value) && is_numeric($rowData) && ($rowData > $lookup_value)) ||
-				(!is_numeric($lookup_value) && !is_numeric($rowData) && (strtolower($rowData) > strtolower($lookup_value)))) {
-                break;
-            }
-            $rowNumber = $rowKey;
-            $rowValue = $rowData;
-        }
-
-        if ($rowNumber !== false) {
-            if ((!$not_exact_match) && ($rowValue != $lookup_value)) {
-                //  if an exact match is required, we have what we need to return an appropriate response
-                return PHPExcel_Calculation_Functions::NA();
-            } else {
-                //  otherwise return the appropriate value
-                return $lookup_array[$returnColumn][$rowNumber];
-            }
-        }
-
-        return PHPExcel_Calculation_Functions::NA();
-    }   //  function HLOOKUP()
-
-
-	/**
-	 * LOOKUP
-	 * The LOOKUP function searches for value either from a one-row or one-column range or from an array.
-	 * @param	lookup_value	The value that you want to match in lookup_array
-	 * @param	lookup_vector	The range of cells being searched
-	 * @param	result_vector	The column from which the matching value must be returned
-	 * @return	mixed			The value of the found cell
-	 */
-	public static function LOOKUP($lookup_value, $lookup_vector, $result_vector=null) {
-		$lookup_value	= PHPExcel_Calculation_Functions::flattenSingleValue($lookup_value);
-
-		if (!is_array($lookup_vector)) {
-			return PHPExcel_Calculation_Functions::NA();
-		}
-		$lookupRows = count($lookup_vector);
-		$l = array_keys($lookup_vector);
-		$l = array_shift($l);
-		$lookupColumns = count($lookup_vector[$l]);
-		if ((($lookupRows == 1) && ($lookupColumns > 1)) || (($lookupRows == 2) && ($lookupColumns != 2))) {
-			$lookup_vector = self::TRANSPOSE($lookup_vector);
-			$lookupRows = count($lookup_vector);
-			$l = array_keys($lookup_vector);
-			$lookupColumns = count($lookup_vector[array_shift($l)]);
-		}
-
-		if (is_null($result_vector)) {
-			$result_vector = $lookup_vector;
-		}
-		$resultRows = count($result_vector);
-		$l = array_keys($result_vector);
-		$l = array_shift($l);
-		$resultColumns = count($result_vector[$l]);
-		if ((($resultRows == 1) && ($resultColumns > 1)) || (($resultRows == 2) && ($resultColumns != 2))) {
-			$result_vector = self::TRANSPOSE($result_vector);
-			$resultRows = count($result_vector);
-			$r = array_keys($result_vector);
-			$resultColumns = count($result_vector[array_shift($r)]);
-		}
-
-		if ($lookupRows == 2) {
-			$result_vector = array_pop($lookup_vector);
-			$lookup_vector = array_shift($lookup_vector);
-		}
-		if ($lookupColumns != 2) {
-			foreach($lookup_vector as &$value) {
-				if (is_array($value)) {
-					$k = array_keys($value);
-					$key1 = $key2 = array_shift($k);
-					$key2++;
-					$dataValue1 = $value[$key1];
-				} else {
-					$key1 = 0;
-					$key2 = 1;
-					$dataValue1 = $value;
-				}
-				$dataValue2 = array_shift($result_vector);
-				if (is_array($dataValue2)) {
-					$dataValue2 = array_shift($dataValue2);
-				}
-				$value = array($key1 => $dataValue1, $key2 => $dataValue2);
-			}
-			unset($value);
-		}
-
-		return self::VLOOKUP($lookup_value,$lookup_vector,2);
- 	}	//	function LOOKUP()
-
-}	//	class PHPExcel_Calculation_LookupRef
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/MathTrig.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/MathTrig.php
deleted file mode 100644
index 689d59ffce9..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/MathTrig.php
+++ /dev/null
@@ -1,1376 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/**
- * PHPExcel_Calculation_MathTrig
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_MathTrig {
-
-	//
-	//	Private method to return an array of the factors of the input value
-	//
-	private static function _factors($value) {
-		$startVal = floor(sqrt($value));
-
-		$factorArray = array();
-		for ($i = $startVal; $i > 1; --$i) {
-			if (($value % $i) == 0) {
-				$factorArray = array_merge($factorArray,self::_factors($value / $i));
-				$factorArray = array_merge($factorArray,self::_factors($i));
-				if ($i <= sqrt($value)) {
-					break;
-				}
-			}
-		}
-		if (!empty($factorArray)) {
-			rsort($factorArray);
-			return $factorArray;
-		} else {
-			return array((integer) $value);
-		}
-	}	//	function _factors()
-
-
-	private static function _romanCut($num, $n) {
-		return ($num - ($num % $n ) ) / $n;
-	}	//	function _romanCut()
-
-
-	/**
-	 * ATAN2
-	 *
-	 * This function calculates the arc tangent of the two variables x and y. It is similar to
-	 *		calculating the arc tangent of y ÷ x, except that the signs of both arguments are used
-	 *		to determine the quadrant of the result.
-	 * The arctangent is the angle from the x-axis to a line containing the origin (0, 0) and a
-	 *		point with coordinates (xCoordinate, yCoordinate). The angle is given in radians between
-	 *		-pi and pi, excluding -pi.
-	 *
-	 * Note that the Excel ATAN2() function accepts its arguments in the reverse order to the standard
-	 *		PHP atan2() function, so we need to reverse them here before calling the PHP atan() function.
-	 *
-	 * Excel Function:
-	 *		ATAN2(xCoordinate,yCoordinate)
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	float	$xCoordinate		The x-coordinate of the point.
-	 * @param	float	$yCoordinate		The y-coordinate of the point.
-	 * @return	float	The inverse tangent of the specified x- and y-coordinates.
-	 */
-	public static function ATAN2($xCoordinate = NULL, $yCoordinate = NULL) {
-		$xCoordinate	= PHPExcel_Calculation_Functions::flattenSingleValue($xCoordinate);
-		$yCoordinate	= PHPExcel_Calculation_Functions::flattenSingleValue($yCoordinate);
-
-		$xCoordinate	= ($xCoordinate !== NULL)	? $xCoordinate : 0.0;
-		$yCoordinate	= ($yCoordinate !== NULL)	? $yCoordinate : 0.0;
-
-		if (((is_numeric($xCoordinate)) || (is_bool($xCoordinate))) &&
-			((is_numeric($yCoordinate)))  || (is_bool($yCoordinate))) {
-			$xCoordinate	= (float) $xCoordinate;
-			$yCoordinate	= (float) $yCoordinate;
-
-			if (($xCoordinate == 0) && ($yCoordinate == 0)) {
-				return PHPExcel_Calculation_Functions::DIV0();
-			}
-
-			return atan2($yCoordinate, $xCoordinate);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function ATAN2()
-
-
-	/**
-	 * CEILING
-	 *
-	 * Returns number rounded up, away from zero, to the nearest multiple of significance.
-	 *		For example, if you want to avoid using pennies in your prices and your product is
-	 *		priced at $4.42, use the formula =CEILING(4.42,0.05) to round prices up to the
-	 *		nearest nickel.
-	 *
-	 * Excel Function:
-	 *		CEILING(number[,significance])
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	float	$number			The number you want to round.
-	 * @param	float	$significance	The multiple to which you want to round.
-	 * @return	float	Rounded Number
-	 */
-	public static function CEILING($number, $significance = NULL) {
-		$number			= PHPExcel_Calculation_Functions::flattenSingleValue($number);
-		$significance	= PHPExcel_Calculation_Functions::flattenSingleValue($significance);
-
-		if ((is_null($significance)) &&
-			(PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC)) {
-			$significance = $number/abs($number);
-		}
-
-        if ((is_numeric($number)) && (is_numeric($significance))) {
-            if (($number == 0.0 ) || ($significance == 0.0)) {
-				return 0.0;
-			} elseif (self::SIGN($number) == self::SIGN($significance)) {
-				return ceil($number / $significance) * $significance;
-			} else {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function CEILING()
-
-
-	/**
-	 * COMBIN
-	 *
-	 * Returns the number of combinations for a given number of items. Use COMBIN to
-	 *		determine the total possible number of groups for a given number of items.
-	 *
-	 * Excel Function:
-	 *		COMBIN(numObjs,numInSet)
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	int		$numObjs	Number of different objects
-	 * @param	int		$numInSet	Number of objects in each combination
-	 * @return	int		Number of combinations
-	 */
-	public static function COMBIN($numObjs, $numInSet) {
-		$numObjs	= PHPExcel_Calculation_Functions::flattenSingleValue($numObjs);
-		$numInSet	= PHPExcel_Calculation_Functions::flattenSingleValue($numInSet);
-
-		if ((is_numeric($numObjs)) && (is_numeric($numInSet))) {
-			if ($numObjs < $numInSet) {
-				return PHPExcel_Calculation_Functions::NaN();
-			} elseif ($numInSet < 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return round(self::FACT($numObjs) / self::FACT($numObjs - $numInSet)) / self::FACT($numInSet);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function COMBIN()
-
-
-	/**
-	 * EVEN
-	 *
-	 * Returns number rounded up to the nearest even integer.
-	 * You can use this function for processing items that come in twos. For example,
-	 *		a packing crate accepts rows of one or two items. The crate is full when
-	 *		the number of items, rounded up to the nearest two, matches the crate's
-	 *		capacity.
-	 *
-	 * Excel Function:
-	 *		EVEN(number)
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	float	$number			Number to round
-	 * @return	int		Rounded Number
-	 */
-	public static function EVEN($number) {
-		$number	= PHPExcel_Calculation_Functions::flattenSingleValue($number);
-
-		if (is_null($number)) {
-			return 0;
-		} elseif (is_bool($number)) {
-			$number = (int) $number;
-		}
-
-		if (is_numeric($number)) {
-			$significance = 2 * self::SIGN($number);
-			return (int) self::CEILING($number,$significance);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function EVEN()
-
-
-	/**
-	 * FACT
-	 *
-	 * Returns the factorial of a number.
-	 * The factorial of a number is equal to 1*2*3*...* number.
-	 *
-	 * Excel Function:
-	 *		FACT(factVal)
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	float	$factVal	Factorial Value
-	 * @return	int		Factorial
-	 */
-	public static function FACT($factVal) {
-		$factVal	= PHPExcel_Calculation_Functions::flattenSingleValue($factVal);
-
-		if (is_numeric($factVal)) {
-			if ($factVal < 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$factLoop = floor($factVal);
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
-				if ($factVal > $factLoop) {
-					return PHPExcel_Calculation_Functions::NaN();
-				}
-			}
-
-			$factorial = 1;
-			while ($factLoop > 1) {
-				$factorial *= $factLoop--;
-			}
-			return $factorial ;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function FACT()
-
-
-	/**
-	 * FACTDOUBLE
-	 *
-	 * Returns the double factorial of a number.
-	 *
-	 * Excel Function:
-	 *		FACTDOUBLE(factVal)
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	float	$factVal	Factorial Value
-	 * @return	int		Double Factorial
-	 */
-	public static function FACTDOUBLE($factVal) {
-		$factLoop	= PHPExcel_Calculation_Functions::flattenSingleValue($factVal);
-
-		if (is_numeric($factLoop)) {
-			$factLoop	= floor($factLoop);
-			if ($factVal < 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$factorial = 1;
-			while ($factLoop > 1) {
-				$factorial *= $factLoop--;
-				--$factLoop;
-			}
-			return $factorial ;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function FACTDOUBLE()
-
-
-	/**
-	 * FLOOR
-	 *
-	 * Rounds number down, toward zero, to the nearest multiple of significance.
-	 *
-	 * Excel Function:
-	 *		FLOOR(number[,significance])
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	float	$number			Number to round
-	 * @param	float	$significance	Significance
-	 * @return	float	Rounded Number
-	 */
-	public static function FLOOR($number, $significance = NULL) {
-		$number			= PHPExcel_Calculation_Functions::flattenSingleValue($number);
-		$significance	= PHPExcel_Calculation_Functions::flattenSingleValue($significance);
-
-		if ((is_null($significance)) && (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC)) {
-			$significance = $number/abs($number);
-		}
-
-		if ((is_numeric($number)) && (is_numeric($significance))) {
-            if ($significance == 0.0) {
-                return PHPExcel_Calculation_Functions::DIV0();
-            } elseif ($number == 0.0) {
-				return 0.0;
-			} elseif (self::SIGN($number) == self::SIGN($significance)) {
-				return floor($number / $significance) * $significance;
-			} else {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-		} else
-
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function FLOOR()
-
-
-	/**
-	 * GCD
-	 *
-	 * Returns the greatest common divisor of a series of numbers.
-	 * The greatest common divisor is the largest integer that divides both
-	 *		number1 and number2 without a remainder.
-	 *
-	 * Excel Function:
-	 *		GCD(number1[,number2[, ...]])
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed	$arg,...		Data values
-	 * @return	integer					Greatest Common Divisor
-	 */
-	public static function GCD() {
-		$returnValue = 1;
-		$allValuesFactors = array();
-		// Loop through arguments
-		foreach(PHPExcel_Calculation_Functions::flattenArray(func_get_args()) as $value) {
-			if (!is_numeric($value)) {
-				return PHPExcel_Calculation_Functions::VALUE();
-			} elseif ($value == 0) {
-				continue;
-			} elseif($value < 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$myFactors = self::_factors($value);
-			$myCountedFactors = array_count_values($myFactors);
-			$allValuesFactors[] = $myCountedFactors;
-		}
-		$allValuesCount = count($allValuesFactors);
-		if ($allValuesCount == 0) {
-			return 0;
-		}
-
-		$mergedArray = $allValuesFactors[0];
-		for ($i=1;$i < $allValuesCount; ++$i) {
-			$mergedArray = array_intersect_key($mergedArray,$allValuesFactors[$i]);
-		}
-		$mergedArrayValues = count($mergedArray);
-		if ($mergedArrayValues == 0) {
-			return $returnValue;
-		} elseif ($mergedArrayValues > 1) {
-			foreach($mergedArray as $mergedKey => $mergedValue) {
-				foreach($allValuesFactors as $highestPowerTest) {
-					foreach($highestPowerTest as $testKey => $testValue) {
-						if (($testKey == $mergedKey) && ($testValue < $mergedValue)) {
-							$mergedArray[$mergedKey] = $testValue;
-							$mergedValue = $testValue;
-						}
-					}
-				}
-			}
-
-			$returnValue = 1;
-			foreach($mergedArray as $key => $value) {
-				$returnValue *= pow($key,$value);
-			}
-			return $returnValue;
-		} else {
-			$keys = array_keys($mergedArray);
-			$key = $keys[0];
-			$value = $mergedArray[$key];
-			foreach($allValuesFactors as $testValue) {
-				foreach($testValue as $mergedKey => $mergedValue) {
-					if (($mergedKey == $key) && ($mergedValue < $value)) {
-						$value = $mergedValue;
-					}
-				}
-			}
-			return pow($key,$value);
-		}
-	}	//	function GCD()
-
-
-	/**
-	 * INT
-	 *
-	 * Casts a floating point value to an integer
-	 *
-	 * Excel Function:
-	 *		INT(number)
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	float	$number			Number to cast to an integer
-	 * @return	integer	Integer value
-	 */
-	public static function INT($number) {
-		$number	= PHPExcel_Calculation_Functions::flattenSingleValue($number);
-
-		if (is_null($number)) {
-			return 0;
-		} elseif (is_bool($number)) {
-			return (int) $number;
-		}
-		if (is_numeric($number)) {
-			return (int) floor($number);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function INT()
-
-
-	/**
-	 * LCM
-	 *
-	 * Returns the lowest common multiplier of a series of numbers
-	 * The least common multiple is the smallest positive integer that is a multiple
-	 * of all integer arguments number1, number2, and so on. Use LCM to add fractions
-	 * with different denominators.
-	 *
-	 * Excel Function:
-	 *		LCM(number1[,number2[, ...]])
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed	$arg,...		Data values
-	 * @return	int		Lowest Common Multiplier
-	 */
-	public static function LCM() {
-		$returnValue = 1;
-		$allPoweredFactors = array();
-		// Loop through arguments
-		foreach(PHPExcel_Calculation_Functions::flattenArray(func_get_args()) as $value) {
-			if (!is_numeric($value)) {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-			if ($value == 0) {
-				return 0;
-			} elseif ($value < 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$myFactors = self::_factors(floor($value));
-			$myCountedFactors = array_count_values($myFactors);
-			$myPoweredFactors = array();
-			foreach($myCountedFactors as $myCountedFactor => $myCountedPower) {
-				$myPoweredFactors[$myCountedFactor] = pow($myCountedFactor,$myCountedPower);
-			}
-			foreach($myPoweredFactors as $myPoweredValue => $myPoweredFactor) {
-				if (array_key_exists($myPoweredValue,$allPoweredFactors)) {
-					if ($allPoweredFactors[$myPoweredValue] < $myPoweredFactor) {
-						$allPoweredFactors[$myPoweredValue] = $myPoweredFactor;
-					}
-				} else {
-					$allPoweredFactors[$myPoweredValue] = $myPoweredFactor;
-				}
-			}
-		}
-		foreach($allPoweredFactors as $allPoweredFactor) {
-			$returnValue *= (integer) $allPoweredFactor;
-		}
-		return $returnValue;
-	}	//	function LCM()
-
-
-	/**
-	 * LOG_BASE
-	 *
-	 * Returns the logarithm of a number to a specified base. The default base is 10.
-	 *
-	 * Excel Function:
-	 *		LOG(number[,base])
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	float	$number		The positive real number for which you want the logarithm
-	 * @param	float	$base		The base of the logarithm. If base is omitted, it is assumed to be 10.
-	 * @return	float
-	 */
-	public static function LOG_BASE($number = NULL, $base = 10) {
-		$number	= PHPExcel_Calculation_Functions::flattenSingleValue($number);
-		$base	= (is_null($base)) ? 10 : (float) PHPExcel_Calculation_Functions::flattenSingleValue($base);
-
-		if ((!is_numeric($base)) || (!is_numeric($number)))
-			return PHPExcel_Calculation_Functions::VALUE();
-		if (($base <= 0) || ($number <= 0))
-			return PHPExcel_Calculation_Functions::NaN();
-		return log($number, $base);
-	}	//	function LOG_BASE()
-
-
-	/**
-	 * MDETERM
-	 *
-	 * Returns the matrix determinant of an array.
-	 *
-	 * Excel Function:
-	 *		MDETERM(array)
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	array	$matrixValues	A matrix of values
-	 * @return	float
-	 */
-	public static function MDETERM($matrixValues) {
-		$matrixData = array();
-		if (!is_array($matrixValues)) { $matrixValues = array(array($matrixValues)); }
-
-		$row = $maxColumn = 0;
-		foreach($matrixValues as $matrixRow) {
-			if (!is_array($matrixRow)) { $matrixRow = array($matrixRow); }
-			$column = 0;
-			foreach($matrixRow as $matrixCell) {
-				if ((is_string($matrixCell)) || ($matrixCell === null)) {
-					return PHPExcel_Calculation_Functions::VALUE();
-				}
-				$matrixData[$column][$row] = $matrixCell;
-				++$column;
-			}
-			if ($column > $maxColumn) { $maxColumn = $column; }
-			++$row;
-		}
-		if ($row != $maxColumn) { return PHPExcel_Calculation_Functions::VALUE(); }
-
-		try {
-			$matrix = new PHPExcel_Shared_JAMA_Matrix($matrixData);
-			return $matrix->det();
-		} catch (PHPExcel_Exception $ex) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-	}	//	function MDETERM()
-
-
-	/**
-	 * MINVERSE
-	 *
-	 * Returns the inverse matrix for the matrix stored in an array.
-	 *
-	 * Excel Function:
-	 *		MINVERSE(array)
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	array	$matrixValues	A matrix of values
-	 * @return	array
-	 */
-	public static function MINVERSE($matrixValues) {
-		$matrixData = array();
-		if (!is_array($matrixValues)) { $matrixValues = array(array($matrixValues)); }
-
-		$row = $maxColumn = 0;
-		foreach($matrixValues as $matrixRow) {
-			if (!is_array($matrixRow)) { $matrixRow = array($matrixRow); }
-			$column = 0;
-			foreach($matrixRow as $matrixCell) {
-				if ((is_string($matrixCell)) || ($matrixCell === null)) {
-					return PHPExcel_Calculation_Functions::VALUE();
-				}
-				$matrixData[$column][$row] = $matrixCell;
-				++$column;
-			}
-			if ($column > $maxColumn) { $maxColumn = $column; }
-			++$row;
-		}
-		if ($row != $maxColumn) { return PHPExcel_Calculation_Functions::VALUE(); }
-
-		try {
-			$matrix = new PHPExcel_Shared_JAMA_Matrix($matrixData);
-			return $matrix->inverse()->getArray();
-		} catch (PHPExcel_Exception $ex) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-	}	//	function MINVERSE()
-
-
-	/**
-	 * MMULT
-	 *
-	 * @param	array	$matrixData1	A matrix of values
-	 * @param	array	$matrixData2	A matrix of values
-	 * @return	array
-	 */
-	public static function MMULT($matrixData1,$matrixData2) {
-		$matrixAData = $matrixBData = array();
-		if (!is_array($matrixData1)) { $matrixData1 = array(array($matrixData1)); }
-		if (!is_array($matrixData2)) { $matrixData2 = array(array($matrixData2)); }
-
-		try {
-            $rowA = 0;
-            foreach($matrixData1 as $matrixRow) {
-                if (!is_array($matrixRow)) { $matrixRow = array($matrixRow); }
-                $columnA = 0;
-                foreach($matrixRow as $matrixCell) {
-                    if ((!is_numeric($matrixCell)) || ($matrixCell === null)) {
-                        return PHPExcel_Calculation_Functions::VALUE();
-                    }
-                    $matrixAData[$rowA][$columnA] = $matrixCell;
-                    ++$columnA;
-                }
-                ++$rowA;
-            }
-			$matrixA = new PHPExcel_Shared_JAMA_Matrix($matrixAData);
-			$rowB = 0;
-			foreach($matrixData2 as $matrixRow) {
-				if (!is_array($matrixRow)) { $matrixRow = array($matrixRow); }
-				$columnB = 0;
-				foreach($matrixRow as $matrixCell) {
-					if ((!is_numeric($matrixCell)) || ($matrixCell === null)) {
-						return PHPExcel_Calculation_Functions::VALUE();
-					}
-					$matrixBData[$rowB][$columnB] = $matrixCell;
-					++$columnB;
-				}
-				++$rowB;
-			}
-			$matrixB = new PHPExcel_Shared_JAMA_Matrix($matrixBData);
-
-			if ($columnA != $rowB) {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-
-			return $matrixA->times($matrixB)->getArray();
-		} catch (PHPExcel_Exception $ex) {
-            var_dump($ex->getMessage());
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-	}	//	function MMULT()
-
-
-	/**
-	 * MOD
-	 *
-	 * @param	int		$a		Dividend
-	 * @param	int		$b		Divisor
-	 * @return	int		Remainder
-	 */
-	public static function MOD($a = 1, $b = 1) {
-		$a		= PHPExcel_Calculation_Functions::flattenSingleValue($a);
-		$b		= PHPExcel_Calculation_Functions::flattenSingleValue($b);
-
-		if ($b == 0.0) {
-			return PHPExcel_Calculation_Functions::DIV0();
-		} elseif (($a < 0.0) && ($b > 0.0)) {
-			return $b - fmod(abs($a),$b);
-		} elseif (($a > 0.0) && ($b < 0.0)) {
-			return $b + fmod($a,abs($b));
-		}
-
-		return fmod($a,$b);
-	}	//	function MOD()
-
-
-	/**
-	 * MROUND
-	 *
-	 * Rounds a number to the nearest multiple of a specified value
-	 *
-	 * @param	float	$number			Number to round
-	 * @param	int		$multiple		Multiple to which you want to round $number
-	 * @return	float	Rounded Number
-	 */
-	public static function MROUND($number,$multiple) {
-		$number		= PHPExcel_Calculation_Functions::flattenSingleValue($number);
-		$multiple	= PHPExcel_Calculation_Functions::flattenSingleValue($multiple);
-
-		if ((is_numeric($number)) && (is_numeric($multiple))) {
-			if ($multiple == 0) {
-				return 0;
-			}
-			if ((self::SIGN($number)) == (self::SIGN($multiple))) {
-				$multiplier = 1 / $multiple;
-				return round($number * $multiplier) / $multiplier;
-			}
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function MROUND()
-
-
-	/**
-	 * MULTINOMIAL
-	 *
-	 * Returns the ratio of the factorial of a sum of values to the product of factorials.
-	 *
-	 * @param	array of mixed		Data Series
-	 * @return	float
-	 */
-	public static function MULTINOMIAL() {
-		$summer = 0;
-		$divisor = 1;
-		// Loop through arguments
-		foreach (PHPExcel_Calculation_Functions::flattenArray(func_get_args()) as $arg) {
-			// Is it a numeric value?
-			if (is_numeric($arg)) {
-				if ($arg < 1) {
-					return PHPExcel_Calculation_Functions::NaN();
-				}
-				$summer += floor($arg);
-				$divisor *= self::FACT($arg);
-			} else {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-		}
-
-		// Return
-		if ($summer > 0) {
-			$summer = self::FACT($summer);
-			return $summer / $divisor;
-		}
-		return 0;
-	}	//	function MULTINOMIAL()
-
-
-	/**
-	 * ODD
-	 *
-	 * Returns number rounded up to the nearest odd integer.
-	 *
-	 * @param	float	$number			Number to round
-	 * @return	int		Rounded Number
-	 */
-	public static function ODD($number) {
-		$number	= PHPExcel_Calculation_Functions::flattenSingleValue($number);
-
-		if (is_null($number)) {
-			return 1;
-		} elseif (is_bool($number)) {
-			$number = (int) $number;
-		}
-
-		if (is_numeric($number)) {
-			$significance = self::SIGN($number);
-			if ($significance == 0) {
-				return 1;
-			}
-
-			$result = self::CEILING($number,$significance);
-			if ($result == self::EVEN($result)) {
-				$result += $significance;
-			}
-
-			return (int) $result;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function ODD()
-
-
-	/**
-	 * POWER
-	 *
-	 * Computes x raised to the power y.
-	 *
-	 * @param	float		$x
-	 * @param	float		$y
-	 * @return	float
-	 */
-	public static function POWER($x = 0, $y = 2) {
-		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$y	= PHPExcel_Calculation_Functions::flattenSingleValue($y);
-
-		// Validate parameters
-		if ($x == 0.0 && $y == 0.0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		} elseif ($x == 0.0 && $y < 0.0) {
-			return PHPExcel_Calculation_Functions::DIV0();
-		}
-
-		// Return
-		$result = pow($x, $y);
-		return (!is_nan($result) && !is_infinite($result)) ? $result : PHPExcel_Calculation_Functions::NaN();
-	}	//	function POWER()
-
-
-	/**
-	 * PRODUCT
-	 *
-	 * PRODUCT returns the product of all the values and cells referenced in the argument list.
-	 *
-	 * Excel Function:
-	 *		PRODUCT(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function PRODUCT() {
-		// Return value
-		$returnValue = null;
-
-		// Loop through arguments
-		foreach (PHPExcel_Calculation_Functions::flattenArray(func_get_args()) as $arg) {
-			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
-				if (is_null($returnValue)) {
-					$returnValue = $arg;
-				} else {
-					$returnValue *= $arg;
-				}
-			}
-		}
-
-		// Return
-		if (is_null($returnValue)) {
-			return 0;
-		}
-		return $returnValue;
-	}	//	function PRODUCT()
-
-
-	/**
-	 * QUOTIENT
-	 *
-	 * QUOTIENT function returns the integer portion of a division. Numerator is the divided number
-	 *		and denominator is the divisor.
-	 *
-	 * Excel Function:
-	 *		QUOTIENT(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function QUOTIENT() {
-		// Return value
-		$returnValue = null;
-
-		// Loop through arguments
-		foreach (PHPExcel_Calculation_Functions::flattenArray(func_get_args()) as $arg) {
-			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
-				if (is_null($returnValue)) {
-					$returnValue = ($arg == 0) ? 0 : $arg;
-				} else {
-					if (($returnValue == 0) || ($arg == 0)) {
-						$returnValue = 0;
-					} else {
-						$returnValue /= $arg;
-					}
-				}
-			}
-		}
-
-		// Return
-		return intval($returnValue);
-	}	//	function QUOTIENT()
-
-
-	/**
-	 * RAND
-	 *
-	 * @param	int		$min	Minimal value
-	 * @param	int		$max	Maximal value
-	 * @return	int		Random number
-	 */
-	public static function RAND($min = 0, $max = 0) {
-		$min		= PHPExcel_Calculation_Functions::flattenSingleValue($min);
-		$max		= PHPExcel_Calculation_Functions::flattenSingleValue($max);
-
-		if ($min == 0 && $max == 0) {
-			return (mt_rand(0,10000000)) / 10000000;
-		} else {
-			return mt_rand($min, $max);
-		}
-	}	//	function RAND()
-
-
-	public static function ROMAN($aValue, $style=0) {
-		$aValue	= PHPExcel_Calculation_Functions::flattenSingleValue($aValue);
-		$style	= (is_null($style))	? 0 :	(integer) PHPExcel_Calculation_Functions::flattenSingleValue($style);
-		if ((!is_numeric($aValue)) || ($aValue < 0) || ($aValue >= 4000)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$aValue = (integer) $aValue;
-		if ($aValue == 0) {
-			return '';
-		}
-
-		$mill = Array('', 'M', 'MM', 'MMM', 'MMMM', 'MMMMM');
-		$cent = Array('', 'C', 'CC', 'CCC', 'CD', 'D', 'DC', 'DCC', 'DCCC', 'CM');
-		$tens = Array('', 'X', 'XX', 'XXX', 'XL', 'L', 'LX', 'LXX', 'LXXX', 'XC');
-		$ones = Array('', 'I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX');
-
-		$roman = '';
-		while ($aValue > 5999) {
-			$roman .= 'M';
-			$aValue -= 1000;
-		}
-		$m = self::_romanCut($aValue, 1000);	$aValue %= 1000;
-		$c = self::_romanCut($aValue, 100);		$aValue %= 100;
-		$t = self::_romanCut($aValue, 10);		$aValue %= 10;
-
-		return $roman.$mill[$m].$cent[$c].$tens[$t].$ones[$aValue];
-	}	//	function ROMAN()
-
-
-	/**
-	 * ROUNDUP
-	 *
-	 * Rounds a number up to a specified number of decimal places
-	 *
-	 * @param	float	$number			Number to round
-	 * @param	int		$digits			Number of digits to which you want to round $number
-	 * @return	float	Rounded Number
-	 */
-	public static function ROUNDUP($number,$digits) {
-		$number	= PHPExcel_Calculation_Functions::flattenSingleValue($number);
-		$digits	= PHPExcel_Calculation_Functions::flattenSingleValue($digits);
-
-		if ((is_numeric($number)) && (is_numeric($digits))) {
-			$significance = pow(10,(int) $digits);
-			if ($number < 0.0) {
-				return floor($number * $significance) / $significance;
-			} else {
-				return ceil($number * $significance) / $significance;
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function ROUNDUP()
-
-
-	/**
-	 * ROUNDDOWN
-	 *
-	 * Rounds a number down to a specified number of decimal places
-	 *
-	 * @param	float	$number			Number to round
-	 * @param	int		$digits			Number of digits to which you want to round $number
-	 * @return	float	Rounded Number
-	 */
-	public static function ROUNDDOWN($number,$digits) {
-		$number	= PHPExcel_Calculation_Functions::flattenSingleValue($number);
-		$digits	= PHPExcel_Calculation_Functions::flattenSingleValue($digits);
-
-		if ((is_numeric($number)) && (is_numeric($digits))) {
-			$significance = pow(10,(int) $digits);
-			if ($number < 0.0) {
-				return ceil($number * $significance) / $significance;
-			} else {
-				return floor($number * $significance) / $significance;
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function ROUNDDOWN()
-
-
-	/**
-	 * SERIESSUM
-	 *
-	 * Returns the sum of a power series
-	 *
-	 * @param	float			$x	Input value to the power series
-	 * @param	float			$n	Initial power to which you want to raise $x
-	 * @param	float			$m	Step by which to increase $n for each term in the series
-	 * @param	array of mixed		Data Series
-	 * @return	float
-	 */
-	public static function SERIESSUM() {
-		// Return value
-		$returnValue = 0;
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-
-		$x = array_shift($aArgs);
-		$n = array_shift($aArgs);
-		$m = array_shift($aArgs);
-
-		if ((is_numeric($x)) && (is_numeric($n)) && (is_numeric($m))) {
-			// Calculate
-			$i = 0;
-			foreach($aArgs as $arg) {
-				// Is it a numeric value?
-				if ((is_numeric($arg)) && (!is_string($arg))) {
-					$returnValue += $arg * pow($x,$n + ($m * $i++));
-				} else {
-					return PHPExcel_Calculation_Functions::VALUE();
-				}
-			}
-			// Return
-			return $returnValue;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function SERIESSUM()
-
-
-	/**
-	 * SIGN
-	 *
-	 * Determines the sign of a number. Returns 1 if the number is positive, zero (0)
-	 *		if the number is 0, and -1 if the number is negative.
-	 *
-	 * @param	float	$number			Number to round
-	 * @return	int		sign value
-	 */
-	public static function SIGN($number) {
-		$number	= PHPExcel_Calculation_Functions::flattenSingleValue($number);
-
-		if (is_bool($number))
-			return (int) $number;
-		if (is_numeric($number)) {
-			if ($number == 0.0) {
-				return 0;
-			}
-			return $number / abs($number);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function SIGN()
-
-
-	/**
-	 * SQRTPI
-	 *
-	 * Returns the square root of (number * pi).
-	 *
-	 * @param	float	$number		Number
-	 * @return	float	Square Root of Number * Pi
-	 */
-	public static function SQRTPI($number) {
-		$number	= PHPExcel_Calculation_Functions::flattenSingleValue($number);
-
-		if (is_numeric($number)) {
-			if ($number < 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return sqrt($number * M_PI) ;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function SQRTPI()
-
-
-	/**
-	 * SUBTOTAL
-	 *
-	 * Returns a subtotal in a list or database.
-	 *
-	 * @param	int		the number 1 to 11 that specifies which function to
-	 *					use in calculating subtotals within a list.
-	 * @param	array of mixed		Data Series
-	 * @return	float
-	 */
-	public static function SUBTOTAL() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-
-		// Calculate
-		$subtotal = array_shift($aArgs);
-
-		if ((is_numeric($subtotal)) && (!is_string($subtotal))) {
-			switch($subtotal) {
-				case 1	:
-					return PHPExcel_Calculation_Statistical::AVERAGE($aArgs);
-					break;
-				case 2	:
-					return PHPExcel_Calculation_Statistical::COUNT($aArgs);
-					break;
-				case 3	:
-					return PHPExcel_Calculation_Statistical::COUNTA($aArgs);
-					break;
-				case 4	:
-					return PHPExcel_Calculation_Statistical::MAX($aArgs);
-					break;
-				case 5	:
-					return PHPExcel_Calculation_Statistical::MIN($aArgs);
-					break;
-				case 6	:
-					return self::PRODUCT($aArgs);
-					break;
-				case 7	:
-					return PHPExcel_Calculation_Statistical::STDEV($aArgs);
-					break;
-				case 8	:
-					return PHPExcel_Calculation_Statistical::STDEVP($aArgs);
-					break;
-				case 9	:
-					return self::SUM($aArgs);
-					break;
-				case 10	:
-					return PHPExcel_Calculation_Statistical::VARFunc($aArgs);
-					break;
-				case 11	:
-					return PHPExcel_Calculation_Statistical::VARP($aArgs);
-					break;
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function SUBTOTAL()
-
-
-	/**
-	 * SUM
-	 *
-	 * SUM computes the sum of all the values and cells referenced in the argument list.
-	 *
-	 * Excel Function:
-	 *		SUM(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function SUM() {
-		// Return value
-		$returnValue = 0;
-
-		// Loop through the arguments
-		foreach (PHPExcel_Calculation_Functions::flattenArray(func_get_args()) as $arg) {
-			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
-				$returnValue += $arg;
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function SUM()
-
-
-	/**
-	 * SUMIF
-	 *
-	 * Counts the number of cells that contain numbers within the list of arguments
-	 *
-	 * Excel Function:
-	 *		SUMIF(value1[,value2[, ...]],condition)
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @param	string		$condition		The criteria that defines which cells will be summed.
-	 * @return	float
-	 */
-	public static function SUMIF($aArgs,$condition,$sumArgs = array()) {
-		// Return value
-		$returnValue = 0;
-
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray($aArgs);
-		$sumArgs = PHPExcel_Calculation_Functions::flattenArray($sumArgs);
-		if (empty($sumArgs)) {
-			$sumArgs = $aArgs;
-		}
-		$condition = PHPExcel_Calculation_Functions::_ifCondition($condition);
-		// Loop through arguments
-		foreach ($aArgs as $key => $arg) {
-			if (!is_numeric($arg)) {
-				$arg = str_replace('"', '""', $arg);
-				$arg = PHPExcel_Calculation::_wrapResult(strtoupper($arg));
-			}
-
-			$testCondition = '='.$arg.$condition;
-			if (PHPExcel_Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
-				// Is it a value within our criteria
-				$returnValue += $sumArgs[$key];
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function SUMIF()
-
-
-	/**
-	 * SUMPRODUCT
-	 *
-	 * Excel Function:
-	 *		SUMPRODUCT(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function SUMPRODUCT() {
-		$arrayList = func_get_args();
-
-		$wrkArray = PHPExcel_Calculation_Functions::flattenArray(array_shift($arrayList));
-		$wrkCellCount = count($wrkArray);
-
-		for ($i=0; $i< $wrkCellCount; ++$i) {
-			if ((!is_numeric($wrkArray[$i])) || (is_string($wrkArray[$i]))) {
-				$wrkArray[$i] = 0;
-			}
-		}
-
-		foreach($arrayList as $matrixData) {
-			$array2 = PHPExcel_Calculation_Functions::flattenArray($matrixData);
-			$count = count($array2);
-			if ($wrkCellCount != $count) {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-
-			foreach ($array2 as $i => $val) {
-				if ((!is_numeric($val)) || (is_string($val))) {
-					$val = 0;
-				}
-				$wrkArray[$i] *= $val;
-			}
-		}
-
-		return array_sum($wrkArray);
-	}	//	function SUMPRODUCT()
-
-
-	/**
-	 * SUMSQ
-	 *
-	 * SUMSQ returns the sum of the squares of the arguments
-	 *
-	 * Excel Function:
-	 *		SUMSQ(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function SUMSQ() {
-		// Return value
-		$returnValue = 0;
-
-		// Loop through arguments
-		foreach (PHPExcel_Calculation_Functions::flattenArray(func_get_args()) as $arg) {
-			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
-				$returnValue += ($arg * $arg);
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function SUMSQ()
-
-
-	/**
-	 * SUMX2MY2
-	 *
-	 * @param	mixed[]	$matrixData1	Matrix #1
-	 * @param	mixed[]	$matrixData2	Matrix #2
-	 * @return	float
-	 */
-	public static function SUMX2MY2($matrixData1,$matrixData2) {
-		$array1 = PHPExcel_Calculation_Functions::flattenArray($matrixData1);
-		$array2 = PHPExcel_Calculation_Functions::flattenArray($matrixData2);
-		$count1 = count($array1);
-		$count2 = count($array2);
-		if ($count1 < $count2) {
-			$count = $count1;
-		} else {
-			$count = $count2;
-		}
-
-		$result = 0;
-		for ($i = 0; $i < $count; ++$i) {
-			if (((is_numeric($array1[$i])) && (!is_string($array1[$i]))) &&
-				((is_numeric($array2[$i])) && (!is_string($array2[$i])))) {
-				$result += ($array1[$i] * $array1[$i]) - ($array2[$i] * $array2[$i]);
-			}
-		}
-
-		return $result;
-	}	//	function SUMX2MY2()
-
-
-	/**
-	 * SUMX2PY2
-	 *
-	 * @param	mixed[]	$matrixData1	Matrix #1
-	 * @param	mixed[]	$matrixData2	Matrix #2
-	 * @return	float
-	 */
-	public static function SUMX2PY2($matrixData1,$matrixData2) {
-		$array1 = PHPExcel_Calculation_Functions::flattenArray($matrixData1);
-		$array2 = PHPExcel_Calculation_Functions::flattenArray($matrixData2);
-		$count1 = count($array1);
-		$count2 = count($array2);
-		if ($count1 < $count2) {
-			$count = $count1;
-		} else {
-			$count = $count2;
-		}
-
-		$result = 0;
-		for ($i = 0; $i < $count; ++$i) {
-			if (((is_numeric($array1[$i])) && (!is_string($array1[$i]))) &&
-				((is_numeric($array2[$i])) && (!is_string($array2[$i])))) {
-				$result += ($array1[$i] * $array1[$i]) + ($array2[$i] * $array2[$i]);
-			}
-		}
-
-		return $result;
-	}	//	function SUMX2PY2()
-
-
-	/**
-	 * SUMXMY2
-	 *
-	 * @param	mixed[]	$matrixData1	Matrix #1
-	 * @param	mixed[]	$matrixData2	Matrix #2
-	 * @return	float
-	 */
-	public static function SUMXMY2($matrixData1,$matrixData2) {
-		$array1 = PHPExcel_Calculation_Functions::flattenArray($matrixData1);
-		$array2 = PHPExcel_Calculation_Functions::flattenArray($matrixData2);
-		$count1 = count($array1);
-		$count2 = count($array2);
-		if ($count1 < $count2) {
-			$count = $count1;
-		} else {
-			$count = $count2;
-		}
-
-		$result = 0;
-		for ($i = 0; $i < $count; ++$i) {
-			if (((is_numeric($array1[$i])) && (!is_string($array1[$i]))) &&
-				((is_numeric($array2[$i])) && (!is_string($array2[$i])))) {
-				$result += ($array1[$i] - $array2[$i]) * ($array1[$i] - $array2[$i]);
-			}
-		}
-
-		return $result;
-	}	//	function SUMXMY2()
-
-
-	/**
-	 * TRUNC
-	 *
-	 * Truncates value to the number of fractional digits by number_digits.
-	 *
-	 * @param	float		$value
-	 * @param	int			$digits
-	 * @return	float		Truncated value
-	 */
-	public static function TRUNC($value = 0, $digits = 0) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$digits	= PHPExcel_Calculation_Functions::flattenSingleValue($digits);
-
-		// Validate parameters
-		if ((!is_numeric($value)) || (!is_numeric($digits)))
-			return PHPExcel_Calculation_Functions::VALUE();
-		$digits	= floor($digits);
-
-		// Truncate
-		$adjust = pow(10, $digits);
-
-		if (($digits > 0) && (rtrim(intval((abs($value) - abs(intval($value))) * $adjust),'0') < $adjust/10))
-			return $value;
-
-		return (intval($value * $adjust)) / $adjust;
-	}	//	function TRUNC()
-
-}	//	class PHPExcel_Calculation_MathTrig
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Statistical.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Statistical.php
deleted file mode 100644
index 67e1951c254..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Statistical.php
+++ /dev/null
@@ -1,3651 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/trendClass.php';
-
-
-/** LOG_GAMMA_X_MAX_VALUE */
-define('LOG_GAMMA_X_MAX_VALUE', 2.55e305);
-
-/** XMININ */
-define('XMININ', 2.23e-308);
-
-/** EPS */
-define('EPS', 2.22e-16);
-
-/** SQRT2PI */
-define('SQRT2PI', 2.5066282746310005024157652848110452530069867406099);
-
-
-/**
- * PHPExcel_Calculation_Statistical
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Statistical {
-
-
-	private static function _checkTrendArrays(&$array1,&$array2) {
-		if (!is_array($array1)) { $array1 = array($array1); }
-		if (!is_array($array2)) { $array2 = array($array2); }
-
-		$array1 = PHPExcel_Calculation_Functions::flattenArray($array1);
-		$array2 = PHPExcel_Calculation_Functions::flattenArray($array2);
-		foreach($array1 as $key => $value) {
-			if ((is_bool($value)) || (is_string($value)) || (is_null($value))) {
-				unset($array1[$key]);
-				unset($array2[$key]);
-			}
-		}
-		foreach($array2 as $key => $value) {
-			if ((is_bool($value)) || (is_string($value)) || (is_null($value))) {
-				unset($array1[$key]);
-				unset($array2[$key]);
-			}
-		}
-		$array1 = array_merge($array1);
-		$array2 = array_merge($array2);
-
-		return True;
-	}	//	function _checkTrendArrays()
-
-
-	/**
-	 * Beta function.
-	 *
-	 * @author Jaco van Kooten
-	 *
-	 * @param p require p>0
-	 * @param q require q>0
-	 * @return 0 if p<=0, q<=0 or p+q>2.55E305 to avoid errors and over/underflow
-	 */
-	private static function _beta($p, $q) {
-		if ($p <= 0.0 || $q <= 0.0 || ($p + $q) > LOG_GAMMA_X_MAX_VALUE) {
-			return 0.0;
-		} else {
-			return exp(self::_logBeta($p, $q));
-		}
-	}	//	function _beta()
-
-
-	/**
-	 * Incomplete beta function
-	 *
-	 * @author Jaco van Kooten
-	 * @author Paul Meagher
-	 *
-	 * The computation is based on formulas from Numerical Recipes, Chapter 6.4 (W.H. Press et al, 1992).
-	 * @param x require 0<=x<=1
-	 * @param p require p>0
-	 * @param q require q>0
-	 * @return 0 if x<0, p<=0, q<=0 or p+q>2.55E305 and 1 if x>1 to avoid errors and over/underflow
-	 */
-	private static function _incompleteBeta($x, $p, $q) {
-		if ($x <= 0.0) {
-			return 0.0;
-		} elseif ($x >= 1.0) {
-			return 1.0;
-		} elseif (($p <= 0.0) || ($q <= 0.0) || (($p + $q) > LOG_GAMMA_X_MAX_VALUE)) {
-			return 0.0;
-		}
-		$beta_gam = exp((0 - self::_logBeta($p, $q)) + $p * log($x) + $q * log(1.0 - $x));
-		if ($x < ($p + 1.0) / ($p + $q + 2.0)) {
-			return $beta_gam * self::_betaFraction($x, $p, $q) / $p;
-		} else {
-			return 1.0 - ($beta_gam * self::_betaFraction(1 - $x, $q, $p) / $q);
-		}
-	}	//	function _incompleteBeta()
-
-
-	// Function cache for _logBeta function
-	private static $_logBetaCache_p			= 0.0;
-	private static $_logBetaCache_q			= 0.0;
-	private static $_logBetaCache_result	= 0.0;
-
-	/**
-	 * The natural logarithm of the beta function.
-	 *
-	 * @param p require p>0
-	 * @param q require q>0
-	 * @return 0 if p<=0, q<=0 or p+q>2.55E305 to avoid errors and over/underflow
-	 * @author Jaco van Kooten
-	 */
-	private static function _logBeta($p, $q) {
-		if ($p != self::$_logBetaCache_p || $q != self::$_logBetaCache_q) {
-			self::$_logBetaCache_p = $p;
-			self::$_logBetaCache_q = $q;
-			if (($p <= 0.0) || ($q <= 0.0) || (($p + $q) > LOG_GAMMA_X_MAX_VALUE)) {
-				self::$_logBetaCache_result = 0.0;
-			} else {
-				self::$_logBetaCache_result = self::_logGamma($p) + self::_logGamma($q) - self::_logGamma($p + $q);
-			}
-		}
-		return self::$_logBetaCache_result;
-	}	//	function _logBeta()
-
-
-	/**
-	 * Evaluates of continued fraction part of incomplete beta function.
-	 * Based on an idea from Numerical Recipes (W.H. Press et al, 1992).
-	 * @author Jaco van Kooten
-	 */
-	private static function _betaFraction($x, $p, $q) {
-		$c = 1.0;
-		$sum_pq = $p + $q;
-		$p_plus = $p + 1.0;
-		$p_minus = $p - 1.0;
-		$h = 1.0 - $sum_pq * $x / $p_plus;
-		if (abs($h) < XMININ) {
-			$h = XMININ;
-		}
-		$h = 1.0 / $h;
-		$frac = $h;
-		$m	 = 1;
-		$delta = 0.0;
-		while ($m <= MAX_ITERATIONS && abs($delta-1.0) > PRECISION ) {
-			$m2 = 2 * $m;
-			// even index for d
-			$d = $m * ($q - $m) * $x / ( ($p_minus + $m2) * ($p + $m2));
-			$h = 1.0 + $d * $h;
-			if (abs($h) < XMININ) {
-				$h = XMININ;
-			}
-			$h = 1.0 / $h;
-			$c = 1.0 + $d / $c;
-			if (abs($c) < XMININ) {
-				$c = XMININ;
-			}
-			$frac *= $h * $c;
-			// odd index for d
-			$d = -($p + $m) * ($sum_pq + $m) * $x / (($p + $m2) * ($p_plus + $m2));
-			$h = 1.0 + $d * $h;
-			if (abs($h) < XMININ) {
-				$h = XMININ;
-			}
-			$h = 1.0 / $h;
-			$c = 1.0 + $d / $c;
-			if (abs($c) < XMININ) {
-				$c = XMININ;
-			}
-			$delta = $h * $c;
-			$frac *= $delta;
-			++$m;
-		}
-		return $frac;
-	}	//	function _betaFraction()
-
-
-	/**
-	 * logGamma function
-	 *
-	 * @version 1.1
-	 * @author Jaco van Kooten
-	 *
-	 * Original author was Jaco van Kooten. Ported to PHP by Paul Meagher.
-	 *
-	 * The natural logarithm of the gamma function. <br />
-	 * Based on public domain NETLIB (Fortran) code by W. J. Cody and L. Stoltz <br />
-	 * Applied Mathematics Division <br />
-	 * Argonne National Laboratory <br />
-	 * Argonne, IL 60439 <br />
-	 * <p>
-	 * References:
-	 * <ol>
-	 * <li>W. J. Cody and K. E. Hillstrom, 'Chebyshev Approximations for the Natural
-	 *	 Logarithm of the Gamma Function,' Math. Comp. 21, 1967, pp. 198-203.</li>
-	 * <li>K. E. Hillstrom, ANL/AMD Program ANLC366S, DGAMMA/DLGAMA, May, 1969.</li>
-	 * <li>Hart, Et. Al., Computer Approximations, Wiley and sons, New York, 1968.</li>
-	 * </ol>
-	 * </p>
-	 * <p>
-	 * From the original documentation:
-	 * </p>
-	 * <p>
-	 * This routine calculates the LOG(GAMMA) function for a positive real argument X.
-	 * Computation is based on an algorithm outlined in references 1 and 2.
-	 * The program uses rational functions that theoretically approximate LOG(GAMMA)
-	 * to at least 18 significant decimal digits. The approximation for X > 12 is from
-	 * reference 3, while approximations for X < 12.0 are similar to those in reference
-	 * 1, but are unpublished. The accuracy achieved depends on the arithmetic system,
-	 * the compiler, the intrinsic functions, and proper selection of the
-	 * machine-dependent constants.
-	 * </p>
-	 * <p>
-	 * Error returns: <br />
-	 * The program returns the value XINF for X .LE. 0.0 or when overflow would occur.
-	 * The computation is believed to be free of underflow and overflow.
-	 * </p>
-	 * @return MAX_VALUE for x < 0.0 or when overflow would occur, i.e. x > 2.55E305
-	 */
-
-	// Function cache for logGamma
-	private static $_logGammaCache_result	= 0.0;
-	private static $_logGammaCache_x		= 0.0;
-
-	private static function _logGamma($x) {
-		// Log Gamma related constants
-		static $lg_d1 = -0.5772156649015328605195174;
-		static $lg_d2 = 0.4227843350984671393993777;
-		static $lg_d4 = 1.791759469228055000094023;
-
-		static $lg_p1 = array(	4.945235359296727046734888,
-								201.8112620856775083915565,
-								2290.838373831346393026739,
-								11319.67205903380828685045,
-								28557.24635671635335736389,
-								38484.96228443793359990269,
-								26377.48787624195437963534,
-								7225.813979700288197698961 );
-		static $lg_p2 = array(	4.974607845568932035012064,
-								542.4138599891070494101986,
-								15506.93864978364947665077,
-								184793.2904445632425417223,
-								1088204.76946882876749847,
-								3338152.967987029735917223,
-								5106661.678927352456275255,
-								3074109.054850539556250927 );
-		static $lg_p4 = array(	14745.02166059939948905062,
-								2426813.369486704502836312,
-								121475557.4045093227939592,
-								2663432449.630976949898078,
-								29403789566.34553899906876,
-								170266573776.5398868392998,
-								492612579337.743088758812,
-								560625185622.3951465078242 );
-
-		static $lg_q1 = array(	67.48212550303777196073036,
-								1113.332393857199323513008,
-								7738.757056935398733233834,
-								27639.87074403340708898585,
-								54993.10206226157329794414,
-								61611.22180066002127833352,
-								36351.27591501940507276287,
-								8785.536302431013170870835 );
-		static $lg_q2 = array(	183.0328399370592604055942,
-								7765.049321445005871323047,
-								133190.3827966074194402448,
-								1136705.821321969608938755,
-								5267964.117437946917577538,
-								13467014.54311101692290052,
-								17827365.30353274213975932,
-								9533095.591844353613395747 );
-		static $lg_q4 = array(	2690.530175870899333379843,
-								639388.5654300092398984238,
-								41355999.30241388052042842,
-								1120872109.61614794137657,
-								14886137286.78813811542398,
-								101680358627.2438228077304,
-								341747634550.7377132798597,
-								446315818741.9713286462081 );
-
-		static $lg_c  = array(	-0.001910444077728,
-								8.4171387781295e-4,
-								-5.952379913043012e-4,
-								7.93650793500350248e-4,
-								-0.002777777777777681622553,
-								0.08333333333333333331554247,
-								0.0057083835261 );
-
-	// Rough estimate of the fourth root of logGamma_xBig
-	static $lg_frtbig = 2.25e76;
-	static $pnt68	 = 0.6796875;
-
-
-	if ($x == self::$_logGammaCache_x) {
-		return self::$_logGammaCache_result;
-	}
-	$y = $x;
-	if ($y > 0.0 && $y <= LOG_GAMMA_X_MAX_VALUE) {
-		if ($y <= EPS) {
-			$res = -log(y);
-		} elseif ($y <= 1.5) {
-			// ---------------------
-			//	EPS .LT. X .LE. 1.5
-			// ---------------------
-			if ($y < $pnt68) {
-				$corr = -log($y);
-				$xm1 = $y;
-			} else {
-				$corr = 0.0;
-				$xm1 = $y - 1.0;
-			}
-			if ($y <= 0.5 || $y >= $pnt68) {
-				$xden = 1.0;
-				$xnum = 0.0;
-				for ($i = 0; $i < 8; ++$i) {
-					$xnum = $xnum * $xm1 + $lg_p1[$i];
-					$xden = $xden * $xm1 + $lg_q1[$i];
-				}
-				$res = $corr + $xm1 * ($lg_d1 + $xm1 * ($xnum / $xden));
-			} else {
-				$xm2 = $y - 1.0;
-				$xden = 1.0;
-				$xnum = 0.0;
-				for ($i = 0; $i < 8; ++$i) {
-					$xnum = $xnum * $xm2 + $lg_p2[$i];
-					$xden = $xden * $xm2 + $lg_q2[$i];
-				}
-				$res = $corr + $xm2 * ($lg_d2 + $xm2 * ($xnum / $xden));
-			}
-		} elseif ($y <= 4.0) {
-			// ---------------------
-			//	1.5 .LT. X .LE. 4.0
-			// ---------------------
-			$xm2 = $y - 2.0;
-			$xden = 1.0;
-			$xnum = 0.0;
-			for ($i = 0; $i < 8; ++$i) {
-				$xnum = $xnum * $xm2 + $lg_p2[$i];
-				$xden = $xden * $xm2 + $lg_q2[$i];
-			}
-			$res = $xm2 * ($lg_d2 + $xm2 * ($xnum / $xden));
-		} elseif ($y <= 12.0) {
-			// ----------------------
-			//	4.0 .LT. X .LE. 12.0
-			// ----------------------
-			$xm4 = $y - 4.0;
-			$xden = -1.0;
-			$xnum = 0.0;
-			for ($i = 0; $i < 8; ++$i) {
-				$xnum = $xnum * $xm4 + $lg_p4[$i];
-				$xden = $xden * $xm4 + $lg_q4[$i];
-			}
-			$res = $lg_d4 + $xm4 * ($xnum / $xden);
-		} else {
-			// ---------------------------------
-			//	Evaluate for argument .GE. 12.0
-			// ---------------------------------
-			$res = 0.0;
-			if ($y <= $lg_frtbig) {
-				$res = $lg_c[6];
-				$ysq = $y * $y;
-				for ($i = 0; $i < 6; ++$i)
-					$res = $res / $ysq + $lg_c[$i];
-				}
-				$res /= $y;
-				$corr = log($y);
-				$res = $res + log(SQRT2PI) - 0.5 * $corr;
-				$res += $y * ($corr - 1.0);
-			}
-		} else {
-			// --------------------------
-			//	Return for bad arguments
-			// --------------------------
-			$res = MAX_VALUE;
-		}
-		// ------------------------------
-		//	Final adjustments and return
-		// ------------------------------
-		self::$_logGammaCache_x = $x;
-		self::$_logGammaCache_result = $res;
-		return $res;
-	}	//	function _logGamma()
-
-
-	//
-	//	Private implementation of the incomplete Gamma function
-	//
-	private static function _incompleteGamma($a,$x) {
-		static $max = 32;
-		$summer = 0;
-		for ($n=0; $n<=$max; ++$n) {
-			$divisor = $a;
-			for ($i=1; $i<=$n; ++$i) {
-				$divisor *= ($a + $i);
-			}
-			$summer += (pow($x,$n) / $divisor);
-		}
-		return pow($x,$a) * exp(0-$x) * $summer;
-	}	//	function _incompleteGamma()
-
-
-	//
-	//	Private implementation of the Gamma function
-	//
-	private static function _gamma($data) {
-		if ($data == 0.0) return 0;
-
-		static $p0 = 1.000000000190015;
-		static $p = array ( 1 => 76.18009172947146,
-							2 => -86.50532032941677,
-							3 => 24.01409824083091,
-							4 => -1.231739572450155,
-							5 => 1.208650973866179e-3,
-							6 => -5.395239384953e-6
-						  );
-
-		$y = $x = $data;
-		$tmp = $x + 5.5;
-		$tmp -= ($x + 0.5) * log($tmp);
-
-		$summer = $p0;
-		for ($j=1;$j<=6;++$j) {
-			$summer += ($p[$j] / ++$y);
-		}
-		return exp(0 - $tmp + log(SQRT2PI * $summer / $x));
-	}	//	function _gamma()
-
-
-	/***************************************************************************
-	 *								inverse_ncdf.php
-	 *							-------------------
-	 *	begin				: Friday, January 16, 2004
-	 *	copyright			: (C) 2004 Michael Nickerson
-	 *	email				: nickersonm@yahoo.com
-	 *
-	 ***************************************************************************/
-	private static function _inverse_ncdf($p) {
-		//	Inverse ncdf approximation by Peter J. Acklam, implementation adapted to
-		//	PHP by Michael Nickerson, using Dr. Thomas Ziegler's C implementation as
-		//	a guide. http://home.online.no/~pjacklam/notes/invnorm/index.html
-		//	I have not checked the accuracy of this implementation. Be aware that PHP
-		//	will truncate the coeficcients to 14 digits.
-
-		//	You have permission to use and distribute this function freely for
-		//	whatever purpose you want, but please show common courtesy and give credit
-		//	where credit is due.
-
-		//	Input paramater is $p - probability - where 0 < p < 1.
-
-		//	Coefficients in rational approximations
-		static $a = array(	1 => -3.969683028665376e+01,
-							2 => 2.209460984245205e+02,
-							3 => -2.759285104469687e+02,
-							4 => 1.383577518672690e+02,
-							5 => -3.066479806614716e+01,
-							6 => 2.506628277459239e+00
-						 );
-
-		static $b = array(	1 => -5.447609879822406e+01,
-							2 => 1.615858368580409e+02,
-							3 => -1.556989798598866e+02,
-							4 => 6.680131188771972e+01,
-							5 => -1.328068155288572e+01
-						 );
-
-		static $c = array(	1 => -7.784894002430293e-03,
-							2 => -3.223964580411365e-01,
-							3 => -2.400758277161838e+00,
-							4 => -2.549732539343734e+00,
-							5 => 4.374664141464968e+00,
-							6 => 2.938163982698783e+00
-						 );
-
-		static $d = array(	1 => 7.784695709041462e-03,
-							2 => 3.224671290700398e-01,
-							3 => 2.445134137142996e+00,
-							4 => 3.754408661907416e+00
-						 );
-
-		//	Define lower and upper region break-points.
-		$p_low = 0.02425;			//Use lower region approx. below this
-		$p_high = 1 - $p_low;		//Use upper region approx. above this
-
-		if (0 < $p && $p < $p_low) {
-			//	Rational approximation for lower region.
-			$q = sqrt(-2 * log($p));
-			return ((((($c[1] * $q + $c[2]) * $q + $c[3]) * $q + $c[4]) * $q + $c[5]) * $q + $c[6]) /
-					(((($d[1] * $q + $d[2]) * $q + $d[3]) * $q + $d[4]) * $q + 1);
-		} elseif ($p_low <= $p && $p <= $p_high) {
-			//	Rational approximation for central region.
-			$q = $p - 0.5;
-			$r = $q * $q;
-			return ((((($a[1] * $r + $a[2]) * $r + $a[3]) * $r + $a[4]) * $r + $a[5]) * $r + $a[6]) * $q /
-				   ((((($b[1] * $r + $b[2]) * $r + $b[3]) * $r + $b[4]) * $r + $b[5]) * $r + 1);
-		} elseif ($p_high < $p && $p < 1) {
-			//	Rational approximation for upper region.
-			$q = sqrt(-2 * log(1 - $p));
-			return -((((($c[1] * $q + $c[2]) * $q + $c[3]) * $q + $c[4]) * $q + $c[5]) * $q + $c[6]) /
-					 (((($d[1] * $q + $d[2]) * $q + $d[3]) * $q + $d[4]) * $q + 1);
-		}
-		//	If 0 < p < 1, return a null value
-		return PHPExcel_Calculation_Functions::NULL();
-	}	//	function _inverse_ncdf()
-
-
-	private static function _inverse_ncdf2($prob) {
-		//	Approximation of inverse standard normal CDF developed by
-		//	B. Moro, "The Full Monte," Risk 8(2), Feb 1995, 57-58.
-
-		$a1 = 2.50662823884;
-		$a2 = -18.61500062529;
-		$a3 = 41.39119773534;
-		$a4 = -25.44106049637;
-
-		$b1 = -8.4735109309;
-		$b2 = 23.08336743743;
-		$b3 = -21.06224101826;
-		$b4 = 3.13082909833;
-
-		$c1 = 0.337475482272615;
-		$c2 = 0.976169019091719;
-		$c3 = 0.160797971491821;
-		$c4 = 2.76438810333863E-02;
-		$c5 = 3.8405729373609E-03;
-		$c6 = 3.951896511919E-04;
-		$c7 = 3.21767881768E-05;
-		$c8 = 2.888167364E-07;
-		$c9 = 3.960315187E-07;
-
-		$y = $prob - 0.5;
-		if (abs($y) < 0.42) {
-			$z = ($y * $y);
-			$z = $y * ((($a4 * $z + $a3) * $z + $a2) * $z + $a1) / (((($b4 * $z + $b3) * $z + $b2) * $z + $b1) * $z + 1);
-		} else {
-			if ($y > 0) {
-				$z = log(-log(1 - $prob));
-			} else {
-				$z = log(-log($prob));
-			}
-			$z = $c1 + $z * ($c2 + $z * ($c3 + $z * ($c4 + $z * ($c5 + $z * ($c6 + $z * ($c7 + $z * ($c8 + $z * $c9)))))));
-			if ($y < 0) {
-				$z = -$z;
-			}
-		}
-		return $z;
-	}	//	function _inverse_ncdf2()
-
-
-	private static function _inverse_ncdf3($p) {
-		//	ALGORITHM AS241 APPL. STATIST. (1988) VOL. 37, NO. 3.
-		//	Produces the normal deviate Z corresponding to a given lower
-		//	tail area of P; Z is accurate to about 1 part in 10**16.
-		//
-		//	This is a PHP version of the original FORTRAN code that can
-		//	be found at http://lib.stat.cmu.edu/apstat/
-		$split1 = 0.425;
-		$split2 = 5;
-		$const1 = 0.180625;
-		$const2 = 1.6;
-
-		//	coefficients for p close to 0.5
-		$a0 = 3.3871328727963666080;
-		$a1 = 1.3314166789178437745E+2;
-		$a2 = 1.9715909503065514427E+3;
-		$a3 = 1.3731693765509461125E+4;
-		$a4 = 4.5921953931549871457E+4;
-		$a5 = 6.7265770927008700853E+4;
-		$a6 = 3.3430575583588128105E+4;
-		$a7 = 2.5090809287301226727E+3;
-
-		$b1 = 4.2313330701600911252E+1;
-		$b2 = 6.8718700749205790830E+2;
-		$b3 = 5.3941960214247511077E+3;
-		$b4 = 2.1213794301586595867E+4;
-		$b5 = 3.9307895800092710610E+4;
-		$b6 = 2.8729085735721942674E+4;
-		$b7 = 5.2264952788528545610E+3;
-
-		//	coefficients for p not close to 0, 0.5 or 1.
-		$c0 = 1.42343711074968357734;
-		$c1 = 4.63033784615654529590;
-		$c2 = 5.76949722146069140550;
-		$c3 = 3.64784832476320460504;
-		$c4 = 1.27045825245236838258;
-		$c5 = 2.41780725177450611770E-1;
-		$c6 = 2.27238449892691845833E-2;
-		$c7 = 7.74545014278341407640E-4;
-
-		$d1 = 2.05319162663775882187;
-		$d2 = 1.67638483018380384940;
-		$d3 = 6.89767334985100004550E-1;
-		$d4 = 1.48103976427480074590E-1;
-		$d5 = 1.51986665636164571966E-2;
-		$d6 = 5.47593808499534494600E-4;
-		$d7 = 1.05075007164441684324E-9;
-
-		//	coefficients for p near 0 or 1.
-		$e0 = 6.65790464350110377720;
-		$e1 = 5.46378491116411436990;
-		$e2 = 1.78482653991729133580;
-		$e3 = 2.96560571828504891230E-1;
-		$e4 = 2.65321895265761230930E-2;
-		$e5 = 1.24266094738807843860E-3;
-		$e6 = 2.71155556874348757815E-5;
-		$e7 = 2.01033439929228813265E-7;
-
-		$f1 = 5.99832206555887937690E-1;
-		$f2 = 1.36929880922735805310E-1;
-		$f3 = 1.48753612908506148525E-2;
-		$f4 = 7.86869131145613259100E-4;
-		$f5 = 1.84631831751005468180E-5;
-		$f6 = 1.42151175831644588870E-7;
-		$f7 = 2.04426310338993978564E-15;
-
-		$q = $p - 0.5;
-
-		//	computation for p close to 0.5
-		if (abs($q) <= split1) {
-			$R = $const1 - $q * $q;
-			$z = $q * ((((((($a7 * $R + $a6) * $R + $a5) * $R + $a4) * $R + $a3) * $R + $a2) * $R + $a1) * $R + $a0) /
-					  ((((((($b7 * $R + $b6) * $R + $b5) * $R + $b4) * $R + $b3) * $R + $b2) * $R + $b1) * $R + 1);
-		} else {
-			if ($q < 0) {
-				$R = $p;
-			} else {
-				$R = 1 - $p;
-			}
-			$R = pow(-log($R),2);
-
-			//	computation for p not close to 0, 0.5 or 1.
-			If ($R <= $split2) {
-				$R = $R - $const2;
-				$z = ((((((($c7 * $R + $c6) * $R + $c5) * $R + $c4) * $R + $c3) * $R + $c2) * $R + $c1) * $R + $c0) /
-					 ((((((($d7 * $R + $d6) * $R + $d5) * $R + $d4) * $R + $d3) * $R + $d2) * $R + $d1) * $R + 1);
-			} else {
-			//	computation for p near 0 or 1.
-				$R = $R - $split2;
-				$z = ((((((($e7 * $R + $e6) * $R + $e5) * $R + $e4) * $R + $e3) * $R + $e2) * $R + $e1) * $R + $e0) /
-					 ((((((($f7 * $R + $f6) * $R + $f5) * $R + $f4) * $R + $f3) * $R + $f2) * $R + $f1) * $R + 1);
-			}
-			if ($q < 0) {
-				$z = -$z;
-			}
-		}
-		return $z;
-	}	//	function _inverse_ncdf3()
-
-
-	/**
-	 * AVEDEV
-	 *
-	 * Returns the average of the absolute deviations of data points from their mean.
-	 * AVEDEV is a measure of the variability in a data set.
-	 *
-	 * Excel Function:
-	 *		AVEDEV(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function AVEDEV() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
-
-		// Return value
-		$returnValue = null;
-
-		$aMean = self::AVERAGE($aArgs);
-		if ($aMean != PHPExcel_Calculation_Functions::DIV0()) {
-			$aCount = 0;
-			foreach ($aArgs as $k => $arg) {
-				if ((is_bool($arg)) &&
-					((!PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
-					$arg = (integer) $arg;
-				}
-				// Is it a numeric value?
-				if ((is_numeric($arg)) && (!is_string($arg))) {
-					if (is_null($returnValue)) {
-						$returnValue = abs($arg - $aMean);
-					} else {
-						$returnValue += abs($arg - $aMean);
-					}
-					++$aCount;
-				}
-			}
-
-			// Return
-			if ($aCount == 0) {
-				return PHPExcel_Calculation_Functions::DIV0();
-			}
-			return $returnValue / $aCount;
-		}
-		return PHPExcel_Calculation_Functions::NaN();
-	}	//	function AVEDEV()
-
-
-	/**
-	 * AVERAGE
-	 *
-	 * Returns the average (arithmetic mean) of the arguments
-	 *
-	 * Excel Function:
-	 *		AVERAGE(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function AVERAGE() {
-		$returnValue = $aCount = 0;
-
-		// Loop through arguments
-		foreach (PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args()) as $k => $arg) {
-			if ((is_bool($arg)) &&
-				((!PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
-				$arg = (integer) $arg;
-			}
-			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
-				if (is_null($returnValue)) {
-					$returnValue = $arg;
-				} else {
-					$returnValue += $arg;
-				}
-				++$aCount;
-			}
-		}
-
-		// Return
-		if ($aCount > 0) {
-			return $returnValue / $aCount;
-		} else {
-			return PHPExcel_Calculation_Functions::DIV0();
-		}
-	}	//	function AVERAGE()
-
-
-	/**
-	 * AVERAGEA
-	 *
-	 * Returns the average of its arguments, including numbers, text, and logical values
-	 *
-	 * Excel Function:
-	 *		AVERAGEA(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function AVERAGEA() {
-		// Return value
-		$returnValue = null;
-
-		$aCount = 0;
-		// Loop through arguments
-		foreach (PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args()) as $k => $arg) {
-			if ((is_bool($arg)) &&
-				(!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
-			} else {
-				if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
-					if (is_bool($arg)) {
-						$arg = (integer) $arg;
-					} elseif (is_string($arg)) {
-						$arg = 0;
-					}
-					if (is_null($returnValue)) {
-						$returnValue = $arg;
-					} else {
-						$returnValue += $arg;
-					}
-					++$aCount;
-				}
-			}
-		}
-
-		// Return
-		if ($aCount > 0) {
-			return $returnValue / $aCount;
-		} else {
-			return PHPExcel_Calculation_Functions::DIV0();
-		}
-	}	//	function AVERAGEA()
-
-
-	/**
-	 * AVERAGEIF
-	 *
-	 * Returns the average value from a range of cells that contain numbers within the list of arguments
-	 *
-	 * Excel Function:
-	 *		AVERAGEIF(value1[,value2[, ...]],condition)
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @param	string		$condition		The criteria that defines which cells will be checked.
-	 * @param	mixed[]		$averageArgs	Data values
-	 * @return	float
-	 */
-	public static function AVERAGEIF($aArgs,$condition,$averageArgs = array()) {
-		// Return value
-		$returnValue = 0;
-
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray($aArgs);
-		$averageArgs = PHPExcel_Calculation_Functions::flattenArray($averageArgs);
-		if (empty($averageArgs)) {
-			$averageArgs = $aArgs;
-		}
-		$condition = PHPExcel_Calculation_Functions::_ifCondition($condition);
-		// Loop through arguments
-		$aCount = 0;
-		foreach ($aArgs as $key => $arg) {
-			if (!is_numeric($arg)) { $arg = PHPExcel_Calculation::_wrapResult(strtoupper($arg)); }
-			$testCondition = '='.$arg.$condition;
-			if (PHPExcel_Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
-				if ((is_null($returnValue)) || ($arg > $returnValue)) {
-					$returnValue += $arg;
-					++$aCount;
-				}
-			}
-		}
-
-		// Return
-		if ($aCount > 0) {
-			return $returnValue / $aCount;
-		} else {
-			return PHPExcel_Calculation_Functions::DIV0();
-		}
-	}	//	function AVERAGEIF()
-
-
-	/**
-	 * BETADIST
-	 *
-	 * Returns the beta distribution.
-	 *
-	 * @param	float		$value			Value at which you want to evaluate the distribution
-	 * @param	float		$alpha			Parameter to the distribution
-	 * @param	float		$beta			Parameter to the distribution
-	 * @param	boolean		$cumulative
-	 * @return	float
-	 *
-	 */
-	public static function BETADIST($value,$alpha,$beta,$rMin=0,$rMax=1) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$alpha	= PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
-		$beta	= PHPExcel_Calculation_Functions::flattenSingleValue($beta);
-		$rMin	= PHPExcel_Calculation_Functions::flattenSingleValue($rMin);
-		$rMax	= PHPExcel_Calculation_Functions::flattenSingleValue($rMax);
-
-		if ((is_numeric($value)) && (is_numeric($alpha)) && (is_numeric($beta)) && (is_numeric($rMin)) && (is_numeric($rMax))) {
-			if (($value < $rMin) || ($value > $rMax) || ($alpha <= 0) || ($beta <= 0) || ($rMin == $rMax)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if ($rMin > $rMax) {
-				$tmp = $rMin;
-				$rMin = $rMax;
-				$rMax = $tmp;
-			}
-			$value -= $rMin;
-			$value /= ($rMax - $rMin);
-			return self::_incompleteBeta($value,$alpha,$beta);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function BETADIST()
-
-
-	/**
-	 * BETAINV
-	 *
-	 * Returns the inverse of the beta distribution.
-	 *
-	 * @param	float		$probability	Probability at which you want to evaluate the distribution
-	 * @param	float		$alpha			Parameter to the distribution
-	 * @param	float		$beta			Parameter to the distribution
-	 * @param	float		$rMin			Minimum value
-	 * @param	float		$rMax			Maximum value
-	 * @param	boolean		$cumulative
-	 * @return	float
-	 *
-	 */
-	public static function BETAINV($probability,$alpha,$beta,$rMin=0,$rMax=1) {
-		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
-		$alpha			= PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
-		$beta			= PHPExcel_Calculation_Functions::flattenSingleValue($beta);
-		$rMin			= PHPExcel_Calculation_Functions::flattenSingleValue($rMin);
-		$rMax			= PHPExcel_Calculation_Functions::flattenSingleValue($rMax);
-
-		if ((is_numeric($probability)) && (is_numeric($alpha)) && (is_numeric($beta)) && (is_numeric($rMin)) && (is_numeric($rMax))) {
-			if (($alpha <= 0) || ($beta <= 0) || ($rMin == $rMax) || ($probability <= 0) || ($probability > 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if ($rMin > $rMax) {
-				$tmp = $rMin;
-				$rMin = $rMax;
-				$rMax = $tmp;
-			}
-			$a = 0;
-			$b = 2;
-
-			$i = 0;
-			while ((($b - $a) > PRECISION) && ($i++ < MAX_ITERATIONS)) {
-				$guess = ($a + $b) / 2;
-				$result = self::BETADIST($guess, $alpha, $beta);
-				if (($result == $probability) || ($result == 0)) {
-					$b = $a;
-				} elseif ($result > $probability) {
-					$b = $guess;
-				} else {
-					$a = $guess;
-				}
-			}
-			if ($i == MAX_ITERATIONS) {
-				return PHPExcel_Calculation_Functions::NA();
-			}
-			return round($rMin + $guess * ($rMax - $rMin),12);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function BETAINV()
-
-
-	/**
-	 * BINOMDIST
-	 *
-	 * Returns the individual term binomial distribution probability. Use BINOMDIST in problems with
-	 *		a fixed number of tests or trials, when the outcomes of any trial are only success or failure,
-	 *		when trials are independent, and when the probability of success is constant throughout the
-	 *		experiment. For example, BINOMDIST can calculate the probability that two of the next three
-	 *		babies born are male.
-	 *
-	 * @param	float		$value			Number of successes in trials
-	 * @param	float		$trials			Number of trials
-	 * @param	float		$probability	Probability of success on each trial
-	 * @param	boolean		$cumulative
-	 * @return	float
-	 *
-	 * @todo	Cumulative distribution function
-	 *
-	 */
-	public static function BINOMDIST($value, $trials, $probability, $cumulative) {
-		$value			= floor(PHPExcel_Calculation_Functions::flattenSingleValue($value));
-		$trials			= floor(PHPExcel_Calculation_Functions::flattenSingleValue($trials));
-		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
-
-		if ((is_numeric($value)) && (is_numeric($trials)) && (is_numeric($probability))) {
-			if (($value < 0) || ($value > $trials)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if (($probability < 0) || ($probability > 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
-				if ($cumulative) {
-					$summer = 0;
-					for ($i = 0; $i <= $value; ++$i) {
-						$summer += PHPExcel_Calculation_MathTrig::COMBIN($trials,$i) * pow($probability,$i) * pow(1 - $probability,$trials - $i);
-					}
-					return $summer;
-				} else {
-					return PHPExcel_Calculation_MathTrig::COMBIN($trials,$value) * pow($probability,$value) * pow(1 - $probability,$trials - $value) ;
-				}
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function BINOMDIST()
-
-
-	/**
-	 * CHIDIST
-	 *
-	 * Returns the one-tailed probability of the chi-squared distribution.
-	 *
-	 * @param	float		$value			Value for the function
-	 * @param	float		$degrees		degrees of freedom
-	 * @return	float
-	 */
-	public static function CHIDIST($value, $degrees) {
-		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$degrees	= floor(PHPExcel_Calculation_Functions::flattenSingleValue($degrees));
-
-		if ((is_numeric($value)) && (is_numeric($degrees))) {
-			if ($degrees < 1) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if ($value < 0) {
-				if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
-					return 1;
-				}
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return 1 - (self::_incompleteGamma($degrees/2,$value/2) / self::_gamma($degrees/2));
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function CHIDIST()
-
-
-	/**
-	 * CHIINV
-	 *
-	 * Returns the one-tailed probability of the chi-squared distribution.
-	 *
-	 * @param	float		$probability	Probability for the function
-	 * @param	float		$degrees		degrees of freedom
-	 * @return	float
-	 */
-	public static function CHIINV($probability, $degrees) {
-		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
-		$degrees		= floor(PHPExcel_Calculation_Functions::flattenSingleValue($degrees));
-
-		if ((is_numeric($probability)) && (is_numeric($degrees))) {
-
-			$xLo = 100;
-			$xHi = 0;
-
-			$x = $xNew = 1;
-			$dx	= 1;
-			$i = 0;
-
-			while ((abs($dx) > PRECISION) && ($i++ < MAX_ITERATIONS)) {
-				// Apply Newton-Raphson step
-				$result = self::CHIDIST($x, $degrees);
-				$error = $result - $probability;
-				if ($error == 0.0) {
-					$dx = 0;
-				} elseif ($error < 0.0) {
-					$xLo = $x;
-				} else {
-					$xHi = $x;
-				}
-				// Avoid division by zero
-				if ($result != 0.0) {
-					$dx = $error / $result;
-					$xNew = $x - $dx;
-				}
-				// If the NR fails to converge (which for example may be the
-				// case if the initial guess is too rough) we apply a bisection
-				// step to determine a more narrow interval around the root.
-				if (($xNew < $xLo) || ($xNew > $xHi) || ($result == 0.0)) {
-					$xNew = ($xLo + $xHi) / 2;
-					$dx = $xNew - $x;
-				}
-				$x = $xNew;
-			}
-			if ($i == MAX_ITERATIONS) {
-				return PHPExcel_Calculation_Functions::NA();
-			}
-			return round($x,12);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function CHIINV()
-
-
-	/**
-	 * CONFIDENCE
-	 *
-	 * Returns the confidence interval for a population mean
-	 *
-	 * @param	float		$alpha
-	 * @param	float		$stdDev		Standard Deviation
-	 * @param	float		$size
-	 * @return	float
-	 *
-	 */
-	public static function CONFIDENCE($alpha,$stdDev,$size) {
-		$alpha	= PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
-		$stdDev	= PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
-		$size	= floor(PHPExcel_Calculation_Functions::flattenSingleValue($size));
-
-		if ((is_numeric($alpha)) && (is_numeric($stdDev)) && (is_numeric($size))) {
-			if (($alpha <= 0) || ($alpha >= 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if (($stdDev <= 0) || ($size < 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return self::NORMSINV(1 - $alpha / 2) * $stdDev / sqrt($size);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function CONFIDENCE()
-
-
-	/**
-	 * CORREL
-	 *
-	 * Returns covariance, the average of the products of deviations for each data point pair.
-	 *
-	 * @param	array of mixed		Data Series Y
-	 * @param	array of mixed		Data Series X
-	 * @return	float
-	 */
-	public static function CORREL($yValues,$xValues=null) {
-		if ((is_null($xValues)) || (!is_array($yValues)) || (!is_array($xValues))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		if (!self::_checkTrendArrays($yValues,$xValues)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$yValueCount = count($yValues);
-		$xValueCount = count($xValues);
-
-		if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
-			return PHPExcel_Calculation_Functions::NA();
-		} elseif ($yValueCount == 1) {
-			return PHPExcel_Calculation_Functions::DIV0();
-		}
-
-		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues);
-		return $bestFitLinear->getCorrelation();
-	}	//	function CORREL()
-
-
-	/**
-	 * COUNT
-	 *
-	 * Counts the number of cells that contain numbers within the list of arguments
-	 *
-	 * Excel Function:
-	 *		COUNT(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	int
-	 */
-	public static function COUNT() {
-		// Return value
-		$returnValue = 0;
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
-		foreach ($aArgs as $k => $arg) {
-			if ((is_bool($arg)) &&
-				((!PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
-				$arg = (integer) $arg;
-			}
-			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
-				++$returnValue;
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function COUNT()
-
-
-	/**
-	 * COUNTA
-	 *
-	 * Counts the number of cells that are not empty within the list of arguments
-	 *
-	 * Excel Function:
-	 *		COUNTA(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	int
-	 */
-	public static function COUNTA() {
-		// Return value
-		$returnValue = 0;
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		foreach ($aArgs as $arg) {
-			// Is it a numeric, boolean or string value?
-			if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
-				++$returnValue;
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function COUNTA()
-
-
-	/**
-	 * COUNTBLANK
-	 *
-	 * Counts the number of empty cells within the list of arguments
-	 *
-	 * Excel Function:
-	 *		COUNTBLANK(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	int
-	 */
-	public static function COUNTBLANK() {
-		// Return value
-		$returnValue = 0;
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		foreach ($aArgs as $arg) {
-			// Is it a blank cell?
-			if ((is_null($arg)) || ((is_string($arg)) && ($arg == ''))) {
-				++$returnValue;
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function COUNTBLANK()
-
-
-	/**
-	 * COUNTIF
-	 *
-	 * Counts the number of cells that contain numbers within the list of arguments
-	 *
-	 * Excel Function:
-	 *		COUNTIF(value1[,value2[, ...]],condition)
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @param	string		$condition		The criteria that defines which cells will be counted.
-	 * @return	int
-	 */
-	public static function COUNTIF($aArgs,$condition) {
-		// Return value
-		$returnValue = 0;
-
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray($aArgs);
-		$condition = PHPExcel_Calculation_Functions::_ifCondition($condition);
-		// Loop through arguments
-		foreach ($aArgs as $arg) {
-			if (!is_numeric($arg)) { $arg = PHPExcel_Calculation::_wrapResult(strtoupper($arg)); }
-			$testCondition = '='.$arg.$condition;
-			if (PHPExcel_Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
-				// Is it a value within our criteria
-				++$returnValue;
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function COUNTIF()
-
-
-	/**
-	 * COVAR
-	 *
-	 * Returns covariance, the average of the products of deviations for each data point pair.
-	 *
-	 * @param	array of mixed		Data Series Y
-	 * @param	array of mixed		Data Series X
-	 * @return	float
-	 */
-	public static function COVAR($yValues,$xValues) {
-		if (!self::_checkTrendArrays($yValues,$xValues)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$yValueCount = count($yValues);
-		$xValueCount = count($xValues);
-
-		if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
-			return PHPExcel_Calculation_Functions::NA();
-		} elseif ($yValueCount == 1) {
-			return PHPExcel_Calculation_Functions::DIV0();
-		}
-
-		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues);
-		return $bestFitLinear->getCovariance();
-	}	//	function COVAR()
-
-
-	/**
-	 * CRITBINOM
-	 *
-	 * Returns the smallest value for which the cumulative binomial distribution is greater
-	 *		than or equal to a criterion value
-	 *
-	 * See http://support.microsoft.com/kb/828117/ for details of the algorithm used
-	 *
-	 * @param	float		$trials			number of Bernoulli trials
-	 * @param	float		$probability	probability of a success on each trial
-	 * @param	float		$alpha			criterion value
-	 * @return	int
-	 *
-	 * @todo	Warning. This implementation differs from the algorithm detailed on the MS
-	 *			web site in that $CumPGuessMinus1 = $CumPGuess - 1 rather than $CumPGuess - $PGuess
-	 *			This eliminates a potential endless loop error, but may have an adverse affect on the
-	 *			accuracy of the function (although all my tests have so far returned correct results).
-	 *
-	 */
-	public static function CRITBINOM($trials, $probability, $alpha) {
-		$trials			= floor(PHPExcel_Calculation_Functions::flattenSingleValue($trials));
-		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
-		$alpha			= PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
-
-		if ((is_numeric($trials)) && (is_numeric($probability)) && (is_numeric($alpha))) {
-			if ($trials < 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if (($probability < 0) || ($probability > 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if (($alpha < 0) || ($alpha > 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if ($alpha <= 0.5) {
-				$t = sqrt(log(1 / ($alpha * $alpha)));
-				$trialsApprox = 0 - ($t + (2.515517 + 0.802853 * $t + 0.010328 * $t * $t) / (1 + 1.432788 * $t + 0.189269 * $t * $t + 0.001308 * $t * $t * $t));
-			} else {
-				$t = sqrt(log(1 / pow(1 - $alpha,2)));
-				$trialsApprox = $t - (2.515517 + 0.802853 * $t + 0.010328 * $t * $t) / (1 + 1.432788 * $t + 0.189269 * $t * $t + 0.001308 * $t * $t * $t);
-			}
-			$Guess = floor($trials * $probability + $trialsApprox * sqrt($trials * $probability * (1 - $probability)));
-			if ($Guess < 0) {
-				$Guess = 0;
-			} elseif ($Guess > $trials) {
-				$Guess = $trials;
-			}
-
-			$TotalUnscaledProbability = $UnscaledPGuess = $UnscaledCumPGuess = 0.0;
-			$EssentiallyZero = 10e-12;
-
-			$m = floor($trials * $probability);
-			++$TotalUnscaledProbability;
-			if ($m == $Guess) { ++$UnscaledPGuess; }
-			if ($m <= $Guess) { ++$UnscaledCumPGuess; }
-
-			$PreviousValue = 1;
-			$Done = False;
-			$k = $m + 1;
-			while ((!$Done) && ($k <= $trials)) {
-				$CurrentValue = $PreviousValue * ($trials - $k + 1) * $probability / ($k * (1 - $probability));
-				$TotalUnscaledProbability += $CurrentValue;
-				if ($k == $Guess) { $UnscaledPGuess += $CurrentValue; }
-				if ($k <= $Guess) { $UnscaledCumPGuess += $CurrentValue; }
-				if ($CurrentValue <= $EssentiallyZero) { $Done = True; }
-				$PreviousValue = $CurrentValue;
-				++$k;
-			}
-
-			$PreviousValue = 1;
-			$Done = False;
-			$k = $m - 1;
-			while ((!$Done) && ($k >= 0)) {
-				$CurrentValue = $PreviousValue * $k + 1 * (1 - $probability) / (($trials - $k) * $probability);
-				$TotalUnscaledProbability += $CurrentValue;
-				if ($k == $Guess) { $UnscaledPGuess += $CurrentValue; }
-				if ($k <= $Guess) { $UnscaledCumPGuess += $CurrentValue; }
-				if ($CurrentValue <= $EssentiallyZero) { $Done = True; }
-				$PreviousValue = $CurrentValue;
-				--$k;
-			}
-
-			$PGuess = $UnscaledPGuess / $TotalUnscaledProbability;
-			$CumPGuess = $UnscaledCumPGuess / $TotalUnscaledProbability;
-
-//			$CumPGuessMinus1 = $CumPGuess - $PGuess;
-			$CumPGuessMinus1 = $CumPGuess - 1;
-
-			while (True) {
-				if (($CumPGuessMinus1 < $alpha) && ($CumPGuess >= $alpha)) {
-					return $Guess;
-				} elseif (($CumPGuessMinus1 < $alpha) && ($CumPGuess < $alpha)) {
-					$PGuessPlus1 = $PGuess * ($trials - $Guess) * $probability / $Guess / (1 - $probability);
-					$CumPGuessMinus1 = $CumPGuess;
-					$CumPGuess = $CumPGuess + $PGuessPlus1;
-					$PGuess = $PGuessPlus1;
-					++$Guess;
-				} elseif (($CumPGuessMinus1 >= $alpha) && ($CumPGuess >= $alpha)) {
-					$PGuessMinus1 = $PGuess * $Guess * (1 - $probability) / ($trials - $Guess + 1) / $probability;
-					$CumPGuess = $CumPGuessMinus1;
-					$CumPGuessMinus1 = $CumPGuessMinus1 - $PGuess;
-					$PGuess = $PGuessMinus1;
-					--$Guess;
-				}
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function CRITBINOM()
-
-
-	/**
-	 * DEVSQ
-	 *
-	 * Returns the sum of squares of deviations of data points from their sample mean.
-	 *
-	 * Excel Function:
-	 *		DEVSQ(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function DEVSQ() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
-
-		// Return value
-		$returnValue = null;
-
-		$aMean = self::AVERAGE($aArgs);
-		if ($aMean != PHPExcel_Calculation_Functions::DIV0()) {
-			$aCount = -1;
-			foreach ($aArgs as $k => $arg) {
-				// Is it a numeric value?
-				if ((is_bool($arg)) &&
-					((!PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
-					$arg = (integer) $arg;
-				}
-				if ((is_numeric($arg)) && (!is_string($arg))) {
-					if (is_null($returnValue)) {
-						$returnValue = pow(($arg - $aMean),2);
-					} else {
-						$returnValue += pow(($arg - $aMean),2);
-					}
-					++$aCount;
-				}
-			}
-
-			// Return
-			if (is_null($returnValue)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			} else {
-				return $returnValue;
-			}
-		}
-		return self::NA();
-	}	//	function DEVSQ()
-
-
-	/**
-	 * EXPONDIST
-	 *
-	 *	Returns the exponential distribution. Use EXPONDIST to model the time between events,
-	 *		such as how long an automated bank teller takes to deliver cash. For example, you can
-	 *		use EXPONDIST to determine the probability that the process takes at most 1 minute.
-	 *
-	 * @param	float		$value			Value of the function
-	 * @param	float		$lambda			The parameter value
-	 * @param	boolean		$cumulative
-	 * @return	float
-	 */
-	public static function EXPONDIST($value, $lambda, $cumulative) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$lambda	= PHPExcel_Calculation_Functions::flattenSingleValue($lambda);
-		$cumulative	= PHPExcel_Calculation_Functions::flattenSingleValue($cumulative);
-
-		if ((is_numeric($value)) && (is_numeric($lambda))) {
-			if (($value < 0) || ($lambda < 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
-				if ($cumulative) {
-					return 1 - exp(0-$value*$lambda);
-				} else {
-					return $lambda * exp(0-$value*$lambda);
-				}
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function EXPONDIST()
-
-
-	/**
-	 * FISHER
-	 *
-	 * Returns the Fisher transformation at x. This transformation produces a function that
-	 *		is normally distributed rather than skewed. Use this function to perform hypothesis
-	 *		testing on the correlation coefficient.
-	 *
-	 * @param	float		$value
-	 * @return	float
-	 */
-	public static function FISHER($value) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-
-		if (is_numeric($value)) {
-			if (($value <= -1) || ($value >= 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return 0.5 * log((1+$value)/(1-$value));
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function FISHER()
-
-
-	/**
-	 * FISHERINV
-	 *
-	 * Returns the inverse of the Fisher transformation. Use this transformation when
-	 *		analyzing correlations between ranges or arrays of data. If y = FISHER(x), then
-	 *		FISHERINV(y) = x.
-	 *
-	 * @param	float		$value
-	 * @return	float
-	 */
-	public static function FISHERINV($value) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-
-		if (is_numeric($value)) {
-			return (exp(2 * $value) - 1) / (exp(2 * $value) + 1);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function FISHERINV()
-
-
-	/**
-	 * FORECAST
-	 *
-	 * Calculates, or predicts, a future value by using existing values. The predicted value is a y-value for a given x-value.
-	 *
-	 * @param	float				Value of X for which we want to find Y
-	 * @param	array of mixed		Data Series Y
-	 * @param	array of mixed		Data Series X
-	 * @return	float
-	 */
-	public static function FORECAST($xValue,$yValues,$xValues) {
-		$xValue	= PHPExcel_Calculation_Functions::flattenSingleValue($xValue);
-		if (!is_numeric($xValue)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (!self::_checkTrendArrays($yValues,$xValues)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$yValueCount = count($yValues);
-		$xValueCount = count($xValues);
-
-		if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
-			return PHPExcel_Calculation_Functions::NA();
-		} elseif ($yValueCount == 1) {
-			return PHPExcel_Calculation_Functions::DIV0();
-		}
-
-		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues);
-		return $bestFitLinear->getValueOfYForX($xValue);
-	}	//	function FORECAST()
-
-
-	/**
-	 * GAMMADIST
-	 *
-	 * Returns the gamma distribution.
-	 *
-	 * @param	float		$value			Value at which you want to evaluate the distribution
-	 * @param	float		$a				Parameter to the distribution
-	 * @param	float		$b				Parameter to the distribution
-	 * @param	boolean		$cumulative
-	 * @return	float
-	 *
-	 */
-	public static function GAMMADIST($value,$a,$b,$cumulative) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$a		= PHPExcel_Calculation_Functions::flattenSingleValue($a);
-		$b		= PHPExcel_Calculation_Functions::flattenSingleValue($b);
-
-		if ((is_numeric($value)) && (is_numeric($a)) && (is_numeric($b))) {
-			if (($value < 0) || ($a <= 0) || ($b <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
-				if ($cumulative) {
-					return self::_incompleteGamma($a,$value / $b) / self::_gamma($a);
-				} else {
-					return (1 / (pow($b,$a) * self::_gamma($a))) * pow($value,$a-1) * exp(0-($value / $b));
-				}
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function GAMMADIST()
-
-
-	/**
-	 * GAMMAINV
-	 *
-	 * Returns the inverse of the beta distribution.
-	 *
-	 * @param	float		$probability	Probability at which you want to evaluate the distribution
-	 * @param	float		$alpha			Parameter to the distribution
-	 * @param	float		$beta			Parameter to the distribution
-	 * @return	float
-	 *
-	 */
-	public static function GAMMAINV($probability,$alpha,$beta) {
-		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
-		$alpha			= PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
-		$beta			= PHPExcel_Calculation_Functions::flattenSingleValue($beta);
-
-		if ((is_numeric($probability)) && (is_numeric($alpha)) && (is_numeric($beta))) {
-			if (($alpha <= 0) || ($beta <= 0) || ($probability < 0) || ($probability > 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-
-			$xLo = 0;
-			$xHi = $alpha * $beta * 5;
-
-			$x = $xNew = 1;
-			$error = $pdf = 0;
-			$dx	= 1024;
-			$i = 0;
-
-			while ((abs($dx) > PRECISION) && ($i++ < MAX_ITERATIONS)) {
-				// Apply Newton-Raphson step
-				$error = self::GAMMADIST($x, $alpha, $beta, True) - $probability;
-				if ($error < 0.0) {
-					$xLo = $x;
-				} else {
-					$xHi = $x;
-				}
-				$pdf = self::GAMMADIST($x, $alpha, $beta, False);
-				// Avoid division by zero
-				if ($pdf != 0.0) {
-					$dx = $error / $pdf;
-					$xNew = $x - $dx;
-				}
-				// If the NR fails to converge (which for example may be the
-				// case if the initial guess is too rough) we apply a bisection
-				// step to determine a more narrow interval around the root.
-				if (($xNew < $xLo) || ($xNew > $xHi) || ($pdf == 0.0)) {
-					$xNew = ($xLo + $xHi) / 2;
-					$dx = $xNew - $x;
-				}
-				$x = $xNew;
-			}
-			if ($i == MAX_ITERATIONS) {
-				return PHPExcel_Calculation_Functions::NA();
-			}
-			return $x;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function GAMMAINV()
-
-
-	/**
-	 * GAMMALN
-	 *
-	 * Returns the natural logarithm of the gamma function.
-	 *
-	 * @param	float		$value
-	 * @return	float
-	 */
-	public static function GAMMALN($value) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-
-		if (is_numeric($value)) {
-			if ($value <= 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return log(self::_gamma($value));
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function GAMMALN()
-
-
-	/**
-	 * GEOMEAN
-	 *
-	 * Returns the geometric mean of an array or range of positive data. For example, you
-	 *		can use GEOMEAN to calculate average growth rate given compound interest with
-	 *		variable rates.
-	 *
-	 * Excel Function:
-	 *		GEOMEAN(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function GEOMEAN() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-
-		$aMean = PHPExcel_Calculation_MathTrig::PRODUCT($aArgs);
-		if (is_numeric($aMean) && ($aMean > 0)) {
-			$aCount = self::COUNT($aArgs) ;
-			if (self::MIN($aArgs) > 0) {
-				return pow($aMean, (1 / $aCount));
-			}
-		}
-		return PHPExcel_Calculation_Functions::NaN();
-	}	//	GEOMEAN()
-
-
-	/**
-	 * GROWTH
-	 *
-	 * Returns values along a predicted emponential trend
-	 *
-	 * @param	array of mixed		Data Series Y
-	 * @param	array of mixed		Data Series X
-	 * @param	array of mixed		Values of X for which we want to find Y
-	 * @param	boolean				A logical value specifying whether to force the intersect to equal 0.
-	 * @return	array of float
-	 */
-	public static function GROWTH($yValues,$xValues=array(),$newValues=array(),$const=True) {
-		$yValues = PHPExcel_Calculation_Functions::flattenArray($yValues);
-		$xValues = PHPExcel_Calculation_Functions::flattenArray($xValues);
-		$newValues = PHPExcel_Calculation_Functions::flattenArray($newValues);
-		$const	= (is_null($const))	? True :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($const);
-
-		$bestFitExponential = trendClass::calculate(trendClass::TREND_EXPONENTIAL,$yValues,$xValues,$const);
-		if (empty($newValues)) {
-			$newValues = $bestFitExponential->getXValues();
-		}
-
-		$returnArray = array();
-		foreach($newValues as $xValue) {
-			$returnArray[0][] = $bestFitExponential->getValueOfYForX($xValue);
-		}
-
-		return $returnArray;
-	}	//	function GROWTH()
-
-
-	/**
-	 * HARMEAN
-	 *
-	 * Returns the harmonic mean of a data set. The harmonic mean is the reciprocal of the
-	 *		arithmetic mean of reciprocals.
-	 *
-	 * Excel Function:
-	 *		HARMEAN(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function HARMEAN() {
-		// Return value
-		$returnValue = PHPExcel_Calculation_Functions::NA();
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		if (self::MIN($aArgs) < 0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		$aCount = 0;
-		foreach ($aArgs as $arg) {
-			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
-				if ($arg <= 0) {
-					return PHPExcel_Calculation_Functions::NaN();
-				}
-				if (is_null($returnValue)) {
-					$returnValue = (1 / $arg);
-				} else {
-					$returnValue += (1 / $arg);
-				}
-				++$aCount;
-			}
-		}
-
-		// Return
-		if ($aCount > 0) {
-			return 1 / ($returnValue / $aCount);
-		} else {
-			return $returnValue;
-		}
-	}	//	function HARMEAN()
-
-
-	/**
-	 * HYPGEOMDIST
-	 *
-	 * Returns the hypergeometric distribution. HYPGEOMDIST returns the probability of a given number of
-	 * sample successes, given the sample size, population successes, and population size.
-	 *
-	 * @param	float		$sampleSuccesses		Number of successes in the sample
-	 * @param	float		$sampleNumber			Size of the sample
-	 * @param	float		$populationSuccesses	Number of successes in the population
-	 * @param	float		$populationNumber		Population size
-	 * @return	float
-	 *
-	 */
-	public static function HYPGEOMDIST($sampleSuccesses, $sampleNumber, $populationSuccesses, $populationNumber) {
-		$sampleSuccesses		= floor(PHPExcel_Calculation_Functions::flattenSingleValue($sampleSuccesses));
-		$sampleNumber			= floor(PHPExcel_Calculation_Functions::flattenSingleValue($sampleNumber));
-		$populationSuccesses	= floor(PHPExcel_Calculation_Functions::flattenSingleValue($populationSuccesses));
-		$populationNumber		= floor(PHPExcel_Calculation_Functions::flattenSingleValue($populationNumber));
-
-		if ((is_numeric($sampleSuccesses)) && (is_numeric($sampleNumber)) && (is_numeric($populationSuccesses)) && (is_numeric($populationNumber))) {
-			if (($sampleSuccesses < 0) || ($sampleSuccesses > $sampleNumber) || ($sampleSuccesses > $populationSuccesses)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if (($sampleNumber <= 0) || ($sampleNumber > $populationNumber)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if (($populationSuccesses <= 0) || ($populationSuccesses > $populationNumber)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return PHPExcel_Calculation_MathTrig::COMBIN($populationSuccesses,$sampleSuccesses) *
-				   PHPExcel_Calculation_MathTrig::COMBIN($populationNumber - $populationSuccesses,$sampleNumber - $sampleSuccesses) /
-				   PHPExcel_Calculation_MathTrig::COMBIN($populationNumber,$sampleNumber);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function HYPGEOMDIST()
-
-
-	/**
-	 * INTERCEPT
-	 *
-	 * Calculates the point at which a line will intersect the y-axis by using existing x-values and y-values.
-	 *
-	 * @param	array of mixed		Data Series Y
-	 * @param	array of mixed		Data Series X
-	 * @return	float
-	 */
-	public static function INTERCEPT($yValues,$xValues) {
-		if (!self::_checkTrendArrays($yValues,$xValues)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$yValueCount = count($yValues);
-		$xValueCount = count($xValues);
-
-		if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
-			return PHPExcel_Calculation_Functions::NA();
-		} elseif ($yValueCount == 1) {
-			return PHPExcel_Calculation_Functions::DIV0();
-		}
-
-		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues);
-		return $bestFitLinear->getIntersect();
-	}	//	function INTERCEPT()
-
-
-	/**
-	 * KURT
-	 *
-	 * Returns the kurtosis of a data set. Kurtosis characterizes the relative peakedness
-	 * or flatness of a distribution compared with the normal distribution. Positive
-	 * kurtosis indicates a relatively peaked distribution. Negative kurtosis indicates a
-	 * relatively flat distribution.
-	 *
-	 * @param	array	Data Series
-	 * @return	float
-	 */
-	public static function KURT() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
-		$mean = self::AVERAGE($aArgs);
-		$stdDev = self::STDEV($aArgs);
-
-		if ($stdDev > 0) {
-			$count = $summer = 0;
-			// Loop through arguments
-			foreach ($aArgs as $k => $arg) {
-				if ((is_bool($arg)) &&
-					(!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
-				} else {
-					// Is it a numeric value?
-					if ((is_numeric($arg)) && (!is_string($arg))) {
-						$summer += pow((($arg - $mean) / $stdDev),4) ;
-						++$count;
-					}
-				}
-			}
-
-			// Return
-			if ($count > 3) {
-				return $summer * ($count * ($count+1) / (($count-1) * ($count-2) * ($count-3))) - (3 * pow($count-1,2) / (($count-2) * ($count-3)));
-			}
-		}
-		return PHPExcel_Calculation_Functions::DIV0();
-	}	//	function KURT()
-
-
-	/**
-	 * LARGE
-	 *
-	 * Returns the nth largest value in a data set. You can use this function to
-	 *		select a value based on its relative standing.
-	 *
-	 * Excel Function:
-	 *		LARGE(value1[,value2[, ...]],entry)
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @param	int			$entry			Position (ordered from the largest) in the array or range of data to return
-	 * @return	float
-	 *
-	 */
-	public static function LARGE() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-
-		// Calculate
-		$entry = floor(array_pop($aArgs));
-
-		if ((is_numeric($entry)) && (!is_string($entry))) {
-			$mArgs = array();
-			foreach ($aArgs as $arg) {
-				// Is it a numeric value?
-				if ((is_numeric($arg)) && (!is_string($arg))) {
-					$mArgs[] = $arg;
-				}
-			}
-			$count = self::COUNT($mArgs);
-			$entry = floor(--$entry);
-			if (($entry < 0) || ($entry >= $count) || ($count == 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			rsort($mArgs);
-			return $mArgs[$entry];
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function LARGE()
-
-
-	/**
-	 * LINEST
-	 *
-	 * Calculates the statistics for a line by using the "least squares" method to calculate a straight line that best fits your data,
-	 *		and then returns an array that describes the line.
-	 *
-	 * @param	array of mixed		Data Series Y
-	 * @param	array of mixed		Data Series X
-	 * @param	boolean				A logical value specifying whether to force the intersect to equal 0.
-	 * @param	boolean				A logical value specifying whether to return additional regression statistics.
-	 * @return	array
-	 */
-	public static function LINEST($yValues, $xValues = NULL, $const = TRUE, $stats = FALSE) {
-		$const	= (is_null($const))	? TRUE :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($const);
-		$stats	= (is_null($stats))	? FALSE :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($stats);
-		if (is_null($xValues)) $xValues = range(1,count(PHPExcel_Calculation_Functions::flattenArray($yValues)));
-
-		if (!self::_checkTrendArrays($yValues,$xValues)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$yValueCount = count($yValues);
-		$xValueCount = count($xValues);
-
-
-		if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
-			return PHPExcel_Calculation_Functions::NA();
-		} elseif ($yValueCount == 1) {
-			return 0;
-		}
-
-		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues,$const);
-		if ($stats) {
-			return array( array( $bestFitLinear->getSlope(),
-						 		 $bestFitLinear->getSlopeSE(),
-						 		 $bestFitLinear->getGoodnessOfFit(),
-						 		 $bestFitLinear->getF(),
-						 		 $bestFitLinear->getSSRegression(),
-							   ),
-						  array( $bestFitLinear->getIntersect(),
-								 $bestFitLinear->getIntersectSE(),
-								 $bestFitLinear->getStdevOfResiduals(),
-								 $bestFitLinear->getDFResiduals(),
-								 $bestFitLinear->getSSResiduals()
-							   )
-						);
-		} else {
-			return array( $bestFitLinear->getSlope(),
-						  $bestFitLinear->getIntersect()
-						);
-		}
-	}	//	function LINEST()
-
-
-	/**
-	 * LOGEST
-	 *
-	 * Calculates an exponential curve that best fits the X and Y data series,
-	 *		and then returns an array that describes the line.
-	 *
-	 * @param	array of mixed		Data Series Y
-	 * @param	array of mixed		Data Series X
-	 * @param	boolean				A logical value specifying whether to force the intersect to equal 0.
-	 * @param	boolean				A logical value specifying whether to return additional regression statistics.
-	 * @return	array
-	 */
-	public static function LOGEST($yValues,$xValues=null,$const=True,$stats=False) {
-		$const	= (is_null($const))	? True :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($const);
-		$stats	= (is_null($stats))	? False :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($stats);
-		if (is_null($xValues)) $xValues = range(1,count(PHPExcel_Calculation_Functions::flattenArray($yValues)));
-
-		if (!self::_checkTrendArrays($yValues,$xValues)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$yValueCount = count($yValues);
-		$xValueCount = count($xValues);
-
-		foreach($yValues as $value) {
-			if ($value <= 0.0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-		}
-
-
-		if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
-			return PHPExcel_Calculation_Functions::NA();
-		} elseif ($yValueCount == 1) {
-			return 1;
-		}
-
-		$bestFitExponential = trendClass::calculate(trendClass::TREND_EXPONENTIAL,$yValues,$xValues,$const);
-		if ($stats) {
-			return array( array( $bestFitExponential->getSlope(),
-						 		 $bestFitExponential->getSlopeSE(),
-						 		 $bestFitExponential->getGoodnessOfFit(),
-						 		 $bestFitExponential->getF(),
-						 		 $bestFitExponential->getSSRegression(),
-							   ),
-						  array( $bestFitExponential->getIntersect(),
-								 $bestFitExponential->getIntersectSE(),
-								 $bestFitExponential->getStdevOfResiduals(),
-								 $bestFitExponential->getDFResiduals(),
-								 $bestFitExponential->getSSResiduals()
-							   )
-						);
-		} else {
-			return array( $bestFitExponential->getSlope(),
-						  $bestFitExponential->getIntersect()
-						);
-		}
-	}	//	function LOGEST()
-
-
-	/**
-	 * LOGINV
-	 *
-	 * Returns the inverse of the normal cumulative distribution
-	 *
-	 * @param	float		$probability
-	 * @param	float		$mean
-	 * @param	float		$stdDev
-	 * @return	float
-	 *
-	 * @todo	Try implementing P J Acklam's refinement algorithm for greater
-	 *			accuracy if I can get my head round the mathematics
-	 *			(as described at) http://home.online.no/~pjacklam/notes/invnorm/
-	 */
-	public static function LOGINV($probability, $mean, $stdDev) {
-		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
-		$mean			= PHPExcel_Calculation_Functions::flattenSingleValue($mean);
-		$stdDev			= PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
-
-		if ((is_numeric($probability)) && (is_numeric($mean)) && (is_numeric($stdDev))) {
-			if (($probability < 0) || ($probability > 1) || ($stdDev <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return exp($mean + $stdDev * self::NORMSINV($probability));
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function LOGINV()
-
-
-	/**
-	 * LOGNORMDIST
-	 *
-	 * Returns the cumulative lognormal distribution of x, where ln(x) is normally distributed
-	 * with parameters mean and standard_dev.
-	 *
-	 * @param	float		$value
-	 * @param	float		$mean
-	 * @param	float		$stdDev
-	 * @return	float
-	 */
-	public static function LOGNORMDIST($value, $mean, $stdDev) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$mean	= PHPExcel_Calculation_Functions::flattenSingleValue($mean);
-		$stdDev	= PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
-
-		if ((is_numeric($value)) && (is_numeric($mean)) && (is_numeric($stdDev))) {
-			if (($value <= 0) || ($stdDev <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return self::NORMSDIST((log($value) - $mean) / $stdDev);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function LOGNORMDIST()
-
-
-	/**
-	 * MAX
-	 *
-	 * MAX returns the value of the element of the values passed that has the highest value,
-	 *		with negative numbers considered smaller than positive numbers.
-	 *
-	 * Excel Function:
-	 *		MAX(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function MAX() {
-		// Return value
-		$returnValue = null;
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		foreach ($aArgs as $arg) {
-			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
-				if ((is_null($returnValue)) || ($arg > $returnValue)) {
-					$returnValue = $arg;
-				}
-			}
-		}
-
-		// Return
-		if(is_null($returnValue)) {
-			return 0;
-		}
-		return $returnValue;
-	}	//	function MAX()
-
-
-	/**
-	 * MAXA
-	 *
-	 * Returns the greatest value in a list of arguments, including numbers, text, and logical values
-	 *
-	 * Excel Function:
-	 *		MAXA(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function MAXA() {
-		// Return value
-		$returnValue = null;
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		foreach ($aArgs as $arg) {
-			// Is it a numeric value?
-			if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
-				if (is_bool($arg)) {
-					$arg = (integer) $arg;
-				} elseif (is_string($arg)) {
-					$arg = 0;
-				}
-				if ((is_null($returnValue)) || ($arg > $returnValue)) {
-					$returnValue = $arg;
-				}
-			}
-		}
-
-		// Return
-		if(is_null($returnValue)) {
-			return 0;
-		}
-		return $returnValue;
-	}	//	function MAXA()
-
-
-	/**
-	 * MAXIF
-	 *
-	 * Counts the maximum value within a range of cells that contain numbers within the list of arguments
-	 *
-	 * Excel Function:
-	 *		MAXIF(value1[,value2[, ...]],condition)
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @param	string		$condition		The criteria that defines which cells will be checked.
-	 * @return	float
-	 */
-	public static function MAXIF($aArgs,$condition,$sumArgs = array()) {
-		// Return value
-		$returnValue = null;
-
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray($aArgs);
-		$sumArgs = PHPExcel_Calculation_Functions::flattenArray($sumArgs);
-		if (empty($sumArgs)) {
-			$sumArgs = $aArgs;
-		}
-		$condition = PHPExcel_Calculation_Functions::_ifCondition($condition);
-		// Loop through arguments
-		foreach ($aArgs as $key => $arg) {
-			if (!is_numeric($arg)) { $arg = PHPExcel_Calculation::_wrapResult(strtoupper($arg)); }
-			$testCondition = '='.$arg.$condition;
-			if (PHPExcel_Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
-				if ((is_null($returnValue)) || ($arg > $returnValue)) {
-					$returnValue = $arg;
-				}
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function MAXIF()
-
-
-	/**
-	 * MEDIAN
-	 *
-	 * Returns the median of the given numbers. The median is the number in the middle of a set of numbers.
-	 *
-	 * Excel Function:
-	 *		MEDIAN(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function MEDIAN() {
-		// Return value
-		$returnValue = PHPExcel_Calculation_Functions::NaN();
-
-		$mArgs = array();
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		foreach ($aArgs as $arg) {
-			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
-				$mArgs[] = $arg;
-			}
-		}
-
-		$mValueCount = count($mArgs);
-		if ($mValueCount > 0) {
-			sort($mArgs,SORT_NUMERIC);
-			$mValueCount = $mValueCount / 2;
-			if ($mValueCount == floor($mValueCount)) {
-				$returnValue = ($mArgs[$mValueCount--] + $mArgs[$mValueCount]) / 2;
-			} else {
-				$mValueCount == floor($mValueCount);
-				$returnValue = $mArgs[$mValueCount];
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function MEDIAN()
-
-
-	/**
-	 * MIN
-	 *
-	 * MIN returns the value of the element of the values passed that has the smallest value,
-	 *		with negative numbers considered smaller than positive numbers.
-	 *
-	 * Excel Function:
-	 *		MIN(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function MIN() {
-		// Return value
-		$returnValue = null;
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		foreach ($aArgs as $arg) {
-			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
-				if ((is_null($returnValue)) || ($arg < $returnValue)) {
-					$returnValue = $arg;
-				}
-			}
-		}
-
-		// Return
-		if(is_null($returnValue)) {
-			return 0;
-		}
-		return $returnValue;
-	}	//	function MIN()
-
-
-	/**
-	 * MINA
-	 *
-	 * Returns the smallest value in a list of arguments, including numbers, text, and logical values
-	 *
-	 * Excel Function:
-	 *		MINA(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function MINA() {
-		// Return value
-		$returnValue = null;
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		foreach ($aArgs as $arg) {
-			// Is it a numeric value?
-			if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
-				if (is_bool($arg)) {
-					$arg = (integer) $arg;
-				} elseif (is_string($arg)) {
-					$arg = 0;
-				}
-				if ((is_null($returnValue)) || ($arg < $returnValue)) {
-					$returnValue = $arg;
-				}
-			}
-		}
-
-		// Return
-		if(is_null($returnValue)) {
-			return 0;
-		}
-		return $returnValue;
-	}	//	function MINA()
-
-
-	/**
-	 * MINIF
-	 *
-	 * Returns the minimum value within a range of cells that contain numbers within the list of arguments
-	 *
-	 * Excel Function:
-	 *		MINIF(value1[,value2[, ...]],condition)
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @param	string		$condition		The criteria that defines which cells will be checked.
-	 * @return	float
-	 */
-	public static function MINIF($aArgs,$condition,$sumArgs = array()) {
-		// Return value
-		$returnValue = null;
-
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray($aArgs);
-		$sumArgs = PHPExcel_Calculation_Functions::flattenArray($sumArgs);
-		if (empty($sumArgs)) {
-			$sumArgs = $aArgs;
-		}
-		$condition = PHPExcel_Calculation_Functions::_ifCondition($condition);
-		// Loop through arguments
-		foreach ($aArgs as $key => $arg) {
-			if (!is_numeric($arg)) { $arg = PHPExcel_Calculation::_wrapResult(strtoupper($arg)); }
-			$testCondition = '='.$arg.$condition;
-			if (PHPExcel_Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
-				if ((is_null($returnValue)) || ($arg < $returnValue)) {
-					$returnValue = $arg;
-				}
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function MINIF()
-
-
-	//
-	//	Special variant of array_count_values that isn't limited to strings and integers,
-	//		but can work with floating point numbers as values
-	//
-	private static function _modeCalc($data) {
-		$frequencyArray = array();
-		foreach($data as $datum) {
-			$found = False;
-			foreach($frequencyArray as $key => $value) {
-				if ((string) $value['value'] == (string) $datum) {
-					++$frequencyArray[$key]['frequency'];
-					$found = True;
-					break;
-				}
-			}
-			if (!$found) {
-				$frequencyArray[] = array('value'		=> $datum,
-										  'frequency'	=>	1 );
-			}
-		}
-
-		foreach($frequencyArray as $key => $value) {
-			$frequencyList[$key] = $value['frequency'];
-			$valueList[$key] = $value['value'];
-		}
-		array_multisort($frequencyList, SORT_DESC, $valueList, SORT_ASC, SORT_NUMERIC, $frequencyArray);
-
-		if ($frequencyArray[0]['frequency'] == 1) {
-			return PHPExcel_Calculation_Functions::NA();
-		}
-		return $frequencyArray[0]['value'];
-	}	//	function _modeCalc()
-
-
-	/**
-	 * MODE
-	 *
-	 * Returns the most frequently occurring, or repetitive, value in an array or range of data
-	 *
-	 * Excel Function:
-	 *		MODE(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function MODE() {
-		// Return value
-		$returnValue = PHPExcel_Calculation_Functions::NA();
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-
-		$mArgs = array();
-		foreach ($aArgs as $arg) {
-			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
-				$mArgs[] = $arg;
-			}
-		}
-
-		if (!empty($mArgs)) {
-			return self::_modeCalc($mArgs);
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function MODE()
-
-
-	/**
-	 * NEGBINOMDIST
-	 *
-	 * Returns the negative binomial distribution. NEGBINOMDIST returns the probability that
-	 *		there will be number_f failures before the number_s-th success, when the constant
-	 *		probability of a success is probability_s. This function is similar to the binomial
-	 *		distribution, except that the number of successes is fixed, and the number of trials is
-	 *		variable. Like the binomial, trials are assumed to be independent.
-	 *
-	 * @param	float		$failures		Number of Failures
-	 * @param	float		$successes		Threshold number of Successes
-	 * @param	float		$probability	Probability of success on each trial
-	 * @return	float
-	 *
-	 */
-	public static function NEGBINOMDIST($failures, $successes, $probability) {
-		$failures		= floor(PHPExcel_Calculation_Functions::flattenSingleValue($failures));
-		$successes		= floor(PHPExcel_Calculation_Functions::flattenSingleValue($successes));
-		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
-
-		if ((is_numeric($failures)) && (is_numeric($successes)) && (is_numeric($probability))) {
-			if (($failures < 0) || ($successes < 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if (($probability < 0) || ($probability > 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
-				if (($failures + $successes - 1) <= 0) {
-					return PHPExcel_Calculation_Functions::NaN();
-				}
-			}
-			return (PHPExcel_Calculation_MathTrig::COMBIN($failures + $successes - 1,$successes - 1)) * (pow($probability,$successes)) * (pow(1 - $probability,$failures)) ;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function NEGBINOMDIST()
-
-
-	/**
-	 * NORMDIST
-	 *
-	 * Returns the normal distribution for the specified mean and standard deviation. This
-	 * function has a very wide range of applications in statistics, including hypothesis
-	 * testing.
-	 *
-	 * @param	float		$value
-	 * @param	float		$mean		Mean Value
-	 * @param	float		$stdDev		Standard Deviation
-	 * @param	boolean		$cumulative
-	 * @return	float
-	 *
-	 */
-	public static function NORMDIST($value, $mean, $stdDev, $cumulative) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$mean	= PHPExcel_Calculation_Functions::flattenSingleValue($mean);
-		$stdDev	= PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
-
-		if ((is_numeric($value)) && (is_numeric($mean)) && (is_numeric($stdDev))) {
-			if ($stdDev < 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
-				if ($cumulative) {
-					return 0.5 * (1 + PHPExcel_Calculation_Engineering::_erfVal(($value - $mean) / ($stdDev * sqrt(2))));
-				} else {
-					return (1 / (SQRT2PI * $stdDev)) * exp(0 - (pow($value - $mean,2) / (2 * ($stdDev * $stdDev))));
-				}
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function NORMDIST()
-
-
-	/**
-	 * NORMINV
-	 *
-	 * Returns the inverse of the normal cumulative distribution for the specified mean and standard deviation.
-	 *
-	 * @param	float		$value
-	 * @param	float		$mean		Mean Value
-	 * @param	float		$stdDev		Standard Deviation
-	 * @return	float
-	 *
-	 */
-	public static function NORMINV($probability,$mean,$stdDev) {
-		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
-		$mean			= PHPExcel_Calculation_Functions::flattenSingleValue($mean);
-		$stdDev			= PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
-
-		if ((is_numeric($probability)) && (is_numeric($mean)) && (is_numeric($stdDev))) {
-			if (($probability < 0) || ($probability > 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if ($stdDev < 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return (self::_inverse_ncdf($probability) * $stdDev) + $mean;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function NORMINV()
-
-
-	/**
-	 * NORMSDIST
-	 *
-	 * Returns the standard normal cumulative distribution function. The distribution has
-	 * a mean of 0 (zero) and a standard deviation of one. Use this function in place of a
-	 * table of standard normal curve areas.
-	 *
-	 * @param	float		$value
-	 * @return	float
-	 */
-	public static function NORMSDIST($value) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-
-		return self::NORMDIST($value, 0, 1, True);
-	}	//	function NORMSDIST()
-
-
-	/**
-	 * NORMSINV
-	 *
-	 * Returns the inverse of the standard normal cumulative distribution
-	 *
-	 * @param	float		$value
-	 * @return	float
-	 */
-	public static function NORMSINV($value) {
-		return self::NORMINV($value, 0, 1);
-	}	//	function NORMSINV()
-
-
-	/**
-	 * PERCENTILE
-	 *
-	 * Returns the nth percentile of values in a range..
-	 *
-	 * Excel Function:
-	 *		PERCENTILE(value1[,value2[, ...]],entry)
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @param	float		$entry			Percentile value in the range 0..1, inclusive.
-	 * @return	float
-	 */
-	public static function PERCENTILE() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-
-		// Calculate
-		$entry = array_pop($aArgs);
-
-		if ((is_numeric($entry)) && (!is_string($entry))) {
-			if (($entry < 0) || ($entry > 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$mArgs = array();
-			foreach ($aArgs as $arg) {
-				// Is it a numeric value?
-				if ((is_numeric($arg)) && (!is_string($arg))) {
-					$mArgs[] = $arg;
-				}
-			}
-			$mValueCount = count($mArgs);
-			if ($mValueCount > 0) {
-				sort($mArgs);
-				$count = self::COUNT($mArgs);
-				$index = $entry * ($count-1);
-				$iBase = floor($index);
-				if ($index == $iBase) {
-					return $mArgs[$index];
-				} else {
-					$iNext = $iBase + 1;
-					$iProportion = $index - $iBase;
-					return $mArgs[$iBase] + (($mArgs[$iNext] - $mArgs[$iBase]) * $iProportion) ;
-				}
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function PERCENTILE()
-
-
-	/**
-	 * PERCENTRANK
-	 *
-	 * Returns the rank of a value in a data set as a percentage of the data set.
-	 *
-	 * @param	array of number		An array of, or a reference to, a list of numbers.
-	 * @param	number				The number whose rank you want to find.
-	 * @param	number				The number of significant digits for the returned percentage value.
-	 * @return	float
-	 */
-	public static function PERCENTRANK($valueSet,$value,$significance=3) {
-		$valueSet	= PHPExcel_Calculation_Functions::flattenArray($valueSet);
-		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$significance	= (is_null($significance))	? 3 :	(integer) PHPExcel_Calculation_Functions::flattenSingleValue($significance);
-
-		foreach($valueSet as $key => $valueEntry) {
-			if (!is_numeric($valueEntry)) {
-				unset($valueSet[$key]);
-			}
-		}
-		sort($valueSet,SORT_NUMERIC);
-		$valueCount = count($valueSet);
-		if ($valueCount == 0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		$valueAdjustor = $valueCount - 1;
-		if (($value < $valueSet[0]) || ($value > $valueSet[$valueAdjustor])) {
-			return PHPExcel_Calculation_Functions::NA();
-		}
-
-		$pos = array_search($value,$valueSet);
-		if ($pos === False) {
-			$pos = 0;
-			$testValue = $valueSet[0];
-			while ($testValue < $value) {
-				$testValue = $valueSet[++$pos];
-			}
-			--$pos;
-			$pos += (($value - $valueSet[$pos]) / ($testValue - $valueSet[$pos]));
-		}
-
-		return round($pos / $valueAdjustor,$significance);
-	}	//	function PERCENTRANK()
-
-
-	/**
-	 * PERMUT
-	 *
-	 * Returns the number of permutations for a given number of objects that can be
-	 *		selected from number objects. A permutation is any set or subset of objects or
-	 *		events where internal order is significant. Permutations are different from
-	 *		combinations, for which the internal order is not significant. Use this function
-	 *		for lottery-style probability calculations.
-	 *
-	 * @param	int		$numObjs	Number of different objects
-	 * @param	int		$numInSet	Number of objects in each permutation
-	 * @return	int		Number of permutations
-	 */
-	public static function PERMUT($numObjs,$numInSet) {
-		$numObjs	= PHPExcel_Calculation_Functions::flattenSingleValue($numObjs);
-		$numInSet	= PHPExcel_Calculation_Functions::flattenSingleValue($numInSet);
-
-		if ((is_numeric($numObjs)) && (is_numeric($numInSet))) {
-			$numInSet = floor($numInSet);
-			if ($numObjs < $numInSet) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return round(PHPExcel_Calculation_MathTrig::FACT($numObjs) / PHPExcel_Calculation_MathTrig::FACT($numObjs - $numInSet));
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function PERMUT()
-
-
-	/**
-	 * POISSON
-	 *
-	 * Returns the Poisson distribution. A common application of the Poisson distribution
-	 * is predicting the number of events over a specific time, such as the number of
-	 * cars arriving at a toll plaza in 1 minute.
-	 *
-	 * @param	float		$value
-	 * @param	float		$mean		Mean Value
-	 * @param	boolean		$cumulative
-	 * @return	float
-	 *
-	 */
-	public static function POISSON($value, $mean, $cumulative) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$mean	= PHPExcel_Calculation_Functions::flattenSingleValue($mean);
-
-		if ((is_numeric($value)) && (is_numeric($mean))) {
-			if (($value < 0) || ($mean <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
-				if ($cumulative) {
-					$summer = 0;
-					for ($i = 0; $i <= floor($value); ++$i) {
-						$summer += pow($mean,$i) / PHPExcel_Calculation_MathTrig::FACT($i);
-					}
-					return exp(0-$mean) * $summer;
-				} else {
-					return (exp(0-$mean) * pow($mean,$value)) / PHPExcel_Calculation_MathTrig::FACT($value);
-				}
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function POISSON()
-
-
-	/**
-	 * QUARTILE
-	 *
-	 * Returns the quartile of a data set.
-	 *
-	 * Excel Function:
-	 *		QUARTILE(value1[,value2[, ...]],entry)
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @param	int			$entry			Quartile value in the range 1..3, inclusive.
-	 * @return	float
-	 */
-	public static function QUARTILE() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-
-		// Calculate
-		$entry = floor(array_pop($aArgs));
-
-		if ((is_numeric($entry)) && (!is_string($entry))) {
-			$entry /= 4;
-			if (($entry < 0) || ($entry > 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return self::PERCENTILE($aArgs,$entry);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function QUARTILE()
-
-
-	/**
-	 * RANK
-	 *
-	 * Returns the rank of a number in a list of numbers.
-	 *
-	 * @param	number				The number whose rank you want to find.
-	 * @param	array of number		An array of, or a reference to, a list of numbers.
-	 * @param	mixed				Order to sort the values in the value set
-	 * @return	float
-	 */
-	public static function RANK($value,$valueSet,$order=0) {
-		$value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$valueSet = PHPExcel_Calculation_Functions::flattenArray($valueSet);
-		$order	= (is_null($order))	? 0 :	(integer) PHPExcel_Calculation_Functions::flattenSingleValue($order);
-
-		foreach($valueSet as $key => $valueEntry) {
-			if (!is_numeric($valueEntry)) {
-				unset($valueSet[$key]);
-			}
-		}
-
-		if ($order == 0) {
-			rsort($valueSet,SORT_NUMERIC);
-		} else {
-			sort($valueSet,SORT_NUMERIC);
-		}
-		$pos = array_search($value,$valueSet);
-		if ($pos === False) {
-			return PHPExcel_Calculation_Functions::NA();
-		}
-
-		return ++$pos;
-	}	//	function RANK()
-
-
-	/**
-	 * RSQ
-	 *
-	 * Returns the square of the Pearson product moment correlation coefficient through data points in known_y's and known_x's.
-	 *
-	 * @param	array of mixed		Data Series Y
-	 * @param	array of mixed		Data Series X
-	 * @return	float
-	 */
-	public static function RSQ($yValues,$xValues) {
-		if (!self::_checkTrendArrays($yValues,$xValues)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$yValueCount = count($yValues);
-		$xValueCount = count($xValues);
-
-		if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
-			return PHPExcel_Calculation_Functions::NA();
-		} elseif ($yValueCount == 1) {
-			return PHPExcel_Calculation_Functions::DIV0();
-		}
-
-		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues);
-		return $bestFitLinear->getGoodnessOfFit();
-	}	//	function RSQ()
-
-
-	/**
-	 * SKEW
-	 *
-	 * Returns the skewness of a distribution. Skewness characterizes the degree of asymmetry
-	 * of a distribution around its mean. Positive skewness indicates a distribution with an
-	 * asymmetric tail extending toward more positive values. Negative skewness indicates a
-	 * distribution with an asymmetric tail extending toward more negative values.
-	 *
-	 * @param	array	Data Series
-	 * @return	float
-	 */
-	public static function SKEW() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
-		$mean = self::AVERAGE($aArgs);
-		$stdDev = self::STDEV($aArgs);
-
-		$count = $summer = 0;
-		// Loop through arguments
-		foreach ($aArgs as $k => $arg) {
-			if ((is_bool($arg)) &&
-				(!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
-			} else {
-				// Is it a numeric value?
-				if ((is_numeric($arg)) && (!is_string($arg))) {
-					$summer += pow((($arg - $mean) / $stdDev),3) ;
-					++$count;
-				}
-			}
-		}
-
-		// Return
-		if ($count > 2) {
-			return $summer * ($count / (($count-1) * ($count-2)));
-		}
-		return PHPExcel_Calculation_Functions::DIV0();
-	}	//	function SKEW()
-
-
-	/**
-	 * SLOPE
-	 *
-	 * Returns the slope of the linear regression line through data points in known_y's and known_x's.
-	 *
-	 * @param	array of mixed		Data Series Y
-	 * @param	array of mixed		Data Series X
-	 * @return	float
-	 */
-	public static function SLOPE($yValues,$xValues) {
-		if (!self::_checkTrendArrays($yValues,$xValues)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$yValueCount = count($yValues);
-		$xValueCount = count($xValues);
-
-		if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
-			return PHPExcel_Calculation_Functions::NA();
-		} elseif ($yValueCount == 1) {
-			return PHPExcel_Calculation_Functions::DIV0();
-		}
-
-		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues);
-		return $bestFitLinear->getSlope();
-	}	//	function SLOPE()
-
-
-	/**
-	 * SMALL
-	 *
-	 * Returns the nth smallest value in a data set. You can use this function to
-	 *		select a value based on its relative standing.
-	 *
-	 * Excel Function:
-	 *		SMALL(value1[,value2[, ...]],entry)
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @param	int			$entry			Position (ordered from the smallest) in the array or range of data to return
-	 * @return	float
-	 */
-	public static function SMALL() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-
-		// Calculate
-		$entry = array_pop($aArgs);
-
-		if ((is_numeric($entry)) && (!is_string($entry))) {
-			$mArgs = array();
-			foreach ($aArgs as $arg) {
-				// Is it a numeric value?
-				if ((is_numeric($arg)) && (!is_string($arg))) {
-					$mArgs[] = $arg;
-				}
-			}
-			$count = self::COUNT($mArgs);
-			$entry = floor(--$entry);
-			if (($entry < 0) || ($entry >= $count) || ($count == 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			sort($mArgs);
-			return $mArgs[$entry];
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function SMALL()
-
-
-	/**
-	 * STANDARDIZE
-	 *
-	 * Returns a normalized value from a distribution characterized by mean and standard_dev.
-	 *
-	 * @param	float	$value		Value to normalize
-	 * @param	float	$mean		Mean Value
-	 * @param	float	$stdDev		Standard Deviation
-	 * @return	float	Standardized value
-	 */
-	public static function STANDARDIZE($value,$mean,$stdDev) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$mean	= PHPExcel_Calculation_Functions::flattenSingleValue($mean);
-		$stdDev	= PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
-
-		if ((is_numeric($value)) && (is_numeric($mean)) && (is_numeric($stdDev))) {
-			if ($stdDev <= 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return ($value - $mean) / $stdDev ;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function STANDARDIZE()
-
-
-	/**
-	 * STDEV
-	 *
-	 * Estimates standard deviation based on a sample. The standard deviation is a measure of how
-	 *		widely values are dispersed from the average value (the mean).
-	 *
-	 * Excel Function:
-	 *		STDEV(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function STDEV() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
-
-		// Return value
-		$returnValue = null;
-
-		$aMean = self::AVERAGE($aArgs);
-		if (!is_null($aMean)) {
-			$aCount = -1;
-			foreach ($aArgs as $k => $arg) {
-				if ((is_bool($arg)) &&
-					((!PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
-					$arg = (integer) $arg;
-				}
-				// Is it a numeric value?
-				if ((is_numeric($arg)) && (!is_string($arg))) {
-					if (is_null($returnValue)) {
-						$returnValue = pow(($arg - $aMean),2);
-					} else {
-						$returnValue += pow(($arg - $aMean),2);
-					}
-					++$aCount;
-				}
-			}
-
-			// Return
-			if (($aCount > 0) && ($returnValue >= 0)) {
-				return sqrt($returnValue / $aCount);
-			}
-		}
-		return PHPExcel_Calculation_Functions::DIV0();
-	}	//	function STDEV()
-
-
-	/**
-	 * STDEVA
-	 *
-	 * Estimates standard deviation based on a sample, including numbers, text, and logical values
-	 *
-	 * Excel Function:
-	 *		STDEVA(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function STDEVA() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
-
-		// Return value
-		$returnValue = null;
-
-		$aMean = self::AVERAGEA($aArgs);
-		if (!is_null($aMean)) {
-			$aCount = -1;
-			foreach ($aArgs as $k => $arg) {
-				if ((is_bool($arg)) &&
-					(!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
-				} else {
-					// Is it a numeric value?
-					if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) & ($arg != '')))) {
-						if (is_bool($arg)) {
-							$arg = (integer) $arg;
-						} elseif (is_string($arg)) {
-							$arg = 0;
-						}
-						if (is_null($returnValue)) {
-							$returnValue = pow(($arg - $aMean),2);
-						} else {
-							$returnValue += pow(($arg - $aMean),2);
-						}
-						++$aCount;
-					}
-				}
-			}
-
-			// Return
-			if (($aCount > 0) && ($returnValue >= 0)) {
-				return sqrt($returnValue / $aCount);
-			}
-		}
-		return PHPExcel_Calculation_Functions::DIV0();
-	}	//	function STDEVA()
-
-
-	/**
-	 * STDEVP
-	 *
-	 * Calculates standard deviation based on the entire population
-	 *
-	 * Excel Function:
-	 *		STDEVP(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function STDEVP() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
-
-		// Return value
-		$returnValue = null;
-
-		$aMean = self::AVERAGE($aArgs);
-		if (!is_null($aMean)) {
-			$aCount = 0;
-			foreach ($aArgs as $k => $arg) {
-				if ((is_bool($arg)) &&
-					((!PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
-					$arg = (integer) $arg;
-				}
-				// Is it a numeric value?
-				if ((is_numeric($arg)) && (!is_string($arg))) {
-					if (is_null($returnValue)) {
-						$returnValue = pow(($arg - $aMean),2);
-					} else {
-						$returnValue += pow(($arg - $aMean),2);
-					}
-					++$aCount;
-				}
-			}
-
-			// Return
-			if (($aCount > 0) && ($returnValue >= 0)) {
-				return sqrt($returnValue / $aCount);
-			}
-		}
-		return PHPExcel_Calculation_Functions::DIV0();
-	}	//	function STDEVP()
-
-
-	/**
-	 * STDEVPA
-	 *
-	 * Calculates standard deviation based on the entire population, including numbers, text, and logical values
-	 *
-	 * Excel Function:
-	 *		STDEVPA(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function STDEVPA() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
-
-		// Return value
-		$returnValue = null;
-
-		$aMean = self::AVERAGEA($aArgs);
-		if (!is_null($aMean)) {
-			$aCount = 0;
-			foreach ($aArgs as $k => $arg) {
-				if ((is_bool($arg)) &&
-					(!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
-				} else {
-					// Is it a numeric value?
-					if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) & ($arg != '')))) {
-						if (is_bool($arg)) {
-							$arg = (integer) $arg;
-						} elseif (is_string($arg)) {
-							$arg = 0;
-						}
-						if (is_null($returnValue)) {
-							$returnValue = pow(($arg - $aMean),2);
-						} else {
-							$returnValue += pow(($arg - $aMean),2);
-						}
-						++$aCount;
-					}
-				}
-			}
-
-			// Return
-			if (($aCount > 0) && ($returnValue >= 0)) {
-				return sqrt($returnValue / $aCount);
-			}
-		}
-		return PHPExcel_Calculation_Functions::DIV0();
-	}	//	function STDEVPA()
-
-
-	/**
-	 * STEYX
-	 *
-	 * Returns the standard error of the predicted y-value for each x in the regression.
-	 *
-	 * @param	array of mixed		Data Series Y
-	 * @param	array of mixed		Data Series X
-	 * @return	float
-	 */
-	public static function STEYX($yValues,$xValues) {
-		if (!self::_checkTrendArrays($yValues,$xValues)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$yValueCount = count($yValues);
-		$xValueCount = count($xValues);
-
-		if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
-			return PHPExcel_Calculation_Functions::NA();
-		} elseif ($yValueCount == 1) {
-			return PHPExcel_Calculation_Functions::DIV0();
-		}
-
-		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues);
-		return $bestFitLinear->getStdevOfResiduals();
-	}	//	function STEYX()
-
-
-	/**
-	 * TDIST
-	 *
-	 * Returns the probability of Student's T distribution.
-	 *
-	 * @param	float		$value			Value for the function
-	 * @param	float		$degrees		degrees of freedom
-	 * @param	float		$tails			number of tails (1 or 2)
-	 * @return	float
-	 */
-	public static function TDIST($value, $degrees, $tails) {
-		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$degrees	= floor(PHPExcel_Calculation_Functions::flattenSingleValue($degrees));
-		$tails		= floor(PHPExcel_Calculation_Functions::flattenSingleValue($tails));
-
-		if ((is_numeric($value)) && (is_numeric($degrees)) && (is_numeric($tails))) {
-			if (($value < 0) || ($degrees < 1) || ($tails < 1) || ($tails > 2)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			//	tdist, which finds the probability that corresponds to a given value
-			//	of t with k degrees of freedom. This algorithm is translated from a
-			//	pascal function on p81 of "Statistical Computing in Pascal" by D
-			//	Cooke, A H Craven & G M Clark (1985: Edward Arnold (Pubs.) Ltd:
-			//	London). The above Pascal algorithm is itself a translation of the
-			//	fortran algoritm "AS 3" by B E Cooper of the Atlas Computer
-			//	Laboratory as reported in (among other places) "Applied Statistics
-			//	Algorithms", editied by P Griffiths and I D Hill (1985; Ellis
-			//	Horwood Ltd.; W. Sussex, England).
-			$tterm = $degrees;
-			$ttheta = atan2($value,sqrt($tterm));
-			$tc = cos($ttheta);
-			$ts = sin($ttheta);
-			$tsum = 0;
-
-			if (($degrees % 2) == 1) {
-				$ti = 3;
-				$tterm = $tc;
-			} else {
-				$ti = 2;
-				$tterm = 1;
-			}
-
-			$tsum = $tterm;
-			while ($ti < $degrees) {
-				$tterm *= $tc * $tc * ($ti - 1) / $ti;
-				$tsum += $tterm;
-				$ti += 2;
-			}
-			$tsum *= $ts;
-			if (($degrees % 2) == 1) { $tsum = M_2DIVPI * ($tsum + $ttheta); }
-			$tValue = 0.5 * (1 + $tsum);
-			if ($tails == 1) {
-				return 1 - abs($tValue);
-			} else {
-				return 1 - abs((1 - $tValue) - $tValue);
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function TDIST()
-
-
-	/**
-	 * TINV
-	 *
-	 * Returns the one-tailed probability of the chi-squared distribution.
-	 *
-	 * @param	float		$probability	Probability for the function
-	 * @param	float		$degrees		degrees of freedom
-	 * @return	float
-	 */
-	public static function TINV($probability, $degrees) {
-		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
-		$degrees		= floor(PHPExcel_Calculation_Functions::flattenSingleValue($degrees));
-
-		if ((is_numeric($probability)) && (is_numeric($degrees))) {
-			$xLo = 100;
-			$xHi = 0;
-
-			$x = $xNew = 1;
-			$dx	= 1;
-			$i = 0;
-
-			while ((abs($dx) > PRECISION) && ($i++ < MAX_ITERATIONS)) {
-				// Apply Newton-Raphson step
-				$result = self::TDIST($x, $degrees, 2);
-				$error = $result - $probability;
-				if ($error == 0.0) {
-					$dx = 0;
-				} elseif ($error < 0.0) {
-					$xLo = $x;
-				} else {
-					$xHi = $x;
-				}
-				// Avoid division by zero
-				if ($result != 0.0) {
-					$dx = $error / $result;
-					$xNew = $x - $dx;
-				}
-				// If the NR fails to converge (which for example may be the
-				// case if the initial guess is too rough) we apply a bisection
-				// step to determine a more narrow interval around the root.
-				if (($xNew < $xLo) || ($xNew > $xHi) || ($result == 0.0)) {
-					$xNew = ($xLo + $xHi) / 2;
-					$dx = $xNew - $x;
-				}
-				$x = $xNew;
-			}
-			if ($i == MAX_ITERATIONS) {
-				return PHPExcel_Calculation_Functions::NA();
-			}
-			return round($x,12);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function TINV()
-
-
-	/**
-	 * TREND
-	 *
-	 * Returns values along a linear trend
-	 *
-	 * @param	array of mixed		Data Series Y
-	 * @param	array of mixed		Data Series X
-	 * @param	array of mixed		Values of X for which we want to find Y
-	 * @param	boolean				A logical value specifying whether to force the intersect to equal 0.
-	 * @return	array of float
-	 */
-	public static function TREND($yValues,$xValues=array(),$newValues=array(),$const=True) {
-		$yValues = PHPExcel_Calculation_Functions::flattenArray($yValues);
-		$xValues = PHPExcel_Calculation_Functions::flattenArray($xValues);
-		$newValues = PHPExcel_Calculation_Functions::flattenArray($newValues);
-		$const	= (is_null($const))	? True :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($const);
-
-		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues,$const);
-		if (empty($newValues)) {
-			$newValues = $bestFitLinear->getXValues();
-		}
-
-		$returnArray = array();
-		foreach($newValues as $xValue) {
-			$returnArray[0][] = $bestFitLinear->getValueOfYForX($xValue);
-		}
-
-		return $returnArray;
-	}	//	function TREND()
-
-
-	/**
-	 * TRIMMEAN
-	 *
-	 * Returns the mean of the interior of a data set. TRIMMEAN calculates the mean
-	 *		taken by excluding a percentage of data points from the top and bottom tails
-	 *		of a data set.
-	 *
-	 * Excel Function:
-	 *		TRIMEAN(value1[,value2[, ...]],$discard)
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @param	float		$discard		Percentage to discard
-	 * @return	float
-	 */
-	public static function TRIMMEAN() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-
-		// Calculate
-		$percent = array_pop($aArgs);
-
-		if ((is_numeric($percent)) && (!is_string($percent))) {
-			if (($percent < 0) || ($percent > 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$mArgs = array();
-			foreach ($aArgs as $arg) {
-				// Is it a numeric value?
-				if ((is_numeric($arg)) && (!is_string($arg))) {
-					$mArgs[] = $arg;
-				}
-			}
-			$discard = floor(self::COUNT($mArgs) * $percent / 2);
-			sort($mArgs);
-			for ($i=0; $i < $discard; ++$i) {
-				array_pop($mArgs);
-				array_shift($mArgs);
-			}
-			return self::AVERAGE($mArgs);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function TRIMMEAN()
-
-
-	/**
-	 * VARFunc
-	 *
-	 * Estimates variance based on a sample.
-	 *
-	 * Excel Function:
-	 *		VAR(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function VARFunc() {
-		// Return value
-		$returnValue = PHPExcel_Calculation_Functions::DIV0();
-
-		$summerA = $summerB = 0;
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		$aCount = 0;
-		foreach ($aArgs as $arg) {
-			if (is_bool($arg)) { $arg = (integer) $arg; }
-			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
-				$summerA += ($arg * $arg);
-				$summerB += $arg;
-				++$aCount;
-			}
-		}
-
-		// Return
-		if ($aCount > 1) {
-			$summerA *= $aCount;
-			$summerB *= $summerB;
-			$returnValue = ($summerA - $summerB) / ($aCount * ($aCount - 1));
-		}
-		return $returnValue;
-	}	//	function VARFunc()
-
-
-	/**
-	 * VARA
-	 *
-	 * Estimates variance based on a sample, including numbers, text, and logical values
-	 *
-	 * Excel Function:
-	 *		VARA(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function VARA() {
-		// Return value
-		$returnValue = PHPExcel_Calculation_Functions::DIV0();
-
-		$summerA = $summerB = 0;
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
-		$aCount = 0;
-		foreach ($aArgs as $k => $arg) {
-			if ((is_string($arg)) &&
-				(PHPExcel_Calculation_Functions::isValue($k))) {
-				return PHPExcel_Calculation_Functions::VALUE();
-			} elseif ((is_string($arg)) &&
-				(!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
-			} else {
-				// Is it a numeric value?
-				if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) & ($arg != '')))) {
-					if (is_bool($arg)) {
-						$arg = (integer) $arg;
-					} elseif (is_string($arg)) {
-						$arg = 0;
-					}
-					$summerA += ($arg * $arg);
-					$summerB += $arg;
-					++$aCount;
-				}
-			}
-		}
-
-		// Return
-		if ($aCount > 1) {
-			$summerA *= $aCount;
-			$summerB *= $summerB;
-			$returnValue = ($summerA - $summerB) / ($aCount * ($aCount - 1));
-		}
-		return $returnValue;
-	}	//	function VARA()
-
-
-	/**
-	 * VARP
-	 *
-	 * Calculates variance based on the entire population
-	 *
-	 * Excel Function:
-	 *		VARP(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function VARP() {
-		// Return value
-		$returnValue = PHPExcel_Calculation_Functions::DIV0();
-
-		$summerA = $summerB = 0;
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		$aCount = 0;
-		foreach ($aArgs as $arg) {
-			if (is_bool($arg)) { $arg = (integer) $arg; }
-			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
-				$summerA += ($arg * $arg);
-				$summerB += $arg;
-				++$aCount;
-			}
-		}
-
-		// Return
-		if ($aCount > 0) {
-			$summerA *= $aCount;
-			$summerB *= $summerB;
-			$returnValue = ($summerA - $summerB) / ($aCount * $aCount);
-		}
-		return $returnValue;
-	}	//	function VARP()
-
-
-	/**
-	 * VARPA
-	 *
-	 * Calculates variance based on the entire population, including numbers, text, and logical values
-	 *
-	 * Excel Function:
-	 *		VARPA(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function VARPA() {
-		// Return value
-		$returnValue = PHPExcel_Calculation_Functions::DIV0();
-
-		$summerA = $summerB = 0;
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
-		$aCount = 0;
-		foreach ($aArgs as $k => $arg) {
-			if ((is_string($arg)) &&
-				(PHPExcel_Calculation_Functions::isValue($k))) {
-				return PHPExcel_Calculation_Functions::VALUE();
-			} elseif ((is_string($arg)) &&
-				(!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
-			} else {
-				// Is it a numeric value?
-				if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) & ($arg != '')))) {
-					if (is_bool($arg)) {
-						$arg = (integer) $arg;
-					} elseif (is_string($arg)) {
-						$arg = 0;
-					}
-					$summerA += ($arg * $arg);
-					$summerB += $arg;
-					++$aCount;
-				}
-			}
-		}
-
-		// Return
-		if ($aCount > 0) {
-			$summerA *= $aCount;
-			$summerB *= $summerB;
-			$returnValue = ($summerA - $summerB) / ($aCount * $aCount);
-		}
-		return $returnValue;
-	}	//	function VARPA()
-
-
-	/**
-	 * WEIBULL
-	 *
-	 * Returns the Weibull distribution. Use this distribution in reliability
-	 * analysis, such as calculating a device's mean time to failure.
-	 *
-	 * @param	float		$value
-	 * @param	float		$alpha		Alpha Parameter
-	 * @param	float		$beta		Beta Parameter
-	 * @param	boolean		$cumulative
-	 * @return	float
-	 *
-	 */
-	public static function WEIBULL($value, $alpha, $beta, $cumulative) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$alpha	= PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
-		$beta	= PHPExcel_Calculation_Functions::flattenSingleValue($beta);
-
-		if ((is_numeric($value)) && (is_numeric($alpha)) && (is_numeric($beta))) {
-			if (($value < 0) || ($alpha <= 0) || ($beta <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
-				if ($cumulative) {
-					return 1 - exp(0 - pow($value / $beta,$alpha));
-				} else {
-					return ($alpha / pow($beta,$alpha)) * pow($value,$alpha - 1) * exp(0 - pow($value / $beta,$alpha));
-				}
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function WEIBULL()
-
-
-	/**
-	 * ZTEST
-	 *
-	 * Returns the Weibull distribution. Use this distribution in reliability
-	 * analysis, such as calculating a device's mean time to failure.
-	 *
-	 * @param	float		$dataSet
-	 * @param	float		$m0		Alpha Parameter
-	 * @param	float		$sigma	Beta Parameter
-	 * @param	boolean		$cumulative
-	 * @return	float
-	 *
-	 */
-	public static function ZTEST($dataSet, $m0, $sigma = NULL) {
-		$dataSet	= PHPExcel_Calculation_Functions::flattenArrayIndexed($dataSet);
-		$m0			= PHPExcel_Calculation_Functions::flattenSingleValue($m0);
-		$sigma		= PHPExcel_Calculation_Functions::flattenSingleValue($sigma);
-
-		if (is_null($sigma)) {
-			$sigma = self::STDEV($dataSet);
-		}
-		$n = count($dataSet);
-
-		return 1 - self::NORMSDIST((self::AVERAGE($dataSet) - $m0)/($sigma/SQRT($n)));
-	}	//	function ZTEST()
-
-}	//	class PHPExcel_Calculation_Statistical
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/TextData.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/TextData.php
deleted file mode 100644
index 148a5b756dd..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/TextData.php
+++ /dev/null
@@ -1,630 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/**
- * PHPExcel_Calculation_TextData
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_TextData {
-
-	private static $_invalidChars = Null;
-
-	private static function _uniord($c) {
-		if (ord($c{0}) >=0 && ord($c{0}) <= 127)
-			return ord($c{0});
-		if (ord($c{0}) >= 192 && ord($c{0}) <= 223)
-			return (ord($c{0})-192)*64 + (ord($c{1})-128);
-		if (ord($c{0}) >= 224 && ord($c{0}) <= 239)
-			return (ord($c{0})-224)*4096 + (ord($c{1})-128)*64 + (ord($c{2})-128);
-		if (ord($c{0}) >= 240 && ord($c{0}) <= 247)
-			return (ord($c{0})-240)*262144 + (ord($c{1})-128)*4096 + (ord($c{2})-128)*64 + (ord($c{3})-128);
-		if (ord($c{0}) >= 248 && ord($c{0}) <= 251)
-			return (ord($c{0})-248)*16777216 + (ord($c{1})-128)*262144 + (ord($c{2})-128)*4096 + (ord($c{3})-128)*64 + (ord($c{4})-128);
-		if (ord($c{0}) >= 252 && ord($c{0}) <= 253)
-			return (ord($c{0})-252)*1073741824 + (ord($c{1})-128)*16777216 + (ord($c{2})-128)*262144 + (ord($c{3})-128)*4096 + (ord($c{4})-128)*64 + (ord($c{5})-128);
-		if (ord($c{0}) >= 254 && ord($c{0}) <= 255) //error
-			return PHPExcel_Calculation_Functions::VALUE();
-		return 0;
-	}	//	function _uniord()
-
-	/**
-	 * CHARACTER
-	 *
-	 * @param	string	$character	Value
-	 * @return	int
-	 */
-	public static function CHARACTER($character) {
-		$character	= PHPExcel_Calculation_Functions::flattenSingleValue($character);
-
-		if ((!is_numeric($character)) || ($character < 0)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (function_exists('mb_convert_encoding')) {
-			return mb_convert_encoding('&#'.intval($character).';', 'UTF-8', 'HTML-ENTITIES');
-		} else {
-			return chr(intval($character));
-		}
-	}
-
-
-	/**
-	 * TRIMNONPRINTABLE
-	 *
-	 * @param	mixed	$stringValue	Value to check
-	 * @return	string
-	 */
-	public static function TRIMNONPRINTABLE($stringValue = '') {
-		$stringValue	= PHPExcel_Calculation_Functions::flattenSingleValue($stringValue);
-
-		if (is_bool($stringValue)) {
-			return ($stringValue) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
-		}
-
-		if (self::$_invalidChars == Null) {
-			self::$_invalidChars = range(chr(0),chr(31));
-		}
-
-		if (is_string($stringValue) || is_numeric($stringValue)) {
-			return str_replace(self::$_invalidChars, '', trim($stringValue, "\x00..\x1F"));
-		}
-		return NULL;
-	}	//	function TRIMNONPRINTABLE()
-
-
-	/**
-	 * TRIMSPACES
-	 *
-	 * @param	mixed	$stringValue	Value to check
-	 * @return	string
-	 */
-	public static function TRIMSPACES($stringValue = '') {
-		$stringValue	= PHPExcel_Calculation_Functions::flattenSingleValue($stringValue);
-		if (is_bool($stringValue)) {
-			return ($stringValue) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
-		}
-
-		if (is_string($stringValue) || is_numeric($stringValue)) {
-			return trim(preg_replace('/ +/',' ',trim($stringValue, ' ')), ' ');
-		}
-		return NULL;
-	}	//	function TRIMSPACES()
-
-
-	/**
-	 * ASCIICODE
-	 *
-	 * @param	string	$characters		Value
-	 * @return	int
-	 */
-	public static function ASCIICODE($characters) {
-		if (($characters === NULL) || ($characters === ''))
-			return PHPExcel_Calculation_Functions::VALUE();
-		$characters	= PHPExcel_Calculation_Functions::flattenSingleValue($characters);
-		if (is_bool($characters)) {
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
-				$characters = (int) $characters;
-			} else {
-				$characters = ($characters) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
-			}
-		}
-
-		$character = $characters;
-		if ((function_exists('mb_strlen')) && (function_exists('mb_substr'))) {
-			if (mb_strlen($characters, 'UTF-8') > 1) { $character = mb_substr($characters, 0, 1, 'UTF-8'); }
-			return self::_uniord($character);
-		} else {
-			if (strlen($characters) > 0) { $character = substr($characters, 0, 1); }
-			return ord($character);
-		}
-	}	//	function ASCIICODE()
-
-
-	/**
-	 * CONCATENATE
-	 *
-	 * @return	string
-	 */
-	public static function CONCATENATE() {
-		// Return value
-		$returnValue = '';
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		foreach ($aArgs as $arg) {
-			if (is_bool($arg)) {
-				if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
-					$arg = (int) $arg;
-				} else {
-					$arg = ($arg) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
-				}
-			}
-			$returnValue .= $arg;
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function CONCATENATE()
-
-
-	/**
-	 * DOLLAR
-	 *
-	 * This function converts a number to text using currency format, with the decimals rounded to the specified place.
-	 * The format used is $#,##0.00_);($#,##0.00)..
-	 *
-	 * @param	float	$value			The value to format
-	 * @param	int		$decimals		The number of digits to display to the right of the decimal point.
-	 *									If decimals is negative, number is rounded to the left of the decimal point.
-	 *									If you omit decimals, it is assumed to be 2
-	 * @return	string
-	 */
-	public static function DOLLAR($value = 0, $decimals = 2) {
-		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$decimals	= is_null($decimals) ? 0 : PHPExcel_Calculation_Functions::flattenSingleValue($decimals);
-
-		// Validate parameters
-		if (!is_numeric($value) || !is_numeric($decimals)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		$decimals = floor($decimals);
-
-		$mask = '$#,##0';
-		if ($decimals > 0) {
-			$mask .= '.' . str_repeat('0',$decimals);
-		} else {
-			$round = pow(10,abs($decimals));
-			if ($value < 0) { $round = 0-$round; }
-			$value = PHPExcel_Calculation_MathTrig::MROUND($value, $round);
-		}
-
-		return PHPExcel_Style_NumberFormat::toFormattedString($value, $mask);
-
-	}	//	function DOLLAR()
-
-
-	/**
-	 * SEARCHSENSITIVE
-	 *
-	 * @param	string	$needle		The string to look for
-	 * @param	string	$haystack	The string in which to look
-	 * @param	int		$offset		Offset within $haystack
-	 * @return	string
-	 */
-	public static function SEARCHSENSITIVE($needle,$haystack,$offset=1) {
-		$needle		= PHPExcel_Calculation_Functions::flattenSingleValue($needle);
-		$haystack	= PHPExcel_Calculation_Functions::flattenSingleValue($haystack);
-		$offset		= PHPExcel_Calculation_Functions::flattenSingleValue($offset);
-
-		if (!is_bool($needle)) {
-			if (is_bool($haystack)) {
-				$haystack = ($haystack) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
-			}
-
-			if (($offset > 0) && (PHPExcel_Shared_String::CountCharacters($haystack) > $offset)) {
-				if (PHPExcel_Shared_String::CountCharacters($needle) == 0) {
-					return $offset;
-				}
-				if (function_exists('mb_strpos')) {
-					$pos = mb_strpos($haystack, $needle, --$offset, 'UTF-8');
-				} else {
-					$pos = strpos($haystack, $needle, --$offset);
-				}
-				if ($pos !== false) {
-					return ++$pos;
-				}
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function SEARCHSENSITIVE()
-
-
-	/**
-	 * SEARCHINSENSITIVE
-	 *
-	 * @param	string	$needle		The string to look for
-	 * @param	string	$haystack	The string in which to look
-	 * @param	int		$offset		Offset within $haystack
-	 * @return	string
-	 */
-	public static function SEARCHINSENSITIVE($needle,$haystack,$offset=1) {
-		$needle		= PHPExcel_Calculation_Functions::flattenSingleValue($needle);
-		$haystack	= PHPExcel_Calculation_Functions::flattenSingleValue($haystack);
-		$offset		= PHPExcel_Calculation_Functions::flattenSingleValue($offset);
-
-		if (!is_bool($needle)) {
-			if (is_bool($haystack)) {
-				$haystack = ($haystack) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
-			}
-
-			if (($offset > 0) && (PHPExcel_Shared_String::CountCharacters($haystack) > $offset)) {
-				if (PHPExcel_Shared_String::CountCharacters($needle) == 0) {
-					return $offset;
-				}
-				if (function_exists('mb_stripos')) {
-					$pos = mb_stripos($haystack, $needle, --$offset,'UTF-8');
-				} else {
-					$pos = stripos($haystack, $needle, --$offset);
-				}
-				if ($pos !== false) {
-					return ++$pos;
-				}
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function SEARCHINSENSITIVE()
-
-
-	/**
-	 * FIXEDFORMAT
-	 *
-	 * @param	mixed		$value	Value to check
-	 * @param	integer		$decimals
-	 * @param	boolean		$no_commas
-	 * @return	boolean
-	 */
-	public static function FIXEDFORMAT($value, $decimals = 2, $no_commas = FALSE) {
-		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$decimals	= PHPExcel_Calculation_Functions::flattenSingleValue($decimals);
-		$no_commas	= PHPExcel_Calculation_Functions::flattenSingleValue($no_commas);
-
-		// Validate parameters
-		if (!is_numeric($value) || !is_numeric($decimals)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		$decimals = floor($decimals);
-
-		$valueResult = round($value,$decimals);
-		if ($decimals < 0) { $decimals = 0; }
-		if (!$no_commas) {
-			$valueResult = number_format($valueResult,$decimals);
-		}
-
-		return (string) $valueResult;
-	}	//	function FIXEDFORMAT()
-
-
-	/**
-	 * LEFT
-	 *
-	 * @param	string	$value	Value
-	 * @param	int		$chars	Number of characters
-	 * @return	string
-	 */
-	public static function LEFT($value = '', $chars = 1) {
-		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$chars		= PHPExcel_Calculation_Functions::flattenSingleValue($chars);
-
-		if ($chars < 0) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (is_bool($value)) {
-			$value = ($value) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
-		}
-
-		if (function_exists('mb_substr')) {
-			return mb_substr($value, 0, $chars, 'UTF-8');
-		} else {
-			return substr($value, 0, $chars);
-		}
-	}	//	function LEFT()
-
-
-	/**
-	 * MID
-	 *
-	 * @param	string	$value	Value
-	 * @param	int		$start	Start character
-	 * @param	int		$chars	Number of characters
-	 * @return	string
-	 */
-	public static function MID($value = '', $start = 1, $chars = null) {
-		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$start		= PHPExcel_Calculation_Functions::flattenSingleValue($start);
-		$chars		= PHPExcel_Calculation_Functions::flattenSingleValue($chars);
-
-		if (($start < 1) || ($chars < 0)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (is_bool($value)) {
-			$value = ($value) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
-		}
-
-		if (function_exists('mb_substr')) {
-			return mb_substr($value, --$start, $chars, 'UTF-8');
-		} else {
-			return substr($value, --$start, $chars);
-		}
-	}	//	function MID()
-
-
-	/**
-	 * RIGHT
-	 *
-	 * @param	string	$value	Value
-	 * @param	int		$chars	Number of characters
-	 * @return	string
-	 */
-	public static function RIGHT($value = '', $chars = 1) {
-		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$chars		= PHPExcel_Calculation_Functions::flattenSingleValue($chars);
-
-		if ($chars < 0) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (is_bool($value)) {
-			$value = ($value) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
-		}
-
-		if ((function_exists('mb_substr')) && (function_exists('mb_strlen'))) {
-			return mb_substr($value, mb_strlen($value, 'UTF-8') - $chars, $chars, 'UTF-8');
-		} else {
-			return substr($value, strlen($value) - $chars);
-		}
-	}	//	function RIGHT()
-
-
-	/**
-	 * STRINGLENGTH
-	 *
-	 * @param	string	$value	Value
-	 * @return	string
-	 */
-	public static function STRINGLENGTH($value = '') {
-		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-
-		if (is_bool($value)) {
-			$value = ($value) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
-		}
-
-		if (function_exists('mb_strlen')) {
-			return mb_strlen($value, 'UTF-8');
-		} else {
-			return strlen($value);
-		}
-	}	//	function STRINGLENGTH()
-
-
-	/**
-	 * LOWERCASE
-	 *
-	 * Converts a string value to upper case.
-	 *
-	 * @param	string		$mixedCaseString
-	 * @return	string
-	 */
-	public static function LOWERCASE($mixedCaseString) {
-		$mixedCaseString	= PHPExcel_Calculation_Functions::flattenSingleValue($mixedCaseString);
-
-		if (is_bool($mixedCaseString)) {
-			$mixedCaseString = ($mixedCaseString) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
-		}
-
-		return PHPExcel_Shared_String::StrToLower($mixedCaseString);
-	}	//	function LOWERCASE()
-
-
-	/**
-	 * UPPERCASE
-	 *
-	 * Converts a string value to upper case.
-	 *
-	 * @param	string		$mixedCaseString
-	 * @return	string
-	 */
-	public static function UPPERCASE($mixedCaseString) {
-		$mixedCaseString	= PHPExcel_Calculation_Functions::flattenSingleValue($mixedCaseString);
-
-		if (is_bool($mixedCaseString)) {
-			$mixedCaseString = ($mixedCaseString) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
-		}
-
-		return PHPExcel_Shared_String::StrToUpper($mixedCaseString);
-	}	//	function UPPERCASE()
-
-
-	/**
-	 * PROPERCASE
-	 *
-	 * Converts a string value to upper case.
-	 *
-	 * @param	string		$mixedCaseString
-	 * @return	string
-	 */
-	public static function PROPERCASE($mixedCaseString) {
-		$mixedCaseString	= PHPExcel_Calculation_Functions::flattenSingleValue($mixedCaseString);
-
-		if (is_bool($mixedCaseString)) {
-			$mixedCaseString = ($mixedCaseString) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
-		}
-
-		return PHPExcel_Shared_String::StrToTitle($mixedCaseString);
-	}	//	function PROPERCASE()
-
-
-	/**
-	 * REPLACE
-	 *
-	 * @param	string	$oldText	String to modify
-	 * @param	int		$start		Start character
-	 * @param	int		$chars		Number of characters
-	 * @param	string	$newText	String to replace in defined position 
-	 * @return	string
-	 */
-	public static function REPLACE($oldText = '', $start = 1, $chars = null, $newText) {
-		$oldText	= PHPExcel_Calculation_Functions::flattenSingleValue($oldText);
-		$start		= PHPExcel_Calculation_Functions::flattenSingleValue($start);
-		$chars		= PHPExcel_Calculation_Functions::flattenSingleValue($chars);
-		$newText	= PHPExcel_Calculation_Functions::flattenSingleValue($newText);
-
-		$left = self::LEFT($oldText,$start-1);
-		$right = self::RIGHT($oldText,self::STRINGLENGTH($oldText)-($start+$chars)+1);
-
-		return $left.$newText.$right;
-	}	//	function REPLACE()
-
-
-	/**
-	 * SUBSTITUTE
-	 *
-	 * @param	string	$text		Value
-	 * @param	string	$fromText	From Value
-	 * @param	string	$toText		To Value
-	 * @param	integer	$instance	Instance Number
-	 * @return	string
-	 */
-	public static function SUBSTITUTE($text = '', $fromText = '', $toText = '', $instance = 0) {
-		$text		= PHPExcel_Calculation_Functions::flattenSingleValue($text);
-		$fromText	= PHPExcel_Calculation_Functions::flattenSingleValue($fromText);
-		$toText		= PHPExcel_Calculation_Functions::flattenSingleValue($toText);
-		$instance	= floor(PHPExcel_Calculation_Functions::flattenSingleValue($instance));
-
-		if ($instance == 0) {
-			if(function_exists('mb_str_replace')) {
-				return mb_str_replace($fromText,$toText,$text);
-			} else {
-				return str_replace($fromText,$toText,$text);
-			}
-		} else {
-			$pos = -1;
-			while($instance > 0) {
-				if (function_exists('mb_strpos')) {
-					$pos = mb_strpos($text, $fromText, $pos+1, 'UTF-8');
-				} else {
-					$pos = strpos($text, $fromText, $pos+1);
-				}
-				if ($pos === false) {
-					break;
-				}
-				--$instance;
-			}
-			if ($pos !== false) {
-				if (function_exists('mb_strlen')) {
-					return self::REPLACE($text,++$pos,mb_strlen($fromText, 'UTF-8'),$toText);
-				} else {
-					return self::REPLACE($text,++$pos,strlen($fromText),$toText);
-				}
-			}
-		}
-
-		return $text;
-	}	//	function SUBSTITUTE()
-
-
-	/**
-	 * RETURNSTRING
-	 *
-	 * @param	mixed	$testValue	Value to check
-	 * @return	boolean
-	 */
-	public static function RETURNSTRING($testValue = '') {
-		$testValue	= PHPExcel_Calculation_Functions::flattenSingleValue($testValue);
-
-		if (is_string($testValue)) {
-			return $testValue;
-		}
-		return Null;
-	}	//	function RETURNSTRING()
-
-
-	/**
-	 * TEXTFORMAT
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @param	string	$format	Format mask to use
-	 * @return	boolean
-	 */
-	public static function TEXTFORMAT($value,$format) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$format	= PHPExcel_Calculation_Functions::flattenSingleValue($format);
-
-		if ((is_string($value)) && (!is_numeric($value)) && PHPExcel_Shared_Date::isDateTimeFormatCode($format)) {
-			$value = PHPExcel_Calculation_DateTime::DATEVALUE($value);
-		}
-
-		return (string) PHPExcel_Style_NumberFormat::toFormattedString($value,$format);
-	}	//	function TEXTFORMAT()
-
-	/**
-	 * VALUE
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	boolean
-	 */
-	public static function VALUE($value = '') {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-
-		if (!is_numeric($value)) {
-            $numberValue = str_replace(
-                PHPExcel_Shared_String::getThousandsSeparator(), 
-                '', 
-                trim($value, " \t\n\r\0\x0B" . PHPExcel_Shared_String::getCurrencyCode())
-            );
-            if (is_numeric($numberValue)) {
-                return (float) $numberValue;
-            }
-
-            $dateSetting = PHPExcel_Calculation_Functions::getReturnDateType();
-            PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_EXCEL);
-
-            if (strpos($value, ':') !== false) {
-                $timeValue = PHPExcel_Calculation_DateTime::TIMEVALUE($value);
-                if ($timeValue !== PHPExcel_Calculation_Functions::VALUE()) {
-                    PHPExcel_Calculation_Functions::setReturnDateType($dateSetting);
-                    return $timeValue;
-                }
-            }
-			$dateValue = PHPExcel_Calculation_DateTime::DATEVALUE($value);
-            if ($dateValue !== PHPExcel_Calculation_Functions::VALUE()) {
-                PHPExcel_Calculation_Functions::setReturnDateType($dateSetting);
-                return $dateValue;
-            }
-            PHPExcel_Calculation_Functions::setReturnDateType($dateSetting);
-
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		return (float) $value;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Token/Stack.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Token/Stack.php
deleted file mode 100644
index 57963e73853..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Token/Stack.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Calculation_Token_Stack
- *
- * @category	PHPExcel_Calculation_Token_Stack
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Token_Stack {
-
-	/**
-	 *  The parser stack for formulae
-	 *
-	 *  @var mixed[]
-	 */
-	private $_stack = array();
-
-	/**
-	 *  Count of entries in the parser stack
-	 *
-	 *  @var integer
-	 */
-	private $_count = 0;
-
-
-	/**
-	 * Return the number of entries on the stack
-	 *
-	 * @return  integer
-	 */
-	public function count() {
-		return $this->_count;
-	}	//	function count()
-
-	/**
-	 * Push a new entry onto the stack
-	 *
-	 * @param  mixed  $type
-	 * @param  mixed  $value
-	 * @param  mixed  $reference
-	 */
-	public function push($type, $value, $reference = NULL) {
-		$this->_stack[$this->_count++] = array('type'		=> $type,
-											   'value'		=> $value,
-											   'reference'	=> $reference
-											  );
-		if ($type == 'Function') {
-			$localeFunction = PHPExcel_Calculation::_localeFunc($value);
-			if ($localeFunction != $value) {
-				$this->_stack[($this->_count - 1)]['localeValue'] = $localeFunction;
-			}
-		}
-	}	//	function push()
-
-	/**
-	 * Pop the last entry from the stack
-	 *
-	 * @return  mixed
-	 */
-	public function pop() {
-		if ($this->_count > 0) {
-			return $this->_stack[--$this->_count];
-		}
-		return NULL;
-	}	//	function pop()
-
-	/**
-	 * Return an entry from the stack without removing it
-	 *
-	 * @param   integer  $n  number indicating how far back in the stack we want to look
-	 * @return  mixed
-	 */
-	public function last($n = 1) {
-		if ($this->_count - $n < 0) {
-			return NULL;
-		}
-		return $this->_stack[$this->_count - $n];
-	}	//	function last()
-
-	/**
-	 * Clear the stack
-	 */
-	function clear() {
-		$this->_stack = array();
-		$this->_count = 0;
-	}
-
-}	//	class PHPExcel_Calculation_Token_Stack
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/functionlist.txt b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/functionlist.txt
deleted file mode 100644
index 67dbd49cf55..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/functionlist.txt
+++ /dev/null
@@ -1,351 +0,0 @@
-ABS
-ACCRINT
-ACCRINTM
-ACOS
-ACOSH
-ADDRESS
-AMORDEGRC
-AMORLINC
-AND
-AREAS
-ASC
-ASIN
-ASINH
-ATAN
-ATAN2
-ATANH
-AVEDEV
-AVERAGE
-AVERAGEA
-AVERAGEIF
-AVERAGEIFS
-BAHTTEXT
-BESSELI
-BESSELJ
-BESSELK
-BESSELY
-BETADIST
-BETAINV
-BIN2DEC
-BIN2HEX
-BIN2OCT
-BINOMDIST
-CEILING
-CELL
-CHAR
-CHIDIST
-CHIINV
-CHITEST
-CHOOSE
-CLEAN
-CODE
-COLUMN
-COLUMNS
-COMBIN
-COMPLEX
-CONCATENATE
-CONFIDENCE
-CONVERT
-CORREL
-COS
-COSH
-COUNT
-COUNTA
-COUNTBLANK
-COUNTIF
-COUNTIFS
-COUPDAYBS
-COUPDAYBS
-COUPDAYSNC
-COUPNCD
-COUPNUM
-COUPPCD
-COVAR
-CRITBINOM
-CUBEKPIMEMBER
-CUBEMEMBER
-CUBEMEMBERPROPERTY
-CUBERANKEDMEMBER
-CUBESET
-CUBESETCOUNT
-CUBEVALUE
-CUMIPMT
-CUMPRINC
-DATE
-DATEDIF
-DATEVALUE
-DAVERAGE
-DAY
-DAYS360
-DB
-DCOUNT
-DCOUNTA
-DDB
-DEC2BIN
-DEC2HEX
-DEC2OCT
-DEGREES
-DELTA
-DEVSQ
-DGET
-DISC
-DMAX
-DMIN
-DOLLAR
-DOLLARDE
-DOLLARFR
-DPRODUCT
-DSTDEV
-DSTDEVP
-DSUM
-DURATION
-DVAR
-DVARP
-EDATE
-EFFECT
-EOMONTH
-ERF
-ERFC
-ERROR.TYPE
-EVEN
-EXACT
-EXP
-EXPONDIST
-FACT
-FACTDOUBLE
-FALSE
-FDIST
-FIND
-FINDB
-FINV
-FISHER
-FISHERINV
-FIXED
-FLOOR
-FORECAST
-FREQUENCY
-FTEST
-FV
-FVSCHEDULE
-GAMAMDIST
-GAMMAINV
-GAMMALN
-GCD
-GEOMEAN
-GESTEP
-GETPIVOTDATA
-GROWTH
-HARMEAN
-HEX2BIN
-HEX2OCT
-HLOOKUP
-HOUR
-HYPERLINK
-HYPGEOMDIST
-IF
-IFERROR
-IMABS
-IMAGINARY
-IMARGUMENT
-IMCONJUGATE
-IMCOS
-IMEXP
-IMLN
-IMLOG10
-IMLOG2
-IMPOWER
-IMPRODUCT
-IMREAL
-IMSIN
-IMSQRT
-IMSUB
-IMSUM
-INDEX
-INDIRECT
-INFO
-INT
-INTERCEPT
-INTRATE
-IPMT
-IRR
-ISBLANK
-ISERR
-ISERROR
-ISEVEN
-ISLOGICAL
-ISNA
-ISNONTEXT
-ISNUMBER
-ISODD
-ISPMT
-ISREF
-ISTEXT
-JIS
-KURT
-LARGE
-LCM
-LEFT
-LEFTB
-LEN
-LENB
-LINEST
-LN
-LOG
-LOG10
-LOGEST
-LOGINV
-LOGNORMDIST
-LOOKUP
-LOWER
-MATCH
-MAX
-MAXA
-MDETERM
-MDURATION
-MEDIAN
-MID
-MIDB
-MIN
-MINA
-MINUTE
-MINVERSE
-MIRR
-MMULT
-MOD
-MODE
-MONTH
-MROUND
-MULTINOMIAL
-N
-NA
-NEGBINOMDIST
-NETWORKDAYS
-NOMINAL
-NORMDIST
-NORMINV
-NORMSDIST
-NORMSINV
-NOT
-NOW
-NPER
-NPV
-OCT2BIN
-OCT2DEC
-OCT2HEX
-ODD
-ODDFPRICE
-ODDFYIELD
-ODDLPRICE
-ODDLYIELD
-OFFSET
-OR
-PEARSON
-PERCENTILE
-PERCENTRANK
-PERMUT
-PHONETIC
-PI
-PMT
-POISSON
-POWER
-PPMT
-PRICE
-PRICEDISC
-PRICEMAT
-PROB
-PRODUCT
-PROPER
-PV
-QUARTILE
-QUOTIENT
-RADIANS
-RAND
-RANDBETWEEN
-RANK
-RATE
-RECEIVED
-REPLACE
-REPLACEB
-REPT
-RIGHT
-RIGHTB
-ROMAN
-ROUND
-ROUNDDOWN
-ROUNDUP
-ROW
-ROWS
-RSQ
-RTD
-SEARCH
-SEARCHB
-SECOND
-SERIESSUM
-SIGN
-SIN
-SINH
-SKEW
-SLN
-SLOPE
-SMALL
-SQRT
-SQRTPI
-STANDARDIZE
-STDEV
-STDEVA
-STDEVP
-STDEVPA
-STEYX
-SUBSTITUTE
-SUBTOTAL
-SUM
-SUMIF
-SUMIFS
-SUMPRODUCT
-SUMSQ
-SUMX2MY2
-SUMX2PY2
-SUMXMY2
-SYD
-T
-TAN
-TANH
-TBILLEQ
-TBILLPRICE
-TBILLYIELD
-TDIST
-TEXT
-TIME
-TIMEVALUE
-TINV
-TODAY
-TRANSPOSE
-TREND
-TRIM
-TRIMMEAN
-TRUE
-TRUNC
-TTEST
-TYPE
-UPPER
-USDOLLAR
-VALUE
-VAR
-VARA
-VARP
-VARPA
-VDB
-VERSION
-VLOOKUP
-WEEKDAY
-WEEKNUM
-WEIBULL
-WORKDAY
-XIRR
-XNPV
-YEAR
-YEARFRAC
-YIELD
-YIELDDISC
-YIELDMAT
-ZTEST
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell.php
deleted file mode 100644
index 2d5f9102d8f..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell.php
+++ /dev/null
@@ -1,1022 +0,0 @@
-<?php
-/**
- *	PHPExcel
- *
- *	Copyright (c) 2006 - 2014 PHPExcel
- *
- *	This library is free software; you can redistribute it and/or
- *	modify it under the terms of the GNU Lesser General Public
- *	License as published by the Free Software Foundation; either
- *	version 2.1 of the License, or (at your option) any later version.
- *
- *	This library is distributed in the hope that it will be useful,
- *	but WITHOUT ANY WARRANTY; without even the implied warranty of
- *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *	Lesser General Public License for more details.
- *
- *	You should have received a copy of the GNU Lesser General Public
- *	License along with this library; if not, write to the Free Software
- *	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *	@category	PHPExcel
- *	@package	PHPExcel_Cell
- *	@copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- *	@license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- *	@version	##VERSION##, ##DATE##
- */
-
-
-/**
- *	PHPExcel_Cell
- *
- *	@category   PHPExcel
- *	@package	PHPExcel_Cell
- *	@copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Cell
-{
-
-	/**
-	 *  Default range variable constant
-	 *
-	 *  @var  string
-	 */
-	const DEFAULT_RANGE = 'A1:A1';
-
-	/**
-	 *	Value binder to use
-	 *
-	 *	@var	PHPExcel_Cell_IValueBinder
-	 */
-	private static $_valueBinder = NULL;
-
-	/**
-	 *	Value of the cell
-	 *
-	 *	@var	mixed
-	 */
-	private $_value;
-
-	/**
-	 *	Calculated value of the cell (used for caching)
-	 *	This returns the value last calculated by MS Excel or whichever spreadsheet program was used to
-	 *		create the original spreadsheet file.
-	 *	Note that this value is not guaranteed to reflect the actual calculated value because it is
-	 *		possible that auto-calculation was disabled in the original spreadsheet, and underlying data
-	 *		values used by the formula have changed since it was last calculated.
-	 *
-	 *	@var mixed
-	 */
-	private $_calculatedValue = NULL;
-
-	/**
-	 *	Type of the cell data
-	 *
-	 *	@var	string
-	 */
-	private $_dataType;
-
-	/**
-	 *	Parent worksheet
-	 *
-	 *	@var	PHPExcel_CachedObjectStorage_CacheBase
-	 */
-	private $_parent;
-
-	/**
-	 *	Index to cellXf
-	 *
-	 *	@var	int
-	 */
-	private $_xfIndex = 0;
-
-	/**
-	 *	Attributes of the formula
-	 *
-	 */
-	private $_formulaAttributes;
-
-
-	/**
-	 *	Send notification to the cache controller
-	 *
-	 *	@return void
-	 **/
-	public function notifyCacheController() {
-		$this->_parent->updateCacheData($this);
-
-		return $this;
-	}
-
-	public function detach() {
-		$this->_parent = NULL;
-	}
-
-	public function attach(PHPExcel_CachedObjectStorage_CacheBase $parent) {
-		$this->_parent = $parent;
-	}
-
-
-	/**
-	 *	Create a new Cell
-	 *
-	 *	@param	mixed				$pValue
-	 *	@param	string				$pDataType
-	 *	@param	PHPExcel_Worksheet	$pSheet
-	 *	@throws	PHPExcel_Exception
-	 */
-	public function __construct($pValue = NULL, $pDataType = NULL, PHPExcel_Worksheet $pSheet = NULL)
-	{
-		// Initialise cell value
-		$this->_value = $pValue;
-
-		// Set worksheet cache
-		$this->_parent = $pSheet->getCellCacheController();
-
-		// Set datatype?
-		if ($pDataType !== NULL) {
-			if ($pDataType == PHPExcel_Cell_DataType::TYPE_STRING2)
-				$pDataType = PHPExcel_Cell_DataType::TYPE_STRING;
-			$this->_dataType = $pDataType;
-		} elseif (!self::getValueBinder()->bindValue($this, $pValue)) {
-            throw new PHPExcel_Exception("Value could not be bound to cell.");
-		}
-	}
-
-	/**
-	 *	Get cell coordinate column
-	 *
-	 *	@return	string
-	 */
-	public function getColumn()
-	{
-		return $this->_parent->getCurrentColumn();
-	}
-
-	/**
-	 *	Get cell coordinate row
-	 *
-	 *	@return	int
-	 */
-	public function getRow()
-	{
-		return $this->_parent->getCurrentRow();
-	}
-
-	/**
-	 *	Get cell coordinate
-	 *
-	 *	@return	string
-	 */
-	public function getCoordinate()
-	{
-		return $this->_parent->getCurrentAddress();
-	}
-
-	/**
-	 *	Get cell value
-	 *
-	 *	@return	mixed
-	 */
-	public function getValue()
-	{
-		return $this->_value;
-	}
-
-	/**
-	 *	Get cell value with formatting
-	 *
-	 *	@return	string
-	 */
-	public function getFormattedValue()
-	{
-		return (string) PHPExcel_Style_NumberFormat::toFormattedString(
-				$this->getCalculatedValue(),
-				$this->getStyle()
-					->getNumberFormat()->getFormatCode()
-			);
-	}
-
-	/**
-	 *	Set cell value
-	 *
-	 *	Sets the value for a cell, automatically determining the datatype using the value binder
-	 *
-	 *	@param	mixed	$pValue					Value
-	 *	@return	PHPExcel_Cell
-	 *	@throws	PHPExcel_Exception
-	 */
-	public function setValue($pValue = NULL)
-	{
-		if (!self::getValueBinder()->bindValue($this, $pValue)) {
-			throw new PHPExcel_Exception("Value could not be bound to cell.");
-		}
-		return $this;
-	}
-
-	/**
-	 *	Set the value for a cell, with the explicit data type passed to the method (bypassing any use of the value binder)
-	 *
-	 *	@param	mixed	$pValue			Value
-	 *	@param	string	$pDataType		Explicit data type
-	 *	@return	PHPExcel_Cell
-	 *	@throws	PHPExcel_Exception
-	 */
-	public function setValueExplicit($pValue = NULL, $pDataType = PHPExcel_Cell_DataType::TYPE_STRING)
-	{
-		// set the value according to data type
-		switch ($pDataType) {
-			case PHPExcel_Cell_DataType::TYPE_NULL:
-				$this->_value = $pValue;
-				break;
-			case PHPExcel_Cell_DataType::TYPE_STRING2:
-				$pDataType = PHPExcel_Cell_DataType::TYPE_STRING;
-			case PHPExcel_Cell_DataType::TYPE_STRING:
-			case PHPExcel_Cell_DataType::TYPE_INLINE:
-				$this->_value = PHPExcel_Cell_DataType::checkString($pValue);
-				break;
-			case PHPExcel_Cell_DataType::TYPE_NUMERIC:
-				$this->_value = (float)$pValue;
-				break;
-			case PHPExcel_Cell_DataType::TYPE_FORMULA:
-				$this->_value = (string)$pValue;
-				break;
-			case PHPExcel_Cell_DataType::TYPE_BOOL:
-				$this->_value = (bool)$pValue;
-				break;
-			case PHPExcel_Cell_DataType::TYPE_ERROR:
-				$this->_value = PHPExcel_Cell_DataType::checkErrorCode($pValue);
-				break;
-			default:
-				throw new PHPExcel_Exception('Invalid datatype: ' . $pDataType);
-				break;
-		}
-
-		// set the datatype
-		$this->_dataType = $pDataType;
-
-		return $this->notifyCacheController();
-	}
-
-	/**
-	 *	Get calculated cell value
-	 *
-	 *	@deprecated		Since version 1.7.8 for planned changes to cell for array formula handling
-	 *
-	 *	@param	boolean $resetLog  Whether the calculation engine logger should be reset or not
-	 *	@return	mixed
-	 *	@throws	PHPExcel_Exception
-	 */
-	public function getCalculatedValue($resetLog = TRUE)
-	{
-//echo 'Cell '.$this->getCoordinate().' value is a '.$this->_dataType.' with a value of '.$this->getValue().PHP_EOL;
-		if ($this->_dataType == PHPExcel_Cell_DataType::TYPE_FORMULA) {
-			try {
-//echo 'Cell value for '.$this->getCoordinate().' is a formula: Calculating value'.PHP_EOL;
-				$result = PHPExcel_Calculation::getInstance(
-					$this->getWorksheet()->getParent()
-				)->calculateCellValue($this,$resetLog);
-//echo $this->getCoordinate().' calculation result is '.$result.PHP_EOL;
-				//	We don't yet handle array returns
-				if (is_array($result)) {
-					while (is_array($result)) {
-						$result = array_pop($result);
-					}
-				}
-			} catch ( PHPExcel_Exception $ex ) {
-				if (($ex->getMessage() === 'Unable to access External Workbook') && ($this->_calculatedValue !== NULL)) {
-//echo 'Returning fallback value of '.$this->_calculatedValue.' for cell '.$this->getCoordinate().PHP_EOL;
-					return $this->_calculatedValue; // Fallback for calculations referencing external files.
-				}
-//echo 'Calculation Exception: '.$ex->getMessage().PHP_EOL;
-				$result = '#N/A';
-				throw new PHPExcel_Calculation_Exception(
-					$this->getWorksheet()->getTitle().'!'.$this->getCoordinate().' -> '.$ex->getMessage()
-				);
-			}
-
-			if ($result === '#Not Yet Implemented') {
-//echo 'Returning fallback value of '.$this->_calculatedValue.' for cell '.$this->getCoordinate().PHP_EOL;
-				return $this->_calculatedValue; // Fallback if calculation engine does not support the formula.
-			}
-//echo 'Returning calculated value of '.$result.' for cell '.$this->getCoordinate().PHP_EOL;
-			return $result;
-		} elseif($this->_value instanceof PHPExcel_RichText) {
-//		echo 'Cell value for '.$this->getCoordinate().' is rich text: Returning data value of '.$this->_value.'<br />';
-			return $this->_value->getPlainText();
-		}
-//		echo 'Cell value for '.$this->getCoordinate().' is not a formula: Returning data value of '.$this->_value.'<br />';
-		return $this->_value;
-	}
-
-	/**
-	 *	Set old calculated value (cached)
-	 *
-	 *	@param	mixed $pValue	Value
-	 *	@return	PHPExcel_Cell
-	 */
-	public function setCalculatedValue($pValue = NULL)
-	{
-		if ($pValue !== NULL) {
-			$this->_calculatedValue = (is_numeric($pValue)) ? (float) $pValue : $pValue;
-		}
-
-		return $this->notifyCacheController();
-	}
-
-	/**
-	 *	Get old calculated value (cached)
-	 *	This returns the value last calculated by MS Excel or whichever spreadsheet program was used to
-	 *		create the original spreadsheet file.
-	 *	Note that this value is not guaranteed to refelect the actual calculated value because it is
-	 *		possible that auto-calculation was disabled in the original spreadsheet, and underlying data
-	 *		values used by the formula have changed since it was last calculated.
-	 *
-	 *	@return	mixed
-	 */
-	public function getOldCalculatedValue()
-	{
-		return $this->_calculatedValue;
-	}
-
-	/**
-	 *	Get cell data type
-	 *
-	 *	@return string
-	 */
-	public function getDataType()
-	{
-		return $this->_dataType;
-	}
-
-	/**
-	 *	Set cell data type
-	 *
-	 *	@param	string $pDataType
-	 *	@return	PHPExcel_Cell
-	 */
-	public function setDataType($pDataType = PHPExcel_Cell_DataType::TYPE_STRING)
-	{
-		if ($pDataType == PHPExcel_Cell_DataType::TYPE_STRING2)
-			$pDataType = PHPExcel_Cell_DataType::TYPE_STRING;
-
-		$this->_dataType = $pDataType;
-
-		return $this->notifyCacheController();
-	}
-
-    /**
-     *  Identify if the cell contains a formula
-     *
-     *  @return boolean
-     */
-    public function isFormula()
-    {
-        return $this->_dataType == PHPExcel_Cell_DataType::TYPE_FORMULA;
-    }
-
-	/**
-	 *	Does this cell contain Data validation rules?
-	 *
-	 *	@return	boolean
-	 *	@throws	PHPExcel_Exception
-	 */
-	public function hasDataValidation()
-	{
-		if (!isset($this->_parent)) {
-			throw new PHPExcel_Exception('Cannot check for data validation when cell is not bound to a worksheet');
-		}
-
-		return $this->getWorksheet()->dataValidationExists($this->getCoordinate());
-	}
-
-	/**
-	 *	Get Data validation rules
-	 *
-	 *	@return	PHPExcel_Cell_DataValidation
-	 *	@throws	PHPExcel_Exception
-	 */
-	public function getDataValidation()
-	{
-		if (!isset($this->_parent)) {
-			throw new PHPExcel_Exception('Cannot get data validation for cell that is not bound to a worksheet');
-		}
-
-		return $this->getWorksheet()->getDataValidation($this->getCoordinate());
-	}
-
-	/**
-	 *	Set Data validation rules
-	 *
-	 *	@param	PHPExcel_Cell_DataValidation	$pDataValidation
-	 *	@return	PHPExcel_Cell
-	 *	@throws	PHPExcel_Exception
-	 */
-	public function setDataValidation(PHPExcel_Cell_DataValidation $pDataValidation = NULL)
-	{
-		if (!isset($this->_parent)) {
-			throw new PHPExcel_Exception('Cannot set data validation for cell that is not bound to a worksheet');
-		}
-
-		$this->getWorksheet()->setDataValidation($this->getCoordinate(), $pDataValidation);
-
-		return $this->notifyCacheController();
-	}
-
-	/**
-	 *	Does this cell contain a Hyperlink?
-	 *
-	 *	@return boolean
-	 *	@throws	PHPExcel_Exception
-	 */
-	public function hasHyperlink()
-	{
-		if (!isset($this->_parent)) {
-			throw new PHPExcel_Exception('Cannot check for hyperlink when cell is not bound to a worksheet');
-		}
-
-		return $this->getWorksheet()->hyperlinkExists($this->getCoordinate());
-	}
-
-	/**
-	 *	Get Hyperlink
-	 *
-	 *	@return	PHPExcel_Cell_Hyperlink
-	 *	@throws	PHPExcel_Exception
-	 */
-	public function getHyperlink()
-	{
-		if (!isset($this->_parent)) {
-			throw new PHPExcel_Exception('Cannot get hyperlink for cell that is not bound to a worksheet');
-		}
-
-		return $this->getWorksheet()->getHyperlink($this->getCoordinate());
-	}
-
-	/**
-	 *	Set Hyperlink
-	 *
-	 *	@param	PHPExcel_Cell_Hyperlink	$pHyperlink
-	 *	@return	PHPExcel_Cell
-	 *	@throws	PHPExcel_Exception
-	 */
-	public function setHyperlink(PHPExcel_Cell_Hyperlink $pHyperlink = NULL)
-	{
-		if (!isset($this->_parent)) {
-			throw new PHPExcel_Exception('Cannot set hyperlink for cell that is not bound to a worksheet');
-		}
-
-		$this->getWorksheet()->setHyperlink($this->getCoordinate(), $pHyperlink);
-
-		return $this->notifyCacheController();
-	}
-
-	/**
-	 *	Get parent worksheet
-	 *
-	 *	@return PHPExcel_CachedObjectStorage_CacheBase
-	 */
-	public function getParent() {
-		return $this->_parent;
-	}
-
-	/**
-	 *	Get parent worksheet
-	 *
-	 *	@return PHPExcel_Worksheet
-	 */
-	public function getWorksheet() {
-		return $this->_parent->getParent();
-	}
-
-	/**
-	 *	Is this cell in a merge range
-	 *
-	 *	@return boolean
-	 */
-    public function isInMergeRange() {
-        return (boolean) $this->getMergeRange();
-    }
-
-	/**
-	 *	Is this cell the master (top left cell) in a merge range (that holds the actual data value)
-	 *
-	 *	@return boolean
-	 */
-    public function isMergeRangeValueCell() {
-        if ($mergeRange = $this->getMergeRange()) {
-            $mergeRange = PHPExcel_Cell::splitRange($mergeRange);
-            list($startCell) = $mergeRange[0];
-            if ($this->getCoordinate() === $startCell) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-	/**
-	 *	If this cell is in a merge range, then return the range
-	 *
-	 *	@return string
-	 */
-    public function getMergeRange() {
-        foreach($this->getWorksheet()->getMergeCells() as $mergeRange) {
-            if ($this->isInRange($mergeRange)) {
-                return $mergeRange;
-            }
-        }
-        return false;
-    }
-
-	/**
-	 *	Get cell style
-	 *
-	 *	@return	PHPExcel_Style
-	 */
-	public function getStyle()
-	{
-		return $this->getWorksheet()->getStyle($this->getCoordinate());
-	}
-
-	/**
-	 *	Re-bind parent
-	 *
-	 *	@param	PHPExcel_Worksheet $parent
-	 *	@return	PHPExcel_Cell
-	 */
-	public function rebindParent(PHPExcel_Worksheet $parent) {
-		$this->_parent = $parent->getCellCacheController();
-
-		return $this->notifyCacheController();
-	}
-
-	/**
-	 *	Is cell in a specific range?
-	 *
-	 *	@param	string	$pRange		Cell range (e.g. A1:A1)
-	 *	@return	boolean
-	 */
-	public function isInRange($pRange = 'A1:A1')
-	{
-		list($rangeStart,$rangeEnd) = self::rangeBoundaries($pRange);
-
-		// Translate properties
-		$myColumn	= self::columnIndexFromString($this->getColumn());
-		$myRow		= $this->getRow();
-
-		// Verify if cell is in range
-		return (($rangeStart[0] <= $myColumn) && ($rangeEnd[0] >= $myColumn) &&
-				($rangeStart[1] <= $myRow) && ($rangeEnd[1] >= $myRow)
-			   );
-	}
-
-	/**
-	 *	Coordinate from string
-	 *
-	 *	@param	string	$pCoordinateString
-	 *	@return	array	Array containing column and row (indexes 0 and 1)
-	 *	@throws	PHPExcel_Exception
-	 */
-	public static function coordinateFromString($pCoordinateString = 'A1')
-	{
-		if (preg_match("/^([$]?[A-Z]{1,3})([$]?\d{1,7})$/", $pCoordinateString, $matches)) {
-			return array($matches[1],$matches[2]);
-		} elseif ((strpos($pCoordinateString,':') !== FALSE) || (strpos($pCoordinateString,',') !== FALSE)) {
-			throw new PHPExcel_Exception('Cell coordinate string can not be a range of cells');
-		} elseif ($pCoordinateString == '') {
-			throw new PHPExcel_Exception('Cell coordinate can not be zero-length string');
-		}
-
-		throw new PHPExcel_Exception('Invalid cell coordinate '.$pCoordinateString);
-	}
-
-	/**
-	 *	Make string row, column or cell coordinate absolute
-	 *
-	 *	@param	string	$pCoordinateString		e.g. 'A' or '1' or 'A1'
-	 *					Note that this value can be a row or column reference as well as a cell reference
-	 *	@return	string	Absolute coordinate		e.g. '$A' or '$1' or '$A$1'
-	 *	@throws	PHPExcel_Exception
-	 */
-	public static function absoluteReference($pCoordinateString = 'A1')
-	{
-		if (strpos($pCoordinateString,':') === FALSE && strpos($pCoordinateString,',') === FALSE) {
-			// Split out any worksheet name from the reference
-			$worksheet = '';
-			$cellAddress = explode('!',$pCoordinateString);
-			if (count($cellAddress) > 1) {
-				list($worksheet,$pCoordinateString) = $cellAddress;
-			}
-			if ($worksheet > '')	$worksheet .= '!';
-
-			// Create absolute coordinate
-			if (ctype_digit($pCoordinateString)) {
-				return $worksheet . '$' . $pCoordinateString;
-			} elseif (ctype_alpha($pCoordinateString)) {
-				return $worksheet . '$' . strtoupper($pCoordinateString);
-			}
-			return $worksheet . self::absoluteCoordinate($pCoordinateString);
-		}
-
-		throw new PHPExcel_Exception('Cell coordinate string can not be a range of cells');
-	}
-
-	/**
-	 *	Make string coordinate absolute
-	 *
-	 *	@param	string	$pCoordinateString		e.g. 'A1'
-	 *	@return	string	Absolute coordinate		e.g. '$A$1'
-	 *	@throws	PHPExcel_Exception
-	 */
-	public static function absoluteCoordinate($pCoordinateString = 'A1')
-	{
-		if (strpos($pCoordinateString,':') === FALSE && strpos($pCoordinateString,',') === FALSE) {
-			// Split out any worksheet name from the coordinate
-			$worksheet = '';
-			$cellAddress = explode('!',$pCoordinateString);
-			if (count($cellAddress) > 1) {
-				list($worksheet,$pCoordinateString) = $cellAddress;
-			}
-			if ($worksheet > '')	$worksheet .= '!';
-
-			// Create absolute coordinate
-			list($column, $row) = self::coordinateFromString($pCoordinateString);
-			$column = ltrim($column,'$');
-			$row = ltrim($row,'$');
-			return $worksheet . '$' . $column . '$' . $row;
-		}
-
-		throw new PHPExcel_Exception('Cell coordinate string can not be a range of cells');
-	}
-
-	/**
-	 *	Split range into coordinate strings
-	 *
-	 *	@param	string	$pRange		e.g. 'B4:D9' or 'B4:D9,H2:O11' or 'B4'
-	 *	@return	array	Array containg one or more arrays containing one or two coordinate strings
-	 *								e.g. array('B4','D9') or array(array('B4','D9'),array('H2','O11'))
-	 *										or array('B4')
-	 */
-	public static function splitRange($pRange = 'A1:A1')
-	{
-		// Ensure $pRange is a valid range
-		if(empty($pRange)) {
-			$pRange = self::DEFAULT_RANGE;
-		}
-
-		$exploded = explode(',', $pRange);
-		$counter = count($exploded);
-		for ($i = 0; $i < $counter; ++$i) {
-			$exploded[$i] = explode(':', $exploded[$i]);
-		}
-		return $exploded;
-	}
-
-	/**
-	 *	Build range from coordinate strings
-	 *
-	 *	@param	array	$pRange	Array containg one or more arrays containing one or two coordinate strings
-	 *	@return	string	String representation of $pRange
-	 *	@throws	PHPExcel_Exception
-	 */
-	public static function buildRange($pRange)
-	{
-		// Verify range
-		if (!is_array($pRange) || empty($pRange) || !is_array($pRange[0])) {
-			throw new PHPExcel_Exception('Range does not contain any information');
-		}
-
-		// Build range
-		$imploded = array();
-		$counter = count($pRange);
-		for ($i = 0; $i < $counter; ++$i) {
-			$pRange[$i] = implode(':', $pRange[$i]);
-		}
-		$imploded = implode(',', $pRange);
-
-		return $imploded;
-	}
-
-	/**
-	 *	Calculate range boundaries
-	 *
-	 *	@param	string	$pRange		Cell range (e.g. A1:A1)
-	 *	@return	array	Range coordinates array(Start Cell, End Cell)
-	 *					where Start Cell and End Cell are arrays (Column Number, Row Number)
-	 */
-	public static function rangeBoundaries($pRange = 'A1:A1')
-	{
-		// Ensure $pRange is a valid range
-		if(empty($pRange)) {
-			$pRange = self::DEFAULT_RANGE;
-		}
-
-		// Uppercase coordinate
-		$pRange = strtoupper($pRange);
-
-		// Extract range
-		if (strpos($pRange, ':') === FALSE) {
-			$rangeA = $rangeB = $pRange;
-		} else {
-			list($rangeA, $rangeB) = explode(':', $pRange);
-		}
-
-		// Calculate range outer borders
-		$rangeStart = self::coordinateFromString($rangeA);
-		$rangeEnd	= self::coordinateFromString($rangeB);
-
-		// Translate column into index
-		$rangeStart[0]	= self::columnIndexFromString($rangeStart[0]);
-		$rangeEnd[0]	= self::columnIndexFromString($rangeEnd[0]);
-
-		return array($rangeStart, $rangeEnd);
-	}
-
-	/**
-	 *	Calculate range dimension
-	 *
-	 *	@param	string	$pRange		Cell range (e.g. A1:A1)
-	 *	@return	array	Range dimension (width, height)
-	 */
-	public static function rangeDimension($pRange = 'A1:A1')
-	{
-		// Calculate range outer borders
-		list($rangeStart,$rangeEnd) = self::rangeBoundaries($pRange);
-
-		return array( ($rangeEnd[0] - $rangeStart[0] + 1), ($rangeEnd[1] - $rangeStart[1] + 1) );
-	}
-
-	/**
-	 *	Calculate range boundaries
-	 *
-	 *	@param	string	$pRange		Cell range (e.g. A1:A1)
-	 *	@return	array	Range coordinates array(Start Cell, End Cell)
-	 *					where Start Cell and End Cell are arrays (Column ID, Row Number)
-	 */
-	public static function getRangeBoundaries($pRange = 'A1:A1')
-	{
-		// Ensure $pRange is a valid range
-		if(empty($pRange)) {
-			$pRange = self::DEFAULT_RANGE;
-		}
-
-		// Uppercase coordinate
-		$pRange = strtoupper($pRange);
-
-		// Extract range
-		if (strpos($pRange, ':') === FALSE) {
-			$rangeA = $rangeB = $pRange;
-		} else {
-			list($rangeA, $rangeB) = explode(':', $pRange);
-		}
-
-		return array( self::coordinateFromString($rangeA), self::coordinateFromString($rangeB));
-	}
-
-	/**
-	 *	Column index from string
-	 *
-	 *	@param	string $pString
-	 *	@return	int Column index (base 1 !!!)
-	 */
-	public static function columnIndexFromString($pString = 'A')
-	{
-		//	Using a lookup cache adds a slight memory overhead, but boosts speed
-		//	caching using a static within the method is faster than a class static,
-		//		though it's additional memory overhead
-		static $_indexCache = array();
-
-		if (isset($_indexCache[$pString]))
-			return $_indexCache[$pString];
-
-		//	It's surprising how costly the strtoupper() and ord() calls actually are, so we use a lookup array rather than use ord()
-		//		and make it case insensitive to get rid of the strtoupper() as well. Because it's a static, there's no significant
-		//		memory overhead either
-		static $_columnLookup = array(
-			'A' => 1, 'B' => 2, 'C' => 3, 'D' => 4, 'E' => 5, 'F' => 6, 'G' => 7, 'H' => 8, 'I' => 9, 'J' => 10, 'K' => 11, 'L' => 12, 'M' => 13,
-			'N' => 14, 'O' => 15, 'P' => 16, 'Q' => 17, 'R' => 18, 'S' => 19, 'T' => 20, 'U' => 21, 'V' => 22, 'W' => 23, 'X' => 24, 'Y' => 25, 'Z' => 26,
-			'a' => 1, 'b' => 2, 'c' => 3, 'd' => 4, 'e' => 5, 'f' => 6, 'g' => 7, 'h' => 8, 'i' => 9, 'j' => 10, 'k' => 11, 'l' => 12, 'm' => 13,
-			'n' => 14, 'o' => 15, 'p' => 16, 'q' => 17, 'r' => 18, 's' => 19, 't' => 20, 'u' => 21, 'v' => 22, 'w' => 23, 'x' => 24, 'y' => 25, 'z' => 26
-		);
-
-		//	We also use the language construct isset() rather than the more costly strlen() function to match the length of $pString
-		//		for improved performance
-		if (isset($pString{0})) {
-			if (!isset($pString{1})) {
-				$_indexCache[$pString] = $_columnLookup[$pString];
-				return $_indexCache[$pString];
-			} elseif(!isset($pString{2})) {
-				$_indexCache[$pString] = $_columnLookup[$pString{0}] * 26 + $_columnLookup[$pString{1}];
-				return $_indexCache[$pString];
-			} elseif(!isset($pString{3})) {
-				$_indexCache[$pString] = $_columnLookup[$pString{0}] * 676 + $_columnLookup[$pString{1}] * 26 + $_columnLookup[$pString{2}];
-				return $_indexCache[$pString];
-			}
-		}
-		throw new PHPExcel_Exception("Column string index can not be " . ((isset($pString{0})) ? "longer than 3 characters" : "empty"));
-	}
-
-	/**
-	 *	String from columnindex
-	 *
-	 *	@param	int $pColumnIndex Column index (base 0 !!!)
-	 *	@return	string
-	 */
-	public static function stringFromColumnIndex($pColumnIndex = 0)
-	{
-		//	Using a lookup cache adds a slight memory overhead, but boosts speed
-		//	caching using a static within the method is faster than a class static,
-		//		though it's additional memory overhead
-		static $_indexCache = array();
-
-		if (!isset($_indexCache[$pColumnIndex])) {
-			// Determine column string
-			if ($pColumnIndex < 26) {
-				$_indexCache[$pColumnIndex] = chr(65 + $pColumnIndex);
-			} elseif ($pColumnIndex < 702) {
-				$_indexCache[$pColumnIndex] = chr(64 + ($pColumnIndex / 26)) .
-											  chr(65 + $pColumnIndex % 26);
-			} else {
-				$_indexCache[$pColumnIndex] = chr(64 + (($pColumnIndex - 26) / 676)) .
-											  chr(65 + ((($pColumnIndex - 26) % 676) / 26)) .
-											  chr(65 + $pColumnIndex % 26);
-			}
-		}
-		return $_indexCache[$pColumnIndex];
-	}
-
-	/**
-	 *	Extract all cell references in range
-	 *
-	 *	@param	string	$pRange		Range (e.g. A1 or A1:C10 or A1:E10 A20:E25)
-	 *	@return	array	Array containing single cell references
-	 */
-	public static function extractAllCellReferencesInRange($pRange = 'A1') {
-		// Returnvalue
-		$returnValue = array();
-
-		// Explode spaces
-		$cellBlocks = explode(' ', str_replace('$', '', strtoupper($pRange)));
-		foreach ($cellBlocks as $cellBlock) {
-			// Single cell?
-			if (strpos($cellBlock,':') === FALSE && strpos($cellBlock,',') === FALSE) {
-				$returnValue[] = $cellBlock;
-				continue;
-			}
-
-			// Range...
-			$ranges = self::splitRange($cellBlock);
-			foreach($ranges as $range) {
-				// Single cell?
-				if (!isset($range[1])) {
-					$returnValue[] = $range[0];
-					continue;
-				}
-
-				// Range...
-				list($rangeStart, $rangeEnd)	= $range;
-				sscanf($rangeStart,'%[A-Z]%d', $startCol, $startRow);
-				sscanf($rangeEnd,'%[A-Z]%d', $endCol, $endRow);
-				$endCol++;
-
-				// Current data
-				$currentCol	= $startCol;
-				$currentRow	= $startRow;
-
-				// Loop cells
-				while ($currentCol != $endCol) {
-					while ($currentRow <= $endRow) {
-						$returnValue[] = $currentCol.$currentRow;
-						++$currentRow;
-					}
-					++$currentCol;
-					$currentRow = $startRow;
-				}
-			}
-		}
-
-		//	Sort the result by column and row
-		$sortKeys = array();
-		foreach (array_unique($returnValue) as $coord) {
-			sscanf($coord,'%[A-Z]%d', $column, $row);
-			$sortKeys[sprintf('%3s%09d',$column,$row)] = $coord;
-		}
-		ksort($sortKeys);
-
-		// Return value
-		return array_values($sortKeys);
-	}
-
-	/**
-	 * Compare 2 cells
-	 *
-	 * @param	PHPExcel_Cell	$a	Cell a
-	 * @param	PHPExcel_Cell	$b	Cell b
-	 * @return	int		Result of comparison (always -1 or 1, never zero!)
-	 */
-	public static function compareCells(PHPExcel_Cell $a, PHPExcel_Cell $b)
-	{
-		if ($a->getRow() < $b->getRow()) {
-			return -1;
-		} elseif ($a->getRow() > $b->getRow()) {
-			return 1;
-		} elseif (self::columnIndexFromString($a->getColumn()) < self::columnIndexFromString($b->getColumn())) {
-			return -1;
-		} else {
-			return 1;
-		}
-	}
-
-	/**
-	 * Get value binder to use
-	 *
-	 * @return PHPExcel_Cell_IValueBinder
-	 */
-	public static function getValueBinder() {
-		if (self::$_valueBinder === NULL) {
-			self::$_valueBinder = new PHPExcel_Cell_DefaultValueBinder();
-		}
-
-		return self::$_valueBinder;
-	}
-
-	/**
-	 * Set value binder to use
-	 *
-	 * @param PHPExcel_Cell_IValueBinder $binder
-	 * @throws PHPExcel_Exception
-	 */
-	public static function setValueBinder(PHPExcel_Cell_IValueBinder $binder = NULL) {
-		if ($binder === NULL) {
-			throw new PHPExcel_Exception("A PHPExcel_Cell_IValueBinder is required for PHPExcel to function correctly.");
-		}
-
-		self::$_valueBinder = $binder;
-	}
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if ((is_object($value)) && ($key != '_parent')) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-
-	/**
-	 * Get index to cellXf
-	 *
-	 * @return int
-	 */
-	public function getXfIndex()
-	{
-		return $this->_xfIndex;
-	}
-
-	/**
-	 * Set index to cellXf
-	 *
-	 * @param int $pValue
-	 * @return PHPExcel_Cell
-	 */
-	public function setXfIndex($pValue = 0)
-	{
-		$this->_xfIndex = $pValue;
-
-		return $this->notifyCacheController();
-	}
-
-	/**
-	 *	@deprecated		Since version 1.7.8 for planned changes to cell for array formula handling
-	 */
-	public function setFormulaAttributes($pAttributes)
-	{
-		$this->_formulaAttributes = $pAttributes;
-		return $this;
-	}
-
-	/**
-	 *	@deprecated		Since version 1.7.8 for planned changes to cell for array formula handling
-	 */
-	public function getFormulaAttributes()
-	{
-		return $this->_formulaAttributes;
-	}
-
-    /**
-     * Convert to string
-     *
-     * @return string
-     */
-	public function __toString()
-	{
-		return (string) $this->getValue();
-	}
-
-}
-
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/AdvancedValueBinder.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/AdvancedValueBinder.php
deleted file mode 100644
index f4280ac4953..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/AdvancedValueBinder.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-    /**
-     * @ignore
-     */
-    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/**
- * PHPExcel_Cell_AdvancedValueBinder
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Cell_AdvancedValueBinder extends PHPExcel_Cell_DefaultValueBinder implements PHPExcel_Cell_IValueBinder
-{
-    /**
-     * Bind value to a cell
-     *
-     * @param  PHPExcel_Cell  $cell  Cell to bind value to
-     * @param  mixed $value          Value to bind in cell
-     * @return boolean
-     */
-    public function bindValue(PHPExcel_Cell $cell, $value = null)
-    {
-        // sanitize UTF-8 strings
-        if (is_string($value)) {
-            $value = PHPExcel_Shared_String::SanitizeUTF8($value);
-        }
-
-        // Find out data type
-        $dataType = parent::dataTypeForValue($value);
-
-        // Style logic - strings
-        if ($dataType === PHPExcel_Cell_DataType::TYPE_STRING && !$value instanceof PHPExcel_RichText) {
-            //    Test for booleans using locale-setting
-            if ($value == PHPExcel_Calculation::getTRUE()) {
-                $cell->setValueExplicit( TRUE, PHPExcel_Cell_DataType::TYPE_BOOL);
-                return true;
-            } elseif($value == PHPExcel_Calculation::getFALSE()) {
-                $cell->setValueExplicit( FALSE, PHPExcel_Cell_DataType::TYPE_BOOL);
-                return true;
-            }
-
-            // Check for number in scientific format
-            if (preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_NUMBER.'$/', $value)) {
-                $cell->setValueExplicit( (float) $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
-                return true;
-            }
-
-            // Check for fraction
-            if (preg_match('/^([+-]?)\s*([0-9]+)\s?\/\s*([0-9]+)$/', $value, $matches)) {
-                // Convert value to number
-                $value = $matches[2] / $matches[3];
-                if ($matches[1] == '-') $value = 0 - $value;
-                $cell->setValueExplicit( (float) $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
-                // Set style
-                $cell->getWorksheet()->getStyle( $cell->getCoordinate() )
-                    ->getNumberFormat()->setFormatCode( '??/??' );
-                return true;
-            } elseif (preg_match('/^([+-]?)([0-9]*) +([0-9]*)\s?\/\s*([0-9]*)$/', $value, $matches)) {
-                // Convert value to number
-                $value = $matches[2] + ($matches[3] / $matches[4]);
-                if ($matches[1] == '-') $value = 0 - $value;
-                $cell->setValueExplicit( (float) $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
-                // Set style
-                $cell->getWorksheet()->getStyle( $cell->getCoordinate() )
-                    ->getNumberFormat()->setFormatCode( '# ??/??' );
-                return true;
-            }
-
-            // Check for percentage
-            if (preg_match('/^\-?[0-9]*\.?[0-9]*\s?\%$/', $value)) {
-                // Convert value to number
-                $value = (float) str_replace('%', '', $value) / 100;
-                $cell->setValueExplicit( $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
-                // Set style
-                $cell->getWorksheet()->getStyle( $cell->getCoordinate() )
-                    ->getNumberFormat()->setFormatCode( PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_00 );
-                return true;
-            }
-
-            // Check for currency
-            $currencyCode = PHPExcel_Shared_String::getCurrencyCode();
-            $decimalSeparator = PHPExcel_Shared_String::getDecimalSeparator();
-            $thousandsSeparator = PHPExcel_Shared_String::getThousandsSeparator();
-            if (preg_match('/^'.preg_quote($currencyCode).' *(\d{1,3}('.preg_quote($thousandsSeparator).'\d{3})*|(\d+))('.preg_quote($decimalSeparator).'\d{2})?$/', $value)) {
-                // Convert value to number
-                $value = (float) trim(str_replace(array($currencyCode, $thousandsSeparator, $decimalSeparator), array('', '', '.'), $value));
-                $cell->setValueExplicit( $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
-                // Set style
-                $cell->getWorksheet()->getStyle( $cell->getCoordinate() )
-                    ->getNumberFormat()->setFormatCode(
-                        str_replace('$', $currencyCode, PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_USD_SIMPLE )
-                    );
-                return true;
-            } elseif (preg_match('/^\$ *(\d{1,3}(\,\d{3})*|(\d+))(\.\d{2})?$/', $value)) {
-                // Convert value to number
-                $value = (float) trim(str_replace(array('$',','), '', $value));
-                $cell->setValueExplicit( $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
-                // Set style
-                $cell->getWorksheet()->getStyle( $cell->getCoordinate() )
-                    ->getNumberFormat()->setFormatCode( PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_USD_SIMPLE );
-                return true;
-            }
-
-            // Check for time without seconds e.g. '9:45', '09:45'
-            if (preg_match('/^(\d|[0-1]\d|2[0-3]):[0-5]\d$/', $value)) {
-                // Convert value to number
-                list($h, $m) = explode(':', $value);
-                $days = $h / 24 + $m / 1440;
-                $cell->setValueExplicit($days, PHPExcel_Cell_DataType::TYPE_NUMERIC);
-                // Set style
-                $cell->getWorksheet()->getStyle( $cell->getCoordinate() )
-                    ->getNumberFormat()->setFormatCode( PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME3 );
-                return true;
-            }
-
-            // Check for time with seconds '9:45:59', '09:45:59'
-            if (preg_match('/^(\d|[0-1]\d|2[0-3]):[0-5]\d:[0-5]\d$/', $value)) {
-                // Convert value to number
-                list($h, $m, $s) = explode(':', $value);
-                $days = $h / 24 + $m / 1440 + $s / 86400;
-                // Convert value to number
-                $cell->setValueExplicit($days, PHPExcel_Cell_DataType::TYPE_NUMERIC);
-                // Set style
-                $cell->getWorksheet()->getStyle( $cell->getCoordinate() )
-                    ->getNumberFormat()->setFormatCode( PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME4 );
-                return true;
-            }
-
-            // Check for datetime, e.g. '2008-12-31', '2008-12-31 15:59', '2008-12-31 15:59:10'
-            if (($d = PHPExcel_Shared_Date::stringToExcel($value)) !== false) {
-                // Convert value to number
-                $cell->setValueExplicit($d, PHPExcel_Cell_DataType::TYPE_NUMERIC);
-                // Determine style. Either there is a time part or not. Look for ':'
-                if (strpos($value, ':') !== false) {
-                    $formatCode = 'yyyy-mm-dd h:mm';
-                } else {
-                    $formatCode = 'yyyy-mm-dd';
-                }
-                $cell->getWorksheet()->getStyle( $cell->getCoordinate() )
-                    ->getNumberFormat()->setFormatCode($formatCode);
-                return true;
-            }
-
-            // Check for newline character "\n"
-            if (strpos($value, "\n") !== FALSE) {
-                $value = PHPExcel_Shared_String::SanitizeUTF8($value);
-                $cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_STRING);
-                // Set style
-                $cell->getWorksheet()->getStyle( $cell->getCoordinate() )
-                    ->getAlignment()->setWrapText(TRUE);
-                return true;
-            }
-        }
-
-        // Not bound yet? Use parent...
-        return parent::bindValue($cell, $value);
-    }
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataType.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataType.php
deleted file mode 100644
index 07e148a50ff..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataType.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Cell_DataType
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Cell_DataType
-{
-    /* Data types */
-    const TYPE_STRING2  = 'str';
-    const TYPE_STRING   = 's';
-    const TYPE_FORMULA  = 'f';
-    const TYPE_NUMERIC  = 'n';
-    const TYPE_BOOL     = 'b';
-    const TYPE_NULL     = 'null';
-    const TYPE_INLINE   = 'inlineStr';
-    const TYPE_ERROR    = 'e';
-
-    /**
-     * List of error codes
-     *
-     * @var array
-     */
-    private static $_errorCodes = array(
-        '#NULL!'  => 0,
-        '#DIV/0!' => 1,
-        '#VALUE!' => 2,
-        '#REF!'   => 3,
-        '#NAME?'  => 4,
-        '#NUM!'   => 5,
-        '#N/A'    => 6
-    );
-
-    /**
-     * Get list of error codes
-     *
-     * @return array
-     */
-    public static function getErrorCodes() {
-        return self::$_errorCodes;
-    }
-
-    /**
-     * DataType for value
-     *
-     * @deprecated  Replaced by PHPExcel_Cell_IValueBinder infrastructure, will be removed in version 1.8.0
-     * @param       mixed  $pValue
-     * @return      string
-     */
-    public static function dataTypeForValue($pValue = null) {
-        return PHPExcel_Cell_DefaultValueBinder::dataTypeForValue($pValue);
-    }
-
-    /**
-     * Check a string that it satisfies Excel requirements
-     *
-     * @param  mixed  Value to sanitize to an Excel string
-     * @return mixed  Sanitized value
-     */
-    public static function checkString($pValue = null)
-    {
-        if ($pValue instanceof PHPExcel_RichText) {
-            // TODO: Sanitize Rich-Text string (max. character count is 32,767)
-            return $pValue;
-        }
-
-        // string must never be longer than 32,767 characters, truncate if necessary
-        $pValue = PHPExcel_Shared_String::Substring($pValue, 0, 32767);
-
-        // we require that newline is represented as "\n" in core, not as "\r\n" or "\r"
-        $pValue = str_replace(array("\r\n", "\r"), "\n", $pValue);
-
-        return $pValue;
-    }
-
-    /**
-     * Check a value that it is a valid error code
-     *
-     * @param  mixed   Value to sanitize to an Excel error code
-     * @return string  Sanitized value
-     */
-    public static function checkErrorCode($pValue = null)
-    {
-        $pValue = (string) $pValue;
-
-        if ( !array_key_exists($pValue, self::$_errorCodes) ) {
-            $pValue = '#NULL!';
-        }
-
-        return $pValue;
-    }
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataValidation.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataValidation.php
deleted file mode 100644
index 538ecd1fbcf..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataValidation.php
+++ /dev/null
@@ -1,472 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Cell_DataValidation
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Cell_DataValidation
-{
-    /* Data validation types */
-    const TYPE_NONE        = 'none';
-    const TYPE_CUSTOM      = 'custom';
-    const TYPE_DATE        = 'date';
-    const TYPE_DECIMAL     = 'decimal';
-    const TYPE_LIST        = 'list';
-    const TYPE_TEXTLENGTH  = 'textLength';
-    const TYPE_TIME        = 'time';
-    const TYPE_WHOLE       = 'whole';
-
-    /* Data validation error styles */
-    const STYLE_STOP         = 'stop';
-    const STYLE_WARNING      = 'warning';
-    const STYLE_INFORMATION  = 'information';
-
-    /* Data validation operators */
-    const OPERATOR_BETWEEN             = 'between';
-    const OPERATOR_EQUAL               = 'equal';
-    const OPERATOR_GREATERTHAN         = 'greaterThan';
-    const OPERATOR_GREATERTHANOREQUAL  = 'greaterThanOrEqual';
-    const OPERATOR_LESSTHAN            = 'lessThan';
-    const OPERATOR_LESSTHANOREQUAL     = 'lessThanOrEqual';
-    const OPERATOR_NOTBETWEEN          = 'notBetween';
-    const OPERATOR_NOTEQUAL            = 'notEqual';
-
-    /**
-     * Formula 1
-     *
-     * @var string
-     */
-    private $_formula1;
-
-    /**
-     * Formula 2
-     *
-     * @var string
-     */
-    private $_formula2;
-
-    /**
-     * Type
-     *
-     * @var string
-     */
-    private $_type = PHPExcel_Cell_DataValidation::TYPE_NONE;
-
-    /**
-     * Error style
-     *
-     * @var string
-     */
-    private $_errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP;
-
-    /**
-     * Operator
-     *
-     * @var string
-     */
-    private $_operator;
-
-    /**
-     * Allow Blank
-     *
-     * @var boolean
-     */
-    private $_allowBlank;
-
-    /**
-     * Show DropDown
-     *
-     * @var boolean
-     */
-    private $_showDropDown;
-
-    /**
-     * Show InputMessage
-     *
-     * @var boolean
-     */
-    private $_showInputMessage;
-
-    /**
-     * Show ErrorMessage
-     *
-     * @var boolean
-     */
-    private $_showErrorMessage;
-
-    /**
-     * Error title
-     *
-     * @var string
-     */
-    private $_errorTitle;
-
-    /**
-     * Error
-     *
-     * @var string
-     */
-    private $_error;
-
-    /**
-     * Prompt title
-     *
-     * @var string
-     */
-    private $_promptTitle;
-
-    /**
-     * Prompt
-     *
-     * @var string
-     */
-    private $_prompt;
-
-    /**
-     * Create a new PHPExcel_Cell_DataValidation
-     */
-    public function __construct()
-    {
-        // Initialise member variables
-        $this->_formula1          = '';
-        $this->_formula2          = '';
-        $this->_type              = PHPExcel_Cell_DataValidation::TYPE_NONE;
-        $this->_errorStyle        = PHPExcel_Cell_DataValidation::STYLE_STOP;
-        $this->_operator          = '';
-        $this->_allowBlank        = FALSE;
-        $this->_showDropDown      = FALSE;
-        $this->_showInputMessage  = FALSE;
-        $this->_showErrorMessage  = FALSE;
-        $this->_errorTitle        = '';
-        $this->_error             = '';
-        $this->_promptTitle       = '';
-        $this->_prompt            = '';
-    }
-
-    /**
-     * Get Formula 1
-     *
-     * @return string
-     */
-    public function getFormula1() {
-        return $this->_formula1;
-    }
-
-    /**
-     * Set Formula 1
-     *
-     * @param  string    $value
-     * @return PHPExcel_Cell_DataValidation
-     */
-    public function setFormula1($value = '') {
-        $this->_formula1 = $value;
-        return $this;
-    }
-
-    /**
-     * Get Formula 2
-     *
-     * @return string
-     */
-    public function getFormula2() {
-        return $this->_formula2;
-    }
-
-    /**
-     * Set Formula 2
-     *
-     * @param  string    $value
-     * @return PHPExcel_Cell_DataValidation
-     */
-    public function setFormula2($value = '') {
-        $this->_formula2 = $value;
-        return $this;
-    }
-
-    /**
-     * Get Type
-     *
-     * @return string
-     */
-    public function getType() {
-        return $this->_type;
-    }
-
-    /**
-     * Set Type
-     *
-     * @param  string    $value
-     * @return PHPExcel_Cell_DataValidation
-     */
-    public function setType($value = PHPExcel_Cell_DataValidation::TYPE_NONE) {
-        $this->_type = $value;
-        return $this;
-    }
-
-    /**
-     * Get Error style
-     *
-     * @return string
-     */
-    public function getErrorStyle() {
-        return $this->_errorStyle;
-    }
-
-    /**
-     * Set Error style
-     *
-     * @param  string    $value
-     * @return PHPExcel_Cell_DataValidation
-     */
-    public function setErrorStyle($value = PHPExcel_Cell_DataValidation::STYLE_STOP) {
-        $this->_errorStyle = $value;
-        return $this;
-    }
-
-    /**
-     * Get Operator
-     *
-     * @return string
-     */
-    public function getOperator() {
-        return $this->_operator;
-    }
-
-    /**
-     * Set Operator
-     *
-     * @param  string    $value
-     * @return PHPExcel_Cell_DataValidation
-     */
-    public function setOperator($value = '') {
-        $this->_operator = $value;
-        return $this;
-    }
-
-    /**
-     * Get Allow Blank
-     *
-     * @return boolean
-     */
-    public function getAllowBlank() {
-        return $this->_allowBlank;
-    }
-
-    /**
-     * Set Allow Blank
-     *
-     * @param  boolean    $value
-     * @return PHPExcel_Cell_DataValidation
-     */
-    public function setAllowBlank($value = false) {
-        $this->_allowBlank = $value;
-        return $this;
-    }
-
-    /**
-     * Get Show DropDown
-     *
-     * @return boolean
-     */
-    public function getShowDropDown() {
-        return $this->_showDropDown;
-    }
-
-    /**
-     * Set Show DropDown
-     *
-     * @param  boolean    $value
-     * @return PHPExcel_Cell_DataValidation
-     */
-    public function setShowDropDown($value = false) {
-        $this->_showDropDown = $value;
-        return $this;
-    }
-
-    /**
-     * Get Show InputMessage
-     *
-     * @return boolean
-     */
-    public function getShowInputMessage() {
-        return $this->_showInputMessage;
-    }
-
-    /**
-     * Set Show InputMessage
-     *
-     * @param  boolean    $value
-     * @return PHPExcel_Cell_DataValidation
-     */
-    public function setShowInputMessage($value = false) {
-        $this->_showInputMessage = $value;
-        return $this;
-    }
-
-    /**
-     * Get Show ErrorMessage
-     *
-     * @return boolean
-     */
-    public function getShowErrorMessage() {
-        return $this->_showErrorMessage;
-    }
-
-    /**
-     * Set Show ErrorMessage
-     *
-     * @param  boolean    $value
-     * @return PHPExcel_Cell_DataValidation
-     */
-    public function setShowErrorMessage($value = false) {
-        $this->_showErrorMessage = $value;
-        return $this;
-    }
-
-    /**
-     * Get Error title
-     *
-     * @return string
-     */
-    public function getErrorTitle() {
-        return $this->_errorTitle;
-    }
-
-    /**
-     * Set Error title
-     *
-     * @param  string    $value
-     * @return PHPExcel_Cell_DataValidation
-     */
-    public function setErrorTitle($value = '') {
-        $this->_errorTitle = $value;
-        return $this;
-    }
-
-    /**
-     * Get Error
-     *
-     * @return string
-     */
-    public function getError() {
-        return $this->_error;
-    }
-
-    /**
-     * Set Error
-     *
-     * @param  string    $value
-     * @return PHPExcel_Cell_DataValidation
-     */
-    public function setError($value = '') {
-        $this->_error = $value;
-        return $this;
-    }
-
-    /**
-     * Get Prompt title
-     *
-     * @return string
-     */
-    public function getPromptTitle() {
-        return $this->_promptTitle;
-    }
-
-    /**
-     * Set Prompt title
-     *
-     * @param  string    $value
-     * @return PHPExcel_Cell_DataValidation
-     */
-    public function setPromptTitle($value = '') {
-        $this->_promptTitle = $value;
-        return $this;
-    }
-
-    /**
-     * Get Prompt
-     *
-     * @return string
-     */
-    public function getPrompt() {
-        return $this->_prompt;
-    }
-
-    /**
-     * Set Prompt
-     *
-     * @param  string    $value
-     * @return PHPExcel_Cell_DataValidation
-     */
-    public function setPrompt($value = '') {
-        $this->_prompt = $value;
-        return $this;
-    }
-
-    /**
-     * Get hash code
-     *
-     * @return string    Hash code
-     */
-    public function getHashCode() {
-        return md5(
-              $this->_formula1
-            . $this->_formula2
-            . $this->_type = PHPExcel_Cell_DataValidation::TYPE_NONE
-            . $this->_errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP
-            . $this->_operator
-            . ($this->_allowBlank ? 't' : 'f')
-            . ($this->_showDropDown ? 't' : 'f')
-            . ($this->_showInputMessage ? 't' : 'f')
-            . ($this->_showErrorMessage ? 't' : 'f')
-            . $this->_errorTitle
-            . $this->_error
-            . $this->_promptTitle
-            . $this->_prompt
-            . __CLASS__
-        );
-    }
-
-    /**
-     * Implement PHP __clone to create a deep clone, not just a shallow copy.
-     */
-    public function __clone() {
-        $vars = get_object_vars($this);
-        foreach ($vars as $key => $value) {
-            if (is_object($value)) {
-                $this->$key = clone $value;
-            } else {
-                $this->$key = $value;
-            }
-        }
-    }
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DefaultValueBinder.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DefaultValueBinder.php
deleted file mode 100644
index 252048f7d8e..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DefaultValueBinder.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-    /**
-     * @ignore
-     */
-    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/**
- * PHPExcel_Cell_DefaultValueBinder
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Cell_DefaultValueBinder implements PHPExcel_Cell_IValueBinder
-{
-    /**
-     * Bind value to a cell
-     *
-     * @param  PHPExcel_Cell  $cell   Cell to bind value to
-     * @param  mixed          $value  Value to bind in cell
-     * @return boolean
-     */
-    public function bindValue(PHPExcel_Cell $cell, $value = null)
-    {
-        // sanitize UTF-8 strings
-        if (is_string($value)) {
-            $value = PHPExcel_Shared_String::SanitizeUTF8($value);
-        } elseif (is_object($value)) {
-            // Handle any objects that might be injected
-            if ($value instanceof DateTime) {
-                $value = $value->format('Y-m-d H:i:s');
-            } elseif (!($value instanceof PHPExcel_RichText)) {
-                $value = (string) $value;
-            }
-        }
-
-        // Set value explicit
-        $cell->setValueExplicit( $value, self::dataTypeForValue($value) );
-
-        // Done!
-        return true;
-    }
-
-    /**
-     * DataType for value
-     *
-     * @param   mixed  $pValue
-     * @return  string
-     */
-    public static function dataTypeForValue($pValue = null) {
-        // Match the value against a few data types
-        if ($pValue === null) {
-            return PHPExcel_Cell_DataType::TYPE_NULL;
-        } elseif ($pValue === '') {
-            return PHPExcel_Cell_DataType::TYPE_STRING;
-        } elseif ($pValue instanceof PHPExcel_RichText) {
-            return PHPExcel_Cell_DataType::TYPE_INLINE;
-        } elseif ($pValue{0} === '=' && strlen($pValue) > 1) {
-            return PHPExcel_Cell_DataType::TYPE_FORMULA;
-        } elseif (is_bool($pValue)) {
-            return PHPExcel_Cell_DataType::TYPE_BOOL;
-        } elseif (is_float($pValue) || is_int($pValue)) {
-            return PHPExcel_Cell_DataType::TYPE_NUMERIC;
-        } elseif (preg_match('/^[\+\-]?([0-9]+\\.?[0-9]*|[0-9]*\\.?[0-9]+)([Ee][\-\+]?[0-2]?\d{1,3})?$/', $pValue)) {
-            $tValue = ltrim($pValue, '+-');
-            if (is_string($pValue) && $tValue{0} === '0' && strlen($tValue) > 1 && $tValue{1} !== '.' ) {
-                return PHPExcel_Cell_DataType::TYPE_STRING;
-            } elseif((strpos($pValue, '.') === false) && ($pValue > PHP_INT_MAX)) {
-                return PHPExcel_Cell_DataType::TYPE_STRING;
-            }
-            return PHPExcel_Cell_DataType::TYPE_NUMERIC;
-        } elseif (is_string($pValue) && array_key_exists($pValue, PHPExcel_Cell_DataType::getErrorCodes())) {
-            return PHPExcel_Cell_DataType::TYPE_ERROR;
-        }
-
-        return PHPExcel_Cell_DataType::TYPE_STRING;
-    }
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/Hyperlink.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/Hyperlink.php
deleted file mode 100644
index 178ba7ee2f5..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/Hyperlink.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Cell_Hyperlink
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Cell_Hyperlink
-{
-    /**
-     * URL to link the cell to
-     *
-     * @var string
-     */
-    private $_url;
-
-    /**
-     * Tooltip to display on the hyperlink
-     *
-     * @var string
-     */
-    private $_tooltip;
-
-    /**
-     * Create a new PHPExcel_Cell_Hyperlink
-     *
-     * @param  string  $pUrl      Url to link the cell to
-     * @param  string  $pTooltip  Tooltip to display on the hyperlink
-     */
-    public function __construct($pUrl = '', $pTooltip = '')
-    {
-        // Initialise member variables
-        $this->_url         = $pUrl;
-        $this->_tooltip     = $pTooltip;
-    }
-
-    /**
-     * Get URL
-     *
-     * @return string
-     */
-    public function getUrl() {
-        return $this->_url;
-    }
-
-    /**
-     * Set URL
-     *
-     * @param  string    $value
-     * @return PHPExcel_Cell_Hyperlink
-     */
-    public function setUrl($value = '') {
-        $this->_url = $value;
-        return $this;
-    }
-
-    /**
-     * Get tooltip
-     *
-     * @return string
-     */
-    public function getTooltip() {
-        return $this->_tooltip;
-    }
-
-    /**
-     * Set tooltip
-     *
-     * @param  string    $value
-     * @return PHPExcel_Cell_Hyperlink
-     */
-    public function setTooltip($value = '') {
-        $this->_tooltip = $value;
-        return $this;
-    }
-
-    /**
-     * Is this hyperlink internal? (to another worksheet)
-     *
-     * @return boolean
-     */
-    public function isInternal() {
-        return strpos($this->_url, 'sheet://') !== false;
-    }
-
-    /**
-     * Get hash code
-     *
-     * @return string    Hash code
-     */
-    public function getHashCode() {
-        return md5(
-              $this->_url
-            . $this->_tooltip
-            . __CLASS__
-        );
-    }
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/IValueBinder.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/IValueBinder.php
deleted file mode 100644
index 551815523e6..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/IValueBinder.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Cell_IValueBinder
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-interface PHPExcel_Cell_IValueBinder
-{
-    /**
-     * Bind value to a cell
-     *
-     * @param  PHPExcel_Cell $cell    Cell to bind value to
-     * @param  mixed $value           Value to bind in cell
-     * @return boolean
-     */
-    public function bindValue(PHPExcel_Cell $cell, $value = NULL);
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart.php
deleted file mode 100644
index 9bf72dbbd4f..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart.php
+++ /dev/null
@@ -1,635 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Chart
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Chart
-{
-	/**
-	 * Chart Name
-	 *
-	 * @var string
-	 */
-	private $_name = '';
-
-	/**
-	 * Worksheet
-	 *
-	 * @var PHPExcel_Worksheet
-	 */
-	private $_worksheet = null;
-
-	/**
-	 * Chart Title
-	 *
-	 * @var PHPExcel_Chart_Title
-	 */
-	private $_title = null;
-
-	/**
-	 * Chart Legend
-	 *
-	 * @var PHPExcel_Chart_Legend
-	 */
-	private $_legend = null;
-
-	/**
-	 * X-Axis Label
-	 *
-	 * @var PHPExcel_Chart_Title
-	 */
-	private $_xAxisLabel = null;
-
-	/**
-	 * Y-Axis Label
-	 *
-	 * @var PHPExcel_Chart_Title
-	 */
-	private $_yAxisLabel = null;
-
-	/**
-	 * Chart Plot Area
-	 *
-	 * @var PHPExcel_Chart_PlotArea
-	 */
-	private $_plotArea = null;
-
-	/**
-	 * Plot Visible Only
-	 *
-	 * @var boolean
-	 */
-	private $_plotVisibleOnly = true;
-
-	/**
-	 * Display Blanks as
-	 *
-	 * @var string
-	 */
-	private $_displayBlanksAs = '0';
-
-  /**
-   * Chart Asix Y as
-   *
-   * @var PHPExcel_Chart_Axis
-   */
-  private $_yAxis = null;
-
-  /**
-   * Chart Asix X as
-   *
-   * @var PHPExcel_Chart_Axis
-   */
-  private $_xAxis = null;
-
-  /**
-   * Chart Major Gridlines as
-   *
-   * @var PHPExcel_Chart_GridLines
-   */
-  private $_majorGridlines = null;
-
-  /**
-   * Chart Minor Gridlines as
-   *
-   * @var PHPExcel_Chart_GridLines
-   */
-  private $_minorGridlines = null;
-
-	/**
-	 * Top-Left Cell Position
-	 *
-	 * @var string
-	 */
-	private $_topLeftCellRef = 'A1';
-
-
-	/**
-	 * Top-Left X-Offset
-	 *
-	 * @var integer
-	 */
-	private $_topLeftXOffset = 0;
-
-
-	/**
-	 * Top-Left Y-Offset
-	 *
-	 * @var integer
-	 */
-	private $_topLeftYOffset = 0;
-
-
-	/**
-	 * Bottom-Right Cell Position
-	 *
-	 * @var string
-	 */
-	private $_bottomRightCellRef = 'A1';
-
-
-	/**
-	 * Bottom-Right X-Offset
-	 *
-	 * @var integer
-	 */
-	private $_bottomRightXOffset = 10;
-
-
-	/**
-	 * Bottom-Right Y-Offset
-	 *
-	 * @var integer
-	 */
-	private $_bottomRightYOffset = 10;
-
-
-	/**
-	 * Create a new PHPExcel_Chart
-	 */
-	public function __construct($name, PHPExcel_Chart_Title $title = null, PHPExcel_Chart_Legend $legend = null, PHPExcel_Chart_PlotArea $plotArea = null, $plotVisibleOnly = true, $displayBlanksAs = '0', PHPExcel_Chart_Title $xAxisLabel = null, PHPExcel_Chart_Title $yAxisLabel = null, PHPExcel_Chart_Axis $xAxis = null, PHPExcel_Chart_Axis $yAxis = null, PHPExcel_Chart_GridLines $majorGridlines = null, PHPExcel_Chart_GridLines $minorGridlines = null)
-	{
-		$this->_name = $name;
-		$this->_title = $title;
-		$this->_legend = $legend;
-		$this->_xAxisLabel = $xAxisLabel;
-		$this->_yAxisLabel = $yAxisLabel;
-		$this->_plotArea = $plotArea;
-		$this->_plotVisibleOnly = $plotVisibleOnly;
-		$this->_displayBlanksAs = $displayBlanksAs;
-		$this->_xAxis = $xAxis;
-		$this->_yAxis = $yAxis;
-    $this->_majorGridlines = $majorGridlines;
-    $this->_minorGridlines = $minorGridlines;
-	}
-
-	/**
-	 * Get Name
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return $this->_name;
-	}
-
-	/**
-	 * Get Worksheet
-	 *
-	 * @return PHPExcel_Worksheet
-	 */
-	public function getWorksheet() {
-		return $this->_worksheet;
-	}
-
-	/**
-	 * Set Worksheet
-	 *
-	 * @param	PHPExcel_Worksheet	$pValue
-	 * @throws	PHPExcel_Chart_Exception
-	 * @return PHPExcel_Chart
-	 */
-	public function setWorksheet(PHPExcel_Worksheet $pValue = null) {
-		$this->_worksheet = $pValue;
-
-		return $this;
-	}
-
-	/**
-	 * Get Title
-	 *
-	 * @return PHPExcel_Chart_Title
-	 */
-	public function getTitle() {
-		return $this->_title;
-	}
-
-	/**
-	 * Set Title
-	 *
-	 * @param	PHPExcel_Chart_Title $title
-	 * @return	PHPExcel_Chart
-	 */
-	public function setTitle(PHPExcel_Chart_Title $title) {
-		$this->_title = $title;
-
-		return $this;
-	}
-
-	/**
-	 * Get Legend
-	 *
-	 * @return PHPExcel_Chart_Legend
-	 */
-	public function getLegend() {
-		return $this->_legend;
-	}
-
-	/**
-	 * Set Legend
-	 *
-	 * @param	PHPExcel_Chart_Legend $legend
-	 * @return	PHPExcel_Chart
-	 */
-	public function setLegend(PHPExcel_Chart_Legend $legend) {
-		$this->_legend = $legend;
-
-		return $this;
-	}
-
-	/**
-	 * Get X-Axis Label
-	 *
-	 * @return PHPExcel_Chart_Title
-	 */
-	public function getXAxisLabel() {
-		return $this->_xAxisLabel;
-	}
-
-	/**
-	 * Set X-Axis Label
-	 *
-	 * @param	PHPExcel_Chart_Title $label
-	 * @return	PHPExcel_Chart
-	 */
-	public function setXAxisLabel(PHPExcel_Chart_Title $label) {
-		$this->_xAxisLabel = $label;
-
-		return $this;
-	}
-
-	/**
-	 * Get Y-Axis Label
-	 *
-	 * @return PHPExcel_Chart_Title
-	 */
-	public function getYAxisLabel() {
-		return $this->_yAxisLabel;
-	}
-
-	/**
-	 * Set Y-Axis Label
-	 *
-	 * @param	PHPExcel_Chart_Title $label
-	 * @return	PHPExcel_Chart
-	 */
-	public function setYAxisLabel(PHPExcel_Chart_Title $label) {
-		$this->_yAxisLabel = $label;
-
-		return $this;
-	}
-
-	/**
-	 * Get Plot Area
-	 *
-	 * @return PHPExcel_Chart_PlotArea
-	 */
-	public function getPlotArea() {
-		return $this->_plotArea;
-	}
-
-	/**
-	 * Get Plot Visible Only
-	 *
-	 * @return boolean
-	 */
-	public function getPlotVisibleOnly() {
-		return $this->_plotVisibleOnly;
-	}
-
-	/**
-	 * Set Plot Visible Only
-	 *
-	 * @param boolean $plotVisibleOnly
-	 * @return PHPExcel_Chart
-	 */
-	public function setPlotVisibleOnly($plotVisibleOnly = true) {
-		$this->_plotVisibleOnly = $plotVisibleOnly;
-
-		return $this;
-	}
-
-	/**
-	 * Get Display Blanks as
-	 *
-	 * @return string
-	 */
-	public function getDisplayBlanksAs() {
-		return $this->_displayBlanksAs;
-	}
-
-	/**
-	 * Set Display Blanks as
-	 *
-	 * @param string $displayBlanksAs
-	 * @return PHPExcel_Chart
-	 */
-	public function setDisplayBlanksAs($displayBlanksAs = '0') {
-		$this->_displayBlanksAs = $displayBlanksAs;
-	}
-
-
-  /**
-   * Get yAxis
-   *
-   * @return PHPExcel_Chart_Axis
-   */
-  public function getChartAxisY() {
-    if($this->_yAxis !== NULL){
-      return $this->_yAxis;
-    }
-
-    return new PHPExcel_Chart_Axis();
-  }
-
-  /**
-   * Get xAxis
-   *
-   * @return PHPExcel_Chart_Axis
-   */
-  public function getChartAxisX() {
-    if($this->_xAxis !== NULL){
-      return $this->_xAxis;
-    }
-
-    return new PHPExcel_Chart_Axis();
-  }
-
-  /**
-   * Get Major Gridlines
-   *
-   * @return PHPExcel_Chart_GridLines
-   */
-  public function getMajorGridlines() {
-    if($this->_majorGridlines !== NULL){
-      return $this->_majorGridlines;
-    }
-
-    return new PHPExcel_Chart_GridLines();
-  }
-
-  /**
-   * Get Minor Gridlines
-   *
-   * @return PHPExcel_Chart_GridLines
-   */
-  public function getMinorGridlines() {
-    if($this->_minorGridlines !== NULL){
-      return $this->_minorGridlines;
-    }
-
-    return new PHPExcel_Chart_GridLines();
-  }
-
-
-	/**
-	 * Set the Top Left position for the chart
-	 *
-	 * @param	string	$cell
-	 * @param	integer	$xOffset
-	 * @param	integer	$yOffset
-	 * @return PHPExcel_Chart
-	 */
-	public function setTopLeftPosition($cell, $xOffset=null, $yOffset=null) {
-		$this->_topLeftCellRef = $cell;
-		if (!is_null($xOffset))
-			$this->setTopLeftXOffset($xOffset);
-		if (!is_null($yOffset))
-			$this->setTopLeftYOffset($yOffset);
-
-		return $this;
-	}
-
-	/**
-	 * Get the top left position of the chart
-	 *
-	 * @return array	an associative array containing the cell address, X-Offset and Y-Offset from the top left of that cell
-	 */
-	public function getTopLeftPosition() {
-		return array( 'cell'	=> $this->_topLeftCellRef,
-					  'xOffset'	=> $this->_topLeftXOffset,
-					  'yOffset'	=> $this->_topLeftYOffset
-					);
-	}
-
-	/**
-	 * Get the cell address where the top left of the chart is fixed
-	 *
-	 * @return string
-	 */
-	public function getTopLeftCell() {
-		return $this->_topLeftCellRef;
-	}
-
-	/**
-	 * Set the Top Left cell position for the chart
-	 *
-	 * @param	string	$cell
-	 * @return PHPExcel_Chart
-	 */
-	public function setTopLeftCell($cell) {
-		$this->_topLeftCellRef = $cell;
-
-		return $this;
-	}
-
-	/**
-	 * Set the offset position within the Top Left cell for the chart
-	 *
-	 * @param	integer	$xOffset
-	 * @param	integer	$yOffset
-	 * @return PHPExcel_Chart
-	 */
-	public function setTopLeftOffset($xOffset=null,$yOffset=null) {
-		if (!is_null($xOffset))
-			$this->setTopLeftXOffset($xOffset);
-		if (!is_null($yOffset))
-			$this->setTopLeftYOffset($yOffset);
-
-		return $this;
-	}
-
-	/**
-	 * Get the offset position within the Top Left cell for the chart
-	 *
-	 * @return integer[]
-	 */
-	public function getTopLeftOffset() {
-		return array( 'X' => $this->_topLeftXOffset,
-					  'Y' => $this->_topLeftYOffset
-					);
-	}
-
-	public function setTopLeftXOffset($xOffset) {
-		$this->_topLeftXOffset = $xOffset;
-
-		return $this;
-	}
-
-	public function getTopLeftXOffset() {
-		return $this->_topLeftXOffset;
-	}
-
-	public function setTopLeftYOffset($yOffset) {
-		$this->_topLeftYOffset = $yOffset;
-
-		return $this;
-	}
-
-	public function getTopLeftYOffset() {
-		return $this->_topLeftYOffset;
-	}
-
-	/**
-	 * Set the Bottom Right position of the chart
-	 *
-	 * @param	string	$cell
-	 * @param	integer	$xOffset
-	 * @param	integer	$yOffset
-	 * @return PHPExcel_Chart
-	 */
-	public function setBottomRightPosition($cell, $xOffset=null, $yOffset=null) {
-		$this->_bottomRightCellRef = $cell;
-		if (!is_null($xOffset))
-			$this->setBottomRightXOffset($xOffset);
-		if (!is_null($yOffset))
-			$this->setBottomRightYOffset($yOffset);
-
-		return $this;
-	}
-
-	/**
-	 * Get the bottom right position of the chart
-	 *
-	 * @return array	an associative array containing the cell address, X-Offset and Y-Offset from the top left of that cell
-	 */
-	public function getBottomRightPosition() {
-		return array( 'cell'	=> $this->_bottomRightCellRef,
-					  'xOffset'	=> $this->_bottomRightXOffset,
-					  'yOffset'	=> $this->_bottomRightYOffset
-					);
-	}
-
-	public function setBottomRightCell($cell) {
-		$this->_bottomRightCellRef = $cell;
-
-		return $this;
-	}
-
-	/**
-	 * Get the cell address where the bottom right of the chart is fixed
-	 *
-	 * @return string
-	 */
-	public function getBottomRightCell() {
-		return $this->_bottomRightCellRef;
-	}
-
-	/**
-	 * Set the offset position within the Bottom Right cell for the chart
-	 *
-	 * @param	integer	$xOffset
-	 * @param	integer	$yOffset
-	 * @return PHPExcel_Chart
-	 */
-	public function setBottomRightOffset($xOffset=null,$yOffset=null) {
-		if (!is_null($xOffset))
-			$this->setBottomRightXOffset($xOffset);
-		if (!is_null($yOffset))
-			$this->setBottomRightYOffset($yOffset);
-
-		return $this;
-	}
-
-	/**
-	 * Get the offset position within the Bottom Right cell for the chart
-	 *
-	 * @return integer[]
-	 */
-	public function getBottomRightOffset() {
-		return array( 'X' => $this->_bottomRightXOffset,
-					  'Y' => $this->_bottomRightYOffset
-					);
-	}
-
-	public function setBottomRightXOffset($xOffset) {
-		$this->_bottomRightXOffset = $xOffset;
-
-		return $this;
-	}
-
-	public function getBottomRightXOffset() {
-		return $this->_bottomRightXOffset;
-	}
-
-	public function setBottomRightYOffset($yOffset) {
-		$this->_bottomRightYOffset = $yOffset;
-
-		return $this;
-	}
-
-	public function getBottomRightYOffset() {
-		return $this->_bottomRightYOffset;
-	}
-
-
-	public function refresh() {
-		if ($this->_worksheet !== NULL) {
-			$this->_plotArea->refresh($this->_worksheet);
-		}
-	}
-
-	public function render($outputDestination = null) {
-		$libraryName = PHPExcel_Settings::getChartRendererName();
-		if (is_null($libraryName)) {
-			return false;
-		}
-		//	Ensure that data series values are up-to-date before we render
-		$this->refresh();
-
-		$libraryPath = PHPExcel_Settings::getChartRendererPath();
-		$includePath = str_replace('\\','/',get_include_path());
-		$rendererPath = str_replace('\\','/',$libraryPath);
-		if (strpos($rendererPath,$includePath) === false) {
-			set_include_path(get_include_path() . PATH_SEPARATOR . $libraryPath);
-		}
-
-		$rendererName = 'PHPExcel_Chart_Renderer_'.$libraryName;
-		$renderer = new $rendererName($this);
-
-		if ($outputDestination == 'php://output') {
-			$outputDestination = null;
-		}
-		return $renderer->render($outputDestination);
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Axis.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Axis.php
deleted file mode 100644
index efb39e9f410..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Axis.php
+++ /dev/null
@@ -1,584 +0,0 @@
-<?php
-require_once 'Properties.php';
-
-/**
- * Created by PhpStorm.
- * User: Wiktor Trzonkowski
- * Date: 6/17/14
- * Time: 12:11 PM
- */
-
-class PHPExcel_Chart_Axis extends
-  PHPExcel_Properties {
-
-  /**
-   * Axis Number
-   *
-   * @var  array of mixed
-   */
-
-  private
-      $_axis_number = array(
-      'format' => self::FORMAT_CODE_GENERAL,
-      'source_linked' => 1
-  );
-
-  /**
-   * Axis Options
-   *
-   * @var  array of mixed
-   */
-
-  private $_axis_options = array(
-      'minimum' => NULL,
-      'maximum' => NULL,
-      'major_unit' => NULL,
-      'minor_unit' => NULL,
-      'orientation' => self::ORIENTATION_NORMAL,
-      'minor_tick_mark' => self::TICK_MARK_NONE,
-      'major_tick_mark' => self::TICK_MARK_NONE,
-      'axis_labels' => self::AXIS_LABELS_NEXT_TO,
-      'horizontal_crosses' => self::HORIZONTAL_CROSSES_AUTOZERO,
-      'horizontal_crosses_value' => NULL
-  );
-
-  /**
-   * Fill Properties
-   *
-   * @var  array of mixed
-   */
-
-  private $_fill_properties = array(
-      'type' => self::EXCEL_COLOR_TYPE_ARGB,
-      'value' => NULL,
-      'alpha' => 0
-  );
-
-  /**
-   * Line Properties
-   *
-   * @var  array of mixed
-   */
-
-  private $_line_properties = array(
-      'type' => self::EXCEL_COLOR_TYPE_ARGB,
-      'value' => NULL,
-      'alpha' => 0
-  );
-
-  /**
-   * Line Style Properties
-   *
-   * @var  array of mixed
-   */
-
-  private $_line_style_properties = array(
-      'width' => '9525',
-      'compound' => self::LINE_STYLE_COMPOUND_SIMPLE,
-      'dash' => self::LINE_STYLE_DASH_SOLID,
-      'cap' => self::LINE_STYLE_CAP_FLAT,
-      'join' => self::LINE_STYLE_JOIN_BEVEL,
-      'arrow' => array(
-          'head' => array(
-              'type' => self::LINE_STYLE_ARROW_TYPE_NOARROW,
-              'size' => self::LINE_STYLE_ARROW_SIZE_5
-          ),
-          'end' => array(
-              'type' => self::LINE_STYLE_ARROW_TYPE_NOARROW,
-              'size' => self::LINE_STYLE_ARROW_SIZE_8
-          ),
-      )
-  );
-
-  /**
-   * Shadow Properties
-   *
-   * @var  array of mixed
-   */
-
-  private $_shadow_properties = array(
-      'presets' => self::SHADOW_PRESETS_NOSHADOW,
-      'effect' => NULL,
-      'color' => array(
-          'type' => self::EXCEL_COLOR_TYPE_STANDARD,
-          'value' => 'black',
-          'alpha' => 40,
-      ),
-      'size' => array(
-          'sx' => NULL,
-          'sy' => NULL,
-          'kx' => NULL
-      ),
-      'blur' => NULL,
-      'direction' => NULL,
-      'distance' => NULL,
-      'algn' => NULL,
-      'rotWithShape' => NULL
-  );
-
-  /**
-   * Glow Properties
-   *
-   * @var  array of mixed
-   */
-
-  private $_glow_properties = array(
-      'size' => NULL,
-      'color' => array(
-          'type' => self::EXCEL_COLOR_TYPE_STANDARD,
-          'value' => 'black',
-          'alpha' => 40
-      )
-  );
-
-  /**
-   * Soft Edge Properties
-   *
-   * @var  array of mixed
-   */
-
-  private $_soft_edges = array(
-      'size' => NULL
-  );
-
-  /**
-   * Get Series Data Type
-   *
-   * @return  string
-   */
-
-  public function setAxisNumberProperties($format_code) {
-    $this->_axis_number['format'] = (string) $format_code;
-    $this->_axis_number['source_linked'] = 0;
-  }
-
-  /**
-   * Get Axis Number Format Data Type
-   *
-   * @return  string
-   */
-
-  public function getAxisNumberFormat() {
-    return $this->_axis_number['format'];
-  }
-
-  /**
-   * Get Axis Number Source Linked
-   *
-   * @return  string
-   */
-
-  public function getAxisNumberSourceLinked() {
-    return (string) $this->_axis_number['source_linked'];
-  }
-
-  /**
-   * Set Axis Options Properties
-   *
-   * @param string $axis_labels
-   * @param string $horizontal_crosses_value
-   * @param string $horizontal_crosses
-   * @param string $axis_orientation
-   * @param string $major_tmt
-   * @param string $minor_tmt
-   * @param string $minimum
-   * @param string $maximum
-   * @param string $major_unit
-   * @param string $minor_unit
-   *
-   */
-
-  public function setAxisOptionsProperties($axis_labels, $horizontal_crosses_value = NULL, $horizontal_crosses = NULL,
-      $axis_orientation = NULL, $major_tmt = NULL, $minor_tmt = NULL, $minimum = NULL, $maximum = NULL, $major_unit = NULL,
-      $minor_unit = NULL) {
-
-    $this->_axis_options['axis_labels'] = (string) $axis_labels;
-    ($horizontal_crosses_value !== NULL)
-        ? $this->_axis_options['horizontal_crosses_value'] = (string) $horizontal_crosses_value : NULL;
-    ($horizontal_crosses !== NULL) ? $this->_axis_options['horizontal_crosses'] = (string) $horizontal_crosses : NULL;
-    ($axis_orientation !== NULL) ? $this->_axis_options['orientation'] = (string) $axis_orientation : NULL;
-    ($major_tmt !== NULL) ? $this->_axis_options['major_tick_mark'] = (string) $major_tmt : NULL;
-    ($minor_tmt !== NULL) ? $this->_axis_options['minor_tick_mark'] = (string) $minor_tmt : NULL;
-    ($minor_tmt !== NULL) ? $this->_axis_options['minor_tick_mark'] = (string) $minor_tmt : NULL;
-    ($minimum !== NULL) ? $this->_axis_options['minimum'] = (string) $minimum : NULL;
-    ($maximum !== NULL) ? $this->_axis_options['maximum'] = (string) $maximum : NULL;
-    ($major_unit !== NULL) ? $this->_axis_options['major_unit'] = (string) $major_unit : NULL;
-    ($minor_unit !== NULL) ? $this->_axis_options['minor_unit'] = (string) $minor_unit : NULL;
-  }
-
-  /**
-   * Get Axis Options Property
-   *
-   * @param string $property
-   *
-   * @return string
-   */
-
-  public function getAxisOptionsProperty($property) {
-    return $this->_axis_options[$property];
-  }
-
-  /**
-   * Set Axis Orientation Property
-   *
-   * @param string $orientation
-   *
-   */
-
-  public function setAxisOrientation($orientation) {
-    $this->orientation = (string) $orientation;
-  }
-
-  /**
-   * Set Fill Property
-   *
-   * @param string $color
-   * @param int $alpha
-   * @param string $type
-   *
-   */
-
-  public function setFillParameters($color, $alpha = 0, $type = self::EXCEL_COLOR_TYPE_ARGB) {
-    $this->_fill_properties = $this->setColorProperties($color, $alpha, $type);
-  }
-
-  /**
-   * Set Line Property
-   *
-   * @param string $color
-   * @param int $alpha
-   * @param string $type
-   *
-   */
-
-  public function setLineParameters($color, $alpha = 0, $type = self::EXCEL_COLOR_TYPE_ARGB) {
-    $this->_line_properties = $this->setColorProperties($color, $alpha, $type);
-  }
-
-  /**
-   * Get Fill Property
-   *
-   * @param string $property
-   *
-   * @return string
-   */
-
-  public function getFillProperty($property) {
-    return $this->_fill_properties[$property];
-  }
-
-  /**
-   * Get Line Property
-   *
-   * @param string $property
-   *
-   * @return string
-   */
-
-  public function getLineProperty($property) {
-    return $this->_line_properties[$property];
-  }
-
-  /**
-   * Set Line Style Properties
-   *
-   * @param float $line_width
-   * @param string $compound_type
-   * @param string $dash_type
-   * @param string $cap_type
-   * @param string $join_type
-   * @param string $head_arrow_type
-   * @param string $head_arrow_size
-   * @param string $end_arrow_type
-   * @param string $end_arrow_size
-   *
-   */
-
-  public function setLineStyleProperties($line_width = NULL, $compound_type = NULL,
-      $dash_type = NULL, $cap_type = NULL, $join_type = NULL, $head_arrow_type = NULL,
-      $head_arrow_size = NULL, $end_arrow_type = NULL, $end_arrow_size = NULL) {
-
-    (!is_null($line_width)) ? $this->_line_style_properties['width'] = $this->getExcelPointsWidth((float) $line_width)
-        : NULL;
-    (!is_null($compound_type)) ? $this->_line_style_properties['compound'] = (string) $compound_type : NULL;
-    (!is_null($dash_type)) ? $this->_line_style_properties['dash'] = (string) $dash_type : NULL;
-    (!is_null($cap_type)) ? $this->_line_style_properties['cap'] = (string) $cap_type : NULL;
-    (!is_null($join_type)) ? $this->_line_style_properties['join'] = (string) $join_type : NULL;
-    (!is_null($head_arrow_type)) ? $this->_line_style_properties['arrow']['head']['type'] = (string) $head_arrow_type
-        : NULL;
-    (!is_null($head_arrow_size)) ? $this->_line_style_properties['arrow']['head']['size'] = (string) $head_arrow_size
-        : NULL;
-    (!is_null($end_arrow_type)) ? $this->_line_style_properties['arrow']['end']['type'] = (string) $end_arrow_type
-        : NULL;
-    (!is_null($end_arrow_size)) ? $this->_line_style_properties['arrow']['end']['size'] = (string) $end_arrow_size
-        : NULL;
-  }
-
-  /**
-   * Get Line Style Property
-   *
-   * @param array|string $elements
-   *
-   * @return string
-   */
-
-  public function getLineStyleProperty($elements) {
-    return $this->getArrayElementsValue($this->_line_style_properties, $elements);
-  }
-
-  /**
-   * Get Line Style Arrow Excel Width
-   *
-   * @param string $arrow
-   *
-   * @return string
-   */
-
-  public function getLineStyleArrowWidth($arrow) {
-    return $this->getLineStyleArrowSize($this->_line_style_properties['arrow'][$arrow]['size'], 'w');
-  }
-
-  /**
-   * Get Line Style Arrow Excel Length
-   *
-   * @param string $arrow
-   *
-   * @return string
-   */
-
-  public function getLineStyleArrowLength($arrow) {
-    return $this->getLineStyleArrowSize($this->_line_style_properties['arrow'][$arrow]['size'], 'len');
-  }
-
-  /**
-   * Set Shadow Properties
-   *
-   * @param int $shadow_presets
-   * @param string $sh_color_value
-   * @param string $sh_color_type
-   * @param string $sh_color_alpha
-   * @param float $sh_blur
-   * @param int $sh_angle
-   * @param float $sh_distance
-   *
-   */
-
-  public function setShadowProperties($sh_presets, $sh_color_value = NULL, $sh_color_type = NULL, $sh_color_alpha = NULL, $sh_blur = NULL, $sh_angle = NULL, $sh_distance = NULL) {
-    $this
-        ->_setShadowPresetsProperties((int) $sh_presets)
-        ->_setShadowColor(
-            is_null($sh_color_value) ? $this->_shadow_properties['color']['value'] : $sh_color_value
-            , is_null($sh_color_alpha) ? (int) $this->_shadow_properties['color']['alpha'] : $sh_color_alpha
-            , is_null($sh_color_type) ? $this->_shadow_properties['color']['type'] : $sh_color_type)
-        ->_setShadowBlur($sh_blur)
-        ->_setShadowAngle($sh_angle)
-        ->_setShadowDistance($sh_distance);
-  }
-
-  /**
-   * Set Shadow Color
-   *
-   * @param int $shadow_presets
-   *
-   * @return PHPExcel_Chart_Axis
-   */
-
-  private function _setShadowPresetsProperties($shadow_presets) {
-    $this->_shadow_properties['presets'] = $shadow_presets;
-    $this->_setShadowProperiesMapValues($this->getShadowPresetsMap($shadow_presets));
-
-    return $this;
-  }
-
-  /**
-   * Set Shadow Properties from Maped Values
-   *
-   * @param array $properties_map
-   * @param * $reference
-   *
-   * @return PHPExcel_Chart_Axis
-   */
-
-  private function _setShadowProperiesMapValues(array $properties_map, &$reference = NULL) {
-    $base_reference = $reference;
-    foreach ($properties_map as $property_key => $property_val) {
-      if (is_array($property_val)) {
-        if ($reference === NULL) {
-          $reference = & $this->_shadow_properties[$property_key];
-        } else {
-          $reference = & $reference[$property_key];
-        }
-        $this->_setShadowProperiesMapValues($property_val, $reference);
-      } else {
-        if ($base_reference === NULL) {
-          $this->_shadow_properties[$property_key] = $property_val;
-        } else {
-          $reference[$property_key] = $property_val;
-        }
-      }
-    }
-
-    return $this;
-  }
-
-  /**
-   * Set Shadow Color
-   *
-   * @param string $color
-   * @param int $alpha
-   * @param string $type
-   *
-   * @return PHPExcel_Chart_Axis
-   */
-
-  private function _setShadowColor($color, $alpha, $type) {
-    $this->_shadow_properties['color'] = $this->setColorProperties($color, $alpha, $type);
-
-    return $this;
-  }
-
-  /**
-   * Set Shadow Blur
-   *
-   * @param float $blur
-   *
-   * @return PHPExcel_Chart_Axis
-   */
-
-  private function _setShadowBlur($blur) {
-    if ($blur !== NULL) {
-      $this->_shadow_properties['blur'] = (string) $this->getExcelPointsWidth($blur);
-    }
-
-    return $this;
-  }
-
-  /**
-   * Set Shadow Angle
-   *
-   * @param int $angle
-   *
-   * @return PHPExcel_Chart_Axis
-   */
-
-  private function _setShadowAngle($angle) {
-    if ($angle !== NULL) {
-      $this->_shadow_properties['direction'] = (string) $this->getExcelPointsAngle($angle);
-    }
-
-    return $this;
-  }
-
-  /**
-   * Set Shadow Distance
-   *
-   * @param float $distance
-   *
-   * @return PHPExcel_Chart_Axis
-   */
-
-  private function _setShadowDistance($distance) {
-    if ($distance !== NULL) {
-      $this->_shadow_properties['distance'] = (string) $this->getExcelPointsWidth($distance);
-    }
-
-    return $this;
-  }
-
-  /**
-   * Get Glow Property
-   *
-   * @param float $size
-   * @param string $color_value
-   * @param int $color_alpha
-   * @param string $color_type
-   */
-
-  public function getShadowProperty($elements) {
-    return $this->getArrayElementsValue($this->_shadow_properties, $elements);
-  }
-
-  /**
-   * Set Glow Properties
-   *
-   * @param float $size
-   * @param string $color_value
-   * @param int $color_alpha
-   * @param string $color_type
-   */
-
-  public function setGlowProperties($size, $color_value = NULL, $color_alpha = NULL, $color_type = NULL) {
-    $this
-        ->_setGlowSize($size)
-        ->_setGlowColor(
-            is_null($color_value) ? $this->_glow_properties['color']['value'] : $color_value
-            , is_null($color_alpha) ? (int) $this->_glow_properties['color']['alpha'] : $color_alpha
-            , is_null($color_type) ? $this->_glow_properties['color']['type'] : $color_type);
-  }
-
-  /**
-   * Get Glow Property
-   *
-   * @param array|string $property
-   *
-   * @return string
-   */
-
-  public function getGlowProperty($property) {
-    return $this->getArrayElementsValue($this->_glow_properties, $property);
-  }
-
-  /**
-   * Set Glow Color
-   *
-   * @param float $size
-   *
-   * @return PHPExcel_Chart_Axis
-   */
-
-  private function _setGlowSize($size) {
-    if (!is_null($size)) {
-      $this->_glow_properties['size'] = $this->getExcelPointsWidth($size);
-    }
-
-    return $this;
-  }
-
-  /**
-   * Set Glow Color
-   *
-   * @param string $color
-   * @param int $alpha
-   * @param string $type
-   *
-   * @return PHPExcel_Chart_Axis
-   */
-
-  private function _setGlowColor($color, $alpha, $type) {
-    $this->_glow_properties['color'] = $this->setColorProperties($color, $alpha, $type);
-
-    return $this;
-  }
-
-  /**
-   * Set Soft Edges Size
-   *
-   * @param float $size
-   */
-
-  public function setSoftEdges($size) {
-    if (!is_null($size)) {
-      $_soft_edges['size'] = (string) $this->getExcelPointsWidth($size);
-    }
-  }
-
-  /**
-   * Get Soft Edges Size
-   *
-   * @return string
-   */
-
-  public function getSoftEdgesSize() {
-    return $this->_soft_edges['size'];
-  }
-}
\ No newline at end of file
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeries.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeries.php
deleted file mode 100644
index 56faf6ee00e..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeries.php
+++ /dev/null
@@ -1,370 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Chart_DataSeries
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Chart_DataSeries
-{
-
-	const TYPE_BARCHART			= 'barChart';
-	const TYPE_BARCHART_3D		= 'bar3DChart';
-	const TYPE_LINECHART		= 'lineChart';
-	const TYPE_LINECHART_3D		= 'line3DChart';
-	const TYPE_AREACHART		= 'areaChart';
-	const TYPE_AREACHART_3D		= 'area3DChart';
-	const TYPE_PIECHART			= 'pieChart';
-	const TYPE_PIECHART_3D		= 'pie3DChart';
-	const TYPE_DOUGHTNUTCHART	= 'doughnutChart';
-	const TYPE_DONUTCHART		= self::TYPE_DOUGHTNUTCHART;	//	Synonym
-	const TYPE_SCATTERCHART		= 'scatterChart';
-	const TYPE_SURFACECHART		= 'surfaceChart';
-	const TYPE_SURFACECHART_3D	= 'surface3DChart';
-	const TYPE_RADARCHART		= 'radarChart';
-	const TYPE_BUBBLECHART		= 'bubbleChart';
-	const TYPE_STOCKCHART		= 'stockChart';
-	const TYPE_CANDLECHART		= self::TYPE_STOCKCHART;	   //	Synonym
-
-	const GROUPING_CLUSTERED			= 'clustered';
-	const GROUPING_STACKED				= 'stacked';
-	const GROUPING_PERCENT_STACKED		= 'percentStacked';
-	const GROUPING_STANDARD				= 'standard';
-
-	const DIRECTION_BAR			= 'bar';
-	const DIRECTION_HORIZONTAL	= self::DIRECTION_BAR;
-	const DIRECTION_COL			= 'col';
-	const DIRECTION_COLUMN		= self::DIRECTION_COL;
-	const DIRECTION_VERTICAL	= self::DIRECTION_COL;
-
-	const STYLE_LINEMARKER		= 'lineMarker';
-	const STYLE_SMOOTHMARKER	= 'smoothMarker';
-	const STYLE_MARKER			= 'marker';
-	const STYLE_FILLED			= 'filled';
-
-
-	/**
-	 * Series Plot Type
-	 *
-	 * @var string
-	 */
-	private $_plotType = null;
-
-	/**
-	 * Plot Grouping Type
-	 *
-	 * @var boolean
-	 */
-	private $_plotGrouping = null;
-
-	/**
-	 * Plot Direction
-	 *
-	 * @var boolean
-	 */
-	private $_plotDirection = null;
-
-	/**
-	 * Plot Style
-	 *
-	 * @var string
-	 */
-	private $_plotStyle = null;
-
-	/**
-	 * Order of plots in Series
-	 *
-	 * @var array of integer
-	 */
-	private $_plotOrder = array();
-
-	/**
-	 * Plot Label
-	 *
-	 * @var array of PHPExcel_Chart_DataSeriesValues
-	 */
-	private $_plotLabel = array();
-
-	/**
-	 * Plot Category
-	 *
-	 * @var array of PHPExcel_Chart_DataSeriesValues
-	 */
-	private $_plotCategory = array();
-
-	/**
-	 * Smooth Line
-	 *
-	 * @var string
-	 */
-	private $_smoothLine = null;
-
-	/**
-	 * Plot Values
-	 *
-	 * @var array of PHPExcel_Chart_DataSeriesValues
-	 */
-	private $_plotValues = array();
-
-	/**
-	 * Create a new PHPExcel_Chart_DataSeries
-	 */
-	public function __construct($plotType = null, $plotGrouping = null, $plotOrder = array(), $plotLabel = array(), $plotCategory = array(), $plotValues = array(), $plotDirection = null, $smoothLine = null, $plotStyle = null)
-	{
-		$this->_plotType = $plotType;
-		$this->_plotGrouping = $plotGrouping;
-		$this->_plotOrder = $plotOrder;
-		$keys = array_keys($plotValues);
-		$this->_plotValues = $plotValues;
-		if ((count($plotLabel) == 0) || (is_null($plotLabel[$keys[0]]))) {
-			$plotLabel[$keys[0]] = new PHPExcel_Chart_DataSeriesValues();
-		}
-
-		$this->_plotLabel = $plotLabel;
-		if ((count($plotCategory) == 0) || (is_null($plotCategory[$keys[0]]))) {
-			$plotCategory[$keys[0]] = new PHPExcel_Chart_DataSeriesValues();
-		}
-		$this->_plotCategory = $plotCategory;
-		$this->_smoothLine = $smoothLine;
-		$this->_plotStyle = $plotStyle;
-		
-		if (is_null($plotDirection)) {
-			$plotDirection = self::DIRECTION_COL;
-		}
-		$this->_plotDirection = $plotDirection;
-	}
-
-	/**
-	 * Get Plot Type
-	 *
-	 * @return string
-	 */
-	public function getPlotType() {
-		return $this->_plotType;
-	}
-
-	/**
-	 * Set Plot Type
-	 *
-	 * @param string $plotType
-     * @return PHPExcel_Chart_DataSeries
-	 */
-	public function setPlotType($plotType = '') {
-		$this->_plotType = $plotType;
-        return $this;
-	}
-
-	/**
-	 * Get Plot Grouping Type
-	 *
-	 * @return string
-	 */
-	public function getPlotGrouping() {
-		return $this->_plotGrouping;
-	}
-
-	/**
-	 * Set Plot Grouping Type
-	 *
-	 * @param string $groupingType
-     * @return PHPExcel_Chart_DataSeries
-	 */
-	public function setPlotGrouping($groupingType = null) {
-		$this->_plotGrouping = $groupingType;
-        return $this;
-	}
-
-	/**
-	 * Get Plot Direction
-	 *
-	 * @return string
-	 */
-	public function getPlotDirection() {
-		return $this->_plotDirection;
-	}
-
-	/**
-	 * Set Plot Direction
-	 *
-	 * @param string $plotDirection
-     * @return PHPExcel_Chart_DataSeries
-	 */
-	public function setPlotDirection($plotDirection = null) {
-		$this->_plotDirection = $plotDirection;
-        return $this;
-	}
-
-	/**
-	 * Get Plot Order
-	 *
-	 * @return string
-	 */
-	public function getPlotOrder() {
-		return $this->_plotOrder;
-	}
-
-	/**
-	 * Get Plot Labels
-	 *
-	 * @return array of PHPExcel_Chart_DataSeriesValues
-	 */
-	public function getPlotLabels() {
-		return $this->_plotLabel;
-	}
-
-	/**
-	 * Get Plot Label by Index
-	 *
-	 * @return PHPExcel_Chart_DataSeriesValues
-	 */
-	public function getPlotLabelByIndex($index) {
-		$keys = array_keys($this->_plotLabel);
-		if (in_array($index,$keys)) {
-			return $this->_plotLabel[$index];
-		} elseif(isset($keys[$index])) {
-			return $this->_plotLabel[$keys[$index]];
-		}
-		return false;
-	}
-
-	/**
-	 * Get Plot Categories
-	 *
-	 * @return array of PHPExcel_Chart_DataSeriesValues
-	 */
-	public function getPlotCategories() {
-		return $this->_plotCategory;
-	}
-
-	/**
-	 * Get Plot Category by Index
-	 *
-	 * @return PHPExcel_Chart_DataSeriesValues
-	 */
-	public function getPlotCategoryByIndex($index) {
-		$keys = array_keys($this->_plotCategory);
-		if (in_array($index,$keys)) {
-			return $this->_plotCategory[$index];
-		} elseif(isset($keys[$index])) {
-			return $this->_plotCategory[$keys[$index]];
-		}
-		return false;
-	}
-
-	/**
-	 * Get Plot Style
-	 *
-	 * @return string
-	 */
-	public function getPlotStyle() {
-		return $this->_plotStyle;
-	}
-
-	/**
-	 * Set Plot Style
-	 *
-	 * @param string $plotStyle
-     * @return PHPExcel_Chart_DataSeries
-	 */
-	public function setPlotStyle($plotStyle = null) {
-		$this->_plotStyle = $plotStyle;
-        return $this;
-	}
-
-	/**
-	 * Get Plot Values
-	 *
-	 * @return array of PHPExcel_Chart_DataSeriesValues
-	 */
-	public function getPlotValues() {
-		return $this->_plotValues;
-	}
-
-	/**
-	 * Get Plot Values by Index
-	 *
-	 * @return PHPExcel_Chart_DataSeriesValues
-	 */
-	public function getPlotValuesByIndex($index) {
-		$keys = array_keys($this->_plotValues);
-		if (in_array($index,$keys)) {
-			return $this->_plotValues[$index];
-		} elseif(isset($keys[$index])) {
-			return $this->_plotValues[$keys[$index]];
-		}
-		return false;
-	}
-
-	/**
-	 * Get Number of Plot Series
-	 *
-	 * @return integer
-	 */
-	public function getPlotSeriesCount() {
-		return count($this->_plotValues);
-	}
-
-	/**
-	 * Get Smooth Line
-	 *
-	 * @return boolean
-	 */
-	public function getSmoothLine() {
-		return $this->_smoothLine;
-	}
-
-	/**
-	 * Set Smooth Line
-	 *
-	 * @param boolean $smoothLine
-     * @return PHPExcel_Chart_DataSeries
-	 */
-	public function setSmoothLine($smoothLine = TRUE) {
-		$this->_smoothLine = $smoothLine;
-        return $this;
-	}
-
-	public function refresh(PHPExcel_Worksheet $worksheet) {
-	    foreach($this->_plotValues as $plotValues) {
-			if ($plotValues !== NULL)
-				$plotValues->refresh($worksheet, TRUE);
-		}
-		foreach($this->_plotLabel as $plotValues) {
-			if ($plotValues !== NULL)
-				$plotValues->refresh($worksheet, TRUE);
-		}
-		foreach($this->_plotCategory as $plotValues) {
-			if ($plotValues !== NULL)
-				$plotValues->refresh($worksheet, FALSE);
-		}
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeriesValues.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeriesValues.php
deleted file mode 100644
index 731d2c92213..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeriesValues.php
+++ /dev/null
@@ -1,327 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Chart_DataSeriesValues
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Chart_DataSeriesValues
-{
-
-	const DATASERIES_TYPE_STRING	= 'String';
-	const DATASERIES_TYPE_NUMBER	= 'Number';
-
-	private static $_dataTypeValues = array(
-		self::DATASERIES_TYPE_STRING,
-		self::DATASERIES_TYPE_NUMBER,
-	);
-
-	/**
-	 * Series Data Type
-	 *
-	 * @var	string
-	 */
-	private $_dataType = null;
-
-	/**
-	 * Series Data Source
-	 *
-	 * @var	string
-	 */
-	private $_dataSource = null;
-
-	/**
-	 * Format Code
-	 *
-	 * @var	string
-	 */
-	private $_formatCode = null;
-
-	/**
-	 * Series Point Marker
-	 *
-	 * @var	string
-	 */
-	private $_marker = null;
-
-	/**
-	 * Point Count (The number of datapoints in the dataseries)
-	 *
-	 * @var	integer
-	 */
-	private $_pointCount = 0;
-
-	/**
-	 * Data Values
-	 *
-	 * @var	array of mixed
-	 */
-	private $_dataValues = array();
-
-	/**
-	 * Create a new PHPExcel_Chart_DataSeriesValues object
-	 */
-	public function __construct($dataType = self::DATASERIES_TYPE_NUMBER, $dataSource = null, $formatCode = null, $pointCount = 0, $dataValues = array(), $marker = null)
-	{
-		$this->setDataType($dataType);
-		$this->_dataSource = $dataSource;
-		$this->_formatCode = $formatCode;
-		$this->_pointCount = $pointCount;
-		$this->_dataValues = $dataValues;
-		$this->_marker = $marker;
-	}
-
-	/**
-	 * Get Series Data Type
-	 *
-	 * @return	string
-	 */
-	public function getDataType() {
-		return $this->_dataType;
-	}
-
-	/**
-	 * Set Series Data Type
-	 *
-	 * @param	string	$dataType	Datatype of this data series
-	 *								Typical values are:
-	 *									PHPExcel_Chart_DataSeriesValues::DATASERIES_TYPE_STRING
-	 *										Normally used for axis point values
-	 *									PHPExcel_Chart_DataSeriesValues::DATASERIES_TYPE_NUMBER
-	 *										Normally used for chart data values
-	 * @return	PHPExcel_Chart_DataSeriesValues
-	 */
-	public function setDataType($dataType = self::DATASERIES_TYPE_NUMBER) {
-		if (!in_array($dataType, self::$_dataTypeValues)) {
-    		throw new PHPExcel_Chart_Exception('Invalid datatype for chart data series values');
-		}
-		$this->_dataType = $dataType;
-
-		return $this;
-	}
-
-	/**
-	 * Get Series Data Source (formula)
-	 *
-	 * @return	string
-	 */
-	public function getDataSource() {
-		return $this->_dataSource;
-	}
-
-	/**
-	 * Set Series Data Source (formula)
-	 *
-	 * @param	string	$dataSource
-	 * @return	PHPExcel_Chart_DataSeriesValues
-	 */
-	public function setDataSource($dataSource = null, $refreshDataValues = true) {
-		$this->_dataSource = $dataSource;
-
-		if ($refreshDataValues) {
-			//	TO DO
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Get Point Marker
-	 *
-	 * @return string
-	 */
-	public function getPointMarker() {
-		return $this->_marker;
-	}
-
-	/**
-	 * Set Point Marker
-	 *
-	 * @param	string	$marker
-	 * @return	PHPExcel_Chart_DataSeriesValues
-	 */
-	public function setPointMarker($marker = null) {
-		$this->_marker = $marker;
-
-		return $this;
-	}
-
-	/**
-	 * Get Series Format Code
-	 *
-	 * @return	string
-	 */
-	public function getFormatCode() {
-		return $this->_formatCode;
-	}
-
-	/**
-	 * Set Series Format Code
-	 *
-	 * @param	string	$formatCode
-	 * @return	PHPExcel_Chart_DataSeriesValues
-	 */
-	public function setFormatCode($formatCode = null) {
-		$this->_formatCode = $formatCode;
-
-		return $this;
-	}
-
-	/**
-	 * Get Series Point Count
-	 *
-	 * @return	integer
-	 */
-	public function getPointCount() {
-		return $this->_pointCount;
-	}
-
-	/**
-	 * Identify if the Data Series is a multi-level or a simple series
-	 *
-	 * @return	boolean
-	 */
-	public function isMultiLevelSeries() {
-		if (count($this->_dataValues) > 0) {
-			return is_array($this->_dataValues[0]);
-		}
-		return null;
-	}
-
-	/**
-	 * Return the level count of a multi-level Data Series
-	 *
-	 * @return	boolean
-	 */
-	public function multiLevelCount() {
-		$levelCount = 0;
-		foreach($this->_dataValues as $dataValueSet) {
-			$levelCount = max($levelCount,count($dataValueSet));
-		}
-		return $levelCount;
-	}
-
-	/**
-	 * Get Series Data Values
-	 *
-	 * @return	array of mixed
-	 */
-	public function getDataValues() {
-		return $this->_dataValues;
-	}
-
-	/**
-	 * Get the first Series Data value
-	 *
-	 * @return	mixed
-	 */
-	public function getDataValue() {
-		$count = count($this->_dataValues);
-		if ($count == 0) {
-			return null;
-		} elseif ($count == 1) {
-			return $this->_dataValues[0];
-		}
-		return $this->_dataValues;
-	}
-
-	/**
-	 * Set Series Data Values
-	 *
-	 * @param	array	$dataValues
-	 * @param	boolean	$refreshDataSource
-	 *					TRUE - refresh the value of _dataSource based on the values of $dataValues
-	 *					FALSE - don't change the value of _dataSource
-	 * @return	PHPExcel_Chart_DataSeriesValues
-	 */
-	public function setDataValues($dataValues = array(), $refreshDataSource = TRUE) {
-		$this->_dataValues = PHPExcel_Calculation_Functions::flattenArray($dataValues);
-		$this->_pointCount = count($dataValues);
-
-		if ($refreshDataSource) {
-			//	TO DO
-		}
-
-		return $this;
-	}
-
-	private function _stripNulls($var) {
-		return $var !== NULL;
-	}
-
-	public function refresh(PHPExcel_Worksheet $worksheet, $flatten = TRUE) {
-        if ($this->_dataSource !== NULL) {
-        	$calcEngine = PHPExcel_Calculation::getInstance($worksheet->getParent());
-			$newDataValues = PHPExcel_Calculation::_unwrapResult(
-			    $calcEngine->_calculateFormulaValue(
-			        '='.$this->_dataSource,
-			        NULL,
-			        $worksheet->getCell('A1')
-			    )
-			);
-			if ($flatten) {
-				$this->_dataValues = PHPExcel_Calculation_Functions::flattenArray($newDataValues);
-				foreach($this->_dataValues as &$dataValue) {
-					if ((!empty($dataValue)) && ($dataValue[0] == '#')) {
-						$dataValue = 0.0;
-					}
-				}
-				unset($dataValue);
-			} else {
-				$cellRange = explode('!',$this->_dataSource);
-				if (count($cellRange) > 1) {
-					list(,$cellRange) = $cellRange;
-				}
-
-				$dimensions = PHPExcel_Cell::rangeDimension(str_replace('$','',$cellRange));
-				if (($dimensions[0] == 1) || ($dimensions[1] == 1)) {
-					$this->_dataValues = PHPExcel_Calculation_Functions::flattenArray($newDataValues);
-				} else {
-					$newArray = array_values(array_shift($newDataValues));
-					foreach($newArray as $i => $newDataSet) {
-						$newArray[$i] = array($newDataSet);
-					}
-
-					foreach($newDataValues as $newDataSet) {
-						$i = 0;
-						foreach($newDataSet as $newDataVal) {
-							array_unshift($newArray[$i++],$newDataVal);
-						}
-					}
-					$this->_dataValues = $newArray;
-				}
-			}
-			$this->_pointCount = count($this->_dataValues);
-		}
-
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Exception.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Exception.php
deleted file mode 100644
index 58b5b58220c..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Exception.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Chart
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Chart_Exception
- *
- * @category   PHPExcel
- * @package    PHPExcel_Chart
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Chart_Exception extends PHPExcel_Exception {
-	/**
-	 * Error handler callback
-	 *
-	 * @param mixed $code
-	 * @param mixed $string
-	 * @param mixed $file
-	 * @param mixed $line
-	 * @param mixed $context
-	 */
-	public static function errorHandlerCallback($code, $string, $file, $line, $context) {
-		$e = new self($string, $code);
-		$e->line = $line;
-		$e->file = $file;
-		throw $e;
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/GridLines.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/GridLines.php
deleted file mode 100644
index 269860ca1f8..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/GridLines.php
+++ /dev/null
@@ -1,458 +0,0 @@
-<?php
-require_once 'Properties.php';
-/**
- * Created by PhpStorm.
- * User: Wiktor Trzonkowski
- * Date: 7/2/14
- * Time: 2:36 PM
- */
-
-class PHPExcel_Chart_GridLines extends
-  PHPExcel_Properties {
-
-  /**
-   * Properties of Class:
-   * Object State (State for Minor Tick Mark) @var bool
-   * Line Properties @var  array of mixed
-   * Shadow Properties @var  array of mixed
-   * Glow Properties @var  array of mixed
-   * Soft Properties @var  array of mixed
-   *
-   */
-
-  private
-      $_object_state = FALSE,
-      $_line_properties = array(
-          'color' => array(
-              'type' => self::EXCEL_COLOR_TYPE_STANDARD,
-              'value' => NULL,
-              'alpha' => 0
-          ),
-          'style' => array(
-              'width' => '9525',
-              'compound' => self::LINE_STYLE_COMPOUND_SIMPLE,
-              'dash' => self::LINE_STYLE_DASH_SOLID,
-              'cap' => self::LINE_STYLE_CAP_FLAT,
-              'join' => self::LINE_STYLE_JOIN_BEVEL,
-              'arrow' => array(
-                  'head' => array(
-                      'type' => self::LINE_STYLE_ARROW_TYPE_NOARROW,
-                      'size' => self::LINE_STYLE_ARROW_SIZE_5
-                  ),
-                  'end' => array(
-                      'type' => self::LINE_STYLE_ARROW_TYPE_NOARROW,
-                      'size' => self::LINE_STYLE_ARROW_SIZE_8
-                  ),
-              )
-          )
-      ),
-      $_shadow_properties = array(
-          'presets' => self::SHADOW_PRESETS_NOSHADOW,
-          'effect' => NULL,
-          'color' => array(
-              'type' => self::EXCEL_COLOR_TYPE_STANDARD,
-              'value' => 'black',
-              'alpha' => 85,
-          ),
-          'size' => array(
-              'sx' => NULL,
-              'sy' => NULL,
-              'kx' => NULL
-          ),
-          'blur' => NULL,
-          'direction' => NULL,
-          'distance' => NULL,
-          'algn' => NULL,
-          'rotWithShape' => NULL
-      ),
-      $_glow_properties = array(
-          'size' => NULL,
-          'color' => array(
-              'type' => self::EXCEL_COLOR_TYPE_STANDARD,
-              'value' => 'black',
-              'alpha' => 40
-          )
-      ),
-      $_soft_edges = array(
-          'size' => NULL
-      );
-
-  /**
-   * Get Object State
-   *
-   * @return bool
-   */
-
-  public function getObjectState() {
-    return $this->_object_state;
-  }
-
-  /**
-   * Change Object State to True
-   *
-   * @return PHPExcel_Chart_GridLines
-   */
-
-  private function _activateObject() {
-    $this->_object_state = TRUE;
-
-    return $this;
-  }
-
-  /**
-   * Set Line Color Properties
-   *
-   * @param string $value
-   * @param int $alpha
-   * @param string $type
-   */
-
-  public function setLineColorProperties($value, $alpha = 0, $type = self::EXCEL_COLOR_TYPE_STANDARD) {
-    $this
-        ->_activateObject()
-        ->_line_properties['color'] = $this->setColorProperties(
-        $value,
-        $alpha,
-        $type);
-  }
-
-  /**
-   * Set Line Color Properties
-   *
-   * @param float $line_width
-   * @param string $compound_type
-   * @param string $dash_type
-   * @param string $cap_type
-   * @param string $join_type
-   * @param string $head_arrow_type
-   * @param string $head_arrow_size
-   * @param string $end_arrow_type
-   * @param string $end_arrow_size
-   */
-
-  public function setLineStyleProperties($line_width = NULL, $compound_type = NULL, $dash_type = NULL, $cap_type = NULL, $join_type = NULL, $head_arrow_type = NULL, $head_arrow_size = NULL, $end_arrow_type = NULL, $end_arrow_size = NULL) {
-    $this->_activateObject();
-    (!is_null($line_width))
-        ? $this->_line_properties['style']['width'] = $this->getExcelPointsWidth((float) $line_width)
-        : NULL;
-    (!is_null($compound_type))
-        ? $this->_line_properties['style']['compound'] = (string) $compound_type
-        : NULL;
-    (!is_null($dash_type))
-        ? $this->_line_properties['style']['dash'] = (string) $dash_type
-        : NULL;
-    (!is_null($cap_type))
-        ? $this->_line_properties['style']['cap'] = (string) $cap_type
-        : NULL;
-    (!is_null($join_type))
-        ? $this->_line_properties['style']['join'] = (string) $join_type
-        : NULL;
-    (!is_null($head_arrow_type))
-        ? $this->_line_properties['style']['arrow']['head']['type'] = (string) $head_arrow_type
-        : NULL;
-    (!is_null($head_arrow_size))
-        ? $this->_line_properties['style']['arrow']['head']['size'] = (string) $head_arrow_size
-        : NULL;
-    (!is_null($end_arrow_type))
-        ? $this->_line_properties['style']['arrow']['end']['type'] = (string) $end_arrow_type
-        : NULL;
-    (!is_null($end_arrow_size))
-        ? $this->_line_properties['style']['arrow']['end']['size'] = (string) $end_arrow_size
-        : NULL;
-  }
-
-  /**
-   * Get Line Color Property
-   *
-   * @param string $parameter
-   *
-   * @return string
-   */
-
-  public function getLineColorProperty($parameter) {
-    return $this->_line_properties['color'][$parameter];
-  }
-
-  /**
-   * Get Line Style Property
-   *
-   * @param  array|string $elements
-   *
-   * @return string
-   */
-
-  public function getLineStyleProperty($elements) {
-    return $this->getArrayElementsValue($this->_line_properties['style'], $elements);
-  }
-
-  /**
-   * Set Glow Properties
-   *
-   * @param  float $size
-   * @param  string $color_value
-   * @param  int $color_alpha
-   * @param  string $color_type
-   *
-   */
-
-  public function setGlowProperties($size, $color_value = NULL, $color_alpha = NULL, $color_type = NULL) {
-    $this
-        ->_activateObject()
-        ->_setGlowSize($size)
-        ->_setGlowColor($color_value, $color_alpha, $color_type);
-  }
-
-  /**
-   * Get Glow Color Property
-   *
-   * @param string $property
-   *
-   * @return string
-   */
-
-  public function getGlowColor($property) {
-    return $this->_glow_properties['color'][$property];
-  }
-
-  /**
-   * Get Glow Size
-   *
-   * @return string
-   */
-
-  public function getGlowSize() {
-    return $this->_glow_properties['size'];
-  }
-
-  /**
-   * Set Glow Size
-   *
-   * @param float $size
-   *
-   * @return PHPExcel_Chart_GridLines
-   */
-
-  private function _setGlowSize($size) {
-    $this->_glow_properties['size'] = $this->getExcelPointsWidth((float) $size);
-
-    return $this;
-  }
-
-  /**
-   * Set Glow Color
-   *
-   * @param string $color
-   * @param int $alpha
-   * @param string $type
-   *
-   * @return PHPExcel_Chart_GridLines
-   */
-
-  private function _setGlowColor($color, $alpha, $type) {
-    if (!is_null($color)) {
-      $this->_glow_properties['color']['value'] = (string) $color;
-    }
-    if (!is_null($alpha)) {
-      $this->_glow_properties['color']['alpha'] = $this->getTrueAlpha((int) $alpha);
-    }
-    if (!is_null($type)) {
-      $this->_glow_properties['color']['type'] = (string) $type;
-    }
-
-    return $this;
-  }
-
-  /**
-   * Get Line Style Arrow Parameters
-   *
-   * @param string $arrow_selector
-   * @param string $property_selector
-   *
-   * @return string
-   */
-
-  public function getLineStyleArrowParameters($arrow_selector, $property_selector) {
-    return $this->getLineStyleArrowSize($this->_line_properties['style']['arrow'][$arrow_selector]['size'], $property_selector);
-  }
-
-  /**
-   * Set Shadow Properties
-   *
-   * @param int $sh_presets
-   * @param string $sh_color_value
-   * @param string $sh_color_type
-   * @param int $sh_color_alpha
-   * @param string $sh_blur
-   * @param int $sh_angle
-   * @param float $sh_distance
-   *
-   */
-
-  public function setShadowProperties($sh_presets, $sh_color_value = NULL, $sh_color_type = NULL, $sh_color_alpha = NULL, $sh_blur = NULL, $sh_angle = NULL, $sh_distance = NULL) {
-    $this
-        ->_activateObject()
-        ->_setShadowPresetsProperties((int) $sh_presets)
-        ->_setShadowColor(
-            is_null($sh_color_value) ? $this->_shadow_properties['color']['value'] : $sh_color_value
-            , is_null($sh_color_alpha) ? (int) $this->_shadow_properties['color']['alpha']
-                : $this->getTrueAlpha($sh_color_alpha)
-            , is_null($sh_color_type) ? $this->_shadow_properties['color']['type'] : $sh_color_type)
-        ->_setShadowBlur($sh_blur)
-        ->_setShadowAngle($sh_angle)
-        ->_setShadowDistance($sh_distance);
-  }
-
-  /**
-   * Set Shadow Presets Properties
-   *
-   * @param int $shadow_presets
-   *
-   * @return PHPExcel_Chart_GridLines
-   */
-
-  private function _setShadowPresetsProperties($shadow_presets) {
-    $this->_shadow_properties['presets'] = $shadow_presets;
-    $this->_setShadowProperiesMapValues($this->getShadowPresetsMap($shadow_presets));
-
-    return $this;
-  }
-
-  /**
-   * Set Shadow Properties Values
-   *
-   * @param array $properties_map
-   * @param * $reference
-   *
-   * @return PHPExcel_Chart_GridLines
-   */
-
-  private function _setShadowProperiesMapValues(array $properties_map, &$reference = NULL) {
-    $base_reference = $reference;
-    foreach ($properties_map as $property_key => $property_val) {
-      if (is_array($property_val)) {
-        if ($reference === NULL) {
-          $reference = & $this->_shadow_properties[$property_key];
-        } else {
-          $reference = & $reference[$property_key];
-        }
-        $this->_setShadowProperiesMapValues($property_val, $reference);
-      } else {
-        if ($base_reference === NULL) {
-          $this->_shadow_properties[$property_key] = $property_val;
-        } else {
-          $reference[$property_key] = $property_val;
-        }
-      }
-    }
-
-    return $this;
-  }
-
-  /**
-   * Set Shadow Color
-   *
-   * @param string $color
-   * @param int $alpha
-   * @param string $type
-   *
-   * @return PHPExcel_Chart_GridLines
-   */
-
-  private function _setShadowColor($color, $alpha, $type) {
-    if (!is_null($color)) {
-      $this->_shadow_properties['color']['value'] = (string) $color;
-    }
-    if (!is_null($alpha)) {
-      $this->_shadow_properties['color']['alpha'] = $this->getTrueAlpha((int) $alpha);
-    }
-    if (!is_null($type)) {
-      $this->_shadow_properties['color']['type'] = (string) $type;
-    }
-
-    return $this;
-  }
-
-  /**
-   * Set Shadow Blur
-   *
-   * @param float $blur
-   *
-   * @return PHPExcel_Chart_GridLines
-   */
-
-  private function _setShadowBlur($blur) {
-    if ($blur !== NULL) {
-      $this->_shadow_properties['blur'] = (string) $this->getExcelPointsWidth($blur);
-    }
-
-    return $this;
-  }
-
-  /**
-   * Set Shadow Angle
-   *
-   * @param int $angle
-   *
-   * @return PHPExcel_Chart_GridLines
-   */
-
-  private function _setShadowAngle($angle) {
-    if ($angle !== NULL) {
-      $this->_shadow_properties['direction'] = (string) $this->getExcelPointsAngle($angle);
-    }
-
-    return $this;
-  }
-
-  /**
-   * Set Shadow Distance
-   *
-   * @param float $distance
-   *
-   * @return PHPExcel_Chart_GridLines
-   */
-
-  private function _setShadowDistance($distance) {
-    if ($distance !== NULL) {
-      $this->_shadow_properties['distance'] = (string) $this->getExcelPointsWidth($distance);
-    }
-
-    return $this;
-  }
-
-  /**
-   * Get Shadow Property
-   *
-   * @param string $elements
-   * @param array $elements
-   *
-   * @return string
-   */
-
-  public function getShadowProperty($elements) {
-    return $this->getArrayElementsValue($this->_shadow_properties, $elements);
-  }
-
-  /**
-   * Set Soft Edges Size
-   *
-   * @param float $size
-   */
-
-  public function setSoftEdgesSize($size) {
-    if (!is_null($size)) {
-      $this->_activateObject();
-      $_soft_edges['size'] = (string) $this->getExcelPointsWidth($size);
-    }
-  }
-
-  /**
-   * Get Soft Edges Size
-   *
-   * @return string
-   */
-
-  public function getSoftEdgesSize() {
-    return $this->_soft_edges['size'];
-  }
-}
\ No newline at end of file
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Layout.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Layout.php
deleted file mode 100644
index eefa157a90f..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Layout.php
+++ /dev/null
@@ -1,445 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Chart_Layout
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Chart_Layout
-{
-	/**
-	 * layoutTarget
-	 *
-	 * @var string
-	 */
-	private $_layoutTarget = NULL;
-
-	/**
-	 * X Mode
-	 *
-	 * @var string
-	 */
-	private $_xMode		= NULL;
-
-	/**
-	 * Y Mode
-	 *
-	 * @var string
-	 */
-	private $_yMode		= NULL;
-
-	/**
-	 * X-Position
-	 *
-	 * @var float
-	 */
-	private $_xPos		= NULL;
-
-	/**
-	 * Y-Position
-	 *
-	 * @var float
-	 */
-	private $_yPos		= NULL;
-
-	/**
-	 * width
-	 *
-	 * @var float
-	 */
-	private $_width		= NULL;
-
-	/**
-	 * height
-	 *
-	 * @var float
-	 */
-	private $_height	= NULL;
-
-	/**
-	 * show legend key
-	 * Specifies that legend keys should be shown in data labels
-	 *
-	 * @var boolean
-	 */
-	private $_showLegendKey	= NULL;
-
-	/**
-	 * show value
-	 * Specifies that the value should be shown in a data label.
-	 *
-	 * @var boolean
-	 */
-	private $_showVal	= NULL;
-
-	/**
-	 * show category name
-	 * Specifies that the category name should be shown in the data label.
-	 *
-	 * @var boolean
-	 */
-	private $_showCatName	= NULL;
-
-	/**
-	 * show data series name
-	 * Specifies that the series name should be shown in the data label.
-	 *
-	 * @var boolean
-	 */
-	private $_showSerName	= NULL;
-
-	/**
-	 * show percentage
-	 * Specifies that the percentage should be shown in the data label.
-	 *
-	 * @var boolean
-	 */
-	private $_showPercent	= NULL;
-
-	/**
-	 * show bubble size
-	 *
-	 * @var boolean
-	 */
-	private $_showBubbleSize	= NULL;
-
-	/**
-	 * show leader lines
-	 * Specifies that leader lines should be shown for the data label.
-	 *
-	 * @var boolean
-	 */
-	private $_showLeaderLines	= NULL;
-
-
-	/**
-	 * Create a new PHPExcel_Chart_Layout
-	 */
-	public function __construct($layout=array())
-	{
-		if (isset($layout['layoutTarget']))	{ $this->_layoutTarget	= $layout['layoutTarget'];	}
-		if (isset($layout['xMode']))		{ $this->_xMode			= $layout['xMode'];			}
-		if (isset($layout['yMode']))		{ $this->_yMode			= $layout['yMode'];			}
-		if (isset($layout['x']))			{ $this->_xPos			= (float) $layout['x'];		}
-		if (isset($layout['y']))			{ $this->_yPos			= (float) $layout['y'];		}
-		if (isset($layout['w']))			{ $this->_width			= (float) $layout['w'];		}
-		if (isset($layout['h']))			{ $this->_height		= (float) $layout['h'];		}
-	}
-
-	/**
-	 * Get Layout Target
-	 *
-	 * @return string
-	 */
-	public function getLayoutTarget() {
-		return $this->_layoutTarget;
-	}
-
-	/**
-	 * Set Layout Target
-	 *
-	 * @param Layout Target $value
-     * @return PHPExcel_Chart_Layout
-	 */
-	public function setLayoutTarget($value) {
-		$this->_layoutTarget = $value;
-        return $this;
-	}
-
-	/**
-	 * Get X-Mode
-	 *
-	 * @return string
-	 */
-	public function getXMode() {
-		return $this->_xMode;
-	}
-
-	/**
-	 * Set X-Mode
-	 *
-	 * @param X-Mode $value
-     * @return PHPExcel_Chart_Layout
-	 */
-	public function setXMode($value) {
-		$this->_xMode = $value;
-        return $this;
-	}
-
-	/**
-	 * Get Y-Mode
-	 *
-	 * @return string
-	 */
-	public function getYMode() {
-		return $this->_yMode;
-	}
-
-	/**
-	 * Set Y-Mode
-	 *
-	 * @param Y-Mode $value
-     * @return PHPExcel_Chart_Layout
-	 */
-	public function setYMode($value) {
-		$this->_yMode = $value;
-        return $this;
-	}
-
-	/**
-	 * Get X-Position
-	 *
-	 * @return number
-	 */
-	public function getXPosition() {
-		return $this->_xPos;
-	}
-
-	/**
-	 * Set X-Position
-	 *
-	 * @param X-Position $value
-     * @return PHPExcel_Chart_Layout
-	 */
-	public function setXPosition($value) {
-		$this->_xPos = $value;
-        return $this;
-	}
-
-	/**
-	 * Get Y-Position
-	 *
-	 * @return number
-	 */
-	public function getYPosition() {
-		return $this->_yPos;
-	}
-
-	/**
-	 * Set Y-Position
-	 *
-	 * @param Y-Position $value
-     * @return PHPExcel_Chart_Layout
-	 */
-	public function setYPosition($value) {
-		$this->_yPos = $value;
-        return $this;
-	}
-
-	/**
-	 * Get Width
-	 *
-	 * @return number
-	 */
-	public function getWidth() {
-		return $this->_width;
-	}
-
-	/**
-	 * Set Width
-	 *
-	 * @param Width $value
-     * @return PHPExcel_Chart_Layout
-	 */
-	public function setWidth($value) {
-		$this->_width = $value;
-        return $this;
-	}
-
-	/**
-	 * Get Height
-	 *
-	 * @return number
-	 */
-	public function getHeight() {
-		return $this->_height;
-	}
-
-	/**
-	 * Set Height
-	 *
-	 * @param Height $value
-     * @return PHPExcel_Chart_Layout
-	 */
-	public function setHeight($value) {
-		$this->_height = $value;
-        return $this;
-	}
-
-
-	/**
-	 * Get show legend key
-	 *
-	 * @return boolean
-	 */
-	public function getShowLegendKey() {
-		return $this->_showLegendKey;
-	}
-
-	/**
-	 * Set show legend key
-	 * Specifies that legend keys should be shown in data labels.
-	 *
-	 * @param boolean $value		Show legend key
-     * @return PHPExcel_Chart_Layout
-	 */
-	public function setShowLegendKey($value) {
-		$this->_showLegendKey = $value;
-        return $this;
-	}
-
-	/**
-	 * Get show value
-	 *
-	 * @return boolean
-	 */
-	public function getShowVal() {
-		return $this->_showVal;
-	}
-
-	/**
-	 * Set show val
-	 * Specifies that the value should be shown in data labels.
-	 *
-	 * @param boolean $value		Show val
-     * @return PHPExcel_Chart_Layout
-	 */
-	public function setShowVal($value) {
-		$this->_showVal = $value;
-        return $this;
-	}
-
-	/**
-	 * Get show category name
-	 *
-	 * @return boolean
-	 */
-	public function getShowCatName() {
-		return $this->_showCatName;
-	}
-
-	/**
-	 * Set show cat name
-	 * Specifies that the category name should be shown in data labels.
-	 *
-	 * @param boolean $value		Show cat name
-     * @return PHPExcel_Chart_Layout
-	 */
-	public function setShowCatName($value) {
-		$this->_showCatName = $value;
-        return $this;
-	}
-
-	/**
-	 * Get show data series name
-	 *
-	 * @return boolean
-	 */
-	public function getShowSerName() {
-		return $this->_showSerName;
-	}
-
-	/**
-	 * Set show ser name
-	 * Specifies that the series name should be shown in data labels.
-	 *
-	 * @param boolean $value		Show series name
-     * @return PHPExcel_Chart_Layout
-	 */
-	public function setShowSerName($value) {
-		$this->_showSerName = $value;
-        return $this;
-	}
-
-	/**
-	 * Get show percentage
-	 *
-	 * @return boolean
-	 */
-	public function getShowPercent() {
-		return $this->_showPercent;
-	}
-
-	/**
-	 * Set show percentage
-	 * Specifies that the percentage should be shown in data labels.
-	 *
-	 * @param boolean $value		Show percentage
-     * @return PHPExcel_Chart_Layout
-	 */
-	public function setShowPercent($value) {
-		$this->_showPercent = $value;
-        return $this;
-	}
-
-	/**
-	 * Get show bubble size
-	 *
-	 * @return boolean
-	 */
-	public function getShowBubbleSize() {
-		return $this->_showBubbleSize;
-	}
-
-	/**
-	 * Set show bubble size
-	 * Specifies that the bubble size should be shown in data labels.
-	 *
-	 * @param boolean $value		Show bubble size
-     * @return PHPExcel_Chart_Layout
-	 */
-	public function setShowBubbleSize($value) {
-		$this->_showBubbleSize = $value;
-        return $this;
-	}
-
-	/**
-	 * Get show leader lines
-	 *
-	 * @return boolean
-	 */
-	public function getShowLeaderLines() {
-		return $this->_showLeaderLines;
-	}
-
-	/**
-	 * Set show leader lines
-	 * Specifies that leader lines should be shown in data labels.
-	 *
-	 * @param boolean $value		Show leader lines
-     * @return PHPExcel_Chart_Layout
-	 */
-	public function setShowLeaderLines($value) {
-		$this->_showLeaderLines = $value;
-        return $this;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Legend.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Legend.php
deleted file mode 100644
index 783b3d42970..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Legend.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Chart_Legend
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Chart_Legend
-{
-	/** Legend positions */
-	const xlLegendPositionBottom	= -4107;	//	Below the chart.
-	const xlLegendPositionCorner	= 2;		//	In the upper right-hand corner of the chart border.
-	const xlLegendPositionCustom	= -4161;	//	A custom position.
-	const xlLegendPositionLeft		= -4131;	//	Left of the chart.
-	const xlLegendPositionRight		= -4152;	//	Right of the chart.
-	const xlLegendPositionTop		= -4160;	//	Above the chart.
-
-	const POSITION_RIGHT	= 'r';
-	const POSITION_LEFT		= 'l';
-	const POSITION_BOTTOM	= 'b';
-	const POSITION_TOP		= 't';
-	const POSITION_TOPRIGHT	= 'tr';
-
-	private static $_positionXLref = array( self::xlLegendPositionBottom	=> self::POSITION_BOTTOM,
-											self::xlLegendPositionCorner	=> self::POSITION_TOPRIGHT,
-											self::xlLegendPositionCustom	=> '??',
-											self::xlLegendPositionLeft		=> self::POSITION_LEFT,
-											self::xlLegendPositionRight		=> self::POSITION_RIGHT,
-											self::xlLegendPositionTop		=> self::POSITION_TOP
-										  );
-
-	/**
-	 * Legend position
-	 *
-	 * @var	string
-	 */
-	private $_position = self::POSITION_RIGHT;
-
-	/**
-	 * Allow overlay of other elements?
-	 *
-	 * @var	boolean
-	 */
-	private $_overlay = TRUE;
-
-	/**
-	 * Legend Layout
-	 *
-	 * @var	PHPExcel_Chart_Layout
-	 */
-	private $_layout = NULL;
-
-
-	/**
-	 *	Create a new PHPExcel_Chart_Legend
-	 */
-	public function __construct($position = self::POSITION_RIGHT, PHPExcel_Chart_Layout $layout = NULL, $overlay = FALSE)
-	{
-		$this->setPosition($position);
-		$this->_layout = $layout;
-		$this->setOverlay($overlay);
-	}
-
-	/**
-	 * Get legend position as an excel string value
-	 *
-	 * @return	string
-	 */
-	public function getPosition() {
-		return $this->_position;
-	}
-
-	/**
-	 * Get legend position using an excel string value
-	 *
-	 * @param	string	$position
-	 */
-	public function setPosition($position = self::POSITION_RIGHT) {
-		if (!in_array($position,self::$_positionXLref)) {
-			return false;
-		}
-
-		$this->_position = $position;
-		return true;
-	}
-
-	/**
-	 * Get legend position as an Excel internal numeric value
-	 *
-	 * @return	number
-	 */
-	public function getPositionXL() {
-		return array_search($this->_position,self::$_positionXLref);
-	}
-
-	/**
-	 * Set legend position using an Excel internal numeric value
-	 *
-	 * @param	number	$positionXL
-	 */
-	public function setPositionXL($positionXL = self::xlLegendPositionRight) {
-		if (!array_key_exists($positionXL,self::$_positionXLref)) {
-			return false;
-		}
-
-		$this->_position = self::$_positionXLref[$positionXL];
-		return true;
-	}
-
-	/**
-	 * Get allow overlay of other elements?
-	 *
-	 * @return	boolean
-	 */
-	public function getOverlay() {
-		return $this->_overlay;
-	}
-
-	/**
-	 * Set allow overlay of other elements?
-	 *
-	 * @param	boolean	$overlay
-	 * @return	boolean
-	 */
-	public function setOverlay($overlay = FALSE) {
-		if (!is_bool($overlay)) {
-			return false;
-		}
-
-		$this->_overlay = $overlay;
-		return true;
-	}
-
-	/**
-	 * Get Layout
-	 *
-	 * @return PHPExcel_Chart_Layout
-	 */
-	public function getLayout() {
-		return $this->_layout;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/PlotArea.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/PlotArea.php
deleted file mode 100644
index c917ce3056e..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/PlotArea.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Chart_PlotArea
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Chart_PlotArea
-{
-	/**
-	 * PlotArea Layout
-	 *
-	 * @var PHPExcel_Chart_Layout
-	 */
-	private $_layout = null;
-
-	/**
-	 * Plot Series
-	 *
-	 * @var array of PHPExcel_Chart_DataSeries
-	 */
-	private $_plotSeries = array();
-
-	/**
-	 * Create a new PHPExcel_Chart_PlotArea
-	 */
-	public function __construct(PHPExcel_Chart_Layout $layout = null, $plotSeries = array())
-	{
-		$this->_layout = $layout;
-		$this->_plotSeries = $plotSeries;
-	}
-
-	/**
-	 * Get Layout
-	 *
-	 * @return PHPExcel_Chart_Layout
-	 */
-	public function getLayout() {
-		return $this->_layout;
-	}
-
-	/**
-	 * Get Number of Plot Groups
-	 *
-	 * @return array of PHPExcel_Chart_DataSeries
-	 */
-	public function getPlotGroupCount() {
-		return count($this->_plotSeries);
-	}
-
-	/**
-	 * Get Number of Plot Series
-	 *
-	 * @return integer
-	 */
-	public function getPlotSeriesCount() {
-		$seriesCount = 0;
-		foreach($this->_plotSeries as $plot) {
-			$seriesCount += $plot->getPlotSeriesCount();
-		}
-		return $seriesCount;
-	}
-
-	/**
-	 * Get Plot Series
-	 *
-	 * @return array of PHPExcel_Chart_DataSeries
-	 */
-	public function getPlotGroup() {
-		return $this->_plotSeries;
-	}
-
-	/**
-	 * Get Plot Series by Index
-	 *
-	 * @return PHPExcel_Chart_DataSeries
-	 */
-	public function getPlotGroupByIndex($index) {
-		return $this->_plotSeries[$index];
-	}
-
-	/**
-	 * Set Plot Series
-	 *
-	 * @param [PHPExcel_Chart_DataSeries]
-     * @return PHPExcel_Chart_PlotArea
-	 */
-	public function setPlotSeries($plotSeries = array()) {
-		$this->_plotSeries = $plotSeries;
-        
-        return $this;
-	}
-
-	public function refresh(PHPExcel_Worksheet $worksheet) {
-	    foreach($this->_plotSeries as $plotSeries) {
-			$plotSeries->refresh($worksheet);
-		}
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Properties.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Properties.php
deleted file mode 100644
index 7593983c091..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Properties.php
+++ /dev/null
@@ -1,359 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: nhw2h8s
- * Date: 7/2/14
- * Time: 5:45 PM
- */
-
-abstract class PHPExcel_Properties {
-
-  const
-      EXCEL_COLOR_TYPE_STANDARD = 'prstClr',
-      EXCEL_COLOR_TYPE_SCHEME = 'schemeClr',
-      EXCEL_COLOR_TYPE_ARGB = 'srgbClr';
-
-  const
-      AXIS_LABELS_LOW = 'low',
-      AXIS_LABELS_HIGH = 'high',
-      AXIS_LABELS_NEXT_TO = 'nextTo',
-      AXIS_LABELS_NONE = 'none';
-
-  const
-      TICK_MARK_NONE = 'none',
-      TICK_MARK_INSIDE = 'in',
-      TICK_MARK_OUTSIDE = 'out',
-      TICK_MARK_CROSS = 'cross';
-
-  const
-      HORIZONTAL_CROSSES_AUTOZERO = 'autoZero',
-      HORIZONTAL_CROSSES_MAXIMUM = 'max';
-
-  const
-      FORMAT_CODE_GENERAL = 'General',
-      FORMAT_CODE_NUMBER = '#,##0.00',
-      FORMAT_CODE_CURRENCY = '$#,##0.00',
-      FORMAT_CODE_ACCOUNTING = '_($* #,##0.00_);_($* (#,##0.00);_($* "-"??_);_(@_)',
-      FORMAT_CODE_DATE = 'm/d/yyyy',
-      FORMAT_CODE_TIME = '[$-F400]h:mm:ss AM/PM',
-      FORMAT_CODE_PERCENTAGE = '0.00%',
-      FORMAT_CODE_FRACTION = '# ?/?',
-      FORMAT_CODE_SCIENTIFIC = '0.00E+00',
-      FORMAT_CODE_TEXT = '@',
-      FORMAT_CODE_SPECIAL = '00000';
-
-  const
-      ORIENTATION_NORMAL = 'minMax',
-      ORIENTATION_REVERSED = 'maxMin';
-
-  const
-      LINE_STYLE_COMPOUND_SIMPLE = 'sng',
-      LINE_STYLE_COMPOUND_DOUBLE = 'dbl',
-      LINE_STYLE_COMPOUND_THICKTHIN = 'thickThin',
-      LINE_STYLE_COMPOUND_THINTHICK = 'thinThick',
-      LINE_STYLE_COMPOUND_TRIPLE = 'tri',
-
-      LINE_STYLE_DASH_SOLID = 'solid',
-      LINE_STYLE_DASH_ROUND_DOT = 'sysDot',
-      LINE_STYLE_DASH_SQUERE_DOT = 'sysDash',
-      LINE_STYPE_DASH_DASH = 'dash',
-      LINE_STYLE_DASH_DASH_DOT = 'dashDot',
-      LINE_STYLE_DASH_LONG_DASH = 'lgDash',
-      LINE_STYLE_DASH_LONG_DASH_DOT = 'lgDashDot',
-      LINE_STYLE_DASH_LONG_DASH_DOT_DOT = 'lgDashDotDot',
-
-      LINE_STYLE_CAP_SQUARE = 'sq',
-      LINE_STYLE_CAP_ROUND = 'rnd',
-      LINE_STYLE_CAP_FLAT = 'flat',
-
-      LINE_STYLE_JOIN_ROUND = 'bevel',
-      LINE_STYLE_JOIN_MITER = 'miter',
-      LINE_STYLE_JOIN_BEVEL = 'bevel',
-
-      LINE_STYLE_ARROW_TYPE_NOARROW = NULL,
-      LINE_STYLE_ARROW_TYPE_ARROW = 'triangle',
-      LINE_STYLE_ARROW_TYPE_OPEN = 'arrow',
-      LINE_STYLE_ARROW_TYPE_STEALTH = 'stealth',
-      LINE_STYLE_ARROW_TYPE_DIAMOND = 'diamond',
-      LINE_STYLE_ARROW_TYPE_OVAL = 'oval',
-
-      LINE_STYLE_ARROW_SIZE_1 = 1,
-      LINE_STYLE_ARROW_SIZE_2 = 2,
-      LINE_STYLE_ARROW_SIZE_3 = 3,
-      LINE_STYLE_ARROW_SIZE_4 = 4,
-      LINE_STYLE_ARROW_SIZE_5 = 5,
-      LINE_STYLE_ARROW_SIZE_6 = 6,
-      LINE_STYLE_ARROW_SIZE_7 = 7,
-      LINE_STYLE_ARROW_SIZE_8 = 8,
-      LINE_STYLE_ARROW_SIZE_9 = 9;
-
-  const
-      SHADOW_PRESETS_NOSHADOW = NULL,
-      SHADOW_PRESETS_OUTER_BOTTTOM_RIGHT = 1,
-      SHADOW_PRESETS_OUTER_BOTTOM = 2,
-      SHADOW_PRESETS_OUTER_BOTTOM_LEFT = 3,
-      SHADOW_PRESETS_OUTER_RIGHT = 4,
-      SHADOW_PRESETS_OUTER_CENTER = 5,
-      SHADOW_PRESETS_OUTER_LEFT = 6,
-      SHADOW_PRESETS_OUTER_TOP_RIGHT = 7,
-      SHADOW_PRESETS_OUTER_TOP = 8,
-      SHADOW_PRESETS_OUTER_TOP_LEFT = 9,
-      SHADOW_PRESETS_INNER_BOTTTOM_RIGHT = 10,
-      SHADOW_PRESETS_INNER_BOTTOM = 11,
-      SHADOW_PRESETS_INNER_BOTTOM_LEFT = 12,
-      SHADOW_PRESETS_INNER_RIGHT = 13,
-      SHADOW_PRESETS_INNER_CENTER = 14,
-      SHADOW_PRESETS_INNER_LEFT = 15,
-      SHADOW_PRESETS_INNER_TOP_RIGHT = 16,
-      SHADOW_PRESETS_INNER_TOP = 17,
-      SHADOW_PRESETS_INNER_TOP_LEFT = 18,
-      SHADOW_PRESETS_PERSPECTIVE_BELOW = 19,
-      SHADOW_PRESETS_PERSPECTIVE_UPPER_RIGHT = 20,
-      SHADOW_PRESETS_PERSPECTIVE_UPPER_LEFT = 21,
-      SHADOW_PRESETS_PERSPECTIVE_LOWER_RIGHT = 22,
-      SHADOW_PRESETS_PERSPECTIVE_LOWER_LEFT = 23;
-
-  protected function  getExcelPointsWidth($width) {
-    return $width * 12700;
-  }
-
-  protected function getExcelPointsAngle($angle) {
-    return $angle * 60000;
-  }
-
-  protected function getTrueAlpha($alpha) {
-    return (string) 100 - $alpha . '000';
-  }
-
-  protected function setColorProperties($color, $alpha, $type) {
-    return array(
-        'type' => (string) $type,
-        'value' => (string) $color,
-        'alpha' => (string) $this->getTrueAlpha($alpha)
-    );
-  }
-
-  protected function getLineStyleArrowSize($array_selector, $array_kay_selector) {
-    $sizes = array(
-        1 => array('w' => 'sm', 'len' => 'sm'),
-        2 => array('w' => 'sm', 'len' => 'med'),
-        3 => array('w' => 'sm', 'len' => 'lg'),
-        4 => array('w' => 'med', 'len' => 'sm'),
-        5 => array('w' => 'med', 'len' => 'med'),
-        6 => array('w' => 'med', 'len' => 'lg'),
-        7 => array('w' => 'lg', 'len' => 'sm'),
-        8 => array('w' => 'lg', 'len' => 'med'),
-        9 => array('w' => 'lg', 'len' => 'lg')
-    );
-
-    return $sizes[$array_selector][$array_kay_selector];
-  }
-
-  protected function getShadowPresetsMap($shadow_presets_option) {
-    $presets_options = array(
-      //OUTER
-      1 => array(
-          'effect' => 'outerShdw',
-          'blur' => '50800',
-          'distance' => '38100',
-          'direction' => '2700000',
-          'algn' => 'tl',
-          'rotWithShape' => '0'
-      ),
-      2 => array(
-          'effect' => 'outerShdw',
-          'blur' => '50800',
-          'distance' => '38100',
-          'direction' => '5400000',
-          'algn' => 't',
-          'rotWithShape' => '0'
-      ),
-      3 => array(
-          'effect' => 'outerShdw',
-          'blur' => '50800',
-          'distance' => '38100',
-          'direction' => '8100000',
-          'algn' => 'tr',
-          'rotWithShape' => '0'
-      ),
-      4 => array(
-          'effect' => 'outerShdw',
-          'blur' => '50800',
-          'distance' => '38100',
-          'algn' => 'l',
-          'rotWithShape' => '0'
-      ),
-      5 => array(
-          'effect' => 'outerShdw',
-          'size' => array(
-              'sx' => '102000',
-              'sy' => '102000'
-          )
-          ,
-          'blur' => '63500',
-          'distance' => '38100',
-          'algn' => 'ctr',
-          'rotWithShape' => '0'
-      ),
-      6 => array(
-          'effect' => 'outerShdw',
-          'blur' => '50800',
-          'distance' => '38100',
-          'direction' => '10800000',
-          'algn' => 'r',
-          'rotWithShape' => '0'
-      ),
-      7 => array(
-          'effect' => 'outerShdw',
-          'blur' => '50800',
-          'distance' => '38100',
-          'direction' => '18900000',
-          'algn' => 'bl',
-          'rotWithShape' => '0'
-      ),
-      8 => array(
-          'effect' => 'outerShdw',
-          'blur' => '50800',
-          'distance' => '38100',
-          'direction' => '16200000',
-          'rotWithShape' => '0'
-      ),
-      9 => array(
-          'effect' => 'outerShdw',
-          'blur' => '50800',
-          'distance' => '38100',
-          'direction' => '13500000',
-          'algn' => 'br',
-          'rotWithShape' => '0'
-      ),
-      //INNER
-      10 => array(
-          'effect' => 'innerShdw',
-          'blur' => '63500',
-          'distance' => '50800',
-          'direction' => '2700000',
-      ),
-      11 => array(
-          'effect' => 'innerShdw',
-          'blur' => '63500',
-          'distance' => '50800',
-          'direction' => '5400000',
-      ),
-      12 => array(
-          'effect' => 'innerShdw',
-          'blur' => '63500',
-          'distance' => '50800',
-          'direction' => '8100000',
-      ),
-      13 => array(
-          'effect' => 'innerShdw',
-          'blur' => '63500',
-          'distance' => '50800',
-      ),
-      14 => array(
-          'effect' => 'innerShdw',
-          'blur' => '114300',
-      ),
-      15 => array(
-          'effect' => 'innerShdw',
-          'blur' => '63500',
-          'distance' => '50800',
-          'direction' => '10800000',
-      ),
-      16 => array(
-          'effect' => 'innerShdw',
-          'blur' => '63500',
-          'distance' => '50800',
-          'direction' => '18900000',
-      ),
-      17 => array(
-          'effect' => 'innerShdw',
-          'blur' => '63500',
-          'distance' => '50800',
-          'direction' => '16200000',
-      ),
-      18 => array(
-          'effect' => 'innerShdw',
-          'blur' => '63500',
-          'distance' => '50800',
-          'direction' => '13500000',
-      ),
-      //perspective
-      19 => array(
-          'effect' => 'outerShdw',
-          'blur' => '152400',
-          'distance' => '317500',
-          'size' => array(
-              'sx' => '90000',
-              'sy' => '-19000',
-          ),
-          'direction' => '5400000',
-          'rotWithShape' => '0',
-      ),
-      20 => array(
-          'effect' => 'outerShdw',
-          'blur' => '76200',
-          'direction' => '18900000',
-          'size' => array(
-              'sy' => '23000',
-              'kx' => '-1200000',
-          ),
-          'algn' => 'bl',
-          'rotWithShape' => '0',
-      ),
-      21 => array(
-          'effect' => 'outerShdw',
-          'blur' => '76200',
-          'direction' => '13500000',
-          'size' => array(
-              'sy' => '23000',
-              'kx' => '1200000',
-          ),
-          'algn' => 'br',
-          'rotWithShape' => '0',
-      ),
-      22 => array(
-          'effect' => 'outerShdw',
-          'blur' => '76200',
-          'distance' => '12700',
-          'direction' => '2700000',
-          'size' => array(
-              'sy' => '-23000',
-              'kx' => '-800400',
-          ),
-          'algn' => 'bl',
-          'rotWithShape' => '0',
-      ),
-      23 => array(
-          'effect' => 'outerShdw',
-          'blur' => '76200',
-          'distance' => '12700',
-          'direction' => '8100000',
-          'size' => array(
-              'sy' => '-23000',
-              'kx' => '800400',
-          ),
-          'algn' => 'br',
-          'rotWithShape' => '0',
-      ),
-    );
-
-    return $presets_options[$shadow_presets_option];
-  }
-
-  protected function getArrayElementsValue($properties, $elements) {
-    $reference = & $properties;
-    if (!is_array($elements)) {
-      return $reference[$elements];
-    } else {
-      foreach ($elements as $keys) {
-        $reference = & $reference[$keys];
-      }
-
-      return $reference;
-    }
-
-    return $this;
-  }
-
-} 
\ No newline at end of file
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt
deleted file mode 100644
index faaa61d153b..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt	
+++ /dev/null
@@ -1,17 +0,0 @@
-ChartDirector
-	http://www.advsofteng.com/cdphp.html
-
-GraPHPite
-	http://graphpite.sourceforge.net/
-
-JpGraph
-	http://www.aditus.nu/jpgraph/
-
-LibChart
-	http://naku.dohcrew.com/libchart/pages/introduction/
-
-pChart
-	http://pchart.sourceforge.net/
-
-TeeChart
-	http://www.steema.com/products/teechart/overview.html
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/jpgraph.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/jpgraph.php
deleted file mode 100644
index dc7de6e66b9..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/jpgraph.php
+++ /dev/null
@@ -1,855 +0,0 @@
-<?php
-
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart_Renderer
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-require_once(PHPExcel_Settings::getChartRendererPath().'/jpgraph.php');
-
-
-/**
- * PHPExcel_Chart_Renderer_jpgraph
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart_Renderer
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Chart_Renderer_jpgraph
-{
-	private static $_width	= 640;
-
-	private static $_height	= 480;
-
-	private static $_colourSet = array( 'mediumpurple1',	'palegreen3',	'gold1',		'cadetblue1',
-										'darkmagenta',		'coral',		'dodgerblue3',	'eggplant',
-										'mediumblue',		'magenta',		'sandybrown',	'cyan',
-										'firebrick1',		'forestgreen',	'deeppink4',	'darkolivegreen',
-										'goldenrod2'
-									  );
-
-	private static $_markSet = array(	'diamond'	=> MARK_DIAMOND,
-										'square'	=> MARK_SQUARE,
-										'triangle'	=> MARK_UTRIANGLE,
-										'x'			=> MARK_X,
-										'star'		=> MARK_STAR,
-										'dot'		=> MARK_FILLEDCIRCLE,
-										'dash'		=> MARK_DTRIANGLE,
-										'circle'	=> MARK_CIRCLE,
-										'plus'		=> MARK_CROSS
-									);
-
-
-	private $_chart	= null;
-
-	private $_graph	= null;
-
-	private static $_plotColour	= 0;
-
-	private static $_plotMark	= 0;
-
-
-	private function _formatPointMarker($seriesPlot,$markerID) {
-		$plotMarkKeys = array_keys(self::$_markSet);
-		if (is_null($markerID)) {
-			//	Use default plot marker (next marker in the series)
-			self::$_plotMark %= count(self::$_markSet);
-			$seriesPlot->mark->SetType(self::$_markSet[$plotMarkKeys[self::$_plotMark++]]);
-		} elseif ($markerID !== 'none') {
-			//	Use specified plot marker (if it exists)
-			if (isset(self::$_markSet[$markerID])) {
-				$seriesPlot->mark->SetType(self::$_markSet[$markerID]);
-			} else {
-				//	If the specified plot marker doesn't exist, use default plot marker (next marker in the series)
-				self::$_plotMark %= count(self::$_markSet);
-				$seriesPlot->mark->SetType(self::$_markSet[$plotMarkKeys[self::$_plotMark++]]);
-			}
-		} else {
-			//	Hide plot marker
-			$seriesPlot->mark->Hide();
-		}
-		$seriesPlot->mark->SetColor(self::$_colourSet[self::$_plotColour]);
-		$seriesPlot->mark->SetFillColor(self::$_colourSet[self::$_plotColour]);
-		$seriesPlot->SetColor(self::$_colourSet[self::$_plotColour++]);
-
-		return $seriesPlot;
-	}	//	function _formatPointMarker()
-
-
-	private function _formatDataSetLabels($groupID, $datasetLabels, $labelCount, $rotation = '') {
-		$datasetLabelFormatCode = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getFormatCode();
-		if (!is_null($datasetLabelFormatCode)) {
-			//	Retrieve any label formatting code
-			$datasetLabelFormatCode = stripslashes($datasetLabelFormatCode);
-		}
-
-		$testCurrentIndex = 0;
-		foreach($datasetLabels as $i => $datasetLabel) {
-			if (is_array($datasetLabel)) {
-				if ($rotation == 'bar') {
-					$datasetLabels[$i] = implode(" ",$datasetLabel);
-				} else {
-					$datasetLabel = array_reverse($datasetLabel);
-					$datasetLabels[$i] = implode("\n",$datasetLabel);
-				}
-			} else {
-				//	Format labels according to any formatting code
-				if (!is_null($datasetLabelFormatCode)) {
-					$datasetLabels[$i] = PHPExcel_Style_NumberFormat::toFormattedString($datasetLabel,$datasetLabelFormatCode);
-				}
-			}
-			++$testCurrentIndex;
-		}
-
-		return $datasetLabels;
-	}	//	function _formatDataSetLabels()
-
-
-	private function _percentageSumCalculation($groupID,$seriesCount) {
-		//	Adjust our values to a percentage value across all series in the group
-		for($i = 0; $i < $seriesCount; ++$i) {
-			if ($i == 0) {
-				$sumValues = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-			} else {
-				$nextValues = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-				foreach($nextValues as $k => $value) {
-					if (isset($sumValues[$k])) {
-						$sumValues[$k] += $value;
-					} else {
-						$sumValues[$k] = $value;
-					}
-				}
-			}
-		}
-
-		return $sumValues;
-	}	//	function _percentageSumCalculation()
-
-
-	private function _percentageAdjustValues($dataValues,$sumValues) {
-		foreach($dataValues as $k => $dataValue) {
-			$dataValues[$k] = $dataValue / $sumValues[$k] * 100;
-		}
-
-		return $dataValues;
-	}	//	function _percentageAdjustValues()
-
-
-	private function _getCaption($captionElement) {
-		//	Read any caption
-		$caption = (!is_null($captionElement)) ? $captionElement->getCaption() : NULL;
-		//	Test if we have a title caption to display
-		if (!is_null($caption)) {
-			//	If we do, it could be a plain string or an array
-			if (is_array($caption)) {
-				//	Implode an array to a plain string
-				$caption = implode('',$caption);
-			}
-		}
-		return $caption;
-	}	//	function _getCaption()
-
-
-	private function _renderTitle() {
-		$title = $this->_getCaption($this->_chart->getTitle());
-		if (!is_null($title)) {
-			$this->_graph->title->Set($title);
-		}
-	}	//	function _renderTitle()
-
-
-	private function _renderLegend() {
-		$legend = $this->_chart->getLegend();
-		if (!is_null($legend)) {
-			$legendPosition = $legend->getPosition();
-			$legendOverlay = $legend->getOverlay();
-			switch ($legendPosition) {
-				case 'r'	:
-					$this->_graph->legend->SetPos(0.01,0.5,'right','center');	//	right
-					$this->_graph->legend->SetColumns(1);
-					break;
-				case 'l'	:
-					$this->_graph->legend->SetPos(0.01,0.5,'left','center');	//	left
-					$this->_graph->legend->SetColumns(1);
-					break;
-				case 't'	:
-					$this->_graph->legend->SetPos(0.5,0.01,'center','top');	//	top
-					break;
-				case 'b'	:
-					$this->_graph->legend->SetPos(0.5,0.99,'center','bottom');	//	bottom
-					break;
-				default		:
-					$this->_graph->legend->SetPos(0.01,0.01,'right','top');	//	top-right
-					$this->_graph->legend->SetColumns(1);
-					break;
-			}
-		} else {
-			$this->_graph->legend->Hide();
-		}
-	}	//	function _renderLegend()
-
-
-	private function _renderCartesianPlotArea($type='textlin') {
-		$this->_graph = new Graph(self::$_width,self::$_height);
-		$this->_graph->SetScale($type);
-
-		$this->_renderTitle();
-
-		//	Rotate for bar rather than column chart
-		$rotation = $this->_chart->getPlotArea()->getPlotGroupByIndex(0)->getPlotDirection();
-		$reverse = ($rotation == 'bar') ? true : false;
-
-		$xAxisLabel = $this->_chart->getXAxisLabel();
-		if (!is_null($xAxisLabel)) {
-			$title = $this->_getCaption($xAxisLabel);
-			if (!is_null($title)) {
-				$this->_graph->xaxis->SetTitle($title,'center');
-				$this->_graph->xaxis->title->SetMargin(35);
-				if ($reverse) {
-					$this->_graph->xaxis->title->SetAngle(90);
-					$this->_graph->xaxis->title->SetMargin(90);
-				}
-			}
-		}
-
-		$yAxisLabel = $this->_chart->getYAxisLabel();
-		if (!is_null($yAxisLabel)) {
-			$title = $this->_getCaption($yAxisLabel);
-			if (!is_null($title)) {
-				$this->_graph->yaxis->SetTitle($title,'center');
-				if ($reverse) {
-					$this->_graph->yaxis->title->SetAngle(0);
-					$this->_graph->yaxis->title->SetMargin(-55);
-				}
-			}
-		}
-	}	//	function _renderCartesianPlotArea()
-
-
-	private function _renderPiePlotArea($doughnut = False) {
-		$this->_graph = new PieGraph(self::$_width,self::$_height);
-
-		$this->_renderTitle();
-	}	//	function _renderPiePlotArea()
-
-
-	private function _renderRadarPlotArea() {
-		$this->_graph = new RadarGraph(self::$_width,self::$_height);
-		$this->_graph->SetScale('lin');
-
-		$this->_renderTitle();
-	}	//	function _renderRadarPlotArea()
-
-
-	private function _renderPlotLine($groupID, $filled = false, $combination = false, $dimensions = '2d') {
-		$grouping = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
-
-        $labelCount = count($this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount());
-		if ($labelCount > 0) {
-			$datasetLabels = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
-			$datasetLabels = $this->_formatDataSetLabels($groupID, $datasetLabels, $labelCount);
-			$this->_graph->xaxis->SetTickLabels($datasetLabels);
-		}
-
-		$seriesCount = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-		$seriesPlots = array();
-		if ($grouping == 'percentStacked') {
-			$sumValues = $this->_percentageSumCalculation($groupID,$seriesCount);
-		}
-
-		//	Loop through each data series in turn
-		for($i = 0; $i < $seriesCount; ++$i) {
-			$dataValues = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-			$marker = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
-
-			if ($grouping == 'percentStacked') {
-				$dataValues = $this->_percentageAdjustValues($dataValues,$sumValues);
-			}
-
-			//	Fill in any missing values in the $dataValues array
-			$testCurrentIndex = 0;
-			foreach($dataValues as $k => $dataValue) {
-				while($k != $testCurrentIndex) {
-					$dataValues[$testCurrentIndex] = null;
-					++$testCurrentIndex;
-				}
-				++$testCurrentIndex;
-			}
-
-			$seriesPlot = new LinePlot($dataValues);
-			if ($combination) {
-				$seriesPlot->SetBarCenter();
-			}
-
-			if ($filled) {
-				$seriesPlot->SetFilled(true);
-				$seriesPlot->SetColor('black');
-				$seriesPlot->SetFillColor(self::$_colourSet[self::$_plotColour++]);
-			} else {
-				//	Set the appropriate plot marker
-				$this->_formatPointMarker($seriesPlot,$marker);
-			}
-			$dataLabel = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
-			$seriesPlot->SetLegend($dataLabel);
-
-			$seriesPlots[] = $seriesPlot;
-		}
-
-		if ($grouping == 'standard') {
-			$groupPlot = $seriesPlots;
-		} else {
-			$groupPlot = new AccLinePlot($seriesPlots);
-		}
-		$this->_graph->Add($groupPlot);
-	}	//	function _renderPlotLine()
-
-
-	private function _renderPlotBar($groupID, $dimensions = '2d') {
-		$rotation = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotDirection();
-		//	Rotate for bar rather than column chart
-		if (($groupID == 0) && ($rotation == 'bar')) {
-			$this->_graph->Set90AndMargin();
-		}
-		$grouping = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
-
-        $labelCount = count($this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount());
-		if ($labelCount > 0) {
-			$datasetLabels = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
-			$datasetLabels = $this->_formatDataSetLabels($groupID, $datasetLabels, $labelCount, $rotation);
-			//	Rotate for bar rather than column chart
-			if ($rotation == 'bar') {
-				$datasetLabels = array_reverse($datasetLabels);
-				$this->_graph->yaxis->SetPos('max');
-				$this->_graph->yaxis->SetLabelAlign('center','top');
-				$this->_graph->yaxis->SetLabelSide(SIDE_RIGHT);
-			}
-			$this->_graph->xaxis->SetTickLabels($datasetLabels);
-		}
-
-
-		$seriesCount = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-		$seriesPlots = array();
-		if ($grouping == 'percentStacked') {
-			$sumValues = $this->_percentageSumCalculation($groupID,$seriesCount);
-		}
-
-		//	Loop through each data series in turn
-		for($j = 0; $j < $seriesCount; ++$j) {
-			$dataValues = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($j)->getDataValues();
-			if ($grouping == 'percentStacked') {
-				$dataValues = $this->_percentageAdjustValues($dataValues,$sumValues);
-			}
-
-			//	Fill in any missing values in the $dataValues array
-			$testCurrentIndex = 0;
-			foreach($dataValues as $k => $dataValue) {
-				while($k != $testCurrentIndex) {
-					$dataValues[$testCurrentIndex] = null;
-					++$testCurrentIndex;
-				}
-				++$testCurrentIndex;
-			}
-
-			//	Reverse the $dataValues order for bar rather than column chart
-			if ($rotation == 'bar') {
-				$dataValues = array_reverse($dataValues);
-			}
-			$seriesPlot = new BarPlot($dataValues);
-			$seriesPlot->SetColor('black');
-			$seriesPlot->SetFillColor(self::$_colourSet[self::$_plotColour++]);
-			if ($dimensions == '3d') {
-				$seriesPlot->SetShadow();
-			}
-			if (!$this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($j)) {
-				$dataLabel = '';
-			} else {
-				$dataLabel = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($j)->getDataValue();
-			}
-			$seriesPlot->SetLegend($dataLabel);
-
-			$seriesPlots[] = $seriesPlot;
-		}
-		//	Reverse the plot order for bar rather than column chart
-		if (($rotation == 'bar') && (!($grouping == 'percentStacked'))) {
-			$seriesPlots = array_reverse($seriesPlots);
-		}
-
-		if ($grouping == 'clustered') {
-			$groupPlot = new GroupBarPlot($seriesPlots);
-		} elseif ($grouping == 'standard') {
-			$groupPlot = new GroupBarPlot($seriesPlots);
-		} else {
-			$groupPlot = new AccBarPlot($seriesPlots);
-			if ($dimensions == '3d') {
-				$groupPlot->SetShadow();
-			}
-		}
-
-		$this->_graph->Add($groupPlot);
-	}	//	function _renderPlotBar()
-
-
-	private function _renderPlotScatter($groupID,$bubble) {
-		$grouping = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
-		$scatterStyle = $bubbleSize = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
-
-		$seriesCount = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-		$seriesPlots = array();
-
-		//	Loop through each data series in turn
-		for($i = 0; $i < $seriesCount; ++$i) {
-			$dataValuesY = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
-			$dataValuesX = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-
-			foreach($dataValuesY as $k => $dataValueY) {
-				$dataValuesY[$k] = $k;
-			}
-
-			$seriesPlot = new ScatterPlot($dataValuesX,$dataValuesY);
-			if ($scatterStyle == 'lineMarker') {
-				$seriesPlot->SetLinkPoints();
-				$seriesPlot->link->SetColor(self::$_colourSet[self::$_plotColour]);
-			} elseif ($scatterStyle == 'smoothMarker') {
-				$spline = new Spline($dataValuesY,$dataValuesX);
-				list($splineDataY,$splineDataX) = $spline->Get(count($dataValuesX) * self::$_width / 20);
-				$lplot = new LinePlot($splineDataX,$splineDataY);
-				$lplot->SetColor(self::$_colourSet[self::$_plotColour]);
-
-				$this->_graph->Add($lplot);
-			}
-
-			if ($bubble) {
-				$this->_formatPointMarker($seriesPlot,'dot');
-				$seriesPlot->mark->SetColor('black');
-				$seriesPlot->mark->SetSize($bubbleSize);
-			} else {
-				$marker = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
-				$this->_formatPointMarker($seriesPlot,$marker);
-			}
-			$dataLabel = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
-			$seriesPlot->SetLegend($dataLabel);
-
-			$this->_graph->Add($seriesPlot);
-		}
-	}	//	function _renderPlotScatter()
-
-
-	private function _renderPlotRadar($groupID) {
-		$radarStyle = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
-
-		$seriesCount = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-		$seriesPlots = array();
-
-		//	Loop through each data series in turn
-		for($i = 0; $i < $seriesCount; ++$i) {
-			$dataValuesY = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
-			$dataValuesX = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-			$marker = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
-
-			$dataValues = array();
-			foreach($dataValuesY as $k => $dataValueY) {
-				$dataValues[$k] = implode(' ',array_reverse($dataValueY));
-			}
-			$tmp = array_shift($dataValues);
-			$dataValues[] = $tmp;
-			$tmp = array_shift($dataValuesX);
-			$dataValuesX[] = $tmp;
-
-			$this->_graph->SetTitles(array_reverse($dataValues));
-
-			$seriesPlot = new RadarPlot(array_reverse($dataValuesX));
-
-			$dataLabel = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
-			$seriesPlot->SetColor(self::$_colourSet[self::$_plotColour++]);
-			if ($radarStyle == 'filled') {
-				$seriesPlot->SetFillColor(self::$_colourSet[self::$_plotColour]);
-			}
-			$this->_formatPointMarker($seriesPlot,$marker);
-			$seriesPlot->SetLegend($dataLabel);
-
-			$this->_graph->Add($seriesPlot);
-		}
-	}	//	function _renderPlotRadar()
-
-
-	private function _renderPlotContour($groupID) {
-		$contourStyle = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
-
-		$seriesCount = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-		$seriesPlots = array();
-
-		$dataValues = array();
-		//	Loop through each data series in turn
-		for($i = 0; $i < $seriesCount; ++$i) {
-			$dataValuesY = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
-			$dataValuesX = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-
-			$dataValues[$i] = $dataValuesX;
-		}
-		$seriesPlot = new ContourPlot($dataValues);
-
-		$this->_graph->Add($seriesPlot);
-	}	//	function _renderPlotContour()
-
-
-	private function _renderPlotStock($groupID) {
-		$seriesCount = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-		$plotOrder = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder();
-
-		$dataValues = array();
-		//	Loop through each data series in turn and build the plot arrays
-		foreach($plotOrder as $i => $v) {
-			$dataValuesX = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($v)->getDataValues();
-			foreach($dataValuesX as $j => $dataValueX) {
-				$dataValues[$plotOrder[$i]][$j] = $dataValueX;
-			}
-		}
-		if(empty($dataValues)) {
-			return;
-		}
-
-		$dataValuesPlot = array();
-        // Flatten the plot arrays to a single dimensional array to work with jpgraph
-		for($j = 0; $j < count($dataValues[0]); $j++) {
-			for($i = 0; $i < $seriesCount; $i++) {
-				$dataValuesPlot[] = $dataValues[$i][$j];
-			}
-		}
-
-        // Set the x-axis labels
-        $labelCount = count($this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount());
-		if ($labelCount > 0) {
-			$datasetLabels = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
-			$datasetLabels = $this->_formatDataSetLabels($groupID, $datasetLabels, $labelCount);
-			$this->_graph->xaxis->SetTickLabels($datasetLabels);
-		}
-
-		$seriesPlot = new StockPlot($dataValuesPlot);
-		$seriesPlot->SetWidth(20);
-
-		$this->_graph->Add($seriesPlot);
-	}	//	function _renderPlotStock()
-
-
-	private function _renderAreaChart($groupCount, $dimensions = '2d') {
-		require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_line.php');
-
-		$this->_renderCartesianPlotArea();
-
-		for($i = 0; $i < $groupCount; ++$i) {
-			$this->_renderPlotLine($i,True,False,$dimensions);
-		}
-	}	//	function _renderAreaChart()
-
-
-	private function _renderLineChart($groupCount, $dimensions = '2d') {
-		require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_line.php');
-
-		$this->_renderCartesianPlotArea();
-
-		for($i = 0; $i < $groupCount; ++$i) {
-			$this->_renderPlotLine($i,False,False,$dimensions);
-		}
-	}	//	function _renderLineChart()
-
-
-	private function _renderBarChart($groupCount, $dimensions = '2d') {
-		require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_bar.php');
-
-		$this->_renderCartesianPlotArea();
-
-		for($i = 0; $i < $groupCount; ++$i) {
-			$this->_renderPlotBar($i,$dimensions);
-		}
-	}	//	function _renderBarChart()
-
-
-	private function _renderScatterChart($groupCount) {
-		require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_scatter.php');
-		require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_regstat.php');
-		require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_line.php');
-
-		$this->_renderCartesianPlotArea('linlin');
-
-		for($i = 0; $i < $groupCount; ++$i) {
-			$this->_renderPlotScatter($i,false);
-		}
-	}	//	function _renderScatterChart()
-
-
-	private function _renderBubbleChart($groupCount) {
-		require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_scatter.php');
-
-		$this->_renderCartesianPlotArea('linlin');
-
-		for($i = 0; $i < $groupCount; ++$i) {
-			$this->_renderPlotScatter($i,true);
-		}
-	}	//	function _renderBubbleChart()
-
-
-	private function _renderPieChart($groupCount, $dimensions = '2d', $doughnut = False, $multiplePlots = False) {
-		require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_pie.php');
-		if ($dimensions == '3d') {
-			require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_pie3d.php');
-		}
-
-		$this->_renderPiePlotArea($doughnut);
-
-		$iLimit = ($multiplePlots) ? $groupCount : 1;
-		for($groupID = 0; $groupID < $iLimit; ++$groupID) {
-			$grouping = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
-			$exploded = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
-			if ($groupID == 0) {
-		        $labelCount = count($this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount());
-				if ($labelCount > 0) {
-					$datasetLabels = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
-					$datasetLabels = $this->_formatDataSetLabels($groupID, $datasetLabels, $labelCount);
-				}
-			}
-
-			$seriesCount = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-			$seriesPlots = array();
-			//	For pie charts, we only display the first series: doughnut charts generally display all series
-			$jLimit = ($multiplePlots) ? $seriesCount : 1;
-			//	Loop through each data series in turn
-			for($j = 0; $j < $jLimit; ++$j) {
-				$dataValues = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($j)->getDataValues();
-
-				//	Fill in any missing values in the $dataValues array
-				$testCurrentIndex = 0;
-				foreach($dataValues as $k => $dataValue) {
-					while($k != $testCurrentIndex) {
-						$dataValues[$testCurrentIndex] = null;
-						++$testCurrentIndex;
-					}
-					++$testCurrentIndex;
-				}
-
-				if ($dimensions == '3d') {
-					$seriesPlot = new PiePlot3D($dataValues);
-				} else {
-					if ($doughnut) {
-						$seriesPlot = new PiePlotC($dataValues);
-					} else {
-						$seriesPlot = new PiePlot($dataValues);
-					}
-				}
-
-				if ($multiplePlots) {
-					$seriesPlot->SetSize(($jLimit-$j) / ($jLimit * 4));
-				}
-
-				if ($doughnut) {
-					$seriesPlot->SetMidColor('white');
-				}
-
-				$seriesPlot->SetColor(self::$_colourSet[self::$_plotColour++]);
-				if (count($datasetLabels) > 0)
-					$seriesPlot->SetLabels(array_fill(0,count($datasetLabels),''));
-				if ($dimensions != '3d') {
-					$seriesPlot->SetGuideLines(false);
-				}
-				if ($j == 0) {
-					if ($exploded) {
-						$seriesPlot->ExplodeAll();
-					}
-					$seriesPlot->SetLegends($datasetLabels);
-				}
-
-				$this->_graph->Add($seriesPlot);
-			}
-		}
-	}	//	function _renderPieChart()
-
-
-	private function _renderRadarChart($groupCount) {
-		require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_radar.php');
-
-		$this->_renderRadarPlotArea();
-
-		for($groupID = 0; $groupID < $groupCount; ++$groupID) {
-			$this->_renderPlotRadar($groupID);
-		}
-	}	//	function _renderRadarChart()
-
-
-	private function _renderStockChart($groupCount) {
-		require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_stock.php');
-
-		$this->_renderCartesianPlotArea('intint');
-
-		for($groupID = 0; $groupID < $groupCount; ++$groupID) {
-			$this->_renderPlotStock($groupID);
-		}
-	}	//	function _renderStockChart()
-
-
-	private function _renderContourChart($groupCount,$dimensions) {
-		require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_contour.php');
-
-		$this->_renderCartesianPlotArea('intint');
-
-		for($i = 0; $i < $groupCount; ++$i) {
-			$this->_renderPlotContour($i);
-		}
-	}	//	function _renderContourChart()
-
-
-	private function _renderCombinationChart($groupCount,$dimensions,$outputDestination) {
-		require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_line.php');
-		require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_bar.php');
-		require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_scatter.php');
-		require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_regstat.php');
-		require_once(PHPExcel_Settings::getChartRendererPath().'jpgraph_line.php');
-
-		$this->_renderCartesianPlotArea();
-
-		for($i = 0; $i < $groupCount; ++$i) {
-			$dimensions = null;
-			$chartType = $this->_chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType();
-			switch ($chartType) {
-				case 'area3DChart' :
-					$dimensions = '3d';
-				case 'areaChart' :
-					$this->_renderPlotLine($i,True,True,$dimensions);
-					break;
-				case 'bar3DChart' :
-					$dimensions = '3d';
-				case 'barChart' :
-					$this->_renderPlotBar($i,$dimensions);
-					break;
-				case 'line3DChart' :
-					$dimensions = '3d';
-				case 'lineChart' :
-					$this->_renderPlotLine($i,False,True,$dimensions);
-					break;
-				case 'scatterChart' :
-					$this->_renderPlotScatter($i,false);
-					break;
-				case 'bubbleChart' :
-					$this->_renderPlotScatter($i,true);
-					break;
-				default	:
-					$this->_graph = null;
-					return false;
-			}
-		}
-
-		$this->_renderLegend();
-
-		$this->_graph->Stroke($outputDestination);
-		return true;
-	}	//	function _renderCombinationChart()
-
-
-	public function render($outputDestination) {
-        self::$_plotColour = 0;
-
-		$groupCount = $this->_chart->getPlotArea()->getPlotGroupCount();
-
-		$dimensions = null;
-		if ($groupCount == 1) {
-			$chartType = $this->_chart->getPlotArea()->getPlotGroupByIndex(0)->getPlotType();
-		} else {
-			$chartTypes = array();
-			for($i = 0; $i < $groupCount; ++$i) {
-				$chartTypes[] = $this->_chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType();
-			}
-			$chartTypes = array_unique($chartTypes);
-			if (count($chartTypes) == 1) {
-				$chartType = array_pop($chartTypes);
-			} elseif (count($chartTypes) == 0) {
-				echo 'Chart is not yet implemented<br />';
-				return false;
-			} else {
-				return $this->_renderCombinationChart($groupCount,$dimensions,$outputDestination);
-			}
-		}
-
-		switch ($chartType) {
-			case 'area3DChart' :
-				$dimensions = '3d';
-			case 'areaChart' :
-				$this->_renderAreaChart($groupCount,$dimensions);
-				break;
-			case 'bar3DChart' :
-				$dimensions = '3d';
-			case 'barChart' :
-				$this->_renderBarChart($groupCount,$dimensions);
-				break;
-			case 'line3DChart' :
-				$dimensions = '3d';
-			case 'lineChart' :
-				$this->_renderLineChart($groupCount,$dimensions);
-				break;
-			case 'pie3DChart' :
-				$dimensions = '3d';
-			case 'pieChart' :
-				$this->_renderPieChart($groupCount,$dimensions,False,False);
-				break;
-			case 'doughnut3DChart' :
-				$dimensions = '3d';
-			case 'doughnutChart' :
-				$this->_renderPieChart($groupCount,$dimensions,True,True);
-				break;
-			case 'scatterChart' :
-				$this->_renderScatterChart($groupCount);
-				break;
-			case 'bubbleChart' :
-				$this->_renderBubbleChart($groupCount);
-				break;
-			case 'radarChart' :
-				$this->_renderRadarChart($groupCount);
-				break;
-			case 'surface3DChart' :
-				$dimensions = '3d';
-			case 'surfaceChart' :
-				$this->_renderContourChart($groupCount,$dimensions);
-				break;
-			case 'stockChart' :
-				$this->_renderStockChart($groupCount,$dimensions);
-				break;
-			default	:
-				echo $chartType.' is not yet implemented<br />';
-				return false;
-		}
-		$this->_renderLegend();
-
-		$this->_graph->Stroke($outputDestination);
-		return true;
-	}	//	function render()
-
-
-	/**
-	 * Create a new PHPExcel_Chart_Renderer_jpgraph
-	 */
-	public function __construct(PHPExcel_Chart $chart)
-	{
-		$this->_graph	= null;
-		$this->_chart	= $chart;
-	}	//	function __construct()
-
-}	//	PHPExcel_Chart_Renderer_jpgraph
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Title.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Title.php
deleted file mode 100644
index 5d226c4b2b8..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Title.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Chart_Title
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Chart_Title
-{
-
-	/**
-	 * Title Caption
-	 *
-	 * @var string
-	 */
-	private $_caption = null;
-
-	/**
-	 * Title Layout
-	 *
-	 * @var PHPExcel_Chart_Layout
-	 */
-	private $_layout = null;
-
-	/**
-	 * Create a new PHPExcel_Chart_Title
-	 */
-	public function __construct($caption = null, PHPExcel_Chart_Layout $layout = null)
-	{
-		$this->_caption = $caption;
-		$this->_layout = $layout;
-	}
-
-	/**
-	 * Get caption
-	 *
-	 * @return string
-	 */
-	public function getCaption() {
-		return $this->_caption;
-	}
-
-	/**
-	 * Set caption
-	 *
-	 * @param string $caption
-     * @return PHPExcel_Chart_Title
-	 */
-	public function setCaption($caption = null) {
-		$this->_caption = $caption;
-        
-        return $this;
-	}
-
-	/**
-	 * Get Layout
-	 *
-	 * @return PHPExcel_Chart_Layout
-	 */
-	public function getLayout() {
-		return $this->_layout;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Comment.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Comment.php
deleted file mode 100644
index 8b8cfdcc4fc..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Comment.php
+++ /dev/null
@@ -1,327 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Comment
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Comment implements PHPExcel_IComparable
-{
-    /**
-     * Author
-     *
-     * @var string
-     */
-    private $_author;
-
-    /**
-     * Rich text comment
-     *
-     * @var PHPExcel_RichText
-     */
-    private $_text;
-
-    /**
-     * Comment width (CSS style, i.e. XXpx or YYpt)
-     *
-     * @var string
-     */
-    private $_width = '96pt';
-
-    /**
-     * Left margin (CSS style, i.e. XXpx or YYpt)
-     *
-     * @var string
-     */
-    private $_marginLeft = '59.25pt';
-
-    /**
-     * Top margin (CSS style, i.e. XXpx or YYpt)
-     *
-     * @var string
-     */
-    private $_marginTop = '1.5pt';
-
-    /**
-     * Visible
-     *
-     * @var boolean
-     */
-    private $_visible = false;
-
-    /**
-     * Comment height (CSS style, i.e. XXpx or YYpt)
-     *
-     * @var string
-     */
-    private $_height = '55.5pt';
-
-    /**
-     * Comment fill color
-     *
-     * @var PHPExcel_Style_Color
-     */
-    private $_fillColor;
-
-    /**
-     * Alignment
-     *
-     * @var string
-     */
-    private $_alignment;
-
-    /**
-     * Create a new PHPExcel_Comment
-     *
-     * @throws PHPExcel_Exception
-     */
-    public function __construct()
-    {
-        // Initialise variables
-        $this->_author		= 'Author';
-        $this->_text		= new PHPExcel_RichText();
-        $this->_fillColor	= new PHPExcel_Style_Color('FFFFFFE1');
-        $this->_alignment	= PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
-    }
-
-    /**
-     * Get Author
-     *
-     * @return string
-     */
-    public function getAuthor() {
-        return $this->_author;
-    }
-
-    /**
-     * Set Author
-     *
-     * @param string $pValue
-     * @return PHPExcel_Comment
-     */
-    public function setAuthor($pValue = '') {
-        $this->_author = $pValue;
-        return $this;
-    }
-
-    /**
-     * Get Rich text comment
-     *
-     * @return PHPExcel_RichText
-     */
-    public function getText() {
-        return $this->_text;
-    }
-
-    /**
-     * Set Rich text comment
-     *
-     * @param PHPExcel_RichText $pValue
-     * @return PHPExcel_Comment
-     */
-    public function setText(PHPExcel_RichText $pValue) {
-        $this->_text = $pValue;
-        return $this;
-    }
-
-    /**
-     * Get comment width (CSS style, i.e. XXpx or YYpt)
-     *
-     * @return string
-     */
-    public function getWidth() {
-        return $this->_width;
-    }
-
-    /**
-     * Set comment width (CSS style, i.e. XXpx or YYpt)
-     *
-     * @param string $value
-     * @return PHPExcel_Comment
-     */
-    public function setWidth($value = '96pt') {
-        $this->_width = $value;
-        return $this;
-    }
-
-    /**
-     * Get comment height (CSS style, i.e. XXpx or YYpt)
-     *
-     * @return string
-     */
-    public function getHeight() {
-        return $this->_height;
-    }
-
-    /**
-     * Set comment height (CSS style, i.e. XXpx or YYpt)
-     *
-     * @param string $value
-     * @return PHPExcel_Comment
-     */
-    public function setHeight($value = '55.5pt') {
-        $this->_height = $value;
-        return $this;
-    }
-
-    /**
-     * Get left margin (CSS style, i.e. XXpx or YYpt)
-     *
-     * @return string
-     */
-    public function getMarginLeft() {
-        return $this->_marginLeft;
-    }
-
-    /**
-     * Set left margin (CSS style, i.e. XXpx or YYpt)
-     *
-     * @param string $value
-     * @return PHPExcel_Comment
-     */
-    public function setMarginLeft($value = '59.25pt') {
-        $this->_marginLeft = $value;
-        return $this;
-    }
-
-    /**
-     * Get top margin (CSS style, i.e. XXpx or YYpt)
-     *
-     * @return string
-     */
-    public function getMarginTop() {
-        return $this->_marginTop;
-    }
-
-    /**
-     * Set top margin (CSS style, i.e. XXpx or YYpt)
-     *
-     * @param string $value
-     * @return PHPExcel_Comment
-     */
-    public function setMarginTop($value = '1.5pt') {
-        $this->_marginTop = $value;
-        return $this;
-    }
-
-    /**
-     * Is the comment visible by default?
-     *
-     * @return boolean
-     */
-    public function getVisible() {
-        return $this->_visible;
-    }
-
-    /**
-     * Set comment default visibility
-     *
-     * @param boolean $value
-     * @return PHPExcel_Comment
-     */
-    public function setVisible($value = false) {
-        $this->_visible = $value;
-        return $this;
-    }
-
-    /**
-     * Get fill color
-     *
-     * @return PHPExcel_Style_Color
-     */
-    public function getFillColor() {
-        return $this->_fillColor;
-    }
-
-    /**
-     * Set Alignment
-     *
-     * @param string $pValue
-     * @return PHPExcel_Comment
-     */
-    public function setAlignment($pValue = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL) {
-        $this->_alignment = $pValue;
-        return $this;
-    }
-
-    /**
-     * Get Alignment
-     *
-     * @return string
-     */
-    public function getAlignment() {
-        return $this->_alignment;
-    }
-
-    /**
-     * Get hash code
-     *
-     * @return string    Hash code
-     */
-    public function getHashCode() {
-        return md5(
-              $this->_author
-            . $this->_text->getHashCode()
-            . $this->_width
-            . $this->_height
-            . $this->_marginLeft
-            . $this->_marginTop
-            . ($this->_visible ? 1 : 0)
-            . $this->_fillColor->getHashCode()
-            . $this->_alignment
-            . __CLASS__
-        );
-    }
-
-    /**
-     * Implement PHP __clone to create a deep clone, not just a shallow copy.
-     */
-    public function __clone() {
-        $vars = get_object_vars($this);
-        foreach ($vars as $key => $value) {
-            if (is_object($value)) {
-                $this->$key = clone $value;
-            } else {
-                $this->$key = $value;
-            }
-        }
-    }
-
-    /**
-     * Convert to string
-     *
-     * @return string
-     */
-    public function __toString() {
-        return $this->_text->getPlainText();
-    }
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentProperties.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentProperties.php
deleted file mode 100644
index 7b4a0e4358b..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentProperties.php
+++ /dev/null
@@ -1,587 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category    PHPExcel
- * @package    PHPExcel
- * @copyright    Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_DocumentProperties
- *
- * @category    PHPExcel
- * @package        PHPExcel
- * @copyright    Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_DocumentProperties
-{
-    /** constants */
-    const PROPERTY_TYPE_BOOLEAN	= 'b';
-    const PROPERTY_TYPE_INTEGER = 'i';
-    const PROPERTY_TYPE_FLOAT   = 'f';
-    const PROPERTY_TYPE_DATE    = 'd';
-    const PROPERTY_TYPE_STRING  = 's';
-    const PROPERTY_TYPE_UNKNOWN = 'u';
-
-    /**
-     * Creator
-     *
-     * @var string
-     */
-    private $_creator    = 'Unknown Creator';
-
-    /**
-     * LastModifiedBy
-     *
-     * @var string
-     */
-    private $_lastModifiedBy;
-
-    /**
-     * Created
-     *
-     * @var datetime
-     */
-    private $_created;
-
-    /**
-     * Modified
-     *
-     * @var datetime
-     */
-    private $_modified;
-
-    /**
-     * Title
-     *
-     * @var string
-     */
-    private $_title            = 'Untitled Spreadsheet';
-
-    /**
-     * Description
-     *
-     * @var string
-     */
-    private $_description    = '';
-
-    /**
-     * Subject
-     *
-     * @var string
-     */
-    private $_subject        = '';
-
-    /**
-     * Keywords
-     *
-     * @var string
-     */
-    private $_keywords        = '';
-
-    /**
-     * Category
-     *
-     * @var string
-     */
-    private $_category        = '';
-
-    /**
-     * Manager
-     *
-     * @var string
-     */
-    private $_manager        = '';
-
-    /**
-     * Company
-     *
-     * @var string
-     */
-    private $_company        = 'Microsoft Corporation';
-
-    /**
-     * Custom Properties
-     *
-     * @var string
-     */
-    private $_customProperties    = array();
-
-
-    /**
-     * Create a new PHPExcel_DocumentProperties
-     */
-    public function __construct()
-    {
-        // Initialise values
-        $this->_lastModifiedBy    = $this->_creator;
-        $this->_created        = time();
-        $this->_modified    = time();
-    }
-
-    /**
-     * Get Creator
-     *
-     * @return string
-     */
-    public function getCreator() {
-        return $this->_creator;
-    }
-
-    /**
-     * Set Creator
-     *
-     * @param string $pValue
-     * @return PHPExcel_DocumentProperties
-     */
-    public function setCreator($pValue = '') {
-        $this->_creator = $pValue;
-        return $this;
-    }
-
-    /**
-     * Get Last Modified By
-     *
-     * @return string
-     */
-    public function getLastModifiedBy() {
-        return $this->_lastModifiedBy;
-    }
-
-    /**
-     * Set Last Modified By
-     *
-     * @param string $pValue
-     * @return PHPExcel_DocumentProperties
-     */
-    public function setLastModifiedBy($pValue = '') {
-        $this->_lastModifiedBy = $pValue;
-        return $this;
-    }
-
-    /**
-     * Get Created
-     *
-     * @return datetime
-     */
-    public function getCreated() {
-        return $this->_created;
-    }
-
-    /**
-     * Set Created
-     *
-     * @param datetime $pValue
-     * @return PHPExcel_DocumentProperties
-     */
-    public function setCreated($pValue = null) {
-        if ($pValue === NULL) {
-            $pValue = time();
-        } elseif (is_string($pValue)) {
-            if (is_numeric($pValue)) {
-                $pValue = intval($pValue);
-            } else {
-                $pValue = strtotime($pValue);
-            }
-        }
-
-        $this->_created = $pValue;
-        return $this;
-    }
-
-    /**
-     * Get Modified
-     *
-     * @return datetime
-     */
-    public function getModified() {
-        return $this->_modified;
-    }
-
-    /**
-     * Set Modified
-     *
-     * @param datetime $pValue
-     * @return PHPExcel_DocumentProperties
-     */
-    public function setModified($pValue = null) {
-        if ($pValue === NULL) {
-            $pValue = time();
-        } elseif (is_string($pValue)) {
-            if (is_numeric($pValue)) {
-                $pValue = intval($pValue);
-            } else {
-                $pValue = strtotime($pValue);
-            }
-        }
-
-        $this->_modified = $pValue;
-        return $this;
-    }
-
-    /**
-     * Get Title
-     *
-     * @return string
-     */
-    public function getTitle() {
-        return $this->_title;
-    }
-
-    /**
-     * Set Title
-     *
-     * @param string $pValue
-     * @return PHPExcel_DocumentProperties
-     */
-    public function setTitle($pValue = '') {
-        $this->_title = $pValue;
-        return $this;
-    }
-
-    /**
-     * Get Description
-     *
-     * @return string
-     */
-    public function getDescription() {
-        return $this->_description;
-    }
-
-    /**
-     * Set Description
-     *
-     * @param string $pValue
-     * @return PHPExcel_DocumentProperties
-     */
-    public function setDescription($pValue = '') {
-        $this->_description = $pValue;
-        return $this;
-    }
-
-    /**
-     * Get Subject
-     *
-     * @return string
-     */
-    public function getSubject() {
-        return $this->_subject;
-    }
-
-    /**
-     * Set Subject
-     *
-     * @param string $pValue
-     * @return PHPExcel_DocumentProperties
-     */
-    public function setSubject($pValue = '') {
-        $this->_subject = $pValue;
-        return $this;
-    }
-
-    /**
-     * Get Keywords
-     *
-     * @return string
-     */
-    public function getKeywords() {
-        return $this->_keywords;
-    }
-
-    /**
-     * Set Keywords
-     *
-     * @param string $pValue
-     * @return PHPExcel_DocumentProperties
-     */
-    public function setKeywords($pValue = '') {
-        $this->_keywords = $pValue;
-        return $this;
-    }
-
-    /**
-     * Get Category
-     *
-     * @return string
-     */
-    public function getCategory() {
-        return $this->_category;
-    }
-
-    /**
-     * Set Category
-     *
-     * @param string $pValue
-     * @return PHPExcel_DocumentProperties
-     */
-    public function setCategory($pValue = '') {
-        $this->_category = $pValue;
-        return $this;
-    }
-
-    /**
-     * Get Company
-     *
-     * @return string
-     */
-    public function getCompany() {
-        return $this->_company;
-    }
-
-    /**
-     * Set Company
-     *
-     * @param string $pValue
-     * @return PHPExcel_DocumentProperties
-     */
-    public function setCompany($pValue = '') {
-        $this->_company = $pValue;
-        return $this;
-    }
-
-    /**
-     * Get Manager
-     *
-     * @return string
-     */
-    public function getManager() {
-        return $this->_manager;
-    }
-
-    /**
-     * Set Manager
-     *
-     * @param string $pValue
-     * @return PHPExcel_DocumentProperties
-     */
-    public function setManager($pValue = '') {
-        $this->_manager = $pValue;
-        return $this;
-    }
-
-    /**
-     * Get a List of Custom Property Names
-     *
-     * @return array of string
-     */
-    public function getCustomProperties() {
-        return array_keys($this->_customProperties);
-    }
-
-    /**
-     * Check if a Custom Property is defined
-     *
-     * @param string $propertyName
-     * @return boolean
-     */
-    public function isCustomPropertySet($propertyName) {
-        return isset($this->_customProperties[$propertyName]);
-    }
-
-    /**
-     * Get a Custom Property Value
-     *
-     * @param string $propertyName
-     * @return string
-     */
-    public function getCustomPropertyValue($propertyName) {
-        if (isset($this->_customProperties[$propertyName])) {
-            return $this->_customProperties[$propertyName]['value'];
-        }
-
-    }
-
-    /**
-     * Get a Custom Property Type
-     *
-     * @param string $propertyName
-     * @return string
-     */
-    public function getCustomPropertyType($propertyName) {
-        if (isset($this->_customProperties[$propertyName])) {
-            return $this->_customProperties[$propertyName]['type'];
-        }
-
-    }
-
-    /**
-     * Set a Custom Property
-     *
-     * @param string $propertyName
-     * @param mixed $propertyValue
-     * @param string $propertyType
-     * 	 'i'    : Integer
-     *   'f' : Floating Point
-     *   's' : String
-     *   'd' : Date/Time
-     *   'b' : Boolean
-     * @return PHPExcel_DocumentProperties
-     */
-    public function setCustomProperty($propertyName,$propertyValue='',$propertyType=NULL) {
-        if (($propertyType === NULL) || (!in_array($propertyType,array(self::PROPERTY_TYPE_INTEGER,
-                                                                       self::PROPERTY_TYPE_FLOAT,
-                                                                       self::PROPERTY_TYPE_STRING,
-                                                                       self::PROPERTY_TYPE_DATE,
-                                                                       self::PROPERTY_TYPE_BOOLEAN)))) {
-            if ($propertyValue === NULL) {
-                $propertyType = self::PROPERTY_TYPE_STRING;
-            } elseif (is_float($propertyValue)) {
-                $propertyType = self::PROPERTY_TYPE_FLOAT;
-            } elseif(is_int($propertyValue)) {
-                $propertyType = self::PROPERTY_TYPE_INTEGER;
-            } elseif (is_bool($propertyValue)) {
-                $propertyType = self::PROPERTY_TYPE_BOOLEAN;
-            } else {
-                $propertyType = self::PROPERTY_TYPE_STRING;
-            }
-        }
-
-        $this->_customProperties[$propertyName] = array('value' => $propertyValue, 'type' => $propertyType);
-        return $this;
-    }
-
-    /**
-     * Implement PHP __clone to create a deep clone, not just a shallow copy.
-     */
-    public function __clone() {
-        $vars = get_object_vars($this);
-        foreach ($vars as $key => $value) {
-            if (is_object($value)) {
-                $this->$key = clone $value;
-            } else {
-                $this->$key = $value;
-            }
-        }
-    }
-
-    public static function convertProperty($propertyValue,$propertyType) {
-        switch ($propertyType) {
-            case 'empty'    :    //    Empty
-                return '';
-                break;
-            case 'null'        :    //    Null
-                return NULL;
-                break;
-            case 'i1'        :    //    1-Byte Signed Integer
-            case 'i2'        :    //    2-Byte Signed Integer
-            case 'i4'        :    //    4-Byte Signed Integer
-            case 'i8'        :    //    8-Byte Signed Integer
-            case 'int'        :    //    Integer
-                return (int) $propertyValue;
-                break;
-            case 'ui1'        :    //    1-Byte Unsigned Integer
-            case 'ui2'        :    //    2-Byte Unsigned Integer
-            case 'ui4'        :    //    4-Byte Unsigned Integer
-            case 'ui8'        :    //    8-Byte Unsigned Integer
-            case 'uint'        :    //    Unsigned Integer
-                return abs((int) $propertyValue);
-                break;
-            case 'r4'        :    //    4-Byte Real Number
-            case 'r8'        :    //    8-Byte Real Number
-            case 'decimal'    :    //    Decimal
-                return (float) $propertyValue;
-                break;
-            case 'lpstr'    :    //    LPSTR
-            case 'lpwstr'    :    //    LPWSTR
-            case 'bstr'        :    //    Basic String
-                return $propertyValue;
-                break;
-            case 'date'        :    //    Date and Time
-            case 'filetime'    :    //    File Time
-                return strtotime($propertyValue);
-                break;
-            case 'bool'        :    //    Boolean
-                return ($propertyValue == 'true') ? True : False;
-                break;
-            case 'cy'        :    //    Currency
-            case 'error'    :    //    Error Status Code
-            case 'vector'    :    //    Vector
-            case 'array'    :    //    Array
-            case 'blob'        :    //    Binary Blob
-            case 'oblob'    :    //    Binary Blob Object
-            case 'stream'    :    //    Binary Stream
-            case 'ostream'    :    //    Binary Stream Object
-            case 'storage'    :    //    Binary Storage
-            case 'ostorage'    :    //    Binary Storage Object
-            case 'vstream'    :    //    Binary Versioned Stream
-            case 'clsid'    :    //    Class ID
-            case 'cf'        :    //    Clipboard Data
-                return $propertyValue;
-                break;
-        }
-        return $propertyValue;
-    }
-
-    public static function convertPropertyType($propertyType) {
-        switch ($propertyType) {
-            case 'i1'        :    //    1-Byte Signed Integer
-            case 'i2'        :    //    2-Byte Signed Integer
-            case 'i4'        :    //    4-Byte Signed Integer
-            case 'i8'        :    //    8-Byte Signed Integer
-            case 'int'        :    //    Integer
-            case 'ui1'        :    //    1-Byte Unsigned Integer
-            case 'ui2'        :    //    2-Byte Unsigned Integer
-            case 'ui4'        :    //    4-Byte Unsigned Integer
-            case 'ui8'        :    //    8-Byte Unsigned Integer
-            case 'uint'        :    //    Unsigned Integer
-                return self::PROPERTY_TYPE_INTEGER;
-                break;
-            case 'r4'        :    //    4-Byte Real Number
-            case 'r8'        :    //    8-Byte Real Number
-            case 'decimal'    :    //    Decimal
-                return self::PROPERTY_TYPE_FLOAT;
-                break;
-            case 'empty'    :    //    Empty
-            case 'null'        :    //    Null
-            case 'lpstr'    :    //    LPSTR
-            case 'lpwstr'    :    //    LPWSTR
-            case 'bstr'        :    //    Basic String
-                return self::PROPERTY_TYPE_STRING;
-                break;
-            case 'date'        :    //    Date and Time
-            case 'filetime'    :    //    File Time
-                return self::PROPERTY_TYPE_DATE;
-                break;
-            case 'bool'        :    //    Boolean
-                return self::PROPERTY_TYPE_BOOLEAN;
-                break;
-            case 'cy'        :    //    Currency
-            case 'error'    :    //    Error Status Code
-            case 'vector'    :    //    Vector
-            case 'array'    :    //    Array
-            case 'blob'        :    //    Binary Blob
-            case 'oblob'    :    //    Binary Blob Object
-            case 'stream'    :    //    Binary Stream
-            case 'ostream'    :    //    Binary Stream Object
-            case 'storage'    :    //    Binary Storage
-            case 'ostorage'    :    //    Binary Storage Object
-            case 'vstream'    :    //    Binary Versioned Stream
-            case 'clsid'    :    //    Class ID
-            case 'cf'        :    //    Clipboard Data
-                return self::PROPERTY_TYPE_UNKNOWN;
-                break;
-        }
-        return self::PROPERTY_TYPE_UNKNOWN;
-    }
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentSecurity.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentSecurity.php
deleted file mode 100644
index cf7ffb57c0f..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentSecurity.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_DocumentSecurity
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_DocumentSecurity
-{
-	/**
-	 * LockRevision
-	 *
-	 * @var boolean
-	 */
-	private $_lockRevision;
-
-	/**
-	 * LockStructure
-	 *
-	 * @var boolean
-	 */
-	private $_lockStructure;
-
-	/**
-	 * LockWindows
-	 *
-	 * @var boolean
-	 */
-	private $_lockWindows;
-
-	/**
-	 * RevisionsPassword
-	 *
-	 * @var string
-	 */
-	private $_revisionsPassword;
-
-	/**
-	 * WorkbookPassword
-	 *
-	 * @var string
-	 */
-	private $_workbookPassword;
-
-    /**
-     * Create a new PHPExcel_DocumentSecurity
-     */
-    public function __construct()
-    {
-    	// Initialise values
-    	$this->_lockRevision		= false;
-    	$this->_lockStructure		= false;
-    	$this->_lockWindows			= false;
-    	$this->_revisionsPassword	= '';
-    	$this->_workbookPassword	= '';
-    }
-
-    /**
-     * Is some sort of dcument security enabled?
-     *
-     * @return boolean
-     */
-    function isSecurityEnabled() {
-    	return 	$this->_lockRevision ||
-		    	$this->_lockStructure ||
-		    	$this->_lockWindows;
-    }
-
-    /**
-     * Get LockRevision
-     *
-     * @return boolean
-     */
-    function getLockRevision() {
-    	return $this->_lockRevision;
-    }
-
-    /**
-     * Set LockRevision
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_DocumentSecurity
-     */
-    function setLockRevision($pValue = false) {
-    	$this->_lockRevision = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get LockStructure
-     *
-     * @return boolean
-     */
-    function getLockStructure() {
-    	return $this->_lockStructure;
-    }
-
-    /**
-     * Set LockStructure
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_DocumentSecurity
-     */
-    function setLockStructure($pValue = false) {
-		$this->_lockStructure = $pValue;
-		return $this;
-    }
-
-    /**
-     * Get LockWindows
-     *
-     * @return boolean
-     */
-    function getLockWindows() {
-    	return $this->_lockWindows;
-    }
-
-    /**
-     * Set LockWindows
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_DocumentSecurity
-     */
-    function setLockWindows($pValue = false) {
-    	$this->_lockWindows = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get RevisionsPassword (hashed)
-     *
-     * @return string
-     */
-    function getRevisionsPassword() {
-    	return $this->_revisionsPassword;
-    }
-
-    /**
-     * Set RevisionsPassword
-     *
-     * @param string 	$pValue
-     * @param boolean 	$pAlreadyHashed If the password has already been hashed, set this to true
-     * @return PHPExcel_DocumentSecurity
-     */
-    function setRevisionsPassword($pValue = '', $pAlreadyHashed = false) {
-    	if (!$pAlreadyHashed) {
-    		$pValue = PHPExcel_Shared_PasswordHasher::hashPassword($pValue);
-    	}
-    	$this->_revisionsPassword = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get WorkbookPassword (hashed)
-     *
-     * @return string
-     */
-    function getWorkbookPassword() {
-    	return $this->_workbookPassword;
-    }
-
-    /**
-     * Set WorkbookPassword
-     *
-     * @param string 	$pValue
-     * @param boolean 	$pAlreadyHashed If the password has already been hashed, set this to true
-     * @return PHPExcel_DocumentSecurity
-     */
-    function setWorkbookPassword($pValue = '', $pAlreadyHashed = false) {
-    	if (!$pAlreadyHashed) {
-    		$pValue = PHPExcel_Shared_PasswordHasher::hashPassword($pValue);
-    	}
-		$this->_workbookPassword = $pValue;
-		return $this;
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Exception.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Exception.php
deleted file mode 100644
index 578b9eeeec8..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Exception.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Exception
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Exception extends Exception {
-    /**
-     * Error handler callback
-     *
-     * @param mixed $code
-     * @param mixed $string
-     * @param mixed $file
-     * @param mixed $line
-     * @param mixed $context
-     */
-    public static function errorHandlerCallback($code, $string, $file, $line, $context) {
-        $e = new self($string, $code);
-        $e->line = $line;
-        $e->file = $file;
-        throw $e;
-    }
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/HashTable.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/HashTable.php
deleted file mode 100644
index 77106e1e05a..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/HashTable.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_HashTable
- *
- * @category   PHPExcel
- * @package	PHPExcel
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_HashTable
-{
-	/**
-	 * HashTable elements
-	 *
-	 * @var array
-	 */
-	public $_items = array();
-
-	/**
-	 * HashTable key map
-	 *
-	 * @var array
-	 */
-	public $_keyMap = array();
-
-	/**
-	 * Create a new PHPExcel_HashTable
-	 *
-	 * @param	PHPExcel_IComparable[] $pSource	Optional source array to create HashTable from
-	 * @throws	PHPExcel_Exception
-	 */
-	public function __construct($pSource = null)
-	{
-		if ($pSource !== NULL) {
-			// Create HashTable
-			$this->addFromSource($pSource);
-		}
-	}
-
-	/**
-	 * Add HashTable items from source
-	 *
-	 * @param	PHPExcel_IComparable[] $pSource	Source array to create HashTable from
-	 * @throws	PHPExcel_Exception
-	 */
-	public function addFromSource($pSource = null) {
-		// Check if an array was passed
-		if ($pSource == null) {
-			return;
-		} else if (!is_array($pSource)) {
-			throw new PHPExcel_Exception('Invalid array parameter passed.');
-		}
-
-		foreach ($pSource as $item) {
-			$this->add($item);
-		}
-	}
-
-	/**
-	 * Add HashTable item
-	 *
-	 * @param	PHPExcel_IComparable $pSource	Item to add
-	 * @throws	PHPExcel_Exception
-	 */
-	public function add(PHPExcel_IComparable $pSource = null) {
-		$hash = $pSource->getHashCode();
-		if (!isset($this->_items[$hash])) {
-			$this->_items[$hash] = $pSource;
-			$this->_keyMap[count($this->_items) - 1] = $hash;
-		}
-	}
-
-	/**
-	 * Remove HashTable item
-	 *
-	 * @param	PHPExcel_IComparable $pSource	Item to remove
-	 * @throws	PHPExcel_Exception
-	 */
-	public function remove(PHPExcel_IComparable $pSource = null) {
-		$hash = $pSource->getHashCode();
-		if (isset($this->_items[$hash])) {
-			unset($this->_items[$hash]);
-
-			$deleteKey = -1;
-			foreach ($this->_keyMap as $key => $value) {
-				if ($deleteKey >= 0) {
-					$this->_keyMap[$key - 1] = $value;
-				}
-
-				if ($value == $hash) {
-					$deleteKey = $key;
-				}
-			}
-			unset($this->_keyMap[count($this->_keyMap) - 1]);
-		}
-	}
-
-	/**
-	 * Clear HashTable
-	 *
-	 */
-	public function clear() {
-		$this->_items = array();
-		$this->_keyMap = array();
-	}
-
-	/**
-	 * Count
-	 *
-	 * @return int
-	 */
-	public function count() {
-		return count($this->_items);
-	}
-
-	/**
-	 * Get index for hash code
-	 *
-	 * @param	string	$pHashCode
-	 * @return	int	Index
-	 */
-	public function getIndexForHashCode($pHashCode = '') {
-		return array_search($pHashCode, $this->_keyMap);
-	}
-
-	/**
-	 * Get by index
-	 *
-	 * @param	int	$pIndex
-	 * @return	PHPExcel_IComparable
-	 *
-	 */
-	public function getByIndex($pIndex = 0) {
-		if (isset($this->_keyMap[$pIndex])) {
-			return $this->getByHashCode( $this->_keyMap[$pIndex] );
-		}
-
-		return null;
-	}
-
-	/**
-	 * Get by hashcode
-	 *
-	 * @param	string	$pHashCode
-	 * @return	PHPExcel_IComparable
-	 *
-	 */
-	public function getByHashCode($pHashCode = '') {
-		if (isset($this->_items[$pHashCode])) {
-			return $this->_items[$pHashCode];
-		}
-
-		return null;
-	}
-
-	/**
-	 * HashTable to array
-	 *
-	 * @return PHPExcel_IComparable[]
-	 */
-	public function toArray() {
-		return $this->_items;
-	}
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			}
-		}
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Helper/HTML.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Helper/HTML.php
deleted file mode 100644
index 9e30ae8a794..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Helper/HTML.php
+++ /dev/null
@@ -1,762 +0,0 @@
-<?php
-
-class PHPExcel_Helper_HTML
-{
-    protected static $colourMap = array(
-        'aliceblue' => 'f0f8ff', 
-        'antiquewhite' => 'faebd7',
-        'antiquewhite1' => 'ffefdb',
-        'antiquewhite2' => 'eedfcc',
-        'antiquewhite3' => 'cdc0b0',
-        'antiquewhite4' => '8b8378',
-        'aqua' => '00ffff',
-        'aquamarine1' => '7fffd4',
-        'aquamarine2' => '76eec6',
-        'aquamarine4' => '458b74',
-        'azure1' => 'f0ffff',
-        'azure2' => 'e0eeee',
-        'azure3' => 'c1cdcd',
-        'azure4' => '838b8b',
-        'beige' => 'f5f5dc',
-        'bisque1' => 'ffe4c4',
-        'bisque2' => 'eed5b7',
-        'bisque3' => 'cdb79e',
-        'bisque4' => '8b7d6b',
-        'black' => '000000',
-        'blanchedalmond' => 'ffebcd',
-        'blue' => '0000ff',
-        'blue1' => '0000ff',
-        'blue2' => '0000ee',
-        'blue4' => '00008b',
-        'blueviolet' => '8a2be2',
-        'brown' => 'a52a2a',
-        'brown1' => 'ff4040',
-        'brown2' => 'ee3b3b',
-        'brown3' => 'cd3333',
-        'brown4' => '8b2323',
-        'burlywood' => 'deb887',
-        'burlywood1' => 'ffd39b',
-        'burlywood2' => 'eec591',
-        'burlywood3' => 'cdaa7d',
-        'burlywood4' => '8b7355',
-        'cadetblue' => '5f9ea0',
-        'cadetblue1' => '98f5ff',
-        'cadetblue2' => '8ee5ee',
-        'cadetblue3' => '7ac5cd',
-        'cadetblue4' => '53868b',
-        'chartreuse1' => '7fff00',
-        'chartreuse2' => '76ee00',
-        'chartreuse3' => '66cd00',
-        'chartreuse4' => '458b00',
-        'chocolate' => 'd2691e',
-        'chocolate1' => 'ff7f24',
-        'chocolate2' => 'ee7621',
-        'chocolate3' => 'cd661d',
-        'coral' => 'ff7f50',
-        'coral1' => 'ff7256',
-        'coral2' => 'ee6a50',
-        'coral3' => 'cd5b45',
-        'coral4' => '8b3e2f',
-        'cornflowerblue' => '6495ed',
-        'cornsilk1' => 'fff8dc',
-        'cornsilk2' => 'eee8cd',
-        'cornsilk3' => 'cdc8b1',
-        'cornsilk4' => '8b8878',
-        'cyan1' => '00ffff',
-        'cyan2' => '00eeee',
-        'cyan3' => '00cdcd',
-        'cyan4' => '008b8b',
-        'darkgoldenrod' => 'b8860b',
-        'darkgoldenrod1' => 'ffb90f',
-        'darkgoldenrod2' => 'eead0e',
-        'darkgoldenrod3' => 'cd950c',
-        'darkgoldenrod4' => '8b6508',
-        'darkgreen' => '006400',
-        'darkkhaki' => 'bdb76b',
-        'darkolivegreen' => '556b2f',
-        'darkolivegreen1' => 'caff70',
-        'darkolivegreen2' => 'bcee68',
-        'darkolivegreen3' => 'a2cd5a',
-        'darkolivegreen4' => '6e8b3d',
-        'darkorange' => 'ff8c00',
-        'darkorange1' => 'ff7f00',
-        'darkorange2' => 'ee7600',
-        'darkorange3' => 'cd6600',
-        'darkorange4' => '8b4500',
-        'darkorchid' => '9932cc',
-        'darkorchid1' => 'bf3eff',
-        'darkorchid2' => 'b23aee',
-        'darkorchid3' => '9a32cd',
-        'darkorchid4' => '68228b',
-        'darksalmon' => 'e9967a',
-        'darkseagreen' => '8fbc8f',
-        'darkseagreen1' => 'c1ffc1',
-        'darkseagreen2' => 'b4eeb4',
-        'darkseagreen3' => '9bcd9b',
-        'darkseagreen4' => '698b69',
-        'darkslateblue' => '483d8b',
-        'darkslategray' => '2f4f4f',
-        'darkslategray1' => '97ffff',
-        'darkslategray2' => '8deeee',
-        'darkslategray3' => '79cdcd',
-        'darkslategray4' => '528b8b',
-        'darkturquoise' => '00ced1',
-        'darkviolet' => '9400d3',
-        'deeppink1' => 'ff1493',
-        'deeppink2' => 'ee1289',
-        'deeppink3' => 'cd1076',
-        'deeppink4' => '8b0a50',
-        'deepskyblue1' => '00bfff',
-        'deepskyblue2' => '00b2ee',
-        'deepskyblue3' => '009acd',
-        'deepskyblue4' => '00688b',
-        'dimgray' => '696969',
-        'dodgerblue1' => '1e90ff',
-        'dodgerblue2' => '1c86ee',
-        'dodgerblue3' => '1874cd',
-        'dodgerblue4' => '104e8b',
-        'firebrick' => 'b22222',
-        'firebrick1' => 'ff3030',
-        'firebrick2' => 'ee2c2c',
-        'firebrick3' => 'cd2626',
-        'firebrick4' => '8b1a1a',
-        'floralwhite' => 'fffaf0',
-        'forestgreen' => '228b22',
-        'fuchsia' => 'ff00ff',
-        'gainsboro' => 'dcdcdc',
-        'ghostwhite' => 'f8f8ff',
-        'gold1' => 'ffd700',
-        'gold2' => 'eec900',
-        'gold3' => 'cdad00',
-        'gold4' => '8b7500',
-        'goldenrod' => 'daa520',
-        'goldenrod1' => 'ffc125',
-        'goldenrod2' => 'eeb422',
-        'goldenrod3' => 'cd9b1d',
-        'goldenrod4' => '8b6914',
-        'gray' => 'bebebe',
-        'gray1' => '030303',
-        'gray10' => '1a1a1a',
-        'gray11' => '1c1c1c',
-        'gray12' => '1f1f1f',
-        'gray13' => '212121',
-        'gray14' => '242424',
-        'gray15' => '262626',
-        'gray16' => '292929',
-        'gray17' => '2b2b2b',
-        'gray18' => '2e2e2e',
-        'gray19' => '303030',
-        'gray2' => '050505',
-        'gray20' => '333333',
-        'gray21' => '363636',
-        'gray22' => '383838',
-        'gray23' => '3b3b3b',
-        'gray24' => '3d3d3d',
-        'gray25' => '404040',
-        'gray26' => '424242',
-        'gray27' => '454545',
-        'gray28' => '474747',
-        'gray29' => '4a4a4a',
-        'gray3' => '080808',
-        'gray30' => '4d4d4d',
-        'gray31' => '4f4f4f',
-        'gray32' => '525252',
-        'gray33' => '545454',
-        'gray34' => '575757',
-        'gray35' => '595959',
-        'gray36' => '5c5c5c',
-        'gray37' => '5e5e5e',
-        'gray38' => '616161',
-        'gray39' => '636363',
-        'gray4' => '0a0a0a',
-        'gray40' => '666666',
-        'gray41' => '696969',
-        'gray42' => '6b6b6b',
-        'gray43' => '6e6e6e',
-        'gray44' => '707070',
-        'gray45' => '737373',
-        'gray46' => '757575',
-        'gray47' => '787878',
-        'gray48' => '7a7a7a',
-        'gray49' => '7d7d7d',
-        'gray5' => '0d0d0d',
-        'gray50' => '7f7f7f',
-        'gray51' => '828282',
-        'gray52' => '858585',
-        'gray53' => '878787',
-        'gray54' => '8a8a8a',
-        'gray55' => '8c8c8c',
-        'gray56' => '8f8f8f',
-        'gray57' => '919191',
-        'gray58' => '949494',
-        'gray59' => '969696',
-        'gray6' => '0f0f0f',
-        'gray60' => '999999',
-        'gray61' => '9c9c9c',
-        'gray62' => '9e9e9e',
-        'gray63' => 'a1a1a1',
-        'gray64' => 'a3a3a3',
-        'gray65' => 'a6a6a6',
-        'gray66' => 'a8a8a8',
-        'gray67' => 'ababab',
-        'gray68' => 'adadad',
-        'gray69' => 'b0b0b0',
-        'gray7' => '121212',
-        'gray70' => 'b3b3b3',
-        'gray71' => 'b5b5b5',
-        'gray72' => 'b8b8b8',
-        'gray73' => 'bababa',
-        'gray74' => 'bdbdbd',
-        'gray75' => 'bfbfbf',
-        'gray76' => 'c2c2c2',
-        'gray77' => 'c4c4c4',
-        'gray78' => 'c7c7c7',
-        'gray79' => 'c9c9c9',
-        'gray8' => '141414',
-        'gray80' => 'cccccc',
-        'gray81' => 'cfcfcf',
-        'gray82' => 'd1d1d1',
-        'gray83' => 'd4d4d4',
-        'gray84' => 'd6d6d6',
-        'gray85' => 'd9d9d9',
-        'gray86' => 'dbdbdb',
-        'gray87' => 'dedede',
-        'gray88' => 'e0e0e0',
-        'gray89' => 'e3e3e3',
-        'gray9' => '171717',
-        'gray90' => 'e5e5e5',
-        'gray91' => 'e8e8e8',
-        'gray92' => 'ebebeb',
-        'gray93' => 'ededed',
-        'gray94' => 'f0f0f0',
-        'gray95' => 'f2f2f2',
-        'gray97' => 'f7f7f7',
-        'gray98' => 'fafafa',
-        'gray99' => 'fcfcfc',
-        'green' => '00ff00',
-        'green1' => '00ff00',
-        'green2' => '00ee00',
-        'green3' => '00cd00',
-        'green4' => '008b00',
-        'greenyellow' => 'adff2f',
-        'honeydew1' => 'f0fff0',
-        'honeydew2' => 'e0eee0',
-        'honeydew3' => 'c1cdc1',
-        'honeydew4' => '838b83',
-        'hotpink' => 'ff69b4',
-        'hotpink1' => 'ff6eb4',
-        'hotpink2' => 'ee6aa7',
-        'hotpink3' => 'cd6090',
-        'hotpink4' => '8b3a62',
-        'indianred' => 'cd5c5c',
-        'indianred1' => 'ff6a6a',
-        'indianred2' => 'ee6363',
-        'indianred3' => 'cd5555',
-        'indianred4' => '8b3a3a',
-        'ivory1' => 'fffff0',
-        'ivory2' => 'eeeee0',
-        'ivory3' => 'cdcdc1',
-        'ivory4' => '8b8b83',
-        'khaki' => 'f0e68c',
-        'khaki1' => 'fff68f',
-        'khaki2' => 'eee685',
-        'khaki3' => 'cdc673',
-        'khaki4' => '8b864e',
-        'lavender' => 'e6e6fa',
-        'lavenderblush1' => 'fff0f5',
-        'lavenderblush2' => 'eee0e5',
-        'lavenderblush3' => 'cdc1c5',
-        'lavenderblush4' => '8b8386',
-        'lawngreen' => '7cfc00',
-        'lemonchiffon1' => 'fffacd',
-        'lemonchiffon2' => 'eee9bf',
-        'lemonchiffon3' => 'cdc9a5',
-        'lemonchiffon4' => '8b8970',
-        'light' => 'eedd82',
-        'lightblue' => 'add8e6',
-        'lightblue1' => 'bfefff',
-        'lightblue2' => 'b2dfee',
-        'lightblue3' => '9ac0cd',
-        'lightblue4' => '68838b',
-        'lightcoral' => 'f08080',
-        'lightcyan1' => 'e0ffff',
-        'lightcyan2' => 'd1eeee',
-        'lightcyan3' => 'b4cdcd',
-        'lightcyan4' => '7a8b8b',
-        'lightgoldenrod1' => 'ffec8b',
-        'lightgoldenrod2' => 'eedc82',
-        'lightgoldenrod3' => 'cdbe70',
-        'lightgoldenrod4' => '8b814c',
-        'lightgoldenrodyellow' => 'fafad2',
-        'lightgray' => 'd3d3d3',
-        'lightpink' => 'ffb6c1',
-        'lightpink1' => 'ffaeb9',
-        'lightpink2' => 'eea2ad',
-        'lightpink3' => 'cd8c95',
-        'lightpink4' => '8b5f65',
-        'lightsalmon1' => 'ffa07a',
-        'lightsalmon2' => 'ee9572',
-        'lightsalmon3' => 'cd8162',
-        'lightsalmon4' => '8b5742',
-        'lightseagreen' => '20b2aa',
-        'lightskyblue' => '87cefa',
-        'lightskyblue1' => 'b0e2ff',
-        'lightskyblue2' => 'a4d3ee',
-        'lightskyblue3' => '8db6cd',
-        'lightskyblue4' => '607b8b',
-        'lightslateblue' => '8470ff',
-        'lightslategray' => '778899',
-        'lightsteelblue' => 'b0c4de',
-        'lightsteelblue1' => 'cae1ff',
-        'lightsteelblue2' => 'bcd2ee',
-        'lightsteelblue3' => 'a2b5cd',
-        'lightsteelblue4' => '6e7b8b',
-        'lightyellow1' => 'ffffe0',
-        'lightyellow2' => 'eeeed1',
-        'lightyellow3' => 'cdcdb4',
-        'lightyellow4' => '8b8b7a',
-        'lime' => '00ff00',
-        'limegreen' => '32cd32',
-        'linen' => 'faf0e6',
-        'magenta' => 'ff00ff',
-        'magenta2' => 'ee00ee',
-        'magenta3' => 'cd00cd',
-        'magenta4' => '8b008b',
-        'maroon' => 'b03060',
-        'maroon1' => 'ff34b3',
-        'maroon2' => 'ee30a7',
-        'maroon3' => 'cd2990',
-        'maroon4' => '8b1c62',
-        'medium' => '66cdaa',
-        'mediumaquamarine' => '66cdaa',
-        'mediumblue' => '0000cd',
-        'mediumorchid' => 'ba55d3',
-        'mediumorchid1' => 'e066ff',
-        'mediumorchid2' => 'd15fee',
-        'mediumorchid3' => 'b452cd',
-        'mediumorchid4' => '7a378b',
-        'mediumpurple' => '9370db',
-        'mediumpurple1' => 'ab82ff',
-        'mediumpurple2' => '9f79ee',
-        'mediumpurple3' => '8968cd',
-        'mediumpurple4' => '5d478b',
-        'mediumseagreen' => '3cb371',
-        'mediumslateblue' => '7b68ee',
-        'mediumspringgreen' => '00fa9a',
-        'mediumturquoise' => '48d1cc',
-        'mediumvioletred' => 'c71585',
-        'midnightblue' => '191970',
-        'mintcream' => 'f5fffa',
-        'mistyrose1' => 'ffe4e1',
-        'mistyrose2' => 'eed5d2',
-        'mistyrose3' => 'cdb7b5',
-        'mistyrose4' => '8b7d7b',
-        'moccasin' => 'ffe4b5',
-        'navajowhite1' => 'ffdead',
-        'navajowhite2' => 'eecfa1',
-        'navajowhite3' => 'cdb38b',
-        'navajowhite4' => '8b795e',
-        'navy' => '000080',
-        'navyblue' => '000080',
-        'oldlace' => 'fdf5e6',
-        'olive' => '808000',
-        'olivedrab' => '6b8e23',
-        'olivedrab1' => 'c0ff3e',
-        'olivedrab2' => 'b3ee3a',
-        'olivedrab4' => '698b22',
-        'orange' => 'ffa500',
-        'orange1' => 'ffa500',
-        'orange2' => 'ee9a00',
-        'orange3' => 'cd8500',
-        'orange4' => '8b5a00',
-        'orangered1' => 'ff4500',
-        'orangered2' => 'ee4000',
-        'orangered3' => 'cd3700',
-        'orangered4' => '8b2500',
-        'orchid' => 'da70d6',
-        'orchid1' => 'ff83fa',
-        'orchid2' => 'ee7ae9',
-        'orchid3' => 'cd69c9',
-        'orchid4' => '8b4789',
-        'pale' => 'db7093',
-        'palegoldenrod' => 'eee8aa',
-        'palegreen' => '98fb98',
-        'palegreen1' => '9aff9a',
-        'palegreen2' => '90ee90',
-        'palegreen3' => '7ccd7c',
-        'palegreen4' => '548b54',
-        'paleturquoise' => 'afeeee',
-        'paleturquoise1' => 'bbffff',
-        'paleturquoise2' => 'aeeeee',
-        'paleturquoise3' => '96cdcd',
-        'paleturquoise4' => '668b8b',
-        'palevioletred' => 'db7093',
-        'palevioletred1' => 'ff82ab',
-        'palevioletred2' => 'ee799f',
-        'palevioletred3' => 'cd6889',
-        'palevioletred4' => '8b475d',
-        'papayawhip' => 'ffefd5',
-        'peachpuff1' => 'ffdab9',
-        'peachpuff2' => 'eecbad',
-        'peachpuff3' => 'cdaf95',
-        'peachpuff4' => '8b7765',
-        'pink' => 'ffc0cb',
-        'pink1' => 'ffb5c5',
-        'pink2' => 'eea9b8',
-        'pink3' => 'cd919e',
-        'pink4' => '8b636c',
-        'plum' => 'dda0dd',
-        'plum1' => 'ffbbff',
-        'plum2' => 'eeaeee',
-        'plum3' => 'cd96cd',
-        'plum4' => '8b668b',
-        'powderblue' => 'b0e0e6',
-        'purple' => 'a020f0',
-        'rebeccapurple' => '663399',
-        'purple1' => '9b30ff',
-        'purple2' => '912cee',
-        'purple3' => '7d26cd',
-        'purple4' => '551a8b',
-        'red' => 'ff0000',
-        'red1' => 'ff0000',
-        'red2' => 'ee0000',
-        'red3' => 'cd0000',
-        'red4' => '8b0000',
-        'rosybrown' => 'bc8f8f',
-        'rosybrown1' => 'ffc1c1',
-        'rosybrown2' => 'eeb4b4',
-        'rosybrown3' => 'cd9b9b',
-        'rosybrown4' => '8b6969',
-        'royalblue' => '4169e1',
-        'royalblue1' => '4876ff',
-        'royalblue2' => '436eee',
-        'royalblue3' => '3a5fcd',
-        'royalblue4' => '27408b',
-        'saddlebrown' => '8b4513',
-        'salmon' => 'fa8072',
-        'salmon1' => 'ff8c69',
-        'salmon2' => 'ee8262',
-        'salmon3' => 'cd7054',
-        'salmon4' => '8b4c39',
-        'sandybrown' => 'f4a460',
-        'seagreen1' => '54ff9f',
-        'seagreen2' => '4eee94',
-        'seagreen3' => '43cd80',
-        'seagreen4' => '2e8b57',
-        'seashell1' => 'fff5ee',
-        'seashell2' => 'eee5de',
-        'seashell3' => 'cdc5bf',
-        'seashell4' => '8b8682',
-        'sienna' => 'a0522d',
-        'sienna1' => 'ff8247',
-        'sienna2' => 'ee7942',
-        'sienna3' => 'cd6839',
-        'sienna4' => '8b4726',
-        'silver' => 'c0c0c0',
-        'skyblue' => '87ceeb',
-        'skyblue1' => '87ceff',
-        'skyblue2' => '7ec0ee',
-        'skyblue3' => '6ca6cd',
-        'skyblue4' => '4a708b',
-        'slateblue' => '6a5acd',
-        'slateblue1' => '836fff',
-        'slateblue2' => '7a67ee',
-        'slateblue3' => '6959cd',
-        'slateblue4' => '473c8b',
-        'slategray' => '708090',
-        'slategray1' => 'c6e2ff',
-        'slategray2' => 'b9d3ee',
-        'slategray3' => '9fb6cd',
-        'slategray4' => '6c7b8b',
-        'snow1' => 'fffafa',
-        'snow2' => 'eee9e9',
-        'snow3' => 'cdc9c9',
-        'snow4' => '8b8989',
-        'springgreen1' => '00ff7f',
-        'springgreen2' => '00ee76',
-        'springgreen3' => '00cd66',
-        'springgreen4' => '008b45',
-        'steelblue' => '4682b4',
-        'steelblue1' => '63b8ff',
-        'steelblue2' => '5cacee',
-        'steelblue3' => '4f94cd',
-        'steelblue4' => '36648b',
-        'tan' => 'd2b48c',
-        'tan1' => 'ffa54f',
-        'tan2' => 'ee9a49',
-        'tan3' => 'cd853f',
-        'tan4' => '8b5a2b',
-        'teal' => '008080',
-        'thistle' => 'd8bfd8',
-        'thistle1' => 'ffe1ff',
-        'thistle2' => 'eed2ee',
-        'thistle3' => 'cdb5cd',
-        'thistle4' => '8b7b8b',
-        'tomato1' => 'ff6347',
-        'tomato2' => 'ee5c42',
-        'tomato3' => 'cd4f39',
-        'tomato4' => '8b3626',
-        'turquoise' => '40e0d0',
-        'turquoise1' => '00f5ff',
-        'turquoise2' => '00e5ee',
-        'turquoise3' => '00c5cd',
-        'turquoise4' => '00868b',
-        'violet' => 'ee82ee',
-        'violetred' => 'd02090',
-        'violetred1' => 'ff3e96',
-        'violetred2' => 'ee3a8c',
-        'violetred3' => 'cd3278',
-        'violetred4' => '8b2252',
-        'wheat' => 'f5deb3',
-        'wheat1' => 'ffe7ba',
-        'wheat2' => 'eed8ae',
-        'wheat3' => 'cdba96',
-        'wheat4' => '8b7e66',
-        'white' => 'ffffff',
-        'whitesmoke' => 'f5f5f5',
-        'yellow' => 'ffff00',
-        'yellow1' => 'ffff00',
-        'yellow2' => 'eeee00',
-        'yellow3' => 'cdcd00',
-        'yellow4' => '8b8b00',
-        'yellowgreen' => '9acd32',
-    );
-
-    protected $face;
-    protected $size;
-    protected $color;
-
-	protected $bold = false;
-	protected $italic = false;
-	protected $underline = false;
-	protected $superscript = false;
-	protected $subscript = false;
-	protected $strikethrough = false;
-
-    protected $startTagCallbacks = array(
-        'font' => 'startFontTag',
-        'b' => 'startBoldTag',
-        'strong' => 'startBoldTag',
-        'i' => 'startItalicTag',
-        'em' => 'startItalicTag',
-        'u' => 'startUnderlineTag',
-        'ins' => 'startUnderlineTag',
-        'del' => 'startStrikethruTag',
-        'sup' => 'startSuperscriptTag',
-        'sub' => 'startSubscriptTag',
-    );
-
-    protected $endTagCallbacks = array(
-        'font' => 'endFontTag',
-        'b' => 'endBoldTag',
-        'strong' => 'endBoldTag',
-        'i' => 'endItalicTag',
-        'em' => 'endItalicTag',
-        'u' => 'endUnderlineTag',
-        'ins' => 'endUnderlineTag',
-        'del' => 'endStrikethruTag',
-        'sup' => 'endSuperscriptTag',
-        'sub' => 'endSubscriptTag',
-        'br' => 'breakTag',
-        'p' => 'breakTag',
-        'h1' => 'breakTag',
-        'h2' => 'breakTag',
-        'h3' => 'breakTag',
-        'h4' => 'breakTag',
-        'h5' => 'breakTag',
-        'h6' => 'breakTag',
-    );
-
-    protected $stack = array();
-
-    protected $stringData = '';
-
-    protected $richTextObject;
-
-    protected function initialise() {
-        $this->face = $this->size = $this->color = null;
-        $this->bold = $this->italic = $this->underline = $this->superscript = $this->subscript = $this->strikethrough = false;
-
-        $this->stack = array();
-
-        $this->stringData = '';
-    }
-
-    public function toRichTextObject($html) {
-        $this->initialise();
-
-        //	Create a new DOM object
-        $dom = new domDocument;
-        //	Load the HTML file into the DOM object
-        //  Note the use of error suppression, because typically this will be an html fragment, so not fully valid markup
-        $loaded = @$dom->loadHTML($html);
-
-        //	Discard excess white space
-        $dom->preserveWhiteSpace = false;
-
-        $this->richTextObject = new PHPExcel_RichText();;
-        $this->parseElements($dom);
-        return $this->richTextObject;
-    }
-
-    protected function buildTextRun() {
-        $text = $this->stringData;
-        if (trim($text) === '')
-            return;
-
-        $richtextRun = $this->richTextObject->createTextRun($this->stringData);
-        if ($this->face) {
-            $richtextRun->getFont()->setName($this->face);
-        }
-        if ($this->size) {
-            $richtextRun->getFont()->setSize($this->size);
-        }
-        if ($this->color) {
-            $richtextRun->getFont()->setColor( new PHPExcel_Style_Color( 'ff' . $this->color ) );
-        }
-        if ($this->bold) {
-            $richtextRun->getFont()->setBold(true);
-        }
-        if ($this->italic) {
-            $richtextRun->getFont()->setItalic(true);
-        }
-        if ($this->underline) {
-            $richtextRun->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE);
-        }
-        if ($this->superscript) {
-            $richtextRun->getFont()->setSuperScript(true);
-        }
-        if ($this->subscript) {
-            $richtextRun->getFont()->setSubScript(true);
-        }
-        if ($this->strikethrough) {
-            $richtextRun->getFont()->setStrikethrough(true);
-        }
-        $this->stringData = '';
-    }
-
-    protected function rgbToColour($rgb) {
-        preg_match_all('/\d+/', $rgb, $values);
-        foreach($values[0] as &$value) {
-            $value = str_pad(dechex($value), 2, '0', STR_PAD_LEFT);
-        }
-        return implode($values[0]);
-    }
-
-    protected function colourNameLookup($rgb) {
-        return self::$colourMap[$rgb];
-    }
-
-    protected function startFontTag($tag) {
-        foreach ($tag->attributes as $attribute) {
-            $attributeName = strtolower($attribute->name);
-            $attributeValue = $attribute->value;
-
-            if ($attributeName == 'color') {
-                if (preg_match('/rgb\s*\(/', $attributeValue)) {
-                    $this->$attributeName = $this->rgbToColour($attributeValue);
-                } elseif(strpos(trim($attributeValue), '#') === 0) {
-                    $this->$attributeName = ltrim($attributeValue, '#');
-                } else {
-                    $this->$attributeName = $this->colourNameLookup($attributeValue);
-                }
-            } else {
-                $this->$attributeName = $attributeValue;
-            }
-        }
-    }
-
-    protected function endFontTag() {
-        $this->face = $this->size = $this->color = null;
-    }
-
-    protected function startBoldTag() {
-        $this->bold = true;
-    }
-
-    protected function endBoldTag() {
-        $this->bold = false;
-    }
-
-    protected function startItalicTag() {
-        $this->italic = true;
-    }
-
-    protected function endItalicTag() {
-        $this->italic = false;
-    }
-
-    protected function startUnderlineTag() {
-        $this->underline = true;
-    }
-
-    protected function endUnderlineTag() {
-        $this->underline = false;
-    }
-
-    protected function startSubscriptTag() {
-        $this->subscript = true;
-    }
-
-    protected function endSubscriptTag() {
-        $this->subscript = false;
-    }
-
-    protected function startSuperscriptTag() {
-        $this->superscript = true;
-    }
-
-    protected function endSuperscriptTag() {
-        $this->superscript = false;
-    }
-
-    protected function startStrikethruTag() {
-        $this->strikethrough = true;
-    }
-
-    protected function endStrikethruTag() {
-        $this->strikethrough = false;
-    }
-
-    protected function breakTag() {
-        $this->stringData .= PHP_EOL;
-    }
-
-    protected function parseTextNode(DOMText $textNode) {
-        $domText = preg_replace('/\s+/u', ' ', ltrim($textNode->nodeValue));
-        $this->stringData .= $domText;
-        $this->buildTextRun();
-    }
-
-    protected function handleCallback($element, $callbackTag, $callbacks) {
-        if (isset($callbacks[$callbackTag])) {
-            $elementHandler = $callbacks[$callbackTag];
-            if (method_exists($this, $elementHandler)) {
-                call_user_func(array($this, $elementHandler), $element);
-            }
-        }
-    }
-
-    protected function parseElementNode(DOMElement $element) {
-        $callbackTag = strtolower($element->nodeName);
-        $this->stack[] = $callbackTag;
-
-        $this->handleCallback($element, $callbackTag, $this->startTagCallbacks);
-
-        $this->parseElements($element);
-        $this->stringData .= ' ';
-        array_pop($this->stack);
-
-        $this->handleCallback($element, $callbackTag, $this->endTagCallbacks);
-    }
-
-    protected function parseElements(DOMNode $element) {
-        foreach ($element->childNodes as $child) {
-            if ($child instanceof DOMText) {
-                $this->parseTextNode($child);
-            } elseif ($child instanceof DOMElement) {
-                $this->parseElementNode($child);
-            }
-        }
-    }
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/IComparable.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/IComparable.php
deleted file mode 100644
index adb9a016d14..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/IComparable.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_IComparable
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-interface PHPExcel_IComparable
-{
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode();
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/IOFactory.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/IOFactory.php
deleted file mode 100644
index 1daa06a5339..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/IOFactory.php
+++ /dev/null
@@ -1,288 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**	PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_IOFactory
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_IOFactory
-{
-	/**
-	 * Search locations
-	 *
-	 * @var	array
-	 * @access	private
-	 * @static
-	 */
-	private static $_searchLocations = array(
-		array( 'type' => 'IWriter', 'path' => 'PHPExcel/Writer/{0}.php', 'class' => 'PHPExcel_Writer_{0}' ),
-		array( 'type' => 'IReader', 'path' => 'PHPExcel/Reader/{0}.php', 'class' => 'PHPExcel_Reader_{0}' )
-	);
-
-	/**
-	 * Autoresolve classes
-	 *
-	 * @var	array
-	 * @access	private
-	 * @static
-	 */
-	private static $_autoResolveClasses = array(
-		'Excel2007',
-		'Excel5',
-		'Excel2003XML',
-		'OOCalc',
-		'SYLK',
-		'Gnumeric',
-		'HTML',
-		'CSV',
-	);
-
-    /**
-     *	Private constructor for PHPExcel_IOFactory
-     */
-    private function __construct() { }
-
-    /**
-     * Get search locations
-     *
-	 * @static
-	 * @access	public
-     * @return	array
-     */
-	public static function getSearchLocations() {
-		return self::$_searchLocations;
-	}	//	function getSearchLocations()
-
-	/**
-	 * Set search locations
-	 *
-	 * @static
-	 * @access	public
-	 * @param	array $value
-	 * @throws	PHPExcel_Reader_Exception
-	 */
-	public static function setSearchLocations($value) {
-		if (is_array($value)) {
-			self::$_searchLocations = $value;
-		} else {
-			throw new PHPExcel_Reader_Exception('Invalid parameter passed.');
-		}
-	}	//	function setSearchLocations()
-
-	/**
-	 * Add search location
-	 *
-	 * @static
-	 * @access	public
-	 * @param	string $type		Example: IWriter
-	 * @param	string $location	Example: PHPExcel/Writer/{0}.php
-	 * @param	string $classname 	Example: PHPExcel_Writer_{0}
-	 */
-	public static function addSearchLocation($type = '', $location = '', $classname = '') {
-		self::$_searchLocations[] = array( 'type' => $type, 'path' => $location, 'class' => $classname );
-	}	//	function addSearchLocation()
-
-	/**
-	 * Create PHPExcel_Writer_IWriter
-	 *
-	 * @static
-	 * @access	public
-	 * @param	PHPExcel $phpExcel
-	 * @param	string  $writerType	Example: Excel2007
-	 * @return	PHPExcel_Writer_IWriter
-	 * @throws	PHPExcel_Reader_Exception
-	 */
-	public static function createWriter(PHPExcel $phpExcel, $writerType = '') {
-		// Search type
-		$searchType = 'IWriter';
-
-		// Include class
-		foreach (self::$_searchLocations as $searchLocation) {
-			if ($searchLocation['type'] == $searchType) {
-				$className = str_replace('{0}', $writerType, $searchLocation['class']);
-
-				$instance = new $className($phpExcel);
-				if ($instance !== NULL) {
-					return $instance;
-				}
-			}
-		}
-
-		// Nothing found...
-		throw new PHPExcel_Reader_Exception("No $searchType found for type $writerType");
-	}	//	function createWriter()
-
-	/**
-	 * Create PHPExcel_Reader_IReader
-	 *
-	 * @static
-	 * @access	public
-	 * @param	string $readerType	Example: Excel2007
-	 * @return	PHPExcel_Reader_IReader
-	 * @throws	PHPExcel_Reader_Exception
-	 */
-	public static function createReader($readerType = '') {
-		// Search type
-		$searchType = 'IReader';
-
-		// Include class
-		foreach (self::$_searchLocations as $searchLocation) {
-			if ($searchLocation['type'] == $searchType) {
-				$className = str_replace('{0}', $readerType, $searchLocation['class']);
-
-				$instance = new $className();
-				if ($instance !== NULL) {
-					return $instance;
-				}
-			}
-		}
-
-		// Nothing found...
-		throw new PHPExcel_Reader_Exception("No $searchType found for type $readerType");
-	}	//	function createReader()
-
-	/**
-	 * Loads PHPExcel from file using automatic PHPExcel_Reader_IReader resolution
-	 *
-	 * @static
-	 * @access public
-	 * @param 	string 		$pFilename		The name of the spreadsheet file
-	 * @return	PHPExcel
-	 * @throws	PHPExcel_Reader_Exception
-	 */
-	public static function load($pFilename) {
-		$reader = self::createReaderForFile($pFilename);
-		return $reader->load($pFilename);
-	}	//	function load()
-
-	/**
-	 * Identify file type using automatic PHPExcel_Reader_IReader resolution
-	 *
-	 * @static
-	 * @access public
-	 * @param 	string 		$pFilename		The name of the spreadsheet file to identify
-	 * @return	string
-	 * @throws	PHPExcel_Reader_Exception
-	 */
-	public static function identify($pFilename) {
-		$reader = self::createReaderForFile($pFilename);
-		$className = get_class($reader);
-		$classType = explode('_',$className);
-		unset($reader);
-		return array_pop($classType);
-	}	//	function identify()
-
-	/**
-	 * Create PHPExcel_Reader_IReader for file using automatic PHPExcel_Reader_IReader resolution
-	 *
-	 * @static
-	 * @access	public
-	 * @param 	string 		$pFilename		The name of the spreadsheet file
-	 * @return	PHPExcel_Reader_IReader
-	 * @throws	PHPExcel_Reader_Exception
-	 */
-	public static function createReaderForFile($pFilename) {
-
-		// First, lucky guess by inspecting file extension
-		$pathinfo = pathinfo($pFilename);
-
-		$extensionType = NULL;
-		if (isset($pathinfo['extension'])) {
-			switch (strtolower($pathinfo['extension'])) {
-				case 'xlsx':			//	Excel (OfficeOpenXML) Spreadsheet
-				case 'xlsm':			//	Excel (OfficeOpenXML) Macro Spreadsheet (macros will be discarded)
-				case 'xltx':			//	Excel (OfficeOpenXML) Template
-				case 'xltm':			//	Excel (OfficeOpenXML) Macro Template (macros will be discarded)
-					$extensionType = 'Excel2007';
-					break;
-				case 'xls':				//	Excel (BIFF) Spreadsheet
-				case 'xlt':				//	Excel (BIFF) Template
-					$extensionType = 'Excel5';
-					break;
-				case 'ods':				//	Open/Libre Offic Calc
-				case 'ots':				//	Open/Libre Offic Calc Template
-					$extensionType = 'OOCalc';
-					break;
-				case 'slk':
-					$extensionType = 'SYLK';
-					break;
-				case 'xml':				//	Excel 2003 SpreadSheetML
-					$extensionType = 'Excel2003XML';
-					break;
-				case 'gnumeric':
-					$extensionType = 'Gnumeric';
-					break;
-				case 'htm':
-				case 'html':
-					$extensionType = 'HTML';
-					break;
-				case 'csv':
-					// Do nothing
-					// We must not try to use CSV reader since it loads
-					// all files including Excel files etc.
-					break;
-				default:
-					break;
-			}
-
-			if ($extensionType !== NULL) {
-				$reader = self::createReader($extensionType);
-				// Let's see if we are lucky
-				if (isset($reader) && $reader->canRead($pFilename)) {
-					return $reader;
-				}
-			}
-		}
-
-		// If we reach here then "lucky guess" didn't give any result
-		// Try walking through all the options in self::$_autoResolveClasses
-		foreach (self::$_autoResolveClasses as $autoResolveClass) {
-			//	Ignore our original guess, we know that won't work
-			if ($autoResolveClass !== $extensionType) {
-				$reader = self::createReader($autoResolveClass);
-				if ($reader->canRead($pFilename)) {
-					return $reader;
-				}
-			}
-		}
-
-		throw new PHPExcel_Reader_Exception('Unable to identify a reader for this file');
-	}	//	function createReaderForFile()
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/NamedRange.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/NamedRange.php
deleted file mode 100644
index fe245e3ee72..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/NamedRange.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_NamedRange
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_NamedRange
-{
-	/**
-	 * Range name
-	 *
-	 * @var string
-	 */
-	private $_name;
-
-	/**
-	 * Worksheet on which the named range can be resolved
-	 *
-	 * @var PHPExcel_Worksheet
-	 */
-	private $_worksheet;
-
-	/**
-	 * Range of the referenced cells
-	 *
-	 * @var string
-	 */
-	private $_range;
-
-	/**
-	 * Is the named range local? (i.e. can only be used on $this->_worksheet)
-	 *
-	 * @var bool
-	 */
-	private $_localOnly;
-
-	/**
-	 * Scope
-	 *
-	 * @var PHPExcel_Worksheet
-	 */
-	private $_scope;
-
-    /**
-     * Create a new NamedRange
-     *
-     * @param string $pName
-     * @param PHPExcel_Worksheet $pWorksheet
-     * @param string $pRange
-     * @param bool $pLocalOnly
-     * @param PHPExcel_Worksheet|null $pScope	Scope. Only applies when $pLocalOnly = true. Null for global scope.
-     * @throws PHPExcel_Exception
-     */
-    public function __construct($pName = null, PHPExcel_Worksheet $pWorksheet, $pRange = 'A1', $pLocalOnly = false, $pScope = null)
-    {
-    	// Validate data
-    	if (($pName === NULL) || ($pWorksheet === NULL) || ($pRange === NULL)) {
-    		throw new PHPExcel_Exception('Parameters can not be null.');
-    	}
-
-    	// Set local members
-    	$this->_name 		= $pName;
-    	$this->_worksheet 	= $pWorksheet;
-    	$this->_range 		= $pRange;
-    	$this->_localOnly 	= $pLocalOnly;
-    	$this->_scope 		= ($pLocalOnly == true) ?
-								(($pScope == null) ? $pWorksheet : $pScope) : null;
-    }
-
-    /**
-     * Get name
-     *
-     * @return string
-     */
-    public function getName() {
-    	return $this->_name;
-    }
-
-    /**
-     * Set name
-     *
-     * @param string $value
-     * @return PHPExcel_NamedRange
-     */
-    public function setName($value = null) {
-    	if ($value !== NULL) {
-    		// Old title
-    		$oldTitle = $this->_name;
-
-    		// Re-attach
-    		if ($this->_worksheet !== NULL) {
-    			$this->_worksheet->getParent()->removeNamedRange($this->_name,$this->_worksheet);
-    		}
-    		$this->_name = $value;
-
-    		if ($this->_worksheet !== NULL) {
-    			$this->_worksheet->getParent()->addNamedRange($this);
-    		}
-
-	    	// New title
-	    	$newTitle = $this->_name;
-	    	PHPExcel_ReferenceHelper::getInstance()->updateNamedFormulas($this->_worksheet->getParent(), $oldTitle, $newTitle);
-    	}
-    	return $this;
-    }
-
-    /**
-     * Get worksheet
-     *
-     * @return PHPExcel_Worksheet
-     */
-    public function getWorksheet() {
-    	return $this->_worksheet;
-    }
-
-    /**
-     * Set worksheet
-     *
-     * @param PHPExcel_Worksheet $value
-     * @return PHPExcel_NamedRange
-     */
-    public function setWorksheet(PHPExcel_Worksheet $value = null) {
-    	if ($value !== NULL) {
-    		$this->_worksheet = $value;
-    	}
-    	return $this;
-    }
-
-    /**
-     * Get range
-     *
-     * @return string
-     */
-    public function getRange() {
-    	return $this->_range;
-    }
-
-    /**
-     * Set range
-     *
-     * @param string $value
-     * @return PHPExcel_NamedRange
-     */
-    public function setRange($value = null) {
-    	if ($value !== NULL) {
-    		$this->_range = $value;
-    	}
-    	return $this;
-    }
-
-    /**
-     * Get localOnly
-     *
-     * @return bool
-     */
-    public function getLocalOnly() {
-    	return $this->_localOnly;
-    }
-
-    /**
-     * Set localOnly
-     *
-     * @param bool $value
-     * @return PHPExcel_NamedRange
-     */
-    public function setLocalOnly($value = false) {
-    	$this->_localOnly = $value;
-    	$this->_scope = $value ? $this->_worksheet : null;
-    	return $this;
-    }
-
-    /**
-     * Get scope
-     *
-     * @return PHPExcel_Worksheet|null
-     */
-    public function getScope() {
-    	return $this->_scope;
-    }
-
-    /**
-     * Set scope
-     *
-     * @param PHPExcel_Worksheet|null $value
-     * @return PHPExcel_NamedRange
-     */
-    public function setScope(PHPExcel_Worksheet $value = null) {
-    	$this->_scope = $value;
-    	$this->_localOnly = ($value == null) ? false : true;
-    	return $this;
-    }
-
-    /**
-     * Resolve a named range to a regular cell range
-     *
-     * @param string $pNamedRange Named range
-     * @param PHPExcel_Worksheet|null $pSheet Scope. Use null for global scope
-     * @return PHPExcel_NamedRange
-     */
-    public static function resolveRange($pNamedRange = '', PHPExcel_Worksheet $pSheet) {
-		return $pSheet->getParent()->getNamedRange($pNamedRange, $pSheet);
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Abstract.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Abstract.php
deleted file mode 100644
index 2d3c964b60b..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Abstract.php
+++ /dev/null
@@ -1,255 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Reader_Abstract
- *
- * @category	PHPExcel
- * @package	PHPExcel_Reader
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
-{
-	/**
-	 * Read data only?
-	 * Identifies whether the Reader should only read data values for cells, and ignore any formatting information;
-	 *		or whether it should read both data and formatting
-	 *
-	 * @var	boolean
-	 */
-	protected $_readDataOnly = FALSE;
-
-	/**
-	 * Read charts that are defined in the workbook?
-	 * Identifies whether the Reader should read the definitions for any charts that exist in the workbook;
-	 *
-	 * @var	boolean
-	 */
-	protected $_includeCharts = FALSE;
-
-	/**
-	 * Restrict which sheets should be loaded?
-	 * This property holds an array of worksheet names to be loaded. If null, then all worksheets will be loaded.
-	 *
-	 * @var array of string
-	 */
-	protected $_loadSheetsOnly = NULL;
-
-	/**
-	 * PHPExcel_Reader_IReadFilter instance
-	 *
-	 * @var PHPExcel_Reader_IReadFilter
-	 */
-	protected $_readFilter = NULL;
-
-	protected $_fileHandle = NULL;
-
-
-	/**
-	 * Read data only?
-	 *		If this is true, then the Reader will only read data values for cells, it will not read any formatting information.
-	 *		If false (the default) it will read data and formatting.
-	 *
-	 * @return	boolean
-	 */
-	public function getReadDataOnly() {
-		return $this->_readDataOnly;
-	}
-
-	/**
-	 * Set read data only
-	 *		Set to true, to advise the Reader only to read data values for cells, and to ignore any formatting information.
-	 *		Set to false (the default) to advise the Reader to read both data and formatting for cells.
-	 *
-	 * @param	boolean	$pValue
-	 *
-	 * @return	PHPExcel_Reader_IReader
-	 */
-	public function setReadDataOnly($pValue = FALSE) {
-		$this->_readDataOnly = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Read charts in workbook?
-	 *		If this is true, then the Reader will include any charts that exist in the workbook.
-	 *      Note that a ReadDataOnly value of false overrides, and charts won't be read regardless of the IncludeCharts value.
-	 *		If false (the default) it will ignore any charts defined in the workbook file.
-	 *
-	 * @return	boolean
-	 */
-	public function getIncludeCharts() {
-		return $this->_includeCharts;
-	}
-
-	/**
-	 * Set read charts in workbook
-	 *		Set to true, to advise the Reader to include any charts that exist in the workbook.
-	 *      Note that a ReadDataOnly value of false overrides, and charts won't be read regardless of the IncludeCharts value.
-	 *		Set to false (the default) to discard charts.
-	 *
-	 * @param	boolean	$pValue
-	 *
-	 * @return	PHPExcel_Reader_IReader
-	 */
-	public function setIncludeCharts($pValue = FALSE) {
-		$this->_includeCharts = (boolean) $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get which sheets to load
-	 * Returns either an array of worksheet names (the list of worksheets that should be loaded), or a null
-	 *		indicating that all worksheets in the workbook should be loaded.
-	 *
-	 * @return mixed
-	 */
-	public function getLoadSheetsOnly()
-	{
-		return $this->_loadSheetsOnly;
-	}
-
-	/**
-	 * Set which sheets to load
-	 *
-	 * @param mixed $value
-	 *		This should be either an array of worksheet names to be loaded, or a string containing a single worksheet name.
-	 *		If NULL, then it tells the Reader to read all worksheets in the workbook
-	 *
-	 * @return PHPExcel_Reader_IReader
-	 */
-	public function setLoadSheetsOnly($value = NULL)
-	{
-        if ($value === NULL)
-            return $this->setLoadAllSheets();
-
-        $this->_loadSheetsOnly = is_array($value) ?
-			$value : array($value);
-		return $this;
-	}
-
-	/**
-	 * Set all sheets to load
-	 *		Tells the Reader to load all worksheets from the workbook.
-	 *
-	 * @return PHPExcel_Reader_IReader
-	 */
-	public function setLoadAllSheets()
-	{
-		$this->_loadSheetsOnly = NULL;
-		return $this;
-	}
-
-	/**
-	 * Read filter
-	 *
-	 * @return PHPExcel_Reader_IReadFilter
-	 */
-	public function getReadFilter() {
-		return $this->_readFilter;
-	}
-
-	/**
-	 * Set read filter
-	 *
-	 * @param PHPExcel_Reader_IReadFilter $pValue
-	 * @return PHPExcel_Reader_IReader
-	 */
-	public function setReadFilter(PHPExcel_Reader_IReadFilter $pValue) {
-		$this->_readFilter = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Open file for reading
-	 *
-	 * @param string $pFilename
-	 * @throws	PHPExcel_Reader_Exception
-	 * @return resource
-	 */
-	protected function _openFile($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename) || !is_readable($pFilename)) {
-			throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		// Open file
-		$this->_fileHandle = fopen($pFilename, 'r');
-		if ($this->_fileHandle === FALSE) {
-			throw new PHPExcel_Reader_Exception("Could not open file " . $pFilename . " for reading.");
-		}
-	}
-
-	/**
-	 * Can the current PHPExcel_Reader_IReader read the file?
-	 *
-	 * @param 	string 		$pFilename
-	 * @return boolean
-	 * @throws PHPExcel_Reader_Exception
-	 */
-	public function canRead($pFilename)
-	{
-		// Check if file exists
-		try {
-			$this->_openFile($pFilename);
-		} catch (Exception $e) {
-			return FALSE;
-		}
-
-		$readable = $this->_isValidFormat();
-		fclose ($this->_fileHandle);
-		return $readable;
-	}
-
-	/**
-	 * Scan theXML for use of <!ENTITY to prevent XXE/XEE attacks
-	 *
-	 * @param 	string 		$xml
-	 * @throws PHPExcel_Reader_Exception
-	 */
-	public function securityScan($xml)
-	{
-        $pattern = '/\\0?' . implode('\\0?', str_split('<!DOCTYPE')) . '\\0?/';
-        if (preg_match($pattern, $xml)) { 
-            throw new PHPExcel_Reader_Exception('Detected use of ENTITY in XML, spreadsheet file load() aborted to prevent XXE/XEE attacks');
-        }
-        return $xml;
-    }
-
-	/**
-	 * Scan theXML for use of <!ENTITY to prevent XXE/XEE attacks
-	 *
-	 * @param 	string 		$filestream
-	 * @throws PHPExcel_Reader_Exception
-	 */
-	public function securityScanFile($filestream)
-	{
-        return $this->securityScan(file_get_contents($filestream));
-    }
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/CSV.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/CSV.php
deleted file mode 100644
index 22176fdc99f..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/CSV.php
+++ /dev/null
@@ -1,387 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_Reader_CSV
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_CSV extends PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
-{
-	/**
-	 * Input encoding
-	 *
-	 * @access	private
-	 * @var	string
-	 */
-	private $_inputEncoding	= 'UTF-8';
-
-	/**
-	 * Delimiter
-	 *
-	 * @access	private
-	 * @var string
-	 */
-	private $_delimiter		= ',';
-
-	/**
-	 * Enclosure
-	 *
-	 * @access	private
-	 * @var	string
-	 */
-	private $_enclosure		= '"';
-
-	/**
-	 * Sheet index to read
-	 *
-	 * @access	private
-	 * @var	int
-	 */
-	private $_sheetIndex	= 0;
-
-	/**
-	 * Load rows contiguously
-	 *
-	 * @access	private
-	 * @var	int
-	 */
-	private $_contiguous	= false;
-
-	/**
-	 * Row counter for loading rows contiguously
-	 *
-	 * @var	int
-	 */
-	private $_contiguousRow	= -1;
-
-
-	/**
-	 * Create a new PHPExcel_Reader_CSV
-	 */
-	public function __construct() {
-		$this->_readFilter		= new PHPExcel_Reader_DefaultReadFilter();
-	}
-
-	/**
-	 * Validate that the current file is a CSV file
-	 *
-	 * @return boolean
-	 */
-	protected function _isValidFormat()
-	{
-		return TRUE;
-	}
-
-	/**
-	 * Set input encoding
-	 *
-	 * @param string $pValue Input encoding
-	 */
-	public function setInputEncoding($pValue = 'UTF-8')
-	{
-		$this->_inputEncoding = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get input encoding
-	 *
-	 * @return string
-	 */
-	public function getInputEncoding()
-	{
-		return $this->_inputEncoding;
-	}
-
-	/**
-	 * Move filepointer past any BOM marker
-	 *
-	 */
-	protected function _skipBOM()
-	{
-		rewind($this->_fileHandle);
-
-		switch ($this->_inputEncoding) {
-			case 'UTF-8':
-				fgets($this->_fileHandle, 4) == "\xEF\xBB\xBF" ?
-					fseek($this->_fileHandle, 3) : fseek($this->_fileHandle, 0);
-				break;
-			case 'UTF-16LE':
-				fgets($this->_fileHandle, 3) == "\xFF\xFE" ?
-					fseek($this->_fileHandle, 2) : fseek($this->_fileHandle, 0);
-				break;
-			case 'UTF-16BE':
-				fgets($this->_fileHandle, 3) == "\xFE\xFF" ?
-					fseek($this->_fileHandle, 2) : fseek($this->_fileHandle, 0);
-				break;
-			case 'UTF-32LE':
-				fgets($this->_fileHandle, 5) == "\xFF\xFE\x00\x00" ?
-					fseek($this->_fileHandle, 4) : fseek($this->_fileHandle, 0);
-				break;
-			case 'UTF-32BE':
-				fgets($this->_fileHandle, 5) == "\x00\x00\xFE\xFF" ?
-					fseek($this->_fileHandle, 4) : fseek($this->_fileHandle, 0);
-				break;
-			default:
-				break;
-		}
-	}
-
-	/**
-	 * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
-	 *
-	 * @param 	string 		$pFilename
-	 * @throws	PHPExcel_Reader_Exception
-	 */
-	public function listWorksheetInfo($pFilename)
-	{
-		// Open file
-		$this->_openFile($pFilename);
-		if (!$this->_isValidFormat()) {
-			fclose ($this->_fileHandle);
-			throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
-		}
-		$fileHandle = $this->_fileHandle;
-
-		// Skip BOM, if any
-		$this->_skipBOM();
-
-		$escapeEnclosures = array( "\\" . $this->_enclosure, $this->_enclosure . $this->_enclosure );
-
-		$worksheetInfo = array();
-		$worksheetInfo[0]['worksheetName'] = 'Worksheet';
-		$worksheetInfo[0]['lastColumnLetter'] = 'A';
-		$worksheetInfo[0]['lastColumnIndex'] = 0;
-		$worksheetInfo[0]['totalRows'] = 0;
-		$worksheetInfo[0]['totalColumns'] = 0;
-
-		// Loop through each line of the file in turn
-		while (($rowData = fgetcsv($fileHandle, 0, $this->_delimiter, $this->_enclosure)) !== FALSE) {
-			$worksheetInfo[0]['totalRows']++;
-			$worksheetInfo[0]['lastColumnIndex'] = max($worksheetInfo[0]['lastColumnIndex'], count($rowData) - 1);
-		}
-
-		$worksheetInfo[0]['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($worksheetInfo[0]['lastColumnIndex']);
-		$worksheetInfo[0]['totalColumns'] = $worksheetInfo[0]['lastColumnIndex'] + 1;
-
-		// Close file
-		fclose($fileHandle);
-
-		return $worksheetInfo;
-	}
-
-	/**
-	 * Loads PHPExcel from file
-	 *
-	 * @param 	string 		$pFilename
-	 * @return PHPExcel
-	 * @throws PHPExcel_Reader_Exception
-	 */
-	public function load($pFilename)
-	{
-		// Create new PHPExcel
-		$objPHPExcel = new PHPExcel();
-
-		// Load into this instance
-		return $this->loadIntoExisting($pFilename, $objPHPExcel);
-	}
-
-	/**
-	 * Loads PHPExcel from file into PHPExcel instance
-	 *
-	 * @param 	string 		$pFilename
-	 * @param	PHPExcel	$objPHPExcel
-	 * @return 	PHPExcel
-	 * @throws 	PHPExcel_Reader_Exception
-	 */
-	public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
-	{
-		$lineEnding = ini_get('auto_detect_line_endings');
-		ini_set('auto_detect_line_endings', true);
-
-		// Open file
-		$this->_openFile($pFilename);
-		if (!$this->_isValidFormat()) {
-			fclose ($this->_fileHandle);
-			throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
-		}
-		$fileHandle = $this->_fileHandle;
-
-		// Skip BOM, if any
-		$this->_skipBOM();
-
-		// Create new PHPExcel object
-		while ($objPHPExcel->getSheetCount() <= $this->_sheetIndex) {
-			$objPHPExcel->createSheet();
-		}
-		$sheet = $objPHPExcel->setActiveSheetIndex($this->_sheetIndex);
-
-		$escapeEnclosures = array( "\\" . $this->_enclosure,
-								   $this->_enclosure . $this->_enclosure
-								 );
-
-		// Set our starting row based on whether we're in contiguous mode or not
-		$currentRow = 1;
-		if ($this->_contiguous) {
-			$currentRow = ($this->_contiguousRow == -1) ? $sheet->getHighestRow(): $this->_contiguousRow;
-		}
-
-		// Loop through each line of the file in turn
-		while (($rowData = fgetcsv($fileHandle, 0, $this->_delimiter, $this->_enclosure)) !== FALSE) {
-			$columnLetter = 'A';
-			foreach($rowData as $rowDatum) {
-				if ($rowDatum != '' && $this->_readFilter->readCell($columnLetter, $currentRow)) {
-					// Unescape enclosures
-					$rowDatum = str_replace($escapeEnclosures, $this->_enclosure, $rowDatum);
-
-					// Convert encoding if necessary
-					if ($this->_inputEncoding !== 'UTF-8') {
-						$rowDatum = PHPExcel_Shared_String::ConvertEncoding($rowDatum, 'UTF-8', $this->_inputEncoding);
-					}
-
-					// Set cell value
-					$sheet->getCell($columnLetter . $currentRow)->setValue($rowDatum);
-				}
-				++$columnLetter;
-			}
-			++$currentRow;
-		}
-
-		// Close file
-		fclose($fileHandle);
-
-		if ($this->_contiguous) {
-			$this->_contiguousRow = $currentRow;
-		}
-
-		ini_set('auto_detect_line_endings', $lineEnding);
-
-		// Return
-		return $objPHPExcel;
-	}
-
-	/**
-	 * Get delimiter
-	 *
-	 * @return string
-	 */
-	public function getDelimiter() {
-		return $this->_delimiter;
-	}
-
-	/**
-	 * Set delimiter
-	 *
-	 * @param	string	$pValue		Delimiter, defaults to ,
-	 * @return	PHPExcel_Reader_CSV
-	 */
-	public function setDelimiter($pValue = ',') {
-		$this->_delimiter = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get enclosure
-	 *
-	 * @return string
-	 */
-	public function getEnclosure() {
-		return $this->_enclosure;
-	}
-
-	/**
-	 * Set enclosure
-	 *
-	 * @param	string	$pValue		Enclosure, defaults to "
-	 * @return PHPExcel_Reader_CSV
-	 */
-	public function setEnclosure($pValue = '"') {
-		if ($pValue == '') {
-			$pValue = '"';
-		}
-		$this->_enclosure = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get sheet index
-	 *
-	 * @return integer
-	 */
-	public function getSheetIndex() {
-		return $this->_sheetIndex;
-	}
-
-	/**
-	 * Set sheet index
-	 *
-	 * @param	integer		$pValue		Sheet index
-	 * @return PHPExcel_Reader_CSV
-	 */
-	public function setSheetIndex($pValue = 0) {
-		$this->_sheetIndex = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Set Contiguous
-	 *
-	 * @param boolean $contiguous
-	 */
-	public function setContiguous($contiguous = FALSE)
-	{
-		$this->_contiguous = (bool) $contiguous;
-		if (!$contiguous) {
-			$this->_contiguousRow = -1;
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Get Contiguous
-	 *
-	 * @return boolean
-	 */
-	public function getContiguous() {
-		return $this->_contiguous;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/DefaultReadFilter.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/DefaultReadFilter.php
deleted file mode 100644
index dc55fc6bde6..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/DefaultReadFilter.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_Reader_DefaultReadFilter
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_DefaultReadFilter implements PHPExcel_Reader_IReadFilter
-{
-	/**
-	 * Should this cell be read?
-	 *
-	 * @param 	$column		String column index
-	 * @param 	$row			Row index
-	 * @param	$worksheetName	Optional worksheet name
-	 * @return	boolean
-	 */
-	public function readCell($column, $row, $worksheetName = '') {
-		return true;
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2003XML.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2003XML.php
deleted file mode 100644
index 851eaab1813..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2003XML.php
+++ /dev/null
@@ -1,809 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_Reader_Excel2003XML
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
-{
-	/**
-	 * Formats
-	 *
-	 * @var array
-	 */
-	protected $_styles = array();
-
-	/**
-	 * Character set used in the file
-	 *
-	 * @var string
-	 */
-	protected $_charSet = 'UTF-8';
-
-
-	/**
-	 * Create a new PHPExcel_Reader_Excel2003XML
-	 */
-	public function __construct() {
-		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
-	}
-
-
-	/**
-	 * Can the current PHPExcel_Reader_IReader read the file?
-	 *
-	 * @param 	string 		$pFilename
-	 * @return 	boolean
-	 * @throws PHPExcel_Reader_Exception
-	 */
-	public function canRead($pFilename)
-	{
-
-		//	Office					xmlns:o="urn:schemas-microsoft-com:office:office"
-		//	Excel					xmlns:x="urn:schemas-microsoft-com:office:excel"
-		//	XML Spreadsheet			xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
-		//	Spreadsheet component	xmlns:c="urn:schemas-microsoft-com:office:component:spreadsheet"
-		//	XML schema 				xmlns:s="uuid:BDC6E3F0-6DA3-11d1-A2A3-00AA00C14882"
-		//	XML data type			xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882"
-		//	MS-persist recordset	xmlns:rs="urn:schemas-microsoft-com:rowset"
-		//	Rowset					xmlns:z="#RowsetSchema"
-		//
-
-		$signature = array(
-				'<?xml version="1.0"',
-				'<?mso-application progid="Excel.Sheet"?>'
-			);
-
-		// Open file
-		$this->_openFile($pFilename);
-		$fileHandle = $this->_fileHandle;
-		
-		// Read sample data (first 2 KB will do)
-		$data = fread($fileHandle, 2048);
-		fclose($fileHandle);
-
-		$valid = true;
-		foreach($signature as $match) {
-			// every part of the signature must be present
-			if (strpos($data, $match) === false) {
-				$valid = false;
-				break;
-			}
-		}
-
-		//	Retrieve charset encoding
-		if(preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/um',$data,$matches)) {
-			$this->_charSet = strtoupper($matches[1]);
-		}
-//		echo 'Character Set is ',$this->_charSet,'<br />';
-
-		return $valid;
-	}
-
-
-	/**
-	 * Reads names of the worksheets from a file, without parsing the whole file to a PHPExcel object
-	 *
-	 * @param 	string 		$pFilename
-	 * @throws 	PHPExcel_Reader_Exception
-	 */
-	public function listWorksheetNames($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-		if (!$this->canRead($pFilename)) {
-			throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
-		}
-
-		$worksheetNames = array();
-
-		$xml = simplexml_load_string($this->securityScan(file_get_contents($pFilename)), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
-		$namespaces = $xml->getNamespaces(true);
-
-		$xml_ss = $xml->children($namespaces['ss']);
-		foreach($xml_ss->Worksheet as $worksheet) {
-			$worksheet_ss = $worksheet->attributes($namespaces['ss']);
-			$worksheetNames[] = self::_convertStringEncoding((string) $worksheet_ss['Name'],$this->_charSet);
-		}
-
-		return $worksheetNames;
-	}
-
-
-	/**
-	 * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
-	 *
-	 * @param   string     $pFilename
-	 * @throws   PHPExcel_Reader_Exception
-	 */
-	public function listWorksheetInfo($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		$worksheetInfo = array();
-
-		$xml = simplexml_load_string($this->securityScan(file_get_contents($pFilename)), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
-		$namespaces = $xml->getNamespaces(true);
-
-		$worksheetID = 1;
-		$xml_ss = $xml->children($namespaces['ss']);
-		foreach($xml_ss->Worksheet as $worksheet) {
-			$worksheet_ss = $worksheet->attributes($namespaces['ss']);
-
-			$tmpInfo = array();
-			$tmpInfo['worksheetName'] = '';
-			$tmpInfo['lastColumnLetter'] = 'A';
-			$tmpInfo['lastColumnIndex'] = 0;
-			$tmpInfo['totalRows'] = 0;
-			$tmpInfo['totalColumns'] = 0;
-
-			if (isset($worksheet_ss['Name'])) {
-				$tmpInfo['worksheetName'] = (string) $worksheet_ss['Name'];
-			} else {
-				$tmpInfo['worksheetName'] = "Worksheet_{$worksheetID}";
-			}
-
-			if (isset($worksheet->Table->Row)) {
-				$rowIndex = 0;
-
-				foreach($worksheet->Table->Row as $rowData) {
-					$columnIndex = 0;
-					$rowHasData = false;
-
-					foreach($rowData->Cell as $cell) {
-						if (isset($cell->Data)) {
-							$tmpInfo['lastColumnIndex'] = max($tmpInfo['lastColumnIndex'], $columnIndex);
-							$rowHasData = true;
-						}
-
-						++$columnIndex;
-					}
-
-					++$rowIndex;
-
-					if ($rowHasData) {
-						$tmpInfo['totalRows'] = max($tmpInfo['totalRows'], $rowIndex);
-					}
-				}
-			}
-
-			$tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
-			$tmpInfo['totalColumns'] = $tmpInfo['lastColumnIndex'] + 1;
-
-			$worksheetInfo[] = $tmpInfo;
-			++$worksheetID;
-		}
-
-		return $worksheetInfo;
-	}
-
-
-    /**
-	 * Loads PHPExcel from file
-	 *
-	 * @param 	string 		$pFilename
-	 * @return 	PHPExcel
-	 * @throws 	PHPExcel_Reader_Exception
-	 */
-	public function load($pFilename)
-	{
-		// Create new PHPExcel
-		$objPHPExcel = new PHPExcel();
-        $objPHPExcel->removeSheetByIndex(0);
-
-		// Load into this instance
-		return $this->loadIntoExisting($pFilename, $objPHPExcel);
-	}
-
-
-	protected static function identifyFixedStyleValue($styleList,&$styleAttributeValue) {
-		$styleAttributeValue = strtolower($styleAttributeValue);
-		foreach($styleList as $style) {
-			if ($styleAttributeValue == strtolower($style)) {
-				$styleAttributeValue = $style;
-				return true;
-			}
-		}
-		return false;
-	}
-
-
- 	/**
- 	 * pixel units to excel width units(units of 1/256th of a character width)
- 	 * @param pxs
- 	 * @return
- 	 */
- 	protected static function _pixel2WidthUnits($pxs) {
-		$UNIT_OFFSET_MAP = array(0, 36, 73, 109, 146, 182, 219);
-
-		$widthUnits = 256 * ($pxs / 7);
-		$widthUnits += $UNIT_OFFSET_MAP[($pxs % 7)];
-		return $widthUnits;
-	}
-
-
-	/**
-	 * excel width units(units of 1/256th of a character width) to pixel units
-	 * @param widthUnits
-	 * @return
-	 */
-	protected static function _widthUnits2Pixel($widthUnits) {
-		$pixels = ($widthUnits / 256) * 7;
-		$offsetWidthUnits = $widthUnits % 256;
-		$pixels += round($offsetWidthUnits / (256 / 7));
-		return $pixels;
-	}
-
-
-	protected static function _hex2str($hex) {
-		return chr(hexdec($hex[1]));
-	}
-
-
-	/**
-	 * Loads PHPExcel from file into PHPExcel instance
-	 *
-	 * @param 	string 		$pFilename
-	 * @param	PHPExcel	$objPHPExcel
-	 * @return 	PHPExcel
-	 * @throws 	PHPExcel_Reader_Exception
-	 */
-	public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
-	{
-		$fromFormats	= array('\-',	'\ ');
-		$toFormats		= array('-',	' ');
-
-		$underlineStyles = array (
-				PHPExcel_Style_Font::UNDERLINE_NONE,
-				PHPExcel_Style_Font::UNDERLINE_DOUBLE,
-				PHPExcel_Style_Font::UNDERLINE_DOUBLEACCOUNTING,
-				PHPExcel_Style_Font::UNDERLINE_SINGLE,
-				PHPExcel_Style_Font::UNDERLINE_SINGLEACCOUNTING
-			);
-		$verticalAlignmentStyles = array (
-				PHPExcel_Style_Alignment::VERTICAL_BOTTOM,
-				PHPExcel_Style_Alignment::VERTICAL_TOP,
-				PHPExcel_Style_Alignment::VERTICAL_CENTER,
-				PHPExcel_Style_Alignment::VERTICAL_JUSTIFY
-			);
-		$horizontalAlignmentStyles = array (
-				PHPExcel_Style_Alignment::HORIZONTAL_GENERAL,
-				PHPExcel_Style_Alignment::HORIZONTAL_LEFT,
-				PHPExcel_Style_Alignment::HORIZONTAL_RIGHT,
-				PHPExcel_Style_Alignment::HORIZONTAL_CENTER,
-				PHPExcel_Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS,
-				PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY
-			);
-
-		$timezoneObj = new DateTimeZone('Europe/London');
-		$GMT = new DateTimeZone('UTC');
-
-
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		if (!$this->canRead($pFilename)) {
-			throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
-		}
-
-		$xml = simplexml_load_string($this->securityScan(file_get_contents($pFilename)), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
-		$namespaces = $xml->getNamespaces(true);
-
-		$docProps = $objPHPExcel->getProperties();
-		if (isset($xml->DocumentProperties[0])) {
-			foreach($xml->DocumentProperties[0] as $propertyName => $propertyValue) {
-				switch ($propertyName) {
-					case 'Title' :
-							$docProps->setTitle(self::_convertStringEncoding($propertyValue,$this->_charSet));
-							break;
-					case 'Subject' :
-							$docProps->setSubject(self::_convertStringEncoding($propertyValue,$this->_charSet));
-							break;
-					case 'Author' :
-							$docProps->setCreator(self::_convertStringEncoding($propertyValue,$this->_charSet));
-							break;
-					case 'Created' :
-							$creationDate = strtotime($propertyValue);
-							$docProps->setCreated($creationDate);
-							break;
-					case 'LastAuthor' :
-							$docProps->setLastModifiedBy(self::_convertStringEncoding($propertyValue,$this->_charSet));
-							break;
-					case 'LastSaved' :
-							$lastSaveDate = strtotime($propertyValue);
-							$docProps->setModified($lastSaveDate);
-							break;
-					case 'Company' :
-							$docProps->setCompany(self::_convertStringEncoding($propertyValue,$this->_charSet));
-							break;
-					case 'Category' :
-							$docProps->setCategory(self::_convertStringEncoding($propertyValue,$this->_charSet));
-							break;
-					case 'Manager' :
-							$docProps->setManager(self::_convertStringEncoding($propertyValue,$this->_charSet));
-							break;
-					case 'Keywords' :
-							$docProps->setKeywords(self::_convertStringEncoding($propertyValue,$this->_charSet));
-							break;
-					case 'Description' :
-							$docProps->setDescription(self::_convertStringEncoding($propertyValue,$this->_charSet));
-							break;
-				}
-			}
-		}
-		if (isset($xml->CustomDocumentProperties)) {
-			foreach($xml->CustomDocumentProperties[0] as $propertyName => $propertyValue) {
-				$propertyAttributes = $propertyValue->attributes($namespaces['dt']);
-				$propertyName = preg_replace_callback('/_x([0-9a-z]{4})_/','PHPExcel_Reader_Excel2003XML::_hex2str',$propertyName);
-				$propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_UNKNOWN;
-				switch((string) $propertyAttributes) {
-					case 'string' :
-						$propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_STRING;
-						$propertyValue = trim($propertyValue);
-						break;
-					case 'boolean' :
-						$propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_BOOLEAN;
-						$propertyValue = (bool) $propertyValue;
-						break;
-					case 'integer' :
-						$propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_INTEGER;
-						$propertyValue = intval($propertyValue);
-						break;
-					case 'float' :
-						$propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_FLOAT;
-						$propertyValue = floatval($propertyValue);
-						break;
-					case 'dateTime.tz' :
-						$propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_DATE;
-						$propertyValue = strtotime(trim($propertyValue));
-						break;
-				}
-				$docProps->setCustomProperty($propertyName,$propertyValue,$propertyType);
-			}
-		}
-
-		foreach($xml->Styles[0] as $style) {
-			$style_ss = $style->attributes($namespaces['ss']);
-			$styleID = (string) $style_ss['ID'];
-//			echo 'Style ID = '.$styleID.'<br />';
-			if ($styleID == 'Default') {
-				$this->_styles['Default'] = array();
-			} else {
-				$this->_styles[$styleID] = $this->_styles['Default'];
-			}
-			foreach ($style as $styleType => $styleData) {
-				$styleAttributes = $styleData->attributes($namespaces['ss']);
-//				echo $styleType.'<br />';
-				switch ($styleType) {
-					case 'Alignment' :
-							foreach($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
-//								echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
-								$styleAttributeValue = (string) $styleAttributeValue;
-								switch ($styleAttributeKey) {
-									case 'Vertical' :
-											if (self::identifyFixedStyleValue($verticalAlignmentStyles,$styleAttributeValue)) {
-												$this->_styles[$styleID]['alignment']['vertical'] = $styleAttributeValue;
-											}
-											break;
-									case 'Horizontal' :
-											if (self::identifyFixedStyleValue($horizontalAlignmentStyles,$styleAttributeValue)) {
-												$this->_styles[$styleID]['alignment']['horizontal'] = $styleAttributeValue;
-											}
-											break;
-									case 'WrapText' :
-											$this->_styles[$styleID]['alignment']['wrap'] = true;
-											break;
-								}
-							}
-							break;
-					case 'Borders' :
-							foreach($styleData->Border as $borderStyle) {
-								$borderAttributes = $borderStyle->attributes($namespaces['ss']);
-								$thisBorder = array();
-								foreach($borderAttributes as $borderStyleKey => $borderStyleValue) {
-//									echo $borderStyleKey.' = '.$borderStyleValue.'<br />';
-									switch ($borderStyleKey) {
-										case 'LineStyle' :
-												$thisBorder['style'] = PHPExcel_Style_Border::BORDER_MEDIUM;
-//												$thisBorder['style'] = $borderStyleValue;
-												break;
-										case 'Weight' :
-//												$thisBorder['style'] = $borderStyleValue;
-												break;
-										case 'Position' :
-												$borderPosition = strtolower($borderStyleValue);
-												break;
-										case 'Color' :
-												$borderColour = substr($borderStyleValue,1);
-												$thisBorder['color']['rgb'] = $borderColour;
-												break;
-									}
-								}
-								if (!empty($thisBorder)) {
-									if (($borderPosition == 'left') || ($borderPosition == 'right') || ($borderPosition == 'top') || ($borderPosition == 'bottom')) {
-										$this->_styles[$styleID]['borders'][$borderPosition] = $thisBorder;
-									}
-								}
-							}
-							break;
-					case 'Font' :
-							foreach($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
-//								echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
-								$styleAttributeValue = (string) $styleAttributeValue;
-								switch ($styleAttributeKey) {
-									case 'FontName' :
-											$this->_styles[$styleID]['font']['name'] = $styleAttributeValue;
-											break;
-									case 'Size' :
-											$this->_styles[$styleID]['font']['size'] = $styleAttributeValue;
-											break;
-									case 'Color' :
-											$this->_styles[$styleID]['font']['color']['rgb'] = substr($styleAttributeValue,1);
-											break;
-									case 'Bold' :
-											$this->_styles[$styleID]['font']['bold'] = true;
-											break;
-									case 'Italic' :
-											$this->_styles[$styleID]['font']['italic'] = true;
-											break;
-									case 'Underline' :
-											if (self::identifyFixedStyleValue($underlineStyles,$styleAttributeValue)) {
-												$this->_styles[$styleID]['font']['underline'] = $styleAttributeValue;
-											}
-											break;
-								}
-							}
-							break;
-					case 'Interior' :
-							foreach($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
-//								echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
-								switch ($styleAttributeKey) {
-									case 'Color' :
-											$this->_styles[$styleID]['fill']['color']['rgb'] = substr($styleAttributeValue,1);
-											break;
-								}
-							}
-							break;
-					case 'NumberFormat' :
-							foreach($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
-//								echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
-								$styleAttributeValue = str_replace($fromFormats,$toFormats,$styleAttributeValue);
-								switch ($styleAttributeValue) {
-									case 'Short Date' :
-											$styleAttributeValue = 'dd/mm/yyyy';
-											break;
-								}
-								if ($styleAttributeValue > '') {
-									$this->_styles[$styleID]['numberformat']['code'] = $styleAttributeValue;
-								}
-							}
-							break;
-					case 'Protection' :
-							foreach($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
-//								echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
-							}
-							break;
-				}
-			}
-//			print_r($this->_styles[$styleID]);
-//			echo '<hr />';
-		}
-//		echo '<hr />';
-
-		$worksheetID = 0;
-		$xml_ss = $xml->children($namespaces['ss']);
-
-		foreach($xml_ss->Worksheet as $worksheet) {
-			$worksheet_ss = $worksheet->attributes($namespaces['ss']);
-
-			if ((isset($this->_loadSheetsOnly)) && (isset($worksheet_ss['Name'])) &&
-				(!in_array($worksheet_ss['Name'], $this->_loadSheetsOnly))) {
-				continue;
-			}
-
-//			echo '<h3>Worksheet: ',$worksheet_ss['Name'],'<h3>';
-//
-			// Create new Worksheet
-			$objPHPExcel->createSheet();
-			$objPHPExcel->setActiveSheetIndex($worksheetID);
-			if (isset($worksheet_ss['Name'])) {
-				$worksheetName = self::_convertStringEncoding((string) $worksheet_ss['Name'],$this->_charSet);
-				//	Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in
-				//		formula cells... during the load, all formulae should be correct, and we're simply bringing
-				//		the worksheet name in line with the formula, not the reverse
-				$objPHPExcel->getActiveSheet()->setTitle($worksheetName,false);
-			}
-
-			$columnID = 'A';
-			if (isset($worksheet->Table->Column)) {
-				foreach($worksheet->Table->Column as $columnData) {
-					$columnData_ss = $columnData->attributes($namespaces['ss']);
-					if (isset($columnData_ss['Index'])) {
-						$columnID = PHPExcel_Cell::stringFromColumnIndex($columnData_ss['Index']-1);
-					}
-					if (isset($columnData_ss['Width'])) {
-						$columnWidth = $columnData_ss['Width'];
-//						echo '<b>Setting column width for '.$columnID.' to '.$columnWidth.'</b><br />';
-						$objPHPExcel->getActiveSheet()->getColumnDimension($columnID)->setWidth($columnWidth / 5.4);
-					}
-					++$columnID;
-				}
-			}
-
-			$rowID = 1;
-			if (isset($worksheet->Table->Row)) {
-                $additionalMergedCells = 0;
-				foreach($worksheet->Table->Row as $rowData) {
-					$rowHasData = false;
-					$row_ss = $rowData->attributes($namespaces['ss']);
-					if (isset($row_ss['Index'])) {
-						$rowID = (integer) $row_ss['Index'];
-					}
-//					echo '<b>Row '.$rowID.'</b><br />';
-
-					$columnID = 'A';
-					foreach($rowData->Cell as $cell) {
-
-						$cell_ss = $cell->attributes($namespaces['ss']);
-						if (isset($cell_ss['Index'])) {
-							$columnID = PHPExcel_Cell::stringFromColumnIndex($cell_ss['Index']-1);
-						}
-						$cellRange = $columnID.$rowID;
-
-						if ($this->getReadFilter() !== NULL) {
-							if (!$this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
-								continue;
-							}
-						}
-
-						if ((isset($cell_ss['MergeAcross'])) || (isset($cell_ss['MergeDown']))) {
-							$columnTo = $columnID;
-							if (isset($cell_ss['MergeAcross'])) {
-                                $additionalMergedCells += (int)$cell_ss['MergeAcross'];
-								$columnTo = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($columnID) + $cell_ss['MergeAcross'] -1);
-							}
-							$rowTo = $rowID;
-							if (isset($cell_ss['MergeDown'])) {
-								$rowTo = $rowTo + $cell_ss['MergeDown'];
-							}
-							$cellRange .= ':'.$columnTo.$rowTo;
-							$objPHPExcel->getActiveSheet()->mergeCells($cellRange);
-						}
-
-						$cellIsSet = $hasCalculatedValue = false;
-						$cellDataFormula = '';
-						if (isset($cell_ss['Formula'])) {
-							$cellDataFormula = $cell_ss['Formula'];
-							// added this as a check for array formulas
-							if (isset($cell_ss['ArrayRange'])) {
-								$cellDataCSEFormula = $cell_ss['ArrayRange'];
-//								echo "found an array formula at ".$columnID.$rowID."<br />";
-							}
-							$hasCalculatedValue = true;
-						}
-						if (isset($cell->Data)) {
-							$cellValue = $cellData = $cell->Data;
-							$type = PHPExcel_Cell_DataType::TYPE_NULL;
-							$cellData_ss = $cellData->attributes($namespaces['ss']);
-							if (isset($cellData_ss['Type'])) {
-								$cellDataType = $cellData_ss['Type'];
-								switch ($cellDataType) {
-									/*
-									const TYPE_STRING		= 's';
-									const TYPE_FORMULA		= 'f';
-									const TYPE_NUMERIC		= 'n';
-									const TYPE_BOOL			= 'b';
-								    const TYPE_NULL			= 'null';
-								    const TYPE_INLINE		= 'inlineStr';
-									const TYPE_ERROR		= 'e';
-									*/
-									case 'String' :
-											$cellValue = self::_convertStringEncoding($cellValue,$this->_charSet);
-											$type = PHPExcel_Cell_DataType::TYPE_STRING;
-											break;
-									case 'Number' :
-											$type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
-											$cellValue = (float) $cellValue;
-											if (floor($cellValue) == $cellValue) {
-												$cellValue = (integer) $cellValue;
-											}
-											break;
-									case 'Boolean' :
-											$type = PHPExcel_Cell_DataType::TYPE_BOOL;
-											$cellValue = ($cellValue != 0);
-											break;
-									case 'DateTime' :
-											$type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
-											$cellValue = PHPExcel_Shared_Date::PHPToExcel(strtotime($cellValue));
-											break;
-									case 'Error' :
-											$type = PHPExcel_Cell_DataType::TYPE_ERROR;
-											break;
-								}
-							}
-
-							if ($hasCalculatedValue) {
-//								echo 'FORMULA<br />';
-								$type = PHPExcel_Cell_DataType::TYPE_FORMULA;
-								$columnNumber = PHPExcel_Cell::columnIndexFromString($columnID);
-								if (substr($cellDataFormula,0,3) == 'of:') {
-									$cellDataFormula = substr($cellDataFormula,3);
-//									echo 'Before: ',$cellDataFormula,'<br />';
-									$temp = explode('"',$cellDataFormula);
-									$key = false;
-									foreach($temp as &$value) {
-										//	Only replace in alternate array entries (i.e. non-quoted blocks)
-										if ($key = !$key) {
-											$value = str_replace(array('[.','.',']'),'',$value);
-										}
-									}
-								} else {
-									//	Convert R1C1 style references to A1 style references (but only when not quoted)
-//									echo 'Before: ',$cellDataFormula,'<br />';
-									$temp = explode('"',$cellDataFormula);
-									$key = false;
-									foreach($temp as &$value) {
-										//	Only replace in alternate array entries (i.e. non-quoted blocks)
-										if ($key = !$key) {
-											preg_match_all('/(R(\[?-?\d*\]?))(C(\[?-?\d*\]?))/',$value, $cellReferences,PREG_SET_ORDER+PREG_OFFSET_CAPTURE);
-											//	Reverse the matches array, otherwise all our offsets will become incorrect if we modify our way
-											//		through the formula from left to right. Reversing means that we work right to left.through
-											//		the formula
-											$cellReferences = array_reverse($cellReferences);
-											//	Loop through each R1C1 style reference in turn, converting it to its A1 style equivalent,
-											//		then modify the formula to use that new reference
-											foreach($cellReferences as $cellReference) {
-												$rowReference = $cellReference[2][0];
-												//	Empty R reference is the current row
-												if ($rowReference == '') $rowReference = $rowID;
-												//	Bracketed R references are relative to the current row
-												if ($rowReference{0} == '[') $rowReference = $rowID + trim($rowReference,'[]');
-												$columnReference = $cellReference[4][0];
-												//	Empty C reference is the current column
-												if ($columnReference == '') $columnReference = $columnNumber;
-												//	Bracketed C references are relative to the current column
-												if ($columnReference{0} == '[') $columnReference = $columnNumber + trim($columnReference,'[]');
-												$A1CellReference = PHPExcel_Cell::stringFromColumnIndex($columnReference-1).$rowReference;
-													$value = substr_replace($value,$A1CellReference,$cellReference[0][1],strlen($cellReference[0][0]));
-											}
-										}
-									}
-								}
-								unset($value);
-								//	Then rebuild the formula string
-								$cellDataFormula = implode('"',$temp);
-//								echo 'After: ',$cellDataFormula,'<br />';
-							}
-
-//							echo 'Cell '.$columnID.$rowID.' is a '.$type.' with a value of '.(($hasCalculatedValue) ? $cellDataFormula : $cellValue).'<br />';
-//
-							$objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $cellValue),$type);
-							if ($hasCalculatedValue) {
-//								echo 'Formula result is '.$cellValue.'<br />';
-								$objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setCalculatedValue($cellValue);
-							}
-							$cellIsSet = $rowHasData = true;
-						}
-
-						if (isset($cell->Comment)) {
-//							echo '<b>comment found</b><br />';
-							$commentAttributes = $cell->Comment->attributes($namespaces['ss']);
-							$author = 'unknown';
-							if (isset($commentAttributes->Author)) {
-								$author = (string)$commentAttributes->Author;
-//								echo 'Author: ',$author,'<br />';
-							}
-							$node = $cell->Comment->Data->asXML();
-//							$annotation = str_replace('html:','',substr($node,49,-10));
-//							echo $annotation,'<br />';
-							$annotation = strip_tags($node);
-//							echo 'Annotation: ',$annotation,'<br />';
-							$objPHPExcel->getActiveSheet()->getComment( $columnID.$rowID )
-															->setAuthor(self::_convertStringEncoding($author ,$this->_charSet))
-															->setText($this->_parseRichText($annotation) );
-						}
-
-						if (($cellIsSet) && (isset($cell_ss['StyleID']))) {
-							$style = (string) $cell_ss['StyleID'];
-//							echo 'Cell style for '.$columnID.$rowID.' is '.$style.'<br />';
-							if ((isset($this->_styles[$style])) && (!empty($this->_styles[$style]))) {
-//								echo 'Cell '.$columnID.$rowID.'<br />';
-//								print_r($this->_styles[$style]);
-//								echo '<br />';
-								if (!$objPHPExcel->getActiveSheet()->cellExists($columnID.$rowID)) {
-									$objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setValue(NULL);
-								}
-								$objPHPExcel->getActiveSheet()->getStyle($cellRange)->applyFromArray($this->_styles[$style]);
-							}
-						}
-						++$columnID;
-                        while ($additionalMergedCells > 0) {
-                            ++$columnID;
-                            $additionalMergedCells--;
-                        }
-					}
-
-					if ($rowHasData) {
-						if (isset($row_ss['StyleID'])) {
-							$rowStyle = $row_ss['StyleID'];
-						}
-						if (isset($row_ss['Height'])) {
-							$rowHeight = $row_ss['Height'];
-//							echo '<b>Setting row height to '.$rowHeight.'</b><br />';
-							$objPHPExcel->getActiveSheet()->getRowDimension($rowID)->setRowHeight($rowHeight);
-						}
-					}
-
-					++$rowID;
-				}
-			}
-			++$worksheetID;
-		}
-
-		// Return
-		return $objPHPExcel;
-	}
-
-
-	protected static function _convertStringEncoding($string,$charset) {
-		if ($charset != 'UTF-8') {
-			return PHPExcel_Shared_String::ConvertEncoding($string,'UTF-8',$charset);
-		}
-		return $string;
-	}
-
-
-	protected function _parseRichText($is = '') {
-		$value = new PHPExcel_RichText();
-
-		$value->createText(self::_convertStringEncoding($is,$this->_charSet));
-
-		return $value;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007.php
deleted file mode 100644
index e41596afcac..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007.php
+++ /dev/null
@@ -1,2083 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_Reader_Excel2007
- *
- * @category	PHPExcel
- * @package	PHPExcel_Reader
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_Excel2007 extends PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
-{
-	/**
-	 * PHPExcel_ReferenceHelper instance
-	 *
-	 * @var PHPExcel_ReferenceHelper
-	 */
-	private $_referenceHelper = NULL;
-
-	/**
-	 * PHPExcel_Reader_Excel2007_Theme instance
-	 *
-	 * @var PHPExcel_Reader_Excel2007_Theme
-	 */
-	private static $_theme = NULL;
-
-
-	/**
-	 * Create a new PHPExcel_Reader_Excel2007 instance
-	 */
-	public function __construct() {
-		$this->_readFilter = new PHPExcel_Reader_DefaultReadFilter();
-		$this->_referenceHelper = PHPExcel_ReferenceHelper::getInstance();
-	}
-
-
-	/**
-	 * Can the current PHPExcel_Reader_IReader read the file?
-	 *
-	 * @param 	string 		$pFilename
-	 * @return 	boolean
-	 * @throws PHPExcel_Reader_Exception
-	 */
-	public function canRead($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-        $zipClass = PHPExcel_Settings::getZipClass();
-
-		// Check if zip class exists
-//		if (!class_exists($zipClass, FALSE)) {
-//			throw new PHPExcel_Reader_Exception($zipClass . " library is not enabled");
-//		}
-
-		$xl = false;
-		// Load file
-		$zip = new $zipClass;
-		if ($zip->open($pFilename) === true) {
-			// check if it is an OOXML archive
-			$rels = simplexml_load_string($this->securityScan($this->_getFromZipArchive($zip, "_rels/.rels")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
-			if ($rels !== false) {
-				foreach ($rels->Relationship as $rel) {
-					switch ($rel["Type"]) {
-						case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument":
-							if (basename($rel["Target"]) == 'workbook.xml') {
-								$xl = true;
-							}
-							break;
-
-					}
-				}
-			}
-			$zip->close();
-		}
-
-		return $xl;
-	}
-
-
-	/**
-	 * Reads names of the worksheets from a file, without parsing the whole file to a PHPExcel object
-	 *
-	 * @param 	string 		$pFilename
-	 * @throws 	PHPExcel_Reader_Exception
-	 */
-	public function listWorksheetNames($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		$worksheetNames = array();
-
-        $zipClass = PHPExcel_Settings::getZipClass();
-
-		$zip = new $zipClass;
-		$zip->open($pFilename);
-
-		//	The files we're looking at here are small enough that simpleXML is more efficient than XMLReader
-		$rels = simplexml_load_string(
-		    $this->securityScan($this->_getFromZipArchive($zip, "_rels/.rels"), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions())
-		); //~ http://schemas.openxmlformats.org/package/2006/relationships");
-		foreach ($rels->Relationship as $rel) {
-			switch ($rel["Type"]) {
-				case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument":
-					$xmlWorkbook = simplexml_load_string(
-					    $this->securityScan($this->_getFromZipArchive($zip, "{$rel['Target']}"), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions())
-					);  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
-
-					if ($xmlWorkbook->sheets) {
-						foreach ($xmlWorkbook->sheets->sheet as $eleSheet) {
-							// Check if sheet should be skipped
-							$worksheetNames[] = (string) $eleSheet["name"];
-						}
-					}
-			}
-		}
-
-		$zip->close();
-
-		return $worksheetNames;
-	}
-
-
-	/**
-	 * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
-	 *
-	 * @param   string     $pFilename
-	 * @throws   PHPExcel_Reader_Exception
-	 */
-	public function listWorksheetInfo($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		$worksheetInfo = array();
-
-        $zipClass = PHPExcel_Settings::getZipClass();
-
-		$zip = new $zipClass;
-		$zip->open($pFilename);
-
-		$rels = simplexml_load_string($this->securityScan($this->_getFromZipArchive($zip, "_rels/.rels")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions()); //~ http://schemas.openxmlformats.org/package/2006/relationships");
-		foreach ($rels->Relationship as $rel) {
-			if ($rel["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument") {
-				$dir = dirname($rel["Target"]);
-				$relsWorkbook = simplexml_load_string($this->securityScan($this->_getFromZipArchive($zip, "$dir/_rels/" . basename($rel["Target"]) . ".rels")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());  //~ http://schemas.openxmlformats.org/package/2006/relationships");
-				$relsWorkbook->registerXPathNamespace("rel", "http://schemas.openxmlformats.org/package/2006/relationships");
-
-				$worksheets = array();
-				foreach ($relsWorkbook->Relationship as $ele) {
-					if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet") {
-						$worksheets[(string) $ele["Id"]] = $ele["Target"];
-					}
-				}
-
-				$xmlWorkbook = simplexml_load_string($this->securityScan($this->_getFromZipArchive($zip, "{$rel['Target']}")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
-				if ($xmlWorkbook->sheets) {
-					$dir = dirname($rel["Target"]);
-					foreach ($xmlWorkbook->sheets->sheet as $eleSheet) {
-						$tmpInfo = array(
-							'worksheetName' => (string) $eleSheet["name"],
-							'lastColumnLetter' => 'A',
-							'lastColumnIndex' => 0,
-							'totalRows' => 0,
-							'totalColumns' => 0,
-						);
-
-						$fileWorksheet = $worksheets[(string) self::array_item($eleSheet->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "id")];
-
-						$xml = new XMLReader();
-						$res = $xml->xml($this->securityScanFile('zip://'.PHPExcel_Shared_File::realpath($pFilename).'#'."$dir/$fileWorksheet"), null, PHPExcel_Settings::getLibXmlLoaderOptions());
-						$xml->setParserProperty(2,true);
-
-						$currCells = 0;
-						while ($xml->read()) {
-							if ($xml->name == 'row' && $xml->nodeType == XMLReader::ELEMENT) {
-								$row = $xml->getAttribute('r');
-								$tmpInfo['totalRows'] = $row;
-								$tmpInfo['totalColumns'] = max($tmpInfo['totalColumns'],$currCells);
-								$currCells = 0;
-							} elseif ($xml->name == 'c' && $xml->nodeType == XMLReader::ELEMENT) {
-								$currCells++;
-							}
-						}
-						$tmpInfo['totalColumns'] = max($tmpInfo['totalColumns'],$currCells);
-						$xml->close();
-
-						$tmpInfo['lastColumnIndex'] = $tmpInfo['totalColumns'] - 1;
-						$tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
-
-						$worksheetInfo[] = $tmpInfo;
-					}
-				}
-			}
-		}
-
-		$zip->close();
-
-		return $worksheetInfo;
-	}
-
-
-	private static function _castToBool($c) {
-//		echo 'Initial Cast to Boolean', PHP_EOL;
-		$value = isset($c->v) ? (string) $c->v : NULL;
-		if ($value == '0') {
-			return FALSE;
-		} elseif ($value == '1') {
-			return TRUE;
-		} else {
-			return (bool)$c->v;
-		}
-		return $value;
-	}	//	function _castToBool()
-
-
-	private static function _castToError($c) {
-//		echo 'Initial Cast to Error', PHP_EOL;
-		return isset($c->v) ? (string) $c->v : NULL;
-	}	//	function _castToError()
-
-
-	private static function _castToString($c) {
-//		echo 'Initial Cast to String, PHP_EOL;
-		return isset($c->v) ? (string) $c->v : NULL;
-	}	//	function _castToString()
-
-
-	private function _castToFormula($c,$r,&$cellDataType,&$value,&$calculatedValue,&$sharedFormulas,$castBaseType) {
-//		echo 'Formula', PHP_EOL;
-//		echo '$c->f is ', $c->f, PHP_EOL;
-		$cellDataType 		= 'f';
-		$value 				= "={$c->f}";
-		$calculatedValue 	= self::$castBaseType($c);
-
-		// Shared formula?
-		if (isset($c->f['t']) && strtolower((string)$c->f['t']) == 'shared') {
-//			echo 'SHARED FORMULA', PHP_EOL;
-			$instance = (string)$c->f['si'];
-
-//			echo 'Instance ID = ', $instance, PHP_EOL;
-//
-//			echo 'Shared Formula Array:', PHP_EOL;
-//			print_r($sharedFormulas);
-			if (!isset($sharedFormulas[(string)$c->f['si']])) {
-//				echo 'SETTING NEW SHARED FORMULA', PHP_EOL;
-//				echo 'Master is ', $r, PHP_EOL;
-//				echo 'Formula is ', $value, PHP_EOL;
-				$sharedFormulas[$instance] = array(	'master' => $r,
-													'formula' => $value
-												  );
-//				echo 'New Shared Formula Array:', PHP_EOL;
-//				print_r($sharedFormulas);
-			} else {
-//				echo 'GETTING SHARED FORMULA', PHP_EOL;
-//				echo 'Master is ', $sharedFormulas[$instance]['master'], PHP_EOL;
-//				echo 'Formula is ', $sharedFormulas[$instance]['formula'], PHP_EOL;
-				$master = PHPExcel_Cell::coordinateFromString($sharedFormulas[$instance]['master']);
-				$current = PHPExcel_Cell::coordinateFromString($r);
-
-				$difference = array(0, 0);
-				$difference[0] = PHPExcel_Cell::columnIndexFromString($current[0]) - PHPExcel_Cell::columnIndexFromString($master[0]);
-				$difference[1] = $current[1] - $master[1];
-
-				$value = $this->_referenceHelper->updateFormulaReferences(	$sharedFormulas[$instance]['formula'],
-																			'A1',
-																			$difference[0],
-																			$difference[1]
-																		 );
-//				echo 'Adjusted Formula is ', $value, PHP_EOL;
-			}
-		}
-	}
-
-
-	public function _getFromZipArchive($archive, $fileName = '')
-	{
-		// Root-relative paths
-		if (strpos($fileName, '//') !== false)
-		{
-			$fileName = substr($fileName, strpos($fileName, '//') + 1);
-		}
-		$fileName = PHPExcel_Shared_File::realpath($fileName);
-
-		// Apache POI fixes
-		$contents = $archive->getFromName($fileName);
-		if ($contents === false)
-		{
-			$contents = $archive->getFromName(substr($fileName, 1));
-		}
-
-		return $contents;
-	}
-
-
-	/**
-	 * Loads PHPExcel from file
-	 *
-	 * @param 	string 		$pFilename
-     * @return  PHPExcel
-	 * @throws 	PHPExcel_Reader_Exception
-	 */
-	public function load($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		// Initialisations
-		$excel = new PHPExcel;
-		$excel->removeSheetByIndex(0);
-		if (!$this->_readDataOnly) {
-			$excel->removeCellStyleXfByIndex(0); // remove the default style
-			$excel->removeCellXfByIndex(0); // remove the default style
-		}
-
-        $zipClass = PHPExcel_Settings::getZipClass();
-
-		$zip = new $zipClass;
-		$zip->open($pFilename);
-
-		//	Read the theme first, because we need the colour scheme when reading the styles
-		$wbRels = simplexml_load_string($this->securityScan($this->_getFromZipArchive($zip, "xl/_rels/workbook.xml.rels")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions()); //~ http://schemas.openxmlformats.org/package/2006/relationships");
-		foreach ($wbRels->Relationship as $rel) {
-			switch ($rel["Type"]) {
-				case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme":
-					$themeOrderArray = array('lt1','dk1','lt2','dk2');
-					$themeOrderAdditional = count($themeOrderArray);
-
-					$xmlTheme = simplexml_load_string($this->securityScan($this->_getFromZipArchive($zip, "xl/{$rel['Target']}")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
-					if (is_object($xmlTheme)) {
-						$xmlThemeName = $xmlTheme->attributes();
-						$xmlTheme = $xmlTheme->children("http://schemas.openxmlformats.org/drawingml/2006/main");
-						$themeName = (string)$xmlThemeName['name'];
-
-						$colourScheme = $xmlTheme->themeElements->clrScheme->attributes();
-						$colourSchemeName = (string)$colourScheme['name'];
-						$colourScheme = $xmlTheme->themeElements->clrScheme->children("http://schemas.openxmlformats.org/drawingml/2006/main");
-
-						$themeColours = array();
-						foreach ($colourScheme as $k => $xmlColour) {
-							$themePos = array_search($k,$themeOrderArray);
-							if ($themePos === false) {
-								$themePos = $themeOrderAdditional++;
-							}
-							if (isset($xmlColour->sysClr)) {
-								$xmlColourData = $xmlColour->sysClr->attributes();
-								$themeColours[$themePos] = $xmlColourData['lastClr'];
-							} elseif (isset($xmlColour->srgbClr)) {
-								$xmlColourData = $xmlColour->srgbClr->attributes();
-								$themeColours[$themePos] = $xmlColourData['val'];
-							}
-						}
-						self::$_theme = new PHPExcel_Reader_Excel2007_Theme($themeName,$colourSchemeName,$themeColours);
-					}
-					break;
-			}
-		}
-
-		$rels = simplexml_load_string($this->securityScan($this->_getFromZipArchive($zip, "_rels/.rels")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions()); //~ http://schemas.openxmlformats.org/package/2006/relationships");
-		foreach ($rels->Relationship as $rel) {
-			switch ($rel["Type"]) {
-				case "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties":
-					$xmlCore = simplexml_load_string($this->securityScan($this->_getFromZipArchive($zip, "{$rel['Target']}")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
-					if (is_object($xmlCore)) {
-						$xmlCore->registerXPathNamespace("dc", "http://purl.org/dc/elements/1.1/");
-						$xmlCore->registerXPathNamespace("dcterms", "http://purl.org/dc/terms/");
-						$xmlCore->registerXPathNamespace("cp", "http://schemas.openxmlformats.org/package/2006/metadata/core-properties");
-						$docProps = $excel->getProperties();
-						$docProps->setCreator((string) self::array_item($xmlCore->xpath("dc:creator")));
-						$docProps->setLastModifiedBy((string) self::array_item($xmlCore->xpath("cp:lastModifiedBy")));
-						$docProps->setCreated(strtotime(self::array_item($xmlCore->xpath("dcterms:created")))); //! respect xsi:type
-						$docProps->setModified(strtotime(self::array_item($xmlCore->xpath("dcterms:modified")))); //! respect xsi:type
-						$docProps->setTitle((string) self::array_item($xmlCore->xpath("dc:title")));
-						$docProps->setDescription((string) self::array_item($xmlCore->xpath("dc:description")));
-						$docProps->setSubject((string) self::array_item($xmlCore->xpath("dc:subject")));
-						$docProps->setKeywords((string) self::array_item($xmlCore->xpath("cp:keywords")));
-						$docProps->setCategory((string) self::array_item($xmlCore->xpath("cp:category")));
-					}
-				break;
-
-				case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties":
-					$xmlCore = simplexml_load_string($this->securityScan($this->_getFromZipArchive($zip, "{$rel['Target']}")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
-					if (is_object($xmlCore)) {
-						$docProps = $excel->getProperties();
-						if (isset($xmlCore->Company))
-							$docProps->setCompany((string) $xmlCore->Company);
-						if (isset($xmlCore->Manager))
-							$docProps->setManager((string) $xmlCore->Manager);
-					}
-				break;
-
-				case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties":
-					$xmlCore = simplexml_load_string($this->securityScan($this->_getFromZipArchive($zip, "{$rel['Target']}")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
-					if (is_object($xmlCore)) {
-						$docProps = $excel->getProperties();
-						foreach ($xmlCore as $xmlProperty) {
-							$cellDataOfficeAttributes = $xmlProperty->attributes();
-							if (isset($cellDataOfficeAttributes['name'])) {
-								$propertyName = (string) $cellDataOfficeAttributes['name'];
-								$cellDataOfficeChildren = $xmlProperty->children('http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes');
-								$attributeType = $cellDataOfficeChildren->getName();
-								$attributeValue = (string) $cellDataOfficeChildren->{$attributeType};
-								$attributeValue = PHPExcel_DocumentProperties::convertProperty($attributeValue,$attributeType);
-								$attributeType = PHPExcel_DocumentProperties::convertPropertyType($attributeType);
-								$docProps->setCustomProperty($propertyName,$attributeValue,$attributeType);
-							}
-						}
-					}
-				break;
-				//Ribbon
-				case "http://schemas.microsoft.com/office/2006/relationships/ui/extensibility":
-					$customUI = $rel['Target'];
-					if(!is_null($customUI)){
-						$this->_readRibbon($excel, $customUI, $zip);
-					}
-				break;
-				case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument":
-					$dir = dirname($rel["Target"]);
-					$relsWorkbook = simplexml_load_string($this->securityScan($this->_getFromZipArchive($zip, "$dir/_rels/" . basename($rel["Target"]) . ".rels")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());  //~ http://schemas.openxmlformats.org/package/2006/relationships");
-					$relsWorkbook->registerXPathNamespace("rel", "http://schemas.openxmlformats.org/package/2006/relationships");
-
-					$sharedStrings = array();
-					$xpath = self::array_item($relsWorkbook->xpath("rel:Relationship[@Type='http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings']"));
-					$xmlStrings = simplexml_load_string($this->securityScan($this->_getFromZipArchive($zip, "$dir/$xpath[Target]")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
-					if (isset($xmlStrings) && isset($xmlStrings->si)) {
-						foreach ($xmlStrings->si as $val) {
-							if (isset($val->t)) {
-								$sharedStrings[] = PHPExcel_Shared_String::ControlCharacterOOXML2PHP( (string) $val->t );
-							} elseif (isset($val->r)) {
-								$sharedStrings[] = $this->_parseRichText($val);
-							}
-						}
-					}
-
-					$worksheets = array();
-                    $macros = $customUI = NULL;
-					foreach ($relsWorkbook->Relationship as $ele) {
-						switch($ele['Type']){
-						case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet":
-							$worksheets[(string) $ele["Id"]] = $ele["Target"];
-							break;
-						// a vbaProject ? (: some macros)
-						case "http://schemas.microsoft.com/office/2006/relationships/vbaProject":
-							$macros = $ele["Target"];
-							break;
-						}
-					}
-
-					if(!is_null($macros)){
-						$macrosCode = $this->_getFromZipArchive($zip, 'xl/vbaProject.bin');//vbaProject.bin always in 'xl' dir and always named vbaProject.bin
-						if($macrosCode !== false){
-							$excel->setMacrosCode($macrosCode);
-							$excel->setHasMacros(true);
-							//short-circuit : not reading vbaProject.bin.rel to get Signature =>allways vbaProjectSignature.bin in 'xl' dir
-							$Certificate = $this->_getFromZipArchive($zip, 'xl/vbaProjectSignature.bin');
-							if($Certificate !== false)
-								$excel->setMacrosCertificate($Certificate);
-						}
-					}
-					$styles 	= array();
-					$cellStyles = array();
-					$xpath = self::array_item($relsWorkbook->xpath("rel:Relationship[@Type='http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles']"));
-					$xmlStyles = simplexml_load_string($this->securityScan($this->_getFromZipArchive($zip, "$dir/$xpath[Target]")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions()); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
-					$numFmts = null;
-					if ($xmlStyles && $xmlStyles->numFmts[0]) {
-						$numFmts = $xmlStyles->numFmts[0];
-					}
-					if (isset($numFmts) && ($numFmts !== NULL)) {
-						$numFmts->registerXPathNamespace("sml", "http://schemas.openxmlformats.org/spreadsheetml/2006/main");
-					}
-					if (!$this->_readDataOnly && $xmlStyles) {
-						foreach ($xmlStyles->cellXfs->xf as $xf) {
-							$numFmt = PHPExcel_Style_NumberFormat::FORMAT_GENERAL;
-
-							if ($xf["numFmtId"]) {
-								if (isset($numFmts)) {
-									$tmpNumFmt = self::array_item($numFmts->xpath("sml:numFmt[@numFmtId=$xf[numFmtId]]"));
-
-									if (isset($tmpNumFmt["formatCode"])) {
-										$numFmt = (string) $tmpNumFmt["formatCode"];
-									}
-								}
-
-								if ((int)$xf["numFmtId"] < 164) {
-									$numFmt = PHPExcel_Style_NumberFormat::builtInFormatCode((int)$xf["numFmtId"]);
-								}
-							}
-                            $quotePrefix = false;
-							if (isset($xf["quotePrefix"])) {
-                                $quotePrefix = (boolean) $xf["quotePrefix"];
-                            }
-							//$numFmt = str_replace('mm', 'i', $numFmt);
-							//$numFmt = str_replace('h', 'H', $numFmt);
-
-							$style = (object) array(
-								"numFmt" => $numFmt,
-								"font" => $xmlStyles->fonts->font[intval($xf["fontId"])],
-								"fill" => $xmlStyles->fills->fill[intval($xf["fillId"])],
-								"border" => $xmlStyles->borders->border[intval($xf["borderId"])],
-								"alignment" => $xf->alignment,
-								"protection" => $xf->protection,
-								"quotePrefix" => $quotePrefix,
-							);
-							$styles[] = $style;
-
-							// add style to cellXf collection
-							$objStyle = new PHPExcel_Style;
-							self::_readStyle($objStyle, $style);
-							$excel->addCellXf($objStyle);
-						}
-
-						foreach ($xmlStyles->cellStyleXfs->xf as $xf) {
-							$numFmt = PHPExcel_Style_NumberFormat::FORMAT_GENERAL;
-							if ($numFmts && $xf["numFmtId"]) {
-								$tmpNumFmt = self::array_item($numFmts->xpath("sml:numFmt[@numFmtId=$xf[numFmtId]]"));
-								if (isset($tmpNumFmt["formatCode"])) {
-									$numFmt = (string) $tmpNumFmt["formatCode"];
-								} else if ((int)$xf["numFmtId"] < 165) {
-									$numFmt = PHPExcel_Style_NumberFormat::builtInFormatCode((int)$xf["numFmtId"]);
-								}
-							}
-
-							$cellStyle = (object) array(
-								"numFmt" => $numFmt,
-								"font" => $xmlStyles->fonts->font[intval($xf["fontId"])],
-								"fill" => $xmlStyles->fills->fill[intval($xf["fillId"])],
-								"border" => $xmlStyles->borders->border[intval($xf["borderId"])],
-								"alignment" => $xf->alignment,
-								"protection" => $xf->protection,
-								"quotePrefix" => $quotePrefix,
-							);
-							$cellStyles[] = $cellStyle;
-
-							// add style to cellStyleXf collection
-							$objStyle = new PHPExcel_Style;
-							self::_readStyle($objStyle, $cellStyle);
-							$excel->addCellStyleXf($objStyle);
-						}
-					}
-
-					$dxfs = array();
-					if (!$this->_readDataOnly && $xmlStyles) {
-						//	Conditional Styles
-						if ($xmlStyles->dxfs) {
-							foreach ($xmlStyles->dxfs->dxf as $dxf) {
-								$style = new PHPExcel_Style(FALSE, TRUE);
-								self::_readStyle($style, $dxf);
-								$dxfs[] = $style;
-							}
-						}
-						//	Cell Styles
-						if ($xmlStyles->cellStyles) {
-							foreach ($xmlStyles->cellStyles->cellStyle as $cellStyle) {
-								if (intval($cellStyle['builtinId']) == 0) {
-									if (isset($cellStyles[intval($cellStyle['xfId'])])) {
-										// Set default style
-										$style = new PHPExcel_Style;
-										self::_readStyle($style, $cellStyles[intval($cellStyle['xfId'])]);
-
-										// normal style, currently not using it for anything
-									}
-								}
-							}
-						}
-					}
-
-					$xmlWorkbook = simplexml_load_string($this->securityScan($this->_getFromZipArchive($zip, "{$rel['Target']}")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
-
-					// Set base date
-					if ($xmlWorkbook->workbookPr) {
-						PHPExcel_Shared_Date::setExcelCalendar(PHPExcel_Shared_Date::CALENDAR_WINDOWS_1900);
-						if (isset($xmlWorkbook->workbookPr['date1904'])) {
-							if (self::boolean((string) $xmlWorkbook->workbookPr['date1904'])) {
-								PHPExcel_Shared_Date::setExcelCalendar(PHPExcel_Shared_Date::CALENDAR_MAC_1904);
-							}
-						}
-					}
-
-					$sheetId = 0; // keep track of new sheet id in final workbook
-					$oldSheetId = -1; // keep track of old sheet id in final workbook
-					$countSkippedSheets = 0; // keep track of number of skipped sheets
-					$mapSheetId = array(); // mapping of sheet ids from old to new
-
-
-					$charts = $chartDetails = array();
-
-					if ($xmlWorkbook->sheets) {
-						foreach ($xmlWorkbook->sheets->sheet as $eleSheet) {
-							++$oldSheetId;
-
-							// Check if sheet should be skipped
-							if (isset($this->_loadSheetsOnly) && !in_array((string) $eleSheet["name"], $this->_loadSheetsOnly)) {
-								++$countSkippedSheets;
-								$mapSheetId[$oldSheetId] = null;
-								continue;
-							}
-
-							// Map old sheet id in original workbook to new sheet id.
-							// They will differ if loadSheetsOnly() is being used
-							$mapSheetId[$oldSheetId] = $oldSheetId - $countSkippedSheets;
-
-							// Load sheet
-							$docSheet = $excel->createSheet();
-							//	Use false for $updateFormulaCellReferences to prevent adjustment of worksheet
-							//		references in formula cells... during the load, all formulae should be correct,
-							//		and we're simply bringing the worksheet name in line with the formula, not the
-							//		reverse
-							$docSheet->setTitle((string) $eleSheet["name"],false);
-							$fileWorksheet = $worksheets[(string) self::array_item($eleSheet->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "id")];
-							$xmlSheet = simplexml_load_string($this->securityScan($this->_getFromZipArchive($zip, "$dir/$fileWorksheet")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
-
-							$sharedFormulas = array();
-
-							if (isset($eleSheet["state"]) && (string) $eleSheet["state"] != '') {
-								$docSheet->setSheetState( (string) $eleSheet["state"] );
-							}
-
-							if (isset($xmlSheet->sheetViews) && isset($xmlSheet->sheetViews->sheetView)) {
-							    if (isset($xmlSheet->sheetViews->sheetView['zoomScale'])) {
-								    $docSheet->getSheetView()->setZoomScale( intval($xmlSheet->sheetViews->sheetView['zoomScale']) );
-								}
-
-							    if (isset($xmlSheet->sheetViews->sheetView['zoomScaleNormal'])) {
-								    $docSheet->getSheetView()->setZoomScaleNormal( intval($xmlSheet->sheetViews->sheetView['zoomScaleNormal']) );
-								}
-
-							    if (isset($xmlSheet->sheetViews->sheetView['view'])) {
-								    $docSheet->getSheetView()->setView((string) $xmlSheet->sheetViews->sheetView['view']);
-								}
-
-								if (isset($xmlSheet->sheetViews->sheetView['showGridLines'])) {
-									$docSheet->setShowGridLines(self::boolean((string)$xmlSheet->sheetViews->sheetView['showGridLines']));
-								}
-
-								if (isset($xmlSheet->sheetViews->sheetView['showRowColHeaders'])) {
-									$docSheet->setShowRowColHeaders(self::boolean((string)$xmlSheet->sheetViews->sheetView['showRowColHeaders']));
-								}
-
-								if (isset($xmlSheet->sheetViews->sheetView['rightToLeft'])) {
-									$docSheet->setRightToLeft(self::boolean((string)$xmlSheet->sheetViews->sheetView['rightToLeft']));
-								}
-
-								if (isset($xmlSheet->sheetViews->sheetView->pane)) {
-								    if (isset($xmlSheet->sheetViews->sheetView->pane['topLeftCell'])) {
-								        $docSheet->freezePane( (string)$xmlSheet->sheetViews->sheetView->pane['topLeftCell'] );
-								    } else {
-								        $xSplit = 0;
-								        $ySplit = 0;
-
-								        if (isset($xmlSheet->sheetViews->sheetView->pane['xSplit'])) {
-								            $xSplit = 1 + intval($xmlSheet->sheetViews->sheetView->pane['xSplit']);
-								        }
-
-								    	if (isset($xmlSheet->sheetViews->sheetView->pane['ySplit'])) {
-								            $ySplit = 1 + intval($xmlSheet->sheetViews->sheetView->pane['ySplit']);
-								        }
-
-								        $docSheet->freezePaneByColumnAndRow($xSplit, $ySplit);
-								    }
-								}
-
-								if (isset($xmlSheet->sheetViews->sheetView->selection)) {
-									if (isset($xmlSheet->sheetViews->sheetView->selection['sqref'])) {
-										$sqref = (string)$xmlSheet->sheetViews->sheetView->selection['sqref'];
-										$sqref = explode(' ', $sqref);
-										$sqref = $sqref[0];
-										$docSheet->setSelectedCells($sqref);
-									}
-								}
-
-							}
-
-							if (isset($xmlSheet->sheetPr) && isset($xmlSheet->sheetPr->tabColor)) {
-								if (isset($xmlSheet->sheetPr->tabColor['rgb'])) {
-									$docSheet->getTabColor()->setARGB( (string)$xmlSheet->sheetPr->tabColor['rgb'] );
-								}
-							}
-							if (isset($xmlSheet->sheetPr) && isset($xmlSheet->sheetPr['codeName'])) {
-								$docSheet->setCodeName((string) $xmlSheet->sheetPr['codeName']);
-							}
-							if (isset($xmlSheet->sheetPr) && isset($xmlSheet->sheetPr->outlinePr)) {
-								if (isset($xmlSheet->sheetPr->outlinePr['summaryRight']) &&
-									!self::boolean((string) $xmlSheet->sheetPr->outlinePr['summaryRight'])) {
-									$docSheet->setShowSummaryRight(FALSE);
-								} else {
-									$docSheet->setShowSummaryRight(TRUE);
-								}
-
-								if (isset($xmlSheet->sheetPr->outlinePr['summaryBelow']) &&
-									!self::boolean((string) $xmlSheet->sheetPr->outlinePr['summaryBelow'])) {
-									$docSheet->setShowSummaryBelow(FALSE);
-								} else {
-									$docSheet->setShowSummaryBelow(TRUE);
-								}
-							}
-
-							if (isset($xmlSheet->sheetPr) && isset($xmlSheet->sheetPr->pageSetUpPr)) {
-								if (isset($xmlSheet->sheetPr->pageSetUpPr['fitToPage']) &&
-									!self::boolean((string) $xmlSheet->sheetPr->pageSetUpPr['fitToPage'])) {
-									$docSheet->getPageSetup()->setFitToPage(FALSE);
-								} else {
-									$docSheet->getPageSetup()->setFitToPage(TRUE);
-								}
-							}
-
-							if (isset($xmlSheet->sheetFormatPr)) {
-								if (isset($xmlSheet->sheetFormatPr['customHeight']) &&
-									self::boolean((string) $xmlSheet->sheetFormatPr['customHeight']) &&
-									isset($xmlSheet->sheetFormatPr['defaultRowHeight'])) {
-									$docSheet->getDefaultRowDimension()->setRowHeight( (float)$xmlSheet->sheetFormatPr['defaultRowHeight'] );
-								}
-								if (isset($xmlSheet->sheetFormatPr['defaultColWidth'])) {
-									$docSheet->getDefaultColumnDimension()->setWidth( (float)$xmlSheet->sheetFormatPr['defaultColWidth'] );
-								}
-								if (isset($xmlSheet->sheetFormatPr['zeroHeight']) &&
-									((string)$xmlSheet->sheetFormatPr['zeroHeight'] == '1')) {
-									$docSheet->getDefaultRowDimension()->setZeroHeight(true);
-								}
-							}
-
-							if (isset($xmlSheet->cols) && !$this->_readDataOnly) {
-								foreach ($xmlSheet->cols->col as $col) {
-                                    for ($i = intval($col["min"]) - 1; $i < intval($col["max"]); ++$i) {
-										if ($col["style"] && !$this->_readDataOnly) {
-											$docSheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($i))->setXfIndex(intval($col["style"]));
-										}
-										if (self::boolean($col["bestFit"])) {
-											//$docSheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($i))->setAutoSize(TRUE);
-										}
-										if (self::boolean($col["hidden"])) {
-                                        // echo PHPExcel_Cell::stringFromColumnIndex($i),': HIDDEN COLUMN',PHP_EOL;
-											$docSheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($i))->setVisible(FALSE);
-										}
-										if (self::boolean($col["collapsed"])) {
-											$docSheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($i))->setCollapsed(TRUE);
-										}
-										if ($col["outlineLevel"] > 0) {
-											$docSheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($i))->setOutlineLevel(intval($col["outlineLevel"]));
-										}
-										$docSheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($i))->setWidth(floatval($col["width"]));
-
-										if (intval($col["max"]) == 16384) {
-											break;
-										}
-									}
-								}
-							}
-
-							if (isset($xmlSheet->printOptions) && !$this->_readDataOnly) {
-								if (self::boolean((string) $xmlSheet->printOptions['gridLinesSet'])) {
-									$docSheet->setShowGridlines(TRUE);
-								}
-
-								if (self::boolean((string) $xmlSheet->printOptions['gridLines'])) {
-									$docSheet->setPrintGridlines(TRUE);
-								}
-
-								if (self::boolean((string) $xmlSheet->printOptions['horizontalCentered'])) {
-									$docSheet->getPageSetup()->setHorizontalCentered(TRUE);
-								}
-								if (self::boolean((string) $xmlSheet->printOptions['verticalCentered'])) {
-									$docSheet->getPageSetup()->setVerticalCentered(TRUE);
-								}
-							}
-
-							if ($xmlSheet && $xmlSheet->sheetData && $xmlSheet->sheetData->row) {
-								foreach ($xmlSheet->sheetData->row as $row) {
-									if ($row["ht"] && !$this->_readDataOnly) {
-										$docSheet->getRowDimension(intval($row["r"]))->setRowHeight(floatval($row["ht"]));
-									}
-									if (self::boolean($row["hidden"]) && !$this->_readDataOnly) {
-										$docSheet->getRowDimension(intval($row["r"]))->setVisible(FALSE);
-									}
-									if (self::boolean($row["collapsed"])) {
-										$docSheet->getRowDimension(intval($row["r"]))->setCollapsed(TRUE);
-									}
-									if ($row["outlineLevel"] > 0) {
-										$docSheet->getRowDimension(intval($row["r"]))->setOutlineLevel(intval($row["outlineLevel"]));
-									}
-									if ($row["s"] && !$this->_readDataOnly) {
-										$docSheet->getRowDimension(intval($row["r"]))->setXfIndex(intval($row["s"]));
-									}
-
-									foreach ($row->c as $c) {
-										$r 					= (string) $c["r"];
-										$cellDataType 		= (string) $c["t"];
-										$value				= null;
-										$calculatedValue 	= null;
-
-										// Read cell?
-										if ($this->getReadFilter() !== NULL) {
-											$coordinates = PHPExcel_Cell::coordinateFromString($r);
-
-											if (!$this->getReadFilter()->readCell($coordinates[0], $coordinates[1], $docSheet->getTitle())) {
-												continue;
-											}
-										}
-
-	//									echo 'Reading cell ', $coordinates[0], $coordinates[1], PHP_EOL;
-	//									print_r($c);
-	//									echo PHP_EOL;
-	//									echo 'Cell Data Type is ', $cellDataType, ': ';
-	//
-										// Read cell!
-										switch ($cellDataType) {
-											case "s":
-	//											echo 'String', PHP_EOL;
-												if ((string)$c->v != '') {
-													$value = $sharedStrings[intval($c->v)];
-
-													if ($value instanceof PHPExcel_RichText) {
-														$value = clone $value;
-													}
-												} else {
-													$value = '';
-												}
-
-												break;
-											case "b":
-	//											echo 'Boolean', PHP_EOL;
-												if (!isset($c->f)) {
-													$value = self::_castToBool($c);
-												} else {
-													// Formula
-													$this->_castToFormula($c,$r,$cellDataType,$value,$calculatedValue,$sharedFormulas,'_castToBool');
-													if (isset($c->f['t'])) {
-														$att = array();
-														$att = $c->f;
-														$docSheet->getCell($r)->setFormulaAttributes($att);
-													}
-	//												echo '$calculatedValue = ', $calculatedValue, PHP_EOL;
-												}
-												break;
-											case "inlineStr":
-	//											echo 'Inline String', PHP_EOL;
-												$value = $this->_parseRichText($c->is);
-
-												break;
-											case "e":
-	//											echo 'Error', PHP_EOL;
-												if (!isset($c->f)) {
-													$value = self::_castToError($c);
-												} else {
-													// Formula
-													$this->_castToFormula($c,$r,$cellDataType,$value,$calculatedValue,$sharedFormulas,'_castToError');
-	//												echo '$calculatedValue = ', $calculatedValue, PHP_EOL;
-												}
-
-												break;
-
-											default:
-	//											echo 'Default', PHP_EOL;
-												if (!isset($c->f)) {
-	//												echo 'Not a Formula', PHP_EOL;
-													$value = self::_castToString($c);
-												} else {
-	//												echo 'Treat as Formula', PHP_EOL;
-													// Formula
-													$this->_castToFormula($c,$r,$cellDataType,$value,$calculatedValue,$sharedFormulas,'_castToString');
-	//												echo '$calculatedValue = ', $calculatedValue, PHP_EOL;
-												}
-
-												break;
-										}
-	//									echo 'Value is ', $value, PHP_EOL;
-
-										// Check for numeric values
-										if (is_numeric($value) && $cellDataType != 's') {
-											if ($value == (int)$value) $value = (int)$value;
-											elseif ($value == (float)$value) $value = (float)$value;
-											elseif ($value == (double)$value) $value = (double)$value;
-										}
-
-										// Rich text?
-										if ($value instanceof PHPExcel_RichText && $this->_readDataOnly) {
-											$value = $value->getPlainText();
-										}
-
-										$cell = $docSheet->getCell($r);
-										// Assign value
-										if ($cellDataType != '') {
-											$cell->setValueExplicit($value, $cellDataType);
-										} else {
-											$cell->setValue($value);
-										}
-										if ($calculatedValue !== NULL) {
-											$cell->setCalculatedValue($calculatedValue);
-										}
-
-										// Style information?
-										if ($c["s"] && !$this->_readDataOnly) {
-											// no style index means 0, it seems
-											$cell->setXfIndex(isset($styles[intval($c["s"])]) ?
-												intval($c["s"]) : 0);
-										}
-									}
-								}
-							}
-
-							$conditionals = array();
-							if (!$this->_readDataOnly && $xmlSheet && $xmlSheet->conditionalFormatting) {
-								foreach ($xmlSheet->conditionalFormatting as $conditional) {
-									foreach ($conditional->cfRule as $cfRule) {
-										if (
-											(
-												(string)$cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_NONE ||
-												(string)$cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_CELLIS ||
-												(string)$cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT ||
-												(string)$cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_EXPRESSION
-											) && isset($dxfs[intval($cfRule["dxfId"])])
-										) {
-											$conditionals[(string) $conditional["sqref"]][intval($cfRule["priority"])] = $cfRule;
-										}
-									}
-								}
-
-								foreach ($conditionals as $ref => $cfRules) {
-									ksort($cfRules);
-									$conditionalStyles = array();
-									foreach ($cfRules as $cfRule) {
-										$objConditional = new PHPExcel_Style_Conditional();
-										$objConditional->setConditionType((string)$cfRule["type"]);
-										$objConditional->setOperatorType((string)$cfRule["operator"]);
-
-										if ((string)$cfRule["text"] != '') {
-											$objConditional->setText((string)$cfRule["text"]);
-										}
-
-										if (count($cfRule->formula) > 1) {
-											foreach ($cfRule->formula as $formula) {
-												$objConditional->addCondition((string)$formula);
-											}
-										} else {
-											$objConditional->addCondition((string)$cfRule->formula);
-										}
-										$objConditional->setStyle(clone $dxfs[intval($cfRule["dxfId"])]);
-										$conditionalStyles[] = $objConditional;
-									}
-
-									// Extract all cell references in $ref
-									$aReferences = PHPExcel_Cell::extractAllCellReferencesInRange($ref);
-									foreach ($aReferences as $reference) {
-										$docSheet->getStyle($reference)->setConditionalStyles($conditionalStyles);
-									}
-								}
-							}
-
-							$aKeys = array("sheet", "objects", "scenarios", "formatCells", "formatColumns", "formatRows", "insertColumns", "insertRows", "insertHyperlinks", "deleteColumns", "deleteRows", "selectLockedCells", "sort", "autoFilter", "pivotTables", "selectUnlockedCells");
-							if (!$this->_readDataOnly && $xmlSheet && $xmlSheet->sheetProtection) {
-								foreach ($aKeys as $key) {
-									$method = "set" . ucfirst($key);
-									$docSheet->getProtection()->$method(self::boolean((string) $xmlSheet->sheetProtection[$key]));
-								}
-							}
-
-							if (!$this->_readDataOnly && $xmlSheet && $xmlSheet->sheetProtection) {
-								$docSheet->getProtection()->setPassword((string) $xmlSheet->sheetProtection["password"], TRUE);
-								if ($xmlSheet->protectedRanges->protectedRange) {
-									foreach ($xmlSheet->protectedRanges->protectedRange as $protectedRange) {
-										$docSheet->protectCells((string) $protectedRange["sqref"], (string) $protectedRange["password"], true);
-									}
-								}
-							}
-
-							if ($xmlSheet && $xmlSheet->autoFilter && !$this->_readDataOnly) {
-                                $autoFilterRange = (string) $xmlSheet->autoFilter["ref"];
-                                if (strpos($autoFilterRange, ':') !== false) {
-                                    $autoFilter = $docSheet->getAutoFilter();
-                                    $autoFilter->setRange($autoFilterRange);
-
-                                    foreach ($xmlSheet->autoFilter->filterColumn as $filterColumn) {
-                                        $column = $autoFilter->getColumnByOffset((integer) $filterColumn["colId"]);
-                                        //	Check for standard filters
-                                        if ($filterColumn->filters) {
-                                            $column->setFilterType(PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_FILTER);
-                                            $filters = $filterColumn->filters;
-                                            if ((isset($filters["blank"])) && ($filters["blank"] == 1)) {
-                                                $column->createRule()->setRule(
-                                                    NULL,	//	Operator is undefined, but always treated as EQUAL
-                                                    ''
-                                                )
-                                                ->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_FILTER);
-                                            }
-                                            //	Standard filters are always an OR join, so no join rule needs to be set
-                                            //	Entries can be either filter elements
-                                            foreach ($filters->filter as $filterRule) {
-                                                $column->createRule()->setRule(
-                                                    NULL,	//	Operator is undefined, but always treated as EQUAL
-                                                    (string) $filterRule["val"]
-                                                )
-                                                ->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_FILTER);
-                                            }
-                                            //	Or Date Group elements
-                                            foreach ($filters->dateGroupItem as $dateGroupItem) {
-                                                $column->createRule()->setRule(
-                                                    NULL,	//	Operator is undefined, but always treated as EQUAL
-                                                    array(
-                                                        'year' => (string) $dateGroupItem["year"],
-                                                        'month' => (string) $dateGroupItem["month"],
-                                                        'day' => (string) $dateGroupItem["day"],
-                                                        'hour' => (string) $dateGroupItem["hour"],
-                                                        'minute' => (string) $dateGroupItem["minute"],
-                                                        'second' => (string) $dateGroupItem["second"],
-                                                    ),
-                                                    (string) $dateGroupItem["dateTimeGrouping"]
-                                                )
-                                                ->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP);
-                                            }
-                                        }
-                                        //	Check for custom filters
-                                        if ($filterColumn->customFilters) {
-                                            $column->setFilterType(PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_CUSTOMFILTER);
-                                            $customFilters = $filterColumn->customFilters;
-                                            //	Custom filters can an AND or an OR join;
-                                            //		and there should only ever be one or two entries
-                                            if ((isset($customFilters["and"])) && ($customFilters["and"] == 1)) {
-                                                $column->setJoin(PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND);
-                                            }
-                                            foreach ($customFilters->customFilter as $filterRule) {
-                                                $column->createRule()->setRule(
-                                                    (string) $filterRule["operator"],
-                                                    (string) $filterRule["val"]
-                                                )
-                                                ->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_CUSTOMFILTER);
-                                            }
-                                        }
-                                        //	Check for dynamic filters
-                                        if ($filterColumn->dynamicFilter) {
-                                            $column->setFilterType(PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_DYNAMICFILTER);
-                                            //	We should only ever have one dynamic filter
-                                            foreach ($filterColumn->dynamicFilter as $filterRule) {
-                                                $column->createRule()->setRule(
-                                                    NULL,	//	Operator is undefined, but always treated as EQUAL
-                                                    (string) $filterRule["val"],
-                                                    (string) $filterRule["type"]
-                                                )
-                                                ->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMICFILTER);
-                                                if (isset($filterRule["val"])) {
-                                                    $column->setAttribute('val',(string) $filterRule["val"]);
-                                                }
-                                                if (isset($filterRule["maxVal"])) {
-                                                    $column->setAttribute('maxVal',(string) $filterRule["maxVal"]);
-                                                }
-                                            }
-                                        }
-                                        //	Check for dynamic filters
-                                        if ($filterColumn->top10) {
-                                            $column->setFilterType(PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_TOPTENFILTER);
-                                            //	We should only ever have one top10 filter
-                                            foreach ($filterColumn->top10 as $filterRule) {
-                                                $column->createRule()->setRule(
-                                                    (((isset($filterRule["percent"])) && ($filterRule["percent"] == 1))
-                                                        ? PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT
-                                                        : PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_BY_VALUE
-                                                    ),
-                                                    (string) $filterRule["val"],
-                                                    (((isset($filterRule["top"])) && ($filterRule["top"] == 1))
-                                                        ? PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP
-                                                        : PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_BOTTOM
-                                                    )
-                                                )
-                                                ->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_TOPTENFILTER);
-                                            }
-                                        }
-                                    }
-								}
-							}
-
-							if ($xmlSheet && $xmlSheet->mergeCells && $xmlSheet->mergeCells->mergeCell && !$this->_readDataOnly) {
-								foreach ($xmlSheet->mergeCells->mergeCell as $mergeCell) {
-									$mergeRef = (string) $mergeCell["ref"];
-									if (strpos($mergeRef,':') !== FALSE) {
-										$docSheet->mergeCells((string) $mergeCell["ref"]);
-									}
-								}
-							}
-
-							if ($xmlSheet && $xmlSheet->pageMargins && !$this->_readDataOnly) {
-								$docPageMargins = $docSheet->getPageMargins();
-								$docPageMargins->setLeft(floatval($xmlSheet->pageMargins["left"]));
-								$docPageMargins->setRight(floatval($xmlSheet->pageMargins["right"]));
-								$docPageMargins->setTop(floatval($xmlSheet->pageMargins["top"]));
-								$docPageMargins->setBottom(floatval($xmlSheet->pageMargins["bottom"]));
-								$docPageMargins->setHeader(floatval($xmlSheet->pageMargins["header"]));
-								$docPageMargins->setFooter(floatval($xmlSheet->pageMargins["footer"]));
-							}
-
-							if ($xmlSheet && $xmlSheet->pageSetup && !$this->_readDataOnly) {
-								$docPageSetup = $docSheet->getPageSetup();
-
-								if (isset($xmlSheet->pageSetup["orientation"])) {
-									$docPageSetup->setOrientation((string) $xmlSheet->pageSetup["orientation"]);
-								}
-								if (isset($xmlSheet->pageSetup["paperSize"])) {
-									$docPageSetup->setPaperSize(intval($xmlSheet->pageSetup["paperSize"]));
-								}
-								if (isset($xmlSheet->pageSetup["scale"])) {
-									$docPageSetup->setScale(intval($xmlSheet->pageSetup["scale"]), FALSE);
-								}
-								if (isset($xmlSheet->pageSetup["fitToHeight"]) && intval($xmlSheet->pageSetup["fitToHeight"]) >= 0) {
-									$docPageSetup->setFitToHeight(intval($xmlSheet->pageSetup["fitToHeight"]), FALSE);
-								}
-								if (isset($xmlSheet->pageSetup["fitToWidth"]) && intval($xmlSheet->pageSetup["fitToWidth"]) >= 0) {
-									$docPageSetup->setFitToWidth(intval($xmlSheet->pageSetup["fitToWidth"]), FALSE);
-								}
-								if (isset($xmlSheet->pageSetup["firstPageNumber"]) && isset($xmlSheet->pageSetup["useFirstPageNumber"]) &&
-									self::boolean((string) $xmlSheet->pageSetup["useFirstPageNumber"])) {
-									$docPageSetup->setFirstPageNumber(intval($xmlSheet->pageSetup["firstPageNumber"]));
-								}
-							}
-
-							if ($xmlSheet && $xmlSheet->headerFooter && !$this->_readDataOnly) {
-								$docHeaderFooter = $docSheet->getHeaderFooter();
-
-								if (isset($xmlSheet->headerFooter["differentOddEven"]) &&
-									self::boolean((string)$xmlSheet->headerFooter["differentOddEven"])) {
-									$docHeaderFooter->setDifferentOddEven(TRUE);
-								} else {
-									$docHeaderFooter->setDifferentOddEven(FALSE);
-								}
-								if (isset($xmlSheet->headerFooter["differentFirst"]) &&
-									self::boolean((string)$xmlSheet->headerFooter["differentFirst"])) {
-									$docHeaderFooter->setDifferentFirst(TRUE);
-								} else {
-									$docHeaderFooter->setDifferentFirst(FALSE);
-								}
-								if (isset($xmlSheet->headerFooter["scaleWithDoc"]) &&
-									!self::boolean((string)$xmlSheet->headerFooter["scaleWithDoc"])) {
-									$docHeaderFooter->setScaleWithDocument(FALSE);
-								} else {
-									$docHeaderFooter->setScaleWithDocument(TRUE);
-								}
-								if (isset($xmlSheet->headerFooter["alignWithMargins"]) &&
-									!self::boolean((string)$xmlSheet->headerFooter["alignWithMargins"])) {
-									$docHeaderFooter->setAlignWithMargins(FALSE);
-								} else {
-									$docHeaderFooter->setAlignWithMargins(TRUE);
-								}
-
-								$docHeaderFooter->setOddHeader((string) $xmlSheet->headerFooter->oddHeader);
-								$docHeaderFooter->setOddFooter((string) $xmlSheet->headerFooter->oddFooter);
-								$docHeaderFooter->setEvenHeader((string) $xmlSheet->headerFooter->evenHeader);
-								$docHeaderFooter->setEvenFooter((string) $xmlSheet->headerFooter->evenFooter);
-								$docHeaderFooter->setFirstHeader((string) $xmlSheet->headerFooter->firstHeader);
-								$docHeaderFooter->setFirstFooter((string) $xmlSheet->headerFooter->firstFooter);
-							}
-
-							if ($xmlSheet && $xmlSheet->rowBreaks && $xmlSheet->rowBreaks->brk && !$this->_readDataOnly) {
-								foreach ($xmlSheet->rowBreaks->brk as $brk) {
-									if ($brk["man"]) {
-										$docSheet->setBreak("A$brk[id]", PHPExcel_Worksheet::BREAK_ROW);
-									}
-								}
-							}
-							if ($xmlSheet && $xmlSheet->colBreaks && $xmlSheet->colBreaks->brk && !$this->_readDataOnly) {
-								foreach ($xmlSheet->colBreaks->brk as $brk) {
-									if ($brk["man"]) {
-										$docSheet->setBreak(PHPExcel_Cell::stringFromColumnIndex((string) $brk["id"]) . "1", PHPExcel_Worksheet::BREAK_COLUMN);
-									}
-								}
-							}
-
-							if ($xmlSheet && $xmlSheet->dataValidations && !$this->_readDataOnly) {
-								foreach ($xmlSheet->dataValidations->dataValidation as $dataValidation) {
-								    // Uppercase coordinate
-							    	$range = strtoupper($dataValidation["sqref"]);
-									$rangeSet = explode(' ',$range);
-									foreach($rangeSet as $range) {
-										$stRange = $docSheet->shrinkRangeToFit($range);
-
-										// Extract all cell references in $range
-										$aReferences = PHPExcel_Cell::extractAllCellReferencesInRange($stRange);
-										foreach ($aReferences as $reference) {
-											// Create validation
-											$docValidation = $docSheet->getCell($reference)->getDataValidation();
-											$docValidation->setType((string) $dataValidation["type"]);
-											$docValidation->setErrorStyle((string) $dataValidation["errorStyle"]);
-											$docValidation->setOperator((string) $dataValidation["operator"]);
-											$docValidation->setAllowBlank($dataValidation["allowBlank"] != 0);
-											$docValidation->setShowDropDown($dataValidation["showDropDown"] == 0);
-											$docValidation->setShowInputMessage($dataValidation["showInputMessage"] != 0);
-											$docValidation->setShowErrorMessage($dataValidation["showErrorMessage"] != 0);
-											$docValidation->setErrorTitle((string) $dataValidation["errorTitle"]);
-											$docValidation->setError((string) $dataValidation["error"]);
-											$docValidation->setPromptTitle((string) $dataValidation["promptTitle"]);
-											$docValidation->setPrompt((string) $dataValidation["prompt"]);
-											$docValidation->setFormula1((string) $dataValidation->formula1);
-											$docValidation->setFormula2((string) $dataValidation->formula2);
-										}
-									}
-								}
-							}
-
-							// Add hyperlinks
-							$hyperlinks = array();
-							if (!$this->_readDataOnly) {
-								// Locate hyperlink relations
-								if ($zip->locateName(dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")) {
-									$relsWorksheet = simplexml_load_string($this->securityScan($this->_getFromZipArchive($zip,  dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions()); //~ http://schemas.openxmlformats.org/package/2006/relationships");
-									foreach ($relsWorksheet->Relationship as $ele) {
-										if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink") {
-											$hyperlinks[(string)$ele["Id"]] = (string)$ele["Target"];
-										}
-									}
-								}
-
-								// Loop through hyperlinks
-								if ($xmlSheet && $xmlSheet->hyperlinks) {
-									foreach ($xmlSheet->hyperlinks->hyperlink as $hyperlink) {
-										// Link url
-										$linkRel = $hyperlink->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships');
-
-										foreach (PHPExcel_Cell::extractAllCellReferencesInRange($hyperlink['ref']) as $cellReference) {
-											$cell = $docSheet->getCell( $cellReference );
-											if (isset($linkRel['id'])) {
-												$hyperlinkUrl = $hyperlinks[ (string)$linkRel['id'] ];
-												if (isset($hyperlink['location'])) {
-													$hyperlinkUrl .= '#' . (string) $hyperlink['location'];
-												}
-												$cell->getHyperlink()->setUrl($hyperlinkUrl);
-											} elseif (isset($hyperlink['location'])) {
-												$cell->getHyperlink()->setUrl( 'sheet://' . (string)$hyperlink['location'] );
-											}
-
-											// Tooltip
-											if (isset($hyperlink['tooltip'])) {
-												$cell->getHyperlink()->setTooltip( (string)$hyperlink['tooltip'] );
-											}
-										}
-									}
-								}
-							}
-
-							// Add comments
-							$comments = array();
-							$vmlComments = array();
-							if (!$this->_readDataOnly) {
-								// Locate comment relations
-								if ($zip->locateName(dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")) {
-									$relsWorksheet = simplexml_load_string($this->securityScan($this->_getFromZipArchive($zip,  dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions()); //~ http://schemas.openxmlformats.org/package/2006/relationships");
-									foreach ($relsWorksheet->Relationship as $ele) {
-									    if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments") {
-											$comments[(string)$ele["Id"]] = (string)$ele["Target"];
-										}
-									    if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing") {
-											$vmlComments[(string)$ele["Id"]] = (string)$ele["Target"];
-										}
-									}
-								}
-
-								// Loop through comments
-								foreach ($comments as $relName => $relPath) {
-									// Load comments file
-									$relPath = PHPExcel_Shared_File::realpath(dirname("$dir/$fileWorksheet") . "/" . $relPath);
-									$commentsFile = simplexml_load_string($this->securityScan($this->_getFromZipArchive($zip, $relPath)), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
-
-									// Utility variables
-									$authors = array();
-
-									// Loop through authors
-									foreach ($commentsFile->authors->author as $author) {
-										$authors[] = (string)$author;
-									}
-
-									// Loop through contents
-									foreach ($commentsFile->commentList->comment as $comment) {
-										if(!empty($comment['authorId']))
-											$docSheet->getComment( (string)$comment['ref'] )->setAuthor( $authors[(string)$comment['authorId']] );
-										$docSheet->getComment( (string)$comment['ref'] )->setText( $this->_parseRichText($comment->text) );
-									}
-								}
-
-								// Loop through VML comments
-							    foreach ($vmlComments as $relName => $relPath) {
-									// Load VML comments file
-									$relPath = PHPExcel_Shared_File::realpath(dirname("$dir/$fileWorksheet") . "/" . $relPath);
-									$vmlCommentsFile = simplexml_load_string($this->securityScan($this->_getFromZipArchive($zip, $relPath)), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
-									$vmlCommentsFile->registerXPathNamespace('v', 'urn:schemas-microsoft-com:vml');
-
-									$shapes = $vmlCommentsFile->xpath('//v:shape');
-									foreach ($shapes as $shape) {
-										$shape->registerXPathNamespace('v', 'urn:schemas-microsoft-com:vml');
-
-										if (isset($shape['style'])) {
-	    									$style        = (string)$shape['style'];
-	    									$fillColor    = strtoupper( substr( (string)$shape['fillcolor'], 1 ) );
-	    									$column       = null;
-	    									$row          = null;
-
-	    									$clientData   = $shape->xpath('.//x:ClientData');
-	    									if (is_array($clientData) && !empty($clientData)) {
-	        									$clientData   = $clientData[0];
-
-	        									if ( isset($clientData['ObjectType']) && (string)$clientData['ObjectType'] == 'Note' ) {
-	        									    $temp = $clientData->xpath('.//x:Row');
-	        									    if (is_array($temp)) $row = $temp[0];
-
-	        									    $temp = $clientData->xpath('.//x:Column');
-	        									    if (is_array($temp)) $column = $temp[0];
-	        									}
-	    									}
-
-	    									if (($column !== NULL) && ($row !== NULL)) {
-	    									    // Set comment properties
-	    									    $comment = $docSheet->getCommentByColumnAndRow((string) $column, $row + 1);
-	    									    $comment->getFillColor()->setRGB( $fillColor );
-
-	    									    // Parse style
-	    									    $styleArray = explode(';', str_replace(' ', '', $style));
-	    									    foreach ($styleArray as $stylePair) {
-	    									        $stylePair = explode(':', $stylePair);
-
-	    									        if ($stylePair[0] == 'margin-left')     $comment->setMarginLeft($stylePair[1]);
-	    									        if ($stylePair[0] == 'margin-top')      $comment->setMarginTop($stylePair[1]);
-	    									        if ($stylePair[0] == 'width')           $comment->setWidth($stylePair[1]);
-	    									        if ($stylePair[0] == 'height')          $comment->setHeight($stylePair[1]);
-	    									        if ($stylePair[0] == 'visibility')      $comment->setVisible( $stylePair[1] == 'visible' );
-
-	    									    }
-	    									}
-										}
-									}
-								}
-
-								// Header/footer images
-								if ($xmlSheet && $xmlSheet->legacyDrawingHF && !$this->_readDataOnly) {
-									if ($zip->locateName(dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")) {
-										$relsWorksheet = simplexml_load_string($this->securityScan($this->_getFromZipArchive($zip,  dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions()); //~ http://schemas.openxmlformats.org/package/2006/relationships");
-										$vmlRelationship = '';
-
-										foreach ($relsWorksheet->Relationship as $ele) {
-											if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing") {
-												$vmlRelationship = self::dir_add("$dir/$fileWorksheet", $ele["Target"]);
-											}
-										}
-
-										if ($vmlRelationship != '') {
-											// Fetch linked images
-											$relsVML = simplexml_load_string($this->securityScan($this->_getFromZipArchive($zip,  dirname($vmlRelationship) . '/_rels/' . basename($vmlRelationship) . '.rels')), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions()); //~ http://schemas.openxmlformats.org/package/2006/relationships");
-											$drawings = array();
-											foreach ($relsVML->Relationship as $ele) {
-												if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image") {
-													$drawings[(string) $ele["Id"]] = self::dir_add($vmlRelationship, $ele["Target"]);
-												}
-											}
-
-											// Fetch VML document
-											$vmlDrawing = simplexml_load_string($this->securityScan($this->_getFromZipArchive($zip, $vmlRelationship)), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
-											$vmlDrawing->registerXPathNamespace('v', 'urn:schemas-microsoft-com:vml');
-
-											$hfImages = array();
-
-											$shapes = $vmlDrawing->xpath('//v:shape');
-											foreach ($shapes as $idx => $shape) {
-												$shape->registerXPathNamespace('v', 'urn:schemas-microsoft-com:vml');
-												$imageData = $shape->xpath('//v:imagedata');
-												$imageData = $imageData[$idx];
-
-												$imageData = $imageData->attributes('urn:schemas-microsoft-com:office:office');
-												$style = self::toCSSArray( (string)$shape['style'] );
-
-												$hfImages[ (string)$shape['id'] ] = new PHPExcel_Worksheet_HeaderFooterDrawing();
-												if (isset($imageData['title'])) {
-													$hfImages[ (string)$shape['id'] ]->setName( (string)$imageData['title'] );
-												}
-
-												$hfImages[ (string)$shape['id'] ]->setPath("zip://".PHPExcel_Shared_File::realpath($pFilename)."#" . $drawings[(string)$imageData['relid']], false);
-												$hfImages[ (string)$shape['id'] ]->setResizeProportional(false);
-												$hfImages[ (string)$shape['id'] ]->setWidth($style['width']);
-												$hfImages[ (string)$shape['id'] ]->setHeight($style['height']);
-												if (isset($style['margin-left'])) {
-													$hfImages[ (string)$shape['id'] ]->setOffsetX($style['margin-left']);
-												}
-												$hfImages[ (string)$shape['id'] ]->setOffsetY($style['margin-top']);
-												$hfImages[ (string)$shape['id'] ]->setResizeProportional(true);
-											}
-
-											$docSheet->getHeaderFooter()->setImages($hfImages);
-										}
-									}
-								}
-
-							}
-
-                            // TODO: Autoshapes from twoCellAnchors!
-							if ($zip->locateName(dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")) {
-								$relsWorksheet = simplexml_load_string($this->securityScan($this->_getFromZipArchive($zip,  dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions()); //~ http://schemas.openxmlformats.org/package/2006/relationships");
-								$drawings = array();
-								foreach ($relsWorksheet->Relationship as $ele) {
-									if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing") {
-										$drawings[(string) $ele["Id"]] = self::dir_add("$dir/$fileWorksheet", $ele["Target"]);
-									}
-								}
-								if ($xmlSheet->drawing && !$this->_readDataOnly) {
-									foreach ($xmlSheet->drawing as $drawing) {
-										$fileDrawing = $drawings[(string) self::array_item($drawing->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "id")];
-										$relsDrawing = simplexml_load_string($this->securityScan($this->_getFromZipArchive($zip,  dirname($fileDrawing) . "/_rels/" . basename($fileDrawing) . ".rels")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions()); //~ http://schemas.openxmlformats.org/package/2006/relationships");
-										$images = array();
-
-										if ($relsDrawing && $relsDrawing->Relationship) {
-											foreach ($relsDrawing->Relationship as $ele) {
-												if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image") {
-													$images[(string) $ele["Id"]] = self::dir_add($fileDrawing, $ele["Target"]);
-												} elseif ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart") {
-													if ($this->_includeCharts) {
-														$charts[self::dir_add($fileDrawing, $ele["Target"])] = array('id'		=> (string) $ele["Id"],
-																													 'sheet'	=> $docSheet->getTitle()
-																													);
-													}
-												}
-											}
-										}
-										$xmlDrawing = simplexml_load_string($this->securityScan($this->_getFromZipArchive($zip, $fileDrawing)), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions())->children("http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing");
-
-										if ($xmlDrawing->oneCellAnchor) {
-											foreach ($xmlDrawing->oneCellAnchor as $oneCellAnchor) {
-												if ($oneCellAnchor->pic->blipFill) {
-													$blip = $oneCellAnchor->pic->blipFill->children("http://schemas.openxmlformats.org/drawingml/2006/main")->blip;
-													$xfrm = $oneCellAnchor->pic->spPr->children("http://schemas.openxmlformats.org/drawingml/2006/main")->xfrm;
-													$outerShdw = $oneCellAnchor->pic->spPr->children("http://schemas.openxmlformats.org/drawingml/2006/main")->effectLst->outerShdw;
-													$objDrawing = new PHPExcel_Worksheet_Drawing;
-													$objDrawing->setName((string) self::array_item($oneCellAnchor->pic->nvPicPr->cNvPr->attributes(), "name"));
-													$objDrawing->setDescription((string) self::array_item($oneCellAnchor->pic->nvPicPr->cNvPr->attributes(), "descr"));
-													$objDrawing->setPath("zip://".PHPExcel_Shared_File::realpath($pFilename)."#" . $images[(string) self::array_item($blip->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "embed")], false);
-													$objDrawing->setCoordinates(PHPExcel_Cell::stringFromColumnIndex((string) $oneCellAnchor->from->col) . ($oneCellAnchor->from->row + 1));
-													$objDrawing->setOffsetX(PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->colOff));
-													$objDrawing->setOffsetY(PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->rowOff));
-													$objDrawing->setResizeProportional(false);
-													$objDrawing->setWidth(PHPExcel_Shared_Drawing::EMUToPixels(self::array_item($oneCellAnchor->ext->attributes(), "cx")));
-													$objDrawing->setHeight(PHPExcel_Shared_Drawing::EMUToPixels(self::array_item($oneCellAnchor->ext->attributes(), "cy")));
-													if ($xfrm) {
-														$objDrawing->setRotation(PHPExcel_Shared_Drawing::angleToDegrees(self::array_item($xfrm->attributes(), "rot")));
-													}
-													if ($outerShdw) {
-														$shadow = $objDrawing->getShadow();
-														$shadow->setVisible(true);
-														$shadow->setBlurRadius(PHPExcel_Shared_Drawing::EMUTopixels(self::array_item($outerShdw->attributes(), "blurRad")));
-														$shadow->setDistance(PHPExcel_Shared_Drawing::EMUTopixels(self::array_item($outerShdw->attributes(), "dist")));
-														$shadow->setDirection(PHPExcel_Shared_Drawing::angleToDegrees(self::array_item($outerShdw->attributes(), "dir")));
-														$shadow->setAlignment((string) self::array_item($outerShdw->attributes(), "algn"));
-														$shadow->getColor()->setRGB(self::array_item($outerShdw->srgbClr->attributes(), "val"));
-														$shadow->setAlpha(self::array_item($outerShdw->srgbClr->alpha->attributes(), "val") / 1000);
-													}
-													$objDrawing->setWorksheet($docSheet);
-												} else {
-													//	? Can charts be positioned with a oneCellAnchor ?
-													$coordinates	= PHPExcel_Cell::stringFromColumnIndex((string) $oneCellAnchor->from->col) . ($oneCellAnchor->from->row + 1);
-													$offsetX		= PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->colOff);
-													$offsetY		= PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->rowOff);
-													$width			= PHPExcel_Shared_Drawing::EMUToPixels(self::array_item($oneCellAnchor->ext->attributes(), "cx"));
-													$height			= PHPExcel_Shared_Drawing::EMUToPixels(self::array_item($oneCellAnchor->ext->attributes(), "cy"));
-												}
-											}
-										}
-										if ($xmlDrawing->twoCellAnchor) {
-											foreach ($xmlDrawing->twoCellAnchor as $twoCellAnchor) {
-												if ($twoCellAnchor->pic->blipFill) {
-													$blip = $twoCellAnchor->pic->blipFill->children("http://schemas.openxmlformats.org/drawingml/2006/main")->blip;
-													$xfrm = $twoCellAnchor->pic->spPr->children("http://schemas.openxmlformats.org/drawingml/2006/main")->xfrm;
-													$outerShdw = $twoCellAnchor->pic->spPr->children("http://schemas.openxmlformats.org/drawingml/2006/main")->effectLst->outerShdw;
-													$objDrawing = new PHPExcel_Worksheet_Drawing;
-													$objDrawing->setName((string) self::array_item($twoCellAnchor->pic->nvPicPr->cNvPr->attributes(), "name"));
-													$objDrawing->setDescription((string) self::array_item($twoCellAnchor->pic->nvPicPr->cNvPr->attributes(), "descr"));
-													$objDrawing->setPath("zip://".PHPExcel_Shared_File::realpath($pFilename)."#" . $images[(string) self::array_item($blip->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "embed")], false);
-													$objDrawing->setCoordinates(PHPExcel_Cell::stringFromColumnIndex((string) $twoCellAnchor->from->col) . ($twoCellAnchor->from->row + 1));
-													$objDrawing->setOffsetX(PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->colOff));
-													$objDrawing->setOffsetY(PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->rowOff));
-													$objDrawing->setResizeProportional(false);
-
-													if ($xfrm) {
-														$objDrawing->setWidth(PHPExcel_Shared_Drawing::EMUToPixels(self::array_item($xfrm->ext->attributes(), "cx")));
-														$objDrawing->setHeight(PHPExcel_Shared_Drawing::EMUToPixels(self::array_item($xfrm->ext->attributes(), "cy")));
-														$objDrawing->setRotation(PHPExcel_Shared_Drawing::angleToDegrees(self::array_item($xfrm->attributes(), "rot")));
-													}
-													if ($outerShdw) {
-														$shadow = $objDrawing->getShadow();
-														$shadow->setVisible(true);
-														$shadow->setBlurRadius(PHPExcel_Shared_Drawing::EMUTopixels(self::array_item($outerShdw->attributes(), "blurRad")));
-														$shadow->setDistance(PHPExcel_Shared_Drawing::EMUTopixels(self::array_item($outerShdw->attributes(), "dist")));
-														$shadow->setDirection(PHPExcel_Shared_Drawing::angleToDegrees(self::array_item($outerShdw->attributes(), "dir")));
-														$shadow->setAlignment((string) self::array_item($outerShdw->attributes(), "algn"));
-														$shadow->getColor()->setRGB(self::array_item($outerShdw->srgbClr->attributes(), "val"));
-														$shadow->setAlpha(self::array_item($outerShdw->srgbClr->alpha->attributes(), "val") / 1000);
-													}
-													$objDrawing->setWorksheet($docSheet);
-												} elseif(($this->_includeCharts) && ($twoCellAnchor->graphicFrame)) {
-													$fromCoordinate	= PHPExcel_Cell::stringFromColumnIndex((string) $twoCellAnchor->from->col) . ($twoCellAnchor->from->row + 1);
-													$fromOffsetX	= PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->colOff);
-													$fromOffsetY	= PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->rowOff);
-													$toCoordinate	= PHPExcel_Cell::stringFromColumnIndex((string) $twoCellAnchor->to->col) . ($twoCellAnchor->to->row + 1);
-													$toOffsetX		= PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->to->colOff);
-													$toOffsetY		= PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->to->rowOff);
-													$graphic		= $twoCellAnchor->graphicFrame->children("http://schemas.openxmlformats.org/drawingml/2006/main")->graphic;
-													$chartRef		= $graphic->graphicData->children("http://schemas.openxmlformats.org/drawingml/2006/chart")->chart;
-													$thisChart		= (string) $chartRef->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships");
-
-													$chartDetails[$docSheet->getTitle().'!'.$thisChart] =
-															array(	'fromCoordinate'	=> $fromCoordinate,
-																	'fromOffsetX'		=> $fromOffsetX,
-																	'fromOffsetY'		=> $fromOffsetY,
-																	'toCoordinate'		=> $toCoordinate,
-																	'toOffsetX'			=> $toOffsetX,
-																	'toOffsetY'			=> $toOffsetY,
-																	'worksheetTitle'	=> $docSheet->getTitle()
-																 );
-												}
-											}
-										}
-
-									}
-								}
-							}
-
-							// Loop through definedNames
-							if ($xmlWorkbook->definedNames) {
-								foreach ($xmlWorkbook->definedNames->definedName as $definedName) {
-									// Extract range
-									$extractedRange = (string)$definedName;
-									$extractedRange = preg_replace('/\'(\w+)\'\!/', '', $extractedRange);
-									if (($spos = strpos($extractedRange,'!')) !== false) {
-										$extractedRange = substr($extractedRange,0,$spos).str_replace('$', '', substr($extractedRange,$spos));
-									} else {
-										$extractedRange = str_replace('$', '', $extractedRange);
-									}
-
-									// Valid range?
-									if (stripos((string)$definedName, '#REF!') !== FALSE || $extractedRange == '') {
-										continue;
-									}
-
-									// Some definedNames are only applicable if we are on the same sheet...
-									if ((string)$definedName['localSheetId'] != '' && (string)$definedName['localSheetId'] == $sheetId) {
-										// Switch on type
-										switch ((string)$definedName['name']) {
-
-											case '_xlnm._FilterDatabase':
-												if ((string)$definedName['hidden'] !== '1') {
-                                                    $extractedRange = explode(',', $extractedRange);
-                                                    foreach ($extractedRange as $range) {
-                                                        $autoFilterRange = $range;
-                                                        if (strpos($autoFilterRange, ':') !== false) {
-                                                            $docSheet->getAutoFilter()->setRange($autoFilterRange);
-                                                        }
-                                                    }
-												}
-												break;
-
-											case '_xlnm.Print_Titles':
-												// Split $extractedRange
-												$extractedRange = explode(',', $extractedRange);
-
-												// Set print titles
-												foreach ($extractedRange as $range) {
-													$matches = array();
-													$range = str_replace('$', '', $range);
-
-													// check for repeating columns, e g. 'A:A' or 'A:D'
-													if (preg_match('/!?([A-Z]+)\:([A-Z]+)$/', $range, $matches)) {
-														$docSheet->getPageSetup()->setColumnsToRepeatAtLeft(array($matches[1], $matches[2]));
-													}
-													// check for repeating rows, e.g. '1:1' or '1:5'
-													elseif (preg_match('/!?(\d+)\:(\d+)$/', $range, $matches)) {
-														$docSheet->getPageSetup()->setRowsToRepeatAtTop(array($matches[1], $matches[2]));
-													}
-												}
-												break;
-
-											case '_xlnm.Print_Area':
-												$rangeSets = explode(',', $extractedRange);		// FIXME: what if sheetname contains comma?
-												$newRangeSets = array();
-												foreach($rangeSets as $rangeSet) {
-													$range = explode('!', $rangeSet);	// FIXME: what if sheetname contains exclamation mark?
-													$rangeSet = isset($range[1]) ? $range[1] : $range[0];
-													if (strpos($rangeSet, ':') === FALSE) {
-														$rangeSet = $rangeSet . ':' . $rangeSet;
-													}
-													$newRangeSets[] = str_replace('$', '', $rangeSet);
-												}
-												$docSheet->getPageSetup()->setPrintArea(implode(',',$newRangeSets));
-												break;
-
-											default:
-												break;
-										}
-									}
-								}
-							}
-
-							// Next sheet id
-							++$sheetId;
-						}
-
-						// Loop through definedNames
-						if ($xmlWorkbook->definedNames) {
-							foreach ($xmlWorkbook->definedNames->definedName as $definedName) {
-								// Extract range
-								$extractedRange = (string)$definedName;
-								$extractedRange = preg_replace('/\'(\w+)\'\!/', '', $extractedRange);
-								if (($spos = strpos($extractedRange,'!')) !== false) {
-									$extractedRange = substr($extractedRange,0,$spos).str_replace('$', '', substr($extractedRange,$spos));
-								} else {
-									$extractedRange = str_replace('$', '', $extractedRange);
-								}
-
-								// Valid range?
-								if (stripos((string)$definedName, '#REF!') !== false || $extractedRange == '') {
-									continue;
-								}
-
-								// Some definedNames are only applicable if we are on the same sheet...
-								if ((string)$definedName['localSheetId'] != '') {
-									// Local defined name
-									// Switch on type
-									switch ((string)$definedName['name']) {
-
-										case '_xlnm._FilterDatabase':
-										case '_xlnm.Print_Titles':
-										case '_xlnm.Print_Area':
-											break;
-
-										default:
-											if ($mapSheetId[(integer) $definedName['localSheetId']] !== null) {
-												$range = explode('!', (string)$definedName);
-												if (count($range) == 2) {
-													$range[0] = str_replace("''", "'", $range[0]);
-													$range[0] = str_replace("'", "", $range[0]);
-													if ($worksheet = $docSheet->getParent()->getSheetByName($range[0])) {
-														$extractedRange = str_replace('$', '', $range[1]);
-														$scope = $docSheet->getParent()->getSheet($mapSheetId[(integer) $definedName['localSheetId']]);
-														$excel->addNamedRange( new PHPExcel_NamedRange((string)$definedName['name'], $worksheet, $extractedRange, true, $scope) );
-													}
-												}
-											}
-											break;
-									}
-								} else if (!isset($definedName['localSheetId'])) {
-									// "Global" definedNames
-									$locatedSheet = null;
-									$extractedSheetName = '';
-									if (strpos( (string)$definedName, '!' ) !== false) {
-										// Extract sheet name
-										$extractedSheetName = PHPExcel_Worksheet::extractSheetTitle( (string)$definedName, true );
-										$extractedSheetName = $extractedSheetName[0];
-
-										// Locate sheet
-										$locatedSheet = $excel->getSheetByName($extractedSheetName);
-
-										// Modify range
-										$range = explode('!', $extractedRange);
-										$extractedRange = isset($range[1]) ? $range[1] : $range[0];
-									}
-
-									if ($locatedSheet !== NULL) {
-										$excel->addNamedRange( new PHPExcel_NamedRange((string)$definedName['name'], $locatedSheet, $extractedRange, false) );
-									}
-								}
-							}
-						}
-					}
-
-					if ((!$this->_readDataOnly) || (!empty($this->_loadSheetsOnly))) {
-						// active sheet index
-						$activeTab = intval($xmlWorkbook->bookViews->workbookView["activeTab"]); // refers to old sheet index
-
-						// keep active sheet index if sheet is still loaded, else first sheet is set as the active
-						if (isset($mapSheetId[$activeTab]) && $mapSheetId[$activeTab] !== null) {
-							$excel->setActiveSheetIndex($mapSheetId[$activeTab]);
-						} else {
-							if ($excel->getSheetCount() == 0) {
-								$excel->createSheet();
-							}
-							$excel->setActiveSheetIndex(0);
-						}
-					}
-				break;
-			}
-
-		}
-
-
-		if (!$this->_readDataOnly) {
-			$contentTypes = simplexml_load_string($this->securityScan($this->_getFromZipArchive($zip, "[Content_Types].xml")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
-			foreach ($contentTypes->Override as $contentType) {
-				switch ($contentType["ContentType"]) {
-					case "application/vnd.openxmlformats-officedocument.drawingml.chart+xml":
-						if ($this->_includeCharts) {
-							$chartEntryRef = ltrim($contentType['PartName'],'/');
-							$chartElements = simplexml_load_string($this->securityScan($this->_getFromZipArchive($zip, $chartEntryRef)), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
-							$objChart = PHPExcel_Reader_Excel2007_Chart::readChart($chartElements,basename($chartEntryRef,'.xml'));
-
-//							echo 'Chart ',$chartEntryRef,'<br />';
-//							var_dump($charts[$chartEntryRef]);
-//
-							if (isset($charts[$chartEntryRef])) {
-								$chartPositionRef = $charts[$chartEntryRef]['sheet'].'!'.$charts[$chartEntryRef]['id'];
-//								echo 'Position Ref ',$chartPositionRef,'<br />';
-								if (isset($chartDetails[$chartPositionRef])) {
-//									var_dump($chartDetails[$chartPositionRef]);
-
-									$excel->getSheetByName($charts[$chartEntryRef]['sheet'])->addChart($objChart);
-									$objChart->setWorksheet($excel->getSheetByName($charts[$chartEntryRef]['sheet']));
-									$objChart->setTopLeftPosition( $chartDetails[$chartPositionRef]['fromCoordinate'],
-																   $chartDetails[$chartPositionRef]['fromOffsetX'],
-																   $chartDetails[$chartPositionRef]['fromOffsetY']
-																 );
-									$objChart->setBottomRightPosition( $chartDetails[$chartPositionRef]['toCoordinate'],
-																	   $chartDetails[$chartPositionRef]['toOffsetX'],
-																	   $chartDetails[$chartPositionRef]['toOffsetY']
-																	 );
-								}
-							}
-						}
-				}
-			}
-		}
-
-		$zip->close();
-
-		return $excel;
-	}
-
-
-	private static function _readColor($color, $background=FALSE) {
-		if (isset($color["rgb"])) {
-			return (string)$color["rgb"];
-		} else if (isset($color["indexed"])) {
-			return PHPExcel_Style_Color::indexedColor($color["indexed"]-7,$background)->getARGB();
-		} else if (isset($color["theme"])) {
-			if (self::$_theme !== NULL) {
-				$returnColour = self::$_theme->getColourByIndex((int)$color["theme"]);
-				if (isset($color["tint"])) {
-					$tintAdjust = (float) $color["tint"];
-					$returnColour = PHPExcel_Style_Color::changeBrightness($returnColour, $tintAdjust);
-				}
-				return 'FF'.$returnColour;
-			}
-		}
-
-		if ($background) {
-			return 'FFFFFFFF';
-		}
-		return 'FF000000';
-	}
-
-
-	private static function _readStyle($docStyle, $style) {
-		// format code
-//		if (isset($style->numFmt)) {
-//			if (isset($style->numFmt['formatCode'])) {
-//				$docStyle->getNumberFormat()->setFormatCode((string) $style->numFmt['formatCode']);
-//			} else {
-				$docStyle->getNumberFormat()->setFormatCode($style->numFmt);
-//			}
-//		}
-
-		// font
-		if (isset($style->font)) {
-			$docStyle->getFont()->setName((string) $style->font->name["val"]);
-			$docStyle->getFont()->setSize((string) $style->font->sz["val"]);
-			if (isset($style->font->b)) {
-				$docStyle->getFont()->setBold(!isset($style->font->b["val"]) || self::boolean((string) $style->font->b["val"]));
-			}
-			if (isset($style->font->i)) {
-				$docStyle->getFont()->setItalic(!isset($style->font->i["val"]) || self::boolean((string) $style->font->i["val"]));
-			}
-			if (isset($style->font->strike)) {
-				$docStyle->getFont()->setStrikethrough(!isset($style->font->strike["val"]) || self::boolean((string) $style->font->strike["val"]));
-			}
-			$docStyle->getFont()->getColor()->setARGB(self::_readColor($style->font->color));
-
-			if (isset($style->font->u) && !isset($style->font->u["val"])) {
-				$docStyle->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE);
-			} else if (isset($style->font->u) && isset($style->font->u["val"])) {
-				$docStyle->getFont()->setUnderline((string)$style->font->u["val"]);
-			}
-
-			if (isset($style->font->vertAlign) && isset($style->font->vertAlign["val"])) {
-				$vertAlign = strtolower((string)$style->font->vertAlign["val"]);
-				if ($vertAlign == 'superscript') {
-					$docStyle->getFont()->setSuperScript(true);
-				}
-				if ($vertAlign == 'subscript') {
-					$docStyle->getFont()->setSubScript(true);
-				}
-			}
-		}
-
-		// fill
-		if (isset($style->fill)) {
-			if ($style->fill->gradientFill) {
-				$gradientFill = $style->fill->gradientFill[0];
-				if(!empty($gradientFill["type"])) {
-					$docStyle->getFill()->setFillType((string) $gradientFill["type"]);
-				}
-				$docStyle->getFill()->setRotation(floatval($gradientFill["degree"]));
-				$gradientFill->registerXPathNamespace("sml", "http://schemas.openxmlformats.org/spreadsheetml/2006/main");
-				$docStyle->getFill()->getStartColor()->setARGB(self::_readColor( self::array_item($gradientFill->xpath("sml:stop[@position=0]"))->color) );
-				$docStyle->getFill()->getEndColor()->setARGB(self::_readColor( self::array_item($gradientFill->xpath("sml:stop[@position=1]"))->color) );
-			} elseif ($style->fill->patternFill) {
-				$patternType = (string)$style->fill->patternFill["patternType"] != '' ? (string)$style->fill->patternFill["patternType"] : 'solid';
-				$docStyle->getFill()->setFillType($patternType);
-				if ($style->fill->patternFill->fgColor) {
-					$docStyle->getFill()->getStartColor()->setARGB(self::_readColor($style->fill->patternFill->fgColor,true));
-				} else {
-					$docStyle->getFill()->getStartColor()->setARGB('FF000000');
-				}
-				if ($style->fill->patternFill->bgColor) {
-					$docStyle->getFill()->getEndColor()->setARGB(self::_readColor($style->fill->patternFill->bgColor,true));
-				}
-			}
-		}
-
-		// border
-		if (isset($style->border)) {
-			$diagonalUp = self::boolean((string) $style->border["diagonalUp"]);
-			$diagonalDown = self::boolean((string) $style->border["diagonalDown"]);
-			if (!$diagonalUp && !$diagonalDown) {
-				$docStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_NONE);
-			} elseif ($diagonalUp && !$diagonalDown) {
-				$docStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_UP);
-			} elseif (!$diagonalUp && $diagonalDown) {
-				$docStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_DOWN);
-			} else {
-				$docStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_BOTH);
-			}
-			self::_readBorder($docStyle->getBorders()->getLeft(), $style->border->left);
-			self::_readBorder($docStyle->getBorders()->getRight(), $style->border->right);
-			self::_readBorder($docStyle->getBorders()->getTop(), $style->border->top);
-			self::_readBorder($docStyle->getBorders()->getBottom(), $style->border->bottom);
-			self::_readBorder($docStyle->getBorders()->getDiagonal(), $style->border->diagonal);
-		}
-
-		// alignment
-		if (isset($style->alignment)) {
-			$docStyle->getAlignment()->setHorizontal((string) $style->alignment["horizontal"]);
-			$docStyle->getAlignment()->setVertical((string) $style->alignment["vertical"]);
-
-			$textRotation = 0;
-			if ((int)$style->alignment["textRotation"] <= 90) {
-				$textRotation = (int)$style->alignment["textRotation"];
-			} else if ((int)$style->alignment["textRotation"] > 90) {
-				$textRotation = 90 - (int)$style->alignment["textRotation"];
-			}
-
-			$docStyle->getAlignment()->setTextRotation(intval($textRotation));
-			$docStyle->getAlignment()->setWrapText(self::boolean((string) $style->alignment["wrapText"]));
-			$docStyle->getAlignment()->setShrinkToFit(self::boolean((string) $style->alignment["shrinkToFit"]));
-			$docStyle->getAlignment()->setIndent( intval((string)$style->alignment["indent"]) > 0 ? intval((string)$style->alignment["indent"]) : 0 );
-			$docStyle->getAlignment()->setReadorder( intval((string)$style->alignment["readingOrder"]) > 0 ? intval((string)$style->alignment["readingOrder"]) : 0 );
-		}
-
-		// protection
-		if (isset($style->protection)) {
-			if (isset($style->protection['locked'])) {
-				if (self::boolean((string) $style->protection['locked'])) {
-					$docStyle->getProtection()->setLocked(PHPExcel_Style_Protection::PROTECTION_PROTECTED);
-				} else {
-					$docStyle->getProtection()->setLocked(PHPExcel_Style_Protection::PROTECTION_UNPROTECTED);
-				}
-			}
-
-			if (isset($style->protection['hidden'])) {
-				if (self::boolean((string) $style->protection['hidden'])) {
-					$docStyle->getProtection()->setHidden(PHPExcel_Style_Protection::PROTECTION_PROTECTED);
-				} else {
-					$docStyle->getProtection()->setHidden(PHPExcel_Style_Protection::PROTECTION_UNPROTECTED);
-				}
-			}
-		}
-
-		// top-level style settings
-		if (isset($style->quotePrefix)) {
-			$docStyle->setQuotePrefix($style->quotePrefix);
-        }
-	}
-
-
-	private static function _readBorder($docBorder, $eleBorder) {
-		if (isset($eleBorder["style"])) {
-			$docBorder->setBorderStyle((string) $eleBorder["style"]);
-		}
-		if (isset($eleBorder->color)) {
-			$docBorder->getColor()->setARGB(self::_readColor($eleBorder->color));
-		}
-	}
-
-
-	private function _parseRichText($is = null) {
-		$value = new PHPExcel_RichText();
-
-		if (isset($is->t)) {
-			$value->createText( PHPExcel_Shared_String::ControlCharacterOOXML2PHP( (string) $is->t ) );
-		} else {
-			if(is_object($is->r)) {
-			foreach ($is->r as $run) {
-				if (!isset($run->rPr)) {
-					$objText = $value->createText( PHPExcel_Shared_String::ControlCharacterOOXML2PHP( (string) $run->t ) );
-
-				} else {
-					$objText = $value->createTextRun( PHPExcel_Shared_String::ControlCharacterOOXML2PHP( (string) $run->t ) );
-
-					if (isset($run->rPr->rFont["val"])) {
-						$objText->getFont()->setName((string) $run->rPr->rFont["val"]);
-					}
-
-					if (isset($run->rPr->sz["val"])) {
-						$objText->getFont()->setSize((string) $run->rPr->sz["val"]);
-					}
-
-					if (isset($run->rPr->color)) {
-						$objText->getFont()->setColor( new PHPExcel_Style_Color( self::_readColor($run->rPr->color) ) );
-					}
-
-					if ((isset($run->rPr->b["val"]) && self::boolean((string) $run->rPr->b["val"])) ||
-						(isset($run->rPr->b) && !isset($run->rPr->b["val"]))) {
-						$objText->getFont()->setBold(TRUE);
-					}
-
-					if ((isset($run->rPr->i["val"]) && self::boolean((string) $run->rPr->i["val"])) ||
-						(isset($run->rPr->i) && !isset($run->rPr->i["val"]))) {
-						$objText->getFont()->setItalic(TRUE);
-					}
-
-					if (isset($run->rPr->vertAlign) && isset($run->rPr->vertAlign["val"])) {
-						$vertAlign = strtolower((string)$run->rPr->vertAlign["val"]);
-						if ($vertAlign == 'superscript') {
-							$objText->getFont()->setSuperScript(TRUE);
-						}
-						if ($vertAlign == 'subscript') {
-							$objText->getFont()->setSubScript(TRUE);
-						}
-					}
-
-					if (isset($run->rPr->u) && !isset($run->rPr->u["val"])) {
-						$objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE);
-					} else if (isset($run->rPr->u) && isset($run->rPr->u["val"])) {
-						$objText->getFont()->setUnderline((string)$run->rPr->u["val"]);
-					}
-
-					if ((isset($run->rPr->strike["val"]) && self::boolean((string) $run->rPr->strike["val"])) ||
-						(isset($run->rPr->strike) && !isset($run->rPr->strike["val"]))) {
-						$objText->getFont()->setStrikethrough(TRUE);
-					}
-				}
-			}
-			}
-		}
-
-		return $value;
-	}
-
-	private function _readRibbon($excel, $customUITarget, $zip)
-    {
-		$baseDir = dirname($customUITarget);
-		$nameCustomUI = basename($customUITarget);
-        // get the xml file (ribbon)
-		$localRibbon = $this->_getFromZipArchive($zip, $customUITarget);
-		$customUIImagesNames = array();
-        $customUIImagesBinaries = array();
-        // something like customUI/_rels/customUI.xml.rels
-		$pathRels = $baseDir . '/_rels/' . $nameCustomUI . '.rels';
-		$dataRels = $this->_getFromZipArchive($zip, $pathRels);
-		if ($dataRels) {
-            // exists and not empty if the ribbon have some pictures (other than internal MSO)
-			$UIRels = simplexml_load_string($this->securityScan($dataRels), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
-			if ($UIRels) {
-				// we need to save id and target to avoid parsing customUI.xml and "guess" if it's a pseudo callback who load the image
-				foreach ($UIRels->Relationship as $ele) {
-					if ($ele["Type"] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image') {
-                        // an image ?
-						$customUIImagesNames[(string) $ele['Id']] = (string)$ele['Target'];
-						$customUIImagesBinaries[(string)$ele['Target']] = $this->_getFromZipArchive($zip, $baseDir . '/' . (string) $ele['Target']);
-					}
-				}
-			}
-		}
-		if ($localRibbon) {
-			$excel->setRibbonXMLData($customUITarget, $localRibbon);
-			if (count($customUIImagesNames) > 0 && count($customUIImagesBinaries) > 0) {
-				$excel->setRibbonBinObjects($customUIImagesNames, $customUIImagesBinaries);
-			} else {
-				$excel->setRibbonBinObjects(NULL);
-			}
-		} else {
-			$excel->setRibbonXMLData(NULL);
-			$excel->setRibbonBinObjects(NULL);
-		}
-	}
-
-	private static function array_item($array, $key = 0) {
-		return (isset($array[$key]) ? $array[$key] : null);
-	}
-
-
-	private static function dir_add($base, $add) {
-		return preg_replace('~[^/]+/\.\./~', '', dirname($base) . "/$add");
-	}
-
-
-	private static function toCSSArray($style) {
-		$style = str_replace(array("\r","\n"), "", $style);
-
-		$temp = explode(';', $style);
-		$style = array();
-		foreach ($temp as $item) {
-			$item = explode(':', $item);
-
-			if (strpos($item[1], 'px') !== false) {
-				$item[1] = str_replace('px', '', $item[1]);
-			}
-			if (strpos($item[1], 'pt') !== false) {
-				$item[1] = str_replace('pt', '', $item[1]);
-				$item[1] = PHPExcel_Shared_Font::fontSizeToPixels($item[1]);
-			}
-			if (strpos($item[1], 'in') !== false) {
-				$item[1] = str_replace('in', '', $item[1]);
-				$item[1] = PHPExcel_Shared_Font::inchSizeToPixels($item[1]);
-			}
-			if (strpos($item[1], 'cm') !== false) {
-				$item[1] = str_replace('cm', '', $item[1]);
-				$item[1] = PHPExcel_Shared_Font::centimeterSizeToPixels($item[1]);
-			}
-
-			$style[$item[0]] = $item[1];
-		}
-
-		return $style;
-	}
-
-	private static function boolean($value = NULL)
-	{
-        if (is_object($value)) {
-			$value = (string) $value;
-        }
-		if (is_numeric($value)) {
-			return (bool) $value;
-        }
-		return ($value === 'true' || $value === 'TRUE');
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Chart.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Chart.php
deleted file mode 100644
index 1424276c640..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Chart.php
+++ /dev/null
@@ -1,517 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Reader_Excel2007
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Reader_Excel2007_Chart
- *
- * @category	PHPExcel
- * @package		PHPExcel_Reader_Excel2007
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_Excel2007_Chart
-{
-	private static function _getAttribute($component, $name, $format) {
-		$attributes = $component->attributes();
-		if (isset($attributes[$name])) {
-			if ($format == 'string') {
-				return (string) $attributes[$name];
-			} elseif ($format == 'integer') {
-				return (integer) $attributes[$name];
-			} elseif ($format == 'boolean') {
-				return (boolean) ($attributes[$name] === '0' || $attributes[$name] !== 'true') ? false : true;
-			} else {
-				return (float) $attributes[$name];
-			}
-		}
-		return null;
-	}	//	function _getAttribute()
-
-
-	private static function _readColor($color,$background=false) {
-		if (isset($color["rgb"])) {
-			return (string)$color["rgb"];
-		} else if (isset($color["indexed"])) {
-			return PHPExcel_Style_Color::indexedColor($color["indexed"]-7,$background)->getARGB();
-		}
-	}
-
-
-	public static function readChart($chartElements,$chartName) {
-		$namespacesChartMeta = $chartElements->getNamespaces(true);
-		$chartElementsC = $chartElements->children($namespacesChartMeta['c']);
-
-		$XaxisLabel = $YaxisLabel = $legend = $title = NULL;
-		$dispBlanksAs = $plotVisOnly = NULL;
-
-		foreach($chartElementsC as $chartElementKey => $chartElement) {
-			switch ($chartElementKey) {
-				case "chart":
-					foreach($chartElement as $chartDetailsKey => $chartDetails) {
-						$chartDetailsC = $chartDetails->children($namespacesChartMeta['c']);
-						switch ($chartDetailsKey) {
-							case "plotArea":
-									$plotAreaLayout = $XaxisLable = $YaxisLable = null;
-									$plotSeries = $plotAttributes = array();
-									foreach($chartDetails as $chartDetailKey => $chartDetail) {
-										switch ($chartDetailKey) {
-											case "layout":
-												$plotAreaLayout = self::_chartLayoutDetails($chartDetail,$namespacesChartMeta,'plotArea');
-												break;
-											case "catAx":
-												if (isset($chartDetail->title)) {
-													$XaxisLabel = self::_chartTitle($chartDetail->title->children($namespacesChartMeta['c']),$namespacesChartMeta,'cat');
-												}
-												break;
-											case "dateAx":
-												if (isset($chartDetail->title)) {
-													$XaxisLabel = self::_chartTitle($chartDetail->title->children($namespacesChartMeta['c']),$namespacesChartMeta,'cat');
-												}
-												break;
-											case "valAx":
-												if (isset($chartDetail->title)) {
-													$YaxisLabel = self::_chartTitle($chartDetail->title->children($namespacesChartMeta['c']),$namespacesChartMeta,'cat');
-												}
-												break;
-											case "barChart":
-											case "bar3DChart":
-												$barDirection = self::_getAttribute($chartDetail->barDir, 'val', 'string');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
-												$plotSer->setPlotDirection($barDirection);
-												$plotSeries[] = $plotSer;
-												$plotAttributes = self::_readChartAttributes($chartDetail);
-												break;
-											case "lineChart":
-											case "line3DChart":
-												$plotSeries[] = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
-												$plotAttributes = self::_readChartAttributes($chartDetail);
-												break;
-											case "areaChart":
-											case "area3DChart":
-												$plotSeries[] = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
-												$plotAttributes = self::_readChartAttributes($chartDetail);
-												break;
-											case "doughnutChart":
-											case "pieChart":
-											case "pie3DChart":
-												$explosion = isset($chartDetail->ser->explosion);
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
-												$plotSer->setPlotStyle($explosion);
-												$plotSeries[] = $plotSer;
-												$plotAttributes = self::_readChartAttributes($chartDetail);
-												break;
-											case "scatterChart":
-												$scatterStyle = self::_getAttribute($chartDetail->scatterStyle, 'val', 'string');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
-												$plotSer->setPlotStyle($scatterStyle);
-												$plotSeries[] = $plotSer;
-												$plotAttributes = self::_readChartAttributes($chartDetail);
-												break;
-											case "bubbleChart":
-												$bubbleScale = self::_getAttribute($chartDetail->bubbleScale, 'val', 'integer');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
-												$plotSer->setPlotStyle($bubbleScale);
-												$plotSeries[] = $plotSer;
-												$plotAttributes = self::_readChartAttributes($chartDetail);
-												break;
-											case "radarChart":
-												$radarStyle = self::_getAttribute($chartDetail->radarStyle, 'val', 'string');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
-												$plotSer->setPlotStyle($radarStyle);
-												$plotSeries[] = $plotSer;
-												$plotAttributes = self::_readChartAttributes($chartDetail);
-												break;
-											case "surfaceChart":
-											case "surface3DChart":
-												$wireFrame = self::_getAttribute($chartDetail->wireframe, 'val', 'boolean');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
-												$plotSer->setPlotStyle($wireFrame);
-												$plotSeries[] = $plotSer;
-												$plotAttributes = self::_readChartAttributes($chartDetail);
-												break;
-											case "stockChart":
-												$plotSeries[] = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
-												$plotAttributes = self::_readChartAttributes($plotAreaLayout);
-												break;
-										}
-									}
-									if ($plotAreaLayout == NULL) {
-										$plotAreaLayout = new PHPExcel_Chart_Layout();
-									}
-									$plotArea = new PHPExcel_Chart_PlotArea($plotAreaLayout,$plotSeries);
-									self::_setChartAttributes($plotAreaLayout,$plotAttributes);
-									break;
-							case "plotVisOnly":
-									$plotVisOnly = self::_getAttribute($chartDetails, 'val', 'string');
-									break;
-							case "dispBlanksAs":
-									$dispBlanksAs = self::_getAttribute($chartDetails, 'val', 'string');
-									break;
-							case "title":
-									$title = self::_chartTitle($chartDetails,$namespacesChartMeta,'title');
-									break;
-							case "legend":
-									$legendPos = 'r';
-									$legendLayout = null;
-									$legendOverlay = false;
-									foreach($chartDetails as $chartDetailKey => $chartDetail) {
-										switch ($chartDetailKey) {
-											case "legendPos":
-												$legendPos = self::_getAttribute($chartDetail, 'val', 'string');
-												break;
-											case "overlay":
-												$legendOverlay = self::_getAttribute($chartDetail, 'val', 'boolean');
-												break;
-											case "layout":
-												$legendLayout = self::_chartLayoutDetails($chartDetail,$namespacesChartMeta,'legend');
-												break;
-										}
-									}
-									$legend = new PHPExcel_Chart_Legend($legendPos, $legendLayout, $legendOverlay);
-									break;
-						}
-					}
-			}
-		}
-		$chart = new PHPExcel_Chart($chartName,$title,$legend,$plotArea,$plotVisOnly,$dispBlanksAs,$XaxisLabel,$YaxisLabel);
-
-		return $chart;
-	}	//	function readChart()
-
-
-	private static function _chartTitle($titleDetails,$namespacesChartMeta,$type) {
-		$caption = array();
-		$titleLayout = null;
-		foreach($titleDetails as $titleDetailKey => $chartDetail) {
-			switch ($titleDetailKey) {
-				case "tx":
-					$titleDetails = $chartDetail->rich->children($namespacesChartMeta['a']);
-					foreach($titleDetails as $titleKey => $titleDetail) {
-						switch ($titleKey) {
-							case "p":
-								$titleDetailPart = $titleDetail->children($namespacesChartMeta['a']);
-								$caption[] = self::_parseRichText($titleDetailPart);
-						}
-					}
-					break;
-				case "layout":
-					$titleLayout = self::_chartLayoutDetails($chartDetail,$namespacesChartMeta);
-					break;
-			}
-		}
-
-		return new PHPExcel_Chart_Title($caption, $titleLayout);
-	}	//	function _chartTitle()
-
-
-	private static function _chartLayoutDetails($chartDetail,$namespacesChartMeta) {
-		if (!isset($chartDetail->manualLayout)) {
-			return null;
-		}
-		$details = $chartDetail->manualLayout->children($namespacesChartMeta['c']);
-		if (is_null($details)) {
-			return null;
-		}
-		$layout = array();
-		foreach($details as $detailKey => $detail) {
-//			echo $detailKey,' => ',self::_getAttribute($detail, 'val', 'string'),PHP_EOL;
-			$layout[$detailKey] = self::_getAttribute($detail, 'val', 'string');
-		}
-		return new PHPExcel_Chart_Layout($layout);
-	}	//	function _chartLayoutDetails()
-
-
-	private static function _chartDataSeries($chartDetail,$namespacesChartMeta,$plotType) {
-		$multiSeriesType = NULL;
-		$smoothLine = false;
-		$seriesLabel = $seriesCategory = $seriesValues = $plotOrder = array();
-
-		$seriesDetailSet = $chartDetail->children($namespacesChartMeta['c']);
-		foreach($seriesDetailSet as $seriesDetailKey => $seriesDetails) {
-			switch ($seriesDetailKey) {
-				case "grouping":
-					$multiSeriesType = self::_getAttribute($chartDetail->grouping, 'val', 'string');
-					break;
-				case "ser":
-					$marker = NULL;
-					foreach($seriesDetails as $seriesKey => $seriesDetail) {
-						switch ($seriesKey) {
-							case "idx":
-								$seriesIndex = self::_getAttribute($seriesDetail, 'val', 'integer');
-								break;
-							case "order":
-								$seriesOrder = self::_getAttribute($seriesDetail, 'val', 'integer');
-								$plotOrder[$seriesIndex] = $seriesOrder;
-								break;
-							case "tx":
-								$seriesLabel[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta);
-								break;
-							case "marker":
-								$marker = self::_getAttribute($seriesDetail->symbol, 'val', 'string');
-								break;
-							case "smooth":
-								$smoothLine = self::_getAttribute($seriesDetail, 'val', 'boolean');
-								break;
-							case "cat":
-								$seriesCategory[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta);
-								break;
-							case "val":
-								$seriesValues[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta,$marker);
-								break;
-							case "xVal":
-								$seriesCategory[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta,$marker);
-								break;
-							case "yVal":
-								$seriesValues[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta,$marker);
-								break;
-						}
-					}
-			}
-		}
-		return new PHPExcel_Chart_DataSeries($plotType,$multiSeriesType,$plotOrder,$seriesLabel,$seriesCategory,$seriesValues,$smoothLine);
-	}	//	function _chartDataSeries()
-
-
-	private static function _chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker = null, $smoothLine = false) {
-		if (isset($seriesDetail->strRef)) {
-			$seriesSource = (string) $seriesDetail->strRef->f;
-			$seriesData = self::_chartDataSeriesValues($seriesDetail->strRef->strCache->children($namespacesChartMeta['c']),'s');
-
-			return new PHPExcel_Chart_DataSeriesValues('String',$seriesSource,$seriesData['formatCode'],$seriesData['pointCount'],$seriesData['dataValues'],$marker,$smoothLine);
-		} elseif (isset($seriesDetail->numRef)) {
-			$seriesSource = (string) $seriesDetail->numRef->f;
-			$seriesData = self::_chartDataSeriesValues($seriesDetail->numRef->numCache->children($namespacesChartMeta['c']));
-
-			return new PHPExcel_Chart_DataSeriesValues('Number',$seriesSource,$seriesData['formatCode'],$seriesData['pointCount'],$seriesData['dataValues'],$marker,$smoothLine);
-		} elseif (isset($seriesDetail->multiLvlStrRef)) {
-			$seriesSource = (string) $seriesDetail->multiLvlStrRef->f;
-			$seriesData = self::_chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlStrRef->multiLvlStrCache->children($namespacesChartMeta['c']),'s');
-			$seriesData['pointCount'] = count($seriesData['dataValues']);
-
-			return new PHPExcel_Chart_DataSeriesValues('String',$seriesSource,$seriesData['formatCode'],$seriesData['pointCount'],$seriesData['dataValues'],$marker,$smoothLine);
-		} elseif (isset($seriesDetail->multiLvlNumRef)) {
-			$seriesSource = (string) $seriesDetail->multiLvlNumRef->f;
-			$seriesData = self::_chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlNumRef->multiLvlNumCache->children($namespacesChartMeta['c']),'s');
-			$seriesData['pointCount'] = count($seriesData['dataValues']);
-
-			return new PHPExcel_Chart_DataSeriesValues('String',$seriesSource,$seriesData['formatCode'],$seriesData['pointCount'],$seriesData['dataValues'],$marker,$smoothLine);
-		}
-		return null;
-	}	//	function _chartDataSeriesValueSet()
-
-
-	private static function _chartDataSeriesValues($seriesValueSet,$dataType='n') {
-		$seriesVal = array();
-		$formatCode = '';
-		$pointCount = 0;
-
-		foreach($seriesValueSet as $seriesValueIdx => $seriesValue) {
-			switch ($seriesValueIdx) {
-				case 'ptCount':
-					$pointCount = self::_getAttribute($seriesValue, 'val', 'integer');
-					break;
-				case 'formatCode':
-					$formatCode = (string) $seriesValue;
-					break;
-				case 'pt':
-					$pointVal = self::_getAttribute($seriesValue, 'idx', 'integer');
-					if ($dataType == 's') {
-						$seriesVal[$pointVal] = (string) $seriesValue->v;
-					} else {
-						$seriesVal[$pointVal] = (float) $seriesValue->v;
-					}
-					break;
-			}
-		}
-
-		if (empty($seriesVal)) {
-			$seriesVal = NULL;
-		}
-
-		return array( 'formatCode'	=> $formatCode,
-					  'pointCount'	=> $pointCount,
-					  'dataValues'	=> $seriesVal
-					);
-	}	//	function _chartDataSeriesValues()
-
-
-	private static function _chartDataSeriesValuesMultiLevel($seriesValueSet,$dataType='n') {
-		$seriesVal = array();
-		$formatCode = '';
-		$pointCount = 0;
-
-		foreach($seriesValueSet->lvl as $seriesLevelIdx => $seriesLevel) {
-			foreach($seriesLevel as $seriesValueIdx => $seriesValue) {
-				switch ($seriesValueIdx) {
-					case 'ptCount':
-						$pointCount = self::_getAttribute($seriesValue, 'val', 'integer');
-						break;
-					case 'formatCode':
-						$formatCode = (string) $seriesValue;
-						break;
-					case 'pt':
-						$pointVal = self::_getAttribute($seriesValue, 'idx', 'integer');
-						if ($dataType == 's') {
-							$seriesVal[$pointVal][] = (string) $seriesValue->v;
-						} else {
-							$seriesVal[$pointVal][] = (float) $seriesValue->v;
-						}
-						break;
-				}
-			}
-		}
-
-		return array( 'formatCode'	=> $formatCode,
-					  'pointCount'	=> $pointCount,
-					  'dataValues'	=> $seriesVal
-					);
-	}	//	function _chartDataSeriesValuesMultiLevel()
-
-	private static function _parseRichText($titleDetailPart = null) {
-		$value = new PHPExcel_RichText();
-
-		foreach($titleDetailPart as $titleDetailElementKey => $titleDetailElement) {
-			if (isset($titleDetailElement->t)) {
-				$objText = $value->createTextRun( (string) $titleDetailElement->t );
-			}
-			if (isset($titleDetailElement->rPr)) {
-				if (isset($titleDetailElement->rPr->rFont["val"])) {
-					$objText->getFont()->setName((string) $titleDetailElement->rPr->rFont["val"]);
-				}
-
-				$fontSize = (self::_getAttribute($titleDetailElement->rPr, 'sz', 'integer'));
-				if (!is_null($fontSize)) {
-					$objText->getFont()->setSize(floor($fontSize / 100));
-				}
-
-				$fontColor = (self::_getAttribute($titleDetailElement->rPr, 'color', 'string'));
-				if (!is_null($fontColor)) {
-					$objText->getFont()->setColor( new PHPExcel_Style_Color( self::_readColor($fontColor) ) );
-				}
-
-				$bold = self::_getAttribute($titleDetailElement->rPr, 'b', 'boolean');
-				if (!is_null($bold)) {
-					$objText->getFont()->setBold($bold);
-				}
-
-				$italic = self::_getAttribute($titleDetailElement->rPr, 'i', 'boolean');
-				if (!is_null($italic)) {
-					$objText->getFont()->setItalic($italic);
-				}
-
-				$baseline = self::_getAttribute($titleDetailElement->rPr, 'baseline', 'integer');
-				if (!is_null($baseline)) {
-					if ($baseline > 0) {
-						$objText->getFont()->setSuperScript(true);
-					} elseif($baseline < 0) {
-						$objText->getFont()->setSubScript(true);
-					}
-				}
-
-				$underscore = (self::_getAttribute($titleDetailElement->rPr, 'u', 'string'));
-				if (!is_null($underscore)) {
-					if ($underscore == 'sng') {
-						$objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE);
-					} elseif($underscore == 'dbl') {
-						$objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_DOUBLE);
-					} else {
-						$objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_NONE);
-					}
-				}
-
-				$strikethrough = (self::_getAttribute($titleDetailElement->rPr, 's', 'string'));
-				if (!is_null($strikethrough)) {
-					if ($strikethrough == 'noStrike') {
-						$objText->getFont()->setStrikethrough(false);
-					} else {
-						$objText->getFont()->setStrikethrough(true);
-					}
-				}
-			}
-		}
-
-		return $value;
-	}
-
-	private static function _readChartAttributes($chartDetail) {
-		$plotAttributes = array();
-		if (isset($chartDetail->dLbls)) {
-			if (isset($chartDetail->dLbls->howLegendKey)) {
-				$plotAttributes['showLegendKey'] = self::_getAttribute($chartDetail->dLbls->showLegendKey, 'val', 'string');
-			}
-			if (isset($chartDetail->dLbls->showVal)) {
-				$plotAttributes['showVal'] = self::_getAttribute($chartDetail->dLbls->showVal, 'val', 'string');
-			}
-			if (isset($chartDetail->dLbls->showCatName)) {
-				$plotAttributes['showCatName'] = self::_getAttribute($chartDetail->dLbls->showCatName, 'val', 'string');
-			}
-			if (isset($chartDetail->dLbls->showSerName)) {
-				$plotAttributes['showSerName'] = self::_getAttribute($chartDetail->dLbls->showSerName, 'val', 'string');
-			}
-			if (isset($chartDetail->dLbls->showPercent)) {
-				$plotAttributes['showPercent'] = self::_getAttribute($chartDetail->dLbls->showPercent, 'val', 'string');
-			}
-			if (isset($chartDetail->dLbls->showBubbleSize)) {
-				$plotAttributes['showBubbleSize'] = self::_getAttribute($chartDetail->dLbls->showBubbleSize, 'val', 'string');
-			}
-			if (isset($chartDetail->dLbls->showLeaderLines)) {
-				$plotAttributes['showLeaderLines'] = self::_getAttribute($chartDetail->dLbls->showLeaderLines, 'val', 'string');
-			}
-		}
-
-		return $plotAttributes;
-	}
-
-	private static function _setChartAttributes($plotArea,$plotAttributes)
-	{
-		foreach($plotAttributes as $plotAttributeKey => $plotAttributeValue) {
-			switch($plotAttributeKey) {
-				case 'showLegendKey' :
-					$plotArea->setShowLegendKey($plotAttributeValue);
-					break;
-				case 'showVal' :
-					$plotArea->setShowVal($plotAttributeValue);
-					break;
-				case 'showCatName' :
-					$plotArea->setShowCatName($plotAttributeValue);
-					break;
-				case 'showSerName' :
-					$plotArea->setShowSerName($plotAttributeValue);
-					break;
-				case 'showPercent' :
-					$plotArea->setShowPercent($plotAttributeValue);
-					break;
-				case 'showBubbleSize' :
-					$plotArea->setShowBubbleSize($plotAttributeValue);
-					break;
-				case 'showLeaderLines' :
-					$plotArea->setShowLeaderLines($plotAttributeValue);
-					break;
-			}
-		}
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Theme.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Theme.php
deleted file mode 100644
index a371c620856..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Theme.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Reader_Excel2007_Theme
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_Excel2007_Theme
-{
-	/**
-	 * Theme Name
-	 *
-	 * @var string
-	 */
-	private $_themeName;
-
-	/**
-	 * Colour Scheme Name
-	 *
-	 * @var string
-	 */
-	private $_colourSchemeName;
-
-	/**
-	 * Colour Map indexed by position
-	 *
-	 * @var array of string
-	 */
-	private $_colourMapValues;
-
-
-	/**
-	 * Colour Map
-	 *
-	 * @var array of string
-	 */
-	private $_colourMap;
-
-
-    /**
-     * Create a new PHPExcel_Theme
-	 *
-     */
-    public function __construct($themeName,$colourSchemeName,$colourMap)
-    {
-		// Initialise values
-    	$this->_themeName			= $themeName;
-		$this->_colourSchemeName	= $colourSchemeName;
-		$this->_colourMap			= $colourMap;
-    }
-
-	/**
-	 * Get Theme Name
-	 *
-	 * @return string
-	 */
-	public function getThemeName()
-	{
-		return $this->_themeName;
-	}
-
-    /**
-     * Get colour Scheme Name
-     *
-     * @return string
-     */
-    public function getColourSchemeName() {
-		return $this->_colourSchemeName;
-    }
-
-    /**
-     * Get colour Map Value by Position
-     *
-     * @return string
-     */
-    public function getColourByIndex($index=0) {
-    	if (isset($this->_colourMap[$index])) {
-			return $this->_colourMap[$index];
-		}
-		return null;
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if ((is_object($value)) && ($key != '_parent')) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5.php
deleted file mode 100644
index 2de1852f68c..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5.php
+++ /dev/null
@@ -1,7088 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader_Excel5
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-// Original file header of ParseXL (used as the base for this class):
-// --------------------------------------------------------------------------------
-// Adapted from Excel_Spreadsheet_Reader developed by users bizon153,
-// trex005, and mmp11 (SourceForge.net)
-// http://sourceforge.net/projects/phpexcelreader/
-// Primary changes made by canyoncasa (dvc) for ParseXL 1.00 ...
-//	 Modelled moreso after Perl Excel Parse/Write modules
-//	 Added Parse_Excel_Spreadsheet object
-//		 Reads a whole worksheet or tab as row,column array or as
-//		 associated hash of indexed rows and named column fields
-//	 Added variables for worksheet (tab) indexes and names
-//	 Added an object call for loading individual woorksheets
-//	 Changed default indexing defaults to 0 based arrays
-//	 Fixed date/time and percent formats
-//	 Includes patches found at SourceForge...
-//		 unicode patch by nobody
-//		 unpack("d") machine depedency patch by matchy
-//		 boundsheet utf16 patch by bjaenichen
-//	 Renamed functions for shorter names
-//	 General code cleanup and rigor, including <80 column width
-//	 Included a testcase Excel file and PHP example calls
-//	 Code works for PHP 5.x
-
-// Primary changes made by canyoncasa (dvc) for ParseXL 1.10 ...
-// http://sourceforge.net/tracker/index.php?func=detail&aid=1466964&group_id=99160&atid=623334
-//	 Decoding of formula conditions, results, and tokens.
-//	 Support for user-defined named cells added as an array "namedcells"
-//		 Patch code for user-defined named cells supports single cells only.
-//		 NOTE: this patch only works for BIFF8 as BIFF5-7 use a different
-//		 external sheet reference structure
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_Reader_Excel5
- *
- * This class uses {@link http://sourceforge.net/projects/phpexcelreader/parseXL}
- *
- * @category	PHPExcel
- * @package		PHPExcel_Reader_Excel5
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
-{
-	// ParseXL definitions
-	const XLS_BIFF8						= 0x0600;
-	const XLS_BIFF7						= 0x0500;
-	const XLS_WorkbookGlobals			= 0x0005;
-	const XLS_Worksheet					= 0x0010;
-
-	// record identifiers
-	const XLS_Type_FORMULA				= 0x0006;
-	const XLS_Type_EOF					= 0x000a;
-	const XLS_Type_PROTECT				= 0x0012;
-	const XLS_Type_OBJECTPROTECT		= 0x0063;
-	const XLS_Type_SCENPROTECT			= 0x00dd;
-	const XLS_Type_PASSWORD				= 0x0013;
-	const XLS_Type_HEADER				= 0x0014;
-	const XLS_Type_FOOTER				= 0x0015;
-	const XLS_Type_EXTERNSHEET			= 0x0017;
-	const XLS_Type_DEFINEDNAME			= 0x0018;
-	const XLS_Type_VERTICALPAGEBREAKS	= 0x001a;
-	const XLS_Type_HORIZONTALPAGEBREAKS	= 0x001b;
-	const XLS_Type_NOTE					= 0x001c;
-	const XLS_Type_SELECTION			= 0x001d;
-	const XLS_Type_DATEMODE				= 0x0022;
-	const XLS_Type_EXTERNNAME			= 0x0023;
-	const XLS_Type_LEFTMARGIN			= 0x0026;
-	const XLS_Type_RIGHTMARGIN			= 0x0027;
-	const XLS_Type_TOPMARGIN			= 0x0028;
-	const XLS_Type_BOTTOMMARGIN			= 0x0029;
-	const XLS_Type_PRINTGRIDLINES		= 0x002b;
-	const XLS_Type_FILEPASS				= 0x002f;
-	const XLS_Type_FONT					= 0x0031;
-	const XLS_Type_CONTINUE				= 0x003c;
-	const XLS_Type_PANE					= 0x0041;
-	const XLS_Type_CODEPAGE				= 0x0042;
-	const XLS_Type_DEFCOLWIDTH 			= 0x0055;
-	const XLS_Type_OBJ					= 0x005d;
-	const XLS_Type_COLINFO				= 0x007d;
-	const XLS_Type_IMDATA				= 0x007f;
-	const XLS_Type_SHEETPR				= 0x0081;
-	const XLS_Type_HCENTER				= 0x0083;
-	const XLS_Type_VCENTER				= 0x0084;
-	const XLS_Type_SHEET				= 0x0085;
-	const XLS_Type_PALETTE				= 0x0092;
-	const XLS_Type_SCL					= 0x00a0;
-	const XLS_Type_PAGESETUP			= 0x00a1;
-	const XLS_Type_MULRK				= 0x00bd;
-	const XLS_Type_MULBLANK				= 0x00be;
-	const XLS_Type_DBCELL				= 0x00d7;
-	const XLS_Type_XF					= 0x00e0;
-	const XLS_Type_MERGEDCELLS			= 0x00e5;
-	const XLS_Type_MSODRAWINGGROUP		= 0x00eb;
-	const XLS_Type_MSODRAWING			= 0x00ec;
-	const XLS_Type_SST					= 0x00fc;
-	const XLS_Type_LABELSST				= 0x00fd;
-	const XLS_Type_EXTSST				= 0x00ff;
-	const XLS_Type_EXTERNALBOOK			= 0x01ae;
-	const XLS_Type_DATAVALIDATIONS		= 0x01b2;
-	const XLS_Type_TXO					= 0x01b6;
-	const XLS_Type_HYPERLINK			= 0x01b8;
-	const XLS_Type_DATAVALIDATION		= 0x01be;
-	const XLS_Type_DIMENSION			= 0x0200;
-	const XLS_Type_BLANK				= 0x0201;
-	const XLS_Type_NUMBER				= 0x0203;
-	const XLS_Type_LABEL				= 0x0204;
-	const XLS_Type_BOOLERR				= 0x0205;
-	const XLS_Type_STRING				= 0x0207;
-	const XLS_Type_ROW					= 0x0208;
-	const XLS_Type_INDEX				= 0x020b;
-	const XLS_Type_ARRAY				= 0x0221;
-	const XLS_Type_DEFAULTROWHEIGHT 	= 0x0225;
-	const XLS_Type_WINDOW2				= 0x023e;
-	const XLS_Type_RK					= 0x027e;
-	const XLS_Type_STYLE				= 0x0293;
-	const XLS_Type_FORMAT				= 0x041e;
-	const XLS_Type_SHAREDFMLA			= 0x04bc;
-	const XLS_Type_BOF					= 0x0809;
-	const XLS_Type_SHEETPROTECTION		= 0x0867;
-	const XLS_Type_RANGEPROTECTION		= 0x0868;
-	const XLS_Type_SHEETLAYOUT			= 0x0862;
-	const XLS_Type_XFEXT				= 0x087d;
-	const XLS_Type_PAGELAYOUTVIEW		= 0x088b;
-	const XLS_Type_UNKNOWN				= 0xffff;
-
-	// Encryption type
-	const MS_BIFF_CRYPTO_NONE = 0;
-	const MS_BIFF_CRYPTO_XOR  = 1;
-	const MS_BIFF_CRYPTO_RC4  = 2;
-	
-	// Size of stream blocks when using RC4 encryption
-	const REKEY_BLOCK = 0x400;
-
-	/**
-	 * Summary Information stream data.
-	 *
-	 * @var string
-	 */
-	private $_summaryInformation;
-
-	/**
-	 * Extended Summary Information stream data.
-	 *
-	 * @var string
-	 */
-	private $_documentSummaryInformation;
-
-	/**
-	 * User-Defined Properties stream data.
-	 *
-	 * @var string
-	 */
-	private $_userDefinedProperties;
-
-	/**
-	 * Workbook stream data. (Includes workbook globals substream as well as sheet substreams)
-	 *
-	 * @var string
-	 */
-	private $_data;
-
-	/**
-	 * Size in bytes of $this->_data
-	 *
-	 * @var int
-	 */
-	private $_dataSize;
-
-	/**
-	 * Current position in stream
-	 *
-	 * @var integer
-	 */
-	private $_pos;
-
-	/**
-	 * Workbook to be returned by the reader.
-	 *
-	 * @var PHPExcel
-	 */
-	private $_phpExcel;
-
-	/**
-	 * Worksheet that is currently being built by the reader.
-	 *
-	 * @var PHPExcel_Worksheet
-	 */
-	private $_phpSheet;
-
-	/**
-	 * BIFF version
-	 *
-	 * @var int
-	 */
-	private $_version;
-
-	/**
-	 * Codepage set in the Excel file being read. Only important for BIFF5 (Excel 5.0 - Excel 95)
-	 * For BIFF8 (Excel 97 - Excel 2003) this will always have the value 'UTF-16LE'
-	 *
-	 * @var string
-	 */
-	private $_codepage;
-
-	/**
-	 * Shared formats
-	 *
-	 * @var array
-	 */
-	private $_formats;
-
-	/**
-	 * Shared fonts
-	 *
-	 * @var array
-	 */
-	private $_objFonts;
-
-	/**
-	 * Color palette
-	 *
-	 * @var array
-	 */
-	private $_palette;
-
-	/**
-	 * Worksheets
-	 *
-	 * @var array
-	 */
-	private $_sheets;
-
-	/**
-	 * External books
-	 *
-	 * @var array
-	 */
-	private $_externalBooks;
-
-	/**
-	 * REF structures. Only applies to BIFF8.
-	 *
-	 * @var array
-	 */
-	private $_ref;
-
-	/**
-	 * External names
-	 *
-	 * @var array
-	 */
-	private $_externalNames;
-
-	/**
-	 * Defined names
-	 *
-	 * @var array
-	 */
-	private $_definedname;
-
-	/**
-	 * Shared strings. Only applies to BIFF8.
-	 *
-	 * @var array
-	 */
-	private $_sst;
-
-	/**
-	 * Panes are frozen? (in sheet currently being read). See WINDOW2 record.
-	 *
-	 * @var boolean
-	 */
-	private $_frozen;
-
-	/**
-	 * Fit printout to number of pages? (in sheet currently being read). See SHEETPR record.
-	 *
-	 * @var boolean
-	 */
-	private $_isFitToPages;
-
-	/**
-	 * Objects. One OBJ record contributes with one entry.
-	 *
-	 * @var array
-	 */
-	private $_objs;
-
-	/**
-	 * Text Objects. One TXO record corresponds with one entry.
-	 *
-	 * @var array
-	 */
-	private $_textObjects;
-
-	/**
-	 * Cell Annotations (BIFF8)
-	 *
-	 * @var array
-	 */
-	private $_cellNotes;
-
-	/**
-	 * The combined MSODRAWINGGROUP data
-	 *
-	 * @var string
-	 */
-	private $_drawingGroupData;
-
-	/**
-	 * The combined MSODRAWING data (per sheet)
-	 *
-	 * @var string
-	 */
-	private $_drawingData;
-
-	/**
-	 * Keep track of XF index
-	 *
-	 * @var int
-	 */
-	private $_xfIndex;
-
-	/**
-	 * Mapping of XF index (that is a cell XF) to final index in cellXf collection
-	 *
-	 * @var array
-	 */
-	private $_mapCellXfIndex;
-
-	/**
-	 * Mapping of XF index (that is a style XF) to final index in cellStyleXf collection
-	 *
-	 * @var array
-	 */
-	private $_mapCellStyleXfIndex;
-
-	/**
-	 * The shared formulas in a sheet. One SHAREDFMLA record contributes with one value.
-	 *
-	 * @var array
-	 */
-	private $_sharedFormulas;
-
-	/**
-	 * The shared formula parts in a sheet. One FORMULA record contributes with one value if it
-	 * refers to a shared formula.
-	 *
-	 * @var array
-	 */
-	private $_sharedFormulaParts;
-
-	/**
-	 * The type of encryption in use
-	 *
-	 * @var int	
-	 */
-	private $_encryption = 0;
-	
-	/**
-	 * The position in the stream after which contents are encrypted
-	 *
-	 * @var int
-	 */
-	private $_encryptionStartPos = false;
-
-	/**
-	 * The current RC4 decryption object
-	 *
-	 * @var PHPExcel_Reader_Excel5_RC4
-	 */
-	private $_rc4Key = null;
-
-	/**
-	 * The position in the stream that the RC4 decryption object was left at
-	 *
-	 * @var int
-	 */
-	private $_rc4Pos = 0;
-
-	/**
-	 * The current MD5 context state
-	 *
-	 * @var string
-	 */
-	private $_md5Ctxt = null;
-
-	/**
-	 * Create a new PHPExcel_Reader_Excel5 instance
-	 */
-	public function __construct() {
-		$this->_readFilter = new PHPExcel_Reader_DefaultReadFilter();
-	}
-
-
-	/**
-	 * Can the current PHPExcel_Reader_IReader read the file?
-	 *
-	 * @param 	string 		$pFilename
-	 * @return 	boolean
-	 * @throws PHPExcel_Reader_Exception
-	 */
-	public function canRead($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		try {
-			// Use ParseXL for the hard work.
-			$ole = new PHPExcel_Shared_OLERead();
-
-			// get excel data
-			$res = $ole->read($pFilename);
-			return true;
-		} catch (PHPExcel_Exception $e) {
-			return false;
-		}
-	}
-
-
-	/**
-	 * Reads names of the worksheets from a file, without parsing the whole file to a PHPExcel object
-	 *
-	 * @param 	string 		$pFilename
-	 * @throws 	PHPExcel_Reader_Exception
-	 */
-	public function listWorksheetNames($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		$worksheetNames = array();
-
-		// Read the OLE file
-		$this->_loadOLE($pFilename);
-
-		// total byte size of Excel data (workbook global substream + sheet substreams)
-		$this->_dataSize = strlen($this->_data);
-
-		$this->_pos		= 0;
-		$this->_sheets	= array();
-
-		// Parse Workbook Global Substream
-		while ($this->_pos < $this->_dataSize) {
-			$code = self::_GetInt2d($this->_data, $this->_pos);
-
-			switch ($code) {
-				case self::XLS_Type_BOF:	$this->_readBof();		break;
-				case self::XLS_Type_SHEET:	$this->_readSheet();	break;
-				case self::XLS_Type_EOF:	$this->_readDefault();	break 2;
-				default:					$this->_readDefault();	break;
-			}
-		}
-
-		foreach ($this->_sheets as $sheet) {
-			if ($sheet['sheetType'] != 0x00) {
-				// 0x00: Worksheet, 0x02: Chart, 0x06: Visual Basic module
-				continue;
-			}
-
-			$worksheetNames[] = $sheet['name'];
-		}
-
-		return $worksheetNames;
-	}
-
-
-	/**
-	 * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
-	 *
-	 * @param   string     $pFilename
-	 * @throws   PHPExcel_Reader_Exception
-	 */
-	public function listWorksheetInfo($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		$worksheetInfo = array();
-
-		// Read the OLE file
-		$this->_loadOLE($pFilename);
-
-		// total byte size of Excel data (workbook global substream + sheet substreams)
-		$this->_dataSize = strlen($this->_data);
-
-		// initialize
-		$this->_pos    = 0;
-		$this->_sheets = array();
-
-		// Parse Workbook Global Substream
-		while ($this->_pos < $this->_dataSize) {
-			$code = self::_GetInt2d($this->_data, $this->_pos);
-
-			switch ($code) {
-				case self::XLS_Type_BOF:        $this->_readBof();        break;
-				case self::XLS_Type_SHEET:      $this->_readSheet();      break;
-				case self::XLS_Type_EOF:        $this->_readDefault();    break 2;
-				default:                        $this->_readDefault();    break;
-			}
-		}
-
-		// Parse the individual sheets
-		foreach ($this->_sheets as $sheet) {
-
-			if ($sheet['sheetType'] != 0x00) {
-				// 0x00: Worksheet
-				// 0x02: Chart
-				// 0x06: Visual Basic module
-				continue;
-			}
-
-			$tmpInfo = array();
-			$tmpInfo['worksheetName'] = $sheet['name'];
-			$tmpInfo['lastColumnLetter'] = 'A';
-			$tmpInfo['lastColumnIndex'] = 0;
-			$tmpInfo['totalRows'] = 0;
-			$tmpInfo['totalColumns'] = 0;
-
-			$this->_pos = $sheet['offset'];
-
-			while ($this->_pos <= $this->_dataSize - 4) {
-				$code = self::_GetInt2d($this->_data, $this->_pos);
-
-				switch ($code) {
-					case self::XLS_Type_RK:
-					case self::XLS_Type_LABELSST:
-					case self::XLS_Type_NUMBER:
-					case self::XLS_Type_FORMULA:
-					case self::XLS_Type_BOOLERR:
-					case self::XLS_Type_LABEL:
-						$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-						$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-						// move stream pointer to next record
-						$this->_pos += 4 + $length;
-
-						$rowIndex = self::_GetInt2d($recordData, 0) + 1;
-						$columnIndex = self::_GetInt2d($recordData, 2);
-
-						$tmpInfo['totalRows'] = max($tmpInfo['totalRows'], $rowIndex);
-						$tmpInfo['lastColumnIndex'] = max($tmpInfo['lastColumnIndex'], $columnIndex);
-						break;
-					case self::XLS_Type_BOF:      $this->_readBof();          break;
-					case self::XLS_Type_EOF:      $this->_readDefault();      break 2;
-					default:                      $this->_readDefault();      break;
-				}
-			}
-
-			$tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
-			$tmpInfo['totalColumns'] = $tmpInfo['lastColumnIndex'] + 1;
-
-			$worksheetInfo[] = $tmpInfo;
-		}
-
-		return $worksheetInfo;
-	}
-
-
-	/**
-	 * Loads PHPExcel from file
-	 *
-	 * @param 	string 		$pFilename
-	 * @return 	PHPExcel
-	 * @throws 	PHPExcel_Reader_Exception
-	 */
-	public function load($pFilename)
-	{
-		// Read the OLE file
-		$this->_loadOLE($pFilename);
-
-		// Initialisations
-		$this->_phpExcel = new PHPExcel;
-		$this->_phpExcel->removeSheetByIndex(0); // remove 1st sheet
-		if (!$this->_readDataOnly) {
-			$this->_phpExcel->removeCellStyleXfByIndex(0); // remove the default style
-			$this->_phpExcel->removeCellXfByIndex(0); // remove the default style
-		}
-
-		// Read the summary information stream (containing meta data)
-		$this->_readSummaryInformation();
-
-		// Read the Additional document summary information stream (containing application-specific meta data)
-		$this->_readDocumentSummaryInformation();
-
-		// total byte size of Excel data (workbook global substream + sheet substreams)
-		$this->_dataSize = strlen($this->_data);
-
-		// initialize
-		$this->_pos					= 0;
-		$this->_codepage			= 'CP1252';
-		$this->_formats				= array();
-		$this->_objFonts			= array();
-		$this->_palette				= array();
-		$this->_sheets				= array();
-		$this->_externalBooks		= array();
-		$this->_ref					= array();
-		$this->_definedname			= array();
-		$this->_sst					= array();
-		$this->_drawingGroupData	= '';
-		$this->_xfIndex				= '';
-		$this->_mapCellXfIndex		= array();
-		$this->_mapCellStyleXfIndex	= array();
-
-		// Parse Workbook Global Substream
-		while ($this->_pos < $this->_dataSize) {
-			$code = self::_GetInt2d($this->_data, $this->_pos);
-
-			switch ($code) {
-				case self::XLS_Type_BOF:			$this->_readBof();				break;
-				case self::XLS_Type_FILEPASS:		$this->_readFilepass();			break;
-				case self::XLS_Type_CODEPAGE:		$this->_readCodepage();			break;
-				case self::XLS_Type_DATEMODE:		$this->_readDateMode();			break;
-				case self::XLS_Type_FONT:			$this->_readFont();				break;
-				case self::XLS_Type_FORMAT:			$this->_readFormat();			break;
-				case self::XLS_Type_XF:				$this->_readXf();				break;
-				case self::XLS_Type_XFEXT:			$this->_readXfExt();			break;
-				case self::XLS_Type_STYLE:			$this->_readStyle();			break;
-				case self::XLS_Type_PALETTE:		$this->_readPalette();			break;
-				case self::XLS_Type_SHEET:			$this->_readSheet();			break;
-				case self::XLS_Type_EXTERNALBOOK:	$this->_readExternalBook();		break;
-				case self::XLS_Type_EXTERNNAME:		$this->_readExternName();		break;
-				case self::XLS_Type_EXTERNSHEET:	$this->_readExternSheet();		break;
-				case self::XLS_Type_DEFINEDNAME:	$this->_readDefinedName();		break;
-				case self::XLS_Type_MSODRAWINGGROUP:	$this->_readMsoDrawingGroup();	break;
-				case self::XLS_Type_SST:			$this->_readSst();				break;
-				case self::XLS_Type_EOF:			$this->_readDefault();			break 2;
-				default:							$this->_readDefault();			break;
-			}
-		}
-
-		// Resolve indexed colors for font, fill, and border colors
-		// Cannot be resolved already in XF record, because PALETTE record comes afterwards
-		if (!$this->_readDataOnly) {
-			foreach ($this->_objFonts as $objFont) {
-				if (isset($objFont->colorIndex)) {
-					$color = self::_readColor($objFont->colorIndex,$this->_palette,$this->_version);
-					$objFont->getColor()->setRGB($color['rgb']);
-				}
-			}
-
-			foreach ($this->_phpExcel->getCellXfCollection() as $objStyle) {
-				// fill start and end color
-				$fill = $objStyle->getFill();
-
-				if (isset($fill->startcolorIndex)) {
-					$startColor = self::_readColor($fill->startcolorIndex,$this->_palette,$this->_version);
-					$fill->getStartColor()->setRGB($startColor['rgb']);
-				}
-
-				if (isset($fill->endcolorIndex)) {
-					$endColor = self::_readColor($fill->endcolorIndex,$this->_palette,$this->_version);
-					$fill->getEndColor()->setRGB($endColor['rgb']);
-				}
-
-				// border colors
-				$top      = $objStyle->getBorders()->getTop();
-				$right    = $objStyle->getBorders()->getRight();
-				$bottom   = $objStyle->getBorders()->getBottom();
-				$left     = $objStyle->getBorders()->getLeft();
-				$diagonal = $objStyle->getBorders()->getDiagonal();
-
-				if (isset($top->colorIndex)) {
-					$borderTopColor = self::_readColor($top->colorIndex,$this->_palette,$this->_version);
-					$top->getColor()->setRGB($borderTopColor['rgb']);
-				}
-
-				if (isset($right->colorIndex)) {
-					$borderRightColor = self::_readColor($right->colorIndex,$this->_palette,$this->_version);
-					$right->getColor()->setRGB($borderRightColor['rgb']);
-				}
-
-				if (isset($bottom->colorIndex)) {
-					$borderBottomColor = self::_readColor($bottom->colorIndex,$this->_palette,$this->_version);
-					$bottom->getColor()->setRGB($borderBottomColor['rgb']);
-				}
-
-				if (isset($left->colorIndex)) {
-					$borderLeftColor = self::_readColor($left->colorIndex,$this->_palette,$this->_version);
-					$left->getColor()->setRGB($borderLeftColor['rgb']);
-				}
-
-				if (isset($diagonal->colorIndex)) {
-					$borderDiagonalColor = self::_readColor($diagonal->colorIndex,$this->_palette,$this->_version);
-					$diagonal->getColor()->setRGB($borderDiagonalColor['rgb']);
-				}
-			}
-		}
-
-		// treat MSODRAWINGGROUP records, workbook-level Escher
-		if (!$this->_readDataOnly && $this->_drawingGroupData) {
-			$escherWorkbook = new PHPExcel_Shared_Escher();
-			$reader = new PHPExcel_Reader_Excel5_Escher($escherWorkbook);
-			$escherWorkbook = $reader->load($this->_drawingGroupData);
-
-			// debug Escher stream
-			//$debug = new Debug_Escher(new PHPExcel_Shared_Escher());
-			//$debug->load($this->_drawingGroupData);
-		}
-
-		// Parse the individual sheets
-		foreach ($this->_sheets as $sheet) {
-
-			if ($sheet['sheetType'] != 0x00) {
-				// 0x00: Worksheet, 0x02: Chart, 0x06: Visual Basic module
-				continue;
-			}
-
-			// check if sheet should be skipped
-			if (isset($this->_loadSheetsOnly) && !in_array($sheet['name'], $this->_loadSheetsOnly)) {
-				continue;
-			}
-
-			// add sheet to PHPExcel object
-			$this->_phpSheet = $this->_phpExcel->createSheet();
-			//	Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in formula
-			//		cells... during the load, all formulae should be correct, and we're simply bringing the worksheet
-			//		name in line with the formula, not the reverse
-			$this->_phpSheet->setTitle($sheet['name'],false);
-			$this->_phpSheet->setSheetState($sheet['sheetState']);
-
-			$this->_pos = $sheet['offset'];
-
-			// Initialize isFitToPages. May change after reading SHEETPR record.
-			$this->_isFitToPages = false;
-
-			// Initialize drawingData
-			$this->_drawingData = '';
-
-			// Initialize objs
-			$this->_objs = array();
-
-			// Initialize shared formula parts
-			$this->_sharedFormulaParts = array();
-
-			// Initialize shared formulas
-			$this->_sharedFormulas = array();
-
-			// Initialize text objs
-			$this->_textObjects = array();
-
-			// Initialize cell annotations
-			$this->_cellNotes = array();
-			$this->textObjRef = -1;
-
-			while ($this->_pos <= $this->_dataSize - 4) {
-				$code = self::_GetInt2d($this->_data, $this->_pos);
-
-				switch ($code) {
-					case self::XLS_Type_BOF:					$this->_readBof();						break;
-					case self::XLS_Type_PRINTGRIDLINES:			$this->_readPrintGridlines();			break;
-					case self::XLS_Type_DEFAULTROWHEIGHT:		$this->_readDefaultRowHeight();			break;
-					case self::XLS_Type_SHEETPR:				$this->_readSheetPr();					break;
-					case self::XLS_Type_HORIZONTALPAGEBREAKS:	$this->_readHorizontalPageBreaks();		break;
-					case self::XLS_Type_VERTICALPAGEBREAKS:		$this->_readVerticalPageBreaks();		break;
-					case self::XLS_Type_HEADER:					$this->_readHeader();					break;
-					case self::XLS_Type_FOOTER:					$this->_readFooter();					break;
-					case self::XLS_Type_HCENTER:				$this->_readHcenter();					break;
-					case self::XLS_Type_VCENTER:				$this->_readVcenter();					break;
-					case self::XLS_Type_LEFTMARGIN:				$this->_readLeftMargin();				break;
-					case self::XLS_Type_RIGHTMARGIN:			$this->_readRightMargin();				break;
-					case self::XLS_Type_TOPMARGIN:				$this->_readTopMargin();				break;
-					case self::XLS_Type_BOTTOMMARGIN:			$this->_readBottomMargin();				break;
-					case self::XLS_Type_PAGESETUP:				$this->_readPageSetup();				break;
-					case self::XLS_Type_PROTECT:				$this->_readProtect();					break;
-					case self::XLS_Type_SCENPROTECT:			$this->_readScenProtect();				break;
-					case self::XLS_Type_OBJECTPROTECT:			$this->_readObjectProtect();			break;
-					case self::XLS_Type_PASSWORD:				$this->_readPassword();					break;
-					case self::XLS_Type_DEFCOLWIDTH:			$this->_readDefColWidth();				break;
-					case self::XLS_Type_COLINFO:				$this->_readColInfo();					break;
-					case self::XLS_Type_DIMENSION:				$this->_readDefault();					break;
-					case self::XLS_Type_ROW:					$this->_readRow();						break;
-					case self::XLS_Type_DBCELL:					$this->_readDefault();					break;
-					case self::XLS_Type_RK:						$this->_readRk();						break;
-					case self::XLS_Type_LABELSST:				$this->_readLabelSst();					break;
-					case self::XLS_Type_MULRK:					$this->_readMulRk();					break;
-					case self::XLS_Type_NUMBER:					$this->_readNumber();					break;
-					case self::XLS_Type_FORMULA:				$this->_readFormula();					break;
-					case self::XLS_Type_SHAREDFMLA:				$this->_readSharedFmla();				break;
-					case self::XLS_Type_BOOLERR:				$this->_readBoolErr();					break;
-					case self::XLS_Type_MULBLANK:				$this->_readMulBlank();					break;
-					case self::XLS_Type_LABEL:					$this->_readLabel();					break;
-					case self::XLS_Type_BLANK:					$this->_readBlank();					break;
-					case self::XLS_Type_MSODRAWING:				$this->_readMsoDrawing();				break;
-					case self::XLS_Type_OBJ:					$this->_readObj();						break;
-					case self::XLS_Type_WINDOW2:				$this->_readWindow2();					break;
-					case self::XLS_Type_PAGELAYOUTVIEW:	$this->_readPageLayoutView();					break;
-					case self::XLS_Type_SCL:					$this->_readScl();						break;
-					case self::XLS_Type_PANE:					$this->_readPane();						break;
-					case self::XLS_Type_SELECTION:				$this->_readSelection();				break;
-					case self::XLS_Type_MERGEDCELLS:			$this->_readMergedCells();				break;
-					case self::XLS_Type_HYPERLINK:				$this->_readHyperLink();				break;
-					case self::XLS_Type_DATAVALIDATIONS:		$this->_readDataValidations();			break;
-					case self::XLS_Type_DATAVALIDATION:			$this->_readDataValidation();			break;
-					case self::XLS_Type_SHEETLAYOUT:			$this->_readSheetLayout();				break;
-					case self::XLS_Type_SHEETPROTECTION:		$this->_readSheetProtection();			break;
-					case self::XLS_Type_RANGEPROTECTION:		$this->_readRangeProtection();			break;
-					case self::XLS_Type_NOTE:					$this->_readNote();						break;
-					//case self::XLS_Type_IMDATA:				$this->_readImData();					break;
-					case self::XLS_Type_TXO:					$this->_readTextObject();				break;
-					case self::XLS_Type_CONTINUE:				$this->_readContinue();					break;
-					case self::XLS_Type_EOF:					$this->_readDefault();					break 2;
-					default:									$this->_readDefault();					break;
-				}
-
-			}
-
-			// treat MSODRAWING records, sheet-level Escher
-			if (!$this->_readDataOnly && $this->_drawingData) {
-				$escherWorksheet = new PHPExcel_Shared_Escher();
-				$reader = new PHPExcel_Reader_Excel5_Escher($escherWorksheet);
-				$escherWorksheet = $reader->load($this->_drawingData);
-
-				// debug Escher stream
-				//$debug = new Debug_Escher(new PHPExcel_Shared_Escher());
-				//$debug->load($this->_drawingData);
-
-				// get all spContainers in one long array, so they can be mapped to OBJ records
-				$allSpContainers = $escherWorksheet->getDgContainer()->getSpgrContainer()->getAllSpContainers();
-			}
-
-			// treat OBJ records
-			foreach ($this->_objs as $n => $obj) {
-//				echo '<hr /><b>Object</b> reference is ',$n,'<br />';
-//				var_dump($obj);
-//				echo '<br />';
-
-				// the first shape container never has a corresponding OBJ record, hence $n + 1
-				if (isset($allSpContainers[$n + 1]) && is_object($allSpContainers[$n + 1])) {
-					$spContainer = $allSpContainers[$n + 1];
-
-					// we skip all spContainers that are a part of a group shape since we cannot yet handle those
-					if ($spContainer->getNestingLevel() > 1) {
-						continue;
-					}
-
-					// calculate the width and height of the shape
-					list($startColumn, $startRow) = PHPExcel_Cell::coordinateFromString($spContainer->getStartCoordinates());
-					list($endColumn, $endRow) = PHPExcel_Cell::coordinateFromString($spContainer->getEndCoordinates());
-
-					$startOffsetX = $spContainer->getStartOffsetX();
-					$startOffsetY = $spContainer->getStartOffsetY();
-					$endOffsetX = $spContainer->getEndOffsetX();
-					$endOffsetY = $spContainer->getEndOffsetY();
-
-					$width = PHPExcel_Shared_Excel5::getDistanceX($this->_phpSheet, $startColumn, $startOffsetX, $endColumn, $endOffsetX);
-					$height = PHPExcel_Shared_Excel5::getDistanceY($this->_phpSheet, $startRow, $startOffsetY, $endRow, $endOffsetY);
-
-					// calculate offsetX and offsetY of the shape
-					$offsetX = $startOffsetX * PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, $startColumn) / 1024;
-					$offsetY = $startOffsetY * PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $startRow) / 256;
-
-					switch ($obj['otObjType']) {
-						case 0x19:
-							// Note
-//							echo 'Cell Annotation Object<br />';
-//							echo 'Object ID is ',$obj['idObjID'],'<br />';
-//
-							if (isset($this->_cellNotes[$obj['idObjID']])) {
-								$cellNote = $this->_cellNotes[$obj['idObjID']];
-
-								if (isset($this->_textObjects[$obj['idObjID']])) {
-									$textObject = $this->_textObjects[$obj['idObjID']];
-									$this->_cellNotes[$obj['idObjID']]['objTextData'] = $textObject;
-								}
-							}
-							break;
-
-						case 0x08:
-//							echo 'Picture Object<br />';
-							// picture
-
-							// get index to BSE entry (1-based)
-							$BSEindex = $spContainer->getOPT(0x0104);
-							$BSECollection = $escherWorkbook->getDggContainer()->getBstoreContainer()->getBSECollection();
-							$BSE = $BSECollection[$BSEindex - 1];
-							$blipType = $BSE->getBlipType();
-
-							// need check because some blip types are not supported by Escher reader such as EMF
-							if ($blip = $BSE->getBlip()) {
-								$ih = imagecreatefromstring($blip->getData());
-								$drawing = new PHPExcel_Worksheet_MemoryDrawing();
-								$drawing->setImageResource($ih);
-
-								// width, height, offsetX, offsetY
-								$drawing->setResizeProportional(false);
-								$drawing->setWidth($width);
-								$drawing->setHeight($height);
-								$drawing->setOffsetX($offsetX);
-								$drawing->setOffsetY($offsetY);
-
-								switch ($blipType) {
-									case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG:
-										$drawing->setRenderingFunction(PHPExcel_Worksheet_MemoryDrawing::RENDERING_JPEG);
-										$drawing->setMimeType(PHPExcel_Worksheet_MemoryDrawing::MIMETYPE_JPEG);
-										break;
-
-									case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG:
-										$drawing->setRenderingFunction(PHPExcel_Worksheet_MemoryDrawing::RENDERING_PNG);
-										$drawing->setMimeType(PHPExcel_Worksheet_MemoryDrawing::MIMETYPE_PNG);
-										break;
-								}
-
-								$drawing->setWorksheet($this->_phpSheet);
-								$drawing->setCoordinates($spContainer->getStartCoordinates());
-							}
-
-							break;
-
-						default:
-							// other object type
-							break;
-
-					}
-				}
-			}
-
-			// treat SHAREDFMLA records
-			if ($this->_version == self::XLS_BIFF8) {
-				foreach ($this->_sharedFormulaParts as $cell => $baseCell) {
-					list($column, $row) = PHPExcel_Cell::coordinateFromString($cell);
-					if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($column, $row, $this->_phpSheet->getTitle()) ) {
-						$formula = $this->_getFormulaFromStructure($this->_sharedFormulas[$baseCell], $cell);
-						$this->_phpSheet->getCell($cell)->setValueExplicit('=' . $formula, PHPExcel_Cell_DataType::TYPE_FORMULA);
-					}
-				}
-			}
-
-			if (!empty($this->_cellNotes)) {
-				foreach($this->_cellNotes as $note => $noteDetails) {
-					if (!isset($noteDetails['objTextData'])) {
-						if (isset($this->_textObjects[$note])) {
-							$textObject = $this->_textObjects[$note];
-							$noteDetails['objTextData'] = $textObject;
-						} else {
-							$noteDetails['objTextData']['text'] = '';
-						}
-					}
-//					echo '<b>Cell annotation ',$note,'</b><br />';
-//					var_dump($noteDetails);
-//					echo '<br />';
-					$cellAddress = str_replace('$','',$noteDetails['cellRef']);
-					$this->_phpSheet->getComment( $cellAddress )
-													->setAuthor( $noteDetails['author'] )
-													->setText($this->_parseRichText($noteDetails['objTextData']['text']) );
-				}
-			}
-		}
-
-		// add the named ranges (defined names)
-		foreach ($this->_definedname as $definedName) {
-			if ($definedName['isBuiltInName']) {
-				switch ($definedName['name']) {
-
-				case pack('C', 0x06):
-					// print area
-					//	in general, formula looks like this: Foo!$C$7:$J$66,Bar!$A$1:$IV$2
-					$ranges = explode(',', $definedName['formula']); // FIXME: what if sheetname contains comma?
-
-					$extractedRanges = array();
-					foreach ($ranges as $range) {
-						// $range should look like one of these
-						//		Foo!$C$7:$J$66
-						//		Bar!$A$1:$IV$2
-
-						$explodes = explode('!', $range);	// FIXME: what if sheetname contains exclamation mark?
-						$sheetName = trim($explodes[0], "'");
-
-						if (count($explodes) == 2) {
-							if (strpos($explodes[1], ':') === FALSE) {
-								$explodes[1] = $explodes[1] . ':' . $explodes[1];
-							}
-							$extractedRanges[] = str_replace('$', '', $explodes[1]); // C7:J66
-						}
-					}
-					if ($docSheet = $this->_phpExcel->getSheetByName($sheetName)) {
-						$docSheet->getPageSetup()->setPrintArea(implode(',', $extractedRanges)); // C7:J66,A1:IV2
-					}
-					break;
-
-				case pack('C', 0x07):
-					// print titles (repeating rows)
-					// Assuming BIFF8, there are 3 cases
-					// 1. repeating rows
-					//		formula looks like this: Sheet!$A$1:$IV$2
-					//		rows 1-2 repeat
-					// 2. repeating columns
-					//		formula looks like this: Sheet!$A$1:$B$65536
-					//		columns A-B repeat
-					// 3. both repeating rows and repeating columns
-					//		formula looks like this: Sheet!$A$1:$B$65536,Sheet!$A$1:$IV$2
-
-					$ranges = explode(',', $definedName['formula']); // FIXME: what if sheetname contains comma?
-
-					foreach ($ranges as $range) {
-						// $range should look like this one of these
-						//		Sheet!$A$1:$B$65536
-						//		Sheet!$A$1:$IV$2
-
-						$explodes = explode('!', $range);
-
-						if (count($explodes) == 2) {
-							if ($docSheet = $this->_phpExcel->getSheetByName($explodes[0])) {
-
-								$extractedRange = $explodes[1];
-								$extractedRange = str_replace('$', '', $extractedRange);
-
-								$coordinateStrings = explode(':', $extractedRange);
-								if (count($coordinateStrings) == 2) {
-									list($firstColumn, $firstRow) = PHPExcel_Cell::coordinateFromString($coordinateStrings[0]);
-									list($lastColumn, $lastRow) = PHPExcel_Cell::coordinateFromString($coordinateStrings[1]);
-
-									if ($firstColumn == 'A' and $lastColumn == 'IV') {
-										// then we have repeating rows
-										$docSheet->getPageSetup()->setRowsToRepeatAtTop(array($firstRow, $lastRow));
-									} elseif ($firstRow == 1 and $lastRow == 65536) {
-										// then we have repeating columns
-										$docSheet->getPageSetup()->setColumnsToRepeatAtLeft(array($firstColumn, $lastColumn));
-									}
-								}
-							}
-						}
-					}
-					break;
-
-				}
-			} else {
-				// Extract range
-				$explodes = explode('!', $definedName['formula']);
-
-				if (count($explodes) == 2) {
-					if (($docSheet = $this->_phpExcel->getSheetByName($explodes[0])) ||
-						($docSheet = $this->_phpExcel->getSheetByName(trim($explodes[0],"'")))) {
-						$extractedRange = $explodes[1];
-						$extractedRange = str_replace('$', '', $extractedRange);
-
-						$localOnly = ($definedName['scope'] == 0) ? false : true;
-
-						$scope = ($definedName['scope'] == 0) ?
-							null : $this->_phpExcel->getSheetByName($this->_sheets[$definedName['scope'] - 1]['name']);
-
-						$this->_phpExcel->addNamedRange( new PHPExcel_NamedRange((string)$definedName['name'], $docSheet, $extractedRange, $localOnly, $scope) );
-					}
-				} else {
-					//	Named Value
-					//	TODO Provide support for named values
-				}
-			}
-		}
-        $this->_data = null;
-
-		return $this->_phpExcel;
-	}
-	
-	/**
-	 * Read record data from stream, decrypting as required
-	 * 
-	 * @param string $data   Data stream to read from
-	 * @param int    $pos    Position to start reading from
-	 * @param int    $length Record data length
-	 * 
-	 * @return string Record data
-	 */
-	private function _readRecordData($data, $pos, $len)
-	{
-		$data = substr($data, $pos, $len);
-		
-		// File not encrypted, or record before encryption start point
-		if ($this->_encryption == self::MS_BIFF_CRYPTO_NONE || $pos < $this->_encryptionStartPos) {
-			return $data;
-		}
-	
-		$recordData = '';
-		if ($this->_encryption == self::MS_BIFF_CRYPTO_RC4) {
-
-			$oldBlock = floor($this->_rc4Pos / self::REKEY_BLOCK);
-			$block = floor($pos / self::REKEY_BLOCK);
-			$endBlock = floor(($pos + $len) / self::REKEY_BLOCK);
-
-			// Spin an RC4 decryptor to the right spot. If we have a decryptor sitting
-			// at a point earlier in the current block, re-use it as we can save some time.
-			if ($block != $oldBlock || $pos < $this->_rc4Pos || !$this->_rc4Key) {
-				$this->_rc4Key = $this->_makeKey($block, $this->_md5Ctxt);
-				$step = $pos % self::REKEY_BLOCK;
-			} else {
-				$step = $pos - $this->_rc4Pos;
-			}
-			$this->_rc4Key->RC4(str_repeat("\0", $step));
-
-			// Decrypt record data (re-keying at the end of every block)
-			while ($block != $endBlock) {
-				$step = self::REKEY_BLOCK - ($pos % self::REKEY_BLOCK);
-				$recordData .= $this->_rc4Key->RC4(substr($data, 0, $step));
-				$data = substr($data, $step);
-				$pos += $step;
-				$len -= $step;
-				$block++;
-				$this->_rc4Key = $this->_makeKey($block, $this->_md5Ctxt);
-			}
-			$recordData .= $this->_rc4Key->RC4(substr($data, 0, $len));
-
-			// Keep track of the position of this decryptor.
-			// We'll try and re-use it later if we can to speed things up
-			$this->_rc4Pos = $pos + $len;
-			
-		} elseif ($this->_encryption == self::MS_BIFF_CRYPTO_XOR) {
-			throw new PHPExcel_Reader_Exception('XOr encryption not supported');
-		}
-		return $recordData;
-	}
-
-	/**
-	 * Use OLE reader to extract the relevant data streams from the OLE file
-	 *
-	 * @param string $pFilename
-	 */
-	private function _loadOLE($pFilename)
-	{
-		// OLE reader
-		$ole = new PHPExcel_Shared_OLERead();
-
-		// get excel data,
-		$res = $ole->read($pFilename);
-		// Get workbook data: workbook stream + sheet streams
-		$this->_data = $ole->getStream($ole->wrkbook);
-
-		// Get summary information data
-		$this->_summaryInformation = $ole->getStream($ole->summaryInformation);
-
-		// Get additional document summary information data
-		$this->_documentSummaryInformation = $ole->getStream($ole->documentSummaryInformation);
-
-		// Get user-defined property data
-//		$this->_userDefinedProperties = $ole->getUserDefinedProperties();
-	}
-
-
-	/**
-	 * Read summary information
-	 */
-	private function _readSummaryInformation()
-	{
-		if (!isset($this->_summaryInformation)) {
-			return;
-		}
-
-		// offset: 0; size: 2; must be 0xFE 0xFF (UTF-16 LE byte order mark)
-		// offset: 2; size: 2;
-		// offset: 4; size: 2; OS version
-		// offset: 6; size: 2; OS indicator
-		// offset: 8; size: 16
-		// offset: 24; size: 4; section count
-		$secCount = self::_GetInt4d($this->_summaryInformation, 24);
-
-		// offset: 28; size: 16; first section's class id: e0 85 9f f2 f9 4f 68 10 ab 91 08 00 2b 27 b3 d9
-		// offset: 44; size: 4
-		$secOffset = self::_GetInt4d($this->_summaryInformation, 44);
-
-		// section header
-		// offset: $secOffset; size: 4; section length
-		$secLength = self::_GetInt4d($this->_summaryInformation, $secOffset);
-
-		// offset: $secOffset+4; size: 4; property count
-		$countProperties = self::_GetInt4d($this->_summaryInformation, $secOffset+4);
-
-		// initialize code page (used to resolve string values)
-		$codePage = 'CP1252';
-
-		// offset: ($secOffset+8); size: var
-		// loop through property decarations and properties
-		for ($i = 0; $i < $countProperties; ++$i) {
-
-			// offset: ($secOffset+8) + (8 * $i); size: 4; property ID
-			$id = self::_GetInt4d($this->_summaryInformation, ($secOffset+8) + (8 * $i));
-
-			// Use value of property id as appropriate
-			// offset: ($secOffset+12) + (8 * $i); size: 4; offset from beginning of section (48)
-			$offset = self::_GetInt4d($this->_summaryInformation, ($secOffset+12) + (8 * $i));
-
-			$type = self::_GetInt4d($this->_summaryInformation, $secOffset + $offset);
-
-			// initialize property value
-			$value = null;
-
-			// extract property value based on property type
-			switch ($type) {
-				case 0x02: // 2 byte signed integer
-					$value = self::_GetInt2d($this->_summaryInformation, $secOffset + 4 + $offset);
-					break;
-
-				case 0x03: // 4 byte signed integer
-					$value = self::_GetInt4d($this->_summaryInformation, $secOffset + 4 + $offset);
-					break;
-
-				case 0x13: // 4 byte unsigned integer
-					// not needed yet, fix later if necessary
-					break;
-
-				case 0x1E: // null-terminated string prepended by dword string length
-					$byteLength = self::_GetInt4d($this->_summaryInformation, $secOffset + 4 + $offset);
-					$value = substr($this->_summaryInformation, $secOffset + 8 + $offset, $byteLength);
-					$value = PHPExcel_Shared_String::ConvertEncoding($value, 'UTF-8', $codePage);
-					$value = rtrim($value);
-					break;
-
-				case 0x40: // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
-					// PHP-time
-					$value = PHPExcel_Shared_OLE::OLE2LocalDate(substr($this->_summaryInformation, $secOffset + 4 + $offset, 8));
-					break;
-
-				case 0x47: // Clipboard format
-					// not needed yet, fix later if necessary
-					break;
-			}
-
-			switch ($id) {
-				case 0x01:	//	Code Page
-					$codePage = PHPExcel_Shared_CodePage::NumberToName($value);
-					break;
-
-				case 0x02:	//	Title
-					$this->_phpExcel->getProperties()->setTitle($value);
-					break;
-
-				case 0x03:	//	Subject
-					$this->_phpExcel->getProperties()->setSubject($value);
-					break;
-
-				case 0x04:	//	Author (Creator)
-					$this->_phpExcel->getProperties()->setCreator($value);
-					break;
-
-				case 0x05:	//	Keywords
-					$this->_phpExcel->getProperties()->setKeywords($value);
-					break;
-
-				case 0x06:	//	Comments (Description)
-					$this->_phpExcel->getProperties()->setDescription($value);
-					break;
-
-				case 0x07:	//	Template
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x08:	//	Last Saved By (LastModifiedBy)
-					$this->_phpExcel->getProperties()->setLastModifiedBy($value);
-					break;
-
-				case 0x09:	//	Revision
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x0A:	//	Total Editing Time
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x0B:	//	Last Printed
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x0C:	//	Created Date/Time
-					$this->_phpExcel->getProperties()->setCreated($value);
-					break;
-
-				case 0x0D:	//	Modified Date/Time
-					$this->_phpExcel->getProperties()->setModified($value);
-					break;
-
-				case 0x0E:	//	Number of Pages
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x0F:	//	Number of Words
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x10:	//	Number of Characters
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x11:	//	Thumbnail
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x12:	//	Name of creating application
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x13:	//	Security
-					//	Not supported by PHPExcel
-					break;
-
-			}
-		}
-	}
-
-
-	/**
-	 * Read additional document summary information
-	 */
-	private function _readDocumentSummaryInformation()
-	{
-		if (!isset($this->_documentSummaryInformation)) {
-			return;
-		}
-
-		//	offset: 0;	size: 2;	must be 0xFE 0xFF (UTF-16 LE byte order mark)
-		//	offset: 2;	size: 2;
-		//	offset: 4;	size: 2;	OS version
-		//	offset: 6;	size: 2;	OS indicator
-		//	offset: 8;	size: 16
-		//	offset: 24;	size: 4;	section count
-		$secCount = self::_GetInt4d($this->_documentSummaryInformation, 24);
-//		echo '$secCount = ',$secCount,'<br />';
-
-		// offset: 28;	size: 16;	first section's class id: 02 d5 cd d5 9c 2e 1b 10 93 97 08 00 2b 2c f9 ae
-		// offset: 44;	size: 4;	first section offset
-		$secOffset = self::_GetInt4d($this->_documentSummaryInformation, 44);
-//		echo '$secOffset = ',$secOffset,'<br />';
-
-		//	section header
-		//	offset: $secOffset;	size: 4;	section length
-		$secLength = self::_GetInt4d($this->_documentSummaryInformation, $secOffset);
-//		echo '$secLength = ',$secLength,'<br />';
-
-		//	offset: $secOffset+4;	size: 4;	property count
-		$countProperties = self::_GetInt4d($this->_documentSummaryInformation, $secOffset+4);
-//		echo '$countProperties = ',$countProperties,'<br />';
-
-		// initialize code page (used to resolve string values)
-		$codePage = 'CP1252';
-
-		//	offset: ($secOffset+8);	size: var
-		//	loop through property decarations and properties
-		for ($i = 0; $i < $countProperties; ++$i) {
-//			echo 'Property ',$i,'<br />';
-			//	offset: ($secOffset+8) + (8 * $i);	size: 4;	property ID
-			$id = self::_GetInt4d($this->_documentSummaryInformation, ($secOffset+8) + (8 * $i));
-//			echo 'ID is ',$id,'<br />';
-
-			// Use value of property id as appropriate
-			// offset: 60 + 8 * $i;	size: 4;	offset from beginning of section (48)
-			$offset = self::_GetInt4d($this->_documentSummaryInformation, ($secOffset+12) + (8 * $i));
-
-			$type = self::_GetInt4d($this->_documentSummaryInformation, $secOffset + $offset);
-//			echo 'Type is ',$type,', ';
-
-			// initialize property value
-			$value = null;
-
-			// extract property value based on property type
-			switch ($type) {
-				case 0x02:	//	2 byte signed integer
-					$value = self::_GetInt2d($this->_documentSummaryInformation, $secOffset + 4 + $offset);
-					break;
-
-				case 0x03:	//	4 byte signed integer
-					$value = self::_GetInt4d($this->_documentSummaryInformation, $secOffset + 4 + $offset);
-					break;
-
-				case 0x0B:  // Boolean
-					$value = self::_GetInt2d($this->_documentSummaryInformation, $secOffset + 4 + $offset);
-					$value = ($value == 0 ? false : true);
-					break;
-
-				case 0x13:	//	4 byte unsigned integer
-					// not needed yet, fix later if necessary
-					break;
-
-				case 0x1E:	//	null-terminated string prepended by dword string length
-					$byteLength = self::_GetInt4d($this->_documentSummaryInformation, $secOffset + 4 + $offset);
-					$value = substr($this->_documentSummaryInformation, $secOffset + 8 + $offset, $byteLength);
-					$value = PHPExcel_Shared_String::ConvertEncoding($value, 'UTF-8', $codePage);
-					$value = rtrim($value);
-					break;
-
-				case 0x40:	//	Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
-					// PHP-Time
-					$value = PHPExcel_Shared_OLE::OLE2LocalDate(substr($this->_documentSummaryInformation, $secOffset + 4 + $offset, 8));
-					break;
-
-				case 0x47:	//	Clipboard format
-					// not needed yet, fix later if necessary
-					break;
-			}
-
-			switch ($id) {
-				case 0x01:	//	Code Page
-					$codePage = PHPExcel_Shared_CodePage::NumberToName($value);
-					break;
-
-				case 0x02:	//	Category
-					$this->_phpExcel->getProperties()->setCategory($value);
-					break;
-
-				case 0x03:	//	Presentation Target
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x04:	//	Bytes
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x05:	//	Lines
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x06:	//	Paragraphs
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x07:	//	Slides
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x08:	//	Notes
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x09:	//	Hidden Slides
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x0A:	//	MM Clips
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x0B:	//	Scale Crop
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x0C:	//	Heading Pairs
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x0D:	//	Titles of Parts
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x0E:	//	Manager
-					$this->_phpExcel->getProperties()->setManager($value);
-					break;
-
-				case 0x0F:	//	Company
-					$this->_phpExcel->getProperties()->setCompany($value);
-					break;
-
-				case 0x10:	//	Links up-to-date
-					//	Not supported by PHPExcel
-					break;
-
-			}
-		}
-	}
-
-
-	/**
-	 * Reads a general type of BIFF record. Does nothing except for moving stream pointer forward to next record.
-	 */
-	private function _readDefault()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-//		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-	}
-
-
-	/**
-	 *	The NOTE record specifies a comment associated with a particular cell. In Excel 95 (BIFF7) and earlier versions,
-	 *		this record stores a note (cell note). This feature was significantly enhanced in Excel 97.
-	 */
-	private function _readNote()
-	{
-//		echo '<b>Read Cell Annotation</b><br />';
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_readDataOnly) {
-			return;
-		}
-
-		$cellAddress = $this->_readBIFF8CellAddress(substr($recordData, 0, 4));
-		if ($this->_version == self::XLS_BIFF8) {
-			$noteObjID = self::_GetInt2d($recordData, 6);
-			$noteAuthor = self::_readUnicodeStringLong(substr($recordData, 8));
-			$noteAuthor = $noteAuthor['value'];
-//			echo 'Note Address=',$cellAddress,'<br />';
-//			echo 'Note Object ID=',$noteObjID,'<br />';
-//			echo 'Note Author=',$noteAuthor,'<hr />';
-//
-			$this->_cellNotes[$noteObjID] = array('cellRef'		=> $cellAddress,
-												  'objectID'	=> $noteObjID,
-												  'author'		=> $noteAuthor
-												 );
-		} else {
-			$extension = false;
-			if ($cellAddress == '$B$65536') {
-				//	If the address row is -1 and the column is 0, (which translates as $B$65536) then this is a continuation
-				//		note from the previous cell annotation. We're not yet handling this, so annotations longer than the
-				//		max 2048 bytes will probably throw a wobbly.
-				$row = self::_GetInt2d($recordData, 0);
-				$extension = true;
-				$cellAddress = array_pop(array_keys($this->_phpSheet->getComments()));
-			}
-//			echo 'Note Address=',$cellAddress,'<br />';
-
-			$cellAddress = str_replace('$','',$cellAddress);
-			$noteLength = self::_GetInt2d($recordData, 4);
-			$noteText = trim(substr($recordData, 6));
-//			echo 'Note Length=',$noteLength,'<br />';
-//			echo 'Note Text=',$noteText,'<br />';
-
-			if ($extension) {
-				//	Concatenate this extension with the currently set comment for the cell
-				$comment = $this->_phpSheet->getComment( $cellAddress );
-				$commentText = $comment->getText()->getPlainText();
-				$comment->setText($this->_parseRichText($commentText.$noteText) );
-			} else {
-				//	Set comment for the cell
-				$this->_phpSheet->getComment( $cellAddress )
-//													->setAuthor( $author )
-													->setText($this->_parseRichText($noteText) );
-			}
-		}
-
-	}
-
-
-	/**
-	 *	The TEXT Object record contains the text associated with a cell annotation.
-	 */
-	private function _readTextObject()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_readDataOnly) {
-			return;
-		}
-
-		// recordData consists of an array of subrecords looking like this:
-		//	grbit: 2 bytes; Option Flags
-		//	rot: 2 bytes; rotation
-		//	cchText: 2 bytes; length of the text (in the first continue record)
-		//	cbRuns: 2 bytes; length of the formatting (in the second continue record)
-		// followed by the continuation records containing the actual text and formatting
-		$grbitOpts	= self::_GetInt2d($recordData, 0);
-		$rot		= self::_GetInt2d($recordData, 2);
-		$cchText	= self::_GetInt2d($recordData, 10);
-		$cbRuns		= self::_GetInt2d($recordData, 12);
-		$text		= $this->_getSplicedRecordData();
-
-		$this->_textObjects[$this->textObjRef] = array(
-				'text'		=> substr($text["recordData"],$text["spliceOffsets"][0]+1,$cchText),
-				'format'	=> substr($text["recordData"],$text["spliceOffsets"][1],$cbRuns),
-				'alignment'	=> $grbitOpts,
-				'rotation'	=> $rot
-			 );
-
-//		echo '<b>_readTextObject()</b><br />';
-//		var_dump($this->_textObjects[$this->textObjRef]);
-//		echo '<br />';
-	}
-
-
-	/**
-	 * Read BOF
-	 */
-	private function _readBof()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 2; size: 2; type of the following data
-		$substreamType = self::_GetInt2d($recordData, 2);
-
-		switch ($substreamType) {
-			case self::XLS_WorkbookGlobals:
-				$version = self::_GetInt2d($recordData, 0);
-				if (($version != self::XLS_BIFF8) && ($version != self::XLS_BIFF7)) {
-					throw new PHPExcel_Reader_Exception('Cannot read this Excel file. Version is too old.');
-				}
-				$this->_version = $version;
-				break;
-
-			case self::XLS_Worksheet:
-				// do not use this version information for anything
-				// it is unreliable (OpenOffice doc, 5.8), use only version information from the global stream
-				break;
-
-			default:
-				// substream, e.g. chart
-				// just skip the entire substream
-				do {
-					$code = self::_GetInt2d($this->_data, $this->_pos);
-					$this->_readDefault();
-				} while ($code != self::XLS_Type_EOF && $this->_pos < $this->_dataSize);
-				break;
-		}
-	}
-
-
-	/**
-	 * FILEPASS
-	 *
-	 * This record is part of the File Protection Block. It
-	 * contains information about the read/write password of the
-	 * file. All record contents following this record will be
-	 * encrypted.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 * 
-	 * The decryption functions and objects used from here on in
-	 * are based on the source of Spreadsheet-ParseExcel:
-	 * http://search.cpan.org/~jmcnamara/Spreadsheet-ParseExcel/
-	 */
-	private function _readFilepass()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-
-		if ($length != 54) {
-			throw new PHPExcel_Reader_Exception('Unexpected file pass record length');
-		}
-		
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-		
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-		
-		if (!$this->_verifyPassword(
-			'VelvetSweatshop',
-			substr($recordData, 6,  16),
-			substr($recordData, 22, 16),
-			substr($recordData, 38, 16),
-			$this->_md5Ctxt
-		)) {
-			throw new PHPExcel_Reader_Exception('Decryption password incorrect');
-		}
-		
-		$this->_encryption = self::MS_BIFF_CRYPTO_RC4;
-
-		// Decryption required from the record after next onwards
-		$this->_encryptionStartPos = $this->_pos + self::_GetInt2d($this->_data, $this->_pos + 2);
-	}
-
-	/**
-	 * Make an RC4 decryptor for the given block
-	 * 
-	 * @var int    $block      Block for which to create decrypto
-	 * @var string $valContext MD5 context state
-	 * 
-	 * @return PHPExcel_Reader_Excel5_RC4
-	 */
-	private function _makeKey($block, $valContext)
-	{
-		$pwarray = str_repeat("\0", 64);
-
-		for ($i = 0; $i < 5; $i++) {
-			$pwarray[$i] = $valContext[$i];
-		}
-		
-		$pwarray[5] = chr($block & 0xff);
-		$pwarray[6] = chr(($block >> 8) & 0xff);
-		$pwarray[7] = chr(($block >> 16) & 0xff);
-		$pwarray[8] = chr(($block >> 24) & 0xff);
-
-		$pwarray[9] = "\x80";
-		$pwarray[56] = "\x48";
-
-		$md5 = new PHPExcel_Reader_Excel5_MD5();
-		$md5->add($pwarray);
-
-		$s = $md5->getContext();
-		return new PHPExcel_Reader_Excel5_RC4($s);
-	}
-
-	/**
-	 * Verify RC4 file password
-	 * 
-	 * @var string $password        Password to check
-	 * @var string $docid           Document id
-	 * @var string $salt_data       Salt data
-	 * @var string $hashedsalt_data Hashed salt data
-	 * @var string &$valContext     Set to the MD5 context of the value
-	 * 
-	 * @return bool Success
-	 */
-	private function _verifyPassword($password, $docid, $salt_data, $hashedsalt_data, &$valContext)
-	{
-		$pwarray = str_repeat("\0", 64);
-
-		for ($i = 0; $i < strlen($password); $i++) {
-			$o = ord(substr($password, $i, 1));
-			$pwarray[2 * $i] = chr($o & 0xff);
-			$pwarray[2 * $i + 1] = chr(($o >> 8) & 0xff);
-		}
-		$pwarray[2 * $i] = chr(0x80);
-		$pwarray[56] = chr(($i << 4) & 0xff);
-
-		$md5 = new PHPExcel_Reader_Excel5_MD5();
-		$md5->add($pwarray);
-
-		$mdContext1 = $md5->getContext();
-
-		$offset = 0;
-		$keyoffset = 0;
-		$tocopy = 5;
-
-		$md5->reset();
-
-		while ($offset != 16) {
-			if ((64 - $offset) < 5) {
-				$tocopy = 64 - $offset;
-			}
-			
-			for ($i = 0; $i <= $tocopy; $i++) {
-				$pwarray[$offset + $i] = $mdContext1[$keyoffset + $i];
-			}
-
-			$offset += $tocopy;
-
-			if ($offset == 64) {
-				$md5->add($pwarray);
-				$keyoffset = $tocopy;
-				$tocopy = 5 - $tocopy;
-				$offset = 0;
-				continue;
-			}
-
-			$keyoffset = 0;
-			$tocopy = 5;
-			for ($i = 0; $i < 16; $i++) {
-				$pwarray[$offset + $i] = $docid[$i];
-			}
-			$offset += 16;
-		}
-
-		$pwarray[16] = "\x80";
-		for ($i = 0; $i < 47; $i++) {
-			$pwarray[17 + $i] = "\0";
-		}
-		$pwarray[56] = "\x80";
-		$pwarray[57] = "\x0a";
-
-		$md5->add($pwarray);
-		$valContext = $md5->getContext();
-
-		$key = $this->_makeKey(0, $valContext);
-
-		$salt = $key->RC4($salt_data);
-		$hashedsalt = $key->RC4($hashedsalt_data);
-		
-		$salt .= "\x80" . str_repeat("\0", 47);
-		$salt[56] = "\x80";
-
-		$md5->reset();
-		$md5->add($salt);
-		$mdContext2 = $md5->getContext();
-
-		return $mdContext2 == $hashedsalt;
-	}
-
-	/**
-	 * CODEPAGE
-	 *
-	 * This record stores the text encoding used to write byte
-	 * strings, stored as MS Windows code page identifier.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readCodepage()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; code page identifier
-		$codepage = self::_GetInt2d($recordData, 0);
-
-		$this->_codepage = PHPExcel_Shared_CodePage::NumberToName($codepage);
-	}
-
-
-	/**
-	 * DATEMODE
-	 *
-	 * This record specifies the base date for displaying date
-	 * values. All dates are stored as count of days past this
-	 * base date. In BIFF2-BIFF4 this record is part of the
-	 * Calculation Settings Block. In BIFF5-BIFF8 it is
-	 * stored in the Workbook Globals Substream.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readDateMode()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; 0 = base 1900, 1 = base 1904
-		PHPExcel_Shared_Date::setExcelCalendar(PHPExcel_Shared_Date::CALENDAR_WINDOWS_1900);
-		if (ord($recordData{0}) == 1) {
-			PHPExcel_Shared_Date::setExcelCalendar(PHPExcel_Shared_Date::CALENDAR_MAC_1904);
-		}
-	}
-
-
-	/**
-	 * Read a FONT record
-	 */
-	private function _readFont()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			$objFont = new PHPExcel_Style_Font();
-
-			// offset: 0; size: 2; height of the font (in twips = 1/20 of a point)
-			$size = self::_GetInt2d($recordData, 0);
-			$objFont->setSize($size / 20);
-
-			// offset: 2; size: 2; option flags
-				// bit: 0; mask 0x0001; bold (redundant in BIFF5-BIFF8)
-				// bit: 1; mask 0x0002; italic
-				$isItalic = (0x0002 & self::_GetInt2d($recordData, 2)) >> 1;
-				if ($isItalic) $objFont->setItalic(true);
-
-				// bit: 2; mask 0x0004; underlined (redundant in BIFF5-BIFF8)
-				// bit: 3; mask 0x0008; strike
-				$isStrike = (0x0008 & self::_GetInt2d($recordData, 2)) >> 3;
-				if ($isStrike) $objFont->setStrikethrough(true);
-
-			// offset: 4; size: 2; colour index
-			$colorIndex = self::_GetInt2d($recordData, 4);
-			$objFont->colorIndex = $colorIndex;
-
-			// offset: 6; size: 2; font weight
-			$weight = self::_GetInt2d($recordData, 6);
-			switch ($weight) {
-				case 0x02BC:
-					$objFont->setBold(true);
-					break;
-			}
-
-			// offset: 8; size: 2; escapement type
-			$escapement = self::_GetInt2d($recordData, 8);
-			switch ($escapement) {
-				case 0x0001:
-					$objFont->setSuperScript(true);
-					break;
-				case 0x0002:
-					$objFont->setSubScript(true);
-					break;
-			}
-
-			// offset: 10; size: 1; underline type
-			$underlineType = ord($recordData{10});
-			switch ($underlineType) {
-				case 0x00:
-					break; // no underline
-				case 0x01:
-					$objFont->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE);
-					break;
-				case 0x02:
-					$objFont->setUnderline(PHPExcel_Style_Font::UNDERLINE_DOUBLE);
-					break;
-				case 0x21:
-					$objFont->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLEACCOUNTING);
-					break;
-				case 0x22:
-					$objFont->setUnderline(PHPExcel_Style_Font::UNDERLINE_DOUBLEACCOUNTING);
-					break;
-			}
-
-			// offset: 11; size: 1; font family
-			// offset: 12; size: 1; character set
-			// offset: 13; size: 1; not used
-			// offset: 14; size: var; font name
-			if ($this->_version == self::XLS_BIFF8) {
-				$string = self::_readUnicodeStringShort(substr($recordData, 14));
-			} else {
-				$string = $this->_readByteStringShort(substr($recordData, 14));
-			}
-			$objFont->setName($string['value']);
-
-			$this->_objFonts[] = $objFont;
-		}
-	}
-
-
-	/**
-	 * FORMAT
-	 *
-	 * This record contains information about a number format.
-	 * All FORMAT records occur together in a sequential list.
-	 *
-	 * In BIFF2-BIFF4 other records referencing a FORMAT record
-	 * contain a zero-based index into this list. From BIFF5 on
-	 * the FORMAT record contains the index itself that will be
-	 * used by other records.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readFormat()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			$indexCode = self::_GetInt2d($recordData, 0);
-
-			if ($this->_version == self::XLS_BIFF8) {
-				$string = self::_readUnicodeStringLong(substr($recordData, 2));
-			} else {
-				// BIFF7
-				$string = $this->_readByteStringShort(substr($recordData, 2));
-			}
-
-			$formatString = $string['value'];
-			$this->_formats[$indexCode] = $formatString;
-		}
-	}
-
-
-	/**
-	 * XF - Extended Format
-	 *
-	 * This record contains formatting information for cells, rows, columns or styles.
-	 * According to http://support.microsoft.com/kb/147732 there are always at least 15 cell style XF
-	 * and 1 cell XF.
-	 * Inspection of Excel files generated by MS Office Excel shows that XF records 0-14 are cell style XF
-	 * and XF record 15 is a cell XF
-	 * We only read the first cell style XF and skip the remaining cell style XF records
-	 * We read all cell XF records.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readXf()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		$objStyle = new PHPExcel_Style();
-
-		if (!$this->_readDataOnly) {
-			// offset:  0; size: 2; Index to FONT record
-			if (self::_GetInt2d($recordData, 0) < 4) {
-				$fontIndex = self::_GetInt2d($recordData, 0);
-			} else {
-				// this has to do with that index 4 is omitted in all BIFF versions for some strange reason
-				// check the OpenOffice documentation of the FONT record
-				$fontIndex = self::_GetInt2d($recordData, 0) - 1;
-			}
-			$objStyle->setFont($this->_objFonts[$fontIndex]);
-
-			// offset:  2; size: 2; Index to FORMAT record
-			$numberFormatIndex = self::_GetInt2d($recordData, 2);
-			if (isset($this->_formats[$numberFormatIndex])) {
-				// then we have user-defined format code
-				$numberformat = array('code' => $this->_formats[$numberFormatIndex]);
-			} elseif (($code = PHPExcel_Style_NumberFormat::builtInFormatCode($numberFormatIndex)) !== '') {
-				// then we have built-in format code
-				$numberformat = array('code' => $code);
-			} else {
-				// we set the general format code
-				$numberformat = array('code' => 'General');
-			}
-			$objStyle->getNumberFormat()->setFormatCode($numberformat['code']);
-
-			// offset:  4; size: 2; XF type, cell protection, and parent style XF
-			// bit 2-0; mask 0x0007; XF_TYPE_PROT
-			$xfTypeProt = self::_GetInt2d($recordData, 4);
-			// bit 0; mask 0x01; 1 = cell is locked
-			$isLocked = (0x01 & $xfTypeProt) >> 0;
-			$objStyle->getProtection()->setLocked($isLocked ?
-				PHPExcel_Style_Protection::PROTECTION_INHERIT : PHPExcel_Style_Protection::PROTECTION_UNPROTECTED);
-
-			// bit 1; mask 0x02; 1 = Formula is hidden
-			$isHidden = (0x02 & $xfTypeProt) >> 1;
-			$objStyle->getProtection()->setHidden($isHidden ?
-				PHPExcel_Style_Protection::PROTECTION_PROTECTED : PHPExcel_Style_Protection::PROTECTION_UNPROTECTED);
-
-			// bit 2; mask 0x04; 0 = Cell XF, 1 = Cell Style XF
-			$isCellStyleXf = (0x04 & $xfTypeProt) >> 2;
-
-			// offset:  6; size: 1; Alignment and text break
-			// bit 2-0, mask 0x07; horizontal alignment
-			$horAlign = (0x07 & ord($recordData{6})) >> 0;
-			switch ($horAlign) {
-				case 0:
-					$objStyle->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_GENERAL);
-					break;
-				case 1:
-					$objStyle->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
-					break;
-				case 2:
-					$objStyle->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
-					break;
-				case 3:
-					$objStyle->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_RIGHT);
-					break;
-				case 4:
-					$objStyle->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_FILL);
-					break;
-				case 5:
-					$objStyle->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY);
-					break;
-				case 6:
-					$objStyle->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS);
-					break;
-			}
-			// bit 3, mask 0x08; wrap text
-			$wrapText = (0x08 & ord($recordData{6})) >> 3;
-			switch ($wrapText) {
-				case 0:
-					$objStyle->getAlignment()->setWrapText(false);
-					break;
-				case 1:
-					$objStyle->getAlignment()->setWrapText(true);
-					break;
-			}
-			// bit 6-4, mask 0x70; vertical alignment
-			$vertAlign = (0x70 & ord($recordData{6})) >> 4;
-			switch ($vertAlign) {
-				case 0:
-					$objStyle->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_TOP);
-					break;
-				case 1:
-					$objStyle->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_CENTER);
-					break;
-				case 2:
-					$objStyle->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_BOTTOM);
-					break;
-				case 3:
-					$objStyle->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_JUSTIFY);
-					break;
-			}
-
-			if ($this->_version == self::XLS_BIFF8) {
-				// offset:  7; size: 1; XF_ROTATION: Text rotation angle
-					$angle = ord($recordData{7});
-					$rotation = 0;
-					if ($angle <= 90) {
-						$rotation = $angle;
-					} else if ($angle <= 180) {
-						$rotation = 90 - $angle;
-					} else if ($angle == 255) {
-						$rotation = -165;
-					}
-					$objStyle->getAlignment()->setTextRotation($rotation);
-
-				// offset:  8; size: 1; Indentation, shrink to cell size, and text direction
-					// bit: 3-0; mask: 0x0F; indent level
-					$indent = (0x0F & ord($recordData{8})) >> 0;
-					$objStyle->getAlignment()->setIndent($indent);
-
-					// bit: 4; mask: 0x10; 1 = shrink content to fit into cell
-					$shrinkToFit = (0x10 & ord($recordData{8})) >> 4;
-					switch ($shrinkToFit) {
-						case 0:
-							$objStyle->getAlignment()->setShrinkToFit(false);
-							break;
-						case 1:
-							$objStyle->getAlignment()->setShrinkToFit(true);
-							break;
-					}
-
-				// offset:  9; size: 1; Flags used for attribute groups
-
-				// offset: 10; size: 4; Cell border lines and background area
-					// bit: 3-0; mask: 0x0000000F; left style
-					if ($bordersLeftStyle = self::_mapBorderStyle((0x0000000F & self::_GetInt4d($recordData, 10)) >> 0)) {
-						$objStyle->getBorders()->getLeft()->setBorderStyle($bordersLeftStyle);
-					}
-					// bit: 7-4; mask: 0x000000F0; right style
-					if ($bordersRightStyle = self::_mapBorderStyle((0x000000F0 & self::_GetInt4d($recordData, 10)) >> 4)) {
-						$objStyle->getBorders()->getRight()->setBorderStyle($bordersRightStyle);
-					}
-					// bit: 11-8; mask: 0x00000F00; top style
-					if ($bordersTopStyle = self::_mapBorderStyle((0x00000F00 & self::_GetInt4d($recordData, 10)) >> 8)) {
-						$objStyle->getBorders()->getTop()->setBorderStyle($bordersTopStyle);
-					}
-					// bit: 15-12; mask: 0x0000F000; bottom style
-					if ($bordersBottomStyle = self::_mapBorderStyle((0x0000F000 & self::_GetInt4d($recordData, 10)) >> 12)) {
-						$objStyle->getBorders()->getBottom()->setBorderStyle($bordersBottomStyle);
-					}
-					// bit: 22-16; mask: 0x007F0000; left color
-					$objStyle->getBorders()->getLeft()->colorIndex = (0x007F0000 & self::_GetInt4d($recordData, 10)) >> 16;
-
-					// bit: 29-23; mask: 0x3F800000; right color
-					$objStyle->getBorders()->getRight()->colorIndex = (0x3F800000 & self::_GetInt4d($recordData, 10)) >> 23;
-
-					// bit: 30; mask: 0x40000000; 1 = diagonal line from top left to right bottom
-					$diagonalDown = (0x40000000 & self::_GetInt4d($recordData, 10)) >> 30 ?
-						true : false;
-
-					// bit: 31; mask: 0x80000000; 1 = diagonal line from bottom left to top right
-					$diagonalUp = (0x80000000 & self::_GetInt4d($recordData, 10)) >> 31 ?
-						true : false;
-
-					if ($diagonalUp == false && $diagonalDown == false) {
-						$objStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_NONE);
-					} elseif ($diagonalUp == true && $diagonalDown == false) {
-						$objStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_UP);
-					} elseif ($diagonalUp == false && $diagonalDown == true) {
-						$objStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_DOWN);
-					} elseif ($diagonalUp == true && $diagonalDown == true) {
-						$objStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_BOTH);
-					}
-
-				// offset: 14; size: 4;
-					// bit: 6-0; mask: 0x0000007F; top color
-					$objStyle->getBorders()->getTop()->colorIndex = (0x0000007F & self::_GetInt4d($recordData, 14)) >> 0;
-
-					// bit: 13-7; mask: 0x00003F80; bottom color
-					$objStyle->getBorders()->getBottom()->colorIndex = (0x00003F80 & self::_GetInt4d($recordData, 14)) >> 7;
-
-					// bit: 20-14; mask: 0x001FC000; diagonal color
-					$objStyle->getBorders()->getDiagonal()->colorIndex = (0x001FC000 & self::_GetInt4d($recordData, 14)) >> 14;
-
-					// bit: 24-21; mask: 0x01E00000; diagonal style
-					if ($bordersDiagonalStyle = self::_mapBorderStyle((0x01E00000 & self::_GetInt4d($recordData, 14)) >> 21)) {
-						$objStyle->getBorders()->getDiagonal()->setBorderStyle($bordersDiagonalStyle);
-					}
-
-					// bit: 31-26; mask: 0xFC000000 fill pattern
-					if ($fillType = self::_mapFillPattern((0xFC000000 & self::_GetInt4d($recordData, 14)) >> 26)) {
-						$objStyle->getFill()->setFillType($fillType);
-					}
-				// offset: 18; size: 2; pattern and background colour
-					// bit: 6-0; mask: 0x007F; color index for pattern color
-					$objStyle->getFill()->startcolorIndex = (0x007F & self::_GetInt2d($recordData, 18)) >> 0;
-
-					// bit: 13-7; mask: 0x3F80; color index for pattern background
-					$objStyle->getFill()->endcolorIndex = (0x3F80 & self::_GetInt2d($recordData, 18)) >> 7;
-			} else {
-				// BIFF5
-
-				// offset: 7; size: 1; Text orientation and flags
-				$orientationAndFlags = ord($recordData{7});
-
-				// bit: 1-0; mask: 0x03; XF_ORIENTATION: Text orientation
-				$xfOrientation = (0x03 & $orientationAndFlags) >> 0;
-				switch ($xfOrientation) {
-					case 0:
-						$objStyle->getAlignment()->setTextRotation(0);
-						break;
-					case 1:
-						$objStyle->getAlignment()->setTextRotation(-165);
-						break;
-					case 2:
-						$objStyle->getAlignment()->setTextRotation(90);
-						break;
-					case 3:
-						$objStyle->getAlignment()->setTextRotation(-90);
-						break;
-				}
-
-				// offset: 8; size: 4; cell border lines and background area
-				$borderAndBackground = self::_GetInt4d($recordData, 8);
-
-				// bit: 6-0; mask: 0x0000007F; color index for pattern color
-				$objStyle->getFill()->startcolorIndex = (0x0000007F & $borderAndBackground) >> 0;
-
-				// bit: 13-7; mask: 0x00003F80; color index for pattern background
-				$objStyle->getFill()->endcolorIndex = (0x00003F80 & $borderAndBackground) >> 7;
-
-				// bit: 21-16; mask: 0x003F0000; fill pattern
-				$objStyle->getFill()->setFillType(self::_mapFillPattern((0x003F0000 & $borderAndBackground) >> 16));
-
-				// bit: 24-22; mask: 0x01C00000; bottom line style
-				$objStyle->getBorders()->getBottom()->setBorderStyle(self::_mapBorderStyle((0x01C00000 & $borderAndBackground) >> 22));
-
-				// bit: 31-25; mask: 0xFE000000; bottom line color
-				$objStyle->getBorders()->getBottom()->colorIndex = (0xFE000000 & $borderAndBackground) >> 25;
-
-				// offset: 12; size: 4; cell border lines
-				$borderLines = self::_GetInt4d($recordData, 12);
-
-				// bit: 2-0; mask: 0x00000007; top line style
-				$objStyle->getBorders()->getTop()->setBorderStyle(self::_mapBorderStyle((0x00000007 & $borderLines) >> 0));
-
-				// bit: 5-3; mask: 0x00000038; left line style
-				$objStyle->getBorders()->getLeft()->setBorderStyle(self::_mapBorderStyle((0x00000038 & $borderLines) >> 3));
-
-				// bit: 8-6; mask: 0x000001C0; right line style
-				$objStyle->getBorders()->getRight()->setBorderStyle(self::_mapBorderStyle((0x000001C0 & $borderLines) >> 6));
-
-				// bit: 15-9; mask: 0x0000FE00; top line color index
-				$objStyle->getBorders()->getTop()->colorIndex = (0x0000FE00 & $borderLines) >> 9;
-
-				// bit: 22-16; mask: 0x007F0000; left line color index
-				$objStyle->getBorders()->getLeft()->colorIndex = (0x007F0000 & $borderLines) >> 16;
-
-				// bit: 29-23; mask: 0x3F800000; right line color index
-				$objStyle->getBorders()->getRight()->colorIndex = (0x3F800000 & $borderLines) >> 23;
-			}
-
-			// add cellStyleXf or cellXf and update mapping
-			if ($isCellStyleXf) {
-				// we only read one style XF record which is always the first
-				if ($this->_xfIndex == 0) {
-					$this->_phpExcel->addCellStyleXf($objStyle);
-					$this->_mapCellStyleXfIndex[$this->_xfIndex] = 0;
-				}
-			} else {
-				// we read all cell XF records
-				$this->_phpExcel->addCellXf($objStyle);
-				$this->_mapCellXfIndex[$this->_xfIndex] = count($this->_phpExcel->getCellXfCollection()) - 1;
-			}
-
-			// update XF index for when we read next record
-			++$this->_xfIndex;
-		}
-	}
-
-
-	/**
-	 *
-	 */
-	private function _readXfExt()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 2; 0x087D = repeated header
-
-			// offset: 2; size: 2
-
-			// offset: 4; size: 8; not used
-
-			// offset: 12; size: 2; record version
-
-			// offset: 14; size: 2; index to XF record which this record modifies
-			$ixfe = self::_GetInt2d($recordData, 14);
-
-			// offset: 16; size: 2; not used
-
-			// offset: 18; size: 2; number of extension properties that follow
-			$cexts = self::_GetInt2d($recordData, 18);
-
-			// start reading the actual extension data
-			$offset = 20;
-			while ($offset < $length) {
-				// extension type
-				$extType = self::_GetInt2d($recordData, $offset);
-
-				// extension length
-				$cb = self::_GetInt2d($recordData, $offset + 2);
-
-				// extension data
-				$extData = substr($recordData, $offset + 4, $cb);
-
-				switch ($extType) {
-					case 4:		// fill start color
-						$xclfType  = self::_GetInt2d($extData, 0); // color type
-						$xclrValue = substr($extData, 4, 4); // color value (value based on color type)
-
-						if ($xclfType == 2) {
-							$rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
-
-							// modify the relevant style property
-							if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
-								$fill = $this->_phpExcel->getCellXfByIndex($this->_mapCellXfIndex[$ixfe])->getFill();
-								$fill->getStartColor()->setRGB($rgb);
-								unset($fill->startcolorIndex); // normal color index does not apply, discard
-							}
-						}
-						break;
-
-					case 5:		// fill end color
-						$xclfType  = self::_GetInt2d($extData, 0); // color type
-						$xclrValue = substr($extData, 4, 4); // color value (value based on color type)
-
-						if ($xclfType == 2) {
-							$rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
-
-							// modify the relevant style property
-							if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
-								$fill = $this->_phpExcel->getCellXfByIndex($this->_mapCellXfIndex[$ixfe])->getFill();
-								$fill->getEndColor()->setRGB($rgb);
-								unset($fill->endcolorIndex); // normal color index does not apply, discard
-							}
-						}
-						break;
-
-					case 7:		// border color top
-						$xclfType  = self::_GetInt2d($extData, 0); // color type
-						$xclrValue = substr($extData, 4, 4); // color value (value based on color type)
-
-						if ($xclfType == 2) {
-							$rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
-
-							// modify the relevant style property
-							if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
-								$top = $this->_phpExcel->getCellXfByIndex($this->_mapCellXfIndex[$ixfe])->getBorders()->getTop();
-								$top->getColor()->setRGB($rgb);
-								unset($top->colorIndex); // normal color index does not apply, discard
-							}
-						}
-						break;
-
-					case 8:		// border color bottom
-						$xclfType  = self::_GetInt2d($extData, 0); // color type
-						$xclrValue = substr($extData, 4, 4); // color value (value based on color type)
-
-						if ($xclfType == 2) {
-							$rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
-
-							// modify the relevant style property
-							if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
-								$bottom = $this->_phpExcel->getCellXfByIndex($this->_mapCellXfIndex[$ixfe])->getBorders()->getBottom();
-								$bottom->getColor()->setRGB($rgb);
-								unset($bottom->colorIndex); // normal color index does not apply, discard
-							}
-						}
-						break;
-
-					case 9:		// border color left
-						$xclfType  = self::_GetInt2d($extData, 0); // color type
-						$xclrValue = substr($extData, 4, 4); // color value (value based on color type)
-
-						if ($xclfType == 2) {
-							$rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
-
-							// modify the relevant style property
-							if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
-								$left = $this->_phpExcel->getCellXfByIndex($this->_mapCellXfIndex[$ixfe])->getBorders()->getLeft();
-								$left->getColor()->setRGB($rgb);
-								unset($left->colorIndex); // normal color index does not apply, discard
-							}
-						}
-						break;
-
-					case 10:		// border color right
-						$xclfType  = self::_GetInt2d($extData, 0); // color type
-						$xclrValue = substr($extData, 4, 4); // color value (value based on color type)
-
-						if ($xclfType == 2) {
-							$rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
-
-							// modify the relevant style property
-							if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
-								$right = $this->_phpExcel->getCellXfByIndex($this->_mapCellXfIndex[$ixfe])->getBorders()->getRight();
-								$right->getColor()->setRGB($rgb);
-								unset($right->colorIndex); // normal color index does not apply, discard
-							}
-						}
-						break;
-
-					case 11:		// border color diagonal
-						$xclfType  = self::_GetInt2d($extData, 0); // color type
-						$xclrValue = substr($extData, 4, 4); // color value (value based on color type)
-
-						if ($xclfType == 2) {
-							$rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
-
-							// modify the relevant style property
-							if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
-								$diagonal = $this->_phpExcel->getCellXfByIndex($this->_mapCellXfIndex[$ixfe])->getBorders()->getDiagonal();
-								$diagonal->getColor()->setRGB($rgb);
-								unset($diagonal->colorIndex); // normal color index does not apply, discard
-							}
-						}
-						break;
-
-					case 13:	// font color
-						$xclfType  = self::_GetInt2d($extData, 0); // color type
-						$xclrValue = substr($extData, 4, 4); // color value (value based on color type)
-
-						if ($xclfType == 2) {
-							$rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
-
-							// modify the relevant style property
-							if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
-								$font = $this->_phpExcel->getCellXfByIndex($this->_mapCellXfIndex[$ixfe])->getFont();
-								$font->getColor()->setRGB($rgb);
-								unset($font->colorIndex); // normal color index does not apply, discard
-							}
-						}
-						break;
-				}
-
-				$offset += $cb;
-			}
-		}
-
-	}
-
-
-	/**
-	 * Read STYLE record
-	 */
-	private function _readStyle()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 2; index to XF record and flag for built-in style
-			$ixfe = self::_GetInt2d($recordData, 0);
-
-			// bit: 11-0; mask 0x0FFF; index to XF record
-			$xfIndex = (0x0FFF & $ixfe) >> 0;
-
-			// bit: 15; mask 0x8000; 0 = user-defined style, 1 = built-in style
-			$isBuiltIn = (bool) ((0x8000 & $ixfe) >> 15);
-
-			if ($isBuiltIn) {
-				// offset: 2; size: 1; identifier for built-in style
-				$builtInId = ord($recordData{2});
-
-				switch ($builtInId) {
-				case 0x00:
-					// currently, we are not using this for anything
-					break;
-
-				default:
-					break;
-				}
-
-			} else {
-				// user-defined; not supported by PHPExcel
-			}
-		}
-	}
-
-
-	/**
-	 * Read PALETTE record
-	 */
-	private function _readPalette()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 2; number of following colors
-			$nm = self::_GetInt2d($recordData, 0);
-
-			// list of RGB colors
-			for ($i = 0; $i < $nm; ++$i) {
-				$rgb = substr($recordData, 2 + 4 * $i, 4);
-				$this->_palette[] = self::_readRGB($rgb);
-			}
-		}
-	}
-
-
-	/**
-	 * SHEET
-	 *
-	 * This record is  located in the  Workbook Globals
-	 * Substream  and represents a sheet inside the workbook.
-	 * One SHEET record is written for each sheet. It stores the
-	 * sheet name and a stream offset to the BOF record of the
-	 * respective Sheet Substream within the Workbook Stream.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readSheet()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// offset: 0; size: 4; absolute stream position of the BOF record of the sheet
-		// NOTE: not encrypted
-		$rec_offset = self::_GetInt4d($this->_data, $this->_pos + 4);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 4; size: 1; sheet state
-		switch (ord($recordData{4})) {
-			case 0x00: $sheetState = PHPExcel_Worksheet::SHEETSTATE_VISIBLE;    break;
-			case 0x01: $sheetState = PHPExcel_Worksheet::SHEETSTATE_HIDDEN;     break;
-			case 0x02: $sheetState = PHPExcel_Worksheet::SHEETSTATE_VERYHIDDEN; break;
-			default: $sheetState = PHPExcel_Worksheet::SHEETSTATE_VISIBLE;      break;
-		}
-
-		// offset: 5; size: 1; sheet type
-		$sheetType = ord($recordData{5});
-
-		// offset: 6; size: var; sheet name
-		if ($this->_version == self::XLS_BIFF8) {
-			$string = self::_readUnicodeStringShort(substr($recordData, 6));
-			$rec_name = $string['value'];
-		} elseif ($this->_version == self::XLS_BIFF7) {
-			$string = $this->_readByteStringShort(substr($recordData, 6));
-			$rec_name = $string['value'];
-		}
-
-		$this->_sheets[] = array(
-			'name' => $rec_name,
-			'offset' => $rec_offset,
-			'sheetState' => $sheetState,
-			'sheetType' => $sheetType,
-		);
-	}
-
-
-	/**
-	 * Read EXTERNALBOOK record
-	 */
-	private function _readExternalBook()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset within record data
-		$offset = 0;
-
-		// there are 4 types of records
-		if (strlen($recordData) > 4) {
-			// external reference
-			// offset: 0; size: 2; number of sheet names ($nm)
-			$nm = self::_GetInt2d($recordData, 0);
-			$offset += 2;
-
-			// offset: 2; size: var; encoded URL without sheet name (Unicode string, 16-bit length)
-			$encodedUrlString = self::_readUnicodeStringLong(substr($recordData, 2));
-			$offset += $encodedUrlString['size'];
-
-			// offset: var; size: var; list of $nm sheet names (Unicode strings, 16-bit length)
-			$externalSheetNames = array();
-			for ($i = 0; $i < $nm; ++$i) {
-				$externalSheetNameString = self::_readUnicodeStringLong(substr($recordData, $offset));
-				$externalSheetNames[] = $externalSheetNameString['value'];
-				$offset += $externalSheetNameString['size'];
-			}
-
-			// store the record data
-			$this->_externalBooks[] = array(
-				'type' => 'external',
-				'encodedUrl' => $encodedUrlString['value'],
-				'externalSheetNames' => $externalSheetNames,
-			);
-
-		} elseif (substr($recordData, 2, 2) == pack('CC', 0x01, 0x04)) {
-			// internal reference
-			// offset: 0; size: 2; number of sheet in this document
-			// offset: 2; size: 2; 0x01 0x04
-			$this->_externalBooks[] = array(
-				'type' => 'internal',
-			);
-		} elseif (substr($recordData, 0, 4) == pack('vCC', 0x0001, 0x01, 0x3A)) {
-			// add-in function
-			// offset: 0; size: 2; 0x0001
-			$this->_externalBooks[] = array(
-				'type' => 'addInFunction',
-			);
-		} elseif (substr($recordData, 0, 2) == pack('v', 0x0000)) {
-			// DDE links, OLE links
-			// offset: 0; size: 2; 0x0000
-			// offset: 2; size: var; encoded source document name
-			$this->_externalBooks[] = array(
-				'type' => 'DDEorOLE',
-			);
-		}
-	}
-
-
-	/**
-	 * Read EXTERNNAME record.
-	 */
-	private function _readExternName()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// external sheet references provided for named cells
-		if ($this->_version == self::XLS_BIFF8) {
-			// offset: 0; size: 2; options
-			$options = self::_GetInt2d($recordData, 0);
-
-			// offset: 2; size: 2;
-
-			// offset: 4; size: 2; not used
-
-			// offset: 6; size: var
-			$nameString = self::_readUnicodeStringShort(substr($recordData, 6));
-
-			// offset: var; size: var; formula data
-			$offset = 6 + $nameString['size'];
-			$formula = $this->_getFormulaFromStructure(substr($recordData, $offset));
-
-			$this->_externalNames[] = array(
-				'name' => $nameString['value'],
-				'formula' => $formula,
-			);
-		}
-	}
-
-
-	/**
-	 * Read EXTERNSHEET record
-	 */
-	private function _readExternSheet()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// external sheet references provided for named cells
-		if ($this->_version == self::XLS_BIFF8) {
-			// offset: 0; size: 2; number of following ref structures
-			$nm = self::_GetInt2d($recordData, 0);
-			for ($i = 0; $i < $nm; ++$i) {
-				$this->_ref[] = array(
-					// offset: 2 + 6 * $i; index to EXTERNALBOOK record
-					'externalBookIndex' => self::_GetInt2d($recordData, 2 + 6 * $i),
-					// offset: 4 + 6 * $i; index to first sheet in EXTERNALBOOK record
-					'firstSheetIndex' => self::_GetInt2d($recordData, 4 + 6 * $i),
-					// offset: 6 + 6 * $i; index to last sheet in EXTERNALBOOK record
-					'lastSheetIndex' => self::_GetInt2d($recordData, 6 + 6 * $i),
-				);
-			}
-		}
-	}
-
-
-	/**
-	 * DEFINEDNAME
-	 *
-	 * This record is part of a Link Table. It contains the name
-	 * and the token array of an internal defined name. Token
-	 * arrays of defined names contain tokens with aberrant
-	 * token classes.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readDefinedName()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_version == self::XLS_BIFF8) {
-			// retrieves named cells
-
-			// offset: 0; size: 2; option flags
-			$opts = self::_GetInt2d($recordData, 0);
-
-				// bit: 5; mask: 0x0020; 0 = user-defined name, 1 = built-in-name
-				$isBuiltInName = (0x0020 & $opts) >> 5;
-
-			// offset: 2; size: 1; keyboard shortcut
-
-			// offset: 3; size: 1; length of the name (character count)
-			$nlen = ord($recordData{3});
-
-			// offset: 4; size: 2; size of the formula data (it can happen that this is zero)
-			// note: there can also be additional data, this is not included in $flen
-			$flen = self::_GetInt2d($recordData, 4);
-
-			// offset: 8; size: 2; 0=Global name, otherwise index to sheet (1-based)
-			$scope = self::_GetInt2d($recordData, 8);
-
-			// offset: 14; size: var; Name (Unicode string without length field)
-			$string = self::_readUnicodeString(substr($recordData, 14), $nlen);
-
-			// offset: var; size: $flen; formula data
-			$offset = 14 + $string['size'];
-			$formulaStructure = pack('v', $flen) . substr($recordData, $offset);
-
-			try {
-				$formula = $this->_getFormulaFromStructure($formulaStructure);
-			} catch (PHPExcel_Exception $e) {
-				$formula = '';
-			}
-
-			$this->_definedname[] = array(
-				'isBuiltInName' => $isBuiltInName,
-				'name' => $string['value'],
-				'formula' => $formula,
-				'scope' => $scope,
-			);
-		}
-	}
-
-
-	/**
-	 * Read MSODRAWINGGROUP record
-	 */
-	private function _readMsoDrawingGroup()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-
-		// get spliced record data
-		$splicedRecordData = $this->_getSplicedRecordData();
-		$recordData = $splicedRecordData['recordData'];
-
-		$this->_drawingGroupData .= $recordData;
-	}
-
-
-	/**
-	 * SST - Shared String Table
-	 *
-	 * This record contains a list of all strings used anywhere
-	 * in the workbook. Each string occurs only once. The
-	 * workbook uses indexes into the list to reference the
-	 * strings.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 **/
-	private function _readSst()
-	{
-		// offset within (spliced) record data
-		$pos = 0;
-
-		// get spliced record data
-		$splicedRecordData = $this->_getSplicedRecordData();
-
-		$recordData = $splicedRecordData['recordData'];
-		$spliceOffsets = $splicedRecordData['spliceOffsets'];
-
-		// offset: 0; size: 4; total number of strings in the workbook
-		$pos += 4;
-
-		// offset: 4; size: 4; number of following strings ($nm)
-		$nm = self::_GetInt4d($recordData, 4);
-		$pos += 4;
-
-		// loop through the Unicode strings (16-bit length)
-		for ($i = 0; $i < $nm; ++$i) {
-
-			// number of characters in the Unicode string
-			$numChars = self::_GetInt2d($recordData, $pos);
-			$pos += 2;
-
-			// option flags
-			$optionFlags = ord($recordData{$pos});
-			++$pos;
-
-			// bit: 0; mask: 0x01; 0 = compressed; 1 = uncompressed
-			$isCompressed = (($optionFlags & 0x01) == 0) ;
-
-			// bit: 2; mask: 0x02; 0 = ordinary; 1 = Asian phonetic
-			$hasAsian = (($optionFlags & 0x04) != 0);
-
-			// bit: 3; mask: 0x03; 0 = ordinary; 1 = Rich-Text
-			$hasRichText = (($optionFlags & 0x08) != 0);
-
-			if ($hasRichText) {
-				// number of Rich-Text formatting runs
-				$formattingRuns = self::_GetInt2d($recordData, $pos);
-				$pos += 2;
-			}
-
-			if ($hasAsian) {
-				// size of Asian phonetic setting
-				$extendedRunLength = self::_GetInt4d($recordData, $pos);
-				$pos += 4;
-			}
-
-			// expected byte length of character array if not split
-			$len = ($isCompressed) ? $numChars : $numChars * 2;
-
-			// look up limit position
-			foreach ($spliceOffsets as $spliceOffset) {
-				// it can happen that the string is empty, therefore we need
-				// <= and not just <
-				if ($pos <= $spliceOffset) {
-					$limitpos = $spliceOffset;
-					break;
-				}
-			}
-
-			if ($pos + $len <= $limitpos) {
-				// character array is not split between records
-
-				$retstr = substr($recordData, $pos, $len);
-				$pos += $len;
-
-			} else {
-				// character array is split between records
-
-				// first part of character array
-				$retstr = substr($recordData, $pos, $limitpos - $pos);
-
-				$bytesRead = $limitpos - $pos;
-
-				// remaining characters in Unicode string
-				$charsLeft = $numChars - (($isCompressed) ? $bytesRead : ($bytesRead / 2));
-
-				$pos = $limitpos;
-
-				// keep reading the characters
-				while ($charsLeft > 0) {
-
-					// look up next limit position, in case the string span more than one continue record
-					foreach ($spliceOffsets as $spliceOffset) {
-						if ($pos < $spliceOffset) {
-							$limitpos = $spliceOffset;
-							break;
-						}
-					}
-
-					// repeated option flags
-					// OpenOffice.org documentation 5.21
-					$option = ord($recordData{$pos});
-					++$pos;
-
-					if ($isCompressed && ($option == 0)) {
-						// 1st fragment compressed
-						// this fragment compressed
-						$len = min($charsLeft, $limitpos - $pos);
-						$retstr .= substr($recordData, $pos, $len);
-						$charsLeft -= $len;
-						$isCompressed = true;
-
-					} elseif (!$isCompressed && ($option != 0)) {
-						// 1st fragment uncompressed
-						// this fragment uncompressed
-						$len = min($charsLeft * 2, $limitpos - $pos);
-						$retstr .= substr($recordData, $pos, $len);
-						$charsLeft -= $len / 2;
-						$isCompressed = false;
-
-					} elseif (!$isCompressed && ($option == 0)) {
-						// 1st fragment uncompressed
-						// this fragment compressed
-						$len = min($charsLeft, $limitpos - $pos);
-						for ($j = 0; $j < $len; ++$j) {
-							$retstr .= $recordData{$pos + $j} . chr(0);
-						}
-						$charsLeft -= $len;
-						$isCompressed = false;
-
-					} else {
-						// 1st fragment compressed
-						// this fragment uncompressed
-						$newstr = '';
-						for ($j = 0; $j < strlen($retstr); ++$j) {
-							$newstr .= $retstr[$j] . chr(0);
-						}
-						$retstr = $newstr;
-						$len = min($charsLeft * 2, $limitpos - $pos);
-						$retstr .= substr($recordData, $pos, $len);
-						$charsLeft -= $len / 2;
-						$isCompressed = false;
-					}
-
-					$pos += $len;
-				}
-			}
-
-			// convert to UTF-8
-			$retstr = self::_encodeUTF16($retstr, $isCompressed);
-
-			// read additional Rich-Text information, if any
-			$fmtRuns = array();
-			if ($hasRichText) {
-				// list of formatting runs
-				for ($j = 0; $j < $formattingRuns; ++$j) {
-					// first formatted character; zero-based
-					$charPos = self::_GetInt2d($recordData, $pos + $j * 4);
-
-					// index to font record
-					$fontIndex = self::_GetInt2d($recordData, $pos + 2 + $j * 4);
-
-					$fmtRuns[] = array(
-						'charPos' => $charPos,
-						'fontIndex' => $fontIndex,
-					);
-				}
-				$pos += 4 * $formattingRuns;
-			}
-
-			// read additional Asian phonetics information, if any
-			if ($hasAsian) {
-				// For Asian phonetic settings, we skip the extended string data
-				$pos += $extendedRunLength;
-			}
-
-			// store the shared sting
-			$this->_sst[] = array(
-				'value' => $retstr,
-				'fmtRuns' => $fmtRuns,
-			);
-		}
-
-		// _getSplicedRecordData() takes care of moving current position in data stream
-	}
-
-
-	/**
-	 * Read PRINTGRIDLINES record
-	 */
-	private function _readPrintGridlines()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_version == self::XLS_BIFF8 && !$this->_readDataOnly) {
-			// offset: 0; size: 2; 0 = do not print sheet grid lines; 1 = print sheet gridlines
-			$printGridlines = (bool) self::_GetInt2d($recordData, 0);
-			$this->_phpSheet->setPrintGridlines($printGridlines);
-		}
-	}
-
-
-	/**
-	 * Read DEFAULTROWHEIGHT record
-	 */
-	private function _readDefaultRowHeight()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; option flags
-		// offset: 2; size: 2; default height for unused rows, (twips 1/20 point)
-		$height = self::_GetInt2d($recordData, 2);
-		$this->_phpSheet->getDefaultRowDimension()->setRowHeight($height / 20);
-	}
-
-
-	/**
-	 * Read SHEETPR record
-	 */
-	private function _readSheetPr()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2
-
-		// bit: 6; mask: 0x0040; 0 = outline buttons above outline group
-		$isSummaryBelow = (0x0040 & self::_GetInt2d($recordData, 0)) >> 6;
-		$this->_phpSheet->setShowSummaryBelow($isSummaryBelow);
-
-		// bit: 7; mask: 0x0080; 0 = outline buttons left of outline group
-		$isSummaryRight = (0x0080 & self::_GetInt2d($recordData, 0)) >> 7;
-		$this->_phpSheet->setShowSummaryRight($isSummaryRight);
-
-		// bit: 8; mask: 0x100; 0 = scale printout in percent, 1 = fit printout to number of pages
-		// this corresponds to radio button setting in page setup dialog in Excel
-		$this->_isFitToPages = (bool) ((0x0100 & self::_GetInt2d($recordData, 0)) >> 8);
-	}
-
-
-	/**
-	 * Read HORIZONTALPAGEBREAKS record
-	 */
-	private function _readHorizontalPageBreaks()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_version == self::XLS_BIFF8 && !$this->_readDataOnly) {
-
-			// offset: 0; size: 2; number of the following row index structures
-			$nm = self::_GetInt2d($recordData, 0);
-
-			// offset: 2; size: 6 * $nm; list of $nm row index structures
-			for ($i = 0; $i < $nm; ++$i) {
-				$r = self::_GetInt2d($recordData, 2 + 6 * $i);
-				$cf = self::_GetInt2d($recordData, 2 + 6 * $i + 2);
-				$cl = self::_GetInt2d($recordData, 2 + 6 * $i + 4);
-
-				// not sure why two column indexes are necessary?
-				$this->_phpSheet->setBreakByColumnAndRow($cf, $r, PHPExcel_Worksheet::BREAK_ROW);
-			}
-		}
-	}
-
-
-	/**
-	 * Read VERTICALPAGEBREAKS record
-	 */
-	private function _readVerticalPageBreaks()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_version == self::XLS_BIFF8 && !$this->_readDataOnly) {
-			// offset: 0; size: 2; number of the following column index structures
-			$nm = self::_GetInt2d($recordData, 0);
-
-			// offset: 2; size: 6 * $nm; list of $nm row index structures
-			for ($i = 0; $i < $nm; ++$i) {
-				$c = self::_GetInt2d($recordData, 2 + 6 * $i);
-				$rf = self::_GetInt2d($recordData, 2 + 6 * $i + 2);
-				$rl = self::_GetInt2d($recordData, 2 + 6 * $i + 4);
-
-				// not sure why two row indexes are necessary?
-				$this->_phpSheet->setBreakByColumnAndRow($c, $rf, PHPExcel_Worksheet::BREAK_COLUMN);
-			}
-		}
-	}
-
-
-	/**
-	 * Read HEADER record
-	 */
-	private function _readHeader()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: var
-			// realized that $recordData can be empty even when record exists
-			if ($recordData) {
-				if ($this->_version == self::XLS_BIFF8) {
-					$string = self::_readUnicodeStringLong($recordData);
-				} else {
-					$string = $this->_readByteStringShort($recordData);
-				}
-
-				$this->_phpSheet->getHeaderFooter()->setOddHeader($string['value']);
-				$this->_phpSheet->getHeaderFooter()->setEvenHeader($string['value']);
-			}
-		}
-	}
-
-
-	/**
-	 * Read FOOTER record
-	 */
-	private function _readFooter()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: var
-			// realized that $recordData can be empty even when record exists
-			if ($recordData) {
-				if ($this->_version == self::XLS_BIFF8) {
-					$string = self::_readUnicodeStringLong($recordData);
-				} else {
-					$string = $this->_readByteStringShort($recordData);
-				}
-				$this->_phpSheet->getHeaderFooter()->setOddFooter($string['value']);
-				$this->_phpSheet->getHeaderFooter()->setEvenFooter($string['value']);
-			}
-		}
-	}
-
-
-	/**
-	 * Read HCENTER record
-	 */
-	private function _readHcenter()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 2; 0 = print sheet left aligned, 1 = print sheet centered horizontally
-			$isHorizontalCentered = (bool) self::_GetInt2d($recordData, 0);
-
-			$this->_phpSheet->getPageSetup()->setHorizontalCentered($isHorizontalCentered);
-		}
-	}
-
-
-	/**
-	 * Read VCENTER record
-	 */
-	private function _readVcenter()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 2; 0 = print sheet aligned at top page border, 1 = print sheet vertically centered
-			$isVerticalCentered = (bool) self::_GetInt2d($recordData, 0);
-
-			$this->_phpSheet->getPageSetup()->setVerticalCentered($isVerticalCentered);
-		}
-	}
-
-
-	/**
-	 * Read LEFTMARGIN record
-	 */
-	private function _readLeftMargin()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 8
-			$this->_phpSheet->getPageMargins()->setLeft(self::_extractNumber($recordData));
-		}
-	}
-
-
-	/**
-	 * Read RIGHTMARGIN record
-	 */
-	private function _readRightMargin()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 8
-			$this->_phpSheet->getPageMargins()->setRight(self::_extractNumber($recordData));
-		}
-	}
-
-
-	/**
-	 * Read TOPMARGIN record
-	 */
-	private function _readTopMargin()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 8
-			$this->_phpSheet->getPageMargins()->setTop(self::_extractNumber($recordData));
-		}
-	}
-
-
-	/**
-	 * Read BOTTOMMARGIN record
-	 */
-	private function _readBottomMargin()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 8
-			$this->_phpSheet->getPageMargins()->setBottom(self::_extractNumber($recordData));
-		}
-	}
-
-
-	/**
-	 * Read PAGESETUP record
-	 */
-	private function _readPageSetup()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 2; paper size
-			$paperSize = self::_GetInt2d($recordData, 0);
-
-			// offset: 2; size: 2; scaling factor
-			$scale = self::_GetInt2d($recordData, 2);
-
-			// offset: 6; size: 2; fit worksheet width to this number of pages, 0 = use as many as needed
-			$fitToWidth = self::_GetInt2d($recordData, 6);
-
-			// offset: 8; size: 2; fit worksheet height to this number of pages, 0 = use as many as needed
-			$fitToHeight = self::_GetInt2d($recordData, 8);
-
-			// offset: 10; size: 2; option flags
-
-				// bit: 1; mask: 0x0002; 0=landscape, 1=portrait
-				$isPortrait = (0x0002 & self::_GetInt2d($recordData, 10)) >> 1;
-
-				// bit: 2; mask: 0x0004; 1= paper size, scaling factor, paper orient. not init
-				// when this bit is set, do not use flags for those properties
-				$isNotInit = (0x0004 & self::_GetInt2d($recordData, 10)) >> 2;
-
-			if (!$isNotInit) {
-				$this->_phpSheet->getPageSetup()->setPaperSize($paperSize);
-				switch ($isPortrait) {
-				case 0: $this->_phpSheet->getPageSetup()->setOrientation(PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE); break;
-				case 1: $this->_phpSheet->getPageSetup()->setOrientation(PHPExcel_Worksheet_PageSetup::ORIENTATION_PORTRAIT); break;
-				}
-
-				$this->_phpSheet->getPageSetup()->setScale($scale, false);
-				$this->_phpSheet->getPageSetup()->setFitToPage((bool) $this->_isFitToPages);
-				$this->_phpSheet->getPageSetup()->setFitToWidth($fitToWidth, false);
-				$this->_phpSheet->getPageSetup()->setFitToHeight($fitToHeight, false);
-			}
-
-			// offset: 16; size: 8; header margin (IEEE 754 floating-point value)
-			$marginHeader = self::_extractNumber(substr($recordData, 16, 8));
-			$this->_phpSheet->getPageMargins()->setHeader($marginHeader);
-
-			// offset: 24; size: 8; footer margin (IEEE 754 floating-point value)
-			$marginFooter = self::_extractNumber(substr($recordData, 24, 8));
-			$this->_phpSheet->getPageMargins()->setFooter($marginFooter);
-		}
-	}
-
-
-	/**
-	 * PROTECT - Sheet protection (BIFF2 through BIFF8)
-	 *   if this record is omitted, then it also means no sheet protection
-	 */
-	private function _readProtect()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_readDataOnly) {
-			return;
-		}
-
-		// offset: 0; size: 2;
-
-		// bit 0, mask 0x01; 1 = sheet is protected
-		$bool = (0x01 & self::_GetInt2d($recordData, 0)) >> 0;
-		$this->_phpSheet->getProtection()->setSheet((bool)$bool);
-	}
-
-
-	/**
-	 * SCENPROTECT
-	 */
-	private function _readScenProtect()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_readDataOnly) {
-			return;
-		}
-
-		// offset: 0; size: 2;
-
-		// bit: 0, mask 0x01; 1 = scenarios are protected
-		$bool = (0x01 & self::_GetInt2d($recordData, 0)) >> 0;
-
-		$this->_phpSheet->getProtection()->setScenarios((bool)$bool);
-	}
-
-
-	/**
-	 * OBJECTPROTECT
-	 */
-	private function _readObjectProtect()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_readDataOnly) {
-			return;
-		}
-
-		// offset: 0; size: 2;
-
-		// bit: 0, mask 0x01; 1 = objects are protected
-		$bool = (0x01 & self::_GetInt2d($recordData, 0)) >> 0;
-
-		$this->_phpSheet->getProtection()->setObjects((bool)$bool);
-	}
-
-
-	/**
-	 * PASSWORD - Sheet protection (hashed) password (BIFF2 through BIFF8)
-	 */
-	private function _readPassword()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 2; 16-bit hash value of password
-			$password = strtoupper(dechex(self::_GetInt2d($recordData, 0))); // the hashed password
-			$this->_phpSheet->getProtection()->setPassword($password, true);
-		}
-	}
-
-
-	/**
-	 * Read DEFCOLWIDTH record
-	 */
-	private function _readDefColWidth()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; default column width
-		$width = self::_GetInt2d($recordData, 0);
-		if ($width != 8) {
-			$this->_phpSheet->getDefaultColumnDimension()->setWidth($width);
-		}
-	}
-
-
-	/**
-	 * Read COLINFO record
-	 */
-	private function _readColInfo()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 2; index to first column in range
-			$fc = self::_GetInt2d($recordData, 0); // first column index
-
-			// offset: 2; size: 2; index to last column in range
-			$lc = self::_GetInt2d($recordData, 2); // first column index
-
-			// offset: 4; size: 2; width of the column in 1/256 of the width of the zero character
-			$width = self::_GetInt2d($recordData, 4);
-
-			// offset: 6; size: 2; index to XF record for default column formatting
-			$xfIndex = self::_GetInt2d($recordData, 6);
-
-			// offset: 8; size: 2; option flags
-
-				// bit: 0; mask: 0x0001; 1= columns are hidden
-				$isHidden = (0x0001 & self::_GetInt2d($recordData, 8)) >> 0;
-
-				// bit: 10-8; mask: 0x0700; outline level of the columns (0 = no outline)
-				$level = (0x0700 & self::_GetInt2d($recordData, 8)) >> 8;
-
-				// bit: 12; mask: 0x1000; 1 = collapsed
-				$isCollapsed = (0x1000 & self::_GetInt2d($recordData, 8)) >> 12;
-
-			// offset: 10; size: 2; not used
-
-			for ($i = $fc; $i <= $lc; ++$i) {
-				if ($lc == 255 || $lc == 256) {
-					$this->_phpSheet->getDefaultColumnDimension()->setWidth($width / 256);
-					break;
-				}
-				$this->_phpSheet->getColumnDimensionByColumn($i)->setWidth($width / 256);
-				$this->_phpSheet->getColumnDimensionByColumn($i)->setVisible(!$isHidden);
-				$this->_phpSheet->getColumnDimensionByColumn($i)->setOutlineLevel($level);
-				$this->_phpSheet->getColumnDimensionByColumn($i)->setCollapsed($isCollapsed);
-				$this->_phpSheet->getColumnDimensionByColumn($i)->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
-			}
-		}
-	}
-
-
-	/**
-	 * ROW
-	 *
-	 * This record contains the properties of a single row in a
-	 * sheet. Rows and cells in a sheet are divided into blocks
-	 * of 32 rows.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readRow()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 2; index of this row
-			$r = self::_GetInt2d($recordData, 0);
-
-			// offset: 2; size: 2; index to column of the first cell which is described by a cell record
-
-			// offset: 4; size: 2; index to column of the last cell which is described by a cell record, increased by 1
-
-			// offset: 6; size: 2;
-
-			// bit: 14-0; mask: 0x7FFF; height of the row, in twips = 1/20 of a point
-			$height = (0x7FFF & self::_GetInt2d($recordData, 6)) >> 0;
-
-			// bit: 15: mask: 0x8000; 0 = row has custom height; 1= row has default height
-			$useDefaultHeight = (0x8000 & self::_GetInt2d($recordData, 6)) >> 15;
-
-			if (!$useDefaultHeight) {
-				$this->_phpSheet->getRowDimension($r + 1)->setRowHeight($height / 20);
-			}
-
-			// offset: 8; size: 2; not used
-
-			// offset: 10; size: 2; not used in BIFF5-BIFF8
-
-			// offset: 12; size: 4; option flags and default row formatting
-
-			// bit: 2-0: mask: 0x00000007; outline level of the row
-			$level = (0x00000007 & self::_GetInt4d($recordData, 12)) >> 0;
-			$this->_phpSheet->getRowDimension($r + 1)->setOutlineLevel($level);
-
-			// bit: 4; mask: 0x00000010; 1 = outline group start or ends here... and is collapsed
-			$isCollapsed = (0x00000010 & self::_GetInt4d($recordData, 12)) >> 4;
-			$this->_phpSheet->getRowDimension($r + 1)->setCollapsed($isCollapsed);
-
-			// bit: 5; mask: 0x00000020; 1 = row is hidden
-			$isHidden = (0x00000020 & self::_GetInt4d($recordData, 12)) >> 5;
-			$this->_phpSheet->getRowDimension($r + 1)->setVisible(!$isHidden);
-
-			// bit: 7; mask: 0x00000080; 1 = row has explicit format
-			$hasExplicitFormat = (0x00000080 & self::_GetInt4d($recordData, 12)) >> 7;
-
-			// bit: 27-16; mask: 0x0FFF0000; only applies when hasExplicitFormat = 1; index to XF record
-			$xfIndex = (0x0FFF0000 & self::_GetInt4d($recordData, 12)) >> 16;
-
-			if ($hasExplicitFormat) {
-				$this->_phpSheet->getRowDimension($r + 1)->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
-			}
-		}
-	}
-
-
-	/**
-	 * Read RK record
-	 * This record represents a cell that contains an RK value
-	 * (encoded integer or floating-point value). If a
-	 * floating-point value cannot be encoded to an RK value,
-	 * a NUMBER record will be written. This record replaces the
-	 * record INTEGER written in BIFF2.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readRk()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; index to row
-		$row = self::_GetInt2d($recordData, 0);
-
-		// offset: 2; size: 2; index to column
-		$column = self::_GetInt2d($recordData, 2);
-		$columnString = PHPExcel_Cell::stringFromColumnIndex($column);
-
-		// Read cell?
-		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
-			// offset: 4; size: 2; index to XF record
-			$xfIndex = self::_GetInt2d($recordData, 4);
-
-			// offset: 6; size: 4; RK value
-			$rknum = self::_GetInt4d($recordData, 6);
-			$numValue = self::_GetIEEE754($rknum);
-
-			$cell = $this->_phpSheet->getCell($columnString . ($row + 1));
-			if (!$this->_readDataOnly) {
-				// add style information
-				$cell->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
-			}
-
-			// add cell
-			$cell->setValueExplicit($numValue, PHPExcel_Cell_DataType::TYPE_NUMERIC);
-		}
-	}
-
-
-	/**
-	 * Read LABELSST record
-	 * This record represents a cell that contains a string. It
-	 * replaces the LABEL record and RSTRING record used in
-	 * BIFF2-BIFF5.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readLabelSst()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; index to row
-		$row = self::_GetInt2d($recordData, 0);
-
-		// offset: 2; size: 2; index to column
-		$column = self::_GetInt2d($recordData, 2);
-		$columnString = PHPExcel_Cell::stringFromColumnIndex($column);
-
-		// Read cell?
-		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
-			// offset: 4; size: 2; index to XF record
-			$xfIndex = self::_GetInt2d($recordData, 4);
-
-			// offset: 6; size: 4; index to SST record
-			$index = self::_GetInt4d($recordData, 6);
-
-			// add cell
-			if (($fmtRuns = $this->_sst[$index]['fmtRuns']) && !$this->_readDataOnly) {
-				// then we should treat as rich text
-				$richText = new PHPExcel_RichText();
-				$charPos = 0;
-				$sstCount = count($this->_sst[$index]['fmtRuns']);
-				for ($i = 0; $i <= $sstCount; ++$i) {
-					if (isset($fmtRuns[$i])) {
-						$text = PHPExcel_Shared_String::Substring($this->_sst[$index]['value'], $charPos, $fmtRuns[$i]['charPos'] - $charPos);
-						$charPos = $fmtRuns[$i]['charPos'];
-					} else {
-						$text = PHPExcel_Shared_String::Substring($this->_sst[$index]['value'], $charPos, PHPExcel_Shared_String::CountCharacters($this->_sst[$index]['value']));
-					}
-
-					if (PHPExcel_Shared_String::CountCharacters($text) > 0) {
-						if ($i == 0) { // first text run, no style
-							$richText->createText($text);
-						} else {
-							$textRun = $richText->createTextRun($text);
-							if (isset($fmtRuns[$i - 1])) {
-								if ($fmtRuns[$i - 1]['fontIndex'] < 4) {
-									$fontIndex = $fmtRuns[$i - 1]['fontIndex'];
-								} else {
-									// this has to do with that index 4 is omitted in all BIFF versions for some strange reason
-									// check the OpenOffice documentation of the FONT record
-									$fontIndex = $fmtRuns[$i - 1]['fontIndex'] - 1;
-								}
-								$textRun->setFont(clone $this->_objFonts[$fontIndex]);
-							}
-						}
-					}
-				}
-				$cell = $this->_phpSheet->getCell($columnString . ($row + 1));
-				$cell->setValueExplicit($richText, PHPExcel_Cell_DataType::TYPE_STRING);
-			} else {
-				$cell = $this->_phpSheet->getCell($columnString . ($row + 1));
-				$cell->setValueExplicit($this->_sst[$index]['value'], PHPExcel_Cell_DataType::TYPE_STRING);
-			}
-
-			if (!$this->_readDataOnly) {
-				// add style information
-				$cell->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
-			}
-		}
-	}
-
-
-	/**
-	 * Read MULRK record
-	 * This record represents a cell range containing RK value
-	 * cells. All cells are located in the same row.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readMulRk()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; index to row
-		$row = self::_GetInt2d($recordData, 0);
-
-		// offset: 2; size: 2; index to first column
-		$colFirst = self::_GetInt2d($recordData, 2);
-
-		// offset: var; size: 2; index to last column
-		$colLast = self::_GetInt2d($recordData, $length - 2);
-		$columns = $colLast - $colFirst + 1;
-
-		// offset within record data
-		$offset = 4;
-
-		for ($i = 0; $i < $columns; ++$i) {
-			$columnString = PHPExcel_Cell::stringFromColumnIndex($colFirst + $i);
-
-			// Read cell?
-			if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
-
-				// offset: var; size: 2; index to XF record
-				$xfIndex = self::_GetInt2d($recordData, $offset);
-
-				// offset: var; size: 4; RK value
-				$numValue = self::_GetIEEE754(self::_GetInt4d($recordData, $offset + 2));
-				$cell = $this->_phpSheet->getCell($columnString . ($row + 1));
-				if (!$this->_readDataOnly) {
-					// add style
-					$cell->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
-				}
-
-				// add cell value
-				$cell->setValueExplicit($numValue, PHPExcel_Cell_DataType::TYPE_NUMERIC);
-			}
-
-			$offset += 6;
-		}
-	}
-
-
-	/**
-	 * Read NUMBER record
-	 * This record represents a cell that contains a
-	 * floating-point value.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readNumber()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; index to row
-		$row = self::_GetInt2d($recordData, 0);
-
-		// offset: 2; size 2; index to column
-		$column = self::_GetInt2d($recordData, 2);
-		$columnString = PHPExcel_Cell::stringFromColumnIndex($column);
-
-		// Read cell?
-		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
-			// offset 4; size: 2; index to XF record
-			$xfIndex = self::_GetInt2d($recordData, 4);
-
-			$numValue = self::_extractNumber(substr($recordData, 6, 8));
-
-			$cell = $this->_phpSheet->getCell($columnString . ($row + 1));
-			if (!$this->_readDataOnly) {
-				// add cell style
-				$cell->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
-			}
-
-			// add cell value
-			$cell->setValueExplicit($numValue, PHPExcel_Cell_DataType::TYPE_NUMERIC);
-		}
-	}
-
-
-	/**
-	 * Read FORMULA record + perhaps a following STRING record if formula result is a string
-	 * This record contains the token array and the result of a
-	 * formula cell.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readFormula()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; row index
-		$row = self::_GetInt2d($recordData, 0);
-
-		// offset: 2; size: 2; col index
-		$column = self::_GetInt2d($recordData, 2);
-		$columnString = PHPExcel_Cell::stringFromColumnIndex($column);
-
-		// offset: 20: size: variable; formula structure
-		$formulaStructure = substr($recordData, 20);
-
-		// offset: 14: size: 2; option flags, recalculate always, recalculate on open etc.
-		$options = self::_GetInt2d($recordData, 14);
-
-		// bit: 0; mask: 0x0001; 1 = recalculate always
-		// bit: 1; mask: 0x0002; 1 = calculate on open
-		// bit: 2; mask: 0x0008; 1 = part of a shared formula
-		$isPartOfSharedFormula = (bool) (0x0008 & $options);
-
-		// WARNING:
-		// We can apparently not rely on $isPartOfSharedFormula. Even when $isPartOfSharedFormula = true
-		// the formula data may be ordinary formula data, therefore we need to check
-		// explicitly for the tExp token (0x01)
-		$isPartOfSharedFormula = $isPartOfSharedFormula && ord($formulaStructure{2}) == 0x01;
-
-		if ($isPartOfSharedFormula) {
-			// part of shared formula which means there will be a formula with a tExp token and nothing else
-			// get the base cell, grab tExp token
-			$baseRow = self::_GetInt2d($formulaStructure, 3);
-			$baseCol = self::_GetInt2d($formulaStructure, 5);
-			$this->_baseCell = PHPExcel_Cell::stringFromColumnIndex($baseCol). ($baseRow + 1);
-		}
-
-		// Read cell?
-		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
-
-			if ($isPartOfSharedFormula) {
-				// formula is added to this cell after the sheet has been read
-				$this->_sharedFormulaParts[$columnString . ($row + 1)] = $this->_baseCell;
-			}
-
-			// offset: 16: size: 4; not used
-
-			// offset: 4; size: 2; XF index
-			$xfIndex = self::_GetInt2d($recordData, 4);
-
-			// offset: 6; size: 8; result of the formula
-			if ( (ord($recordData{6}) == 0)
-				&& (ord($recordData{12}) == 255)
-				&& (ord($recordData{13}) == 255) ) {
-
-				// String formula. Result follows in appended STRING record
-				$dataType = PHPExcel_Cell_DataType::TYPE_STRING;
-
-				// read possible SHAREDFMLA record
-				$code = self::_GetInt2d($this->_data, $this->_pos);
-				if ($code == self::XLS_Type_SHAREDFMLA) {
-					$this->_readSharedFmla();
-				}
-
-				// read STRING record
-				$value = $this->_readString();
-
-			} elseif ((ord($recordData{6}) == 1)
-				&& (ord($recordData{12}) == 255)
-				&& (ord($recordData{13}) == 255)) {
-
-				// Boolean formula. Result is in +2; 0=false, 1=true
-				$dataType = PHPExcel_Cell_DataType::TYPE_BOOL;
-				$value = (bool) ord($recordData{8});
-
-			} elseif ((ord($recordData{6}) == 2)
-				&& (ord($recordData{12}) == 255)
-				&& (ord($recordData{13}) == 255)) {
-
-				// Error formula. Error code is in +2
-				$dataType = PHPExcel_Cell_DataType::TYPE_ERROR;
-				$value = self::_mapErrorCode(ord($recordData{8}));
-
-			} elseif ((ord($recordData{6}) == 3)
-				&& (ord($recordData{12}) == 255)
-				&& (ord($recordData{13}) == 255)) {
-
-				// Formula result is a null string
-				$dataType = PHPExcel_Cell_DataType::TYPE_NULL;
-				$value = '';
-
-			} else {
-
-				// forumla result is a number, first 14 bytes like _NUMBER record
-				$dataType = PHPExcel_Cell_DataType::TYPE_NUMERIC;
-				$value = self::_extractNumber(substr($recordData, 6, 8));
-
-			}
-
-			$cell = $this->_phpSheet->getCell($columnString . ($row + 1));
-			if (!$this->_readDataOnly) {
-				// add cell style
-				$cell->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
-			}
-
-			// store the formula
-			if (!$isPartOfSharedFormula) {
-				// not part of shared formula
-				// add cell value. If we can read formula, populate with formula, otherwise just used cached value
-				try {
-					if ($this->_version != self::XLS_BIFF8) {
-						throw new PHPExcel_Reader_Exception('Not BIFF8. Can only read BIFF8 formulas');
-					}
-					$formula = $this->_getFormulaFromStructure($formulaStructure); // get formula in human language
-					$cell->setValueExplicit('=' . $formula, PHPExcel_Cell_DataType::TYPE_FORMULA);
-
-				} catch (PHPExcel_Exception $e) {
-					$cell->setValueExplicit($value, $dataType);
-				}
-			} else {
-				if ($this->_version == self::XLS_BIFF8) {
-					// do nothing at this point, formula id added later in the code
-				} else {
-					$cell->setValueExplicit($value, $dataType);
-				}
-			}
-
-			// store the cached calculated value
-			$cell->setCalculatedValue($value);
-		}
-	}
-
-
-	/**
-	 * Read a SHAREDFMLA record. This function just stores the binary shared formula in the reader,
-	 * which usually contains relative references.
-	 * These will be used to construct the formula in each shared formula part after the sheet is read.
-	 */
-	private function _readSharedFmla()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0, size: 6; cell range address of the area used by the shared formula, not used for anything
-		$cellRange = substr($recordData, 0, 6);
-		$cellRange = $this->_readBIFF5CellRangeAddressFixed($cellRange); // note: even BIFF8 uses BIFF5 syntax
-
-		// offset: 6, size: 1; not used
-
-		// offset: 7, size: 1; number of existing FORMULA records for this shared formula
-		$no = ord($recordData{7});
-
-		// offset: 8, size: var; Binary token array of the shared formula
-		$formula = substr($recordData, 8);
-
-		// at this point we only store the shared formula for later use
-		$this->_sharedFormulas[$this->_baseCell] = $formula;
-
-	}
-
-
-	/**
-	 * Read a STRING record from current stream position and advance the stream pointer to next record
-	 * This record is used for storing result from FORMULA record when it is a string, and
-	 * it occurs directly after the FORMULA record
-	 *
-	 * @return string The string contents as UTF-8
-	 */
-	private function _readString()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_version == self::XLS_BIFF8) {
-			$string = self::_readUnicodeStringLong($recordData);
-			$value = $string['value'];
-		} else {
-			$string = $this->_readByteStringLong($recordData);
-			$value = $string['value'];
-		}
-
-		return $value;
-	}
-
-
-	/**
-	 * Read BOOLERR record
-	 * This record represents a Boolean value or error value
-	 * cell.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readBoolErr()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; row index
-		$row = self::_GetInt2d($recordData, 0);
-
-		// offset: 2; size: 2; column index
-		$column = self::_GetInt2d($recordData, 2);
-		$columnString = PHPExcel_Cell::stringFromColumnIndex($column);
-
-		// Read cell?
-		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
-			// offset: 4; size: 2; index to XF record
-			$xfIndex = self::_GetInt2d($recordData, 4);
-
-			// offset: 6; size: 1; the boolean value or error value
-			$boolErr = ord($recordData{6});
-
-			// offset: 7; size: 1; 0=boolean; 1=error
-			$isError = ord($recordData{7});
-
-			$cell = $this->_phpSheet->getCell($columnString . ($row + 1));
-			switch ($isError) {
-				case 0: // boolean
-					$value = (bool) $boolErr;
-
-					// add cell value
-					$cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_BOOL);
-					break;
-
-				case 1: // error type
-					$value = self::_mapErrorCode($boolErr);
-
-					// add cell value
-					$cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_ERROR);
-					break;
-			}
-
-			if (!$this->_readDataOnly) {
-				// add cell style
-				$cell->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
-			}
-		}
-	}
-
-
-	/**
-	 * Read MULBLANK record
-	 * This record represents a cell range of empty cells. All
-	 * cells are located in the same row
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readMulBlank()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; index to row
-		$row = self::_GetInt2d($recordData, 0);
-
-		// offset: 2; size: 2; index to first column
-		$fc = self::_GetInt2d($recordData, 2);
-
-		// offset: 4; size: 2 x nc; list of indexes to XF records
-		// add style information
-		if (!$this->_readDataOnly) {
-			for ($i = 0; $i < $length / 2 - 3; ++$i) {
-				$columnString = PHPExcel_Cell::stringFromColumnIndex($fc + $i);
-
-				// Read cell?
-				if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
-					$xfIndex = self::_GetInt2d($recordData, 4 + 2 * $i);
-					$this->_phpSheet->getCell($columnString . ($row + 1))->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
-				}
-			}
-		}
-
-		// offset: 6; size 2; index to last column (not needed)
-	}
-
-
-	/**
-	 * Read LABEL record
-	 * This record represents a cell that contains a string. In
-	 * BIFF8 it is usually replaced by the LABELSST record.
-	 * Excel still uses this record, if it copies unformatted
-	 * text cells to the clipboard.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readLabel()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; index to row
-		$row = self::_GetInt2d($recordData, 0);
-
-		// offset: 2; size: 2; index to column
-		$column = self::_GetInt2d($recordData, 2);
-		$columnString = PHPExcel_Cell::stringFromColumnIndex($column);
-
-		// Read cell?
-		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
-			// offset: 4; size: 2; XF index
-			$xfIndex = self::_GetInt2d($recordData, 4);
-
-			// add cell value
-			// todo: what if string is very long? continue record
-			if ($this->_version == self::XLS_BIFF8) {
-				$string = self::_readUnicodeStringLong(substr($recordData, 6));
-				$value = $string['value'];
-			} else {
-				$string = $this->_readByteStringLong(substr($recordData, 6));
-				$value = $string['value'];
-			}
-			$cell = $this->_phpSheet->getCell($columnString . ($row + 1));
-			$cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_STRING);
-
-			if (!$this->_readDataOnly) {
-				// add cell style
-				$cell->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
-			}
-		}
-	}
-
-
-	/**
-	 * Read BLANK record
-	 */
-	private function _readBlank()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; row index
-		$row = self::_GetInt2d($recordData, 0);
-
-		// offset: 2; size: 2; col index
-		$col = self::_GetInt2d($recordData, 2);
-		$columnString = PHPExcel_Cell::stringFromColumnIndex($col);
-
-		// Read cell?
-		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
-			// offset: 4; size: 2; XF index
-			$xfIndex = self::_GetInt2d($recordData, 4);
-
-			// add style information
-			if (!$this->_readDataOnly) {
-				$this->_phpSheet->getCell($columnString . ($row + 1))->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
-			}
-		}
-
-	}
-
-
-	/**
-	 * Read MSODRAWING record
-	 */
-	private function _readMsoDrawing()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-
-		// get spliced record data
-		$splicedRecordData = $this->_getSplicedRecordData();
-		$recordData = $splicedRecordData['recordData'];
-
-		$this->_drawingData .= $recordData;
-	}
-
-
-	/**
-	 * Read OBJ record
-	 */
-	private function _readObj()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_readDataOnly || $this->_version != self::XLS_BIFF8) {
-			return;
-		}
-
-		// recordData consists of an array of subrecords looking like this:
-		//	ft: 2 bytes; ftCmo type (0x15)
-		//	cb: 2 bytes; size in bytes of ftCmo data
-		//	ot: 2 bytes; Object Type
-		//	id: 2 bytes; Object id number
-		//	grbit: 2 bytes; Option Flags
-		//	data: var; subrecord data
-
-		// for now, we are just interested in the second subrecord containing the object type
-		$ftCmoType	= self::_GetInt2d($recordData, 0);
-		$cbCmoSize	= self::_GetInt2d($recordData, 2);
-		$otObjType	= self::_GetInt2d($recordData, 4);
-		$idObjID	= self::_GetInt2d($recordData, 6);
-		$grbitOpts	= self::_GetInt2d($recordData, 6);
-
-		$this->_objs[] = array(
-			'ftCmoType'	=> $ftCmoType,
-			'cbCmoSize'	=> $cbCmoSize,
-			'otObjType'	=> $otObjType,
-			'idObjID'	=> $idObjID,
-			'grbitOpts'	=> $grbitOpts
-		);
-		$this->textObjRef = $idObjID;
-
-//		echo '<b>_readObj()</b><br />';
-//		var_dump(end($this->_objs));
-//		echo '<br />';
-	}
-
-
-	/**
-	 * Read WINDOW2 record
-	 */
-	private function _readWindow2()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; option flags
-		$options = self::_GetInt2d($recordData, 0);
-
-		// offset: 2; size: 2; index to first visible row
-		$firstVisibleRow = self::_GetInt2d($recordData, 2);
-
-		// offset: 4; size: 2; index to first visible colum
-		$firstVisibleColumn = self::_GetInt2d($recordData, 4);
-		if ($this->_version === self::XLS_BIFF8) {
-			// offset:  8; size: 2; not used
-			// offset: 10; size: 2; cached magnification factor in page break preview (in percent); 0 = Default (60%)
-			// offset: 12; size: 2; cached magnification factor in normal view (in percent); 0 = Default (100%)
-			// offset: 14; size: 4; not used
-			$zoomscaleInPageBreakPreview = self::_GetInt2d($recordData, 10);
-			if ($zoomscaleInPageBreakPreview === 0) $zoomscaleInPageBreakPreview = 60;
-			$zoomscaleInNormalView = self::_GetInt2d($recordData, 12);
-			if ($zoomscaleInNormalView === 0) $zoomscaleInNormalView = 100;
-		}
-
-		// bit: 1; mask: 0x0002; 0 = do not show gridlines, 1 = show gridlines
-		$showGridlines = (bool) ((0x0002 & $options) >> 1);
-		$this->_phpSheet->setShowGridlines($showGridlines);
-
-		// bit: 2; mask: 0x0004; 0 = do not show headers, 1 = show headers
-		$showRowColHeaders = (bool) ((0x0004 & $options) >> 2);
-		$this->_phpSheet->setShowRowColHeaders($showRowColHeaders);
-
-		// bit: 3; mask: 0x0008; 0 = panes are not frozen, 1 = panes are frozen
-		$this->_frozen = (bool) ((0x0008 & $options) >> 3);
-
-		// bit: 6; mask: 0x0040; 0 = columns from left to right, 1 = columns from right to left
-		$this->_phpSheet->setRightToLeft((bool)((0x0040 & $options) >> 6));
-
-		// bit: 10; mask: 0x0400; 0 = sheet not active, 1 = sheet active
-		$isActive = (bool) ((0x0400 & $options) >> 10);
-		if ($isActive) {
-			$this->_phpExcel->setActiveSheetIndex($this->_phpExcel->getIndex($this->_phpSheet));
-		}
-
-		// bit: 11; mask: 0x0800; 0 = normal view, 1 = page break view
-		$isPageBreakPreview = (bool) ((0x0800 & $options) >> 11);
-
-		//FIXME: set $firstVisibleRow and $firstVisibleColumn
-
-		if ($this->_phpSheet->getSheetView()->getView() !== PHPExcel_Worksheet_SheetView::SHEETVIEW_PAGE_LAYOUT) {
-			//NOTE: this setting is inferior to page layout view(Excel2007-)
-			$view = $isPageBreakPreview? PHPExcel_Worksheet_SheetView::SHEETVIEW_PAGE_BREAK_PREVIEW :
-				PHPExcel_Worksheet_SheetView::SHEETVIEW_NORMAL;
-			$this->_phpSheet->getSheetView()->setView($view);
-			if ($this->_version === self::XLS_BIFF8) {
-				$zoomScale = $isPageBreakPreview? $zoomscaleInPageBreakPreview : $zoomscaleInNormalView;
-				$this->_phpSheet->getSheetView()->setZoomScale($zoomScale);
-				$this->_phpSheet->getSheetView()->setZoomScaleNormal($zoomscaleInNormalView);
-			}
-		}
-	}
-
-	/**
-	 * Read PLV Record(Created by Excel2007 or upper)
-	 */
-	private function _readPageLayoutView(){
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		//var_dump(unpack("vrt/vgrbitFrt/V2reserved/vwScalePLV/vgrbit", $recordData));
-
-		// offset: 0; size: 2; rt
-		//->ignore
-		$rt = self::_GetInt2d($recordData, 0);
-		// offset: 2; size: 2; grbitfr
-		//->ignore
-		$grbitFrt = self::_GetInt2d($recordData, 2);
-		// offset: 4; size: 8; reserved
-		//->ignore
-
-		// offset: 12; size 2; zoom scale
-		$wScalePLV = self::_GetInt2d($recordData, 12);
-		// offset: 14; size 2; grbit
-		$grbit = self::_GetInt2d($recordData, 14);
-
-		// decomprise grbit
-		$fPageLayoutView   = $grbit & 0x01;
-		$fRulerVisible     = ($grbit >> 1) & 0x01; //no support
-		$fWhitespaceHidden = ($grbit >> 3) & 0x01; //no support
-
-		if ($fPageLayoutView === 1) {
-			$this->_phpSheet->getSheetView()->setView(PHPExcel_Worksheet_SheetView::SHEETVIEW_PAGE_LAYOUT);
-			$this->_phpSheet->getSheetView()->setZoomScale($wScalePLV); //set by Excel2007 only if SHEETVIEW_PAGE_LAYOUT
-		}
-		//otherwise, we cannot know whether SHEETVIEW_PAGE_LAYOUT or SHEETVIEW_PAGE_BREAK_PREVIEW.
-	}
-
-	/**
-	 * Read SCL record
-	 */
-	private function _readScl()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; numerator of the view magnification
-		$numerator = self::_GetInt2d($recordData, 0);
-
-		// offset: 2; size: 2; numerator of the view magnification
-		$denumerator = self::_GetInt2d($recordData, 2);
-
-		// set the zoom scale (in percent)
-		$this->_phpSheet->getSheetView()->setZoomScale($numerator * 100 / $denumerator);
-	}
-
-
-	/**
-	 * Read PANE record
-	 */
-	private function _readPane()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 2; position of vertical split
-			$px = self::_GetInt2d($recordData, 0);
-
-			// offset: 2; size: 2; position of horizontal split
-			$py = self::_GetInt2d($recordData, 2);
-
-			if ($this->_frozen) {
-				// frozen panes
-				$this->_phpSheet->freezePane(PHPExcel_Cell::stringFromColumnIndex($px) . ($py + 1));
-			} else {
-				// unfrozen panes; split windows; not supported by PHPExcel core
-			}
-		}
-	}
-
-
-	/**
-	 * Read SELECTION record. There is one such record for each pane in the sheet.
-	 */
-	private function _readSelection()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 1; pane identifier
-			$paneId = ord($recordData{0});
-
-			// offset: 1; size: 2; index to row of the active cell
-			$r = self::_GetInt2d($recordData, 1);
-
-			// offset: 3; size: 2; index to column of the active cell
-			$c = self::_GetInt2d($recordData, 3);
-
-			// offset: 5; size: 2; index into the following cell range list to the
-			//  entry that contains the active cell
-			$index = self::_GetInt2d($recordData, 5);
-
-			// offset: 7; size: var; cell range address list containing all selected cell ranges
-			$data = substr($recordData, 7);
-			$cellRangeAddressList = $this->_readBIFF5CellRangeAddressList($data); // note: also BIFF8 uses BIFF5 syntax
-
-			$selectedCells = $cellRangeAddressList['cellRangeAddresses'][0];
-
-			// first row '1' + last row '16384' indicates that full column is selected (apparently also in BIFF8!)
-			if (preg_match('/^([A-Z]+1\:[A-Z]+)16384$/', $selectedCells)) {
-				$selectedCells = preg_replace('/^([A-Z]+1\:[A-Z]+)16384$/', '${1}1048576', $selectedCells);
-			}
-
-			// first row '1' + last row '65536' indicates that full column is selected
-			if (preg_match('/^([A-Z]+1\:[A-Z]+)65536$/', $selectedCells)) {
-				$selectedCells = preg_replace('/^([A-Z]+1\:[A-Z]+)65536$/', '${1}1048576', $selectedCells);
-			}
-
-			// first column 'A' + last column 'IV' indicates that full row is selected
-			if (preg_match('/^(A[0-9]+\:)IV([0-9]+)$/', $selectedCells)) {
-				$selectedCells = preg_replace('/^(A[0-9]+\:)IV([0-9]+)$/', '${1}XFD${2}', $selectedCells);
-			}
-
-			$this->_phpSheet->setSelectedCells($selectedCells);
-		}
-	}
-
-
-	private function _includeCellRangeFiltered($cellRangeAddress)
-	{
-		$includeCellRange = true;
-		if ($this->getReadFilter() !== NULL) {
-			$includeCellRange = false;
-			$rangeBoundaries = PHPExcel_Cell::getRangeBoundaries($cellRangeAddress);
-			$rangeBoundaries[1][0]++;
-			for ($row = $rangeBoundaries[0][1]; $row <= $rangeBoundaries[1][1]; $row++) {
-				for ($column = $rangeBoundaries[0][0]; $column != $rangeBoundaries[1][0]; $column++) {
-					if ($this->getReadFilter()->readCell($column, $row, $this->_phpSheet->getTitle())) {
-						$includeCellRange = true;
-						break 2;
-					}
-				}
-			}
-		}
-		return $includeCellRange;
-	}
-
-
-	/**
-	 * MERGEDCELLS
-	 *
-	 * This record contains the addresses of merged cell ranges
-	 * in the current sheet.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readMergedCells()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_version == self::XLS_BIFF8 && !$this->_readDataOnly) {
-			$cellRangeAddressList = $this->_readBIFF8CellRangeAddressList($recordData);
-			foreach ($cellRangeAddressList['cellRangeAddresses'] as $cellRangeAddress) {
-				if ((strpos($cellRangeAddress,':') !== FALSE) &&
-					($this->_includeCellRangeFiltered($cellRangeAddress))) {
-					$this->_phpSheet->mergeCells($cellRangeAddress);
-				}
-			}
-		}
-	}
-
-
-	/**
-	 * Read HYPERLINK record
-	 */
-	private function _readHyperLink()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer forward to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 8; cell range address of all cells containing this hyperlink
-			try {
-				$cellRange = $this->_readBIFF8CellRangeAddressFixed($recordData, 0, 8);
-			} catch (PHPExcel_Exception $e) {
-				return;
-			}
-
-			// offset: 8, size: 16; GUID of StdLink
-
-			// offset: 24, size: 4; unknown value
-
-			// offset: 28, size: 4; option flags
-
-				// bit: 0; mask: 0x00000001; 0 = no link or extant, 1 = file link or URL
-				$isFileLinkOrUrl = (0x00000001 & self::_GetInt2d($recordData, 28)) >> 0;
-
-				// bit: 1; mask: 0x00000002; 0 = relative path, 1 = absolute path or URL
-				$isAbsPathOrUrl = (0x00000001 & self::_GetInt2d($recordData, 28)) >> 1;
-
-				// bit: 2 (and 4); mask: 0x00000014; 0 = no description
-				$hasDesc = (0x00000014 & self::_GetInt2d($recordData, 28)) >> 2;
-
-				// bit: 3; mask: 0x00000008; 0 = no text, 1 = has text
-				$hasText = (0x00000008 & self::_GetInt2d($recordData, 28)) >> 3;
-
-				// bit: 7; mask: 0x00000080; 0 = no target frame, 1 = has target frame
-				$hasFrame = (0x00000080 & self::_GetInt2d($recordData, 28)) >> 7;
-
-				// bit: 8; mask: 0x00000100; 0 = file link or URL, 1 = UNC path (inc. server name)
-				$isUNC = (0x00000100 & self::_GetInt2d($recordData, 28)) >> 8;
-
-			// offset within record data
-			$offset = 32;
-
-			if ($hasDesc) {
-				// offset: 32; size: var; character count of description text
-				$dl = self::_GetInt4d($recordData, 32);
-				// offset: 36; size: var; character array of description text, no Unicode string header, always 16-bit characters, zero terminated
-				$desc = self::_encodeUTF16(substr($recordData, 36, 2 * ($dl - 1)), false);
-				$offset += 4 + 2 * $dl;
-			}
-			if ($hasFrame) {
-				$fl = self::_GetInt4d($recordData, $offset);
-				$offset += 4 + 2 * $fl;
-			}
-
-			// detect type of hyperlink (there are 4 types)
-			$hyperlinkType = null;
-
-			if ($isUNC) {
-				$hyperlinkType = 'UNC';
-			} else if (!$isFileLinkOrUrl) {
-				$hyperlinkType = 'workbook';
-			} else if (ord($recordData{$offset}) == 0x03) {
-				$hyperlinkType = 'local';
-			} else if (ord($recordData{$offset}) == 0xE0) {
-				$hyperlinkType = 'URL';
-			}
-
-			switch ($hyperlinkType) {
-			case 'URL':
-				// section 5.58.2: Hyperlink containing a URL
-				// e.g. http://example.org/index.php
-
-				// offset: var; size: 16; GUID of URL Moniker
-				$offset += 16;
-				// offset: var; size: 4; size (in bytes) of character array of the URL including trailing zero word
-				$us = self::_GetInt4d($recordData, $offset);
-				$offset += 4;
-				// offset: var; size: $us; character array of the URL, no Unicode string header, always 16-bit characters, zero-terminated
-				$url = self::_encodeUTF16(substr($recordData, $offset, $us - 2), false);
-                $nullOffset = strpos($url, 0x00);
-				if ($nullOffset)
-                    $url = substr($url,0,$nullOffset);
-				$url .= $hasText ? '#' : '';
-				$offset += $us;
-				break;
-
-			case 'local':
-				// section 5.58.3: Hyperlink to local file
-				// examples:
-				//   mydoc.txt
-				//   ../../somedoc.xls#Sheet!A1
-
-				// offset: var; size: 16; GUI of File Moniker
-				$offset += 16;
-
-				// offset: var; size: 2; directory up-level count.
-				$upLevelCount = self::_GetInt2d($recordData, $offset);
-				$offset += 2;
-
-				// offset: var; size: 4; character count of the shortened file path and name, including trailing zero word
-				$sl = self::_GetInt4d($recordData, $offset);
-				$offset += 4;
-
-				// offset: var; size: sl; character array of the shortened file path and name in 8.3-DOS-format (compressed Unicode string)
-				$shortenedFilePath = substr($recordData, $offset, $sl);
-				$shortenedFilePath = self::_encodeUTF16($shortenedFilePath, true);
-				$shortenedFilePath = substr($shortenedFilePath, 0, -1); // remove trailing zero
-
-				$offset += $sl;
-
-				// offset: var; size: 24; unknown sequence
-				$offset += 24;
-
-				// extended file path
-				// offset: var; size: 4; size of the following file link field including string lenth mark
-				$sz = self::_GetInt4d($recordData, $offset);
-				$offset += 4;
-
-				// only present if $sz > 0
-				if ($sz > 0) {
-					// offset: var; size: 4; size of the character array of the extended file path and name
-					$xl = self::_GetInt4d($recordData, $offset);
-					$offset += 4;
-
-					// offset: var; size 2; unknown
-					$offset += 2;
-
-					// offset: var; size $xl; character array of the extended file path and name.
-					$extendedFilePath = substr($recordData, $offset, $xl);
-					$extendedFilePath = self::_encodeUTF16($extendedFilePath, false);
-					$offset += $xl;
-				}
-
-				// construct the path
-				$url = str_repeat('..\\', $upLevelCount);
-				$url .= ($sz > 0) ?
-					$extendedFilePath : $shortenedFilePath; // use extended path if available
-				$url .= $hasText ? '#' : '';
-
-				break;
-
-
-			case 'UNC':
-				// section 5.58.4: Hyperlink to a File with UNC (Universal Naming Convention) Path
-				// todo: implement
-				return;
-
-			case 'workbook':
-				// section 5.58.5: Hyperlink to the Current Workbook
-				// e.g. Sheet2!B1:C2, stored in text mark field
-				$url = 'sheet://';
-				break;
-
-			default:
-				return;
-
-			}
-
-			if ($hasText) {
-				// offset: var; size: 4; character count of text mark including trailing zero word
-				$tl = self::_GetInt4d($recordData, $offset);
-				$offset += 4;
-				// offset: var; size: var; character array of the text mark without the # sign, no Unicode header, always 16-bit characters, zero-terminated
-				$text = self::_encodeUTF16(substr($recordData, $offset, 2 * ($tl - 1)), false);
-				$url .= $text;
-			}
-
-			// apply the hyperlink to all the relevant cells
-			foreach (PHPExcel_Cell::extractAllCellReferencesInRange($cellRange) as $coordinate) {
-				$this->_phpSheet->getCell($coordinate)->getHyperLink()->setUrl($url);
-			}
-		}
-	}
-
-
-	/**
-	 * Read DATAVALIDATIONS record
-	 */
-	private function _readDataValidations()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer forward to next record
-		$this->_pos += 4 + $length;
-	}
-
-
-	/**
-	 * Read DATAVALIDATION record
-	 */
-	private function _readDataValidation()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer forward to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_readDataOnly) {
-			return;
-		}
-
-		// offset: 0; size: 4; Options
-		$options = self::_GetInt4d($recordData, 0);
-
-		// bit: 0-3; mask: 0x0000000F; type
-		$type = (0x0000000F & $options) >> 0;
-		switch ($type) {
-			case 0x00:	$type = PHPExcel_Cell_DataValidation::TYPE_NONE;		break;
-			case 0x01:	$type = PHPExcel_Cell_DataValidation::TYPE_WHOLE;		break;
-			case 0x02:	$type = PHPExcel_Cell_DataValidation::TYPE_DECIMAL;		break;
-			case 0x03:	$type = PHPExcel_Cell_DataValidation::TYPE_LIST;		break;
-			case 0x04:	$type = PHPExcel_Cell_DataValidation::TYPE_DATE;		break;
-			case 0x05:	$type = PHPExcel_Cell_DataValidation::TYPE_TIME;		break;
-			case 0x06:	$type = PHPExcel_Cell_DataValidation::TYPE_TEXTLENGTH;	break;
-			case 0x07:	$type = PHPExcel_Cell_DataValidation::TYPE_CUSTOM;		break;
-		}
-
-		// bit: 4-6; mask: 0x00000070; error type
-		$errorStyle = (0x00000070 & $options) >> 4;
-		switch ($errorStyle) {
-			case 0x00:	$errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP;			break;
-			case 0x01:	$errorStyle = PHPExcel_Cell_DataValidation::STYLE_WARNING;		break;
-			case 0x02:	$errorStyle = PHPExcel_Cell_DataValidation::STYLE_INFORMATION;	break;
-		}
-
-		// bit: 7; mask: 0x00000080; 1= formula is explicit (only applies to list)
-		// I have only seen cases where this is 1
-		$explicitFormula = (0x00000080 & $options) >> 7;
-
-		// bit: 8; mask: 0x00000100; 1= empty cells allowed
-		$allowBlank = (0x00000100 & $options) >> 8;
-
-		// bit: 9; mask: 0x00000200; 1= suppress drop down arrow in list type validity
-		$suppressDropDown = (0x00000200 & $options) >> 9;
-
-		// bit: 18; mask: 0x00040000; 1= show prompt box if cell selected
-		$showInputMessage = (0x00040000 & $options) >> 18;
-
-		// bit: 19; mask: 0x00080000; 1= show error box if invalid values entered
-		$showErrorMessage = (0x00080000 & $options) >> 19;
-
-		// bit: 20-23; mask: 0x00F00000; condition operator
-		$operator = (0x00F00000 & $options) >> 20;
-		switch ($operator) {
-			case 0x00: $operator = PHPExcel_Cell_DataValidation::OPERATOR_BETWEEN			;	break;
-			case 0x01: $operator = PHPExcel_Cell_DataValidation::OPERATOR_NOTBETWEEN		;	break;
-			case 0x02: $operator = PHPExcel_Cell_DataValidation::OPERATOR_EQUAL				;	break;
-			case 0x03: $operator = PHPExcel_Cell_DataValidation::OPERATOR_NOTEQUAL			;	break;
-			case 0x04: $operator = PHPExcel_Cell_DataValidation::OPERATOR_GREATERTHAN		;	break;
-			case 0x05: $operator = PHPExcel_Cell_DataValidation::OPERATOR_LESSTHAN			;	break;
-			case 0x06: $operator = PHPExcel_Cell_DataValidation::OPERATOR_GREATERTHANOREQUAL;	break;
-			case 0x07: $operator = PHPExcel_Cell_DataValidation::OPERATOR_LESSTHANOREQUAL	;	break;
-		}
-
-		// offset: 4; size: var; title of the prompt box
-		$offset = 4;
-		$string = self::_readUnicodeStringLong(substr($recordData, $offset));
-		$promptTitle = $string['value'] !== chr(0) ?
-			$string['value'] : '';
-		$offset += $string['size'];
-
-		// offset: var; size: var; title of the error box
-		$string = self::_readUnicodeStringLong(substr($recordData, $offset));
-		$errorTitle = $string['value'] !== chr(0) ?
-			$string['value'] : '';
-		$offset += $string['size'];
-
-		// offset: var; size: var; text of the prompt box
-		$string = self::_readUnicodeStringLong(substr($recordData, $offset));
-		$prompt = $string['value'] !== chr(0) ?
-			$string['value'] : '';
-		$offset += $string['size'];
-
-		// offset: var; size: var; text of the error box
-		$string = self::_readUnicodeStringLong(substr($recordData, $offset));
-		$error = $string['value'] !== chr(0) ?
-			$string['value'] : '';
-		$offset += $string['size'];
-
-		// offset: var; size: 2; size of the formula data for the first condition
-		$sz1 = self::_GetInt2d($recordData, $offset);
-		$offset += 2;
-
-		// offset: var; size: 2; not used
-		$offset += 2;
-
-		// offset: var; size: $sz1; formula data for first condition (without size field)
-		$formula1 = substr($recordData, $offset, $sz1);
-		$formula1 = pack('v', $sz1) . $formula1; // prepend the length
-		try {
-			$formula1 = $this->_getFormulaFromStructure($formula1);
-
-			// in list type validity, null characters are used as item separators
-			if ($type == PHPExcel_Cell_DataValidation::TYPE_LIST) {
-				$formula1 = str_replace(chr(0), ',', $formula1);
-			}
-		} catch (PHPExcel_Exception $e) {
-			return;
-		}
-		$offset += $sz1;
-
-		// offset: var; size: 2; size of the formula data for the first condition
-		$sz2 = self::_GetInt2d($recordData, $offset);
-		$offset += 2;
-
-		// offset: var; size: 2; not used
-		$offset += 2;
-
-		// offset: var; size: $sz2; formula data for second condition (without size field)
-		$formula2 = substr($recordData, $offset, $sz2);
-		$formula2 = pack('v', $sz2) . $formula2; // prepend the length
-		try {
-			$formula2 = $this->_getFormulaFromStructure($formula2);
-		} catch (PHPExcel_Exception $e) {
-			return;
-		}
-		$offset += $sz2;
-
-		// offset: var; size: var; cell range address list with
-		$cellRangeAddressList = $this->_readBIFF8CellRangeAddressList(substr($recordData, $offset));
-		$cellRangeAddresses = $cellRangeAddressList['cellRangeAddresses'];
-
-		foreach ($cellRangeAddresses as $cellRange) {
-			$stRange = $this->_phpSheet->shrinkRangeToFit($cellRange);
-			$stRange = PHPExcel_Cell::extractAllCellReferencesInRange($stRange);
-			foreach ($stRange as $coordinate) {
-				$objValidation = $this->_phpSheet->getCell($coordinate)->getDataValidation();
-				$objValidation->setType($type);
-				$objValidation->setErrorStyle($errorStyle);
-				$objValidation->setAllowBlank((bool)$allowBlank);
-				$objValidation->setShowInputMessage((bool)$showInputMessage);
-				$objValidation->setShowErrorMessage((bool)$showErrorMessage);
-				$objValidation->setShowDropDown(!$suppressDropDown);
-				$objValidation->setOperator($operator);
-				$objValidation->setErrorTitle($errorTitle);
-				$objValidation->setError($error);
-				$objValidation->setPromptTitle($promptTitle);
-				$objValidation->setPrompt($prompt);
-				$objValidation->setFormula1($formula1);
-				$objValidation->setFormula2($formula2);
-			}
-		}
-
-	}
-
-
-	/**
-	 * Read SHEETLAYOUT record. Stores sheet tab color information.
-	 */
-	private function _readSheetLayout()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// local pointer in record data
-		$offset = 0;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 2; repeated record identifier 0x0862
-
-			// offset: 2; size: 10; not used
-
-			// offset: 12; size: 4; size of record data
-			// Excel 2003 uses size of 0x14 (documented), Excel 2007 uses size of 0x28 (not documented?)
-			$sz = self::_GetInt4d($recordData, 12);
-
-			switch ($sz) {
-				case 0x14:
-					// offset: 16; size: 2; color index for sheet tab
-					$colorIndex = self::_GetInt2d($recordData, 16);
-					$color = self::_readColor($colorIndex,$this->_palette,$this->_version);
-					$this->_phpSheet->getTabColor()->setRGB($color['rgb']);
-					break;
-
-				case 0x28:
-					// TODO: Investigate structure for .xls SHEETLAYOUT record as saved by MS Office Excel 2007
-					return;
-					break;
-			}
-		}
-	}
-
-
-	/**
-	 * Read SHEETPROTECTION record (FEATHEADR)
-	 */
-	private function _readSheetProtection()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_readDataOnly) {
-			return;
-		}
-
-		// offset: 0; size: 2; repeated record header
-
-		// offset: 2; size: 2; FRT cell reference flag (=0 currently)
-
-		// offset: 4; size: 8; Currently not used and set to 0
-
-		// offset: 12; size: 2; Shared feature type index (2=Enhanced Protetion, 4=SmartTag)
-		$isf = self::_GetInt2d($recordData, 12);
-		if ($isf != 2) {
-			return;
-		}
-
-		// offset: 14; size: 1; =1 since this is a feat header
-
-		// offset: 15; size: 4; size of rgbHdrSData
-
-		// rgbHdrSData, assume "Enhanced Protection"
-		// offset: 19; size: 2; option flags
-		$options = self::_GetInt2d($recordData, 19);
-
-		// bit: 0; mask 0x0001; 1 = user may edit objects, 0 = users must not edit objects
-		$bool = (0x0001 & $options) >> 0;
-		$this->_phpSheet->getProtection()->setObjects(!$bool);
-
-		// bit: 1; mask 0x0002; edit scenarios
-		$bool = (0x0002 & $options) >> 1;
-		$this->_phpSheet->getProtection()->setScenarios(!$bool);
-
-		// bit: 2; mask 0x0004; format cells
-		$bool = (0x0004 & $options) >> 2;
-		$this->_phpSheet->getProtection()->setFormatCells(!$bool);
-
-		// bit: 3; mask 0x0008; format columns
-		$bool = (0x0008 & $options) >> 3;
-		$this->_phpSheet->getProtection()->setFormatColumns(!$bool);
-
-		// bit: 4; mask 0x0010; format rows
-		$bool = (0x0010 & $options) >> 4;
-		$this->_phpSheet->getProtection()->setFormatRows(!$bool);
-
-		// bit: 5; mask 0x0020; insert columns
-		$bool = (0x0020 & $options) >> 5;
-		$this->_phpSheet->getProtection()->setInsertColumns(!$bool);
-
-		// bit: 6; mask 0x0040; insert rows
-		$bool = (0x0040 & $options) >> 6;
-		$this->_phpSheet->getProtection()->setInsertRows(!$bool);
-
-		// bit: 7; mask 0x0080; insert hyperlinks
-		$bool = (0x0080 & $options) >> 7;
-		$this->_phpSheet->getProtection()->setInsertHyperlinks(!$bool);
-
-		// bit: 8; mask 0x0100; delete columns
-		$bool = (0x0100 & $options) >> 8;
-		$this->_phpSheet->getProtection()->setDeleteColumns(!$bool);
-
-		// bit: 9; mask 0x0200; delete rows
-		$bool = (0x0200 & $options) >> 9;
-		$this->_phpSheet->getProtection()->setDeleteRows(!$bool);
-
-		// bit: 10; mask 0x0400; select locked cells
-		$bool = (0x0400 & $options) >> 10;
-		$this->_phpSheet->getProtection()->setSelectLockedCells(!$bool);
-
-		// bit: 11; mask 0x0800; sort cell range
-		$bool = (0x0800 & $options) >> 11;
-		$this->_phpSheet->getProtection()->setSort(!$bool);
-
-		// bit: 12; mask 0x1000; auto filter
-		$bool = (0x1000 & $options) >> 12;
-		$this->_phpSheet->getProtection()->setAutoFilter(!$bool);
-
-		// bit: 13; mask 0x2000; pivot tables
-		$bool = (0x2000 & $options) >> 13;
-		$this->_phpSheet->getProtection()->setPivotTables(!$bool);
-
-		// bit: 14; mask 0x4000; select unlocked cells
-		$bool = (0x4000 & $options) >> 14;
-		$this->_phpSheet->getProtection()->setSelectUnlockedCells(!$bool);
-
-		// offset: 21; size: 2; not used
-	}
-
-
-	/**
-	 * Read RANGEPROTECTION record
-	 * Reading of this record is based on Microsoft Office Excel 97-2000 Binary File Format Specification,
-	 * where it is referred to as FEAT record
-	 */
-	private function _readRangeProtection()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// local pointer in record data
-		$offset = 0;
-
-		if (!$this->_readDataOnly) {
-			$offset += 12;
-
-			// offset: 12; size: 2; shared feature type, 2 = enhanced protection, 4 = smart tag
-			$isf = self::_GetInt2d($recordData, 12);
-			if ($isf != 2) {
-				// we only read FEAT records of type 2
-				return;
-			}
-			$offset += 2;
-
-			$offset += 5;
-
-			// offset: 19; size: 2; count of ref ranges this feature is on
-			$cref = self::_GetInt2d($recordData, 19);
-			$offset += 2;
-
-			$offset += 6;
-
-			// offset: 27; size: 8 * $cref; list of cell ranges (like in hyperlink record)
-			$cellRanges = array();
-			for ($i = 0; $i < $cref; ++$i) {
-				try {
-					$cellRange = $this->_readBIFF8CellRangeAddressFixed(substr($recordData, 27 + 8 * $i, 8));
-				} catch (PHPExcel_Exception $e) {
-					return;
-				}
-				$cellRanges[] = $cellRange;
-				$offset += 8;
-			}
-
-			// offset: var; size: var; variable length of feature specific data
-			$rgbFeat = substr($recordData, $offset);
-			$offset += 4;
-
-			// offset: var; size: 4; the encrypted password (only 16-bit although field is 32-bit)
-			$wPassword = self::_GetInt4d($recordData, $offset);
-			$offset += 4;
-
-			// Apply range protection to sheet
-			if ($cellRanges) {
-				$this->_phpSheet->protectCells(implode(' ', $cellRanges), strtoupper(dechex($wPassword)), true);
-			}
-		}
-	}
-
-
-	/**
-	 * Read IMDATA record
-	 */
-	private function _readImData()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-
-		// get spliced record data
-		$splicedRecordData = $this->_getSplicedRecordData();
-		$recordData = $splicedRecordData['recordData'];
-
-		// UNDER CONSTRUCTION
-
-		// offset: 0; size: 2; image format
-		$cf = self::_GetInt2d($recordData, 0);
-
-		// offset: 2; size: 2; environment from which the file was written
-		$env = self::_GetInt2d($recordData, 2);
-
-		// offset: 4; size: 4; length of the image data
-		$lcb = self::_GetInt4d($recordData, 4);
-
-		// offset: 8; size: var; image data
-		$iData = substr($recordData, 8);
-
-		switch ($cf) {
-		case 0x09: // Windows bitmap format
-			// BITMAPCOREINFO
-			// 1. BITMAPCOREHEADER
-			// offset: 0; size: 4; bcSize, Specifies the number of bytes required by the structure
-			$bcSize = self::_GetInt4d($iData, 0);
-//			var_dump($bcSize);
-
-			// offset: 4; size: 2; bcWidth, specifies the width of the bitmap, in pixels
-			$bcWidth = self::_GetInt2d($iData, 4);
-//			var_dump($bcWidth);
-
-			// offset: 6; size: 2; bcHeight, specifies the height of the bitmap, in pixels.
-			$bcHeight = self::_GetInt2d($iData, 6);
-//			var_dump($bcHeight);
-			$ih = imagecreatetruecolor($bcWidth, $bcHeight);
-
-			// offset: 8; size: 2; bcPlanes, specifies the number of planes for the target device. This value must be 1
-
-			// offset: 10; size: 2; bcBitCount specifies the number of bits-per-pixel. This value must be 1, 4, 8, or 24
-			$bcBitCount = self::_GetInt2d($iData, 10);
-//			var_dump($bcBitCount);
-
-			$rgbString = substr($iData, 12);
-			$rgbTriples = array();
-			while (strlen($rgbString) > 0) {
-				$rgbTriples[] = unpack('Cb/Cg/Cr', $rgbString);
-				$rgbString = substr($rgbString, 3);
-			}
-			$x = 0;
-			$y = 0;
-			foreach ($rgbTriples as $i => $rgbTriple) {
-				$color = imagecolorallocate($ih, $rgbTriple['r'], $rgbTriple['g'], $rgbTriple['b']);
-				imagesetpixel($ih, $x, $bcHeight - 1 - $y, $color);
-				$x = ($x + 1) % $bcWidth;
-				$y = $y + floor(($x + 1) / $bcWidth);
-			}
-			//imagepng($ih, 'image.png');
-
-			$drawing = new PHPExcel_Worksheet_Drawing();
-			$drawing->setPath($filename);
-			$drawing->setWorksheet($this->_phpSheet);
-
-			break;
-
-		case 0x02: // Windows metafile or Macintosh PICT format
-		case 0x0e: // native format
-		default;
-			break;
-
-		}
-
-		// _getSplicedRecordData() takes care of moving current position in data stream
-	}
-
-
-	/**
-	 * Read a free CONTINUE record. Free CONTINUE record may be a camouflaged MSODRAWING record
-	 * When MSODRAWING data on a sheet exceeds 8224 bytes, CONTINUE records are used instead. Undocumented.
-	 * In this case, we must treat the CONTINUE record as a MSODRAWING record
-	 */
-	private function _readContinue()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-		// check if we are reading drawing data
-		// this is in case a free CONTINUE record occurs in other circumstances we are unaware of
-		if ($this->_drawingData == '') {
-			// move stream pointer to next record
-			$this->_pos += 4 + $length;
-
-			return;
-		}
-
-		// check if record data is at least 4 bytes long, otherwise there is no chance this is MSODRAWING data
-		if ($length < 4) {
-			// move stream pointer to next record
-			$this->_pos += 4 + $length;
-
-			return;
-		}
-
-		// dirty check to see if CONTINUE record could be a camouflaged MSODRAWING record
-		// look inside CONTINUE record to see if it looks like a part of an Escher stream
-		// we know that Escher stream may be split at least at
-		//		0xF003 MsofbtSpgrContainer
-		//		0xF004 MsofbtSpContainer
-		//		0xF00D MsofbtClientTextbox
-		$validSplitPoints = array(0xF003, 0xF004, 0xF00D); // add identifiers if we find more
-
-		$splitPoint = self::_GetInt2d($recordData, 2);
-		if (in_array($splitPoint, $validSplitPoints)) {
-			// get spliced record data (and move pointer to next record)
-			$splicedRecordData = $this->_getSplicedRecordData();
-			$this->_drawingData .= $splicedRecordData['recordData'];
-
-			return;
-		}
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-	}
-
-
-	/**
-	 * Reads a record from current position in data stream and continues reading data as long as CONTINUE
-	 * records are found. Splices the record data pieces and returns the combined string as if record data
-	 * is in one piece.
-	 * Moves to next current position in data stream to start of next record different from a CONtINUE record
-	 *
-	 * @return array
-	 */
-	private function _getSplicedRecordData()
-	{
-		$data = '';
-		$spliceOffsets = array();
-
-		$i = 0;
-		$spliceOffsets[0] = 0;
-
-		do {
-			++$i;
-
-			// offset: 0; size: 2; identifier
-			$identifier = self::_GetInt2d($this->_data, $this->_pos);
-			// offset: 2; size: 2; length
-			$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-			$data .= $this->_readRecordData($this->_data, $this->_pos + 4, $length);
-
-			$spliceOffsets[$i] = $spliceOffsets[$i - 1] + $length;
-
-			$this->_pos += 4 + $length;
-			$nextIdentifier = self::_GetInt2d($this->_data, $this->_pos);
-		}
-		while ($nextIdentifier == self::XLS_Type_CONTINUE);
-
-		$splicedData = array(
-			'recordData' => $data,
-			'spliceOffsets' => $spliceOffsets,
-		);
-
-		return $splicedData;
-
-	}
-
-
-	/**
-	 * Convert formula structure into human readable Excel formula like 'A3+A5*5'
-	 *
-	 * @param string $formulaStructure The complete binary data for the formula
-	 * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
-	 * @return string Human readable formula
-	 */
-	private function _getFormulaFromStructure($formulaStructure, $baseCell = 'A1')
-	{
-		// offset: 0; size: 2; size of the following formula data
-		$sz = self::_GetInt2d($formulaStructure, 0);
-
-		// offset: 2; size: sz
-		$formulaData = substr($formulaStructure, 2, $sz);
-
-		// for debug: dump the formula data
-		//echo '<xmp>';
-		//echo 'size: ' . $sz . "\n";
-		//echo 'the entire formula data: ';
-		//Debug::dump($formulaData);
-		//echo "\n----\n";
-
-		// offset: 2 + sz; size: variable (optional)
-		if (strlen($formulaStructure) > 2 + $sz) {
-			$additionalData = substr($formulaStructure, 2 + $sz);
-
-			// for debug: dump the additional data
-			//echo 'the entire additional data: ';
-			//Debug::dump($additionalData);
-			//echo "\n----\n";
-
-		} else {
-			$additionalData = '';
-		}
-
-		return $this->_getFormulaFromData($formulaData, $additionalData, $baseCell);
-	}
-
-
-	/**
-	 * Take formula data and additional data for formula and return human readable formula
-	 *
-	 * @param string $formulaData The binary data for the formula itself
-	 * @param string $additionalData Additional binary data going with the formula
-	 * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
-	 * @return string Human readable formula
-	 */
-	private function _getFormulaFromData($formulaData,  $additionalData = '', $baseCell = 'A1')
-	{
-		// start parsing the formula data
-		$tokens = array();
-
-		while (strlen($formulaData) > 0 and $token = $this->_getNextToken($formulaData, $baseCell)) {
-			$tokens[] = $token;
-			$formulaData = substr($formulaData, $token['size']);
-
-			// for debug: dump the token
-			//var_dump($token);
-		}
-
-		$formulaString = $this->_createFormulaFromTokens($tokens, $additionalData);
-
-		return $formulaString;
-	}
-
-
-	/**
-	 * Take array of tokens together with additional data for formula and return human readable formula
-	 *
-	 * @param array $tokens
-	 * @param array $additionalData Additional binary data going with the formula
-	 * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
-	 * @return string Human readable formula
-	 */
-	private function _createFormulaFromTokens($tokens, $additionalData)
-	{
-		// empty formula?
-		if (empty($tokens)) {
-			return '';
-		}
-
-		$formulaStrings = array();
-		foreach ($tokens as $token) {
-			// initialize spaces
-			$space0 = isset($space0) ? $space0 : ''; // spaces before next token, not tParen
-			$space1 = isset($space1) ? $space1 : ''; // carriage returns before next token, not tParen
-			$space2 = isset($space2) ? $space2 : ''; // spaces before opening parenthesis
-			$space3 = isset($space3) ? $space3 : ''; // carriage returns before opening parenthesis
-			$space4 = isset($space4) ? $space4 : ''; // spaces before closing parenthesis
-			$space5 = isset($space5) ? $space5 : ''; // carriage returns before closing parenthesis
-
-			switch ($token['name']) {
-			case 'tAdd': // addition
-			case 'tConcat': // addition
-			case 'tDiv': // division
-			case 'tEQ': // equality
-			case 'tGE': // greater than or equal
-			case 'tGT': // greater than
-			case 'tIsect': // intersection
-			case 'tLE': // less than or equal
-			case 'tList': // less than or equal
-			case 'tLT': // less than
-			case 'tMul': // multiplication
-			case 'tNE': // multiplication
-			case 'tPower': // power
-			case 'tRange': // range
-			case 'tSub': // subtraction
-				$op2 = array_pop($formulaStrings);
-				$op1 = array_pop($formulaStrings);
-				$formulaStrings[] = "$op1$space1$space0{$token['data']}$op2";
-				unset($space0, $space1);
-				break;
-			case 'tUplus': // unary plus
-			case 'tUminus': // unary minus
-				$op = array_pop($formulaStrings);
-				$formulaStrings[] = "$space1$space0{$token['data']}$op";
-				unset($space0, $space1);
-				break;
-			case 'tPercent': // percent sign
-				$op = array_pop($formulaStrings);
-				$formulaStrings[] = "$op$space1$space0{$token['data']}";
-				unset($space0, $space1);
-				break;
-			case 'tAttrVolatile': // indicates volatile function
-			case 'tAttrIf':
-			case 'tAttrSkip':
-			case 'tAttrChoose':
-				// token is only important for Excel formula evaluator
-				// do nothing
-				break;
-			case 'tAttrSpace': // space / carriage return
-				// space will be used when next token arrives, do not alter formulaString stack
-				switch ($token['data']['spacetype']) {
-				case 'type0':
-					$space0 = str_repeat(' ', $token['data']['spacecount']);
-					break;
-				case 'type1':
-					$space1 = str_repeat("\n", $token['data']['spacecount']);
-					break;
-				case 'type2':
-					$space2 = str_repeat(' ', $token['data']['spacecount']);
-					break;
-				case 'type3':
-					$space3 = str_repeat("\n", $token['data']['spacecount']);
-					break;
-				case 'type4':
-					$space4 = str_repeat(' ', $token['data']['spacecount']);
-					break;
-				case 'type5':
-					$space5 = str_repeat("\n", $token['data']['spacecount']);
-					break;
-				}
-				break;
-			case 'tAttrSum': // SUM function with one parameter
-				$op = array_pop($formulaStrings);
-				$formulaStrings[] = "{$space1}{$space0}SUM($op)";
-				unset($space0, $space1);
-				break;
-			case 'tFunc': // function with fixed number of arguments
-			case 'tFuncV': // function with variable number of arguments
-				if ($token['data']['function'] != '') {
-					// normal function
-					$ops = array(); // array of operators
-					for ($i = 0; $i < $token['data']['args']; ++$i) {
-						$ops[] = array_pop($formulaStrings);
-					}
-					$ops = array_reverse($ops);
-					$formulaStrings[] = "$space1$space0{$token['data']['function']}(" . implode(',', $ops) . ")";
-					unset($space0, $space1);
-				} else {
-					// add-in function
-					$ops = array(); // array of operators
-					for ($i = 0; $i < $token['data']['args'] - 1; ++$i) {
-						$ops[] = array_pop($formulaStrings);
-					}
-					$ops = array_reverse($ops);
-					$function = array_pop($formulaStrings);
-					$formulaStrings[] = "$space1$space0$function(" . implode(',', $ops) . ")";
-					unset($space0, $space1);
-				}
-				break;
-			case 'tParen': // parenthesis
-				$expression = array_pop($formulaStrings);
-				$formulaStrings[] = "$space3$space2($expression$space5$space4)";
-				unset($space2, $space3, $space4, $space5);
-				break;
-			case 'tArray': // array constant
-				$constantArray = self::_readBIFF8ConstantArray($additionalData);
-				$formulaStrings[] = $space1 . $space0 . $constantArray['value'];
-				$additionalData = substr($additionalData, $constantArray['size']); // bite of chunk of additional data
-				unset($space0, $space1);
-				break;
-			case 'tMemArea':
-				// bite off chunk of additional data
-				$cellRangeAddressList = $this->_readBIFF8CellRangeAddressList($additionalData);
-				$additionalData = substr($additionalData, $cellRangeAddressList['size']);
-				$formulaStrings[] = "$space1$space0{$token['data']}";
-				unset($space0, $space1);
-				break;
-			case 'tArea': // cell range address
-			case 'tBool': // boolean
-			case 'tErr': // error code
-			case 'tInt': // integer
-			case 'tMemErr':
-			case 'tMemFunc':
-			case 'tMissArg':
-			case 'tName':
-			case 'tNameX':
-			case 'tNum': // number
-			case 'tRef': // single cell reference
-			case 'tRef3d': // 3d cell reference
-			case 'tArea3d': // 3d cell range reference
-			case 'tRefN':
-			case 'tAreaN':
-			case 'tStr': // string
-				$formulaStrings[] = "$space1$space0{$token['data']}";
-				unset($space0, $space1);
-				break;
-			}
-		}
-		$formulaString = $formulaStrings[0];
-
-		// for debug: dump the human readable formula
-		//echo '----' . "\n";
-		//echo 'Formula: ' . $formulaString;
-
-		return $formulaString;
-	}
-
-
-	/**
-	 * Fetch next token from binary formula data
-	 *
-	 * @param string Formula data
-	 * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
-	 * @return array
-	 * @throws PHPExcel_Reader_Exception
-	 */
-	private function _getNextToken($formulaData, $baseCell = 'A1')
-	{
-		// offset: 0; size: 1; token id
-		$id = ord($formulaData[0]); // token id
-		$name = false; // initialize token name
-
-		switch ($id) {
-		case 0x03: $name = 'tAdd';		$size = 1;	$data = '+';	break;
-		case 0x04: $name = 'tSub';		$size = 1;	$data = '-';	break;
-		case 0x05: $name = 'tMul';		$size = 1;	$data = '*';	break;
-		case 0x06: $name = 'tDiv';		$size = 1;	$data = '/';	break;
-		case 0x07: $name = 'tPower';	$size = 1;	$data = '^';	break;
-		case 0x08: $name = 'tConcat';	$size = 1;	$data = '&';	break;
-		case 0x09: $name = 'tLT';		$size = 1;	$data = '<';	break;
-		case 0x0A: $name = 'tLE';		$size = 1;	$data = '<=';	break;
-		case 0x0B: $name = 'tEQ';		$size = 1;	$data = '=';	break;
-		case 0x0C: $name = 'tGE';		$size = 1;	$data = '>=';	break;
-		case 0x0D: $name = 'tGT';		$size = 1;	$data = '>';	break;
-		case 0x0E: $name = 'tNE';		$size = 1;	$data = '<>';	break;
-		case 0x0F: $name = 'tIsect';	$size = 1;	$data = ' ';	break;
-		case 0x10: $name = 'tList';		$size = 1;	$data = ',';	break;
-		case 0x11: $name = 'tRange';	$size = 1;	$data = ':';	break;
-		case 0x12: $name = 'tUplus';	$size = 1;	$data = '+';	break;
-		case 0x13: $name = 'tUminus';	$size = 1;	$data = '-';	break;
-		case 0x14: $name = 'tPercent';	$size = 1;	$data = '%';	break;
-		case 0x15:	//	parenthesis
-			$name  = 'tParen';
-			$size  = 1;
-			$data = null;
-			break;
-		case 0x16:	//	missing argument
-			$name = 'tMissArg';
-			$size = 1;
-			$data = '';
-			break;
-		case 0x17:	//	string
-			$name = 'tStr';
-			// offset: 1; size: var; Unicode string, 8-bit string length
-			$string = self::_readUnicodeStringShort(substr($formulaData, 1));
-			$size = 1 + $string['size'];
-			$data = self::_UTF8toExcelDoubleQuoted($string['value']);
-			break;
-		case 0x19:	//	Special attribute
-			// offset: 1; size: 1; attribute type flags:
-			switch (ord($formulaData[1])) {
-			case 0x01:
-				$name = 'tAttrVolatile';
-				$size = 4;
-				$data = null;
-				break;
-			case 0x02:
-				$name = 'tAttrIf';
-				$size = 4;
-				$data = null;
-				break;
-			case 0x04:
-				$name = 'tAttrChoose';
-				// offset: 2; size: 2; number of choices in the CHOOSE function ($nc, number of parameters decreased by 1)
-				$nc = self::_GetInt2d($formulaData, 2);
-				// offset: 4; size: 2 * $nc
-				// offset: 4 + 2 * $nc; size: 2
-				$size = 2 * $nc + 6;
-				$data = null;
-				break;
-			case 0x08:
-				$name = 'tAttrSkip';
-				$size = 4;
-				$data = null;
-				break;
-			case 0x10:
-				$name = 'tAttrSum';
-				$size = 4;
-				$data = null;
-				break;
-			case 0x40:
-			case 0x41:
-				$name = 'tAttrSpace';
-				$size = 4;
-				// offset: 2; size: 2; space type and position
-				switch (ord($formulaData[2])) {
-				case 0x00:
-					$spacetype = 'type0';
-					break;
-				case 0x01:
-					$spacetype = 'type1';
-					break;
-				case 0x02:
-					$spacetype = 'type2';
-					break;
-				case 0x03:
-					$spacetype = 'type3';
-					break;
-				case 0x04:
-					$spacetype = 'type4';
-					break;
-				case 0x05:
-					$spacetype = 'type5';
-					break;
-				default:
-					throw new PHPExcel_Reader_Exception('Unrecognized space type in tAttrSpace token');
-					break;
-				}
-				// offset: 3; size: 1; number of inserted spaces/carriage returns
-				$spacecount = ord($formulaData[3]);
-
-				$data = array('spacetype' => $spacetype, 'spacecount' => $spacecount);
-				break;
-			default:
-				throw new PHPExcel_Reader_Exception('Unrecognized attribute flag in tAttr token');
-				break;
-			}
-			break;
-		case 0x1C:	//	error code
-			// offset: 1; size: 1; error code
-			$name = 'tErr';
-			$size = 2;
-			$data = self::_mapErrorCode(ord($formulaData[1]));
-			break;
-		case 0x1D:	//	boolean
-			// offset: 1; size: 1; 0 = false, 1 = true;
-			$name = 'tBool';
-			$size = 2;
-			$data = ord($formulaData[1]) ? 'TRUE' : 'FALSE';
-			break;
-		case 0x1E:	//	integer
-			// offset: 1; size: 2; unsigned 16-bit integer
-			$name = 'tInt';
-			$size = 3;
-			$data = self::_GetInt2d($formulaData, 1);
-			break;
-		case 0x1F:	//	number
-			// offset: 1; size: 8;
-			$name = 'tNum';
-			$size = 9;
-			$data = self::_extractNumber(substr($formulaData, 1));
-			$data = str_replace(',', '.', (string)$data); // in case non-English locale
-			break;
-		case 0x20:	//	array constant
-		case 0x40:
-		case 0x60:
-			// offset: 1; size: 7; not used
-			$name = 'tArray';
-			$size = 8;
-			$data = null;
-			break;
-		case 0x21:	//	function with fixed number of arguments
-		case 0x41:
-		case 0x61:
-			$name = 'tFunc';
-			$size = 3;
-			// offset: 1; size: 2; index to built-in sheet function
-			switch (self::_GetInt2d($formulaData, 1)) {
-			case   2: $function = 'ISNA'; 			$args = 1; 	break;
-			case   3: $function = 'ISERROR'; 		$args = 1; 	break;
-			case  10: $function = 'NA'; 			$args = 0; 	break;
-			case  15: $function = 'SIN'; 			$args = 1; 	break;
-			case  16: $function = 'COS'; 			$args = 1; 	break;
-			case  17: $function = 'TAN'; 			$args = 1; 	break;
-			case  18: $function = 'ATAN'; 			$args = 1; 	break;
-			case  19: $function = 'PI'; 			$args = 0; 	break;
-			case  20: $function = 'SQRT'; 			$args = 1; 	break;
-			case  21: $function = 'EXP'; 			$args = 1; 	break;
-			case  22: $function = 'LN'; 			$args = 1; 	break;
-			case  23: $function = 'LOG10'; 			$args = 1; 	break;
-			case  24: $function = 'ABS'; 			$args = 1; 	break;
-			case  25: $function = 'INT'; 			$args = 1; 	break;
-			case  26: $function = 'SIGN'; 			$args = 1; 	break;
-			case  27: $function = 'ROUND'; 			$args = 2; 	break;
-			case  30: $function = 'REPT'; 			$args = 2; 	break;
-			case  31: $function = 'MID'; 			$args = 3; 	break;
-			case  32: $function = 'LEN'; 			$args = 1; 	break;
-			case  33: $function = 'VALUE'; 			$args = 1; 	break;
-			case  34: $function = 'TRUE'; 			$args = 0; 	break;
-			case  35: $function = 'FALSE'; 			$args = 0; 	break;
-			case  38: $function = 'NOT'; 			$args = 1; 	break;
-			case  39: $function = 'MOD'; 			$args = 2;	break;
-			case  40: $function = 'DCOUNT'; 		$args = 3;	break;
-			case  41: $function = 'DSUM'; 			$args = 3;	break;
-			case  42: $function = 'DAVERAGE'; 		$args = 3;	break;
-			case  43: $function = 'DMIN'; 			$args = 3;	break;
-			case  44: $function = 'DMAX'; 			$args = 3;	break;
-			case  45: $function = 'DSTDEV'; 		$args = 3;	break;
-			case  48: $function = 'TEXT'; 			$args = 2;	break;
-			case  61: $function = 'MIRR'; 			$args = 3;	break;
-			case  63: $function = 'RAND'; 			$args = 0;	break;
-			case  65: $function = 'DATE'; 			$args = 3;	break;
-			case  66: $function = 'TIME'; 			$args = 3;	break;
-			case  67: $function = 'DAY'; 			$args = 1;	break;
-			case  68: $function = 'MONTH'; 			$args = 1;	break;
-			case  69: $function = 'YEAR'; 			$args = 1;	break;
-			case  71: $function = 'HOUR'; 			$args = 1;	break;
-			case  72: $function = 'MINUTE'; 		$args = 1;	break;
-			case  73: $function = 'SECOND'; 		$args = 1;	break;
-			case  74: $function = 'NOW'; 			$args = 0;	break;
-			case  75: $function = 'AREAS'; 			$args = 1;	break;
-			case  76: $function = 'ROWS'; 			$args = 1;	break;
-			case  77: $function = 'COLUMNS'; 		$args = 1;	break;
-			case  83: $function = 'TRANSPOSE'; 		$args = 1;	break;
-			case  86: $function = 'TYPE'; 			$args = 1;	break;
-			case  97: $function = 'ATAN2'; 			$args = 2;	break;
-			case  98: $function = 'ASIN'; 			$args = 1;	break;
-			case  99: $function = 'ACOS'; 			$args = 1;	break;
-			case 105: $function = 'ISREF'; 			$args = 1;	break;
-			case 111: $function = 'CHAR'; 			$args = 1;	break;
-			case 112: $function = 'LOWER'; 			$args = 1;	break;
-			case 113: $function = 'UPPER'; 			$args = 1;	break;
-			case 114: $function = 'PROPER'; 		$args = 1;	break;
-			case 117: $function = 'EXACT'; 			$args = 2;	break;
-			case 118: $function = 'TRIM'; 			$args = 1;	break;
-			case 119: $function = 'REPLACE'; 		$args = 4;	break;
-			case 121: $function = 'CODE'; 			$args = 1;	break;
-			case 126: $function = 'ISERR'; 			$args = 1;	break;
-			case 127: $function = 'ISTEXT'; 		$args = 1;	break;
-			case 128: $function = 'ISNUMBER'; 		$args = 1;	break;
-			case 129: $function = 'ISBLANK'; 		$args = 1;	break;
-			case 130: $function = 'T'; 				$args = 1;	break;
-			case 131: $function = 'N'; 				$args = 1;	break;
-			case 140: $function = 'DATEVALUE'; 		$args = 1;	break;
-			case 141: $function = 'TIMEVALUE'; 		$args = 1;	break;
-			case 142: $function = 'SLN'; 			$args = 3;	break;
-			case 143: $function = 'SYD'; 			$args = 4;	break;
-			case 162: $function = 'CLEAN'; 			$args = 1;	break;
-			case 163: $function = 'MDETERM'; 		$args = 1;	break;
-			case 164: $function = 'MINVERSE'; 		$args = 1;	break;
-			case 165: $function = 'MMULT'; 			$args = 2;	break;
-			case 184: $function = 'FACT'; 			$args = 1;	break;
-			case 189: $function = 'DPRODUCT'; 		$args = 3;	break;
-			case 190: $function = 'ISNONTEXT'; 		$args = 1;	break;
-			case 195: $function = 'DSTDEVP'; 		$args = 3;	break;
-			case 196: $function = 'DVARP'; 			$args = 3;	break;
-			case 198: $function = 'ISLOGICAL'; 		$args = 1;	break;
-			case 199: $function = 'DCOUNTA'; 		$args = 3;	break;
-			case 207: $function = 'REPLACEB'; 		$args = 4;	break;
-			case 210: $function = 'MIDB'; 			$args = 3;	break;
-			case 211: $function = 'LENB'; 			$args = 1;	break;
-			case 212: $function = 'ROUNDUP'; 		$args = 2;	break;
-			case 213: $function = 'ROUNDDOWN'; 		$args = 2;	break;
-			case 214: $function = 'ASC'; 			$args = 1;	break;
-			case 215: $function = 'DBCS'; 			$args = 1;	break;
-			case 221: $function = 'TODAY'; 			$args = 0;	break;
-			case 229: $function = 'SINH'; 			$args = 1;	break;
-			case 230: $function = 'COSH'; 			$args = 1;	break;
-			case 231: $function = 'TANH'; 			$args = 1;	break;
-			case 232: $function = 'ASINH'; 			$args = 1;	break;
-			case 233: $function = 'ACOSH'; 			$args = 1;	break;
-			case 234: $function = 'ATANH'; 			$args = 1;	break;
-			case 235: $function = 'DGET'; 			$args = 3;	break;
-			case 244: $function = 'INFO'; 			$args = 1;	break;
-			case 252: $function = 'FREQUENCY'; 		$args = 2;	break;
-			case 261: $function = 'ERROR.TYPE'; 	$args = 1;	break;
-			case 271: $function = 'GAMMALN'; 		$args = 1;	break;
-			case 273: $function = 'BINOMDIST'; 		$args = 4;	break;
-			case 274: $function = 'CHIDIST'; 		$args = 2;	break;
-			case 275: $function = 'CHIINV'; 		$args = 2;	break;
-			case 276: $function = 'COMBIN'; 		$args = 2;	break;
-			case 277: $function = 'CONFIDENCE'; 	$args = 3;	break;
-			case 278: $function = 'CRITBINOM'; 		$args = 3;	break;
-			case 279: $function = 'EVEN'; 			$args = 1;	break;
-			case 280: $function = 'EXPONDIST'; 		$args = 3;	break;
-			case 281: $function = 'FDIST'; 			$args = 3;	break;
-			case 282: $function = 'FINV'; 			$args = 3;	break;
-			case 283: $function = 'FISHER'; 		$args = 1;	break;
-			case 284: $function = 'FISHERINV'; 		$args = 1;	break;
-			case 285: $function = 'FLOOR'; 			$args = 2;	break;
-			case 286: $function = 'GAMMADIST'; 		$args = 4;	break;
-			case 287: $function = 'GAMMAINV'; 		$args = 3;	break;
-			case 288: $function = 'CEILING'; 		$args = 2;	break;
-			case 289: $function = 'HYPGEOMDIST';	$args = 4;	break;
-			case 290: $function = 'LOGNORMDIST';	$args = 3;	break;
-			case 291: $function = 'LOGINV';			$args = 3;	break;
-			case 292: $function = 'NEGBINOMDIST';	$args = 3;	break;
-			case 293: $function = 'NORMDIST';		$args = 4;	break;
-			case 294: $function = 'NORMSDIST';		$args = 1;	break;
-			case 295: $function = 'NORMINV';		$args = 3;	break;
-			case 296: $function = 'NORMSINV';		$args = 1;	break;
-			case 297: $function = 'STANDARDIZE';	$args = 3;	break;
-			case 298: $function = 'ODD';			$args = 1;	break;
-			case 299: $function = 'PERMUT';			$args = 2;	break;
-			case 300: $function = 'POISSON';		$args = 3;	break;
-			case 301: $function = 'TDIST';			$args = 3;	break;
-			case 302: $function = 'WEIBULL';		$args = 4;	break;
-			case 303: $function = 'SUMXMY2';		$args = 2;	break;
-			case 304: $function = 'SUMX2MY2';		$args = 2;	break;
-			case 305: $function = 'SUMX2PY2';		$args = 2;	break;
-			case 306: $function = 'CHITEST';		$args = 2;	break;
-			case 307: $function = 'CORREL';			$args = 2;	break;
-			case 308: $function = 'COVAR';			$args = 2;	break;
-			case 309: $function = 'FORECAST';		$args = 3;	break;
-			case 310: $function = 'FTEST';			$args = 2;	break;
-			case 311: $function = 'INTERCEPT';		$args = 2;	break;
-			case 312: $function = 'PEARSON';		$args = 2;	break;
-			case 313: $function = 'RSQ';			$args = 2;	break;
-			case 314: $function = 'STEYX';			$args = 2;	break;
-			case 315: $function = 'SLOPE';			$args = 2;	break;
-			case 316: $function = 'TTEST';			$args = 4;	break;
-			case 325: $function = 'LARGE';			$args = 2;	break;
-			case 326: $function = 'SMALL';			$args = 2;	break;
-			case 327: $function = 'QUARTILE';		$args = 2;	break;
-			case 328: $function = 'PERCENTILE';		$args = 2;	break;
-			case 331: $function = 'TRIMMEAN';		$args = 2;	break;
-			case 332: $function = 'TINV';			$args = 2;	break;
-			case 337: $function = 'POWER';			$args = 2;	break;
-			case 342: $function = 'RADIANS';		$args = 1;	break;
-			case 343: $function = 'DEGREES';		$args = 1;	break;
-			case 346: $function = 'COUNTIF';		$args = 2;	break;
-			case 347: $function = 'COUNTBLANK';		$args = 1;	break;
-			case 350: $function = 'ISPMT';			$args = 4;	break;
-			case 351: $function = 'DATEDIF';		$args = 3;	break;
-			case 352: $function = 'DATESTRING';		$args = 1;	break;
-			case 353: $function = 'NUMBERSTRING';	$args = 2;	break;
-			case 360: $function = 'PHONETIC';		$args = 1;	break;
-			case 368: $function = 'BAHTTEXT';		$args = 1;	break;
-			default:
-				throw new PHPExcel_Reader_Exception('Unrecognized function in formula');
-				break;
-			}
-			$data = array('function' => $function, 'args' => $args);
-			break;
-		case 0x22:	//	function with variable number of arguments
-		case 0x42:
-		case 0x62:
-			$name = 'tFuncV';
-			$size = 4;
-			// offset: 1; size: 1; number of arguments
-			$args = ord($formulaData[1]);
-			// offset: 2: size: 2; index to built-in sheet function
-			$index = self::_GetInt2d($formulaData, 2);
-			switch ($index) {
-			case   0: $function = 'COUNT';			break;
-			case   1: $function = 'IF';				break;
-			case   4: $function = 'SUM';			break;
-			case   5: $function = 'AVERAGE';		break;
-			case   6: $function = 'MIN';			break;
-			case   7: $function = 'MAX';			break;
-			case   8: $function = 'ROW';			break;
-			case   9: $function = 'COLUMN';			break;
-			case  11: $function = 'NPV';			break;
-			case  12: $function = 'STDEV';			break;
-			case  13: $function = 'DOLLAR';			break;
-			case  14: $function = 'FIXED';			break;
-			case  28: $function = 'LOOKUP';			break;
-			case  29: $function = 'INDEX';			break;
-			case  36: $function = 'AND';			break;
-			case  37: $function = 'OR';				break;
-			case  46: $function = 'VAR';			break;
-			case  49: $function = 'LINEST';			break;
-			case  50: $function = 'TREND';			break;
-			case  51: $function = 'LOGEST';			break;
-			case  52: $function = 'GROWTH';			break;
-			case  56: $function = 'PV';				break;
-			case  57: $function = 'FV';				break;
-			case  58: $function = 'NPER';			break;
-			case  59: $function = 'PMT';			break;
-			case  60: $function = 'RATE';			break;
-			case  62: $function = 'IRR';			break;
-			case  64: $function = 'MATCH';			break;
-			case  70: $function = 'WEEKDAY';		break;
-			case  78: $function = 'OFFSET';			break;
-			case  82: $function = 'SEARCH';			break;
-			case 100: $function = 'CHOOSE';			break;
-			case 101: $function = 'HLOOKUP';		break;
-			case 102: $function = 'VLOOKUP';		break;
-			case 109: $function = 'LOG';			break;
-			case 115: $function = 'LEFT';			break;
-			case 116: $function = 'RIGHT';			break;
-			case 120: $function = 'SUBSTITUTE';		break;
-			case 124: $function = 'FIND';			break;
-			case 125: $function = 'CELL';			break;
-			case 144: $function = 'DDB';			break;
-			case 148: $function = 'INDIRECT';		break;
-			case 167: $function = 'IPMT';			break;
-			case 168: $function = 'PPMT';			break;
-			case 169: $function = 'COUNTA';			break;
-			case 183: $function = 'PRODUCT';		break;
-			case 193: $function = 'STDEVP';			break;
-			case 194: $function = 'VARP';			break;
-			case 197: $function = 'TRUNC';			break;
-			case 204: $function = 'USDOLLAR';		break;
-			case 205: $function = 'FINDB';			break;
-			case 206: $function = 'SEARCHB';		break;
-			case 208: $function = 'LEFTB';			break;
-			case 209: $function = 'RIGHTB';			break;
-			case 216: $function = 'RANK';			break;
-			case 219: $function = 'ADDRESS';		break;
-			case 220: $function = 'DAYS360';		break;
-			case 222: $function = 'VDB';			break;
-			case 227: $function = 'MEDIAN';			break;
-			case 228: $function = 'SUMPRODUCT';		break;
-			case 247: $function = 'DB';				break;
-			case 255: $function = '';				break;
-			case 269: $function = 'AVEDEV';			break;
-			case 270: $function = 'BETADIST';		break;
-			case 272: $function = 'BETAINV';		break;
-			case 317: $function = 'PROB';			break;
-			case 318: $function = 'DEVSQ';			break;
-			case 319: $function = 'GEOMEAN';		break;
-			case 320: $function = 'HARMEAN';		break;
-			case 321: $function = 'SUMSQ';			break;
-			case 322: $function = 'KURT';			break;
-			case 323: $function = 'SKEW';			break;
-			case 324: $function = 'ZTEST';			break;
-			case 329: $function = 'PERCENTRANK';	break;
-			case 330: $function = 'MODE';			break;
-			case 336: $function = 'CONCATENATE';	break;
-			case 344: $function = 'SUBTOTAL';		break;
-			case 345: $function = 'SUMIF';			break;
-			case 354: $function = 'ROMAN';			break;
-			case 358: $function = 'GETPIVOTDATA';	break;
-			case 359: $function = 'HYPERLINK';		break;
-			case 361: $function = 'AVERAGEA';		break;
-			case 362: $function = 'MAXA';			break;
-			case 363: $function = 'MINA';			break;
-			case 364: $function = 'STDEVPA';		break;
-			case 365: $function = 'VARPA';			break;
-			case 366: $function = 'STDEVA';			break;
-			case 367: $function = 'VARA';			break;
-			default:
-				throw new PHPExcel_Reader_Exception('Unrecognized function in formula');
-				break;
-			}
-			$data = array('function' => $function, 'args' => $args);
-			break;
-		case 0x23:	//	index to defined name
-		case 0x43:
-		case 0x63:
-			$name = 'tName';
-			$size = 5;
-			// offset: 1; size: 2; one-based index to definedname record
-			$definedNameIndex = self::_GetInt2d($formulaData, 1) - 1;
-			// offset: 2; size: 2; not used
-			$data = $this->_definedname[$definedNameIndex]['name'];
-			break;
-		case 0x24:	//	single cell reference e.g. A5
-		case 0x44:
-		case 0x64:
-			$name = 'tRef';
-			$size = 5;
-			$data = $this->_readBIFF8CellAddress(substr($formulaData, 1, 4));
-			break;
-		case 0x25:	//	cell range reference to cells in the same sheet (2d)
-		case 0x45:
-		case 0x65:
-			$name = 'tArea';
-			$size = 9;
-			$data = $this->_readBIFF8CellRangeAddress(substr($formulaData, 1, 8));
-			break;
-		case 0x26:	//	Constant reference sub-expression
-		case 0x46:
-		case 0x66:
-			$name = 'tMemArea';
-			// offset: 1; size: 4; not used
-			// offset: 5; size: 2; size of the following subexpression
-			$subSize = self::_GetInt2d($formulaData, 5);
-			$size = 7 + $subSize;
-			$data = $this->_getFormulaFromData(substr($formulaData, 7, $subSize));
-			break;
-		case 0x27:	//	Deleted constant reference sub-expression
-		case 0x47:
-		case 0x67:
-			$name = 'tMemErr';
-			// offset: 1; size: 4; not used
-			// offset: 5; size: 2; size of the following subexpression
-			$subSize = self::_GetInt2d($formulaData, 5);
-			$size = 7 + $subSize;
-			$data = $this->_getFormulaFromData(substr($formulaData, 7, $subSize));
-			break;
-		case 0x29:	//	Variable reference sub-expression
-		case 0x49:
-		case 0x69:
-			$name = 'tMemFunc';
-			// offset: 1; size: 2; size of the following sub-expression
-			$subSize = self::_GetInt2d($formulaData, 1);
-			$size = 3 + $subSize;
-			$data = $this->_getFormulaFromData(substr($formulaData, 3, $subSize));
-			break;
-
-		case 0x2C: // Relative 2d cell reference reference, used in shared formulas and some other places
-		case 0x4C:
-		case 0x6C:
-			$name = 'tRefN';
-			$size = 5;
-			$data = $this->_readBIFF8CellAddressB(substr($formulaData, 1, 4), $baseCell);
-			break;
-
-		case 0x2D:	//	Relative 2d range reference
-		case 0x4D:
-		case 0x6D:
-			$name = 'tAreaN';
-			$size = 9;
-			$data = $this->_readBIFF8CellRangeAddressB(substr($formulaData, 1, 8), $baseCell);
-			break;
-
-		case 0x39:	//	External name
-		case 0x59:
-		case 0x79:
-			$name = 'tNameX';
-			$size = 7;
-			// offset: 1; size: 2; index to REF entry in EXTERNSHEET record
-			// offset: 3; size: 2; one-based index to DEFINEDNAME or EXTERNNAME record
-			$index = self::_GetInt2d($formulaData, 3);
-			// assume index is to EXTERNNAME record
-			$data = $this->_externalNames[$index - 1]['name'];
-			// offset: 5; size: 2; not used
-			break;
-
-		case 0x3A:	//	3d reference to cell
-		case 0x5A:
-		case 0x7A:
-			$name = 'tRef3d';
-			$size = 7;
-
-			try {
-				// offset: 1; size: 2; index to REF entry
-				$sheetRange = $this->_readSheetRangeByRefIndex(self::_GetInt2d($formulaData, 1));
-				// offset: 3; size: 4; cell address
-				$cellAddress = $this->_readBIFF8CellAddress(substr($formulaData, 3, 4));
-
-				$data = "$sheetRange!$cellAddress";
-			} catch (PHPExcel_Exception $e) {
-				// deleted sheet reference
-				$data = '#REF!';
-			}
-
-			break;
-		case 0x3B:	//	3d reference to cell range
-		case 0x5B:
-		case 0x7B:
-			$name = 'tArea3d';
-			$size = 11;
-
-			try {
-				// offset: 1; size: 2; index to REF entry
-				$sheetRange = $this->_readSheetRangeByRefIndex(self::_GetInt2d($formulaData, 1));
-				// offset: 3; size: 8; cell address
-				$cellRangeAddress = $this->_readBIFF8CellRangeAddress(substr($formulaData, 3, 8));
-
-				$data = "$sheetRange!$cellRangeAddress";
-			} catch (PHPExcel_Exception $e) {
-				// deleted sheet reference
-				$data = '#REF!';
-			}
-
-			break;
-		// Unknown cases	// don't know how to deal with
-		default:
-			throw new PHPExcel_Reader_Exception('Unrecognized token ' . sprintf('%02X', $id) . ' in formula');
-			break;
-		}
-
-		return array(
-			'id' => $id,
-			'name' => $name,
-			'size' => $size,
-			'data' => $data,
-		);
-	}
-
-
-	/**
-	 * Reads a cell address in BIFF8 e.g. 'A2' or '$A$2'
-	 * section 3.3.4
-	 *
-	 * @param string $cellAddressStructure
-	 * @return string
-	 */
-	private function _readBIFF8CellAddress($cellAddressStructure)
-	{
-		// offset: 0; size: 2; index to row (0... 65535) (or offset (-32768... 32767))
-		$row = self::_GetInt2d($cellAddressStructure, 0) + 1;
-
-		// offset: 2; size: 2; index to column or column offset + relative flags
-
-			// bit: 7-0; mask 0x00FF; column index
-			$column = PHPExcel_Cell::stringFromColumnIndex(0x00FF & self::_GetInt2d($cellAddressStructure, 2));
-
-			// bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
-			if (!(0x4000 & self::_GetInt2d($cellAddressStructure, 2))) {
-				$column = '$' . $column;
-			}
-			// bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
-			if (!(0x8000 & self::_GetInt2d($cellAddressStructure, 2))) {
-				$row = '$' . $row;
-			}
-
-		return $column . $row;
-	}
-
-
-	/**
-	 * Reads a cell address in BIFF8 for shared formulas. Uses positive and negative values for row and column
-	 * to indicate offsets from a base cell
-	 * section 3.3.4
-	 *
-	 * @param string $cellAddressStructure
-	 * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
-	 * @return string
-	 */
-	private function _readBIFF8CellAddressB($cellAddressStructure, $baseCell = 'A1')
-	{
-		list($baseCol, $baseRow) = PHPExcel_Cell::coordinateFromString($baseCell);
-		$baseCol = PHPExcel_Cell::columnIndexFromString($baseCol) - 1;
-
-		// offset: 0; size: 2; index to row (0... 65535) (or offset (-32768... 32767))
-			$rowIndex = self::_GetInt2d($cellAddressStructure, 0);
-			$row = self::_GetInt2d($cellAddressStructure, 0) + 1;
-
-		// offset: 2; size: 2; index to column or column offset + relative flags
-
-			// bit: 7-0; mask 0x00FF; column index
-			$colIndex = 0x00FF & self::_GetInt2d($cellAddressStructure, 2);
-
-			// bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
-			if (!(0x4000 & self::_GetInt2d($cellAddressStructure, 2))) {
-				$column = PHPExcel_Cell::stringFromColumnIndex($colIndex);
-				$column = '$' . $column;
-			} else {
-				$colIndex = ($colIndex <= 127) ? $colIndex : $colIndex - 256;
-				$column = PHPExcel_Cell::stringFromColumnIndex($baseCol + $colIndex);
-			}
-
-			// bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
-			if (!(0x8000 & self::_GetInt2d($cellAddressStructure, 2))) {
-				$row = '$' . $row;
-			} else {
-				$rowIndex = ($rowIndex <= 32767) ? $rowIndex : $rowIndex - 65536;
-				$row = $baseRow + $rowIndex;
-			}
-
-		return $column . $row;
-	}
-
-
-	/**
-	 * Reads a cell range address in BIFF5 e.g. 'A2:B6' or 'A1'
-	 * always fixed range
-	 * section 2.5.14
-	 *
-	 * @param string $subData
-	 * @return string
-	 * @throws PHPExcel_Reader_Exception
-	 */
-	private function _readBIFF5CellRangeAddressFixed($subData)
-	{
-		// offset: 0; size: 2; index to first row
-		$fr = self::_GetInt2d($subData, 0) + 1;
-
-		// offset: 2; size: 2; index to last row
-		$lr = self::_GetInt2d($subData, 2) + 1;
-
-		// offset: 4; size: 1; index to first column
-		$fc = ord($subData{4});
-
-		// offset: 5; size: 1; index to last column
-		$lc = ord($subData{5});
-
-		// check values
-		if ($fr > $lr || $fc > $lc) {
-			throw new PHPExcel_Reader_Exception('Not a cell range address');
-		}
-
-		// column index to letter
-		$fc = PHPExcel_Cell::stringFromColumnIndex($fc);
-		$lc = PHPExcel_Cell::stringFromColumnIndex($lc);
-
-		if ($fr == $lr and $fc == $lc) {
-			return "$fc$fr";
-		}
-		return "$fc$fr:$lc$lr";
-	}
-
-
-	/**
-	 * Reads a cell range address in BIFF8 e.g. 'A2:B6' or 'A1'
-	 * always fixed range
-	 * section 2.5.14
-	 *
-	 * @param string $subData
-	 * @return string
-	 * @throws PHPExcel_Reader_Exception
-	 */
-	private function _readBIFF8CellRangeAddressFixed($subData)
-	{
-		// offset: 0; size: 2; index to first row
-		$fr = self::_GetInt2d($subData, 0) + 1;
-
-		// offset: 2; size: 2; index to last row
-		$lr = self::_GetInt2d($subData, 2) + 1;
-
-		// offset: 4; size: 2; index to first column
-		$fc = self::_GetInt2d($subData, 4);
-
-		// offset: 6; size: 2; index to last column
-		$lc = self::_GetInt2d($subData, 6);
-
-		// check values
-		if ($fr > $lr || $fc > $lc) {
-			throw new PHPExcel_Reader_Exception('Not a cell range address');
-		}
-
-		// column index to letter
-		$fc = PHPExcel_Cell::stringFromColumnIndex($fc);
-		$lc = PHPExcel_Cell::stringFromColumnIndex($lc);
-
-		if ($fr == $lr and $fc == $lc) {
-			return "$fc$fr";
-		}
-		return "$fc$fr:$lc$lr";
-	}
-
-
-	/**
-	 * Reads a cell range address in BIFF8 e.g. 'A2:B6' or '$A$2:$B$6'
-	 * there are flags indicating whether column/row index is relative
-	 * section 3.3.4
-	 *
-	 * @param string $subData
-	 * @return string
-	 */
-	private function _readBIFF8CellRangeAddress($subData)
-	{
-		// todo: if cell range is just a single cell, should this funciton
-		// not just return e.g. 'A1' and not 'A1:A1' ?
-
-		// offset: 0; size: 2; index to first row (0... 65535) (or offset (-32768... 32767))
-			$fr = self::_GetInt2d($subData, 0) + 1;
-
-		// offset: 2; size: 2; index to last row (0... 65535) (or offset (-32768... 32767))
-			$lr = self::_GetInt2d($subData, 2) + 1;
-
-		// offset: 4; size: 2; index to first column or column offset + relative flags
-
-		// bit: 7-0; mask 0x00FF; column index
-		$fc = PHPExcel_Cell::stringFromColumnIndex(0x00FF & self::_GetInt2d($subData, 4));
-
-		// bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
-		if (!(0x4000 & self::_GetInt2d($subData, 4))) {
-			$fc = '$' . $fc;
-		}
-
-		// bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
-		if (!(0x8000 & self::_GetInt2d($subData, 4))) {
-			$fr = '$' . $fr;
-		}
-
-		// offset: 6; size: 2; index to last column or column offset + relative flags
-
-		// bit: 7-0; mask 0x00FF; column index
-		$lc = PHPExcel_Cell::stringFromColumnIndex(0x00FF & self::_GetInt2d($subData, 6));
-
-		// bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
-		if (!(0x4000 & self::_GetInt2d($subData, 6))) {
-			$lc = '$' . $lc;
-		}
-
-		// bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
-		if (!(0x8000 & self::_GetInt2d($subData, 6))) {
-			$lr = '$' . $lr;
-		}
-
-		return "$fc$fr:$lc$lr";
-	}
-
-
-	/**
-	 * Reads a cell range address in BIFF8 for shared formulas. Uses positive and negative values for row and column
-	 * to indicate offsets from a base cell
-	 * section 3.3.4
-	 *
-	 * @param string $subData
-	 * @param string $baseCell Base cell
-	 * @return string Cell range address
-	 */
-	private function _readBIFF8CellRangeAddressB($subData, $baseCell = 'A1')
-	{
-		list($baseCol, $baseRow) = PHPExcel_Cell::coordinateFromString($baseCell);
-		$baseCol = PHPExcel_Cell::columnIndexFromString($baseCol) - 1;
-
-		// TODO: if cell range is just a single cell, should this funciton
-		// not just return e.g. 'A1' and not 'A1:A1' ?
-
-		// offset: 0; size: 2; first row
-		$frIndex = self::_GetInt2d($subData, 0); // adjust below
-
-		// offset: 2; size: 2; relative index to first row (0... 65535) should be treated as offset (-32768... 32767)
-		$lrIndex = self::_GetInt2d($subData, 2); // adjust below
-
-		// offset: 4; size: 2; first column with relative/absolute flags
-
-		// bit: 7-0; mask 0x00FF; column index
-		$fcIndex = 0x00FF & self::_GetInt2d($subData, 4);
-
-		// bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
-		if (!(0x4000 & self::_GetInt2d($subData, 4))) {
-			// absolute column index
-			$fc = PHPExcel_Cell::stringFromColumnIndex($fcIndex);
-			$fc = '$' . $fc;
-		} else {
-			// column offset
-			$fcIndex = ($fcIndex <= 127) ? $fcIndex : $fcIndex - 256;
-			$fc = PHPExcel_Cell::stringFromColumnIndex($baseCol + $fcIndex);
-		}
-
-		// bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
-		if (!(0x8000 & self::_GetInt2d($subData, 4))) {
-			// absolute row index
-			$fr = $frIndex + 1;
-			$fr = '$' . $fr;
-		} else {
-			// row offset
-			$frIndex = ($frIndex <= 32767) ? $frIndex : $frIndex - 65536;
-			$fr = $baseRow + $frIndex;
-		}
-
-		// offset: 6; size: 2; last column with relative/absolute flags
-
-		// bit: 7-0; mask 0x00FF; column index
-		$lcIndex = 0x00FF & self::_GetInt2d($subData, 6);
-		$lcIndex = ($lcIndex <= 127) ? $lcIndex : $lcIndex - 256;
-		$lc = PHPExcel_Cell::stringFromColumnIndex($baseCol + $lcIndex);
-
-		// bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
-		if (!(0x4000 & self::_GetInt2d($subData, 6))) {
-			// absolute column index
-			$lc = PHPExcel_Cell::stringFromColumnIndex($lcIndex);
-			$lc = '$' . $lc;
-		} else {
-			// column offset
-			$lcIndex = ($lcIndex <= 127) ? $lcIndex : $lcIndex - 256;
-			$lc = PHPExcel_Cell::stringFromColumnIndex($baseCol + $lcIndex);
-		}
-
-		// bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
-		if (!(0x8000 & self::_GetInt2d($subData, 6))) {
-			// absolute row index
-			$lr = $lrIndex + 1;
-			$lr = '$' . $lr;
-		} else {
-			// row offset
-			$lrIndex = ($lrIndex <= 32767) ? $lrIndex : $lrIndex - 65536;
-			$lr = $baseRow + $lrIndex;
-		}
-
-		return "$fc$fr:$lc$lr";
-	}
-
-
-	/**
-	 * Read BIFF8 cell range address list
-	 * section 2.5.15
-	 *
-	 * @param string $subData
-	 * @return array
-	 */
-	private function _readBIFF8CellRangeAddressList($subData)
-	{
-		$cellRangeAddresses = array();
-
-		// offset: 0; size: 2; number of the following cell range addresses
-		$nm = self::_GetInt2d($subData, 0);
-
-		$offset = 2;
-		// offset: 2; size: 8 * $nm; list of $nm (fixed) cell range addresses
-		for ($i = 0; $i < $nm; ++$i) {
-			$cellRangeAddresses[] = $this->_readBIFF8CellRangeAddressFixed(substr($subData, $offset, 8));
-			$offset += 8;
-		}
-
-		return array(
-			'size' => 2 + 8 * $nm,
-			'cellRangeAddresses' => $cellRangeAddresses,
-		);
-	}
-
-
-	/**
-	 * Read BIFF5 cell range address list
-	 * section 2.5.15
-	 *
-	 * @param string $subData
-	 * @return array
-	 */
-	private function _readBIFF5CellRangeAddressList($subData)
-	{
-		$cellRangeAddresses = array();
-
-		// offset: 0; size: 2; number of the following cell range addresses
-		$nm = self::_GetInt2d($subData, 0);
-
-		$offset = 2;
-		// offset: 2; size: 6 * $nm; list of $nm (fixed) cell range addresses
-		for ($i = 0; $i < $nm; ++$i) {
-			$cellRangeAddresses[] = $this->_readBIFF5CellRangeAddressFixed(substr($subData, $offset, 6));
-			$offset += 6;
-		}
-
-		return array(
-			'size' => 2 + 6 * $nm,
-			'cellRangeAddresses' => $cellRangeAddresses,
-		);
-	}
-
-
-	/**
-	 * Get a sheet range like Sheet1:Sheet3 from REF index
-	 * Note: If there is only one sheet in the range, one gets e.g Sheet1
-	 * It can also happen that the REF structure uses the -1 (FFFF) code to indicate deleted sheets,
-	 * in which case an PHPExcel_Reader_Exception is thrown
-	 *
-	 * @param int $index
-	 * @return string|false
-	 * @throws PHPExcel_Reader_Exception
-	 */
-	private function _readSheetRangeByRefIndex($index)
-	{
-		if (isset($this->_ref[$index])) {
-
-			$type = $this->_externalBooks[$this->_ref[$index]['externalBookIndex']]['type'];
-
-			switch ($type) {
-				case 'internal':
-					// check if we have a deleted 3d reference
-					if ($this->_ref[$index]['firstSheetIndex'] == 0xFFFF or $this->_ref[$index]['lastSheetIndex'] == 0xFFFF) {
-						throw new PHPExcel_Reader_Exception('Deleted sheet reference');
-					}
-
-					// we have normal sheet range (collapsed or uncollapsed)
-					$firstSheetName = $this->_sheets[$this->_ref[$index]['firstSheetIndex']]['name'];
-					$lastSheetName = $this->_sheets[$this->_ref[$index]['lastSheetIndex']]['name'];
-
-					if ($firstSheetName == $lastSheetName) {
-						// collapsed sheet range
-						$sheetRange = $firstSheetName;
-					} else {
-						$sheetRange = "$firstSheetName:$lastSheetName";
-					}
-
-					// escape the single-quotes
-					$sheetRange = str_replace("'", "''", $sheetRange);
-
-					// if there are special characters, we need to enclose the range in single-quotes
-					// todo: check if we have identified the whole set of special characters
-					// it seems that the following characters are not accepted for sheet names
-					// and we may assume that they are not present: []*/:\?
-					if (preg_match("/[ !\"@#£$%&{()}<>=+'|^,;-]/", $sheetRange)) {
-						$sheetRange = "'$sheetRange'";
-					}
-
-					return $sheetRange;
-					break;
-
-				default:
-					// TODO: external sheet support
-					throw new PHPExcel_Reader_Exception('Excel5 reader only supports internal sheets in fomulas');
-					break;
-			}
-		}
-		return false;
-	}
-
-
-	/**
-	 * read BIFF8 constant value array from array data
-	 * returns e.g. array('value' => '{1,2;3,4}', 'size' => 40}
-	 * section 2.5.8
-	 *
-	 * @param string $arrayData
-	 * @return array
-	 */
-	private static function _readBIFF8ConstantArray($arrayData)
-	{
-		// offset: 0; size: 1; number of columns decreased by 1
-		$nc = ord($arrayData[0]);
-
-		// offset: 1; size: 2; number of rows decreased by 1
-		$nr = self::_GetInt2d($arrayData, 1);
-		$size = 3; // initialize
-		$arrayData = substr($arrayData, 3);
-
-		// offset: 3; size: var; list of ($nc + 1) * ($nr + 1) constant values
-		$matrixChunks = array();
-		for ($r = 1; $r <= $nr + 1; ++$r) {
-			$items = array();
-			for ($c = 1; $c <= $nc + 1; ++$c) {
-				$constant = self::_readBIFF8Constant($arrayData);
-				$items[] = $constant['value'];
-				$arrayData = substr($arrayData, $constant['size']);
-				$size += $constant['size'];
-			}
-			$matrixChunks[] = implode(',', $items); // looks like e.g. '1,"hello"'
-		}
-		$matrix = '{' . implode(';', $matrixChunks) . '}';
-
-		return array(
-			'value' => $matrix,
-			'size' => $size,
-		);
-	}
-
-
-	/**
-	 * read BIFF8 constant value which may be 'Empty Value', 'Number', 'String Value', 'Boolean Value', 'Error Value'
-	 * section 2.5.7
-	 * returns e.g. array('value' => '5', 'size' => 9)
-	 *
-	 * @param string $valueData
-	 * @return array
-	 */
-	private static function _readBIFF8Constant($valueData)
-	{
-		// offset: 0; size: 1; identifier for type of constant
-		$identifier = ord($valueData[0]);
-
-		switch ($identifier) {
-		case 0x00: // empty constant (what is this?)
-			$value = '';
-			$size = 9;
-			break;
-		case 0x01: // number
-			// offset: 1; size: 8; IEEE 754 floating-point value
-			$value = self::_extractNumber(substr($valueData, 1, 8));
-			$size = 9;
-			break;
-		case 0x02: // string value
-			// offset: 1; size: var; Unicode string, 16-bit string length
-			$string = self::_readUnicodeStringLong(substr($valueData, 1));
-			$value = '"' . $string['value'] . '"';
-			$size = 1 + $string['size'];
-			break;
-		case 0x04: // boolean
-			// offset: 1; size: 1; 0 = FALSE, 1 = TRUE
-			if (ord($valueData[1])) {
-				$value = 'TRUE';
-			} else {
-				$value = 'FALSE';
-			}
-			$size = 9;
-			break;
-		case 0x10: // error code
-			// offset: 1; size: 1; error code
-			$value = self::_mapErrorCode(ord($valueData[1]));
-			$size = 9;
-			break;
-		}
-		return array(
-			'value' => $value,
-			'size' => $size,
-		);
-	}
-
-
-	/**
-	 * Extract RGB color
-	 * OpenOffice.org's Documentation of the Microsoft Excel File Format, section 2.5.4
-	 *
-	 * @param string $rgb Encoded RGB value (4 bytes)
-	 * @return array
-	 */
-	private static function _readRGB($rgb)
-	{
-		// offset: 0; size 1; Red component
-		$r = ord($rgb{0});
-
-		// offset: 1; size: 1; Green component
-		$g = ord($rgb{1});
-
-		// offset: 2; size: 1; Blue component
-		$b = ord($rgb{2});
-
-		// HEX notation, e.g. 'FF00FC'
-		$rgb = sprintf('%02X%02X%02X', $r, $g, $b);
-
-		return array('rgb' => $rgb);
-	}
-
-
-	/**
-	 * Read byte string (8-bit string length)
-	 * OpenOffice documentation: 2.5.2
-	 *
-	 * @param string $subData
-	 * @return array
-	 */
-	private function _readByteStringShort($subData)
-	{
-		// offset: 0; size: 1; length of the string (character count)
-		$ln = ord($subData[0]);
-
-		// offset: 1: size: var; character array (8-bit characters)
-		$value = $this->_decodeCodepage(substr($subData, 1, $ln));
-
-		return array(
-			'value' => $value,
-			'size' => 1 + $ln, // size in bytes of data structure
-		);
-	}
-
-
-	/**
-	 * Read byte string (16-bit string length)
-	 * OpenOffice documentation: 2.5.2
-	 *
-	 * @param string $subData
-	 * @return array
-	 */
-	private function _readByteStringLong($subData)
-	{
-		// offset: 0; size: 2; length of the string (character count)
-		$ln = self::_GetInt2d($subData, 0);
-
-		// offset: 2: size: var; character array (8-bit characters)
-		$value = $this->_decodeCodepage(substr($subData, 2));
-
-		//return $string;
-		return array(
-			'value' => $value,
-			'size' => 2 + $ln, // size in bytes of data structure
-		);
-	}
-
-
-	/**
-	 * Extracts an Excel Unicode short string (8-bit string length)
-	 * OpenOffice documentation: 2.5.3
-	 * function will automatically find out where the Unicode string ends.
-	 *
-	 * @param string $subData
-	 * @return array
-	 */
-	private static function _readUnicodeStringShort($subData)
-	{
-		$value = '';
-
-		// offset: 0: size: 1; length of the string (character count)
-		$characterCount = ord($subData[0]);
-
-		$string = self::_readUnicodeString(substr($subData, 1), $characterCount);
-
-		// add 1 for the string length
-		$string['size'] += 1;
-
-		return $string;
-	}
-
-
-	/**
-	 * Extracts an Excel Unicode long string (16-bit string length)
-	 * OpenOffice documentation: 2.5.3
-	 * this function is under construction, needs to support rich text, and Asian phonetic settings
-	 *
-	 * @param string $subData
-	 * @return array
-	 */
-	private static function _readUnicodeStringLong($subData)
-	{
-		$value = '';
-
-		// offset: 0: size: 2; length of the string (character count)
-		$characterCount = self::_GetInt2d($subData, 0);
-
-		$string = self::_readUnicodeString(substr($subData, 2), $characterCount);
-
-		// add 2 for the string length
-		$string['size'] += 2;
-
-		return $string;
-	}
-
-
-	/**
-	 * Read Unicode string with no string length field, but with known character count
-	 * this function is under construction, needs to support rich text, and Asian phonetic settings
-	 * OpenOffice.org's Documentation of the Microsoft Excel File Format, section 2.5.3
-	 *
-	 * @param string $subData
-	 * @param int $characterCount
-	 * @return array
-	 */
-	private static function _readUnicodeString($subData, $characterCount)
-	{
-		$value = '';
-
-		// offset: 0: size: 1; option flags
-
-			// bit: 0; mask: 0x01; character compression (0 = compressed 8-bit, 1 = uncompressed 16-bit)
-			$isCompressed = !((0x01 & ord($subData[0])) >> 0);
-
-			// bit: 2; mask: 0x04; Asian phonetic settings
-			$hasAsian = (0x04) & ord($subData[0]) >> 2;
-
-			// bit: 3; mask: 0x08; Rich-Text settings
-			$hasRichText = (0x08) & ord($subData[0]) >> 3;
-
-		// offset: 1: size: var; character array
-		// this offset assumes richtext and Asian phonetic settings are off which is generally wrong
-		// needs to be fixed
-		$value = self::_encodeUTF16(substr($subData, 1, $isCompressed ? $characterCount : 2 * $characterCount), $isCompressed);
-
-		return array(
-			'value' => $value,
-			'size' => $isCompressed ? 1 + $characterCount : 1 + 2 * $characterCount, // the size in bytes including the option flags
-		);
-	}
-
-
-	/**
-	 * Convert UTF-8 string to string surounded by double quotes. Used for explicit string tokens in formulas.
-	 * Example:  hello"world  -->  "hello""world"
-	 *
-	 * @param string $value UTF-8 encoded string
-	 * @return string
-	 */
-	private static function _UTF8toExcelDoubleQuoted($value)
-	{
-		return '"' . str_replace('"', '""', $value) . '"';
-	}
-
-
-	/**
-	 * Reads first 8 bytes of a string and return IEEE 754 float
-	 *
-	 * @param string $data Binary string that is at least 8 bytes long
-	 * @return float
-	 */
-	private static function _extractNumber($data)
-	{
-		$rknumhigh = self::_GetInt4d($data, 4);
-		$rknumlow = self::_GetInt4d($data, 0);
-		$sign = ($rknumhigh & 0x80000000) >> 31;
-		$exp = (($rknumhigh & 0x7ff00000) >> 20) - 1023;
-		$mantissa = (0x100000 | ($rknumhigh & 0x000fffff));
-		$mantissalow1 = ($rknumlow & 0x80000000) >> 31;
-		$mantissalow2 = ($rknumlow & 0x7fffffff);
-		$value = $mantissa / pow( 2 , (20 - $exp));
-
-		if ($mantissalow1 != 0) {
-			$value += 1 / pow (2 , (21 - $exp));
-		}
-
-		$value += $mantissalow2 / pow (2 , (52 - $exp));
-		if ($sign) {
-			$value *= -1;
-		}
-
-		return $value;
-	}
-
-
-	private static function _GetIEEE754($rknum)
-	{
-		if (($rknum & 0x02) != 0) {
-			$value = $rknum >> 2;
-		} else {
-			// changes by mmp, info on IEEE754 encoding from
-			// research.microsoft.com/~hollasch/cgindex/coding/ieeefloat.html
-			// The RK format calls for using only the most significant 30 bits
-			// of the 64 bit floating point value. The other 34 bits are assumed
-			// to be 0 so we use the upper 30 bits of $rknum as follows...
-			$sign = ($rknum & 0x80000000) >> 31;
-			$exp = ($rknum & 0x7ff00000) >> 20;
-			$mantissa = (0x100000 | ($rknum & 0x000ffffc));
-			$value = $mantissa / pow( 2 , (20- ($exp - 1023)));
-			if ($sign) {
-				$value = -1 * $value;
-			}
-			//end of changes by mmp
-		}
-		if (($rknum & 0x01) != 0) {
-			$value /= 100;
-		}
-		return $value;
-	}
-
-
-	/**
-	 * Get UTF-8 string from (compressed or uncompressed) UTF-16 string
-	 *
-	 * @param string $string
-	 * @param bool $compressed
-	 * @return string
-	 */
-	private static function _encodeUTF16($string, $compressed = '')
-	{
-		if ($compressed) {
-			$string = self::_uncompressByteString($string);
- 		}
-
-		return PHPExcel_Shared_String::ConvertEncoding($string, 'UTF-8', 'UTF-16LE');
-	}
-
-
-	/**
-	 * Convert UTF-16 string in compressed notation to uncompressed form. Only used for BIFF8.
-	 *
-	 * @param string $string
-	 * @return string
-	 */
-	private static function _uncompressByteString($string)
-	{
-		$uncompressedString = '';
-		$strLen = strlen($string);
-		for ($i = 0; $i < $strLen; ++$i) {
-			$uncompressedString .= $string[$i] . "\0";
-		}
-
-		return $uncompressedString;
-	}
-
-
-	/**
-	 * Convert string to UTF-8. Only used for BIFF5.
-	 *
-	 * @param string $string
-	 * @return string
-	 */
-	private function _decodeCodepage($string)
-	{
-		return PHPExcel_Shared_String::ConvertEncoding($string, 'UTF-8', $this->_codepage);
-	}
-
-
-	/**
-	 * Read 16-bit unsigned integer
-	 *
-	 * @param string $data
-	 * @param int $pos
-	 * @return int
-	 */
-	public static function _GetInt2d($data, $pos)
-	{
-		return ord($data[$pos]) | (ord($data[$pos+1]) << 8);
-	}
-
-
-	/**
-	 * Read 32-bit signed integer
-	 *
-	 * @param string $data
-	 * @param int $pos
-	 * @return int
-	 */
-	public static function _GetInt4d($data, $pos)
-	{
-		// FIX: represent numbers correctly on 64-bit system
-		// http://sourceforge.net/tracker/index.php?func=detail&aid=1487372&group_id=99160&atid=623334
-		// Hacked by Andreas Rehm 2006 to ensure correct result of the <<24 block on 32 and 64bit systems
-		$_or_24 = ord($data[$pos + 3]);
-		if ($_or_24 >= 128) {
-			// negative number
-			$_ord_24 = -abs((256 - $_or_24) << 24);
-		} else {
-			$_ord_24 = ($_or_24 & 127) << 24;
-		}
-		return ord($data[$pos]) | (ord($data[$pos+1]) << 8) | (ord($data[$pos+2]) << 16) | $_ord_24;
-	}
-
-
-	/**
-	 * Read color
-	 *
-	 * @param int $color Indexed color
-	 * @param array $palette Color palette
-	 * @return array RGB color value, example: array('rgb' => 'FF0000')
-	 */
-	private static function _readColor($color,$palette,$version)
-	{
-		if ($color <= 0x07 || $color >= 0x40) {
-			// special built-in color
-			return self::_mapBuiltInColor($color);
-		} elseif (isset($palette) && isset($palette[$color - 8])) {
-			// palette color, color index 0x08 maps to pallete index 0
-			return $palette[$color - 8];
-		} else {
-			// default color table
-			if ($version == self::XLS_BIFF8) {
-				return self::_mapColor($color);
-			} else {
-				// BIFF5
-				return self::_mapColorBIFF5($color);
-			}
-		}
-
-		return $color;
-	}
-
-
-	/**
-	 * Map border style
-	 * OpenOffice documentation: 2.5.11
-	 *
-	 * @param int $index
-	 * @return string
-	 */
-	private static function _mapBorderStyle($index)
-	{
-		switch ($index) {
-			case 0x00: return PHPExcel_Style_Border::BORDER_NONE;
-			case 0x01: return PHPExcel_Style_Border::BORDER_THIN;
-			case 0x02: return PHPExcel_Style_Border::BORDER_MEDIUM;
-			case 0x03: return PHPExcel_Style_Border::BORDER_DASHED;
-			case 0x04: return PHPExcel_Style_Border::BORDER_DOTTED;
-			case 0x05: return PHPExcel_Style_Border::BORDER_THICK;
-			case 0x06: return PHPExcel_Style_Border::BORDER_DOUBLE;
-			case 0x07: return PHPExcel_Style_Border::BORDER_HAIR;
-			case 0x08: return PHPExcel_Style_Border::BORDER_MEDIUMDASHED;
-			case 0x09: return PHPExcel_Style_Border::BORDER_DASHDOT;
-			case 0x0A: return PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT;
-			case 0x0B: return PHPExcel_Style_Border::BORDER_DASHDOTDOT;
-			case 0x0C: return PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT;
-			case 0x0D: return PHPExcel_Style_Border::BORDER_SLANTDASHDOT;
-			default:   return PHPExcel_Style_Border::BORDER_NONE;
-		}
-	}
-
-
-	/**
-	 * Get fill pattern from index
-	 * OpenOffice documentation: 2.5.12
-	 *
-	 * @param int $index
-	 * @return string
-	 */
-	private static function _mapFillPattern($index)
-	{
-		switch ($index) {
-			case 0x00: return PHPExcel_Style_Fill::FILL_NONE;
-			case 0x01: return PHPExcel_Style_Fill::FILL_SOLID;
-			case 0x02: return PHPExcel_Style_Fill::FILL_PATTERN_MEDIUMGRAY;
-			case 0x03: return PHPExcel_Style_Fill::FILL_PATTERN_DARKGRAY;
-			case 0x04: return PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRAY;
-			case 0x05: return PHPExcel_Style_Fill::FILL_PATTERN_DARKHORIZONTAL;
-			case 0x06: return PHPExcel_Style_Fill::FILL_PATTERN_DARKVERTICAL;
-			case 0x07: return PHPExcel_Style_Fill::FILL_PATTERN_DARKDOWN;
-			case 0x08: return PHPExcel_Style_Fill::FILL_PATTERN_DARKUP;
-			case 0x09: return PHPExcel_Style_Fill::FILL_PATTERN_DARKGRID;
-			case 0x0A: return PHPExcel_Style_Fill::FILL_PATTERN_DARKTRELLIS;
-			case 0x0B: return PHPExcel_Style_Fill::FILL_PATTERN_LIGHTHORIZONTAL;
-			case 0x0C: return PHPExcel_Style_Fill::FILL_PATTERN_LIGHTVERTICAL;
-			case 0x0D: return PHPExcel_Style_Fill::FILL_PATTERN_LIGHTDOWN;
-			case 0x0E: return PHPExcel_Style_Fill::FILL_PATTERN_LIGHTUP;
-			case 0x0F: return PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRID;
-			case 0x10: return PHPExcel_Style_Fill::FILL_PATTERN_LIGHTTRELLIS;
-			case 0x11: return PHPExcel_Style_Fill::FILL_PATTERN_GRAY125;
-			case 0x12: return PHPExcel_Style_Fill::FILL_PATTERN_GRAY0625;
-			default:   return PHPExcel_Style_Fill::FILL_NONE;
-		}
-	}
-
-
-	/**
-	 * Map error code, e.g. '#N/A'
-	 *
-	 * @param int $subData
-	 * @return string
-	 */
-	private static function _mapErrorCode($subData)
-	{
-		switch ($subData) {
-			case 0x00: return '#NULL!';		break;
-			case 0x07: return '#DIV/0!';	break;
-			case 0x0F: return '#VALUE!';	break;
-			case 0x17: return '#REF!';		break;
-			case 0x1D: return '#NAME?';		break;
-			case 0x24: return '#NUM!';		break;
-			case 0x2A: return '#N/A';		break;
-			default: return false;
-		}
-	}
-
-
-	/**
-	 * Map built-in color to RGB value
-	 *
-	 * @param int $color Indexed color
-	 * @return array
-	 */
-	private static function _mapBuiltInColor($color)
-	{
-		switch ($color) {
-			case 0x00: return array('rgb' => '000000');
-			case 0x01: return array('rgb' => 'FFFFFF');
-			case 0x02: return array('rgb' => 'FF0000');
-			case 0x03: return array('rgb' => '00FF00');
-			case 0x04: return array('rgb' => '0000FF');
-			case 0x05: return array('rgb' => 'FFFF00');
-			case 0x06: return array('rgb' => 'FF00FF');
-			case 0x07: return array('rgb' => '00FFFF');
-			case 0x40: return array('rgb' => '000000'); // system window text color
-			case 0x41: return array('rgb' => 'FFFFFF'); // system window background color
-			default:   return array('rgb' => '000000');
-		}
-	}
-
-
-	/**
-	 * Map color array from BIFF5 built-in color index
-	 *
-	 * @param int $subData
-	 * @return array
-	 */
-	private static function _mapColorBIFF5($subData)
-	{
-		switch ($subData) {
-			case 0x08: return array('rgb' => '000000');
-			case 0x09: return array('rgb' => 'FFFFFF');
-			case 0x0A: return array('rgb' => 'FF0000');
-			case 0x0B: return array('rgb' => '00FF00');
-			case 0x0C: return array('rgb' => '0000FF');
-			case 0x0D: return array('rgb' => 'FFFF00');
-			case 0x0E: return array('rgb' => 'FF00FF');
-			case 0x0F: return array('rgb' => '00FFFF');
-			case 0x10: return array('rgb' => '800000');
-			case 0x11: return array('rgb' => '008000');
-			case 0x12: return array('rgb' => '000080');
-			case 0x13: return array('rgb' => '808000');
-			case 0x14: return array('rgb' => '800080');
-			case 0x15: return array('rgb' => '008080');
-			case 0x16: return array('rgb' => 'C0C0C0');
-			case 0x17: return array('rgb' => '808080');
-			case 0x18: return array('rgb' => '8080FF');
-			case 0x19: return array('rgb' => '802060');
-			case 0x1A: return array('rgb' => 'FFFFC0');
-			case 0x1B: return array('rgb' => 'A0E0F0');
-			case 0x1C: return array('rgb' => '600080');
-			case 0x1D: return array('rgb' => 'FF8080');
-			case 0x1E: return array('rgb' => '0080C0');
-			case 0x1F: return array('rgb' => 'C0C0FF');
-			case 0x20: return array('rgb' => '000080');
-			case 0x21: return array('rgb' => 'FF00FF');
-			case 0x22: return array('rgb' => 'FFFF00');
-			case 0x23: return array('rgb' => '00FFFF');
-			case 0x24: return array('rgb' => '800080');
-			case 0x25: return array('rgb' => '800000');
-			case 0x26: return array('rgb' => '008080');
-			case 0x27: return array('rgb' => '0000FF');
-			case 0x28: return array('rgb' => '00CFFF');
-			case 0x29: return array('rgb' => '69FFFF');
-			case 0x2A: return array('rgb' => 'E0FFE0');
-			case 0x2B: return array('rgb' => 'FFFF80');
-			case 0x2C: return array('rgb' => 'A6CAF0');
-			case 0x2D: return array('rgb' => 'DD9CB3');
-			case 0x2E: return array('rgb' => 'B38FEE');
-			case 0x2F: return array('rgb' => 'E3E3E3');
-			case 0x30: return array('rgb' => '2A6FF9');
-			case 0x31: return array('rgb' => '3FB8CD');
-			case 0x32: return array('rgb' => '488436');
-			case 0x33: return array('rgb' => '958C41');
-			case 0x34: return array('rgb' => '8E5E42');
-			case 0x35: return array('rgb' => 'A0627A');
-			case 0x36: return array('rgb' => '624FAC');
-			case 0x37: return array('rgb' => '969696');
-			case 0x38: return array('rgb' => '1D2FBE');
-			case 0x39: return array('rgb' => '286676');
-			case 0x3A: return array('rgb' => '004500');
-			case 0x3B: return array('rgb' => '453E01');
-			case 0x3C: return array('rgb' => '6A2813');
-			case 0x3D: return array('rgb' => '85396A');
-			case 0x3E: return array('rgb' => '4A3285');
-			case 0x3F: return array('rgb' => '424242');
-			default:   return array('rgb' => '000000');
-		}
-	}
-
-
-	/**
-	 * Map color array from BIFF8 built-in color index
-	 *
-	 * @param int $subData
-	 * @return array
-	 */
-	private static function _mapColor($subData)
-	{
-		switch ($subData) {
-			case 0x08: return array('rgb' => '000000');
-			case 0x09: return array('rgb' => 'FFFFFF');
-			case 0x0A: return array('rgb' => 'FF0000');
-			case 0x0B: return array('rgb' => '00FF00');
-			case 0x0C: return array('rgb' => '0000FF');
-			case 0x0D: return array('rgb' => 'FFFF00');
-			case 0x0E: return array('rgb' => 'FF00FF');
-			case 0x0F: return array('rgb' => '00FFFF');
-			case 0x10: return array('rgb' => '800000');
-			case 0x11: return array('rgb' => '008000');
-			case 0x12: return array('rgb' => '000080');
-			case 0x13: return array('rgb' => '808000');
-			case 0x14: return array('rgb' => '800080');
-			case 0x15: return array('rgb' => '008080');
-			case 0x16: return array('rgb' => 'C0C0C0');
-			case 0x17: return array('rgb' => '808080');
-			case 0x18: return array('rgb' => '9999FF');
-			case 0x19: return array('rgb' => '993366');
-			case 0x1A: return array('rgb' => 'FFFFCC');
-			case 0x1B: return array('rgb' => 'CCFFFF');
-			case 0x1C: return array('rgb' => '660066');
-			case 0x1D: return array('rgb' => 'FF8080');
-			case 0x1E: return array('rgb' => '0066CC');
-			case 0x1F: return array('rgb' => 'CCCCFF');
-			case 0x20: return array('rgb' => '000080');
-			case 0x21: return array('rgb' => 'FF00FF');
-			case 0x22: return array('rgb' => 'FFFF00');
-			case 0x23: return array('rgb' => '00FFFF');
-			case 0x24: return array('rgb' => '800080');
-			case 0x25: return array('rgb' => '800000');
-			case 0x26: return array('rgb' => '008080');
-			case 0x27: return array('rgb' => '0000FF');
-			case 0x28: return array('rgb' => '00CCFF');
-			case 0x29: return array('rgb' => 'CCFFFF');
-			case 0x2A: return array('rgb' => 'CCFFCC');
-			case 0x2B: return array('rgb' => 'FFFF99');
-			case 0x2C: return array('rgb' => '99CCFF');
-			case 0x2D: return array('rgb' => 'FF99CC');
-			case 0x2E: return array('rgb' => 'CC99FF');
-			case 0x2F: return array('rgb' => 'FFCC99');
-			case 0x30: return array('rgb' => '3366FF');
-			case 0x31: return array('rgb' => '33CCCC');
-			case 0x32: return array('rgb' => '99CC00');
-			case 0x33: return array('rgb' => 'FFCC00');
-			case 0x34: return array('rgb' => 'FF9900');
-			case 0x35: return array('rgb' => 'FF6600');
-			case 0x36: return array('rgb' => '666699');
-			case 0x37: return array('rgb' => '969696');
-			case 0x38: return array('rgb' => '003366');
-			case 0x39: return array('rgb' => '339966');
-			case 0x3A: return array('rgb' => '003300');
-			case 0x3B: return array('rgb' => '333300');
-			case 0x3C: return array('rgb' => '993300');
-			case 0x3D: return array('rgb' => '993366');
-			case 0x3E: return array('rgb' => '333399');
-			case 0x3F: return array('rgb' => '333333');
-			default:   return array('rgb' => '000000');
-		}
-	}
-
-
-	private function _parseRichText($is = '') {
-		$value = new PHPExcel_RichText();
-
-		$value->createText($is);
-
-		return $value;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/Escher.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/Escher.php
deleted file mode 100644
index 8dc5e902eb9..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/Escher.php
+++ /dev/null
@@ -1,640 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader_Excel5
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Reader_Excel5_Escher
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader_Excel5
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_Excel5_Escher
-{
-	const DGGCONTAINER		= 0xF000;
-	const BSTORECONTAINER	= 0xF001;
-	const DGCONTAINER		= 0xF002;
-	const SPGRCONTAINER		= 0xF003;
-	const SPCONTAINER		= 0xF004;
-	const DGG				= 0xF006;
-	const BSE				= 0xF007;
-	const DG				= 0xF008;
-	const SPGR				= 0xF009;
-	const SP				= 0xF00A;
-	const OPT				= 0xF00B;
-	const CLIENTTEXTBOX		= 0xF00D;
-	const CLIENTANCHOR		= 0xF010;
-	const CLIENTDATA		= 0xF011;
-	const BLIPJPEG			= 0xF01D;
-	const BLIPPNG			= 0xF01E;
-	const SPLITMENUCOLORS	= 0xF11E;
-	const TERTIARYOPT		= 0xF122;
-
-	/**
-	 * Escher stream data (binary)
-	 *
-	 * @var string
-	 */
-	private $_data;
-
-	/**
-	 * Size in bytes of the Escher stream data
-	 *
-	 * @var int
-	 */
-	private $_dataSize;
-
-	/**
-	 * Current position of stream pointer in Escher stream data
-	 *
-	 * @var int
-	 */
-	private $_pos;
-
-	/**
-	 * The object to be returned by the reader. Modified during load.
-	 *
-	 * @var mixed
-	 */
-	private $_object;
-
-	/**
-	 * Create a new PHPExcel_Reader_Excel5_Escher instance
-	 *
-	 * @param mixed $object
-	 */
-	public function __construct($object)
-	{
-		$this->_object = $object;
-	}
-
-	/**
-	 * Load Escher stream data. May be a partial Escher stream.
-	 *
-	 * @param string $data
-	 */
-	public function load($data)
-	{
-		$this->_data = $data;
-
-		// total byte size of Excel data (workbook global substream + sheet substreams)
-		$this->_dataSize = strlen($this->_data);
-
-		$this->_pos = 0;
-
-		// Parse Escher stream
-		while ($this->_pos < $this->_dataSize) {
-
-			// offset: 2; size: 2: Record Type
-			$fbt = PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos + 2);
-
-			switch ($fbt) {
-				case self::DGGCONTAINER:	$this->_readDggContainer();		break;
-				case self::DGG:				$this->_readDgg();				break;
-				case self::BSTORECONTAINER:	$this->_readBstoreContainer();	break;
-				case self::BSE:				$this->_readBSE();				break;
-				case self::BLIPJPEG:		$this->_readBlipJPEG();			break;
-				case self::BLIPPNG:			$this->_readBlipPNG();			break;
-				case self::OPT:				$this->_readOPT();				break;
-				case self::TERTIARYOPT:		$this->_readTertiaryOPT();		break;
-				case self::SPLITMENUCOLORS:	$this->_readSplitMenuColors();	break;
-				case self::DGCONTAINER:		$this->_readDgContainer();		break;
-				case self::DG:				$this->_readDg();				break;
-				case self::SPGRCONTAINER:	$this->_readSpgrContainer();	break;
-				case self::SPCONTAINER:		$this->_readSpContainer();		break;
-				case self::SPGR:			$this->_readSpgr();				break;
-				case self::SP:				$this->_readSp();				break;
-				case self::CLIENTTEXTBOX:	$this->_readClientTextbox();	break;
-				case self::CLIENTANCHOR:	$this->_readClientAnchor();		break;
-				case self::CLIENTDATA:		$this->_readClientData();		break;
-				default:					$this->_readDefault();			break;
-			}
-		}
-
-		return $this->_object;
-	}
-
-	/**
-	 * Read a generic record
-	 */
-	private function _readDefault()
-	{
-		// offset 0; size: 2; recVer and recInstance
-		$verInstance = PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos);
-
-		// offset: 2; size: 2: Record Type
-		$fbt = PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos + 2);
-
-		// bit: 0-3; mask: 0x000F; recVer
-		$recVer = (0x000F & $verInstance) >> 0;
-
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-	}
-
-	/**
-	 * Read DggContainer record (Drawing Group Container)
-	 */
-	private function _readDggContainer()
-	{
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-
-		// record is a container, read contents
-		$dggContainer = new PHPExcel_Shared_Escher_DggContainer();
-		$this->_object->setDggContainer($dggContainer);
-		$reader = new PHPExcel_Reader_Excel5_Escher($dggContainer);
-		$reader->load($recordData);
-	}
-
-	/**
-	 * Read Dgg record (Drawing Group)
-	 */
-	private function _readDgg()
-	{
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-	}
-
-	/**
-	 * Read BstoreContainer record (Blip Store Container)
-	 */
-	private function _readBstoreContainer()
-	{
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-
-		// record is a container, read contents
-		$bstoreContainer = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer();
-		$this->_object->setBstoreContainer($bstoreContainer);
-		$reader = new PHPExcel_Reader_Excel5_Escher($bstoreContainer);
-		$reader->load($recordData);
-	}
-
-	/**
-	 * Read BSE record
-	 */
-	private function _readBSE()
-	{
-		// offset: 0; size: 2; recVer and recInstance
-
-		// bit: 4-15; mask: 0xFFF0; recInstance
-		$recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos)) >> 4;
-
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-
-		// add BSE to BstoreContainer
-		$BSE = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE();
-		$this->_object->addBSE($BSE);
-
-		$BSE->setBLIPType($recInstance);
-
-		// offset: 0; size: 1; btWin32 (MSOBLIPTYPE)
-		$btWin32 = ord($recordData[0]);
-
-		// offset: 1; size: 1; btWin32 (MSOBLIPTYPE)
-		$btMacOS = ord($recordData[1]);
-
-		// offset: 2; size: 16; MD4 digest
-		$rgbUid = substr($recordData, 2, 16);
-
-		// offset: 18; size: 2; tag
-		$tag = PHPExcel_Reader_Excel5::_GetInt2d($recordData, 18);
-
-		// offset: 20; size: 4; size of BLIP in bytes
-		$size = PHPExcel_Reader_Excel5::_GetInt4d($recordData, 20);
-
-		// offset: 24; size: 4; number of references to this BLIP
-		$cRef = PHPExcel_Reader_Excel5::_GetInt4d($recordData, 24);
-
-		// offset: 28; size: 4; MSOFO file offset
-		$foDelay = PHPExcel_Reader_Excel5::_GetInt4d($recordData, 28);
-
-		// offset: 32; size: 1; unused1
-		$unused1 = ord($recordData{32});
-
-		// offset: 33; size: 1; size of nameData in bytes (including null terminator)
-		$cbName = ord($recordData{33});
-
-		// offset: 34; size: 1; unused2
-		$unused2 = ord($recordData{34});
-
-		// offset: 35; size: 1; unused3
-		$unused3 = ord($recordData{35});
-
-		// offset: 36; size: $cbName; nameData
-		$nameData = substr($recordData, 36, $cbName);
-
-		// offset: 36 + $cbName, size: var; the BLIP data
-		$blipData = substr($recordData, 36 + $cbName);
-
-		// record is a container, read contents
-		$reader = new PHPExcel_Reader_Excel5_Escher($BSE);
-		$reader->load($blipData);
-	}
-
-	/**
-	 * Read BlipJPEG record. Holds raw JPEG image data
-	 */
-	private function _readBlipJPEG()
-	{
-		// offset: 0; size: 2; recVer and recInstance
-
-		// bit: 4-15; mask: 0xFFF0; recInstance
-		$recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos)) >> 4;
-
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-
-		$pos = 0;
-
-		// offset: 0; size: 16; rgbUid1 (MD4 digest of)
-		$rgbUid1 = substr($recordData, 0, 16);
-		$pos += 16;
-
-		// offset: 16; size: 16; rgbUid2 (MD4 digest), only if $recInstance = 0x46B or 0x6E3
-		if (in_array($recInstance, array(0x046B, 0x06E3))) {
-			$rgbUid2 = substr($recordData, 16, 16);
-			$pos += 16;
-		}
-
-		// offset: var; size: 1; tag
-		$tag = ord($recordData{$pos});
-		$pos += 1;
-
-		// offset: var; size: var; the raw image data
-		$data = substr($recordData, $pos);
-
-		$blip = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip();
-		$blip->setData($data);
-
-		$this->_object->setBlip($blip);
-	}
-
-	/**
-	 * Read BlipPNG record. Holds raw PNG image data
-	 */
-	private function _readBlipPNG()
-	{
-		// offset: 0; size: 2; recVer and recInstance
-
-		// bit: 4-15; mask: 0xFFF0; recInstance
-		$recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos)) >> 4;
-
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-
-		$pos = 0;
-
-		// offset: 0; size: 16; rgbUid1 (MD4 digest of)
-		$rgbUid1 = substr($recordData, 0, 16);
-		$pos += 16;
-
-		// offset: 16; size: 16; rgbUid2 (MD4 digest), only if $recInstance = 0x46B or 0x6E3
-		if ($recInstance == 0x06E1) {
-			$rgbUid2 = substr($recordData, 16, 16);
-			$pos += 16;
-		}
-
-		// offset: var; size: 1; tag
-		$tag = ord($recordData{$pos});
-		$pos += 1;
-
-		// offset: var; size: var; the raw image data
-		$data = substr($recordData, $pos);
-
-		$blip = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip();
-		$blip->setData($data);
-
-		$this->_object->setBlip($blip);
-	}
-
-	/**
-	 * Read OPT record. This record may occur within DggContainer record or SpContainer
-	 */
-	private function _readOPT()
-	{
-		// offset: 0; size: 2; recVer and recInstance
-
-		// bit: 4-15; mask: 0xFFF0; recInstance
-		$recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos)) >> 4;
-
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-
-		$this->_readOfficeArtRGFOPTE($recordData, $recInstance);
-	}
-
-	/**
-	 * Read TertiaryOPT record
-	 */
-	private function _readTertiaryOPT()
-	{
-		// offset: 0; size: 2; recVer and recInstance
-
-		// bit: 4-15; mask: 0xFFF0; recInstance
-		$recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos)) >> 4;
-
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-	}
-
-	/**
-	 * Read SplitMenuColors record
-	 */
-	private function _readSplitMenuColors()
-	{
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-	}
-
-	/**
-	 * Read DgContainer record (Drawing Container)
-	 */
-	private function _readDgContainer()
-	{
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-
-		// record is a container, read contents
-		$dgContainer = new PHPExcel_Shared_Escher_DgContainer();
-		$this->_object->setDgContainer($dgContainer);
-		$reader = new PHPExcel_Reader_Excel5_Escher($dgContainer);
-		$escher = $reader->load($recordData);
-	}
-
-	/**
-	 * Read Dg record (Drawing)
-	 */
-	private function _readDg()
-	{
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-	}
-
-	/**
-	 * Read SpgrContainer record (Shape Group Container)
-	 */
-	private function _readSpgrContainer()
-	{
-		// context is either context DgContainer or SpgrContainer
-
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-
-		// record is a container, read contents
-		$spgrContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer();
-
-		if ($this->_object instanceof PHPExcel_Shared_Escher_DgContainer) {
-			// DgContainer
-			$this->_object->setSpgrContainer($spgrContainer);
-		} else {
-			// SpgrContainer
-			$this->_object->addChild($spgrContainer);
-		}
-
-		$reader = new PHPExcel_Reader_Excel5_Escher($spgrContainer);
-		$escher = $reader->load($recordData);
-	}
-
-	/**
-	 * Read SpContainer record (Shape Container)
-	 */
-	private function _readSpContainer()
-	{
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// add spContainer to spgrContainer
-		$spContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer();
-		$this->_object->addChild($spContainer);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-
-		// record is a container, read contents
-		$reader = new PHPExcel_Reader_Excel5_Escher($spContainer);
-		$escher = $reader->load($recordData);
-	}
-
-	/**
-	 * Read Spgr record (Shape Group)
-	 */
-	private function _readSpgr()
-	{
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-	}
-
-	/**
-	 * Read Sp record (Shape)
-	 */
-	private function _readSp()
-	{
-		// offset: 0; size: 2; recVer and recInstance
-
-		// bit: 4-15; mask: 0xFFF0; recInstance
-		$recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos)) >> 4;
-
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-	}
-
-	/**
-	 * Read ClientTextbox record
-	 */
-	private function _readClientTextbox()
-	{
-		// offset: 0; size: 2; recVer and recInstance
-
-		// bit: 4-15; mask: 0xFFF0; recInstance
-		$recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos)) >> 4;
-
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-	}
-
-	/**
-	 * Read ClientAnchor record. This record holds information about where the shape is anchored in worksheet
-	 */
-	private function _readClientAnchor()
-	{
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-
-		// offset: 2; size: 2; upper-left corner column index (0-based)
-		$c1 = PHPExcel_Reader_Excel5::_GetInt2d($recordData, 2);
-
-		// offset: 4; size: 2; upper-left corner horizontal offset in 1/1024 of column width
-		$startOffsetX = PHPExcel_Reader_Excel5::_GetInt2d($recordData, 4);
-
-		// offset: 6; size: 2; upper-left corner row index (0-based)
-		$r1 = PHPExcel_Reader_Excel5::_GetInt2d($recordData, 6);
-
-		// offset: 8; size: 2; upper-left corner vertical offset in 1/256 of row height
-		$startOffsetY = PHPExcel_Reader_Excel5::_GetInt2d($recordData, 8);
-
-		// offset: 10; size: 2; bottom-right corner column index (0-based)
-		$c2 = PHPExcel_Reader_Excel5::_GetInt2d($recordData, 10);
-
-		// offset: 12; size: 2; bottom-right corner horizontal offset in 1/1024 of column width
-		$endOffsetX = PHPExcel_Reader_Excel5::_GetInt2d($recordData, 12);
-
-		// offset: 14; size: 2; bottom-right corner row index (0-based)
-		$r2 = PHPExcel_Reader_Excel5::_GetInt2d($recordData, 14);
-
-		// offset: 16; size: 2; bottom-right corner vertical offset in 1/256 of row height
-		$endOffsetY = PHPExcel_Reader_Excel5::_GetInt2d($recordData, 16);
-
-		// set the start coordinates
-		$this->_object->setStartCoordinates(PHPExcel_Cell::stringFromColumnIndex($c1) . ($r1 + 1));
-
-		// set the start offsetX
-		$this->_object->setStartOffsetX($startOffsetX);
-
-		// set the start offsetY
-		$this->_object->setStartOffsetY($startOffsetY);
-
-		// set the end coordinates
-		$this->_object->setEndCoordinates(PHPExcel_Cell::stringFromColumnIndex($c2) . ($r2 + 1));
-
-		// set the end offsetX
-		$this->_object->setEndOffsetX($endOffsetX);
-
-		// set the end offsetY
-		$this->_object->setEndOffsetY($endOffsetY);
-	}
-
-	/**
-	 * Read ClientData record
-	 */
-	private function _readClientData()
-	{
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-	}
-
-	/**
-	 * Read OfficeArtRGFOPTE table of property-value pairs
-	 *
-	 * @param string $data Binary data
-	 * @param int $n Number of properties
-	 */
-	private function _readOfficeArtRGFOPTE($data, $n) {
-
-		$splicedComplexData = substr($data, 6 * $n);
-
-		// loop through property-value pairs
-		for ($i = 0; $i < $n; ++$i) {
-			// read 6 bytes at a time
-			$fopte = substr($data, 6 * $i, 6);
-
-			// offset: 0; size: 2; opid
-			$opid = PHPExcel_Reader_Excel5::_GetInt2d($fopte, 0);
-
-			// bit: 0-13; mask: 0x3FFF; opid.opid
-			$opidOpid = (0x3FFF & $opid) >> 0;
-
-			// bit: 14; mask 0x4000; 1 = value in op field is BLIP identifier
-			$opidFBid = (0x4000 & $opid) >> 14;
-
-			// bit: 15; mask 0x8000; 1 = this is a complex property, op field specifies size of complex data
-			$opidFComplex = (0x8000 & $opid) >> 15;
-
-			// offset: 2; size: 4; the value for this property
-			$op = PHPExcel_Reader_Excel5::_GetInt4d($fopte, 2);
-
-			if ($opidFComplex) {
-				$complexData = substr($splicedComplexData, 0, $op);
-				$splicedComplexData = substr($splicedComplexData, $op);
-
-				// we store string value with complex data
-				$value = $complexData;
-			} else {
-				// we store integer value
-				$value = $op;
-			}
-
-			$this->_object->setOPT($opidOpid, $value);
-		}
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/MD5.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/MD5.php
deleted file mode 100644
index 097e9753ff3..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/MD5.php
+++ /dev/null
@@ -1,221 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader_Excel5
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt        LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Reader_Excel5_MD5
- *
- * @category        PHPExcel
- * @package                PHPExcel_Reader_Excel5
- * @copyright        Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_Excel5_MD5
-{
-    // Context
-    private $a;
-    private $b;
-    private $c;
-    private $d;
-
-
-    /**
-     * MD5 stream constructor
-     */
-    public function __construct()
-    {
-        $this->reset();
-    }
-
-
-    /**
-     * Reset the MD5 stream context
-     */
-    public function reset()
-    {
-        $this->a = 0x67452301;
-        $this->b = 0xEFCDAB89;
-        $this->c = 0x98BADCFE;
-        $this->d = 0x10325476;
-    }
-
-
-    /**
-     * Get MD5 stream context
-     * 
-     * @return string
-     */
-    public function getContext()
-    {
-        $s = '';
-        foreach (array('a', 'b', 'c', 'd') as $i) {
-            $v = $this->{$i};
-            $s .= chr($v & 0xff);
-            $s .= chr(($v >> 8) & 0xff);
-            $s .= chr(($v >> 16) & 0xff);
-            $s .= chr(($v >> 24) & 0xff);
-        }
-
-        return $s;
-    }
-
-
-    /**
-     * Add data to context
-     * 
-     * @param string $data Data to add
-     */
-    public function add($data)
-    {
-        $words = array_values(unpack('V16', $data));
-
-        $A = $this->a;
-        $B = $this->b;
-        $C = $this->c;
-        $D = $this->d;
-
-        $F = array('PHPExcel_Reader_Excel5_MD5','F');
-        $G = array('PHPExcel_Reader_Excel5_MD5','G');
-        $H = array('PHPExcel_Reader_Excel5_MD5','H');
-        $I = array('PHPExcel_Reader_Excel5_MD5','I');
-
-        /* ROUND 1 */
-        self::step($F, $A, $B, $C, $D, $words[0], 7, 0xd76aa478);
-        self::step($F, $D, $A, $B, $C, $words[1], 12, 0xe8c7b756);
-        self::step($F, $C, $D, $A, $B, $words[2], 17, 0x242070db);
-        self::step($F, $B, $C, $D, $A, $words[3], 22, 0xc1bdceee);
-        self::step($F, $A, $B, $C, $D, $words[4], 7, 0xf57c0faf);
-        self::step($F, $D, $A, $B, $C, $words[5], 12, 0x4787c62a);
-        self::step($F, $C, $D, $A, $B, $words[6], 17, 0xa8304613);
-        self::step($F, $B, $C, $D, $A, $words[7], 22, 0xfd469501);
-        self::step($F, $A, $B, $C, $D, $words[8], 7, 0x698098d8);
-        self::step($F, $D, $A, $B, $C, $words[9], 12, 0x8b44f7af);
-        self::step($F, $C, $D, $A, $B, $words[10], 17, 0xffff5bb1);
-        self::step($F, $B, $C, $D, $A, $words[11], 22, 0x895cd7be);
-        self::step($F, $A, $B, $C, $D, $words[12], 7, 0x6b901122);
-        self::step($F, $D, $A, $B, $C, $words[13], 12, 0xfd987193);
-        self::step($F, $C, $D, $A, $B, $words[14], 17, 0xa679438e);
-        self::step($F, $B, $C, $D, $A, $words[15], 22, 0x49b40821);
-
-        /* ROUND 2 */
-        self::step($G, $A, $B, $C, $D, $words[1], 5, 0xf61e2562);
-        self::step($G, $D, $A, $B, $C, $words[6], 9, 0xc040b340);
-        self::step($G, $C, $D, $A, $B, $words[11], 14, 0x265e5a51);
-        self::step($G, $B, $C, $D, $A, $words[0], 20, 0xe9b6c7aa);
-        self::step($G, $A, $B, $C, $D, $words[5], 5, 0xd62f105d);
-        self::step($G, $D, $A, $B, $C, $words[10], 9, 0x02441453);
-        self::step($G, $C, $D, $A, $B, $words[15], 14, 0xd8a1e681);
-        self::step($G, $B, $C, $D, $A, $words[4], 20, 0xe7d3fbc8);
-        self::step($G, $A, $B, $C, $D, $words[9], 5, 0x21e1cde6);
-        self::step($G, $D, $A, $B, $C, $words[14], 9, 0xc33707d6);
-        self::step($G, $C, $D, $A, $B, $words[3], 14, 0xf4d50d87);
-        self::step($G, $B, $C, $D, $A, $words[8], 20, 0x455a14ed);
-        self::step($G, $A, $B, $C, $D, $words[13], 5, 0xa9e3e905);
-        self::step($G, $D, $A, $B, $C, $words[2], 9, 0xfcefa3f8);
-        self::step($G, $C, $D, $A, $B, $words[7], 14, 0x676f02d9);
-        self::step($G, $B, $C, $D, $A, $words[12], 20, 0x8d2a4c8a);
-
-        /* ROUND 3 */
-        self::step($H, $A, $B, $C, $D, $words[5], 4, 0xfffa3942);
-        self::step($H, $D, $A, $B, $C, $words[8], 11, 0x8771f681);
-        self::step($H, $C, $D, $A, $B, $words[11], 16, 0x6d9d6122);
-        self::step($H, $B, $C, $D, $A, $words[14], 23, 0xfde5380c);
-        self::step($H, $A, $B, $C, $D, $words[1], 4, 0xa4beea44);
-        self::step($H, $D, $A, $B, $C, $words[4], 11, 0x4bdecfa9);
-        self::step($H, $C, $D, $A, $B, $words[7], 16, 0xf6bb4b60);
-        self::step($H, $B, $C, $D, $A, $words[10], 23, 0xbebfbc70);
-        self::step($H, $A, $B, $C, $D, $words[13], 4, 0x289b7ec6);
-        self::step($H, $D, $A, $B, $C, $words[0], 11, 0xeaa127fa);
-        self::step($H, $C, $D, $A, $B, $words[3], 16, 0xd4ef3085);
-        self::step($H, $B, $C, $D, $A, $words[6], 23, 0x04881d05);
-        self::step($H, $A, $B, $C, $D, $words[9], 4, 0xd9d4d039);
-        self::step($H, $D, $A, $B, $C, $words[12], 11, 0xe6db99e5);
-        self::step($H, $C, $D, $A, $B, $words[15], 16, 0x1fa27cf8);
-        self::step($H, $B, $C, $D, $A, $words[2], 23, 0xc4ac5665);
-
-        /* ROUND 4 */
-        self::step($I, $A, $B, $C, $D, $words[0], 6, 0xf4292244);
-        self::step($I, $D, $A, $B, $C, $words[7], 10, 0x432aff97);
-        self::step($I, $C, $D, $A, $B, $words[14], 15, 0xab9423a7);
-        self::step($I, $B, $C, $D, $A, $words[5], 21, 0xfc93a039);
-        self::step($I, $A, $B, $C, $D, $words[12], 6, 0x655b59c3);
-        self::step($I, $D, $A, $B, $C, $words[3], 10, 0x8f0ccc92);
-        self::step($I, $C, $D, $A, $B, $words[10], 15, 0xffeff47d);
-        self::step($I, $B, $C, $D, $A, $words[1], 21, 0x85845dd1);
-        self::step($I, $A, $B, $C, $D, $words[8], 6, 0x6fa87e4f);
-        self::step($I, $D, $A, $B, $C, $words[15], 10, 0xfe2ce6e0);
-        self::step($I, $C, $D, $A, $B, $words[6], 15, 0xa3014314);
-        self::step($I, $B, $C, $D, $A, $words[13], 21, 0x4e0811a1);
-        self::step($I, $A, $B, $C, $D, $words[4], 6, 0xf7537e82);
-        self::step($I, $D, $A, $B, $C, $words[11], 10, 0xbd3af235);
-        self::step($I, $C, $D, $A, $B, $words[2], 15, 0x2ad7d2bb);
-        self::step($I, $B, $C, $D, $A, $words[9], 21, 0xeb86d391);
-
-        $this->a = ($this->a + $A) & 0xffffffff;
-        $this->b = ($this->b + $B) & 0xffffffff;
-        $this->c = ($this->c + $C) & 0xffffffff;
-        $this->d = ($this->d + $D) & 0xffffffff;
-    }
-
-
-    private static function F($X, $Y, $Z)
-    {
-        return (($X & $Y) | ((~ $X) & $Z)); // X AND Y OR NOT X AND Z
-    }
-
-
-    private static function G($X, $Y, $Z)
-    {
-        return (($X & $Z) | ($Y & (~ $Z))); // X AND Z OR Y AND NOT Z
-    }
-
-
-    private static function H($X, $Y, $Z)
-    {
-        return ($X ^ $Y ^ $Z); // X XOR Y XOR Z
-    }
-
-
-    private static function I($X, $Y, $Z)
-    {
-        return ($Y ^ ($X | (~ $Z))) ; // Y XOR (X OR NOT Z)
-    }
-
-
-    private static function step($func, &$A, $B, $C, $D, $M, $s, $t)
-    {
-        $A = ($A + call_user_func($func, $B, $C, $D) + $M + $t) & 0xffffffff;
-        $A = self::rotate($A, $s);
-        $A = ($B + $A) & 0xffffffff;
-    }
-
-
-    private static function rotate($decimal, $bits)
-    {
-        $binary = str_pad(decbin($decimal), 32, "0", STR_PAD_LEFT);
-        return bindec(substr($binary, $bits).substr($binary, 0, $bits));
-    }
-}
\ No newline at end of file
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/RC4.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/RC4.php
deleted file mode 100644
index 199ee1921cd..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/RC4.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader_Excel5
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Reader_Excel5_RC4
- *
- * @category	PHPExcel
- * @package		PHPExcel_Reader_Excel5
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_Excel5_RC4
-{
-	// Context
-	var $s = array();
-	var $i = 0;
-	var $j = 0;
-
-	/**
-	 * RC4 stream decryption/encryption constrcutor
-	 * 
-	 * @param string $key Encryption key/passphrase
-	 */
-	public function __construct($key)
-	{
-		$len = strlen($key);
-
-		for ($this->i = 0; $this->i < 256; $this->i++) {
-			$this->s[$this->i] = $this->i;
-		}
-
-		$this->j = 0;
-		for ($this->i = 0; $this->i < 256; $this->i++) {
-			$this->j = ($this->j + $this->s[$this->i] + ord($key[$this->i % $len])) % 256;
-			$t = $this->s[$this->i];
-			$this->s[$this->i] = $this->s[$this->j];
-			$this->s[$this->j] = $t;
-		}
-		$this->i = $this->j = 0;
-	}
-
-	/**
-	 * Symmetric decryption/encryption function
-	 * 
-	 * @param string $data Data to encrypt/decrypt
-	 * 
-	 * @return string
-	 */
-	public function RC4($data)
-	{
-		$len = strlen($data);
-		for ($c = 0; $c < $len; $c++) {
-			$this->i = ($this->i + 1) % 256;
-			$this->j = ($this->j + $this->s[$this->i]) % 256;
-			$t = $this->s[$this->i];
-			$this->s[$this->i] = $this->s[$this->j];
-			$this->s[$this->j] = $t;
-
-			$t = ($this->s[$this->i] + $this->s[$this->j]) % 256;
-
-			$data[$c] = chr(ord($data[$c]) ^ $this->s[$t]);
-		}
-		return $data;
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Exception.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Exception.php
deleted file mode 100644
index d0e2f57070e..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Exception.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Reader_Exception
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_Exception extends PHPExcel_Exception {
-	/**
-	 * Error handler callback
-	 *
-	 * @param mixed $code
-	 * @param mixed $string
-	 * @param mixed $file
-	 * @param mixed $line
-	 * @param mixed $context
-	 */
-	public static function errorHandlerCallback($code, $string, $file, $line, $context) {
-		$e = new self($string, $code);
-		$e->line = $line;
-		$e->file = $file;
-		throw $e;
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Gnumeric.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Gnumeric.php
deleted file mode 100644
index 584ded2879b..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Gnumeric.php
+++ /dev/null
@@ -1,873 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_Reader_Gnumeric
- *
- * @category	PHPExcel
- * @package		PHPExcel_Reader
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
-{
-	/**
-	 * Formats
-	 *
-	 * @var array
-	 */
-	private $_styles = array();
-
-	/**
-	 * Shared Expressions
-	 *
-	 * @var array
-	 */
-	private $_expressions = array();
-
-	private $_referenceHelper = null;
-
-
-	/**
-	 * Create a new PHPExcel_Reader_Gnumeric
-	 */
-	public function __construct() {
-		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
-		$this->_referenceHelper = PHPExcel_ReferenceHelper::getInstance();
-	}
-
-
-	/**
-	 * Can the current PHPExcel_Reader_IReader read the file?
-	 *
-	 * @param 	string 		$pFilename
-	 * @return 	boolean
-	 * @throws PHPExcel_Reader_Exception
-	 */
-	public function canRead($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		// Check if gzlib functions are available
-		if (!function_exists('gzread')) {
-			throw new PHPExcel_Reader_Exception("gzlib library is not enabled");
-		}
-
-		// Read signature data (first 3 bytes)
-		$fh = fopen($pFilename, 'r');
-		$data = fread($fh, 2);
-		fclose($fh);
-
-		if ($data != chr(0x1F).chr(0x8B)) {
-			return false;
-		}
-
-		return true;
-	}
-
-
-	/**
-	 * Reads names of the worksheets from a file, without parsing the whole file to a PHPExcel object
-	 *
-	 * @param 	string 		$pFilename
-	 * @throws 	PHPExcel_Reader_Exception
-	 */
-	public function listWorksheetNames($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		$xml = new XMLReader();
-		$xml->xml(
-			$this->securityScanFile('compress.zlib://'.realpath($pFilename)), null, PHPExcel_Settings::getLibXmlLoaderOptions()
-		);
-		$xml->setParserProperty(2,true);
-
-		$worksheetNames = array();
-		while ($xml->read()) {
-			if ($xml->name == 'gnm:SheetName' && $xml->nodeType == XMLReader::ELEMENT) {
-			    $xml->read();	//	Move onto the value node
-				$worksheetNames[] = (string) $xml->value;
-			} elseif ($xml->name == 'gnm:Sheets') {
-				//	break out of the loop once we've got our sheet names rather than parse the entire file
-				break;
-			}
-		}
-
-		return $worksheetNames;
-	}
-
-
-	/**
-	 * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
-	 *
-	 * @param   string     $pFilename
-	 * @throws   PHPExcel_Reader_Exception
-	 */
-	public function listWorksheetInfo($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		$xml = new XMLReader();
-		$xml->xml(
-			$this->securityScanFile('compress.zlib://'.realpath($pFilename)), null, PHPExcel_Settings::getLibXmlLoaderOptions()
-		);
-		$xml->setParserProperty(2,true);
-
-		$worksheetInfo = array();
-		while ($xml->read()) {
-			if ($xml->name == 'gnm:Sheet' && $xml->nodeType == XMLReader::ELEMENT) {
-				$tmpInfo = array(
-					'worksheetName' => '',
-					'lastColumnLetter' => 'A',
-					'lastColumnIndex' => 0,
-					'totalRows' => 0,
-					'totalColumns' => 0,
-				);
-
-				while ($xml->read()) {
-					if ($xml->name == 'gnm:Name' && $xml->nodeType == XMLReader::ELEMENT) {
-					    $xml->read();	//	Move onto the value node
-						$tmpInfo['worksheetName'] = (string) $xml->value;
-					} elseif ($xml->name == 'gnm:MaxCol' && $xml->nodeType == XMLReader::ELEMENT) {
-					    $xml->read();	//	Move onto the value node
-						$tmpInfo['lastColumnIndex'] = (int) $xml->value;
-						$tmpInfo['totalColumns'] = (int) $xml->value + 1;
-					} elseif ($xml->name == 'gnm:MaxRow' && $xml->nodeType == XMLReader::ELEMENT) {
-					    $xml->read();	//	Move onto the value node
-						$tmpInfo['totalRows'] = (int) $xml->value + 1;
-						break;
-					}
-				}
-				$tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
-				$worksheetInfo[] = $tmpInfo;
-			}
-		}
-
-		return $worksheetInfo;
-	}
-
-
-	private function _gzfileGetContents($filename) {
-		$file = @gzopen($filename, 'rb');
-		if ($file !== false) {
-			$data = '';
-			while (!gzeof($file)) {
-				$data .= gzread($file, 1024);
-			}
-			gzclose($file);
-		}
-		return $data;
-	}
-
-
-	/**
-	 * Loads PHPExcel from file
-	 *
-	 * @param 	string 		$pFilename
-	 * @return 	PHPExcel
-	 * @throws 	PHPExcel_Reader_Exception
-	 */
-	public function load($pFilename)
-	{
-		// Create new PHPExcel
-		$objPHPExcel = new PHPExcel();
-
-		// Load into this instance
-		return $this->loadIntoExisting($pFilename, $objPHPExcel);
-	}
-
-
-	/**
-	 * Loads PHPExcel from file into PHPExcel instance
-	 *
-	 * @param 	string 		$pFilename
-	 * @param	PHPExcel	$objPHPExcel
-	 * @return 	PHPExcel
-	 * @throws 	PHPExcel_Reader_Exception
-	 */
-	public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		$timezoneObj = new DateTimeZone('Europe/London');
-		$GMT = new DateTimeZone('UTC');
-
-		$gFileData = $this->_gzfileGetContents($pFilename);
-
-//		echo '<pre>';
-//		echo htmlentities($gFileData,ENT_QUOTES,'UTF-8');
-//		echo '</pre><hr />';
-//
-		$xml = simplexml_load_string($this->securityScan($gFileData), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
-		$namespacesMeta = $xml->getNamespaces(true);
-
-//		var_dump($namespacesMeta);
-//
-		$gnmXML = $xml->children($namespacesMeta['gnm']);
-
-		$docProps = $objPHPExcel->getProperties();
-		//	Document Properties are held differently, depending on the version of Gnumeric
-		if (isset($namespacesMeta['office'])) {
-			$officeXML = $xml->children($namespacesMeta['office']);
-		    $officeDocXML = $officeXML->{'document-meta'};
-			$officeDocMetaXML = $officeDocXML->meta;
-
-			foreach($officeDocMetaXML as $officePropertyData) {
-
-				$officePropertyDC = array();
-				if (isset($namespacesMeta['dc'])) {
-					$officePropertyDC = $officePropertyData->children($namespacesMeta['dc']);
-				}
-				foreach($officePropertyDC as $propertyName => $propertyValue) {
-					$propertyValue = (string) $propertyValue;
-					switch ($propertyName) {
-						case 'title' :
-								$docProps->setTitle(trim($propertyValue));
-								break;
-						case 'subject' :
-								$docProps->setSubject(trim($propertyValue));
-								break;
-						case 'creator' :
-								$docProps->setCreator(trim($propertyValue));
-								$docProps->setLastModifiedBy(trim($propertyValue));
-								break;
-						case 'date' :
-								$creationDate = strtotime(trim($propertyValue));
-								$docProps->setCreated($creationDate);
-								$docProps->setModified($creationDate);
-								break;
-						case 'description' :
-								$docProps->setDescription(trim($propertyValue));
-								break;
-					}
-				}
-				$officePropertyMeta = array();
-				if (isset($namespacesMeta['meta'])) {
-					$officePropertyMeta = $officePropertyData->children($namespacesMeta['meta']);
-				}
-				foreach($officePropertyMeta as $propertyName => $propertyValue) {
-					$attributes = $propertyValue->attributes($namespacesMeta['meta']);
-					$propertyValue = (string) $propertyValue;
-					switch ($propertyName) {
-						case 'keyword' :
-								$docProps->setKeywords(trim($propertyValue));
-								break;
-						case 'initial-creator' :
-								$docProps->setCreator(trim($propertyValue));
-								$docProps->setLastModifiedBy(trim($propertyValue));
-								break;
-						case 'creation-date' :
-								$creationDate = strtotime(trim($propertyValue));
-								$docProps->setCreated($creationDate);
-								$docProps->setModified($creationDate);
-								break;
-						case 'user-defined' :
-								list(,$attrName) = explode(':',$attributes['name']);
-								switch ($attrName) {
-									case 'publisher' :
-											$docProps->setCompany(trim($propertyValue));
-											break;
-									case 'category' :
-											$docProps->setCategory(trim($propertyValue));
-											break;
-									case 'manager' :
-											$docProps->setManager(trim($propertyValue));
-											break;
-								}
-								break;
-					}
-				}
-			}
-		} elseif (isset($gnmXML->Summary)) {
-			foreach($gnmXML->Summary->Item as $summaryItem) {
-				$propertyName = $summaryItem->name;
-				$propertyValue = $summaryItem->{'val-string'};
-				switch ($propertyName) {
-					case 'title' :
-						$docProps->setTitle(trim($propertyValue));
-						break;
-					case 'comments' :
-						$docProps->setDescription(trim($propertyValue));
-						break;
-					case 'keywords' :
-						$docProps->setKeywords(trim($propertyValue));
-						break;
-					case 'category' :
-						$docProps->setCategory(trim($propertyValue));
-						break;
-					case 'manager' :
-						$docProps->setManager(trim($propertyValue));
-						break;
-					case 'author' :
-						$docProps->setCreator(trim($propertyValue));
-						$docProps->setLastModifiedBy(trim($propertyValue));
-						break;
-					case 'company' :
-						$docProps->setCompany(trim($propertyValue));
-						break;
-				}
-			}
-		}
-
-		$worksheetID = 0;
-		foreach($gnmXML->Sheets->Sheet as $sheet) {
-			$worksheetName = (string) $sheet->Name;
-//			echo '<b>Worksheet: ',$worksheetName,'</b><br />';
-			if ((isset($this->_loadSheetsOnly)) && (!in_array($worksheetName, $this->_loadSheetsOnly))) {
-				continue;
-			}
-
-			$maxRow = $maxCol = 0;
-
-			// Create new Worksheet
-			$objPHPExcel->createSheet();
-			$objPHPExcel->setActiveSheetIndex($worksheetID);
-			//	Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in formula
-			//		cells... during the load, all formulae should be correct, and we're simply bringing the worksheet
-			//		name in line with the formula, not the reverse
-			$objPHPExcel->getActiveSheet()->setTitle($worksheetName,false);
-
-			if ((!$this->_readDataOnly) && (isset($sheet->PrintInformation))) {
-				if (isset($sheet->PrintInformation->Margins)) {
-					foreach($sheet->PrintInformation->Margins->children('gnm',TRUE) as $key => $margin) {
-						$marginAttributes = $margin->attributes();
-						$marginSize = 72 / 100;	//	Default
-						switch($marginAttributes['PrefUnit']) {
-							case 'mm' :
-								$marginSize = intval($marginAttributes['Points']) / 100;
-								break;
-						}
-						switch($key) {
-							case 'top' :
-								$objPHPExcel->getActiveSheet()->getPageMargins()->setTop($marginSize);
-								break;
-							case 'bottom' :
-								$objPHPExcel->getActiveSheet()->getPageMargins()->setBottom($marginSize);
-								break;
-							case 'left' :
-								$objPHPExcel->getActiveSheet()->getPageMargins()->setLeft($marginSize);
-								break;
-							case 'right' :
-								$objPHPExcel->getActiveSheet()->getPageMargins()->setRight($marginSize);
-								break;
-							case 'header' :
-								$objPHPExcel->getActiveSheet()->getPageMargins()->setHeader($marginSize);
-								break;
-							case 'footer' :
-								$objPHPExcel->getActiveSheet()->getPageMargins()->setFooter($marginSize);
-								break;
-						}
-					}
-				}
-			}
-
-			foreach($sheet->Cells->Cell as $cell) {
-				$cellAttributes = $cell->attributes();
-				$row = (int) $cellAttributes->Row + 1;
-				$column = (int) $cellAttributes->Col;
-
-				if ($row > $maxRow) $maxRow = $row;
-				if ($column > $maxCol) $maxCol = $column;
-
-				$column = PHPExcel_Cell::stringFromColumnIndex($column);
-
-				// Read cell?
-				if ($this->getReadFilter() !== NULL) {
-					if (!$this->getReadFilter()->readCell($column, $row, $worksheetName)) {
-						continue;
-					}
-				}
-
-				$ValueType = $cellAttributes->ValueType;
-				$ExprID = (string) $cellAttributes->ExprID;
-//				echo 'Cell ',$column,$row,'<br />';
-//				echo 'Type is ',$ValueType,'<br />';
-//				echo 'Value is ',$cell,'<br />';
-				$type = PHPExcel_Cell_DataType::TYPE_FORMULA;
-				if ($ExprID > '') {
-					if (((string) $cell) > '') {
-
-						$this->_expressions[$ExprID] = array( 'column'	=> $cellAttributes->Col,
-															  'row'		=> $cellAttributes->Row,
-															  'formula'	=> (string) $cell
-															);
-//						echo 'NEW EXPRESSION ',$ExprID,'<br />';
-					} else {
-						$expression = $this->_expressions[$ExprID];
-
-						$cell = $this->_referenceHelper->updateFormulaReferences( $expression['formula'],
-																				  'A1',
-																				  $cellAttributes->Col - $expression['column'],
-																				  $cellAttributes->Row - $expression['row'],
-																				  $worksheetName
-																				);
-//						echo 'SHARED EXPRESSION ',$ExprID,'<br />';
-//						echo 'New Value is ',$cell,'<br />';
-					}
-					$type = PHPExcel_Cell_DataType::TYPE_FORMULA;
-				} else {
-					switch($ValueType) {
-						case '10' :		//	NULL
-							$type = PHPExcel_Cell_DataType::TYPE_NULL;
-							break;
-						case '20' :		//	Boolean
-							$type = PHPExcel_Cell_DataType::TYPE_BOOL;
-							$cell = ($cell == 'TRUE') ? True : False;
-							break;
-						case '30' :		//	Integer
-							$cell = intval($cell);
-						case '40' :		//	Float
-							$type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
-							break;
-						case '50' :		//	Error
-							$type = PHPExcel_Cell_DataType::TYPE_ERROR;
-							break;
-						case '60' :		//	String
-							$type = PHPExcel_Cell_DataType::TYPE_STRING;
-							break;
-						case '70' :		//	Cell Range
-						case '80' :		//	Array
-					}
-				}
-				$objPHPExcel->getActiveSheet()->getCell($column.$row)->setValueExplicit($cell,$type);
-			}
-
-			if ((!$this->_readDataOnly) && (isset($sheet->Objects))) {
-				foreach($sheet->Objects->children('gnm',TRUE) as $key => $comment) {
-					$commentAttributes = $comment->attributes();
-					//	Only comment objects are handled at the moment
-					if ($commentAttributes->Text) {
-						$objPHPExcel->getActiveSheet()->getComment( (string)$commentAttributes->ObjectBound )
-															->setAuthor( (string)$commentAttributes->Author )
-															->setText($this->_parseRichText((string)$commentAttributes->Text) );
-					}
-				}
-			}
-//			echo '$maxCol=',$maxCol,'; $maxRow=',$maxRow,'<br />';
-//
-			foreach($sheet->Styles->StyleRegion as $styleRegion) {
-				$styleAttributes = $styleRegion->attributes();
-				if (($styleAttributes['startRow'] <= $maxRow) &&
-					($styleAttributes['startCol'] <= $maxCol)) {
-
-					$startColumn = PHPExcel_Cell::stringFromColumnIndex((int) $styleAttributes['startCol']);
-					$startRow = $styleAttributes['startRow'] + 1;
-
-					$endColumn = ($styleAttributes['endCol'] > $maxCol) ? $maxCol : (int) $styleAttributes['endCol'];
-					$endColumn = PHPExcel_Cell::stringFromColumnIndex($endColumn);
-					$endRow = ($styleAttributes['endRow'] > $maxRow) ? $maxRow : $styleAttributes['endRow'];
-					$endRow += 1;
-					$cellRange = $startColumn.$startRow.':'.$endColumn.$endRow;
-//					echo $cellRange,'<br />';
-
-					$styleAttributes = $styleRegion->Style->attributes();
-//					var_dump($styleAttributes);
-//					echo '<br />';
-
-					//	We still set the number format mask for date/time values, even if _readDataOnly is true
-					if ((!$this->_readDataOnly) ||
-						(PHPExcel_Shared_Date::isDateTimeFormatCode((string) $styleAttributes['Format']))) {
-						$styleArray = array();
-						$styleArray['numberformat']['code'] = (string) $styleAttributes['Format'];
-						//	If _readDataOnly is false, we set all formatting information
-						if (!$this->_readDataOnly) {
-							switch($styleAttributes['HAlign']) {
-								case '1' :
-									$styleArray['alignment']['horizontal'] = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
-									break;
-								case '2' :
-									$styleArray['alignment']['horizontal'] = PHPExcel_Style_Alignment::HORIZONTAL_LEFT;
-									break;
-								case '4' :
-									$styleArray['alignment']['horizontal'] = PHPExcel_Style_Alignment::HORIZONTAL_RIGHT;
-									break;
-								case '8' :
-									$styleArray['alignment']['horizontal'] = PHPExcel_Style_Alignment::HORIZONTAL_CENTER;
-									break;
-								case '16' :
-								case '64' :
-									$styleArray['alignment']['horizontal'] = PHPExcel_Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS;
-									break;
-								case '32' :
-									$styleArray['alignment']['horizontal'] = PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY;
-									break;
-							}
-
-							switch($styleAttributes['VAlign']) {
-								case '1' :
-									$styleArray['alignment']['vertical'] = PHPExcel_Style_Alignment::VERTICAL_TOP;
-									break;
-								case '2' :
-									$styleArray['alignment']['vertical'] = PHPExcel_Style_Alignment::VERTICAL_BOTTOM;
-									break;
-								case '4' :
-									$styleArray['alignment']['vertical'] = PHPExcel_Style_Alignment::VERTICAL_CENTER;
-									break;
-								case '8' :
-									$styleArray['alignment']['vertical'] = PHPExcel_Style_Alignment::VERTICAL_JUSTIFY;
-									break;
-							}
-
-							$styleArray['alignment']['wrap'] = ($styleAttributes['WrapText'] == '1') ? True : False;
-							$styleArray['alignment']['shrinkToFit'] = ($styleAttributes['ShrinkToFit'] == '1') ? True : False;
-							$styleArray['alignment']['indent'] = (intval($styleAttributes["Indent"]) > 0) ? $styleAttributes["indent"] : 0;
-
-							$RGB = self::_parseGnumericColour($styleAttributes["Fore"]);
-							$styleArray['font']['color']['rgb'] = $RGB;
-							$RGB = self::_parseGnumericColour($styleAttributes["Back"]);
-							$shade = $styleAttributes["Shade"];
-							if (($RGB != '000000') || ($shade != '0')) {
-								$styleArray['fill']['color']['rgb'] = $styleArray['fill']['startcolor']['rgb'] = $RGB;
-								$RGB2 = self::_parseGnumericColour($styleAttributes["PatternColor"]);
-								$styleArray['fill']['endcolor']['rgb'] = $RGB2;
-								switch($shade) {
-									case '1' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_SOLID;
-										break;
-									case '2' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_GRADIENT_LINEAR;
-										break;
-									case '3' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_GRADIENT_PATH;
-										break;
-									case '4' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKDOWN;
-										break;
-									case '5' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKGRAY;
-										break;
-									case '6' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKGRID;
-										break;
-									case '7' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKHORIZONTAL;
-										break;
-									case '8' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKTRELLIS;
-										break;
-									case '9' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKUP;
-										break;
-									case '10' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKVERTICAL;
-										break;
-									case '11' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_GRAY0625;
-										break;
-									case '12' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_GRAY125;
-										break;
-									case '13' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTDOWN;
-										break;
-									case '14' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRAY;
-										break;
-									case '15' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRID;
-										break;
-									case '16' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTHORIZONTAL;
-										break;
-									case '17' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTTRELLIS;
-										break;
-									case '18' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTUP;
-										break;
-									case '19' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTVERTICAL;
-										break;
-									case '20' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_MEDIUMGRAY;
-										break;
-								}
-							}
-
-							$fontAttributes = $styleRegion->Style->Font->attributes();
-//							var_dump($fontAttributes);
-//							echo '<br />';
-							$styleArray['font']['name'] = (string) $styleRegion->Style->Font;
-							$styleArray['font']['size'] = intval($fontAttributes['Unit']);
-							$styleArray['font']['bold'] = ($fontAttributes['Bold'] == '1') ? True : False;
-							$styleArray['font']['italic'] = ($fontAttributes['Italic'] == '1') ? True : False;
-							$styleArray['font']['strike'] = ($fontAttributes['StrikeThrough'] == '1') ? True : False;
-							switch($fontAttributes['Underline']) {
-								case '1' :
-									$styleArray['font']['underline'] = PHPExcel_Style_Font::UNDERLINE_SINGLE;
-									break;
-								case '2' :
-									$styleArray['font']['underline'] = PHPExcel_Style_Font::UNDERLINE_DOUBLE;
-									break;
-								case '3' :
-									$styleArray['font']['underline'] = PHPExcel_Style_Font::UNDERLINE_SINGLEACCOUNTING;
-									break;
-								case '4' :
-									$styleArray['font']['underline'] = PHPExcel_Style_Font::UNDERLINE_DOUBLEACCOUNTING;
-									break;
-								default :
-									$styleArray['font']['underline'] = PHPExcel_Style_Font::UNDERLINE_NONE;
-									break;
-							}
-							switch($fontAttributes['Script']) {
-								case '1' :
-									$styleArray['font']['superScript'] = True;
-									break;
-								case '-1' :
-									$styleArray['font']['subScript'] = True;
-									break;
-							}
-
-							if (isset($styleRegion->Style->StyleBorder)) {
-								if (isset($styleRegion->Style->StyleBorder->Top)) {
-									$styleArray['borders']['top'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Top->attributes());
-								}
-								if (isset($styleRegion->Style->StyleBorder->Bottom)) {
-									$styleArray['borders']['bottom'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Bottom->attributes());
-								}
-								if (isset($styleRegion->Style->StyleBorder->Left)) {
-									$styleArray['borders']['left'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Left->attributes());
-								}
-								if (isset($styleRegion->Style->StyleBorder->Right)) {
-									$styleArray['borders']['right'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Right->attributes());
-								}
-								if ((isset($styleRegion->Style->StyleBorder->Diagonal)) && (isset($styleRegion->Style->StyleBorder->{'Rev-Diagonal'}))) {
-									$styleArray['borders']['diagonal'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Diagonal->attributes());
-									$styleArray['borders']['diagonaldirection'] = PHPExcel_Style_Borders::DIAGONAL_BOTH;
-								} elseif (isset($styleRegion->Style->StyleBorder->Diagonal)) {
-									$styleArray['borders']['diagonal'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Diagonal->attributes());
-									$styleArray['borders']['diagonaldirection'] = PHPExcel_Style_Borders::DIAGONAL_UP;
-								} elseif (isset($styleRegion->Style->StyleBorder->{'Rev-Diagonal'})) {
-									$styleArray['borders']['diagonal'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->{'Rev-Diagonal'}->attributes());
-									$styleArray['borders']['diagonaldirection'] = PHPExcel_Style_Borders::DIAGONAL_DOWN;
-								}
-							}
-							if (isset($styleRegion->Style->HyperLink)) {
-								//	TO DO
-								$hyperlink = $styleRegion->Style->HyperLink->attributes();
-							}
-						}
-//						var_dump($styleArray);
-//						echo '<br />';
-						$objPHPExcel->getActiveSheet()->getStyle($cellRange)->applyFromArray($styleArray);
-					}
-				}
-			}
-
-			if ((!$this->_readDataOnly) && (isset($sheet->Cols))) {
-				//	Column Widths
-				$columnAttributes = $sheet->Cols->attributes();
-				$defaultWidth = $columnAttributes['DefaultSizePts']  / 5.4;
-				$c = 0;
-				foreach($sheet->Cols->ColInfo as $columnOverride) {
-					$columnAttributes = $columnOverride->attributes();
-					$column = $columnAttributes['No'];
-					$columnWidth = $columnAttributes['Unit']  / 5.4;
-					$hidden = ((isset($columnAttributes['Hidden'])) && ($columnAttributes['Hidden'] == '1')) ? true : false;
-					$columnCount = (isset($columnAttributes['Count'])) ? $columnAttributes['Count'] : 1;
-					while ($c < $column) {
-						$objPHPExcel->getActiveSheet()->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($c))->setWidth($defaultWidth);
-						++$c;
-					}
-					while (($c < ($column+$columnCount)) && ($c <= $maxCol)) {
-						$objPHPExcel->getActiveSheet()->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($c))->setWidth($columnWidth);
-						if ($hidden) {
-							$objPHPExcel->getActiveSheet()->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($c))->setVisible(false);
-						}
-						++$c;
-					}
-				}
-				while ($c <= $maxCol) {
-					$objPHPExcel->getActiveSheet()->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($c))->setWidth($defaultWidth);
-					++$c;
-				}
-			}
-
-			if ((!$this->_readDataOnly) && (isset($sheet->Rows))) {
-				//	Row Heights
-				$rowAttributes = $sheet->Rows->attributes();
-				$defaultHeight = $rowAttributes['DefaultSizePts'];
-				$r = 0;
-
-				foreach($sheet->Rows->RowInfo as $rowOverride) {
-					$rowAttributes = $rowOverride->attributes();
-					$row = $rowAttributes['No'];
-					$rowHeight = $rowAttributes['Unit'];
-					$hidden = ((isset($rowAttributes['Hidden'])) && ($rowAttributes['Hidden'] == '1')) ? true : false;
-					$rowCount = (isset($rowAttributes['Count'])) ? $rowAttributes['Count'] : 1;
-					while ($r < $row) {
-						++$r;
-						$objPHPExcel->getActiveSheet()->getRowDimension($r)->setRowHeight($defaultHeight);
-					}
-					while (($r < ($row+$rowCount)) && ($r < $maxRow)) {
-						++$r;
-						$objPHPExcel->getActiveSheet()->getRowDimension($r)->setRowHeight($rowHeight);
-						if ($hidden) {
-							$objPHPExcel->getActiveSheet()->getRowDimension($r)->setVisible(false);
-						}
-					}
-				}
-				while ($r < $maxRow) {
-					++$r;
-					$objPHPExcel->getActiveSheet()->getRowDimension($r)->setRowHeight($defaultHeight);
-				}
-			}
-
-			//	Handle Merged Cells in this worksheet
-			if (isset($sheet->MergedRegions)) {
-				foreach($sheet->MergedRegions->Merge as $mergeCells) {
-					if (strpos($mergeCells,':') !== FALSE) {
-						$objPHPExcel->getActiveSheet()->mergeCells($mergeCells);
-					}
-				}
-			}
-
-			$worksheetID++;
-		}
-
-		//	Loop through definedNames (global named ranges)
-		if (isset($gnmXML->Names)) {
-			foreach($gnmXML->Names->Name as $namedRange) {
-				$name = (string) $namedRange->name;
-				$range = (string) $namedRange->value;
-				if (stripos($range, '#REF!') !== false) {
-					continue;
-				}
-
-				$range = explode('!',$range);
-				$range[0] = trim($range[0],"'");;
-				if ($worksheet = $objPHPExcel->getSheetByName($range[0])) {
-					$extractedRange = str_replace('$', '', $range[1]);
-					$objPHPExcel->addNamedRange( new PHPExcel_NamedRange($name, $worksheet, $extractedRange) );
-				}
-			}
-		}
-
-
-		// Return
-		return $objPHPExcel;
-	}
-
-
-	private static function _parseBorderAttributes($borderAttributes)
-	{
-		$styleArray = array();
-
-		if (isset($borderAttributes["Color"])) {
-			$RGB = self::_parseGnumericColour($borderAttributes["Color"]);
-			$styleArray['color']['rgb'] = $RGB;
-		}
-
-		switch ($borderAttributes["Style"]) {
-			case '0' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_NONE;
-				break;
-			case '1' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_THIN;
-				break;
-			case '2' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUM;
-				break;
-			case '4' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_DASHED;
-				break;
-			case '5' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_THICK;
-				break;
-			case '6' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_DOUBLE;
-				break;
-			case '7' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_DOTTED;
-				break;
-			case '9' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_DASHDOT;
-				break;
-			case '10' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT;
-				break;
-			case '11' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_DASHDOTDOT;
-				break;
-			case '12' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT;
-				break;
-			case '13' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT;
-				break;
-			case '3' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_SLANTDASHDOT;
-				break;
-			case '8' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUMDASHED;
-				break;
-		}
-		return $styleArray;
-	}
-
-
-	private function _parseRichText($is = '') {
-		$value = new PHPExcel_RichText();
-
-		$value->createText($is);
-
-		return $value;
-	}
-
-
-	private static function _parseGnumericColour($gnmColour) {
-		list($gnmR,$gnmG,$gnmB) = explode(':',$gnmColour);
-		$gnmR = substr(str_pad($gnmR,4,'0',STR_PAD_RIGHT),0,2);
-		$gnmG = substr(str_pad($gnmG,4,'0',STR_PAD_RIGHT),0,2);
-		$gnmB = substr(str_pad($gnmB,4,'0',STR_PAD_RIGHT),0,2);
-		$RGB = $gnmR.$gnmG.$gnmB;
-//		echo 'Excel Colour: ',$RGB,'<br />';
-		return $RGB;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/HTML.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/HTML.php
deleted file mode 100644
index 26cc598c159..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/HTML.php
+++ /dev/null
@@ -1,534 +0,0 @@
-<?php
-
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-    /**
-     * @ignore
-     */
-    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_Reader_HTML
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_HTML extends PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
-{
-
-    /**
-     * Input encoding
-     *
-     * @var string
-     */
-    protected $_inputEncoding = 'ANSI';
-
-    /**
-     * Sheet index to read
-     *
-     * @var int
-     */
-    protected $_sheetIndex = 0;
-
-    /**
-     * Formats
-     *
-     * @var array
-     */
-    protected $_formats = array(
-        'h1' => array('font' => array('bold' => true,
-                'size' => 24,
-            ),
-        ), //	Bold, 24pt
-        'h2' => array('font' => array('bold' => true,
-                'size' => 18,
-            ),
-        ), //	Bold, 18pt
-        'h3' => array('font' => array('bold' => true,
-                'size' => 13.5,
-            ),
-        ), //	Bold, 13.5pt
-        'h4' => array('font' => array('bold' => true,
-                'size' => 12,
-            ),
-        ), //	Bold, 12pt
-        'h5' => array('font' => array('bold' => true,
-                'size' => 10,
-            ),
-        ), //	Bold, 10pt
-        'h6' => array('font' => array('bold' => true,
-                'size' => 7.5,
-            ),
-        ), //	Bold, 7.5pt
-        'a' => array('font' => array('underline' => true,
-                'color' => array('argb' => PHPExcel_Style_Color::COLOR_BLUE,
-                ),
-            ),
-        ), //	Blue underlined
-        'hr' => array('borders' => array('bottom' => array('style' => PHPExcel_Style_Border::BORDER_THIN,
-                    'color' => array(\PHPExcel_Style_Color::COLOR_BLACK,
-                    ),
-                ),
-            ),
-        ), //	Bottom border
-    );
-
-    protected $rowspan = array();
-
-    /**
-     * Create a new PHPExcel_Reader_HTML
-     */
-    public function __construct()
-    {
-        $this->_readFilter = new PHPExcel_Reader_DefaultReadFilter();
-    }
-
-    /**
-     * Validate that the current file is an HTML file
-     *
-     * @return boolean
-     */
-    protected function _isValidFormat()
-    {
-        //	Reading 2048 bytes should be enough to validate that the format is HTML
-        $data = fread($this->_fileHandle, 2048);
-        if ((strpos($data, '<') !== FALSE) &&
-                (strlen($data) !== strlen(strip_tags($data)))) {
-            return TRUE;
-        }
-
-        return FALSE;
-    }
-
-    /**
-     * Loads PHPExcel from file
-     *
-     * @param  string                    $pFilename
-     * @return PHPExcel
-     * @throws PHPExcel_Reader_Exception
-     */
-    public function load($pFilename)
-    {
-        // Create new PHPExcel
-        $objPHPExcel = new PHPExcel();
-
-        // Load into this instance
-        return $this->loadIntoExisting($pFilename, $objPHPExcel);
-    }
-
-    /**
-     * Set input encoding
-     *
-     * @param string $pValue Input encoding
-     */
-    public function setInputEncoding($pValue = 'ANSI')
-    {
-        $this->_inputEncoding = $pValue;
-
-        return $this;
-    }
-
-    /**
-     * Get input encoding
-     *
-     * @return string
-     */
-    public function getInputEncoding()
-    {
-        return $this->_inputEncoding;
-    }
-
-    //	Data Array used for testing only, should write to PHPExcel object on completion of tests
-    protected $_dataArray = array();
-    protected $_tableLevel = 0;
-    protected $_nestedColumn = array('A');
-
-    protected function _setTableStartColumn($column)
-    {
-        if ($this->_tableLevel == 0)
-            $column = 'A';
-        ++$this->_tableLevel;
-        $this->_nestedColumn[$this->_tableLevel] = $column;
-
-        return $this->_nestedColumn[$this->_tableLevel];
-    }
-
-    protected function _getTableStartColumn()
-    {
-        return $this->_nestedColumn[$this->_tableLevel];
-    }
-
-    protected function _releaseTableStartColumn()
-    {
-        --$this->_tableLevel;
-
-        return array_pop($this->_nestedColumn);
-    }
-
-    protected function _flushCell($sheet, $column, $row, &$cellContent)
-    {
-        if (is_string($cellContent)) {
-            //	Simple String content
-            if (trim($cellContent) > '') {
-                //	Only actually write it if there's content in the string
-//				echo 'FLUSH CELL: ' , $column , $row , ' => ' , $cellContent , '<br />';
-                //	Write to worksheet to be done here...
-                //	... we return the cell so we can mess about with styles more easily
-                $sheet->setCellValue($column . $row, $cellContent, true);
-                $this->_dataArray[$row][$column] = $cellContent;
-            }
-        } else {
-            //	We have a Rich Text run
-            //	TODO
-            $this->_dataArray[$row][$column] = 'RICH TEXT: ' . $cellContent;
-        }
-        $cellContent = (string) '';
-    }
-
-    protected function _processDomElement(DOMNode $element, $sheet, &$row, &$column, &$cellContent, $format = null)
-    {
-        foreach ($element->childNodes as $child) {
-            if ($child instanceof DOMText) {
-                $domText = preg_replace('/\s+/u', ' ', trim($child->nodeValue));
-                if (is_string($cellContent)) {
-                    //	simply append the text if the cell content is a plain text string
-                    $cellContent .= $domText;
-                } else {
-                    //	but if we have a rich text run instead, we need to append it correctly
-                    //	TODO
-                }
-            } elseif ($child instanceof DOMElement) {
-//				echo '<b>DOM ELEMENT: </b>' , strtoupper($child->nodeName) , '<br />';
-
-                $attributeArray = array();
-                foreach ($child->attributes as $attribute) {
-//					echo '<b>ATTRIBUTE: </b>' , $attribute->name , ' => ' , $attribute->value , '<br />';
-                    $attributeArray[$attribute->name] = $attribute->value;
-                }
-
-                switch ($child->nodeName) {
-                    case 'meta' :
-                        foreach ($attributeArray as $attributeName => $attributeValue) {
-                            switch ($attributeName) {
-                                case 'content':
-                                    //	TODO
-                                    //	Extract character set, so we can convert to UTF-8 if required
-                                    break;
-                            }
-                        }
-                        $this->_processDomElement($child, $sheet, $row, $column, $cellContent);
-                        break;
-                    case 'title' :
-                        $this->_processDomElement($child, $sheet, $row, $column, $cellContent);
-                        $sheet->setTitle($cellContent);
-                        $cellContent = '';
-                        break;
-                    case 'span' :
-                    case 'div' :
-                    case 'font' :
-                    case 'i' :
-                    case 'em' :
-                    case 'strong':
-                    case 'b' :
-//						echo 'STYLING, SPAN OR DIV<br />';
-                        if ($cellContent > '')
-                            $cellContent .= ' ';
-                        $this->_processDomElement($child, $sheet, $row, $column, $cellContent);
-                        if ($cellContent > '')
-                            $cellContent .= ' ';
-//						echo 'END OF STYLING, SPAN OR DIV<br />';
-                        break;
-                    case 'hr' :
-                        $this->_flushCell($sheet, $column, $row, $cellContent);
-                        ++$row;
-                        if (isset($this->_formats[$child->nodeName])) {
-                            $sheet->getStyle($column . $row)->applyFromArray($this->_formats[$child->nodeName]);
-                        } else {
-                            $cellContent = '----------';
-                            $this->_flushCell($sheet, $column, $row, $cellContent);
-                        }
-                        ++$row;
-                    case 'br' :
-                        if ($this->_tableLevel > 0) {
-                            //	If we're inside a table, replace with a \n
-                            $cellContent .= "\n";
-                        } else {
-                            //	Otherwise flush our existing content and move the row cursor on
-                            $this->_flushCell($sheet, $column, $row, $cellContent);
-                            ++$row;
-                        }
-//						echo 'HARD LINE BREAK: ' , '<br />';
-                        break;
-                    case 'a' :
-//						echo 'START OF HYPERLINK: ' , '<br />';
-                        foreach ($attributeArray as $attributeName => $attributeValue) {
-                            switch ($attributeName) {
-                                case 'href':
-//									echo 'Link to ' , $attributeValue , '<br />';
-                                    $sheet->getCell($column . $row)->getHyperlink()->setUrl($attributeValue);
-                                    if (isset($this->_formats[$child->nodeName])) {
-                                        $sheet->getStyle($column . $row)->applyFromArray($this->_formats[$child->nodeName]);
-                                    }
-                                    break;
-                            }
-                        }
-                        $cellContent .= ' ';
-                        $this->_processDomElement($child, $sheet, $row, $column, $cellContent);
-//						echo 'END OF HYPERLINK:' , '<br />';
-                        break;
-                    case 'h1' :
-                    case 'h2' :
-                    case 'h3' :
-                    case 'h4' :
-                    case 'h5' :
-                    case 'h6' :
-                    case 'ol' :
-                    case 'ul' :
-                    case 'p' :
-                        if ($this->_tableLevel > 0) {
-                            //	If we're inside a table, replace with a \n
-                            $cellContent .= "\n";
-//							echo 'LIST ENTRY: ' , '<br />';
-                            $this->_processDomElement($child, $sheet, $row, $column, $cellContent);
-//							echo 'END OF LIST ENTRY:' , '<br />';
-                        } else {
-                            if ($cellContent > '') {
-                                $this->_flushCell($sheet, $column, $row, $cellContent);
-                                $row++;
-                            }
-//							echo 'START OF PARAGRAPH: ' , '<br />';
-                            $this->_processDomElement($child, $sheet, $row, $column, $cellContent);
-//							echo 'END OF PARAGRAPH:' , '<br />';
-                            $this->_flushCell($sheet, $column, $row, $cellContent);
-
-                            if (isset($this->_formats[$child->nodeName])) {
-                                $sheet->getStyle($column . $row)->applyFromArray($this->_formats[$child->nodeName]);
-                            }
-
-                            $row++;
-                            $column = 'A';
-                        }
-                        break;
-                    case 'li' :
-                        if ($this->_tableLevel > 0) {
-                            //	If we're inside a table, replace with a \n
-                            $cellContent .= "\n";
-//							echo 'LIST ENTRY: ' , '<br />';
-                            $this->_processDomElement($child, $sheet, $row, $column, $cellContent);
-//							echo 'END OF LIST ENTRY:' , '<br />';
-                        } else {
-                            if ($cellContent > '') {
-                                $this->_flushCell($sheet, $column, $row, $cellContent);
-                            }
-                            ++$row;
-//							echo 'LIST ENTRY: ' , '<br />';
-                            $this->_processDomElement($child, $sheet, $row, $column, $cellContent);
-//							echo 'END OF LIST ENTRY:' , '<br />';
-                            $this->_flushCell($sheet, $column, $row, $cellContent);
-                            $column = 'A';
-                        }
-                        break;
-                    case 'table' :
-                        $this->_flushCell($sheet, $column, $row, $cellContent);
-                        $column = $this->_setTableStartColumn($column);
-//						echo 'START OF TABLE LEVEL ' , $this->_tableLevel , '<br />';
-                        if ($this->_tableLevel > 1)
-                            --$row;
-                        $this->_processDomElement($child, $sheet, $row, $column, $cellContent);
-//						echo 'END OF TABLE LEVEL ' , $this->_tableLevel , '<br />';
-                        $column = $this->_releaseTableStartColumn();
-                        if ($this->_tableLevel > 1) {
-                            ++$column;
-                        } else {
-                            ++$row;
-                        }
-                        break;
-                    case 'thead' :
-                    case 'tbody' :
-                        $this->_processDomElement($child, $sheet, $row, $column, $cellContent);
-                        break;
-                    case 'tr' :
-                        $column = $this->_getTableStartColumn();
-                        $cellContent = '';
-//						echo 'START OF TABLE ' , $this->_tableLevel , ' ROW<br />';
-                        $this->_processDomElement($child, $sheet, $row, $column, $cellContent);
-                        ++$row;
-//						echo 'END OF TABLE ' , $this->_tableLevel , ' ROW<br />';
-                        break;
-                    case 'th' :
-                    case 'td' :
-//						echo 'START OF TABLE ' , $this->_tableLevel , ' CELL<br />';
-                        $this->_processDomElement($child, $sheet, $row, $column, $cellContent);
-//						echo 'END OF TABLE ' , $this->_tableLevel , ' CELL<br />';
-
-                        while (isset($this->rowspan[$column . $row])) {
-                            ++$column;
-                        }
-
-                        $this->_flushCell($sheet, $column, $row, $cellContent);
-
-//                        if (isset($attributeArray['style']) && !empty($attributeArray['style'])) {
-//                            $styleAry = $this->getPhpExcelStyleArray($attributeArray['style']);
-//
-//                            if (!empty($styleAry)) {
-//                                $sheet->getStyle($column . $row)->applyFromArray($styleAry);
-//                            }
-//                        }
-
-                        if (isset($attributeArray['rowspan']) && isset($attributeArray['colspan'])) {
-                            //create merging rowspan and colspan
-                            $columnTo = $column;
-                            for ($i = 0; $i < $attributeArray['colspan'] - 1; $i++) {
-                                ++$columnTo;
-                            }
-                            $range = $column . $row . ':' . $columnTo . ($row + $attributeArray['rowspan'] - 1);
-                            foreach (\PHPExcel_Cell::extractAllCellReferencesInRange($range) as $value) {
-                                $this->rowspan[$value] = true;
-                            }
-                            $sheet->mergeCells($range);
-                            $column = $columnTo;
-                        } elseif (isset($attributeArray['rowspan'])) {
-                            //create merging rowspan
-                            $range = $column . $row . ':' . $column . ($row + $attributeArray['rowspan'] - 1);
-                            foreach (\PHPExcel_Cell::extractAllCellReferencesInRange($range) as $value) {
-                                $this->rowspan[$value] = true;
-                            }
-                            $sheet->mergeCells($range);
-                        } elseif (isset($attributeArray['colspan'])) {
-                            //create merging colspan
-                            $columnTo = $column;
-                            for ($i = 0; $i < $attributeArray['colspan'] - 1; $i++) {
-                                ++$columnTo;
-                            }
-                            $sheet->mergeCells($column . $row . ':' . $columnTo . $row);
-                            $column = $columnTo;
-                        }
-                        ++$column;
-                        break;
-                    case 'body' :
-                        $row = 1;
-                        $column = 'A';
-                        $content = '';
-                        $this->_tableLevel = 0;
-                        $this->_processDomElement($child, $sheet, $row, $column, $cellContent);
-                        break;
-                    default:
-                        $this->_processDomElement($child, $sheet, $row, $column, $cellContent);
-                }
-            }
-        }
-    }
-
-    /**
-     * Loads PHPExcel from file into PHPExcel instance
-     *
-     * @param  string                    $pFilename
-     * @param  PHPExcel                  $objPHPExcel
-     * @return PHPExcel
-     * @throws PHPExcel_Reader_Exception
-     */
-    public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
-    {
-        // Open file to validate
-        $this->_openFile($pFilename);
-        if (!$this->_isValidFormat()) {
-            fclose($this->_fileHandle);
-            throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid HTML file.");
-        }
-        //	Close after validating
-        fclose($this->_fileHandle);
-
-        // Create new PHPExcel
-        while ($objPHPExcel->getSheetCount() <= $this->_sheetIndex) {
-            $objPHPExcel->createSheet();
-        }
-        $objPHPExcel->setActiveSheetIndex($this->_sheetIndex);
-
-        //	Create a new DOM object
-        $dom = new domDocument;
-        //	Reload the HTML file into the DOM object
-        $loaded = $dom->loadHTML($this->securityScanFile($pFilename));
-        if ($loaded === FALSE) {
-            throw new PHPExcel_Reader_Exception('Failed to load ', $pFilename, ' as a DOM Document');
-        }
-
-        //	Discard white space
-        $dom->preserveWhiteSpace = false;
-
-        $row = 0;
-        $column = 'A';
-        $content = '';
-        $this->_processDomElement($dom, $objPHPExcel->getActiveSheet(), $row, $column, $content);
-
-		// Return
-        return $objPHPExcel;
-    }
-
-    /**
-     * Get sheet index
-     *
-     * @return int
-     */
-    public function getSheetIndex()
-    {
-        return $this->_sheetIndex;
-    }
-
-    /**
-     * Set sheet index
-     *
-     * @param  int                  $pValue Sheet index
-     * @return PHPExcel_Reader_HTML
-     */
-    public function setSheetIndex($pValue = 0)
-    {
-        $this->_sheetIndex = $pValue;
-
-        return $this;
-    }
-
-	/**
-	 * Scan theXML for use of <!ENTITY to prevent XXE/XEE attacks
-	 *
-	 * @param 	string 		$xml
-	 * @throws PHPExcel_Reader_Exception
-	 */
-	public function securityScan($xml)
-	{
-        $pattern = '/\\0?' . implode('\\0?', str_split('<!ENTITY')) . '\\0?/';
-        if (preg_match($pattern, $xml)) { 
-            throw new PHPExcel_Reader_Exception('Detected use of ENTITY in XML, spreadsheet file load() aborted to prevent XXE/XEE attacks');
-        }
-        return $xml;
-    }
-
-}
-
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReadFilter.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReadFilter.php
deleted file mode 100644
index f27cff8b979..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReadFilter.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Reader_IReadFilter
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-interface PHPExcel_Reader_IReadFilter
-{
-	/**
-	 * Should this cell be read?
-	 *
-	 * @param 	$column		String column index
-	 * @param 	$row			Row index
-	 * @param	$worksheetName	Optional worksheet name
-	 * @return	boolean
-	 */
-	public function readCell($column, $row, $worksheetName = '');
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReader.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReader.php
deleted file mode 100644
index b543df4a7b4..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReader.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Reader_IReader
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-interface PHPExcel_Reader_IReader
-{
-	/**
-	 * Can the current PHPExcel_Reader_IReader read the file?
-	 *
-	 * @param 	string 		$pFilename
-	 * @return 	boolean
-	 */
-	public function canRead($pFilename);
-
-	/**
-	 * Loads PHPExcel from file
-	 *
-	 * @param 	string 		$pFilename
-     * @return  PHPExcel
-	 * @throws 	PHPExcel_Reader_Exception
-	 */
-	public function load($pFilename);
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/OOCalc.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/OOCalc.php
deleted file mode 100644
index 7644df94143..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/OOCalc.php
+++ /dev/null
@@ -1,711 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_Reader_OOCalc
- *
- * @category	PHPExcel
- * @package		PHPExcel_Reader
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
-{
-	/**
-	 * Formats
-	 *
-	 * @var array
-	 */
-	private $_styles = array();
-
-
-	/**
-	 * Create a new PHPExcel_Reader_OOCalc
-	 */
-	public function __construct() {
-		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
-	}
-
-
-	/**
-	 * Can the current PHPExcel_Reader_IReader read the file?
-	 *
-	 * @param 	string 		$pFilename
-	 * @return 	boolean
-	 * @throws PHPExcel_Reader_Exception
-	 */
-	public function canRead($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-        $zipClass = PHPExcel_Settings::getZipClass();
-
-		// Check if zip class exists
-//		if (!class_exists($zipClass, FALSE)) {
-//			throw new PHPExcel_Reader_Exception($zipClass . " library is not enabled");
-//		}
-
-        $mimeType = 'UNKNOWN';
-		// Load file
-		$zip = new $zipClass;
-		if ($zip->open($pFilename) === true) {
-			// check if it is an OOXML archive
-			$stat = $zip->statName('mimetype');
-			if ($stat && ($stat['size'] <= 255)) {
-				$mimeType = $zip->getFromName($stat['name']);
-			} elseif($stat = $zip->statName('META-INF/manifest.xml')) {
-		        $xml = simplexml_load_string($this->securityScan($zip->getFromName('META-INF/manifest.xml')), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
-		        $namespacesContent = $xml->getNamespaces(true);
-				if (isset($namespacesContent['manifest'])) {
-			        $manifest = $xml->children($namespacesContent['manifest']);
-				    foreach($manifest as $manifestDataSet) {
-					    $manifestAttributes = $manifestDataSet->attributes($namespacesContent['manifest']);
-				        if ($manifestAttributes->{'full-path'} == '/') {
-				            $mimeType = (string) $manifestAttributes->{'media-type'};
-				            break;
-				    	}
-				    }
-				}
-			}
-
-			$zip->close();
-
-			return ($mimeType === 'application/vnd.oasis.opendocument.spreadsheet');
-		}
-
-		return FALSE;
-	}
-
-
-	/**
-	 * Reads names of the worksheets from a file, without parsing the whole file to a PHPExcel object
-	 *
-	 * @param 	string 		$pFilename
-	 * @throws 	PHPExcel_Reader_Exception
-	 */
-	public function listWorksheetNames($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-        $zipClass = PHPExcel_Settings::getZipClass();
-
-		$zip = new $zipClass;
-		if (!$zip->open($pFilename)) {
-			throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! Error opening file.");
-		}
-
-		$worksheetNames = array();
-
-		$xml = new XMLReader();
-		$res = $xml->xml($this->securityScanFile('zip://'.realpath($pFilename).'#content.xml'), null, PHPExcel_Settings::getLibXmlLoaderOptions());
-		$xml->setParserProperty(2,true);
-
-		//	Step into the first level of content of the XML
-		$xml->read();
-		while ($xml->read()) {
-			//	Quickly jump through to the office:body node
-			while ($xml->name !== 'office:body') {
-				if ($xml->isEmptyElement)
-					$xml->read();
-				else
-					$xml->next();
-			}
-			//	Now read each node until we find our first table:table node
-			while ($xml->read()) {
-				if ($xml->name == 'table:table' && $xml->nodeType == XMLReader::ELEMENT) {
-					//	Loop through each table:table node reading the table:name attribute for each worksheet name
-					do {
-						$worksheetNames[] = $xml->getAttribute('table:name');
-						$xml->next();
-					} while ($xml->name == 'table:table' && $xml->nodeType == XMLReader::ELEMENT);
-				}
-			}
-		}
-
-		return $worksheetNames;
-	}
-
-
-	/**
-	 * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
-	 *
-	 * @param   string     $pFilename
-	 * @throws   PHPExcel_Reader_Exception
-	 */
-	public function listWorksheetInfo($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		$worksheetInfo = array();
-
-        $zipClass = PHPExcel_Settings::getZipClass();
-
-		$zip = new $zipClass;
-		if (!$zip->open($pFilename)) {
-			throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! Error opening file.");
-		}
-
-		$xml = new XMLReader();
-		$res = $xml->xml($this->securityScanFile('zip://'.realpath($pFilename).'#content.xml'), null, PHPExcel_Settings::getLibXmlLoaderOptions());
-		$xml->setParserProperty(2,true);
-
-		//	Step into the first level of content of the XML
-		$xml->read();
-		while ($xml->read()) {
-			//	Quickly jump through to the office:body node
-			while ($xml->name !== 'office:body') {
-				if ($xml->isEmptyElement)
-					$xml->read();
-				else
-					$xml->next();
-			}
-				//	Now read each node until we find our first table:table node
-			while ($xml->read()) {
-				if ($xml->name == 'table:table' && $xml->nodeType == XMLReader::ELEMENT) {
-					$worksheetNames[] = $xml->getAttribute('table:name');
-
-					$tmpInfo = array(
-						'worksheetName' => $xml->getAttribute('table:name'),
-						'lastColumnLetter' => 'A',
-						'lastColumnIndex' => 0,
-						'totalRows' => 0,
-						'totalColumns' => 0,
-					);
-
-					//	Loop through each child node of the table:table element reading
-					$currCells = 0;
-					do {
-						$xml->read();
-						if ($xml->name == 'table:table-row' && $xml->nodeType == XMLReader::ELEMENT) {
-							$rowspan = $xml->getAttribute('table:number-rows-repeated');
-							$rowspan = empty($rowspan) ? 1 : $rowspan;
-							$tmpInfo['totalRows'] += $rowspan;
-							$tmpInfo['totalColumns'] = max($tmpInfo['totalColumns'],$currCells);
-							$currCells = 0;
-							//	Step into the row
-							$xml->read();
-							do {
-								if ($xml->name == 'table:table-cell' && $xml->nodeType == XMLReader::ELEMENT) {
-									if (!$xml->isEmptyElement) {
-										$currCells++;
-										$xml->next();
-									} else {
-										$xml->read();
-									}
-								} elseif ($xml->name == 'table:covered-table-cell' && $xml->nodeType == XMLReader::ELEMENT) {
-									$mergeSize = $xml->getAttribute('table:number-columns-repeated');
-									$currCells += $mergeSize;
-									$xml->read();
-								}
-							} while ($xml->name != 'table:table-row');
-						}
-					} while ($xml->name != 'table:table');
-
-					$tmpInfo['totalColumns'] = max($tmpInfo['totalColumns'],$currCells);
-					$tmpInfo['lastColumnIndex'] = $tmpInfo['totalColumns'] - 1;
-					$tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
-					$worksheetInfo[] = $tmpInfo;
-				}
-			}
-
-//				foreach($workbookData->table as $worksheetDataSet) {
-//					$worksheetData = $worksheetDataSet->children($namespacesContent['table']);
-//					$worksheetDataAttributes = $worksheetDataSet->attributes($namespacesContent['table']);
-//
-//					$rowIndex = 0;
-//					foreach ($worksheetData as $key => $rowData) {
-//						switch ($key) {
-//							case 'table-row' :
-//								$rowDataTableAttributes = $rowData->attributes($namespacesContent['table']);
-//								$rowRepeats = (isset($rowDataTableAttributes['number-rows-repeated'])) ?
-//										$rowDataTableAttributes['number-rows-repeated'] : 1;
-//								$columnIndex = 0;
-//
-//								foreach ($rowData as $key => $cellData) {
-//									$cellDataTableAttributes = $cellData->attributes($namespacesContent['table']);
-//									$colRepeats = (isset($cellDataTableAttributes['number-columns-repeated'])) ?
-//										$cellDataTableAttributes['number-columns-repeated'] : 1;
-//									$cellDataOfficeAttributes = $cellData->attributes($namespacesContent['office']);
-//									if (isset($cellDataOfficeAttributes['value-type'])) {
-//										$tmpInfo['lastColumnIndex'] = max($tmpInfo['lastColumnIndex'], $columnIndex + $colRepeats - 1);
-//										$tmpInfo['totalRows'] = max($tmpInfo['totalRows'], $rowIndex + $rowRepeats);
-//									}
-//									$columnIndex += $colRepeats;
-//								}
-//								$rowIndex += $rowRepeats;
-//								break;
-//						}
-//					}
-//
-//					$tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
-//					$tmpInfo['totalColumns'] = $tmpInfo['lastColumnIndex'] + 1;
-//
-//				}
-//			}
-		}
-
-		return $worksheetInfo;
-	}
-
-
-	/**
-	 * Loads PHPExcel from file
-	 *
-	 * @param 	string 		$pFilename
-	 * @return 	PHPExcel
-	 * @throws 	PHPExcel_Reader_Exception
-	 */
-	public function load($pFilename)
-	{
-		// Create new PHPExcel
-		$objPHPExcel = new PHPExcel();
-
-		// Load into this instance
-		return $this->loadIntoExisting($pFilename, $objPHPExcel);
-	}
-
-
-	private static function identifyFixedStyleValue($styleList,&$styleAttributeValue) {
-		$styleAttributeValue = strtolower($styleAttributeValue);
-		foreach($styleList as $style) {
-			if ($styleAttributeValue == strtolower($style)) {
-				$styleAttributeValue = $style;
-				return true;
-			}
-		}
-		return false;
-	}
-
-
-	/**
-	 * Loads PHPExcel from file into PHPExcel instance
-	 *
-	 * @param 	string 		$pFilename
-	 * @param	PHPExcel	$objPHPExcel
-	 * @return 	PHPExcel
-	 * @throws 	PHPExcel_Reader_Exception
-	 */
-	public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		$timezoneObj = new DateTimeZone('Europe/London');
-		$GMT = new DateTimeZone('UTC');
-
-        $zipClass = PHPExcel_Settings::getZipClass();
-
-		$zip = new $zipClass;
-		if (!$zip->open($pFilename)) {
-			throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! Error opening file.");
-		}
-
-//		echo '<h1>Meta Information</h1>';
-		$xml = simplexml_load_string($this->securityScan($zip->getFromName("meta.xml")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
-		$namespacesMeta = $xml->getNamespaces(true);
-//		echo '<pre>';
-//		print_r($namespacesMeta);
-//		echo '</pre><hr />';
-
-		$docProps = $objPHPExcel->getProperties();
-		$officeProperty = $xml->children($namespacesMeta['office']);
-		foreach($officeProperty as $officePropertyData) {
-			$officePropertyDC = array();
-			if (isset($namespacesMeta['dc'])) {
-				$officePropertyDC = $officePropertyData->children($namespacesMeta['dc']);
-			}
-			foreach($officePropertyDC as $propertyName => $propertyValue) {
-				$propertyValue = (string) $propertyValue;
-				switch ($propertyName) {
-					case 'title' :
-							$docProps->setTitle($propertyValue);
-							break;
-					case 'subject' :
-							$docProps->setSubject($propertyValue);
-							break;
-					case 'creator' :
-							$docProps->setCreator($propertyValue);
-							$docProps->setLastModifiedBy($propertyValue);
-							break;
-					case 'date' :
-							$creationDate = strtotime($propertyValue);
-							$docProps->setCreated($creationDate);
-							$docProps->setModified($creationDate);
-							break;
-					case 'description' :
-							$docProps->setDescription($propertyValue);
-							break;
-				}
-			}
-			$officePropertyMeta = array();
-			if (isset($namespacesMeta['dc'])) {
-				$officePropertyMeta = $officePropertyData->children($namespacesMeta['meta']);
-			}
-			foreach($officePropertyMeta as $propertyName => $propertyValue) {
-				$propertyValueAttributes = $propertyValue->attributes($namespacesMeta['meta']);
-				$propertyValue = (string) $propertyValue;
-				switch ($propertyName) {
-					case 'initial-creator' :
-							$docProps->setCreator($propertyValue);
-							break;
-					case 'keyword' :
-							$docProps->setKeywords($propertyValue);
-							break;
-					case 'creation-date' :
-							$creationDate = strtotime($propertyValue);
-							$docProps->setCreated($creationDate);
-							break;
-					case 'user-defined' :
-							$propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_STRING;
-							foreach ($propertyValueAttributes as $key => $value) {
-								if ($key == 'name') {
-									$propertyValueName = (string) $value;
-								} elseif($key == 'value-type') {
-									switch ($value) {
-										case 'date'	:
-											$propertyValue = PHPExcel_DocumentProperties::convertProperty($propertyValue,'date');
-											$propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_DATE;
-											break;
-										case 'boolean'	:
-											$propertyValue = PHPExcel_DocumentProperties::convertProperty($propertyValue,'bool');
-											$propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_BOOLEAN;
-											break;
-										case 'float'	:
-											$propertyValue = PHPExcel_DocumentProperties::convertProperty($propertyValue,'r4');
-											$propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_FLOAT;
-											break;
-										default :
-											$propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_STRING;
-									}
-								}
-							}
-							$docProps->setCustomProperty($propertyValueName,$propertyValue,$propertyValueType);
-							break;
-				}
-			}
-		}
-
-
-//		echo '<h1>Workbook Content</h1>';
-		$xml = simplexml_load_string($this->securityScan($zip->getFromName("content.xml")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
-		$namespacesContent = $xml->getNamespaces(true);
-//		echo '<pre>';
-//		print_r($namespacesContent);
-//		echo '</pre><hr />';
-
-		$workbook = $xml->children($namespacesContent['office']);
-		foreach($workbook->body->spreadsheet as $workbookData) {
-			$workbookData = $workbookData->children($namespacesContent['table']);
-			$worksheetID = 0;
-			foreach($workbookData->table as $worksheetDataSet) {
-				$worksheetData = $worksheetDataSet->children($namespacesContent['table']);
-//				print_r($worksheetData);
-//				echo '<br />';
-				$worksheetDataAttributes = $worksheetDataSet->attributes($namespacesContent['table']);
-//				print_r($worksheetDataAttributes);
-//				echo '<br />';
-				if ((isset($this->_loadSheetsOnly)) && (isset($worksheetDataAttributes['name'])) &&
-					(!in_array($worksheetDataAttributes['name'], $this->_loadSheetsOnly))) {
-					continue;
-				}
-
-//				echo '<h2>Worksheet '.$worksheetDataAttributes['name'].'</h2>';
-				// Create new Worksheet
-				$objPHPExcel->createSheet();
-				$objPHPExcel->setActiveSheetIndex($worksheetID);
-				if (isset($worksheetDataAttributes['name'])) {
-					$worksheetName = (string) $worksheetDataAttributes['name'];
-					//	Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in
-					//		formula cells... during the load, all formulae should be correct, and we're simply
-					//		bringing the worksheet name in line with the formula, not the reverse
-					$objPHPExcel->getActiveSheet()->setTitle($worksheetName,false);
-				}
-
-				$rowID = 1;
-				foreach($worksheetData as $key => $rowData) {
-//					echo '<b>'.$key.'</b><br />';
-					switch ($key) {
-						case 'table-header-rows':
-							foreach ($rowData as $key=>$cellData) {
-								$rowData = $cellData;
-								break;
-							}
-						case 'table-row' :
-							$rowDataTableAttributes = $rowData->attributes($namespacesContent['table']);
-							$rowRepeats = (isset($rowDataTableAttributes['number-rows-repeated'])) ?
-									$rowDataTableAttributes['number-rows-repeated'] : 1;
-							$columnID = 'A';
-							foreach($rowData as $key => $cellData) {
-								if ($this->getReadFilter() !== NULL) {
-									if (!$this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
-										continue;
-									}
-								}
-
-//								echo '<b>'.$columnID.$rowID.'</b><br />';
-								$cellDataText = (isset($namespacesContent['text'])) ?
-									$cellData->children($namespacesContent['text']) :
-									'';
-								$cellDataOffice = $cellData->children($namespacesContent['office']);
-								$cellDataOfficeAttributes = $cellData->attributes($namespacesContent['office']);
-								$cellDataTableAttributes = $cellData->attributes($namespacesContent['table']);
-
-//								echo 'Office Attributes: ';
-//								print_r($cellDataOfficeAttributes);
-//								echo '<br />Table Attributes: ';
-//								print_r($cellDataTableAttributes);
-//								echo '<br />Cell Data Text';
-//								print_r($cellDataText);
-//								echo '<br />';
-//
-								$type = $formatting = $hyperlink = null;
-								$hasCalculatedValue = false;
-								$cellDataFormula = '';
-								if (isset($cellDataTableAttributes['formula'])) {
-									$cellDataFormula = $cellDataTableAttributes['formula'];
-									$hasCalculatedValue = true;
-								}
-
-								if (isset($cellDataOffice->annotation)) {
-//									echo 'Cell has comment<br />';
-									$annotationText = $cellDataOffice->annotation->children($namespacesContent['text']);
-									$textArray = array();
-									foreach($annotationText as $t) {
-									    if (isset($t->span)) {
-    										foreach($t->span as $text) {
-    											$textArray[] = (string)$text;
-    										}
-									    } else {
-									        $textArray[] = (string) $t;
-									    }
-									}
-									$text = implode("\n",$textArray);
-//									echo $text,'<br />';
-									$objPHPExcel->getActiveSheet()->getComment( $columnID.$rowID )
-//																	->setAuthor( $author )
-																	->setText($this->_parseRichText($text) );
-								}
-
-									if (isset($cellDataText->p)) {
-									// Consolidate if there are multiple p records (maybe with spans as well)
-									$dataArray = array();
-									// Text can have multiple text:p and within those, multiple text:span.
-									// text:p newlines, but text:span does not.
-									// Also, here we assume there is no text data is span fields are specified, since
-									// we have no way of knowing proper positioning anyway.
-									foreach ($cellDataText->p as $pData) {
-										if (isset($pData->span)) {
-											// span sections do not newline, so we just create one large string here
-											$spanSection = "";
-											foreach ($pData->span as $spanData) {
-												$spanSection .= $spanData;
-											}
-											array_push($dataArray, $spanSection);
-										} else {
-											array_push($dataArray, $pData);
-										}
-									}
-									$allCellDataText = implode($dataArray, "\n");
-
-//									echo 'Value Type is '.$cellDataOfficeAttributes['value-type'].'<br />';
-									switch ($cellDataOfficeAttributes['value-type']) {
- 										case 'string' :
-												$type = PHPExcel_Cell_DataType::TYPE_STRING;
-												$dataValue = $allCellDataText;
-												if (isset($dataValue->a)) {
-													$dataValue = $dataValue->a;
-													$cellXLinkAttributes = $dataValue->attributes($namespacesContent['xlink']);
-													$hyperlink = $cellXLinkAttributes['href'];
-												}
-												break;
-										case 'boolean' :
-												$type = PHPExcel_Cell_DataType::TYPE_BOOL;
-												$dataValue = ($allCellDataText == 'TRUE') ? True : False;
-												break;
-										case 'percentage' :
-												$type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
-												$dataValue = (float) $cellDataOfficeAttributes['value'];
-												if (floor($dataValue) == $dataValue) {
-													$dataValue = (integer) $dataValue;
-												}
-												$formatting = PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_00;
-												break;
-										case 'currency' :
-												$type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
-												$dataValue = (float) $cellDataOfficeAttributes['value'];
-												if (floor($dataValue) == $dataValue) {
-													$dataValue = (integer) $dataValue;
-												}
-												$formatting = PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_USD_SIMPLE;
-												break;
-										case 'float' :
-												$type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
-												$dataValue = (float) $cellDataOfficeAttributes['value'];
-												if (floor($dataValue) == $dataValue) {
-													if ($dataValue == (integer) $dataValue)
-														$dataValue = (integer) $dataValue;
-													else
-														$dataValue = (float) $dataValue;
-												}
-												break;
-										case 'date' :
-												$type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
-											    $dateObj = new DateTime($cellDataOfficeAttributes['date-value'], $GMT);
-												$dateObj->setTimeZone($timezoneObj);
-												list($year,$month,$day,$hour,$minute,$second) = explode(' ',$dateObj->format('Y m d H i s'));
-												$dataValue = PHPExcel_Shared_Date::FormattedPHPToExcel($year,$month,$day,$hour,$minute,$second);
-												if ($dataValue != floor($dataValue)) {
-													$formatting = PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX15.' '.PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME4;
-												} else {
-													$formatting = PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX15;
-												}
-												break;
-										case 'time' :
-												$type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
-												$dataValue = PHPExcel_Shared_Date::PHPToExcel(strtotime('01-01-1970 '.implode(':',sscanf($cellDataOfficeAttributes['time-value'],'PT%dH%dM%dS'))));
-												$formatting = PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME4;
-												break;
-									}
-//									echo 'Data value is '.$dataValue.'<br />';
-//									if ($hyperlink !== NULL) {
-//										echo 'Hyperlink is '.$hyperlink.'<br />';
-//									}
-								} else {
-									$type = PHPExcel_Cell_DataType::TYPE_NULL;
-									$dataValue = NULL;
-								}
-
-								if ($hasCalculatedValue) {
-									$type = PHPExcel_Cell_DataType::TYPE_FORMULA;
-//									echo 'Formula: ', $cellDataFormula, PHP_EOL;
-									$cellDataFormula = substr($cellDataFormula,strpos($cellDataFormula,':=')+1);
-									$temp = explode('"',$cellDataFormula);
-									$tKey = false;
-									foreach($temp as &$value) {
-										//	Only replace in alternate array entries (i.e. non-quoted blocks)
-										if ($tKey = !$tKey) {
-											$value = preg_replace('/\[([^\.]+)\.([^\.]+):\.([^\.]+)\]/Ui','$1!$2:$3',$value);    //  Cell range reference in another sheet
-											$value = preg_replace('/\[([^\.]+)\.([^\.]+)\]/Ui','$1!$2',$value);       //  Cell reference in another sheet
-											$value = preg_replace('/\[\.([^\.]+):\.([^\.]+)\]/Ui','$1:$2',$value);    //  Cell range reference
-											$value = preg_replace('/\[\.([^\.]+)\]/Ui','$1',$value);                  //  Simple cell reference
-											$value = PHPExcel_Calculation::_translateSeparator(';',',',$value,$inBraces);
-										}
-									}
-									unset($value);
-									//	Then rebuild the formula string
-									$cellDataFormula = implode('"',$temp);
-//									echo 'Adjusted Formula: ', $cellDataFormula, PHP_EOL;
-								}
-
-								$colRepeats = (isset($cellDataTableAttributes['number-columns-repeated'])) ?
-									$cellDataTableAttributes['number-columns-repeated'] : 1;
-								if ($type !== NULL) {
-									for ($i = 0; $i < $colRepeats; ++$i) {
-										if ($i > 0) {
-											++$columnID;
-										}
-										if ($type !== PHPExcel_Cell_DataType::TYPE_NULL) {
-											for ($rowAdjust = 0; $rowAdjust < $rowRepeats; ++$rowAdjust) {
-												$rID = $rowID + $rowAdjust;
-												$objPHPExcel->getActiveSheet()->getCell($columnID.$rID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $dataValue),$type);
-												if ($hasCalculatedValue) {
-//													echo 'Forumla result is '.$dataValue.'<br />';
-													$objPHPExcel->getActiveSheet()->getCell($columnID.$rID)->setCalculatedValue($dataValue);
-												}
-												if ($formatting !== NULL) {
-													$objPHPExcel->getActiveSheet()->getStyle($columnID.$rID)->getNumberFormat()->setFormatCode($formatting);
-												} else {
-													$objPHPExcel->getActiveSheet()->getStyle($columnID.$rID)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_GENERAL);
-												}
-												if ($hyperlink !== NULL) {
-													$objPHPExcel->getActiveSheet()->getCell($columnID.$rID)->getHyperlink()->setUrl($hyperlink);
-												}
-											}
-										}
-									}
-								}
-
-								//	Merged cells
-								if ((isset($cellDataTableAttributes['number-columns-spanned'])) || (isset($cellDataTableAttributes['number-rows-spanned']))) {
-									if (($type !== PHPExcel_Cell_DataType::TYPE_NULL) || (!$this->_readDataOnly)) {
-										$columnTo = $columnID;
-										if (isset($cellDataTableAttributes['number-columns-spanned'])) {
-											$columnTo = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($columnID) + $cellDataTableAttributes['number-columns-spanned'] -2);
-										}
-										$rowTo = $rowID;
-										if (isset($cellDataTableAttributes['number-rows-spanned'])) {
-											$rowTo = $rowTo + $cellDataTableAttributes['number-rows-spanned'] - 1;
-										}
-										$cellRange = $columnID.$rowID.':'.$columnTo.$rowTo;
-										$objPHPExcel->getActiveSheet()->mergeCells($cellRange);
-									}
-								}
-
-								++$columnID;
-							}
-							$rowID += $rowRepeats;
-							break;
-					}
-				}
-				++$worksheetID;
-			}
-		}
-
-		// Return
-		return $objPHPExcel;
-	}
-
-
-	private function _parseRichText($is = '') {
-		$value = new PHPExcel_RichText();
-
-		$value->createText($is);
-
-		return $value;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/SYLK.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/SYLK.php
deleted file mode 100644
index b61118a3b4b..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/SYLK.php
+++ /dev/null
@@ -1,450 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_Reader_SYLK
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_SYLK extends PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
-{
-	/**
-	 * Input encoding
-	 *
-	 * @var string
-	 */
-	private $_inputEncoding	= 'ANSI';
-
-	/**
-	 * Sheet index to read
-	 *
-	 * @var int
-	 */
-	private $_sheetIndex 	= 0;
-
-	/**
-	 * Formats
-	 *
-	 * @var array
-	 */
-	private $_formats = array();
-
-	/**
-	 * Format Count
-	 *
-	 * @var int
-	 */
-	private $_format = 0;
-
-	/**
-	 * Create a new PHPExcel_Reader_SYLK
-	 */
-	public function __construct() {
-		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
-	}
-
-	/**
-	 * Validate that the current file is a SYLK file
-	 *
-	 * @return boolean
-	 */
-	protected function _isValidFormat()
-	{
-		// Read sample data (first 2 KB will do)
-		$data = fread($this->_fileHandle, 2048);
-
-		// Count delimiters in file
-		$delimiterCount = substr_count($data, ';');
-		if ($delimiterCount < 1) {
-			return FALSE;
-		}
-
-		// Analyze first line looking for ID; signature
-		$lines = explode("\n", $data);
-		if (substr($lines[0],0,4) != 'ID;P') {
-			return FALSE;
-		}
-
-		return TRUE;
-	}
-
-	/**
-	 * Set input encoding
-	 *
-	 * @param string $pValue Input encoding
-	 */
-	public function setInputEncoding($pValue = 'ANSI')
-	{
-		$this->_inputEncoding = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get input encoding
-	 *
-	 * @return string
-	 */
-	public function getInputEncoding()
-	{
-		return $this->_inputEncoding;
-	}
-
-	/**
-	 * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
-	 *
-	 * @param   string     $pFilename
-	 * @throws   PHPExcel_Reader_Exception
-	 */
-	public function listWorksheetInfo($pFilename)
-	{
-		// Open file
-		$this->_openFile($pFilename);
-		if (!$this->_isValidFormat()) {
-			fclose ($this->_fileHandle);
-			throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
-		}
-		$fileHandle = $this->_fileHandle;
-		rewind($fileHandle);
-
-		$worksheetInfo = array();
-		$worksheetInfo[0]['worksheetName'] = 'Worksheet';
-		$worksheetInfo[0]['lastColumnLetter'] = 'A';
-		$worksheetInfo[0]['lastColumnIndex'] = 0;
-		$worksheetInfo[0]['totalRows'] = 0;
-		$worksheetInfo[0]['totalColumns'] = 0;
-
-		// Loop through file
-		$rowData = array();
-
-		// loop through one row (line) at a time in the file
-		$rowIndex = 0;
-		while (($rowData = fgets($fileHandle)) !== FALSE) {
-			$columnIndex = 0;
-
-			// convert SYLK encoded $rowData to UTF-8
-			$rowData = PHPExcel_Shared_String::SYLKtoUTF8($rowData);
-
-			// explode each row at semicolons while taking into account that literal semicolon (;)
-			// is escaped like this (;;)
-			$rowData = explode("\t",str_replace('¤',';',str_replace(';',"\t",str_replace(';;','¤',rtrim($rowData)))));
-
-			$dataType = array_shift($rowData);
-			if ($dataType == 'C') {
-				//  Read cell value data
-				foreach($rowData as $rowDatum) {
-					switch($rowDatum{0}) {
-						case 'C' :
-						case 'X' :
-							$columnIndex = substr($rowDatum,1) - 1;
-							break;
-						case 'R' :
-						case 'Y' :
-							$rowIndex = substr($rowDatum,1);
-							break;
-					}
-
-					$worksheetInfo[0]['totalRows'] = max($worksheetInfo[0]['totalRows'], $rowIndex);
-					$worksheetInfo[0]['lastColumnIndex'] = max($worksheetInfo[0]['lastColumnIndex'], $columnIndex);
-				}
-			}
-		}
-
-		$worksheetInfo[0]['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($worksheetInfo[0]['lastColumnIndex']);
-		$worksheetInfo[0]['totalColumns'] = $worksheetInfo[0]['lastColumnIndex'] + 1;
-
-		// Close file
-		fclose($fileHandle);
-
-		return $worksheetInfo;
-	}
-
-	/**
-	 * Loads PHPExcel from file
-	 *
-	 * @param 	string 		$pFilename
-	 * @return 	PHPExcel
-	 * @throws 	PHPExcel_Reader_Exception
-	 */
-	public function load($pFilename)
-	{
-		// Create new PHPExcel
-		$objPHPExcel = new PHPExcel();
-
-		// Load into this instance
-		return $this->loadIntoExisting($pFilename, $objPHPExcel);
-	}
-
-	/**
-	 * Loads PHPExcel from file into PHPExcel instance
-	 *
-	 * @param 	string 		$pFilename
-	 * @param	PHPExcel	$objPHPExcel
-	 * @return 	PHPExcel
-	 * @throws 	PHPExcel_Reader_Exception
-	 */
-	public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
-	{
-		// Open file
-		$this->_openFile($pFilename);
-		if (!$this->_isValidFormat()) {
-			fclose ($this->_fileHandle);
-			throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
-		}
-		$fileHandle = $this->_fileHandle;
-		rewind($fileHandle);
-
-		// Create new PHPExcel
-		while ($objPHPExcel->getSheetCount() <= $this->_sheetIndex) {
-			$objPHPExcel->createSheet();
-		}
-		$objPHPExcel->setActiveSheetIndex( $this->_sheetIndex );
-
-		$fromFormats	= array('\-',	'\ ');
-		$toFormats		= array('-',	' ');
-
-		// Loop through file
-		$rowData = array();
-		$column = $row = '';
-
-		// loop through one row (line) at a time in the file
-		while (($rowData = fgets($fileHandle)) !== FALSE) {
-
-			// convert SYLK encoded $rowData to UTF-8
-			$rowData = PHPExcel_Shared_String::SYLKtoUTF8($rowData);
-
-			// explode each row at semicolons while taking into account that literal semicolon (;)
-			// is escaped like this (;;)
-			$rowData = explode("\t",str_replace('¤',';',str_replace(';',"\t",str_replace(';;','¤',rtrim($rowData)))));
-
-			$dataType = array_shift($rowData);
-			//	Read shared styles
-			if ($dataType == 'P') {
-				$formatArray = array();
-				foreach($rowData as $rowDatum) {
-					switch($rowDatum{0}) {
-						case 'P' :	$formatArray['numberformat']['code'] = str_replace($fromFormats,$toFormats,substr($rowDatum,1));
-									break;
-						case 'E' :
-						case 'F' :	$formatArray['font']['name'] = substr($rowDatum,1);
-									break;
-						case 'L' :	$formatArray['font']['size'] = substr($rowDatum,1);
-									break;
-						case 'S' :	$styleSettings = substr($rowDatum,1);
-									for ($i=0;$i<strlen($styleSettings);++$i) {
-										switch ($styleSettings{$i}) {
-											case 'I' :	$formatArray['font']['italic'] = true;
-														break;
-											case 'D' :	$formatArray['font']['bold'] = true;
-														break;
-											case 'T' :	$formatArray['borders']['top']['style'] = PHPExcel_Style_Border::BORDER_THIN;
-														break;
-											case 'B' :	$formatArray['borders']['bottom']['style'] = PHPExcel_Style_Border::BORDER_THIN;
-														break;
-											case 'L' :	$formatArray['borders']['left']['style'] = PHPExcel_Style_Border::BORDER_THIN;
-														break;
-											case 'R' :	$formatArray['borders']['right']['style'] = PHPExcel_Style_Border::BORDER_THIN;
-														break;
-										}
-									}
-									break;
-					}
-				}
-				$this->_formats['P'.$this->_format++] = $formatArray;
-			//	Read cell value data
-			} elseif ($dataType == 'C') {
-				$hasCalculatedValue = false;
-				$cellData = $cellDataFormula = '';
-				foreach($rowData as $rowDatum) {
-					switch($rowDatum{0}) {
-						case 'C' :
-						case 'X' :	$column = substr($rowDatum,1);
-									break;
-						case 'R' :
-						case 'Y' :	$row = substr($rowDatum,1);
-									break;
-						case 'K' :	$cellData = substr($rowDatum,1);
-									break;
-						case 'E' :	$cellDataFormula = '='.substr($rowDatum,1);
-									//	Convert R1C1 style references to A1 style references (but only when not quoted)
-									$temp = explode('"',$cellDataFormula);
-									$key = false;
-									foreach($temp as &$value) {
-										//	Only count/replace in alternate array entries
-										if ($key = !$key) {
-											preg_match_all('/(R(\[?-?\d*\]?))(C(\[?-?\d*\]?))/',$value, $cellReferences,PREG_SET_ORDER+PREG_OFFSET_CAPTURE);
-											//	Reverse the matches array, otherwise all our offsets will become incorrect if we modify our way
-											//		through the formula from left to right. Reversing means that we work right to left.through
-											//		the formula
-											$cellReferences = array_reverse($cellReferences);
-											//	Loop through each R1C1 style reference in turn, converting it to its A1 style equivalent,
-											//		then modify the formula to use that new reference
-											foreach($cellReferences as $cellReference) {
-												$rowReference = $cellReference[2][0];
-												//	Empty R reference is the current row
-												if ($rowReference == '') $rowReference = $row;
-												//	Bracketed R references are relative to the current row
-												if ($rowReference{0} == '[') $rowReference = $row + trim($rowReference,'[]');
-												$columnReference = $cellReference[4][0];
-												//	Empty C reference is the current column
-												if ($columnReference == '') $columnReference = $column;
-												//	Bracketed C references are relative to the current column
-												if ($columnReference{0} == '[') $columnReference = $column + trim($columnReference,'[]');
-												$A1CellReference = PHPExcel_Cell::stringFromColumnIndex($columnReference-1).$rowReference;
-
-												$value = substr_replace($value,$A1CellReference,$cellReference[0][1],strlen($cellReference[0][0]));
-											}
-										}
-									}
-									unset($value);
-									//	Then rebuild the formula string
-									$cellDataFormula = implode('"',$temp);
-									$hasCalculatedValue = true;
-									break;
-					}
-				}
-				$columnLetter = PHPExcel_Cell::stringFromColumnIndex($column-1);
-				$cellData = PHPExcel_Calculation::_unwrapResult($cellData);
-
-				// Set cell value
-				$objPHPExcel->getActiveSheet()->getCell($columnLetter.$row)->setValue(($hasCalculatedValue) ? $cellDataFormula : $cellData);
-				if ($hasCalculatedValue) {
-					$cellData = PHPExcel_Calculation::_unwrapResult($cellData);
-					$objPHPExcel->getActiveSheet()->getCell($columnLetter.$row)->setCalculatedValue($cellData);
-				}
-			//	Read cell formatting
-			} elseif ($dataType == 'F') {
-				$formatStyle = $columnWidth = $styleSettings = '';
-				$styleData = array();
-				foreach($rowData as $rowDatum) {
-					switch($rowDatum{0}) {
-						case 'C' :
-						case 'X' :	$column = substr($rowDatum,1);
-									break;
-						case 'R' :
-						case 'Y' :	$row = substr($rowDatum,1);
-									break;
-						case 'P' :	$formatStyle = $rowDatum;
-									break;
-						case 'W' :	list($startCol,$endCol,$columnWidth) = explode(' ',substr($rowDatum,1));
-									break;
-						case 'S' :	$styleSettings = substr($rowDatum,1);
-									for ($i=0;$i<strlen($styleSettings);++$i) {
-										switch ($styleSettings{$i}) {
-											case 'I' :	$styleData['font']['italic'] = true;
-														break;
-											case 'D' :	$styleData['font']['bold'] = true;
-														break;
-											case 'T' :	$styleData['borders']['top']['style'] = PHPExcel_Style_Border::BORDER_THIN;
-														break;
-											case 'B' :	$styleData['borders']['bottom']['style'] = PHPExcel_Style_Border::BORDER_THIN;
-														break;
-											case 'L' :	$styleData['borders']['left']['style'] = PHPExcel_Style_Border::BORDER_THIN;
-														break;
-											case 'R' :	$styleData['borders']['right']['style'] = PHPExcel_Style_Border::BORDER_THIN;
-														break;
-										}
-									}
-									break;
-					}
-				}
-				if (($formatStyle > '') && ($column > '') && ($row > '')) {
-					$columnLetter = PHPExcel_Cell::stringFromColumnIndex($column-1);
-					if (isset($this->_formats[$formatStyle])) {
-						$objPHPExcel->getActiveSheet()->getStyle($columnLetter.$row)->applyFromArray($this->_formats[$formatStyle]);
-					}
-				}
-				if ((!empty($styleData)) && ($column > '') && ($row > '')) {
-					$columnLetter = PHPExcel_Cell::stringFromColumnIndex($column-1);
-					$objPHPExcel->getActiveSheet()->getStyle($columnLetter.$row)->applyFromArray($styleData);
-				}
-				if ($columnWidth > '') {
-					if ($startCol == $endCol) {
-						$startCol = PHPExcel_Cell::stringFromColumnIndex($startCol-1);
-						$objPHPExcel->getActiveSheet()->getColumnDimension($startCol)->setWidth($columnWidth);
-					} else {
-						$startCol = PHPExcel_Cell::stringFromColumnIndex($startCol-1);
-						$endCol = PHPExcel_Cell::stringFromColumnIndex($endCol-1);
-						$objPHPExcel->getActiveSheet()->getColumnDimension($startCol)->setWidth($columnWidth);
-						do {
-							$objPHPExcel->getActiveSheet()->getColumnDimension(++$startCol)->setWidth($columnWidth);
-						} while ($startCol != $endCol);
-					}
-				}
-			} else {
-				foreach($rowData as $rowDatum) {
-					switch($rowDatum{0}) {
-						case 'C' :
-						case 'X' :	$column = substr($rowDatum,1);
-									break;
-						case 'R' :
-						case 'Y' :	$row = substr($rowDatum,1);
-									break;
-					}
-				}
-			}
-		}
-
-		// Close file
-		fclose($fileHandle);
-
-		// Return
-		return $objPHPExcel;
-	}
-
-	/**
-	 * Get sheet index
-	 *
-	 * @return int
-	 */
-	public function getSheetIndex() {
-		return $this->_sheetIndex;
-	}
-
-	/**
-	 * Set sheet index
-	 *
-	 * @param	int		$pValue		Sheet index
-	 * @return PHPExcel_Reader_SYLK
-	 */
-	public function setSheetIndex($pValue = 0) {
-		$this->_sheetIndex = $pValue;
-		return $this;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/ReferenceHelper.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/ReferenceHelper.php
deleted file mode 100644
index 9eadab4d575..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/ReferenceHelper.php
+++ /dev/null
@@ -1,922 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_ReferenceHelper (Singleton)
- *
- * @category   PHPExcel
- * @package	PHPExcel
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_ReferenceHelper
-{
-	/**	Constants				*/
-	/**	Regular Expressions		*/
-	const REFHELPER_REGEXP_CELLREF		= '((\w*|\'[^!]*\')!)?(?<![:a-z\$])(\$?[a-z]{1,3}\$?\d+)(?=[^:!\d\'])';
-	const REFHELPER_REGEXP_CELLRANGE	= '((\w*|\'[^!]*\')!)?(\$?[a-z]{1,3}\$?\d+):(\$?[a-z]{1,3}\$?\d+)';
-	const REFHELPER_REGEXP_ROWRANGE		= '((\w*|\'[^!]*\')!)?(\$?\d+):(\$?\d+)';
-	const REFHELPER_REGEXP_COLRANGE		= '((\w*|\'[^!]*\')!)?(\$?[a-z]{1,3}):(\$?[a-z]{1,3})';
-
-	/**
-	 * Instance of this class
-	 *
-	 * @var PHPExcel_ReferenceHelper
-	 */
-	private static $_instance;
-
-	/**
-	 * Get an instance of this class
-	 *
-	 * @return PHPExcel_ReferenceHelper
-	 */
-	public static function getInstance() {
-		if (!isset(self::$_instance) || (self::$_instance === NULL)) {
-			self::$_instance = new PHPExcel_ReferenceHelper();
-		}
-
-		return self::$_instance;
-	}
-
-	/**
-	 * Create a new PHPExcel_ReferenceHelper
-	 */
-	protected function __construct() {
-	}
-
-	/**
-	 * Compare two column addresses
-	 * Intended for use as a Callback function for sorting column addresses by column
-	 *
-	 * @param   string   $a  First column to test (e.g. 'AA')
-	 * @param   string   $b  Second column to test (e.g. 'Z')
-	 * @return  integer
-	 */
-	public static function columnSort($a, $b) {
-		return strcasecmp(strlen($a) . $a, strlen($b) . $b);
-	}
-
-	/**
-	 * Compare two column addresses
-	 * Intended for use as a Callback function for reverse sorting column addresses by column
-	 *
-	 * @param   string   $a  First column to test (e.g. 'AA')
-	 * @param   string   $b  Second column to test (e.g. 'Z')
-	 * @return  integer
-	 */
-	public static function columnReverseSort($a, $b) {
-		return 1 - strcasecmp(strlen($a) . $a, strlen($b) . $b);
-	}
-
-	/**
-	 * Compare two cell addresses
-	 * Intended for use as a Callback function for sorting cell addresses by column and row
-	 *
-	 * @param   string   $a  First cell to test (e.g. 'AA1')
-	 * @param   string   $b  Second cell to test (e.g. 'Z1')
-	 * @return  integer
-	 */
-	public static function cellSort($a, $b) {
-		sscanf($a,'%[A-Z]%d', $ac, $ar);
-		sscanf($b,'%[A-Z]%d', $bc, $br);
-
-		if ($ar == $br) {
-			return strcasecmp(strlen($ac) . $ac, strlen($bc) . $bc);
-		}
-		return ($ar < $br) ? -1 : 1;
-	}
-
-	/**
-	 * Compare two cell addresses
-	 * Intended for use as a Callback function for sorting cell addresses by column and row
-	 *
-	 * @param   string   $a  First cell to test (e.g. 'AA1')
-	 * @param   string   $b  Second cell to test (e.g. 'Z1')
-	 * @return  integer
-	 */
-	public static function cellReverseSort($a, $b) {
-		sscanf($a,'%[A-Z]%d', $ac, $ar);
-		sscanf($b,'%[A-Z]%d', $bc, $br);
-
-		if ($ar == $br) {
-			return 1 - strcasecmp(strlen($ac) . $ac, strlen($bc) . $bc);
-		}
-		return ($ar < $br) ? 1 : -1;
-	}
-
-	/**
-	 * Test whether a cell address falls within a defined range of cells
-	 *
-	 * @param   string     $cellAddress        Address of the cell we're testing
-	 * @param   integer    $beforeRow          Number of the row we're inserting/deleting before
-	 * @param   integer    $pNumRows           Number of rows to insert/delete (negative values indicate deletion)
-	 * @param   integer    $beforeColumnIndex  Index number of the column we're inserting/deleting before
-	 * @param   integer    $pNumCols           Number of columns to insert/delete (negative values indicate deletion)
-	 * @return  boolean
-	 */
-	private static function cellAddressInDeleteRange($cellAddress, $beforeRow, $pNumRows, $beforeColumnIndex, $pNumCols) {
-		list($cellColumn, $cellRow) = PHPExcel_Cell::coordinateFromString($cellAddress);
-		$cellColumnIndex = PHPExcel_Cell::columnIndexFromString($cellColumn);
-		//	Is cell within the range of rows/columns if we're deleting
-		if ($pNumRows < 0 &&
-			($cellRow >= ($beforeRow + $pNumRows)) &&
-			($cellRow < $beforeRow)) {
-			return TRUE;
-		} elseif ($pNumCols < 0 &&
-			($cellColumnIndex >= ($beforeColumnIndex + $pNumCols)) &&
-			($cellColumnIndex < $beforeColumnIndex)) {
-			return TRUE;
-		}
-		return FALSE;
-	}
-
-	/**
-	 * Update page breaks when inserting/deleting rows/columns
-	 *
-	 * @param   PHPExcel_Worksheet  $pSheet             The worksheet that we're editing
-	 * @param   string              $pBefore            Insert/Delete before this cell address (e.g. 'A1')
-	 * @param   integer             $beforeColumnIndex  Index number of the column we're inserting/deleting before
-	 * @param   integer             $pNumCols           Number of columns to insert/delete (negative values indicate deletion)
-	 * @param   integer             $beforeRow          Number of the row we're inserting/deleting before
-	 * @param   integer             $pNumRows           Number of rows to insert/delete (negative values indicate deletion)
-	 */
-	protected function _adjustPageBreaks(PHPExcel_Worksheet $pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
-	{
-		$aBreaks = $pSheet->getBreaks();
-		($pNumCols > 0 || $pNumRows > 0) ?
-			uksort($aBreaks, array('PHPExcel_ReferenceHelper','cellReverseSort')) :
-			uksort($aBreaks, array('PHPExcel_ReferenceHelper','cellSort'));
-
-		foreach ($aBreaks as $key => $value) {
-			if (self::cellAddressInDeleteRange($key, $beforeRow, $pNumRows, $beforeColumnIndex, $pNumCols)) {
-				//	If we're deleting, then clear any defined breaks that are within the range
-				//		of rows/columns that we're deleting
-				$pSheet->setBreak($key, PHPExcel_Worksheet::BREAK_NONE);
-			} else {
-				//	Otherwise update any affected breaks by inserting a new break at the appropriate point
-				//		and removing the old affected break
-				$newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
-				if ($key != $newReference) {
-					$pSheet->setBreak($newReference, $value)
-					    ->setBreak($key, PHPExcel_Worksheet::BREAK_NONE);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Update cell comments when inserting/deleting rows/columns
-	 *
-	 * @param   PHPExcel_Worksheet  $pSheet             The worksheet that we're editing
-	 * @param   string              $pBefore            Insert/Delete before this cell address (e.g. 'A1')
-	 * @param   integer             $beforeColumnIndex  Index number of the column we're inserting/deleting before
-	 * @param   integer             $pNumCols           Number of columns to insert/delete (negative values indicate deletion)
-	 * @param   integer             $beforeRow          Number of the row we're inserting/deleting before
-	 * @param   integer             $pNumRows           Number of rows to insert/delete (negative values indicate deletion)
-	 */
-	protected function _adjustComments($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
-	{
-		$aComments = $pSheet->getComments();
-		$aNewComments = array(); // the new array of all comments
-
-		foreach ($aComments as $key => &$value) {
-			// Any comments inside a deleted range will be ignored
-			if (!self::cellAddressInDeleteRange($key, $beforeRow, $pNumRows, $beforeColumnIndex, $pNumCols)) {
-				//	Otherwise build a new array of comments indexed by the adjusted cell reference
-				$newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
-				$aNewComments[$newReference] = $value;
-			}
-		}
-		//	Replace the comments array with the new set of comments
-		$pSheet->setComments($aNewComments);
-	}
-
-	/**
-	 * Update hyperlinks when inserting/deleting rows/columns
-	 *
-	 * @param   PHPExcel_Worksheet  $pSheet             The worksheet that we're editing
-	 * @param   string              $pBefore            Insert/Delete before this cell address (e.g. 'A1')
-	 * @param   integer             $beforeColumnIndex  Index number of the column we're inserting/deleting before
-	 * @param   integer             $pNumCols           Number of columns to insert/delete (negative values indicate deletion)
-	 * @param   integer             $beforeRow          Number of the row we're inserting/deleting before
-	 * @param   integer             $pNumRows           Number of rows to insert/delete (negative values indicate deletion)
-	 */
-	protected function _adjustHyperlinks($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
-	{
-		$aHyperlinkCollection = $pSheet->getHyperlinkCollection();
-		($pNumCols > 0 || $pNumRows > 0) ?
-			uksort($aHyperlinkCollection, array('PHPExcel_ReferenceHelper','cellReverseSort')) :
-			uksort($aHyperlinkCollection, array('PHPExcel_ReferenceHelper','cellSort'));
-
-		foreach ($aHyperlinkCollection as $key => $value) {
-			$newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
-			if ($key != $newReference) {
-				$pSheet->setHyperlink( $newReference, $value );
-				$pSheet->setHyperlink( $key, null );
-			}
-		}
-	}
-
-	/**
-	 * Update data validations when inserting/deleting rows/columns
-	 *
-	 * @param   PHPExcel_Worksheet  $pSheet             The worksheet that we're editing
-	 * @param   string              $pBefore            Insert/Delete before this cell address (e.g. 'A1')
-	 * @param   integer             $beforeColumnIndex  Index number of the column we're inserting/deleting before
-	 * @param   integer             $pNumCols           Number of columns to insert/delete (negative values indicate deletion)
-	 * @param   integer             $beforeRow          Number of the row we're inserting/deleting before
-	 * @param   integer             $pNumRows           Number of rows to insert/delete (negative values indicate deletion)
-	 */
-	protected function _adjustDataValidations($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
-	{
-		$aDataValidationCollection = $pSheet->getDataValidationCollection();
-		($pNumCols > 0 || $pNumRows > 0) ?
-			uksort($aDataValidationCollection, array('PHPExcel_ReferenceHelper','cellReverseSort')) :
-			uksort($aDataValidationCollection, array('PHPExcel_ReferenceHelper','cellSort'));
-		foreach ($aDataValidationCollection as $key => $value) {
-			$newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
-			if ($key != $newReference) {
-				$pSheet->setDataValidation( $newReference, $value );
-				$pSheet->setDataValidation( $key, null );
-			}
-		}
-	}
-
-	/**
-	 * Update merged cells when inserting/deleting rows/columns
-	 *
-	 * @param   PHPExcel_Worksheet  $pSheet             The worksheet that we're editing
-	 * @param   string              $pBefore            Insert/Delete before this cell address (e.g. 'A1')
-	 * @param   integer             $beforeColumnIndex  Index number of the column we're inserting/deleting before
-	 * @param   integer             $pNumCols           Number of columns to insert/delete (negative values indicate deletion)
-	 * @param   integer             $beforeRow          Number of the row we're inserting/deleting before
-	 * @param   integer             $pNumRows           Number of rows to insert/delete (negative values indicate deletion)
-	 */
-	protected function _adjustMergeCells($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
-	{
-		$aMergeCells = $pSheet->getMergeCells();
-		$aNewMergeCells = array(); // the new array of all merge cells
-		foreach ($aMergeCells as $key => &$value) {
-			$newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
-			$aNewMergeCells[$newReference] = $newReference;
-		}
-		$pSheet->setMergeCells($aNewMergeCells); // replace the merge cells array
-	}
-
-	/**
-	 * Update protected cells when inserting/deleting rows/columns
-	 *
-	 * @param   PHPExcel_Worksheet  $pSheet             The worksheet that we're editing
-	 * @param   string              $pBefore            Insert/Delete before this cell address (e.g. 'A1')
-	 * @param   integer             $beforeColumnIndex  Index number of the column we're inserting/deleting before
-	 * @param   integer             $pNumCols           Number of columns to insert/delete (negative values indicate deletion)
-	 * @param   integer             $beforeRow          Number of the row we're inserting/deleting before
-	 * @param   integer             $pNumRows           Number of rows to insert/delete (negative values indicate deletion)
-	 */
-	protected function _adjustProtectedCells($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
-	{
-		$aProtectedCells = $pSheet->getProtectedCells();
-		($pNumCols > 0 || $pNumRows > 0) ?
-			uksort($aProtectedCells, array('PHPExcel_ReferenceHelper','cellReverseSort')) :
-			uksort($aProtectedCells, array('PHPExcel_ReferenceHelper','cellSort'));
-		foreach ($aProtectedCells as $key => $value) {
-			$newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
-			if ($key != $newReference) {
-				$pSheet->protectCells( $newReference, $value, true );
-				$pSheet->unprotectCells( $key );
-			}
-		}
-	}
-
-	/**
-	 * Update column dimensions when inserting/deleting rows/columns
-	 *
-	 * @param   PHPExcel_Worksheet  $pSheet             The worksheet that we're editing
-	 * @param   string              $pBefore            Insert/Delete before this cell address (e.g. 'A1')
-	 * @param   integer             $beforeColumnIndex  Index number of the column we're inserting/deleting before
-	 * @param   integer             $pNumCols           Number of columns to insert/delete (negative values indicate deletion)
-	 * @param   integer             $beforeRow          Number of the row we're inserting/deleting before
-	 * @param   integer             $pNumRows           Number of rows to insert/delete (negative values indicate deletion)
-	 */
-	protected function _adjustColumnDimensions($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
-	{
-		$aColumnDimensions = array_reverse($pSheet->getColumnDimensions(), true);
-		if (!empty($aColumnDimensions)) {
-			foreach ($aColumnDimensions as $objColumnDimension) {
-				$newReference = $this->updateCellReference($objColumnDimension->getColumnIndex() . '1', $pBefore, $pNumCols, $pNumRows);
-				list($newReference) = PHPExcel_Cell::coordinateFromString($newReference);
-				if ($objColumnDimension->getColumnIndex() != $newReference) {
-					$objColumnDimension->setColumnIndex($newReference);
-				}
-			}
-			$pSheet->refreshColumnDimensions();
-		}
-	}
-
-	/**
-	 * Update row dimensions when inserting/deleting rows/columns
-	 *
-	 * @param   PHPExcel_Worksheet  $pSheet             The worksheet that we're editing
-	 * @param   string              $pBefore            Insert/Delete before this cell address (e.g. 'A1')
-	 * @param   integer             $beforeColumnIndex  Index number of the column we're inserting/deleting before
-	 * @param   integer             $pNumCols           Number of columns to insert/delete (negative values indicate deletion)
-	 * @param   integer             $beforeRow          Number of the row we're inserting/deleting before
-	 * @param   integer             $pNumRows           Number of rows to insert/delete (negative values indicate deletion)
-	 */
-	protected function _adjustRowDimensions($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
-	{
-		$aRowDimensions = array_reverse($pSheet->getRowDimensions(), true);
-		if (!empty($aRowDimensions)) {
-			foreach ($aRowDimensions as $objRowDimension) {
-				$newReference = $this->updateCellReference('A' . $objRowDimension->getRowIndex(), $pBefore, $pNumCols, $pNumRows);
-				list(, $newReference) = PHPExcel_Cell::coordinateFromString($newReference);
-				if ($objRowDimension->getRowIndex() != $newReference) {
-					$objRowDimension->setRowIndex($newReference);
-				}
-			}
-			$pSheet->refreshRowDimensions();
-
-			$copyDimension = $pSheet->getRowDimension($beforeRow - 1);
-			for ($i = $beforeRow; $i <= $beforeRow - 1 + $pNumRows; ++$i) {
-				$newDimension = $pSheet->getRowDimension($i);
-				$newDimension->setRowHeight($copyDimension->getRowHeight());
-				$newDimension->setVisible($copyDimension->getVisible());
-				$newDimension->setOutlineLevel($copyDimension->getOutlineLevel());
-				$newDimension->setCollapsed($copyDimension->getCollapsed());
-			}
-		}
-	}
-
-	/**
-	 * Insert a new column or row, updating all possible related data
-	 *
-	 * @param   string              $pBefore    Insert before this cell address (e.g. 'A1')
-	 * @param   integer             $pNumCols   Number of columns to insert/delete (negative values indicate deletion)
-	 * @param   integer             $pNumRows   Number of rows to insert/delete (negative values indicate deletion)
-	 * @param   PHPExcel_Worksheet  $pSheet     The worksheet that we're editing
-	 * @throws  PHPExcel_Exception
-	 */
-	public function insertNewBefore($pBefore = 'A1', $pNumCols = 0, $pNumRows = 0, PHPExcel_Worksheet $pSheet = NULL)
-	{
-		$remove = ($pNumCols < 0 || $pNumRows < 0);
-		$aCellCollection = $pSheet->getCellCollection();
-
-		// Get coordinates of $pBefore
-		$beforeColumn	= 'A';
-		$beforeRow		= 1;
-		list($beforeColumn, $beforeRow) = PHPExcel_Cell::coordinateFromString($pBefore);
-		$beforeColumnIndex = PHPExcel_Cell::columnIndexFromString($beforeColumn);
-
-		// Clear cells if we are removing columns or rows
-		$highestColumn	= $pSheet->getHighestColumn();
-		$highestRow	= $pSheet->getHighestRow();
-
-		// 1. Clear column strips if we are removing columns
-		if ($pNumCols < 0 && $beforeColumnIndex - 2 + $pNumCols > 0) {
-			for ($i = 1; $i <= $highestRow - 1; ++$i) {
-				for ($j = $beforeColumnIndex - 1 + $pNumCols; $j <= $beforeColumnIndex - 2; ++$j) {
-					$coordinate = PHPExcel_Cell::stringFromColumnIndex($j) . $i;
-					$pSheet->removeConditionalStyles($coordinate);
-					if ($pSheet->cellExists($coordinate)) {
-						$pSheet->getCell($coordinate)->setValueExplicit('', PHPExcel_Cell_DataType::TYPE_NULL);
-						$pSheet->getCell($coordinate)->setXfIndex(0);
-					}
-				}
-			}
-		}
-
-		// 2. Clear row strips if we are removing rows
-		if ($pNumRows < 0 && $beforeRow - 1 + $pNumRows > 0) {
-			for ($i = $beforeColumnIndex - 1; $i <= PHPExcel_Cell::columnIndexFromString($highestColumn) - 1; ++$i) {
-				for ($j = $beforeRow + $pNumRows; $j <= $beforeRow - 1; ++$j) {
-					$coordinate = PHPExcel_Cell::stringFromColumnIndex($i) . $j;
-					$pSheet->removeConditionalStyles($coordinate);
-					if ($pSheet->cellExists($coordinate)) {
-						$pSheet->getCell($coordinate)->setValueExplicit('', PHPExcel_Cell_DataType::TYPE_NULL);
-						$pSheet->getCell($coordinate)->setXfIndex(0);
-					}
-				}
-			}
-		}
-
-		// Loop through cells, bottom-up, and change cell coordinates
-        if($remove) {
-            // It's faster to reverse and pop than to use unshift, especially with large cell collections
-            $aCellCollection = array_reverse($aCellCollection);
-        }
-		while ($cellID = array_pop($aCellCollection)) {
-			$cell = $pSheet->getCell($cellID);
-			$cellIndex = PHPExcel_Cell::columnIndexFromString($cell->getColumn());
-
-			if ($cellIndex-1 + $pNumCols < 0) {
-				continue;
-			}
-
-			// New coordinates
-			$newCoordinates = PHPExcel_Cell::stringFromColumnIndex($cellIndex-1 + $pNumCols) . ($cell->getRow() + $pNumRows);
-
-			// Should the cell be updated? Move value and cellXf index from one cell to another.
-			if (($cellIndex >= $beforeColumnIndex) &&
-				($cell->getRow() >= $beforeRow)) {
-
-				// Update cell styles
-				$pSheet->getCell($newCoordinates)->setXfIndex($cell->getXfIndex());
-
-				// Insert this cell at its new location
-				if ($cell->getDataType() == PHPExcel_Cell_DataType::TYPE_FORMULA) {
-					// Formula should be adjusted
-					$pSheet->getCell($newCoordinates)
-						   ->setValue($this->updateFormulaReferences($cell->getValue(),
-						   					$pBefore, $pNumCols, $pNumRows, $pSheet->getTitle()));
-				} else {
-					// Formula should not be adjusted
-					$pSheet->getCell($newCoordinates)->setValue($cell->getValue());
-				}
-
-				// Clear the original cell
-				$pSheet->getCellCacheController()->deleteCacheData($cellID);
-
-			} else {
-				/*	We don't need to update styles for rows/columns before our insertion position,
-						but we do still need to adjust any formulae	in those cells					*/
-				if ($cell->getDataType() == PHPExcel_Cell_DataType::TYPE_FORMULA) {
-					// Formula should be adjusted
-					$cell->setValue($this->updateFormulaReferences($cell->getValue(),
-										$pBefore, $pNumCols, $pNumRows, $pSheet->getTitle()));
-				}
-
-			}
-		}
-
-		// Duplicate styles for the newly inserted cells
-		$highestColumn	= $pSheet->getHighestColumn();
-		$highestRow	= $pSheet->getHighestRow();
-
-		if ($pNumCols > 0 && $beforeColumnIndex - 2 > 0) {
-			for ($i = $beforeRow; $i <= $highestRow - 1; ++$i) {
-
-				// Style
-				$coordinate = PHPExcel_Cell::stringFromColumnIndex( $beforeColumnIndex - 2 ) . $i;
-				if ($pSheet->cellExists($coordinate)) {
-					$xfIndex = $pSheet->getCell($coordinate)->getXfIndex();
-					$conditionalStyles = $pSheet->conditionalStylesExists($coordinate) ?
-						$pSheet->getConditionalStyles($coordinate) : false;
-					for ($j = $beforeColumnIndex - 1; $j <= $beforeColumnIndex - 2 + $pNumCols; ++$j) {
-						$pSheet->getCellByColumnAndRow($j, $i)->setXfIndex($xfIndex);
-						if ($conditionalStyles) {
-							$cloned = array();
-							foreach ($conditionalStyles as $conditionalStyle) {
-								$cloned[] = clone $conditionalStyle;
-							}
-							$pSheet->setConditionalStyles(PHPExcel_Cell::stringFromColumnIndex($j) . $i, $cloned);
-						}
-					}
-				}
-
-			}
-		}
-
-		if ($pNumRows > 0 && $beforeRow - 1 > 0) {
-			for ($i = $beforeColumnIndex - 1; $i <= PHPExcel_Cell::columnIndexFromString($highestColumn) - 1; ++$i) {
-
-				// Style
-				$coordinate = PHPExcel_Cell::stringFromColumnIndex($i) . ($beforeRow - 1);
-				if ($pSheet->cellExists($coordinate)) {
-					$xfIndex = $pSheet->getCell($coordinate)->getXfIndex();
-					$conditionalStyles = $pSheet->conditionalStylesExists($coordinate) ?
-						$pSheet->getConditionalStyles($coordinate) : false;
-					for ($j = $beforeRow; $j <= $beforeRow - 1 + $pNumRows; ++$j) {
-						$pSheet->getCell(PHPExcel_Cell::stringFromColumnIndex($i) . $j)->setXfIndex($xfIndex);
-						if ($conditionalStyles) {
-							$cloned = array();
-							foreach ($conditionalStyles as $conditionalStyle) {
-								$cloned[] = clone $conditionalStyle;
-							}
-							$pSheet->setConditionalStyles(PHPExcel_Cell::stringFromColumnIndex($i) . $j, $cloned);
-						}
-					}
-				}
-			}
-		}
-
-		// Update worksheet: column dimensions
-		$this->_adjustColumnDimensions($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
-
-		// Update worksheet: row dimensions
-		$this->_adjustRowDimensions($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
-
-		//	Update worksheet: page breaks
-		$this->_adjustPageBreaks($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
-
-		//	Update worksheet: comments
-		$this->_adjustComments($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
-
-		// Update worksheet: hyperlinks
-		$this->_adjustHyperlinks($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
-
-		// Update worksheet: data validations
-		$this->_adjustDataValidations($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
-
-		// Update worksheet: merge cells
-		$this->_adjustMergeCells($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
-
-		// Update worksheet: protected cells
-		$this->_adjustProtectedCells($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
-
-		// Update worksheet: autofilter
-		$autoFilter = $pSheet->getAutoFilter();
-		$autoFilterRange = $autoFilter->getRange();
-		if (!empty($autoFilterRange)) {
-			if ($pNumCols != 0) {
-				$autoFilterColumns = array_keys($autoFilter->getColumns());
-				if (count($autoFilterColumns) > 0) {
-					sscanf($pBefore,'%[A-Z]%d', $column, $row);
-					$columnIndex = PHPExcel_Cell::columnIndexFromString($column);
-					list($rangeStart,$rangeEnd) = PHPExcel_Cell::rangeBoundaries($autoFilterRange);
-					if ($columnIndex <= $rangeEnd[0]) {
-						if ($pNumCols < 0) {
-							//	If we're actually deleting any columns that fall within the autofilter range,
-							//		then we delete any rules for those columns
-							$deleteColumn = $columnIndex + $pNumCols - 1;
-							$deleteCount = abs($pNumCols);
-							for ($i = 1; $i <= $deleteCount; ++$i) {
-								if (in_array(PHPExcel_Cell::stringFromColumnIndex($deleteColumn),$autoFilterColumns)) {
-									$autoFilter->clearColumn(PHPExcel_Cell::stringFromColumnIndex($deleteColumn));
-								}
-								++$deleteColumn;
-							}
-						}
-						$startCol = ($columnIndex > $rangeStart[0]) ? $columnIndex : $rangeStart[0];
-
-						//	Shuffle columns in autofilter range
-						if ($pNumCols > 0) {
-							//	For insert, we shuffle from end to beginning to avoid overwriting
-							$startColID = PHPExcel_Cell::stringFromColumnIndex($startCol-1);
-							$toColID = PHPExcel_Cell::stringFromColumnIndex($startCol+$pNumCols-1);
-							$endColID = PHPExcel_Cell::stringFromColumnIndex($rangeEnd[0]);
-
-							$startColRef = $startCol;
-							$endColRef = $rangeEnd[0];
-							$toColRef = $rangeEnd[0]+$pNumCols;
-
-							do {
-								$autoFilter->shiftColumn(PHPExcel_Cell::stringFromColumnIndex($endColRef-1),PHPExcel_Cell::stringFromColumnIndex($toColRef-1));
-								--$endColRef;
-								--$toColRef;
-							} while ($startColRef <= $endColRef);
-						} else {
-							//	For delete, we shuffle from beginning to end to avoid overwriting
-							$startColID = PHPExcel_Cell::stringFromColumnIndex($startCol-1);
-							$toColID = PHPExcel_Cell::stringFromColumnIndex($startCol+$pNumCols-1);
-							$endColID = PHPExcel_Cell::stringFromColumnIndex($rangeEnd[0]);
-							do {
-								$autoFilter->shiftColumn($startColID,$toColID);
-								++$startColID;
-								++$toColID;
-							} while ($startColID != $endColID);
-						}
-					}
-				}
-			}
-			$pSheet->setAutoFilter( $this->updateCellReference($autoFilterRange, $pBefore, $pNumCols, $pNumRows) );
-		}
-
-		// Update worksheet: freeze pane
-		if ($pSheet->getFreezePane() != '') {
-			$pSheet->freezePane( $this->updateCellReference($pSheet->getFreezePane(), $pBefore, $pNumCols, $pNumRows) );
-		}
-
-		// Page setup
-		if ($pSheet->getPageSetup()->isPrintAreaSet()) {
-			$pSheet->getPageSetup()->setPrintArea( $this->updateCellReference($pSheet->getPageSetup()->getPrintArea(), $pBefore, $pNumCols, $pNumRows) );
-		}
-
-		// Update worksheet: drawings
-		$aDrawings = $pSheet->getDrawingCollection();
-		foreach ($aDrawings as $objDrawing) {
-			$newReference = $this->updateCellReference($objDrawing->getCoordinates(), $pBefore, $pNumCols, $pNumRows);
-			if ($objDrawing->getCoordinates() != $newReference) {
-				$objDrawing->setCoordinates($newReference);
-			}
-		}
-
-		// Update workbook: named ranges
-		if (count($pSheet->getParent()->getNamedRanges()) > 0) {
-			foreach ($pSheet->getParent()->getNamedRanges() as $namedRange) {
-				if ($namedRange->getWorksheet()->getHashCode() == $pSheet->getHashCode()) {
-					$namedRange->setRange(
-						$this->updateCellReference($namedRange->getRange(), $pBefore, $pNumCols, $pNumRows)
-					);
-				}
-			}
-		}
-
-		// Garbage collect
-		$pSheet->garbageCollect();
-	}
-
-	/**
-	 * Update references within formulas
-	 *
-	 * @param	string	$pFormula	Formula to update
-	 * @param	int		$pBefore	Insert before this one
-	 * @param	int		$pNumCols	Number of columns to insert
-	 * @param	int		$pNumRows	Number of rows to insert
-	 * @param   string  $sheetName  Worksheet name/title
-	 * @return	string	Updated formula
-	 * @throws	PHPExcel_Exception
-	 */
-	public function updateFormulaReferences($pFormula = '', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0, $sheetName = '') {
-		//	Update cell references in the formula
-		$formulaBlocks = explode('"',$pFormula);
-		$i = false;
-		foreach($formulaBlocks as &$formulaBlock) {
-			//	Ignore blocks that were enclosed in quotes (alternating entries in the $formulaBlocks array after the explode)
-			if ($i = !$i) {
-				$adjustCount = 0;
-				$newCellTokens = $cellTokens = array();
-				//	Search for row ranges (e.g. 'Sheet1'!3:5 or 3:5) with or without $ absolutes (e.g. $3:5)
-				$matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_ROWRANGE.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER);
-				if ($matchCount > 0) {
-					foreach($matches as $match) {
-						$fromString = ($match[2] > '') ? $match[2].'!' : '';
-						$fromString .= $match[3].':'.$match[4];
-						$modified3 = substr($this->updateCellReference('$A'.$match[3],$pBefore,$pNumCols,$pNumRows),2);
-						$modified4 = substr($this->updateCellReference('$A'.$match[4],$pBefore,$pNumCols,$pNumRows),2);
-
-						if ($match[3].':'.$match[4] !== $modified3.':'.$modified4) {
-							if (($match[2] == '') || (trim($match[2],"'") == $sheetName)) {
-								$toString = ($match[2] > '') ? $match[2].'!' : '';
-								$toString .= $modified3.':'.$modified4;
-								//	Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
-								$column = 100000;
-								$row = 10000000+trim($match[3],'$');
-								$cellIndex = $column.$row;
-
-								$newCellTokens[$cellIndex] = preg_quote($toString);
-								$cellTokens[$cellIndex] = '/(?<!\d\$\!)'.preg_quote($fromString).'(?!\d)/i';
-								++$adjustCount;
-							}
-						}
-					}
-				}
-				//	Search for column ranges (e.g. 'Sheet1'!C:E or C:E) with or without $ absolutes (e.g. $C:E)
-				$matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_COLRANGE.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER);
-				if ($matchCount > 0) {
-					foreach($matches as $match) {
-						$fromString = ($match[2] > '') ? $match[2].'!' : '';
-						$fromString .= $match[3].':'.$match[4];
-						$modified3 = substr($this->updateCellReference($match[3].'$1',$pBefore,$pNumCols,$pNumRows),0,-2);
-						$modified4 = substr($this->updateCellReference($match[4].'$1',$pBefore,$pNumCols,$pNumRows),0,-2);
-
-						if ($match[3].':'.$match[4] !== $modified3.':'.$modified4) {
-							if (($match[2] == '') || (trim($match[2],"'") == $sheetName)) {
-								$toString = ($match[2] > '') ? $match[2].'!' : '';
-								$toString .= $modified3.':'.$modified4;
-								//	Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
-								$column = PHPExcel_Cell::columnIndexFromString(trim($match[3],'$')) + 100000;
-								$row = 10000000;
-								$cellIndex = $column.$row;
-
-								$newCellTokens[$cellIndex] = preg_quote($toString);
-								$cellTokens[$cellIndex] = '/(?<![A-Z\$\!])'.preg_quote($fromString).'(?![A-Z])/i';
-								++$adjustCount;
-							}
-						}
-					}
-				}
-				//	Search for cell ranges (e.g. 'Sheet1'!A3:C5 or A3:C5) with or without $ absolutes (e.g. $A1:C$5)
-				$matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_CELLRANGE.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER);
-				if ($matchCount > 0) {
-					foreach($matches as $match) {
-						$fromString = ($match[2] > '') ? $match[2].'!' : '';
-						$fromString .= $match[3].':'.$match[4];
-						$modified3 = $this->updateCellReference($match[3],$pBefore,$pNumCols,$pNumRows);
-						$modified4 = $this->updateCellReference($match[4],$pBefore,$pNumCols,$pNumRows);
-
-						if ($match[3].$match[4] !== $modified3.$modified4) {
-							if (($match[2] == '') || (trim($match[2],"'") == $sheetName)) {
-								$toString = ($match[2] > '') ? $match[2].'!' : '';
-								$toString .= $modified3.':'.$modified4;
-								list($column,$row) = PHPExcel_Cell::coordinateFromString($match[3]);
-								//	Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
-								$column = PHPExcel_Cell::columnIndexFromString(trim($column,'$')) + 100000;
-								$row = trim($row,'$') + 10000000;
-								$cellIndex = $column.$row;
-
-								$newCellTokens[$cellIndex] = preg_quote($toString);
-								$cellTokens[$cellIndex] = '/(?<![A-Z]\$\!)'.preg_quote($fromString).'(?!\d)/i';
-								++$adjustCount;
-							}
-						}
-					}
-				}
-				//	Search for cell references (e.g. 'Sheet1'!A3 or C5) with or without $ absolutes (e.g. $A1 or C$5)
-				$matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_CELLREF.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER);
-
-				if ($matchCount > 0) {
-					foreach($matches as $match) {
-						$fromString = ($match[2] > '') ? $match[2].'!' : '';
-						$fromString .= $match[3];
-
-						$modified3 = $this->updateCellReference($match[3],$pBefore,$pNumCols,$pNumRows);
-						if ($match[3] !== $modified3) {
-							if (($match[2] == '') || (trim($match[2],"'") == $sheetName)) {
-								$toString = ($match[2] > '') ? $match[2].'!' : '';
-								$toString .= $modified3;
-								list($column,$row) = PHPExcel_Cell::coordinateFromString($match[3]);
-								//	Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
-								$column = PHPExcel_Cell::columnIndexFromString(trim($column,'$')) + 100000;
-								$row = trim($row,'$') + 10000000;
-								$cellIndex = $row . $column;
-
-								$newCellTokens[$cellIndex] = preg_quote($toString);
-								$cellTokens[$cellIndex] = '/(?<![A-Z\$\!])'.preg_quote($fromString).'(?!\d)/i';
-								++$adjustCount;
-							}
-						}
-					}
-				}
-				if ($adjustCount > 0) {
-                    if ($pNumCols > 0 || $pNumRows > 0) {
-                        krsort($cellTokens);
-                        krsort($newCellTokens);
-                      } else {
-                        ksort($cellTokens);
-                        ksort($newCellTokens);
-                    }   //  Update cell references in the formula
-					$formulaBlock = str_replace('\\','',preg_replace($cellTokens,$newCellTokens,$formulaBlock));
-				}
-			}
-		}
-		unset($formulaBlock);
-
-		//	Then rebuild the formula string
-		return implode('"',$formulaBlocks);
-	}
-
-	/**
-	 * Update cell reference
-	 *
-	 * @param	string	$pCellRange			Cell range
-	 * @param	int		$pBefore			Insert before this one
-	 * @param	int		$pNumCols			Number of columns to increment
-	 * @param	int		$pNumRows			Number of rows to increment
-	 * @return	string	Updated cell range
-	 * @throws	PHPExcel_Exception
-	 */
-	public function updateCellReference($pCellRange = 'A1', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0) {
-		// Is it in another worksheet? Will not have to update anything.
-		if (strpos($pCellRange, "!") !== false) {
-			return $pCellRange;
-		// Is it a range or a single cell?
-		} elseif (strpos($pCellRange, ':') === false && strpos($pCellRange, ',') === false) {
-			// Single cell
-			return $this->_updateSingleCellReference($pCellRange, $pBefore, $pNumCols, $pNumRows);
-		} elseif (strpos($pCellRange, ':') !== false || strpos($pCellRange, ',') !== false) {
-			// Range
-			return $this->_updateCellRange($pCellRange, $pBefore, $pNumCols, $pNumRows);
-		} else {
-			// Return original
-			return $pCellRange;
-		}
-	}
-
-	/**
-	 * Update named formulas (i.e. containing worksheet references / named ranges)
-	 *
-	 * @param PHPExcel $pPhpExcel	Object to update
-	 * @param string $oldName		Old name (name to replace)
-	 * @param string $newName		New name
-	 */
-	public function updateNamedFormulas(PHPExcel $pPhpExcel, $oldName = '', $newName = '') {
-		if ($oldName == '') {
-			return;
-		}
-
-		foreach ($pPhpExcel->getWorksheetIterator() as $sheet) {
-			foreach ($sheet->getCellCollection(false) as $cellID) {
-				$cell = $sheet->getCell($cellID);
-				if (($cell !== NULL) && ($cell->getDataType() == PHPExcel_Cell_DataType::TYPE_FORMULA)) {
-					$formula = $cell->getValue();
-					if (strpos($formula, $oldName) !== false) {
-						$formula = str_replace("'" . $oldName . "'!", "'" . $newName . "'!", $formula);
-						$formula = str_replace($oldName . "!", $newName . "!", $formula);
-						$cell->setValueExplicit($formula, PHPExcel_Cell_DataType::TYPE_FORMULA);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Update cell range
-	 *
-	 * @param	string	$pCellRange			Cell range	(e.g. 'B2:D4', 'B:C' or '2:3')
-	 * @param	int		$pBefore			Insert before this one
-	 * @param	int		$pNumCols			Number of columns to increment
-	 * @param	int		$pNumRows			Number of rows to increment
-	 * @return	string	Updated cell range
-	 * @throws	PHPExcel_Exception
-	 */
-	private function _updateCellRange($pCellRange = 'A1:A1', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0) {
-		if (strpos($pCellRange,':') !== false || strpos($pCellRange, ',') !== false) {
-			// Update range
-			$range = PHPExcel_Cell::splitRange($pCellRange);
-			$ic = count($range);
-			for ($i = 0; $i < $ic; ++$i) {
-				$jc = count($range[$i]);
-				for ($j = 0; $j < $jc; ++$j) {
-					if (ctype_alpha($range[$i][$j])) {
-						$r = PHPExcel_Cell::coordinateFromString($this->_updateSingleCellReference($range[$i][$j].'1', $pBefore, $pNumCols, $pNumRows));
-						$range[$i][$j] = $r[0];
-					} elseif(ctype_digit($range[$i][$j])) {
-						$r = PHPExcel_Cell::coordinateFromString($this->_updateSingleCellReference('A'.$range[$i][$j], $pBefore, $pNumCols, $pNumRows));
-						$range[$i][$j] = $r[1];
-					} else {
-						$range[$i][$j] = $this->_updateSingleCellReference($range[$i][$j], $pBefore, $pNumCols, $pNumRows);
-					}
-				}
-			}
-
-			// Recreate range string
-			return PHPExcel_Cell::buildRange($range);
-		} else {
-			throw new PHPExcel_Exception("Only cell ranges may be passed to this method.");
-		}
-	}
-
-	/**
-	 * Update single cell reference
-	 *
-	 * @param	string	$pCellReference		Single cell reference
-	 * @param	int		$pBefore			Insert before this one
-	 * @param	int		$pNumCols			Number of columns to increment
-	 * @param	int		$pNumRows			Number of rows to increment
-	 * @return	string	Updated cell reference
-	 * @throws	PHPExcel_Exception
-	 */
-	private function _updateSingleCellReference($pCellReference = 'A1', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0) {
-		if (strpos($pCellReference, ':') === false && strpos($pCellReference, ',') === false) {
-			// Get coordinates of $pBefore
-			list($beforeColumn, $beforeRow) = PHPExcel_Cell::coordinateFromString( $pBefore );
-
-			// Get coordinates of $pCellReference
-			list($newColumn, $newRow) = PHPExcel_Cell::coordinateFromString( $pCellReference );
-
-			// Verify which parts should be updated
-			$updateColumn = (($newColumn{0} != '$') && ($beforeColumn{0} != '$') &&
-							 PHPExcel_Cell::columnIndexFromString($newColumn) >= PHPExcel_Cell::columnIndexFromString($beforeColumn));
-			$updateRow = (($newRow{0} != '$') && ($beforeRow{0} != '$') &&
-						  $newRow >= $beforeRow);
-
-			// Create new column reference
-			if ($updateColumn) {
-				$newColumn	= PHPExcel_Cell::stringFromColumnIndex( PHPExcel_Cell::columnIndexFromString($newColumn) - 1 + $pNumCols );
-			}
-
-			// Create new row reference
-			if ($updateRow) {
-				$newRow	= $newRow + $pNumRows;
-			}
-
-			// Return new reference
-			return $newColumn . $newRow;
-		} else {
-			throw new PHPExcel_Exception("Only single cell references may be passed to this method.");
-		}
-	}
-
-	/**
-	 * __clone implementation. Cloning should not be allowed in a Singleton!
-	 *
-	 * @throws	PHPExcel_Exception
-	 */
-	public final function __clone() {
-		throw new PHPExcel_Exception("Cloning a Singleton is not allowed!");
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText.php
deleted file mode 100644
index 19326315bae..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_RichText
- *
- * @category   PHPExcel
- * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_RichText implements PHPExcel_IComparable
-{
-    /**
-     * Rich text elements
-     *
-     * @var PHPExcel_RichText_ITextElement[]
-     */
-    private $_richTextElements;
-
-    /**
-     * Create a new PHPExcel_RichText instance
-     *
-     * @param PHPExcel_Cell $pCell
-     * @throws PHPExcel_Exception
-     */
-    public function __construct(PHPExcel_Cell $pCell = null)
-    {
-        // Initialise variables
-        $this->_richTextElements = array();
-
-        // Rich-Text string attached to cell?
-        if ($pCell !== NULL) {
-            // Add cell text and style
-            if ($pCell->getValue() != "") {
-                $objRun = new PHPExcel_RichText_Run($pCell->getValue());
-                $objRun->setFont(clone $pCell->getParent()->getStyle($pCell->getCoordinate())->getFont());
-                $this->addText($objRun);
-            }
-
-            // Set parent value
-            $pCell->setValueExplicit($this, PHPExcel_Cell_DataType::TYPE_STRING);
-        }
-    }
-
-    /**
-     * Add text
-     *
-     * @param PHPExcel_RichText_ITextElement $pText Rich text element
-     * @throws PHPExcel_Exception
-     * @return PHPExcel_RichText
-     */
-    public function addText(PHPExcel_RichText_ITextElement $pText = null)
-    {
-        $this->_richTextElements[] = $pText;
-        return $this;
-    }
-
-    /**
-     * Create text
-     *
-     * @param string $pText Text
-     * @return PHPExcel_RichText_TextElement
-     * @throws PHPExcel_Exception
-     */
-    public function createText($pText = '')
-    {
-        $objText = new PHPExcel_RichText_TextElement($pText);
-        $this->addText($objText);
-        return $objText;
-    }
-
-    /**
-     * Create text run
-     *
-     * @param string $pText Text
-     * @return PHPExcel_RichText_Run
-     * @throws PHPExcel_Exception
-     */
-    public function createTextRun($pText = '')
-    {
-        $objText = new PHPExcel_RichText_Run($pText);
-        $this->addText($objText);
-        return $objText;
-    }
-
-    /**
-     * Get plain text
-     *
-     * @return string
-     */
-    public function getPlainText()
-    {
-        // Return value
-        $returnValue = '';
-
-        // Loop through all PHPExcel_RichText_ITextElement
-        foreach ($this->_richTextElements as $text) {
-            $returnValue .= $text->getText();
-        }
-
-        // Return
-        return $returnValue;
-    }
-
-    /**
-     * Convert to string
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->getPlainText();
-    }
-
-    /**
-     * Get Rich Text elements
-     *
-     * @return PHPExcel_RichText_ITextElement[]
-     */
-    public function getRichTextElements()
-    {
-        return $this->_richTextElements;
-    }
-
-    /**
-     * Set Rich Text elements
-     *
-     * @param PHPExcel_RichText_ITextElement[] $pElements Array of elements
-     * @throws PHPExcel_Exception
-     * @return PHPExcel_RichText
-     */
-    public function setRichTextElements($pElements = null)
-    {
-        if (is_array($pElements)) {
-            $this->_richTextElements = $pElements;
-        } else {
-            throw new PHPExcel_Exception("Invalid PHPExcel_RichText_ITextElement[] array passed.");
-        }
-        return $this;
-    }
-
-    /**
-     * Get hash code
-     *
-     * @return string    Hash code
-     */
-    public function getHashCode()
-    {
-        $hashElements = '';
-        foreach ($this->_richTextElements as $element) {
-            $hashElements .= $element->getHashCode();
-        }
-
-        return md5(
-              $hashElements
-            . __CLASS__
-        );
-    }
-
-    /**
-     * Implement PHP __clone to create a deep clone, not just a shallow copy.
-     */
-    public function __clone()
-    {
-        $vars = get_object_vars($this);
-        foreach ($vars as $key => $value) {
-            if (is_object($value)) {
-                $this->$key = clone $value;
-            } else {
-                $this->$key = $value;
-            }
-        }
-    }
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/ITextElement.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/ITextElement.php
deleted file mode 100644
index 9f1c6240a9b..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/ITextElement.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_RichText_ITextElement
- *
- * @category   PHPExcel
- * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-interface PHPExcel_RichText_ITextElement
-{
-	/**
-	 * Get text
-	 *
-	 * @return string	Text
-	 */
-	public function getText();
-
-	/**
-	 * Set text
-	 *
-	 * @param 	$pText string	Text
-	 * @return PHPExcel_RichText_ITextElement
-	 */
-	public function setText($pText = '');
-
-	/**
-	 * Get font
-	 *
-	 * @return PHPExcel_Style_Font
-	 */
-	public function getFont();
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode();
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/Run.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/Run.php
deleted file mode 100644
index 4a8c592e34e..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/Run.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_RichText_Run
- *
- * @category   PHPExcel
- * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_RichText_Run extends PHPExcel_RichText_TextElement implements PHPExcel_RichText_ITextElement
-{
-	/**
-	 * Font
-	 *
-	 * @var PHPExcel_Style_Font
-	 */
-	private $_font;
-
-    /**
-     * Create a new PHPExcel_RichText_Run instance
-     *
-     * @param 	string		$pText		Text
-     */
-    public function __construct($pText = '')
-    {
-    	// Initialise variables
-    	$this->setText($pText);
-    	$this->_font = new PHPExcel_Style_Font();
-    }
-
-	/**
-	 * Get font
-	 *
-	 * @return PHPExcel_Style_Font
-	 */
-	public function getFont() {
-		return $this->_font;
-	}
-
-	/**
-	 * Set font
-	 *
-	 * @param	PHPExcel_Style_Font		$pFont		Font
-	 * @throws 	PHPExcel_Exception
-	 * @return PHPExcel_RichText_ITextElement
-	 */
-	public function setFont(PHPExcel_Style_Font $pFont = null) {
-		$this->_font = $pFont;
-		return $this;
-	}
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-    	return md5(
-    		  $this->getText()
-    		. $this->_font->getHashCode()
-    		. __CLASS__
-    	);
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/TextElement.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/TextElement.php
deleted file mode 100644
index ec7c2644ef2..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/TextElement.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_RichText_TextElement
- *
- * @category   PHPExcel
- * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_RichText_TextElement implements PHPExcel_RichText_ITextElement
-{
-	/**
-	 * Text
-	 *
-	 * @var string
-	 */
-	private $_text;
-
-    /**
-     * Create a new PHPExcel_RichText_TextElement instance
-     *
-     * @param 	string		$pText		Text
-     */
-    public function __construct($pText = '')
-    {
-    	// Initialise variables
-    	$this->_text = $pText;
-    }
-
-	/**
-	 * Get text
-	 *
-	 * @return string	Text
-	 */
-	public function getText() {
-		return $this->_text;
-	}
-
-	/**
-	 * Set text
-	 *
-	 * @param 	$pText string	Text
-	 * @return PHPExcel_RichText_ITextElement
-	 */
-	public function setText($pText = '') {
-		$this->_text = $pText;
-		return $this;
-	}
-
-	/**
-	 * Get font
-	 *
-	 * @return PHPExcel_Style_Font
-	 */
-	public function getFont() {
-		return null;
-	}
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-    	return md5(
-    		  $this->_text
-    		. __CLASS__
-    	);
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Settings.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Settings.php
deleted file mode 100644
index c78d9350df7..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Settings.php
+++ /dev/null
@@ -1,391 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Settings
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-    /**
-     * @ignore
-     */
-    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../');
-    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-class PHPExcel_Settings
-{
-    /**    constants */
-    /**    Available Zip library classes */
-    const PCLZIP        = 'PHPExcel_Shared_ZipArchive';
-    const ZIPARCHIVE    = 'ZipArchive';
-
-    /**    Optional Chart Rendering libraries */
-    const CHART_RENDERER_JPGRAPH    = 'jpgraph';
-
-    /**    Optional PDF Rendering libraries */
-    const PDF_RENDERER_TCPDF		= 'tcPDF';
-    const PDF_RENDERER_DOMPDF		= 'DomPDF';
-    const PDF_RENDERER_MPDF 		= 'mPDF';
-
-
-    private static $_chartRenderers = array(
-        self::CHART_RENDERER_JPGRAPH,
-    );
-
-    private static $_pdfRenderers = array(
-        self::PDF_RENDERER_TCPDF,
-        self::PDF_RENDERER_DOMPDF,
-        self::PDF_RENDERER_MPDF,
-    );
-
-
-    /**
-     * Name of the class used for Zip file management
-     *	e.g.
-     *		ZipArchive
-     *
-     * @var string
-     */
-    private static $_zipClass    = self::ZIPARCHIVE;
-
-
-    /**
-     * Name of the external Library used for rendering charts
-     *	e.g.
-     *		jpgraph
-     *
-     * @var string
-     */
-    private static $_chartRendererName = NULL;
-
-    /**
-     * Directory Path to the external Library used for rendering charts
-     *
-     * @var string
-     */
-    private static $_chartRendererPath = NULL;
-
-
-    /**
-     * Name of the external Library used for rendering PDF files
-     *	e.g.
-     * 		mPDF
-     *
-     * @var string
-     */
-    private static $_pdfRendererName = NULL;
-
-    /**
-     * Directory Path to the external Library used for rendering PDF files
-     *
-     * @var string
-     */
-    private static $_pdfRendererPath = NULL;
-
-    /**
-     * Default options for libxml loader
-     *
-     * @var int
-     */
-    private static $_libXmlLoaderOptions = null;
-
-    /**
-     * Set the Zip handler Class that PHPExcel should use for Zip file management (PCLZip or ZipArchive)
-     *
-     * @param string $zipClass	The Zip handler class that PHPExcel should use for Zip file management
-     * 	 e.g. PHPExcel_Settings::PCLZip or PHPExcel_Settings::ZipArchive
-     * @return	boolean	Success or failure
-     */
-    public static function setZipClass($zipClass)
-    {
-        if (($zipClass === self::PCLZIP) ||
-            ($zipClass === self::ZIPARCHIVE)) {
-            self::$_zipClass = $zipClass;
-            return TRUE;
-        }
-        return FALSE;
-    } // function setZipClass()
-
-
-    /**
-     * Return the name of the Zip handler Class that PHPExcel is configured to use (PCLZip or ZipArchive)
-     *	or Zip file management
-     *
-     * @return string Name of the Zip handler Class that PHPExcel is configured to use
-     *	for Zip file management
-     *	e.g. PHPExcel_Settings::PCLZip or PHPExcel_Settings::ZipArchive
-     */
-    public static function getZipClass()
-    {
-        return self::$_zipClass;
-    } // function getZipClass()
-
-
-    /**
-     * Return the name of the method that is currently configured for cell cacheing
-     *
-     * @return string Name of the cacheing method
-     */
-    public static function getCacheStorageMethod()
-    {
-        return PHPExcel_CachedObjectStorageFactory::getCacheStorageMethod();
-    } // function getCacheStorageMethod()
-
-
-    /**
-     * Return the name of the class that is currently being used for cell cacheing
-     *
-     * @return string Name of the class currently being used for cacheing
-     */
-    public static function getCacheStorageClass()
-    {
-        return PHPExcel_CachedObjectStorageFactory::getCacheStorageClass();
-    } // function getCacheStorageClass()
-
-
-    /**
-     * Set the method that should be used for cell cacheing
-     *
-     * @param string $method Name of the cacheing method
-     * @param array $arguments Optional configuration arguments for the cacheing method
-     * @return boolean Success or failure
-     */
-    public static function setCacheStorageMethod(
-    	$method = PHPExcel_CachedObjectStorageFactory::cache_in_memory,
-      $arguments = array()
-    )
-    {
-        return PHPExcel_CachedObjectStorageFactory::initialize($method, $arguments);
-    } // function setCacheStorageMethod()
-
-
-    /**
-     * Set the locale code to use for formula translations and any special formatting
-     *
-     * @param string $locale The locale code to use (e.g. "fr" or "pt_br" or "en_uk")
-     * @return boolean Success or failure
-     */
-    public static function setLocale($locale='en_us')
-    {
-        return PHPExcel_Calculation::getInstance()->setLocale($locale);
-    } // function setLocale()
-
-
-    /**
-     * Set details of the external library that PHPExcel should use for rendering charts
-     *
-     * @param string $libraryName	Internal reference name of the library
-     *	e.g. PHPExcel_Settings::CHART_RENDERER_JPGRAPH
-     * @param string $libraryBaseDir Directory path to the library's base folder
-     *
-     * @return	boolean	Success or failure
-     */
-    public static function setChartRenderer($libraryName, $libraryBaseDir)
-    {
-        if (!self::setChartRendererName($libraryName))
-            return FALSE;
-        return self::setChartRendererPath($libraryBaseDir);
-    } // function setChartRenderer()
-
-
-    /**
-     * Identify to PHPExcel the external library to use for rendering charts
-     *
-     * @param string $libraryName	Internal reference name of the library
-     *	e.g. PHPExcel_Settings::CHART_RENDERER_JPGRAPH
-     *
-     * @return	boolean	Success or failure
-     */
-    public static function setChartRendererName($libraryName)
-    {
-        if (!in_array($libraryName,self::$_chartRenderers)) {
-            return FALSE;
-        }
-
-        self::$_chartRendererName = $libraryName;
-
-        return TRUE;
-    } // function setChartRendererName()
-
-
-    /**
-     * Tell PHPExcel where to find the external library to use for rendering charts
-     *
-     * @param string $libraryBaseDir	Directory path to the library's base folder
-     * @return	boolean	Success or failure
-     */
-    public static function setChartRendererPath($libraryBaseDir)
-    {
-        if ((file_exists($libraryBaseDir) === false) || (is_readable($libraryBaseDir) === false)) {
-            return FALSE;
-        }
-        self::$_chartRendererPath = $libraryBaseDir;
-
-        return TRUE;
-    } // function setChartRendererPath()
-
-
-    /**
-     * Return the Chart Rendering Library that PHPExcel is currently configured to use (e.g. jpgraph)
-     *
-     * @return string|NULL Internal reference name of the Chart Rendering Library that PHPExcel is
-     *	currently configured to use
-     *	e.g. PHPExcel_Settings::CHART_RENDERER_JPGRAPH
-     */
-    public static function getChartRendererName()
-    {
-        return self::$_chartRendererName;
-    } // function getChartRendererName()
-
-
-    /**
-     * Return the directory path to the Chart Rendering Library that PHPExcel is currently configured to use
-     *
-     * @return string|NULL Directory Path to the Chart Rendering Library that PHPExcel is
-     * 	currently configured to use
-     */
-    public static function getChartRendererPath()
-    {
-        return self::$_chartRendererPath;
-    } // function getChartRendererPath()
-
-
-    /**
-     * Set details of the external library that PHPExcel should use for rendering PDF files
-     *
-     * @param string $libraryName Internal reference name of the library
-     * 	e.g. PHPExcel_Settings::PDF_RENDERER_TCPDF,
-     * 	PHPExcel_Settings::PDF_RENDERER_DOMPDF
-     *  or PHPExcel_Settings::PDF_RENDERER_MPDF
-     * @param string $libraryBaseDir Directory path to the library's base folder
-     *
-     * @return boolean Success or failure
-     */
-    public static function setPdfRenderer($libraryName, $libraryBaseDir)
-    {
-        if (!self::setPdfRendererName($libraryName))
-            return FALSE;
-        return self::setPdfRendererPath($libraryBaseDir);
-    } // function setPdfRenderer()
-
-
-    /**
-     * Identify to PHPExcel the external library to use for rendering PDF files
-     *
-     * @param string $libraryName Internal reference name of the library
-     * 	e.g. PHPExcel_Settings::PDF_RENDERER_TCPDF,
-     *	PHPExcel_Settings::PDF_RENDERER_DOMPDF
-     * 	or PHPExcel_Settings::PDF_RENDERER_MPDF
-     *
-     * @return boolean Success or failure
-     */
-    public static function setPdfRendererName($libraryName)
-    {
-        if (!in_array($libraryName,self::$_pdfRenderers)) {
-            return FALSE;
-        }
-
-        self::$_pdfRendererName = $libraryName;
-
-        return TRUE;
-    } // function setPdfRendererName()
-
-
-    /**
-     * Tell PHPExcel where to find the external library to use for rendering PDF files
-     *
-     * @param string $libraryBaseDir Directory path to the library's base folder
-     * @return boolean Success or failure
-     */
-    public static function setPdfRendererPath($libraryBaseDir)
-    {
-        if ((file_exists($libraryBaseDir) === false) || (is_readable($libraryBaseDir) === false)) {
-            return FALSE;
-        }
-        self::$_pdfRendererPath = $libraryBaseDir;
-
-        return TRUE;
-    } // function setPdfRendererPath()
-
-
-    /**
-     * Return the PDF Rendering Library that PHPExcel is currently configured to use (e.g. dompdf)
-     *
-     * @return string|NULL Internal reference name of the PDF Rendering Library that PHPExcel is
-     * 	currently configured to use
-     *  e.g. PHPExcel_Settings::PDF_RENDERER_TCPDF,
-     *  PHPExcel_Settings::PDF_RENDERER_DOMPDF
-     *  or PHPExcel_Settings::PDF_RENDERER_MPDF
-     */
-    public static function getPdfRendererName()
-    {
-        return self::$_pdfRendererName;
-    } // function getPdfRendererName()
-
-    /**
-     * Return the directory path to the PDF Rendering Library that PHPExcel is currently configured to use
-     *
-     * @return string|NULL Directory Path to the PDF Rendering Library that PHPExcel is
-     *		currently configured to use
-     */
-    public static function getPdfRendererPath()
-    {
-        return self::$_pdfRendererPath;
-    } // function getPdfRendererPath()
-
-    /**
-     * Set default options for libxml loader
-     *
-     * @param int $options Default options for libxml loader
-     */
-    public static function setLibXmlLoaderOptions($options = null)
-    {
-        if (is_null($options) && defined(LIBXML_DTDLOAD)) {
-            $options = LIBXML_DTDLOAD | LIBXML_DTDATTR;
-        }
-        if (version_compare(PHP_VERSION, '5.2.11') >= 0) {
-            @libxml_disable_entity_loader($options == (LIBXML_DTDLOAD | LIBXML_DTDATTR)); 
-        }
-        self::$_libXmlLoaderOptions = $options;
-    } // function setLibXmlLoaderOptions
-
-    /**
-     * Get default options for libxml loader.
-     * Defaults to LIBXML_DTDLOAD | LIBXML_DTDATTR when not set explicitly.
-     *
-     * @return int Default options for libxml loader
-     */
-    public static function getLibXmlLoaderOptions()
-    {
-        if (is_null(self::$_libXmlLoaderOptions) && defined(LIBXML_DTDLOAD)) {
-            self::setLibXmlLoaderOptions(LIBXML_DTDLOAD | LIBXML_DTDATTR);
-        }
-        if (version_compare(PHP_VERSION, '5.2.11') >= 0) {
-            @libxml_disable_entity_loader(self::$_libXmlLoaderOptions == (LIBXML_DTDLOAD | LIBXML_DTDATTR));
-        }
-        return self::$_libXmlLoaderOptions;
-    } // function getLibXmlLoaderOptions
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/CodePage.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/CodePage.php
deleted file mode 100644
index 89e2d19cfff..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/CodePage.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Shared_CodePage
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_CodePage
-{
-	/**
-	 * Convert Microsoft Code Page Identifier to Code Page Name which iconv
-	 * and mbstring understands
-	 *
-	 * @param integer $codePage Microsoft Code Page Indentifier
-	 * @return string Code Page Name
-	 * @throws PHPExcel_Exception
-	 */
-	public static function NumberToName($codePage = 1252)
-	{
-		switch ($codePage) {
-			case 367:	return 'ASCII';				break;	//	ASCII
-			case 437:	return 'CP437';				break;	//	OEM US
-			case 720:	throw new PHPExcel_Exception('Code page 720 not supported.');
-													break;	//	OEM Arabic
-			case 737:	return 'CP737';				break;	//	OEM Greek
-			case 775:	return 'CP775';				break;	//	OEM Baltic
-			case 850:	return 'CP850';				break;	//	OEM Latin I
-			case 852:	return 'CP852';				break;	//	OEM Latin II (Central European)
-			case 855:	return 'CP855';				break;	//	OEM Cyrillic
-			case 857:	return 'CP857';				break;	//	OEM Turkish
-			case 858:	return 'CP858';				break;	//	OEM Multilingual Latin I with Euro
-			case 860:	return 'CP860';				break;	//	OEM Portugese
-			case 861:	return 'CP861';				break;	//	OEM Icelandic
-			case 862:	return 'CP862';				break;	//	OEM Hebrew
-			case 863:	return 'CP863';				break;	//	OEM Canadian (French)
-			case 864:	return 'CP864';				break;	//	OEM Arabic
-			case 865:	return 'CP865';				break;	//	OEM Nordic
-			case 866:	return 'CP866';				break;	//	OEM Cyrillic (Russian)
-			case 869:	return 'CP869';				break;	//	OEM Greek (Modern)
-			case 874:	return 'CP874';				break;	//	ANSI Thai
-			case 932:	return 'CP932';				break;	//	ANSI Japanese Shift-JIS
-			case 936:	return 'CP936';				break;	//	ANSI Chinese Simplified GBK
-			case 949:	return 'CP949';				break;	//	ANSI Korean (Wansung)
-			case 950:	return 'CP950';				break;	//	ANSI Chinese Traditional BIG5
-			case 1200:	return 'UTF-16LE';			break;	//	UTF-16 (BIFF8)
-			case 1250:	return 'CP1250';			break;	//	ANSI Latin II (Central European)
-			case 1251:	return 'CP1251';			break;	//	ANSI Cyrillic
-			case 0:		//	CodePage is not always correctly set when the xls file was saved by Apple's Numbers program
-			case 1252:	return 'CP1252';			break;	//	ANSI Latin I (BIFF4-BIFF7)
-			case 1253:	return 'CP1253';			break;	//	ANSI Greek
-			case 1254:	return 'CP1254';			break;	//	ANSI Turkish
-			case 1255:	return 'CP1255';			break;	//	ANSI Hebrew
-			case 1256:	return 'CP1256';			break;	//	ANSI Arabic
-			case 1257:	return 'CP1257';			break;	//	ANSI Baltic
-			case 1258:	return 'CP1258';			break;	//	ANSI Vietnamese
-			case 1361:	return 'CP1361';			break;	//	ANSI Korean (Johab)
-			case 10000:	return 'MAC';				break;	//	Apple Roman
-			case 10001:	return 'CP932';				break;	//	Macintosh Japanese
-			case 10002:	return 'CP950';				break;	//	Macintosh Chinese Traditional
-			case 10003:	return 'CP1361';			break;	//	Macintosh Korean
-			case 10006:	return 'MACGREEK';			break;	//	Macintosh Greek
-			case 10007:	return 'MACCYRILLIC';			break;	//	Macintosh Cyrillic
-                        case 10008:	return 'CP936';				break;  //	Macintosh - Simplified Chinese (GB 2312)
-			case 10029:	return 'MACCENTRALEUROPE';		break;	//	Macintosh Central Europe
-			case 10079:	return 'MACICELAND';			break;	//	Macintosh Icelandic
-			case 10081:	return 'MACTURKISH';			break;	//	Macintosh Turkish
-			case 21010:	return 'UTF-16LE';			break;	//	UTF-16 (BIFF8) This isn't correct, but some Excel writer libraries erroneously use Codepage 21010 for UTF-16LE
-			case 32768:	return 'MAC';				break;	//	Apple Roman
-			case 32769:	throw new PHPExcel_Exception('Code page 32769 not supported.');
-													break;	//	ANSI Latin I (BIFF2-BIFF3)
-			case 65000:	return 'UTF-7';				break;	//	Unicode (UTF-7)
-			case 65001:	return 'UTF-8';				break;	//	Unicode (UTF-8)
-		}
-
-		throw new PHPExcel_Exception('Unknown codepage: ' . $codePage);
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Date.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Date.php
deleted file mode 100644
index 75f367eac5a..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Date.php
+++ /dev/null
@@ -1,393 +0,0 @@
-<?php
-
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Shared_Date
- *
- * @category   PHPExcel
- * @package	PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_Date
-{
-	/** constants */
-	const CALENDAR_WINDOWS_1900 = 1900;		//	Base date of 1st Jan 1900 = 1.0
-	const CALENDAR_MAC_1904 = 1904;			//	Base date of 2nd Jan 1904 = 1.0
-
-	/*
-	 * Names of the months of the year, indexed by shortname
-	 * Planned usage for locale settings
-	 *
-	 * @public
-	 * @var	string[]
-	 */
-	public static $_monthNames = array(	'Jan' => 'January',
-										'Feb' => 'February',
-										'Mar' => 'March',
-										'Apr' => 'April',
-										'May' => 'May',
-										'Jun' => 'June',
-										'Jul' => 'July',
-										'Aug' => 'August',
-										'Sep' => 'September',
-										'Oct' => 'October',
-										'Nov' => 'November',
-										'Dec' => 'December',
-									  );
-
-	/*
-	 * Names of the months of the year, indexed by shortname
-	 * Planned usage for locale settings
-	 *
-	 * @public
-	 * @var	string[]
-	 */
-	public static $_numberSuffixes = array(	'st',
-											'nd',
-											'rd',
-											'th',
-										  );
-
-	/*
-	 * Base calendar year to use for calculations
-	 *
-	 * @private
-	 * @var	int
-	 */
-	protected static $_excelBaseDate	= self::CALENDAR_WINDOWS_1900;
-
-	/**
-	 * Set the Excel calendar (Windows 1900 or Mac 1904)
-	 *
-	 * @param	 integer	$baseDate			Excel base date (1900 or 1904)
-	 * @return	 boolean						Success or failure
-	 */
-	public static function setExcelCalendar($baseDate) {
-		if (($baseDate == self::CALENDAR_WINDOWS_1900) ||
-			($baseDate == self::CALENDAR_MAC_1904)) {
-			self::$_excelBaseDate = $baseDate;
-			return TRUE;
-		}
-		return FALSE;
-	}	//	function setExcelCalendar()
-
-
-	/**
-	 * Return the Excel calendar (Windows 1900 or Mac 1904)
-	 *
-	 * @return	 integer	Excel base date (1900 or 1904)
-	 */
-	public static function getExcelCalendar() {
-		return self::$_excelBaseDate;
-	}	//	function getExcelCalendar()
-
-
-	/**
-	 *	Convert a date from Excel to PHP
-	 *
-	 *	@param		long		$dateValue			Excel date/time value
-	 *	@param		boolean		$adjustToTimezone	Flag indicating whether $dateValue should be treated as
-	 *													a UST timestamp, or adjusted to UST
-	 *	@param		string	 	$timezone			The timezone for finding the adjustment from UST
-	 *	@return		long		PHP serialized date/time
-	 */
-	public static function ExcelToPHP($dateValue = 0, $adjustToTimezone = FALSE, $timezone = NULL) {
-		if (self::$_excelBaseDate == self::CALENDAR_WINDOWS_1900) {
-			$my_excelBaseDate = 25569;
-			//	Adjust for the spurious 29-Feb-1900 (Day 60)
-			if ($dateValue < 60) {
-				--$my_excelBaseDate;
-			}
-		} else {
-			$my_excelBaseDate = 24107;
-		}
-
-		// Perform conversion
-		if ($dateValue >= 1) {
-			$utcDays = $dateValue - $my_excelBaseDate;
-			$returnValue = round($utcDays * 86400);
-			if (($returnValue <= PHP_INT_MAX) && ($returnValue >= -PHP_INT_MAX)) {
-				$returnValue = (integer) $returnValue;
-			}
-		} else {
-			$hours = round($dateValue * 24);
-			$mins = round($dateValue * 1440) - round($hours * 60);
-			$secs = round($dateValue * 86400) - round($hours * 3600) - round($mins * 60);
-			$returnValue = (integer) gmmktime($hours, $mins, $secs);
-		}
-
-		$timezoneAdjustment = ($adjustToTimezone) ?
-		    PHPExcel_Shared_TimeZone::getTimezoneAdjustment($timezone, $returnValue) :
-		    0;
-
-		// Return
-		return $returnValue + $timezoneAdjustment;
-	}	//	function ExcelToPHP()
-
-
-	/**
-	 * Convert a date from Excel to a PHP Date/Time object
-	 *
-	 * @param	integer		$dateValue		Excel date/time value
-	 * @return	DateTime					PHP date/time object
-	 */
-	public static function ExcelToPHPObject($dateValue = 0) {
-		$dateTime = self::ExcelToPHP($dateValue);
-		$days = floor($dateTime / 86400);
-		$time = round((($dateTime / 86400) - $days) * 86400);
-		$hours = round($time / 3600);
-		$minutes = round($time / 60) - ($hours * 60);
-		$seconds = round($time) - ($hours * 3600) - ($minutes * 60);
-
-		$dateObj = date_create('1-Jan-1970+'.$days.' days');
-		$dateObj->setTime($hours,$minutes,$seconds);
-
-		return $dateObj;
-	}	//	function ExcelToPHPObject()
-
-
-	/**
-	 *	Convert a date from PHP to Excel
-	 *
-	 *	@param	mixed		$dateValue			PHP serialized date/time or date object
-	 *	@param	boolean		$adjustToTimezone	Flag indicating whether $dateValue should be treated as
-	 *													a UST timestamp, or adjusted to UST
-	 *	@param	string	 	$timezone			The timezone for finding the adjustment from UST
-	 *	@return	mixed		Excel date/time value
-	 *							or boolean FALSE on failure
-	 */
-	public static function PHPToExcel($dateValue = 0, $adjustToTimezone = FALSE, $timezone = NULL) {
-		$saveTimeZone = date_default_timezone_get();
-		date_default_timezone_set('UTC');
-		$retValue = FALSE;
-		if ((is_object($dateValue)) && ($dateValue instanceof DateTime)) {
-			$retValue = self::FormattedPHPToExcel( $dateValue->format('Y'), $dateValue->format('m'), $dateValue->format('d'),
-												   $dateValue->format('H'), $dateValue->format('i'), $dateValue->format('s')
-												 );
-		} elseif (is_numeric($dateValue)) {
-			$retValue = self::FormattedPHPToExcel( date('Y',$dateValue), date('m',$dateValue), date('d',$dateValue),
-												   date('H',$dateValue), date('i',$dateValue), date('s',$dateValue)
-												 );
-		}
-		date_default_timezone_set($saveTimeZone);
-
-		return $retValue;
-	}	//	function PHPToExcel()
-
-
-	/**
-	 * FormattedPHPToExcel
-	 *
-	 * @param	long	$year
-	 * @param	long	$month
-	 * @param	long	$day
-	 * @param	long	$hours
-	 * @param	long	$minutes
-	 * @param	long	$seconds
-	 * @return  long				Excel date/time value
-	 */
-	public static function FormattedPHPToExcel($year, $month, $day, $hours=0, $minutes=0, $seconds=0) {
-		if (self::$_excelBaseDate == self::CALENDAR_WINDOWS_1900) {
-			//
-			//	Fudge factor for the erroneous fact that the year 1900 is treated as a Leap Year in MS Excel
-			//	This affects every date following 28th February 1900
-			//
-			$excel1900isLeapYear = TRUE;
-			if (($year == 1900) && ($month <= 2)) { $excel1900isLeapYear = FALSE; }
-			$my_excelBaseDate = 2415020;
-		} else {
-			$my_excelBaseDate = 2416481;
-			$excel1900isLeapYear = FALSE;
-		}
-
-		//	Julian base date Adjustment
-		if ($month > 2) {
-			$month -= 3;
-		} else {
-			$month += 9;
-			--$year;
-		}
-
-		//	Calculate the Julian Date, then subtract the Excel base date (JD 2415020 = 31-Dec-1899 Giving Excel Date of 0)
-		$century = substr($year,0,2);
-		$decade = substr($year,2,2);
-		$excelDate = floor((146097 * $century) / 4) + floor((1461 * $decade) / 4) + floor((153 * $month + 2) / 5) + $day + 1721119 - $my_excelBaseDate + $excel1900isLeapYear;
-
-		$excelTime = (($hours * 3600) + ($minutes * 60) + $seconds) / 86400;
-
-		return (float) $excelDate + $excelTime;
-	}	//	function FormattedPHPToExcel()
-
-
-	/**
-	 * Is a given cell a date/time?
-	 *
-	 * @param	 PHPExcel_Cell	$pCell
-	 * @return	 boolean
-	 */
-	public static function isDateTime(PHPExcel_Cell $pCell) {
-		return self::isDateTimeFormat(
-			$pCell->getWorksheet()->getStyle(
-				$pCell->getCoordinate()
-			)->getNumberFormat()
-		);
-	}	//	function isDateTime()
-
-
-	/**
-	 * Is a given number format a date/time?
-	 *
-	 * @param	 PHPExcel_Style_NumberFormat	$pFormat
-	 * @return	 boolean
-	 */
-	public static function isDateTimeFormat(PHPExcel_Style_NumberFormat $pFormat) {
-		return self::isDateTimeFormatCode($pFormat->getFormatCode());
-	}	//	function isDateTimeFormat()
-
-
-	private static	$possibleDateFormatCharacters = 'eymdHs';
-
-	/**
-	 * Is a given number format code a date/time?
-	 *
-	 * @param	 string	$pFormatCode
-	 * @return	 boolean
-	 */
-	public static function isDateTimeFormatCode($pFormatCode = '') {
-		if (strtolower($pFormatCode) === strtolower(PHPExcel_Style_NumberFormat::FORMAT_GENERAL))
-            //	"General" contains an epoch letter 'e', so we trap for it explicitly here (case-insensitive check)
-			return FALSE;
-        if (preg_match('/[0#]E[+-]0/i', $pFormatCode))
-			//	Scientific format
-			return FALSE;
-		// Switch on formatcode
-		switch ($pFormatCode) {
-			//	Explicitly defined date formats
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_YYYYMMDD:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_YYYYMMDD2:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_DDMMYYYY:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_DMYSLASH:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_DMYMINUS:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_DMMINUS:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_MYMINUS:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_DATETIME:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME1:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME2:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME3:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME4:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME5:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME6:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME7:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME8:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_YYYYMMDDSLASH:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX14:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX15:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX16:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX17:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX22:
-				return TRUE;
-		}
-
-		//	Typically number, currency or accounting (or occasionally fraction) formats
-		if ((substr($pFormatCode,0,1) == '_') || (substr($pFormatCode,0,2) == '0 ')) {
-			return FALSE;
-		}
-		// Try checking for any of the date formatting characters that don't appear within square braces
-		if (preg_match('/(^|\])[^\[]*['.self::$possibleDateFormatCharacters.']/i',$pFormatCode)) {
-			//	We might also have a format mask containing quoted strings...
-			//		we don't want to test for any of our characters within the quoted blocks
-			if (strpos($pFormatCode,'"') !== FALSE) {
-				$segMatcher = FALSE;
-				foreach(explode('"',$pFormatCode) as $subVal) {
-					//	Only test in alternate array entries (the non-quoted blocks)
-					if (($segMatcher = !$segMatcher) &&
-						(preg_match('/(^|\])[^\[]*['.self::$possibleDateFormatCharacters.']/i',$subVal))) {
-						return TRUE;
-					}
-				}
-				return FALSE;
-			}
-			return TRUE;
-		}
-
-		// No date...
-		return FALSE;
-	}	//	function isDateTimeFormatCode()
-
-
-	/**
-	 * Convert a date/time string to Excel time
-	 *
-	 * @param	string	$dateValue		Examples: '2009-12-31', '2009-12-31 15:59', '2009-12-31 15:59:10'
-	 * @return	float|FALSE		Excel date/time serial value
-	 */
-	public static function stringToExcel($dateValue = '') {
-		if (strlen($dateValue) < 2)
-			return FALSE;
-		if (!preg_match('/^(\d{1,4}[ \.\/\-][A-Z]{3,9}([ \.\/\-]\d{1,4})?|[A-Z]{3,9}[ \.\/\-]\d{1,4}([ \.\/\-]\d{1,4})?|\d{1,4}[ \.\/\-]\d{1,4}([ \.\/\-]\d{1,4})?)( \d{1,2}:\d{1,2}(:\d{1,2})?)?$/iu', $dateValue))
-			return FALSE;
-
-		$dateValueNew = PHPExcel_Calculation_DateTime::DATEVALUE($dateValue);
-
-		if ($dateValueNew === PHPExcel_Calculation_Functions::VALUE()) {
-			return FALSE;
-		} else {
-			if (strpos($dateValue, ':') !== FALSE) {
-				$timeValue = PHPExcel_Calculation_DateTime::TIMEVALUE($dateValue);
-				if ($timeValue === PHPExcel_Calculation_Functions::VALUE()) {
-					return FALSE;
-				}
-				$dateValueNew += $timeValue;
-			}
-			return $dateValueNew;
-		}
-
-
-	}
-
-    public static function monthStringToNumber($month) {
-        $monthIndex = 1;
-        foreach(self::$_monthNames as $shortMonthName => $longMonthName) {
-            if (($month === $longMonthName) || ($month === $shortMonthName)) {
-                return $monthIndex;
-            }
-            ++$monthIndex;
-        }
-        return $month;
-    }
-
-    public static function dayStringToNumber($day) {
-		$strippedDayValue = (str_replace(self::$_numberSuffixes,'',$day));
-		if (is_numeric($strippedDayValue)) {
-		    return $strippedDayValue;
-		}
-		return $day;
-    }
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Drawing.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Drawing.php
deleted file mode 100644
index dbff74abce0..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Drawing.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Shared_Drawing
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_Drawing
-{
-	/**
-	 * Convert pixels to EMU
-	 *
-	 * @param 	int $pValue	Value in pixels
-	 * @return 	int			Value in EMU
-	 */
-	public static function pixelsToEMU($pValue = 0) {
-		return round($pValue * 9525);
-	}
-
-	/**
-	 * Convert EMU to pixels
-	 *
-	 * @param 	int $pValue	Value in EMU
-	 * @return 	int			Value in pixels
-	 */
-	public static function EMUToPixels($pValue = 0) {
-		if ($pValue != 0) {
-			return round($pValue / 9525);
-		} else {
-			return 0;
-		}
-	}
-
-	/**
-	 * Convert pixels to column width. Exact algorithm not known.
-	 * By inspection of a real Excel file using Calibri 11, one finds 1000px ~ 142.85546875
-	 * This gives a conversion factor of 7. Also, we assume that pixels and font size are proportional.
-	 *
-	 * @param 	int $pValue	Value in pixels
-	 * @param 	PHPExcel_Style_Font $pDefaultFont	Default font of the workbook
-	 * @return 	int			Value in cell dimension
-	 */
-	public static function pixelsToCellDimension($pValue = 0, PHPExcel_Style_Font $pDefaultFont) {
-		// Font name and size
-		$name = $pDefaultFont->getName();
-		$size = $pDefaultFont->getSize();
-
-		if (isset(PHPExcel_Shared_Font::$defaultColumnWidths[$name][$size])) {
-			// Exact width can be determined
-			$colWidth = $pValue
-				* PHPExcel_Shared_Font::$defaultColumnWidths[$name][$size]['width']
-				/ PHPExcel_Shared_Font::$defaultColumnWidths[$name][$size]['px'];
-		} else {
-			// We don't have data for this particular font and size, use approximation by
-			// extrapolating from Calibri 11
-			$colWidth = $pValue * 11
-				* PHPExcel_Shared_Font::$defaultColumnWidths['Calibri'][11]['width']
-				/ PHPExcel_Shared_Font::$defaultColumnWidths['Calibri'][11]['px'] / $size;
-		}
-
-		return $colWidth;
-	}
-
-	/**
-	 * Convert column width from (intrinsic) Excel units to pixels
-	 *
-	 * @param 	float	$pValue		Value in cell dimension
-	 * @param 	PHPExcel_Style_Font $pDefaultFont	Default font of the workbook
-	 * @return 	int		Value in pixels
-	 */
-	public static function cellDimensionToPixels($pValue = 0, PHPExcel_Style_Font $pDefaultFont) {
-		// Font name and size
-		$name = $pDefaultFont->getName();
-		$size = $pDefaultFont->getSize();
-
-		if (isset(PHPExcel_Shared_Font::$defaultColumnWidths[$name][$size])) {
-			// Exact width can be determined
-			$colWidth = $pValue
-				* PHPExcel_Shared_Font::$defaultColumnWidths[$name][$size]['px']
-				/ PHPExcel_Shared_Font::$defaultColumnWidths[$name][$size]['width'];
-
-		} else {
-			// We don't have data for this particular font and size, use approximation by
-			// extrapolating from Calibri 11
-			$colWidth = $pValue * $size
-				* PHPExcel_Shared_Font::$defaultColumnWidths['Calibri'][11]['px']
-				/ PHPExcel_Shared_Font::$defaultColumnWidths['Calibri'][11]['width'] / 11;
-		}
-
-		// Round pixels to closest integer
-		$colWidth = (int) round($colWidth);
-
-		return $colWidth;
-	}
-
-	/**
-	 * Convert pixels to points
-	 *
-	 * @param 	int $pValue	Value in pixels
-	 * @return 	int			Value in points
-	 */
-	public static function pixelsToPoints($pValue = 0) {
-		return $pValue * 0.67777777;
-	}
-
-	/**
-	 * Convert points to pixels
-	 *
-	 * @param 	int $pValue	Value in points
-	 * @return 	int			Value in pixels
-	 */
-	public static function pointsToPixels($pValue = 0) {
-		if ($pValue != 0) {
-			return (int) ceil($pValue * 1.333333333);
-		} else {
-			return 0;
-		}
-	}
-
-	/**
-	 * Convert degrees to angle
-	 *
-	 * @param 	int $pValue	Degrees
-	 * @return 	int			Angle
-	 */
-	public static function degreesToAngle($pValue = 0) {
-		return (int)round($pValue * 60000);
-	}
-
-	/**
-	 * Convert angle to degrees
-	 *
-	 * @param 	int $pValue	Angle
-	 * @return 	int			Degrees
-	 */
-	public static function angleToDegrees($pValue = 0) {
-		if ($pValue != 0) {
-			return round($pValue / 60000);
-		} else {
-			return 0;
-		}
-	}
-
-	/**
-	 * Create a new image from file. By alexander at alexauto dot nl
-	 *
-	 * @link http://www.php.net/manual/en/function.imagecreatefromwbmp.php#86214
-	 * @param string $filename Path to Windows DIB (BMP) image
-	 * @return resource
-	 */
-	public static function imagecreatefrombmp($p_sFile)
-	{
-        //    Load the image into a string
-        $file    =    fopen($p_sFile,"rb");
-        $read    =    fread($file,10);
-        while(!feof($file)&&($read<>""))
-            $read    .=    fread($file,1024);
-
-        $temp    =    unpack("H*",$read);
-        $hex    =    $temp[1];
-        $header    =    substr($hex,0,108);
-
-        //    Process the header
-        //    Structure: http://www.fastgraph.com/help/bmp_header_format.html
-        if (substr($header,0,4)=="424d")
-        {
-            //    Cut it in parts of 2 bytes
-            $header_parts    =    str_split($header,2);
-
-            //    Get the width        4 bytes
-            $width            =    hexdec($header_parts[19].$header_parts[18]);
-
-            //    Get the height        4 bytes
-            $height            =    hexdec($header_parts[23].$header_parts[22]);
-
-            //    Unset the header params
-            unset($header_parts);
-        }
-
-        //    Define starting X and Y
-        $x                =    0;
-        $y                =    1;
-
-        //    Create newimage
-        $image            =    imagecreatetruecolor($width,$height);
-
-        //    Grab the body from the image
-        $body            =    substr($hex,108);
-
-        //    Calculate if padding at the end-line is needed
-        //    Divided by two to keep overview.
-        //    1 byte = 2 HEX-chars
-        $body_size        =    (strlen($body)/2);
-        $header_size    =    ($width*$height);
-
-        //    Use end-line padding? Only when needed
-        $usePadding        =    ($body_size>($header_size*3)+4);
-
-        //    Using a for-loop with index-calculation instaid of str_split to avoid large memory consumption
-        //    Calculate the next DWORD-position in the body
-        for ($i=0;$i<$body_size;$i+=3)
-        {
-            //    Calculate line-ending and padding
-            if ($x>=$width)
-            {
-                //    If padding needed, ignore image-padding
-                //    Shift i to the ending of the current 32-bit-block
-                if ($usePadding)
-                    $i    +=    $width%4;
-
-                //    Reset horizontal position
-                $x    =    0;
-
-                //    Raise the height-position (bottom-up)
-                $y++;
-
-                //    Reached the image-height? Break the for-loop
-                if ($y>$height)
-                    break;
-            }
-
-            //    Calculation of the RGB-pixel (defined as BGR in image-data)
-            //    Define $i_pos as absolute position in the body
-            $i_pos    =    $i*2;
-            $r        =    hexdec($body[$i_pos+4].$body[$i_pos+5]);
-            $g        =    hexdec($body[$i_pos+2].$body[$i_pos+3]);
-            $b        =    hexdec($body[$i_pos].$body[$i_pos+1]);
-
-            //    Calculate and draw the pixel
-            $color    =    imagecolorallocate($image,$r,$g,$b);
-            imagesetpixel($image,$x,$height-$y,$color);
-
-            //    Raise the horizontal position
-            $x++;
-        }
-
-        //    Unset the body / free the memory
-        unset($body);
-
-        //    Return image-object
-        return $image;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher.php
deleted file mode 100644
index ddf68c65bd1..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Shared_Escher
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_Escher
-{
-	/**
-	 * Drawing Group Container
-	 *
-	 * @var PHPExcel_Shared_Escher_DggContainer
-	 */
-	private $_dggContainer;
-
-	/**
-	 * Drawing Container
-	 *
-	 * @var PHPExcel_Shared_Escher_DgContainer
-	 */
-	private $_dgContainer;
-
-	/**
-	 * Get Drawing Group Container
-	 *
-	 * @return PHPExcel_Shared_Escher_DgContainer
-	 */
-	public function getDggContainer()
-	{
-		return $this->_dggContainer;
-	}
-
-	/**
-	 * Set Drawing Group Container
-	 *
-	 * @param PHPExcel_Shared_Escher_DggContainer $dggContainer
-	 */
-	public function setDggContainer($dggContainer)
-	{
-		return $this->_dggContainer = $dggContainer;
-	}
-
-	/**
-	 * Get Drawing Container
-	 *
-	 * @return PHPExcel_Shared_Escher_DgContainer
-	 */
-	public function getDgContainer()
-	{
-		return $this->_dgContainer;
-	}
-
-	/**
-	 * Set Drawing Container
-	 *
-	 * @param PHPExcel_Shared_Escher_DgContainer $dgContainer
-	 */
-	public function setDgContainer($dgContainer)
-	{
-		return $this->_dgContainer = $dgContainer;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer.php
deleted file mode 100644
index cb826db109e..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Shared_Escher_DgContainer
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_Escher_DgContainer
-{
-	/**
-	 * Drawing index, 1-based.
-	 *
-	 * @var int
-	 */
-	private $_dgId;
-
-	/**
-	 * Last shape index in this drawing
-	 *
-	 * @var int
-	 */
-	private $_lastSpId;
-
-	private $_spgrContainer = null;
-
-	public function getDgId()
-	{
-		return $this->_dgId;
-	}
-
-	public function setDgId($value)
-	{
-		$this->_dgId = $value;
-	}
-
-	public function getLastSpId()
-	{
-		return $this->_lastSpId;
-	}
-
-	public function setLastSpId($value)
-	{
-		$this->_lastSpId = $value;
-	}
-
-	public function getSpgrContainer()
-	{
-		return $this->_spgrContainer;
-	}
-
-	public function setSpgrContainer($spgrContainer)
-	{
-		return $this->_spgrContainer = $spgrContainer;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php
deleted file mode 100644
index b8ad8eafd73..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Shared_Escher_DgContainer_SpgrContainer
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_Escher_DgContainer_SpgrContainer
-{
-	/**
-	 * Parent Shape Group Container
-	 *
-	 * @var PHPExcel_Shared_Escher_DgContainer_SpgrContainer
-	 */
-	private $_parent;
-
-	/**
-	 * Shape Container collection
-	 *
-	 * @var array
-	 */
-	private $_children = array();
-
-	/**
-	 * Set parent Shape Group Container
-	 *
-	 * @param PHPExcel_Shared_Escher_DgContainer_SpgrContainer $parent
-	 */
-	public function setParent($parent)
-	{
-		$this->_parent = $parent;
-	}
-
-	/**
-	 * Get the parent Shape Group Container if any
-	 *
-	 * @return PHPExcel_Shared_Escher_DgContainer_SpgrContainer|null
-	 */
-	public function getParent()
-	{
-		return $this->_parent;
-	}
-
-	/**
-	 * Add a child. This will be either spgrContainer or spContainer
-	 *
-	 * @param mixed $child
-	 */
-	public function addChild($child)
-	{
-		$this->_children[] = $child;
-		$child->setParent($this);
-	}
-
-	/**
-	 * Get collection of Shape Containers
-	 */
-	public function getChildren()
-	{
-		return $this->_children;
-	}
-
-	/**
-	 * Recursively get all spContainers within this spgrContainer
-	 *
-	 * @return PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer[]
-	 */
-	public function getAllSpContainers()
-	{
-		$allSpContainers = array();
-
-		foreach ($this->_children as $child) {
-			if ($child instanceof PHPExcel_Shared_Escher_DgContainer_SpgrContainer) {
-				$allSpContainers = array_merge($allSpContainers, $child->getAllSpContainers());
-			} else {
-				$allSpContainers[] = $child;
-			}
-		}
-
-		return $allSpContainers;
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
deleted file mode 100644
index 68231480188..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
+++ /dev/null
@@ -1,395 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer
-{
-	/**
-	 * Parent Shape Group Container
-	 *
-	 * @var PHPExcel_Shared_Escher_DgContainer_SpgrContainer
-	 */
-	private $_parent;
-
-	/**
-	 * Is this a group shape?
-	 *
-	 * @var boolean
-	 */
-	private $_spgr = false;
-
-	/**
-	 * Shape type
-	 *
-	 * @var int
-	 */
-	private $_spType;
-
-	/**
-	 * Shape flag
-	 *
-	 * @var int
-	 */
-	private $_spFlag;
-
-	/**
-	 * Shape index (usually group shape has index 0, and the rest: 1,2,3...)
-	 *
-	 * @var boolean
-	 */
-	private $_spId;
-
-	/**
-	 * Array of options
-	 *
-	 * @var array
-	 */
-	private $_OPT;
-
-	/**
-	 * Cell coordinates of upper-left corner of shape, e.g. 'A1'
-	 *
-	 * @var string
-	 */
-	private $_startCoordinates;
-
-	/**
-	 * Horizontal offset of upper-left corner of shape measured in 1/1024 of column width
-	 *
-	 * @var int
-	 */
-	private $_startOffsetX;
-
-	/**
-	 * Vertical offset of upper-left corner of shape measured in 1/256 of row height
-	 *
-	 * @var int
-	 */
-	private $_startOffsetY;
-
-	/**
-	 * Cell coordinates of bottom-right corner of shape, e.g. 'B2'
-	 *
-	 * @var string
-	 */
-	private $_endCoordinates;
-
-	/**
-	 * Horizontal offset of bottom-right corner of shape measured in 1/1024 of column width
-	 *
-	 * @var int
-	 */
-	private $_endOffsetX;
-
-	/**
-	 * Vertical offset of bottom-right corner of shape measured in 1/256 of row height
-	 *
-	 * @var int
-	 */
-	private $_endOffsetY;
-
-	/**
-	 * Set parent Shape Group Container
-	 *
-	 * @param PHPExcel_Shared_Escher_DgContainer_SpgrContainer $parent
-	 */
-	public function setParent($parent)
-	{
-		$this->_parent = $parent;
-	}
-
-	/**
-	 * Get the parent Shape Group Container
-	 *
-	 * @return PHPExcel_Shared_Escher_DgContainer_SpgrContainer
-	 */
-	public function getParent()
-	{
-		return $this->_parent;
-	}
-
-	/**
-	 * Set whether this is a group shape
-	 *
-	 * @param boolean $value
-	 */
-	public function setSpgr($value = false)
-	{
-		$this->_spgr = $value;
-	}
-
-	/**
-	 * Get whether this is a group shape
-	 *
-	 * @return boolean
-	 */
-	public function getSpgr()
-	{
-		return $this->_spgr;
-	}
-
-	/**
-	 * Set the shape type
-	 *
-	 * @param int $value
-	 */
-	public function setSpType($value)
-	{
-		$this->_spType = $value;
-	}
-
-	/**
-	 * Get the shape type
-	 *
-	 * @return int
-	 */
-	public function getSpType()
-	{
-		return $this->_spType;
-	}
-
-	/**
-	 * Set the shape flag
-	 *
-	 * @param int $value
-	 */
-	public function setSpFlag($value)
-	{
-		$this->_spFlag = $value;
-	}
-
-	/**
-	 * Get the shape flag
-	 *
-	 * @return int
-	 */
-	public function getSpFlag()
-	{
-		return $this->_spFlag;
-	}
-
-	/**
-	 * Set the shape index
-	 *
-	 * @param int $value
-	 */
-	public function setSpId($value)
-	{
-		$this->_spId = $value;
-	}
-
-	/**
-	 * Get the shape index
-	 *
-	 * @return int
-	 */
-	public function getSpId()
-	{
-		return $this->_spId;
-	}
-
-	/**
-	 * Set an option for the Shape Group Container
-	 *
-	 * @param int $property The number specifies the option
-	 * @param mixed $value
-	 */
-	public function setOPT($property, $value)
-	{
-		$this->_OPT[$property] = $value;
-	}
-
-	/**
-	 * Get an option for the Shape Group Container
-	 *
-	 * @param int $property The number specifies the option
-	 * @return mixed
-	 */
-	public function getOPT($property)
-	{
-		if (isset($this->_OPT[$property])) {
-			return $this->_OPT[$property];
-		}
-		return null;
-	}
-
-	/**
-	 * Get the collection of options
-	 *
-	 * @return array
-	 */
-	public function getOPTCollection()
-	{
-		return $this->_OPT;
-	}
-
-	/**
-	 * Set cell coordinates of upper-left corner of shape
-	 *
-	 * @param string $value
-	 */
-	public function setStartCoordinates($value = 'A1')
-	{
-		$this->_startCoordinates = $value;
-	}
-
-	/**
-	 * Get cell coordinates of upper-left corner of shape
-	 *
-	 * @return string
-	 */
-	public function getStartCoordinates()
-	{
-		return $this->_startCoordinates;
-	}
-
-	/**
-	 * Set offset in x-direction of upper-left corner of shape measured in 1/1024 of column width
-	 *
-	 * @param int $startOffsetX
-	 */
-	public function setStartOffsetX($startOffsetX = 0)
-	{
-		$this->_startOffsetX = $startOffsetX;
-	}
-
-	/**
-	 * Get offset in x-direction of upper-left corner of shape measured in 1/1024 of column width
-	 *
-	 * @return int
-	 */
-	public function getStartOffsetX()
-	{
-		return $this->_startOffsetX;
-	}
-
-	/**
-	 * Set offset in y-direction of upper-left corner of shape measured in 1/256 of row height
-	 *
-	 * @param int $startOffsetY
-	 */
-	public function setStartOffsetY($startOffsetY = 0)
-	{
-		$this->_startOffsetY = $startOffsetY;
-	}
-
-	/**
-	 * Get offset in y-direction of upper-left corner of shape measured in 1/256 of row height
-	 *
-	 * @return int
-	 */
-	public function getStartOffsetY()
-	{
-		return $this->_startOffsetY;
-	}
-
-	/**
-	 * Set cell coordinates of bottom-right corner of shape
-	 *
-	 * @param string $value
-	 */
-	public function setEndCoordinates($value = 'A1')
-	{
-		$this->_endCoordinates = $value;
-	}
-
-	/**
-	 * Get cell coordinates of bottom-right corner of shape
-	 *
-	 * @return string
-	 */
-	public function getEndCoordinates()
-	{
-		return $this->_endCoordinates;
-	}
-
-	/**
-	 * Set offset in x-direction of bottom-right corner of shape measured in 1/1024 of column width
-	 *
-	 * @param int $startOffsetX
-	 */
-	public function setEndOffsetX($endOffsetX = 0)
-	{
-		$this->_endOffsetX = $endOffsetX;
-	}
-
-	/**
-	 * Get offset in x-direction of bottom-right corner of shape measured in 1/1024 of column width
-	 *
-	 * @return int
-	 */
-	public function getEndOffsetX()
-	{
-		return $this->_endOffsetX;
-	}
-
-	/**
-	 * Set offset in y-direction of bottom-right corner of shape measured in 1/256 of row height
-	 *
-	 * @param int $endOffsetY
-	 */
-	public function setEndOffsetY($endOffsetY = 0)
-	{
-		$this->_endOffsetY = $endOffsetY;
-	}
-
-	/**
-	 * Get offset in y-direction of bottom-right corner of shape measured in 1/256 of row height
-	 *
-	 * @return int
-	 */
-	public function getEndOffsetY()
-	{
-		return $this->_endOffsetY;
-	}
-
-	/**
-	 * Get the nesting level of this spContainer. This is the number of spgrContainers between this spContainer and
-	 * the dgContainer. A value of 1 = immediately within first spgrContainer
-	 * Higher nesting level occurs if and only if spContainer is part of a shape group
-	 *
-	 * @return int Nesting level
-	 */
-	public function getNestingLevel()
-	{
-		$nestingLevel = 0;
-
-		$parent = $this->getParent();
-		while ($parent instanceof PHPExcel_Shared_Escher_DgContainer_SpgrContainer) {
-			++$nestingLevel;
-			$parent = $parent->getParent();
-		}
-
-		return $nestingLevel;
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer.php
deleted file mode 100644
index 26696ec9db3..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Shared_Escher_DggContainer
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_Escher_DggContainer
-{
-	/**
-	 * Maximum shape index of all shapes in all drawings increased by one
-	 *
-	 * @var int
-	 */
-	private $_spIdMax;
-
-	/**
-	 * Total number of drawings saved
-	 *
-	 * @var int
-	 */
-	private $_cDgSaved;
-
-	/**
-	 * Total number of shapes saved (including group shapes)
-	 *
-	 * @var int
-	 */
-	private $_cSpSaved;
-
-	/**
-	 * BLIP Store Container
-	 *
-	 * @var PHPExcel_Shared_Escher_DggContainer_BstoreContainer
-	 */
-	private $_bstoreContainer;
-
-	/**
-	 * Array of options for the drawing group
-	 *
-	 * @var array
-	 */
-	private $_OPT = array();
-
-	/**
-	 * Array of identifier clusters containg information about the maximum shape identifiers
-	 *
-	 * @var array
-	 */
-	private $_IDCLs = array();
-
-	/**
-	 * Get maximum shape index of all shapes in all drawings (plus one)
-	 *
-	 * @return int
-	 */
-	public function getSpIdMax()
-	{
-		return $this->_spIdMax;
-	}
-
-	/**
-	 * Set maximum shape index of all shapes in all drawings (plus one)
-	 *
-	 * @param int
-	 */
-	public function setSpIdMax($value)
-	{
-		$this->_spIdMax = $value;
-	}
-
-	/**
-	 * Get total number of drawings saved
-	 *
-	 * @return int
-	 */
-	public function getCDgSaved()
-	{
-		return $this->_cDgSaved;
-	}
-
-	/**
-	 * Set total number of drawings saved
-	 *
-	 * @param int
-	 */
-	public function setCDgSaved($value)
-	{
-		$this->_cDgSaved = $value;
-	}
-
-	/**
-	 * Get total number of shapes saved (including group shapes)
-	 *
-	 * @return int
-	 */
-	public function getCSpSaved()
-	{
-		return $this->_cSpSaved;
-	}
-
-	/**
-	 * Set total number of shapes saved (including group shapes)
-	 *
-	 * @param int
-	 */
-	public function setCSpSaved($value)
-	{
-		$this->_cSpSaved = $value;
-	}
-
-	/**
-	 * Get BLIP Store Container
-	 *
-	 * @return PHPExcel_Shared_Escher_DggContainer_BstoreContainer
-	 */
-	public function getBstoreContainer()
-	{
-		return $this->_bstoreContainer;
-	}
-
-	/**
-	 * Set BLIP Store Container
-	 *
-	 * @param PHPExcel_Shared_Escher_DggContainer_BstoreContainer $bstoreContainer
-	 */
-	public function setBstoreContainer($bstoreContainer)
-	{
-		$this->_bstoreContainer = $bstoreContainer;
-	}
-
-	/**
-	 * Set an option for the drawing group
-	 *
-	 * @param int $property The number specifies the option
-	 * @param mixed $value
-	 */
-	public function setOPT($property, $value)
-	{
-		$this->_OPT[$property] = $value;
-	}
-
-	/**
-	 * Get an option for the drawing group
-	 *
-	 * @param int $property The number specifies the option
-	 * @return mixed
-	 */
-	public function getOPT($property)
-	{
-		if (isset($this->_OPT[$property])) {
-			return $this->_OPT[$property];
-		}
-		return null;
-	}
-
-	/**
-	 * Get identifier clusters
-	 *
-	 * @return array
-	 */
-	public function getIDCLs()
-	{
-		return $this->_IDCLs;
-	}
-
-	/**
-	 * Set identifier clusters. array(<drawingId> => <max shape id>, ...)
-	 *
-	 * @param array $pValue
-	 */
-	public function setIDCLs($pValue)
-	{
-		$this->_IDCLs = $pValue;
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php
deleted file mode 100644
index fba2e73fa2c..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Shared_Escher_DggContainer_BstoreContainer
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_Escher_DggContainer_BstoreContainer
-{
-	/**
-	 * BLIP Store Entries. Each of them holds one BLIP (Big Large Image or Picture)
-	 *
-	 * @var array
-	 */
-	private $_BSECollection = array();
-
-	/**
-	 * Add a BLIP Store Entry
-	 *
-	 * @param PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE $BSE
-	 */
-	public function addBSE($BSE)
-	{
-		$this->_BSECollection[] = $BSE;
-		$BSE->setParent($this);
-	}
-
-	/**
-	 * Get the collection of BLIP Store Entries
-	 *
-	 * @return PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE[]
-	 */
-	public function getBSECollection()
-	{
-		return $this->_BSECollection;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php
deleted file mode 100644
index 418896a3419..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE
-{
-	const BLIPTYPE_ERROR	= 0x00;
-	const BLIPTYPE_UNKNOWN	= 0x01;
-	const BLIPTYPE_EMF		= 0x02;
-	const BLIPTYPE_WMF		= 0x03;
-	const BLIPTYPE_PICT		= 0x04;
-	const BLIPTYPE_JPEG		= 0x05;
-	const BLIPTYPE_PNG		= 0x06;
-	const BLIPTYPE_DIB		= 0x07;
-	const BLIPTYPE_TIFF		= 0x11;
-	const BLIPTYPE_CMYKJPEG	= 0x12;
-
-	/**
-	 * The parent BLIP Store Entry Container
-	 *
-	 * @var PHPExcel_Shared_Escher_DggContainer_BstoreContainer
-	 */
-	private $_parent;
-
-	/**
-	 * The BLIP (Big Large Image or Picture)
-	 *
-	 * @var PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip
-	 */
-	private $_blip;
-
-	/**
-	 * The BLIP type
-	 *
-	 * @var int
-	 */
-	private $_blipType;
-
-	/**
-	 * Set parent BLIP Store Entry Container
-	 *
-	 * @param PHPExcel_Shared_Escher_DggContainer_BstoreContainer $parent
-	 */
-	public function setParent($parent)
-	{
-		$this->_parent = $parent;
-	}
-
-	/**
-	 * Get the BLIP
-	 *
-	 * @return PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip
-	 */
-	public function getBlip()
-	{
-		return $this->_blip;
-	}
-
-	/**
-	 * Set the BLIP
-	 *
-	 * @param PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip $blip
-	 */
-	public function setBlip($blip)
-	{
-		$this->_blip = $blip;
-		$blip->setParent($this);
-	}
-
-	/**
-	 * Get the BLIP type
-	 *
-	 * @return int
-	 */
-	public function getBlipType()
-	{
-		return $this->_blipType;
-	}
-
-	/**
-	 * Set the BLIP type
-	 *
-	 * @param int
-	 */
-	public function setBlipType($blipType)
-	{
-		$this->_blipType = $blipType;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
deleted file mode 100644
index d9cc2f5c086..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip
-{
-	/**
-	 * The parent BSE
-	 *
-	 * @var PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE
-	 */
-	private $_parent;
-
-	/**
-	 * Raw image data
-	 *
-	 * @var string
-	 */
-	private $_data;
-
-	/**
-	 * Get the raw image data
-	 *
-	 * @return string
-	 */
-	public function getData()
-	{
-		return $this->_data;
-	}
-
-	/**
-	 * Set the raw image data
-	 *
-	 * @param string
-	 */
-	public function setData($data)
-	{
-		$this->_data = $data;
-	}
-
-	/**
-	 * Set parent BSE
-	 *
-	 * @param PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE $parent
-	 */
-	public function setParent($parent)
-	{
-		$this->_parent = $parent;
-	}
-
-	/**
-	 * Get parent BSE
-	 *
-	 * @return PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE $parent
-	 */
-	public function getParent()
-	{
-		return $this->_parent;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Excel5.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Excel5.php
deleted file mode 100644
index 3caf675dd43..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Excel5.php
+++ /dev/null
@@ -1,317 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Shared_Excel5
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_Excel5
-{
-	/**
-	 * Get the width of a column in pixels. We use the relationship y = ceil(7x) where
-	 * x is the width in intrinsic Excel units (measuring width in number of normal characters)
-	 * This holds for Arial 10
-	 *
-	 * @param PHPExcel_Worksheet $sheet The sheet
-	 * @param string $col The column
-	 * @return integer The width in pixels
-	*/
-	public static function sizeCol($sheet, $col = 'A')
-	{
-		// default font of the workbook
-		$font = $sheet->getParent()->getDefaultStyle()->getFont();
-
-		$columnDimensions = $sheet->getColumnDimensions();
-
-		// first find the true column width in pixels (uncollapsed and unhidden)
-		if ( isset($columnDimensions[$col]) and $columnDimensions[$col]->getWidth() != -1 ) {
-
-			// then we have column dimension with explicit width
-			$columnDimension = $columnDimensions[$col];
-			$width = $columnDimension->getWidth();
-			$pixelWidth = PHPExcel_Shared_Drawing::cellDimensionToPixels($width, $font);
-
-		} else if ($sheet->getDefaultColumnDimension()->getWidth() != -1) {
-
-			// then we have default column dimension with explicit width
-			$defaultColumnDimension = $sheet->getDefaultColumnDimension();
-			$width = $defaultColumnDimension->getWidth();
-			$pixelWidth = PHPExcel_Shared_Drawing::cellDimensionToPixels($width, $font);
-
-		} else {
-
-			// we don't even have any default column dimension. Width depends on default font
-			$pixelWidth = PHPExcel_Shared_Font::getDefaultColumnWidthByFont($font, true);
-		}
-
-		// now find the effective column width in pixels
-		if (isset($columnDimensions[$col]) and !$columnDimensions[$col]->getVisible()) {
-			$effectivePixelWidth = 0;
-		} else {
-			$effectivePixelWidth = $pixelWidth;
-		}
-
-		return $effectivePixelWidth;
-	}
-
-	/**
-	 * Convert the height of a cell from user's units to pixels. By interpolation
-	 * the relationship is: y = 4/3x. If the height hasn't been set by the user we
-	 * use the default value. If the row is hidden we use a value of zero.
-	 *
-	 * @param PHPExcel_Worksheet $sheet The sheet
-	 * @param integer $row The row index (1-based)
-	 * @return integer The width in pixels
-	 */
-	public static function sizeRow($sheet, $row = 1)
-	{
-		// default font of the workbook
-		$font = $sheet->getParent()->getDefaultStyle()->getFont();
-
-		$rowDimensions = $sheet->getRowDimensions();
-
-		// first find the true row height in pixels (uncollapsed and unhidden)
-		if ( isset($rowDimensions[$row]) and $rowDimensions[$row]->getRowHeight() != -1) {
-
-			// then we have a row dimension
-			$rowDimension = $rowDimensions[$row];
-			$rowHeight = $rowDimension->getRowHeight();
-			$pixelRowHeight = (int) ceil(4 * $rowHeight / 3); // here we assume Arial 10
-
-		} else if ($sheet->getDefaultRowDimension()->getRowHeight() != -1) {
-
-			// then we have a default row dimension with explicit height
-			$defaultRowDimension = $sheet->getDefaultRowDimension();
-			$rowHeight = $defaultRowDimension->getRowHeight();
-			$pixelRowHeight = PHPExcel_Shared_Drawing::pointsToPixels($rowHeight);
-
-		} else {
-
-			// we don't even have any default row dimension. Height depends on default font
-			$pointRowHeight = PHPExcel_Shared_Font::getDefaultRowHeightByFont($font);
-			$pixelRowHeight = PHPExcel_Shared_Font::fontSizeToPixels($pointRowHeight);
-
-		}
-
-		// now find the effective row height in pixels
-		if ( isset($rowDimensions[$row]) and !$rowDimensions[$row]->getVisible() ) {
-			$effectivePixelRowHeight = 0;
-		} else {
-			$effectivePixelRowHeight = $pixelRowHeight;
-		}
-
-		return $effectivePixelRowHeight;
-	}
-
-	/**
-	 * Get the horizontal distance in pixels between two anchors
-	 * The distanceX is found as sum of all the spanning columns widths minus correction for the two offsets
-	 *
-	 * @param PHPExcel_Worksheet $sheet
-	 * @param string $startColumn
-	 * @param integer $startOffsetX Offset within start cell measured in 1/1024 of the cell width
-	 * @param string $endColumn
-	 * @param integer $endOffsetX Offset within end cell measured in 1/1024 of the cell width
-	 * @return integer Horizontal measured in pixels
-	 */
-	public static function getDistanceX(PHPExcel_Worksheet $sheet, $startColumn = 'A', $startOffsetX = 0, $endColumn = 'A', $endOffsetX = 0)
-	{
-		$distanceX = 0;
-
-		// add the widths of the spanning columns
-		$startColumnIndex = PHPExcel_Cell::columnIndexFromString($startColumn) - 1; // 1-based
-		$endColumnIndex = PHPExcel_Cell::columnIndexFromString($endColumn) - 1; // 1-based
-		for ($i = $startColumnIndex; $i <= $endColumnIndex; ++$i) {
-			$distanceX += self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($i));
-		}
-
-		// correct for offsetX in startcell
-		$distanceX -= (int) floor(self::sizeCol($sheet, $startColumn) * $startOffsetX / 1024);
-
-		// correct for offsetX in endcell
-		$distanceX -= (int) floor(self::sizeCol($sheet, $endColumn) * (1 - $endOffsetX / 1024));
-
-		return $distanceX;
-	}
-
-	/**
-	 * Get the vertical distance in pixels between two anchors
-	 * The distanceY is found as sum of all the spanning rows minus two offsets
-	 *
-	 * @param PHPExcel_Worksheet $sheet
-	 * @param integer $startRow (1-based)
-	 * @param integer $startOffsetY Offset within start cell measured in 1/256 of the cell height
-	 * @param integer $endRow (1-based)
-	 * @param integer $endOffsetY Offset within end cell measured in 1/256 of the cell height
-	 * @return integer Vertical distance measured in pixels
-	 */
-	public static function getDistanceY(PHPExcel_Worksheet $sheet, $startRow = 1, $startOffsetY = 0, $endRow = 1, $endOffsetY = 0)
-	{
-		$distanceY = 0;
-
-		// add the widths of the spanning rows
-		for ($row = $startRow; $row <= $endRow; ++$row) {
-			$distanceY += self::sizeRow($sheet, $row);
-		}
-
-		// correct for offsetX in startcell
-		$distanceY -= (int) floor(self::sizeRow($sheet, $startRow) * $startOffsetY / 256);
-
-		// correct for offsetX in endcell
-		$distanceY -= (int) floor(self::sizeRow($sheet, $endRow) * (1 - $endOffsetY / 256));
-
-		return $distanceY;
-	}
-
-	/**
-	 * Convert 1-cell anchor coordinates to 2-cell anchor coordinates
-	 * This function is ported from PEAR Spreadsheet_Writer_Excel with small modifications
-	 *
-	 * Calculate the vertices that define the position of the image as required by
-	 * the OBJ record.
-	 *
-	 *		 +------------+------------+
-	 *		 |	 A	  |	  B	 |
-	 *   +-----+------------+------------+
-	 *   |	 |(x1,y1)	 |			|
-	 *   |  1  |(A1)._______|______	  |
-	 *   |	 |	|			  |	 |
-	 *   |	 |	|			  |	 |
-	 *   +-----+----|	BITMAP	|-----+
-	 *   |	 |	|			  |	 |
-	 *   |  2  |	|______________.	 |
-	 *   |	 |			|		(B2)|
-	 *   |	 |			|	 (x2,y2)|
-	 *   +---- +------------+------------+
-	 *
-	 * Example of a bitmap that covers some of the area from cell A1 to cell B2.
-	 *
-	 * Based on the width and height of the bitmap we need to calculate 8 vars:
-	 *	 $col_start, $row_start, $col_end, $row_end, $x1, $y1, $x2, $y2.
-	 * The width and height of the cells are also variable and have to be taken into
-	 * account.
-	 * The values of $col_start and $row_start are passed in from the calling
-	 * function. The values of $col_end and $row_end are calculated by subtracting
-	 * the width and height of the bitmap from the width and height of the
-	 * underlying cells.
-	 * The vertices are expressed as a percentage of the underlying cell width as
-	 * follows (rhs values are in pixels):
-	 *
-	 *	   x1 = X / W *1024
-	 *	   y1 = Y / H *256
-	 *	   x2 = (X-1) / W *1024
-	 *	   y2 = (Y-1) / H *256
-	 *
-	 *	   Where:  X is distance from the left side of the underlying cell
-	 *			   Y is distance from the top of the underlying cell
-	 *			   W is the width of the cell
-	 *			   H is the height of the cell
-	 *
-	 * @param PHPExcel_Worksheet $sheet
-	 * @param string $coordinates E.g. 'A1'
-	 * @param integer $offsetX Horizontal offset in pixels
-	 * @param integer $offsetY Vertical offset in pixels
-	 * @param integer $width Width in pixels
-	 * @param integer $height Height in pixels
-	 * @return array
-	 */
-	public static function oneAnchor2twoAnchor($sheet, $coordinates, $offsetX, $offsetY, $width, $height)
-	{
-		list($column, $row) = PHPExcel_Cell::coordinateFromString($coordinates);
-		$col_start = PHPExcel_Cell::columnIndexFromString($column) - 1;
-		$row_start = $row - 1;
-
-		$x1 = $offsetX;
-		$y1 = $offsetY;
-
-		// Initialise end cell to the same as the start cell
-		$col_end	= $col_start;  // Col containing lower right corner of object
-		$row_end	= $row_start;  // Row containing bottom right corner of object
-
-		// Zero the specified offset if greater than the cell dimensions
-		if ($x1 >= self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_start))) {
-			$x1 = 0;
-		}
-		if ($y1 >= self::sizeRow($sheet, $row_start + 1)) {
-			$y1 = 0;
-		}
-
-		$width	  = $width  + $x1 -1;
-		$height	 = $height + $y1 -1;
-
-		// Subtract the underlying cell widths to find the end cell of the image
-		while ($width >= self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_end))) {
-			$width -= self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_end));
-			++$col_end;
-		}
-
-		// Subtract the underlying cell heights to find the end cell of the image
-		while ($height >= self::sizeRow($sheet, $row_end + 1)) {
-			$height -= self::sizeRow($sheet, $row_end + 1);
-			++$row_end;
-		}
-
-		// Bitmap isn't allowed to start or finish in a hidden cell, i.e. a cell
-		// with zero height or width.
-		if (self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_start)) == 0) {
-			return;
-		}
-		if (self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_end))   == 0) {
-			return;
-		}
-		if (self::sizeRow($sheet, $row_start + 1) == 0) {
-			return;
-		}
-		if (self::sizeRow($sheet, $row_end + 1)   == 0) {
-			return;
-		}
-
-		// Convert the pixel values to the percentage value expected by Excel
-		$x1 = $x1	 / self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_start))   * 1024;
-		$y1 = $y1	 / self::sizeRow($sheet, $row_start + 1)   *  256;
-		$x2 = ($width + 1)  / self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_end))	 * 1024; // Distance to right side of object
-		$y2 = ($height + 1) / self::sizeRow($sheet, $row_end + 1)	 *  256; // Distance to bottom of object
-
-		$startCoordinates = PHPExcel_Cell::stringFromColumnIndex($col_start) . ($row_start + 1);
-		$endCoordinates = PHPExcel_Cell::stringFromColumnIndex($col_end) . ($row_end + 1);
-
-		$twoAnchor = array(
-			'startCoordinates' => $startCoordinates,
-			'startOffsetX' => $x1,
-			'startOffsetY' => $y1,
-			'endCoordinates' => $endCoordinates,
-			'endOffsetX' => $x2,
-			'endOffsetY' => $y2,
-		);
-
-		return  $twoAnchor;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/File.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/File.php
deleted file mode 100644
index 52c9b9796f7..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/File.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Shared_File
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_File
-{
-	/*
-	 * Use Temp or File Upload Temp for temporary files
-	 *
-	 * @protected
-	 * @var	boolean
-	 */
-	protected static $_useUploadTempDirectory	= FALSE;
-
-
-	/**
-	 * Set the flag indicating whether the File Upload Temp directory should be used for temporary files
-	 *
-	 * @param	 boolean	$useUploadTempDir		Use File Upload Temporary directory (true or false)
-	 */
-	public static function setUseUploadTempDirectory($useUploadTempDir = FALSE) {
-		self::$_useUploadTempDirectory = (boolean) $useUploadTempDir;
-	}	//	function setUseUploadTempDirectory()
-
-
-	/**
-	 * Get the flag indicating whether the File Upload Temp directory should be used for temporary files
-	 *
-	 * @return	 boolean	Use File Upload Temporary directory (true or false)
-	 */
-	public static function getUseUploadTempDirectory() {
-		return self::$_useUploadTempDirectory;
-	}	//	function getUseUploadTempDirectory()
-
-
-	/**
-	  * Verify if a file exists
-	  *
-	  * @param 	string	$pFilename	Filename
-	  * @return bool
-	  */
-	public static function file_exists($pFilename) {
-		// Sick construction, but it seems that
-		// file_exists returns strange values when
-		// doing the original file_exists on ZIP archives...
-		if ( strtolower(substr($pFilename, 0, 3)) == 'zip' ) {
-			// Open ZIP file and verify if the file exists
-			$zipFile 		= substr($pFilename, 6, strpos($pFilename, '#') - 6);
-			$archiveFile 	= substr($pFilename, strpos($pFilename, '#') + 1);
-
-			$zip = new ZipArchive();
-			if ($zip->open($zipFile) === true) {
-				$returnValue = ($zip->getFromName($archiveFile) !== false);
-				$zip->close();
-				return $returnValue;
-			} else {
-				return false;
-			}
-		} else {
-			// Regular file_exists
-			return file_exists($pFilename);
-		}
-	}
-
-	/**
-	 * Returns canonicalized absolute pathname, also for ZIP archives
-	 *
-	 * @param string $pFilename
-	 * @return string
-	 */
-	public static function realpath($pFilename) {
-		// Returnvalue
-		$returnValue = '';
-
-		// Try using realpath()
-		if (file_exists($pFilename)) {
-			$returnValue = realpath($pFilename);
-		}
-
-		// Found something?
-		if ($returnValue == '' || ($returnValue === NULL)) {
-			$pathArray = explode('/' , $pFilename);
-			while(in_array('..', $pathArray) && $pathArray[0] != '..') {
-				for ($i = 0; $i < count($pathArray); ++$i) {
-					if ($pathArray[$i] == '..' && $i > 0) {
-						unset($pathArray[$i]);
-						unset($pathArray[$i - 1]);
-						break;
-					}
-				}
-			}
-			$returnValue = implode('/', $pathArray);
-		}
-
-		// Return
-		return $returnValue;
-	}
-
-	/**
-	 * Get the systems temporary directory.
-	 *
-	 * @return string
-	 */
-	public static function sys_get_temp_dir()
-	{
-		if (self::$_useUploadTempDirectory) {
-			//  use upload-directory when defined to allow running on environments having very restricted
-			//      open_basedir configs
-			if (ini_get('upload_tmp_dir') !== FALSE) {
-				if ($temp = ini_get('upload_tmp_dir')) {
-					if (file_exists($temp))
-						return realpath($temp);
-				}
-			}
-		}
-
-		// sys_get_temp_dir is only available since PHP 5.2.1
-		// http://php.net/manual/en/function.sys-get-temp-dir.php#94119
-		if ( !function_exists('sys_get_temp_dir')) {
-			if ($temp = getenv('TMP') ) {
-				if ((!empty($temp)) && (file_exists($temp))) { return realpath($temp); }
-			}
-			if ($temp = getenv('TEMP') ) {
-				if ((!empty($temp)) && (file_exists($temp))) { return realpath($temp); }
-			}
-			if ($temp = getenv('TMPDIR') ) {
-				if ((!empty($temp)) && (file_exists($temp))) { return realpath($temp); }
-			}
-
-			// trick for creating a file in system's temporary dir
-			// without knowing the path of the system's temporary dir
-			$temp = tempnam(__FILE__, '');
-			if (file_exists($temp)) {
-				unlink($temp);
-				return realpath(dirname($temp));
-			}
-
-			return null;
-		}
-
-		// use ordinary built-in PHP function
-		//	There should be no problem with the 5.2.4 Suhosin realpath() bug, because this line should only
-		//		be called if we're running 5.2.1 or earlier
-		return realpath(sys_get_temp_dir());
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Font.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Font.php
deleted file mode 100644
index 8e5b27b8fc1..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Font.php
+++ /dev/null
@@ -1,773 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Shared_Font
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_Font
-{
-	/* Methods for resolving autosize value */
-	const AUTOSIZE_METHOD_APPROX	= 'approx';
-	const AUTOSIZE_METHOD_EXACT		= 'exact';
-
-	private static $_autoSizeMethods = array(
-		self::AUTOSIZE_METHOD_APPROX,
-		self::AUTOSIZE_METHOD_EXACT,
-	);
-
-	/** Character set codes used by BIFF5-8 in Font records */
-	const CHARSET_ANSI_LATIN				= 0x00;
-	const CHARSET_SYSTEM_DEFAULT			= 0x01;
-	const CHARSET_SYMBOL					= 0x02;
-	const CHARSET_APPLE_ROMAN				= 0x4D;
-	const CHARSET_ANSI_JAPANESE_SHIFTJIS	= 0x80;
-	const CHARSET_ANSI_KOREAN_HANGUL		= 0x81;
-	const CHARSET_ANSI_KOREAN_JOHAB			= 0x82;
-	const CHARSET_ANSI_CHINESE_SIMIPLIFIED	= 0x86;		//	gb2312
-	const CHARSET_ANSI_CHINESE_TRADITIONAL	= 0x88;		//	big5
-	const CHARSET_ANSI_GREEK				= 0xA1;
-	const CHARSET_ANSI_TURKISH				= 0xA2;
-	const CHARSET_ANSI_VIETNAMESE			= 0xA3;
-	const CHARSET_ANSI_HEBREW				= 0xB1;
-	const CHARSET_ANSI_ARABIC				= 0xB2;
-	const CHARSET_ANSI_BALTIC				= 0xBA;
-	const CHARSET_ANSI_CYRILLIC				= 0xCC;
-	const CHARSET_ANSI_THAI					= 0xDD;
-	const CHARSET_ANSI_LATIN_II				= 0xEE;
-	const CHARSET_OEM_LATIN_I				= 0xFF;
-
-	//  XXX: Constants created!
-	/** Font filenames */
-	const ARIAL								= 'arial.ttf';
-	const ARIAL_BOLD						= 'arialbd.ttf';
-	const ARIAL_ITALIC						= 'ariali.ttf';
-	const ARIAL_BOLD_ITALIC					= 'arialbi.ttf';
-
-	const CALIBRI							= 'CALIBRI.TTF';
-	const CALIBRI_BOLD						= 'CALIBRIB.TTF';
-	const CALIBRI_ITALIC					= 'CALIBRII.TTF';
-	const CALIBRI_BOLD_ITALIC				= 'CALIBRIZ.TTF';
-
-	const COMIC_SANS_MS						= 'comic.ttf';
-	const COMIC_SANS_MS_BOLD				= 'comicbd.ttf';
-
-	const COURIER_NEW						= 'cour.ttf';
-	const COURIER_NEW_BOLD					= 'courbd.ttf';
-	const COURIER_NEW_ITALIC				= 'couri.ttf';
-	const COURIER_NEW_BOLD_ITALIC			= 'courbi.ttf';
-
-	const GEORGIA							= 'georgia.ttf';
-	const GEORGIA_BOLD						= 'georgiab.ttf';
-	const GEORGIA_ITALIC					= 'georgiai.ttf';
-	const GEORGIA_BOLD_ITALIC				= 'georgiaz.ttf';
-
-	const IMPACT							= 'impact.ttf';
-
-	const LIBERATION_SANS					= 'LiberationSans-Regular.ttf';
-	const LIBERATION_SANS_BOLD				= 'LiberationSans-Bold.ttf';
-	const LIBERATION_SANS_ITALIC			= 'LiberationSans-Italic.ttf';
-	const LIBERATION_SANS_BOLD_ITALIC		= 'LiberationSans-BoldItalic.ttf';
-
-	const LUCIDA_CONSOLE					= 'lucon.ttf';
-	const LUCIDA_SANS_UNICODE				= 'l_10646.ttf';
-
-	const MICROSOFT_SANS_SERIF				= 'micross.ttf';
-
-	const PALATINO_LINOTYPE					= 'pala.ttf';
-	const PALATINO_LINOTYPE_BOLD			= 'palab.ttf';
-	const PALATINO_LINOTYPE_ITALIC			= 'palai.ttf';
-	const PALATINO_LINOTYPE_BOLD_ITALIC		= 'palabi.ttf';
-
-	const SYMBOL							= 'symbol.ttf';
-
-	const TAHOMA							= 'tahoma.ttf';
-	const TAHOMA_BOLD						= 'tahomabd.ttf';
-
-	const TIMES_NEW_ROMAN					= 'times.ttf';
-	const TIMES_NEW_ROMAN_BOLD				= 'timesbd.ttf';
-	const TIMES_NEW_ROMAN_ITALIC			= 'timesi.ttf';
-	const TIMES_NEW_ROMAN_BOLD_ITALIC		= 'timesbi.ttf';
-
-	const TREBUCHET_MS						= 'trebuc.ttf';
-	const TREBUCHET_MS_BOLD					= 'trebucbd.ttf';
-	const TREBUCHET_MS_ITALIC				= 'trebucit.ttf';
-	const TREBUCHET_MS_BOLD_ITALIC			= 'trebucbi.ttf';
-
-	const VERDANA							= 'verdana.ttf';
-	const VERDANA_BOLD						= 'verdanab.ttf';
-	const VERDANA_ITALIC					= 'verdanai.ttf';
-	const VERDANA_BOLD_ITALIC				= 'verdanaz.ttf';
-
-	/**
-	 * AutoSize method
-	 *
-	 * @var string
-	 */
-	private static $autoSizeMethod = self::AUTOSIZE_METHOD_APPROX;
-
-	/**
-	 * Path to folder containing TrueType font .ttf files
-	 *
-	 * @var string
-	 */
-	private static $trueTypeFontPath = null;
-
-	/**
-	 * How wide is a default column for a given default font and size?
-	 * Empirical data found by inspecting real Excel files and reading off the pixel width
-	 * in Microsoft Office Excel 2007.
-	 *
-	 * @var array
-	 */
-	public static $defaultColumnWidths = array(
-		'Arial' => array(
-			 1 => array('px' => 24, 'width' => 12.00000000),
-			 2 => array('px' => 24, 'width' => 12.00000000),
-			 3 => array('px' => 32, 'width' => 10.66406250),
-			 4 => array('px' => 32, 'width' => 10.66406250),
-			 5 => array('px' => 40, 'width' => 10.00000000),
-			 6 => array('px' => 48, 'width' =>  9.59765625),
-			 7 => array('px' => 48, 'width' =>  9.59765625),
-			 8 => array('px' => 56, 'width' =>  9.33203125),
-			 9 => array('px' => 64, 'width' =>  9.14062500),
-			10 => array('px' => 64, 'width' =>  9.14062500),
-		),
-		'Calibri' => array(
-			 1 => array('px' => 24, 'width' => 12.00000000),
-			 2 => array('px' => 24, 'width' => 12.00000000),
-			 3 => array('px' => 32, 'width' => 10.66406250),
-			 4 => array('px' => 32, 'width' => 10.66406250),
-			 5 => array('px' => 40, 'width' => 10.00000000),
-			 6 => array('px' => 48, 'width' =>  9.59765625),
-			 7 => array('px' => 48, 'width' =>  9.59765625),
-			 8 => array('px' => 56, 'width' =>  9.33203125),
-			 9 => array('px' => 56, 'width' =>  9.33203125),
-			10 => array('px' => 64, 'width' =>  9.14062500),
-			11 => array('px' => 64, 'width' =>  9.14062500),
-		),
-		'Verdana' => array(
-			 1 => array('px' => 24, 'width' => 12.00000000),
-			 2 => array('px' => 24, 'width' => 12.00000000),
-			 3 => array('px' => 32, 'width' => 10.66406250),
-			 4 => array('px' => 32, 'width' => 10.66406250),
-			 5 => array('px' => 40, 'width' => 10.00000000),
-			 6 => array('px' => 48, 'width' =>  9.59765625),
-			 7 => array('px' => 48, 'width' =>  9.59765625),
-			 8 => array('px' => 64, 'width' =>  9.14062500),
-			 9 => array('px' => 72, 'width' =>  9.00000000),
-			10 => array('px' => 72, 'width' =>  9.00000000),
-		),
-	);
-
-	/**
-	 * Set autoSize method
-	 *
-	 * @param string $pValue
-	 * @return	 boolean					Success or failure
-	 */
-	public static function setAutoSizeMethod($pValue = self::AUTOSIZE_METHOD_APPROX)
-	{
-		if (!in_array($pValue,self::$_autoSizeMethods)) {
-			return FALSE;
-		}
-		self::$autoSizeMethod = $pValue;
-
-		return TRUE;
-	}
-
-	/**
-	 * Get autoSize method
-	 *
-	 * @return string
-	 */
-	public static function getAutoSizeMethod()
-	{
-		return self::$autoSizeMethod;
-	}
-
-	/**
-	 * Set the path to the folder containing .ttf files. There should be a trailing slash.
-	 * Typical locations on variout some platforms:
-	 *	<ul>
-	 *		<li>C:/Windows/Fonts/</li>
-	 *		<li>/usr/share/fonts/truetype/</li>
-	 *		<li>~/.fonts/</li>
-	 *	</ul>
-	 *
-	 * @param string $pValue
-	 */
-	public static function setTrueTypeFontPath($pValue = '')
-	{
-		self::$trueTypeFontPath = $pValue;
-	}
-
-	/**
-	 * Get the path to the folder containing .ttf files.
-	 *
-	 * @return string
-	 */
-	public static function getTrueTypeFontPath()
-	{
-		return self::$trueTypeFontPath;
-	}
-
-    /**
-	 * Calculate an (approximate) OpenXML column width, based on font size and text contained
-	 *
-	 * @param 	PHPExcel_Style_Font			$font			Font object
-	 * @param 	PHPExcel_RichText|string	$cellText		Text to calculate width
-	 * @param 	integer						$rotation		Rotation angle
-	 * @param 	PHPExcel_Style_Font|NULL	$defaultFont	Font object
-	 * @return 	integer		Column width
-	 */
-	public static function calculateColumnWidth(PHPExcel_Style_Font $font, $cellText = '', $rotation = 0, PHPExcel_Style_Font $defaultFont = null) {
-		// If it is rich text, use plain text
-		if ($cellText instanceof PHPExcel_RichText) {
-			$cellText = $cellText->getPlainText();
-		}
-
-		// Special case if there are one or more newline characters ("\n")
-		if (strpos($cellText, "\n") !== false) {
-			$lineTexts = explode("\n", $cellText);
-			$lineWidths = array();
-			foreach ($lineTexts as $lineText) {
-				$lineWidths[] = self::calculateColumnWidth($font, $lineText, $rotation = 0, $defaultFont);
-			}
-			return max($lineWidths); // width of longest line in cell
-		}
-
-		// Try to get the exact text width in pixels
-        $approximate = self::$autoSizeMethod == self::AUTOSIZE_METHOD_APPROX;
-        if (!$approximate) {
-            $columnWidthAdjust = ceil(self::getTextWidthPixelsExact('n', $font, 0) * 1.07);
-            try {
-                // Width of text in pixels excl. padding
-                // and addition because Excel adds some padding, just use approx width of 'n' glyph
-                $columnWidth = self::getTextWidthPixelsExact($cellText, $font, $rotation) + $columnWidthAdjust;
-            } catch (PHPExcel_Exception $e) {
-                $approximate = true;
-            }
-        }
-
-        if ($approximate) {
-            $columnWidthAdjust = self::getTextWidthPixelsApprox('n', $font, 0);
-			// Width of text in pixels excl. padding, approximation
-			// and addition because Excel adds some padding, just use approx width of 'n' glyph
-			$columnWidth = self::getTextWidthPixelsApprox($cellText, $font, $rotation) + $columnWidthAdjust;
-        }
-
-		// Convert from pixel width to column width
-		$columnWidth = PHPExcel_Shared_Drawing::pixelsToCellDimension($columnWidth, $defaultFont);
-
-		// Return
-		return round($columnWidth, 6);
-	}
-
-	/**
-	 * Get GD text width in pixels for a string of text in a certain font at a certain rotation angle
-	 *
-	 * @param string $text
-	 * @param PHPExcel_Style_Font
-	 * @param int $rotation
-	 * @return int
-	 * @throws PHPExcel_Exception
-	 */
-	public static function getTextWidthPixelsExact($text, PHPExcel_Style_Font $font, $rotation = 0) {
-		if (!function_exists('imagettfbbox')) {
-			throw new PHPExcel_Exception('GD library needs to be enabled');
-		}
-
-		// font size should really be supplied in pixels in GD2,
-		// but since GD2 seems to assume 72dpi, pixels and points are the same
-		$fontFile = self::getTrueTypeFontFileFromFont($font);
-		$textBox = imagettfbbox($font->getSize(), $rotation, $fontFile, $text);
-
-		// Get corners positions
-		$lowerLeftCornerX  = $textBox[0];
-//		$lowerLeftCornerY  = $textBox[1];
-		$lowerRightCornerX = $textBox[2];
-//		$lowerRightCornerY = $textBox[3];
-		$upperRightCornerX = $textBox[4];
-//		$upperRightCornerY = $textBox[5];
-		$upperLeftCornerX  = $textBox[6];
-//		$upperLeftCornerY  = $textBox[7];
-
-		// Consider the rotation when calculating the width
-		$textWidth = max($lowerRightCornerX - $upperLeftCornerX, $upperRightCornerX - $lowerLeftCornerX);
-
-		return $textWidth;
-	}
-
-	/**
-	 * Get approximate width in pixels for a string of text in a certain font at a certain rotation angle
-	 *
-	 * @param string $columnText
-	 * @param PHPExcel_Style_Font $font
-	 * @param int $rotation
-	 * @return int Text width in pixels (no padding added)
-	 */
-	public static function getTextWidthPixelsApprox($columnText, PHPExcel_Style_Font $font = null, $rotation = 0)
-	{
-		$fontName = $font->getName();
-		$fontSize = $font->getSize();
-
-		// Calculate column width in pixels. We assume fixed glyph width. Result varies with font name and size.
-		switch ($fontName) {
-			case 'Calibri':
-				// value 8.26 was found via interpolation by inspecting real Excel files with Calibri 11 font.
-				$columnWidth = (int) (8.26 * PHPExcel_Shared_String::CountCharacters($columnText));
-				$columnWidth = $columnWidth * $fontSize / 11; // extrapolate from font size
-				break;
-
-			case 'Arial':
-				// value 7 was found via interpolation by inspecting real Excel files with Arial 10 font.
-//				$columnWidth = (int) (7 * PHPExcel_Shared_String::CountCharacters($columnText));
-                // value 8 was set because of experience in different exports at Arial 10 font.
-				$columnWidth = (int) (8 * PHPExcel_Shared_String::CountCharacters($columnText));
-				$columnWidth = $columnWidth * $fontSize / 10; // extrapolate from font size
-                break;
-
-			case 'Verdana':
-				// value 8 was found via interpolation by inspecting real Excel files with Verdana 10 font.
-				$columnWidth = (int) (8 * PHPExcel_Shared_String::CountCharacters($columnText));
-				$columnWidth = $columnWidth * $fontSize / 10; // extrapolate from font size
-				break;
-
-			default:
-				// just assume Calibri
-				$columnWidth = (int) (8.26 * PHPExcel_Shared_String::CountCharacters($columnText));
-				$columnWidth = $columnWidth * $fontSize / 11; // extrapolate from font size
-				break;
-		}
-
-		// Calculate approximate rotated column width
-		if ($rotation !== 0) {
-			if ($rotation == -165) {
-				// stacked text
-				$columnWidth = 4; // approximation
-			} else {
-				// rotated text
-				$columnWidth = $columnWidth * cos(deg2rad($rotation))
-								+ $fontSize * abs(sin(deg2rad($rotation))) / 5; // approximation
-			}
-		}
-
-		// pixel width is an integer
-		return (int) $columnWidth;
-	}
-
-	/**
-	 * Calculate an (approximate) pixel size, based on a font points size
-	 *
-	 * @param 	int		$fontSizeInPoints	Font size (in points)
-	 * @return 	int		Font size (in pixels)
-	 */
-	public static function fontSizeToPixels($fontSizeInPoints = 11) {
-		return (int) ((4 / 3) * $fontSizeInPoints);
-	}
-
-	/**
-	 * Calculate an (approximate) pixel size, based on inch size
-	 *
-	 * @param 	int		$sizeInInch	Font size (in inch)
-	 * @return 	int		Size (in pixels)
-	 */
-	public static function inchSizeToPixels($sizeInInch = 1) {
-		return ($sizeInInch * 96);
-	}
-
-	/**
-	 * Calculate an (approximate) pixel size, based on centimeter size
-	 *
-	 * @param 	int		$sizeInCm	Font size (in centimeters)
-	 * @return 	int		Size (in pixels)
-	 */
-	public static function centimeterSizeToPixels($sizeInCm = 1) {
-		return ($sizeInCm * 37.795275591);
-	}
-
-	/**
-	 * Returns the font path given the font
-	 *
-	 * @param PHPExcel_Style_Font
-	 * @return string Path to TrueType font file
-	 */
-	public static function getTrueTypeFontFileFromFont($font) {
-		if (!file_exists(self::$trueTypeFontPath) || !is_dir(self::$trueTypeFontPath)) {
-			throw new PHPExcel_Exception('Valid directory to TrueType Font files not specified');
-		}
-
-		$name		= $font->getName();
-		$bold		= $font->getBold();
-		$italic		= $font->getItalic();
-
-		// Check if we can map font to true type font file
-		switch ($name) {
-			case 'Arial':
-				$fontFile = (
-					$bold ? ($italic ? self::ARIAL_BOLD_ITALIC : self::ARIAL_BOLD)
-						  : ($italic ? self::ARIAL_ITALIC : self::ARIAL)
-				);
-				break;
-
-			case 'Calibri':
-				$fontFile = (
-					$bold ? ($italic ? self::CALIBRI_BOLD_ITALIC : self::CALIBRI_BOLD)
-						  : ($italic ? self::CALIBRI_ITALIC : self::CALIBRI)
-				);
-				break;
-
-			case 'Courier New':
-				$fontFile = (
-					$bold ? ($italic ? self::COURIER_NEW_BOLD_ITALIC : self::COURIER_NEW_BOLD)
-						  : ($italic ? self::COURIER_NEW_ITALIC : self::COURIER_NEW)
-				);
-				break;
-
-			case 'Comic Sans MS':
-				$fontFile = (
-					$bold ? self::COMIC_SANS_MS_BOLD : self::COMIC_SANS_MS
-				);
-				break;
-
-			case 'Georgia':
-				$fontFile = (
-					$bold ? ($italic ? self::GEORGIA_BOLD_ITALIC : self::GEORGIA_BOLD)
-						  : ($italic ? self::GEORGIA_ITALIC : self::GEORGIA)
-				);
-				break;
-
-			case 'Impact':
-				$fontFile = self::IMPACT;
-				break;
-
-			case 'Liberation Sans':
-				$fontFile = (
-					$bold ? ($italic ? self::LIBERATION_SANS_BOLD_ITALIC : self::LIBERATION_SANS_BOLD)
-						  : ($italic ? self::LIBERATION_SANS_ITALIC : self::LIBERATION_SANS)
-				);
-				break;
-
-			case 'Lucida Console':
-				$fontFile = self::LUCIDA_CONSOLE;
-				break;
-
-			case 'Lucida Sans Unicode':
-				$fontFile = self::LUCIDA_SANS_UNICODE;
-				break;
-
-			case 'Microsoft Sans Serif':
-				$fontFile = self::MICROSOFT_SANS_SERIF;
-				break;
-
-			case 'Palatino Linotype':
-				$fontFile = (
-					$bold ? ($italic ? self::PALATINO_LINOTYPE_BOLD_ITALIC : self::PALATINO_LINOTYPE_BOLD)
-						  : ($italic ? self::PALATINO_LINOTYPE_ITALIC : self::PALATINO_LINOTYPE)
-				);
-				break;
-
-			case 'Symbol':
-				$fontFile = self::SYMBOL;
-				break;
-
-			case 'Tahoma':
-				$fontFile = (
-					$bold ? self::TAHOMA_BOLD : self::TAHOMA
-				);
-				break;
-
-			case 'Times New Roman':
-				$fontFile = (
-					$bold ? ($italic ? self::TIMES_NEW_ROMAN_BOLD_ITALIC : self::TIMES_NEW_ROMAN_BOLD)
-						  : ($italic ? self::TIMES_NEW_ROMAN_ITALIC : self::TIMES_NEW_ROMAN)
-				);
-				break;
-
-			case 'Trebuchet MS':
-				$fontFile = (
-					$bold ? ($italic ? self::TREBUCHET_MS_BOLD_ITALIC : self::TREBUCHET_MS_BOLD)
-						  : ($italic ? self::TREBUCHET_MS_ITALIC : self::TREBUCHET_MS)
-				);
-				break;
-
-			case 'Verdana':
-				$fontFile = (
-					$bold ? ($italic ? self::VERDANA_BOLD_ITALIC : self::VERDANA_BOLD)
-						  : ($italic ? self::VERDANA_ITALIC : self::VERDANA)
-				);
-				break;
-
-			default:
-				throw new PHPExcel_Exception('Unknown font name "'. $name .'". Cannot map to TrueType font file');
-				break;
-		}
-
-		$fontFile = self::$trueTypeFontPath . $fontFile;
-
-		// Check if file actually exists
-		if (!file_exists($fontFile)) {
-			throw New PHPExcel_Exception('TrueType Font file not found');
-		}
-
-		return $fontFile;
-	}
-
-	/**
-	 * Returns the associated charset for the font name.
-	 *
-	 * @param string $name Font name
-	 * @return int Character set code
-	 */
-	public static function getCharsetFromFontName($name)
-	{
-		switch ($name) {
-			// Add more cases. Check FONT records in real Excel files.
-			case 'EucrosiaUPC':		return self::CHARSET_ANSI_THAI;
-			case 'Wingdings':		return self::CHARSET_SYMBOL;
-			case 'Wingdings 2':		return self::CHARSET_SYMBOL;
-			case 'Wingdings 3':		return self::CHARSET_SYMBOL;
-			default:				return self::CHARSET_ANSI_LATIN;
-		}
-	}
-
-	/**
-	 * Get the effective column width for columns without a column dimension or column with width -1
-	 * For example, for Calibri 11 this is 9.140625 (64 px)
-	 *
-	 * @param PHPExcel_Style_Font $font The workbooks default font
-	 * @param boolean $pPixels true = return column width in pixels, false = return in OOXML units
-	 * @return mixed Column width
-	 */
-	public static function getDefaultColumnWidthByFont(PHPExcel_Style_Font $font, $pPixels = false)
-	{
-		if (isset(self::$defaultColumnWidths[$font->getName()][$font->getSize()])) {
-			// Exact width can be determined
-			$columnWidth = $pPixels ?
-				self::$defaultColumnWidths[$font->getName()][$font->getSize()]['px']
-					: self::$defaultColumnWidths[$font->getName()][$font->getSize()]['width'];
-
-		} else {
-			// We don't have data for this particular font and size, use approximation by
-			// extrapolating from Calibri 11
-			$columnWidth = $pPixels ?
-				self::$defaultColumnWidths['Calibri'][11]['px']
-					: self::$defaultColumnWidths['Calibri'][11]['width'];
-			$columnWidth = $columnWidth * $font->getSize() / 11;
-
-			// Round pixels to closest integer
-			if ($pPixels) {
-				$columnWidth = (int) round($columnWidth);
-			}
-		}
-
-		return $columnWidth;
-	}
-
-	/**
-	 * Get the effective row height for rows without a row dimension or rows with height -1
-	 * For example, for Calibri 11 this is 15 points
-	 *
-	 * @param PHPExcel_Style_Font $font The workbooks default font
-	 * @return float Row height in points
-	 */
-	public static function getDefaultRowHeightByFont(PHPExcel_Style_Font $font)
-	{
-		switch ($font->getName()) {
-			case 'Arial':
-				switch ($font->getSize()) {
-					case 10:
-						// inspection of Arial 10 workbook says 12.75pt ~17px
-						$rowHeight = 12.75;
-						break;
-
-					case 9:
-						// inspection of Arial 9 workbook says 12.00pt ~16px
-						$rowHeight = 12;
-						break;
-
-					case 8:
-						// inspection of Arial 8 workbook says 11.25pt ~15px
-						$rowHeight = 11.25;
-						break;
-
-					case 7:
-						// inspection of Arial 7 workbook says 9.00pt ~12px
-						$rowHeight = 9;
-						break;
-
-					case 6:
-					case 5:
-						// inspection of Arial 5,6 workbook says 8.25pt ~11px
-						$rowHeight = 8.25;
-						break;
-
-					case 4:
-						// inspection of Arial 4 workbook says 6.75pt ~9px
-						$rowHeight = 6.75;
-						break;
-
-					case 3:
-						// inspection of Arial 3 workbook says 6.00pt ~8px
-						$rowHeight = 6;
-						break;
-
-					case 2:
-					case 1:
-						// inspection of Arial 1,2 workbook says 5.25pt ~7px
-						$rowHeight = 5.25;
-						break;
-
-					default:
-						// use Arial 10 workbook as an approximation, extrapolation
-						$rowHeight = 12.75 * $font->getSize() / 10;
-						break;
-				}
-				break;
-
-			case 'Calibri':
-				switch ($font->getSize()) {
-					case 11:
-						// inspection of Calibri 11 workbook says 15.00pt ~20px
-						$rowHeight = 15;
-						break;
-
-					case 10:
-						// inspection of Calibri 10 workbook says 12.75pt ~17px
-						$rowHeight = 12.75;
-						break;
-
-					case 9:
-						// inspection of Calibri 9 workbook says 12.00pt ~16px
-						$rowHeight = 12;
-						break;
-
-					case 8:
-						// inspection of Calibri 8 workbook says 11.25pt ~15px
-						$rowHeight = 11.25;
-						break;
-
-					case 7:
-						// inspection of Calibri 7 workbook says 9.00pt ~12px
-						$rowHeight = 9;
-						break;
-
-					case 6:
-					case 5:
-						// inspection of Calibri 5,6 workbook says 8.25pt ~11px
-						$rowHeight = 8.25;
-						break;
-
-					case 4:
-						// inspection of Calibri 4 workbook says 6.75pt ~9px
-						$rowHeight = 6.75;
-						break;
-
-					case 3:
-						// inspection of Calibri 3 workbook says 6.00pt ~8px
-						$rowHeight = 6.00;
-						break;
-
-					case 2:
-					case 1:
-						// inspection of Calibri 1,2 workbook says 5.25pt ~7px
-						$rowHeight = 5.25;
-						break;
-
-					default:
-						// use Calibri 11 workbook as an approximation, extrapolation
-						$rowHeight = 15 * $font->getSize() / 11;
-						break;
-				}
-				break;
-
-			case 'Verdana':
-				switch ($font->getSize()) {
-					case 10:
-						// inspection of Verdana 10 workbook says 12.75pt ~17px
-						$rowHeight = 12.75;
-						break;
-
-					case 9:
-						// inspection of Verdana 9 workbook says 11.25pt ~15px
-						$rowHeight = 11.25;
-						break;
-
-					case 8:
-						// inspection of Verdana 8 workbook says 10.50pt ~14px
-						$rowHeight = 10.50;
-						break;
-
-					case 7:
-						// inspection of Verdana 7 workbook says 9.00pt ~12px
-						$rowHeight = 9.00;
-						break;
-
-					case 6:
-					case 5:
-						// inspection of Verdana 5,6 workbook says 8.25pt ~11px
-						$rowHeight = 8.25;
-						break;
-
-					case 4:
-						// inspection of Verdana 4 workbook says 6.75pt ~9px
-						$rowHeight = 6.75;
-						break;
-
-					case 3:
-						// inspection of Verdana 3 workbook says 6.00pt ~8px
-						$rowHeight = 6;
-						break;
-
-					case 2:
-					case 1:
-						// inspection of Verdana 1,2 workbook says 5.25pt ~7px
-						$rowHeight = 5.25;
-						break;
-
-					default:
-						// use Verdana 10 workbook as an approximation, extrapolation
-						$rowHeight = 12.75 * $font->getSize() / 10;
-						break;
-				}
-				break;
-
-			default:
-				// just use Calibri as an approximation
-				$rowHeight = 15 * $font->getSize() / 11;
-				break;
-		}
-
-		return $rowHeight;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CHANGELOG.TXT b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CHANGELOG.TXT
deleted file mode 100644
index 1c18a5da35d..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CHANGELOG.TXT
+++ /dev/null
@@ -1,16 +0,0 @@
-Mar 1, 2005 11:15 AST by PM
-
-+ For consistency, renamed Math.php to Maths.java, utils to util, 
-  tests to test, docs to doc - 
-
-+ Removed conditional logic from top of Matrix class.
-
-+ Switched to using hypo function in Maths.php for all php-hypot calls.
-  NOTE TO SELF: Need to make sure that all decompositions have been 
-  switched over to using the bundled hypo.
-
-Feb 25, 2005 at 10:00 AST by PM
-
-+ Recommend using simpler Error.php instead of JAMA_Error.php but 
-  can be persuaded otherwise.
-
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CholeskyDecomposition.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CholeskyDecomposition.php
deleted file mode 100644
index cfbaa53bc8d..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CholeskyDecomposition.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/**
- *	@package JAMA
- *
- *	Cholesky decomposition class
- *
- *	For a symmetric, positive definite matrix A, the Cholesky decomposition
- *	is an lower triangular matrix L so that A = L*L'.
- *
- *	If the matrix is not symmetric or positive definite, the constructor
- *	returns a partial decomposition and sets an internal flag that may
- *	be queried by the isSPD() method.
- *
- *	@author Paul Meagher
- *	@author Michael Bommarito
- *	@version 1.2
- */
-class CholeskyDecomposition {
-
-	/**
-	 *	Decomposition storage
-	 *	@var array
-	 *	@access private
-	 */
-	private $L = array();
-
-	/**
-	 *	Matrix row and column dimension
-	 *	@var int
-	 *	@access private
-	 */
-	private $m;
-
-	/**
-	 *	Symmetric positive definite flag
-	 *	@var boolean
-	 *	@access private
-	 */
-	private $isspd = true;
-
-
-	/**
-	 *	CholeskyDecomposition
-	 *
-	 *	Class constructor - decomposes symmetric positive definite matrix
-	 *	@param mixed Matrix square symmetric positive definite matrix
-	 */
-	public function __construct($A = null) {
-		if ($A instanceof Matrix) {
-			$this->L = $A->getArray();
-			$this->m = $A->getRowDimension();
-
-			for($i = 0; $i < $this->m; ++$i) {
-				for($j = $i; $j < $this->m; ++$j) {
-					for($sum = $this->L[$i][$j], $k = $i - 1; $k >= 0; --$k) {
-						$sum -= $this->L[$i][$k] * $this->L[$j][$k];
-					}
-					if ($i == $j) {
-						if ($sum >= 0) {
-							$this->L[$i][$i] = sqrt($sum);
-						} else {
-							$this->isspd = false;
-						}
-					} else {
-						if ($this->L[$i][$i] != 0) {
-							$this->L[$j][$i] = $sum / $this->L[$i][$i];
-						}
-					}
-				}
-
-				for ($k = $i+1; $k < $this->m; ++$k) {
-					$this->L[$i][$k] = 0.0;
-				}
-			}
-		} else {
-			throw new PHPExcel_Calculation_Exception(JAMAError(ArgumentTypeException));
-		}
-	}	//	function __construct()
-
-
-	/**
-	 *	Is the matrix symmetric and positive definite?
-	 *
-	 *	@return boolean
-	 */
-	public function isSPD() {
-		return $this->isspd;
-	}	//	function isSPD()
-
-
-	/**
-	 *	getL
-	 *
-	 *	Return triangular factor.
-	 *	@return Matrix Lower triangular matrix
-	 */
-	public function getL() {
-		return new Matrix($this->L);
-	}	//	function getL()
-
-
-	/**
-	 *	Solve A*X = B
-	 *
-	 *	@param $B Row-equal matrix
-	 *	@return Matrix L * L' * X = B
-	 */
-	public function solve($B = null) {
-		if ($B instanceof Matrix) {
-			if ($B->getRowDimension() == $this->m) {
-				if ($this->isspd) {
-					$X  = $B->getArrayCopy();
-					$nx = $B->getColumnDimension();
-
-					for ($k = 0; $k < $this->m; ++$k) {
-						for ($i = $k + 1; $i < $this->m; ++$i) {
-							for ($j = 0; $j < $nx; ++$j) {
-								$X[$i][$j] -= $X[$k][$j] * $this->L[$i][$k];
-							}
-						}
-						for ($j = 0; $j < $nx; ++$j) {
-							$X[$k][$j] /= $this->L[$k][$k];
-						}
-					}
-
-					for ($k = $this->m - 1; $k >= 0; --$k) {
-						for ($j = 0; $j < $nx; ++$j) {
-							$X[$k][$j] /= $this->L[$k][$k];
-						}
-						for ($i = 0; $i < $k; ++$i) {
-							for ($j = 0; $j < $nx; ++$j) {
-								$X[$i][$j] -= $X[$k][$j] * $this->L[$k][$i];
-							}
-						}
-					}
-
-					return new Matrix($X, $this->m, $nx);
-				} else {
-					throw new PHPExcel_Calculation_Exception(JAMAError(MatrixSPDException));
-				}
-			} else {
-				throw new PHPExcel_Calculation_Exception(JAMAError(MatrixDimensionException));
-			}
-		} else {
-			throw new PHPExcel_Calculation_Exception(JAMAError(ArgumentTypeException));
-		}
-	}	//	function solve()
-
-}	//	class CholeskyDecomposition
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php
deleted file mode 100644
index 2a696d00f8e..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php
+++ /dev/null
@@ -1,862 +0,0 @@
-<?php
-/**
- *	@package JAMA
- *
- *	Class to obtain eigenvalues and eigenvectors of a real matrix.
- *
- *	If A is symmetric, then A = V*D*V' where the eigenvalue matrix D
- *	is diagonal and the eigenvector matrix V is orthogonal (i.e.
- *	A = V.times(D.times(V.transpose())) and V.times(V.transpose())
- *	equals the identity matrix).
- *
- *	If A is not symmetric, then the eigenvalue matrix D is block diagonal
- *	with the real eigenvalues in 1-by-1 blocks and any complex eigenvalues,
- *	lambda + i*mu, in 2-by-2 blocks, [lambda, mu; -mu, lambda].  The
- *	columns of V represent the eigenvectors in the sense that A*V = V*D,
- *	i.e. A.times(V) equals V.times(D).  The matrix V may be badly
- *	conditioned, or even singular, so the validity of the equation
- *	A = V*D*inverse(V) depends upon V.cond().
- *
- *	@author  Paul Meagher
- *	@license PHP v3.0
- *	@version 1.1
- */
-class EigenvalueDecomposition {
-
-	/**
-	 *	Row and column dimension (square matrix).
-	 *	@var int
-	 */
-	private $n;
-
-	/**
-	 *	Internal symmetry flag.
-	 *	@var int
-	 */
-	private $issymmetric;
-
-	/**
-	 *	Arrays for internal storage of eigenvalues.
-	 *	@var array
-	 */
-	private $d = array();
-	private $e = array();
-
-	/**
-	 *	Array for internal storage of eigenvectors.
-	 *	@var array
-	 */
-	private $V = array();
-
-	/**
-	*	Array for internal storage of nonsymmetric Hessenberg form.
-	*	@var array
-	*/
-	private $H = array();
-
-	/**
-	*	Working storage for nonsymmetric algorithm.
-	*	@var array
-	*/
-	private $ort;
-
-	/**
-	*	Used for complex scalar division.
-	*	@var float
-	*/
-	private $cdivr;
-	private $cdivi;
-
-
-	/**
-	 *	Symmetric Householder reduction to tridiagonal form.
-	 *
-	 *	@access private
-	 */
-	private function tred2 () {
-		//  This is derived from the Algol procedures tred2 by
-		//  Bowdler, Martin, Reinsch, and Wilkinson, Handbook for
-		//  Auto. Comp., Vol.ii-Linear Algebra, and the corresponding
-		//  Fortran subroutine in EISPACK.
-		$this->d = $this->V[$this->n-1];
-		// Householder reduction to tridiagonal form.
-		for ($i = $this->n-1; $i > 0; --$i) {
-			$i_ = $i -1;
-			// Scale to avoid under/overflow.
-			$h = $scale = 0.0;
-			$scale += array_sum(array_map(abs, $this->d));
-			if ($scale == 0.0) {
-				$this->e[$i] = $this->d[$i_];
-				$this->d = array_slice($this->V[$i_], 0, $i_);
-				for ($j = 0; $j < $i; ++$j) {
-					$this->V[$j][$i] = $this->V[$i][$j] = 0.0;
-				}
-			} else {
-				// Generate Householder vector.
-				for ($k = 0; $k < $i; ++$k) {
-					$this->d[$k] /= $scale;
-					$h += pow($this->d[$k], 2);
-				}
-				$f = $this->d[$i_];
-				$g = sqrt($h);
-				if ($f > 0) {
-					$g = -$g;
-				}
-				$this->e[$i] = $scale * $g;
-				$h = $h - $f * $g;
-				$this->d[$i_] = $f - $g;
-				for ($j = 0; $j < $i; ++$j) {
-					$this->e[$j] = 0.0;
-				}
-				// Apply similarity transformation to remaining columns.
-				for ($j = 0; $j < $i; ++$j) {
-					$f = $this->d[$j];
-					$this->V[$j][$i] = $f;
-					$g = $this->e[$j] + $this->V[$j][$j] * $f;
-					for ($k = $j+1; $k <= $i_; ++$k) {
-						$g += $this->V[$k][$j] * $this->d[$k];
-						$this->e[$k] += $this->V[$k][$j] * $f;
-					}
-					$this->e[$j] = $g;
-				}
-				$f = 0.0;
-				for ($j = 0; $j < $i; ++$j) {
-					$this->e[$j] /= $h;
-					$f += $this->e[$j] * $this->d[$j];
-				}
-				$hh = $f / (2 * $h);
-				for ($j=0; $j < $i; ++$j) {
-					$this->e[$j] -= $hh * $this->d[$j];
-				}
-				for ($j = 0; $j < $i; ++$j) {
-					$f = $this->d[$j];
-					$g = $this->e[$j];
-					for ($k = $j; $k <= $i_; ++$k) {
-						$this->V[$k][$j] -= ($f * $this->e[$k] + $g * $this->d[$k]);
-					}
-					$this->d[$j] = $this->V[$i-1][$j];
-					$this->V[$i][$j] = 0.0;
-				}
-			}
-			$this->d[$i] = $h;
-		}
-
-		// Accumulate transformations.
-		for ($i = 0; $i < $this->n-1; ++$i) {
-			$this->V[$this->n-1][$i] = $this->V[$i][$i];
-			$this->V[$i][$i] = 1.0;
-			$h = $this->d[$i+1];
-			if ($h != 0.0) {
-				for ($k = 0; $k <= $i; ++$k) {
-					$this->d[$k] = $this->V[$k][$i+1] / $h;
-				}
-				for ($j = 0; $j <= $i; ++$j) {
-					$g = 0.0;
-					for ($k = 0; $k <= $i; ++$k) {
-						$g += $this->V[$k][$i+1] * $this->V[$k][$j];
-					}
-					for ($k = 0; $k <= $i; ++$k) {
-						$this->V[$k][$j] -= $g * $this->d[$k];
-					}
-				}
-			}
-			for ($k = 0; $k <= $i; ++$k) {
-				$this->V[$k][$i+1] = 0.0;
-			}
-		}
-
-		$this->d = $this->V[$this->n-1];
-		$this->V[$this->n-1] = array_fill(0, $j, 0.0);
-		$this->V[$this->n-1][$this->n-1] = 1.0;
-		$this->e[0] = 0.0;
-	}
-
-
-	/**
-	 *	Symmetric tridiagonal QL algorithm.
-	 *
-	 *	This is derived from the Algol procedures tql2, by
-	 *	Bowdler, Martin, Reinsch, and Wilkinson, Handbook for
-	 *	Auto. Comp., Vol.ii-Linear Algebra, and the corresponding
-	 *	Fortran subroutine in EISPACK.
-	 *
-	 *	@access private
-	 */
-	private function tql2() {
-		for ($i = 1; $i < $this->n; ++$i) {
-			$this->e[$i-1] = $this->e[$i];
-		}
-		$this->e[$this->n-1] = 0.0;
-		$f = 0.0;
-		$tst1 = 0.0;
-		$eps  = pow(2.0,-52.0);
-
-		for ($l = 0; $l < $this->n; ++$l) {
-			// Find small subdiagonal element
-			$tst1 = max($tst1, abs($this->d[$l]) + abs($this->e[$l]));
-			$m = $l;
-			while ($m < $this->n) {
-				if (abs($this->e[$m]) <= $eps * $tst1)
-					break;
-				++$m;
-			}
-			// If m == l, $this->d[l] is an eigenvalue,
-			// otherwise, iterate.
-			if ($m > $l) {
-				$iter = 0;
-				do {
-					// Could check iteration count here.
-					$iter += 1;
-					// Compute implicit shift
-					$g = $this->d[$l];
-					$p = ($this->d[$l+1] - $g) / (2.0 * $this->e[$l]);
-					$r = hypo($p, 1.0);
-					if ($p < 0)
-						$r *= -1;
-					$this->d[$l] = $this->e[$l] / ($p + $r);
-					$this->d[$l+1] = $this->e[$l] * ($p + $r);
-					$dl1 = $this->d[$l+1];
-					$h = $g - $this->d[$l];
-					for ($i = $l + 2; $i < $this->n; ++$i)
-						$this->d[$i] -= $h;
-					$f += $h;
-					// Implicit QL transformation.
-					$p = $this->d[$m];
-					$c = 1.0;
-					$c2 = $c3 = $c;
-					$el1 = $this->e[$l + 1];
-					$s = $s2 = 0.0;
-					for ($i = $m-1; $i >= $l; --$i) {
-						$c3 = $c2;
-						$c2 = $c;
-						$s2 = $s;
-						$g  = $c * $this->e[$i];
-						$h  = $c * $p;
-						$r  = hypo($p, $this->e[$i]);
-						$this->e[$i+1] = $s * $r;
-						$s = $this->e[$i] / $r;
-						$c = $p / $r;
-						$p = $c * $this->d[$i] - $s * $g;
-						$this->d[$i+1] = $h + $s * ($c * $g + $s * $this->d[$i]);
-						// Accumulate transformation.
-						for ($k = 0; $k < $this->n; ++$k) {
-							$h = $this->V[$k][$i+1];
-							$this->V[$k][$i+1] = $s * $this->V[$k][$i] + $c * $h;
-							$this->V[$k][$i] = $c * $this->V[$k][$i] - $s * $h;
-						}
-					}
-					$p = -$s * $s2 * $c3 * $el1 * $this->e[$l] / $dl1;
-					$this->e[$l] = $s * $p;
-					$this->d[$l] = $c * $p;
-				// Check for convergence.
-				} while (abs($this->e[$l]) > $eps * $tst1);
-			}
-			$this->d[$l] = $this->d[$l] + $f;
-			$this->e[$l] = 0.0;
-		}
-
-		// Sort eigenvalues and corresponding vectors.
-		for ($i = 0; $i < $this->n - 1; ++$i) {
-			$k = $i;
-			$p = $this->d[$i];
-			for ($j = $i+1; $j < $this->n; ++$j) {
-				if ($this->d[$j] < $p) {
-					$k = $j;
-					$p = $this->d[$j];
-				}
-			}
-			if ($k != $i) {
-				$this->d[$k] = $this->d[$i];
-				$this->d[$i] = $p;
-				for ($j = 0; $j < $this->n; ++$j) {
-					$p = $this->V[$j][$i];
-					$this->V[$j][$i] = $this->V[$j][$k];
-					$this->V[$j][$k] = $p;
-				}
-			}
-		}
-	}
-
-
-	/**
-	 *	Nonsymmetric reduction to Hessenberg form.
-	 *
-	 *	This is derived from the Algol procedures orthes and ortran,
-	 *	by Martin and Wilkinson, Handbook for Auto. Comp.,
-	 *	Vol.ii-Linear Algebra, and the corresponding
-	 *	Fortran subroutines in EISPACK.
-	 *
-	 *	@access private
-	 */
-	private function orthes () {
-		$low  = 0;
-		$high = $this->n-1;
-
-		for ($m = $low+1; $m <= $high-1; ++$m) {
-			// Scale column.
-			$scale = 0.0;
-			for ($i = $m; $i <= $high; ++$i) {
-				$scale = $scale + abs($this->H[$i][$m-1]);
-			}
-			if ($scale != 0.0) {
-				// Compute Householder transformation.
-				$h = 0.0;
-				for ($i = $high; $i >= $m; --$i) {
-					$this->ort[$i] = $this->H[$i][$m-1] / $scale;
-					$h += $this->ort[$i] * $this->ort[$i];
-				}
-				$g = sqrt($h);
-				if ($this->ort[$m] > 0) {
-					$g *= -1;
-				}
-				$h -= $this->ort[$m] * $g;
-				$this->ort[$m] -= $g;
-				// Apply Householder similarity transformation
-				// H = (I -u * u' / h) * H * (I -u * u') / h)
-				for ($j = $m; $j < $this->n; ++$j) {
-					$f = 0.0;
-					for ($i = $high; $i >= $m; --$i) {
-						$f += $this->ort[$i] * $this->H[$i][$j];
-					}
-					$f /= $h;
-					for ($i = $m; $i <= $high; ++$i) {
-						$this->H[$i][$j] -= $f * $this->ort[$i];
-					}
-				}
-				for ($i = 0; $i <= $high; ++$i) {
-					$f = 0.0;
-					for ($j = $high; $j >= $m; --$j) {
-						$f += $this->ort[$j] * $this->H[$i][$j];
-					}
-					$f = $f / $h;
-					for ($j = $m; $j <= $high; ++$j) {
-						$this->H[$i][$j] -= $f * $this->ort[$j];
-					}
-				}
-				$this->ort[$m] = $scale * $this->ort[$m];
-				$this->H[$m][$m-1] = $scale * $g;
-			}
-		}
-
-		// Accumulate transformations (Algol's ortran).
-		for ($i = 0; $i < $this->n; ++$i) {
-			for ($j = 0; $j < $this->n; ++$j) {
-				$this->V[$i][$j] = ($i == $j ? 1.0 : 0.0);
-			}
-		}
-		for ($m = $high-1; $m >= $low+1; --$m) {
-			if ($this->H[$m][$m-1] != 0.0) {
-				for ($i = $m+1; $i <= $high; ++$i) {
-					$this->ort[$i] = $this->H[$i][$m-1];
-				}
-				for ($j = $m; $j <= $high; ++$j) {
-					$g = 0.0;
-					for ($i = $m; $i <= $high; ++$i) {
-						$g += $this->ort[$i] * $this->V[$i][$j];
-					}
-					// Double division avoids possible underflow
-					$g = ($g / $this->ort[$m]) / $this->H[$m][$m-1];
-					for ($i = $m; $i <= $high; ++$i) {
-						$this->V[$i][$j] += $g * $this->ort[$i];
-					}
-				}
-			}
-		}
-	}
-
-
-	/**
-	 *	Performs complex division.
-	 *
-	 *	@access private
-	 */
-	private function cdiv($xr, $xi, $yr, $yi) {
-		if (abs($yr) > abs($yi)) {
-			$r = $yi / $yr;
-			$d = $yr + $r * $yi;
-			$this->cdivr = ($xr + $r * $xi) / $d;
-			$this->cdivi = ($xi - $r * $xr) / $d;
-		} else {
-			$r = $yr / $yi;
-			$d = $yi + $r * $yr;
-			$this->cdivr = ($r * $xr + $xi) / $d;
-			$this->cdivi = ($r * $xi - $xr) / $d;
-		}
-	}
-
-
-	/**
-	 *	Nonsymmetric reduction from Hessenberg to real Schur form.
-	 *
-	 *	Code is derived from the Algol procedure hqr2,
-	 *	by Martin and Wilkinson, Handbook for Auto. Comp.,
-	 *	Vol.ii-Linear Algebra, and the corresponding
-	 *	Fortran subroutine in EISPACK.
-	 *
-	 *	@access private
-	 */
-	private function hqr2 () {
-		//  Initialize
-		$nn = $this->n;
-		$n  = $nn - 1;
-		$low = 0;
-		$high = $nn - 1;
-		$eps = pow(2.0, -52.0);
-		$exshift = 0.0;
-		$p = $q = $r = $s = $z = 0;
-		// Store roots isolated by balanc and compute matrix norm
-		$norm = 0.0;
-
-		for ($i = 0; $i < $nn; ++$i) {
-			if (($i < $low) OR ($i > $high)) {
-				$this->d[$i] = $this->H[$i][$i];
-				$this->e[$i] = 0.0;
-			}
-			for ($j = max($i-1, 0); $j < $nn; ++$j) {
-				$norm = $norm + abs($this->H[$i][$j]);
-			}
-		}
-
-		// Outer loop over eigenvalue index
-		$iter = 0;
-		while ($n >= $low) {
-			// Look for single small sub-diagonal element
-			$l = $n;
-			while ($l > $low) {
-				$s = abs($this->H[$l-1][$l-1]) + abs($this->H[$l][$l]);
-				if ($s == 0.0) {
-					$s = $norm;
-				}
-				if (abs($this->H[$l][$l-1]) < $eps * $s) {
-					break;
-				}
-				--$l;
-			}
-			// Check for convergence
-			// One root found
-			if ($l == $n) {
-				$this->H[$n][$n] = $this->H[$n][$n] + $exshift;
-				$this->d[$n] = $this->H[$n][$n];
-				$this->e[$n] = 0.0;
-				--$n;
-				$iter = 0;
-			// Two roots found
-			} else if ($l == $n-1) {
-				$w = $this->H[$n][$n-1] * $this->H[$n-1][$n];
-				$p = ($this->H[$n-1][$n-1] - $this->H[$n][$n]) / 2.0;
-				$q = $p * $p + $w;
-				$z = sqrt(abs($q));
-				$this->H[$n][$n] = $this->H[$n][$n] + $exshift;
-				$this->H[$n-1][$n-1] = $this->H[$n-1][$n-1] + $exshift;
-				$x = $this->H[$n][$n];
-				// Real pair
-				if ($q >= 0) {
-					if ($p >= 0) {
-						$z = $p + $z;
-					} else {
-						$z = $p - $z;
-					}
-					$this->d[$n-1] = $x + $z;
-					$this->d[$n] = $this->d[$n-1];
-					if ($z != 0.0) {
-						$this->d[$n] = $x - $w / $z;
-					}
-					$this->e[$n-1] = 0.0;
-					$this->e[$n] = 0.0;
-					$x = $this->H[$n][$n-1];
-					$s = abs($x) + abs($z);
-					$p = $x / $s;
-					$q = $z / $s;
-					$r = sqrt($p * $p + $q * $q);
-					$p = $p / $r;
-					$q = $q / $r;
-					// Row modification
-					for ($j = $n-1; $j < $nn; ++$j) {
-						$z = $this->H[$n-1][$j];
-						$this->H[$n-1][$j] = $q * $z + $p * $this->H[$n][$j];
-						$this->H[$n][$j] = $q * $this->H[$n][$j] - $p * $z;
-					}
-					// Column modification
-					for ($i = 0; $i <= n; ++$i) {
-						$z = $this->H[$i][$n-1];
-						$this->H[$i][$n-1] = $q * $z + $p * $this->H[$i][$n];
-						$this->H[$i][$n] = $q * $this->H[$i][$n] - $p * $z;
-					}
-					// Accumulate transformations
-					for ($i = $low; $i <= $high; ++$i) {
-						$z = $this->V[$i][$n-1];
-						$this->V[$i][$n-1] = $q * $z + $p * $this->V[$i][$n];
-						$this->V[$i][$n] = $q * $this->V[$i][$n] - $p * $z;
-					}
-				// Complex pair
-				} else {
-					$this->d[$n-1] = $x + $p;
-					$this->d[$n] = $x + $p;
-					$this->e[$n-1] = $z;
-					$this->e[$n] = -$z;
-				}
-				$n = $n - 2;
-				$iter = 0;
-			// No convergence yet
-			} else {
-				// Form shift
-				$x = $this->H[$n][$n];
-				$y = 0.0;
-				$w = 0.0;
-				if ($l < $n) {
-					$y = $this->H[$n-1][$n-1];
-					$w = $this->H[$n][$n-1] * $this->H[$n-1][$n];
-				}
-				// Wilkinson's original ad hoc shift
-				if ($iter == 10) {
-					$exshift += $x;
-					for ($i = $low; $i <= $n; ++$i) {
-						$this->H[$i][$i] -= $x;
-					}
-					$s = abs($this->H[$n][$n-1]) + abs($this->H[$n-1][$n-2]);
-					$x = $y = 0.75 * $s;
-					$w = -0.4375 * $s * $s;
-				}
-				// MATLAB's new ad hoc shift
-				if ($iter == 30) {
-					$s = ($y - $x) / 2.0;
-					$s = $s * $s + $w;
-					if ($s > 0) {
-						$s = sqrt($s);
-						if ($y < $x) {
-							$s = -$s;
-						}
-						$s = $x - $w / (($y - $x) / 2.0 + $s);
-						for ($i = $low; $i <= $n; ++$i) {
-							$this->H[$i][$i] -= $s;
-						}
-						$exshift += $s;
-						$x = $y = $w = 0.964;
-					}
-				}
-				// Could check iteration count here.
-				$iter = $iter + 1;
-				// Look for two consecutive small sub-diagonal elements
-				$m = $n - 2;
-				while ($m >= $l) {
-					$z = $this->H[$m][$m];
-					$r = $x - $z;
-					$s = $y - $z;
-					$p = ($r * $s - $w) / $this->H[$m+1][$m] + $this->H[$m][$m+1];
-					$q = $this->H[$m+1][$m+1] - $z - $r - $s;
-					$r = $this->H[$m+2][$m+1];
-					$s = abs($p) + abs($q) + abs($r);
-					$p = $p / $s;
-					$q = $q / $s;
-					$r = $r / $s;
-					if ($m == $l) {
-						break;
-					}
-					if (abs($this->H[$m][$m-1]) * (abs($q) + abs($r)) <
-						$eps * (abs($p) * (abs($this->H[$m-1][$m-1]) + abs($z) + abs($this->H[$m+1][$m+1])))) {
-						break;
-					}
-					--$m;
-				}
-				for ($i = $m + 2; $i <= $n; ++$i) {
-					$this->H[$i][$i-2] = 0.0;
-					if ($i > $m+2) {
-						$this->H[$i][$i-3] = 0.0;
-					}
-				}
-				// Double QR step involving rows l:n and columns m:n
-				for ($k = $m; $k <= $n-1; ++$k) {
-					$notlast = ($k != $n-1);
-					if ($k != $m) {
-						$p = $this->H[$k][$k-1];
-						$q = $this->H[$k+1][$k-1];
-						$r = ($notlast ? $this->H[$k+2][$k-1] : 0.0);
-						$x = abs($p) + abs($q) + abs($r);
-						if ($x != 0.0) {
-							$p = $p / $x;
-							$q = $q / $x;
-							$r = $r / $x;
-						}
-					}
-					if ($x == 0.0) {
-						break;
-					}
-					$s = sqrt($p * $p + $q * $q + $r * $r);
-					if ($p < 0) {
-						$s = -$s;
-					}
-					if ($s != 0) {
-						if ($k != $m) {
-							$this->H[$k][$k-1] = -$s * $x;
-						} elseif ($l != $m) {
-							$this->H[$k][$k-1] = -$this->H[$k][$k-1];
-						}
-						$p = $p + $s;
-						$x = $p / $s;
-						$y = $q / $s;
-						$z = $r / $s;
-						$q = $q / $p;
-						$r = $r / $p;
-						// Row modification
-						for ($j = $k; $j < $nn; ++$j) {
-							$p = $this->H[$k][$j] + $q * $this->H[$k+1][$j];
-							if ($notlast) {
-								$p = $p + $r * $this->H[$k+2][$j];
-								$this->H[$k+2][$j] = $this->H[$k+2][$j] - $p * $z;
-							}
-							$this->H[$k][$j] = $this->H[$k][$j] - $p * $x;
-							$this->H[$k+1][$j] = $this->H[$k+1][$j] - $p * $y;
-						}
-						// Column modification
-						for ($i = 0; $i <= min($n, $k+3); ++$i) {
-							$p = $x * $this->H[$i][$k] + $y * $this->H[$i][$k+1];
-							if ($notlast) {
-								$p = $p + $z * $this->H[$i][$k+2];
-								$this->H[$i][$k+2] = $this->H[$i][$k+2] - $p * $r;
-							}
-							$this->H[$i][$k] = $this->H[$i][$k] - $p;
-							$this->H[$i][$k+1] = $this->H[$i][$k+1] - $p * $q;
-						}
-						// Accumulate transformations
-						for ($i = $low; $i <= $high; ++$i) {
-							$p = $x * $this->V[$i][$k] + $y * $this->V[$i][$k+1];
-							if ($notlast) {
-								$p = $p + $z * $this->V[$i][$k+2];
-								$this->V[$i][$k+2] = $this->V[$i][$k+2] - $p * $r;
-							}
-							$this->V[$i][$k] = $this->V[$i][$k] - $p;
-							$this->V[$i][$k+1] = $this->V[$i][$k+1] - $p * $q;
-						}
-					}  // ($s != 0)
-				}  // k loop
-			}  // check convergence
-		}  // while ($n >= $low)
-
-		// Backsubstitute to find vectors of upper triangular form
-		if ($norm == 0.0) {
-			return;
-		}
-
-		for ($n = $nn-1; $n >= 0; --$n) {
-			$p = $this->d[$n];
-			$q = $this->e[$n];
-			// Real vector
-			if ($q == 0) {
-				$l = $n;
-				$this->H[$n][$n] = 1.0;
-				for ($i = $n-1; $i >= 0; --$i) {
-					$w = $this->H[$i][$i] - $p;
-					$r = 0.0;
-					for ($j = $l; $j <= $n; ++$j) {
-						$r = $r + $this->H[$i][$j] * $this->H[$j][$n];
-					}
-					if ($this->e[$i] < 0.0) {
-						$z = $w;
-						$s = $r;
-					} else {
-						$l = $i;
-						if ($this->e[$i] == 0.0) {
-							if ($w != 0.0) {
-								$this->H[$i][$n] = -$r / $w;
-							} else {
-								$this->H[$i][$n] = -$r / ($eps * $norm);
-							}
-						// Solve real equations
-						} else {
-							$x = $this->H[$i][$i+1];
-							$y = $this->H[$i+1][$i];
-							$q = ($this->d[$i] - $p) * ($this->d[$i] - $p) + $this->e[$i] * $this->e[$i];
-							$t = ($x * $s - $z * $r) / $q;
-							$this->H[$i][$n] = $t;
-							if (abs($x) > abs($z)) {
-								$this->H[$i+1][$n] = (-$r - $w * $t) / $x;
-							} else {
-								$this->H[$i+1][$n] = (-$s - $y * $t) / $z;
-							}
-						}
-						// Overflow control
-						$t = abs($this->H[$i][$n]);
-						if (($eps * $t) * $t > 1) {
-							for ($j = $i; $j <= $n; ++$j) {
-								$this->H[$j][$n] = $this->H[$j][$n] / $t;
-							}
-						}
-					}
-				}
-			// Complex vector
-			} else if ($q < 0) {
-				$l = $n-1;
-				// Last vector component imaginary so matrix is triangular
-				if (abs($this->H[$n][$n-1]) > abs($this->H[$n-1][$n])) {
-					$this->H[$n-1][$n-1] = $q / $this->H[$n][$n-1];
-					$this->H[$n-1][$n] = -($this->H[$n][$n] - $p) / $this->H[$n][$n-1];
-				} else {
-					$this->cdiv(0.0, -$this->H[$n-1][$n], $this->H[$n-1][$n-1] - $p, $q);
-					$this->H[$n-1][$n-1] = $this->cdivr;
-					$this->H[$n-1][$n]   = $this->cdivi;
-				}
-				$this->H[$n][$n-1] = 0.0;
-				$this->H[$n][$n] = 1.0;
-				for ($i = $n-2; $i >= 0; --$i) {
-					// double ra,sa,vr,vi;
-					$ra = 0.0;
-					$sa = 0.0;
-					for ($j = $l; $j <= $n; ++$j) {
-						$ra = $ra + $this->H[$i][$j] * $this->H[$j][$n-1];
-						$sa = $sa + $this->H[$i][$j] * $this->H[$j][$n];
-					}
-					$w = $this->H[$i][$i] - $p;
-					if ($this->e[$i] < 0.0) {
-						$z = $w;
-						$r = $ra;
-						$s = $sa;
-					} else {
-						$l = $i;
-						if ($this->e[$i] == 0) {
-							$this->cdiv(-$ra, -$sa, $w, $q);
-							$this->H[$i][$n-1] = $this->cdivr;
-							$this->H[$i][$n]   = $this->cdivi;
-						} else {
-							// Solve complex equations
-							$x = $this->H[$i][$i+1];
-							$y = $this->H[$i+1][$i];
-							$vr = ($this->d[$i] - $p) * ($this->d[$i] - $p) + $this->e[$i] * $this->e[$i] - $q * $q;
-							$vi = ($this->d[$i] - $p) * 2.0 * $q;
-							if ($vr == 0.0 & $vi == 0.0) {
-								$vr = $eps * $norm * (abs($w) + abs($q) + abs($x) + abs($y) + abs($z));
-							}
-							$this->cdiv($x * $r - $z * $ra + $q * $sa, $x * $s - $z * $sa - $q * $ra, $vr, $vi);
-							$this->H[$i][$n-1] = $this->cdivr;
-							$this->H[$i][$n]   = $this->cdivi;
-							if (abs($x) > (abs($z) + abs($q))) {
-								$this->H[$i+1][$n-1] = (-$ra - $w * $this->H[$i][$n-1] + $q * $this->H[$i][$n]) / $x;
-								$this->H[$i+1][$n] = (-$sa - $w * $this->H[$i][$n] - $q * $this->H[$i][$n-1]) / $x;
-							} else {
-								$this->cdiv(-$r - $y * $this->H[$i][$n-1], -$s - $y * $this->H[$i][$n], $z, $q);
-								$this->H[$i+1][$n-1] = $this->cdivr;
-								$this->H[$i+1][$n]   = $this->cdivi;
-							}
-						}
-						// Overflow control
-						$t = max(abs($this->H[$i][$n-1]),abs($this->H[$i][$n]));
-						if (($eps * $t) * $t > 1) {
-							for ($j = $i; $j <= $n; ++$j) {
-								$this->H[$j][$n-1] = $this->H[$j][$n-1] / $t;
-								$this->H[$j][$n]   = $this->H[$j][$n] / $t;
-							}
-						}
-					} // end else
-				} // end for
-			} // end else for complex case
-		} // end for
-
-		// Vectors of isolated roots
-		for ($i = 0; $i < $nn; ++$i) {
-			if ($i < $low | $i > $high) {
-				for ($j = $i; $j < $nn; ++$j) {
-					$this->V[$i][$j] = $this->H[$i][$j];
-				}
-			}
-		}
-
-		// Back transformation to get eigenvectors of original matrix
-		for ($j = $nn-1; $j >= $low; --$j) {
-			for ($i = $low; $i <= $high; ++$i) {
-				$z = 0.0;
-				for ($k = $low; $k <= min($j,$high); ++$k) {
-					$z = $z + $this->V[$i][$k] * $this->H[$k][$j];
-				}
-				$this->V[$i][$j] = $z;
-			}
-		}
-	} // end hqr2
-
-
-	/**
-	 *	Constructor: Check for symmetry, then construct the eigenvalue decomposition
-	 *
-	 *	@access public
-	 *	@param A  Square matrix
-	 *	@return Structure to access D and V.
-	 */
-	public function __construct($Arg) {
-		$this->A = $Arg->getArray();
-		$this->n = $Arg->getColumnDimension();
-
-		$issymmetric = true;
-		for ($j = 0; ($j < $this->n) & $issymmetric; ++$j) {
-			for ($i = 0; ($i < $this->n) & $issymmetric; ++$i) {
-				$issymmetric = ($this->A[$i][$j] == $this->A[$j][$i]);
-			}
-		}
-
-		if ($issymmetric) {
-			$this->V = $this->A;
-			// Tridiagonalize.
-			$this->tred2();
-			// Diagonalize.
-			$this->tql2();
-		} else {
-			$this->H = $this->A;
-			$this->ort = array();
-			// Reduce to Hessenberg form.
-			$this->orthes();
-			// Reduce Hessenberg to real Schur form.
-			$this->hqr2();
-		}
-	}
-
-
-	/**
-	 *	Return the eigenvector matrix
-	 *
-	 *	@access public
-	 *	@return V
-	 */
-	public function getV() {
-		return new Matrix($this->V, $this->n, $this->n);
-	}
-
-
-	/**
-	 *	Return the real parts of the eigenvalues
-	 *
-	 *	@access public
-	 *	@return real(diag(D))
-	 */
-	public function getRealEigenvalues() {
-		return $this->d;
-	}
-
-
-	/**
-	 *	Return the imaginary parts of the eigenvalues
-	 *
-	 *	@access public
-	 *	@return imag(diag(D))
-	 */
-	public function getImagEigenvalues() {
-		return $this->e;
-	}
-
-
-	/**
-	 *	Return the block diagonal eigenvalue matrix
-	 *
-	 *	@access public
-	 *	@return D
-	 */
-	public function getD() {
-		for ($i = 0; $i < $this->n; ++$i) {
-			$D[$i] = array_fill(0, $this->n, 0.0);
-			$D[$i][$i] = $this->d[$i];
-			if ($this->e[$i] == 0) {
-				continue;
-			}
-			$o = ($this->e[$i] > 0) ? $i + 1 : $i - 1;
-			$D[$i][$o] = $this->e[$i];
-		}
-		return new Matrix($D);
-	}
-
-}	//	class EigenvalueDecomposition
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/LUDecomposition.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/LUDecomposition.php
deleted file mode 100644
index 08e500cf75a..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/LUDecomposition.php
+++ /dev/null
@@ -1,258 +0,0 @@
-<?php
-/**
- *	@package JAMA
- *
- *	For an m-by-n matrix A with m >= n, the LU decomposition is an m-by-n
- *	unit lower triangular matrix L, an n-by-n upper triangular matrix U,
- *	and a permutation vector piv of length m so that A(piv,:) = L*U.
- *	If m < n, then L is m-by-m and U is m-by-n.
- *
- *	The LU decompostion with pivoting always exists, even if the matrix is
- *	singular, so the constructor will never fail. The primary use of the
- *	LU decomposition is in the solution of square systems of simultaneous
- *	linear equations. This will fail if isNonsingular() returns false.
- *
- *	@author Paul Meagher
- *	@author Bartosz Matosiuk
- *	@author Michael Bommarito
- *	@version 1.1
- *	@license PHP v3.0
- */
-class PHPExcel_Shared_JAMA_LUDecomposition {
-
-	const MatrixSingularException	= "Can only perform operation on singular matrix.";
-	const MatrixSquareException		= "Mismatched Row dimension";
-
-	/**
-	 *	Decomposition storage
-	 *	@var array
-	 */
-	private $LU = array();
-
-	/**
-	 *	Row dimension.
-	 *	@var int
-	 */
-	private $m;
-
-	/**
-	 *	Column dimension.
-	 *	@var int
-	 */
-	private $n;
-
-	/**
-	 *	Pivot sign.
-	 *	@var int
-	 */
-	private $pivsign;
-
-	/**
-	 *	Internal storage of pivot vector.
-	 *	@var array
-	 */
-	private $piv = array();
-
-
-	/**
-	 *	LU Decomposition constructor.
-	 *
-	 *	@param $A Rectangular matrix
-	 *	@return Structure to access L, U and piv.
-	 */
-	public function __construct($A) {
-		if ($A instanceof PHPExcel_Shared_JAMA_Matrix) {
-			// Use a "left-looking", dot-product, Crout/Doolittle algorithm.
-			$this->LU = $A->getArray();
-			$this->m  = $A->getRowDimension();
-			$this->n  = $A->getColumnDimension();
-			for ($i = 0; $i < $this->m; ++$i) {
-				$this->piv[$i] = $i;
-			}
-			$this->pivsign = 1;
-			$LUrowi = $LUcolj = array();
-
-			// Outer loop.
-			for ($j = 0; $j < $this->n; ++$j) {
-				// Make a copy of the j-th column to localize references.
-				for ($i = 0; $i < $this->m; ++$i) {
-					$LUcolj[$i] = &$this->LU[$i][$j];
-				}
-				// Apply previous transformations.
-				for ($i = 0; $i < $this->m; ++$i) {
-					$LUrowi = $this->LU[$i];
-					// Most of the time is spent in the following dot product.
-					$kmax = min($i,$j);
-					$s = 0.0;
-					for ($k = 0; $k < $kmax; ++$k) {
-						$s += $LUrowi[$k] * $LUcolj[$k];
-					}
-					$LUrowi[$j] = $LUcolj[$i] -= $s;
-				}
-				// Find pivot and exchange if necessary.
-				$p = $j;
-				for ($i = $j+1; $i < $this->m; ++$i) {
-					if (abs($LUcolj[$i]) > abs($LUcolj[$p])) {
-						$p = $i;
-					}
-				}
-				if ($p != $j) {
-					for ($k = 0; $k < $this->n; ++$k) {
-						$t = $this->LU[$p][$k];
-						$this->LU[$p][$k] = $this->LU[$j][$k];
-						$this->LU[$j][$k] = $t;
-					}
-					$k = $this->piv[$p];
-					$this->piv[$p] = $this->piv[$j];
-					$this->piv[$j] = $k;
-					$this->pivsign = $this->pivsign * -1;
-				}
-				// Compute multipliers.
-				if (($j < $this->m) && ($this->LU[$j][$j] != 0.0)) {
-					for ($i = $j+1; $i < $this->m; ++$i) {
-						$this->LU[$i][$j] /= $this->LU[$j][$j];
-					}
-				}
-			}
-		} else {
-			throw new PHPExcel_Calculation_Exception(PHPExcel_Shared_JAMA_Matrix::ArgumentTypeException);
-		}
-	}	//	function __construct()
-
-
-	/**
-	 *	Get lower triangular factor.
-	 *
-	 *	@return array Lower triangular factor
-	 */
-	public function getL() {
-		for ($i = 0; $i < $this->m; ++$i) {
-			for ($j = 0; $j < $this->n; ++$j) {
-				if ($i > $j) {
-					$L[$i][$j] = $this->LU[$i][$j];
-				} elseif ($i == $j) {
-					$L[$i][$j] = 1.0;
-				} else {
-					$L[$i][$j] = 0.0;
-				}
-			}
-		}
-		return new PHPExcel_Shared_JAMA_Matrix($L);
-	}	//	function getL()
-
-
-	/**
-	 *	Get upper triangular factor.
-	 *
-	 *	@return array Upper triangular factor
-	 */
-	public function getU() {
-		for ($i = 0; $i < $this->n; ++$i) {
-			for ($j = 0; $j < $this->n; ++$j) {
-				if ($i <= $j) {
-					$U[$i][$j] = $this->LU[$i][$j];
-				} else {
-					$U[$i][$j] = 0.0;
-				}
-			}
-		}
-		return new PHPExcel_Shared_JAMA_Matrix($U);
-	}	//	function getU()
-
-
-	/**
-	 *	Return pivot permutation vector.
-	 *
-	 *	@return array Pivot vector
-	 */
-	public function getPivot() {
-		return $this->piv;
-	}	//	function getPivot()
-
-
-	/**
-	 *	Alias for getPivot
-	 *
-	 *	@see getPivot
-	 */
-	public function getDoublePivot() {
-		return $this->getPivot();
-	}	//	function getDoublePivot()
-
-
-	/**
-	 *	Is the matrix nonsingular?
-	 *
-	 *	@return true if U, and hence A, is nonsingular.
-	 */
-	public function isNonsingular() {
-		for ($j = 0; $j < $this->n; ++$j) {
-			if ($this->LU[$j][$j] == 0) {
-				return false;
-			}
-		}
-		return true;
-	}	//	function isNonsingular()
-
-
-	/**
-	 *	Count determinants
-	 *
-	 *	@return array d matrix deterninat
-	 */
-	public function det() {
-		if ($this->m == $this->n) {
-			$d = $this->pivsign;
-			for ($j = 0; $j < $this->n; ++$j) {
-				$d *= $this->LU[$j][$j];
-			}
-			return $d;
-		} else {
-			throw new PHPExcel_Calculation_Exception(PHPExcel_Shared_JAMA_Matrix::MatrixDimensionException);
-		}
-	}	//	function det()
-
-
-	/**
-	 *	Solve A*X = B
-	 *
-	 *	@param  $B  A Matrix with as many rows as A and any number of columns.
-	 *	@return  X so that L*U*X = B(piv,:)
-	 *	@PHPExcel_Calculation_Exception  IllegalArgumentException Matrix row dimensions must agree.
-	 *	@PHPExcel_Calculation_Exception  RuntimeException  Matrix is singular.
-	 */
-	public function solve($B) {
-		if ($B->getRowDimension() == $this->m) {
-			if ($this->isNonsingular()) {
-				// Copy right hand side with pivoting
-				$nx = $B->getColumnDimension();
-				$X  = $B->getMatrix($this->piv, 0, $nx-1);
-				// Solve L*Y = B(piv,:)
-				for ($k = 0; $k < $this->n; ++$k) {
-					for ($i = $k+1; $i < $this->n; ++$i) {
-						for ($j = 0; $j < $nx; ++$j) {
-							$X->A[$i][$j] -= $X->A[$k][$j] * $this->LU[$i][$k];
-						}
-					}
-				}
-				// Solve U*X = Y;
-				for ($k = $this->n-1; $k >= 0; --$k) {
-					for ($j = 0; $j < $nx; ++$j) {
-						$X->A[$k][$j] /= $this->LU[$k][$k];
-					}
-					for ($i = 0; $i < $k; ++$i) {
-						for ($j = 0; $j < $nx; ++$j) {
-							$X->A[$i][$j] -= $X->A[$k][$j] * $this->LU[$i][$k];
-						}
-					}
-				}
-				return $X;
-			} else {
-				throw new PHPExcel_Calculation_Exception(self::MatrixSingularException);
-			}
-		} else {
-			throw new PHPExcel_Calculation_Exception(self::MatrixSquareException);
-		}
-	}	//	function solve()
-
-}	//	class PHPExcel_Shared_JAMA_LUDecomposition
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/Matrix.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/Matrix.php
deleted file mode 100644
index 1e7c334ac51..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/Matrix.php
+++ /dev/null
@@ -1,1057 +0,0 @@
-<?php
-/**
- * @package JAMA
- */
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/*
- *	Matrix class
- *
- *	@author Paul Meagher
- *	@author Michael Bommarito
- *	@author Lukasz Karapuda
- *	@author Bartek Matosiuk
- *	@version 1.8
- *	@license PHP v3.0
- *	@see http://math.nist.gov/javanumerics/jama/
- */
-class PHPExcel_Shared_JAMA_Matrix {
-
-
-	const PolymorphicArgumentException	= "Invalid argument pattern for polymorphic function.";
-	const ArgumentTypeException			= "Invalid argument type.";
-	const ArgumentBoundsException		= "Invalid argument range.";
-	const MatrixDimensionException		= "Matrix dimensions are not equal.";
-	const ArrayLengthException			= "Array length must be a multiple of m.";
-
-	/**
-	 *	Matrix storage
-	 *
-	 *	@var array
-	 *	@access public
-	 */
-	public $A = array();
-
-	/**
-	 *	Matrix row dimension
-	 *
-	 *	@var int
-	 *	@access private
-	 */
-	private $m;
-
-	/**
-	 *	Matrix column dimension
-	 *
-	 *	@var int
-	 *	@access private
-	 */
-	private $n;
-
-
-	/**
-	 *	Polymorphic constructor
-	 *
-	 *	As PHP has no support for polymorphic constructors, we hack our own sort of polymorphism using func_num_args, func_get_arg, and gettype. In essence, we're just implementing a simple RTTI filter and calling the appropriate constructor.
-	 */
-	public function __construct() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				//Rectangular matrix - m x n initialized from 2D array
-				case 'array':
-						$this->m = count($args[0]);
-						$this->n = count($args[0][0]);
-						$this->A = $args[0];
-						break;
-				//Square matrix - n x n
-				case 'integer':
-						$this->m = $args[0];
-						$this->n = $args[0];
-						$this->A = array_fill(0, $this->m, array_fill(0, $this->n, 0));
-						break;
-				//Rectangular matrix - m x n
-				case 'integer,integer':
-						$this->m = $args[0];
-						$this->n = $args[1];
-						$this->A = array_fill(0, $this->m, array_fill(0, $this->n, 0));
-						break;
-				//Rectangular matrix - m x n initialized from packed array
-				case 'array,integer':
-						$this->m = $args[1];
-						if ($this->m != 0) {
-							$this->n = count($args[0]) / $this->m;
-						} else {
-							$this->n = 0;
-						}
-						if (($this->m * $this->n) == count($args[0])) {
-							for($i = 0; $i < $this->m; ++$i) {
-								for($j = 0; $j < $this->n; ++$j) {
-									$this->A[$i][$j] = $args[0][$i + $j * $this->m];
-								}
-							}
-						} else {
-							throw new PHPExcel_Calculation_Exception(self::ArrayLengthException);
-						}
-						break;
-				default:
-						throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-						break;
-			}
-		} else {
-			throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function __construct()
-
-
-	/**
-	 *	getArray
-	 *
-	 *	@return array Matrix array
-	 */
-	public function getArray() {
-		return $this->A;
-	}	//	function getArray()
-
-
-	/**
-	 *	getRowDimension
-	 *
-	 *	@return int Row dimension
-	 */
-	public function getRowDimension() {
-		return $this->m;
-	}	//	function getRowDimension()
-
-
-	/**
-	 *	getColumnDimension
-	 *
-	 *	@return int Column dimension
-	 */
-	public function getColumnDimension() {
-		return $this->n;
-	}	//	function getColumnDimension()
-
-
-	/**
-	 *	get
-	 *
-	 *	Get the i,j-th element of the matrix.
-	 *	@param int $i Row position
-	 *	@param int $j Column position
-	 *	@return mixed Element (int/float/double)
-	 */
-	public function get($i = null, $j = null) {
-		return $this->A[$i][$j];
-	}	//	function get()
-
-
-	/**
-	 *	getMatrix
-	 *
-	 *	Get a submatrix
-	 *	@param int $i0 Initial row index
-	 *	@param int $iF Final row index
-	 *	@param int $j0 Initial column index
-	 *	@param int $jF Final column index
-	 *	@return Matrix Submatrix
-	 */
-	public function getMatrix() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				//A($i0...; $j0...)
-				case 'integer,integer':
-						list($i0, $j0) = $args;
-						if ($i0 >= 0) { $m = $this->m - $i0; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); }
-						if ($j0 >= 0) { $n = $this->n - $j0; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); }
-						$R = new PHPExcel_Shared_JAMA_Matrix($m, $n);
-						for($i = $i0; $i < $this->m; ++$i) {
-							for($j = $j0; $j < $this->n; ++$j) {
-								$R->set($i, $j, $this->A[$i][$j]);
-							}
-						}
-						return $R;
-						break;
-				//A($i0...$iF; $j0...$jF)
-				case 'integer,integer,integer,integer':
-						list($i0, $iF, $j0, $jF) = $args;
-						if (($iF > $i0) && ($this->m >= $iF) && ($i0 >= 0)) { $m = $iF - $i0; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); }
-						if (($jF > $j0) && ($this->n >= $jF) && ($j0 >= 0)) { $n = $jF - $j0; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); }
-						$R = new PHPExcel_Shared_JAMA_Matrix($m+1, $n+1);
-						for($i = $i0; $i <= $iF; ++$i) {
-							for($j = $j0; $j <= $jF; ++$j) {
-								$R->set($i - $i0, $j - $j0, $this->A[$i][$j]);
-							}
-						}
-						return $R;
-						break;
-				//$R = array of row indices; $C = array of column indices
-				case 'array,array':
-						list($RL, $CL) = $args;
-						if (count($RL) > 0) { $m = count($RL); } else { throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); }
-						if (count($CL) > 0) { $n = count($CL); } else { throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); }
-						$R = new PHPExcel_Shared_JAMA_Matrix($m, $n);
-						for($i = 0; $i < $m; ++$i) {
-							for($j = 0; $j < $n; ++$j) {
-								$R->set($i - $i0, $j - $j0, $this->A[$RL[$i]][$CL[$j]]);
-							}
-						}
-						return $R;
-						break;
-				//$RL = array of row indices; $CL = array of column indices
-				case 'array,array':
-						list($RL, $CL) = $args;
-						if (count($RL) > 0) { $m = count($RL); } else { throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); }
-						if (count($CL) > 0) { $n = count($CL); } else { throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); }
-						$R = new PHPExcel_Shared_JAMA_Matrix($m, $n);
-						for($i = 0; $i < $m; ++$i) {
-							for($j = 0; $j < $n; ++$j) {
-								$R->set($i, $j, $this->A[$RL[$i]][$CL[$j]]);
-							}
-						}
-						return $R;
-						break;
-				//A($i0...$iF); $CL = array of column indices
-				case 'integer,integer,array':
-						list($i0, $iF, $CL) = $args;
-						if (($iF > $i0) && ($this->m >= $iF) && ($i0 >= 0)) { $m = $iF - $i0; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); }
-						if (count($CL) > 0) { $n = count($CL); } else { throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); }
-						$R = new PHPExcel_Shared_JAMA_Matrix($m, $n);
-						for($i = $i0; $i < $iF; ++$i) {
-							for($j = 0; $j < $n; ++$j) {
-								$R->set($i - $i0, $j, $this->A[$RL[$i]][$j]);
-							}
-						}
-						return $R;
-						break;
-				//$RL = array of row indices
-				case 'array,integer,integer':
-						list($RL, $j0, $jF) = $args;
-						if (count($RL) > 0) { $m = count($RL); } else { throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); }
-						if (($jF >= $j0) && ($this->n >= $jF) && ($j0 >= 0)) { $n = $jF - $j0; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); }
-						$R = new PHPExcel_Shared_JAMA_Matrix($m, $n+1);
-						for($i = 0; $i < $m; ++$i) {
-							for($j = $j0; $j <= $jF; ++$j) {
-								$R->set($i, $j - $j0, $this->A[$RL[$i]][$j]);
-							}
-						}
-						return $R;
-						break;
-				default:
-						throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-						break;
-			}
-		} else {
-			throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function getMatrix()
-
-
-	/**
-	 *	checkMatrixDimensions
-	 *
-	 *	Is matrix B the same size?
-	 *	@param Matrix $B Matrix B
-	 *	@return boolean
-	 */
-	public function checkMatrixDimensions($B = null) {
-		if ($B instanceof PHPExcel_Shared_JAMA_Matrix) {
-			if (($this->m == $B->getRowDimension()) && ($this->n == $B->getColumnDimension())) {
-				return true;
-			} else {
-				throw new PHPExcel_Calculation_Exception(self::MatrixDimensionException);
-			}
-		} else {
-			throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException);
-		}
-	}	//	function checkMatrixDimensions()
-
-
-
-	/**
-	 *	set
-	 *
-	 *	Set the i,j-th element of the matrix.
-	 *	@param int $i Row position
-	 *	@param int $j Column position
-	 *	@param mixed $c Int/float/double value
-	 *	@return mixed Element (int/float/double)
-	 */
-	public function set($i = null, $j = null, $c = null) {
-		// Optimized set version just has this
-		$this->A[$i][$j] = $c;
-	}	//	function set()
-
-
-	/**
-	 *	identity
-	 *
-	 *	Generate an identity matrix.
-	 *	@param int $m Row dimension
-	 *	@param int $n Column dimension
-	 *	@return Matrix Identity matrix
-	 */
-	public function identity($m = null, $n = null) {
-		return $this->diagonal($m, $n, 1);
-	}	//	function identity()
-
-
-	/**
-	 *	diagonal
-	 *
-	 *	Generate a diagonal matrix
-	 *	@param int $m Row dimension
-	 *	@param int $n Column dimension
-	 *	@param mixed $c Diagonal value
-	 *	@return Matrix Diagonal matrix
-	 */
-	public function diagonal($m = null, $n = null, $c = 1) {
-		$R = new PHPExcel_Shared_JAMA_Matrix($m, $n);
-		for($i = 0; $i < $m; ++$i) {
-			$R->set($i, $i, $c);
-		}
-		return $R;
-	}	//	function diagonal()
-
-
-	/**
-	 *	getMatrixByRow
-	 *
-	 *	Get a submatrix by row index/range
-	 *	@param int $i0 Initial row index
-	 *	@param int $iF Final row index
-	 *	@return Matrix Submatrix
-	 */
-	public function getMatrixByRow($i0 = null, $iF = null) {
-		if (is_int($i0)) {
-			if (is_int($iF)) {
-				return $this->getMatrix($i0, 0, $iF + 1, $this->n);
-			} else {
-				return $this->getMatrix($i0, 0, $i0 + 1, $this->n);
-			}
-		} else {
-			throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException);
-		}
-	}	//	function getMatrixByRow()
-
-
-	/**
-	 *	getMatrixByCol
-	 *
-	 *	Get a submatrix by column index/range
-	 *	@param int $i0 Initial column index
-	 *	@param int $iF Final column index
-	 *	@return Matrix Submatrix
-	 */
-	public function getMatrixByCol($j0 = null, $jF = null) {
-		if (is_int($j0)) {
-			if (is_int($jF)) {
-				return $this->getMatrix(0, $j0, $this->m, $jF + 1);
-			} else {
-				return $this->getMatrix(0, $j0, $this->m, $j0 + 1);
-			}
-		} else {
-			throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException);
-		}
-	}	//	function getMatrixByCol()
-
-
-	/**
-	 *	transpose
-	 *
-	 *	Tranpose matrix
-	 *	@return Matrix Transposed matrix
-	 */
-	public function transpose() {
-		$R = new PHPExcel_Shared_JAMA_Matrix($this->n, $this->m);
-		for($i = 0; $i < $this->m; ++$i) {
-			for($j = 0; $j < $this->n; ++$j) {
-				$R->set($j, $i, $this->A[$i][$j]);
-			}
-		}
-		return $R;
-	}	//	function transpose()
-
-
-	/**
-	 *	trace
-	 *
-	 *	Sum of diagonal elements
-	 *	@return float Sum of diagonal elements
-	 */
-	public function trace() {
-		$s = 0;
-		$n = min($this->m, $this->n);
-		for($i = 0; $i < $n; ++$i) {
-			$s += $this->A[$i][$i];
-		}
-		return $s;
-	}	//	function trace()
-
-
-	/**
-	 *	uminus
-	 *
-	 *	Unary minus matrix -A
-	 *	@return Matrix Unary minus matrix
-	 */
-	public function uminus() {
-	}	//	function uminus()
-
-
-	/**
-	 *	plus
-	 *
-	 *	A + B
-	 *	@param mixed $B Matrix/Array
-	 *	@return Matrix Sum
-	 */
-	public function plus() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				case 'object':
-						if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); }
-						break;
-				case 'array':
-						$M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
-						break;
-				default:
-						throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-						break;
-			}
-			$this->checkMatrixDimensions($M);
-			for($i = 0; $i < $this->m; ++$i) {
-				for($j = 0; $j < $this->n; ++$j) {
-					$M->set($i, $j, $M->get($i, $j) + $this->A[$i][$j]);
-				}
-			}
-			return $M;
-		} else {
-			throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function plus()
-
-
-	/**
-	 *	plusEquals
-	 *
-	 *	A = A + B
-	 *	@param mixed $B Matrix/Array
-	 *	@return Matrix Sum
-	 */
-	public function plusEquals() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				case 'object':
-						if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); }
-						break;
-				case 'array':
-						$M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
-						break;
-				default:
-						throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-						break;
-			}
-			$this->checkMatrixDimensions($M);
-			for($i = 0; $i < $this->m; ++$i) {
-				for($j = 0; $j < $this->n; ++$j) {
-					$validValues = True;
-					$value = $M->get($i, $j);
-					if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
-						$this->A[$i][$j] = trim($this->A[$i][$j],'"');
-						$validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($this->A[$i][$j]);
-					}
-					if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
-						$value = trim($value,'"');
-						$validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($value);
-					}
-					if ($validValues) {
-						$this->A[$i][$j] += $value;
-					} else {
-						$this->A[$i][$j] = PHPExcel_Calculation_Functions::NaN();
-					}
-				}
-			}
-			return $this;
-		} else {
-			throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function plusEquals()
-
-
-	/**
-	 *	minus
-	 *
-	 *	A - B
-	 *	@param mixed $B Matrix/Array
-	 *	@return Matrix Sum
-	 */
-	public function minus() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				case 'object':
-						if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); }
-						break;
-				case 'array':
-						$M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
-						break;
-				default:
-						throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-						break;
-			}
-			$this->checkMatrixDimensions($M);
-			for($i = 0; $i < $this->m; ++$i) {
-				for($j = 0; $j < $this->n; ++$j) {
-					$M->set($i, $j, $M->get($i, $j) - $this->A[$i][$j]);
-				}
-			}
-			return $M;
-		} else {
-			throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function minus()
-
-
-	/**
-	 *	minusEquals
-	 *
-	 *	A = A - B
-	 *	@param mixed $B Matrix/Array
-	 *	@return Matrix Sum
-	 */
-	public function minusEquals() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				case 'object':
-						if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); }
-						break;
-				case 'array':
-						$M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
-						break;
-				default:
-						throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-						break;
-			}
-			$this->checkMatrixDimensions($M);
-			for($i = 0; $i < $this->m; ++$i) {
-				for($j = 0; $j < $this->n; ++$j) {
-					$validValues = True;
-					$value = $M->get($i, $j);
-					if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
-						$this->A[$i][$j] = trim($this->A[$i][$j],'"');
-						$validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($this->A[$i][$j]);
-					}
-					if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
-						$value = trim($value,'"');
-						$validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($value);
-					}
-					if ($validValues) {
-						$this->A[$i][$j] -= $value;
-					} else {
-						$this->A[$i][$j] = PHPExcel_Calculation_Functions::NaN();
-					}
-				}
-			}
-			return $this;
-		} else {
-			throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function minusEquals()
-
-
-	/**
-	 *	arrayTimes
-	 *
-	 *	Element-by-element multiplication
-	 *	Cij = Aij * Bij
-	 *	@param mixed $B Matrix/Array
-	 *	@return Matrix Matrix Cij
-	 */
-	public function arrayTimes() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				case 'object':
-						if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); }
-						break;
-				case 'array':
-						$M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
-						break;
-				default:
-						throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-						break;
-			}
-			$this->checkMatrixDimensions($M);
-			for($i = 0; $i < $this->m; ++$i) {
-				for($j = 0; $j < $this->n; ++$j) {
-					$M->set($i, $j, $M->get($i, $j) * $this->A[$i][$j]);
-				}
-			}
-			return $M;
-		} else {
-			throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function arrayTimes()
-
-
-	/**
-	 *	arrayTimesEquals
-	 *
-	 *	Element-by-element multiplication
-	 *	Aij = Aij * Bij
-	 *	@param mixed $B Matrix/Array
-	 *	@return Matrix Matrix Aij
-	 */
-	public function arrayTimesEquals() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				case 'object':
-						if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); }
-						break;
-				case 'array':
-						$M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
-						break;
-				default:
-						throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-						break;
-			}
-			$this->checkMatrixDimensions($M);
-			for($i = 0; $i < $this->m; ++$i) {
-				for($j = 0; $j < $this->n; ++$j) {
-					$validValues = True;
-					$value = $M->get($i, $j);
-					if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
-						$this->A[$i][$j] = trim($this->A[$i][$j],'"');
-						$validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($this->A[$i][$j]);
-					}
-					if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
-						$value = trim($value,'"');
-						$validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($value);
-					}
-					if ($validValues) {
-						$this->A[$i][$j] *= $value;
-					} else {
-						$this->A[$i][$j] = PHPExcel_Calculation_Functions::NaN();
-					}
-				}
-			}
-			return $this;
-		} else {
-			throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function arrayTimesEquals()
-
-
-	/**
-	 *	arrayRightDivide
-	 *
-	 *	Element-by-element right division
-	 *	A / B
-	 *	@param Matrix $B Matrix B
-	 *	@return Matrix Division result
-	 */
-	public function arrayRightDivide() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				case 'object':
-						if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); }
-						break;
-				case 'array':
-						$M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
-						break;
-				default:
-						throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-						break;
-			}
-			$this->checkMatrixDimensions($M);
-			for($i = 0; $i < $this->m; ++$i) {
-				for($j = 0; $j < $this->n; ++$j) {
-					$validValues = True;
-					$value = $M->get($i, $j);
-					if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
-						$this->A[$i][$j] = trim($this->A[$i][$j],'"');
-						$validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($this->A[$i][$j]);
-					}
-					if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
-						$value = trim($value,'"');
-						$validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($value);
-					}
-					if ($validValues) {
-						if ($value == 0) {
-							//	Trap for Divide by Zero error
-							$M->set($i, $j, '#DIV/0!');
-						} else {
-							$M->set($i, $j, $this->A[$i][$j] / $value);
-						}
-					} else {
-						$M->set($i, $j, PHPExcel_Calculation_Functions::NaN());
-					}
-				}
-			}
-			return $M;
-		} else {
-			throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function arrayRightDivide()
-
-
-	/**
-	 *	arrayRightDivideEquals
-	 *
-	 *	Element-by-element right division
-	 *	Aij = Aij / Bij
-	 *	@param mixed $B Matrix/Array
-	 *	@return Matrix Matrix Aij
-	 */
-	public function arrayRightDivideEquals() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				case 'object':
-						if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); }
-						break;
-				case 'array':
-						$M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
-						break;
-				default:
-						throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-						break;
-			}
-			$this->checkMatrixDimensions($M);
-			for($i = 0; $i < $this->m; ++$i) {
-				for($j = 0; $j < $this->n; ++$j) {
-					$this->A[$i][$j] = $this->A[$i][$j] / $M->get($i, $j);
-				}
-			}
-			return $M;
-		} else {
-			throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function arrayRightDivideEquals()
-
-
-	/**
-	 *	arrayLeftDivide
-	 *
-	 *	Element-by-element Left division
-	 *	A / B
-	 *	@param Matrix $B Matrix B
-	 *	@return Matrix Division result
-	 */
-	public function arrayLeftDivide() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				case 'object':
-						if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); }
-						break;
-				case 'array':
-						$M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
-						break;
-				default:
-						throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-						break;
-			}
-			$this->checkMatrixDimensions($M);
-			for($i = 0; $i < $this->m; ++$i) {
-				for($j = 0; $j < $this->n; ++$j) {
-					$M->set($i, $j, $M->get($i, $j) / $this->A[$i][$j]);
-				}
-			}
-			return $M;
-		} else {
-			throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function arrayLeftDivide()
-
-
-	/**
-	 *	arrayLeftDivideEquals
-	 *
-	 *	Element-by-element Left division
-	 *	Aij = Aij / Bij
-	 *	@param mixed $B Matrix/Array
-	 *	@return Matrix Matrix Aij
-	 */
-	public function arrayLeftDivideEquals() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				case 'object':
-						if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); }
-						break;
-				case 'array':
-						$M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
-						break;
-				default:
-						throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-						break;
-			}
-			$this->checkMatrixDimensions($M);
-			for($i = 0; $i < $this->m; ++$i) {
-				for($j = 0; $j < $this->n; ++$j) {
-					$this->A[$i][$j] = $M->get($i, $j) / $this->A[$i][$j];
-				}
-			}
-			return $M;
-		} else {
-			throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function arrayLeftDivideEquals()
-
-
-	/**
-	 *	times
-	 *
-	 *	Matrix multiplication
-	 *	@param mixed $n Matrix/Array/Scalar
-	 *	@return Matrix Product
-	 */
-	public function times() {
-		if (func_num_args() > 0) {
-			$args  = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				case 'object':
-						if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $B = $args[0]; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); }
-						if ($this->n == $B->m) {
-							$C = new PHPExcel_Shared_JAMA_Matrix($this->m, $B->n);
-							for($j = 0; $j < $B->n; ++$j) {
-								for ($k = 0; $k < $this->n; ++$k) {
-									$Bcolj[$k] = $B->A[$k][$j];
-								}
-								for($i = 0; $i < $this->m; ++$i) {
-									$Arowi = $this->A[$i];
-									$s = 0;
-									for($k = 0; $k < $this->n; ++$k) {
-										$s += $Arowi[$k] * $Bcolj[$k];
-									}
-									$C->A[$i][$j] = $s;
-								}
-							}
-							return $C;
-						} else {
-							throw new PHPExcel_Calculation_Exception(JAMAError(MatrixDimensionMismatch));
-						}
-						break;
-				case 'array':
-						$B = new PHPExcel_Shared_JAMA_Matrix($args[0]);
-						if ($this->n == $B->m) {
-							$C = new PHPExcel_Shared_JAMA_Matrix($this->m, $B->n);
-							for($i = 0; $i < $C->m; ++$i) {
-								for($j = 0; $j < $C->n; ++$j) {
-									$s = "0";
-									for($k = 0; $k < $C->n; ++$k) {
-										$s += $this->A[$i][$k] * $B->A[$k][$j];
-									}
-									$C->A[$i][$j] = $s;
-								}
-							}
-							return $C;
-						} else {
-							throw new PHPExcel_Calculation_Exception(JAMAError(MatrixDimensionMismatch));
-						}
-						return $M;
-						break;
-				case 'integer':
-						$C = new PHPExcel_Shared_JAMA_Matrix($this->A);
-						for($i = 0; $i < $C->m; ++$i) {
-							for($j = 0; $j < $C->n; ++$j) {
-								$C->A[$i][$j] *= $args[0];
-							}
-						}
-						return $C;
-						break;
-				case 'double':
-						$C = new PHPExcel_Shared_JAMA_Matrix($this->m, $this->n);
-						for($i = 0; $i < $C->m; ++$i) {
-							for($j = 0; $j < $C->n; ++$j) {
-								$C->A[$i][$j] = $args[0] * $this->A[$i][$j];
-							}
-						}
-						return $C;
-						break;
-				case 'float':
-						$C = new PHPExcel_Shared_JAMA_Matrix($this->A);
-						for($i = 0; $i < $C->m; ++$i) {
-							for($j = 0; $j < $C->n; ++$j) {
-								$C->A[$i][$j] *= $args[0];
-							}
-						}
-						return $C;
-						break;
-				default:
-						throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-						break;
-			}
-		} else {
-			throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function times()
-
-
-	/**
-	 *	power
-	 *
-	 *	A = A ^ B
-	 *	@param mixed $B Matrix/Array
-	 *	@return Matrix Sum
-	 */
-	public function power() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				case 'object':
-						if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); }
-						break;
-				case 'array':
-						$M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
-						break;
-				default:
-						throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-						break;
-			}
-			$this->checkMatrixDimensions($M);
-			for($i = 0; $i < $this->m; ++$i) {
-				for($j = 0; $j < $this->n; ++$j) {
-					$validValues = True;
-					$value = $M->get($i, $j);
-					if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
-						$this->A[$i][$j] = trim($this->A[$i][$j],'"');
-						$validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($this->A[$i][$j]);
-					}
-					if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
-						$value = trim($value,'"');
-						$validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($value);
-					}
-					if ($validValues) {
-						$this->A[$i][$j] = pow($this->A[$i][$j],$value);
-					} else {
-						$this->A[$i][$j] = PHPExcel_Calculation_Functions::NaN();
-					}
-				}
-			}
-			return $this;
-		} else {
-			throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function power()
-
-
-	/**
-	 *	concat
-	 *
-	 *	A = A & B
-	 *	@param mixed $B Matrix/Array
-	 *	@return Matrix Sum
-	 */
-	public function concat() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				case 'object':
-						if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); }
-				case 'array':
-						$M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
-						break;
-				default:
-						throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-						break;
-			}
-			$this->checkMatrixDimensions($M);
-			for($i = 0; $i < $this->m; ++$i) {
-				for($j = 0; $j < $this->n; ++$j) {
-					$this->A[$i][$j] = trim($this->A[$i][$j],'"').trim($M->get($i, $j),'"');
-				}
-			}
-			return $this;
-		} else {
-			throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function concat()
-
-
-	/**
-	 *	Solve A*X = B.
-	 *
-	 *	@param Matrix $B Right hand side
-	 *	@return Matrix ... Solution if A is square, least squares solution otherwise
-	 */
-	public function solve($B) {
-		if ($this->m == $this->n) {
-			$LU = new PHPExcel_Shared_JAMA_LUDecomposition($this);
-			return $LU->solve($B);
-		} else {
-			$QR = new PHPExcel_Shared_JAMA_QRDecomposition($this);
-			return $QR->solve($B);
-		}
-	}	//	function solve()
-
-
-	/**
-	 *	Matrix inverse or pseudoinverse.
-	 *
-	 *	@return Matrix ... Inverse(A) if A is square, pseudoinverse otherwise.
-	 */
-	public function inverse() {
-		return $this->solve($this->identity($this->m, $this->m));
-	}	//	function inverse()
-
-
-	/**
-	 *	det
-	 *
-	 *	Calculate determinant
-	 *	@return float Determinant
-	 */
-	public function det() {
-		$L = new PHPExcel_Shared_JAMA_LUDecomposition($this);
-		return $L->det();
-	}	//	function det()
-}	//	class PHPExcel_Shared_JAMA_Matrix
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/QRDecomposition.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/QRDecomposition.php
deleted file mode 100644
index 7538462987d..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/QRDecomposition.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-/**
- *	@package JAMA
- *
- *	For an m-by-n matrix A with m >= n, the QR decomposition is an m-by-n
- *	orthogonal matrix Q and an n-by-n upper triangular matrix R so that
- *	A = Q*R.
- *
- *	The QR decompostion always exists, even if the matrix does not have
- *	full rank, so the constructor will never fail.  The primary use of the
- *	QR decomposition is in the least squares solution of nonsquare systems
- *	of simultaneous linear equations.  This will fail if isFullRank()
- *	returns false.
- *
- *	@author  Paul Meagher
- *	@license PHP v3.0
- *	@version 1.1
- */
-class PHPExcel_Shared_JAMA_QRDecomposition {
-
-	const MatrixRankException	= "Can only perform operation on full-rank matrix.";
-
-	/**
-	 *	Array for internal storage of decomposition.
-	 *	@var array
-	 */
-	private $QR = array();
-
-	/**
-	 *	Row dimension.
-	 *	@var integer
-	 */
-	private $m;
-
-	/**
-	*	Column dimension.
-	*	@var integer
-	*/
-	private $n;
-
-	/**
-	 *	Array for internal storage of diagonal of R.
-	 *	@var  array
-	 */
-	private $Rdiag = array();
-
-
-	/**
-	 *	QR Decomposition computed by Householder reflections.
-	 *
-	 *	@param matrix $A Rectangular matrix
-	 *	@return Structure to access R and the Householder vectors and compute Q.
-	 */
-	public function __construct($A) {
-		if($A instanceof PHPExcel_Shared_JAMA_Matrix) {
-			// Initialize.
-			$this->QR = $A->getArrayCopy();
-			$this->m  = $A->getRowDimension();
-			$this->n  = $A->getColumnDimension();
-			// Main loop.
-			for ($k = 0; $k < $this->n; ++$k) {
-				// Compute 2-norm of k-th column without under/overflow.
-				$nrm = 0.0;
-				for ($i = $k; $i < $this->m; ++$i) {
-					$nrm = hypo($nrm, $this->QR[$i][$k]);
-				}
-				if ($nrm != 0.0) {
-					// Form k-th Householder vector.
-					if ($this->QR[$k][$k] < 0) {
-						$nrm = -$nrm;
-					}
-					for ($i = $k; $i < $this->m; ++$i) {
-						$this->QR[$i][$k] /= $nrm;
-					}
-					$this->QR[$k][$k] += 1.0;
-					// Apply transformation to remaining columns.
-					for ($j = $k+1; $j < $this->n; ++$j) {
-						$s = 0.0;
-						for ($i = $k; $i < $this->m; ++$i) {
-							$s += $this->QR[$i][$k] * $this->QR[$i][$j];
-						}
-						$s = -$s/$this->QR[$k][$k];
-						for ($i = $k; $i < $this->m; ++$i) {
-							$this->QR[$i][$j] += $s * $this->QR[$i][$k];
-						}
-					}
-				}
-				$this->Rdiag[$k] = -$nrm;
-			}
-		} else {
-			throw new PHPExcel_Calculation_Exception(PHPExcel_Shared_JAMA_Matrix::ArgumentTypeException);
-		}
-	}	//	function __construct()
-
-
-	/**
-	 *	Is the matrix full rank?
-	 *
-	 *	@return boolean true if R, and hence A, has full rank, else false.
-	 */
-	public function isFullRank() {
-		for ($j = 0; $j < $this->n; ++$j) {
-			if ($this->Rdiag[$j] == 0) {
-				return false;
-			}
-		}
-		return true;
-	}	//	function isFullRank()
-
-
-	/**
-	 *	Return the Householder vectors
-	 *
-	 *	@return Matrix Lower trapezoidal matrix whose columns define the reflections
-	 */
-	public function getH() {
-		for ($i = 0; $i < $this->m; ++$i) {
-			for ($j = 0; $j < $this->n; ++$j) {
-				if ($i >= $j) {
-					$H[$i][$j] = $this->QR[$i][$j];
-				} else {
-					$H[$i][$j] = 0.0;
-				}
-			}
-		}
-		return new PHPExcel_Shared_JAMA_Matrix($H);
-	}	//	function getH()
-
-
-	/**
-	 *	Return the upper triangular factor
-	 *
-	 *	@return Matrix upper triangular factor
-	 */
-	public function getR() {
-		for ($i = 0; $i < $this->n; ++$i) {
-			for ($j = 0; $j < $this->n; ++$j) {
-				if ($i < $j) {
-					$R[$i][$j] = $this->QR[$i][$j];
-				} elseif ($i == $j) {
-					$R[$i][$j] = $this->Rdiag[$i];
-				} else {
-					$R[$i][$j] = 0.0;
-				}
-			}
-		}
-		return new PHPExcel_Shared_JAMA_Matrix($R);
-	}	//	function getR()
-
-
-	/**
-	 *	Generate and return the (economy-sized) orthogonal factor
-	 *
-	 *	@return Matrix orthogonal factor
-	 */
-	public function getQ() {
-		for ($k = $this->n-1; $k >= 0; --$k) {
-			for ($i = 0; $i < $this->m; ++$i) {
-				$Q[$i][$k] = 0.0;
-			}
-			$Q[$k][$k] = 1.0;
-			for ($j = $k; $j < $this->n; ++$j) {
-				if ($this->QR[$k][$k] != 0) {
-					$s = 0.0;
-					for ($i = $k; $i < $this->m; ++$i) {
-						$s += $this->QR[$i][$k] * $Q[$i][$j];
-					}
-					$s = -$s/$this->QR[$k][$k];
-					for ($i = $k; $i < $this->m; ++$i) {
-						$Q[$i][$j] += $s * $this->QR[$i][$k];
-					}
-				}
-			}
-		}
-		/*
-		for($i = 0; $i < count($Q); ++$i) {
-			for($j = 0; $j < count($Q); ++$j) {
-				if(! isset($Q[$i][$j]) ) {
-					$Q[$i][$j] = 0;
-				}
-			}
-		}
-		*/
-		return new PHPExcel_Shared_JAMA_Matrix($Q);
-	}	//	function getQ()
-
-
-	/**
-	 *	Least squares solution of A*X = B
-	 *
-	 *	@param Matrix $B A Matrix with as many rows as A and any number of columns.
-	 *	@return Matrix Matrix that minimizes the two norm of Q*R*X-B.
-	 */
-	public function solve($B) {
-		if ($B->getRowDimension() == $this->m) {
-			if ($this->isFullRank()) {
-				// Copy right hand side
-				$nx = $B->getColumnDimension();
-				$X  = $B->getArrayCopy();
-				// Compute Y = transpose(Q)*B
-				for ($k = 0; $k < $this->n; ++$k) {
-					for ($j = 0; $j < $nx; ++$j) {
-						$s = 0.0;
-						for ($i = $k; $i < $this->m; ++$i) {
-							$s += $this->QR[$i][$k] * $X[$i][$j];
-						}
-						$s = -$s/$this->QR[$k][$k];
-						for ($i = $k; $i < $this->m; ++$i) {
-							$X[$i][$j] += $s * $this->QR[$i][$k];
-						}
-					}
-				}
-				// Solve R*X = Y;
-				for ($k = $this->n-1; $k >= 0; --$k) {
-					for ($j = 0; $j < $nx; ++$j) {
-						$X[$k][$j] /= $this->Rdiag[$k];
-					}
-					for ($i = 0; $i < $k; ++$i) {
-						for ($j = 0; $j < $nx; ++$j) {
-							$X[$i][$j] -= $X[$k][$j]* $this->QR[$i][$k];
-						}
-					}
-				}
-				$X = new PHPExcel_Shared_JAMA_Matrix($X);
-				return ($X->getMatrix(0, $this->n-1, 0, $nx));
-			} else {
-				throw new PHPExcel_Calculation_Exception(self::MatrixRankException);
-			}
-		} else {
-			throw new PHPExcel_Calculation_Exception(PHPExcel_Shared_JAMA_Matrix::MatrixDimensionException);
-		}
-	}	//	function solve()
-
-}	//	PHPExcel_Shared_JAMA_class QRDecomposition
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/SingularValueDecomposition.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/SingularValueDecomposition.php
deleted file mode 100644
index a4b096c5951..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/SingularValueDecomposition.php
+++ /dev/null
@@ -1,526 +0,0 @@
-<?php
-/**
- *	@package JAMA
- *
- *	For an m-by-n matrix A with m >= n, the singular value decomposition is
- *	an m-by-n orthogonal matrix U, an n-by-n diagonal matrix S, and
- *	an n-by-n orthogonal matrix V so that A = U*S*V'.
- *
- *	The singular values, sigma[$k] = S[$k][$k], are ordered so that
- *	sigma[0] >= sigma[1] >= ... >= sigma[n-1].
- *
- *	The singular value decompostion always exists, so the constructor will
- *	never fail.  The matrix condition number and the effective numerical
- *	rank can be computed from this decomposition.
- *
- *	@author  Paul Meagher
- *	@license PHP v3.0
- *	@version 1.1
- */
-class SingularValueDecomposition  {
-
-	/**
-	 *	Internal storage of U.
-	 *	@var array
-	 */
-	private $U = array();
-
-	/**
-	 *	Internal storage of V.
-	 *	@var array
-	 */
-	private $V = array();
-
-	/**
-	 *	Internal storage of singular values.
-	 *	@var array
-	 */
-	private $s = array();
-
-	/**
-	 *	Row dimension.
-	 *	@var int
-	 */
-	private $m;
-
-	/**
-	 *	Column dimension.
-	 *	@var int
-	 */
-	private $n;
-
-
-	/**
-	 *	Construct the singular value decomposition
-	 *
-	 *	Derived from LINPACK code.
-	 *
-	 *	@param $A Rectangular matrix
-	 *	@return Structure to access U, S and V.
-	 */
-	public function __construct($Arg) {
-
-		// Initialize.
-		$A = $Arg->getArrayCopy();
-		$this->m = $Arg->getRowDimension();
-		$this->n = $Arg->getColumnDimension();
-		$nu      = min($this->m, $this->n);
-		$e       = array();
-		$work    = array();
-		$wantu   = true;
-		$wantv   = true;
-		$nct = min($this->m - 1, $this->n);
-		$nrt = max(0, min($this->n - 2, $this->m));
-
-		// Reduce A to bidiagonal form, storing the diagonal elements
-		// in s and the super-diagonal elements in e.
-		for ($k = 0; $k < max($nct,$nrt); ++$k) {
-
-			if ($k < $nct) {
-				// Compute the transformation for the k-th column and
-				// place the k-th diagonal in s[$k].
-				// Compute 2-norm of k-th column without under/overflow.
-				$this->s[$k] = 0;
-				for ($i = $k; $i < $this->m; ++$i) {
-					$this->s[$k] = hypo($this->s[$k], $A[$i][$k]);
-				}
-				if ($this->s[$k] != 0.0) {
-					if ($A[$k][$k] < 0.0) {
-						$this->s[$k] = -$this->s[$k];
-					}
-					for ($i = $k; $i < $this->m; ++$i) {
-						$A[$i][$k] /= $this->s[$k];
-					}
-					$A[$k][$k] += 1.0;
-				}
-				$this->s[$k] = -$this->s[$k];
-			}
-
-			for ($j = $k + 1; $j < $this->n; ++$j) {
-				if (($k < $nct) & ($this->s[$k] != 0.0)) {
-					// Apply the transformation.
-					$t = 0;
-					for ($i = $k; $i < $this->m; ++$i) {
-						$t += $A[$i][$k] * $A[$i][$j];
-					}
-					$t = -$t / $A[$k][$k];
-					for ($i = $k; $i < $this->m; ++$i) {
-						$A[$i][$j] += $t * $A[$i][$k];
-					}
-					// Place the k-th row of A into e for the
-					// subsequent calculation of the row transformation.
-					$e[$j] = $A[$k][$j];
-				}
-			}
-
-			if ($wantu AND ($k < $nct)) {
-				// Place the transformation in U for subsequent back
-				// multiplication.
-				for ($i = $k; $i < $this->m; ++$i) {
-					$this->U[$i][$k] = $A[$i][$k];
-				}
-			}
-
-			if ($k < $nrt) {
-				// Compute the k-th row transformation and place the
-				// k-th super-diagonal in e[$k].
-				// Compute 2-norm without under/overflow.
-				$e[$k] = 0;
-				for ($i = $k + 1; $i < $this->n; ++$i) {
-					$e[$k] = hypo($e[$k], $e[$i]);
-				}
-				if ($e[$k] != 0.0) {
-					if ($e[$k+1] < 0.0) {
-						$e[$k] = -$e[$k];
-					}
-					for ($i = $k + 1; $i < $this->n; ++$i) {
-						$e[$i] /= $e[$k];
-					}
-					$e[$k+1] += 1.0;
-				}
-				$e[$k] = -$e[$k];
-				if (($k+1 < $this->m) AND ($e[$k] != 0.0)) {
-					// Apply the transformation.
-					for ($i = $k+1; $i < $this->m; ++$i) {
-						$work[$i] = 0.0;
-					}
-					for ($j = $k+1; $j < $this->n; ++$j) {
-						for ($i = $k+1; $i < $this->m; ++$i) {
-							$work[$i] += $e[$j] * $A[$i][$j];
-						}
-					}
-					for ($j = $k + 1; $j < $this->n; ++$j) {
-						$t = -$e[$j] / $e[$k+1];
-						for ($i = $k + 1; $i < $this->m; ++$i) {
-							$A[$i][$j] += $t * $work[$i];
-						}
-					}
-				}
-				if ($wantv) {
-					// Place the transformation in V for subsequent
-					// back multiplication.
-					for ($i = $k + 1; $i < $this->n; ++$i) {
-						$this->V[$i][$k] = $e[$i];
-					}
-				}
-			}
-		}
-
-		// Set up the final bidiagonal matrix or order p.
-		$p = min($this->n, $this->m + 1);
-		if ($nct < $this->n) {
-			$this->s[$nct] = $A[$nct][$nct];
-		}
-		if ($this->m < $p) {
-			$this->s[$p-1] = 0.0;
-		}
-		if ($nrt + 1 < $p) {
-			$e[$nrt] = $A[$nrt][$p-1];
-		}
-		$e[$p-1] = 0.0;
-		// If required, generate U.
-		if ($wantu) {
-			for ($j = $nct; $j < $nu; ++$j) {
-				for ($i = 0; $i < $this->m; ++$i) {
-					$this->U[$i][$j] = 0.0;
-				}
-				$this->U[$j][$j] = 1.0;
-			}
-			for ($k = $nct - 1; $k >= 0; --$k) {
-				if ($this->s[$k] != 0.0) {
-					for ($j = $k + 1; $j < $nu; ++$j) {
-						$t = 0;
-						for ($i = $k; $i < $this->m; ++$i) {
-							$t += $this->U[$i][$k] * $this->U[$i][$j];
-						}
-						$t = -$t / $this->U[$k][$k];
-						for ($i = $k; $i < $this->m; ++$i) {
-							$this->U[$i][$j] += $t * $this->U[$i][$k];
-						}
-					}
-					for ($i = $k; $i < $this->m; ++$i ) {
-						$this->U[$i][$k] = -$this->U[$i][$k];
-					}
-					$this->U[$k][$k] = 1.0 + $this->U[$k][$k];
-					for ($i = 0; $i < $k - 1; ++$i) {
-						$this->U[$i][$k] = 0.0;
-					}
-				} else {
-					for ($i = 0; $i < $this->m; ++$i) {
-						$this->U[$i][$k] = 0.0;
-					}
-					$this->U[$k][$k] = 1.0;
-				}
-			}
-		}
-
-		// If required, generate V.
-		if ($wantv) {
-			for ($k = $this->n - 1; $k >= 0; --$k) {
-				if (($k < $nrt) AND ($e[$k] != 0.0)) {
-					for ($j = $k + 1; $j < $nu; ++$j) {
-						$t = 0;
-						for ($i = $k + 1; $i < $this->n; ++$i) {
-							$t += $this->V[$i][$k]* $this->V[$i][$j];
-						}
-						$t = -$t / $this->V[$k+1][$k];
-						for ($i = $k + 1; $i < $this->n; ++$i) {
-							$this->V[$i][$j] += $t * $this->V[$i][$k];
-						}
-					}
-				}
-				for ($i = 0; $i < $this->n; ++$i) {
-					$this->V[$i][$k] = 0.0;
-				}
-				$this->V[$k][$k] = 1.0;
-			}
-		}
-
-		// Main iteration loop for the singular values.
-		$pp   = $p - 1;
-		$iter = 0;
-		$eps  = pow(2.0, -52.0);
-
-		while ($p > 0) {
-			// Here is where a test for too many iterations would go.
-			// This section of the program inspects for negligible
-			// elements in the s and e arrays.  On completion the
-			// variables kase and k are set as follows:
-			// kase = 1  if s(p) and e[k-1] are negligible and k<p
-			// kase = 2  if s(k) is negligible and k<p
-			// kase = 3  if e[k-1] is negligible, k<p, and
-			//           s(k), ..., s(p) are not negligible (qr step).
-			// kase = 4  if e(p-1) is negligible (convergence).
-			for ($k = $p - 2; $k >= -1; --$k) {
-				if ($k == -1) {
-					break;
-				}
-				if (abs($e[$k]) <= $eps * (abs($this->s[$k]) + abs($this->s[$k+1]))) {
-					$e[$k] = 0.0;
-					break;
-				}
-			}
-			if ($k == $p - 2) {
-				$kase = 4;
-			} else {
-				for ($ks = $p - 1; $ks >= $k; --$ks) {
-					if ($ks == $k) {
-						break;
-					}
-					$t = ($ks != $p ? abs($e[$ks]) : 0.) + ($ks != $k + 1 ? abs($e[$ks-1]) : 0.);
-					if (abs($this->s[$ks]) <= $eps * $t)  {
-						$this->s[$ks] = 0.0;
-						break;
-					}
-				}
-				if ($ks == $k) {
-					$kase = 3;
-				} else if ($ks == $p-1) {
-					$kase = 1;
-				} else {
-					$kase = 2;
-					$k = $ks;
-				}
-			}
-			++$k;
-
-			// Perform the task indicated by kase.
-			switch ($kase) {
-				// Deflate negligible s(p).
-				case 1:
-						$f = $e[$p-2];
-						$e[$p-2] = 0.0;
-						for ($j = $p - 2; $j >= $k; --$j) {
-							$t  = hypo($this->s[$j],$f);
-							$cs = $this->s[$j] / $t;
-							$sn = $f / $t;
-							$this->s[$j] = $t;
-							if ($j != $k) {
-								$f = -$sn * $e[$j-1];
-								$e[$j-1] = $cs * $e[$j-1];
-							}
-							if ($wantv) {
-								for ($i = 0; $i < $this->n; ++$i) {
-									$t = $cs * $this->V[$i][$j] + $sn * $this->V[$i][$p-1];
-									$this->V[$i][$p-1] = -$sn * $this->V[$i][$j] + $cs * $this->V[$i][$p-1];
-									$this->V[$i][$j] = $t;
-								}
-							}
-						}
-						break;
-				// Split at negligible s(k).
-				case 2:
-						$f = $e[$k-1];
-						$e[$k-1] = 0.0;
-						for ($j = $k; $j < $p; ++$j) {
-							$t = hypo($this->s[$j], $f);
-							$cs = $this->s[$j] / $t;
-							$sn = $f / $t;
-							$this->s[$j] = $t;
-							$f = -$sn * $e[$j];
-							$e[$j] = $cs * $e[$j];
-							if ($wantu) {
-								for ($i = 0; $i < $this->m; ++$i) {
-									$t = $cs * $this->U[$i][$j] + $sn * $this->U[$i][$k-1];
-									$this->U[$i][$k-1] = -$sn * $this->U[$i][$j] + $cs * $this->U[$i][$k-1];
-									$this->U[$i][$j] = $t;
-								}
-							}
-						}
-						break;
-				// Perform one qr step.
-				case 3:
-						// Calculate the shift.
-						$scale = max(max(max(max(
-									abs($this->s[$p-1]),abs($this->s[$p-2])),abs($e[$p-2])),
-									abs($this->s[$k])), abs($e[$k]));
-						$sp   = $this->s[$p-1] / $scale;
-						$spm1 = $this->s[$p-2] / $scale;
-						$epm1 = $e[$p-2] / $scale;
-						$sk   = $this->s[$k] / $scale;
-						$ek   = $e[$k] / $scale;
-						$b    = (($spm1 + $sp) * ($spm1 - $sp) + $epm1 * $epm1) / 2.0;
-						$c    = ($sp * $epm1) * ($sp * $epm1);
-						$shift = 0.0;
-						if (($b != 0.0) || ($c != 0.0)) {
-							$shift = sqrt($b * $b + $c);
-							if ($b < 0.0) {
-								$shift = -$shift;
-							}
-							$shift = $c / ($b + $shift);
-						}
-						$f = ($sk + $sp) * ($sk - $sp) + $shift;
-						$g = $sk * $ek;
-						// Chase zeros.
-						for ($j = $k; $j < $p-1; ++$j) {
-							$t  = hypo($f,$g);
-							$cs = $f/$t;
-							$sn = $g/$t;
-							if ($j != $k) {
-								$e[$j-1] = $t;
-							}
-							$f = $cs * $this->s[$j] + $sn * $e[$j];
-							$e[$j] = $cs * $e[$j] - $sn * $this->s[$j];
-							$g = $sn * $this->s[$j+1];
-							$this->s[$j+1] = $cs * $this->s[$j+1];
-							if ($wantv) {
-								for ($i = 0; $i < $this->n; ++$i) {
-									$t = $cs * $this->V[$i][$j] + $sn * $this->V[$i][$j+1];
-									$this->V[$i][$j+1] = -$sn * $this->V[$i][$j] + $cs * $this->V[$i][$j+1];
-									$this->V[$i][$j] = $t;
-								}
-							}
-							$t = hypo($f,$g);
-							$cs = $f/$t;
-							$sn = $g/$t;
-							$this->s[$j] = $t;
-							$f = $cs * $e[$j] + $sn * $this->s[$j+1];
-							$this->s[$j+1] = -$sn * $e[$j] + $cs * $this->s[$j+1];
-							$g = $sn * $e[$j+1];
-							$e[$j+1] = $cs * $e[$j+1];
-							if ($wantu && ($j < $this->m - 1)) {
-								for ($i = 0; $i < $this->m; ++$i) {
-									$t = $cs * $this->U[$i][$j] + $sn * $this->U[$i][$j+1];
-									$this->U[$i][$j+1] = -$sn * $this->U[$i][$j] + $cs * $this->U[$i][$j+1];
-									$this->U[$i][$j] = $t;
-								}
-							}
-						}
-						$e[$p-2] = $f;
-						$iter = $iter + 1;
-						break;
-				// Convergence.
-				case 4:
-						// Make the singular values positive.
-						if ($this->s[$k] <= 0.0) {
-							$this->s[$k] = ($this->s[$k] < 0.0 ? -$this->s[$k] : 0.0);
-							if ($wantv) {
-								for ($i = 0; $i <= $pp; ++$i) {
-									$this->V[$i][$k] = -$this->V[$i][$k];
-								}
-							}
-						}
-						// Order the singular values.
-						while ($k < $pp) {
-							if ($this->s[$k] >= $this->s[$k+1]) {
-								break;
-							}
-							$t = $this->s[$k];
-							$this->s[$k] = $this->s[$k+1];
-							$this->s[$k+1] = $t;
-							if ($wantv AND ($k < $this->n - 1)) {
-								for ($i = 0; $i < $this->n; ++$i) {
-									$t = $this->V[$i][$k+1];
-									$this->V[$i][$k+1] = $this->V[$i][$k];
-									$this->V[$i][$k] = $t;
-								}
-							}
-							if ($wantu AND ($k < $this->m-1)) {
-								for ($i = 0; $i < $this->m; ++$i) {
-									$t = $this->U[$i][$k+1];
-									$this->U[$i][$k+1] = $this->U[$i][$k];
-									$this->U[$i][$k] = $t;
-								}
-							}
-							++$k;
-						}
-						$iter = 0;
-						--$p;
-						break;
-			} // end switch
-		} // end while
-
-	} // end constructor
-
-
-	/**
-	 *	Return the left singular vectors
-	 *
-	 *	@access public
-	 *	@return U
-	 */
-	public function getU() {
-		return new Matrix($this->U, $this->m, min($this->m + 1, $this->n));
-	}
-
-
-	/**
-	 *	Return the right singular vectors
-	 *
-	 *	@access public
-	 *	@return V
-	 */
-	public function getV() {
-		return new Matrix($this->V);
-	}
-
-
-	/**
-	 *	Return the one-dimensional array of singular values
-	 *
-	 *	@access public
-	 *	@return diagonal of S.
-	 */
-	public function getSingularValues() {
-		return $this->s;
-	}
-
-
-	/**
-	 *	Return the diagonal matrix of singular values
-	 *
-	 *	@access public
-	 *	@return S
-	 */
-	public function getS() {
-		for ($i = 0; $i < $this->n; ++$i) {
-			for ($j = 0; $j < $this->n; ++$j) {
-				$S[$i][$j] = 0.0;
-			}
-			$S[$i][$i] = $this->s[$i];
-		}
-		return new Matrix($S);
-	}
-
-
-	/**
-	 *	Two norm
-	 *
-	 *	@access public
-	 *	@return max(S)
-	 */
-	public function norm2() {
-		return $this->s[0];
-	}
-
-
-	/**
-	 *	Two norm condition number
-	 *
-	 *	@access public
-	 *	@return max(S)/min(S)
-	 */
-	public function cond() {
-		return $this->s[0] / $this->s[min($this->m, $this->n) - 1];
-	}
-
-
-	/**
-	 *	Effective numerical matrix rank
-	 *
-	 *	@access public
-	 *	@return Number of nonnegligible singular values.
-	 */
-	public function rank() {
-		$eps = pow(2.0, -52.0);
-		$tol = max($this->m, $this->n) * $this->s[0] * $eps;
-		$r = 0;
-		for ($i = 0; $i < count($this->s); ++$i) {
-			if ($this->s[$i] > $tol) {
-				++$r;
-			}
-		}
-		return $r;
-	}
-
-}	//	class SingularValueDecomposition
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Error.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Error.php
deleted file mode 100644
index e73252b3d6a..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Error.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- *	@package JAMA
- *
- *	Error handling
- *	@author Michael Bommarito
- *	@version 01292005
- */
-
-//Language constant
-define('JAMALANG', 'EN');
-
-
-//All errors may be defined by the following format:
-//define('ExceptionName', N);
-//$error['lang'][ExceptionName] = 'Error message';
-$error = array();
-
-/*
-I've used Babelfish and a little poor knowledge of Romance/Germanic languages for the translations here.
-Feel free to correct anything that looks amiss to you.
-*/
-
-define('PolymorphicArgumentException', -1);
-$error['EN'][PolymorphicArgumentException] = "Invalid argument pattern for polymorphic function.";
-$error['FR'][PolymorphicArgumentException] = "Modèle inadmissible d'argument pour la fonction polymorphe.".
-$error['DE'][PolymorphicArgumentException] = "Unzulässiges Argumentmuster für polymorphe Funktion.";
-
-define('ArgumentTypeException', -2);
-$error['EN'][ArgumentTypeException] = "Invalid argument type.";
-$error['FR'][ArgumentTypeException] = "Type inadmissible d'argument.";
-$error['DE'][ArgumentTypeException] = "Unzulässige Argumentart.";
-
-define('ArgumentBoundsException', -3);
-$error['EN'][ArgumentBoundsException] = "Invalid argument range.";
-$error['FR'][ArgumentBoundsException] = "Gamme inadmissible d'argument.";
-$error['DE'][ArgumentBoundsException] = "Unzulässige Argumentstrecke.";
-
-define('MatrixDimensionException', -4);
-$error['EN'][MatrixDimensionException] = "Matrix dimensions are not equal.";
-$error['FR'][MatrixDimensionException] = "Les dimensions de Matrix ne sont pas égales.";
-$error['DE'][MatrixDimensionException] = "Matrixmaße sind nicht gleich.";
-
-define('PrecisionLossException', -5);
-$error['EN'][PrecisionLossException] = "Significant precision loss detected.";
-$error['FR'][PrecisionLossException] = "Perte significative de précision détectée.";
-$error['DE'][PrecisionLossException] = "Bedeutender Präzision Verlust ermittelte.";
-
-define('MatrixSPDException', -6);
-$error['EN'][MatrixSPDException] = "Can only perform operation on symmetric positive definite matrix.";
-$error['FR'][MatrixSPDException] = "Perte significative de précision détectée.";
-$error['DE'][MatrixSPDException] = "Bedeutender Präzision Verlust ermittelte.";
-
-define('MatrixSingularException', -7);
-$error['EN'][MatrixSingularException] = "Can only perform operation on singular matrix.";
-
-define('MatrixRankException', -8);
-$error['EN'][MatrixRankException] = "Can only perform operation on full-rank matrix.";
-
-define('ArrayLengthException', -9);
-$error['EN'][ArrayLengthException] = "Array length must be a multiple of m.";
-
-define('RowLengthException', -10);
-$error['EN'][RowLengthException] = "All rows must have the same length.";
-
-/**
- *	Custom error handler
- *	@param int $num Error number
- */
-function JAMAError($errorNumber = null) {
-	global $error;
-
-	if (isset($errorNumber)) {
-		if (isset($error[JAMALANG][$errorNumber])) {
-			return $error[JAMALANG][$errorNumber];
-		} else {
-			return $error['EN'][$errorNumber];
-		}
-	} else {
-		return ("Invalid argument to JAMAError()");
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Maths.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Maths.php
deleted file mode 100644
index aa09a8bbbfa..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Maths.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- *	@package JAMA
- *
- *	Pythagorean Theorem:
- *
- *	a = 3
- *	b = 4
- *	r = sqrt(square(a) + square(b))
- *	r = 5
- *
- *	r = sqrt(a^2 + b^2) without under/overflow.
- */
-function hypo($a, $b) {
-	if (abs($a) > abs($b)) {
-		$r = $b / $a;
-		$r = abs($a) * sqrt(1 + $r * $r);
-	} elseif ($b != 0) {
-		$r = $a / $b;
-		$r = abs($b) * sqrt(1 + $r * $r);
-	} else {
-		$r = 0.0;
-	}
-	return $r;
-}	//	function hypo()
-
-
-/**
- *	Mike Bommarito's version.
- *	Compute n-dimensional hyotheneuse.
- *
-function hypot() {
-	$s = 0;
-	foreach (func_get_args() as $d) {
-		if (is_numeric($d)) {
-			$s += pow($d, 2);
-		} else {
-			throw new PHPExcel_Calculation_Exception(JAMAError(ArgumentTypeException));
-		}
-	}
-	return sqrt($s);
-}
-*/
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE.php
deleted file mode 100644
index 076ca7e3e30..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE.php
+++ /dev/null
@@ -1,531 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2002 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Xavier Noguer <xnoguer@php.net>                              |
-// | Based on OLE::Storage_Lite by Kawai, Takanori                        |
-// +----------------------------------------------------------------------+
-//
-// $Id: OLE.php,v 1.13 2007/03/07 14:38:25 schmidt Exp $
-
-
-/**
-* Array for storing OLE instances that are accessed from
-* OLE_ChainedBlockStream::stream_open().
-* @var  array
-*/
-$GLOBALS['_OLE_INSTANCES'] = array();
-
-/**
-* OLE package base class.
-*
-* @author   Xavier Noguer <xnoguer@php.net>
-* @author   Christian Schmidt <schmidt@php.net>
-* @category   PHPExcel
-* @package    PHPExcel_Shared_OLE
-*/
-class PHPExcel_Shared_OLE
-{
-	const OLE_PPS_TYPE_ROOT   =      5;
-	const OLE_PPS_TYPE_DIR    =      1;
-	const OLE_PPS_TYPE_FILE   =      2;
-	const OLE_DATA_SIZE_SMALL = 0x1000;
-	const OLE_LONG_INT_SIZE   =      4;
-	const OLE_PPS_SIZE        =   0x80;
-
-	/**
-	 * The file handle for reading an OLE container
-	 * @var resource
-	*/
-	public $_file_handle;
-
-	/**
-	* Array of PPS's found on the OLE container
-	* @var array
-	*/
-	public $_list = array();
-
-	/**
-	 * Root directory of OLE container
-	 * @var OLE_PPS_Root
-	*/
-	public $root;
-
-	/**
-	 * Big Block Allocation Table
-	 * @var array  (blockId => nextBlockId)
-	*/
-	public $bbat;
-
-	/**
-	 * Short Block Allocation Table
-	 * @var array  (blockId => nextBlockId)
-	*/
-	public $sbat;
-
-	/**
-	 * Size of big blocks. This is usually 512.
-	 * @var  int  number of octets per block.
-	*/
-	public $bigBlockSize;
-
-	/**
-	 * Size of small blocks. This is usually 64.
-	 * @var  int  number of octets per block
-	*/
-	public $smallBlockSize;
-
-	/**
-	 * Reads an OLE container from the contents of the file given.
-	 *
-	 * @acces public
-	 * @param string $file
-	 * @return mixed true on success, PEAR_Error on failure
-	*/
-	public function read($file)
-	{
-		$fh = fopen($file, "r");
-		if (!$fh) {
-			throw new PHPExcel_Reader_Exception("Can't open file $file");
-		}
-		$this->_file_handle = $fh;
-
-		$signature = fread($fh, 8);
-		if ("\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1" != $signature) {
-			throw new PHPExcel_Reader_Exception("File doesn't seem to be an OLE container.");
-		}
-		fseek($fh, 28);
-		if (fread($fh, 2) != "\xFE\xFF") {
-			// This shouldn't be a problem in practice
-			throw new PHPExcel_Reader_Exception("Only Little-Endian encoding is supported.");
-		}
-		// Size of blocks and short blocks in bytes
-		$this->bigBlockSize = pow(2, self::_readInt2($fh));
-		$this->smallBlockSize  = pow(2, self::_readInt2($fh));
-
-		// Skip UID, revision number and version number
-		fseek($fh, 44);
-		// Number of blocks in Big Block Allocation Table
-		$bbatBlockCount = self::_readInt4($fh);
-
-		// Root chain 1st block
-		$directoryFirstBlockId = self::_readInt4($fh);
-
-		// Skip unused bytes
-		fseek($fh, 56);
-		// Streams shorter than this are stored using small blocks
-		$this->bigBlockThreshold = self::_readInt4($fh);
-		// Block id of first sector in Short Block Allocation Table
-		$sbatFirstBlockId = self::_readInt4($fh);
-		// Number of blocks in Short Block Allocation Table
-		$sbbatBlockCount = self::_readInt4($fh);
-		// Block id of first sector in Master Block Allocation Table
-		$mbatFirstBlockId = self::_readInt4($fh);
-		// Number of blocks in Master Block Allocation Table
-		$mbbatBlockCount = self::_readInt4($fh);
-		$this->bbat = array();
-
-		// Remaining 4 * 109 bytes of current block is beginning of Master
-		// Block Allocation Table
-		$mbatBlocks = array();
-		for ($i = 0; $i < 109; ++$i) {
-			$mbatBlocks[] = self::_readInt4($fh);
-		}
-
-		// Read rest of Master Block Allocation Table (if any is left)
-		$pos = $this->_getBlockOffset($mbatFirstBlockId);
-		for ($i = 0; $i < $mbbatBlockCount; ++$i) {
-			fseek($fh, $pos);
-			for ($j = 0; $j < $this->bigBlockSize / 4 - 1; ++$j) {
-				$mbatBlocks[] = self::_readInt4($fh);
-			}
-			// Last block id in each block points to next block
-			$pos = $this->_getBlockOffset(self::_readInt4($fh));
-		}
-
-		// Read Big Block Allocation Table according to chain specified by
-		// $mbatBlocks
-		for ($i = 0; $i < $bbatBlockCount; ++$i) {
-			$pos = $this->_getBlockOffset($mbatBlocks[$i]);
-			fseek($fh, $pos);
-			for ($j = 0 ; $j < $this->bigBlockSize / 4; ++$j) {
-				$this->bbat[] = self::_readInt4($fh);
-			}
-		}
-
-		// Read short block allocation table (SBAT)
-		$this->sbat = array();
-		$shortBlockCount = $sbbatBlockCount * $this->bigBlockSize / 4;
-		$sbatFh = $this->getStream($sbatFirstBlockId);
-		for ($blockId = 0; $blockId < $shortBlockCount; ++$blockId) {
-			$this->sbat[$blockId] = self::_readInt4($sbatFh);
-		}
-		fclose($sbatFh);
-
-		$this->_readPpsWks($directoryFirstBlockId);
-
-		return true;
-	}
-
-	/**
-	 * @param  int  block id
-	 * @param  int  byte offset from beginning of file
-	 * @access public
-	 */
-	public function _getBlockOffset($blockId)
-	{
-		return 512 + $blockId * $this->bigBlockSize;
-	}
-
-	/**
-	* Returns a stream for use with fread() etc. External callers should
-	* use PHPExcel_Shared_OLE_PPS_File::getStream().
-	* @param   int|PPS   block id or PPS
-	* @return  resource  read-only stream
-	*/
-	public function getStream($blockIdOrPps)
-	{
-		static $isRegistered = false;
-		if (!$isRegistered) {
-			stream_wrapper_register('ole-chainedblockstream',
-				'PHPExcel_Shared_OLE_ChainedBlockStream');
-			$isRegistered = true;
-		}
-
-		// Store current instance in global array, so that it can be accessed
-		// in OLE_ChainedBlockStream::stream_open().
-		// Object is removed from self::$instances in OLE_Stream::close().
-		$GLOBALS['_OLE_INSTANCES'][] = $this;
-		$instanceId = end(array_keys($GLOBALS['_OLE_INSTANCES']));
-
-		$path = 'ole-chainedblockstream://oleInstanceId=' . $instanceId;
-		if ($blockIdOrPps instanceof PHPExcel_Shared_OLE_PPS) {
-			$path .= '&blockId=' . $blockIdOrPps->_StartBlock;
-			$path .= '&size=' . $blockIdOrPps->Size;
-		} else {
-			$path .= '&blockId=' . $blockIdOrPps;
-		}
-		return fopen($path, 'r');
-	}
-
-	/**
-	 * Reads a signed char.
-	 * @param   resource  file handle
-	 * @return  int
-	 * @access public
-	 */
-	private static function _readInt1($fh)
-	{
-		list(, $tmp) = unpack("c", fread($fh, 1));
-		return $tmp;
-	}
-
-	/**
-	 * Reads an unsigned short (2 octets).
-	 * @param   resource  file handle
-	 * @return  int
-	 * @access public
-	 */
-	private static function _readInt2($fh)
-	{
-		list(, $tmp) = unpack("v", fread($fh, 2));
-		return $tmp;
-	}
-
-	/**
-	 * Reads an unsigned long (4 octets).
-	 * @param   resource  file handle
-	 * @return  int
-	 * @access public
-	 */
-	private static function _readInt4($fh)
-	{
-		list(, $tmp) = unpack("V", fread($fh, 4));
-		return $tmp;
-	}
-
-	/**
-	* Gets information about all PPS's on the OLE container from the PPS WK's
-	* creates an OLE_PPS object for each one.
-	*
-	* @access public
-	* @param  integer  the block id of the first block
-	* @return mixed true on success, PEAR_Error on failure
-	*/
-	public function _readPpsWks($blockId)
-	{
-		$fh = $this->getStream($blockId);
-		for ($pos = 0; ; $pos += 128) {
-			fseek($fh, $pos, SEEK_SET);
-			$nameUtf16 = fread($fh, 64);
-			$nameLength = self::_readInt2($fh);
-			$nameUtf16 = substr($nameUtf16, 0, $nameLength - 2);
-			// Simple conversion from UTF-16LE to ISO-8859-1
-			$name = str_replace("\x00", "", $nameUtf16);
-			$type = self::_readInt1($fh);
-			switch ($type) {
-			case self::OLE_PPS_TYPE_ROOT:
-				$pps = new PHPExcel_Shared_OLE_PPS_Root(null, null, array());
-				$this->root = $pps;
-				break;
-			case self::OLE_PPS_TYPE_DIR:
-				$pps = new PHPExcel_Shared_OLE_PPS(null, null, null, null, null,
-								   null, null, null, null, array());
-				break;
-			case self::OLE_PPS_TYPE_FILE:
-				$pps = new PHPExcel_Shared_OLE_PPS_File($name);
-				break;
-			default:
-				continue 2;
-			}
-			fseek($fh, 1, SEEK_CUR);
-			$pps->Type    = $type;
-			$pps->Name    = $name;
-			$pps->PrevPps = self::_readInt4($fh);
-			$pps->NextPps = self::_readInt4($fh);
-			$pps->DirPps  = self::_readInt4($fh);
-			fseek($fh, 20, SEEK_CUR);
-			$pps->Time1st = self::OLE2LocalDate(fread($fh, 8));
-			$pps->Time2nd = self::OLE2LocalDate(fread($fh, 8));
-			$pps->_StartBlock = self::_readInt4($fh);
-			$pps->Size = self::_readInt4($fh);
-			$pps->No = count($this->_list);
-			$this->_list[] = $pps;
-
-			// check if the PPS tree (starting from root) is complete
-			if (isset($this->root) &&
-				$this->_ppsTreeComplete($this->root->No)) {
-
-				break;
-			}
-		}
-		fclose($fh);
-
-		// Initialize $pps->children on directories
-		foreach ($this->_list as $pps) {
-			if ($pps->Type == self::OLE_PPS_TYPE_DIR || $pps->Type == self::OLE_PPS_TYPE_ROOT) {
-				$nos = array($pps->DirPps);
-				$pps->children = array();
-				while ($nos) {
-					$no = array_pop($nos);
-					if ($no != -1) {
-						$childPps = $this->_list[$no];
-						$nos[] = $childPps->PrevPps;
-						$nos[] = $childPps->NextPps;
-						$pps->children[] = $childPps;
-					}
-				}
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	* It checks whether the PPS tree is complete (all PPS's read)
-	* starting with the given PPS (not necessarily root)
-	*
-	* @access public
-	* @param integer $index The index of the PPS from which we are checking
-	* @return boolean Whether the PPS tree for the given PPS is complete
-	*/
-	public function _ppsTreeComplete($index)
-	{
-		return isset($this->_list[$index]) &&
-			   ($pps = $this->_list[$index]) &&
-			   ($pps->PrevPps == -1 ||
-				$this->_ppsTreeComplete($pps->PrevPps)) &&
-			   ($pps->NextPps == -1 ||
-				$this->_ppsTreeComplete($pps->NextPps)) &&
-			   ($pps->DirPps == -1 ||
-				$this->_ppsTreeComplete($pps->DirPps));
-	}
-
-	/**
-	* Checks whether a PPS is a File PPS or not.
-	* If there is no PPS for the index given, it will return false.
-	*
-	* @access public
-	* @param integer $index The index for the PPS
-	* @return bool true if it's a File PPS, false otherwise
-	*/
-	public function isFile($index)
-	{
-		if (isset($this->_list[$index])) {
-			return ($this->_list[$index]->Type == self::OLE_PPS_TYPE_FILE);
-		}
-		return false;
-	}
-
-	/**
-	* Checks whether a PPS is a Root PPS or not.
-	* If there is no PPS for the index given, it will return false.
-	*
-	* @access public
-	* @param integer $index The index for the PPS.
-	* @return bool true if it's a Root PPS, false otherwise
-	*/
-	public function isRoot($index)
-	{
-		if (isset($this->_list[$index])) {
-			return ($this->_list[$index]->Type == self::OLE_PPS_TYPE_ROOT);
-		}
-		return false;
-	}
-
-	/**
-	* Gives the total number of PPS's found in the OLE container.
-	*
-	* @access public
-	* @return integer The total number of PPS's found in the OLE container
-	*/
-	public function ppsTotal()
-	{
-		return count($this->_list);
-	}
-
-	/**
-	* Gets data from a PPS
-	* If there is no PPS for the index given, it will return an empty string.
-	*
-	* @access public
-	* @param integer $index    The index for the PPS
-	* @param integer $position The position from which to start reading
-	*                          (relative to the PPS)
-	* @param integer $length   The amount of bytes to read (at most)
-	* @return string The binary string containing the data requested
-	* @see OLE_PPS_File::getStream()
-	*/
-	public function getData($index, $position, $length)
-	{
-		// if position is not valid return empty string
-		if (!isset($this->_list[$index]) || ($position >= $this->_list[$index]->Size) || ($position < 0)) {
-			return '';
-		}
-		$fh = $this->getStream($this->_list[$index]);
-		$data = stream_get_contents($fh, $length, $position);
-		fclose($fh);
-		return $data;
-	}
-
-	/**
-	* Gets the data length from a PPS
-	* If there is no PPS for the index given, it will return 0.
-	*
-	* @access public
-	* @param integer $index    The index for the PPS
-	* @return integer The amount of bytes in data the PPS has
-	*/
-	public function getDataLength($index)
-	{
-		if (isset($this->_list[$index])) {
-			return $this->_list[$index]->Size;
-		}
-		return 0;
-	}
-
-	/**
-	* Utility function to transform ASCII text to Unicode
-	*
-	* @access public
-	* @static
-	* @param string $ascii The ASCII string to transform
-	* @return string The string in Unicode
-	*/
-	public static function Asc2Ucs($ascii)
-	{
-		$rawname = '';
-		for ($i = 0; $i < strlen($ascii); ++$i) {
-			$rawname .= $ascii{$i} . "\x00";
-		}
-		return $rawname;
-	}
-
-	/**
-	* Utility function
-	* Returns a string for the OLE container with the date given
-	*
-	* @access public
-	* @static
-	* @param integer $date A timestamp
-	* @return string The string for the OLE container
-	*/
-	public static function LocalDate2OLE($date = null)
-	{
-		if (!isset($date)) {
-			return "\x00\x00\x00\x00\x00\x00\x00\x00";
-		}
-
-		// factor used for separating numbers into 4 bytes parts
-		$factor = pow(2, 32);
-
-		// days from 1-1-1601 until the beggining of UNIX era
-		$days = 134774;
-		// calculate seconds
-		$big_date = $days*24*3600 + gmmktime(date("H",$date),date("i",$date),date("s",$date),
-											 date("m",$date),date("d",$date),date("Y",$date));
-		// multiply just to make MS happy
-		$big_date *= 10000000;
-
-		$high_part = floor($big_date / $factor);
-		// lower 4 bytes
-		$low_part = floor((($big_date / $factor) - $high_part) * $factor);
-
-		// Make HEX string
-		$res = '';
-
-		for ($i = 0; $i < 4; ++$i) {
-			$hex = $low_part % 0x100;
-			$res .= pack('c', $hex);
-			$low_part /= 0x100;
-		}
-		for ($i = 0; $i < 4; ++$i) {
-			$hex = $high_part % 0x100;
-			$res .= pack('c', $hex);
-			$high_part /= 0x100;
-		}
-		return $res;
-	}
-
-	/**
-	* Returns a timestamp from an OLE container's date
-	*
-	* @access public
-	* @static
-	* @param integer $string A binary string with the encoded date
-	* @return string The timestamp corresponding to the string
-	*/
-	public static function OLE2LocalDate($string)
-	{
-		if (strlen($string) != 8) {
-			return new PEAR_Error("Expecting 8 byte string");
-		}
-
-		// factor used for separating numbers into 4 bytes parts
-		$factor = pow(2,32);
-		list(, $high_part) = unpack('V', substr($string, 4, 4));
-		list(, $low_part) = unpack('V', substr($string, 0, 4));
-
-		$big_date = ($high_part * $factor) + $low_part;
-		// translate to seconds
-		$big_date /= 10000000;
-
-		// days from 1-1-1601 until the beggining of UNIX era
-		$days = 134774;
-
-		// translate to seconds from beggining of UNIX era
-		$big_date -= $days * 24 * 3600;
-		return floor($big_date);
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/ChainedBlockStream.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/ChainedBlockStream.php
deleted file mode 100644
index 0736fc23248..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/ChainedBlockStream.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (C) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_OLE
- * @copyright  Copyright (c) 2006 - 2007 Christian Schmidt
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version ##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Shared_OLE_ChainedBlockStream
- *
- * Stream wrapper for reading data stored in an OLE file. Implements methods
- * for PHP's stream_wrapper_register(). For creating streams using this
- * wrapper, use PHPExcel_Shared_OLE_PPS_File::getStream().
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_OLE
- */
-class PHPExcel_Shared_OLE_ChainedBlockStream
-{
-	/**
-	 * The OLE container of the file that is being read.
-	 * @var OLE
-	 */
-	public $ole;
-
-	/**
-	 * Parameters specified by fopen().
-	 * @var array
-	 */
-	public $params;
-
-	/**
-	 * The binary data of the file.
-	 * @var  string
-	 */
-	public $data;
-
-	/**
-	 * The file pointer.
-	 * @var  int  byte offset
-	 */
-	public $pos;
-
-	/**
-	 * Implements support for fopen().
-	 * For creating streams using this wrapper, use OLE_PPS_File::getStream().
-	 *
-	 * @param	string	$path			resource name including scheme, e.g.
-	 *									ole-chainedblockstream://oleInstanceId=1
-	 * @param	string	$mode			only "r" is supported
-	 * @param	int		$options		mask of STREAM_REPORT_ERRORS and STREAM_USE_PATH
-	 * @param	string  &$openedPath	absolute path of the opened stream (out parameter)
-	 * @return	bool    true on success
-	 */
-	public function stream_open($path, $mode, $options, &$openedPath)
-	{
-		if ($mode != 'r') {
-			if ($options & STREAM_REPORT_ERRORS) {
-				trigger_error('Only reading is supported', E_USER_WARNING);
-			}
-			return false;
-		}
-
-		// 25 is length of "ole-chainedblockstream://"
-		parse_str(substr($path, 25), $this->params);
-		if (!isset($this->params['oleInstanceId'],
-				   $this->params['blockId'],
-				   $GLOBALS['_OLE_INSTANCES'][$this->params['oleInstanceId']])) {
-
-			if ($options & STREAM_REPORT_ERRORS) {
-				trigger_error('OLE stream not found', E_USER_WARNING);
-			}
-			return false;
-		}
-		$this->ole = $GLOBALS['_OLE_INSTANCES'][$this->params['oleInstanceId']];
-
-		$blockId = $this->params['blockId'];
-		$this->data = '';
-		if (isset($this->params['size']) &&
-			$this->params['size'] < $this->ole->bigBlockThreshold &&
-			$blockId != $this->ole->root->_StartBlock) {
-
-			// Block id refers to small blocks
-			$rootPos = $this->ole->_getBlockOffset($this->ole->root->_StartBlock);
-			while ($blockId != -2) {
-				$pos = $rootPos + $blockId * $this->ole->bigBlockSize;
-				$blockId = $this->ole->sbat[$blockId];
-				fseek($this->ole->_file_handle, $pos);
-				$this->data .= fread($this->ole->_file_handle, $this->ole->bigBlockSize);
-			}
-		} else {
-			// Block id refers to big blocks
-			while ($blockId != -2) {
-				$pos = $this->ole->_getBlockOffset($blockId);
-				fseek($this->ole->_file_handle, $pos);
-				$this->data .= fread($this->ole->_file_handle, $this->ole->bigBlockSize);
-				$blockId = $this->ole->bbat[$blockId];
-			}
-		}
-		if (isset($this->params['size'])) {
-			$this->data = substr($this->data, 0, $this->params['size']);
-		}
-
-		if ($options & STREAM_USE_PATH) {
-			$openedPath = $path;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Implements support for fclose().
-	 *
-	 */
-	public function stream_close()
-	{
-		$this->ole = null;
-		unset($GLOBALS['_OLE_INSTANCES']);
-	}
-
-	/**
-	 * Implements support for fread(), fgets() etc.
-	 *
-	 * @param   int		$count	maximum number of bytes to read
-	 * @return  string
-	 */
-	public function stream_read($count)
-	{
-		if ($this->stream_eof()) {
-			return false;
-		}
-		$s = substr($this->data, $this->pos, $count);
-		$this->pos += $count;
-		return $s;
-	}
-
-	/**
-	 * Implements support for feof().
-	 *
-	 * @return  bool  TRUE if the file pointer is at EOF; otherwise FALSE
-	 */
-	public function stream_eof()
-	{
-		return $this->pos >= strlen($this->data);
-	}
-
-	/**
-	 * Returns the position of the file pointer, i.e. its offset into the file
-	 * stream. Implements support for ftell().
-	 *
-	 * @return  int
-	 */
-	public function stream_tell()
-	{
-		return $this->pos;
-	}
-
-	/**
-	 * Implements support for fseek().
-	 *
-	 * @param	int		$offset	byte offset
-	 * @param	int		$whence	SEEK_SET, SEEK_CUR or SEEK_END
-	 * @return	bool
-	 */
-	public function stream_seek($offset, $whence)
-	{
-		if ($whence == SEEK_SET && $offset >= 0) {
-			$this->pos = $offset;
-		} elseif ($whence == SEEK_CUR && -$offset <= $this->pos) {
-			$this->pos += $offset;
-		} elseif ($whence == SEEK_END && -$offset <= sizeof($this->data)) {
-			$this->pos = strlen($this->data) + $offset;
-		} else {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Implements support for fstat(). Currently the only supported field is
-	 * "size".
-	 * @return  array
-	 */
-	public function stream_stat()
-	{
-		return array(
-			'size' => strlen($this->data),
-			);
-	}
-
-	// Methods used by stream_wrapper_register() that are not implemented:
-	// bool stream_flush ( void )
-	// int stream_write ( string data )
-	// bool rename ( string path_from, string path_to )
-	// bool mkdir ( string path, int mode, int options )
-	// bool rmdir ( string path, int options )
-	// bool dir_opendir ( string path, int options )
-	// array url_stat ( string path, int flags )
-	// string dir_readdir ( void )
-	// bool dir_rewinddir ( void )
-	// bool dir_closedir ( void )
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS.php
deleted file mode 100644
index 4db0ae4e27b..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2002 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Xavier Noguer <xnoguer@php.net>                              |
-// | Based on OLE::Storage_Lite by Kawai, Takanori                        |
-// +----------------------------------------------------------------------+
-//
-// $Id: PPS.php,v 1.7 2007/02/13 21:00:42 schmidt Exp $
-
-
-/**
-* Class for creating PPS's for OLE containers
-*
-* @author   Xavier Noguer <xnoguer@php.net>
-* @category PHPExcel
-* @package  PHPExcel_Shared_OLE
-*/
-class PHPExcel_Shared_OLE_PPS
-{
-	/**
-	* The PPS index
-	* @var integer
-	*/
-	public $No;
-
-	/**
-	* The PPS name (in Unicode)
-	* @var string
-	*/
-	public $Name;
-
-	/**
-	* The PPS type. Dir, Root or File
-	* @var integer
-	*/
-	public $Type;
-
-	/**
-	* The index of the previous PPS
-	* @var integer
-	*/
-	public $PrevPps;
-
-	/**
-	* The index of the next PPS
-	* @var integer
-	*/
-	public $NextPps;
-
-	/**
-	* The index of it's first child if this is a Dir or Root PPS
-	* @var integer
-	*/
-	public $DirPps;
-
-	/**
-	* A timestamp
-	* @var integer
-	*/
-	public $Time1st;
-
-	/**
-	* A timestamp
-	* @var integer
-	*/
-	public $Time2nd;
-
-	/**
-	* Starting block (small or big) for this PPS's data  inside the container
-	* @var integer
-	*/
-	public $_StartBlock;
-
-	/**
-	* The size of the PPS's data (in bytes)
-	* @var integer
-	*/
-	public $Size;
-
-	/**
-	* The PPS's data (only used if it's not using a temporary file)
-	* @var string
-	*/
-	public $_data;
-
-	/**
-	* Array of child PPS's (only used by Root and Dir PPS's)
-	* @var array
-	*/
-	public $children = array();
-
-	/**
-	* Pointer to OLE container
-	* @var OLE
-	*/
-	public $ole;
-
-	/**
-	* The constructor
-	*
-	* @access public
-	* @param integer $No   The PPS index
-	* @param string  $name The PPS name
-	* @param integer $type The PPS type. Dir, Root or File
-	* @param integer $prev The index of the previous PPS
-	* @param integer $next The index of the next PPS
-	* @param integer $dir  The index of it's first child if this is a Dir or Root PPS
-	* @param integer $time_1st A timestamp
-	* @param integer $time_2nd A timestamp
-	* @param string  $data  The (usually binary) source data of the PPS
-	* @param array   $children Array containing children PPS for this PPS
-	*/
-	public function __construct($No, $name, $type, $prev, $next, $dir, $time_1st, $time_2nd, $data, $children)
-	{
-		$this->No      = $No;
-		$this->Name    = $name;
-		$this->Type    = $type;
-		$this->PrevPps = $prev;
-		$this->NextPps = $next;
-		$this->DirPps  = $dir;
-		$this->Time1st = $time_1st;
-		$this->Time2nd = $time_2nd;
-		$this->_data      = $data;
-		$this->children   = $children;
-		if ($data != '') {
-			$this->Size = strlen($data);
-		} else {
-			$this->Size = 0;
-		}
-	}
-
-	/**
-	* Returns the amount of data saved for this PPS
-	*
-	* @access public
-	* @return integer The amount of data (in bytes)
-	*/
-	public function _DataLen()
-	{
-		if (!isset($this->_data)) {
-			return 0;
-		}
-		//if (isset($this->_PPS_FILE)) {
-		//	fseek($this->_PPS_FILE, 0);
-		//	$stats = fstat($this->_PPS_FILE);
-		//	return $stats[7];
-		//} else {
-			return strlen($this->_data);
-		//}
-	}
-
-	/**
-	* Returns a string with the PPS's WK (What is a WK?)
-	*
-	* @access public
-	* @return string The binary string
-	*/
-	public function _getPpsWk()
-	{
-		$ret = str_pad($this->Name,64,"\x00");
-
-		$ret .= pack("v", strlen($this->Name) + 2)  // 66
-			  . pack("c", $this->Type)              // 67
-			  . pack("c", 0x00) //UK                // 68
-			  . pack("V", $this->PrevPps) //Prev    // 72
-			  . pack("V", $this->NextPps) //Next    // 76
-			  . pack("V", $this->DirPps)  //Dir     // 80
-			  . "\x00\x09\x02\x00"                  // 84
-			  . "\x00\x00\x00\x00"                  // 88
-			  . "\xc0\x00\x00\x00"                  // 92
-			  . "\x00\x00\x00\x46"                  // 96 // Seems to be ok only for Root
-			  . "\x00\x00\x00\x00"                  // 100
-			  . PHPExcel_Shared_OLE::LocalDate2OLE($this->Time1st)       // 108
-			  . PHPExcel_Shared_OLE::LocalDate2OLE($this->Time2nd)       // 116
-			  . pack("V", isset($this->_StartBlock)?
-						$this->_StartBlock:0)        // 120
-			  . pack("V", $this->Size)               // 124
-			  . pack("V", 0);                        // 128
-		return $ret;
-	}
-
-	/**
-	* Updates index and pointers to previous, next and children PPS's for this
-	* PPS. I don't think it'll work with Dir PPS's.
-	*
-	* @access public
-	* @param array &$raList Reference to the array of PPS's for the whole OLE
-	*                          container
-	* @return integer          The index for this PPS
-	*/
-	public static function _savePpsSetPnt(&$raList, $to_save, $depth = 0)
-	{
-		if ( !is_array($to_save) || (empty($to_save)) ) {
-			return 0xFFFFFFFF;
-		} elseif( count($to_save) == 1 ) {
-			$cnt = count($raList);
-			// If the first entry, it's the root... Don't clone it!
-			$raList[$cnt] = ( $depth == 0 ) ? $to_save[0] : clone $to_save[0];
-			$raList[$cnt]->No = $cnt;
-			$raList[$cnt]->PrevPps = 0xFFFFFFFF;
-			$raList[$cnt]->NextPps = 0xFFFFFFFF;
-			$raList[$cnt]->DirPps  = self::_savePpsSetPnt($raList, @$raList[$cnt]->children, $depth++);
-		} else {
-			$iPos  = floor(count($to_save) / 2);
-			$aPrev = array_slice($to_save, 0, $iPos);
-			$aNext = array_slice($to_save, $iPos + 1);
-			$cnt   = count($raList);
-			// If the first entry, it's the root... Don't clone it!
-			$raList[$cnt] = ( $depth == 0 ) ? $to_save[$iPos] : clone $to_save[$iPos];
-			$raList[$cnt]->No = $cnt;
-			$raList[$cnt]->PrevPps = self::_savePpsSetPnt($raList, $aPrev, $depth++);
-			$raList[$cnt]->NextPps = self::_savePpsSetPnt($raList, $aNext, $depth++);
-			$raList[$cnt]->DirPps  = self::_savePpsSetPnt($raList, @$raList[$cnt]->children, $depth++);
-
-		}
-		return $cnt;
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/File.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/File.php
deleted file mode 100644
index f061f568cc2..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/File.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2002 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Xavier Noguer <xnoguer@php.net>                              |
-// | Based on OLE::Storage_Lite by Kawai, Takanori                        |
-// +----------------------------------------------------------------------+
-//
-// $Id: File.php,v 1.11 2007/02/13 21:00:42 schmidt Exp $
-
-
-/**
-* Class for creating File PPS's for OLE containers
-*
-* @author   Xavier Noguer <xnoguer@php.net>
-* @category PHPExcel
-* @package  PHPExcel_Shared_OLE
-*/
-class PHPExcel_Shared_OLE_PPS_File extends PHPExcel_Shared_OLE_PPS
-	{
-	/**
-	* The constructor
-	*
-	* @access public
-	* @param string $name The name of the file (in Unicode)
-	* @see OLE::Asc2Ucs()
-	*/
-	public function __construct($name)
-	{
-		parent::__construct(
-			null,
-			$name,
-			PHPExcel_Shared_OLE::OLE_PPS_TYPE_FILE,
-			null,
-			null,
-			null,
-			null,
-			null,
-			'',
-			array());
-	}
-
-	/**
-	* Initialization method. Has to be called right after OLE_PPS_File().
-	*
-	* @access public
-	* @return mixed true on success
-	*/
-	public function init()
-	{
-		return true;
-	}
-
-	/**
-	* Append data to PPS
-	*
-	* @access public
-	* @param string $data The data to append
-	*/
-	public function append($data)
-	{
-		$this->_data .= $data;
-	}
-
-	/**
-	 * Returns a stream for reading this file using fread() etc.
-	 * @return  resource  a read-only stream
-	 */
-	public function getStream()
-	{
-		$this->ole->getStream($this);
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/Root.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/Root.php
deleted file mode 100644
index 8c6dcda078a..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/Root.php
+++ /dev/null
@@ -1,467 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2002 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Xavier Noguer <xnoguer@php.net>                              |
-// | Based on OLE::Storage_Lite by Kawai, Takanori                        |
-// +----------------------------------------------------------------------+
-//
-// $Id: Root.php,v 1.9 2005/04/23 21:53:49 dufuz Exp $
-
-
-/**
-* Class for creating Root PPS's for OLE containers
-*
-* @author   Xavier Noguer <xnoguer@php.net>
-* @category PHPExcel
-* @package  PHPExcel_Shared_OLE
-*/
-class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
-	{
-
-	/**
-	 * Directory for temporary files
-	 * @var string
-	 */
-	protected $_tmp_dir		= NULL;
-
-	/**
-	 * @param integer $time_1st A timestamp
-	 * @param integer $time_2nd A timestamp
-	 */
-	public function __construct($time_1st, $time_2nd, $raChild)
-	{
-		$this->_tempDir = PHPExcel_Shared_File::sys_get_temp_dir();
-
-		parent::__construct(
-		   null,
-		   PHPExcel_Shared_OLE::Asc2Ucs('Root Entry'),
-		   PHPExcel_Shared_OLE::OLE_PPS_TYPE_ROOT,
-		   null,
-		   null,
-		   null,
-		   $time_1st,
-		   $time_2nd,
-		   null,
-		   $raChild);
-	}
-
-	/**
-	* Method for saving the whole OLE container (including files).
-	* In fact, if called with an empty argument (or '-'), it saves to a
-	* temporary file and then outputs it's contents to stdout.
-	* If a resource pointer to a stream created by fopen() is passed
-	* it will be used, but you have to close such stream by yourself.
-	*
-	* @param string|resource $filename The name of the file or stream where to save the OLE container.
-	* @access public
-	* @return mixed true on success
-	*/
-	public function save($filename)
-	{
-		// Initial Setting for saving
-		$this->_BIG_BLOCK_SIZE  = pow(2,
-					  ((isset($this->_BIG_BLOCK_SIZE))? self::_adjust2($this->_BIG_BLOCK_SIZE)  : 9));
-		$this->_SMALL_BLOCK_SIZE= pow(2,
-					  ((isset($this->_SMALL_BLOCK_SIZE))?  self::_adjust2($this->_SMALL_BLOCK_SIZE): 6));
-
-		if (is_resource($filename)) {
-		    $this->_FILEH_ = $filename;
-		} else if ($filename == '-' || $filename == '') {
-			if ($this->_tmp_dir === NULL)
-				$this->_tmp_dir = PHPExcel_Shared_File::sys_get_temp_dir();
-			$this->_tmp_filename = tempnam($this->_tmp_dir, "OLE_PPS_Root");
-			$this->_FILEH_ = fopen($this->_tmp_filename,"w+b");
-			if ($this->_FILEH_ == false) {
-				throw new PHPExcel_Writer_Exception("Can't create temporary file.");
-			}
-		} else {
-			$this->_FILEH_ = fopen($filename, "wb");
-		}
-		if ($this->_FILEH_ == false) {
-			throw new PHPExcel_Writer_Exception("Can't open $filename. It may be in use or protected.");
-		}
-		// Make an array of PPS's (for Save)
-		$aList = array();
-		PHPExcel_Shared_OLE_PPS::_savePpsSetPnt($aList, array($this));
-		// calculate values for header
-		list($iSBDcnt, $iBBcnt, $iPPScnt) = $this->_calcSize($aList); //, $rhInfo);
-		// Save Header
-		$this->_saveHeader($iSBDcnt, $iBBcnt, $iPPScnt);
-
-		// Make Small Data string (write SBD)
-		$this->_data = $this->_makeSmallData($aList);
-
-		// Write BB
-		$this->_saveBigData($iSBDcnt, $aList);
-		// Write PPS
-		$this->_savePps($aList);
-		// Write Big Block Depot and BDList and Adding Header informations
-		$this->_saveBbd($iSBDcnt, $iBBcnt, $iPPScnt);
-
-		if (!is_resource($filename)) {
- 			fclose($this->_FILEH_);
- 		}
-
-		return true;
-	}
-
-	/**
-	* Calculate some numbers
-	*
-	* @access public
-	* @param array $raList Reference to an array of PPS's
-	* @return array The array of numbers
-	*/
-	public function _calcSize(&$raList)
-	{
-		// Calculate Basic Setting
-		list($iSBDcnt, $iBBcnt, $iPPScnt) = array(0,0,0);
-		$iSmallLen = 0;
-		$iSBcnt = 0;
-		$iCount = count($raList);
-		for ($i = 0; $i < $iCount; ++$i) {
-			if ($raList[$i]->Type == PHPExcel_Shared_OLE::OLE_PPS_TYPE_FILE) {
-				$raList[$i]->Size = $raList[$i]->_DataLen();
-				if ($raList[$i]->Size < PHPExcel_Shared_OLE::OLE_DATA_SIZE_SMALL) {
-					$iSBcnt += floor($raList[$i]->Size / $this->_SMALL_BLOCK_SIZE)
-								  + (($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE)? 1: 0);
-				} else {
-					$iBBcnt += (floor($raList[$i]->Size / $this->_BIG_BLOCK_SIZE) +
-						(($raList[$i]->Size % $this->_BIG_BLOCK_SIZE)? 1: 0));
-				}
-			}
-		}
-		$iSmallLen = $iSBcnt * $this->_SMALL_BLOCK_SIZE;
-		$iSlCnt = floor($this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE);
-		$iSBDcnt = floor($iSBcnt / $iSlCnt) + (($iSBcnt % $iSlCnt)? 1:0);
-		$iBBcnt +=  (floor($iSmallLen / $this->_BIG_BLOCK_SIZE) +
-					  (( $iSmallLen % $this->_BIG_BLOCK_SIZE)? 1: 0));
-		$iCnt = count($raList);
-		$iBdCnt = $this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_PPS_SIZE;
-		$iPPScnt = (floor($iCnt/$iBdCnt) + (($iCnt % $iBdCnt)? 1: 0));
-
-		return array($iSBDcnt, $iBBcnt, $iPPScnt);
-	}
-
-	/**
-	* Helper function for caculating a magic value for block sizes
-	*
-	* @access public
-	* @param integer $i2 The argument
-	* @see save()
-	* @return integer
-	*/
-	private static function _adjust2($i2)
-	{
-		$iWk = log($i2)/log(2);
-		return ($iWk > floor($iWk))? floor($iWk)+1:$iWk;
-	}
-
-	/**
-	* Save OLE header
-	*
-	* @access public
-	* @param integer $iSBDcnt
-	* @param integer $iBBcnt
-	* @param integer $iPPScnt
-	*/
-	public function _saveHeader($iSBDcnt, $iBBcnt, $iPPScnt)
-	{
-		$FILE = $this->_FILEH_;
-
-		// Calculate Basic Setting
-		$iBlCnt = $this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE;
-		$i1stBdL = ($this->_BIG_BLOCK_SIZE - 0x4C) / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE;
-
-		$iBdExL = 0;
-		$iAll = $iBBcnt + $iPPScnt + $iSBDcnt;
-		$iAllW = $iAll;
-		$iBdCntW = floor($iAllW / $iBlCnt) + (($iAllW % $iBlCnt)? 1: 0);
-		$iBdCnt = floor(($iAll + $iBdCntW) / $iBlCnt) + ((($iAllW+$iBdCntW) % $iBlCnt)? 1: 0);
-
-		// Calculate BD count
-		if ($iBdCnt > $i1stBdL) {
-			while (1) {
-				++$iBdExL;
-				++$iAllW;
-				$iBdCntW = floor($iAllW / $iBlCnt) + (($iAllW % $iBlCnt)? 1: 0);
-				$iBdCnt = floor(($iAllW + $iBdCntW) / $iBlCnt) + ((($iAllW+$iBdCntW) % $iBlCnt)? 1: 0);
-				if ($iBdCnt <= ($iBdExL*$iBlCnt+ $i1stBdL)) {
-					break;
-				}
-			}
-		}
-
-		// Save Header
-		fwrite($FILE,
-				"\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1"
-				. "\x00\x00\x00\x00"
-				. "\x00\x00\x00\x00"
-				. "\x00\x00\x00\x00"
-				. "\x00\x00\x00\x00"
-				. pack("v", 0x3b)
-				. pack("v", 0x03)
-				. pack("v", -2)
-				. pack("v", 9)
-				. pack("v", 6)
-				. pack("v", 0)
-				. "\x00\x00\x00\x00"
-				. "\x00\x00\x00\x00"
-				. pack("V", $iBdCnt)
-				. pack("V", $iBBcnt+$iSBDcnt) //ROOT START
-				. pack("V", 0)
-				. pack("V", 0x1000)
-				. pack("V", $iSBDcnt ? 0 : -2)                  //Small Block Depot
-				. pack("V", $iSBDcnt)
-		  );
-		// Extra BDList Start, Count
-		if ($iBdCnt < $i1stBdL) {
-			fwrite($FILE,
-					pack("V", -2)      // Extra BDList Start
-					. pack("V", 0)        // Extra BDList Count
-				  );
-		} else {
-			fwrite($FILE, pack("V", $iAll+$iBdCnt) . pack("V", $iBdExL));
-		}
-
-		// BDList
-		for ($i = 0; $i < $i1stBdL && $i < $iBdCnt; ++$i) {
-			fwrite($FILE, pack("V", $iAll+$i));
-		}
-		if ($i < $i1stBdL) {
-			$jB = $i1stBdL - $i;
-			for ($j = 0; $j < $jB; ++$j) {
-				fwrite($FILE, (pack("V", -1)));
-			}
-		}
-	}
-
-	/**
-	* Saving big data (PPS's with data bigger than PHPExcel_Shared_OLE::OLE_DATA_SIZE_SMALL)
-	*
-	* @access public
-	* @param integer $iStBlk
-	* @param array &$raList Reference to array of PPS's
-	*/
-	public function _saveBigData($iStBlk, &$raList)
-	{
-		$FILE = $this->_FILEH_;
-
-		// cycle through PPS's
-		$iCount = count($raList);
-		for ($i = 0; $i < $iCount; ++$i) {
-			if ($raList[$i]->Type != PHPExcel_Shared_OLE::OLE_PPS_TYPE_DIR) {
-				$raList[$i]->Size = $raList[$i]->_DataLen();
-				if (($raList[$i]->Size >= PHPExcel_Shared_OLE::OLE_DATA_SIZE_SMALL) ||
-					(($raList[$i]->Type == PHPExcel_Shared_OLE::OLE_PPS_TYPE_ROOT) && isset($raList[$i]->_data)))
-				{
-					// Write Data
-					//if (isset($raList[$i]->_PPS_FILE)) {
-					//	$iLen = 0;
-					//	fseek($raList[$i]->_PPS_FILE, 0); // To The Top
-					//	while($sBuff = fread($raList[$i]->_PPS_FILE, 4096)) {
-					//		$iLen += strlen($sBuff);
-					//		fwrite($FILE, $sBuff);
-					//	}
-					//} else {
-						fwrite($FILE, $raList[$i]->_data);
-					//}
-
-					if ($raList[$i]->Size % $this->_BIG_BLOCK_SIZE) {
-						fwrite($FILE, str_repeat("\x00", $this->_BIG_BLOCK_SIZE - ($raList[$i]->Size % $this->_BIG_BLOCK_SIZE)));
-					}
-					// Set For PPS
-					$raList[$i]->_StartBlock = $iStBlk;
-					$iStBlk +=
-							(floor($raList[$i]->Size / $this->_BIG_BLOCK_SIZE) +
-								(($raList[$i]->Size % $this->_BIG_BLOCK_SIZE)? 1: 0));
-				}
-				// Close file for each PPS, and unlink it
-				//if (isset($raList[$i]->_PPS_FILE)) {
-				//	fclose($raList[$i]->_PPS_FILE);
-				//	$raList[$i]->_PPS_FILE = null;
-				//	unlink($raList[$i]->_tmp_filename);
-				//}
-			}
-		}
-	}
-
-	/**
-	* get small data (PPS's with data smaller than PHPExcel_Shared_OLE::OLE_DATA_SIZE_SMALL)
-	*
-	* @access public
-	* @param array &$raList Reference to array of PPS's
-	*/
-	public function _makeSmallData(&$raList)
-	{
-		$sRes = '';
-		$FILE = $this->_FILEH_;
-		$iSmBlk = 0;
-
-		$iCount = count($raList);
-		for ($i = 0; $i < $iCount; ++$i) {
-			// Make SBD, small data string
-			if ($raList[$i]->Type == PHPExcel_Shared_OLE::OLE_PPS_TYPE_FILE) {
-				if ($raList[$i]->Size <= 0) {
-					continue;
-				}
-				if ($raList[$i]->Size < PHPExcel_Shared_OLE::OLE_DATA_SIZE_SMALL) {
-					$iSmbCnt = floor($raList[$i]->Size / $this->_SMALL_BLOCK_SIZE)
-								  + (($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE)? 1: 0);
-					// Add to SBD
-					$jB = $iSmbCnt - 1;
-					for ($j = 0; $j < $jB; ++$j) {
-						fwrite($FILE, pack("V", $j+$iSmBlk+1));
-					}
-					fwrite($FILE, pack("V", -2));
-
-					//// Add to Data String(this will be written for RootEntry)
-					//if ($raList[$i]->_PPS_FILE) {
-					//	fseek($raList[$i]->_PPS_FILE, 0); // To The Top
-					//	while ($sBuff = fread($raList[$i]->_PPS_FILE, 4096)) {
-					//		$sRes .= $sBuff;
-					//	}
-					//} else {
-						$sRes .= $raList[$i]->_data;
-					//}
-					if ($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE) {
-						$sRes .= str_repeat("\x00",$this->_SMALL_BLOCK_SIZE - ($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE));
-					}
-					// Set for PPS
-					$raList[$i]->_StartBlock = $iSmBlk;
-					$iSmBlk += $iSmbCnt;
-				}
-			}
-		}
-		$iSbCnt = floor($this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE);
-		if ($iSmBlk % $iSbCnt) {
-			$iB = $iSbCnt - ($iSmBlk % $iSbCnt);
-			for ($i = 0; $i < $iB; ++$i) {
-				fwrite($FILE, pack("V", -1));
-			}
-		}
-		return $sRes;
-	}
-
-	/**
-	* Saves all the PPS's WKs
-	*
-	* @access public
-	* @param array $raList Reference to an array with all PPS's
-	*/
-	public function _savePps(&$raList)
-	{
-		// Save each PPS WK
-		$iC = count($raList);
-		for ($i = 0; $i < $iC; ++$i) {
-			fwrite($this->_FILEH_, $raList[$i]->_getPpsWk());
-		}
-		// Adjust for Block
-		$iCnt = count($raList);
-		$iBCnt = $this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_PPS_SIZE;
-		if ($iCnt % $iBCnt) {
-			fwrite($this->_FILEH_, str_repeat("\x00",($iBCnt - ($iCnt % $iBCnt)) * PHPExcel_Shared_OLE::OLE_PPS_SIZE));
-		}
-	}
-
-	/**
-	* Saving Big Block Depot
-	*
-	* @access public
-	* @param integer $iSbdSize
-	* @param integer $iBsize
-	* @param integer $iPpsCnt
-	*/
-	public function _saveBbd($iSbdSize, $iBsize, $iPpsCnt)
-	{
-		$FILE = $this->_FILEH_;
-		// Calculate Basic Setting
-		$iBbCnt = $this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE;
-		$i1stBdL = ($this->_BIG_BLOCK_SIZE - 0x4C) / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE;
-
-		$iBdExL = 0;
-		$iAll = $iBsize + $iPpsCnt + $iSbdSize;
-		$iAllW = $iAll;
-		$iBdCntW = floor($iAllW / $iBbCnt) + (($iAllW % $iBbCnt)? 1: 0);
-		$iBdCnt = floor(($iAll + $iBdCntW) / $iBbCnt) + ((($iAllW+$iBdCntW) % $iBbCnt)? 1: 0);
-		// Calculate BD count
-		if ($iBdCnt >$i1stBdL) {
-			while (1) {
-				++$iBdExL;
-				++$iAllW;
-				$iBdCntW = floor($iAllW / $iBbCnt) + (($iAllW % $iBbCnt)? 1: 0);
-				$iBdCnt = floor(($iAllW + $iBdCntW) / $iBbCnt) + ((($iAllW+$iBdCntW) % $iBbCnt)? 1: 0);
-				if ($iBdCnt <= ($iBdExL*$iBbCnt+ $i1stBdL)) {
-					break;
-				}
-			}
-		}
-
-		// Making BD
-		// Set for SBD
-		if ($iSbdSize > 0) {
-			for ($i = 0; $i < ($iSbdSize - 1); ++$i) {
-				fwrite($FILE, pack("V", $i+1));
-			}
-			fwrite($FILE, pack("V", -2));
-		}
-		// Set for B
-		for ($i = 0; $i < ($iBsize - 1); ++$i) {
-			fwrite($FILE, pack("V", $i+$iSbdSize+1));
-		}
-		fwrite($FILE, pack("V", -2));
-
-		// Set for PPS
-		for ($i = 0; $i < ($iPpsCnt - 1); ++$i) {
-			fwrite($FILE, pack("V", $i+$iSbdSize+$iBsize+1));
-		}
-		fwrite($FILE, pack("V", -2));
-		// Set for BBD itself ( 0xFFFFFFFD : BBD)
-		for ($i = 0; $i < $iBdCnt; ++$i) {
-			fwrite($FILE, pack("V", 0xFFFFFFFD));
-		}
-		// Set for ExtraBDList
-		for ($i = 0; $i < $iBdExL; ++$i) {
-			fwrite($FILE, pack("V", 0xFFFFFFFC));
-		}
-		// Adjust for Block
-		if (($iAllW + $iBdCnt) % $iBbCnt) {
-			$iBlock = ($iBbCnt - (($iAllW + $iBdCnt) % $iBbCnt));
-			for ($i = 0; $i < $iBlock; ++$i) {
-				fwrite($FILE, pack("V", -1));
-			}
-		}
-		// Extra BDList
-		if ($iBdCnt > $i1stBdL) {
-			$iN=0;
-			$iNb=0;
-			for ($i = $i1stBdL;$i < $iBdCnt; $i++, ++$iN) {
-				if ($iN >= ($iBbCnt - 1)) {
-					$iN = 0;
-					++$iNb;
-					fwrite($FILE, pack("V", $iAll+$iBdCnt+$iNb));
-				}
-				fwrite($FILE, pack("V", $iBsize+$iSbdSize+$iPpsCnt+$i));
-			}
-			if (($iBdCnt-$i1stBdL) % ($iBbCnt-1)) {
-				$iB = ($iBbCnt - 1) - (($iBdCnt - $i1stBdL) % ($iBbCnt - 1));
-				for ($i = 0; $i < $iB; ++$i) {
-					fwrite($FILE, pack("V", -1));
-				}
-			}
-			fwrite($FILE, pack("V", -2));
-		}
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLERead.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLERead.php
deleted file mode 100644
index 261bdde5812..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLERead.php
+++ /dev/null
@@ -1,317 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-defined('IDENTIFIER_OLE') ||
-    define('IDENTIFIER_OLE', pack('CCCCCCCC', 0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1));
-
-class PHPExcel_Shared_OLERead {
-	private $data = '';
-
-	// OLE identifier
-	const IDENTIFIER_OLE = IDENTIFIER_OLE;
-
-	// Size of a sector = 512 bytes
-	const BIG_BLOCK_SIZE					= 0x200;
-
-	// Size of a short sector = 64 bytes
-	const SMALL_BLOCK_SIZE					= 0x40;
-
-	// Size of a directory entry always = 128 bytes
-	const PROPERTY_STORAGE_BLOCK_SIZE		= 0x80;
-
-	// Minimum size of a standard stream = 4096 bytes, streams smaller than this are stored as short streams
-	const SMALL_BLOCK_THRESHOLD				= 0x1000;
-
-	// header offsets
-	const NUM_BIG_BLOCK_DEPOT_BLOCKS_POS	= 0x2c;
-	const ROOT_START_BLOCK_POS				= 0x30;
-	const SMALL_BLOCK_DEPOT_BLOCK_POS		= 0x3c;
-	const EXTENSION_BLOCK_POS				= 0x44;
-	const NUM_EXTENSION_BLOCK_POS			= 0x48;
-	const BIG_BLOCK_DEPOT_BLOCKS_POS		= 0x4c;
-
-	// property storage offsets (directory offsets)
-	const SIZE_OF_NAME_POS					= 0x40;
-	const TYPE_POS							= 0x42;
-	const START_BLOCK_POS					= 0x74;
-	const SIZE_POS							= 0x78;
-
-
-
-	public $wrkbook						= null;
-	public $summaryInformation			= null;
-	public $documentSummaryInformation	= null;
-
-
-	/**
-	 * Read the file
-	 *
-	 * @param $sFileName string Filename
-	 * @throws PHPExcel_Reader_Exception
-	 */
-	public function read($sFileName)
-	{
-		// Check if file exists and is readable
-		if(!is_readable($sFileName)) {
-			throw new PHPExcel_Reader_Exception("Could not open " . $sFileName . " for reading! File does not exist, or it is not readable.");
-		}
-
-		// Get the file identifier
-		// Don't bother reading the whole file until we know it's a valid OLE file
-		$this->data = file_get_contents($sFileName, FALSE, NULL, 0, 8);
-
-		// Check OLE identifier
-		if ($this->data != self::IDENTIFIER_OLE) {
-			throw new PHPExcel_Reader_Exception('The filename ' . $sFileName . ' is not recognised as an OLE file');
-		}
-
-		// Get the file data
-		$this->data = file_get_contents($sFileName);
-
-		// Total number of sectors used for the SAT
-		$this->numBigBlockDepotBlocks = self::_GetInt4d($this->data, self::NUM_BIG_BLOCK_DEPOT_BLOCKS_POS);
-
-		// SecID of the first sector of the directory stream
-		$this->rootStartBlock = self::_GetInt4d($this->data, self::ROOT_START_BLOCK_POS);
-
-		// SecID of the first sector of the SSAT (or -2 if not extant)
-		$this->sbdStartBlock = self::_GetInt4d($this->data, self::SMALL_BLOCK_DEPOT_BLOCK_POS);
-
-		// SecID of the first sector of the MSAT (or -2 if no additional sectors are used)
-		$this->extensionBlock = self::_GetInt4d($this->data, self::EXTENSION_BLOCK_POS);
-
-		// Total number of sectors used by MSAT
-		$this->numExtensionBlocks = self::_GetInt4d($this->data, self::NUM_EXTENSION_BLOCK_POS);
-
-		$bigBlockDepotBlocks = array();
-		$pos = self::BIG_BLOCK_DEPOT_BLOCKS_POS;
-
-		$bbdBlocks = $this->numBigBlockDepotBlocks;
-
-		if ($this->numExtensionBlocks != 0) {
-			$bbdBlocks = (self::BIG_BLOCK_SIZE - self::BIG_BLOCK_DEPOT_BLOCKS_POS)/4;
-		}
-
-		for ($i = 0; $i < $bbdBlocks; ++$i) {
-			  $bigBlockDepotBlocks[$i] = self::_GetInt4d($this->data, $pos);
-			  $pos += 4;
-		}
-
-		for ($j = 0; $j < $this->numExtensionBlocks; ++$j) {
-			$pos = ($this->extensionBlock + 1) * self::BIG_BLOCK_SIZE;
-			$blocksToRead = min($this->numBigBlockDepotBlocks - $bbdBlocks, self::BIG_BLOCK_SIZE / 4 - 1);
-
-			for ($i = $bbdBlocks; $i < $bbdBlocks + $blocksToRead; ++$i) {
-				$bigBlockDepotBlocks[$i] = self::_GetInt4d($this->data, $pos);
-				$pos += 4;
-			}
-
-			$bbdBlocks += $blocksToRead;
-			if ($bbdBlocks < $this->numBigBlockDepotBlocks) {
-				$this->extensionBlock = self::_GetInt4d($this->data, $pos);
-			}
-		}
-
-		$pos = 0;
-		$this->bigBlockChain = '';
-		$bbs = self::BIG_BLOCK_SIZE / 4;
-		for ($i = 0; $i < $this->numBigBlockDepotBlocks; ++$i) {
-			$pos = ($bigBlockDepotBlocks[$i] + 1) * self::BIG_BLOCK_SIZE;
-
-			$this->bigBlockChain .= substr($this->data, $pos, 4*$bbs);
-			$pos += 4*$bbs;
-		}
-
-		$pos = 0;
-		$sbdBlock = $this->sbdStartBlock;
-		$this->smallBlockChain = '';
-		while ($sbdBlock != -2) {
-			$pos = ($sbdBlock + 1) * self::BIG_BLOCK_SIZE;
-
-			$this->smallBlockChain .= substr($this->data, $pos, 4*$bbs);
-			$pos += 4*$bbs;
-
-			$sbdBlock = self::_GetInt4d($this->bigBlockChain, $sbdBlock*4);
-		}
-
-		// read the directory stream
-		$block = $this->rootStartBlock;
-		$this->entry = $this->_readData($block);
-
-		$this->_readPropertySets();
-	}
-
-	/**
-	 * Extract binary stream data
-	 *
-	 * @return string
-	 */
-	public function getStream($stream)
-	{
-		if ($stream === NULL) {
-			return null;
-		}
-
-		$streamData = '';
-
-		if ($this->props[$stream]['size'] < self::SMALL_BLOCK_THRESHOLD) {
-			$rootdata = $this->_readData($this->props[$this->rootentry]['startBlock']);
-
-			$block = $this->props[$stream]['startBlock'];
-
-			while ($block != -2) {
-	  			$pos = $block * self::SMALL_BLOCK_SIZE;
-				$streamData .= substr($rootdata, $pos, self::SMALL_BLOCK_SIZE);
-
-				$block = self::_GetInt4d($this->smallBlockChain, $block*4);
-			}
-
-			return $streamData;
-		} else {
-			$numBlocks = $this->props[$stream]['size'] / self::BIG_BLOCK_SIZE;
-			if ($this->props[$stream]['size'] % self::BIG_BLOCK_SIZE != 0) {
-				++$numBlocks;
-			}
-
-			if ($numBlocks == 0) return '';
-
-			$block = $this->props[$stream]['startBlock'];
-
-			while ($block != -2) {
-				$pos = ($block + 1) * self::BIG_BLOCK_SIZE;
-				$streamData .= substr($this->data, $pos, self::BIG_BLOCK_SIZE);
-				$block = self::_GetInt4d($this->bigBlockChain, $block*4);
-			}
-
-			return $streamData;
-		}
-	}
-
-	/**
-	 * Read a standard stream (by joining sectors using information from SAT)
-	 *
-	 * @param int $bl Sector ID where the stream starts
-	 * @return string Data for standard stream
-	 */
-	private function _readData($bl)
-	{
-		$block = $bl;
-		$data = '';
-
-		while ($block != -2)  {
-			$pos = ($block + 1) * self::BIG_BLOCK_SIZE;
-			$data .= substr($this->data, $pos, self::BIG_BLOCK_SIZE);
-			$block = self::_GetInt4d($this->bigBlockChain, $block*4);
-		}
-		return $data;
-	 }
-
-	/**
-	 * Read entries in the directory stream.
-	 */
-	private function _readPropertySets() {
-		$offset = 0;
-
-		// loop through entires, each entry is 128 bytes
-		$entryLen = strlen($this->entry);
-		while ($offset < $entryLen) {
-			// entry data (128 bytes)
-			$d = substr($this->entry, $offset, self::PROPERTY_STORAGE_BLOCK_SIZE);
-
-			// size in bytes of name
-			$nameSize = ord($d[self::SIZE_OF_NAME_POS]) | (ord($d[self::SIZE_OF_NAME_POS+1]) << 8);
-
-			// type of entry
-			$type = ord($d[self::TYPE_POS]);
-
-			// sectorID of first sector or short sector, if this entry refers to a stream (the case with workbook)
-			// sectorID of first sector of the short-stream container stream, if this entry is root entry
-			$startBlock = self::_GetInt4d($d, self::START_BLOCK_POS);
-
-			$size = self::_GetInt4d($d, self::SIZE_POS);
-
-			$name = str_replace("\x00", "", substr($d,0,$nameSize));
-
-
-			$this->props[] = array (
-				'name' => $name,
-				'type' => $type,
-				'startBlock' => $startBlock,
-				'size' => $size);
-
-			// tmp helper to simplify checks
-			$upName = strtoupper($name);
-
-			// Workbook directory entry (BIFF5 uses Book, BIFF8 uses Workbook)
-			if (($upName === 'WORKBOOK') || ($upName === 'BOOK')) {
-				$this->wrkbook = count($this->props) - 1;
-			}
-			else if ( $upName === 'ROOT ENTRY' || $upName === 'R') {
-				// Root entry
-				$this->rootentry = count($this->props) - 1;
-			}
-
-			// Summary information
-			if ($name == chr(5) . 'SummaryInformation') {
-//				echo 'Summary Information<br />';
-				$this->summaryInformation = count($this->props) - 1;
-			}
-
-			// Additional Document Summary information
-			if ($name == chr(5) . 'DocumentSummaryInformation') {
-//				echo 'Document Summary Information<br />';
-				$this->documentSummaryInformation = count($this->props) - 1;
-			}
-
-			$offset += self::PROPERTY_STORAGE_BLOCK_SIZE;
-		}
-
-	}
-
-	/**
-	 * Read 4 bytes of data at specified position
-	 *
-	 * @param string $data
-	 * @param int $pos
-	 * @return int
-	 */
-	private static function _GetInt4d($data, $pos)
-	{
-		// FIX: represent numbers correctly on 64-bit system
-		// http://sourceforge.net/tracker/index.php?func=detail&aid=1487372&group_id=99160&atid=623334
-		// Hacked by Andreas Rehm 2006 to ensure correct result of the <<24 block on 32 and 64bit systems
-		$_or_24 = ord($data[$pos + 3]);
-		if ($_or_24 >= 128) {
-			// negative number
-			$_ord_24 = -abs((256 - $_or_24) << 24);
-		} else {
-			$_ord_24 = ($_or_24 & 127) << 24;
-		}
-		return ord($data[$pos]) | (ord($data[$pos + 1]) << 8) | (ord($data[$pos + 2]) << 16) | $_ord_24;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/gnu-lgpl.txt b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/gnu-lgpl.txt
deleted file mode 100644
index b1e3f5a2638..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/gnu-lgpl.txt
+++ /dev/null
@@ -1,504 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/pclzip.lib.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/pclzip.lib.php
deleted file mode 100644
index 7d1936aa245..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/pclzip.lib.php
+++ /dev/null
@@ -1,5691 +0,0 @@
-<?php
-// --------------------------------------------------------------------------------
-// PhpConcept Library - Zip Module 2.8.2
-// --------------------------------------------------------------------------------
-// License GNU/LGPL - Vincent Blavet - August 2009
-// http://www.phpconcept.net
-// --------------------------------------------------------------------------------
-//
-// Presentation :
-//   PclZip is a PHP library that manage ZIP archives.
-//   So far tests show that archives generated by PclZip are readable by
-//   WinZip application and other tools.
-//
-// Description :
-//   See readme.txt and http://www.phpconcept.net
-//
-// Warning :
-//   This library and the associated files are non commercial, non professional
-//   work.
-//   It should not have unexpected results. However if any damage is caused by
-//   this software the author can not be responsible.
-//   The use of this software is at the risk of the user.
-//
-// --------------------------------------------------------------------------------
-// $Id: pclzip.lib.php,v 1.60 2009/09/30 21:01:04 vblavet Exp $
-// --------------------------------------------------------------------------------
-
-  // ----- Constants
-  if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
-    define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );
-  }
-  
-  // ----- File list separator
-  // In version 1.x of PclZip, the separator for file list is a space
-  // (which is not a very smart choice, specifically for windows paths !).
-  // A better separator should be a comma (,). This constant gives you the
-  // abilty to change that.
-  // However notice that changing this value, may have impact on existing
-  // scripts, using space separated filenames.
-  // Recommanded values for compatibility with older versions :
-  //define( 'PCLZIP_SEPARATOR', ' ' );
-  // Recommanded values for smart separation of filenames.
-  if (!defined('PCLZIP_SEPARATOR')) {
-    define( 'PCLZIP_SEPARATOR', ',' );
-  }
-
-  // ----- Error configuration
-  // 0 : PclZip Class integrated error handling
-  // 1 : PclError external library error handling. By enabling this
-  //     you must ensure that you have included PclError library.
-  // [2,...] : reserved for futur use
-  if (!defined('PCLZIP_ERROR_EXTERNAL')) {
-    define( 'PCLZIP_ERROR_EXTERNAL', 0 );
-  }
-
-  // ----- Optional static temporary directory
-  //       By default temporary files are generated in the script current
-  //       path.
-  //       If defined :
-  //       - MUST BE terminated by a '/'.
-  //       - MUST be a valid, already created directory
-  //       Samples :
-  // define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
-  // define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
-  if (!defined('PCLZIP_TEMPORARY_DIR')) {
-    define( 'PCLZIP_TEMPORARY_DIR', '' );
-  }
-
-  // ----- Optional threshold ratio for use of temporary files
-  //       Pclzip sense the size of the file to add/extract and decide to
-  //       use or not temporary file. The algorythm is looking for 
-  //       memory_limit of PHP and apply a ratio.
-  //       threshold = memory_limit * ratio.
-  //       Recommended values are under 0.5. Default 0.47.
-  //       Samples :
-  // define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );
-  if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
-    define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.47 );
-  }
-
-// --------------------------------------------------------------------------------
-// ***** UNDER THIS LINE NOTHING NEEDS TO BE MODIFIED *****
-// --------------------------------------------------------------------------------
-
-  // ----- Global variables
-  $g_pclzip_version = "2.8.2";
-
-  // ----- Error codes
-  //   -1 : Unable to open file in binary write mode
-  //   -2 : Unable to open file in binary read mode
-  //   -3 : Invalid parameters
-  //   -4 : File does not exist
-  //   -5 : Filename is too long (max. 255)
-  //   -6 : Not a valid zip file
-  //   -7 : Invalid extracted file size
-  //   -8 : Unable to create directory
-  //   -9 : Invalid archive extension
-  //  -10 : Invalid archive format
-  //  -11 : Unable to delete file (unlink)
-  //  -12 : Unable to rename file (rename)
-  //  -13 : Invalid header checksum
-  //  -14 : Invalid archive size
-  define( 'PCLZIP_ERR_USER_ABORTED', 2 );
-  define( 'PCLZIP_ERR_NO_ERROR', 0 );
-  define( 'PCLZIP_ERR_WRITE_OPEN_FAIL', -1 );
-  define( 'PCLZIP_ERR_READ_OPEN_FAIL', -2 );
-  define( 'PCLZIP_ERR_INVALID_PARAMETER', -3 );
-  define( 'PCLZIP_ERR_MISSING_FILE', -4 );
-  define( 'PCLZIP_ERR_FILENAME_TOO_LONG', -5 );
-  define( 'PCLZIP_ERR_INVALID_ZIP', -6 );
-  define( 'PCLZIP_ERR_BAD_EXTRACTED_FILE', -7 );
-  define( 'PCLZIP_ERR_DIR_CREATE_FAIL', -8 );
-  define( 'PCLZIP_ERR_BAD_EXTENSION', -9 );
-  define( 'PCLZIP_ERR_BAD_FORMAT', -10 );
-  define( 'PCLZIP_ERR_DELETE_FILE_FAIL', -11 );
-  define( 'PCLZIP_ERR_RENAME_FILE_FAIL', -12 );
-  define( 'PCLZIP_ERR_BAD_CHECKSUM', -13 );
-  define( 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14 );
-  define( 'PCLZIP_ERR_MISSING_OPTION_VALUE', -15 );
-  define( 'PCLZIP_ERR_INVALID_OPTION_VALUE', -16 );
-  define( 'PCLZIP_ERR_ALREADY_A_DIRECTORY', -17 );
-  define( 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18 );
-  define( 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19 );
-  define( 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20 );
-  define( 'PCLZIP_ERR_DIRECTORY_RESTRICTION', -21 );
-
-  // ----- Options values
-  define( 'PCLZIP_OPT_PATH', 77001 );
-  define( 'PCLZIP_OPT_ADD_PATH', 77002 );
-  define( 'PCLZIP_OPT_REMOVE_PATH', 77003 );
-  define( 'PCLZIP_OPT_REMOVE_ALL_PATH', 77004 );
-  define( 'PCLZIP_OPT_SET_CHMOD', 77005 );
-  define( 'PCLZIP_OPT_EXTRACT_AS_STRING', 77006 );
-  define( 'PCLZIP_OPT_NO_COMPRESSION', 77007 );
-  define( 'PCLZIP_OPT_BY_NAME', 77008 );
-  define( 'PCLZIP_OPT_BY_INDEX', 77009 );
-  define( 'PCLZIP_OPT_BY_EREG', 77010 );
-  define( 'PCLZIP_OPT_BY_PREG', 77011 );
-  define( 'PCLZIP_OPT_COMMENT', 77012 );
-  define( 'PCLZIP_OPT_ADD_COMMENT', 77013 );
-  define( 'PCLZIP_OPT_PREPEND_COMMENT', 77014 );
-  define( 'PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015 );
-  define( 'PCLZIP_OPT_REPLACE_NEWER', 77016 );
-  define( 'PCLZIP_OPT_STOP_ON_ERROR', 77017 );
-  // Having big trouble with crypt. Need to multiply 2 long int
-  // which is not correctly supported by PHP ...
-  //define( 'PCLZIP_OPT_CRYPT', 77018 );
-  define( 'PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019 );
-  define( 'PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020 ); // alias
-  define( 'PCLZIP_OPT_TEMP_FILE_ON', 77021 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021 ); // alias
-  define( 'PCLZIP_OPT_TEMP_FILE_OFF', 77022 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022 ); // alias
-  
-  // ----- File description attributes
-  define( 'PCLZIP_ATT_FILE_NAME', 79001 );
-  define( 'PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002 );
-  define( 'PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003 );
-  define( 'PCLZIP_ATT_FILE_MTIME', 79004 );
-  define( 'PCLZIP_ATT_FILE_CONTENT', 79005 );
-  define( 'PCLZIP_ATT_FILE_COMMENT', 79006 );
-
-  // ----- Call backs values
-  define( 'PCLZIP_CB_PRE_EXTRACT', 78001 );
-  define( 'PCLZIP_CB_POST_EXTRACT', 78002 );
-  define( 'PCLZIP_CB_PRE_ADD', 78003 );
-  define( 'PCLZIP_CB_POST_ADD', 78004 );
-  /* For futur use
-  define( 'PCLZIP_CB_PRE_LIST', 78005 );
-  define( 'PCLZIP_CB_POST_LIST', 78006 );
-  define( 'PCLZIP_CB_PRE_DELETE', 78007 );
-  define( 'PCLZIP_CB_POST_DELETE', 78008 );
-  */
-
-  // --------------------------------------------------------------------------------
-  // Class : PclZip
-  // Description :
-  //   PclZip is the class that represent a Zip archive.
-  //   The public methods allow the manipulation of the archive.
-  // Attributes :
-  //   Attributes must not be accessed directly.
-  // Methods :
-  //   PclZip() : Object creator
-  //   create() : Creates the Zip archive
-  //   listContent() : List the content of the Zip archive
-  //   extract() : Extract the content of the archive
-  //   properties() : List the properties of the archive
-  // --------------------------------------------------------------------------------
-  class PclZip
-  {
-    // ----- Filename of the zip file
-    var $zipname = '';
-
-    // ----- File descriptor of the zip file
-    var $zip_fd = 0;
-
-    // ----- Internal error handling
-    var $error_code = 1;
-    var $error_string = '';
-    
-    // ----- Current status of the magic_quotes_runtime
-    // This value store the php configuration for magic_quotes
-    // The class can then disable the magic_quotes and reset it after
-    var $magic_quotes_status;
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZip()
-  // Description :
-  //   Creates a PclZip object and set the name of the associated Zip archive
-  //   filename.
-  //   Note that no real action is taken, if the archive does not exist it is not
-  //   created. Use create() for that.
-  // --------------------------------------------------------------------------------
-  function PclZip($p_zipname)
-  {
-
-    // ----- Tests the zlib
-    if (!function_exists('gzopen'))
-    {
-      die('Abort '.basename(__FILE__).' : Missing zlib extensions');
-    }
-
-    // ----- Set the attributes
-    $this->zipname = $p_zipname;
-    $this->zip_fd = 0;
-    $this->magic_quotes_status = -1;
-
-    // ----- Return
-    return;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   create($p_filelist, $p_add_dir="", $p_remove_dir="")
-  //   create($p_filelist, $p_option, $p_option_value, ...)
-  // Description :
-  //   This method supports two different synopsis. The first one is historical.
-  //   This method creates a Zip Archive. The Zip file is created in the
-  //   filesystem. The files and directories indicated in $p_filelist
-  //   are added in the archive. See the parameters description for the
-  //   supported format of $p_filelist.
-  //   When a directory is in the list, the directory and its content is added
-  //   in the archive.
-  //   In this synopsis, the function takes an optional variable list of
-  //   options. See bellow the supported options.
-  // Parameters :
-  //   $p_filelist : An array containing file or directory names, or
-  //                 a string containing one filename or one directory name, or
-  //                 a string containing a list of filenames and/or directory
-  //                 names separated by spaces.
-  //   $p_add_dir : A path to add before the real path of the archived file,
-  //                in order to have it memorized in the archive.
-  //   $p_remove_dir : A path to remove from the real path of the file to archive,
-  //                   in order to have a shorter path memorized in the archive.
-  //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
-  //                   is removed first, before $p_add_dir is added.
-  // Options :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_OPT_COMMENT :
-  //   PCLZIP_CB_PRE_ADD :
-  //   PCLZIP_CB_POST_ADD :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the added files, with a status of the add action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function create($p_filelist)
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Set default values
-    $v_options = array();
-    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove from the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_ADD => 'optional',
-                                                   PCLZIP_CB_POST_ADD => 'optional',
-                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
-                                                   PCLZIP_OPT_COMMENT => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                                                   //, PCLZIP_OPT_CRYPT => 'optional'
-                                             ));
-        if ($v_result != 1) {
-          return 0;
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_options[PCLZIP_OPT_ADD_PATH] = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                       "Invalid number / type of arguments");
-          return 0;
-        }
-      }
-    }
-    
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Init
-    $v_string_list = array();
-    $v_att_list = array();
-    $v_filedescr_list = array();
-    $p_result_list = array();
-    
-    // ----- Look if the $p_filelist is really an array
-    if (is_array($p_filelist)) {
-    
-      // ----- Look if the first element is also an array
-      //       This will mean that this is a file description entry
-      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
-        $v_att_list = $p_filelist;
-      }
-      
-      // ----- The list is a list of string names
-      else {
-        $v_string_list = $p_filelist;
-      }
-    }
-
-    // ----- Look if the $p_filelist is a string
-    else if (is_string($p_filelist)) {
-      // ----- Create a list from the string
-      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
-    }
-
-    // ----- Invalid variable type for $p_filelist
-    else {
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");
-      return 0;
-    }
-    
-    // ----- Reformat the string list
-    if (sizeof($v_string_list) != 0) {
-      foreach ($v_string_list as $v_string) {
-        if ($v_string != '') {
-          $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-        }
-        else {
-        }
-      }
-    }
-    
-    // ----- For each file in the list check the attributes
-    $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
-             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_MTIME => 'optional'
-             ,PCLZIP_ATT_FILE_CONTENT => 'optional'
-             ,PCLZIP_ATT_FILE_COMMENT => 'optional'
-						);
-    foreach ($v_att_list as $v_entry) {
-      $v_result = $this->privFileDescrParseAtt($v_entry,
-                                               $v_filedescr_list[],
-                                               $v_options,
-                                               $v_supported_attributes);
-      if ($v_result != 1) {
-        return 0;
-      }
-    }
-
-    // ----- Expand the filelist (expand directories)
-    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Call the create fct
-    $v_result = $this->privCreate($v_filedescr_list, $p_result_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Return
-    return $p_result_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   add($p_filelist, $p_add_dir="", $p_remove_dir="")
-  //   add($p_filelist, $p_option, $p_option_value, ...)
-  // Description :
-  //   This method supports two synopsis. The first one is historical.
-  //   This methods add the list of files in an existing archive.
-  //   If a file with the same name already exists, it is added at the end of the
-  //   archive, the first one is still present.
-  //   If the archive does not exist, it is created.
-  // Parameters :
-  //   $p_filelist : An array containing file or directory names, or
-  //                 a string containing one filename or one directory name, or
-  //                 a string containing a list of filenames and/or directory
-  //                 names separated by spaces.
-  //   $p_add_dir : A path to add before the real path of the archived file,
-  //                in order to have it memorized in the archive.
-  //   $p_remove_dir : A path to remove from the real path of the file to archive,
-  //                   in order to have a shorter path memorized in the archive.
-  //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
-  //                   is removed first, before $p_add_dir is added.
-  // Options :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_OPT_COMMENT :
-  //   PCLZIP_OPT_ADD_COMMENT :
-  //   PCLZIP_OPT_PREPEND_COMMENT :
-  //   PCLZIP_CB_PRE_ADD :
-  //   PCLZIP_CB_POST_ADD :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the added files, with a status of the add action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function add($p_filelist)
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Set default values
-    $v_options = array();
-    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove form the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_ADD => 'optional',
-                                                   PCLZIP_CB_POST_ADD => 'optional',
-                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
-                                                   PCLZIP_OPT_COMMENT => 'optional',
-                                                   PCLZIP_OPT_ADD_COMMENT => 'optional',
-                                                   PCLZIP_OPT_PREPEND_COMMENT => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                                                   //, PCLZIP_OPT_CRYPT => 'optional'
-												   ));
-        if ($v_result != 1) {
-          return 0;
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_options[PCLZIP_OPT_ADD_PATH] = $v_add_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
-
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Init
-    $v_string_list = array();
-    $v_att_list = array();
-    $v_filedescr_list = array();
-    $p_result_list = array();
-    
-    // ----- Look if the $p_filelist is really an array
-    if (is_array($p_filelist)) {
-    
-      // ----- Look if the first element is also an array
-      //       This will mean that this is a file description entry
-      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
-        $v_att_list = $p_filelist;
-      }
-      
-      // ----- The list is a list of string names
-      else {
-        $v_string_list = $p_filelist;
-      }
-    }
-
-    // ----- Look if the $p_filelist is a string
-    else if (is_string($p_filelist)) {
-      // ----- Create a list from the string
-      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
-    }
-
-    // ----- Invalid variable type for $p_filelist
-    else {
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '".gettype($p_filelist)."' for p_filelist");
-      return 0;
-    }
-    
-    // ----- Reformat the string list
-    if (sizeof($v_string_list) != 0) {
-      foreach ($v_string_list as $v_string) {
-        $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-      }
-    }
-    
-    // ----- For each file in the list check the attributes
-    $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
-             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_MTIME => 'optional'
-             ,PCLZIP_ATT_FILE_CONTENT => 'optional'
-             ,PCLZIP_ATT_FILE_COMMENT => 'optional'
-						);
-    foreach ($v_att_list as $v_entry) {
-      $v_result = $this->privFileDescrParseAtt($v_entry,
-                                               $v_filedescr_list[],
-                                               $v_options,
-                                               $v_supported_attributes);
-      if ($v_result != 1) {
-        return 0;
-      }
-    }
-
-    // ----- Expand the filelist (expand directories)
-    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Call the create fct
-    $v_result = $this->privAdd($v_filedescr_list, $p_result_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Return
-    return $p_result_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : listContent()
-  // Description :
-  //   This public method, gives the list of the files and directories, with their
-  //   properties.
-  //   The properties of each entries in the list are (used also in other functions) :
-  //     filename : Name of the file. For a create or add action it is the filename
-  //                given by the user. For an extract function it is the filename
-  //                of the extracted file.
-  //     stored_filename : Name of the file / directory stored in the archive.
-  //     size : Size of the stored file.
-  //     compressed_size : Size of the file's data compressed in the archive
-  //                       (without the headers overhead)
-  //     mtime : Last known modification date of the file (UNIX timestamp)
-  //     comment : Comment associated with the file
-  //     folder : true | false
-  //     index : index of the file in the archive
-  //     status : status of the action (depending of the action) :
-  //              Values are :
-  //                ok : OK !
-  //                filtered : the file / dir is not extracted (filtered by user)
-  //                already_a_directory : the file can not be extracted because a
-  //                                      directory with the same name already exists
-  //                write_protected : the file can not be extracted because a file
-  //                                  with the same name already exists and is
-  //                                  write protected
-  //                newer_exist : the file was not extracted because a newer file exists
-  //                path_creation_fail : the file is not extracted because the folder
-  //                                     does not exist and can not be created
-  //                write_error : the file was not extracted because there was a
-  //                              error while writing the file
-  //                read_error : the file was not extracted because there was a error
-  //                             while reading the file
-  //                invalid_header : the file was not extracted because of an archive
-  //                                 format error (bad file header)
-  //   Note that each time a method can continue operating when there
-  //   is an action error on a file, the error is only logged in the file status.
-  // Return Values :
-  //   0 on an unrecoverable failure,
-  //   The list of the files in the archive.
-  // --------------------------------------------------------------------------------
-  function listContent()
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Call the extracting fct
-    $p_list = array();
-    if (($v_result = $this->privList($p_list)) != 1)
-    {
-      unset($p_list);
-      return(0);
-    }
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   extract($p_path="./", $p_remove_path="")
-  //   extract([$p_option, $p_option_value, ...])
-  // Description :
-  //   This method supports two synopsis. The first one is historical.
-  //   This method extract all the files / directories from the archive to the
-  //   folder indicated in $p_path.
-  //   If you want to ignore the 'root' part of path of the memorized files
-  //   you can indicate this in the optional $p_remove_path parameter.
-  //   By default, if a newer file with the same name already exists, the
-  //   file is not extracted.
-  //
-  //   If both PCLZIP_OPT_PATH and PCLZIP_OPT_ADD_PATH aoptions
-  //   are used, the path indicated in PCLZIP_OPT_ADD_PATH is append
-  //   at the end of the path value of PCLZIP_OPT_PATH.
-  // Parameters :
-  //   $p_path : Path where the files and directories are to be extracted
-  //   $p_remove_path : First part ('root' part) of the memorized path
-  //                    (if any similar) to remove while extracting.
-  // Options :
-  //   PCLZIP_OPT_PATH :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_CB_PRE_EXTRACT :
-  //   PCLZIP_CB_POST_EXTRACT :
-  // Return Values :
-  //   0 or a negative value on failure,
-  //   The list of the extracted files, with a status of the action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function extract()
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Set default values
-    $v_options = array();
-//    $v_path = "./";
-    $v_path = '';
-    $v_remove_path = "";
-    $v_remove_all_path = false;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Default values for option
-    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-
-    // ----- Look for arguments
-    if ($v_size > 0) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
-                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
-                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
-                                                   PCLZIP_OPT_BY_NAME => 'optional',
-                                                   PCLZIP_OPT_BY_EREG => 'optional',
-                                                   PCLZIP_OPT_BY_PREG => 'optional',
-                                                   PCLZIP_OPT_BY_INDEX => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
-                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
-                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
-                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-												    ));
-        if ($v_result != 1) {
-          return 0;
-        }
-
-        // ----- Set the arguments
-        if (isset($v_options[PCLZIP_OPT_PATH])) {
-          $v_path = $v_options[PCLZIP_OPT_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
-          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
-          // ----- Check for '/' in last path char
-          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
-            $v_path .= '/';
-          }
-          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
-
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Trace
-
-    // ----- Call the extracting fct
-    $p_list = array();
-    $v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path,
-	                                     $v_remove_all_path, $v_options);
-    if ($v_result < 1) {
-      unset($p_list);
-      return(0);
-    }
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   extractByIndex($p_index, $p_path="./", $p_remove_path="")
-  //   extractByIndex($p_index, [$p_option, $p_option_value, ...])
-  // Description :
-  //   This method supports two synopsis. The first one is historical.
-  //   This method is doing a partial extract of the archive.
-  //   The extracted files or folders are identified by their index in the
-  //   archive (from 0 to n).
-  //   Note that if the index identify a folder, only the folder entry is
-  //   extracted, not all the files included in the archive.
-  // Parameters :
-  //   $p_index : A single index (integer) or a string of indexes of files to
-  //              extract. The form of the string is "0,4-6,8-12" with only numbers
-  //              and '-' for range or ',' to separate ranges. No spaces or ';'
-  //              are allowed.
-  //   $p_path : Path where the files and directories are to be extracted
-  //   $p_remove_path : First part ('root' part) of the memorized path
-  //                    (if any similar) to remove while extracting.
-  // Options :
-  //   PCLZIP_OPT_PATH :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_OPT_EXTRACT_AS_STRING : The files are extracted as strings and
-  //     not as files.
-  //     The resulting content is in a new field 'content' in the file
-  //     structure.
-  //     This option must be used alone (any other options are ignored).
-  //   PCLZIP_CB_PRE_EXTRACT :
-  //   PCLZIP_CB_POST_EXTRACT :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the extracted files, with a status of the action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  //function extractByIndex($p_index, options...)
-  function extractByIndex($p_index)
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Set default values
-    $v_options = array();
-//    $v_path = "./";
-    $v_path = '';
-    $v_remove_path = "";
-    $v_remove_all_path = false;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Default values for option
-    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove form the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
-                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
-                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
-                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
-                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
-                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-												   ));
-        if ($v_result != 1) {
-          return 0;
-        }
-
-        // ----- Set the arguments
-        if (isset($v_options[PCLZIP_OPT_PATH])) {
-          $v_path = $v_options[PCLZIP_OPT_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
-          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
-          // ----- Check for '/' in last path char
-          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
-            $v_path .= '/';
-          }
-          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
-        }
-        if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
-          $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-        }
-        else {
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
-
-    // ----- Trace
-
-    // ----- Trick
-    // Here I want to reuse extractByRule(), so I need to parse the $p_index
-    // with privParseOptions()
-    $v_arg_trick = array (PCLZIP_OPT_BY_INDEX, $p_index);
-    $v_options_trick = array();
-    $v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick,
-                                        array (PCLZIP_OPT_BY_INDEX => 'optional' ));
-    if ($v_result != 1) {
-        return 0;
-    }
-    $v_options[PCLZIP_OPT_BY_INDEX] = $v_options_trick[PCLZIP_OPT_BY_INDEX];
-
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Call the extracting fct
-    if (($v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options)) < 1) {
-        return(0);
-    }
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   delete([$p_option, $p_option_value, ...])
-  // Description :
-  //   This method removes files from the archive.
-  //   If no parameters are given, then all the archive is emptied.
-  // Parameters :
-  //   None or optional arguments.
-  // Options :
-  //   PCLZIP_OPT_BY_INDEX :
-  //   PCLZIP_OPT_BY_NAME :
-  //   PCLZIP_OPT_BY_EREG : 
-  //   PCLZIP_OPT_BY_PREG :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the files which are still present in the archive.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function delete()
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Set default values
-    $v_options = array();
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 0) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Parse the options
-      $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                        array (PCLZIP_OPT_BY_NAME => 'optional',
-                                               PCLZIP_OPT_BY_EREG => 'optional',
-                                               PCLZIP_OPT_BY_PREG => 'optional',
-                                               PCLZIP_OPT_BY_INDEX => 'optional' ));
-      if ($v_result != 1) {
-          return 0;
-      }
-    }
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Call the delete fct
-    $v_list = array();
-    if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) {
-      $this->privSwapBackMagicQuotes();
-      unset($v_list);
-      return(0);
-    }
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : deleteByIndex()
-  // Description :
-  //   ***** Deprecated *****
-  //   delete(PCLZIP_OPT_BY_INDEX, $p_index) should be prefered.
-  // --------------------------------------------------------------------------------
-  function deleteByIndex($p_index)
-  {
-    
-    $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : properties()
-  // Description :
-  //   This method gives the properties of the archive.
-  //   The properties are :
-  //     nb : Number of files in the archive
-  //     comment : Comment associated with the archive file
-  //     status : not_exist, ok
-  // Parameters :
-  //   None
-  // Return Values :
-  //   0 on failure,
-  //   An array with the archive properties.
-  // --------------------------------------------------------------------------------
-  function properties()
-  {
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      $this->privSwapBackMagicQuotes();
-      return(0);
-    }
-
-    // ----- Default properties
-    $v_prop = array();
-    $v_prop['comment'] = '';
-    $v_prop['nb'] = 0;
-    $v_prop['status'] = 'not_exist';
-
-    // ----- Look if file exists
-    if (@is_file($this->zipname))
-    {
-      // ----- Open the zip file
-      if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
-      {
-        $this->privSwapBackMagicQuotes();
-        
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
-
-        // ----- Return
-        return 0;
-      }
-
-      // ----- Read the central directory informations
-      $v_central_dir = array();
-      if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-      {
-        $this->privSwapBackMagicQuotes();
-        return 0;
-      }
-
-      // ----- Close the zip file
-      $this->privCloseFd();
-
-      // ----- Set the user attributes
-      $v_prop['comment'] = $v_central_dir['comment'];
-      $v_prop['nb'] = $v_central_dir['entries'];
-      $v_prop['status'] = 'ok';
-    }
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_prop;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : duplicate()
-  // Description :
-  //   This method creates an archive by copying the content of an other one. If
-  //   the archive already exist, it is replaced by the new one without any warning.
-  // Parameters :
-  //   $p_archive : The filename of a valid archive, or
-  //                a valid PclZip object.
-  // Return Values :
-  //   1 on success.
-  //   0 or a negative value on error (error code).
-  // --------------------------------------------------------------------------------
-  function duplicate($p_archive)
-  {
-    $v_result = 1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Look if the $p_archive is a PclZip object
-    if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip'))
-    {
-
-      // ----- Duplicate the archive
-      $v_result = $this->privDuplicate($p_archive->zipname);
-    }
-
-    // ----- Look if the $p_archive is a string (so a filename)
-    else if (is_string($p_archive))
-    {
-
-      // ----- Check that $p_archive is a valid zip file
-      // TBC : Should also check the archive format
-      if (!is_file($p_archive)) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
-        $v_result = PCLZIP_ERR_MISSING_FILE;
-      }
-      else {
-        // ----- Duplicate the archive
-        $v_result = $this->privDuplicate($p_archive);
-      }
-    }
-
-    // ----- Invalid variable
-    else
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
-      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : merge()
-  // Description :
-  //   This method merge the $p_archive_to_add archive at the end of the current
-  //   one ($this).
-  //   If the archive ($this) does not exist, the merge becomes a duplicate.
-  //   If the $p_archive_to_add archive does not exist, the merge is a success.
-  // Parameters :
-  //   $p_archive_to_add : It can be directly the filename of a valid zip archive,
-  //                       or a PclZip object archive.
-  // Return Values :
-  //   1 on success,
-  //   0 or negative values on error (see below).
-  // --------------------------------------------------------------------------------
-  function merge($p_archive_to_add)
-  {
-    $v_result = 1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Look if the $p_archive_to_add is a PclZip object
-    if ((is_object($p_archive_to_add)) && (get_class($p_archive_to_add) == 'pclzip'))
-    {
-
-      // ----- Merge the archive
-      $v_result = $this->privMerge($p_archive_to_add);
-    }
-
-    // ----- Look if the $p_archive_to_add is a string (so a filename)
-    else if (is_string($p_archive_to_add))
-    {
-
-      // ----- Create a temporary archive
-      $v_object_archive = new PclZip($p_archive_to_add);
-
-      // ----- Merge the archive
-      $v_result = $this->privMerge($v_object_archive);
-    }
-
-    // ----- Invalid variable
-    else
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
-      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-
-
-  // --------------------------------------------------------------------------------
-  // Function : errorCode()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function errorCode()
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      return(PclErrorCode());
-    }
-    else {
-      return($this->error_code);
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : errorName()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function errorName($p_with_code=false)
-  {
-    $v_name = array ( PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
-                      PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
-                      PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
-                      PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
-                      PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE',
-                      PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG',
-                      PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP',
-                      PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE',
-                      PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL',
-                      PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION',
-                      PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT',
-                      PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL',
-                      PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL',
-                      PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM',
-                      PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP',
-                      PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE',
-                      PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE',
-                      PCLZIP_ERR_UNSUPPORTED_COMPRESSION => 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION',
-                      PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION'
-                      ,PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE'
-                      ,PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION'
-                    );
-
-    if (isset($v_name[$this->error_code])) {
-      $v_value = $v_name[$this->error_code];
-    }
-    else {
-      $v_value = 'NoName';
-    }
-
-    if ($p_with_code) {
-      return($v_value.' ('.$this->error_code.')');
-    }
-    else {
-      return($v_value);
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : errorInfo()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function errorInfo($p_full=false)
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      return(PclErrorString());
-    }
-    else {
-      if ($p_full) {
-        return($this->errorName(true)." : ".$this->error_string);
-      }
-      else {
-        return($this->error_string." [code ".$this->error_code."]");
-      }
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-
-// --------------------------------------------------------------------------------
-// ***** UNDER THIS LINE ARE DEFINED PRIVATE INTERNAL FUNCTIONS *****
-// *****                                                        *****
-// *****       THESES FUNCTIONS MUST NOT BE USED DIRECTLY       *****
-// --------------------------------------------------------------------------------
-
-
-
-  // --------------------------------------------------------------------------------
-  // Function : privCheckFormat()
-  // Description :
-  //   This method check that the archive exists and is a valid zip archive.
-  //   Several level of check exists. (futur)
-  // Parameters :
-  //   $p_level : Level of check. Default 0.
-  //              0 : Check the first bytes (magic codes) (default value))
-  //              1 : 0 + Check the central directory (futur)
-  //              2 : 1 + Check each file header (futur)
-  // Return Values :
-  //   true on success,
-  //   false on error, the error code is set.
-  // --------------------------------------------------------------------------------
-  function privCheckFormat($p_level=0)
-  {
-    $v_result = true;
-
-	// ----- Reset the file system cache
-    clearstatcache();
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Look if the file exits
-    if (!is_file($this->zipname)) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'");
-      return(false);
-    }
-
-    // ----- Check that the file is readeable
-    if (!is_readable($this->zipname)) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");
-      return(false);
-    }
-
-    // ----- Check the magic code
-    // TBC
-
-    // ----- Check the central header
-    // TBC
-
-    // ----- Check each file header
-    // TBC
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privParseOptions()
-  // Description :
-  //   This internal methods reads the variable list of arguments ($p_options_list,
-  //   $p_size) and generate an array with the options and values ($v_result_list).
-  //   $v_requested_options contains the options that can be present and those that
-  //   must be present.
-  //   $v_requested_options is an array, with the option value as key, and 'optional',
-  //   or 'mandatory' as value.
-  // Parameters :
-  //   See above.
-  // Return Values :
-  //   1 on success.
-  //   0 on failure.
-  // --------------------------------------------------------------------------------
-  function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options=false)
-  {
-    $v_result=1;
-    
-    // ----- Read the options
-    $i=0;
-    while ($i<$p_size) {
-
-      // ----- Check if the option is supported
-      if (!isset($v_requested_options[$p_options_list[$i]])) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '".$p_options_list[$i]."' for this method");
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Look for next option
-      switch ($p_options_list[$i]) {
-        // ----- Look for options that request a path value
-        case PCLZIP_OPT_PATH :
-        case PCLZIP_OPT_REMOVE_PATH :
-        case PCLZIP_OPT_ADD_PATH :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
-          $i++;
-        break;
-
-        case PCLZIP_OPT_TEMP_FILE_THRESHOLD :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-            return PclZip::errorCode();
-          }
-          
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
-            return PclZip::errorCode();
-          }
-          
-          // ----- Check the value
-          $v_value = $p_options_list[$i+1];
-          if ((!is_integer($v_value)) || ($v_value<0)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value (and convert it in bytes)
-          $v_result_list[$p_options_list[$i]] = $v_value*1048576;
-          $i++;
-        break;
-
-        case PCLZIP_OPT_TEMP_FILE_ON :
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
-            return PclZip::errorCode();
-          }
-          
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
-
-        case PCLZIP_OPT_TEMP_FILE_OFF :
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_ON])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");
-            return PclZip::errorCode();
-          }
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
-            return PclZip::errorCode();
-          }
-          
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
-
-        case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (   is_string($p_options_list[$i+1])
-              && ($p_options_list[$i+1] != '')) {
-            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
-            $i++;
-          }
-          else {
-          }
-        break;
-
-        // ----- Look for options that request an array of string for value
-        case PCLZIP_OPT_BY_NAME :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];
-          }
-          else if (is_array($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that request an EREG or PREG expression
-        case PCLZIP_OPT_BY_EREG :
-          // ereg() is deprecated starting with PHP 5.3. Move PCLZIP_OPT_BY_EREG
-          // to PCLZIP_OPT_BY_PREG
-          $p_options_list[$i] = PCLZIP_OPT_BY_PREG;
-        case PCLZIP_OPT_BY_PREG :
-        //case PCLZIP_OPT_CRYPT :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that takes a string
-        case PCLZIP_OPT_COMMENT :
-        case PCLZIP_OPT_ADD_COMMENT :
-        case PCLZIP_OPT_PREPEND_COMMENT :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE,
-			                     "Missing parameter value for option '"
-								 .PclZipUtilOptionText($p_options_list[$i])
-								 ."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE,
-			                     "Wrong parameter value for option '"
-								 .PclZipUtilOptionText($p_options_list[$i])
-								 ."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that request an array of index
-        case PCLZIP_OPT_BY_INDEX :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_work_list = array();
-          if (is_string($p_options_list[$i+1])) {
-
-              // ----- Remove spaces
-              $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');
-
-              // ----- Parse items
-              $v_work_list = explode(",", $p_options_list[$i+1]);
-          }
-          else if (is_integer($p_options_list[$i+1])) {
-              $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1];
-          }
-          else if (is_array($p_options_list[$i+1])) {
-              $v_work_list = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          
-          // ----- Reduce the index list
-          // each index item in the list must be a couple with a start and
-          // an end value : [0,3], [5-5], [8-10], ...
-          // ----- Check the format of each item
-          $v_sort_flag=false;
-          $v_sort_value=0;
-          for ($j=0; $j<sizeof($v_work_list); $j++) {
-              // ----- Explode the item
-              $v_item_list = explode("-", $v_work_list[$j]);
-              $v_size_item_list = sizeof($v_item_list);
-              
-              // ----- TBC : Here we might check that each item is a
-              // real integer ...
-              
-              // ----- Look for single value
-              if ($v_size_item_list == 1) {
-                  // ----- Set the option value
-                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
-                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[0];
-              }
-              elseif ($v_size_item_list == 2) {
-                  // ----- Set the option value
-                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
-                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[1];
-              }
-              else {
-                  // ----- Error log
-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-                  // ----- Return
-                  return PclZip::errorCode();
-              }
-
-
-              // ----- Look for list sort
-              if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
-                  $v_sort_flag=true;
-
-                  // ----- TBC : An automatic sort should be writen ...
-                  // ----- Error log
-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-                  // ----- Return
-                  return PclZip::errorCode();
-              }
-              $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
-          }
-          
-          // ----- Sort the items
-          if ($v_sort_flag) {
-              // TBC : To Be Completed
-          }
-
-          // ----- Next option
-          $i++;
-        break;
-
-        // ----- Look for options that request no value
-        case PCLZIP_OPT_REMOVE_ALL_PATH :
-        case PCLZIP_OPT_EXTRACT_AS_STRING :
-        case PCLZIP_OPT_NO_COMPRESSION :
-        case PCLZIP_OPT_EXTRACT_IN_OUTPUT :
-        case PCLZIP_OPT_REPLACE_NEWER :
-        case PCLZIP_OPT_STOP_ON_ERROR :
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
-
-        // ----- Look for options that request an octal value
-        case PCLZIP_OPT_SET_CHMOD :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          $i++;
-        break;
-
-        // ----- Look for options that request a call-back
-        case PCLZIP_CB_PRE_EXTRACT :
-        case PCLZIP_CB_POST_EXTRACT :
-        case PCLZIP_CB_PRE_ADD :
-        case PCLZIP_CB_POST_ADD :
-        /* for futur use
-        case PCLZIP_CB_PRE_DELETE :
-        case PCLZIP_CB_POST_DELETE :
-        case PCLZIP_CB_PRE_LIST :
-        case PCLZIP_CB_POST_LIST :
-        */
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_function_name = $p_options_list[$i+1];
-
-          // ----- Check that the value is a valid existing function
-          if (!function_exists($v_function_name)) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '".$v_function_name."()' is not an existing function for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Set the attribute
-          $v_result_list[$p_options_list[$i]] = $v_function_name;
-          $i++;
-        break;
-
-        default :
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                       "Unknown parameter '"
-							   .$p_options_list[$i]."'");
-
-          // ----- Return
-          return PclZip::errorCode();
-      }
-
-      // ----- Next options
-      $i++;
-    }
-
-    // ----- Look for mandatory options
-    if ($v_requested_options !== false) {
-      for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
-        // ----- Look for mandatory option
-        if ($v_requested_options[$key] == 'mandatory') {
-          // ----- Look if present
-          if (!isset($v_result_list[$key])) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-        }
-      }
-    }
-    
-    // ----- Look for default values
-    if (!isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
-      
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privOptionDefaultThreshold()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privOptionDefaultThreshold(&$p_options)
-  {
-    $v_result=1;
-    
-    if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-        || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
-      return $v_result;
-    }
-    
-    // ----- Get 'memory_limit' configuration value
-    $v_memory_limit = ini_get('memory_limit');
-    $v_memory_limit = trim($v_memory_limit);
-    $last = strtolower(substr($v_memory_limit, -1));
- 
-    if($last == 'g')
-        //$v_memory_limit = $v_memory_limit*1024*1024*1024;
-        $v_memory_limit = $v_memory_limit*1073741824;
-    if($last == 'm')
-        //$v_memory_limit = $v_memory_limit*1024*1024;
-        $v_memory_limit = $v_memory_limit*1048576;
-    if($last == 'k')
-        $v_memory_limit = $v_memory_limit*1024;
-            
-    $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit*PCLZIP_TEMPORARY_FILE_RATIO);
-    
-
-    // ----- Sanity check : No threshold if value lower than 1M
-    if ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] < 1048576) {
-      unset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]);
-    }
-          
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privFileDescrParseAtt()
-  // Description :
-  // Parameters :
-  // Return Values :
-  //   1 on success.
-  //   0 on failure.
-  // --------------------------------------------------------------------------------
-  function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options=false)
-  {
-    $v_result=1;
-    
-    // ----- For each file in the list check the attributes
-    foreach ($p_file_list as $v_key => $v_value) {
-    
-      // ----- Check if the option is supported
-      if (!isset($v_requested_options[$v_key])) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '".$v_key."' for this file");
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Look for attribute
-      switch ($v_key) {
-        case PCLZIP_ATT_FILE_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
-          
-          if ($p_filedescr['filename'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-        break;
-
-        case PCLZIP_ATT_FILE_NEW_SHORT_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
-
-          if ($p_filedescr['new_short_name'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-        break;
-
-        case PCLZIP_ATT_FILE_NEW_FULL_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
-
-          if ($p_filedescr['new_full_name'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-        break;
-
-        // ----- Look for options that takes a string
-        case PCLZIP_ATT_FILE_COMMENT :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['comment'] = $v_value;
-        break;
-
-        case PCLZIP_ATT_FILE_MTIME :
-          if (!is_integer($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". Integer expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['mtime'] = $v_value;
-        break;
-
-        case PCLZIP_ATT_FILE_CONTENT :
-          $p_filedescr['content'] = $v_value;
-        break;
-
-        default :
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                           "Unknown parameter '".$v_key."'");
-
-          // ----- Return
-          return PclZip::errorCode();
-      }
-
-      // ----- Look for mandatory options
-      if ($v_requested_options !== false) {
-        for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
-          // ----- Look for mandatory option
-          if ($v_requested_options[$key] == 'mandatory') {
-            // ----- Look if present
-            if (!isset($p_file_list[$key])) {
-              PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
-              return PclZip::errorCode();
-            }
-          }
-        }
-      }
-    
-    // end foreach
-    }
-    
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privFileDescrExpand()
-  // Description :
-  //   This method look for each item of the list to see if its a file, a folder
-  //   or a string to be added as file. For any other type of files (link, other)
-  //   just ignore the item.
-  //   Then prepare the information that will be stored for that file.
-  //   When its a folder, expand the folder with all the files that are in that 
-  //   folder (recursively).
-  // Parameters :
-  // Return Values :
-  //   1 on success.
-  //   0 on failure.
-  // --------------------------------------------------------------------------------
-  function privFileDescrExpand(&$p_filedescr_list, &$p_options)
-  {
-    $v_result=1;
-    
-    // ----- Create a result list
-    $v_result_list = array();
-    
-    // ----- Look each entry
-    for ($i=0; $i<sizeof($p_filedescr_list); $i++) {
-      
-      // ----- Get filedescr
-      $v_descr = $p_filedescr_list[$i];
-      
-      // ----- Reduce the filename
-      $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename'], false);
-      $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
-      
-      // ----- Look for real file or folder
-      if (file_exists($v_descr['filename'])) {
-        if (@is_file($v_descr['filename'])) {
-          $v_descr['type'] = 'file';
-        }
-        else if (@is_dir($v_descr['filename'])) {
-          $v_descr['type'] = 'folder';
-        }
-        else if (@is_link($v_descr['filename'])) {
-          // skip
-          continue;
-        }
-        else {
-          // skip
-          continue;
-        }
-      }
-      
-      // ----- Look for string added as file
-      else if (isset($v_descr['content'])) {
-        $v_descr['type'] = 'virtual_file';
-      }
-      
-      // ----- Missing file
-      else {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$v_descr['filename']."' does not exist");
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-      
-      // ----- Calculate the stored filename
-      $this->privCalculateStoredFilename($v_descr, $p_options);
-      
-      // ----- Add the descriptor in result list
-      $v_result_list[sizeof($v_result_list)] = $v_descr;
-      
-      // ----- Look for folder
-      if ($v_descr['type'] == 'folder') {
-        // ----- List of items in folder
-        $v_dirlist_descr = array();
-        $v_dirlist_nb = 0;
-        if ($v_folder_handler = @opendir($v_descr['filename'])) {
-          while (($v_item_handler = @readdir($v_folder_handler)) !== false) {
-
-            // ----- Skip '.' and '..'
-            if (($v_item_handler == '.') || ($v_item_handler == '..')) {
-                continue;
-            }
-            
-            // ----- Compose the full filename
-            $v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'].'/'.$v_item_handler;
-            
-            // ----- Look for different stored filename
-            // Because the name of the folder was changed, the name of the
-            // files/sub-folders also change
-            if (($v_descr['stored_filename'] != $v_descr['filename'])
-                 && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
-              if ($v_descr['stored_filename'] != '') {
-                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'].'/'.$v_item_handler;
-              }
-              else {
-                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
-              }
-            }
-      
-            $v_dirlist_nb++;
-          }
-          
-          @closedir($v_folder_handler);
-        }
-        else {
-          // TBC : unable to open folder in read mode
-        }
-        
-        // ----- Expand each element of the list
-        if ($v_dirlist_nb != 0) {
-          // ----- Expand
-          if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, $p_options)) != 1) {
-            return $v_result;
-          }
-          
-          // ----- Concat the resulting list
-          $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
-        }
-        else {
-        }
-          
-        // ----- Free local array
-        unset($v_dirlist_descr);
-      }
-    }
-    
-    // ----- Get the result list
-    $p_filedescr_list = $v_result_list;
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCreate()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_list_detail = array();
-    
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Open the file in write mode
-    if (($v_result = $this->privOpenFd('wb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Add the list of files
-    $v_result = $this->privAddList($p_filedescr_list, $p_result_list, $p_options);
-
-    // ----- Close
-    $this->privCloseFd();
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAdd()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_list_detail = array();
-
-    // ----- Look if the archive exists or is empty
-    if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0))
-    {
-
-      // ----- Do a create
-      $v_result = $this->privCreate($p_filedescr_list, $p_result_list, $p_options);
-
-      // ----- Return
-      return $v_result;
-    }
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Magic quotes trick
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
-
-    // ----- Creates a temporay file
-    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
-
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
-    {
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
-
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = $v_central_dir['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Swap the file descriptor
-    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
-    // the following methods on the temporary fil and not the real archive
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Add the files
-    $v_header_list = array();
-    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
-    {
-      fclose($v_zip_temp_fd);
-      $this->privCloseFd();
-      @unlink($v_zip_temp_name);
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($this->zip_fd);
-
-    // ----- Copy the block of file headers from the old archive
-    $v_size = $v_central_dir['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_zip_temp_fd, $v_read_size);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Create the Central Dir files header
-    for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++)
-    {
-      // ----- Create the file header
-      if ($v_header_list[$i]['status'] == 'ok') {
-        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-          fclose($v_zip_temp_fd);
-          $this->privCloseFd();
-          @unlink($v_zip_temp_name);
-          $this->privSwapBackMagicQuotes();
-
-          // ----- Return
-          return $v_result;
-        }
-        $v_count++;
-      }
-
-      // ----- Transform the header to a 'usable' info
-      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-    }
-
-    // ----- Zip file comment
-    $v_comment = $v_central_dir['comment'];
-    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-    }
-    if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) {
-      $v_comment = $v_comment.$p_options[PCLZIP_OPT_ADD_COMMENT];
-    }
-    if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT].$v_comment;
-    }
-
-    // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
-
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_count+$v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)
-    {
-      // ----- Reset the file list
-      unset($v_header_list);
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Swap back the file descriptor
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Close
-    $this->privCloseFd();
-
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Delete the zip file
-    // TBC : I should test the result ...
-    @unlink($this->zipname);
-
-    // ----- Rename the temporary file
-    // TBC : I should test the result ...
-    //@rename($v_zip_temp_name, $this->zipname);
-    PclZipUtilRename($v_zip_temp_name, $this->zipname);
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privOpenFd()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privOpenFd($p_mode)
-  {
-    $v_result=1;
-
-    // ----- Look if already open
-    if ($this->zip_fd != 0)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \''.$this->zipname.'\' already open');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Open the zip file
-    if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in '.$p_mode.' mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCloseFd()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privCloseFd()
-  {
-    $v_result=1;
-
-    if ($this->zip_fd != 0)
-      @fclose($this->zip_fd);
-    $this->zip_fd = 0;
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddList()
-  // Description :
-  //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
-  //   different from the real path of the file. This is usefull if you want to have PclTar
-  //   running in any directory, and memorize relative path from an other directory.
-  // Parameters :
-  //   $p_list : An array containing the file or directory names to add in the tar
-  //   $p_result_list : list of added files with their properties (specially the status field)
-  //   $p_add_dir : Path to add in the filename path archived
-  //   $p_remove_dir : Path to remove in the filename path archived
-  // Return Values :
-  // --------------------------------------------------------------------------------
-//  function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
-  function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Add the files
-    $v_header_list = array();
-    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($this->zip_fd);
-
-    // ----- Create the Central Dir files header
-    for ($i=0,$v_count=0; $i<sizeof($v_header_list); $i++)
-    {
-      // ----- Create the file header
-      if ($v_header_list[$i]['status'] == 'ok') {
-        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-          // ----- Return
-          return $v_result;
-        }
-        $v_count++;
-      }
-
-      // ----- Transform the header to a 'usable' info
-      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-    }
-
-    // ----- Zip file comment
-    $v_comment = '';
-    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-    }
-
-    // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
-
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1)
-    {
-      // ----- Reset the file list
-      unset($v_header_list);
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddFileList()
-  // Description :
-  // Parameters :
-  //   $p_filedescr_list : An array containing the file description 
-  //                      or directory names to add in the zip
-  //   $p_result_list : list of added files with their properties (specially the status field)
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_header = array();
-
-    // ----- Recuperate the current number of elt in list
-    $v_nb = sizeof($p_result_list);
-
-    // ----- Loop on the files
-    for ($j=0; ($j<sizeof($p_filedescr_list)) && ($v_result==1); $j++) {
-      // ----- Format the filename
-      $p_filedescr_list[$j]['filename']
-      = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
-      
-
-      // ----- Skip empty file names
-      // TBC : Can this be possible ? not checked in DescrParseAtt ?
-      if ($p_filedescr_list[$j]['filename'] == "") {
-        continue;
-      }
-
-      // ----- Check the filename
-      if (   ($p_filedescr_list[$j]['type'] != 'virtual_file')
-          && (!file_exists($p_filedescr_list[$j]['filename']))) {
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$p_filedescr_list[$j]['filename']."' does not exist");
-        return PclZip::errorCode();
-      }
-
-      // ----- Look if it is a file or a dir with no all path remove option
-      // or a dir with all its path removed
-//      if (   (is_file($p_filedescr_list[$j]['filename']))
-//          || (   is_dir($p_filedescr_list[$j]['filename'])
-      if (   ($p_filedescr_list[$j]['type'] == 'file')
-          || ($p_filedescr_list[$j]['type'] == 'virtual_file')
-          || (   ($p_filedescr_list[$j]['type'] == 'folder')
-              && (   !isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])
-                  || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))
-          ) {
-
-        // ----- Add the file
-        $v_result = $this->privAddFile($p_filedescr_list[$j], $v_header,
-                                       $p_options);
-        if ($v_result != 1) {
-          return $v_result;
-        }
-
-        // ----- Store the file infos
-        $p_result_list[$v_nb++] = $v_header;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAddFile($p_filedescr, &$p_header, &$p_options)
-  {
-    $v_result=1;
-    
-    // ----- Working variable
-    $p_filename = $p_filedescr['filename'];
-
-    // TBC : Already done in the fileAtt check ... ?
-    if ($p_filename == "") {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-  
-    // ----- Look for a stored different filename 
-    /* TBC : Removed
-    if (isset($p_filedescr['stored_filename'])) {
-      $v_stored_filename = $p_filedescr['stored_filename'];
-    }
-    else {
-      $v_stored_filename = $p_filedescr['stored_filename'];
-    }
-    */
-
-    // ----- Set the file properties
-    clearstatcache();
-    $p_header['version'] = 20;
-    $p_header['version_extracted'] = 10;
-    $p_header['flag'] = 0;
-    $p_header['compression'] = 0;
-    $p_header['crc'] = 0;
-    $p_header['compressed_size'] = 0;
-    $p_header['filename_len'] = strlen($p_filename);
-    $p_header['extra_len'] = 0;
-    $p_header['disk'] = 0;
-    $p_header['internal'] = 0;
-    $p_header['offset'] = 0;
-    $p_header['filename'] = $p_filename;
-// TBC : Removed    $p_header['stored_filename'] = $v_stored_filename;
-    $p_header['stored_filename'] = $p_filedescr['stored_filename'];
-    $p_header['extra'] = '';
-    $p_header['status'] = 'ok';
-    $p_header['index'] = -1;
-
-    // ----- Look for regular file
-    if ($p_filedescr['type']=='file') {
-      $p_header['external'] = 0x00000000;
-      $p_header['size'] = filesize($p_filename);
-    }
-    
-    // ----- Look for regular folder
-    else if ($p_filedescr['type']=='folder') {
-      $p_header['external'] = 0x00000010;
-      $p_header['mtime'] = filemtime($p_filename);
-      $p_header['size'] = filesize($p_filename);
-    }
-    
-    // ----- Look for virtual file
-    else if ($p_filedescr['type'] == 'virtual_file') {
-      $p_header['external'] = 0x00000000;
-      $p_header['size'] = strlen($p_filedescr['content']);
-    }
-    
-
-    // ----- Look for filetime
-    if (isset($p_filedescr['mtime'])) {
-      $p_header['mtime'] = $p_filedescr['mtime'];
-    }
-    else if ($p_filedescr['type'] == 'virtual_file') {
-      $p_header['mtime'] = time();
-    }
-    else {
-      $p_header['mtime'] = filemtime($p_filename);
-    }
-
-    // ------ Look for file comment
-    if (isset($p_filedescr['comment'])) {
-      $p_header['comment_len'] = strlen($p_filedescr['comment']);
-      $p_header['comment'] = $p_filedescr['comment'];
-    }
-    else {
-      $p_header['comment_len'] = 0;
-      $p_header['comment'] = '';
-    }
-
-    // ----- Look for pre-add callback
-    if (isset($p_options[PCLZIP_CB_PRE_ADD])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_ADD].'(PCLZIP_CB_PRE_ADD, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_ADD](PCLZIP_CB_PRE_ADD, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_header['status'] = "skipped";
-        $v_result = 1;
-      }
-
-      // ----- Update the informations
-      // Only some fields can be modified
-      if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
-        $p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
-      }
-    }
-
-    // ----- Look for empty stored filename
-    if ($p_header['stored_filename'] == "") {
-      $p_header['status'] = "filtered";
-    }
-    
-    // ----- Check the path length
-    if (strlen($p_header['stored_filename']) > 0xFF) {
-      $p_header['status'] = 'filename_too_long';
-    }
-
-    // ----- Look if no error, or file not skipped
-    if ($p_header['status'] == 'ok') {
-
-      // ----- Look for a file
-      if ($p_filedescr['type'] == 'file') {
-        // ----- Look for using temporary file to zip
-        if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) 
-            && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
-                || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                    && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])) ) ) {
-          $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);
-          if ($v_result < PCLZIP_ERR_NO_ERROR) {
-            return $v_result;
-          }
-        }
-        
-        // ----- Use "in memory" zip algo
-        else {
-
-        // ----- Open the source file
-        if (($v_file = @fopen($p_filename, "rb")) == 0) {
-          PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
-          return PclZip::errorCode();
-        }
-
-        // ----- Read the file content
-        $v_content = @fread($v_file, $p_header['size']);
-
-        // ----- Close the file
-        @fclose($v_file);
-
-        // ----- Calculate the CRC
-        $p_header['crc'] = @crc32($v_content);
-        
-        // ----- Look for no compression
-        if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
-          // ----- Set header parameters
-          $p_header['compressed_size'] = $p_header['size'];
-          $p_header['compression'] = 0;
-        }
-        
-        // ----- Look for normal compression
-        else {
-          // ----- Compress the content
-          $v_content = @gzdeflate($v_content);
-
-          // ----- Set header parameters
-          $p_header['compressed_size'] = strlen($v_content);
-          $p_header['compression'] = 8;
-        }
-        
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-          @fclose($v_file);
-          return $v_result;
-        }
-
-        // ----- Write the compressed (or not) content
-        @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
-
-        }
-
-      }
-
-      // ----- Look for a virtual file (a file from string)
-      else if ($p_filedescr['type'] == 'virtual_file') {
-          
-        $v_content = $p_filedescr['content'];
-
-        // ----- Calculate the CRC
-        $p_header['crc'] = @crc32($v_content);
-        
-        // ----- Look for no compression
-        if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
-          // ----- Set header parameters
-          $p_header['compressed_size'] = $p_header['size'];
-          $p_header['compression'] = 0;
-        }
-        
-        // ----- Look for normal compression
-        else {
-          // ----- Compress the content
-          $v_content = @gzdeflate($v_content);
-
-          // ----- Set header parameters
-          $p_header['compressed_size'] = strlen($v_content);
-          $p_header['compression'] = 8;
-        }
-        
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-          @fclose($v_file);
-          return $v_result;
-        }
-
-        // ----- Write the compressed (or not) content
-        @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
-      }
-
-      // ----- Look for a directory
-      else if ($p_filedescr['type'] == 'folder') {
-        // ----- Look for directory last '/'
-        if (@substr($p_header['stored_filename'], -1) != '/') {
-          $p_header['stored_filename'] .= '/';
-        }
-
-        // ----- Set the file properties
-        $p_header['size'] = 0;
-        //$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
-        $p_header['external'] = 0x00000010;   // Value for a folder : to be checked
-
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1)
-        {
-          return $v_result;
-        }
-      }
-    }
-
-    // ----- Look for post-add callback
-    if (isset($p_options[PCLZIP_CB_POST_ADD])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_ADD].'(PCLZIP_CB_POST_ADD, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_ADD](PCLZIP_CB_POST_ADD, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Ignored
-        $v_result = 1;
-      }
-
-      // ----- Update the informations
-      // Nothing can be modified
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddFileUsingTempFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
-  {
-    $v_result=PCLZIP_ERR_NO_ERROR;
-    
-    // ----- Working variable
-    $p_filename = $p_filedescr['filename'];
-
-
-    // ----- Open the source file
-    if (($v_file = @fopen($p_filename, "rb")) == 0) {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
-      return PclZip::errorCode();
-    }
-
-    // ----- Creates a compressed temporary file
-    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
-    if (($v_file_compressed = @gzopen($v_gzip_temp_name, "wb")) == 0) {
-      fclose($v_file);
-      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = filesize($p_filename);
-    while ($v_size != 0) {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_file, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @gzputs($v_file_compressed, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Close the file
-    @fclose($v_file);
-    @gzclose($v_file_compressed);
-
-    // ----- Check the minimum file size
-    if (filesize($v_gzip_temp_name) < 18) {
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \''.$v_gzip_temp_name.'\' has invalid filesize - should be minimum 18 bytes');
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the compressed attributes
-    if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the gzip file header
-    $v_binary_data = @fread($v_file_compressed, 10);
-    $v_data_header = unpack('a1id1/a1id2/a1cm/a1flag/Vmtime/a1xfl/a1os', $v_binary_data);
-
-    // ----- Check some parameters
-    $v_data_header['os'] = bin2hex($v_data_header['os']);
-
-    // ----- Read the gzip file footer
-    @fseek($v_file_compressed, filesize($v_gzip_temp_name)-8);
-    $v_binary_data = @fread($v_file_compressed, 8);
-    $v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);
-
-    // ----- Set the attributes
-    $p_header['compression'] = ord($v_data_header['cm']);
-    //$p_header['mtime'] = $v_data_header['mtime'];
-    $p_header['crc'] = $v_data_footer['crc'];
-    $p_header['compressed_size'] = filesize($v_gzip_temp_name)-18;
-
-    // ----- Close the file
-    @fclose($v_file_compressed);
-
-    // ----- Call the header generation
-    if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-      return $v_result;
-    }
-
-    // ----- Add the compressed data
-    if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0)
-    {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    fseek($v_file_compressed, 10);
-    $v_size = $p_header['compressed_size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_file_compressed, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Close the file
-    @fclose($v_file_compressed);
-
-    // ----- Unlink the temporary file
-    @unlink($v_gzip_temp_name);
-    
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCalculateStoredFilename()
-  // Description :
-  //   Based on file descriptor properties and global options, this method
-  //   calculate the filename that will be stored in the archive.
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privCalculateStoredFilename(&$p_filedescr, &$p_options)
-  {
-    $v_result=1;
-    
-    // ----- Working variables
-    $p_filename = $p_filedescr['filename'];
-    if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
-      $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
-    }
-    else {
-      $p_add_dir = '';
-    }
-    if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
-      $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
-    }
-    else {
-      $p_remove_dir = '';
-    }
-    if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-      $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-    }
-    else {
-      $p_remove_all_dir = 0;
-    }
-
-
-    // ----- Look for full name change
-    if (isset($p_filedescr['new_full_name'])) {
-      // ----- Remove drive letter if any
-      $v_stored_filename = PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);
-    }
-    
-    // ----- Look for path and/or short name change
-    else {
-
-      // ----- Look for short name change
-      // Its when we cahnge just the filename but not the path
-      if (isset($p_filedescr['new_short_name'])) {
-        $v_path_info = pathinfo($p_filename);
-        $v_dir = '';
-        if ($v_path_info['dirname'] != '') {
-          $v_dir = $v_path_info['dirname'].'/';
-        }
-        $v_stored_filename = $v_dir.$p_filedescr['new_short_name'];
-      }
-      else {
-        // ----- Calculate the stored filename
-        $v_stored_filename = $p_filename;
-      }
-
-      // ----- Look for all path to remove
-      if ($p_remove_all_dir) {
-        $v_stored_filename = basename($p_filename);
-      }
-      // ----- Look for partial path remove
-      else if ($p_remove_dir != "") {
-        if (substr($p_remove_dir, -1) != '/')
-          $p_remove_dir .= "/";
-
-        if (   (substr($p_filename, 0, 2) == "./")
-            || (substr($p_remove_dir, 0, 2) == "./")) {
-            
-          if (   (substr($p_filename, 0, 2) == "./")
-              && (substr($p_remove_dir, 0, 2) != "./")) {
-            $p_remove_dir = "./".$p_remove_dir;
-          }
-          if (   (substr($p_filename, 0, 2) != "./")
-              && (substr($p_remove_dir, 0, 2) == "./")) {
-            $p_remove_dir = substr($p_remove_dir, 2);
-          }
-        }
-
-        $v_compare = PclZipUtilPathInclusion($p_remove_dir,
-                                             $v_stored_filename);
-        if ($v_compare > 0) {
-          if ($v_compare == 2) {
-            $v_stored_filename = "";
-          }
-          else {
-            $v_stored_filename = substr($v_stored_filename,
-                                        strlen($p_remove_dir));
-          }
-        }
-      }
-      
-      // ----- Remove drive letter if any
-      $v_stored_filename = PclZipUtilTranslateWinPath($v_stored_filename);
-      
-      // ----- Look for path to add
-      if ($p_add_dir != "") {
-        if (substr($p_add_dir, -1) == "/")
-          $v_stored_filename = $p_add_dir.$v_stored_filename;
-        else
-          $v_stored_filename = $p_add_dir."/".$v_stored_filename;
-      }
-    }
-
-    // ----- Filename (reduce the path of stored name)
-    $v_stored_filename = PclZipUtilPathReduction($v_stored_filename);
-    $p_filedescr['stored_filename'] = $v_stored_filename;
-    
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privWriteFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privWriteFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // ----- Store the offset position of the file
-    $p_header['offset'] = ftell($this->zip_fd);
-
-    // ----- Transform UNIX mtime to DOS format mdate/mtime
-    $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
-
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50,
-	                      $p_header['version_extracted'], $p_header['flag'],
-                          $p_header['compression'], $v_mtime, $v_mdate,
-                          $p_header['crc'], $p_header['compressed_size'],
-						  $p_header['size'],
-                          strlen($p_header['stored_filename']),
-						  $p_header['extra_len']);
-
-    // ----- Write the first 148 bytes of the header in the archive
-    fputs($this->zip_fd, $v_binary_data, 30);
-
-    // ----- Write the variable fields
-    if (strlen($p_header['stored_filename']) != 0)
-    {
-      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
-    }
-    if ($p_header['extra_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privWriteCentralFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privWriteCentralFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // TBC
-    //for(reset($p_header); $key = key($p_header); next($p_header)) {
-    //}
-
-    // ----- Transform UNIX mtime to DOS format mdate/mtime
-    $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
-
-
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50,
-	                      $p_header['version'], $p_header['version_extracted'],
-                          $p_header['flag'], $p_header['compression'],
-						  $v_mtime, $v_mdate, $p_header['crc'],
-                          $p_header['compressed_size'], $p_header['size'],
-                          strlen($p_header['stored_filename']),
-						  $p_header['extra_len'], $p_header['comment_len'],
-                          $p_header['disk'], $p_header['internal'],
-						  $p_header['external'], $p_header['offset']);
-
-    // ----- Write the 42 bytes of the header in the zip file
-    fputs($this->zip_fd, $v_binary_data, 46);
-
-    // ----- Write the variable fields
-    if (strlen($p_header['stored_filename']) != 0)
-    {
-      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
-    }
-    if ($p_header['extra_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
-    }
-    if ($p_header['comment_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']);
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privWriteCentralHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
-  {
-    $v_result=1;
-
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries,
-	                      $p_nb_entries, $p_size,
-						  $p_offset, strlen($p_comment));
-
-    // ----- Write the 22 bytes of the header in the zip file
-    fputs($this->zip_fd, $v_binary_data, 22);
-
-    // ----- Write the variable fields
-    if (strlen($p_comment) != 0)
-    {
-      fputs($this->zip_fd, $p_comment, strlen($p_comment));
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privList()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privList(&$p_list)
-  {
-    $v_result=1;
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Open the zip file
-    if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
-    {
-      // ----- Magic quotes trick
-      $this->privSwapBackMagicQuotes();
-      
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of Central Dir
-    @rewind($this->zip_fd);
-    if (@fseek($this->zip_fd, $v_central_dir['offset']))
-    {
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read each entry
-    for ($i=0; $i<$v_central_dir['entries']; $i++)
-    {
-      // ----- Read the file header
-      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
-      {
-        $this->privSwapBackMagicQuotes();
-        return $v_result;
-      }
-      $v_header['index'] = $i;
-
-      // ----- Get the only interesting attributes
-      $this->privConvertHeader2FileInfo($v_header, $p_list[$i]);
-      unset($v_header);
-    }
-
-    // ----- Close the zip file
-    $this->privCloseFd();
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privConvertHeader2FileInfo()
-  // Description :
-  //   This function takes the file informations from the central directory
-  //   entries and extract the interesting parameters that will be given back.
-  //   The resulting file infos are set in the array $p_info
-  //     $p_info['filename'] : Filename with full path. Given by user (add),
-  //                           extracted in the filesystem (extract).
-  //     $p_info['stored_filename'] : Stored filename in the archive.
-  //     $p_info['size'] = Size of the file.
-  //     $p_info['compressed_size'] = Compressed size of the file.
-  //     $p_info['mtime'] = Last modification date of the file.
-  //     $p_info['comment'] = Comment associated with the file.
-  //     $p_info['folder'] = true/false : indicates if the entry is a folder or not.
-  //     $p_info['status'] = status of the action on the file.
-  //     $p_info['crc'] = CRC of the file content.
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privConvertHeader2FileInfo($p_header, &$p_info)
-  {
-    $v_result=1;
-
-    // ----- Get the interesting attributes
-    $v_temp_path = PclZipUtilPathReduction($p_header['filename']);
-    $p_info['filename'] = $v_temp_path;
-    $v_temp_path = PclZipUtilPathReduction($p_header['stored_filename']);
-    $p_info['stored_filename'] = $v_temp_path;
-    $p_info['size'] = $p_header['size'];
-    $p_info['compressed_size'] = $p_header['compressed_size'];
-    $p_info['mtime'] = $p_header['mtime'];
-    $p_info['comment'] = $p_header['comment'];
-    $p_info['folder'] = (($p_header['external']&0x00000010)==0x00000010);
-    $p_info['index'] = $p_header['index'];
-    $p_info['status'] = $p_header['status'];
-    $p_info['crc'] = $p_header['crc'];
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractByRule()
-  // Description :
-  //   Extract a file or directory depending of rules (by index, by name, ...)
-  // Parameters :
-  //   $p_file_list : An array where will be placed the properties of each
-  //                  extracted file
-  //   $p_path : Path to add while writing the extracted files
-  //   $p_remove_path : Path to remove (from the file memorized path) while writing the
-  //                    extracted files. If the path does not match the file path,
-  //                    the file is extracted with its memorized path.
-  //                    $p_remove_path does not apply to 'list' mode.
-  //                    $p_path and $p_remove_path are commulative.
-  // Return Values :
-  //   1 on success,0 or less on error (see error code list)
-  // --------------------------------------------------------------------------------
-  function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Check the path
-    if (   ($p_path == "")
-	    || (   (substr($p_path, 0, 1) != "/")
-		    && (substr($p_path, 0, 3) != "../")
-			&& (substr($p_path,1,2)!=":/")))
-      $p_path = "./".$p_path;
-
-    // ----- Reduce the path last (and duplicated) '/'
-    if (($p_path != "./") && ($p_path != "/"))
-    {
-      // ----- Look for the path end '/'
-      while (substr($p_path, -1) == "/")
-      {
-        $p_path = substr($p_path, 0, strlen($p_path)-1);
-      }
-    }
-
-    // ----- Look for path to remove format (should end by /)
-    if (($p_remove_path != "") && (substr($p_remove_path, -1) != '/'))
-    {
-      $p_remove_path .= '/';
-    }
-    $p_remove_path_size = strlen($p_remove_path);
-
-    // ----- Open the zip file
-    if (($v_result = $this->privOpenFd('rb')) != 1)
-    {
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      // ----- Close the zip file
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
-
-      return $v_result;
-    }
-
-    // ----- Start at beginning of Central Dir
-    $v_pos_entry = $v_central_dir['offset'];
-
-    // ----- Read each entry
-    $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
-    {
-
-      // ----- Read next Central dir entry
-      @rewind($this->zip_fd);
-      if (@fseek($this->zip_fd, $v_pos_entry))
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-        $this->privSwapBackMagicQuotes();
-
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Read the file header
-      $v_header = array();
-      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-        $this->privSwapBackMagicQuotes();
-
-        return $v_result;
-      }
-
-      // ----- Store the index
-      $v_header['index'] = $i;
-
-      // ----- Store the file position
-      $v_pos_entry = ftell($this->zip_fd);
-
-      // ----- Look for the specific extract rules
-      $v_extract = false;
-
-      // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
-          && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
-
-          // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
-
-              // ----- Look for a directory
-              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
-
-                  // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
-                      && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_extract = true;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
-                  $v_extract = true;
-              }
-          }
-      }
-
-      // ----- Look for extract by ereg rule
-      // ereg() is deprecated with PHP 5.3
-      /* 
-      else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
-               && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
-
-          if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header['stored_filename'])) {
-              $v_extract = true;
-          }
-      }
-      */
-
-      // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
-               && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
-
-          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
-              $v_extract = true;
-          }
-      }
-
-      // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
-               && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
-          
-          // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
-
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
-                  $v_extract = true;
-              }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
-              }
-
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
-                  break;
-              }
-          }
-      }
-
-      // ----- Look for no rule, which means extract all the archive
-      else {
-          $v_extract = true;
-      }
-
-	  // ----- Check compression method
-	  if (   ($v_extract)
-	      && (   ($v_header['compression'] != 8)
-		      && ($v_header['compression'] != 0))) {
-          $v_header['status'] = 'unsupported_compression';
-
-          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-              $this->privSwapBackMagicQuotes();
-              
-              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION,
-			                       "Filename '".$v_header['stored_filename']."' is "
-				  	    	  	   ."compressed by an unsupported compression "
-				  	    	  	   ."method (".$v_header['compression'].") ");
-
-              return PclZip::errorCode();
-		  }
-	  }
-	  
-	  // ----- Check encrypted files
-	  if (($v_extract) && (($v_header['flag'] & 1) == 1)) {
-          $v_header['status'] = 'unsupported_encryption';
-
-          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-              $this->privSwapBackMagicQuotes();
-
-              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION,
-			                       "Unsupported encryption for "
-				  	    	  	   ." filename '".$v_header['stored_filename']
-								   ."'");
-
-              return PclZip::errorCode();
-		  }
-    }
-
-      // ----- Look for real extraction
-      if (($v_extract) && ($v_header['status'] != 'ok')) {
-          $v_result = $this->privConvertHeader2FileInfo($v_header,
-		                                        $p_file_list[$v_nb_extracted++]);
-          if ($v_result != 1) {
-              $this->privCloseFd();
-              $this->privSwapBackMagicQuotes();
-              return $v_result;
-          }
-
-          $v_extract = false;
-      }
-      
-      // ----- Look for real extraction
-      if ($v_extract)
-      {
-
-        // ----- Go to the file position
-        @rewind($this->zip_fd);
-        if (@fseek($this->zip_fd, $v_header['offset']))
-        {
-          // ----- Close the zip file
-          $this->privCloseFd();
-
-          $this->privSwapBackMagicQuotes();
-
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-          // ----- Return
-          return PclZip::errorCode();
-        }
-
-        // ----- Look for extraction as string
-        if ($p_options[PCLZIP_OPT_EXTRACT_AS_STRING]) {
-
-          $v_string = '';
-
-          // ----- Extracting the file
-          $v_result1 = $this->privExtractFileAsString($v_header, $v_string, $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
-
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1)
-          {
-            // ----- Close the zip file
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-
-            return $v_result;
-          }
-
-          // ----- Set the file content
-          $p_file_list[$v_nb_extracted]['content'] = $v_string;
-
-          // ----- Next extracted file
-          $v_nb_extracted++;
-          
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-          	break;
-          }
-        }
-        // ----- Look for extraction in standard output
-        elseif (   (isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))
-		        && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
-          // ----- Extracting the file in standard output
-          $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
-
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result;
-          }
-
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-          	break;
-          }
-        }
-        // ----- Look for normal extraction
-        else {
-          // ----- Extracting the file
-          $v_result1 = $this->privExtractFile($v_header,
-		                                      $p_path, $p_remove_path,
-											  $p_remove_all_path,
-											  $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
-
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1)
-          {
-            // ----- Close the zip file
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-
-            return $v_result;
-          }
-
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-          	break;
-          }
-        }
-      }
-    }
-
-    // ----- Close the zip file
-    $this->privCloseFd();
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  //
-  // 1 : ... ?
-  // PCLZIP_ERR_USER_ABORTED(2) : User ask for extraction stop in callback
-  // --------------------------------------------------------------------------------
-  function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Read the file header
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
-
-    // ----- Look for all path to remove
-    if ($p_remove_all_path == true) {
-        // ----- Look for folder entry that not need to be extracted
-        if (($p_entry['external']&0x00000010)==0x00000010) {
-
-            $p_entry['status'] = "filtered";
-
-            return $v_result;
-        }
-
-        // ----- Get the basename of the path
-        $p_entry['filename'] = basename($p_entry['filename']);
-    }
-
-    // ----- Look for path to remove
-    else if ($p_remove_path != "")
-    {
-      if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2)
-      {
-
-        // ----- Change the file status
-        $p_entry['status'] = "filtered";
-
-        // ----- Return
-        return $v_result;
-      }
-
-      $p_remove_path_size = strlen($p_remove_path);
-      if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path)
-      {
-
-        // ----- Remove the path
-        $p_entry['filename'] = substr($p_entry['filename'], $p_remove_path_size);
-
-      }
-    }
-
-    // ----- Add the path
-    if ($p_path != '') {
-      $p_entry['filename'] = $p_path."/".$p_entry['filename'];
-    }
-    
-    // ----- Check a base_dir_restriction
-    if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
-      $v_inclusion
-      = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION],
-                                $p_entry['filename']); 
-      if ($v_inclusion == 0) {
-
-        PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION,
-			                     "Filename '".$p_entry['filename']."' is "
-								 ."outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
-
-        return PclZip::errorCode();
-      }
-    }
-
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
-        $v_result = 1;
-      }
-      
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
-
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-    // ----- Look for specific actions while the file exist
-    if (file_exists($p_entry['filename']))
-    {
-
-      // ----- Look if file is a directory
-      if (is_dir($p_entry['filename']))
-      {
-
-        // ----- Change the file status
-        $p_entry['status'] = "already_a_directory";
-        
-        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-        // For historical reason first PclZip implementation does not stop
-        // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-            PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY,
-			                     "Filename '".$p_entry['filename']."' is "
-								 ."already used by an existing directory");
-
-            return PclZip::errorCode();
-		    }
-      }
-      // ----- Look if file is write protected
-      else if (!is_writeable($p_entry['filename']))
-      {
-
-        // ----- Change the file status
-        $p_entry['status'] = "write_protected";
-
-        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-        // For historical reason first PclZip implementation does not stop
-        // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
-			                     "Filename '".$p_entry['filename']."' exists "
-								 ."and is write protected");
-
-            return PclZip::errorCode();
-		    }
-      }
-
-      // ----- Look if the extracted file is older
-      else if (filemtime($p_entry['filename']) > $p_entry['mtime'])
-      {
-        // ----- Change the file status
-        if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
-		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {
-	  	  }
-		    else {
-            $p_entry['status'] = "newer_exist";
-
-            // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-            // For historical reason first PclZip implementation does not stop
-            // when this kind of error occurs.
-            if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		        && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-                PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
-			             "Newer version of '".$p_entry['filename']."' exists "
-					    ."and option PCLZIP_OPT_REPLACE_NEWER is not selected");
-
-                return PclZip::errorCode();
-		      }
-		    }
-      }
-      else {
-      }
-    }
-
-    // ----- Check the directory availability and create it if necessary
-    else {
-      if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/'))
-        $v_dir_to_check = $p_entry['filename'];
-      else if (!strstr($p_entry['filename'], "/"))
-        $v_dir_to_check = "";
-      else
-        $v_dir_to_check = dirname($p_entry['filename']);
-
-        if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
-  
-          // ----- Change the file status
-          $p_entry['status'] = "path_creation_fail";
-  
-          // ----- Return
-          //return $v_result;
-          $v_result = 1;
-        }
-      }
-    }
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010))
-      {
-        // ----- Look for not compressed file
-        if ($p_entry['compression'] == 0) {
-
-    		  // ----- Opening destination file
-          if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0)
-          {
-
-            // ----- Change the file status
-            $p_entry['status'] = "write_error";
-
-            // ----- Return
-            return $v_result;
-          }
-
-
-          // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-          $v_size = $p_entry['compressed_size'];
-          while ($v_size != 0)
-          {
-            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-            $v_buffer = @fread($this->zip_fd, $v_read_size);
-            /* Try to speed up the code
-            $v_binary_data = pack('a'.$v_read_size, $v_buffer);
-            @fwrite($v_dest_file, $v_binary_data, $v_read_size);
-            */
-            @fwrite($v_dest_file, $v_buffer, $v_read_size);            
-            $v_size -= $v_read_size;
-          }
-
-          // ----- Closing the destination file
-          fclose($v_dest_file);
-
-          // ----- Change the file mtime
-          touch($p_entry['filename'], $p_entry['mtime']);
-          
-
-        }
-        else {
-          // ----- TBC
-          // Need to be finished
-          if (($p_entry['flag'] & 1) == 1) {
-            PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \''.$p_entry['filename'].'\' is encrypted. Encrypted files are not supported.');
-            return PclZip::errorCode();
-          }
-
-
-          // ----- Look for using temporary file to unzip
-          if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) 
-              && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
-                  || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                      && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])) ) ) {
-            $v_result = $this->privExtractFileUsingTempFile($p_entry, $p_options);
-            if ($v_result < PCLZIP_ERR_NO_ERROR) {
-              return $v_result;
-            }
-          }
-          
-          // ----- Look for extract in memory
-          else {
-
-          
-            // ----- Read the compressed file in a buffer (one shot)
-            $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-            
-            // ----- Decompress the file
-            $v_file_content = @gzinflate($v_buffer);
-            unset($v_buffer);
-            if ($v_file_content === FALSE) {
-  
-              // ----- Change the file status
-              // TBC
-              $p_entry['status'] = "error";
-              
-              return $v_result;
-            }
-            
-            // ----- Opening destination file
-            if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
-  
-              // ----- Change the file status
-              $p_entry['status'] = "write_error";
-  
-              return $v_result;
-            }
-  
-            // ----- Write the uncompressed data
-            @fwrite($v_dest_file, $v_file_content, $p_entry['size']);
-            unset($v_file_content);
-  
-            // ----- Closing the destination file
-            @fclose($v_dest_file);
-            
-          }
-
-          // ----- Change the file mtime
-          @touch($p_entry['filename'], $p_entry['mtime']);
-        }
-
-        // ----- Look for chmod option
-        if (isset($p_options[PCLZIP_OPT_SET_CHMOD])) {
-
-          // ----- Change the mode of the file
-          @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);
-        }
-
-      }
-    }
-
-  	// ----- Change abort status
-  	if ($p_entry['status'] == "aborted") {
-        $p_entry['status'] = "skipped";
-  	}
-	
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFileUsingTempFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privExtractFileUsingTempFile(&$p_entry, &$p_options)
-  {
-    $v_result=1;
-        
-    // ----- Creates a temporary file
-    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
-    if (($v_dest_file = @fopen($v_gzip_temp_name, "wb")) == 0) {
-      fclose($v_file);
-      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
-      return PclZip::errorCode();
-    }
-
-
-    // ----- Write gz file format header
-    $v_binary_data = pack('va1a1Va1a1', 0x8b1f, Chr($p_entry['compression']), Chr(0x00), time(), Chr(0x00), Chr(3));
-    @fwrite($v_dest_file, $v_binary_data, 10);
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = $p_entry['compressed_size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($this->zip_fd, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($v_dest_file, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Write gz file format footer
-    $v_binary_data = pack('VV', $p_entry['crc'], $p_entry['size']);
-    @fwrite($v_dest_file, $v_binary_data, 8);
-
-    // ----- Close the temporary file
-    @fclose($v_dest_file);
-
-    // ----- Opening destination file
-    if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
-      $p_entry['status'] = "write_error";
-      return $v_result;
-    }
-
-    // ----- Open the temporary gz file
-    if (($v_src_file = @gzopen($v_gzip_temp_name, 'rb')) == 0) {
-      @fclose($v_dest_file);
-      $p_entry['status'] = "read_error";
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
-
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = $p_entry['size'];
-    while ($v_size != 0) {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @gzread($v_src_file, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($v_dest_file, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-    @fclose($v_dest_file);
-    @gzclose($v_src_file);
-
-    // ----- Delete the temporary file
-    @unlink($v_gzip_temp_name);
-    
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFileInOutput()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privExtractFileInOutput(&$p_entry, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Read the file header
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
-      return $v_result;
-    }
-
-
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
-
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
-        $v_result = 1;
-      }
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
-
-    // ----- Trace
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
-        // ----- Look for not compressed file
-        if ($p_entry['compressed_size'] == $p_entry['size']) {
-
-          // ----- Read the file in a buffer (one shot)
-          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-
-          // ----- Send the file to the output
-          echo $v_buffer;
-          unset($v_buffer);
-        }
-        else {
-
-          // ----- Read the compressed file in a buffer (one shot)
-          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-          
-          // ----- Decompress the file
-          $v_file_content = gzinflate($v_buffer);
-          unset($v_buffer);
-
-          // ----- Send the file to the output
-          echo $v_file_content;
-          unset($v_file_content);
-        }
-      }
-    }
-
-	// ----- Change abort status
-	if ($p_entry['status'] == "aborted") {
-      $p_entry['status'] = "skipped";
-	}
-
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
-
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFileAsString()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Read the file header
-    $v_header = array();
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
-
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
-        $v_result = 1;
-      }
-      
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
-
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
-        // ----- Look for not compressed file
-  //      if ($p_entry['compressed_size'] == $p_entry['size'])
-        if ($p_entry['compression'] == 0) {
-  
-          // ----- Reading the file
-          $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
-        }
-        else {
-  
-          // ----- Reading the file
-          $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
-          
-          // ----- Decompress the file
-          if (($p_string = @gzinflate($v_data)) === FALSE) {
-              // TBC
-          }
-        }
-  
-        // ----- Trace
-      }
-      else {
-          // TBC : error : can not extract a folder in a string
-      }
-      
-    }
-
-  	// ----- Change abort status
-  	if ($p_entry['status'] == "aborted") {
-        $p_entry['status'] = "skipped";
-  	}
-	
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-      
-      // ----- Swap the content to header
-      $v_local_header['content'] = $p_string;
-      $p_string = '';
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
-
-      // ----- Swap back the content to header
-      $p_string = $v_local_header['content'];
-      unset($v_local_header['content']);
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privReadFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privReadFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // ----- Read the 4 bytes signature
-    $v_binary_data = @fread($this->zip_fd, 4);
-    $v_data = unpack('Vid', $v_binary_data);
-
-    // ----- Check signature
-    if ($v_data['id'] != 0x04034b50)
-    {
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the first 42 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 26);
-
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 26)
-    {
-      $p_header['filename'] = "";
-      $p_header['status'] = "invalid_header";
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the values
-    $v_data = unpack('vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $v_binary_data);
-
-    // ----- Get filename
-    $p_header['filename'] = fread($this->zip_fd, $v_data['filename_len']);
-
-    // ----- Get extra_fields
-    if ($v_data['extra_len'] != 0) {
-      $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
-    }
-    else {
-      $p_header['extra'] = '';
-    }
-
-    // ----- Extract properties
-    $p_header['version_extracted'] = $v_data['version'];
-    $p_header['compression'] = $v_data['compression'];
-    $p_header['size'] = $v_data['size'];
-    $p_header['compressed_size'] = $v_data['compressed_size'];
-    $p_header['crc'] = $v_data['crc'];
-    $p_header['flag'] = $v_data['flag'];
-    $p_header['filename_len'] = $v_data['filename_len'];
-
-    // ----- Recuperate date in UNIX format
-    $p_header['mdate'] = $v_data['mdate'];
-    $p_header['mtime'] = $v_data['mtime'];
-    if ($p_header['mdate'] && $p_header['mtime'])
-    {
-      // ----- Extract time
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
-
-      // ----- Extract date
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
-      $v_day = $p_header['mdate'] & 0x001F;
-
-      // ----- Get UNIX date format
-      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
-
-    }
-    else
-    {
-      $p_header['mtime'] = time();
-    }
-
-    // TBC
-    //for(reset($v_data); $key = key($v_data); next($v_data)) {
-    //}
-
-    // ----- Set the stored filename
-    $p_header['stored_filename'] = $p_header['filename'];
-
-    // ----- Set the status field
-    $p_header['status'] = "ok";
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privReadCentralFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privReadCentralFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // ----- Read the 4 bytes signature
-    $v_binary_data = @fread($this->zip_fd, 4);
-    $v_data = unpack('Vid', $v_binary_data);
-
-    // ----- Check signature
-    if ($v_data['id'] != 0x02014b50)
-    {
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the first 42 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 42);
-
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 42)
-    {
-      $p_header['filename'] = "";
-      $p_header['status'] = "invalid_header";
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the values
-    $p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data);
-
-    // ----- Get filename
-    if ($p_header['filename_len'] != 0)
-      $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
-    else
-      $p_header['filename'] = '';
-
-    // ----- Get extra
-    if ($p_header['extra_len'] != 0)
-      $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
-    else
-      $p_header['extra'] = '';
-
-    // ----- Get comment
-    if ($p_header['comment_len'] != 0)
-      $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
-    else
-      $p_header['comment'] = '';
-
-    // ----- Extract properties
-
-    // ----- Recuperate date in UNIX format
-    //if ($p_header['mdate'] && $p_header['mtime'])
-    // TBC : bug : this was ignoring time with 0/0/0
-    if (1)
-    {
-      // ----- Extract time
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
-
-      // ----- Extract date
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
-      $v_day = $p_header['mdate'] & 0x001F;
-
-      // ----- Get UNIX date format
-      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
-
-    }
-    else
-    {
-      $p_header['mtime'] = time();
-    }
-
-    // ----- Set the stored filename
-    $p_header['stored_filename'] = $p_header['filename'];
-
-    // ----- Set default status to ok
-    $p_header['status'] = 'ok';
-
-    // ----- Look if it is a directory
-    if (substr($p_header['filename'], -1) == '/') {
-      //$p_header['external'] = 0x41FF0010;
-      $p_header['external'] = 0x00000010;
-    }
-
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCheckFileHeaders()
-  // Description :
-  // Parameters :
-  // Return Values :
-  //   1 on success,
-  //   0 on error;
-  // --------------------------------------------------------------------------------
-  function privCheckFileHeaders(&$p_local_header, &$p_central_header)
-  {
-    $v_result=1;
-
-  	// ----- Check the static values
-  	// TBC
-  	if ($p_local_header['filename'] != $p_central_header['filename']) {
-  	}
-  	if ($p_local_header['version_extracted'] != $p_central_header['version_extracted']) {
-  	}
-  	if ($p_local_header['flag'] != $p_central_header['flag']) {
-  	}
-  	if ($p_local_header['compression'] != $p_central_header['compression']) {
-  	}
-  	if ($p_local_header['mtime'] != $p_central_header['mtime']) {
-  	}
-  	if ($p_local_header['filename_len'] != $p_central_header['filename_len']) {
-  	}
-  
-  	// ----- Look for flag bit 3
-  	if (($p_local_header['flag'] & 8) == 8) {
-          $p_local_header['size'] = $p_central_header['size'];
-          $p_local_header['compressed_size'] = $p_central_header['compressed_size'];
-          $p_local_header['crc'] = $p_central_header['crc'];
-  	}
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privReadEndCentralDir()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privReadEndCentralDir(&$p_central_dir)
-  {
-    $v_result=1;
-
-    // ----- Go to the end of the zip file
-    $v_size = filesize($this->zipname);
-    @fseek($this->zip_fd, $v_size);
-    if (@ftell($this->zip_fd) != $v_size)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \''.$this->zipname.'\'');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- First try : look if this is an archive with no commentaries (most of the time)
-    // in this case the end of central dir is at 22 bytes of the file end
-    $v_found = 0;
-    if ($v_size > 26) {
-      @fseek($this->zip_fd, $v_size-22);
-      if (($v_pos = @ftell($this->zip_fd)) != ($v_size-22))
-      {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Read for bytes
-      $v_binary_data = @fread($this->zip_fd, 4);
-      $v_data = @unpack('Vid', $v_binary_data);
-
-      // ----- Check signature
-      if ($v_data['id'] == 0x06054b50) {
-        $v_found = 1;
-      }
-
-      $v_pos = ftell($this->zip_fd);
-    }
-
-    // ----- Go back to the maximum possible size of the Central Dir End Record
-    if (!$v_found) {
-      $v_maximum_size = 65557; // 0xFFFF + 22;
-      if ($v_maximum_size > $v_size)
-        $v_maximum_size = $v_size;
-      @fseek($this->zip_fd, $v_size-$v_maximum_size);
-      if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size))
-      {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Read byte per byte in order to find the signature
-      $v_pos = ftell($this->zip_fd);
-      $v_bytes = 0x00000000;
-      while ($v_pos < $v_size)
-      {
-        // ----- Read a byte
-        $v_byte = @fread($this->zip_fd, 1);
-
-        // -----  Add the byte
-        //$v_bytes = ($v_bytes << 8) | Ord($v_byte);
-        // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number 
-        // Otherwise on systems where we have 64bit integers the check below for the magic number will fail. 
-        $v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte); 
-
-        // ----- Compare the bytes
-        if ($v_bytes == 0x504b0506)
-        {
-          $v_pos++;
-          break;
-        }
-
-        $v_pos++;
-      }
-
-      // ----- Look if not found end of central dir
-      if ($v_pos == $v_size)
-      {
-
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Unable to find End of Central Dir Record signature");
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-    }
-
-    // ----- Read the first 18 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 18);
-
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 18)
-    {
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : ".strlen($v_binary_data));
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the values
-    $v_data = unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size', $v_binary_data);
-
-    // ----- Check the global size
-    if (($v_pos + $v_data['comment_size'] + 18) != $v_size) {
-
-	  // ----- Removed in release 2.2 see readme file
-	  // The check of the file size is a little too strict.
-	  // Some bugs where found when a zip is encrypted/decrypted with 'crypt'.
-	  // While decrypted, zip has training 0 bytes
-	  if (0) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT,
-	                       'The central dir is not at the end of the archive.'
-						   .' Some trailing bytes exists after the archive.');
-
-      // ----- Return
-      return PclZip::errorCode();
-	  }
-    }
-
-    // ----- Get comment
-    if ($v_data['comment_size'] != 0) {
-      $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);
-    }
-    else
-      $p_central_dir['comment'] = '';
-
-    $p_central_dir['entries'] = $v_data['entries'];
-    $p_central_dir['disk_entries'] = $v_data['disk_entries'];
-    $p_central_dir['offset'] = $v_data['offset'];
-    $p_central_dir['size'] = $v_data['size'];
-    $p_central_dir['disk'] = $v_data['disk'];
-    $p_central_dir['disk_start'] = $v_data['disk_start'];
-
-    // TBC
-    //for(reset($p_central_dir); $key = key($p_central_dir); next($p_central_dir)) {
-    //}
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDeleteByRule()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privDeleteByRule(&$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_list_detail = array();
-
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
-
-    // ----- Scan all the files
-    // ----- Start at beginning of Central Dir
-    $v_pos_entry = $v_central_dir['offset'];
-    @rewind($this->zip_fd);
-    if (@fseek($this->zip_fd, $v_pos_entry))
-    {
-      // ----- Close the zip file
-      $this->privCloseFd();
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read each entry
-    $v_header_list = array();
-    $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
-    {
-
-      // ----- Read the file header
-      $v_header_list[$v_nb_extracted] = array();
-      if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1)
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-
-        return $v_result;
-      }
-
-
-      // ----- Store the index
-      $v_header_list[$v_nb_extracted]['index'] = $i;
-
-      // ----- Look for the specific extract rules
-      $v_found = false;
-
-      // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
-          && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
-
-          // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
-
-              // ----- Look for a directory
-              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
-
-                  // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
-                      && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_found = true;
-                  }
-                  elseif (   (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */
-                          && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_found = true;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
-                  $v_found = true;
-              }
-          }
-      }
-
-      // ----- Look for extract by ereg rule
-      // ereg() is deprecated with PHP 5.3
-      /*
-      else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
-               && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
-
-          if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
-              $v_found = true;
-          }
-      }
-      */
-
-      // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
-               && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
-
-          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
-              $v_found = true;
-          }
-      }
-
-      // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
-               && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
-
-          // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
-
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
-                  $v_found = true;
-              }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
-              }
-
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
-                  break;
-              }
-          }
-      }
-      else {
-      	$v_found = true;
-      }
-
-      // ----- Look for deletion
-      if ($v_found)
-      {
-        unset($v_header_list[$v_nb_extracted]);
-      }
-      else
-      {
-        $v_nb_extracted++;
-      }
-    }
-
-    // ----- Look if something need to be deleted
-    if ($v_nb_extracted > 0) {
-
-        // ----- Creates a temporay file
-        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
-
-        // ----- Creates a temporary zip archive
-        $v_temp_zip = new PclZip($v_zip_temp_name);
-
-        // ----- Open the temporary zip file in write mode
-        if (($v_result = $v_temp_zip->privOpenFd('wb')) != 1) {
-            $this->privCloseFd();
-
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Look which file need to be kept
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
-
-            // ----- Calculate the position of the header
-            @rewind($this->zip_fd);
-            if (@fseek($this->zip_fd,  $v_header_list[$i]['offset'])) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-                // ----- Return
-                return PclZip::errorCode();
-            }
-
-            // ----- Read the file header
-            $v_local_header = array();
-            if (($v_result = $this->privReadFileHeader($v_local_header)) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                return $v_result;
-            }
-            
-            // ----- Check that local file header is same as central file header
-            if ($this->privCheckFileHeaders($v_local_header,
-			                                $v_header_list[$i]) != 1) {
-                // TBC
-            }
-            unset($v_local_header);
-
-            // ----- Write the file header
-            if (($v_result = $v_temp_zip->privWriteFileHeader($v_header_list[$i])) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                return $v_result;
-            }
-
-            // ----- Read/write the data block
-            if (($v_result = PclZipUtilCopyBlock($this->zip_fd, $v_temp_zip->zip_fd, $v_header_list[$i]['compressed_size'])) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                return $v_result;
-            }
-        }
-
-        // ----- Store the offset of the central dir
-        $v_offset = @ftell($v_temp_zip->zip_fd);
-
-        // ----- Re-Create the Central Dir files header
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
-            // ----- Create the file header
-            if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-                $v_temp_zip->privCloseFd();
-                $this->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                return $v_result;
-            }
-
-            // ----- Transform the header to a 'usable' info
-            $v_temp_zip->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-        }
-
-
-        // ----- Zip file comment
-        $v_comment = '';
-        if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-          $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-        }
-
-        // ----- Calculate the size of the central header
-        $v_size = @ftell($v_temp_zip->zip_fd)-$v_offset;
-
-        // ----- Create the central dir footer
-        if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
-            // ----- Reset the file list
-            unset($v_header_list);
-            $v_temp_zip->privCloseFd();
-            $this->privCloseFd();
-            @unlink($v_zip_temp_name);
-
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Close
-        $v_temp_zip->privCloseFd();
-        $this->privCloseFd();
-
-        // ----- Delete the zip file
-        // TBC : I should test the result ...
-        @unlink($this->zipname);
-
-        // ----- Rename the temporary file
-        // TBC : I should test the result ...
-        //@rename($v_zip_temp_name, $this->zipname);
-        PclZipUtilRename($v_zip_temp_name, $this->zipname);
-    
-        // ----- Destroy the temporary archive
-        unset($v_temp_zip);
-    }
-    
-    // ----- Remove every files : reset the file
-    else if ($v_central_dir['entries'] != 0) {
-        $this->privCloseFd();
-
-        if (($v_result = $this->privOpenFd('wb')) != 1) {
-          return $v_result;
-        }
-
-        if (($v_result = $this->privWriteCentralHeader(0, 0, 0, '')) != 1) {
-          return $v_result;
-        }
-
-        $this->privCloseFd();
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDirCheck()
-  // Description :
-  //   Check if a directory exists, if not it creates it and all the parents directory
-  //   which may be useful.
-  // Parameters :
-  //   $p_dir : Directory path to check.
-  // Return Values :
-  //    1 : OK
-  //   -1 : Unable to create directory
-  // --------------------------------------------------------------------------------
-  function privDirCheck($p_dir, $p_is_dir=false)
-  {
-    $v_result = 1;
-
-
-    // ----- Remove the final '/'
-    if (($p_is_dir) && (substr($p_dir, -1)=='/'))
-    {
-      $p_dir = substr($p_dir, 0, strlen($p_dir)-1);
-    }
-
-    // ----- Check the directory availability
-    if ((is_dir($p_dir)) || ($p_dir == ""))
-    {
-      return 1;
-    }
-
-    // ----- Extract parent directory
-    $p_parent_dir = dirname($p_dir);
-
-    // ----- Just a check
-    if ($p_parent_dir != $p_dir)
-    {
-      // ----- Look for parent directory
-      if ($p_parent_dir != "")
-      {
-        if (($v_result = $this->privDirCheck($p_parent_dir)) != 1)
-        {
-          return $v_result;
-        }
-      }
-    }
-
-    // ----- Create the directory
-    if (!@mkdir($p_dir, 0777))
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privMerge()
-  // Description :
-  //   If $p_archive_to_add does not exist, the function exit with a success result.
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privMerge(&$p_archive_to_add)
-  {
-    $v_result=1;
-
-    // ----- Look if the archive_to_add exists
-    if (!is_file($p_archive_to_add->zipname))
-    {
-
-      // ----- Nothing to merge, so merge is a success
-      $v_result = 1;
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Look if the archive exists
-    if (!is_file($this->zipname))
-    {
-
-      // ----- Do a duplicate
-      $v_result = $this->privDuplicate($p_archive_to_add->zipname);
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
-
-    // ----- Open the archive_to_add file
-    if (($v_result=$p_archive_to_add->privOpenFd('rb')) != 1)
-    {
-      $this->privCloseFd();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir_to_add = array();
-    if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
-
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($p_archive_to_add->zip_fd);
-
-    // ----- Creates a temporay file
-    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
-
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
-
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = $v_central_dir['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Copy the files from the archive_to_add into the temporary file
-    $v_size = $v_central_dir_to_add['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($p_archive_to_add->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($v_zip_temp_fd);
-
-    // ----- Copy the block of file headers from the old archive
-    $v_size = $v_central_dir['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Copy the block of file headers from the archive_to_add
-    $v_size = $v_central_dir_to_add['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($p_archive_to_add->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Merge the file comments
-    $v_comment = $v_central_dir['comment'].' '.$v_central_dir_to_add['comment'];
-
-    // ----- Calculate the size of the (new) central header
-    $v_size = @ftell($v_zip_temp_fd)-$v_offset;
-
-    // ----- Swap the file descriptor
-    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
-    // the following methods on the temporary fil and not the real archive fd
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries']+$v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
-      @fclose($v_zip_temp_fd);
-      $this->zip_fd = null;
-
-      // ----- Reset the file list
-      unset($v_header_list);
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Swap back the file descriptor
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Close
-    $this->privCloseFd();
-    $p_archive_to_add->privCloseFd();
-
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
-
-    // ----- Delete the zip file
-    // TBC : I should test the result ...
-    @unlink($this->zipname);
-
-    // ----- Rename the temporary file
-    // TBC : I should test the result ...
-    //@rename($v_zip_temp_name, $this->zipname);
-    PclZipUtilRename($v_zip_temp_name, $this->zipname);
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDuplicate()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privDuplicate($p_archive_filename)
-  {
-    $v_result=1;
-
-    // ----- Look if the $p_archive_filename exists
-    if (!is_file($p_archive_filename))
-    {
-
-      // ----- Nothing to duplicate, so duplicate is a success.
-      $v_result = 1;
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('wb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0)
-    {
-      $this->privCloseFd();
-
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \''.$p_archive_filename.'\' in binary write mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = filesize($p_archive_filename);
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($v_zip_temp_fd, $v_read_size);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Close
-    $this->privCloseFd();
-
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privErrorLog()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privErrorLog($p_error_code=0, $p_error_string='')
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      PclError($p_error_code, $p_error_string);
-    }
-    else {
-      $this->error_code = $p_error_code;
-      $this->error_string = $p_error_string;
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privErrorReset()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privErrorReset()
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      PclErrorReset();
-    }
-    else {
-      $this->error_code = 0;
-      $this->error_string = '';
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDisableMagicQuotes()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privDisableMagicQuotes()
-  {
-    $v_result=1;
-
-    // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
-	    || (!function_exists("set_magic_quotes_runtime"))) {
-      return $v_result;
-	}
-
-    // ----- Look if already done
-    if ($this->magic_quotes_status != -1) {
-      return $v_result;
-	}
-
-	// ----- Get and memorize the magic_quote value
-	$this->magic_quotes_status = @get_magic_quotes_runtime();
-
-	// ----- Disable magic_quotes
-	if ($this->magic_quotes_status == 1) {
-	  @set_magic_quotes_runtime(0);
-	}
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privSwapBackMagicQuotes()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privSwapBackMagicQuotes()
-  {
-    $v_result=1;
-
-    // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
-	    || (!function_exists("set_magic_quotes_runtime"))) {
-      return $v_result;
-	}
-
-    // ----- Look if something to do
-    if ($this->magic_quotes_status != -1) {
-      return $v_result;
-	}
-
-	// ----- Swap back magic_quotes
-	if ($this->magic_quotes_status == 1) {
-  	  @set_magic_quotes_runtime($this->magic_quotes_status);
-	}
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  }
-  // End of class
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilPathReduction()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function PclZipUtilPathReduction($p_dir)
-  {
-    $v_result = "";
-
-    // ----- Look for not empty path
-    if ($p_dir != "") {
-      // ----- Explode path by directory names
-      $v_list = explode("/", $p_dir);
-
-      // ----- Study directories from last to first
-      $v_skip = 0;
-      for ($i=sizeof($v_list)-1; $i>=0; $i--) {
-        // ----- Look for current path
-        if ($v_list[$i] == ".") {
-          // ----- Ignore this directory
-          // Should be the first $i=0, but no check is done
-        }
-        else if ($v_list[$i] == "..") {
-		  $v_skip++;
-        }
-        else if ($v_list[$i] == "") {
-		  // ----- First '/' i.e. root slash
-		  if ($i == 0) {
-            $v_result = "/".$v_result;
-		    if ($v_skip > 0) {
-		        // ----- It is an invalid path, so the path is not modified
-		        // TBC
-		        $v_result = $p_dir;
-                $v_skip = 0;
-		    }
-		  }
-		  // ----- Last '/' i.e. indicates a directory
-		  else if ($i == (sizeof($v_list)-1)) {
-            $v_result = $v_list[$i];
-		  }
-		  // ----- Double '/' inside the path
-		  else {
-            // ----- Ignore only the double '//' in path,
-            // but not the first and last '/'
-		  }
-        }
-        else {
-		  // ----- Look for item to skip
-		  if ($v_skip > 0) {
-		    $v_skip--;
-		  }
-		  else {
-            $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:"");
-		  }
-        }
-      }
-      
-      // ----- Look for skip
-      if ($v_skip > 0) {
-        while ($v_skip > 0) {
-            $v_result = '../'.$v_result;
-            $v_skip--;
-        }
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilPathInclusion()
-  // Description :
-  //   This function indicates if the path $p_path is under the $p_dir tree. Or,
-  //   said in an other way, if the file or sub-dir $p_path is inside the dir
-  //   $p_dir.
-  //   The function indicates also if the path is exactly the same as the dir.
-  //   This function supports path with duplicated '/' like '//', but does not
-  //   support '.' or '..' statements.
-  // Parameters :
-  // Return Values :
-  //   0 if $p_path is not inside directory $p_dir
-  //   1 if $p_path is inside directory $p_dir
-  //   2 if $p_path is exactly the same as $p_dir
-  // --------------------------------------------------------------------------------
-  function PclZipUtilPathInclusion($p_dir, $p_path)
-  {
-    $v_result = 1;
-    
-    // ----- Look for path beginning by ./
-    if (   ($p_dir == '.')
-        || ((strlen($p_dir) >=2) && (substr($p_dir, 0, 2) == './'))) {
-      $p_dir = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_dir, 1);
-    }
-    if (   ($p_path == '.')
-        || ((strlen($p_path) >=2) && (substr($p_path, 0, 2) == './'))) {
-      $p_path = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_path, 1);
-    }
-
-    // ----- Explode dir and path by directory separator
-    $v_list_dir = explode("/", $p_dir);
-    $v_list_dir_size = sizeof($v_list_dir);
-    $v_list_path = explode("/", $p_path);
-    $v_list_path_size = sizeof($v_list_path);
-
-    // ----- Study directories paths
-    $i = 0;
-    $j = 0;
-    while (($i < $v_list_dir_size) && ($j < $v_list_path_size) && ($v_result)) {
-
-      // ----- Look for empty dir (path reduction)
-      if ($v_list_dir[$i] == '') {
-        $i++;
-        continue;
-      }
-      if ($v_list_path[$j] == '') {
-        $j++;
-        continue;
-      }
-
-      // ----- Compare the items
-      if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ( $v_list_path[$j] != ''))  {
-        $v_result = 0;
-      }
-
-      // ----- Next items
-      $i++;
-      $j++;
-    }
-
-    // ----- Look if everything seems to be the same
-    if ($v_result) {
-      // ----- Skip all the empty items
-      while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) $j++;
-      while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) $i++;
-
-      if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {
-        // ----- There are exactly the same
-        $v_result = 2;
-      }
-      else if ($i < $v_list_dir_size) {
-        // ----- The path is shorter than the dir
-        $v_result = 0;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilCopyBlock()
-  // Description :
-  // Parameters :
-  //   $p_mode : read/write compression mode
-  //             0 : src & dest normal
-  //             1 : src gzip, dest normal
-  //             2 : src normal, dest gzip
-  //             3 : src & dest gzip
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
-  {
-    $v_result = 1;
-
-    if ($p_mode==0)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @fread($p_src, $v_read_size);
-        @fwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==1)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @gzread($p_src, $v_read_size);
-        @fwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==2)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @fread($p_src, $v_read_size);
-        @gzwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==3)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @gzread($p_src, $v_read_size);
-        @gzwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilRename()
-  // Description :
-  //   This function tries to do a simple rename() function. If it fails, it
-  //   tries to copy the $p_src file in a new $p_dest file and then unlink the
-  //   first one.
-  // Parameters :
-  //   $p_src : Old filename
-  //   $p_dest : New filename
-  // Return Values :
-  //   1 on success, 0 on failure.
-  // --------------------------------------------------------------------------------
-  function PclZipUtilRename($p_src, $p_dest)
-  {
-    $v_result = 1;
-
-    // ----- Try to rename the files
-    if (!@rename($p_src, $p_dest)) {
-
-      // ----- Try to copy & unlink the src
-      if (!@copy($p_src, $p_dest)) {
-        $v_result = 0;
-      }
-      else if (!@unlink($p_src)) {
-        $v_result = 0;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilOptionText()
-  // Description :
-  //   Translate option value in text. Mainly for debug purpose.
-  // Parameters :
-  //   $p_option : the option value.
-  // Return Values :
-  //   The option text value.
-  // --------------------------------------------------------------------------------
-  function PclZipUtilOptionText($p_option)
-  {
-    
-    $v_list = get_defined_constants();
-    for (reset($v_list); $v_key = key($v_list); next($v_list)) {
-	    $v_prefix = substr($v_key, 0, 10);
-	    if ((   ($v_prefix == 'PCLZIP_OPT')
-           || ($v_prefix == 'PCLZIP_CB_')
-           || ($v_prefix == 'PCLZIP_ATT'))
-	        && ($v_list[$v_key] == $p_option)) {
-        return $v_key;
-	    }
-    }
-    
-    $v_result = 'Unknown';
-
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilTranslateWinPath()
-  // Description :
-  //   Translate windows path by replacing '\' by '/' and optionally removing
-  //   drive letter.
-  // Parameters :
-  //   $p_path : path to translate.
-  //   $p_remove_disk_letter : true | false
-  // Return Values :
-  //   The path translated.
-  // --------------------------------------------------------------------------------
-  function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter=true)
-  {
-    if (stristr(php_uname(), 'windows')) {
-      // ----- Look for potential disk letter
-      if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
-          $p_path = substr($p_path, $v_position+1);
-      }
-      // ----- Change potential windows directory separator
-      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
-          $p_path = strtr($p_path, '\\', '/');
-      }
-    }
-    return $p_path;
-  }
-  // --------------------------------------------------------------------------------
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/readme.txt b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/readme.txt
deleted file mode 100644
index d1b11e25897..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/readme.txt
+++ /dev/null
@@ -1,421 +0,0 @@
-// --------------------------------------------------------------------------------
-// PclZip 2.8.2 - readme.txt
-// --------------------------------------------------------------------------------
-// License GNU/LGPL - August 2009
-// Vincent Blavet - vincent@phpconcept.net
-// http://www.phpconcept.net
-// --------------------------------------------------------------------------------
-// $Id: readme.txt,v 1.60 2009/09/30 20:35:21 vblavet Exp $
-// --------------------------------------------------------------------------------
-
-
-
-0 - Sommaire
-============
-    1 - Introduction
-    2 - What's new
-    3 - Corrected bugs
-    4 - Known bugs or limitations
-    5 - License
-    6 - Warning
-    7 - Documentation
-    8 - Author
-    9 - Contribute
-
-1 - Introduction
-================
-
-  PclZip is a library that allow you to manage a Zip archive.
-
-  Full documentation about PclZip can be found here : http://www.phpconcept.net/pclzip
-
-2 - What's new
-==============
-
-  Version 2.8.2 :
-    - PCLZIP_CB_PRE_EXTRACT and PCLZIP_CB_POST_EXTRACT are now supported with 
-      extraction as a string (PCLZIP_OPT_EXTRACT_AS_STRING). The string
-      can also be modified in the post-extract call back.
-    **Bugs correction :
-    - PCLZIP_OPT_REMOVE_ALL_PATH was not working correctly    
-    - Remove use of eval() and do direct call to callback functions
-    - Correct support of 64bits systems (Thanks to WordPress team)
-
-  Version 2.8.1 :
-    - Move option PCLZIP_OPT_BY_EREG to PCLZIP_OPT_BY_PREG because ereg() is
-      deprecated in PHP 5.3. When using option PCLZIP_OPT_BY_EREG, PclZip will
-      automatically replace it by PCLZIP_OPT_BY_PREG.
-  
-  Version 2.8 :
-    - Improve extraction of zip archive for large files by using temporary files
-      This feature is working like the one defined in r2.7.
-      Options are renamed : PCLZIP_OPT_TEMP_FILE_ON, PCLZIP_OPT_TEMP_FILE_OFF,
-      PCLZIP_OPT_TEMP_FILE_THRESHOLD
-    - Add a ratio constant PCLZIP_TEMPORARY_FILE_RATIO to configure the auto
-      sense of temporary file use.
-    - Bug correction : Reduce filepath in returned file list to remove ennoying
-      './/' preambule in file path.
-
-  Version 2.7 :
-    - Improve creation of zip archive for large files :
-      PclZip will now autosense the configured memory and use temporary files
-      when large file is suspected.
-      This feature can also ne triggered by manual options in create() and add()
-      methods. 'PCLZIP_OPT_ADD_TEMP_FILE_ON' force the use of temporary files,
-      'PCLZIP_OPT_ADD_TEMP_FILE_OFF' disable the autosense technic, 
-      'PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD' allow for configuration of a size
-      threshold to use temporary files.
-      Using "temporary files" rather than "memory" might take more time, but
-      might give the ability to zip very large files :
-      Tested on my win laptop with a 88Mo file :
-        Zip "in-memory" : 18sec (max_execution_time=30, memory_limit=180Mo)
-        Zip "tmporary-files" : 23sec (max_execution_time=30, memory_limit=30Mo)
-    - Replace use of mktime() by time() to limit the E_STRICT error messages.
-    - Bug correction : When adding files with full windows path (drive letter)
-      PclZip is now working. Before, if the drive letter is not the default
-      path, PclZip was not able to add the file.
-
-  Version 2.6 :
-    - Code optimisation
-    - New attributes PCLZIP_ATT_FILE_COMMENT gives the ability to
-      add a comment for a specific file. (Don't really know if this is usefull)
-    - New attribute PCLZIP_ATT_FILE_CONTENT gives the ability to add a string 
-      as a file.
-    - New attribute PCLZIP_ATT_FILE_MTIME modify the timestamp associated with
-      a file.
-    - Correct a bug. Files archived with a timestamp with 0h0m0s were extracted
-      with current time
-    - Add CRC value in the informations returned back for each file after an
-      action.
-    - Add missing closedir() statement.
-    - When adding a folder, and removing the path of this folder, files were
-      incorrectly added with a '/' at the beginning. Which means files are 
-      related to root in unix systems. Corrected.
-    - Add conditional if before constant definition. This will allow users
-      to redefine constants without changing the file, and then improve
-      upgrade of pclzip code for new versions.
-  
-  Version 2.5 :
-    - Introduce the ability to add file/folder with individual properties (file descriptor).
-      This gives for example the ability to change the filename of a zipped file.
-      . Able to add files individually
-      . Able to change full name
-      . Able to change short name
-      . Compatible with global options
-    - New attributes : PCLZIP_ATT_FILE_NAME, PCLZIP_ATT_FILE_NEW_SHORT_NAME, PCLZIP_ATT_FILE_NEW_FULL_NAME
-    - New error code : PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE
-    - Add a security control feature. PclZip can extract any file in any folder
-      of a system. People may use this to upload a zip file and try to override
-      a system file. The PCLZIP_OPT_EXTRACT_DIR_RESTRICTION will give the
-      ability to forgive any directory transversal behavior.
-    - New PCLZIP_OPT_EXTRACT_DIR_RESTRICTION : check extraction path
-    - New error code : PCLZIP_ERR_DIRECTORY_RESTRICTION
-    - Modification in PclZipUtilPathInclusion() : dir and path beginning with ./ will be prepend
-      by current path (getcwd())
-  
-  Version 2.4 :
-    - Code improvment : try to speed up the code by removing unusefull call to pack()
-    - Correct bug in delete() : delete() should be called with no argument. This was not
-      the case in 2.3. This is corrected in 2.4.
-    - Correct a bug in path_inclusion function. When the path has several '../../', the
-      result was bad.
-    - Add a check for magic_quotes_runtime configuration. If enabled, PclZip will 
-      disable it while working and det it back to its original value.
-      This resolve a lots of bad formated archive errors.
-    - Bug correction : PclZip now correctly unzip file in some specific situation,
-      when compressed content has same size as uncompressed content.
-    - Bug correction : When selecting option 'PCLZIP_OPT_REMOVE_ALL_PATH', 
-      directories are not any more created.
-    - Code improvment : correct unclosed opendir(), better handling of . and .. in
-      loops.
-
-
-  Version 2.3 :
-    - Correct a bug with PHP5 : affecting the value 0xFE49FFE0 to a variable does not
-      give the same result in PHP4 and PHP5 ....
-
-  Version 2.2 :
-    - Try development of PCLZIP_OPT_CRYPT .....
-      However this becomes to a stop. To crypt/decrypt I need to multiply 2 long integers,
-      the result (greater than a long) is not supported by PHP. Even the use of bcmath
-      functions does not help. I did not find yet a solution ...;
-    - Add missing '/' at end of directory entries
-    - Check is a file is encrypted or not. Returns status 'unsupported_encryption' and/or
-      error code PCLZIP_ERR_UNSUPPORTED_ENCRYPTION.
-    - Corrected : Bad "version need to extract" field in local file header
-    - Add private method privCheckFileHeaders() in order to check local and central
-      file headers. PclZip is now supporting purpose bit flag bit 3. Purpose bit flag bit 3 gives
-      the ability to have a local file header without size, compressed size and crc filled.
-    - Add a generic status 'error' for file status
-    - Add control of compression type. PclZip only support deflate compression method.
-      Before v2.2, PclZip does not check the compression method used in an archive while
-      extracting. With v2.2 PclZip returns a new error status for a file using an unsupported
-      compression method. New status is "unsupported_compression". New error code is
-      PCLZIP_ERR_UNSUPPORTED_COMPRESSION.
-    - Add optional attribute PCLZIP_OPT_STOP_ON_ERROR. This will stop the extract of files
-      when errors like 'a folder with same name exists' or 'a newer file exists' or
-      'a write protected file' exists, rather than set a status for the concerning file
-      and resume the extract of the zip.
-    - Add optional attribute PCLZIP_OPT_REPLACE_NEWER. This will force, during an extract' the
-      replacement of the file, even if a  newer version of the file exists.
-      Note that today if a file with the same name already exists but is older it will be
-      replaced by the extracted one.
-    - Improve PclZipUtilOption()
-    - Support of zip archive with trailing bytes. Before 2.2, PclZip checks that the central
-      directory structure is the last data in the archive. Crypt encryption/decryption of
-      zip archive put trailing 0 bytes after decryption. PclZip is now supporting this.
-
-  Version 2.1 :
-    - Add the ability to abort the extraction by using a user callback function.
-      The user can now return the value '2' in its callback which indicates to stop the
-      extraction. For a pre call-back extract is stopped before the extration of the current
-      file. For a post call back, the extraction is stopped after.
-    - Add the ability to extract a file (or several files) directly in the standard output.
-      This is done by the new parameter PCLZIP_OPT_EXTRACT_IN_OUTPUT with method extract().
-    - Add support for parameters PCLZIP_OPT_COMMENT, PCLZIP_OPT_ADD_COMMENT,
-      PCLZIP_OPT_PREPEND_COMMENT. This will create, replace, add, or prepend comments
-      in the zip archive.
-    - When merging two archives, the comments are not any more lost, but merged, with a 
-      blank space separator.
-    - Corrected bug : Files are not deleted when all files are asked to be deleted.
-    - Corrected bug : Folders with name '0' made PclZip to abort the create or add feature.
-
-
-  Version 2.0 :
-    ***** Warning : Some new features may break the backward compatibility for your scripts.
-                    Please carefully read the readme file.
-    - Add the ability to delete by Index, name and regular expression. This feature is 
-      performed by the method delete(), which uses the optional parameters
-      PCLZIP_OPT_BY_INDEX, PCLZIP_OPT_BY_NAME, PCLZIP_OPT_BY_EREG or PCLZIP_OPT_BY_PREG.
-    - Add the ability to extract by regular expression. To extract by regexp you must use the method
-      extract(), with the option PCLZIP_OPT_BY_EREG or PCLZIP_OPT_BY_PREG 
-      (depending if you want to use ereg() or preg_match() syntax) followed by the 
-      regular expression pattern.
-    - Add the ability to extract by index, directly with the extract() method. This is a
-      code improvment of the extractByIndex() method.
-    - Add the ability to extract by name. To extract by name you must use the method
-      extract(), with the option PCLZIP_OPT_BY_NAME followed by the filename to
-      extract or an array of filenames to extract. To extract all a folder, use the folder
-      name rather than the filename with a '/' at the end.
-    - Add the ability to add files without compression. This is done with a new attribute
-      which is PCLZIP_OPT_NO_COMPRESSION.
-    - Add the attribute PCLZIP_OPT_EXTRACT_AS_STRING, which allow to extract a file directly
-      in a string without using any file (or temporary file).
-    - Add constant PCLZIP_SEPARATOR for static configuration of filename separators in a single string.
-      The default separator is now a comma (,) and not any more a blank space.
-      THIS BREAK THE BACKWARD COMPATIBILITY : Please check if this may have an impact with
-      your script.
-    - Improve algorythm performance by removing the use of temporary files when adding or 
-      extracting files in an archive.
-    - Add (correct) detection of empty filename zipping. This can occurs when the removed
-      path is the same
-      as a zipped dir. The dir is not zipped (['status'] = filtered), only its content.
-    - Add better support for windows paths (thanks for help from manus@manusfreedom.com).
-    - Corrected bug : When the archive file already exists with size=0, the add() method
-      fails. Corrected in 2.0.
-    - Remove the use of OS_WINDOWS constant. Use php_uname() function rather.
-    - Control the order of index ranges in extract by index feature.
-    - Change the internal management of folders (better handling of internal flag).
-
-
-  Version 1.3 :
-    - Removing the double include check. This is now done by include_once() and require_once()
-      PHP directives.
-    - Changing the error handling mecanism : Remove the use of an external error library.
-      The former PclError...() functions are replaced by internal equivalent methods.
-      By changing the environment variable PCLZIP_ERROR_EXTERNAL you can still use the former library.
-      Introducing the use of constants for error codes rather than integer values. This will help
-      in futur improvment.
-      Introduction of error handling functions like errorCode(), errorName() and errorInfo().
-    - Remove the deprecated use of calling function with arguments passed by reference.
-    - Add the calling of extract(), extractByIndex(), create() and add() functions
-      with variable options rather than fixed arguments.
-    - Add the ability to remove all the file path while extracting or adding,
-      without any need to specify the path to remove.
-      This is available for extract(), extractByIndex(), create() and add() functionS by using
-      the new variable options parameters :
-      - PCLZIP_OPT_REMOVE_ALL_PATH : by indicating this option while calling the fct.
-    - Ability to change the mode of a file after the extraction (chmod()).
-      This is available for extract() and extractByIndex() functionS by using
-      the new variable options parameters.
-      - PCLZIP_OPT_SET_CHMOD : by setting the value of this option.
-    - Ability to definition call-back options. These call-back will be called during the adding,
-      or the extracting of file (extract(), extractByIndex(), create() and add() functions) :
-      - PCLZIP_CB_PRE_EXTRACT : will be called before each extraction of a file. The user
-        can trigerred the change the filename of the extracted file. The user can triggered the
-        skip of the extraction. This is adding a 'skipped' status in the file list result value.
-      - PCLZIP_CB_POST_EXTRACT : will be called after each extraction of a file.
-        Nothing can be triggered from that point.
-      - PCLZIP_CB_PRE_ADD : will be called before each add of a file. The user
-        can trigerred the change the stored filename of the added file. The user can triggered the
-        skip of the add. This is adding a 'skipped' status in the file list result value.
-      - PCLZIP_CB_POST_ADD : will be called after each add of a file.
-        Nothing can be triggered from that point.
-    - Two status are added in the file list returned as function result : skipped & filename_too_long
-      'skipped' is used when a call-back function ask for skipping the file.
-      'filename_too_long' is used while adding a file with a too long filename to archive (the file is
-      not added)
-    - Adding the function PclZipUtilPathInclusion(), that check the inclusion of a path into
-      a directory.
-    - Add a check of the presence of the archive file before some actions (like list, ...)
-    - Add the initialisation of field "index" in header array. This means that by
-      default index will be -1 when not explicitly set by the methods.
-
-  Version 1.2 :
-    - Adding a duplicate function.
-    - Adding a merge function. The merge function is a "quick merge" function,
-      it just append the content of an archive at the end of the first one. There
-      is no check for duplicate files or more recent files.
-    - Improve the search of the central directory end.
-
-  Version 1.1.2 :
-
-    - Changing the license of PclZip. PclZip is now released under the GNU / LGPL license
-      (see License section).
-    - Adding the optional support of a static temporary directory. You will need to configure
-      the constant PCLZIP_TEMPORARY_DIR if you want to use this feature.
-    - Improving the rename() function. In some cases rename() does not work (different
-      Filesystems), so it will be replaced by a copy() + unlink() functions.
-
-  Version 1.1.1 :
-
-    - Maintenance release, no new feature.
-
-  Version 1.1 :
-
-    - New method Add() : adding files in the archive
-    - New method ExtractByIndex() : partial extract of the archive, files are identified by
-      their index in the archive
-    - New method DeleteByIndex() : delete some files/folder entries from the archive,
-      files are identified by their index in the archive.
-    - Adding a test of the zlib extension presence. If not present abort the script.
-
-  Version 1.0.1 :
-
-    - No new feature
-
-
-3 - Corrected bugs
-==================
-
-  Corrected in Version 2.0 :
-    - Corrected : During an extraction, if a call-back fucntion is used and try to skip
-                  a file, all the extraction process is stopped. 
-
-  Corrected in Version 1.3 :
-    - Corrected : Support of static synopsis for method extract() is broken.
-    - Corrected : invalid size of archive content field (0xFF) should be (0xFFFF).
-    - Corrected : When an extract is done with a remove_path parameter, the entry for
-      the directory with exactly the same path is not skipped/filtered.
-    - Corrected : extractByIndex() and deleteByIndex() were not managing index in the
-      right way. For example indexes '1,3-5,11' will only extract files 1 and 11. This
-      is due to a sort of the index resulting table that puts 11 before 3-5 (sort on
-      string and not interger). The sort is temporarilly removed, this means that
-      you must provide a sorted list of index ranges.
-
-  Corrected in Version 1.2 :
-
-    - Nothing.
-
-  Corrected in Version 1.1.2 :
-
-    - Corrected : Winzip is unable to delete or add new files in a PclZip created archives.
-
-  Corrected in Version 1.1.1 :
-
-    - Corrected : When archived file is not compressed (0% compression), the
-      extract method fails.
-
-  Corrected in Version 1.1 :
-
-    - Corrected : Adding a complete tree of folder may result in a bad archive
-      creation.
-
-  Corrected in Version 1.0.1 :
-
-    - Corrected : Error while compressing files greater than PCLZIP_READ_BLOCK_SIZE (default=1024).
-
-
-4 - Known bugs or limitations
-=============================
-
-  Please publish bugs reports in SourceForge :
-    http://sourceforge.net/tracker/?group_id=40254&atid=427564
-
-  In Version 2.x :
-    - PclZip does only support file uncompressed or compressed with deflate (compression method 8)
-    - PclZip does not support password protected zip archive
-    - Some concern were seen when changing mtime of a file while archiving. 
-      Seems to be linked to Daylight Saving Time (PclTest_changing_mtime).
-
-  In Version 1.2 :
-
-    - merge() methods does not check for duplicate files or last date of modifications.
-
-  In Version 1.1 :
-
-    - Limitation : Using 'extract' fields in the file header in the zip archive is not supported.
-    - WinZip is unable to delete a single file in a PclZip created archive. It is also unable to
-      add a file in a PclZip created archive. (Corrected in v.1.2)
-
-  In Version 1.0.1 :
-
-    - Adding a complete tree of folder may result in a bad archive
-      creation. (Corrected in V.1.1).
-    - Path given to methods must be in the unix format (/) and not the Windows format (\).
-      Workaround : Use only / directory separators.
-    - PclZip is using temporary files that are sometime the name of the file with a .tmp or .gz
-      added suffix. Files with these names may already exist and may be overwritten.
-      Workaround : none.
-    - PclZip does not check if the zlib extension is present. If it is absent, the zip
-      file is not created and the lib abort without warning.
-      Workaround : enable the zlib extension on the php install
-
-  In Version 1.0 :
-
-    - Error while compressing files greater than PCLZIP_READ_BLOCK_SIZE (default=1024).
-      (Corrected in v.1.0.1)
-    - Limitation : Multi-disk zip archive are not supported.
-
-
-5 - License
-===========
-
-  Since version 1.1.2, PclZip Library is released under GNU/LGPL license.
-  This library is free, so you can use it at no cost.
-
-  HOWEVER, if you release a script, an application, a library or any kind of
-  code using PclZip library (or a part of it), YOU MUST :
-  - Indicate in the documentation (or a readme file), that your work
-    uses PclZip Library, and make a reference to the author and the web site
-    http://www.phpconcept.net
-  - Gives the ability to the final user to update the PclZip libary.
-
-  I will also appreciate that you send me a mail (vincent@phpconcept.net), just to
-  be aware that someone is using PclZip.
-
-  For more information about GNU/LGPL license : http://www.gnu.org
-
-6 - Warning
-=================
-
-  This library and the associated files are non commercial, non professional work.
-  It should not have unexpected results. However if any damage is caused by this software
-  the author can not be responsible.
-  The use of this software is at the risk of the user.
-
-7 - Documentation
-=================
-  PclZip User Manuel is available in English on PhpConcept : http://www.phpconcept.net/pclzip/man/en/index.php
-  A Russian translation was done by Feskov Kuzma : http://php.russofile.ru/ru/authors/unsort/zip/
-
-8 - Author
-==========
-
-  This software was written by Vincent Blavet (vincent@phpconcept.net) on its leasure time.
-
-9 - Contribute
-==============
-  If you want to contribute to the development of PclZip, please contact vincent@phpconcept.net.
-  If you can help in financing PhpConcept hosting service, please go to
-  http://www.phpconcept.net/soutien.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PasswordHasher.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PasswordHasher.php
deleted file mode 100644
index 891b6bc15e4..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PasswordHasher.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Shared_PasswordHasher
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_PasswordHasher
-{
-	/**
-	 * Create a password hash from a given string.
-	 *
-	 * This method is based on the algorithm provided by
-	 * Daniel Rentz of OpenOffice and the PEAR package
-	 * Spreadsheet_Excel_Writer by Xavier Noguer <xnoguer@rezebra.com>.
-	 *
-	 * @param 	string	$pPassword	Password to hash
-	 * @return 	string				Hashed password
-	 */
-	public static function hashPassword($pPassword = '') {
-        $password	= 0x0000;
-        $charPos	= 1;       // char position
-
-        // split the plain text password in its component characters
-        $chars = preg_split('//', $pPassword, -1, PREG_SPLIT_NO_EMPTY);
-        foreach ($chars as $char) {
-            $value			= ord($char) << $charPos++;	// shifted ASCII value
-            $rotated_bits	= $value >> 15;				// rotated bits beyond bit 15
-            $value			&= 0x7fff;					// first 15 bits
-            $password		^= ($value | $rotated_bits);
-        }
-
-        $password ^= strlen($pPassword);
-        $password ^= 0xCE4B;
-
-        return(strtoupper(dechex($password)));
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/String.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/String.php
deleted file mode 100644
index 7d6b4192b07..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/String.php
+++ /dev/null
@@ -1,811 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Shared_String
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_String
-{
-	/**	Constants				*/
-	/**	Regular Expressions		*/
-	//	Fraction
-	const STRING_REGEXP_FRACTION	= '(-?)(\d+)\s+(\d+\/\d+)';
-
-
-	/**
-	 * Control characters array
-	 *
-	 * @var string[]
-	 */
-	private static $_controlCharacters = array();
-
-	/**
-	 * SYLK Characters array
-	 *
-	 * $var array
-	 */
-	private static $_SYLKCharacters = array();
-
-	/**
-	 * Decimal separator
-	 *
-	 * @var string
-	 */
-	private static $_decimalSeparator;
-
-	/**
-	 * Thousands separator
-	 *
-	 * @var string
-	 */
-	private static $_thousandsSeparator;
-
-	/**
-	 * Currency code
-	 *
-	 * @var string
-	 */
-	private static $_currencyCode;
-
-	/**
-	 * Is mbstring extension avalable?
-	 *
-	 * @var boolean
-	 */
-	private static $_isMbstringEnabled;
-
-	/**
-	 * Is iconv extension avalable?
-	 *
-	 * @var boolean
-	 */
-	private static $_isIconvEnabled;
-
-	/**
-	 * Build control characters array
-	 */
-	private static function _buildControlCharacters() {
-		for ($i = 0; $i <= 31; ++$i) {
-			if ($i != 9 && $i != 10 && $i != 13) {
-				$find = '_x' . sprintf('%04s' , strtoupper(dechex($i))) . '_';
-				$replace = chr($i);
-				self::$_controlCharacters[$find] = $replace;
-			}
-		}
-	}
-
-	/**
-	 * Build SYLK characters array
-	 */
-	private static function _buildSYLKCharacters()
-	{
-		self::$_SYLKCharacters = array(
-			"\x1B 0"  => chr(0),
-			"\x1B 1"  => chr(1),
-			"\x1B 2"  => chr(2),
-			"\x1B 3"  => chr(3),
-			"\x1B 4"  => chr(4),
-			"\x1B 5"  => chr(5),
-			"\x1B 6"  => chr(6),
-			"\x1B 7"  => chr(7),
-			"\x1B 8"  => chr(8),
-			"\x1B 9"  => chr(9),
-			"\x1B :"  => chr(10),
-			"\x1B ;"  => chr(11),
-			"\x1B <"  => chr(12),
-			"\x1B :"  => chr(13),
-			"\x1B >"  => chr(14),
-			"\x1B ?"  => chr(15),
-			"\x1B!0"  => chr(16),
-			"\x1B!1"  => chr(17),
-			"\x1B!2"  => chr(18),
-			"\x1B!3"  => chr(19),
-			"\x1B!4"  => chr(20),
-			"\x1B!5"  => chr(21),
-			"\x1B!6"  => chr(22),
-			"\x1B!7"  => chr(23),
-			"\x1B!8"  => chr(24),
-			"\x1B!9"  => chr(25),
-			"\x1B!:"  => chr(26),
-			"\x1B!;"  => chr(27),
-			"\x1B!<"  => chr(28),
-			"\x1B!="  => chr(29),
-			"\x1B!>"  => chr(30),
-			"\x1B!?"  => chr(31),
-			"\x1B'?"  => chr(127),
-			"\x1B(0"  => '€', // 128 in CP1252
-			"\x1B(2"  => '‚', // 130 in CP1252
-			"\x1B(3"  => 'ƒ', // 131 in CP1252
-			"\x1B(4"  => '„', // 132 in CP1252
-			"\x1B(5"  => '…', // 133 in CP1252
-			"\x1B(6"  => '†', // 134 in CP1252
-			"\x1B(7"  => '‡', // 135 in CP1252
-			"\x1B(8"  => 'ˆ', // 136 in CP1252
-			"\x1B(9"  => '‰', // 137 in CP1252
-			"\x1B(:"  => 'Š', // 138 in CP1252
-			"\x1B(;"  => '‹', // 139 in CP1252
-			"\x1BNj"  => 'Œ', // 140 in CP1252
-			"\x1B(>"  => 'Ž', // 142 in CP1252
-			"\x1B)1"  => '‘', // 145 in CP1252
-			"\x1B)2"  => '’', // 146 in CP1252
-			"\x1B)3"  => '“', // 147 in CP1252
-			"\x1B)4"  => '”', // 148 in CP1252
-			"\x1B)5"  => '•', // 149 in CP1252
-			"\x1B)6"  => '–', // 150 in CP1252
-			"\x1B)7"  => '—', // 151 in CP1252
-			"\x1B)8"  => '˜', // 152 in CP1252
-			"\x1B)9"  => '™', // 153 in CP1252
-			"\x1B):"  => 'š', // 154 in CP1252
-			"\x1B);"  => '›', // 155 in CP1252
-			"\x1BNz"  => 'œ', // 156 in CP1252
-			"\x1B)>"  => 'ž', // 158 in CP1252
-			"\x1B)?"  => 'Ÿ', // 159 in CP1252
-			"\x1B*0"  => ' ', // 160 in CP1252
-			"\x1BN!"  => '¡', // 161 in CP1252
-			"\x1BN\"" => '¢', // 162 in CP1252
-			"\x1BN#"  => '£', // 163 in CP1252
-			"\x1BN("  => '¤', // 164 in CP1252
-			"\x1BN%"  => '¥', // 165 in CP1252
-			"\x1B*6"  => '¦', // 166 in CP1252
-			"\x1BN'"  => '§', // 167 in CP1252
-			"\x1BNH " => '¨', // 168 in CP1252
-			"\x1BNS"  => '©', // 169 in CP1252
-			"\x1BNc"  => 'ª', // 170 in CP1252
-			"\x1BN+"  => '«', // 171 in CP1252
-			"\x1B*<"  => '¬', // 172 in CP1252
-			"\x1B*="  => '­', // 173 in CP1252
-			"\x1BNR"  => '®', // 174 in CP1252
-			"\x1B*?"  => '¯', // 175 in CP1252
-			"\x1BN0"  => '°', // 176 in CP1252
-			"\x1BN1"  => '±', // 177 in CP1252
-			"\x1BN2"  => '²', // 178 in CP1252
-			"\x1BN3"  => '³', // 179 in CP1252
-			"\x1BNB " => '´', // 180 in CP1252
-			"\x1BN5"  => 'µ', // 181 in CP1252
-			"\x1BN6"  => '¶', // 182 in CP1252
-			"\x1BN7"  => '·', // 183 in CP1252
-			"\x1B+8"  => '¸', // 184 in CP1252
-			"\x1BNQ"  => '¹', // 185 in CP1252
-			"\x1BNk"  => 'º', // 186 in CP1252
-			"\x1BN;"  => '»', // 187 in CP1252
-			"\x1BN<"  => '¼', // 188 in CP1252
-			"\x1BN="  => '½', // 189 in CP1252
-			"\x1BN>"  => '¾', // 190 in CP1252
-			"\x1BN?"  => '¿', // 191 in CP1252
-			"\x1BNAA" => 'À', // 192 in CP1252
-			"\x1BNBA" => 'Á', // 193 in CP1252
-			"\x1BNCA" => 'Â', // 194 in CP1252
-			"\x1BNDA" => 'Ã', // 195 in CP1252
-			"\x1BNHA" => 'Ä', // 196 in CP1252
-			"\x1BNJA" => 'Å', // 197 in CP1252
-			"\x1BNa"  => 'Æ', // 198 in CP1252
-			"\x1BNKC" => 'Ç', // 199 in CP1252
-			"\x1BNAE" => 'È', // 200 in CP1252
-			"\x1BNBE" => 'É', // 201 in CP1252
-			"\x1BNCE" => 'Ê', // 202 in CP1252
-			"\x1BNHE" => 'Ë', // 203 in CP1252
-			"\x1BNAI" => 'Ì', // 204 in CP1252
-			"\x1BNBI" => 'Í', // 205 in CP1252
-			"\x1BNCI" => 'Î', // 206 in CP1252
-			"\x1BNHI" => 'Ï', // 207 in CP1252
-			"\x1BNb"  => 'Ð', // 208 in CP1252
-			"\x1BNDN" => 'Ñ', // 209 in CP1252
-			"\x1BNAO" => 'Ò', // 210 in CP1252
-			"\x1BNBO" => 'Ó', // 211 in CP1252
-			"\x1BNCO" => 'Ô', // 212 in CP1252
-			"\x1BNDO" => 'Õ', // 213 in CP1252
-			"\x1BNHO" => 'Ö', // 214 in CP1252
-			"\x1B-7"  => '×', // 215 in CP1252
-			"\x1BNi"  => 'Ø', // 216 in CP1252
-			"\x1BNAU" => 'Ù', // 217 in CP1252
-			"\x1BNBU" => 'Ú', // 218 in CP1252
-			"\x1BNCU" => 'Û', // 219 in CP1252
-			"\x1BNHU" => 'Ü', // 220 in CP1252
-			"\x1B-="  => 'Ý', // 221 in CP1252
-			"\x1BNl"  => 'Þ', // 222 in CP1252
-			"\x1BN{"  => 'ß', // 223 in CP1252
-			"\x1BNAa" => 'à', // 224 in CP1252
-			"\x1BNBa" => 'á', // 225 in CP1252
-			"\x1BNCa" => 'â', // 226 in CP1252
-			"\x1BNDa" => 'ã', // 227 in CP1252
-			"\x1BNHa" => 'ä', // 228 in CP1252
-			"\x1BNJa" => 'å', // 229 in CP1252
-			"\x1BNq"  => 'æ', // 230 in CP1252
-			"\x1BNKc" => 'ç', // 231 in CP1252
-			"\x1BNAe" => 'è', // 232 in CP1252
-			"\x1BNBe" => 'é', // 233 in CP1252
-			"\x1BNCe" => 'ê', // 234 in CP1252
-			"\x1BNHe" => 'ë', // 235 in CP1252
-			"\x1BNAi" => 'ì', // 236 in CP1252
-			"\x1BNBi" => 'í', // 237 in CP1252
-			"\x1BNCi" => 'î', // 238 in CP1252
-			"\x1BNHi" => 'ï', // 239 in CP1252
-			"\x1BNs"  => 'ð', // 240 in CP1252
-			"\x1BNDn" => 'ñ', // 241 in CP1252
-			"\x1BNAo" => 'ò', // 242 in CP1252
-			"\x1BNBo" => 'ó', // 243 in CP1252
-			"\x1BNCo" => 'ô', // 244 in CP1252
-			"\x1BNDo" => 'õ', // 245 in CP1252
-			"\x1BNHo" => 'ö', // 246 in CP1252
-			"\x1B/7"  => '÷', // 247 in CP1252
-			"\x1BNy"  => 'ø', // 248 in CP1252
-			"\x1BNAu" => 'ù', // 249 in CP1252
-			"\x1BNBu" => 'ú', // 250 in CP1252
-			"\x1BNCu" => 'û', // 251 in CP1252
-			"\x1BNHu" => 'ü', // 252 in CP1252
-			"\x1B/="  => 'ý', // 253 in CP1252
-			"\x1BN|"  => 'þ', // 254 in CP1252
-			"\x1BNHy" => 'ÿ', // 255 in CP1252
-		);
-	}
-
-	/**
-	 * Get whether mbstring extension is available
-	 *
-	 * @return boolean
-	 */
-	public static function getIsMbstringEnabled()
-	{
-		if (isset(self::$_isMbstringEnabled)) {
-			return self::$_isMbstringEnabled;
-		}
-
-		self::$_isMbstringEnabled = function_exists('mb_convert_encoding') ?
-			true : false;
-
-		return self::$_isMbstringEnabled;
-	}
-
-	/**
-	 * Get whether iconv extension is available
-	 *
-	 * @return boolean
-	 */
-	public static function getIsIconvEnabled()
-	{
-		if (isset(self::$_isIconvEnabled)) {
-			return self::$_isIconvEnabled;
-		}
-
-		// Fail if iconv doesn't exist
-		if (!function_exists('iconv')) {
-			self::$_isIconvEnabled = false;
-			return false;
-		}
-
-		// Sometimes iconv is not working, and e.g. iconv('UTF-8', 'UTF-16LE', 'x') just returns false,
-		if (!@iconv('UTF-8', 'UTF-16LE', 'x')) {
-			self::$_isIconvEnabled = false;
-			return false;
-		}
-
-		// Sometimes iconv_substr('A', 0, 1, 'UTF-8') just returns false in PHP 5.2.0
-		// we cannot use iconv in that case either (http://bugs.php.net/bug.php?id=37773)
-		if (!@iconv_substr('A', 0, 1, 'UTF-8')) {
-			self::$_isIconvEnabled = false;
-			return false;
-		}
-
-		// CUSTOM: IBM AIX iconv() does not work
-		if ( defined('PHP_OS') && @stristr(PHP_OS, 'AIX')
-				&& defined('ICONV_IMPL') && (@strcasecmp(ICONV_IMPL, 'unknown') == 0)
-				&& defined('ICONV_VERSION') && (@strcasecmp(ICONV_VERSION, 'unknown') == 0) )
-		{
-			self::$_isIconvEnabled = false;
-			return false;
-		}
-
-		// If we reach here no problems were detected with iconv
-		self::$_isIconvEnabled = true;
-		return true;
-	}
-
-	public static function buildCharacterSets() {
-		if(empty(self::$_controlCharacters)) {
-			self::_buildControlCharacters();
-		}
-		if(empty(self::$_SYLKCharacters)) {
-			self::_buildSYLKCharacters();
-		}
-	}
-
-	/**
-	 * Convert from OpenXML escaped control character to PHP control character
-	 *
-	 * Excel 2007 team:
-	 * ----------------
-	 * That's correct, control characters are stored directly in the shared-strings table.
-	 * We do encode characters that cannot be represented in XML using the following escape sequence:
-	 * _xHHHH_ where H represents a hexadecimal character in the character's value...
-	 * So you could end up with something like _x0008_ in a string (either in a cell value (<v>)
-	 * element or in the shared string <t> element.
-	 *
-	 * @param 	string	$value	Value to unescape
-	 * @return 	string
-	 */
-	public static function ControlCharacterOOXML2PHP($value = '') {
-		return str_replace( array_keys(self::$_controlCharacters), array_values(self::$_controlCharacters), $value );
-	}
-
-	/**
-	 * Convert from PHP control character to OpenXML escaped control character
-	 *
-	 * Excel 2007 team:
-	 * ----------------
-	 * That's correct, control characters are stored directly in the shared-strings table.
-	 * We do encode characters that cannot be represented in XML using the following escape sequence:
-	 * _xHHHH_ where H represents a hexadecimal character in the character's value...
-	 * So you could end up with something like _x0008_ in a string (either in a cell value (<v>)
-	 * element or in the shared string <t> element.
-	 *
-	 * @param 	string	$value	Value to escape
-	 * @return 	string
-	 */
-	public static function ControlCharacterPHP2OOXML($value = '') {
-		return str_replace( array_values(self::$_controlCharacters), array_keys(self::$_controlCharacters), $value );
-	}
-
-	/**
-	 * Try to sanitize UTF8, stripping invalid byte sequences. Not perfect. Does not surrogate characters.
-	 *
-	 * @param string $value
-	 * @return string
-	 */
-	public static function SanitizeUTF8($value)
-	{
-		if (self::getIsIconvEnabled()) {
-			$value = @iconv('UTF-8', 'UTF-8', $value);
-			return $value;
-		}
-
-		if (self::getIsMbstringEnabled()) {
-			$value = mb_convert_encoding($value, 'UTF-8', 'UTF-8');
-			return $value;
-		}
-
-		// else, no conversion
-		return $value;
-	}
-
-	/**
-	 * Check if a string contains UTF8 data
-	 *
-	 * @param string $value
-	 * @return boolean
-	 */
-	public static function IsUTF8($value = '') {
-		return $value === '' || preg_match('/^./su', $value) === 1;
-	}
-
-	/**
-	 * Formats a numeric value as a string for output in various output writers forcing
-	 * point as decimal separator in case locale is other than English.
-	 *
-	 * @param mixed $value
-	 * @return string
-	 */
-	public static function FormatNumber($value) {
-		if (is_float($value)) {
-			return str_replace(',', '.', $value);
-		}
-		return (string) $value;
-	}
-
-	/**
-	 * Converts a UTF-8 string into BIFF8 Unicode string data (8-bit string length)
-	 * Writes the string using uncompressed notation, no rich text, no Asian phonetics
-	 * If mbstring extension is not available, ASCII is assumed, and compressed notation is used
-	 * although this will give wrong results for non-ASCII strings
-	 * see OpenOffice.org's Documentation of the Microsoft Excel File Format, sect. 2.5.3
-	 *
-	 * @param string  $value    UTF-8 encoded string
-	 * @param mixed[] $arrcRuns Details of rich text runs in $value
-	 * @return string
-	 */
-	public static function UTF8toBIFF8UnicodeShort($value, $arrcRuns = array())
-	{
-		// character count
-		$ln = self::CountCharacters($value, 'UTF-8');
-		// option flags
-		if(empty($arrcRuns)){
-			$opt = (self::getIsIconvEnabled() || self::getIsMbstringEnabled()) ?
-				0x0001 : 0x0000;
-			$data = pack('CC', $ln, $opt);
-			// characters
-			$data .= self::ConvertEncoding($value, 'UTF-16LE', 'UTF-8');
-		}
-		else {
-			$data = pack('vC', $ln, 0x09);
-			$data .= pack('v', count($arrcRuns));
-			// characters
-			$data .= self::ConvertEncoding($value, 'UTF-16LE', 'UTF-8');
-			foreach ($arrcRuns as $cRun){
-				$data .= pack('v', $cRun['strlen']);
-				$data .= pack('v', $cRun['fontidx']);
-			}
-		}
-		return $data;
-	}
-
-	/**
-	 * Converts a UTF-8 string into BIFF8 Unicode string data (16-bit string length)
-	 * Writes the string using uncompressed notation, no rich text, no Asian phonetics
-	 * If mbstring extension is not available, ASCII is assumed, and compressed notation is used
-	 * although this will give wrong results for non-ASCII strings
-	 * see OpenOffice.org's Documentation of the Microsoft Excel File Format, sect. 2.5.3
-	 *
-	 * @param string $value UTF-8 encoded string
-	 * @return string
-	 */
-	public static function UTF8toBIFF8UnicodeLong($value)
-	{
-		// character count
-		$ln = self::CountCharacters($value, 'UTF-8');
-
-		// option flags
-		$opt = (self::getIsIconvEnabled() || self::getIsMbstringEnabled()) ?
-			0x0001 : 0x0000;
-
-		// characters
-		$chars = self::ConvertEncoding($value, 'UTF-16LE', 'UTF-8');
-
-		$data = pack('vC', $ln, $opt) . $chars;
-		return $data;
-	}
-
-	/**
-	 * Convert string from one encoding to another. First try mbstring, then iconv, finally strlen
-	 *
-	 * @param string $value
-	 * @param string $to Encoding to convert to, e.g. 'UTF-8'
-	 * @param string $from Encoding to convert from, e.g. 'UTF-16LE'
-	 * @return string
-	 */
-	public static function ConvertEncoding($value, $to, $from)
-	{
-		if (self::getIsIconvEnabled()) {
-			return iconv($from, $to, $value);
-		}
-
-		if (self::getIsMbstringEnabled()) {
-			return mb_convert_encoding($value, $to, $from);
-		}
-
-		if($from == 'UTF-16LE'){
-			return self::utf16_decode($value, false);
-		}else if($from == 'UTF-16BE'){
-			return self::utf16_decode($value);
-		}
-		// else, no conversion
-		return $value;
-	}
-
-	/**
-	 * Decode UTF-16 encoded strings.
-	 *
-	 * Can handle both BOM'ed data and un-BOM'ed data.
-	 * Assumes Big-Endian byte order if no BOM is available.
-	 * This function was taken from http://php.net/manual/en/function.utf8-decode.php
-	 * and $bom_be parameter added.
-	 *
-	 * @param   string  $str  UTF-16 encoded data to decode.
-	 * @return  string  UTF-8 / ISO encoded data.
-	 * @access  public
-	 * @version 0.2 / 2010-05-13
-	 * @author  Rasmus Andersson {@link http://rasmusandersson.se/}
-	 * @author vadik56
-	 */
-	public static function utf16_decode($str, $bom_be = TRUE) {
-		if( strlen($str) < 2 ) return $str;
-		$c0 = ord($str{0});
-		$c1 = ord($str{1});
-		if( $c0 == 0xfe && $c1 == 0xff ) { $str = substr($str,2); }
-		elseif( $c0 == 0xff && $c1 == 0xfe ) { $str = substr($str,2); $bom_be = false; }
-		$len = strlen($str);
-		$newstr = '';
-		for($i=0;$i<$len;$i+=2) {
-			if( $bom_be ) { $val = ord($str{$i})   << 4; $val += ord($str{$i+1}); }
-			else {        $val = ord($str{$i+1}) << 4; $val += ord($str{$i}); }
-			$newstr .= ($val == 0x228) ? "\n" : chr($val);
-		}
-		return $newstr;
-	}
-
-	/**
-	 * Get character count. First try mbstring, then iconv, finally strlen
-	 *
-	 * @param string $value
-	 * @param string $enc Encoding
-	 * @return int Character count
-	 */
-	public static function CountCharacters($value, $enc = 'UTF-8')
-	{
-		if (self::getIsMbstringEnabled()) {
-			return mb_strlen($value, $enc);
-		}
-
-		if (self::getIsIconvEnabled()) {
-			return iconv_strlen($value, $enc);
-		}
-
-		// else strlen
-		return strlen($value);
-	}
-
-	/**
-	 * Get a substring of a UTF-8 encoded string. First try mbstring, then iconv, finally strlen
-	 *
-	 * @param string $pValue UTF-8 encoded string
-	 * @param int $pStart Start offset
-	 * @param int $pLength Maximum number of characters in substring
-	 * @return string
-	 */
-	public static function Substring($pValue = '', $pStart = 0, $pLength = 0)
-	{
-		if (self::getIsMbstringEnabled()) {
-			return mb_substr($pValue, $pStart, $pLength, 'UTF-8');
-		}
-
-		if (self::getIsIconvEnabled()) {
-			return iconv_substr($pValue, $pStart, $pLength, 'UTF-8');
-		}
-
-		// else substr
-		return substr($pValue, $pStart, $pLength);
-	}
-
-	/**
-	 * Convert a UTF-8 encoded string to upper case
-	 *
-	 * @param string $pValue UTF-8 encoded string
-	 * @return string
-	 */
-	public static function StrToUpper($pValue = '')
-	{
-		if (function_exists('mb_convert_case')) {
-			return mb_convert_case($pValue, MB_CASE_UPPER, "UTF-8");
-		}
-		return strtoupper($pValue);
-	}
-
-	/**
-	 * Convert a UTF-8 encoded string to lower case
-	 *
-	 * @param string $pValue UTF-8 encoded string
-	 * @return string
-	 */
-	public static function StrToLower($pValue = '')
-	{
-		if (function_exists('mb_convert_case')) {
-			return mb_convert_case($pValue, MB_CASE_LOWER, "UTF-8");
-		}
-		return strtolower($pValue);
-	}
-
-	/**
-	 * Convert a UTF-8 encoded string to title/proper case
-	 *    (uppercase every first character in each word, lower case all other characters)
-	 *
-	 * @param string $pValue UTF-8 encoded string
-	 * @return string
-	 */
-	public static function StrToTitle($pValue = '')
-	{
-		if (function_exists('mb_convert_case')) {
-			return mb_convert_case($pValue, MB_CASE_TITLE, "UTF-8");
-		}
-		return ucwords($pValue);
-	}
-
-    public static function mb_is_upper($char)
-    {
-        return mb_strtolower($char, "UTF-8") != $char;
-    }
-
-    public static function mb_str_split($string)
-    {
-        # Split at all position not after the start: ^
-        # and not before the end: $
-        return preg_split('/(?<!^)(?!$)/u', $string );
-    }
-
-	/**
-	 * Reverse the case of a string, so that all uppercase characters become lowercase
-     *    and all lowercase characters become uppercase
-	 *
-	 * @param string $pValue UTF-8 encoded string
-	 * @return string
-	 */
-	public static function StrCaseReverse($pValue = '')
-	{
-        if (self::getIsMbstringEnabled()) {
-            $characters = self::mb_str_split($pValue);
-            foreach($characters as &$character) {
-                if(self::mb_is_upper($character)) {
-                    $character = mb_strtolower($character, 'UTF-8');
-                } else {
-                    $character = mb_strtoupper($character, 'UTF-8');
-                }
-            }
-            return implode('', $characters);
-		}
-		return strtolower($pValue) ^ strtoupper($pValue) ^ $pValue;
-	}
-
-	/**
-	 * Identify whether a string contains a fractional numeric value,
-	 *    and convert it to a numeric if it is
-	 *
-	 * @param string &$operand string value to test
-	 * @return boolean
-	 */
-	public static function convertToNumberIfFraction(&$operand) {
-		if (preg_match('/^'.self::STRING_REGEXP_FRACTION.'$/i', $operand, $match)) {
-			$sign = ($match[1] == '-') ? '-' : '+';
-			$fractionFormula = '='.$sign.$match[2].$sign.$match[3];
-			$operand = PHPExcel_Calculation::getInstance()->_calculateFormulaValue($fractionFormula);
-			return true;
-		}
-		return false;
-	}	//	function convertToNumberIfFraction()
-
-	/**
-	 * Get the decimal separator. If it has not yet been set explicitly, try to obtain number
-	 * formatting information from locale.
-	 *
-	 * @return string
-	 */
-	public static function getDecimalSeparator()
-	{
-		if (!isset(self::$_decimalSeparator)) {
-			$localeconv = localeconv();
-			self::$_decimalSeparator = ($localeconv['decimal_point'] != '')
-				? $localeconv['decimal_point'] : $localeconv['mon_decimal_point'];
-
-			if (self::$_decimalSeparator == '') {
-				// Default to .
-				self::$_decimalSeparator = '.';
-			}
-		}
-		return self::$_decimalSeparator;
-	}
-
-	/**
-	 * Set the decimal separator. Only used by PHPExcel_Style_NumberFormat::toFormattedString()
-	 * to format output by PHPExcel_Writer_HTML and PHPExcel_Writer_PDF
-	 *
-	 * @param string $pValue Character for decimal separator
-	 */
-	public static function setDecimalSeparator($pValue = '.')
-	{
-		self::$_decimalSeparator = $pValue;
-	}
-
-	/**
-	 * Get the thousands separator. If it has not yet been set explicitly, try to obtain number
-	 * formatting information from locale.
-	 *
-	 * @return string
-	 */
-	public static function getThousandsSeparator()
-	{
-		if (!isset(self::$_thousandsSeparator)) {
-			$localeconv = localeconv();
-			self::$_thousandsSeparator = ($localeconv['thousands_sep'] != '')
-				? $localeconv['thousands_sep'] : $localeconv['mon_thousands_sep'];
-
-			if (self::$_thousandsSeparator == '') {
-				// Default to .
-				self::$_thousandsSeparator = ',';
-			}
-		}
-		return self::$_thousandsSeparator;
-	}
-
-	/**
-	 * Set the thousands separator. Only used by PHPExcel_Style_NumberFormat::toFormattedString()
-	 * to format output by PHPExcel_Writer_HTML and PHPExcel_Writer_PDF
-	 *
-	 * @param string $pValue Character for thousands separator
-	 */
-	public static function setThousandsSeparator($pValue = ',')
-	{
-		self::$_thousandsSeparator = $pValue;
-	}
-
-	/**
-	 *	Get the currency code. If it has not yet been set explicitly, try to obtain the
-	 *		symbol information from locale.
-	 *
-	 * @return string
-	 */
-	public static function getCurrencyCode()
-	{
-		if (!isset(self::$_currencyCode)) {
-			$localeconv = localeconv();
-			self::$_currencyCode = ($localeconv['currency_symbol'] != '')
-				? $localeconv['currency_symbol'] : $localeconv['int_curr_symbol'];
-
-			if (self::$_currencyCode == '') {
-				// Default to $
-				self::$_currencyCode = '$';
-			}
-		}
-		return self::$_currencyCode;
-	}
-
-	/**
-	 * Set the currency code. Only used by PHPExcel_Style_NumberFormat::toFormattedString()
-	 *		to format output by PHPExcel_Writer_HTML and PHPExcel_Writer_PDF
-	 *
-	 * @param string $pValue Character for currency code
-	 */
-	public static function setCurrencyCode($pValue = '$')
-	{
-		self::$_currencyCode = $pValue;
-	}
-
-	/**
-	 * Convert SYLK encoded string to UTF-8
-	 *
-	 * @param string $pValue
-	 * @return string UTF-8 encoded string
-	 */
-	public static function SYLKtoUTF8($pValue = '')
-	{
-		// If there is no escape character in the string there is nothing to do
-		if (strpos($pValue, '') === false) {
-			return $pValue;
-		}
-
-		foreach (self::$_SYLKCharacters as $k => $v) {
-			$pValue = str_replace($k, $v, $pValue);
-		}
-
-		return $pValue;
-	}
-
-	/**
-	 * Retrieve any leading numeric part of a string, or return the full string if no leading numeric
-	 *	(handles basic integer or float, but not exponent or non decimal)
-	 *
-	 * @param	string	$value
-	 * @return	mixed	string or only the leading numeric part of the string
-	 */
-	public static function testStringAsNumeric($value)
-	{
-		if (is_numeric($value))
-			return $value;
-		$v = floatval($value);
-		return (is_numeric(substr($value, 0, strlen($v)))) ? $v : $value;
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/TimeZone.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/TimeZone.php
deleted file mode 100644
index 1792a295389..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/TimeZone.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Shared_TimeZone
- *
- * @category   PHPExcel
- * @package	PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_TimeZone
-{
-	/*
-	 * Default Timezone used for date/time conversions
-	 *
-	 * @private
-	 * @var	string
-	 */
-	protected static $_timezone	= 'UTC';
-
-	/**
-	 * Validate a Timezone name
-	 *
-	 * @param	 string		$timezone			Time zone (e.g. 'Europe/London')
-	 * @return	 boolean						Success or failure
-	 */
-	public static function _validateTimeZone($timezone) {
-		if (in_array($timezone, DateTimeZone::listIdentifiers())) {
-			return TRUE;
-		}
-		return FALSE;
-	}
-
-	/**
-	 * Set the Default Timezone used for date/time conversions
-	 *
-	 * @param	 string		$timezone			Time zone (e.g. 'Europe/London')
-	 * @return	 boolean						Success or failure
-	 */
-	public static function setTimeZone($timezone) {
-		if (self::_validateTimezone($timezone)) {
-			self::$_timezone = $timezone;
-			return TRUE;
-		}
-		return FALSE;
-	}	//	function setTimezone()
-
-
-	/**
-	 * Return the Default Timezone used for date/time conversions
-	 *
-	 * @return	 string		Timezone (e.g. 'Europe/London')
-	 */
-	public static function getTimeZone() {
-		return self::$_timezone;
-	}	//	function getTimezone()
-
-
-	/**
-	 *	Return the Timezone transition for the specified timezone and timestamp
-	 *
-	 *	@param		DateTimeZone	 	$objTimezone	The timezone for finding the transitions
-	 *	@param		integer	 			$timestamp		PHP date/time value for finding the current transition
-	 *	@return	 	array				The current transition details
-	 */
-	private static function _getTimezoneTransitions($objTimezone, $timestamp) {
-		$allTransitions = $objTimezone->getTransitions();
-		$transitions = array();
-		foreach($allTransitions as $key => $transition) {
-			if ($transition['ts'] > $timestamp) {
-				$transitions[] = ($key > 0) ? $allTransitions[$key - 1] : $transition;
-				break;
-			}
-			if (empty($transitions)) {
-				$transitions[] = end($allTransitions);
-			}
-		}
-
-		return $transitions;
-	}
-
-	/**
-	 *	Return the Timezone offset used for date/time conversions to/from UST
-	 *	This requires both the timezone and the calculated date/time to allow for local DST
-	 *
-	 *	@param		string	 			$timezone		The timezone for finding the adjustment to UST
-	 *	@param		integer	 			$timestamp		PHP date/time value
-	 *	@return	 	integer				Number of seconds for timezone adjustment
-	 *	@throws		PHPExcel_Exception
-	 */
-	public static function getTimeZoneAdjustment($timezone, $timestamp) {
-		if ($timezone !== NULL) {
-			if (!self::_validateTimezone($timezone)) {
-				throw new PHPExcel_Exception("Invalid timezone " . $timezone);
-			}
-		} else {
-			$timezone = self::$_timezone;
-		}
-
-		if ($timezone == 'UST') {
-			return 0;
-		}
-
-		$objTimezone = new DateTimeZone($timezone);
-		if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
-			$transitions = $objTimezone->getTransitions($timestamp,$timestamp);
-		} else {
-			$transitions = self::_getTimezoneTransitions($objTimezone, $timestamp);
-		}
-
-		return (count($transitions) > 0) ? $transitions[0]['offset'] : 0;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/XMLWriter.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/XMLWriter.php
deleted file mode 100644
index beca51fc587..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/XMLWriter.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-if (!defined('DATE_W3C')) {
-  define('DATE_W3C', 'Y-m-d\TH:i:sP');
-}
-
-if (!defined('DEBUGMODE_ENABLED')) {
-  define('DEBUGMODE_ENABLED', false);
-}
-
-
-/**
- * PHPExcel_Shared_XMLWriter
- *
- * @category   PHPExcel
- * @package	PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_XMLWriter extends XMLWriter {
-	/** Temporary storage method */
-	const STORAGE_MEMORY	= 1;
-	const STORAGE_DISK		= 2;
-
-	/**
-	 * Temporary filename
-	 *
-	 * @var string
-	 */
-	private $_tempFileName = '';
-
-	/**
-	 * Create a new PHPExcel_Shared_XMLWriter instance
-	 *
-	 * @param int		$pTemporaryStorage			Temporary storage location
-	 * @param string	$pTemporaryStorageFolder	Temporary storage folder
-	 */
-	public function __construct($pTemporaryStorage = self::STORAGE_MEMORY, $pTemporaryStorageFolder = NULL) {
-		// Open temporary storage
-		if ($pTemporaryStorage == self::STORAGE_MEMORY) {
-			$this->openMemory();
-		} else {
-			// Create temporary filename
-			if ($pTemporaryStorageFolder === NULL)
-				$pTemporaryStorageFolder = PHPExcel_Shared_File::sys_get_temp_dir();
-			$this->_tempFileName = @tempnam($pTemporaryStorageFolder, 'xml');
-
-			// Open storage
-			if ($this->openUri($this->_tempFileName) === false) {
-				// Fallback to memory...
-				$this->openMemory();
-			}
-		}
-
-		// Set default values
-		if (DEBUGMODE_ENABLED) {
-			$this->setIndent(true);
-		}
-	}
-
-	/**
-	 * Destructor
-	 */
-	public function __destruct() {
-		// Unlink temporary files
-		if ($this->_tempFileName != '') {
-			@unlink($this->_tempFileName);
-		}
-	}
-
-	/**
-	 * Get written data
-	 *
-	 * @return $data
-	 */
-	public function getData() {
-		if ($this->_tempFileName == '') {
-			return $this->outputMemory(true);
-		} else {
-			$this->flush();
-			return file_get_contents($this->_tempFileName);
-		}
-	}
-
-	/**
-	 * Fallback method for writeRaw, introduced in PHP 5.2
-	 *
-	 * @param string $text
-	 * @return string
-	 */
-	public function writeRawData($text)
-	{
-		if (is_array($text)) {
-			$text = implode("\n",$text);
-		}
-
-		if (method_exists($this, 'writeRaw')) {
-			return $this->writeRaw(htmlspecialchars($text));
-		}
-
-		return $this->text($text);
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipArchive.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipArchive.php
deleted file mode 100644
index 9a801a84114..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipArchive.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_ZipArchive
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-if (!defined('PCLZIP_TEMPORARY_DIR')) {
-	define('PCLZIP_TEMPORARY_DIR', PHPExcel_Shared_File::sys_get_temp_dir() . DIRECTORY_SEPARATOR);
-}
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/PCLZip/pclzip.lib.php';
-
-
-/**
- * PHPExcel_Shared_ZipArchive
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_ZipArchive
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_ZipArchive
-{
-
-	/**	constants */
-	const OVERWRITE		= 'OVERWRITE';
-	const CREATE		= 'CREATE';
-
-
-	/**
-	 * Temporary storage directory
-	 *
-	 * @var string
-	 */
-	private $_tempDir;
-
-	/**
-	 * Zip Archive Stream Handle
-	 *
-	 * @var string
-	 */
-	private $_zip;
-
-
-    /**
-	 * Open a new zip archive
-	 *
-	 * @param	string	$fileName	Filename for the zip archive
-	 * @return	boolean
-     */
-	public function open($fileName)
-	{
-		$this->_tempDir = PHPExcel_Shared_File::sys_get_temp_dir();
-
-		$this->_zip = new PclZip($fileName);
-
-		return true;
-	}
-
-
-    /**
-	 * Close this zip archive
-	 *
-     */
-	public function close()
-	{
-	}
-
-
-    /**
-	 * Add a new file to the zip archive from a string of raw data.
-	 *
-	 * @param	string	$localname		Directory/Name of the file to add to the zip archive
-	 * @param	string	$contents		String of data to add to the zip archive
-     */
-	public function addFromString($localname, $contents)
-	{
-		$filenameParts = pathinfo($localname);
-
-		$handle = fopen($this->_tempDir.'/'.$filenameParts["basename"], "wb");
-		fwrite($handle, $contents);
-		fclose($handle);
-
-		$res = $this->_zip->add($this->_tempDir.'/'.$filenameParts["basename"],
-								PCLZIP_OPT_REMOVE_PATH, $this->_tempDir,
-								PCLZIP_OPT_ADD_PATH, $filenameParts["dirname"]
-							   );
-		if ($res == 0) {
-			throw new PHPExcel_Writer_Exception("Error zipping files : " . $this->_zip->errorInfo(true));
-		}
-
-		unlink($this->_tempDir.'/'.$filenameParts["basename"]);
-	}
-
-    /**
-     * Find if given fileName exist in archive (Emulate ZipArchive locateName())
-     *
-     * @param        string        $fileName        Filename for the file in zip archive
-     * @return        boolean
-     */
-    public function locateName($fileName)
-    {
-        $list = $this->_zip->listContent();
-        $listCount = count($list);
-        $list_index = -1;
-        for ($i = 0; $i < $listCount; ++$i) {
-            if (strtolower($list[$i]["filename"]) == strtolower($fileName) ||
-                strtolower($list[$i]["stored_filename"]) == strtolower($fileName)) {
-                $list_index = $i;
-                break;
-            }
-        }
-        return ($list_index > -1);
-    }
-
-    /**
-     * Extract file from archive by given fileName (Emulate ZipArchive getFromName())
-     *
-     * @param        string        $fileName        Filename for the file in zip archive
-     * @return        string  $contents        File string contents
-     */
-    public function getFromName($fileName) 
-    {
-        $list = $this->_zip->listContent();
-        $listCount = count($list);
-        $list_index = -1;
-        for ($i = 0; $i < $listCount; ++$i) {
-            if (strtolower($list[$i]["filename"]) == strtolower($fileName) ||
-                strtolower($list[$i]["stored_filename"]) == strtolower($fileName)) {
-                $list_index = $i;
-                break;
-            }
-        }
-
-        $extracted = "";
-        if ($list_index != -1) {
-            $extracted = $this->_zip->extractByIndex($list_index, PCLZIP_OPT_EXTRACT_AS_STRING);
-        } else {
-            $filename = substr($fileName, 1);
-            $list_index = -1;
-            for ($i = 0; $i < $listCount; ++$i) {
-                if (strtolower($list[$i]["filename"]) == strtolower($fileName) || 
-                    strtolower($list[$i]["stored_filename"]) == strtolower($fileName)) {
-                    $list_index = $i;
-                    break;
-                }
-            }
-            $extracted = $this->_zip->extractByIndex($list_index, PCLZIP_OPT_EXTRACT_AS_STRING);
-        }
-        if ((is_array($extracted)) && ($extracted != 0)) {
-            $contents = $extracted[0]["content"];
-        }
-
-        return $contents;
-    }
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipStreamWrapper.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipStreamWrapper.php
deleted file mode 100644
index 6e63d3ce3d6..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipStreamWrapper.php
+++ /dev/null
@@ -1,201 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Shared_ZipStreamWrapper
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_ZipStreamWrapper {
-	/**
-	 * Internal ZipAcrhive
-	 *
-	 * @var ZipAcrhive
-	 */
-    private $_archive;
-
-    /**
-     * Filename in ZipAcrhive
-     *
-     * @var string
-     */
-    private $_fileNameInArchive = '';
-
-    /**
-     * Position in file
-     *
-     * @var int
-     */
-    private $_position = 0;
-
-    /**
-     * Data
-     *
-     * @var mixed
-     */
-    private $_data = '';
-
-    /**
-     * Register wrapper
-     */
-    public static function register() {
-		@stream_wrapper_unregister("zip");
-		@stream_wrapper_register("zip", __CLASS__);
-    }
-
-    /**
-	 * Implements support for fopen().
-	 *
-	 * @param	string	$path			resource name including scheme, e.g.
-	 * @param	string	$mode			only "r" is supported
-	 * @param	int		$options		mask of STREAM_REPORT_ERRORS and STREAM_USE_PATH
-	 * @param	string  &$openedPath	absolute path of the opened stream (out parameter)
-	 * @return	bool    true on success
-     */
-    public function stream_open($path, $mode, $options, &$opened_path) {
-        // Check for mode
-        if ($mode{0} != 'r') {
-            throw new PHPExcel_Reader_Exception('Mode ' . $mode . ' is not supported. Only read mode is supported.');
-        }
-
-		$pos = strrpos($path, '#');
-		$url['host'] = substr($path, 6, $pos - 6); // 6: strlen('zip://')
-		$url['fragment'] = substr($path, $pos + 1);
-
-        // Open archive
-        $this->_archive = new ZipArchive();
-        $this->_archive->open($url['host']);
-
-        $this->_fileNameInArchive = $url['fragment'];
-        $this->_position = 0;
-        $this->_data = $this->_archive->getFromName( $this->_fileNameInArchive );
-
-        return true;
-    }
-
-    /**
-	 * Implements support for fstat().
-	 *
-	 * @return  boolean
-     */
-    public function statName() {
-        return $this->_fileNameInArchive;
-    }
-
-    /**
-	 * Implements support for fstat().
-	 *
-	 * @return  boolean
-     */
-    public function url_stat() {
-        return $this->statName( $this->_fileNameInArchive );
-    }
-
-    /**
-	 * Implements support for fstat().
-	 *
-	 * @return  boolean
-     */
-    public function stream_stat() {
-        return $this->_archive->statName( $this->_fileNameInArchive );
-    }
-
-    /**
-	 * Implements support for fread(), fgets() etc.
-	 *
-	 * @param   int		$count	maximum number of bytes to read
-	 * @return  string
-     */
-    function stream_read($count) {
-        $ret = substr($this->_data, $this->_position, $count);
-        $this->_position += strlen($ret);
-        return $ret;
-    }
-
-    /**
-	 * Returns the position of the file pointer, i.e. its offset into the file
-	 * stream. Implements support for ftell().
-	 *
-	 * @return  int
-     */
-    public function stream_tell() {
-        return $this->_position;
-    }
-
-    /**
-     * EOF stream
-	 *
-	 * @return	bool
-     */
-    public function stream_eof() {
-        return $this->_position >= strlen($this->_data);
-    }
-
-    /**
-     * Seek stream
-	 *
-	 * @param	int		$offset	byte offset
-	 * @param	int		$whence	SEEK_SET, SEEK_CUR or SEEK_END
-	 * @return	bool
-     */
-    public function stream_seek($offset, $whence) {
-        switch ($whence) {
-            case SEEK_SET:
-                if ($offset < strlen($this->_data) && $offset >= 0) {
-                     $this->_position = $offset;
-                     return true;
-                } else {
-                     return false;
-                }
-                break;
-
-            case SEEK_CUR:
-                if ($offset >= 0) {
-                     $this->_position += $offset;
-                     return true;
-                } else {
-                     return false;
-                }
-                break;
-
-            case SEEK_END:
-                if (strlen($this->_data) + $offset >= 0) {
-                     $this->_position = strlen($this->_data) + $offset;
-                     return true;
-                } else {
-                     return false;
-                }
-                break;
-
-            default:
-                return false;
-        }
-    }
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/bestFitClass.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/bestFitClass.php
deleted file mode 100644
index 9ae8b006d03..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/bestFitClass.php
+++ /dev/null
@@ -1,432 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Best_Fit
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Best_Fit
-{
-	/**
-	 * Indicator flag for a calculation error
-	 *
-	 * @var	boolean
-	 **/
-	protected $_error				= False;
-
-	/**
-	 * Algorithm type to use for best-fit
-	 *
-	 * @var	string
-	 **/
-	protected $_bestFitType			= 'undetermined';
-
-	/**
-	 * Number of entries in the sets of x- and y-value arrays
-	 *
-	 * @var	int
-	 **/
-	protected $_valueCount			= 0;
-
-	/**
-	 * X-value dataseries of values
-	 *
-	 * @var	float[]
-	 **/
-	protected $_xValues				= array();
-
-	/**
-	 * Y-value dataseries of values
-	 *
-	 * @var	float[]
-	 **/
-	protected $_yValues				= array();
-
-	/**
-	 * Flag indicating whether values should be adjusted to Y=0
-	 *
-	 * @var	boolean
-	 **/
-	protected $_adjustToZero		= False;
-
-	/**
-	 * Y-value series of best-fit values
-	 *
-	 * @var	float[]
-	 **/
-	protected $_yBestFitValues		= array();
-
-	protected $_goodnessOfFit 		= 1;
-
-	protected $_stdevOfResiduals	= 0;
-
-	protected $_covariance			= 0;
-
-	protected $_correlation			= 0;
-
-	protected $_SSRegression		= 0;
-
-	protected $_SSResiduals			= 0;
-
-	protected $_DFResiduals			= 0;
-
-	protected $_F					= 0;
-
-	protected $_slope				= 0;
-
-	protected $_slopeSE				= 0;
-
-	protected $_intersect			= 0;
-
-	protected $_intersectSE			= 0;
-
-	protected $_Xoffset				= 0;
-
-	protected $_Yoffset				= 0;
-
-
-	public function getError() {
-		return $this->_error;
-	}	//	function getBestFitType()
-
-
-	public function getBestFitType() {
-		return $this->_bestFitType;
-	}	//	function getBestFitType()
-
-
-	/**
-	 * Return the Y-Value for a specified value of X
-	 *
-	 * @param	 float		$xValue			X-Value
-	 * @return	 float						Y-Value
-	 */
-	public function getValueOfYForX($xValue) {
-		return False;
-	}	//	function getValueOfYForX()
-
-
-	/**
-	 * Return the X-Value for a specified value of Y
-	 *
-	 * @param	 float		$yValue			Y-Value
-	 * @return	 float						X-Value
-	 */
-	public function getValueOfXForY($yValue) {
-		return False;
-	}	//	function getValueOfXForY()
-
-
-	/**
-	 * Return the original set of X-Values
-	 *
-	 * @return	 float[]				X-Values
-	 */
-	public function getXValues() {
-		return $this->_xValues;
-	}	//	function getValueOfXForY()
-
-
-	/**
-	 * Return the Equation of the best-fit line
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 */
-	public function getEquation($dp=0) {
-		return False;
-	}	//	function getEquation()
-
-
-	/**
-	 * Return the Slope of the line
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 */
-	public function getSlope($dp=0) {
-		if ($dp != 0) {
-			return round($this->_slope,$dp);
-		}
-		return $this->_slope;
-	}	//	function getSlope()
-
-
-	/**
-	 * Return the standard error of the Slope
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 */
-	public function getSlopeSE($dp=0) {
-		if ($dp != 0) {
-			return round($this->_slopeSE,$dp);
-		}
-		return $this->_slopeSE;
-	}	//	function getSlopeSE()
-
-
-	/**
-	 * Return the Value of X where it intersects Y = 0
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 */
-	public function getIntersect($dp=0) {
-		if ($dp != 0) {
-			return round($this->_intersect,$dp);
-		}
-		return $this->_intersect;
-	}	//	function getIntersect()
-
-
-	/**
-	 * Return the standard error of the Intersect
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 */
-	public function getIntersectSE($dp=0) {
-		if ($dp != 0) {
-			return round($this->_intersectSE,$dp);
-		}
-		return $this->_intersectSE;
-	}	//	function getIntersectSE()
-
-
-	/**
-	 * Return the goodness of fit for this regression
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to return
-	 * @return	 float
-	 */
-	public function getGoodnessOfFit($dp=0) {
-		if ($dp != 0) {
-			return round($this->_goodnessOfFit,$dp);
-		}
-		return $this->_goodnessOfFit;
-	}	//	function getGoodnessOfFit()
-
-
-	public function getGoodnessOfFitPercent($dp=0) {
-		if ($dp != 0) {
-			return round($this->_goodnessOfFit * 100,$dp);
-		}
-		return $this->_goodnessOfFit * 100;
-	}	//	function getGoodnessOfFitPercent()
-
-
-	/**
-	 * Return the standard deviation of the residuals for this regression
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to return
-	 * @return	 float
-	 */
-	public function getStdevOfResiduals($dp=0) {
-		if ($dp != 0) {
-			return round($this->_stdevOfResiduals,$dp);
-		}
-		return $this->_stdevOfResiduals;
-	}	//	function getStdevOfResiduals()
-
-
-	public function getSSRegression($dp=0) {
-		if ($dp != 0) {
-			return round($this->_SSRegression,$dp);
-		}
-		return $this->_SSRegression;
-	}	//	function getSSRegression()
-
-
-	public function getSSResiduals($dp=0) {
-		if ($dp != 0) {
-			return round($this->_SSResiduals,$dp);
-		}
-		return $this->_SSResiduals;
-	}	//	function getSSResiduals()
-
-
-	public function getDFResiduals($dp=0) {
-		if ($dp != 0) {
-			return round($this->_DFResiduals,$dp);
-		}
-		return $this->_DFResiduals;
-	}	//	function getDFResiduals()
-
-
-	public function getF($dp=0) {
-		if ($dp != 0) {
-			return round($this->_F,$dp);
-		}
-		return $this->_F;
-	}	//	function getF()
-
-
-	public function getCovariance($dp=0) {
-		if ($dp != 0) {
-			return round($this->_covariance,$dp);
-		}
-		return $this->_covariance;
-	}	//	function getCovariance()
-
-
-	public function getCorrelation($dp=0) {
-		if ($dp != 0) {
-			return round($this->_correlation,$dp);
-		}
-		return $this->_correlation;
-	}	//	function getCorrelation()
-
-
-	public function getYBestFitValues() {
-		return $this->_yBestFitValues;
-	}	//	function getYBestFitValues()
-
-
-	protected function _calculateGoodnessOfFit($sumX,$sumY,$sumX2,$sumY2,$sumXY,$meanX,$meanY, $const) {
-		$SSres = $SScov = $SScor = $SStot = $SSsex = 0.0;
-		foreach($this->_xValues as $xKey => $xValue) {
-			$bestFitY = $this->_yBestFitValues[$xKey] = $this->getValueOfYForX($xValue);
-
-			$SSres += ($this->_yValues[$xKey] - $bestFitY) * ($this->_yValues[$xKey] - $bestFitY);
-			if ($const) {
-				$SStot += ($this->_yValues[$xKey] - $meanY) * ($this->_yValues[$xKey] - $meanY);
-			} else {
-				$SStot += $this->_yValues[$xKey] * $this->_yValues[$xKey];
-			}
-			$SScov += ($this->_xValues[$xKey] - $meanX) * ($this->_yValues[$xKey] - $meanY);
-			if ($const) {
-				$SSsex += ($this->_xValues[$xKey] - $meanX) * ($this->_xValues[$xKey] - $meanX);
-			} else {
-				$SSsex += $this->_xValues[$xKey] * $this->_xValues[$xKey];
-			}
-		}
-
-		$this->_SSResiduals = $SSres;
-		$this->_DFResiduals = $this->_valueCount - 1 - $const;
-
-		if ($this->_DFResiduals == 0.0) {
-			$this->_stdevOfResiduals = 0.0;
-		} else {
-			$this->_stdevOfResiduals = sqrt($SSres / $this->_DFResiduals);
-		}
-		if (($SStot == 0.0) || ($SSres == $SStot)) {
-			$this->_goodnessOfFit = 1;
-		} else {
-			$this->_goodnessOfFit = 1 - ($SSres / $SStot);
-		}
-
-		$this->_SSRegression = $this->_goodnessOfFit * $SStot;
-		$this->_covariance = $SScov / $this->_valueCount;
-		$this->_correlation = ($this->_valueCount * $sumXY - $sumX * $sumY) / sqrt(($this->_valueCount * $sumX2 - pow($sumX,2)) * ($this->_valueCount * $sumY2 - pow($sumY,2)));
-		$this->_slopeSE = $this->_stdevOfResiduals / sqrt($SSsex);
-		$this->_intersectSE = $this->_stdevOfResiduals * sqrt(1 / ($this->_valueCount - ($sumX * $sumX) / $sumX2));
-		if ($this->_SSResiduals != 0.0) {
-			if ($this->_DFResiduals == 0.0) {
-				$this->_F = 0.0;
-			} else {
-				$this->_F = $this->_SSRegression / ($this->_SSResiduals / $this->_DFResiduals);
-			}
-		} else {
-			if ($this->_DFResiduals == 0.0) {
-				$this->_F = 0.0;
-			} else {
-				$this->_F = $this->_SSRegression / $this->_DFResiduals;
-			}
-		}
-	}	//	function _calculateGoodnessOfFit()
-
-
-	protected function _leastSquareFit($yValues, $xValues, $const) {
-		// calculate sums
-		$x_sum = array_sum($xValues);
-		$y_sum = array_sum($yValues);
-		$meanX = $x_sum / $this->_valueCount;
-		$meanY = $y_sum / $this->_valueCount;
-		$mBase = $mDivisor = $xx_sum = $xy_sum = $yy_sum = 0.0;
-		for($i = 0; $i < $this->_valueCount; ++$i) {
-			$xy_sum += $xValues[$i] * $yValues[$i];
-			$xx_sum += $xValues[$i] * $xValues[$i];
-			$yy_sum += $yValues[$i] * $yValues[$i];
-
-			if ($const) {
-				$mBase += ($xValues[$i] - $meanX) * ($yValues[$i] - $meanY);
-				$mDivisor += ($xValues[$i] - $meanX) * ($xValues[$i] - $meanX);
-			} else {
-				$mBase += $xValues[$i] * $yValues[$i];
-				$mDivisor += $xValues[$i] * $xValues[$i];
-			}
-		}
-
-		// calculate slope
-//		$this->_slope = (($this->_valueCount * $xy_sum) - ($x_sum * $y_sum)) / (($this->_valueCount * $xx_sum) - ($x_sum * $x_sum));
-		$this->_slope = $mBase / $mDivisor;
-
-		// calculate intersect
-//		$this->_intersect = ($y_sum - ($this->_slope * $x_sum)) / $this->_valueCount;
-		if ($const) {
-			$this->_intersect = $meanY - ($this->_slope * $meanX);
-		} else {
-			$this->_intersect = 0;
-		}
-
-		$this->_calculateGoodnessOfFit($x_sum,$y_sum,$xx_sum,$yy_sum,$xy_sum,$meanX,$meanY,$const);
-	}	//	function _leastSquareFit()
-
-
-	/**
-	 * Define the regression
-	 *
-	 * @param	float[]		$yValues	The set of Y-values for this regression
-	 * @param	float[]		$xValues	The set of X-values for this regression
-	 * @param	boolean		$const
-	 */
-	function __construct($yValues, $xValues=array(), $const=True) {
-		//	Calculate number of points
-		$nY = count($yValues);
-		$nX = count($xValues);
-
-		//	Define X Values if necessary
-		if ($nX == 0) {
-			$xValues = range(1,$nY);
-			$nX = $nY;
-		} elseif ($nY != $nX) {
-			//	Ensure both arrays of points are the same size
-			$this->_error = True;
-			return False;
-		}
-
-		$this->_valueCount = $nY;
-		$this->_xValues = $xValues;
-		$this->_yValues = $yValues;
-	}	//	function __construct()
-
-}	//	class bestFit
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/exponentialBestFitClass.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/exponentialBestFitClass.php
deleted file mode 100644
index b524b5fe4cf..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/exponentialBestFitClass.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-require_once(PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/bestFitClass.php');
-
-
-/**
- * PHPExcel_Exponential_Best_Fit
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Exponential_Best_Fit extends PHPExcel_Best_Fit
-{
-	/**
-	 * Algorithm type to use for best-fit
-	 * (Name of this trend class)
-	 *
-	 * @var	string
-	 **/
-	protected $_bestFitType		= 'exponential';
-
-
-	/**
-	 * Return the Y-Value for a specified value of X
-	 *
-	 * @param	 float		$xValue			X-Value
-	 * @return	 float						Y-Value
-	 **/
-	public function getValueOfYForX($xValue) {
-		return $this->getIntersect() * pow($this->getSlope(),($xValue - $this->_Xoffset));
-	}	//	function getValueOfYForX()
-
-
-	/**
-	 * Return the X-Value for a specified value of Y
-	 *
-	 * @param	 float		$yValue			Y-Value
-	 * @return	 float						X-Value
-	 **/
-	public function getValueOfXForY($yValue) {
-		return log(($yValue + $this->_Yoffset) / $this->getIntersect()) / log($this->getSlope());
-	}	//	function getValueOfXForY()
-
-
-	/**
-	 * Return the Equation of the best-fit line
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 **/
-	public function getEquation($dp=0) {
-		$slope = $this->getSlope($dp);
-		$intersect = $this->getIntersect($dp);
-
-		return 'Y = '.$intersect.' * '.$slope.'^X';
-	}	//	function getEquation()
-
-
-	/**
-	 * Return the Slope of the line
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 **/
-	public function getSlope($dp=0) {
-		if ($dp != 0) {
-			return round(exp($this->_slope),$dp);
-		}
-		return exp($this->_slope);
-	}	//	function getSlope()
-
-
-	/**
-	 * Return the Value of X where it intersects Y = 0
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 **/
-	public function getIntersect($dp=0) {
-		if ($dp != 0) {
-			return round(exp($this->_intersect),$dp);
-		}
-		return exp($this->_intersect);
-	}	//	function getIntersect()
-
-
-	/**
-	 * Execute the regression and calculate the goodness of fit for a set of X and Y data values
-	 *
-	 * @param	 float[]	$yValues	The set of Y-values for this regression
-	 * @param	 float[]	$xValues	The set of X-values for this regression
-	 * @param	 boolean	$const
-	 */
-	private function _exponential_regression($yValues, $xValues, $const) {
-		foreach($yValues as &$value) {
-			if ($value < 0.0) {
-				$value = 0 - log(abs($value));
-			} elseif ($value > 0.0) {
-				$value = log($value);
-			}
-		}
-		unset($value);
-
-		$this->_leastSquareFit($yValues, $xValues, $const);
-	}	//	function _exponential_regression()
-
-
-	/**
-	 * Define the regression and calculate the goodness of fit for a set of X and Y data values
-	 *
-	 * @param	float[]		$yValues	The set of Y-values for this regression
-	 * @param	float[]		$xValues	The set of X-values for this regression
-	 * @param	boolean		$const
-	 */
-	function __construct($yValues, $xValues=array(), $const=True) {
-		if (parent::__construct($yValues, $xValues) !== False) {
-			$this->_exponential_regression($yValues, $xValues, $const);
-		}
-	}	//	function __construct()
-
-}	//	class exponentialBestFit
\ No newline at end of file
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/linearBestFitClass.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/linearBestFitClass.php
deleted file mode 100644
index 7d811aa5b99..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/linearBestFitClass.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-require_once(PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/bestFitClass.php');
-
-
-/**
- * PHPExcel_Linear_Best_Fit
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Linear_Best_Fit extends PHPExcel_Best_Fit
-{
-	/**
-	 * Algorithm type to use for best-fit
-	 * (Name of this trend class)
-	 *
-	 * @var	string
-	 **/
-	protected $_bestFitType		= 'linear';
-
-
-	/**
-	 * Return the Y-Value for a specified value of X
-	 *
-	 * @param	 float		$xValue			X-Value
-	 * @return	 float						Y-Value
-	 **/
-	public function getValueOfYForX($xValue) {
-		return $this->getIntersect() + $this->getSlope() * $xValue;
-	}	//	function getValueOfYForX()
-
-
-	/**
-	 * Return the X-Value for a specified value of Y
-	 *
-	 * @param	 float		$yValue			Y-Value
-	 * @return	 float						X-Value
-	 **/
-	public function getValueOfXForY($yValue) {
-		return ($yValue - $this->getIntersect()) / $this->getSlope();
-	}	//	function getValueOfXForY()
-
-
-	/**
-	 * Return the Equation of the best-fit line
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 **/
-	public function getEquation($dp=0) {
-		$slope = $this->getSlope($dp);
-		$intersect = $this->getIntersect($dp);
-
-		return 'Y = '.$intersect.' + '.$slope.' * X';
-	}	//	function getEquation()
-
-
-	/**
-	 * Execute the regression and calculate the goodness of fit for a set of X and Y data values
-	 *
-	 * @param	 float[]	$yValues	The set of Y-values for this regression
-	 * @param	 float[]	$xValues	The set of X-values for this regression
-	 * @param	 boolean	$const
-	 */
-	private function _linear_regression($yValues, $xValues, $const) {
-		$this->_leastSquareFit($yValues, $xValues,$const);
-	}	//	function _linear_regression()
-
-
-	/**
-	 * Define the regression and calculate the goodness of fit for a set of X and Y data values
-	 *
-	 * @param	float[]		$yValues	The set of Y-values for this regression
-	 * @param	float[]		$xValues	The set of X-values for this regression
-	 * @param	boolean		$const
-	 */
-	function __construct($yValues, $xValues=array(), $const=True) {
-		if (parent::__construct($yValues, $xValues) !== False) {
-			$this->_linear_regression($yValues, $xValues, $const);
-		}
-	}	//	function __construct()
-
-}	//	class linearBestFit
\ No newline at end of file
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/logarithmicBestFitClass.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/logarithmicBestFitClass.php
deleted file mode 100644
index b43cd5edfad..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/logarithmicBestFitClass.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-require_once(PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/bestFitClass.php');
-
-
-/**
- * PHPExcel_Logarithmic_Best_Fit
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Logarithmic_Best_Fit extends PHPExcel_Best_Fit
-{
-	/**
-	 * Algorithm type to use for best-fit
-	 * (Name of this trend class)
-	 *
-	 * @var	string
-	 **/
-	protected $_bestFitType		= 'logarithmic';
-
-
-	/**
-	 * Return the Y-Value for a specified value of X
-	 *
-	 * @param	 float		$xValue			X-Value
-	 * @return	 float						Y-Value
-	 **/
-	public function getValueOfYForX($xValue) {
-		return $this->getIntersect() + $this->getSlope() * log($xValue - $this->_Xoffset);
-	}	//	function getValueOfYForX()
-
-
-	/**
-	 * Return the X-Value for a specified value of Y
-	 *
-	 * @param	 float		$yValue			Y-Value
-	 * @return	 float						X-Value
-	 **/
-	public function getValueOfXForY($yValue) {
-		return exp(($yValue - $this->getIntersect()) / $this->getSlope());
-	}	//	function getValueOfXForY()
-
-
-	/**
-	 * Return the Equation of the best-fit line
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 **/
-	public function getEquation($dp=0) {
-		$slope = $this->getSlope($dp);
-		$intersect = $this->getIntersect($dp);
-
-		return 'Y = '.$intersect.' + '.$slope.' * log(X)';
-	}	//	function getEquation()
-
-
-	/**
-	 * Execute the regression and calculate the goodness of fit for a set of X and Y data values
-	 *
-	 * @param	 float[]	$yValues	The set of Y-values for this regression
-	 * @param	 float[]	$xValues	The set of X-values for this regression
-	 * @param	 boolean	$const
-	 */
-	private function _logarithmic_regression($yValues, $xValues, $const) {
-		foreach($xValues as &$value) {
-			if ($value < 0.0) {
-				$value = 0 - log(abs($value));
-			} elseif ($value > 0.0) {
-				$value = log($value);
-			}
-		}
-		unset($value);
-
-		$this->_leastSquareFit($yValues, $xValues, $const);
-	}	//	function _logarithmic_regression()
-
-
-	/**
-	 * Define the regression and calculate the goodness of fit for a set of X and Y data values
-	 *
-	 * @param	float[]		$yValues	The set of Y-values for this regression
-	 * @param	float[]		$xValues	The set of X-values for this regression
-	 * @param	boolean		$const
-	 */
-	function __construct($yValues, $xValues=array(), $const=True) {
-		if (parent::__construct($yValues, $xValues) !== False) {
-			$this->_logarithmic_regression($yValues, $xValues, $const);
-		}
-	}	//	function __construct()
-
-}	//	class logarithmicBestFit
\ No newline at end of file
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/polynomialBestFitClass.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/polynomialBestFitClass.php
deleted file mode 100644
index 3d329eb7d42..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/polynomialBestFitClass.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/bestFitClass.php';
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/JAMA/Matrix.php';
-
-
-/**
- * PHPExcel_Polynomial_Best_Fit
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Polynomial_Best_Fit extends PHPExcel_Best_Fit
-{
-	/**
-	 * Algorithm type to use for best-fit
-	 * (Name of this trend class)
-	 *
-	 * @var	string
-	 **/
-	protected $_bestFitType		= 'polynomial';
-
-	/**
-	 * Polynomial order
-	 *
-	 * @protected
-	 * @var	int
-	 **/
-	protected $_order			= 0;
-
-
-	/**
-	 * Return the order of this polynomial
-	 *
-	 * @return	 int
-	 **/
-	public function getOrder() {
-		return $this->_order;
-	}	//	function getOrder()
-
-
-	/**
-	 * Return the Y-Value for a specified value of X
-	 *
-	 * @param	 float		$xValue			X-Value
-	 * @return	 float						Y-Value
-	 **/
-	public function getValueOfYForX($xValue) {
-		$retVal = $this->getIntersect();
-		$slope = $this->getSlope();
-		foreach($slope as $key => $value) {
-			if ($value != 0.0) {
-				$retVal += $value * pow($xValue, $key + 1);
-			}
-		}
-		return $retVal;
-	}	//	function getValueOfYForX()
-
-
-	/**
-	 * Return the X-Value for a specified value of Y
-	 *
-	 * @param	 float		$yValue			Y-Value
-	 * @return	 float						X-Value
-	 **/
-	public function getValueOfXForY($yValue) {
-		return ($yValue - $this->getIntersect()) / $this->getSlope();
-	}	//	function getValueOfXForY()
-
-
-	/**
-	 * Return the Equation of the best-fit line
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 **/
-	public function getEquation($dp=0) {
-		$slope = $this->getSlope($dp);
-		$intersect = $this->getIntersect($dp);
-
-		$equation = 'Y = '.$intersect;
-		foreach($slope as $key => $value) {
-			if ($value != 0.0) {
-				$equation .= ' + '.$value.' * X';
-				if ($key > 0) {
-					$equation .= '^'.($key + 1);
-				}
-			}
-		}
-		return $equation;
-	}	//	function getEquation()
-
-
-	/**
-	 * Return the Slope of the line
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 **/
-	public function getSlope($dp=0) {
-		if ($dp != 0) {
-			$coefficients = array();
-			foreach($this->_slope as $coefficient) {
-				$coefficients[] = round($coefficient,$dp);
-			}
-			return $coefficients;
-		}
-		return $this->_slope;
-	}	//	function getSlope()
-
-
-	public function getCoefficients($dp=0) {
-		return array_merge(array($this->getIntersect($dp)),$this->getSlope($dp));
-	}	//	function getCoefficients()
-
-
-	/**
-	 * Execute the regression and calculate the goodness of fit for a set of X and Y data values
-	 *
-	 * @param	int			$order		Order of Polynomial for this regression
-	 * @param	float[]		$yValues	The set of Y-values for this regression
-	 * @param	float[]		$xValues	The set of X-values for this regression
-	 * @param	boolean		$const
-	 */
-	private function _polynomial_regression($order, $yValues, $xValues, $const) {
-		// calculate sums
-		$x_sum = array_sum($xValues);
-		$y_sum = array_sum($yValues);
-		$xx_sum = $xy_sum = 0;
-		for($i = 0; $i < $this->_valueCount; ++$i) {
-			$xy_sum += $xValues[$i] * $yValues[$i];
-			$xx_sum += $xValues[$i] * $xValues[$i];
-			$yy_sum += $yValues[$i] * $yValues[$i];
-		}
-		/*
-		 *	This routine uses logic from the PHP port of polyfit version 0.1
-		 *	written by Michael Bommarito and Paul Meagher
-		 *
-		 *	The function fits a polynomial function of order $order through
-		 *	a series of x-y data points using least squares.
-		 *
-		 */
-		for ($i = 0; $i < $this->_valueCount; ++$i) {
-			for ($j = 0; $j <= $order; ++$j) {
-				$A[$i][$j] = pow($xValues[$i], $j);
-			}
-		}
-		for ($i=0; $i < $this->_valueCount; ++$i) {
-			$B[$i] = array($yValues[$i]);
-		}
-		$matrixA = new Matrix($A);
-		$matrixB = new Matrix($B);
-		$C = $matrixA->solve($matrixB);
-
-		$coefficients = array();
-		for($i = 0; $i < $C->m; ++$i) {
-			$r = $C->get($i, 0);
-			if (abs($r) <= pow(10, -9)) {
-				$r = 0;
-			}
-			$coefficients[] = $r;
-		}
-
-		$this->_intersect = array_shift($coefficients);
-		$this->_slope = $coefficients;
-
-		$this->_calculateGoodnessOfFit($x_sum,$y_sum,$xx_sum,$yy_sum,$xy_sum);
-		foreach($this->_xValues as $xKey => $xValue) {
-			$this->_yBestFitValues[$xKey] = $this->getValueOfYForX($xValue);
-		}
-	}	//	function _polynomial_regression()
-
-
-	/**
-	 * Define the regression and calculate the goodness of fit for a set of X and Y data values
-	 *
-	 * @param	int			$order		Order of Polynomial for this regression
-	 * @param	float[]		$yValues	The set of Y-values for this regression
-	 * @param	float[]		$xValues	The set of X-values for this regression
-	 * @param	boolean		$const
-	 */
-	function __construct($order, $yValues, $xValues=array(), $const=True) {
-		if (parent::__construct($yValues, $xValues) !== False) {
-			if ($order < $this->_valueCount) {
-				$this->_bestFitType .= '_'.$order;
-				$this->_order = $order;
-				$this->_polynomial_regression($order, $yValues, $xValues, $const);
-				if (($this->getGoodnessOfFit() < 0.0) || ($this->getGoodnessOfFit() > 1.0)) {
-					$this->_error = True;
-				}
-			} else {
-				$this->_error = True;
-			}
-		}
-	}	//	function __construct()
-
-}	//	class polynomialBestFit
\ No newline at end of file
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/powerBestFitClass.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/powerBestFitClass.php
deleted file mode 100644
index 832669c9f5a..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/powerBestFitClass.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/bestFitClass.php';
-
-
-/**
- * PHPExcel_Power_Best_Fit
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Power_Best_Fit extends PHPExcel_Best_Fit
-{
-	/**
-	 * Algorithm type to use for best-fit
-	 * (Name of this trend class)
-	 *
-	 * @var	string
-	 **/
-	protected $_bestFitType		= 'power';
-
-
-	/**
-	 * Return the Y-Value for a specified value of X
-	 *
-	 * @param	 float		$xValue			X-Value
-	 * @return	 float						Y-Value
-	 **/
-	public function getValueOfYForX($xValue) {
-		return $this->getIntersect() * pow(($xValue - $this->_Xoffset),$this->getSlope());
-	}	//	function getValueOfYForX()
-
-
-	/**
-	 * Return the X-Value for a specified value of Y
-	 *
-	 * @param	 float		$yValue			Y-Value
-	 * @return	 float						X-Value
-	 **/
-	public function getValueOfXForY($yValue) {
-		return pow((($yValue + $this->_Yoffset) / $this->getIntersect()),(1 / $this->getSlope()));
-	}	//	function getValueOfXForY()
-
-
-	/**
-	 * Return the Equation of the best-fit line
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 **/
-	public function getEquation($dp=0) {
-		$slope = $this->getSlope($dp);
-		$intersect = $this->getIntersect($dp);
-
-		return 'Y = '.$intersect.' * X^'.$slope;
-	}	//	function getEquation()
-
-
-	/**
-	 * Return the Value of X where it intersects Y = 0
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 **/
-	public function getIntersect($dp=0) {
-		if ($dp != 0) {
-			return round(exp($this->_intersect),$dp);
-		}
-		return exp($this->_intersect);
-	}	//	function getIntersect()
-
-
-	/**
-	 * Execute the regression and calculate the goodness of fit for a set of X and Y data values
-	 *
-	 * @param	 float[]	$yValues	The set of Y-values for this regression
-	 * @param	 float[]	$xValues	The set of X-values for this regression
-	 * @param	 boolean	$const
-	 */
-	private function _power_regression($yValues, $xValues, $const) {
-		foreach($xValues as &$value) {
-			if ($value < 0.0) {
-				$value = 0 - log(abs($value));
-			} elseif ($value > 0.0) {
-				$value = log($value);
-			}
-		}
-		unset($value);
-		foreach($yValues as &$value) {
-			if ($value < 0.0) {
-				$value = 0 - log(abs($value));
-			} elseif ($value > 0.0) {
-				$value = log($value);
-			}
-		}
-		unset($value);
-
-		$this->_leastSquareFit($yValues, $xValues, $const);
-	}	//	function _power_regression()
-
-
-	/**
-	 * Define the regression and calculate the goodness of fit for a set of X and Y data values
-	 *
-	 * @param	 float[]	$yValues	The set of Y-values for this regression
-	 * @param	 float[]	$xValues	The set of X-values for this regression
-	 * @param	 boolean	$const
-	 */
-	function __construct($yValues, $xValues=array(), $const=True) {
-		if (parent::__construct($yValues, $xValues) !== False) {
-			$this->_power_regression($yValues, $xValues, $const);
-		}
-	}	//	function __construct()
-
-}	//	class powerBestFit
\ No newline at end of file
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/trendClass.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/trendClass.php
deleted file mode 100644
index 25d7eb1d8cc..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/trendClass.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/linearBestFitClass.php';
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/logarithmicBestFitClass.php';
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/exponentialBestFitClass.php';
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/powerBestFitClass.php';
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/polynomialBestFitClass.php';
-
-
-/**
- * PHPExcel_trendClass
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class trendClass
-{
-	const TREND_LINEAR				= 'Linear';
-	const TREND_LOGARITHMIC			= 'Logarithmic';
-	const TREND_EXPONENTIAL			= 'Exponential';
-	const TREND_POWER				= 'Power';
-	const TREND_POLYNOMIAL_2		= 'Polynomial_2';
-	const TREND_POLYNOMIAL_3		= 'Polynomial_3';
-	const TREND_POLYNOMIAL_4		= 'Polynomial_4';
-	const TREND_POLYNOMIAL_5		= 'Polynomial_5';
-	const TREND_POLYNOMIAL_6		= 'Polynomial_6';
-	const TREND_BEST_FIT			= 'Bestfit';
-	const TREND_BEST_FIT_NO_POLY	= 'Bestfit_no_Polynomials';
-
-	/**
-	 * Names of the best-fit trend analysis methods
-	 *
-	 * @var string[]
-	 **/
-	private static $_trendTypes = array( self::TREND_LINEAR,
-										 self::TREND_LOGARITHMIC,
-										 self::TREND_EXPONENTIAL,
-										 self::TREND_POWER
-									   );
-	/**
-	 * Names of the best-fit trend polynomial orders
-	 *
-	 * @var string[]
-	 **/
-	private static $_trendTypePolyOrders = array( self::TREND_POLYNOMIAL_2,
-												  self::TREND_POLYNOMIAL_3,
-												  self::TREND_POLYNOMIAL_4,
-												  self::TREND_POLYNOMIAL_5,
-												  self::TREND_POLYNOMIAL_6
-											    );
-
-	/**
-	 * Cached results for each method when trying to identify which provides the best fit
-	 *
-	 * @var PHPExcel_Best_Fit[]
-	 **/
-	private static $_trendCache = array();
-
-
-	public static function calculate($trendType=self::TREND_BEST_FIT, $yValues, $xValues=array(), $const=True) {
-		//	Calculate number of points in each dataset
-		$nY = count($yValues);
-		$nX = count($xValues);
-
-		//	Define X Values if necessary
-		if ($nX == 0) {
-			$xValues = range(1,$nY);
-			$nX = $nY;
-		} elseif ($nY != $nX) {
-			//	Ensure both arrays of points are the same size
-			trigger_error("trend(): Number of elements in coordinate arrays do not match.", E_USER_ERROR);
-		}
-
-		$key = md5($trendType.$const.serialize($yValues).serialize($xValues));
-		//	Determine which trend method has been requested
-		switch ($trendType) {
-			//	Instantiate and return the class for the requested trend method
-			case self::TREND_LINEAR :
-			case self::TREND_LOGARITHMIC :
-			case self::TREND_EXPONENTIAL :
-			case self::TREND_POWER :
-				if (!isset(self::$_trendCache[$key])) {
-					$className = 'PHPExcel_'.$trendType.'_Best_Fit';
-					self::$_trendCache[$key] = new $className($yValues,$xValues,$const);
-				}
-				return self::$_trendCache[$key];
-				break;
-			case self::TREND_POLYNOMIAL_2	:
-			case self::TREND_POLYNOMIAL_3	:
-			case self::TREND_POLYNOMIAL_4	:
-			case self::TREND_POLYNOMIAL_5	:
-			case self::TREND_POLYNOMIAL_6	:
-				if (!isset(self::$_trendCache[$key])) {
-					$order = substr($trendType,-1);
-					self::$_trendCache[$key] = new PHPExcel_Polynomial_Best_Fit($order,$yValues,$xValues,$const);
-				}
-				return self::$_trendCache[$key];
-				break;
-			case self::TREND_BEST_FIT			:
-			case self::TREND_BEST_FIT_NO_POLY	:
-				//	If the request is to determine the best fit regression, then we test each trend line in turn
-				//	Start by generating an instance of each available trend method
-				foreach(self::$_trendTypes as $trendMethod) {
-					$className = 'PHPExcel_'.$trendMethod.'BestFit';
-					$bestFit[$trendMethod] = new $className($yValues,$xValues,$const);
-					$bestFitValue[$trendMethod] = $bestFit[$trendMethod]->getGoodnessOfFit();
-				}
-				if ($trendType != self::TREND_BEST_FIT_NO_POLY) {
-					foreach(self::$_trendTypePolyOrders as $trendMethod) {
-						$order = substr($trendMethod,-1);
-						$bestFit[$trendMethod] = new PHPExcel_Polynomial_Best_Fit($order,$yValues,$xValues,$const);
-						if ($bestFit[$trendMethod]->getError()) {
-							unset($bestFit[$trendMethod]);
-						} else {
-							$bestFitValue[$trendMethod] = $bestFit[$trendMethod]->getGoodnessOfFit();
-						}
-					}
-				}
-				//	Determine which of our trend lines is the best fit, and then we return the instance of that trend class
-				arsort($bestFitValue);
-				$bestFitType = key($bestFitValue);
-				return $bestFit[$bestFitType];
-				break;
-			default	:
-				return false;
-		}
-	}	//	function calculate()
-
-}	//	class trendClass
\ No newline at end of file
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style.php
deleted file mode 100644
index 9c29320eaa6..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style.php
+++ /dev/null
@@ -1,668 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Style
- *
- * @category   PHPExcel
- * @package    PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
-{
-    /**
-     * Font
-     *
-     * @var PHPExcel_Style_Font
-     */
-    protected $_font;
-
-    /**
-     * Fill
-     *
-     * @var PHPExcel_Style_Fill
-     */
-    protected $_fill;
-
-    /**
-     * Borders
-     *
-     * @var PHPExcel_Style_Borders
-     */
-    protected $_borders;
-
-    /**
-     * Alignment
-     *
-     * @var PHPExcel_Style_Alignment
-     */
-    protected $_alignment;
-
-    /**
-     * Number Format
-     *
-     * @var PHPExcel_Style_NumberFormat
-     */
-    protected $_numberFormat;
-
-    /**
-     * Conditional styles
-     *
-     * @var PHPExcel_Style_Conditional[]
-     */
-    protected $_conditionalStyles;
-
-    /**
-     * Protection
-     *
-     * @var PHPExcel_Style_Protection
-     */
-    protected $_protection;
-
-    /**
-     * Index of style in collection. Only used for real style.
-     *
-     * @var int
-     */
-    protected $_index;
-
-    /**
-     * Use Quote Prefix when displaying in cell editor. Only used for real style.
-     *
-     * @var boolean
-     */
-    protected $_quotePrefix = false;
-
-    /**
-     * Create a new PHPExcel_Style
-     *
-     * @param boolean $isSupervisor Flag indicating if this is a supervisor or not
-     * 		Leave this value at default unless you understand exactly what
-     *    its ramifications are
-     * @param boolean $isConditional Flag indicating if this is a conditional style or not
-     *   	Leave this value at default unless you understand exactly what
-     *    its ramifications are
-     */
-    public function __construct($isSupervisor = false, $isConditional = false)
-    {
-        // Supervisor?
-        $this->_isSupervisor = $isSupervisor;
-
-        // Initialise values
-        $this->_conditionalStyles	= array();
-        $this->_font              = new PHPExcel_Style_Font($isSupervisor, $isConditional);
-        $this->_fill              = new PHPExcel_Style_Fill($isSupervisor, $isConditional);
-        $this->_borders           = new PHPExcel_Style_Borders($isSupervisor, $isConditional);
-        $this->_alignment         = new PHPExcel_Style_Alignment($isSupervisor, $isConditional);
-        $this->_numberFormat      = new PHPExcel_Style_NumberFormat($isSupervisor, $isConditional);
-        $this->_protection        = new PHPExcel_Style_Protection($isSupervisor, $isConditional);
-
-        // bind parent if we are a supervisor
-        if ($isSupervisor) {
-            $this->_font->bindParent($this);
-            $this->_fill->bindParent($this);
-            $this->_borders->bindParent($this);
-            $this->_alignment->bindParent($this);
-            $this->_numberFormat->bindParent($this);
-            $this->_protection->bindParent($this);
-        }
-    }
-
-    /**
-     * Get the shared style component for the currently active cell in currently active sheet.
-     * Only used for style supervisor
-     *
-     * @return PHPExcel_Style
-     */
-    public function getSharedComponent()
-    {
-        $activeSheet = $this->getActiveSheet();
-        $selectedCell = $this->getActiveCell(); // e.g. 'A1'
-
-        if ($activeSheet->cellExists($selectedCell)) {
-            $xfIndex = $activeSheet->getCell($selectedCell)->getXfIndex();
-        } else {
-            $xfIndex = 0;
-        }
-
-        return $this->_parent->getCellXfByIndex($xfIndex);
-    }
-
-    /**
-     * Get parent. Only used for style supervisor
-     *
-     * @return PHPExcel
-     */
-    public function getParent()
-    {
-        return $this->_parent;
-    }
-
-	/**
-	 * Build style array from subcomponents
-	 *
-	 * @param array $array
-	 * @return array
-	 */
-	public function getStyleArray($array)
-	{
-		return array('quotePrefix' => $array);
-	}
-
-    /**
-     * Apply styles from array
-     *
-     * <code>
-     * $objPHPExcel->getActiveSheet()->getStyle('B2')->applyFromArray(
-     *         array(
-     *             'font'    => array(
-     *                 'name'      => 'Arial',
-     *                 'bold'      => true,
-     *                 'italic'    => false,
-     *                 'underline' => PHPExcel_Style_Font::UNDERLINE_DOUBLE,
-     *                 'strike'    => false,
-     *                 'color'     => array(
-     *                     'rgb' => '808080'
-     *                 )
-     *             ),
-     *             'borders' => array(
-     *                 'bottom'     => array(
-     *                     'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
-     *                     'color' => array(
-     *                         'rgb' => '808080'
-     *                     )
-     *                 ),
-     *                 'top'     => array(
-     *                     'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
-     *                     'color' => array(
-     *                         'rgb' => '808080'
-     *                     )
-     *                 )
-     *             ),
-     *             'quotePrefix'    => true
-     *         )
-     * );
-     * </code>
-     *
-     * @param    array    $pStyles    Array containing style information
-     * @param     boolean        $pAdvanced    Advanced mode for setting borders.
-     * @throws    PHPExcel_Exception
-     * @return PHPExcel_Style
-     */
-    public function applyFromArray($pStyles = null, $pAdvanced = true)
-    {
-        if (is_array($pStyles)) {
-            if ($this->_isSupervisor) {
-
-                $pRange = $this->getSelectedCells();
-
-                // Uppercase coordinate
-                $pRange = strtoupper($pRange);
-
-                // Is it a cell range or a single cell?
-                if (strpos($pRange, ':') === false) {
-                    $rangeA = $pRange;
-                    $rangeB = $pRange;
-                } else {
-                    list($rangeA, $rangeB) = explode(':', $pRange);
-                }
-
-                // Calculate range outer borders
-                $rangeStart = PHPExcel_Cell::coordinateFromString($rangeA);
-                $rangeEnd     = PHPExcel_Cell::coordinateFromString($rangeB);
-
-                // Translate column into index
-                $rangeStart[0]    = PHPExcel_Cell::columnIndexFromString($rangeStart[0]) - 1;
-                $rangeEnd[0]    = PHPExcel_Cell::columnIndexFromString($rangeEnd[0]) - 1;
-
-                // Make sure we can loop upwards on rows and columns
-                if ($rangeStart[0] > $rangeEnd[0] && $rangeStart[1] > $rangeEnd[1]) {
-                    $tmp = $rangeStart;
-                    $rangeStart = $rangeEnd;
-                    $rangeEnd = $tmp;
-                }
-
-                // ADVANCED MODE:
-
-                if ($pAdvanced && isset($pStyles['borders'])) {
-
-                    // 'allborders' is a shorthand property for 'outline' and 'inside' and
-                    //        it applies to components that have not been set explicitly
-                    if (isset($pStyles['borders']['allborders'])) {
-                        foreach (array('outline', 'inside') as $component) {
-                            if (!isset($pStyles['borders'][$component])) {
-                                $pStyles['borders'][$component] = $pStyles['borders']['allborders'];
-                            }
-                        }
-                        unset($pStyles['borders']['allborders']); // not needed any more
-                    }
-
-                    // 'outline' is a shorthand property for 'top', 'right', 'bottom', 'left'
-                    //        it applies to components that have not been set explicitly
-                    if (isset($pStyles['borders']['outline'])) {
-                        foreach (array('top', 'right', 'bottom', 'left') as $component) {
-                            if (!isset($pStyles['borders'][$component])) {
-                                $pStyles['borders'][$component] = $pStyles['borders']['outline'];
-                            }
-                        }
-                        unset($pStyles['borders']['outline']); // not needed any more
-                    }
-
-                    // 'inside' is a shorthand property for 'vertical' and 'horizontal'
-                    //        it applies to components that have not been set explicitly
-                    if (isset($pStyles['borders']['inside'])) {
-                        foreach (array('vertical', 'horizontal') as $component) {
-                            if (!isset($pStyles['borders'][$component])) {
-                                $pStyles['borders'][$component] = $pStyles['borders']['inside'];
-                            }
-                        }
-                        unset($pStyles['borders']['inside']); // not needed any more
-                    }
-
-                    // width and height characteristics of selection, 1, 2, or 3 (for 3 or more)
-                    $xMax = min($rangeEnd[0] - $rangeStart[0] + 1, 3);
-                    $yMax = min($rangeEnd[1] - $rangeStart[1] + 1, 3);
-
-                    // loop through up to 3 x 3 = 9 regions
-                    for ($x = 1; $x <= $xMax; ++$x) {
-                        // start column index for region
-                        $colStart = ($x == 3) ?
-                            PHPExcel_Cell::stringFromColumnIndex($rangeEnd[0])
-                                : PHPExcel_Cell::stringFromColumnIndex($rangeStart[0] + $x - 1);
-
-                        // end column index for region
-                        $colEnd = ($x == 1) ?
-                            PHPExcel_Cell::stringFromColumnIndex($rangeStart[0])
-                                : PHPExcel_Cell::stringFromColumnIndex($rangeEnd[0] - $xMax + $x);
-
-                        for ($y = 1; $y <= $yMax; ++$y) {
-
-                            // which edges are touching the region
-                            $edges = array();
-
-                            // are we at left edge
-                            if ($x == 1) {
-                                $edges[] = 'left';
-                            }
-
-                            // are we at right edge
-                            if ($x == $xMax) {
-                                $edges[] = 'right';
-                            }
-
-                            // are we at top edge?
-                            if ($y == 1) {
-                                $edges[] = 'top';
-                            }
-
-                            // are we at bottom edge?
-                            if ($y == $yMax) {
-                                $edges[] = 'bottom';
-                            }
-
-                            // start row index for region
-                            $rowStart = ($y == 3) ?
-                                $rangeEnd[1] : $rangeStart[1] + $y - 1;
-
-                            // end row index for region
-                            $rowEnd = ($y == 1) ?
-                                $rangeStart[1] : $rangeEnd[1] - $yMax + $y;
-
-                            // build range for region
-                            $range = $colStart . $rowStart . ':' . $colEnd . $rowEnd;
-
-                            // retrieve relevant style array for region
-                            $regionStyles = $pStyles;
-                            unset($regionStyles['borders']['inside']);
-
-                            // what are the inner edges of the region when looking at the selection
-                            $innerEdges = array_diff( array('top', 'right', 'bottom', 'left'), $edges );
-
-                            // inner edges that are not touching the region should take the 'inside' border properties if they have been set
-                            foreach ($innerEdges as $innerEdge) {
-                                switch ($innerEdge) {
-                                    case 'top':
-                                    case 'bottom':
-                                        // should pick up 'horizontal' border property if set
-                                        if (isset($pStyles['borders']['horizontal'])) {
-                                            $regionStyles['borders'][$innerEdge] = $pStyles['borders']['horizontal'];
-                                        } else {
-                                            unset($regionStyles['borders'][$innerEdge]);
-                                        }
-                                        break;
-                                    case 'left':
-                                    case 'right':
-                                        // should pick up 'vertical' border property if set
-                                        if (isset($pStyles['borders']['vertical'])) {
-                                            $regionStyles['borders'][$innerEdge] = $pStyles['borders']['vertical'];
-                                        } else {
-                                            unset($regionStyles['borders'][$innerEdge]);
-                                        }
-                                        break;
-                                }
-                            }
-
-                            // apply region style to region by calling applyFromArray() in simple mode
-                            $this->getActiveSheet()->getStyle($range)->applyFromArray($regionStyles, false);
-                        }
-                    }
-                    return $this;
-                }
-
-                // SIMPLE MODE:
-
-                // Selection type, inspect
-                if (preg_match('/^[A-Z]+1:[A-Z]+1048576$/', $pRange)) {
-                    $selectionType = 'COLUMN';
-                } else if (preg_match('/^A[0-9]+:XFD[0-9]+$/', $pRange)) {
-                    $selectionType = 'ROW';
-                } else {
-                    $selectionType = 'CELL';
-                }
-
-                // First loop through columns, rows, or cells to find out which styles are affected by this operation
-                switch ($selectionType) {
-                    case 'COLUMN':
-                        $oldXfIndexes = array();
-                        for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
-                            $oldXfIndexes[$this->getActiveSheet()->getColumnDimensionByColumn($col)->getXfIndex()] = true;
-                        }
-                        break;
-
-                    case 'ROW':
-                        $oldXfIndexes = array();
-                        for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
-                            if ($this->getActiveSheet()->getRowDimension($row)->getXfIndex() == null) {
-                                $oldXfIndexes[0] = true; // row without explicit style should be formatted based on default style
-                            } else {
-                                $oldXfIndexes[$this->getActiveSheet()->getRowDimension($row)->getXfIndex()] = true;
-                            }
-                        }
-                        break;
-
-                    case 'CELL':
-                        $oldXfIndexes = array();
-                        for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
-                            for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
-                                $oldXfIndexes[$this->getActiveSheet()->getCellByColumnAndRow($col, $row)->getXfIndex()] = true;
-                            }
-                        }
-                        break;
-                }
-
-                // clone each of the affected styles, apply the style array, and add the new styles to the workbook
-                $workbook = $this->getActiveSheet()->getParent();
-                foreach ($oldXfIndexes as $oldXfIndex => $dummy) {
-                    $style = $workbook->getCellXfByIndex($oldXfIndex);
-                    $newStyle = clone $style;
-                    $newStyle->applyFromArray($pStyles);
-
-                    if ($existingStyle = $workbook->getCellXfByHashCode($newStyle->getHashCode())) {
-                        // there is already such cell Xf in our collection
-                        $newXfIndexes[$oldXfIndex] = $existingStyle->getIndex();
-                    } else {
-                        // we don't have such a cell Xf, need to add
-                        $workbook->addCellXf($newStyle);
-                        $newXfIndexes[$oldXfIndex] = $newStyle->getIndex();
-                    }
-                }
-
-                // Loop through columns, rows, or cells again and update the XF index
-                switch ($selectionType) {
-                    case 'COLUMN':
-                        for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
-                            $columnDimension = $this->getActiveSheet()->getColumnDimensionByColumn($col);
-                            $oldXfIndex = $columnDimension->getXfIndex();
-                            $columnDimension->setXfIndex($newXfIndexes[$oldXfIndex]);
-                        }
-                        break;
-
-                    case 'ROW':
-                        for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
-                            $rowDimension = $this->getActiveSheet()->getRowDimension($row);
-                            $oldXfIndex = $rowDimension->getXfIndex() === null ?
-                                0 : $rowDimension->getXfIndex(); // row without explicit style should be formatted based on default style
-                            $rowDimension->setXfIndex($newXfIndexes[$oldXfIndex]);
-                        }
-                        break;
-
-                    case 'CELL':
-                        for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
-                            for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
-                                $cell = $this->getActiveSheet()->getCellByColumnAndRow($col, $row);
-                                $oldXfIndex = $cell->getXfIndex();
-                                $cell->setXfIndex($newXfIndexes[$oldXfIndex]);
-                            }
-                        }
-                        break;
-                }
-
-            } else {
-                // not a supervisor, just apply the style array directly on style object
-                if (array_key_exists('fill', $pStyles)) {
-                    $this->getFill()->applyFromArray($pStyles['fill']);
-                }
-                if (array_key_exists('font', $pStyles)) {
-                    $this->getFont()->applyFromArray($pStyles['font']);
-                }
-                if (array_key_exists('borders', $pStyles)) {
-                    $this->getBorders()->applyFromArray($pStyles['borders']);
-                }
-                if (array_key_exists('alignment', $pStyles)) {
-                    $this->getAlignment()->applyFromArray($pStyles['alignment']);
-                }
-                if (array_key_exists('numberformat', $pStyles)) {
-                    $this->getNumberFormat()->applyFromArray($pStyles['numberformat']);
-                }
-                if (array_key_exists('protection', $pStyles)) {
-                    $this->getProtection()->applyFromArray($pStyles['protection']);
-                }
-                if (array_key_exists('quotePrefix', $pStyles)) {
-                    $this->_quotePrefix = $pStyles['quotePrefix'];
-                }
-            }
-        } else {
-            throw new PHPExcel_Exception("Invalid style array passed.");
-        }
-        return $this;
-    }
-
-    /**
-     * Get Fill
-     *
-     * @return PHPExcel_Style_Fill
-     */
-    public function getFill()
-    {
-        return $this->_fill;
-    }
-
-    /**
-     * Get Font
-     *
-     * @return PHPExcel_Style_Font
-     */
-    public function getFont()
-    {
-        return $this->_font;
-    }
-
-    /**
-     * Set font
-     *
-     * @param PHPExcel_Style_Font $font
-     * @return PHPExcel_Style
-     */
-    public function setFont(PHPExcel_Style_Font $font)
-    {
-        $this->_font = $font;
-        return $this;
-    }
-
-    /**
-     * Get Borders
-     *
-     * @return PHPExcel_Style_Borders
-     */
-    public function getBorders()
-    {
-        return $this->_borders;
-    }
-
-    /**
-     * Get Alignment
-     *
-     * @return PHPExcel_Style_Alignment
-     */
-    public function getAlignment()
-    {
-        return $this->_alignment;
-    }
-
-    /**
-     * Get Number Format
-     *
-     * @return PHPExcel_Style_NumberFormat
-     */
-    public function getNumberFormat()
-    {
-        return $this->_numberFormat;
-    }
-
-    /**
-     * Get Conditional Styles. Only used on supervisor.
-     *
-     * @return PHPExcel_Style_Conditional[]
-     */
-    public function getConditionalStyles()
-    {
-        return $this->getActiveSheet()->getConditionalStyles($this->getActiveCell());
-    }
-
-    /**
-     * Set Conditional Styles. Only used on supervisor.
-     *
-     * @param PHPExcel_Style_Conditional[] $pValue Array of condtional styles
-     * @return PHPExcel_Style
-     */
-    public function setConditionalStyles($pValue = null)
-    {
-        if (is_array($pValue)) {
-            $this->getActiveSheet()->setConditionalStyles($this->getSelectedCells(), $pValue);
-        }
-        return $this;
-    }
-
-    /**
-     * Get Protection
-     *
-     * @return PHPExcel_Style_Protection
-     */
-    public function getProtection()
-    {
-        return $this->_protection;
-    }
-
-    /**
-     * Get quote prefix
-     *
-     * @return boolean
-     */
-    public function getQuotePrefix()
-    {
-        if ($this->_isSupervisor) {
-            return $this->getSharedComponent()->getQuotePrefix();
-        }
-        return $this->_quotePrefix;
-    }
-
-    /**
-     * Set quote prefix
-     *
-     * @param boolean $pValue
-     */
-    public function setQuotePrefix($pValue)
-    {
-        if ($pValue == '') {
-            $pValue = false;
-        }
-        if ($this->_isSupervisor) {
-            $styleArray = array('quotePrefix' => $pValue);
-            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-        } else {
-            $this->_quotePrefix = (boolean) $pValue;
-        }
-        return $this;
-    }
-
-    /**
-     * Get hash code
-     *
-     * @return string Hash code
-     */
-    public function getHashCode()
-    {
-        $hashConditionals = '';
-        foreach ($this->_conditionalStyles as $conditional) {
-            $hashConditionals .= $conditional->getHashCode();
-        }
-
-        return md5(
-              $this->_fill->getHashCode()
-            . $this->_font->getHashCode()
-            . $this->_borders->getHashCode()
-            . $this->_alignment->getHashCode()
-            . $this->_numberFormat->getHashCode()
-            . $hashConditionals
-            . $this->_protection->getHashCode()
-            . ($this->_quotePrefix  ? 't' : 'f')
-            . __CLASS__
-        );
-    }
-
-    /**
-     * Get own index in style collection
-     *
-     * @return int
-     */
-    public function getIndex()
-    {
-        return $this->_index;
-    }
-
-    /**
-     * Set own index in style collection
-     *
-     * @param int $pValue
-     */
-    public function setIndex($pValue)
-    {
-        $this->_index = $pValue;
-    }
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Alignment.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Alignment.php
deleted file mode 100644
index 00825debf2c..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Alignment.php
+++ /dev/null
@@ -1,459 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Style_Alignment
- *
- * @category   PHPExcel
- * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Style_Alignment extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
-{
-	/* Horizontal alignment styles */
-	const HORIZONTAL_GENERAL			= 'general';
-	const HORIZONTAL_LEFT				= 'left';
-	const HORIZONTAL_RIGHT				= 'right';
-	const HORIZONTAL_CENTER				= 'center';
-	const HORIZONTAL_CENTER_CONTINUOUS	= 'centerContinuous';
-	const HORIZONTAL_JUSTIFY			= 'justify';
-	const HORIZONTAL_FILL				= 'fill';
-	const HORIZONTAL_DISTRIBUTED		= 'distributed';        // Excel2007 only
-
-	/* Vertical alignment styles */
-	const VERTICAL_BOTTOM				= 'bottom';
-	const VERTICAL_TOP					= 'top';
-	const VERTICAL_CENTER				= 'center';
-	const VERTICAL_JUSTIFY				= 'justify';
-	const VERTICAL_DISTRIBUTED		    = 'distributed';        // Excel2007 only
-
-	/* Read order */
-	const READORDER_CONTEXT				= 0;
-	const READORDER_LTR	    			= 1;
-	const READORDER_RTL  				= 2;
-
-	/**
-	 * Horizontal alignment
-	 *
-	 * @var string
-	 */
-	protected $_horizontal = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
-
-	/**
-	 * Vertical alignment
-	 *
-	 * @var string
-	 */
-	protected $_vertical = PHPExcel_Style_Alignment::VERTICAL_BOTTOM;
-
-	/**
-	 * Text rotation
-	 *
-	 * @var integer
-	 */
-	protected $_textRotation = 0;
-
-	/**
-	 * Wrap text
-	 *
-	 * @var boolean
-	 */
-	protected $_wrapText = FALSE;
-
-	/**
-	 * Shrink to fit
-	 *
-	 * @var boolean
-	 */
-	protected $_shrinkToFit	= FALSE;
-
-	/**
-	 * Indent - only possible with horizontal alignment left and right
-	 *
-	 * @var integer
-	 */
-	protected $_indent = 0;
-
-	/**
-	 * Read order
-	 *
-	 * @var integer
-	 */
-	protected $_readorder = 0;
-
-	/**
-	 * Create a new PHPExcel_Style_Alignment
-	 *
-	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 * @param	boolean	$isConditional	Flag indicating if this is a conditional style or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 */
-	public function __construct($isSupervisor = FALSE, $isConditional = FALSE)
-	{
-		// Supervisor?
-		parent::__construct($isSupervisor);
-
-		if ($isConditional) {
-			$this->_horizontal		= NULL;
-			$this->_vertical		= NULL;
-			$this->_textRotation	= NULL;
-		}
-	}
-
-	/**
-	 * Get the shared style component for the currently active cell in currently active sheet.
-	 * Only used for style supervisor
-	 *
-	 * @return PHPExcel_Style_Alignment
-	 */
-	public function getSharedComponent()
-	{
-		return $this->_parent->getSharedComponent()->getAlignment();
-	}
-
-	/**
-	 * Build style array from subcomponents
-	 *
-	 * @param array $array
-	 * @return array
-	 */
-	public function getStyleArray($array)
-	{
-		return array('alignment' => $array);
-	}
-
-	/**
-	 * Apply styles from array
-	 *
-	 * <code>
-	 * $objPHPExcel->getActiveSheet()->getStyle('B2')->getAlignment()->applyFromArray(
-	 *		array(
-	 *			'horizontal' => PHPExcel_Style_Alignment::HORIZONTAL_CENTER,
-	 *			'vertical'   => PHPExcel_Style_Alignment::VERTICAL_CENTER,
-	 *			'rotation'   => 0,
-	 *			'wrap'			=> TRUE
-	 *		)
-	 * );
-	 * </code>
-	 *
-	 * @param	array	$pStyles	Array containing style information
-	 * @throws	PHPExcel_Exception
-	 * @return PHPExcel_Style_Alignment
-	 */
-	public function applyFromArray($pStyles = NULL) {
-		if (is_array($pStyles)) {
-			if ($this->_isSupervisor) {
-				$this->getActiveSheet()->getStyle($this->getSelectedCells())
-				    ->applyFromArray($this->getStyleArray($pStyles));
-			} else {
-				if (isset($pStyles['horizontal'])) {
-					$this->setHorizontal($pStyles['horizontal']);
-				}
-				if (isset($pStyles['vertical'])) {
-					$this->setVertical($pStyles['vertical']);
-				}
-				if (isset($pStyles['rotation'])) {
-					$this->setTextRotation($pStyles['rotation']);
-				}
-				if (isset($pStyles['wrap'])) {
-					$this->setWrapText($pStyles['wrap']);
-				}
-				if (isset($pStyles['shrinkToFit'])) {
-					$this->setShrinkToFit($pStyles['shrinkToFit']);
-				}
-				if (isset($pStyles['indent'])) {
-					$this->setIndent($pStyles['indent']);
-				}
-				if (isset($pStyles['readorder'])) {
-					$this->setReadorder($pStyles['readorder']);
-				}
-			}
-		} else {
-			throw new PHPExcel_Exception("Invalid style array passed.");
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Horizontal
-	 *
-	 * @return string
-	 */
-	public function getHorizontal() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getHorizontal();
-		}
-		return $this->_horizontal;
-	}
-
-	/**
-	 * Set Horizontal
-	 *
-	 * @param string $pValue
-	 * @return PHPExcel_Style_Alignment
-	 */
-	public function setHorizontal($pValue = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL) {
-		if ($pValue == '') {
-			$pValue = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
-		}
-
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('horizontal' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		}
-		else {
-			$this->_horizontal = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Vertical
-	 *
-	 * @return string
-	 */
-	public function getVertical() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getVertical();
-		}
-		return $this->_vertical;
-	}
-
-	/**
-	 * Set Vertical
-	 *
-	 * @param string $pValue
-	 * @return PHPExcel_Style_Alignment
-	 */
-	public function setVertical($pValue = PHPExcel_Style_Alignment::VERTICAL_BOTTOM) {
-		if ($pValue == '') {
-			$pValue = PHPExcel_Style_Alignment::VERTICAL_BOTTOM;
-		}
-
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('vertical' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_vertical = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get TextRotation
-	 *
-	 * @return int
-	 */
-	public function getTextRotation() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getTextRotation();
-		}
-		return $this->_textRotation;
-	}
-
-	/**
-	 * Set TextRotation
-	 *
-	 * @param int $pValue
-	 * @throws PHPExcel_Exception
-	 * @return PHPExcel_Style_Alignment
-	 */
-	public function setTextRotation($pValue = 0) {
-		// Excel2007 value 255 => PHPExcel value -165
-		if ($pValue == 255) {
-			$pValue = -165;
-		}
-
-		// Set rotation
-		if ( ($pValue >= -90 && $pValue <= 90) || $pValue == -165 ) {
-			if ($this->_isSupervisor) {
-				$styleArray = $this->getStyleArray(array('rotation' => $pValue));
-				$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-			} else {
-				$this->_textRotation = $pValue;
-			}
-		} else {
-			throw new PHPExcel_Exception("Text rotation should be a value between -90 and 90.");
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Get Wrap Text
-	 *
-	 * @return boolean
-	 */
-	public function getWrapText() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getWrapText();
-		}
-		return $this->_wrapText;
-	}
-
-	/**
-	 * Set Wrap Text
-	 *
-	 * @param boolean $pValue
-	 * @return PHPExcel_Style_Alignment
-	 */
-	public function setWrapText($pValue = FALSE) {
-		if ($pValue == '') {
-			$pValue = FALSE;
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('wrap' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_wrapText = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Shrink to fit
-	 *
-	 * @return boolean
-	 */
-	public function getShrinkToFit() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getShrinkToFit();
-		}
-		return $this->_shrinkToFit;
-	}
-
-	/**
-	 * Set Shrink to fit
-	 *
-	 * @param boolean $pValue
-	 * @return PHPExcel_Style_Alignment
-	 */
-	public function setShrinkToFit($pValue = FALSE) {
-		if ($pValue == '') {
-			$pValue = FALSE;
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('shrinkToFit' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_shrinkToFit = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get indent
-	 *
-	 * @return int
-	 */
-	public function getIndent() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getIndent();
-		}
-		return $this->_indent;
-	}
-
-	/**
-	 * Set indent
-	 *
-	 * @param int $pValue
-	 * @return PHPExcel_Style_Alignment
-	 */
-	public function setIndent($pValue = 0) {
-		if ($pValue > 0) {
-			if ($this->getHorizontal() != self::HORIZONTAL_GENERAL &&
-				$this->getHorizontal() != self::HORIZONTAL_LEFT &&
-				$this->getHorizontal() != self::HORIZONTAL_RIGHT) {
-				$pValue = 0; // indent not supported
-			}
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('indent' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_indent = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get read order
-	 *
-	 * @return integer
-	 */
-	public function getReadorder() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getReadorder();
-		}
-		return $this->_readorder;
-	}
-
-	/**
-	 * Set read order
-	 *
-	 * @param int $pValue
-	 * @return PHPExcel_Style_Alignment
-	 */
-	public function setReadorder($pValue = 0) {
-		if ($pValue < 0 || $pValue > 2) {
-            $pValue = 0;
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('readorder' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_readorder = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getHashCode();
-		}
-		return md5(
-			  $this->_horizontal
-			. $this->_vertical
-			. $this->_textRotation
-			. ($this->_wrapText ? 't' : 'f')
-			. ($this->_shrinkToFit ? 't' : 'f')
-			. $this->_indent
-			. $this->_readorder
-			. __CLASS__
-		);
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Border.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Border.php
deleted file mode 100644
index ec737bf0f14..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Border.php
+++ /dev/null
@@ -1,294 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Style_Border
- *
- * @category   PHPExcel
- * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Style_Border extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
-{
-	/* Border style */
-	const BORDER_NONE				= 'none';
-	const BORDER_DASHDOT			= 'dashDot';
-	const BORDER_DASHDOTDOT			= 'dashDotDot';
-	const BORDER_DASHED				= 'dashed';
-	const BORDER_DOTTED				= 'dotted';
-	const BORDER_DOUBLE				= 'double';
-	const BORDER_HAIR				= 'hair';
-	const BORDER_MEDIUM				= 'medium';
-	const BORDER_MEDIUMDASHDOT		= 'mediumDashDot';
-	const BORDER_MEDIUMDASHDOTDOT	= 'mediumDashDotDot';
-	const BORDER_MEDIUMDASHED		= 'mediumDashed';
-	const BORDER_SLANTDASHDOT		= 'slantDashDot';
-	const BORDER_THICK				= 'thick';
-	const BORDER_THIN				= 'thin';
-
-	/**
-	 * Border style
-	 *
-	 * @var string
-	 */
-	protected $_borderStyle	= PHPExcel_Style_Border::BORDER_NONE;
-
-	/**
-	 * Border color
-	 *
-	 * @var PHPExcel_Style_Color
-	 */
-	protected $_color;
-
-	/**
-	 * Parent property name
-	 *
-	 * @var string
-	 */
-	protected $_parentPropertyName;
-
-	/**
-	 * Create a new PHPExcel_Style_Border
-	 *
-	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 * @param	boolean	$isConditional	Flag indicating if this is a conditional style or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 */
-	public function __construct($isSupervisor = FALSE, $isConditional = FALSE)
-	{
-		// Supervisor?
-		parent::__construct($isSupervisor);
-
-		// Initialise values
-		$this->_color	= new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor);
-
-		// bind parent if we are a supervisor
-		if ($isSupervisor) {
-			$this->_color->bindParent($this, '_color');
-		}
-	}
-
-	/**
-	 * Bind parent. Only used for supervisor
-	 *
-	 * @param PHPExcel_Style_Borders $parent
-	 * @param string $parentPropertyName
-	 * @return PHPExcel_Style_Border
-	 */
-	public function bindParent($parent, $parentPropertyName=NULL)
-	{
-		$this->_parent = $parent;
-		$this->_parentPropertyName = $parentPropertyName;
-		return $this;
-	}
-
-	/**
-	 * Get the shared style component for the currently active cell in currently active sheet.
-	 * Only used for style supervisor
-	 *
-	 * @return PHPExcel_Style_Border
-	 * @throws PHPExcel_Exception
-	 */
-	public function getSharedComponent()
-	{
-		switch ($this->_parentPropertyName) {
-			case '_allBorders':
-			case '_horizontal':
-			case '_inside':
-			case '_outline':
-			case '_vertical':
-				throw new PHPExcel_Exception('Cannot get shared component for a pseudo-border.');
-				break;
-			case '_bottom':
-				return $this->_parent->getSharedComponent()->getBottom();		break;
-			case '_diagonal':
-				return $this->_parent->getSharedComponent()->getDiagonal();		break;
-			case '_left':
-				return $this->_parent->getSharedComponent()->getLeft();			break;
-			case '_right':
-				return $this->_parent->getSharedComponent()->getRight();		break;
-			case '_top':
-				return $this->_parent->getSharedComponent()->getTop();			break;
-
-		}
-	}
-
-	/**
-	 * Build style array from subcomponents
-	 *
-	 * @param array $array
-	 * @return array
-	 */
-	public function getStyleArray($array)
-	{
-		switch ($this->_parentPropertyName) {
-		case '_allBorders':
-				$key = 'allborders';	break;
-		case '_bottom':
-				$key = 'bottom';		break;
-		case '_diagonal':
-				$key = 'diagonal';		break;
-		case '_horizontal':
-				$key = 'horizontal';	break;
-		case '_inside':
-				$key = 'inside';		break;
-		case '_left':
-				$key = 'left';			break;
-		case '_outline':
-				$key = 'outline';		break;
-		case '_right':
-				$key = 'right';			break;
-		case '_top':
-				$key = 'top';			break;
-		case '_vertical':
-				$key = 'vertical';		break;
-		}
-		return $this->_parent->getStyleArray(array($key => $array));
-	}
-
-	/**
-	 * Apply styles from array
-	 *
-	 * <code>
-	 * $objPHPExcel->getActiveSheet()->getStyle('B2')->getBorders()->getTop()->applyFromArray(
-	 *		array(
-	 *			'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
-	 *			'color' => array(
-	 *				'rgb' => '808080'
-	 *			)
-	 *		)
-	 * );
-	 * </code>
-	 *
-	 * @param	array	$pStyles	Array containing style information
-	 * @throws	PHPExcel_Exception
-	 * @return PHPExcel_Style_Border
-	 */
-	public function applyFromArray($pStyles = null) {
-		if (is_array($pStyles)) {
-			if ($this->_isSupervisor) {
-				$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
-			} else {
-				if (isset($pStyles['style'])) {
-					$this->setBorderStyle($pStyles['style']);
-				}
-				if (isset($pStyles['color'])) {
-					$this->getColor()->applyFromArray($pStyles['color']);
-				}
-			}
-		} else {
-			throw new PHPExcel_Exception("Invalid style array passed.");
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Border style
-	 *
-	 * @return string
-	 */
-	public function getBorderStyle() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getBorderStyle();
-		}
-		return $this->_borderStyle;
-	}
-
-	/**
-	 * Set Border style
-	 *
-	 * @param string|boolean	$pValue
-	 *							When passing a boolean, FALSE equates PHPExcel_Style_Border::BORDER_NONE
-	 *								and TRUE to PHPExcel_Style_Border::BORDER_MEDIUM
-	 * @return PHPExcel_Style_Border
-	 */
-	public function setBorderStyle($pValue = PHPExcel_Style_Border::BORDER_NONE) {
-
-		if (empty($pValue)) {
-			$pValue = PHPExcel_Style_Border::BORDER_NONE;
-		} elseif(is_bool($pValue) && $pValue) {
-			$pValue = PHPExcel_Style_Border::BORDER_MEDIUM;
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('style' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_borderStyle = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Border Color
-	 *
-	 * @return PHPExcel_Style_Color
-	 */
-	public function getColor() {
-		return $this->_color;
-	}
-
-	/**
-	 * Set Border Color
-	 *
-	 * @param	PHPExcel_Style_Color $pValue
-	 * @throws	PHPExcel_Exception
-	 * @return PHPExcel_Style_Border
-	 */
-	public function setColor(PHPExcel_Style_Color $pValue = null) {
-		// make sure parameter is a real color and not a supervisor
-		$color = $pValue->getIsSupervisor() ? $pValue->getSharedComponent() : $pValue;
-
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getColor()->getStyleArray(array('argb' => $color->getARGB()));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_color = $color;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getHashCode();
-		}
-		return md5(
-			  $this->_borderStyle
-			. $this->_color->getHashCode()
-			. __CLASS__
-		);
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Borders.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Borders.php
deleted file mode 100644
index 21dcfeeefdb..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Borders.php
+++ /dev/null
@@ -1,424 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Style_Borders
- *
- * @category   PHPExcel
- * @package    PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Style_Borders extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
-{
-	/* Diagonal directions */
-	const DIAGONAL_NONE		= 0;
-	const DIAGONAL_UP		= 1;
-	const DIAGONAL_DOWN		= 2;
-	const DIAGONAL_BOTH		= 3;
-
-	/**
-	 * Left
-	 *
-	 * @var PHPExcel_Style_Border
-	 */
-	protected $_left;
-
-	/**
-	 * Right
-	 *
-	 * @var PHPExcel_Style_Border
-	 */
-	protected $_right;
-
-	/**
-	 * Top
-	 *
-	 * @var PHPExcel_Style_Border
-	 */
-	protected $_top;
-
-	/**
-	 * Bottom
-	 *
-	 * @var PHPExcel_Style_Border
-	 */
-	protected $_bottom;
-
-	/**
-	 * Diagonal
-	 *
-	 * @var PHPExcel_Style_Border
-	 */
-	protected $_diagonal;
-
-	/**
-	 * DiagonalDirection
-	 *
-	 * @var int
-	 */
-	protected $_diagonalDirection;
-
-	/**
-	 * All borders psedo-border. Only applies to supervisor.
-	 *
-	 * @var PHPExcel_Style_Border
-	 */
-	protected $_allBorders;
-
-	/**
-	 * Outline psedo-border. Only applies to supervisor.
-	 *
-	 * @var PHPExcel_Style_Border
-	 */
-	protected $_outline;
-
-	/**
-	 * Inside psedo-border. Only applies to supervisor.
-	 *
-	 * @var PHPExcel_Style_Border
-	 */
-	protected $_inside;
-
-	/**
-	 * Vertical pseudo-border. Only applies to supervisor.
-	 *
-	 * @var PHPExcel_Style_Border
-	 */
-	protected $_vertical;
-
-	/**
-	 * Horizontal pseudo-border. Only applies to supervisor.
-	 *
-	 * @var PHPExcel_Style_Border
-	 */
-	protected $_horizontal;
-
-	/**
-     * Create a new PHPExcel_Style_Borders
-	 *
-	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 * @param	boolean	$isConditional	Flag indicating if this is a conditional style or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-     */
-    public function __construct($isSupervisor = FALSE, $isConditional = FALSE)
-    {
-    	// Supervisor?
-		parent::__construct($isSupervisor);
-
-    	// Initialise values
-    	$this->_left				= new PHPExcel_Style_Border($isSupervisor, $isConditional);
-    	$this->_right				= new PHPExcel_Style_Border($isSupervisor, $isConditional);
-    	$this->_top					= new PHPExcel_Style_Border($isSupervisor, $isConditional);
-    	$this->_bottom				= new PHPExcel_Style_Border($isSupervisor, $isConditional);
-    	$this->_diagonal			= new PHPExcel_Style_Border($isSupervisor, $isConditional);
-		$this->_diagonalDirection	= PHPExcel_Style_Borders::DIAGONAL_NONE;
-
-		// Specially for supervisor
-		if ($isSupervisor) {
-			// Initialize pseudo-borders
-			$this->_allBorders			= new PHPExcel_Style_Border(TRUE);
-			$this->_outline				= new PHPExcel_Style_Border(TRUE);
-			$this->_inside				= new PHPExcel_Style_Border(TRUE);
-			$this->_vertical			= new PHPExcel_Style_Border(TRUE);
-			$this->_horizontal			= new PHPExcel_Style_Border(TRUE);
-
-			// bind parent if we are a supervisor
-			$this->_left->bindParent($this, '_left');
-			$this->_right->bindParent($this, '_right');
-			$this->_top->bindParent($this, '_top');
-			$this->_bottom->bindParent($this, '_bottom');
-			$this->_diagonal->bindParent($this, '_diagonal');
-			$this->_allBorders->bindParent($this, '_allBorders');
-			$this->_outline->bindParent($this, '_outline');
-			$this->_inside->bindParent($this, '_inside');
-			$this->_vertical->bindParent($this, '_vertical');
-			$this->_horizontal->bindParent($this, '_horizontal');
-		}
-    }
-
-	/**
-	 * Get the shared style component for the currently active cell in currently active sheet.
-	 * Only used for style supervisor
-	 *
-	 * @return PHPExcel_Style_Borders
-	 */
-	public function getSharedComponent()
-	{
-		return $this->_parent->getSharedComponent()->getBorders();
-	}
-
-	/**
-	 * Build style array from subcomponents
-	 *
-	 * @param array $array
-	 * @return array
-	 */
-	public function getStyleArray($array)
-	{
-		return array('borders' => $array);
-	}
-
-	/**
-     * Apply styles from array
-     *
-     * <code>
-     * $objPHPExcel->getActiveSheet()->getStyle('B2')->getBorders()->applyFromArray(
-     * 		array(
-     * 			'bottom'     => array(
-     * 				'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
-     * 				'color' => array(
-     * 					'rgb' => '808080'
-     * 				)
-     * 			),
-     * 			'top'     => array(
-     * 				'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
-     * 				'color' => array(
-     * 					'rgb' => '808080'
-     * 				)
-     * 			)
-     * 		)
-     * );
-     * </code>
-     * <code>
-     * $objPHPExcel->getActiveSheet()->getStyle('B2')->getBorders()->applyFromArray(
-     * 		array(
-     * 			'allborders' => array(
-     * 				'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
-     * 				'color' => array(
-     * 					'rgb' => '808080'
-     * 				)
-     * 			)
-     * 		)
-     * );
-     * </code>
-     *
-     * @param	array	$pStyles	Array containing style information
-     * @throws	PHPExcel_Exception
-     * @return PHPExcel_Style_Borders
-     */
-	public function applyFromArray($pStyles = null) {
-		if (is_array($pStyles)) {
-			if ($this->_isSupervisor) {
-				$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
-			} else {
-				if (array_key_exists('left', $pStyles)) {
-					$this->getLeft()->applyFromArray($pStyles['left']);
-				}
-				if (array_key_exists('right', $pStyles)) {
-					$this->getRight()->applyFromArray($pStyles['right']);
-				}
-				if (array_key_exists('top', $pStyles)) {
-					$this->getTop()->applyFromArray($pStyles['top']);
-				}
-				if (array_key_exists('bottom', $pStyles)) {
-					$this->getBottom()->applyFromArray($pStyles['bottom']);
-				}
-				if (array_key_exists('diagonal', $pStyles)) {
-					$this->getDiagonal()->applyFromArray($pStyles['diagonal']);
-				}
-				if (array_key_exists('diagonaldirection', $pStyles)) {
-					$this->setDiagonalDirection($pStyles['diagonaldirection']);
-				}
-				if (array_key_exists('allborders', $pStyles)) {
-					$this->getLeft()->applyFromArray($pStyles['allborders']);
-					$this->getRight()->applyFromArray($pStyles['allborders']);
-					$this->getTop()->applyFromArray($pStyles['allborders']);
-					$this->getBottom()->applyFromArray($pStyles['allborders']);
-				}
-			}
-		} else {
-			throw new PHPExcel_Exception("Invalid style array passed.");
-		}
-		return $this;
-	}
-
-    /**
-     * Get Left
-     *
-     * @return PHPExcel_Style_Border
-     */
-    public function getLeft() {
-		return $this->_left;
-    }
-
-    /**
-     * Get Right
-     *
-     * @return PHPExcel_Style_Border
-     */
-    public function getRight() {
-		return $this->_right;
-    }
-
-    /**
-     * Get Top
-     *
-     * @return PHPExcel_Style_Border
-     */
-    public function getTop() {
-		return $this->_top;
-    }
-
-    /**
-     * Get Bottom
-     *
-     * @return PHPExcel_Style_Border
-     */
-    public function getBottom() {
-		return $this->_bottom;
-    }
-
-    /**
-     * Get Diagonal
-     *
-     * @return PHPExcel_Style_Border
-     */
-    public function getDiagonal() {
-		return $this->_diagonal;
-    }
-
-    /**
-     * Get AllBorders (pseudo-border). Only applies to supervisor.
-     *
-     * @return PHPExcel_Style_Border
-     * @throws PHPExcel_Exception
-     */
-    public function getAllBorders() {
-		if (!$this->_isSupervisor) {
-			throw new PHPExcel_Exception('Can only get pseudo-border for supervisor.');
-		}
-		return $this->_allBorders;
-    }
-
-    /**
-     * Get Outline (pseudo-border). Only applies to supervisor.
-     *
-     * @return boolean
-     * @throws PHPExcel_Exception
-     */
-    public function getOutline() {
-		if (!$this->_isSupervisor) {
-			throw new PHPExcel_Exception('Can only get pseudo-border for supervisor.');
-		}
-    	return $this->_outline;
-    }
-
-    /**
-     * Get Inside (pseudo-border). Only applies to supervisor.
-     *
-     * @return boolean
-     * @throws PHPExcel_Exception
-     */
-    public function getInside() {
-		if (!$this->_isSupervisor) {
-			throw new PHPExcel_Exception('Can only get pseudo-border for supervisor.');
-		}
-    	return $this->_inside;
-    }
-
-    /**
-     * Get Vertical (pseudo-border). Only applies to supervisor.
-     *
-     * @return PHPExcel_Style_Border
-     * @throws PHPExcel_Exception
-     */
-    public function getVertical() {
-		if (!$this->_isSupervisor) {
-			throw new PHPExcel_Exception('Can only get pseudo-border for supervisor.');
-		}
-		return $this->_vertical;
-    }
-
-    /**
-     * Get Horizontal (pseudo-border). Only applies to supervisor.
-     *
-     * @return PHPExcel_Style_Border
-     * @throws PHPExcel_Exception
-     */
-    public function getHorizontal() {
-		if (!$this->_isSupervisor) {
-			throw new PHPExcel_Exception('Can only get pseudo-border for supervisor.');
-		}
-		return $this->_horizontal;
-    }
-
-    /**
-     * Get DiagonalDirection
-     *
-     * @return int
-     */
-    public function getDiagonalDirection() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getDiagonalDirection();
-		}
-    	return $this->_diagonalDirection;
-    }
-
-    /**
-     * Set DiagonalDirection
-     *
-     * @param int $pValue
-     * @return PHPExcel_Style_Borders
-     */
-    public function setDiagonalDirection($pValue = PHPExcel_Style_Borders::DIAGONAL_NONE) {
-        if ($pValue == '') {
-    		$pValue = PHPExcel_Style_Borders::DIAGONAL_NONE;
-    	}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('diagonaldirection' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_diagonalDirection = $pValue;
-		}
-		return $this;
-    }
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getHashcode();
-		}
-    	return md5(
-    		  $this->getLeft()->getHashCode()
-    		. $this->getRight()->getHashCode()
-    		. $this->getTop()->getHashCode()
-    		. $this->getBottom()->getHashCode()
-    		. $this->getDiagonal()->getHashCode()
-    		. $this->getDiagonalDirection()
-    		. __CLASS__
-    	);
-    }
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Color.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Color.php
deleted file mode 100644
index a56c9a6338b..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Color.php
+++ /dev/null
@@ -1,429 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Style
- * @copyright Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Style_Color
- *
- * @category   PHPExcel
- * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Style_Color extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
-{
-	/* Colors */
-	const COLOR_BLACK						= 'FF000000';
-	const COLOR_WHITE						= 'FFFFFFFF';
-	const COLOR_RED							= 'FFFF0000';
-	const COLOR_DARKRED						= 'FF800000';
-	const COLOR_BLUE						= 'FF0000FF';
-	const COLOR_DARKBLUE					= 'FF000080';
-	const COLOR_GREEN						= 'FF00FF00';
-	const COLOR_DARKGREEN					= 'FF008000';
-	const COLOR_YELLOW						= 'FFFFFF00';
-	const COLOR_DARKYELLOW					= 'FF808000';
-
-	/**
-	 * Indexed colors array
-	 *
-	 * @var array
-	 */
-	protected static $_indexedColors;
-
-	/**
-	 * ARGB - Alpha RGB
-	 *
-	 * @var string
-	 */
-	protected $_argb	= NULL;
-
-	/**
-	 * Parent property name
-	 *
-	 * @var string
-	 */
-	protected $_parentPropertyName;
-
-
-	/**
-	 * Create a new PHPExcel_Style_Color
-	 *
-	 * @param	string	$pARGB			ARGB value for the colour
-	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 * @param	boolean	$isConditional	Flag indicating if this is a conditional style or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 */
-	public function __construct($pARGB = PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor = FALSE, $isConditional = FALSE)
-	{
-		//	Supervisor?
-		parent::__construct($isSupervisor);
-
-		//	Initialise values
-		if (!$isConditional) {
-			$this->_argb = $pARGB;
-		}
-	}
-
-	/**
-	 * Bind parent. Only used for supervisor
-	 *
-	 * @param mixed $parent
-	 * @param string $parentPropertyName
-	 * @return PHPExcel_Style_Color
-	 */
-	public function bindParent($parent, $parentPropertyName=NULL)
-	{
-		$this->_parent = $parent;
-		$this->_parentPropertyName = $parentPropertyName;
-		return $this;
-	}
-
-	/**
-	 * Get the shared style component for the currently active cell in currently active sheet.
-	 * Only used for style supervisor
-	 *
-	 * @return PHPExcel_Style_Color
-	 */
-	public function getSharedComponent()
-	{
-		switch ($this->_parentPropertyName) {
-			case '_endColor':
-				return $this->_parent->getSharedComponent()->getEndColor();		break;
-			case '_color':
-				return $this->_parent->getSharedComponent()->getColor();		break;
-			case '_startColor':
-				return $this->_parent->getSharedComponent()->getStartColor();	break;
-		}
-	}
-
-	/**
-	 * Build style array from subcomponents
-	 *
-	 * @param array $array
-	 * @return array
-	 */
-	public function getStyleArray($array)
-	{
-		switch ($this->_parentPropertyName) {
-			case '_endColor':
-				$key = 'endcolor';
-				break;
-			case '_color':
-				$key = 'color';
-				break;
-			case '_startColor':
-				$key = 'startcolor';
-				break;
-
-		}
-		return $this->_parent->getStyleArray(array($key => $array));
-	}
-
-	/**
-	 * Apply styles from array
-	 *
-	 * <code>
-	 * $objPHPExcel->getActiveSheet()->getStyle('B2')->getFont()->getColor()->applyFromArray( array('rgb' => '808080') );
-	 * </code>
-	 *
-	 * @param	array	$pStyles	Array containing style information
-	 * @throws	PHPExcel_Exception
-	 * @return PHPExcel_Style_Color
-	 */
-	public function applyFromArray($pStyles = NULL) {
-		if (is_array($pStyles)) {
-			if ($this->_isSupervisor) {
-				$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
-			} else {
-				if (array_key_exists('rgb', $pStyles)) {
-					$this->setRGB($pStyles['rgb']);
-				}
-				if (array_key_exists('argb', $pStyles)) {
-					$this->setARGB($pStyles['argb']);
-				}
-			}
-		} else {
-			throw new PHPExcel_Exception("Invalid style array passed.");
-		}
-		return $this;
-	}
-
-	/**
-	 * Get ARGB
-	 *
-	 * @return string
-	 */
-	public function getARGB() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getARGB();
-		}
-		return $this->_argb;
-	}
-
-	/**
-	 * Set ARGB
-	 *
-	 * @param string $pValue
-	 * @return PHPExcel_Style_Color
-	 */
-	public function setARGB($pValue = PHPExcel_Style_Color::COLOR_BLACK) {
-		if ($pValue == '') {
-			$pValue = PHPExcel_Style_Color::COLOR_BLACK;
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('argb' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_argb = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get RGB
-	 *
-	 * @return string
-	 */
-	public function getRGB() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getRGB();
-		}
-		return substr($this->_argb, 2);
-	}
-
-	/**
-	 * Set RGB
-	 *
-	 * @param	string	$pValue	RGB value
-	 * @return PHPExcel_Style_Color
-	 */
-	public function setRGB($pValue = '000000') {
-		if ($pValue == '') {
-			$pValue = '000000';
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('argb' => 'FF' . $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_argb = 'FF' . $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get a specified colour component of an RGB value
-	 *
-	 * @private
-	 * @param	string		$RGB		The colour as an RGB value (e.g. FF00CCCC or CCDDEE
-	 * @param	int			$offset		Position within the RGB value to extract
-	 * @param	boolean		$hex		Flag indicating whether the component should be returned as a hex or a
-	 *									decimal value
-	 * @return	string		The extracted colour component
-	 */
-	private static function _getColourComponent($RGB,$offset,$hex=TRUE) {
-		$colour = substr($RGB, $offset, 2);
-		if (!$hex)
-			$colour = hexdec($colour);
-		return $colour;
-	}
-
-	/**
-	 * Get the red colour component of an RGB value
-	 *
-	 * @param	string		$RGB		The colour as an RGB value (e.g. FF00CCCC or CCDDEE
-	 * @param	boolean		$hex		Flag indicating whether the component should be returned as a hex or a
-	 *									decimal value
-	 * @return	string		The red colour component
-	 */
-	public static function getRed($RGB,$hex=TRUE) {
-		return self::_getColourComponent($RGB, strlen($RGB) - 6, $hex);
-	}
-
-	/**
-	 * Get the green colour component of an RGB value
-	 *
-	 * @param	string		$RGB		The colour as an RGB value (e.g. FF00CCCC or CCDDEE
-	 * @param	boolean		$hex		Flag indicating whether the component should be returned as a hex or a
-	 *									decimal value
-	 * @return	string		The green colour component
-	 */
-	public static function getGreen($RGB,$hex=TRUE) {
-		return self::_getColourComponent($RGB, strlen($RGB) - 4, $hex);
-	}
-
-	/**
-	 * Get the blue colour component of an RGB value
-	 *
-	 * @param	string		$RGB		The colour as an RGB value (e.g. FF00CCCC or CCDDEE
-	 * @param	boolean		$hex		Flag indicating whether the component should be returned as a hex or a
-	 *									decimal value
-	 * @return	string		The blue colour component
-	 */
-	public static function getBlue($RGB,$hex=TRUE) {
-		return self::_getColourComponent($RGB, strlen($RGB) - 2, $hex);
-	}
-
-	/**
-	 * Adjust the brightness of a color
-	 *
-	 * @param	string		$hex	The colour as an RGBA or RGB value (e.g. FF00CCCC or CCDDEE)
-	 * @param	float		$adjustPercentage	The percentage by which to adjust the colour as a float from -1 to 1
-	 * @return	string		The adjusted colour as an RGBA or RGB value (e.g. FF00CCCC or CCDDEE)
-	 */
-	public static function changeBrightness($hex, $adjustPercentage) {
-		$rgba = (strlen($hex) == 8);
-
-		$red	= self::getRed($hex, FALSE);
-		$green	= self::getGreen($hex, FALSE);
-		$blue	= self::getBlue($hex, FALSE);
-		if ($adjustPercentage > 0) {
-			$red	+= (255 - $red) * $adjustPercentage;
-			$green	+= (255 - $green) * $adjustPercentage;
-			$blue	+= (255 - $blue) * $adjustPercentage;
-		} else {
-			$red	+= $red * $adjustPercentage;
-			$green	+= $green * $adjustPercentage;
-			$blue	+= $blue * $adjustPercentage;
-		}
-
-		if ($red < 0) $red = 0;
-		elseif ($red > 255) $red = 255;
-		if ($green < 0) $green = 0;
-		elseif ($green > 255) $green = 255;
-		if ($blue < 0) $blue = 0;
-		elseif ($blue > 255) $blue = 255;
-
-		$rgb = strtoupper(	str_pad(dechex($red), 2, '0', 0) .
-							str_pad(dechex($green), 2, '0', 0) .
-							str_pad(dechex($blue), 2, '0', 0)
-						 );
-		return (($rgba) ? 'FF' : '') . $rgb;
-	}
-
-	/**
-	 * Get indexed color
-	 *
-	 * @param	int			$pIndex			Index entry point into the colour array
-	 * @param	boolean		$background		Flag to indicate whether default background or foreground colour
-	 *											should be returned if the indexed colour doesn't exist
-	 * @return	PHPExcel_Style_Color
-	 */
-	public static function indexedColor($pIndex, $background=FALSE) {
-		// Clean parameter
-		$pIndex = intval($pIndex);
-
-		// Indexed colors
-		if (is_null(self::$_indexedColors)) {
-			self::$_indexedColors = array(
-					1	=> 'FF000000',	//	System Colour #1 - Black
-					2	=> 'FFFFFFFF',	//	System Colour #2 - White
-					3	=> 'FFFF0000',	//	System Colour #3 - Red
-					4	=> 'FF00FF00',	//	System Colour #4 - Green
-					5	=> 'FF0000FF',	//	System Colour #5 - Blue
-					6	=> 'FFFFFF00',	//	System Colour #6 - Yellow
-					7	=> 'FFFF00FF',	//	System Colour #7- Magenta
-					8	=> 'FF00FFFF',	//	System Colour #8- Cyan
-					9	=> 'FF800000',	//	Standard Colour #9
-					10	=> 'FF008000',	//	Standard Colour #10
-					11	=> 'FF000080',	//	Standard Colour #11
-					12	=> 'FF808000',	//	Standard Colour #12
-					13	=> 'FF800080',	//	Standard Colour #13
-					14	=> 'FF008080',	//	Standard Colour #14
-					15	=> 'FFC0C0C0',	//	Standard Colour #15
-					16	=> 'FF808080',	//	Standard Colour #16
-					17	=> 'FF9999FF',	//	Chart Fill Colour #17
-					18	=> 'FF993366',	//	Chart Fill Colour #18
-					19	=> 'FFFFFFCC',	//	Chart Fill Colour #19
-					20	=> 'FFCCFFFF',	//	Chart Fill Colour #20
-					21	=> 'FF660066',	//	Chart Fill Colour #21
-					22	=> 'FFFF8080',	//	Chart Fill Colour #22
-					23	=> 'FF0066CC',	//	Chart Fill Colour #23
-					24	=> 'FFCCCCFF',	//	Chart Fill Colour #24
-					25	=> 'FF000080',	//	Chart Line Colour #25
-					26	=> 'FFFF00FF',	//	Chart Line Colour #26
-					27	=> 'FFFFFF00',	//	Chart Line Colour #27
-					28	=> 'FF00FFFF',	//	Chart Line Colour #28
-					29	=> 'FF800080',	//	Chart Line Colour #29
-					30	=> 'FF800000',	//	Chart Line Colour #30
-					31	=> 'FF008080',	//	Chart Line Colour #31
-					32	=> 'FF0000FF',	//	Chart Line Colour #32
-					33	=> 'FF00CCFF',	//	Standard Colour #33
-					34	=> 'FFCCFFFF',	//	Standard Colour #34
-					35	=> 'FFCCFFCC',	//	Standard Colour #35
-					36	=> 'FFFFFF99',	//	Standard Colour #36
-					37	=> 'FF99CCFF',	//	Standard Colour #37
-					38	=> 'FFFF99CC',	//	Standard Colour #38
-					39	=> 'FFCC99FF',	//	Standard Colour #39
-					40	=> 'FFFFCC99',	//	Standard Colour #40
-					41	=> 'FF3366FF',	//	Standard Colour #41
-					42	=> 'FF33CCCC',	//	Standard Colour #42
-					43	=> 'FF99CC00',	//	Standard Colour #43
-					44	=> 'FFFFCC00',	//	Standard Colour #44
-					45	=> 'FFFF9900',	//	Standard Colour #45
-					46	=> 'FFFF6600',	//	Standard Colour #46
-					47	=> 'FF666699',	//	Standard Colour #47
-					48	=> 'FF969696',	//	Standard Colour #48
-					49	=> 'FF003366',	//	Standard Colour #49
-					50	=> 'FF339966',	//	Standard Colour #50
-					51	=> 'FF003300',	//	Standard Colour #51
-					52	=> 'FF333300',	//	Standard Colour #52
-					53	=> 'FF993300',	//	Standard Colour #53
-					54	=> 'FF993366',	//	Standard Colour #54
-					55	=> 'FF333399',	//	Standard Colour #55
-					56	=> 'FF333333'	//	Standard Colour #56
-				);
-		}
-
-		if (array_key_exists($pIndex, self::$_indexedColors)) {
-			return new PHPExcel_Style_Color(self::$_indexedColors[$pIndex]);
-		}
-
-		if ($background) {
-			return new PHPExcel_Style_Color('FFFFFFFF');
-		}
-		return new PHPExcel_Style_Color('FF000000');
-	}
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getHashCode();
-		}
-		return md5(
-			  $this->_argb
-			. __CLASS__
-		);
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Conditional.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Conditional.php
deleted file mode 100644
index aebf1e31333..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Conditional.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Style_Conditional
- *
- * @category   PHPExcel
- * @package    PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Style_Conditional implements PHPExcel_IComparable
-{
-	/* Condition types */
-	const CONDITION_NONE					= 'none';
-	const CONDITION_CELLIS					= 'cellIs';
-	const CONDITION_CONTAINSTEXT			= 'containsText';
-	const CONDITION_EXPRESSION 				= 'expression';
-
-	/* Operator types */
-	const OPERATOR_NONE						= '';
-	const OPERATOR_BEGINSWITH				= 'beginsWith';
-	const OPERATOR_ENDSWITH					= 'endsWith';
-	const OPERATOR_EQUAL					= 'equal';
-	const OPERATOR_GREATERTHAN				= 'greaterThan';
-	const OPERATOR_GREATERTHANOREQUAL		= 'greaterThanOrEqual';
-	const OPERATOR_LESSTHAN					= 'lessThan';
-	const OPERATOR_LESSTHANOREQUAL			= 'lessThanOrEqual';
-	const OPERATOR_NOTEQUAL					= 'notEqual';
-	const OPERATOR_CONTAINSTEXT				= 'containsText';
-	const OPERATOR_NOTCONTAINS				= 'notContains';
-	const OPERATOR_BETWEEN					= 'between';
-
-	/**
-	 * Condition type
-	 *
-	 * @var int
-	 */
-	private $_conditionType;
-
-	/**
-	 * Operator type
-	 *
-	 * @var int
-	 */
-	private $_operatorType;
-
-	/**
-	 * Text
-	 *
-	 * @var string
-	 */
-	private $_text;
-
-	/**
-	 * Condition
-	 *
-	 * @var string[]
-	 */
-	private $_condition = array();
-
-	/**
-	 * Style
-	 *
-	 * @var PHPExcel_Style
-	 */
-	private $_style;
-
-    /**
-     * Create a new PHPExcel_Style_Conditional
-     */
-    public function __construct()
-    {
-    	// Initialise values
-    	$this->_conditionType		= PHPExcel_Style_Conditional::CONDITION_NONE;
-    	$this->_operatorType		= PHPExcel_Style_Conditional::OPERATOR_NONE;
-    	$this->_text    			= null;
-    	$this->_condition			= array();
-    	$this->_style				= new PHPExcel_Style(FALSE, TRUE);
-    }
-
-    /**
-     * Get Condition type
-     *
-     * @return string
-     */
-    public function getConditionType() {
-    	return $this->_conditionType;
-    }
-
-    /**
-     * Set Condition type
-     *
-     * @param string $pValue	PHPExcel_Style_Conditional condition type
-     * @return PHPExcel_Style_Conditional
-     */
-    public function setConditionType($pValue = PHPExcel_Style_Conditional::CONDITION_NONE) {
-    	$this->_conditionType = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Operator type
-     *
-     * @return string
-     */
-    public function getOperatorType() {
-    	return $this->_operatorType;
-    }
-
-    /**
-     * Set Operator type
-     *
-     * @param string $pValue	PHPExcel_Style_Conditional operator type
-     * @return PHPExcel_Style_Conditional
-     */
-    public function setOperatorType($pValue = PHPExcel_Style_Conditional::OPERATOR_NONE) {
-    	$this->_operatorType = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get text
-     *
-     * @return string
-     */
-    public function getText() {
-        return $this->_text;
-    }
-
-    /**
-     * Set text
-     *
-     * @param string $value
-     * @return PHPExcel_Style_Conditional
-     */
-    public function setText($value = null) {
-           $this->_text = $value;
-           return $this;
-    }
-
-    /**
-     * Get Condition
-     *
-     * @deprecated Deprecated, use getConditions instead
-     * @return string
-     */
-    public function getCondition() {
-    	if (isset($this->_condition[0])) {
-    		return $this->_condition[0];
-    	}
-
-    	return '';
-    }
-
-    /**
-     * Set Condition
-     *
-     * @deprecated Deprecated, use setConditions instead
-     * @param string $pValue	Condition
-     * @return PHPExcel_Style_Conditional
-     */
-    public function setCondition($pValue = '') {
-    	if (!is_array($pValue))
-    		$pValue = array($pValue);
-
-    	return $this->setConditions($pValue);
-    }
-
-    /**
-     * Get Conditions
-     *
-     * @return string[]
-     */
-    public function getConditions() {
-    	return $this->_condition;
-    }
-
-    /**
-     * Set Conditions
-     *
-     * @param string[] $pValue	Condition
-     * @return PHPExcel_Style_Conditional
-     */
-    public function setConditions($pValue) {
-    	if (!is_array($pValue))
-    		$pValue = array($pValue);
-
-    	$this->_condition = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Add Condition
-     *
-     * @param string $pValue	Condition
-     * @return PHPExcel_Style_Conditional
-     */
-    public function addCondition($pValue = '') {
-    	$this->_condition[] = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Style
-     *
-     * @return PHPExcel_Style
-     */
-    public function getStyle() {
-    	return $this->_style;
-    }
-
-    /**
-     * Set Style
-     *
-     * @param 	PHPExcel_Style $pValue
-     * @throws 	PHPExcel_Exception
-     * @return PHPExcel_Style_Conditional
-     */
-    public function setStyle(PHPExcel_Style $pValue = null) {
-   		$this->_style = $pValue;
-   		return $this;
-    }
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-    	return md5(
-    		  $this->_conditionType
-    		. $this->_operatorType
-    		. implode(';', $this->_condition)
-    		. $this->_style->getHashCode()
-    		. __CLASS__
-    	);
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Fill.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Fill.php
deleted file mode 100644
index 6412ba6349d..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Fill.php
+++ /dev/null
@@ -1,321 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Style_Fill
- *
- * @category   PHPExcel
- * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Style_Fill extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
-{
-	/* Fill types */
-	const FILL_NONE							= 'none';
-	const FILL_SOLID						= 'solid';
-	const FILL_GRADIENT_LINEAR				= 'linear';
-	const FILL_GRADIENT_PATH				= 'path';
-	const FILL_PATTERN_DARKDOWN				= 'darkDown';
-	const FILL_PATTERN_DARKGRAY				= 'darkGray';
-	const FILL_PATTERN_DARKGRID				= 'darkGrid';
-	const FILL_PATTERN_DARKHORIZONTAL		= 'darkHorizontal';
-	const FILL_PATTERN_DARKTRELLIS			= 'darkTrellis';
-	const FILL_PATTERN_DARKUP				= 'darkUp';
-	const FILL_PATTERN_DARKVERTICAL			= 'darkVertical';
-	const FILL_PATTERN_GRAY0625				= 'gray0625';
-	const FILL_PATTERN_GRAY125				= 'gray125';
-	const FILL_PATTERN_LIGHTDOWN			= 'lightDown';
-	const FILL_PATTERN_LIGHTGRAY			= 'lightGray';
-	const FILL_PATTERN_LIGHTGRID			= 'lightGrid';
-	const FILL_PATTERN_LIGHTHORIZONTAL		= 'lightHorizontal';
-	const FILL_PATTERN_LIGHTTRELLIS			= 'lightTrellis';
-	const FILL_PATTERN_LIGHTUP				= 'lightUp';
-	const FILL_PATTERN_LIGHTVERTICAL		= 'lightVertical';
-	const FILL_PATTERN_MEDIUMGRAY			= 'mediumGray';
-
-	/**
-	 * Fill type
-	 *
-	 * @var string
-	 */
-	protected $_fillType	= PHPExcel_Style_Fill::FILL_NONE;
-
-	/**
-	 * Rotation
-	 *
-	 * @var double
-	 */
-	protected $_rotation	= 0;
-
-	/**
-	 * Start color
-	 *
-	 * @var PHPExcel_Style_Color
-	 */
-	protected $_startColor;
-
-	/**
-	 * End color
-	 *
-	 * @var PHPExcel_Style_Color
-	 */
-	protected $_endColor;
-
-	/**
-	 * Create a new PHPExcel_Style_Fill
-	 *
-	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 * @param	boolean	$isConditional	Flag indicating if this is a conditional style or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 */
-	public function __construct($isSupervisor = FALSE, $isConditional = FALSE)
-	{
-		// Supervisor?
-		parent::__construct($isSupervisor);
-
-		// Initialise values
-		if ($isConditional) {
-			$this->_fillType = NULL;
-		}
-		$this->_startColor			= new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_WHITE, $isSupervisor, $isConditional);
-		$this->_endColor			= new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor, $isConditional);
-
-		// bind parent if we are a supervisor
-		if ($isSupervisor) {
-			$this->_startColor->bindParent($this, '_startColor');
-			$this->_endColor->bindParent($this, '_endColor');
-		}
-	}
-
-	/**
-	 * Get the shared style component for the currently active cell in currently active sheet.
-	 * Only used for style supervisor
-	 *
-	 * @return PHPExcel_Style_Fill
-	 */
-	public function getSharedComponent()
-	{
-		return $this->_parent->getSharedComponent()->getFill();
-	}
-
-	/**
-	 * Build style array from subcomponents
-	 *
-	 * @param array $array
-	 * @return array
-	 */
-	public function getStyleArray($array)
-	{
-		return array('fill' => $array);
-	}
-
-	/**
-	 * Apply styles from array
-	 *
-	 * <code>
-	 * $objPHPExcel->getActiveSheet()->getStyle('B2')->getFill()->applyFromArray(
-	 *		array(
-	 *			'type'	   => PHPExcel_Style_Fill::FILL_GRADIENT_LINEAR,
-	 *			'rotation'   => 0,
-	 *			'startcolor' => array(
-	 *				'rgb' => '000000'
-	 *			),
-	 *			'endcolor'   => array(
-	 *				'argb' => 'FFFFFFFF'
-	 *			)
-	 *		)
-	 * );
-	 * </code>
-	 *
-	 * @param	array	$pStyles	Array containing style information
-	 * @throws	PHPExcel_Exception
-	 * @return PHPExcel_Style_Fill
-	 */
-	public function applyFromArray($pStyles = null) {
-		if (is_array($pStyles)) {
-			if ($this->_isSupervisor) {
-				$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
-			} else {
-				if (array_key_exists('type', $pStyles)) {
-					$this->setFillType($pStyles['type']);
-				}
-				if (array_key_exists('rotation', $pStyles)) {
-					$this->setRotation($pStyles['rotation']);
-				}
-				if (array_key_exists('startcolor', $pStyles)) {
-					$this->getStartColor()->applyFromArray($pStyles['startcolor']);
-				}
-				if (array_key_exists('endcolor', $pStyles)) {
-					$this->getEndColor()->applyFromArray($pStyles['endcolor']);
-				}
-				if (array_key_exists('color', $pStyles)) {
-					$this->getStartColor()->applyFromArray($pStyles['color']);
-				}
-			}
-		} else {
-			throw new PHPExcel_Exception("Invalid style array passed.");
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Fill Type
-	 *
-	 * @return string
-	 */
-	public function getFillType() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getFillType();
-		}
-		return $this->_fillType;
-	}
-
-	/**
-	 * Set Fill Type
-	 *
-	 * @param string $pValue	PHPExcel_Style_Fill fill type
-	 * @return PHPExcel_Style_Fill
-	 */
-	public function setFillType($pValue = PHPExcel_Style_Fill::FILL_NONE) {
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('type' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_fillType = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Rotation
-	 *
-	 * @return double
-	 */
-	public function getRotation() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getRotation();
-		}
-		return $this->_rotation;
-	}
-
-	/**
-	 * Set Rotation
-	 *
-	 * @param double $pValue
-	 * @return PHPExcel_Style_Fill
-	 */
-	public function setRotation($pValue = 0) {
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('rotation' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_rotation = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Start Color
-	 *
-	 * @return PHPExcel_Style_Color
-	 */
-	public function getStartColor() {
-		return $this->_startColor;
-	}
-
-	/**
-	 * Set Start Color
-	 *
-	 * @param	PHPExcel_Style_Color $pValue
-	 * @throws	PHPExcel_Exception
-	 * @return PHPExcel_Style_Fill
-	 */
-	public function setStartColor(PHPExcel_Style_Color $pValue = null) {
-		// make sure parameter is a real color and not a supervisor
-		$color = $pValue->getIsSupervisor() ? $pValue->getSharedComponent() : $pValue;
-
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStartColor()->getStyleArray(array('argb' => $color->getARGB()));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_startColor = $color;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get End Color
-	 *
-	 * @return PHPExcel_Style_Color
-	 */
-	public function getEndColor() {
-		return $this->_endColor;
-	}
-
-	/**
-	 * Set End Color
-	 *
-	 * @param	PHPExcel_Style_Color $pValue
-	 * @throws	PHPExcel_Exception
-	 * @return PHPExcel_Style_Fill
-	 */
-	public function setEndColor(PHPExcel_Style_Color $pValue = null) {
-		// make sure parameter is a real color and not a supervisor
-		$color = $pValue->getIsSupervisor() ? $pValue->getSharedComponent() : $pValue;
-
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getEndColor()->getStyleArray(array('argb' => $color->getARGB()));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_endColor = $color;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getHashCode();
-		}
-		return md5(
-			  $this->getFillType()
-			. $this->getRotation()
-			. $this->getStartColor()->getHashCode()
-			. $this->getEndColor()->getHashCode()
-			. __CLASS__
-		);
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Font.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Font.php
deleted file mode 100644
index 296e348557a..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Font.php
+++ /dev/null
@@ -1,532 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Style_Font
- *
- * @category   PHPExcel
- * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Style_Font extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
-{
-	/* Underline types */
-	const UNDERLINE_NONE					= 'none';
-	const UNDERLINE_DOUBLE					= 'double';
-	const UNDERLINE_DOUBLEACCOUNTING		= 'doubleAccounting';
-	const UNDERLINE_SINGLE					= 'single';
-	const UNDERLINE_SINGLEACCOUNTING		= 'singleAccounting';
-
-	/**
-	 * Font Name
-	 *
-	 * @var string
-	 */
-	protected $_name			= 'Calibri';
-
-	/**
-	 * Font Size
-	 *
-	 * @var float
-	 */
-	protected $_size			= 11;
-
-	/**
-	 * Bold
-	 *
-	 * @var boolean
-	 */
-	protected $_bold			= FALSE;
-
-	/**
-	 * Italic
-	 *
-	 * @var boolean
-	 */
-	protected $_italic		= FALSE;
-
-	/**
-	 * Superscript
-	 *
-	 * @var boolean
-	 */
-	protected $_superScript	= FALSE;
-
-	/**
-	 * Subscript
-	 *
-	 * @var boolean
-	 */
-	protected $_subScript		= FALSE;
-
-	/**
-	 * Underline
-	 *
-	 * @var string
-	 */
-	protected $_underline		= self::UNDERLINE_NONE;
-
-	/**
-	 * Strikethrough
-	 *
-	 * @var boolean
-	 */
-	protected $_strikethrough	= FALSE;
-
-	/**
-	 * Foreground color
-	 *
-	 * @var PHPExcel_Style_Color
-	 */
-	protected $_color;
-
-	/**
-	 * Create a new PHPExcel_Style_Font
-	 *
-	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 * @param	boolean	$isConditional	Flag indicating if this is a conditional style or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 */
-	public function __construct($isSupervisor = FALSE, $isConditional = FALSE)
-	{
-		// Supervisor?
-		parent::__construct($isSupervisor);
-
-		// Initialise values
-		if ($isConditional) {
-			$this->_name			= NULL;
-			$this->_size			= NULL;
-			$this->_bold			= NULL;
-			$this->_italic			= NULL;
-			$this->_superScript		= NULL;
-			$this->_subScript		= NULL;
-			$this->_underline		= NULL;
-			$this->_strikethrough	= NULL;
-			$this->_color			= new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor, $isConditional);
-		} else {
-			$this->_color	= new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor);
-		}
-		// bind parent if we are a supervisor
-		if ($isSupervisor) {
-			$this->_color->bindParent($this, '_color');
-		}
-	}
-
-	/**
-	 * Get the shared style component for the currently active cell in currently active sheet.
-	 * Only used for style supervisor
-	 *
-	 * @return PHPExcel_Style_Font
-	 */
-	public function getSharedComponent()
-	{
-		return $this->_parent->getSharedComponent()->getFont();
-	}
-
-	/**
-	 * Build style array from subcomponents
-	 *
-	 * @param array $array
-	 * @return array
-	 */
-	public function getStyleArray($array)
-	{
-		return array('font' => $array);
-	}
-
-	/**
-	 * Apply styles from array
-	 *
-	 * <code>
-	 * $objPHPExcel->getActiveSheet()->getStyle('B2')->getFont()->applyFromArray(
-	 *		array(
-	 *			'name'		=> 'Arial',
-	 *			'bold'		=> TRUE,
-	 *			'italic'	=> FALSE,
-	 *			'underline' => PHPExcel_Style_Font::UNDERLINE_DOUBLE,
-	 *			'strike'	=> FALSE,
-	 *			'color'		=> array(
-	 *				'rgb' => '808080'
-	 *			)
-	 *		)
-	 * );
-	 * </code>
-	 *
-	 * @param	array	$pStyles	Array containing style information
-	 * @throws	PHPExcel_Exception
-	 * @return PHPExcel_Style_Font
-	 */
-	public function applyFromArray($pStyles = null) {
-		if (is_array($pStyles)) {
-			if ($this->_isSupervisor) {
-				$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
-			} else {
-				if (array_key_exists('name', $pStyles)) {
-					$this->setName($pStyles['name']);
-				}
-				if (array_key_exists('bold', $pStyles)) {
-					$this->setBold($pStyles['bold']);
-				}
-				if (array_key_exists('italic', $pStyles)) {
-					$this->setItalic($pStyles['italic']);
-				}
-				if (array_key_exists('superScript', $pStyles)) {
-					$this->setSuperScript($pStyles['superScript']);
-				}
-				if (array_key_exists('subScript', $pStyles)) {
-					$this->setSubScript($pStyles['subScript']);
-				}
-				if (array_key_exists('underline', $pStyles)) {
-					$this->setUnderline($pStyles['underline']);
-				}
-				if (array_key_exists('strike', $pStyles)) {
-					$this->setStrikethrough($pStyles['strike']);
-				}
-				if (array_key_exists('color', $pStyles)) {
-					$this->getColor()->applyFromArray($pStyles['color']);
-				}
-				if (array_key_exists('size', $pStyles)) {
-					$this->setSize($pStyles['size']);
-				}
-			}
-		} else {
-			throw new PHPExcel_Exception("Invalid style array passed.");
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Name
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getName();
-		}
-		return $this->_name;
-	}
-
-	/**
-	 * Set Name
-	 *
-	 * @param string $pValue
-	 * @return PHPExcel_Style_Font
-	 */
-	public function setName($pValue = 'Calibri') {
-  		if ($pValue == '') {
-			$pValue = 'Calibri';
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('name' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_name = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Size
-	 *
-	 * @return double
-	 */
-	public function getSize() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getSize();
-		}
-		return $this->_size;
-	}
-
-	/**
-	 * Set Size
-	 *
-	 * @param double $pValue
-	 * @return PHPExcel_Style_Font
-	 */
-	public function setSize($pValue = 10) {
-		if ($pValue == '') {
-			$pValue = 10;
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('size' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_size = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Bold
-	 *
-	 * @return boolean
-	 */
-	public function getBold() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getBold();
-		}
-		return $this->_bold;
-	}
-
-	/**
-	 * Set Bold
-	 *
-	 * @param boolean $pValue
-	 * @return PHPExcel_Style_Font
-	 */
-	public function setBold($pValue = false) {
-		if ($pValue == '') {
-			$pValue = false;
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('bold' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_bold = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Italic
-	 *
-	 * @return boolean
-	 */
-	public function getItalic() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getItalic();
-		}
-		return $this->_italic;
-	}
-
-	/**
-	 * Set Italic
-	 *
-	 * @param boolean $pValue
-	 * @return PHPExcel_Style_Font
-	 */
-	public function setItalic($pValue = false) {
-		if ($pValue == '') {
-			$pValue = false;
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('italic' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_italic = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get SuperScript
-	 *
-	 * @return boolean
-	 */
-	public function getSuperScript() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getSuperScript();
-		}
-		return $this->_superScript;
-	}
-
-	/**
-	 * Set SuperScript
-	 *
-	 * @param boolean $pValue
-	 * @return PHPExcel_Style_Font
-	 */
-	public function setSuperScript($pValue = false) {
-		if ($pValue == '') {
-			$pValue = false;
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('superScript' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_superScript = $pValue;
-			$this->_subScript = !$pValue;
-		}
-		return $this;
-	}
-
-		/**
-	 * Get SubScript
-	 *
-	 * @return boolean
-	 */
-	public function getSubScript() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getSubScript();
-		}
-		return $this->_subScript;
-	}
-
-	/**
-	 * Set SubScript
-	 *
-	 * @param boolean $pValue
-	 * @return PHPExcel_Style_Font
-	 */
-	public function setSubScript($pValue = false) {
-		if ($pValue == '') {
-			$pValue = false;
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('subScript' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_subScript = $pValue;
-			$this->_superScript = !$pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Underline
-	 *
-	 * @return string
-	 */
-	public function getUnderline() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getUnderline();
-		}
-		return $this->_underline;
-	}
-
-	/**
-	 * Set Underline
-	 *
-	 * @param string|boolean $pValue	PHPExcel_Style_Font underline type
-	 *									If a boolean is passed, then TRUE equates to UNDERLINE_SINGLE,
-	 *										false equates to UNDERLINE_NONE
-	 * @return PHPExcel_Style_Font
-	 */
-	public function setUnderline($pValue = self::UNDERLINE_NONE) {
-		if (is_bool($pValue)) {
-			$pValue = ($pValue) ? self::UNDERLINE_SINGLE : self::UNDERLINE_NONE;
-		} elseif ($pValue == '') {
-			$pValue = self::UNDERLINE_NONE;
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('underline' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_underline = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Strikethrough
-	 *
-	 * @return boolean
-	 */
-	public function getStrikethrough() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getStrikethrough();
-		}
-		return $this->_strikethrough;
-	}
-
-	/**
-	 * Set Strikethrough
-	 *
-	 * @param boolean $pValue
-	 * @return PHPExcel_Style_Font
-	 */
-	public function setStrikethrough($pValue = false) {
-		if ($pValue == '') {
-			$pValue = false;
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('strike' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_strikethrough = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Color
-	 *
-	 * @return PHPExcel_Style_Color
-	 */
-	public function getColor() {
-		return $this->_color;
-	}
-
-	/**
-	 * Set Color
-	 *
-	 * @param	PHPExcel_Style_Color $pValue
-	 * @throws	PHPExcel_Exception
-	 * @return PHPExcel_Style_Font
-	 */
-	public function setColor(PHPExcel_Style_Color $pValue = null) {
-		// make sure parameter is a real color and not a supervisor
-		$color = $pValue->getIsSupervisor() ? $pValue->getSharedComponent() : $pValue;
-
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getColor()->getStyleArray(array('argb' => $color->getARGB()));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_color = $color;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getHashCode();
-		}
-		return md5(
-			  $this->_name
-			. $this->_size
-			. ($this->_bold ? 't' : 'f')
-			. ($this->_italic ? 't' : 'f')
-			. ($this->_superScript ? 't' : 'f')
-			. ($this->_subScript ? 't' : 'f')
-			. $this->_underline
-			. ($this->_strikethrough ? 't' : 'f')
-			. $this->_color->getHashCode()
-			. __CLASS__
-		);
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/NumberFormat.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/NumberFormat.php
deleted file mode 100644
index 62ab3e2752c..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/NumberFormat.php
+++ /dev/null
@@ -1,717 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Style_NumberFormat
- *
- * @category   PHPExcel
- * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Style_NumberFormat extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
-{
-	/* Pre-defined formats */
-	const FORMAT_GENERAL					= 'General';
-
-	const FORMAT_TEXT						= '@';
-
-	const FORMAT_NUMBER						= '0';
-	const FORMAT_NUMBER_00					= '0.00';
-	const FORMAT_NUMBER_COMMA_SEPARATED1	= '#,##0.00';
-	const FORMAT_NUMBER_COMMA_SEPARATED2	= '#,##0.00_-';
-
-	const FORMAT_PERCENTAGE					= '0%';
-	const FORMAT_PERCENTAGE_00				= '0.00%';
-
-	const FORMAT_DATE_YYYYMMDD2				= 'yyyy-mm-dd';
-	const FORMAT_DATE_YYYYMMDD				= 'yy-mm-dd';
-	const FORMAT_DATE_DDMMYYYY				= 'dd/mm/yy';
-	const FORMAT_DATE_DMYSLASH				= 'd/m/y';
-	const FORMAT_DATE_DMYMINUS				= 'd-m-y';
-	const FORMAT_DATE_DMMINUS				= 'd-m';
-	const FORMAT_DATE_MYMINUS				= 'm-y';
-	const FORMAT_DATE_XLSX14				= 'mm-dd-yy';
-	const FORMAT_DATE_XLSX15				= 'd-mmm-yy';
-	const FORMAT_DATE_XLSX16				= 'd-mmm';
-	const FORMAT_DATE_XLSX17				= 'mmm-yy';
-	const FORMAT_DATE_XLSX22				= 'm/d/yy h:mm';
-	const FORMAT_DATE_DATETIME				= 'd/m/y h:mm';
-	const FORMAT_DATE_TIME1					= 'h:mm AM/PM';
-	const FORMAT_DATE_TIME2					= 'h:mm:ss AM/PM';
-	const FORMAT_DATE_TIME3					= 'h:mm';
-	const FORMAT_DATE_TIME4					= 'h:mm:ss';
-	const FORMAT_DATE_TIME5					= 'mm:ss';
-	const FORMAT_DATE_TIME6					= 'h:mm:ss';
-	const FORMAT_DATE_TIME7					= 'i:s.S';
-	const FORMAT_DATE_TIME8					= 'h:mm:ss;@';
-	const FORMAT_DATE_YYYYMMDDSLASH			= 'yy/mm/dd;@';
-
-	const FORMAT_CURRENCY_USD_SIMPLE		= '"$"#,##0.00_-';
-	const FORMAT_CURRENCY_USD				= '$#,##0_-';
-	const FORMAT_CURRENCY_EUR_SIMPLE		= '[$EUR ]#,##0.00_-';
-
-	/**
-	 * Excel built-in number formats
-	 *
-	 * @var array
-	 */
-	protected static $_builtInFormats;
-
-	/**
-	 * Excel built-in number formats (flipped, for faster lookups)
-	 *
-	 * @var array
-	 */
-	protected static $_flippedBuiltInFormats;
-
-	/**
-	 * Format Code
-	 *
-	 * @var string
-	 */
-	protected $_formatCode	=	PHPExcel_Style_NumberFormat::FORMAT_GENERAL;
-
-	/**
-	 * Built-in format Code
-	 *
-	 * @var string
-	 */
-	protected $_builtInFormatCode	= 0;
-
-	/**
-	 * Create a new PHPExcel_Style_NumberFormat
-	 *
-	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 * @param	boolean	$isConditional	Flag indicating if this is a conditional style or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 */
-	public function __construct($isSupervisor = FALSE, $isConditional = FALSE)
-	{
-		// Supervisor?
-		parent::__construct($isSupervisor);
-
-		if ($isConditional) {
-			$this->_formatCode = NULL;
-			$this->_builtInFormatCode = FALSE;
-		}
-	}
-
-	/**
-	 * Get the shared style component for the currently active cell in currently active sheet.
-	 * Only used for style supervisor
-	 *
-	 * @return PHPExcel_Style_NumberFormat
-	 */
-	public function getSharedComponent()
-	{
-		return $this->_parent->getSharedComponent()->getNumberFormat();
-	}
-
-	/**
-	 * Build style array from subcomponents
-	 *
-	 * @param array $array
-	 * @return array
-	 */
-	public function getStyleArray($array)
-	{
-		return array('numberformat' => $array);
-	}
-
-	/**
-	 * Apply styles from array
-	 *
-	 * <code>
-	 * $objPHPExcel->getActiveSheet()->getStyle('B2')->getNumberFormat()->applyFromArray(
-	 *		array(
-	 *			'code' => PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE
-	 *		)
-	 * );
-	 * </code>
-	 *
-	 * @param	array	$pStyles	Array containing style information
-	 * @throws	PHPExcel_Exception
-	 * @return PHPExcel_Style_NumberFormat
-	 */
-	public function applyFromArray($pStyles = null)
-	{
-		if (is_array($pStyles)) {
-			if ($this->_isSupervisor) {
-				$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
-			} else {
-				if (array_key_exists('code', $pStyles)) {
-					$this->setFormatCode($pStyles['code']);
-				}
-			}
-		} else {
-			throw new PHPExcel_Exception("Invalid style array passed.");
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Format Code
-	 *
-	 * @return string
-	 */
-	public function getFormatCode()
-	{
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getFormatCode();
-		}
-		if ($this->_builtInFormatCode !== false)
-		{
-			return self::builtInFormatCode($this->_builtInFormatCode);
-		}
-		return $this->_formatCode;
-	}
-
-	/**
-	 * Set Format Code
-	 *
-	 * @param string $pValue
-	 * @return PHPExcel_Style_NumberFormat
-	 */
-	public function setFormatCode($pValue = PHPExcel_Style_NumberFormat::FORMAT_GENERAL)
-	{
-		if ($pValue == '') {
-			$pValue = PHPExcel_Style_NumberFormat::FORMAT_GENERAL;
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('code' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_formatCode = $pValue;
-			$this->_builtInFormatCode = self::builtInFormatCodeIndex($pValue);
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Built-In Format Code
-	 *
-	 * @return int
-	 */
-	public function getBuiltInFormatCode()
-	{
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getBuiltInFormatCode();
-		}
-		return $this->_builtInFormatCode;
-	}
-
-	/**
-	 * Set Built-In Format Code
-	 *
-	 * @param int $pValue
-	 * @return PHPExcel_Style_NumberFormat
-	 */
-	public function setBuiltInFormatCode($pValue = 0)
-	{
-
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('code' => self::builtInFormatCode($pValue)));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_builtInFormatCode = $pValue;
-			$this->_formatCode = self::builtInFormatCode($pValue);
-		}
-		return $this;
-	}
-
-	/**
-	 * Fill built-in format codes
-	 */
-	private static function fillBuiltInFormatCodes()
-	{
-		// Built-in format codes
-		if (is_null(self::$_builtInFormats)) {
-			self::$_builtInFormats = array();
-
-			// General
-			self::$_builtInFormats[0] = PHPExcel_Style_NumberFormat::FORMAT_GENERAL;
-			self::$_builtInFormats[1] = '0';
-			self::$_builtInFormats[2] = '0.00';
-			self::$_builtInFormats[3] = '#,##0';
-			self::$_builtInFormats[4] = '#,##0.00';
-
-			self::$_builtInFormats[9] = '0%';
-			self::$_builtInFormats[10] = '0.00%';
-			self::$_builtInFormats[11] = '0.00E+00';
-			self::$_builtInFormats[12] = '# ?/?';
-			self::$_builtInFormats[13] = '# ??/??';
-			self::$_builtInFormats[14] = 'mm-dd-yy';
-			self::$_builtInFormats[15] = 'd-mmm-yy';
-			self::$_builtInFormats[16] = 'd-mmm';
-			self::$_builtInFormats[17] = 'mmm-yy';
-			self::$_builtInFormats[18] = 'h:mm AM/PM';
-			self::$_builtInFormats[19] = 'h:mm:ss AM/PM';
-			self::$_builtInFormats[20] = 'h:mm';
-			self::$_builtInFormats[21] = 'h:mm:ss';
-			self::$_builtInFormats[22] = 'm/d/yy h:mm';
-
-			self::$_builtInFormats[37] = '#,##0 ;(#,##0)';
-			self::$_builtInFormats[38] = '#,##0 ;[Red](#,##0)';
-			self::$_builtInFormats[39] = '#,##0.00;(#,##0.00)';
-			self::$_builtInFormats[40] = '#,##0.00;[Red](#,##0.00)';
-
-			self::$_builtInFormats[44] = '_("$"* #,##0.00_);_("$"* \(#,##0.00\);_("$"* "-"??_);_(@_)';
-			self::$_builtInFormats[45] = 'mm:ss';
-			self::$_builtInFormats[46] = '[h]:mm:ss';
-			self::$_builtInFormats[47] = 'mmss.0';
-			self::$_builtInFormats[48] = '##0.0E+0';
-			self::$_builtInFormats[49] = '@';
-
-			// CHT
-			self::$_builtInFormats[27] = '[$-404]e/m/d';
-			self::$_builtInFormats[30] = 'm/d/yy';
-			self::$_builtInFormats[36] = '[$-404]e/m/d';
-			self::$_builtInFormats[50] = '[$-404]e/m/d';
-			self::$_builtInFormats[57] = '[$-404]e/m/d';
-
-			// THA
-			self::$_builtInFormats[59] = 't0';
-			self::$_builtInFormats[60] = 't0.00';
-			self::$_builtInFormats[61] = 't#,##0';
-			self::$_builtInFormats[62] = 't#,##0.00';
-			self::$_builtInFormats[67] = 't0%';
-			self::$_builtInFormats[68] = 't0.00%';
-			self::$_builtInFormats[69] = 't# ?/?';
-			self::$_builtInFormats[70] = 't# ??/??';
-
-			// Flip array (for faster lookups)
-			self::$_flippedBuiltInFormats = array_flip(self::$_builtInFormats);
-		}
-	}
-
-	/**
-	 * Get built-in format code
-	 *
-	 * @param	int		$pIndex
-	 * @return	string
-	 */
-	public static function builtInFormatCode($pIndex)
-	{
-		// Clean parameter
-		$pIndex = intval($pIndex);
-
-		// Ensure built-in format codes are available
-		self::fillBuiltInFormatCodes();
-
-		// Lookup format code
-		if (isset(self::$_builtInFormats[$pIndex])) {
-			return self::$_builtInFormats[$pIndex];
-		}
-
-		return '';
-	}
-
-	/**
-	 * Get built-in format code index
-	 *
-	 * @param	string		$formatCode
-	 * @return	int|boolean
-	 */
-	public static function builtInFormatCodeIndex($formatCode)
-	{
-		// Ensure built-in format codes are available
-		self::fillBuiltInFormatCodes();
-
-		// Lookup format code
-		if (isset(self::$_flippedBuiltInFormats[$formatCode])) {
-			return self::$_flippedBuiltInFormats[$formatCode];
-		}
-
-		return false;
-	}
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode()
-	{
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getHashCode();
-		}
-		return md5(
-			  $this->_formatCode
-			. $this->_builtInFormatCode
-			. __CLASS__
-		);
-	}
-
-	/**
-	 * Search/replace values to convert Excel date/time format masks to PHP format masks
-	 *
-	 * @var array
-	 */
-	private static $_dateFormatReplacements = array(
-			// first remove escapes related to non-format characters
-			'\\'	=> '',
-			//	12-hour suffix
-			'am/pm'	=> 'A',
-			//	4-digit year
-			'e'	=> 'Y',
-			'yyyy'	=> 'Y',
-			//	2-digit year
-			'yy'	=> 'y',
-			//	first letter of month - no php equivalent
-			'mmmmm'	=> 'M',
-			//	full month name
-			'mmmm'	=> 'F',
-			//	short month name
-			'mmm'	=> 'M',
-			//	mm is minutes if time, but can also be month w/leading zero
-			//	so we try to identify times be the inclusion of a : separator in the mask
-			//	It isn't perfect, but the best way I know how
-			':mm'	=> ':i',
-			'mm:'	=> 'i:',
-			//	month leading zero
-			'mm'	=> 'm',
-			//	month no leading zero
-			'm'		=> 'n',
-			//	full day of week name
-			'dddd'	=> 'l',
-			//	short day of week name
-			'ddd'	=> 'D',
-			//	days leading zero
-			'dd'	=> 'd',
-			//	days no leading zero
-			'd'		=> 'j',
-			//	seconds
-			'ss'	=> 's',
-			//	fractional seconds - no php equivalent
-			'.s'	=> ''
-		);
-	/**
-	 * Search/replace values to convert Excel date/time format masks hours to PHP format masks (24 hr clock)
-	 *
-	 * @var array
-	 */
-	private static $_dateFormatReplacements24 = array(
-			'hh'	=> 'H',
-			'h'		=> 'G'
-		);
-	/**
-	 * Search/replace values to convert Excel date/time format masks hours to PHP format masks (12 hr clock)
-	 *
-	 * @var array
-	 */
-	private static $_dateFormatReplacements12 = array(
-			'hh'	=> 'h',
-			'h'		=> 'g'
-		);
-
-	private static function _formatAsDate(&$value, &$format)
-	{
-		// dvc: convert Excel formats to PHP date formats
-
-		// strip off first part containing e.g. [$-F800] or [$USD-409]
-		// general syntax: [$<Currency string>-<language info>]
-		// language info is in hexadecimal
-		$format = preg_replace('/^(\[\$[A-Z]*-[0-9A-F]*\])/i', '', $format);
-
-		// OpenOffice.org uses upper-case number formats, e.g. 'YYYY', convert to lower-case
-		$format = strtolower($format);
-
-		$format = strtr($format,self::$_dateFormatReplacements);
-		if (!strpos($format,'A')) {	// 24-hour time format
-			$format = strtr($format,self::$_dateFormatReplacements24);
-		} else {					// 12-hour time format
-			$format = strtr($format,self::$_dateFormatReplacements12);
-		}
-
-		$dateObj = PHPExcel_Shared_Date::ExcelToPHPObject($value);
-		$value = $dateObj->format($format);
-	}
-
-	private static function _formatAsPercentage(&$value, &$format)
-	{
-		if ($format === self::FORMAT_PERCENTAGE) {
-			$value = round( (100 * $value), 0) . '%';
-		} else {
-			if (preg_match('/\.[#0]+/i', $format, $m)) {
-				$s = substr($m[0], 0, 1) . (strlen($m[0]) - 1);
-				$format = str_replace($m[0], $s, $format);
-			}
-			if (preg_match('/^[#0]+/', $format, $m)) {
-				$format = str_replace($m[0], strlen($m[0]), $format);
-			}
-			$format = '%' . str_replace('%', 'f%%', $format);
-
-			$value = sprintf($format, 100 * $value);
-		}
-	}
-
-	private static function _formatAsFraction(&$value, &$format)
-	{
-		$sign = ($value < 0) ? '-' : '';
-
-		$integerPart = floor(abs($value));
-		$decimalPart = trim(fmod(abs($value),1),'0.');
-		$decimalLength = strlen($decimalPart);
-		$decimalDivisor = pow(10,$decimalLength);
-
-		$GCD = PHPExcel_Calculation_MathTrig::GCD($decimalPart,$decimalDivisor);
-
-		$adjustedDecimalPart = $decimalPart/$GCD;
-		$adjustedDecimalDivisor = $decimalDivisor/$GCD;
-
-		if ((strpos($format,'0') !== false) || (strpos($format,'#') !== false) || (substr($format,0,3) == '? ?')) {
-			if ($integerPart == 0) {
-				$integerPart = '';
-			}
-			$value = "$sign$integerPart $adjustedDecimalPart/$adjustedDecimalDivisor";
-		} else {
-			$adjustedDecimalPart += $integerPart * $adjustedDecimalDivisor;
-			$value = "$sign$adjustedDecimalPart/$adjustedDecimalDivisor";
-		}
-	}
-
-	private static function _complexNumberFormatMask($number, $mask, $level = 0) {
-        $sign = ($number < 0.0);
-        $number = abs($number);
-		if (strpos($mask,'.') !== false) {
-			$numbers = explode('.', $number . '.0');
-			$masks = explode('.', $mask . '.0');
-			$result1 = self::_complexNumberFormatMask($numbers[0], $masks[0], 1);
-			$result2 = strrev(self::_complexNumberFormatMask(strrev($numbers[1]), strrev($masks[1]), 1));
-			return (($sign) ? '-' : '') . $result1 . '.' . $result2;
-		}
-
-		$r = preg_match_all('/0+/', $mask, $result, PREG_OFFSET_CAPTURE);
-		if ($r > 1) {
-			$result = array_reverse($result[0]);
-
-			foreach($result as $block) {
-				$divisor = 1 . $block[0];
-				$size = strlen($block[0]);
-				$offset = $block[1];
-
-				$blockValue = sprintf(
-					'%0' . $size . 'd',
-					fmod($number, $divisor)
-				);
-				$number = floor($number / $divisor);
-				$mask = substr_replace($mask, $blockValue, $offset, $size);
-			}
-			if ($number > 0) {
-				$mask = substr_replace($mask, $number, $offset, 0);
-			}
-			$result = $mask;
-		} else {
-			$result = $number;
-		}
-
-		return (($sign) ? '-' : '') . $result;
-	}
-
-	/**
-	 * Convert a value in a pre-defined format to a PHP string
-	 *
-	 * @param mixed	$value		Value to format
-	 * @param string	$format		Format code
-	 * @param array		$callBack	Callback function for additional formatting of string
-	 * @return string	Formatted string
-	 */
-	public static function toFormattedString($value = '0', $format = PHPExcel_Style_NumberFormat::FORMAT_GENERAL, $callBack = null)
-	{
-		// For now we do not treat strings although section 4 of a format code affects strings
-		if (!is_numeric($value)) return $value;
-
-		// For 'General' format code, we just pass the value although this is not entirely the way Excel does it,
-		// it seems to round numbers to a total of 10 digits.
-		if (($format === PHPExcel_Style_NumberFormat::FORMAT_GENERAL) || ($format === PHPExcel_Style_NumberFormat::FORMAT_TEXT)) {
-			return $value;
-		}
-
-		// Get the sections, there can be up to four sections
-		$sections = explode(';', $format);
-
-		// Fetch the relevant section depending on whether number is positive, negative, or zero?
-		// Text not supported yet.
-		// Here is how the sections apply to various values in Excel:
-		//   1 section:   [POSITIVE/NEGATIVE/ZERO/TEXT]
-		//   2 sections:  [POSITIVE/ZERO/TEXT] [NEGATIVE]
-		//   3 sections:  [POSITIVE/TEXT] [NEGATIVE] [ZERO]
-		//   4 sections:  [POSITIVE] [NEGATIVE] [ZERO] [TEXT]
-		switch (count($sections)) {
-			case 1:
-				$format = $sections[0];
-				break;
-
-			case 2:
-				$format = ($value >= 0) ? $sections[0] : $sections[1];
-				$value = abs($value); // Use the absolute value
-				break;
-
-			case 3:
-				$format = ($value > 0) ?
-					$sections[0] : ( ($value < 0) ?
-						$sections[1] : $sections[2]);
-				$value = abs($value); // Use the absolute value
-				break;
-
-			case 4:
-				$format = ($value > 0) ?
-					$sections[0] : ( ($value < 0) ?
-						$sections[1] : $sections[2]);
-				$value = abs($value); // Use the absolute value
-				break;
-
-			default:
-				// something is wrong, just use first section
-				$format = $sections[0];
-				break;
-		}
-
-		// Save format with color information for later use below
-		$formatColor = $format;
-
-		// Strip color information
-		$color_regex = '/^\\[[a-zA-Z]+\\]/';
-		$format = preg_replace($color_regex, '', $format);
-
-		// Let's begin inspecting the format and converting the value to a formatted string
-		if (preg_match('/^(\[\$[A-Z]*-[0-9A-F]*\])*[hmsdy]/i', $format)) { // datetime format
-			self::_formatAsDate($value, $format);
-		} else if (preg_match('/%$/', $format)) { // % number format
-			self::_formatAsPercentage($value, $format);
-		} else {
-			if ($format === self::FORMAT_CURRENCY_EUR_SIMPLE) {
-				$value = 'EUR ' . sprintf('%1.2f', $value);
-			} else {
-				// In Excel formats, "_" is used to add spacing, which we can't do in HTML
-				$format = preg_replace('/_./', '', $format);
-
-				// Some non-number characters are escaped with \, which we don't need
-				$format = preg_replace("/\\\\/", '', $format);
-//              Handle escaped characters, such as \" to display a literal " or \\ to display a literal \
-//              $format = preg_replace('/(?<!\\\\)\"/', '', $format);
-//				$format = str_replace(array('\\"', '*'), array('"', ''), $format);
-
-				// Some non-number strings are quoted, so we'll get rid of the quotes, likewise any positional * symbols
-				$format = str_replace(array('"', '*'), '', $format);
-
-				// Find out if we need thousands separator
-				// This is indicated by a comma enclosed by a digit placeholder:
-				//		#,#   or   0,0
-				$useThousands = preg_match('/(#,#|0,0)/', $format);
-				if ($useThousands) {
-					$format = preg_replace('/0,0/', '00', $format);
-					$format = preg_replace('/#,#/', '##', $format);
-				}
-
-				// Scale thousands, millions,...
-				// This is indicated by a number of commas after a digit placeholder:
-				//		#,   or	0.0,,
-				$scale = 1; // same as no scale
-				$matches = array();
-				if (preg_match('/(#|0)(,+)/', $format, $matches)) {
-					$scale = pow(1000, strlen($matches[2]));
-
-					// strip the commas
-					$format = preg_replace('/0,+/', '0', $format);
-					$format = preg_replace('/#,+/', '#', $format);
-				}
-
-				if (preg_match('/#?.*\?\/\?/', $format, $m)) {
-					//echo 'Format mask is fractional '.$format.' <br />';
-					if ($value != (int)$value) {
-						self::_formatAsFraction($value, $format);
-					}
-
-				} else {
-					// Handle the number itself
-
-					// scale number
-					$value = $value / $scale;
-
-					// Strip #
-					$format = preg_replace('/\\#/', '0', $format);
-
-					$n = "/\[[^\]]+\]/";
-					$m = preg_replace($n, '', $format);
-					$number_regex = "/(0+)(\.?)(0*)/";
-					if (preg_match($number_regex, $m, $matches)) {
-						$left = $matches[1];
-						$dec = $matches[2];
-						$right = $matches[3];
-
-						// minimun width of formatted number (including dot)
-						$minWidth = strlen($left) + strlen($dec) + strlen($right);
-						if ($useThousands) {
-							$value = number_format(
-										$value
-										, strlen($right)
-										, PHPExcel_Shared_String::getDecimalSeparator()
-										, PHPExcel_Shared_String::getThousandsSeparator()
-									);
-							$value = preg_replace($number_regex, $value, $format);
-						} else {
-							if (preg_match('/[0#]E[+-]0/i', $format)) {
-								//	Scientific format
-								$value = sprintf('%5.2E', $value);
-							} elseif (preg_match('/0([^\d\.]+)0/', $format)) {
-								$value = self::_complexNumberFormatMask($value, $format);
-							} else {
-								$sprintf_pattern = "%0$minWidth." . strlen($right) . "f";
-								$value = sprintf($sprintf_pattern, $value);
-								$value = preg_replace($number_regex, $value, $format);
-							}
-						}
-					}
-				}
-				if (preg_match('/\[\$(.*)\]/u', $format, $m)) {
-					//	Currency or Accounting
-					$currencyFormat = $m[0];
-					$currencyCode = $m[1];
-					list($currencyCode) = explode('-',$currencyCode);
-					if ($currencyCode == '') {
-						$currencyCode = PHPExcel_Shared_String::getCurrencyCode();
-					}
-					$value = preg_replace('/\[\$([^\]]*)\]/u',$currencyCode,$value);
-				}
-			}
-		}
-
-		// Additional formatting provided by callback function
-		if ($callBack !== null) {
-			list($writerInstance, $function) = $callBack;
-			$value = $writerInstance->$function($value, $formatColor);
-		}
-
-		return $value;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Protection.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Protection.php
deleted file mode 100644
index 8dc1f31ad70..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Protection.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.4.5, 2007-08-23
- */
-
-
-/**
- * PHPExcel_Style_Protection
- *
- * @category   PHPExcel
- * @package    PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Style_Protection extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
-{
-	/** Protection styles */
-	const PROTECTION_INHERIT		= 'inherit';
-	const PROTECTION_PROTECTED		= 'protected';
-	const PROTECTION_UNPROTECTED	= 'unprotected';
-
-	/**
-	 * Locked
-	 *
-	 * @var string
-	 */
-	protected $_locked;
-
-	/**
-	 * Hidden
-	 *
-	 * @var string
-	 */
-	protected $_hidden;
-
-	/**
-     * Create a new PHPExcel_Style_Protection
-	 *
-	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 * @param	boolean	$isConditional	Flag indicating if this is a conditional style or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-     */
-    public function __construct($isSupervisor = FALSE, $isConditional = FALSE)
-    {
-    	// Supervisor?
-		parent::__construct($isSupervisor);
-
-    	// Initialise values
-		if (!$isConditional) {
-	    	$this->_locked			= self::PROTECTION_INHERIT;
-	    	$this->_hidden			= self::PROTECTION_INHERIT;
-		}
-    }
-
-	/**
-	 * Get the shared style component for the currently active cell in currently active sheet.
-	 * Only used for style supervisor
-	 *
-	 * @return PHPExcel_Style_Protection
-	 */
-	public function getSharedComponent()
-	{
-		return $this->_parent->getSharedComponent()->getProtection();
-	}
-
-	/**
-	 * Build style array from subcomponents
-	 *
-	 * @param array $array
-	 * @return array
-	 */
-	public function getStyleArray($array)
-	{
-		return array('protection' => $array);
-	}
-
-    /**
-     * Apply styles from array
-     *
-     * <code>
-     * $objPHPExcel->getActiveSheet()->getStyle('B2')->getLocked()->applyFromArray(
-     *		array(
-     *			'locked' => TRUE,
-     *			'hidden' => FALSE
-     *		)
-     * );
-     * </code>
-     *
-     * @param	array	$pStyles	Array containing style information
-     * @throws	PHPExcel_Exception
-     * @return PHPExcel_Style_Protection
-     */
-	public function applyFromArray($pStyles = NULL) {
-		if (is_array($pStyles)) {
-			if ($this->_isSupervisor) {
-				$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
-			} else {
-				if (isset($pStyles['locked'])) {
-					$this->setLocked($pStyles['locked']);
-				}
-				if (isset($pStyles['hidden'])) {
-					$this->setHidden($pStyles['hidden']);
-				}
-			}
-		} else {
-			throw new PHPExcel_Exception("Invalid style array passed.");
-		}
-		return $this;
-	}
-
-    /**
-     * Get locked
-     *
-     * @return string
-     */
-    public function getLocked() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getLocked();
-		}
-    	return $this->_locked;
-    }
-
-    /**
-     * Set locked
-     *
-     * @param string $pValue
-     * @return PHPExcel_Style_Protection
-     */
-    public function setLocked($pValue = self::PROTECTION_INHERIT) {
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('locked' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_locked = $pValue;
-		}
-		return $this;
-    }
-
-    /**
-     * Get hidden
-     *
-     * @return string
-     */
-    public function getHidden() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getHidden();
-		}
-    	return $this->_hidden;
-    }
-
-    /**
-     * Set hidden
-     *
-     * @param string $pValue
-     * @return PHPExcel_Style_Protection
-     */
-    public function setHidden($pValue = self::PROTECTION_INHERIT) {
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('hidden' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_hidden = $pValue;
-		}
-		return $this;
-    }
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getHashCode();
-		}
-    	return md5(
-    		  $this->_locked
-    		. $this->_hidden
-    		. __CLASS__
-    	);
-    }
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Supervisor.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Supervisor.php
deleted file mode 100644
index 2d21f52934d..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Supervisor.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Style_Supervisor
- *
- * @category   PHPExcel
- * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-abstract class PHPExcel_Style_Supervisor
-{
-	/**
-	 * Supervisor?
-	 *
-	 * @var boolean
-	 */
-	protected $_isSupervisor;
-
-	/**
-	 * Parent. Only used for supervisor
-	 *
-	 * @var PHPExcel_Style
-	 */
-	protected $_parent;
-
-	/**
-	 * Create a new PHPExcel_Style_Alignment
-	 *
-	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 */
-	public function __construct($isSupervisor = FALSE)
-	{
-		// Supervisor?
-		$this->_isSupervisor = $isSupervisor;
-	}
-
-	/**
-	 * Bind parent. Only used for supervisor
-	 *
-	 * @param PHPExcel $parent
-	 * @return PHPExcel_Style_Supervisor
-	 */
-	public function bindParent($parent, $parentPropertyName=NULL)
-	{
-		$this->_parent = $parent;
-		return $this;
-	}
-
-	/**
-	 * Is this a supervisor or a cell style component?
-	 *
-	 * @return boolean
-	 */
-	public function getIsSupervisor()
-	{
-		return $this->_isSupervisor;
-	}
-
-	/**
-	 * Get the currently active sheet. Only used for supervisor
-	 *
-	 * @return PHPExcel_Worksheet
-	 */
-	public function getActiveSheet()
-	{
-		return $this->_parent->getActiveSheet();
-	}
-
-	/**
-	 * Get the currently active cell coordinate in currently active sheet.
-	 * Only used for supervisor
-	 *
-	 * @return string E.g. 'A1'
-	 */
-	public function getSelectedCells()
-	{
-		return $this->getActiveSheet()->getSelectedCells();
-	}
-
-	/**
-	 * Get the currently active cell coordinate in currently active sheet.
-	 * Only used for supervisor
-	 *
-	 * @return string E.g. 'A1'
-	 */
-	public function getActiveCell()
-	{
-		return $this->getActiveSheet()->getActiveCell();
-	}
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if ((is_object($value)) && ($key != '_parent')) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet.php
deleted file mode 100644
index 2b0b57ae4d2..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet.php
+++ /dev/null
@@ -1,2945 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet implements PHPExcel_IComparable
-{
-    /* Break types */
-    const BREAK_NONE   = 0;
-    const BREAK_ROW    = 1;
-    const BREAK_COLUMN = 2;
-
-    /* Sheet state */
-    const SHEETSTATE_VISIBLE    = 'visible';
-    const SHEETSTATE_HIDDEN     = 'hidden';
-    const SHEETSTATE_VERYHIDDEN = 'veryHidden';
-
-    /**
-     * Invalid characters in sheet title
-     *
-     * @var array
-     */
-    private static $_invalidCharacters = array('*', ':', '/', '\\', '?', '[', ']');
-
-    /**
-     * Parent spreadsheet
-     *
-     * @var PHPExcel
-     */
-    private $_parent;
-
-    /**
-     * Cacheable collection of cells
-     *
-     * @var PHPExcel_CachedObjectStorage_xxx
-     */
-    private $_cellCollection = null;
-
-    /**
-     * Collection of row dimensions
-     *
-     * @var PHPExcel_Worksheet_RowDimension[]
-     */
-    private $_rowDimensions = array();
-
-    /**
-     * Default row dimension
-     *
-     * @var PHPExcel_Worksheet_RowDimension
-     */
-    private $_defaultRowDimension = null;
-
-    /**
-     * Collection of column dimensions
-     *
-     * @var PHPExcel_Worksheet_ColumnDimension[]
-     */
-    private $_columnDimensions = array();
-
-    /**
-     * Default column dimension
-     *
-     * @var PHPExcel_Worksheet_ColumnDimension
-     */
-    private $_defaultColumnDimension = null;
-
-    /**
-     * Collection of drawings
-     *
-     * @var PHPExcel_Worksheet_BaseDrawing[]
-     */
-    private $_drawingCollection = null;
-
-    /**
-     * Collection of Chart objects
-     *
-     * @var PHPExcel_Chart[]
-     */
-    private $_chartCollection = array();
-
-    /**
-     * Worksheet title
-     *
-     * @var string
-     */
-    private $_title;
-
-    /**
-     * Sheet state
-     *
-     * @var string
-     */
-    private $_sheetState;
-
-    /**
-     * Page setup
-     *
-     * @var PHPExcel_Worksheet_PageSetup
-     */
-    private $_pageSetup;
-
-    /**
-     * Page margins
-     *
-     * @var PHPExcel_Worksheet_PageMargins
-     */
-    private $_pageMargins;
-
-    /**
-     * Page header/footer
-     *
-     * @var PHPExcel_Worksheet_HeaderFooter
-     */
-    private $_headerFooter;
-
-    /**
-     * Sheet view
-     *
-     * @var PHPExcel_Worksheet_SheetView
-     */
-    private $_sheetView;
-
-    /**
-     * Protection
-     *
-     * @var PHPExcel_Worksheet_Protection
-     */
-    private $_protection;
-
-    /**
-     * Collection of styles
-     *
-     * @var PHPExcel_Style[]
-     */
-    private $_styles = array();
-
-    /**
-     * Conditional styles. Indexed by cell coordinate, e.g. 'A1'
-     *
-     * @var array
-     */
-    private $_conditionalStylesCollection = array();
-
-    /**
-     * Is the current cell collection sorted already?
-     *
-     * @var boolean
-     */
-    private $_cellCollectionIsSorted = false;
-
-    /**
-     * Collection of breaks
-     *
-     * @var array
-     */
-    private $_breaks = array();
-
-    /**
-     * Collection of merged cell ranges
-     *
-     * @var array
-     */
-    private $_mergeCells = array();
-
-    /**
-     * Collection of protected cell ranges
-     *
-     * @var array
-     */
-    private $_protectedCells = array();
-
-    /**
-     * Autofilter Range and selection
-     *
-     * @var PHPExcel_Worksheet_AutoFilter
-     */
-    private $_autoFilter = NULL;
-
-    /**
-     * Freeze pane
-     *
-     * @var string
-     */
-    private $_freezePane = '';
-
-    /**
-     * Show gridlines?
-     *
-     * @var boolean
-     */
-    private $_showGridlines = true;
-
-    /**
-    * Print gridlines?
-    *
-    * @var boolean
-    */
-    private $_printGridlines = false;
-
-    /**
-    * Show row and column headers?
-    *
-    * @var boolean
-    */
-    private $_showRowColHeaders = true;
-
-    /**
-     * Show summary below? (Row/Column outline)
-     *
-     * @var boolean
-     */
-    private $_showSummaryBelow = true;
-
-    /**
-     * Show summary right? (Row/Column outline)
-     *
-     * @var boolean
-     */
-    private $_showSummaryRight = true;
-
-    /**
-     * Collection of comments
-     *
-     * @var PHPExcel_Comment[]
-     */
-    private $_comments = array();
-
-    /**
-     * Active cell. (Only one!)
-     *
-     * @var string
-     */
-    private $_activeCell = 'A1';
-
-    /**
-     * Selected cells
-     *
-     * @var string
-     */
-    private $_selectedCells = 'A1';
-
-    /**
-     * Cached highest column
-     *
-     * @var string
-     */
-    private $_cachedHighestColumn = 'A';
-
-    /**
-     * Cached highest row
-     *
-     * @var int
-     */
-    private $_cachedHighestRow = 1;
-
-    /**
-     * Right-to-left?
-     *
-     * @var boolean
-     */
-    private $_rightToLeft = false;
-
-    /**
-     * Hyperlinks. Indexed by cell coordinate, e.g. 'A1'
-     *
-     * @var array
-     */
-    private $_hyperlinkCollection = array();
-
-    /**
-     * Data validation objects. Indexed by cell coordinate, e.g. 'A1'
-     *
-     * @var array
-     */
-    private $_dataValidationCollection = array();
-
-    /**
-     * Tab color
-     *
-     * @var PHPExcel_Style_Color
-     */
-    private $_tabColor;
-
-    /**
-     * Dirty flag
-     *
-     * @var boolean
-     */
-    private $_dirty    = true;
-
-    /**
-     * Hash
-     *
-     * @var string
-     */
-    private $_hash    = null;
-
-    /**
-    * CodeName
-    *
-    * @var string
-    */
-    private $_codeName = null;
-
-	/**
-     * Create a new worksheet
-     *
-     * @param PHPExcel        $pParent
-     * @param string        $pTitle
-     */
-    public function __construct(PHPExcel $pParent = null, $pTitle = 'Worksheet')
-    {
-        // Set parent and title
-        $this->_parent = $pParent;
-        $this->setTitle($pTitle, FALSE);
-        // setTitle can change $pTitle
-	    $this->setCodeName($this->getTitle());
-        $this->setSheetState(PHPExcel_Worksheet::SHEETSTATE_VISIBLE);
-
-        $this->_cellCollection        = PHPExcel_CachedObjectStorageFactory::getInstance($this);
-
-        // Set page setup
-        $this->_pageSetup            = new PHPExcel_Worksheet_PageSetup();
-
-        // Set page margins
-        $this->_pageMargins         = new PHPExcel_Worksheet_PageMargins();
-
-        // Set page header/footer
-        $this->_headerFooter        = new PHPExcel_Worksheet_HeaderFooter();
-
-        // Set sheet view
-        $this->_sheetView            = new PHPExcel_Worksheet_SheetView();
-
-        // Drawing collection
-        $this->_drawingCollection    = new ArrayObject();
-
-        // Chart collection
-        $this->_chartCollection     = new ArrayObject();
-
-        // Protection
-        $this->_protection            = new PHPExcel_Worksheet_Protection();
-
-        // Default row dimension
-        $this->_defaultRowDimension = new PHPExcel_Worksheet_RowDimension(NULL);
-
-        // Default column dimension
-        $this->_defaultColumnDimension    = new PHPExcel_Worksheet_ColumnDimension(NULL);
-
-        $this->_autoFilter            = new PHPExcel_Worksheet_AutoFilter(NULL, $this);
-    }
-
-
-    /**
-     * Disconnect all cells from this PHPExcel_Worksheet object,
-     *    typically so that the worksheet object can be unset
-     *
-     */
-	public function disconnectCells() {
-    	if ( $this->_cellCollection !== NULL){
-            $this->_cellCollection->unsetWorksheetCells();
-            $this->_cellCollection = NULL;
-    	}
-        //    detach ourself from the workbook, so that it can then delete this worksheet successfully
-        $this->_parent = null;
-    }
-
-    /**
-     * Code to execute when this worksheet is unset()
-     *
-     */
-	function __destruct() {
-		PHPExcel_Calculation::getInstance($this->_parent)
-		    ->clearCalculationCacheForWorksheet($this->_title);
-
-		$this->disconnectCells();
-	}
-
-   /**
-     * Return the cache controller for the cell collection
-     *
-     * @return PHPExcel_CachedObjectStorage_xxx
-     */
-	public function getCellCacheController() {
-        return $this->_cellCollection;
-    }    //    function getCellCacheController()
-
-
-    /**
-     * Get array of invalid characters for sheet title
-     *
-     * @return array
-     */
-    public static function getInvalidCharacters()
-    {
-        return self::$_invalidCharacters;
-    }
-
-    /**
-     * Check sheet code name for valid Excel syntax
-     *
-     * @param string $pValue The string to check
-     * @return string The valid string
-     * @throws Exception
-     */
-    private static function _checkSheetCodeName($pValue)
-    {
-        $CharCount = PHPExcel_Shared_String::CountCharacters($pValue);
-        if ($CharCount == 0) {
-            throw new PHPExcel_Exception('Sheet code name cannot be empty.');
-        }
-        // Some of the printable ASCII characters are invalid:  * : / \ ? [ ] and  first and last characters cannot be a "'"
-        if ((str_replace(self::$_invalidCharacters, '', $pValue) !== $pValue) || 
-            (PHPExcel_Shared_String::Substring($pValue,-1,1)=='\'') || 
-            (PHPExcel_Shared_String::Substring($pValue,0,1)=='\'')) {
-            throw new PHPExcel_Exception('Invalid character found in sheet code name');
-        }
- 
-        // Maximum 31 characters allowed for sheet title
-        if ($CharCount > 31) {
-            throw new PHPExcel_Exception('Maximum 31 characters allowed in sheet code name.');
-        }
- 
-        return $pValue;
-    }
-
-   /**
-     * Check sheet title for valid Excel syntax
-     *
-     * @param string $pValue The string to check
-     * @return string The valid string
-     * @throws PHPExcel_Exception
-     */
-    private static function _checkSheetTitle($pValue)
-    {
-        // Some of the printable ASCII characters are invalid:  * : / \ ? [ ]
-        if (str_replace(self::$_invalidCharacters, '', $pValue) !== $pValue) {
-            throw new PHPExcel_Exception('Invalid character found in sheet title');
-        }
-
-        // Maximum 31 characters allowed for sheet title
-        if (PHPExcel_Shared_String::CountCharacters($pValue) > 31) {
-            throw new PHPExcel_Exception('Maximum 31 characters allowed in sheet title.');
-        }
-
-        return $pValue;
-    }
-
-    /**
-     * Get collection of cells
-     *
-     * @param boolean $pSorted Also sort the cell collection?
-     * @return PHPExcel_Cell[]
-     */
-    public function getCellCollection($pSorted = true)
-    {
-        if ($pSorted) {
-            // Re-order cell collection
-            return $this->sortCellCollection();
-        }
-        if ($this->_cellCollection !== NULL) {
-            return $this->_cellCollection->getCellList();
-        }
-        return array();
-    }
-
-    /**
-     * Sort collection of cells
-     *
-     * @return PHPExcel_Worksheet
-     */
-    public function sortCellCollection()
-    {
-        if ($this->_cellCollection !== NULL) {
-            return $this->_cellCollection->getSortedCellList();
-        }
-        return array();
-    }
-
-    /**
-     * Get collection of row dimensions
-     *
-     * @return PHPExcel_Worksheet_RowDimension[]
-     */
-    public function getRowDimensions()
-    {
-        return $this->_rowDimensions;
-    }
-
-    /**
-     * Get default row dimension
-     *
-     * @return PHPExcel_Worksheet_RowDimension
-     */
-    public function getDefaultRowDimension()
-    {
-        return $this->_defaultRowDimension;
-    }
-
-    /**
-     * Get collection of column dimensions
-     *
-     * @return PHPExcel_Worksheet_ColumnDimension[]
-     */
-    public function getColumnDimensions()
-    {
-        return $this->_columnDimensions;
-    }
-
-    /**
-     * Get default column dimension
-     *
-     * @return PHPExcel_Worksheet_ColumnDimension
-     */
-    public function getDefaultColumnDimension()
-    {
-        return $this->_defaultColumnDimension;
-    }
-
-    /**
-     * Get collection of drawings
-     *
-     * @return PHPExcel_Worksheet_BaseDrawing[]
-     */
-    public function getDrawingCollection()
-    {
-        return $this->_drawingCollection;
-    }
-
-    /**
-     * Get collection of charts
-     *
-     * @return PHPExcel_Chart[]
-     */
-    public function getChartCollection()
-    {
-        return $this->_chartCollection;
-    }
-
-    /**
-     * Add chart
-     *
-     * @param PHPExcel_Chart $pChart
-     * @param int|null $iChartIndex Index where chart should go (0,1,..., or null for last)
-     * @return PHPExcel_Chart
-     */
-    public function addChart(PHPExcel_Chart $pChart = null, $iChartIndex = null)
-    {
-        $pChart->setWorksheet($this);
-        if (is_null($iChartIndex)) {
-            $this->_chartCollection[] = $pChart;
-        } else {
-            // Insert the chart at the requested index
-            array_splice($this->_chartCollection, $iChartIndex, 0, array($pChart));
-        }
-
-        return $pChart;
-    }
-
-    /**
-     * Return the count of charts on this worksheet
-     *
-     * @return int        The number of charts
-     */
-    public function getChartCount()
-    {
-        return count($this->_chartCollection);
-    }
-
-    /**
-     * Get a chart by its index position
-     *
-     * @param string $index Chart index position
-     * @return false|PHPExcel_Chart
-     * @throws PHPExcel_Exception
-     */
-    public function getChartByIndex($index = null)
-    {
-        $chartCount = count($this->_chartCollection);
-        if ($chartCount == 0) {
-            return false;
-        }
-        if (is_null($index)) {
-            $index = --$chartCount;
-        }
-        if (!isset($this->_chartCollection[$index])) {
-            return false;
-        }
-
-        return $this->_chartCollection[$index];
-    }
-
-    /**
-     * Return an array of the names of charts on this worksheet
-     *
-     * @return string[] The names of charts
-     * @throws PHPExcel_Exception
-     */
-    public function getChartNames()
-    {
-        $chartNames = array();
-        foreach($this->_chartCollection as $chart) {
-            $chartNames[] = $chart->getName();
-        }
-        return $chartNames;
-    }
-
-    /**
-     * Get a chart by name
-     *
-     * @param string $chartName Chart name
-     * @return false|PHPExcel_Chart
-     * @throws PHPExcel_Exception
-     */
-    public function getChartByName($chartName = '')
-    {
-        $chartCount = count($this->_chartCollection);
-        if ($chartCount == 0) {
-            return false;
-        }
-        foreach($this->_chartCollection as $index => $chart) {
-            if ($chart->getName() == $chartName) {
-                return $this->_chartCollection[$index];
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Refresh column dimensions
-     *
-     * @return PHPExcel_Worksheet
-     */
-    public function refreshColumnDimensions()
-    {
-        $currentColumnDimensions = $this->getColumnDimensions();
-        $newColumnDimensions = array();
-
-        foreach ($currentColumnDimensions as $objColumnDimension) {
-            $newColumnDimensions[$objColumnDimension->getColumnIndex()] = $objColumnDimension;
-        }
-
-        $this->_columnDimensions = $newColumnDimensions;
-
-        return $this;
-    }
-
-    /**
-     * Refresh row dimensions
-     *
-     * @return PHPExcel_Worksheet
-     */
-    public function refreshRowDimensions()
-    {
-        $currentRowDimensions = $this->getRowDimensions();
-        $newRowDimensions = array();
-
-        foreach ($currentRowDimensions as $objRowDimension) {
-            $newRowDimensions[$objRowDimension->getRowIndex()] = $objRowDimension;
-        }
-
-        $this->_rowDimensions = $newRowDimensions;
-
-        return $this;
-    }
-
-    /**
-     * Calculate worksheet dimension
-     *
-     * @return string  String containing the dimension of this worksheet
-     */
-    public function calculateWorksheetDimension()
-    {
-        // Return
-        return 'A1' . ':' .  $this->getHighestColumn() . $this->getHighestRow();
-    }
-
-    /**
-     * Calculate worksheet data dimension
-     *
-     * @return string  String containing the dimension of this worksheet that actually contain data
-     */
-    public function calculateWorksheetDataDimension()
-    {
-        // Return
-        return 'A1' . ':' .  $this->getHighestDataColumn() . $this->getHighestDataRow();
-    }
-
-    /**
-     * Calculate widths for auto-size columns
-     *
-     * @param  boolean  $calculateMergeCells  Calculate merge cell width
-     * @return PHPExcel_Worksheet;
-     */
-    public function calculateColumnWidths($calculateMergeCells = false)
-    {
-        // initialize $autoSizes array
-        $autoSizes = array();
-        foreach ($this->getColumnDimensions() as $colDimension) {
-            if ($colDimension->getAutoSize()) {
-                $autoSizes[$colDimension->getColumnIndex()] = -1;
-            }
-        }
-
-        // There is only something to do if there are some auto-size columns
-        if (!empty($autoSizes)) {
-
-            // build list of cells references that participate in a merge
-            $isMergeCell = array();
-            foreach ($this->getMergeCells() as $cells) {
-                foreach (PHPExcel_Cell::extractAllCellReferencesInRange($cells) as $cellReference) {
-                    $isMergeCell[$cellReference] = true;
-                }
-            }
-
-            // loop through all cells in the worksheet
-            foreach ($this->getCellCollection(false) as $cellID) {
-                $cell = $this->getCell($cellID);
-				if (isset($autoSizes[$this->_cellCollection->getCurrentColumn()])) {
-                    // Determine width if cell does not participate in a merge
-					if (!isset($isMergeCell[$this->_cellCollection->getCurrentAddress()])) {
-                        // Calculated value
-                        // To formatted string
-						$cellValue = PHPExcel_Style_NumberFormat::toFormattedString(
-							$cell->getCalculatedValue(),
-							$this->getParent()->getCellXfByIndex($cell->getXfIndex())->getNumberFormat()->getFormatCode()
-						);
-
-						$autoSizes[$this->_cellCollection->getCurrentColumn()] = max(
-							(float) $autoSizes[$this->_cellCollection->getCurrentColumn()],
-                            (float)PHPExcel_Shared_Font::calculateColumnWidth(
-								$this->getParent()->getCellXfByIndex($cell->getXfIndex())->getFont(),
-                                $cellValue,
-								$this->getParent()->getCellXfByIndex($cell->getXfIndex())->getAlignment()->getTextRotation(),
-                                $this->getDefaultStyle()->getFont()
-                            )
-                        );
-                    }
-                }
-            }
-
-            // adjust column widths
-            foreach ($autoSizes as $columnIndex => $width) {
-                if ($width == -1) $width = $this->getDefaultColumnDimension()->getWidth();
-                $this->getColumnDimension($columnIndex)->setWidth($width);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get parent
-     *
-     * @return PHPExcel
-     */
-	public function getParent() {
-        return $this->_parent;
-    }
-
-    /**
-     * Re-bind parent
-     *
-     * @param PHPExcel $parent
-     * @return PHPExcel_Worksheet
-     */
-	public function rebindParent(PHPExcel $parent) {
-        if ($this->_parent !== null) {
-            $namedRanges = $this->_parent->getNamedRanges();
-            foreach ($namedRanges as $namedRange) {
-                $parent->addNamedRange($namedRange);
-            }
-
-            $this->_parent->removeSheetByIndex(
-                $this->_parent->getIndex($this)
-            );
-        }
-        $this->_parent = $parent;
-
-        return $this;
-    }
-
-    /**
-     * Get title
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return $this->_title;
-    }
-
-    /**
-     * Set title
-     *
-     * @param string $pValue String containing the dimension of this worksheet
-     * @param string $updateFormulaCellReferences boolean Flag indicating whether cell references in formulae should
-     *        	be updated to reflect the new sheet name.
-     *          This should be left as the default true, unless you are
-     *          certain that no formula cells on any worksheet contain
-     *          references to this worksheet
-     * @return PHPExcel_Worksheet
-     */
-    public function setTitle($pValue = 'Worksheet', $updateFormulaCellReferences = true)
-    {
-        // Is this a 'rename' or not?
-        if ($this->getTitle() == $pValue) {
-            return $this;
-        }
-
-        // Syntax check
-        self::_checkSheetTitle($pValue);
-
-        // Old title
-        $oldTitle = $this->getTitle();
-
-        if ($this->_parent) {
-            // Is there already such sheet name?
-			if ($this->_parent->sheetNameExists($pValue)) {
-                // Use name, but append with lowest possible integer
-
-                if (PHPExcel_Shared_String::CountCharacters($pValue) > 29) {
-                    $pValue = PHPExcel_Shared_String::Substring($pValue,0,29);
-                }
-                $i = 1;
-				while ($this->_parent->sheetNameExists($pValue . ' ' . $i)) {
-                    ++$i;
-                    if ($i == 10) {
-                        if (PHPExcel_Shared_String::CountCharacters($pValue) > 28) {
-                            $pValue = PHPExcel_Shared_String::Substring($pValue,0,28);
-                        }
-                    } elseif ($i == 100) {
-                        if (PHPExcel_Shared_String::CountCharacters($pValue) > 27) {
-                            $pValue = PHPExcel_Shared_String::Substring($pValue,0,27);
-                        }
-                    }
-                }
-
-                $altTitle = $pValue . ' ' . $i;
-                return $this->setTitle($altTitle,$updateFormulaCellReferences);
-            }
-        }
-
-        // Set title
-        $this->_title = $pValue;
-        $this->_dirty = true;
-
-        if ($this->_parent) {
-            // New title
-            $newTitle = $this->getTitle();
-			PHPExcel_Calculation::getInstance($this->_parent)
-			    ->renameCalculationCacheForWorksheet($oldTitle, $newTitle);
-            if ($updateFormulaCellReferences)
-				PHPExcel_ReferenceHelper::getInstance()->updateNamedFormulas($this->_parent, $oldTitle, $newTitle);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get sheet state
-     *
-     * @return string Sheet state (visible, hidden, veryHidden)
-     */
-	public function getSheetState() {
-        return $this->_sheetState;
-    }
-
-    /**
-     * Set sheet state
-     *
-     * @param string $value Sheet state (visible, hidden, veryHidden)
-     * @return PHPExcel_Worksheet
-     */
-	public function setSheetState($value = PHPExcel_Worksheet::SHEETSTATE_VISIBLE) {
-        $this->_sheetState = $value;
-        return $this;
-    }
-
-    /**
-     * Get page setup
-     *
-     * @return PHPExcel_Worksheet_PageSetup
-     */
-    public function getPageSetup()
-    {
-        return $this->_pageSetup;
-    }
-
-    /**
-     * Set page setup
-     *
-     * @param PHPExcel_Worksheet_PageSetup    $pValue
-     * @return PHPExcel_Worksheet
-     */
-    public function setPageSetup(PHPExcel_Worksheet_PageSetup $pValue)
-    {
-        $this->_pageSetup = $pValue;
-        return $this;
-    }
-
-    /**
-     * Get page margins
-     *
-     * @return PHPExcel_Worksheet_PageMargins
-     */
-    public function getPageMargins()
-    {
-        return $this->_pageMargins;
-    }
-
-    /**
-     * Set page margins
-     *
-     * @param PHPExcel_Worksheet_PageMargins    $pValue
-     * @return PHPExcel_Worksheet
-     */
-    public function setPageMargins(PHPExcel_Worksheet_PageMargins $pValue)
-    {
-        $this->_pageMargins = $pValue;
-        return $this;
-    }
-
-    /**
-     * Get page header/footer
-     *
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function getHeaderFooter()
-    {
-        return $this->_headerFooter;
-    }
-
-    /**
-     * Set page header/footer
-     *
-     * @param PHPExcel_Worksheet_HeaderFooter    $pValue
-     * @return PHPExcel_Worksheet
-     */
-    public function setHeaderFooter(PHPExcel_Worksheet_HeaderFooter $pValue)
-    {
-        $this->_headerFooter = $pValue;
-        return $this;
-    }
-
-    /**
-     * Get sheet view
-     *
-     * @return PHPExcel_Worksheet_SheetView
-     */
-    public function getSheetView()
-    {
-        return $this->_sheetView;
-    }
-
-    /**
-     * Set sheet view
-     *
-     * @param PHPExcel_Worksheet_SheetView    $pValue
-     * @return PHPExcel_Worksheet
-     */
-    public function setSheetView(PHPExcel_Worksheet_SheetView $pValue)
-    {
-        $this->_sheetView = $pValue;
-        return $this;
-    }
-
-    /**
-     * Get Protection
-     *
-     * @return PHPExcel_Worksheet_Protection
-     */
-    public function getProtection()
-    {
-        return $this->_protection;
-    }
-
-    /**
-     * Set Protection
-     *
-     * @param PHPExcel_Worksheet_Protection    $pValue
-     * @return PHPExcel_Worksheet
-     */
-    public function setProtection(PHPExcel_Worksheet_Protection $pValue)
-    {
-        $this->_protection = $pValue;
-        $this->_dirty = true;
-
-        return $this;
-    }
-
-    /**
-     * Get highest worksheet column
-     *
-     * @param   string     $row        Return the data highest column for the specified row,
-     *                                     or the highest column of any row if no row number is passed
-     * @return string Highest column name
-     */
-    public function getHighestColumn($row = null)
-    {
-        if ($row == null) {
-            return $this->_cachedHighestColumn;
-        }
-        return $this->getHighestDataColumn($row);
-    }
-
-    /**
-     * Get highest worksheet column that contains data
-     *
-     * @param   string     $row        Return the highest data column for the specified row,
-     *                                     or the highest data column of any row if no row number is passed
-     * @return string Highest column name that contains data
-     */
-    public function getHighestDataColumn($row = null)
-    {
-        return $this->_cellCollection->getHighestColumn($row);
-    }
-
-    /**
-     * Get highest worksheet row
-     *
-     * @param   string     $column     Return the highest data row for the specified column,
-     *                                     or the highest row of any column if no column letter is passed
-     * @return int Highest row number
-     */
-    public function getHighestRow($column = null)
-    {
-        if ($column == null) {
-            return $this->_cachedHighestRow;
-        }
-        return $this->getHighestDataRow($column);
-    }
-
-    /**
-     * Get highest worksheet row that contains data
-     *
-     * @param   string     $column     Return the highest data row for the specified column,
-     *                                     or the highest data row of any column if no column letter is passed
-     * @return string Highest row number that contains data
-     */
-    public function getHighestDataRow($column = null)
-    {
-        return $this->_cellCollection->getHighestRow($column);
-    }
-
-    /**
-     * Get highest worksheet column and highest row that have cell records
-     *
-     * @return array Highest column name and highest row number
-     */
-    public function getHighestRowAndColumn()
-    {
-        return $this->_cellCollection->getHighestRowAndColumn();
-    }
-
-    /**
-     * Set a cell value
-     *
-     * @param string $pCoordinate Coordinate of the cell
-     * @param mixed $pValue Value of the cell
-     * @param bool $returnCell   Return the worksheet (false, default) or the cell (true)
-     * @return PHPExcel_Worksheet|PHPExcel_Cell    Depending on the last parameter being specified
-     */
-    public function setCellValue($pCoordinate = 'A1', $pValue = null, $returnCell = false)
-    {
-        $cell = $this->getCell(strtoupper($pCoordinate))->setValue($pValue);
-        return ($returnCell) ? $cell : $this;
-    }
-
-    /**
-     * Set a cell value by using numeric cell coordinates
-     *
-     * @param string $pColumn Numeric column coordinate of the cell (A = 0)
-     * @param string $pRow Numeric row coordinate of the cell
-     * @param mixed $pValue Value of the cell
-     * @param bool $returnCell Return the worksheet (false, default) or the cell (true)
-     * @return PHPExcel_Worksheet|PHPExcel_Cell    Depending on the last parameter being specified
-     */
-    public function setCellValueByColumnAndRow($pColumn = 0, $pRow = 1, $pValue = null, $returnCell = false)
-    {
-        $cell = $this->getCellByColumnAndRow($pColumn, $pRow)->setValue($pValue);
-        return ($returnCell) ? $cell : $this;
-    }
-
-    /**
-     * Set a cell value
-     *
-     * @param string $pCoordinate Coordinate of the cell
-     * @param mixed  $pValue Value of the cell
-     * @param string $pDataType Explicit data type
-     * @param bool $returnCell Return the worksheet (false, default) or the cell (true)
-     * @return PHPExcel_Worksheet|PHPExcel_Cell    Depending on the last parameter being specified
-     */
-    public function setCellValueExplicit($pCoordinate = 'A1', $pValue = null, $pDataType = PHPExcel_Cell_DataType::TYPE_STRING, $returnCell = false)
-    {
-        // Set value
-        $cell = $this->getCell(strtoupper($pCoordinate))->setValueExplicit($pValue, $pDataType);
-        return ($returnCell) ? $cell : $this;
-    }
-
-    /**
-     * Set a cell value by using numeric cell coordinates
-     *
-     * @param string $pColumn Numeric column coordinate of the cell
-     * @param string $pRow Numeric row coordinate of the cell
-     * @param mixed $pValue Value of the cell
-     * @param string $pDataType Explicit data type
-     * @param bool $returnCell Return the worksheet (false, default) or the cell (true)
-     * @return PHPExcel_Worksheet|PHPExcel_Cell    Depending on the last parameter being specified
-     */
-    public function setCellValueExplicitByColumnAndRow($pColumn = 0, $pRow = 1, $pValue = null, $pDataType = PHPExcel_Cell_DataType::TYPE_STRING, $returnCell = false)
-    {
-        $cell = $this->getCellByColumnAndRow($pColumn, $pRow)->setValueExplicit($pValue, $pDataType);
-        return ($returnCell) ? $cell : $this;
-    }
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param string $pCoordinate    Coordinate of the cell
-     * @throws PHPExcel_Exception
-     * @return PHPExcel_Cell Cell that was found
-     */
-    public function getCell($pCoordinate = 'A1')
-    {
-        $pCoordinate = strtoupper($pCoordinate);
-        // Check cell collection
-        if ($this->_cellCollection->isDataSet($pCoordinate)) {
-            return $this->_cellCollection->getCacheData($pCoordinate);
-        }
-
-        // Worksheet reference?
-        if (strpos($pCoordinate, '!') !== false) {
-            $worksheetReference = PHPExcel_Worksheet::extractSheetTitle($pCoordinate, true);
-			return $this->_parent->getSheetByName($worksheetReference[0])->getCell($worksheetReference[1]);
-        }
-
-        // Named range?
-        if ((!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $pCoordinate, $matches)) &&
-            (preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $pCoordinate, $matches))) {
-            $namedRange = PHPExcel_NamedRange::resolveRange($pCoordinate, $this);
-            if ($namedRange !== NULL) {
-                $pCoordinate = $namedRange->getRange();
-                return $namedRange->getWorksheet()->getCell($pCoordinate);
-            }
-        }
-
-        // Uppercase coordinate
-        $pCoordinate = strtoupper($pCoordinate);
-
-        if (strpos($pCoordinate, ':') !== false || strpos($pCoordinate, ',') !== false) {
-            throw new PHPExcel_Exception('Cell coordinate can not be a range of cells.');
-        } elseif (strpos($pCoordinate, '$') !== false) {
-            throw new PHPExcel_Exception('Cell coordinate must not be absolute.');
-        }
-
-        // Create new cell object
-        return $this->_createNewCell($pCoordinate);
-    }
-
-    /**
-     * Get cell at a specific coordinate by using numeric cell coordinates
-     *
-     * @param  string $pColumn Numeric column coordinate of the cell
-     * @param string $pRow Numeric row coordinate of the cell
-     * @return PHPExcel_Cell Cell that was found
-     */
-    public function getCellByColumnAndRow($pColumn = 0, $pRow = 1)
-    {
-        $columnLetter = PHPExcel_Cell::stringFromColumnIndex($pColumn);
-        $coordinate = $columnLetter . $pRow;
-
-        if ($this->_cellCollection->isDataSet($coordinate)) {
-            return $this->_cellCollection->getCacheData($coordinate);
-        }
-
-		return $this->_createNewCell($coordinate);
-    }
-
-    /**
-     * Create a new cell at the specified coordinate
-     *
-     * @param string $pCoordinate    Coordinate of the cell
-     * @return PHPExcel_Cell Cell that was created
-     */
-	private function _createNewCell($pCoordinate)
-	{
-		$cell = $this->_cellCollection->addCacheData(
-			$pCoordinate,
-			new PHPExcel_Cell(
-				NULL, 
-				PHPExcel_Cell_DataType::TYPE_NULL, 
-				$this
-			)
-		);
-        $this->_cellCollectionIsSorted = false;
-
-        // Coordinates
-        $aCoordinates = PHPExcel_Cell::coordinateFromString($pCoordinate);
-        if (PHPExcel_Cell::columnIndexFromString($this->_cachedHighestColumn) < PHPExcel_Cell::columnIndexFromString($aCoordinates[0]))
-            $this->_cachedHighestColumn = $aCoordinates[0];
-        $this->_cachedHighestRow = max($this->_cachedHighestRow, $aCoordinates[1]);
-
-        // Cell needs appropriate xfIndex from dimensions records
-		//    but don't create dimension records if they don't already exist
-        $rowDimension    = $this->getRowDimension($aCoordinates[1], FALSE);
-        $columnDimension = $this->getColumnDimension($aCoordinates[0], FALSE);
-
-        if ($rowDimension !== NULL && $rowDimension->getXfIndex() > 0) {
-            // then there is a row dimension with explicit style, assign it to the cell
-            $cell->setXfIndex($rowDimension->getXfIndex());
-        } elseif ($columnDimension !== NULL && $columnDimension->getXfIndex() > 0) {
-            // then there is a column dimension, assign it to the cell
-            $cell->setXfIndex($columnDimension->getXfIndex());
-        }
-
-        return $cell;
-	}
-	
-    /**
-     * Does the cell at a specific coordinate exist?
-     *
-     * @param string $pCoordinate  Coordinate of the cell
-     * @throws PHPExcel_Exception
-     * @return boolean
-     */
-    public function cellExists($pCoordinate = 'A1')
-    {
-       // Worksheet reference?
-        if (strpos($pCoordinate, '!') !== false) {
-            $worksheetReference = PHPExcel_Worksheet::extractSheetTitle($pCoordinate, true);
-			return $this->_parent->getSheetByName($worksheetReference[0])->cellExists(strtoupper($worksheetReference[1]));
-        }
-
-        // Named range?
-        if ((!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $pCoordinate, $matches)) &&
-            (preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $pCoordinate, $matches))) {
-            $namedRange = PHPExcel_NamedRange::resolveRange($pCoordinate, $this);
-            if ($namedRange !== NULL) {
-                $pCoordinate = $namedRange->getRange();
-                if ($this->getHashCode() != $namedRange->getWorksheet()->getHashCode()) {
-                    if (!$namedRange->getLocalOnly()) {
-                        return $namedRange->getWorksheet()->cellExists($pCoordinate);
-                    } else {
-                        throw new PHPExcel_Exception('Named range ' . $namedRange->getName() . ' is not accessible from within sheet ' . $this->getTitle());
-                    }
-                }
-            }
-            else { return false; }
-        }
-
-        // Uppercase coordinate
-        $pCoordinate = strtoupper($pCoordinate);
-
-        if (strpos($pCoordinate,':') !== false || strpos($pCoordinate,',') !== false) {
-            throw new PHPExcel_Exception('Cell coordinate can not be a range of cells.');
-        } elseif (strpos($pCoordinate,'$') !== false) {
-            throw new PHPExcel_Exception('Cell coordinate must not be absolute.');
-        } else {
-            // Coordinates
-            $aCoordinates = PHPExcel_Cell::coordinateFromString($pCoordinate);
-
-            // Cell exists?
-            return $this->_cellCollection->isDataSet($pCoordinate);
-        }
-    }
-
-    /**
-     * Cell at a specific coordinate by using numeric cell coordinates exists?
-     *
-     * @param string $pColumn Numeric column coordinate of the cell
-     * @param string $pRow Numeric row coordinate of the cell
-     * @return boolean
-     */
-    public function cellExistsByColumnAndRow($pColumn = 0, $pRow = 1)
-    {
-        return $this->cellExists(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow);
-    }
-
-    /**
-     * Get row dimension at a specific row
-     *
-     * @param int $pRow Numeric index of the row
-     * @return PHPExcel_Worksheet_RowDimension
-     */
-    public function getRowDimension($pRow = 1, $create = TRUE)
-    {
-        // Found
-        $found = null;
-
-        // Get row dimension
-        if (!isset($this->_rowDimensions[$pRow])) {
-			if (!$create)
-				return NULL;
-            $this->_rowDimensions[$pRow] = new PHPExcel_Worksheet_RowDimension($pRow);
-
-            $this->_cachedHighestRow = max($this->_cachedHighestRow,$pRow);
-        }
-        return $this->_rowDimensions[$pRow];
-    }
-
-    /**
-     * Get column dimension at a specific column
-     *
-     * @param string $pColumn String index of the column
-     * @return PHPExcel_Worksheet_ColumnDimension
-     */
-    public function getColumnDimension($pColumn = 'A', $create = TRUE)
-    {
-        // Uppercase coordinate
-        $pColumn = strtoupper($pColumn);
-
-        // Fetch dimensions
-        if (!isset($this->_columnDimensions[$pColumn])) {
-			if (!$create)
-				return NULL;
-            $this->_columnDimensions[$pColumn] = new PHPExcel_Worksheet_ColumnDimension($pColumn);
-
-            if (PHPExcel_Cell::columnIndexFromString($this->_cachedHighestColumn) < PHPExcel_Cell::columnIndexFromString($pColumn))
-                $this->_cachedHighestColumn = $pColumn;
-        }
-        return $this->_columnDimensions[$pColumn];
-    }
-
-    /**
-     * Get column dimension at a specific column by using numeric cell coordinates
-     *
-     * @param string $pColumn Numeric column coordinate of the cell
-     * @return PHPExcel_Worksheet_ColumnDimension
-     */
-    public function getColumnDimensionByColumn($pColumn = 0)
-    {
-        return $this->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($pColumn));
-    }
-
-    /**
-     * Get styles
-     *
-     * @return PHPExcel_Style[]
-     */
-    public function getStyles()
-    {
-        return $this->_styles;
-    }
-
-    /**
-     * Get default style of workbook.
-     *
-     * @deprecated
-     * @return PHPExcel_Style
-     * @throws PHPExcel_Exception
-     */
-    public function getDefaultStyle()
-    {
-        return $this->_parent->getDefaultStyle();
-    }
-
-    /**
-     * Set default style - should only be used by PHPExcel_IReader implementations!
-     *
-     * @deprecated
-     * @param PHPExcel_Style $pValue
-     * @throws PHPExcel_Exception
-     * @return PHPExcel_Worksheet
-     */
-    public function setDefaultStyle(PHPExcel_Style $pValue)
-    {
-        $this->_parent->getDefaultStyle()->applyFromArray(array(
-            'font' => array(
-                'name' => $pValue->getFont()->getName(),
-                'size' => $pValue->getFont()->getSize(),
-            ),
-        ));
-        return $this;
-    }
-
-    /**
-     * Get style for cell
-     *
-     * @param string $pCellCoordinate Cell coordinate (or range) to get style for
-     * @return PHPExcel_Style
-     * @throws PHPExcel_Exception
-     */
-    public function getStyle($pCellCoordinate = 'A1')
-    {
-        // set this sheet as active
-        $this->_parent->setActiveSheetIndex($this->_parent->getIndex($this));
-
-        // set cell coordinate as active
-        $this->setSelectedCells(strtoupper($pCellCoordinate));
-
-        return $this->_parent->getCellXfSupervisor();
-    }
-
-    /**
-     * Get conditional styles for a cell
-     *
-     * @param string $pCoordinate
-     * @return PHPExcel_Style_Conditional[]
-     */
-    public function getConditionalStyles($pCoordinate = 'A1')
-    {
-        $pCoordinate = strtoupper($pCoordinate);
-        if (!isset($this->_conditionalStylesCollection[$pCoordinate])) {
-            $this->_conditionalStylesCollection[$pCoordinate] = array();
-        }
-        return $this->_conditionalStylesCollection[$pCoordinate];
-    }
-
-    /**
-     * Do conditional styles exist for this cell?
-     *
-     * @param string $pCoordinate
-     * @return boolean
-     */
-    public function conditionalStylesExists($pCoordinate = 'A1')
-    {
-        if (isset($this->_conditionalStylesCollection[strtoupper($pCoordinate)])) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Removes conditional styles for a cell
-     *
-     * @param string $pCoordinate
-     * @return PHPExcel_Worksheet
-     */
-    public function removeConditionalStyles($pCoordinate = 'A1')
-    {
-        unset($this->_conditionalStylesCollection[strtoupper($pCoordinate)]);
-        return $this;
-    }
-
-    /**
-     * Get collection of conditional styles
-     *
-     * @return array
-     */
-    public function getConditionalStylesCollection()
-    {
-        return $this->_conditionalStylesCollection;
-    }
-
-    /**
-     * Set conditional styles
-     *
-     * @param $pCoordinate string E.g. 'A1'
-     * @param $pValue PHPExcel_Style_Conditional[]
-     * @return PHPExcel_Worksheet
-     */
-    public function setConditionalStyles($pCoordinate = 'A1', $pValue)
-    {
-        $this->_conditionalStylesCollection[strtoupper($pCoordinate)] = $pValue;
-        return $this;
-    }
-
-    /**
-     * Get style for cell by using numeric cell coordinates
-     *
-     * @param int $pColumn  Numeric column coordinate of the cell
-     * @param int $pRow Numeric row coordinate of the cell
-     * @param int pColumn2 Numeric column coordinate of the range cell
-     * @param int pRow2 Numeric row coordinate of the range cell
-     * @return PHPExcel_Style
-     */
-    public function getStyleByColumnAndRow($pColumn = 0, $pRow = 1, $pColumn2 = null, $pRow2 = null)
-    {
-        if (!is_null($pColumn2) && !is_null($pRow2)) {
-		    $cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow . ':' . 
-                PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2;
-		    return $this->getStyle($cellRange);
-	    }
-
-        return $this->getStyle(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow);
-    }
-
-    /**
-     * Set shared cell style to a range of cells
-     *
-     * Please note that this will overwrite existing cell styles for cells in range!
-     *
-     * @deprecated
-     * @param PHPExcel_Style $pSharedCellStyle Cell style to share
-     * @param string $pRange Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
-     * @throws PHPExcel_Exception
-     * @return PHPExcel_Worksheet
-     */
-    public function setSharedStyle(PHPExcel_Style $pSharedCellStyle = null, $pRange = '')
-    {
-        $this->duplicateStyle($pSharedCellStyle, $pRange);
-        return $this;
-    }
-
-    /**
-     * Duplicate cell style to a range of cells
-     *
-     * Please note that this will overwrite existing cell styles for cells in range!
-     *
-     * @param PHPExcel_Style $pCellStyle Cell style to duplicate
-     * @param string $pRange Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
-     * @throws PHPExcel_Exception
-     * @return PHPExcel_Worksheet
-     */
-    public function duplicateStyle(PHPExcel_Style $pCellStyle = null, $pRange = '')
-    {
-        // make sure we have a real style and not supervisor
-        $style = $pCellStyle->getIsSupervisor() ? $pCellStyle->getSharedComponent() : $pCellStyle;
-
-        // Add the style to the workbook if necessary
-        $workbook = $this->_parent;
-		if ($existingStyle = $this->_parent->getCellXfByHashCode($pCellStyle->getHashCode())) {
-            // there is already such cell Xf in our collection
-            $xfIndex = $existingStyle->getIndex();
-        } else {
-            // we don't have such a cell Xf, need to add
-            $workbook->addCellXf($pCellStyle);
-            $xfIndex = $pCellStyle->getIndex();
-        }
-
-        // Calculate range outer borders
-        list($rangeStart, $rangeEnd) = PHPExcel_Cell::rangeBoundaries($pRange . ':' . $pRange);
-
-        // Make sure we can loop upwards on rows and columns
-        if ($rangeStart[0] > $rangeEnd[0] && $rangeStart[1] > $rangeEnd[1]) {
-            $tmp = $rangeStart;
-            $rangeStart = $rangeEnd;
-            $rangeEnd = $tmp;
-        }
-
-        // Loop through cells and apply styles
-        for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
-            for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
-                $this->getCell(PHPExcel_Cell::stringFromColumnIndex($col - 1) . $row)->setXfIndex($xfIndex);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Duplicate conditional style to a range of cells
-     *
-     * Please note that this will overwrite existing cell styles for cells in range!
-     *
-	 * @param	array of PHPExcel_Style_Conditional	$pCellStyle	Cell style to duplicate
-     * @param string $pRange Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
-     * @throws PHPExcel_Exception
-     * @return PHPExcel_Worksheet
-     */
-    public function duplicateConditionalStyle(array $pCellStyle = null, $pRange = '')
-    {
-        foreach($pCellStyle as $cellStyle) {
-            if (!($cellStyle instanceof PHPExcel_Style_Conditional)) {
-                throw new PHPExcel_Exception('Style is not a conditional style');
-            }
-        }
-
-        // Calculate range outer borders
-        list($rangeStart, $rangeEnd) = PHPExcel_Cell::rangeBoundaries($pRange . ':' . $pRange);
-
-        // Make sure we can loop upwards on rows and columns
-        if ($rangeStart[0] > $rangeEnd[0] && $rangeStart[1] > $rangeEnd[1]) {
-            $tmp = $rangeStart;
-            $rangeStart = $rangeEnd;
-            $rangeEnd = $tmp;
-        }
-
-        // Loop through cells and apply styles
-        for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
-            for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
-                $this->setConditionalStyles(PHPExcel_Cell::stringFromColumnIndex($col - 1) . $row, $pCellStyle);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Duplicate cell style array to a range of cells
-     *
-     * Please note that this will overwrite existing cell styles for cells in range,
-     * if they are in the styles array. For example, if you decide to set a range of
-     * cells to font bold, only include font bold in the styles array.
-     *
-     * @deprecated
-     * @param array $pStyles Array containing style information
-     * @param string $pRange Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
-     * @param boolean $pAdvanced Advanced mode for setting borders.
-     * @throws PHPExcel_Exception
-     * @return PHPExcel_Worksheet
-     */
-    public function duplicateStyleArray($pStyles = null, $pRange = '', $pAdvanced = true)
-    {
-        $this->getStyle($pRange)->applyFromArray($pStyles, $pAdvanced);
-        return $this;
-    }
-
-    /**
-     * Set break on a cell
-     *
-     * @param string $pCell Cell coordinate (e.g. A1)
-     * @param int $pBreak Break type (type of PHPExcel_Worksheet::BREAK_*)
-     * @throws PHPExcel_Exception
-     * @return PHPExcel_Worksheet
-     */
-    public function setBreak($pCell = 'A1', $pBreak = PHPExcel_Worksheet::BREAK_NONE)
-    {
-        // Uppercase coordinate
-        $pCell = strtoupper($pCell);
-
-        if ($pCell != '') {
-        	if ($pBreak == PHPExcel_Worksheet::BREAK_NONE) {
-        		if (isset($this->_breaks[$pCell])) {
-	            	unset($this->_breaks[$pCell]);
-        		}
-        	} else {
-	            $this->_breaks[$pCell] = $pBreak;
-	        }
-        } else {
-            throw new PHPExcel_Exception('No cell coordinate specified.');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set break on a cell by using numeric cell coordinates
-     *
-     * @param integer $pColumn Numeric column coordinate of the cell
-     * @param integer $pRow Numeric row coordinate of the cell
-     * @param  integer $pBreak Break type (type of PHPExcel_Worksheet::BREAK_*)
-     * @return PHPExcel_Worksheet
-     */
-    public function setBreakByColumnAndRow($pColumn = 0, $pRow = 1, $pBreak = PHPExcel_Worksheet::BREAK_NONE)
-    {
-        return $this->setBreak(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow, $pBreak);
-    }
-
-    /**
-     * Get breaks
-     *
-     * @return array[]
-     */
-    public function getBreaks()
-    {
-        return $this->_breaks;
-    }
-
-    /**
-     * Set merge on a cell range
-     *
-     * @param string $pRange  Cell range (e.g. A1:E1)
-     * @throws PHPExcel_Exception
-     * @return PHPExcel_Worksheet
-     */
-    public function mergeCells($pRange = 'A1:A1')
-    {
-        // Uppercase coordinate
-        $pRange = strtoupper($pRange);
-
-        if (strpos($pRange,':') !== false) {
-            $this->_mergeCells[$pRange] = $pRange;
-
-            // make sure cells are created
-
-            // get the cells in the range
-            $aReferences = PHPExcel_Cell::extractAllCellReferencesInRange($pRange);
-
-            // create upper left cell if it does not already exist
-            $upperLeft = $aReferences[0];
-            if (!$this->cellExists($upperLeft)) {
-                $this->getCell($upperLeft)->setValueExplicit(null, PHPExcel_Cell_DataType::TYPE_NULL);
-            }
-
-            // create or blank out the rest of the cells in the range
-            $count = count($aReferences);
-            for ($i = 1; $i < $count; $i++) {
-                $this->getCell($aReferences[$i])->setValueExplicit(null, PHPExcel_Cell_DataType::TYPE_NULL);
-            }
-
-        } else {
-            throw new PHPExcel_Exception('Merge must be set on a range of cells.');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set merge on a cell range by using numeric cell coordinates
-     *
-     * @param int $pColumn1    Numeric column coordinate of the first cell
-     * @param int $pRow1        Numeric row coordinate of the first cell
-     * @param int $pColumn2    Numeric column coordinate of the last cell
-     * @param int $pRow2        Numeric row coordinate of the last cell
-     * @throws    PHPExcel_Exception
-     * @return PHPExcel_Worksheet
-     */
-    public function mergeCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1)
-    {
-        $cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2;
-        return $this->mergeCells($cellRange);
-    }
-
-    /**
-     * Remove merge on a cell range
-     *
-     * @param    string            $pRange        Cell range (e.g. A1:E1)
-     * @throws    PHPExcel_Exception
-     * @return PHPExcel_Worksheet
-     */
-    public function unmergeCells($pRange = 'A1:A1')
-    {
-        // Uppercase coordinate
-        $pRange = strtoupper($pRange);
-
-        if (strpos($pRange,':') !== false) {
-            if (isset($this->_mergeCells[$pRange])) {
-                unset($this->_mergeCells[$pRange]);
-            } else {
-                throw new PHPExcel_Exception('Cell range ' . $pRange . ' not known as merged.');
-            }
-        } else {
-            throw new PHPExcel_Exception('Merge can only be removed from a range of cells.');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Remove merge on a cell range by using numeric cell coordinates
-     *
-     * @param int $pColumn1    Numeric column coordinate of the first cell
-     * @param int $pRow1        Numeric row coordinate of the first cell
-     * @param int $pColumn2    Numeric column coordinate of the last cell
-     * @param int $pRow2        Numeric row coordinate of the last cell
-     * @throws    PHPExcel_Exception
-     * @return PHPExcel_Worksheet
-     */
-    public function unmergeCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1)
-    {
-        $cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2;
-        return $this->unmergeCells($cellRange);
-    }
-
-    /**
-     * Get merge cells array.
-     *
-     * @return array[]
-     */
-    public function getMergeCells()
-    {
-        return $this->_mergeCells;
-    }
-
-    /**
-     * Set merge cells array for the entire sheet. Use instead mergeCells() to merge
-     * a single cell range.
-     *
-     * @param array
-     */
-    public function setMergeCells($pValue = array())
-    {
-        $this->_mergeCells = $pValue;
-
-        return $this;
-    }
-
-    /**
-     * Set protection on a cell range
-     *
-     * @param    string            $pRange                Cell (e.g. A1) or cell range (e.g. A1:E1)
-     * @param    string            $pPassword            Password to unlock the protection
-     * @param    boolean        $pAlreadyHashed    If the password has already been hashed, set this to true
-     * @throws    PHPExcel_Exception
-     * @return PHPExcel_Worksheet
-     */
-    public function protectCells($pRange = 'A1', $pPassword = '', $pAlreadyHashed = false)
-    {
-        // Uppercase coordinate
-        $pRange = strtoupper($pRange);
-
-        if (!$pAlreadyHashed) {
-            $pPassword = PHPExcel_Shared_PasswordHasher::hashPassword($pPassword);
-        }
-        $this->_protectedCells[$pRange] = $pPassword;
-
-        return $this;
-    }
-
-    /**
-     * Set protection on a cell range by using numeric cell coordinates
-     *
-     * @param int  $pColumn1            Numeric column coordinate of the first cell
-     * @param int  $pRow1                Numeric row coordinate of the first cell
-     * @param int  $pColumn2            Numeric column coordinate of the last cell
-     * @param int  $pRow2                Numeric row coordinate of the last cell
-     * @param string $pPassword            Password to unlock the protection
-     * @param    boolean $pAlreadyHashed    If the password has already been hashed, set this to true
-     * @throws    PHPExcel_Exception
-     * @return PHPExcel_Worksheet
-     */
-    public function protectCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1, $pPassword = '', $pAlreadyHashed = false)
-    {
-        $cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2;
-        return $this->protectCells($cellRange, $pPassword, $pAlreadyHashed);
-    }
-
-    /**
-     * Remove protection on a cell range
-     *
-     * @param    string            $pRange        Cell (e.g. A1) or cell range (e.g. A1:E1)
-     * @throws    PHPExcel_Exception
-     * @return PHPExcel_Worksheet
-     */
-    public function unprotectCells($pRange = 'A1')
-    {
-        // Uppercase coordinate
-        $pRange = strtoupper($pRange);
-
-        if (isset($this->_protectedCells[$pRange])) {
-            unset($this->_protectedCells[$pRange]);
-        } else {
-            throw new PHPExcel_Exception('Cell range ' . $pRange . ' not known as protected.');
-        }
-        return $this;
-    }
-
-    /**
-     * Remove protection on a cell range by using numeric cell coordinates
-     *
-     * @param int  $pColumn1            Numeric column coordinate of the first cell
-     * @param int  $pRow1                Numeric row coordinate of the first cell
-     * @param int  $pColumn2            Numeric column coordinate of the last cell
-     * @param int $pRow2                Numeric row coordinate of the last cell
-     * @param string $pPassword            Password to unlock the protection
-     * @param    boolean $pAlreadyHashed    If the password has already been hashed, set this to true
-     * @throws    PHPExcel_Exception
-     * @return PHPExcel_Worksheet
-     */
-    public function unprotectCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1, $pPassword = '', $pAlreadyHashed = false)
-    {
-        $cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2;
-        return $this->unprotectCells($cellRange, $pPassword, $pAlreadyHashed);
-    }
-
-    /**
-     * Get protected cells
-     *
-     * @return array[]
-     */
-    public function getProtectedCells()
-    {
-        return $this->_protectedCells;
-    }
-
-    /**
-     *    Get Autofilter
-     *
-     *    @return PHPExcel_Worksheet_AutoFilter
-     */
-    public function getAutoFilter()
-    {
-        return $this->_autoFilter;
-    }
-
-    /**
-     *    Set AutoFilter
-     *
-     *    @param    PHPExcel_Worksheet_AutoFilter|string   $pValue
-     *            A simple string containing a Cell range like 'A1:E10' is permitted for backward compatibility
-     *    @throws    PHPExcel_Exception
-     *    @return PHPExcel_Worksheet
-     */
-    public function setAutoFilter($pValue)
-    {
-        $pRange = strtoupper($pValue);
-
-        if (is_string($pValue)) {
-            $this->_autoFilter->setRange($pValue);
-        } elseif(is_object($pValue) && ($pValue instanceof PHPExcel_Worksheet_AutoFilter)) {
-            $this->_autoFilter = $pValue;
-        }
-        return $this;
-    }
-
-    /**
-     *    Set Autofilter Range by using numeric cell coordinates
-     *
-     *    @param  integer  $pColumn1    Numeric column coordinate of the first cell
-     *    @param  integer  $pRow1       Numeric row coordinate of the first cell
-     *    @param  integer  $pColumn2    Numeric column coordinate of the second cell
-     *    @param  integer  $pRow2       Numeric row coordinate of the second cell
-     *    @throws    PHPExcel_Exception
-     *    @return PHPExcel_Worksheet
-     */
-    public function setAutoFilterByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1)
-    {
-        return $this->setAutoFilter(
-            PHPExcel_Cell::stringFromColumnIndex($pColumn1) . $pRow1
-            . ':' .
-            PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2
-        );
-    }
-
-    /**
-     * Remove autofilter
-     *
-     * @return PHPExcel_Worksheet
-     */
-    public function removeAutoFilter()
-    {
-        $this->_autoFilter->setRange(NULL);
-        return $this;
-    }
-
-    /**
-     * Get Freeze Pane
-     *
-     * @return string
-     */
-    public function getFreezePane()
-    {
-        return $this->_freezePane;
-    }
-
-    /**
-     * Freeze Pane
-     *
-     * @param    string        $pCell        Cell (i.e. A2)
-     *                                    Examples:
-     *                                        A2 will freeze the rows above cell A2 (i.e row 1)
-     *                                        B1 will freeze the columns to the left of cell B1 (i.e column A)
-     *                                        B2 will freeze the rows above and to the left of cell A2
-     *                                            (i.e row 1 and column A)
-     * @throws    PHPExcel_Exception
-     * @return PHPExcel_Worksheet
-     */
-    public function freezePane($pCell = '')
-    {
-        // Uppercase coordinate
-        $pCell = strtoupper($pCell);
-
-        if (strpos($pCell,':') === false && strpos($pCell,',') === false) {
-            $this->_freezePane = $pCell;
-        } else {
-            throw new PHPExcel_Exception('Freeze pane can not be set on a range of cells.');
-        }
-        return $this;
-    }
-
-    /**
-     * Freeze Pane by using numeric cell coordinates
-     *
-     * @param int $pColumn    Numeric column coordinate of the cell
-     * @param int $pRow        Numeric row coordinate of the cell
-     * @throws    PHPExcel_Exception
-     * @return PHPExcel_Worksheet
-     */
-    public function freezePaneByColumnAndRow($pColumn = 0, $pRow = 1)
-    {
-        return $this->freezePane(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow);
-    }
-
-    /**
-     * Unfreeze Pane
-     *
-     * @return PHPExcel_Worksheet
-     */
-    public function unfreezePane()
-    {
-        return $this->freezePane('');
-    }
-
-    /**
-     * Insert a new row, updating all possible related data
-     *
-     * @param int $pBefore    Insert before this one
-     * @param int $pNumRows    Number of rows to insert
-     * @throws    PHPExcel_Exception
-     * @return PHPExcel_Worksheet
-     */
-    public function insertNewRowBefore($pBefore = 1, $pNumRows = 1) {
-        if ($pBefore >= 1) {
-            $objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
-            $objReferenceHelper->insertNewBefore('A' . $pBefore, 0, $pNumRows, $this);
-        } else {
-            throw new PHPExcel_Exception("Rows can only be inserted before at least row 1.");
-        }
-        return $this;
-    }
-
-    /**
-     * Insert a new column, updating all possible related data
-     *
-     * @param int $pBefore    Insert before this one
-     * @param int $pNumCols    Number of columns to insert
-     * @throws    PHPExcel_Exception
-     * @return PHPExcel_Worksheet
-     */
-    public function insertNewColumnBefore($pBefore = 'A', $pNumCols = 1) {
-        if (!is_numeric($pBefore)) {
-            $objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
-            $objReferenceHelper->insertNewBefore($pBefore . '1', $pNumCols, 0, $this);
-        } else {
-            throw new PHPExcel_Exception("Column references should not be numeric.");
-        }
-        return $this;
-    }
-
-    /**
-     * Insert a new column, updating all possible related data
-     *
-     * @param int $pBefore    Insert before this one (numeric column coordinate of the cell)
-     * @param int $pNumCols    Number of columns to insert
-     * @throws    PHPExcel_Exception
-     * @return PHPExcel_Worksheet
-     */
-    public function insertNewColumnBeforeByIndex($pBefore = 0, $pNumCols = 1) {
-        if ($pBefore >= 0) {
-            return $this->insertNewColumnBefore(PHPExcel_Cell::stringFromColumnIndex($pBefore), $pNumCols);
-        } else {
-            throw new PHPExcel_Exception("Columns can only be inserted before at least column A (0).");
-        }
-    }
-
-    /**
-     * Delete a row, updating all possible related data
-     *
-     * @param int $pRow        Remove starting with this one
-     * @param int $pNumRows    Number of rows to remove
-     * @throws    PHPExcel_Exception
-     * @return PHPExcel_Worksheet
-     */
-    public function removeRow($pRow = 1, $pNumRows = 1) {
-        if ($pRow >= 1) {
-            $highestRow = $this->getHighestDataRow();
-            $objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
-            $objReferenceHelper->insertNewBefore('A' . ($pRow + $pNumRows), 0, -$pNumRows, $this);
-            for($r = 0; $r < $pNumRows; ++$r) {
-                $this->getCellCacheController()->removeRow($highestRow);
-                --$highestRow;
-            }
-        } else {
-            throw new PHPExcel_Exception("Rows to be deleted should at least start from row 1.");
-        }
-        return $this;
-    }
-
-    /**
-     * Remove a column, updating all possible related data
-     *
-     * @param string    $pColumn     Remove starting with this one
-     * @param int       $pNumCols    Number of columns to remove
-     * @throws    PHPExcel_Exception
-     * @return PHPExcel_Worksheet
-     */
-    public function removeColumn($pColumn = 'A', $pNumCols = 1) {
-        if (!is_numeric($pColumn)) {
-            $highestColumn = $this->getHighestDataColumn();
-            $pColumn = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($pColumn) - 1 + $pNumCols);
-            $objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
-            $objReferenceHelper->insertNewBefore($pColumn . '1', -$pNumCols, 0, $this);
-            for($c = 0; $c < $pNumCols; ++$c) {
-                $this->getCellCacheController()->removeColumn($highestColumn);
-                $highestColumn = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($highestColumn) - 2);
-            }
-        } else {
-            throw new PHPExcel_Exception("Column references should not be numeric.");
-        }
-        return $this;
-    }
-
-    /**
-     * Remove a column, updating all possible related data
-     *
-     * @param int $pColumn    Remove starting with this one (numeric column coordinate of the cell)
-     * @param int $pNumCols    Number of columns to remove
-     * @throws    PHPExcel_Exception
-     * @return PHPExcel_Worksheet
-     */
-    public function removeColumnByIndex($pColumn = 0, $pNumCols = 1) {
-        if ($pColumn >= 0) {
-            return $this->removeColumn(PHPExcel_Cell::stringFromColumnIndex($pColumn), $pNumCols);
-        } else {
-            throw new PHPExcel_Exception("Columns to be deleted should at least start from column 0");
-        }
-    }
-
-    /**
-     * Show gridlines?
-     *
-     * @return boolean
-     */
-    public function getShowGridlines() {
-        return $this->_showGridlines;
-    }
-
-    /**
-     * Set show gridlines
-     *
-     * @param boolean $pValue    Show gridlines (true/false)
-     * @return PHPExcel_Worksheet
-     */
-    public function setShowGridlines($pValue = false) {
-        $this->_showGridlines = $pValue;
-        return $this;
-    }
-
-    /**
-    * Print gridlines?
-    *
-    * @return boolean
-    */
-    public function getPrintGridlines() {
-        return $this->_printGridlines;
-    }
-
-    /**
-    * Set print gridlines
-    *
-    * @param boolean $pValue Print gridlines (true/false)
-    * @return PHPExcel_Worksheet
-    */
-    public function setPrintGridlines($pValue = false) {
-        $this->_printGridlines = $pValue;
-        return $this;
-    }
-
-    /**
-    * Show row and column headers?
-    *
-    * @return boolean
-    */
-    public function getShowRowColHeaders() {
-        return $this->_showRowColHeaders;
-    }
-
-    /**
-    * Set show row and column headers
-    *
-    * @param boolean $pValue Show row and column headers (true/false)
-    * @return PHPExcel_Worksheet
-    */
-    public function setShowRowColHeaders($pValue = false) {
-        $this->_showRowColHeaders = $pValue;
-        return $this;
-    }
-
-    /**
-     * Show summary below? (Row/Column outlining)
-     *
-     * @return boolean
-     */
-    public function getShowSummaryBelow() {
-        return $this->_showSummaryBelow;
-    }
-
-    /**
-     * Set show summary below
-     *
-     * @param boolean $pValue    Show summary below (true/false)
-     * @return PHPExcel_Worksheet
-     */
-    public function setShowSummaryBelow($pValue = true) {
-        $this->_showSummaryBelow = $pValue;
-        return $this;
-    }
-
-    /**
-     * Show summary right? (Row/Column outlining)
-     *
-     * @return boolean
-     */
-    public function getShowSummaryRight() {
-        return $this->_showSummaryRight;
-    }
-
-    /**
-     * Set show summary right
-     *
-     * @param boolean $pValue    Show summary right (true/false)
-     * @return PHPExcel_Worksheet
-     */
-    public function setShowSummaryRight($pValue = true) {
-        $this->_showSummaryRight = $pValue;
-        return $this;
-    }
-
-    /**
-     * Get comments
-     *
-     * @return PHPExcel_Comment[]
-     */
-    public function getComments()
-    {
-        return $this->_comments;
-    }
-
-    /**
-     * Set comments array for the entire sheet.
-     *
-	 * @param array of PHPExcel_Comment
-     * @return PHPExcel_Worksheet
-     */
-    public function setComments($pValue = array())
-    {
-        $this->_comments = $pValue;
-
-        return $this;
-    }
-
-    /**
-     * Get comment for cell
-     *
-     * @param string $pCellCoordinate    Cell coordinate to get comment for
-     * @return PHPExcel_Comment
-     * @throws PHPExcel_Exception
-     */
-    public function getComment($pCellCoordinate = 'A1')
-    {
-        // Uppercase coordinate
-        $pCellCoordinate = strtoupper($pCellCoordinate);
-
-        if (strpos($pCellCoordinate,':') !== false || strpos($pCellCoordinate,',') !== false) {
-            throw new PHPExcel_Exception('Cell coordinate string can not be a range of cells.');
-        } else if (strpos($pCellCoordinate,'$') !== false) {
-            throw new PHPExcel_Exception('Cell coordinate string must not be absolute.');
-        } else if ($pCellCoordinate == '') {
-            throw new PHPExcel_Exception('Cell coordinate can not be zero-length string.');
-        } else {
-            // Check if we already have a comment for this cell.
-            // If not, create a new comment.
-            if (isset($this->_comments[$pCellCoordinate])) {
-                return $this->_comments[$pCellCoordinate];
-            } else {
-                $newComment = new PHPExcel_Comment();
-                $this->_comments[$pCellCoordinate] = $newComment;
-                return $newComment;
-            }
-        }
-    }
-
-    /**
-     * Get comment for cell by using numeric cell coordinates
-     *
-     * @param int $pColumn    Numeric column coordinate of the cell
-     * @param int $pRow        Numeric row coordinate of the cell
-     * @return PHPExcel_Comment
-     */
-    public function getCommentByColumnAndRow($pColumn = 0, $pRow = 1)
-    {
-        return $this->getComment(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow);
-    }
-
-    /**
-     * Get selected cell
-     *
-     * @deprecated
-     * @return string
-     */
-    public function getSelectedCell()
-    {
-        return $this->getSelectedCells();
-    }
-
-    /**
-     * Get active cell
-     *
-     * @return string Example: 'A1'
-     */
-    public function getActiveCell()
-    {
-        return $this->_activeCell;
-    }
-
-    /**
-     * Get selected cells
-     *
-     * @return string
-     */
-    public function getSelectedCells()
-    {
-        return $this->_selectedCells;
-    }
-
-    /**
-     * Selected cell
-     *
-     * @param    string        $pCoordinate    Cell (i.e. A1)
-     * @return PHPExcel_Worksheet
-     */
-    public function setSelectedCell($pCoordinate = 'A1')
-    {
-        return $this->setSelectedCells($pCoordinate);
-    }
-
-    /**
-     * Select a range of cells.
-     *
-     * @param    string        $pCoordinate    Cell range, examples: 'A1', 'B2:G5', 'A:C', '3:6'
-     * @throws    PHPExcel_Exception
-     * @return PHPExcel_Worksheet
-     */
-    public function setSelectedCells($pCoordinate = 'A1')
-    {
-        // Uppercase coordinate
-        $pCoordinate = strtoupper($pCoordinate);
-
-        // Convert 'A' to 'A:A'
-        $pCoordinate = preg_replace('/^([A-Z]+)$/', '${1}:${1}', $pCoordinate);
-
-        // Convert '1' to '1:1'
-        $pCoordinate = preg_replace('/^([0-9]+)$/', '${1}:${1}', $pCoordinate);
-
-        // Convert 'A:C' to 'A1:C1048576'
-        $pCoordinate = preg_replace('/^([A-Z]+):([A-Z]+)$/', '${1}1:${2}1048576', $pCoordinate);
-
-        // Convert '1:3' to 'A1:XFD3'
-        $pCoordinate = preg_replace('/^([0-9]+):([0-9]+)$/', 'A${1}:XFD${2}', $pCoordinate);
-
-        if (strpos($pCoordinate,':') !== false || strpos($pCoordinate,',') !== false) {
-            list($first, ) = PHPExcel_Cell::splitRange($pCoordinate);
-            $this->_activeCell = $first[0];
-        } else {
-            $this->_activeCell = $pCoordinate;
-        }
-        $this->_selectedCells = $pCoordinate;
-        return $this;
-    }
-
-    /**
-     * Selected cell by using numeric cell coordinates
-     *
-     * @param int $pColumn Numeric column coordinate of the cell
-     * @param int $pRow Numeric row coordinate of the cell
-     * @throws PHPExcel_Exception
-     * @return PHPExcel_Worksheet
-     */
-    public function setSelectedCellByColumnAndRow($pColumn = 0, $pRow = 1)
-    {
-        return $this->setSelectedCells(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow);
-    }
-
-    /**
-     * Get right-to-left
-     *
-     * @return boolean
-     */
-    public function getRightToLeft() {
-        return $this->_rightToLeft;
-    }
-
-    /**
-     * Set right-to-left
-     *
-     * @param boolean $value    Right-to-left true/false
-     * @return PHPExcel_Worksheet
-     */
-    public function setRightToLeft($value = false) {
-        $this->_rightToLeft = $value;
-        return $this;
-    }
-
-    /**
-     * Fill worksheet from values in array
-     *
-     * @param array $source Source array
-     * @param mixed $nullValue Value in source array that stands for blank cell
-     * @param string $startCell Insert array starting from this cell address as the top left coordinate
-     * @param boolean $strictNullComparison Apply strict comparison when testing for null values in the array
-     * @throws PHPExcel_Exception
-     * @return PHPExcel_Worksheet
-     */
-    public function fromArray($source = null, $nullValue = null, $startCell = 'A1', $strictNullComparison = false) {
-        if (is_array($source)) {
-            //    Convert a 1-D array to 2-D (for ease of looping)
-            if (!is_array(end($source))) {
-                $source = array($source);
-            }
-
-            // start coordinate
-            list ($startColumn, $startRow) = PHPExcel_Cell::coordinateFromString($startCell);
-
-            // Loop through $source
-            foreach ($source as $rowData) {
-                $currentColumn = $startColumn;
-                foreach($rowData as $cellValue) {
-                    if ($strictNullComparison) {
-                        if ($cellValue !== $nullValue) {
-                            // Set cell value
-                            $this->getCell($currentColumn . $startRow)->setValue($cellValue);
-                        }
-                    } else {
-                        if ($cellValue != $nullValue) {
-                            // Set cell value
-                            $this->getCell($currentColumn . $startRow)->setValue($cellValue);
-                        }
-                    }
-                    ++$currentColumn;
-                }
-                ++$startRow;
-            }
-        } else {
-            throw new PHPExcel_Exception("Parameter \$source should be an array.");
-        }
-        return $this;
-    }
-
-    /**
-     * Create array from a range of cells
-     *
-     * @param string $pRange Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
-     * @param mixed $nullValue Value returned in the array entry if a cell doesn't exist
-     * @param boolean $calculateFormulas Should formulas be calculated?
-     * @param boolean $formatData Should formatting be applied to cell values?
-     * @param boolean $returnCellRef False - Return a simple array of rows and columns indexed by number counting from zero
-     *                               True - Return rows and columns indexed by their actual row and column IDs
-     * @return array
-     */
-	public function rangeToArray($pRange = 'A1', $nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false) {
-        // Returnvalue
-        $returnValue = array();
-        //    Identify the range that we need to extract from the worksheet
-        list($rangeStart, $rangeEnd) = PHPExcel_Cell::rangeBoundaries($pRange);
-        $minCol = PHPExcel_Cell::stringFromColumnIndex($rangeStart[0] -1);
-        $minRow = $rangeStart[1];
-        $maxCol = PHPExcel_Cell::stringFromColumnIndex($rangeEnd[0] -1);
-        $maxRow = $rangeEnd[1];
-
-        $maxCol++;
-        // Loop through rows
-        $r = -1;
-        for ($row = $minRow; $row <= $maxRow; ++$row) {
-            $rRef = ($returnCellRef) ? $row : ++$r;
-            $c = -1;
-            // Loop through columns in the current row
-            for ($col = $minCol; $col != $maxCol; ++$col) {
-                $cRef = ($returnCellRef) ? $col : ++$c;
-                //    Using getCell() will create a new cell if it doesn't already exist. We don't want that to happen
-                //        so we test and retrieve directly against _cellCollection
-                if ($this->_cellCollection->isDataSet($col.$row)) {
-                    // Cell exists
-                    $cell = $this->_cellCollection->getCacheData($col.$row);
-                    if ($cell->getValue() !== null) {
-                        if ($cell->getValue() instanceof PHPExcel_RichText) {
-                            $returnValue[$rRef][$cRef] = $cell->getValue()->getPlainText();
-                        } else {
-                            if ($calculateFormulas) {
-                                $returnValue[$rRef][$cRef] = $cell->getCalculatedValue();
-                            } else {
-                                $returnValue[$rRef][$cRef] = $cell->getValue();
-                            }
-                        }
-
-                        if ($formatData) {
-                            $style = $this->_parent->getCellXfByIndex($cell->getXfIndex());
-                            $returnValue[$rRef][$cRef] = PHPExcel_Style_NumberFormat::toFormattedString(
-                            	$returnValue[$rRef][$cRef],
-								($style && $style->getNumberFormat()) ?
-									$style->getNumberFormat()->getFormatCode() :
-									PHPExcel_Style_NumberFormat::FORMAT_GENERAL
-                            );
-                        }
-                    } else {
-                        // Cell holds a NULL
-                        $returnValue[$rRef][$cRef] = $nullValue;
-                    }
-                } else {
-                    // Cell doesn't exist
-                    $returnValue[$rRef][$cRef] = $nullValue;
-                }
-            }
-        }
-
-        // Return
-        return $returnValue;
-    }
-
-
-    /**
-     * Create array from a range of cells
-     *
-     * @param  string $pNamedRange Name of the Named Range
-     * @param  mixed  $nullValue Value returned in the array entry if a cell doesn't exist
-     * @param  boolean $calculateFormulas  Should formulas be calculated?
-     * @param  boolean $formatData  Should formatting be applied to cell values?
-     * @param  boolean $returnCellRef False - Return a simple array of rows and columns indexed by number counting from zero
-     *                                True - Return rows and columns indexed by their actual row and column IDs
-     * @return array
-     * @throws PHPExcel_Exception
-     */
-	public function namedRangeToArray($pNamedRange = '', $nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false) {
-        $namedRange = PHPExcel_NamedRange::resolveRange($pNamedRange, $this);
-        if ($namedRange !== NULL) {
-            $pWorkSheet = $namedRange->getWorksheet();
-            $pCellRange = $namedRange->getRange();
-
-			return $pWorkSheet->rangeToArray(	$pCellRange,
-												$nullValue, $calculateFormulas, $formatData, $returnCellRef);
-        }
-
-        throw new PHPExcel_Exception('Named Range '.$pNamedRange.' does not exist.');
-    }
-
-
-    /**
-     * Create array from worksheet
-     *
-     * @param mixed $nullValue Value returned in the array entry if a cell doesn't exist
-     * @param boolean $calculateFormulas Should formulas be calculated?
-     * @param boolean $formatData  Should formatting be applied to cell values?
-     * @param boolean $returnCellRef False - Return a simple array of rows and columns indexed by number counting from zero
-     *                               True - Return rows and columns indexed by their actual row and column IDs
-     * @return array
-     */
-	public function toArray($nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false) {
-        // Garbage collect...
-        $this->garbageCollect();
-
-        //    Identify the range that we need to extract from the worksheet
-        $maxCol = $this->getHighestColumn();
-        $maxRow = $this->getHighestRow();
-        // Return
-		return $this->rangeToArray(	'A1:'.$maxCol.$maxRow,
-									$nullValue, $calculateFormulas, $formatData, $returnCellRef);
-    }
-
-    /**
-     * Get row iterator
-     *
-     * @param   integer   $startRow   The row number at which to start iterating
-     * @param   integer   $endRow     The row number at which to stop iterating
-     *
-     * @return PHPExcel_Worksheet_RowIterator
-     */
-	public function getRowIterator($startRow = 1, $endRow = null) {
-        return new PHPExcel_Worksheet_RowIterator($this, $startRow, $endRow);
-    }
-
-    /**
-     * Get column iterator
-     *
-     * @param   string   $startColumn The column address at which to start iterating
-     * @param   string   $endColumn   The column address at which to stop iterating
-     *
-     * @return PHPExcel_Worksheet_ColumnIterator
-     */
-	public function getColumnIterator($startColumn = 'A', $endColumn = null) {
-        return new PHPExcel_Worksheet_ColumnIterator($this, $startColumn, $endColumn);
-    }
-
-    /**
-     * Run PHPExcel garabage collector.
-     *
-     * @return PHPExcel_Worksheet
-     */
-	public function garbageCollect() {
-        // Flush cache
-        $this->_cellCollection->getCacheData('A1');
-        // Build a reference table from images
-//        $imageCoordinates = array();
-//        $iterator = $this->getDrawingCollection()->getIterator();
-//        while ($iterator->valid()) {
-//            $imageCoordinates[$iterator->current()->getCoordinates()] = true;
-//
-//            $iterator->next();
-//        }
-//
-        // Lookup highest column and highest row if cells are cleaned
-        $colRow = $this->_cellCollection->getHighestRowAndColumn();
-        $highestRow = $colRow['row'];
-        $highestColumn = PHPExcel_Cell::columnIndexFromString($colRow['column']);
-
-        // Loop through column dimensions
-        foreach ($this->_columnDimensions as $dimension) {
-            $highestColumn = max($highestColumn,PHPExcel_Cell::columnIndexFromString($dimension->getColumnIndex()));
-        }
-
-        // Loop through row dimensions
-        foreach ($this->_rowDimensions as $dimension) {
-            $highestRow = max($highestRow,$dimension->getRowIndex());
-        }
-
-        // Cache values
-        if ($highestColumn < 0) {
-            $this->_cachedHighestColumn = 'A';
-        } else {
-            $this->_cachedHighestColumn = PHPExcel_Cell::stringFromColumnIndex(--$highestColumn);
-        }
-        $this->_cachedHighestRow = $highestRow;
-
-        // Return
-        return $this;
-    }
-
-    /**
-     * Get hash code
-     *
-     * @return string    Hash code
-     */
-	public function getHashCode() {
-        if ($this->_dirty) {
-            $this->_hash = md5( $this->_title .
-                                $this->_autoFilter .
-                                ($this->_protection->isProtectionEnabled() ? 't' : 'f') .
-                                __CLASS__
-                              );
-            $this->_dirty = false;
-        }
-        return $this->_hash;
-    }
-
-    /**
-     * Extract worksheet title from range.
-     *
-     * Example: extractSheetTitle("testSheet!A1") ==> 'A1'
-     * Example: extractSheetTitle("'testSheet 1'!A1", true) ==> array('testSheet 1', 'A1');
-     *
-     * @param string $pRange    Range to extract title from
-     * @param bool $returnRange    Return range? (see example)
-     * @return mixed
-     */
-	public static function extractSheetTitle($pRange, $returnRange = false) {
-        // Sheet title included?
-        if (($sep = strpos($pRange, '!')) === false) {
-            return '';
-        }
-
-        if ($returnRange) {
-            return array( trim(substr($pRange, 0, $sep),"'"),
-                          substr($pRange, $sep + 1)
-                        );
-        }
-
-        return substr($pRange, $sep + 1);
-    }
-
-    /**
-     * Get hyperlink
-     *
-     * @param string $pCellCoordinate    Cell coordinate to get hyperlink for
-     */
-    public function getHyperlink($pCellCoordinate = 'A1')
-    {
-        // return hyperlink if we already have one
-        if (isset($this->_hyperlinkCollection[$pCellCoordinate])) {
-            return $this->_hyperlinkCollection[$pCellCoordinate];
-        }
-
-        // else create hyperlink
-        $this->_hyperlinkCollection[$pCellCoordinate] = new PHPExcel_Cell_Hyperlink();
-        return $this->_hyperlinkCollection[$pCellCoordinate];
-    }
-
-    /**
-     * Set hyperlnk
-     *
-     * @param string $pCellCoordinate    Cell coordinate to insert hyperlink
-     * @param    PHPExcel_Cell_Hyperlink    $pHyperlink
-     * @return PHPExcel_Worksheet
-     */
-    public function setHyperlink($pCellCoordinate = 'A1', PHPExcel_Cell_Hyperlink $pHyperlink = null)
-    {
-        if ($pHyperlink === null) {
-            unset($this->_hyperlinkCollection[$pCellCoordinate]);
-        } else {
-            $this->_hyperlinkCollection[$pCellCoordinate] = $pHyperlink;
-        }
-        return $this;
-    }
-
-    /**
-     * Hyperlink at a specific coordinate exists?
-     *
-     * @param string $pCoordinate
-     * @return boolean
-     */
-    public function hyperlinkExists($pCoordinate = 'A1')
-    {
-        return isset($this->_hyperlinkCollection[$pCoordinate]);
-    }
-
-    /**
-     * Get collection of hyperlinks
-     *
-     * @return PHPExcel_Cell_Hyperlink[]
-     */
-    public function getHyperlinkCollection()
-    {
-        return $this->_hyperlinkCollection;
-    }
-
-    /**
-     * Get data validation
-     *
-     * @param string $pCellCoordinate Cell coordinate to get data validation for
-     */
-    public function getDataValidation($pCellCoordinate = 'A1')
-    {
-        // return data validation if we already have one
-        if (isset($this->_dataValidationCollection[$pCellCoordinate])) {
-            return $this->_dataValidationCollection[$pCellCoordinate];
-        }
-
-        // else create data validation
-        $this->_dataValidationCollection[$pCellCoordinate] = new PHPExcel_Cell_DataValidation();
-        return $this->_dataValidationCollection[$pCellCoordinate];
-    }
-
-    /**
-     * Set data validation
-     *
-     * @param string $pCellCoordinate    Cell coordinate to insert data validation
-     * @param    PHPExcel_Cell_DataValidation    $pDataValidation
-     * @return PHPExcel_Worksheet
-     */
-    public function setDataValidation($pCellCoordinate = 'A1', PHPExcel_Cell_DataValidation $pDataValidation = null)
-    {
-        if ($pDataValidation === null) {
-            unset($this->_dataValidationCollection[$pCellCoordinate]);
-        } else {
-            $this->_dataValidationCollection[$pCellCoordinate] = $pDataValidation;
-        }
-        return $this;
-    }
-
-    /**
-     * Data validation at a specific coordinate exists?
-     *
-     * @param string $pCoordinate
-     * @return boolean
-     */
-    public function dataValidationExists($pCoordinate = 'A1')
-    {
-        return isset($this->_dataValidationCollection[$pCoordinate]);
-    }
-
-    /**
-     * Get collection of data validations
-     *
-     * @return PHPExcel_Cell_DataValidation[]
-     */
-    public function getDataValidationCollection()
-    {
-        return $this->_dataValidationCollection;
-    }
-
-    /**
-     * Accepts a range, returning it as a range that falls within the current highest row and column of the worksheet
-     *
-     * @param string $range
-     * @return string Adjusted range value
-     */
-	public function shrinkRangeToFit($range) {
-        $maxCol = $this->getHighestColumn();
-        $maxRow = $this->getHighestRow();
-        $maxCol = PHPExcel_Cell::columnIndexFromString($maxCol);
-
-        $rangeBlocks = explode(' ',$range);
-        foreach ($rangeBlocks as &$rangeSet) {
-            $rangeBoundaries = PHPExcel_Cell::getRangeBoundaries($rangeSet);
-
-            if (PHPExcel_Cell::columnIndexFromString($rangeBoundaries[0][0]) > $maxCol) { $rangeBoundaries[0][0] = PHPExcel_Cell::stringFromColumnIndex($maxCol); }
-            if ($rangeBoundaries[0][1] > $maxRow) { $rangeBoundaries[0][1] = $maxRow; }
-            if (PHPExcel_Cell::columnIndexFromString($rangeBoundaries[1][0]) > $maxCol) { $rangeBoundaries[1][0] = PHPExcel_Cell::stringFromColumnIndex($maxCol); }
-            if ($rangeBoundaries[1][1] > $maxRow) { $rangeBoundaries[1][1] = $maxRow; }
-            $rangeSet = $rangeBoundaries[0][0].$rangeBoundaries[0][1].':'.$rangeBoundaries[1][0].$rangeBoundaries[1][1];
-        }
-        unset($rangeSet);
-        $stRange = implode(' ',$rangeBlocks);
-
-        return $stRange;
-    }
-
-    /**
-     * Get tab color
-     *
-     * @return PHPExcel_Style_Color
-     */
-    public function getTabColor()
-    {
-        if ($this->_tabColor === NULL)
-            $this->_tabColor = new PHPExcel_Style_Color();
-
-        return $this->_tabColor;
-    }
-
-    /**
-     * Reset tab color
-     *
-     * @return PHPExcel_Worksheet
-     */
-    public function resetTabColor()
-    {
-        $this->_tabColor = null;
-        unset($this->_tabColor);
-
-        return $this;
-    }
-
-    /**
-     * Tab color set?
-     *
-     * @return boolean
-     */
-    public function isTabColorSet()
-    {
-        return ($this->_tabColor !== NULL);
-    }
-
-    /**
-     * Copy worksheet (!= clone!)
-     *
-     * @return PHPExcel_Worksheet
-     */
-	public function copy() {
-        $copied = clone $this;
-
-        return $copied;
-    }
-
-    /**
-     * Implement PHP __clone to create a deep clone, not just a shallow copy.
-     */
-	public function __clone() {
-        foreach ($this as $key => $val) {
-            if ($key == '_parent') {
-                continue;
-            }
-
-            if (is_object($val) || (is_array($val))) {
-                if ($key == '_cellCollection') {
-                    $newCollection = clone $this->_cellCollection;
-                    $newCollection->copyCellCollection($this);
-                    $this->_cellCollection = $newCollection;
-                } elseif ($key == '_drawingCollection') {
-                    $newCollection = clone $this->_drawingCollection;
-                    $this->_drawingCollection = $newCollection;
-                } elseif (($key == '_autoFilter') && ($this->_autoFilter instanceof PHPExcel_Worksheet_AutoFilter)) {
-                    $newAutoFilter = clone $this->_autoFilter;
-                    $this->_autoFilter = $newAutoFilter;
-                    $this->_autoFilter->setParent($this);
-                } else {
-                    $this->{$key} = unserialize(serialize($val));
-                }
-            }
-        }
-    }
-/**
-	 * Define the code name of the sheet
-	 *
-	 * @param null|string Same rule as Title minus space not allowed (but, like Excel, change silently space to underscore)
-	 * @return objWorksheet
-	 * @throws PHPExcel_Exception
-	*/
-	public function setCodeName($pValue=null){
-		// Is this a 'rename' or not?
-		if ($this->getCodeName() == $pValue) {
-			return $this;
-		}
-		$pValue = str_replace(' ', '_', $pValue);//Excel does this automatically without flinching, we are doing the same
-		// Syntax check
-        // throw an exception if not valid
-		self::_checkSheetCodeName($pValue);
-
-		// We use the same code that setTitle to find a valid codeName else not using a space (Excel don't like) but a '_'
-		
-        if ($this->getParent()) {
-			// Is there already such sheet name?
-			if ($this->getParent()->sheetCodeNameExists($pValue)) {
-				// Use name, but append with lowest possible integer
-
-				if (PHPExcel_Shared_String::CountCharacters($pValue) > 29) {
-					$pValue = PHPExcel_Shared_String::Substring($pValue,0,29);
-				}
-				$i = 1;
-				while ($this->getParent()->sheetCodeNameExists($pValue . '_' . $i)) {
-					++$i;
-					if ($i == 10) {
-						if (PHPExcel_Shared_String::CountCharacters($pValue) > 28) {
-							$pValue = PHPExcel_Shared_String::Substring($pValue,0,28);
-						}
-					} elseif ($i == 100) {
-						if (PHPExcel_Shared_String::CountCharacters($pValue) > 27) {
-							$pValue = PHPExcel_Shared_String::Substring($pValue,0,27);
-						}
-					}
-				}
-
-				$pValue = $pValue . '_' . $i;// ok, we have a valid name
-				//codeName is'nt used in formula : no need to call for an update
-				//return $this->setTitle($altTitle,$updateFormulaCellReferences);
-			}
-		}
-
-		$this->_codeName=$pValue;
-		return $this;
-	}
-	/**
-	 * Return the code name of the sheet
-	 *
-	 * @return null|string
-	*/
-	public function getCodeName(){
-		return $this->_codeName;
-	}
-	/**
-	 * Sheet has a code name ?
-	 * @return boolean
-	*/
-	public function hasCodeName(){
-		return !(is_null($this->_codeName));
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter.php
deleted file mode 100644
index 22c3574899c..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter.php
+++ /dev/null
@@ -1,862 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_AutoFilter
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_AutoFilter
-{
-	/**
-	 * Autofilter Worksheet
-	 *
-	 * @var PHPExcel_Worksheet
-	 */
-	private $_workSheet = NULL;
-
-
-	/**
-	 * Autofilter Range
-	 *
-	 * @var string
-	 */
-	private $_range = '';
-
-
-	/**
-	 * Autofilter Column Ruleset
-	 *
-	 * @var array of PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	private $_columns = array();
-
-
-    /**
-     * Create a new PHPExcel_Worksheet_AutoFilter
-	 *
-	 *	@param	string		$pRange		Cell range (i.e. A1:E10)
-	 * @param PHPExcel_Worksheet $pSheet
-     */
-    public function __construct($pRange = '', PHPExcel_Worksheet $pSheet = NULL)
-    {
-		$this->_range = $pRange;
-		$this->_workSheet = $pSheet;
-    }
-
-	/**
-	 * Get AutoFilter Parent Worksheet
-	 *
-	 * @return PHPExcel_Worksheet
-	 */
-	public function getParent() {
-		return $this->_workSheet;
-	}
-
-	/**
-	 * Set AutoFilter Parent Worksheet
-	 *
-	 * @param PHPExcel_Worksheet $pSheet
-	 * @return PHPExcel_Worksheet_AutoFilter
-	 */
-	public function setParent(PHPExcel_Worksheet $pSheet = NULL) {
-		$this->_workSheet = $pSheet;
-
-		return $this;
-	}
-
-	/**
-	 * Get AutoFilter Range
-	 *
-	 * @return string
-	 */
-	public function getRange() {
-		return $this->_range;
-	}
-
-	/**
-	 *	Set AutoFilter Range
-	 *
-	 *	@param	string		$pRange		Cell range (i.e. A1:E10)
-	 *	@throws	PHPExcel_Exception
-	 *	@return PHPExcel_Worksheet_AutoFilter
-	 */
-	public function setRange($pRange = '') {
-		// Uppercase coordinate
-		$cellAddress = explode('!',strtoupper($pRange));
-		if (count($cellAddress) > 1) {
-			list($worksheet,$pRange) = $cellAddress;
-		}
-
-		if (strpos($pRange,':') !== FALSE) {
-			$this->_range = $pRange;
-		} elseif(empty($pRange)) {
-			$this->_range = '';
-		} else {
-			throw new PHPExcel_Exception('Autofilter must be set on a range of cells.');
-		}
-
-		if (empty($pRange)) {
-			//	Discard all column rules
-			$this->_columns = array();
-		} else {
-			//	Discard any column rules that are no longer valid within this range
-			list($rangeStart,$rangeEnd) = PHPExcel_Cell::rangeBoundaries($this->_range);
-			foreach($this->_columns as $key => $value) {
-				$colIndex = PHPExcel_Cell::columnIndexFromString($key);
-				if (($rangeStart[0] > $colIndex) || ($rangeEnd[0] < $colIndex)) {
-					unset($this->_columns[$key]);
-				}
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Get all AutoFilter Columns
-	 *
-	 * @throws	PHPExcel_Exception
-	 * @return array of PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	public function getColumns() {
-		return $this->_columns;
-	}
-
-	/**
-	 * Validate that the specified column is in the AutoFilter range
-	 *
-	 * @param	string	$column			Column name (e.g. A)
-	 * @throws	PHPExcel_Exception
-	 * @return	integer	The column offset within the autofilter range
-	 */
-	public function testColumnInRange($column) {
-		if (empty($this->_range)) {
-			throw new PHPExcel_Exception("No autofilter range is defined.");
-		}
-
-		$columnIndex = PHPExcel_Cell::columnIndexFromString($column);
-		list($rangeStart,$rangeEnd) = PHPExcel_Cell::rangeBoundaries($this->_range);
-		if (($rangeStart[0] > $columnIndex) || ($rangeEnd[0] < $columnIndex)) {
-			throw new PHPExcel_Exception("Column is outside of current autofilter range.");
-		}
-
-		return $columnIndex - $rangeStart[0];
-	}
-
-	/**
-	 * Get a specified AutoFilter Column Offset within the defined AutoFilter range
-	 *
-	 * @param	string	$pColumn		Column name (e.g. A)
-	 * @throws	PHPExcel_Exception
-	 * @return integer	The offset of the specified column within the autofilter range
-	 */
-	public function getColumnOffset($pColumn) {
-		return $this->testColumnInRange($pColumn);
-	}
-
-	/**
-	 * Get a specified AutoFilter Column
-	 *
-	 * @param	string	$pColumn		Column name (e.g. A)
-	 * @throws	PHPExcel_Exception
-	 * @return PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	public function getColumn($pColumn) {
-		$this->testColumnInRange($pColumn);
-
-		if (!isset($this->_columns[$pColumn])) {
-			$this->_columns[$pColumn] = new PHPExcel_Worksheet_AutoFilter_Column($pColumn, $this);
-		}
-
-		return $this->_columns[$pColumn];
-	}
-
-	/**
-	 * Get a specified AutoFilter Column by it's offset
-	 *
-	 * @param	integer	$pColumnOffset		Column offset within range (starting from 0)
-	 * @throws	PHPExcel_Exception
-	 * @return PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	public function getColumnByOffset($pColumnOffset = 0) {
-		list($rangeStart,$rangeEnd) = PHPExcel_Cell::rangeBoundaries($this->_range);
-		$pColumn = PHPExcel_Cell::stringFromColumnIndex($rangeStart[0] + $pColumnOffset - 1);
-
-		return $this->getColumn($pColumn);
-	}
-
-	/**
-	 *	Set AutoFilter
-	 *
-	 *	@param	PHPExcel_Worksheet_AutoFilter_Column|string		$pColumn
-	 *			A simple string containing a Column ID like 'A' is permitted
-	 *	@throws	PHPExcel_Exception
-	 *	@return PHPExcel_Worksheet_AutoFilter
-	 */
-	public function setColumn($pColumn)
-	{
-		if ((is_string($pColumn)) && (!empty($pColumn))) {
-			$column = $pColumn;
-		} elseif(is_object($pColumn) && ($pColumn instanceof PHPExcel_Worksheet_AutoFilter_Column)) {
-			$column = $pColumn->getColumnIndex();
-		} else {
-			throw new PHPExcel_Exception("Column is not within the autofilter range.");
-		}
-		$this->testColumnInRange($column);
-
-		if (is_string($pColumn)) {
-			$this->_columns[$pColumn] = new PHPExcel_Worksheet_AutoFilter_Column($pColumn, $this);
-		} elseif(is_object($pColumn) && ($pColumn instanceof PHPExcel_Worksheet_AutoFilter_Column)) {
-			$pColumn->setParent($this);
-			$this->_columns[$column] = $pColumn;
-		}
-		ksort($this->_columns);
-
-		return $this;
-	}
-
-	/**
-	 * Clear a specified AutoFilter Column
-	 *
-	 * @param	string  $pColumn    Column name (e.g. A)
-	 * @throws	PHPExcel_Exception
-	 * @return PHPExcel_Worksheet_AutoFilter
-	 */
-	public function clearColumn($pColumn) {
-		$this->testColumnInRange($pColumn);
-
-		if (isset($this->_columns[$pColumn])) {
-			unset($this->_columns[$pColumn]);
-		}
-
-		return $this;
-	}
-
-	/**
-	 *	Shift an AutoFilter Column Rule to a different column
-	 *
-	 *	Note: This method bypasses validation of the destination column to ensure it is within this AutoFilter range.
-	 *		Nor does it verify whether any column rule already exists at $toColumn, but will simply overrideany existing value.
-	 *		Use with caution.
-	 *
-	 *	@param	string	$fromColumn		Column name (e.g. A)
-	 *	@param	string	$toColumn		Column name (e.g. B)
-	 *	@return PHPExcel_Worksheet_AutoFilter
-	 */
-	public function shiftColumn($fromColumn=NULL,$toColumn=NULL) {
-		$fromColumn = strtoupper($fromColumn);
-		$toColumn = strtoupper($toColumn);
-
-		if (($fromColumn !== NULL) && (isset($this->_columns[$fromColumn])) && ($toColumn !== NULL)) {
-			$this->_columns[$fromColumn]->setParent();
-			$this->_columns[$fromColumn]->setColumnIndex($toColumn);
-			$this->_columns[$toColumn] = $this->_columns[$fromColumn];
-			$this->_columns[$toColumn]->setParent($this);
-			unset($this->_columns[$fromColumn]);
-
-			ksort($this->_columns);
-		}
-
-		return $this;
-	}
-
-
-	/**
-	 *	Test if cell value is in the defined set of values
-	 *
-	 *	@param	mixed		$cellValue
-	 *	@param	mixed[]		$dataSet
-	 *	@return boolean
-	 */
-	private static function _filterTestInSimpleDataSet($cellValue,$dataSet)
-	{
-		$dataSetValues = $dataSet['filterValues'];
-		$blanks = $dataSet['blanks'];
-		if (($cellValue == '') || ($cellValue === NULL)) {
-			return $blanks;
-		}
-		return in_array($cellValue,$dataSetValues);
-	}
-
-	/**
-	 *	Test if cell value is in the defined set of Excel date values
-	 *
-	 *	@param	mixed		$cellValue
-	 *	@param	mixed[]		$dataSet
-	 *	@return boolean
-	 */
-	private static function _filterTestInDateGroupSet($cellValue,$dataSet)
-	{
-		$dateSet = $dataSet['filterValues'];
-		$blanks = $dataSet['blanks'];
-		if (($cellValue == '') || ($cellValue === NULL)) {
-			return $blanks;
-		}
-
-		if (is_numeric($cellValue)) {
-			$dateValue = PHPExcel_Shared_Date::ExcelToPHP($cellValue);
-			if ($cellValue < 1) {
-				//	Just the time part
-				$dtVal = date('His',$dateValue);
-				$dateSet = $dateSet['time'];
-			} elseif($cellValue == floor($cellValue)) {
-				//	Just the date part
-				$dtVal = date('Ymd',$dateValue);
-				$dateSet = $dateSet['date'];
-			} else {
-				//	date and time parts
-				$dtVal = date('YmdHis',$dateValue);
-				$dateSet = $dateSet['dateTime'];
-			}
-			foreach($dateSet as $dateValue) {
-				//	Use of substr to extract value at the appropriate group level
-				if (substr($dtVal,0,strlen($dateValue)) == $dateValue)
-					return TRUE;
-			}
-		}
-
-		return FALSE;
-	}
-
-	/**
-	 *	Test if cell value is within a set of values defined by a ruleset
-	 *
-	 *	@param	mixed		$cellValue
-	 *	@param	mixed[]		$ruleSet
-	 *	@return boolean
-	 */
-	private static function _filterTestInCustomDataSet($cellValue, $ruleSet)
-	{
-		$dataSet = $ruleSet['filterRules'];
-		$join = $ruleSet['join'];
-		$customRuleForBlanks = isset($ruleSet['customRuleForBlanks']) ? $ruleSet['customRuleForBlanks'] : FALSE;
-
-		if (!$customRuleForBlanks) {
-			//	Blank cells are always ignored, so return a FALSE
-			if (($cellValue == '') || ($cellValue === NULL)) {
-				return FALSE;
-			}
-		}
-		$returnVal = ($join == PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND);
-		foreach($dataSet as $rule) {
-			if (is_numeric($rule['value'])) {
-				//	Numeric values are tested using the appropriate operator
-				switch ($rule['operator']) {
-					case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL :
-						$retVal	= ($cellValue == $rule['value']);
-						break;
-					case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL :
-						$retVal	= ($cellValue != $rule['value']);
-						break;
-					case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN :
-						$retVal	= ($cellValue > $rule['value']);
-						break;
-					case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL :
-						$retVal	= ($cellValue >= $rule['value']);
-						break;
-					case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN :
-						$retVal	= ($cellValue < $rule['value']);
-						break;
-					case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL :
-						$retVal	= ($cellValue <= $rule['value']);
-						break;
-				}
-			} elseif($rule['value'] == '') {
-				switch ($rule['operator']) {
-					case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL :
-						$retVal	= (($cellValue == '') || ($cellValue === NULL));
-						break;
-					case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL :
-						$retVal	= (($cellValue != '') && ($cellValue !== NULL));
-						break;
-					default :
-						$retVal	= TRUE;
-						break;
-				}
-			} else {
-				//	String values are always tested for equality, factoring in for wildcards (hence a regexp test)
-				$retVal	= preg_match('/^'.$rule['value'].'$/i',$cellValue);
-			}
-			//	If there are multiple conditions, then we need to test both using the appropriate join operator
-			switch ($join) {
-				case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_OR :
-					$returnVal = $returnVal || $retVal;
-					//	Break as soon as we have a TRUE match for OR joins,
-					//		to avoid unnecessary additional code execution
-					if ($returnVal)
-						return $returnVal;
-					break;
-				case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND :
-					$returnVal = $returnVal && $retVal;
-					break;
-			}
-		}
-
-		return $returnVal;
-	}
-
-	/**
-	 *	Test if cell date value is matches a set of values defined by a set of months
-	 *
-	 *	@param	mixed		$cellValue
-	 *	@param	mixed[]		$monthSet
-	 *	@return boolean
-	 */
-	private static function _filterTestInPeriodDateSet($cellValue, $monthSet)
-	{
-		//	Blank cells are always ignored, so return a FALSE
-		if (($cellValue == '') || ($cellValue === NULL)) {
-			return FALSE;
-		}
-
-		if (is_numeric($cellValue)) {
-			$dateValue = date('m',PHPExcel_Shared_Date::ExcelToPHP($cellValue));
-			if (in_array($dateValue,$monthSet)) {
-				return TRUE;
-			}
-		}
-
-		return FALSE;
-	}
-
-	/**
-	 *	Search/Replace arrays to convert Excel wildcard syntax to a regexp syntax for preg_matching
-	 *
-	 *	@var	array
-	 */
-	private static $_fromReplace = array('\*', '\?', '~~', '~.*', '~.?');
-	private static $_toReplace   = array('.*', '.',  '~',  '\*',  '\?');
-
-
-	/**
-	 *	Convert a dynamic rule daterange to a custom filter range expression for ease of calculation
-	 *
-	 *	@param	string										$dynamicRuleType
-	 *	@param	PHPExcel_Worksheet_AutoFilter_Column		&$filterColumn
-	 *	@return mixed[]
-	 */
-	private function _dynamicFilterDateRange($dynamicRuleType, &$filterColumn)
-	{
-		$rDateType = PHPExcel_Calculation_Functions::getReturnDateType();
-		PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC);
-		$val = $maxVal = NULL;
-
-		$ruleValues = array();
-		$baseDate = PHPExcel_Calculation_DateTime::DATENOW();
-		//	Calculate start/end dates for the required date range based on current date
-		switch ($dynamicRuleType) {
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK :
-				$baseDate = strtotime('-7 days',$baseDate);
-				break;
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK :
-				$baseDate = strtotime('-7 days',$baseDate);
-				break;
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH :
-				$baseDate = strtotime('-1 month',gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
-				break;
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH :
-				$baseDate = strtotime('+1 month',gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
-				break;
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER :
-				$baseDate = strtotime('-3 month',gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
-				break;
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER :
-				$baseDate = strtotime('+3 month',gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
-				break;
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR :
-				$baseDate = strtotime('-1 year',gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
-				break;
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR :
-				$baseDate = strtotime('+1 year',gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
-				break;
-		}
-
-		switch ($dynamicRuleType) {
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_TODAY :
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY :
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW :
-				$maxVal = (int) PHPExcel_Shared_Date::PHPtoExcel(strtotime('+1 day',$baseDate));
-				$val = (int) PHPExcel_Shared_Date::PHPToExcel($baseDate);
-				break;
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_YEARTODATE :
-				$maxVal = (int) PHPExcel_Shared_Date::PHPtoExcel(strtotime('+1 day',$baseDate));
-				$val = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0,0,0,1,1,date('Y',$baseDate)));
-				break;
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISYEAR :
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR :
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR :
-				$maxVal = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0,0,0,31,12,date('Y',$baseDate)));
-				++$maxVal;
-				$val = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0,0,0,1,1,date('Y',$baseDate)));
-				break;
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISQUARTER :
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER :
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER :
-				$thisMonth = date('m',$baseDate);
-				$thisQuarter = floor(--$thisMonth / 3);
-				$maxVal = (int) PHPExcel_Shared_Date::PHPtoExcel(gmmktime(0,0,0,date('t',$baseDate),(1+$thisQuarter)*3,date('Y',$baseDate)));
-				++$maxVal;
-				$val = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0,0,0,1,1+$thisQuarter*3,date('Y',$baseDate)));
-				break;
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISMONTH :
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH :
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH :
-				$maxVal = (int) PHPExcel_Shared_Date::PHPtoExcel(gmmktime(0,0,0,date('t',$baseDate),date('m',$baseDate),date('Y',$baseDate)));
-				++$maxVal;
-				$val = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
-				break;
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISWEEK :
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK :
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK :
-				$dayOfWeek = date('w',$baseDate);
-				$val = (int) PHPExcel_Shared_Date::PHPToExcel($baseDate) - $dayOfWeek;
-				$maxVal = $val + 7;
-				break;
-		}
-
-		switch ($dynamicRuleType) {
-			//	Adjust Today dates for Yesterday and Tomorrow
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY :
-				--$maxVal;
-				--$val;
-				break;
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW :
-				++$maxVal;
-				++$val;
-				break;
-		}
-
-		//	Set the filter column rule attributes ready for writing
-		$filterColumn->setAttributes(array(	'val' => $val,
-											'maxVal' => $maxVal
-										  )
-									);
-
-		//	Set the rules for identifying rows for hide/show
-		$ruleValues[] = array( 'operator' => PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL,
-							   'value' => $val
-							 );
-		$ruleValues[] = array( 'operator' => PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN,
-							   'value' => $maxVal
-							 );
-		PHPExcel_Calculation_Functions::setReturnDateType($rDateType);
-
-		return array(
-			'method' => '_filterTestInCustomDataSet',
-			'arguments' => array( 'filterRules' => $ruleValues,
-								  'join' => PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND
-								)
-		);
-	}
-
-	private function _calculateTopTenValue($columnID,$startRow,$endRow,$ruleType,$ruleValue) {
-		$range = $columnID.$startRow.':'.$columnID.$endRow;
-		$dataValues = PHPExcel_Calculation_Functions::flattenArray(
-			$this->_workSheet->rangeToArray($range,NULL,TRUE,FALSE)
-		);
-
-		$dataValues = array_filter($dataValues);
-		if ($ruleType == PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP) {
-			rsort($dataValues);
-		} else {
-			sort($dataValues);
-		}
-
-		return array_pop(array_slice($dataValues,0,$ruleValue));
-	}
-
-	/**
-	 *	Apply the AutoFilter rules to the AutoFilter Range
-	 *
-	 *	@throws	PHPExcel_Exception
-	 *	@return PHPExcel_Worksheet_AutoFilter
-	 */
-	public function showHideRows()
-	{
-		list($rangeStart,$rangeEnd) = PHPExcel_Cell::rangeBoundaries($this->_range);
-
-		//	The heading row should always be visible
-//		echo 'AutoFilter Heading Row ',$rangeStart[1],' is always SHOWN',PHP_EOL;
-		$this->_workSheet->getRowDimension($rangeStart[1])->setVisible(TRUE);
-
-		$columnFilterTests = array();
-		foreach($this->_columns as $columnID => $filterColumn) {
-			$rules = $filterColumn->getRules();
-			switch ($filterColumn->getFilterType()) {
-				case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_FILTER :
-					$ruleValues = array();
-					//	Build a list of the filter value selections
-					foreach($rules as $rule) {
-						$ruleType = $rule->getRuleType();
-						$ruleValues[] = $rule->getValue();
-					}
-					//	Test if we want to include blanks in our filter criteria
-					$blanks = FALSE;
-					$ruleDataSet = array_filter($ruleValues);
-					if (count($ruleValues) != count($ruleDataSet))
-						$blanks = TRUE;
-					if ($ruleType == PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_FILTER) {
-						//	Filter on absolute values
-						$columnFilterTests[$columnID] = array(
-							'method' => '_filterTestInSimpleDataSet',
-							'arguments' => array( 'filterValues' => $ruleDataSet,
-												  'blanks' => $blanks
-												)
-						);
-					} else {
-						//	Filter on date group values
-						$arguments = array(
-                            'date' => array(),
-                            'time' => array(),
-                            'dateTime' => array(),
-                        );
-						foreach($ruleDataSet as $ruleValue) {
-							$date = $time = '';
-							if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR])) &&
-								($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR] !== ''))
-								$date .= sprintf('%04d',$ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR]);
-							if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH])) &&
-								($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH] != ''))
-								$date .= sprintf('%02d',$ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH]);
-							if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY])) &&
-								($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY] !== ''))
-								$date .= sprintf('%02d',$ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY]);
-							if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR])) &&
-								($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR] !== ''))
-								$time .= sprintf('%02d',$ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR]);
-							if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE])) &&
-								($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE] !== ''))
-								$time .= sprintf('%02d',$ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE]);
-							if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND])) &&
-								($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND] !== ''))
-								$time .= sprintf('%02d',$ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND]);
-							$dateTime = $date . $time;
-							$arguments['date'][] = $date;
-							$arguments['time'][] = $time;
-							$arguments['dateTime'][] = $dateTime;
-						}
-						//	Remove empty elements
-						$arguments['date'] = array_filter($arguments['date']);
-						$arguments['time'] = array_filter($arguments['time']);
-						$arguments['dateTime'] = array_filter($arguments['dateTime']);
-						$columnFilterTests[$columnID] = array(
-							'method' => '_filterTestInDateGroupSet',
-							'arguments' => array( 'filterValues' => $arguments,
-												  'blanks' => $blanks
-												)
-						);
-					}
-					break;
-				case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_CUSTOMFILTER :
-					$customRuleForBlanks = FALSE;
-					$ruleValues = array();
-					//	Build a list of the filter value selections
-					foreach($rules as $rule) {
-						$ruleType = $rule->getRuleType();
-						$ruleValue = $rule->getValue();
-						if (!is_numeric($ruleValue)) {
-							//	Convert to a regexp allowing for regexp reserved characters, wildcards and escaped wildcards
-							$ruleValue = preg_quote($ruleValue);
-							$ruleValue = str_replace(self::$_fromReplace,self::$_toReplace,$ruleValue);
-							if (trim($ruleValue) == '') {
-								$customRuleForBlanks = TRUE;
-								$ruleValue = trim($ruleValue);
-							}
-						}
-						$ruleValues[] = array( 'operator' => $rule->getOperator(),
-											   'value' => $ruleValue
-											 );
-					}
-					$join = $filterColumn->getJoin();
-					$columnFilterTests[$columnID] = array(
-						'method' => '_filterTestInCustomDataSet',
-						'arguments' => array( 'filterRules' => $ruleValues,
-											  'join' => $join,
-											  'customRuleForBlanks' => $customRuleForBlanks
-											)
-					);
-					break;
-				case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_DYNAMICFILTER :
-					$ruleValues = array();
-					foreach($rules as $rule) {
-						//	We should only ever have one Dynamic Filter Rule anyway
-						$dynamicRuleType = $rule->getGrouping();
-						if (($dynamicRuleType == PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE) ||
-							($dynamicRuleType == PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE)) {
-							//	Number (Average) based
-							//	Calculate the average
-							$averageFormula = '=AVERAGE('.$columnID.($rangeStart[1]+1).':'.$columnID.$rangeEnd[1].')';
-							$average = PHPExcel_Calculation::getInstance()->calculateFormula($averageFormula,NULL,$this->_workSheet->getCell('A1'));
-							//	Set above/below rule based on greaterThan or LessTan
-							$operator = ($dynamicRuleType === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE)
-								? PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN
-								: PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN;
-							$ruleValues[] = array( 'operator' => $operator,
-												   'value' => $average
-												 );
-							$columnFilterTests[$columnID] = array(
-								'method' => '_filterTestInCustomDataSet',
-								'arguments' => array( 'filterRules' => $ruleValues,
-													  'join' => PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_OR
-													)
-							);
-						} else {
-							//	Date based
-							if ($dynamicRuleType{0} == 'M' || $dynamicRuleType{0} == 'Q') {
-								//	Month or Quarter
-								sscanf($dynamicRuleType,'%[A-Z]%d', $periodType, $period);
-								if ($periodType == 'M') {
-									$ruleValues = array($period);
-								} else {
-									--$period;
-									$periodEnd = (1+$period)*3;
-									$periodStart = 1+$period*3;
-									$ruleValues = range($periodStart,periodEnd);
-								}
-								$columnFilterTests[$columnID] = array(
-									'method' => '_filterTestInPeriodDateSet',
-									'arguments' => $ruleValues
-								);
-								$filterColumn->setAttributes(array());
-							} else {
-								//	Date Range
-								$columnFilterTests[$columnID] = $this->_dynamicFilterDateRange($dynamicRuleType, $filterColumn);
-								break;
-							}
-						}
-					}
-					break;
-				case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_TOPTENFILTER :
-					$ruleValues = array();
-					$dataRowCount = $rangeEnd[1] - $rangeStart[1];
-					foreach($rules as $rule) {
-						//	We should only ever have one Dynamic Filter Rule anyway
-						$toptenRuleType = $rule->getGrouping();
-						$ruleValue = $rule->getValue();
-						$ruleOperator = $rule->getOperator();
-					}
-					if ($ruleOperator === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT) {
-						$ruleValue = floor($ruleValue * ($dataRowCount / 100));
-					}
-					if ($ruleValue < 1) $ruleValue = 1;
-					if ($ruleValue > 500) $ruleValue = 500;
-
-					$maxVal = $this->_calculateTopTenValue($columnID,$rangeStart[1]+1,$rangeEnd[1],$toptenRuleType,$ruleValue);
-
-					$operator = ($toptenRuleType == PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP)
-						? PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL
-						: PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL;
-					$ruleValues[] = array( 'operator' => $operator,
-										   'value' => $maxVal
-										 );
-					$columnFilterTests[$columnID] = array(
-						'method' => '_filterTestInCustomDataSet',
-						'arguments' => array( 'filterRules' => $ruleValues,
-											  'join' => PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_OR
-											)
-					);
-					$filterColumn->setAttributes(
-						array('maxVal' => $maxVal)
-					);
-					break;
-			}
-		}
-
-//		echo 'Column Filter Test CRITERIA',PHP_EOL;
-//		var_dump($columnFilterTests);
-//
-		//	Execute the column tests for each row in the autoFilter range to determine show/hide,
-		for ($row = $rangeStart[1]+1; $row <= $rangeEnd[1]; ++$row) {
-//			echo 'Testing Row = ',$row,PHP_EOL;
-			$result = TRUE;
-			foreach($columnFilterTests as $columnID => $columnFilterTest) {
-//				echo 'Testing cell ',$columnID.$row,PHP_EOL;
-				$cellValue = $this->_workSheet->getCell($columnID.$row)->getCalculatedValue();
-//				echo 'Value is ',$cellValue,PHP_EOL;
-				//	Execute the filter test
-				$result = $result &&
-					call_user_func_array(
-						array('PHPExcel_Worksheet_AutoFilter',$columnFilterTest['method']),
-						array(
-							$cellValue,
-							$columnFilterTest['arguments']
-						)
-					);
-//				echo (($result) ? 'VALID' : 'INVALID'),PHP_EOL;
-				//	If filter test has resulted in FALSE, exit the loop straightaway rather than running any more tests
-				if (!$result)
-					break;
-			}
-			//	Set show/hide for the row based on the result of the autoFilter result
-//			echo (($result) ? 'SHOW' : 'HIDE'),PHP_EOL;
-			$this->_workSheet->getRowDimension($row)->setVisible($result);
-		}
-
-		return $this;
-	}
-
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				if ($key == '_workSheet') {
-					//	Detach from worksheet
-					$this->{$key} = NULL;
-				} else {
-					$this->{$key} = clone $value;
-				}
-			} elseif ((is_array($value)) && ($key == '_columns')) {
-				//	The columns array of PHPExcel_Worksheet_AutoFilter objects
-				$this->{$key} = array();
-				foreach ($value as $k => $v) {
-					$this->{$key}[$k] = clone $v;
-					// attach the new cloned Column to this new cloned Autofilter object
-					$this->{$key}[$k]->setParent($this);
-				}
-			} else {
-				$this->{$key} = $value;
-			}
-		}
-	}
-
-	/**
-	 * toString method replicates previous behavior by returning the range if object is
-	 *    referenced as a property of its parent.
-	 */
-	public function __toString() {
-		return (string) $this->_range;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column.php
deleted file mode 100644
index 1a6fb4eb8df..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column.php
+++ /dev/null
@@ -1,394 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Worksheet
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_AutoFilter_Column
- *
- * @category	PHPExcel
- * @package		PHPExcel_Worksheet
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_AutoFilter_Column
-{
-	const AUTOFILTER_FILTERTYPE_FILTER			= 'filters';
-	const AUTOFILTER_FILTERTYPE_CUSTOMFILTER	= 'customFilters';
-	//	Supports no more than 2 rules, with an And/Or join criteria
-	//		if more than 1 rule is defined
-	const AUTOFILTER_FILTERTYPE_DYNAMICFILTER	= 'dynamicFilter';
-	//	Even though the filter rule is constant, the filtered data can vary
-	//		e.g. filtered by date = TODAY
-	const AUTOFILTER_FILTERTYPE_TOPTENFILTER	= 'top10';
-
-	/**
-	 * Types of autofilter rules
-	 *
-	 * @var string[]
-	 */
-	private static $_filterTypes = array(
-		//	Currently we're not handling
-		//		colorFilter
-		//		extLst
-		//		iconFilter
-		self::AUTOFILTER_FILTERTYPE_FILTER,
-		self::AUTOFILTER_FILTERTYPE_CUSTOMFILTER,
-		self::AUTOFILTER_FILTERTYPE_DYNAMICFILTER,
-		self::AUTOFILTER_FILTERTYPE_TOPTENFILTER,
-	);
-
-	/* Multiple Rule Connections */
-	const AUTOFILTER_COLUMN_JOIN_AND	= 'and';
-	const AUTOFILTER_COLUMN_JOIN_OR		= 'or';
-
-	/**
-	 * Join options for autofilter rules
-	 *
-	 * @var string[]
-	 */
-	private static $_ruleJoins = array(
-		self::AUTOFILTER_COLUMN_JOIN_AND,
-		self::AUTOFILTER_COLUMN_JOIN_OR,
-	);
-
-	/**
-	 * Autofilter
-	 *
-	 * @var PHPExcel_Worksheet_AutoFilter
-	 */
-	private $_parent = NULL;
-
-
-	/**
-	 * Autofilter Column Index
-	 *
-	 * @var string
-	 */
-	private $_columnIndex = '';
-
-
-	/**
-	 * Autofilter Column Filter Type
-	 *
-	 * @var string
-	 */
-	private $_filterType = self::AUTOFILTER_FILTERTYPE_FILTER;
-
-
-	/**
-	 * Autofilter Multiple Rules And/Or
-	 *
-	 * @var string
-	 */
-	private $_join = self::AUTOFILTER_COLUMN_JOIN_OR;
-
-
-	/**
-	 * Autofilter Column Rules
-	 *
-	 * @var array of PHPExcel_Worksheet_AutoFilter_Column_Rule
-	 */
-	private $_ruleset = array();
-
-
-	/**
-	 * Autofilter Column Dynamic Attributes
-	 *
-	 * @var array of mixed
-	 */
-	private $_attributes = array();
-
-
-	/**
-	 * Create a new PHPExcel_Worksheet_AutoFilter_Column
-	 *
-	 *	@param	string		                   $pColumn		Column (e.g. A)
-	 *	@param	PHPExcel_Worksheet_AutoFilter  $pParent		Autofilter for this column
-	 */
-	public function __construct($pColumn, PHPExcel_Worksheet_AutoFilter $pParent = NULL)
-	{
-		$this->_columnIndex = $pColumn;
-		$this->_parent = $pParent;
-	}
-
-	/**
-	 * Get AutoFilter Column Index
-	 *
-	 * @return string
-	 */
-	public function getColumnIndex() {
-		return $this->_columnIndex;
-	}
-
-	/**
-	 *	Set AutoFilter Column Index
-	 *
-	 *	@param	string		$pColumn		Column (e.g. A)
-	 *	@throws	PHPExcel_Exception
-	 *	@return PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	public function setColumnIndex($pColumn) {
-		// Uppercase coordinate
-		$pColumn = strtoupper($pColumn);
-		if ($this->_parent !== NULL) {
-			$this->_parent->testColumnInRange($pColumn);
-		}
-
-		$this->_columnIndex = $pColumn;
-
-		return $this;
-	}
-
-	/**
-	 * Get this Column's AutoFilter Parent
-	 *
-	 * @return PHPExcel_Worksheet_AutoFilter
-	 */
-	public function getParent() {
-		return $this->_parent;
-	}
-
-	/**
-	 * Set this Column's AutoFilter Parent
-	 *
-	 * @param PHPExcel_Worksheet_AutoFilter
-	 * @return PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	public function setParent(PHPExcel_Worksheet_AutoFilter $pParent = NULL) {
-		$this->_parent = $pParent;
-
-		return $this;
-	}
-
-	/**
-	 * Get AutoFilter Type
-	 *
-	 * @return string
-	 */
-	public function getFilterType() {
-		return $this->_filterType;
-	}
-
-	/**
-	 *	Set AutoFilter Type
-	 *
-	 *	@param	string		$pFilterType
-	 *	@throws	PHPExcel_Exception
-	 *	@return PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	public function setFilterType($pFilterType = self::AUTOFILTER_FILTERTYPE_FILTER) {
-		if (!in_array($pFilterType,self::$_filterTypes)) {
-			throw new PHPExcel_Exception('Invalid filter type for column AutoFilter.');
-		}
-
-		$this->_filterType = $pFilterType;
-
-		return $this;
-	}
-
-	/**
-	 * Get AutoFilter Multiple Rules And/Or Join
-	 *
-	 * @return string
-	 */
-	public function getJoin() {
-		return $this->_join;
-	}
-
-	/**
-	 *	Set AutoFilter Multiple Rules And/Or
-	 *
-	 *	@param	string		$pJoin		And/Or
-	 *	@throws	PHPExcel_Exception
-	 *	@return PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	public function setJoin($pJoin = self::AUTOFILTER_COLUMN_JOIN_OR) {
-		// Lowercase And/Or
-		$pJoin = strtolower($pJoin);
-		if (!in_array($pJoin,self::$_ruleJoins)) {
-			throw new PHPExcel_Exception('Invalid rule connection for column AutoFilter.');
-		}
-
-		$this->_join = $pJoin;
-
-		return $this;
-	}
-
-	/**
-	 *	Set AutoFilter Attributes
-	 *
-	 *	@param	string[]		$pAttributes
-	 *	@throws	PHPExcel_Exception
-	 *	@return PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	public function setAttributes($pAttributes = array()) {
-		$this->_attributes = $pAttributes;
-
-		return $this;
-	}
-
-	/**
-	 *	Set An AutoFilter Attribute
-	 *
-	 *	@param	string		$pName		Attribute Name
-	 *	@param	string		$pValue		Attribute Value
-	 *	@throws	PHPExcel_Exception
-	 *	@return PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	public function setAttribute($pName, $pValue) {
-		$this->_attributes[$pName] = $pValue;
-
-		return $this;
-	}
-
-	/**
-	 * Get AutoFilter Column Attributes
-	 *
-	 * @return string
-	 */
-	public function getAttributes() {
-		return $this->_attributes;
-	}
-
-	/**
-	 * Get specific AutoFilter Column Attribute
-	 *
-	 *	@param	string		$pName		Attribute Name
-	 * @return string
-	 */
-	public function getAttribute($pName) {
-		if (isset($this->_attributes[$pName]))
-			return $this->_attributes[$pName];
-		return NULL;
-	}
-
-	/**
-	 * Get all AutoFilter Column Rules
-	 *
-	 * @throws	PHPExcel_Exception
-	 * @return array of PHPExcel_Worksheet_AutoFilter_Column_Rule
-	 */
-	public function getRules() {
-		return $this->_ruleset;
-	}
-
-	/**
-	 * Get a specified AutoFilter Column Rule
-	 *
-	 * @param	integer	$pIndex		Rule index in the ruleset array
-	 * @return	PHPExcel_Worksheet_AutoFilter_Column_Rule
-	 */
-	public function getRule($pIndex) {
-		if (!isset($this->_ruleset[$pIndex])) {
-			$this->_ruleset[$pIndex] = new PHPExcel_Worksheet_AutoFilter_Column_Rule($this);
-		}
-		return $this->_ruleset[$pIndex];
-	}
-
-	/**
-	 * Create a new AutoFilter Column Rule in the ruleset
-	 *
-	 * @return	PHPExcel_Worksheet_AutoFilter_Column_Rule
-	 */
-	public function createRule() {
-		$this->_ruleset[] = new PHPExcel_Worksheet_AutoFilter_Column_Rule($this);
-
-		return end($this->_ruleset);
-	}
-
-	/**
-	 * Add a new AutoFilter Column Rule to the ruleset
-	 *
-	 * @param	PHPExcel_Worksheet_AutoFilter_Column_Rule	$pRule
-	 * @param	boolean	$returnRule 	Flag indicating whether the rule object or the column object should be returned
-	 * @return	PHPExcel_Worksheet_AutoFilter_Column|PHPExcel_Worksheet_AutoFilter_Column_Rule
-	 */
-	public function addRule(PHPExcel_Worksheet_AutoFilter_Column_Rule $pRule, $returnRule=TRUE) {
-		$pRule->setParent($this);
-		$this->_ruleset[] = $pRule;
-
-		return ($returnRule) ? $pRule : $this;
-	}
-
-	/**
-	 * Delete a specified AutoFilter Column Rule
-	 *	If the number of rules is reduced to 1, then we reset And/Or logic to Or
-	 *
-	 * @param	integer	$pIndex		Rule index in the ruleset array
-	 * @return	PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	public function deleteRule($pIndex) {
-		if (isset($this->_ruleset[$pIndex])) {
-			unset($this->_ruleset[$pIndex]);
-			//	If we've just deleted down to a single rule, then reset And/Or joining to Or
-			if (count($this->_ruleset) <= 1) {
-				$this->setJoin(self::AUTOFILTER_COLUMN_JOIN_OR);
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Delete all AutoFilter Column Rules
-	 *
-	 * @return	PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	public function clearRules() {
-		$this->_ruleset = array();
-		$this->setJoin(self::AUTOFILTER_COLUMN_JOIN_OR);
-
-		return $this;
-	}
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				if ($key == '_parent') {
-					//	Detach from autofilter parent
-					$this->$key = NULL;
-				} else {
-					$this->$key = clone $value;
-				}
-			} elseif ((is_array($value)) && ($key == '_ruleset')) {
-				//	The columns array of PHPExcel_Worksheet_AutoFilter objects
-				$this->$key = array();
-				foreach ($value as $k => $v) {
-					$this->$key[$k] = clone $v;
-					// attach the new cloned Rule to this new cloned Autofilter Cloned object
-					$this->$key[$k]->setParent($this);
-				}
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column/Rule.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column/Rule.php
deleted file mode 100644
index e602646401b..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column/Rule.php
+++ /dev/null
@@ -1,464 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Worksheet
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_AutoFilter_Column_Rule
- *
- * @category	PHPExcel
- * @package		PHPExcel_Worksheet
- * @copyright	Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_AutoFilter_Column_Rule
-{
-	const AUTOFILTER_RULETYPE_FILTER		= 'filter';
-	const AUTOFILTER_RULETYPE_DATEGROUP		= 'dateGroupItem';
-	const AUTOFILTER_RULETYPE_CUSTOMFILTER	= 'customFilter';
-	const AUTOFILTER_RULETYPE_DYNAMICFILTER	= 'dynamicFilter';
-	const AUTOFILTER_RULETYPE_TOPTENFILTER	= 'top10Filter';
-
-	private static $_ruleTypes = array(
-		//	Currently we're not handling
-		//		colorFilter
-		//		extLst
-		//		iconFilter
-		self::AUTOFILTER_RULETYPE_FILTER,
-		self::AUTOFILTER_RULETYPE_DATEGROUP,
-		self::AUTOFILTER_RULETYPE_CUSTOMFILTER,
-		self::AUTOFILTER_RULETYPE_DYNAMICFILTER,
-		self::AUTOFILTER_RULETYPE_TOPTENFILTER,
-	);
-
-	const AUTOFILTER_RULETYPE_DATEGROUP_YEAR	= 'year';
-	const AUTOFILTER_RULETYPE_DATEGROUP_MONTH	= 'month';
-	const AUTOFILTER_RULETYPE_DATEGROUP_DAY		= 'day';
-	const AUTOFILTER_RULETYPE_DATEGROUP_HOUR	= 'hour';
-	const AUTOFILTER_RULETYPE_DATEGROUP_MINUTE	= 'minute';
-	const AUTOFILTER_RULETYPE_DATEGROUP_SECOND	= 'second';
-
-	private static $_dateTimeGroups = array(
-		self::AUTOFILTER_RULETYPE_DATEGROUP_YEAR,
-		self::AUTOFILTER_RULETYPE_DATEGROUP_MONTH,
-		self::AUTOFILTER_RULETYPE_DATEGROUP_DAY,
-		self::AUTOFILTER_RULETYPE_DATEGROUP_HOUR,
-		self::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE,
-		self::AUTOFILTER_RULETYPE_DATEGROUP_SECOND,
-	);
-
-	const AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY		= 'yesterday';
-	const AUTOFILTER_RULETYPE_DYNAMIC_TODAY			= 'today';
-	const AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW		= 'tomorrow';
-	const AUTOFILTER_RULETYPE_DYNAMIC_YEARTODATE	= 'yearToDate';
-	const AUTOFILTER_RULETYPE_DYNAMIC_THISYEAR		= 'thisYear';
-	const AUTOFILTER_RULETYPE_DYNAMIC_THISQUARTER	= 'thisQuarter';
-	const AUTOFILTER_RULETYPE_DYNAMIC_THISMONTH		= 'thisMonth';
-	const AUTOFILTER_RULETYPE_DYNAMIC_THISWEEK		= 'thisWeek';
-	const AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR		= 'lastYear';
-	const AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER	= 'lastQuarter';
-	const AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH		= 'lastMonth';
-	const AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK		= 'lastWeek';
-	const AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR		= 'nextYear';
-	const AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER	= 'nextQuarter';
-	const AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH		= 'nextMonth';
-	const AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK		= 'nextWeek';
-	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_1		= 'M1';
-	const AUTOFILTER_RULETYPE_DYNAMIC_JANUARY		= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_1;
-	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_2		= 'M2';
-	const AUTOFILTER_RULETYPE_DYNAMIC_FEBRUARY		= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_2;
-	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_3		= 'M3';
-	const AUTOFILTER_RULETYPE_DYNAMIC_MARCH			= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_3;
-	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_4		= 'M4';
-	const AUTOFILTER_RULETYPE_DYNAMIC_APRIL			= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_4;
-	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_5		= 'M5';
-	const AUTOFILTER_RULETYPE_DYNAMIC_MAY			= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_5;
-	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_6		= 'M6';
-	const AUTOFILTER_RULETYPE_DYNAMIC_JUNE			= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_6;
-	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_7		= 'M7';
-	const AUTOFILTER_RULETYPE_DYNAMIC_JULY			= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_7;
-	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_8		= 'M8';
-	const AUTOFILTER_RULETYPE_DYNAMIC_AUGUST		= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_8;
-	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_9		= 'M9';
-	const AUTOFILTER_RULETYPE_DYNAMIC_SEPTEMBER		= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_9;
-	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_10		= 'M10';
-	const AUTOFILTER_RULETYPE_DYNAMIC_OCTOBER		= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_10;
-	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_11		= 'M11';
-	const AUTOFILTER_RULETYPE_DYNAMIC_NOVEMBER		= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_11;
-	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_12		= 'M12';
-	const AUTOFILTER_RULETYPE_DYNAMIC_DECEMBER		= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_12;
-	const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_1		= 'Q1';
-	const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_2		= 'Q2';
-	const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_3		= 'Q3';
-	const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_4		= 'Q4';
-	const AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE	= 'aboveAverage';
-	const AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE	= 'belowAverage';
-
-	private static $_dynamicTypes = array(
-		self::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_TODAY,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_YEARTODATE,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_THISYEAR,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_THISQUARTER,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_THISMONTH,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_THISWEEK,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_1,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_2,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_3,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_4,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_5,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_6,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_7,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_8,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_9,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_10,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_11,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_12,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_1,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_2,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_3,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_4,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE,
-	);
-
-	/*
-	 *	The only valid filter rule operators for filter and customFilter types are:
-	 *		<xsd:enumeration value="equal"/>
-	 *		<xsd:enumeration value="lessThan"/>
-	 *		<xsd:enumeration value="lessThanOrEqual"/>
-	 *		<xsd:enumeration value="notEqual"/>
-	 *		<xsd:enumeration value="greaterThanOrEqual"/>
-	 *		<xsd:enumeration value="greaterThan"/>
-	 */
-	const AUTOFILTER_COLUMN_RULE_EQUAL				= 'equal';
-	const AUTOFILTER_COLUMN_RULE_NOTEQUAL			= 'notEqual';
-	const AUTOFILTER_COLUMN_RULE_GREATERTHAN		= 'greaterThan';
-	const AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL	= 'greaterThanOrEqual';
-	const AUTOFILTER_COLUMN_RULE_LESSTHAN			= 'lessThan';
-	const AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL	= 'lessThanOrEqual';
-
-	private static $_operators = array(
-		self::AUTOFILTER_COLUMN_RULE_EQUAL,
-		self::AUTOFILTER_COLUMN_RULE_NOTEQUAL,
-		self::AUTOFILTER_COLUMN_RULE_GREATERTHAN,
-		self::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL,
-		self::AUTOFILTER_COLUMN_RULE_LESSTHAN,
-		self::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL,
-	);
-
-	const AUTOFILTER_COLUMN_RULE_TOPTEN_BY_VALUE	= 'byValue';
-	const AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT		= 'byPercent';
-
-	private static $_topTenValue = array(
-		self::AUTOFILTER_COLUMN_RULE_TOPTEN_BY_VALUE,
-		self::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT,
-	);
-
-	const AUTOFILTER_COLUMN_RULE_TOPTEN_TOP			= 'top';
-	const AUTOFILTER_COLUMN_RULE_TOPTEN_BOTTOM		= 'bottom';
-
-	private static $_topTenType = array(
-		self::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP,
-		self::AUTOFILTER_COLUMN_RULE_TOPTEN_BOTTOM,
-	);
-
-
-	/* Rule Operators (Numeric, Boolean etc) */
-//	const AUTOFILTER_COLUMN_RULE_BETWEEN			= 'between';		//	greaterThanOrEqual 1 && lessThanOrEqual 2
-	/* Rule Operators (Numeric Special) which are translated to standard numeric operators with calculated values */
-//	const AUTOFILTER_COLUMN_RULE_TOPTEN				= 'topTen';			//	greaterThan calculated value
-//	const AUTOFILTER_COLUMN_RULE_TOPTENPERCENT		= 'topTenPercent';	//	greaterThan calculated value
-//	const AUTOFILTER_COLUMN_RULE_ABOVEAVERAGE		= 'aboveAverage';	//	Value is calculated as the average
-//	const AUTOFILTER_COLUMN_RULE_BELOWAVERAGE		= 'belowAverage';	//	Value is calculated as the average
-	/* Rule Operators (String) which are set as wild-carded values */
-//	const AUTOFILTER_COLUMN_RULE_BEGINSWITH			= 'beginsWith';			// A*
-//	const AUTOFILTER_COLUMN_RULE_ENDSWITH			= 'endsWith';			// *Z
-//	const AUTOFILTER_COLUMN_RULE_CONTAINS			= 'contains';			// *B*
-//	const AUTOFILTER_COLUMN_RULE_DOESNTCONTAIN		= 'notEqual';			//	notEqual *B*
-	/* Rule Operators (Date Special) which are translated to standard numeric operators with calculated values */
-//	const AUTOFILTER_COLUMN_RULE_BEFORE				= 'lessThan';
-//	const AUTOFILTER_COLUMN_RULE_AFTER				= 'greaterThan';
-//	const AUTOFILTER_COLUMN_RULE_YESTERDAY			= 'yesterday';
-//	const AUTOFILTER_COLUMN_RULE_TODAY				= 'today';
-//	const AUTOFILTER_COLUMN_RULE_TOMORROW			= 'tomorrow';
-//	const AUTOFILTER_COLUMN_RULE_LASTWEEK			= 'lastWeek';
-//	const AUTOFILTER_COLUMN_RULE_THISWEEK			= 'thisWeek';
-//	const AUTOFILTER_COLUMN_RULE_NEXTWEEK			= 'nextWeek';
-//	const AUTOFILTER_COLUMN_RULE_LASTMONTH			= 'lastMonth';
-//	const AUTOFILTER_COLUMN_RULE_THISMONTH			= 'thisMonth';
-//	const AUTOFILTER_COLUMN_RULE_NEXTMONTH			= 'nextMonth';
-//	const AUTOFILTER_COLUMN_RULE_LASTQUARTER		= 'lastQuarter';
-//	const AUTOFILTER_COLUMN_RULE_THISQUARTER		= 'thisQuarter';
-//	const AUTOFILTER_COLUMN_RULE_NEXTQUARTER		= 'nextQuarter';
-//	const AUTOFILTER_COLUMN_RULE_LASTYEAR			= 'lastYear';
-//	const AUTOFILTER_COLUMN_RULE_THISYEAR			= 'thisYear';
-//	const AUTOFILTER_COLUMN_RULE_NEXTYEAR			= 'nextYear';
-//	const AUTOFILTER_COLUMN_RULE_YEARTODATE			= 'yearToDate';			//	<dynamicFilter val="40909" type="yearToDate" maxVal="41113"/>
-//	const AUTOFILTER_COLUMN_RULE_ALLDATESINMONTH	= 'allDatesInMonth';	//	<dynamicFilter type="M2"/> for Month/February
-//	const AUTOFILTER_COLUMN_RULE_ALLDATESINQUARTER	= 'allDatesInQuarter';	//	<dynamicFilter type="Q2"/> for Quarter 2
-
-	/**
-	 * Autofilter Column
-	 *
-	 * @var PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	private $_parent = NULL;
-
-
-	/**
-	 * Autofilter Rule Type
-	 *
-	 * @var string
-	 */
-	private $_ruleType = self::AUTOFILTER_RULETYPE_FILTER;
-
-
-	/**
-	 * Autofilter Rule Value
-	 *
-	 * @var string
-	 */
-	private $_value = '';
-
-	/**
-	 * Autofilter Rule Operator
-	 *
-	 * @var string
-	 */
-	private $_operator = self::AUTOFILTER_COLUMN_RULE_EQUAL;
-
-	/**
-	 * DateTimeGrouping Group Value
-	 *
-	 * @var string
-	 */
-	private $_grouping = '';
-
-
-	/**
-	 * Create a new PHPExcel_Worksheet_AutoFilter_Column_Rule
-	 *
-	 * @param PHPExcel_Worksheet_AutoFilter_Column $pParent
-	 */
-	public function __construct(PHPExcel_Worksheet_AutoFilter_Column $pParent = NULL)
-	{
-		$this->_parent = $pParent;
-	}
-
-	/**
-	 * Get AutoFilter Rule Type
-	 *
-	 * @return string
-	 */
-	public function getRuleType() {
-		return $this->_ruleType;
-	}
-
-	/**
-	 *	Set AutoFilter Rule Type
-	 *
-	 *	@param	string		$pRuleType
-	 *	@throws	PHPExcel_Exception
-	 *	@return PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	public function setRuleType($pRuleType = self::AUTOFILTER_RULETYPE_FILTER) {
-		if (!in_array($pRuleType,self::$_ruleTypes)) {
-			throw new PHPExcel_Exception('Invalid rule type for column AutoFilter Rule.');
-		}
-
-		$this->_ruleType = $pRuleType;
-
-		return $this;
-	}
-
-	/**
-	 * Get AutoFilter Rule Value
-	 *
-	 * @return string
-	 */
-	public function getValue() {
-		return $this->_value;
-	}
-
-	/**
-	 *	Set AutoFilter Rule Value
-	 *
-	 *	@param	string|string[]		$pValue
-	 *	@throws	PHPExcel_Exception
-	 *	@return PHPExcel_Worksheet_AutoFilter_Column_Rule
-	 */
-	public function setValue($pValue = '') {
-		if (is_array($pValue)) {
-			$grouping = -1;
-			foreach($pValue as $key => $value) {
-				//	Validate array entries
-				if (!in_array($key,self::$_dateTimeGroups)) {
-					//	Remove any invalid entries from the value array
-					unset($pValue[$key]);
-				} else {
-					//	Work out what the dateTime grouping will be
-					$grouping = max($grouping,array_search($key,self::$_dateTimeGroups));
-				}
-			}
-			if (count($pValue) == 0) {
-				throw new PHPExcel_Exception('Invalid rule value for column AutoFilter Rule.');
-			}
-			//	Set the dateTime grouping that we've anticipated
-			$this->setGrouping(self::$_dateTimeGroups[$grouping]);
-		}
-		$this->_value = $pValue;
-
-		return $this;
-	}
-
-	/**
-	 * Get AutoFilter Rule Operator
-	 *
-	 * @return string
-	 */
-	public function getOperator() {
-		return $this->_operator;
-	}
-
-	/**
-	 *	Set AutoFilter Rule Operator
-	 *
-	 *	@param	string		$pOperator
-	 *	@throws	PHPExcel_Exception
-	 *	@return PHPExcel_Worksheet_AutoFilter_Column_Rule
-	 */
-	public function setOperator($pOperator = self::AUTOFILTER_COLUMN_RULE_EQUAL) {
-		if (empty($pOperator))
-			$pOperator = self::AUTOFILTER_COLUMN_RULE_EQUAL;
-		if ((!in_array($pOperator,self::$_operators)) &&
-			(!in_array($pOperator,self::$_topTenValue))) {
-			throw new PHPExcel_Exception('Invalid operator for column AutoFilter Rule.');
-		}
-		$this->_operator = $pOperator;
-
-		return $this;
-	}
-
-	/**
-	 * Get AutoFilter Rule Grouping
-	 *
-	 * @return string
-	 */
-	public function getGrouping() {
-		return $this->_grouping;
-	}
-
-	/**
-	 *	Set AutoFilter Rule Grouping
-	 *
-	 *	@param	string		$pGrouping
-	 *	@throws	PHPExcel_Exception
-	 *	@return PHPExcel_Worksheet_AutoFilter_Column_Rule
-	 */
-	public function setGrouping($pGrouping = NULL) {
-		if (($pGrouping !== NULL) &&
-			(!in_array($pGrouping,self::$_dateTimeGroups)) &&
-			(!in_array($pGrouping,self::$_dynamicTypes)) &&
-			(!in_array($pGrouping,self::$_topTenType))) {
-			throw new PHPExcel_Exception('Invalid rule type for column AutoFilter Rule.');
-		}
-
-		$this->_grouping = $pGrouping;
-
-		return $this;
-	}
-
-	/**
-	 *	Set AutoFilter Rule
-	 *
-	 *	@param	string				$pOperator
-	 *	@param	string|string[]		$pValue
-	 *	@param	string				$pGrouping
-	 *	@throws	PHPExcel_Exception
-	 *	@return PHPExcel_Worksheet_AutoFilter_Column_Rule
-	 */
-	public function setRule($pOperator = self::AUTOFILTER_COLUMN_RULE_EQUAL, $pValue = '', $pGrouping = NULL) {
-		$this->setOperator($pOperator);
-		$this->setValue($pValue);
-		//	Only set grouping if it's been passed in as a user-supplied argument,
-		//		otherwise we're calculating it when we setValue() and don't want to overwrite that
-		//		If the user supplies an argumnet for grouping, then on their own head be it
-		if ($pGrouping !== NULL)
-			$this->setGrouping($pGrouping);
-
-		return $this;
-	}
-
-	/**
-	 * Get this Rule's AutoFilter Column Parent
-	 *
-	 * @return PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	public function getParent() {
-		return $this->_parent;
-	}
-
-	/**
-	 * Set this Rule's AutoFilter Column Parent
-	 *
-	 * @param PHPExcel_Worksheet_AutoFilter_Column
-	 * @return PHPExcel_Worksheet_AutoFilter_Column_Rule
-	 */
-	public function setParent(PHPExcel_Worksheet_AutoFilter_Column $pParent = NULL) {
-		$this->_parent = $pParent;
-
-		return $this;
-	}
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				if ($key == '_parent') {
-					//	Detach from autofilter column parent
-					$this->$key = NULL;
-				} else {
-					$this->$key = clone $value;
-				}
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/BaseDrawing.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/BaseDrawing.php
deleted file mode 100644
index 5a760fcad11..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/BaseDrawing.php
+++ /dev/null
@@ -1,489 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_BaseDrawing
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
-{
-	/**
-	 * Image counter
-	 *
-	 * @var int
-	 */
-	private static $_imageCounter = 0;
-
-	/**
-	 * Image index
-	 *
-	 * @var int
-	 */
-	private $_imageIndex = 0;
-
-	/**
-	 * Name
-	 *
-	 * @var string
-	 */
-	protected $_name;
-
-	/**
-	 * Description
-	 *
-	 * @var string
-	 */
-	protected $_description;
-
-	/**
-	 * Worksheet
-	 *
-	 * @var PHPExcel_Worksheet
-	 */
-	protected $_worksheet;
-
-	/**
-	 * Coordinates
-	 *
-	 * @var string
-	 */
-	protected $_coordinates;
-
-	/**
-	 * Offset X
-	 *
-	 * @var int
-	 */
-	protected $_offsetX;
-
-	/**
-	 * Offset Y
-	 *
-	 * @var int
-	 */
-	protected $_offsetY;
-
-	/**
-	 * Width
-	 *
-	 * @var int
-	 */
-	protected $_width;
-
-	/**
-	 * Height
-	 *
-	 * @var int
-	 */
-	protected $_height;
-
-	/**
-	 * Proportional resize
-	 *
-	 * @var boolean
-	 */
-	protected $_resizeProportional;
-
-	/**
-	 * Rotation
-	 *
-	 * @var int
-	 */
-	protected $_rotation;
-
-	/**
-	 * Shadow
-	 *
-	 * @var PHPExcel_Worksheet_Drawing_Shadow
-	 */
-	protected $_shadow;
-
-    /**
-     * Create a new PHPExcel_Worksheet_BaseDrawing
-     */
-    public function __construct()
-    {
-    	// Initialise values
-    	$this->_name				= '';
-    	$this->_description			= '';
-    	$this->_worksheet			= null;
-    	$this->_coordinates			= 'A1';
-    	$this->_offsetX				= 0;
-    	$this->_offsetY				= 0;
-    	$this->_width				= 0;
-    	$this->_height				= 0;
-    	$this->_resizeProportional	= true;
-    	$this->_rotation			= 0;
-    	$this->_shadow				= new PHPExcel_Worksheet_Drawing_Shadow();
-
-		// Set image index
-		self::$_imageCounter++;
-		$this->_imageIndex 			= self::$_imageCounter;
-    }
-
-    /**
-     * Get image index
-     *
-     * @return int
-     */
-    public function getImageIndex() {
-    	return $this->_imageIndex;
-    }
-
-    /**
-     * Get Name
-     *
-     * @return string
-     */
-    public function getName() {
-    	return $this->_name;
-    }
-
-    /**
-     * Set Name
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setName($pValue = '') {
-    	$this->_name = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Description
-     *
-     * @return string
-     */
-    public function getDescription() {
-    	return $this->_description;
-    }
-
-    /**
-     * Set Description
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setDescription($pValue = '') {
-    	$this->_description = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Worksheet
-     *
-     * @return PHPExcel_Worksheet
-     */
-    public function getWorksheet() {
-    	return $this->_worksheet;
-    }
-
-    /**
-     * Set Worksheet
-     *
-     * @param 	PHPExcel_Worksheet 	$pValue
-     * @param 	bool				$pOverrideOld	If a Worksheet has already been assigned, overwrite it and remove image from old Worksheet?
-     * @throws 	PHPExcel_Exception
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setWorksheet(PHPExcel_Worksheet $pValue = null, $pOverrideOld = false) {
-    	if (is_null($this->_worksheet)) {
-    		// Add drawing to PHPExcel_Worksheet
-	    	$this->_worksheet = $pValue;
-	    	$this->_worksheet->getCell($this->_coordinates);
-	    	$this->_worksheet->getDrawingCollection()->append($this);
-    	} else {
-    		if ($pOverrideOld) {
-    			// Remove drawing from old PHPExcel_Worksheet
-    			$iterator = $this->_worksheet->getDrawingCollection()->getIterator();
-
-    			while ($iterator->valid()) {
-    				if ($iterator->current()->getHashCode() == $this->getHashCode()) {
-    					$this->_worksheet->getDrawingCollection()->offsetUnset( $iterator->key() );
-    					$this->_worksheet = null;
-    					break;
-    				}
-    			}
-
-    			// Set new PHPExcel_Worksheet
-    			$this->setWorksheet($pValue);
-    		} else {
-    			throw new PHPExcel_Exception("A PHPExcel_Worksheet has already been assigned. Drawings can only exist on one PHPExcel_Worksheet.");
-    		}
-    	}
-    	return $this;
-    }
-
-    /**
-     * Get Coordinates
-     *
-     * @return string
-     */
-    public function getCoordinates() {
-    	return $this->_coordinates;
-    }
-
-    /**
-     * Set Coordinates
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setCoordinates($pValue = 'A1') {
-    	$this->_coordinates = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get OffsetX
-     *
-     * @return int
-     */
-    public function getOffsetX() {
-    	return $this->_offsetX;
-    }
-
-    /**
-     * Set OffsetX
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setOffsetX($pValue = 0) {
-    	$this->_offsetX = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get OffsetY
-     *
-     * @return int
-     */
-    public function getOffsetY() {
-    	return $this->_offsetY;
-    }
-
-    /**
-     * Set OffsetY
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setOffsetY($pValue = 0) {
-    	$this->_offsetY = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Width
-     *
-     * @return int
-     */
-    public function getWidth() {
-    	return $this->_width;
-    }
-
-    /**
-     * Set Width
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setWidth($pValue = 0) {
-    	// Resize proportional?
-    	if ($this->_resizeProportional && $pValue != 0) {
-    		$ratio = $this->_height / ($this->_width != 0 ? $this->_width : 1);
-    		$this->_height = round($ratio * $pValue);
-    	}
-
-    	// Set width
-    	$this->_width = $pValue;
-
-    	return $this;
-    }
-
-    /**
-     * Get Height
-     *
-     * @return int
-     */
-    public function getHeight() {
-    	return $this->_height;
-    }
-
-    /**
-     * Set Height
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setHeight($pValue = 0) {
-    	// Resize proportional?
-    	if ($this->_resizeProportional && $pValue != 0) {
-    		$ratio = $this->_width / ($this->_height != 0 ? $this->_height : 1);
-    		$this->_width = round($ratio * $pValue);
-    	}
-
-    	// Set height
-    	$this->_height = $pValue;
-
-    	return $this;
-    }
-
-    /**
-     * Set width and height with proportional resize
-	 * Example:
-	 * <code>
-	 * $objDrawing->setResizeProportional(true);
-	 * $objDrawing->setWidthAndHeight(160,120);
-	 * </code>
-	 *
-     * @author Vincent@luo MSN:kele_100@hotmail.com
-     * @param int $width
-     * @param int $height
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-	public function setWidthAndHeight($width = 0, $height = 0) {
-		$xratio = $width / ($this->_width != 0 ? $this->_width : 1);
-		$yratio = $height / ($this->_height != 0 ? $this->_height : 1);
-		if ($this->_resizeProportional && !($width == 0 || $height == 0)) {
-			if (($xratio * $this->_height) < $height) {
-				$this->_height = ceil($xratio * $this->_height);
-				$this->_width  = $width;
-			} else {
-				$this->_width	= ceil($yratio * $this->_width);
-				$this->_height	= $height;
-			}
-		} else {
-            $this->_width = $width;
-            $this->_height = $height;
-        }
-
-		return $this;
-	}
-
-    /**
-     * Get ResizeProportional
-     *
-     * @return boolean
-     */
-    public function getResizeProportional() {
-    	return $this->_resizeProportional;
-    }
-
-    /**
-     * Set ResizeProportional
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setResizeProportional($pValue = true) {
-    	$this->_resizeProportional = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Rotation
-     *
-     * @return int
-     */
-    public function getRotation() {
-    	return $this->_rotation;
-    }
-
-    /**
-     * Set Rotation
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setRotation($pValue = 0) {
-    	$this->_rotation = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Shadow
-     *
-     * @return PHPExcel_Worksheet_Drawing_Shadow
-     */
-    public function getShadow() {
-    	return $this->_shadow;
-    }
-
-    /**
-     * Set Shadow
-     *
-     * @param 	PHPExcel_Worksheet_Drawing_Shadow $pValue
-     * @throws 	PHPExcel_Exception
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setShadow(PHPExcel_Worksheet_Drawing_Shadow $pValue = null) {
-   		$this->_shadow = $pValue;
-   		return $this;
-    }
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-    	return md5(
-    		  $this->_name
-    		. $this->_description
-    		. $this->_worksheet->getHashCode()
-    		. $this->_coordinates
-    		. $this->_offsetX
-    		. $this->_offsetY
-    		. $this->_width
-    		. $this->_height
-    		. $this->_rotation
-    		. $this->_shadow->getHashCode()
-    		. __CLASS__
-    	);
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/CellIterator.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/CellIterator.php
deleted file mode 100644
index 239cb4ff1f5..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/CellIterator.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.8.0, 2014-03-02
- */
-
-
-/**
- * PHPExcel_Worksheet_CellIterator
- *
- * Used to iterate rows in a PHPExcel_Worksheet
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-abstract class PHPExcel_Worksheet_CellIterator
-{
-	/**
-	 * PHPExcel_Worksheet to iterate
-	 *
-	 * @var PHPExcel_Worksheet
-	 */
-	protected $_subject;
-
-	/**
-	 * Current iterator position
-	 *
-	 * @var mixed
-	 */
-	protected $_position = null;
-
-	/**
-	 * Iterate only existing cells
-	 *
-	 * @var boolean
-	 */
-	protected $_onlyExistingCells = false;
-
-	/**
-	 * Destructor
-	 */
-	public function __destruct() {
-		unset($this->_subject);
-	}
-
-	/**
-	 * Get loop only existing cells
-	 *
-	 * @return boolean
-	 */
-    public function getIterateOnlyExistingCells() {
-    	return $this->_onlyExistingCells;
-    }
-
-	/**
-	 * Validate start/end values for "IterateOnlyExistingCells" mode, and adjust if necessary
-	 *
-     * @throws PHPExcel_Exception
-	 */
-    abstract protected function adjustForExistingOnlyRange();
-
-	/**
-	 * Set the iterator to loop only existing cells
-	 *
-	 * @param	boolean		$value
-     * @throws PHPExcel_Exception
-	 */
-    public function setIterateOnlyExistingCells($value = true) {
-    	$this->_onlyExistingCells = (boolean) $value;
-
-        $this->adjustForExistingOnlyRange();
-    }
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Column.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Column.php
deleted file mode 100644
index 94af2135725..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Column.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_Column
- *
- * Represents a column in PHPExcel_Worksheet, used by PHPExcel_Worksheet_ColumnIterator
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_Column
-{
-	/**
-	 * PHPExcel_Worksheet
-	 *
-	 * @var PHPExcel_Worksheet
-	 */
-	private $_parent;
-
-	/**
-	 * Column index
-	 *
-	 * @var string
-	 */
-	private $_columnIndex;
-
-	/**
-	 * Create a new column
-	 *
-	 * @param PHPExcel_Worksheet 	$parent
-	 * @param string				$columnIndex
-	 */
-	public function __construct(PHPExcel_Worksheet $parent = null, $columnIndex = 'A') {
-		// Set parent and column index
-		$this->_parent 		= $parent;
-		$this->_columnIndex = $columnIndex;
-	}
-
-	/**
-	 * Destructor
-	 */
-	public function __destruct() {
-		unset($this->_parent);
-	}
-
-	/**
-	 * Get column index
-	 *
-	 * @return int
-	 */
-	public function getColumnIndex() {
-		return $this->_columnIndex;
-	}
-
-	/**
-	 * Get cell iterator
-	 *
-	 * @param	integer				$startRow	    The row number at which to start iterating
-	 * @param	integer				$endRow	        Optionally, the row number at which to stop iterating
-	 * @return PHPExcel_Worksheet_CellIterator
-	 */
-	public function getCellIterator($startRow = 1, $endRow = null) {
-		return new PHPExcel_Worksheet_ColumnCellIterator($this->_parent, $this->_columnIndex, $startRow, $endRow);
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnCellIterator.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnCellIterator.php
deleted file mode 100644
index a9ef49f00d7..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnCellIterator.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_ColumnCellIterator
- *
- * Used to iterate columns in a PHPExcel_Worksheet
- *
- * @category   PHPExcel
- * @package	PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_ColumnCellIterator extends PHPExcel_Worksheet_CellIterator implements Iterator
-{
-	/**
-	 * Column index
-	 *
-	 * @var string
-	 */
-	protected $_columnIndex;
-
-    /**
-	 * Start position
-	 *
-	 * @var int
-	 */
-	protected $_startRow = 1;
-
-	/**
-	 * End position
-	 *
-	 * @var int
-	 */
-	protected $_endRow = 1;
-
-	/**
-	 * Create a new row iterator
-	 *
-	 * @param	PHPExcel_Worksheet	$subject	    The worksheet to iterate over
-     * @param   string              $columnIndex    The column that we want to iterate
-	 * @param	integer				$startRow	    The row number at which to start iterating
-	 * @param	integer				$endRow	        Optionally, the row number at which to stop iterating
-	 */
-	public function __construct(PHPExcel_Worksheet $subject = null, $columnIndex, $startRow = 1, $endRow = null) {
-		// Set subject
-		$this->_subject = $subject;
-		$this->_columnIndex = PHPExcel_Cell::columnIndexFromString($columnIndex) - 1;
-		$this->resetEnd($endRow);
-		$this->resetStart($startRow);
-	}
-
-	/**
-	 * Destructor
-	 */
-	public function __destruct() {
-		unset($this->_subject);
-	}
-
-	/**
-	 * (Re)Set the start row and the current row pointer
-	 *
-	 * @param integer	$startRow	The row number at which to start iterating
-     * @return PHPExcel_Worksheet_ColumnCellIterator
-     * @throws PHPExcel_Exception
-	 */
-	public function resetStart($startRow = 1) {
-		$this->_startRow = $startRow;
-        $this->adjustForExistingOnlyRange();
-		$this->seek($startRow);
-
-        return $this;
-	}
-
-	/**
-	 * (Re)Set the end row
-	 *
-	 * @param integer	$endRow	The row number at which to stop iterating
-     * @return PHPExcel_Worksheet_ColumnCellIterator
-     * @throws PHPExcel_Exception
-	 */
-	public function resetEnd($endRow = null) {
-		$this->_endRow = ($endRow) ? $endRow : $this->_subject->getHighestRow();
-        $this->adjustForExistingOnlyRange();
-
-        return $this;
-	}
-
-	/**
-	 * Set the row pointer to the selected row
-	 *
-	 * @param integer	$row	The row number to set the current pointer at
-     * @return PHPExcel_Worksheet_ColumnCellIterator
-     * @throws PHPExcel_Exception
-	 */
-	public function seek($row = 1) {
-        if (($row < $this->_startRow) || ($row > $this->_endRow)) {
-            throw new PHPExcel_Exception("Row $row is out of range ({$this->_startRow} - {$this->_endRow})");
-        } elseif ($this->_onlyExistingCells && !($this->_subject->cellExistsByColumnAndRow($this->_columnIndex, $row))) {
-            throw new PHPExcel_Exception('In "IterateOnlyExistingCells" mode and Cell does not exist');
-        }
-		$this->_position = $row;
-
-        return $this;
-	}
-
-	/**
-	 * Rewind the iterator to the starting row
-	 */
-	public function rewind() {
-		$this->_position = $this->_startRow;
-	}
-
-	/**
-	 * Return the current cell in this worksheet column
-	 *
-	 * @return PHPExcel_Worksheet_Row
-	 */
-	public function current() {
-		return $this->_subject->getCellByColumnAndRow($this->_columnIndex, $this->_position);
-	}
-
-	/**
-	 * Return the current iterator key
-	 *
-	 * @return int
-	 */
-	public function key() {
-		return $this->_position;
-	}
-
-	/**
-	 * Set the iterator to its next value
-	 */
-	public function next() {
-        do {
-            ++$this->_position;
-        } while (($this->_onlyExistingCells) &&
-            (!$this->_subject->cellExistsByColumnAndRow($this->_columnIndex, $this->_position)) &&
-            ($this->_position <= $this->_endRow));
-	}
-
-	/**
-	 * Set the iterator to its previous value
-	 */
-	public function prev() {
-        if ($this->_position <= $this->_startRow) {
-            throw new PHPExcel_Exception("Row is already at the beginning of range ({$this->_startRow} - {$this->_endRow})");
-        }
-
-        do {
-            --$this->_position;
-        } while (($this->_onlyExistingCells) &&
-            (!$this->_subject->cellExistsByColumnAndRow($this->_columnIndex, $this->_position)) &&
-            ($this->_position >= $this->_startRow));
-	}
-
-	/**
-	 * Indicate if more rows exist in the worksheet range of rows that we're iterating
-	 *
-	 * @return boolean
-	 */
-	public function valid() {
-		return $this->_position <= $this->_endRow;
-	}
-
-	/**
-	 * Validate start/end values for "IterateOnlyExistingCells" mode, and adjust if necessary
-	 *
-     * @throws PHPExcel_Exception
-	 */
-    protected function adjustForExistingOnlyRange() {
-        if ($this->_onlyExistingCells) {
-            while ((!$this->_subject->cellExistsByColumnAndRow($this->_columnIndex, $this->_startRow)) &&
-                ($this->_startRow <= $this->_endRow)) {
-                ++$this->_startRow;
-            }
-            if ($this->_startRow > $this->_endRow) {
-                throw new PHPExcel_Exception('No cells exist within the specified range');
-            }
-            while ((!$this->_subject->cellExistsByColumnAndRow($this->_columnIndex, $this->_endRow)) &&
-                ($this->_endRow >= $this->_startRow)) {
-                --$this->_endRow;
-            }
-            if ($this->_endRow < $this->_startRow) {
-                throw new PHPExcel_Exception('No cells exist within the specified range');
-            }
-        }
-    }
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnDimension.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnDimension.php
deleted file mode 100644
index bc6a042eb42..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnDimension.php
+++ /dev/null
@@ -1,266 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_ColumnDimension
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_ColumnDimension
-{
-	/**
-	 * Column index
-	 *
-	 * @var int
-	 */
-	private $_columnIndex;
-
-	/**
-	 * Column width
-	 *
-	 * When this is set to a negative value, the column width should be ignored by IWriter
-	 *
-	 * @var double
-	 */
-	private $_width			= -1;
-
-	/**
-	 * Auto size?
-	 *
-	 * @var bool
-	 */
-	private $_autoSize		= false;
-
-	/**
-	 * Visible?
-	 *
-	 * @var bool
-	 */
-	private $_visible		= true;
-
-	/**
-	 * Outline level
-	 *
-	 * @var int
-	 */
-	private $_outlineLevel	= 0;
-
-	/**
-	 * Collapsed
-	 *
-	 * @var bool
-	 */
-	private $_collapsed		= false;
-
-	/**
-	 * Index to cellXf
-	 *
-	 * @var int
-	 */
-	private $_xfIndex;
-
-    /**
-     * Create a new PHPExcel_Worksheet_ColumnDimension
-     *
-     * @param string $pIndex Character column index
-     */
-    public function __construct($pIndex = 'A')
-    {
-    	// Initialise values
-    	$this->_columnIndex		= $pIndex;
-
-		// set default index to cellXf
-		$this->_xfIndex = 0;
-    }
-
-    /**
-     * Get ColumnIndex
-     *
-     * @return string
-     */
-    public function getColumnIndex() {
-    	return $this->_columnIndex;
-    }
-
-    /**
-     * Set ColumnIndex
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_ColumnDimension
-     */
-    public function setColumnIndex($pValue) {
-    	$this->_columnIndex = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Width
-     *
-     * @return double
-     */
-    public function getWidth() {
-    	return $this->_width;
-    }
-
-    /**
-     * Set Width
-     *
-     * @param double $pValue
-     * @return PHPExcel_Worksheet_ColumnDimension
-     */
-    public function setWidth($pValue = -1) {
-    	$this->_width = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Auto Size
-     *
-     * @return bool
-     */
-    public function getAutoSize() {
-    	return $this->_autoSize;
-    }
-
-    /**
-     * Set Auto Size
-     *
-     * @param bool $pValue
-     * @return PHPExcel_Worksheet_ColumnDimension
-     */
-    public function setAutoSize($pValue = false) {
-    	$this->_autoSize = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Visible
-     *
-     * @return bool
-     */
-    public function getVisible() {
-    	return $this->_visible;
-    }
-
-    /**
-     * Set Visible
-     *
-     * @param bool $pValue
-     * @return PHPExcel_Worksheet_ColumnDimension
-     */
-    public function setVisible($pValue = true) {
-    	$this->_visible = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Outline Level
-     *
-     * @return int
-     */
-    public function getOutlineLevel() {
-    	return $this->_outlineLevel;
-    }
-
-    /**
-     * Set Outline Level
-     *
-     * Value must be between 0 and 7
-     *
-     * @param int $pValue
-     * @throws PHPExcel_Exception
-     * @return PHPExcel_Worksheet_ColumnDimension
-     */
-    public function setOutlineLevel($pValue) {
-    	if ($pValue < 0 || $pValue > 7) {
-    		throw new PHPExcel_Exception("Outline level must range between 0 and 7.");
-    	}
-
-    	$this->_outlineLevel = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Collapsed
-     *
-     * @return bool
-     */
-    public function getCollapsed() {
-    	return $this->_collapsed;
-    }
-
-    /**
-     * Set Collapsed
-     *
-     * @param bool $pValue
-     * @return PHPExcel_Worksheet_ColumnDimension
-     */
-    public function setCollapsed($pValue = true) {
-    	$this->_collapsed = $pValue;
-    	return $this;
-    }
-
-	/**
-	 * Get index to cellXf
-	 *
-	 * @return int
-	 */
-	public function getXfIndex()
-	{
-		return $this->_xfIndex;
-	}
-
-	/**
-	 * Set index to cellXf
-	 *
-	 * @param int $pValue
-	 * @return PHPExcel_Worksheet_ColumnDimension
-	 */
-	public function setXfIndex($pValue = 0)
-	{
-		$this->_xfIndex = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnIterator.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnIterator.php
deleted file mode 100644
index 3030b3f434c..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnIterator.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_ColumnIterator
- *
- * Used to iterate columns in a PHPExcel_Worksheet
- *
- * @category   PHPExcel
- * @package	PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_ColumnIterator implements Iterator
-{
-	/**
-	 * PHPExcel_Worksheet to iterate
-	 *
-	 * @var PHPExcel_Worksheet
-	 */
-	private $_subject;
-
-	/**
-	 * Current iterator position
-	 *
-	 * @var int
-	 */
-	private $_position = 0;
-
-	/**
-	 * Start position
-	 *
-	 * @var int
-	 */
-	private $_startColumn = 0;
-
-
-	/**
-	 * End position
-	 *
-	 * @var int
-	 */
-	private $_endColumn = 0;
-
-
-	/**
-	 * Create a new column iterator
-	 *
-	 * @param	PHPExcel_Worksheet	$subject	The worksheet to iterate over
-	 * @param	string				$startColumn	The column address at which to start iterating
-	 * @param	string				$endColumn	    Optionally, the column address at which to stop iterating
-	 */
-	public function __construct(PHPExcel_Worksheet $subject = null, $startColumn = 'A', $endColumn = null) {
-		// Set subject
-		$this->_subject = $subject;
-		$this->resetEnd($endColumn);
-		$this->resetStart($startColumn);
-	}
-
-	/**
-	 * Destructor
-	 */
-	public function __destruct() {
-		unset($this->_subject);
-	}
-
-	/**
-	 * (Re)Set the start column and the current column pointer
-	 *
-	 * @param integer	$startColumn	The column address at which to start iterating
-     * @return PHPExcel_Worksheet_ColumnIterator
-	 */
-	public function resetStart($startColumn = 'A') {
-        $startColumnIndex = PHPExcel_Cell::columnIndexFromString($startColumn) - 1;
-		$this->_startColumn = $startColumnIndex;
-		$this->seek($startColumn);
-
-        return $this;
-	}
-
-	/**
-	 * (Re)Set the end column
-	 *
-	 * @param string	$endColumn	The column address at which to stop iterating
-     * @return PHPExcel_Worksheet_ColumnIterator
-	 */
-	public function resetEnd($endColumn = null) {
-		$endColumn = ($endColumn) ? $endColumn : $this->_subject->getHighestColumn();
-		$this->_endColumn = PHPExcel_Cell::columnIndexFromString($endColumn) - 1;
-
-        return $this;
-	}
-
-	/**
-	 * Set the column pointer to the selected column
-	 *
-	 * @param string	$column	The column address to set the current pointer at
-     * @return PHPExcel_Worksheet_ColumnIterator
-     * @throws PHPExcel_Exception
-	 */
-	public function seek($column = 'A') {
-        $column = PHPExcel_Cell::columnIndexFromString($column) - 1;
-        if (($column < $this->_startColumn) || ($column > $this->_endColumn)) {
-            throw new PHPExcel_Exception("Column $column is out of range ({$this->_startColumn} - {$this->_endColumn})");
-        }
-		$this->_position = $column;
-
-        return $this;
-    }
-
-	/**
-	 * Rewind the iterator to the starting column
-	 */
-	public function rewind() {
-		$this->_position = $this->_startColumn;
-	}
-
-	/**
-	 * Return the current column in this worksheet
-	 *
-	 * @return PHPExcel_Worksheet_Column
-	 */
-	public function current() {
-		return new PHPExcel_Worksheet_Column($this->_subject, PHPExcel_Cell::stringFromColumnIndex($this->_position));
-	}
-
-	/**
-	 * Return the current iterator key
-	 *
-	 * @return string
-	 */
-	public function key() {
-		return PHPExcel_Cell::stringFromColumnIndex($this->_position);
-	}
-
-	/**
-	 * Set the iterator to its next value
-	 */
-	public function next() {
-		++$this->_position;
-	}
-
-	/**
-	 * Set the iterator to its previous value
-     *
-     * @throws PHPExcel_Exception
-	 */
-	public function prev() {
-        if ($this->_position <= $this->_startColumn) {
-            throw new PHPExcel_Exception(
-                "Column is already at the beginning of range (" . 
-                PHPExcel_Cell::stringFromColumnIndex($this->_endColumn) . " - " . 
-                PHPExcel_Cell::stringFromColumnIndex($this->_endColumn) . ")"
-            );
-        }
-
-        --$this->_position;
-	}
-
-	/**
-	 * Indicate if more columns exist in the worksheet range of columns that we're iterating
-	 *
-	 * @return boolean
-	 */
-	public function valid() {
-		return $this->_position <= $this->_endColumn;
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing.php
deleted file mode 100644
index e8d87f1d04e..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet_Drawing
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_Drawing
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet_Drawing
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_Drawing extends PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
-{
-	/**
-	 * Path
-	 *
-	 * @var string
-	 */
-	private $_path;
-
-    /**
-     * Create a new PHPExcel_Worksheet_Drawing
-     */
-    public function __construct()
-    {
-    	// Initialise values
-    	$this->_path				= '';
-
-    	// Initialize parent
-    	parent::__construct();
-    }
-
-    /**
-     * Get Filename
-     *
-     * @return string
-     */
-    public function getFilename() {
-    	return basename($this->_path);
-    }
-
-    /**
-     * Get indexed filename (using image index)
-     *
-     * @return string
-     */
-    public function getIndexedFilename() {
-    	$fileName = $this->getFilename();
-    	$fileName = str_replace(' ', '_', $fileName);
-    	return str_replace('.' . $this->getExtension(), '', $fileName) . $this->getImageIndex() . '.' . $this->getExtension();
-    }
-
-    /**
-     * Get Extension
-     *
-     * @return string
-     */
-    public function getExtension() {
-    	$exploded = explode(".", basename($this->_path));
-    	return $exploded[count($exploded) - 1];
-    }
-
-    /**
-     * Get Path
-     *
-     * @return string
-     */
-    public function getPath() {
-    	return $this->_path;
-    }
-
-    /**
-     * Set Path
-     *
-     * @param 	string 		$pValue			File path
-     * @param 	boolean		$pVerifyFile	Verify file
-     * @throws 	PHPExcel_Exception
-     * @return PHPExcel_Worksheet_Drawing
-     */
-    public function setPath($pValue = '', $pVerifyFile = true) {
-    	if ($pVerifyFile) {
-	    	if (file_exists($pValue)) {
-	    		$this->_path = $pValue;
-
-	    		if ($this->_width == 0 && $this->_height == 0) {
-	    			// Get width/height
-	    			list($this->_width, $this->_height) = getimagesize($pValue);
-	    		}
-	    	} else {
-	    		throw new PHPExcel_Exception("File $pValue not found!");
-	    	}
-    	} else {
-    		$this->_path = $pValue;
-    	}
-    	return $this;
-    }
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-    	return md5(
-    		  $this->_path
-    		. parent::getHashCode()
-    		. __CLASS__
-    	);
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing/Shadow.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing/Shadow.php
deleted file mode 100644
index 98b95b1a709..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing/Shadow.php
+++ /dev/null
@@ -1,288 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet_Drawing
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_Drawing_Shadow
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet_Drawing
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_Drawing_Shadow implements PHPExcel_IComparable
-{
-	/* Shadow alignment */
-	const SHADOW_BOTTOM							= 'b';
-	const SHADOW_BOTTOM_LEFT					= 'bl';
-	const SHADOW_BOTTOM_RIGHT					= 'br';
-	const SHADOW_CENTER							= 'ctr';
-	const SHADOW_LEFT							= 'l';
-	const SHADOW_TOP							= 't';
-	const SHADOW_TOP_LEFT						= 'tl';
-	const SHADOW_TOP_RIGHT						= 'tr';
-
-	/**
-	 * Visible
-	 *
-	 * @var boolean
-	 */
-	private $_visible;
-
-	/**
-	 * Blur radius
-	 *
-	 * Defaults to 6
-	 *
-	 * @var int
-	 */
-	private $_blurRadius;
-
-	/**
-	 * Shadow distance
-	 *
-	 * Defaults to 2
-	 *
-	 * @var int
-	 */
-	private $_distance;
-
-	/**
-	 * Shadow direction (in degrees)
-	 *
-	 * @var int
-	 */
-	private $_direction;
-
-	/**
-	 * Shadow alignment
-	 *
-	 * @var int
-	 */
-	private $_alignment;
-
-	/**
-	 * Color
-	 *
-	 * @var PHPExcel_Style_Color
-	 */
-	private $_color;
-
-	/**
-	 * Alpha
-	 *
-	 * @var int
-	 */
-	private $_alpha;
-
-    /**
-     * Create a new PHPExcel_Worksheet_Drawing_Shadow
-     */
-    public function __construct()
-    {
-    	// Initialise values
-    	$this->_visible				= false;
-    	$this->_blurRadius			= 6;
-    	$this->_distance			= 2;
-    	$this->_direction			= 0;
-    	$this->_alignment			= PHPExcel_Worksheet_Drawing_Shadow::SHADOW_BOTTOM_RIGHT;
-    	$this->_color				= new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK);
-    	$this->_alpha				= 50;
-    }
-
-    /**
-     * Get Visible
-     *
-     * @return boolean
-     */
-    public function getVisible() {
-    	return $this->_visible;
-    }
-
-    /**
-     * Set Visible
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Drawing_Shadow
-     */
-    public function setVisible($pValue = false) {
-    	$this->_visible = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Blur radius
-     *
-     * @return int
-     */
-    public function getBlurRadius() {
-    	return $this->_blurRadius;
-    }
-
-    /**
-     * Set Blur radius
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_Drawing_Shadow
-     */
-    public function setBlurRadius($pValue = 6) {
-    	$this->_blurRadius = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Shadow distance
-     *
-     * @return int
-     */
-    public function getDistance() {
-    	return $this->_distance;
-    }
-
-    /**
-     * Set Shadow distance
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_Drawing_Shadow
-     */
-    public function setDistance($pValue = 2) {
-    	$this->_distance = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Shadow direction (in degrees)
-     *
-     * @return int
-     */
-    public function getDirection() {
-    	return $this->_direction;
-    }
-
-    /**
-     * Set Shadow direction (in degrees)
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_Drawing_Shadow
-     */
-    public function setDirection($pValue = 0) {
-    	$this->_direction = $pValue;
-    	return $this;
-    }
-
-   /**
-     * Get Shadow alignment
-     *
-     * @return int
-     */
-    public function getAlignment() {
-    	return $this->_alignment;
-    }
-
-    /**
-     * Set Shadow alignment
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_Drawing_Shadow
-     */
-    public function setAlignment($pValue = 0) {
-    	$this->_alignment = $pValue;
-    	return $this;
-    }
-
-   /**
-     * Get Color
-     *
-     * @return PHPExcel_Style_Color
-     */
-    public function getColor() {
-    	return $this->_color;
-    }
-
-    /**
-     * Set Color
-     *
-     * @param 	PHPExcel_Style_Color $pValue
-     * @throws 	PHPExcel_Exception
-     * @return PHPExcel_Worksheet_Drawing_Shadow
-     */
-    public function setColor(PHPExcel_Style_Color $pValue = null) {
-   		$this->_color = $pValue;
-   		return $this;
-    }
-
-   /**
-     * Get Alpha
-     *
-     * @return int
-     */
-    public function getAlpha() {
-    	return $this->_alpha;
-    }
-
-    /**
-     * Set Alpha
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_Drawing_Shadow
-     */
-    public function setAlpha($pValue = 0) {
-    	$this->_alpha = $pValue;
-    	return $this;
-    }
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-    	return md5(
-    		  ($this->_visible ? 't' : 'f')
-    		. $this->_blurRadius
-    		. $this->_distance
-    		. $this->_direction
-    		. $this->_alignment
-    		. $this->_color->getHashCode()
-    		. $this->_alpha
-    		. __CLASS__
-    	);
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooter.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooter.php
deleted file mode 100644
index 8037416383f..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooter.php
+++ /dev/null
@@ -1,465 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_HeaderFooter
- *
- * <code>
- * Header/Footer Formatting Syntax taken from Office Open XML Part 4 - Markup Language Reference, page 1970:
- *
- * There are a number of formatting codes that can be written inline with the actual header / footer text, which
- * affect the formatting in the header or footer.
- *
- * Example: This example shows the text "Center Bold Header" on the first line (center section), and the date on
- * the second line (center section).
- * 		&CCenter &"-,Bold"Bold&"-,Regular"Header_x000A_&D
- *
- * General Rules:
- * There is no required order in which these codes must appear.
- *
- * The first occurrence of the following codes turns the formatting ON, the second occurrence turns it OFF again:
- * - strikethrough
- * - superscript
- * - subscript
- * Superscript and subscript cannot both be ON at same time. Whichever comes first wins and the other is ignored,
- * while the first is ON.
- * &L - code for "left section" (there are three header / footer locations, "left", "center", and "right"). When
- * two or more occurrences of this section marker exist, the contents from all markers are concatenated, in the
- * order of appearance, and placed into the left section.
- * &P - code for "current page #"
- * &N - code for "total pages"
- * &font size - code for "text font size", where font size is a font size in points.
- * &K - code for "text font color"
- * RGB Color is specified as RRGGBB
- * Theme Color is specifed as TTSNN where TT is the theme color Id, S is either "+" or "-" of the tint/shade
- * value, NN is the tint/shade value.
- * &S - code for "text strikethrough" on / off
- * &X - code for "text super script" on / off
- * &Y - code for "text subscript" on / off
- * &C - code for "center section". When two or more occurrences of this section marker exist, the contents
- * from all markers are concatenated, in the order of appearance, and placed into the center section.
- *
- * &D - code for "date"
- * &T - code for "time"
- * &G - code for "picture as background"
- * &U - code for "text single underline"
- * &E - code for "double underline"
- * &R - code for "right section". When two or more occurrences of this section marker exist, the contents
- * from all markers are concatenated, in the order of appearance, and placed into the right section.
- * &Z - code for "this workbook's file path"
- * &F - code for "this workbook's file name"
- * &A - code for "sheet tab name"
- * &+ - code for add to page #.
- * &- - code for subtract from page #.
- * &"font name,font type" - code for "text font name" and "text font type", where font name and font type
- * are strings specifying the name and type of the font, separated by a comma. When a hyphen appears in font
- * name, it means "none specified". Both of font name and font type can be localized values.
- * &"-,Bold" - code for "bold font style"
- * &B - also means "bold font style".
- * &"-,Regular" - code for "regular font style"
- * &"-,Italic" - code for "italic font style"
- * &I - also means "italic font style"
- * &"-,Bold Italic" code for "bold italic font style"
- * &O - code for "outline style"
- * &H - code for "shadow style"
- * </code>
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_HeaderFooter
-{
-	/* Header/footer image location */
-	const IMAGE_HEADER_LEFT							= 'LH';
-	const IMAGE_HEADER_CENTER						= 'CH';
-	const IMAGE_HEADER_RIGHT						= 'RH';
-	const IMAGE_FOOTER_LEFT							= 'LF';
-	const IMAGE_FOOTER_CENTER						= 'CF';
-	const IMAGE_FOOTER_RIGHT						= 'RF';
-
-	/**
-	 * OddHeader
-	 *
-	 * @var string
-	 */
-	private $_oddHeader			= '';
-
-	/**
-	 * OddFooter
-	 *
-	 * @var string
-	 */
-	private $_oddFooter			= '';
-
-	/**
-	 * EvenHeader
-	 *
-	 * @var string
-	 */
-	private $_evenHeader		= '';
-
-	/**
-	 * EvenFooter
-	 *
-	 * @var string
-	 */
-	private $_evenFooter		= '';
-
-	/**
-	 * FirstHeader
-	 *
-	 * @var string
-	 */
-	private $_firstHeader		= '';
-
-	/**
-	 * FirstFooter
-	 *
-	 * @var string
-	 */
-	private $_firstFooter		= '';
-
-	/**
-	 * Different header for Odd/Even, defaults to false
-	 *
-	 * @var boolean
-	 */
-	private $_differentOddEven	= false;
-
-	/**
-	 * Different header for first page, defaults to false
-	 *
-	 * @var boolean
-	 */
-	private $_differentFirst	= false;
-
-	/**
-	 * Scale with document, defaults to true
-	 *
-	 * @var boolean
-	 */
-	private $_scaleWithDocument	= true;
-
-	/**
-	 * Align with margins, defaults to true
-	 *
-	 * @var boolean
-	 */
-	private $_alignWithMargins	= true;
-
-	/**
-	 * Header/footer images
-	 *
-	 * @var PHPExcel_Worksheet_HeaderFooterDrawing[]
-	 */
-	private $_headerFooterImages = array();
-
-    /**
-     * Create a new PHPExcel_Worksheet_HeaderFooter
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * Get OddHeader
-     *
-     * @return string
-     */
-    public function getOddHeader() {
-    	return $this->_oddHeader;
-    }
-
-    /**
-     * Set OddHeader
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function setOddHeader($pValue) {
-    	$this->_oddHeader = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get OddFooter
-     *
-     * @return string
-     */
-    public function getOddFooter() {
-    	return $this->_oddFooter;
-    }
-
-    /**
-     * Set OddFooter
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function setOddFooter($pValue) {
-    	$this->_oddFooter = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get EvenHeader
-     *
-     * @return string
-     */
-    public function getEvenHeader() {
-    	return $this->_evenHeader;
-    }
-
-    /**
-     * Set EvenHeader
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function setEvenHeader($pValue) {
-    	$this->_evenHeader = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get EvenFooter
-     *
-     * @return string
-     */
-    public function getEvenFooter() {
-    	return $this->_evenFooter;
-    }
-
-    /**
-     * Set EvenFooter
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function setEvenFooter($pValue) {
-    	$this->_evenFooter = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get FirstHeader
-     *
-     * @return string
-     */
-    public function getFirstHeader() {
-    	return $this->_firstHeader;
-    }
-
-    /**
-     * Set FirstHeader
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function setFirstHeader($pValue) {
-    	$this->_firstHeader = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get FirstFooter
-     *
-     * @return string
-     */
-    public function getFirstFooter() {
-    	return $this->_firstFooter;
-    }
-
-    /**
-     * Set FirstFooter
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function setFirstFooter($pValue) {
-    	$this->_firstFooter = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get DifferentOddEven
-     *
-     * @return boolean
-     */
-    public function getDifferentOddEven() {
-    	return $this->_differentOddEven;
-    }
-
-    /**
-     * Set DifferentOddEven
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function setDifferentOddEven($pValue = false) {
-    	$this->_differentOddEven = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get DifferentFirst
-     *
-     * @return boolean
-     */
-    public function getDifferentFirst() {
-    	return $this->_differentFirst;
-    }
-
-    /**
-     * Set DifferentFirst
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function setDifferentFirst($pValue = false) {
-    	$this->_differentFirst = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get ScaleWithDocument
-     *
-     * @return boolean
-     */
-    public function getScaleWithDocument() {
-    	return $this->_scaleWithDocument;
-    }
-
-    /**
-     * Set ScaleWithDocument
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function setScaleWithDocument($pValue = true) {
-    	$this->_scaleWithDocument = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get AlignWithMargins
-     *
-     * @return boolean
-     */
-    public function getAlignWithMargins() {
-    	return $this->_alignWithMargins;
-    }
-
-    /**
-     * Set AlignWithMargins
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function setAlignWithMargins($pValue = true) {
-    	$this->_alignWithMargins = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Add header/footer image
-     *
-     * @param PHPExcel_Worksheet_HeaderFooterDrawing $image
-     * @param string $location
-     * @throws PHPExcel_Exception
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function addImage(PHPExcel_Worksheet_HeaderFooterDrawing $image = null, $location = self::IMAGE_HEADER_LEFT) {
-    	$this->_headerFooterImages[$location] = $image;
-    	return $this;
-    }
-
-    /**
-     * Remove header/footer image
-     *
-     * @param string $location
-     * @throws PHPExcel_Exception
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function removeImage($location = self::IMAGE_HEADER_LEFT) {
-    	if (isset($this->_headerFooterImages[$location])) {
-    		unset($this->_headerFooterImages[$location]);
-    	}
-    	return $this;
-    }
-
-    /**
-     * Set header/footer images
-     *
-     * @param PHPExcel_Worksheet_HeaderFooterDrawing[] $images
-     * @throws PHPExcel_Exception
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function setImages($images) {
-    	if (!is_array($images)) {
-    		throw new PHPExcel_Exception('Invalid parameter!');
-    	}
-
-    	$this->_headerFooterImages = $images;
-    	return $this;
-    }
-
-    /**
-     * Get header/footer images
-     *
-     * @return PHPExcel_Worksheet_HeaderFooterDrawing[]
-     */
-    public function getImages() {
-    	// Sort array
-    	$images = array();
-    	if (isset($this->_headerFooterImages[self::IMAGE_HEADER_LEFT])) 	$images[self::IMAGE_HEADER_LEFT] = 		$this->_headerFooterImages[self::IMAGE_HEADER_LEFT];
-    	if (isset($this->_headerFooterImages[self::IMAGE_HEADER_CENTER])) 	$images[self::IMAGE_HEADER_CENTER] = 	$this->_headerFooterImages[self::IMAGE_HEADER_CENTER];
-    	if (isset($this->_headerFooterImages[self::IMAGE_HEADER_RIGHT])) 	$images[self::IMAGE_HEADER_RIGHT] = 	$this->_headerFooterImages[self::IMAGE_HEADER_RIGHT];
-    	if (isset($this->_headerFooterImages[self::IMAGE_FOOTER_LEFT])) 	$images[self::IMAGE_FOOTER_LEFT] = 		$this->_headerFooterImages[self::IMAGE_FOOTER_LEFT];
-    	if (isset($this->_headerFooterImages[self::IMAGE_FOOTER_CENTER])) 	$images[self::IMAGE_FOOTER_CENTER] = 	$this->_headerFooterImages[self::IMAGE_FOOTER_CENTER];
-    	if (isset($this->_headerFooterImages[self::IMAGE_FOOTER_RIGHT])) 	$images[self::IMAGE_FOOTER_RIGHT] = 	$this->_headerFooterImages[self::IMAGE_FOOTER_RIGHT];
-    	$this->_headerFooterImages = $images;
-
-    	return $this->_headerFooterImages;
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooterDrawing.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooterDrawing.php
deleted file mode 100644
index 966664f932d..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooterDrawing.php
+++ /dev/null
@@ -1,350 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_HeaderFooterDrawing
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_HeaderFooterDrawing extends PHPExcel_Worksheet_Drawing implements PHPExcel_IComparable
-{
-	/**
-	 * Path
-	 *
-	 * @var string
-	 */
-	private $_path;
-
-	/**
-	 * Name
-	 *
-	 * @var string
-	 */
-	protected $_name;
-
-	/**
-	 * Offset X
-	 *
-	 * @var int
-	 */
-	protected $_offsetX;
-
-	/**
-	 * Offset Y
-	 *
-	 * @var int
-	 */
-	protected $_offsetY;
-
-	/**
-	 * Width
-	 *
-	 * @var int
-	 */
-	protected $_width;
-
-	/**
-	 * Height
-	 *
-	 * @var int
-	 */
-	protected $_height;
-
-	/**
-	 * Proportional resize
-	 *
-	 * @var boolean
-	 */
-	protected $_resizeProportional;
-
-    /**
-     * Create a new PHPExcel_Worksheet_HeaderFooterDrawing
-     */
-    public function __construct()
-    {
-    	// Initialise values
-    	$this->_path				= '';
-    	$this->_name				= '';
-    	$this->_offsetX				= 0;
-    	$this->_offsetY				= 0;
-    	$this->_width				= 0;
-    	$this->_height				= 0;
-    	$this->_resizeProportional	= true;
-    }
-
-    /**
-     * Get Name
-     *
-     * @return string
-     */
-    public function getName() {
-    	return $this->_name;
-    }
-
-    /**
-     * Set Name
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_HeaderFooterDrawing
-     */
-    public function setName($pValue = '') {
-    	$this->_name = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get OffsetX
-     *
-     * @return int
-     */
-    public function getOffsetX() {
-    	return $this->_offsetX;
-    }
-
-    /**
-     * Set OffsetX
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_HeaderFooterDrawing
-     */
-    public function setOffsetX($pValue = 0) {
-    	$this->_offsetX = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get OffsetY
-     *
-     * @return int
-     */
-    public function getOffsetY() {
-    	return $this->_offsetY;
-    }
-
-    /**
-     * Set OffsetY
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_HeaderFooterDrawing
-     */
-    public function setOffsetY($pValue = 0) {
-    	$this->_offsetY = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Width
-     *
-     * @return int
-     */
-    public function getWidth() {
-    	return $this->_width;
-    }
-
-    /**
-     * Set Width
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_HeaderFooterDrawing
-     */
-    public function setWidth($pValue = 0) {
-    	// Resize proportional?
-    	if ($this->_resizeProportional && $pValue != 0) {
-    		$ratio = $this->_width / $this->_height;
-    		$this->_height = round($ratio * $pValue);
-    	}
-
-    	// Set width
-    	$this->_width = $pValue;
-
-    	return $this;
-    }
-
-    /**
-     * Get Height
-     *
-     * @return int
-     */
-    public function getHeight() {
-    	return $this->_height;
-    }
-
-    /**
-     * Set Height
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_HeaderFooterDrawing
-     */
-    public function setHeight($pValue = 0) {
-    	// Resize proportional?
-    	if ($this->_resizeProportional && $pValue != 0) {
-    		$ratio = $this->_width / $this->_height;
-    		$this->_width = round($ratio * $pValue);
-    	}
-
-    	// Set height
-    	$this->_height = $pValue;
-
-    	return $this;
-    }
-
-    /**
-     * Set width and height with proportional resize
-	 * Example:
-	 * <code>
-     * $objDrawing->setResizeProportional(true);
-     * $objDrawing->setWidthAndHeight(160,120);
-	 * </code>
-	 *
-     * @author Vincent@luo MSN:kele_100@hotmail.com
-     * @param int $width
-     * @param int $height
-     * @return PHPExcel_Worksheet_HeaderFooterDrawing
-     */
-	public function setWidthAndHeight($width = 0, $height = 0) {
-		$xratio = $width / $this->_width;
-		$yratio = $height / $this->_height;
-		if ($this->_resizeProportional && !($width == 0 || $height == 0)) {
-			if (($xratio * $this->_height) < $height) {
-				$this->_height = ceil($xratio * $this->_height);
-				$this->_width  = $width;
-			} else {
-				$this->_width	= ceil($yratio * $this->_width);
-				$this->_height	= $height;
-			}
-		}
-		return $this;
-	}
-
-    /**
-     * Get ResizeProportional
-     *
-     * @return boolean
-     */
-    public function getResizeProportional() {
-    	return $this->_resizeProportional;
-    }
-
-    /**
-     * Set ResizeProportional
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_HeaderFooterDrawing
-     */
-    public function setResizeProportional($pValue = true) {
-    	$this->_resizeProportional = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Filename
-     *
-     * @return string
-     */
-    public function getFilename() {
-    	return basename($this->_path);
-    }
-
-    /**
-     * Get Extension
-     *
-     * @return string
-     */
-    public function getExtension() {
-        $parts = explode(".", basename($this->_path));
-        return end($parts);
-    }
-
-    /**
-     * Get Path
-     *
-     * @return string
-     */
-    public function getPath() {
-    	return $this->_path;
-    }
-
-    /**
-     * Set Path
-     *
-     * @param 	string 		$pValue			File path
-     * @param 	boolean		$pVerifyFile	Verify file
-     * @throws 	PHPExcel_Exception
-     * @return PHPExcel_Worksheet_HeaderFooterDrawing
-     */
-    public function setPath($pValue = '', $pVerifyFile = true) {
-    	if ($pVerifyFile) {
-	    	if (file_exists($pValue)) {
-	    		$this->_path = $pValue;
-
-	    		if ($this->_width == 0 && $this->_height == 0) {
-	    			// Get width/height
-	    			list($this->_width, $this->_height) = getimagesize($pValue);
-	    		}
-	    	} else {
-	    		throw new PHPExcel_Exception("File $pValue not found!");
-	    	}
-    	} else {
-    		$this->_path = $pValue;
-    	}
-    	return $this;
-    }
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-    	return md5(
-    		  $this->_path
-    		. $this->_name
-    		. $this->_offsetX
-    		. $this->_offsetY
-    		. $this->_width
-    		. $this->_height
-    		. __CLASS__
-    	);
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/MemoryDrawing.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/MemoryDrawing.php
deleted file mode 100644
index 80fc6d1f0b3..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/MemoryDrawing.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_MemoryDrawing
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_MemoryDrawing extends PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
-{
-	/* Rendering functions */
-	const RENDERING_DEFAULT					= 'imagepng';
-	const RENDERING_PNG						= 'imagepng';
-	const RENDERING_GIF						= 'imagegif';
-	const RENDERING_JPEG					= 'imagejpeg';
-
-	/* MIME types */
-	const MIMETYPE_DEFAULT					= 'image/png';
-	const MIMETYPE_PNG						= 'image/png';
-	const MIMETYPE_GIF						= 'image/gif';
-	const MIMETYPE_JPEG						= 'image/jpeg';
-
-	/**
-	 * Image resource
-	 *
-	 * @var resource
-	 */
-	private $_imageResource;
-
-	/**
-	 * Rendering function
-	 *
-	 * @var string
-	 */
-	private $_renderingFunction;
-
-	/**
-	 * Mime type
-	 *
-	 * @var string
-	 */
-	private $_mimeType;
-
-	/**
-	 * Unique name
-	 *
-	 * @var string
-	 */
-	private $_uniqueName;
-
-    /**
-     * Create a new PHPExcel_Worksheet_MemoryDrawing
-     */
-    public function __construct()
-    {
-    	// Initialise values
-    	$this->_imageResource		= null;
-    	$this->_renderingFunction 	= self::RENDERING_DEFAULT;
-    	$this->_mimeType			= self::MIMETYPE_DEFAULT;
-    	$this->_uniqueName			= md5(rand(0, 9999). time() . rand(0, 9999));
-
-    	// Initialize parent
-    	parent::__construct();
-    }
-
-    /**
-     * Get image resource
-     *
-     * @return resource
-     */
-    public function getImageResource() {
-    	return $this->_imageResource;
-    }
-
-    /**
-     * Set image resource
-     *
-     * @param	$value resource
-     * @return PHPExcel_Worksheet_MemoryDrawing
-     */
-    public function setImageResource($value = null) {
-    	$this->_imageResource = $value;
-
-    	if (!is_null($this->_imageResource)) {
-	    	// Get width/height
-	    	$this->_width	= imagesx($this->_imageResource);
-	    	$this->_height	= imagesy($this->_imageResource);
-    	}
-    	return $this;
-    }
-
-    /**
-     * Get rendering function
-     *
-     * @return string
-     */
-    public function getRenderingFunction() {
-    	return $this->_renderingFunction;
-    }
-
-    /**
-     * Set rendering function
-     *
-     * @param string $value
-     * @return PHPExcel_Worksheet_MemoryDrawing
-     */
-    public function setRenderingFunction($value = PHPExcel_Worksheet_MemoryDrawing::RENDERING_DEFAULT) {
-    	$this->_renderingFunction = $value;
-    	return $this;
-    }
-
-    /**
-     * Get mime type
-     *
-     * @return string
-     */
-    public function getMimeType() {
-    	return $this->_mimeType;
-    }
-
-    /**
-     * Set mime type
-     *
-     * @param string $value
-     * @return PHPExcel_Worksheet_MemoryDrawing
-     */
-    public function setMimeType($value = PHPExcel_Worksheet_MemoryDrawing::MIMETYPE_DEFAULT) {
-    	$this->_mimeType = $value;
-    	return $this;
-    }
-
-    /**
-     * Get indexed filename (using image index)
-     *
-     * @return string
-     */
-    public function getIndexedFilename() {
-		$extension 	= strtolower($this->getMimeType());
-		$extension 	= explode('/', $extension);
-		$extension 	= $extension[1];
-
-    	return $this->_uniqueName . $this->getImageIndex() . '.' . $extension;
-    }
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-    	return md5(
-    		  $this->_renderingFunction
-    		. $this->_mimeType
-    		. $this->_uniqueName
-    		. parent::getHashCode()
-    		. __CLASS__
-    	);
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageMargins.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageMargins.php
deleted file mode 100644
index b05a291ff3b..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageMargins.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_PageMargins
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_PageMargins
-{
-	/**
-	 * Left
-	 *
-	 * @var double
-	 */
-	private $_left		= 0.7;
-
-	/**
-	 * Right
-	 *
-	 * @var double
-	 */
-	private $_right		= 0.7;
-
-	/**
-	 * Top
-	 *
-	 * @var double
-	 */
-	private $_top		= 0.75;
-
-	/**
-	 * Bottom
-	 *
-	 * @var double
-	 */
-	private $_bottom	= 0.75;
-
-	/**
-	 * Header
-	 *
-	 * @var double
-	 */
-	private $_header 	= 0.3;
-
-	/**
-	 * Footer
-	 *
-	 * @var double
-	 */
-	private $_footer 	= 0.3;
-
-    /**
-     * Create a new PHPExcel_Worksheet_PageMargins
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * Get Left
-     *
-     * @return double
-     */
-    public function getLeft() {
-    	return $this->_left;
-    }
-
-    /**
-     * Set Left
-     *
-     * @param double $pValue
-     * @return PHPExcel_Worksheet_PageMargins
-     */
-    public function setLeft($pValue) {
-    	$this->_left = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Right
-     *
-     * @return double
-     */
-    public function getRight() {
-    	return $this->_right;
-    }
-
-    /**
-     * Set Right
-     *
-     * @param double $pValue
-     * @return PHPExcel_Worksheet_PageMargins
-     */
-    public function setRight($pValue) {
-    	$this->_right = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Top
-     *
-     * @return double
-     */
-    public function getTop() {
-    	return $this->_top;
-    }
-
-    /**
-     * Set Top
-     *
-     * @param double $pValue
-     * @return PHPExcel_Worksheet_PageMargins
-     */
-    public function setTop($pValue) {
-    	$this->_top = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Bottom
-     *
-     * @return double
-     */
-    public function getBottom() {
-    	return $this->_bottom;
-    }
-
-    /**
-     * Set Bottom
-     *
-     * @param double $pValue
-     * @return PHPExcel_Worksheet_PageMargins
-     */
-    public function setBottom($pValue) {
-    	$this->_bottom = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Header
-     *
-     * @return double
-     */
-    public function getHeader() {
-    	return $this->_header;
-    }
-
-    /**
-     * Set Header
-     *
-     * @param double $pValue
-     * @return PHPExcel_Worksheet_PageMargins
-     */
-    public function setHeader($pValue) {
-    	$this->_header = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Footer
-     *
-     * @return double
-     */
-    public function getFooter() {
-    	return $this->_footer;
-    }
-
-    /**
-     * Set Footer
-     *
-     * @param double $pValue
-     * @return PHPExcel_Worksheet_PageMargins
-     */
-    public function setFooter($pValue) {
-    	$this->_footer = $pValue;
-    	return $this;
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageSetup.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageSetup.php
deleted file mode 100644
index ba2792fac9f..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageSetup.php
+++ /dev/null
@@ -1,798 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_PageSetup
- *
- * <code>
- * Paper size taken from Office Open XML Part 4 - Markup Language Reference, page 1988:
- *
- * 1 = Letter paper (8.5 in. by 11 in.)
- * 2 = Letter small paper (8.5 in. by 11 in.)
- * 3 = Tabloid paper (11 in. by 17 in.)
- * 4 = Ledger paper (17 in. by 11 in.)
- * 5 = Legal paper (8.5 in. by 14 in.)
- * 6 = Statement paper (5.5 in. by 8.5 in.)
- * 7 = Executive paper (7.25 in. by 10.5 in.)
- * 8 = A3 paper (297 mm by 420 mm)
- * 9 = A4 paper (210 mm by 297 mm)
- * 10 = A4 small paper (210 mm by 297 mm)
- * 11 = A5 paper (148 mm by 210 mm)
- * 12 = B4 paper (250 mm by 353 mm)
- * 13 = B5 paper (176 mm by 250 mm)
- * 14 = Folio paper (8.5 in. by 13 in.)
- * 15 = Quarto paper (215 mm by 275 mm)
- * 16 = Standard paper (10 in. by 14 in.)
- * 17 = Standard paper (11 in. by 17 in.)
- * 18 = Note paper (8.5 in. by 11 in.)
- * 19 = #9 envelope (3.875 in. by 8.875 in.)
- * 20 = #10 envelope (4.125 in. by 9.5 in.)
- * 21 = #11 envelope (4.5 in. by 10.375 in.)
- * 22 = #12 envelope (4.75 in. by 11 in.)
- * 23 = #14 envelope (5 in. by 11.5 in.)
- * 24 = C paper (17 in. by 22 in.)
- * 25 = D paper (22 in. by 34 in.)
- * 26 = E paper (34 in. by 44 in.)
- * 27 = DL envelope (110 mm by 220 mm)
- * 28 = C5 envelope (162 mm by 229 mm)
- * 29 = C3 envelope (324 mm by 458 mm)
- * 30 = C4 envelope (229 mm by 324 mm)
- * 31 = C6 envelope (114 mm by 162 mm)
- * 32 = C65 envelope (114 mm by 229 mm)
- * 33 = B4 envelope (250 mm by 353 mm)
- * 34 = B5 envelope (176 mm by 250 mm)
- * 35 = B6 envelope (176 mm by 125 mm)
- * 36 = Italy envelope (110 mm by 230 mm)
- * 37 = Monarch envelope (3.875 in. by 7.5 in.).
- * 38 = 6 3/4 envelope (3.625 in. by 6.5 in.)
- * 39 = US standard fanfold (14.875 in. by 11 in.)
- * 40 = German standard fanfold (8.5 in. by 12 in.)
- * 41 = German legal fanfold (8.5 in. by 13 in.)
- * 42 = ISO B4 (250 mm by 353 mm)
- * 43 = Japanese double postcard (200 mm by 148 mm)
- * 44 = Standard paper (9 in. by 11 in.)
- * 45 = Standard paper (10 in. by 11 in.)
- * 46 = Standard paper (15 in. by 11 in.)
- * 47 = Invite envelope (220 mm by 220 mm)
- * 50 = Letter extra paper (9.275 in. by 12 in.)
- * 51 = Legal extra paper (9.275 in. by 15 in.)
- * 52 = Tabloid extra paper (11.69 in. by 18 in.)
- * 53 = A4 extra paper (236 mm by 322 mm)
- * 54 = Letter transverse paper (8.275 in. by 11 in.)
- * 55 = A4 transverse paper (210 mm by 297 mm)
- * 56 = Letter extra transverse paper (9.275 in. by 12 in.)
- * 57 = SuperA/SuperA/A4 paper (227 mm by 356 mm)
- * 58 = SuperB/SuperB/A3 paper (305 mm by 487 mm)
- * 59 = Letter plus paper (8.5 in. by 12.69 in.)
- * 60 = A4 plus paper (210 mm by 330 mm)
- * 61 = A5 transverse paper (148 mm by 210 mm)
- * 62 = JIS B5 transverse paper (182 mm by 257 mm)
- * 63 = A3 extra paper (322 mm by 445 mm)
- * 64 = A5 extra paper (174 mm by 235 mm)
- * 65 = ISO B5 extra paper (201 mm by 276 mm)
- * 66 = A2 paper (420 mm by 594 mm)
- * 67 = A3 transverse paper (297 mm by 420 mm)
- * 68 = A3 extra transverse paper (322 mm by 445 mm)
- * </code>
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_PageSetup
-{
-	/* Paper size */
-	const PAPERSIZE_LETTER							= 1;
-	const PAPERSIZE_LETTER_SMALL					= 2;
-	const PAPERSIZE_TABLOID							= 3;
-	const PAPERSIZE_LEDGER							= 4;
-	const PAPERSIZE_LEGAL							= 5;
-	const PAPERSIZE_STATEMENT						= 6;
-	const PAPERSIZE_EXECUTIVE						= 7;
-	const PAPERSIZE_A3								= 8;
-	const PAPERSIZE_A4								= 9;
-	const PAPERSIZE_A4_SMALL						= 10;
-	const PAPERSIZE_A5								= 11;
-	const PAPERSIZE_B4								= 12;
-	const PAPERSIZE_B5								= 13;
-	const PAPERSIZE_FOLIO							= 14;
-	const PAPERSIZE_QUARTO							= 15;
-	const PAPERSIZE_STANDARD_1						= 16;
-	const PAPERSIZE_STANDARD_2						= 17;
-	const PAPERSIZE_NOTE							= 18;
-	const PAPERSIZE_NO9_ENVELOPE					= 19;
-	const PAPERSIZE_NO10_ENVELOPE					= 20;
-	const PAPERSIZE_NO11_ENVELOPE					= 21;
-	const PAPERSIZE_NO12_ENVELOPE					= 22;
-	const PAPERSIZE_NO14_ENVELOPE					= 23;
-	const PAPERSIZE_C								= 24;
-	const PAPERSIZE_D								= 25;
-	const PAPERSIZE_E								= 26;
-	const PAPERSIZE_DL_ENVELOPE						= 27;
-	const PAPERSIZE_C5_ENVELOPE						= 28;
-	const PAPERSIZE_C3_ENVELOPE						= 29;
-	const PAPERSIZE_C4_ENVELOPE						= 30;
-	const PAPERSIZE_C6_ENVELOPE						= 31;
-	const PAPERSIZE_C65_ENVELOPE					= 32;
-	const PAPERSIZE_B4_ENVELOPE						= 33;
-	const PAPERSIZE_B5_ENVELOPE						= 34;
-	const PAPERSIZE_B6_ENVELOPE						= 35;
-	const PAPERSIZE_ITALY_ENVELOPE					= 36;
-	const PAPERSIZE_MONARCH_ENVELOPE				= 37;
-	const PAPERSIZE_6_3_4_ENVELOPE					= 38;
-	const PAPERSIZE_US_STANDARD_FANFOLD				= 39;
-	const PAPERSIZE_GERMAN_STANDARD_FANFOLD			= 40;
-	const PAPERSIZE_GERMAN_LEGAL_FANFOLD			= 41;
-	const PAPERSIZE_ISO_B4							= 42;
-	const PAPERSIZE_JAPANESE_DOUBLE_POSTCARD		= 43;
-	const PAPERSIZE_STANDARD_PAPER_1				= 44;
-	const PAPERSIZE_STANDARD_PAPER_2				= 45;
-	const PAPERSIZE_STANDARD_PAPER_3				= 46;
-	const PAPERSIZE_INVITE_ENVELOPE					= 47;
-	const PAPERSIZE_LETTER_EXTRA_PAPER				= 48;
-	const PAPERSIZE_LEGAL_EXTRA_PAPER				= 49;
-	const PAPERSIZE_TABLOID_EXTRA_PAPER				= 50;
-	const PAPERSIZE_A4_EXTRA_PAPER					= 51;
-	const PAPERSIZE_LETTER_TRANSVERSE_PAPER			= 52;
-	const PAPERSIZE_A4_TRANSVERSE_PAPER				= 53;
-	const PAPERSIZE_LETTER_EXTRA_TRANSVERSE_PAPER	= 54;
-	const PAPERSIZE_SUPERA_SUPERA_A4_PAPER			= 55;
-	const PAPERSIZE_SUPERB_SUPERB_A3_PAPER			= 56;
-	const PAPERSIZE_LETTER_PLUS_PAPER				= 57;
-	const PAPERSIZE_A4_PLUS_PAPER					= 58;
-	const PAPERSIZE_A5_TRANSVERSE_PAPER				= 59;
-	const PAPERSIZE_JIS_B5_TRANSVERSE_PAPER			= 60;
-	const PAPERSIZE_A3_EXTRA_PAPER					= 61;
-	const PAPERSIZE_A5_EXTRA_PAPER					= 62;
-	const PAPERSIZE_ISO_B5_EXTRA_PAPER				= 63;
-	const PAPERSIZE_A2_PAPER						= 64;
-	const PAPERSIZE_A3_TRANSVERSE_PAPER				= 65;
-	const PAPERSIZE_A3_EXTRA_TRANSVERSE_PAPER		= 66;
-
-	/* Page orientation */
-	const ORIENTATION_DEFAULT	= 'default';
-	const ORIENTATION_LANDSCAPE	= 'landscape';
-	const ORIENTATION_PORTRAIT	= 'portrait';
-
-	/* Print Range Set Method */
-	const SETPRINTRANGE_OVERWRITE	= 'O';
-	const SETPRINTRANGE_INSERT		= 'I';
-
-
-	/**
-	 * Paper size
-	 *
-	 * @var int
-	 */
-	private $_paperSize		= PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER;
-
-	/**
-	 * Orientation
-	 *
-	 * @var string
-	 */
-	private $_orientation	= PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT;
-
-	/**
-	 * Scale (Print Scale)
-	 *
-	 * Print scaling. Valid values range from 10 to 400
-	 * This setting is overridden when fitToWidth and/or fitToHeight are in use
-	 *
-	 * @var int?
-	 */
-	private $_scale			= 100;
-
-	/**
-	  * Fit To Page
-	  * Whether scale or fitToWith / fitToHeight applies
-	  *
-	  * @var boolean
-	  */
-	private $_fitToPage		= FALSE;
-
-	/**
-	  * Fit To Height
-	  * Number of vertical pages to fit on
-	  *
-	  * @var int?
-	  */
-	private $_fitToHeight	= 1;
-
-	/**
-	  * Fit To Width
-	  * Number of horizontal pages to fit on
-	  *
-	  * @var int?
-	  */
-	private $_fitToWidth	= 1;
-
-	/**
-	 * Columns to repeat at left
-	 *
-	 * @var array Containing start column and end column, empty array if option unset
-	 */
-	private $_columnsToRepeatAtLeft = array('', '');
-
-	/**
-	 * Rows to repeat at top
-	 *
-	 * @var array Containing start row number and end row number, empty array if option unset
-	 */
-	private $_rowsToRepeatAtTop = array(0, 0);
-
-	/**
-	 * Center page horizontally
-	 *
-	 * @var boolean
-	 */
-	private $_horizontalCentered = FALSE;
-
-	/**
-	 * Center page vertically
-	 *
-	 * @var boolean
-	 */
-	private $_verticalCentered = FALSE;
-
-	/**
-	 * Print area
-	 *
-	 * @var string
-	 */
-	private $_printArea = NULL;
-
-	/**
-	 * First page number
-	 *
-	 * @var int
-	 */
-	private $_firstPageNumber = NULL;
-
-    /**
-     * Create a new PHPExcel_Worksheet_PageSetup
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * Get Paper Size
-     *
-     * @return int
-     */
-    public function getPaperSize() {
-    	return $this->_paperSize;
-    }
-
-    /**
-     * Set Paper Size
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_PageSetup
-     */
-    public function setPaperSize($pValue = PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER) {
-    	$this->_paperSize = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Orientation
-     *
-     * @return string
-     */
-    public function getOrientation() {
-    	return $this->_orientation;
-    }
-
-    /**
-     * Set Orientation
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_PageSetup
-     */
-    public function setOrientation($pValue = PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT) {
-    	$this->_orientation = $pValue;
-    	return $this;
-    }
-
-	/**
-	 * Get Scale
-	 *
-	 * @return int?
-	 */
-	public function getScale() {
-		return $this->_scale;
-	}
-
-	/**
-	 * Set Scale
-	 *
-	 * Print scaling. Valid values range from 10 to 400
-	 * This setting is overridden when fitToWidth and/or fitToHeight are in use
-	 *
-	 * @param 	int?	$pValue
-	 * @param boolean	$pUpdate	Update fitToPage so scaling applies rather than fitToHeight / fitToWidth
-	 * @return PHPExcel_Worksheet_PageSetup
-	 * @throws 	PHPExcel_Exception
-	 */
-	public function setScale($pValue = 100, $pUpdate = true) {
-		// Microsoft Office Excel 2007 only allows setting a scale between 10 and 400 via the user interface,
-		// but it is apparently still able to handle any scale >= 0, where 0 results in 100
-		if (($pValue >= 0) || is_null($pValue)) {
-			$this->_scale = $pValue;
-			if ($pUpdate) {
-				$this->_fitToPage = false;
-			}
-		} else {
-			throw new PHPExcel_Exception("Scale must not be negative");
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Fit To Page
-	 *
-	 * @return boolean
-	 */
-	public function getFitToPage() {
-		return $this->_fitToPage;
-	}
-
-	/**
-	 * Set Fit To Page
-	 *
-	 * @param boolean $pValue
-	 * @return PHPExcel_Worksheet_PageSetup
-	 */
-	public function setFitToPage($pValue = TRUE) {
-		$this->_fitToPage = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get Fit To Height
-	 *
-	 * @return int?
-	 */
-	public function getFitToHeight() {
-		return $this->_fitToHeight;
-	}
-
-	/**
-	 * Set Fit To Height
-	 *
-	 * @param int? $pValue
-	 * @param boolean $pUpdate Update fitToPage so it applies rather than scaling
-	 * @return PHPExcel_Worksheet_PageSetup
-	 */
-	public function setFitToHeight($pValue = 1, $pUpdate = TRUE) {
-		$this->_fitToHeight = $pValue;
-		if ($pUpdate) {
-			$this->_fitToPage = TRUE;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Fit To Width
-	 *
-	 * @return int?
-	 */
-	public function getFitToWidth() {
-		return $this->_fitToWidth;
-	}
-
-	/**
-	 * Set Fit To Width
-	 *
-	 * @param int? $pValue
-	 * @param boolean $pUpdate Update fitToPage so it applies rather than scaling
-	 * @return PHPExcel_Worksheet_PageSetup
-	 */
-	public function setFitToWidth($pValue = 1, $pUpdate = TRUE) {
-		$this->_fitToWidth = $pValue;
-		if ($pUpdate) {
-			$this->_fitToPage = TRUE;
-		}
-		return $this;
-	}
-
-	/**
-	 * Is Columns to repeat at left set?
-	 *
-	 * @return boolean
-	 */
-	public function isColumnsToRepeatAtLeftSet() {
-		if (is_array($this->_columnsToRepeatAtLeft)) {
-			if ($this->_columnsToRepeatAtLeft[0] != '' && $this->_columnsToRepeatAtLeft[1] != '') {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Get Columns to repeat at left
-	 *
-	 * @return array Containing start column and end column, empty array if option unset
-	 */
-	public function getColumnsToRepeatAtLeft() {
-		return $this->_columnsToRepeatAtLeft;
-	}
-
-	/**
-	 * Set Columns to repeat at left
-	 *
-	 * @param array $pValue Containing start column and end column, empty array if option unset
-	 * @return PHPExcel_Worksheet_PageSetup
-	 */
-	public function setColumnsToRepeatAtLeft($pValue = null) {
-		if (is_array($pValue)) {
-			$this->_columnsToRepeatAtLeft = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Set Columns to repeat at left by start and end
-	 *
-	 * @param string $pStart
-	 * @param string $pEnd
-	 * @return PHPExcel_Worksheet_PageSetup
-	 */
-	public function setColumnsToRepeatAtLeftByStartAndEnd($pStart = 'A', $pEnd = 'A') {
-		$this->_columnsToRepeatAtLeft = array($pStart, $pEnd);
-		return $this;
-	}
-
-	/**
-	 * Is Rows to repeat at top set?
-	 *
-	 * @return boolean
-	 */
-	public function isRowsToRepeatAtTopSet() {
-		if (is_array($this->_rowsToRepeatAtTop)) {
-			if ($this->_rowsToRepeatAtTop[0] != 0 && $this->_rowsToRepeatAtTop[1] != 0) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Get Rows to repeat at top
-	 *
-	 * @return array Containing start column and end column, empty array if option unset
-	 */
-	public function getRowsToRepeatAtTop() {
-		return $this->_rowsToRepeatAtTop;
-	}
-
-	/**
-	 * Set Rows to repeat at top
-	 *
-	 * @param array	$pValue	Containing start column and end column, empty array if option unset
-	 * @return PHPExcel_Worksheet_PageSetup
-	 */
-	public function setRowsToRepeatAtTop($pValue = null) {
-		if (is_array($pValue)) {
-			$this->_rowsToRepeatAtTop = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Set Rows to repeat at top by start and end
-	 *
-	 * @param int $pStart
-	 * @param int $pEnd
-	 * @return PHPExcel_Worksheet_PageSetup
-	 */
-	public function setRowsToRepeatAtTopByStartAndEnd($pStart = 1, $pEnd = 1) {
-		$this->_rowsToRepeatAtTop = array($pStart, $pEnd);
-		return $this;
-	}
-
-	/**
-	 * Get center page horizontally
-	 *
-	 * @return bool
-	 */
-	public function getHorizontalCentered() {
-		return $this->_horizontalCentered;
-	}
-
-	/**
-	 * Set center page horizontally
-	 *
-	 * @param bool $value
-	 * @return PHPExcel_Worksheet_PageSetup
-	 */
-	public function setHorizontalCentered($value = false) {
-		$this->_horizontalCentered = $value;
-		return $this;
-	}
-
-	/**
-	 * Get center page vertically
-	 *
-	 * @return bool
-	 */
-	public function getVerticalCentered() {
-		return $this->_verticalCentered;
-	}
-
-	/**
-	 * Set center page vertically
-	 *
-	 * @param bool $value
-	 * @return PHPExcel_Worksheet_PageSetup
-	 */
-	public function setVerticalCentered($value = false) {
-		$this->_verticalCentered = $value;
-		return $this;
-	}
-
-	/**
-	 *	Get print area
-	 *
-	 * @param	int		$index	Identifier for a specific print area range if several ranges have been set
-	 *							Default behaviour, or a index value of 0, will return all ranges as a comma-separated string
-	 *							Otherwise, the specific range identified by the value of $index will be returned
-	 *							Print areas are numbered from 1
-	 * @throws	PHPExcel_Exception
-	 * @return	string
-	 */
-	public function getPrintArea($index = 0) {
-		if ($index == 0) {
-			return $this->_printArea;
-		}
-		$printAreas = explode(',',$this->_printArea);
-		if (isset($printAreas[$index-1])) {
-			return $printAreas[$index-1];
-		}
-		throw new PHPExcel_Exception("Requested Print Area does not exist");
-	}
-
-	/**
-	 * Is print area set?
-	 *
-	 * @param	int		$index	Identifier for a specific print area range if several ranges have been set
-	 *							Default behaviour, or an index value of 0, will identify whether any print range is set
-	 *							Otherwise, existence of the range identified by the value of $index will be returned
-	 *							Print areas are numbered from 1
-	 * @return	boolean
-	 */
-	public function isPrintAreaSet($index = 0) {
-		if ($index == 0) {
-			return !is_null($this->_printArea);
-		}
-		$printAreas = explode(',',$this->_printArea);
-		return isset($printAreas[$index-1]);
-	}
-
-	/**
-	 * Clear a print area
-	 *
-	 * @param	int		$index	Identifier for a specific print area range if several ranges have been set
-	 *							Default behaviour, or an index value of 0, will clear all print ranges that are set
-	 *							Otherwise, the range identified by the value of $index will be removed from the series
-	 *							Print areas are numbered from 1
-	 * @return	PHPExcel_Worksheet_PageSetup
-	 */
-	public function clearPrintArea($index = 0) {
-		if ($index == 0) {
-			$this->_printArea = NULL;
-		} else {
-			$printAreas = explode(',',$this->_printArea);
-			if (isset($printAreas[$index-1])) {
-				unset($printAreas[$index-1]);
-				$this->_printArea = implode(',',$printAreas);
-			}
-		}
-
-    	return $this;
-	}
-
-	/**
-	 * Set print area. e.g. 'A1:D10' or 'A1:D10,G5:M20'
-	 *
-	 * @param	string	$value
-	 * @param	int		$index	Identifier for a specific print area range allowing several ranges to be set
-	 *							When the method is "O"verwrite, then a positive integer index will overwrite that indexed
-	 *								entry in the print areas list; a negative index value will identify which entry to
-	 *								overwrite working bacward through the print area to the list, with the last entry as -1.
-	 *								Specifying an index value of 0, will overwrite <b>all</b> existing print ranges.
-	 *							When the method is "I"nsert, then a positive index will insert after that indexed entry in
-	 *								the print areas list, while a negative index will insert before the indexed entry.
-	 *								Specifying an index value of 0, will always append the new print range at the end of the
-	 *								list.
-	 *							Print areas are numbered from 1
-	 * @param	string	$method	Determines the method used when setting multiple print areas
-	 *							Default behaviour, or the "O" method, overwrites existing print area
-	 *							The "I" method, inserts the new print area before any specified index, or at the end of the list
-	 * @return	PHPExcel_Worksheet_PageSetup
-	 * @throws	PHPExcel_Exception
-	 */
-	public function setPrintArea($value, $index = 0, $method = self::SETPRINTRANGE_OVERWRITE) {
-		if (strpos($value,'!') !== false) {
-			throw new PHPExcel_Exception('Cell coordinate must not specify a worksheet.');
-		} elseif (strpos($value,':') === false) {
-			throw new PHPExcel_Exception('Cell coordinate must be a range of cells.');
-		} elseif (strpos($value,'$') !== false) {
-			throw new PHPExcel_Exception('Cell coordinate must not be absolute.');
-		}
-		$value = strtoupper($value);
-
-		if ($method == self::SETPRINTRANGE_OVERWRITE) {
-			if ($index == 0) {
-				$this->_printArea = $value;
-			} else {
-				$printAreas = explode(',',$this->_printArea);
-				if($index < 0) {
-					$index = count($printAreas) - abs($index) + 1;
-				}
-				if (($index <= 0) || ($index > count($printAreas))) {
-		    		throw new PHPExcel_Exception('Invalid index for setting print range.');
-				}
-				$printAreas[$index-1] = $value;
-				$this->_printArea = implode(',',$printAreas);
-			}
-		} elseif($method == self::SETPRINTRANGE_INSERT) {
-			if ($index == 0) {
-				$this->_printArea .= ($this->_printArea == '') ? $value : ','.$value;
-			} else {
-				$printAreas = explode(',',$this->_printArea);
-				if($index < 0) {
-					$index = abs($index) - 1;
-				}
-				if ($index > count($printAreas)) {
-		    		throw new PHPExcel_Exception('Invalid index for setting print range.');
-				}
-				$printAreas = array_merge(array_slice($printAreas,0,$index),array($value),array_slice($printAreas,$index));
-				$this->_printArea = implode(',',$printAreas);
-			}
-		} else {
-    		throw new PHPExcel_Exception('Invalid method for setting print range.');
-		}
-
-    	return $this;
-	}
-
-	/**
-	 * Add a new print area (e.g. 'A1:D10' or 'A1:D10,G5:M20') to the list of print areas
-	 *
-	 * @param	string	$value
-	 * @param	int		$index	Identifier for a specific print area range allowing several ranges to be set
-	 *							A positive index will insert after that indexed entry in the print areas list, while a
-	 *								negative index will insert before the indexed entry.
-	 *								Specifying an index value of 0, will always append the new print range at the end of the
-	 *								list.
-	 *							Print areas are numbered from 1
-	 * @return	PHPExcel_Worksheet_PageSetup
-	 * @throws	PHPExcel_Exception
-	 */
-	public function addPrintArea($value, $index = -1) {
-		return $this->setPrintArea($value, $index, self::SETPRINTRANGE_INSERT);
-	}
-
-	/**
-	 * Set print area
-	 *
-	 * @param	int		$column1	Column 1
-	 * @param	int		$row1		Row 1
-	 * @param	int		$column2	Column 2
-	 * @param	int		$row2		Row 2
-	 * @param	int		$index		Identifier for a specific print area range allowing several ranges to be set
-	 *								When the method is "O"verwrite, then a positive integer index will overwrite that indexed
-	 *									entry in the print areas list; a negative index value will identify which entry to
-	 *									overwrite working bacward through the print area to the list, with the last entry as -1.
-	 *									Specifying an index value of 0, will overwrite <b>all</b> existing print ranges.
-	 *								When the method is "I"nsert, then a positive index will insert after that indexed entry in
-	 *									the print areas list, while a negative index will insert before the indexed entry.
-	 *									Specifying an index value of 0, will always append the new print range at the end of the
-	 *									list.
-	 *								Print areas are numbered from 1
-	 * @param	string	$method		Determines the method used when setting multiple print areas
-	 *								Default behaviour, or the "O" method, overwrites existing print area
-	 *								The "I" method, inserts the new print area before any specified index, or at the end of the list
-	 * @return	PHPExcel_Worksheet_PageSetup
-	 * @throws	PHPExcel_Exception
-	 */
-    public function setPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = 0, $method = self::SETPRINTRANGE_OVERWRITE)
-    {
-    	return $this->setPrintArea(PHPExcel_Cell::stringFromColumnIndex($column1) . $row1 . ':' . PHPExcel_Cell::stringFromColumnIndex($column2) . $row2, $index, $method);
-    }
-
-	/**
-	 * Add a new print area to the list of print areas
-	 *
-	 * @param	int		$column1	Start Column for the print area
-	 * @param	int		$row1		Start Row for the print area
-	 * @param	int		$column2	End Column for the print area
-	 * @param	int		$row2		End Row for the print area
-	 * @param	int		$index		Identifier for a specific print area range allowing several ranges to be set
-	 *								A positive index will insert after that indexed entry in the print areas list, while a
-	 *									negative index will insert before the indexed entry.
-	 *									Specifying an index value of 0, will always append the new print range at the end of the
-	 *									list.
-	 *								Print areas are numbered from 1
-	 * @return	PHPExcel_Worksheet_PageSetup
-	 * @throws	PHPExcel_Exception
-	 */
-    public function addPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = -1)
-    {
-    	return $this->setPrintArea(PHPExcel_Cell::stringFromColumnIndex($column1) . $row1 . ':' . PHPExcel_Cell::stringFromColumnIndex($column2) . $row2, $index, self::SETPRINTRANGE_INSERT);
-	}
-
-	/**
-	 * Get first page number
-	 *
-	 * @return int
-	 */
-    public function getFirstPageNumber() {
-		return $this->_firstPageNumber;
-    }
-
-    /**
-     * Set first page number
-     *
-     * @param int $value
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function setFirstPageNumber($value = null) {
-		$this->_firstPageNumber = $value;
-		return $this;
-    }
-
-    /**
-     * Reset first page number
-     *
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function resetFirstPageNumber() {
-		return $this->setFirstPageNumber(null);
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Protection.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Protection.php
deleted file mode 100644
index da66bf7632f..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Protection.php
+++ /dev/null
@@ -1,545 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_Protection
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_Protection
-{
-	/**
-	 * Sheet
-	 *
-	 * @var boolean
-	 */
-	private $_sheet					= false;
-
-	/**
-	 * Objects
-	 *
-	 * @var boolean
-	 */
-	private $_objects				= false;
-
-	/**
-	 * Scenarios
-	 *
-	 * @var boolean
-	 */
-	private $_scenarios				= false;
-
-	/**
-	 * Format cells
-	 *
-	 * @var boolean
-	 */
-	private $_formatCells			= false;
-
-	/**
-	 * Format columns
-	 *
-	 * @var boolean
-	 */
-	private $_formatColumns			= false;
-
-	/**
-	 * Format rows
-	 *
-	 * @var boolean
-	 */
-	private $_formatRows			= false;
-
-	/**
-	 * Insert columns
-	 *
-	 * @var boolean
-	 */
-	private $_insertColumns			= false;
-
-	/**
-	 * Insert rows
-	 *
-	 * @var boolean
-	 */
-	private $_insertRows			= false;
-
-	/**
-	 * Insert hyperlinks
-	 *
-	 * @var boolean
-	 */
-	private $_insertHyperlinks		= false;
-
-	/**
-	 * Delete columns
-	 *
-	 * @var boolean
-	 */
-	private $_deleteColumns			= false;
-
-	/**
-	 * Delete rows
-	 *
-	 * @var boolean
-	 */
-	private $_deleteRows			= false;
-
-	/**
-	 * Select locked cells
-	 *
-	 * @var boolean
-	 */
-	private $_selectLockedCells		= false;
-
-	/**
-	 * Sort
-	 *
-	 * @var boolean
-	 */
-	private $_sort					= false;
-
-	/**
-	 * AutoFilter
-	 *
-	 * @var boolean
-	 */
-	private $_autoFilter			= false;
-
-	/**
-	 * Pivot tables
-	 *
-	 * @var boolean
-	 */
-	private $_pivotTables			= false;
-
-	/**
-	 * Select unlocked cells
-	 *
-	 * @var boolean
-	 */
-	private $_selectUnlockedCells	= false;
-
-	/**
-	 * Password
-	 *
-	 * @var string
-	 */
-	private $_password				= '';
-
-    /**
-     * Create a new PHPExcel_Worksheet_Protection
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * Is some sort of protection enabled?
-     *
-     * @return boolean
-     */
-    function isProtectionEnabled() {
-    	return 	$this->_sheet ||
-				$this->_objects ||
-				$this->_scenarios ||
-				$this->_formatCells ||
-				$this->_formatColumns ||
-				$this->_formatRows ||
-				$this->_insertColumns ||
-				$this->_insertRows ||
-				$this->_insertHyperlinks ||
-				$this->_deleteColumns ||
-				$this->_deleteRows ||
-				$this->_selectLockedCells ||
-				$this->_sort ||
-				$this->_autoFilter ||
-				$this->_pivotTables ||
-				$this->_selectUnlockedCells;
-    }
-
-    /**
-     * Get Sheet
-     *
-     * @return boolean
-     */
-    function getSheet() {
-    	return $this->_sheet;
-    }
-
-    /**
-     * Set Sheet
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setSheet($pValue = false) {
-    	$this->_sheet = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Objects
-     *
-     * @return boolean
-     */
-    function getObjects() {
-    	return $this->_objects;
-    }
-
-    /**
-     * Set Objects
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setObjects($pValue = false) {
-    	$this->_objects = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Scenarios
-     *
-     * @return boolean
-     */
-    function getScenarios() {
-    	return $this->_scenarios;
-    }
-
-    /**
-     * Set Scenarios
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setScenarios($pValue = false) {
-    	$this->_scenarios = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get FormatCells
-     *
-     * @return boolean
-     */
-    function getFormatCells() {
-    	return $this->_formatCells;
-    }
-
-    /**
-     * Set FormatCells
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setFormatCells($pValue = false) {
-    	$this->_formatCells = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get FormatColumns
-     *
-     * @return boolean
-     */
-    function getFormatColumns() {
-    	return $this->_formatColumns;
-    }
-
-    /**
-     * Set FormatColumns
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setFormatColumns($pValue = false) {
-    	$this->_formatColumns = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get FormatRows
-     *
-     * @return boolean
-     */
-    function getFormatRows() {
-    	return $this->_formatRows;
-    }
-
-    /**
-     * Set FormatRows
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setFormatRows($pValue = false) {
-    	$this->_formatRows = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get InsertColumns
-     *
-     * @return boolean
-     */
-    function getInsertColumns() {
-    	return $this->_insertColumns;
-    }
-
-    /**
-     * Set InsertColumns
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setInsertColumns($pValue = false) {
-    	$this->_insertColumns = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get InsertRows
-     *
-     * @return boolean
-     */
-    function getInsertRows() {
-    	return $this->_insertRows;
-    }
-
-    /**
-     * Set InsertRows
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setInsertRows($pValue = false) {
-    	$this->_insertRows = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get InsertHyperlinks
-     *
-     * @return boolean
-     */
-    function getInsertHyperlinks() {
-    	return $this->_insertHyperlinks;
-    }
-
-    /**
-     * Set InsertHyperlinks
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setInsertHyperlinks($pValue = false) {
-    	$this->_insertHyperlinks = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get DeleteColumns
-     *
-     * @return boolean
-     */
-    function getDeleteColumns() {
-    	return $this->_deleteColumns;
-    }
-
-    /**
-     * Set DeleteColumns
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setDeleteColumns($pValue = false) {
-    	$this->_deleteColumns = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get DeleteRows
-     *
-     * @return boolean
-     */
-    function getDeleteRows() {
-    	return $this->_deleteRows;
-    }
-
-    /**
-     * Set DeleteRows
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setDeleteRows($pValue = false) {
-    	$this->_deleteRows = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get SelectLockedCells
-     *
-     * @return boolean
-     */
-    function getSelectLockedCells() {
-    	return $this->_selectLockedCells;
-    }
-
-    /**
-     * Set SelectLockedCells
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setSelectLockedCells($pValue = false) {
-    	$this->_selectLockedCells = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Sort
-     *
-     * @return boolean
-     */
-    function getSort() {
-    	return $this->_sort;
-    }
-
-    /**
-     * Set Sort
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setSort($pValue = false) {
-    	$this->_sort = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get AutoFilter
-     *
-     * @return boolean
-     */
-    function getAutoFilter() {
-    	return $this->_autoFilter;
-    }
-
-    /**
-     * Set AutoFilter
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setAutoFilter($pValue = false) {
-    	$this->_autoFilter = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get PivotTables
-     *
-     * @return boolean
-     */
-    function getPivotTables() {
-    	return $this->_pivotTables;
-    }
-
-    /**
-     * Set PivotTables
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setPivotTables($pValue = false) {
-    	$this->_pivotTables = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get SelectUnlockedCells
-     *
-     * @return boolean
-     */
-    function getSelectUnlockedCells() {
-    	return $this->_selectUnlockedCells;
-    }
-
-    /**
-     * Set SelectUnlockedCells
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setSelectUnlockedCells($pValue = false) {
-    	$this->_selectUnlockedCells = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Password (hashed)
-     *
-     * @return string
-     */
-    function getPassword() {
-    	return $this->_password;
-    }
-
-    /**
-     * Set Password
-     *
-     * @param string 	$pValue
-     * @param boolean 	$pAlreadyHashed If the password has already been hashed, set this to true
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setPassword($pValue = '', $pAlreadyHashed = false) {
-    	if (!$pAlreadyHashed) {
-    		$pValue = PHPExcel_Shared_PasswordHasher::hashPassword($pValue);
-    	}
-		$this->_password = $pValue;
-		return $this;
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Row.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Row.php
deleted file mode 100644
index 33043279035..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Row.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_Row
- *
- * Represents a row in PHPExcel_Worksheet, used by PHPExcel_Worksheet_RowIterator
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_Row
-{
-	/**
-	 * PHPExcel_Worksheet
-	 *
-	 * @var PHPExcel_Worksheet
-	 */
-	private $_parent;
-
-	/**
-	 * Row index
-	 *
-	 * @var int
-	 */
-	private $_rowIndex = 0;
-
-	/**
-	 * Create a new row
-	 *
-	 * @param PHPExcel_Worksheet 		$parent
-	 * @param int						$rowIndex
-	 */
-	public function __construct(PHPExcel_Worksheet $parent = null, $rowIndex = 1) {
-		// Set parent and row index
-		$this->_parent 		= $parent;
-		$this->_rowIndex 	= $rowIndex;
-	}
-
-	/**
-	 * Destructor
-	 */
-	public function __destruct() {
-		unset($this->_parent);
-	}
-
-	/**
-	 * Get row index
-	 *
-	 * @return int
-	 */
-	public function getRowIndex() {
-		return $this->_rowIndex;
-	}
-
-	/**
-	 * Get cell iterator
-	 *
-	 * @param	string				$startColumn	The column address at which to start iterating
-	 * @param	string				$endColumn	    Optionally, the column address at which to stop iterating
-	 * @return PHPExcel_Worksheet_CellIterator
-	 */
-	public function getCellIterator($startColumn = 'A', $endColumn = null) {
-		return new PHPExcel_Worksheet_RowCellIterator($this->_parent, $this->_rowIndex, $startColumn, $endColumn);
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowCellIterator.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowCellIterator.php
deleted file mode 100644
index 96c6b419c5e..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowCellIterator.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_RowCellIterator
- *
- * Used to iterate columns in a PHPExcel_Worksheet
- *
- * @category   PHPExcel
- * @package	PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_RowCellIterator extends PHPExcel_Worksheet_CellIterator implements Iterator
-{
-	/**
-	 * Row index
-	 *
-	 * @var int
-	 */
-	protected $_rowIndex;
-
-	/**
-	 * Start position
-	 *
-	 * @var int
-	 */
-	protected $_startColumn = 0;
-
-	/**
-	 * End position
-	 *
-	 * @var int
-	 */
-	protected $_endColumn = 0;
-
-	/**
-	 * Create a new column iterator
-	 *
-	 * @param	PHPExcel_Worksheet	$subject	    The worksheet to iterate over
-     * @param   integer             $rowIndex       The row that we want to iterate
-	 * @param	string				$startColumn	The column address at which to start iterating
-	 * @param	string				$endColumn	    Optionally, the column address at which to stop iterating
-	 */
-	public function __construct(PHPExcel_Worksheet $subject = null, $rowIndex = 1, $startColumn = 'A', $endColumn = null) {
-		// Set subject and row index
-		$this->_subject = $subject;
-		$this->_rowIndex = $rowIndex;
-		$this->resetEnd($endColumn);
-		$this->resetStart($startColumn);
-	}
-
-	/**
-	 * Destructor
-	 */
-	public function __destruct() {
-		unset($this->_subject);
-	}
-
-	/**
-	 * (Re)Set the start column and the current column pointer
-	 *
-	 * @param integer	$startColumn	The column address at which to start iterating
-     * @return PHPExcel_Worksheet_RowCellIterator
-     * @throws PHPExcel_Exception
-	 */
-	public function resetStart($startColumn = 'A') {
-        $startColumnIndex = PHPExcel_Cell::columnIndexFromString($startColumn) - 1;
-		$this->_startColumn = $startColumnIndex;
-        $this->adjustForExistingOnlyRange();
-		$this->seek(PHPExcel_Cell::stringFromColumnIndex($this->_startColumn));
-
-        return $this;
-	}
-
-	/**
-	 * (Re)Set the end column
-	 *
-	 * @param string	$endColumn	The column address at which to stop iterating
-     * @return PHPExcel_Worksheet_RowCellIterator
-     * @throws PHPExcel_Exception
-	 */
-	public function resetEnd($endColumn = null) {
-		$endColumn = ($endColumn) ? $endColumn : $this->_subject->getHighestColumn();
-		$this->_endColumn = PHPExcel_Cell::columnIndexFromString($endColumn) - 1;
-        $this->adjustForExistingOnlyRange();
-
-        return $this;
-	}
-
-	/**
-	 * Set the column pointer to the selected column
-	 *
-	 * @param string	$column	The column address to set the current pointer at
-     * @return PHPExcel_Worksheet_RowCellIterator
-     * @throws PHPExcel_Exception
-	 */
-	public function seek($column = 'A') {
-        $column = PHPExcel_Cell::columnIndexFromString($column) - 1;
-        if (($column < $this->_startColumn) || ($column > $this->_endColumn)) {
-            throw new PHPExcel_Exception("Column $column is out of range ({$this->_startColumn} - {$this->_endColumn})");
-        } elseif ($this->_onlyExistingCells && !($this->_subject->cellExistsByColumnAndRow($column, $this->_rowIndex))) {
-            throw new PHPExcel_Exception('In "IterateOnlyExistingCells" mode and Cell does not exist');
-        }
-		$this->_position = $column;
-
-        return $this;
-    }
-
-	/**
-	 * Rewind the iterator to the starting column
-	 */
-	public function rewind() {
-		$this->_position = $this->_startColumn;
-	}
-
-	/**
-	 * Return the current cell in this worksheet row
-	 *
-	 * @return PHPExcel_Cell
-	 */
-	public function current() {
-		return $this->_subject->getCellByColumnAndRow($this->_position, $this->_rowIndex);
-	}
-
-	/**
-	 * Return the current iterator key
-	 *
-	 * @return string
-	 */
-	public function key() {
-		return PHPExcel_Cell::stringFromColumnIndex($this->_position);
-	}
-
-	/**
-	 * Set the iterator to its next value
-	 */
-	public function next() {
-        do {
-            ++$this->_position;
-        } while (($this->_onlyExistingCells) &&
-            (!$this->_subject->cellExistsByColumnAndRow($this->_position, $this->_rowIndex)) &&
-            ($this->_position <= $this->_endColumn));
-	}
-
-	/**
-	 * Set the iterator to its previous value
-     *
-     * @throws PHPExcel_Exception
-	 */
-	public function prev() {
-        if ($this->_position <= $this->_startColumn) {
-            throw new PHPExcel_Exception(
-                "Column is already at the beginning of range (" . 
-                PHPExcel_Cell::stringFromColumnIndex($this->_endColumn) . " - " . 
-                PHPExcel_Cell::stringFromColumnIndex($this->_endColumn) . ")"
-            );
-        }
-
-        do {
-            --$this->_position;
-        } while (($this->_onlyExistingCells) &&
-            (!$this->_subject->cellExistsByColumnAndRow($this->_position, $this->_rowIndex)) &&
-            ($this->_position >= $this->_startColumn));
-	}
-
-	/**
-	 * Indicate if more columns exist in the worksheet range of columns that we're iterating
-	 *
-	 * @return boolean
-	 */
-	public function valid() {
-		return $this->_position <= $this->_endColumn;
-	}
-
-	/**
-	 * Validate start/end values for "IterateOnlyExistingCells" mode, and adjust if necessary
-	 *
-     * @throws PHPExcel_Exception
-	 */
-    protected function adjustForExistingOnlyRange() {
-        if ($this->_onlyExistingCells) {
-            while ((!$this->_subject->cellExistsByColumnAndRow($this->_startColumn, $this->_rowIndex)) &&
-                ($this->_startColumn <= $this->_endColumn)) {
-                ++$this->_startColumn;
-            }
-            if ($this->_startColumn > $this->_endColumn) {
-                throw new PHPExcel_Exception('No cells exist within the specified range');
-            }
-            while ((!$this->_subject->cellExistsByColumnAndRow($this->_endColumn, $this->_rowIndex)) &&
-                ($this->_endColumn >= $this->_startColumn)) {
-                --$this->_endColumn;
-            }
-            if ($this->_endColumn < $this->_startColumn) {
-                throw new PHPExcel_Exception('No cells exist within the specified range');
-            }
-        }
-    }
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowDimension.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowDimension.php
deleted file mode 100644
index bff89a0809e..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowDimension.php
+++ /dev/null
@@ -1,265 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_RowDimension
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_RowDimension
-{
-	/**
-	 * Row index
-	 *
-	 * @var int
-	 */
-	private $_rowIndex;
-
-	/**
-	 * Row height (in pt)
-	 *
-	 * When this is set to a negative value, the row height should be ignored by IWriter
-	 *
-	 * @var double
-	 */
-	private $_rowHeight		= -1;
-
- 	/**
-	 * ZeroHeight for Row?
-	 *
-	 * @var bool
-	 */
-	private $_zeroHeight	= false;
-
-	/**
-	 * Visible?
-	 *
-	 * @var bool
-	 */
-	private $_visible		= true;
-
-	/**
-	 * Outline level
-	 *
-	 * @var int
-	 */
-	private $_outlineLevel	= 0;
-
-	/**
-	 * Collapsed
-	 *
-	 * @var bool
-	 */
-	private $_collapsed		= false;
-
-	/**
-	 * Index to cellXf. Null value means row has no explicit cellXf format.
-	 *
-	 * @var int|null
-	 */
-	private $_xfIndex;
-
-    /**
-     * Create a new PHPExcel_Worksheet_RowDimension
-     *
-     * @param int $pIndex Numeric row index
-     */
-    public function __construct($pIndex = 0)
-    {
-    	// Initialise values
-    	$this->_rowIndex		= $pIndex;
-
-		// set row dimension as unformatted by default
-		$this->_xfIndex = null;
-    }
-
-    /**
-     * Get Row Index
-     *
-     * @return int
-     */
-    public function getRowIndex() {
-    	return $this->_rowIndex;
-    }
-
-    /**
-     * Set Row Index
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_RowDimension
-     */
-    public function setRowIndex($pValue) {
-    	$this->_rowIndex = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Row Height
-     *
-     * @return double
-     */
-    public function getRowHeight() {
-    	return $this->_rowHeight;
-    }
-
-    /**
-     * Set Row Height
-     *
-     * @param double $pValue
-     * @return PHPExcel_Worksheet_RowDimension
-     */
-    public function setRowHeight($pValue = -1) {
-    	$this->_rowHeight = $pValue;
-    	return $this;
-    }
-
-	/**
-	 * Get ZeroHeight
-	 *
-	 * @return bool
-	 */
-	public function getZeroHeight() {
-		return $this->_zeroHeight;
-	}
-
-	/**
-	 * Set ZeroHeight
-	 *
-	 * @param bool $pValue
-	 * @return PHPExcel_Worksheet_RowDimension
-	 */
-	public function setZeroHeight($pValue = false) {
-		$this->_zeroHeight = $pValue;
-		return $this;
-	}
-
-    /**
-     * Get Visible
-     *
-     * @return bool
-     */
-    public function getVisible() {
-    	return $this->_visible;
-    }
-
-    /**
-     * Set Visible
-     *
-     * @param bool $pValue
-     * @return PHPExcel_Worksheet_RowDimension
-     */
-    public function setVisible($pValue = true) {
-    	$this->_visible = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Outline Level
-     *
-     * @return int
-     */
-    public function getOutlineLevel() {
-    	return $this->_outlineLevel;
-    }
-
-    /**
-     * Set Outline Level
-     *
-     * Value must be between 0 and 7
-     *
-     * @param int $pValue
-     * @throws PHPExcel_Exception
-     * @return PHPExcel_Worksheet_RowDimension
-     */
-    public function setOutlineLevel($pValue) {
-    	if ($pValue < 0 || $pValue > 7) {
-    		throw new PHPExcel_Exception("Outline level must range between 0 and 7.");
-    	}
-
-    	$this->_outlineLevel = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Collapsed
-     *
-     * @return bool
-     */
-    public function getCollapsed() {
-    	return $this->_collapsed;
-    }
-
-    /**
-     * Set Collapsed
-     *
-     * @param bool $pValue
-     * @return PHPExcel_Worksheet_RowDimension
-     */
-    public function setCollapsed($pValue = true) {
-    	$this->_collapsed = $pValue;
-    	return $this;
-    }
-
-	/**
-	 * Get index to cellXf
-	 *
-	 * @return int
-	 */
-	public function getXfIndex()
-	{
-		return $this->_xfIndex;
-	}
-
-	/**
-	 * Set index to cellXf
-	 *
-	 * @param int $pValue
-	 * @return PHPExcel_Worksheet_RowDimension
-	 */
-	public function setXfIndex($pValue = 0)
-	{
-		$this->_xfIndex = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowIterator.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowIterator.php
deleted file mode 100644
index 110d8621437..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowIterator.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_RowIterator
- *
- * Used to iterate rows in a PHPExcel_Worksheet
- *
- * @category   PHPExcel
- * @package	PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_RowIterator implements Iterator
-{
-	/**
-	 * PHPExcel_Worksheet to iterate
-	 *
-	 * @var PHPExcel_Worksheet
-	 */
-	private $_subject;
-
-	/**
-	 * Current iterator position
-	 *
-	 * @var int
-	 */
-	private $_position = 1;
-
-	/**
-	 * Start position
-	 *
-	 * @var int
-	 */
-	private $_startRow = 1;
-
-
-	/**
-	 * End position
-	 *
-	 * @var int
-	 */
-	private $_endRow = 1;
-
-
-	/**
-	 * Create a new row iterator
-	 *
-	 * @param	PHPExcel_Worksheet	$subject	The worksheet to iterate over
-	 * @param	integer				$startRow	The row number at which to start iterating
-	 * @param	integer				$endRow	    Optionally, the row number at which to stop iterating
-	 */
-	public function __construct(PHPExcel_Worksheet $subject = null, $startRow = 1, $endRow = null) {
-		// Set subject
-		$this->_subject = $subject;
-		$this->resetEnd($endRow);
-		$this->resetStart($startRow);
-	}
-
-	/**
-	 * Destructor
-	 */
-	public function __destruct() {
-		unset($this->_subject);
-	}
-
-	/**
-	 * (Re)Set the start row and the current row pointer
-	 *
-	 * @param integer	$startRow	The row number at which to start iterating
-     * @return PHPExcel_Worksheet_RowIterator
-	 */
-	public function resetStart($startRow = 1) {
-		$this->_startRow = $startRow;
-		$this->seek($startRow);
-
-        return $this;
-	}
-
-	/**
-	 * (Re)Set the end row
-	 *
-	 * @param integer	$endRow	The row number at which to stop iterating
-     * @return PHPExcel_Worksheet_RowIterator
-	 */
-	public function resetEnd($endRow = null) {
-		$this->_endRow = ($endRow) ? $endRow : $this->_subject->getHighestRow();
-
-        return $this;
-	}
-
-	/**
-	 * Set the row pointer to the selected row
-	 *
-	 * @param integer	$row	The row number to set the current pointer at
-     * @return PHPExcel_Worksheet_RowIterator
-     * @throws PHPExcel_Exception
-	 */
-	public function seek($row = 1) {
-        if (($row < $this->_startRow) || ($row > $this->_endRow)) {
-            throw new PHPExcel_Exception("Row $row is out of range ({$this->_startRow} - {$this->_endRow})");
-        }
-		$this->_position = $row;
-
-        return $this;
-	}
-
-	/**
-	 * Rewind the iterator to the starting row
-	 */
-	public function rewind() {
-		$this->_position = $this->_startRow;
-	}
-
-	/**
-	 * Return the current row in this worksheet
-	 *
-	 * @return PHPExcel_Worksheet_Row
-	 */
-	public function current() {
-		return new PHPExcel_Worksheet_Row($this->_subject, $this->_position);
-	}
-
-	/**
-	 * Return the current iterator key
-	 *
-	 * @return int
-	 */
-	public function key() {
-		return $this->_position;
-	}
-
-	/**
-	 * Set the iterator to its next value
-	 */
-	public function next() {
-		++$this->_position;
-	}
-
-	/**
-	 * Set the iterator to its previous value
-	 */
-	public function prev() {
-        if ($this->_position <= $this->_startRow) {
-            throw new PHPExcel_Exception("Row is already at the beginning of range ({$this->_startRow} - {$this->_endRow})");
-        }
-
-        --$this->_position;
-	}
-
-	/**
-	 * Indicate if more rows exist in the worksheet range of rows that we're iterating
-	 *
-	 * @return boolean
-	 */
-	public function valid() {
-		return $this->_position <= $this->_endRow;
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/SheetView.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/SheetView.php
deleted file mode 100644
index 8ced835ddad..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/SheetView.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_SheetView
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_SheetView
-{
-
-	/* Sheet View types */
-	const SHEETVIEW_NORMAL				= 'normal';
-	const SHEETVIEW_PAGE_LAYOUT			= 'pageLayout';
-	const SHEETVIEW_PAGE_BREAK_PREVIEW	= 'pageBreakPreview';
-
-	private static $_sheetViewTypes = array(
-		self::SHEETVIEW_NORMAL,
-		self::SHEETVIEW_PAGE_LAYOUT,
-		self::SHEETVIEW_PAGE_BREAK_PREVIEW,
-	);
-
-	/**
-	 * ZoomScale
-	 *
-	 * Valid values range from 10 to 400.
-	 *
-	 * @var int
-	 */
-	private $_zoomScale			= 100;
-
-	/**
-	 * ZoomScaleNormal
-	 *
-	 * Valid values range from 10 to 400.
-	 *
-	 * @var int
-	 */
-	private $_zoomScaleNormal	= 100;
-
-	/**
-	 * View
-	 *
-	 * Valid values range from 10 to 400.
-	 *
-	 * @var string
-	 */
-	private $_sheetviewType		= self::SHEETVIEW_NORMAL;
-
-    /**
-     * Create a new PHPExcel_Worksheet_SheetView
-     */
-    public function __construct()
-    {
-    }
-
-	/**
-	 * Get ZoomScale
-	 *
-	 * @return int
-	 */
-	public function getZoomScale() {
-		return $this->_zoomScale;
-	}
-
-	/**
-	 * Set ZoomScale
-	 *
-	 * Valid values range from 10 to 400.
-	 *
-	 * @param 	int 	$pValue
-	 * @throws 	PHPExcel_Exception
-	 * @return PHPExcel_Worksheet_SheetView
-	 */
-	public function setZoomScale($pValue = 100) {
-		// Microsoft Office Excel 2007 only allows setting a scale between 10 and 400 via the user interface,
-		// but it is apparently still able to handle any scale >= 1
-		if (($pValue >= 1) || is_null($pValue)) {
-			$this->_zoomScale = $pValue;
-		} else {
-			throw new PHPExcel_Exception("Scale must be greater than or equal to 1.");
-		}
-		return $this;
-	}
-
-	/**
-	 * Get ZoomScaleNormal
-	 *
-	 * @return int
-	 */
-	public function getZoomScaleNormal() {
-		return $this->_zoomScaleNormal;
-	}
-
-	/**
-	 * Set ZoomScale
-	 *
-	 * Valid values range from 10 to 400.
-	 *
-	 * @param 	int 	$pValue
-	 * @throws 	PHPExcel_Exception
-	 * @return PHPExcel_Worksheet_SheetView
-	 */
-	public function setZoomScaleNormal($pValue = 100) {
-		if (($pValue >= 1) || is_null($pValue)) {
-			$this->_zoomScaleNormal = $pValue;
-		} else {
-			throw new PHPExcel_Exception("Scale must be greater than or equal to 1.");
-		}
-		return $this;
-	}
-
-	/**
-	 * Get View
-	 *
-	 * @return string
-	 */
-	public function getView() {
-		return $this->_sheetviewType;
-	}
-
-	/**
-	 * Set View
-	 *
-	 * Valid values are
-	 *		'normal'			self::SHEETVIEW_NORMAL
-	 *		'pageLayout'		self::SHEETVIEW_PAGE_LAYOUT
-	 *		'pageBreakPreview'	self::SHEETVIEW_PAGE_BREAK_PREVIEW
-	 *
-	 * @param 	string 	$pValue
-	 * @throws 	PHPExcel_Exception
-	 * @return PHPExcel_Worksheet_SheetView
-	 */
-	public function setView($pValue = NULL) {
-		//	MS Excel 2007 allows setting the view to 'normal', 'pageLayout' or 'pageBreakPreview'
-		//		via the user interface
-		if ($pValue === NULL)
-			$pValue = self::SHEETVIEW_NORMAL;
-		if (in_array($pValue, self::$_sheetViewTypes)) {
-			$this->_sheetviewType = $pValue;
-		} else {
-			throw new PHPExcel_Exception("Invalid sheetview layout type.");
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/WorksheetIterator.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/WorksheetIterator.php
deleted file mode 100644
index ad17fd90342..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/WorksheetIterator.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_WorksheetIterator
- *
- * Used to iterate worksheets in PHPExcel
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_WorksheetIterator implements Iterator
-{
-    /**
-     * Spreadsheet to iterate
-     *
-     * @var PHPExcel
-     */
-    private $_subject;
-
-    /**
-     * Current iterator position
-     *
-     * @var int
-     */
-    private $_position = 0;
-
-    /**
-     * Create a new worksheet iterator
-     *
-     * @param PHPExcel         $subject
-     */
-    public function __construct(PHPExcel $subject = null)
-    {
-        // Set subject
-        $this->_subject = $subject;
-    }
-
-    /**
-     * Destructor
-     */
-    public function __destruct()
-    {
-        unset($this->_subject);
-    }
-
-    /**
-     * Rewind iterator
-     */
-    public function rewind()
-    {
-        $this->_position = 0;
-    }
-
-    /**
-     * Current PHPExcel_Worksheet
-     *
-     * @return PHPExcel_Worksheet
-     */
-    public function current()
-    {
-        return $this->_subject->getSheet($this->_position);
-    }
-
-    /**
-     * Current key
-     *
-     * @return int
-     */
-    public function key()
-    {
-        return $this->_position;
-    }
-
-    /**
-     * Next value
-     */
-    public function next()
-    {
-        ++$this->_position;
-    }
-
-    /**
-     * More PHPExcel_Worksheet instances available?
-     *
-     * @return boolean
-     */
-    public function valid()
-    {
-        return $this->_position < $this->_subject->getSheetCount();
-    }
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Abstract.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Abstract.php
deleted file mode 100644
index fca6a60cc80..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Abstract.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Abstract
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-abstract class PHPExcel_Writer_Abstract implements PHPExcel_Writer_IWriter
-{
-	/**
-	 * Write charts that are defined in the workbook?
-	 * Identifies whether the Writer should write definitions for any charts that exist in the PHPExcel object;
-	 *
-	 * @var	boolean
-	 */
-	protected $_includeCharts = FALSE;
-
-	/**
-	 * Pre-calculate formulas
-	 * Forces PHPExcel to recalculate all formulae in a workbook when saving, so that the pre-calculated values are
-	 *    immediately available to MS Excel or other office spreadsheet viewer when opening the file
-	 *
-	 * @var boolean
-	 */
-	protected $_preCalculateFormulas = TRUE;
-
-	/**
-	 * Use disk caching where possible?
-	 *
-	 * @var boolean
-	 */
-	protected $_useDiskCaching = FALSE;
-
-	/**
-	 * Disk caching directory
-	 *
-	 * @var string
-	 */
-	protected $_diskCachingDirectory	= './';
-
-	/**
-	 * Write charts in workbook?
-	 *		If this is true, then the Writer will write definitions for any charts that exist in the PHPExcel object.
-	 *		If false (the default) it will ignore any charts defined in the PHPExcel object.
-	 *
-	 * @return	boolean
-	 */
-	public function getIncludeCharts() {
-		return $this->_includeCharts;
-	}
-
-	/**
-	 * Set write charts in workbook
-	 *		Set to true, to advise the Writer to include any charts that exist in the PHPExcel object.
-	 *		Set to false (the default) to ignore charts.
-	 *
-	 * @param	boolean	$pValue
-	 * @return	PHPExcel_Writer_IWriter
-	 */
-	public function setIncludeCharts($pValue = FALSE) {
-		$this->_includeCharts = (boolean) $pValue;
-		return $this;
-	}
-
-    /**
-     * Get Pre-Calculate Formulas flag
-	 *     If this is true (the default), then the writer will recalculate all formulae in a workbook when saving,
-	 *        so that the pre-calculated values are immediately available to MS Excel or other office spreadsheet
-	 *        viewer when opening the file
-	 *     If false, then formulae are not calculated on save. This is faster for saving in PHPExcel, but slower
-	 *        when opening the resulting file in MS Excel, because Excel has to recalculate the formulae itself
-     *
-     * @return boolean
-     */
-    public function getPreCalculateFormulas() {
-    	return $this->_preCalculateFormulas;
-    }
-
-    /**
-     * Set Pre-Calculate Formulas
-	 *		Set to true (the default) to advise the Writer to calculate all formulae on save
-	 *		Set to false to prevent precalculation of formulae on save.
-     *
-     * @param boolean $pValue	Pre-Calculate Formulas?
-	 * @return	PHPExcel_Writer_IWriter
-     */
-    public function setPreCalculateFormulas($pValue = TRUE) {
-    	$this->_preCalculateFormulas = (boolean) $pValue;
-		return $this;
-    }
-
-	/**
-	 * Get use disk caching where possible?
-	 *
-	 * @return boolean
-	 */
-	public function getUseDiskCaching() {
-		return $this->_useDiskCaching;
-	}
-
-	/**
-	 * Set use disk caching where possible?
-	 *
-	 * @param 	boolean 	$pValue
-	 * @param	string		$pDirectory		Disk caching directory
-	 * @throws	PHPExcel_Writer_Exception	when directory does not exist
-	 * @return PHPExcel_Writer_Excel2007
-	 */
-	public function setUseDiskCaching($pValue = FALSE, $pDirectory = NULL) {
-		$this->_useDiskCaching = $pValue;
-
-		if ($pDirectory !== NULL) {
-    		if (is_dir($pDirectory)) {
-    			$this->_diskCachingDirectory = $pDirectory;
-    		} else {
-    			throw new PHPExcel_Writer_Exception("Directory does not exist: $pDirectory");
-    		}
-		}
-		return $this;
-	}
-
-	/**
-	 * Get disk caching directory
-	 *
-	 * @return string
-	 */
-	public function getDiskCachingDirectory() {
-		return $this->_diskCachingDirectory;
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/CSV.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/CSV.php
deleted file mode 100644
index 97961ccca43..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/CSV.php
+++ /dev/null
@@ -1,310 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Writer_CSV
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_CSV
- *
- * @category   PHPExcel
- * @package	PHPExcel_Writer_CSV
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_CSV extends PHPExcel_Writer_Abstract implements PHPExcel_Writer_IWriter {
-	/**
-	 * PHPExcel object
-	 *
-	 * @var PHPExcel
-	 */
-	private $_phpExcel;
-
-	/**
-	 * Delimiter
-	 *
-	 * @var string
-	 */
-	private $_delimiter	= ',';
-
-	/**
-	 * Enclosure
-	 *
-	 * @var string
-	 */
-	private $_enclosure	= '"';
-
-	/**
-	 * Line ending
-	 *
-	 * @var string
-	 */
-	private $_lineEnding	= PHP_EOL;
-
-	/**
-	 * Sheet index to write
-	 *
-	 * @var int
-	 */
-	private $_sheetIndex	= 0;
-
-	/**
-	 * Whether to write a BOM (for UTF8).
-	 *
-	 * @var boolean
-	 */
-	private $_useBOM = false;
-
-	/**
-	 * Whether to write a fully Excel compatible CSV file.
-	 *
-	 * @var boolean
-	 */
-	private $_excelCompatibility = false;
-
-	/**
-	 * Create a new PHPExcel_Writer_CSV
-	 *
-	 * @param	PHPExcel	$phpExcel	PHPExcel object
-	 */
-	public function __construct(PHPExcel $phpExcel) {
-		$this->_phpExcel	= $phpExcel;
-	}
-
-	/**
-	 * Save PHPExcel to file
-	 *
-	 * @param	string		$pFilename
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	public function save($pFilename = null) {
-		// Fetch sheet
-		$sheet = $this->_phpExcel->getSheet($this->_sheetIndex);
-
-		$saveDebugLog = PHPExcel_Calculation::getInstance($this->_phpExcel)->getDebugLog()->getWriteDebugLog();
-		PHPExcel_Calculation::getInstance($this->_phpExcel)->getDebugLog()->setWriteDebugLog(FALSE);
-		$saveArrayReturnType = PHPExcel_Calculation::getArrayReturnType();
-		PHPExcel_Calculation::setArrayReturnType(PHPExcel_Calculation::RETURN_ARRAY_AS_VALUE);
-
-		// Open file
-		$fileHandle = fopen($pFilename, 'wb+');
-		if ($fileHandle === false) {
-			throw new PHPExcel_Writer_Exception("Could not open file $pFilename for writing.");
-		}
-
-		if ($this->_excelCompatibility) {
-			fwrite($fileHandle, "\xEF\xBB\xBF");	//	Enforce UTF-8 BOM Header
-			$this->setEnclosure('"');				//	Set enclosure to "
-			$this->setDelimiter(";");			    //	Set delimiter to a semi-colon
-            $this->setLineEnding("\r\n");
-			fwrite($fileHandle, 'sep=' . $this->getDelimiter() . $this->_lineEnding);
-		} elseif ($this->_useBOM) {
-			// Write the UTF-8 BOM code if required
-			fwrite($fileHandle, "\xEF\xBB\xBF");
-		}
-
-		//	Identify the range that we need to extract from the worksheet
-		$maxCol = $sheet->getHighestDataColumn();
-		$maxRow = $sheet->getHighestDataRow();
-
-		// Write rows to file
-		for($row = 1; $row <= $maxRow; ++$row) {
-			// Convert the row to an array...
-			$cellsArray = $sheet->rangeToArray('A'.$row.':'.$maxCol.$row,'', $this->_preCalculateFormulas);
-			// ... and write to the file
-			$this->_writeLine($fileHandle, $cellsArray[0]);
-		}
-
-		// Close file
-		fclose($fileHandle);
-
-		PHPExcel_Calculation::setArrayReturnType($saveArrayReturnType);
-		PHPExcel_Calculation::getInstance($this->_phpExcel)->getDebugLog()->setWriteDebugLog($saveDebugLog);
-	}
-
-	/**
-	 * Get delimiter
-	 *
-	 * @return string
-	 */
-	public function getDelimiter() {
-		return $this->_delimiter;
-	}
-
-	/**
-	 * Set delimiter
-	 *
-	 * @param	string	$pValue		Delimiter, defaults to ,
-	 * @return PHPExcel_Writer_CSV
-	 */
-	public function setDelimiter($pValue = ',') {
-		$this->_delimiter = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get enclosure
-	 *
-	 * @return string
-	 */
-	public function getEnclosure() {
-		return $this->_enclosure;
-	}
-
-	/**
-	 * Set enclosure
-	 *
-	 * @param	string	$pValue		Enclosure, defaults to "
-	 * @return PHPExcel_Writer_CSV
-	 */
-	public function setEnclosure($pValue = '"') {
-		if ($pValue == '') {
-			$pValue = null;
-		}
-		$this->_enclosure = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get line ending
-	 *
-	 * @return string
-	 */
-	public function getLineEnding() {
-		return $this->_lineEnding;
-	}
-
-	/**
-	 * Set line ending
-	 *
-	 * @param	string	$pValue		Line ending, defaults to OS line ending (PHP_EOL)
-	 * @return PHPExcel_Writer_CSV
-	 */
-	public function setLineEnding($pValue = PHP_EOL) {
-		$this->_lineEnding = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get whether BOM should be used
-	 *
-	 * @return boolean
-	 */
-	public function getUseBOM() {
-		return $this->_useBOM;
-	}
-
-	/**
-	 * Set whether BOM should be used
-	 *
-	 * @param	boolean	$pValue		Use UTF-8 byte-order mark? Defaults to false
-	 * @return PHPExcel_Writer_CSV
-	 */
-	public function setUseBOM($pValue = false) {
-		$this->_useBOM = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get whether the file should be saved with full Excel Compatibility
-	 *
-	 * @return boolean
-	 */
-	public function getExcelCompatibility() {
-		return $this->_excelCompatibility;
-	}
-
-	/**
-	 * Set whether the file should be saved with full Excel Compatibility
-	 *
-	 * @param	boolean	$pValue		Set the file to be written as a fully Excel compatible csv file
-	 *								Note that this overrides other settings such as useBOM, enclosure and delimiter
-	 * @return PHPExcel_Writer_CSV
-	 */
-	public function setExcelCompatibility($pValue = false) {
-		$this->_excelCompatibility = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get sheet index
-	 *
-	 * @return int
-	 */
-	public function getSheetIndex() {
-		return $this->_sheetIndex;
-	}
-
-	/**
-	 * Set sheet index
-	 *
-	 * @param	int		$pValue		Sheet index
-	 * @return PHPExcel_Writer_CSV
-	 */
-	public function setSheetIndex($pValue = 0) {
-		$this->_sheetIndex = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Write line to CSV file
-	 *
-	 * @param	mixed	$pFileHandle	PHP filehandle
-	 * @param	array	$pValues		Array containing values in a row
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _writeLine($pFileHandle = null, $pValues = null) {
-		if (is_array($pValues)) {
-			// No leading delimiter
-			$writeDelimiter = false;
-
-			// Build the line
-			$line = '';
-
-			foreach ($pValues as $element) {
-				// Escape enclosures
-				$element = str_replace($this->_enclosure, $this->_enclosure . $this->_enclosure, $element);
-
-				// Add delimiter
-				if ($writeDelimiter) {
-					$line .= $this->_delimiter;
-				} else {
-					$writeDelimiter = true;
-				}
-
-				// Add enclosed string
-				$line .= $this->_enclosure . $element . $this->_enclosure;
-			}
-
-			// Add line ending
-			$line .= $this->_lineEnding;
-
-			// Write to file
-            fwrite($pFileHandle, $line);
-		} else {
-			throw new PHPExcel_Writer_Exception("Invalid data row passed to CSV writer.");
-		}
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007.php
deleted file mode 100644
index 4cf14ac1c4b..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007.php
+++ /dev/null
@@ -1,532 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel2007
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel2007 extends PHPExcel_Writer_Abstract implements PHPExcel_Writer_IWriter
-{
-	/**
-	 * Pre-calculate formulas
-	 * Forces PHPExcel to recalculate all formulae in a workbook when saving, so that the pre-calculated values are
-	 *    immediately available to MS Excel or other office spreadsheet viewer when opening the file
-	 *
-     * Overrides the default TRUE for this specific writer for performance reasons
-     *
-	 * @var boolean
-	 */
-	protected $_preCalculateFormulas = FALSE;
-
-	/**
-	 * Office2003 compatibility
-	 *
-	 * @var boolean
-	 */
-	private $_office2003compatibility = false;
-
-	/**
-	 * Private writer parts
-	 *
-	 * @var PHPExcel_Writer_Excel2007_WriterPart[]
-	 */
-	private $_writerParts	= array();
-
-	/**
-	 * Private PHPExcel
-	 *
-	 * @var PHPExcel
-	 */
-	private $_spreadSheet;
-
-	/**
-	 * Private string table
-	 *
-	 * @var string[]
-	 */
-	private $_stringTable	= array();
-
-	/**
-	 * Private unique PHPExcel_Style_Conditional HashTable
-	 *
-	 * @var PHPExcel_HashTable
-	 */
-	private $_stylesConditionalHashTable;
-
-	/**
-	 * Private unique PHPExcel_Style HashTable
-	 *
-	 * @var PHPExcel_HashTable
-	 */
-	private $_styleHashTable;
-
-	/**
-	 * Private unique PHPExcel_Style_Fill HashTable
-	 *
-	 * @var PHPExcel_HashTable
-	 */
-	private $_fillHashTable;
-
-	/**
-	 * Private unique PHPExcel_Style_Font HashTable
-	 *
-	 * @var PHPExcel_HashTable
-	 */
-	private $_fontHashTable;
-
-	/**
-	 * Private unique PHPExcel_Style_Borders HashTable
-	 *
-	 * @var PHPExcel_HashTable
-	 */
-	private $_bordersHashTable ;
-
-	/**
-	 * Private unique PHPExcel_Style_NumberFormat HashTable
-	 *
-	 * @var PHPExcel_HashTable
-	 */
-	private $_numFmtHashTable;
-
-	/**
-	 * Private unique PHPExcel_Worksheet_BaseDrawing HashTable
-	 *
-	 * @var PHPExcel_HashTable
-	 */
-	private $_drawingHashTable;
-
-    /**
-     * Create a new PHPExcel_Writer_Excel2007
-     *
-	 * @param 	PHPExcel	$pPHPExcel
-     */
-    public function __construct(PHPExcel $pPHPExcel = null)
-    {
-    	// Assign PHPExcel
-		$this->setPHPExcel($pPHPExcel);
-
-    	$writerPartsArray = array(	'stringtable'	=> 'PHPExcel_Writer_Excel2007_StringTable',
-									'contenttypes'	=> 'PHPExcel_Writer_Excel2007_ContentTypes',
-									'docprops' 		=> 'PHPExcel_Writer_Excel2007_DocProps',
-									'rels'			=> 'PHPExcel_Writer_Excel2007_Rels',
-									'theme' 		=> 'PHPExcel_Writer_Excel2007_Theme',
-									'style' 		=> 'PHPExcel_Writer_Excel2007_Style',
-									'workbook' 		=> 'PHPExcel_Writer_Excel2007_Workbook',
-									'worksheet' 	=> 'PHPExcel_Writer_Excel2007_Worksheet',
-									'drawing' 		=> 'PHPExcel_Writer_Excel2007_Drawing',
-									'comments' 		=> 'PHPExcel_Writer_Excel2007_Comments',
-									'chart'			=> 'PHPExcel_Writer_Excel2007_Chart',
-									'relsvba'		=> 'PHPExcel_Writer_Excel2007_RelsVBA',
-									'relsribbonobjects' => 'PHPExcel_Writer_Excel2007_RelsRibbon'
-								 );
-
-    	//	Initialise writer parts
-		//		and Assign their parent IWriters
-		foreach ($writerPartsArray as $writer => $class) {
-			$this->_writerParts[$writer] = new $class($this);
-		}
-
-    	$hashTablesArray = array( '_stylesConditionalHashTable',	'_fillHashTable',		'_fontHashTable',
-								  '_bordersHashTable',				'_numFmtHashTable',		'_drawingHashTable',
-                                  '_styleHashTable'
-							    );
-
-		// Set HashTable variables
-		foreach ($hashTablesArray as $tableName) {
-			$this->$tableName 	= new PHPExcel_HashTable();
-		}
-    }
-
-	/**
-	 * Get writer part
-	 *
-	 * @param 	string 	$pPartName		Writer part name
-	 * @return 	PHPExcel_Writer_Excel2007_WriterPart
-	 */
-	public function getWriterPart($pPartName = '') {
-		if ($pPartName != '' && isset($this->_writerParts[strtolower($pPartName)])) {
-			return $this->_writerParts[strtolower($pPartName)];
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Save PHPExcel to file
-	 *
-	 * @param 	string 		$pFilename
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function save($pFilename = null)
-	{
-		if ($this->_spreadSheet !== NULL) {
-			// garbage collect
-			$this->_spreadSheet->garbageCollect();
-
-			// If $pFilename is php://output or php://stdout, make it a temporary file...
-			$originalFilename = $pFilename;
-			if (strtolower($pFilename) == 'php://output' || strtolower($pFilename) == 'php://stdout') {
-				$pFilename = @tempnam(PHPExcel_Shared_File::sys_get_temp_dir(), 'phpxltmp');
-				if ($pFilename == '') {
-					$pFilename = $originalFilename;
-				}
-			}
-
-			$saveDebugLog = PHPExcel_Calculation::getInstance($this->_spreadSheet)->getDebugLog()->getWriteDebugLog();
-			PHPExcel_Calculation::getInstance($this->_spreadSheet)->getDebugLog()->setWriteDebugLog(FALSE);
-			$saveDateReturnType = PHPExcel_Calculation_Functions::getReturnDateType();
-			PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_EXCEL);
-
-			// Create string lookup table
-			$this->_stringTable = array();
-			for ($i = 0; $i < $this->_spreadSheet->getSheetCount(); ++$i) {
-				$this->_stringTable = $this->getWriterPart('StringTable')->createStringTable($this->_spreadSheet->getSheet($i), $this->_stringTable);
-			}
-
-			// Create styles dictionaries
-			$this->_styleHashTable->addFromSource( 	            $this->getWriterPart('Style')->allStyles($this->_spreadSheet) 			);
-			$this->_stylesConditionalHashTable->addFromSource( 	$this->getWriterPart('Style')->allConditionalStyles($this->_spreadSheet) 			);
-			$this->_fillHashTable->addFromSource( 				$this->getWriterPart('Style')->allFills($this->_spreadSheet) 			);
-			$this->_fontHashTable->addFromSource( 				$this->getWriterPart('Style')->allFonts($this->_spreadSheet) 			);
-			$this->_bordersHashTable->addFromSource( 			$this->getWriterPart('Style')->allBorders($this->_spreadSheet) 			);
-			$this->_numFmtHashTable->addFromSource( 			$this->getWriterPart('Style')->allNumberFormats($this->_spreadSheet) 	);
-
-			// Create drawing dictionary
-			$this->_drawingHashTable->addFromSource( 			$this->getWriterPart('Drawing')->allDrawings($this->_spreadSheet) 		);
-
-			// Create new ZIP file and open it for writing
-			$zipClass = PHPExcel_Settings::getZipClass();
-			$objZip = new $zipClass();
-
-			//	Retrieve OVERWRITE and CREATE constants from the instantiated zip class
-			//	This method of accessing constant values from a dynamic class should work with all appropriate versions of PHP
-			$ro = new ReflectionObject($objZip);
-			$zipOverWrite = $ro->getConstant('OVERWRITE');
-			$zipCreate = $ro->getConstant('CREATE');
-
-			if (file_exists($pFilename)) {
-				unlink($pFilename);
-			}
-			// Try opening the ZIP file
-			if ($objZip->open($pFilename, $zipOverWrite) !== true) {
-				if ($objZip->open($pFilename, $zipCreate) !== true) {
-					throw new PHPExcel_Writer_Exception("Could not open " . $pFilename . " for writing.");
-				}
-			}
-
-			// Add [Content_Types].xml to ZIP file
-			$objZip->addFromString('[Content_Types].xml', 			$this->getWriterPart('ContentTypes')->writeContentTypes($this->_spreadSheet, $this->_includeCharts));
-
-			//if hasMacros, add the vbaProject.bin file, Certificate file(if exists)
-			if($this->_spreadSheet->hasMacros()){
-				$macrosCode=$this->_spreadSheet->getMacrosCode();
-				if(!is_null($macrosCode)){// we have the code ?
-					$objZip->addFromString('xl/vbaProject.bin', $macrosCode);//allways in 'xl', allways named vbaProject.bin
-					if($this->_spreadSheet->hasMacrosCertificate()){//signed macros ?
-						// Yes : add the certificate file and the related rels file
-						$objZip->addFromString('xl/vbaProjectSignature.bin', $this->_spreadSheet->getMacrosCertificate());
-						$objZip->addFromString('xl/_rels/vbaProject.bin.rels',
-							$this->getWriterPart('RelsVBA')->writeVBARelationships($this->_spreadSheet));
-					}
-				}
-			}
-			//a custom UI in this workbook ? add it ("base" xml and additional objects (pictures) and rels)
-			if($this->_spreadSheet->hasRibbon()){
-				$tmpRibbonTarget=$this->_spreadSheet->getRibbonXMLData('target');
-				$objZip->addFromString($tmpRibbonTarget, $this->_spreadSheet->getRibbonXMLData('data'));
-				if($this->_spreadSheet->hasRibbonBinObjects()){
-					$tmpRootPath=dirname($tmpRibbonTarget).'/';
-					$ribbonBinObjects=$this->_spreadSheet->getRibbonBinObjects('data');//the files to write
-					foreach($ribbonBinObjects as $aPath=>$aContent){
-						$objZip->addFromString($tmpRootPath.$aPath, $aContent);
-					}
-					//the rels for files
-					$objZip->addFromString($tmpRootPath.'_rels/'.basename($tmpRibbonTarget).'.rels',
-						$this->getWriterPart('RelsRibbonObjects')->writeRibbonRelationships($this->_spreadSheet));
-				}
-			}
-			
-			// Add relationships to ZIP file
-			$objZip->addFromString('_rels/.rels', 					$this->getWriterPart('Rels')->writeRelationships($this->_spreadSheet));
-			$objZip->addFromString('xl/_rels/workbook.xml.rels', 	$this->getWriterPart('Rels')->writeWorkbookRelationships($this->_spreadSheet));
-
-			// Add document properties to ZIP file
-			$objZip->addFromString('docProps/app.xml', 				$this->getWriterPart('DocProps')->writeDocPropsApp($this->_spreadSheet));
-			$objZip->addFromString('docProps/core.xml', 			$this->getWriterPart('DocProps')->writeDocPropsCore($this->_spreadSheet));
-			$customPropertiesPart = $this->getWriterPart('DocProps')->writeDocPropsCustom($this->_spreadSheet);
-			if ($customPropertiesPart !== NULL) {
-				$objZip->addFromString('docProps/custom.xml', 		$customPropertiesPart);
-			}
-
-			// Add theme to ZIP file
-			$objZip->addFromString('xl/theme/theme1.xml', 			$this->getWriterPart('Theme')->writeTheme($this->_spreadSheet));
-
-			// Add string table to ZIP file
-			$objZip->addFromString('xl/sharedStrings.xml', 			$this->getWriterPart('StringTable')->writeStringTable($this->_stringTable));
-
-			// Add styles to ZIP file
-			$objZip->addFromString('xl/styles.xml', 				$this->getWriterPart('Style')->writeStyles($this->_spreadSheet));
-
-			// Add workbook to ZIP file
-			$objZip->addFromString('xl/workbook.xml', 				$this->getWriterPart('Workbook')->writeWorkbook($this->_spreadSheet, $this->_preCalculateFormulas));
-
-			$chartCount = 0;
-			// Add worksheets
-			for ($i = 0; $i < $this->_spreadSheet->getSheetCount(); ++$i) {
-				$objZip->addFromString('xl/worksheets/sheet' . ($i + 1) . '.xml', $this->getWriterPart('Worksheet')->writeWorksheet($this->_spreadSheet->getSheet($i), $this->_stringTable, $this->_includeCharts));
-				if ($this->_includeCharts) {
-					$charts = $this->_spreadSheet->getSheet($i)->getChartCollection();
-					if (count($charts) > 0) {
-						foreach($charts as $chart) {
-							$objZip->addFromString('xl/charts/chart' . ($chartCount + 1) . '.xml', $this->getWriterPart('Chart')->writeChart($chart));
-							$chartCount++;
-						}
-					}
-				}
-			}
-
-			$chartRef1 = $chartRef2 = 0;
-			// Add worksheet relationships (drawings, ...)
-			for ($i = 0; $i < $this->_spreadSheet->getSheetCount(); ++$i) {
-
-				// Add relationships
-				$objZip->addFromString('xl/worksheets/_rels/sheet' . ($i + 1) . '.xml.rels', 	$this->getWriterPart('Rels')->writeWorksheetRelationships($this->_spreadSheet->getSheet($i), ($i + 1), $this->_includeCharts));
-
-				$drawings = $this->_spreadSheet->getSheet($i)->getDrawingCollection();
-				$drawingCount = count($drawings);
-				if ($this->_includeCharts) {
-					$chartCount = $this->_spreadSheet->getSheet($i)->getChartCount();
-				}
-
-				// Add drawing and image relationship parts
-				if (($drawingCount > 0) || ($chartCount > 0)) {
-					// Drawing relationships
-					$objZip->addFromString('xl/drawings/_rels/drawing' . ($i + 1) . '.xml.rels', $this->getWriterPart('Rels')->writeDrawingRelationships($this->_spreadSheet->getSheet($i),$chartRef1, $this->_includeCharts));
-
-					// Drawings
-					$objZip->addFromString('xl/drawings/drawing' . ($i + 1) . '.xml', $this->getWriterPart('Drawing')->writeDrawings($this->_spreadSheet->getSheet($i),$chartRef2,$this->_includeCharts));
-				}
-
-				// Add comment relationship parts
-				if (count($this->_spreadSheet->getSheet($i)->getComments()) > 0) {
-					// VML Comments
-					$objZip->addFromString('xl/drawings/vmlDrawing' . ($i + 1) . '.vml', $this->getWriterPart('Comments')->writeVMLComments($this->_spreadSheet->getSheet($i)));
-
-					// Comments
-					$objZip->addFromString('xl/comments' . ($i + 1) . '.xml', $this->getWriterPart('Comments')->writeComments($this->_spreadSheet->getSheet($i)));
-				}
-
-				// Add header/footer relationship parts
-				if (count($this->_spreadSheet->getSheet($i)->getHeaderFooter()->getImages()) > 0) {
-					// VML Drawings
-					$objZip->addFromString('xl/drawings/vmlDrawingHF' . ($i + 1) . '.vml', $this->getWriterPart('Drawing')->writeVMLHeaderFooterImages($this->_spreadSheet->getSheet($i)));
-
-					// VML Drawing relationships
-					$objZip->addFromString('xl/drawings/_rels/vmlDrawingHF' . ($i + 1) . '.vml.rels', $this->getWriterPart('Rels')->writeHeaderFooterDrawingRelationships($this->_spreadSheet->getSheet($i)));
-
-					// Media
-					foreach ($this->_spreadSheet->getSheet($i)->getHeaderFooter()->getImages() as $image) {
-						$objZip->addFromString('xl/media/' . $image->getIndexedFilename(), file_get_contents($image->getPath()));
-					}
-				}
-			}
-
-			// Add media
-			for ($i = 0; $i < $this->getDrawingHashTable()->count(); ++$i) {
-				if ($this->getDrawingHashTable()->getByIndex($i) instanceof PHPExcel_Worksheet_Drawing) {
-					$imageContents = null;
-					$imagePath = $this->getDrawingHashTable()->getByIndex($i)->getPath();
-					if (strpos($imagePath, 'zip://') !== false) {
-						$imagePath = substr($imagePath, 6);
-						$imagePathSplitted = explode('#', $imagePath);
-
-						$imageZip = new ZipArchive();
-						$imageZip->open($imagePathSplitted[0]);
-						$imageContents = $imageZip->getFromName($imagePathSplitted[1]);
-						$imageZip->close();
-						unset($imageZip);
-					} else {
-						$imageContents = file_get_contents($imagePath);
-					}
-
-					$objZip->addFromString('xl/media/' . str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()), $imageContents);
-				} else if ($this->getDrawingHashTable()->getByIndex($i) instanceof PHPExcel_Worksheet_MemoryDrawing) {
-					ob_start();
-					call_user_func(
-						$this->getDrawingHashTable()->getByIndex($i)->getRenderingFunction(),
-						$this->getDrawingHashTable()->getByIndex($i)->getImageResource()
-					);
-					$imageContents = ob_get_contents();
-					ob_end_clean();
-
-					$objZip->addFromString('xl/media/' . str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()), $imageContents);
-				}
-			}
-
-			PHPExcel_Calculation_Functions::setReturnDateType($saveDateReturnType);
-			PHPExcel_Calculation::getInstance($this->_spreadSheet)->getDebugLog()->setWriteDebugLog($saveDebugLog);
-
-			// Close file
-			if ($objZip->close() === false) {
-				throw new PHPExcel_Writer_Exception("Could not close zip file $pFilename.");
-			}
-
-			// If a temporary file was used, copy it to the correct file stream
-			if ($originalFilename != $pFilename) {
-				if (copy($pFilename, $originalFilename) === false) {
-					throw new PHPExcel_Writer_Exception("Could not copy temporary zip file $pFilename to $originalFilename.");
-				}
-				@unlink($pFilename);
-			}
-		} else {
-			throw new PHPExcel_Writer_Exception("PHPExcel object unassigned.");
-		}
-	}
-
-	/**
-	 * Get PHPExcel object
-	 *
-	 * @return PHPExcel
-	 * @throws PHPExcel_Writer_Exception
-	 */
-	public function getPHPExcel() {
-		if ($this->_spreadSheet !== null) {
-			return $this->_spreadSheet;
-		} else {
-			throw new PHPExcel_Writer_Exception("No PHPExcel assigned.");
-		}
-	}
-
-	/**
-	 * Set PHPExcel object
-	 *
-	 * @param 	PHPExcel 	$pPHPExcel	PHPExcel object
-	 * @throws	PHPExcel_Writer_Exception
-	 * @return PHPExcel_Writer_Excel2007
-	 */
-	public function setPHPExcel(PHPExcel $pPHPExcel = null) {
-		$this->_spreadSheet = $pPHPExcel;
-		return $this;
-	}
-
-    /**
-     * Get string table
-     *
-     * @return string[]
-     */
-    public function getStringTable() {
-    	return $this->_stringTable;
-    }
-
-    /**
-     * Get PHPExcel_Style HashTable
-     *
-     * @return PHPExcel_HashTable
-     */
-    public function getStyleHashTable() {
-    	return $this->_styleHashTable;
-    }
-
-    /**
-     * Get PHPExcel_Style_Conditional HashTable
-     *
-     * @return PHPExcel_HashTable
-     */
-    public function getStylesConditionalHashTable() {
-    	return $this->_stylesConditionalHashTable;
-    }
-
-    /**
-     * Get PHPExcel_Style_Fill HashTable
-     *
-     * @return PHPExcel_HashTable
-     */
-    public function getFillHashTable() {
-    	return $this->_fillHashTable;
-    }
-
-    /**
-     * Get PHPExcel_Style_Font HashTable
-     *
-     * @return PHPExcel_HashTable
-     */
-    public function getFontHashTable() {
-    	return $this->_fontHashTable;
-    }
-
-    /**
-     * Get PHPExcel_Style_Borders HashTable
-     *
-     * @return PHPExcel_HashTable
-     */
-    public function getBordersHashTable() {
-    	return $this->_bordersHashTable;
-    }
-
-    /**
-     * Get PHPExcel_Style_NumberFormat HashTable
-     *
-     * @return PHPExcel_HashTable
-     */
-    public function getNumFmtHashTable() {
-    	return $this->_numFmtHashTable;
-    }
-
-    /**
-     * Get PHPExcel_Worksheet_BaseDrawing HashTable
-     *
-     * @return PHPExcel_HashTable
-     */
-    public function getDrawingHashTable() {
-    	return $this->_drawingHashTable;
-    }
-
-    /**
-     * Get Office2003 compatibility
-     *
-     * @return boolean
-     */
-    public function getOffice2003Compatibility() {
-    	return $this->_office2003compatibility;
-    }
-
-    /**
-     * Set Office2003 compatibility
-     *
-     * @param boolean $pValue	Office2003 compatibility?
-     * @return PHPExcel_Writer_Excel2007
-     */
-    public function setOffice2003Compatibility($pValue = false) {
-    	$this->_office2003compatibility = $pValue;
-    	return $this;
-    }
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Chart.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Chart.php
deleted file mode 100644
index 4846910fa29..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Chart.php
+++ /dev/null
@@ -1,1606 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Writer_Excel2007_Chart
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel2007_Chart extends
-  PHPExcel_Writer_Excel2007_WriterPart {
-
-  /**
-   * Write charts to XML format
-   *
-   * @param  PHPExcel_Chart $pChart
-   *
-   * @return  string            XML Output
-   * @throws  PHPExcel_Writer_Exception
-   */
-  public function writeChart(PHPExcel_Chart $pChart = NULL) {
-    // Create XML writer
-    $objWriter = NULL;
-    if ($this->getParentWriter()
-        ->getUseDiskCaching()
-    ) {
-      $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()
-          ->getDiskCachingDirectory());
-    } else {
-      $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-    }
-    //	Ensure that data series values are up-to-date before we save
-    $pChart->refresh();
-
-    // XML header
-    $objWriter->startDocument('1.0', 'UTF-8', 'yes');
-
-    // c:chartSpace
-    $objWriter->startElement('c:chartSpace');
-    $objWriter->writeAttribute('xmlns:c', 'http://schemas.openxmlformats.org/drawingml/2006/chart');
-    $objWriter->writeAttribute('xmlns:a', 'http://schemas.openxmlformats.org/drawingml/2006/main');
-    $objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
-
-    $objWriter->startElement('c:date1904');
-    $objWriter->writeAttribute('val', 0);
-    $objWriter->endElement();
-    $objWriter->startElement('c:lang');
-    $objWriter->writeAttribute('val', "en-GB");
-    $objWriter->endElement();
-    $objWriter->startElement('c:roundedCorners');
-    $objWriter->writeAttribute('val', 0);
-    $objWriter->endElement();
-
-    $this->_writeAlternateContent($objWriter);
-
-    $objWriter->startElement('c:chart');
-
-    $this->_writeTitle($pChart->getTitle(), $objWriter);
-
-    $objWriter->startElement('c:autoTitleDeleted');
-    $objWriter->writeAttribute('val', 0);
-    $objWriter->endElement();
-
-    $this->_writePlotArea(
-        $pChart->getPlotArea(),
-        $pChart->getXAxisLabel(),
-        $pChart->getYAxisLabel(),
-        $objWriter,
-        $pChart->getWorksheet(),
-        $pChart->getChartAxisX(),
-        $pChart->getChartAxisY(),
-        $pChart->getMajorGridlines(),
-        $pChart->getMinorGridlines()
-    );
-
-    $this->_writeLegend($pChart->getLegend(), $objWriter);
-
-    $objWriter->startElement('c:plotVisOnly');
-    $objWriter->writeAttribute('val', 1);
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:dispBlanksAs');
-    $objWriter->writeAttribute('val', "gap");
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:showDLblsOverMax');
-    $objWriter->writeAttribute('val', 0);
-    $objWriter->endElement();
-
-    $objWriter->endElement();
-
-    $this->_writePrintSettings($objWriter);
-
-    $objWriter->endElement();
-
-    // Return
-    return $objWriter->getData();
-  }
-
-  /**
-   * Write Chart Title
-   *
-   * @param  PHPExcel_Chart_Title $title
-   * @param  PHPExcel_Shared_XMLWriter $objWriter XML Writer
-   *
-   * @throws  PHPExcel_Writer_Exception
-   */
-  private function _writeTitle(PHPExcel_Chart_Title $title = NULL, $objWriter) {
-    if (is_null($title)) {
-      return;
-    }
-
-    $objWriter->startElement('c:title');
-    $objWriter->startElement('c:tx');
-    $objWriter->startElement('c:rich');
-
-    $objWriter->startElement('a:bodyPr');
-    $objWriter->endElement();
-
-    $objWriter->startElement('a:lstStyle');
-    $objWriter->endElement();
-
-    $objWriter->startElement('a:p');
-
-    $caption = $title->getCaption();
-    if ((is_array($caption)) && (count($caption) > 0)) {
-      $caption = $caption[0];
-    }
-    $this->getParentWriter()
-        ->getWriterPart('stringtable')
-        ->writeRichTextForCharts($objWriter, $caption, 'a');
-
-    $objWriter->endElement();
-    $objWriter->endElement();
-    $objWriter->endElement();
-
-    $layout = $title->getLayout();
-    $this->_writeLayout($layout, $objWriter);
-
-    $objWriter->startElement('c:overlay');
-    $objWriter->writeAttribute('val', 0);
-    $objWriter->endElement();
-
-    $objWriter->endElement();
-  }
-
-  /**
-   * Write Chart Legend
-   *
-   * @param  PHPExcel_Chart_Legend $legend
-   * @param  PHPExcel_Shared_XMLWriter $objWriter XML Writer
-   *
-   * @throws  PHPExcel_Writer_Exception
-   */
-  private function _writeLegend(PHPExcel_Chart_Legend $legend = NULL, $objWriter) {
-    if (is_null($legend)) {
-      return;
-    }
-
-    $objWriter->startElement('c:legend');
-
-    $objWriter->startElement('c:legendPos');
-    $objWriter->writeAttribute('val', $legend->getPosition());
-    $objWriter->endElement();
-
-    $layout = $legend->getLayout();
-    $this->_writeLayout($layout, $objWriter);
-
-    $objWriter->startElement('c:overlay');
-    $objWriter->writeAttribute('val', ($legend->getOverlay()) ? '1' : '0');
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:txPr');
-    $objWriter->startElement('a:bodyPr');
-    $objWriter->endElement();
-
-    $objWriter->startElement('a:lstStyle');
-    $objWriter->endElement();
-
-    $objWriter->startElement('a:p');
-    $objWriter->startElement('a:pPr');
-    $objWriter->writeAttribute('rtl', 0);
-
-    $objWriter->startElement('a:defRPr');
-    $objWriter->endElement();
-    $objWriter->endElement();
-
-    $objWriter->startElement('a:endParaRPr');
-    $objWriter->writeAttribute('lang', "en-US");
-    $objWriter->endElement();
-
-    $objWriter->endElement();
-    $objWriter->endElement();
-
-    $objWriter->endElement();
-  }
-
-  /**
-   * Write Chart Plot Area
-   *
-   * @param  PHPExcel_Chart_PlotArea $plotArea
-   * @param  PHPExcel_Chart_Title $xAxisLabel
-   * @param  PHPExcel_Chart_Title $yAxisLabel
-   * @param  PHPExcel_Chart_Axis $xAxis
-   * @param  PHPExcel_Chart_Axis $yAxis
-   * @param  PHPExcel_Shared_XMLWriter $objWriter XML Writer
-   *
-   * @throws  PHPExcel_Writer_Exception
-   */
-  private function _writePlotArea(PHPExcel_Chart_PlotArea $plotArea,
-      PHPExcel_Chart_Title $xAxisLabel = NULL,
-      PHPExcel_Chart_Title $yAxisLabel = NULL,
-      $objWriter,
-      PHPExcel_Worksheet $pSheet,
-      PHPExcel_Chart_Axis $xAxis,
-      PHPExcel_Chart_Axis $yAxis,
-      PHPExcel_Chart_GridLines $majorGridlines,
-      PHPExcel_Chart_GridLines $minorGridlines
-  ) {
-    if (is_null($plotArea)) {
-      return;
-    }
-
-    $id1 = $id2 = 0;
-    $this->_seriesIndex = 0;
-    $objWriter->startElement('c:plotArea');
-
-    $layout = $plotArea->getLayout();
-
-    $this->_writeLayout($layout, $objWriter);
-
-    $chartTypes = self::_getChartType($plotArea);
-    $catIsMultiLevelSeries = $valIsMultiLevelSeries = FALSE;
-    $plotGroupingType = '';
-    foreach ($chartTypes as $chartType) {
-      $objWriter->startElement('c:' . $chartType);
-
-      $groupCount = $plotArea->getPlotGroupCount();
-      for ($i = 0; $i < $groupCount; ++$i) {
-        $plotGroup = $plotArea->getPlotGroupByIndex($i);
-        $groupType = $plotGroup->getPlotType();
-        if ($groupType == $chartType) {
-
-          $plotStyle = $plotGroup->getPlotStyle();
-          if ($groupType === PHPExcel_Chart_DataSeries::TYPE_RADARCHART) {
-            $objWriter->startElement('c:radarStyle');
-            $objWriter->writeAttribute('val', $plotStyle);
-            $objWriter->endElement();
-          } elseif ($groupType === PHPExcel_Chart_DataSeries::TYPE_SCATTERCHART) {
-            $objWriter->startElement('c:scatterStyle');
-            $objWriter->writeAttribute('val', $plotStyle);
-            $objWriter->endElement();
-          }
-
-          $this->_writePlotGroup($plotGroup, $chartType, $objWriter, $catIsMultiLevelSeries, $valIsMultiLevelSeries, $plotGroupingType, $pSheet);
-        }
-      }
-
-      $this->_writeDataLbls($objWriter, $layout);
-
-      if ($chartType === PHPExcel_Chart_DataSeries::TYPE_LINECHART) {
-        //	Line only, Line3D can't be smoothed
-
-        $objWriter->startElement('c:smooth');
-        $objWriter->writeAttribute('val', (integer) $plotGroup->getSmoothLine());
-        $objWriter->endElement();
-      } elseif (($chartType === PHPExcel_Chart_DataSeries::TYPE_BARCHART) ||
-          ($chartType === PHPExcel_Chart_DataSeries::TYPE_BARCHART_3D)
-      ) {
-
-        $objWriter->startElement('c:gapWidth');
-        $objWriter->writeAttribute('val', 150);
-        $objWriter->endElement();
-
-        if ($plotGroupingType == 'percentStacked' ||
-            $plotGroupingType == 'stacked'
-        ) {
-
-          $objWriter->startElement('c:overlap');
-          $objWriter->writeAttribute('val', 100);
-          $objWriter->endElement();
-        }
-      } elseif ($chartType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
-
-        $objWriter->startElement('c:bubbleScale');
-        $objWriter->writeAttribute('val', 25);
-        $objWriter->endElement();
-
-        $objWriter->startElement('c:showNegBubbles');
-        $objWriter->writeAttribute('val', 0);
-        $objWriter->endElement();
-      } elseif ($chartType === PHPExcel_Chart_DataSeries::TYPE_STOCKCHART) {
-
-        $objWriter->startElement('c:hiLowLines');
-        $objWriter->endElement();
-
-        $objWriter->startElement('c:upDownBars');
-
-        $objWriter->startElement('c:gapWidth');
-        $objWriter->writeAttribute('val', 300);
-        $objWriter->endElement();
-
-        $objWriter->startElement('c:upBars');
-        $objWriter->endElement();
-
-        $objWriter->startElement('c:downBars');
-        $objWriter->endElement();
-
-        $objWriter->endElement();
-      }
-
-      //	Generate 2 unique numbers to use for axId values
-      //					$id1 = $id2 = rand(10000000,99999999);
-      //					do {
-      //						$id2 = rand(10000000,99999999);
-      //					} while ($id1 == $id2);
-      $id1 = '75091328';
-      $id2 = '75089408';
-
-      if (($chartType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART) &&
-          ($chartType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) &&
-          ($chartType !== PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)
-      ) {
-
-        $objWriter->startElement('c:axId');
-        $objWriter->writeAttribute('val', $id1);
-        $objWriter->endElement();
-        $objWriter->startElement('c:axId');
-        $objWriter->writeAttribute('val', $id2);
-        $objWriter->endElement();
-      } else {
-        $objWriter->startElement('c:firstSliceAng');
-        $objWriter->writeAttribute('val', 0);
-        $objWriter->endElement();
-
-        if ($chartType === PHPExcel_Chart_DataSeries::TYPE_DONUTCHART) {
-
-          $objWriter->startElement('c:holeSize');
-          $objWriter->writeAttribute('val', 50);
-          $objWriter->endElement();
-        }
-      }
-
-      $objWriter->endElement();
-    }
-
-    if (($chartType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART) &&
-        ($chartType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) &&
-        ($chartType !== PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)
-    ) {
-
-      if ($chartType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
-        $this->_writeValAx($objWriter, $plotArea, $xAxisLabel, $chartType, $id1, $id2, $catIsMultiLevelSeries, $xAxis, $yAxis, $majorGridlines, $minorGridlines);
-      } else {
-        $this->_writeCatAx($objWriter, $plotArea, $xAxisLabel, $chartType, $id1, $id2, $catIsMultiLevelSeries, $xAxis, $yAxis);
-      }
-
-      $this->_writeValAx($objWriter, $plotArea, $yAxisLabel, $chartType, $id1, $id2, $valIsMultiLevelSeries, $xAxis, $yAxis, $majorGridlines, $minorGridlines);
-    }
-
-    $objWriter->endElement();
-  }
-
-  /**
-   * Write Data Labels
-   *
-   * @param  PHPExcel_Shared_XMLWriter $objWriter XML Writer
-   * @param  PHPExcel_Chart_Layout $chartLayout Chart layout
-   *
-   * @throws  PHPExcel_Writer_Exception
-   */
-  private function _writeDataLbls($objWriter, $chartLayout) {
-    $objWriter->startElement('c:dLbls');
-
-    $objWriter->startElement('c:showLegendKey');
-    $showLegendKey = (empty($chartLayout)) ? 0 : $chartLayout->getShowLegendKey();
-    $objWriter->writeAttribute('val', ((empty($showLegendKey)) ? 0 : 1));
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:showVal');
-    $showVal = (empty($chartLayout)) ? 0 : $chartLayout->getShowVal();
-    $objWriter->writeAttribute('val', ((empty($showVal)) ? 0 : 1));
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:showCatName');
-    $showCatName = (empty($chartLayout)) ? 0 : $chartLayout->getShowCatName();
-    $objWriter->writeAttribute('val', ((empty($showCatName)) ? 0 : 1));
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:showSerName');
-    $showSerName = (empty($chartLayout)) ? 0 : $chartLayout->getShowSerName();
-    $objWriter->writeAttribute('val', ((empty($showSerName)) ? 0 : 1));
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:showPercent');
-    $showPercent = (empty($chartLayout)) ? 0 : $chartLayout->getShowPercent();
-    $objWriter->writeAttribute('val', ((empty($showPercent)) ? 0 : 1));
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:showBubbleSize');
-    $showBubbleSize = (empty($chartLayout)) ? 0 : $chartLayout->getShowBubbleSize();
-    $objWriter->writeAttribute('val', ((empty($showBubbleSize)) ? 0 : 1));
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:showLeaderLines');
-    $showLeaderLines = (empty($chartLayout)) ? 1 : $chartLayout->getShowLeaderLines();
-    $objWriter->writeAttribute('val', ((empty($showLeaderLines)) ? 0 : 1));
-    $objWriter->endElement();
-
-    $objWriter->endElement();
-  }
-
-  /**
-   * Write Category Axis
-   *
-   * @param  PHPExcel_Shared_XMLWriter $objWriter XML Writer
-   * @param  PHPExcel_Chart_PlotArea $plotArea
-   * @param  PHPExcel_Chart_Title $xAxisLabel
-   * @param  string $groupType Chart type
-   * @param  string $id1
-   * @param  string $id2
-   * @param  boolean $isMultiLevelSeries
-   *
-   * @throws  PHPExcel_Writer_Exception
-   */
-  private function _writeCatAx($objWriter, PHPExcel_Chart_PlotArea $plotArea, $xAxisLabel, $groupType, $id1, $id2, $isMultiLevelSeries, $xAxis, $yAxis) {
-    $objWriter->startElement('c:catAx');
-
-    if ($id1 > 0) {
-      $objWriter->startElement('c:axId');
-      $objWriter->writeAttribute('val', $id1);
-      $objWriter->endElement();
-    }
-
-    $objWriter->startElement('c:scaling');
-    $objWriter->startElement('c:orientation');
-    $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('orientation'));
-    $objWriter->endElement();
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:delete');
-    $objWriter->writeAttribute('val', 0);
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:axPos');
-    $objWriter->writeAttribute('val', "b");
-    $objWriter->endElement();
-
-    if (!is_null($xAxisLabel)) {
-      $objWriter->startElement('c:title');
-      $objWriter->startElement('c:tx');
-      $objWriter->startElement('c:rich');
-
-      $objWriter->startElement('a:bodyPr');
-      $objWriter->endElement();
-
-      $objWriter->startElement('a:lstStyle');
-      $objWriter->endElement();
-
-      $objWriter->startElement('a:p');
-      $objWriter->startElement('a:r');
-
-      $caption = $xAxisLabel->getCaption();
-      if (is_array($caption)) {
-        $caption = $caption[0];
-      }
-      $objWriter->startElement('a:t');
-      //										$objWriter->writeAttribute('xml:space', 'preserve');
-      $objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML($caption));
-      $objWriter->endElement();
-
-      $objWriter->endElement();
-      $objWriter->endElement();
-      $objWriter->endElement();
-      $objWriter->endElement();
-
-      $layout = $xAxisLabel->getLayout();
-      $this->_writeLayout($layout, $objWriter);
-
-      $objWriter->startElement('c:overlay');
-      $objWriter->writeAttribute('val', 0);
-      $objWriter->endElement();
-
-      $objWriter->endElement();
-
-    }
-
-    $objWriter->startElement('c:numFmt');
-    $objWriter->writeAttribute('formatCode', $yAxis->getAxisNumberFormat());
-    $objWriter->writeAttribute('sourceLinked', $yAxis->getAxisNumberSourceLinked());
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:majorTickMark');
-    $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('major_tick_mark'));
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:minorTickMark');
-    $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('minor_tick_mark'));
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:tickLblPos');
-    $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('axis_labels'));
-    $objWriter->endElement();
-
-    if ($id2 > 0) {
-      $objWriter->startElement('c:crossAx');
-      $objWriter->writeAttribute('val', $id2);
-      $objWriter->endElement();
-
-      $objWriter->startElement('c:crosses');
-      $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('horizontal_crosses'));
-      $objWriter->endElement();
-    }
-
-    $objWriter->startElement('c:auto');
-    $objWriter->writeAttribute('val', 1);
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:lblAlgn');
-    $objWriter->writeAttribute('val', "ctr");
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:lblOffset');
-    $objWriter->writeAttribute('val', 100);
-    $objWriter->endElement();
-
-    if ($isMultiLevelSeries) {
-      $objWriter->startElement('c:noMultiLvlLbl');
-      $objWriter->writeAttribute('val', 0);
-      $objWriter->endElement();
-    }
-    $objWriter->endElement();
-  }
-
-  /**
-   * Write Value Axis
-   *
-   * @param  PHPExcel_Shared_XMLWriter $objWriter XML Writer
-   * @param  PHPExcel_Chart_PlotArea $plotArea
-   * @param  PHPExcel_Chart_Title $yAxisLabel
-   * @param  string $groupType Chart type
-   * @param  string $id1
-   * @param  string $id2
-   * @param  boolean $isMultiLevelSeries
-   *
-   * @throws  PHPExcel_Writer_Exception
-   */
-  private function _writeValAx($objWriter, PHPExcel_Chart_PlotArea $plotArea, $yAxisLabel, $groupType, $id1, $id2, $isMultiLevelSeries, $xAxis, $yAxis, $majorGridlines, $minorGridlines) {
-    $objWriter->startElement('c:valAx');
-
-    if ($id2 > 0) {
-      $objWriter->startElement('c:axId');
-      $objWriter->writeAttribute('val', $id2);
-      $objWriter->endElement();
-    }
-
-    $objWriter->startElement('c:scaling');
-    $objWriter->startElement('c:orientation');
-    $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('orientation'));
-
-    if (!is_null($xAxis->getAxisOptionsProperty('maximum'))) {
-      $objWriter->startElement('c:max');
-      $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('maximum'));
-      $objWriter->endElement();
-    }
-
-    if (!is_null($xAxis->getAxisOptionsProperty('minimum'))) {
-      $objWriter->startElement('c:min');
-      $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('minimum'));
-      $objWriter->endElement();
-    }
-
-    $objWriter->endElement();
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:delete');
-    $objWriter->writeAttribute('val', 0);
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:axPos');
-    $objWriter->writeAttribute('val', "l");
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:majorGridlines');
-    $objWriter->startElement('c:spPr');
-
-    if (!is_null($majorGridlines->getLineColorProperty('value'))) {
-      $objWriter->startElement('a:ln');
-      $objWriter->writeAttribute('w', $majorGridlines->getLineStyleProperty('width'));
-      $objWriter->startElement('a:solidFill');
-      $objWriter->startElement("a:{$majorGridlines->getLineColorProperty('type')}");
-      $objWriter->writeAttribute('val', $majorGridlines->getLineColorProperty('value'));
-      $objWriter->startElement('a:alpha');
-      $objWriter->writeAttribute('val', $majorGridlines->getLineColorProperty('alpha'));
-      $objWriter->endElement(); //end alpha
-      $objWriter->endElement(); //end srgbClr
-      $objWriter->endElement(); //end solidFill
-
-      $objWriter->startElement('a:prstDash');
-      $objWriter->writeAttribute('val', $majorGridlines->getLineStyleProperty('dash'));
-      $objWriter->endElement();
-
-      if ($majorGridlines->getLineStyleProperty('join') == 'miter') {
-        $objWriter->startElement('a:miter');
-        $objWriter->writeAttribute('lim', '800000');
-        $objWriter->endElement();
-      } else {
-        $objWriter->startElement('a:bevel');
-        $objWriter->endElement();
-      }
-
-      if (!is_null($majorGridlines->getLineStyleProperty(array('arrow', 'head', 'type')))) {
-        $objWriter->startElement('a:headEnd');
-        $objWriter->writeAttribute('type', $majorGridlines->getLineStyleProperty(array('arrow', 'head', 'type')));
-        $objWriter->writeAttribute('w', $majorGridlines->getLineStyleArrowParameters('head', 'w'));
-        $objWriter->writeAttribute('len', $majorGridlines->getLineStyleArrowParameters('head', 'len'));
-        $objWriter->endElement();
-      }
-
-      if (!is_null($majorGridlines->getLineStyleProperty(array('arrow', 'end', 'type')))) {
-        $objWriter->startElement('a:tailEnd');
-        $objWriter->writeAttribute('type', $majorGridlines->getLineStyleProperty(array('arrow', 'end', 'type')));
-        $objWriter->writeAttribute('w', $majorGridlines->getLineStyleArrowParameters('end', 'w'));
-        $objWriter->writeAttribute('len', $majorGridlines->getLineStyleArrowParameters('end', 'len'));
-        $objWriter->endElement();
-      }
-      $objWriter->endElement(); //end ln
-    }
-    $objWriter->startElement('a:effectLst');
-
-    if (!is_null($majorGridlines->getGlowSize())) {
-      $objWriter->startElement('a:glow');
-      $objWriter->writeAttribute('rad', $majorGridlines->getGlowSize());
-      $objWriter->startElement("a:{$majorGridlines->getGlowColor('type')}");
-      $objWriter->writeAttribute('val', $majorGridlines->getGlowColor('value'));
-      $objWriter->startElement('a:alpha');
-      $objWriter->writeAttribute('val', $majorGridlines->getGlowColor('alpha'));
-      $objWriter->endElement(); //end alpha
-      $objWriter->endElement(); //end schemeClr
-      $objWriter->endElement(); //end glow
-    }
-
-    if (!is_null($majorGridlines->getShadowProperty('presets'))) {
-      $objWriter->startElement("a:{$majorGridlines->getShadowProperty('effect')}");
-      if (!is_null($majorGridlines->getShadowProperty('blur'))) {
-        $objWriter->writeAttribute('blurRad', $majorGridlines->getShadowProperty('blur'));
-      }
-      if (!is_null($majorGridlines->getShadowProperty('distance'))) {
-        $objWriter->writeAttribute('dist', $majorGridlines->getShadowProperty('distance'));
-      }
-      if (!is_null($majorGridlines->getShadowProperty('direction'))) {
-        $objWriter->writeAttribute('dir', $majorGridlines->getShadowProperty('direction'));
-      }
-      if (!is_null($majorGridlines->getShadowProperty('algn'))) {
-        $objWriter->writeAttribute('algn', $majorGridlines->getShadowProperty('algn'));
-      }
-      if (!is_null($majorGridlines->getShadowProperty(array('size', 'sx')))) {
-        $objWriter->writeAttribute('sx', $majorGridlines->getShadowProperty(array('size', 'sx')));
-      }
-      if (!is_null($majorGridlines->getShadowProperty(array('size', 'sy')))) {
-        $objWriter->writeAttribute('sy', $majorGridlines->getShadowProperty(array('size', 'sy')));
-      }
-      if (!is_null($majorGridlines->getShadowProperty(array('size', 'kx')))) {
-        $objWriter->writeAttribute('kx', $majorGridlines->getShadowProperty(array('size', 'kx')));
-      }
-      if (!is_null($majorGridlines->getShadowProperty('rotWithShape'))) {
-        $objWriter->writeAttribute('rotWithShape', $majorGridlines->getShadowProperty('rotWithShape'));
-      }
-      $objWriter->startElement("a:{$majorGridlines->getShadowProperty(array('color', 'type'))}");
-      $objWriter->writeAttribute('val', $majorGridlines->getShadowProperty(array('color', 'value')));
-
-      $objWriter->startElement('a:alpha');
-      $objWriter->writeAttribute('val', $majorGridlines->getShadowProperty(array('color', 'alpha')));
-      $objWriter->endElement(); //end alpha
-
-      $objWriter->endElement(); //end color:type
-      $objWriter->endElement(); //end shadow
-    }
-
-    if (!is_null($majorGridlines->getSoftEdgesSize())) {
-      $objWriter->startElement('a:softEdge');
-      $objWriter->writeAttribute('rad', $majorGridlines->getSoftEdgesSize());
-      $objWriter->endElement(); //end softEdge
-    }
-
-    $objWriter->endElement(); //end effectLst
-    $objWriter->endElement(); //end spPr
-    $objWriter->endElement(); //end majorGridLines
-
-    if ($minorGridlines->getObjectState()) {
-      $objWriter->startElement('c:minorGridlines');
-      $objWriter->startElement('c:spPr');
-
-      if (!is_null($minorGridlines->getLineColorProperty('value'))) {
-        $objWriter->startElement('a:ln');
-        $objWriter->writeAttribute('w', $minorGridlines->getLineStyleProperty('width'));
-        $objWriter->startElement('a:solidFill');
-        $objWriter->startElement("a:{$minorGridlines->getLineColorProperty('type')}");
-        $objWriter->writeAttribute('val', $minorGridlines->getLineColorProperty('value'));
-        $objWriter->startElement('a:alpha');
-        $objWriter->writeAttribute('val', $minorGridlines->getLineColorProperty('alpha'));
-        $objWriter->endElement(); //end alpha
-        $objWriter->endElement(); //end srgbClr
-        $objWriter->endElement(); //end solidFill
-
-        $objWriter->startElement('a:prstDash');
-        $objWriter->writeAttribute('val', $minorGridlines->getLineStyleProperty('dash'));
-        $objWriter->endElement();
-
-        if ($minorGridlines->getLineStyleProperty('join') == 'miter') {
-          $objWriter->startElement('a:miter');
-          $objWriter->writeAttribute('lim', '800000');
-          $objWriter->endElement();
-        } else {
-          $objWriter->startElement('a:bevel');
-          $objWriter->endElement();
-        }
-
-        if (!is_null($minorGridlines->getLineStyleProperty(array('arrow', 'head', 'type')))) {
-          $objWriter->startElement('a:headEnd');
-          $objWriter->writeAttribute('type', $minorGridlines->getLineStyleProperty(array('arrow', 'head', 'type')));
-          $objWriter->writeAttribute('w', $minorGridlines->getLineStyleArrowParameters('head', 'w'));
-          $objWriter->writeAttribute('len', $minorGridlines->getLineStyleArrowParameters('head', 'len'));
-          $objWriter->endElement();
-        }
-
-        if (!is_null($minorGridlines->getLineStyleProperty(array('arrow', 'end', 'type')))) {
-          $objWriter->startElement('a:tailEnd');
-          $objWriter->writeAttribute('type', $minorGridlines->getLineStyleProperty(array('arrow', 'end', 'type')));
-          $objWriter->writeAttribute('w', $minorGridlines->getLineStyleArrowParameters('end', 'w'));
-          $objWriter->writeAttribute('len', $minorGridlines->getLineStyleArrowParameters('end', 'len'));
-          $objWriter->endElement();
-        }
-        $objWriter->endElement(); //end ln
-      }
-
-      $objWriter->startElement('a:effectLst');
-
-      if (!is_null($minorGridlines->getGlowSize())) {
-        $objWriter->startElement('a:glow');
-        $objWriter->writeAttribute('rad', $minorGridlines->getGlowSize());
-        $objWriter->startElement("a:{$minorGridlines->getGlowColor('type')}");
-        $objWriter->writeAttribute('val', $minorGridlines->getGlowColor('value'));
-        $objWriter->startElement('a:alpha');
-        $objWriter->writeAttribute('val', $minorGridlines->getGlowColor('alpha'));
-        $objWriter->endElement(); //end alpha
-        $objWriter->endElement(); //end schemeClr
-        $objWriter->endElement(); //end glow
-      }
-
-      if (!is_null($minorGridlines->getShadowProperty('presets'))) {
-        $objWriter->startElement("a:{$minorGridlines->getShadowProperty('effect')}");
-        if (!is_null($minorGridlines->getShadowProperty('blur'))) {
-          $objWriter->writeAttribute('blurRad', $minorGridlines->getShadowProperty('blur'));
-        }
-        if (!is_null($minorGridlines->getShadowProperty('distance'))) {
-          $objWriter->writeAttribute('dist', $minorGridlines->getShadowProperty('distance'));
-        }
-        if (!is_null($minorGridlines->getShadowProperty('direction'))) {
-          $objWriter->writeAttribute('dir', $minorGridlines->getShadowProperty('direction'));
-        }
-        if (!is_null($minorGridlines->getShadowProperty('algn'))) {
-          $objWriter->writeAttribute('algn', $minorGridlines->getShadowProperty('algn'));
-        }
-        if (!is_null($minorGridlines->getShadowProperty(array('size', 'sx')))) {
-          $objWriter->writeAttribute('sx', $minorGridlines->getShadowProperty(array('size', 'sx')));
-        }
-        if (!is_null($minorGridlines->getShadowProperty(array('size', 'sy')))) {
-          $objWriter->writeAttribute('sy', $minorGridlines->getShadowProperty(array('size', 'sy')));
-        }
-        if (!is_null($minorGridlines->getShadowProperty(array('size', 'kx')))) {
-          $objWriter->writeAttribute('kx', $minorGridlines->getShadowProperty(array('size', 'kx')));
-        }
-        if (!is_null($minorGridlines->getShadowProperty('rotWithShape'))) {
-          $objWriter->writeAttribute('rotWithShape', $minorGridlines->getShadowProperty('rotWithShape'));
-        }
-        $objWriter->startElement("a:{$minorGridlines->getShadowProperty(array('color', 'type'))}");
-        $objWriter->writeAttribute('val', $minorGridlines->getShadowProperty(array('color', 'value')));
-        $objWriter->startElement('a:alpha');
-        $objWriter->writeAttribute('val', $minorGridlines->getShadowProperty(array('color', 'alpha')));
-        $objWriter->endElement(); //end alpha
-        $objWriter->endElement(); //end color:type
-        $objWriter->endElement(); //end shadow
-      }
-
-      if (!is_null($minorGridlines->getSoftEdgesSize())) {
-        $objWriter->startElement('a:softEdge');
-        $objWriter->writeAttribute('rad', $minorGridlines->getSoftEdgesSize());
-        $objWriter->endElement(); //end softEdge
-      }
-
-      $objWriter->endElement(); //end effectLst
-      $objWriter->endElement(); //end spPr
-      $objWriter->endElement(); //end minorGridLines
-    }
-
-    if (!is_null($yAxisLabel)) {
-
-      $objWriter->startElement('c:title');
-      $objWriter->startElement('c:tx');
-      $objWriter->startElement('c:rich');
-
-      $objWriter->startElement('a:bodyPr');
-      $objWriter->endElement();
-
-      $objWriter->startElement('a:lstStyle');
-      $objWriter->endElement();
-
-      $objWriter->startElement('a:p');
-      $objWriter->startElement('a:r');
-
-      $caption = $yAxisLabel->getCaption();
-      if (is_array($caption)) {
-        $caption = $caption[0];
-      }
-
-      $objWriter->startElement('a:t');
-      //										$objWriter->writeAttribute('xml:space', 'preserve');
-      $objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML($caption));
-      $objWriter->endElement();
-
-      $objWriter->endElement();
-      $objWriter->endElement();
-      $objWriter->endElement();
-      $objWriter->endElement();
-
-      if ($groupType !== PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
-        $layout = $yAxisLabel->getLayout();
-        $this->_writeLayout($layout, $objWriter);
-      }
-
-      $objWriter->startElement('c:overlay');
-      $objWriter->writeAttribute('val', 0);
-      $objWriter->endElement();
-
-      $objWriter->endElement();
-    }
-
-    $objWriter->startElement('c:numFmt');
-    $objWriter->writeAttribute('formatCode', $xAxis->getAxisNumberFormat());
-    $objWriter->writeAttribute('sourceLinked', $xAxis->getAxisNumberSourceLinked());
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:majorTickMark');
-    $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('major_tick_mark'));
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:minorTickMark');
-    $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('minor_tick_mark'));
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:tickLblPos');
-    $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('axis_labels'));
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:spPr');
-
-    if (!is_null($xAxis->getFillProperty('value'))) {
-      $objWriter->startElement('a:solidFill');
-      $objWriter->startElement("a:" . $xAxis->getFillProperty('type'));
-      $objWriter->writeAttribute('val', $xAxis->getFillProperty('value'));
-      $objWriter->startElement('a:alpha');
-      $objWriter->writeAttribute('val', $xAxis->getFillProperty('alpha'));
-      $objWriter->endElement();
-      $objWriter->endElement();
-      $objWriter->endElement();
-    }
-
-    $objWriter->startElement('a:ln');
-
-    $objWriter->writeAttribute('w', $xAxis->getLineStyleProperty('width'));
-    $objWriter->writeAttribute('cap', $xAxis->getLineStyleProperty('cap'));
-    $objWriter->writeAttribute('cmpd', $xAxis->getLineStyleProperty('compound'));
-
-    if (!is_null($xAxis->getLineProperty('value'))) {
-      $objWriter->startElement('a:solidFill');
-      $objWriter->startElement("a:" . $xAxis->getLineProperty('type'));
-      $objWriter->writeAttribute('val', $xAxis->getLineProperty('value'));
-      $objWriter->startElement('a:alpha');
-      $objWriter->writeAttribute('val', $xAxis->getLineProperty('alpha'));
-      $objWriter->endElement();
-      $objWriter->endElement();
-      $objWriter->endElement();
-    }
-
-    $objWriter->startElement('a:prstDash');
-    $objWriter->writeAttribute('val', $xAxis->getLineStyleProperty('dash'));
-    $objWriter->endElement();
-
-    if ($xAxis->getLineStyleProperty('join') == 'miter') {
-      $objWriter->startElement('a:miter');
-      $objWriter->writeAttribute('lim', '800000');
-      $objWriter->endElement();
-    } else {
-      $objWriter->startElement('a:bevel');
-      $objWriter->endElement();
-    }
-
-    if (!is_null($xAxis->getLineStyleProperty(array('arrow', 'head', 'type')))) {
-      $objWriter->startElement('a:headEnd');
-      $objWriter->writeAttribute('type', $xAxis->getLineStyleProperty(array('arrow', 'head', 'type')));
-      $objWriter->writeAttribute('w', $xAxis->getLineStyleArrowWidth('head'));
-      $objWriter->writeAttribute('len', $xAxis->getLineStyleArrowLength('head'));
-      $objWriter->endElement();
-    }
-
-    if (!is_null($xAxis->getLineStyleProperty(array('arrow', 'end', 'type')))) {
-      $objWriter->startElement('a:tailEnd');
-      $objWriter->writeAttribute('type', $xAxis->getLineStyleProperty(array('arrow', 'end', 'type')));
-      $objWriter->writeAttribute('w', $xAxis->getLineStyleArrowWidth('end'));
-      $objWriter->writeAttribute('len', $xAxis->getLineStyleArrowLength('end'));
-      $objWriter->endElement();
-    }
-
-    $objWriter->endElement();
-
-    $objWriter->startElement('a:effectLst');
-
-    if (!is_null($xAxis->getGlowProperty('size'))) {
-      $objWriter->startElement('a:glow');
-      $objWriter->writeAttribute('rad', $xAxis->getGlowProperty('size'));
-      $objWriter->startElement("a:{$xAxis->getGlowProperty(array('color','type'))}");
-      $objWriter->writeAttribute('val', $xAxis->getGlowProperty(array('color','value')));
-      $objWriter->startElement('a:alpha');
-      $objWriter->writeAttribute('val', $xAxis->getGlowProperty(array('color','alpha')));
-      $objWriter->endElement();
-      $objWriter->endElement();
-      $objWriter->endElement();
-    }
-
-    if (!is_null($xAxis->getShadowProperty('presets'))) {
-      $objWriter->startElement("a:{$xAxis->getShadowProperty('effect')}");
-
-      if (!is_null($xAxis->getShadowProperty('blur'))) {
-        $objWriter->writeAttribute('blurRad', $xAxis->getShadowProperty('blur'));
-      }
-      if (!is_null($xAxis->getShadowProperty('distance'))) {
-        $objWriter->writeAttribute('dist', $xAxis->getShadowProperty('distance'));
-      }
-      if (!is_null($xAxis->getShadowProperty('direction'))) {
-        $objWriter->writeAttribute('dir', $xAxis->getShadowProperty('direction'));
-      }
-      if (!is_null($xAxis->getShadowProperty('algn'))) {
-        $objWriter->writeAttribute('algn', $xAxis->getShadowProperty('algn'));
-      }
-      if (!is_null($xAxis->getShadowProperty(array('size','sx')))) {
-        $objWriter->writeAttribute('sx', $xAxis->getShadowProperty(array('size','sx')));
-      }
-      if (!is_null($xAxis->getShadowProperty(array('size','sy')))) {
-        $objWriter->writeAttribute('sy', $xAxis->getShadowProperty(array('size','sy')));
-      }
-      if (!is_null($xAxis->getShadowProperty(array('size','kx')))) {
-        $objWriter->writeAttribute('kx', $xAxis->getShadowProperty(array('size','kx')));
-      }
-      if (!is_null($xAxis->getShadowProperty('rotWithShape'))) {
-        $objWriter->writeAttribute('rotWithShape', $xAxis->getShadowProperty('rotWithShape'));
-      }
-
-      $objWriter->startElement("a:{$xAxis->getShadowProperty(array('color','type'))}");
-      $objWriter->writeAttribute('val', $xAxis->getShadowProperty(array('color','value')));
-      $objWriter->startElement('a:alpha');
-      $objWriter->writeAttribute('val', $xAxis->getShadowProperty(array('color','alpha')));
-      $objWriter->endElement();
-      $objWriter->endElement();
-
-      $objWriter->endElement();
-    }
-
-    if (!is_null($xAxis->getSoftEdgesSize())) {
-      $objWriter->startElement('a:softEdge');
-      $objWriter->writeAttribute('rad', $xAxis->getSoftEdgesSize());
-      $objWriter->endElement();
-    }
-
-    $objWriter->endElement(); //effectList
-    $objWriter->endElement(); //end spPr
-
-    if ($id1 > 0) {
-      $objWriter->startElement('c:crossAx');
-      $objWriter->writeAttribute('val', $id2);
-      $objWriter->endElement();
-
-      if (!is_null($xAxis->getAxisOptionsProperty('horizontal_crosses_value'))) {
-        $objWriter->startElement('c:crossesAt');
-        $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('horizontal_crosses_value'));
-        $objWriter->endElement();
-      } else {
-        $objWriter->startElement('c:crosses');
-        $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('horizontal_crosses'));
-        $objWriter->endElement();
-      }
-
-      $objWriter->startElement('c:crossBetween');
-      $objWriter->writeAttribute('val', "midCat");
-      $objWriter->endElement();
-
-      if (!is_null($xAxis->getAxisOptionsProperty('major_unit'))) {
-        $objWriter->startElement('c:majorUnit');
-        $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('major_unit'));
-        $objWriter->endElement();
-      }
-
-      if (!is_null($xAxis->getAxisOptionsProperty('minor_unit'))) {
-        $objWriter->startElement('c:minorUnit');
-        $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('minor_unit'));
-        $objWriter->endElement();
-      }
-
-    }
-
-    if ($isMultiLevelSeries) {
-      if ($groupType !== PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
-        $objWriter->startElement('c:noMultiLvlLbl');
-        $objWriter->writeAttribute('val', 0);
-        $objWriter->endElement();
-      }
-    }
-
-    $objWriter->endElement();
-
-  }
-
-  /**
-   * Get the data series type(s) for a chart plot series
-   *
-   * @param  PHPExcel_Chart_PlotArea $plotArea
-   *
-   * @return  string|array
-   * @throws  PHPExcel_Writer_Exception
-   */
-  private
-  static function _getChartType($plotArea) {
-    $groupCount = $plotArea->getPlotGroupCount();
-
-    if ($groupCount == 1) {
-      $chartType = array(
-          $plotArea->getPlotGroupByIndex(0)
-              ->getPlotType()
-      );
-    } else {
-      $chartTypes = array();
-      for ($i = 0; $i < $groupCount; ++$i) {
-        $chartTypes[] = $plotArea->getPlotGroupByIndex($i)
-            ->getPlotType();
-      }
-      $chartType = array_unique($chartTypes);
-      if (count($chartTypes) == 0) {
-        throw new PHPExcel_Writer_Exception('Chart is not yet implemented');
-      }
-    }
-
-    return $chartType;
-  }
-
-  /**
-   * Write Plot Group (series of related plots)
-   *
-   * @param  PHPExcel_Chart_DataSeries $plotGroup
-   * @param  string $groupType Type of plot for dataseries
-   * @param  PHPExcel_Shared_XMLWriter $objWriter XML Writer
-   * @param  boolean &$catIsMultiLevelSeries Is category a multi-series category
-   * @param  boolean &$valIsMultiLevelSeries Is value set a multi-series set
-   * @param  string &$plotGroupingType Type of grouping for multi-series values
-   * @param  PHPExcel_Worksheet $pSheet
-   *
-   * @throws  PHPExcel_Writer_Exception
-   */
-  private function _writePlotGroup($plotGroup,
-      $groupType,
-      $objWriter,
-      &$catIsMultiLevelSeries,
-      &$valIsMultiLevelSeries,
-      &$plotGroupingType,
-      PHPExcel_Worksheet $pSheet
-  ) {
-    if (is_null($plotGroup)) {
-      return;
-    }
-
-    if (($groupType == PHPExcel_Chart_DataSeries::TYPE_BARCHART) ||
-        ($groupType == PHPExcel_Chart_DataSeries::TYPE_BARCHART_3D)
-    ) {
-      $objWriter->startElement('c:barDir');
-      $objWriter->writeAttribute('val', $plotGroup->getPlotDirection());
-      $objWriter->endElement();
-    }
-
-    if (!is_null($plotGroup->getPlotGrouping())) {
-      $plotGroupingType = $plotGroup->getPlotGrouping();
-      $objWriter->startElement('c:grouping');
-      $objWriter->writeAttribute('val', $plotGroupingType);
-      $objWriter->endElement();
-    }
-
-    //	Get these details before the loop, because we can use the count to check for varyColors
-    $plotSeriesOrder = $plotGroup->getPlotOrder();
-    $plotSeriesCount = count($plotSeriesOrder);
-
-    if (($groupType !== PHPExcel_Chart_DataSeries::TYPE_RADARCHART) &&
-        ($groupType !== PHPExcel_Chart_DataSeries::TYPE_STOCKCHART)
-    ) {
-
-      if ($groupType !== PHPExcel_Chart_DataSeries::TYPE_LINECHART) {
-        if (($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART) ||
-            ($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) ||
-            ($groupType == PHPExcel_Chart_DataSeries::TYPE_DONUTCHART) ||
-            ($plotSeriesCount > 1)
-        ) {
-          $objWriter->startElement('c:varyColors');
-          $objWriter->writeAttribute('val', 1);
-          $objWriter->endElement();
-        } else {
-          $objWriter->startElement('c:varyColors');
-          $objWriter->writeAttribute('val', 0);
-          $objWriter->endElement();
-        }
-      }
-    }
-
-    foreach ($plotSeriesOrder as $plotSeriesIdx => $plotSeriesRef) {
-      $objWriter->startElement('c:ser');
-
-      $objWriter->startElement('c:idx');
-      $objWriter->writeAttribute('val', $this->_seriesIndex + $plotSeriesIdx);
-      $objWriter->endElement();
-
-      $objWriter->startElement('c:order');
-      $objWriter->writeAttribute('val', $this->_seriesIndex + $plotSeriesRef);
-      $objWriter->endElement();
-
-      if (($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART) ||
-          ($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) ||
-          ($groupType == PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)
-      ) {
-
-        $objWriter->startElement('c:dPt');
-        $objWriter->startElement('c:idx');
-        $objWriter->writeAttribute('val', 3);
-        $objWriter->endElement();
-
-        $objWriter->startElement('c:bubble3D');
-        $objWriter->writeAttribute('val', 0);
-        $objWriter->endElement();
-
-        $objWriter->startElement('c:spPr');
-        $objWriter->startElement('a:solidFill');
-        $objWriter->startElement('a:srgbClr');
-        $objWriter->writeAttribute('val', 'FF9900');
-        $objWriter->endElement();
-        $objWriter->endElement();
-        $objWriter->endElement();
-        $objWriter->endElement();
-      }
-
-      //	Labels
-      $plotSeriesLabel = $plotGroup->getPlotLabelByIndex($plotSeriesRef);
-      if ($plotSeriesLabel && ($plotSeriesLabel->getPointCount() > 0)) {
-        $objWriter->startElement('c:tx');
-        $objWriter->startElement('c:strRef');
-        $this->_writePlotSeriesLabel($plotSeriesLabel, $objWriter);
-        $objWriter->endElement();
-        $objWriter->endElement();
-      }
-
-      //	Formatting for the points
-      if (($groupType == PHPExcel_Chart_DataSeries::TYPE_LINECHART) ||
-          ($groupType == PHPExcel_Chart_DataSeries::TYPE_STOCKCHART)
-      ) {
-        $objWriter->startElement('c:spPr');
-        $objWriter->startElement('a:ln');
-        $objWriter->writeAttribute('w', 12700);
-        if ($groupType == PHPExcel_Chart_DataSeries::TYPE_STOCKCHART) {
-          $objWriter->startElement('a:noFill');
-          $objWriter->endElement();
-        }
-        $objWriter->endElement();
-        $objWriter->endElement();
-      }
-
-      $plotSeriesValues = $plotGroup->getPlotValuesByIndex($plotSeriesRef);
-      if ($plotSeriesValues) {
-        $plotSeriesMarker = $plotSeriesValues->getPointMarker();
-        if ($plotSeriesMarker) {
-          $objWriter->startElement('c:marker');
-          $objWriter->startElement('c:symbol');
-          $objWriter->writeAttribute('val', $plotSeriesMarker);
-          $objWriter->endElement();
-
-          if ($plotSeriesMarker !== 'none') {
-            $objWriter->startElement('c:size');
-            $objWriter->writeAttribute('val', 3);
-            $objWriter->endElement();
-          }
-
-          $objWriter->endElement();
-        }
-      }
-
-      if (($groupType === PHPExcel_Chart_DataSeries::TYPE_BARCHART) ||
-          ($groupType === PHPExcel_Chart_DataSeries::TYPE_BARCHART_3D) ||
-          ($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART)
-      ) {
-
-        $objWriter->startElement('c:invertIfNegative');
-        $objWriter->writeAttribute('val', 0);
-        $objWriter->endElement();
-      }
-
-      //	Category Labels
-      $plotSeriesCategory = $plotGroup->getPlotCategoryByIndex($plotSeriesRef);
-      if ($plotSeriesCategory && ($plotSeriesCategory->getPointCount() > 0)) {
-        $catIsMultiLevelSeries = $catIsMultiLevelSeries || $plotSeriesCategory->isMultiLevelSeries();
-
-        if (($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART) ||
-            ($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) ||
-            ($groupType == PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)
-        ) {
-
-          if (!is_null($plotGroup->getPlotStyle())) {
-            $plotStyle = $plotGroup->getPlotStyle();
-            if ($plotStyle) {
-              $objWriter->startElement('c:explosion');
-              $objWriter->writeAttribute('val', 25);
-              $objWriter->endElement();
-            }
-          }
-        }
-
-        if (($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) ||
-            ($groupType === PHPExcel_Chart_DataSeries::TYPE_SCATTERCHART)
-        ) {
-          $objWriter->startElement('c:xVal');
-        } else {
-          $objWriter->startElement('c:cat');
-        }
-
-        $this->_writePlotSeriesValues($plotSeriesCategory, $objWriter, $groupType, 'str', $pSheet);
-        $objWriter->endElement();
-      }
-
-      //	Values
-      if ($plotSeriesValues) {
-        $valIsMultiLevelSeries = $valIsMultiLevelSeries || $plotSeriesValues->isMultiLevelSeries();
-
-        if (($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) ||
-            ($groupType === PHPExcel_Chart_DataSeries::TYPE_SCATTERCHART)
-        ) {
-          $objWriter->startElement('c:yVal');
-        } else {
-          $objWriter->startElement('c:val');
-        }
-
-        $this->_writePlotSeriesValues($plotSeriesValues, $objWriter, $groupType, 'num', $pSheet);
-        $objWriter->endElement();
-      }
-
-      if ($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
-        $this->_writeBubbles($plotSeriesValues, $objWriter, $pSheet);
-      }
-
-      $objWriter->endElement();
-
-    }
-
-    $this->_seriesIndex += $plotSeriesIdx + 1;
-  }
-
-  /**
-   * Write Plot Series Label
-   *
-   * @param  PHPExcel_Chart_DataSeriesValues $plotSeriesLabel
-   * @param  PHPExcel_Shared_XMLWriter $objWriter XML Writer
-   *
-   * @throws  PHPExcel_Writer_Exception
-   */
-  private function _writePlotSeriesLabel($plotSeriesLabel, $objWriter) {
-    if (is_null($plotSeriesLabel)) {
-      return;
-    }
-
-    $objWriter->startElement('c:f');
-    $objWriter->writeRawData($plotSeriesLabel->getDataSource());
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:strCache');
-    $objWriter->startElement('c:ptCount');
-    $objWriter->writeAttribute('val', $plotSeriesLabel->getPointCount());
-    $objWriter->endElement();
-
-    foreach ($plotSeriesLabel->getDataValues() as $plotLabelKey => $plotLabelValue) {
-      $objWriter->startElement('c:pt');
-      $objWriter->writeAttribute('idx', $plotLabelKey);
-
-      $objWriter->startElement('c:v');
-      $objWriter->writeRawData($plotLabelValue);
-      $objWriter->endElement();
-      $objWriter->endElement();
-    }
-    $objWriter->endElement();
-
-  }
-
-  /**
-   * Write Plot Series Values
-   *
-   * @param  PHPExcel_Chart_DataSeriesValues $plotSeriesValues
-   * @param  PHPExcel_Shared_XMLWriter $objWriter XML Writer
-   * @param  string $groupType Type of plot for dataseries
-   * @param  string $dataType Datatype of series values
-   * @param  PHPExcel_Worksheet $pSheet
-   *
-   * @throws  PHPExcel_Writer_Exception
-   */
-  private function _writePlotSeriesValues($plotSeriesValues,
-      $objWriter,
-      $groupType,
-      $dataType = 'str',
-      PHPExcel_Worksheet $pSheet
-  ) {
-    if (is_null($plotSeriesValues)) {
-      return;
-    }
-
-    if ($plotSeriesValues->isMultiLevelSeries()) {
-      $levelCount = $plotSeriesValues->multiLevelCount();
-
-      $objWriter->startElement('c:multiLvlStrRef');
-
-      $objWriter->startElement('c:f');
-      $objWriter->writeRawData($plotSeriesValues->getDataSource());
-      $objWriter->endElement();
-
-      $objWriter->startElement('c:multiLvlStrCache');
-
-      $objWriter->startElement('c:ptCount');
-      $objWriter->writeAttribute('val', $plotSeriesValues->getPointCount());
-      $objWriter->endElement();
-
-      for ($level = 0; $level < $levelCount; ++$level) {
-        $objWriter->startElement('c:lvl');
-
-        foreach ($plotSeriesValues->getDataValues() as $plotSeriesKey => $plotSeriesValue) {
-          if (isset($plotSeriesValue[$level])) {
-            $objWriter->startElement('c:pt');
-            $objWriter->writeAttribute('idx', $plotSeriesKey);
-
-            $objWriter->startElement('c:v');
-            $objWriter->writeRawData($plotSeriesValue[$level]);
-            $objWriter->endElement();
-            $objWriter->endElement();
-          }
-        }
-
-        $objWriter->endElement();
-      }
-
-      $objWriter->endElement();
-
-      $objWriter->endElement();
-    } else {
-      $objWriter->startElement('c:' . $dataType . 'Ref');
-
-      $objWriter->startElement('c:f');
-      $objWriter->writeRawData($plotSeriesValues->getDataSource());
-      $objWriter->endElement();
-
-      $objWriter->startElement('c:' . $dataType . 'Cache');
-
-      if (($groupType != PHPExcel_Chart_DataSeries::TYPE_PIECHART) &&
-          ($groupType != PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) &&
-          ($groupType != PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)
-      ) {
-
-        if (($plotSeriesValues->getFormatCode() !== NULL) &&
-            ($plotSeriesValues->getFormatCode() !== '')
-        ) {
-          $objWriter->startElement('c:formatCode');
-          $objWriter->writeRawData($plotSeriesValues->getFormatCode());
-          $objWriter->endElement();
-        }
-      }
-
-      $objWriter->startElement('c:ptCount');
-      $objWriter->writeAttribute('val', $plotSeriesValues->getPointCount());
-      $objWriter->endElement();
-
-      $dataValues = $plotSeriesValues->getDataValues();
-      if (!empty($dataValues)) {
-        if (is_array($dataValues)) {
-          foreach ($dataValues as $plotSeriesKey => $plotSeriesValue) {
-            $objWriter->startElement('c:pt');
-            $objWriter->writeAttribute('idx', $plotSeriesKey);
-
-            $objWriter->startElement('c:v');
-            $objWriter->writeRawData($plotSeriesValue);
-            $objWriter->endElement();
-            $objWriter->endElement();
-          }
-        }
-      }
-
-      $objWriter->endElement();
-
-      $objWriter->endElement();
-    }
-  }
-
-  /**
-   * Write Bubble Chart Details
-   *
-   * @param  PHPExcel_Chart_DataSeriesValues $plotSeriesValues
-   * @param  PHPExcel_Shared_XMLWriter $objWriter XML Writer
-   *
-   * @throws  PHPExcel_Writer_Exception
-   */
-  private function _writeBubbles($plotSeriesValues, $objWriter, PHPExcel_Worksheet $pSheet) {
-    if (is_null($plotSeriesValues)) {
-      return;
-    }
-
-    $objWriter->startElement('c:bubbleSize');
-    $objWriter->startElement('c:numLit');
-
-    $objWriter->startElement('c:formatCode');
-    $objWriter->writeRawData('General');
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:ptCount');
-    $objWriter->writeAttribute('val', $plotSeriesValues->getPointCount());
-    $objWriter->endElement();
-
-    $dataValues = $plotSeriesValues->getDataValues();
-    if (!empty($dataValues)) {
-      if (is_array($dataValues)) {
-        foreach ($dataValues as $plotSeriesKey => $plotSeriesValue) {
-          $objWriter->startElement('c:pt');
-          $objWriter->writeAttribute('idx', $plotSeriesKey);
-          $objWriter->startElement('c:v');
-          $objWriter->writeRawData(1);
-          $objWriter->endElement();
-          $objWriter->endElement();
-        }
-      }
-    }
-
-    $objWriter->endElement();
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:bubble3D');
-    $objWriter->writeAttribute('val', 0);
-    $objWriter->endElement();
-  }
-
-  /**
-   * Write Layout
-   *
-   * @param  PHPExcel_Chart_Layout $layout
-   * @param  PHPExcel_Shared_XMLWriter $objWriter XML Writer
-   *
-   * @throws  PHPExcel_Writer_Exception
-   */
-  private function _writeLayout(PHPExcel_Chart_Layout $layout = NULL, $objWriter) {
-    $objWriter->startElement('c:layout');
-
-    if (!is_null($layout)) {
-      $objWriter->startElement('c:manualLayout');
-
-      $layoutTarget = $layout->getLayoutTarget();
-      if (!is_null($layoutTarget)) {
-        $objWriter->startElement('c:layoutTarget');
-        $objWriter->writeAttribute('val', $layoutTarget);
-        $objWriter->endElement();
-      }
-
-      $xMode = $layout->getXMode();
-      if (!is_null($xMode)) {
-        $objWriter->startElement('c:xMode');
-        $objWriter->writeAttribute('val', $xMode);
-        $objWriter->endElement();
-      }
-
-      $yMode = $layout->getYMode();
-      if (!is_null($yMode)) {
-        $objWriter->startElement('c:yMode');
-        $objWriter->writeAttribute('val', $yMode);
-        $objWriter->endElement();
-      }
-
-      $x = $layout->getXPosition();
-      if (!is_null($x)) {
-        $objWriter->startElement('c:x');
-        $objWriter->writeAttribute('val', $x);
-        $objWriter->endElement();
-      }
-
-      $y = $layout->getYPosition();
-      if (!is_null($y)) {
-        $objWriter->startElement('c:y');
-        $objWriter->writeAttribute('val', $y);
-        $objWriter->endElement();
-      }
-
-      $w = $layout->getWidth();
-      if (!is_null($w)) {
-        $objWriter->startElement('c:w');
-        $objWriter->writeAttribute('val', $w);
-        $objWriter->endElement();
-      }
-
-      $h = $layout->getHeight();
-      if (!is_null($h)) {
-        $objWriter->startElement('c:h');
-        $objWriter->writeAttribute('val', $h);
-        $objWriter->endElement();
-      }
-
-      $objWriter->endElement();
-    }
-
-    $objWriter->endElement();
-  }
-
-  /**
-   * Write Alternate Content block
-   *
-   * @param  PHPExcel_Shared_XMLWriter $objWriter XML Writer
-   *
-   * @throws  PHPExcel_Writer_Exception
-   */
-  private function _writeAlternateContent($objWriter) {
-    $objWriter->startElement('mc:AlternateContent');
-    $objWriter->writeAttribute('xmlns:mc', 'http://schemas.openxmlformats.org/markup-compatibility/2006');
-
-    $objWriter->startElement('mc:Choice');
-    $objWriter->writeAttribute('xmlns:c14', 'http://schemas.microsoft.com/office/drawing/2007/8/2/chart');
-    $objWriter->writeAttribute('Requires', 'c14');
-
-    $objWriter->startElement('c14:style');
-    $objWriter->writeAttribute('val', '102');
-    $objWriter->endElement();
-    $objWriter->endElement();
-
-    $objWriter->startElement('mc:Fallback');
-    $objWriter->startElement('c:style');
-    $objWriter->writeAttribute('val', '2');
-    $objWriter->endElement();
-    $objWriter->endElement();
-
-    $objWriter->endElement();
-  }
-
-  /**
-   * Write Printer Settings
-   *
-   * @param  PHPExcel_Shared_XMLWriter $objWriter XML Writer
-   *
-   * @throws  PHPExcel_Writer_Exception
-   */
-  private function _writePrintSettings($objWriter) {
-    $objWriter->startElement('c:printSettings');
-
-    $objWriter->startElement('c:headerFooter');
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:pageMargins');
-    $objWriter->writeAttribute('footer', 0.3);
-    $objWriter->writeAttribute('header', 0.3);
-    $objWriter->writeAttribute('r', 0.7);
-    $objWriter->writeAttribute('l', 0.7);
-    $objWriter->writeAttribute('t', 0.75);
-    $objWriter->writeAttribute('b', 0.75);
-    $objWriter->endElement();
-
-    $objWriter->startElement('c:pageSetup');
-    $objWriter->writeAttribute('orientation', "portrait");
-    $objWriter->endElement();
-
-    $objWriter->endElement();
-  }
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Comments.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Comments.php
deleted file mode 100644
index dc809fa8e32..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Comments.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel2007_Comments
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel2007_Comments extends PHPExcel_Writer_Excel2007_WriterPart
-{
-	/**
-	 * Write comments to XML format
-	 *
-	 * @param 	PHPExcel_Worksheet				$pWorksheet
-	 * @return 	string 								XML Output
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function writeComments(PHPExcel_Worksheet $pWorksheet = null)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-  		// Comments cache
-  		$comments	= $pWorksheet->getComments();
-
-  		// Authors cache
-  		$authors	= array();
-  		$authorId	= 0;
-		foreach ($comments as $comment) {
-			if (!isset($authors[$comment->getAuthor()])) {
-				$authors[$comment->getAuthor()] = $authorId++;
-			}
-		}
-
-		// comments
-		$objWriter->startElement('comments');
-		$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
-
-			// Loop through authors
-			$objWriter->startElement('authors');
-			foreach ($authors as $author => $index) {
-				$objWriter->writeElement('author', $author);
-			}
-			$objWriter->endElement();
-
-			// Loop through comments
-			$objWriter->startElement('commentList');
-			foreach ($comments as $key => $value) {
-				$this->_writeComment($objWriter, $key, $value, $authors);
-			}
-			$objWriter->endElement();
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Write comment to XML format
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter		$objWriter 			XML Writer
-	 * @param	string							$pCellReference		Cell reference
-	 * @param 	PHPExcel_Comment				$pComment			Comment
-	 * @param	array							$pAuthors			Array of authors
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function _writeComment(PHPExcel_Shared_XMLWriter $objWriter = null, $pCellReference = 'A1', PHPExcel_Comment $pComment = null, $pAuthors = null)
-	{
-		// comment
-		$objWriter->startElement('comment');
-		$objWriter->writeAttribute('ref', 		$pCellReference);
-		$objWriter->writeAttribute('authorId', 	$pAuthors[$pComment->getAuthor()]);
-
-			// text
-			$objWriter->startElement('text');
-			$this->getParentWriter()->getWriterPart('stringtable')->writeRichText($objWriter, $pComment->getText());
-			$objWriter->endElement();
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write VML comments to XML format
-	 *
-	 * @param 	PHPExcel_Worksheet				$pWorksheet
-	 * @return 	string 								XML Output
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function writeVMLComments(PHPExcel_Worksheet $pWorksheet = null)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-  		// Comments cache
-  		$comments	= $pWorksheet->getComments();
-
-		// xml
-		$objWriter->startElement('xml');
-		$objWriter->writeAttribute('xmlns:v', 'urn:schemas-microsoft-com:vml');
-		$objWriter->writeAttribute('xmlns:o', 'urn:schemas-microsoft-com:office:office');
-		$objWriter->writeAttribute('xmlns:x', 'urn:schemas-microsoft-com:office:excel');
-
-			// o:shapelayout
-			$objWriter->startElement('o:shapelayout');
-			$objWriter->writeAttribute('v:ext', 		'edit');
-
-				// o:idmap
-				$objWriter->startElement('o:idmap');
-				$objWriter->writeAttribute('v:ext', 	'edit');
-				$objWriter->writeAttribute('data', 		'1');
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-
-			// v:shapetype
-			$objWriter->startElement('v:shapetype');
-			$objWriter->writeAttribute('id', 		'_x0000_t202');
-			$objWriter->writeAttribute('coordsize', '21600,21600');
-			$objWriter->writeAttribute('o:spt', 	'202');
-			$objWriter->writeAttribute('path', 		'm,l,21600r21600,l21600,xe');
-
-				// v:stroke
-				$objWriter->startElement('v:stroke');
-				$objWriter->writeAttribute('joinstyle', 	'miter');
-				$objWriter->endElement();
-
-				// v:path
-				$objWriter->startElement('v:path');
-				$objWriter->writeAttribute('gradientshapeok', 	't');
-				$objWriter->writeAttribute('o:connecttype', 	'rect');
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-
-			// Loop through comments
-			foreach ($comments as $key => $value) {
-				$this->_writeVMLComment($objWriter, $key, $value);
-			}
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Write VML comment to XML format
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter		$objWriter 			XML Writer
-	 * @param	string							$pCellReference		Cell reference
-	 * @param 	PHPExcel_Comment				$pComment			Comment
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function _writeVMLComment(PHPExcel_Shared_XMLWriter $objWriter = null, $pCellReference = 'A1', PHPExcel_Comment $pComment = null)
-	{
- 		// Metadata
- 		list($column, $row) = PHPExcel_Cell::coordinateFromString($pCellReference);
- 		$column = PHPExcel_Cell::columnIndexFromString($column);
- 		$id = 1024 + $column + $row;
- 		$id = substr($id, 0, 4);
-
-		// v:shape
-		$objWriter->startElement('v:shape');
-		$objWriter->writeAttribute('id', 			'_x0000_s' . $id);
-		$objWriter->writeAttribute('type', 			'#_x0000_t202');
-		$objWriter->writeAttribute('style', 		'position:absolute;margin-left:' . $pComment->getMarginLeft() . ';margin-top:' . $pComment->getMarginTop() . ';width:' . $pComment->getWidth() . ';height:' . $pComment->getHeight() . ';z-index:1;visibility:' . ($pComment->getVisible() ? 'visible' : 'hidden'));
-		$objWriter->writeAttribute('fillcolor', 	'#' . $pComment->getFillColor()->getRGB());
-		$objWriter->writeAttribute('o:insetmode', 	'auto');
-
-			// v:fill
-			$objWriter->startElement('v:fill');
-			$objWriter->writeAttribute('color2', 		'#' . $pComment->getFillColor()->getRGB());
-			$objWriter->endElement();
-
-			// v:shadow
-			$objWriter->startElement('v:shadow');
-			$objWriter->writeAttribute('on', 			't');
-			$objWriter->writeAttribute('color', 		'black');
-			$objWriter->writeAttribute('obscured', 		't');
-			$objWriter->endElement();
-
-			// v:path
-			$objWriter->startElement('v:path');
-			$objWriter->writeAttribute('o:connecttype', 'none');
-			$objWriter->endElement();
-
-			// v:textbox
-			$objWriter->startElement('v:textbox');
-			$objWriter->writeAttribute('style', 'mso-direction-alt:auto');
-
-				// div
-				$objWriter->startElement('div');
-				$objWriter->writeAttribute('style', 'text-align:left');
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-
-			// x:ClientData
-			$objWriter->startElement('x:ClientData');
-			$objWriter->writeAttribute('ObjectType', 'Note');
-
-				// x:MoveWithCells
-				$objWriter->writeElement('x:MoveWithCells', '');
-
-				// x:SizeWithCells
-				$objWriter->writeElement('x:SizeWithCells', '');
-
-				// x:Anchor
-				//$objWriter->writeElement('x:Anchor', $column . ', 15, ' . ($row - 2) . ', 10, ' . ($column + 4) . ', 15, ' . ($row + 5) . ', 18');
-
-				// x:AutoFill
-				$objWriter->writeElement('x:AutoFill', 'False');
-
-				// x:Row
-				$objWriter->writeElement('x:Row', ($row - 1));
-
-				// x:Column
-				$objWriter->writeElement('x:Column', ($column - 1));
-
-			$objWriter->endElement();
-
-		$objWriter->endElement();
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/ContentTypes.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/ContentTypes.php
deleted file mode 100644
index 557853654a3..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/ContentTypes.php
+++ /dev/null
@@ -1,287 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel2007_ContentTypes
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel2007_ContentTypes extends PHPExcel_Writer_Excel2007_WriterPart
-{
-	/**
-	 * Write content types to XML format
-	 *
-	 * @param 	PHPExcel	$pPHPExcel
-	 * @param	boolean		$includeCharts	Flag indicating if we should include drawing details for charts
-	 * @return 	string 						XML Output
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function writeContentTypes(PHPExcel $pPHPExcel = null, $includeCharts = FALSE)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-		// Types
-		$objWriter->startElement('Types');
-		$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/content-types');
-
-			// Theme
-			$this->_writeOverrideContentType(
-				$objWriter, '/xl/theme/theme1.xml', 'application/vnd.openxmlformats-officedocument.theme+xml'
-			);
-
-			// Styles
-			$this->_writeOverrideContentType(
-				$objWriter, '/xl/styles.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml'
-			);
-
-			// Rels
-			$this->_writeDefaultContentType(
-				$objWriter, 'rels', 'application/vnd.openxmlformats-package.relationships+xml'
-			);
-
-			// XML
-			$this->_writeDefaultContentType(
-				$objWriter, 'xml', 'application/xml'
-			);
-
-			// VML
-			$this->_writeDefaultContentType(
-				$objWriter, 'vml', 'application/vnd.openxmlformats-officedocument.vmlDrawing'
-			);
-
-			// Workbook
-			if($pPHPExcel->hasMacros()){ //Macros in workbook ?
-				// Yes : not standard content but "macroEnabled"
-				$this->_writeOverrideContentType(
-					$objWriter, '/xl/workbook.xml', 'application/vnd.ms-excel.sheet.macroEnabled.main+xml'
-				);
-				//... and define a new type for the VBA project
-				$this->_writeDefaultContentType(
-							$objWriter, 'bin', 'application/vnd.ms-office.vbaProject'
-						);
-				if($pPHPExcel->hasMacrosCertificate()){// signed macros ?
-					// Yes : add needed information
-					$this->_writeOverrideContentType(
-						$objWriter, '/xl/vbaProjectSignature.bin', 'application/vnd.ms-office.vbaProjectSignature'
-				);
-				}
-			}else{// no macros in workbook, so standard type
-				$this->_writeOverrideContentType(
-					$objWriter, '/xl/workbook.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml'
-				);
-			}
-
-			// DocProps
-			$this->_writeOverrideContentType(
-				$objWriter, '/docProps/app.xml', 'application/vnd.openxmlformats-officedocument.extended-properties+xml'
-			);
-
-			$this->_writeOverrideContentType(
-				$objWriter, '/docProps/core.xml', 'application/vnd.openxmlformats-package.core-properties+xml'
-			);
-
-			$customPropertyList = $pPHPExcel->getProperties()->getCustomProperties();
-			if (!empty($customPropertyList)) {
-				$this->_writeOverrideContentType(
-					$objWriter, '/docProps/custom.xml', 'application/vnd.openxmlformats-officedocument.custom-properties+xml'
-				);
-			}
-
-			// Worksheets
-			$sheetCount = $pPHPExcel->getSheetCount();
-			for ($i = 0; $i < $sheetCount; ++$i) {
-				$this->_writeOverrideContentType(
-					$objWriter, '/xl/worksheets/sheet' . ($i + 1) . '.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml'
-				);
-			}
-
-			// Shared strings
-			$this->_writeOverrideContentType(
-				$objWriter, '/xl/sharedStrings.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml'
-			);
-
-			// Add worksheet relationship content types
-			$chart = 1;
-			for ($i = 0; $i < $sheetCount; ++$i) {
-				$drawings = $pPHPExcel->getSheet($i)->getDrawingCollection();
-				$drawingCount = count($drawings);
-				$chartCount = ($includeCharts) ? $pPHPExcel->getSheet($i)->getChartCount() : 0;
-
-				//	We need a drawing relationship for the worksheet if we have either drawings or charts
-				if (($drawingCount > 0) || ($chartCount > 0)) {
-					$this->_writeOverrideContentType(
-						$objWriter, '/xl/drawings/drawing' . ($i + 1) . '.xml', 'application/vnd.openxmlformats-officedocument.drawing+xml'
-					);
-				}
-
-				//	If we have charts, then we need a chart relationship for every individual chart
-				if ($chartCount > 0) {
-					for ($c = 0; $c < $chartCount; ++$c) {
-						$this->_writeOverrideContentType(
-							$objWriter, '/xl/charts/chart' . $chart++ . '.xml', 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml'
-						);
-					}
-				}
-			}
-
-			// Comments
-			for ($i = 0; $i < $sheetCount; ++$i) {
-				if (count($pPHPExcel->getSheet($i)->getComments()) > 0) {
-					$this->_writeOverrideContentType(
-						$objWriter, '/xl/comments' . ($i + 1) . '.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml'
-					);
-				}
-			}
-
-			// Add media content-types
-			$aMediaContentTypes = array();
-			$mediaCount = $this->getParentWriter()->getDrawingHashTable()->count();
-			for ($i = 0; $i < $mediaCount; ++$i) {
-				$extension 	= '';
-				$mimeType 	= '';
-
-				if ($this->getParentWriter()->getDrawingHashTable()->getByIndex($i) instanceof PHPExcel_Worksheet_Drawing) {
-					$extension 	= strtolower($this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getExtension());
-					$mimeType 	= $this->_getImageMimeType( $this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getPath() );
-				} else if ($this->getParentWriter()->getDrawingHashTable()->getByIndex($i) instanceof PHPExcel_Worksheet_MemoryDrawing) {
-					$extension 	= strtolower($this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getMimeType());
-					$extension 	= explode('/', $extension);
-					$extension 	= $extension[1];
-
-					$mimeType 	= $this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getMimeType();
-				}
-
-				if (!isset( $aMediaContentTypes[$extension]) ) {
-						$aMediaContentTypes[$extension] = $mimeType;
-
-						$this->_writeDefaultContentType(
-							$objWriter, $extension, $mimeType
-						);
-				}
-			}
-			if($pPHPExcel->hasRibbonBinObjects()){//Some additional objects in the ribbon ?
-				//we need to write "Extension" but not already write for media content
-				$tabRibbonTypes=array_diff($pPHPExcel->getRibbonBinObjects('types'), array_keys($aMediaContentTypes));
-				foreach($tabRibbonTypes as $aRibbonType){
-					$mimeType='image/.'.$aRibbonType;//we wrote $mimeType like customUI Editor
-					$this->_writeDefaultContentType(
-						$objWriter, $aRibbonType, $mimeType
-					);
-				}	
-			}
-			$sheetCount = $pPHPExcel->getSheetCount();
-			for ($i = 0; $i < $sheetCount; ++$i) {
-				if (count($pPHPExcel->getSheet()->getHeaderFooter()->getImages()) > 0) {
-					foreach ($pPHPExcel->getSheet()->getHeaderFooter()->getImages() as $image) {
-						if (!isset( $aMediaContentTypes[strtolower($image->getExtension())]) ) {
-							$aMediaContentTypes[strtolower($image->getExtension())] = $this->_getImageMimeType( $image->getPath() );
-
-							$this->_writeDefaultContentType(
-								$objWriter, strtolower($image->getExtension()), $aMediaContentTypes[strtolower($image->getExtension())]
-							);
-						}
-					}
-				}
-			}
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Get image mime type
-	 *
-	 * @param 	string	$pFile	Filename
-	 * @return 	string	Mime Type
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _getImageMimeType($pFile = '')
-	{
-		if (PHPExcel_Shared_File::file_exists($pFile)) {
-			$image = getimagesize($pFile);
-			return image_type_to_mime_type($image[2]);
-		} else {
-			throw new PHPExcel_Writer_Exception("File $pFile does not exist");
-		}
-	}
-
-	/**
-	 * Write Default content type
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
-	 * @param 	string 						$pPartname 		Part name
-	 * @param 	string 						$pContentType 	Content type
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _writeDefaultContentType(PHPExcel_Shared_XMLWriter $objWriter = null, $pPartname = '', $pContentType = '')
-	{
-		if ($pPartname != '' && $pContentType != '') {
-			// Write content type
-			$objWriter->startElement('Default');
-			$objWriter->writeAttribute('Extension', 	$pPartname);
-			$objWriter->writeAttribute('ContentType', 	$pContentType);
-			$objWriter->endElement();
-		} else {
-			throw new PHPExcel_Writer_Exception("Invalid parameters passed.");
-		}
-	}
-
-	/**
-	 * Write Override content type
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
-	 * @param 	string 						$pPartname 		Part name
-	 * @param 	string 						$pContentType 	Content type
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _writeOverrideContentType(PHPExcel_Shared_XMLWriter $objWriter = null, $pPartname = '', $pContentType = '')
-	{
-		if ($pPartname != '' && $pContentType != '') {
-			// Write content type
-			$objWriter->startElement('Override');
-			$objWriter->writeAttribute('PartName', 		$pPartname);
-			$objWriter->writeAttribute('ContentType', 	$pContentType);
-			$objWriter->endElement();
-		} else {
-			throw new PHPExcel_Writer_Exception("Invalid parameters passed.");
-		}
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/DocProps.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/DocProps.php
deleted file mode 100644
index f8821379c65..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/DocProps.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel2007_DocProps
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel2007_DocProps extends PHPExcel_Writer_Excel2007_WriterPart
-{
-/**
-	 * Write docProps/app.xml to XML format
-	 *
-	 * @param 	PHPExcel	$pPHPExcel
-	 * @return 	string 		XML Output
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function writeDocPropsApp(PHPExcel $pPHPExcel = null)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-		// Properties
-		$objWriter->startElement('Properties');
-			$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/officeDocument/2006/extended-properties');
-			$objWriter->writeAttribute('xmlns:vt', 'http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes');
-
-			// Application
-			$objWriter->writeElement('Application', 	'Microsoft Excel');
-
-			// DocSecurity
-			$objWriter->writeElement('DocSecurity', 	'0');
-
-			// ScaleCrop
-			$objWriter->writeElement('ScaleCrop', 		'false');
-
-			// HeadingPairs
-			$objWriter->startElement('HeadingPairs');
-
-				// Vector
-				$objWriter->startElement('vt:vector');
-					$objWriter->writeAttribute('size', 		'2');
-					$objWriter->writeAttribute('baseType', 	'variant');
-
-					// Variant
-					$objWriter->startElement('vt:variant');
-						$objWriter->writeElement('vt:lpstr', 	'Worksheets');
-					$objWriter->endElement();
-
-					// Variant
-					$objWriter->startElement('vt:variant');
-						$objWriter->writeElement('vt:i4', 		$pPHPExcel->getSheetCount());
-					$objWriter->endElement();
-
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-
-			// TitlesOfParts
-			$objWriter->startElement('TitlesOfParts');
-
-				// Vector
-				$objWriter->startElement('vt:vector');
-					$objWriter->writeAttribute('size', 		$pPHPExcel->getSheetCount());
-					$objWriter->writeAttribute('baseType',	'lpstr');
-
-					$sheetCount = $pPHPExcel->getSheetCount();
-					for ($i = 0; $i < $sheetCount; ++$i) {
-						$objWriter->writeElement('vt:lpstr', $pPHPExcel->getSheet($i)->getTitle());
-					}
-
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-
-			// Company
-			$objWriter->writeElement('Company', 			$pPHPExcel->getProperties()->getCompany());
-
-			// Company
-			$objWriter->writeElement('Manager', 			$pPHPExcel->getProperties()->getManager());
-
-			// LinksUpToDate
-			$objWriter->writeElement('LinksUpToDate', 		'false');
-
-			// SharedDoc
-			$objWriter->writeElement('SharedDoc', 			'false');
-
-			// HyperlinksChanged
-			$objWriter->writeElement('HyperlinksChanged', 	'false');
-
-			// AppVersion
-			$objWriter->writeElement('AppVersion', 			'12.0000');
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Write docProps/core.xml to XML format
-	 *
-	 * @param 	PHPExcel	$pPHPExcel
-	 * @return 	string 		XML Output
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function writeDocPropsCore(PHPExcel $pPHPExcel = null)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-		// cp:coreProperties
-		$objWriter->startElement('cp:coreProperties');
-			$objWriter->writeAttribute('xmlns:cp', 'http://schemas.openxmlformats.org/package/2006/metadata/core-properties');
-			$objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/');
-			$objWriter->writeAttribute('xmlns:dcterms', 'http://purl.org/dc/terms/');
-			$objWriter->writeAttribute('xmlns:dcmitype', 'http://purl.org/dc/dcmitype/');
-			$objWriter->writeAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
-
-			// dc:creator
-			$objWriter->writeElement('dc:creator',			$pPHPExcel->getProperties()->getCreator());
-
-			// cp:lastModifiedBy
-			$objWriter->writeElement('cp:lastModifiedBy', 	$pPHPExcel->getProperties()->getLastModifiedBy());
-
-			// dcterms:created
-			$objWriter->startElement('dcterms:created');
-				$objWriter->writeAttribute('xsi:type', 'dcterms:W3CDTF');
-				$objWriter->writeRawData(date(DATE_W3C, 	$pPHPExcel->getProperties()->getCreated()));
-			$objWriter->endElement();
-
-			// dcterms:modified
-			$objWriter->startElement('dcterms:modified');
-				$objWriter->writeAttribute('xsi:type', 'dcterms:W3CDTF');
-				$objWriter->writeRawData(date(DATE_W3C, 	$pPHPExcel->getProperties()->getModified()));
-			$objWriter->endElement();
-
-			// dc:title
-			$objWriter->writeElement('dc:title', 			$pPHPExcel->getProperties()->getTitle());
-
-			// dc:description
-			$objWriter->writeElement('dc:description', 		$pPHPExcel->getProperties()->getDescription());
-
-			// dc:subject
-			$objWriter->writeElement('dc:subject', 			$pPHPExcel->getProperties()->getSubject());
-
-			// cp:keywords
-			$objWriter->writeElement('cp:keywords', 		$pPHPExcel->getProperties()->getKeywords());
-
-			// cp:category
-			$objWriter->writeElement('cp:category', 		$pPHPExcel->getProperties()->getCategory());
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Write docProps/custom.xml to XML format
-	 *
-	 * @param 	PHPExcel	$pPHPExcel
-	 * @return 	string 		XML Output
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function writeDocPropsCustom(PHPExcel $pPHPExcel = null)
-	{
-		$customPropertyList = $pPHPExcel->getProperties()->getCustomProperties();
-		if (empty($customPropertyList)) {
-			return;
-		}
-
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-		// cp:coreProperties
-		$objWriter->startElement('Properties');
-			$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/officeDocument/2006/custom-properties');
-			$objWriter->writeAttribute('xmlns:vt', 'http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes');
-
-
-			foreach($customPropertyList as $key => $customProperty) {
-				$propertyValue = $pPHPExcel->getProperties()->getCustomPropertyValue($customProperty);
-				$propertyType = $pPHPExcel->getProperties()->getCustomPropertyType($customProperty);
-
-				$objWriter->startElement('property');
-					$objWriter->writeAttribute('fmtid', 	'{D5CDD505-2E9C-101B-9397-08002B2CF9AE}');
-					$objWriter->writeAttribute('pid', 		$key+2);
-					$objWriter->writeAttribute('name', 		$customProperty);
-
-					switch($propertyType) {
-						case 'i' :
-							$objWriter->writeElement('vt:i4', 		$propertyValue);
-							break;
-						case 'f' :
-							$objWriter->writeElement('vt:r8', 		$propertyValue);
-							break;
-						case 'b' :
-							$objWriter->writeElement('vt:bool', 	($propertyValue) ? 'true' : 'false');
-							break;
-						case 'd' :
-							$objWriter->startElement('vt:filetime');
-								$objWriter->writeRawData(date(DATE_W3C, $propertyValue));
-							$objWriter->endElement();
-							break;
-						default :
-							$objWriter->writeElement('vt:lpwstr', 	$propertyValue);
-							break;
-					}
-
-				$objWriter->endElement();
-			}
-
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Drawing.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Drawing.php
deleted file mode 100644
index 1cf971ed4d1..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Drawing.php
+++ /dev/null
@@ -1,598 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel2007_Drawing
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel2007_Drawing extends PHPExcel_Writer_Excel2007_WriterPart
-{
-	/**
-	 * Write drawings to XML format
-	 *
-	 * @param 	PHPExcel_Worksheet	$pWorksheet
-	 * @param	int					&$chartRef		Chart ID
-	 * @param	boolean				$includeCharts	Flag indicating if we should include drawing details for charts
-	 * @return 	string 				XML Output
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function writeDrawings(PHPExcel_Worksheet $pWorksheet = null, &$chartRef, $includeCharts = FALSE)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-		// xdr:wsDr
-		$objWriter->startElement('xdr:wsDr');
-		$objWriter->writeAttribute('xmlns:xdr', 'http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing');
-		$objWriter->writeAttribute('xmlns:a', 'http://schemas.openxmlformats.org/drawingml/2006/main');
-
-			// Loop through images and write drawings
-			$i = 1;
-			$iterator = $pWorksheet->getDrawingCollection()->getIterator();
-			while ($iterator->valid()) {
-				$this->_writeDrawing($objWriter, $iterator->current(), $i);
-
-				$iterator->next();
-				++$i;
-			}
-
-			if ($includeCharts) {
-				$chartCount = $pWorksheet->getChartCount();
-				// Loop through charts and write the chart position
-				if ($chartCount > 0) {
-					for ($c = 0; $c < $chartCount; ++$c) {
-						$this->_writeChart($objWriter, $pWorksheet->getChartByIndex($c), $c+$i);
-					}
-				}
-			}
-
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Write drawings to XML format
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter 		XML Writer
-	 * @param 	PHPExcel_Chart				$pChart
-	 * @param 	int							$pRelationId
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function _writeChart(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Chart $pChart = null, $pRelationId = -1)
-	{
-		$tl = $pChart->getTopLeftPosition();
-		$tl['colRow'] = PHPExcel_Cell::coordinateFromString($tl['cell']);
-		$br = $pChart->getBottomRightPosition();
-		$br['colRow'] = PHPExcel_Cell::coordinateFromString($br['cell']);
-
-		$objWriter->startElement('xdr:twoCellAnchor');
-
-			$objWriter->startElement('xdr:from');
-				$objWriter->writeElement('xdr:col', PHPExcel_Cell::columnIndexFromString($tl['colRow'][0]) - 1);
-				$objWriter->writeElement('xdr:colOff', PHPExcel_Shared_Drawing::pixelsToEMU($tl['xOffset']));
-				$objWriter->writeElement('xdr:row', $tl['colRow'][1] - 1);
-				$objWriter->writeElement('xdr:rowOff', PHPExcel_Shared_Drawing::pixelsToEMU($tl['yOffset']));
-			$objWriter->endElement();
-			$objWriter->startElement('xdr:to');
-				$objWriter->writeElement('xdr:col', PHPExcel_Cell::columnIndexFromString($br['colRow'][0]) - 1);
-				$objWriter->writeElement('xdr:colOff', PHPExcel_Shared_Drawing::pixelsToEMU($br['xOffset']));
-				$objWriter->writeElement('xdr:row', $br['colRow'][1] - 1);
-				$objWriter->writeElement('xdr:rowOff', PHPExcel_Shared_Drawing::pixelsToEMU($br['yOffset']));
-			$objWriter->endElement();
-
-			$objWriter->startElement('xdr:graphicFrame');
-				$objWriter->writeAttribute('macro', '');
-				$objWriter->startElement('xdr:nvGraphicFramePr');
-					$objWriter->startElement('xdr:cNvPr');
-						$objWriter->writeAttribute('name', 'Chart '.$pRelationId);
-						$objWriter->writeAttribute('id', 1025 * $pRelationId);
-					$objWriter->endElement();
-					$objWriter->startElement('xdr:cNvGraphicFramePr');
-						$objWriter->startElement('a:graphicFrameLocks');
-						$objWriter->endElement();
-					$objWriter->endElement();
-				$objWriter->endElement();
-
-				$objWriter->startElement('xdr:xfrm');
-					$objWriter->startElement('a:off');
-						$objWriter->writeAttribute('x', '0');
-						$objWriter->writeAttribute('y', '0');
-					$objWriter->endElement();
-					$objWriter->startElement('a:ext');
-						$objWriter->writeAttribute('cx', '0');
-						$objWriter->writeAttribute('cy', '0');
-					$objWriter->endElement();
-				$objWriter->endElement();
-
-				$objWriter->startElement('a:graphic');
-					$objWriter->startElement('a:graphicData');
-						$objWriter->writeAttribute('uri', 'http://schemas.openxmlformats.org/drawingml/2006/chart');
-						$objWriter->startElement('c:chart');
-							$objWriter->writeAttribute('xmlns:c', 'http://schemas.openxmlformats.org/drawingml/2006/chart');
-							$objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
-							$objWriter->writeAttribute('r:id', 'rId'.$pRelationId);
-						$objWriter->endElement();
-					$objWriter->endElement();
-				$objWriter->endElement();
-			$objWriter->endElement();
-
-			$objWriter->startElement('xdr:clientData');
-			$objWriter->endElement();
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write drawings to XML format
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter			$objWriter 		XML Writer
-	 * @param 	PHPExcel_Worksheet_BaseDrawing		$pDrawing
-	 * @param 	int									$pRelationId
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function _writeDrawing(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet_BaseDrawing $pDrawing = null, $pRelationId = -1)
-	{
-		if ($pRelationId >= 0) {
-			// xdr:oneCellAnchor
-			$objWriter->startElement('xdr:oneCellAnchor');
-				// Image location
-				$aCoordinates 		= PHPExcel_Cell::coordinateFromString($pDrawing->getCoordinates());
-				$aCoordinates[0] 	= PHPExcel_Cell::columnIndexFromString($aCoordinates[0]);
-
-				// xdr:from
-				$objWriter->startElement('xdr:from');
-					$objWriter->writeElement('xdr:col', $aCoordinates[0] - 1);
-					$objWriter->writeElement('xdr:colOff', PHPExcel_Shared_Drawing::pixelsToEMU($pDrawing->getOffsetX()));
-					$objWriter->writeElement('xdr:row', $aCoordinates[1] - 1);
-					$objWriter->writeElement('xdr:rowOff', PHPExcel_Shared_Drawing::pixelsToEMU($pDrawing->getOffsetY()));
-				$objWriter->endElement();
-
-				// xdr:ext
-				$objWriter->startElement('xdr:ext');
-					$objWriter->writeAttribute('cx', PHPExcel_Shared_Drawing::pixelsToEMU($pDrawing->getWidth()));
-					$objWriter->writeAttribute('cy', PHPExcel_Shared_Drawing::pixelsToEMU($pDrawing->getHeight()));
-				$objWriter->endElement();
-
-				// xdr:pic
-				$objWriter->startElement('xdr:pic');
-
-					// xdr:nvPicPr
-					$objWriter->startElement('xdr:nvPicPr');
-
-						// xdr:cNvPr
-						$objWriter->startElement('xdr:cNvPr');
-						$objWriter->writeAttribute('id', $pRelationId);
-						$objWriter->writeAttribute('name', $pDrawing->getName());
-						$objWriter->writeAttribute('descr', $pDrawing->getDescription());
-						$objWriter->endElement();
-
-						// xdr:cNvPicPr
-						$objWriter->startElement('xdr:cNvPicPr');
-
-							// a:picLocks
-							$objWriter->startElement('a:picLocks');
-							$objWriter->writeAttribute('noChangeAspect', '1');
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-
-					$objWriter->endElement();
-
-					// xdr:blipFill
-					$objWriter->startElement('xdr:blipFill');
-
-						// a:blip
-						$objWriter->startElement('a:blip');
-						$objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
-						$objWriter->writeAttribute('r:embed', 'rId' . $pRelationId);
-						$objWriter->endElement();
-
-						// a:stretch
-						$objWriter->startElement('a:stretch');
-							$objWriter->writeElement('a:fillRect', null);
-						$objWriter->endElement();
-
-					$objWriter->endElement();
-
-					// xdr:spPr
-					$objWriter->startElement('xdr:spPr');
-
-						// a:xfrm
-						$objWriter->startElement('a:xfrm');
-						$objWriter->writeAttribute('rot', PHPExcel_Shared_Drawing::degreesToAngle($pDrawing->getRotation()));
-						$objWriter->endElement();
-
-						// a:prstGeom
-						$objWriter->startElement('a:prstGeom');
-						$objWriter->writeAttribute('prst', 'rect');
-
-							// a:avLst
-							$objWriter->writeElement('a:avLst', null);
-
-						$objWriter->endElement();
-
-//						// a:solidFill
-//						$objWriter->startElement('a:solidFill');
-
-//							// a:srgbClr
-//							$objWriter->startElement('a:srgbClr');
-//							$objWriter->writeAttribute('val', 'FFFFFF');
-
-///* SHADE
-//								// a:shade
-//								$objWriter->startElement('a:shade');
-//								$objWriter->writeAttribute('val', '85000');
-//								$objWriter->endElement();
-//*/
-
-//							$objWriter->endElement();
-
-//						$objWriter->endElement();
-/*
-						// a:ln
-						$objWriter->startElement('a:ln');
-						$objWriter->writeAttribute('w', '88900');
-						$objWriter->writeAttribute('cap', 'sq');
-
-							// a:solidFill
-							$objWriter->startElement('a:solidFill');
-
-								// a:srgbClr
-								$objWriter->startElement('a:srgbClr');
-								$objWriter->writeAttribute('val', 'FFFFFF');
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-							// a:miter
-							$objWriter->startElement('a:miter');
-							$objWriter->writeAttribute('lim', '800000');
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-*/
-
-						if ($pDrawing->getShadow()->getVisible()) {
-							// a:effectLst
-							$objWriter->startElement('a:effectLst');
-
-								// a:outerShdw
-								$objWriter->startElement('a:outerShdw');
-								$objWriter->writeAttribute('blurRad', 		PHPExcel_Shared_Drawing::pixelsToEMU($pDrawing->getShadow()->getBlurRadius()));
-								$objWriter->writeAttribute('dist',			PHPExcel_Shared_Drawing::pixelsToEMU($pDrawing->getShadow()->getDistance()));
-								$objWriter->writeAttribute('dir',			PHPExcel_Shared_Drawing::degreesToAngle($pDrawing->getShadow()->getDirection()));
-								$objWriter->writeAttribute('algn',			$pDrawing->getShadow()->getAlignment());
-								$objWriter->writeAttribute('rotWithShape', 	'0');
-
-									// a:srgbClr
-									$objWriter->startElement('a:srgbClr');
-									$objWriter->writeAttribute('val',		$pDrawing->getShadow()->getColor()->getRGB());
-
-										// a:alpha
-										$objWriter->startElement('a:alpha');
-										$objWriter->writeAttribute('val', 	$pDrawing->getShadow()->getAlpha() * 1000);
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-						}
-/*
-
-						// a:scene3d
-						$objWriter->startElement('a:scene3d');
-
-							// a:camera
-							$objWriter->startElement('a:camera');
-							$objWriter->writeAttribute('prst', 'orthographicFront');
-							$objWriter->endElement();
-
-							// a:lightRig
-							$objWriter->startElement('a:lightRig');
-							$objWriter->writeAttribute('rig', 'twoPt');
-							$objWriter->writeAttribute('dir', 't');
-
-								// a:rot
-								$objWriter->startElement('a:rot');
-								$objWriter->writeAttribute('lat', '0');
-								$objWriter->writeAttribute('lon', '0');
-								$objWriter->writeAttribute('rev', '0');
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-*/
-/*
-						// a:sp3d
-						$objWriter->startElement('a:sp3d');
-
-							// a:bevelT
-							$objWriter->startElement('a:bevelT');
-							$objWriter->writeAttribute('w', '25400');
-							$objWriter->writeAttribute('h', '19050');
-							$objWriter->endElement();
-
-							// a:contourClr
-							$objWriter->startElement('a:contourClr');
-
-								// a:srgbClr
-								$objWriter->startElement('a:srgbClr');
-								$objWriter->writeAttribute('val', 'FFFFFF');
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-*/
-					$objWriter->endElement();
-
-				$objWriter->endElement();
-
-				// xdr:clientData
-				$objWriter->writeElement('xdr:clientData', null);
-
-			$objWriter->endElement();
-		} else {
-			throw new PHPExcel_Writer_Exception("Invalid parameters passed.");
-		}
-	}
-
-	/**
-	 * Write VML header/footer images to XML format
-	 *
-	 * @param 	PHPExcel_Worksheet				$pWorksheet
-	 * @return 	string 								XML Output
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function writeVMLHeaderFooterImages(PHPExcel_Worksheet $pWorksheet = null)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-  		// Header/footer images
-  		$images = $pWorksheet->getHeaderFooter()->getImages();
-
-		// xml
-		$objWriter->startElement('xml');
-		$objWriter->writeAttribute('xmlns:v', 'urn:schemas-microsoft-com:vml');
-		$objWriter->writeAttribute('xmlns:o', 'urn:schemas-microsoft-com:office:office');
-		$objWriter->writeAttribute('xmlns:x', 'urn:schemas-microsoft-com:office:excel');
-
-			// o:shapelayout
-			$objWriter->startElement('o:shapelayout');
-			$objWriter->writeAttribute('v:ext', 		'edit');
-
-				// o:idmap
-				$objWriter->startElement('o:idmap');
-				$objWriter->writeAttribute('v:ext', 	'edit');
-				$objWriter->writeAttribute('data', 		'1');
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-
-			// v:shapetype
-			$objWriter->startElement('v:shapetype');
-			$objWriter->writeAttribute('id', 					'_x0000_t75');
-			$objWriter->writeAttribute('coordsize', 			'21600,21600');
-			$objWriter->writeAttribute('o:spt', 				'75');
-			$objWriter->writeAttribute('o:preferrelative', 		't');
-			$objWriter->writeAttribute('path', 					'm@4@5l@4@11@9@11@9@5xe');
-			$objWriter->writeAttribute('filled',		 		'f');
-			$objWriter->writeAttribute('stroked',		 		'f');
-
-				// v:stroke
-				$objWriter->startElement('v:stroke');
-				$objWriter->writeAttribute('joinstyle', 		'miter');
-				$objWriter->endElement();
-
-				// v:formulas
-				$objWriter->startElement('v:formulas');
-
-					// v:f
-					$objWriter->startElement('v:f');
-					$objWriter->writeAttribute('eqn', 		'if lineDrawn pixelLineWidth 0');
-					$objWriter->endElement();
-
-					// v:f
-					$objWriter->startElement('v:f');
-					$objWriter->writeAttribute('eqn', 		'sum @0 1 0');
-					$objWriter->endElement();
-
-					// v:f
-					$objWriter->startElement('v:f');
-					$objWriter->writeAttribute('eqn', 		'sum 0 0 @1');
-					$objWriter->endElement();
-
-					// v:f
-					$objWriter->startElement('v:f');
-					$objWriter->writeAttribute('eqn', 		'prod @2 1 2');
-					$objWriter->endElement();
-
-					// v:f
-					$objWriter->startElement('v:f');
-					$objWriter->writeAttribute('eqn', 		'prod @3 21600 pixelWidth');
-					$objWriter->endElement();
-
-					// v:f
-					$objWriter->startElement('v:f');
-					$objWriter->writeAttribute('eqn', 		'prod @3 21600 pixelHeight');
-					$objWriter->endElement();
-
-					// v:f
-					$objWriter->startElement('v:f');
-					$objWriter->writeAttribute('eqn', 		'sum @0 0 1');
-					$objWriter->endElement();
-
-					// v:f
-					$objWriter->startElement('v:f');
-					$objWriter->writeAttribute('eqn', 		'prod @6 1 2');
-					$objWriter->endElement();
-
-					// v:f
-					$objWriter->startElement('v:f');
-					$objWriter->writeAttribute('eqn', 		'prod @7 21600 pixelWidth');
-					$objWriter->endElement();
-
-					// v:f
-					$objWriter->startElement('v:f');
-					$objWriter->writeAttribute('eqn', 		'sum @8 21600 0');
-					$objWriter->endElement();
-
-					// v:f
-					$objWriter->startElement('v:f');
-					$objWriter->writeAttribute('eqn', 		'prod @7 21600 pixelHeight');
-					$objWriter->endElement();
-
-					// v:f
-					$objWriter->startElement('v:f');
-					$objWriter->writeAttribute('eqn', 		'sum @10 21600 0');
-					$objWriter->endElement();
-
-				$objWriter->endElement();
-
-				// v:path
-				$objWriter->startElement('v:path');
-				$objWriter->writeAttribute('o:extrusionok', 	'f');
-				$objWriter->writeAttribute('gradientshapeok', 	't');
-				$objWriter->writeAttribute('o:connecttype', 	'rect');
-				$objWriter->endElement();
-
-				// o:lock
-				$objWriter->startElement('o:lock');
-				$objWriter->writeAttribute('v:ext', 			'edit');
-				$objWriter->writeAttribute('aspectratio', 		't');
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-
-			// Loop through images
-			foreach ($images as $key => $value) {
-				$this->_writeVMLHeaderFooterImage($objWriter, $key, $value);
-			}
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Write VML comment to XML format
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter		$objWriter 			XML Writer
-	 * @param	string							$pReference			Reference
-	 * @param 	PHPExcel_Worksheet_HeaderFooterDrawing	$pImage		Image
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function _writeVMLHeaderFooterImage(PHPExcel_Shared_XMLWriter $objWriter = null, $pReference = '', PHPExcel_Worksheet_HeaderFooterDrawing $pImage = null)
-	{
-		// Calculate object id
-		preg_match('{(\d+)}', md5($pReference), $m);
-		$id = 1500 + (substr($m[1], 0, 2) * 1);
-
-		// Calculate offset
-		$width = $pImage->getWidth();
-		$height = $pImage->getHeight();
-		$marginLeft = $pImage->getOffsetX();
-		$marginTop = $pImage->getOffsetY();
-
-		// v:shape
-		$objWriter->startElement('v:shape');
-		$objWriter->writeAttribute('id', 			$pReference);
-		$objWriter->writeAttribute('o:spid', 		'_x0000_s' . $id);
-		$objWriter->writeAttribute('type', 			'#_x0000_t75');
-		$objWriter->writeAttribute('style', 		"position:absolute;margin-left:{$marginLeft}px;margin-top:{$marginTop}px;width:{$width}px;height:{$height}px;z-index:1");
-
-			// v:imagedata
-			$objWriter->startElement('v:imagedata');
-			$objWriter->writeAttribute('o:relid', 		'rId' . $pReference);
-			$objWriter->writeAttribute('o:title', 		$pImage->getName());
-			$objWriter->endElement();
-
-			// o:lock
-			$objWriter->startElement('o:lock');
-			$objWriter->writeAttribute('v:ext', 		'edit');
-			$objWriter->writeAttribute('rotation', 		't');
-			$objWriter->endElement();
-
-		$objWriter->endElement();
-	}
-
-
-	/**
-	 * Get an array of all drawings
-	 *
-	 * @param 	PHPExcel							$pPHPExcel
-	 * @return 	PHPExcel_Worksheet_Drawing[]		All drawings in PHPExcel
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function allDrawings(PHPExcel $pPHPExcel = null)
-	{
-		// Get an array of all drawings
-		$aDrawings	= array();
-
-		// Loop through PHPExcel
-		$sheetCount = $pPHPExcel->getSheetCount();
-		for ($i = 0; $i < $sheetCount; ++$i) {
-			// Loop through images and add to array
-			$iterator = $pPHPExcel->getSheet($i)->getDrawingCollection()->getIterator();
-			while ($iterator->valid()) {
-				$aDrawings[] = $iterator->current();
-
-  				$iterator->next();
-			}
-		}
-
-		return $aDrawings;
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Rels.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Rels.php
deleted file mode 100644
index a7d36c0a9d0..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Rels.php
+++ /dev/null
@@ -1,437 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel2007_Rels
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel2007_Rels extends PHPExcel_Writer_Excel2007_WriterPart
-{
-	/**
-	 * Write relationships to XML format
-	 *
-	 * @param 	PHPExcel	$pPHPExcel
-	 * @return 	string 		XML Output
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function writeRelationships(PHPExcel $pPHPExcel = null)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-		// Relationships
-		$objWriter->startElement('Relationships');
-		$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
-
-			$customPropertyList = $pPHPExcel->getProperties()->getCustomProperties();
-			if (!empty($customPropertyList)) {
-				// Relationship docProps/app.xml
-				$this->_writeRelationship(
-					$objWriter,
-					4,
-					'http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties',
-					'docProps/custom.xml'
-				);
-
-			}
-
-			// Relationship docProps/app.xml
-			$this->_writeRelationship(
-				$objWriter,
-				3,
-				'http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties',
-				'docProps/app.xml'
-			);
-
-			// Relationship docProps/core.xml
-			$this->_writeRelationship(
-				$objWriter,
-				2,
-				'http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties',
-				'docProps/core.xml'
-			);
-
-			// Relationship xl/workbook.xml
-			$this->_writeRelationship(
-				$objWriter,
-				1,
-				'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument',
-				'xl/workbook.xml'
-			);
-			// a custom UI in workbook ?
-			if($pPHPExcel->hasRibbon()){
-				$this->_writeRelationShip(
-					$objWriter,
-					5,
-					'http://schemas.microsoft.com/office/2006/relationships/ui/extensibility',
-					$pPHPExcel->getRibbonXMLData('target')
-				);
-			}
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Write workbook relationships to XML format
-	 *
-	 * @param 	PHPExcel	$pPHPExcel
-	 * @return 	string 		XML Output
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function writeWorkbookRelationships(PHPExcel $pPHPExcel = null)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-		// Relationships
-		$objWriter->startElement('Relationships');
-		$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
-
-			// Relationship styles.xml
-			$this->_writeRelationship(
-				$objWriter,
-				1,
-				'http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles',
-				'styles.xml'
-			);
-
-			// Relationship theme/theme1.xml
-			$this->_writeRelationship(
-				$objWriter,
-				2,
-				'http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme',
-				'theme/theme1.xml'
-			);
-
-			// Relationship sharedStrings.xml
-			$this->_writeRelationship(
-				$objWriter,
-				3,
-				'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings',
-				'sharedStrings.xml'
-			);
-
-			// Relationships with sheets
-			$sheetCount = $pPHPExcel->getSheetCount();
-			for ($i = 0; $i < $sheetCount; ++$i) {
-				$this->_writeRelationship(
-					$objWriter,
-					($i + 1 + 3),
-					'http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet',
-					'worksheets/sheet' . ($i + 1) . '.xml'
-				);
-			}
-			// Relationships for vbaProject if needed
-			// id : just after the last sheet
-			if($pPHPExcel->hasMacros()){
-				$this->_writeRelationShip(
-					$objWriter,
-					($i + 1 + 3),
-					'http://schemas.microsoft.com/office/2006/relationships/vbaProject',
-					'vbaProject.bin'
-				);
-				++$i;//increment i if needed for an another relation
-			}
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Write worksheet relationships to XML format
-	 *
-	 * Numbering is as follows:
-	 * 	rId1 				- Drawings
-	 *  rId_hyperlink_x 	- Hyperlinks
-	 *
-	 * @param 	PHPExcel_Worksheet	$pWorksheet
-	 * @param 	int					$pWorksheetId
-	 * @param	boolean				$includeCharts	Flag indicating if we should write charts
-	 * @return 	string 				XML Output
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function writeWorksheetRelationships(PHPExcel_Worksheet $pWorksheet = null, $pWorksheetId = 1, $includeCharts = FALSE)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-		// Relationships
-		$objWriter->startElement('Relationships');
-		$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
-
-			// Write drawing relationships?
-			$d = 0;
-			if ($includeCharts) {
-				$charts = $pWorksheet->getChartCollection();
-			} else {
-				$charts = array();
-			}
-			if (($pWorksheet->getDrawingCollection()->count() > 0) ||
-				(count($charts) > 0)) {
-				$this->_writeRelationship(
-					$objWriter,
-					++$d,
-					'http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing',
-					'../drawings/drawing' . $pWorksheetId . '.xml'
-				);
-			}
-
-			// Write chart relationships?
-//			$chartCount = 0;
-//			$charts = $pWorksheet->getChartCollection();
-//			echo 'Chart Rels: ' , count($charts) , '<br />';
-//			if (count($charts) > 0) {
-//				foreach($charts as $chart) {
-//					$this->_writeRelationship(
-//						$objWriter,
-//						++$d,
-//						'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart',
-//						'../charts/chart' . ++$chartCount . '.xml'
-//					);
-//				}
-//			}
-//
-			// Write hyperlink relationships?
-			$i = 1;
-			foreach ($pWorksheet->getHyperlinkCollection() as $hyperlink) {
-				if (!$hyperlink->isInternal()) {
-					$this->_writeRelationship(
-						$objWriter,
-						'_hyperlink_' . $i,
-						'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink',
-						$hyperlink->getUrl(),
-						'External'
-					);
-
-					++$i;
-				}
-			}
-
-			// Write comments relationship?
-			$i = 1;
-			if (count($pWorksheet->getComments()) > 0) {
-				$this->_writeRelationship(
-					$objWriter,
-					'_comments_vml' . $i,
-					'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing',
-					'../drawings/vmlDrawing' . $pWorksheetId . '.vml'
-				);
-
-				$this->_writeRelationship(
-					$objWriter,
-					'_comments' . $i,
-					'http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments',
-					'../comments' . $pWorksheetId . '.xml'
-				);
-			}
-
-			// Write header/footer relationship?
-			$i = 1;
-			if (count($pWorksheet->getHeaderFooter()->getImages()) > 0) {
-				$this->_writeRelationship(
-					$objWriter,
-					'_headerfooter_vml' . $i,
-					'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing',
-					'../drawings/vmlDrawingHF' . $pWorksheetId . '.vml'
-				);
-			}
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Write drawing relationships to XML format
-	 *
-	 * @param 	PHPExcel_Worksheet	$pWorksheet
-	 * @param	int					&$chartRef		Chart ID
-	 * @param	boolean				$includeCharts	Flag indicating if we should write charts
-	 * @return 	string 				XML Output
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function writeDrawingRelationships(PHPExcel_Worksheet $pWorksheet = null, &$chartRef, $includeCharts = FALSE)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-		// Relationships
-		$objWriter->startElement('Relationships');
-		$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
-
-			// Loop through images and write relationships
-			$i = 1;
-			$iterator = $pWorksheet->getDrawingCollection()->getIterator();
-			while ($iterator->valid()) {
-				if ($iterator->current() instanceof PHPExcel_Worksheet_Drawing
-					|| $iterator->current() instanceof PHPExcel_Worksheet_MemoryDrawing) {
-					// Write relationship for image drawing
-					$this->_writeRelationship(
-						$objWriter,
-						$i,
-						'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image',
-						'../media/' . str_replace(' ', '', $iterator->current()->getIndexedFilename())
-					);
-				}
-
-				$iterator->next();
-				++$i;
-			}
-
-			if ($includeCharts) {
-				// Loop through charts and write relationships
-				$chartCount = $pWorksheet->getChartCount();
-				if ($chartCount > 0) {
-					for ($c = 0; $c < $chartCount; ++$c) {
-						$this->_writeRelationship(
-							$objWriter,
-							$i++,
-							'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart',
-							'../charts/chart' . ++$chartRef . '.xml'
-						);
-					}
-				}
-			}
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Write header/footer drawing relationships to XML format
-	 *
-	 * @param 	PHPExcel_Worksheet			$pWorksheet
-	 * @return 	string 						XML Output
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function writeHeaderFooterDrawingRelationships(PHPExcel_Worksheet $pWorksheet = null)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-		// Relationships
-		$objWriter->startElement('Relationships');
-		$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
-
-			// Loop through images and write relationships
-			foreach ($pWorksheet->getHeaderFooter()->getImages() as $key => $value) {
-				// Write relationship for image drawing
-				$this->_writeRelationship(
-					$objWriter,
-					$key,
-					'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image',
-					'../media/' . $value->getIndexedFilename()
-				);
-			}
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Write Override content type
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
-	 * @param 	int							$pId			Relationship ID. rId will be prepended!
-	 * @param 	string						$pType			Relationship type
-	 * @param 	string 						$pTarget		Relationship target
-	 * @param 	string 						$pTargetMode	Relationship target mode
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _writeRelationship(PHPExcel_Shared_XMLWriter $objWriter = null, $pId = 1, $pType = '', $pTarget = '', $pTargetMode = '')
-	{
-		if ($pType != '' && $pTarget != '') {
-			// Write relationship
-			$objWriter->startElement('Relationship');
-			$objWriter->writeAttribute('Id', 		'rId' . $pId);
-			$objWriter->writeAttribute('Type', 		$pType);
-			$objWriter->writeAttribute('Target',	$pTarget);
-
-			if ($pTargetMode != '') {
-				$objWriter->writeAttribute('TargetMode',	$pTargetMode);
-			}
-
-			$objWriter->endElement();
-		} else {
-			throw new PHPExcel_Writer_Exception("Invalid parameters passed.");
-		}
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsRibbon.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsRibbon.php
deleted file mode 100644
index 615f2cbd993..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsRibbon.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version     ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel2007_RelsRibbon
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel2007_RelsRibbon extends PHPExcel_Writer_Excel2007_WriterPart
-{
-	/**
-	 * Write relationships for additional objects of custom UI (ribbon)
-	 *
-	 * @param 	PHPExcel	$pPHPExcel
-	 * @return 	string 		XML Output
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function writeRibbonRelationships(PHPExcel $pPHPExcel = null){
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-		// Relationships
-		$objWriter->startElement('Relationships');
-		$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
-		$localRels=$pPHPExcel->getRibbonBinObjects('names');
-		if(is_array($localRels)){
-			foreach($localRels as $aId=>$aTarget){
-				$objWriter->startElement('Relationship');
-				$objWriter->writeAttribute('Id', $aId);
-				$objWriter->writeAttribute('Type', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image');
-				$objWriter->writeAttribute('Target', $aTarget);
-				$objWriter->endElement();//Relationship
-			}
-		}
-		$objWriter->endElement();//Relationships
-
-		// Return
-		return $objWriter->getData();
-
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsVBA.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsVBA.php
deleted file mode 100644
index 3f87d81f2a7..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsVBA.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version     ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel2007_RelsVBA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel2007_RelsVBA extends PHPExcel_Writer_Excel2007_WriterPart
-{
-	/**
-	 * Write relationships for a signed VBA Project
-	 *
-	 * @param 	PHPExcel	$pPHPExcel
-	 * @return 	string 		XML Output
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function writeVBARelationships(PHPExcel $pPHPExcel = null){
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-		// Relationships
-		$objWriter->startElement('Relationships');
-		$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
-		$objWriter->startElement('Relationship');
-		$objWriter->writeAttribute('Id', 'rId1');
-		$objWriter->writeAttribute('Type', 'http://schemas.microsoft.com/office/2006/relationships/vbaProjectSignature');
-		$objWriter->writeAttribute('Target', 'vbaProjectSignature.bin');
-		$objWriter->endElement();//Relationship
-		$objWriter->endElement();//Relationships
-
-		// Return
-		return $objWriter->getData();
-
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/StringTable.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/StringTable.php
deleted file mode 100644
index e8ca1c5a566..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/StringTable.php
+++ /dev/null
@@ -1,319 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel2007_StringTable
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel2007_StringTable extends PHPExcel_Writer_Excel2007_WriterPart
-{
-	/**
-	 * Create worksheet stringtable
-	 *
-	 * @param 	PHPExcel_Worksheet 	$pSheet				Worksheet
-	 * @param 	string[] 				$pExistingTable 	Existing table to eventually merge with
-	 * @return 	string[] 				String table for worksheet
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function createStringTable($pSheet = null, $pExistingTable = null)
-	{
-		if ($pSheet !== NULL) {
-			// Create string lookup table
-			$aStringTable = array();
-			$cellCollection = null;
-			$aFlippedStringTable = null;	// For faster lookup
-
-			// Is an existing table given?
-			if (($pExistingTable !== NULL) && is_array($pExistingTable)) {
-				$aStringTable = $pExistingTable;
-			}
-
-			// Fill index array
-			$aFlippedStringTable = $this->flipStringTable($aStringTable);
-
-			// Loop through cells
-			foreach ($pSheet->getCellCollection() as $cellID) {
-				$cell = $pSheet->getCell($cellID);
-				$cellValue = $cell->getValue();
-				if (!is_object($cellValue) &&
-					($cellValue !== NULL) &&
-					$cellValue !== '' &&
-					!isset($aFlippedStringTable[$cellValue]) &&
-					($cell->getDataType() == PHPExcel_Cell_DataType::TYPE_STRING || $cell->getDataType() == PHPExcel_Cell_DataType::TYPE_STRING2 || $cell->getDataType() == PHPExcel_Cell_DataType::TYPE_NULL)) {
-						$aStringTable[] = $cellValue;
-						$aFlippedStringTable[$cellValue] = true;
-				} elseif ($cellValue instanceof PHPExcel_RichText &&
-						  ($cellValue !== NULL) &&
-						  !isset($aFlippedStringTable[$cellValue->getHashCode()])) {
-								$aStringTable[] = $cellValue;
-								$aFlippedStringTable[$cellValue->getHashCode()] = true;
-	        	}
-	        }
-
-	        // Return
-	        return $aStringTable;
-		} else {
-			throw new PHPExcel_Writer_Exception("Invalid PHPExcel_Worksheet object passed.");
-		}
-	}
-
-	/**
-	 * Write string table to XML format
-	 *
-	 * @param 	string[] 	$pStringTable
-	 * @return 	string 		XML Output
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function writeStringTable($pStringTable = null)
-	{
-		if ($pStringTable !== NULL) {
-			// Create XML writer
-			$objWriter = null;
-			if ($this->getParentWriter()->getUseDiskCaching()) {
-				$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-			} else {
-				$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-			}
-
-			// XML header
-			$objWriter->startDocument('1.0','UTF-8','yes');
-
-			// String table
-			$objWriter->startElement('sst');
-			$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
-			$objWriter->writeAttribute('uniqueCount', count($pStringTable));
-
-				// Loop through string table
-				foreach ($pStringTable as $textElement) {
-					$objWriter->startElement('si');
-
-						if (! $textElement instanceof PHPExcel_RichText) {
-							$textToWrite = PHPExcel_Shared_String::ControlCharacterPHP2OOXML( $textElement );
-							$objWriter->startElement('t');
-							if ($textToWrite !== trim($textToWrite)) {
-								$objWriter->writeAttribute('xml:space', 'preserve');
-							}
-							$objWriter->writeRawData($textToWrite);
-							$objWriter->endElement();
-						} else if ($textElement instanceof PHPExcel_RichText) {
-							$this->writeRichText($objWriter, $textElement);
-						}
-
-                    $objWriter->endElement();
-				}
-
-			$objWriter->endElement();
-
-			// Return
-			return $objWriter->getData();
-		} else {
-			throw new PHPExcel_Writer_Exception("Invalid string table array passed.");
-		}
-	}
-
-	/**
-	 * Write Rich Text
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter 		XML Writer
-	 * @param 	PHPExcel_RichText			$pRichText		Rich text
-	 * @param 	string						$prefix			Optional Namespace prefix
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function writeRichText(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_RichText $pRichText = null, $prefix=NULL)
-	{
-		if ($prefix !== NULL)
-			$prefix .= ':';
-		// Loop through rich text elements
-		$elements = $pRichText->getRichTextElements();
-		foreach ($elements as $element) {
-			// r
-			$objWriter->startElement($prefix.'r');
-
-				// rPr
-				if ($element instanceof PHPExcel_RichText_Run) {
-					// rPr
-					$objWriter->startElement($prefix.'rPr');
-
-						// rFont
-						$objWriter->startElement($prefix.'rFont');
-						$objWriter->writeAttribute('val', $element->getFont()->getName());
-						$objWriter->endElement();
-
-						// Bold
-						$objWriter->startElement($prefix.'b');
-						$objWriter->writeAttribute('val', ($element->getFont()->getBold() ? 'true' : 'false'));
-						$objWriter->endElement();
-
-						// Italic
-						$objWriter->startElement($prefix.'i');
-						$objWriter->writeAttribute('val', ($element->getFont()->getItalic() ? 'true' : 'false'));
-						$objWriter->endElement();
-
-						// Superscript / subscript
-						if ($element->getFont()->getSuperScript() || $element->getFont()->getSubScript()) {
-							$objWriter->startElement($prefix.'vertAlign');
-							if ($element->getFont()->getSuperScript()) {
-								$objWriter->writeAttribute('val', 'superscript');
-							} else if ($element->getFont()->getSubScript()) {
-								$objWriter->writeAttribute('val', 'subscript');
-							}
-							$objWriter->endElement();
-						}
-
-						// Strikethrough
-						$objWriter->startElement($prefix.'strike');
-						$objWriter->writeAttribute('val', ($element->getFont()->getStrikethrough() ? 'true' : 'false'));
-						$objWriter->endElement();
-
-						// Color
-						$objWriter->startElement($prefix.'color');
-						$objWriter->writeAttribute('rgb', $element->getFont()->getColor()->getARGB());
-						$objWriter->endElement();
-
-						// Size
-						$objWriter->startElement($prefix.'sz');
-						$objWriter->writeAttribute('val', $element->getFont()->getSize());
-						$objWriter->endElement();
-
-						// Underline
-						$objWriter->startElement($prefix.'u');
-						$objWriter->writeAttribute('val', $element->getFont()->getUnderline());
-						$objWriter->endElement();
-
-					$objWriter->endElement();
-				}
-
-				// t
-				$objWriter->startElement($prefix.'t');
-				$objWriter->writeAttribute('xml:space', 'preserve');
-				$objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML( $element->getText() ));
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write Rich Text
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter 		XML Writer
-	 * @param 	string|PHPExcel_RichText	$pRichText		text string or Rich text
-	 * @param 	string						$prefix			Optional Namespace prefix
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function writeRichTextForCharts(PHPExcel_Shared_XMLWriter $objWriter = null, $pRichText = null, $prefix=NULL)
-	{
-		if (!$pRichText instanceof PHPExcel_RichText) {
-			$textRun = $pRichText;
-			$pRichText = new PHPExcel_RichText();
-			$pRichText->createTextRun($textRun);
-		}
-
-		if ($prefix !== NULL)
-			$prefix .= ':';
-		// Loop through rich text elements
-		$elements = $pRichText->getRichTextElements();
-		foreach ($elements as $element) {
-			// r
-			$objWriter->startElement($prefix.'r');
-
-				// rPr
-				$objWriter->startElement($prefix.'rPr');
-
-					// Bold
-					$objWriter->writeAttribute('b', ($element->getFont()->getBold() ? 1 : 0));
-					// Italic
-					$objWriter->writeAttribute('i', ($element->getFont()->getItalic() ? 1 : 0));
-					// Underline
-					$underlineType = $element->getFont()->getUnderline();
-					switch($underlineType) {
-						case 'single' :
-							$underlineType = 'sng';
-							break;
-						case 'double' :
-							$underlineType = 'dbl';
-							break;
-					}
-					$objWriter->writeAttribute('u', $underlineType);
-					// Strikethrough
-					$objWriter->writeAttribute('strike', ($element->getFont()->getStrikethrough() ? 'sngStrike' : 'noStrike'));
-
-					// rFont
-					$objWriter->startElement($prefix.'latin');
-						$objWriter->writeAttribute('typeface', $element->getFont()->getName());
-					$objWriter->endElement();
-
-					// Superscript / subscript
-//					if ($element->getFont()->getSuperScript() || $element->getFont()->getSubScript()) {
-//						$objWriter->startElement($prefix.'vertAlign');
-//						if ($element->getFont()->getSuperScript()) {
-//							$objWriter->writeAttribute('val', 'superscript');
-//						} else if ($element->getFont()->getSubScript()) {
-//							$objWriter->writeAttribute('val', 'subscript');
-//						}
-//						$objWriter->endElement();
-//					}
-//
-				$objWriter->endElement();
-
-				// t
-				$objWriter->startElement($prefix.'t');
-//					$objWriter->writeAttribute('xml:space', 'preserve');	//	Excel2010 accepts, Excel2007 complains
-					$objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML( $element->getText() ));
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Flip string table (for index searching)
-	 *
-	 * @param 	array	$stringTable	Stringtable
-	 * @return 	array
-	 */
-	public function flipStringTable($stringTable = array()) {
-		// Return value
-		$returnValue = array();
-
-		// Loop through stringtable and add flipped items to $returnValue
-		foreach ($stringTable as $key => $value) {
-			if (! $value instanceof PHPExcel_RichText) {
-				$returnValue[$value] = $key;
-			} else if ($value instanceof PHPExcel_RichText) {
-				$returnValue[$value->getHashCode()] = $key;
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Style.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Style.php
deleted file mode 100644
index d38c6eacc02..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Style.php
+++ /dev/null
@@ -1,707 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel2007_Style
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPart
-{
-	/**
-	 * Write styles to XML format
-	 *
-	 * @param 	PHPExcel	$pPHPExcel
-	 * @return 	string 		XML Output
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function writeStyles(PHPExcel $pPHPExcel = null)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-		// styleSheet
-		$objWriter->startElement('styleSheet');
-		$objWriter->writeAttribute('xml:space', 'preserve');
-		$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
-
-			// numFmts
-			$objWriter->startElement('numFmts');
-			$objWriter->writeAttribute('count', $this->getParentWriter()->getNumFmtHashTable()->count());
-
-				// numFmt
-				for ($i = 0; $i < $this->getParentWriter()->getNumFmtHashTable()->count(); ++$i) {
-					$this->_writeNumFmt($objWriter, $this->getParentWriter()->getNumFmtHashTable()->getByIndex($i), $i);
-				}
-
-			$objWriter->endElement();
-
-			// fonts
-			$objWriter->startElement('fonts');
-			$objWriter->writeAttribute('count', $this->getParentWriter()->getFontHashTable()->count());
-
-				// font
-				for ($i = 0; $i < $this->getParentWriter()->getFontHashTable()->count(); ++$i) {
-					$this->_writeFont($objWriter, $this->getParentWriter()->getFontHashTable()->getByIndex($i));
-				}
-
-			$objWriter->endElement();
-
-			// fills
-			$objWriter->startElement('fills');
-			$objWriter->writeAttribute('count', $this->getParentWriter()->getFillHashTable()->count());
-
-				// fill
-				for ($i = 0; $i < $this->getParentWriter()->getFillHashTable()->count(); ++$i) {
-					$this->_writeFill($objWriter, $this->getParentWriter()->getFillHashTable()->getByIndex($i));
-				}
-
-			$objWriter->endElement();
-
-			// borders
-			$objWriter->startElement('borders');
-			$objWriter->writeAttribute('count', $this->getParentWriter()->getBordersHashTable()->count());
-
-				// border
-				for ($i = 0; $i < $this->getParentWriter()->getBordersHashTable()->count(); ++$i) {
-					$this->_writeBorder($objWriter, $this->getParentWriter()->getBordersHashTable()->getByIndex($i));
-				}
-
-			$objWriter->endElement();
-
-			// cellStyleXfs
-			$objWriter->startElement('cellStyleXfs');
-			$objWriter->writeAttribute('count', 1);
-
-				// xf
-				$objWriter->startElement('xf');
-					$objWriter->writeAttribute('numFmtId', 	0);
-					$objWriter->writeAttribute('fontId', 	0);
-					$objWriter->writeAttribute('fillId', 	0);
-					$objWriter->writeAttribute('borderId',	0);
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-
-			// cellXfs
-			$objWriter->startElement('cellXfs');
-			$objWriter->writeAttribute('count', count($pPHPExcel->getCellXfCollection()));
-
-				// xf
-				foreach ($pPHPExcel->getCellXfCollection() as $cellXf) {
-					$this->_writeCellStyleXf($objWriter, $cellXf, $pPHPExcel);
-				}
-
-			$objWriter->endElement();
-
-			// cellStyles
-			$objWriter->startElement('cellStyles');
-			$objWriter->writeAttribute('count', 1);
-
-				// cellStyle
-				$objWriter->startElement('cellStyle');
-					$objWriter->writeAttribute('name', 		'Normal');
-					$objWriter->writeAttribute('xfId', 		0);
-					$objWriter->writeAttribute('builtinId',	0);
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-
-			// dxfs
-			$objWriter->startElement('dxfs');
-			$objWriter->writeAttribute('count', $this->getParentWriter()->getStylesConditionalHashTable()->count());
-
-				// dxf
-				for ($i = 0; $i < $this->getParentWriter()->getStylesConditionalHashTable()->count(); ++$i) {
-					$this->_writeCellStyleDxf($objWriter, $this->getParentWriter()->getStylesConditionalHashTable()->getByIndex($i)->getStyle());
-				}
-
-			$objWriter->endElement();
-
-			// tableStyles
-			$objWriter->startElement('tableStyles');
-			$objWriter->writeAttribute('defaultTableStyle', 'TableStyleMedium9');
-			$objWriter->writeAttribute('defaultPivotStyle', 'PivotTableStyle1');
-			$objWriter->endElement();
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Write Fill
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
-	 * @param 	PHPExcel_Style_Fill			$pFill			Fill style
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _writeFill(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style_Fill $pFill = null)
-	{
-		// Check if this is a pattern type or gradient type
-		if ($pFill->getFillType() === PHPExcel_Style_Fill::FILL_GRADIENT_LINEAR ||
-			$pFill->getFillType() === PHPExcel_Style_Fill::FILL_GRADIENT_PATH) {
-			// Gradient fill
-			$this->_writeGradientFill($objWriter, $pFill);
-		} elseif($pFill->getFillType() !== NULL) {
-			// Pattern fill
-			$this->_writePatternFill($objWriter, $pFill);
-		}
-	}
-
-	/**
-	 * Write Gradient Fill
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
-	 * @param 	PHPExcel_Style_Fill			$pFill			Fill style
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _writeGradientFill(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style_Fill $pFill = null)
-	{
-		// fill
-		$objWriter->startElement('fill');
-
-			// gradientFill
-			$objWriter->startElement('gradientFill');
-				$objWriter->writeAttribute('type', 		$pFill->getFillType());
-				$objWriter->writeAttribute('degree', 	$pFill->getRotation());
-
-				// stop
-				$objWriter->startElement('stop');
-				$objWriter->writeAttribute('position', '0');
-
-					// color
-					$objWriter->startElement('color');
-					$objWriter->writeAttribute('rgb', $pFill->getStartColor()->getARGB());
-					$objWriter->endElement();
-
-				$objWriter->endElement();
-
-				// stop
-				$objWriter->startElement('stop');
-				$objWriter->writeAttribute('position', '1');
-
-					// color
-					$objWriter->startElement('color');
-					$objWriter->writeAttribute('rgb', $pFill->getEndColor()->getARGB());
-					$objWriter->endElement();
-
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write Pattern Fill
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter			$objWriter 		XML Writer
-	 * @param 	PHPExcel_Style_Fill					$pFill			Fill style
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _writePatternFill(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style_Fill $pFill = null)
-	{
-		// fill
-		$objWriter->startElement('fill');
-
-			// patternFill
-			$objWriter->startElement('patternFill');
-				$objWriter->writeAttribute('patternType', $pFill->getFillType());
-
-				if ($pFill->getFillType() !== PHPExcel_Style_Fill::FILL_NONE) {
-					// fgColor
-					if ($pFill->getStartColor()->getARGB()) {
-						$objWriter->startElement('fgColor');
-						$objWriter->writeAttribute('rgb', $pFill->getStartColor()->getARGB());
-						$objWriter->endElement();
-					}
-				}
-				if ($pFill->getFillType() !== PHPExcel_Style_Fill::FILL_NONE) {
-					// bgColor
-					if ($pFill->getEndColor()->getARGB()) {
-						$objWriter->startElement('bgColor');
-						$objWriter->writeAttribute('rgb', $pFill->getEndColor()->getARGB());
-						$objWriter->endElement();
-					}
-				}
-
-			$objWriter->endElement();
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write Font
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter		$objWriter 		XML Writer
-	 * @param 	PHPExcel_Style_Font				$pFont			Font style
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _writeFont(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style_Font $pFont = null)
-	{
-		// font
-		$objWriter->startElement('font');
-			//	Weird! The order of these elements actually makes a difference when opening Excel2007
-			//		files in Excel2003 with the compatibility pack. It's not documented behaviour,
-			//		and makes for a real WTF!
-
-			// Bold. We explicitly write this element also when false (like MS Office Excel 2007 does
-			// for conditional formatting). Otherwise it will apparently not be picked up in conditional
-			// formatting style dialog
-			if ($pFont->getBold() !== NULL) {
-				$objWriter->startElement('b');
-					$objWriter->writeAttribute('val', $pFont->getBold() ? '1' : '0');
-				$objWriter->endElement();
-			}
-
-			// Italic
-			if ($pFont->getItalic() !== NULL) {
-				$objWriter->startElement('i');
-					$objWriter->writeAttribute('val', $pFont->getItalic() ? '1' : '0');
-				$objWriter->endElement();
-			}
-
-			// Strikethrough
-			if ($pFont->getStrikethrough() !== NULL) {
-				$objWriter->startElement('strike');
-				$objWriter->writeAttribute('val', $pFont->getStrikethrough() ? '1' : '0');
-				$objWriter->endElement();
-			}
-
-			// Underline
-			if ($pFont->getUnderline() !== NULL) {
-				$objWriter->startElement('u');
-				$objWriter->writeAttribute('val', $pFont->getUnderline());
-				$objWriter->endElement();
-			}
-
-			// Superscript / subscript
-			if ($pFont->getSuperScript() === TRUE || $pFont->getSubScript() === TRUE) {
-				$objWriter->startElement('vertAlign');
-				if ($pFont->getSuperScript() === TRUE) {
-					$objWriter->writeAttribute('val', 'superscript');
-				} else if ($pFont->getSubScript() === TRUE) {
-					$objWriter->writeAttribute('val', 'subscript');
-				}
-				$objWriter->endElement();
-			}
-
-			// Size
-			if ($pFont->getSize() !== NULL) {
-				$objWriter->startElement('sz');
-					$objWriter->writeAttribute('val', $pFont->getSize());
-				$objWriter->endElement();
-			}
-
-			// Foreground color
-			if ($pFont->getColor()->getARGB() !== NULL) {
-				$objWriter->startElement('color');
-				$objWriter->writeAttribute('rgb', $pFont->getColor()->getARGB());
-				$objWriter->endElement();
-			}
-
-			// Name
-			if ($pFont->getName() !== NULL) {
-				$objWriter->startElement('name');
-					$objWriter->writeAttribute('val', $pFont->getName());
-				$objWriter->endElement();
-			}
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write Border
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter			$objWriter 		XML Writer
-	 * @param 	PHPExcel_Style_Borders				$pBorders		Borders style
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _writeBorder(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style_Borders $pBorders = null)
-	{
-		// Write border
-		$objWriter->startElement('border');
-			// Diagonal?
-			switch ($pBorders->getDiagonalDirection()) {
-				case PHPExcel_Style_Borders::DIAGONAL_UP:
-					$objWriter->writeAttribute('diagonalUp', 	'true');
-					$objWriter->writeAttribute('diagonalDown', 	'false');
-					break;
-				case PHPExcel_Style_Borders::DIAGONAL_DOWN:
-					$objWriter->writeAttribute('diagonalUp', 	'false');
-					$objWriter->writeAttribute('diagonalDown', 	'true');
-					break;
-				case PHPExcel_Style_Borders::DIAGONAL_BOTH:
-					$objWriter->writeAttribute('diagonalUp', 	'true');
-					$objWriter->writeAttribute('diagonalDown', 	'true');
-					break;
-			}
-
-			// BorderPr
-			$this->_writeBorderPr($objWriter, 'left',		$pBorders->getLeft());
-			$this->_writeBorderPr($objWriter, 'right',		$pBorders->getRight());
-			$this->_writeBorderPr($objWriter, 'top',		$pBorders->getTop());
-			$this->_writeBorderPr($objWriter, 'bottom',		$pBorders->getBottom());
-			$this->_writeBorderPr($objWriter, 'diagonal',	$pBorders->getDiagonal());
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write Cell Style Xf
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter			$objWriter 		XML Writer
-	 * @param 	PHPExcel_Style						$pStyle			Style
-	 * @param 	PHPExcel							$pPHPExcel		Workbook
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _writeCellStyleXf(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style $pStyle = null, PHPExcel $pPHPExcel = null)
-	{
-		// xf
-		$objWriter->startElement('xf');
-			$objWriter->writeAttribute('xfId', 0);
-			$objWriter->writeAttribute('fontId', 			(int)$this->getParentWriter()->getFontHashTable()->getIndexForHashCode($pStyle->getFont()->getHashCode()));
-            if ($pStyle->getQuotePrefix()) {
-                $objWriter->writeAttribute('quotePrefix', 	    1);
-            }
-
-			if ($pStyle->getNumberFormat()->getBuiltInFormatCode() === false) {
-				$objWriter->writeAttribute('numFmtId', 			(int)($this->getParentWriter()->getNumFmtHashTable()->getIndexForHashCode($pStyle->getNumberFormat()->getHashCode()) + 164)   );
-			} else {
-				$objWriter->writeAttribute('numFmtId', 			(int)$pStyle->getNumberFormat()->getBuiltInFormatCode());
-			}
-
-			$objWriter->writeAttribute('fillId', 			(int)$this->getParentWriter()->getFillHashTable()->getIndexForHashCode($pStyle->getFill()->getHashCode()));
-			$objWriter->writeAttribute('borderId', 			(int)$this->getParentWriter()->getBordersHashTable()->getIndexForHashCode($pStyle->getBorders()->getHashCode()));
-
-			// Apply styles?
-			$objWriter->writeAttribute('applyFont', 		($pPHPExcel->getDefaultStyle()->getFont()->getHashCode() != $pStyle->getFont()->getHashCode()) ? '1' : '0');
-			$objWriter->writeAttribute('applyNumberFormat', ($pPHPExcel->getDefaultStyle()->getNumberFormat()->getHashCode() != $pStyle->getNumberFormat()->getHashCode()) ? '1' : '0');
-			$objWriter->writeAttribute('applyFill', 		($pPHPExcel->getDefaultStyle()->getFill()->getHashCode() != $pStyle->getFill()->getHashCode()) ? '1' : '0');
-			$objWriter->writeAttribute('applyBorder', 		($pPHPExcel->getDefaultStyle()->getBorders()->getHashCode() != $pStyle->getBorders()->getHashCode()) ? '1' : '0');
-			$objWriter->writeAttribute('applyAlignment',	($pPHPExcel->getDefaultStyle()->getAlignment()->getHashCode() != $pStyle->getAlignment()->getHashCode()) ? '1' : '0');
-			if ($pStyle->getProtection()->getLocked() != PHPExcel_Style_Protection::PROTECTION_INHERIT || $pStyle->getProtection()->getHidden() != PHPExcel_Style_Protection::PROTECTION_INHERIT) {
-				$objWriter->writeAttribute('applyProtection', 'true');
-			}
-
-			// alignment
-			$objWriter->startElement('alignment');
-				$objWriter->writeAttribute('horizontal', 	$pStyle->getAlignment()->getHorizontal());
-				$objWriter->writeAttribute('vertical', 		$pStyle->getAlignment()->getVertical());
-
-				$textRotation = 0;
-				if ($pStyle->getAlignment()->getTextRotation() >= 0) {
-					$textRotation = $pStyle->getAlignment()->getTextRotation();
-				} else if ($pStyle->getAlignment()->getTextRotation() < 0) {
-					$textRotation = 90 - $pStyle->getAlignment()->getTextRotation();
-				}
-				$objWriter->writeAttribute('textRotation', 	$textRotation);
-
-				$objWriter->writeAttribute('wrapText', 		($pStyle->getAlignment()->getWrapText() ? 'true' : 'false'));
-				$objWriter->writeAttribute('shrinkToFit', 	($pStyle->getAlignment()->getShrinkToFit() ? 'true' : 'false'));
-
-				if ($pStyle->getAlignment()->getIndent() > 0) {
-					$objWriter->writeAttribute('indent', 	$pStyle->getAlignment()->getIndent());
-				}
-				if ($pStyle->getAlignment()->getReadorder() > 0) {
-					$objWriter->writeAttribute('readingOrder', 	$pStyle->getAlignment()->getReadorder());
-				}
-			$objWriter->endElement();
-
-			// protection
-			if ($pStyle->getProtection()->getLocked() != PHPExcel_Style_Protection::PROTECTION_INHERIT || $pStyle->getProtection()->getHidden() != PHPExcel_Style_Protection::PROTECTION_INHERIT) {
-				$objWriter->startElement('protection');
-					if ($pStyle->getProtection()->getLocked() != PHPExcel_Style_Protection::PROTECTION_INHERIT) {
-						$objWriter->writeAttribute('locked', 		($pStyle->getProtection()->getLocked() == PHPExcel_Style_Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
-					}
-					if ($pStyle->getProtection()->getHidden() != PHPExcel_Style_Protection::PROTECTION_INHERIT) {
-						$objWriter->writeAttribute('hidden', 		($pStyle->getProtection()->getHidden() == PHPExcel_Style_Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
-					}
-				$objWriter->endElement();
-			}
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write Cell Style Dxf
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter 		$objWriter 		XML Writer
-	 * @param 	PHPExcel_Style					$pStyle			Style
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _writeCellStyleDxf(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style $pStyle = null)
-	{
-		// dxf
-		$objWriter->startElement('dxf');
-
-			// font
-			$this->_writeFont($objWriter, $pStyle->getFont());
-
-			// numFmt
-			$this->_writeNumFmt($objWriter, $pStyle->getNumberFormat());
-
-			// fill
-			$this->_writeFill($objWriter, $pStyle->getFill());
-
-			// alignment
-			$objWriter->startElement('alignment');
-				if ($pStyle->getAlignment()->getHorizontal() !== NULL) {
-					$objWriter->writeAttribute('horizontal', $pStyle->getAlignment()->getHorizontal());
-				}
-				if ($pStyle->getAlignment()->getVertical() !== NULL) {
-					$objWriter->writeAttribute('vertical', $pStyle->getAlignment()->getVertical());
-				}
-
-				if ($pStyle->getAlignment()->getTextRotation() !== NULL) {
-					$textRotation = 0;
-					if ($pStyle->getAlignment()->getTextRotation() >= 0) {
-						$textRotation = $pStyle->getAlignment()->getTextRotation();
-					} else if ($pStyle->getAlignment()->getTextRotation() < 0) {
-						$textRotation = 90 - $pStyle->getAlignment()->getTextRotation();
-					}
-					$objWriter->writeAttribute('textRotation', 	$textRotation);
-				}
-			$objWriter->endElement();
-
-			// border
-			$this->_writeBorder($objWriter, $pStyle->getBorders());
-
-			// protection
-			if (($pStyle->getProtection()->getLocked() !== NULL) ||
-				($pStyle->getProtection()->getHidden() !== NULL)) {
-				if ($pStyle->getProtection()->getLocked() !== PHPExcel_Style_Protection::PROTECTION_INHERIT ||
-					$pStyle->getProtection()->getHidden() !== PHPExcel_Style_Protection::PROTECTION_INHERIT) {
-					$objWriter->startElement('protection');
-						if (($pStyle->getProtection()->getLocked() !== NULL) &&
-							($pStyle->getProtection()->getLocked() !== PHPExcel_Style_Protection::PROTECTION_INHERIT)) {
-							$objWriter->writeAttribute('locked', ($pStyle->getProtection()->getLocked() == PHPExcel_Style_Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
-						}
-						if (($pStyle->getProtection()->getHidden() !== NULL) &&
-							($pStyle->getProtection()->getHidden() !== PHPExcel_Style_Protection::PROTECTION_INHERIT)) {
-							$objWriter->writeAttribute('hidden', ($pStyle->getProtection()->getHidden() == PHPExcel_Style_Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
-						}
-					$objWriter->endElement();
-				}
-			}
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write BorderPr
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter		$objWriter 		XML Writer
-	 * @param 	string							$pName			Element name
-	 * @param 	PHPExcel_Style_Border			$pBorder		Border style
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _writeBorderPr(PHPExcel_Shared_XMLWriter $objWriter = null, $pName = 'left', PHPExcel_Style_Border $pBorder = null)
-	{
-		// Write BorderPr
-		if ($pBorder->getBorderStyle() != PHPExcel_Style_Border::BORDER_NONE) {
-			$objWriter->startElement($pName);
-			$objWriter->writeAttribute('style', 	$pBorder->getBorderStyle());
-
-				// color
-				$objWriter->startElement('color');
-				$objWriter->writeAttribute('rgb', 	$pBorder->getColor()->getARGB());
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write NumberFormat
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter			$objWriter 		XML Writer
-	 * @param 	PHPExcel_Style_NumberFormat			$pNumberFormat	Number Format
-	 * @param 	int									$pId			Number Format identifier
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _writeNumFmt(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style_NumberFormat $pNumberFormat = null, $pId = 0)
-	{
-		// Translate formatcode
-		$formatCode = $pNumberFormat->getFormatCode();
-
-		// numFmt
-		if ($formatCode !== NULL) {
-			$objWriter->startElement('numFmt');
-				$objWriter->writeAttribute('numFmtId', ($pId + 164));
-				$objWriter->writeAttribute('formatCode', $formatCode);
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Get an array of all styles
-	 *
-	 * @param 	PHPExcel				$pPHPExcel
-	 * @return 	PHPExcel_Style[]		All styles in PHPExcel
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function allStyles(PHPExcel $pPHPExcel = null)
-	{
-		$aStyles = $pPHPExcel->getCellXfCollection();
-
-		return $aStyles;
-	}
-
-	/**
-	 * Get an array of all conditional styles
-	 *
-	 * @param 	PHPExcel							$pPHPExcel
-	 * @return 	PHPExcel_Style_Conditional[]		All conditional styles in PHPExcel
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function allConditionalStyles(PHPExcel $pPHPExcel = null)
-	{
-		// Get an array of all styles
-		$aStyles		= array();
-
-		$sheetCount = $pPHPExcel->getSheetCount();
-		for ($i = 0; $i < $sheetCount; ++$i) {
-			foreach ($pPHPExcel->getSheet($i)->getConditionalStylesCollection() as $conditionalStyles) {
-				foreach ($conditionalStyles as $conditionalStyle) {
-					$aStyles[] = $conditionalStyle;
-				}
-			}
-		}
-
-		return $aStyles;
-	}
-
-	/**
-	 * Get an array of all fills
-	 *
-	 * @param 	PHPExcel						$pPHPExcel
-	 * @return 	PHPExcel_Style_Fill[]		All fills in PHPExcel
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function allFills(PHPExcel $pPHPExcel = null)
-	{
-		// Get an array of unique fills
-		$aFills 	= array();
-
-		// Two first fills are predefined
-		$fill0 = new PHPExcel_Style_Fill();
-		$fill0->setFillType(PHPExcel_Style_Fill::FILL_NONE);
-		$aFills[] = $fill0;
-
-		$fill1 = new PHPExcel_Style_Fill();
-		$fill1->setFillType(PHPExcel_Style_Fill::FILL_PATTERN_GRAY125);
-		$aFills[] = $fill1;
-		// The remaining fills
-		$aStyles 	= $this->allStyles($pPHPExcel);
-		foreach ($aStyles as $style) {
-			if (!array_key_exists($style->getFill()->getHashCode(), $aFills)) {
-				$aFills[ $style->getFill()->getHashCode() ] = $style->getFill();
-			}
-		}
-
-		return $aFills;
-	}
-
-	/**
-	 * Get an array of all fonts
-	 *
-	 * @param 	PHPExcel						$pPHPExcel
-	 * @return 	PHPExcel_Style_Font[]		All fonts in PHPExcel
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function allFonts(PHPExcel $pPHPExcel = null)
-	{
-		// Get an array of unique fonts
-		$aFonts 	= array();
-		$aStyles 	= $this->allStyles($pPHPExcel);
-
-		foreach ($aStyles as $style) {
-			if (!array_key_exists($style->getFont()->getHashCode(), $aFonts)) {
-				$aFonts[ $style->getFont()->getHashCode() ] = $style->getFont();
-			}
-		}
-
-		return $aFonts;
-	}
-
-	/**
-	 * Get an array of all borders
-	 *
-	 * @param 	PHPExcel						$pPHPExcel
-	 * @return 	PHPExcel_Style_Borders[]		All borders in PHPExcel
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function allBorders(PHPExcel $pPHPExcel = null)
-	{
-		// Get an array of unique borders
-		$aBorders 	= array();
-		$aStyles 	= $this->allStyles($pPHPExcel);
-
-		foreach ($aStyles as $style) {
-			if (!array_key_exists($style->getBorders()->getHashCode(), $aBorders)) {
-				$aBorders[ $style->getBorders()->getHashCode() ] = $style->getBorders();
-			}
-		}
-
-		return $aBorders;
-	}
-
-	/**
-	 * Get an array of all number formats
-	 *
-	 * @param 	PHPExcel								$pPHPExcel
-	 * @return 	PHPExcel_Style_NumberFormat[]		All number formats in PHPExcel
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function allNumberFormats(PHPExcel $pPHPExcel = null)
-	{
-		// Get an array of unique number formats
-		$aNumFmts 	= array();
-		$aStyles 	= $this->allStyles($pPHPExcel);
-
-		foreach ($aStyles as $style) {
-			if ($style->getNumberFormat()->getBuiltInFormatCode() === false && !array_key_exists($style->getNumberFormat()->getHashCode(), $aNumFmts)) {
-				$aNumFmts[ $style->getNumberFormat()->getHashCode() ] = $style->getNumberFormat();
-			}
-		}
-
-		return $aNumFmts;
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Theme.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Theme.php
deleted file mode 100644
index c67b948165c..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Theme.php
+++ /dev/null
@@ -1,871 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel2007_Theme
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel2007_Theme extends PHPExcel_Writer_Excel2007_WriterPart
-{
-	/**
-	 * Map of Major fonts to write
-	 * @static	array of string
-	 *
-	 */
-	private static $_majorFonts = array(
-					'Jpan' => 'ＭＳ Ｐゴシック',
-					'Hang' => '맑은 고딕',
-					'Hans' => '宋体',
-					'Hant' => '新細明體',
-					'Arab' => 'Times New Roman',
-					'Hebr' => 'Times New Roman',
-					'Thai' => 'Tahoma',
-					'Ethi' => 'Nyala',
-					'Beng' => 'Vrinda',
-					'Gujr' => 'Shruti',
-					'Khmr' => 'MoolBoran',
-					'Knda' => 'Tunga',
-					'Guru' => 'Raavi',
-					'Cans' => 'Euphemia',
-					'Cher' => 'Plantagenet Cherokee',
-					'Yiii' => 'Microsoft Yi Baiti',
-					'Tibt' => 'Microsoft Himalaya',
-					'Thaa' => 'MV Boli',
-					'Deva' => 'Mangal',
-					'Telu' => 'Gautami',
-					'Taml' => 'Latha',
-					'Syrc' => 'Estrangelo Edessa',
-					'Orya' => 'Kalinga',
-					'Mlym' => 'Kartika',
-					'Laoo' => 'DokChampa',
-					'Sinh' => 'Iskoola Pota',
-					'Mong' => 'Mongolian Baiti',
-					'Viet' => 'Times New Roman',
-					'Uigh' => 'Microsoft Uighur',
-					'Geor' => 'Sylfaen',
-			);
-
-	/**
-	 * Map of Minor fonts to write
-	 * @static	array of string
-	 *
-	 */
-	private static $_minorFonts = array(
-					'Jpan' => 'ＭＳ Ｐゴシック',
-					'Hang' => '맑은 고딕',
-					'Hans' => '宋体',
-					'Hant' => '新細明體',
-					'Arab' => 'Arial',
-					'Hebr' => 'Arial',
-					'Thai' => 'Tahoma',
-					'Ethi' => 'Nyala',
-					'Beng' => 'Vrinda',
-					'Gujr' => 'Shruti',
-					'Khmr' => 'DaunPenh',
-					'Knda' => 'Tunga',
-					'Guru' => 'Raavi',
-					'Cans' => 'Euphemia',
-					'Cher' => 'Plantagenet Cherokee',
-					'Yiii' => 'Microsoft Yi Baiti',
-					'Tibt' => 'Microsoft Himalaya',
-					'Thaa' => 'MV Boli',
-					'Deva' => 'Mangal',
-					'Telu' => 'Gautami',
-					'Taml' => 'Latha',
-					'Syrc' => 'Estrangelo Edessa',
-					'Orya' => 'Kalinga',
-					'Mlym' => 'Kartika',
-					'Laoo' => 'DokChampa',
-					'Sinh' => 'Iskoola Pota',
-					'Mong' => 'Mongolian Baiti',
-					'Viet' => 'Arial',
-					'Uigh' => 'Microsoft Uighur',
-					'Geor' => 'Sylfaen',
-			);
-
-	/**
-	 * Map of core colours
-	 * @static	array of string
-	 *
-	 */
-		private static $_colourScheme = array(
-					'dk2'		=> '1F497D',
-					'lt2'		=> 'EEECE1',
-					'accent1'	=> '4F81BD',
-					'accent2'	=> 'C0504D',
-					'accent3'	=> '9BBB59',
-					'accent4'	=> '8064A2',
-					'accent5'	=> '4BACC6',
-					'accent6'	=> 'F79646',
-					'hlink'		=> '0000FF',
-					'folHlink'	=> '800080',
-			);
-			
-	/**
-	 * Write theme to XML format
-	 *
-	 * @param 	PHPExcel	$pPHPExcel
-	 * @return 	string 		XML Output
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function writeTheme(PHPExcel $pPHPExcel = null)
-	{
-			// Create XML writer
-			$objWriter = null;
-			if ($this->getParentWriter()->getUseDiskCaching()) {
-				$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-			} else {
-				$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-			}
-
-			// XML header
-			$objWriter->startDocument('1.0','UTF-8','yes');
-
-			// a:theme
-			$objWriter->startElement('a:theme');
-			$objWriter->writeAttribute('xmlns:a', 'http://schemas.openxmlformats.org/drawingml/2006/main');
-			$objWriter->writeAttribute('name', 'Office Theme');
-
-				// a:themeElements
-				$objWriter->startElement('a:themeElements');
-
-					// a:clrScheme
-					$objWriter->startElement('a:clrScheme');
-					$objWriter->writeAttribute('name', 'Office');
-
-						// a:dk1
-						$objWriter->startElement('a:dk1');
-
-							// a:sysClr
-							$objWriter->startElement('a:sysClr');
-							$objWriter->writeAttribute('val', 'windowText');
-							$objWriter->writeAttribute('lastClr', '000000');
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-
-						// a:lt1
-						$objWriter->startElement('a:lt1');
-
-							// a:sysClr
-							$objWriter->startElement('a:sysClr');
-							$objWriter->writeAttribute('val', 'window');
-							$objWriter->writeAttribute('lastClr', 'FFFFFF');
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-
-						// a:dk2
-						$this->_writeColourScheme($objWriter);
-
-					$objWriter->endElement();
-
-					// a:fontScheme
-					$objWriter->startElement('a:fontScheme');
-					$objWriter->writeAttribute('name', 'Office');
-
-						// a:majorFont
-						$objWriter->startElement('a:majorFont');
-							$this->_writeFonts($objWriter, 'Cambria', self::$_majorFonts);
-						$objWriter->endElement();
-
-						// a:minorFont
-						$objWriter->startElement('a:minorFont');
-							$this->_writeFonts($objWriter, 'Calibri', self::$_minorFonts);
-						$objWriter->endElement();
-
-					$objWriter->endElement();
-
-					// a:fmtScheme
-					$objWriter->startElement('a:fmtScheme');
-					$objWriter->writeAttribute('name', 'Office');
-
-						// a:fillStyleLst
-						$objWriter->startElement('a:fillStyleLst');
-
-							// a:solidFill
-							$objWriter->startElement('a:solidFill');
-
-								// a:schemeClr
-								$objWriter->startElement('a:schemeClr');
-								$objWriter->writeAttribute('val', 'phClr');
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-							// a:gradFill
-							$objWriter->startElement('a:gradFill');
-							$objWriter->writeAttribute('rotWithShape', '1');
-
-								// a:gsLst
-								$objWriter->startElement('a:gsLst');
-
-									// a:gs
-									$objWriter->startElement('a:gs');
-									$objWriter->writeAttribute('pos', '0');
-
-										// a:schemeClr
-										$objWriter->startElement('a:schemeClr');
-										$objWriter->writeAttribute('val', 'phClr');
-
-											// a:tint
-											$objWriter->startElement('a:tint');
-											$objWriter->writeAttribute('val', '50000');
-											$objWriter->endElement();
-
-											// a:satMod
-											$objWriter->startElement('a:satMod');
-											$objWriter->writeAttribute('val', '300000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-									// a:gs
-									$objWriter->startElement('a:gs');
-									$objWriter->writeAttribute('pos', '35000');
-
-										// a:schemeClr
-										$objWriter->startElement('a:schemeClr');
-										$objWriter->writeAttribute('val', 'phClr');
-
-											// a:tint
-											$objWriter->startElement('a:tint');
-											$objWriter->writeAttribute('val', '37000');
-											$objWriter->endElement();
-
-											// a:satMod
-											$objWriter->startElement('a:satMod');
-											$objWriter->writeAttribute('val', '300000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-									// a:gs
-									$objWriter->startElement('a:gs');
-									$objWriter->writeAttribute('pos', '100000');
-
-										// a:schemeClr
-										$objWriter->startElement('a:schemeClr');
-										$objWriter->writeAttribute('val', 'phClr');
-
-											// a:tint
-											$objWriter->startElement('a:tint');
-											$objWriter->writeAttribute('val', '15000');
-											$objWriter->endElement();
-
-											// a:satMod
-											$objWriter->startElement('a:satMod');
-											$objWriter->writeAttribute('val', '350000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-								// a:lin
-								$objWriter->startElement('a:lin');
-								$objWriter->writeAttribute('ang', '16200000');
-								$objWriter->writeAttribute('scaled', '1');
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-							// a:gradFill
-							$objWriter->startElement('a:gradFill');
-							$objWriter->writeAttribute('rotWithShape', '1');
-
-								// a:gsLst
-								$objWriter->startElement('a:gsLst');
-
-									// a:gs
-									$objWriter->startElement('a:gs');
-									$objWriter->writeAttribute('pos', '0');
-
-										// a:schemeClr
-										$objWriter->startElement('a:schemeClr');
-										$objWriter->writeAttribute('val', 'phClr');
-
-											// a:shade
-											$objWriter->startElement('a:shade');
-											$objWriter->writeAttribute('val', '51000');
-											$objWriter->endElement();
-
-											// a:satMod
-											$objWriter->startElement('a:satMod');
-											$objWriter->writeAttribute('val', '130000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-									// a:gs
-									$objWriter->startElement('a:gs');
-									$objWriter->writeAttribute('pos', '80000');
-
-										// a:schemeClr
-										$objWriter->startElement('a:schemeClr');
-										$objWriter->writeAttribute('val', 'phClr');
-
-											// a:shade
-											$objWriter->startElement('a:shade');
-											$objWriter->writeAttribute('val', '93000');
-											$objWriter->endElement();
-
-											// a:satMod
-											$objWriter->startElement('a:satMod');
-											$objWriter->writeAttribute('val', '130000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-									// a:gs
-									$objWriter->startElement('a:gs');
-									$objWriter->writeAttribute('pos', '100000');
-
-										// a:schemeClr
-										$objWriter->startElement('a:schemeClr');
-										$objWriter->writeAttribute('val', 'phClr');
-
-											// a:shade
-											$objWriter->startElement('a:shade');
-											$objWriter->writeAttribute('val', '94000');
-											$objWriter->endElement();
-
-											// a:satMod
-											$objWriter->startElement('a:satMod');
-											$objWriter->writeAttribute('val', '135000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-								// a:lin
-								$objWriter->startElement('a:lin');
-								$objWriter->writeAttribute('ang', '16200000');
-								$objWriter->writeAttribute('scaled', '0');
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-
-						// a:lnStyleLst
-						$objWriter->startElement('a:lnStyleLst');
-
-							// a:ln
-							$objWriter->startElement('a:ln');
-							$objWriter->writeAttribute('w', '9525');
-							$objWriter->writeAttribute('cap', 'flat');
-							$objWriter->writeAttribute('cmpd', 'sng');
-							$objWriter->writeAttribute('algn', 'ctr');
-
-								// a:solidFill
-								$objWriter->startElement('a:solidFill');
-
-									// a:schemeClr
-									$objWriter->startElement('a:schemeClr');
-									$objWriter->writeAttribute('val', 'phClr');
-
-											// a:shade
-											$objWriter->startElement('a:shade');
-											$objWriter->writeAttribute('val', '95000');
-											$objWriter->endElement();
-
-											// a:satMod
-											$objWriter->startElement('a:satMod');
-											$objWriter->writeAttribute('val', '105000');
-											$objWriter->endElement();
-
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-								// a:prstDash
-								$objWriter->startElement('a:prstDash');
-								$objWriter->writeAttribute('val', 'solid');
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-							// a:ln
-							$objWriter->startElement('a:ln');
-							$objWriter->writeAttribute('w', '25400');
-							$objWriter->writeAttribute('cap', 'flat');
-							$objWriter->writeAttribute('cmpd', 'sng');
-							$objWriter->writeAttribute('algn', 'ctr');
-
-								// a:solidFill
-								$objWriter->startElement('a:solidFill');
-
-									// a:schemeClr
-									$objWriter->startElement('a:schemeClr');
-									$objWriter->writeAttribute('val', 'phClr');
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-								// a:prstDash
-								$objWriter->startElement('a:prstDash');
-								$objWriter->writeAttribute('val', 'solid');
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-							// a:ln
-							$objWriter->startElement('a:ln');
-							$objWriter->writeAttribute('w', '38100');
-							$objWriter->writeAttribute('cap', 'flat');
-							$objWriter->writeAttribute('cmpd', 'sng');
-							$objWriter->writeAttribute('algn', 'ctr');
-
-								// a:solidFill
-								$objWriter->startElement('a:solidFill');
-
-									// a:schemeClr
-									$objWriter->startElement('a:schemeClr');
-									$objWriter->writeAttribute('val', 'phClr');
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-								// a:prstDash
-								$objWriter->startElement('a:prstDash');
-								$objWriter->writeAttribute('val', 'solid');
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-
-
-
-						// a:effectStyleLst
-						$objWriter->startElement('a:effectStyleLst');
-
-							// a:effectStyle
-							$objWriter->startElement('a:effectStyle');
-
-								// a:effectLst
-								$objWriter->startElement('a:effectLst');
-
-									// a:outerShdw
-									$objWriter->startElement('a:outerShdw');
-									$objWriter->writeAttribute('blurRad', '40000');
-									$objWriter->writeAttribute('dist', '20000');
-									$objWriter->writeAttribute('dir', '5400000');
-									$objWriter->writeAttribute('rotWithShape', '0');
-
-										// a:srgbClr
-										$objWriter->startElement('a:srgbClr');
-										$objWriter->writeAttribute('val', '000000');
-
-											// a:alpha
-											$objWriter->startElement('a:alpha');
-											$objWriter->writeAttribute('val', '38000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-							// a:effectStyle
-							$objWriter->startElement('a:effectStyle');
-
-								// a:effectLst
-								$objWriter->startElement('a:effectLst');
-
-									// a:outerShdw
-									$objWriter->startElement('a:outerShdw');
-									$objWriter->writeAttribute('blurRad', '40000');
-									$objWriter->writeAttribute('dist', '23000');
-									$objWriter->writeAttribute('dir', '5400000');
-									$objWriter->writeAttribute('rotWithShape', '0');
-
-										// a:srgbClr
-										$objWriter->startElement('a:srgbClr');
-										$objWriter->writeAttribute('val', '000000');
-
-											// a:alpha
-											$objWriter->startElement('a:alpha');
-											$objWriter->writeAttribute('val', '35000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-							// a:effectStyle
-							$objWriter->startElement('a:effectStyle');
-
-								// a:effectLst
-								$objWriter->startElement('a:effectLst');
-
-									// a:outerShdw
-									$objWriter->startElement('a:outerShdw');
-									$objWriter->writeAttribute('blurRad', '40000');
-									$objWriter->writeAttribute('dist', '23000');
-									$objWriter->writeAttribute('dir', '5400000');
-									$objWriter->writeAttribute('rotWithShape', '0');
-
-										// a:srgbClr
-										$objWriter->startElement('a:srgbClr');
-										$objWriter->writeAttribute('val', '000000');
-
-											// a:alpha
-											$objWriter->startElement('a:alpha');
-											$objWriter->writeAttribute('val', '35000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-								// a:scene3d
-								$objWriter->startElement('a:scene3d');
-
-									// a:camera
-									$objWriter->startElement('a:camera');
-									$objWriter->writeAttribute('prst', 'orthographicFront');
-
-										// a:rot
-										$objWriter->startElement('a:rot');
-										$objWriter->writeAttribute('lat', '0');
-										$objWriter->writeAttribute('lon', '0');
-										$objWriter->writeAttribute('rev', '0');
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-									// a:lightRig
-									$objWriter->startElement('a:lightRig');
-									$objWriter->writeAttribute('rig', 'threePt');
-									$objWriter->writeAttribute('dir', 't');
-
-										// a:rot
-										$objWriter->startElement('a:rot');
-										$objWriter->writeAttribute('lat', '0');
-										$objWriter->writeAttribute('lon', '0');
-										$objWriter->writeAttribute('rev', '1200000');
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-								// a:sp3d
-								$objWriter->startElement('a:sp3d');
-
-									// a:bevelT
-									$objWriter->startElement('a:bevelT');
-									$objWriter->writeAttribute('w', '63500');
-									$objWriter->writeAttribute('h', '25400');
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-
-						// a:bgFillStyleLst
-						$objWriter->startElement('a:bgFillStyleLst');
-
-							// a:solidFill
-							$objWriter->startElement('a:solidFill');
-
-								// a:schemeClr
-								$objWriter->startElement('a:schemeClr');
-								$objWriter->writeAttribute('val', 'phClr');
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-							// a:gradFill
-							$objWriter->startElement('a:gradFill');
-							$objWriter->writeAttribute('rotWithShape', '1');
-
-								// a:gsLst
-								$objWriter->startElement('a:gsLst');
-
-									// a:gs
-									$objWriter->startElement('a:gs');
-									$objWriter->writeAttribute('pos', '0');
-
-										// a:schemeClr
-										$objWriter->startElement('a:schemeClr');
-										$objWriter->writeAttribute('val', 'phClr');
-
-											// a:tint
-											$objWriter->startElement('a:tint');
-											$objWriter->writeAttribute('val', '40000');
-											$objWriter->endElement();
-
-											// a:satMod
-											$objWriter->startElement('a:satMod');
-											$objWriter->writeAttribute('val', '350000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-									// a:gs
-									$objWriter->startElement('a:gs');
-									$objWriter->writeAttribute('pos', '40000');
-
-										// a:schemeClr
-										$objWriter->startElement('a:schemeClr');
-										$objWriter->writeAttribute('val', 'phClr');
-
-											// a:tint
-											$objWriter->startElement('a:tint');
-											$objWriter->writeAttribute('val', '45000');
-											$objWriter->endElement();
-
-											// a:shade
-											$objWriter->startElement('a:shade');
-											$objWriter->writeAttribute('val', '99000');
-											$objWriter->endElement();
-
-											// a:satMod
-											$objWriter->startElement('a:satMod');
-											$objWriter->writeAttribute('val', '350000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-									// a:gs
-									$objWriter->startElement('a:gs');
-									$objWriter->writeAttribute('pos', '100000');
-
-										// a:schemeClr
-										$objWriter->startElement('a:schemeClr');
-										$objWriter->writeAttribute('val', 'phClr');
-
-											// a:shade
-											$objWriter->startElement('a:shade');
-											$objWriter->writeAttribute('val', '20000');
-											$objWriter->endElement();
-
-											// a:satMod
-											$objWriter->startElement('a:satMod');
-											$objWriter->writeAttribute('val', '255000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-								// a:path
-								$objWriter->startElement('a:path');
-								$objWriter->writeAttribute('path', 'circle');
-
-									// a:fillToRect
-									$objWriter->startElement('a:fillToRect');
-									$objWriter->writeAttribute('l', '50000');
-									$objWriter->writeAttribute('t', '-80000');
-									$objWriter->writeAttribute('r', '50000');
-									$objWriter->writeAttribute('b', '180000');
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-							// a:gradFill
-							$objWriter->startElement('a:gradFill');
-							$objWriter->writeAttribute('rotWithShape', '1');
-
-								// a:gsLst
-								$objWriter->startElement('a:gsLst');
-
-									// a:gs
-									$objWriter->startElement('a:gs');
-									$objWriter->writeAttribute('pos', '0');
-
-										// a:schemeClr
-										$objWriter->startElement('a:schemeClr');
-										$objWriter->writeAttribute('val', 'phClr');
-
-											// a:tint
-											$objWriter->startElement('a:tint');
-											$objWriter->writeAttribute('val', '80000');
-											$objWriter->endElement();
-
-											// a:satMod
-											$objWriter->startElement('a:satMod');
-											$objWriter->writeAttribute('val', '300000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-									// a:gs
-									$objWriter->startElement('a:gs');
-									$objWriter->writeAttribute('pos', '100000');
-
-										// a:schemeClr
-										$objWriter->startElement('a:schemeClr');
-										$objWriter->writeAttribute('val', 'phClr');
-
-											// a:shade
-											$objWriter->startElement('a:shade');
-											$objWriter->writeAttribute('val', '30000');
-											$objWriter->endElement();
-
-											// a:satMod
-											$objWriter->startElement('a:satMod');
-											$objWriter->writeAttribute('val', '200000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-								// a:path
-								$objWriter->startElement('a:path');
-								$objWriter->writeAttribute('path', 'circle');
-
-									// a:fillToRect
-									$objWriter->startElement('a:fillToRect');
-									$objWriter->writeAttribute('l', '50000');
-									$objWriter->writeAttribute('t', '50000');
-									$objWriter->writeAttribute('r', '50000');
-									$objWriter->writeAttribute('b', '50000');
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-
-					$objWriter->endElement();
-
-				$objWriter->endElement();
-
-				// a:objectDefaults
-				$objWriter->writeElement('a:objectDefaults', null);
-
-				// a:extraClrSchemeLst
-				$objWriter->writeElement('a:extraClrSchemeLst', null);
-
-			$objWriter->endElement();
-
-			// Return
-			return $objWriter->getData();
-	}
-
-	/**
-	 * Write fonts to XML format
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter
-	 * @param 	string						$latinFont
-	 * @param 	array of string				$fontSet
-	 * @return 	string 						XML Output
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _writeFonts($objWriter, $latinFont, $fontSet)
-	{
-		// a:latin
-		$objWriter->startElement('a:latin');
-		$objWriter->writeAttribute('typeface', $latinFont);
-		$objWriter->endElement();
-
-		// a:ea
-		$objWriter->startElement('a:ea');
-		$objWriter->writeAttribute('typeface', '');
-		$objWriter->endElement();
-
-		// a:cs
-		$objWriter->startElement('a:cs');
-		$objWriter->writeAttribute('typeface', '');
-		$objWriter->endElement();
-
-		foreach($fontSet as $fontScript => $typeface) {
-			$objWriter->startElement('a:font');
-				$objWriter->writeAttribute('script', $fontScript);
-				$objWriter->writeAttribute('typeface', $typeface);
-			$objWriter->endElement();
-		}
-
-	}
-
-	/**
-	 * Write colour scheme to XML format
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter
-	 * @return 	string 						XML Output
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _writeColourScheme($objWriter)
-	{
-		foreach(self::$_colourScheme as $colourName => $colourValue) {
-			$objWriter->startElement('a:'.$colourName);
-
-				$objWriter->startElement('a:srgbClr');
-					$objWriter->writeAttribute('val', $colourValue);
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-		}
-						
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Workbook.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Workbook.php
deleted file mode 100644
index f30929476e1..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Workbook.php
+++ /dev/null
@@ -1,456 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel2007_Workbook
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel2007_Workbook extends PHPExcel_Writer_Excel2007_WriterPart
-{
-	/**
-	 * Write workbook to XML format
-	 *
-	 * @param 	PHPExcel	$pPHPExcel
-	 * @param	boolean		$recalcRequired	Indicate whether formulas should be recalculated before writing
-	 * @return 	string 		XML Output
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	public function writeWorkbook(PHPExcel $pPHPExcel = null, $recalcRequired = FALSE)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-		// workbook
-		$objWriter->startElement('workbook');
-		$objWriter->writeAttribute('xml:space', 'preserve');
-		$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
-		$objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
-
-			// fileVersion
-			$this->_writeFileVersion($objWriter);
-
-			// workbookPr
-			$this->_writeWorkbookPr($objWriter);
-
-			// workbookProtection
-			$this->_writeWorkbookProtection($objWriter, $pPHPExcel);
-
-			// bookViews
-			if ($this->getParentWriter()->getOffice2003Compatibility() === false) {
-				$this->_writeBookViews($objWriter, $pPHPExcel);
-			}
-
-			// sheets
-			$this->_writeSheets($objWriter, $pPHPExcel);
-
-			// definedNames
-			$this->_writeDefinedNames($objWriter, $pPHPExcel);
-
-			// calcPr
-			$this->_writeCalcPr($objWriter,$recalcRequired);
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Write file version
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter $objWriter 		XML Writer
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _writeFileVersion(PHPExcel_Shared_XMLWriter $objWriter = null)
-	{
-		$objWriter->startElement('fileVersion');
-		$objWriter->writeAttribute('appName', 'xl');
-		$objWriter->writeAttribute('lastEdited', '4');
-		$objWriter->writeAttribute('lowestEdited', '4');
-		$objWriter->writeAttribute('rupBuild', '4505');
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write WorkbookPr
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter $objWriter 		XML Writer
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _writeWorkbookPr(PHPExcel_Shared_XMLWriter $objWriter = null)
-	{
-		$objWriter->startElement('workbookPr');
-
-		if (PHPExcel_Shared_Date::getExcelCalendar() == PHPExcel_Shared_Date::CALENDAR_MAC_1904) {
-			$objWriter->writeAttribute('date1904', '1');
-		}
-
-		$objWriter->writeAttribute('codeName', 'ThisWorkbook');
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write BookViews
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
-	 * @param 	PHPExcel					$pPHPExcel
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _writeBookViews(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel $pPHPExcel = null)
-	{
-		// bookViews
-		$objWriter->startElement('bookViews');
-
-			// workbookView
-			$objWriter->startElement('workbookView');
-
-			$objWriter->writeAttribute('activeTab', $pPHPExcel->getActiveSheetIndex());
-			$objWriter->writeAttribute('autoFilterDateGrouping', '1');
-			$objWriter->writeAttribute('firstSheet', '0');
-			$objWriter->writeAttribute('minimized', '0');
-			$objWriter->writeAttribute('showHorizontalScroll', '1');
-			$objWriter->writeAttribute('showSheetTabs', '1');
-			$objWriter->writeAttribute('showVerticalScroll', '1');
-			$objWriter->writeAttribute('tabRatio', '600');
-			$objWriter->writeAttribute('visibility', 'visible');
-
-			$objWriter->endElement();
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write WorkbookProtection
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
-	 * @param 	PHPExcel					$pPHPExcel
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _writeWorkbookProtection(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel $pPHPExcel = null)
-	{
-		if ($pPHPExcel->getSecurity()->isSecurityEnabled()) {
-			$objWriter->startElement('workbookProtection');
-			$objWriter->writeAttribute('lockRevision',		($pPHPExcel->getSecurity()->getLockRevision() ? 'true' : 'false'));
-			$objWriter->writeAttribute('lockStructure', 	($pPHPExcel->getSecurity()->getLockStructure() ? 'true' : 'false'));
-			$objWriter->writeAttribute('lockWindows', 		($pPHPExcel->getSecurity()->getLockWindows() ? 'true' : 'false'));
-
-			if ($pPHPExcel->getSecurity()->getRevisionsPassword() != '') {
-				$objWriter->writeAttribute('revisionsPassword',	$pPHPExcel->getSecurity()->getRevisionsPassword());
-			}
-
-			if ($pPHPExcel->getSecurity()->getWorkbookPassword() != '') {
-				$objWriter->writeAttribute('workbookPassword',	$pPHPExcel->getSecurity()->getWorkbookPassword());
-			}
-
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write calcPr
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter		XML Writer
-	 * @param	boolean						$recalcRequired	Indicate whether formulas should be recalculated before writing
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _writeCalcPr(PHPExcel_Shared_XMLWriter $objWriter = null, $recalcRequired = TRUE)
-	{
-		$objWriter->startElement('calcPr');
-
-		//	Set the calcid to a higher value than Excel itself will use, otherwise Excel will always recalc
-        //  If MS Excel does do a recalc, then users opening a file in MS Excel will be prompted to save on exit
-        //     because the file has changed
-		$objWriter->writeAttribute('calcId', 			'999999');
-		$objWriter->writeAttribute('calcMode', 			'auto');
-		//	fullCalcOnLoad isn't needed if we've recalculating for the save
-		$objWriter->writeAttribute('calcCompleted', 	($recalcRequired) ? 1 : 0);
-		$objWriter->writeAttribute('fullCalcOnLoad', 	($recalcRequired) ? 0 : 1);
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write sheets
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
-	 * @param 	PHPExcel					$pPHPExcel
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _writeSheets(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel $pPHPExcel = null)
-	{
-		// Write sheets
-		$objWriter->startElement('sheets');
-		$sheetCount = $pPHPExcel->getSheetCount();
-		for ($i = 0; $i < $sheetCount; ++$i) {
-			// sheet
-			$this->_writeSheet(
-				$objWriter,
-				$pPHPExcel->getSheet($i)->getTitle(),
-				($i + 1),
-				($i + 1 + 3),
-				$pPHPExcel->getSheet($i)->getSheetState()
-			);
-		}
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write sheet
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
-	 * @param 	string 						$pSheetname 		Sheet name
-	 * @param 	int							$pSheetId	 		Sheet id
-	 * @param 	int							$pRelId				Relationship ID
-	 * @param   string                      $sheetState         Sheet state (visible, hidden, veryHidden)
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _writeSheet(PHPExcel_Shared_XMLWriter $objWriter = null, $pSheetname = '', $pSheetId = 1, $pRelId = 1, $sheetState = 'visible')
-	{
-		if ($pSheetname != '') {
-			// Write sheet
-			$objWriter->startElement('sheet');
-			$objWriter->writeAttribute('name', 		$pSheetname);
-			$objWriter->writeAttribute('sheetId', 	$pSheetId);
-			if ($sheetState != 'visible' && $sheetState != '') {
-				$objWriter->writeAttribute('state', $sheetState);
-			}
-			$objWriter->writeAttribute('r:id', 		'rId' . $pRelId);
-			$objWriter->endElement();
-		} else {
-			throw new PHPExcel_Writer_Exception("Invalid parameters passed.");
-		}
-	}
-
-	/**
-	 * Write Defined Names
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter 		XML Writer
-	 * @param 	PHPExcel					$pPHPExcel
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _writeDefinedNames(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel $pPHPExcel = null)
-	{
-		// Write defined names
-		$objWriter->startElement('definedNames');
-
-		// Named ranges
-		if (count($pPHPExcel->getNamedRanges()) > 0) {
-			// Named ranges
-			$this->_writeNamedRanges($objWriter, $pPHPExcel);
-		}
-
-		// Other defined names
-		$sheetCount = $pPHPExcel->getSheetCount();
-		for ($i = 0; $i < $sheetCount; ++$i) {
-			// definedName for autoFilter
-			$this->_writeDefinedNameForAutofilter($objWriter, $pPHPExcel->getSheet($i), $i);
-
-			// definedName for Print_Titles
-			$this->_writeDefinedNameForPrintTitles($objWriter, $pPHPExcel->getSheet($i), $i);
-
-			// definedName for Print_Area
-			$this->_writeDefinedNameForPrintArea($objWriter, $pPHPExcel->getSheet($i), $i);
-		}
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write named ranges
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter 		XML Writer
-	 * @param 	PHPExcel					$pPHPExcel
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _writeNamedRanges(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel $pPHPExcel)
-	{
-		// Loop named ranges
-		$namedRanges = $pPHPExcel->getNamedRanges();
-		foreach ($namedRanges as $namedRange) {
-			$this->_writeDefinedNameForNamedRange($objWriter, $namedRange);
-		}
-	}
-
-	/**
-	 * Write Defined Name for named range
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter 		XML Writer
-	 * @param 	PHPExcel_NamedRange			$pNamedRange
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _writeDefinedNameForNamedRange(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_NamedRange $pNamedRange)
-	{
-		// definedName for named range
-		$objWriter->startElement('definedName');
-		$objWriter->writeAttribute('name',			$pNamedRange->getName());
-		if ($pNamedRange->getLocalOnly()) {
-			$objWriter->writeAttribute('localSheetId',	$pNamedRange->getScope()->getParent()->getIndex($pNamedRange->getScope()));
-		}
-
-		// Create absolute coordinate and write as raw text
-		$range = PHPExcel_Cell::splitRange($pNamedRange->getRange());
-		for ($i = 0; $i < count($range); $i++) {
-			$range[$i][0] = '\'' . str_replace("'", "''", $pNamedRange->getWorksheet()->getTitle()) . '\'!' . PHPExcel_Cell::absoluteReference($range[$i][0]);
-			if (isset($range[$i][1])) {
-				$range[$i][1] = PHPExcel_Cell::absoluteReference($range[$i][1]);
-			}
-		}
-		$range = PHPExcel_Cell::buildRange($range);
-
-		$objWriter->writeRawData($range);
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write Defined Name for autoFilter
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter 		XML Writer
-	 * @param 	PHPExcel_Worksheet			$pSheet
-	 * @param 	int							$pSheetId
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _writeDefinedNameForAutofilter(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null, $pSheetId = 0)
-	{
-		// definedName for autoFilter
-		$autoFilterRange = $pSheet->getAutoFilter()->getRange();
-		if (!empty($autoFilterRange)) {
-			$objWriter->startElement('definedName');
-			$objWriter->writeAttribute('name',			'_xlnm._FilterDatabase');
-			$objWriter->writeAttribute('localSheetId',	$pSheetId);
-			$objWriter->writeAttribute('hidden',		'1');
-
-			// Create absolute coordinate and write as raw text
-			$range = PHPExcel_Cell::splitRange($autoFilterRange);
-			$range = $range[0];
-			//	Strip any worksheet ref so we can make the cell ref absolute
-			if (strpos($range[0],'!') !== false) {
-				list($ws,$range[0]) = explode('!',$range[0]);
-			}
-
-			$range[0] = PHPExcel_Cell::absoluteCoordinate($range[0]);
-			$range[1] = PHPExcel_Cell::absoluteCoordinate($range[1]);
-			$range = implode(':', $range);
-
-			$objWriter->writeRawData('\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!' . $range);
-
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write Defined Name for PrintTitles
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter 		XML Writer
-	 * @param 	PHPExcel_Worksheet			$pSheet
-	 * @param 	int							$pSheetId
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _writeDefinedNameForPrintTitles(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null, $pSheetId = 0)
-	{
-		// definedName for PrintTitles
-		if ($pSheet->getPageSetup()->isColumnsToRepeatAtLeftSet() || $pSheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
-			$objWriter->startElement('definedName');
-			$objWriter->writeAttribute('name',			'_xlnm.Print_Titles');
-			$objWriter->writeAttribute('localSheetId',	$pSheetId);
-
-			// Setting string
-			$settingString = '';
-
-			// Columns to repeat
-			if ($pSheet->getPageSetup()->isColumnsToRepeatAtLeftSet()) {
-				$repeat = $pSheet->getPageSetup()->getColumnsToRepeatAtLeft();
-
-				$settingString .= '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!$' . $repeat[0] . ':$' . $repeat[1];
-			}
-
-			// Rows to repeat
-			if ($pSheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
-				if ($pSheet->getPageSetup()->isColumnsToRepeatAtLeftSet()) {
-					$settingString .= ',';
-				}
-
-				$repeat = $pSheet->getPageSetup()->getRowsToRepeatAtTop();
-
-				$settingString .= '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!$' . $repeat[0] . ':$' . $repeat[1];
-			}
-
-			$objWriter->writeRawData($settingString);
-
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write Defined Name for PrintTitles
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter 		XML Writer
-	 * @param 	PHPExcel_Worksheet			$pSheet
-	 * @param 	int							$pSheetId
-	 * @throws 	PHPExcel_Writer_Exception
-	 */
-	private function _writeDefinedNameForPrintArea(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null, $pSheetId = 0)
-	{
-		// definedName for PrintArea
-		if ($pSheet->getPageSetup()->isPrintAreaSet()) {
-			$objWriter->startElement('definedName');
-			$objWriter->writeAttribute('name',			'_xlnm.Print_Area');
-			$objWriter->writeAttribute('localSheetId',	$pSheetId);
-
-			// Setting string
-			$settingString = '';
-
-			// Print area
-			$printArea = PHPExcel_Cell::splitRange($pSheet->getPageSetup()->getPrintArea());
-
-			$chunks = array();
-			foreach ($printArea as $printAreaRect) {
-				$printAreaRect[0] = PHPExcel_Cell::absoluteReference($printAreaRect[0]);
-				$printAreaRect[1] = PHPExcel_Cell::absoluteReference($printAreaRect[1]);
-				$chunks[] = '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!' . implode(':', $printAreaRect);
-			}
-
-			$objWriter->writeRawData(implode(',', $chunks));
-
-			$objWriter->endElement();
-		}
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Worksheet.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Worksheet.php
deleted file mode 100644
index 5cb803e5261..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Worksheet.php
+++ /dev/null
@@ -1,1220 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel2007_Worksheet
- *
- * @category   PHPExcel
- * @package	PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_WriterPart
-{
-	/**
-	 * Write worksheet to XML format
-	 *
-	 * @param	PHPExcel_Worksheet		$pSheet
-	 * @param	string[]				$pStringTable
-	 * @param	boolean					$includeCharts	Flag indicating if we should write charts
-	 * @return	string					XML Output
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	public function writeWorksheet($pSheet = null, $pStringTable = null, $includeCharts = FALSE)
-	{
-		if (!is_null($pSheet)) {
-			// Create XML writer
-			$objWriter = null;
-			if ($this->getParentWriter()->getUseDiskCaching()) {
-				$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-			} else {
-				$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-			}
-
-			// XML header
-			$objWriter->startDocument('1.0','UTF-8','yes');
-
-			// Worksheet
-			$objWriter->startElement('worksheet');
-			$objWriter->writeAttribute('xml:space', 'preserve');
-			$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
-			$objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
-
-				// sheetPr
-				$this->_writeSheetPr($objWriter, $pSheet);
-
-				// Dimension
-				$this->_writeDimension($objWriter, $pSheet);
-
-				// sheetViews
-				$this->_writeSheetViews($objWriter, $pSheet);
-
-				// sheetFormatPr
-				$this->_writeSheetFormatPr($objWriter, $pSheet);
-
-				// cols
-				$this->_writeCols($objWriter, $pSheet);
-
-				// sheetData
-				$this->_writeSheetData($objWriter, $pSheet, $pStringTable);
-
-				// sheetProtection
-				$this->_writeSheetProtection($objWriter, $pSheet);
-
-				// protectedRanges
-				$this->_writeProtectedRanges($objWriter, $pSheet);
-
-				// autoFilter
-				$this->_writeAutoFilter($objWriter, $pSheet);
-
-				// mergeCells
-				$this->_writeMergeCells($objWriter, $pSheet);
-
-				// conditionalFormatting
-				$this->_writeConditionalFormatting($objWriter, $pSheet);
-
-				// dataValidations
-				$this->_writeDataValidations($objWriter, $pSheet);
-
-				// hyperlinks
-				$this->_writeHyperlinks($objWriter, $pSheet);
-
-				// Print options
-				$this->_writePrintOptions($objWriter, $pSheet);
-
-				// Page margins
-				$this->_writePageMargins($objWriter, $pSheet);
-
-				// Page setup
-				$this->_writePageSetup($objWriter, $pSheet);
-
-				// Header / footer
-				$this->_writeHeaderFooter($objWriter, $pSheet);
-
-				// Breaks
-				$this->_writeBreaks($objWriter, $pSheet);
-
-				// Drawings and/or Charts
-				$this->_writeDrawings($objWriter, $pSheet, $includeCharts);
-
-				// LegacyDrawing
-				$this->_writeLegacyDrawing($objWriter, $pSheet);
-
-				// LegacyDrawingHF
-				$this->_writeLegacyDrawingHF($objWriter, $pSheet);
-
-			$objWriter->endElement();
-
-			// Return
-			return $objWriter->getData();
-		} else {
-			throw new PHPExcel_Writer_Exception("Invalid PHPExcel_Worksheet object passed.");
-		}
-	}
-
-	/**
-	 * Write SheetPr
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter		$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet				$pSheet			Worksheet
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _writeSheetPr(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// sheetPr
-		$objWriter->startElement('sheetPr');
-		//$objWriter->writeAttribute('codeName',		$pSheet->getTitle());
-		if($pSheet->getParent()->hasMacros()){//if the workbook have macros, we need to have codeName for the sheet
-			if($pSheet->hasCodeName()==false){
-				$pSheet->setCodeName($pSheet->getTitle());
-			}
-			$objWriter->writeAttribute('codeName',		$pSheet->getCodeName());
-		}
-			$autoFilterRange = $pSheet->getAutoFilter()->getRange();
-			if (!empty($autoFilterRange)) {
-				$objWriter->writeAttribute('filterMode', 1);
-				$pSheet->getAutoFilter()->showHideRows();
-			}
-
-			// tabColor
-			if ($pSheet->isTabColorSet()) {
-				$objWriter->startElement('tabColor');
-				$objWriter->writeAttribute('rgb',	$pSheet->getTabColor()->getARGB());
-				$objWriter->endElement();
-			}
-
-			// outlinePr
-			$objWriter->startElement('outlinePr');
-			$objWriter->writeAttribute('summaryBelow',	($pSheet->getShowSummaryBelow() ? '1' : '0'));
-			$objWriter->writeAttribute('summaryRight',	($pSheet->getShowSummaryRight() ? '1' : '0'));
-			$objWriter->endElement();
-
-			// pageSetUpPr
-			if ($pSheet->getPageSetup()->getFitToPage()) {
-				$objWriter->startElement('pageSetUpPr');
-				$objWriter->writeAttribute('fitToPage',	'1');
-				$objWriter->endElement();
-			}
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write Dimension
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter	$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet			$pSheet			Worksheet
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _writeDimension(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// dimension
-		$objWriter->startElement('dimension');
-		$objWriter->writeAttribute('ref', $pSheet->calculateWorksheetDimension());
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write SheetViews
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter			$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet					$pSheet			Worksheet
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _writeSheetViews(PHPExcel_Shared_XMLWriter $objWriter = NULL, PHPExcel_Worksheet $pSheet = NULL)
-	{
-		// sheetViews
-		$objWriter->startElement('sheetViews');
-
-			// Sheet selected?
-			$sheetSelected = false;
-			if ($this->getParentWriter()->getPHPExcel()->getIndex($pSheet) == $this->getParentWriter()->getPHPExcel()->getActiveSheetIndex())
-				$sheetSelected = true;
-
-
-			// sheetView
-			$objWriter->startElement('sheetView');
-			$objWriter->writeAttribute('tabSelected',		$sheetSelected ? '1' : '0');
-			$objWriter->writeAttribute('workbookViewId',	'0');
-
-				// Zoom scales
-				if ($pSheet->getSheetView()->getZoomScale() != 100) {
-					$objWriter->writeAttribute('zoomScale',	$pSheet->getSheetView()->getZoomScale());
-				}
-				if ($pSheet->getSheetView()->getZoomScaleNormal() != 100) {
-					$objWriter->writeAttribute('zoomScaleNormal',	$pSheet->getSheetView()->getZoomScaleNormal());
-				}
-
-				// View Layout Type
-				if ($pSheet->getSheetView()->getView() !== PHPExcel_Worksheet_SheetView::SHEETVIEW_NORMAL) {
-					$objWriter->writeAttribute('view',	$pSheet->getSheetView()->getView());
-				}
-
-				// Gridlines
-				if ($pSheet->getShowGridlines()) {
-					$objWriter->writeAttribute('showGridLines',	'true');
-				} else {
-					$objWriter->writeAttribute('showGridLines',	'false');
-				}
-
-				// Row and column headers
-				if ($pSheet->getShowRowColHeaders()) {
-					$objWriter->writeAttribute('showRowColHeaders', '1');
-				} else {
-					$objWriter->writeAttribute('showRowColHeaders', '0');
-				}
-
-				// Right-to-left
-				if ($pSheet->getRightToLeft()) {
-					$objWriter->writeAttribute('rightToLeft',	'true');
-				}
-
-				$activeCell = $pSheet->getActiveCell();
-
-				// Pane
-				$pane = '';
-				$topLeftCell = $pSheet->getFreezePane();
-				if (($topLeftCell != '') && ($topLeftCell != 'A1')) {
-					$activeCell = $topLeftCell;
-					// Calculate freeze coordinates
-					$xSplit = $ySplit = 0;
-
-					list($xSplit, $ySplit) = PHPExcel_Cell::coordinateFromString($topLeftCell);
-					$xSplit = PHPExcel_Cell::columnIndexFromString($xSplit);
-
-					// pane
-					$pane = 'topRight';
-					$objWriter->startElement('pane');
-					if ($xSplit > 1)
-						$objWriter->writeAttribute('xSplit',	$xSplit - 1);
-					if ($ySplit > 1) {
-						$objWriter->writeAttribute('ySplit',	$ySplit - 1);
-						$pane = ($xSplit > 1) ? 'bottomRight' : 'bottomLeft';
-					}
-					$objWriter->writeAttribute('topLeftCell',	$topLeftCell);
-					$objWriter->writeAttribute('activePane',	$pane);
-					$objWriter->writeAttribute('state',		'frozen');
-					$objWriter->endElement();
-
-					if (($xSplit > 1) && ($ySplit > 1)) {
-						//	Write additional selections if more than two panes (ie both an X and a Y split)
-						$objWriter->startElement('selection');	$objWriter->writeAttribute('pane', 'topRight');		$objWriter->endElement();
-						$objWriter->startElement('selection');	$objWriter->writeAttribute('pane', 'bottomLeft');	$objWriter->endElement();
-					}
-				}
-
-				// Selection
-//				if ($pane != '') {
-					//	Only need to write selection element if we have a split pane
-					//		We cheat a little by over-riding the active cell selection, setting it to the split cell
-					$objWriter->startElement('selection');
-					if ($pane != '') {
-						$objWriter->writeAttribute('pane', $pane);
-					}
-					$objWriter->writeAttribute('activeCell', $activeCell);
-					$objWriter->writeAttribute('sqref', $activeCell);
-					$objWriter->endElement();
-//				}
-
-			$objWriter->endElement();
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write SheetFormatPr
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter $objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet		  $pSheet			Worksheet
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _writeSheetFormatPr(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// sheetFormatPr
-		$objWriter->startElement('sheetFormatPr');
-
-			// Default row height
-			if ($pSheet->getDefaultRowDimension()->getRowHeight() >= 0) {
-				$objWriter->writeAttribute('customHeight',		'true');
-				$objWriter->writeAttribute('defaultRowHeight',	PHPExcel_Shared_String::FormatNumber($pSheet->getDefaultRowDimension()->getRowHeight()));
-			} else {
-				$objWriter->writeAttribute('defaultRowHeight', '14.4');
-			}
-
-			// Set Zero Height row
-			if ((string)$pSheet->getDefaultRowDimension()->getZeroHeight()  == '1' ||
-				strtolower((string)$pSheet->getDefaultRowDimension()->getZeroHeight()) == 'true' ) {
-				$objWriter->writeAttribute('zeroHeight', '1');
-			}
-
-			// Default column width
-			if ($pSheet->getDefaultColumnDimension()->getWidth() >= 0) {
-				$objWriter->writeAttribute('defaultColWidth', PHPExcel_Shared_String::FormatNumber($pSheet->getDefaultColumnDimension()->getWidth()));
-			}
-
-			// Outline level - row
-			$outlineLevelRow = 0;
-			foreach ($pSheet->getRowDimensions() as $dimension) {
-				if ($dimension->getOutlineLevel() > $outlineLevelRow) {
-					$outlineLevelRow = $dimension->getOutlineLevel();
-				}
-			}
-			$objWriter->writeAttribute('outlineLevelRow',	(int)$outlineLevelRow);
-
-			// Outline level - column
-			$outlineLevelCol = 0;
-			foreach ($pSheet->getColumnDimensions() as $dimension) {
-				if ($dimension->getOutlineLevel() > $outlineLevelCol) {
-					$outlineLevelCol = $dimension->getOutlineLevel();
-				}
-			}
-			$objWriter->writeAttribute('outlineLevelCol',	(int)$outlineLevelCol);
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write Cols
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter			$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet					$pSheet			Worksheet
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _writeCols(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// cols
-		if (count($pSheet->getColumnDimensions()) > 0)  {
-			$objWriter->startElement('cols');
-
-				$pSheet->calculateColumnWidths();
-
-				// Loop through column dimensions
-				foreach ($pSheet->getColumnDimensions() as $colDimension) {
-					// col
-					$objWriter->startElement('col');
-					$objWriter->writeAttribute('min',	PHPExcel_Cell::columnIndexFromString($colDimension->getColumnIndex()));
-					$objWriter->writeAttribute('max',	PHPExcel_Cell::columnIndexFromString($colDimension->getColumnIndex()));
-
-					if ($colDimension->getWidth() < 0) {
-						// No width set, apply default of 10
-						$objWriter->writeAttribute('width',		'9.10');
-					} else {
-						// Width set
-						$objWriter->writeAttribute('width',		PHPExcel_Shared_String::FormatNumber($colDimension->getWidth()));
-					}
-
-					// Column visibility
-					if ($colDimension->getVisible() == false) {
-						$objWriter->writeAttribute('hidden',		'true');
-					}
-
-					// Auto size?
-					if ($colDimension->getAutoSize()) {
-						$objWriter->writeAttribute('bestFit',		'true');
-					}
-
-					// Custom width?
-					if ($colDimension->getWidth() != $pSheet->getDefaultColumnDimension()->getWidth()) {
-						$objWriter->writeAttribute('customWidth',	'true');
-					}
-
-					// Collapsed
-					if ($colDimension->getCollapsed() == true) {
-						$objWriter->writeAttribute('collapsed',		'true');
-					}
-
-					// Outline level
-					if ($colDimension->getOutlineLevel() > 0) {
-						$objWriter->writeAttribute('outlineLevel',	$colDimension->getOutlineLevel());
-					}
-
-					// Style
-					$objWriter->writeAttribute('style', $colDimension->getXfIndex());
-
-					$objWriter->endElement();
-				}
-
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write SheetProtection
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter			$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet					$pSheet			Worksheet
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _writeSheetProtection(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// sheetProtection
-		$objWriter->startElement('sheetProtection');
-
-		if ($pSheet->getProtection()->getPassword() != '') {
-			$objWriter->writeAttribute('password',				$pSheet->getProtection()->getPassword());
-		}
-
-		$objWriter->writeAttribute('sheet',					($pSheet->getProtection()->getSheet()				? 'true' : 'false'));
-		$objWriter->writeAttribute('objects',				($pSheet->getProtection()->getObjects()				? 'true' : 'false'));
-		$objWriter->writeAttribute('scenarios',				($pSheet->getProtection()->getScenarios()			? 'true' : 'false'));
-		$objWriter->writeAttribute('formatCells',			($pSheet->getProtection()->getFormatCells()			? 'true' : 'false'));
-		$objWriter->writeAttribute('formatColumns',			($pSheet->getProtection()->getFormatColumns()		? 'true' : 'false'));
-		$objWriter->writeAttribute('formatRows',			($pSheet->getProtection()->getFormatRows()			? 'true' : 'false'));
-		$objWriter->writeAttribute('insertColumns',			($pSheet->getProtection()->getInsertColumns()		? 'true' : 'false'));
-		$objWriter->writeAttribute('insertRows',			($pSheet->getProtection()->getInsertRows()			? 'true' : 'false'));
-		$objWriter->writeAttribute('insertHyperlinks',		($pSheet->getProtection()->getInsertHyperlinks()	? 'true' : 'false'));
-		$objWriter->writeAttribute('deleteColumns',			($pSheet->getProtection()->getDeleteColumns()		? 'true' : 'false'));
-		$objWriter->writeAttribute('deleteRows',			($pSheet->getProtection()->getDeleteRows()			? 'true' : 'false'));
-		$objWriter->writeAttribute('selectLockedCells',		($pSheet->getProtection()->getSelectLockedCells()	? 'true' : 'false'));
-		$objWriter->writeAttribute('sort',					($pSheet->getProtection()->getSort()				? 'true' : 'false'));
-		$objWriter->writeAttribute('autoFilter',			($pSheet->getProtection()->getAutoFilter()			? 'true' : 'false'));
-		$objWriter->writeAttribute('pivotTables',			($pSheet->getProtection()->getPivotTables()			? 'true' : 'false'));
-		$objWriter->writeAttribute('selectUnlockedCells',	($pSheet->getProtection()->getSelectUnlockedCells()	? 'true' : 'false'));
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write ConditionalFormatting
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter			$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet					$pSheet			Worksheet
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _writeConditionalFormatting(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// Conditional id
-		$id = 1;
-
-		// Loop through styles in the current worksheet
-		foreach ($pSheet->getConditionalStylesCollection() as $cellCoordinate => $conditionalStyles) {
-			foreach ($conditionalStyles as $conditional) {
-				// WHY was this again?
-				// if ($this->getParentWriter()->getStylesConditionalHashTable()->getIndexForHashCode( $conditional->getHashCode() ) == '') {
-				//	continue;
-				// }
-				if ($conditional->getConditionType() != PHPExcel_Style_Conditional::CONDITION_NONE) {
-					// conditionalFormatting
-					$objWriter->startElement('conditionalFormatting');
-					$objWriter->writeAttribute('sqref',	$cellCoordinate);
-
-						// cfRule
-						$objWriter->startElement('cfRule');
-						$objWriter->writeAttribute('type',		$conditional->getConditionType());
-						$objWriter->writeAttribute('dxfId',		$this->getParentWriter()->getStylesConditionalHashTable()->getIndexForHashCode( $conditional->getHashCode() ));
-						$objWriter->writeAttribute('priority',	$id++);
-
-						if (($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CELLIS
-								||
-							 $conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT)
-							&& $conditional->getOperatorType() != PHPExcel_Style_Conditional::OPERATOR_NONE) {
-							$objWriter->writeAttribute('operator',	$conditional->getOperatorType());
-						}
-
-						if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
-							&& !is_null($conditional->getText())) {
-							$objWriter->writeAttribute('text',	$conditional->getText());
-						}
-
-						if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
-							&& $conditional->getOperatorType() == PHPExcel_Style_Conditional::OPERATOR_CONTAINSTEXT
-							&& !is_null($conditional->getText())) {
-							$objWriter->writeElement('formula',	'NOT(ISERROR(SEARCH("' . $conditional->getText() . '",' . $cellCoordinate . ')))');
-						} else if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
-							&& $conditional->getOperatorType() == PHPExcel_Style_Conditional::OPERATOR_BEGINSWITH
-							&& !is_null($conditional->getText())) {
-							$objWriter->writeElement('formula',	'LEFT(' . $cellCoordinate . ',' . strlen($conditional->getText()) . ')="' . $conditional->getText() . '"');
-						} else if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
-							&& $conditional->getOperatorType() == PHPExcel_Style_Conditional::OPERATOR_ENDSWITH
-							&& !is_null($conditional->getText())) {
-							$objWriter->writeElement('formula',	'RIGHT(' . $cellCoordinate . ',' . strlen($conditional->getText()) . ')="' . $conditional->getText() . '"');
-						} else if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
-							&& $conditional->getOperatorType() == PHPExcel_Style_Conditional::OPERATOR_NOTCONTAINS
-							&& !is_null($conditional->getText())) {
-							$objWriter->writeElement('formula',	'ISERROR(SEARCH("' . $conditional->getText() . '",' . $cellCoordinate . '))');
-						} else if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CELLIS
-							|| $conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
-							|| $conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_EXPRESSION) {
-							foreach ($conditional->getConditions() as $formula) {
-								// Formula
-								$objWriter->writeElement('formula',	$formula);
-							}
-						}
-
-						$objWriter->endElement();
-
-					$objWriter->endElement();
-				}
-			}
-		}
-	}
-
-	/**
-	 * Write DataValidations
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter			$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet					$pSheet			Worksheet
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _writeDataValidations(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// Datavalidation collection
-		$dataValidationCollection = $pSheet->getDataValidationCollection();
-
-		// Write data validations?
-		if (!empty($dataValidationCollection)) {
-			$objWriter->startElement('dataValidations');
-			$objWriter->writeAttribute('count', count($dataValidationCollection));
-
-			foreach ($dataValidationCollection as $coordinate => $dv) {
-				$objWriter->startElement('dataValidation');
-
-				if ($dv->getType() != '') {
-					$objWriter->writeAttribute('type', $dv->getType());
-				}
-
-				if ($dv->getErrorStyle() != '') {
-					$objWriter->writeAttribute('errorStyle', $dv->getErrorStyle());
-				}
-
-				if ($dv->getOperator() != '') {
-					$objWriter->writeAttribute('operator', $dv->getOperator());
-				}
-
-				$objWriter->writeAttribute('allowBlank',		($dv->getAllowBlank()		? '1'  : '0'));
-				$objWriter->writeAttribute('showDropDown',		(!$dv->getShowDropDown()	? '1'  : '0'));
-				$objWriter->writeAttribute('showInputMessage',	($dv->getShowInputMessage()	? '1'  : '0'));
-				$objWriter->writeAttribute('showErrorMessage',	($dv->getShowErrorMessage()	? '1'  : '0'));
-
-				if ($dv->getErrorTitle() !== '') {
-					$objWriter->writeAttribute('errorTitle', $dv->getErrorTitle());
-				}
-				if ($dv->getError() !== '') {
-					$objWriter->writeAttribute('error', $dv->getError());
-				}
-				if ($dv->getPromptTitle() !== '') {
-					$objWriter->writeAttribute('promptTitle', $dv->getPromptTitle());
-				}
-				if ($dv->getPrompt() !== '') {
-					$objWriter->writeAttribute('prompt', $dv->getPrompt());
-				}
-
-				$objWriter->writeAttribute('sqref', $coordinate);
-
-				if ($dv->getFormula1() !== '') {
-					$objWriter->writeElement('formula1', $dv->getFormula1());
-				}
-				if ($dv->getFormula2() !== '') {
-					$objWriter->writeElement('formula2', $dv->getFormula2());
-				}
-
-				$objWriter->endElement();
-			}
-
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write Hyperlinks
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter			$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet					$pSheet			Worksheet
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _writeHyperlinks(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// Hyperlink collection
-		$hyperlinkCollection = $pSheet->getHyperlinkCollection();
-
-		// Relation ID
-		$relationId = 1;
-
-		// Write hyperlinks?
-		if (!empty($hyperlinkCollection)) {
-			$objWriter->startElement('hyperlinks');
-
-			foreach ($hyperlinkCollection as $coordinate => $hyperlink) {
-				$objWriter->startElement('hyperlink');
-
-				$objWriter->writeAttribute('ref', $coordinate);
-				if (!$hyperlink->isInternal()) {
-					$objWriter->writeAttribute('r:id',	'rId_hyperlink_' . $relationId);
-					++$relationId;
-				} else {
-					$objWriter->writeAttribute('location',	str_replace('sheet://', '', $hyperlink->getUrl()));
-				}
-
-				if ($hyperlink->getTooltip() != '') {
-					$objWriter->writeAttribute('tooltip', $hyperlink->getTooltip());
-				}
-
-				$objWriter->endElement();
-			}
-
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write ProtectedRanges
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter			$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet					$pSheet			Worksheet
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _writeProtectedRanges(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		if (count($pSheet->getProtectedCells()) > 0) {
-			// protectedRanges
-			$objWriter->startElement('protectedRanges');
-
-				// Loop protectedRanges
-				foreach ($pSheet->getProtectedCells() as $protectedCell => $passwordHash) {
-					// protectedRange
-					$objWriter->startElement('protectedRange');
-					$objWriter->writeAttribute('name',		'p' . md5($protectedCell));
-					$objWriter->writeAttribute('sqref',	$protectedCell);
-					if (!empty($passwordHash)) {
-						$objWriter->writeAttribute('password',	$passwordHash);
-					}
-					$objWriter->endElement();
-				}
-
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write MergeCells
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter			$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet					$pSheet			Worksheet
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _writeMergeCells(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		if (count($pSheet->getMergeCells()) > 0) {
-			// mergeCells
-			$objWriter->startElement('mergeCells');
-
-				// Loop mergeCells
-				foreach ($pSheet->getMergeCells() as $mergeCell) {
-					// mergeCell
-					$objWriter->startElement('mergeCell');
-					$objWriter->writeAttribute('ref', $mergeCell);
-					$objWriter->endElement();
-				}
-
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write PrintOptions
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter			$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet					$pSheet			Worksheet
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _writePrintOptions(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// printOptions
-		$objWriter->startElement('printOptions');
-
-		$objWriter->writeAttribute('gridLines',	($pSheet->getPrintGridlines() ? 'true': 'false'));
-		$objWriter->writeAttribute('gridLinesSet',	'true');
-
-		if ($pSheet->getPageSetup()->getHorizontalCentered()) {
-			$objWriter->writeAttribute('horizontalCentered', 'true');
-		}
-
-		if ($pSheet->getPageSetup()->getVerticalCentered()) {
-			$objWriter->writeAttribute('verticalCentered', 'true');
-		}
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write PageMargins
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter				$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet						$pSheet			Worksheet
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _writePageMargins(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// pageMargins
-		$objWriter->startElement('pageMargins');
-		$objWriter->writeAttribute('left',		PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getLeft()));
-		$objWriter->writeAttribute('right',		PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getRight()));
-		$objWriter->writeAttribute('top',		PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getTop()));
-		$objWriter->writeAttribute('bottom',	PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getBottom()));
-		$objWriter->writeAttribute('header',	PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getHeader()));
-		$objWriter->writeAttribute('footer',	PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getFooter()));
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write AutoFilter
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter				$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet						$pSheet			Worksheet
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _writeAutoFilter(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		$autoFilterRange = $pSheet->getAutoFilter()->getRange();
-		if (!empty($autoFilterRange)) {
-			// autoFilter
-			$objWriter->startElement('autoFilter');
-
-			// Strip any worksheet reference from the filter coordinates
-			$range = PHPExcel_Cell::splitRange($autoFilterRange);
-			$range = $range[0];
-			//	Strip any worksheet ref
-			if (strpos($range[0],'!') !== false) {
-				list($ws,$range[0]) = explode('!',$range[0]);
-			}
-			$range = implode(':', $range);
-
-			$objWriter->writeAttribute('ref',	str_replace('$','',$range));
-
-			$columns = $pSheet->getAutoFilter()->getColumns();
-			if (count($columns > 0)) {
-				foreach($columns as $columnID => $column) {
-					$rules = $column->getRules();
-					if (count($rules > 0)) {
-						$objWriter->startElement('filterColumn');
-							$objWriter->writeAttribute('colId',	$pSheet->getAutoFilter()->getColumnOffset($columnID));
-
-							$objWriter->startElement( $column->getFilterType());
-								if ($column->getJoin() == PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND) {
-									$objWriter->writeAttribute('and',	1);
-								}
-
-								foreach ($rules as $rule) {
-									if (($column->getFilterType() === PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_FILTER) &&
-										($rule->getOperator() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL) &&
-										($rule->getValue() === '')) {
-										//	Filter rule for Blanks
-										$objWriter->writeAttribute('blank',	1);
-									} elseif($rule->getRuleType() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMICFILTER) {
-										//	Dynamic Filter Rule
-										$objWriter->writeAttribute('type', $rule->getGrouping());
-										$val = $column->getAttribute('val');
-										if ($val !== NULL) {
-											$objWriter->writeAttribute('val', $val);
-										}
-										$maxVal = $column->getAttribute('maxVal');
-										if ($maxVal !== NULL) {
-											$objWriter->writeAttribute('maxVal', $maxVal);
-										}
-									} elseif($rule->getRuleType() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_TOPTENFILTER) {
-										//	Top 10 Filter Rule
-										$objWriter->writeAttribute('val',	$rule->getValue());
-										$objWriter->writeAttribute('percent',	(($rule->getOperator() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT) ? '1' : '0'));
-										$objWriter->writeAttribute('top',	(($rule->getGrouping() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP) ? '1': '0'));
-									} else {
-										//	Filter, DateGroupItem or CustomFilter
-										$objWriter->startElement($rule->getRuleType());
-
-											if ($rule->getOperator() !== PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL) {
-												$objWriter->writeAttribute('operator',	$rule->getOperator());
-											}
-											if ($rule->getRuleType() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP) {
-												// Date Group filters
-												foreach($rule->getValue() as $key => $value) {
-													if ($value > '') $objWriter->writeAttribute($key,	$value);
-												}
-												$objWriter->writeAttribute('dateTimeGrouping',	$rule->getGrouping());
-											} else {
-												$objWriter->writeAttribute('val',	$rule->getValue());
-											}
-
-										$objWriter->endElement();
-									}
-								}
-
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-					}
-				}
-			}
-
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write PageSetup
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter			$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet					$pSheet			Worksheet
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _writePageSetup(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// pageSetup
-		$objWriter->startElement('pageSetup');
-		$objWriter->writeAttribute('paperSize',		$pSheet->getPageSetup()->getPaperSize());
-		$objWriter->writeAttribute('orientation',	$pSheet->getPageSetup()->getOrientation());
-
-		if (!is_null($pSheet->getPageSetup()->getScale())) {
-			$objWriter->writeAttribute('scale',				 $pSheet->getPageSetup()->getScale());
-		}
-		if (!is_null($pSheet->getPageSetup()->getFitToHeight())) {
-			$objWriter->writeAttribute('fitToHeight',		 $pSheet->getPageSetup()->getFitToHeight());
-		} else {
-			$objWriter->writeAttribute('fitToHeight',		 '0');
-		}
-		if (!is_null($pSheet->getPageSetup()->getFitToWidth())) {
-			$objWriter->writeAttribute('fitToWidth',		 $pSheet->getPageSetup()->getFitToWidth());
-		} else {
-			$objWriter->writeAttribute('fitToWidth',		 '0');
-		}
-		if (!is_null($pSheet->getPageSetup()->getFirstPageNumber())) {
-			$objWriter->writeAttribute('firstPageNumber',	$pSheet->getPageSetup()->getFirstPageNumber());
-			$objWriter->writeAttribute('useFirstPageNumber', '1');
-		}
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write Header / Footer
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter		$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet				$pSheet			Worksheet
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _writeHeaderFooter(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// headerFooter
-		$objWriter->startElement('headerFooter');
-		$objWriter->writeAttribute('differentOddEven',	($pSheet->getHeaderFooter()->getDifferentOddEven() ? 'true' : 'false'));
-		$objWriter->writeAttribute('differentFirst',	($pSheet->getHeaderFooter()->getDifferentFirst() ? 'true' : 'false'));
-		$objWriter->writeAttribute('scaleWithDoc',		($pSheet->getHeaderFooter()->getScaleWithDocument() ? 'true' : 'false'));
-		$objWriter->writeAttribute('alignWithMargins',	($pSheet->getHeaderFooter()->getAlignWithMargins() ? 'true' : 'false'));
-
-			$objWriter->writeElement('oddHeader',		$pSheet->getHeaderFooter()->getOddHeader());
-			$objWriter->writeElement('oddFooter',		$pSheet->getHeaderFooter()->getOddFooter());
-			$objWriter->writeElement('evenHeader',		$pSheet->getHeaderFooter()->getEvenHeader());
-			$objWriter->writeElement('evenFooter',		$pSheet->getHeaderFooter()->getEvenFooter());
-			$objWriter->writeElement('firstHeader',	$pSheet->getHeaderFooter()->getFirstHeader());
-			$objWriter->writeElement('firstFooter',	$pSheet->getHeaderFooter()->getFirstFooter());
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write Breaks
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter		$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet				$pSheet			Worksheet
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _writeBreaks(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// Get row and column breaks
-		$aRowBreaks = array();
-		$aColumnBreaks = array();
-		foreach ($pSheet->getBreaks() as $cell => $breakType) {
-			if ($breakType == PHPExcel_Worksheet::BREAK_ROW) {
-				$aRowBreaks[] = $cell;
-			} else if ($breakType == PHPExcel_Worksheet::BREAK_COLUMN) {
-				$aColumnBreaks[] = $cell;
-			}
-		}
-
-		// rowBreaks
-		if (!empty($aRowBreaks)) {
-			$objWriter->startElement('rowBreaks');
-			$objWriter->writeAttribute('count',			count($aRowBreaks));
-			$objWriter->writeAttribute('manualBreakCount',	count($aRowBreaks));
-
-				foreach ($aRowBreaks as $cell) {
-					$coords = PHPExcel_Cell::coordinateFromString($cell);
-
-					$objWriter->startElement('brk');
-					$objWriter->writeAttribute('id',	$coords[1]);
-					$objWriter->writeAttribute('man',	'1');
-					$objWriter->endElement();
-				}
-
-			$objWriter->endElement();
-		}
-
-		// Second, write column breaks
-		if (!empty($aColumnBreaks)) {
-			$objWriter->startElement('colBreaks');
-			$objWriter->writeAttribute('count',			count($aColumnBreaks));
-			$objWriter->writeAttribute('manualBreakCount',	count($aColumnBreaks));
-
-				foreach ($aColumnBreaks as $cell) {
-					$coords = PHPExcel_Cell::coordinateFromString($cell);
-
-					$objWriter->startElement('brk');
-					$objWriter->writeAttribute('id',	PHPExcel_Cell::columnIndexFromString($coords[0]) - 1);
-					$objWriter->writeAttribute('man',	'1');
-					$objWriter->endElement();
-				}
-
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write SheetData
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter		$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet				$pSheet			Worksheet
-	 * @param	string[]						$pStringTable	String table
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _writeSheetData(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null, $pStringTable = null)
-	{
-		if (is_array($pStringTable)) {
-			// Flipped stringtable, for faster index searching
-			$aFlippedStringTable = $this->getParentWriter()->getWriterPart('stringtable')->flipStringTable($pStringTable);
-
-			// sheetData
-			$objWriter->startElement('sheetData');
-
-				// Get column count
-				$colCount = PHPExcel_Cell::columnIndexFromString($pSheet->getHighestColumn());
-
-				// Highest row number
-				$highestRow = $pSheet->getHighestRow();
-
-				// Loop through cells
-				$cellsByRow = array();
-				foreach ($pSheet->getCellCollection() as $cellID) {
-					$cellAddress = PHPExcel_Cell::coordinateFromString($cellID);
-					$cellsByRow[$cellAddress[1]][] = $cellID;
-				}
-
-				$currentRow = 0;
-				while($currentRow++ < $highestRow) {
-					// Get row dimension
-					$rowDimension = $pSheet->getRowDimension($currentRow);
-
-					// Write current row?
-					$writeCurrentRow =	isset($cellsByRow[$currentRow]) ||
-										$rowDimension->getRowHeight() >= 0 ||
-										$rowDimension->getVisible() == false ||
-										$rowDimension->getCollapsed() == true ||
-										$rowDimension->getOutlineLevel() > 0 ||
-										$rowDimension->getXfIndex() !== null;
-
-					if ($writeCurrentRow) {
-						// Start a new row
-						$objWriter->startElement('row');
-						$objWriter->writeAttribute('r',	$currentRow);
-						$objWriter->writeAttribute('spans',	'1:' . $colCount);
-
-						// Row dimensions
-						if ($rowDimension->getRowHeight() >= 0) {
-							$objWriter->writeAttribute('customHeight',	'1');
-							$objWriter->writeAttribute('ht',			PHPExcel_Shared_String::FormatNumber($rowDimension->getRowHeight()));
-						}
-
-						// Row visibility
-						if ($rowDimension->getVisible() == false) {
-							$objWriter->writeAttribute('hidden',		'true');
-						}
-
-						// Collapsed
-						if ($rowDimension->getCollapsed() == true) {
-							$objWriter->writeAttribute('collapsed',		'true');
-						}
-
-						// Outline level
-						if ($rowDimension->getOutlineLevel() > 0) {
-							$objWriter->writeAttribute('outlineLevel',	$rowDimension->getOutlineLevel());
-						}
-
-						// Style
-						if ($rowDimension->getXfIndex() !== null) {
-							$objWriter->writeAttribute('s',	$rowDimension->getXfIndex());
-							$objWriter->writeAttribute('customFormat', '1');
-						}
-
-						// Write cells
-						if (isset($cellsByRow[$currentRow])) {
-							foreach($cellsByRow[$currentRow] as $cellAddress) {
-								// Write cell
-								$this->_writeCell($objWriter, $pSheet, $cellAddress, $pStringTable, $aFlippedStringTable);
-							}
-						}
-
-						// End row
-						$objWriter->endElement();
-					}
-				}
-
-			$objWriter->endElement();
-		} else {
-			throw new PHPExcel_Writer_Exception("Invalid parameters passed.");
-		}
-	}
-
-	/**
-	 * Write Cell
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter	$objWriter				XML Writer
-	 * @param	PHPExcel_Worksheet			$pSheet					Worksheet
-	 * @param	PHPExcel_Cell				$pCellAddress			Cell Address
-	 * @param	string[]					$pStringTable			String table
-	 * @param	string[]					$pFlippedStringTable	String table (flipped), for faster index searching
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _writeCell(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null, $pCellAddress = null, $pStringTable = null, $pFlippedStringTable = null)
-	{
-		if (is_array($pStringTable) && is_array($pFlippedStringTable)) {
-			// Cell
-			$pCell = $pSheet->getCell($pCellAddress);
-			$objWriter->startElement('c');
-			$objWriter->writeAttribute('r', $pCellAddress);
-
-			// Sheet styles
-			if ($pCell->getXfIndex() != '') {
-				$objWriter->writeAttribute('s', $pCell->getXfIndex());
-			}
-
-			// If cell value is supplied, write cell value
-			$cellValue = $pCell->getValue();
-			if (is_object($cellValue) || $cellValue !== '') {
-				// Map type
-				$mappedType = $pCell->getDataType();
-
-				// Write data type depending on its type
-				switch (strtolower($mappedType)) {
-					case 'inlinestr':	// Inline string
-					case 's':			// String
-					case 'b':			// Boolean
-						$objWriter->writeAttribute('t', $mappedType);
-						break;
-					case 'f':			// Formula
-						$calculatedValue = ($this->getParentWriter()->getPreCalculateFormulas()) ?
-						    $pCell->getCalculatedValue() :
-						    $cellValue;
-						if (is_string($calculatedValue)) {
-							$objWriter->writeAttribute('t', 'str');
-						}
-						break;
-					case 'e':			// Error
-						$objWriter->writeAttribute('t', $mappedType);
-				}
-
-				// Write data depending on its type
-				switch (strtolower($mappedType)) {
-					case 'inlinestr':	// Inline string
-						if (! $cellValue instanceof PHPExcel_RichText) {
-							$objWriter->writeElement('t', PHPExcel_Shared_String::ControlCharacterPHP2OOXML( htmlspecialchars($cellValue) ) );
-						} else if ($cellValue instanceof PHPExcel_RichText) {
-							$objWriter->startElement('is');
-							$this->getParentWriter()->getWriterPart('stringtable')->writeRichText($objWriter, $cellValue);
-							$objWriter->endElement();
-						}
-
-						break;
-					case 's':			// String
-						if (! $cellValue instanceof PHPExcel_RichText) {
-							if (isset($pFlippedStringTable[$cellValue])) {
-								$objWriter->writeElement('v', $pFlippedStringTable[$cellValue]);
-							}
-						} else if ($cellValue instanceof PHPExcel_RichText) {
-							$objWriter->writeElement('v', $pFlippedStringTable[$cellValue->getHashCode()]);
-						}
-
-						break;
-					case 'f':			// Formula
-						$attributes = $pCell->getFormulaAttributes();
-						if($attributes['t'] == 'array') {
-							$objWriter->startElement('f');
-							$objWriter->writeAttribute('t', 'array');
-							$objWriter->writeAttribute('ref', $pCellAddress);
-							$objWriter->writeAttribute('aca', '1');
-							$objWriter->writeAttribute('ca', '1');
-							$objWriter->text(substr($cellValue, 1));
-							$objWriter->endElement();
-						} else {
-							$objWriter->writeElement('f', substr($cellValue, 1));
-						}
-						if ($this->getParentWriter()->getOffice2003Compatibility() === false) {
-							if ($this->getParentWriter()->getPreCalculateFormulas()) {
-//								$calculatedValue = $pCell->getCalculatedValue();
-								if (!is_array($calculatedValue) && substr($calculatedValue, 0, 1) != '#') {
-									$objWriter->writeElement('v', PHPExcel_Shared_String::FormatNumber($calculatedValue));
-								} else {
-									$objWriter->writeElement('v', '0');
-								}
-							} else {
-								$objWriter->writeElement('v', '0');
-							}
-						}
-						break;
-					case 'n':			// Numeric
-						// force point as decimal separator in case current locale uses comma
-						$objWriter->writeElement('v', str_replace(',', '.', $cellValue));
-						break;
-					case 'b':			// Boolean
-						$objWriter->writeElement('v', ($cellValue ? '1' : '0'));
-						break;
-					case 'e':			// Error
-						if (substr($cellValue, 0, 1) == '=') {
-							$objWriter->writeElement('f', substr($cellValue, 1));
-							$objWriter->writeElement('v', substr($cellValue, 1));
-						} else {
-							$objWriter->writeElement('v', $cellValue);
-						}
-
-						break;
-				}
-			}
-
-			$objWriter->endElement();
-		} else {
-			throw new PHPExcel_Writer_Exception("Invalid parameters passed.");
-		}
-	}
-
-	/**
-	 * Write Drawings
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter	$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet			$pSheet			Worksheet
-	 * @param	boolean						$includeCharts	Flag indicating if we should include drawing details for charts
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _writeDrawings(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null, $includeCharts = FALSE)
-	{
-		$chartCount = ($includeCharts) ? $pSheet->getChartCollection()->count() : 0;
-		// If sheet contains drawings, add the relationships
-		if (($pSheet->getDrawingCollection()->count() > 0) ||
-			($chartCount > 0)) {
-			$objWriter->startElement('drawing');
-			$objWriter->writeAttribute('r:id', 'rId1');
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write LegacyDrawing
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter		$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet				$pSheet			Worksheet
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _writeLegacyDrawing(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// If sheet contains comments, add the relationships
-		if (count($pSheet->getComments()) > 0) {
-			$objWriter->startElement('legacyDrawing');
-			$objWriter->writeAttribute('r:id', 'rId_comments_vml1');
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write LegacyDrawingHF
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter		$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet				$pSheet			Worksheet
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _writeLegacyDrawingHF(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// If sheet contains images, add the relationships
-		if (count($pSheet->getHeaderFooter()->getImages()) > 0) {
-			$objWriter->startElement('legacyDrawingHF');
-			$objWriter->writeAttribute('r:id', 'rId_headerfooter_vml1');
-			$objWriter->endElement();
-		}
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/WriterPart.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/WriterPart.php
deleted file mode 100644
index 68b1124fd54..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/WriterPart.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel2007_WriterPart
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-abstract class PHPExcel_Writer_Excel2007_WriterPart
-{
-	/**
-	 * Parent IWriter object
-	 *
-	 * @var PHPExcel_Writer_IWriter
-	 */
-	private $_parentWriter;
-
-	/**
-	 * Set parent IWriter object
-	 *
-	 * @param PHPExcel_Writer_IWriter	$pWriter
-	 * @throws PHPExcel_Writer_Exception
-	 */
-	public function setParentWriter(PHPExcel_Writer_IWriter $pWriter = null) {
-		$this->_parentWriter = $pWriter;
-	}
-
-	/**
-	 * Get parent IWriter object
-	 *
-	 * @return PHPExcel_Writer_IWriter
-	 * @throws PHPExcel_Writer_Exception
-	 */
-	public function getParentWriter() {
-		if (!is_null($this->_parentWriter)) {
-			return $this->_parentWriter;
-		} else {
-			throw new PHPExcel_Writer_Exception("No parent PHPExcel_Writer_IWriter assigned.");
-		}
-	}
-
-	/**
-	 * Set parent IWriter object
-	 *
-	 * @param PHPExcel_Writer_IWriter	$pWriter
-	 * @throws PHPExcel_Writer_Exception
-	 */
-	public function __construct(PHPExcel_Writer_IWriter $pWriter = null) {
-		if (!is_null($pWriter)) {
-			$this->_parentWriter = $pWriter;
-		}
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5.php
deleted file mode 100644
index 1a990d045ad..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5.php
+++ /dev/null
@@ -1,935 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel5
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExcel_Writer_IWriter
-{
-	/**
-	 * PHPExcel object
-	 *
-	 * @var PHPExcel
-	 */
-	private $_phpExcel;
-
-	/**
-	 * Total number of shared strings in workbook
-	 *
-	 * @var int
-	 */
-	private $_str_total		= 0;
-
-	/**
-	 * Number of unique shared strings in workbook
-	 *
-	 * @var int
-	 */
-	private $_str_unique	= 0;
-
-	/**
-	 * Array of unique shared strings in workbook
-	 *
-	 * @var array
-	 */
-	private $_str_table		= array();
-
-	/**
-	 * Color cache. Mapping between RGB value and color index.
-	 *
-	 * @var array
-	 */
-	private $_colors;
-
-	/**
-	 * Formula parser
-	 *
-	 * @var PHPExcel_Writer_Excel5_Parser
-	 */
-	private $_parser;
-
-	/**
-	 * Identifier clusters for drawings. Used in MSODRAWINGGROUP record.
-	 *
-	 * @var array
-	 */
-	private $_IDCLs;
-
-	/**
-	 * Basic OLE object summary information
-	 *
-	 * @var array
-	 */
-	private $_summaryInformation;
-
-	/**
-	 * Extended OLE object document summary information
-	 *
-	 * @var array
-	 */
-	private $_documentSummaryInformation;
-
-	/**
-	 * Create a new PHPExcel_Writer_Excel5
-	 *
-	 * @param	PHPExcel	$phpExcel	PHPExcel object
-	 */
-	public function __construct(PHPExcel $phpExcel) {
-		$this->_phpExcel	= $phpExcel;
-
-		$this->_parser		= new PHPExcel_Writer_Excel5_Parser();
-	}
-
-	/**
-	 * Save PHPExcel to file
-	 *
-	 * @param	string		$pFilename
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	public function save($pFilename = null) {
-
-		// garbage collect
-		$this->_phpExcel->garbageCollect();
-
-		$saveDebugLog = PHPExcel_Calculation::getInstance($this->_phpExcel)->getDebugLog()->getWriteDebugLog();
-		PHPExcel_Calculation::getInstance($this->_phpExcel)->getDebugLog()->setWriteDebugLog(FALSE);
-		$saveDateReturnType = PHPExcel_Calculation_Functions::getReturnDateType();
-		PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_EXCEL);
-
-		// initialize colors array
-		$this->_colors          = array();
-
-		// Initialise workbook writer
-		$this->_writerWorkbook = new PHPExcel_Writer_Excel5_Workbook($this->_phpExcel,
-																	 $this->_str_total, $this->_str_unique, $this->_str_table,
-																	 $this->_colors, $this->_parser);
-
-		// Initialise worksheet writers
-		$countSheets = $this->_phpExcel->getSheetCount();
-		for ($i = 0; $i < $countSheets; ++$i) {
-			$this->_writerWorksheets[$i] = new PHPExcel_Writer_Excel5_Worksheet($this->_str_total, $this->_str_unique,
-																			   $this->_str_table, $this->_colors,
-																			   $this->_parser,
-																			   $this->_preCalculateFormulas,
-																			   $this->_phpExcel->getSheet($i));
-		}
-
-		// build Escher objects. Escher objects for workbooks needs to be build before Escher object for workbook.
-		$this->_buildWorksheetEschers();
-		$this->_buildWorkbookEscher();
-
-		// add 15 identical cell style Xfs
-		// for now, we use the first cellXf instead of cellStyleXf
-		$cellXfCollection = $this->_phpExcel->getCellXfCollection();
-		for ($i = 0; $i < 15; ++$i) {
-			$this->_writerWorkbook->addXfWriter($cellXfCollection[0], true);
-		}
-
-		// add all the cell Xfs
-		foreach ($this->_phpExcel->getCellXfCollection() as $style) {
-			$this->_writerWorkbook->addXfWriter($style, false);
-		}
-
-		// add fonts from rich text eleemnts
-		for ($i = 0; $i < $countSheets; ++$i) {
-			foreach ($this->_writerWorksheets[$i]->_phpSheet->getCellCollection() as $cellID) {
-				$cell = $this->_writerWorksheets[$i]->_phpSheet->getCell($cellID);
-				$cVal = $cell->getValue();
-				if ($cVal instanceof PHPExcel_RichText) {
-					$elements = $cVal->getRichTextElements();
-					foreach ($elements as $element) {
-						if ($element instanceof PHPExcel_RichText_Run) {
-							$font = $element->getFont();
-							$this->_writerWorksheets[$i]->_fntHashIndex[$font->getHashCode()] = $this->_writerWorkbook->_addFont($font);
-						}
-					}
-				}
-			}
-		}
-
-		// initialize OLE file
-		$workbookStreamName = 'Workbook';
-		$OLE = new PHPExcel_Shared_OLE_PPS_File(PHPExcel_Shared_OLE::Asc2Ucs($workbookStreamName));
-
-		// Write the worksheet streams before the global workbook stream,
-		// because the byte sizes of these are needed in the global workbook stream
-		$worksheetSizes = array();
-		for ($i = 0; $i < $countSheets; ++$i) {
-			$this->_writerWorksheets[$i]->close();
-			$worksheetSizes[] = $this->_writerWorksheets[$i]->_datasize;
-		}
-
-		// add binary data for global workbook stream
-		$OLE->append($this->_writerWorkbook->writeWorkbook($worksheetSizes));
-
-		// add binary data for sheet streams
-		for ($i = 0; $i < $countSheets; ++$i) {
-			$OLE->append($this->_writerWorksheets[$i]->getData());
-		}
-
-		$this->_documentSummaryInformation = $this->_writeDocumentSummaryInformation();
-		// initialize OLE Document Summary Information
-		if(isset($this->_documentSummaryInformation) && !empty($this->_documentSummaryInformation)){
-			$OLE_DocumentSummaryInformation = new PHPExcel_Shared_OLE_PPS_File(PHPExcel_Shared_OLE::Asc2Ucs(chr(5) . 'DocumentSummaryInformation'));
-			$OLE_DocumentSummaryInformation->append($this->_documentSummaryInformation);
-		}
-
-		$this->_summaryInformation = $this->_writeSummaryInformation();
-		// initialize OLE Summary Information
-		if(isset($this->_summaryInformation) && !empty($this->_summaryInformation)){
-		  $OLE_SummaryInformation = new PHPExcel_Shared_OLE_PPS_File(PHPExcel_Shared_OLE::Asc2Ucs(chr(5) . 'SummaryInformation'));
-		  $OLE_SummaryInformation->append($this->_summaryInformation);
-		}
-
-		// define OLE Parts
-		$arrRootData = array($OLE);
-		// initialize OLE Properties file
-		if(isset($OLE_SummaryInformation)){
-			$arrRootData[] = $OLE_SummaryInformation;
-		}
-		// initialize OLE Extended Properties file
-		if(isset($OLE_DocumentSummaryInformation)){
-			$arrRootData[] = $OLE_DocumentSummaryInformation;
-		}
-
-		$root = new PHPExcel_Shared_OLE_PPS_Root(time(), time(), $arrRootData);
-		// save the OLE file
-		$res = $root->save($pFilename);
-
-		PHPExcel_Calculation_Functions::setReturnDateType($saveDateReturnType);
-		PHPExcel_Calculation::getInstance($this->_phpExcel)->getDebugLog()->setWriteDebugLog($saveDebugLog);
-	}
-
-	/**
-	 * Set temporary storage directory
-	 *
-	 * @deprecated
-	 * @param	string	$pValue		Temporary storage directory
-	 * @throws	PHPExcel_Writer_Exception	when directory does not exist
-	 * @return PHPExcel_Writer_Excel5
-	 */
-	public function setTempDir($pValue = '') {
-		return $this;
-	}
-
-	/**
-	 * Build the Worksheet Escher objects
-	 *
-	 */
-	private function _buildWorksheetEschers()
-	{
-		// 1-based index to BstoreContainer
-		$blipIndex = 0;
-		$lastReducedSpId = 0;
-		$lastSpId = 0;
-
-		foreach ($this->_phpExcel->getAllsheets() as $sheet) {
-			// sheet index
-			$sheetIndex = $sheet->getParent()->getIndex($sheet);
-
-			$escher = null;
-
-			// check if there are any shapes for this sheet
-			$filterRange = $sheet->getAutoFilter()->getRange();
-			if (count($sheet->getDrawingCollection()) == 0 && empty($filterRange)) {
-				continue;
-			}
-
-			// create intermediate Escher object
-			$escher = new PHPExcel_Shared_Escher();
-
-			// dgContainer
-			$dgContainer = new PHPExcel_Shared_Escher_DgContainer();
-
-			// set the drawing index (we use sheet index + 1)
-			$dgId = $sheet->getParent()->getIndex($sheet) + 1;
-			$dgContainer->setDgId($dgId);
-			$escher->setDgContainer($dgContainer);
-
-			// spgrContainer
-			$spgrContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer();
-			$dgContainer->setSpgrContainer($spgrContainer);
-
-			// add one shape which is the group shape
-			$spContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer();
-			$spContainer->setSpgr(true);
-			$spContainer->setSpType(0);
-			$spContainer->setSpId(($sheet->getParent()->getIndex($sheet) + 1) << 10);
-			$spgrContainer->addChild($spContainer);
-
-			// add the shapes
-
-			$countShapes[$sheetIndex] = 0; // count number of shapes (minus group shape), in sheet
-
-			foreach ($sheet->getDrawingCollection() as $drawing) {
-				++$blipIndex;
-
-				++$countShapes[$sheetIndex];
-
-				// add the shape
-				$spContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer();
-
-				// set the shape type
-				$spContainer->setSpType(0x004B);
-				// set the shape flag
-				$spContainer->setSpFlag(0x02);
-
-				// set the shape index (we combine 1-based sheet index and $countShapes to create unique shape index)
-				$reducedSpId = $countShapes[$sheetIndex];
-				$spId = $reducedSpId
-					| ($sheet->getParent()->getIndex($sheet) + 1) << 10;
-				$spContainer->setSpId($spId);
-
-				// keep track of last reducedSpId
-				$lastReducedSpId = $reducedSpId;
-
-				// keep track of last spId
-				$lastSpId = $spId;
-
-				// set the BLIP index
-				$spContainer->setOPT(0x4104, $blipIndex);
-
-				// set coordinates and offsets, client anchor
-				$coordinates = $drawing->getCoordinates();
-				$offsetX = $drawing->getOffsetX();
-				$offsetY = $drawing->getOffsetY();
-				$width = $drawing->getWidth();
-				$height = $drawing->getHeight();
-
-				$twoAnchor = PHPExcel_Shared_Excel5::oneAnchor2twoAnchor($sheet, $coordinates, $offsetX, $offsetY, $width, $height);
-
-				$spContainer->setStartCoordinates($twoAnchor['startCoordinates']);
-				$spContainer->setStartOffsetX($twoAnchor['startOffsetX']);
-				$spContainer->setStartOffsetY($twoAnchor['startOffsetY']);
-				$spContainer->setEndCoordinates($twoAnchor['endCoordinates']);
-				$spContainer->setEndOffsetX($twoAnchor['endOffsetX']);
-				$spContainer->setEndOffsetY($twoAnchor['endOffsetY']);
-
-				$spgrContainer->addChild($spContainer);
-			}
-
-			// AutoFilters
-			if(!empty($filterRange)){
-				$rangeBounds = PHPExcel_Cell::rangeBoundaries($filterRange);
-				$iNumColStart = $rangeBounds[0][0];
-				$iNumColEnd = $rangeBounds[1][0];
-
-				$iInc = $iNumColStart;
-				while($iInc <= $iNumColEnd){
-					++$countShapes[$sheetIndex];
-
-					// create an Drawing Object for the dropdown
-					$oDrawing  = new PHPExcel_Worksheet_BaseDrawing();
-					// get the coordinates of drawing
-					$cDrawing   = PHPExcel_Cell::stringFromColumnIndex($iInc - 1) . $rangeBounds[0][1];
-					$oDrawing->setCoordinates($cDrawing);
-					$oDrawing->setWorksheet($sheet);
-
-					// add the shape
-					$spContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer();
-					// set the shape type
-					$spContainer->setSpType(0x00C9);
-					// set the shape flag
-					$spContainer->setSpFlag(0x01);
-
-					// set the shape index (we combine 1-based sheet index and $countShapes to create unique shape index)
-					$reducedSpId = $countShapes[$sheetIndex];
-					$spId = $reducedSpId
-						| ($sheet->getParent()->getIndex($sheet) + 1) << 10;
-					$spContainer->setSpId($spId);
-
-					// keep track of last reducedSpId
-					$lastReducedSpId = $reducedSpId;
-
-					// keep track of last spId
-					$lastSpId = $spId;
-
-					$spContainer->setOPT(0x007F, 0x01040104); // Protection -> fLockAgainstGrouping
-					$spContainer->setOPT(0x00BF, 0x00080008); // Text -> fFitTextToShape
-					$spContainer->setOPT(0x01BF, 0x00010000); // Fill Style -> fNoFillHitTest
-					$spContainer->setOPT(0x01FF, 0x00080000); // Line Style -> fNoLineDrawDash
-					$spContainer->setOPT(0x03BF, 0x000A0000); // Group Shape -> fPrint
-
-					// set coordinates and offsets, client anchor
-					$endCoordinates = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::stringFromColumnIndex($iInc - 1));
-					$endCoordinates .= $rangeBounds[0][1] + 1;
-
-					$spContainer->setStartCoordinates($cDrawing);
-					$spContainer->setStartOffsetX(0);
-					$spContainer->setStartOffsetY(0);
-					$spContainer->setEndCoordinates($endCoordinates);
-					$spContainer->setEndOffsetX(0);
-					$spContainer->setEndOffsetY(0);
-
-					$spgrContainer->addChild($spContainer);
-					$iInc++;
-				}
-			}
-
-			// identifier clusters, used for workbook Escher object
-			$this->_IDCLs[$dgId] = $lastReducedSpId;
-
-			// set last shape index
-			$dgContainer->setLastSpId($lastSpId);
-
-			// set the Escher object
-			$this->_writerWorksheets[$sheetIndex]->setEscher($escher);
-		}
-	}
-
-	/**
-	 * Build the Escher object corresponding to the MSODRAWINGGROUP record
-	 */
-	private function _buildWorkbookEscher()
-	{
-		$escher = null;
-
-		// any drawings in this workbook?
-		$found = false;
-		foreach ($this->_phpExcel->getAllSheets() as $sheet) {
-			if (count($sheet->getDrawingCollection()) > 0) {
-				$found = true;
-				break;
-			}
-		}
-
-		// nothing to do if there are no drawings
-		if (!$found) {
-			return;
-		}
-
-		// if we reach here, then there are drawings in the workbook
-		$escher = new PHPExcel_Shared_Escher();
-
-		// dggContainer
-		$dggContainer = new PHPExcel_Shared_Escher_DggContainer();
-		$escher->setDggContainer($dggContainer);
-
-		// set IDCLs (identifier clusters)
-		$dggContainer->setIDCLs($this->_IDCLs);
-
-		// this loop is for determining maximum shape identifier of all drawing
-		$spIdMax = 0;
-		$totalCountShapes = 0;
-		$countDrawings = 0;
-
-		foreach ($this->_phpExcel->getAllsheets() as $sheet) {
-			$sheetCountShapes = 0; // count number of shapes (minus group shape), in sheet
-
-			if (count($sheet->getDrawingCollection()) > 0) {
-				++$countDrawings;
-
-				foreach ($sheet->getDrawingCollection() as $drawing) {
-					++$sheetCountShapes;
-					++$totalCountShapes;
-
-					$spId = $sheetCountShapes
-						| ($this->_phpExcel->getIndex($sheet) + 1) << 10;
-					$spIdMax = max($spId, $spIdMax);
-				}
-			}
-		}
-
-		$dggContainer->setSpIdMax($spIdMax + 1);
-		$dggContainer->setCDgSaved($countDrawings);
-		$dggContainer->setCSpSaved($totalCountShapes + $countDrawings); // total number of shapes incl. one group shapes per drawing
-
-		// bstoreContainer
-		$bstoreContainer = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer();
-		$dggContainer->setBstoreContainer($bstoreContainer);
-
-		// the BSE's (all the images)
-		foreach ($this->_phpExcel->getAllsheets() as $sheet) {
-			foreach ($sheet->getDrawingCollection() as $drawing) {
-				if ($drawing instanceof PHPExcel_Worksheet_Drawing) {
-
-					$filename = $drawing->getPath();
-
-					list($imagesx, $imagesy, $imageFormat) = getimagesize($filename);
-
-					switch ($imageFormat) {
-
-					case 1: // GIF, not supported by BIFF8, we convert to PNG
-						$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
-						ob_start();
-						imagepng(imagecreatefromgif($filename));
-						$blipData = ob_get_contents();
-						ob_end_clean();
-						break;
-
-					case 2: // JPEG
-						$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG;
-						$blipData = file_get_contents($filename);
-						break;
-
-					case 3: // PNG
-						$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
-						$blipData = file_get_contents($filename);
-						break;
-
-					case 6: // Windows DIB (BMP), we convert to PNG
-						$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
-						ob_start();
-						imagepng(PHPExcel_Shared_Drawing::imagecreatefrombmp($filename));
-						$blipData = ob_get_contents();
-						ob_end_clean();
-						break;
-
-					default: continue 2;
-
-					}
-
-					$blip = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip();
-					$blip->setData($blipData);
-
-					$BSE = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE();
-					$BSE->setBlipType($blipType);
-					$BSE->setBlip($blip);
-
-					$bstoreContainer->addBSE($BSE);
-
-				} else if ($drawing instanceof PHPExcel_Worksheet_MemoryDrawing) {
-
-					switch ($drawing->getRenderingFunction()) {
-
-					case PHPExcel_Worksheet_MemoryDrawing::RENDERING_JPEG:
-						$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG;
-						$renderingFunction = 'imagejpeg';
-						break;
-
-					case PHPExcel_Worksheet_MemoryDrawing::RENDERING_GIF:
-					case PHPExcel_Worksheet_MemoryDrawing::RENDERING_PNG:
-					case PHPExcel_Worksheet_MemoryDrawing::RENDERING_DEFAULT:
-						$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
-						$renderingFunction = 'imagepng';
-						break;
-
-					}
-
-					ob_start();
-					call_user_func($renderingFunction, $drawing->getImageResource());
-					$blipData = ob_get_contents();
-					ob_end_clean();
-
-					$blip = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip();
-					$blip->setData($blipData);
-
-					$BSE = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE();
-					$BSE->setBlipType($blipType);
-					$BSE->setBlip($blip);
-
-					$bstoreContainer->addBSE($BSE);
-				}
-			}
-		}
-
-		// Set the Escher object
-		$this->_writerWorkbook->setEscher($escher);
-	}
-
-	/**
-	 * Build the OLE Part for DocumentSummary Information
-	 * @return string
-	 */
-	private function _writeDocumentSummaryInformation(){
-
-		// offset: 0; size: 2; must be 0xFE 0xFF (UTF-16 LE byte order mark)
-		$data = pack('v', 0xFFFE);
-		// offset: 2; size: 2;
-		$data .= pack('v', 0x0000);
-		// offset: 4; size: 2; OS version
-		$data .= pack('v', 0x0106);
-		// offset: 6; size: 2; OS indicator
-		$data .= pack('v', 0x0002);
-		// offset: 8; size: 16
-		$data .= pack('VVVV', 0x00, 0x00, 0x00, 0x00);
-		// offset: 24; size: 4; section count
-		$data .= pack('V', 0x0001);
-
-		// offset: 28; size: 16; first section's class id: 02 d5 cd d5 9c 2e 1b 10 93 97 08 00 2b 2c f9 ae
-		$data .= pack('vvvvvvvv', 0xD502, 0xD5CD, 0x2E9C, 0x101B, 0x9793, 0x0008, 0x2C2B, 0xAEF9);
-		// offset: 44; size: 4; offset of the start
-		$data .= pack('V', 0x30);
-
-		// SECTION
-		$dataSection = array();
-		$dataSection_NumProps = 0;
-		$dataSection_Summary = '';
-		$dataSection_Content = '';
-
-		// GKPIDDSI_CODEPAGE: CodePage
-		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x01),
-							   'offset' => array('pack' => 'V'),
-							   'type' 	=> array('pack' => 'V', 'data' => 0x02), // 2 byte signed integer
-							   'data'	=> array('data' => 1252));
-		$dataSection_NumProps++;
-
-		// GKPIDDSI_CATEGORY : Category
-		if($this->_phpExcel->getProperties()->getCategory()){
-			$dataProp = $this->_phpExcel->getProperties()->getCategory();
-			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x02),
-								   'offset' => array('pack' => 'V'),
-								   'type' 	=> array('pack' => 'V', 'data' => 0x1E),
-								   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
-			$dataSection_NumProps++;
-		}
-		// GKPIDDSI_VERSION :Version of the application that wrote the property storage
-		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x17),
-							   'offset' => array('pack' => 'V'),
-							   'type' 	=> array('pack' => 'V', 'data' => 0x03),
-							   'data'	=> array('pack' => 'V', 'data' => 0x000C0000));
-		$dataSection_NumProps++;
-		// GKPIDDSI_SCALE : FALSE
-		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0B),
-							   'offset' => array('pack' => 'V'),
-							   'type' 	=> array('pack' => 'V', 'data' => 0x0B),
-							   'data'	=> array('data' => false));
-		$dataSection_NumProps++;
-		// GKPIDDSI_LINKSDIRTY : True if any of the values for the linked properties have changed outside of the application
-		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x10),
-							   'offset' => array('pack' => 'V'),
-							   'type' 	=> array('pack' => 'V', 'data' => 0x0B),
-							   'data'	=> array('data' => false));
-		$dataSection_NumProps++;
-		// GKPIDDSI_SHAREDOC : FALSE
-		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x13),
-							   'offset' => array('pack' => 'V'),
-							   'type' 	=> array('pack' => 'V', 'data' => 0x0B),
-							   'data'	=> array('data' => false));
-		$dataSection_NumProps++;
-		// GKPIDDSI_HYPERLINKSCHANGED : True if any of the values for the _PID_LINKS (hyperlink text) have changed outside of the application
-		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x16),
-							   'offset' => array('pack' => 'V'),
-							   'type' 	=> array('pack' => 'V', 'data' => 0x0B),
-							   'data'	=> array('data' => false));
-		$dataSection_NumProps++;
-
-		// GKPIDDSI_DOCSPARTS
-		// MS-OSHARED p75 (2.3.3.2.2.1)
-		// Structure is VtVecUnalignedLpstrValue (2.3.3.1.9)
-		// cElements
-		$dataProp = pack('v', 0x0001);
-		$dataProp .= pack('v', 0x0000);
-		// array of UnalignedLpstr
-		  // cch
-		  $dataProp .= pack('v', 0x000A);
-		  $dataProp .= pack('v', 0x0000);
-		  // value
-		  $dataProp .= 'Worksheet'.chr(0);
-
-		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0D),
-							   'offset' => array('pack' => 'V'),
-							   'type' 	=> array('pack' => 'V', 'data' => 0x101E),
-							   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
-		$dataSection_NumProps++;
-
-		// GKPIDDSI_HEADINGPAIR
-		// VtVecHeadingPairValue
-		  // cElements
-		  $dataProp = pack('v', 0x0002);
-		  $dataProp .= pack('v', 0x0000);
-		  // Array of vtHeadingPair
-		    // vtUnalignedString - headingString
-		      // stringType
-		      $dataProp .= pack('v', 0x001E);
-		      // padding
-		      $dataProp .= pack('v', 0x0000);
-		      // UnalignedLpstr
-		        // cch
-		        $dataProp .= pack('v', 0x0013);
-		        $dataProp .= pack('v', 0x0000);
-		        // value
-		        $dataProp .= 'Feuilles de calcul';
-		    // vtUnalignedString - headingParts
-		      // wType : 0x0003 = 32 bit signed integer
-		      $dataProp .= pack('v', 0x0300);
-		      // padding
-		      $dataProp .= pack('v', 0x0000);
-		      // value
-		      $dataProp .= pack('v', 0x0100);
-		      $dataProp .= pack('v', 0x0000);
-			  $dataProp .= pack('v', 0x0000);
-		      $dataProp .= pack('v', 0x0000);
-
-        $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0C),
-        					   'offset' => array('pack' => 'V'),
-        					   'type' 	=> array('pack' => 'V', 'data' => 0x100C),
-        					   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
-        $dataSection_NumProps++;
-
-		// 		4 	Section Length
-		//		4 	Property count
-		//		8 * $dataSection_NumProps (8 =  ID (4) + OffSet(4))
-		$dataSection_Content_Offset = 8 + $dataSection_NumProps * 8;
-		foreach ($dataSection as $dataProp){
-			// Summary
-			$dataSection_Summary .= pack($dataProp['summary']['pack'], $dataProp['summary']['data']);
-			// Offset
-			$dataSection_Summary .= pack($dataProp['offset']['pack'], $dataSection_Content_Offset);
-			// DataType
-			$dataSection_Content .= pack($dataProp['type']['pack'], $dataProp['type']['data']);
-			// Data
-			if($dataProp['type']['data'] == 0x02){ // 2 byte signed integer
-				$dataSection_Content .= pack('V', $dataProp['data']['data']);
-
-				$dataSection_Content_Offset += 4 + 4;
-			}
-			elseif($dataProp['type']['data'] == 0x03){ // 4 byte signed integer
-				$dataSection_Content .= pack('V', $dataProp['data']['data']);
-
-				$dataSection_Content_Offset += 4 + 4;
-			}
-			elseif($dataProp['type']['data'] == 0x0B){ // Boolean
-				if($dataProp['data']['data'] == false){
-					$dataSection_Content .= pack('V', 0x0000);
-				} else {
-					$dataSection_Content .= pack('V', 0x0001);
-				}
-				$dataSection_Content_Offset += 4 + 4;
-			}
-			elseif($dataProp['type']['data'] == 0x1E){ // null-terminated string prepended by dword string length
-				// Null-terminated string
-				$dataProp['data']['data'] .= chr(0);
-				$dataProp['data']['length'] += 1;
-				// Complete the string with null string for being a %4
-				$dataProp['data']['length'] = $dataProp['data']['length'] + ((4 - $dataProp['data']['length'] % 4)==4 ? 0 : (4 - $dataProp['data']['length'] % 4));
-				$dataProp['data']['data'] = str_pad($dataProp['data']['data'], $dataProp['data']['length'], chr(0), STR_PAD_RIGHT);
-
-				$dataSection_Content .= pack('V', $dataProp['data']['length']);
-				$dataSection_Content .= $dataProp['data']['data'];
-
-				$dataSection_Content_Offset += 4 + 4 + strlen($dataProp['data']['data']);
-			}
-			elseif($dataProp['type']['data'] == 0x40){ // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
-				$dataSection_Content .= $dataProp['data']['data'];
-
-				$dataSection_Content_Offset += 4 + 8;
-			}
-			else {
-				// Data Type Not Used at the moment
-				$dataSection_Content .= $dataProp['data']['data'];
-
-				$dataSection_Content_Offset += 4 + $dataProp['data']['length'];
-			}
-		}
-		// Now $dataSection_Content_Offset contains the size of the content
-
-		// section header
-		// offset: $secOffset; size: 4; section length
-		// 		+ x  Size of the content (summary + content)
-		$data .= pack('V', $dataSection_Content_Offset);
-		// offset: $secOffset+4; size: 4; property count
-		$data .= pack('V', $dataSection_NumProps);
-		// Section Summary
-		$data .= $dataSection_Summary;
-		// Section Content
-		$data .= $dataSection_Content;
-
-		return $data;
-	}
-
-	/**
-	 * Build the OLE Part for Summary Information
-	 * @return string
-	 */
-	private function _writeSummaryInformation(){
-		// offset: 0; size: 2; must be 0xFE 0xFF (UTF-16 LE byte order mark)
-		$data = pack('v', 0xFFFE);
-		// offset: 2; size: 2;
-		$data .= pack('v', 0x0000);
-		// offset: 4; size: 2; OS version
-		$data .= pack('v', 0x0106);
-		// offset: 6; size: 2; OS indicator
-		$data .= pack('v', 0x0002);
-		// offset: 8; size: 16
-		$data .= pack('VVVV', 0x00, 0x00, 0x00, 0x00);
-		// offset: 24; size: 4; section count
-		$data .= pack('V', 0x0001);
-
-		// offset: 28; size: 16; first section's class id: e0 85 9f f2 f9 4f 68 10 ab 91 08 00 2b 27 b3 d9
-		$data .= pack('vvvvvvvv', 0x85E0, 0xF29F, 0x4FF9, 0x1068, 0x91AB, 0x0008, 0x272B, 0xD9B3);
-		// offset: 44; size: 4; offset of the start
-		$data .= pack('V', 0x30);
-
-		// SECTION
-		$dataSection = array();
-		$dataSection_NumProps = 0;
-		$dataSection_Summary = '';
-		$dataSection_Content = '';
-
-		// CodePage : CP-1252
-		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x01),
-							   'offset' => array('pack' => 'V'),
-							   'type' 	=> array('pack' => 'V', 'data' => 0x02), // 2 byte signed integer
-							   'data'	=> array('data' => 1252));
-		$dataSection_NumProps++;
-
-		//	Title
-		if($this->_phpExcel->getProperties()->getTitle()){
-			$dataProp = $this->_phpExcel->getProperties()->getTitle();
-			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x02),
-								   'offset' => array('pack' => 'V'),
-								   'type' 	=> array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
-								   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
-			$dataSection_NumProps++;
-		}
-		//	Subject
-		if($this->_phpExcel->getProperties()->getSubject()){
-			$dataProp = $this->_phpExcel->getProperties()->getSubject();
-			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x03),
-								   'offset' => array('pack' => 'V'),
-								   'type' 	=> array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
-								   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
-			$dataSection_NumProps++;
-		}
-		//	Author (Creator)
-		if($this->_phpExcel->getProperties()->getCreator()){
-			$dataProp = $this->_phpExcel->getProperties()->getCreator();
-			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x04),
-								   'offset' => array('pack' => 'V'),
-								   'type' 	=> array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
-								   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
-			$dataSection_NumProps++;
-		}
-		//	Keywords
-		if($this->_phpExcel->getProperties()->getKeywords()){
-			$dataProp = $this->_phpExcel->getProperties()->getKeywords();
-			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x05),
-								   'offset' => array('pack' => 'V'),
-								   'type' 	=> array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
-								   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
-			$dataSection_NumProps++;
-		}
-		//	Comments (Description)
-		if($this->_phpExcel->getProperties()->getDescription()){
-			$dataProp = $this->_phpExcel->getProperties()->getDescription();
-			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x06),
-								   'offset' => array('pack' => 'V'),
-								   'type' 	=> array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
-								   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
-			$dataSection_NumProps++;
-		}
-		//	Last Saved By (LastModifiedBy)
-		if($this->_phpExcel->getProperties()->getLastModifiedBy()){
-			$dataProp = $this->_phpExcel->getProperties()->getLastModifiedBy();
-			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x08),
-								   'offset' => array('pack' => 'V'),
-								   'type' 	=> array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
-								   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
-			$dataSection_NumProps++;
-		}
-		//	Created Date/Time
-		if($this->_phpExcel->getProperties()->getCreated()){
-			$dataProp = $this->_phpExcel->getProperties()->getCreated();
-			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0C),
-								   'offset' => array('pack' => 'V'),
-								   'type' 	=> array('pack' => 'V', 'data' => 0x40), // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
-								   'data'	=> array('data' => PHPExcel_Shared_OLE::LocalDate2OLE($dataProp)));
-			$dataSection_NumProps++;
-		}
-		//	Modified Date/Time
-		if($this->_phpExcel->getProperties()->getModified()){
-			$dataProp = $this->_phpExcel->getProperties()->getModified();
-			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0D),
-								   'offset' => array('pack' => 'V'),
-								   'type' 	=> array('pack' => 'V', 'data' => 0x40), // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
-								   'data'	=> array('data' => PHPExcel_Shared_OLE::LocalDate2OLE($dataProp)));
-			$dataSection_NumProps++;
-		}
-		//	Security
-		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x13),
-							   'offset' => array('pack' => 'V'),
-							   'type' 	=> array('pack' => 'V', 'data' => 0x03), // 4 byte signed integer
-							   'data'	=> array('data' => 0x00));
-		$dataSection_NumProps++;
-
-
-		// 		4 	Section Length
-		//		4 	Property count
-		//		8 * $dataSection_NumProps (8 =  ID (4) + OffSet(4))
-		$dataSection_Content_Offset = 8 + $dataSection_NumProps * 8;
-		foreach ($dataSection as $dataProp){
-			// Summary
-			$dataSection_Summary .= pack($dataProp['summary']['pack'], $dataProp['summary']['data']);
-			// Offset
-			$dataSection_Summary .= pack($dataProp['offset']['pack'], $dataSection_Content_Offset);
-			// DataType
-			$dataSection_Content .= pack($dataProp['type']['pack'], $dataProp['type']['data']);
-			// Data
-			if($dataProp['type']['data'] == 0x02){ // 2 byte signed integer
-				$dataSection_Content .= pack('V', $dataProp['data']['data']);
-
-				$dataSection_Content_Offset += 4 + 4;
-			}
-			elseif($dataProp['type']['data'] == 0x03){ // 4 byte signed integer
-				$dataSection_Content .= pack('V', $dataProp['data']['data']);
-
-				$dataSection_Content_Offset += 4 + 4;
-			}
-			elseif($dataProp['type']['data'] == 0x1E){ // null-terminated string prepended by dword string length
-				// Null-terminated string
-				$dataProp['data']['data'] .= chr(0);
-				$dataProp['data']['length'] += 1;
-				// Complete the string with null string for being a %4
-				$dataProp['data']['length'] = $dataProp['data']['length'] + ((4 - $dataProp['data']['length'] % 4)==4 ? 0 : (4 - $dataProp['data']['length'] % 4));
-				$dataProp['data']['data'] = str_pad($dataProp['data']['data'], $dataProp['data']['length'], chr(0), STR_PAD_RIGHT);
-
-				$dataSection_Content .= pack('V', $dataProp['data']['length']);
-				$dataSection_Content .= $dataProp['data']['data'];
-
-				$dataSection_Content_Offset += 4 + 4 + strlen($dataProp['data']['data']);
-			}
-			elseif($dataProp['type']['data'] == 0x40){ // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
-				$dataSection_Content .= $dataProp['data']['data'];
-
-				$dataSection_Content_Offset += 4 + 8;
-			}
-			else {
-				// Data Type Not Used at the moment
-			}
-		}
-		// Now $dataSection_Content_Offset contains the size of the content
-
-		// section header
-		// offset: $secOffset; size: 4; section length
-		// 		+ x  Size of the content (summary + content)
-		$data .= pack('V', $dataSection_Content_Offset);
-		// offset: $secOffset+4; size: 4; property count
-		$data .= pack('V', $dataSection_NumProps);
-		// Section Summary
-		$data .= $dataSection_Summary;
-		// Section Content
-		$data .= $dataSection_Content;
-
-		return $data;
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/BIFFwriter.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/BIFFwriter.php
deleted file mode 100644
index 86201134d0f..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/BIFFwriter.php
+++ /dev/null
@@ -1,255 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-// Original file header of PEAR::Spreadsheet_Excel_Writer_BIFFwriter (used as the base for this class):
-// -----------------------------------------------------------------------------------------
-// *  Module written/ported by Xavier Noguer <xnoguer@rezebra.com>
-// *
-// *  The majority of this is _NOT_ my code.  I simply ported it from the
-// *  PERL Spreadsheet::WriteExcel module.
-// *
-// *  The author of the Spreadsheet::WriteExcel module is John McNamara
-// *  <jmcnamara@cpan.org>
-// *
-// *  I _DO_ maintain this code, and John McNamara has nothing to do with the
-// *  porting of this code to PHP.  Any questions directly related to this
-// *  class library should be directed to me.
-// *
-// *  License Information:
-// *
-// *    Spreadsheet_Excel_Writer:  A library for generating Excel Spreadsheets
-// *    Copyright (c) 2002-2003 Xavier Noguer xnoguer@rezebra.com
-// *
-// *    This library is free software; you can redistribute it and/or
-// *    modify it under the terms of the GNU Lesser General Public
-// *    License as published by the Free Software Foundation; either
-// *    version 2.1 of the License, or (at your option) any later version.
-// *
-// *    This library is distributed in the hope that it will be useful,
-// *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-// *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// *    Lesser General Public License for more details.
-// *
-// *    You should have received a copy of the GNU Lesser General Public
-// *    License along with this library; if not, write to the Free Software
-// *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-// */
-
-
-/**
- * PHPExcel_Writer_Excel5_BIFFwriter
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel5_BIFFwriter
-{
-	/**
-	 * The byte order of this architecture. 0 => little endian, 1 => big endian
-	 * @var integer
-	 */
-	private static $_byte_order;
-
-	/**
-	 * The string containing the data of the BIFF stream
-	 * @var string
-	 */
-	public $_data;
-
-	/**
-	 * The size of the data in bytes. Should be the same as strlen($this->_data)
-	 * @var integer
-	 */
-	public $_datasize;
-
-	/**
-	 * The maximum length for a BIFF record (excluding record header and length field). See _addContinue()
-	 * @var integer
-	 * @see _addContinue()
-	 */
-	public $_limit	= 8224;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		$this->_data       = '';
-		$this->_datasize   = 0;
-//		$this->_limit      = 8224;
-	}
-
-	/**
-	 * Determine the byte order and store it as class data to avoid
-	 * recalculating it for each call to new().
-	 *
-	 * @return int
-	 */
-	public static function getByteOrder()
-	{
-		if (!isset(self::$_byte_order)) {
-			// Check if "pack" gives the required IEEE 64bit float
-			$teststr = pack("d", 1.2345);
-			$number  = pack("C8", 0x8D, 0x97, 0x6E, 0x12, 0x83, 0xC0, 0xF3, 0x3F);
-			if ($number == $teststr) {
-				$byte_order = 0;    // Little Endian
-			} elseif ($number == strrev($teststr)){
-				$byte_order = 1;    // Big Endian
-			} else {
-				// Give up. I'll fix this in a later version.
-				throw new PHPExcel_Writer_Exception("Required floating point format not supported on this platform.");
-			}
-			self::$_byte_order = $byte_order;
-		}
-
-		return self::$_byte_order;
-	}
-
-	/**
-	 * General storage function
-	 *
-	 * @param string $data binary data to append
-	 * @access private
-	 */
-	function _append($data)
-	{
-		if (strlen($data) - 4 > $this->_limit) {
-			$data = $this->_addContinue($data);
-		}
-		$this->_data		.= $data;
-		$this->_datasize	+= strlen($data);
-	}
-
-	/**
-	 * General storage function like _append, but returns string instead of modifying $this->_data
-	 *
-	 * @param string $data binary data to write
-	 * @return string
-	 */
-	public function writeData($data)
-	{
-		if (strlen($data) - 4 > $this->_limit) {
-			$data = $this->_addContinue($data);
-		}
-		$this->_datasize += strlen($data);
-
-		return $data;
-	}
-
-	/**
-	 * Writes Excel BOF record to indicate the beginning of a stream or
-	 * sub-stream in the BIFF file.
-	 *
-	 * @param  integer $type Type of BIFF file to write: 0x0005 Workbook,
-	 *                       0x0010 Worksheet.
-	 * @access private
-	 */
-	function _storeBof($type)
-	{
-		$record  = 0x0809;			// Record identifier	(BIFF5-BIFF8)
-		$length  = 0x0010;
-
-		// by inspection of real files, MS Office Excel 2007 writes the following
-		$unknown = pack("VV", 0x000100D1, 0x00000406);
-
-		$build   = 0x0DBB;			//	Excel 97
-		$year    = 0x07CC;			//	Excel 97
-
-		$version = 0x0600;			//	BIFF8
-
-		$header  = pack("vv",   $record, $length);
-		$data    = pack("vvvv", $version, $type, $build, $year);
-		$this->_append($header . $data . $unknown);
-	}
-
-	/**
-	 * Writes Excel EOF record to indicate the end of a BIFF stream.
-	 *
-	 * @access private
-	 */
-	function _storeEof()
-	{
-		$record    = 0x000A;   // Record identifier
-		$length    = 0x0000;   // Number of bytes to follow
-
-		$header    = pack("vv", $record, $length);
-		$this->_append($header);
-	}
-
-	/**
-	 * Writes Excel EOF record to indicate the end of a BIFF stream.
-	 *
-	 * @access private
-	 */
-	public function writeEof()
-	{
-		$record    = 0x000A;   // Record identifier
-		$length    = 0x0000;   // Number of bytes to follow
-		$header    = pack("vv", $record, $length);
-		return $this->writeData($header);
-	}
-
-	/**
-	 * Excel limits the size of BIFF records. In Excel 5 the limit is 2084 bytes. In
-	 * Excel 97 the limit is 8228 bytes. Records that are longer than these limits
-	 * must be split up into CONTINUE blocks.
-	 *
-	 * This function takes a long BIFF record and inserts CONTINUE records as
-	 * necessary.
-	 *
-	 * @param  string  $data The original binary data to be written
-	 * @return string        A very convenient string of continue blocks
-	 * @access private
-	 */
-	function _addContinue($data)
-	{
-		$limit  = $this->_limit;
-		$record = 0x003C;         // Record identifier
-
-		// The first 2080/8224 bytes remain intact. However, we have to change
-		// the length field of the record.
-		$tmp = substr($data, 0, 2) . pack("v", $limit) . substr($data, 4, $limit);
-
-		$header = pack("vv", $record, $limit);  // Headers for continue records
-
-		// Retrieve chunks of 2080/8224 bytes +4 for the header.
-		$data_length = strlen($data);
-		for ($i = $limit + 4; $i < ($data_length - $limit); $i += $limit) {
-			$tmp .= $header;
-			$tmp .= substr($data, $i, $limit);
-		}
-
-		// Retrieve the last chunk of data
-		$header  = pack("vv", $record, strlen($data) - $i);
-		$tmp    .= $header;
-		$tmp    .= substr($data, $i, strlen($data) - $i);
-
-		return $tmp;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Escher.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Escher.php
deleted file mode 100644
index 92e6a8d8848..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Escher.php
+++ /dev/null
@@ -1,537 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Shared_Escher_DggContainer_BstoreContainer
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel5_Escher
-{
-	/**
-	 * The object we are writing
-	 */
-	private $_object;
-
-	/**
-	 * The written binary data
-	 */
-	private $_data;
-
-	/**
-	 * Shape offsets. Positions in binary stream where a new shape record begins
-	 *
-	 * @var array
-	 */
-	private $_spOffsets;
-
-	/**
-	 * Shape types.
-	 *
-	 * @var array
-	 */
-	private $_spTypes;
-	
-	/**
-	 * Constructor
-	 *
-	 * @param mixed
-	 */
-	public function __construct($object)
-	{
-		$this->_object = $object;
-	}
-
-	/**
-	 * Process the object to be written
-	 */
-	public function close()
-	{
-		// initialize
-		$this->_data = '';
-
-		switch (get_class($this->_object)) {
-
-		case 'PHPExcel_Shared_Escher':
-			if ($dggContainer = $this->_object->getDggContainer()) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($dggContainer);
-				$this->_data = $writer->close();
-			} else if ($dgContainer = $this->_object->getDgContainer()) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($dgContainer);
-				$this->_data = $writer->close();
-				$this->_spOffsets = $writer->getSpOffsets();
-				$this->_spTypes = $writer->getSpTypes();
-			}
-			break;
-
-		case 'PHPExcel_Shared_Escher_DggContainer':
-			// this is a container record
-
-			// initialize
-			$innerData = '';
-
-			// write the dgg
-			$recVer			= 0x0;
-			$recInstance	= 0x0000;
-			$recType		= 0xF006;
-
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
-
-			// dgg data
-			$dggData =
-				pack('VVVV'
-					, $this->_object->getSpIdMax() // maximum shape identifier increased by one
-					, $this->_object->getCDgSaved() + 1 // number of file identifier clusters increased by one
-					, $this->_object->getCSpSaved()
-					, $this->_object->getCDgSaved() // count total number of drawings saved
-				);
-
-			// add file identifier clusters (one per drawing)
-			$IDCLs = $this->_object->getIDCLs();
-
-			foreach ($IDCLs as $dgId => $maxReducedSpId) {
-				$dggData .= pack('VV', $dgId, $maxReducedSpId + 1);
-			}
-
-			$header = pack('vvV', $recVerInstance, $recType, strlen($dggData));
-			$innerData .= $header . $dggData;
-
-			// write the bstoreContainer
-			if ($bstoreContainer = $this->_object->getBstoreContainer()) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($bstoreContainer);
-				$innerData .= $writer->close();
-			}
-
-			// write the record
-			$recVer			= 0xF;
-			$recInstance	= 0x0000;
-			$recType		= 0xF000;
-			$length			= strlen($innerData);
-
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
-
-			$header = pack('vvV', $recVerInstance, $recType, $length);
-
-			$this->_data = $header . $innerData;
-			break;
-
-		case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer':
-			// this is a container record
-
-			// initialize
-			$innerData = '';
-
-			// treat the inner data
-			if ($BSECollection = $this->_object->getBSECollection()) {
-				foreach ($BSECollection as $BSE) {
-					$writer = new PHPExcel_Writer_Excel5_Escher($BSE);
-					$innerData .= $writer->close();
-				}
-			}
-
-			// write the record
-			$recVer			= 0xF;
-			$recInstance	= count($this->_object->getBSECollection());
-			$recType		= 0xF001;
-			$length			= strlen($innerData);
-
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
-
-			$header = pack('vvV', $recVerInstance, $recType, $length);
-
-			$this->_data = $header . $innerData;
-			break;
-
-		case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE':
-			// this is a semi-container record
-
-			// initialize
-			$innerData = '';
-
-			// here we treat the inner data
-			if ($blip = $this->_object->getBlip()) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($blip);
-				$innerData .= $writer->close();
-			}
-
-			// initialize
-			$data = '';
-
-			$btWin32 = $this->_object->getBlipType();
-			$btMacOS = $this->_object->getBlipType();
-			$data .= pack('CC', $btWin32, $btMacOS);
-
-			$rgbUid = pack('VVVV', 0,0,0,0); // todo
-			$data .= $rgbUid;
-
-			$tag = 0;
-			$size = strlen($innerData);
-			$cRef = 1;
-			$foDelay = 0; //todo
-			$unused1 = 0x0;
-			$cbName = 0x0;
-			$unused2 = 0x0;
-			$unused3 = 0x0;
-			$data .= pack('vVVVCCCC', $tag, $size, $cRef, $foDelay, $unused1, $cbName, $unused2, $unused3);
-
-			$data .= $innerData;
-
-			// write the record
-			$recVer			= 0x2;
-			$recInstance	= $this->_object->getBlipType();
-			$recType		= 0xF007;
-			$length			= strlen($data);
-
-			$recVerInstance  = $recVer;
-			$recVerInstance |=	$recInstance << 4;
-
-			$header = pack('vvV', $recVerInstance, $recType, $length);
-
-			$this->_data = $header;
-
-			$this->_data .= $data;
-			break;
-
-		case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip':
-			// this is an atom record
-
-			// write the record
-			switch ($this->_object->getParent()->getBlipType()) {
-
-			case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG:
-				// initialize
-				$innerData = '';
-
-				$rgbUid1 = pack('VVVV', 0,0,0,0); // todo
-				$innerData .= $rgbUid1;
-
-				$tag = 0xFF; // todo
-				$innerData .= pack('C', $tag);
-
-				$innerData .= $this->_object->getData();
-
-				$recVer			= 0x0;
-				$recInstance	= 0x46A;
-				$recType		= 0xF01D;
-				$length			= strlen($innerData);
-
-				$recVerInstance  = $recVer;
-				$recVerInstance |=	$recInstance << 4;
-
-				$header = pack('vvV', $recVerInstance, $recType, $length);
-
-				$this->_data = $header;
-
-				$this->_data .= $innerData;
-				break;
-
-			case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG:
-				// initialize
-				$innerData = '';
-
-				$rgbUid1 = pack('VVVV', 0,0,0,0); // todo
-				$innerData .= $rgbUid1;
-
-				$tag = 0xFF; // todo
-				$innerData .= pack('C', $tag);
-
-				$innerData .= $this->_object->getData();
-
-				$recVer			= 0x0;
-				$recInstance	= 0x6E0;
-				$recType		= 0xF01E;
-				$length			= strlen($innerData);
-
-				$recVerInstance  = $recVer;
-				$recVerInstance |=	$recInstance << 4;
-
-				$header = pack('vvV', $recVerInstance, $recType, $length);
-
-				$this->_data = $header;
-
-				$this->_data .= $innerData;
-				break;
-
-			}
-			break;
-
-		case 'PHPExcel_Shared_Escher_DgContainer':
-			// this is a container record
-
-			// initialize
-			$innerData = '';
-
-			// write the dg
-			$recVer			= 0x0;
-			$recInstance	= $this->_object->getDgId();
-			$recType		= 0xF008;
-			$length			= 8;
-
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
-
-			$header = pack('vvV', $recVerInstance, $recType, $length);
-
-			// number of shapes in this drawing (including group shape)
-			$countShapes = count($this->_object->getSpgrContainer()->getChildren());
-			$innerData .= $header . pack('VV', $countShapes, $this->_object->getLastSpId());
-			//$innerData .= $header . pack('VV', 0, 0);
-
-			// write the spgrContainer
-			if ($spgrContainer = $this->_object->getSpgrContainer()) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($spgrContainer);
-				$innerData .= $writer->close();
-
-				// get the shape offsets relative to the spgrContainer record
-				$spOffsets = $writer->getSpOffsets();
-				$spTypes   = $writer->getSpTypes();
-				
-				// save the shape offsets relative to dgContainer
-				foreach ($spOffsets as & $spOffset) {
-					$spOffset += 24; // add length of dgContainer header data (8 bytes) plus dg data (16 bytes)
-				}
-
-				$this->_spOffsets = $spOffsets;
-				$this->_spTypes = $spTypes;
-			}
-
-			// write the record
-			$recVer			= 0xF;
-			$recInstance	= 0x0000;
-			$recType		= 0xF002;
-			$length			= strlen($innerData);
-
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
-
-			$header = pack('vvV', $recVerInstance, $recType, $length);
-
-			$this->_data = $header . $innerData;
-			break;
-
-		case 'PHPExcel_Shared_Escher_DgContainer_SpgrContainer':
-			// this is a container record
-
-			// initialize
-			$innerData = '';
-
-			// initialize spape offsets
-			$totalSize = 8;
-			$spOffsets = array();
-			$spTypes   = array();
-
-			// treat the inner data
-			foreach ($this->_object->getChildren() as $spContainer) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($spContainer);
-				$spData = $writer->close();
-				$innerData .= $spData;
-
-				// save the shape offsets (where new shape records begin)
-				$totalSize += strlen($spData);
-				$spOffsets[] = $totalSize;
-				
-				$spTypes = array_merge($spTypes, $writer->getSpTypes());
-			}
-
-			// write the record
-			$recVer			= 0xF;
-			$recInstance	= 0x0000;
-			$recType		= 0xF003;
-			$length			= strlen($innerData);
-
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
-
-			$header = pack('vvV', $recVerInstance, $recType, $length);
-
-			$this->_data = $header . $innerData;
-			$this->_spOffsets = $spOffsets;
-			$this->_spTypes = $spTypes;
-			break;
-
-		case 'PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer':
-			// initialize
-			$data = '';
-
-			// build the data
-
-			// write group shape record, if necessary?
-			if ($this->_object->getSpgr()) {
-				$recVer			= 0x1;
-				$recInstance	= 0x0000;
-				$recType		= 0xF009;
-				$length			= 0x00000010;
-
-				$recVerInstance  = $recVer;
-				$recVerInstance |= $recInstance << 4;
-
-				$header = pack('vvV', $recVerInstance, $recType, $length);
-
-				$data .= $header . pack('VVVV', 0,0,0,0);
-			}
-			$this->_spTypes[] = ($this->_object->getSpType());
-
-			// write the shape record
-			$recVer			= 0x2;
-			$recInstance	= $this->_object->getSpType(); // shape type
-			$recType		= 0xF00A;
-			$length			= 0x00000008;
-
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
-
-			$header = pack('vvV', $recVerInstance, $recType, $length);
-
-			$data .= $header . pack('VV', $this->_object->getSpId(), $this->_object->getSpgr() ? 0x0005 : 0x0A00);
-
-
-			// the options
-			if ($this->_object->getOPTCollection()) {
-				$optData = '';
-
-				$recVer			= 0x3;
-				$recInstance	= count($this->_object->getOPTCollection());
-				$recType		= 0xF00B;
-				foreach ($this->_object->getOPTCollection() as $property => $value) {
-					$optData .= pack('vV', $property, $value);
-				}
-				$length			= strlen($optData);
-
-				$recVerInstance  = $recVer;
-				$recVerInstance |= $recInstance << 4;
-
-				$header = pack('vvV', $recVerInstance, $recType, $length);
-				$data .= $header . $optData;
-			}
-
-			// the client anchor
-			if ($this->_object->getStartCoordinates()) {
-				$clientAnchorData = '';
-
-				$recVer			= 0x0;
-				$recInstance	= 0x0;
-				$recType		= 0xF010;
-
-				// start coordinates
-				list($column, $row) = PHPExcel_Cell::coordinateFromString($this->_object->getStartCoordinates());
-				$c1 = PHPExcel_Cell::columnIndexFromString($column) - 1;
-				$r1 = $row - 1;
-
-				// start offsetX
-				$startOffsetX = $this->_object->getStartOffsetX();
-
-				// start offsetY
-				$startOffsetY = $this->_object->getStartOffsetY();
-
-				// end coordinates
-				list($column, $row) = PHPExcel_Cell::coordinateFromString($this->_object->getEndCoordinates());
-				$c2 = PHPExcel_Cell::columnIndexFromString($column) - 1;
-				$r2 = $row - 1;
-
-				// end offsetX
-				$endOffsetX = $this->_object->getEndOffsetX();
-
-				// end offsetY
-				$endOffsetY = $this->_object->getEndOffsetY();
-
-				$clientAnchorData = pack('vvvvvvvvv', $this->_object->getSpFlag(),
-					$c1, $startOffsetX, $r1, $startOffsetY,
-					$c2, $endOffsetX, $r2, $endOffsetY);
-				
-				$length			= strlen($clientAnchorData);
-
-				$recVerInstance  = $recVer;
-				$recVerInstance |= $recInstance << 4;
-
-				$header = pack('vvV', $recVerInstance, $recType, $length);
-				$data .= $header . $clientAnchorData;
-			}
-
-			// the client data, just empty for now
-			if (!$this->_object->getSpgr()) {
-				$clientDataData = '';
-
-				$recVer			= 0x0;
-				$recInstance	= 0x0;
-				$recType		= 0xF011;
-
-				$length = strlen($clientDataData);
-
-				$recVerInstance  = $recVer;
-				$recVerInstance |= $recInstance << 4;
-
-				$header = pack('vvV', $recVerInstance, $recType, $length);
-				$data .= $header . $clientDataData;
-			}
-
-			// write the record
-			$recVer			= 0xF;
-			$recInstance	= 0x0000;
-			$recType		= 0xF004;
-			$length			= strlen($data);
-
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
-
-			$header = pack('vvV', $recVerInstance, $recType, $length);
-
-			$this->_data = $header . $data;
-			break;
-
-		}
-
-		return $this->_data;
-	}
-
-	/**
-	 * Gets the shape offsets
-	 *
-	 * @return array
-	 */
-	public function getSpOffsets()
-	{
-		return $this->_spOffsets;
-	}
-
-	/**
-	 * Gets the shape types
-	 *
-	 * @return array
-	 */
-	public function getSpTypes()
-	{
-		return $this->_spTypes;
-	}
-	
-	
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Font.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Font.php
deleted file mode 100644
index 0df1943826b..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Font.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel5_Font
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel5_Font
-{
-	/**
-	 * Color index
-	 *
-	 * @var int
-	 */
-	private $_colorIndex;
-
-	/**
-	 * Font
-	 *
-	 * @var PHPExcel_Style_Font
-	 */
-	private $_font;
-
-	/**
-	 * Constructor
-	 *
-	 * @param PHPExcel_Style_Font $font
-	 */
-	public function __construct(PHPExcel_Style_Font $font = null)
-	{
-		$this->_colorIndex = 0x7FFF;
-		$this->_font = $font;
-	}
-
-	/**
-	 * Set the color index
-	 *
-	 * @param int $colorIndex
-	 */
-	public function setColorIndex($colorIndex)
-	{
-		$this->_colorIndex = $colorIndex;
-	}
-
-	/**
-	 * Get font record data
-	 *
-	 * @return string
-	 */
-	public function writeFont()
-	{
-		$font_outline = 0;
-		$font_shadow = 0;
-
-		$icv = $this->_colorIndex; // Index to color palette
-		if ($this->_font->getSuperScript()) {
-			$sss = 1;
-		} else if ($this->_font->getSubScript()) {
-			$sss = 2;
-		} else {
-			$sss = 0;
-		}
-		$bFamily = 0; // Font family
-		$bCharSet = PHPExcel_Shared_Font::getCharsetFromFontName($this->_font->getName()); // Character set
-
-		$record = 0x31;		// Record identifier
-		$reserved = 0x00;	// Reserved
-		$grbit = 0x00;		// Font attributes
-		if ($this->_font->getItalic()) {
-			$grbit |= 0x02;
-		}
-		if ($this->_font->getStrikethrough()) {
-			$grbit |= 0x08;
-		}
-		if ($font_outline) {
-			$grbit |= 0x10;
-		}
-		if ($font_shadow) {
-			$grbit |= 0x20;
-		}
-
-		$data = pack("vvvvvCCCC",
-			$this->_font->getSize() * 20,						//	Fontsize (in twips)
-			$grbit,
-			$icv,												//	Colour
-			self::_mapBold($this->_font->getBold()),			//	Font weight
-			$sss,												//	Superscript/Subscript
-			self::_mapUnderline($this->_font->getUnderline()),
-			$bFamily,
-			$bCharSet,
-			$reserved
-		);
-		$data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($this->_font->getName());
-
-		$length = strlen($data);
-		$header = pack("vv", $record, $length);
-
-		return($header . $data);
-	}
-
-	/**
-	 * Map to BIFF5-BIFF8 codes for bold
-	 *
-	 * @param boolean $bold
-	 * @return int
-	 */
-	private static function _mapBold($bold) {
-		if ($bold) {
-			return 0x2BC;	//	700 = Bold font weight
-		}
-		return 0x190;		//	400 = Normal font weight
-	}
-
-	/**
-	 * Map of BIFF2-BIFF8 codes for underline styles
-	 * @static	array of int
-	 *
-	 */
-	private static $_mapUnderline = array(	PHPExcel_Style_Font::UNDERLINE_NONE					=> 0x00,
-											PHPExcel_Style_Font::UNDERLINE_SINGLE				=> 0x01,
-											PHPExcel_Style_Font::UNDERLINE_DOUBLE				=> 0x02,
-											PHPExcel_Style_Font::UNDERLINE_SINGLEACCOUNTING		=> 0x21,
-											PHPExcel_Style_Font::UNDERLINE_DOUBLEACCOUNTING		=> 0x22,
-										 );
-	/**
-	 * Map underline
-	 *
-	 * @param string
-	 * @return int
-	 */
-	private static function _mapUnderline($underline) {
-		if (isset(self::$_mapUnderline[$underline]))
-			return self::$_mapUnderline[$underline];
-		return 0x00;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Parser.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Parser.php
deleted file mode 100644
index bc6ddb132b6..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Parser.php
+++ /dev/null
@@ -1,1583 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-// Original file header of PEAR::Spreadsheet_Excel_Writer_Parser (used as the base for this class):
-// -----------------------------------------------------------------------------------------
-// *  Class for parsing Excel formulas
-// *
-// *  License Information:
-// *
-// *    Spreadsheet_Excel_Writer:  A library for generating Excel Spreadsheets
-// *    Copyright (c) 2002-2003 Xavier Noguer xnoguer@rezebra.com
-// *
-// *    This library is free software; you can redistribute it and/or
-// *    modify it under the terms of the GNU Lesser General Public
-// *    License as published by the Free Software Foundation; either
-// *    version 2.1 of the License, or (at your option) any later version.
-// *
-// *    This library is distributed in the hope that it will be useful,
-// *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-// *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// *    Lesser General Public License for more details.
-// *
-// *    You should have received a copy of the GNU Lesser General Public
-// *    License along with this library; if not, write to the Free Software
-// *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-// */
-
-
-/**
- * PHPExcel_Writer_Excel5_Parser
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel5_Parser
-{
-	/**	Constants				*/
-	// Sheet title in unquoted form
-	// Invalid sheet title characters cannot occur in the sheet title:
-	// 		*:/\?[]
-	// Moreover, there are valid sheet title characters that cannot occur in unquoted form (there may be more?)
-	// +-% '^&<>=,;#()"{}
-	const REGEX_SHEET_TITLE_UNQUOTED = '[^\*\:\/\\\\\?\[\]\+\-\% \\\'\^\&\<\>\=\,\;\#\(\)\"\{\}]+';
-
-	// Sheet title in quoted form (without surrounding quotes)
-	// Invalid sheet title characters cannot occur in the sheet title:
-	// *:/\?[]					(usual invalid sheet title characters)
-	// Single quote is represented as a pair ''
-	const REGEX_SHEET_TITLE_QUOTED = '(([^\*\:\/\\\\\?\[\]\\\'])+|(\\\'\\\')+)+';
-
-	/**
-	 * The index of the character we are currently looking at
-	 * @var integer
-	 */
-	public $_current_char;
-
-	/**
-	 * The token we are working on.
-	 * @var string
-	 */
-	public $_current_token;
-
-	/**
-	 * The formula to parse
-	 * @var string
-	 */
-	public $_formula;
-
-	/**
-	 * The character ahead of the current char
-	 * @var string
-	 */
-	public $_lookahead;
-
-	/**
-	 * The parse tree to be generated
-	 * @var string
-	 */
-	public $_parse_tree;
-
-	/**
-	 * Array of external sheets
-	 * @var array
-	 */
-	public $_ext_sheets;
-
-	/**
-	 * Array of sheet references in the form of REF structures
-	 * @var array
-	 */
-	public $_references;
-
-	/**
-	 * The class constructor
-	 *
-	 */
-	public function __construct()
-	{
-		$this->_current_char  = 0;
-		$this->_current_token = '';       // The token we are working on.
-		$this->_formula       = '';       // The formula to parse.
-		$this->_lookahead     = '';       // The character ahead of the current char.
-		$this->_parse_tree    = '';       // The parse tree to be generated.
-		$this->_initializeHashes();      // Initialize the hashes: ptg's and function's ptg's
-		$this->_ext_sheets = array();
-		$this->_references = array();
-	}
-
-	/**
-	 * Initialize the ptg and function hashes.
-	 *
-	 * @access private
-	 */
-	function _initializeHashes()
-	{
-		// The Excel ptg indices
-		$this->ptg = array(
-			'ptgExp'       => 0x01,
-			'ptgTbl'       => 0x02,
-			'ptgAdd'       => 0x03,
-			'ptgSub'       => 0x04,
-			'ptgMul'       => 0x05,
-			'ptgDiv'       => 0x06,
-			'ptgPower'     => 0x07,
-			'ptgConcat'    => 0x08,
-			'ptgLT'        => 0x09,
-			'ptgLE'        => 0x0A,
-			'ptgEQ'        => 0x0B,
-			'ptgGE'        => 0x0C,
-			'ptgGT'        => 0x0D,
-			'ptgNE'        => 0x0E,
-			'ptgIsect'     => 0x0F,
-			'ptgUnion'     => 0x10,
-			'ptgRange'     => 0x11,
-			'ptgUplus'     => 0x12,
-			'ptgUminus'    => 0x13,
-			'ptgPercent'   => 0x14,
-			'ptgParen'     => 0x15,
-			'ptgMissArg'   => 0x16,
-			'ptgStr'       => 0x17,
-			'ptgAttr'      => 0x19,
-			'ptgSheet'     => 0x1A,
-			'ptgEndSheet'  => 0x1B,
-			'ptgErr'       => 0x1C,
-			'ptgBool'      => 0x1D,
-			'ptgInt'       => 0x1E,
-			'ptgNum'       => 0x1F,
-			'ptgArray'     => 0x20,
-			'ptgFunc'      => 0x21,
-			'ptgFuncVar'   => 0x22,
-			'ptgName'      => 0x23,
-			'ptgRef'       => 0x24,
-			'ptgArea'      => 0x25,
-			'ptgMemArea'   => 0x26,
-			'ptgMemErr'    => 0x27,
-			'ptgMemNoMem'  => 0x28,
-			'ptgMemFunc'   => 0x29,
-			'ptgRefErr'    => 0x2A,
-			'ptgAreaErr'   => 0x2B,
-			'ptgRefN'      => 0x2C,
-			'ptgAreaN'     => 0x2D,
-			'ptgMemAreaN'  => 0x2E,
-			'ptgMemNoMemN' => 0x2F,
-			'ptgNameX'     => 0x39,
-			'ptgRef3d'     => 0x3A,
-			'ptgArea3d'    => 0x3B,
-			'ptgRefErr3d'  => 0x3C,
-			'ptgAreaErr3d' => 0x3D,
-			'ptgArrayV'    => 0x40,
-			'ptgFuncV'     => 0x41,
-			'ptgFuncVarV'  => 0x42,
-			'ptgNameV'     => 0x43,
-			'ptgRefV'      => 0x44,
-			'ptgAreaV'     => 0x45,
-			'ptgMemAreaV'  => 0x46,
-			'ptgMemErrV'   => 0x47,
-			'ptgMemNoMemV' => 0x48,
-			'ptgMemFuncV'  => 0x49,
-			'ptgRefErrV'   => 0x4A,
-			'ptgAreaErrV'  => 0x4B,
-			'ptgRefNV'     => 0x4C,
-			'ptgAreaNV'    => 0x4D,
-			'ptgMemAreaNV' => 0x4E,
-			'ptgMemNoMemN' => 0x4F,
-			'ptgFuncCEV'   => 0x58,
-			'ptgNameXV'    => 0x59,
-			'ptgRef3dV'    => 0x5A,
-			'ptgArea3dV'   => 0x5B,
-			'ptgRefErr3dV' => 0x5C,
-			'ptgAreaErr3d' => 0x5D,
-			'ptgArrayA'    => 0x60,
-			'ptgFuncA'     => 0x61,
-			'ptgFuncVarA'  => 0x62,
-			'ptgNameA'     => 0x63,
-			'ptgRefA'      => 0x64,
-			'ptgAreaA'     => 0x65,
-			'ptgMemAreaA'  => 0x66,
-			'ptgMemErrA'   => 0x67,
-			'ptgMemNoMemA' => 0x68,
-			'ptgMemFuncA'  => 0x69,
-			'ptgRefErrA'   => 0x6A,
-			'ptgAreaErrA'  => 0x6B,
-			'ptgRefNA'     => 0x6C,
-			'ptgAreaNA'    => 0x6D,
-			'ptgMemAreaNA' => 0x6E,
-			'ptgMemNoMemN' => 0x6F,
-			'ptgFuncCEA'   => 0x78,
-			'ptgNameXA'    => 0x79,
-			'ptgRef3dA'    => 0x7A,
-			'ptgArea3dA'   => 0x7B,
-			'ptgRefErr3dA' => 0x7C,
-			'ptgAreaErr3d' => 0x7D
-			);
-
-		// Thanks to Michael Meeks and Gnumeric for the initial arg values.
-		//
-		// The following hash was generated by "function_locale.pl" in the distro.
-		// Refer to function_locale.pl for non-English function names.
-		//
-		// The array elements are as follow:
-		// ptg:   The Excel function ptg code.
-		// args:  The number of arguments that the function takes:
-		//           >=0 is a fixed number of arguments.
-		//           -1  is a variable  number of arguments.
-		// class: The reference, value or array class of the function args.
-		// vol:   The function is volatile.
-		//
-		$this->_functions = array(
-			  // function                  ptg  args  class  vol
-			  'COUNT'           => array(   0,   -1,    0,    0 ),
-			  'IF'              => array(   1,   -1,    1,    0 ),
-			  'ISNA'            => array(   2,    1,    1,    0 ),
-			  'ISERROR'         => array(   3,    1,    1,    0 ),
-			  'SUM'             => array(   4,   -1,    0,    0 ),
-			  'AVERAGE'         => array(   5,   -1,    0,    0 ),
-			  'MIN'             => array(   6,   -1,    0,    0 ),
-			  'MAX'             => array(   7,   -1,    0,    0 ),
-			  'ROW'             => array(   8,   -1,    0,    0 ),
-			  'COLUMN'          => array(   9,   -1,    0,    0 ),
-			  'NA'              => array(  10,    0,    0,    0 ),
-			  'NPV'             => array(  11,   -1,    1,    0 ),
-			  'STDEV'           => array(  12,   -1,    0,    0 ),
-			  'DOLLAR'          => array(  13,   -1,    1,    0 ),
-			  'FIXED'           => array(  14,   -1,    1,    0 ),
-			  'SIN'             => array(  15,    1,    1,    0 ),
-			  'COS'             => array(  16,    1,    1,    0 ),
-			  'TAN'             => array(  17,    1,    1,    0 ),
-			  'ATAN'            => array(  18,    1,    1,    0 ),
-			  'PI'              => array(  19,    0,    1,    0 ),
-			  'SQRT'            => array(  20,    1,    1,    0 ),
-			  'EXP'             => array(  21,    1,    1,    0 ),
-			  'LN'              => array(  22,    1,    1,    0 ),
-			  'LOG10'           => array(  23,    1,    1,    0 ),
-			  'ABS'             => array(  24,    1,    1,    0 ),
-			  'INT'             => array(  25,    1,    1,    0 ),
-			  'SIGN'            => array(  26,    1,    1,    0 ),
-			  'ROUND'           => array(  27,    2,    1,    0 ),
-			  'LOOKUP'          => array(  28,   -1,    0,    0 ),
-			  'INDEX'           => array(  29,   -1,    0,    1 ),
-			  'REPT'            => array(  30,    2,    1,    0 ),
-			  'MID'             => array(  31,    3,    1,    0 ),
-			  'LEN'             => array(  32,    1,    1,    0 ),
-			  'VALUE'           => array(  33,    1,    1,    0 ),
-			  'TRUE'            => array(  34,    0,    1,    0 ),
-			  'FALSE'           => array(  35,    0,    1,    0 ),
-			  'AND'             => array(  36,   -1,    0,    0 ),
-			  'OR'              => array(  37,   -1,    0,    0 ),
-			  'NOT'             => array(  38,    1,    1,    0 ),
-			  'MOD'             => array(  39,    2,    1,    0 ),
-			  'DCOUNT'          => array(  40,    3,    0,    0 ),
-			  'DSUM'            => array(  41,    3,    0,    0 ),
-			  'DAVERAGE'        => array(  42,    3,    0,    0 ),
-			  'DMIN'            => array(  43,    3,    0,    0 ),
-			  'DMAX'            => array(  44,    3,    0,    0 ),
-			  'DSTDEV'          => array(  45,    3,    0,    0 ),
-			  'VAR'             => array(  46,   -1,    0,    0 ),
-			  'DVAR'            => array(  47,    3,    0,    0 ),
-			  'TEXT'            => array(  48,    2,    1,    0 ),
-			  'LINEST'          => array(  49,   -1,    0,    0 ),
-			  'TREND'           => array(  50,   -1,    0,    0 ),
-			  'LOGEST'          => array(  51,   -1,    0,    0 ),
-			  'GROWTH'          => array(  52,   -1,    0,    0 ),
-			  'PV'              => array(  56,   -1,    1,    0 ),
-			  'FV'              => array(  57,   -1,    1,    0 ),
-			  'NPER'            => array(  58,   -1,    1,    0 ),
-			  'PMT'             => array(  59,   -1,    1,    0 ),
-			  'RATE'            => array(  60,   -1,    1,    0 ),
-			  'MIRR'            => array(  61,    3,    0,    0 ),
-			  'IRR'             => array(  62,   -1,    0,    0 ),
-			  'RAND'            => array(  63,    0,    1,    1 ),
-			  'MATCH'           => array(  64,   -1,    0,    0 ),
-			  'DATE'            => array(  65,    3,    1,    0 ),
-			  'TIME'            => array(  66,    3,    1,    0 ),
-			  'DAY'             => array(  67,    1,    1,    0 ),
-			  'MONTH'           => array(  68,    1,    1,    0 ),
-			  'YEAR'            => array(  69,    1,    1,    0 ),
-			  'WEEKDAY'         => array(  70,   -1,    1,    0 ),
-			  'HOUR'            => array(  71,    1,    1,    0 ),
-			  'MINUTE'          => array(  72,    1,    1,    0 ),
-			  'SECOND'          => array(  73,    1,    1,    0 ),
-			  'NOW'             => array(  74,    0,    1,    1 ),
-			  'AREAS'           => array(  75,    1,    0,    1 ),
-			  'ROWS'            => array(  76,    1,    0,    1 ),
-			  'COLUMNS'         => array(  77,    1,    0,    1 ),
-			  'OFFSET'          => array(  78,   -1,    0,    1 ),
-			  'SEARCH'          => array(  82,   -1,    1,    0 ),
-			  'TRANSPOSE'       => array(  83,    1,    1,    0 ),
-			  'TYPE'            => array(  86,    1,    1,    0 ),
-			  'ATAN2'           => array(  97,    2,    1,    0 ),
-			  'ASIN'            => array(  98,    1,    1,    0 ),
-			  'ACOS'            => array(  99,    1,    1,    0 ),
-			  'CHOOSE'          => array( 100,   -1,    1,    0 ),
-			  'HLOOKUP'         => array( 101,   -1,    0,    0 ),
-			  'VLOOKUP'         => array( 102,   -1,    0,    0 ),
-			  'ISREF'           => array( 105,    1,    0,    0 ),
-			  'LOG'             => array( 109,   -1,    1,    0 ),
-			  'CHAR'            => array( 111,    1,    1,    0 ),
-			  'LOWER'           => array( 112,    1,    1,    0 ),
-			  'UPPER'           => array( 113,    1,    1,    0 ),
-			  'PROPER'          => array( 114,    1,    1,    0 ),
-			  'LEFT'            => array( 115,   -1,    1,    0 ),
-			  'RIGHT'           => array( 116,   -1,    1,    0 ),
-			  'EXACT'           => array( 117,    2,    1,    0 ),
-			  'TRIM'            => array( 118,    1,    1,    0 ),
-			  'REPLACE'         => array( 119,    4,    1,    0 ),
-			  'SUBSTITUTE'      => array( 120,   -1,    1,    0 ),
-			  'CODE'            => array( 121,    1,    1,    0 ),
-			  'FIND'            => array( 124,   -1,    1,    0 ),
-			  'CELL'            => array( 125,   -1,    0,    1 ),
-			  'ISERR'           => array( 126,    1,    1,    0 ),
-			  'ISTEXT'          => array( 127,    1,    1,    0 ),
-			  'ISNUMBER'        => array( 128,    1,    1,    0 ),
-			  'ISBLANK'         => array( 129,    1,    1,    0 ),
-			  'T'               => array( 130,    1,    0,    0 ),
-			  'N'               => array( 131,    1,    0,    0 ),
-			  'DATEVALUE'       => array( 140,    1,    1,    0 ),
-			  'TIMEVALUE'       => array( 141,    1,    1,    0 ),
-			  'SLN'             => array( 142,    3,    1,    0 ),
-			  'SYD'             => array( 143,    4,    1,    0 ),
-			  'DDB'             => array( 144,   -1,    1,    0 ),
-			  'INDIRECT'        => array( 148,   -1,    1,    1 ),
-			  'CALL'            => array( 150,   -1,    1,    0 ),
-			  'CLEAN'           => array( 162,    1,    1,    0 ),
-			  'MDETERM'         => array( 163,    1,    2,    0 ),
-			  'MINVERSE'        => array( 164,    1,    2,    0 ),
-			  'MMULT'           => array( 165,    2,    2,    0 ),
-			  'IPMT'            => array( 167,   -1,    1,    0 ),
-			  'PPMT'            => array( 168,   -1,    1,    0 ),
-			  'COUNTA'          => array( 169,   -1,    0,    0 ),
-			  'PRODUCT'         => array( 183,   -1,    0,    0 ),
-			  'FACT'            => array( 184,    1,    1,    0 ),
-			  'DPRODUCT'        => array( 189,    3,    0,    0 ),
-			  'ISNONTEXT'       => array( 190,    1,    1,    0 ),
-			  'STDEVP'          => array( 193,   -1,    0,    0 ),
-			  'VARP'            => array( 194,   -1,    0,    0 ),
-			  'DSTDEVP'         => array( 195,    3,    0,    0 ),
-			  'DVARP'           => array( 196,    3,    0,    0 ),
-			  'TRUNC'           => array( 197,   -1,    1,    0 ),
-			  'ISLOGICAL'       => array( 198,    1,    1,    0 ),
-			  'DCOUNTA'         => array( 199,    3,    0,    0 ),
-			  'USDOLLAR'        => array( 204,   -1,    1,    0 ),
-			  'FINDB'           => array( 205,   -1,    1,    0 ),
-			  'SEARCHB'         => array( 206,   -1,    1,    0 ),
-			  'REPLACEB'        => array( 207,    4,    1,    0 ),
-			  'LEFTB'           => array( 208,   -1,    1,    0 ),
-			  'RIGHTB'          => array( 209,   -1,    1,    0 ),
-			  'MIDB'            => array( 210,    3,    1,    0 ),
-			  'LENB'            => array( 211,    1,    1,    0 ),
-			  'ROUNDUP'         => array( 212,    2,    1,    0 ),
-			  'ROUNDDOWN'       => array( 213,    2,    1,    0 ),
-			  'ASC'             => array( 214,    1,    1,    0 ),
-			  'DBCS'            => array( 215,    1,    1,    0 ),
-			  'RANK'            => array( 216,   -1,    0,    0 ),
-			  'ADDRESS'         => array( 219,   -1,    1,    0 ),
-			  'DAYS360'         => array( 220,   -1,    1,    0 ),
-			  'TODAY'           => array( 221,    0,    1,    1 ),
-			  'VDB'             => array( 222,   -1,    1,    0 ),
-			  'MEDIAN'          => array( 227,   -1,    0,    0 ),
-			  'SUMPRODUCT'      => array( 228,   -1,    2,    0 ),
-			  'SINH'            => array( 229,    1,    1,    0 ),
-			  'COSH'            => array( 230,    1,    1,    0 ),
-			  'TANH'            => array( 231,    1,    1,    0 ),
-			  'ASINH'           => array( 232,    1,    1,    0 ),
-			  'ACOSH'           => array( 233,    1,    1,    0 ),
-			  'ATANH'           => array( 234,    1,    1,    0 ),
-			  'DGET'            => array( 235,    3,    0,    0 ),
-			  'INFO'            => array( 244,    1,    1,    1 ),
-			  'DB'              => array( 247,   -1,    1,    0 ),
-			  'FREQUENCY'       => array( 252,    2,    0,    0 ),
-			  'ERROR.TYPE'      => array( 261,    1,    1,    0 ),
-			  'REGISTER.ID'     => array( 267,   -1,    1,    0 ),
-			  'AVEDEV'          => array( 269,   -1,    0,    0 ),
-			  'BETADIST'        => array( 270,   -1,    1,    0 ),
-			  'GAMMALN'         => array( 271,    1,    1,    0 ),
-			  'BETAINV'         => array( 272,   -1,    1,    0 ),
-			  'BINOMDIST'       => array( 273,    4,    1,    0 ),
-			  'CHIDIST'         => array( 274,    2,    1,    0 ),
-			  'CHIINV'          => array( 275,    2,    1,    0 ),
-			  'COMBIN'          => array( 276,    2,    1,    0 ),
-			  'CONFIDENCE'      => array( 277,    3,    1,    0 ),
-			  'CRITBINOM'       => array( 278,    3,    1,    0 ),
-			  'EVEN'            => array( 279,    1,    1,    0 ),
-			  'EXPONDIST'       => array( 280,    3,    1,    0 ),
-			  'FDIST'           => array( 281,    3,    1,    0 ),
-			  'FINV'            => array( 282,    3,    1,    0 ),
-			  'FISHER'          => array( 283,    1,    1,    0 ),
-			  'FISHERINV'       => array( 284,    1,    1,    0 ),
-			  'FLOOR'           => array( 285,    2,    1,    0 ),
-			  'GAMMADIST'       => array( 286,    4,    1,    0 ),
-			  'GAMMAINV'        => array( 287,    3,    1,    0 ),
-			  'CEILING'         => array( 288,    2,    1,    0 ),
-			  'HYPGEOMDIST'     => array( 289,    4,    1,    0 ),
-			  'LOGNORMDIST'     => array( 290,    3,    1,    0 ),
-			  'LOGINV'          => array( 291,    3,    1,    0 ),
-			  'NEGBINOMDIST'    => array( 292,    3,    1,    0 ),
-			  'NORMDIST'        => array( 293,    4,    1,    0 ),
-			  'NORMSDIST'       => array( 294,    1,    1,    0 ),
-			  'NORMINV'         => array( 295,    3,    1,    0 ),
-			  'NORMSINV'        => array( 296,    1,    1,    0 ),
-			  'STANDARDIZE'     => array( 297,    3,    1,    0 ),
-			  'ODD'             => array( 298,    1,    1,    0 ),
-			  'PERMUT'          => array( 299,    2,    1,    0 ),
-			  'POISSON'         => array( 300,    3,    1,    0 ),
-			  'TDIST'           => array( 301,    3,    1,    0 ),
-			  'WEIBULL'         => array( 302,    4,    1,    0 ),
-			  'SUMXMY2'         => array( 303,    2,    2,    0 ),
-			  'SUMX2MY2'        => array( 304,    2,    2,    0 ),
-			  'SUMX2PY2'        => array( 305,    2,    2,    0 ),
-			  'CHITEST'         => array( 306,    2,    2,    0 ),
-			  'CORREL'          => array( 307,    2,    2,    0 ),
-			  'COVAR'           => array( 308,    2,    2,    0 ),
-			  'FORECAST'        => array( 309,    3,    2,    0 ),
-			  'FTEST'           => array( 310,    2,    2,    0 ),
-			  'INTERCEPT'       => array( 311,    2,    2,    0 ),
-			  'PEARSON'         => array( 312,    2,    2,    0 ),
-			  'RSQ'             => array( 313,    2,    2,    0 ),
-			  'STEYX'           => array( 314,    2,    2,    0 ),
-			  'SLOPE'           => array( 315,    2,    2,    0 ),
-			  'TTEST'           => array( 316,    4,    2,    0 ),
-			  'PROB'            => array( 317,   -1,    2,    0 ),
-			  'DEVSQ'           => array( 318,   -1,    0,    0 ),
-			  'GEOMEAN'         => array( 319,   -1,    0,    0 ),
-			  'HARMEAN'         => array( 320,   -1,    0,    0 ),
-			  'SUMSQ'           => array( 321,   -1,    0,    0 ),
-			  'KURT'            => array( 322,   -1,    0,    0 ),
-			  'SKEW'            => array( 323,   -1,    0,    0 ),
-			  'ZTEST'           => array( 324,   -1,    0,    0 ),
-			  'LARGE'           => array( 325,    2,    0,    0 ),
-			  'SMALL'           => array( 326,    2,    0,    0 ),
-			  'QUARTILE'        => array( 327,    2,    0,    0 ),
-			  'PERCENTILE'      => array( 328,    2,    0,    0 ),
-			  'PERCENTRANK'     => array( 329,   -1,    0,    0 ),
-			  'MODE'            => array( 330,   -1,    2,    0 ),
-			  'TRIMMEAN'        => array( 331,    2,    0,    0 ),
-			  'TINV'            => array( 332,    2,    1,    0 ),
-			  'CONCATENATE'     => array( 336,   -1,    1,    0 ),
-			  'POWER'           => array( 337,    2,    1,    0 ),
-			  'RADIANS'         => array( 342,    1,    1,    0 ),
-			  'DEGREES'         => array( 343,    1,    1,    0 ),
-			  'SUBTOTAL'        => array( 344,   -1,    0,    0 ),
-			  'SUMIF'           => array( 345,   -1,    0,    0 ),
-			  'COUNTIF'         => array( 346,    2,    0,    0 ),
-			  'COUNTBLANK'      => array( 347,    1,    0,    0 ),
-			  'ISPMT'           => array( 350,    4,    1,    0 ),
-			  'DATEDIF'         => array( 351,    3,    1,    0 ),
-			  'DATESTRING'      => array( 352,    1,    1,    0 ),
-			  'NUMBERSTRING'    => array( 353,    2,    1,    0 ),
-			  'ROMAN'           => array( 354,   -1,    1,    0 ),
-			  'GETPIVOTDATA'    => array( 358,   -1,    0,    0 ),
-			  'HYPERLINK'       => array( 359,   -1,    1,    0 ),
-			  'PHONETIC'        => array( 360,    1,    0,    0 ),
-			  'AVERAGEA'        => array( 361,   -1,    0,    0 ),
-			  'MAXA'            => array( 362,   -1,    0,    0 ),
-			  'MINA'            => array( 363,   -1,    0,    0 ),
-			  'STDEVPA'         => array( 364,   -1,    0,    0 ),
-			  'VARPA'           => array( 365,   -1,    0,    0 ),
-			  'STDEVA'          => array( 366,   -1,    0,    0 ),
-			  'VARA'            => array( 367,   -1,    0,    0 ),
-			  'BAHTTEXT'        => array( 368,    1,    0,    0 ),
-			  );
-	}
-
-	/**
-	 * Convert a token to the proper ptg value.
-	 *
-	 * @access private
-	 * @param mixed $token The token to convert.
-	 * @return mixed the converted token on success
-	 */
-	function _convert($token)
-	{
-		if (preg_match("/\"([^\"]|\"\"){0,255}\"/", $token)) {
-			return $this->_convertString($token);
-
-		} elseif (is_numeric($token)) {
-			return $this->_convertNumber($token);
-
-		// match references like A1 or $A$1
-		} elseif (preg_match('/^\$?([A-Ia-i]?[A-Za-z])\$?(\d+)$/',$token)) {
-			return $this->_convertRef2d($token);
-
-		// match external references like Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1
-		} elseif (preg_match("/^" . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?[A-Ia-i]?[A-Za-z]\\$?(\d+)$/u",$token)) {
-			return $this->_convertRef3d($token);
-
-		// match external references like 'Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1
-		} elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?[A-Ia-i]?[A-Za-z]\\$?(\d+)$/u",$token)) {
-			return $this->_convertRef3d($token);
-
-		// match ranges like A1:B2 or $A$1:$B$2
-		} elseif (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)\:(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)$/', $token)) {
-			return $this->_convertRange2d($token);
-
-		// match external ranges like Sheet1!A1:B2 or Sheet1:Sheet2!A1:B2 or Sheet1!$A$1:$B$2 or Sheet1:Sheet2!$A$1:$B$2
-		} elseif (preg_match("/^" . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)\:\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)$/u",$token)) {
-			return $this->_convertRange3d($token);
-
-		// match external ranges like 'Sheet1'!A1:B2 or 'Sheet1:Sheet2'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1:Sheet2'!$A$1:$B$2
-		} elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)\:\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)$/u",$token)) {
-			return $this->_convertRange3d($token);
-
-		// operators (including parentheses)
-		} elseif (isset($this->ptg[$token])) {
-			return pack("C", $this->ptg[$token]);
-
-        // match error codes
-		} elseif (preg_match("/^#[A-Z0\/]{3,5}[!?]{1}$/", $token) or $token == '#N/A') {
-		    return $this->_convertError($token);
-
-		// commented so argument number can be processed correctly. See toReversePolish().
-		/*elseif (preg_match("/[A-Z0-9\xc0-\xdc\.]+/",$token))
-		{
-			return($this->_convertFunction($token,$this->_func_args));
-		}*/
-
-		// if it's an argument, ignore the token (the argument remains)
-		} elseif ($token == 'arg') {
-			return '';
-		}
-
-		// TODO: use real error codes
-		throw new PHPExcel_Writer_Exception("Unknown token $token");
-	}
-
-	/**
-	 * Convert a number token to ptgInt or ptgNum
-	 *
-	 * @access private
-	 * @param mixed $num an integer or double for conversion to its ptg value
-	 */
-	function _convertNumber($num)
-	{
-		// Integer in the range 0..2**16-1
-		if ((preg_match("/^\d+$/", $num)) and ($num <= 65535)) {
-			return pack("Cv", $this->ptg['ptgInt'], $num);
-		} else { // A float
-			if (PHPExcel_Writer_Excel5_BIFFwriter::getByteOrder()) { // if it's Big Endian
-				$num = strrev($num);
-			}
-			return pack("Cd", $this->ptg['ptgNum'], $num);
-		}
-	}
-
-	/**
-	 * Convert a string token to ptgStr
-	 *
-	 * @access private
-	 * @param string $string A string for conversion to its ptg value.
-	 * @return mixed the converted token on success
-	 */
-	function _convertString($string)
-	{
-		// chop away beggining and ending quotes
-		$string = substr($string, 1, strlen($string) - 2);
-		if (strlen($string) > 255) {
-			throw new PHPExcel_Writer_Exception("String is too long");
-		}
-
-		return pack('C', $this->ptg['ptgStr']) . PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($string);
-	}
-
-	/**
-	 * Convert a function to a ptgFunc or ptgFuncVarV depending on the number of
-	 * args that it takes.
-	 *
-	 * @access private
-	 * @param string  $token    The name of the function for convertion to ptg value.
-	 * @param integer $num_args The number of arguments the function receives.
-	 * @return string The packed ptg for the function
-	 */
-	function _convertFunction($token, $num_args)
-	{
-		$args     = $this->_functions[$token][1];
-//		$volatile = $this->_functions[$token][3];
-
-		// Fixed number of args eg. TIME($i,$j,$k).
-		if ($args >= 0) {
-			return pack("Cv", $this->ptg['ptgFuncV'], $this->_functions[$token][0]);
-		}
-		// Variable number of args eg. SUM($i,$j,$k, ..).
-		if ($args == -1) {
-			return pack("CCv", $this->ptg['ptgFuncVarV'], $num_args, $this->_functions[$token][0]);
-		}
-	}
-
-	/**
-	 * Convert an Excel range such as A1:D4 to a ptgRefV.
-	 *
-	 * @access private
-	 * @param string	$range	An Excel range in the A1:A2
-	 * @param int		$class
-	 */
-	function _convertRange2d($range, $class=0)
-	{
-
-		// TODO: possible class value 0,1,2 check Formula.pm
-		// Split the range into 2 cell refs
-		if (preg_match('/^(\$)?([A-Ia-i]?[A-Za-z])(\$)?(\d+)\:(\$)?([A-Ia-i]?[A-Za-z])(\$)?(\d+)$/', $range)) {
-			list($cell1, $cell2) = explode(':', $range);
-		} else {
-			// TODO: use real error codes
-			throw new PHPExcel_Writer_Exception("Unknown range separator");
-		}
-
-		// Convert the cell references
-		list($row1, $col1) = $this->_cellToPackedRowcol($cell1);
-		list($row2, $col2) = $this->_cellToPackedRowcol($cell2);
-
-		// The ptg value depends on the class of the ptg.
-		if ($class == 0) {
-			$ptgArea = pack("C", $this->ptg['ptgArea']);
-		} elseif ($class == 1) {
-			$ptgArea = pack("C", $this->ptg['ptgAreaV']);
-		} elseif ($class == 2) {
-			$ptgArea = pack("C", $this->ptg['ptgAreaA']);
-		} else {
-			// TODO: use real error codes
-			throw new PHPExcel_Writer_Exception("Unknown class $class");
-		}
-		return $ptgArea . $row1 . $row2 . $col1. $col2;
-	}
-
-	/**
-	 * Convert an Excel 3d range such as "Sheet1!A1:D4" or "Sheet1:Sheet2!A1:D4" to
-	 * a ptgArea3d.
-	 *
-	 * @access private
-	 * @param string $token An Excel range in the Sheet1!A1:A2 format.
-	 * @return mixed The packed ptgArea3d token on success.
-	 */
-	function _convertRange3d($token)
-	{
-//		$class = 0; // formulas like Sheet1!$A$1:$A$2 in list type data validation need this class (0x3B)
-
-		// Split the ref at the ! symbol
-		list($ext_ref, $range) = explode('!', $token);
-
-		// Convert the external reference part (different for BIFF8)
-		$ext_ref = $this->_getRefIndex($ext_ref);
-
-		// Split the range into 2 cell refs
-		list($cell1, $cell2) = explode(':', $range);
-
-		// Convert the cell references
-		if (preg_match("/^(\\$)?[A-Ia-i]?[A-Za-z](\\$)?(\d+)$/", $cell1)) {
-			list($row1, $col1) = $this->_cellToPackedRowcol($cell1);
-			list($row2, $col2) = $this->_cellToPackedRowcol($cell2);
-		} else { // It's a rows range (like 26:27)
-			 list($row1, $col1, $row2, $col2) = $this->_rangeToPackedRange($cell1.':'.$cell2);
-		}
-
-		// The ptg value depends on the class of the ptg.
-//		if ($class == 0) {
-			$ptgArea = pack("C", $this->ptg['ptgArea3d']);
-//		} elseif ($class == 1) {
-//			$ptgArea = pack("C", $this->ptg['ptgArea3dV']);
-//		} elseif ($class == 2) {
-//			$ptgArea = pack("C", $this->ptg['ptgArea3dA']);
-//		} else {
-//			throw new PHPExcel_Writer_Exception("Unknown class $class");
-//		}
-
-		return $ptgArea . $ext_ref . $row1 . $row2 . $col1. $col2;
-	}
-
-	/**
-	 * Convert an Excel reference such as A1, $B2, C$3 or $D$4 to a ptgRefV.
-	 *
-	 * @access private
-	 * @param string $cell An Excel cell reference
-	 * @return string The cell in packed() format with the corresponding ptg
-	 */
-	function _convertRef2d($cell)
-	{
-//		$class = 2; // as far as I know, this is magick.
-
-		// Convert the cell reference
-		$cell_array = $this->_cellToPackedRowcol($cell);
-		list($row, $col) = $cell_array;
-
-		// The ptg value depends on the class of the ptg.
-//		if ($class == 0) {
-//			$ptgRef = pack("C", $this->ptg['ptgRef']);
-//		} elseif ($class == 1) {
-//			$ptgRef = pack("C", $this->ptg['ptgRefV']);
-//		} elseif ($class == 2) {
-			$ptgRef = pack("C", $this->ptg['ptgRefA']);
-//		} else {
-//			// TODO: use real error codes
-//			throw new PHPExcel_Writer_Exception("Unknown class $class");
-//		}
-		return $ptgRef.$row.$col;
-	}
-
-	/**
-	 * Convert an Excel 3d reference such as "Sheet1!A1" or "Sheet1:Sheet2!A1" to a
-	 * ptgRef3d.
-	 *
-	 * @access private
-	 * @param string $cell An Excel cell reference
-	 * @return mixed The packed ptgRef3d token on success.
-	 */
-	function _convertRef3d($cell)
-	{
-//		$class = 2; // as far as I know, this is magick.
-
-		// Split the ref at the ! symbol
-		list($ext_ref, $cell) = explode('!', $cell);
-
-		// Convert the external reference part (different for BIFF8)
-		$ext_ref = $this->_getRefIndex($ext_ref);
-
-		// Convert the cell reference part
-		list($row, $col) = $this->_cellToPackedRowcol($cell);
-
-		// The ptg value depends on the class of the ptg.
-//		if ($class == 0) {
-//			$ptgRef = pack("C", $this->ptg['ptgRef3d']);
-//		} elseif ($class == 1) {
-//			$ptgRef = pack("C", $this->ptg['ptgRef3dV']);
-//		} elseif ($class == 2) {
-			$ptgRef = pack("C", $this->ptg['ptgRef3dA']);
-//		} else {
-//			throw new PHPExcel_Writer_Exception("Unknown class $class");
-//		}
-
-		return $ptgRef . $ext_ref. $row . $col;
-	}
-
-    /**
-     * Convert an error code to a ptgErr
-     *
-     * @access	private
-	 * @param	string	$errorCode	The error code for conversion to its ptg value
-     * @return	string				The error code ptgErr
-     */
-    function _convertError($errorCode)
-    {
-		switch ($errorCode) {
-			case '#NULL!':	return pack("C", 0x00);
-			case '#DIV/0!':	return pack("C", 0x07);
-			case '#VALUE!':	return pack("C", 0x0F);
-			case '#REF!':	return pack("C", 0x17);
-			case '#NAME?':	return pack("C", 0x1D);
-			case '#NUM!':	return pack("C", 0x24);
-			case '#N/A':	return pack("C", 0x2A);
-		}
-		return pack("C", 0xFF);
-    }
-
-	/**
-	 * Convert the sheet name part of an external reference, for example "Sheet1" or
-	 * "Sheet1:Sheet2", to a packed structure.
-	 *
-	 * @access	private
-	 * @param	string	$ext_ref	The name of the external reference
-	 * @return	string				The reference index in packed() format
-	 */
-	function _packExtRef($ext_ref)
-	{
-		$ext_ref = preg_replace("/^'/", '', $ext_ref); // Remove leading  ' if any.
-		$ext_ref = preg_replace("/'$/", '', $ext_ref); // Remove trailing ' if any.
-
-		// Check if there is a sheet range eg., Sheet1:Sheet2.
-		if (preg_match("/:/", $ext_ref)) {
-			list($sheet_name1, $sheet_name2) = explode(':', $ext_ref);
-
-			$sheet1 = $this->_getSheetIndex($sheet_name1);
-			if ($sheet1 == -1) {
-				throw new PHPExcel_Writer_Exception("Unknown sheet name $sheet_name1 in formula");
-			}
-			$sheet2 = $this->_getSheetIndex($sheet_name2);
-			if ($sheet2 == -1) {
-				throw new PHPExcel_Writer_Exception("Unknown sheet name $sheet_name2 in formula");
-			}
-
-			// Reverse max and min sheet numbers if necessary
-			if ($sheet1 > $sheet2) {
-				list($sheet1, $sheet2) = array($sheet2, $sheet1);
-			}
-		} else { // Single sheet name only.
-			$sheet1 = $this->_getSheetIndex($ext_ref);
-			if ($sheet1 == -1) {
-				throw new PHPExcel_Writer_Exception("Unknown sheet name $ext_ref in formula");
-			}
-			$sheet2 = $sheet1;
-		}
-
-		// References are stored relative to 0xFFFF.
-		$offset = -1 - $sheet1;
-
-		return pack('vdvv', $offset, 0x00, $sheet1, $sheet2);
-	}
-
-	/**
-	 * Look up the REF index that corresponds to an external sheet name
-	 * (or range). If it doesn't exist yet add it to the workbook's references
-	 * array. It assumes all sheet names given must exist.
-	 *
-	 * @access private
-	 * @param string $ext_ref The name of the external reference
-	 * @return mixed The reference index in packed() format on success
-	 */
-	function _getRefIndex($ext_ref)
-	{
-		$ext_ref = preg_replace("/^'/", '', $ext_ref); // Remove leading  ' if any.
-		$ext_ref = preg_replace("/'$/", '', $ext_ref); // Remove trailing ' if any.
-		$ext_ref = str_replace('\'\'', '\'', $ext_ref); // Replace escaped '' with '
-
-		// Check if there is a sheet range eg., Sheet1:Sheet2.
-		if (preg_match("/:/", $ext_ref)) {
-			list($sheet_name1, $sheet_name2) = explode(':', $ext_ref);
-
-			$sheet1 = $this->_getSheetIndex($sheet_name1);
-			if ($sheet1 == -1) {
-				throw new PHPExcel_Writer_Exception("Unknown sheet name $sheet_name1 in formula");
-			}
-			$sheet2 = $this->_getSheetIndex($sheet_name2);
-			if ($sheet2 == -1) {
-				throw new PHPExcel_Writer_Exception("Unknown sheet name $sheet_name2 in formula");
-			}
-
-			// Reverse max and min sheet numbers if necessary
-			if ($sheet1 > $sheet2) {
-				list($sheet1, $sheet2) = array($sheet2, $sheet1);
-			}
-		} else { // Single sheet name only.
-			$sheet1 = $this->_getSheetIndex($ext_ref);
-			if ($sheet1 == -1) {
-				throw new PHPExcel_Writer_Exception("Unknown sheet name $ext_ref in formula");
-			}
-			$sheet2 = $sheet1;
-		}
-
-		// assume all references belong to this document
-		$supbook_index = 0x00;
-		$ref = pack('vvv', $supbook_index, $sheet1, $sheet2);
-		$total_references = count($this->_references);
-		$index = -1;
-		for ($i = 0; $i < $total_references; ++$i) {
-			if ($ref == $this->_references[$i]) {
-				$index = $i;
-				break;
-			}
-		}
-		// if REF was not found add it to references array
-		if ($index == -1) {
-			$this->_references[$total_references] = $ref;
-			$index = $total_references;
-		}
-
-		return pack('v', $index);
-	}
-
-	/**
-	 * Look up the index that corresponds to an external sheet name. The hash of
-	 * sheet names is updated by the addworksheet() method of the
-	 * PHPExcel_Writer_Excel5_Workbook class.
-	 *
-	 * @access	private
-	 * @param	string	$sheet_name		Sheet name
-	 * @return	integer					The sheet index, -1 if the sheet was not found
-	 */
-	function _getSheetIndex($sheet_name)
-	{
-		if (!isset($this->_ext_sheets[$sheet_name])) {
-			return -1;
-		} else {
-			return $this->_ext_sheets[$sheet_name];
-		}
-	}
-
-	/**
-	 * This method is used to update the array of sheet names. It is
-	 * called by the addWorksheet() method of the
-	 * PHPExcel_Writer_Excel5_Workbook class.
-	 *
-	 * @access public
-	 * @see PHPExcel_Writer_Excel5_Workbook::addWorksheet()
-	 * @param string  $name  The name of the worksheet being added
-	 * @param integer $index The index of the worksheet being added
-	 */
-	function setExtSheet($name, $index)
-	{
-		$this->_ext_sheets[$name] = $index;
-	}
-
-	/**
-	 * pack() row and column into the required 3 or 4 byte format.
-	 *
-	 * @access private
-	 * @param string $cell The Excel cell reference to be packed
-	 * @return array Array containing the row and column in packed() format
-	 */
-	function _cellToPackedRowcol($cell)
-	{
-		$cell = strtoupper($cell);
-		list($row, $col, $row_rel, $col_rel) = $this->_cellToRowcol($cell);
-		if ($col >= 256) {
-			throw new PHPExcel_Writer_Exception("Column in: $cell greater than 255");
-		}
-		if ($row >= 65536) {
-			throw new PHPExcel_Writer_Exception("Row in: $cell greater than 65536 ");
-		}
-
-		// Set the high bits to indicate if row or col are relative.
-		$col |= $col_rel << 14;
-		$col |= $row_rel << 15;
-		$col = pack('v', $col);
-
-		$row = pack('v', $row);
-
-		return array($row, $col);
-	}
-
-	/**
-	 * pack() row range into the required 3 or 4 byte format.
-	 * Just using maximum col/rows, which is probably not the correct solution
-	 *
-	 * @access private
-	 * @param string $range The Excel range to be packed
-	 * @return array Array containing (row1,col1,row2,col2) in packed() format
-	 */
-	function _rangeToPackedRange($range)
-	{
-		preg_match('/(\$)?(\d+)\:(\$)?(\d+)/', $range, $match);
-		// return absolute rows if there is a $ in the ref
-		$row1_rel = empty($match[1]) ? 1 : 0;
-		$row1     = $match[2];
-		$row2_rel = empty($match[3]) ? 1 : 0;
-		$row2     = $match[4];
-		// Convert 1-index to zero-index
-		--$row1;
-		--$row2;
-		// Trick poor inocent Excel
-		$col1 = 0;
-		$col2 = 65535; // FIXME: maximum possible value for Excel 5 (change this!!!)
-
-		// FIXME: this changes for BIFF8
-		if (($row1 >= 65536) or ($row2 >= 65536)) {
-			throw new PHPExcel_Writer_Exception("Row in: $range greater than 65536 ");
-		}
-
-		// Set the high bits to indicate if rows are relative.
-		$col1 |= $row1_rel << 15;
-		$col2 |= $row2_rel << 15;
-		$col1 = pack('v', $col1);
-		$col2 = pack('v', $col2);
-
-		$row1 = pack('v', $row1);
-		$row2 = pack('v', $row2);
-
-		return array($row1, $col1, $row2, $col2);
-	}
-
-	/**
-	 * Convert an Excel cell reference such as A1 or $B2 or C$3 or $D$4 to a zero
-	 * indexed row and column number. Also returns two (0,1) values to indicate
-	 * whether the row or column are relative references.
-	 *
-	 * @access private
-	 * @param string $cell The Excel cell reference in A1 format.
-	 * @return array
-	 */
-	function _cellToRowcol($cell)
-	{
-		preg_match('/(\$)?([A-I]?[A-Z])(\$)?(\d+)/',$cell,$match);
-		// return absolute column if there is a $ in the ref
-		$col_rel = empty($match[1]) ? 1 : 0;
-		$col_ref = $match[2];
-		$row_rel = empty($match[3]) ? 1 : 0;
-		$row     = $match[4];
-
-		// Convert base26 column string to a number.
-		$expn   = strlen($col_ref) - 1;
-		$col    = 0;
-		$col_ref_length = strlen($col_ref);
-		for ($i = 0; $i < $col_ref_length; ++$i) {
-			$col += (ord($col_ref{$i}) - 64) * pow(26, $expn);
-			--$expn;
-		}
-
-		// Convert 1-index to zero-index
-		--$row;
-		--$col;
-
-		return array($row, $col, $row_rel, $col_rel);
-	}
-
-	/**
-	 * Advance to the next valid token.
-	 *
-	 * @access private
-	 */
-	function _advance()
-	{
-		$i = $this->_current_char;
-		$formula_length = strlen($this->_formula);
-		// eat up white spaces
-		if ($i < $formula_length) {
-			while ($this->_formula{$i} == " ") {
-				++$i;
-			}
-
-			if ($i < ($formula_length - 1)) {
-				$this->_lookahead = $this->_formula{$i+1};
-			}
-			$token = '';
-		}
-
-		while ($i < $formula_length) {
-			$token .= $this->_formula{$i};
-
-			if ($i < ($formula_length - 1)) {
-				$this->_lookahead = $this->_formula{$i+1};
-			} else {
-				$this->_lookahead = '';
-			}
-
-			if ($this->_match($token) != '') {
-				//if ($i < strlen($this->_formula) - 1) {
-				//    $this->_lookahead = $this->_formula{$i+1};
-				//}
-				$this->_current_char = $i + 1;
-				$this->_current_token = $token;
-				return 1;
-			}
-
-			if ($i < ($formula_length - 2)) {
-				$this->_lookahead = $this->_formula{$i+2};
-			} else { // if we run out of characters _lookahead becomes empty
-				$this->_lookahead = '';
-			}
-			++$i;
-		}
-		//die("Lexical error ".$this->_current_char);
-	}
-
-	/**
-	 * Checks if it's a valid token.
-	 *
-	 * @access private
-	 * @param mixed $token The token to check.
-	 * @return mixed       The checked token or false on failure
-	 */
-	function _match($token)
-	{
-		switch($token) {
-			case "+":
-			case "-":
-			case "*":
-			case "/":
-			case "(":
-			case ")":
-			case ",":
-			case ";":
-			case ">=":
-			case "<=":
-			case "=":
-			case "<>":
-			case "^":
-			case "&":
-			case "%":
-				return $token;
-				break;
-			case ">":
-				if ($this->_lookahead == '=') { // it's a GE token
-					break;
-				}
-				return $token;
-				break;
-			case "<":
-				// it's a LE or a NE token
-				if (($this->_lookahead == '=') or ($this->_lookahead == '>')) {
-					break;
-				}
-				return $token;
-				break;
-			default:
-				// if it's a reference A1 or $A$1 or $A1 or A$1
-				if (preg_match('/^\$?[A-Ia-i]?[A-Za-z]\$?[0-9]+$/',$token) and
-				   !preg_match("/[0-9]/",$this->_lookahead) and
-				   ($this->_lookahead != ':') and ($this->_lookahead != '.') and
-				   ($this->_lookahead != '!'))
-				{
-					return $token;
-				}
-				// If it's an external reference (Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1)
-				elseif (preg_match("/^" . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u",$token) and
-					   !preg_match("/[0-9]/",$this->_lookahead) and
-					   ($this->_lookahead != ':') and ($this->_lookahead != '.'))
-				{
-					return $token;
-				}
-				// If it's an external reference ('Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1)
-				elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u",$token) and
-					   !preg_match("/[0-9]/",$this->_lookahead) and
-					   ($this->_lookahead != ':') and ($this->_lookahead != '.'))
-				{
-					return $token;
-				}
-				// if it's a range A1:A2 or $A$1:$A$2
-				elseif (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+:(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+$/', $token) and
-					   !preg_match("/[0-9]/",$this->_lookahead))
-				{
-					return $token;
-				}
-				// If it's an external range like Sheet1!A1:B2 or Sheet1:Sheet2!A1:B2 or Sheet1!$A$1:$B$2 or Sheet1:Sheet2!$A$1:$B$2
-				elseif (preg_match("/^" . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+:\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+$/u",$token) and
-					   !preg_match("/[0-9]/",$this->_lookahead))
-				{
-					return $token;
-				}
-				// If it's an external range like 'Sheet1'!A1:B2 or 'Sheet1:Sheet2'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1:Sheet2'!$A$1:$B$2
-				elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+:\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+$/u",$token) and
-					   !preg_match("/[0-9]/",$this->_lookahead))
-				{
-					return $token;
-				}
-				// If it's a number (check that it's not a sheet name or range)
-				elseif (is_numeric($token) and
-						(!is_numeric($token.$this->_lookahead) or ($this->_lookahead == '')) and
-						($this->_lookahead != '!') and ($this->_lookahead != ':'))
-				{
-					return $token;
-				}
-				// If it's a string (of maximum 255 characters)
-				elseif (preg_match("/\"([^\"]|\"\"){0,255}\"/",$token) and $this->_lookahead != '"' and (substr_count($token, '"')%2 == 0))
-				{
-					return $token;
-				}
-			    // If it's an error code
-			    elseif (preg_match("/^#[A-Z0\/]{3,5}[!?]{1}$/", $token) or $token == '#N/A')
-			    {
-			        return $token;
-			    }
-				// if it's a function call
-				elseif (preg_match("/^[A-Z0-9\xc0-\xdc\.]+$/i",$token) and ($this->_lookahead == "("))
-				{
-					return $token;
-				}
-				//	It's an argument of some description (e.g. a named range),
-				//		precise nature yet to be determined
-				elseif(substr($token,-1) == ')') {
-					return $token;
-				}
-				return '';
-		}
-	}
-
-	/**
-	 * The parsing method. It parses a formula.
-	 *
-	 * @access public
-	 * @param string $formula The formula to parse, without the initial equal
-	 *                        sign (=).
-	 * @return mixed true on success
-	 */
-	function parse($formula)
-	{
-		$this->_current_char = 0;
-		$this->_formula      = $formula;
-		$this->_lookahead    = isset($formula{1}) ? $formula{1} : '';
-		$this->_advance();
-		$this->_parse_tree   = $this->_condition();
-		return true;
-	}
-
-	/**
-	 * It parses a condition. It assumes the following rule:
-	 * Cond -> Expr [(">" | "<") Expr]
-	 *
-	 * @access private
-	 * @return mixed The parsed ptg'd tree on success
-	 */
-	function _condition()
-	{
-		$result = $this->_expression();
-		if ($this->_current_token == "<") {
-			$this->_advance();
-			$result2 = $this->_expression();
-			$result = $this->_createTree('ptgLT', $result, $result2);
-		} elseif ($this->_current_token == ">") {
-			$this->_advance();
-			$result2 = $this->_expression();
-			$result = $this->_createTree('ptgGT', $result, $result2);
-		} elseif ($this->_current_token == "<=") {
-			$this->_advance();
-			$result2 = $this->_expression();
-			$result = $this->_createTree('ptgLE', $result, $result2);
-		} elseif ($this->_current_token == ">=") {
-			$this->_advance();
-			$result2 = $this->_expression();
-			$result = $this->_createTree('ptgGE', $result, $result2);
-		} elseif ($this->_current_token == "=") {
-			$this->_advance();
-			$result2 = $this->_expression();
-			$result = $this->_createTree('ptgEQ', $result, $result2);
-		} elseif ($this->_current_token == "<>") {
-			$this->_advance();
-			$result2 = $this->_expression();
-			$result = $this->_createTree('ptgNE', $result, $result2);
-		} elseif ($this->_current_token == "&") {
-		    $this->_advance();
-		    $result2 = $this->_expression();
-		    $result = $this->_createTree('ptgConcat', $result, $result2);
-		}
-		return $result;
-	}
-
-	/**
-	 * It parses a expression. It assumes the following rule:
-	 * Expr -> Term [("+" | "-") Term]
-	 *      -> "string"
-	 *      -> "-" Term : Negative value
-	 *      -> "+" Term : Positive value
-	 *      -> Error code
-	 *
-	 * @access private
-	 * @return mixed The parsed ptg'd tree on success
-	 */
-	function _expression()
-	{
-		// If it's a string return a string node
-		if (preg_match("/\"([^\"]|\"\"){0,255}\"/", $this->_current_token)) {
-			$tmp = str_replace('""', '"', $this->_current_token);
-			if (($tmp == '"') || ($tmp == '')) $tmp = '""';	//	Trap for "" that has been used for an empty string
-			$result = $this->_createTree($tmp, '', '');
-			$this->_advance();
-			return $result;
-        // If it's an error code
-        } elseif (preg_match("/^#[A-Z0\/]{3,5}[!?]{1}$/", $this->_current_token) or $this->_current_token == '#N/A'){
-		    $result = $this->_createTree($this->_current_token, 'ptgErr', '');
-		    $this->_advance();
-		    return $result;
-		// If it's a negative value
-        } elseif ($this->_current_token == "-") {
-			// catch "-" Term
-			$this->_advance();
-			$result2 = $this->_expression();
-			$result = $this->_createTree('ptgUminus', $result2, '');
-			return $result;
-        // If it's a positive value
-		} elseif ($this->_current_token == "+") {
-			// catch "+" Term
-			$this->_advance();
-			$result2 = $this->_expression();
-			$result = $this->_createTree('ptgUplus', $result2, '');
-			return $result;
-		}
-		$result = $this->_term();
-		while (($this->_current_token == "+") or
-			   ($this->_current_token == "-") or
-			   ($this->_current_token == "^")) {
-		/**/
-			if ($this->_current_token == "+") {
-				$this->_advance();
-				$result2 = $this->_term();
-				$result = $this->_createTree('ptgAdd', $result, $result2);
-			} elseif ($this->_current_token == "-") {
-				$this->_advance();
-				$result2 = $this->_term();
-				$result = $this->_createTree('ptgSub', $result, $result2);
-			} else {
-				$this->_advance();
-				$result2 = $this->_term();
-				$result = $this->_createTree('ptgPower', $result, $result2);
-			}
-		}
-		return $result;
-	}
-
-	/**
-	 * This function just introduces a ptgParen element in the tree, so that Excel
-	 * doesn't get confused when working with a parenthesized formula afterwards.
-	 *
-	 * @access private
-	 * @see _fact()
-	 * @return array The parsed ptg'd tree
-	 */
-	function _parenthesizedExpression()
-	{
-		$result = $this->_createTree('ptgParen', $this->_expression(), '');
-		return $result;
-	}
-
-	/**
-	 * It parses a term. It assumes the following rule:
-	 * Term -> Fact [("*" | "/") Fact]
-	 *
-	 * @access private
-	 * @return mixed The parsed ptg'd tree on success
-	 */
-	function _term()
-	{
-		$result = $this->_fact();
-		while (($this->_current_token == "*") or
-			   ($this->_current_token == "/")) {
-		/**/
-			if ($this->_current_token == "*") {
-				$this->_advance();
-				$result2 = $this->_fact();
-				$result = $this->_createTree('ptgMul', $result, $result2);
-			} else {
-				$this->_advance();
-				$result2 = $this->_fact();
-				$result = $this->_createTree('ptgDiv', $result, $result2);
-			}
-		}
-		return $result;
-	}
-
-	/**
-	 * It parses a factor. It assumes the following rule:
-	 * Fact -> ( Expr )
-	 *       | CellRef
-	 *       | CellRange
-	 *       | Number
-	 *       | Function
-	 *
-	 * @access private
-	 * @return mixed The parsed ptg'd tree on success
-	 */
-	function _fact()
-	{
-		if ($this->_current_token == "(") {
-			$this->_advance();         // eat the "("
-			$result = $this->_parenthesizedExpression();
-			if ($this->_current_token != ")") {
-				throw new PHPExcel_Writer_Exception("')' token expected.");
-			}
-			$this->_advance();         // eat the ")"
-			return $result;
-		}
-		// if it's a reference
-		if (preg_match('/^\$?[A-Ia-i]?[A-Za-z]\$?[0-9]+$/',$this->_current_token))
-		{
-			$result = $this->_createTree($this->_current_token, '', '');
-			$this->_advance();
-			return $result;
-		}
-		// If it's an external reference (Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1)
-		elseif (preg_match("/^" . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u",$this->_current_token))
-		{
-			$result = $this->_createTree($this->_current_token, '', '');
-			$this->_advance();
-			return $result;
-		}
-		// If it's an external reference ('Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1)
-		elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u",$this->_current_token))
-		{
-			$result = $this->_createTree($this->_current_token, '', '');
-			$this->_advance();
-			return $result;
-		}
-		// if it's a range A1:B2 or $A$1:$B$2
-		elseif (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+:(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+$/',$this->_current_token) or
-				preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+\.\.(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+$/',$this->_current_token))
-		{
-			// must be an error?
-			$result = $this->_createTree($this->_current_token, '', '');
-			$this->_advance();
-			return $result;
-		}
-		// If it's an external range (Sheet1!A1:B2 or Sheet1:Sheet2!A1:B2 or Sheet1!$A$1:$B$2 or Sheet1:Sheet2!$A$1:$B$2)
-		elseif (preg_match("/^" . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+:\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+$/u",$this->_current_token))
-		{
-			// must be an error?
-			//$result = $this->_current_token;
-			$result = $this->_createTree($this->_current_token, '', '');
-			$this->_advance();
-			return $result;
-		}
-		// If it's an external range ('Sheet1'!A1:B2 or 'Sheet1'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1'!$A$1:$B$2)
-		elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+:\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+$/u",$this->_current_token))
-		{
-			// must be an error?
-			//$result = $this->_current_token;
-			$result = $this->_createTree($this->_current_token, '', '');
-			$this->_advance();
-			return $result;
-		}
-		// If it's a number or a percent
-		elseif (is_numeric($this->_current_token))
-		{
-		    if($this->_lookahead == '%'){
-		        $result = $this->_createTree('ptgPercent', $this->_current_token, '');
-                $this->_advance();  // Skip the percentage operator once we've pre-built that tree
-		    } else {
-		        $result = $this->_createTree($this->_current_token, '', '');
-		    }
-		    $this->_advance();
-		    return $result;
-		}
-		// if it's a function call
-		elseif (preg_match("/^[A-Z0-9\xc0-\xdc\.]+$/i",$this->_current_token))
-		{
-			$result = $this->_func();
-			return $result;
-		}
-		throw new PHPExcel_Writer_Exception("Syntax error: ".$this->_current_token.
-								 ", lookahead: ".$this->_lookahead.
-								 ", current char: ".$this->_current_char);
-	}
-
-	/**
-	 * It parses a function call. It assumes the following rule:
-	 * Func -> ( Expr [,Expr]* )
-	 *
-	 * @access private
-	 * @return mixed The parsed ptg'd tree on success
-	 */
-	function _func()
-	{
-		$num_args = 0; // number of arguments received
-		$function = strtoupper($this->_current_token);
-		$result   = ''; // initialize result
-		$this->_advance();
-		$this->_advance();         // eat the "("
-		while ($this->_current_token != ')') {
-		/**/
-			if ($num_args > 0) {
-				if ($this->_current_token == "," or
-					$this->_current_token == ";")
-				{
-					$this->_advance();  // eat the "," or ";"
-				} else {
-					throw new PHPExcel_Writer_Exception("Syntax error: comma expected in ".
-									  "function $function, arg #{$num_args}");
-				}
-				$result2 = $this->_condition();
-				$result = $this->_createTree('arg', $result, $result2);
-			} else { // first argument
-				$result2 = $this->_condition();
-				$result = $this->_createTree('arg', '', $result2);
-			}
-			++$num_args;
-		}
-		if (!isset($this->_functions[$function])) {
-			throw new PHPExcel_Writer_Exception("Function $function() doesn't exist");
-		}
-		$args = $this->_functions[$function][1];
-		// If fixed number of args eg. TIME($i,$j,$k). Check that the number of args is valid.
-		if (($args >= 0) and ($args != $num_args)) {
-			throw new PHPExcel_Writer_Exception("Incorrect number of arguments in function $function() ");
-		}
-
-		$result = $this->_createTree($function, $result, $num_args);
-		$this->_advance();         // eat the ")"
-		return $result;
-	}
-
-	/**
-	 * Creates a tree. In fact an array which may have one or two arrays (sub-trees)
-	 * as elements.
-	 *
-	 * @access private
-	 * @param mixed $value The value of this node.
-	 * @param mixed $left  The left array (sub-tree) or a final node.
-	 * @param mixed $right The right array (sub-tree) or a final node.
-	 * @return array A tree
-	 */
-	function _createTree($value, $left, $right)
-	{
-		return array('value' => $value, 'left' => $left, 'right' => $right);
-	}
-
-	/**
-	 * Builds a string containing the tree in reverse polish notation (What you
-	 * would use in a HP calculator stack).
-	 * The following tree:
-	 *
-	 *    +
-	 *   / \
-	 *  2   3
-	 *
-	 * produces: "23+"
-	 *
-	 * The following tree:
-	 *
-	 *    +
-	 *   / \
-	 *  3   *
-	 *     / \
-	 *    6   A1
-	 *
-	 * produces: "36A1*+"
-	 *
-	 * In fact all operands, functions, references, etc... are written as ptg's
-	 *
-	 * @access public
-	 * @param array $tree The optional tree to convert.
-	 * @return string The tree in reverse polish notation
-	 */
-	function toReversePolish($tree = array())
-	{
-		$polish = ""; // the string we are going to return
-		if (empty($tree)) { // If it's the first call use _parse_tree
-			$tree = $this->_parse_tree;
-		}
-
-		if (is_array($tree['left'])) {
-			$converted_tree = $this->toReversePolish($tree['left']);
-			$polish .= $converted_tree;
-		} elseif ($tree['left'] != '') { // It's a final node
-			$converted_tree = $this->_convert($tree['left']);
-			$polish .= $converted_tree;
-		}
-		if (is_array($tree['right'])) {
-			$converted_tree = $this->toReversePolish($tree['right']);
-			$polish .= $converted_tree;
-		} elseif ($tree['right'] != '') { // It's a final node
-			$converted_tree = $this->_convert($tree['right']);
-			$polish .= $converted_tree;
-		}
-		// if it's a function convert it here (so we can set it's arguments)
-		if (preg_match("/^[A-Z0-9\xc0-\xdc\.]+$/",$tree['value']) and
-			!preg_match('/^([A-Ia-i]?[A-Za-z])(\d+)$/',$tree['value']) and
-			!preg_match("/^[A-Ia-i]?[A-Za-z](\d+)\.\.[A-Ia-i]?[A-Za-z](\d+)$/",$tree['value']) and
-			!is_numeric($tree['value']) and
-			!isset($this->ptg[$tree['value']]))
-		{
-			// left subtree for a function is always an array.
-			if ($tree['left'] != '') {
-				$left_tree = $this->toReversePolish($tree['left']);
-			} else {
-				$left_tree = '';
-			}
-			// add it's left subtree and return.
-			return $left_tree.$this->_convertFunction($tree['value'], $tree['right']);
-		} else {
-			$converted_tree = $this->_convert($tree['value']);
-		}
-		$polish .= $converted_tree;
-		return $polish;
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Workbook.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Workbook.php
deleted file mode 100644
index ecfac5dc015..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Workbook.php
+++ /dev/null
@@ -1,1450 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-// Original file header of PEAR::Spreadsheet_Excel_Writer_Workbook (used as the base for this class):
-// -----------------------------------------------------------------------------------------
-// /*
-// *  Module written/ported by Xavier Noguer <xnoguer@rezebra.com>
-// *
-// *  The majority of this is _NOT_ my code.  I simply ported it from the
-// *  PERL Spreadsheet::WriteExcel module.
-// *
-// *  The author of the Spreadsheet::WriteExcel module is John McNamara
-// *  <jmcnamara@cpan.org>
-// *
-// *  I _DO_ maintain this code, and John McNamara has nothing to do with the
-// *  porting of this code to PHP.  Any questions directly related to this
-// *  class library should be directed to me.
-// *
-// *  License Information:
-// *
-// *    Spreadsheet_Excel_Writer:  A library for generating Excel Spreadsheets
-// *    Copyright (c) 2002-2003 Xavier Noguer xnoguer@rezebra.com
-// *
-// *    This library is free software; you can redistribute it and/or
-// *    modify it under the terms of the GNU Lesser General Public
-// *    License as published by the Free Software Foundation; either
-// *    version 2.1 of the License, or (at your option) any later version.
-// *
-// *    This library is distributed in the hope that it will be useful,
-// *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-// *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// *    Lesser General Public License for more details.
-// *
-// *    You should have received a copy of the GNU Lesser General Public
-// *    License along with this library; if not, write to the Free Software
-// *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-// */
-
-
-/**
- * PHPExcel_Writer_Excel5_Workbook
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
-{
-	/**
-	 * Formula parser
-	 *
-	 * @var PHPExcel_Writer_Excel5_Parser
-	 */
-	private $_parser;
-
-	/**
-	 * The BIFF file size for the workbook.
-	 * @var integer
-	 * @see _calcSheetOffsets()
-	 */
-	public $_biffsize;
-
-	/**
-	 * XF Writers
-	 * @var PHPExcel_Writer_Excel5_Xf[]
-	 */
-	private $_xfWriters = array();
-
-	/**
-	 * Array containing the colour palette
-	 * @var array
-	 */
-	public $_palette;
-
-	/**
-	 * The codepage indicates the text encoding used for strings
-	 * @var integer
-	 */
-	public $_codepage;
-
-	/**
-	 * The country code used for localization
-	 * @var integer
-	 */
-	public $_country_code;
-
-	/**
-	 * Workbook
-	 * @var PHPExcel
-	 */
-	private $_phpExcel;
-
-	/**
-	 * Fonts writers
-	 *
-	 * @var PHPExcel_Writer_Excel5_Font[]
-	 */
-	private $_fontWriters = array();
-
-	/**
-	 * Added fonts. Maps from font's hash => index in workbook
-	 *
-	 * @var array
-	 */
-	private $_addedFonts = array();
-
-	/**
-	 * Shared number formats
-	 *
-	 * @var array
-	 */
-	private $_numberFormats = array();
-
-	/**
-	 * Added number formats. Maps from numberFormat's hash => index in workbook
-	 *
-	 * @var array
-	 */
-	private $_addedNumberFormats = array();
-
-	/**
-	 * Sizes of the binary worksheet streams
-	 *
-	 * @var array
-	 */
-	private $_worksheetSizes = array();
-
-	/**
-	 * Offsets of the binary worksheet streams relative to the start of the global workbook stream
-	 *
-	 * @var array
-	 */
-	private $_worksheetOffsets = array();
-
-	/**
-	 * Total number of shared strings in workbook
-	 *
-	 * @var int
-	 */
-	private $_str_total;
-
-	/**
-	 * Number of unique shared strings in workbook
-	 *
-	 * @var int
-	 */
-	private $_str_unique;
-
-	/**
-	 * Array of unique shared strings in workbook
-	 *
-	 * @var array
-	 */
-	private $_str_table;
-
-	/**
-	 * Color cache
-	 */
-	private $_colors;
-
-	/**
-	 * Escher object corresponding to MSODRAWINGGROUP
-	 *
-	 * @var PHPExcel_Shared_Escher
-	 */
-	private $_escher;
-
-
-	/**
-	 * Class constructor
-	 *
-	 * @param PHPExcel	$phpExcel		The Workbook
-	 * @param int		&$str_total		Total number of strings
-	 * @param int		&$str_unique	Total number of unique strings
-	 * @param array		&$str_table		String Table
-	 * @param array		&$colors		Colour Table
-	 * @param mixed		$parser			The formula parser created for the Workbook
-	 */
-	public function __construct(PHPExcel $phpExcel = null,
-								&$str_total, &$str_unique, &$str_table, &$colors,
-								$parser )
-	{
-		// It needs to call its parent's constructor explicitly
-		parent::__construct();
-
-		$this->_parser           = $parser;
-		$this->_biffsize         = 0;
-		$this->_palette          = array();
-		$this->_country_code     = -1;
-
-		$this->_str_total       = &$str_total;
-		$this->_str_unique      = &$str_unique;
-		$this->_str_table       = &$str_table;
-		$this->_colors          = &$colors;
-		$this->_setPaletteXl97();
-
-		$this->_phpExcel = $phpExcel;
-
-		// set BIFFwriter limit for CONTINUE records
-		//		$this->_limit = 8224;
-		$this->_codepage = 0x04B0;
-
-		// Add empty sheets and Build color cache
-		$countSheets = $phpExcel->getSheetCount();
-		for ($i = 0; $i < $countSheets; ++$i) {
-			$phpSheet = $phpExcel->getSheet($i);
-
-			$this->_parser->setExtSheet($phpSheet->getTitle(), $i);  // Register worksheet name with parser
-
-			$supbook_index = 0x00;
-			$ref = pack('vvv', $supbook_index, $i, $i);
-			$this->_parser->_references[] = $ref;  // Register reference with parser
-
-			// Sheet tab colors?
-			if ($phpSheet->isTabColorSet()) {
-				$this->_addColor($phpSheet->getTabColor()->getRGB());
-			}
-		}
-
-	}
-
-	/**
-	 * Add a new XF writer
-	 *
-	 * @param PHPExcel_Style
-	 * @param boolean Is it a style XF?
-	 * @return int Index to XF record
-	 */
-	public function addXfWriter($style, $isStyleXf = false)
-	{
-		$xfWriter = new PHPExcel_Writer_Excel5_Xf($style);
-		$xfWriter->setIsStyleXf($isStyleXf);
-
-		// Add the font if not already added
-		$fontIndex = $this->_addFont($style->getFont());
-
-		// Assign the font index to the xf record
-		$xfWriter->setFontIndex($fontIndex);
-
-		// Background colors, best to treat these after the font so black will come after white in custom palette
-		$xfWriter->setFgColor($this->_addColor($style->getFill()->getStartColor()->getRGB()));
-		$xfWriter->setBgColor($this->_addColor($style->getFill()->getEndColor()->getRGB()));
-		$xfWriter->setBottomColor($this->_addColor($style->getBorders()->getBottom()->getColor()->getRGB()));
-		$xfWriter->setTopColor($this->_addColor($style->getBorders()->getTop()->getColor()->getRGB()));
-		$xfWriter->setRightColor($this->_addColor($style->getBorders()->getRight()->getColor()->getRGB()));
-		$xfWriter->setLeftColor($this->_addColor($style->getBorders()->getLeft()->getColor()->getRGB()));
-		$xfWriter->setDiagColor($this->_addColor($style->getBorders()->getDiagonal()->getColor()->getRGB()));
-
-		// Add the number format if it is not a built-in one and not already added
-		if ($style->getNumberFormat()->getBuiltInFormatCode() === false) {
-			$numberFormatHashCode = $style->getNumberFormat()->getHashCode();
-
-			if (isset($this->_addedNumberFormats[$numberFormatHashCode])) {
-				$numberFormatIndex = $this->_addedNumberFormats[$numberFormatHashCode];
-			} else {
-				$numberFormatIndex = 164 + count($this->_numberFormats);
-				$this->_numberFormats[$numberFormatIndex] = $style->getNumberFormat();
-				$this->_addedNumberFormats[$numberFormatHashCode] = $numberFormatIndex;
-			}
-		} else {
-			$numberFormatIndex = (int) $style->getNumberFormat()->getBuiltInFormatCode();
-		}
-
-		// Assign the number format index to xf record
-		$xfWriter->setNumberFormatIndex($numberFormatIndex);
-
-		$this->_xfWriters[] = $xfWriter;
-
-		$xfIndex = count($this->_xfWriters) - 1;
-		return $xfIndex;
-	}
-
-	/**
-	 * Add a font to added fonts
-	 *
-	 * @param PHPExcel_Style_Font $font
-	 * @return int Index to FONT record
-	 */
-	public function _addFont(PHPExcel_Style_Font $font)
-	{
-		$fontHashCode = $font->getHashCode();
-		if(isset($this->_addedFonts[$fontHashCode])){
-			$fontIndex = $this->_addedFonts[$fontHashCode];
-		} else {
-			$countFonts = count($this->_fontWriters);
-			$fontIndex = ($countFonts < 4) ? $countFonts : $countFonts + 1;
-
-			$fontWriter = new PHPExcel_Writer_Excel5_Font($font);
-			$fontWriter->setColorIndex($this->_addColor($font->getColor()->getRGB()));
-			$this->_fontWriters[] = $fontWriter;
-
-			$this->_addedFonts[$fontHashCode] = $fontIndex;
-		}
-		return $fontIndex;
-	}
-
-	/**
-	 * Alter color palette adding a custom color
-	 *
-	 * @param string $rgb E.g. 'FF00AA'
-	 * @return int Color index
-	 */
-	private function _addColor($rgb) {
-		if (!isset($this->_colors[$rgb])) {
-			if (count($this->_colors) < 57) {
-				// then we add a custom color altering the palette
-				$colorIndex = 8 + count($this->_colors);
-				$this->_palette[$colorIndex] =
-					array(
-						hexdec(substr($rgb, 0, 2)),
-						hexdec(substr($rgb, 2, 2)),
-						hexdec(substr($rgb, 4)),
-						0
-					);
-				$this->_colors[$rgb] = $colorIndex;
-			} else {
-				// no room for more custom colors, just map to black
-				$colorIndex = 0;
-			}
-		} else {
-			// fetch already added custom color
-			$colorIndex = $this->_colors[$rgb];
-		}
-
-		return $colorIndex;
-	}
-
-	/**
-	 * Sets the colour palette to the Excel 97+ default.
-	 *
-	 * @access private
-	 */
-	function _setPaletteXl97()
-	{
-		$this->_palette = array(
-			0x08 => array(0x00, 0x00, 0x00, 0x00),
-			0x09 => array(0xff, 0xff, 0xff, 0x00),
-			0x0A => array(0xff, 0x00, 0x00, 0x00),
-			0x0B => array(0x00, 0xff, 0x00, 0x00),
-			0x0C => array(0x00, 0x00, 0xff, 0x00),
-			0x0D => array(0xff, 0xff, 0x00, 0x00),
-			0x0E => array(0xff, 0x00, 0xff, 0x00),
-			0x0F => array(0x00, 0xff, 0xff, 0x00),
-			0x10 => array(0x80, 0x00, 0x00, 0x00),
-			0x11 => array(0x00, 0x80, 0x00, 0x00),
-			0x12 => array(0x00, 0x00, 0x80, 0x00),
-			0x13 => array(0x80, 0x80, 0x00, 0x00),
-			0x14 => array(0x80, 0x00, 0x80, 0x00),
-			0x15 => array(0x00, 0x80, 0x80, 0x00),
-			0x16 => array(0xc0, 0xc0, 0xc0, 0x00),
-			0x17 => array(0x80, 0x80, 0x80, 0x00),
-			0x18 => array(0x99, 0x99, 0xff, 0x00),
-			0x19 => array(0x99, 0x33, 0x66, 0x00),
-			0x1A => array(0xff, 0xff, 0xcc, 0x00),
-			0x1B => array(0xcc, 0xff, 0xff, 0x00),
-			0x1C => array(0x66, 0x00, 0x66, 0x00),
-			0x1D => array(0xff, 0x80, 0x80, 0x00),
-			0x1E => array(0x00, 0x66, 0xcc, 0x00),
-			0x1F => array(0xcc, 0xcc, 0xff, 0x00),
-			0x20 => array(0x00, 0x00, 0x80, 0x00),
-			0x21 => array(0xff, 0x00, 0xff, 0x00),
-			0x22 => array(0xff, 0xff, 0x00, 0x00),
-			0x23 => array(0x00, 0xff, 0xff, 0x00),
-			0x24 => array(0x80, 0x00, 0x80, 0x00),
-			0x25 => array(0x80, 0x00, 0x00, 0x00),
-			0x26 => array(0x00, 0x80, 0x80, 0x00),
-			0x27 => array(0x00, 0x00, 0xff, 0x00),
-			0x28 => array(0x00, 0xcc, 0xff, 0x00),
-			0x29 => array(0xcc, 0xff, 0xff, 0x00),
-			0x2A => array(0xcc, 0xff, 0xcc, 0x00),
-			0x2B => array(0xff, 0xff, 0x99, 0x00),
-			0x2C => array(0x99, 0xcc, 0xff, 0x00),
-			0x2D => array(0xff, 0x99, 0xcc, 0x00),
-			0x2E => array(0xcc, 0x99, 0xff, 0x00),
-			0x2F => array(0xff, 0xcc, 0x99, 0x00),
-			0x30 => array(0x33, 0x66, 0xff, 0x00),
-			0x31 => array(0x33, 0xcc, 0xcc, 0x00),
-			0x32 => array(0x99, 0xcc, 0x00, 0x00),
-			0x33 => array(0xff, 0xcc, 0x00, 0x00),
-			0x34 => array(0xff, 0x99, 0x00, 0x00),
-			0x35 => array(0xff, 0x66, 0x00, 0x00),
-			0x36 => array(0x66, 0x66, 0x99, 0x00),
-			0x37 => array(0x96, 0x96, 0x96, 0x00),
-			0x38 => array(0x00, 0x33, 0x66, 0x00),
-			0x39 => array(0x33, 0x99, 0x66, 0x00),
-			0x3A => array(0x00, 0x33, 0x00, 0x00),
-			0x3B => array(0x33, 0x33, 0x00, 0x00),
-			0x3C => array(0x99, 0x33, 0x00, 0x00),
-			0x3D => array(0x99, 0x33, 0x66, 0x00),
-			0x3E => array(0x33, 0x33, 0x99, 0x00),
-			0x3F => array(0x33, 0x33, 0x33, 0x00),
-		);
-	}
-
-	/**
-	 * Assemble worksheets into a workbook and send the BIFF data to an OLE
-	 * storage.
-	 *
-	 * @param	array	$pWorksheetSizes	The sizes in bytes of the binary worksheet streams
-	 * @return	string	Binary data for workbook stream
-	 */
-	public function writeWorkbook($pWorksheetSizes = null)
-	{
-		$this->_worksheetSizes = $pWorksheetSizes;
-
-		// Calculate the number of selected worksheet tabs and call the finalization
-		// methods for each worksheet
-		$total_worksheets = $this->_phpExcel->getSheetCount();
-
-		// Add part 1 of the Workbook globals, what goes before the SHEET records
-		$this->_storeBof(0x0005);
-		$this->_writeCodepage();
-		$this->_writeWindow1();
-
-		$this->_writeDatemode();
-		$this->_writeAllFonts();
-		$this->_writeAllNumFormats();
-		$this->_writeAllXfs();
-		$this->_writeAllStyles();
-		$this->_writePalette();
-
-		// Prepare part 3 of the workbook global stream, what goes after the SHEET records
-		$part3 = '';
-		if ($this->_country_code != -1) {
-			$part3 .= $this->_writeCountry();
-		}
-		$part3 .= $this->_writeRecalcId();
-
-		$part3 .= $this->_writeSupbookInternal();
-		/* TODO: store external SUPBOOK records and XCT and CRN records
-		in case of external references for BIFF8 */
-		$part3 .= $this->_writeExternsheetBiff8();
-		$part3 .= $this->_writeAllDefinedNamesBiff8();
-		$part3 .= $this->_writeMsoDrawingGroup();
-		$part3 .= $this->_writeSharedStringsTable();
-
-		$part3 .= $this->writeEof();
-
-		// Add part 2 of the Workbook globals, the SHEET records
-		$this->_calcSheetOffsets();
-		for ($i = 0; $i < $total_worksheets; ++$i) {
-			$this->_writeBoundsheet($this->_phpExcel->getSheet($i), $this->_worksheetOffsets[$i]);
-		}
-
-		// Add part 3 of the Workbook globals
-		$this->_data .= $part3;
-
-		return $this->_data;
-	}
-
-	/**
-	 * Calculate offsets for Worksheet BOF records.
-	 *
-	 * @access private
-	 */
-	function _calcSheetOffsets()
-	{
-		$boundsheet_length = 10;  // fixed length for a BOUNDSHEET record
-
-		// size of Workbook globals part 1 + 3
-		$offset            = $this->_datasize;
-
-		// add size of Workbook globals part 2, the length of the SHEET records
-		$total_worksheets = count($this->_phpExcel->getAllSheets());
-		foreach ($this->_phpExcel->getWorksheetIterator() as $sheet) {
-			$offset += $boundsheet_length + strlen(PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($sheet->getTitle()));
-		}
-
-		// add the sizes of each of the Sheet substreams, respectively
-		for ($i = 0; $i < $total_worksheets; ++$i) {
-			$this->_worksheetOffsets[$i] = $offset;
-			$offset += $this->_worksheetSizes[$i];
-		}
-		$this->_biffsize = $offset;
-	}
-
-	/**
-	 * Store the Excel FONT records.
-	 */
-	private function _writeAllFonts()
-	{
-		foreach ($this->_fontWriters as $fontWriter) {
-			$this->_append($fontWriter->writeFont());
-		}
-	}
-
-	/**
-	 * Store user defined numerical formats i.e. FORMAT records
-	 */
-	private function _writeAllNumFormats()
-	{
-		foreach ($this->_numberFormats as $numberFormatIndex => $numberFormat) {
-			$this->_writeNumFormat($numberFormat->getFormatCode(), $numberFormatIndex);
-		}
-	}
-
-	/**
-	 * Write all XF records.
-	 */
-	private function _writeAllXfs()
-	{
-		foreach ($this->_xfWriters as $xfWriter) {
-			$this->_append($xfWriter->writeXf());
-		}
-	}
-
-	/**
-	 * Write all STYLE records.
-	 */
-	private function _writeAllStyles()
-	{
-		$this->_writeStyle();
-	}
-
-	/**
-	 * Write the EXTERNCOUNT and EXTERNSHEET records. These are used as indexes for
-	 * the NAME records.
-	 */
-	private function _writeExterns()
-	{
-		$countSheets = $this->_phpExcel->getSheetCount();
-		// Create EXTERNCOUNT with number of worksheets
-		$this->_writeExterncount($countSheets);
-
-		// Create EXTERNSHEET for each worksheet
-		for ($i = 0; $i < $countSheets; ++$i) {
-			$this->_writeExternsheet($this->_phpExcel->getSheet($i)->getTitle());
-		}
-	}
-
-	/**
-	 * Write the NAME record to define the print area and the repeat rows and cols.
-	 */
-	private function _writeNames()
-	{
-		// total number of sheets
-		$total_worksheets = $this->_phpExcel->getSheetCount();
-
-		// Create the print area NAME records
-		for ($i = 0; $i < $total_worksheets; ++$i) {
-			$sheetSetup = $this->_phpExcel->getSheet($i)->getPageSetup();
-			// Write a Name record if the print area has been defined
-			if ($sheetSetup->isPrintAreaSet()) {
-				// Print area
-				$printArea = PHPExcel_Cell::splitRange($sheetSetup->getPrintArea());
-				$printArea = $printArea[0];
-				$printArea[0] = PHPExcel_Cell::coordinateFromString($printArea[0]);
-				$printArea[1] = PHPExcel_Cell::coordinateFromString($printArea[1]);
-
-				$print_rowmin = $printArea[0][1] - 1;
-				$print_rowmax = $printArea[1][1] - 1;
-				$print_colmin = PHPExcel_Cell::columnIndexFromString($printArea[0][0]) - 1;
-				$print_colmax = PHPExcel_Cell::columnIndexFromString($printArea[1][0]) - 1;
-
-				$this->_writeNameShort(
-					$i, // sheet index
-					0x06, // NAME type
-					$print_rowmin,
-					$print_rowmax,
-					$print_colmin,
-					$print_colmax
-					);
-			}
-		}
-
-		// Create the print title NAME records
-		for ($i = 0; $i < $total_worksheets; ++$i) {
-			$sheetSetup = $this->_phpExcel->getSheet($i)->getPageSetup();
-
-			// simultaneous repeatColumns repeatRows
-			if ($sheetSetup->isColumnsToRepeatAtLeftSet() && $sheetSetup->isRowsToRepeatAtTopSet()) {
-				$repeat = $sheetSetup->getColumnsToRepeatAtLeft();
-				$colmin = PHPExcel_Cell::columnIndexFromString($repeat[0]) - 1;
-				$colmax = PHPExcel_Cell::columnIndexFromString($repeat[1]) - 1;
-
-				$repeat = $sheetSetup->getRowsToRepeatAtTop();
-				$rowmin = $repeat[0] - 1;
-				$rowmax = $repeat[1] - 1;
-
-				$this->_writeNameLong(
-					$i, // sheet index
-					0x07, // NAME type
-					$rowmin,
-					$rowmax,
-					$colmin,
-					$colmax
-					);
-
-			// (exclusive) either repeatColumns or repeatRows
-			} else if ($sheetSetup->isColumnsToRepeatAtLeftSet() || $sheetSetup->isRowsToRepeatAtTopSet()) {
-
-				// Columns to repeat
-				if ($sheetSetup->isColumnsToRepeatAtLeftSet()) {
-					$repeat = $sheetSetup->getColumnsToRepeatAtLeft();
-					$colmin = PHPExcel_Cell::columnIndexFromString($repeat[0]) - 1;
-					$colmax = PHPExcel_Cell::columnIndexFromString($repeat[1]) - 1;
-				} else {
-					$colmin = 0;
-					$colmax = 255;
-				}
-
-				// Rows to repeat
-				if ($sheetSetup->isRowsToRepeatAtTopSet()) {
-					$repeat = $sheetSetup->getRowsToRepeatAtTop();
-					$rowmin = $repeat[0] - 1;
-					$rowmax = $repeat[1] - 1;
-				} else {
-					$rowmin = 0;
-					$rowmax = 65535;
-				}
-
-				$this->_writeNameShort(
-					$i, // sheet index
-					0x07, // NAME type
-					$rowmin,
-					$rowmax,
-					$colmin,
-					$colmax
-					);
-			}
-		}
-	}
-
-	/**
-	 * Writes all the DEFINEDNAME records (BIFF8).
-	 * So far this is only used for repeating rows/columns (print titles) and print areas
-	 */
-	private function _writeAllDefinedNamesBiff8()
-	{
-		$chunk = '';
-
-		// Named ranges
-		if (count($this->_phpExcel->getNamedRanges()) > 0) {
-			// Loop named ranges
-			$namedRanges = $this->_phpExcel->getNamedRanges();
-			foreach ($namedRanges as $namedRange) {
-
-				// Create absolute coordinate
-				$range = PHPExcel_Cell::splitRange($namedRange->getRange());
-				for ($i = 0; $i < count($range); $i++) {
-					$range[$i][0] = '\'' . str_replace("'", "''", $namedRange->getWorksheet()->getTitle()) . '\'!' . PHPExcel_Cell::absoluteCoordinate($range[$i][0]);
-					if (isset($range[$i][1])) {
-						$range[$i][1] = PHPExcel_Cell::absoluteCoordinate($range[$i][1]);
-					}
-				}
-				$range = PHPExcel_Cell::buildRange($range); // e.g. Sheet1!$A$1:$B$2
-
-				// parse formula
-				try {
-					$error = $this->_parser->parse($range);
-					$formulaData = $this->_parser->toReversePolish();
-
-					// make sure tRef3d is of type tRef3dR (0x3A)
-					if (isset($formulaData{0}) and ($formulaData{0} == "\x7A" or $formulaData{0} == "\x5A")) {
-						$formulaData = "\x3A" . substr($formulaData, 1);
-					}
-
-					if ($namedRange->getLocalOnly()) {
-						// local scope
-						$scope = $this->_phpExcel->getIndex($namedRange->getScope()) + 1;
-					} else {
-						// global scope
-						$scope = 0;
-					}
-					$chunk .= $this->writeData($this->_writeDefinedNameBiff8($namedRange->getName(), $formulaData, $scope, false));
-
-				} catch(PHPExcel_Exception $e) {
-					// do nothing
-				}
-			}
-		}
-
-		// total number of sheets
-		$total_worksheets = $this->_phpExcel->getSheetCount();
-
-		// write the print titles (repeating rows, columns), if any
-		for ($i = 0; $i < $total_worksheets; ++$i) {
-			$sheetSetup = $this->_phpExcel->getSheet($i)->getPageSetup();
-			// simultaneous repeatColumns repeatRows
-			if ($sheetSetup->isColumnsToRepeatAtLeftSet() && $sheetSetup->isRowsToRepeatAtTopSet()) {
-				$repeat = $sheetSetup->getColumnsToRepeatAtLeft();
-				$colmin = PHPExcel_Cell::columnIndexFromString($repeat[0]) - 1;
-				$colmax = PHPExcel_Cell::columnIndexFromString($repeat[1]) - 1;
-
-				$repeat = $sheetSetup->getRowsToRepeatAtTop();
-				$rowmin = $repeat[0] - 1;
-				$rowmax = $repeat[1] - 1;
-
-				// construct formula data manually
-				$formulaData = pack('Cv', 0x29, 0x17); // tMemFunc
-				$formulaData .= pack('Cvvvvv', 0x3B, $i, 0, 65535, $colmin, $colmax); // tArea3d
-				$formulaData .= pack('Cvvvvv', 0x3B, $i, $rowmin, $rowmax, 0, 255); // tArea3d
-				$formulaData .= pack('C', 0x10); // tList
-
-				// store the DEFINEDNAME record
-				$chunk .= $this->writeData($this->_writeDefinedNameBiff8(pack('C', 0x07), $formulaData, $i + 1, true));
-
-			// (exclusive) either repeatColumns or repeatRows
-			} else if ($sheetSetup->isColumnsToRepeatAtLeftSet() || $sheetSetup->isRowsToRepeatAtTopSet()) {
-
-				// Columns to repeat
-				if ($sheetSetup->isColumnsToRepeatAtLeftSet()) {
-					$repeat = $sheetSetup->getColumnsToRepeatAtLeft();
-					$colmin = PHPExcel_Cell::columnIndexFromString($repeat[0]) - 1;
-					$colmax = PHPExcel_Cell::columnIndexFromString($repeat[1]) - 1;
-				} else {
-					$colmin = 0;
-					$colmax = 255;
-				}
-				// Rows to repeat
-				if ($sheetSetup->isRowsToRepeatAtTopSet()) {
-					$repeat = $sheetSetup->getRowsToRepeatAtTop();
-					$rowmin = $repeat[0] - 1;
-					$rowmax = $repeat[1] - 1;
-				} else {
-					$rowmin = 0;
-					$rowmax = 65535;
-				}
-
-				// construct formula data manually because parser does not recognize absolute 3d cell references
-				$formulaData = pack('Cvvvvv', 0x3B, $i, $rowmin, $rowmax, $colmin, $colmax);
-
-				// store the DEFINEDNAME record
-				$chunk .= $this->writeData($this->_writeDefinedNameBiff8(pack('C', 0x07), $formulaData, $i + 1, true));
-			}
-		}
-
-		// write the print areas, if any
-		for ($i = 0; $i < $total_worksheets; ++$i) {
-			$sheetSetup = $this->_phpExcel->getSheet($i)->getPageSetup();
-			if ($sheetSetup->isPrintAreaSet()) {
-				// Print area, e.g. A3:J6,H1:X20
-				$printArea = PHPExcel_Cell::splitRange($sheetSetup->getPrintArea());
-				$countPrintArea = count($printArea);
-
-				$formulaData = '';
-				for ($j = 0; $j < $countPrintArea; ++$j) {
-					$printAreaRect = $printArea[$j]; // e.g. A3:J6
-					$printAreaRect[0] = PHPExcel_Cell::coordinateFromString($printAreaRect[0]);
-					$printAreaRect[1] = PHPExcel_Cell::coordinateFromString($printAreaRect[1]);
-
-					$print_rowmin = $printAreaRect[0][1] - 1;
-					$print_rowmax = $printAreaRect[1][1] - 1;
-					$print_colmin = PHPExcel_Cell::columnIndexFromString($printAreaRect[0][0]) - 1;
-					$print_colmax = PHPExcel_Cell::columnIndexFromString($printAreaRect[1][0]) - 1;
-
-					// construct formula data manually because parser does not recognize absolute 3d cell references
-					$formulaData .= pack('Cvvvvv', 0x3B, $i, $print_rowmin, $print_rowmax, $print_colmin, $print_colmax);
-
-					if ($j > 0) {
-						$formulaData .= pack('C', 0x10); // list operator token ','
-					}
-				}
-
-				// store the DEFINEDNAME record
-				$chunk .= $this->writeData($this->_writeDefinedNameBiff8(pack('C', 0x06), $formulaData, $i + 1, true));
-			}
-		}
-
-		// write autofilters, if any
-		for ($i = 0; $i < $total_worksheets; ++$i) {
-			$sheetAutoFilter = $this->_phpExcel->getSheet($i)->getAutoFilter();
-			$autoFilterRange = $sheetAutoFilter->getRange();
-			if(!empty($autoFilterRange)) {
-				$rangeBounds = PHPExcel_Cell::rangeBoundaries($autoFilterRange);
-
-				//Autofilter built in name
-				$name = pack('C', 0x0D);
-
-				$chunk .= $this->writeData($this->_writeShortNameBiff8($name, $i + 1, $rangeBounds, true));
-			}
-		}
-
-		return $chunk;
-	}
-
-	/**
-	 * Write a DEFINEDNAME record for BIFF8 using explicit binary formula data
-	 *
-	 * @param	string		$name			The name in UTF-8
-	 * @param	string		$formulaData	The binary formula data
-	 * @param	string		$sheetIndex		1-based sheet index the defined name applies to. 0 = global
-	 * @param	boolean		$isBuiltIn		Built-in name?
-	 * @return	string	Complete binary record data
-	 */
-	private function _writeDefinedNameBiff8($name, $formulaData, $sheetIndex = 0, $isBuiltIn = false)
-	{
-		$record = 0x0018;
-
-		// option flags
-		$options = $isBuiltIn ? 0x20 : 0x00;
-
-		// length of the name, character count
-		$nlen = PHPExcel_Shared_String::CountCharacters($name);
-
-		// name with stripped length field
-		$name = substr(PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($name), 2);
-
-		// size of the formula (in bytes)
-		$sz = strlen($formulaData);
-
-		// combine the parts
-		$data = pack('vCCvvvCCCC', $options, 0, $nlen, $sz, 0, $sheetIndex, 0, 0, 0, 0)
-			. $name . $formulaData;
-		$length = strlen($data);
-
-		$header = pack('vv', $record, $length);
-
-		return $header . $data;
-	}
-
-	/**
-	 * Write a short NAME record
-	 *
-	 * @param	string		 $name
-	 * @param	string		 $sheetIndex		1-based sheet index the defined name applies to. 0 = global
-	 * @param	integer[][]  $rangeBounds    range boundaries
-	 * @param	boolean      $isHidden
-	 * @return	string	Complete binary record data
-	 * */
-	private function _writeShortNameBiff8($name, $sheetIndex = 0, $rangeBounds, $isHidden = false){
-		$record = 0x0018;
-
-		// option flags
-		$options = ($isHidden  ? 0x21 : 0x00);
-
-		$extra  = pack('Cvvvvv',
-				0x3B,
-				$sheetIndex - 1,
-				$rangeBounds[0][1] - 1,
-				$rangeBounds[1][1] - 1,
-				$rangeBounds[0][0] - 1,
-				$rangeBounds[1][0] - 1);
-
-		// size of the formula (in bytes)
-		$sz = strlen($extra);
-
-		// combine the parts
-		$data = pack('vCCvvvCCCCC', $options, 0, 1, $sz, 0, $sheetIndex, 0, 0, 0, 0, 0)
-			. $name . $extra;
-		$length = strlen($data);
-
-		$header = pack('vv', $record, $length);
-
-		return $header . $data;
-	}
-
-	/**
-	 * Stores the CODEPAGE biff record.
-	 */
-	private function _writeCodepage()
-	{
-		$record          = 0x0042;             // Record identifier
-		$length          = 0x0002;             // Number of bytes to follow
-		$cv              = $this->_codepage;   // The code page
-
-		$header          = pack('vv', $record, $length);
-		$data            = pack('v',  $cv);
-
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write Excel BIFF WINDOW1 record.
-	 */
-	private function _writeWindow1()
-	{
-		$record    = 0x003D;                 // Record identifier
-		$length    = 0x0012;                 // Number of bytes to follow
-
-		$xWn       = 0x0000;                 // Horizontal position of window
-		$yWn       = 0x0000;                 // Vertical position of window
-		$dxWn      = 0x25BC;                 // Width of window
-		$dyWn      = 0x1572;                 // Height of window
-
-		$grbit     = 0x0038;                 // Option flags
-
-		// not supported by PHPExcel, so there is only one selected sheet, the active
-		$ctabsel   = 1;       // Number of workbook tabs selected
-
-		$wTabRatio = 0x0258;                 // Tab to scrollbar ratio
-
-		// not supported by PHPExcel, set to 0
-		$itabFirst = 0;     // 1st displayed worksheet
-		$itabCur   = $this->_phpExcel->getActiveSheetIndex();    // Active worksheet
-
-		$header    = pack("vv",        $record, $length);
-		$data      = pack("vvvvvvvvv", $xWn, $yWn, $dxWn, $dyWn,
-									   $grbit,
-									   $itabCur, $itabFirst,
-									   $ctabsel, $wTabRatio);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Writes Excel BIFF BOUNDSHEET record.
-	 *
-	 * @param PHPExcel_Worksheet  $sheet Worksheet name
-	 * @param integer $offset    Location of worksheet BOF
-	 */
-	private function _writeBoundsheet($sheet, $offset)
-	{
-		$sheetname = $sheet->getTitle();
-		$record    = 0x0085;                    // Record identifier
-
-		// sheet state
-		switch ($sheet->getSheetState()) {
-			case PHPExcel_Worksheet::SHEETSTATE_VISIBLE:	$ss = 0x00; break;
-			case PHPExcel_Worksheet::SHEETSTATE_HIDDEN:		$ss = 0x01; break;
-			case PHPExcel_Worksheet::SHEETSTATE_VERYHIDDEN:	$ss = 0x02; break;
-			default: $ss = 0x00; break;
-		}
-
-		// sheet type
-		$st = 0x00;
-
-		$grbit     = 0x0000;                    // Visibility and sheet type
-
-		$data      = pack("VCC", $offset, $ss, $st);
-		$data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($sheetname);
-
-		$length = strlen($data);
-		$header = pack("vv",  $record, $length);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write Internal SUPBOOK record
-	 */
-	private function _writeSupbookInternal()
-	{
-		$record    = 0x01AE;   // Record identifier
-		$length    = 0x0004;   // Bytes to follow
-
-		$header    = pack("vv", $record, $length);
-		$data      = pack("vv", $this->_phpExcel->getSheetCount(), 0x0401);
-		return $this->writeData($header . $data);
-	}
-
-	/**
-	 * Writes the Excel BIFF EXTERNSHEET record. These references are used by
-	 * formulas.
-	 *
-	 */
-	private function _writeExternsheetBiff8()
-	{
-		$total_references = count($this->_parser->_references);
-		$record   = 0x0017;                     // Record identifier
-		$length   = 2 + 6 * $total_references;  // Number of bytes to follow
-
-		$supbook_index = 0;           // FIXME: only using internal SUPBOOK record
-		$header           = pack("vv",  $record, $length);
-		$data             = pack('v', $total_references);
-		for ($i = 0; $i < $total_references; ++$i) {
-			$data .= $this->_parser->_references[$i];
-		}
-		return $this->writeData($header . $data);
-	}
-
-	/**
-	 * Write Excel BIFF STYLE records.
-	 */
-	private function _writeStyle()
-	{
-		$record    = 0x0293;   // Record identifier
-		$length    = 0x0004;   // Bytes to follow
-
-		$ixfe      = 0x8000;  // Index to cell style XF
-		$BuiltIn   = 0x00;     // Built-in style
-		$iLevel    = 0xff;     // Outline style level
-
-		$header    = pack("vv",  $record, $length);
-		$data      = pack("vCC", $ixfe, $BuiltIn, $iLevel);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Writes Excel FORMAT record for non "built-in" numerical formats.
-	 *
-	 * @param string  $format Custom format string
-	 * @param integer $ifmt   Format index code
-	 */
-	private function _writeNumFormat($format, $ifmt)
-	{
-		$record    = 0x041E;                      // Record identifier
-
-		$numberFormatString = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($format);
-		$length    = 2 + strlen($numberFormatString);      // Number of bytes to follow
-
-
-		$header    = pack("vv", $record, $length);
-		$data      = pack("v", $ifmt) .  $numberFormatString;
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write DATEMODE record to indicate the date system in use (1904 or 1900).
-	 */
-	private function _writeDatemode()
-	{
-		$record    = 0x0022;         // Record identifier
-		$length    = 0x0002;         // Bytes to follow
-
-		$f1904     = (PHPExcel_Shared_Date::getExcelCalendar() == PHPExcel_Shared_Date::CALENDAR_MAC_1904) ?
-			1 : 0;   // Flag for 1904 date system
-
-		$header    = pack("vv", $record, $length);
-		$data      = pack("v", $f1904);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write BIFF record EXTERNCOUNT to indicate the number of external sheet
-	 * references in the workbook.
-	 *
-	 * Excel only stores references to external sheets that are used in NAME.
-	 * The workbook NAME record is required to define the print area and the repeat
-	 * rows and columns.
-	 *
-	 * A similar method is used in Worksheet.php for a slightly different purpose.
-	 *
-	 * @param integer $cxals Number of external references
-	 */
-	private function _writeExterncount($cxals)
-	{
-		$record   = 0x0016;          // Record identifier
-		$length   = 0x0002;          // Number of bytes to follow
-
-		$header   = pack("vv", $record, $length);
-		$data     = pack("v",  $cxals);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Writes the Excel BIFF EXTERNSHEET record. These references are used by
-	 * formulas. NAME record is required to define the print area and the repeat
-	 * rows and columns.
-	 *
-	 * A similar method is used in Worksheet.php for a slightly different purpose.
-	 *
-	 * @param string $sheetname Worksheet name
-	 */
-	private function _writeExternsheet($sheetname)
-	{
-		$record      = 0x0017;                     // Record identifier
-		$length      = 0x02 + strlen($sheetname);  // Number of bytes to follow
-
-		$cch         = strlen($sheetname);         // Length of sheet name
-		$rgch        = 0x03;                       // Filename encoding
-
-		$header      = pack("vv",  $record, $length);
-		$data        = pack("CC", $cch, $rgch);
-		$this->_append($header . $data . $sheetname);
-	}
-
-	/**
-	 * Store the NAME record in the short format that is used for storing the print
-	 * area, repeat rows only and repeat columns only.
-	 *
-	 * @param integer $index  Sheet index
-	 * @param integer $type   Built-in name type
-	 * @param integer $rowmin Start row
-	 * @param integer $rowmax End row
-	 * @param integer $colmin Start colum
-	 * @param integer $colmax End column
-	 */
-	private function _writeNameShort($index, $type, $rowmin, $rowmax, $colmin, $colmax)
-	{
-		$record          = 0x0018;       // Record identifier
-		$length          = 0x0024;       // Number of bytes to follow
-
-		$grbit           = 0x0020;       // Option flags
-		$chKey           = 0x00;         // Keyboard shortcut
-		$cch             = 0x01;         // Length of text name
-		$cce             = 0x0015;       // Length of text definition
-		$ixals           = $index + 1;   // Sheet index
-		$itab            = $ixals;       // Equal to ixals
-		$cchCustMenu     = 0x00;         // Length of cust menu text
-		$cchDescription  = 0x00;         // Length of description text
-		$cchHelptopic    = 0x00;         // Length of help topic text
-		$cchStatustext   = 0x00;         // Length of status bar text
-		$rgch            = $type;        // Built-in name type
-
-		$unknown03       = 0x3b;
-		$unknown04       = 0xffff-$index;
-		$unknown05       = 0x0000;
-		$unknown06       = 0x0000;
-		$unknown07       = 0x1087;
-		$unknown08       = 0x8005;
-
-		$header             = pack("vv", $record, $length);
-		$data               = pack("v", $grbit);
-		$data              .= pack("C", $chKey);
-		$data              .= pack("C", $cch);
-		$data              .= pack("v", $cce);
-		$data              .= pack("v", $ixals);
-		$data              .= pack("v", $itab);
-		$data              .= pack("C", $cchCustMenu);
-		$data              .= pack("C", $cchDescription);
-		$data              .= pack("C", $cchHelptopic);
-		$data              .= pack("C", $cchStatustext);
-		$data              .= pack("C", $rgch);
-		$data              .= pack("C", $unknown03);
-		$data              .= pack("v", $unknown04);
-		$data              .= pack("v", $unknown05);
-		$data              .= pack("v", $unknown06);
-		$data              .= pack("v", $unknown07);
-		$data              .= pack("v", $unknown08);
-		$data              .= pack("v", $index);
-		$data              .= pack("v", $index);
-		$data              .= pack("v", $rowmin);
-		$data              .= pack("v", $rowmax);
-		$data              .= pack("C", $colmin);
-		$data              .= pack("C", $colmax);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Store the NAME record in the long format that is used for storing the repeat
-	 * rows and columns when both are specified. This shares a lot of code with
-	 * _writeNameShort() but we use a separate method to keep the code clean.
-	 * Code abstraction for reuse can be carried too far, and I should know. ;-)
-	 *
-	 * @param integer $index Sheet index
-	 * @param integer $type  Built-in name type
-	 * @param integer $rowmin Start row
-	 * @param integer $rowmax End row
-	 * @param integer $colmin Start colum
-	 * @param integer $colmax End column
-	 */
-	private function _writeNameLong($index, $type, $rowmin, $rowmax, $colmin, $colmax)
-	{
-		$record          = 0x0018;       // Record identifier
-		$length          = 0x003d;       // Number of bytes to follow
-		$grbit           = 0x0020;       // Option flags
-		$chKey           = 0x00;         // Keyboard shortcut
-		$cch             = 0x01;         // Length of text name
-		$cce             = 0x002e;       // Length of text definition
-		$ixals           = $index + 1;   // Sheet index
-		$itab            = $ixals;       // Equal to ixals
-		$cchCustMenu     = 0x00;         // Length of cust menu text
-		$cchDescription  = 0x00;         // Length of description text
-		$cchHelptopic    = 0x00;         // Length of help topic text
-		$cchStatustext   = 0x00;         // Length of status bar text
-		$rgch            = $type;        // Built-in name type
-
-		$unknown01       = 0x29;
-		$unknown02       = 0x002b;
-		$unknown03       = 0x3b;
-		$unknown04       = 0xffff-$index;
-		$unknown05       = 0x0000;
-		$unknown06       = 0x0000;
-		$unknown07       = 0x1087;
-		$unknown08       = 0x8008;
-
-		$header             = pack("vv",  $record, $length);
-		$data               = pack("v", $grbit);
-		$data              .= pack("C", $chKey);
-		$data              .= pack("C", $cch);
-		$data              .= pack("v", $cce);
-		$data              .= pack("v", $ixals);
-		$data              .= pack("v", $itab);
-		$data              .= pack("C", $cchCustMenu);
-		$data              .= pack("C", $cchDescription);
-		$data              .= pack("C", $cchHelptopic);
-		$data              .= pack("C", $cchStatustext);
-		$data              .= pack("C", $rgch);
-		$data              .= pack("C", $unknown01);
-		$data              .= pack("v", $unknown02);
-		// Column definition
-		$data              .= pack("C", $unknown03);
-		$data              .= pack("v", $unknown04);
-		$data              .= pack("v", $unknown05);
-		$data              .= pack("v", $unknown06);
-		$data              .= pack("v", $unknown07);
-		$data              .= pack("v", $unknown08);
-		$data              .= pack("v", $index);
-		$data              .= pack("v", $index);
-		$data              .= pack("v", 0x0000);
-		$data              .= pack("v", 0x3fff);
-		$data              .= pack("C", $colmin);
-		$data              .= pack("C", $colmax);
-		// Row definition
-		$data              .= pack("C", $unknown03);
-		$data              .= pack("v", $unknown04);
-		$data              .= pack("v", $unknown05);
-		$data              .= pack("v", $unknown06);
-		$data              .= pack("v", $unknown07);
-		$data              .= pack("v", $unknown08);
-		$data              .= pack("v", $index);
-		$data              .= pack("v", $index);
-		$data              .= pack("v", $rowmin);
-		$data              .= pack("v", $rowmax);
-		$data              .= pack("C", 0x00);
-		$data              .= pack("C", 0xff);
-		// End of data
-		$data              .= pack("C", 0x10);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Stores the COUNTRY record for localization
-	 *
-	 * @return string
-	 */
-	private function _writeCountry()
-	{
-		$record          = 0x008C;    // Record identifier
-		$length          = 4;         // Number of bytes to follow
-
-		$header = pack('vv',  $record, $length);
-		/* using the same country code always for simplicity */
-		$data = pack('vv', $this->_country_code, $this->_country_code);
-		//$this->_append($header . $data);
-		return $this->writeData($header . $data);
-	}
-
-	/**
-	 * Write the RECALCID record
-	 *
-	 * @return string
-	 */
-	private function _writeRecalcId()
-	{
-		$record = 0x01C1;    // Record identifier
-		$length = 8;         // Number of bytes to follow
-
-		$header = pack('vv',  $record, $length);
-
-		// by inspection of real Excel files, MS Office Excel 2007 writes this
-		$data = pack('VV', 0x000001C1, 0x00001E667);
-
-		return $this->writeData($header . $data);
-	}
-
-	/**
-	 * Stores the PALETTE biff record.
-	 */
-	private function _writePalette()
-	{
-		$aref            = $this->_palette;
-
-		$record          = 0x0092;                 // Record identifier
-		$length          = 2 + 4 * count($aref);   // Number of bytes to follow
-		$ccv             =         count($aref);   // Number of RGB values to follow
-		$data = '';                                // The RGB data
-
-		// Pack the RGB data
-		foreach ($aref as $color) {
-			foreach ($color as $byte) {
-				$data .= pack("C",$byte);
-			}
-		}
-
-		$header = pack("vvv",  $record, $length, $ccv);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Handling of the SST continue blocks is complicated by the need to include an
-	 * additional continuation byte depending on whether the string is split between
-	 * blocks or whether it starts at the beginning of the block. (There are also
-	 * additional complications that will arise later when/if Rich Strings are
-	 * supported).
-	 *
-	 * The Excel documentation says that the SST record should be followed by an
-	 * EXTSST record. The EXTSST record is a hash table that is used to optimise
-	 * access to SST. However, despite the documentation it doesn't seem to be
-	 * required so we will ignore it.
-	 *
-	 * @return string Binary data
-	 */
-	private function _writeSharedStringsTable()
-	{
-		// maximum size of record data (excluding record header)
-		$continue_limit = 8224;
-
-		// initialize array of record data blocks
-		$recordDatas = array();
-
-		// start SST record data block with total number of strings, total number of unique strings
-		$recordData = pack("VV", $this->_str_total, $this->_str_unique);
-
-		// loop through all (unique) strings in shared strings table
-		foreach (array_keys($this->_str_table) as $string) {
-
-			// here $string is a BIFF8 encoded string
-
-			// length = character count
-			$headerinfo = unpack("vlength/Cencoding", $string);
-
-			// currently, this is always 1 = uncompressed
-			$encoding = $headerinfo["encoding"];
-
-			// initialize finished writing current $string
-			$finished = false;
-
-			while ($finished === false) {
-
-				// normally, there will be only one cycle, but if string cannot immediately be written as is
-				// there will be need for more than one cylcle, if string longer than one record data block, there
-				// may be need for even more cycles
-
-				if (strlen($recordData) + strlen($string) <= $continue_limit) {
-					// then we can write the string (or remainder of string) without any problems
-					$recordData .= $string;
-
-					if (strlen($recordData) + strlen($string) == $continue_limit) {
-						// we close the record data block, and initialize a new one
-						$recordDatas[] = $recordData;
-						$recordData = '';
-					}
-
-					// we are finished writing this string
-					$finished = true;
-				} else {
-					// special treatment writing the string (or remainder of the string)
-					// If the string is very long it may need to be written in more than one CONTINUE record.
-
-					// check how many bytes more there is room for in the current record
-					$space_remaining = $continue_limit - strlen($recordData);
-
-					// minimum space needed
-					// uncompressed: 2 byte string length length field + 1 byte option flags + 2 byte character
-					// compressed:   2 byte string length length field + 1 byte option flags + 1 byte character
-					$min_space_needed = ($encoding == 1) ? 5 : 4;
-
-					// We have two cases
-					// 1. space remaining is less than minimum space needed
-					//		here we must waste the space remaining and move to next record data block
-					// 2. space remaining is greater than or equal to minimum space needed
-					//		here we write as much as we can in the current block, then move to next record data block
-
-					// 1. space remaining is less than minimum space needed
-					if ($space_remaining < $min_space_needed) {
-						// we close the block, store the block data
-						$recordDatas[] = $recordData;
-
-						// and start new record data block where we start writing the string
-						$recordData = '';
-
-					// 2. space remaining is greater than or equal to minimum space needed
-					} else {
-						// initialize effective remaining space, for Unicode strings this may need to be reduced by 1, see below
-						$effective_space_remaining = $space_remaining;
-
-						// for uncompressed strings, sometimes effective space remaining is reduced by 1
-						if ( $encoding == 1 && (strlen($string) - $space_remaining) % 2 == 1 ) {
-							--$effective_space_remaining;
-						}
-
-						// one block fininshed, store the block data
-						$recordData .= substr($string, 0, $effective_space_remaining);
-
-						$string = substr($string, $effective_space_remaining); // for next cycle in while loop
-						$recordDatas[] = $recordData;
-
-						// start new record data block with the repeated option flags
-						$recordData = pack('C', $encoding);
-					}
-				}
-			}
-		}
-
-		// Store the last record data block unless it is empty
-		// if there was no need for any continue records, this will be the for SST record data block itself
-		if (strlen($recordData) > 0) {
-			$recordDatas[] = $recordData;
-		}
-
-		// combine into one chunk with all the blocks SST, CONTINUE,...
-		$chunk = '';
-		foreach ($recordDatas as $i => $recordData) {
-			// first block should have the SST record header, remaing should have CONTINUE header
-			$record = ($i == 0) ? 0x00FC : 0x003C;
-
-			$header = pack("vv", $record, strlen($recordData));
-			$data = $header . $recordData;
-
-			$chunk .= $this->writeData($data);
-		}
-
-		return $chunk;
-	}
-
-	/**
-	 * Writes the MSODRAWINGGROUP record if needed. Possibly split using CONTINUE records.
-	 */
-	private function _writeMsoDrawingGroup()
-	{
-		// write the Escher stream if necessary
-		if (isset($this->_escher)) {
-			$writer = new PHPExcel_Writer_Excel5_Escher($this->_escher);
-			$data = $writer->close();
-
-			$record = 0x00EB;
-			$length = strlen($data);
-			$header = pack("vv",  $record, $length);
-
-			return $this->writeData($header . $data);
-
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Get Escher object
-	 *
-	 * @return PHPExcel_Shared_Escher
-	 */
-	public function getEscher()
-	{
-		return $this->_escher;
-	}
-
-	/**
-	 * Set Escher object
-	 *
-	 * @param PHPExcel_Shared_Escher $pValue
-	 */
-	public function setEscher(PHPExcel_Shared_Escher $pValue = null)
-	{
-		$this->_escher = $pValue;
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Worksheet.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Worksheet.php
deleted file mode 100644
index fb75499b118..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Worksheet.php
+++ /dev/null
@@ -1,3681 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-// Original file header of PEAR::Spreadsheet_Excel_Writer_Worksheet (used as the base for this class):
-// -----------------------------------------------------------------------------------------
-// /*
-// *  Module written/ported by Xavier Noguer <xnoguer@rezebra.com>
-// *
-// *  The majority of this is _NOT_ my code.  I simply ported it from the
-// *  PERL Spreadsheet::WriteExcel module.
-// *
-// *  The author of the Spreadsheet::WriteExcel module is John McNamara
-// *  <jmcnamara@cpan.org>
-// *
-// *  I _DO_ maintain this code, and John McNamara has nothing to do with the
-// *  porting of this code to PHP.  Any questions directly related to this
-// *  class library should be directed to me.
-// *
-// *  License Information:
-// *
-// *    Spreadsheet_Excel_Writer:  A library for generating Excel Spreadsheets
-// *    Copyright (c) 2002-2003 Xavier Noguer xnoguer@rezebra.com
-// *
-// *    This library is free software; you can redistribute it and/or
-// *    modify it under the terms of the GNU Lesser General Public
-// *    License as published by the Free Software Foundation; either
-// *    version 2.1 of the License, or (at your option) any later version.
-// *
-// *    This library is distributed in the hope that it will be useful,
-// *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-// *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// *    Lesser General Public License for more details.
-// *
-// *    You should have received a copy of the GNU Lesser General Public
-// *    License along with this library; if not, write to the Free Software
-// *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-// */
-
-
-/**
- * PHPExcel_Writer_Excel5_Worksheet
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
-{
-	/**
-	 * Formula parser
-	 *
-	 * @var PHPExcel_Writer_Excel5_Parser
-	 */
-	private $_parser;
-
-	/**
-	 * Maximum number of characters for a string (LABEL record in BIFF5)
-	 * @var integer
-	 */
-	public $_xls_strmax;
-
-	/**
-	 * Array containing format information for columns
-	 * @var array
-	 */
-	public $_colinfo;
-
-	/**
-	 * Array containing the selected area for the worksheet
-	 * @var array
-	 */
-	public $_selection;
-
-	/**
-	 * The active pane for the worksheet
-	 * @var integer
-	 */
-	public $_active_pane;
-
-	/**
-	 * Whether to use outline.
-	 * @var integer
-	 */
-	public $_outline_on;
-
-	/**
-	 * Auto outline styles.
-	 * @var bool
-	 */
-	public $_outline_style;
-
-	/**
-	 * Whether to have outline summary below.
-	 * @var bool
-	 */
-	public $_outline_below;
-
-	/**
-	 * Whether to have outline summary at the right.
-	 * @var bool
-	 */
-	public $_outline_right;
-
-	/**
-	 * Reference to the total number of strings in the workbook
-	 * @var integer
-	 */
-	public $_str_total;
-
-	/**
-	 * Reference to the number of unique strings in the workbook
-	 * @var integer
-	 */
-	public $_str_unique;
-
-	/**
-	 * Reference to the array containing all the unique strings in the workbook
-	 * @var array
-	 */
-	public $_str_table;
-
-	/**
-	 * Color cache
-	 */
-	private $_colors;
-
-	/**
-	 * Index of first used row (at least 0)
-	 * @var int
-	 */
-	private $_firstRowIndex;
-
-	/**
-	 * Index of last used row. (no used rows means -1)
-	 * @var int
-	 */
-	private $_lastRowIndex;
-
-	/**
-	 * Index of first used column (at least 0)
-	 * @var int
-	 */
-	private $_firstColumnIndex;
-
-	/**
-	 * Index of last used column (no used columns means -1)
-	 * @var int
-	 */
-	private $_lastColumnIndex;
-
-	/**
-	 * Sheet object
-	 * @var PHPExcel_Worksheet
-	 */
-	public $_phpSheet;
-
-	/**
-	 * Count cell style Xfs
-	 *
-	 * @var int
-	 */
-	private $_countCellStyleXfs;
-
-	/**
-	 * Escher object corresponding to MSODRAWING
-	 *
-	 * @var PHPExcel_Shared_Escher
-	 */
-	private $_escher;
-
-	/**
-	 * Array of font hashes associated to FONT records index
-	 *
-	 * @var array
-	 */
-	public $_fntHashIndex;
-
-	/**
-	 * Constructor
-	 *
-	 * @param int		&$str_total		Total number of strings
-	 * @param int		&$str_unique	Total number of unique strings
-	 * @param array		&$str_table		String Table
-	 * @param array		&$colors		Colour Table
-	 * @param mixed		$parser			The formula parser created for the Workbook
-	 * @param boolean	$preCalculateFormulas	Flag indicating whether formulas should be calculated or just written
-	 * @param string	$phpSheet		The worksheet to write
-	 * @param PHPExcel_Worksheet $phpSheet
-	 */
-	public function __construct(&$str_total, &$str_unique, &$str_table, &$colors,
-								$parser, $preCalculateFormulas, $phpSheet)
-	{
-		// It needs to call its parent's constructor explicitly
-		parent::__construct();
-
-		// change BIFFwriter limit for CONTINUE records
-//		$this->_limit = 8224;
-
-
-		$this->_preCalculateFormulas = $preCalculateFormulas;
-		$this->_str_total		= &$str_total;
-		$this->_str_unique		= &$str_unique;
-		$this->_str_table		= &$str_table;
-		$this->_colors			= &$colors;
-		$this->_parser			= $parser;
-
-		$this->_phpSheet = $phpSheet;
-
-		//$this->ext_sheets		= array();
-		//$this->offset			= 0;
-		$this->_xls_strmax		= 255;
-		$this->_colinfo			= array();
-		$this->_selection		= array(0,0,0,0);
-		$this->_active_pane		= 3;
-
-		$this->_print_headers		= 0;
-
-		$this->_outline_style		= 0;
-		$this->_outline_below		= 1;
-		$this->_outline_right		= 1;
-		$this->_outline_on			= 1;
-
-		$this->_fntHashIndex	= array();
-
-		// calculate values for DIMENSIONS record
-		$minR = 1;
-		$minC = 'A';
-
-		$maxR  = $this->_phpSheet->getHighestRow();
-		$maxC = $this->_phpSheet->getHighestColumn();
-
-		// Determine lowest and highest column and row
-//		$this->_firstRowIndex = ($minR > 65535) ? 65535 : $minR;
-		$this->_lastRowIndex = ($maxR > 65535) ? 65535 : $maxR ;
-
-		$this->_firstColumnIndex	= PHPExcel_Cell::columnIndexFromString($minC);
-		$this->_lastColumnIndex		= PHPExcel_Cell::columnIndexFromString($maxC);
-
-//		if ($this->_firstColumnIndex > 255) $this->_firstColumnIndex = 255;
-		if ($this->_lastColumnIndex > 255) $this->_lastColumnIndex = 255;
-
-		$this->_countCellStyleXfs = count($phpSheet->getParent()->getCellStyleXfCollection());
-	}
-
-	/**
-	 * Add data to the beginning of the workbook (note the reverse order)
-	 * and to the end of the workbook.
-	 *
-	 * @access public
-	 * @see PHPExcel_Writer_Excel5_Workbook::storeWorkbook()
-	 */
-	function close()
-	{
-		$_phpSheet = $this->_phpSheet;
-
-		$num_sheets = $_phpSheet->getParent()->getSheetCount();
-
-		// Write BOF record
-		$this->_storeBof(0x0010);
-
-		// Write PRINTHEADERS
-		$this->_writePrintHeaders();
-
-		// Write PRINTGRIDLINES
-		$this->_writePrintGridlines();
-
-		// Write GRIDSET
-		$this->_writeGridset();
-
-		// Calculate column widths
-		$_phpSheet->calculateColumnWidths();
-
-		// Column dimensions
-		if (($defaultWidth = $_phpSheet->getDefaultColumnDimension()->getWidth()) < 0) {
-			$defaultWidth = PHPExcel_Shared_Font::getDefaultColumnWidthByFont($_phpSheet->getParent()->getDefaultStyle()->getFont());
-		}
-
-		$columnDimensions = $_phpSheet->getColumnDimensions();
-		$maxCol = $this->_lastColumnIndex -1;
-		for ($i = 0; $i <= $maxCol; ++$i) {
-			$hidden = 0;
-			$level = 0;
-			$xfIndex = 15; // there are 15 cell style Xfs
-
-			$width = $defaultWidth;
-
-			$columnLetter = PHPExcel_Cell::stringFromColumnIndex($i);
-			if (isset($columnDimensions[$columnLetter])) {
-				$columnDimension = $columnDimensions[$columnLetter];
-				if ($columnDimension->getWidth() >= 0) {
-					$width = $columnDimension->getWidth();
-				}
-				$hidden = $columnDimension->getVisible() ? 0 : 1;
-				$level = $columnDimension->getOutlineLevel();
-				$xfIndex = $columnDimension->getXfIndex() + 15; // there are 15 cell style Xfs
-			}
-
-			// Components of _colinfo:
-			// $firstcol first column on the range
-			// $lastcol  last column on the range
-			// $width	width to set
-			// $xfIndex  The optional cell style Xf index to apply to the columns
-			// $hidden   The optional hidden atribute
-			// $level	The optional outline level
-			$this->_colinfo[] = array($i, $i, $width, $xfIndex, $hidden, $level);
-		}
-
-		// Write GUTS
-		$this->_writeGuts();
-
-		// Write DEFAULTROWHEIGHT
-		$this->_writeDefaultRowHeight();
-
-		// Write WSBOOL
-		$this->_writeWsbool();
-
-		// Write horizontal and vertical page breaks
-		$this->_writeBreaks();
-
-		// Write page header
-		$this->_writeHeader();
-
-		// Write page footer
-		$this->_writeFooter();
-
-		// Write page horizontal centering
-		$this->_writeHcenter();
-
-		// Write page vertical centering
-		$this->_writeVcenter();
-
-		// Write left margin
-		$this->_writeMarginLeft();
-
-		// Write right margin
-		$this->_writeMarginRight();
-
-		// Write top margin
-		$this->_writeMarginTop();
-
-		// Write bottom margin
-		$this->_writeMarginBottom();
-
-		// Write page setup
-		$this->_writeSetup();
-
-		// Write sheet protection
-		$this->_writeProtect();
-
-		// Write SCENPROTECT
-		$this->_writeScenProtect();
-
-		// Write OBJECTPROTECT
-		$this->_writeObjectProtect();
-
-		// Write sheet password
-		$this->_writePassword();
-
-		// Write DEFCOLWIDTH record
-		$this->_writeDefcol();
-
-		// Write the COLINFO records if they exist
-		if (!empty($this->_colinfo)) {
-			$colcount = count($this->_colinfo);
-			for ($i = 0; $i < $colcount; ++$i) {
-				$this->_writeColinfo($this->_colinfo[$i]);
-			}
-		}
-		$autoFilterRange = $_phpSheet->getAutoFilter()->getRange();
-		if (!empty($autoFilterRange)) {
-			// Write AUTOFILTERINFO
-			$this->_writeAutoFilterInfo();
-		}
-
-		// Write sheet dimensions
-		$this->_writeDimensions();
-
-		// Row dimensions
-		foreach ($_phpSheet->getRowDimensions() as $rowDimension) {
-			$xfIndex = $rowDimension->getXfIndex() + 15; // there are 15 cellXfs
-			$this->_writeRow( $rowDimension->getRowIndex() - 1, $rowDimension->getRowHeight(), $xfIndex, ($rowDimension->getVisible() ? '0' : '1'), $rowDimension->getOutlineLevel() );
-		}
-
-		// Write Cells
-		foreach ($_phpSheet->getCellCollection() as $cellID) {
-			$cell = $_phpSheet->getCell($cellID);
-			$row = $cell->getRow() - 1;
-			$column = PHPExcel_Cell::columnIndexFromString($cell->getColumn()) - 1;
-
-			// Don't break Excel!
-//			if ($row + 1 > 65536 or $column + 1 > 256) {
-			if ($row > 65535 || $column > 255) {
-				break;
-			}
-
-			// Write cell value
-			$xfIndex = $cell->getXfIndex() + 15; // there are 15 cell style Xfs
-
-			$cVal = $cell->getValue();
-			if ($cVal instanceof PHPExcel_RichText) {
-				// $this->_writeString($row, $column, $cVal->getPlainText(), $xfIndex);
-				$arrcRun = array();
-				$str_len = PHPExcel_Shared_String::CountCharacters($cVal->getPlainText(), 'UTF-8');
-				$str_pos = 0;
-				$elements = $cVal->getRichTextElements();
-				foreach ($elements as $element) {
-					// FONT Index
-					if ($element instanceof PHPExcel_RichText_Run) {
-						$str_fontidx = $this->_fntHashIndex[$element->getFont()->getHashCode()];
-					}
-					else {
-						$str_fontidx = 0;
-					}
-					$arrcRun[] = array('strlen' => $str_pos, 'fontidx' => $str_fontidx);
-					// Position FROM
-					$str_pos += PHPExcel_Shared_String::CountCharacters($element->getText(), 'UTF-8');
-				}
-				$this->_writeRichTextString($row, $column, $cVal->getPlainText(), $xfIndex, $arrcRun);
-			} else {
-				switch ($cell->getDatatype()) {
-					case PHPExcel_Cell_DataType::TYPE_STRING:
-					case PHPExcel_Cell_DataType::TYPE_NULL:
-						if ($cVal === '' || $cVal === null) {
-							$this->_writeBlank($row, $column, $xfIndex);
-						} else {
-							$this->_writeString($row, $column, $cVal, $xfIndex);
-						}
-						break;
-
-					case PHPExcel_Cell_DataType::TYPE_NUMERIC:
-						$this->_writeNumber($row, $column, $cVal, $xfIndex);
-						break;
-
-					case PHPExcel_Cell_DataType::TYPE_FORMULA:
-						$calculatedValue = $this->_preCalculateFormulas ?
-							$cell->getCalculatedValue() : null;
-						$this->_writeFormula($row, $column, $cVal, $xfIndex, $calculatedValue);
-						break;
-
-					case PHPExcel_Cell_DataType::TYPE_BOOL:
-						$this->_writeBoolErr($row, $column, $cVal, 0, $xfIndex);
-						break;
-
-					case PHPExcel_Cell_DataType::TYPE_ERROR:
-						$this->_writeBoolErr($row, $column, self::_mapErrorCode($cVal), 1, $xfIndex);
-						break;
-
-				}
-			}
-		}
-
-		// Append
-		$this->_writeMsoDrawing();
-
-		// Write WINDOW2 record
-		$this->_writeWindow2();
-
-		// Write PLV record
-		$this->_writePageLayoutView();
-
-		// Write ZOOM record
-		$this->_writeZoom();
-		if ($_phpSheet->getFreezePane()) {
-			$this->_writePanes();
-		}
-
-		// Write SELECTION record
-		$this->_writeSelection();
-
-		// Write MergedCellsTable Record
-		$this->_writeMergedCells();
-
-		// Hyperlinks
-		foreach ($_phpSheet->getHyperLinkCollection() as $coordinate => $hyperlink) {
-			list($column, $row) = PHPExcel_Cell::coordinateFromString($coordinate);
-
-			$url = $hyperlink->getUrl();
-
-			if ( strpos($url, 'sheet://') !== false ) {
-				// internal to current workbook
-				$url = str_replace('sheet://', 'internal:', $url);
-
-			} else if ( preg_match('/^(http:|https:|ftp:|mailto:)/', $url) ) {
-				// URL
-				// $url = $url;
-
-			} else {
-				// external (local file)
-				$url = 'external:' . $url;
-			}
-
-			$this->_writeUrl($row - 1, PHPExcel_Cell::columnIndexFromString($column) - 1, $url);
-		}
-
-		$this->_writeDataValidity();
-		$this->_writeSheetLayout();
-
-		// Write SHEETPROTECTION record
-		$this->_writeSheetProtection();
-		$this->_writeRangeProtection();
-
-		$arrConditionalStyles = $_phpSheet->getConditionalStylesCollection();
-		if(!empty($arrConditionalStyles)){
-			$arrConditional = array();
-			// @todo CFRule & CFHeader
-			// Write CFHEADER record
-			$this->_writeCFHeader();
-			// Write ConditionalFormattingTable records
-			foreach ($arrConditionalStyles as $cellCoordinate => $conditionalStyles) {
-				foreach ($conditionalStyles as $conditional) {
-					if($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_EXPRESSION
-						|| $conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CELLIS){
-						if(!in_array($conditional->getHashCode(), $arrConditional)){
-							$arrConditional[] = $conditional->getHashCode();
-							// Write CFRULE record
-							$this->_writeCFRule($conditional);
-						}
-					}
-				}
-			}
-		}
-
-		$this->_storeEof();
-	}
-
-	/**
-	 * Write a cell range address in BIFF8
-	 * always fixed range
-	 * See section 2.5.14 in OpenOffice.org's Documentation of the Microsoft Excel File Format
-	 *
-	 * @param string $range E.g. 'A1' or 'A1:B6'
-	 * @return string Binary data
-	 */
-	private function _writeBIFF8CellRangeAddressFixed($range = 'A1')
-	{
-		$explodes = explode(':', $range);
-
-		// extract first cell, e.g. 'A1'
-		$firstCell = $explodes[0];
-
-		// extract last cell, e.g. 'B6'
-		if (count($explodes) == 1) {
-			$lastCell = $firstCell;
-		} else {
-			$lastCell = $explodes[1];
-		}
-
-		$firstCellCoordinates = PHPExcel_Cell::coordinateFromString($firstCell); // e.g. array(0, 1)
-		$lastCellCoordinates  = PHPExcel_Cell::coordinateFromString($lastCell);  // e.g. array(1, 6)
-
-		return(pack('vvvv',
-			$firstCellCoordinates[1] - 1,
-			$lastCellCoordinates[1] - 1,
-			PHPExcel_Cell::columnIndexFromString($firstCellCoordinates[0]) - 1,
-			PHPExcel_Cell::columnIndexFromString($lastCellCoordinates[0]) - 1
-		));
-	}
-
-	/**
-	 * Retrieves data from memory in one chunk, or from disk in $buffer
-	 * sized chunks.
-	 *
-	 * @return string The data
-	 */
-	function getData()
-	{
-		$buffer = 4096;
-
-		// Return data stored in memory
-		if (isset($this->_data)) {
-			$tmp   = $this->_data;
-			unset($this->_data);
-			return $tmp;
-		}
-		// No data to return
-		return false;
-	}
-
-	/**
-	 * Set the option to print the row and column headers on the printed page.
-	 *
-	 * @access public
-	 * @param integer $print Whether to print the headers or not. Defaults to 1 (print).
-	 */
-	function printRowColHeaders($print = 1)
-	{
-		$this->_print_headers = $print;
-	}
-
-	/**
-	 * This method sets the properties for outlining and grouping. The defaults
-	 * correspond to Excel's defaults.
-	 *
-	 * @param bool $visible
-	 * @param bool $symbols_below
-	 * @param bool $symbols_right
-	 * @param bool $auto_style
-	 */
-	function setOutline($visible = true, $symbols_below = true, $symbols_right = true, $auto_style = false)
-	{
-		$this->_outline_on	= $visible;
-		$this->_outline_below = $symbols_below;
-		$this->_outline_right = $symbols_right;
-		$this->_outline_style = $auto_style;
-
-		// Ensure this is a boolean vale for Window2
-		if ($this->_outline_on) {
-			$this->_outline_on = 1;
-		}
-	 }
-
-	/**
-	 * Write a double to the specified row and column (zero indexed).
-	 * An integer can be written as a double. Excel will display an
-	 * integer. $format is optional.
-	 *
-	 * Returns  0 : normal termination
-	 *		 -2 : row or column out of range
-	 *
-	 * @param integer $row	Zero indexed row
-	 * @param integer $col	Zero indexed column
-	 * @param float   $num	The number to write
-	 * @param mixed   $xfIndex The optional XF format
-	 * @return integer
-	 */
-	private function _writeNumber($row, $col, $num, $xfIndex)
-	{
-		$record	= 0x0203;				 // Record identifier
-		$length	= 0x000E;				 // Number of bytes to follow
-
-		$header		= pack("vv",  $record, $length);
-		$data		= pack("vvv", $row, $col, $xfIndex);
-		$xl_double	= pack("d",   $num);
-		if (self::getByteOrder()) { // if it's Big Endian
-			$xl_double = strrev($xl_double);
-		}
-
-		$this->_append($header.$data.$xl_double);
-		return(0);
-	}
-
-	/**
-	 * Write a LABELSST record or a LABEL record. Which one depends on BIFF version
-	 *
-	 * @param int $row Row index (0-based)
-	 * @param int $col Column index (0-based)
-	 * @param string $str The string
-	 * @param int $xfIndex Index to XF record
-	 */
-	private function _writeString($row, $col, $str, $xfIndex)
-	{
-		$this->_writeLabelSst($row, $col, $str, $xfIndex);
-	}
-
-	/**
-	 * Write a LABELSST record or a LABEL record. Which one depends on BIFF version
-	 * It differs from _writeString by the writing of rich text strings.
-	 * @param int $row Row index (0-based)
-	 * @param int $col Column index (0-based)
-	 * @param string $str The string
-	 * @param mixed   $xfIndex The XF format index for the cell
-	 * @param array $arrcRun Index to Font record and characters beginning
-	 */
-	private function _writeRichTextString($row, $col, $str, $xfIndex, $arrcRun){
-		$record	= 0x00FD;				   // Record identifier
-		$length	= 0x000A;				   // Bytes to follow
-		$str = PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($str, $arrcRun);
-
-		/* check if string is already present */
-		if (!isset($this->_str_table[$str])) {
-			$this->_str_table[$str] = $this->_str_unique++;
-		}
-		$this->_str_total++;
-
-		$header	= pack('vv',   $record, $length);
-		$data	= pack('vvvV', $row, $col, $xfIndex, $this->_str_table[$str]);
-		$this->_append($header.$data);
-	}
-
-	/**
-	 * Write a string to the specified row and column (zero indexed).
-	 * NOTE: there is an Excel 5 defined limit of 255 characters.
-	 * $format is optional.
-	 * Returns  0 : normal termination
-	 *		 -2 : row or column out of range
-	 *		 -3 : long string truncated to 255 chars
-	 *
-	 * @access public
-	 * @param integer $row	Zero indexed row
-	 * @param integer $col	Zero indexed column
-	 * @param string  $str	The string to write
-	 * @param mixed   $xfIndex The XF format index for the cell
-	 * @return integer
-	 */
-	private function _writeLabel($row, $col, $str, $xfIndex)
-	{
-		$strlen	= strlen($str);
-		$record	= 0x0204;				   // Record identifier
-		$length	= 0x0008 + $strlen;		 // Bytes to follow
-
-		$str_error = 0;
-
-		if ($strlen > $this->_xls_strmax) { // LABEL must be < 255 chars
-			$str	= substr($str, 0, $this->_xls_strmax);
-			$length	= 0x0008 + $this->_xls_strmax;
-			$strlen	= $this->_xls_strmax;
-			$str_error = -3;
-		}
-
-		$header	= pack("vv",   $record, $length);
-		$data	= pack("vvvv", $row, $col, $xfIndex, $strlen);
-		$this->_append($header . $data . $str);
-		return($str_error);
-	}
-
-	/**
-	 * Write a string to the specified row and column (zero indexed).
-	 * This is the BIFF8 version (no 255 chars limit).
-	 * $format is optional.
-	 * Returns  0 : normal termination
-	 *		 -2 : row or column out of range
-	 *		 -3 : long string truncated to 255 chars
-	 *
-	 * @access public
-	 * @param integer $row	Zero indexed row
-	 * @param integer $col	Zero indexed column
-	 * @param string  $str	The string to write
-	 * @param mixed   $xfIndex The XF format index for the cell
-	 * @return integer
-	 */
-	private function _writeLabelSst($row, $col, $str, $xfIndex)
-	{
-		$record	= 0x00FD;				   // Record identifier
-		$length	= 0x000A;				   // Bytes to follow
-
-		$str = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($str);
-
-		/* check if string is already present */
-		if (!isset($this->_str_table[$str])) {
-			$this->_str_table[$str] = $this->_str_unique++;
-		}
-		$this->_str_total++;
-
-		$header	= pack('vv',   $record, $length);
-		$data	= pack('vvvV', $row, $col, $xfIndex, $this->_str_table[$str]);
-		$this->_append($header.$data);
-	}
-
-	/**
-	 * Writes a note associated with the cell given by the row and column.
-	 * NOTE records don't have a length limit.
-	 *
-	 * @param integer $row	Zero indexed row
-	 * @param integer $col	Zero indexed column
-	 * @param string  $note   The note to write
-	 */
-	private function _writeNote($row, $col, $note)
-	{
-		$note_length	= strlen($note);
-		$record			= 0x001C;			// Record identifier
-		$max_length		= 2048;				// Maximun length for a NOTE record
-
-		// Length for this record is no more than 2048 + 6
-		$length	= 0x0006 + min($note_length, 2048);
-		$header	= pack("vv",   $record, $length);
-		$data	= pack("vvv", $row, $col, $note_length);
-		$this->_append($header . $data . substr($note, 0, 2048));
-
-		for ($i = $max_length; $i < $note_length; $i += $max_length) {
-			$chunk  = substr($note, $i, $max_length);
-			$length = 0x0006 + strlen($chunk);
-			$header = pack("vv",   $record, $length);
-			$data   = pack("vvv", -1, 0, strlen($chunk));
-			$this->_append($header.$data.$chunk);
-		}
-		return(0);
-	}
-
-	/**
-	 * Write a blank cell to the specified row and column (zero indexed).
-	 * A blank cell is used to specify formatting without adding a string
-	 * or a number.
-	 *
-	 * A blank cell without a format serves no purpose. Therefore, we don't write
-	 * a BLANK record unless a format is specified.
-	 *
-	 * Returns  0 : normal termination (including no format)
-	 *		 -1 : insufficient number of arguments
-	 *		 -2 : row or column out of range
-	 *
-	 * @param integer $row	Zero indexed row
-	 * @param integer $col	Zero indexed column
-	 * @param mixed   $xfIndex The XF format index
-	 */
-	function _writeBlank($row, $col, $xfIndex)
-	{
-		$record	= 0x0201;				 // Record identifier
-		$length	= 0x0006;				 // Number of bytes to follow
-
-		$header	= pack("vv",  $record, $length);
-		$data	  = pack("vvv", $row, $col, $xfIndex);
-		$this->_append($header . $data);
-		return 0;
-	}
-
-	/**
-	 * Write a boolean or an error type to the specified row and column (zero indexed)
-	 *
-	 * @param int $row Row index (0-based)
-	 * @param int $col Column index (0-based)
-	 * @param int $value
-	 * @param boolean $isError Error or Boolean?
-	 * @param int $xfIndex
-	 */
-	private function _writeBoolErr($row, $col, $value, $isError, $xfIndex)
-	{
-		$record = 0x0205;
-		$length = 8;
-
-		$header	= pack("vv",  $record, $length);
-		$data	  = pack("vvvCC", $row, $col, $xfIndex, $value, $isError);
-		$this->_append($header . $data);
-		return 0;
-	}
-
-	/**
-	 * Write a formula to the specified row and column (zero indexed).
-	 * The textual representation of the formula is passed to the parser in
-	 * Parser.php which returns a packed binary string.
-	 *
-	 * Returns  0 : normal termination
-	 *		 -1 : formula errors (bad formula)
-	 *		 -2 : row or column out of range
-	 *
-	 * @param integer $row	 Zero indexed row
-	 * @param integer $col	 Zero indexed column
-	 * @param string  $formula The formula text string
-	 * @param mixed   $xfIndex  The XF format index
-	 * @param mixed   $calculatedValue  Calculated value
-	 * @return integer
-	 */
-	private function _writeFormula($row, $col, $formula, $xfIndex, $calculatedValue)
-	{
-		$record	= 0x0006;	 // Record identifier
-
-		// Initialize possible additional value for STRING record that should be written after the FORMULA record?
-		$stringValue = null;
-
-		// calculated value
-		if (isset($calculatedValue)) {
-			// Since we can't yet get the data type of the calculated value,
-			// we use best effort to determine data type
-			if (is_bool($calculatedValue)) {
-				// Boolean value
-				$num = pack('CCCvCv', 0x01, 0x00, (int)$calculatedValue, 0x00, 0x00, 0xFFFF);
-			} elseif (is_int($calculatedValue) || is_float($calculatedValue)) {
-				// Numeric value
-				$num = pack('d', $calculatedValue);
-			} elseif (is_string($calculatedValue)) {
-				if (array_key_exists($calculatedValue, PHPExcel_Cell_DataType::getErrorCodes())) {
-					// Error value
-					$num = pack('CCCvCv', 0x02, 0x00, self::_mapErrorCode($calculatedValue), 0x00, 0x00, 0xFFFF);
-				} elseif ($calculatedValue === '') {
-					// Empty string (and BIFF8)
-					$num = pack('CCCvCv', 0x03, 0x00, 0x00, 0x00, 0x00, 0xFFFF);
-				} else {
-					// Non-empty string value (or empty string BIFF5)
-					$stringValue = $calculatedValue;
-					$num = pack('CCCvCv', 0x00, 0x00, 0x00, 0x00, 0x00, 0xFFFF);
-				}
-			} else {
-				// We are really not supposed to reach here
-				$num = pack('d', 0x00);
-			}
-		} else {
-			$num = pack('d', 0x00);
-		}
-
-		$grbit		= 0x03;				// Option flags
-		$unknown	= 0x0000;			// Must be zero
-
-		// Strip the '=' or '@' sign at the beginning of the formula string
-		if ($formula{0} == '=') {
-			$formula = substr($formula,1);
-		} else {
-			// Error handling
-			$this->_writeString($row, $col, 'Unrecognised character for formula');
-			return -1;
-		}
-
-		// Parse the formula using the parser in Parser.php
-		try {
-			$error = $this->_parser->parse($formula);
-			$formula = $this->_parser->toReversePolish();
-
-			$formlen	= strlen($formula);	// Length of the binary string
-			$length	 = 0x16 + $formlen;	 // Length of the record data
-
-			$header	= pack("vv",	  $record, $length);
-
-			$data	  = pack("vvv", $row, $col, $xfIndex)
-						. $num
-						. pack("vVv", $grbit, $unknown, $formlen);
-			$this->_append($header . $data . $formula);
-
-			// Append also a STRING record if necessary
-			if ($stringValue !== null) {
-				$this->_writeStringRecord($stringValue);
-			}
-
-			return 0;
-
-		} catch (PHPExcel_Exception $e) {
-			// do nothing
-		}
-
-	}
-
-	/**
-	 * Write a STRING record. This
-	 *
-	 * @param string $stringValue
-	 */
-	private function _writeStringRecord($stringValue)
-	{
-		$record = 0x0207;	 // Record identifier
-		$data = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($stringValue);
-
-		$length = strlen($data);
-		$header = pack('vv', $record, $length);
-
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write a hyperlink.
-	 * This is comprised of two elements: the visible label and
-	 * the invisible link. The visible label is the same as the link unless an
-	 * alternative string is specified. The label is written using the
-	 * _writeString() method. Therefore the 255 characters string limit applies.
-	 * $string and $format are optional.
-	 *
-	 * The hyperlink can be to a http, ftp, mail, internal sheet (not yet), or external
-	 * directory url.
-	 *
-	 * Returns  0 : normal termination
-	 *		 -2 : row or column out of range
-	 *		 -3 : long string truncated to 255 chars
-	 *
-	 * @param integer $row	Row
-	 * @param integer $col	Column
-	 * @param string  $url	URL string
-	 * @return integer
-	 */
-	private function _writeUrl($row, $col, $url)
-	{
-		// Add start row and col to arg list
-		return($this->_writeUrlRange($row, $col, $row, $col, $url));
-	}
-
-	/**
-	 * This is the more general form of _writeUrl(). It allows a hyperlink to be
-	 * written to a range of cells. This function also decides the type of hyperlink
-	 * to be written. These are either, Web (http, ftp, mailto), Internal
-	 * (Sheet1!A1) or external ('c:\temp\foo.xls#Sheet1!A1').
-	 *
-	 * @access private
-	 * @see _writeUrl()
-	 * @param integer $row1   Start row
-	 * @param integer $col1   Start column
-	 * @param integer $row2   End row
-	 * @param integer $col2   End column
-	 * @param string  $url	URL string
-	 * @return integer
-	 */
-	function _writeUrlRange($row1, $col1, $row2, $col2, $url)
-	{
-		// Check for internal/external sheet links or default to web link
-		if (preg_match('[^internal:]', $url)) {
-			return($this->_writeUrlInternal($row1, $col1, $row2, $col2, $url));
-		}
-		if (preg_match('[^external:]', $url)) {
-			return($this->_writeUrlExternal($row1, $col1, $row2, $col2, $url));
-		}
-		return($this->_writeUrlWeb($row1, $col1, $row2, $col2, $url));
-	}
-
-	/**
-	 * Used to write http, ftp and mailto hyperlinks.
-	 * The link type ($options) is 0x03 is the same as absolute dir ref without
-	 * sheet. However it is differentiated by the $unknown2 data stream.
-	 *
-	 * @access private
-	 * @see _writeUrl()
-	 * @param integer $row1   Start row
-	 * @param integer $col1   Start column
-	 * @param integer $row2   End row
-	 * @param integer $col2   End column
-	 * @param string  $url	URL string
-	 * @return integer
-	 */
-	function _writeUrlWeb($row1, $col1, $row2, $col2, $url)
-	{
-		$record	  = 0x01B8;					   // Record identifier
-		$length	  = 0x00000;					  // Bytes to follow
-
-		// Pack the undocumented parts of the hyperlink stream
-		$unknown1	= pack("H*", "D0C9EA79F9BACE118C8200AA004BA90B02000000");
-		$unknown2	= pack("H*", "E0C9EA79F9BACE118C8200AA004BA90B");
-
-		// Pack the option flags
-		$options	 = pack("V", 0x03);
-
-		// Convert URL to a null terminated wchar string
-		$url		 = join("\0", preg_split("''", $url, -1, PREG_SPLIT_NO_EMPTY));
-		$url		 = $url . "\0\0\0";
-
-		// Pack the length of the URL
-		$url_len	 = pack("V", strlen($url));
-
-		// Calculate the data length
-		$length	  = 0x34 + strlen($url);
-
-		// Pack the header data
-		$header	  = pack("vv",   $record, $length);
-		$data		= pack("vvvv", $row1, $row2, $col1, $col2);
-
-		// Write the packed data
-		$this->_append($header . $data .
-					   $unknown1 . $options .
-					   $unknown2 . $url_len . $url);
-		return 0;
-	}
-
-	/**
-	 * Used to write internal reference hyperlinks such as "Sheet1!A1".
-	 *
-	 * @access private
-	 * @see _writeUrl()
-	 * @param integer $row1   Start row
-	 * @param integer $col1   Start column
-	 * @param integer $row2   End row
-	 * @param integer $col2   End column
-	 * @param string  $url	URL string
-	 * @return integer
-	 */
-	function _writeUrlInternal($row1, $col1, $row2, $col2, $url)
-	{
-		$record	  = 0x01B8;					   // Record identifier
-		$length	  = 0x00000;					  // Bytes to follow
-
-		// Strip URL type
-		$url = preg_replace('/^internal:/', '', $url);
-
-		// Pack the undocumented parts of the hyperlink stream
-		$unknown1	= pack("H*", "D0C9EA79F9BACE118C8200AA004BA90B02000000");
-
-		// Pack the option flags
-		$options	 = pack("V", 0x08);
-
-		// Convert the URL type and to a null terminated wchar string
-		$url .= "\0";
-
-		// character count
-		$url_len = PHPExcel_Shared_String::CountCharacters($url);
-		$url_len = pack('V', $url_len);
-
-		$url = PHPExcel_Shared_String::ConvertEncoding($url, 'UTF-16LE', 'UTF-8');
-
-		// Calculate the data length
-		$length	  = 0x24 + strlen($url);
-
-		// Pack the header data
-		$header	  = pack("vv",   $record, $length);
-		$data		= pack("vvvv", $row1, $row2, $col1, $col2);
-
-		// Write the packed data
-		$this->_append($header . $data .
-					   $unknown1 . $options .
-					   $url_len . $url);
-		return 0;
-	}
-
-	/**
-	 * Write links to external directory names such as 'c:\foo.xls',
-	 * c:\foo.xls#Sheet1!A1', '../../foo.xls'. and '../../foo.xls#Sheet1!A1'.
-	 *
-	 * Note: Excel writes some relative links with the $dir_long string. We ignore
-	 * these cases for the sake of simpler code.
-	 *
-	 * @access private
-	 * @see _writeUrl()
-	 * @param integer $row1   Start row
-	 * @param integer $col1   Start column
-	 * @param integer $row2   End row
-	 * @param integer $col2   End column
-	 * @param string  $url	URL string
-	 * @return integer
-	 */
-	function _writeUrlExternal($row1, $col1, $row2, $col2, $url)
-	{
-		// Network drives are different. We will handle them separately
-		// MS/Novell network drives and shares start with \\
-		if (preg_match('[^external:\\\\]', $url)) {
-			return; //($this->_writeUrlExternal_net($row1, $col1, $row2, $col2, $url, $str, $format));
-		}
-
-		$record	  = 0x01B8;					   // Record identifier
-		$length	  = 0x00000;					  // Bytes to follow
-
-		// Strip URL type and change Unix dir separator to Dos style (if needed)
-		//
-		$url = preg_replace('/^external:/', '', $url);
-		$url = preg_replace('/\//', "\\", $url);
-
-		// Determine if the link is relative or absolute:
-		//   relative if link contains no dir separator, "somefile.xls"
-		//   relative if link starts with up-dir, "..\..\somefile.xls"
-		//   otherwise, absolute
-
-		$absolute = 0x00; // relative path
-		if ( preg_match('/^[A-Z]:/', $url) ) {
-			$absolute = 0x02; // absolute path on Windows, e.g. C:\...
-		}
-		$link_type			   = 0x01 | $absolute;
-
-		// Determine if the link contains a sheet reference and change some of the
-		// parameters accordingly.
-		// Split the dir name and sheet name (if it exists)
-		$dir_long = $url;
-		if (preg_match("/\#/", $url)) {
-			$link_type |= 0x08;
-		}
-
-
-		// Pack the link type
-		$link_type   = pack("V", $link_type);
-
-		// Calculate the up-level dir count e.g.. (..\..\..\ == 3)
-		$up_count	= preg_match_all("/\.\.\\\/", $dir_long, $useless);
-		$up_count	= pack("v", $up_count);
-
-		// Store the short dos dir name (null terminated)
-		$dir_short   = preg_replace("/\.\.\\\/", '', $dir_long) . "\0";
-
-		// Store the long dir name as a wchar string (non-null terminated)
-		$dir_long	   = $dir_long . "\0";
-
-		// Pack the lengths of the dir strings
-		$dir_short_len = pack("V", strlen($dir_short)	  );
-		$dir_long_len  = pack("V", strlen($dir_long)	   );
-		$stream_len	= pack("V", 0);//strlen($dir_long) + 0x06);
-
-		// Pack the undocumented parts of the hyperlink stream
-		$unknown1 = pack("H*",'D0C9EA79F9BACE118C8200AA004BA90B02000000'	   );
-		$unknown2 = pack("H*",'0303000000000000C000000000000046'			   );
-		$unknown3 = pack("H*",'FFFFADDE000000000000000000000000000000000000000');
-		$unknown4 = pack("v",  0x03											);
-
-		// Pack the main data stream
-		$data		= pack("vvvv", $row1, $row2, $col1, $col2) .
-						  $unknown1	 .
-						  $link_type	.
-						  $unknown2	 .
-						  $up_count	 .
-						  $dir_short_len.
-						  $dir_short	.
-						  $unknown3	 .
-						  $stream_len   ;/*.
-						  $dir_long_len .
-						  $unknown4	 .
-						  $dir_long	 .
-						  $sheet_len	.
-						  $sheet		;*/
-
-		// Pack the header data
-		$length   = strlen($data);
-		$header   = pack("vv", $record, $length);
-
-		// Write the packed data
-		$this->_append($header. $data);
-		return 0;
-	}
-
-	/**
-	 * This method is used to set the height and format for a row.
-	 *
-	 * @param integer $row	The row to set
-	 * @param integer $height Height we are giving to the row.
-	 *						Use null to set XF without setting height
-	 * @param integer $xfIndex  The optional cell style Xf index to apply to the columns
-	 * @param bool	$hidden The optional hidden attribute
-	 * @param integer $level  The optional outline level for row, in range [0,7]
-	 */
-	private function _writeRow($row, $height, $xfIndex, $hidden = false, $level = 0)
-	{
-		$record	  = 0x0208;			   // Record identifier
-		$length	  = 0x0010;			   // Number of bytes to follow
-
-		$colMic	  = 0x0000;			   // First defined column
-		$colMac	  = 0x0000;			   // Last defined column
-		$irwMac	  = 0x0000;			   // Used by Excel to optimise loading
-		$reserved	= 0x0000;			   // Reserved
-		$grbit	   = 0x0000;			   // Option flags
-		$ixfe		= $xfIndex;
-
-		if ( $height < 0 ){
-			$height = null;
-		}
-
-		// Use _writeRow($row, null, $XF) to set XF format without setting height
-		if ($height != null) {
-			$miyRw = $height * 20;  // row height
-		} else {
-			$miyRw = 0xff;		  // default row height is 256
-		}
-
-		// Set the options flags. fUnsynced is used to show that the font and row
-		// heights are not compatible. This is usually the case for WriteExcel.
-		// The collapsed flag 0x10 doesn't seem to be used to indicate that a row
-		// is collapsed. Instead it is used to indicate that the previous row is
-		// collapsed. The zero height flag, 0x20, is used to collapse a row.
-
-		$grbit |= $level;
-		if ($hidden) {
-			$grbit |= 0x0030;
-		}
-		if ($height !== null) {
-			$grbit |= 0x0040; // fUnsynced
-		}
-		if ($xfIndex !== 0xF) {
-			$grbit |= 0x0080;
-		}
-		$grbit |= 0x0100;
-
-		$header   = pack("vv",	   $record, $length);
-		$data	 = pack("vvvvvvvv", $row, $colMic, $colMac, $miyRw,
-									 $irwMac,$reserved, $grbit, $ixfe);
-		$this->_append($header.$data);
-	}
-
-	/**
-	 * Writes Excel DIMENSIONS to define the area in which there is data.
-	 */
-	private function _writeDimensions()
-	{
-		$record = 0x0200; // Record identifier
-
-		$length = 0x000E;
-		$data = pack('VVvvv'
-				, $this->_firstRowIndex
-				, $this->_lastRowIndex + 1
-				, $this->_firstColumnIndex
-				, $this->_lastColumnIndex + 1
-				, 0x0000 // reserved
-			);
-
-		$header = pack("vv", $record, $length);
-		$this->_append($header.$data);
-	}
-
-	/**
-	 * Write BIFF record Window2.
-	 */
-	private function _writeWindow2()
-	{
-		$record		 = 0x023E;	 // Record identifier
-		$length		 = 0x0012;
-
-		$grbit		  = 0x00B6;	 // Option flags
-		$rwTop		  = 0x0000;	 // Top row visible in window
-		$colLeft		= 0x0000;	 // Leftmost column visible in window
-
-
-		// The options flags that comprise $grbit
-		$fDspFmla	   = 0;					 // 0 - bit
-		$fDspGrid	   = $this->_phpSheet->getShowGridlines() ? 1 : 0; // 1
-		$fDspRwCol	  = $this->_phpSheet->getShowRowColHeaders() ? 1 : 0; // 2
-		$fFrozen		= $this->_phpSheet->getFreezePane() ? 1 : 0;		// 3
-		$fDspZeros	  = 1;					 // 4
-		$fDefaultHdr	= 1;					 // 5
-		$fArabic		= $this->_phpSheet->getRightToLeft() ? 1 : 0; // 6
-		$fDspGuts	   = $this->_outline_on;	// 7
-		$fFrozenNoSplit = 0;					 // 0 - bit
-		// no support in PHPExcel for selected sheet, therefore sheet is only selected if it is the active sheet
-		$fSelected	  = ($this->_phpSheet === $this->_phpSheet->getParent()->getActiveSheet()) ? 1 : 0;
-		$fPaged		 = 1;					 // 2
-		$fPageBreakPreview = $this->_phpSheet->getSheetView()->getView() === PHPExcel_Worksheet_SheetView::SHEETVIEW_PAGE_BREAK_PREVIEW;
-
-		$grbit			 = $fDspFmla;
-		$grbit			|= $fDspGrid	   << 1;
-		$grbit			|= $fDspRwCol	   << 2;
-		$grbit			|= $fFrozen		   << 3;
-		$grbit			|= $fDspZeros	   << 4;
-		$grbit			|= $fDefaultHdr	   << 5;
-		$grbit			|= $fArabic		   << 6;
-		$grbit			|= $fDspGuts	   << 7;
-		$grbit			|= $fFrozenNoSplit << 8;
-		$grbit			|= $fSelected	   << 9;
-		$grbit			|= $fPaged		   << 10;
-		$grbit			|= $fPageBreakPreview << 11;
-
-		$header  = pack("vv",   $record, $length);
-		$data	= pack("vvv", $grbit, $rwTop, $colLeft);
-
-		// FIXME !!!
-		$rgbHdr	   = 0x0040; // Row/column heading and gridline color index
-		$zoom_factor_page_break = ($fPageBreakPreview? $this->_phpSheet->getSheetView()->getZoomScale() : 0x0000);
-		$zoom_factor_normal =  $this->_phpSheet->getSheetView()->getZoomScaleNormal();
-
-		$data .= pack("vvvvV", $rgbHdr, 0x0000, $zoom_factor_page_break, $zoom_factor_normal, 0x00000000);
-
-		$this->_append($header.$data);
-	}
-
-	/**
-	 * Write BIFF record DEFAULTROWHEIGHT.
-	 */
-	private function _writeDefaultRowHeight()
-	{
-		$defaultRowHeight = $this->_phpSheet->getDefaultRowDimension()->getRowHeight();
-
-		if ($defaultRowHeight < 0) {
-			return;
-		}
-
-		// convert to twips
-		$defaultRowHeight = (int) 20 * $defaultRowHeight;
-
-		$record   = 0x0225;	  // Record identifier
-		$length   = 0x0004;	  // Number of bytes to follow
-
-		$header   = pack("vv", $record, $length);
-		$data	 = pack("vv",  1, $defaultRowHeight);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write BIFF record DEFCOLWIDTH if COLINFO records are in use.
-	 */
-	private function _writeDefcol()
-	{
-		$defaultColWidth = 8;
-
-		$record   = 0x0055;	  // Record identifier
-		$length   = 0x0002;	  // Number of bytes to follow
-
-		$header = pack("vv", $record, $length);
-		$data = pack("v", $defaultColWidth);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write BIFF record COLINFO to define column widths
-	 *
-	 * Note: The SDK says the record length is 0x0B but Excel writes a 0x0C
-	 * length record.
-	 *
-	 * @param array $col_array This is the only parameter received and is composed of the following:
-	 *				0 => First formatted column,
-	 *				1 => Last formatted column,
-	 *				2 => Col width (8.43 is Excel default),
-	 *				3 => The optional XF format of the column,
-	 *				4 => Option flags.
-	 *				5 => Optional outline level
-	 */
-	private function _writeColinfo($col_array)
-	{
-		if (isset($col_array[0])) {
-			$colFirst = $col_array[0];
-		}
-		if (isset($col_array[1])) {
-			$colLast = $col_array[1];
-		}
-		if (isset($col_array[2])) {
-			$coldx = $col_array[2];
-		} else {
-			$coldx = 8.43;
-		}
-		if (isset($col_array[3])) {
-			$xfIndex = $col_array[3];
-		} else {
-			$xfIndex = 15;
-		}
-		if (isset($col_array[4])) {
-			$grbit = $col_array[4];
-		} else {
-			$grbit = 0;
-		}
-		if (isset($col_array[5])) {
-			$level = $col_array[5];
-		} else {
-			$level = 0;
-		}
-		$record   = 0x007D;		  // Record identifier
-		$length   = 0x000C;		  // Number of bytes to follow
-
-		$coldx   *= 256;			 // Convert to units of 1/256 of a char
-
-		$ixfe	 = $xfIndex;
-		$reserved = 0x0000;			// Reserved
-
-		$level = max(0, min($level, 7));
-		$grbit |= $level << 8;
-
-		$header   = pack("vv",	 $record, $length);
-		$data	 = pack("vvvvvv", $colFirst, $colLast, $coldx,
-								   $ixfe, $grbit, $reserved);
-		$this->_append($header.$data);
-	}
-
-	/**
-	 * Write BIFF record SELECTION.
-	 */
-	private function _writeSelection()
-	{
-		// look up the selected cell range
-		$selectedCells = $this->_phpSheet->getSelectedCells();
-		$selectedCells = PHPExcel_Cell::splitRange($this->_phpSheet->getSelectedCells());
-		$selectedCells = $selectedCells[0];
-		if (count($selectedCells) == 2) {
-			list($first, $last) = $selectedCells;
-		} else {
-			$first = $selectedCells[0];
-			$last  = $selectedCells[0];
-		}
-
-		list($colFirst, $rwFirst) = PHPExcel_Cell::coordinateFromString($first);
-		$colFirst = PHPExcel_Cell::columnIndexFromString($colFirst) - 1; // base 0 column index
-		--$rwFirst; // base 0 row index
-
-		list($colLast, $rwLast) = PHPExcel_Cell::coordinateFromString($last);
-		$colLast = PHPExcel_Cell::columnIndexFromString($colLast) - 1; // base 0 column index
-		--$rwLast; // base 0 row index
-
-		// make sure we are not out of bounds
-		$colFirst = min($colFirst, 255);
-		$colLast  = min($colLast,  255);
-
-		$rwFirst = min($rwFirst, 65535);
-		$rwLast  = min($rwLast,  65535);
-
-		$record   = 0x001D;				  // Record identifier
-		$length   = 0x000F;				  // Number of bytes to follow
-
-		$pnn	  = $this->_active_pane;	 // Pane position
-		$rwAct	= $rwFirst;				// Active row
-		$colAct   = $colFirst;			   // Active column
-		$irefAct  = 0;					   // Active cell ref
-		$cref	 = 1;					   // Number of refs
-
-		if (!isset($rwLast)) {
-			$rwLast   = $rwFirst;	   // Last  row in reference
-		}
-		if (!isset($colLast)) {
-			$colLast  = $colFirst;	  // Last  col in reference
-		}
-
-		// Swap last row/col for first row/col as necessary
-		if ($rwFirst > $rwLast) {
-			list($rwFirst, $rwLast) = array($rwLast, $rwFirst);
-		}
-
-		if ($colFirst > $colLast) {
-			list($colFirst, $colLast) = array($colLast, $colFirst);
-		}
-
-		$header   = pack("vv",		 $record, $length);
-		$data	 = pack("CvvvvvvCC",  $pnn, $rwAct, $colAct,
-									   $irefAct, $cref,
-									   $rwFirst, $rwLast,
-									   $colFirst, $colLast);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Store the MERGEDCELLS records for all ranges of merged cells
-	 */
-	private function _writeMergedCells()
-	{
-		$mergeCells = $this->_phpSheet->getMergeCells();
-		$countMergeCells = count($mergeCells);
-
-		if ($countMergeCells == 0) {
-			return;
-		}
-
-		// maximum allowed number of merged cells per record
-		$maxCountMergeCellsPerRecord = 1027;
-
-		// record identifier
-		$record = 0x00E5;
-
-		// counter for total number of merged cells treated so far by the writer
-		$i = 0;
-
-		// counter for number of merged cells written in record currently being written
-		$j = 0;
-
-		// initialize record data
-		$recordData = '';
-
-		// loop through the merged cells
-		foreach ($mergeCells as $mergeCell) {
-			++$i;
-			++$j;
-
-			// extract the row and column indexes
-			$range = PHPExcel_Cell::splitRange($mergeCell);
-			list($first, $last) = $range[0];
-			list($firstColumn, $firstRow) = PHPExcel_Cell::coordinateFromString($first);
-			list($lastColumn, $lastRow) = PHPExcel_Cell::coordinateFromString($last);
-
-			$recordData .= pack('vvvv', $firstRow - 1, $lastRow - 1, PHPExcel_Cell::columnIndexFromString($firstColumn) - 1, PHPExcel_Cell::columnIndexFromString($lastColumn) - 1);
-
-			// flush record if we have reached limit for number of merged cells, or reached final merged cell
-			if ($j == $maxCountMergeCellsPerRecord or $i == $countMergeCells) {
-				$recordData = pack('v', $j) . $recordData;
-				$length = strlen($recordData);
-				$header = pack('vv', $record, $length);
-				$this->_append($header . $recordData);
-
-				// initialize for next record, if any
-				$recordData = '';
-				$j = 0;
-			}
-		}
-	}
-
-	/**
-	 * Write SHEETLAYOUT record
-	 */
-	private function _writeSheetLayout()
-	{
-		if (!$this->_phpSheet->isTabColorSet()) {
-			return;
-		}
-
-		$recordData = pack(
-			'vvVVVvv'
-			, 0x0862
-			, 0x0000		// unused
-			, 0x00000000	// unused
-			, 0x00000000	// unused
-			, 0x00000014	// size of record data
-			, $this->_colors[$this->_phpSheet->getTabColor()->getRGB()]	// color index
-			, 0x0000		// unused
-		);
-
-		$length = strlen($recordData);
-
-		$record = 0x0862; // Record identifier
-		$header = pack('vv', $record, $length);
-		$this->_append($header . $recordData);
-	}
-
-	/**
-	 * Write SHEETPROTECTION
-	 */
-	private function _writeSheetProtection()
-	{
-		// record identifier
-		$record = 0x0867;
-
-		// prepare options
-		$options  =   (int) !$this->_phpSheet->getProtection()->getObjects()
-					| (int) !$this->_phpSheet->getProtection()->getScenarios()           << 1
-					| (int) !$this->_phpSheet->getProtection()->getFormatCells()         << 2
-					| (int) !$this->_phpSheet->getProtection()->getFormatColumns()       << 3
-					| (int) !$this->_phpSheet->getProtection()->getFormatRows()          << 4
-					| (int) !$this->_phpSheet->getProtection()->getInsertColumns()       << 5
-					| (int) !$this->_phpSheet->getProtection()->getInsertRows()          << 6
-					| (int) !$this->_phpSheet->getProtection()->getInsertHyperlinks()    << 7
-					| (int) !$this->_phpSheet->getProtection()->getDeleteColumns()       << 8
-					| (int) !$this->_phpSheet->getProtection()->getDeleteRows()          << 9
-					| (int) !$this->_phpSheet->getProtection()->getSelectLockedCells()   << 10
-					| (int) !$this->_phpSheet->getProtection()->getSort()                << 11
-					| (int) !$this->_phpSheet->getProtection()->getAutoFilter()          << 12
-					| (int) !$this->_phpSheet->getProtection()->getPivotTables()         << 13
-					| (int) !$this->_phpSheet->getProtection()->getSelectUnlockedCells() << 14 ;
-
-		// record data
-		$recordData = pack(
-			'vVVCVVvv'
-			, 0x0867		// repeated record identifier
-			, 0x0000		// not used
-			, 0x0000		// not used
-			, 0x00			// not used
-			, 0x01000200	// unknown data
-			, 0xFFFFFFFF	// unknown data
-			, $options		// options
-			, 0x0000		// not used
-		);
-
-		$length = strlen($recordData);
-		$header = pack('vv', $record, $length);
-
-		$this->_append($header . $recordData);
-	}
-
-	/**
-	 * Write BIFF record RANGEPROTECTION
-	 *
-	 * Openoffice.org's Documentaion of the Microsoft Excel File Format uses term RANGEPROTECTION for these records
-	 * Microsoft Office Excel 97-2007 Binary File Format Specification uses term FEAT for these records
-	 */
-	private function _writeRangeProtection()
-	{
-		foreach ($this->_phpSheet->getProtectedCells() as $range => $password) {
-			// number of ranges, e.g. 'A1:B3 C20:D25'
-			$cellRanges = explode(' ', $range);
-			$cref = count($cellRanges);
-
-			$recordData = pack(
-				'vvVVvCVvVv',
-				0x0868,
-				0x00,
-				0x0000,
-				0x0000,
-				0x02,
-				0x0,
-				0x0000,
-				$cref,
-				0x0000,
-				0x00
-			);
-
-			foreach ($cellRanges as $cellRange) {
-				$recordData .= $this->_writeBIFF8CellRangeAddressFixed($cellRange);
-			}
-
-			// the rgbFeat structure
-			$recordData .= pack(
-				'VV',
-				0x0000,
-				hexdec($password)
-			);
-
-			$recordData .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong('p' . md5($recordData));
-
-			$length = strlen($recordData);
-
-			$record = 0x0868;		// Record identifier
-			$header = pack("vv", $record, $length);
-			$this->_append($header . $recordData);
-		}
-	}
-
-	/**
-	 * Write BIFF record EXTERNCOUNT to indicate the number of external sheet
-	 * references in a worksheet.
-	 *
-	 * Excel only stores references to external sheets that are used in formulas.
-	 * For simplicity we store references to all the sheets in the workbook
-	 * regardless of whether they are used or not. This reduces the overall
-	 * complexity and eliminates the need for a two way dialogue between the formula
-	 * parser the worksheet objects.
-	 *
-	 * @param integer $count The number of external sheet references in this worksheet
-	 */
-	private function _writeExterncount($count)
-	{
-		$record = 0x0016;		  // Record identifier
-		$length = 0x0002;		  // Number of bytes to follow
-
-		$header = pack("vv", $record, $length);
-		$data   = pack("v",  $count);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Writes the Excel BIFF EXTERNSHEET record. These references are used by
-	 * formulas. A formula references a sheet name via an index. Since we store a
-	 * reference to all of the external worksheets the EXTERNSHEET index is the same
-	 * as the worksheet index.
-	 *
-	 * @param string $sheetname The name of a external worksheet
-	 */
-	private function _writeExternsheet($sheetname)
-	{
-		$record	= 0x0017;		 // Record identifier
-
-		// References to the current sheet are encoded differently to references to
-		// external sheets.
-		//
-		if ($this->_phpSheet->getTitle() == $sheetname) {
-			$sheetname = '';
-			$length	= 0x02;  // The following 2 bytes
-			$cch	   = 1;	 // The following byte
-			$rgch	  = 0x02;  // Self reference
-		} else {
-			$length	= 0x02 + strlen($sheetname);
-			$cch	   = strlen($sheetname);
-			$rgch	  = 0x03;  // Reference to a sheet in the current workbook
-		}
-
-		$header = pack("vv",  $record, $length);
-		$data   = pack("CC", $cch, $rgch);
-		$this->_append($header . $data . $sheetname);
-	}
-
-	/**
-	 * Writes the Excel BIFF PANE record.
-	 * The panes can either be frozen or thawed (unfrozen).
-	 * Frozen panes are specified in terms of an integer number of rows and columns.
-	 * Thawed panes are specified in terms of Excel's units for rows and columns.
-	 */
-	private function _writePanes()
-	{
-		$panes = array();
-		if ($freezePane = $this->_phpSheet->getFreezePane()) {
-			list($column, $row) = PHPExcel_Cell::coordinateFromString($freezePane);
-			$panes[0] = $row - 1;
-			$panes[1] = PHPExcel_Cell::columnIndexFromString($column) - 1;
-		} else {
-			// thaw panes
-			return;
-		}
-
-		$y	   = isset($panes[0]) ? $panes[0] : null;
-		$x	   = isset($panes[1]) ? $panes[1] : null;
-		$rwTop   = isset($panes[2]) ? $panes[2] : null;
-		$colLeft = isset($panes[3]) ? $panes[3] : null;
-		if (count($panes) > 4) { // if Active pane was received
-			$pnnAct = $panes[4];
-		} else {
-			$pnnAct = null;
-		}
-		$record  = 0x0041;	   // Record identifier
-		$length  = 0x000A;	   // Number of bytes to follow
-
-		// Code specific to frozen or thawed panes.
-		if ($this->_phpSheet->getFreezePane()) {
-			// Set default values for $rwTop and $colLeft
-			if (!isset($rwTop)) {
-				$rwTop   = $y;
-			}
-			if (!isset($colLeft)) {
-				$colLeft = $x;
-			}
-		} else {
-			// Set default values for $rwTop and $colLeft
-			if (!isset($rwTop)) {
-				$rwTop   = 0;
-			}
-			if (!isset($colLeft)) {
-				$colLeft = 0;
-			}
-
-			// Convert Excel's row and column units to the internal units.
-			// The default row height is 12.75
-			// The default column width is 8.43
-			// The following slope and intersection values were interpolated.
-			//
-			$y = 20*$y + 255;
-			$x = 113.879*$x + 390;
-		}
-
-
-		// Determine which pane should be active. There is also the undocumented
-		// option to override this should it be necessary: may be removed later.
-		//
-		if (!isset($pnnAct)) {
-			if ($x != 0 && $y != 0) {
-				$pnnAct = 0; // Bottom right
-			}
-			if ($x != 0 && $y == 0) {
-				$pnnAct = 1; // Top right
-			}
-			if ($x == 0 && $y != 0) {
-				$pnnAct = 2; // Bottom left
-			}
-			if ($x == 0 && $y == 0) {
-				$pnnAct = 3; // Top left
-			}
-		}
-
-		$this->_active_pane = $pnnAct; // Used in _writeSelection
-
-		$header	 = pack("vv",	$record, $length);
-		$data	   = pack("vvvvv", $x, $y, $rwTop, $colLeft, $pnnAct);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Store the page setup SETUP BIFF record.
-	 */
-	private function _writeSetup()
-	{
-		$record	   = 0x00A1;				  // Record identifier
-		$length	   = 0x0022;				  // Number of bytes to follow
-
-		$iPaperSize   = $this->_phpSheet->getPageSetup()->getPaperSize();	// Paper size
-
-		$iScale = $this->_phpSheet->getPageSetup()->getScale() ?
-			$this->_phpSheet->getPageSetup()->getScale() : 100;   // Print scaling factor
-
-		$iPageStart   = 0x01;				 // Starting page number
-		$iFitWidth	= (int) $this->_phpSheet->getPageSetup()->getFitToWidth();	// Fit to number of pages wide
-		$iFitHeight	= (int) $this->_phpSheet->getPageSetup()->getFitToHeight();	// Fit to number of pages high
-		$grbit		= 0x00;				 // Option flags
-		$iRes		 = 0x0258;			   // Print resolution
-		$iVRes		= 0x0258;			   // Vertical print resolution
-
-		$numHdr	   = $this->_phpSheet->getPageMargins()->getHeader();  // Header Margin
-
-		$numFtr	   = $this->_phpSheet->getPageMargins()->getFooter();   // Footer Margin
-		$iCopies	  = 0x01;				 // Number of copies
-
-		$fLeftToRight = 0x0;					 // Print over then down
-
-		// Page orientation
-		$fLandscape = ($this->_phpSheet->getPageSetup()->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ?
-			0x0 : 0x1;
-
-		$fNoPls	   = 0x0;					 // Setup not read from printer
-		$fNoColor	 = 0x0;					 // Print black and white
-		$fDraft	   = 0x0;					 // Print draft quality
-		$fNotes	   = 0x0;					 // Print notes
-		$fNoOrient	= 0x0;					 // Orientation not set
-		$fUsePage	 = 0x0;					 // Use custom starting page
-
-		$grbit		   = $fLeftToRight;
-		$grbit		  |= $fLandscape	<< 1;
-		$grbit		  |= $fNoPls		<< 2;
-		$grbit		  |= $fNoColor	  << 3;
-		$grbit		  |= $fDraft		<< 4;
-		$grbit		  |= $fNotes		<< 5;
-		$grbit		  |= $fNoOrient	 << 6;
-		$grbit		  |= $fUsePage	  << 7;
-
-		$numHdr = pack("d", $numHdr);
-		$numFtr = pack("d", $numFtr);
-		if (self::getByteOrder()) { // if it's Big Endian
-			$numHdr = strrev($numHdr);
-			$numFtr = strrev($numFtr);
-		}
-
-		$header = pack("vv", $record, $length);
-		$data1  = pack("vvvvvvvv", $iPaperSize,
-								   $iScale,
-								   $iPageStart,
-								   $iFitWidth,
-								   $iFitHeight,
-								   $grbit,
-								   $iRes,
-								   $iVRes);
-		$data2  = $numHdr.$numFtr;
-		$data3  = pack("v", $iCopies);
-		$this->_append($header . $data1 . $data2 . $data3);
-	}
-
-	/**
-	 * Store the header caption BIFF record.
-	 */
-	private function _writeHeader()
-	{
-		$record  = 0x0014;			   // Record identifier
-
-		/* removing for now
-		// need to fix character count (multibyte!)
-		if (strlen($this->_phpSheet->getHeaderFooter()->getOddHeader()) <= 255) {
-			$str	  = $this->_phpSheet->getHeaderFooter()->getOddHeader();	   // header string
-		} else {
-			$str = '';
-		}
-		*/
-
-		$recordData = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($this->_phpSheet->getHeaderFooter()->getOddHeader());
-		$length = strlen($recordData);
-
-		$header   = pack("vv", $record, $length);
-
-		$this->_append($header . $recordData);
-	}
-
-	/**
-	 * Store the footer caption BIFF record.
-	 */
-	private function _writeFooter()
-	{
-		$record  = 0x0015;			   // Record identifier
-
-		/* removing for now
-		// need to fix character count (multibyte!)
-		if (strlen($this->_phpSheet->getHeaderFooter()->getOddFooter()) <= 255) {
-			$str = $this->_phpSheet->getHeaderFooter()->getOddFooter();
-		} else {
-			$str = '';
-		}
-		*/
-
-		$recordData = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($this->_phpSheet->getHeaderFooter()->getOddFooter());
-		$length = strlen($recordData);
-
-		$header	= pack("vv", $record, $length);
-
-		$this->_append($header . $recordData);
-	}
-
-	/**
-	 * Store the horizontal centering HCENTER BIFF record.
-	 *
-	 * @access private
-	 */
-	private function _writeHcenter()
-	{
-		$record   = 0x0083;			  // Record identifier
-		$length   = 0x0002;			  // Bytes to follow
-
-		$fHCenter = $this->_phpSheet->getPageSetup()->getHorizontalCentered() ? 1 : 0;	 // Horizontal centering
-
-		$header	= pack("vv", $record, $length);
-		$data	  = pack("v",  $fHCenter);
-
-		$this->_append($header.$data);
-	}
-
-	/**
-	 * Store the vertical centering VCENTER BIFF record.
-	 */
-	private function _writeVcenter()
-	{
-		$record   = 0x0084;			  // Record identifier
-		$length   = 0x0002;			  // Bytes to follow
-
-		$fVCenter = $this->_phpSheet->getPageSetup()->getVerticalCentered() ? 1 : 0;	 // Horizontal centering
-
-		$header	= pack("vv", $record, $length);
-		$data	  = pack("v",  $fVCenter);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Store the LEFTMARGIN BIFF record.
-	 */
-	private function _writeMarginLeft()
-	{
-		$record  = 0x0026;				   // Record identifier
-		$length  = 0x0008;				   // Bytes to follow
-
-		$margin  = $this->_phpSheet->getPageMargins()->getLeft();	 // Margin in inches
-
-		$header	= pack("vv",  $record, $length);
-		$data	  = pack("d",   $margin);
-		if (self::getByteOrder()) { // if it's Big Endian
-			$data = strrev($data);
-		}
-
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Store the RIGHTMARGIN BIFF record.
-	 */
-	private function _writeMarginRight()
-	{
-		$record  = 0x0027;				   // Record identifier
-		$length  = 0x0008;				   // Bytes to follow
-
-		$margin  = $this->_phpSheet->getPageMargins()->getRight();	 // Margin in inches
-
-		$header	= pack("vv",  $record, $length);
-		$data	  = pack("d",   $margin);
-		if (self::getByteOrder()) { // if it's Big Endian
-			$data = strrev($data);
-		}
-
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Store the TOPMARGIN BIFF record.
-	 */
-	private function _writeMarginTop()
-	{
-		$record  = 0x0028;				   // Record identifier
-		$length  = 0x0008;				   // Bytes to follow
-
-		$margin  = $this->_phpSheet->getPageMargins()->getTop();	 // Margin in inches
-
-		$header	= pack("vv",  $record, $length);
-		$data	  = pack("d",   $margin);
-		if (self::getByteOrder()) { // if it's Big Endian
-			$data = strrev($data);
-		}
-
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Store the BOTTOMMARGIN BIFF record.
-	 */
-	private function _writeMarginBottom()
-	{
-		$record  = 0x0029;				   // Record identifier
-		$length  = 0x0008;				   // Bytes to follow
-
-		$margin  = $this->_phpSheet->getPageMargins()->getBottom();	 // Margin in inches
-
-		$header	= pack("vv",  $record, $length);
-		$data	  = pack("d",   $margin);
-		if (self::getByteOrder()) { // if it's Big Endian
-			$data = strrev($data);
-		}
-
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write the PRINTHEADERS BIFF record.
-	 */
-	private function _writePrintHeaders()
-	{
-		$record	  = 0x002a;				   // Record identifier
-		$length	  = 0x0002;				   // Bytes to follow
-
-		$fPrintRwCol = $this->_print_headers;	 // Boolean flag
-
-		$header	  = pack("vv", $record, $length);
-		$data		= pack("v", $fPrintRwCol);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write the PRINTGRIDLINES BIFF record. Must be used in conjunction with the
-	 * GRIDSET record.
-	 */
-	private function _writePrintGridlines()
-	{
-		$record	  = 0x002b;					// Record identifier
-		$length	  = 0x0002;					// Bytes to follow
-
-		$fPrintGrid  = $this->_phpSheet->getPrintGridlines() ? 1 : 0;	// Boolean flag
-
-		$header	  = pack("vv", $record, $length);
-		$data	  = pack("v", $fPrintGrid);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write the GRIDSET BIFF record. Must be used in conjunction with the
-	 * PRINTGRIDLINES record.
-	 */
-	private function _writeGridset()
-	{
-		$record	  = 0x0082;						// Record identifier
-		$length	  = 0x0002;						// Bytes to follow
-
-		$fGridSet	= !$this->_phpSheet->getPrintGridlines();	 // Boolean flag
-
-		$header	  = pack("vv",  $record, $length);
-		$data		= pack("v",   $fGridSet);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write the AUTOFILTERINFO BIFF record. This is used to configure the number of autofilter select used in the sheet.
-	 */
-	private function _writeAutoFilterInfo(){
-		$record	  = 0x009D;						// Record identifier
-		$length	  = 0x0002;						// Bytes to follow
-
-		$rangeBounds = PHPExcel_Cell::rangeBoundaries($this->_phpSheet->getAutoFilter()->getRange());
-		$iNumFilters = 1 + $rangeBounds[1][0] - $rangeBounds[0][0];
-
-		$header   = pack("vv", $record, $length);
-		$data     = pack("v",  $iNumFilters);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write the GUTS BIFF record. This is used to configure the gutter margins
-	 * where Excel outline symbols are displayed. The visibility of the gutters is
-	 * controlled by a flag in WSBOOL.
-	 *
-	 * @see _writeWsbool()
-	 */
-	private  function _writeGuts()
-	{
-		$record	  = 0x0080;   // Record identifier
-		$length	  = 0x0008;   // Bytes to follow
-
-		$dxRwGut	 = 0x0000;   // Size of row gutter
-		$dxColGut	= 0x0000;   // Size of col gutter
-
-		// determine maximum row outline level
-		$maxRowOutlineLevel = 0;
-		foreach ($this->_phpSheet->getRowDimensions() as $rowDimension) {
-			$maxRowOutlineLevel = max($maxRowOutlineLevel, $rowDimension->getOutlineLevel());
-		}
-
-		$col_level   = 0;
-
-		// Calculate the maximum column outline level. The equivalent calculation
-		// for the row outline level is carried out in _writeRow().
-		$colcount = count($this->_colinfo);
-		for ($i = 0; $i < $colcount; ++$i) {
-			$col_level = max($this->_colinfo[$i][5], $col_level);
-		}
-
-		// Set the limits for the outline levels (0 <= x <= 7).
-		$col_level = max(0, min($col_level, 7));
-
-		// The displayed level is one greater than the max outline levels
-		if ($maxRowOutlineLevel) {
-			++$maxRowOutlineLevel;
-		}
-		if ($col_level) {
-			++$col_level;
-		}
-
-		$header	  = pack("vv",   $record, $length);
-		$data		= pack("vvvv", $dxRwGut, $dxColGut, $maxRowOutlineLevel, $col_level);
-
-		$this->_append($header.$data);
-	}
-
-	/**
-	 * Write the WSBOOL BIFF record, mainly for fit-to-page. Used in conjunction
-	 * with the SETUP record.
-	 */
-	private function _writeWsbool()
-	{
-		$record	  = 0x0081;   // Record identifier
-		$length	  = 0x0002;   // Bytes to follow
-		$grbit	   = 0x0000;
-
-		// The only option that is of interest is the flag for fit to page. So we
-		// set all the options in one go.
-		//
-		// Set the option flags
-		$grbit |= 0x0001;						   // Auto page breaks visible
-		if ($this->_outline_style) {
-			$grbit |= 0x0020; // Auto outline styles
-		}
-		if ($this->_phpSheet->getShowSummaryBelow()) {
-			$grbit |= 0x0040; // Outline summary below
-		}
-		if ($this->_phpSheet->getShowSummaryRight()) {
-			$grbit |= 0x0080; // Outline summary right
-		}
-		if ($this->_phpSheet->getPageSetup()->getFitToPage()) {
-			$grbit |= 0x0100; // Page setup fit to page
-		}
-		if ($this->_outline_on) {
-			$grbit |= 0x0400; // Outline symbols displayed
-		}
-
-		$header	  = pack("vv", $record, $length);
-		$data		= pack("v",  $grbit);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write the HORIZONTALPAGEBREAKS and VERTICALPAGEBREAKS BIFF records.
-	 */
-	private function _writeBreaks()
-	{
-		// initialize
-		$vbreaks = array();
-		$hbreaks = array();
-
-		foreach ($this->_phpSheet->getBreaks() as $cell => $breakType) {
-			// Fetch coordinates
-			$coordinates = PHPExcel_Cell::coordinateFromString($cell);
-
-			// Decide what to do by the type of break
-			switch ($breakType) {
-				case PHPExcel_Worksheet::BREAK_COLUMN:
-					// Add to list of vertical breaks
-					$vbreaks[] = PHPExcel_Cell::columnIndexFromString($coordinates[0]) - 1;
-					break;
-
-				case PHPExcel_Worksheet::BREAK_ROW:
-					// Add to list of horizontal breaks
-					$hbreaks[] = $coordinates[1];
-					break;
-
-				case PHPExcel_Worksheet::BREAK_NONE:
-				default:
-					// Nothing to do
-					break;
-			}
-		}
-
-		//horizontal page breaks
-		if (!empty($hbreaks)) {
-
-			// Sort and filter array of page breaks
-			sort($hbreaks, SORT_NUMERIC);
-			if ($hbreaks[0] == 0) { // don't use first break if it's 0
-				array_shift($hbreaks);
-			}
-
-			$record  = 0x001b;			   // Record identifier
-			$cbrk	= count($hbreaks);	   // Number of page breaks
-			$length  = 2 + 6 * $cbrk;	  // Bytes to follow
-
-			$header  = pack("vv", $record, $length);
-			$data	= pack("v",  $cbrk);
-
-			// Append each page break
-			foreach ($hbreaks as $hbreak) {
-				$data .= pack("vvv", $hbreak, 0x0000, 0x00ff);
-			}
-
-			$this->_append($header . $data);
-		}
-
-		// vertical page breaks
-		if (!empty($vbreaks)) {
-
-			// 1000 vertical pagebreaks appears to be an internal Excel 5 limit.
-			// It is slightly higher in Excel 97/200, approx. 1026
-			$vbreaks = array_slice($vbreaks, 0, 1000);
-
-			// Sort and filter array of page breaks
-			sort($vbreaks, SORT_NUMERIC);
-			if ($vbreaks[0] == 0) { // don't use first break if it's 0
-				array_shift($vbreaks);
-			}
-
-			$record  = 0x001a;			   // Record identifier
-			$cbrk	= count($vbreaks);	   // Number of page breaks
-			$length  = 2 + 6 * $cbrk;	  // Bytes to follow
-
-			$header  = pack("vv",  $record, $length);
-			$data	= pack("v",   $cbrk);
-
-			// Append each page break
-			foreach ($vbreaks as $vbreak) {
-				$data .= pack("vvv", $vbreak, 0x0000, 0xffff);
-			}
-
-			$this->_append($header . $data);
-		}
-	}
-
-	/**
-	 * Set the Biff PROTECT record to indicate that the worksheet is protected.
-	 */
-	private function _writeProtect()
-	{
-		// Exit unless sheet protection has been specified
-		if (!$this->_phpSheet->getProtection()->getSheet()) {
-			return;
-		}
-
-		$record	  = 0x0012;			 // Record identifier
-		$length	  = 0x0002;			 // Bytes to follow
-
-		$fLock	  = 1;	// Worksheet is protected
-
-		$header	  = pack("vv", $record, $length);
-		$data	  = pack("v",  $fLock);
-
-		$this->_append($header.$data);
-	}
-
-	/**
-	 * Write SCENPROTECT
-	 */
-	private function _writeScenProtect()
-	{
-		// Exit if sheet protection is not active
-		if (!$this->_phpSheet->getProtection()->getSheet()) {
-			return;
-		}
-
-		// Exit if scenarios are not protected
-		if (!$this->_phpSheet->getProtection()->getScenarios()) {
-			return;
-		}
-
-		$record = 0x00DD; // Record identifier
-		$length = 0x0002; // Bytes to follow
-
-		$header = pack('vv', $record, $length);
-		$data = pack('v', 1);
-
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write OBJECTPROTECT
-	 */
-	private function _writeObjectProtect()
-	{
-		// Exit if sheet protection is not active
-		if (!$this->_phpSheet->getProtection()->getSheet()) {
-			return;
-		}
-
-		// Exit if objects are not protected
-		if (!$this->_phpSheet->getProtection()->getObjects()) {
-			return;
-		}
-
-		$record = 0x0063; // Record identifier
-		$length = 0x0002; // Bytes to follow
-
-		$header = pack('vv', $record, $length);
-		$data = pack('v', 1);
-
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write the worksheet PASSWORD record.
-	 */
-	private function _writePassword()
-	{
-		// Exit unless sheet protection and password have been specified
-		if (!$this->_phpSheet->getProtection()->getSheet() || !$this->_phpSheet->getProtection()->getPassword()) {
-			return;
-		}
-
-		$record	  = 0x0013;			   // Record identifier
-		$length	  = 0x0002;			   // Bytes to follow
-
-		$wPassword   = hexdec($this->_phpSheet->getProtection()->getPassword());	 // Encoded password
-
-		$header	  = pack("vv", $record, $length);
-		$data		= pack("v",  $wPassword);
-
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Insert a 24bit bitmap image in a worksheet.
-	 *
-	 * @access public
-	 * @param integer $row	 The row we are going to insert the bitmap into
-	 * @param integer $col	 The column we are going to insert the bitmap into
-	 * @param mixed   $bitmap  The bitmap filename or GD-image resource
-	 * @param integer $x	   The horizontal position (offset) of the image inside the cell.
-	 * @param integer $y	   The vertical position (offset) of the image inside the cell.
-	 * @param float   $scale_x The horizontal scale
-	 * @param float   $scale_y The vertical scale
-	 */
-	function insertBitmap($row, $col, $bitmap, $x = 0, $y = 0, $scale_x = 1, $scale_y = 1)
-	{
-		$bitmap_array = (is_resource($bitmap) ? $this->_processBitmapGd($bitmap) : $this->_processBitmap($bitmap));
-		list($width, $height, $size, $data) = $bitmap_array; //$this->_processBitmap($bitmap);
-
-		// Scale the frame of the image.
-		$width  *= $scale_x;
-		$height *= $scale_y;
-
-		// Calculate the vertices of the image and write the OBJ record
-		$this->_positionImage($col, $row, $x, $y, $width, $height);
-
-		// Write the IMDATA record to store the bitmap data
-		$record	  = 0x007f;
-		$length	  = 8 + $size;
-		$cf		  = 0x09;
-		$env		 = 0x01;
-		$lcb		 = $size;
-
-		$header	  = pack("vvvvV", $record, $length, $cf, $env, $lcb);
-		$this->_append($header.$data);
-	}
-
-	/**
-	 * Calculate the vertices that define the position of the image as required by
-	 * the OBJ record.
-	 *
-	 *		 +------------+------------+
-	 *		 |	 A	  |	  B	 |
-	 *   +-----+------------+------------+
-	 *   |	 |(x1,y1)	 |			|
-	 *   |  1  |(A1)._______|______	  |
-	 *   |	 |	|			  |	 |
-	 *   |	 |	|			  |	 |
-	 *   +-----+----|	BITMAP	|-----+
-	 *   |	 |	|			  |	 |
-	 *   |  2  |	|______________.	 |
-	 *   |	 |			|		(B2)|
-	 *   |	 |			|	 (x2,y2)|
-	 *   +---- +------------+------------+
-	 *
-	 * Example of a bitmap that covers some of the area from cell A1 to cell B2.
-	 *
-	 * Based on the width and height of the bitmap we need to calculate 8 vars:
-	 *	 $col_start, $row_start, $col_end, $row_end, $x1, $y1, $x2, $y2.
-	 * The width and height of the cells are also variable and have to be taken into
-	 * account.
-	 * The values of $col_start and $row_start are passed in from the calling
-	 * function. The values of $col_end and $row_end are calculated by subtracting
-	 * the width and height of the bitmap from the width and height of the
-	 * underlying cells.
-	 * The vertices are expressed as a percentage of the underlying cell width as
-	 * follows (rhs values are in pixels):
-	 *
-	 *	   x1 = X / W *1024
-	 *	   y1 = Y / H *256
-	 *	   x2 = (X-1) / W *1024
-	 *	   y2 = (Y-1) / H *256
-	 *
-	 *	   Where:  X is distance from the left side of the underlying cell
-	 *			   Y is distance from the top of the underlying cell
-	 *			   W is the width of the cell
-	 *			   H is the height of the cell
-	 * The SDK incorrectly states that the height should be expressed as a
-	 *		percentage of 1024.
-	 *
-	 * @access private
-	 * @param integer $col_start Col containing upper left corner of object
-	 * @param integer $row_start Row containing top left corner of object
-	 * @param integer $x1		Distance to left side of object
-	 * @param integer $y1		Distance to top of object
-	 * @param integer $width	 Width of image frame
-	 * @param integer $height	Height of image frame
-	 */
-	function _positionImage($col_start, $row_start, $x1, $y1, $width, $height)
-	{
-		// Initialise end cell to the same as the start cell
-		$col_end	= $col_start;  // Col containing lower right corner of object
-		$row_end	= $row_start;  // Row containing bottom right corner of object
-
-		// Zero the specified offset if greater than the cell dimensions
-		if ($x1 >= PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_start))) {
-			$x1 = 0;
-		}
-		if ($y1 >= PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_start + 1)) {
-			$y1 = 0;
-		}
-
-		$width	  = $width  + $x1 -1;
-		$height	 = $height + $y1 -1;
-
-		// Subtract the underlying cell widths to find the end cell of the image
-		while ($width >= PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_end))) {
-			$width -= PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_end));
-			++$col_end;
-		}
-
-		// Subtract the underlying cell heights to find the end cell of the image
-		while ($height >= PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_end + 1)) {
-			$height -= PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_end + 1);
-			++$row_end;
-		}
-
-		// Bitmap isn't allowed to start or finish in a hidden cell, i.e. a cell
-		// with zero eight or width.
-		//
-		if (PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_start)) == 0) {
-			return;
-		}
-		if (PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_end))   == 0) {
-			return;
-		}
-		if (PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_start + 1) == 0) {
-			return;
-		}
-		if (PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_end + 1)   == 0) {
-			return;
-		}
-
-		// Convert the pixel values to the percentage value expected by Excel
-		$x1 = $x1	 / PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_start))   * 1024;
-		$y1 = $y1	 / PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_start + 1)   *  256;
-		$x2 = $width  / PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_end))	 * 1024; // Distance to right side of object
-		$y2 = $height / PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_end + 1)	 *  256; // Distance to bottom of object
-
-		$this->_writeObjPicture($col_start, $x1,
-								 $row_start, $y1,
-								 $col_end, $x2,
-								 $row_end, $y2);
-	}
-
-	/**
-	 * Store the OBJ record that precedes an IMDATA record. This could be generalise
-	 * to support other Excel objects.
-	 *
-	 * @param integer $colL Column containing upper left corner of object
-	 * @param integer $dxL  Distance from left side of cell
-	 * @param integer $rwT  Row containing top left corner of object
-	 * @param integer $dyT  Distance from top of cell
-	 * @param integer $colR Column containing lower right corner of object
-	 * @param integer $dxR  Distance from right of cell
-	 * @param integer $rwB  Row containing bottom right corner of object
-	 * @param integer $dyB  Distance from bottom of cell
-	 */
-	private function _writeObjPicture($colL,$dxL,$rwT,$dyT,$colR,$dxR,$rwB,$dyB)
-	{
-		$record	  = 0x005d;   // Record identifier
-		$length	  = 0x003c;   // Bytes to follow
-
-		$cObj		= 0x0001;   // Count of objects in file (set to 1)
-		$OT		  = 0x0008;   // Object type. 8 = Picture
-		$id		  = 0x0001;   // Object ID
-		$grbit	   = 0x0614;   // Option flags
-
-		$cbMacro	 = 0x0000;   // Length of FMLA structure
-		$Reserved1   = 0x0000;   // Reserved
-		$Reserved2   = 0x0000;   // Reserved
-
-		$icvBack	 = 0x09;	 // Background colour
-		$icvFore	 = 0x09;	 // Foreground colour
-		$fls		 = 0x00;	 // Fill pattern
-		$fAuto	   = 0x00;	 // Automatic fill
-		$icv		 = 0x08;	 // Line colour
-		$lns		 = 0xff;	 // Line style
-		$lnw		 = 0x01;	 // Line weight
-		$fAutoB	  = 0x00;	 // Automatic border
-		$frs		 = 0x0000;   // Frame style
-		$cf		  = 0x0009;   // Image format, 9 = bitmap
-		$Reserved3   = 0x0000;   // Reserved
-		$cbPictFmla  = 0x0000;   // Length of FMLA structure
-		$Reserved4   = 0x0000;   // Reserved
-		$grbit2	  = 0x0001;   // Option flags
-		$Reserved5   = 0x0000;   // Reserved
-
-
-		$header	  = pack("vv", $record, $length);
-		$data		= pack("V", $cObj);
-		$data	   .= pack("v", $OT);
-		$data	   .= pack("v", $id);
-		$data	   .= pack("v", $grbit);
-		$data	   .= pack("v", $colL);
-		$data	   .= pack("v", $dxL);
-		$data	   .= pack("v", $rwT);
-		$data	   .= pack("v", $dyT);
-		$data	   .= pack("v", $colR);
-		$data	   .= pack("v", $dxR);
-		$data	   .= pack("v", $rwB);
-		$data	   .= pack("v", $dyB);
-		$data	   .= pack("v", $cbMacro);
-		$data	   .= pack("V", $Reserved1);
-		$data	   .= pack("v", $Reserved2);
-		$data	   .= pack("C", $icvBack);
-		$data	   .= pack("C", $icvFore);
-		$data	   .= pack("C", $fls);
-		$data	   .= pack("C", $fAuto);
-		$data	   .= pack("C", $icv);
-		$data	   .= pack("C", $lns);
-		$data	   .= pack("C", $lnw);
-		$data	   .= pack("C", $fAutoB);
-		$data	   .= pack("v", $frs);
-		$data	   .= pack("V", $cf);
-		$data	   .= pack("v", $Reserved3);
-		$data	   .= pack("v", $cbPictFmla);
-		$data	   .= pack("v", $Reserved4);
-		$data	   .= pack("v", $grbit2);
-		$data	   .= pack("V", $Reserved5);
-
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Convert a GD-image into the internal format.
-	 *
-	 * @access private
-	 * @param resource $image The image to process
-	 * @return array Array with data and properties of the bitmap
-	 */
-	function _processBitmapGd($image) {
-		$width = imagesx($image);
-		$height = imagesy($image);
-
-		$data = pack("Vvvvv", 0x000c, $width, $height, 0x01, 0x18);
-		for ($j=$height; $j--; ) {
-			for ($i=0; $i < $width; ++$i) {
-				$color = imagecolorsforindex($image, imagecolorat($image, $i, $j));
-				foreach (array("red", "green", "blue") as $key) {
-					$color[$key] = $color[$key] + round((255 - $color[$key]) * $color["alpha"] / 127);
-				}
-				$data .= chr($color["blue"]) . chr($color["green"]) . chr($color["red"]);
-			}
-			if (3*$width % 4) {
-				$data .= str_repeat("\x00", 4 - 3*$width % 4);
-			}
-		}
-
-		return array($width, $height, strlen($data), $data);
-	}
-
-	/**
-	 * Convert a 24 bit bitmap into the modified internal format used by Windows.
-	 * This is described in BITMAPCOREHEADER and BITMAPCOREINFO structures in the
-	 * MSDN library.
-	 *
-	 * @access private
-	 * @param string $bitmap The bitmap to process
-	 * @return array Array with data and properties of the bitmap
-	 */
-	function _processBitmap($bitmap)
-	{
-		// Open file.
-		$bmp_fd = @fopen($bitmap,"rb");
-		if (!$bmp_fd) {
-			throw new PHPExcel_Writer_Exception("Couldn't import $bitmap");
-		}
-
-		// Slurp the file into a string.
-		$data = fread($bmp_fd, filesize($bitmap));
-
-		// Check that the file is big enough to be a bitmap.
-		if (strlen($data) <= 0x36) {
-			throw new PHPExcel_Writer_Exception("$bitmap doesn't contain enough data.\n");
-		}
-
-		// The first 2 bytes are used to identify the bitmap.
-		$identity = unpack("A2ident", $data);
-		if ($identity['ident'] != "BM") {
-			throw new PHPExcel_Writer_Exception("$bitmap doesn't appear to be a valid bitmap image.\n");
-		}
-
-		// Remove bitmap data: ID.
-		$data = substr($data, 2);
-
-		// Read and remove the bitmap size. This is more reliable than reading
-		// the data size at offset 0x22.
-		//
-		$size_array   = unpack("Vsa", substr($data, 0, 4));
-		$size   = $size_array['sa'];
-		$data   = substr($data, 4);
-		$size  -= 0x36; // Subtract size of bitmap header.
-		$size  += 0x0C; // Add size of BIFF header.
-
-		// Remove bitmap data: reserved, offset, header length.
-		$data = substr($data, 12);
-
-		// Read and remove the bitmap width and height. Verify the sizes.
-		$width_and_height = unpack("V2", substr($data, 0, 8));
-		$width  = $width_and_height[1];
-		$height = $width_and_height[2];
-		$data   = substr($data, 8);
-		if ($width > 0xFFFF) {
-			throw new PHPExcel_Writer_Exception("$bitmap: largest image width supported is 65k.\n");
-		}
-		if ($height > 0xFFFF) {
-			throw new PHPExcel_Writer_Exception("$bitmap: largest image height supported is 65k.\n");
-		}
-
-		// Read and remove the bitmap planes and bpp data. Verify them.
-		$planes_and_bitcount = unpack("v2", substr($data, 0, 4));
-		$data = substr($data, 4);
-		if ($planes_and_bitcount[2] != 24) { // Bitcount
-			throw new PHPExcel_Writer_Exception("$bitmap isn't a 24bit true color bitmap.\n");
-		}
-		if ($planes_and_bitcount[1] != 1) {
-			throw new PHPExcel_Writer_Exception("$bitmap: only 1 plane supported in bitmap image.\n");
-		}
-
-		// Read and remove the bitmap compression. Verify compression.
-		$compression = unpack("Vcomp", substr($data, 0, 4));
-		$data = substr($data, 4);
-
-		//$compression = 0;
-		if ($compression['comp'] != 0) {
-			throw new PHPExcel_Writer_Exception("$bitmap: compression not supported in bitmap image.\n");
-		}
-
-		// Remove bitmap data: data size, hres, vres, colours, imp. colours.
-		$data = substr($data, 20);
-
-		// Add the BITMAPCOREHEADER data
-		$header  = pack("Vvvvv", 0x000c, $width, $height, 0x01, 0x18);
-		$data	= $header . $data;
-
-		return (array($width, $height, $size, $data));
-	}
-
-	/**
-	 * Store the window zoom factor. This should be a reduced fraction but for
-	 * simplicity we will store all fractions with a numerator of 100.
-	 */
-	private function _writeZoom()
-	{
-		// If scale is 100 we don't need to write a record
-		if ($this->_phpSheet->getSheetView()->getZoomScale() == 100) {
-			return;
-		}
-
-		$record	  = 0x00A0;			   // Record identifier
-		$length	  = 0x0004;			   // Bytes to follow
-
-		$header	  = pack("vv", $record, $length);
-		$data		= pack("vv", $this->_phpSheet->getSheetView()->getZoomScale(), 100);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Get Escher object
-	 *
-	 * @return PHPExcel_Shared_Escher
-	 */
-	public function getEscher()
-	{
-		return $this->_escher;
-	}
-
-	/**
-	 * Set Escher object
-	 *
-	 * @param PHPExcel_Shared_Escher $pValue
-	 */
-	public function setEscher(PHPExcel_Shared_Escher $pValue = null)
-	{
-		$this->_escher = $pValue;
-	}
-
-	/**
-	 * Write MSODRAWING record
-	 */
-	private function _writeMsoDrawing()
-	{
-		// write the Escher stream if necessary
-		if (isset($this->_escher)) {
-			$writer = new PHPExcel_Writer_Excel5_Escher($this->_escher);
-			$data = $writer->close();
-			$spOffsets = $writer->getSpOffsets();
-			$spTypes = $writer->getSpTypes();
-			// write the neccesary MSODRAWING, OBJ records
-
-			// split the Escher stream
-			$spOffsets[0] = 0;
-			$nm = count($spOffsets) - 1; // number of shapes excluding first shape
-			for ($i = 1; $i <= $nm; ++$i) {
-				// MSODRAWING record
-				$record = 0x00EC;			// Record identifier
-
-				// chunk of Escher stream for one shape
-				$dataChunk = substr($data, $spOffsets[$i -1], $spOffsets[$i] - $spOffsets[$i - 1]);
-
-				$length = strlen($dataChunk);
-				$header = pack("vv", $record, $length);
-
-				$this->_append($header . $dataChunk);
-
-				// OBJ record
-				$record = 0x005D; // record identifier
-				$objData = '';
-
-				// ftCmo
-				if($spTypes[$i] == 0x00C9){
-					// Add ftCmo (common object data) subobject
-					$objData .=
-						pack('vvvvvVVV'
-								, 0x0015	// 0x0015 = ftCmo
-								, 0x0012	// length of ftCmo data
-								, 0x0014	// object type, 0x0014 = filter
-								, $i		// object id number, Excel seems to use 1-based index, local for the sheet
-								, 0x2101	// option flags, 0x2001 is what OpenOffice.org uses
-								, 0			// reserved
-								, 0			// reserved
-								, 0			// reserved
-						);
-
-					// Add ftSbs Scroll bar subobject
-					$objData .= pack('vv', 0x00C, 0x0014);
-					$objData .= pack('H*', '0000000000000000640001000A00000010000100');
-					// Add ftLbsData (List box data) subobject
-					$objData .= pack('vv', 0x0013, 0x1FEE);
-					$objData .= pack('H*', '00000000010001030000020008005700');
-				}
-				else {
-					// Add ftCmo (common object data) subobject
-					$objData .=
-						pack('vvvvvVVV'
-							, 0x0015	// 0x0015 = ftCmo
-							, 0x0012	// length of ftCmo data
-							, 0x0008	// object type, 0x0008 = picture
-							, $i		// object id number, Excel seems to use 1-based index, local for the sheet
-							, 0x6011	// option flags, 0x6011 is what OpenOffice.org uses
-							, 0			// reserved
-							, 0			// reserved
-							, 0			// reserved
-						);
-				}
-
-				// ftEnd
-				$objData .=
-					pack('vv'
-						, 0x0000	// 0x0000 = ftEnd
-						, 0x0000	// length of ftEnd data
-					);
-
-				$length = strlen($objData);
-				$header = pack('vv', $record, $length);
-				$this->_append($header . $objData);
-			}
-		}
-	}
-
-	/**
-	 * Store the DATAVALIDATIONS and DATAVALIDATION records.
-	 */
-	private function _writeDataValidity()
-	{
-		// Datavalidation collection
-		$dataValidationCollection = $this->_phpSheet->getDataValidationCollection();
-
-		// Write data validations?
-		if (!empty($dataValidationCollection)) {
-
-			// DATAVALIDATIONS record
-			$record = 0x01B2;	  // Record identifier
-			$length	  = 0x0012;	  // Bytes to follow
-
-			$grbit  = 0x0000;	   // Prompt box at cell, no cached validity data at DV records
-			$horPos	  = 0x00000000;  // Horizontal position of prompt box, if fixed position
-			$verPos	  = 0x00000000;  // Vertical position of prompt box, if fixed position
-			$objId  = 0xFFFFFFFF;  // Object identifier of drop down arrow object, or -1 if not visible
-
-			$header	  = pack('vv', $record, $length);
-			$data		= pack('vVVVV', $grbit, $horPos, $verPos, $objId,
-										 count($dataValidationCollection));
-			$this->_append($header.$data);
-
-			// DATAVALIDATION records
-			$record = 0x01BE;			  // Record identifier
-
-			foreach ($dataValidationCollection as $cellCoordinate => $dataValidation) {
-				// initialize record data
-				$data = '';
-
-				// options
-				$options = 0x00000000;
-
-				// data type
-				$type = $dataValidation->getType();
-				switch ($type) {
-					case PHPExcel_Cell_DataValidation::TYPE_NONE:		$type = 0x00;	break;
-					case PHPExcel_Cell_DataValidation::TYPE_WHOLE:		$type = 0x01;	break;
-					case PHPExcel_Cell_DataValidation::TYPE_DECIMAL:	$type = 0x02;	break;
-					case PHPExcel_Cell_DataValidation::TYPE_LIST:		$type = 0x03;	break;
-					case PHPExcel_Cell_DataValidation::TYPE_DATE:		$type = 0x04;	break;
-					case PHPExcel_Cell_DataValidation::TYPE_TIME:		$type = 0x05;	break;
-					case PHPExcel_Cell_DataValidation::TYPE_TEXTLENGTH:	$type = 0x06;	break;
-					case PHPExcel_Cell_DataValidation::TYPE_CUSTOM:		$type = 0x07;	break;
-				}
-				$options |= $type << 0;
-
-				// error style
-				$errorStyle = $dataValidation->getType();
-				switch ($errorStyle) {
-					case PHPExcel_Cell_DataValidation::STYLE_STOP:			$errorStyle = 0x00;		break;
-					case PHPExcel_Cell_DataValidation::STYLE_WARNING:		$errorStyle = 0x01;		break;
-					case PHPExcel_Cell_DataValidation::STYLE_INFORMATION:	$errorStyle = 0x02;		break;
-				}
-				$options |= $errorStyle << 4;
-
-				// explicit formula?
-				if ($type == 0x03 && preg_match('/^\".*\"$/', $dataValidation->getFormula1())) {
-					$options |= 0x01				<< 7;
-				}
-
-				// empty cells allowed
-				$options |= $dataValidation->getAllowBlank() << 8;
-
-				// show drop down
-				$options |= (!$dataValidation->getShowDropDown()) << 9;
-
-				// show input message
-				$options |= $dataValidation->getShowInputMessage() << 18;
-
-				// show error message
-				$options |= $dataValidation->getShowErrorMessage() << 19;
-
-				// condition operator
-				$operator = $dataValidation->getOperator();
-				switch ($operator) {
-					case PHPExcel_Cell_DataValidation::OPERATOR_BETWEEN: $operator = 0x00			;	break;
-					case PHPExcel_Cell_DataValidation::OPERATOR_NOTBETWEEN: $operator = 0x01		;	break;
-					case PHPExcel_Cell_DataValidation::OPERATOR_EQUAL: $operator = 0x02				;	break;
-					case PHPExcel_Cell_DataValidation::OPERATOR_NOTEQUAL: $operator = 0x03			;	break;
-					case PHPExcel_Cell_DataValidation::OPERATOR_GREATERTHAN: $operator = 0x04		;	break;
-					case PHPExcel_Cell_DataValidation::OPERATOR_LESSTHAN: $operator = 0x05			;	break;
-					case PHPExcel_Cell_DataValidation::OPERATOR_GREATERTHANOREQUAL: $operator = 0x06;	break;
-					case PHPExcel_Cell_DataValidation::OPERATOR_LESSTHANOREQUAL: $operator = 0x07	;	break;
-				}
-				$options |= $operator << 20;
-
-				$data		= pack('V', $options);
-
-				// prompt title
-				$promptTitle = $dataValidation->getPromptTitle() !== '' ?
-					$dataValidation->getPromptTitle() : chr(0);
-				$data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($promptTitle);
-
-				// error title
-				$errorTitle = $dataValidation->getErrorTitle() !== '' ?
-					$dataValidation->getErrorTitle() : chr(0);
-				$data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($errorTitle);
-
-				// prompt text
-				$prompt = $dataValidation->getPrompt() !== '' ?
-					$dataValidation->getPrompt() : chr(0);
-				$data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($prompt);
-
-				// error text
-				$error = $dataValidation->getError() !== '' ?
-					$dataValidation->getError() : chr(0);
-				$data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($error);
-
-				// formula 1
-				try {
-					$formula1 = $dataValidation->getFormula1();
-					if ($type == 0x03) { // list type
-						$formula1 = str_replace(',', chr(0), $formula1);
-					}
-					$this->_parser->parse($formula1);
-					$formula1 = $this->_parser->toReversePolish();
-					$sz1 = strlen($formula1);
-
-				} catch(PHPExcel_Exception $e) {
-					$sz1 = 0;
-					$formula1 = '';
-				}
-				$data .= pack('vv', $sz1, 0x0000);
-				$data .= $formula1;
-
-				// formula 2
-				try {
-					$formula2 = $dataValidation->getFormula2();
-					if ($formula2 === '') {
-						throw new PHPExcel_Writer_Exception('No formula2');
-					}
-					$this->_parser->parse($formula2);
-					$formula2 = $this->_parser->toReversePolish();
-					$sz2 = strlen($formula2);
-
-				} catch(PHPExcel_Exception $e) {
-					$sz2 = 0;
-					$formula2 = '';
-				}
-				$data .= pack('vv', $sz2, 0x0000);
-				$data .= $formula2;
-
-				// cell range address list
-				$data .= pack('v', 0x0001);
-				$data .= $this->_writeBIFF8CellRangeAddressFixed($cellCoordinate);
-
-				$length = strlen($data);
-			$header = pack("vv", $record, $length);
-
-				$this->_append($header . $data);
-			}
-		}
-	}
-
-	/**
-	 * Map Error code
-	 *
-	 * @param string $errorCode
-	 * @return int
-	 */
-	private static function _mapErrorCode($errorCode) {
-		switch ($errorCode) {
-			case '#NULL!':	return 0x00;
-			case '#DIV/0!':	return 0x07;
-			case '#VALUE!':	return 0x0F;
-			case '#REF!':	return 0x17;
-			case '#NAME?':	return 0x1D;
-			case '#NUM!':	return 0x24;
-			case '#N/A':	return 0x2A;
-		}
-
-		return 0;
-	}
-
-	/**
-	 * Write PLV Record
-	 */
-	private function _writePageLayoutView(){
-		$record	  = 0x088B;			   // Record identifier
-		$length	  = 0x0010;			   // Bytes to follow
-
-		$rt         = 0x088B; // 2
-		$grbitFrt   = 0x0000; // 2
-		$reserved   = 0x0000000000000000; // 8
-		$wScalvePLV = $this->_phpSheet->getSheetView()->getZoomScale(); // 2
-
-		// The options flags that comprise $grbit
-		if($this->_phpSheet->getSheetView()->getView() == PHPExcel_Worksheet_SheetView::SHEETVIEW_PAGE_LAYOUT){
-			$fPageLayoutView   = 1;
-		} else {
-			$fPageLayoutView   = 0;
-		}
-		$fRulerVisible     = 0;
-		$fWhitespaceHidden = 0;
-
-		$grbit      = $fPageLayoutView; // 2
-		$grbit		|= $fRulerVisible	   << 1;
-		$grbit		|= $fWhitespaceHidden  << 3;
-
-		$header	  = pack("vv", $record, $length);
-		$data	  = pack("vvVVvv", $rt, $grbitFrt, 0x00000000, 0x00000000, $wScalvePLV, $grbit);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write CFRule Record
-	 * @param PHPExcel_Style_Conditional $conditional
-	 */
-	private function _writeCFRule(PHPExcel_Style_Conditional $conditional){
-		$record	  = 0x01B1;			   // Record identifier
-
-		// $type : Type of the CF
-		// $operatorType : Comparison operator
-		if($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_EXPRESSION){
-			$type = 0x02;
-			$operatorType = 0x00;
-		} else if($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CELLIS){
-			$type = 0x01;
-
-			switch ($conditional->getOperatorType()){
-				case PHPExcel_Style_Conditional::OPERATOR_NONE:
-					$operatorType = 0x00;
-					break;
-				case PHPExcel_Style_Conditional::OPERATOR_EQUAL:
-					$operatorType = 0x03;
-					break;
-				case PHPExcel_Style_Conditional::OPERATOR_GREATERTHAN:
-					$operatorType = 0x05;
-					break;
-				case PHPExcel_Style_Conditional::OPERATOR_GREATERTHANOREQUAL:
-					$operatorType = 0x07;
-					break;
-				case PHPExcel_Style_Conditional::OPERATOR_LESSTHAN:
-					$operatorType = 0x06;
-					break;
-				case PHPExcel_Style_Conditional::OPERATOR_LESSTHANOREQUAL:
-					$operatorType = 0x08;
-					break;
-				case PHPExcel_Style_Conditional::OPERATOR_NOTEQUAL:
-					$operatorType = 0x04;
-					break;
-				case PHPExcel_Style_Conditional::OPERATOR_BETWEEN:
-					$operatorType = 0x01;
-					break;
-					// not OPERATOR_NOTBETWEEN 0x02
-			}
-		}
-
-		// $szValue1 : size of the formula data for first value or formula
-		// $szValue2 : size of the formula data for second value or formula
-		$arrConditions = $conditional->getConditions();
-		$numConditions = sizeof($arrConditions);
-		if($numConditions == 1){
-			$szValue1 = ($arrConditions[0] <= 65535 ? 3 : 0x0000);
-			$szValue2 = 0x0000;
-			$operand1 = pack('Cv', 0x1E, $arrConditions[0]);
-			$operand2 = null;
-		} else if($numConditions == 2 && ($conditional->getOperatorType() == PHPExcel_Style_Conditional::OPERATOR_BETWEEN)){
-			$szValue1 = ($arrConditions[0] <= 65535 ? 3 : 0x0000);
-			$szValue2 = ($arrConditions[1] <= 65535 ? 3 : 0x0000);
-			$operand1 = pack('Cv', 0x1E, $arrConditions[0]);
-			$operand2 = pack('Cv', 0x1E, $arrConditions[1]);
-		} else {
-			$szValue1 = 0x0000;
-			$szValue2 = 0x0000;
-			$operand1 = null;
-			$operand2 = null;
-		}
-
-		// $flags : Option flags
-		// Alignment
-		$bAlignHz = ($conditional->getStyle()->getAlignment()->getHorizontal() == null ? 1 : 0);
-		$bAlignVt = ($conditional->getStyle()->getAlignment()->getVertical() == null ? 1 : 0);
-		$bAlignWrapTx = ($conditional->getStyle()->getAlignment()->getWrapText() == false ? 1 : 0);
-		$bTxRotation = ($conditional->getStyle()->getAlignment()->getTextRotation() == null ? 1 : 0);
-		$bIndent = ($conditional->getStyle()->getAlignment()->getIndent() == 0 ? 1 : 0);
-		$bShrinkToFit = ($conditional->getStyle()->getAlignment()->getShrinkToFit() == false ? 1 : 0);
-		if($bAlignHz == 0 || $bAlignVt == 0 || $bAlignWrapTx == 0 || $bTxRotation == 0 || $bIndent == 0 || $bShrinkToFit == 0){
-			$bFormatAlign = 1;
-		} else {
-			$bFormatAlign = 0;
-		}
-		// Protection
-		$bProtLocked = ($conditional->getStyle()->getProtection()->getLocked() == null ? 1 : 0);
-		$bProtHidden = ($conditional->getStyle()->getProtection()->getHidden() == null ? 1 : 0);
-		if($bProtLocked == 0 || $bProtHidden == 0){
-			$bFormatProt = 1;
-		} else {
-			$bFormatProt = 0;
-		}
-		// Border
-		$bBorderLeft = ($conditional->getStyle()->getBorders()->getLeft()->getColor()->getARGB() == PHPExcel_Style_Color::COLOR_BLACK
-						&& $conditional->getStyle()->getBorders()->getLeft()->getBorderStyle() == PHPExcel_Style_Border::BORDER_NONE ? 1 : 0);
-		$bBorderRight = ($conditional->getStyle()->getBorders()->getRight()->getColor()->getARGB() == PHPExcel_Style_Color::COLOR_BLACK
-						&& $conditional->getStyle()->getBorders()->getRight()->getBorderStyle() == PHPExcel_Style_Border::BORDER_NONE ? 1 : 0);
-		$bBorderTop = ($conditional->getStyle()->getBorders()->getTop()->getColor()->getARGB() == PHPExcel_Style_Color::COLOR_BLACK
-						&& $conditional->getStyle()->getBorders()->getTop()->getBorderStyle() == PHPExcel_Style_Border::BORDER_NONE ? 1 : 0);
-		$bBorderBottom = ($conditional->getStyle()->getBorders()->getBottom()->getColor()->getARGB() == PHPExcel_Style_Color::COLOR_BLACK
-						&& $conditional->getStyle()->getBorders()->getBottom()->getBorderStyle() == PHPExcel_Style_Border::BORDER_NONE ? 1 : 0);
-		if($bBorderLeft == 0 || $bBorderRight == 0 || $bBorderTop == 0 || $bBorderBottom == 0){
-			$bFormatBorder = 1;
-		} else {
-			$bFormatBorder = 0;
-		}
-		// Pattern
-		$bFillStyle = ($conditional->getStyle()->getFill()->getFillType() == null ? 0 : 1);
-		$bFillColor = ($conditional->getStyle()->getFill()->getStartColor()->getARGB() == null ? 0 : 1);
-		$bFillColorBg = ($conditional->getStyle()->getFill()->getEndColor()->getARGB() == null ? 0 : 1);
-		if($bFillStyle == 0 || $bFillColor == 0 || $bFillColorBg == 0){
-			$bFormatFill = 1;
-		} else {
-			$bFormatFill = 0;
-		}
-		// Font
-		if($conditional->getStyle()->getFont()->getName() != null
-			|| $conditional->getStyle()->getFont()->getSize() != null
-			|| $conditional->getStyle()->getFont()->getBold() != null
-			|| $conditional->getStyle()->getFont()->getItalic() != null
-			|| $conditional->getStyle()->getFont()->getSuperScript() != null
-			|| $conditional->getStyle()->getFont()->getSubScript() != null
-			|| $conditional->getStyle()->getFont()->getUnderline() != null
-			|| $conditional->getStyle()->getFont()->getStrikethrough() != null
-			|| $conditional->getStyle()->getFont()->getColor()->getARGB() != null){
-			$bFormatFont = 1;
-		} else {
-			$bFormatFont = 0;
-		}
-		// Alignment
-		$flags = 0;
-		$flags |= (1 == $bAlignHz      ? 0x00000001 : 0);
-		$flags |= (1 == $bAlignVt      ? 0x00000002 : 0);
-		$flags |= (1 == $bAlignWrapTx  ? 0x00000004 : 0);
-		$flags |= (1 == $bTxRotation   ? 0x00000008 : 0);
-		// Justify last line flag
-		$flags |= (1 == 1              ? 0x00000010 : 0);
-		$flags |= (1 == $bIndent       ? 0x00000020 : 0);
-		$flags |= (1 == $bShrinkToFit  ? 0x00000040 : 0);
-		// Default
-		$flags |= (1 == 1              ? 0x00000080 : 0);
-		// Protection
-		$flags |= (1 == $bProtLocked   ? 0x00000100 : 0);
-		$flags |= (1 == $bProtHidden   ? 0x00000200 : 0);
-		// Border
-		$flags |= (1 == $bBorderLeft   ? 0x00000400 : 0);
-		$flags |= (1 == $bBorderRight  ? 0x00000800 : 0);
-		$flags |= (1 == $bBorderTop    ? 0x00001000 : 0);
-		$flags |= (1 == $bBorderBottom ? 0x00002000 : 0);
-		$flags |= (1 == 1              ? 0x00004000 : 0); // Top left to Bottom right border
-		$flags |= (1 == 1              ? 0x00008000 : 0); // Bottom left to Top right border
-		// Pattern
-		$flags |= (1 == $bFillStyle    ? 0x00010000 : 0);
-		$flags |= (1 == $bFillColor    ? 0x00020000 : 0);
-		$flags |= (1 == $bFillColorBg  ? 0x00040000 : 0);
-		$flags |= (1 == 1              ? 0x00380000 : 0);
-		// Font
-		$flags |= (1 == $bFormatFont   ? 0x04000000 : 0);
-	    // Alignment :
-		$flags |= (1 == $bFormatAlign  ? 0x08000000 : 0);
-		// Border
-		$flags |= (1 == $bFormatBorder ? 0x10000000 : 0);
-		// Pattern
-		$flags |= (1 == $bFormatFill   ? 0x20000000 : 0);
-		// Protection
-		$flags |= (1 == $bFormatProt   ? 0x40000000 : 0);
-		// Text direction
-		$flags |= (1 == 0              ? 0x80000000 : 0);
-
-		// Data Blocks
-		if($bFormatFont == 1){
-			// Font Name
-			if($conditional->getStyle()->getFont()->getName() == null){
-				$dataBlockFont =  pack('VVVVVVVV', 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000);
-				$dataBlockFont .= pack('VVVVVVVV', 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000);
-			} else {
-				$dataBlockFont = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($conditional->getStyle()->getFont()->getName());
-			}
-			// Font Size
-			if($conditional->getStyle()->getFont()->getSize() == null){
-				$dataBlockFont .= pack('V', 20 * 11);
-			} else {
-				$dataBlockFont .= pack('V', 20 * $conditional->getStyle()->getFont()->getSize());
-			}
-			// Font Options
-			$dataBlockFont .= pack('V', 0);
-			// Font weight
-			if($conditional->getStyle()->getFont()->getBold() == true){
-				$dataBlockFont .= pack('v', 0x02BC);
-			} else {
-				$dataBlockFont .= pack('v', 0x0190);
-			}
-			// Escapement type
-			if($conditional->getStyle()->getFont()->getSubScript() == true){
-				$dataBlockFont .= pack('v', 0x02);
-				$fontEscapement = 0;
-			} else if($conditional->getStyle()->getFont()->getSuperScript() == true){
-				$dataBlockFont .= pack('v', 0x01);
-				$fontEscapement = 0;
-			} else {
-				$dataBlockFont .= pack('v', 0x00);
-				$fontEscapement = 1;
-			}
-			// Underline type
-			switch ($conditional->getStyle()->getFont()->getUnderline()){
-				case PHPExcel_Style_Font::UNDERLINE_NONE             : $dataBlockFont .= pack('C', 0x00); $fontUnderline = 0; break;
-				case PHPExcel_Style_Font::UNDERLINE_DOUBLE           : $dataBlockFont .= pack('C', 0x02); $fontUnderline = 0; break;
-				case PHPExcel_Style_Font::UNDERLINE_DOUBLEACCOUNTING : $dataBlockFont .= pack('C', 0x22); $fontUnderline = 0; break;
-				case PHPExcel_Style_Font::UNDERLINE_SINGLE           : $dataBlockFont .= pack('C', 0x01); $fontUnderline = 0; break;
-				case PHPExcel_Style_Font::UNDERLINE_SINGLEACCOUNTING : $dataBlockFont .= pack('C', 0x21); $fontUnderline = 0; break;
-				default                                              : $dataBlockFont .= pack('C', 0x00); $fontUnderline = 1; break;
-			}
-			// Not used (3)
-			$dataBlockFont .= pack('vC', 0x0000, 0x00);
-			// Font color index
-			switch ($conditional->getStyle()->getFont()->getColor()->getRGB()) {
-				case '000000': $colorIdx = 0x08; break;
-				case 'FFFFFF': $colorIdx = 0x09; break;
-				case 'FF0000': $colorIdx = 0x0A; break;
-				case '00FF00': $colorIdx = 0x0B; break;
-				case '0000FF': $colorIdx = 0x0C; break;
-				case 'FFFF00': $colorIdx = 0x0D; break;
-				case 'FF00FF': $colorIdx = 0x0E; break;
-				case '00FFFF': $colorIdx = 0x0F; break;
-				case '800000': $colorIdx = 0x10; break;
-				case '008000': $colorIdx = 0x11; break;
-				case '000080': $colorIdx = 0x12; break;
-				case '808000': $colorIdx = 0x13; break;
-				case '800080': $colorIdx = 0x14; break;
-				case '008080': $colorIdx = 0x15; break;
-				case 'C0C0C0': $colorIdx = 0x16; break;
-				case '808080': $colorIdx = 0x17; break;
-				case '9999FF': $colorIdx = 0x18; break;
-				case '993366': $colorIdx = 0x19; break;
-				case 'FFFFCC': $colorIdx = 0x1A; break;
-				case 'CCFFFF': $colorIdx = 0x1B; break;
-				case '660066': $colorIdx = 0x1C; break;
-				case 'FF8080': $colorIdx = 0x1D; break;
-				case '0066CC': $colorIdx = 0x1E; break;
-				case 'CCCCFF': $colorIdx = 0x1F; break;
-				case '000080': $colorIdx = 0x20; break;
-				case 'FF00FF': $colorIdx = 0x21; break;
-				case 'FFFF00': $colorIdx = 0x22; break;
-				case '00FFFF': $colorIdx = 0x23; break;
-				case '800080': $colorIdx = 0x24; break;
-				case '800000': $colorIdx = 0x25; break;
-				case '008080': $colorIdx = 0x26; break;
-				case '0000FF': $colorIdx = 0x27; break;
-				case '00CCFF': $colorIdx = 0x28; break;
-				case 'CCFFFF': $colorIdx = 0x29; break;
-				case 'CCFFCC': $colorIdx = 0x2A; break;
-				case 'FFFF99': $colorIdx = 0x2B; break;
-				case '99CCFF': $colorIdx = 0x2C; break;
-				case 'FF99CC': $colorIdx = 0x2D; break;
-				case 'CC99FF': $colorIdx = 0x2E; break;
-				case 'FFCC99': $colorIdx = 0x2F; break;
-				case '3366FF': $colorIdx = 0x30; break;
-				case '33CCCC': $colorIdx = 0x31; break;
-				case '99CC00': $colorIdx = 0x32; break;
-				case 'FFCC00': $colorIdx = 0x33; break;
-				case 'FF9900': $colorIdx = 0x34; break;
-				case 'FF6600': $colorIdx = 0x35; break;
-				case '666699': $colorIdx = 0x36; break;
-				case '969696': $colorIdx = 0x37; break;
-				case '003366': $colorIdx = 0x38; break;
-				case '339966': $colorIdx = 0x39; break;
-				case '003300': $colorIdx = 0x3A; break;
-				case '333300': $colorIdx = 0x3B; break;
-				case '993300': $colorIdx = 0x3C; break;
-				case '993366': $colorIdx = 0x3D; break;
-				case '333399': $colorIdx = 0x3E; break;
-				case '333333': $colorIdx = 0x3F; break;
-				default: $colorIdx = 0x00; break;
-			}
-			$dataBlockFont .= pack('V', $colorIdx);
-			// Not used (4)
-			$dataBlockFont .= pack('V', 0x00000000);
-			// Options flags for modified font attributes
-			$optionsFlags = 0;
-			$optionsFlagsBold = ($conditional->getStyle()->getFont()->getBold() == null ? 1 : 0);
-			$optionsFlags |= (1 == $optionsFlagsBold  ? 0x00000002 : 0);
-			$optionsFlags |= (1 == 1                  ? 0x00000008 : 0);
-			$optionsFlags |= (1 == 1                  ? 0x00000010 : 0);
-			$optionsFlags |= (1 == 0                  ? 0x00000020 : 0);
-			$optionsFlags |= (1 == 1                  ? 0x00000080 : 0);
-			$dataBlockFont .= pack('V', $optionsFlags);
-			// Escapement type
-			$dataBlockFont .= pack('V', $fontEscapement);
-			// Underline type
-			$dataBlockFont .= pack('V', $fontUnderline);
-			// Always
-			$dataBlockFont .= pack('V', 0x00000000);
-			// Always
-			$dataBlockFont .= pack('V', 0x00000000);
-			// Not used (8)
-			$dataBlockFont .= pack('VV', 0x00000000, 0x00000000);
-			// Always
-			$dataBlockFont .= pack('v', 0x0001);
-		}
-		if($bFormatAlign == 1){
-			$blockAlign = 0;
-			// Alignment and text break
-			switch ($conditional->getStyle()->getAlignment()->getHorizontal()){
-				case PHPExcel_Style_Alignment::HORIZONTAL_GENERAL 			: $blockAlign = 0; break;
-				case PHPExcel_Style_Alignment::HORIZONTAL_LEFT				: $blockAlign = 1; break;
-				case PHPExcel_Style_Alignment::HORIZONTAL_RIGHT				: $blockAlign = 3; break;
-				case PHPExcel_Style_Alignment::HORIZONTAL_CENTER			: $blockAlign = 2; break;
-				case PHPExcel_Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS	: $blockAlign = 6; break;
-				case PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY			: $blockAlign = 5; break;
-			}
-			if($conditional->getStyle()->getAlignment()->getWrapText() == true){
-				$blockAlign |= 1 << 3;
-			} else {
-				$blockAlign |= 0 << 3;
-			}
-			switch ($conditional->getStyle()->getAlignment()->getVertical()){
-				case PHPExcel_Style_Alignment::VERTICAL_BOTTOM 				: $blockAlign = 2 << 4; break;
-				case PHPExcel_Style_Alignment::VERTICAL_TOP					: $blockAlign = 0 << 4; break;
-				case PHPExcel_Style_Alignment::VERTICAL_CENTER				: $blockAlign = 1 << 4; break;
-				case PHPExcel_Style_Alignment::VERTICAL_JUSTIFY				: $blockAlign = 3 << 4; break;
-			}
-			$blockAlign |= 0 << 7;
-
-			// Text rotation angle
-			$blockRotation = $conditional->getStyle()->getAlignment()->getTextRotation();
-
-			// Indentation
-			$blockIndent = $conditional->getStyle()->getAlignment()->getIndent();
-			if($conditional->getStyle()->getAlignment()->getShrinkToFit() == true){
-				$blockIndent |= 1 << 4;
-			} else {
-				$blockIndent |= 0 << 4;
-			}
-			$blockIndent |= 0 << 6;
-
-			// Relative indentation
-			$blockIndentRelative = 255;
-
-			$dataBlockAlign = pack('CCvvv', $blockAlign, $blockRotation, $blockIndent, $blockIndentRelative, 0x0000);
-		}
-		if($bFormatBorder == 1){
-			$blockLineStyle = 0;
-			switch ($conditional->getStyle()->getBorders()->getLeft()->getBorderStyle()){
-				case PHPExcel_Style_Border::BORDER_NONE              : $blockLineStyle |= 0x00; break;
-				case PHPExcel_Style_Border::BORDER_THIN              : $blockLineStyle |= 0x01; break;
-				case PHPExcel_Style_Border::BORDER_MEDIUM            : $blockLineStyle |= 0x02; break;
-				case PHPExcel_Style_Border::BORDER_DASHED            : $blockLineStyle |= 0x03; break;
-				case PHPExcel_Style_Border::BORDER_DOTTED            : $blockLineStyle |= 0x04; break;
-				case PHPExcel_Style_Border::BORDER_THICK             : $blockLineStyle |= 0x05; break;
-				case PHPExcel_Style_Border::BORDER_DOUBLE            : $blockLineStyle |= 0x06; break;
-				case PHPExcel_Style_Border::BORDER_HAIR              : $blockLineStyle |= 0x07; break;
-				case PHPExcel_Style_Border::BORDER_MEDIUMDASHED      : $blockLineStyle |= 0x08; break;
-				case PHPExcel_Style_Border::BORDER_DASHDOT           : $blockLineStyle |= 0x09; break;
-				case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT     : $blockLineStyle |= 0x0A; break;
-				case PHPExcel_Style_Border::BORDER_DASHDOTDOT        : $blockLineStyle |= 0x0B; break;
-				case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT  : $blockLineStyle |= 0x0C; break;
-				case PHPExcel_Style_Border::BORDER_SLANTDASHDOT      : $blockLineStyle |= 0x0D; break;
-			}
-			switch ($conditional->getStyle()->getBorders()->getRight()->getBorderStyle()){
-				case PHPExcel_Style_Border::BORDER_NONE              : $blockLineStyle |= 0x00 << 4; break;
-				case PHPExcel_Style_Border::BORDER_THIN              : $blockLineStyle |= 0x01 << 4; break;
-				case PHPExcel_Style_Border::BORDER_MEDIUM            : $blockLineStyle |= 0x02 << 4; break;
-				case PHPExcel_Style_Border::BORDER_DASHED            : $blockLineStyle |= 0x03 << 4; break;
-				case PHPExcel_Style_Border::BORDER_DOTTED            : $blockLineStyle |= 0x04 << 4; break;
-				case PHPExcel_Style_Border::BORDER_THICK             : $blockLineStyle |= 0x05 << 4; break;
-				case PHPExcel_Style_Border::BORDER_DOUBLE            : $blockLineStyle |= 0x06 << 4; break;
-				case PHPExcel_Style_Border::BORDER_HAIR              : $blockLineStyle |= 0x07 << 4; break;
-				case PHPExcel_Style_Border::BORDER_MEDIUMDASHED      : $blockLineStyle |= 0x08 << 4; break;
-				case PHPExcel_Style_Border::BORDER_DASHDOT           : $blockLineStyle |= 0x09 << 4; break;
-				case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT     : $blockLineStyle |= 0x0A << 4; break;
-				case PHPExcel_Style_Border::BORDER_DASHDOTDOT        : $blockLineStyle |= 0x0B << 4; break;
-				case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT  : $blockLineStyle |= 0x0C << 4; break;
-				case PHPExcel_Style_Border::BORDER_SLANTDASHDOT      : $blockLineStyle |= 0x0D << 4; break;
-			}
-			switch ($conditional->getStyle()->getBorders()->getTop()->getBorderStyle()){
-				case PHPExcel_Style_Border::BORDER_NONE              : $blockLineStyle |= 0x00 << 8; break;
-				case PHPExcel_Style_Border::BORDER_THIN              : $blockLineStyle |= 0x01 << 8; break;
-				case PHPExcel_Style_Border::BORDER_MEDIUM            : $blockLineStyle |= 0x02 << 8; break;
-				case PHPExcel_Style_Border::BORDER_DASHED            : $blockLineStyle |= 0x03 << 8; break;
-				case PHPExcel_Style_Border::BORDER_DOTTED            : $blockLineStyle |= 0x04 << 8; break;
-				case PHPExcel_Style_Border::BORDER_THICK             : $blockLineStyle |= 0x05 << 8; break;
-				case PHPExcel_Style_Border::BORDER_DOUBLE            : $blockLineStyle |= 0x06 << 8; break;
-				case PHPExcel_Style_Border::BORDER_HAIR              : $blockLineStyle |= 0x07 << 8; break;
-				case PHPExcel_Style_Border::BORDER_MEDIUMDASHED      : $blockLineStyle |= 0x08 << 8; break;
-				case PHPExcel_Style_Border::BORDER_DASHDOT           : $blockLineStyle |= 0x09 << 8; break;
-				case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT     : $blockLineStyle |= 0x0A << 8; break;
-				case PHPExcel_Style_Border::BORDER_DASHDOTDOT        : $blockLineStyle |= 0x0B << 8; break;
-				case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT  : $blockLineStyle |= 0x0C << 8; break;
-				case PHPExcel_Style_Border::BORDER_SLANTDASHDOT      : $blockLineStyle |= 0x0D << 8; break;
-			}
-			switch ($conditional->getStyle()->getBorders()->getBottom()->getBorderStyle()){
-				case PHPExcel_Style_Border::BORDER_NONE              : $blockLineStyle |= 0x00 << 12; break;
-				case PHPExcel_Style_Border::BORDER_THIN              : $blockLineStyle |= 0x01 << 12; break;
-				case PHPExcel_Style_Border::BORDER_MEDIUM            : $blockLineStyle |= 0x02 << 12; break;
-				case PHPExcel_Style_Border::BORDER_DASHED            : $blockLineStyle |= 0x03 << 12; break;
-				case PHPExcel_Style_Border::BORDER_DOTTED            : $blockLineStyle |= 0x04 << 12; break;
-				case PHPExcel_Style_Border::BORDER_THICK             : $blockLineStyle |= 0x05 << 12; break;
-				case PHPExcel_Style_Border::BORDER_DOUBLE            : $blockLineStyle |= 0x06 << 12; break;
-				case PHPExcel_Style_Border::BORDER_HAIR              : $blockLineStyle |= 0x07 << 12; break;
-				case PHPExcel_Style_Border::BORDER_MEDIUMDASHED      : $blockLineStyle |= 0x08 << 12; break;
-				case PHPExcel_Style_Border::BORDER_DASHDOT           : $blockLineStyle |= 0x09 << 12; break;
-				case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT     : $blockLineStyle |= 0x0A << 12; break;
-				case PHPExcel_Style_Border::BORDER_DASHDOTDOT        : $blockLineStyle |= 0x0B << 12; break;
-				case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT  : $blockLineStyle |= 0x0C << 12; break;
-				case PHPExcel_Style_Border::BORDER_SLANTDASHDOT      : $blockLineStyle |= 0x0D << 12; break;
-			}
-			//@todo _writeCFRule() => $blockLineStyle => Index Color for left line
-			//@todo _writeCFRule() => $blockLineStyle => Index Color for right line
-			//@todo _writeCFRule() => $blockLineStyle => Top-left to bottom-right on/off
-			//@todo _writeCFRule() => $blockLineStyle => Bottom-left to top-right on/off
-			$blockColor = 0;
-			//@todo _writeCFRule() => $blockColor => Index Color for top line
-			//@todo _writeCFRule() => $blockColor => Index Color for bottom line
-			//@todo _writeCFRule() => $blockColor => Index Color for diagonal line
-			switch ($conditional->getStyle()->getBorders()->getDiagonal()->getBorderStyle()){
-				case PHPExcel_Style_Border::BORDER_NONE              : $blockColor |= 0x00 << 21; break;
-				case PHPExcel_Style_Border::BORDER_THIN              : $blockColor |= 0x01 << 21; break;
-				case PHPExcel_Style_Border::BORDER_MEDIUM            : $blockColor |= 0x02 << 21; break;
-				case PHPExcel_Style_Border::BORDER_DASHED            : $blockColor |= 0x03 << 21; break;
-				case PHPExcel_Style_Border::BORDER_DOTTED            : $blockColor |= 0x04 << 21; break;
-				case PHPExcel_Style_Border::BORDER_THICK             : $blockColor |= 0x05 << 21; break;
-				case PHPExcel_Style_Border::BORDER_DOUBLE            : $blockColor |= 0x06 << 21; break;
-				case PHPExcel_Style_Border::BORDER_HAIR              : $blockColor |= 0x07 << 21; break;
-				case PHPExcel_Style_Border::BORDER_MEDIUMDASHED      : $blockColor |= 0x08 << 21; break;
-				case PHPExcel_Style_Border::BORDER_DASHDOT           : $blockColor |= 0x09 << 21; break;
-				case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT     : $blockColor |= 0x0A << 21; break;
-				case PHPExcel_Style_Border::BORDER_DASHDOTDOT        : $blockColor |= 0x0B << 21; break;
-				case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT  : $blockColor |= 0x0C << 21; break;
-				case PHPExcel_Style_Border::BORDER_SLANTDASHDOT      : $blockColor |= 0x0D << 21; break;
-			}
-			$dataBlockBorder = pack('vv', $blockLineStyle, $blockColor);
-		}
-		if($bFormatFill == 1){
-			// Fill Patern Style
-			$blockFillPatternStyle = 0;
-			switch ($conditional->getStyle()->getFill()->getFillType()){
-				case PHPExcel_Style_Fill::FILL_NONE						: $blockFillPatternStyle = 0x00; break;
-				case PHPExcel_Style_Fill::FILL_SOLID					: $blockFillPatternStyle = 0x01; break;
-				case PHPExcel_Style_Fill::FILL_PATTERN_MEDIUMGRAY		: $blockFillPatternStyle = 0x02; break;
-				case PHPExcel_Style_Fill::FILL_PATTERN_DARKGRAY			: $blockFillPatternStyle = 0x03; break;
-				case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRAY		: $blockFillPatternStyle = 0x04; break;
-				case PHPExcel_Style_Fill::FILL_PATTERN_DARKHORIZONTAL	: $blockFillPatternStyle = 0x05; break;
-				case PHPExcel_Style_Fill::FILL_PATTERN_DARKVERTICAL		: $blockFillPatternStyle = 0x06; break;
-				case PHPExcel_Style_Fill::FILL_PATTERN_DARKDOWN			: $blockFillPatternStyle = 0x07; break;
-				case PHPExcel_Style_Fill::FILL_PATTERN_DARKUP			: $blockFillPatternStyle = 0x08; break;
-				case PHPExcel_Style_Fill::FILL_PATTERN_DARKGRID			: $blockFillPatternStyle = 0x09; break;
-				case PHPExcel_Style_Fill::FILL_PATTERN_DARKTRELLIS		: $blockFillPatternStyle = 0x0A; break;
-				case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTHORIZONTAL	: $blockFillPatternStyle = 0x0B; break;
-				case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTVERTICAL	: $blockFillPatternStyle = 0x0C; break;
-				case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTDOWN		: $blockFillPatternStyle = 0x0D; break;
-				case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTUP			: $blockFillPatternStyle = 0x0E; break;
-				case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRID		: $blockFillPatternStyle = 0x0F; break;
-				case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTTRELLIS		: $blockFillPatternStyle = 0x10; break;
-				case PHPExcel_Style_Fill::FILL_PATTERN_GRAY125			: $blockFillPatternStyle = 0x11; break;
-				case PHPExcel_Style_Fill::FILL_PATTERN_GRAY0625			: $blockFillPatternStyle = 0x12; break;
-				case PHPExcel_Style_Fill::FILL_GRADIENT_LINEAR			: $blockFillPatternStyle = 0x00; break;	// does not exist in BIFF8
-				case PHPExcel_Style_Fill::FILL_GRADIENT_PATH			: $blockFillPatternStyle = 0x00; break;	// does not exist in BIFF8
-				default                                                 : $blockFillPatternStyle = 0x00; break;
-			}
-			// Color
-			switch ($conditional->getStyle()->getFill()->getStartColor()->getRGB()) {
-				case '000000': $colorIdxBg = 0x08; break;
-				case 'FFFFFF': $colorIdxBg = 0x09; break;
-				case 'FF0000': $colorIdxBg = 0x0A; break;
-				case '00FF00': $colorIdxBg = 0x0B; break;
-				case '0000FF': $colorIdxBg = 0x0C; break;
-				case 'FFFF00': $colorIdxBg = 0x0D; break;
-				case 'FF00FF': $colorIdxBg = 0x0E; break;
-				case '00FFFF': $colorIdxBg = 0x0F; break;
-				case '800000': $colorIdxBg = 0x10; break;
-				case '008000': $colorIdxBg = 0x11; break;
-				case '000080': $colorIdxBg = 0x12; break;
-				case '808000': $colorIdxBg = 0x13; break;
-				case '800080': $colorIdxBg = 0x14; break;
-				case '008080': $colorIdxBg = 0x15; break;
-				case 'C0C0C0': $colorIdxBg = 0x16; break;
-				case '808080': $colorIdxBg = 0x17; break;
-				case '9999FF': $colorIdxBg = 0x18; break;
-				case '993366': $colorIdxBg = 0x19; break;
-				case 'FFFFCC': $colorIdxBg = 0x1A; break;
-				case 'CCFFFF': $colorIdxBg = 0x1B; break;
-				case '660066': $colorIdxBg = 0x1C; break;
-				case 'FF8080': $colorIdxBg = 0x1D; break;
-				case '0066CC': $colorIdxBg = 0x1E; break;
-				case 'CCCCFF': $colorIdxBg = 0x1F; break;
-				case '000080': $colorIdxBg = 0x20; break;
-				case 'FF00FF': $colorIdxBg = 0x21; break;
-				case 'FFFF00': $colorIdxBg = 0x22; break;
-				case '00FFFF': $colorIdxBg = 0x23; break;
-				case '800080': $colorIdxBg = 0x24; break;
-				case '800000': $colorIdxBg = 0x25; break;
-				case '008080': $colorIdxBg = 0x26; break;
-				case '0000FF': $colorIdxBg = 0x27; break;
-				case '00CCFF': $colorIdxBg = 0x28; break;
-				case 'CCFFFF': $colorIdxBg = 0x29; break;
-				case 'CCFFCC': $colorIdxBg = 0x2A; break;
-				case 'FFFF99': $colorIdxBg = 0x2B; break;
-				case '99CCFF': $colorIdxBg = 0x2C; break;
-				case 'FF99CC': $colorIdxBg = 0x2D; break;
-				case 'CC99FF': $colorIdxBg = 0x2E; break;
-				case 'FFCC99': $colorIdxBg = 0x2F; break;
-				case '3366FF': $colorIdxBg = 0x30; break;
-				case '33CCCC': $colorIdxBg = 0x31; break;
-				case '99CC00': $colorIdxBg = 0x32; break;
-				case 'FFCC00': $colorIdxBg = 0x33; break;
-				case 'FF9900': $colorIdxBg = 0x34; break;
-				case 'FF6600': $colorIdxBg = 0x35; break;
-				case '666699': $colorIdxBg = 0x36; break;
-				case '969696': $colorIdxBg = 0x37; break;
-				case '003366': $colorIdxBg = 0x38; break;
-				case '339966': $colorIdxBg = 0x39; break;
-				case '003300': $colorIdxBg = 0x3A; break;
-				case '333300': $colorIdxBg = 0x3B; break;
-				case '993300': $colorIdxBg = 0x3C; break;
-				case '993366': $colorIdxBg = 0x3D; break;
-				case '333399': $colorIdxBg = 0x3E; break;
-				case '333333': $colorIdxBg = 0x3F; break;
-				default:       $colorIdxBg = 0x41; break;
-			}
-			// Fg Color
-			switch ($conditional->getStyle()->getFill()->getEndColor()->getRGB()) {
-				case '000000': $colorIdxFg = 0x08; break;
-				case 'FFFFFF': $colorIdxFg = 0x09; break;
-				case 'FF0000': $colorIdxFg = 0x0A; break;
-				case '00FF00': $colorIdxFg = 0x0B; break;
-				case '0000FF': $colorIdxFg = 0x0C; break;
-				case 'FFFF00': $colorIdxFg = 0x0D; break;
-				case 'FF00FF': $colorIdxFg = 0x0E; break;
-				case '00FFFF': $colorIdxFg = 0x0F; break;
-				case '800000': $colorIdxFg = 0x10; break;
-				case '008000': $colorIdxFg = 0x11; break;
-				case '000080': $colorIdxFg = 0x12; break;
-				case '808000': $colorIdxFg = 0x13; break;
-				case '800080': $colorIdxFg = 0x14; break;
-				case '008080': $colorIdxFg = 0x15; break;
-				case 'C0C0C0': $colorIdxFg = 0x16; break;
-				case '808080': $colorIdxFg = 0x17; break;
-				case '9999FF': $colorIdxFg = 0x18; break;
-				case '993366': $colorIdxFg = 0x19; break;
-				case 'FFFFCC': $colorIdxFg = 0x1A; break;
-				case 'CCFFFF': $colorIdxFg = 0x1B; break;
-				case '660066': $colorIdxFg = 0x1C; break;
-				case 'FF8080': $colorIdxFg = 0x1D; break;
-				case '0066CC': $colorIdxFg = 0x1E; break;
-				case 'CCCCFF': $colorIdxFg = 0x1F; break;
-				case '000080': $colorIdxFg = 0x20; break;
-				case 'FF00FF': $colorIdxFg = 0x21; break;
-				case 'FFFF00': $colorIdxFg = 0x22; break;
-				case '00FFFF': $colorIdxFg = 0x23; break;
-				case '800080': $colorIdxFg = 0x24; break;
-				case '800000': $colorIdxFg = 0x25; break;
-				case '008080': $colorIdxFg = 0x26; break;
-				case '0000FF': $colorIdxFg = 0x27; break;
-				case '00CCFF': $colorIdxFg = 0x28; break;
-				case 'CCFFFF': $colorIdxFg = 0x29; break;
-				case 'CCFFCC': $colorIdxFg = 0x2A; break;
-				case 'FFFF99': $colorIdxFg = 0x2B; break;
-				case '99CCFF': $colorIdxFg = 0x2C; break;
-				case 'FF99CC': $colorIdxFg = 0x2D; break;
-				case 'CC99FF': $colorIdxFg = 0x2E; break;
-				case 'FFCC99': $colorIdxFg = 0x2F; break;
-				case '3366FF': $colorIdxFg = 0x30; break;
-				case '33CCCC': $colorIdxFg = 0x31; break;
-				case '99CC00': $colorIdxFg = 0x32; break;
-				case 'FFCC00': $colorIdxFg = 0x33; break;
-				case 'FF9900': $colorIdxFg = 0x34; break;
-				case 'FF6600': $colorIdxFg = 0x35; break;
-				case '666699': $colorIdxFg = 0x36; break;
-				case '969696': $colorIdxFg = 0x37; break;
-				case '003366': $colorIdxFg = 0x38; break;
-				case '339966': $colorIdxFg = 0x39; break;
-				case '003300': $colorIdxFg = 0x3A; break;
-				case '333300': $colorIdxFg = 0x3B; break;
-				case '993300': $colorIdxFg = 0x3C; break;
-				case '993366': $colorIdxFg = 0x3D; break;
-				case '333399': $colorIdxFg = 0x3E; break;
-				case '333333': $colorIdxFg = 0x3F; break;
-				default:       $colorIdxFg = 0x40; break;
-			}
-			$dataBlockFill = pack('v', $blockFillPatternStyle);
-			$dataBlockFill .= pack('v', $colorIdxFg | ($colorIdxBg << 7));
-		}
-		if($bFormatProt == 1){
-			$dataBlockProtection = 0;
-			if($conditional->getStyle()->getProtection()->getLocked() == PHPExcel_Style_Protection::PROTECTION_PROTECTED){
-				$dataBlockProtection = 1;
-			}
-			if($conditional->getStyle()->getProtection()->getHidden() == PHPExcel_Style_Protection::PROTECTION_PROTECTED){
-				$dataBlockProtection = 1 << 1;
-			}
-		}
-
-		$data	  = pack('CCvvVv', $type, $operatorType, $szValue1, $szValue2, $flags, 0x0000);
-		if($bFormatFont == 1){ // Block Formatting : OK
-			$data .= $dataBlockFont;
-		}
-		if($bFormatAlign == 1){
-			$data .= $dataBlockAlign;
-		}
-		if($bFormatBorder == 1){
-			$data .= $dataBlockBorder;
-		}
-		if($bFormatFill == 1){ // Block Formatting : OK
-			$data .= $dataBlockFill;
-		}
-		if($bFormatProt == 1){
-			$data .= $dataBlockProtection;
-		}
-		if(!is_null($operand1)){
-			$data .= $operand1;
-		}
-		if(!is_null($operand2)){
-			$data .= $operand2;
-		}
-		$header	  = pack('vv', $record, strlen($data));
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write CFHeader record
-	 */
-	private function _writeCFHeader(){
-		$record	  = 0x01B0;			   // Record identifier
-		$length	  = 0x0016;			   // Bytes to follow
-
-		$numColumnMin = null;
-		$numColumnMax = null;
-		$numRowMin = null;
-		$numRowMax = null;
-		$arrConditional = array();
-		foreach ($this->_phpSheet->getConditionalStylesCollection() as $cellCoordinate => $conditionalStyles) {
-			foreach ($conditionalStyles as $conditional) {
-				if($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_EXPRESSION
-						|| $conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CELLIS){
-					if(!in_array($conditional->getHashCode(), $arrConditional)){
-						$arrConditional[] = $conditional->getHashCode();
-					}
-					// Cells
-					$arrCoord = PHPExcel_Cell::coordinateFromString($cellCoordinate);
-					if(!is_numeric($arrCoord[0])){
-						$arrCoord[0] = PHPExcel_Cell::columnIndexFromString($arrCoord[0]);
-					}
-					if(is_null($numColumnMin) || ($numColumnMin > $arrCoord[0])){
-						$numColumnMin = $arrCoord[0];
-					}
-					if(is_null($numColumnMax) || ($numColumnMax < $arrCoord[0])){
-						$numColumnMax = $arrCoord[0];
-					}
-					if(is_null($numRowMin) || ($numRowMin > $arrCoord[1])){
-						$numRowMin = $arrCoord[1];
-					}
-					if(is_null($numRowMax) || ($numRowMax < $arrCoord[1])){
-						$numRowMax = $arrCoord[1];
-					}
-				}
-			}
-		}
-		$needRedraw = 1;
-		$cellRange = pack('vvvv', $numRowMin-1, $numRowMax-1, $numColumnMin-1, $numColumnMax-1);
-
-		$header	  = pack('vv', $record, $length);
-		$data	  = pack('vv', count($arrConditional), $needRedraw);
-		$data     .= $cellRange;
-		$data     .= pack('v', 0x0001);
-		$data     .= $cellRange;
-		$this->_append($header . $data);
-	}
-}
\ No newline at end of file
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Xf.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Xf.php
deleted file mode 100644
index 99f1b2a0c9a..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Xf.php
+++ /dev/null
@@ -1,547 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-// Original file header of PEAR::Spreadsheet_Excel_Writer_Format (used as the base for this class):
-// -----------------------------------------------------------------------------------------
-// /*
-// *  Module written/ported by Xavier Noguer <xnoguer@rezebra.com>
-// *
-// *  The majority of this is _NOT_ my code.  I simply ported it from the
-// *  PERL Spreadsheet::WriteExcel module.
-// *
-// *  The author of the Spreadsheet::WriteExcel module is John McNamara
-// *  <jmcnamara@cpan.org>
-// *
-// *  I _DO_ maintain this code, and John McNamara has nothing to do with the
-// *  porting of this code to PHP.  Any questions directly related to this
-// *  class library should be directed to me.
-// *
-// *  License Information:
-// *
-// *    Spreadsheet_Excel_Writer:  A library for generating Excel Spreadsheets
-// *    Copyright (c) 2002-2003 Xavier Noguer xnoguer@rezebra.com
-// *
-// *    This library is free software; you can redistribute it and/or
-// *    modify it under the terms of the GNU Lesser General Public
-// *    License as published by the Free Software Foundation; either
-// *    version 2.1 of the License, or (at your option) any later version.
-// *
-// *    This library is distributed in the hope that it will be useful,
-// *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-// *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// *    Lesser General Public License for more details.
-// *
-// *    You should have received a copy of the GNU Lesser General Public
-// *    License along with this library; if not, write to the Free Software
-// *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-// */
-
-
-/**
- * PHPExcel_Writer_Excel5_Xf
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel5_Xf
-{
-    /**
-	 * Style XF or a cell XF ?
-	 *
-	 * @var boolean
-	 */
-	private $_isStyleXf;
-
-	/**
-	 * Index to the FONT record. Index 4 does not exist
-	 * @var integer
-	 */
-	private $_fontIndex;
-
-	/**
-	 * An index (2 bytes) to a FORMAT record (number format).
-	 * @var integer
-	 */
-	public $_numberFormatIndex;
-
-	/**
-	 * 1 bit, apparently not used.
-	 * @var integer
-	 */
-	public $_text_justlast;
-
-	/**
-	 * The cell's foreground color.
-	 * @var integer
-	 */
-	public $_fg_color;
-
-	/**
-	 * The cell's background color.
-	 * @var integer
-	 */
-	public $_bg_color;
-
-	/**
-	 * Color of the bottom border of the cell.
-	 * @var integer
-	 */
-	public $_bottom_color;
-
-	/**
-	 * Color of the top border of the cell.
-	 * @var integer
-	 */
-	public $_top_color;
-
-	/**
-	* Color of the left border of the cell.
-	* @var integer
-	*/
-	public $_left_color;
-
-	/**
-	 * Color of the right border of the cell.
-	 * @var integer
-	 */
-	public $_right_color;
-
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param PHPExcel_Style	The XF format
-	 */
-	public function __construct(PHPExcel_Style $style = null)
-	{
-		$this->_isStyleXf =     false;
-		$this->_fontIndex      = 0;
-
-		$this->_numberFormatIndex     = 0;
-
-		$this->_text_justlast  = 0;
-
-		$this->_fg_color       = 0x40;
-		$this->_bg_color       = 0x41;
-
-		$this->_diag           = 0;
-
-		$this->_bottom_color   = 0x40;
-		$this->_top_color      = 0x40;
-		$this->_left_color     = 0x40;
-		$this->_right_color    = 0x40;
-		$this->_diag_color     = 0x40;
-		$this->_style = $style;
-
-	}
-
-
-	/**
-	 * Generate an Excel BIFF XF record (style or cell).
-	 *
-	 * @return string The XF record
-	 */
-	function writeXf()
-	{
-		// Set the type of the XF record and some of the attributes.
-		if ($this->_isStyleXf) {
-			$style = 0xFFF5;
-		} else {
-			$style   = self::_mapLocked($this->_style->getProtection()->getLocked());
-			$style  |= self::_mapHidden($this->_style->getProtection()->getHidden()) << 1;
-		}
-
-		// Flags to indicate if attributes have been set.
-		$atr_num     = ($this->_numberFormatIndex != 0)?1:0;
-		$atr_fnt     = ($this->_fontIndex != 0)?1:0;
-		$atr_alc     = ((int) $this->_style->getAlignment()->getWrapText()) ? 1 : 0;
-		$atr_bdr     = (self::_mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle())   ||
-						self::_mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle())      ||
-						self::_mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle())     ||
-						self::_mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle()))?1:0;
-		$atr_pat     = (($this->_fg_color != 0x40) ||
-						($this->_bg_color != 0x41) ||
-						self::_mapFillType($this->_style->getFill()->getFillType()))?1:0;
-		$atr_prot    = self::_mapLocked($this->_style->getProtection()->getLocked())
-						| self::_mapHidden($this->_style->getProtection()->getHidden());
-
-		// Zero the default border colour if the border has not been set.
-		if (self::_mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle()) == 0) {
-			$this->_bottom_color = 0;
-		}
-		if (self::_mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle())  == 0) {
-			$this->_top_color = 0;
-		}
-		if (self::_mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle()) == 0) {
-			$this->_right_color = 0;
-		}
-		if (self::_mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle()) == 0) {
-			$this->_left_color = 0;
-		}
-		if (self::_mapBorderStyle($this->_style->getBorders()->getDiagonal()->getBorderStyle()) == 0) {
-			$this->_diag_color = 0;
-		}
-
-		$record         = 0x00E0;              // Record identifier
-		$length         = 0x0014;              // Number of bytes to follow
-
-		$ifnt           = $this->_fontIndex;   // Index to FONT record
-		$ifmt           = $this->_numberFormatIndex;  // Index to FORMAT record
-
-		$align          = $this->_mapHAlign($this->_style->getAlignment()->getHorizontal());       // Alignment
-		$align         |= (int) $this->_style->getAlignment()->getWrapText()     << 3;
-		$align         |= self::_mapVAlign($this->_style->getAlignment()->getVertical())  << 4;
-		$align         |= $this->_text_justlast << 7;
-
-		$used_attrib    = $atr_num              << 2;
-		$used_attrib   |= $atr_fnt              << 3;
-		$used_attrib   |= $atr_alc              << 4;
-		$used_attrib   |= $atr_bdr              << 5;
-		$used_attrib   |= $atr_pat              << 6;
-		$used_attrib   |= $atr_prot             << 7;
-
-		$icv            = $this->_fg_color;      // fg and bg pattern colors
-		$icv           |= $this->_bg_color      << 7;
-
-		$border1        = self::_mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle());          // Border line style and color
-		$border1       |= self::_mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle())         << 4;
-		$border1       |= self::_mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle())           << 8;
-		$border1       |= self::_mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle())        << 12;
-		$border1       |= $this->_left_color    << 16;
-		$border1       |= $this->_right_color   << 23;
-
-		$diagonalDirection = $this->_style->getBorders()->getDiagonalDirection();
-		$diag_tl_to_rb = $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_BOTH
-							|| $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_DOWN;
-		$diag_tr_to_lb = $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_BOTH
-							|| $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_UP;
-		$border1       |= $diag_tl_to_rb        << 30;
-		$border1       |= $diag_tr_to_lb        << 31;
-
-		$border2        = $this->_top_color;    // Border color
-		$border2       |= $this->_bottom_color   << 7;
-		$border2       |= $this->_diag_color     << 14;
-		$border2       |= self::_mapBorderStyle($this->_style->getBorders()->getDiagonal()->getBorderStyle())           << 21;
-		$border2       |= self::_mapFillType($this->_style->getFill()->getFillType())        << 26;
-
-		$header      = pack("vv",       $record, $length);
-
-		//BIFF8 options: identation, shrinkToFit and  text direction
-		$biff8_options  = $this->_style->getAlignment()->getIndent();
-		$biff8_options |= (int) $this->_style->getAlignment()->getShrinkToFit() << 4;
-
-		$data  = pack("vvvC", $ifnt, $ifmt, $style, $align);
-		$data .= pack("CCC"
-			, self::_mapTextRotation($this->_style->getAlignment()->getTextRotation())
-			, $biff8_options
-			, $used_attrib
-			);
-		$data .= pack("VVv", $border1, $border2, $icv);
-
-		return($header . $data);
-	}
-
-	/**
-	 * Is this a style XF ?
-	 *
-	 * @param boolean $value
-	 */
-	public function setIsStyleXf($value)
-	{
-		$this->_isStyleXf = $value;
-	}
-
-	/**
-	 * Sets the cell's bottom border color
-	 *
-	 * @access public
-	 * @param int $colorIndex Color index
-	 */
-	function setBottomColor($colorIndex)
-	{
-		$this->_bottom_color = $colorIndex;
-	}
-
-	/**
-	 * Sets the cell's top border color
-	 *
-	 * @access public
-	 * @param int $colorIndex Color index
-	 */
-	function setTopColor($colorIndex)
-	{
-		$this->_top_color = $colorIndex;
-	}
-
-	/**
-	 * Sets the cell's left border color
-	 *
-	 * @access public
-	 * @param int $colorIndex Color index
-	 */
-	function setLeftColor($colorIndex)
-	{
-		$this->_left_color = $colorIndex;
-	}
-
-	/**
-	 * Sets the cell's right border color
-	 *
-	 * @access public
-	 * @param int $colorIndex Color index
-	 */
-	function setRightColor($colorIndex)
-	{
-		$this->_right_color = $colorIndex;
-	}
-
-	/**
-	 * Sets the cell's diagonal border color
-	 *
-	 * @access public
-	 * @param int $colorIndex Color index
-	 */
-	function setDiagColor($colorIndex)
-	{
-		$this->_diag_color = $colorIndex;
-	}
-
-
-	/**
-	 * Sets the cell's foreground color
-	 *
-	 * @access public
-	 * @param int $colorIndex Color index
-	 */
-	function setFgColor($colorIndex)
-	{
-		$this->_fg_color = $colorIndex;
-	}
-
-	/**
-	 * Sets the cell's background color
-	 *
-	 * @access public
-	 * @param int $colorIndex Color index
-	 */
-	function setBgColor($colorIndex)
-	{
-		$this->_bg_color = $colorIndex;
-	}
-
-	/**
-	 * Sets the index to the number format record
-	 * It can be date, time, currency, etc...
-	 *
-	 * @access public
-	 * @param integer $numberFormatIndex Index to format record
-	 */
-	function setNumberFormatIndex($numberFormatIndex)
-	{
-		$this->_numberFormatIndex = $numberFormatIndex;
-	}
-
-	/**
-	 * Set the font index.
-	 *
-	 * @param int $value Font index, note that value 4 does not exist
-	 */
-	public function setFontIndex($value)
-	{
-		$this->_fontIndex = $value;
-	}
-
-	/**
-	 * Map of BIFF2-BIFF8 codes for border styles
-	 * @static	array of int
-	 *
-	 */
-	private static $_mapBorderStyle = array	( PHPExcel_Style_Border::BORDER_NONE				=> 0x00,
-											  PHPExcel_Style_Border::BORDER_THIN				=> 0x01,
-											  PHPExcel_Style_Border::BORDER_MEDIUM				=> 0x02,
-											  PHPExcel_Style_Border::BORDER_DASHED				=> 0x03,
-											  PHPExcel_Style_Border::BORDER_DOTTED				=> 0x04,
-											  PHPExcel_Style_Border::BORDER_THICK				=> 0x05,
-											  PHPExcel_Style_Border::BORDER_DOUBLE				=> 0x06,
-											  PHPExcel_Style_Border::BORDER_HAIR				=> 0x07,
-											  PHPExcel_Style_Border::BORDER_MEDIUMDASHED		=> 0x08,
-											  PHPExcel_Style_Border::BORDER_DASHDOT				=> 0x09,
-											  PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT		=> 0x0A,
-											  PHPExcel_Style_Border::BORDER_DASHDOTDOT			=> 0x0B,
-											  PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT	=> 0x0C,
-											  PHPExcel_Style_Border::BORDER_SLANTDASHDOT		=> 0x0D,
-											);
-
-	/**
-	 * Map border style
-	 *
-	 * @param string $borderStyle
-	 * @return int
-	 */
-	private static function _mapBorderStyle($borderStyle) {
-		if (isset(self::$_mapBorderStyle[$borderStyle]))
-			return self::$_mapBorderStyle[$borderStyle];
-		return 0x00;
-	}
-
-	/**
-	 * Map of BIFF2-BIFF8 codes for fill types
-	 * @static	array of int
-	 *
-	 */
-	private static $_mapFillType = array( PHPExcel_Style_Fill::FILL_NONE					=> 0x00,
-										  PHPExcel_Style_Fill::FILL_SOLID					=> 0x01,
-										  PHPExcel_Style_Fill::FILL_PATTERN_MEDIUMGRAY		=> 0x02,
-										  PHPExcel_Style_Fill::FILL_PATTERN_DARKGRAY		=> 0x03,
-										  PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRAY		=> 0x04,
-										  PHPExcel_Style_Fill::FILL_PATTERN_DARKHORIZONTAL	=> 0x05,
-										  PHPExcel_Style_Fill::FILL_PATTERN_DARKVERTICAL	=> 0x06,
-										  PHPExcel_Style_Fill::FILL_PATTERN_DARKDOWN		=> 0x07,
-										  PHPExcel_Style_Fill::FILL_PATTERN_DARKUP			=> 0x08,
-										  PHPExcel_Style_Fill::FILL_PATTERN_DARKGRID		=> 0x09,
-										  PHPExcel_Style_Fill::FILL_PATTERN_DARKTRELLIS		=> 0x0A,
-										  PHPExcel_Style_Fill::FILL_PATTERN_LIGHTHORIZONTAL	=> 0x0B,
-										  PHPExcel_Style_Fill::FILL_PATTERN_LIGHTVERTICAL	=> 0x0C,
-										  PHPExcel_Style_Fill::FILL_PATTERN_LIGHTDOWN		=> 0x0D,
-										  PHPExcel_Style_Fill::FILL_PATTERN_LIGHTUP			=> 0x0E,
-										  PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRID		=> 0x0F,
-										  PHPExcel_Style_Fill::FILL_PATTERN_LIGHTTRELLIS	=> 0x10,
-										  PHPExcel_Style_Fill::FILL_PATTERN_GRAY125			=> 0x11,
-										  PHPExcel_Style_Fill::FILL_PATTERN_GRAY0625		=> 0x12,
-										  PHPExcel_Style_Fill::FILL_GRADIENT_LINEAR			=> 0x00,	// does not exist in BIFF8
-										  PHPExcel_Style_Fill::FILL_GRADIENT_PATH			=> 0x00,	// does not exist in BIFF8
-										);
-	/**
-	 * Map fill type
-	 *
-	 * @param string $fillType
-	 * @return int
-	 */
-	private static function _mapFillType($fillType) {
-		if (isset(self::$_mapFillType[$fillType]))
-			return self::$_mapFillType[$fillType];
-		return 0x00;
-	}
-
-	/**
-	 * Map of BIFF2-BIFF8 codes for horizontal alignment
-	 * @static	array of int
-	 *
-	 */
-	private static $_mapHAlign = array( PHPExcel_Style_Alignment::HORIZONTAL_GENERAL			=> 0,
-										PHPExcel_Style_Alignment::HORIZONTAL_LEFT				=> 1,
-										PHPExcel_Style_Alignment::HORIZONTAL_CENTER				=> 2,
-										PHPExcel_Style_Alignment::HORIZONTAL_RIGHT				=> 3,
-										PHPExcel_Style_Alignment::HORIZONTAL_FILL				=> 4,
-										PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY			=> 5,
-										PHPExcel_Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS	=> 6,
-									  );
-	/**
-	 * Map to BIFF2-BIFF8 codes for horizontal alignment
-	 *
-	 * @param string $hAlign
-	 * @return int
-	 */
-	private function _mapHAlign($hAlign)
-	{
-		if (isset(self::$_mapHAlign[$hAlign]))
-			return self::$_mapHAlign[$hAlign];
-		return 0;
-	}
-
-	/**
-	 * Map of BIFF2-BIFF8 codes for vertical alignment
-	 * @static	array of int
-	 *
-	 */
-	private static $_mapVAlign = array( PHPExcel_Style_Alignment::VERTICAL_TOP		=> 0,
-										PHPExcel_Style_Alignment::VERTICAL_CENTER	=> 1,
-										PHPExcel_Style_Alignment::VERTICAL_BOTTOM	=> 2,
-										PHPExcel_Style_Alignment::VERTICAL_JUSTIFY	=> 3,
-									  );
-	/**
-	 * Map to BIFF2-BIFF8 codes for vertical alignment
-	 *
-	 * @param string $vAlign
-	 * @return int
-	 */
-	private static function _mapVAlign($vAlign) {
-		if (isset(self::$_mapVAlign[$vAlign]))
-			return self::$_mapVAlign[$vAlign];
-		return 2;
-	}
-
-	/**
-	 * Map to BIFF8 codes for text rotation angle
-	 *
-	 * @param int $textRotation
-	 * @return int
-	 */
-	private static function _mapTextRotation($textRotation) {
-		if ($textRotation >= 0) {
-			return $textRotation;
-		}
-		if ($textRotation == -165) {
-			return 255;
-		}
-		if ($textRotation < 0) {
-			return 90 - $textRotation;
-		}
-	}
-
-	/**
-	 * Map locked
-	 *
-	 * @param string
-	 * @return int
-	 */
-	private static function _mapLocked($locked) {
-		switch ($locked) {
-			case PHPExcel_Style_Protection::PROTECTION_INHERIT:		return 1;
-			case PHPExcel_Style_Protection::PROTECTION_PROTECTED:	return 1;
-			case PHPExcel_Style_Protection::PROTECTION_UNPROTECTED:	return 0;
-			default:												return 1;
-		}
-	}
-
-	/**
-	 * Map hidden
-	 *
-	 * @param string
-	 * @return int
-	 */
-	private static function _mapHidden($hidden) {
-		switch ($hidden) {
-			case PHPExcel_Style_Protection::PROTECTION_INHERIT:		return 0;
-			case PHPExcel_Style_Protection::PROTECTION_PROTECTED:	return 1;
-			case PHPExcel_Style_Protection::PROTECTION_UNPROTECTED:	return 0;
-			default:												return 0;
-		}
-	}
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Exception.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Exception.php
deleted file mode 100644
index 1715587a278..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Exception.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Exception
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Exception extends PHPExcel_Exception {
-	/**
-	 * Error handler callback
-	 *
-	 * @param mixed $code
-	 * @param mixed $string
-	 * @param mixed $file
-	 * @param mixed $line
-	 * @param mixed $context
-	 */
-	public static function errorHandlerCallback($code, $string, $file, $line, $context) {
-		$e = new self($string, $code);
-		$e->line = $line;
-		$e->file = $file;
-		throw $e;
-	}
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/HTML.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/HTML.php
deleted file mode 100644
index 63c5d47872d..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/HTML.php
+++ /dev/null
@@ -1,1548 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Writer_HTML
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_HTML
- *
- * @category   PHPExcel
- * @package	PHPExcel_Writer_HTML
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_Writer_IWriter {
-	/**
-	 * PHPExcel object
-	 *
-	 * @var PHPExcel
-	 */
-	protected $_phpExcel;
-
-	/**
-	 * Sheet index to write
-	 *
-	 * @var int
-	 */
-	private $_sheetIndex	= 0;
-
-	/**
-	 * Images root
-	 *
-	 * @var string
-	 */
-	private $_imagesRoot	= '.';
-
-	/**
-	 * embed images, or link to images
-	 *
-	 * @var boolean
-	 */
-	private $_embedImages	= FALSE;
-
-	/**
-	 * Use inline CSS?
-	 *
-	 * @var boolean
-	 */
-	private $_useInlineCss = false;
-
-	/**
-	 * Array of CSS styles
-	 *
-	 * @var array
-	 */
-	private $_cssStyles = null;
-
-	/**
-	 * Array of column widths in points
-	 *
-	 * @var array
-	 */
-	private $_columnWidths = null;
-
-	/**
-	 * Default font
-	 *
-	 * @var PHPExcel_Style_Font
-	 */
-	private $_defaultFont;
-
-	/**
-	 * Flag whether spans have been calculated
-	 *
-	 * @var boolean
-	 */
-	private $_spansAreCalculated	= false;
-
-	/**
-	 * Excel cells that should not be written as HTML cells
-	 *
-	 * @var array
-	 */
-	private $_isSpannedCell	= array();
-
-	/**
-	 * Excel cells that are upper-left corner in a cell merge
-	 *
-	 * @var array
-	 */
-	private $_isBaseCell	= array();
-
-	/**
-	 * Excel rows that should not be written as HTML rows
-	 *
-	 * @var array
-	 */
-	private $_isSpannedRow	= array();
-
-	/**
-	 * Is the current writer creating PDF?
-	 *
-	 * @var boolean
-	 */
-	protected $_isPdf = false;
-
-	/**
-	 * Generate the Navigation block
-	 *
-	 * @var boolean
-	 */
-	private $_generateSheetNavigationBlock = true;
-
-	/**
-	 * Create a new PHPExcel_Writer_HTML
-	 *
-	 * @param	PHPExcel	$phpExcel	PHPExcel object
-	 */
-	public function __construct(PHPExcel $phpExcel) {
-		$this->_phpExcel = $phpExcel;
-		$this->_defaultFont = $this->_phpExcel->getDefaultStyle()->getFont();
-	}
-
-	/**
-	 * Save PHPExcel to file
-	 *
-	 * @param	string		$pFilename
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	public function save($pFilename = null) {
-		// garbage collect
-		$this->_phpExcel->garbageCollect();
-
-		$saveDebugLog = PHPExcel_Calculation::getInstance($this->_phpExcel)->getDebugLog()->getWriteDebugLog();
-		PHPExcel_Calculation::getInstance($this->_phpExcel)->getDebugLog()->setWriteDebugLog(FALSE);
-		$saveArrayReturnType = PHPExcel_Calculation::getArrayReturnType();
-		PHPExcel_Calculation::setArrayReturnType(PHPExcel_Calculation::RETURN_ARRAY_AS_VALUE);
-
-		// Build CSS
-		$this->buildCSS(!$this->_useInlineCss);
-
-		// Open file
-		$fileHandle = fopen($pFilename, 'wb+');
-		if ($fileHandle === false) {
-			throw new PHPExcel_Writer_Exception("Could not open file $pFilename for writing.");
-		}
-
-		// Write headers
-		fwrite($fileHandle, $this->generateHTMLHeader(!$this->_useInlineCss));
-
-		// Write navigation (tabs)
-		if ((!$this->_isPdf) && ($this->_generateSheetNavigationBlock)) {
-			fwrite($fileHandle, $this->generateNavigation());
-		}
-
-		// Write data
-		fwrite($fileHandle, $this->generateSheetData());
-
-		// Write footer
-		fwrite($fileHandle, $this->generateHTMLFooter());
-
-		// Close file
-		fclose($fileHandle);
-
-		PHPExcel_Calculation::setArrayReturnType($saveArrayReturnType);
-		PHPExcel_Calculation::getInstance($this->_phpExcel)->getDebugLog()->setWriteDebugLog($saveDebugLog);
-	}
-
-	/**
-	 * Map VAlign
-	 *
-	 * @param	string		$vAlign		Vertical alignment
-	 * @return string
-	 */
-	private function _mapVAlign($vAlign) {
-		switch ($vAlign) {
-			case PHPExcel_Style_Alignment::VERTICAL_BOTTOM:		return 'bottom';
-			case PHPExcel_Style_Alignment::VERTICAL_TOP:		return 'top';
-			case PHPExcel_Style_Alignment::VERTICAL_CENTER:
-			case PHPExcel_Style_Alignment::VERTICAL_JUSTIFY:	return 'middle';
-			default: return 'baseline';
-		}
-	}
-
-	/**
-	 * Map HAlign
-	 *
-	 * @param	string		$hAlign		Horizontal alignment
-	 * @return string|false
-	 */
-	private function _mapHAlign($hAlign) {
-		switch ($hAlign) {
-			case PHPExcel_Style_Alignment::HORIZONTAL_GENERAL:				return false;
-			case PHPExcel_Style_Alignment::HORIZONTAL_LEFT:					return 'left';
-			case PHPExcel_Style_Alignment::HORIZONTAL_RIGHT:				return 'right';
-			case PHPExcel_Style_Alignment::HORIZONTAL_CENTER:
-			case PHPExcel_Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS:	return 'center';
-			case PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY:				return 'justify';
-			default: return false;
-		}
-	}
-
-	/**
-	 * Map border style
-	 *
-	 * @param	int		$borderStyle		Sheet index
-	 * @return	string
-	 */
-	private function _mapBorderStyle($borderStyle) {
-		switch ($borderStyle) {
-			case PHPExcel_Style_Border::BORDER_NONE:				return 'none';
-			case PHPExcel_Style_Border::BORDER_DASHDOT:				return '1px dashed';
-			case PHPExcel_Style_Border::BORDER_DASHDOTDOT:			return '1px dotted';
-			case PHPExcel_Style_Border::BORDER_DASHED:				return '1px dashed';
-			case PHPExcel_Style_Border::BORDER_DOTTED:				return '1px dotted';
-			case PHPExcel_Style_Border::BORDER_DOUBLE:				return '3px double';
-			case PHPExcel_Style_Border::BORDER_HAIR:				return '1px solid';
-			case PHPExcel_Style_Border::BORDER_MEDIUM:				return '2px solid';
-			case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT:		return '2px dashed';
-			case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT:	return '2px dotted';
-			case PHPExcel_Style_Border::BORDER_MEDIUMDASHED:		return '2px dashed';
-			case PHPExcel_Style_Border::BORDER_SLANTDASHDOT:		return '2px dashed';
-			case PHPExcel_Style_Border::BORDER_THICK:				return '3px solid';
-			case PHPExcel_Style_Border::BORDER_THIN:				return '1px solid';
-			default: return '1px solid'; // map others to thin
-		}
-	}
-
-	/**
-	 * Get sheet index
-	 *
-	 * @return int
-	 */
-	public function getSheetIndex() {
-		return $this->_sheetIndex;
-	}
-
-	/**
-	 * Set sheet index
-	 *
-	 * @param	int		$pValue		Sheet index
-	 * @return PHPExcel_Writer_HTML
-	 */
-	public function setSheetIndex($pValue = 0) {
-		$this->_sheetIndex = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get sheet index
-	 *
-	 * @return boolean
-	 */
-	public function getGenerateSheetNavigationBlock() {
-		return $this->_generateSheetNavigationBlock;
-	}
-
-	/**
-	 * Set sheet index
-	 *
-	 * @param	boolean		$pValue		Flag indicating whether the sheet navigation block should be generated or not
-	 * @return PHPExcel_Writer_HTML
-	 */
-	public function setGenerateSheetNavigationBlock($pValue = true) {
-		$this->_generateSheetNavigationBlock = (bool) $pValue;
-		return $this;
-	}
-
-	/**
-	 * Write all sheets (resets sheetIndex to NULL)
-	 */
-	public function writeAllSheets() {
-		$this->_sheetIndex = null;
-		return $this;
-	}
-
-	/**
-	 * Generate HTML header
-	 *
-	 * @param	boolean		$pIncludeStyles		Include styles?
-	 * @return	string
-	 * @throws PHPExcel_Writer_Exception
-	 */
-	public function generateHTMLHeader($pIncludeStyles = false) {
-		// PHPExcel object known?
-		if (is_null($this->_phpExcel)) {
-			throw new PHPExcel_Writer_Exception('Internal PHPExcel object not set to an instance of an object.');
-		}
-
-		// Construct HTML
-		$properties = $this->_phpExcel->getProperties();
-		$html = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">' . PHP_EOL;
-		$html .= '<!-- Generated by PHPExcel - http://www.phpexcel.net -->' . PHP_EOL;
-		$html .= '<html>' . PHP_EOL;
-		$html .= '  <head>' . PHP_EOL;
-		$html .= '	  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">' . PHP_EOL;
-		if ($properties->getTitle() > '')
-			$html .= '	  <title>' . htmlspecialchars($properties->getTitle()) . '</title>' . PHP_EOL;
-
-		if ($properties->getCreator() > '')
-			$html .= '	  <meta name="author" content="' . htmlspecialchars($properties->getCreator()) . '" />' . PHP_EOL;
-		if ($properties->getTitle() > '')
-			$html .= '	  <meta name="title" content="' . htmlspecialchars($properties->getTitle()) . '" />' . PHP_EOL;
-		if ($properties->getDescription() > '')
-			$html .= '	  <meta name="description" content="' . htmlspecialchars($properties->getDescription()) . '" />' . PHP_EOL;
-		if ($properties->getSubject() > '')
-			$html .= '	  <meta name="subject" content="' . htmlspecialchars($properties->getSubject()) . '" />' . PHP_EOL;
-		if ($properties->getKeywords() > '')
-			$html .= '	  <meta name="keywords" content="' . htmlspecialchars($properties->getKeywords()) . '" />' . PHP_EOL;
-		if ($properties->getCategory() > '')
-			$html .= '	  <meta name="category" content="' . htmlspecialchars($properties->getCategory()) . '" />' . PHP_EOL;
-		if ($properties->getCompany() > '')
-			$html .= '	  <meta name="company" content="' . htmlspecialchars($properties->getCompany()) . '" />' . PHP_EOL;
-		if ($properties->getManager() > '')
-			$html .= '	  <meta name="manager" content="' . htmlspecialchars($properties->getManager()) . '" />' . PHP_EOL;
-
-		if ($pIncludeStyles) {
-			$html .= $this->generateStyles(true);
-		}
-
-		$html .= '  </head>' . PHP_EOL;
-		$html .= '' . PHP_EOL;
-		$html .= '  <body>' . PHP_EOL;
-
-		// Return
-		return $html;
-	}
-
-	/**
-	 * Generate sheet data
-	 *
-	 * @return	string
-	 * @throws PHPExcel_Writer_Exception
-	 */
-	public function generateSheetData() {
-		// PHPExcel object known?
-		if (is_null($this->_phpExcel)) {
-			throw new PHPExcel_Writer_Exception('Internal PHPExcel object not set to an instance of an object.');
-		}
-
-		// Ensure that Spans have been calculated?
-		if (!$this->_spansAreCalculated) {
-			$this->_calculateSpans();
-		}
-
-		// Fetch sheets
-		$sheets = array();
-		if (is_null($this->_sheetIndex)) {
-			$sheets = $this->_phpExcel->getAllSheets();
-		} else {
-			$sheets[] = $this->_phpExcel->getSheet($this->_sheetIndex);
-		}
-
-		// Construct HTML
-		$html = '';
-
-		// Loop all sheets
-		$sheetId = 0;
-		foreach ($sheets as $sheet) {
-			// Write table header
-			$html .= $this->_generateTableHeader($sheet);
-
-			// Get worksheet dimension
-			$dimension = explode(':', $sheet->calculateWorksheetDimension());
-			$dimension[0] = PHPExcel_Cell::coordinateFromString($dimension[0]);
-			$dimension[0][0] = PHPExcel_Cell::columnIndexFromString($dimension[0][0]) - 1;
-			$dimension[1] = PHPExcel_Cell::coordinateFromString($dimension[1]);
-			$dimension[1][0] = PHPExcel_Cell::columnIndexFromString($dimension[1][0]) - 1;
-
-			// row min,max
-			$rowMin = $dimension[0][1];
-			$rowMax = $dimension[1][1];
-
-			// calculate start of <tbody>, <thead>
-			$tbodyStart = $rowMin;
-			$theadStart = $theadEnd   = 0; // default: no <thead>	no </thead>
-			if ($sheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
-				$rowsToRepeatAtTop = $sheet->getPageSetup()->getRowsToRepeatAtTop();
-
-				// we can only support repeating rows that start at top row
-				if ($rowsToRepeatAtTop[0] == 1) {
-					$theadStart = $rowsToRepeatAtTop[0];
-					$theadEnd   = $rowsToRepeatAtTop[1];
-					$tbodyStart = $rowsToRepeatAtTop[1] + 1;
-				}
-			}
-
-			// Loop through cells
-			$row = $rowMin-1;
-			while($row++ < $rowMax) {
-				// <thead> ?
-				if ($row == $theadStart) {
-					$html .= '		<thead>' . PHP_EOL;
-                    $cellType = 'th';
-				}
-
-				// <tbody> ?
-				if ($row == $tbodyStart) {
-					$html .= '		<tbody>' . PHP_EOL;
-                    $cellType = 'td';
-				}
-
-				// Write row if there are HTML table cells in it
-				if ( !isset($this->_isSpannedRow[$sheet->getParent()->getIndex($sheet)][$row]) ) {
-					// Start a new rowData
-					$rowData = array();
-					// Loop through columns
-					$column = $dimension[0][0] - 1;
-					while($column++ < $dimension[1][0]) {
-						// Cell exists?
-						if ($sheet->cellExistsByColumnAndRow($column, $row)) {
-							$rowData[$column] = PHPExcel_Cell::stringFromColumnIndex($column) . $row;
-						} else {
-							$rowData[$column] = '';
-						}
-					}
-					$html .= $this->_generateRow($sheet, $rowData, $row - 1, $cellType);
-				}
-
-				// </thead> ?
-				if ($row == $theadEnd) {
-					$html .= '		</thead>' . PHP_EOL;
-				}
-			}
-			$html .= $this->_extendRowsForChartsAndImages($sheet, $row);
-
-			// Close table body.
-			$html .= '		</tbody>' . PHP_EOL;
-
-			// Write table footer
-			$html .= $this->_generateTableFooter();
-
-			// Writing PDF?
-			if ($this->_isPdf) {
-				if (is_null($this->_sheetIndex) && $sheetId + 1 < $this->_phpExcel->getSheetCount()) {
-					$html .= '<div style="page-break-before:always" />';
-				}
-			}
-
-			// Next sheet
-			++$sheetId;
-		}
-
-		// Return
-		return $html;
-	}
-
-	/**
-	 * Generate sheet tabs
-	 *
-	 * @return	string
-	 * @throws PHPExcel_Writer_Exception
-	 */
-	public function generateNavigation()
-	{
-		// PHPExcel object known?
-		if (is_null($this->_phpExcel)) {
-			throw new PHPExcel_Writer_Exception('Internal PHPExcel object not set to an instance of an object.');
-		}
-
-		// Fetch sheets
-		$sheets = array();
-		if (is_null($this->_sheetIndex)) {
-			$sheets = $this->_phpExcel->getAllSheets();
-		} else {
-			$sheets[] = $this->_phpExcel->getSheet($this->_sheetIndex);
-		}
-
-		// Construct HTML
-		$html = '';
-
-		// Only if there are more than 1 sheets
-		if (count($sheets) > 1) {
-			// Loop all sheets
-			$sheetId = 0;
-
-			$html .= '<ul class="navigation">' . PHP_EOL;
-
-			foreach ($sheets as $sheet) {
-				$html .= '  <li class="sheet' . $sheetId . '"><a href="#sheet' . $sheetId . '">' . $sheet->getTitle() . '</a></li>' . PHP_EOL;
-				++$sheetId;
-			}
-
-			$html .= '</ul>' . PHP_EOL;
-		}
-
-		return $html;
-	}
-
-	private function _extendRowsForChartsAndImages(PHPExcel_Worksheet $pSheet, $row) {
-		$rowMax = $row;
-		$colMax = 'A';
-		if ($this->_includeCharts) {
-			foreach ($pSheet->getChartCollection() as $chart) {
-				if ($chart instanceof PHPExcel_Chart) {
-				    $chartCoordinates = $chart->getTopLeftPosition();
-				    $chartTL = PHPExcel_Cell::coordinateFromString($chartCoordinates['cell']);
-					$chartCol = PHPExcel_Cell::columnIndexFromString($chartTL[0]);
-					if ($chartTL[1] > $rowMax) {
-						$rowMax = $chartTL[1];
-						if ($chartCol > PHPExcel_Cell::columnIndexFromString($colMax)) {
-							$colMax = $chartTL[0];
-						}
-					}
-				}
-			}
-		}
-
-		foreach ($pSheet->getDrawingCollection() as $drawing) {
-			if ($drawing instanceof PHPExcel_Worksheet_Drawing) {
-			    $imageTL = PHPExcel_Cell::coordinateFromString($drawing->getCoordinates());
-				$imageCol = PHPExcel_Cell::columnIndexFromString($imageTL[0]);
-				if ($imageTL[1] > $rowMax) {
-					$rowMax = $imageTL[1];
-					if ($imageCol > PHPExcel_Cell::columnIndexFromString($colMax)) {
-						$colMax = $imageTL[0];
-					}
-				}
-			}
-		}
-		$html = '';
-		$colMax++;
-		while ($row < $rowMax) {
-			$html .= '<tr>';
-			for ($col = 'A'; $col != $colMax; ++$col) {
-				$html .= '<td>';
-				$html .= $this->_writeImageInCell($pSheet, $col.$row);
-				if ($this->_includeCharts) {
-					$html .= $this->_writeChartInCell($pSheet, $col.$row);
-				}
-				$html .= '</td>';
-			}
-			++$row;
-			$html .= '</tr>';
-		}
-		return $html;
-	}
-
-
-	/**
-	 * Generate image tag in cell
-	 *
-	 * @param	PHPExcel_Worksheet	$pSheet			PHPExcel_Worksheet
-	 * @param	string				$coordinates	Cell coordinates
-	 * @return	string
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _writeImageInCell(PHPExcel_Worksheet $pSheet, $coordinates) {
-		// Construct HTML
-		$html = '';
-
-		// Write images
-		foreach ($pSheet->getDrawingCollection() as $drawing) {
-			if ($drawing instanceof PHPExcel_Worksheet_Drawing) {
-				if ($drawing->getCoordinates() == $coordinates) {
-					$filename = $drawing->getPath();
-
-					// Strip off eventual '.'
-					if (substr($filename, 0, 1) == '.') {
-						$filename = substr($filename, 1);
-					}
-
-					// Prepend images root
-					$filename = $this->getImagesRoot() . $filename;
-
-					// Strip off eventual '.'
-					if (substr($filename, 0, 1) == '.' && substr($filename, 0, 2) != './') {
-						$filename = substr($filename, 1);
-					}
-
-					// Convert UTF8 data to PCDATA
-					$filename = htmlspecialchars($filename);
-
-					$html .= PHP_EOL;
-					if ((!$this->_embedImages) || ($this->_isPdf)) {
-						$imageData = $filename;
-					} else {
-						$imageDetails = getimagesize($filename);
-						if ($fp = fopen($filename,"rb", 0)) {
-							$picture = fread($fp,filesize($filename));
-							fclose($fp);
-							// base64 encode the binary data, then break it
-							// into chunks according to RFC 2045 semantics
-							$base64 = chunk_split(base64_encode($picture));
-							$imageData = 'data:'.$imageDetails['mime'].';base64,' . $base64;
-						} else {
-							$imageData = $filename;
-						}
-					}
-
-					$html .= '<div style="position: relative;">';
-					$html .= '<img style="position: absolute; z-index: 1; left: ' . 
-                        $drawing->getOffsetX() . 'px; top: ' . $drawing->getOffsetY() . 'px; width: ' . 
-                        $drawing->getWidth() . 'px; height: ' . $drawing->getHeight() . 'px;" src="' . 
-                        $imageData . '" border="0" />';
-					$html .= '</div>';
-				}
-			}
-		}
-
-		// Return
-		return $html;
-	}
-
-	/**
-	 * Generate chart tag in cell
-	 *
-	 * @param	PHPExcel_Worksheet	$pSheet			PHPExcel_Worksheet
-	 * @param	string				$coordinates	Cell coordinates
-	 * @return	string
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _writeChartInCell(PHPExcel_Worksheet $pSheet, $coordinates) {
-		// Construct HTML
-		$html = '';
-
-		// Write charts
-		foreach ($pSheet->getChartCollection() as $chart) {
-			if ($chart instanceof PHPExcel_Chart) {
-			    $chartCoordinates = $chart->getTopLeftPosition();
-				if ($chartCoordinates['cell'] == $coordinates) {
-					$chartFileName = PHPExcel_Shared_File::sys_get_temp_dir().'/'.uniqid().'.png';
-					if (!$chart->render($chartFileName)) {
-						return;
-					}
-
-					$html .= PHP_EOL;
-					$imageDetails = getimagesize($chartFileName);
-					if ($fp = fopen($chartFileName,"rb", 0)) {
-						$picture = fread($fp,filesize($chartFileName));
-						fclose($fp);
-						// base64 encode the binary data, then break it
-						// into chunks according to RFC 2045 semantics
-						$base64 = chunk_split(base64_encode($picture));
-						$imageData = 'data:'.$imageDetails['mime'].';base64,' . $base64;
-
-						$html .= '<div style="position: relative;">';
-						$html .= '<img style="position: absolute; z-index: 1; left: ' . $chartCoordinates['xOffset'] . 'px; top: ' . $chartCoordinates['yOffset'] . 'px; width: ' . $imageDetails[0] . 'px; height: ' . $imageDetails[1] . 'px;" src="' . $imageData . '" border="0" />' . PHP_EOL;
-						$html .= '</div>';
-
-						unlink($chartFileName);
-					}
-				}
-			}
-		}
-
-		// Return
-		return $html;
-	}
-
-	/**
-	 * Generate CSS styles
-	 *
-	 * @param	boolean	$generateSurroundingHTML	Generate surrounding HTML tags? (&lt;style&gt; and &lt;/style&gt;)
-	 * @return	string
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	public function generateStyles($generateSurroundingHTML = true) {
-		// PHPExcel object known?
-		if (is_null($this->_phpExcel)) {
-			throw new PHPExcel_Writer_Exception('Internal PHPExcel object not set to an instance of an object.');
-		}
-
-		// Build CSS
-		$css = $this->buildCSS($generateSurroundingHTML);
-
-		// Construct HTML
-		$html = '';
-
-		// Start styles
-		if ($generateSurroundingHTML) {
-			$html .= '	<style type="text/css">' . PHP_EOL;
-			$html .= '	  html { ' . $this->_assembleCSS($css['html']) . ' }' . PHP_EOL;
-		}
-
-		// Write all other styles
-		foreach ($css as $styleName => $styleDefinition) {
-			if ($styleName != 'html') {
-				$html .= '	  ' . $styleName . ' { ' . $this->_assembleCSS($styleDefinition) . ' }' . PHP_EOL;
-			}
-		}
-
-		// End styles
-		if ($generateSurroundingHTML) {
-			$html .= '	</style>' . PHP_EOL;
-		}
-
-		// Return
-		return $html;
-	}
-
-	/**
-	 * Build CSS styles
-	 *
-	 * @param	boolean	$generateSurroundingHTML	Generate surrounding HTML style? (html { })
-	 * @return	array
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	public function buildCSS($generateSurroundingHTML = true) {
-		// PHPExcel object known?
-		if (is_null($this->_phpExcel)) {
-			throw new PHPExcel_Writer_Exception('Internal PHPExcel object not set to an instance of an object.');
-		}
-
-		// Cached?
-		if (!is_null($this->_cssStyles)) {
-			return $this->_cssStyles;
-		}
-
-		// Ensure that spans have been calculated
-		if (!$this->_spansAreCalculated) {
-			$this->_calculateSpans();
-		}
-
-		// Construct CSS
-		$css = array();
-
-		// Start styles
-		if ($generateSurroundingHTML) {
-			// html { }
-			$css['html']['font-family']	  = 'Calibri, Arial, Helvetica, sans-serif';
-			$css['html']['font-size']		= '11pt';
-			$css['html']['background-color'] = 'white';
-		}
-
-
-		// table { }
-		$css['table']['border-collapse']  = 'collapse';
-	    if (!$this->_isPdf) {
-			$css['table']['page-break-after'] = 'always';
-		}
-
-		// .gridlines td { }
-		$css['.gridlines td']['border'] = '1px dotted black';
-		$css['.gridlines th']['border'] = '1px dotted black';
-
-		// .b {}
-		$css['.b']['text-align'] = 'center'; // BOOL
-
-		// .e {}
-		$css['.e']['text-align'] = 'center'; // ERROR
-
-		// .f {}
-		$css['.f']['text-align'] = 'right'; // FORMULA
-
-		// .inlineStr {}
-		$css['.inlineStr']['text-align'] = 'left'; // INLINE
-
-		// .n {}
-		$css['.n']['text-align'] = 'right'; // NUMERIC
-
-		// .s {}
-		$css['.s']['text-align'] = 'left'; // STRING
-
-		// Calculate cell style hashes
-		foreach ($this->_phpExcel->getCellXfCollection() as $index => $style) {
-			$css['td.style' . $index] = $this->_createCSSStyle( $style );
-			$css['th.style' . $index] = $this->_createCSSStyle( $style );
-		}
-
-		// Fetch sheets
-		$sheets = array();
-		if (is_null($this->_sheetIndex)) {
-			$sheets = $this->_phpExcel->getAllSheets();
-		} else {
-			$sheets[] = $this->_phpExcel->getSheet($this->_sheetIndex);
-		}
-
-		// Build styles per sheet
-		foreach ($sheets as $sheet) {
-			// Calculate hash code
-			$sheetIndex = $sheet->getParent()->getIndex($sheet);
-
-			// Build styles
-			// Calculate column widths
-			$sheet->calculateColumnWidths();
-
-			// col elements, initialize
-			$highestColumnIndex = PHPExcel_Cell::columnIndexFromString($sheet->getHighestColumn()) - 1;
-			$column = -1;
-			while($column++ < $highestColumnIndex) {
-				$this->_columnWidths[$sheetIndex][$column] = 42; // approximation
-				$css['table.sheet' . $sheetIndex . ' col.col' . $column]['width'] = '42pt';
-			}
-
-			// col elements, loop through columnDimensions and set width
-			foreach ($sheet->getColumnDimensions() as $columnDimension) {
-				if (($width = PHPExcel_Shared_Drawing::cellDimensionToPixels($columnDimension->getWidth(), $this->_defaultFont)) >= 0) {
-					$width = PHPExcel_Shared_Drawing::pixelsToPoints($width);
-					$column = PHPExcel_Cell::columnIndexFromString($columnDimension->getColumnIndex()) - 1;
-					$this->_columnWidths[$sheetIndex][$column] = $width;
-					$css['table.sheet' . $sheetIndex . ' col.col' . $column]['width'] = $width . 'pt';
-
-					if ($columnDimension->getVisible() === false) {
-						$css['table.sheet' . $sheetIndex . ' col.col' . $column]['visibility'] = 'collapse';
-						$css['table.sheet' . $sheetIndex . ' col.col' . $column]['*display'] = 'none'; // target IE6+7
-					}
-				}
-			}
-
-			// Default row height
-			$rowDimension = $sheet->getDefaultRowDimension();
-
-			// table.sheetN tr { }
-			$css['table.sheet' . $sheetIndex . ' tr'] = array();
-
-			if ($rowDimension->getRowHeight() == -1) {
-				$pt_height = PHPExcel_Shared_Font::getDefaultRowHeightByFont($this->_phpExcel->getDefaultStyle()->getFont());
-			} else {
-				$pt_height = $rowDimension->getRowHeight();
-			}
-			$css['table.sheet' . $sheetIndex . ' tr']['height'] = $pt_height . 'pt';
-			if ($rowDimension->getVisible() === false) {
-				$css['table.sheet' . $sheetIndex . ' tr']['display']	= 'none';
-				$css['table.sheet' . $sheetIndex . ' tr']['visibility'] = 'hidden';
-			}
-
-			// Calculate row heights
-			foreach ($sheet->getRowDimensions() as $rowDimension) {
-				$row = $rowDimension->getRowIndex() - 1;
-
-				// table.sheetN tr.rowYYYYYY { }
-				$css['table.sheet' . $sheetIndex . ' tr.row' . $row] = array();
-
-				if ($rowDimension->getRowHeight() == -1) {
-					$pt_height = PHPExcel_Shared_Font::getDefaultRowHeightByFont($this->_phpExcel->getDefaultStyle()->getFont());
-				} else {
-					$pt_height = $rowDimension->getRowHeight();
-				}
-				$css['table.sheet' . $sheetIndex . ' tr.row' . $row]['height'] = $pt_height . 'pt';
-				if ($rowDimension->getVisible() === false) {
-					$css['table.sheet' . $sheetIndex . ' tr.row' . $row]['display'] = 'none';
-					$css['table.sheet' . $sheetIndex . ' tr.row' . $row]['visibility'] = 'hidden';
-				}
-			}
-		}
-
-		// Cache
-		if (is_null($this->_cssStyles)) {
-			$this->_cssStyles = $css;
-		}
-
-		// Return
-		return $css;
-	}
-
-	/**
-	 * Create CSS style
-	 *
-	 * @param	PHPExcel_Style		$pStyle			PHPExcel_Style
-	 * @return	array
-	 */
-	private function _createCSSStyle(PHPExcel_Style $pStyle) {
-		// Construct CSS
-		$css = '';
-
-		// Create CSS
-		$css = array_merge(
-			$this->_createCSSStyleAlignment($pStyle->getAlignment())
-			, $this->_createCSSStyleBorders($pStyle->getBorders())
-			, $this->_createCSSStyleFont($pStyle->getFont())
-			, $this->_createCSSStyleFill($pStyle->getFill())
-		);
-
-		// Return
-		return $css;
-	}
-
-	/**
-	 * Create CSS style (PHPExcel_Style_Alignment)
-	 *
-	 * @param	PHPExcel_Style_Alignment		$pStyle			PHPExcel_Style_Alignment
-	 * @return	array
-	 */
-	private function _createCSSStyleAlignment(PHPExcel_Style_Alignment $pStyle) {
-		// Construct CSS
-		$css = array();
-
-		// Create CSS
-		$css['vertical-align'] = $this->_mapVAlign($pStyle->getVertical());
-		if ($textAlign = $this->_mapHAlign($pStyle->getHorizontal())) {
-			$css['text-align'] = $textAlign;
-			if(in_array($textAlign,array('left','right')))
-				$css['padding-'.$textAlign] = (string)((int)$pStyle->getIndent() * 9).'px';
-		}
-
-		// Return
-		return $css;
-	}
-
-	/**
-	 * Create CSS style (PHPExcel_Style_Font)
-	 *
-	 * @param	PHPExcel_Style_Font		$pStyle			PHPExcel_Style_Font
-	 * @return	array
-	 */
-	private function _createCSSStyleFont(PHPExcel_Style_Font $pStyle) {
-		// Construct CSS
-		$css = array();
-
-		// Create CSS
-		if ($pStyle->getBold()) {
-			$css['font-weight'] = 'bold';
-		}
-		if ($pStyle->getUnderline() != PHPExcel_Style_Font::UNDERLINE_NONE && $pStyle->getStrikethrough()) {
-			$css['text-decoration'] = 'underline line-through';
-		} else if ($pStyle->getUnderline() != PHPExcel_Style_Font::UNDERLINE_NONE) {
-			$css['text-decoration'] = 'underline';
-		} else if ($pStyle->getStrikethrough()) {
-			$css['text-decoration'] = 'line-through';
-		}
-		if ($pStyle->getItalic()) {
-			$css['font-style'] = 'italic';
-		}
-
-		$css['color']		= '#' . $pStyle->getColor()->getRGB();
-		$css['font-family']	= '\'' . $pStyle->getName() . '\'';
-		$css['font-size']	= $pStyle->getSize() . 'pt';
-
-		// Return
-		return $css;
-	}
-
-	/**
-	 * Create CSS style (PHPExcel_Style_Borders)
-	 *
-	 * @param	PHPExcel_Style_Borders		$pStyle			PHPExcel_Style_Borders
-	 * @return	array
-	 */
-	private function _createCSSStyleBorders(PHPExcel_Style_Borders $pStyle) {
-		// Construct CSS
-		$css = array();
-
-		// Create CSS
-		$css['border-bottom']	= $this->_createCSSStyleBorder($pStyle->getBottom());
-		$css['border-top']		= $this->_createCSSStyleBorder($pStyle->getTop());
-		$css['border-left']		= $this->_createCSSStyleBorder($pStyle->getLeft());
-		$css['border-right']	= $this->_createCSSStyleBorder($pStyle->getRight());
-
-		// Return
-		return $css;
-	}
-
-	/**
-	 * Create CSS style (PHPExcel_Style_Border)
-	 *
-	 * @param	PHPExcel_Style_Border		$pStyle			PHPExcel_Style_Border
-	 * @return	string
-	 */
-	private function _createCSSStyleBorder(PHPExcel_Style_Border $pStyle) {
-		// Create CSS
-//		$css = $this->_mapBorderStyle($pStyle->getBorderStyle()) . ' #' . $pStyle->getColor()->getRGB();
-		//	Create CSS - add !important to non-none border styles for merged cells  
-		$borderStyle = $this->_mapBorderStyle($pStyle->getBorderStyle());  
-		$css = $borderStyle . ' #' . $pStyle->getColor()->getRGB() . (($borderStyle == 'none') ? '' : ' !important'); 
-
-		// Return
-		return $css;
-	}
-
-	/**
-	 * Create CSS style (PHPExcel_Style_Fill)
-	 *
-	 * @param	PHPExcel_Style_Fill		$pStyle			PHPExcel_Style_Fill
-	 * @return	array
-	 */
-	private function _createCSSStyleFill(PHPExcel_Style_Fill $pStyle) {
-		// Construct HTML
-		$css = array();
-
-		// Create CSS
-		$value = $pStyle->getFillType() == PHPExcel_Style_Fill::FILL_NONE ?
-			'white' : '#' . $pStyle->getStartColor()->getRGB();
-		$css['background-color'] = $value;
-
-		// Return
-		return $css;
-	}
-
-	/**
-	 * Generate HTML footer
-	 */
-	public function generateHTMLFooter() {
-		// Construct HTML
-		$html = '';
-		$html .= '  </body>' . PHP_EOL;
-		$html .= '</html>' . PHP_EOL;
-
-		// Return
-		return $html;
-	}
-
-	/**
-	 * Generate table header
-	 *
-	 * @param	PHPExcel_Worksheet	$pSheet		The worksheet for the table we are writing
-	 * @return	string
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _generateTableHeader($pSheet) {
-		$sheetIndex = $pSheet->getParent()->getIndex($pSheet);
-
-		// Construct HTML
-		$html = '';
-		$html .= $this->_setMargins($pSheet);
-			
-		if (!$this->_useInlineCss) {
-			$gridlines = $pSheet->getShowGridlines() ? ' gridlines' : '';
-			$html .= '	<table border="0" cellpadding="0" cellspacing="0" id="sheet' . $sheetIndex . '" class="sheet' . $sheetIndex . $gridlines . '">' . PHP_EOL;
-		} else {
-			$style = isset($this->_cssStyles['table']) ?
-				$this->_assembleCSS($this->_cssStyles['table']) : '';
-
-			if ($this->_isPdf && $pSheet->getShowGridlines()) {
-				$html .= '	<table border="1" cellpadding="1" id="sheet' . $sheetIndex . '" cellspacing="1" style="' . $style . '">' . PHP_EOL;
-			} else {
-				$html .= '	<table border="0" cellpadding="1" id="sheet' . $sheetIndex . '" cellspacing="0" style="' . $style . '">' . PHP_EOL;
-			}
-		}
-
-		// Write <col> elements
-		$highestColumnIndex = PHPExcel_Cell::columnIndexFromString($pSheet->getHighestColumn()) - 1;
-		$i = -1;
-		while($i++ < $highestColumnIndex) {
-		    if (!$this->_isPdf) {
-				if (!$this->_useInlineCss) {
-					$html .= '		<col class="col' . $i . '">' . PHP_EOL;
-				} else {
-					$style = isset($this->_cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i]) ?
-						$this->_assembleCSS($this->_cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i]) : '';
-					$html .= '		<col style="' . $style . '">' . PHP_EOL;
-				}
-			}
-		}
-
-		// Return
-		return $html;
-	}
-
-	/**
-	 * Generate table footer
-	 *
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _generateTableFooter() {
-		// Construct HTML
-		$html = '';
-		$html .= '	</table>' . PHP_EOL;
-
-		// Return
-		return $html;
-	}
-
-	/**
-	 * Generate row
-	 *
-	 * @param	PHPExcel_Worksheet	$pSheet			PHPExcel_Worksheet
-	 * @param	array				$pValues		Array containing cells in a row
-	 * @param	int					$pRow			Row number (0-based)
-	 * @return	string
-	 * @throws	PHPExcel_Writer_Exception
-	 */
-	private function _generateRow(PHPExcel_Worksheet $pSheet, $pValues = null, $pRow = 0, $cellType = 'td') {
-		if (is_array($pValues)) {
-			// Construct HTML
-			$html = '';
-
-			// Sheet index
-			$sheetIndex = $pSheet->getParent()->getIndex($pSheet);
-
-			// DomPDF and breaks
-			if ($this->_isPdf && count($pSheet->getBreaks()) > 0) {
-				$breaks = $pSheet->getBreaks();
-
-				// check if a break is needed before this row
-				if (isset($breaks['A' . $pRow])) {
-					// close table: </table>
-					$html .= $this->_generateTableFooter();
-
-					// insert page break
-					$html .= '<div style="page-break-before:always" />';
-
-					// open table again: <table> + <col> etc.
-					$html .= $this->_generateTableHeader($pSheet);
-				}
-			}
-
-			// Write row start
-			if (!$this->_useInlineCss) {
-				$html .= '		  <tr class="row' . $pRow . '">' . PHP_EOL;
-			} else {
-				$style = isset($this->_cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow])
-					? $this->_assembleCSS($this->_cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]) : '';
-
-				$html .= '		  <tr style="' . $style . '">' . PHP_EOL;
-			}
-
-			// Write cells
-			$colNum = 0;
-			foreach ($pValues as $cellAddress) {
-                $cell = ($cellAddress > '') ? $pSheet->getCell($cellAddress) : '';
-				$coordinate = PHPExcel_Cell::stringFromColumnIndex($colNum) . ($pRow + 1);
-				if (!$this->_useInlineCss) {
-					$cssClass = '';
-					$cssClass = 'column' . $colNum;
-				} else {
-					$cssClass = array();
-                    if ($cellType == 'th') {
-                        if (isset($this->_cssStyles['table.sheet' . $sheetIndex . ' th.column' . $colNum])) {
-                            $this->_cssStyles['table.sheet' . $sheetIndex . ' th.column' . $colNum];
-                        }
-                    } else {
-                        if (isset($this->_cssStyles['table.sheet' . $sheetIndex . ' td.column' . $colNum])) {
-                            $this->_cssStyles['table.sheet' . $sheetIndex . ' td.column' . $colNum];
-                        }
-                    }
-				}
-				$colSpan = 1;
-				$rowSpan = 1;
-
-				// initialize
-				$cellData = '&nbsp;';
-
-				// PHPExcel_Cell
-				if ($cell instanceof PHPExcel_Cell) {
-					$cellData = '';
-					if (is_null($cell->getParent())) {
-						$cell->attach($pSheet);
-					}
-					// Value
-					if ($cell->getValue() instanceof PHPExcel_RichText) {
-						// Loop through rich text elements
-						$elements = $cell->getValue()->getRichTextElements();
-						foreach ($elements as $element) {
-							// Rich text start?
-							if ($element instanceof PHPExcel_RichText_Run) {
-								$cellData .= '<span style="' . $this->_assembleCSS($this->_createCSSStyleFont($element->getFont())) . '">';
-
-								if ($element->getFont()->getSuperScript()) {
-									$cellData .= '<sup>';
-								} else if ($element->getFont()->getSubScript()) {
-									$cellData .= '<sub>';
-								}
-							}
-
-							// Convert UTF8 data to PCDATA
-							$cellText = $element->getText();
-							$cellData .= htmlspecialchars($cellText);
-
-							if ($element instanceof PHPExcel_RichText_Run) {
-								if ($element->getFont()->getSuperScript()) {
-									$cellData .= '</sup>';
-								} else if ($element->getFont()->getSubScript()) {
-									$cellData .= '</sub>';
-								}
-
-								$cellData .= '</span>';
-							}
-						}
-					} else {
-						if ($this->_preCalculateFormulas) {
-							$cellData = PHPExcel_Style_NumberFormat::toFormattedString(
-								$cell->getCalculatedValue(),
-								$pSheet->getParent()->getCellXfByIndex( $cell->getXfIndex() )->getNumberFormat()->getFormatCode(),
-								array($this, 'formatColor')
-							);
-						} else {
-							$cellData = PHPExcel_Style_NumberFormat::toFormattedString(
-								$cell->getValue(),
-								$pSheet->getParent()->getCellXfByIndex( $cell->getXfIndex() )->getNumberFormat()->getFormatCode(),
-								array($this, 'formatColor')
-							);
-						}
-						$cellData = htmlspecialchars($cellData);
-						if ($pSheet->getParent()->getCellXfByIndex( $cell->getXfIndex() )->getFont()->getSuperScript()) {
-							$cellData = '<sup>'.$cellData.'</sup>';
-						} elseif ($pSheet->getParent()->getCellXfByIndex( $cell->getXfIndex() )->getFont()->getSubScript()) {
-							$cellData = '<sub>'.$cellData.'</sub>';
-						}
-					}
-
-					// Converts the cell content so that spaces occuring at beginning of each new line are replaced by &nbsp;
-					// Example: "  Hello\n to the world" is converted to "&nbsp;&nbsp;Hello\n&nbsp;to the world"
-					$cellData = preg_replace("/(?m)(?:^|\\G) /", '&nbsp;', $cellData);
-
-					// convert newline "\n" to '<br>'
-					$cellData = nl2br($cellData);
-
-					// Extend CSS class?
-					if (!$this->_useInlineCss) {
-						$cssClass .= ' style' . $cell->getXfIndex();
-						$cssClass .= ' ' . $cell->getDataType();
-					} else {
-                        if ($cellType == 'th') {
-                            if (isset($this->_cssStyles['th.style' . $cell->getXfIndex()])) {
-                                $cssClass = array_merge($cssClass, $this->_cssStyles['th.style' . $cell->getXfIndex()]);
-                            }
-                        } else {
-                            if (isset($this->_cssStyles['td.style' . $cell->getXfIndex()])) {
-                                $cssClass = array_merge($cssClass, $this->_cssStyles['td.style' . $cell->getXfIndex()]);
-                            }
-                        }
-
-						// General horizontal alignment: Actual horizontal alignment depends on dataType
-						$sharedStyle = $pSheet->getParent()->getCellXfByIndex( $cell->getXfIndex() );
-						if ($sharedStyle->getAlignment()->getHorizontal() == PHPExcel_Style_Alignment::HORIZONTAL_GENERAL
-							&& isset($this->_cssStyles['.' . $cell->getDataType()]['text-align']))
-						{
-							$cssClass['text-align'] = $this->_cssStyles['.' . $cell->getDataType()]['text-align'];
-						}
-					}
-				}
-
-				// Hyperlink?
-				if ($pSheet->hyperlinkExists($coordinate) && !$pSheet->getHyperlink($coordinate)->isInternal()) {
-					$cellData = '<a href="' . htmlspecialchars($pSheet->getHyperlink($coordinate)->getUrl()) . '" title="' . htmlspecialchars($pSheet->getHyperlink($coordinate)->getTooltip()) . '">' . $cellData . '</a>';
-				}
-
-				// Should the cell be written or is it swallowed by a rowspan or colspan?
-				$writeCell = ! ( isset($this->_isSpannedCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum])
-							&& $this->_isSpannedCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum] );
-
-				// Colspan and Rowspan
-				$colspan = 1;
-				$rowspan = 1;
-				if (isset($this->_isBaseCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum])) {
-					$spans = $this->_isBaseCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum];
-					$rowSpan = $spans['rowspan'];
-					$colSpan = $spans['colspan'];
-
-					//	Also apply style from last cell in merge to fix borders -
-					//		relies on !important for non-none border declarations in _createCSSStyleBorder
-					$endCellCoord = PHPExcel_Cell::stringFromColumnIndex($colNum + $colSpan - 1) . ($pRow + $rowSpan);
-					if (!$this->_useInlineCss) {
-						$cssClass .= ' style' . $pSheet->getCell($endCellCoord)->getXfIndex();
-					}
-				}
-
-				// Write
-				if ($writeCell) {
-					// Column start
-					$html .= '			<' . $cellType;
-						if (!$this->_useInlineCss) {
-							$html .= ' class="' . $cssClass . '"';
-						} else {
-							//** Necessary redundant code for the sake of PHPExcel_Writer_PDF **
-							// We must explicitly write the width of the <td> element because TCPDF
-							// does not recognize e.g. <col style="width:42pt">
-							$width = 0;
-							$i = $colNum - 1;
-							$e = $colNum + $colSpan - 1;
-							while($i++ < $e) {
-								if (isset($this->_columnWidths[$sheetIndex][$i])) {
-									$width += $this->_columnWidths[$sheetIndex][$i];
-								}
-							}
-							$cssClass['width'] = $width . 'pt';
-
-							// We must also explicitly write the height of the <td> element because TCPDF
-							// does not recognize e.g. <tr style="height:50pt">
-							if (isset($this->_cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]['height'])) {
-								$height = $this->_cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]['height'];
-								$cssClass['height'] = $height;
-							}
-							//** end of redundant code **
-
-							$html .= ' style="' . $this->_assembleCSS($cssClass) . '"';
-						}
-						if ($colSpan > 1) {
-							$html .= ' colspan="' . $colSpan . '"';
-						}
-						if ($rowSpan > 1) {
-							$html .= ' rowspan="' . $rowSpan . '"';
-						}
-					$html .= '>';
-
-					// Image?
-					$html .= $this->_writeImageInCell($pSheet, $coordinate);
-
-					// Chart?
-					if ($this->_includeCharts) {
-						$html .= $this->_writeChartInCell($pSheet, $coordinate);
-					}
-
-					// Cell data
-					$html .= $cellData;
-
-					// Column end
-					$html .= '</'.$cellType.'>' . PHP_EOL;
-				}
-
-				// Next column
-				++$colNum;
-			}
-
-			// Write row end
-			$html .= '		  </tr>' . PHP_EOL;
-
-			// Return
-			return $html;
-		} else {
-			throw new PHPExcel_Writer_Exception("Invalid parameters passed.");
-		}
-	}
-
-	/**
-	 * Takes array where of CSS properties / values and converts to CSS string
-	 *
-	 * @param array
-	 * @return string
-	 */
-	private function _assembleCSS($pValue = array())
-	{
-		$pairs = array();
-		foreach ($pValue as $property => $value) {
-			$pairs[] = $property . ':' . $value;
-		}
-		$string = implode('; ', $pairs);
-
-		return $string;
-	}
-
-	/**
-	 * Get images root
-	 *
-	 * @return string
-	 */
-	public function getImagesRoot() {
-		return $this->_imagesRoot;
-	}
-
-	/**
-	 * Set images root
-	 *
-	 * @param string $pValue
-	 * @return PHPExcel_Writer_HTML
-	 */
-	public function setImagesRoot($pValue = '.') {
-		$this->_imagesRoot = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get embed images
-	 *
-	 * @return boolean
-	 */
-	public function getEmbedImages() {
-		return $this->_embedImages;
-	}
-
-	/**
-	 * Set embed images
-	 *
-	 * @param boolean $pValue
-	 * @return PHPExcel_Writer_HTML
-	 */
-	public function setEmbedImages($pValue = '.') {
-		$this->_embedImages = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get use inline CSS?
-	 *
-	 * @return boolean
-	 */
-	public function getUseInlineCss() {
-		return $this->_useInlineCss;
-	}
-
-	/**
-	 * Set use inline CSS?
-	 *
-	 * @param boolean $pValue
-	 * @return PHPExcel_Writer_HTML
-	 */
-	public function setUseInlineCss($pValue = false) {
-		$this->_useInlineCss = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Add color to formatted string as inline style
-	 *
-	 * @param string $pValue Plain formatted value without color
-	 * @param string $pFormat Format code
-	 * @return string
-	 */
-	public function formatColor($pValue, $pFormat)
-	{
-		// Color information, e.g. [Red] is always at the beginning
-		$color = null; // initialize
-		$matches = array();
-
-		$color_regex = '/^\\[[a-zA-Z]+\\]/';
-		if (preg_match($color_regex, $pFormat, $matches)) {
-			$color = str_replace('[', '', $matches[0]);
-			$color = str_replace(']', '', $color);
-			$color = strtolower($color);
-		}
-
-		// convert to PCDATA
-		$value = htmlspecialchars($pValue);
-
-		// color span tag
-		if ($color !== null) {
-			$value = '<span style="color:' . $color . '">' . $value . '</span>';
-		}
-
-		return $value;
-	}
-
-	/**
-	 * Calculate information about HTML colspan and rowspan which is not always the same as Excel's
-	 */
-	private function _calculateSpans()
-	{
-		// Identify all cells that should be omitted in HTML due to cell merge.
-		// In HTML only the upper-left cell should be written and it should have
-		//   appropriate rowspan / colspan attribute
-		$sheetIndexes = $this->_sheetIndex !== null ?
-			array($this->_sheetIndex) : range(0, $this->_phpExcel->getSheetCount() - 1);
-
-		foreach ($sheetIndexes as $sheetIndex) {
-			$sheet = $this->_phpExcel->getSheet($sheetIndex);
-
-			$candidateSpannedRow  = array();
-
-			// loop through all Excel merged cells
-			foreach ($sheet->getMergeCells() as $cells) {
-				list($cells, ) = PHPExcel_Cell::splitRange($cells);
-				$first = $cells[0];
-				$last  = $cells[1];
-
-				list($fc, $fr) = PHPExcel_Cell::coordinateFromString($first);
-				$fc = PHPExcel_Cell::columnIndexFromString($fc) - 1;
-
-				list($lc, $lr) = PHPExcel_Cell::coordinateFromString($last);
-				$lc = PHPExcel_Cell::columnIndexFromString($lc) - 1;
-
-				// loop through the individual cells in the individual merge
-				$r = $fr - 1;
-				while($r++ < $lr) {
-					// also, flag this row as a HTML row that is candidate to be omitted
-					$candidateSpannedRow[$r] = $r;
-
-					$c = $fc - 1;
-					while($c++ < $lc) {
-						if ( !($c == $fc && $r == $fr) ) {
-							// not the upper-left cell (should not be written in HTML)
-							$this->_isSpannedCell[$sheetIndex][$r][$c] = array(
-								'baseCell' => array($fr, $fc),
-							);
-						} else {
-							// upper-left is the base cell that should hold the colspan/rowspan attribute
-							$this->_isBaseCell[$sheetIndex][$r][$c] = array(
-								'xlrowspan' => $lr - $fr + 1, // Excel rowspan
-								'rowspan'   => $lr - $fr + 1, // HTML rowspan, value may change
-								'xlcolspan' => $lc - $fc + 1, // Excel colspan
-								'colspan'   => $lc - $fc + 1, // HTML colspan, value may change
-							);
-						}
-					}
-				}
-			}
-
-			// Identify which rows should be omitted in HTML. These are the rows where all the cells
-			//   participate in a merge and the where base cells are somewhere above.
-			$countColumns = PHPExcel_Cell::columnIndexFromString($sheet->getHighestColumn());
-			foreach ($candidateSpannedRow as $rowIndex) {
-				if (isset($this->_isSpannedCell[$sheetIndex][$rowIndex])) {
-					if (count($this->_isSpannedCell[$sheetIndex][$rowIndex]) == $countColumns) {
-						$this->_isSpannedRow[$sheetIndex][$rowIndex] = $rowIndex;
-					};
-				}
-			}
-
-			// For each of the omitted rows we found above, the affected rowspans should be subtracted by 1
-			if ( isset($this->_isSpannedRow[$sheetIndex]) ) {
-				foreach ($this->_isSpannedRow[$sheetIndex] as $rowIndex) {
-					$adjustedBaseCells = array();
-					$c = -1;
-					$e = $countColumns - 1;
-					while($c++ < $e) {
-						$baseCell = $this->_isSpannedCell[$sheetIndex][$rowIndex][$c]['baseCell'];
-
-						if ( !in_array($baseCell, $adjustedBaseCells) ) {
-							// subtract rowspan by 1
-							--$this->_isBaseCell[$sheetIndex][ $baseCell[0] ][ $baseCell[1] ]['rowspan'];
-							$adjustedBaseCells[] = $baseCell;
-						}
-					}
-				}
-			}
-
-			// TODO: Same for columns
-		}
-
-		// We have calculated the spans
-		$this->_spansAreCalculated = true;
-	}
-
-	private function _setMargins(PHPExcel_Worksheet $pSheet) {
-		$htmlPage = '@page { ';
-		$htmlBody = 'body { ';
-
-		$left = PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getLeft()) . 'in; ';
-		$htmlPage .= 'left-margin: ' . $left;
-		$htmlBody .= 'left-margin: ' . $left;
-		$right = PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getRight()) . 'in; ';
-		$htmlPage .= 'right-margin: ' . $right;
-		$htmlBody .= 'right-margin: ' . $right;
-		$top = PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getTop()) . 'in; ';
-		$htmlPage .= 'top-margin: ' . $top;
-		$htmlBody .= 'top-margin: ' . $top;
-		$bottom = PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getBottom()) . 'in; ';
-		$htmlPage .= 'bottom-margin: ' . $bottom;
-		$htmlBody .= 'bottom-margin: ' . $bottom;
-
-		$htmlPage .= "}\n";
-		$htmlBody .= "}\n";
-
-		return "<style>\n" . $htmlPage . $htmlBody . "</style>\n";
-	}
-	
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/IWriter.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/IWriter.php
deleted file mode 100644
index f0b94b9e9ab..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/IWriter.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- *  PHPExcel
- *
- *  Copyright (c) 2006 - 2014 PHPExcel
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *  @category   PHPExcel
- *  @package    PHPExcel_Writer
- *  @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- *  @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- *  @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- *  PHPExcel_Writer_IWriter
- *
- *  @category   PHPExcel
- *  @package    PHPExcel_Writer
- *  @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-interface PHPExcel_Writer_IWriter
-{
-    /**
-     *  Save PHPExcel to file
-     *
-     *  @param   string       $pFilename  Name of the file to save
-     *  @throws  PHPExcel_Writer_Exception
-     */
-    public function save($pFilename = NULL);
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument.php
deleted file mode 100644
index 2cbe6f90424..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_OpenDocument
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_OpenDocument
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_OpenDocument
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @author     Alexander Pervakov <frost-nzcr4@jagmort.com>
- * @link       http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os.html
- */
-class PHPExcel_Writer_OpenDocument extends PHPExcel_Writer_Abstract implements PHPExcel_Writer_IWriter
-{
-    /**
-     * Private writer parts
-     *
-     * @var PHPExcel_Writer_OpenDocument_WriterPart[]
-     */
-    private $_writerParts = array();
-
-    /**
-     * Private PHPExcel
-     *
-     * @var PHPExcel
-     */
-    private $_spreadSheet;
-
-    /**
-     * Create a new PHPExcel_Writer_OpenDocument
-     *
-     * @param PHPExcel $pPHPExcel
-     */
-    public function __construct(PHPExcel $pPHPExcel = null)
-    {
-        $this->setPHPExcel($pPHPExcel);
-
-        $writerPartsArray = array(
-            'content'    => 'PHPExcel_Writer_OpenDocument_Content',
-            'meta'       => 'PHPExcel_Writer_OpenDocument_Meta',
-            'meta_inf'   => 'PHPExcel_Writer_OpenDocument_MetaInf',
-            'mimetype'   => 'PHPExcel_Writer_OpenDocument_Mimetype',
-            'settings'   => 'PHPExcel_Writer_OpenDocument_Settings',
-            'styles'     => 'PHPExcel_Writer_OpenDocument_Styles',
-            'thumbnails' => 'PHPExcel_Writer_OpenDocument_Thumbnails'
-        );
-
-        foreach ($writerPartsArray as $writer => $class) {
-            $this->_writerParts[$writer] = new $class($this);
-        }
-    }
-
-    /**
-     * Get writer part
-     *
-     * @param  string  $pPartName  Writer part name
-     * @return PHPExcel_Writer_Excel2007_WriterPart
-     */
-    public function getWriterPart($pPartName = '')
-    {
-        if ($pPartName != '' && isset($this->_writerParts[strtolower($pPartName)])) {
-            return $this->_writerParts[strtolower($pPartName)];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Save PHPExcel to file
-     *
-     * @param  string  $pFilename
-     * @throws PHPExcel_Writer_Exception
-     */
-    public function save($pFilename = NULL)
-    {
-        if (!$this->_spreadSheet) {
-            throw new PHPExcel_Writer_Exception('PHPExcel object unassigned.');
-        }
-
-        // garbage collect
-        $this->_spreadSheet->garbageCollect();
-
-        // If $pFilename is php://output or php://stdout, make it a temporary file...
-        $originalFilename = $pFilename;
-        if (strtolower($pFilename) == 'php://output' || strtolower($pFilename) == 'php://stdout') {
-            $pFilename = @tempnam(PHPExcel_Shared_File::sys_get_temp_dir(), 'phpxltmp');
-            if ($pFilename == '') {
-                $pFilename = $originalFilename;
-            }
-        }
-
-        $objZip = $this->_createZip($pFilename);
-
-        $objZip->addFromString('META-INF/manifest.xml', $this->getWriterPart('meta_inf')->writeManifest());
-        $objZip->addFromString('Thumbnails/thumbnail.png', $this->getWriterPart('thumbnails')->writeThumbnail());
-        $objZip->addFromString('content.xml',  $this->getWriterPart('content')->write());
-        $objZip->addFromString('meta.xml',     $this->getWriterPart('meta')->write());
-        $objZip->addFromString('mimetype',     $this->getWriterPart('mimetype')->write());
-        $objZip->addFromString('settings.xml', $this->getWriterPart('settings')->write());
-        $objZip->addFromString('styles.xml',   $this->getWriterPart('styles')->write());
-
-        // Close file
-        if ($objZip->close() === false) {
-            throw new PHPExcel_Writer_Exception("Could not close zip file $pFilename.");
-        }
-
-        // If a temporary file was used, copy it to the correct file stream
-        if ($originalFilename != $pFilename) {
-            if (copy($pFilename, $originalFilename) === false) {
-                throw new PHPExcel_Writer_Exception("Could not copy temporary zip file $pFilename to $originalFilename.");
-            }
-            @unlink($pFilename);
-        }
-    }
-
-    /**
-     * Create zip object
-     *
-     * @param string $pFilename
-     * @throws PHPExcel_Writer_Exception
-     * @return ZipArchive
-     */
-    private function _createZip($pFilename)
-    {
-        // Create new ZIP file and open it for writing
-        $zipClass = PHPExcel_Settings::getZipClass();
-        $objZip = new $zipClass();
-
-        // Retrieve OVERWRITE and CREATE constants from the instantiated zip class
-        // This method of accessing constant values from a dynamic class should work with all appropriate versions of PHP
-        $ro = new ReflectionObject($objZip);
-        $zipOverWrite = $ro->getConstant('OVERWRITE');
-        $zipCreate = $ro->getConstant('CREATE');
-
-        if (file_exists($pFilename)) {
-            unlink($pFilename);
-        }
-        // Try opening the ZIP file
-        if ($objZip->open($pFilename, $zipOverWrite) !== true) {
-            if ($objZip->open($pFilename, $zipCreate) !== true) {
-                throw new PHPExcel_Writer_Exception("Could not open $pFilename for writing.");
-            }
-        }
-
-        return $objZip;
-    }
-
-    /**
-     * Get PHPExcel object
-     *
-     * @return PHPExcel
-     * @throws PHPExcel_Writer_Exception
-     */
-    public function getPHPExcel()
-    {
-        if ($this->_spreadSheet !== null) {
-            return $this->_spreadSheet;
-        } else {
-            throw new PHPExcel_Writer_Exception('No PHPExcel assigned.');
-        }
-    }
-
-    /**
-     * Set PHPExcel object
-     *
-     * @param  PHPExcel  $pPHPExcel  PHPExcel object
-     * @throws PHPExcel_Writer_Exception
-     * @return PHPExcel_Writer_Excel2007
-     */
-    public function setPHPExcel(PHPExcel $pPHPExcel = null)
-    {
-        $this->_spreadSheet = $pPHPExcel;
-        return $this;
-    }
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Cell/Comment.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Cell/Comment.php
deleted file mode 100644
index 88406ed1ad2..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Cell/Comment.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_OpenDocument
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_OpenDocument_Cell_Comment
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_OpenDocument
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @author     Alexander Pervakov <frost-nzcr4@jagmort.com>
- */
-class PHPExcel_Writer_OpenDocument_Cell_Comment
-{
-    public static function write(PHPExcel_Shared_XMLWriter $objWriter, PHPExcel_Cell $cell)
-    {
-        $comments = $cell->getWorksheet()->getComments();
-        if (!isset($comments[$cell->getCoordinate()])) {
-            return;
-        }
-        $comment = $comments[$cell->getCoordinate()];
-
-        $objWriter->startElement('office:annotation');
-            //$objWriter->writeAttribute('draw:style-name', 'gr1');
-            //$objWriter->writeAttribute('draw:text-style-name', 'P1');
-            $objWriter->writeAttribute('svg:width', $comment->getWidth());
-            $objWriter->writeAttribute('svg:height', $comment->getHeight());
-            $objWriter->writeAttribute('svg:x', $comment->getMarginLeft());
-            $objWriter->writeAttribute('svg:y', $comment->getMarginTop());
-            //$objWriter->writeAttribute('draw:caption-point-x', $comment->getMarginLeft());
-            //$objWriter->writeAttribute('draw:caption-point-y', $comment->getMarginTop());
-                $objWriter->writeElement('dc:creator', $comment->getAuthor());
-                // TODO: Not realized in PHPExcel_Comment yet.
-                //$objWriter->writeElement('dc:date', $comment->getDate());
-                $objWriter->writeElement('text:p', $comment->getText()->getPlainText());
-                    //$objWriter->writeAttribute('draw:text-style-name', 'P1');
-        $objWriter->endElement();
-    }
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Content.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Content.php
deleted file mode 100644
index 625b3541747..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Content.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_OpenDocument
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_OpenDocument_Content
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_OpenDocument
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @author     Alexander Pervakov <frost-nzcr4@jagmort.com>
- */
-class PHPExcel_Writer_OpenDocument_Content extends PHPExcel_Writer_OpenDocument_WriterPart
-{
-    const NUMBER_COLS_REPEATED_MAX = 1024;
-    const NUMBER_ROWS_REPEATED_MAX = 1048576;
-
-    /**
-     * Write content.xml to XML format
-     *
-     * @param   PHPExcel                   $pPHPExcel
-     * @return  string                     XML Output
-     * @throws  PHPExcel_Writer_Exception
-     */
-    public function write(PHPExcel $pPHPExcel = null)
-    {
-        if (!$pPHPExcel) {
-            $pPHPExcel = $this->getParentWriter()->getPHPExcel(); /* @var $pPHPExcel PHPExcel */
-        }
-
-        $objWriter = null;
-        if ($this->getParentWriter()->getUseDiskCaching()) {
-            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-        } else {
-            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-        }
-
-        // XML header
-        $objWriter->startDocument('1.0', 'UTF-8');
-
-        // Content
-        $objWriter->startElement('office:document-content');
-            $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0');
-            $objWriter->writeAttribute('xmlns:style', 'urn:oasis:names:tc:opendocument:xmlns:style:1.0');
-            $objWriter->writeAttribute('xmlns:text', 'urn:oasis:names:tc:opendocument:xmlns:text:1.0');
-            $objWriter->writeAttribute('xmlns:table', 'urn:oasis:names:tc:opendocument:xmlns:table:1.0');
-            $objWriter->writeAttribute('xmlns:draw', 'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0');
-            $objWriter->writeAttribute('xmlns:fo', 'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0');
-            $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
-            $objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/');
-            $objWriter->writeAttribute('xmlns:meta', 'urn:oasis:names:tc:opendocument:xmlns:meta:1.0');
-            $objWriter->writeAttribute('xmlns:number', 'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0');
-            $objWriter->writeAttribute('xmlns:presentation', 'urn:oasis:names:tc:opendocument:xmlns:presentation:1.0');
-            $objWriter->writeAttribute('xmlns:svg', 'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0');
-            $objWriter->writeAttribute('xmlns:chart', 'urn:oasis:names:tc:opendocument:xmlns:chart:1.0');
-            $objWriter->writeAttribute('xmlns:dr3d', 'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0');
-            $objWriter->writeAttribute('xmlns:math', 'http://www.w3.org/1998/Math/MathML');
-            $objWriter->writeAttribute('xmlns:form', 'urn:oasis:names:tc:opendocument:xmlns:form:1.0');
-            $objWriter->writeAttribute('xmlns:script', 'urn:oasis:names:tc:opendocument:xmlns:script:1.0');
-            $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office');
-            $objWriter->writeAttribute('xmlns:ooow', 'http://openoffice.org/2004/writer');
-            $objWriter->writeAttribute('xmlns:oooc', 'http://openoffice.org/2004/calc');
-            $objWriter->writeAttribute('xmlns:dom', 'http://www.w3.org/2001/xml-events');
-            $objWriter->writeAttribute('xmlns:xforms', 'http://www.w3.org/2002/xforms');
-            $objWriter->writeAttribute('xmlns:xsd', 'http://www.w3.org/2001/XMLSchema');
-            $objWriter->writeAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
-            $objWriter->writeAttribute('xmlns:rpt', 'http://openoffice.org/2005/report');
-            $objWriter->writeAttribute('xmlns:of', 'urn:oasis:names:tc:opendocument:xmlns:of:1.2');
-            $objWriter->writeAttribute('xmlns:xhtml', 'http://www.w3.org/1999/xhtml');
-            $objWriter->writeAttribute('xmlns:grddl', 'http://www.w3.org/2003/g/data-view#');
-            $objWriter->writeAttribute('xmlns:tableooo', 'http://openoffice.org/2009/table');
-            $objWriter->writeAttribute('xmlns:field', 'urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0');
-            $objWriter->writeAttribute('xmlns:formx', 'urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0');
-            $objWriter->writeAttribute('xmlns:css3t', 'http://www.w3.org/TR/css3-text/');
-            $objWriter->writeAttribute('office:version', '1.2');
-
-            $objWriter->writeElement('office:scripts');
-            $objWriter->writeElement('office:font-face-decls');
-            $objWriter->writeElement('office:automatic-styles');
-
-            $objWriter->startElement('office:body');
-                $objWriter->startElement('office:spreadsheet');
-                    $objWriter->writeElement('table:calculation-settings');
-                    $this->_writeSheets($objWriter);
-                    $objWriter->writeElement('table:named-expressions');
-                $objWriter->endElement();
-            $objWriter->endElement();
-        $objWriter->endElement();
-
-        return $objWriter->getData();
-    }
-
-    /**
-     * Write sheets
-     *
-     * @param PHPExcel_Shared_XMLWriter $objWriter
-     */
-    private function _writeSheets(PHPExcel_Shared_XMLWriter $objWriter)
-    {
-        $pPHPExcel = $this->getParentWriter()->getPHPExcel(); /* @var $pPHPExcel PHPExcel */
-
-        $sheet_count = $pPHPExcel->getSheetCount();
-        for ($i = 0; $i < $sheet_count; $i++) {
-            //$this->getWriterPart('Worksheet')->writeWorksheet());
-            $objWriter->startElement('table:table');
-                $objWriter->writeAttribute('table:name', $pPHPExcel->getSheet($i)->getTitle());
-                $objWriter->writeElement('office:forms');
-                $objWriter->startElement('table:table-column');
-                    $objWriter->writeAttribute('table:number-columns-repeated', self::NUMBER_COLS_REPEATED_MAX);
-                $objWriter->endElement();
-                $this->_writeRows($objWriter, $pPHPExcel->getSheet($i));
-            $objWriter->endElement();
-        }
-    }
-
-    /**
-     * Write rows of the specified sheet
-     *
-     * @param PHPExcel_Shared_XMLWriter $objWriter
-     * @param PHPExcel_Worksheet $sheet
-     */
-    private function _writeRows(PHPExcel_Shared_XMLWriter $objWriter, PHPExcel_Worksheet $sheet)
-    {
-        $number_rows_repeated = self::NUMBER_ROWS_REPEATED_MAX;
-        $span_row = 0;
-        $rows = $sheet->getRowIterator();
-        while ($rows->valid()) {
-            $number_rows_repeated--;
-            $row = $rows->current();
-            if ($row->getCellIterator()->valid()) {
-                if ($span_row) {
-                    $objWriter->startElement('table:table-row');
-                    if ($span_row > 1) {
-                        $objWriter->writeAttribute('table:number-rows-repeated', $span_row);
-                    }
-                    $objWriter->startElement('table:table-cell');
-                        $objWriter->writeAttribute('table:number-columns-repeated', self::NUMBER_COLS_REPEATED_MAX);
-                    $objWriter->endElement();
-                    $objWriter->endElement();
-                    $span_row = 0;
-                }
-                $objWriter->startElement('table:table-row');
-                $this->_writeCells($objWriter, $row);
-                $objWriter->endElement();
-            } else {
-                $span_row++;
-            }
-            $rows->next();
-        }
-    }
-
-    /**
-     * Write cells of the specified row
-     *
-     * @param PHPExcel_Shared_XMLWriter $objWriter
-     * @param PHPExcel_Worksheet_Row $row
-     * @throws PHPExcel_Writer_Exception
-     */
-    private function _writeCells(PHPExcel_Shared_XMLWriter $objWriter, PHPExcel_Worksheet_Row $row)
-    {
-        $number_cols_repeated = self::NUMBER_COLS_REPEATED_MAX;
-        $prev_column = -1;
-        $cells = $row->getCellIterator();
-        while ($cells->valid()) {
-            $cell = $cells->current();
-            $column = PHPExcel_Cell::columnIndexFromString($cell->getColumn()) - 1;
-
-            $this->_writeCellSpan($objWriter, $column, $prev_column);
-            $objWriter->startElement('table:table-cell');
-
-            switch ($cell->getDataType()) {
-                case PHPExcel_Cell_DataType::TYPE_BOOL:
-                    $objWriter->writeAttribute('office:value-type', 'boolean');
-                    $objWriter->writeAttribute('office:value', $cell->getValue());
-                    $objWriter->writeElement('text:p', $cell->getValue());
-                    break;
-
-                case PHPExcel_Cell_DataType::TYPE_ERROR:
-                    throw new PHPExcel_Writer_Exception('Writing of error not implemented yet.');
-                    break;
-
-                case PHPExcel_Cell_DataType::TYPE_FORMULA:
-                    try {
-                        $formula_value = $cell->getCalculatedValue();
-                    } catch (Exception $e) {
-                        $formula_value = $cell->getValue();
-                    }
-                    $objWriter->writeAttribute('table:formula', 'of:' . $cell->getValue());
-                    if (is_numeric($formula_value)) {
-                        $objWriter->writeAttribute('office:value-type', 'float');
-                    } else {
-                        $objWriter->writeAttribute('office:value-type', 'string');
-                    }
-                    $objWriter->writeAttribute('office:value', $formula_value);
-                    $objWriter->writeElement('text:p', $formula_value);
-                    break;
-
-                case PHPExcel_Cell_DataType::TYPE_INLINE:
-                    throw new PHPExcel_Writer_Exception('Writing of inline not implemented yet.');
-                    break;
-
-                case PHPExcel_Cell_DataType::TYPE_NUMERIC:
-                    $objWriter->writeAttribute('office:value-type', 'float');
-                    $objWriter->writeAttribute('office:value', $cell->getValue());
-                    $objWriter->writeElement('text:p', $cell->getValue());
-                    break;
-
-                case PHPExcel_Cell_DataType::TYPE_STRING:
-                    $objWriter->writeAttribute('office:value-type', 'string');
-                    $objWriter->writeElement('text:p', $cell->getValue());
-                    break;
-            }
-            PHPExcel_Writer_OpenDocument_Cell_Comment::write($objWriter, $cell);
-            $objWriter->endElement();
-            $prev_column = $column;
-            $cells->next();
-        }
-        $number_cols_repeated = $number_cols_repeated - $prev_column - 1;
-        if ($number_cols_repeated > 0) {
-            if ($number_cols_repeated > 1) {
-                $objWriter->startElement('table:table-cell');
-                $objWriter->writeAttribute('table:number-columns-repeated', $number_cols_repeated);
-                $objWriter->endElement();
-            } else {
-                $objWriter->writeElement('table:table-cell');
-            }
-        }
-    }
-
-    /**
-     * Write span
-     *
-     * @param PHPExcel_Shared_XMLWriter $objWriter
-     * @param integer $curColumn
-     * @param integer $prevColumn
-     */
-    private function _writeCellSpan(PHPExcel_Shared_XMLWriter $objWriter, $curColumn, $prevColumn)
-    {
-        $diff = $curColumn - $prevColumn - 1;
-        if (1 === $diff) {
-            $objWriter->writeElement('table:table-cell');
-        } elseif ($diff > 1) {
-            $objWriter->startElement('table:table-cell');
-                $objWriter->writeAttribute('table:number-columns-repeated', $diff);
-            $objWriter->endElement();
-        }
-    }
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Meta.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Meta.php
deleted file mode 100644
index 7f39e558924..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Meta.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_OpenDocument
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_OpenDocument_Meta
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_OpenDocument
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @author     Alexander Pervakov <frost-nzcr4@jagmort.com>
- */
-class PHPExcel_Writer_OpenDocument_Meta extends PHPExcel_Writer_OpenDocument_WriterPart
-{
-    /**
-     * Write meta.xml to XML format
-     *
-     * @param   PHPExcel                   $pPHPExcel
-     * @return  string                     XML Output
-     * @throws  PHPExcel_Writer_Exception
-     */
-    public function write(PHPExcel $pPHPExcel = null)
-    {
-        if (!$pPHPExcel) {
-            $pPHPExcel = $this->getParentWriter()->getPHPExcel();
-        }
-
-        $objWriter = null;
-        if ($this->getParentWriter()->getUseDiskCaching()) {
-            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-        } else {
-            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-        }
-
-        // XML header
-        $objWriter->startDocument('1.0', 'UTF-8');
-
-        // Meta
-        $objWriter->startElement('office:document-meta');
-            $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0');
-            $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
-            $objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/');
-            $objWriter->writeAttribute('xmlns:meta', 'urn:oasis:names:tc:opendocument:xmlns:meta:1.0');
-            $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office');
-            $objWriter->writeAttribute('xmlns:grddl', 'http://www.w3.org/2003/g/data-view#');
-            $objWriter->writeAttribute('office:version', '1.2');
-
-            $objWriter->startElement('office:meta');
-                $objWriter->writeElement('meta:initial-creator', $pPHPExcel->getProperties()->getCreator());
-                $objWriter->writeElement('dc:creator', $pPHPExcel->getProperties()->getCreator());
-                $objWriter->writeElement('meta:creation-date', date(DATE_W3C, $pPHPExcel->getProperties()->getCreated()));
-                $objWriter->writeElement('dc:date', date(DATE_W3C, $pPHPExcel->getProperties()->getCreated()));
-                $objWriter->writeElement('dc:title', $pPHPExcel->getProperties()->getTitle());
-                $objWriter->writeElement('dc:description', $pPHPExcel->getProperties()->getDescription());
-                $objWriter->writeElement('dc:subject', $pPHPExcel->getProperties()->getSubject());
-                $keywords = explode(' ', $pPHPExcel->getProperties()->getKeywords());
-                foreach ($keywords as $keyword) {
-                    $objWriter->writeElement('meta:keyword', $keyword);
-                }
-                //<meta:document-statistic meta:table-count="XXX" meta:cell-count="XXX" meta:object-count="XXX"/>
-                $objWriter->startElement('meta:user-defined');
-                    $objWriter->writeAttribute('meta:name', 'Company');
-                    $objWriter->writeRaw($pPHPExcel->getProperties()->getCompany());
-                $objWriter->endElement();
-                $objWriter->startElement('meta:user-defined');
-                    $objWriter->writeAttribute('meta:name', 'category');
-                    $objWriter->writeRaw($pPHPExcel->getProperties()->getCategory());
-                $objWriter->endElement();
-            $objWriter->endElement();
-        $objWriter->endElement();
-
-        return $objWriter->getData();
-    }
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/MetaInf.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/MetaInf.php
deleted file mode 100644
index 301d39db99f..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/MetaInf.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_OpenDocument
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_OpenDocument_MetaInf
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_OpenDocument
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @author     Alexander Pervakov <frost-nzcr4@jagmort.com>
- */
-class PHPExcel_Writer_OpenDocument_MetaInf extends PHPExcel_Writer_OpenDocument_WriterPart
-{
-    /**
-     * Write META-INF/manifest.xml to XML format
-     *
-     * @param     PHPExcel    $pPHPExcel
-     * @return     string         XML Output
-     * @throws     PHPExcel_Writer_Exception
-     */
-    public function writeManifest(PHPExcel $pPHPExcel = null)
-    {
-        if (!$pPHPExcel) {
-            $pPHPExcel = $this->getParentWriter()->getPHPExcel();
-        }
-
-        $objWriter = null;
-        if ($this->getParentWriter()->getUseDiskCaching()) {
-            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-        } else {
-            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-        }
-
-        // XML header
-        $objWriter->startDocument('1.0', 'UTF-8');
-
-        // Manifest
-        $objWriter->startElement('manifest:manifest');
-            $objWriter->writeAttribute('xmlns:manifest', 'urn:oasis:names:tc:opendocument:xmlns:manifest:1.0');
-            $objWriter->writeAttribute('manifest:version', '1.2');
-
-            $objWriter->startElement('manifest:file-entry');
-                $objWriter->writeAttribute('manifest:full-path', '/');
-                $objWriter->writeAttribute('manifest:version', '1.2');
-                $objWriter->writeAttribute('manifest:media-type', 'application/vnd.oasis.opendocument.spreadsheet');
-            $objWriter->endElement();
-            $objWriter->startElement('manifest:file-entry');
-                $objWriter->writeAttribute('manifest:full-path', 'meta.xml');
-                $objWriter->writeAttribute('manifest:media-type', 'text/xml');
-            $objWriter->endElement();
-            $objWriter->startElement('manifest:file-entry');
-                $objWriter->writeAttribute('manifest:full-path', 'settings.xml');
-                $objWriter->writeAttribute('manifest:media-type', 'text/xml');
-            $objWriter->endElement();
-            $objWriter->startElement('manifest:file-entry');
-                $objWriter->writeAttribute('manifest:full-path', 'content.xml');
-                $objWriter->writeAttribute('manifest:media-type', 'text/xml');
-            $objWriter->endElement();
-            $objWriter->startElement('manifest:file-entry');
-                $objWriter->writeAttribute('manifest:full-path', 'Thumbnails/thumbnail.png');
-                $objWriter->writeAttribute('manifest:media-type', 'image/png');
-            $objWriter->endElement();
-            $objWriter->startElement('manifest:file-entry');
-                $objWriter->writeAttribute('manifest:full-path', 'styles.xml');
-                $objWriter->writeAttribute('manifest:media-type', 'text/xml');
-            $objWriter->endElement();
-        $objWriter->endElement();
-
-        return $objWriter->getData();
-    }
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Mimetype.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Mimetype.php
deleted file mode 100644
index 99ff638a9bb..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Mimetype.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_OpenDocument
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_OpenDocument_Mimetype
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_OpenDocument
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @author     Alexander Pervakov <frost-nzcr4@jagmort.com>
- */
-class PHPExcel_Writer_OpenDocument_Mimetype extends PHPExcel_Writer_OpenDocument_WriterPart
-{
-    /**
-     * Write mimetype to plain text format
-     *
-     * @param     PHPExcel    $pPHPExcel
-     * @return     string         XML Output
-     * @throws     PHPExcel_Writer_Exception
-     */
-    public function write(PHPExcel $pPHPExcel = null)
-    {
-        return 'application/vnd.oasis.opendocument.spreadsheet';
-    }
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Settings.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Settings.php
deleted file mode 100644
index 557e748d419..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Settings.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_OpenDocument
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_OpenDocument_Settings
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_OpenDocument
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @author     Alexander Pervakov <frost-nzcr4@jagmort.com>
- */
-class PHPExcel_Writer_OpenDocument_Settings extends PHPExcel_Writer_OpenDocument_WriterPart
-{
-    /**
-     * Write settings.xml to XML format
-     *
-     * @param   PHPExcel                   $pPHPExcel
-     * @return  string                     XML Output
-     * @throws  PHPExcel_Writer_Exception
-     */
-    public function write(PHPExcel $pPHPExcel = null)
-    {
-        if (!$pPHPExcel) {
-            $pPHPExcel = $this->getParentWriter()->getPHPExcel();
-        }
-
-        $objWriter = null;
-        if ($this->getParentWriter()->getUseDiskCaching()) {
-            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-        } else {
-            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-        }
-
-        // XML header
-        $objWriter->startDocument('1.0', 'UTF-8');
-
-        // Settings
-        $objWriter->startElement('office:document-settings');
-            $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0');
-            $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
-            $objWriter->writeAttribute('xmlns:config', 'urn:oasis:names:tc:opendocument:xmlns:config:1.0');
-            $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office');
-            $objWriter->writeAttribute('office:version', '1.2');
-
-            $objWriter->startElement('office:settings');
-                $objWriter->startElement('config:config-item-set');
-                    $objWriter->writeAttribute('config:name', 'ooo:view-settings');
-                    $objWriter->startElement('config:config-item-map-indexed');
-                        $objWriter->writeAttribute('config:name', 'Views');
-                    $objWriter->endElement();
-                $objWriter->endElement();
-                $objWriter->startElement('config:config-item-set');
-                    $objWriter->writeAttribute('config:name', 'ooo:configuration-settings');
-                $objWriter->endElement();
-            $objWriter->endElement();
-        $objWriter->endElement();
-
-        return $objWriter->getData();
-    }
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Styles.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Styles.php
deleted file mode 100644
index d886736328f..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Styles.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_OpenDocument
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_OpenDocument_Styles
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_OpenDocument
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @author     Alexander Pervakov <frost-nzcr4@jagmort.com>
- */
-class PHPExcel_Writer_OpenDocument_Styles extends PHPExcel_Writer_OpenDocument_WriterPart
-{
-    /**
-     * Write styles.xml to XML format
-     *
-     * @param   PHPExcel                   $pPHPExcel
-     * @return  string                     XML Output
-     * @throws  PHPExcel_Writer_Exception
-     */
-    public function write(PHPExcel $pPHPExcel = null)
-    {
-        if (!$pPHPExcel) {
-            $pPHPExcel = $this->getParentWriter()->getPHPExcel();
-        }
-
-        $objWriter = null;
-        if ($this->getParentWriter()->getUseDiskCaching()) {
-            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-        } else {
-            $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-        }
-
-        // XML header
-        $objWriter->startDocument('1.0', 'UTF-8');
-
-        // Content
-        $objWriter->startElement('office:document-styles');
-            $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0');
-            $objWriter->writeAttribute('xmlns:style', 'urn:oasis:names:tc:opendocument:xmlns:style:1.0');
-            $objWriter->writeAttribute('xmlns:text', 'urn:oasis:names:tc:opendocument:xmlns:text:1.0');
-            $objWriter->writeAttribute('xmlns:table', 'urn:oasis:names:tc:opendocument:xmlns:table:1.0');
-            $objWriter->writeAttribute('xmlns:draw', 'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0');
-            $objWriter->writeAttribute('xmlns:fo', 'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0');
-            $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
-            $objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/');
-            $objWriter->writeAttribute('xmlns:meta', 'urn:oasis:names:tc:opendocument:xmlns:meta:1.0');
-            $objWriter->writeAttribute('xmlns:number', 'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0');
-            $objWriter->writeAttribute('xmlns:presentation', 'urn:oasis:names:tc:opendocument:xmlns:presentation:1.0');
-            $objWriter->writeAttribute('xmlns:svg', 'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0');
-            $objWriter->writeAttribute('xmlns:chart', 'urn:oasis:names:tc:opendocument:xmlns:chart:1.0');
-            $objWriter->writeAttribute('xmlns:dr3d', 'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0');
-            $objWriter->writeAttribute('xmlns:math', 'http://www.w3.org/1998/Math/MathML');
-            $objWriter->writeAttribute('xmlns:form', 'urn:oasis:names:tc:opendocument:xmlns:form:1.0');
-            $objWriter->writeAttribute('xmlns:script', 'urn:oasis:names:tc:opendocument:xmlns:script:1.0');
-            $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office');
-            $objWriter->writeAttribute('xmlns:ooow', 'http://openoffice.org/2004/writer');
-            $objWriter->writeAttribute('xmlns:oooc', 'http://openoffice.org/2004/calc');
-            $objWriter->writeAttribute('xmlns:dom', 'http://www.w3.org/2001/xml-events');
-            $objWriter->writeAttribute('xmlns:rpt', 'http://openoffice.org/2005/report');
-            $objWriter->writeAttribute('xmlns:of', 'urn:oasis:names:tc:opendocument:xmlns:of:1.2');
-            $objWriter->writeAttribute('xmlns:xhtml', 'http://www.w3.org/1999/xhtml');
-            $objWriter->writeAttribute('xmlns:grddl', 'http://www.w3.org/2003/g/data-view#');
-            $objWriter->writeAttribute('xmlns:tableooo', 'http://openoffice.org/2009/table');
-            $objWriter->writeAttribute('xmlns:css3t', 'http://www.w3.org/TR/css3-text/');
-            $objWriter->writeAttribute('office:version', '1.2');
-
-            $objWriter->writeElement('office:font-face-decls');
-            $objWriter->writeElement('office:styles');
-            $objWriter->writeElement('office:automatic-styles');
-            $objWriter->writeElement('office:master-styles');
-        $objWriter->endElement();
-
-        return $objWriter->getData();
-    }
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Thumbnails.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Thumbnails.php
deleted file mode 100644
index a7e85c45604..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Thumbnails.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_OpenDocument
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_OpenDocument_Thumbnails
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_OpenDocument
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @author     Alexander Pervakov <frost-nzcr4@jagmort.com>
- */
-class PHPExcel_Writer_OpenDocument_Thumbnails extends PHPExcel_Writer_OpenDocument_WriterPart
-{
-    /**
-     * Write Thumbnails/thumbnail.png to PNG format
-     *
-     * @param   PHPExcel                   $pPHPExcel
-     * @return  string                     XML Output
-     * @throws  PHPExcel_Writer_Exception
-     */
-    public function writeThumbnail(PHPExcel $pPHPExcel = null)
-    {
-        return '';
-    }
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/WriterPart.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/WriterPart.php
deleted file mode 100644
index e6e713a1b3a..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/WriterPart.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2014 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_OpenDocument
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_OpenDocument_WriterPart
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_OpenDocument
- * @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-abstract class PHPExcel_Writer_OpenDocument_WriterPart extends PHPExcel_Writer_Excel2007_WriterPart
-{
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF.php
deleted file mode 100644
index 3131ee0a127..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- *  PHPExcel
- *
- *  Copyright (c) 2006 - 2014 PHPExcel
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *  @category    PHPExcel
- *  @package     PHPExcel_Writer_PDF
- *  @copyright   Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- *  @license     http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- *  @version     ##VERSION##, ##DATE##
- */
-
-
-/**
- *  PHPExcel_Writer_PDF
- *
- *  @category    PHPExcel
- *  @package     PHPExcel_Writer_PDF
- *  @copyright   Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_PDF implements PHPExcel_Writer_IWriter
-{
-
-    /**
-     * The wrapper for the requested PDF rendering engine
-     *
-     * @var PHPExcel_Writer_PDF_Core
-     */
-    private $_renderer = NULL;
-
-    /**
-     *  Instantiate a new renderer of the configured type within this container class
-     *
-     *  @param  PHPExcel   $phpExcel         PHPExcel object
-     *  @throws PHPExcel_Writer_Exception    when PDF library is not configured
-     */
-    public function __construct(PHPExcel $phpExcel)
-    {
-        $pdfLibraryName = PHPExcel_Settings::getPdfRendererName();
-        if (is_null($pdfLibraryName)) {
-            throw new PHPExcel_Writer_Exception("PDF Rendering library has not been defined.");
-        }
-
-        $pdfLibraryPath = PHPExcel_Settings::getPdfRendererPath();
-        if (is_null($pdfLibraryName)) {
-            throw new PHPExcel_Writer_Exception("PDF Rendering library path has not been defined.");
-        }
-        $includePath = str_replace('\\', '/', get_include_path());
-        $rendererPath = str_replace('\\', '/', $pdfLibraryPath);
-        if (strpos($rendererPath, $includePath) === false) {
-            set_include_path(get_include_path() . PATH_SEPARATOR . $pdfLibraryPath);
-        }
-
-        $rendererName = 'PHPExcel_Writer_PDF_' . $pdfLibraryName;
-        $this->_renderer = new $rendererName($phpExcel);
-    }
-
-
-    /**
-     *  Magic method to handle direct calls to the configured PDF renderer wrapper class.
-     *
-     *  @param   string   $name        Renderer library method name
-     *  @param   mixed[]  $arguments   Array of arguments to pass to the renderer method
-     *  @return  mixed    Returned data from the PDF renderer wrapper method
-     */
-    public function __call($name, $arguments)
-    {
-        if ($this->_renderer === NULL) {
-            throw new PHPExcel_Writer_Exception("PDF Rendering library has not been defined.");
-        }
-
-        return call_user_func_array(array($this->_renderer, $name), $arguments);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function save($pFilename = null)
-    {
-        $this->_renderer->save($pFilename);
-    }
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/Core.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/Core.php
deleted file mode 100644
index 3842334d9f7..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/Core.php
+++ /dev/null
@@ -1,364 +0,0 @@
-<?php
-/**
- *  PHPExcel
- *
- *  Copyright (c) 2006 - 2014 PHPExcel
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *  @category    PHPExcel
- *  @package     PHPExcel_Writer_PDF
- *  @copyright   Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- *  @license     http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- *  @version     ##VERSION##, ##DATE##
- */
-
-
-/**
- *  PHPExcel_Writer_PDF_Core
- *
- *  @category    PHPExcel
- *  @package     PHPExcel_Writer_PDF
- *  @copyright   Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-abstract class PHPExcel_Writer_PDF_Core extends PHPExcel_Writer_HTML
-{
-    /**
-     * Temporary storage directory
-     *
-     * @var string
-     */
-    protected $_tempDir = '';
-
-    /**
-     * Font
-     *
-     * @var string
-     */
-    protected $_font = 'freesans';
-
-    /**
-     * Orientation (Over-ride)
-     *
-     * @var string
-     */
-    protected $_orientation    = NULL;
-
-    /**
-     * Paper size (Over-ride)
-     *
-     * @var int
-     */
-    protected $_paperSize    = NULL;
-
-
-    /**
-     * Temporary storage for Save Array Return type
-     *
-     * @var string
-     */
-	private $_saveArrayReturnType;
-
-    /**
-     * Paper Sizes xRef List
-     *
-     * @var array
-     */
-    protected static $_paperSizes = array(
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER
-            => 'LETTER',                 //    (8.5 in. by 11 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_SMALL
-            => 'LETTER',                 //    (8.5 in. by 11 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_TABLOID
-            => array(792.00, 1224.00),   //    (11 in. by 17 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_LEDGER
-            => array(1224.00, 792.00),   //    (17 in. by 11 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_LEGAL
-            => 'LEGAL',                  //    (8.5 in. by 14 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_STATEMENT
-            => array(396.00, 612.00),    //    (5.5 in. by 8.5 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_EXECUTIVE
-            => 'EXECUTIVE',              //    (7.25 in. by 10.5 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_A3
-            => 'A3',                     //    (297 mm by 420 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4
-            => 'A4',                     //    (210 mm by 297 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4_SMALL
-            => 'A4',                     //    (210 mm by 297 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_A5
-            => 'A5',                     //    (148 mm by 210 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_B4
-            => 'B4',                     //    (250 mm by 353 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_B5
-            => 'B5',                     //    (176 mm by 250 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_FOLIO
-            => 'FOLIO',                  //    (8.5 in. by 13 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_QUARTO
-            => array(609.45, 779.53),    //    (215 mm by 275 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_1
-            => array(720.00, 1008.00),   //    (10 in. by 14 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_2
-            => array(792.00, 1224.00),   //    (11 in. by 17 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_NOTE
-            => 'LETTER',                 //    (8.5 in. by 11 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO9_ENVELOPE
-            => array(279.00, 639.00),    //    (3.875 in. by 8.875 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO10_ENVELOPE
-            => array(297.00, 684.00),    //    (4.125 in. by 9.5 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO11_ENVELOPE
-            => array(324.00, 747.00),    //    (4.5 in. by 10.375 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO12_ENVELOPE
-            => array(342.00, 792.00),    //    (4.75 in. by 11 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO14_ENVELOPE
-            => array(360.00, 828.00),    //    (5 in. by 11.5 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_C
-            => array(1224.00, 1584.00),  //    (17 in. by 22 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_D
-            => array(1584.00, 2448.00),  //    (22 in. by 34 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_E
-            => array(2448.00, 3168.00),  //    (34 in. by 44 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_DL_ENVELOPE
-            => array(311.81, 623.62),    //    (110 mm by 220 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_C5_ENVELOPE
-            => 'C5',                     //    (162 mm by 229 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_C3_ENVELOPE
-            => 'C3',                     //    (324 mm by 458 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_C4_ENVELOPE
-            => 'C4',                     //    (229 mm by 324 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_C6_ENVELOPE
-            => 'C6',                     //    (114 mm by 162 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_C65_ENVELOPE
-            => array(323.15, 649.13),    //    (114 mm by 229 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_B4_ENVELOPE
-            => 'B4',                     //    (250 mm by 353 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_B5_ENVELOPE
-            => 'B5',                     //    (176 mm by 250 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_B6_ENVELOPE
-            => array(498.90, 354.33),    //    (176 mm by 125 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_ITALY_ENVELOPE
-            => array(311.81, 651.97),    //    (110 mm by 230 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_MONARCH_ENVELOPE
-            => array(279.00, 540.00),    //    (3.875 in. by 7.5 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_6_3_4_ENVELOPE
-            => array(261.00, 468.00),    //    (3.625 in. by 6.5 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_US_STANDARD_FANFOLD
-            => array(1071.00, 792.00),   //    (14.875 in. by 11 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_GERMAN_STANDARD_FANFOLD
-            => array(612.00, 864.00),    //    (8.5 in. by 12 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_GERMAN_LEGAL_FANFOLD
-            => 'FOLIO',                  //    (8.5 in. by 13 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_ISO_B4
-            => 'B4',                     //    (250 mm by 353 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_JAPANESE_DOUBLE_POSTCARD
-            => array(566.93, 419.53),    //    (200 mm by 148 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_PAPER_1
-            => array(648.00, 792.00),    //    (9 in. by 11 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_PAPER_2
-            => array(720.00, 792.00),    //    (10 in. by 11 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_PAPER_3
-            => array(1080.00, 792.00),   //    (15 in. by 11 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_INVITE_ENVELOPE
-            => array(623.62, 623.62),    //    (220 mm by 220 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_EXTRA_PAPER
-            => array(667.80, 864.00),    //    (9.275 in. by 12 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_LEGAL_EXTRA_PAPER
-            => array(667.80, 1080.00),   //    (9.275 in. by 15 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_TABLOID_EXTRA_PAPER
-            => array(841.68, 1296.00),   //    (11.69 in. by 18 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4_EXTRA_PAPER
-            => array(668.98, 912.76),    //    (236 mm by 322 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_TRANSVERSE_PAPER
-            => array(595.80, 792.00),    //    (8.275 in. by 11 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4_TRANSVERSE_PAPER
-            => 'A4',                     //    (210 mm by 297 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_EXTRA_TRANSVERSE_PAPER
-            => array(667.80, 864.00),    //    (9.275 in. by 12 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_SUPERA_SUPERA_A4_PAPER
-            => array(643.46, 1009.13),   //    (227 mm by 356 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_SUPERB_SUPERB_A3_PAPER
-            => array(864.57, 1380.47),   //    (305 mm by 487 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_PLUS_PAPER
-            => array(612.00, 913.68),    //    (8.5 in. by 12.69 in.)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4_PLUS_PAPER
-            => array(595.28, 935.43),    //    (210 mm by 330 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_A5_TRANSVERSE_PAPER
-            => 'A5',                     //    (148 mm by 210 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_JIS_B5_TRANSVERSE_PAPER
-            => array(515.91, 728.50),    //    (182 mm by 257 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_A3_EXTRA_PAPER
-            => array(912.76, 1261.42),   //    (322 mm by 445 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_A5_EXTRA_PAPER
-            => array(493.23, 666.14),    //    (174 mm by 235 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_ISO_B5_EXTRA_PAPER
-            => array(569.76, 782.36),    //    (201 mm by 276 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_A2_PAPER
-            => 'A2',                     //    (420 mm by 594 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_A3_TRANSVERSE_PAPER
-            => 'A3',                     //    (297 mm by 420 mm)
-        PHPExcel_Worksheet_PageSetup::PAPERSIZE_A3_EXTRA_TRANSVERSE_PAPER
-            => array(912.76, 1261.42)    //    (322 mm by 445 mm)
-    );
-
-    /**
-     *  Create a new PHPExcel_Writer_PDF
-     *
-     *  @param     PHPExcel    $phpExcel    PHPExcel object
-     */
-    public function __construct(PHPExcel $phpExcel)
-    {
-        parent::__construct($phpExcel);
-        $this->setUseInlineCss(TRUE);
-        $this->_tempDir = PHPExcel_Shared_File::sys_get_temp_dir();
-    }
-
-    /**
-     *  Get Font
-     *
-     *  @return string
-     */
-    public function getFont()
-    {
-        return $this->_font;
-    }
-
-    /**
-     *  Set font. Examples:
-     *      'arialunicid0-chinese-simplified'
-     *      'arialunicid0-chinese-traditional'
-     *      'arialunicid0-korean'
-     *      'arialunicid0-japanese'
-     *
-     *  @param    string    $fontName
-     */
-    public function setFont($fontName)
-    {
-        $this->_font = $fontName;
-        return $this;
-    }
-
-    /**
-     *  Get Paper Size
-     *
-     *  @return int
-     */
-    public function getPaperSize()
-    {
-        return $this->_paperSize;
-    }
-
-    /**
-     *  Set Paper Size
-     *
-     *  @param  string  $pValue Paper size
-     *  @return PHPExcel_Writer_PDF
-     */
-    public function setPaperSize($pValue = PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER)
-    {
-        $this->_paperSize = $pValue;
-        return $this;
-    }
-
-    /**
-     *  Get Orientation
-     *
-     *  @return string
-     */
-    public function getOrientation()
-    {
-        return $this->_orientation;
-    }
-
-    /**
-     *  Set Orientation
-     *
-     *  @param string $pValue  Page orientation
-     *  @return PHPExcel_Writer_PDF
-     */
-    public function setOrientation($pValue = PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT)
-    {
-        $this->_orientation = $pValue;
-        return $this;
-    }
-
-    /**
-     *  Get temporary storage directory
-     *
-     *  @return string
-     */
-    public function getTempDir()
-    {
-        return $this->_tempDir;
-    }
-
-    /**
-     *  Set temporary storage directory
-     *
-     *  @param     string        $pValue        Temporary storage directory
-     *  @throws    PHPExcel_Writer_Exception    when directory does not exist
-     *  @return    PHPExcel_Writer_PDF
-     */
-    public function setTempDir($pValue = '')
-    {
-        if (is_dir($pValue)) {
-            $this->_tempDir = $pValue;
-        } else {
-            throw new PHPExcel_Writer_Exception("Directory does not exist: $pValue");
-        }
-        return $this;
-    }
-
-    /**
-     *  Save PHPExcel to PDF file, pre-save
-     *
-     *  @param     string     $pFilename   Name of the file to save as
-     *  @throws    PHPExcel_Writer_Exception
-     */
-    protected function prepareForSave($pFilename = NULL)
-    {
-        //  garbage collect
-        $this->_phpExcel->garbageCollect();
-
-        $this->_saveArrayReturnType = PHPExcel_Calculation::getArrayReturnType();
-        PHPExcel_Calculation::setArrayReturnType(PHPExcel_Calculation::RETURN_ARRAY_AS_VALUE);
-
-        //  Open file
-        $fileHandle = fopen($pFilename, 'w');
-        if ($fileHandle === FALSE) {
-            throw new PHPExcel_Writer_Exception("Could not open file $pFilename for writing.");
-        }
-
-        //  Set PDF
-        $this->_isPdf = TRUE;
-        //  Build CSS
-        $this->buildCSS(TRUE);
-
-        return $fileHandle;
-    }
-
-    /**
-     *  Save PHPExcel to PDF file, post-save
-     *
-     *  @param     resource      $fileHandle
-     *  @throws    PHPExcel_Writer_Exception
-     */
-    protected function restoreStateAfterSave($fileHandle)
-    {
-        //  Close file
-        fclose($fileHandle);
-
-        PHPExcel_Calculation::setArrayReturnType($this->_saveArrayReturnType);
-    }
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/DomPDF.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/DomPDF.php
deleted file mode 100644
index 01e4e0122a8..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/DomPDF.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- *  PHPExcel
- *
- *  Copyright (c) 2006 - 2014 PHPExcel
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *  @category    PHPExcel
- *  @package     PHPExcel_Writer_PDF
- *  @copyright   Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- *  @license     http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- *  @version     ##VERSION##, ##DATE##
- */
-
-
-/**  Require DomPDF library */
-$pdfRendererClassFile = PHPExcel_Settings::getPdfRendererPath() . '/dompdf_config.inc.php';
-if (file_exists($pdfRendererClassFile)) {
-    require_once $pdfRendererClassFile;
-} else {
-    throw new PHPExcel_Writer_Exception('Unable to load PDF Rendering library');
-}
-
-/**
- *  PHPExcel_Writer_PDF_DomPDF
- *
- *  @category    PHPExcel
- *  @package     PHPExcel_Writer_PDF
- *  @copyright   Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_PDF_DomPDF extends PHPExcel_Writer_PDF_Core implements PHPExcel_Writer_IWriter
-{
-    /**
-     *  Create a new PHPExcel_Writer_PDF
-     *
-     *  @param   PHPExcel    $phpExcel    PHPExcel object
-     */
-    public function __construct(PHPExcel $phpExcel)
-    {
-        parent::__construct($phpExcel);
-    }
-
-    /**
-     *  Save PHPExcel to file
-     *
-     *  @param   string     $pFilename   Name of the file to save as
-     *  @throws  PHPExcel_Writer_Exception
-     */
-    public function save($pFilename = NULL)
-    {
-        $fileHandle = parent::prepareForSave($pFilename);
-
-        //  Default PDF paper size
-        $paperSize = 'LETTER';    //    Letter    (8.5 in. by 11 in.)
-
-        //  Check for paper size and page orientation
-        if (is_null($this->getSheetIndex())) {
-            $orientation = ($this->_phpExcel->getSheet(0)->getPageSetup()->getOrientation()
-                == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE)
-                    ? 'L'
-                    : 'P';
-            $printPaperSize = $this->_phpExcel->getSheet(0)->getPageSetup()->getPaperSize();
-            $printMargins = $this->_phpExcel->getSheet(0)->getPageMargins();
-        } else {
-            $orientation = ($this->_phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getOrientation()
-                == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE)
-                    ? 'L'
-                    : 'P';
-            $printPaperSize = $this->_phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getPaperSize();
-            $printMargins = $this->_phpExcel->getSheet($this->getSheetIndex())->getPageMargins();
-        }
-
-        
-        $orientation = ($orientation == 'L') ? 'landscape' : 'portrait';
-
-        //  Override Page Orientation
-        if (!is_null($this->getOrientation())) {
-            $orientation = ($this->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT)
-                ? PHPExcel_Worksheet_PageSetup::ORIENTATION_PORTRAIT
-                : $this->getOrientation();
-        }
-        //  Override Paper Size
-        if (!is_null($this->getPaperSize())) {
-            $printPaperSize = $this->getPaperSize();
-        }
-
-        if (isset(self::$_paperSizes[$printPaperSize])) {
-            $paperSize = self::$_paperSizes[$printPaperSize];
-        }
-
-
-        //  Create PDF
-        $pdf = new DOMPDF();
-        $pdf->set_paper(strtolower($paperSize), $orientation);
-
-        $pdf->load_html(
-            $this->generateHTMLHeader(FALSE) .
-            $this->generateSheetData() .
-            $this->generateHTMLFooter()
-        );
-        $pdf->render();
-
-        //  Write to file
-        fwrite($fileHandle, $pdf->output());
-
-		parent::restoreStateAfterSave($fileHandle);
-    }
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/mPDF.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/mPDF.php
deleted file mode 100644
index dddc097d343..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/mPDF.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/**
- *  PHPExcel
- *
- *  Copyright (c) 2006 - 2014 PHPExcel
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *  @category    PHPExcel
- *  @package     PHPExcel_Writer_PDF
- *  @copyright   Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- *  @license     http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- *  @version     ##VERSION##, ##DATE##
- */
-
-
-/**  Require mPDF library */
-$pdfRendererClassFile = PHPExcel_Settings::getPdfRendererPath() . '/mpdf.php';
-if (file_exists($pdfRendererClassFile)) {
-    require_once $pdfRendererClassFile;
-} else {
-    throw new PHPExcel_Writer_Exception('Unable to load PDF Rendering library');
-}
-
-/**
- *  PHPExcel_Writer_PDF_mPDF
- *
- *  @category    PHPExcel
- *  @package     PHPExcel_Writer_PDF
- *  @copyright   Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_PDF_mPDF extends PHPExcel_Writer_PDF_Core implements PHPExcel_Writer_IWriter
-{
-    /**
-     *  Create a new PHPExcel_Writer_PDF
-     *
-     *  @param  PHPExcel  $phpExcel  PHPExcel object
-     */
-    public function __construct(PHPExcel $phpExcel)
-    {
-        parent::__construct($phpExcel);
-    }
-
-    /**
-     *  Save PHPExcel to file
-     *
-     *  @param     string     $pFilename   Name of the file to save as
-     *  @throws    PHPExcel_Writer_Exception
-     */
-    public function save($pFilename = NULL)
-    {
-        $fileHandle = parent::prepareForSave($pFilename);
-
-        //  Default PDF paper size
-        $paperSize = 'LETTER';    //    Letter    (8.5 in. by 11 in.)
-
-        //  Check for paper size and page orientation
-        if (is_null($this->getSheetIndex())) {
-            $orientation = ($this->_phpExcel->getSheet(0)->getPageSetup()->getOrientation()
-                == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE)
-                    ? 'L'
-                    : 'P';
-            $printPaperSize = $this->_phpExcel->getSheet(0)->getPageSetup()->getPaperSize();
-            $printMargins = $this->_phpExcel->getSheet(0)->getPageMargins();
-        } else {
-            $orientation = ($this->_phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getOrientation()
-                == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE)
-                    ? 'L'
-                    : 'P';
-            $printPaperSize = $this->_phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getPaperSize();
-            $printMargins = $this->_phpExcel->getSheet($this->getSheetIndex())->getPageMargins();
-        }
-        $this->setOrientation($orientation);
-
-        //  Override Page Orientation
-        if (!is_null($this->getOrientation())) {
-            $orientation = ($this->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT)
-                ? PHPExcel_Worksheet_PageSetup::ORIENTATION_PORTRAIT
-                : $this->getOrientation();
-        }
-        $orientation = strtoupper($orientation);
-
-        //  Override Paper Size
-        if (!is_null($this->getPaperSize())) {
-            $printPaperSize = $this->getPaperSize();
-        }
-
-        if (isset(self::$_paperSizes[$printPaperSize])) {
-            $paperSize = self::$_paperSizes[$printPaperSize];
-        }
-
-        //  Create PDF
-        $pdf = new mpdf();
-        $ortmp = $orientation;
-        $pdf->_setPageSize(strtoupper($paperSize), $ortmp);
-        $pdf->DefOrientation = $orientation;
-        $pdf->AddPage($orientation);
-
-        //  Document info
-        $pdf->SetTitle($this->_phpExcel->getProperties()->getTitle());
-        $pdf->SetAuthor($this->_phpExcel->getProperties()->getCreator());
-        $pdf->SetSubject($this->_phpExcel->getProperties()->getSubject());
-        $pdf->SetKeywords($this->_phpExcel->getProperties()->getKeywords());
-        $pdf->SetCreator($this->_phpExcel->getProperties()->getCreator());
-
-        $pdf->WriteHTML(
-            $this->generateHTMLHeader(FALSE) .
-            $this->generateSheetData() .
-            $this->generateHTMLFooter()
-        );
-
-        //  Write to file
-        fwrite($fileHandle, $pdf->Output('', 'S'));
-
-		parent::restoreStateAfterSave($fileHandle);
-    }
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/tcPDF.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/tcPDF.php
deleted file mode 100644
index 4e1937afc70..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/tcPDF.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/**
- *  PHPExcel
- *
- *  Copyright (c) 2006 - 2014 PHPExcel
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *  @category    PHPExcel
- *  @package     PHPExcel_Writer_PDF
- *  @copyright   Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- *  @license     http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- *  @version     ##VERSION##, ##DATE##
- */
-
-
-/**  Require tcPDF library */
-$pdfRendererClassFile = PHPExcel_Settings::getPdfRendererPath() . '/tcpdf.php';
-if (file_exists($pdfRendererClassFile)) {
-    $k_path_url = PHPExcel_Settings::getPdfRendererPath();
-    require_once $pdfRendererClassFile;
-} else {
-    throw new PHPExcel_Writer_Exception('Unable to load PDF Rendering library');
-}
-
-/**
- *  PHPExcel_Writer_PDF_tcPDF
- *
- *  @category    PHPExcel
- *  @package     PHPExcel_Writer_PDF
- *  @copyright   Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_PDF_tcPDF extends PHPExcel_Writer_PDF_Core implements PHPExcel_Writer_IWriter
-{
-    /**
-     *  Create a new PHPExcel_Writer_PDF
-     *
-     *  @param  PHPExcel  $phpExcel  PHPExcel object
-     */
-    public function __construct(PHPExcel $phpExcel)
-    {
-        parent::__construct($phpExcel);
-    }
-
-    /**
-     *  Save PHPExcel to file
-     *
-     *  @param     string     $pFilename   Name of the file to save as
-     *  @throws    PHPExcel_Writer_Exception
-     */
-    public function save($pFilename = NULL)
-    {
-        $fileHandle = parent::prepareForSave($pFilename);
-
-        //  Default PDF paper size
-        $paperSize = 'LETTER';    //    Letter    (8.5 in. by 11 in.)
-
-        //  Check for paper size and page orientation
-        if (is_null($this->getSheetIndex())) {
-            $orientation = ($this->_phpExcel->getSheet(0)->getPageSetup()->getOrientation()
-                == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE)
-                    ? 'L'
-                    : 'P';
-            $printPaperSize = $this->_phpExcel->getSheet(0)->getPageSetup()->getPaperSize();
-            $printMargins = $this->_phpExcel->getSheet(0)->getPageMargins();
-        } else {
-            $orientation = ($this->_phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getOrientation()
-                == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE)
-                    ? 'L'
-                    : 'P';
-            $printPaperSize = $this->_phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getPaperSize();
-            $printMargins = $this->_phpExcel->getSheet($this->getSheetIndex())->getPageMargins();
-        }
-
-        //  Override Page Orientation
-        if (!is_null($this->getOrientation())) {
-            $orientation = ($this->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE)
-                ? 'L'
-                : 'P';
-        }
-        //  Override Paper Size
-        if (!is_null($this->getPaperSize())) {
-            $printPaperSize = $this->getPaperSize();
-        }
-
-        if (isset(self::$_paperSizes[$printPaperSize])) {
-            $paperSize = self::$_paperSizes[$printPaperSize];
-        }
-
-
-        //  Create PDF
-        $pdf = new TCPDF($orientation, 'pt', $paperSize);
-        $pdf->setFontSubsetting(FALSE);
-        //    Set margins, converting inches to points (using 72 dpi)
-        $pdf->SetMargins($printMargins->getLeft() * 72, $printMargins->getTop() * 72, $printMargins->getRight() * 72);
-        $pdf->SetAutoPageBreak(TRUE, $printMargins->getBottom() * 72);
-
-        $pdf->setPrintHeader(FALSE);
-        $pdf->setPrintFooter(FALSE);
-
-        $pdf->AddPage();
-
-        //  Set the appropriate font
-        $pdf->SetFont($this->getFont());
-        $pdf->writeHTML(
-            $this->generateHTMLHeader(FALSE) .
-            $this->generateSheetData() .
-            $this->generateHTMLFooter()
-        );
-
-        //  Document info
-        $pdf->SetTitle($this->_phpExcel->getProperties()->getTitle());
-        $pdf->SetAuthor($this->_phpExcel->getProperties()->getCreator());
-        $pdf->SetSubject($this->_phpExcel->getProperties()->getSubject());
-        $pdf->SetKeywords($this->_phpExcel->getProperties()->getKeywords());
-        $pdf->SetCreator($this->_phpExcel->getProperties()->getCreator());
-
-        //  Write to file
-        fwrite($fileHandle, $pdf->output($pFilename, 'S'));
-
-		parent::restoreStateAfterSave($fileHandle);
-    }
-
-}
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/bg/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/bg/config
deleted file mode 100644
index 4cecddb3c3c..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/bg/config
+++ /dev/null
@@ -1,49 +0,0 @@
-##
-## PHPExcel
-##
-
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt  LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= лв
-
-
-##
-##	Excel Error Codes	(For future use)
-
-##
-NULL	= #ПРАЗНО!
-DIV0	= #ДЕЛ/0!
-VALUE	= #СТОЙНОСТ!
-REF	= #РЕФ!
-NAME	= #ИМЕ?
-NUM	= #ЧИСЛО!
-NA	= #Н/Д
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/config
deleted file mode 100644
index 8992916acaf..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= Kč
-
-
-##
-##	Excel Error Codes	(For future use)
-##
-NULL	= #NULL!
-DIV0	= #DIV/0!
-VALUE	= #HODNOTA!
-REF	= #REF!
-NAME	= #NÁZEV?
-NUM	= #NUM!
-NA	= #N/A
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
deleted file mode 100644
index f9d69784ae2..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
+++ /dev/null
@@ -1,438 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Calculation
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
-##
-##
-
-
-##
-##	Add-in and Automation functions		Funkce doplňků a automatizace
-##
-GETPIVOTDATA		= ZÍSKATKONTDATA	##	Vrátí data uložená v kontingenční tabulce. Pomocí funkce ZÍSKATKONTDATA můžete načíst souhrnná data z kontingenční tabulky, pokud jsou tato data v kontingenční sestavě zobrazena.
-
-
-##
-##	Cube functions				Funkce pro práci s krychlemi
-##
-CUBEKPIMEMBER		= CUBEKPIMEMBER		##	Vrátí název, vlastnost a velikost klíčového ukazatele výkonu (KUV) a zobrazí v buňce název a vlastnost. Klíčový ukazatel výkonu je kvantifikovatelná veličina, například hrubý měsíční zisk nebo čtvrtletní obrat na zaměstnance, která se používá pro sledování výkonnosti organizace.
-CUBEMEMBER		= CUBEMEMBER		##	Vrátí člen nebo n-tici v hierarchii krychle. Slouží k ověření, zda v krychli existuje člen nebo n-tice.
-CUBEMEMBERPROPERTY	= CUBEMEMBERPROPERTY	##	Vrátí hodnotu vlastnosti člena v krychli. Slouží k ověření, zda v krychli existuje člen s daným názvem, a k vrácení konkrétní vlastnosti tohoto člena.
-CUBERANKEDMEMBER	= CUBERANKEDMEMBER	##	Vrátí n-tý nebo pořadový člen sady. Použijte ji pro vrácení jednoho nebo více prvků sady, například obchodníka s nejvyšším obratem nebo deseti nejlepších studentů.
-CUBESET			= CUBESET		##	Definuje vypočtenou sadu členů nebo n-tic odesláním výrazu sady do krychle na serveru, který vytvoří sadu a potom ji vrátí do aplikace Microsoft Office Excel.
-CUBESETCOUNT		= CUBESETCOUNT		##	Vrátí počet položek v množině
-CUBEVALUE		= CUBEVALUE		##	Vrátí úhrnnou hodnotu z krychle.
-
-
-##
-##	Database functions			Funkce databáze
-##
-DAVERAGE		= DPRŮMĚR		##	Vrátí průměr vybraných položek databáze.
-DCOUNT			= DPOČET		##	Spočítá buňky databáze obsahující čísla.
-DCOUNTA			= DPOČET2		##	Spočítá buňky databáze, které nejsou prázdné.
-DGET			= DZÍSKAT		##	Extrahuje z databáze jeden záznam splňující zadaná kritéria.
-DMAX			= DMAX			##	Vrátí maximální hodnotu z vybraných položek databáze.
-DMIN			= DMIN			##	Vrátí minimální hodnotu z vybraných položek databáze.
-DPRODUCT		= DSOUČIN		##	Vynásobí hodnoty určitého pole záznamů v databázi, které splňují daná kritéria.
-DSTDEV			= DSMODCH.VÝBĚR		##	Odhadne směrodatnou odchylku výběru vybraných položek databáze.
-DSTDEVP			= DSMODCH		##	Vypočte směrodatnou odchylku základního souboru vybraných položek databáze.
-DSUM			= DSUMA			##	Sečte čísla ve sloupcovém poli záznamů databáze, která splňují daná kritéria.
-DVAR			= DVAR.VÝBĚR		##	Odhadne rozptyl výběru vybraných položek databáze.
-DVARP			= DVAR			##	Vypočte rozptyl základního souboru vybraných položek databáze.
-
-
-##
-##	Date and time functions			Funkce data a času
-##
-DATE			= DATUM			##	Vrátí pořadové číslo určitého data.
-DATEVALUE		= DATUMHODN		##	Převede datum ve formě textu na pořadové číslo.
-DAY			= DEN			##	Převede pořadové číslo na den v měsíci.
-DAYS360			= ROK360		##	Vrátí počet dní mezi dvěma daty na základě roku s 360 dny.
-EDATE			= EDATE			##	Vrátí pořadové číslo data, které označuje určený počet měsíců před nebo po počátečním datu.
-EOMONTH			= EOMONTH		##	Vrátí pořadové číslo posledního dne měsíce před nebo po zadaném počtu měsíců.
-HOUR			= HODINA		##	Převede pořadové číslo na hodinu.
-MINUTE			= MINUTA		##	Převede pořadové číslo na minutu.
-MONTH			= MĚSÍC			##	Převede pořadové číslo na měsíc.
-NETWORKDAYS		= NETWORKDAYS		##	Vrátí počet celých pracovních dní mezi dvěma daty.
-NOW			= NYNÍ			##	Vrátí pořadové číslo aktuálního data a času.
-SECOND			= SEKUNDA		##	Převede pořadové číslo na sekundu.
-TIME			= ČAS			##	Vrátí pořadové číslo určitého času.
-TIMEVALUE		= ČASHODN		##	Převede čas ve formě textu na pořadové číslo.
-TODAY			= DNES			##	Vrátí pořadové číslo dnešního data.
-WEEKDAY			= DENTÝDNE		##	Převede pořadové číslo na den v týdnu.
-WEEKNUM			= WEEKNUM		##	Převede pořadové číslo na číslo představující číselnou pozici týdne v roce.
-WORKDAY			= WORKDAY		##	Vrátí pořadové číslo data před nebo po zadaném počtu pracovních dní.
-YEAR			= ROK			##	Převede pořadové číslo na rok.
-YEARFRAC		= YEARFRAC		##	Vrátí část roku vyjádřenou zlomkem a představující počet celých dní mezi počátečním a koncovým datem.
-
-
-##
-##	Engineering functions			Inženýrské funkce (Technické funkce)
-##
-BESSELI			= BESSELI		##	Vrátí modifikovanou Besselovu funkci In(x).
-BESSELJ			= BESSELJ		##	Vrátí modifikovanou Besselovu funkci Jn(x).
-BESSELK			= BESSELK		##	Vrátí modifikovanou Besselovu funkci Kn(x).
-BESSELY			= BESSELY		##	Vrátí Besselovu funkci Yn(x).
-BIN2DEC			= BIN2DEC		##	Převede binární číslo na desítkové.
-BIN2HEX			= BIN2HEX		##	Převede binární číslo na šestnáctkové.
-BIN2OCT			= BIN2OCT		##	Převede binární číslo na osmičkové.
-COMPLEX			= COMPLEX		##	Převede reálnou a imaginární část na komplexní číslo.
-CONVERT			= CONVERT		##	Převede číslo do jiného jednotkového měrného systému.
-DEC2BIN			= DEC2BIN		##	Převede desítkového čísla na dvojkové
-DEC2HEX			= DEC2HEX		##	Převede desítkové číslo na šestnáctkové.
-DEC2OCT			= DEC2OCT		##	Převede desítkové číslo na osmičkové.
-DELTA			= DELTA			##	Testuje rovnost dvou hodnot.
-ERF			= ERF			##	Vrátí chybovou funkci.
-ERFC			= ERFC			##	Vrátí doplňkovou chybovou funkci.
-GESTEP			= GESTEP		##	Testuje, zda je číslo větší než mezní hodnota.
-HEX2BIN			= HEX2BIN		##	Převede šestnáctkové číslo na binární.
-HEX2DEC			= HEX2DEC		##	Převede šestnáctkové číslo na desítkové.
-HEX2OCT			= HEX2OCT		##	Převede šestnáctkové číslo na osmičkové.
-IMABS			= IMABS			##	Vrátí absolutní hodnotu (modul) komplexního čísla.
-IMAGINARY		= IMAGINARY		##	Vrátí imaginární část komplexního čísla.
-IMARGUMENT		= IMARGUMENT		##	Vrátí argument théta, úhel vyjádřený v radiánech.
-IMCONJUGATE		= IMCONJUGATE		##	Vrátí komplexně sdružené číslo ke komplexnímu číslu.
-IMCOS			= IMCOS			##	Vrátí kosinus komplexního čísla.
-IMDIV			= IMDIV			##	Vrátí podíl dvou komplexních čísel.
-IMEXP			= IMEXP			##	Vrátí exponenciální tvar komplexního čísla.
-IMLN			= IMLN			##	Vrátí přirozený logaritmus komplexního čísla.
-IMLOG10			= IMLOG10		##	Vrátí dekadický logaritmus komplexního čísla.
-IMLOG2			= IMLOG2		##	Vrátí logaritmus komplexního čísla při základu 2.
-IMPOWER			= IMPOWER		##	Vrátí komplexní číslo umocněné na celé číslo.
-IMPRODUCT		= IMPRODUCT		##	Vrátí součin komplexních čísel.
-IMREAL			= IMREAL		##	Vrátí reálnou část komplexního čísla.
-IMSIN			= IMSIN			##	Vrátí sinus komplexního čísla.
-IMSQRT			= IMSQRT		##	Vrátí druhou odmocninu komplexního čísla.
-IMSUB			= IMSUB			##	Vrátí rozdíl mezi dvěma komplexními čísly.
-IMSUM			= IMSUM			##	Vrátí součet dvou komplexních čísel.
-OCT2BIN			= OCT2BIN		##	Převede osmičkové číslo na binární.
-OCT2DEC			= OCT2DEC		##	Převede osmičkové číslo na desítkové.
-OCT2HEX			= OCT2HEX		##	Převede osmičkové číslo na šestnáctkové.
-
-
-##
-##	Financial functions			Finanční funkce
-##
-ACCRINT			= ACCRINT		##	Vrátí nahromaděný úrok z cenného papíru, ze kterého je úrok placen v pravidelných termínech.
-ACCRINTM		= ACCRINTM		##	Vrátí nahromaděný úrok z cenného papíru, ze kterého je úrok placen k datu splatnosti.
-AMORDEGRC		= AMORDEGRC		##	Vrátí lineární amortizaci v každém účetním období pomocí koeficientu amortizace.
-AMORLINC		= AMORLINC		##	Vrátí lineární amortizaci v každém účetním období.
-COUPDAYBS		= COUPDAYBS		##	Vrátí počet dnů od začátku období placení kupónů do data splatnosti.
-COUPDAYS		= COUPDAYS		##	Vrátí počet dnů v období placení kupónů, které obsahuje den zúčtování.
-COUPDAYSNC		= COUPDAYSNC		##	Vrátí počet dnů od data zúčtování do následujícího data placení kupónu.
-COUPNCD			= COUPNCD		##	Vrátí následující datum placení kupónu po datu zúčtování.
-COUPNUM			= COUPNUM		##	Vrátí počet kupónů splatných mezi datem zúčtování a datem splatnosti.
-COUPPCD			= COUPPCD		##	Vrátí předchozí datum placení kupónu před datem zúčtování.
-CUMIPMT			= CUMIPMT		##	Vrátí kumulativní úrok splacený mezi dvěma obdobími.
-CUMPRINC		= CUMPRINC		##	Vrátí kumulativní jistinu splacenou mezi dvěma obdobími půjčky.
-DB			= ODPIS.ZRYCH		##	Vrátí odpis aktiva za určité období pomocí degresivní metody odpisu s pevným zůstatkem.
-DDB			= ODPIS.ZRYCH2		##	Vrátí odpis aktiva za určité období pomocí dvojité degresivní metody odpisu nebo jiné metody, kterou zadáte.
-DISC			= DISC			##	Vrátí diskontní sazbu cenného papíru.
-DOLLARDE		= DOLLARDE		##	Převede částku v korunách vyjádřenou zlomkem na částku v korunách vyjádřenou desetinným číslem.
-DOLLARFR		= DOLLARFR		##	Převede částku v korunách vyjádřenou desetinným číslem na částku v korunách vyjádřenou zlomkem.
-DURATION		= DURATION		##	Vrátí roční dobu cenného papíru s pravidelnými úrokovými sazbami.
-EFFECT			= EFFECT		##	Vrátí efektivní roční úrokovou sazbu.
-FV			= BUDHODNOTA		##	Vrátí budoucí hodnotu investice.
-FVSCHEDULE		= FVSCHEDULE		##	Vrátí budoucí hodnotu počáteční jistiny po použití série sazeb složitého úroku.
-INTRATE			= INTRATE		##	Vrátí úrokovou sazbu plně investovaného cenného papíru.
-IPMT			= PLATBA.ÚROK		##	Vrátí výšku úroku investice za dané období.
-IRR			= MÍRA.VÝNOSNOSTI	##	Vrátí vnitřní výnosové procento série peněžních toků.
-ISPMT			= ISPMT			##	Vypočte výši úroku z investice zaplaceného během určitého období.
-MDURATION		= MDURATION		##	Vrátí Macauleyho modifikovanou dobu cenného papíru o nominální hodnotě 100 Kč.
-MIRR			= MOD.MÍRA.VÝNOSNOSTI	##	Vrátí vnitřní sazbu výnosu, přičemž kladné a záporné hodnoty peněžních prostředků jsou financovány podle různých sazeb.
-NOMINAL			= NOMINAL		##	Vrátí nominální roční úrokovou sazbu.
-NPER			= POČET.OBDOBÍ		##	Vrátí počet období pro investici.
-NPV			= ČISTÁ.SOUČHODNOTA	##	Vrátí čistou současnou hodnotu investice vypočítanou na základě série pravidelných peněžních toků a diskontní sazby.
-ODDFPRICE		= ODDFPRICE		##	Vrátí cenu cenného papíru o nominální hodnotě 100 Kč s odlišným prvním obdobím.
-ODDFYIELD		= ODDFYIELD		##	Vrátí výnos cenného papíru s odlišným prvním obdobím.
-ODDLPRICE		= ODDLPRICE		##	Vrátí cenu cenného papíru o nominální hodnotě 100 Kč s odlišným posledním obdobím.
-ODDLYIELD		= ODDLYIELD		##	Vrátí výnos cenného papíru s odlišným posledním obdobím.
-PMT			= PLATBA		##	Vrátí hodnotu pravidelné splátky anuity.
-PPMT			= PLATBA.ZÁKLAD		##	Vrátí hodnotu splátky jistiny pro zadanou investici za dané období.
-PRICE			= PRICE			##	Vrátí cenu cenného papíru o nominální hodnotě 100 Kč, ze kterého je úrok placen v pravidelných termínech.
-PRICEDISC		= PRICEDISC		##	Vrátí cenu diskontního cenného papíru o nominální hodnotě 100 Kč.
-PRICEMAT		= PRICEMAT		##	Vrátí cenu cenného papíru o nominální hodnotě 100 Kč, ze kterého je úrok placen k datu splatnosti.
-PV			= SOUČHODNOTA		##	Vrátí současnou hodnotu investice.
-RATE			= ÚROKOVÁ.MÍRA		##	Vrátí úrokovou sazbu vztaženou na období anuity.
-RECEIVED		= RECEIVED		##	Vrátí částku obdrženou k datu splatnosti plně investovaného cenného papíru.
-SLN			= ODPIS.LIN		##	Vrátí přímé odpisy aktiva pro jedno období.
-SYD			= ODPIS.NELIN		##	Vrátí směrné číslo ročních odpisů aktiva pro zadané období.
-TBILLEQ			= TBILLEQ		##	Vrátí výnos směnky státní pokladny ekvivalentní výnosu obligace.
-TBILLPRICE		= TBILLPRICE		##	Vrátí cenu směnky státní pokladny o nominální hodnotě 100 Kč.
-TBILLYIELD		= TBILLYIELD		##	Vrátí výnos směnky státní pokladny.
-VDB			= ODPIS.ZA.INT		##	Vrátí odpis aktiva pro určité období nebo část období pomocí degresivní metody odpisu.
-XIRR			= XIRR			##	Vrátí vnitřní výnosnost pro harmonogram peněžních toků, který nemusí být nutně periodický.
-XNPV			= XNPV			##	Vrátí čistou současnou hodnotu pro harmonogram peněžních toků, který nemusí být nutně periodický.
-YIELD			= YIELD			##	Vrátí výnos cenného papíru, ze kterého je úrok placen v pravidelných termínech.
-YIELDDISC		= YIELDDISC		##	Vrátí roční výnos diskontního cenného papíru, například směnky státní pokladny.
-YIELDMAT		= YIELDMAT		##	Vrátí roční výnos cenného papíru, ze kterého je úrok placen k datu splatnosti.
-
-
-##
-##	Information functions			Informační funkce
-##
-CELL			= POLÍČKO		##	Vrátí informace o formátování, umístění nebo obsahu buňky.
-ERROR.TYPE		= CHYBA.TYP		##	Vrátí číslo odpovídající typu chyby.
-INFO			= O.PROSTŘEDÍ		##	Vrátí informace o aktuálním pracovním prostředí.
-ISBLANK			= JE.PRÁZDNÉ		##	Vrátí hodnotu PRAVDA, pokud se argument hodnota odkazuje na prázdnou buňku.
-ISERR			= JE.CHYBA		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota libovolná chybová hodnota (kromě #N/A).
-ISERROR			= JE.CHYBHODN		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota libovolná chybová hodnota.
-ISEVEN			= ISEVEN		##	Vrátí hodnotu PRAVDA, pokud je číslo sudé.
-ISLOGICAL		= JE.LOGHODN		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota logická hodnota.
-ISNA			= JE.NEDEF		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota chybová hodnota #N/A.
-ISNONTEXT		= JE.NETEXT		##	Vrátí hodnotu PRAVDA, pokud argument hodnota není text.
-ISNUMBER		= JE.ČÍSLO		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota číslo.
-ISODD			= ISODD			##	Vrátí hodnotu PRAVDA, pokud je číslo liché.
-ISREF			= JE.ODKAZ		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota odkaz.
-ISTEXT			= JE.TEXT		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota text.
-N			= N			##	Vrátí hodnotu převedenou na číslo.
-NA			= NEDEF			##	Vrátí chybovou hodnotu #N/A.
-TYPE			= TYP			##	Vrátí číslo označující datový typ hodnoty.
-
-
-##
-##	Logical functions			Logické funkce
-##
-AND			= A			##	Vrátí hodnotu PRAVDA, mají-li všechny argumenty hodnotu PRAVDA.
-FALSE			= NEPRAVDA		##	Vrátí logickou hodnotu NEPRAVDA.
-IF			= KDYŽ			##	Určí, který logický test má proběhnout.
-IFERROR			= IFERROR		##	Pokud je vzorec vyhodnocen jako chyba, vrátí zadanou hodnotu. V opačném případě vrátí výsledek vzorce.
-NOT			= NE			##	Provede logickou negaci argumentu funkce.
-OR			= NEBO			##	Vrátí hodnotu PRAVDA, je-li alespoň jeden argument roven hodnotě PRAVDA.
-TRUE			= PRAVDA		##	Vrátí logickou hodnotu PRAVDA.
-
-
-##
-##	Lookup and reference functions		Vyhledávací funkce
-##
-ADDRESS			= ODKAZ			##	Vrátí textový odkaz na jednu buňku listu.
-AREAS			= POČET.BLOKŮ		##	Vrátí počet oblastí v odkazu.
-CHOOSE			= ZVOLIT		##	Zvolí hodnotu ze seznamu hodnot.
-COLUMN			= SLOUPEC		##	Vrátí číslo sloupce odkazu.
-COLUMNS			= SLOUPCE		##	Vrátí počet sloupců v odkazu.
-HLOOKUP			= VVYHLEDAT		##	Prohledá horní řádek matice a vrátí hodnotu určené buňky.
-HYPERLINK		= HYPERTEXTOVÝ.ODKAZ	##	Vytvoří zástupce nebo odkaz, který otevře dokument uložený na síťovém serveru, v síti intranet nebo Internet.
-INDEX			= INDEX			##	Pomocí rejstříku zvolí hodnotu z odkazu nebo matice.
-INDIRECT		= NEPŘÍMÝ.ODKAZ		##	Vrátí odkaz určený textovou hodnotou.
-LOOKUP			= VYHLEDAT		##	Vyhledá hodnoty ve vektoru nebo matici.
-MATCH			= POZVYHLEDAT		##	Vyhledá hodnoty v odkazu nebo matici.
-OFFSET			= POSUN			##	Vrátí posun odkazu od zadaného odkazu.
-ROW			= ŘÁDEK			##	Vrátí číslo řádku odkazu.
-ROWS			= ŘÁDKY			##	Vrátí počet řádků v odkazu.
-RTD			= RTD			##	Načte data reálného času z programu, který podporuje automatizaci modelu COM (Automatizace: Způsob práce s objekty určité aplikace z jiné aplikace nebo nástroje pro vývoj. Automatizace (dříve nazývaná automatizace OLE) je počítačovým standardem a je funkcí modelu COM (Component Object Model).).
-TRANSPOSE		= TRANSPOZICE		##	Vrátí transponovanou matici.
-VLOOKUP			= SVYHLEDAT		##	Prohledá první sloupec matice, přesune kurzor v řádku a vrátí hodnotu buňky.
-
-
-##
-##	Math and trigonometry functions		Matematické a trigonometrické funkce
-##
-ABS			= ABS			##	Vrátí absolutní hodnotu čísla.
-ACOS			= ARCCOS		##	Vrátí arkuskosinus čísla.
-ACOSH			= ARCCOSH		##	Vrátí hyperbolický arkuskosinus čísla.
-ASIN			= ARCSIN		##	Vrátí arkussinus čísla.
-ASINH			= ARCSINH		##	Vrátí hyperbolický arkussinus čísla.
-ATAN			= ARCTG			##	Vrátí arkustangens čísla.
-ATAN2			= ARCTG2		##	Vrátí arkustangens x-ové a y-ové souřadnice.
-ATANH			= ARCTGH		##	Vrátí hyperbolický arkustangens čísla.
-CEILING			= ZAOKR.NAHORU		##	Zaokrouhlí číslo na nejbližší celé číslo nebo na nejbližší násobek zadané hodnoty.
-COMBIN			= KOMBINACE		##	Vrátí počet kombinací pro daný počet položek.
-COS			= COS			##	Vrátí kosinus čísla.
-COSH			= COSH			##	Vrátí hyperbolický kosinus čísla.
-DEGREES			= DEGREES		##	Převede radiány na stupně.
-EVEN			= ZAOKROUHLIT.NA.SUDÉ	##	Zaokrouhlí číslo nahoru na nejbližší celé sudé číslo.
-EXP			= EXP			##	Vrátí základ přirozeného logaritmu e umocněný na zadané číslo.
-FACT			= FAKTORIÁL		##	Vrátí faktoriál čísla.
-FACTDOUBLE		= FACTDOUBLE		##	Vrátí dvojitý faktoriál čísla.
-FLOOR			= ZAOKR.DOLŮ		##	Zaokrouhlí číslo dolů, směrem k nule.
-GCD			= GCD			##	Vrátí největší společný dělitel.
-INT			= CELÁ.ČÁST		##	Zaokrouhlí číslo dolů na nejbližší celé číslo.
-LCM			= LCM			##	Vrátí nejmenší společný násobek.
-LN			= LN			##	Vrátí přirozený logaritmus čísla.
-LOG			= LOGZ			##	Vrátí logaritmus čísla při zadaném základu.
-LOG10			= LOG			##	Vrátí dekadický logaritmus čísla.
-MDETERM			= DETERMINANT		##	Vrátí determinant matice.
-MINVERSE		= INVERZE		##	Vrátí inverzní matici.
-MMULT			= SOUČIN.MATIC		##	Vrátí součin dvou matic.
-MOD			= MOD			##	Vrátí zbytek po dělení.
-MROUND			= MROUND		##	Vrátí číslo zaokrouhlené na požadovaný násobek.
-MULTINOMIAL		= MULTINOMIAL		##	Vrátí mnohočlen z množiny čísel.
-ODD			= ZAOKROUHLIT.NA.LICHÉ	##	Zaokrouhlí číslo nahoru na nejbližší celé liché číslo.
-PI			= PI			##	Vrátí hodnotu čísla pí.
-POWER			= POWER			##	Umocní číslo na zadanou mocninu.
-PRODUCT			= SOUČIN		##	Vynásobí argumenty funkce.
-QUOTIENT		= QUOTIENT		##	Vrátí celou část dělení.
-RADIANS			= RADIANS		##	Převede stupně na radiány.
-RAND			= NÁHČÍSLO		##	Vrátí náhodné číslo mezi 0 a 1.
-RANDBETWEEN		= RANDBETWEEN		##	Vrátí náhodné číslo mezi zadanými čísly.
-ROMAN			= ROMAN			##	Převede arabskou číslici na římskou ve formátu textu.
-ROUND			= ZAOKROUHLIT		##	Zaokrouhlí číslo na zadaný počet číslic.
-ROUNDDOWN		= ROUNDDOWN		##	Zaokrouhlí číslo dolů, směrem k nule.
-ROUNDUP			= ROUNDUP		##	Zaokrouhlí číslo nahoru, směrem od nuly.
-SERIESSUM		= SERIESSUM		##	Vrátí součet mocninné řady určené podle vzorce.
-SIGN			= SIGN			##	Vrátí znaménko čísla.
-SIN			= SIN			##	Vrátí sinus daného úhlu.
-SINH			= SINH			##	Vrátí hyperbolický sinus čísla.
-SQRT			= ODMOCNINA		##	Vrátí kladnou druhou odmocninu.
-SQRTPI			= SQRTPI		##	Vrátí druhou odmocninu výrazu (číslo * pí).
-SUBTOTAL		= SUBTOTAL		##	Vrátí souhrn v seznamu nebo databázi.
-SUM			= SUMA			##	Sečte argumenty funkce.
-SUMIF			= SUMIF			##	Sečte buňky vybrané podle zadaných kritérií.
-SUMIFS			= SUMIFS		##	Sečte buňky určené více zadanými podmínkami.
-SUMPRODUCT		= SOUČIN.SKALÁRNÍ	##	Vrátí součet součinů odpovídajících prvků matic.
-SUMSQ			= SUMA.ČTVERCŮ		##	Vrátí součet čtverců argumentů.
-SUMX2MY2		= SUMX2MY2		##	Vrátí součet rozdílu čtverců odpovídajících hodnot ve dvou maticích.
-SUMX2PY2		= SUMX2PY2		##	Vrátí součet součtu čtverců odpovídajících hodnot ve dvou maticích.
-SUMXMY2			= SUMXMY2		##	Vrátí součet čtverců rozdílů odpovídajících hodnot ve dvou maticích.
-TAN			= TGTG			##	Vrátí tangens čísla.
-TANH			= TGH			##	Vrátí hyperbolický tangens čísla.
-TRUNC			= USEKNOUT		##	Zkrátí číslo na celé číslo.
-
-
-##
-##	Statistical functions			Statistické funkce
-##
-AVEDEV			= PRŮMODCHYLKA		##	Vrátí průměrnou hodnotu absolutních odchylek datových bodů od jejich střední hodnoty.
-AVERAGE			= PRŮMĚR		##	Vrátí průměrnou hodnotu argumentů.
-AVERAGEA		= AVERAGEA		##	Vrátí průměrnou hodnotu argumentů včetně čísel, textu a logických hodnot.
-AVERAGEIF		= AVERAGEIF		##	Vrátí průměrnou hodnotu (aritmetický průměr) všech buněk v oblasti, které vyhovují příslušné podmínce.
-AVERAGEIFS		= AVERAGEIFS		##	Vrátí průměrnou hodnotu (aritmetický průměr) všech buněk vyhovujících několika podmínkám.
-BETADIST		= BETADIST		##	Vrátí hodnotu součtového rozdělení beta.
-BETAINV			= BETAINV		##	Vrátí inverzní hodnotu součtového rozdělení pro zadané rozdělení beta.
-BINOMDIST		= BINOMDIST		##	Vrátí hodnotu binomického rozdělení pravděpodobnosti jednotlivých veličin.
-CHIDIST			= CHIDIST		##	Vrátí jednostrannou pravděpodobnost rozdělení chí-kvadrát.
-CHIINV			= CHIINV		##	Vrátí hodnotu funkce inverzní k distribuční funkci jednostranné pravděpodobnosti rozdělení chí-kvadrát.
-CHITEST			= CHITEST		##	Vrátí test nezávislosti.
-CONFIDENCE		= CONFIDENCE		##	Vrátí interval spolehlivosti pro střední hodnotu základního souboru.
-CORREL			= CORREL		##	Vrátí korelační koeficient mezi dvěma množinami dat.
-COUNT			= POČET			##	Vrátí počet čísel v seznamu argumentů.
-COUNTA			= POČET2		##	Vrátí počet hodnot v seznamu argumentů.
-COUNTBLANK		= COUNTBLANK		##	Spočítá počet prázdných buněk v oblasti.
-COUNTIF			= COUNTIF		##	Spočítá buňky v oblasti, které odpovídají zadaným kritériím.
-COUNTIFS		= COUNTIFS		##	Spočítá buňky v oblasti, které odpovídají více kritériím.
-COVAR			= COVAR			##	Vrátí hodnotu kovariance, průměrnou hodnotu součinů párových odchylek
-CRITBINOM		= CRITBINOM		##	Vrátí nejmenší hodnotu, pro kterou má součtové binomické rozdělení hodnotu větší nebo rovnu hodnotě kritéria.
-DEVSQ			= DEVSQ			##	Vrátí součet čtverců odchylek.
-EXPONDIST		= EXPONDIST		##	Vrátí hodnotu exponenciálního rozdělení.
-FDIST			= FDIST			##	Vrátí hodnotu rozdělení pravděpodobnosti F.
-FINV			= FINV			##	Vrátí hodnotu inverzní funkce k distribuční funkci rozdělení F.
-FISHER			= FISHER		##	Vrátí hodnotu Fisherovy transformace.
-FISHERINV		= FISHERINV		##	Vrátí hodnotu inverzní funkce k Fisherově transformaci.
-FORECAST		= FORECAST		##	Vrátí hodnotu lineárního trendu.
-FREQUENCY		= ČETNOSTI		##	Vrátí četnost rozdělení jako svislou matici.
-FTEST			= FTEST			##	Vrátí výsledek F-testu.
-GAMMADIST		= GAMMADIST		##	Vrátí hodnotu rozdělení gama.
-GAMMAINV		= GAMMAINV		##	Vrátí hodnotu inverzní funkce k distribuční funkci součtového rozdělení gama.
-GAMMALN			= GAMMALN		##	Vrátí přirozený logaritmus funkce gama, Γ(x).
-GEOMEAN			= GEOMEAN		##	Vrátí geometrický průměr.
-GROWTH			= LOGLINTREND		##	Vrátí hodnoty exponenciálního trendu.
-HARMEAN			= HARMEAN		##	Vrátí harmonický průměr.
-HYPGEOMDIST		= HYPGEOMDIST		##	Vrátí hodnotu hypergeometrického rozdělení.
-INTERCEPT		= INTERCEPT		##	Vrátí úsek lineární regresní čáry.
-KURT			= KURT			##	Vrátí hodnotu excesu množiny dat.
-LARGE			= LARGE			##	Vrátí k-tou největší hodnotu množiny dat.
-LINEST			= LINREGRESE		##	Vrátí parametry lineárního trendu.
-LOGEST			= LOGLINREGRESE		##	Vrátí parametry exponenciálního trendu.
-LOGINV			= LOGINV		##	Vrátí inverzní funkci k distribuční funkci logaritmicko-normálního rozdělení.
-LOGNORMDIST		= LOGNORMDIST		##	Vrátí hodnotu součtového logaritmicko-normálního rozdělení.
-MAX			= MAX			##	Vrátí maximální hodnotu seznamu argumentů.
-MAXA			= MAXA			##	Vrátí maximální hodnotu seznamu argumentů včetně čísel, textu a logických hodnot.
-MEDIAN			= MEDIAN		##	Vrátí střední hodnotu zadaných čísel.
-MIN			= MIN			##	Vrátí minimální hodnotu seznamu argumentů.
-MINA			= MINA			##	Vrátí nejmenší hodnotu v seznamu argumentů včetně čísel, textu a logických hodnot.
-MODE			= MODE			##	Vrátí hodnotu, která se v množině dat vyskytuje nejčastěji.
-NEGBINOMDIST		= NEGBINOMDIST		##	Vrátí hodnotu negativního binomického rozdělení.
-NORMDIST		= NORMDIST		##	Vrátí hodnotu normálního součtového rozdělení.
-NORMINV			= NORMINV		##	Vrátí inverzní funkci k funkci normálního součtového rozdělení.
-NORMSDIST		= NORMSDIST		##	Vrátí hodnotu standardního normálního součtového rozdělení.
-NORMSINV		= NORMSINV		##	Vrátí inverzní funkci k funkci standardního normálního součtového rozdělení.
-PEARSON			= PEARSON		##	Vrátí Pearsonův výsledný momentový korelační koeficient.
-PERCENTILE		= PERCENTIL		##	Vrátí hodnotu k-tého percentilu hodnot v oblasti.
-PERCENTRANK		= PERCENTRANK		##	Vrátí pořadí hodnoty v množině dat vyjádřené procentuální částí množiny dat.
-PERMUT			= PERMUTACE		##	Vrátí počet permutací pro zadaný počet objektů.
-POISSON			= POISSON		##	Vrátí hodnotu distribuční funkce Poissonova rozdělení.
-PROB			= PROB			##	Vrátí pravděpodobnost výskytu hodnot v oblasti mezi dvěma mezními hodnotami.
-QUARTILE		= QUARTIL		##	Vrátí hodnotu kvartilu množiny dat.
-RANK			= RANK			##	Vrátí pořadí čísla v seznamu čísel.
-RSQ			= RKQ			##	Vrátí druhou mocninu Pearsonova výsledného momentového korelačního koeficientu.
-SKEW			= SKEW			##	Vrátí zešikmení rozdělení.
-SLOPE			= SLOPE			##	Vrátí směrnici lineární regresní čáry.
-SMALL			= SMALL			##	Vrátí k-tou nejmenší hodnotu množiny dat.
-STANDARDIZE		= STANDARDIZE		##	Vrátí normalizovanou hodnotu.
-STDEV			= SMODCH.VÝBĚR		##	Vypočte směrodatnou odchylku výběru.
-STDEVA			= STDEVA		##	Vypočte směrodatnou odchylku výběru včetně čísel, textu a logických hodnot.
-STDEVP			= SMODCH		##	Vypočte směrodatnou odchylku základního souboru.
-STDEVPA			= STDEVPA		##	Vypočte směrodatnou odchylku základního souboru včetně čísel, textu a logických hodnot.
-STEYX			= STEYX			##	Vrátí standardní chybu předpovězené hodnoty y pro každou hodnotu x v regresi.
-TDIST			= TDIST			##	Vrátí hodnotu Studentova t-rozdělení.
-TINV			= TINV			##	Vrátí inverzní funkci k distribuční funkci Studentova t-rozdělení.
-TREND			= LINTREND		##	Vrátí hodnoty lineárního trendu.
-TRIMMEAN		= TRIMMEAN		##	Vrátí střední hodnotu vnitřní části množiny dat.
-TTEST			= TTEST			##	Vrátí pravděpodobnost spojenou se Studentovým t-testem.
-VAR			= VAR.VÝBĚR		##	Vypočte rozptyl výběru.
-VARA			= VARA			##	Vypočte rozptyl výběru včetně čísel, textu a logických hodnot.
-VARP			= VAR			##	Vypočte rozptyl základního souboru.
-VARPA			= VARPA			##	Vypočte rozptyl základního souboru včetně čísel, textu a logických hodnot.
-WEIBULL			= WEIBULL		##	Vrátí hodnotu Weibullova rozdělení.
-ZTEST			= ZTEST			##	Vrátí jednostrannou P-hodnotu z-testu.
-
-
-##
-##	Text functions				Textové funkce
-##
-ASC			= ASC			##	Změní znaky s plnou šířkou (dvoubajtové)v řetězci znaků na znaky s poloviční šířkou (jednobajtové).
-BAHTTEXT		= BAHTTEXT		##	Převede číslo na text ve formátu, měny ß (baht).
-CHAR			= ZNAK			##	Vrátí znak určený číslem kódu.
-CLEAN			= VYČISTIT		##	Odebere z textu všechny netisknutelné znaky.
-CODE			= KÓD			##	Vrátí číselný kód prvního znaku zadaného textového řetězce.
-CONCATENATE		= CONCATENATE		##	Spojí několik textových položek do jedné.
-DOLLAR			= KČ			##	Převede číslo na text ve formátu měny Kč (česká koruna).
-EXACT			= STEJNÉ		##	Zkontroluje, zda jsou dvě textové hodnoty shodné.
-FIND			= NAJÍT			##	Nalezne textovou hodnotu uvnitř jiné (rozlišuje malá a velká písmena).
-FINDB			= FINDB			##	Nalezne textovou hodnotu uvnitř jiné (rozlišuje malá a velká písmena).
-FIXED			= ZAOKROUHLIT.NA.TEXT	##	Zformátuje číslo jako text s pevným počtem desetinných míst.
-JIS			= JIS			##	Změní znaky s poloviční šířkou (jednobajtové) v řetězci znaků na znaky s plnou šířkou (dvoubajtové).
-LEFT			= ZLEVA			##	Vrátí první znaky textové hodnoty umístěné nejvíce vlevo.
-LEFTB			= LEFTB			##	Vrátí první znaky textové hodnoty umístěné nejvíce vlevo.
-LEN			= DÉLKA			##	Vrátí počet znaků textového řetězce.
-LENB			= LENB			##	Vrátí počet znaků textového řetězce.
-LOWER			= MALÁ			##	Převede text na malá písmena.
-MID			= ČÁST			##	Vrátí určitý počet znaků textového řetězce počínaje zadaným místem.
-MIDB			= MIDB			##	Vrátí určitý počet znaků textového řetězce počínaje zadaným místem.
-PHONETIC		= ZVUKOVÉ		##	Extrahuje fonetické znaky (furigana) z textového řetězce.
-PROPER			= VELKÁ2		##	Převede první písmeno každého slova textové hodnoty na velké.
-REPLACE			= NAHRADIT		##	Nahradí znaky uvnitř textu.
-REPLACEB		= NAHRADITB		##	Nahradí znaky uvnitř textu.
-REPT			= OPAKOVAT		##	Zopakuje text podle zadaného počtu opakování.
-RIGHT			= ZPRAVA		##	Vrátí první znaky textové hodnoty umístěné nejvíce vpravo.
-RIGHTB			= RIGHTB		##	Vrátí první znaky textové hodnoty umístěné nejvíce vpravo.
-SEARCH			= HLEDAT		##	Nalezne textovou hodnotu uvnitř jiné (malá a velká písmena nejsou rozlišována).
-SEARCHB			= SEARCHB		##	Nalezne textovou hodnotu uvnitř jiné (malá a velká písmena nejsou rozlišována).
-SUBSTITUTE		= DOSADIT		##	V textovém řetězci nahradí starý text novým.
-T			= T			##	Převede argumenty na text.
-TEXT			= HODNOTA.NA.TEXT	##	Zformátuje číslo a převede ho na text.
-TRIM			= PROČISTIT		##	Odstraní z textu mezery.
-UPPER			= VELKÁ			##	Převede text na velká písmena.
-VALUE			= HODNOTA		##	Převede textový argument na číslo.
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/config
deleted file mode 100644
index cef47e9502d..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/config
+++ /dev/null
@@ -1,48 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= kr
-
-
-
-##
-##	Excel Error Codes	(For future use)
-##
-NULL	= #NUL!
-DIV0	= #DIVISION/0!
-VALUE	= #VÆRDI!
-REF	= #REFERENCE!
-NAME	= #NAVN?
-NUM	= #NUM!
-NA	= #I/T
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
deleted file mode 100644
index 1db4d30bb1c..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
+++ /dev/null
@@ -1,438 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Calculation
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
-##
-##
-
-
-##
-##	Add-in and Automation functions			Tilføjelsesprogram- og automatiseringsfunktioner
-##
-GETPIVOTDATA		= HENTPIVOTDATA			##	Returnerer data, der er lagret i en pivottabelrapport
-
-
-##
-##	Cube functions					Kubefunktioner
-##
-CUBEKPIMEMBER		= KUBE.KPI.MEDLEM		##	Returnerer navn, egenskab og mål for en KPI-indikator og viser navnet og egenskaben i cellen. En KPI-indikator er en målbar størrelse, f.eks. bruttooverskud pr. måned eller personaleudskiftning pr. kvartal, der bruges til at overvåge en organisations præstationer.
-CUBEMEMBER		= KUBE.MEDLEM			##	Returnerer et medlem eller en tupel fra kubehierarkiet. Bruges til at validere, om et medlem eller en tupel findes i kuben.
-CUBEMEMBERPROPERTY	= KUBEMEDLEM.EGENSKAB		##	Returnerer værdien af en egenskab for et medlem i kuben. Bruges til at validere, om et medlemsnavn findes i kuben, og returnere den angivne egenskab for medlemmet.
-CUBERANKEDMEMBER	= KUBEMEDLEM.RANG		##	Returnerer det n'te eller rangordnede medlem i et sæt. Bruges til at returnere et eller flere elementer i et sæt, f.eks. topsælgere eller de 10 bedste elever.
-CUBESET			= KUBESÆT			##	Definerer et beregnet sæt medlemmer eller tupler ved at sende et sætudtryk til kuben på serveren, som opretter sættet og returnerer det til Microsoft Office Excel.
-CUBESETCOUNT		= KUBESÆT.TÆL			##	Returnerer antallet af elementer i et sæt.
-CUBEVALUE		= KUBEVÆRDI			##	Returnerer en sammenlagt (aggregeret) værdi fra en kube.
-
-
-##
-##	Database functions				Databasefunktioner
-##
-DAVERAGE		= DMIDDEL			##	Returnerer gennemsnittet af markerede databaseposter
-DCOUNT			= DTÆL				##	Tæller de celler, der indeholder tal, i en database
-DCOUNTA			= DTÆLV				##	Tæller udfyldte celler i en database
-DGET			= DHENT				##	Uddrager en enkelt post, der opfylder de angivne kriterier, fra en database
-DMAX			= DMAKS				##	Returnerer den største værdi blandt markerede databaseposter
-DMIN			= DMIN				##	Returnerer den mindste værdi blandt markerede databaseposter
-DPRODUCT		= DPRODUKT			##	Ganger værdierne i et bestemt felt med poster, der opfylder kriterierne i en database
-DSTDEV			= DSTDAFV			##	Beregner et skøn over standardafvigelsen baseret på en stikprøve af markerede databaseposter
-DSTDEVP			= DSTDAFVP			##	Beregner standardafvigelsen baseret på hele populationen af markerede databaseposter
-DSUM			= DSUM				##	Sammenlægger de tal i feltkolonnen i databasen, der opfylder kriterierne
-DVAR			= DVARIANS			##	Beregner varians baseret på en stikprøve af markerede databaseposter
-DVARP			= DVARIANSP			##	Beregner varians baseret på hele populationen af markerede databaseposter
-
-
-##
-##	Date and time functions				Dato- og klokkeslætsfunktioner
-##
-DATE			= DATO				##	Returnerer serienummeret for en bestemt dato
-DATEVALUE		= DATOVÆRDI			##	Konverterer en dato i form af tekst til et serienummer
-DAY			= DAG				##	Konverterer et serienummer til en dag i måneden
-DAYS360			= DAGE360			##	Beregner antallet af dage mellem to datoer på grundlag af et år med 360 dage
-EDATE			= EDATO				##	Returnerer serienummeret for den dato, der ligger det angivne antal måneder før eller efter startdatoen
-EOMONTH			= SLUT.PÅ.MÅNED			##	Returnerer serienummeret på den sidste dag i måneden før eller efter et angivet antal måneder
-HOUR			= TIME				##	Konverterer et serienummer til en time
-MINUTE			= MINUT				##	Konverterer et serienummer til et minut
-MONTH			= MÅNED				##	Konverterer et serienummer til en måned
-NETWORKDAYS		= ANTAL.ARBEJDSDAGE		##	Returnerer antallet af hele arbejdsdage mellem to datoer
-NOW			= NU				##	Returnerer serienummeret for den aktuelle dato eller det aktuelle klokkeslæt
-SECOND			= SEKUND			##	Konverterer et serienummer til et sekund
-TIME			= KLOKKESLÆT			##	Returnerer serienummeret for et bestemt klokkeslæt
-TIMEVALUE		= TIDSVÆRDI			##	Konverterer et klokkeslæt i form af tekst til et serienummer
-TODAY			= IDAG				##	Returnerer serienummeret for dags dato
-WEEKDAY			= UGEDAG			##	Konverterer et serienummer til en ugedag
-WEEKNUM			= UGE.NR			##	Konverterer et serienummer til et tal, der angiver ugenummeret i året
-WORKDAY			= ARBEJDSDAG			##	Returnerer serienummeret for dagen før eller efter det angivne antal arbejdsdage
-YEAR			= ÅR				##	Konverterer et serienummer til et år
-YEARFRAC		= ÅR.BRØK			##	Returnerer årsbrøken, der repræsenterer antallet af hele dage mellem startdato og slutdato
-
-
-##
-##	Engineering functions				Tekniske funktioner
-##
-BESSELI			= BESSELI			##	Returnerer den modificerede Bessel-funktion In(x)
-BESSELJ			= BESSELJ			##	Returnerer Bessel-funktionen Jn(x)
-BESSELK			= BESSELK			##	Returnerer den modificerede Bessel-funktion Kn(x)
-BESSELY			= BESSELY			##	Returnerer Bessel-funktionen Yn(x)
-BIN2DEC			= BIN.TIL.DEC			##	Konverterer et binært tal til et decimaltal
-BIN2HEX			= BIN.TIL.HEX			##	Konverterer et binært tal til et heksadecimalt tal
-BIN2OCT			= BIN.TIL.OKT			##	Konverterer et binært tal til et oktaltal.
-COMPLEX			= KOMPLEKS			##	Konverterer reelle og imaginære koefficienter til et komplekst tal
-CONVERT			= KONVERTER			##	Konverterer et tal fra én måleenhed til en anden
-DEC2BIN			= DEC.TIL.BIN			##	Konverterer et decimaltal til et binært tal
-DEC2HEX			= DEC.TIL.HEX			##	Konverterer et decimaltal til et heksadecimalt tal
-DEC2OCT			= DEC.TIL.OKT			##	Konverterer et decimaltal til et oktaltal
-DELTA			= DELTA				##	Tester, om to værdier er ens
-ERF			= FEJLFUNK			##	Returner fejlfunktionen
-ERFC			= FEJLFUNK.KOMP			##	Returnerer den komplementære fejlfunktion
-GESTEP			= GETRIN			##	Tester, om et tal er større end en grænseværdi
-HEX2BIN			= HEX.TIL.BIN			##	Konverterer et heksadecimalt tal til et binært tal
-HEX2DEC			= HEX.TIL.DEC			##	Konverterer et decimaltal til et heksadecimalt tal
-HEX2OCT			= HEX.TIL.OKT			##	Konverterer et heksadecimalt tal til et oktaltal
-IMABS			= IMAGABS			##	Returnerer den absolutte værdi (modulus) for et komplekst tal
-IMAGINARY		= IMAGINÆR			##	Returnerer den imaginære koefficient for et komplekst tal
-IMARGUMENT		= IMAGARGUMENT			##	Returnerer argumentet theta, en vinkel udtrykt i radianer
-IMCONJUGATE		= IMAGKONJUGERE			##	Returnerer den komplekse konjugation af et komplekst tal
-IMCOS			= IMAGCOS			##	Returnerer et komplekst tals cosinus
-IMDIV			= IMAGDIV			##	Returnerer kvotienten for to komplekse tal
-IMEXP			= IMAGEKSP			##	Returnerer et komplekst tals eksponentialfunktion
-IMLN			= IMAGLN			##	Returnerer et komplekst tals naturlige logaritme
-IMLOG10			= IMAGLOG10			##	Returnerer et komplekst tals sædvanlige logaritme (titalslogaritme)
-IMLOG2			= IMAGLOG2			##	Returnerer et komplekst tals sædvanlige logaritme (totalslogaritme)
-IMPOWER			= IMAGPOTENS			##	Returnerer et komplekst tal opløftet i en heltalspotens
-IMPRODUCT		= IMAGPRODUKT			##	Returnerer produktet af komplekse tal
-IMREAL			= IMAGREELT			##	Returnerer den reelle koefficient for et komplekst tal
-IMSIN			= IMAGSIN			##	Returnerer et komplekst tals sinus
-IMSQRT			= IMAGKVROD			##	Returnerer et komplekst tals kvadratrod
-IMSUB			= IMAGSUB			##	Returnerer forskellen mellem to komplekse tal
-IMSUM			= IMAGSUM			##	Returnerer summen af komplekse tal
-OCT2BIN			= OKT.TIL.BIN			##	Konverterer et oktaltal til et binært tal
-OCT2DEC			= OKT.TIL.DEC			##	Konverterer et oktaltal til et decimaltal
-OCT2HEX			= OKT.TIL.HEX			##	Konverterer et oktaltal til et heksadecimalt tal
-
-
-##
-##	Financial functions				Finansielle funktioner
-##
-ACCRINT			= PÅLØBRENTE			##	Returnerer den påløbne rente for et værdipapir med periodiske renteudbetalinger
-ACCRINTM		= PÅLØBRENTE.UDLØB		##	Returnerer den påløbne rente for et værdipapir, hvor renteudbetalingen finder sted ved papirets udløb
-AMORDEGRC		= AMORDEGRC			##	Returnerer afskrivningsbeløbet for hver regnskabsperiode ved hjælp af en afskrivningskoefficient
-AMORLINC		= AMORLINC			##	Returnerer afskrivningsbeløbet for hver regnskabsperiode
-COUPDAYBS		= KUPONDAGE.SA			##	Returnerer antallet af dage fra starten af kuponperioden til afregningsdatoen
-COUPDAYS		= KUPONDAGE.A			##	Returnerer antallet af dage fra begyndelsen af kuponperioden til afregningsdatoen
-COUPDAYSNC		= KUPONDAGE.ANK			##	Returnerer antallet af dage i den kuponperiode, der indeholder afregningsdatoen
-COUPNCD			= KUPONDAG.NÆSTE		##	Returnerer den næste kupondato efter afregningsdatoen
-COUPNUM			= KUPONBETALINGER		##	Returnerer antallet af kuponudbetalinger mellem afregnings- og udløbsdatoen
-COUPPCD			= KUPONDAG.FORRIGE		##	Returnerer den forrige kupondato før afregningsdatoen
-CUMIPMT			= AKKUM.RENTE			##	Returnerer den akkumulerede rente, der betales på et lån mellem to perioder
-CUMPRINC		= AKKUM.HOVEDSTOL		##	Returnerer den akkumulerede nedbringelse af hovedstol mellem to perioder
-DB			= DB				##	Returnerer afskrivningen på et aktiv i en angivet periode ved anvendelse af saldometoden
-DDB			= DSA				##	Returnerer afskrivningsbeløbet for et aktiv over en bestemt periode ved anvendelse af dobbeltsaldometoden eller en anden afskrivningsmetode, som du angiver
-DISC			= DISKONTO			##	Returnerer et værdipapirs diskonto
-DOLLARDE		= KR.DECIMAL			##	Konverterer en kronepris udtrykt som brøk til en kronepris udtrykt som decimaltal
-DOLLARFR		= KR.BRØK			##	Konverterer en kronepris udtrykt som decimaltal til en kronepris udtrykt som brøk
-DURATION		= VARIGHED			##	Returnerer den årlige løbetid for et værdipapir med periodiske renteudbetalinger
-EFFECT			= EFFEKTIV.RENTE		##	Returnerer den årlige effektive rente
-FV			= FV				##	Returnerer fremtidsværdien af en investering
-FVSCHEDULE		= FVTABEL			##	Returnerer den fremtidige værdi af en hovedstol, når der er tilskrevet rente og rentes rente efter forskellige rentesatser
-INTRATE			= RENTEFOD			##	Returnerer renten på et fuldt ud investeret værdipapir
-IPMT			= R.YDELSE			##	Returnerer renten fra en investering for en given periode
-IRR			= IA				##	Returnerer den interne rente for en række pengestrømme
-ISPMT			= ISPMT				##	Beregner den betalte rente i løbet af en bestemt investeringsperiode
-MDURATION		= MVARIGHED			##	Returnerer Macauleys modificerede løbetid for et værdipapir med en formodet pari på kr. 100
-MIRR			= MIA				##	Returnerer den interne forrentning, hvor positive og negative pengestrømme finansieres til forskellig rente
-NOMINAL			= NOMINEL			##	Returnerer den årlige nominelle rente
-NPER			= NPER				##	Returnerer antallet af perioder for en investering
-NPV			= NUTIDSVÆRDI			##	Returnerer nettonutidsværdien for en investering baseret på en række periodiske pengestrømme og en diskonteringssats
-ODDFPRICE		= ULIGE.KURS.PÅLYDENDE		##	Returnerer kursen pr. kr. 100 nominel værdi for et værdipapir med en ulige (kort eller lang) første periode
-ODDFYIELD		= ULIGE.FØRSTE.AFKAST		##	Returnerer afkastet for et værdipapir med ulige første periode
-ODDLPRICE		= ULIGE.SIDSTE.KURS		##	Returnerer kursen pr. kr. 100 nominel værdi for et værdipapir med ulige sidste periode
-ODDLYIELD		= ULIGE.SIDSTE.AFKAST		##	Returnerer afkastet for et værdipapir med ulige sidste periode
-PMT			= YDELSE			##	Returnerer renten fra en investering for en given periode
-PPMT			= H.YDELSE			##	Returnerer ydelsen på hovedstolen for en investering i en given periode
-PRICE			= KURS				##	Returnerer kursen pr. kr 100 nominel værdi for et værdipapir med periodiske renteudbetalinger
-PRICEDISC		= KURS.DISKONTO			##	Returnerer kursen pr. kr 100 nominel værdi for et diskonteret værdipapir
-PRICEMAT		= KURS.UDLØB			##	Returnerer kursen pr. kr 100 nominel værdi for et værdipapir, hvor renten udbetales ved papirets udløb
-PV			= NV				##	Returnerer den nuværende værdi af en investering
-RATE			= RENTE				##	Returnerer renten i hver periode for en annuitet
-RECEIVED		= MODTAGET.VED.UDLØB		##	Returnerer det beløb, der modtages ved udløbet af et fuldt ud investeret værdipapir
-SLN			= LA				##	Returnerer den lineære afskrivning for et aktiv i en enkelt periode
-SYD			= ÅRSAFSKRIVNING		##	Returnerer den årlige afskrivning på et aktiv i en bestemt periode
-TBILLEQ			= STATSOBLIGATION		##	Returnerer det obligationsækvivalente afkast for en statsobligation
-TBILLPRICE		= STATSOBLIGATION.KURS		##	Returnerer kursen pr. kr 100 nominel værdi for en statsobligation
-TBILLYIELD		= STATSOBLIGATION.AFKAST	##	Returnerer en afkastet på en statsobligation
-VDB			= VSA				##	Returnerer afskrivningen på et aktiv i en angivet periode, herunder delperioder, ved brug af dobbeltsaldometoden
-XIRR			= INTERN.RENTE			##	Returnerer den interne rente for en plan over pengestrømme, der ikke behøver at være periodiske
-XNPV			= NETTO.NUTIDSVÆRDI		##	Returnerer nutidsværdien for en plan over pengestrømme, der ikke behøver at være periodiske
-YIELD			= AFKAST			##	Returnerer afkastet for et værdipapir med periodiske renteudbetalinger
-YIELDDISC		= AFKAST.DISKONTO		##	Returnerer det årlige afkast for et diskonteret værdipapir, f.eks. en statsobligation
-YIELDMAT		= AFKAST.UDLØBSDATO		##	Returnerer det årlige afkast for et værdipapir, hvor renten udbetales ved papirets udløb
-
-
-##
-##	Information functions				Informationsfunktioner
-##
-CELL			= CELLE				##	Returnerer oplysninger om formatering, placering eller indhold af en celle
-ERROR.TYPE		= FEJLTYPE			##	Returnerer et tal, der svarer til en fejltype
-INFO			= INFO				##	Returnerer oplysninger om det aktuelle operativmiljø
-ISBLANK			= ER.TOM			##	Returnerer SAND, hvis værdien er tom
-ISERR			= ER.FJL			##	Returnerer SAND, hvis værdien er en fejlværdi undtagen #I/T
-ISERROR			= ER.FEJL			##	Returnerer SAND, hvis værdien er en fejlværdi
-ISEVEN			= ER.LIGE			##	Returnerer SAND, hvis tallet er lige
-ISLOGICAL		= ER.LOGISK			##	Returnerer SAND, hvis værdien er en logisk værdi
-ISNA			= ER.IKKE.TILGÆNGELIG		##	Returnerer SAND, hvis værdien er fejlværdien #I/T
-ISNONTEXT		= ER.IKKE.TEKST			##	Returnerer SAND, hvis værdien ikke er tekst
-ISNUMBER		= ER.TAL			##	Returnerer SAND, hvis værdien er et tal
-ISODD			= ER.ULIGE			##	Returnerer SAND, hvis tallet er ulige
-ISREF			= ER.REFERENCE			##	Returnerer SAND, hvis værdien er en reference
-ISTEXT			= ER.TEKST			##	Returnerer SAND, hvis værdien er tekst
-N			= TAL				##	Returnerer en værdi konverteret til et tal
-NA			= IKKE.TILGÆNGELIG		##	Returnerer fejlværdien #I/T
-TYPE			= VÆRDITYPE			##	Returnerer et tal, der angiver datatypen for en værdi
-
-
-##
-##	Logical functions				Logiske funktioner
-##
-AND			= OG				##	Returnerer SAND, hvis alle argumenterne er sande
-FALSE			= FALSK				##	Returnerer den logiske værdi FALSK
-IF			= HVIS				##	Angiver en logisk test, der skal udføres
-IFERROR			= HVIS.FEJL			##	Returnerer en værdi, du angiver, hvis en formel evauleres som en fejl. Returnerer i modsat fald resultatet af formlen
-NOT			= IKKE				##	Vender argumentets logik om
-OR			= ELLER				##	Returneret værdien SAND, hvis mindst ét argument er sandt
-TRUE			= SAND				##	Returnerer den logiske værdi SAND
-
-
-##
-##	Lookup and reference functions			Opslags- og referencefunktioner
-##
-ADDRESS			= ADRESSE			##	Returnerer en reference som tekst til en enkelt celle i et regneark
-AREAS			= OMRÅDER			##	Returnerer antallet af områder i en reference
-CHOOSE			= VÆLG				##	Vælger en værdi på en liste med værdier
-COLUMN			= KOLONNE			##	Returnerer kolonnenummeret i en reference
-COLUMNS			= KOLONNER			##	Returnerer antallet af kolonner i en reference
-HLOOKUP			= VOPSLAG			##	Søger i den øverste række af en matrix og returnerer værdien af den angivne celle
-HYPERLINK		= HYPERLINK			##	Opretter en genvej kaldet et hyperlink, der åbner et dokument, som er lagret på en netværksserver, på et intranet eller på internettet
-INDEX			= INDEKS			##	Anvender et indeks til at vælge en værdi fra en reference eller en matrix
-INDIRECT		= INDIREKTE			##	Returnerer en reference, der er angivet af en tekstværdi
-LOOKUP			= SLÅ.OP			##	Søger værdier i en vektor eller en matrix
-MATCH			= SAMMENLIGN			##	Søger værdier i en reference eller en matrix
-OFFSET			= FORSKYDNING			##	Returnerer en reference forskudt i forhold til en given reference
-ROW			= RÆKKE				##	Returnerer rækkenummeret for en reference
-ROWS			= RÆKKER			##	Returnerer antallet af rækker i en reference
-RTD			= RTD				##	Henter realtidsdata fra et program, der understøtter COM-automatisering (Automation: En metode til at arbejde med objekter fra et andet program eller udviklingsværktøj. Automation, som tidligere blev kaldt OLE Automation, er en industristandard og en funktion i COM (Component Object Model).)
-TRANSPOSE		= TRANSPONER			##	Returnerer en transponeret matrix
-VLOOKUP			= LOPSLAG			##	Søger i øverste række af en matrix og flytter på tværs af rækken for at returnere en celleværdi
-
-
-##
-##	Math and trigonometry functions			Matematiske og trigonometriske funktioner
-##
-ABS			= ABS				##	Returnerer den absolutte værdi af et tal
-ACOS			= ARCCOS			##	Returnerer et tals arcus cosinus
-ACOSH			= ARCCOSH			##	Returnerer den inverse hyperbolske cosinus af tal
-ASIN			= ARCSIN			##	Returnerer et tals arcus sinus
-ASINH			= ARCSINH			##	Returnerer den inverse hyperbolske sinus for tal
-ATAN			= ARCTAN			##	Returnerer et tals arcus tangens
-ATAN2			= ARCTAN2			##	Returnerer de angivne x- og y-koordinaters arcus tangens
-ATANH			= ARCTANH			##	Returnerer et tals inverse hyperbolske tangens
-CEILING			= AFRUND.LOFT			##	Afrunder et tal til nærmeste heltal eller til nærmeste multiplum af betydning
-COMBIN			= KOMBIN			##	Returnerer antallet af kombinationer for et givet antal objekter
-COS			= COS				##	Returnerer et tals cosinus
-COSH			= COSH				##	Returnerer den inverse hyperbolske cosinus af et tal
-DEGREES			= GRADER			##	Konverterer radianer til grader
-EVEN			= LIGE				##	Runder et tal op til nærmeste lige heltal
-EXP			= EKSP				##	Returnerer e opløftet til en potens af et angivet tal
-FACT			= FAKULTET			##	Returnerer et tals fakultet
-FACTDOUBLE		= DOBBELT.FAKULTET		##	Returnerer et tals dobbelte fakultet
-FLOOR			= AFRUND.GULV			##	Runder et tal ned mod nul
-GCD			= STØRSTE.FÆLLES.DIVISOR	##	Returnerer den største fælles divisor
-INT			= HELTAL			##	Nedrunder et tal til det nærmeste heltal
-LCM			= MINDSTE.FÆLLES.MULTIPLUM	##	Returnerer det mindste fælles multiplum
-LN			= LN				##	Returnerer et tals naturlige logaritme
-LOG			= LOG				##	Returnerer logaritmen for et tal på grundlag af et angivet grundtal
-LOG10			= LOG10				##	Returnerer titalslogaritmen af et tal
-MDETERM			= MDETERM			##	Returnerer determinanten for en matrix
-MINVERSE		= MINVERT			##	Returnerer den inverse matrix for en matrix
-MMULT			= MPRODUKT			##	Returnerer matrixproduktet af to matrixer
-MOD			= REST				##	Returnerer restværdien fra division
-MROUND			= MAFRUND			##	Returnerer et tal afrundet til det ønskede multiplum
-MULTINOMIAL		= MULTINOMIAL			##	Returnerer et multinomialt talsæt
-ODD			= ULIGE				##	Runder et tal op til nærmeste ulige heltal
-PI			= PI				##	Returnerer værdien af pi
-POWER			= POTENS			##	Returnerer resultatet af et tal opløftet til en potens
-PRODUCT			= PRODUKT			##	Multiplicerer argumenterne
-QUOTIENT		= KVOTIENT			##	Returnerer heltalsdelen ved division
-RADIANS			= RADIANER			##	Konverterer grader til radianer
-RAND			= SLUMP				##	Returnerer et tilfældigt tal mellem 0 og 1
-RANDBETWEEN		= SLUMP.MELLEM			##	Returnerer et tilfældigt tal mellem de tal, der angives
-ROMAN			= ROMERTAL			##	Konverterer et arabertal til romertal som tekst
-ROUND			= AFRUND			##	Afrunder et tal til et angivet antal decimaler
-ROUNDDOWN		= RUND.NED			##	Runder et tal ned mod nul
-ROUNDUP			= RUND.OP			##	Runder et tal op, væk fra 0 (nul)
-SERIESSUM		= SERIESUM			##	Returnerer summen af en potensserie baseret på en formel
-SIGN			= FORTEGN			##	Returnerer et tals fortegn
-SIN			= SIN				##	Returnerer en given vinkels sinusværdi
-SINH			= SINH				##	Returnerer den hyperbolske sinus af et tal
-SQRT			= KVROD				##	Returnerer en positiv kvadratrod
-SQRTPI			= KVRODPI			##	Returnerer kvadratroden af (tal * pi;)
-SUBTOTAL		= SUBTOTAL			##	Returnerer en subtotal på en liste eller i en database
-SUM			= SUM				##	Lægger argumenterne sammen
-SUMIF			= SUM.HVIS			##	Lægger de celler sammen, der er specificeret af et givet kriterium.
-SUMIFS			= SUM.HVISER			##	Lægger de celler i et område sammen, der opfylder flere kriterier.
-SUMPRODUCT		= SUMPRODUKT			##	Returnerer summen af produkter af ens matrixkomponenter
-SUMSQ			= SUMKV				##	Returnerer summen af argumenternes kvadrater
-SUMX2MY2		= SUMX2MY2			##	Returnerer summen af differensen mellem kvadrater af ens værdier i to matrixer
-SUMX2PY2		= SUMX2PY2			##	Returnerer summen af summen af kvadrater af tilsvarende værdier i to matrixer
-SUMXMY2			= SUMXMY2			##	Returnerer summen af kvadrater af differenser mellem ens værdier i to matrixer
-TAN			= TAN				##	Returnerer et tals tangens
-TANH			= TANH				##	Returnerer et tals hyperbolske tangens
-TRUNC			= AFKORT			##	Afkorter et tal til et heltal
-
-
-##
-##	Statistical functions				Statistiske funktioner
-##
-AVEDEV			= MAD				##	Returnerer den gennemsnitlige numeriske afvigelse fra stikprøvens middelværdi
-AVERAGE			= MIDDEL			##	Returnerer middelværdien af argumenterne
-AVERAGEA		= MIDDELV			##	Returnerer middelværdien af argumenterne og medtager tal, tekst og logiske værdier
-AVERAGEIF		= MIDDEL.HVIS			##	Returnerer gennemsnittet (den aritmetiske middelværdi) af alle de celler, der opfylder et givet kriterium, i et område
-AVERAGEIFS		= MIDDEL.HVISER			##	Returnerer gennemsnittet (den aritmetiske middelværdi) af alle de celler, der opfylder flere kriterier.
-BETADIST		= BETAFORDELING			##	Returnerer den kumulative betafordelingsfunktion
-BETAINV			= BETAINV			##	Returnerer den inverse kumulative fordelingsfunktion for en angivet betafordeling
-BINOMDIST		= BINOMIALFORDELING		##	Returnerer punktsandsynligheden for binomialfordelingen
-CHIDIST			= CHIFORDELING			##	Returnerer fraktilsandsynligheden for en chi2-fordeling
-CHIINV			= CHIINV			##	Returnerer den inverse fraktilsandsynlighed for en chi2-fordeling
-CHITEST			= CHITEST			##	Foretager en test for uafhængighed
-CONFIDENCE		= KONFIDENSINTERVAL		##	Returnerer et konfidensinterval for en population
-CORREL			= KORRELATION			##	Returnerer korrelationskoefficienten mellem to datasæt
-COUNT			= TÆL				##	Tæller antallet af tal på en liste med argumenter
-COUNTA			= TÆLV				##	Tæller antallet af værdier på en liste med argumenter
-COUNTBLANK		= ANTAL.BLANKE			##	Tæller antallet af tomme celler i et område
-COUNTIF			= TÆLHVIS			##	Tæller antallet af celler, som opfylder de givne kriterier, i et område
-COUNTIFS		= TÆL.HVISER			##	Tæller antallet af de celler, som opfylder flere kriterier, i et område
-COVAR			= KOVARIANS			##	Beregner kovariansen mellem to stokastiske variabler
-CRITBINOM		= KRITBINOM			##	Returnerer den mindste værdi for x, for hvilken det gælder, at fordelingsfunktionen er mindre end eller lig med kriterieværdien.
-DEVSQ			= SAK				##	Returnerer summen af de kvadrerede afvigelser fra middelværdien
-EXPONDIST		= EKSPFORDELING			##	Returnerer eksponentialfordelingen
-FDIST			= FFORDELING			##	Returnerer fraktilsandsynligheden for F-fordelingen
-FINV			= FINV				##	Returnerer den inverse fraktilsandsynlighed for F-fordelingen
-FISHER			= FISHER			##	Returnerer Fisher-transformationen
-FISHERINV		= FISHERINV			##	Returnerer den inverse Fisher-transformation
-FORECAST		= PROGNOSE			##	Returnerer en prognoseværdi baseret på lineær tendens
-FREQUENCY		= FREKVENS			##	Returnerer en frekvensfordeling i en søjlevektor
-FTEST			= FTEST				##	Returnerer resultatet af en F-test til sammenligning af varians
-GAMMADIST		= GAMMAFORDELING		##	Returnerer fordelingsfunktionen for gammafordelingen
-GAMMAINV		= GAMMAINV			##	Returnerer den inverse fordelingsfunktion for gammafordelingen
-GAMMALN			= GAMMALN			##	Returnerer den naturlige logaritme til gammafordelingen, G(x)
-GEOMEAN			= GEOMIDDELVÆRDI		##	Returnerer det geometriske gennemsnit
-GROWTH			= FORØGELSE			##	Returnerer værdier langs en eksponentiel tendens
-HARMEAN			= HARMIDDELVÆRDI		##	Returnerer det harmoniske gennemsnit
-HYPGEOMDIST		= HYPGEOFORDELING		##	Returnerer punktsandsynligheden i en hypergeometrisk fordeling
-INTERCEPT		= SKÆRING			##	Returnerer afskæringsværdien på y-aksen i en lineær regression
-KURT			= TOPSTEJL			##	Returnerer kurtosisværdien for en stokastisk variabel
-LARGE			= STOR				##	Returnerer den k'te største værdi i et datasæt
-LINEST			= LINREGR			##	Returnerer parameterestimaterne for en lineær tendens
-LOGEST			= LOGREGR			##	Returnerer parameterestimaterne for en eksponentiel tendens
-LOGINV			= LOGINV			##	Returnerer den inverse fordelingsfunktion for lognormalfordelingen
-LOGNORMDIST		= LOGNORMFORDELING		##	Returnerer fordelingsfunktionen for lognormalfordelingen
-MAX			= MAKS				##	Returnerer den maksimale værdi på en liste med argumenter.
-MAXA			= MAKSV				##	Returnerer den maksimale værdi på en liste med argumenter og medtager tal, tekst og logiske værdier
-MEDIAN			= MEDIAN			##	Returnerer medianen for de angivne tal
-MIN			= MIN				##	Returnerer den mindste værdi på en liste med argumenter.
-MINA			= MINV				##	Returnerer den mindste værdi på en liste med argumenter og medtager tal, tekst og logiske værdier
-MODE			= HYPPIGST			##	Returnerer den hyppigste værdi i et datasæt
-NEGBINOMDIST		= NEGBINOMFORDELING		##	Returnerer den negative binomialfordeling
-NORMDIST		= NORMFORDELING			##	Returnerer fordelingsfunktionen for normalfordelingen
-NORMINV			= NORMINV			##	Returnerer den inverse fordelingsfunktion for normalfordelingen
-NORMSDIST		= STANDARDNORMFORDELING		##	Returnerer fordelingsfunktionen for standardnormalfordelingen
-NORMSINV		= STANDARDNORMINV		##	Returnerer den inverse fordelingsfunktion for standardnormalfordelingen
-PEARSON			= PEARSON			##	Returnerer Pearsons korrelationskoefficient
-PERCENTILE		= FRAKTIL			##	Returnerer den k'te fraktil for datasættet
-PERCENTRANK		= PROCENTPLADS			##	Returnerer den procentuelle rang for en given værdi i et datasæt
-PERMUT			= PERMUT			##	Returnerer antallet af permutationer for et givet sæt objekter
-POISSON			= POISSON			##	Returnerer fordelingsfunktionen for en Poisson-fordeling
-PROB			= SANDSYNLIGHED			##	Returnerer intervalsandsynligheden
-QUARTILE		= KVARTIL			##	Returnerer kvartilen i et givet datasæt
-RANK			= PLADS				##	Returnerer rangen for et tal på en liste med tal
-RSQ			= FORKLARINGSGRAD		##	Returnerer R2-værdien fra en simpel lineær regression
-SKEW			= SKÆVHED			##	Returnerer skævheden for en stokastisk variabel
-SLOPE			= HÆLDNING			##	Returnerer estimatet på hældningen fra en simpel lineær regression
-SMALL			= MINDSTE			##	Returnerer den k'te mindste værdi i datasættet
-STANDARDIZE		= STANDARDISER			##	Returnerer en standardiseret værdi
-STDEV			= STDAFV			##	Estimerer standardafvigelsen på basis af en stikprøve
-STDEVA			= STDAFVV			##	Beregner standardafvigelsen på basis af en prøve og medtager tal, tekst og logiske værdier
-STDEVP			= STDAFVP			##	Beregner standardafvigelsen på basis af en hel population
-STDEVPA			= STDAFVPV			##	Beregner standardafvigelsen på basis af en hel population og medtager tal, tekst og logiske værdier
-STEYX			= STFYX				##	Returnerer standardafvigelsen for de estimerede y-værdier i den simple lineære regression
-TDIST			= TFORDELING			##	Returnerer fordelingsfunktionen for Student's t-fordeling
-TINV			= TINV				##	Returnerer den inverse fordelingsfunktion for Student's t-fordeling
-TREND			= TENDENS			##	Returnerer værdi under antagelse af en lineær tendens
-TRIMMEAN		= TRIMMIDDELVÆRDI		##	Returnerer den trimmede middelværdi for datasættet
-TTEST			= TTEST				##	Returnerer den sandsynlighed, der er forbundet med Student's t-test
-VAR			= VARIANS			##	Beregner variansen på basis af en prøve
-VARA			= VARIANSV			##	Beregner variansen på basis af en prøve og medtager tal, tekst og logiske værdier
-VARP			= VARIANSP			##	Beregner variansen på basis af hele populationen
-VARPA			= VARIANSPV			##	Beregner variansen på basis af hele populationen og medtager tal, tekst og logiske værdier
-WEIBULL			= WEIBULL			##	Returnerer fordelingsfunktionen for Weibull-fordelingen
-ZTEST			= ZTEST				##	Returnerer sandsynlighedsværdien ved en en-sidet z-test
-
-
-##
-##	Text functions					Tekstfunktioner
-##
-ASC			= ASC				##	Ændrer engelske tegn i fuld bredde (dobbelt-byte) eller katakana i en tegnstreng til tegn i halv bredde (enkelt-byte)
-BAHTTEXT		= BAHTTEKST			##	Konverterer et tal til tekst ved hjælp af valutaformatet ß (baht)
-CHAR			= TEGN				##	Returnerer det tegn, der svarer til kodenummeret
-CLEAN			= RENS				##	Fjerner alle tegn, der ikke kan udskrives, fra tekst
-CODE			= KODE				##	Returnerer en numerisk kode for det første tegn i en tekststreng
-CONCATENATE		= SAMMENKÆDNING			##	Sammenkæder adskillige tekstelementer til ét tekstelement
-DOLLAR			= KR				##	Konverterer et tal til tekst ved hjælp af valutaformatet kr. (kroner)
-EXACT			= EKSAKT			##	Kontrollerer, om to tekstværdier er identiske
-FIND			= FIND				##	Søger efter en tekstværdi i en anden tekstværdi (der skelnes mellem store og små bogstaver)
-FINDB			= FINDB				##	Søger efter en tekstværdi i en anden tekstværdi (der skelnes mellem store og små bogstaver)
-FIXED			= FAST				##	Formaterer et tal som tekst med et fast antal decimaler
-JIS			= JIS				##	Ændrer engelske tegn i halv bredde (enkelt-byte) eller katakana i en tegnstreng til tegn i fuld bredde (dobbelt-byte)
-LEFT			= VENSTRE			##	Returnerer tegnet længst til venstre i en tekstværdi
-LEFTB			= VENSTREB			##	Returnerer tegnet længst til venstre i en tekstværdi
-LEN			= LÆNGDE			##	Returnerer antallet af tegn i en tekststreng
-LENB			= LÆNGDEB			##	Returnerer antallet af tegn i en tekststreng
-LOWER			= SMÅ.BOGSTAVER			##	Konverterer tekst til små bogstaver
-MID			= MIDT				##	Returnerer et bestemt antal tegn fra en tekststreng fra og med den angivne startposition
-MIDB			= MIDTB				##	Returnerer et bestemt antal tegn fra en tekststreng fra og med den angivne startposition
-PHONETIC		= FONETISK			##	Uddrager de fonetiske (furigana) tegn fra en tekststreng
-PROPER			= STORT.FORBOGSTAV		##	Konverterer første bogstav i hvert ord i teksten til stort bogstav
-REPLACE			= ERSTAT			##	Erstatter tegn i tekst
-REPLACEB		= ERSTATB			##	Erstatter tegn i tekst
-REPT			= GENTAG			##	Gentager tekst et givet antal gange
-RIGHT			= HØJRE				##	Returnerer tegnet længste til højre i en tekstværdi
-RIGHTB			= HØJREB			##	Returnerer tegnet længste til højre i en tekstværdi
-SEARCH			= SØG				##	Søger efter en tekstværdi i en anden tekstværdi (der skelnes ikke mellem store og små bogstaver)
-SEARCHB			= SØGB				##	Søger efter en tekstværdi i en anden tekstværdi (der skelnes ikke mellem store og små bogstaver)
-SUBSTITUTE		= UDSKIFT			##	Udskifter gammel tekst med ny tekst i en tekststreng
-T			= T				##	Konverterer argumenterne til tekst
-TEXT			= TEKST				##	Formaterer et tal og konverterer det til tekst
-TRIM			= FJERN.OVERFLØDIGE.BLANKE	##	Fjerner mellemrum fra tekst
-UPPER			= STORE.BOGSTAVER		##	Konverterer tekst til store bogstaver
-VALUE			= VÆRDI				##	Konverterer et tekstargument til et tal
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/config
deleted file mode 100644
index ff7e29899cc..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= €
-
-
-##
-##	Excel Error Codes	(For future use)
-##
-NULL	= #NULL!
-DIV0	= #DIV/0!
-VALUE	= #WERT!
-REF	= #BEZUG!
-NAME	= #NAME?
-NUM	= #ZAHL!
-NA	= #NV
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
deleted file mode 100644
index ce85641a3c9..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
+++ /dev/null
@@ -1,438 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Calculation
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
-##
-##
-
-
-##
-##	Add-in and Automation functions			Add-In- und Automatisierungsfunktionen
-##
-GETPIVOTDATA	= PIVOTDATENZUORDNEN			##	In einem PivotTable-Bericht gespeicherte Daten werden zurückgegeben.
-
-
-##
-##	Cube functions					Cubefunktionen
-##
-CUBEKPIMEMBER		= CUBEKPIELEMENT		##	Gibt Name, Eigenschaft und Measure eines Key Performance Indicators (KPI) zurück und zeigt den Namen und die Eigenschaft in der Zelle an. Ein KPI ist ein quantifizierbares Maß, wie z. B. der monatliche Bruttogewinn oder die vierteljährliche Mitarbeiterfluktuation, mit dessen Hilfe das Leistungsverhalten eines Unternehmens überwacht werden kann.
-CUBEMEMBER		= CUBEELEMENT			##	Gibt ein Element oder ein Tuple in einer Cubehierarchie zurück. Wird verwendet, um zu überprüfen, ob das Element oder Tuple im Cube vorhanden ist.
-CUBEMEMBERPROPERTY	= CUBEELEMENTEIGENSCHAFT	##	Gibt den Wert einer Elementeigenschaft im Cube zurück. Wird verwendet, um zu überprüfen, ob ein Elementname im Cube vorhanden ist, und um die für dieses Element angegebene Eigenschaft zurückzugeben.
-CUBERANKEDMEMBER	= CUBERANGELEMENT		##	Gibt das n-te oder n-rangige Element in einer Menge zurück. Wird verwendet, um mindestens ein Element in einer Menge zurückzugeben, wie z. B. bester Vertriebsmitarbeiter oder 10 beste Kursteilnehmer.
-CUBESET			= CUBEMENGE			##	Definiert eine berechnete Menge Elemente oder Tuples durch Senden eines Mengenausdrucks an den Cube auf dem Server, der die Menge erstellt und an Microsoft Office Excel zurückgibt.
-CUBESETCOUNT		= CUBEMENGENANZAHL		##	Gibt die Anzahl der Elemente in einer Menge zurück.
-CUBEVALUE		= CUBEWERT			##	Gibt einen Aggregatwert aus einem Cube zurück.
-
-
-##
-##	Database functions				Datenbankfunktionen
-##
-DAVERAGE		= DBMITTELWERT			##	Gibt den Mittelwert der ausgewählten Datenbankeinträge zurück
-DCOUNT			= DBANZAHL			##	Zählt die Zellen mit Zahlen in einer Datenbank
-DCOUNTA			= DBANZAHL2			##	Zählt nicht leere Zellen in einer Datenbank
-DGET			= DBAUSZUG			##	Extrahiert aus einer Datenbank einen einzelnen Datensatz, der den angegebenen Kriterien entspricht
-DMAX			= DBMAX				##	Gibt den größten Wert aus ausgewählten Datenbankeinträgen zurück
-DMIN			= DBMIN				##	Gibt den kleinsten Wert aus ausgewählten Datenbankeinträgen zurück
-DPRODUCT		= DBPRODUKT			##	Multipliziert die Werte in einem bestimmten Feld mit Datensätzen, die den Kriterien in einer Datenbank entsprechen
-DSTDEV			= DBSTDABW			##	Schätzt die Standardabweichung auf der Grundlage einer Stichprobe aus ausgewählten Datenbankeinträgen
-DSTDEVP			= DBSTDABWN			##	Berechnet die Standardabweichung auf der Grundlage der Grundgesamtheit ausgewählter Datenbankeinträge
-DSUM			= DBSUMME			##	Addiert die Zahlen in der Feldspalte mit Datensätzen in der Datenbank, die den Kriterien entsprechen
-DVAR			= DBVARIANZ			##	Schätzt die Varianz auf der Grundlage ausgewählter Datenbankeinträge
-DVARP			= DBVARIANZEN			##	Berechnet die Varianz auf der Grundlage der Grundgesamtheit ausgewählter Datenbankeinträge
-
-
-##
-##	Date and time functions				Datums- und Zeitfunktionen
-##
-DATE			= DATUM				##	Gibt die fortlaufende Zahl eines bestimmten Datums zurück
-DATEVALUE		= DATWERT			##	Wandelt ein Datum in Form von Text in eine fortlaufende Zahl um
-DAY			= TAG				##	Wandelt eine fortlaufende Zahl in den Tag des Monats um
-DAYS360			= TAGE360			##	Berechnet die Anzahl der Tage zwischen zwei Datumsangaben ausgehend von einem Jahr, das 360 Tage hat
-EDATE			= EDATUM			##	Gibt die fortlaufende Zahl des Datums zurück, bei dem es sich um die angegebene Anzahl von Monaten vor oder nach dem Anfangstermin handelt
-EOMONTH			= MONATSENDE			##	Gibt die fortlaufende Zahl des letzten Tags des Monats vor oder nach einer festgelegten Anzahl von Monaten zurück
-HOUR			= STUNDE			##	Wandelt eine fortlaufende Zahl in eine Stunde um
-MINUTE			= MINUTE			##	Wandelt eine fortlaufende Zahl in eine Minute um
-MONTH			= MONAT				##	Wandelt eine fortlaufende Zahl in einen Monat um
-NETWORKDAYS		= NETTOARBEITSTAGE		##	Gibt die Anzahl von ganzen Arbeitstagen zwischen zwei Datumswerten zurück
-NOW			= JETZT				##	Gibt die fortlaufende Zahl des aktuellen Datums und der aktuellen Uhrzeit zurück
-SECOND			= SEKUNDE			##	Wandelt eine fortlaufende Zahl in eine Sekunde um
-TIME			= ZEIT				##	Gibt die fortlaufende Zahl einer bestimmten Uhrzeit zurück
-TIMEVALUE		= ZEITWERT			##	Wandelt eine Uhrzeit in Form von Text in eine fortlaufende Zahl um
-TODAY			= HEUTE				##	Gibt die fortlaufende Zahl des heutigen Datums zurück
-WEEKDAY			= WOCHENTAG			##	Wandelt eine fortlaufende Zahl in den Wochentag um
-WEEKNUM			= KALENDERWOCHE			##	Wandelt eine fortlaufende Zahl in eine Zahl um, die angibt, in welche Woche eines Jahres das angegebene Datum fällt
-WORKDAY			= ARBEITSTAG			##	Gibt die fortlaufende Zahl des Datums vor oder nach einer bestimmten Anzahl von Arbeitstagen zurück
-YEAR			= JAHR				##	Wandelt eine fortlaufende Zahl in ein Jahr um
-YEARFRAC		= BRTEILJAHRE			##	Gibt die Anzahl der ganzen Tage zwischen Ausgangsdatum und Enddatum in Bruchteilen von Jahren zurück
-
-
-##
-##	Engineering functions				Konstruktionsfunktionen
-##
-BESSELI			= BESSELI			##	Gibt die geänderte Besselfunktion In(x) zurück
-BESSELJ			= BESSELJ			##	Gibt die Besselfunktion Jn(x) zurück
-BESSELK			= BESSELK			##	Gibt die geänderte Besselfunktion Kn(x) zurück
-BESSELY			= BESSELY			##	Gibt die Besselfunktion Yn(x) zurück
-BIN2DEC			= BININDEZ			##	Wandelt eine binäre Zahl (Dualzahl) in eine dezimale Zahl um
-BIN2HEX			= BININHEX			##	Wandelt eine binäre Zahl (Dualzahl) in eine hexadezimale Zahl um
-BIN2OCT			= BININOKT			##	Wandelt eine binäre Zahl (Dualzahl) in eine oktale Zahl um
-COMPLEX			= KOMPLEXE			##	Wandelt den Real- und Imaginärteil in eine komplexe Zahl um
-CONVERT			= UMWANDELN			##	Wandelt eine Zahl von einem Maßsystem in ein anderes um
-DEC2BIN			= DEZINBIN			##	Wandelt eine dezimale Zahl in eine binäre Zahl (Dualzahl) um
-DEC2HEX			= DEZINHEX			##	Wandelt eine dezimale Zahl in eine hexadezimale Zahl um
-DEC2OCT			= DEZINOKT			##	Wandelt eine dezimale Zahl in eine oktale Zahl um
-DELTA			= DELTA				##	Überprüft, ob zwei Werte gleich sind
-ERF			= GAUSSFEHLER			##	Gibt die Gauss'sche Fehlerfunktion zurück
-ERFC			= GAUSSFKOMPL			##	Gibt das Komplement zur Gauss'schen Fehlerfunktion zurück
-GESTEP			= GGANZZAHL			##	Überprüft, ob eine Zahl größer als ein gegebener Schwellenwert ist
-HEX2BIN			= HEXINBIN			##	Wandelt eine hexadezimale Zahl in eine Binärzahl um
-HEX2DEC			= HEXINDEZ			##	Wandelt eine hexadezimale Zahl in eine dezimale Zahl um
-HEX2OCT			= HEXINOKT			##	Wandelt eine hexadezimale Zahl in eine Oktalzahl um
-IMABS			= IMABS				##	Gibt den Absolutbetrag (Modulo) einer komplexen Zahl zurück
-IMAGINARY		= IMAGINÄRTEIL			##	Gibt den Imaginärteil einer komplexen Zahl zurück
-IMARGUMENT		= IMARGUMENT			##	Gibt das Argument Theta zurück, einen Winkel, der als Bogenmaß ausgedrückt wird
-IMCONJUGATE		= IMKONJUGIERTE			##	Gibt die konjugierte komplexe Zahl zu einer komplexen Zahl zurück
-IMCOS			= IMCOS				##	Gibt den Kosinus einer komplexen Zahl zurück
-IMDIV			= IMDIV				##	Gibt den Quotienten zweier komplexer Zahlen zurück
-IMEXP			= IMEXP				##	Gibt die algebraische Form einer in exponentieller Schreibweise vorliegenden komplexen Zahl zurück
-IMLN			= IMLN				##	Gibt den natürlichen Logarithmus einer komplexen Zahl zurück
-IMLOG10			= IMLOG10			##	Gibt den Logarithmus einer komplexen Zahl zur Basis 10 zurück
-IMLOG2			= IMLOG2			##	Gibt den Logarithmus einer komplexen Zahl zur Basis 2 zurück
-IMPOWER			= IMAPOTENZ			##	Potenziert eine komplexe Zahl mit einer ganzen Zahl
-IMPRODUCT		= IMPRODUKT			##	Gibt das Produkt von komplexen Zahlen zurück
-IMREAL			= IMREALTEIL			##	Gibt den Realteil einer komplexen Zahl zurück
-IMSIN			= IMSIN				##	Gibt den Sinus einer komplexen Zahl zurück
-IMSQRT			= IMWURZEL			##	Gibt die Quadratwurzel einer komplexen Zahl zurück
-IMSUB			= IMSUB				##	Gibt die Differenz zwischen zwei komplexen Zahlen zurück
-IMSUM			= IMSUMME			##	Gibt die Summe von komplexen Zahlen zurück
-OCT2BIN			= OKTINBIN			##	Wandelt eine oktale Zahl in eine binäre Zahl (Dualzahl) um
-OCT2DEC			= OKTINDEZ			##	Wandelt eine oktale Zahl in eine dezimale Zahl um
-OCT2HEX			= OKTINHEX			##	Wandelt eine oktale Zahl in eine hexadezimale Zahl um
-
-
-##
-##	Financial functions				Finanzmathematische Funktionen
-##
-ACCRINT			= AUFGELZINS			##	Gibt die aufgelaufenen Zinsen (Stückzinsen) eines Wertpapiers mit periodischen Zinszahlungen zurück
-ACCRINTM		= AUFGELZINSF			##	Gibt die aufgelaufenen Zinsen (Stückzinsen) eines Wertpapiers zurück, die bei Fälligkeit ausgezahlt werden
-AMORDEGRC		= AMORDEGRK			##	Gibt die Abschreibung für die einzelnen Abschreibungszeiträume mithilfe eines Abschreibungskoeffizienten zurück
-AMORLINC		= AMORLINEARK			##	Gibt die Abschreibung für die einzelnen Abschreibungszeiträume zurück
-COUPDAYBS		= ZINSTERMTAGVA			##	Gibt die Anzahl der Tage vom Anfang des Zinstermins bis zum Abrechnungstermin zurück
-COUPDAYS		= ZINSTERMTAGE			##	Gibt die Anzahl der Tage der Zinsperiode zurück, die den Abrechnungstermin einschließt
-COUPDAYSNC		= ZINSTERMTAGNZ			##	Gibt die Anzahl der Tage vom Abrechnungstermin bis zum nächsten Zinstermin zurück
-COUPNCD			= ZINSTERMNZ			##	Gibt das Datum des ersten Zinstermins nach dem Abrechnungstermin zurück
-COUPNUM			= ZINSTERMZAHL			##	Gibt die Anzahl der Zinstermine zwischen Abrechnungs- und Fälligkeitsdatum zurück
-COUPPCD			= ZINSTERMVZ			##	Gibt das Datum des letzten Zinstermins vor dem Abrechnungstermin zurück
-CUMIPMT			= KUMZINSZ			##	Berechnet die kumulierten Zinsen, die zwischen zwei Perioden zu zahlen sind
-CUMPRINC		= KUMKAPITAL			##	Berechnet die aufgelaufene Tilgung eines Darlehens, die zwischen zwei Perioden zu zahlen ist
-DB			= GDA2				##	Gibt die geometrisch-degressive Abschreibung eines Wirtschaftsguts für eine bestimmte Periode zurück
-DDB			= GDA				##	Gibt die Abschreibung eines Anlageguts für einen angegebenen Zeitraum unter Verwendung der degressiven Doppelraten-Abschreibung oder eines anderen von Ihnen angegebenen Abschreibungsverfahrens zurück
-DISC			= DISAGIO			##	Gibt den in Prozent ausgedrückten Abzinsungssatz eines Wertpapiers zurück
-DOLLARDE		= NOTIERUNGDEZ			##	Wandelt eine Notierung, die als Dezimalbruch ausgedrückt wurde, in eine Dezimalzahl um
-DOLLARFR		= NOTIERUNGBRU			##	Wandelt eine Notierung, die als Dezimalzahl ausgedrückt wurde, in einen Dezimalbruch um
-DURATION		= DURATION			##	Gibt die jährliche Duration eines Wertpapiers mit periodischen Zinszahlungen zurück
-EFFECT			= EFFEKTIV			##	Gibt die jährliche Effektivverzinsung zurück
-FV			= ZW				##	Gibt den zukünftigen Wert (Endwert) einer Investition zurück
-FVSCHEDULE		= ZW2				##	Gibt den aufgezinsten Wert des Anfangskapitals für eine Reihe periodisch unterschiedlicher Zinssätze zurück
-INTRATE			= ZINSSATZ			##	Gibt den Zinssatz eines voll investierten Wertpapiers zurück
-IPMT			= ZINSZ				##	Gibt die Zinszahlung einer Investition für die angegebene Periode zurück
-IRR			= IKV				##	Gibt den internen Zinsfuß einer Investition ohne Finanzierungskosten oder Reinvestitionsgewinne zurück
-ISPMT			= ISPMT				##	Berechnet die während eines bestimmten Zeitraums für eine Investition gezahlten Zinsen
-MDURATION		= MDURATION			##	Gibt die geänderte Dauer für ein Wertpapier mit einem angenommenen Nennwert von 100 € zurück
-MIRR			= QIKV				##	Gibt den internen Zinsfuß zurück, wobei positive und negative Zahlungen zu unterschiedlichen Sätzen finanziert werden
-NOMINAL			= NOMINAL			##	Gibt die jährliche Nominalverzinsung zurück
-NPER			= ZZR				##	Gibt die Anzahl der Zahlungsperioden einer Investition zurück
-NPV			= NBW				##	Gibt den Nettobarwert einer Investition auf Basis periodisch anfallender Zahlungen und eines Abzinsungsfaktors zurück
-ODDFPRICE		= UNREGER.KURS			##	Gibt den Kurs pro 100 € Nennwert eines Wertpapiers mit einem unregelmäßigen ersten Zinstermin zurück
-ODDFYIELD		= UNREGER.REND			##	Gibt die Rendite eines Wertpapiers mit einem unregelmäßigen ersten Zinstermin zurück
-ODDLPRICE		= UNREGLE.KURS			##	Gibt den Kurs pro 100 € Nennwert eines Wertpapiers mit einem unregelmäßigen letzten Zinstermin zurück
-ODDLYIELD		= UNREGLE.REND			##	Gibt die Rendite eines Wertpapiers mit einem unregelmäßigen letzten Zinstermin zurück
-PMT			= RMZ				##	Gibt die periodische Zahlung für eine Annuität zurück
-PPMT			= KAPZ				##	Gibt die Kapitalrückzahlung einer Investition für eine angegebene Periode zurück
-PRICE			= KURS				##	Gibt den Kurs pro 100 € Nennwert eines Wertpapiers zurück, das periodisch Zinsen auszahlt
-PRICEDISC		= KURSDISAGIO			##	Gibt den Kurs pro 100 € Nennwert eines unverzinslichen Wertpapiers zurück
-PRICEMAT		= KURSFÄLLIG			##	Gibt den Kurs pro 100 € Nennwert eines Wertpapiers zurück, das Zinsen am Fälligkeitsdatum auszahlt
-PV			= BW				##	Gibt den Barwert einer Investition zurück
-RATE			= ZINS				##	Gibt den Zinssatz pro Zeitraum einer Annuität zurück
-RECEIVED		= AUSZAHLUNG			##	Gibt den Auszahlungsbetrag eines voll investierten Wertpapiers am Fälligkeitstermin zurück
-SLN			= LIA				##	Gibt die lineare Abschreibung eines Wirtschaftsguts pro Periode zurück
-SYD			= DIA				##	Gibt die arithmetisch-degressive Abschreibung eines Wirtschaftsguts für eine bestimmte Periode zurück
-TBILLEQ			= TBILLÄQUIV			##	Gibt die Rendite für ein Wertpapier zurück
-TBILLPRICE		= TBILLKURS			##	Gibt den Kurs pro 100 € Nennwert eines Wertpapiers zurück
-TBILLYIELD		= TBILLRENDITE			##	Gibt die Rendite für ein Wertpapier zurück
-VDB			= VDB				##	Gibt die degressive Abschreibung eines Wirtschaftsguts für eine bestimmte Periode oder Teilperiode zurück
-XIRR			= XINTZINSFUSS			##	Gibt den internen Zinsfuß einer Reihe nicht periodisch anfallender Zahlungen zurück
-XNPV			= XKAPITALWERT			##	Gibt den Nettobarwert (Kapitalwert) einer Reihe nicht periodisch anfallender Zahlungen zurück
-YIELD			= RENDITE			##	Gibt die Rendite eines Wertpapiers zurück, das periodisch Zinsen auszahlt
-YIELDDISC		= RENDITEDIS			##	Gibt die jährliche Rendite eines unverzinslichen Wertpapiers zurück
-YIELDMAT		= RENDITEFÄLL			##	Gibt die jährliche Rendite eines Wertpapiers zurück, das Zinsen am Fälligkeitsdatum auszahlt
-
-
-##
-##	Information functions				Informationsfunktionen
-##
-CELL			= ZELLE				##	Gibt Informationen zu Formatierung, Position oder Inhalt einer Zelle zurück
-ERROR.TYPE		= FEHLER.TYP			##	Gibt eine Zahl zurück, die einem Fehlertyp entspricht
-INFO			= INFO				##	Gibt Informationen zur aktuellen Betriebssystemumgebung zurück
-ISBLANK			= ISTLEER			##	Gibt WAHR zurück, wenn der Wert leer ist
-ISERR			= ISTFEHL			##	Gibt WAHR zurück, wenn der Wert ein beliebiger Fehlerwert außer #N/V ist
-ISERROR			= ISTFEHLER			##	Gibt WAHR zurück, wenn der Wert ein beliebiger Fehlerwert ist
-ISEVEN			= ISTGERADE			##	Gibt WAHR zurück, wenn es sich um eine gerade Zahl handelt
-ISLOGICAL		= ISTLOG			##	Gibt WAHR zurück, wenn der Wert ein Wahrheitswert ist
-ISNA			= ISTNV				##	Gibt WAHR zurück, wenn der Wert der Fehlerwert #N/V ist
-ISNONTEXT		= ISTKTEXT			##	Gibt WAHR zurück, wenn der Wert ein Element ist, das keinen Text enthält
-ISNUMBER		= ISTZAHL			##	Gibt WAHR zurück, wenn der Wert eine Zahl ist
-ISODD			= ISTUNGERADE			##	Gibt WAHR zurück, wenn es sich um eine ungerade Zahl handelt
-ISREF			= ISTBEZUG			##	Gibt WAHR zurück, wenn der Wert ein Bezug ist
-ISTEXT			= ISTTEXT			##	Gibt WAHR zurück, wenn der Wert ein Element ist, das Text enthält
-N			= N				##	Gibt den in eine Zahl umgewandelten Wert zurück
-NA			= NV				##	Gibt den Fehlerwert #NV zurück
-TYPE			= TYP				##	Gibt eine Zahl zurück, die den Datentyp des angegebenen Werts anzeigt
-
-
-##
-##	Logical functions				Logische Funktionen
-##
-AND			= UND				##	Gibt WAHR zurück, wenn alle zugehörigen Argumente WAHR sind
-FALSE			= FALSCH			##	Gibt den Wahrheitswert FALSCH zurück
-IF			= WENN				##	Gibt einen logischen Test zum Ausführen an
-IFERROR			= WENNFEHLER			##	Gibt einen von Ihnen festgelegten Wert zurück, wenn die Auswertung der Formel zu einem Fehler führt; andernfalls wird das Ergebnis der Formel zurückgegeben
-NOT			= NICHT				##	Kehrt den Wahrheitswert der zugehörigen Argumente um
-OR			= ODER				##	Gibt WAHR zurück, wenn ein Argument WAHR ist
-TRUE			= WAHR				##	Gibt den Wahrheitswert WAHR zurück
-
-
-##
-##	Lookup and reference functions			Nachschlage- und Verweisfunktionen
-##
-ADDRESS			= ADRESSE			##	Gibt einen Bezug auf eine einzelne Zelle in einem Tabellenblatt als Text zurück
-AREAS			= BEREICHE			##	Gibt die Anzahl der innerhalb eines Bezugs aufgeführten Bereiche zurück
-CHOOSE			= WAHL				##	Wählt einen Wert aus eine Liste mit Werten aus
-COLUMN			= SPALTE			##	Gibt die Spaltennummer eines Bezugs zurück
-COLUMNS			= SPALTEN			##	Gibt die Anzahl der Spalten in einem Bezug zurück
-HLOOKUP			= HVERWEIS			##	Sucht in der obersten Zeile einer Matrix und gibt den Wert der angegebenen Zelle zurück
-HYPERLINK		= HYPERLINK			##	Erstellt eine Verknüpfung, über die ein auf einem Netzwerkserver, in einem Intranet oder im Internet gespeichertes Dokument geöffnet wird
-INDEX			= INDEX				##	Verwendet einen Index, um einen Wert aus einem Bezug oder einer Matrix auszuwählen
-INDIRECT		= INDIREKT			##	Gibt einen Bezug zurück, der von einem Textwert angegeben wird
-LOOKUP			= LOOKUP			##	Sucht Werte in einem Vektor oder einer Matrix
-MATCH			= VERGLEICH			##	Sucht Werte in einem Bezug oder einer Matrix
-OFFSET			= BEREICH.VERSCHIEBEN		##	Gibt einen Bezugoffset aus einem gegebenen Bezug zurück
-ROW			= ZEILE				##	Gibt die Zeilennummer eines Bezugs zurück
-ROWS			= ZEILEN			##	Gibt die Anzahl der Zeilen in einem Bezug zurück
-RTD			= RTD				##	Ruft Echtzeitdaten von einem Programm ab, das die COM-Automatisierung (Automatisierung: Ein Verfahren, bei dem aus einer Anwendung oder einem Entwicklungstool heraus mit den Objekten einer anderen Anwendung gearbeitet wird. Die früher als OLE-Automatisierung bezeichnete Automatisierung ist ein Industriestandard und eine Funktion von COM (Component Object Model).) unterstützt
-TRANSPOSE		= MTRANS			##	Gibt die transponierte Matrix einer Matrix zurück
-VLOOKUP			= SVERWEIS			##	Sucht in der ersten Spalte einer Matrix und arbeitet sich durch die Zeile, um den Wert einer Zelle zurückzugeben
-
-
-##
-##	Math and trigonometry functions			Mathematische und trigonometrische Funktionen
-##
-ABS			= ABS				##	Gibt den Absolutwert einer Zahl zurück
-ACOS			= ARCCOS			##	Gibt den Arkuskosinus einer Zahl zurück
-ACOSH			= ARCCOSHYP			##	Gibt den umgekehrten hyperbolischen Kosinus einer Zahl zurück
-ASIN			= ARCSIN			##	Gibt den Arkussinus einer Zahl zurück
-ASINH			= ARCSINHYP			##	Gibt den umgekehrten hyperbolischen Sinus einer Zahl zurück
-ATAN			= ARCTAN			##	Gibt den Arkustangens einer Zahl zurück
-ATAN2			= ARCTAN2			##	Gibt den Arkustangens einer x- und einer y-Koordinate zurück
-ATANH			= ARCTANHYP			##	Gibt den umgekehrten hyperbolischen Tangens einer Zahl zurück
-CEILING			= OBERGRENZE			##	Rundet eine Zahl auf die nächste ganze Zahl oder das nächste Vielfache von Schritt
-COMBIN			= KOMBINATIONEN			##	Gibt die Anzahl der Kombinationen für eine bestimmte Anzahl von Objekten zurück
-COS			= COS				##	Gibt den Kosinus einer Zahl zurück
-COSH			= COSHYP			##	Gibt den hyperbolischen Kosinus einer Zahl zurück
-DEGREES			= GRAD				##	Wandelt Bogenmaß (Radiant) in Grad um
-EVEN			= GERADE			##	Rundet eine Zahl auf die nächste gerade ganze Zahl auf
-EXP			= EXP				##	Potenziert die Basis e mit der als Argument angegebenen Zahl
-FACT			= FAKULTÄT			##	Gibt die Fakultät einer Zahl zurück
-FACTDOUBLE		= ZWEIFAKULTÄT			##	Gibt die Fakultät zu Zahl mit Schrittlänge 2 zurück
-FLOOR			= UNTERGRENZE			##	Rundet die Zahl auf Anzahl_Stellen ab
-GCD			= GGT				##	Gibt den größten gemeinsamen Teiler zurück
-INT			= GANZZAHL			##	Rundet eine Zahl auf die nächstkleinere ganze Zahl ab
-LCM			= KGV				##	Gibt das kleinste gemeinsame Vielfache zurück
-LN			= LN				##	Gibt den natürlichen Logarithmus einer Zahl zurück
-LOG			= LOG				##	Gibt den Logarithmus einer Zahl zu der angegebenen Basis zurück
-LOG10			= LOG10				##	Gibt den Logarithmus einer Zahl zur Basis 10 zurück
-MDETERM			= MDET				##	Gibt die Determinante einer Matrix zurück
-MINVERSE		= MINV				##	Gibt die inverse Matrix einer Matrix zurück
-MMULT			= MMULT				##	Gibt das Produkt zweier Matrizen zurück
-MOD			= REST				##	Gibt den Rest einer Division zurück
-MROUND			= VRUNDEN			##	Gibt eine auf das gewünschte Vielfache gerundete Zahl zurück
-MULTINOMIAL		= POLYNOMIAL			##	Gibt den Polynomialkoeffizienten einer Gruppe von Zahlen zurück
-ODD			= UNGERADE			##	Rundet eine Zahl auf die nächste ungerade ganze Zahl auf
-PI			= PI				##	Gibt den Wert Pi zurück
-POWER			= POTENZ			##	Gibt als Ergebnis eine potenzierte Zahl zurück
-PRODUCT			= PRODUKT			##	Multipliziert die zugehörigen Argumente
-QUOTIENT		= QUOTIENT			##	Gibt den ganzzahligen Anteil einer Division zurück
-RADIANS			= BOGENMASS			##	Wandelt Grad in Bogenmaß (Radiant) um
-RAND			= ZUFALLSZAHL			##	Gibt eine Zufallszahl zwischen 0 und 1 zurück
-RANDBETWEEN		= ZUFALLSBEREICH		##	Gibt eine Zufallszahl aus dem festgelegten Bereich zurück
-ROMAN			= RÖMISCH			##	Wandelt eine arabische Zahl in eine römische Zahl als Text um
-ROUND			= RUNDEN			##	Rundet eine Zahl auf eine bestimmte Anzahl von Dezimalstellen
-ROUNDDOWN		= ABRUNDEN			##	Rundet die Zahl auf Anzahl_Stellen ab
-ROUNDUP			= AUFRUNDEN			##	Rundet die Zahl auf Anzahl_Stellen auf
-SERIESSUM		= POTENZREIHE			##	Gibt die Summe von Potenzen (zur Berechnung von Potenzreihen und dichotomen Wahrscheinlichkeiten) zurück
-SIGN			= VORZEICHEN			##	Gibt das Vorzeichen einer Zahl zurück
-SIN			= SIN				##	Gibt den Sinus einer Zahl zurück
-SINH			= SINHYP			##	Gibt den hyperbolischen Sinus einer Zahl zurück
-SQRT			= WURZEL			##	Gibt die Quadratwurzel einer Zahl zurück
-SQRTPI			= WURZELPI			##	Gibt die Wurzel aus der mit Pi (pi) multiplizierten Zahl zurück
-SUBTOTAL		= TEILERGEBNIS			##	Gibt ein Teilergebnis in einer Liste oder Datenbank zurück
-SUM			= SUMME				##	Addiert die zugehörigen Argumente
-SUMIF			= SUMMEWENN			##	Addiert Zahlen, die mit den Suchkriterien übereinstimmen
-SUMIFS			= SUMMEWENNS			##	Die Zellen, die mehrere Kriterien erfüllen, werden in einem Bereich hinzugefügt
-SUMPRODUCT		= SUMMENPRODUKT			##	Gibt die Summe der Produkte zusammengehöriger Matrixkomponenten zurück
-SUMSQ			= QUADRATESUMME			##	Gibt die Summe der quadrierten Argumente zurück
-SUMX2MY2		= SUMMEX2MY2			##	Gibt die Summe der Differenzen der Quadrate für zusammengehörige Komponenten zweier Matrizen zurück
-SUMX2PY2		= SUMMEX2PY2			##	Gibt die Summe der Quadrate für zusammengehörige Komponenten zweier Matrizen zurück
-SUMXMY2			= SUMMEXMY2			##	Gibt die Summe der quadrierten Differenzen für zusammengehörige Komponenten zweier Matrizen zurück
-TAN			= TAN				##	Gibt den Tangens einer Zahl zurück
-TANH			= TANHYP			##	Gibt den hyperbolischen Tangens einer Zahl zurück
-TRUNC			= KÜRZEN			##	Schneidet die Kommastellen einer Zahl ab und gibt als Ergebnis eine ganze Zahl zurück
-
-
-##
-##	Statistical functions				Statistische Funktionen
-##
-AVEDEV			= MITTELABW			##	Gibt die durchschnittliche absolute Abweichung einer Reihe von Merkmalsausprägungen und ihrem Mittelwert zurück
-AVERAGE			= MITTELWERT			##	Gibt den Mittelwert der zugehörigen Argumente zurück
-AVERAGEA		= MITTELWERTA			##	Gibt den Mittelwert der zugehörigen Argumente, die Zahlen, Text und Wahrheitswerte enthalten, zurück
-AVERAGEIF		= MITTELWERTWENN		##	Der Durchschnittswert (arithmetisches Mittel) für alle Zellen in einem Bereich, die einem angegebenen Kriterium entsprechen, wird zurückgegeben
-AVERAGEIFS		= MITTELWERTWENNS		##	Gibt den Durchschnittswert (arithmetisches Mittel) aller Zellen zurück, die mehreren Kriterien entsprechen
-BETADIST		= BETAVERT			##	Gibt die Werte der kumulierten Betaverteilungsfunktion zurück
-BETAINV			= BETAINV			##	Gibt das Quantil der angegebenen Betaverteilung zurück
-BINOMDIST		= BINOMVERT			##	Gibt Wahrscheinlichkeiten einer binomialverteilten Zufallsvariablen zurück
-CHIDIST			= CHIVERT			##	Gibt Werte der Verteilungsfunktion (1-Alpha) einer Chi-Quadrat-verteilten Zufallsgröße zurück
-CHIINV			= CHIINV			##	Gibt Quantile der Verteilungsfunktion (1-Alpha) der Chi-Quadrat-Verteilung zurück
-CHITEST			= CHITEST			##	Gibt die Teststatistik eines Unabhängigkeitstests zurück
-CONFIDENCE		= KONFIDENZ			##	Ermöglicht die Berechnung des 1-Alpha Konfidenzintervalls für den Erwartungswert einer Zufallsvariablen
-CORREL			= KORREL			##	Gibt den Korrelationskoeffizienten zweier Reihen von Merkmalsausprägungen zurück
-COUNT			= ANZAHL			##	Gibt die Anzahl der Zahlen in der Liste mit Argumenten an
-COUNTA			= ANZAHL2			##	Gibt die Anzahl der Werte in der Liste mit Argumenten an
-COUNTBLANK		= ANZAHLLEEREZELLEN		##	Gibt die Anzahl der leeren Zellen in einem Bereich an
-COUNTIF			= ZÄHLENWENN			##	Gibt die Anzahl der Zellen in einem Bereich an, deren Inhalte mit den Suchkriterien übereinstimmen
-COUNTIFS		= ZÄHLENWENNS			##	Gibt die Anzahl der Zellen in einem Bereich an, deren Inhalte mit mehreren Suchkriterien übereinstimmen
-COVAR			= KOVAR				##	Gibt die Kovarianz zurück, den Mittelwert der für alle Datenpunktpaare gebildeten Produkte der Abweichungen
-CRITBINOM		= KRITBINOM			##	Gibt den kleinsten Wert zurück, für den die kumulierten Wahrscheinlichkeiten der Binomialverteilung kleiner oder gleich einer Grenzwahrscheinlichkeit sind
-DEVSQ			= SUMQUADABW			##	Gibt die Summe der quadrierten Abweichungen der Datenpunkte von ihrem Stichprobenmittelwert zurück
-EXPONDIST		= EXPONVERT			##	Gibt Wahrscheinlichkeiten einer exponential verteilten Zufallsvariablen zurück
-FDIST			= FVERT				##	Gibt Werte der Verteilungsfunktion (1-Alpha) einer F-verteilten Zufallsvariablen zurück
-FINV			= FINV				##	Gibt Quantile der F-Verteilung zurück
-FISHER			= FISHER			##	Gibt die Fisher-Transformation zurück
-FISHERINV		= FISHERINV			##	Gibt die Umkehrung der Fisher-Transformation zurück
-FORECAST		= PROGNOSE			##	Gibt einen Wert zurück, der sich aus einem linearen Trend ergibt
-FREQUENCY		= HÄUFIGKEIT			##	Gibt eine Häufigkeitsverteilung als vertikale Matrix zurück
-FTEST			= FTEST				##	Gibt die Teststatistik eines F-Tests zurück
-GAMMADIST		= GAMMAVERT			##	Gibt Wahrscheinlichkeiten einer gammaverteilten Zufallsvariablen zurück
-GAMMAINV		= GAMMAINV			##	Gibt Quantile der Gammaverteilung zurück
-GAMMALN			= GAMMALN			##	Gibt den natürlichen Logarithmus der Gammafunktion zurück, Γ(x)
-GEOMEAN			= GEOMITTEL			##	Gibt das geometrische Mittel zurück
-GROWTH			= VARIATION			##	Gibt Werte zurück, die sich aus einem exponentiellen Trend ergeben
-HARMEAN			= HARMITTEL			##	Gibt das harmonische Mittel zurück
-HYPGEOMDIST		= HYPGEOMVERT			##	Gibt Wahrscheinlichkeiten einer hypergeometrisch-verteilten Zufallsvariablen zurück
-INTERCEPT		= ACHSENABSCHNITT		##	Gibt den Schnittpunkt der Regressionsgeraden zurück
-KURT			= KURT				##	Gibt die Kurtosis (Exzess) einer Datengruppe zurück
-LARGE			= KGRÖSSTE			##	Gibt den k-größten Wert einer Datengruppe zurück
-LINEST			= RGP				##	Gibt die Parameter eines linearen Trends zurück
-LOGEST			= RKP				##	Gibt die Parameter eines exponentiellen Trends zurück
-LOGINV			= LOGINV			##	Gibt Quantile der Lognormalverteilung zurück
-LOGNORMDIST		= LOGNORMVERT			##	Gibt Werte der Verteilungsfunktion einer lognormalverteilten Zufallsvariablen zurück
-MAX			= MAX				##	Gibt den Maximalwert einer Liste mit Argumenten zurück
-MAXA			= MAXA				##	Gibt den Maximalwert einer Liste mit Argumenten zurück, die Zahlen, Text und Wahrheitswerte enthalten
-MEDIAN			= MEDIAN			##	Gibt den Median der angegebenen Zahlen zurück
-MIN			= MIN				##	Gibt den Minimalwert einer Liste mit Argumenten zurück
-MINA			= MINA				##	Gibt den kleinsten Wert einer Liste mit Argumenten zurück, die Zahlen, Text und Wahrheitswerte enthalten
-MODE			= MODALWERT			##	Gibt den am häufigsten vorkommenden Wert in einer Datengruppe zurück
-NEGBINOMDIST		= NEGBINOMVERT			##	Gibt Wahrscheinlichkeiten einer negativen, binominal verteilten Zufallsvariablen zurück
-NORMDIST		= NORMVERT			##	Gibt Wahrscheinlichkeiten einer normal verteilten Zufallsvariablen zurück
-NORMINV			= NORMINV			##	Gibt Quantile der Normalverteilung zurück
-NORMSDIST		= STANDNORMVERT			##	Gibt Werte der Verteilungsfunktion einer standardnormalverteilten Zufallsvariablen zurück
-NORMSINV		= STANDNORMINV			##	Gibt Quantile der Standardnormalverteilung zurück
-PEARSON			= PEARSON			##	Gibt den Pearsonschen Korrelationskoeffizienten zurück
-PERCENTILE		= QUANTIL			##	Gibt das Alpha-Quantil einer Gruppe von Daten zurück
-PERCENTRANK		= QUANTILSRANG			##	Gibt den prozentualen Rang (Alpha) eines Werts in einer Datengruppe zurück
-PERMUT			= VARIATIONEN			##	Gibt die Anzahl der Möglichkeiten zurück, um k Elemente aus einer Menge von n Elementen ohne Zurücklegen zu ziehen
-POISSON			= POISSON			##	Gibt Wahrscheinlichkeiten einer poissonverteilten Zufallsvariablen zurück
-PROB			= WAHRSCHBEREICH		##	Gibt die Wahrscheinlichkeit für ein von zwei Werten eingeschlossenes Intervall zurück
-QUARTILE		= QUARTILE			##	Gibt die Quartile der Datengruppe zurück
-RANK			= RANG				##	Gibt den Rang zurück, den eine Zahl innerhalb einer Liste von Zahlen einnimmt
-RSQ			= BESTIMMTHEITSMASS		##	Gibt das Quadrat des Pearsonschen Korrelationskoeffizienten zurück
-SKEW			= SCHIEFE			##	Gibt die Schiefe einer Verteilung zurück
-SLOPE			= STEIGUNG			##	Gibt die Steigung der Regressionsgeraden zurück
-SMALL			= KKLEINSTE			##	Gibt den k-kleinsten Wert einer Datengruppe zurück
-STANDARDIZE		= STANDARDISIERUNG		##	Gibt den standardisierten Wert zurück
-STDEV			= STABW				##	Schätzt die Standardabweichung ausgehend von einer Stichprobe
-STDEVA			= STABWA			##	Schätzt die Standardabweichung ausgehend von einer Stichprobe, die Zahlen, Text und Wahrheitswerte enthält
-STDEVP			= STABWN			##	Berechnet die Standardabweichung ausgehend von der Grundgesamtheit
-STDEVPA			= STABWNA			##	Berechnet die Standardabweichung ausgehend von der Grundgesamtheit, die Zahlen, Text und Wahrheitswerte enthält
-STEYX			= STFEHLERYX			##	Gibt den Standardfehler der geschätzten y-Werte für alle x-Werte der Regression zurück
-TDIST			= TVERT				##	Gibt Werte der Verteilungsfunktion (1-Alpha) einer (Student) t-verteilten Zufallsvariablen zurück
-TINV			= TINV				##	Gibt Quantile der t-Verteilung zurück
-TREND			= TREND				##	Gibt Werte zurück, die sich aus einem linearen Trend ergeben
-TRIMMEAN		= GESTUTZTMITTEL		##	Gibt den Mittelwert einer Datengruppe zurück, ohne die Randwerte zu berücksichtigen
-TTEST			= TTEST				##	Gibt die Teststatistik eines Student'schen t-Tests zurück
-VAR			= VARIANZ			##	Schätzt die Varianz ausgehend von einer Stichprobe
-VARA			= VARIANZA			##	Schätzt die Varianz ausgehend von einer Stichprobe, die Zahlen, Text und Wahrheitswerte enthält
-VARP			= VARIANZEN			##	Berechnet die Varianz ausgehend von der Grundgesamtheit
-VARPA			= VARIANZENA			##	Berechnet die Varianz ausgehend von der Grundgesamtheit, die Zahlen, Text und Wahrheitswerte enthält
-WEIBULL			= WEIBULL			##	Gibt Wahrscheinlichkeiten einer weibullverteilten Zufallsvariablen zurück
-ZTEST			= GTEST				##	Gibt den einseitigen Wahrscheinlichkeitswert für einen Gausstest (Normalverteilung) zurück
-
-
-##
-##	Text functions					Textfunktionen
-##
-ASC			= ASC				##	Konvertiert DB-Text in einer Zeichenfolge (lateinische Buchstaben oder Katakana) in SB-Text
-BAHTTEXT		= BAHTTEXT			##	Wandelt eine Zahl in Text im Währungsformat ß (Baht) um
-CHAR			= ZEICHEN			##	Gibt das der Codezahl entsprechende Zeichen zurück
-CLEAN			= SÄUBERN			##	Löscht alle nicht druckbaren Zeichen aus einem Text
-CODE			= CODE				##	Gibt die Codezahl des ersten Zeichens in einem Text zurück
-CONCATENATE		= VERKETTEN			##	Verknüpft mehrere Textelemente zu einem Textelement
-DOLLAR			= DM				##	Wandelt eine Zahl in Text im Währungsformat € (Euro) um
-EXACT			= IDENTISCH			##	Prüft, ob zwei Textwerte identisch sind
-FIND			= FINDEN			##	Sucht nach einem Textwert, der in einem anderen Textwert enthalten ist (Groß-/Kleinschreibung wird unterschieden)
-FINDB			= FINDENB			##	Sucht nach einem Textwert, der in einem anderen Textwert enthalten ist (Groß-/Kleinschreibung wird unterschieden)
-FIXED			= FEST				##	Formatiert eine Zahl als Text mit einer festen Anzahl von Dezimalstellen
-JIS			= JIS				##	Konvertiert SB-Text in einer Zeichenfolge (lateinische Buchstaben oder Katakana) in DB-Text
-LEFT			= LINKS				##	Gibt die Zeichen ganz links in einem Textwert zurück
-LEFTB			= LINKSB			##	Gibt die Zeichen ganz links in einem Textwert zurück
-LEN			= LÄNGE				##	Gibt die Anzahl der Zeichen in einer Zeichenfolge zurück
-LENB			= LÄNGEB			##	Gibt die Anzahl der Zeichen in einer Zeichenfolge zurück
-LOWER			= KLEIN				##	Wandelt Text in Kleinbuchstaben um
-MID			= TEIL				##	Gibt eine bestimmte Anzahl Zeichen aus einer Zeichenfolge ab der von Ihnen angegebenen Stelle zurück
-MIDB			= TEILB				##	Gibt eine bestimmte Anzahl Zeichen aus einer Zeichenfolge ab der von Ihnen angegebenen Stelle zurück
-PHONETIC		= PHONETIC			##	Extrahiert die phonetischen (Furigana-)Zeichen aus einer Textzeichenfolge
-PROPER			= GROSS2			##	Wandelt den ersten Buchstaben aller Wörter eines Textwerts in Großbuchstaben um
-REPLACE			= ERSETZEN			##	Ersetzt Zeichen in Text
-REPLACEB		= ERSETZENB			##	Ersetzt Zeichen in Text
-REPT			= WIEDERHOLEN			##	Wiederholt einen Text so oft wie angegeben
-RIGHT			= RECHTS			##	Gibt die Zeichen ganz rechts in einem Textwert zurück
-RIGHTB			= RECHTSB			##	Gibt die Zeichen ganz rechts in einem Textwert zurück
-SEARCH			= SUCHEN			##	Sucht nach einem Textwert, der in einem anderen Textwert enthalten ist (Groß-/Kleinschreibung wird nicht unterschieden)
-SEARCHB			= SUCHENB			##	Sucht nach einem Textwert, der in einem anderen Textwert enthalten ist (Groß-/Kleinschreibung wird nicht unterschieden)
-SUBSTITUTE		= WECHSELN			##	Ersetzt in einer Zeichenfolge neuen Text gegen alten
-T			= T				##	Wandelt die zugehörigen Argumente in Text um
-TEXT			= TEXT				##	Formatiert eine Zahl und wandelt sie in Text um
-TRIM			= GLÄTTEN			##	Entfernt Leerzeichen aus Text
-UPPER			= GROSS				##	Wandelt Text in Großbuchstaben um
-VALUE			= WERT				##	Wandelt ein Textargument in eine Zahl um
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/en/uk/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/en/uk/config
deleted file mode 100644
index f008e61cc90..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/en/uk/config
+++ /dev/null
@@ -1,32 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-##
-##	(For future use)
-##
-currencySymbol	= £
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/config
deleted file mode 100644
index fa16f5639df..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= $	##	I'm surprised that the Excel Documentation suggests $ rather than €
-
-
-##
-##	Excel Error Codes	(For future use)
-##
-NULL	= #¡NULO!
-DIV0	= #¡DIV/0!
-VALUE	= #¡VALOR!
-REF	= #¡REF!
-NAME	= #¿NOMBRE?
-NUM	= #¡NÚM!
-NA	= #N/A
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
deleted file mode 100644
index 51ce48b3153..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
+++ /dev/null
@@ -1,438 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Calculation
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
-##
-##
-
-
-##
-##	Add-in and Automation functions				Funciones de complementos y automatización
-##
-GETPIVOTDATA		= IMPORTARDATOSDINAMICOS		##	Devuelve los datos almacenados en un informe de tabla dinámica.
-
-
-##
-##	Cube functions						Funciones de cubo
-##
-CUBEKPIMEMBER		= MIEMBROKPICUBO			##	Devuelve un nombre, propiedad y medida de indicador de rendimiento clave (KPI) y muestra el nombre y la propiedad en la celda. Un KPI es una medida cuantificable, como los beneficios brutos mensuales o la facturación trimestral por empleado, que se usa para supervisar el rendimiento de una organización.
-CUBEMEMBER		= MIEMBROCUBO				##	Devuelve un miembro o tupla en una jerarquía de cubo. Se usa para validar la existencia del miembro o la tupla en el cubo.
-CUBEMEMBERPROPERTY	= PROPIEDADMIEMBROCUBO			##	Devuelve el valor de una propiedad de miembro del cubo Se usa para validar la existencia de un nombre de miembro en el cubo y para devolver la propiedad especificada para este miembro.
-CUBERANKEDMEMBER	= MIEMBRORANGOCUBO			##	Devuelve el miembro n, o clasificado, de un conjunto. Se usa para devolver uno o más elementos de un conjunto, por ejemplo, el representante con mejores ventas o los diez mejores alumnos.
-CUBESET			= CONJUNTOCUBO				##	Define un conjunto calculado de miembros o tuplas mediante el envío de una expresión de conjunto al cubo en el servidor, lo que crea el conjunto y, después, devuelve dicho conjunto a Microsoft Office Excel.
-CUBESETCOUNT		= RECUENTOCONJUNTOCUBO			##	Devuelve el número de elementos de un conjunto.
-CUBEVALUE		= VALORCUBO				##	Devuelve un valor agregado de un cubo.
-
-
-##
-##	Database functions					Funciones de base de datos
-##
-DAVERAGE		= BDPROMEDIO				##	Devuelve el promedio de las entradas seleccionadas en la base de datos.
-DCOUNT			= BDCONTAR				##	Cuenta el número de celdas que contienen números en una base de datos.
-DCOUNTA			= BDCONTARA				##	Cuenta el número de celdas no vacías en una base de datos.
-DGET			= BDEXTRAER				##	Extrae de una base de datos un único registro que cumple los criterios especificados.
-DMAX			= BDMAX					##	Devuelve el valor máximo de las entradas seleccionadas de la base de datos.
-DMIN			= BDMIN					##	Devuelve el valor mínimo de las entradas seleccionadas de la base de datos.
-DPRODUCT		= BDPRODUCTO				##	Multiplica los valores de un campo concreto de registros de una base de datos que cumplen los criterios especificados.
-DSTDEV			= BDDESVEST				##	Calcula la desviación estándar a partir de una muestra de entradas seleccionadas en la base de datos.
-DSTDEVP			= BDDESVESTP				##	Calcula la desviación estándar en función de la población total de las entradas seleccionadas de la base de datos.
-DSUM			= BDSUMA				##	Suma los números de la columna de campo de los registros de la base de datos que cumplen los criterios.
-DVAR			= BDVAR					##	Calcula la varianza a partir de una muestra de entradas seleccionadas de la base de datos.
-DVARP			= BDVARP				##	Calcula la varianza a partir de la población total de entradas seleccionadas de la base de datos.
-
-
-##
-##	Date and time functions					Funciones de fecha y hora
-##
-DATE			= FECHA					##	Devuelve el número de serie correspondiente a una fecha determinada.
-DATEVALUE		= FECHANUMERO				##	Convierte una fecha con formato de texto en un valor de número de serie.
-DAY			= DIA					##	Convierte un número de serie en un valor de día del mes.
-DAYS360			= DIAS360				##	Calcula el número de días entre dos fechas a partir de un año de 360 días.
-EDATE			= FECHA.MES				##	Devuelve el número de serie de la fecha equivalente al número indicado de meses anteriores o posteriores a la fecha inicial.
-EOMONTH			= FIN.MES				##	Devuelve el número de serie correspondiente al último día del mes anterior o posterior a un número de meses especificado.
-HOUR			= HORA					##	Convierte un número de serie en un valor de hora.
-MINUTE			= MINUTO				##	Convierte un número de serie en un valor de minuto.
-MONTH			= MES					##	Convierte un número de serie en un valor de mes.
-NETWORKDAYS		= DIAS.LAB				##	Devuelve el número de todos los días laborables existentes entre dos fechas.
-NOW			= AHORA					##	Devuelve el número de serie correspondiente a la fecha y hora actuales.
-SECOND			= SEGUNDO				##	Convierte un número de serie en un valor de segundo.
-TIME			= HORA					##	Devuelve el número de serie correspondiente a una hora determinada.
-TIMEVALUE		= HORANUMERO				##	Convierte una hora con formato de texto en un valor de número de serie.
-TODAY			= HOY					##	Devuelve el número de serie correspondiente al día actual.
-WEEKDAY			= DIASEM				##	Convierte un número de serie en un valor de día de la semana.
-WEEKNUM			= NUM.DE.SEMANA				##	Convierte un número de serie en un número que representa el lugar numérico correspondiente a una semana de un año.
-WORKDAY			= DIA.LAB				##	Devuelve el número de serie de la fecha que tiene lugar antes o después de un número determinado de días laborables.
-YEAR			= AÑO					##	Convierte un número de serie en un valor de año.
-YEARFRAC		= FRAC.AÑO				##	Devuelve la fracción de año que representa el número total de días existentes entre el valor de fecha_inicial y el de fecha_final.
-
-
-##
-##	Engineering functions					Funciones de ingeniería
-##
-BESSELI			= BESSELI				##	Devuelve la función Bessel In(x) modificada.
-BESSELJ			= BESSELJ				##	Devuelve la función Bessel Jn(x).
-BESSELK			= BESSELK				##	Devuelve la función Bessel Kn(x) modificada.
-BESSELY			= BESSELY				##	Devuelve la función Bessel Yn(x).
-BIN2DEC			= BIN.A.DEC				##	Convierte un número binario en decimal.
-BIN2HEX			= BIN.A.HEX				##	Convierte un número binario en hexadecimal.
-BIN2OCT			= BIN.A.OCT				##	Convierte un número binario en octal.
-COMPLEX			= COMPLEJO				##	Convierte coeficientes reales e imaginarios en un número complejo.
-CONVERT			= CONVERTIR				##	Convierte un número de un sistema de medida a otro.
-DEC2BIN			= DEC.A.BIN				##	Convierte un número decimal en binario.
-DEC2HEX			= DEC.A.HEX				##	Convierte un número decimal en hexadecimal.
-DEC2OCT			= DEC.A.OCT				##	Convierte un número decimal en octal.
-DELTA			= DELTA					##	Comprueba si dos valores son iguales.
-ERF			= FUN.ERROR				##	Devuelve la función de error.
-ERFC			= FUN.ERROR.COMPL			##	Devuelve la función de error complementario.
-GESTEP			= MAYOR.O.IGUAL				##	Comprueba si un número es mayor que un valor de umbral.
-HEX2BIN			= HEX.A.BIN				##	Convierte un número hexadecimal en binario.
-HEX2DEC			= HEX.A.DEC				##	Convierte un número hexadecimal en decimal.
-HEX2OCT			= HEX.A.OCT				##	Convierte un número hexadecimal en octal.
-IMABS			= IM.ABS				##	Devuelve el valor absoluto (módulo) de un número complejo.
-IMAGINARY		= IMAGINARIO				##	Devuelve el coeficiente imaginario de un número complejo.
-IMARGUMENT		= IM.ANGULO				##	Devuelve el argumento theta, un ángulo expresado en radianes.
-IMCONJUGATE		= IM.CONJUGADA				##	Devuelve la conjugada compleja de un número complejo.
-IMCOS			= IM.COS				##	Devuelve el coseno de un número complejo.
-IMDIV			= IM.DIV				##	Devuelve el cociente de dos números complejos.
-IMEXP			= IM.EXP				##	Devuelve el valor exponencial de un número complejo.
-IMLN			= IM.LN					##	Devuelve el logaritmo natural (neperiano) de un número complejo.
-IMLOG10			= IM.LOG10				##	Devuelve el logaritmo en base 10 de un número complejo.
-IMLOG2			= IM.LOG2				##	Devuelve el logaritmo en base 2 de un número complejo.
-IMPOWER			= IM.POT				##	Devuelve un número complejo elevado a una potencia entera.
-IMPRODUCT		= IM.PRODUCT				##	Devuelve el producto de números complejos.
-IMREAL			= IM.REAL				##	Devuelve el coeficiente real de un número complejo.
-IMSIN			= IM.SENO				##	Devuelve el seno de un número complejo.
-IMSQRT			= IM.RAIZ2				##	Devuelve la raíz cuadrada de un número complejo.
-IMSUB			= IM.SUSTR				##	Devuelve la diferencia entre dos números complejos.
-IMSUM			= IM.SUM				##	Devuelve la suma de números complejos.
-OCT2BIN			= OCT.A.BIN				##	Convierte un número octal en binario.
-OCT2DEC			= OCT.A.DEC				##	Convierte un número octal en decimal.
-OCT2HEX			= OCT.A.HEX				##	Convierte un número octal en hexadecimal.
-
-
-##
-##	Financial functions					Funciones financieras
-##
-ACCRINT			= INT.ACUM				##	Devuelve el interés acumulado de un valor bursátil con pagos de interés periódicos.
-ACCRINTM		= INT.ACUM.V				##	Devuelve el interés acumulado de un valor bursátil con pagos de interés al vencimiento.
-AMORDEGRC		= AMORTIZ.PROGRE			##	Devuelve la amortización de cada período contable mediante el uso de un coeficiente de amortización.
-AMORLINC		= AMORTIZ.LIN				##	Devuelve la amortización de cada uno de los períodos contables.
-COUPDAYBS		= CUPON.DIAS.L1				##	Devuelve el número de días desde el principio del período de un cupón hasta la fecha de liquidación.
-COUPDAYS		= CUPON.DIAS				##	Devuelve el número de días del período (entre dos cupones) donde se encuentra la fecha de liquidación.
-COUPDAYSNC		= CUPON.DIAS.L2				##	Devuelve el número de días desde la fecha de liquidación hasta la fecha del próximo cupón.
-COUPNCD			= CUPON.FECHA.L2			##	Devuelve la fecha del próximo cupón después de la fecha de liquidación.
-COUPNUM			= CUPON.NUM				##	Devuelve el número de pagos de cupón entre la fecha de liquidación y la fecha de vencimiento.
-COUPPCD			= CUPON.FECHA.L1			##	Devuelve la fecha de cupón anterior a la fecha de liquidación.
-CUMIPMT			= PAGO.INT.ENTRE			##	Devuelve el interés acumulado pagado entre dos períodos.
-CUMPRINC		= PAGO.PRINC.ENTRE			##	Devuelve el capital acumulado pagado de un préstamo entre dos períodos.
-DB			= DB					##	Devuelve la amortización de un bien durante un período específico a través del método de amortización de saldo fijo.
-DDB			= DDB					##	Devuelve la amortización de un bien durante un período específico a través del método de amortización por doble disminución de saldo u otro método que se especifique.
-DISC			= TASA.DESC				##	Devuelve la tasa de descuento de un valor bursátil.
-DOLLARDE		= MONEDA.DEC				##	Convierte una cotización de un valor bursátil expresada en forma fraccionaria en una cotización de un valor bursátil expresada en forma decimal.
-DOLLARFR		= MONEDA.FRAC				##	Convierte una cotización de un valor bursátil expresada en forma decimal en una cotización de un valor bursátil expresada en forma fraccionaria.
-DURATION		= DURACION				##	Devuelve la duración anual de un valor bursátil con pagos de interés periódico.
-EFFECT			= INT.EFECTIVO				##	Devuelve la tasa de interés anual efectiva.
-FV			= VF					##	Devuelve el valor futuro de una inversión.
-FVSCHEDULE		= VF.PLAN				##	Devuelve el valor futuro de un capital inicial después de aplicar una serie de tasas de interés compuesto.
-INTRATE			= TASA.INT				##	Devuelve la tasa de interés para la inversión total de un valor bursátil.
-IPMT			= PAGOINT				##	Devuelve el pago de intereses de una inversión durante un período determinado.
-IRR			= TIR					##	Devuelve la tasa interna de retorno para una serie de flujos de efectivo periódicos.
-ISPMT			= INT.PAGO.DIR				##	Calcula el interés pagado durante un período específico de una inversión.
-MDURATION		= DURACION.MODIF			##	Devuelve la duración de Macauley modificada de un valor bursátil con un valor nominal supuesto de 100 $.
-MIRR			= TIRM					##	Devuelve la tasa interna de retorno donde se financian flujos de efectivo positivos y negativos a tasas diferentes.
-NOMINAL			= TASA.NOMINAL				##	Devuelve la tasa nominal de interés anual.
-NPER			= NPER					##	Devuelve el número de períodos de una inversión.
-NPV			= VNA					##	Devuelve el valor neto actual de una inversión en función de una serie de flujos periódicos de efectivo y una tasa de descuento.
-ODDFPRICE		= PRECIO.PER.IRREGULAR.1		##	Devuelve el precio por un valor nominal de 100 $ de un valor bursátil con un primer período impar.
-ODDFYIELD		= RENDTO.PER.IRREGULAR.1		##	Devuelve el rendimiento de un valor bursátil con un primer período impar.
-ODDLPRICE		= PRECIO.PER.IRREGULAR.2		##	Devuelve el precio por un valor nominal de 100 $ de un valor bursátil con un último período impar.
-ODDLYIELD		= RENDTO.PER.IRREGULAR.2		##	Devuelve el rendimiento de un valor bursátil con un último período impar.
-PMT			= PAGO					##	Devuelve el pago periódico de una anualidad.
-PPMT			= PAGOPRIN				##	Devuelve el pago de capital de una inversión durante un período determinado.
-PRICE			= PRECIO				##	Devuelve el precio por un valor nominal de 100 $ de un valor bursátil que paga una tasa de interés periódico.
-PRICEDISC		= PRECIO.DESCUENTO			##	Devuelve el precio por un valor nominal de 100 $ de un valor bursátil con descuento.
-PRICEMAT		= PRECIO.VENCIMIENTO			##	Devuelve el precio por un valor nominal de 100 $ de un valor bursátil que paga interés a su vencimiento.
-PV			= VALACT				##	Devuelve el valor actual de una inversión.
-RATE			= TASA					##	Devuelve la tasa de interés por período de una anualidad.
-RECEIVED		= CANTIDAD.RECIBIDA			##	Devuelve la cantidad recibida al vencimiento de un valor bursátil completamente invertido.
-SLN			= SLN					##	Devuelve la amortización por método directo de un bien en un período dado.
-SYD			= SYD					##	Devuelve la amortización por suma de dígitos de los años de un bien durante un período especificado.
-TBILLEQ			= LETRA.DE.TES.EQV.A.BONO		##	Devuelve el rendimiento de un bono equivalente a una letra del Tesoro (de EE.UU.)
-TBILLPRICE		= LETRA.DE.TES.PRECIO			##	Devuelve el precio por un valor nominal de 100 $ de una letra del Tesoro (de EE.UU.)
-TBILLYIELD		= LETRA.DE.TES.RENDTO			##	Devuelve el rendimiento de una letra del Tesoro (de EE.UU.)
-VDB			= DVS					##	Devuelve la amortización de un bien durante un período específico o parcial a través del método de cálculo del saldo en disminución.
-XIRR			= TIR.NO.PER				##	Devuelve la tasa interna de retorno para un flujo de efectivo que no es necesariamente periódico.
-XNPV			= VNA.NO.PER				##	Devuelve el valor neto actual para un flujo de efectivo que no es necesariamente periódico.
-YIELD			= RENDTO				##	Devuelve el rendimiento de un valor bursátil que paga intereses periódicos.
-YIELDDISC		= RENDTO.DESC				##	Devuelve el rendimiento anual de un valor bursátil con descuento; por ejemplo, una letra del Tesoro (de EE.UU.)
-YIELDMAT		= RENDTO.VENCTO				##	Devuelve el rendimiento anual de un valor bursátil que paga intereses al vencimiento.
-
-
-##
-##	Information functions					Funciones de información
-##
-CELL			= CELDA					##	Devuelve información acerca del formato, la ubicación o el contenido de una celda.
-ERROR.TYPE		= TIPO.DE.ERROR				##	Devuelve un número que corresponde a un tipo de error.
-INFO			= INFO					##	Devuelve información acerca del entorno operativo en uso.
-ISBLANK			= ESBLANCO				##	Devuelve VERDADERO si el valor está en blanco.
-ISERR			= ESERR					##	Devuelve VERDADERO si el valor es cualquier valor de error excepto #N/A.
-ISERROR			= ESERROR				##	Devuelve VERDADERO si el valor es cualquier valor de error.
-ISEVEN			= ES.PAR				##	Devuelve VERDADERO si el número es par.
-ISLOGICAL		= ESLOGICO				##	Devuelve VERDADERO si el valor es un valor lógico.
-ISNA			= ESNOD					##	Devuelve VERDADERO si el valor es el valor de error #N/A.
-ISNONTEXT		= ESNOTEXTO				##	Devuelve VERDADERO si el valor no es texto.
-ISNUMBER		= ESNUMERO				##	Devuelve VERDADERO si el valor es un número.
-ISODD			= ES.IMPAR				##	Devuelve VERDADERO si el número es impar.
-ISREF			= ESREF					##	Devuelve VERDADERO si el valor es una referencia.
-ISTEXT			= ESTEXTO				##	Devuelve VERDADERO si el valor es texto.
-N			= N					##	Devuelve un valor convertido en un número.
-NA			= ND					##	Devuelve el valor de error #N/A.
-TYPE			= TIPO					##	Devuelve un número que indica el tipo de datos de un valor.
-
-
-##
-##	Logical functions					Funciones lógicas
-##
-AND			= Y					##	Devuelve VERDADERO si todos sus argumentos son VERDADERO.
-FALSE			= FALSO					##	Devuelve el valor lógico FALSO.
-IF			= SI					##	Especifica una prueba lógica que realizar.
-IFERROR			= SI.ERROR				##	Devuelve un valor que se especifica si una fórmula lo evalúa como un error; de lo contrario, devuelve el resultado de la fórmula.
-NOT			= NO					##	Invierte el valor lógico del argumento.
-OR			= O					##	Devuelve VERDADERO si cualquier argumento es VERDADERO.
-TRUE			= VERDADERO				##	Devuelve el valor lógico VERDADERO.
-
-
-##
-##	Lookup and reference functions				Funciones de búsqueda y referencia
-##
-ADDRESS			= DIRECCION				##	Devuelve una referencia como texto a una sola celda de una hoja de cálculo.
-AREAS			= AREAS					##	Devuelve el número de áreas de una referencia.
-CHOOSE			= ELEGIR				##	Elige un valor de una lista de valores.
-COLUMN			= COLUMNA				##	Devuelve el número de columna de una referencia.
-COLUMNS			= COLUMNAS				##	Devuelve el número de columnas de una referencia.
-HLOOKUP			= BUSCARH				##	Busca en la fila superior de una matriz y devuelve el valor de la celda indicada.
-HYPERLINK		= HIPERVINCULO				##	Crea un acceso directo o un salto que abre un documento almacenado en un servidor de red, en una intranet o en Internet.
-INDEX			= INDICE				##	Usa un índice para elegir un valor de una referencia o matriz.
-INDIRECT		= INDIRECTO				##	Devuelve una referencia indicada por un valor de texto.
-LOOKUP			= BUSCAR				##	Busca valores de un vector o una matriz.
-MATCH			= COINCIDIR				##	Busca valores de una referencia o matriz.
-OFFSET			= DESREF				##	Devuelve un desplazamiento de referencia respecto a una referencia dada.
-ROW			= FILA					##	Devuelve el número de fila de una referencia.
-ROWS			= FILAS					##	Devuelve el número de filas de una referencia.
-RTD			= RDTR					##	Recupera datos en tiempo real desde un programa compatible con la automatización COM (automatización: modo de trabajar con los objetos de una aplicación desde otra aplicación o herramienta de entorno. La automatización, antes denominada automatización OLE, es un estándar de la industria y una función del Modelo de objetos componentes (COM).).
-TRANSPOSE		= TRANSPONER				##	Devuelve la transposición de una matriz.
-VLOOKUP			= BUSCARV				##	Busca en la primera columna de una matriz y se mueve en horizontal por la fila para devolver el valor de una celda.
-
-
-##
-##	Math and trigonometry functions				Funciones matemáticas y trigonométricas
-##
-ABS			= ABS					##	Devuelve el valor absoluto de un número.
-ACOS			= ACOS					##	Devuelve el arcocoseno de un número.
-ACOSH			= ACOSH					##	Devuelve el coseno hiperbólico inverso de un número.
-ASIN			= ASENO					##	Devuelve el arcoseno de un número.
-ASINH			= ASENOH				##	Devuelve el seno hiperbólico inverso de un número.
-ATAN			= ATAN					##	Devuelve la arcotangente de un número.
-ATAN2			= ATAN2					##	Devuelve la arcotangente de las coordenadas "x" e "y".
-ATANH			= ATANH					##	Devuelve la tangente hiperbólica inversa de un número.
-CEILING			= MULTIPLO.SUPERIOR			##	Redondea un número al entero más próximo o al múltiplo significativo más cercano.
-COMBIN			= COMBINAT				##	Devuelve el número de combinaciones para un número determinado de objetos.
-COS			= COS					##	Devuelve el coseno de un número.
-COSH			= COSH					##	Devuelve el coseno hiperbólico de un número.
-DEGREES			= GRADOS				##	Convierte radianes en grados.
-EVEN			= REDONDEA.PAR				##	Redondea un número hasta el entero par más próximo.
-EXP			= EXP					##	Devuelve e elevado a la potencia de un número dado.
-FACT			= FACT					##	Devuelve el factorial de un número.
-FACTDOUBLE		= FACT.DOBLE				##	Devuelve el factorial doble de un número.
-FLOOR			= MULTIPLO.INFERIOR			##	Redondea un número hacia abajo, en dirección hacia cero.
-GCD			= M.C.D					##	Devuelve el máximo común divisor.
-INT			= ENTERO				##	Redondea un número hacia abajo hasta el entero más próximo.
-LCM			= M.C.M					##	Devuelve el mínimo común múltiplo.
-LN			= LN					##	Devuelve el logaritmo natural (neperiano) de un número.
-LOG			= LOG					##	Devuelve el logaritmo de un número en una base especificada.
-LOG10			= LOG10					##	Devuelve el logaritmo en base 10 de un número.
-MDETERM			= MDETERM				##	Devuelve la determinante matricial de una matriz.
-MINVERSE		= MINVERSA				##	Devuelve la matriz inversa de una matriz.
-MMULT			= MMULT					##	Devuelve el producto de matriz de dos matrices.
-MOD			= RESIDUO				##	Devuelve el resto de la división.
-MROUND			= REDOND.MULT				##	Devuelve un número redondeado al múltiplo deseado.
-MULTINOMIAL		= MULTINOMIAL				##	Devuelve el polinomio de un conjunto de números.
-ODD			= REDONDEA.IMPAR			##	Redondea un número hacia arriba hasta el entero impar más próximo.
-PI			= PI					##	Devuelve el valor de pi.
-POWER			= POTENCIA				##	Devuelve el resultado de elevar un número a una potencia.
-PRODUCT			= PRODUCTO				##	Multiplica sus argumentos.
-QUOTIENT		= COCIENTE				##	Devuelve la parte entera de una división.
-RADIANS			= RADIANES				##	Convierte grados en radianes.
-RAND			= ALEATORIO				##	Devuelve un número aleatorio entre 0 y 1.
-RANDBETWEEN		= ALEATORIO.ENTRE			##	Devuelve un número aleatorio entre los números que especifique.
-ROMAN			= NUMERO.ROMANO				##	Convierte un número arábigo en número romano, con formato de texto.
-ROUND			= REDONDEAR				##	Redondea un número al número de decimales especificado.
-ROUNDDOWN		= REDONDEAR.MENOS			##	Redondea un número hacia abajo, en dirección hacia cero.
-ROUNDUP			= REDONDEAR.MAS				##	Redondea un número hacia arriba, en dirección contraria a cero.
-SERIESSUM		= SUMA.SERIES				##	Devuelve la suma de una serie de potencias en función de la fórmula.
-SIGN			= SIGNO					##	Devuelve el signo de un número.
-SIN			= SENO					##	Devuelve el seno de un ángulo determinado.
-SINH			= SENOH					##	Devuelve el seno hiperbólico de un número.
-SQRT			= RAIZ					##	Devuelve la raíz cuadrada positiva de un número.
-SQRTPI			= RAIZ2PI				##	Devuelve la raíz cuadrada de un número multiplicado por PI (número * pi).
-SUBTOTAL		= SUBTOTALES				##	Devuelve un subtotal en una lista o base de datos.
-SUM			= SUMA					##	Suma sus argumentos.
-SUMIF			= SUMAR.SI				##	Suma las celdas especificadas que cumplen unos criterios determinados.
-SUMIFS			= SUMAR.SI.CONJUNTO			##	Suma las celdas de un rango que cumplen varios criterios.
-SUMPRODUCT		= SUMAPRODUCTO				##	Devuelve la suma de los productos de los correspondientes componentes de matriz.
-SUMSQ			= SUMA.CUADRADOS			##	Devuelve la suma de los cuadrados de los argumentos.
-SUMX2MY2		= SUMAX2MENOSY2				##	Devuelve la suma de la diferencia de los cuadrados de los valores correspondientes de dos matrices.
-SUMX2PY2		= SUMAX2MASY2				##	Devuelve la suma de la suma de los cuadrados de los valores correspondientes de dos matrices.
-SUMXMY2			= SUMAXMENOSY2				##	Devuelve la suma de los cuadrados de las diferencias de los valores correspondientes de dos matrices.
-TAN			= TAN					##	Devuelve la tangente de un número.
-TANH			= TANH					##	Devuelve la tangente hiperbólica de un número.
-TRUNC			= TRUNCAR				##	Trunca un número a un entero.
-
-
-##
-##	Statistical functions					Funciones estadísticas
-##
-AVEDEV			= DESVPROM				##	Devuelve el promedio de las desviaciones absolutas de la media de los puntos de datos.
-AVERAGE			= PROMEDIO				##	Devuelve el promedio de sus argumentos.
-AVERAGEA		= PROMEDIOA				##	Devuelve el promedio de sus argumentos, incluidos números, texto y valores lógicos.
-AVERAGEIF		= PROMEDIO.SI				##	Devuelve el promedio (media aritmética) de todas las celdas de un rango que cumplen unos criterios determinados.
-AVERAGEIFS		= PROMEDIO.SI.CONJUNTO			##	Devuelve el promedio (media aritmética) de todas las celdas que cumplen múltiples criterios.
-BETADIST		= DISTR.BETA				##	Devuelve la función de distribución beta acumulativa.
-BETAINV			= DISTR.BETA.INV			##	Devuelve la función inversa de la función de distribución acumulativa de una distribución beta especificada.
-BINOMDIST		= DISTR.BINOM				##	Devuelve la probabilidad de una variable aleatoria discreta siguiendo una distribución binomial.
-CHIDIST			= DISTR.CHI				##	Devuelve la probabilidad de una variable aleatoria continua siguiendo una distribución chi cuadrado de una sola cola.
-CHIINV			= PRUEBA.CHI.INV			##	Devuelve la función inversa de la probabilidad de una variable aleatoria continua siguiendo una distribución chi cuadrado de una sola cola.
-CHITEST			= PRUEBA.CHI				##	Devuelve la prueba de independencia.
-CONFIDENCE		= INTERVALO.CONFIANZA			##	Devuelve el intervalo de confianza de la media de una población.
-CORREL			= COEF.DE.CORREL			##	Devuelve el coeficiente de correlación entre dos conjuntos de datos.
-COUNT			= CONTAR				##	Cuenta cuántos números hay en la lista de argumentos.
-COUNTA			= CONTARA				##	Cuenta cuántos valores hay en la lista de argumentos.
-COUNTBLANK		= CONTAR.BLANCO				##	Cuenta el número de celdas en blanco de un rango.
-COUNTIF			= CONTAR.SI				##	Cuenta el número de celdas, dentro del rango, que cumplen el criterio especificado.
-COUNTIFS		= CONTAR.SI.CONJUNTO			##	Cuenta el número de celdas, dentro del rango, que cumplen varios criterios.
-COVAR			= COVAR					##	Devuelve la covarianza, que es el promedio de los productos de las desviaciones para cada pareja de puntos de datos.
-CRITBINOM		= BINOM.CRIT				##	Devuelve el menor valor cuya distribución binomial acumulativa es menor o igual a un valor de criterio.
-DEVSQ			= DESVIA2				##	Devuelve la suma de los cuadrados de las desviaciones.
-EXPONDIST		= DISTR.EXP				##	Devuelve la distribución exponencial.
-FDIST			= DISTR.F				##	Devuelve la distribución de probabilidad F.
-FINV			= DISTR.F.INV				##	Devuelve la función inversa de la distribución de probabilidad F.
-FISHER			= FISHER				##	Devuelve la transformación Fisher.
-FISHERINV		= PRUEBA.FISHER.INV			##	Devuelve la función inversa de la transformación Fisher.
-FORECAST		= PRONOSTICO				##	Devuelve un valor en una tendencia lineal.
-FREQUENCY		= FRECUENCIA				##	Devuelve una distribución de frecuencia como una matriz vertical.
-FTEST			= PRUEBA.F				##	Devuelve el resultado de una prueba F.
-GAMMADIST		= DISTR.GAMMA				##	Devuelve la distribución gamma.
-GAMMAINV		= DISTR.GAMMA.INV			##	Devuelve la función inversa de la distribución gamma acumulativa.
-GAMMALN			= GAMMA.LN				##	Devuelve el logaritmo natural de la función gamma, G(x).
-GEOMEAN			= MEDIA.GEOM				##	Devuelve la media geométrica.
-GROWTH			= CRECIMIENTO				##	Devuelve valores en una tendencia exponencial.
-HARMEAN			= MEDIA.ARMO				##	Devuelve la media armónica.
-HYPGEOMDIST		= DISTR.HIPERGEOM			##	Devuelve la distribución hipergeométrica.
-INTERCEPT		= INTERSECCION.EJE			##	Devuelve la intersección de la línea de regresión lineal.
-KURT			= CURTOSIS				##	Devuelve la curtosis de un conjunto de datos.
-LARGE			= K.ESIMO.MAYOR				##	Devuelve el k-ésimo mayor valor de un conjunto de datos.
-LINEST			= ESTIMACION.LINEAL			##	Devuelve los parámetros de una tendencia lineal.
-LOGEST			= ESTIMACION.LOGARITMICA		##	Devuelve los parámetros de una tendencia exponencial.
-LOGINV			= DISTR.LOG.INV				##	Devuelve la función inversa de la distribución logarítmico-normal.
-LOGNORMDIST		= DISTR.LOG.NORM			##	Devuelve la distribución logarítmico-normal acumulativa.
-MAX			= MAX					##	Devuelve el valor máximo de una lista de argumentos.
-MAXA			= MAXA					##	Devuelve el valor máximo de una lista de argumentos, incluidos números, texto y valores lógicos.
-MEDIAN			= MEDIANA				##	Devuelve la mediana de los números dados.
-MIN			= MIN					##	Devuelve el valor mínimo de una lista de argumentos.
-MINA			= MINA					##	Devuelve el valor mínimo de una lista de argumentos, incluidos números, texto y valores lógicos.
-MODE			= MODA					##	Devuelve el valor más común de un conjunto de datos.
-NEGBINOMDIST		= NEGBINOMDIST				##	Devuelve la distribución binomial negativa.
-NORMDIST		= DISTR.NORM				##	Devuelve la distribución normal acumulativa.
-NORMINV			= DISTR.NORM.INV			##	Devuelve la función inversa de la distribución normal acumulativa.
-NORMSDIST		= DISTR.NORM.ESTAND			##	Devuelve la distribución normal estándar acumulativa.
-NORMSINV		= DISTR.NORM.ESTAND.INV			##	Devuelve la función inversa de la distribución normal estándar acumulativa.
-PEARSON			= PEARSON				##	Devuelve el coeficiente de momento de correlación de producto Pearson.
-PERCENTILE		= PERCENTIL				##	Devuelve el k-ésimo percentil de los valores de un rango.
-PERCENTRANK		= RANGO.PERCENTIL			##	Devuelve el rango porcentual de un valor de un conjunto de datos.
-PERMUT			= PERMUTACIONES				##	Devuelve el número de permutaciones de un número determinado de objetos.
-POISSON			= POISSON				##	Devuelve la distribución de Poisson.
-PROB			= PROBABILIDAD				##	Devuelve la probabilidad de que los valores de un rango se encuentren entre dos límites.
-QUARTILE		= CUARTIL				##	Devuelve el cuartil de un conjunto de datos.
-RANK			= JERARQUIA				##	Devuelve la jerarquía de un número en una lista de números.
-RSQ			= COEFICIENTE.R2			##	Devuelve el cuadrado del coeficiente de momento de correlación de producto Pearson.
-SKEW			= COEFICIENTE.ASIMETRIA			##	Devuelve la asimetría de una distribución.
-SLOPE			= PENDIENTE				##	Devuelve la pendiente de la línea de regresión lineal.
-SMALL			= K.ESIMO.MENOR				##	Devuelve el k-ésimo menor valor de un conjunto de datos.
-STANDARDIZE		= NORMALIZACION				##	Devuelve un valor normalizado.
-STDEV			= DESVEST				##	Calcula la desviación estándar a partir de una muestra.
-STDEVA			= DESVESTA				##	Calcula la desviación estándar a partir de una muestra, incluidos números, texto y valores lógicos.
-STDEVP			= DESVESTP				##	Calcula la desviación estándar en función de toda la población.
-STDEVPA			= DESVESTPA				##	Calcula la desviación estándar en función de toda la población, incluidos números, texto y valores lógicos.
-STEYX			= ERROR.TIPICO.XY			##	Devuelve el error estándar del valor de "y" previsto para cada "x" de la regresión.
-TDIST			= DISTR.T				##	Devuelve la distribución de t de Student.
-TINV			= DISTR.T.INV				##	Devuelve la función inversa de la distribución de t de Student.
-TREND			= TENDENCIA				##	Devuelve valores en una tendencia lineal.
-TRIMMEAN		= MEDIA.ACOTADA				##	Devuelve la media del interior de un conjunto de datos.
-TTEST			= PRUEBA.T				##	Devuelve la probabilidad asociada a una prueba t de Student.
-VAR			= VAR					##	Calcula la varianza en función de una muestra.
-VARA			= VARA					##	Calcula la varianza en función de una muestra, incluidos números, texto y valores lógicos.
-VARP			= VARP					##	Calcula la varianza en función de toda la población.
-VARPA			= VARPA					##	Calcula la varianza en función de toda la población, incluidos números, texto y valores lógicos.
-WEIBULL			= DIST.WEIBULL				##	Devuelve la distribución de Weibull.
-ZTEST			= PRUEBA.Z				##	Devuelve el valor de una probabilidad de una cola de una prueba z.
-
-
-##
-##	Text functions						Funciones de texto
-##
-ASC			= ASC					##	Convierte las letras inglesas o katakana de ancho completo (de dos bytes) dentro de una cadena de caracteres en caracteres de ancho medio (de un byte).
-BAHTTEXT		= TEXTOBAHT				##	Convierte un número en texto, con el formato de moneda ß (Baht).
-CHAR			= CARACTER				##	Devuelve el carácter especificado por el número de código.
-CLEAN			= LIMPIAR				##	Quita del texto todos los caracteres no imprimibles.
-CODE			= CODIGO				##	Devuelve un código numérico del primer carácter de una cadena de texto.
-CONCATENATE		= CONCATENAR				##	Concatena varios elementos de texto en uno solo.
-DOLLAR			= MONEDA				##	Convierte un número en texto, con el formato de moneda $ (dólar).
-EXACT			= IGUAL					##	Comprueba si dos valores de texto son idénticos.
-FIND			= ENCONTRAR				##	Busca un valor de texto dentro de otro (distingue mayúsculas de minúsculas).
-FINDB			= ENCONTRARB				##	Busca un valor de texto dentro de otro (distingue mayúsculas de minúsculas).
-FIXED			= DECIMAL				##	Da formato a un número como texto con un número fijo de decimales.
-JIS			= JIS					##	Convierte las letras inglesas o katakana de ancho medio (de un byte) dentro de una cadena de caracteres en caracteres de ancho completo (de dos bytes).
-LEFT			= IZQUIERDA				##	Devuelve los caracteres del lado izquierdo de un valor de texto.
-LEFTB			= IZQUIERDAB				##	Devuelve los caracteres del lado izquierdo de un valor de texto.
-LEN			= LARGO					##	Devuelve el número de caracteres de una cadena de texto.
-LENB			= LARGOB				##	Devuelve el número de caracteres de una cadena de texto.
-LOWER			= MINUSC				##	Pone el texto en minúsculas.
-MID			= EXTRAE				##	Devuelve un número específico de caracteres de una cadena de texto que comienza en la posición que se especifique.
-MIDB			= EXTRAEB				##	Devuelve un número específico de caracteres de una cadena de texto que comienza en la posición que se especifique.
-PHONETIC		= FONETICO				##	Extrae los caracteres fonéticos (furigana) de una cadena de texto.
-PROPER			= NOMPROPIO				##	Pone en mayúscula la primera letra de cada palabra de un valor de texto.
-REPLACE			= REEMPLAZAR				##	Reemplaza caracteres de texto.
-REPLACEB		= REEMPLAZARB				##	Reemplaza caracteres de texto.
-REPT			= REPETIR				##	Repite el texto un número determinado de veces.
-RIGHT			= DERECHA				##	Devuelve los caracteres del lado derecho de un valor de texto.
-RIGHTB			= DERECHAB				##	Devuelve los caracteres del lado derecho de un valor de texto.
-SEARCH			= HALLAR				##	Busca un valor de texto dentro de otro (no distingue mayúsculas de minúsculas).
-SEARCHB			= HALLARB				##	Busca un valor de texto dentro de otro (no distingue mayúsculas de minúsculas).
-SUBSTITUTE		= SUSTITUIR				##	Sustituye texto nuevo por texto antiguo en una cadena de texto.
-T			= T					##	Convierte sus argumentos a texto.
-TEXT			= TEXTO					##	Da formato a un número y lo convierte en texto.
-TRIM			= ESPACIOS				##	Quita los espacios del texto.
-UPPER			= MAYUSC				##	Pone el texto en mayúsculas.
-VALUE			= VALOR					##	Convierte un argumento de texto en un número.
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/config
deleted file mode 100644
index a481864a6fa..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= $	#	Symbol not known, should it be a € (Euro)?
-
-
-##
-##	Excel Error Codes	(For future use)
-##
-NULL	= #TYHJÄ!
-DIV0	= #JAKO/0!
-VALUE	= #ARVO!
-REF	= #VIITTAUS!
-NAME	= #NIMI?
-NUM	= #LUKU!
-NA	= #PUUTTUU
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
deleted file mode 100644
index 7bed722a641..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
+++ /dev/null
@@ -1,438 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Calculation
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
-##
-##
-
-
-##
-##	Add-in and Automation functions			Apuohjelma- ja automaatiofunktiot
-##
-GETPIVOTDATA		= NOUDA.PIVOT.TIEDOT		##	Palauttaa pivot-taulukkoraporttiin tallennettuja tietoja.
-
-
-##
-##	Cube functions					Kuutiofunktiot
-##
-CUBEKPIMEMBER		= KUUTIOKPIJÄSEN		##	Palauttaa suorituskykyilmaisimen (KPI) nimen, ominaisuuden sekä mitan ja näyttää nimen sekä ominaisuuden solussa. KPI on mitattavissa oleva suure, kuten kuukauden bruttotuotto tai vuosineljänneksen työntekijäkohtainen liikevaihto, joiden avulla tarkkaillaan organisaation suorituskykyä.
-CUBEMEMBER		= KUUTIONJÄSEN			##	Palauttaa kuutiohierarkian jäsenen tai monikon. Tällä funktiolla voit tarkistaa, että jäsen tai monikko on olemassa kuutiossa.
-CUBEMEMBERPROPERTY	= KUUTIONJÄSENENOMINAISUUS	##	Palauttaa kuution jäsenominaisuuden arvon. Tällä funktiolla voit tarkistaa, että nimi on olemassa kuutiossa, ja palauttaa tämän jäsenen määritetyn ominaisuuden.
-CUBERANKEDMEMBER	= KUUTIONLUOKITELTUJÄSEN	##	Palauttaa joukon n:nnen jäsenen. Tällä funktiolla voit palauttaa joukosta elementtejä, kuten parhaan myyjän tai 10 parasta opiskelijaa.
-CUBESET			= KUUTIOJOUKKO			##	Määrittää lasketun jäsen- tai monikkojoukon lähettämällä joukon lausekkeita palvelimessa olevalle kuutiolle. Palvelin luo joukon ja palauttaa sen Microsoft Office Excelille.
-CUBESETCOUNT		= KUUTIOJOUKKOJENMÄÄRÄ		##	Palauttaa joukon kohteiden määrän.
-CUBEVALUE		= KUUTIONARVO			##	Palauttaa koostetun arvon kuutiosta.
-
-
-##
-##	Database functions				Tietokantafunktiot
-##
-DAVERAGE		= TKESKIARVO			##	Palauttaa valittujen tietokantamerkintöjen keskiarvon.
-DCOUNT			= TLASKE			##	Laskee tietokannan lukuja sisältävien solujen määrän.
-DCOUNTA			= TLASKEA			##	Laskee tietokannan tietoja sisältävien solujen määrän.
-DGET			= TNOUDA			##	Hakee määritettyjä ehtoja vastaavan tietueen tietokannasta.
-DMAX			= TMAKS				##	Palauttaa suurimman arvon tietokannasta valittujen arvojen joukosta.
-DMIN			= TMIN				##	Palauttaa pienimmän arvon tietokannasta valittujen arvojen joukosta.
-DPRODUCT		= TTULO				##	Kertoo määritetyn ehdon täyttävien tietokannan tietueiden tietyssä kentässä olevat arvot.
-DSTDEV			= TKESKIHAJONTA			##	Laskee keskihajonnan tietokannasta valituista arvoista muodostuvan otoksen perusteella.
-DSTDEVP			= TKESKIHAJONTAP		##	Laskee keskihajonnan tietokannasta valittujen arvojen koko populaation perusteella.
-DSUM			= TSUMMA			##	Lisää luvut määritetyn ehdon täyttävien tietokannan tietueiden kenttäsarakkeeseen.
-DVAR			= TVARIANSSI			##	Laskee varianssin tietokannasta valittujen arvojen otoksen perusteella.
-DVARP			= TVARIANSSIP			##	Laskee varianssin tietokannasta valittujen arvojen koko populaation perusteella.
-
-
-##
-##	Date and time functions				Päivämäärä- ja aikafunktiot
-##
-DATE			= PÄIVÄYS			##	Palauttaa annetun päivämäärän järjestysluvun.
-DATEVALUE		= PÄIVÄYSARVO			##	Muuntaa tekstimuodossa olevan päivämäärän järjestysluvuksi.
-DAY			= PÄIVÄ				##	Muuntaa järjestysluvun kuukauden päiväksi.
-DAYS360			= PÄIVÄT360			##	Laskee kahden päivämäärän välisten päivien määrän käyttäen perustana 360-päiväistä vuotta.
-EDATE			= PÄIVÄ.KUUKAUSI		##	Palauttaa järjestyslukuna päivämäärän, joka poikkeaa aloituspäivän päivämäärästä annetun kuukausimäärän verran joko eteen- tai taaksepäin.
-EOMONTH			= KUUKAUSI.LOPPU		##	Palauttaa järjestyslukuna sen kuukauden viimeisen päivämäärän, joka poikkeaa annetun kuukausimäärän verran eteen- tai taaksepäin.
-HOUR			= TUNNIT			##	Muuntaa järjestysluvun tunneiksi.
-MINUTE			= MINUUTIT			##	Muuntaa järjestysluvun minuuteiksi.
-MONTH			= KUUKAUSI			##	Muuntaa järjestysluvun kuukausiksi.
-NETWORKDAYS		= TYÖPÄIVÄT			##	Palauttaa kahden päivämäärän välissä olevien täysien työpäivien määrän.
-NOW			= NYT				##	Palauttaa kuluvan päivämäärän ja ajan järjestysnumeron.
-SECOND			= SEKUNNIT			##	Muuntaa järjestysluvun sekunneiksi.
-TIME			= AIKA				##	Palauttaa annetun kellonajan järjestysluvun.
-TIMEVALUE		= AIKA_ARVO			##	Muuntaa tekstimuodossa olevan kellonajan järjestysluvuksi.
-TODAY			= TÄMÄ.PÄIVÄ			##	Palauttaa kuluvan päivän päivämäärän järjestysluvun.
-WEEKDAY			= VIIKONPÄIVÄ			##	Muuntaa järjestysluvun viikonpäiväksi.
-WEEKNUM			= VIIKKO.NRO			##	Muuntaa järjestysluvun luvuksi, joka ilmaisee viikon järjestysluvun vuoden alusta laskettuna.
-WORKDAY			= TYÖPÄIVÄ			##	Palauttaa järjestysluvun päivämäärälle, joka sijaitsee annettujen työpäivien verran eteen tai taaksepäin.
-YEAR			= VUOSI				##	Muuntaa järjestysluvun vuosiksi.
-YEARFRAC		= VUOSI.OSA			##	Palauttaa määritettyjen päivämäärien (aloituspäivä ja lopetuspäivä) välisen osan vuodesta.
-
-
-##
-##	Engineering functions				Tekniset funktiot
-##
-BESSELI			= BESSELI			##	Palauttaa muunnetun Bessel-funktion In(x).
-BESSELJ			= BESSELJ			##	Palauttaa Bessel-funktion Jn(x).
-BESSELK			= BESSELK			##	Palauttaa muunnetun Bessel-funktion Kn(x).
-BESSELY			= BESSELY			##	Palauttaa Bessel-funktion Yn(x).
-BIN2DEC			= BINDES			##	Muuntaa binaariluvun desimaaliluvuksi.
-BIN2HEX			= BINHEKSA			##	Muuntaa binaariluvun heksadesimaaliluvuksi.
-BIN2OCT			= BINOKT			##	Muuntaa binaariluvun oktaaliluvuksi.
-COMPLEX			= KOMPLEKSI			##	Muuntaa reaali- ja imaginaariosien kertoimet kompleksiluvuksi.
-CONVERT			= MUUNNA			##	Muuntaa luvun toisen mittajärjestelmän mukaiseksi.
-DEC2BIN			= DESBIN			##	Muuntaa desimaaliluvun binaariluvuksi.
-DEC2HEX			= DESHEKSA			##	Muuntaa kymmenjärjestelmän luvun heksadesimaaliluvuksi.
-DEC2OCT			= DESOKT			##	Muuntaa kymmenjärjestelmän luvun oktaaliluvuksi.
-DELTA			= SAMA.ARVO			##	Tarkistaa, ovatko kaksi arvoa yhtä suuria.
-ERF			= VIRHEFUNKTIO			##	Palauttaa virhefunktion.
-ERFC			= VIRHEFUNKTIO.KOMPLEMENTTI	##	Palauttaa komplementtivirhefunktion.
-GESTEP			= RAJA				##	Testaa, onko luku suurempi kuin kynnysarvo.
-HEX2BIN			= HEKSABIN			##	Muuntaa heksadesimaaliluvun binaariluvuksi.
-HEX2DEC			= HEKSADES			##	Muuntaa heksadesimaaliluvun desimaaliluvuksi.
-HEX2OCT			= HEKSAOKT			##	Muuntaa heksadesimaaliluvun oktaaliluvuksi.
-IMABS			= KOMPLEKSI.ITSEISARVO		##	Palauttaa kompleksiluvun itseisarvon (moduluksen).
-IMAGINARY		= KOMPLEKSI.IMAG		##	Palauttaa kompleksiluvun imaginaariosan kertoimen.
-IMARGUMENT		= KOMPLEKSI.ARG			##	Palauttaa theeta-argumentin, joka on radiaaneina annettu kulma.
-IMCONJUGATE		= KOMPLEKSI.KONJ		##	Palauttaa kompleksiluvun konjugaattiluvun.
-IMCOS			= KOMPLEKSI.COS			##	Palauttaa kompleksiluvun kosinin.
-IMDIV			= KOMPLEKSI.OSAM		##	Palauttaa kahden kompleksiluvun osamäärän.
-IMEXP			= KOMPLEKSI.EKSP		##	Palauttaa kompleksiluvun eksponentin.
-IMLN			= KOMPLEKSI.LN			##	Palauttaa kompleksiluvun luonnollisen logaritmin.
-IMLOG10			= KOMPLEKSI.LOG10		##	Palauttaa kompleksiluvun kymmenkantaisen logaritmin.
-IMLOG2			= KOMPLEKSI.LOG2		##	Palauttaa kompleksiluvun kaksikantaisen logaritmin.
-IMPOWER			= KOMPLEKSI.POT			##	Palauttaa kokonaislukupotenssiin korotetun kompleksiluvun.
-IMPRODUCT		= KOMPLEKSI.TULO		##	Palauttaa kompleksilukujen tulon.
-IMREAL			= KOMPLEKSI.REAALI		##	Palauttaa kompleksiluvun reaaliosan kertoimen.
-IMSIN			= KOMPLEKSI.SIN			##	Palauttaa kompleksiluvun sinin.
-IMSQRT			= KOMPLEKSI.NELIÖJ		##	Palauttaa kompleksiluvun neliöjuuren.
-IMSUB			= KOMPLEKSI.EROTUS		##	Palauttaa kahden kompleksiluvun erotuksen.
-IMSUM			= KOMPLEKSI.SUM			##	Palauttaa kompleksilukujen summan.
-OCT2BIN			= OKTBIN			##	Muuntaa oktaaliluvun binaariluvuksi.
-OCT2DEC			= OKTDES			##	Muuntaa oktaaliluvun desimaaliluvuksi.
-OCT2HEX			= OKTHEKSA			##	Muuntaa oktaaliluvun heksadesimaaliluvuksi.
-
-
-##
-##	Financial functions				Rahoitusfunktiot   
-##
-ACCRINT			= KERTYNYT.KORKO		##	Laskee arvopaperille kertyneen koron, kun korko kertyy säännöllisin väliajoin.
-ACCRINTM		= KERTYNYT.KORKO.LOPUSSA	##	Laskee arvopaperille kertyneen koron, kun korko maksetaan eräpäivänä.
-AMORDEGRC		= AMORDEGRC			##	Laskee kunkin laskentakauden poiston poistokerrointa käyttämällä.
-AMORLINC		= AMORLINC			##	Palauttaa kunkin laskentakauden poiston.
-COUPDAYBS		= KORKOPÄIVÄT.ALUSTA		##	Palauttaa koronmaksukauden aloituspäivän ja tilityspäivän välisen ajanjakson päivien määrän.
-COUPDAYS		= KORKOPÄIVÄT			##	Palauttaa päivien määrän koronmaksukaudelta, johon tilityspäivä kuuluu.
-COUPDAYSNC		= KORKOPÄIVÄT.SEURAAVA		##	Palauttaa tilityspäivän ja seuraavan koronmaksupäivän välisen ajanjakson päivien määrän.
-COUPNCD			= KORKOMAKSU.SEURAAVA		##	Palauttaa tilityspäivän jälkeisen seuraavan koronmaksupäivän.
-COUPNUM			= KORKOPÄIVÄJAKSOT		##	Palauttaa arvopaperin ostopäivän ja erääntymispäivän välisten koronmaksupäivien määrän.
-COUPPCD			= KORKOPÄIVÄ.EDELLINEN		##	Palauttaa tilityspäivää edeltävän koronmaksupäivän.
-CUMIPMT			= MAKSETTU.KORKO		##	Palauttaa kahden jakson välisenä aikana kertyneen koron.
-CUMPRINC		= MAKSETTU.LYHENNYS		##	Palauttaa lainalle kahden jakson välisenä aikana kertyneen lyhennyksen.
-DB			= DB				##	Palauttaa kauden kirjanpidollisen poiston amerikkalaisen DB-menetelmän (Fixed-declining balance) mukaan.
-DDB			= DDB				##	Palauttaa kauden kirjanpidollisen poiston amerikkalaisen DDB-menetelmän (Double-Declining Balance) tai jonkin muun määrittämäsi menetelmän mukaan.
-DISC			= DISKONTTOKORKO		##	Palauttaa arvopaperin diskonttokoron.
-DOLLARDE		= VALUUTTA.DES			##	Muuntaa murtolukuna ilmoitetun valuuttamäärän desimaaliluvuksi.
-DOLLARFR		= VALUUTTA.MURTO		##	Muuntaa desimaalilukuna ilmaistun valuuttamäärän murtoluvuksi.
-DURATION		= KESTO				##	Palauttaa keston arvopaperille, jonka koronmaksu tapahtuu säännöllisesti.
-EFFECT			= KORKO.EFEKT			##	Palauttaa todellisen vuosikoron.
-FV			= TULEVA.ARVO			##	Palauttaa sijoituksen tulevan arvon.
-FVSCHEDULE		= TULEVA.ARVO.ERIKORKO		##	Palauttaa pääoman tulevan arvon, kun pääomalle on kertynyt korkoa vaihtelevasti.
-INTRATE			= KORKO.ARVOPAPERI		##	Palauttaa arvopaperin korkokannan täysin sijoitetulle arvopaperille.
-IPMT			= IPMT				##	Laskee sijoitukselle tai lainalle tiettynä ajanjaksona kertyvän koron.
-IRR			= SISÄINEN.KORKO		##	Laskee sisäisen korkokannan kassavirrasta muodostuvalle sarjalle.
-ISPMT			= ONMAKSU			##	Laskee sijoituksen maksetun koron tietyllä jaksolla.
-MDURATION		= KESTO.MUUNN			##	Palauttaa muunnetun Macauley-keston arvopaperille, jonka oletettu nimellisarvo on 100 euroa.
-MIRR			= MSISÄINEN			##	Palauttaa sisäisen korkokannan, kun positiivisten ja negatiivisten kassavirtojen rahoituskorko on erilainen.
-NOMINAL			= KORKO.VUOSI			##	Palauttaa vuosittaisen nimelliskoron.
-NPER			= NJAKSO			##	Palauttaa sijoituksen jaksojen määrän.
-NPV			= NNA				##	Palauttaa sijoituksen nykyarvon toistuvista kassavirroista muodostuvan sarjan ja diskonttokoron perusteella.
-ODDFPRICE		= PARITON.ENS.NIMELLISARVO	##	Palauttaa arvopaperin hinnan tilanteessa, jossa ensimmäinen jakso on pariton.
-ODDFYIELD		= PARITON.ENS.TUOTTO		##	Palauttaa arvopaperin tuoton tilanteessa, jossa ensimmäinen jakso on pariton.
-ODDLPRICE		= PARITON.VIIM.NIMELLISARVO	##	Palauttaa arvopaperin hinnan tilanteessa, jossa viimeinen jakso on pariton.
-ODDLYIELD		= PARITON.VIIM.TUOTTO		##	Palauttaa arvopaperin tuoton tilanteessa, jossa viimeinen jakso on pariton.
-PMT			= MAKSU				##	Palauttaa annuiteetin kausittaisen maksuerän.
-PPMT			= PPMT				##	Laskee sijoitukselle tai lainalle tiettynä ajanjaksona maksettavan lyhennyksen.
-PRICE			= HINTA				##	Palauttaa hinnan 100 euron nimellisarvoa kohden arvopaperille, jonka korko maksetaan säännöllisin väliajoin.
-PRICEDISC		= HINTA.DISK			##	Palauttaa diskontatun arvopaperin hinnan 100 euron nimellisarvoa kohden.
-PRICEMAT		= HINTA.LUNASTUS		##	Palauttaa hinnan 100 euron nimellisarvoa kohden arvopaperille, jonka korko maksetaan erääntymispäivänä.
-PV			= NA				##	Palauttaa sijoituksen nykyarvon.
-RATE			= KORKO				##	Palauttaa annuiteetin kausittaisen korkokannan.
-RECEIVED		= SAATU.HINTA			##	Palauttaa arvopaperin tuoton erääntymispäivänä kokonaan maksetulle sijoitukselle.
-SLN			= STP				##	Palauttaa sijoituksen tasapoiston yhdeltä jaksolta.
-SYD			= VUOSIPOISTO			##	Palauttaa sijoituksen vuosipoiston annettuna kautena amerikkalaisen SYD-menetelmän (Sum-of-Year's Digits) avulla.
-TBILLEQ			= OBLIG.TUOTTOPROS		##	Palauttaa valtion obligaation tuoton vastaavana joukkovelkakirjan tuottona.
-TBILLPRICE		= OBLIG.HINTA			##	Palauttaa obligaation hinnan 100 euron nimellisarvoa kohden.
-TBILLYIELD		= OBLIG.TUOTTO			##	Palauttaa obligaation tuoton.
-VDB			= VDB				##	Palauttaa annetun kauden tai kauden osan kirjanpidollisen poiston amerikkalaisen DB-menetelmän (Fixed-declining balance) mukaan.
-XIRR			= SISÄINEN.KORKO.JAKSOTON	##	Palauttaa sisäisen korkokannan kassavirtojen sarjoille, jotka eivät välttämättä ole säännöllisiä.
-XNPV			= NNA.JAKSOTON			##	Palauttaa nettonykyarvon kassavirtasarjalle, joka ei välttämättä ole kausittainen.
-YIELD			= TUOTTO			##	Palauttaa tuoton arvopaperille, jonka korko maksetaan säännöllisin väliajoin.
-YIELDDISC		= TUOTTO.DISK			##	Palauttaa diskontatun arvopaperin, kuten obligaation, vuosittaisen tuoton.
-YIELDMAT		= TUOTTO.ERÄP			##	Palauttaa erääntymispäivänään korkoa tuottavan arvopaperin vuosittaisen tuoton.
-
-
-##
-##	Information functions				Erikoisfunktiot
-##
-CELL			= SOLU				##	Palauttaa tietoja solun muotoilusta, sijainnista ja sisällöstä.
-ERROR.TYPE		= VIRHEEN.LAJI			##	Palauttaa virhetyyppiä vastaavan luvun.
-INFO			= KUVAUS			##	Palauttaa tietoja nykyisestä käyttöympäristöstä.
-ISBLANK			= ONTYHJÄ			##	Palauttaa arvon TOSI, jos arvo on tyhjä.
-ISERR			= ONVIRH			##	Palauttaa arvon TOSI, jos arvo on mikä tahansa virhearvo paitsi arvo #PUUTTUU!.
-ISERROR			= ONVIRHE			##	Palauttaa arvon TOSI, jos arvo on mikä tahansa virhearvo.
-ISEVEN			= ONPARILLINEN			##	Palauttaa arvon TOSI, jos arvo on parillinen.
-ISLOGICAL		= ONTOTUUS			##	Palauttaa arvon TOSI, jos arvo on mikä tahansa looginen arvo.
-ISNA			= ONPUUTTUU			##	Palauttaa arvon TOSI, jos virhearvo on #PUUTTUU!.
-ISNONTEXT		= ONEI_TEKSTI			##	Palauttaa arvon TOSI, jos arvo ei ole teksti.
-ISNUMBER		= ONLUKU			##	Palauttaa arvon TOSI, jos arvo on luku.
-ISODD			= ONPARITON			##	Palauttaa arvon TOSI, jos arvo on pariton.
-ISREF			= ONVIITT			##	Palauttaa arvon TOSI, jos arvo on viittaus.
-ISTEXT			= ONTEKSTI			##	Palauttaa arvon TOSI, jos arvo on teksti.
-N			= N				##	Palauttaa arvon luvuksi muunnettuna.
-NA			= PUUTTUU			##	Palauttaa virhearvon #PUUTTUU!.
-TYPE			= TYYPPI			##	Palauttaa luvun, joka ilmaisee arvon tietotyypin.
-
-
-##
-##	Logical functions				Loogiset funktiot
-##
-AND			= JA				##	Palauttaa arvon TOSI, jos kaikkien argumenttien arvo on TOSI.
-FALSE			= EPÄTOSI			##	Palauttaa totuusarvon EPÄTOSI.
-IF			= JOS				##	Määrittää suoritettavan loogisen testin.
-IFERROR			= JOSVIRHE			##	Palauttaa määrittämäsi arvon, jos kaavan tulos on virhe; muussa tapauksessa palauttaa kaavan tuloksen.
-NOT			= EI				##	Kääntää argumentin loogisen arvon.
-OR			= TAI				##	Palauttaa arvon TOSI, jos minkä tahansa argumentin arvo on TOSI.
-TRUE			= TOSI				##	Palauttaa totuusarvon TOSI.
-
-
-##
-##	Lookup and reference functions			Haku- ja viitefunktiot
-##
-ADDRESS			= OSOITE			##	Palauttaa laskentataulukon soluun osoittavan viittauksen tekstinä.
-AREAS			= ALUEET			##	Palauttaa viittauksessa olevien alueiden määrän.
-CHOOSE			= VALITSE.INDEKSI		##	Valitsee arvon arvoluettelosta.
-COLUMN			= SARAKE			##	Palauttaa viittauksen sarakenumeron.
-COLUMNS			= SARAKKEET			##	Palauttaa viittauksessa olevien sarakkeiden määrän.
-HLOOKUP			= VHAKU				##	Suorittaa haun matriisin ylimmältä riviltä ja palauttaa määritetyn solun arvon.
-HYPERLINK		= HYPERLINKKI			##	Luo pikakuvakkeen tai tekstin, joka avaa verkkopalvelimeen, intranetiin tai Internetiin tallennetun tiedoston.
-INDEX			= INDEKSI			##	Valitsee arvon viittauksesta tai matriisista indeksin mukaan.
-INDIRECT		= EPÄSUORA			##	Palauttaa tekstiarvona ilmaistun viittauksen.
-LOOKUP			= HAKU				##	Etsii arvoja vektorista tai matriisista.
-MATCH			= VASTINE			##	Etsii arvoja viittauksesta tai matriisista.
-OFFSET			= SIIRTYMÄ			##	Palauttaa annetun viittauksen siirtymän.
-ROW			= RIVI				##	Palauttaa viittauksen rivinumeron.
-ROWS			= RIVIT				##	Palauttaa viittauksessa olevien rivien määrän.
-RTD			= RTD				##	Noutaa COM-automaatiota (automaatio: Tapa käsitellä sovelluksen objekteja toisesta sovelluksesta tai kehitystyökalusta. Automaatio, jota aiemmin kutsuttiin OLE-automaatioksi, on teollisuusstandardi ja COM-mallin (Component Object Model) ominaisuus.) tukevasta ohjelmasta reaaliaikaisia tietoja.
-TRANSPOSE		= TRANSPONOI			##	Palauttaa matriisin käänteismatriisin.
-VLOOKUP			= PHAKU				##	Suorittaa haun matriisin ensimmäisestä sarakkeesta ja palauttaa rivillä olevan solun arvon.
-
-
-##
-##	Math and trigonometry functions			Matemaattiset ja trigonometriset funktiot
-##
-ABS			= ITSEISARVO			##	Palauttaa luvun itseisarvon.
-ACOS			= ACOS				##	Palauttaa luvun arkuskosinin.
-ACOSH			= ACOSH				##	Palauttaa luvun käänteisen hyperbolisen kosinin.
-ASIN			= ASIN				##	Palauttaa luvun arkussinin.
-ASINH			= ASINH				##	Palauttaa luvun käänteisen hyperbolisen sinin.
-ATAN			= ATAN				##	Palauttaa luvun arkustangentin.
-ATAN2			= ATAN2				##	Palauttaa arkustangentin x- ja y-koordinaatin perusteella.
-ATANH			= ATANH				##	Palauttaa luvun käänteisen hyperbolisen tangentin.
-CEILING			= PYÖRISTÄ.KERR.YLÖS		##	Pyöristää luvun lähimpään kokonaislukuun tai tarkkuusargumentin lähimpään kerrannaiseen.
-COMBIN			= KOMBINAATIO			##	Palauttaa mahdollisten kombinaatioiden määrän annetulle objektien määrälle.
-COS			= COS				##	Palauttaa luvun kosinin.
-COSH			= COSH				##	Palauttaa luvun hyperbolisen kosinin.
-DEGREES			= ASTEET			##	Muuntaa radiaanit asteiksi.
-EVEN			= PARILLINEN			##	Pyöristää luvun ylöspäin lähimpään parilliseen kokonaislukuun.
-EXP			= EKSPONENTTI			##	Palauttaa e:n korotettuna annetun luvun osoittamaan potenssiin.
-FACT			= KERTOMA			##	Palauttaa luvun kertoman.
-FACTDOUBLE		= KERTOMA.OSA			##	Palauttaa luvun osakertoman.
-FLOOR			= PYÖRISTÄ.KERR.ALAS		##	Pyöristää luvun alaspäin (nollaa kohti).
-GCD			= SUURIN.YHT.TEKIJÄ		##	Palauttaa suurimman yhteisen tekijän.
-INT			= KOKONAISLUKU			##	Pyöristää luvun alaspäin lähimpään kokonaislukuun.
-LCM			= PIENIN.YHT.JAETTAVA		##	Palauttaa pienimmän yhteisen tekijän.
-LN			= LUONNLOG			##	Palauttaa luvun luonnollisen logaritmin.
-LOG			= LOG				##	Laskee luvun logaritmin käyttämällä annettua kantalukua.
-LOG10			= LOG10				##	Palauttaa luvun kymmenkantaisen logaritmin.
-MDETERM			= MDETERM			##	Palauttaa matriisin matriisideterminantin.
-MINVERSE		= MKÄÄNTEINEN			##	Palauttaa matriisin käänteismatriisin.
-MMULT			= MKERRO			##	Palauttaa kahden matriisin tulon.
-MOD			= JAKOJ				##	Palauttaa jakolaskun jäännöksen.
-MROUND			= PYÖRISTÄ.KERR			##	Palauttaa luvun pyöristettynä annetun luvun kerrannaiseen.
-MULTINOMIAL		= MULTINOMI			##	Palauttaa lukujoukon multinomin.
-ODD			= PARITON			##	Pyöristää luvun ylöspäin lähimpään parittomaan kokonaislukuun.
-PI			= PII				##	Palauttaa piin arvon.
-POWER			= POTENSSI			##	Palauttaa luvun korotettuna haluttuun potenssiin.
-PRODUCT			= TULO				##	Kertoo annetut argumentit.
-QUOTIENT		= OSAMÄÄRÄ			##	Palauttaa osamäärän kokonaislukuosan.
-RADIANS			= RADIAANIT			##	Muuntaa asteet radiaaneiksi.
-RAND			= SATUNNAISLUKU			##	Palauttaa satunnaisluvun väliltä 0–1.
-RANDBETWEEN		= SATUNNAISLUKU.VÄLILTÄ		##	Palauttaa satunnaisluvun määritettyjen lukujen väliltä.
-ROMAN			= ROMAN				##	Muuntaa arabialaisen numeron tekstimuotoiseksi roomalaiseksi numeroksi.
-ROUND			= PYÖRISTÄ			##	Pyöristää luvun annettuun määrään desimaaleja.
-ROUNDDOWN		= PYÖRISTÄ.DES.ALAS		##	Pyöristää luvun alaspäin (nollaa kohti).
-ROUNDUP			= PYÖRISTÄ.DES.YLÖS		##	Pyöristää luvun ylöspäin (poispäin nollasta).
-SERIESSUM		= SARJA.SUMMA			##	Palauttaa kaavaan perustuvan potenssisarjan arvon.
-SIGN			= ETUMERKKI			##	Palauttaa luvun etumerkin.
-SIN			= SIN				##	Palauttaa annetun kulman sinin.
-SINH			= SINH				##	Palauttaa luvun hyperbolisen sinin.
-SQRT			= NELIÖJUURI			##	Palauttaa positiivisen neliöjuuren.
-SQRTPI			= NELIÖJUURI.PII		##	Palauttaa tulon (luku * pii) neliöjuuren.
-SUBTOTAL		= VÄLISUMMA			##	Palauttaa luettelon tai tietokannan välisumman.
-SUM			= SUMMA				##	Laskee yhteen annetut argumentit.
-SUMIF			= SUMMA.JOS			##	Laskee ehdot täyttävien solujen summan.
-SUMIFS			= SUMMA.JOS.JOUKKO		##	Laskee yhteen solualueen useita ehtoja vastaavat solut.
-SUMPRODUCT		= TULOJEN.SUMMA			##	Palauttaa matriisin toisiaan vastaavien osien tulojen summan.
-SUMSQ			= NELIÖSUMMA			##	Palauttaa argumenttien neliöiden summan.
-SUMX2MY2		= NELIÖSUMMIEN.EROTUS		##	Palauttaa kahden matriisin toisiaan vastaavien arvojen laskettujen neliösummien erotuksen.
-SUMX2PY2		= NELIÖSUMMIEN.SUMMA		##	Palauttaa kahden matriisin toisiaan vastaavien arvojen neliösummien summan.
-SUMXMY2			= EROTUSTEN.NELIÖSUMMA		##	Palauttaa kahden matriisin toisiaan vastaavien arvojen erotusten neliösumman.
-TAN			= TAN				##	Palauttaa luvun tangentin.
-TANH			= TANH				##	Palauttaa luvun hyperbolisen tangentin.
-TRUNC			= KATKAISE			##	Katkaisee luvun kokonaisluvuksi.
-
-
-##
-##	Statistical functions				Tilastolliset funktiot
-##
-AVEDEV			= KESKIPOIKKEAMA		##	Palauttaa hajontojen itseisarvojen keskiarvon.
-AVERAGE			= KESKIARVO			##	Palauttaa argumenttien keskiarvon.
-AVERAGEA		= KESKIARVOA			##	Palauttaa argumenttien, mukaan lukien lukujen, tekstin ja loogisten arvojen, keskiarvon.
-AVERAGEIF		= KESKIARVO.JOS			##	Palauttaa alueen niiden solujen keskiarvon (aritmeettisen keskiarvon), jotka täyttävät annetut ehdot.
-AVERAGEIFS		= KESKIARVO.JOS.JOUKKO		##	Palauttaa niiden solujen keskiarvon (aritmeettisen keskiarvon), jotka vastaavat useita ehtoja.
-BETADIST		= BEETAJAKAUMA			##	Palauttaa kumulatiivisen beetajakaumafunktion arvon.
-BETAINV			= BEETAJAKAUMA.KÄÄNT		##	Palauttaa määritetyn beetajakauman käänteisen kumulatiivisen jakaumafunktion arvon.
-BINOMDIST		= BINOMIJAKAUMA			##	Palauttaa yksittäisen termin binomijakaumatodennäköisyyden.
-CHIDIST			= CHIJAKAUMA			##	Palauttaa yksisuuntaisen chi-neliön jakauman todennäköisyyden.
-CHIINV			= CHIJAKAUMA.KÄÄNT		##	Palauttaa yksisuuntaisen chi-neliön jakauman todennäköisyyden käänteisarvon.
-CHITEST			= CHITESTI			##	Palauttaa riippumattomuustestin tuloksen.
-CONFIDENCE		= LUOTTAMUSVÄLI			##	Palauttaa luottamusvälin populaation keskiarvolle.
-CORREL			= KORRELAATIO			##	Palauttaa kahden arvojoukon korrelaatiokertoimen.
-COUNT			= LASKE				##	Laskee argumenttiluettelossa olevien lukujen määrän.
-COUNTA			= LASKE.A			##	Laskee argumenttiluettelossa olevien arvojen määrän.
-COUNTBLANK		= LASKE.TYHJÄT			##	Laskee alueella olevien tyhjien solujen määrän.
-COUNTIF			= LASKE.JOS			##	Laskee alueella olevien sellaisten solujen määrän, joiden sisältö vastaa annettuja ehtoja.
-COUNTIFS		= LASKE.JOS.JOUKKO		##	Laskee alueella olevien sellaisten solujen määrän, joiden sisältö vastaa useita ehtoja.
-COVAR			= KOVARIANSSI			##	Palauttaa kovarianssin, joka on keskiarvo havaintoaineiston kunkin pisteparin poikkeamien tuloista.
-CRITBINOM		= BINOMIJAKAUMA.KRIT		##	Palauttaa pienimmän arvon, jossa binomijakauman kertymäfunktion arvo on pienempi tai yhtä suuri kuin vertailuarvo.
-DEVSQ			= OIKAISTU.NELIÖSUMMA		##	Palauttaa keskipoikkeamien neliösumman.
-EXPONDIST		= EKSPONENTIAALIJAKAUMA		##	Palauttaa eksponentiaalijakauman.
-FDIST			= FJAKAUMA			##	Palauttaa F-todennäköisyysjakauman.
-FINV			= FJAKAUMA.KÄÄNT		##	Palauttaa F-todennäköisyysjakauman käänteisfunktion.
-FISHER			= FISHER			##	Palauttaa Fisher-muunnoksen.
-FISHERINV		= FISHER.KÄÄNT			##	Palauttaa käänteisen Fisher-muunnoksen.
-FORECAST		= ENNUSTE			##	Palauttaa lineaarisen trendin arvon.
-FREQUENCY		= TAAJUUS			##	Palauttaa frekvenssijakautuman pystysuuntaisena matriisina.
-FTEST			= FTESTI			##	Palauttaa F-testin tuloksen.
-GAMMADIST		= GAMMAJAKAUMA			##	Palauttaa gammajakauman.
-GAMMAINV		= GAMMAJAKAUMA.KÄÄNT		##	Palauttaa käänteisen gammajakauman kertymäfunktion.
-GAMMALN			= GAMMALN			##	Palauttaa gammafunktion luonnollisen logaritmin G(x).
-GEOMEAN			= KESKIARVO.GEOM		##	Palauttaa geometrisen keskiarvon.
-GROWTH			= KASVU				##	Palauttaa eksponentiaalisen trendin arvon.
-HARMEAN			= KESKIARVO.HARM		##	Palauttaa harmonisen keskiarvon.
-HYPGEOMDIST		= HYPERGEOM.JAKAUMA		##	Palauttaa hypergeometrisen jakauman.
-INTERCEPT		= LEIKKAUSPISTE			##	Palauttaa lineaarisen regressiosuoran leikkauspisteen.
-KURT			= KURT				##	Palauttaa tietoalueen vinous-arvon eli huipukkuuden.
-LARGE			= SUURI				##	Palauttaa tietojoukon k:nneksi suurimman arvon.
-LINEST			= LINREGR			##	Palauttaa lineaarisen trendin parametrit.
-LOGEST			= LOGREGR			##	Palauttaa eksponentiaalisen trendin parametrit.
-LOGINV			= LOGNORM.JAKAUMA.KÄÄNT		##	Palauttaa lognormeeratun jakauman käänteisfunktion.
-LOGNORMDIST		= LOGNORM.JAKAUMA		##	Palauttaa lognormaalisen jakauman kertymäfunktion.
-MAX			= MAKS				##	Palauttaa suurimman arvon argumenttiluettelosta.
-MAXA			= MAKSA				##	Palauttaa argumenttien, mukaan lukien lukujen, tekstin ja loogisten arvojen, suurimman arvon.
-MEDIAN			= MEDIAANI			##	Palauttaa annettujen lukujen mediaanin.
-MIN			= MIN				##	Palauttaa pienimmän arvon argumenttiluettelosta.
-MINA			= MINA				##	Palauttaa argumenttien, mukaan lukien lukujen, tekstin ja loogisten arvojen, pienimmän arvon.
-MODE			= MOODI				##	Palauttaa tietojoukossa useimmin esiintyvän arvon.
-NEGBINOMDIST		= BINOMIJAKAUMA.NEG		##	Palauttaa negatiivisen binomijakauman.
-NORMDIST		= NORM.JAKAUMA			##	Palauttaa normaalijakauman kertymäfunktion.
-NORMINV			= NORM.JAKAUMA.KÄÄNT		##	Palauttaa käänteisen normaalijakauman kertymäfunktion.
-NORMSDIST		= NORM.JAKAUMA.NORMIT		##	Palauttaa normitetun normaalijakauman kertymäfunktion.
-NORMSINV		= NORM.JAKAUMA.NORMIT.KÄÄNT	##	Palauttaa normitetun normaalijakauman kertymäfunktion käänteisarvon.
-PEARSON			= PEARSON			##	Palauttaa Pearsonin tulomomenttikorrelaatiokertoimen.
-PERCENTILE		= PROSENTTIPISTE		##	Palauttaa alueen arvojen k:nnen prosenttipisteen.
-PERCENTRANK		= PROSENTTIJÄRJESTYS		##	Palauttaa tietojoukon arvon prosentuaalisen järjestysluvun.
-PERMUT			= PERMUTAATIO			##	Palauttaa mahdollisten permutaatioiden määrän annetulle objektien määrälle.
-POISSON			= POISSON			##	Palauttaa Poissonin todennäköisyysjakauman.
-PROB			= TODENNÄKÖISYYS		##	Palauttaa todennäköisyyden sille, että arvot ovat tietyltä väliltä.
-QUARTILE		= NELJÄNNES			##	Palauttaa tietoalueen neljänneksen.
-RANK			= ARVON.MUKAAN			##	Palauttaa luvun paikan lukuarvoluettelossa.
-RSQ			= PEARSON.NELIÖ			##	Palauttaa Pearsonin tulomomenttikorrelaatiokertoimen neliön.
-SKEW			= JAKAUMAN.VINOUS		##	Palauttaa jakauman vinouden.
-SLOPE			= KULMAKERROIN			##	Palauttaa lineaarisen regressiosuoran kulmakertoimen.
-SMALL			= PIENI				##	Palauttaa tietojoukon k:nneksi pienimmän arvon.
-STANDARDIZE		= NORMITA			##	Palauttaa normitetun arvon.
-STDEV			= KESKIHAJONTA			##	Laskee populaation keskihajonnan otoksen perusteella.
-STDEVA			= KESKIHAJONTAA			##	Laskee populaation keskihajonnan otoksen perusteella, mukaan lukien luvut, tekstin ja loogiset arvot.
-STDEVP			= KESKIHAJONTAP			##	Laskee normaalijakautuman koko populaation perusteella.
-STDEVPA			= KESKIHAJONTAPA		##	Laskee populaation keskihajonnan koko populaation perusteella, mukaan lukien luvut, tekstin ja totuusarvot.
-STEYX			= KESKIVIRHE			##	Palauttaa regression kutakin x-arvoa vastaavan ennustetun y-arvon keskivirheen.
-TDIST			= TJAKAUMA			##	Palauttaa t-jakautuman.
-TINV			= TJAKAUMA.KÄÄNT		##	Palauttaa käänteisen t-jakauman.
-TREND			= SUUNTAUS			##	Palauttaa lineaarisen trendin arvoja.
-TRIMMEAN		= KESKIARVO.TASATTU		##	Palauttaa tietojoukon tasatun keskiarvon.
-TTEST			= TTESTI			##	Palauttaa t-testiin liittyvän todennäköisyyden.
-VAR			= VAR				##	Arvioi populaation varianssia otoksen perusteella.
-VARA			= VARA				##	Laskee populaation varianssin otoksen perusteella, mukaan lukien luvut, tekstin ja loogiset arvot.
-VARP			= VARP				##	Laskee varianssin koko populaation perusteella.
-VARPA			= VARPA				##	Laskee populaation varianssin koko populaation perusteella, mukaan lukien luvut, tekstin ja totuusarvot.
-WEIBULL			= WEIBULL			##	Palauttaa Weibullin jakauman.
-ZTEST			= ZTESTI			##	Palauttaa z-testin yksisuuntaisen todennäköisyysarvon.
-
-
-##
-##	Text functions					Tekstifunktiot
-##
-ASC			= ASC				##	Muuntaa merkkijonossa olevat englanninkieliset DBCS- tai katakana-merkit SBCS-merkeiksi.
-BAHTTEXT		= BAHTTEKSTI			##	Muuntaa luvun tekstiksi ß (baht) -valuuttamuotoa käyttämällä.
-CHAR			= MERKKI			##	Palauttaa koodin lukua vastaavan merkin.
-CLEAN			= SIIVOA			##	Poistaa tekstistä kaikki tulostumattomat merkit.
-CODE			= KOODI				##	Palauttaa tekstimerkkijonon ensimmäisen merkin numerokoodin.
-CONCATENATE		= KETJUTA			##	Yhdistää useat merkkijonot yhdeksi merkkijonoksi.
-DOLLAR			= VALUUTTA			##	Muuntaa luvun tekstiksi $ (dollari) -valuuttamuotoa käyttämällä.
-EXACT			= VERTAA			##	Tarkistaa, ovatko kaksi tekstiarvoa samanlaiset.
-FIND			= ETSI				##	Etsii tekstiarvon toisen tekstin sisältä (tunnistaa isot ja pienet kirjaimet).
-FINDB			= ETSIB				##	Etsii tekstiarvon toisen tekstin sisältä (tunnistaa isot ja pienet kirjaimet).
-FIXED			= KIINTEÄ			##	Muotoilee luvun tekstiksi, jossa on kiinteä määrä desimaaleja.
-JIS			= JIS				##	Muuntaa merkkijonossa olevat englanninkieliset SBCS- tai katakana-merkit DBCS-merkeiksi.
-LEFT			= VASEN				##	Palauttaa tekstiarvon vasemmanpuoliset merkit.
-LEFTB			= VASENB			##	Palauttaa tekstiarvon vasemmanpuoliset merkit.
-LEN			= PITUUS			##	Palauttaa tekstimerkkijonon merkkien määrän.
-LENB			= PITUUSB			##	Palauttaa tekstimerkkijonon merkkien määrän.
-LOWER			= PIENET			##	Muuntaa tekstin pieniksi kirjaimiksi.
-MID			= POIMI.TEKSTI			##	Palauttaa määritetyn määrän merkkejä merkkijonosta alkaen annetusta kohdasta.
-MIDB			= POIMI.TEKSTIB			##	Palauttaa määritetyn määrän merkkejä merkkijonosta alkaen annetusta kohdasta.
-PHONETIC		= FONEETTINEN			##	Hakee foneettiset (furigana) merkit merkkijonosta.
-PROPER			= ERISNIMI			##	Muuttaa merkkijonon kunkin sanan ensimmäisen kirjaimen isoksi.
-REPLACE			= KORVAA			##	Korvaa tekstissä olevat merkit.
-REPLACEB		= KORVAAB			##	Korvaa tekstissä olevat merkit.
-REPT			= TOISTA			##	Toistaa tekstin annetun määrän kertoja.
-RIGHT			= OIKEA				##	Palauttaa tekstiarvon oikeanpuoliset merkit.
-RIGHTB			= OIKEAB			##	Palauttaa tekstiarvon oikeanpuoliset merkit.
-SEARCH			= KÄY.LÄPI			##	Etsii tekstiarvon toisen tekstin sisältä (isot ja pienet kirjaimet tulkitaan samoiksi merkeiksi).
-SEARCHB			= KÄY.LÄPIB			##	Etsii tekstiarvon toisen tekstin sisältä (isot ja pienet kirjaimet tulkitaan samoiksi merkeiksi).
-SUBSTITUTE		= VAIHDA			##	Korvaa merkkijonossa olevan tekstin toisella.
-T			= T				##	Muuntaa argumentit tekstiksi.
-TEXT			= TEKSTI			##	Muotoilee luvun ja muuntaa sen tekstiksi.
-TRIM			= POISTA.VÄLIT			##	Poistaa välilyönnit tekstistä.
-UPPER			= ISOT				##	Muuntaa tekstin isoiksi kirjaimiksi.
-VALUE			= ARVO				##	Muuntaa tekstiargumentin luvuksi.
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/config
deleted file mode 100644
index 2240d6b9f8b..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= €
-
-
-##
-##	Excel Error Codes	(For future use)
-##
-NULL	= #NUL!
-DIV0	= #DIV/0!
-VALUE	= #VALEUR!
-REF	= #REF!
-NAME	= #NOM?
-NUM	= #NOMBRE!
-NA	= #N/A
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
deleted file mode 100644
index 8d25f6ac193..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
+++ /dev/null
@@ -1,438 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Calculation
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
-##
-##
-
-
-##
-##	Add-in and Automation functions			Fonctions de complément et d’automatisation
-##
-GETPIVOTDATA		= LIREDONNEESTABCROISDYNAMIQUE	##	Renvoie les données stockées dans un rapport de tableau croisé dynamique.
-
-
-##
-##	Cube functions					Fonctions Cube
-##
-CUBEKPIMEMBER		= MEMBREKPICUBE			##	Renvoie un nom, une propriété et une mesure d’indicateur de performance clé et affiche le nom et la propriété dans la cellule. Un indicateur de performance clé est une mesure quantifiable, telle que la marge bénéficiaire brute mensuelle ou la rotation trimestrielle du personnel, utilisée pour évaluer les performances d’une entreprise.
-CUBEMEMBER		= MEMBRECUBE			##	Renvoie un membre ou un uplet dans une hiérarchie de cubes. Utilisez cette fonction pour valider l’existence du membre ou de l’uplet dans le cube.
-CUBEMEMBERPROPERTY	= PROPRIETEMEMBRECUBE		##	Renvoie la valeur d’une propriété de membre du cube. Utilisez cette fonction pour valider l’existence d’un nom de membre dans le cube et pour renvoyer la propriété spécifiée pour ce membre.
-CUBERANKEDMEMBER	= RANGMEMBRECUBE		##	Renvoie le nième membre ou le membre placé à un certain rang dans un ensemble. Utilisez cette fonction pour renvoyer un ou plusieurs éléments d’un ensemble, tels que les meilleurs vendeurs ou les 10 meilleurs étudiants.
-CUBESET			= JEUCUBE			##	Définit un ensemble calculé de membres ou d’uplets en envoyant une expression définie au cube sur le serveur qui crée l’ensemble et le renvoie à Microsoft Office Excel.
-CUBESETCOUNT		= NBJEUCUBE			##	Renvoie le nombre d’éléments dans un jeu.
-CUBEVALUE		= VALEURCUBE			##	Renvoie une valeur d’agrégation issue d’un cube.
-
-
-##
-##	Database functions				Fonctions de base de données
-##
-DAVERAGE		= BDMOYENNE			##	Renvoie la moyenne des entrées de base de données sélectionnées.
-DCOUNT			= BCOMPTE			##	Compte le nombre de cellules d’une base de données qui contiennent des nombres.
-DCOUNTA			= BDNBVAL			##	Compte les cellules non vides d’une base de données.
-DGET			= BDLIRE			##	Extrait d’une base de données un enregistrement unique répondant aux critères spécifiés.
-DMAX			= BDMAX				##	Renvoie la valeur maximale des entrées de base de données sélectionnées.
-DMIN			= BDMIN				##	Renvoie la valeur minimale des entrées de base de données sélectionnées.
-DPRODUCT		= BDPRODUIT			##	Multiplie les valeurs d’un champ particulier des enregistrements d’une base de données, qui répondent aux critères spécifiés.
-DSTDEV			= BDECARTYPE			##	Calcule l’écart type pour un échantillon d’entrées de base de données sélectionnées.
-DSTDEVP			= BDECARTYPEP			##	Calcule l’écart type pour l’ensemble d’une population d’entrées de base de données sélectionnées.
-DSUM			= BDSOMME			##	Ajoute les nombres dans la colonne de champ des enregistrements de la base de données, qui répondent aux critères.
-DVAR			= BDVAR				##	Calcule la variance pour un échantillon d’entrées de base de données sélectionnées.
-DVARP			= BDVARP			##	Calcule la variance pour l’ensemble d’une population d’entrées de base de données sélectionnées.
-
-
-##
-##	Date and time functions				Fonctions de date et d’heure
-##
-DATE			= DATE				##	Renvoie le numéro de série d’une date précise.
-DATEVALUE		= DATEVAL			##	Convertit une date représentée sous forme de texte en numéro de série.
-DAY			= JOUR				##	Convertit un numéro de série en jour du mois.
-DAYS360			= JOURS360			##	Calcule le nombre de jours qui séparent deux dates sur la base d’une année de 360 jours.
-EDATE			= MOIS.DECALER			##	Renvoie le numéro séquentiel de la date qui représente une date spécifiée (l’argument date_départ), corrigée en plus ou en moins du nombre de mois indiqué.
-EOMONTH			= FIN.MOIS			##	Renvoie le numéro séquentiel de la date du dernier jour du mois précédant ou suivant la date_départ du nombre de mois indiqué.
-HOUR			= HEURE				##	Convertit un numéro de série en heure.
-MINUTE			= MINUTE			##	Convertit un numéro de série en minute.
-MONTH			= MOIS				##	Convertit un numéro de série en mois.
-NETWORKDAYS		= NB.JOURS.OUVRES		##	Renvoie le nombre de jours ouvrés entiers compris entre deux dates.
-NOW			= MAINTENANT			##	Renvoie le numéro de série de la date et de l’heure du jour.
-SECOND			= SECONDE			##	Convertit un numéro de série en seconde.
-TIME			= TEMPS				##	Renvoie le numéro de série d’une heure précise.
-TIMEVALUE		= TEMPSVAL			##	Convertit une date représentée sous forme de texte en numéro de série.
-TODAY			= AUJOURDHUI			##	Renvoie le numéro de série de la date du jour.
-WEEKDAY			= JOURSEM			##	Convertit un numéro de série en jour de la semaine.
-WEEKNUM			= NO.SEMAINE			##	Convertit un numéro de série en un numéro représentant l’ordre de la semaine dans l’année.
-WORKDAY			= SERIE.JOUR.OUVRE		##	Renvoie le numéro de série de la date avant ou après le nombre de jours ouvrés spécifiés.
-YEAR			= ANNEE				##	Convertit un numéro de série en année.
-YEARFRAC		= FRACTION.ANNEE		##	Renvoie la fraction de l’année représentant le nombre de jours entre la date de début et la date de fin.
-
-
-##
-##	Engineering functions				Fonctions d’ingénierie
-##
-BESSELI			= BESSELI			##	Renvoie la fonction Bessel modifiée In(x).
-BESSELJ			= BESSELJ			##	Renvoie la fonction Bessel Jn(x).
-BESSELK			= BESSELK			##	Renvoie la fonction Bessel modifiée Kn(x).
-BESSELY			= BESSELY			##	Renvoie la fonction Bessel Yn(x).
-BIN2DEC			= BINDEC			##	Convertit un nombre binaire en nombre décimal.
-BIN2HEX			= BINHEX			##	Convertit un nombre binaire en nombre hexadécimal.
-BIN2OCT			= BINOCT			##	Convertit un nombre binaire en nombre octal.
-COMPLEX			= COMPLEXE			##	Convertit des coefficients réel et imaginaire en un nombre complexe.
-CONVERT			= CONVERT			##	Convertit un nombre d’une unité de mesure à une autre.
-DEC2BIN			= DECBIN			##	Convertit un nombre décimal en nombre binaire.
-DEC2HEX			= DECHEX			##	Convertit un nombre décimal en nombre hexadécimal.
-DEC2OCT			= DECOCT			##	Convertit un nombre décimal en nombre octal.
-DELTA			= DELTA				##	Teste l’égalité de deux nombres.
-ERF			= ERF				##	Renvoie la valeur de la fonction d’erreur.
-ERFC			= ERFC				##	Renvoie la valeur de la fonction d’erreur complémentaire.
-GESTEP			= SUP.SEUIL			##	Teste si un nombre est supérieur à une valeur de seuil.
-HEX2BIN			= HEXBIN			##	Convertit un nombre hexadécimal en nombre binaire.
-HEX2DEC			= HEXDEC			##	Convertit un nombre hexadécimal en nombre décimal.
-HEX2OCT			= HEXOCT			##	Convertit un nombre hexadécimal en nombre octal.
-IMABS			= COMPLEXE.MODULE		##	Renvoie la valeur absolue (module) d’un nombre complexe.
-IMAGINARY		= COMPLEXE.IMAGINAIRE		##	Renvoie le coefficient imaginaire d’un nombre complexe.
-IMARGUMENT		= COMPLEXE.ARGUMENT		##	Renvoie l’argument thêta, un angle exprimé en radians.
-IMCONJUGATE		= COMPLEXE.CONJUGUE		##	Renvoie le nombre complexe conjugué d’un nombre complexe.
-IMCOS			= IMCOS				##	Renvoie le cosinus d’un nombre complexe.
-IMDIV			= COMPLEXE.DIV			##	Renvoie le quotient de deux nombres complexes.
-IMEXP			= COMPLEXE.EXP			##	Renvoie la fonction exponentielle d’un nombre complexe.
-IMLN			= COMPLEXE.LN			##	Renvoie le logarithme népérien d’un nombre complexe.
-IMLOG10			= COMPLEXE.LOG10		##	Calcule le logarithme en base 10 d’un nombre complexe.
-IMLOG2			= COMPLEXE.LOG2			##	Calcule le logarithme en base 2 d’un nombre complexe.
-IMPOWER			= COMPLEXE.PUISSANCE		##	Renvoie un nombre complexe élevé à une puissance entière.
-IMPRODUCT		= COMPLEXE.PRODUIT		##	Renvoie le produit de plusieurs nombres complexes.
-IMREAL			= COMPLEXE.REEL			##	Renvoie le coefficient réel d’un nombre complexe.
-IMSIN			= COMPLEXE.SIN			##	Renvoie le sinus d’un nombre complexe.
-IMSQRT			= COMPLEXE.RACINE		##	Renvoie la racine carrée d’un nombre complexe.
-IMSUB			= COMPLEXE.DIFFERENCE		##	Renvoie la différence entre deux nombres complexes.
-IMSUM			= COMPLEXE.SOMME		##	Renvoie la somme de plusieurs nombres complexes.
-OCT2BIN			= OCTBIN			##	Convertit un nombre octal en nombre binaire.
-OCT2DEC			= OCTDEC			##	Convertit un nombre octal en nombre décimal.
-OCT2HEX			= OCTHEX			##	Convertit un nombre octal en nombre hexadécimal.
-
-
-##
-##	Financial functions				Fonctions financières
-##
-ACCRINT			= INTERET.ACC			##	Renvoie l’intérêt couru non échu d’un titre dont l’intérêt est perçu périodiquement.
-ACCRINTM		= INTERET.ACC.MAT		##	Renvoie l’intérêt couru non échu d’un titre dont l’intérêt est perçu à l’échéance.
-AMORDEGRC		= AMORDEGRC			##	Renvoie l’amortissement correspondant à chaque période comptable en utilisant un coefficient d’amortissement.
-AMORLINC		= AMORLINC			##	Renvoie l’amortissement d’un bien à la fin d’une période fiscale donnée.
-COUPDAYBS		= NB.JOURS.COUPON.PREC		##	Renvoie le nombre de jours entre le début de la période de coupon et la date de liquidation.
-COUPDAYS		= NB.JOURS.COUPONS		##	Renvoie le nombre de jours pour la période du coupon contenant la date de liquidation.
-COUPDAYSNC		= NB.JOURS.COUPON.SUIV		##	Renvoie le nombre de jours entre la date de liquidation et la date du coupon suivant la date de liquidation.
-COUPNCD			= DATE.COUPON.SUIV		##	Renvoie la première date de coupon ultérieure à la date de règlement.
-COUPNUM			= NB.COUPONS			##	Renvoie le nombre de coupons dus entre la date de règlement et la date d’échéance.
-COUPPCD			= DATE.COUPON.PREC		##	Renvoie la date de coupon précédant la date de règlement.
-CUMIPMT			= CUMUL.INTER			##	Renvoie l’intérêt cumulé payé sur un emprunt entre deux périodes.
-CUMPRINC		= CUMUL.PRINCPER		##	Renvoie le montant cumulé des remboursements du capital d’un emprunt effectués entre deux périodes.
-DB			= DB				##	Renvoie l’amortissement d’un bien pour une période spécifiée en utilisant la méthode de l’amortissement dégressif à taux fixe.
-DDB			= DDB				##	Renvoie l’amortissement d’un bien pour toute période spécifiée, en utilisant la méthode de l’amortissement dégressif à taux double ou selon un coefficient à spécifier.
-DISC			= TAUX.ESCOMPTE			##	Calcule le taux d’escompte d’une transaction.
-DOLLARDE		= PRIX.DEC			##	Convertit un prix en euros, exprimé sous forme de fraction, en un prix en euros exprimé sous forme de nombre décimal.
-DOLLARFR		= PRIX.FRAC			##	Convertit un prix en euros, exprimé sous forme de nombre décimal, en un prix en euros exprimé sous forme de fraction.
-DURATION		= DUREE				##	Renvoie la durée, en années, d’un titre dont l’intérêt est perçu périodiquement.
-EFFECT			= TAUX.EFFECTIF			##	Renvoie le taux d’intérêt annuel effectif.
-FV			= VC				##	Renvoie la valeur future d’un investissement.
-FVSCHEDULE		= VC.PAIEMENTS			##	Calcule la valeur future d’un investissement en appliquant une série de taux d’intérêt composites.
-INTRATE			= TAUX.INTERET			##	Affiche le taux d’intérêt d’un titre totalement investi.
-IPMT			= INTPER			##	Calcule le montant des intérêts d’un investissement pour une période donnée.
-IRR			= TRI				##	Calcule le taux de rentabilité interne d’un investissement pour une succession de trésoreries.
-ISPMT			= ISPMT				##	Calcule le montant des intérêts d’un investissement pour une période donnée.
-MDURATION		= DUREE.MODIFIEE		##	Renvoie la durée de Macauley modifiée pour un titre ayant une valeur nominale hypothétique de 100_euros.
-MIRR			= TRIM				##	Calcule le taux de rentabilité interne lorsque les paiements positifs et négatifs sont financés à des taux différents.
-NOMINAL			= TAUX.NOMINAL			##	Calcule le taux d’intérêt nominal annuel.
-NPER			= NPM				##	Renvoie le nombre de versements nécessaires pour rembourser un emprunt.
-NPV			= VAN				##	Calcule la valeur actuelle nette d’un investissement basé sur une série de décaissements et un taux d’escompte.
-ODDFPRICE		= PRIX.PCOUPON.IRREG		##	Renvoie le prix par tranche de valeur nominale de 100 euros d’un titre dont la première période de coupon est irrégulière.
-ODDFYIELD		= REND.PCOUPON.IRREG		##	Renvoie le taux de rendement d’un titre dont la première période de coupon est irrégulière.
-ODDLPRICE		= PRIX.DCOUPON.IRREG		##	Renvoie le prix par tranche de valeur nominale de 100 euros d’un titre dont la première période de coupon est irrégulière.
-ODDLYIELD		= REND.DCOUPON.IRREG		##	Renvoie le taux de rendement d’un titre dont la dernière période de coupon est irrégulière.
-PMT			= VPM				##	Calcule le paiement périodique d’un investissement donné.
-PPMT			= PRINCPER			##	Calcule, pour une période donnée, la part de remboursement du principal d’un investissement.
-PRICE			= PRIX.TITRE			##	Renvoie le prix d’un titre rapportant des intérêts périodiques, pour une valeur nominale de 100 euros.
-PRICEDISC		= VALEUR.ENCAISSEMENT		##	Renvoie la valeur d’encaissement d’un escompte commercial, pour une valeur nominale de 100 euros.
-PRICEMAT		= PRIX.TITRE.ECHEANCE		##	Renvoie le prix d’un titre dont la valeur nominale est 100 euros et qui rapporte des intérêts à l’échéance.
-PV			= PV				##	Calcule la valeur actuelle d’un investissement.
-RATE			= TAUX				##	Calcule le taux d’intérêt par période pour une annuité.
-RECEIVED		= VALEUR.NOMINALE		##	Renvoie la valeur nominale à échéance d’un effet de commerce.
-SLN			= AMORLIN			##	Calcule l’amortissement linéaire d’un bien pour une période donnée.
-SYD			= SYD				##	Calcule l’amortissement d’un bien pour une période donnée sur la base de la méthode américaine Sum-of-Years Digits (amortissement dégressif à taux décroissant appliqué à une valeur constante).
-TBILLEQ			= TAUX.ESCOMPTE.R		##	Renvoie le taux d’escompte rationnel d’un bon du Trésor.
-TBILLPRICE		= PRIX.BON.TRESOR		##	Renvoie le prix d’un bon du Trésor d’une valeur nominale de 100 euros.
-TBILLYIELD		= RENDEMENT.BON.TRESOR		##	Calcule le taux de rendement d’un bon du Trésor.
-VDB			= VDB				##	Renvoie l’amortissement d’un bien pour une période spécifiée ou partielle en utilisant une méthode de l’amortissement dégressif à taux fixe.
-XIRR			= TRI.PAIEMENTS			##	Calcule le taux de rentabilité interne d’un ensemble de paiements non périodiques.
-XNPV			= VAN.PAIEMENTS			##	Renvoie la valeur actuelle nette d’un ensemble de paiements non périodiques.
-YIELD			= RENDEMENT.TITRE		##	Calcule le rendement d’un titre rapportant des intérêts périodiquement.
-YIELDDISC		= RENDEMENT.SIMPLE		##	Calcule le taux de rendement d’un emprunt à intérêt simple (par exemple, un bon du Trésor).
-YIELDMAT		= RENDEMENT.TITRE.ECHEANCE	##	Renvoie le rendement annuel d’un titre qui rapporte des intérêts à l’échéance.
-
-
-##
-##	Information functions				Fonctions d’information
-##
-CELL			= CELLULE			##	Renvoie des informations sur la mise en forme, l’emplacement et le contenu d’une cellule.
-ERROR.TYPE		= TYPE.ERREUR			##	Renvoie un nombre correspondant à un type d’erreur.
-INFO			= INFORMATIONS			##	Renvoie des informations sur l’environnement d’exploitation actuel.
-ISBLANK			= ESTVIDE			##	Renvoie VRAI si l’argument valeur est vide.
-ISERR			= ESTERR			##	Renvoie VRAI si l’argument valeur fait référence à une valeur d’erreur, sauf #N/A.
-ISERROR			= ESTERREUR			##	Renvoie VRAI si l’argument valeur fait référence à une valeur d’erreur.
-ISEVEN			= EST.PAIR			##	Renvoie VRAI si le chiffre est pair.
-ISLOGICAL		= ESTLOGIQUE			##	Renvoie VRAI si l’argument valeur fait référence à une valeur logique.
-ISNA			= ESTNA				##	Renvoie VRAI si l’argument valeur fait référence à la valeur d’erreur #N/A.
-ISNONTEXT		= ESTNONTEXTE			##	Renvoie VRAI si l’argument valeur ne se présente pas sous forme de texte.
-ISNUMBER		= ESTNUM			##	Renvoie VRAI si l’argument valeur représente un nombre.
-ISODD			= EST.IMPAIR			##	Renvoie VRAI si le chiffre est impair.
-ISREF			= ESTREF			##	Renvoie VRAI si l’argument valeur est une référence.
-ISTEXT			= ESTTEXTE			##	Renvoie VRAI si l’argument valeur se présente sous forme de texte.
-N			= N				##	Renvoie une valeur convertie en nombre.
-NA			= NA				##	Renvoie la valeur d’erreur #N/A.
-TYPE			= TYPE				##	Renvoie un nombre indiquant le type de données d’une valeur.
-
-
-##
-##	Logical functions				Fonctions logiques
-##
-AND			= ET				##	Renvoie VRAI si tous ses arguments sont VRAI.
-FALSE			= FAUX				##	Renvoie la valeur logique FAUX.
-IF			= SI				##	Spécifie un test logique à effectuer.
-IFERROR			= SIERREUR			##	Renvoie une valeur que vous spécifiez si une formule génère une erreur ; sinon, elle renvoie le résultat de la formule.
-NOT			= NON				##	Inverse la logique de cet argument.
-OR			= OU				##	Renvoie VRAI si un des arguments est VRAI.
-TRUE			= VRAI				##	Renvoie la valeur logique VRAI.
-
-
-##
-##	Lookup and reference functions			Fonctions de recherche et de référence
-##
-ADDRESS			= ADRESSE			##	Renvoie une référence sous forme de texte à une seule cellule d’une feuille de calcul.
-AREAS			= ZONES				##	Renvoie le nombre de zones dans une référence.
-CHOOSE			= CHOISIR			##	Choisit une valeur dans une liste.
-COLUMN			= COLONNE			##	Renvoie le numéro de colonne d’une référence.
-COLUMNS			= COLONNES			##	Renvoie le nombre de colonnes dans une référence.
-HLOOKUP			= RECHERCHEH			##	Effectue une recherche dans la première ligne d’une matrice et renvoie la valeur de la cellule indiquée.
-HYPERLINK		= LIEN_HYPERTEXTE		##	Crée un raccourci ou un renvoi qui ouvre un document stocké sur un serveur réseau, sur un réseau Intranet ou sur Internet.
-INDEX			= INDEX				##	Utilise un index pour choisir une valeur provenant d’une référence ou d’une matrice.
-INDIRECT		= INDIRECT			##	Renvoie une référence indiquée par une valeur de texte.
-LOOKUP			= RECHERCHE			##	Recherche des valeurs dans un vecteur ou une matrice.
-MATCH			= EQUIV				##	Recherche des valeurs dans une référence ou une matrice.
-OFFSET			= DECALER			##	Renvoie une référence décalée par rapport à une référence donnée.
-ROW			= LIGNE				##	Renvoie le numéro de ligne d’une référence.
-ROWS			= LIGNES			##	Renvoie le nombre de lignes dans une référence.
-RTD			= RTD				##	Extrait les données en temps réel à partir d’un programme prenant en charge l’automation COM (Automation : utilisation des objets d'une application à partir d'une autre application ou d'un autre outil de développement. Autrefois appelée OLE Automation, Automation est une norme industrielle et une fonctionnalité du modèle d'objet COM (Component Object Model).).
-TRANSPOSE		= TRANSPOSE			##	Renvoie la transposition d’une matrice.
-VLOOKUP			= RECHERCHEV			##	Effectue une recherche dans la première colonne d’une matrice et se déplace sur la ligne pour renvoyer la valeur d’une cellule.
-
-
-##
-##	Math and trigonometry functions			Fonctions mathématiques et trigonométriques
-##
-ABS			= ABS				##	Renvoie la valeur absolue d’un nombre.
-ACOS			= ACOS				##	Renvoie l’arccosinus d’un nombre.
-ACOSH			= ACOSH				##	Renvoie le cosinus hyperbolique inverse d’un nombre.
-ASIN			= ASIN				##	Renvoie l’arcsinus d’un nombre.
-ASINH			= ASINH				##	Renvoie le sinus hyperbolique inverse d’un nombre.
-ATAN			= ATAN				##	Renvoie l’arctangente d’un nombre.
-ATAN2			= ATAN2				##	Renvoie l’arctangente des coordonnées x et y.
-ATANH			= ATANH				##	Renvoie la tangente hyperbolique inverse d’un nombre.
-CEILING			= PLAFOND			##	Arrondit un nombre au nombre entier le plus proche ou au multiple le plus proche de l’argument précision en s’éloignant de zéro.
-COMBIN			= COMBIN			##	Renvoie le nombre de combinaisons que l’on peut former avec un nombre donné d’objets.
-COS			= COS				##	Renvoie le cosinus d’un nombre.
-COSH			= COSH				##	Renvoie le cosinus hyperbolique d’un nombre.
-DEGREES			= DEGRES			##	Convertit des radians en degrés.
-EVEN			= PAIR				##	Arrondit un nombre au nombre entier pair le plus proche en s’éloignant de zéro.
-EXP			= EXP				##	Renvoie e élevé à la puissance d’un nombre donné.
-FACT			= FACT				##	Renvoie la factorielle d’un nombre.
-FACTDOUBLE		= FACTDOUBLE			##	Renvoie la factorielle double d’un nombre.
-FLOOR			= PLANCHER			##	Arrondit un nombre en tendant vers 0 (zéro).
-GCD			= PGCD				##	Renvoie le plus grand commun diviseur.
-INT			= ENT				##	Arrondit un nombre à l’entier immédiatement inférieur.
-LCM			= PPCM				##	Renvoie le plus petit commun multiple.
-LN			= LN				##	Renvoie le logarithme népérien d’un nombre.
-LOG			= LOG				##	Renvoie le logarithme d’un nombre dans la base spécifiée.
-LOG10			= LOG10				##	Calcule le logarithme en base 10 d’un nombre.
-MDETERM			= DETERMAT			##	Renvoie le déterminant d’une matrice.
-MINVERSE		= INVERSEMAT			##	Renvoie la matrice inverse d’une matrice.
-MMULT			= PRODUITMAT			##	Renvoie le produit de deux matrices.
-MOD			= MOD				##	Renvoie le reste d’une division.
-MROUND			= ARRONDI.AU.MULTIPLE		##	Donne l’arrondi d’un nombre au multiple spécifié.
-MULTINOMIAL		= MULTINOMIALE			##	Calcule la multinomiale d’un ensemble de nombres.
-ODD			= IMPAIR			##	Renvoie le nombre, arrondi à la valeur du nombre entier impair le plus proche en s’éloignant de zéro.
-PI			= PI				##	Renvoie la valeur de pi.
-POWER			= PUISSANCE			##	Renvoie la valeur du nombre élevé à une puissance.
-PRODUCT			= PRODUIT			##	Multiplie ses arguments.
-QUOTIENT		= QUOTIENT			##	Renvoie la partie entière du résultat d’une division.
-RADIANS			= RADIANS			##	Convertit des degrés en radians.
-RAND			= ALEA				##	Renvoie un nombre aléatoire compris entre 0 et 1.
-RANDBETWEEN		= ALEA.ENTRE.BORNES		##	Renvoie un nombre aléatoire entre les nombres que vous spécifiez.
-ROMAN			= ROMAIN			##	Convertit des chiffres arabes en chiffres romains, sous forme de texte.
-ROUND			= ARRONDI			##	Arrondit un nombre au nombre de chiffres indiqué.
-ROUNDDOWN		= ARRONDI.INF			##	Arrondit un nombre en tendant vers 0 (zéro).
-ROUNDUP			= ARRONDI.SUP			##	Arrondit un nombre à l’entier supérieur, en s’éloignant de zéro.
-SERIESSUM		= SOMME.SERIES			##	Renvoie la somme d’une série géométrique en s’appuyant sur la formule suivante :
-SIGN			= SIGNE				##	Renvoie le signe d’un nombre.
-SIN			= SIN				##	Renvoie le sinus d’un angle donné.
-SINH			= SINH				##	Renvoie le sinus hyperbolique d’un nombre.
-SQRT			= RACINE			##	Renvoie la racine carrée d’un nombre.
-SQRTPI			= RACINE.PI			##	Renvoie la racine carrée de (nombre * pi).
-SUBTOTAL		= SOUS.TOTAL			##	Renvoie un sous-total dans une liste ou une base de données.
-SUM			= SOMME				##	Calcule la somme de ses arguments.
-SUMIF			= SOMME.SI			##	Additionne les cellules spécifiées si elles répondent à un critère donné.
-SUMIFS			= SOMME.SI.ENS			##	Ajoute les cellules d’une plage qui répondent à plusieurs critères.
-SUMPRODUCT		= SOMMEPROD			##	Multiplie les valeurs correspondantes des matrices spécifiées et calcule la somme de ces produits.
-SUMSQ			= SOMME.CARRES			##	Renvoie la somme des carrés des arguments.
-SUMX2MY2		= SOMME.X2MY2			##	Renvoie la somme de la différence des carrés des valeurs correspondantes de deux matrices.
-SUMX2PY2		= SOMME.X2PY2			##	Renvoie la somme de la somme des carrés des valeurs correspondantes de deux matrices.
-SUMXMY2			= SOMME.XMY2			##	Renvoie la somme des carrés des différences entre les valeurs correspondantes de deux matrices.
-TAN			= TAN				##	Renvoie la tangente d’un nombre.
-TANH			= TANH				##	Renvoie la tangente hyperbolique d’un nombre.
-TRUNC			= TRONQUE			##	Renvoie la partie entière d’un nombre.
-
-
-##
-##	Statistical functions				Fonctions statistiques
-##
-AVEDEV			= ECART.MOYEN			##	Renvoie la moyenne des écarts absolus observés dans la moyenne des points de données.
-AVERAGE			= MOYENNE			##	Renvoie la moyenne de ses arguments.
-AVERAGEA		= AVERAGEA			##	Renvoie la moyenne de ses arguments, nombres, texte et valeurs logiques inclus.
-AVERAGEIF		= MOYENNE.SI			##	Renvoie la moyenne (arithmétique) de toutes les cellules d’une plage qui répondent à des critères donnés.
-AVERAGEIFS		= MOYENNE.SI.ENS		##	Renvoie la moyenne (arithmétique) de toutes les cellules qui répondent à plusieurs critères.
-BETADIST		= LOI.BETA			##	Renvoie la fonction de distribution cumulée.
-BETAINV			= BETA.INVERSE			##	Renvoie l’inverse de la fonction de distribution cumulée pour une distribution bêta spécifiée.
-BINOMDIST		= LOI.BINOMIALE			##	Renvoie la probabilité d’une variable aléatoire discrète suivant la loi binomiale.
-CHIDIST			= LOI.KHIDEUX			##	Renvoie la probabilité unilatérale de la distribution khi-deux.
-CHIINV			= KHIDEUX.INVERSE		##	Renvoie l’inverse de la probabilité unilatérale de la distribution khi-deux.
-CHITEST			= TEST.KHIDEUX			##	Renvoie le test d’indépendance.
-CONFIDENCE		= INTERVALLE.CONFIANCE		##	Renvoie l’intervalle de confiance pour une moyenne de population.
-CORREL			= COEFFICIENT.CORRELATION	##	Renvoie le coefficient de corrélation entre deux séries de données.
-COUNT			= NB				##	Détermine les nombres compris dans la liste des arguments.
-COUNTA			= NBVAL				##	Détermine le nombre de valeurs comprises dans la liste des arguments.
-COUNTBLANK		= NB.VIDE			##	Compte le nombre de cellules vides dans une plage.
-COUNTIF			= NB.SI				##	Compte le nombre de cellules qui répondent à un critère donné dans une plage.
-COUNTIFS		= NB.SI.ENS			##	Compte le nombre de cellules à l’intérieur d’une plage qui répondent à plusieurs critères.
-COVAR			= COVARIANCE			##	Renvoie la covariance, moyenne des produits des écarts pour chaque série d’observations.
-CRITBINOM		= CRITERE.LOI.BINOMIALE		##	Renvoie la plus petite valeur pour laquelle la distribution binomiale cumulée est inférieure ou égale à une valeur de critère.
-DEVSQ			= SOMME.CARRES.ECARTS		##	Renvoie la somme des carrés des écarts.
-EXPONDIST		= LOI.EXPONENTIELLE		##	Renvoie la distribution exponentielle.
-FDIST			= LOI.F				##	Renvoie la distribution de probabilité F.
-FINV			= INVERSE.LOI.F			##	Renvoie l’inverse de la distribution de probabilité F.
-FISHER			= FISHER			##	Renvoie la transformation de Fisher.
-FISHERINV		= FISHER.INVERSE		##	Renvoie l’inverse de la transformation de Fisher.
-FORECAST		= PREVISION			##	Calcule une valeur par rapport à une tendance linéaire.
-FREQUENCY		= FREQUENCE			##	Calcule la fréquence d’apparition des valeurs dans une plage de valeurs, puis renvoie des nombres sous forme de matrice verticale.
-FTEST			= TEST.F			##	Renvoie le résultat d’un test F.
-GAMMADIST		= LOI.GAMMA			##	Renvoie la probabilité d’une variable aléatoire suivant une loi Gamma.
-GAMMAINV		= LOI.GAMMA.INVERSE		##	Renvoie, pour une probabilité donnée, la valeur d’une variable aléatoire suivant une loi Gamma.
-GAMMALN			= LNGAMMA			##	Renvoie le logarithme népérien de la fonction Gamma, G(x)
-GEOMEAN			= MOYENNE.GEOMETRIQUE		##	Renvoie la moyenne géométrique.
-GROWTH			= CROISSANCE			##	Calcule des valeurs par rapport à une tendance exponentielle.
-HARMEAN			= MOYENNE.HARMONIQUE		##	Renvoie la moyenne harmonique.
-HYPGEOMDIST		= LOI.HYPERGEOMETRIQUE		##	Renvoie la probabilité d’une variable aléatoire discrète suivant une loi hypergéométrique.
-INTERCEPT		= ORDONNEE.ORIGINE		##	Renvoie l’ordonnée à l’origine d’une droite de régression linéaire.
-KURT			= KURTOSIS			##	Renvoie le kurtosis d’une série de données.
-LARGE			= GRANDE.VALEUR			##	Renvoie la k-ième plus grande valeur d’une série de données.
-LINEST			= DROITEREG			##	Renvoie les paramètres d’une tendance linéaire.
-LOGEST			= LOGREG			##	Renvoie les paramètres d’une tendance exponentielle.
-LOGINV			= LOI.LOGNORMALE.INVERSE	##	Renvoie l’inverse de la probabilité pour une variable aléatoire suivant la loi lognormale.
-LOGNORMDIST		= LOI.LOGNORMALE		##	Renvoie la probabilité d’une variable aléatoire continue suivant une loi lognormale.
-MAX			= MAX				##	Renvoie la valeur maximale contenue dans une liste d’arguments.
-MAXA			= MAXA				##	Renvoie la valeur maximale d’une liste d’arguments, nombres, texte et valeurs logiques inclus.
-MEDIAN			= MEDIANE			##	Renvoie la valeur médiane des nombres donnés.
-MIN			= MIN				##	Renvoie la valeur minimale contenue dans une liste d’arguments.
-MINA			= MINA				##	Renvoie la plus petite valeur d’une liste d’arguments, nombres, texte et valeurs logiques inclus.
-MODE			= MODE				##	Renvoie la valeur la plus courante d’une série de données.
-NEGBINOMDIST		= LOI.BINOMIALE.NEG		##	Renvoie la probabilité d’une variable aléatoire discrète suivant une loi binomiale négative.
-NORMDIST		= LOI.NORMALE			##	Renvoie la probabilité d’une variable aléatoire continue suivant une loi normale.
-NORMINV			= LOI.NORMALE.INVERSE		##	Renvoie, pour une probabilité donnée, la valeur d’une variable aléatoire suivant une loi normale standard.
-NORMSDIST		= LOI.NORMALE.STANDARD		##	Renvoie la probabilité d’une variable aléatoire continue suivant une loi normale standard.
-NORMSINV		= LOI.NORMALE.STANDARD.INVERSE	##	Renvoie l’inverse de la distribution cumulée normale standard.
-PEARSON			= PEARSON			##	Renvoie le coefficient de corrélation d’échantillonnage de Pearson.
-PERCENTILE		= CENTILE			##	Renvoie le k-ième centile des valeurs d’une plage.
-PERCENTRANK		= RANG.POURCENTAGE		##	Renvoie le rang en pourcentage d’une valeur d’une série de données.
-PERMUT			= PERMUTATION			##	Renvoie le nombre de permutations pour un nombre donné d’objets.
-POISSON			= LOI.POISSON			##	Renvoie la probabilité d’une variable aléatoire suivant une loi de Poisson.
-PROB			= PROBABILITE			##	Renvoie la probabilité que des valeurs d’une plage soient comprises entre deux limites.
-QUARTILE		= QUARTILE			##	Renvoie le quartile d’une série de données.
-RANK			= RANG				##	Renvoie le rang d’un nombre contenu dans une liste.
-RSQ			= COEFFICIENT.DETERMINATION	##	Renvoie la valeur du coefficient de détermination R^2 d’une régression linéaire.
-SKEW			= COEFFICIENT.ASYMETRIE		##	Renvoie l’asymétrie d’une distribution.
-SLOPE			= PENTE				##	Renvoie la pente d’une droite de régression linéaire.
-SMALL			= PETITE.VALEUR			##	Renvoie la k-ième plus petite valeur d’une série de données.
-STANDARDIZE		= CENTREE.REDUITE		##	Renvoie une valeur centrée réduite.
-STDEV			= ECARTYPE			##	Évalue l’écart type d’une population en se basant sur un échantillon de cette population.
-STDEVA			= STDEVA			##	Évalue l’écart type d’une population en se basant sur un échantillon de cette population, nombres, texte et valeurs logiques inclus.
-STDEVP			= ECARTYPEP			##	Calcule l’écart type d’une population à partir de la population entière.
-STDEVPA			= STDEVPA			##	Calcule l’écart type d’une population à partir de l’ensemble de la population, nombres, texte et valeurs logiques inclus.
-STEYX			= ERREUR.TYPE.XY		##	Renvoie l’erreur type de la valeur y prévue pour chaque x de la régression.
-TDIST			= LOI.STUDENT			##	Renvoie la probabilité d’une variable aléatoire suivant une loi T de Student.
-TINV			= LOI.STUDENT.INVERSE		##	Renvoie, pour une probabilité donnée, la valeur d’une variable aléatoire suivant une loi T de Student.
-TREND			= TENDANCE			##	Renvoie des valeurs par rapport à une tendance linéaire.
-TRIMMEAN		= MOYENNE.REDUITE		##	Renvoie la moyenne de l’intérieur d’une série de données.
-TTEST			= TEST.STUDENT			##	Renvoie la probabilité associée à un test T de Student.
-VAR			= VAR				##	Calcule la variance sur la base d’un échantillon.
-VARA			= VARA				##	Estime la variance d’une population en se basant sur un échantillon de cette population, nombres, texte et valeurs logiques incluses.
-VARP			= VAR.P				##	Calcule la variance sur la base de l’ensemble de la population.
-VARPA			= VARPA				##	Calcule la variance d’une population en se basant sur la population entière, nombres, texte et valeurs logiques inclus.
-WEIBULL			= LOI.WEIBULL			##	Renvoie la probabilité d’une variable aléatoire suivant une loi de Weibull.
-ZTEST			= TEST.Z			##	Renvoie la valeur de probabilité unilatérale d’un test z.
-
-
-##
-##	Text functions					Fonctions de texte
-##
-ASC			= ASC				##	Change les caractères anglais ou katakana à pleine chasse (codés sur deux octets) à l’intérieur d’une chaîne de caractères en caractères à demi-chasse (codés sur un octet).
-BAHTTEXT		= BAHTTEXT			##	Convertit un nombre en texte en utilisant le format monétaire ß (baht).
-CHAR			= CAR				##	Renvoie le caractère spécifié par le code numérique.
-CLEAN			= EPURAGE			##	Supprime tous les caractères de contrôle du texte.
-CODE			= CODE				##	Renvoie le numéro de code du premier caractère du texte.
-CONCATENATE		= CONCATENER			##	Assemble plusieurs éléments textuels de façon à n’en former qu’un seul.
-DOLLAR			= EURO				##	Convertit un nombre en texte en utilisant le format monétaire € (euro).
-EXACT			= EXACT				##	Vérifie si deux valeurs de texte sont identiques.
-FIND			= TROUVE			##	Trouve un valeur textuelle dans une autre, en respectant la casse.
-FINDB			= TROUVERB			##	Trouve un valeur textuelle dans une autre, en respectant la casse.
-FIXED			= CTXT				##	Convertit un nombre au format texte avec un nombre de décimales spécifié.
-JIS			= JIS				##	Change les caractères anglais ou katakana à demi-chasse (codés sur un octet) à l’intérieur d’une chaîne de caractères en caractères à à pleine chasse (codés sur deux octets).
-LEFT			= GAUCHE			##	Renvoie des caractères situés à l’extrême gauche d’une chaîne de caractères.
-LEFTB			= GAUCHEB			##	Renvoie des caractères situés à l’extrême gauche d’une chaîne de caractères.
-LEN			= NBCAR				##	Renvoie le nombre de caractères contenus dans une chaîne de texte.
-LENB			= LENB				##	Renvoie le nombre de caractères contenus dans une chaîne de texte.
-LOWER			= MINUSCULE			##	Convertit le texte en minuscules.
-MID			= STXT				##	Renvoie un nombre déterminé de caractères d’une chaîne de texte à partir de la position que vous indiquez.
-MIDB			= STXTB				##	Renvoie un nombre déterminé de caractères d’une chaîne de texte à partir de la position que vous indiquez.
-PHONETIC		= PHONETIQUE			##	Extrait les caractères phonétiques (furigana) d’une chaîne de texte.
-PROPER			= NOMPROPRE			##	Met en majuscules la première lettre de chaque mot dans une chaîne textuelle.
-REPLACE			= REMPLACER			##	Remplace des caractères dans un texte.
-REPLACEB		= REMPLACERB			##	Remplace des caractères dans un texte.
-REPT			= REPT				##	Répète un texte un certain nombre de fois.
-RIGHT			= DROITE			##	Renvoie des caractères situés à l’extrême droite d’une chaîne de caractères.
-RIGHTB			= DROITEB			##	Renvoie des caractères situés à l’extrême droite d’une chaîne de caractères.
-SEARCH			= CHERCHE			##	Trouve un texte dans un autre texte (sans respecter la casse).
-SEARCHB			= CHERCHERB			##	Trouve un texte dans un autre texte (sans respecter la casse).
-SUBSTITUTE		= SUBSTITUE			##	Remplace l’ancien texte d’une chaîne de caractères par un nouveau.
-T			= T				##	Convertit ses arguments en texte.
-TEXT			= TEXTE				##	Convertit un nombre au format texte.
-TRIM			= SUPPRESPACE			##	Supprime les espaces du texte.
-UPPER			= MAJUSCULE			##	Convertit le texte en majuscules.
-VALUE			= CNUM				##	Convertit un argument textuel en nombre
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/config
deleted file mode 100644
index dec7cbde15d..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= Ft
-
-
-##
-##	Excel Error Codes	(For future use)
-##
-NULL	= #NULLA!
-DIV0	= #ZÉRÓOSZTÓ!
-VALUE	= #ÉRTÉK!
-REF	= #HIV!
-NAME	= #NÉV?
-NUM	= #SZÁM!
-NA	= #HIÁNYZIK
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
deleted file mode 100644
index 4abce13b91b..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
+++ /dev/null
@@ -1,438 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Calculation
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
-##
-##
-
-
-##
-##	Add-in and Automation functions			Bővítmények és automatizálási függvények
-##
-GETPIVOTDATA		= KIMUTATÁSADATOT.VESZ		##	A kimutatásokban tárolt adatok visszaadására használható.
-
-
-##
-##	Cube functions Kockafüggvények   
-##
-CUBEKPIMEMBER		= KOCKA.FŐTELJMUT		##	Egy fő teljesítménymutató (KPI) nevét, tulajdonságát és mértékegységét adja eredményül, a nevet és a tulajdonságot megjeleníti a cellában. A KPI-k számszerűsíthető mérési lehetőséget jelentenek – ilyen mutató például a havi bruttó nyereség vagy az egy alkalmazottra jutó negyedéves forgalom –, egy szervezet teljesítményének nyomonkövetésére használhatók.
-CUBEMEMBER		= KOCKA.TAG			##	Kockahierachia tagját vagy rekordját adja eredményül. Ellenőrizhető vele, hogy szerepel-e a kockában az adott tag vagy rekord.
-CUBEMEMBERPROPERTY	= KOCKA.TAG.TUL			##	A kocka egyik tagtulajdonságának értékét adja eredményül. Használatával ellenőrizhető, hogy szerepel-e egy tagnév a kockában, eredménye pedig az erre a tagra vonatkozó, megadott tulajdonság.
-CUBERANKEDMEMBER	= KOCKA.HALM.ELEM		##	Egy halmaz rangsor szerinti n-edik tagját adja eredményül. Használatával egy halmaz egy vagy több elemét kaphatja meg, például a legnagyobb teljesítményű üzletkötőt vagy a 10 legjobb tanulót.
-CUBESET			= KOCKA.HALM			##	Számított tagok vagy rekordok halmazát adja eredményül, ehhez egy beállított kifejezést elküld a kiszolgálón található kockának, majd ezt a halmazt adja vissza a Microsoft Office Excel alkalmazásnak.
-CUBESETCOUNT		= KOCKA.HALM.DB			##	Egy halmaz elemszámát adja eredményül.
-CUBEVALUE		= KOCKA.ÉRTÉK			##	Kockából összesített értéket ad eredményül.
-
-
-##
-##	Database functions				Adatbázis-kezelő függvények
-##
-DAVERAGE		= AB.ÁTLAG			##	A kijelölt adatbáziselemek átlagát számítja ki.
-DCOUNT			= AB.DARAB			##	Megszámolja, hogy az adatbázisban hány cella tartalmaz számokat.
-DCOUNTA			= AB.DARAB2			##	Megszámolja az adatbázisban lévő nem üres cellákat.
-DGET			= AB.MEZŐ			##	Egy adatbázisból egyetlen olyan rekordot ad vissza, amely megfelel a megadott feltételeknek.
-DMAX			= AB.MAX			##	A kiválasztott adatbáziselemek közül a legnagyobb értéket adja eredményül.
-DMIN			= AB.MIN			##	A kijelölt adatbáziselemek közül a legkisebb értéket adja eredményül.
-DPRODUCT		= AB.SZORZAT			##	Az adatbázis megadott feltételeknek eleget tevő rekordjaira összeszorozza a megadott mezőben található számértékeket, és eredményül ezt a szorzatot adja.
-DSTDEV			= AB.SZÓRÁS			##	A kijelölt adatbáziselemek egy mintája alapján megbecsüli a szórást.
-DSTDEVP			= AB.SZÓRÁS2			##	A kijelölt adatbáziselemek teljes sokasága alapján kiszámítja a szórást.
-DSUM			= AB.SZUM			##	Összeadja a feltételnek megfelelő adatbázisrekordok mezőoszlopában a számokat.
-DVAR			= AB.VAR			##	A kijelölt adatbáziselemek mintája alapján becslést ad a szórásnégyzetre.
-DVARP			= AB.VAR2			##	A kijelölt adatbáziselemek teljes sokasága alapján kiszámítja a szórásnégyzetet.
-
-
-##
-##	Date and time functions				Dátumfüggvények
-##
-DATE			= DÁTUM				##	Adott dátum dátumértékét adja eredményül.
-DATEVALUE		= DÁTUMÉRTÉK			##	Szövegként megadott dátumot dátumértékké alakít át.
-DAY			= NAP				##	Dátumértéket a hónap egy napjává (0-31) alakít.
-DAYS360			= NAP360			##	Két dátum közé eső napok számát számítja ki a 360 napos év alapján.
-EDATE			= EDATE				##	Adott dátumnál adott számú hónappal korábbi vagy későbbi dátum dátumértékét adja eredményül.
-EOMONTH			= EOMONTH			##	Adott dátumnál adott számú hónappal korábbi vagy későbbi hónap utolsó napjának dátumértékét adja eredményül.
-HOUR			= ÓRA				##	Időértéket órákká alakít.
-MINUTE			= PERC				##	Időértéket percekké alakít.
-MONTH			= HÓNAP				##	Időértéket hónapokká alakít.
-NETWORKDAYS		= NETWORKDAYS			##	Két dátum között a teljes munkanapok számát adja meg.
-NOW			= MOST				##	A napi dátum dátumértékét és a pontos idő időértékét adja eredményül.
-SECOND			= MPERC				##	Időértéket másodpercekké alakít át.
-TIME			= IDŐ				##	Adott időpont időértékét adja meg.
-TIMEVALUE		= IDŐÉRTÉK			##	Szövegként megadott időpontot időértékké alakít át.
-TODAY			= MA				##	A napi dátum dátumértékét adja eredményül.
-WEEKDAY			= HÉT.NAPJA			##	Dátumértéket a hét napjává alakítja át.
-WEEKNUM			= WEEKNUM			##	Visszatérési értéke egy szám, amely azt mutatja meg, hogy a megadott dátum az év hányadik hetére esik.
-WORKDAY			= WORKDAY			##	Adott dátumnál adott munkanappal korábbi vagy későbbi dátum dátumértékét adja eredményül.
-YEAR			= ÉV				##	Sorszámot évvé alakít át.
-YEARFRAC		= YEARFRAC			##	Az adott dátumok közötti teljes napok számát törtévként adja meg.
-
-
-##
-##	Engineering functions				Mérnöki függvények
-##
-BESSELI			= BESSELI			##	Az In(x) módosított Bessel-függvény értékét adja eredményül.
-BESSELJ			= BESSELJ			##	A Jn(x) Bessel-függvény értékét adja eredményül.
-BESSELK			= BESSELK			##	A Kn(x) módosított Bessel-függvény értékét adja eredményül.
-BESSELY			= BESSELY			##	Az Yn(x) módosított Bessel-függvény értékét adja eredményül.
-BIN2DEC			= BIN2DEC			##	Bináris számot decimálissá alakít át.
-BIN2HEX			= BIN2HEX			##	Bináris számot hexadecimálissá alakít át.
-BIN2OCT			= BIN2OCT			##	Bináris számot oktálissá alakít át.
-COMPLEX			= COMPLEX			##	Valós és képzetes részből komplex számot képez.
-CONVERT			= CONVERT			##	Mértékegységeket vált át.
-DEC2BIN			= DEC2BIN			##	Decimális számot binárissá alakít át.
-DEC2HEX			= DEC2HEX			##	Decimális számot hexadecimálissá alakít át.
-DEC2OCT			= DEC2OCT			##	Decimális számot oktálissá alakít át.
-DELTA			= DELTA				##	Azt vizsgálja, hogy két érték egyenlő-e.
-ERF			= ERF				##	A hibafüggvény értékét adja eredményül.
-ERFC			= ERFC				##	A kiegészített hibafüggvény értékét adja eredményül.
-GESTEP			= GESTEP			##	Azt vizsgálja, hogy egy szám nagyobb-e adott küszöbértéknél.
-HEX2BIN			= HEX2BIN			##	Hexadecimális számot binárissá alakít át.
-HEX2DEC			= HEX2DEC			##	Hexadecimális számot decimálissá alakít át.
-HEX2OCT			= HEX2OCT			##	Hexadecimális számot oktálissá alakít át.
-IMABS			= IMABS				##	Komplex szám abszolút értékét (modulusát) adja eredményül.
-IMAGINARY		= IMAGINARY			##	Komplex szám képzetes részét adja eredményül.
-IMARGUMENT		= IMARGUMENT			##	A komplex szám radiánban kifejezett théta argumentumát adja eredményül.
-IMCONJUGATE		= IMCONJUGATE			##	Komplex szám komplex konjugáltját adja eredményül.
-IMCOS			= IMCOS				##	Komplex szám koszinuszát adja eredményül.
-IMDIV			= IMDIV				##	Két komplex szám hányadosát adja eredményül.
-IMEXP			= IMEXP				##	Az e szám komplex kitevőjű hatványát adja eredményül.
-IMLN			= IMLN				##	Komplex szám természetes logaritmusát adja eredményül.
-IMLOG10			= IMLOG10			##	Komplex szám tízes alapú logaritmusát adja eredményül.
-IMLOG2			= IMLOG2			##	Komplex szám kettes alapú logaritmusát adja eredményül.
-IMPOWER			= IMPOWER			##	Komplex szám hatványát adja eredményül.
-IMPRODUCT		= IMPRODUCT			##	Komplex számok szorzatát adja eredményül.
-IMREAL			= IMREAL			##	Komplex szám valós részét adja eredményül.
-IMSIN			= IMSIN				##	Komplex szám szinuszát adja eredményül.
-IMSQRT			= IMSQRT			##	Komplex szám négyzetgyökét adja eredményül.
-IMSUB			= IMSUB				##	Két komplex szám különbségét adja eredményül.
-IMSUM			= IMSUM				##	Komplex számok összegét adja eredményül.
-OCT2BIN			= OCT2BIN			##	Oktális számot binárissá alakít át.
-OCT2DEC			= OCT2DEC			##	Oktális számot decimálissá alakít át.
-OCT2HEX			= OCT2HEX			##	Oktális számot hexadecimálissá alakít át.
-
-
-##
-##	Financial functions				Pénzügyi függvények
-##
-ACCRINT			= ACCRINT			##	Periodikusan kamatozó értékpapír felszaporodott kamatát adja eredményül.
-ACCRINTM		= ACCRINTM			##	Lejáratkor kamatozó értékpapír felszaporodott kamatát adja eredményül.
-AMORDEGRC		= AMORDEGRC			##	Állóeszköz lineáris értékcsökkenését adja meg az egyes könyvelési időszakokra vonatkozóan.
-AMORLINC		= AMORLINC			##	Az egyes könyvelési időszakokban az értékcsökkenést adja meg.
-COUPDAYBS		= COUPDAYBS			##	A szelvényidőszak kezdetétől a kifizetés időpontjáig eltelt napokat adja vissza.
-COUPDAYS		= COUPDAYS			##	A kifizetés időpontját magában foglaló szelvényperiódus hosszát adja meg napokban.
-COUPDAYSNC		= COUPDAYSNC			##	A kifizetés időpontja és a legközelebbi szelvénydátum közötti napok számát adja meg.
-COUPNCD			= COUPNCD			##	A kifizetést követő legelső szelvénydátumot adja eredményül.
-COUPNUM			= COUPNUM			##	A kifizetés és a lejárat időpontja között kifizetendő szelvények számát adja eredményül.
-COUPPCD			= COUPPCD			##	A kifizetés előtti utolsó szelvénydátumot adja eredményül.
-CUMIPMT			= CUMIPMT			##	Két fizetési időszak között kifizetett kamat halmozott értékét adja eredményül.
-CUMPRINC		= CUMPRINC			##	Két fizetési időszak között kifizetett részletek halmozott (kamatot nem tartalmazó) értékét adja eredményül.
-DB			= KCS2				##	Eszköz adott időszak alatti értékcsökkenését számítja ki a lineáris leírási modell alkalmazásával.
-DDB			= KCSA				##	Eszköz értékcsökkenését számítja ki adott időszakra vonatkozóan a progresszív vagy egyéb megadott leírási modell alkalmazásával.
-DISC			= DISC				##	Értékpapír leszámítolási kamatlábát adja eredményül.
-DOLLARDE		= DOLLARDE			##	Egy közönséges törtként megadott számot tizedes törtté alakít át.
-DOLLARFR		= DOLLARFR			##	Tizedes törtként megadott számot közönséges törtté alakít át.
-DURATION		= DURATION			##	Periodikus kamatfizetésű értékpapír éves kamatérzékenységét adja eredményül.
-EFFECT			= EFFECT			##	Az éves tényleges kamatláb értékét adja eredményül.
-FV			= JBÉ				##	Befektetés jövőbeli értékét számítja ki.
-FVSCHEDULE		= FVSCHEDULE			##	A kezdőtőke adott kamatlábak szerint megnövelt jövőbeli értékét adja eredményül.
-INTRATE			= INTRATE			##	A lejáratig teljesen lekötött értékpapír kamatrátáját adja eredményül.
-IPMT			= RRÉSZLET			##	Hiteltörlesztésen belül a tőketörlesztés nagyságát számítja ki adott időszakra.
-IRR			= BMR				##	A befektetés belső megtérülési rátáját számítja ki pénzáramláshoz.
-ISPMT			= LRÉSZLETKAMAT			##	A befektetés adott időszakára fizetett kamatot számítja ki.
-MDURATION		= MDURATION			##	Egy 100 Ft névértékű értékpapír Macauley-féle módosított kamatérzékenységét adja eredményül.
-MIRR			= MEGTÉRÜLÉS			##	A befektetés belső megtérülési rátáját számítja ki a költségek és a bevételek különböző kamatlába mellett.
-NOMINAL			= NOMINAL			##	Az éves névleges kamatláb értékét adja eredményül.
-NPER			= PER.SZÁM			##	A törlesztési időszakok számát adja meg.
-NPV			= NMÉ				##	Befektetéshez kapcsolódó pénzáramlás nettó jelenértékét számítja ki ismert pénzáramlás és kamatláb mellett.
-ODDFPRICE		= ODDFPRICE			##	Egy 100 Ft névértékű, a futamidő elején töredék-időszakos értékpapír árát adja eredményül.
-ODDFYIELD		= ODDFYIELD			##	A futamidő elején töredék-időszakos értékpapír hozamát adja eredményül.
-ODDLPRICE		= ODDLPRICE			##	Egy 100 Ft névértékű, a futamidő végén töredék-időszakos értékpapír árát adja eredményül.
-ODDLYIELD		= ODDLYIELD			##	A futamidő végén töredék-időszakos értékpapír hozamát adja eredményül.
-PMT			= RÉSZLET			##	A törlesztési időszakra vonatkozó törlesztési összeget számítja ki.
-PPMT			= PRÉSZLET			##	Hiteltörlesztésen belül a tőketörlesztés nagyságát számítja ki adott időszakra.
-PRICE			= PRICE				##	Egy 100 Ft névértékű, periodikusan kamatozó értékpapír árát adja eredményül.
-PRICEDISC		= PRICEDISC			##	Egy 100 Ft névértékű leszámítolt értékpapír árát adja eredményül.
-PRICEMAT		= PRICEMAT			##	Egy 100 Ft névértékű, a lejáratkor kamatozó értékpapír árát adja eredményül.
-PV			= MÉ				##	Befektetés jelenlegi értékét számítja ki.
-RATE			= RÁTA				##	Egy törlesztési időszakban az egy időszakra eső kamatláb nagyságát számítja ki.
-RECEIVED		= RECEIVED			##	A lejáratig teljesen lekötött értékpapír lejáratakor kapott összegét adja eredményül.
-SLN			= LCSA				##	Tárgyi eszköz egy időszakra eső amortizációját adja meg bruttó érték szerinti lineáris leírási kulcsot alkalmazva.
-SYD			= SYD				##	Tárgyi eszköz értékcsökkenését számítja ki adott időszakra az évek számjegyösszegével dolgozó módszer alapján.
-TBILLEQ			= TBILLEQ			##	Kincstárjegy kötvény-egyenértékű hozamát adja eredményül.
-TBILLPRICE		= TBILLPRICE			##	Egy 100 Ft névértékű kincstárjegy árát adja eredményül.
-TBILLYIELD		= TBILLYIELD			##	Kincstárjegy hozamát adja eredményül.
-VDB			= ÉCSRI				##	Tárgyi eszköz amortizációját számítja ki megadott vagy részidőszakra a csökkenő egyenleg módszerének alkalmazásával.
-XIRR			= XIRR				##	Ütemezett készpénzforgalom (cash flow) belső megtérülési kamatrátáját adja eredményül.
-XNPV			= XNPV				##	Ütemezett készpénzforgalom (cash flow) nettó jelenlegi értékét adja eredményül.
-YIELD			= YIELD				##	Periodikusan kamatozó értékpapír hozamát adja eredményül.
-YIELDDISC		= YIELDDISC			##	Leszámítolt értékpapír (például kincstárjegy) éves hozamát adja eredményül.
-YIELDMAT		= YIELDMAT			##	Lejáratkor kamatozó értékpapír éves hozamát adja eredményül.
-
-
-##
-##	Information functions				Információs függvények
-##
-CELL			= CELLA				##	Egy cella formátumára, elhelyezkedésére vagy tartalmára vonatkozó adatokat ad eredményül.
-ERROR.TYPE		= HIBA.TÍPUS			##	Egy hibatípushoz tartozó számot ad eredményül.
-INFO			= INFÓ				##	A rendszer- és munkakörnyezet pillanatnyi állapotáról ad felvilágosítást.
-ISBLANK			= ÜRES				##	Eredménye IGAZ, ha az érték üres.
-ISERR			= HIBA				##	Eredménye IGAZ, ha az érték valamelyik hibaérték a #HIÁNYZIK kivételével.
-ISERROR			= HIBÁS				##	Eredménye IGAZ, ha az érték valamelyik hibaérték.
-ISEVEN			= ISEVEN			##	Eredménye IGAZ, ha argumentuma páros szám.
-ISLOGICAL		= LOGIKAI			##	Eredménye IGAZ, ha az érték logikai érték.
-ISNA			= NINCS				##	Eredménye IGAZ, ha az érték a #HIÁNYZIK hibaérték.
-ISNONTEXT		= NEM.SZÖVEG			##	Eredménye IGAZ, ha az érték nem szöveg.
-ISNUMBER		= SZÁM				##	Eredménye IGAZ, ha az érték szám.
-ISODD			= ISODD				##	Eredménye IGAZ, ha argumentuma páratlan szám.
-ISREF			= HIVATKOZÁS			##	Eredménye IGAZ, ha az érték hivatkozás.
-ISTEXT			= SZÖVEG.E			##	Eredménye IGAZ, ha az érték szöveg.
-N			= N				##	Argumentumának értékét számmá alakítja.
-NA			= HIÁNYZIK			##	Eredménye a #HIÁNYZIK hibaérték.
-TYPE			= TÍPUS				##	Érték adattípusának azonosítószámát adja eredményül.
-
-
-##
-##	Logical functions				Logikai függvények
-##
-AND			= ÉS				##	Eredménye IGAZ, ha minden argumentuma IGAZ.
-FALSE			= HAMIS				##	A HAMIS logikai értéket adja eredményül.
-IF			= HA				##	Logikai vizsgálatot hajt végre.
-IFERROR			= HAHIBA			##	A megadott értéket adja vissza, ha egy képlet hibához vezet; más esetben a képlet értékét adja eredményül.
-NOT			= NEM				##	Argumentuma értékének ellentettjét adja eredményül.
-OR			= VAGY				##	Eredménye IGAZ, ha bármely argumentuma IGAZ.
-TRUE			= IGAZ				##	Az IGAZ logikai értéket adja eredményül.
-
-
-##
-##	Lookup and reference functions			Keresési és hivatkozási függvények
-##
-ADDRESS			= CÍM				##	A munkalap egy cellájára való hivatkozást adja szövegként eredményül.
-AREAS			= TERÜLET			##	Hivatkozásban a területek számát adja eredményül.
-CHOOSE			= VÁLASZT			##	Értékek listájából választ ki egy elemet.
-COLUMN			= OSZLOP			##	Egy hivatkozás oszlopszámát adja eredményül.
-COLUMNS			= OSZLOPOK			##	A hivatkozásban található oszlopok számát adja eredményül.
-HLOOKUP			= VKERES			##	A megadott tömb felső sorában adott értékű elemet keres, és a megtalált elem oszlopából adott sorban elhelyezkedő értékkel tér vissza.
-HYPERLINK		= HIPERHIVATKOZÁS		##	Hálózati kiszolgálón, intraneten vagy az interneten tárolt dokumentumot megnyitó parancsikont vagy hivatkozást hoz létre.
-INDEX			= INDEX				##	Tömb- vagy hivatkozás indexszel megadott értékét adja vissza.
-INDIRECT		= INDIREKT			##	Szöveg megadott hivatkozást ad eredményül.
-LOOKUP			= KERES				##	Vektorban vagy tömbben keres meg értékeket.
-MATCH			= HOL.VAN			##	Hivatkozásban vagy tömbben értékeket keres.
-OFFSET			= OFSZET			##	Hivatkozás egy másik hivatkozástól számított távolságát adja meg.
-ROW			= SOR				##	Egy hivatkozás sorának számát adja meg.
-ROWS			= SOROK				##	Egy hivatkozás sorainak számát adja meg.
-RTD			= RTD				##	Valós idejű adatokat keres vissza a COM automatizmust (automatizálás: Egy alkalmazás objektumaival való munka másik alkalmazásból vagy fejlesztőeszközből. A korábban OLE automatizmusnak nevezett automatizálás iparági szabvány, a Component Object Model (COM) szolgáltatása.) támogató programból.
-TRANSPOSE		= TRANSZPONÁLÁS			##	Egy tömb transzponáltját adja eredményül.
-VLOOKUP			= FKERES			##	A megadott tömb bal szélső oszlopában megkeres egy értéket, majd annak sora és a megadott oszlop metszéspontjában levő értéked adja eredményül.
-
-
-##
-##	Math and trigonometry functions			Matematikai és trigonometrikus függvények
-##
-ABS			= ABS				##	Egy szám abszolút értékét adja eredményül.
-ACOS			= ARCCOS			##	Egy szám arkusz koszinuszát számítja ki.
-ACOSH			= ACOSH				##	Egy szám inverz koszinusz hiperbolikuszát számítja ki.
-ASIN			= ARCSIN			##	Egy szám arkusz szinuszát számítja ki.
-ASINH			= ASINH				##	Egy szám inverz szinusz hiperbolikuszát számítja ki.
-ATAN			= ARCTAN			##	Egy szám arkusz tangensét számítja ki.
-ATAN2			= ARCTAN2			##	X és y koordináták alapján számítja ki az arkusz tangens értéket.
-ATANH			= ATANH				##	A szám inverz tangens hiperbolikuszát számítja ki.
-CEILING			= PLAFON			##	Egy számot a legközelebbi egészre vagy a pontosságként megadott érték legközelebb eső többszörösére kerekít.
-COMBIN			= KOMBINÁCIÓK			##	Adott számú objektum összes lehetséges kombinációinak számát számítja ki.
-COS			= COS				##	Egy szám koszinuszát számítja ki.
-COSH			= COSH				##	Egy szám koszinusz hiperbolikuszát számítja ki.
-DEGREES			= FOK				##	Radiánt fokká alakít át.
-EVEN			= PÁROS				##	Egy számot a legközelebbi páros egész számra kerekít.
-EXP			= KITEVŐ			##	Az e adott kitevőjű hatványát adja eredményül.
-FACT			= FAKT				##	Egy szám faktoriálisát számítja ki.
-FACTDOUBLE		= FACTDOUBLE			##	Egy szám dupla faktoriálisát adja eredményül.
-FLOOR			= PADLÓ				##	Egy számot lefelé, a nulla felé kerekít.
-GCD			= GCD				##	A legnagyobb közös osztót adja eredményül.
-INT			= INT				##	Egy számot lefelé kerekít a legközelebbi egészre.
-LCM			= LCM				##	A legkisebb közös többszöröst adja eredményül.
-LN			= LN				##	Egy szám természetes logaritmusát számítja ki.
-LOG			= LOG				##	Egy szám adott alapú logaritmusát számítja ki.
-LOG10			= LOG10				##	Egy szám 10-es alapú logaritmusát számítja ki.
-MDETERM			= MDETERM			##	Egy tömb mátrix-determinánsát számítja ki.
-MINVERSE		= INVERZ.MÁTRIX			##	Egy tömb mátrix inverzét adja eredményül.
-MMULT			= MSZORZAT			##	Két tömb mátrix-szorzatát adja meg.
-MOD			= MARADÉK			##	Egy szám osztási maradékát adja eredményül.
-MROUND			= MROUND			##	A kívánt többszörösére kerekített értéket ad eredményül.
-MULTINOMIAL		= MULTINOMIAL			##	Számhalmaz multinomiálisát adja eredményül.
-ODD			= PÁRATLAN			##	Egy számot a legközelebbi páratlan számra kerekít.
-PI			= PI				##	A pi matematikai állandót adja vissza.
-POWER			= HATVÁNY			##	Egy szám adott kitevőjű hatványát számítja ki.
-PRODUCT			= SZORZAT			##	Argumentumai szorzatát számítja ki.
-QUOTIENT		= QUOTIENT			##	Egy hányados egész részét adja eredményül.
-RADIANS			= RADIÁN			##	Fokot radiánná alakít át.
-RAND			= VÉL				##	Egy 0 és 1 közötti véletlen számot ad eredményül.
-RANDBETWEEN		= RANDBETWEEN			##	Megadott számok közé eső véletlen számot állít elő.
-ROMAN			= RÓMAI				##	Egy számot római számokkal kifejezve szövegként ad eredményül.
-ROUND			= KEREKÍTÉS			##	Egy számot adott számú számjegyre kerekít.
-ROUNDDOWN		= KEREKÍTÉS.LE			##	Egy számot lefelé, a nulla felé kerekít.
-ROUNDUP			= KEREKÍTÉS.FEL			##	Egy számot felfelé, a nullától távolabbra kerekít.
-SERIESSUM		= SERIESSUM			##	Hatványsor összegét adja eredményül.
-SIGN			= ELŐJEL			##	Egy szám előjelét adja meg.
-SIN			= SIN				##	Egy szög szinuszát számítja ki.
-SINH			= SINH				##	Egy szám szinusz hiperbolikuszát számítja ki.
-SQRT			= GYÖK				##	Egy szám pozitív négyzetgyökét számítja ki.
-SQRTPI			= SQRTPI			##	A (szám*pi) négyzetgyökét adja eredményül.
-SUBTOTAL		= RÉSZÖSSZEG			##	Lista vagy adatbázis részösszegét adja eredményül.
-SUM			= SZUM				##	Összeadja az argumentumlistájában lévő számokat.
-SUMIF			= SZUMHA			##	A megadott feltételeknek eleget tevő cellákban található értékeket adja össze.
-SUMIFS			= SZUMHATÖBB			##	Több megadott feltételnek eleget tévő tartománycellák összegét adja eredményül.
-SUMPRODUCT		= SZORZATÖSSZEG			##	A megfelelő tömbelemek szorzatának összegét számítja ki.
-SUMSQ			= NÉGYZETÖSSZEG			##	Argumentumai négyzetének összegét számítja ki.
-SUMX2MY2		= SZUMX2BŐLY2			##	Két tömb megfelelő elemei négyzetének különbségét összegzi.
-SUMX2PY2		= SZUMX2MEGY2			##	Két tömb megfelelő elemei négyzetének összegét összegzi.
-SUMXMY2			= SZUMXBŐLY2			##	Két tömb megfelelő elemei különbségének négyzetösszegét számítja ki.
-TAN			= TAN				##	Egy szám tangensét számítja ki.
-TANH			= TANH				##	Egy szám tangens hiperbolikuszát számítja ki.
-TRUNC			= CSONK				##	Egy számot egésszé csonkít.
-
-
-##
-##	Statistical functions				Statisztikai függvények
-##
-AVEDEV			= ÁTL.ELTÉRÉS			##	Az adatpontoknak átlaguktól való átlagos abszolút eltérését számítja ki.
-AVERAGE			= ÁTLAG				##	Argumentumai átlagát számítja ki.
-AVERAGEA		= ÁTLAGA			##	Argumentumai átlagát számítja ki (beleértve a számokat, szöveget és logikai értékeket).
-AVERAGEIF		= ÁTLAGHA			##	A megadott feltételnek eleget tévő tartomány celláinak átlagát (számtani közepét) adja eredményül.
-AVERAGEIFS		= ÁTLAGHATÖBB			##	A megadott feltételeknek eleget tévő cellák átlagát (számtani közepét) adja eredményül.
-BETADIST		= BÉTA.ELOSZLÁS			##	A béta-eloszlás függvényt számítja ki.
-BETAINV			= INVERZ.BÉTA			##	Adott béta-eloszláshoz kiszámítja a béta eloszlásfüggvény inverzét.
-BINOMDIST		= BINOM.ELOSZLÁS		##	A diszkrét binomiális eloszlás valószínűségértékét számítja ki.
-CHIDIST			= KHI.ELOSZLÁS			##	A khi-négyzet-eloszlás egyszélű valószínűségértékét számítja ki.
-CHIINV			= INVERZ.KHI			##	A khi-négyzet-eloszlás egyszélű valószínűségértékének inverzét számítja ki.
-CHITEST			= KHI.PRÓBA			##	Függetlenségvizsgálatot hajt végre.
-CONFIDENCE		= MEGBÍZHATÓSÁG			##	Egy statisztikai sokaság várható értékének megbízhatósági intervallumát adja eredményül.
-CORREL			= KORREL			##	Két adathalmaz korrelációs együtthatóját számítja ki.
-COUNT			= DARAB				##	Megszámolja, hogy argumentumlistájában hány szám található.
-COUNTA			= DARAB2			##	Megszámolja, hogy argumentumlistájában hány érték található.
-COUNTBLANK		= DARABÜRES			##	Egy tartományban összeszámolja az üres cellákat.
-COUNTIF			= DARABTELI			##	Egy tartományban összeszámolja azokat a cellákat, amelyek eleget tesznek a megadott feltételnek.
-COUNTIFS		= DARABHATÖBB			##	Egy tartományban összeszámolja azokat a cellákat, amelyek eleget tesznek több feltételnek.
-COVAR			= KOVAR				##	A kovarianciát, azaz a páronkénti eltérések szorzatának átlagát számítja ki.
-CRITBINOM		= KRITBINOM			##	Azt a legkisebb számot adja eredményül, amelyre a binomiális eloszlásfüggvény értéke nem kisebb egy adott határértéknél.
-DEVSQ			= SQ				##	Az átlagtól való eltérések négyzetének összegét számítja ki.
-EXPONDIST		= EXP.ELOSZLÁS			##	Az exponenciális eloszlás értékét számítja ki.
-FDIST			= F.ELOSZLÁS			##	Az F-eloszlás értékét számítja ki.
-FINV			= INVERZ.F			##	Az F-eloszlás inverzének értékét számítja ki.
-FISHER			= FISHER			##	Fisher-transzformációt hajt végre.
-FISHERINV		= INVERZ.FISHER			##	A Fisher-transzformáció inverzét hajtja végre.
-FORECAST		= ELŐREJELZÉS			##	Az ismert értékek alapján lineáris regresszióval becsült értéket ad eredményül.
-FREQUENCY		= GYAKORISÁG			##	A gyakorisági vagy empirikus eloszlás értékét függőleges tömbként adja eredményül.
-FTEST			= F.PRÓBA			##	Az F-próba értékét adja eredményül.
-GAMMADIST		= GAMMA.ELOSZLÁS		##	A gamma-eloszlás értékét számítja ki.
-GAMMAINV		= INVERZ.GAMMA			##	A gamma-eloszlás eloszlásfüggvénye inverzének értékét számítja ki.
-GAMMALN			= GAMMALN			##	A gamma-függvény természetes logaritmusát számítja ki.
-GEOMEAN			= MÉRTANI.KÖZÉP			##	Argumentumai mértani középértékét számítja ki.
-GROWTH			= NÖV				##	Exponenciális regresszió alapján ad becslést.
-HARMEAN			= HARM.KÖZÉP			##	Argumentumai harmonikus átlagát számítja ki.
-HYPGEOMDIST		= HIPERGEOM.ELOSZLÁS		##	A hipergeometriai eloszlás értékét számítja ki.
-INTERCEPT		= METSZ				##	A regressziós egyenes y tengellyel való metszéspontját határozza meg.
-KURT			= CSÚCSOSSÁG			##	Egy adathalmaz csúcsosságát számítja ki.
-LARGE			= NAGY				##	Egy adathalmaz k-adik legnagyobb elemét adja eredményül.
-LINEST			= LIN.ILL			##	A legkisebb négyzetek módszerével az adatokra illesztett egyenes paramétereit határozza meg.
-LOGEST			= LOG.ILL			##	Az adatokra illesztett exponenciális görbe paramétereit határozza meg.
-LOGINV			= INVERZ.LOG.ELOSZLÁS		##	A lognormális eloszlás inverzét számítja ki.
-LOGNORMDIST		= LOG.ELOSZLÁS			##	A lognormális eloszlásfüggvény értékét számítja ki.
-MAX			= MAX				##	Az argumentumai között szereplő legnagyobb számot adja meg.
-MAXA			= MAX2				##	Az argumentumai között szereplő legnagyobb számot adja meg (beleértve a számokat, szöveget és logikai értékeket).
-MEDIAN			= MEDIÁN			##	Adott számhalmaz mediánját számítja ki.
-MIN			= MIN				##	Az argumentumai között szereplő legkisebb számot adja meg.
-MINA			= MIN2				##	Az argumentumai között szereplő legkisebb számot adja meg, beleértve a számokat, szöveget és logikai értékeket.
-MODE			= MÓDUSZ			##	Egy adathalmazból kiválasztja a leggyakrabban előforduló számot.
-NEGBINOMDIST		= NEGBINOM.ELOSZL		##	A negatív binomiális eloszlás értékét számítja ki.
-NORMDIST		= NORM.ELOSZL			##	A normális eloszlás értékét számítja ki.
-NORMINV			= INVERZ.NORM			##	A normális eloszlás eloszlásfüggvénye inverzének értékét számítja ki.
-NORMSDIST		= STNORMELOSZL			##	A standard normális eloszlás eloszlásfüggvényének értékét számítja ki.
-NORMSINV		= INVERZ.STNORM			##	A standard normális eloszlás eloszlásfüggvénye inverzének értékét számítja ki.
-PEARSON			= PEARSON			##	A Pearson-féle korrelációs együtthatót számítja ki.
-PERCENTILE		= PERCENTILIS			##	Egy tartományban található értékek k-adik percentilisét, azaz százalékosztályát adja eredményül.
-PERCENTRANK		= SZÁZALÉKRANG			##	Egy értéknek egy adathalmazon belül vett százalékos rangját (elhelyezkedését) számítja ki.
-PERMUT			= VARIÁCIÓK			##	Adott számú objektum k-ad osztályú ismétlés nélküli variációinak számát számítja ki.
-POISSON			= POISSON			##	A Poisson-eloszlás értékét számítja ki.
-PROB			= VALÓSZÍNŰSÉG			##	Annak valószínűségét számítja ki, hogy adott értékek két határérték közé esnek.
-QUARTILE		= KVARTILIS			##	Egy adathalmaz kvartilisét (negyedszintjét) számítja ki.
-RANK			= SORSZÁM			##	Kiszámítja, hogy egy szám hányadik egy számsorozatban.
-RSQ			= RNÉGYZET			##	Kiszámítja a Pearson-féle szorzatmomentum korrelációs együtthatójának négyzetét.
-SKEW			= FERDESÉG			##	Egy eloszlás ferdeségét határozza meg.
-SLOPE			= MEREDEKSÉG			##	Egy lineáris regressziós egyenes meredekségét számítja ki.
-SMALL			= KICSI				##	Egy adathalmaz k-adik legkisebb elemét adja meg.
-STANDARDIZE		= NORMALIZÁLÁS			##	Normalizált értéket ad eredményül.
-STDEV			= SZÓRÁS			##	Egy statisztikai sokaság mintájából kiszámítja annak szórását.
-STDEVA			= SZÓRÁSA			##	Egy statisztikai sokaság mintájából kiszámítja annak szórását (beleértve a számokat, szöveget és logikai értékeket).
-STDEVP			= SZÓRÁSP			##	Egy statisztikai sokaság egészéből kiszámítja annak szórását.
-STDEVPA			= SZÓRÁSPA			##	Egy statisztikai sokaság egészéből kiszámítja annak szórását (beleértve számokat, szöveget és logikai értékeket).
-STEYX			= STHIBAYX			##	Egy regresszió esetén az egyes x-értékek alapján meghatározott y-értékek standard hibáját számítja ki.
-TDIST			= T.ELOSZLÁS			##	A Student-féle t-eloszlás értékét számítja ki.
-TINV			= INVERZ.T			##	A Student-féle t-eloszlás inverzét számítja ki.
-TREND			= TREND				##	Lineáris trend értékeit számítja ki.
-TRIMMEAN		= RÉSZÁTLAG			##	Egy adathalmaz középső részének átlagát számítja ki.
-TTEST			= T.PRÓBA			##	A Student-féle t-próbához tartozó valószínűséget számítja ki.
-VAR			= VAR				##	Minta alapján becslést ad a varianciára.
-VARA			= VARA				##	Minta alapján becslést ad a varianciára (beleértve számokat, szöveget és logikai értékeket).
-VARP			= VARP				##	Egy statisztikai sokaság varianciáját számítja ki.
-VARPA			= VARPA				##	Egy statisztikai sokaság varianciáját számítja ki (beleértve számokat, szöveget és logikai értékeket).
-WEIBULL			= WEIBULL			##	A Weibull-féle eloszlás értékét számítja ki.
-ZTEST			= Z.PRÓBA			##	Az egyszélű z-próbával kapott valószínűségértéket számítja ki.
-
-
-##
-##	Text functions					Szövegműveletekhez használható függvények
-##
-ASC			= ASC				##	Szöveg teljes szélességű (kétbájtos) latin és katakana karaktereit félszélességű (egybájtos) karakterekké alakítja.
-BAHTTEXT		= BAHTSZÖVEG			##	Számot szöveggé alakít a ß (baht) pénznemformátum használatával.
-CHAR			= KARAKTER			##	A kódszámmal meghatározott karaktert adja eredményül.
-CLEAN			= TISZTÍT			##	A szövegből eltávolítja az összes nem nyomtatható karaktert.
-CODE			= KÓD				##	Karaktersorozat első karakterének numerikus kódját adja eredményül.
-CONCATENATE		= ÖSSZEFŰZ			##	Több szövegelemet egyetlen szöveges elemmé fűz össze.
-DOLLAR			= FORINT			##	Számot pénznem formátumú szöveggé alakít át.
-EXACT			= AZONOS			##	Megvizsgálja, hogy két érték azonos-e.
-FIND			= SZÖVEG.TALÁL			##	Karaktersorozatot keres egy másikban (a kis- és nagybetűk megkülönböztetésével).
-FINDB			= SZÖVEG.TALÁL2			##	Karaktersorozatot keres egy másikban (a kis- és nagybetűk megkülönböztetésével).
-FIXED			= FIX				##	Számot szöveges formátumúra alakít adott számú tizedesjegyre kerekítve.
-JIS			= JIS				##	A félszélességű (egybájtos) latin és a katakana karaktereket teljes szélességű (kétbájtos) karakterekké alakítja.
-LEFT			= BAL				##	Szöveg bal szélső karaktereit adja eredményül.
-LEFTB			= BAL2				##	Szöveg bal szélső karaktereit adja eredményül.
-LEN			= HOSSZ				##	Szöveg karakterekben mért hosszát adja eredményül.
-LENB			= HOSSZ2			##	Szöveg karakterekben mért hosszát adja eredményül.
-LOWER			= KISBETŰ			##	Szöveget kisbetűssé alakít át.
-MID			= KÖZÉP				##	A szöveg adott pozíciójától kezdve megadott számú karaktert ad vissza eredményként.
-MIDB			= KÖZÉP2			##	A szöveg adott pozíciójától kezdve megadott számú karaktert ad vissza eredményként.
-PHONETIC		= PHONETIC			##	Szöveg furigana (fonetikus) karaktereit adja vissza.
-PROPER			= TNÉV				##	Szöveg minden szavának kezdőbetűjét nagybetűsre cseréli.
-REPLACE			= CSERE				##	A szövegen belül karaktereket cserél.
-REPLACEB		= CSERE2			##	A szövegen belül karaktereket cserél.
-REPT			= SOKSZOR			##	Megadott számú alkalommal megismétel egy szövegrészt.
-RIGHT			= JOBB				##	Szövegrész jobb szélső karaktereit adja eredményül.
-RIGHTB			= JOBB2				##	Szövegrész jobb szélső karaktereit adja eredményül.
-SEARCH			= SZÖVEG.KERES			##	Karaktersorozatot keres egy másikban (a kis- és nagybetűk között nem tesz különbséget).
-SEARCHB			= SZÖVEG.KERES2			##	Karaktersorozatot keres egy másikban (a kis- és nagybetűk között nem tesz különbséget).
-SUBSTITUTE		= HELYETTE			##	Szövegben adott karaktereket másikra cserél.
-T			= T				##	Argumentumát szöveggé alakítja át.
-TEXT			= SZÖVEG			##	Számértéket alakít át adott számformátumú szöveggé.
-TRIM			= TRIM				##	A szövegből eltávolítja a szóközöket.
-UPPER			= NAGYBETŰS			##	Szöveget nagybetűssé alakít át.
-VALUE			= ÉRTÉK				##	Szöveget számmá alakít át.
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/config
deleted file mode 100644
index f862a02d72d..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= €
-
-
-##
-##	Excel Error Codes	(For future use)
-##
-NULL	= #NULLO!
-DIV0	= #DIV/0!
-VALUE	= #VALORE!
-REF	= #RIF!
-NAME	= #NOME?
-NUM	= #NUM!
-NA	= #N/D
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
deleted file mode 100644
index b9219a6a4ce..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
+++ /dev/null
@@ -1,438 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Calculation
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
-##
-##
-
-
-##
-##	Add-in and Automation functions			Funzioni di automazione e dei componenti aggiuntivi
-##
-GETPIVOTDATA		= INFO.DATI.TAB.PIVOT		##	Restituisce i dati memorizzati in un rapporto di tabella pivot
-
-
-##
-##	Cube functions					Funzioni cubo
-##
-CUBEKPIMEMBER		= MEMBRO.KPI.CUBO		##	Restituisce il nome, la proprietà e la misura di un indicatore di prestazioni chiave (KPI) e visualizza il nome e la proprietà nella cella. Un KPI è una misura quantificabile, ad esempio l'utile lordo mensile o il fatturato trimestrale dei dipendenti, utilizzata per il monitoraggio delle prestazioni di un'organizzazione.
-CUBEMEMBER		= MEMBRO.CUBO			##	Restituisce un membro o una tupla in una gerarchia di cubi. Consente di verificare l'esistenza del membro o della tupla nel cubo.
-CUBEMEMBERPROPERTY	= PROPRIETÀ.MEMBRO.CUBO		##	Restituisce il valore di una proprietà di un membro del cubo. Consente di verificare l'esistenza di un nome di membro all'interno del cubo e di restituire la proprietà specificata per tale membro.
-CUBERANKEDMEMBER	= MEMBRO.CUBO.CON.RANGO		##	Restituisce l'n-esimo membro o il membro ordinato di un insieme. Consente di restituire uno o più elementi in un insieme, ad esempio l'agente di vendita migliore o i primi 10 studenti.
-CUBESET			= SET.CUBO			##	Definisce un insieme di tuple o membri calcolati mediante l'invio di un'espressione di insieme al cubo sul server. In questo modo l'insieme viene creato e restituito a Microsoft Office Excel.
-CUBESETCOUNT		= CONTA.SET.CUBO		##	Restituisce il numero di elementi di un insieme.
-CUBEVALUE		= VALORE.CUBO			##	Restituisce un valore aggregato da un cubo.
-
-
-##
-##	Database functions				Funzioni di database
-##
-DAVERAGE		= DB.MEDIA			##	Restituisce la media di voci del database selezionate
-DCOUNT			= DB.CONTA.NUMERI		##	Conta le celle di un database contenenti numeri
-DCOUNTA			= DB.CONTA.VALORI		##	Conta le celle non vuote in un database
-DGET			= DB.VALORI			##	Estrae da un database un singolo record che soddisfa i criteri specificati
-DMAX			= DB.MAX			##	Restituisce il valore massimo dalle voci selezionate in un database
-DMIN			= DB.MIN			##	Restituisce il valore minimo dalle voci di un database selezionate
-DPRODUCT		= DB.PRODOTTO			##	Moltiplica i valori in un determinato campo di record che soddisfano i criteri del database
-DSTDEV			= DB.DEV.ST			##	Restituisce una stima della deviazione standard sulla base di un campione di voci di un database selezionate
-DSTDEVP			= DB.DEV.ST.POP			##	Calcola la deviazione standard sulla base di tutte le voci di un database selezionate
-DSUM			= DB.SOMMA			##	Aggiunge i numeri nel campo colonna di record del database che soddisfa determinati criteri
-DVAR			= DB.VAR			##	Restituisce una stima della varianza sulla base di un campione da voci di un database selezionate
-DVARP			= DB.VAR.POP			##	Calcola la varianza sulla base di tutte le voci di un database selezionate
-
-
-##
-##	Date and time functions				Funzioni data e ora
-##
-DATE			= DATA				##	Restituisce il numero seriale di una determinata data
-DATEVALUE		= DATA.VALORE			##	Converte una data sotto forma di testo in un numero seriale
-DAY			= GIORNO			##	Converte un numero seriale in un giorno del mese
-DAYS360			= GIORNO360			##	Calcola il numero di giorni compreso tra due date basandosi su un anno di 360 giorni
-EDATE			= DATA.MESE			##	Restituisce il numero seriale della data che rappresenta il numero di mesi prima o dopo la data di inizio
-EOMONTH			= FINE.MESE			##	Restituisce il numero seriale dell'ultimo giorno del mese, prima o dopo un determinato numero di mesi
-HOUR			= ORA				##	Converte un numero seriale in un'ora
-MINUTE			= MINUTO			##	Converte un numero seriale in un minuto
-MONTH			= MESE				##	Converte un numero seriale in un mese
-NETWORKDAYS		= GIORNI.LAVORATIVI.TOT		##	Restituisce il numero di tutti i giorni lavorativi compresi fra due date
-NOW			= ADESSO			##	Restituisce il numero seriale della data e dell'ora corrente
-SECOND			= SECONDO			##	Converte un numero seriale in un secondo
-TIME			= ORARIO			##	Restituisce il numero seriale di una determinata ora
-TIMEVALUE		= ORARIO.VALORE			##	Converte un orario in forma di testo in un numero seriale
-TODAY			= OGGI				##	Restituisce il numero seriale relativo alla data odierna
-WEEKDAY			= GIORNO.SETTIMANA		##	Converte un numero seriale in un giorno della settimana
-WEEKNUM			= NUM.SETTIMANA			##	Converte un numero seriale in un numero che rappresenta la posizione numerica di una settimana nell'anno
-WORKDAY			= GIORNO.LAVORATIVO		##	Restituisce il numero della data prima o dopo un determinato numero di giorni lavorativi
-YEAR			= ANNO				##	Converte un numero seriale in un anno
-YEARFRAC		= FRAZIONE.ANNO			##	Restituisce la frazione dell'anno che rappresenta il numero dei giorni compresi tra una data_ iniziale e una data_finale
-
-
-##
-##	Engineering functions				Funzioni ingegneristiche
-##
-BESSELI			= BESSEL.I			##	Restituisce la funzione di Bessel modificata In(x)
-BESSELJ			= BESSEL.J			##	Restituisce la funzione di Bessel Jn(x)
-BESSELK			= BESSEL.K			##	Restituisce la funzione di Bessel modificata Kn(x)
-BESSELY			= BESSEL.Y			##	Restituisce la funzione di Bessel Yn(x)
-BIN2DEC			= BINARIO.DECIMALE		##	Converte un numero binario in decimale
-BIN2HEX			= BINARIO.HEX			##	Converte un numero binario in esadecimale
-BIN2OCT			= BINARIO.OCT			##	Converte un numero binario in ottale
-COMPLEX			= COMPLESSO			##	Converte i coefficienti reali e immaginari in numeri complessi
-CONVERT			= CONVERTI			##	Converte un numero da un sistema di misura in un altro
-DEC2BIN			= DECIMALE.BINARIO		##	Converte un numero decimale in binario
-DEC2HEX			= DECIMALE.HEX			##	Converte un numero decimale in esadecimale
-DEC2OCT			= DECIMALE.OCT			##	Converte un numero decimale in ottale
-DELTA			= DELTA				##	Verifica se due valori sono uguali
-ERF			= FUNZ.ERRORE			##	Restituisce la funzione di errore
-ERFC			= FUNZ.ERRORE.COMP		##	Restituisce la funzione di errore complementare
-GESTEP			= SOGLIA			##	Verifica se un numero è maggiore del valore di soglia
-HEX2BIN			= HEX.BINARIO			##	Converte un numero esadecimale in binario
-HEX2DEC			= HEX.DECIMALE			##	Converte un numero esadecimale in decimale
-HEX2OCT			= HEX.OCT			##	Converte un numero esadecimale in ottale
-IMABS			= COMP.MODULO			##	Restituisce il valore assoluto (modulo) di un numero complesso
-IMAGINARY		= COMP.IMMAGINARIO		##	Restituisce il coefficiente immaginario di un numero complesso
-IMARGUMENT		= COMP.ARGOMENTO		##	Restituisce l'argomento theta, un angolo espresso in radianti
-IMCONJUGATE		= COMP.CONIUGATO		##	Restituisce il complesso coniugato del numero complesso
-IMCOS			= COMP.COS			##	Restituisce il coseno di un numero complesso
-IMDIV			= COMP.DIV			##	Restituisce il quoziente di due numeri complessi
-IMEXP			= COMP.EXP			##	Restituisce il valore esponenziale di un numero complesso
-IMLN			= COMP.LN			##	Restituisce il logaritmo naturale di un numero complesso
-IMLOG10			= COMP.LOG10			##	Restituisce il logaritmo in base 10 di un numero complesso
-IMLOG2			= COMP.LOG2			##	Restituisce un logaritmo in base 2 di un numero complesso
-IMPOWER			= COMP.POTENZA			##	Restituisce il numero complesso elevato a una potenza intera
-IMPRODUCT		= COMP.PRODOTTO			##	Restituisce il prodotto di numeri complessi compresi tra 2 e 29
-IMREAL			= COMP.PARTE.REALE		##	Restituisce il coefficiente reale di un numero complesso
-IMSIN			= COMP.SEN			##	Restituisce il seno di un numero complesso
-IMSQRT			= COMP.RADQ			##	Restituisce la radice quadrata di un numero complesso
-IMSUB			= COMP.DIFF			##	Restituisce la differenza fra due numeri complessi
-IMSUM			= COMP.SOMMA			##	Restituisce la somma di numeri complessi
-OCT2BIN			= OCT.BINARIO			##	Converte un numero ottale in binario
-OCT2DEC			= OCT.DECIMALE			##	Converte un numero ottale in decimale
-OCT2HEX			= OCT.HEX			##	Converte un numero ottale in esadecimale
-
-
-##
-##	Financial functions				Funzioni finanziarie
-##
-ACCRINT			= INT.MATURATO.PER		##	Restituisce l'interesse maturato di un titolo che paga interessi periodici
-ACCRINTM		= INT.MATURATO.SCAD		##	Restituisce l'interesse maturato di un titolo che paga interessi alla scadenza
-AMORDEGRC		= AMMORT.DEGR			##	Restituisce l'ammortamento per ogni periodo contabile utilizzando un coefficiente di ammortamento
-AMORLINC		= AMMORT.PER			##	Restituisce l'ammortamento per ogni periodo contabile
-COUPDAYBS		= GIORNI.CED.INIZ.LIQ		##	Restituisce il numero dei giorni che vanno dall'inizio del periodo di durata della cedola alla data di liquidazione
-COUPDAYS		= GIORNI.CED			##	Restituisce il numero dei giorni relativi al periodo della cedola che contiene la data di liquidazione
-COUPDAYSNC		= GIORNI.CED.NUOVA		##	Restituisce il numero di giorni che vanno dalla data di liquidazione alla data della cedola successiva
-COUPNCD			= DATA.CED.SUCC			##	Restituisce un numero che rappresenta la data della cedola successiva alla data di liquidazione
-COUPNUM			= NUM.CED			##	Restituisce il numero di cedole pagabili fra la data di liquidazione e la data di scadenza
-COUPPCD			= DATA.CED.PREC			##	Restituisce un numero che rappresenta la data della cedola precedente alla data di liquidazione
-CUMIPMT			= INT.CUMUL			##	Restituisce l'interesse cumulativo pagato fra due periodi
-CUMPRINC		= CAP.CUM			##	Restituisce il capitale cumulativo pagato per estinguere un debito fra due periodi
-DB			= DB				##	Restituisce l'ammortamento di un bene per un periodo specificato utilizzando il metodo di ammortamento a quote fisse decrescenti
-DDB			= AMMORT			##	Restituisce l'ammortamento di un bene per un periodo specificato utilizzando il metodo di ammortamento a doppie quote decrescenti o altri metodi specificati
-DISC			= TASSO.SCONTO			##	Restituisce il tasso di sconto per un titolo
-DOLLARDE		= VALUTA.DEC			##	Converte un prezzo valuta, espresso come frazione, in prezzo valuta, espresso come numero decimale
-DOLLARFR		= VALUTA.FRAZ			##	Converte un prezzo valuta, espresso come numero decimale, in prezzo valuta, espresso come frazione
-DURATION		= DURATA			##	Restituisce la durata annuale di un titolo con i pagamenti di interesse periodico
-EFFECT			= EFFETTIVO			##	Restituisce l'effettivo tasso di interesse annuo
-FV			= VAL.FUT			##	Restituisce il valore futuro di un investimento
-FVSCHEDULE		= VAL.FUT.CAPITALE		##	Restituisce il valore futuro di un capitale iniziale dopo aver applicato una serie di tassi di interesse composti
-INTRATE			= TASSO.INT			##	Restituisce il tasso di interesse per un titolo interamente investito
-IPMT			= INTERESSI			##	Restituisce il valore degli interessi per un investimento relativo a un periodo specifico
-IRR			= TIR.COST			##	Restituisce il tasso di rendimento interno per una serie di flussi di cassa
-ISPMT			= INTERESSE.RATA		##	Calcola l'interesse di un investimento pagato durante un periodo specifico
-MDURATION		= DURATA.M			##	Restituisce la durata Macauley modificata per un titolo con un valore presunto di € 100
-MIRR			= TIR.VAR			##	Restituisce il tasso di rendimento interno in cui i flussi di cassa positivi e negativi sono finanziati a tassi differenti
-NOMINAL			= NOMINALE			##	Restituisce il tasso di interesse nominale annuale
-NPER			= NUM.RATE			##	Restituisce un numero di periodi relativi a un investimento
-NPV			= VAN				##	Restituisce il valore attuale netto di un investimento basato su una serie di flussi di cassa periodici e sul tasso di sconto
-ODDFPRICE		= PREZZO.PRIMO.IRR		##	Restituisce il prezzo di un titolo dal valore nominale di € 100 avente il primo periodo di durata irregolare
-ODDFYIELD		= REND.PRIMO.IRR		##	Restituisce il rendimento di un titolo avente il primo periodo di durata irregolare
-ODDLPRICE		= PREZZO.ULTIMO.IRR		##	Restituisce il prezzo di un titolo dal valore nominale di € 100 avente l'ultimo periodo di durata irregolare
-ODDLYIELD		= REND.ULTIMO.IRR		##	Restituisce il rendimento di un titolo avente l'ultimo periodo di durata irregolare
-PMT			= RATA				##	Restituisce il pagamento periodico di una rendita annua
-PPMT			= P.RATA			##	Restituisce il pagamento sul capitale di un investimento per un dato periodo
-PRICE			= PREZZO			##	Restituisce il prezzo di un titolo dal valore nominale di € 100 che paga interessi periodici
-PRICEDISC		= PREZZO.SCONT			##	Restituisce il prezzo di un titolo scontato dal valore nominale di € 100
-PRICEMAT		= PREZZO.SCAD			##	Restituisce il prezzo di un titolo dal valore nominale di € 100 che paga gli interessi alla scadenza
-PV			= VA				##	Restituisce il valore attuale di un investimento
-RATE			= TASSO				##	Restituisce il tasso di interesse per un periodo di un'annualità
-RECEIVED		= RICEV.SCAD			##	Restituisce l'ammontare ricevuto alla scadenza di un titolo interamente investito
-SLN			= AMMORT.COST			##	Restituisce l'ammortamento a quote costanti di un bene per un singolo periodo
-SYD			= AMMORT.ANNUO			##	Restituisce l'ammortamento a somma degli anni di un bene per un periodo specificato
-TBILLEQ			= BOT.EQUIV			##	Restituisce il rendimento equivalente ad un'obbligazione per un Buono ordinario del Tesoro
-TBILLPRICE		= BOT.PREZZO			##	Restituisce il prezzo di un Buono del Tesoro dal valore nominale di € 100
-TBILLYIELD		= BOT.REND			##	Restituisce il rendimento di un Buono del Tesoro
-VDB			= AMMORT.VAR			##	Restituisce l'ammortamento di un bene per un periodo specificato o parziale utilizzando il metodo a doppie quote proporzionali ai valori residui
-XIRR			= TIR.X				##	Restituisce il tasso di rendimento interno di un impiego di flussi di cassa
-XNPV			= VAN.X				##	Restituisce il valore attuale netto di un impiego di flussi di cassa non necessariamente periodici
-YIELD			= REND				##	Restituisce il rendimento di un titolo che frutta interessi periodici
-YIELDDISC		= REND.TITOLI.SCONT		##	Restituisce il rendimento annuale di un titolo scontato, ad esempio un Buono del Tesoro
-YIELDMAT		= REND.SCAD			##	Restituisce il rendimento annuo di un titolo che paga interessi alla scadenza
-
-
-##
-##	Information functions				Funzioni relative alle informazioni
-##
-CELL			= CELLA				##	Restituisce le informazioni sulla formattazione, la posizione o i contenuti di una cella
-ERROR.TYPE		= ERRORE.TIPO			##	Restituisce un numero che corrisponde a un tipo di errore
-INFO			= INFO				##	Restituisce le informazioni sull'ambiente operativo corrente
-ISBLANK			= VAL.VUOTO			##	Restituisce VERO se il valore è vuoto
-ISERR			= VAL.ERR			##	Restituisce VERO se il valore è un valore di errore qualsiasi tranne #N/D
-ISERROR			= VAL.ERRORE			##	Restituisce VERO se il valore è un valore di errore qualsiasi
-ISEVEN			= VAL.PARI			##	Restituisce VERO se il numero è pari
-ISLOGICAL		= VAL.LOGICO			##	Restituisce VERO se il valore è un valore logico
-ISNA			= VAL.NON.DISP			##	Restituisce VERO se il valore è un valore di errore #N/D
-ISNONTEXT		= VAL.NON.TESTO			##	Restituisce VERO se il valore non è in formato testo
-ISNUMBER		= VAL.NUMERO			##	Restituisce VERO se il valore è un numero
-ISODD			= VAL.DISPARI			##	Restituisce VERO se il numero è dispari
-ISREF			= VAL.RIF			##	Restituisce VERO se il valore è un riferimento
-ISTEXT			= VAL.TESTO			##	Restituisce VERO se il valore è in formato testo
-N			= NUM				##	Restituisce un valore convertito in numero
-NA			= NON.DISP			##	Restituisce il valore di errore #N/D
-TYPE			= TIPO				##	Restituisce un numero che indica il tipo di dati relativi a un valore
-
-
-##
-##	Logical functions				Funzioni logiche
-##
-AND			= E				##	Restituisce VERO se tutti gli argomenti sono VERO
-FALSE			= FALSO				##	Restituisce il valore logico FALSO
-IF			= SE				##	Specifica un test logico da eseguire
-IFERROR			= SE.ERRORE			##	Restituisce un valore specificato se una formula fornisce un errore come risultato; in caso contrario, restituisce il risultato della formula
-NOT			= NON				##	Inverte la logica degli argomenti
-OR			= O				##	Restituisce VERO se un argomento qualsiasi è VERO
-TRUE			= VERO				##	Restituisce il valore logico VERO
-
-
-##
-##	Lookup and reference functions			Funzioni di ricerca e di riferimento
-##
-ADDRESS			= INDIRIZZO			##	Restituisce un riferimento come testo in una singola cella di un foglio di lavoro
-AREAS			= AREE				##	Restituisce il numero di aree in un riferimento
-CHOOSE			= SCEGLI			##	Sceglie un valore da un elenco di valori
-COLUMN			= RIF.COLONNA			##	Restituisce il numero di colonna di un riferimento
-COLUMNS			= COLONNE			##	Restituisce il numero di colonne in un riferimento
-HLOOKUP			= CERCA.ORIZZ			##	Effettua una ricerca nella riga superiore di una matrice e restituisce il valore della cella specificata
-HYPERLINK		= COLLEG.IPERTESTUALE		##	Crea un collegamento che apre un documento memorizzato in un server di rete, una rete Intranet o Internet
-INDEX			= INDICE			##	Utilizza un indice per scegliere un valore da un riferimento o da una matrice
-INDIRECT		= INDIRETTO			##	Restituisce un riferimento specificato da un valore testo
-LOOKUP			= CERCA				##	Ricerca i valori in un vettore o in una matrice
-MATCH			= CONFRONTA			##	Ricerca i valori in un riferimento o in una matrice
-OFFSET			= SCARTO			##	Restituisce uno scarto di riferimento da un riferimento dato
-ROW			= RIF.RIGA			##	Restituisce il numero di riga di un riferimento
-ROWS			= RIGHE				##	Restituisce il numero delle righe in un riferimento
-RTD			= DATITEMPOREALE		##	Recupera dati in tempo reale da un programma che supporta l'automazione COM (automazione: Metodo per utilizzare gli oggetti di un'applicazione da un'altra applicazione o da un altro strumento di sviluppo. Precedentemente nota come automazione OLE, l'automazione è uno standard del settore e una caratteristica del modello COM (Component Object Model).)
-TRANSPOSE		= MATR.TRASPOSTA		##	Restituisce la trasposizione di una matrice
-VLOOKUP			= CERCA.VERT			##	Effettua una ricerca nella prima colonna di una matrice e si sposta attraverso la riga per restituire il valore di una cella
-
-
-##
-##	Math and trigonometry functions			Funzioni matematiche e trigonometriche
-##
-ABS			= ASS				##	Restituisce il valore assoluto di un numero.
-ACOS			= ARCCOS			##	Restituisce l'arcocoseno di un numero
-ACOSH			= ARCCOSH			##	Restituisce l'inverso del coseno iperbolico di un numero
-ASIN			= ARCSEN			##	Restituisce l'arcoseno di un numero
-ASINH			= ARCSENH			##	Restituisce l'inverso del seno iperbolico di un numero
-ATAN			= ARCTAN			##	Restituisce l'arcotangente di un numero
-ATAN2			= ARCTAN.2			##	Restituisce l'arcotangente delle coordinate x e y specificate
-ATANH			= ARCTANH			##	Restituisce l'inverso della tangente iperbolica di un numero
-CEILING			= ARROTONDA.ECCESSO		##	Arrotonda un numero per eccesso all'intero più vicino o al multiplo più vicino a peso
-COMBIN			= COMBINAZIONE			##	Restituisce il numero di combinazioni possibili per un numero assegnato di elementi
-COS			= COS				##	Restituisce il coseno dell'angolo specificato
-COSH			= COSH				##	Restituisce il coseno iperbolico di un numero
-DEGREES			= GRADI				##	Converte i radianti in gradi
-EVEN			= PARI				##	Arrotonda il valore assoluto di un numero per eccesso al più vicino intero pari
-EXP			= ESP				##	Restituisce il numero e elevato alla potenza di num
-FACT			= FATTORIALE			##	Restituisce il fattoriale di un numero
-FACTDOUBLE		= FATT.DOPPIO			##	Restituisce il fattoriale doppio di un numero
-FLOOR			= ARROTONDA.DIFETTO		##	Arrotonda un numero per difetto al multiplo più vicino a zero
-GCD			= MCD				##	Restituisce il massimo comune divisore
-INT			= INT				##	Arrotonda un numero per difetto al numero intero più vicino
-LCM			= MCM				##	Restituisce il minimo comune multiplo
-LN			= LN				##	Restituisce il logaritmo naturale di un numero
-LOG			= LOG				##	Restituisce il logaritmo di un numero in una specificata base
-LOG10			= LOG10				##	Restituisce il logaritmo in base 10 di un numero
-MDETERM			= MATR.DETERM			##	Restituisce il determinante di una matrice
-MINVERSE		= MATR.INVERSA			##	Restituisce l'inverso di una matrice
-MMULT			= MATR.PRODOTTO			##	Restituisce il prodotto di due matrici
-MOD			= RESTO				##	Restituisce il resto della divisione
-MROUND			= ARROTONDA.MULTIPLO		##	Restituisce un numero arrotondato al multiplo desiderato
-MULTINOMIAL		= MULTINOMIALE			##	Restituisce il multinomiale di un insieme di numeri
-ODD			= DISPARI			##	Arrotonda un numero per eccesso al più vicino intero dispari
-PI			= PI.GRECO			##	Restituisce il valore di pi greco
-POWER			= POTENZA			##	Restituisce il risultato di un numero elevato a potenza
-PRODUCT			= PRODOTTO			##	Moltiplica i suoi argomenti
-QUOTIENT		= QUOZIENTE			##	Restituisce la parte intera di una divisione
-RADIANS			= RADIANTI			##	Converte i gradi in radianti
-RAND			= CASUALE			##	Restituisce un numero casuale compreso tra 0 e 1
-RANDBETWEEN		= CASUALE.TRA			##	Restituisce un numero casuale compreso tra i numeri specificati
-ROMAN			= ROMANO			##	Restituisce il numero come numero romano sotto forma di testo
-ROUND			= ARROTONDA			##	Arrotonda il numero al numero di cifre specificato
-ROUNDDOWN		= ARROTONDA.PER.DIF		##	Arrotonda il valore assoluto di un numero per difetto
-ROUNDUP			= ARROTONDA.PER.ECC		##	Arrotonda il valore assoluto di un numero per eccesso
-SERIESSUM		= SOMMA.SERIE			##	Restituisce la somma di una serie di potenze in base alla formula
-SIGN			= SEGNO				##	Restituisce il segno di un numero
-SIN			= SEN				##	Restituisce il seno di un dato angolo
-SINH			= SENH				##	Restituisce il seno iperbolico di un numero
-SQRT			= RADQ				##	Restituisce una radice quadrata
-SQRTPI			= RADQ.PI.GRECO			##	Restituisce la radice quadrata di un numero (numero * pi greco)
-SUBTOTAL		= SUBTOTALE			##	Restituisce un subtotale in un elenco o in un database
-SUM			= SOMMA				##	Somma i suoi argomenti
-SUMIF			= SOMMA.SE			##	Somma le celle specificate da un dato criterio
-SUMIFS			= SOMMA.PIÙ.SE			##	Somma le celle in un intervallo che soddisfano più criteri
-SUMPRODUCT		= MATR.SOMMA.PRODOTTO		##	Restituisce la somma dei prodotti dei componenti corrispondenti della matrice
-SUMSQ			= SOMMA.Q			##	Restituisce la somma dei quadrati degli argomenti
-SUMX2MY2		= SOMMA.DIFF.Q			##	Restituisce la somma della differenza dei quadrati dei corrispondenti elementi in due matrici
-SUMX2PY2		= SOMMA.SOMMA.Q			##	Restituisce la somma della somma dei quadrati dei corrispondenti elementi in due matrici
-SUMXMY2			= SOMMA.Q.DIFF			##	Restituisce la somma dei quadrati delle differenze dei corrispondenti elementi in due matrici
-TAN			= TAN				##	Restituisce la tangente di un numero
-TANH			= TANH				##	Restituisce la tangente iperbolica di un numero
-TRUNC			= TRONCA			##	Tronca la parte decimale di un numero
-
-
-##
-##	Statistical functions				Funzioni statistiche
-##
-AVEDEV			= MEDIA.DEV			##	Restituisce la media delle deviazioni assolute delle coordinate rispetto alla loro media
-AVERAGE			= MEDIA				##	Restituisce la media degli argomenti
-AVERAGEA		= MEDIA.VALORI			##	Restituisce la media degli argomenti, inclusi i numeri, il testo e i valori logici
-AVERAGEIF		= MEDIA.SE			##	Restituisce la media aritmetica di tutte le celle in un intervallo che soddisfano un determinato criterio
-AVERAGEIFS		= MEDIA.PIÙ.SE			##	Restituisce la media aritmetica di tutte le celle che soddisfano più criteri
-BETADIST		= DISTRIB.BETA			##	Restituisce la funzione di distribuzione cumulativa beta
-BETAINV			= INV.BETA			##	Restituisce l'inverso della funzione di distribuzione cumulativa per una distribuzione beta specificata
-BINOMDIST		= DISTRIB.BINOM			##	Restituisce la distribuzione binomiale per il termine individuale
-CHIDIST			= DISTRIB.CHI			##	Restituisce la probabilità a una coda per la distribuzione del chi quadrato
-CHIINV			= INV.CHI			##	Restituisce l'inverso della probabilità ad una coda per la distribuzione del chi quadrato
-CHITEST			= TEST.CHI			##	Restituisce il test per l'indipendenza
-CONFIDENCE		= CONFIDENZA			##	Restituisce l'intervallo di confidenza per una popolazione
-CORREL			= CORRELAZIONE			##	Restituisce il coefficiente di correlazione tra due insiemi di dati
-COUNT			= CONTA.NUMERI			##	Conta la quantità di numeri nell'elenco di argomenti
-COUNTA			= CONTA.VALORI			##	Conta il numero di valori nell'elenco di argomenti
-COUNTBLANK		= CONTA.VUOTE			##	Conta il numero di celle vuote all'interno di un intervallo
-COUNTIF			= CONTA.SE			##	Conta il numero di celle all'interno di un intervallo che soddisfa i criteri specificati
-COUNTIFS		= CONTA.PIÙ.SE			##	Conta il numero di celle in un intervallo che soddisfano più criteri.
-COVAR			= COVARIANZA			##	Calcola la covarianza, la media dei prodotti delle deviazioni accoppiate
-CRITBINOM		= CRIT.BINOM			##	Restituisce il più piccolo valore per il quale la distribuzione cumulativa binomiale risulta maggiore o uguale ad un valore di criterio
-DEVSQ			= DEV.Q				##	Restituisce la somma dei quadrati delle deviazioni
-EXPONDIST		= DISTRIB.EXP			##	Restituisce la distribuzione esponenziale
-FDIST			= DISTRIB.F			##	Restituisce la distribuzione di probabilità F
-FINV			= INV.F				##	Restituisce l'inverso della distribuzione della probabilità F
-FISHER			= FISHER			##	Restituisce la trasformazione di Fisher
-FISHERINV		= INV.FISHER			##	Restituisce l'inverso della trasformazione di Fisher
-FORECAST		= PREVISIONE			##	Restituisce i valori lungo una tendenza lineare
-FREQUENCY		= FREQUENZA			##	Restituisce la distribuzione di frequenza come matrice verticale
-FTEST			= TEST.F			##	Restituisce il risultato di un test F
-GAMMADIST		= DISTRIB.GAMMA			##	Restituisce la distribuzione gamma
-GAMMAINV		= INV.GAMMA			##	Restituisce l'inverso della distribuzione cumulativa gamma
-GAMMALN			= LN.GAMMA			##	Restituisce il logaritmo naturale della funzione gamma, G(x)
-GEOMEAN			= MEDIA.GEOMETRICA		##	Restituisce la media geometrica
-GROWTH			= CRESCITA			##	Restituisce i valori lungo una linea di tendenza esponenziale
-HARMEAN			= MEDIA.ARMONICA		##	Restituisce la media armonica
-HYPGEOMDIST		= DISTRIB.IPERGEOM		##	Restituisce la distribuzione ipergeometrica
-INTERCEPT		= INTERCETTA			##	Restituisce l'intercetta della retta di regressione lineare
-KURT			= CURTOSI			##	Restituisce la curtosi di un insieme di dati
-LARGE			= GRANDE			##	Restituisce il k-esimo valore più grande in un insieme di dati
-LINEST			= REGR.LIN			##	Restituisce i parametri di una tendenza lineare
-LOGEST			= REGR.LOG			##	Restituisce i parametri di una linea di tendenza esponenziale
-LOGINV			= INV.LOGNORM			##	Restituisce l'inverso di una distribuzione lognormale
-LOGNORMDIST		= DISTRIB.LOGNORM		##	Restituisce la distribuzione lognormale cumulativa
-MAX			= MAX				##	Restituisce il valore massimo in un elenco di argomenti
-MAXA			= MAX.VALORI			##	Restituisce il valore massimo in un elenco di argomenti, inclusi i numeri, il testo e i valori logici
-MEDIAN			= MEDIANA			##	Restituisce la mediana dei numeri specificati
-MIN			= MIN				##	Restituisce il valore minimo in un elenco di argomenti
-MINA			= MIN.VALORI			##	Restituisce il più piccolo valore in un elenco di argomenti, inclusi i numeri, il testo e i valori logici
-MODE			= MODA				##	Restituisce il valore più comune in un insieme di dati
-NEGBINOMDIST		= DISTRIB.BINOM.NEG		##	Restituisce la distribuzione binomiale negativa
-NORMDIST		= DISTRIB.NORM			##	Restituisce la distribuzione cumulativa normale
-NORMINV			= INV.NORM			##	Restituisce l'inverso della distribuzione cumulativa normale standard
-NORMSDIST		= DISTRIB.NORM.ST		##	Restituisce la distribuzione cumulativa normale standard
-NORMSINV		= INV.NORM.ST			##	Restituisce l'inverso della distribuzione cumulativa normale
-PEARSON			= PEARSON			##	Restituisce il coefficiente del momento di correlazione di Pearson
-PERCENTILE		= PERCENTILE			##	Restituisce il k-esimo dato percentile di valori in un intervallo
-PERCENTRANK		= PERCENT.RANGO			##	Restituisce il rango di un valore in un insieme di dati come percentuale
-PERMUT			= PERMUTAZIONE			##	Restituisce il numero delle permutazioni per un determinato numero di oggetti
-POISSON			= POISSON			##	Restituisce la distribuzione di Poisson
-PROB			= PROBABILITÀ			##	Calcola la probabilità che dei valori in un intervallo siano compresi tra due limiti
-QUARTILE		= QUARTILE			##	Restituisce il quartile di un insieme di dati
-RANK			= RANGO				##	Restituisce il rango di un numero in un elenco di numeri
-RSQ			= RQ				##	Restituisce la radice quadrata del coefficiente di momento di correlazione di Pearson
-SKEW			= ASIMMETRIA			##	Restituisce il grado di asimmetria di una distribuzione
-SLOPE			= PENDENZA			##	Restituisce la pendenza di una retta di regressione lineare
-SMALL			= PICCOLO			##	Restituisce il k-esimo valore più piccolo in un insieme di dati
-STANDARDIZE		= NORMALIZZA			##	Restituisce un valore normalizzato
-STDEV			= DEV.ST			##	Restituisce una stima della deviazione standard sulla base di un campione
-STDEVA			= DEV.ST.VALORI			##	Restituisce una stima della deviazione standard sulla base di un campione, inclusi i numeri, il testo e i valori logici
-STDEVP			= DEV.ST.POP			##	Calcola la deviazione standard sulla base di un'intera popolazione
-STDEVPA			= DEV.ST.POP.VALORI		##	Calcola la deviazione standard sulla base sull'intera popolazione, inclusi i numeri, il testo e i valori logici
-STEYX			= ERR.STD.YX			##	Restituisce l'errore standard del valore previsto per y per ogni valore x nella regressione
-TDIST			= DISTRIB.T			##	Restituisce la distribuzione t di Student
-TINV			= INV.T				##	Restituisce l'inversa della distribuzione t di Student
-TREND			= TENDENZA			##	Restituisce i valori lungo una linea di tendenza lineare
-TRIMMEAN		= MEDIA.TRONCATA		##	Restituisce la media della parte interna di un insieme di dati
-TTEST			= TEST.T			##	Restituisce la probabilità associata ad un test t di Student
-VAR			= VAR				##	Stima la varianza sulla base di un campione
-VARA			= VAR.VALORI			##	Stima la varianza sulla base di un campione, inclusi i numeri, il testo e i valori logici
-VARP			= VAR.POP			##	Calcola la varianza sulla base dell'intera popolazione
-VARPA			= VAR.POP.VALORI		##	Calcola la deviazione standard sulla base sull'intera popolazione, inclusi i numeri, il testo e i valori logici
-WEIBULL			= WEIBULL			##	Restituisce la distribuzione di Weibull
-ZTEST			= TEST.Z			##	Restituisce il valore di probabilità a una coda per un test z
-
-
-##
-##	Text functions					Funzioni di testo
-##
-ASC			= ASC				##	Modifica le lettere inglesi o il katakana a doppio byte all'interno di una stringa di caratteri in caratteri a singolo byte
-BAHTTEXT		= BAHTTESTO			##	Converte un numero in testo, utilizzando il formato valuta ß (baht)
-CHAR			= CODICE.CARATT			##	Restituisce il carattere specificato dal numero di codice
-CLEAN			= LIBERA			##	Elimina dal testo tutti i caratteri che non è possibile stampare
-CODE			= CODICE			##	Restituisce il codice numerico del primo carattere di una stringa di testo
-CONCATENATE		= CONCATENA			##	Unisce diversi elementi di testo in un unico elemento di testo
-DOLLAR			= VALUTA			##	Converte un numero in testo, utilizzando il formato valuta € (euro)
-EXACT			= IDENTICO			##	Verifica se due valori di testo sono uguali
-FIND			= TROVA				##	Rileva un valore di testo all'interno di un altro (distinzione tra maiuscole e minuscole)
-FINDB			= TROVA.B			##	Rileva un valore di testo all'interno di un altro (distinzione tra maiuscole e minuscole)
-FIXED			= FISSO				##	Formatta un numero come testo con un numero fisso di decimali
-JIS			= ORDINAMENTO.JIS		##	Modifica le lettere inglesi o i caratteri katakana a byte singolo all'interno di una stringa di caratteri in caratteri a byte doppio.
-LEFT			= SINISTRA			##	Restituisce il carattere più a sinistra di un valore di testo
-LEFTB			= SINISTRA.B			##	Restituisce il carattere più a sinistra di un valore di testo
-LEN			= LUNGHEZZA			##	Restituisce il numero di caratteri di una stringa di testo
-LENB			= LUNB				##	Restituisce il numero di caratteri di una stringa di testo
-LOWER			= MINUSC			##	Converte il testo in lettere minuscole
-MID			= MEDIA				##	Restituisce un numero specifico di caratteri di una stringa di testo a partire dalla posizione specificata
-MIDB			= MEDIA.B			##	Restituisce un numero specifico di caratteri di una stringa di testo a partire dalla posizione specificata
-PHONETIC		= FURIGANA			##	Estrae i caratteri fonetici (furigana) da una stringa di testo.
-PROPER			= MAIUSC.INIZ			##	Converte in maiuscolo la prima lettera di ogni parola di un valore di testo
-REPLACE			= RIMPIAZZA			##	Sostituisce i caratteri all'interno di un testo
-REPLACEB		= SOSTITUISCI.B			##	Sostituisce i caratteri all'interno di un testo
-REPT			= RIPETI			##	Ripete un testo per un dato numero di volte
-RIGHT			= DESTRA			##	Restituisce il carattere più a destra di un valore di testo
-RIGHTB			= DESTRA.B			##	Restituisce il carattere più a destra di un valore di testo
-SEARCH			= RICERCA			##	Rileva un valore di testo all'interno di un altro (non è sensibile alle maiuscole e minuscole)
-SEARCHB			= CERCA.B			##	Rileva un valore di testo all'interno di un altro (non è sensibile alle maiuscole e minuscole)
-SUBSTITUTE		= SOSTITUISCI			##	Sostituisce il nuovo testo al testo contenuto in una stringa
-T			= T				##	Converte gli argomenti in testo
-TEXT			= TESTO				##	Formatta un numero e lo converte in testo
-TRIM			= ANNULLA.SPAZI			##	Elimina gli spazi dal testo
-UPPER			= MAIUSC			##	Converte il testo in lettere maiuscole
-VALUE			= VALORE			##	Converte un argomento di testo in numero
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/config
deleted file mode 100644
index 7377a181df0..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= €
-
-
-##
-##	Excel Error Codes	(For future use)
-##
-NULL	= #LEEG!
-DIV0	= #DEEL/0!
-VALUE	= #WAARDE!
-REF	= #VERW!
-NAME	= #NAAM?
-NUM	= #GETAL!
-NA	= #N/B
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
deleted file mode 100644
index b6b8296ef04..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
+++ /dev/null
@@ -1,438 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Calculation
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
-##
-##
-
-
-##
-##	Add-in and Automation functions			Automatiseringsfuncties en functies in invoegtoepassingen
-##
-GETPIVOTDATA		= DRAAITABEL.OPHALEN		##	Geeft gegevens uit een draaitabelrapport als resultaat
-
-
-##
-##	Cube functions					Kubusfuncties
-##
-CUBEKPIMEMBER		= KUBUSKPILID			##	Retourneert de naam, eigenschap en waarde van een KPI (prestatie-indicator) en geeft de naam en de eigenschap in de cel weer. Een KPI is een meetbare waarde, zoals de maandelijkse brutowinst of de omzet per kwartaal per werknemer, die wordt gebruikt om de prestaties van een organisatie te bewaken
-CUBEMEMBER		= KUBUSLID			##	Retourneert een lid of tupel in een kubushiërarchie. Wordt gebruikt om te controleren of het lid of de tupel in de kubus aanwezig is
-CUBEMEMBERPROPERTY	= KUBUSLIDEIGENSCHAP		##	Retourneert de waarde van een lideigenschap in de kubus. Wordt gebruikt om te controleren of de lidnaam in de kubus bestaat en retourneert de opgegeven eigenschap voor dit lid
-CUBERANKEDMEMBER	= KUBUSGERANGCHIKTLID		##	Retourneert het zoveelste, gerangschikte lid in een set. Wordt gebruikt om een of meer elementen in een set te retourneren, zoals de tien beste verkopers of de tien beste studenten
-CUBESET			= KUBUSSET			##	Definieert een berekende set leden of tupels door een ingestelde expressie naar de kubus op de server te sturen, alwaar de set wordt gemaakt en vervolgens wordt geretourneerd naar Microsoft Office Excel
-CUBESETCOUNT		= KUBUSSETAANTAL		##	Retourneert het aantal onderdelen in een set
-CUBEVALUE		= KUBUSWAARDE			##	Retourneert een samengestelde waarde van een kubus
-
-
-##
-##	Database functions				Databasefuncties
-##
-DAVERAGE		= DBGEMIDDELDE			##	Berekent de gemiddelde waarde in geselecteerde databasegegevens
-DCOUNT			= DBAANTAL			##	Telt de cellen met getallen in een database
-DCOUNTA			= DBAANTALC			##	Telt de niet-lege cellen in een database
-DGET			= DBLEZEN			##	Retourneert één record dat voldoet aan de opgegeven criteria uit een database
-DMAX			= DBMAX				##	Retourneert de maximumwaarde in de geselecteerde databasegegevens
-DMIN			= DBMIN				##	Retourneert de minimumwaarde in de geselecteerde databasegegevens
-DPRODUCT		= DBPRODUCT			##	Vermenigvuldigt de waarden in een bepaald veld van de records die voldoen aan de criteria in een database
-DSTDEV			= DBSTDEV			##	Maakt een schatting van de standaarddeviatie op basis van een steekproef uit geselecteerde databasegegevens
-DSTDEVP			= DBSTDEVP			##	Berekent de standaarddeviatie op basis van de volledige populatie van geselecteerde databasegegevens
-DSUM			= DBSOM				##	Telt de getallen uit een kolom records in de database op die voldoen aan de criteria
-DVAR			= DBVAR				##	Maakt een schatting van de variantie op basis van een steekproef uit geselecteerde databasegegevens
-DVARP			= DBVARP			##	Berekent de variantie op basis van de volledige populatie van geselecteerde databasegegevens
-
-
-##
-##	Date and time functions				Datum- en tijdfuncties
-##
-DATE			= DATUM				##	Geeft als resultaat het seriële getal van een opgegeven datum
-DATEVALUE		= DATUMWAARDE			##	Converteert een datum in de vorm van tekst naar een serieel getal
-DAY			= DAG				##	Converteert een serieel getal naar een dag van de maand
-DAYS360			= DAGEN360			##	Berekent het aantal dagen tussen twee datums op basis van een jaar met 360 dagen
-EDATE			= ZELFDE.DAG			##	Geeft als resultaat het seriële getal van een datum die het opgegeven aantal maanden voor of na de begindatum ligt
-EOMONTH			= LAATSTE.DAG			##	Geeft als resultaat het seriële getal van de laatste dag van de maand voor of na het opgegeven aantal maanden
-HOUR			= UUR				##	Converteert een serieel getal naar uren
-MINUTE			= MINUUT			##	Converteert een serieel naar getal minuten
-MONTH			= MAAND				##	Converteert een serieel getal naar een maand
-NETWORKDAYS		= NETTO.WERKDAGEN		##	Geeft als resultaat het aantal hele werkdagen tussen twee datums
-NOW			= NU				##	Geeft als resultaat het seriële getal van de huidige datum en tijd
-SECOND			= SECONDE			##	Converteert een serieel getal naar seconden
-TIME			= TIJD				##	Geeft als resultaat het seriële getal van een bepaald tijdstip
-TIMEVALUE		= TIJDWAARDE			##	Converteert de tijd in de vorm van tekst naar een serieel getal
-TODAY			= VANDAAG			##	Geeft als resultaat het seriële getal van de huidige datum
-WEEKDAY			= WEEKDAG			##	Converteert een serieel getal naar een weekdag
-WEEKNUM			= WEEKNUMMER			##	Converteert een serieel getal naar een weeknummer
-WORKDAY			= WERKDAG			##	Geeft als resultaat het seriële getal van de datum voor of na een bepaald aantal werkdagen
-YEAR			= JAAR				##	Converteert een serieel getal naar een jaar
-YEARFRAC		= JAAR.DEEL			##	Geeft als resultaat het gedeelte van het jaar, uitgedrukt in het aantal hele dagen tussen begindatum en einddatum
-
-
-##
-##	Engineering functions				Technische functies
-##
-BESSELI			= BESSEL.Y			##	Geeft als resultaat de gewijzigde Bessel-functie In(x)
-BESSELJ			= BESSEL.J			##	Geeft als resultaat de Bessel-functie Jn(x)
-BESSELK			= BESSEL.K			##	Geeft als resultaat de gewijzigde Bessel-functie Kn(x)
-BESSELY			= BESSEL.Y			##	Geeft als resultaat de gewijzigde Bessel-functie Yn(x)
-BIN2DEC			= BIN.N.DEC			##	Converteert een binair getal naar een decimaal getal
-BIN2HEX			= BIN.N.HEX			##	Converteert een binair getal naar een hexadecimaal getal
-BIN2OCT			= BIN.N.OCT			##	Converteert een binair getal naar een octaal getal
-COMPLEX			= COMPLEX			##	Converteert reële en imaginaire coëfficiënten naar een complex getal
-CONVERT			= CONVERTEREN			##	Converteert een getal in de ene maateenheid naar een getal in een andere maateenheid
-DEC2BIN			= DEC.N.BIN			##	Converteert een decimaal getal naar een binair getal
-DEC2HEX			= DEC.N.HEX			##	Converteert een decimaal getal naar een hexadecimaal getal
-DEC2OCT			= DEC.N.OCT			##	Converteert een decimaal getal naar een octaal getal
-DELTA			= DELTA				##	Test of twee waarden gelijk zijn
-ERF			= FOUTFUNCTIE			##	Geeft als resultaat de foutfunctie
-ERFC			= FOUT.COMPLEMENT		##	Geeft als resultaat de complementaire foutfunctie
-GESTEP			= GROTER.DAN			##	Test of een getal groter is dan de drempelwaarde
-HEX2BIN			= HEX.N.BIN			##	Converteert een hexadecimaal getal naar een binair getal
-HEX2DEC			= HEX.N.DEC			##	Converteert een hexadecimaal getal naar een decimaal getal
-HEX2OCT			= HEX.N.OCT			##	Converteert een hexadecimaal getal naar een octaal getal
-IMABS			= C.ABS				##	Geeft als resultaat de absolute waarde (modulus) van een complex getal
-IMAGINARY		= C.IM.DEEL			##	Geeft als resultaat de imaginaire coëfficiënt van een complex getal
-IMARGUMENT		= C.ARGUMENT			##	Geeft als resultaat het argument thèta, een hoek uitgedrukt in radialen
-IMCONJUGATE		= C.TOEGEVOEGD			##	Geeft als resultaat het complexe toegevoegde getal van een complex getal
-IMCOS			= C.COS				##	Geeft als resultaat de cosinus van een complex getal
-IMDIV			= C.QUOTIENT			##	Geeft als resultaat het quotiënt van twee complexe getallen
-IMEXP			= C.EXP				##	Geeft als resultaat de exponent van een complex getal
-IMLN			= C.LN				##	Geeft als resultaat de natuurlijke logaritme van een complex getal
-IMLOG10			= C.LOG10			##	Geeft als resultaat de logaritme met grondtal 10 van een complex getal
-IMLOG2			= C.LOG2			##	Geeft als resultaat de logaritme met grondtal 2 van een complex getal
-IMPOWER			= C.MACHT			##	Geeft als resultaat een complex getal dat is verheven tot de macht van een geheel getal
-IMPRODUCT		= C.PRODUCT			##	Geeft als resultaat het product van complexe getallen
-IMREAL			= C.REEEL.DEEL			##	Geeft als resultaat de reële coëfficiënt van een complex getal
-IMSIN			= C.SIN				##	Geeft als resultaat de sinus van een complex getal
-IMSQRT			= C.WORTEL			##	Geeft als resultaat de vierkantswortel van een complex getal
-IMSUB			= C.VERSCHIL			##	Geeft als resultaat het verschil tussen twee complexe getallen
-IMSUM			= C.SOM				##	Geeft als resultaat de som van complexe getallen
-OCT2BIN			= OCT.N.BIN			##	Converteert een octaal getal naar een binair getal
-OCT2DEC			= OCT.N.DEC			##	Converteert een octaal getal naar een decimaal getal
-OCT2HEX			= OCT.N.HEX			##	Converteert een octaal getal naar een hexadecimaal getal
-
-
-##
-##	Financial functions				Financiële functies
-##
-ACCRINT			= SAMENG.RENTE			##	Berekent de opgelopen rente voor een waardepapier waarvan de rente periodiek wordt uitgekeerd
-ACCRINTM		= SAMENG.RENTE.V		##	Berekent de opgelopen rente voor een waardepapier waarvan de rente op de vervaldatum wordt uitgekeerd
-AMORDEGRC		= AMORDEGRC			##	Geeft als resultaat de afschrijving voor elke boekingsperiode door een afschrijvingscoëfficiënt toe te passen
-AMORLINC		= AMORLINC			##	Berekent de afschrijving voor elke boekingsperiode
-COUPDAYBS		= COUP.DAGEN.BB			##	Berekent het aantal dagen vanaf het begin van de coupontermijn tot de stortingsdatum
-COUPDAYS		= COUP.DAGEN			##	Geeft als resultaat het aantal dagen in de coupontermijn waarin de stortingsdatum valt
-COUPDAYSNC		= COUP.DAGEN.VV			##	Geeft als resultaat het aantal dagen vanaf de stortingsdatum tot de volgende couponvervaldatum
-COUPNCD			= COUP.DATUM.NB			##	Geeft als resultaat de volgende coupondatum na de stortingsdatum
-COUPNUM			= COUP.AANTAL			##	Geeft als resultaat het aantal coupons dat nog moet worden uitbetaald tussen de stortingsdatum en de vervaldatum
-COUPPCD			= COUP.DATUM.VB			##	Geeft als resultaat de vorige couponvervaldatum vóór de stortingsdatum
-CUMIPMT			= CUM.RENTE			##	Geeft als resultaat de cumulatieve rente die tussen twee termijnen is uitgekeerd
-CUMPRINC		= CUM.HOOFDSOM			##	Geeft als resultaat de cumulatieve hoofdsom van een lening die tussen twee termijnen is terugbetaald
-DB			= DB				##	Geeft als resultaat de afschrijving van activa voor een bepaalde periode met behulp van de 'fixed declining balance'-methode
-DDB			= DDB				##	Geeft als resultaat de afschrijving van activa over een bepaalde termijn met behulp van de 'double declining balance'-methode of een andere methode die u opgeeft
-DISC			= DISCONTO			##	Geeft als resultaat het discontopercentage voor een waardepapier
-DOLLARDE		= EURO.DE			##	Converteert een prijs in euro's, uitgedrukt in een breuk, naar een prijs in euro's, uitgedrukt in een decimaal getal
-DOLLARFR		= EURO.BR			##	Converteert een prijs in euro's, uitgedrukt in een decimaal getal, naar een prijs in euro's, uitgedrukt in een breuk
-DURATION		= DUUR				##	Geeft als resultaat de gewogen gemiddelde looptijd voor een waardepapier met periodieke rentebetalingen
-EFFECT			= EFFECT.RENTE			##	Geeft als resultaat het effectieve jaarlijkse rentepercentage
-FV			= TW				##	Geeft als resultaat de toekomstige waarde van een investering
-FVSCHEDULE		= TOEK.WAARDE2			##	Geeft als resultaat de toekomstige waarde van een bepaalde hoofdsom na het toepassen van een reeks samengestelde rentepercentages
-INTRATE			= RENTEPERCENTAGE		##	Geeft als resultaat het rentepercentage voor een volgestort waardepapier
-IPMT			= IBET				##	Geeft als resultaat de te betalen rente voor een investering over een bepaalde termijn
-IRR			= IR				##	Geeft als resultaat de interne rentabiliteit voor een reeks cashflows
-ISPMT			= ISBET				##	Geeft als resultaat de rente die is betaald tijdens een bepaalde termijn van een investering
-MDURATION		= AANG.DUUR			##	Geeft als resultaat de aangepaste Macauley-looptijd voor een waardepapier, aangenomen dat de nominale waarde € 100 bedraagt
-MIRR			= GIR				##	Geeft als resultaat de interne rentabiliteit voor een serie cashflows, waarbij voor betalingen een ander rentepercentage geldt dan voor inkomsten
-NOMINAL			= NOMINALE.RENTE		##	Geeft als resultaat het nominale jaarlijkse rentepercentage
-NPER			= NPER				##	Geeft als resultaat het aantal termijnen van een investering
-NPV			= NHW				##	Geeft als resultaat de netto huidige waarde van een investering op basis van een reeks periodieke cashflows en een discontopercentage
-ODDFPRICE		= AFW.ET.PRIJS			##	Geeft als resultaat de prijs per € 100 nominale waarde voor een waardepapier met een afwijkende eerste termijn
-ODDFYIELD		= AFW.ET.REND			##	Geeft als resultaat het rendement voor een waardepapier met een afwijkende eerste termijn
-ODDLPRICE		= AFW.LT.PRIJS			##	Geeft als resultaat de prijs per € 100 nominale waarde voor een waardepapier met een afwijkende laatste termijn
-ODDLYIELD		= AFW.LT.REND			##	Geeft als resultaat het rendement voor een waardepapier met een afwijkende laatste termijn
-PMT			= BET				##	Geeft als resultaat de periodieke betaling voor een annuïteit
-PPMT			= PBET				##	Geeft als resultaat de afbetaling op de hoofdsom voor een bepaalde termijn
-PRICE			= PRIJS.NOM			##	Geeft als resultaat de prijs per € 100 nominale waarde voor een waardepapier waarvan de rente periodiek wordt uitgekeerd
-PRICEDISC		= PRIJS.DISCONTO		##	Geeft als resultaat de prijs per € 100 nominale waarde voor een verdisconteerd waardepapier
-PRICEMAT		= PRIJS.VERVALDAG		##	Geeft als resultaat de prijs per € 100 nominale waarde voor een waardepapier waarvan de rente wordt uitgekeerd op de vervaldatum
-PV			= HW				##	Geeft als resultaat de huidige waarde van een investering
-RATE			= RENTE				##	Geeft als resultaat het periodieke rentepercentage voor een annuïteit
-RECEIVED		= OPBRENGST			##	Geeft als resultaat het bedrag dat op de vervaldatum wordt uitgekeerd voor een volgestort waardepapier
-SLN			= LIN.AFSCHR			##	Geeft als resultaat de lineaire afschrijving van activa over één termijn
-SYD			= SYD				##	Geeft als resultaat de afschrijving van activa over een bepaalde termijn met behulp van de 'Sum-Of-Years-Digits'-methode
-TBILLEQ			= SCHATK.OBL			##	Geeft als resultaat het rendement op schatkistpapier, dat op dezelfde manier wordt berekend als het rendement op obligaties
-TBILLPRICE		= SCHATK.PRIJS			##	Bepaalt de prijs per € 100 nominale waarde voor schatkistpapier
-TBILLYIELD		= SCHATK.REND			##	Berekent het rendement voor schatkistpapier
-VDB			= VDB				##	Geeft als resultaat de afschrijving van activa over een gehele of gedeeltelijke termijn met behulp van de 'declining balance'-methode
-XIRR			= IR.SCHEMA			##	Berekent de interne rentabiliteit voor een betalingsschema van cashflows
-XNPV			= NHW2				##	Berekent de huidige nettowaarde voor een betalingsschema van cashflows
-YIELD			= RENDEMENT			##	Geeft als resultaat het rendement voor een waardepapier waarvan de rente periodiek wordt uitgekeerd
-YIELDDISC		= REND.DISCONTO			##	Geeft als resultaat het jaarlijkse rendement voor een verdisconteerd waardepapier, bijvoorbeeld schatkistpapier
-YIELDMAT		= REND.VERVAL			##	Geeft als resultaat het jaarlijkse rendement voor een waardepapier waarvan de rente wordt uitgekeerd op de vervaldatum
-
-
-##
-##	Information functions				Informatiefuncties
-##
-CELL			= CEL				##	Geeft als resultaat informatie over de opmaak, locatie of inhoud van een cel
-ERROR.TYPE		= TYPE.FOUT			##	Geeft als resultaat een getal dat overeenkomt met een van de foutwaarden van Microsoft Excel
-INFO			= INFO				##	Geeft als resultaat informatie over de huidige besturingsomgeving
-ISBLANK			= ISLEEG			##	Geeft als resultaat WAAR als de waarde leeg is
-ISERR			= ISFOUT2			##	Geeft als resultaat WAAR als de waarde een foutwaarde is, met uitzondering van #N/B
-ISERROR			= ISFOUT			##	Geeft als resultaat WAAR als de waarde een foutwaarde is
-ISEVEN			= IS.EVEN			##	Geeft als resultaat WAAR als het getal even is
-ISLOGICAL		= ISLOGISCH			##	Geeft als resultaat WAAR als de waarde een logische waarde is
-ISNA			= ISNB				##	Geeft als resultaat WAAR als de waarde de foutwaarde #N/B is
-ISNONTEXT		= ISGEENTEKST			##	Geeft als resultaat WAAR als de waarde geen tekst is
-ISNUMBER		= ISGETAL			##	Geeft als resultaat WAAR als de waarde een getal is
-ISODD			= IS.ONEVEN			##	Geeft als resultaat WAAR als het getal oneven is
-ISREF			= ISVERWIJZING			##	Geeft als resultaat WAAR als de waarde een verwijzing is
-ISTEXT			= ISTEKST			##	Geeft als resultaat WAAR als de waarde tekst is
-N			= N				##	Geeft als resultaat een waarde die is geconverteerd naar een getal
-NA			= NB				##	Geeft als resultaat de foutwaarde #N/B
-TYPE			= TYPE				##	Geeft als resultaat een getal dat het gegevenstype van een waarde aangeeft
-
-
-##
-##	Logical functions				Logische functies
-##
-AND			= EN				##	Geeft als resultaat WAAR als alle argumenten WAAR zijn
-FALSE			= ONWAAR			##	Geeft als resultaat de logische waarde ONWAAR
-IF			= ALS				##	Geeft een logische test aan
-IFERROR			= ALS.FOUT			##	Retourneert een waarde die u opgeeft als een formule een fout oplevert, anders wordt het resultaat van de formule geretourneerd
-NOT			= NIET				##	Keert de logische waarde van het argument om
-OR			= OF				##	Geeft als resultaat WAAR als minimaal een van de argumenten WAAR is
-TRUE			= WAAR				##	Geeft als resultaat de logische waarde WAAR
-
-
-##
-##	Lookup and reference functions			Zoek- en verwijzingsfuncties
-##
-ADDRESS			= ADRES				##	Geeft als resultaat een verwijzing, in de vorm van tekst, naar één bepaalde cel in een werkblad
-AREAS			= BEREIKEN			##	Geeft als resultaat het aantal bereiken in een verwijzing
-CHOOSE			= KIEZEN			##	Kiest een waarde uit een lijst met waarden
-COLUMN			= KOLOM				##	Geeft als resultaat het kolomnummer van een verwijzing
-COLUMNS			= KOLOMMEN			##	Geeft als resultaat het aantal kolommen in een verwijzing
-HLOOKUP			= HORIZ.ZOEKEN			##	Zoekt in de bovenste rij van een matrix naar een bepaalde waarde en geeft als resultaat de gevonden waarde in de opgegeven cel
-HYPERLINK		= HYPERLINK			##	Maakt een snelkoppeling of een sprong waarmee een document wordt geopend dat is opgeslagen op een netwerkserver, een intranet of op internet
-INDEX			= INDEX				##	Kiest met een index een waarde uit een verwijzing of een matrix
-INDIRECT		= INDIRECT			##	Geeft als resultaat een verwijzing die wordt aangegeven met een tekstwaarde
-LOOKUP			= ZOEKEN			##	Zoekt naar bepaalde waarden in een vector of een matrix
-MATCH			= VERGELIJKEN			##	Zoekt naar bepaalde waarden in een verwijzing of een matrix
-OFFSET			= VERSCHUIVING			##	Geeft als resultaat een nieuwe verwijzing die is verschoven ten opzichte van een bepaalde verwijzing
-ROW			= RIJ				##	Geeft als resultaat het rijnummer van een verwijzing
-ROWS			= RIJEN				##	Geeft als resultaat het aantal rijen in een verwijzing
-RTD			= RTG				##	Haalt realtimegegevens op uit een programma dat COM-automatisering (automatisering: een methode waarmee de ene toepassing objecten van een andere toepassing of ontwikkelprogramma kan besturen. Automatisering werd vroeger OLE-automatisering genoemd. Automatisering is een industrienorm die deel uitmaakt van het Component Object Model (COM).) ondersteunt
-TRANSPOSE		= TRANSPONEREN			##	Geeft als resultaat de getransponeerde van een matrix
-VLOOKUP			= VERT.ZOEKEN			##	Zoekt in de meest linkse kolom van een matrix naar een bepaalde waarde en geeft als resultaat de waarde in de opgegeven cel
-
-
-##
-##	Math and trigonometry functions			Wiskundige en trigonometrische functies
-##
-ABS			= ABS				##	Geeft als resultaat de absolute waarde van een getal
-ACOS			= BOOGCOS			##	Geeft als resultaat de boogcosinus van een getal
-ACOSH			= BOOGCOSH			##	Geeft als resultaat de inverse cosinus hyperbolicus van een getal
-ASIN			= BOOGSIN			##	Geeft als resultaat de boogsinus van een getal
-ASINH			= BOOGSINH			##	Geeft als resultaat de inverse sinus hyperbolicus van een getal
-ATAN			= BOOGTAN			##	Geeft als resultaat de boogtangens van een getal
-ATAN2			= BOOGTAN2			##	Geeft als resultaat de boogtangens van de x- en y-coördinaten
-ATANH			= BOOGTANH			##	Geeft als resultaat de inverse tangens hyperbolicus van een getal
-CEILING			= AFRONDEN.BOVEN		##	Rondt de absolute waarde van een getal naar boven af op het dichtstbijzijnde gehele getal of het dichtstbijzijnde significante veelvoud
-COMBIN			= COMBINATIES			##	Geeft als resultaat het aantal combinaties voor een bepaald aantal objecten
-COS			= COS				##	Geeft als resultaat de cosinus van een getal
-COSH			= COSH				##	Geeft als resultaat de cosinus hyperbolicus van een getal
-DEGREES			= GRADEN			##	Converteert radialen naar graden
-EVEN			= EVEN				##	Rondt het getal af op het dichtstbijzijnde gehele even getal
-EXP			= EXP				##	Verheft e tot de macht van een bepaald getal
-FACT			= FACULTEIT			##	Geeft als resultaat de faculteit van een getal
-FACTDOUBLE		= DUBBELE.FACULTEIT		##	Geeft als resultaat de dubbele faculteit van een getal
-FLOOR			= AFRONDEN.BENEDEN		##	Rondt de absolute waarde van een getal naar beneden af
-GCD			= GGD				##	Geeft als resultaat de grootste gemene deler
-INT			= INTEGER			##	Rondt een getal naar beneden af op het dichtstbijzijnde gehele getal
-LCM			= KGV				##	Geeft als resultaat het kleinste gemene veelvoud
-LN			= LN				##	Geeft als resultaat de natuurlijke logaritme van een getal
-LOG			= LOG				##	Geeft als resultaat de logaritme met het opgegeven grondtal van een getal
-LOG10			= LOG10				##	Geeft als resultaat de logaritme met grondtal 10 van een getal
-MDETERM			= DETERMINANTMAT		##	Geeft als resultaat de determinant van een matrix
-MINVERSE		= INVERSEMAT			##	Geeft als resultaat de inverse van een matrix
-MMULT			= PRODUCTMAT			##	Geeft als resultaat het product van twee matrices
-MOD			= REST				##	Geeft als resultaat het restgetal van een deling
-MROUND			= AFRONDEN.N.VEELVOUD		##	Geeft als resultaat een getal afgerond op het gewenste veelvoud
-MULTINOMIAL		= MULTINOMIAAL			##	Geeft als resultaat de multinomiaalcoëfficiënt van een reeks getallen
-ODD			= ONEVEN			##	Rondt de absolute waarde van het getal naar boven af op het dichtstbijzijnde gehele oneven getal
-PI			= PI				##	Geeft als resultaat de waarde van pi
-POWER			= MACHT				##	Verheft een getal tot een macht
-PRODUCT			= PRODUCT			##	Vermenigvuldigt de argumenten met elkaar
-QUOTIENT		= QUOTIENT			##	Geeft als resultaat de uitkomst van een deling als geheel getal
-RADIANS			= RADIALEN			##	Converteert graden naar radialen
-RAND			= ASELECT			##	Geeft als resultaat een willekeurig getal tussen 0 en 1
-RANDBETWEEN		= ASELECTTUSSEN			##	Geeft een willekeurig getal tussen de getallen die u hebt opgegeven
-ROMAN			= ROMEINS			##	Converteert een Arabisch getal naar een Romeins getal en geeft het resultaat weer in de vorm van tekst
-ROUND			= AFRONDEN			##	Rondt een getal af op het opgegeven aantal decimalen
-ROUNDDOWN		= AFRONDEN.NAAR.BENEDEN		##	Rondt de absolute waarde van een getal naar beneden af
-ROUNDUP			= AFRONDEN.NAAR.BOVEN		##	Rondt de absolute waarde van een getal naar boven af
-SERIESSUM		= SOM.MACHTREEKS		##	Geeft als resultaat de som van een machtreeks die is gebaseerd op de formule
-SIGN			= POS.NEG			##	Geeft als resultaat het teken van een getal
-SIN			= SIN				##	Geeft als resultaat de sinus van de opgegeven hoek
-SINH			= SINH				##	Geeft als resultaat de sinus hyperbolicus van een getal
-SQRT			= WORTEL			##	Geeft als resultaat de positieve vierkantswortel van een getal
-SQRTPI			= WORTEL.PI			##	Geeft als resultaat de vierkantswortel van (getal * pi)
-SUBTOTAL		= SUBTOTAAL			##	Geeft als resultaat een subtotaal voor een bereik
-SUM			= SOM				##	Telt de argumenten op
-SUMIF			= SOM.ALS			##	Telt de getallen bij elkaar op die voldoen aan een bepaald criterium
-SUMIFS			= SOMMEN.ALS			##	Telt de cellen in een bereik op die aan meerdere criteria voldoen
-SUMPRODUCT		= SOMPRODUCT			##	Geeft als resultaat de som van de producten van de corresponderende matrixelementen
-SUMSQ			= KWADRATENSOM			##	Geeft als resultaat de som van de kwadraten van de argumenten
-SUMX2MY2		= SOM.X2MINY2			##	Geeft als resultaat de som van het verschil tussen de kwadraten van corresponderende waarden in twee matrices
-SUMX2PY2		= SOM.X2PLUSY2			##	Geeft als resultaat de som van de kwadratensom van corresponderende waarden in twee matrices
-SUMXMY2			= SOM.XMINY.2			##	Geeft als resultaat de som van de kwadraten van de verschillen tussen de corresponderende waarden in twee matrices
-TAN			= TAN				##	Geeft als resultaat de tangens van een getal
-TANH			= TANH				##	Geeft als resultaat de tangens hyperbolicus van een getal
-TRUNC			= GEHEEL			##	Kapt een getal af tot een geheel getal
-
-
-##
-##	Statistical functions				Statistische functies
-##
-AVEDEV			= GEM.DEVIATIE			##	Geeft als resultaat het gemiddelde van de absolute deviaties van gegevenspunten ten opzichte van hun gemiddelde waarde
-AVERAGE			= GEMIDDELDE			##	Geeft als resultaat het gemiddelde van de argumenten
-AVERAGEA		= GEMIDDELDEA			##	Geeft als resultaat het gemiddelde van de argumenten, inclusief getallen, tekst en logische waarden
-AVERAGEIF		= GEMIDDELDE.ALS		##	Geeft het gemiddelde (rekenkundig gemiddelde) als resultaat van alle cellen in een bereik die voldoen aan de opgegeven criteria
-AVERAGEIFS		= GEMIDDELDEN.ALS		##	Geeft het gemiddelde (rekenkundig gemiddelde) als resultaat van alle cellen die aan meerdere criteria voldoen
-BETADIST		= BETA.VERD			##	Geeft als resultaat de cumulatieve bèta-verdelingsfunctie
-BETAINV			= BETA.INV			##	Geeft als resultaat de inverse van de cumulatieve verdelingsfunctie voor een gegeven bèta-verdeling
-BINOMDIST		= BINOMIALE.VERD		##	Geeft als resultaat de binomiale verdeling
-CHIDIST			= CHI.KWADRAAT			##	Geeft als resultaat de eenzijdige kans van de chi-kwadraatverdeling
-CHIINV			= CHI.KWADRAAT.INV		##	Geeft als resultaat de inverse van een eenzijdige kans van de chi-kwadraatverdeling
-CHITEST			= CHI.TOETS			##	Geeft als resultaat de onafhankelijkheidstoets
-CONFIDENCE		= BETROUWBAARHEID		##	Geeft als resultaat het betrouwbaarheidsinterval van een gemiddelde waarde voor de elementen van een populatie
-CORREL			= CORRELATIE			##	Geeft als resultaat de correlatiecoëfficiënt van twee gegevensverzamelingen
-COUNT			= AANTAL			##	Telt het aantal getallen in de argumentenlijst
-COUNTA			= AANTALARG			##	Telt het aantal waarden in de argumentenlijst
-COUNTBLANK		= AANTAL.LEGE.CELLEN		##	Telt het aantal lege cellen in een bereik
-COUNTIF			= AANTAL.ALS			##	Telt in een bereik het aantal cellen die voldoen aan een bepaald criterium
-COUNTIFS		= AANTALLEN.ALS			##	Telt in een bereik het aantal cellen die voldoen aan meerdere criteria
-COVAR			= COVARIANTIE			##	Geeft als resultaat de covariantie, het gemiddelde van de producten van de gepaarde deviaties
-CRITBINOM		= CRIT.BINOM			##	Geeft als resultaat de kleinste waarde waarvoor de binomiale verdeling kleiner is dan of gelijk is aan het criterium
-DEVSQ			= DEV.KWAD			##	Geeft als resultaat de som van de deviaties in het kwadraat
-EXPONDIST		= EXPON.VERD			##	Geeft als resultaat de exponentiële verdeling
-FDIST			= F.VERDELING			##	Geeft als resultaat de F-verdeling
-FINV			= F.INVERSE			##	Geeft als resultaat de inverse van de F-verdeling
-FISHER			= FISHER			##	Geeft als resultaat de Fisher-transformatie
-FISHERINV		= FISHER.INV			##	Geeft als resultaat de inverse van de Fisher-transformatie
-FORECAST		= VOORSPELLEN			##	Geeft als resultaat een waarde op basis van een lineaire trend
-FREQUENCY		= FREQUENTIE			##	Geeft als resultaat een frequentieverdeling in de vorm van een verticale matrix
-FTEST			= F.TOETS			##	Geeft als resultaat een F-toets
-GAMMADIST		= GAMMA.VERD			##	Geeft als resultaat de gamma-verdeling
-GAMMAINV		= GAMMA.INV			##	Geeft als resultaat de inverse van de cumulatieve gamma-verdeling
-GAMMALN			= GAMMA.LN			##	Geeft als resultaat de natuurlijke logaritme van de gamma-functie, G(x)
-GEOMEAN			= MEETK.GEM			##	Geeft als resultaat het meetkundige gemiddelde
-GROWTH			= GROEI				##	Geeft als resultaat de waarden voor een exponentiële trend
-HARMEAN			= HARM.GEM			##	Geeft als resultaat het harmonische gemiddelde
-HYPGEOMDIST		= HYPERGEO.VERD			##	Geeft als resultaat de hypergeometrische verdeling
-INTERCEPT		= SNIJPUNT			##	Geeft als resultaat het snijpunt van de lineaire regressielijn met de y-as
-KURT			= KURTOSIS			##	Geeft als resultaat de kurtosis van een gegevensverzameling
-LARGE			= GROOTSTE			##	Geeft als resultaat de op k-1 na grootste waarde in een gegevensverzameling
-LINEST			= LIJNSCH			##	Geeft als resultaat de parameters van een lineaire trend
-LOGEST			= LOGSCH			##	Geeft als resultaat de parameters van een exponentiële trend
-LOGINV			= LOG.NORM.INV			##	Geeft als resultaat de inverse van de logaritmische normale verdeling
-LOGNORMDIST		= LOG.NORM.VERD			##	Geeft als resultaat de cumulatieve logaritmische normale verdeling
-MAX			= MAX				##	Geeft als resultaat de maximumwaarde in een lijst met argumenten
-MAXA			= MAXA				##	Geeft als resultaat de maximumwaarde in een lijst met argumenten, inclusief getallen, tekst en logische waarden
-MEDIAN			= MEDIAAN			##	Geeft als resultaat de mediaan van de opgegeven getallen
-MIN			= MIN				##	Geeft als resultaat de minimumwaarde in een lijst met argumenten
-MINA			= MINA				##	Geeft als resultaat de minimumwaarde in een lijst met argumenten, inclusief getallen, tekst en logische waarden
-MODE			= MODUS				##	Geeft als resultaat de meest voorkomende waarde in een gegevensverzameling
-NEGBINOMDIST		= NEG.BINOM.VERD		##	Geeft als resultaat de negatieve binomiaalverdeling
-NORMDIST		= NORM.VERD			##	Geeft als resultaat de cumulatieve normale verdeling
-NORMINV			= NORM.INV			##	Geeft als resultaat de inverse van de cumulatieve standaardnormale verdeling
-NORMSDIST		= STAND.NORM.VERD		##	Geeft als resultaat de cumulatieve standaardnormale verdeling
-NORMSINV		= STAND.NORM.INV		##	Geeft als resultaat de inverse van de cumulatieve normale verdeling
-PEARSON			= PEARSON			##	Geeft als resultaat de correlatiecoëfficiënt van Pearson
-PERCENTILE		= PERCENTIEL			##	Geeft als resultaat het k-de percentiel van waarden in een bereik
-PERCENTRANK		= PERCENT.RANG			##	Geeft als resultaat de positie, in procenten uitgedrukt, van een waarde in de rangorde van een gegevensverzameling
-PERMUT			= PERMUTATIES			##	Geeft als resultaat het aantal permutaties voor een gegeven aantal objecten
-POISSON			= POISSON			##	Geeft als resultaat de Poisson-verdeling
-PROB			= KANS				##	Geeft als resultaat de kans dat waarden zich tussen twee grenzen bevinden
-QUARTILE		= KWARTIEL			##	Geeft als resultaat het kwartiel van een gegevensverzameling
-RANK			= RANG				##	Geeft als resultaat het rangnummer van een getal in een lijst getallen
-RSQ			= R.KWADRAAT			##	Geeft als resultaat het kwadraat van de Pearson-correlatiecoëfficiënt
-SKEW			= SCHEEFHEID			##	Geeft als resultaat de mate van asymmetrie van een verdeling
-SLOPE			= RICHTING			##	Geeft als resultaat de richtingscoëfficiënt van een lineaire regressielijn
-SMALL			= KLEINSTE			##	Geeft als resultaat de op k-1 na kleinste waarde in een gegevensverzameling
-STANDARDIZE		= NORMALISEREN			##	Geeft als resultaat een genormaliseerde waarde
-STDEV			= STDEV				##	Maakt een schatting van de standaarddeviatie op basis van een steekproef
-STDEVA			= STDEVA			##	Maakt een schatting van de standaarddeviatie op basis van een steekproef, inclusief getallen, tekst en logische waarden
-STDEVP			= STDEVP			##	Berekent de standaarddeviatie op basis van de volledige populatie
-STDEVPA			= STDEVPA			##	Berekent de standaarddeviatie op basis van de volledige populatie, inclusief getallen, tekst en logische waarden
-STEYX			= STAND.FOUT.YX			##	Geeft als resultaat de standaardfout in de voorspelde y-waarde voor elke x in een regressie
-TDIST			= T.VERD			##	Geeft als resultaat de Student T-verdeling
-TINV			= T.INV				##	Geeft als resultaat de inverse van de Student T-verdeling
-TREND			= TREND				##	Geeft als resultaat de waarden voor een lineaire trend
-TRIMMEAN		= GETRIMD.GEM			##	Geeft als resultaat het gemiddelde van waarden in een gegevensverzameling
-TTEST			= T.TOETS			##	Geeft als resultaat de kans met behulp van de Student T-toets
-VAR			= VAR				##	Maakt een schatting van de variantie op basis van een steekproef
-VARA			= VARA				##	Maakt een schatting van de variantie op basis van een steekproef, inclusief getallen, tekst en logische waarden
-VARP			= VARP				##	Berekent de variantie op basis van de volledige populatie
-VARPA			= VARPA				##	Berekent de standaarddeviatie op basis van de volledige populatie, inclusief getallen, tekst en logische waarden
-WEIBULL			= WEIBULL			##	Geeft als resultaat de Weibull-verdeling
-ZTEST			= Z.TOETS			##	Geeft als resultaat de eenzijdige kanswaarde van een Z-toets
-
-
-##
-##	Text functions					Tekstfuncties
-##
-ASC			= ASC				##	Wijzigt Nederlandse letters of katakanatekens over de volle breedte (dubbel-bytetekens) binnen een tekenreeks in tekens over de halve breedte (enkel-bytetekens)
-BAHTTEXT		= BAHT.TEKST			##	Converteert een getal naar tekst met de valutanotatie ß (baht)
-CHAR			= TEKEN				##	Geeft als resultaat het teken dat hoort bij de opgegeven code
-CLEAN			= WISSEN.CONTROL		##	Verwijdert alle niet-afdrukbare tekens uit een tekst
-CODE			= CODE				##	Geeft als resultaat de numerieke code voor het eerste teken in een tekenreeks
-CONCATENATE		= TEKST.SAMENVOEGEN		##	Voegt verschillende tekstfragmenten samen tot één tekstfragment
-DOLLAR			= EURO				##	Converteert een getal naar tekst met de valutanotatie € (euro)
-EXACT			= GELIJK			##	Controleert of twee tekenreeksen identiek zijn
-FIND			= VIND.ALLES			##	Zoekt een bepaalde tekenreeks in een tekst (waarbij onderscheid wordt gemaakt tussen hoofdletters en kleine letters)
-FINDB			= VIND.ALLES.B			##	Zoekt een bepaalde tekenreeks in een tekst (waarbij onderscheid wordt gemaakt tussen hoofdletters en kleine letters)
-FIXED			= VAST				##	Maakt een getal als tekst met een vast aantal decimalen op
-JIS			= JIS				##	Wijzigt Nederlandse letters of katakanatekens over de halve breedte (enkel-bytetekens) binnen een tekenreeks in tekens over de volle breedte (dubbel-bytetekens)
-LEFT			= LINKS				##	Geeft als resultaat de meest linkse tekens in een tekenreeks
-LEFTB			= LINKSB			##	Geeft als resultaat de meest linkse tekens in een tekenreeks
-LEN			= LENGTE			##	Geeft als resultaat het aantal tekens in een tekenreeks
-LENB			= LENGTEB			##	Geeft als resultaat het aantal tekens in een tekenreeks
-LOWER			= KLEINE.LETTERS		##	Zet tekst om in kleine letters
-MID			= MIDDEN			##	Geeft als resultaat een bepaald aantal tekens van een tekenreeks vanaf de positie die u opgeeft
-MIDB			= DEELB				##	Geeft als resultaat een bepaald aantal tekens van een tekenreeks vanaf de positie die u opgeeft
-PHONETIC		= FONETISCH			##	Haalt de fonetische tekens (furigana) uit een tekenreeks op
-PROPER			= BEGINLETTERS			##	Zet de eerste letter van elk woord in een tekst om in een hoofdletter
-REPLACE			= VERVANG			##	Vervangt tekens binnen een tekst
-REPLACEB		= VERVANGENB			##	Vervangt tekens binnen een tekst
-REPT			= HERHALING			##	Herhaalt een tekst een aantal malen
-RIGHT			= RECHTS			##	Geeft als resultaat de meest rechtse tekens in een tekenreeks
-RIGHTB			= RECHTSB			##	Geeft als resultaat de meest rechtse tekens in een tekenreeks
-SEARCH			= VIND.SPEC			##	Zoekt een bepaalde tekenreeks in een tekst (waarbij geen onderscheid wordt gemaakt tussen hoofdletters en kleine letters)
-SEARCHB			= VIND.SPEC.B			##	Zoekt een bepaalde tekenreeks in een tekst (waarbij geen onderscheid wordt gemaakt tussen hoofdletters en kleine letters)
-SUBSTITUTE		= SUBSTITUEREN			##	Vervangt oude tekst door nieuwe tekst in een tekenreeks
-T			= T				##	Converteert de argumenten naar tekst
-TEXT			= TEKST				##	Maakt een getal op en converteert het getal naar tekst
-TRIM			= SPATIES.WISSEN		##	Verwijdert de spaties uit een tekst
-UPPER			= HOOFDLETTERS			##	Zet tekst om in hoofdletters
-VALUE			= WAARDE			##	Converteert tekst naar een getal
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/config
deleted file mode 100644
index 15fcc128640..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= kr
-
-
-##
-##	Excel Error Codes	(For future use)
-##
-NULL	= #NULL!
-DIV0	= #DIV/0!
-VALUE	= #VERDI!
-REF	= #REF!
-NAME	= #NAVN?
-NUM	= #NUM!
-NA	= #I/T
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
deleted file mode 100644
index 57a80a7a406..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
+++ /dev/null
@@ -1,438 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Calculation
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
-##
-##
-
-
-##
-##	Add-in and Automation functions				Funksjonene Tillegg og Automatisering
-##
-GETPIVOTDATA		= HENTPIVOTDATA				##	Returnerer data som er lagret i en pivottabellrapport
-
-
-##
-##	Cube functions						Kubefunksjoner
-##
-CUBEKPIMEMBER		= KUBEKPIMEDLEM				##	Returnerer navnet, egenskapen og målet for en viktig ytelsesindikator (KPI), og viser navnet og egenskapen i cellen. En KPI er en målbar enhet, for eksempel månedlig bruttoinntjening eller kvartalsvis inntjening per ansatt, og brukes til å overvåke ytelsen i en organisasjon.
-CUBEMEMBER		= KUBEMEDLEM				##	Returnerer et medlem eller en tuppel i et kubehierarki. Brukes til å validere at medlemmet eller tuppelen finnes i kuben.
-CUBEMEMBERPROPERTY	= KUBEMEDLEMEGENSKAP			##	Returnerer verdien til en medlemsegenskap i kuben. Brukes til å validere at et medlemsnavn finnes i kuben, og til å returnere den angitte egenskapen for dette medlemmet.
-CUBERANKEDMEMBER	= KUBERANGERTMEDLEM			##	Returnerer det n-te, eller rangerte, medlemmet i et sett. Brukes til å returnere ett eller flere elementer i et sett, for eksempel de 10 beste studentene.
-CUBESET			= KUBESETT				##	Definerer et beregnet sett av medlemmer eller tuppeler ved å sende et settuttrykk til kuben på serveren, noe som oppretter settet og deretter returnerer dette settet til Microsoft Office Excel.
-CUBESETCOUNT		= KUBESETTANTALL			##	Returnerer antallet elementer i et sett.
-CUBEVALUE		= KUBEVERDI				##	Returnerer en aggregert verdi fra en kube.
-
-
-##
-##	Database functions					Databasefunksjoner
-##
-DAVERAGE		= DGJENNOMSNITT				##	Returnerer gjennomsnittet av merkede databaseposter
-DCOUNT			= DANTALL				##	Teller celler som inneholder tall i en database
-DCOUNTA			= DANTALLA				##	Teller celler som ikke er tomme i en database
-DGET			= DHENT					##	Trekker ut fra en database en post som oppfyller angitte vilkår
-DMAX			= DMAKS					##	Returnerer maksimumsverdien fra merkede databaseposter
-DMIN			= DMIN					##	Returnerer minimumsverdien fra merkede databaseposter
-DPRODUCT		= DPRODUKT				##	Multipliserer verdiene i et bestemt felt med poster som oppfyller vilkårene i en database
-DSTDEV			= DSTDAV				##	Estimerer standardavviket basert på et utvalg av merkede databaseposter
-DSTDEVP			= DSTAVP				##	Beregner standardavviket basert på at merkede databaseposter utgjør hele populasjonen
-DSUM			= DSUMMER				##	Legger til tallene i feltkolonnen med poster, i databasen som oppfyller vilkårene
-DVAR			= DVARIANS				##	Estimerer variansen basert på et utvalg av merkede databaseposter
-DVARP			= DVARIANSP				##	Beregner variansen basert på at merkede databaseposter utgjør hele populasjonen
-
-
-##
-##	Date and time functions					Dato- og tidsfunksjoner
-##
-DATE			= DATO					##	Returnerer serienummeret som svarer til en bestemt dato
-DATEVALUE		= DATOVERDI				##	Konverterer en dato med tekstformat til et serienummer
-DAY			= DAG					##	Konverterer et serienummer til en dag i måneden
-DAYS360			= DAGER360				##	Beregner antall dager mellom to datoer basert på et år med 360 dager
-EDATE			= DAG.ETTER				##	Returnerer serienummeret som svarer til datoen som er det indikerte antall måneder før eller etter startdatoen
-EOMONTH			= MÅNEDSSLUTT				##	Returnerer serienummeret som svarer til siste dag i måneden, før eller etter et angitt antall måneder
-HOUR			= TIME					##	Konverterer et serienummer til en time
-MINUTE			= MINUTT				##	Konverterer et serienummer til et minutt
-MONTH			= MÅNED					##	Konverterer et serienummer til en måned
-NETWORKDAYS		= NETT.ARBEIDSDAGER			##	Returnerer antall hele arbeidsdager mellom to datoer
-NOW			= NÅ					##	Returnerer serienummeret som svarer til gjeldende dato og klokkeslett
-SECOND			= SEKUND				##	Konverterer et serienummer til et sekund
-TIME			= TID					##	Returnerer serienummeret som svarer til et bestemt klokkeslett
-TIMEVALUE		= TIDSVERDI				##	Konverterer et klokkeslett i tekstformat til et serienummer
-TODAY			= IDAG					##	Returnerer serienummeret som svarer til dagens dato
-WEEKDAY			= UKEDAG				##	Konverterer et serienummer til en ukedag
-WEEKNUM			= UKENR					##	Konverterer et serienummer til et tall som representerer hvilket nummer uken har i et år
-WORKDAY			= ARBEIDSDAG				##	Returnerer serienummeret som svarer til datoen før eller etter et angitt antall arbeidsdager
-YEAR			= ÅR					##	Konverterer et serienummer til et år
-YEARFRAC		= ÅRDEL					##	Returnerer brøkdelen for året, som svarer til antall hele dager mellom startdato og sluttdato
-
-
-##
-##	Engineering functions					Tekniske funksjoner
-##
-BESSELI			= BESSELI				##	Returnerer den endrede Bessel-funksjonen In(x)
-BESSELJ			= BESSELJ				##	Returnerer Bessel-funksjonen Jn(x)
-BESSELK			= BESSELK				##	Returnerer den endrede Bessel-funksjonen Kn(x)
-BESSELY			= BESSELY				##	Returnerer Bessel-funksjonen Yn(x)
-BIN2DEC			= BINTILDES				##	Konverterer et binært tall til et desimaltall
-BIN2HEX			= BINTILHEKS				##	Konverterer et binært tall til et heksadesimaltall
-BIN2OCT			= BINTILOKT				##	Konverterer et binært tall til et oktaltall
-COMPLEX			= KOMPLEKS				##	Konverterer reelle og imaginære koeffisienter til et komplekst tall
-CONVERT			= KONVERTER				##	Konverterer et tall fra ett målsystem til et annet
-DEC2BIN			= DESTILBIN				##	Konverterer et desimaltall til et binærtall
-DEC2HEX			= DESTILHEKS				##	Konverterer et heltall i 10-tallsystemet til et heksadesimalt tall
-DEC2OCT			= DESTILOKT				##	Konverterer et heltall i 10-tallsystemet til et oktaltall
-DELTA			= DELTA					##	Undersøker om to verdier er like
-ERF			= FEILF					##	Returnerer feilfunksjonen
-ERFC			= FEILFK				##	Returnerer den komplementære feilfunksjonen
-GESTEP			= GRENSEVERDI				##	Tester om et tall er større enn en terskelverdi
-HEX2BIN			= HEKSTILBIN				##	Konverterer et heksadesimaltall til et binært tall
-HEX2DEC			= HEKSTILDES				##	Konverterer et heksadesimalt tall til et heltall i 10-tallsystemet
-HEX2OCT			= HEKSTILOKT				##	Konverterer et heksadesimalt tall til et oktaltall
-IMABS			= IMABS					##	Returnerer absoluttverdien (koeffisienten) til et komplekst tall
-IMAGINARY		= IMAGINÆR				##	Returnerer den imaginære koeffisienten til et komplekst tall
-IMARGUMENT		= IMARGUMENT				##	Returnerer argumentet theta, som er en vinkel uttrykt i radianer
-IMCONJUGATE		= IMKONJUGERT				##	Returnerer den komplekse konjugaten til et komplekst tall
-IMCOS			= IMCOS					##	Returnerer cosinus til et komplekst tall
-IMDIV			= IMDIV					##	Returnerer kvotienten til to komplekse tall
-IMEXP			= IMEKSP				##	Returnerer eksponenten til et komplekst tall
-IMLN			= IMLN					##	Returnerer den naturlige logaritmen for et komplekst tall
-IMLOG10			= IMLOG10				##	Returnerer logaritmen med grunntall 10 for et komplekst tall
-IMLOG2			= IMLOG2				##	Returnerer logaritmen med grunntall 2 for et komplekst tall
-IMPOWER			= IMOPPHØY				##	Returnerer et komplekst tall opphøyd til en heltallspotens
-IMPRODUCT		= IMPRODUKT				##	Returnerer produktet av komplekse tall
-IMREAL			= IMREELL				##	Returnerer den reelle koeffisienten til et komplekst tall
-IMSIN			= IMSIN					##	Returnerer sinus til et komplekst tall
-IMSQRT			= IMROT					##	Returnerer kvadratroten av et komplekst tall
-IMSUB			= IMSUB					##	Returnerer differansen mellom to komplekse tall
-IMSUM			= IMSUMMER				##	Returnerer summen av komplekse tall
-OCT2BIN			= OKTTILBIN				##	Konverterer et oktaltall til et binært tall
-OCT2DEC			= OKTTILDES				##	Konverterer et oktaltall til et desimaltall
-OCT2HEX			= OKTTILHEKS				##	Konverterer et oktaltall til et heksadesimaltall
-
-
-##
-##	Financial functions					Økonomiske funksjoner
-##
-ACCRINT			= PÅLØPT.PERIODISK.RENTE		##	Returnerer påløpte renter for et verdipapir som betaler periodisk rente
-ACCRINTM		= PÅLØPT.FORFALLSRENTE			##	Returnerer den påløpte renten for et verdipapir som betaler rente ved forfall
-AMORDEGRC		= AMORDEGRC				##	Returnerer avskrivningen for hver regnskapsperiode ved hjelp av en avskrivingskoeffisient
-AMORLINC		= AMORLINC				##	Returnerer avskrivingen for hver regnskapsperiode
-COUPDAYBS		= OBLIG.DAGER.FF			##	Returnerer antall dager fra begynnelsen av den rentebærende perioden til innløsningsdatoen
-COUPDAYS		= OBLIG.DAGER				##	Returnerer antall dager i den rentebærende perioden som inneholder innløsningsdatoen
-COUPDAYSNC		= OBLIG.DAGER.NF			##	Returnerer antall dager fra betalingsdato til neste renteinnbetalingsdato
-COUPNCD			= OBLIG.DAGER.EF			##	Returnerer obligasjonsdatoen som kommer etter oppgjørsdatoen
-COUPNUM			= OBLIG.ANTALL				##	Returnerer antall obligasjoner som skal betales mellom oppgjørsdatoen og forfallsdatoen
-COUPPCD			= OBLIG.DAG.FORRIGE			##	Returnerer obligasjonsdatoen som kommer før oppgjørsdatoen
-CUMIPMT			= SAMLET.RENTE				##	Returnerer den kumulative renten som er betalt mellom to perioder
-CUMPRINC		= SAMLET.HOVEDSTOL			##	Returnerer den kumulative hovedstolen som er betalt for et lån mellom to perioder
-DB			= DAVSKR				##	Returnerer avskrivningen for et aktivum i en angitt periode, foretatt med fast degressiv avskrivning
-DDB			= DEGRAVS				##	Returnerer avskrivningen for et aktivum for en gitt periode, ved hjelp av dobbel degressiv avskrivning eller en metode som du selv angir
-DISC			= DISKONTERT				##	Returnerer diskonteringsraten for et verdipapir
-DOLLARDE		= DOLLARDE				##	Konverterer en valutapris uttrykt som en brøk, til en valutapris uttrykt som et desimaltall
-DOLLARFR		= DOLLARBR				##	Konverterer en valutapris uttrykt som et desimaltall, til en valutapris uttrykt som en brøk
-DURATION		= VARIGHET				##	Returnerer årlig varighet for et verdipapir med renter som betales periodisk
-EFFECT			= EFFEKTIV.RENTE			##	Returnerer den effektive årlige rentesatsen
-FV			= SLUTTVERDI				##	Returnerer fremtidig verdi for en investering
-FVSCHEDULE		= SVPLAN				##	Returnerer den fremtidige verdien av en inngående hovedstol etter å ha anvendt en serie med sammensatte rentesatser
-INTRATE			= RENTESATS				##	Returnerer rentefoten av et fullfinansiert verdipapir
-IPMT			= RAVDRAG				##	Returnerer betalte renter på en investering for en gitt periode
-IRR			= IR					##	Returnerer internrenten for en serie kontantstrømmer
-ISPMT			= ER.AVDRAG				##	Beregner renten som er betalt for en investering i løpet av en bestemt periode
-MDURATION		= MVARIGHET				##	Returnerer Macauleys modifiserte varighet for et verdipapir med en antatt pålydende verdi på kr 100,00
-MIRR			= MODIR					##	Returnerer internrenten der positive og negative kontantstrømmer finansieres med forskjellige satser
-NOMINAL			= NOMINELL				##	Returnerer årlig nominell rentesats
-NPER			= PERIODER				##	Returnerer antall perioder for en investering
-NPV			= NNV					##	Returnerer netto nåverdi for en investering, basert på en serie periodiske kontantstrømmer og en rentesats
-ODDFPRICE		= AVVIKFP.PRIS				##	Returnerer pris pålydende kr 100 for et verdipapir med en odde første periode
-ODDFYIELD		= AVVIKFP.AVKASTNING			##	Returnerer avkastingen for et verdipapir med en odde første periode
-ODDLPRICE		= AVVIKSP.PRIS				##	Returnerer pris pålydende kr 100 for et verdipapir med en odde siste periode
-ODDLYIELD		= AVVIKSP.AVKASTNING			##	Returnerer avkastingen for et verdipapir med en odde siste periode
-PMT			= AVDRAG				##	Returnerer periodisk betaling for en annuitet
-PPMT			= AMORT					##	Returnerer betalingen på hovedstolen for en investering i en gitt periode
-PRICE			= PRIS					##	Returnerer prisen per pålydende kr 100 for et verdipapir som gir periodisk avkastning
-PRICEDISC		= PRIS.DISKONTERT			##	Returnerer prisen per pålydende kr 100 for et diskontert verdipapir
-PRICEMAT		= PRIS.FORFALL				##	Returnerer prisen per pålydende kr 100 av et verdipapir som betaler rente ved forfall
-PV			= NÅVERDI				##	Returnerer nåverdien av en investering
-RATE			= RENTE					##	Returnerer rentesatsen per periode for en annuitet
-RECEIVED		= MOTTATT.AVKAST			##	Returnerer summen som mottas ved forfallsdato for et fullinvestert verdipapir
-SLN			= LINAVS				##	Returnerer den lineære avskrivningen for et aktivum i én periode
-SYD			= ÅRSAVS				##	Returnerer årsavskrivningen for et aktivum i en angitt periode
-TBILLEQ			= TBILLEKV				##	Returnerer den obligasjonsekvivalente avkastningen for en statsobligasjon
-TBILLPRICE		= TBILLPRIS				##	Returnerer prisen per pålydende kr 100 for en statsobligasjon
-TBILLYIELD		= TBILLAVKASTNING			##	Returnerer avkastningen til en statsobligasjon
-VDB			= VERDIAVS				##	Returnerer avskrivningen for et aktivum i en angitt periode eller delperiode, ved hjelp av degressiv avskrivning
-XIRR			= XIR					##	Returnerer internrenten for en serie kontantstrømmer som ikke nødvendigvis er periodiske
-XNPV			= XNNV					##	Returnerer netto nåverdi for en serie kontantstrømmer som ikke nødvendigvis er periodiske
-YIELD			= AVKAST				##	Returnerer avkastningen på et verdipapir som betaler periodisk rente
-YIELDDISC		= AVKAST.DISKONTERT			##	Returnerer årlig avkastning for et diskontert verdipapir, for eksempel en statskasseveksel
-YIELDMAT		= AVKAST.FORFALL			##	Returnerer den årlige avkastningen for et verdipapir som betaler rente ved forfallsdato
-
-
-##
-##	Information functions					Informasjonsfunksjoner
-##
-CELL			= CELLE					##	Returnerer informasjon om formatering, plassering eller innholdet til en celle
-ERROR.TYPE		= FEIL.TYPE				##	Returnerer et tall som svarer til en feiltype
-INFO			= INFO					##	Returnerer informasjon om gjeldende operativmiljø
-ISBLANK			= ERTOM					##	Returnerer SANN hvis verdien er tom
-ISERR			= ERFEIL				##	Returnerer SANN hvis verdien er en hvilken som helst annen feilverdi enn #I/T
-ISERROR			= ERFEIL				##	Returnerer SANN hvis verdien er en hvilken som helst feilverdi
-ISEVEN			= ERPARTALL				##	Returnerer SANN hvis tallet er et partall
-ISLOGICAL		= ERLOGISK				##	Returnerer SANN hvis verdien er en logisk verdi
-ISNA			= ERIT					##	Returnerer SANN hvis verdien er feilverdien #I/T
-ISNONTEXT		= ERIKKETEKST				##	Returnerer SANN hvis verdien ikke er tekst
-ISNUMBER		= ERTALL				##	Returnerer SANN hvis verdien er et tall
-ISODD			= ERODDETALL				##	Returnerer SANN hvis tallet er et oddetall
-ISREF			= ERREF					##	Returnerer SANN hvis verdien er en referanse
-ISTEXT			= ERTEKST				##	Returnerer SANN hvis verdien er tekst
-N			= N					##	Returnerer en verdi som er konvertert til et tall
-NA			= IT					##	Returnerer feilverdien #I/T
-TYPE			= VERDITYPE				##	Returnerer et tall som indikerer datatypen til en verdi
-
-
-##
-##	Logical functions					Logiske funksjoner
-##
-AND			= OG					##	Returnerer SANN hvis alle argumentene er lik SANN
-FALSE			= USANN					##	Returnerer den logiske verdien USANN
-IF			= HVIS					##	Angir en logisk test som skal utføres
-IFERROR			= HVISFEIL				##	Returnerer en verdi du angir hvis en formel evaluerer til en feil. Ellers returnerer den resultatet av formelen.
-NOT			= IKKE					##	Reverserer logikken til argumentet
-OR			= ELLER					##	Returnerer SANN hvis ett eller flere argumenter er lik SANN
-TRUE			= SANN					##	Returnerer den logiske verdien SANN
-
-
-##
-##	Lookup and reference functions				Oppslag- og referansefunksjoner
-##
-ADDRESS			= ADRESSE				##	Returnerer en referanse som tekst til en enkelt celle i et regneark
-AREAS			= OMRÅDER				##	Returnerer antall områder i en referanse
-CHOOSE			= VELG					##	Velger en verdi fra en liste med verdier
-COLUMN			= KOLONNE				##	Returnerer kolonnenummeret for en referanse
-COLUMNS			= KOLONNER				##	Returnerer antall kolonner i en referanse
-HLOOKUP			= FINN.KOLONNE				##	Leter i den øverste raden i en matrise og returnerer verdien for den angitte cellen
-HYPERLINK		= HYPERKOBLING				##	Oppretter en snarvei eller et hopp som åpner et dokument som er lagret på en nettverksserver, et intranett eller Internett
-INDEX			= INDEKS				##	Bruker en indeks til å velge en verdi fra en referanse eller matrise
-INDIRECT		= INDIREKTE				##	Returnerer en referanse angitt av en tekstverdi
-LOOKUP			= SLÅ.OPP				##	Slår opp verdier i en vektor eller matrise
-MATCH			= SAMMENLIGNE				##	Slår opp verdier i en referanse eller matrise
-OFFSET			= FORSKYVNING				##	Returnerer en referanseforskyvning fra en gitt referanse
-ROW			= RAD					##	Returnerer radnummeret for en referanse
-ROWS			= RADER					##	Returnerer antall rader i en referanse
-RTD			= RTD					##	Henter sanntidsdata fra et program som støtter COM-automatisering (automatisering: En måte å arbeide på med programobjekter fra et annet program- eller utviklingsverktøy. Tidligere kalt OLE-automatisering. Automatisering er en bransjestandard og en funksjon i Component Object Model (COM).)
-TRANSPOSE		= TRANSPONER				##	Returnerer transponeringen av en matrise
-VLOOKUP			= FINN.RAD				##	Leter i den første kolonnen i en matrise og flytter bortover raden for å returnere verdien til en celle
-
-
-##
-##	Math and trigonometry functions				Matematikk- og trigonometrifunksjoner
-##
-ABS			= ABS					##	Returnerer absoluttverdien til et tall
-ACOS			= ARCCOS				##	Returnerer arcus cosinus til et tall
-ACOSH			= ARCCOSH				##	Returnerer den inverse hyperbolske cosinus til et tall
-ASIN			= ARCSIN				##	Returnerer arcus sinus til et tall
-ASINH			= ARCSINH				##	Returnerer den inverse hyperbolske sinus til et tall
-ATAN			= ARCTAN				##	Returnerer arcus tangens til et tall
-ATAN2			= ARCTAN2				##	Returnerer arcus tangens fra x- og y-koordinater
-ATANH			= ARCTANH				##	Returnerer den inverse hyperbolske tangens til et tall
-CEILING			= AVRUND.GJELDENDE.MULTIPLUM		##	Runder av et tall til nærmeste heltall eller til nærmeste signifikante multiplum
-COMBIN			= KOMBINASJON				##	Returnerer antall kombinasjoner for ett gitt antall objekter
-COS			= COS					##	Returnerer cosinus til et tall
-COSH			= COSH					##	Returnerer den hyperbolske cosinus til et tall
-DEGREES			= GRADER				##	Konverterer radianer til grader
-EVEN			= AVRUND.TIL.PARTALL			##	Runder av et tall oppover til nærmeste heltall som er et partall
-EXP			= EKSP					##	Returnerer e opphøyd i en angitt potens
-FACT			= FAKULTET				##	Returnerer fakultet til et tall
-FACTDOUBLE		= DOBBELFAKT				##	Returnerer et talls doble fakultet
-FLOOR			= AVRUND.GJELDENDE.MULTIPLUM.NED	##	Avrunder et tall nedover, mot null
-GCD			= SFF					##	Returnerer høyeste felles divisor
-INT			= HELTALL				##	Avrunder et tall nedover til nærmeste heltall
-LCM			= MFM					##	Returnerer minste felles multiplum
-LN			= LN					##	Returnerer den naturlige logaritmen til et tall
-LOG			= LOG					##	Returnerer logaritmen for et tall til et angitt grunntall
-LOG10			= LOG10					##	Returnerer logaritmen med grunntall 10 for et tall
-MDETERM			= MDETERM				##	Returnerer matrisedeterminanten til en matrise
-MINVERSE		= MINVERS				##	Returnerer den inverse matrisen til en matrise
-MMULT			= MMULT					##	Returnerer matriseproduktet av to matriser
-MOD			= REST					##	Returnerer resten fra en divisjon
-MROUND			= MRUND					##	Returnerer et tall avrundet til det ønskede multiplum
-MULTINOMIAL		= MULTINOMINELL				##	Returnerer det multinominelle for et sett med tall
-ODD			= AVRUND.TIL.ODDETALL			##	Runder av et tall oppover til nærmeste heltall som er et oddetall
-PI			= PI					##	Returnerer verdien av pi
-POWER			= OPPHØYD.I				##	Returnerer resultatet av et tall opphøyd i en potens
-PRODUCT			= PRODUKT				##	Multipliserer argumentene
-QUOTIENT		= KVOTIENT				##	Returnerer heltallsdelen av en divisjon
-RADIANS			= RADIANER				##	Konverterer grader til radianer
-RAND			= TILFELDIG				##	Returnerer et tilfeldig tall mellom 0 og 1
-RANDBETWEEN		= TILFELDIGMELLOM			##	Returnerer et tilfeldig tall innenfor et angitt område
-ROMAN			= ROMERTALL				##	Konverterer vanlige tall til romertall, som tekst
-ROUND			= AVRUND				##	Avrunder et tall til et angitt antall sifre
-ROUNDDOWN		= AVRUND.NED				##	Avrunder et tall nedover, mot null
-ROUNDUP			= AVRUND.OPP				##	Runder av et tall oppover, bort fra null
-SERIESSUM		= SUMMER.REKKE				##	Returnerer summen av en geometrisk rekke, basert på formelen
-SIGN			= FORTEGN				##	Returnerer fortegnet for et tall
-SIN			= SIN					##	Returnerer sinus til en gitt vinkel
-SINH			= SINH					##	Returnerer den hyperbolske sinus til et tall
-SQRT			= ROT					##	Returnerer en positiv kvadratrot
-SQRTPI			= ROTPI					##	Returnerer kvadratroten av (tall * pi)
-SUBTOTAL		= DELSUM				##	Returnerer en delsum i en liste eller database
-SUM			= SUMMER				##	Legger sammen argumentene
-SUMIF			= SUMMERHVIS				##	Legger sammen cellene angitt ved et gitt vilkår
-SUMIFS			= SUMMER.HVIS.SETT			##	Legger sammen cellene i et område som oppfyller flere vilkår
-SUMPRODUCT		= SUMMERPRODUKT				##	Returnerer summen av produktene av tilsvarende matrisekomponenter
-SUMSQ			= SUMMERKVADRAT				##	Returnerer kvadratsummen av argumentene
-SUMX2MY2		= SUMMERX2MY2				##	Returnerer summen av differansen av kvadratene for tilsvarende verdier i to matriser
-SUMX2PY2		= SUMMERX2PY2				##	Returnerer summen av kvadratsummene for tilsvarende verdier i to matriser
-SUMXMY2			= SUMMERXMY2				##	Returnerer summen av kvadratene av differansen for tilsvarende verdier i to matriser
-TAN			= TAN					##	Returnerer tangens for et tall
-TANH			= TANH					##	Returnerer den hyperbolske tangens for et tall
-TRUNC			= AVKORT				##	Korter av et tall til et heltall
-
-
-##
-##	Statistical functions					Statistiske funksjoner
-##
-AVEDEV			= GJENNOMSNITTSAVVIK			##	Returnerer datapunktenes gjennomsnittlige absoluttavvik fra middelverdien
-AVERAGE			= GJENNOMSNITT				##	Returnerer gjennomsnittet for argumentene
-AVERAGEA		= GJENNOMSNITTA				##	Returnerer gjennomsnittet for argumentene, inkludert tall, tekst og logiske verdier
-AVERAGEIF		= GJENNOMSNITTHVIS			##	Returnerer gjennomsnittet (aritmetisk gjennomsnitt) av alle cellene i et område som oppfyller et bestemt vilkår
-AVERAGEIFS		= GJENNOMSNITT.HVIS.SETT		##	Returnerer gjennomsnittet (aritmetisk middelverdi) av alle celler som oppfyller flere vilkår.
-BETADIST		= BETA.FORDELING			##	Returnerer den kumulative betafordelingsfunksjonen
-BETAINV			= INVERS.BETA.FORDELING			##	Returnerer den inverse verdien til fordelingsfunksjonen for en angitt betafordeling
-BINOMDIST		= BINOM.FORDELING			##	Returnerer den individuelle binomiske sannsynlighetsfordelingen
-CHIDIST			= KJI.FORDELING				##	Returnerer den ensidige sannsynligheten for en kjikvadrert fordeling
-CHIINV			= INVERS.KJI.FORDELING			##	Returnerer den inverse av den ensidige sannsynligheten for den kjikvadrerte fordelingen
-CHITEST			= KJI.TEST				##	Utfører testen for uavhengighet
-CONFIDENCE		= KONFIDENS				##	Returnerer konfidensintervallet til gjennomsnittet for en populasjon
-CORREL			= KORRELASJON				##	Returnerer korrelasjonskoeffisienten mellom to datasett
-COUNT			= ANTALL				##	Teller hvor mange tall som er i argumentlisten
-COUNTA			= ANTALLA				##	Teller hvor mange verdier som er i argumentlisten
-COUNTBLANK		= TELLBLANKE				##	Teller antall tomme celler i et område.
-COUNTIF			= ANTALL.HVIS				##	Teller antall celler i et område som oppfyller gitte vilkår
-COUNTIFS		= ANTALL.HVIS.SETT			##	Teller antallet ikke-tomme celler i et område som oppfyller flere vilkår
-COVAR			= KOVARIANS				##	Returnerer kovariansen, gjennomsnittet av produktene av parvise avvik
-CRITBINOM		= GRENSE.BINOM				##	Returnerer den minste verdien der den kumulative binomiske fordelingen er mindre enn eller lik en vilkårsverdi
-DEVSQ			= AVVIK.KVADRERT			##	Returnerer summen av kvadrerte avvik
-EXPONDIST		= EKSP.FORDELING			##	Returnerer eksponentialfordelingen
-FDIST			= FFORDELING				##	Returnerer F-sannsynlighetsfordelingen
-FINV			= FFORDELING.INVERS			##	Returnerer den inverse av den sannsynlige F-fordelingen
-FISHER			= FISHER				##	Returnerer Fisher-transformasjonen
-FISHERINV		= FISHERINV				##	Returnerer den inverse av Fisher-transformasjonen
-FORECAST		= PROGNOSE				##	Returnerer en verdi langs en lineær trend
-FREQUENCY		= FREKVENS				##	Returnerer en frekvensdistribusjon som en loddrett matrise
-FTEST			= FTEST					##	Returnerer resultatet av en F-test
-GAMMADIST		= GAMMAFORDELING			##	Returnerer gammafordelingen
-GAMMAINV		= GAMMAINV				##	Returnerer den inverse av den gammakumulative fordelingen
-GAMMALN			= GAMMALN				##	Returnerer den naturlige logaritmen til gammafunksjonen G(x)
-GEOMEAN			= GJENNOMSNITT.GEOMETRISK		##	Returnerer den geometriske middelverdien
-GROWTH			= VEKST					##	Returnerer verdier langs en eksponentiell trend
-HARMEAN			= GJENNOMSNITT.HARMONISK		##	Returnerer den harmoniske middelverdien
-HYPGEOMDIST		= HYPGEOM.FORDELING			##	Returnerer den hypergeometriske fordelingen
-INTERCEPT		= SKJÆRINGSPUNKT			##	Returnerer skjæringspunktet til den lineære regresjonslinjen
-KURT			= KURT					##	Returnerer kurtosen til et datasett
-LARGE			= N.STØRST				##	Returnerer den n-te største verdien i et datasett
-LINEST			= RETTLINJE				##	Returnerer parameterne til en lineær trend
-LOGEST			= KURVE					##	Returnerer parameterne til en eksponentiell trend
-LOGINV			= LOGINV				##	Returnerer den inverse lognormale fordelingen
-LOGNORMDIST		= LOGNORMFORD				##	Returnerer den kumulative lognormale fordelingen
-MAX			= STØRST				##	Returnerer maksimumsverdien i en argumentliste
-MAXA			= MAKSA					##	Returnerer maksimumsverdien i en argumentliste, inkludert tall, tekst og logiske verdier
-MEDIAN			= MEDIAN				##	Returnerer medianen til tallene som er gitt
-MIN			= MIN					##	Returnerer minimumsverdien i en argumentliste
-MINA			= MINA					##	Returnerer den minste verdien i en argumentliste, inkludert tall, tekst og logiske verdier
-MODE			= MODUS					##	Returnerer den vanligste verdien i et datasett
-NEGBINOMDIST		= NEGBINOM.FORDELING			##	Returnerer den negative binomiske fordelingen
-NORMDIST		= NORMALFORDELING			##	Returnerer den kumulative normalfordelingen
-NORMINV			= NORMINV				##	Returnerer den inverse kumulative normalfordelingen
-NORMSDIST		= NORMSFORDELING			##	Returnerer standard kumulativ normalfordeling
-NORMSINV		= NORMSINV				##	Returnerer den inverse av den den kumulative standard normalfordelingen
-PEARSON			= PEARSON				##	Returnerer produktmomentkorrelasjonskoeffisienten, Pearson
-PERCENTILE		= PERSENTIL				##	Returnerer den n-te persentil av verdiene i et område
-PERCENTRANK		= PROSENTDEL				##	Returnerer prosentrangeringen av en verdi i et datasett
-PERMUT			= PERMUTER				##	Returnerer antall permutasjoner for et gitt antall objekter
-POISSON			= POISSON				##	Returnerer Poissons sannsynlighetsfordeling
-PROB			= SANNSYNLIG				##	Returnerer sannsynligheten for at verdier i et område ligger mellom to grenser
-QUARTILE		= KVARTIL				##	Returnerer kvartilen til et datasett
-RANK			= RANG					##	Returnerer rangeringen av et tall, eller plassen tallet har i en rekke
-RSQ			= RKVADRAT				##	Returnerer kvadratet av produktmomentkorrelasjonskoeffisienten (Pearsons r)
-SKEW			= SKJEVFORDELING			##	Returnerer skjevheten i en fordeling
-SLOPE			= STIGNINGSTALL				##	Returnerer stigningtallet for den lineære regresjonslinjen
-SMALL			= N.MINST				##	Returnerer den n-te minste verdien i et datasett
-STANDARDIZE		= NORMALISER				##	Returnerer en normalisert verdi
-STDEV			= STDAV					##	Estimere standardavvik på grunnlag av et utvalg
-STDEVA			= STDAVVIKA				##	Estimerer standardavvik basert på et utvalg, inkludert tall, tekst og logiske verdier
-STDEVP			= STDAVP				##	Beregner standardavvik basert på hele populasjonen
-STDEVPA			= STDAVVIKPA				##	Beregner standardavvik basert på hele populasjonen, inkludert tall, tekst og logiske verdier
-STEYX			= STANDARDFEIL				##	Returnerer standardfeilen for den predikerte y-verdien for hver x i regresjonen
-TDIST			= TFORDELING				##	Returnerer en Student t-fordeling
-TINV			= TINV					##	Returnerer den inverse Student t-fordelingen
-TREND			= TREND					##	Returnerer verdier langs en lineær trend
-TRIMMEAN		= TRIMMET.GJENNOMSNITT			##	Returnerer den interne middelverdien til et datasett
-TTEST			= TTEST					##	Returnerer sannsynligheten assosiert med en Student t-test
-VAR			= VARIANS				##	Estimerer varians basert på et utvalg
-VARA			= VARIANSA				##	Estimerer varians basert på et utvalg, inkludert tall, tekst og logiske verdier
-VARP			= VARIANSP				##	Beregner varians basert på hele populasjonen
-VARPA			= VARIANSPA				##	Beregner varians basert på hele populasjonen, inkludert tall, tekst og logiske verdier
-WEIBULL			= WEIBULL.FORDELING			##	Returnerer Weibull-fordelingen
-ZTEST			= ZTEST					##	Returnerer den ensidige sannsynlighetsverdien for en z-test
-
-
-##
-##	Text functions						Tekstfunksjoner
-##
-ASC			= STIGENDE				##	Endrer fullbreddes (dobbeltbyte) engelske bokstaver eller katakana i en tegnstreng, til halvbreddes (enkeltbyte) tegn
-BAHTTEXT		= BAHTTEKST				##	Konverterer et tall til tekst, og bruker valutaformatet ß (baht)
-CHAR			= TEGNKODE				##	Returnerer tegnet som svarer til kodenummeret
-CLEAN			= RENSK					##	Fjerner alle tegn som ikke kan skrives ut, fra teksten
-CODE			= KODE					##	Returnerer en numerisk kode for det første tegnet i en tekststreng
-CONCATENATE		= KJEDE.SAMMEN				##	Slår sammen flere tekstelementer til ett tekstelement
-DOLLAR			= VALUTA				##	Konverterer et tall til tekst, og bruker valutaformatet $ (dollar)
-EXACT			= EKSAKT				##	Kontrollerer om to tekstverdier er like
-FIND			= FINN					##	Finner en tekstverdi inne i en annen (skiller mellom store og små bokstaver)
-FINDB			= FINNB					##	Finner en tekstverdi inne i en annen (skiller mellom store og små bokstaver)
-FIXED			= FASTSATT				##	Formaterer et tall som tekst med et bestemt antall desimaler
-JIS			= JIS					##	Endrer halvbreddes (enkeltbyte) engelske bokstaver eller katakana i en tegnstreng, til fullbreddes (dobbeltbyte) tegn
-LEFT			= VENSTRE				##	Returnerer tegnene lengst til venstre i en tekstverdi
-LEFTB			= VENSTREB				##	Returnerer tegnene lengst til venstre i en tekstverdi
-LEN			= LENGDE				##	Returnerer antall tegn i en tekststreng
-LENB			= LENGDEB				##	Returnerer antall tegn i en tekststreng
-LOWER			= SMÅ					##	Konverterer tekst til små bokstaver
-MID			= DELTEKST				##	Returnerer et angitt antall tegn fra en tekststreng, og begynner fra posisjonen du angir
-MIDB			= DELTEKSTB				##	Returnerer et angitt antall tegn fra en tekststreng, og begynner fra posisjonen du angir
-PHONETIC		= FURIGANA				##	Trekker ut fonetiske tegn (furigana) fra en tekststreng
-PROPER			= STOR.FORBOKSTAV			##	Gir den første bokstaven i hvert ord i en tekstverdi stor forbokstav
-REPLACE			= ERSTATT				##	Erstatter tegn i en tekst
-REPLACEB		= ERSTATTB				##	Erstatter tegn i en tekst
-REPT			= GJENTA				##	Gjentar tekst et gitt antall ganger
-RIGHT			= HØYRE					##	Returnerer tegnene lengst til høyre i en tekstverdi
-RIGHTB			= HØYREB				##	Returnerer tegnene lengst til høyre i en tekstverdi
-SEARCH			= SØK					##	Finner en tekstverdi inne i en annen (skiller ikke mellom store og små bokstaver)
-SEARCHB			= SØKB					##	Finner en tekstverdi inne i en annen (skiller ikke mellom store og små bokstaver)
-SUBSTITUTE		= BYTT.UT				##	Bytter ut gammel tekst med ny tekst i en tekststreng
-T			= T					##	Konverterer argumentene til tekst
-TEXT			= TEKST					##	Formaterer et tall og konverterer det til tekst
-TRIM			= TRIMME				##	Fjerner mellomrom fra tekst
-UPPER			= STORE					##	Konverterer tekst til store bokstaver
-VALUE			= VERDI					##	Konverterer et tekstargument til et tall
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/config
deleted file mode 100644
index fb1e7b13d9d..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= zł
-
-
-##
-##	Excel Error Codes	(For future use)
-##
-NULL	= #ZERO!
-DIV0	= #DZIEL/0!
-VALUE	= #ARG!
-REF	= #ADR!
-NAME	= #NAZWA?
-NUM	= #LICZBA!
-NA	= #N/D!
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
deleted file mode 100644
index 2e5697973c1..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
+++ /dev/null
@@ -1,438 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Calculation
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
-##
-##
-
-
-##
-##	Add-in and Automation functions			Funkcje dodatków i automatyzacji
-##
-GETPIVOTDATA		= WEŹDANETABELI			##	Zwraca dane przechowywane w raporcie tabeli przestawnej.
-
-
-##
-##	Cube functions					Funkcje modułów
-##
-CUBEKPIMEMBER		= ELEMENT.KPI.MODUŁU		##	Zwraca nazwę, właściwość i miarę kluczowego wskaźnika wydajności (KPI) oraz wyświetla nazwę i właściwość w komórce. Wskaźnik KPI jest miarą ilościową, taką jak miesięczny zysk brutto lub kwartalna fluktuacja pracowników, używaną do monitorowania wydajności organizacji.
-CUBEMEMBER		= ELEMENT.MODUŁU		##	Zwraca element lub krotkę z hierarchii modułu. Służy do sprawdzania, czy element lub krotka istnieje w module.
-CUBEMEMBERPROPERTY	= WŁAŚCIWOŚĆ.ELEMENTU.MODUŁU	##	Zwraca wartość właściwości elementu w module. Służy do sprawdzania, czy nazwa elementu istnieje w module, i zwracania określonej właściwości dla tego elementu.
-CUBERANKEDMEMBER	= USZEREGOWANY.ELEMENT.MODUŁU	##	Zwraca n-ty (albo uszeregowany) element zestawu. Służy do zwracania elementu lub elementów zestawu, na przykład najlepszego sprzedawcy lub 10 najlepszych studentów.
-CUBESET			= ZESTAW.MODUŁÓW		##	Definiuje obliczony zestaw elementów lub krotek, wysyłając wyrażenie zestawu do serwera modułu, który tworzy zestaw i zwraca go do programu Microsoft Office Excel.
-CUBESETCOUNT		= LICZNIK.MODUŁÓW.ZESTAWU	##	Zwraca liczbę elementów zestawu.
-CUBEVALUE		= WARTOŚĆ.MODUŁU		##	Zwraca zagregowaną wartość z modułu.
-
-
-##
-##	Database functions				Funkcje baz danych
-##
-DAVERAGE		= BD.ŚREDNIA			##	Zwraca wartość średniej wybranych wpisów bazy danych.
-DCOUNT			= BD.ILE.REKORDÓW		##	Zlicza komórki zawierające liczby w bazie danych.
-DCOUNTA			= BD.ILE.REKORDÓW.A		##	Zlicza niepuste komórki w bazie danych.
-DGET			= BD.POLE			##	Wyodrębnia z bazy danych jeden rekord spełniający określone kryteria.
-DMAX			= BD.MAX			##	Zwraca wartość maksymalną z wybranych wpisów bazy danych.
-DMIN			= BD.MIN			##	Zwraca wartość minimalną z wybranych wpisów bazy danych.
-DPRODUCT		= BD.ILOCZYN			##	Mnoży wartości w konkretnym, spełniającym kryteria polu rekordów bazy danych.
-DSTDEV			= BD.ODCH.STANDARD		##	Szacuje odchylenie standardowe na podstawie próbki z wybranych wpisów bazy danych.
-DSTDEVP			= BD.ODCH.STANDARD.POPUL	##	Oblicza odchylenie standardowe na podstawie całej populacji wybranych wpisów bazy danych.
-DSUM			= BD.SUMA			##	Dodaje liczby w kolumnie pól rekordów bazy danych, które spełniają kryteria.
-DVAR			= BD.WARIANCJA			##	Szacuje wariancję na podstawie próbki z wybranych wpisów bazy danych.
-DVARP			= BD.WARIANCJA.POPUL		##	Oblicza wariancję na podstawie całej populacji wybranych wpisów bazy danych.
-
-
-##
-##	Date and time functions				Funkcje dat, godzin i czasu
-##
-DATE			= DATA				##	Zwraca liczbę seryjną dla wybranej daty.
-DATEVALUE		= DATA.WARTOŚĆ			##	Konwertuje datę w formie tekstu na liczbę seryjną.
-DAY			= DZIEŃ				##	Konwertuje liczbę seryjną na dzień miesiąca.
-DAYS360			= DNI.360			##	Oblicza liczbę dni między dwiema datami na podstawie roku 360-dniowego.
-EDATE			= UPŁDNI			##	Zwraca liczbę seryjną daty jako wskazaną liczbę miesięcy przed określoną datą początkową lub po niej.
-EOMONTH			= EOMONTH			##	Zwraca liczbę seryjną ostatniego dnia miesiąca przed określoną liczbą miesięcy lub po niej.
-HOUR			= GODZINA			##	Konwertuje liczbę seryjną na godzinę.
-MINUTE			= MINUTA			##	Konwertuje liczbę seryjną na minutę.
-MONTH			= MIESIĄC			##	Konwertuje liczbę seryjną na miesiąc.
-NETWORKDAYS		= NETWORKDAYS			##	Zwraca liczbę pełnych dni roboczych między dwiema datami.
-NOW			= TERAZ				##	Zwraca liczbę seryjną bieżącej daty i godziny.
-SECOND			= SEKUNDA			##	Konwertuje liczbę seryjną na sekundę.
-TIME			= CZAS				##	Zwraca liczbę seryjną określonego czasu.
-TIMEVALUE		= CZAS.WARTOŚĆ			##	Konwertuje czas w formie tekstu na liczbę seryjną.
-TODAY			= DZIŚ				##	Zwraca liczbę seryjną dla daty bieżącej.
-WEEKDAY			= DZIEŃ.TYG			##	Konwertuje liczbę seryjną na dzień tygodnia.
-WEEKNUM			= WEEKNUM			##	Konwertuje liczbę seryjną na liczbę reprezentującą numer tygodnia w roku.
-WORKDAY			= WORKDAY			##	Zwraca liczbę seryjną dla daty przed określoną liczbą dni roboczych lub po niej.
-YEAR			= ROK				##	Konwertuje liczbę seryjną na rok.
-YEARFRAC		= YEARFRAC			##	Zwraca część roku reprezentowaną przez pełną liczbę dni między datą początkową a datą końcową.
-
-
-##
-##	Engineering functions				Funkcje inżynierskie
-##
-BESSELI			= BESSELI			##	Zwraca wartość zmodyfikowanej funkcji Bessela In(x).
-BESSELJ			= BESSELJ			##	Zwraca wartość funkcji Bessela Jn(x).
-BESSELK			= BESSELK			##	Zwraca wartość zmodyfikowanej funkcji Bessela Kn(x).
-BESSELY			= BESSELY			##	Zwraca wartość funkcji Bessela Yn(x).
-BIN2DEC			= BIN2DEC			##	Konwertuje liczbę w postaci dwójkowej na liczbę w postaci dziesiętnej.
-BIN2HEX			= BIN2HEX			##	Konwertuje liczbę w postaci dwójkowej na liczbę w postaci szesnastkowej.
-BIN2OCT			= BIN2OCT			##	Konwertuje liczbę w postaci dwójkowej na liczbę w postaci ósemkowej.
-COMPLEX			= COMPLEX			##	Konwertuje część rzeczywistą i urojoną na liczbę zespoloną.
-CONVERT			= CONVERT			##	Konwertuje liczbę z jednego systemu miar na inny.
-DEC2BIN			= DEC2BIN			##	Konwertuje liczbę w postaci dziesiętnej na postać dwójkową.
-DEC2HEX			= DEC2HEX			##	Konwertuje liczbę w postaci dziesiętnej na liczbę w postaci szesnastkowej.
-DEC2OCT			= DEC2OCT			##	Konwertuje liczbę w postaci dziesiętnej na liczbę w postaci ósemkowej.
-DELTA			= DELTA				##	Sprawdza, czy dwie wartości są równe.
-ERF			= ERF				##	Zwraca wartość funkcji błędu.
-ERFC			= ERFC				##	Zwraca wartość komplementarnej funkcji błędu.
-GESTEP			= GESTEP			##	Sprawdza, czy liczba jest większa niż wartość progowa.
-HEX2BIN			= HEX2BIN			##	Konwertuje liczbę w postaci szesnastkowej na liczbę w postaci dwójkowej.
-HEX2DEC			= HEX2DEC			##	Konwertuje liczbę w postaci szesnastkowej na liczbę w postaci dziesiętnej.
-HEX2OCT			= HEX2OCT			##	Konwertuje liczbę w postaci szesnastkowej na liczbę w postaci ósemkowej.
-IMABS			= IMABS				##	Zwraca wartość bezwzględną (moduł) liczby zespolonej.
-IMAGINARY		= IMAGINARY			##	Zwraca wartość części urojonej liczby zespolonej.
-IMARGUMENT		= IMARGUMENT			##	Zwraca wartość argumentu liczby zespolonej, przy czym kąt wyrażony jest w radianach.
-IMCONJUGATE		= IMCONJUGATE			##	Zwraca wartość liczby sprzężonej danej liczby zespolonej.
-IMCOS			= IMCOS				##	Zwraca wartość cosinusa liczby zespolonej.
-IMDIV			= IMDIV				##	Zwraca wartość ilorazu dwóch liczb zespolonych.
-IMEXP			= IMEXP				##	Zwraca postać wykładniczą liczby zespolonej.
-IMLN			= IMLN				##	Zwraca wartość logarytmu naturalnego liczby zespolonej.
-IMLOG10			= IMLOG10			##	Zwraca wartość logarytmu dziesiętnego liczby zespolonej.
-IMLOG2			= IMLOG2			##	Zwraca wartość logarytmu liczby zespolonej przy podstawie 2.
-IMPOWER			= IMPOWER			##	Zwraca wartość liczby zespolonej podniesionej do potęgi całkowitej.
-IMPRODUCT		= IMPRODUCT			##	Zwraca wartość iloczynu liczb zespolonych.
-IMREAL			= IMREAL			##	Zwraca wartość części rzeczywistej liczby zespolonej.
-IMSIN			= IMSIN				##	Zwraca wartość sinusa liczby zespolonej.
-IMSQRT			= IMSQRT			##	Zwraca wartość pierwiastka kwadratowego z liczby zespolonej.
-IMSUB			= IMSUB				##	Zwraca wartość różnicy dwóch liczb zespolonych.
-IMSUM			= IMSUM				##	Zwraca wartość sumy liczb zespolonych.
-OCT2BIN			= OCT2BIN			##	Konwertuje liczbę w postaci ósemkowej na liczbę w postaci dwójkowej.
-OCT2DEC			= OCT2DEC			##	Konwertuje liczbę w postaci ósemkowej na liczbę w postaci dziesiętnej.
-OCT2HEX			= OCT2HEX			##	Konwertuje liczbę w postaci ósemkowej na liczbę w postaci szesnastkowej.
-
-
-##
-##	Financial functions				Funkcje finansowe
-##
-ACCRINT			= ACCRINT			##	Zwraca narosłe odsetki dla papieru wartościowego z oprocentowaniem okresowym.
-ACCRINTM		= ACCRINTM			##	Zwraca narosłe odsetki dla papieru wartościowego z oprocentowaniem w terminie wykupu.
-AMORDEGRC		= AMORDEGRC			##	Zwraca amortyzację dla każdego okresu rozliczeniowego z wykorzystaniem współczynnika amortyzacji.
-AMORLINC		= AMORLINC			##	Zwraca amortyzację dla każdego okresu rozliczeniowego.
-COUPDAYBS		= COUPDAYBS			##	Zwraca liczbę dni od początku okresu dywidendy do dnia rozliczeniowego.
-COUPDAYS		= COUPDAYS			##	Zwraca liczbę dni w okresie dywidendy, z uwzględnieniem dnia rozliczeniowego.
-COUPDAYSNC		= COUPDAYSNC			##	Zwraca liczbę dni od dnia rozliczeniowego do daty następnego dnia dywidendy.
-COUPNCD			= COUPNCD			##	Zwraca dzień następnej dywidendy po dniu rozliczeniowym.
-COUPNUM			= COUPNUM			##	Zwraca liczbę dywidend płatnych między dniem rozliczeniowym a dniem wykupu.
-COUPPCD			= COUPPCD			##	Zwraca dzień poprzedniej dywidendy przed dniem rozliczeniowym.
-CUMIPMT			= CUMIPMT			##	Zwraca wartość procentu składanego płatnego między dwoma okresami.
-CUMPRINC		= CUMPRINC			##	Zwraca wartość kapitału skumulowanego spłaty pożyczki między dwoma okresami.
-DB			= DB				##	Zwraca amortyzację środka trwałego w danym okresie metodą degresywną z zastosowaniem stałej bazowej.
-DDB			= DDB				##	Zwraca amortyzację środka trwałego za podany okres metodą degresywną z zastosowaniem podwójnej bazowej lub metodą określoną przez użytkownika.
-DISC			= DISC				##	Zwraca wartość stopy dyskontowej papieru wartościowego.
-DOLLARDE		= DOLLARDE			##	Konwertuje cenę w postaci ułamkowej na cenę wyrażoną w postaci dziesiętnej.
-DOLLARFR		= DOLLARFR			##	Konwertuje cenę wyrażoną w postaci dziesiętnej na cenę wyrażoną w postaci ułamkowej.
-DURATION		= DURATION			##	Zwraca wartość rocznego przychodu z papieru wartościowego o okresowych wypłatach oprocentowania.
-EFFECT			= EFFECT			##	Zwraca wartość efektywnej rocznej stopy procentowej.
-FV			= FV				##	Zwraca przyszłą wartość lokaty.
-FVSCHEDULE		= FVSCHEDULE			##	Zwraca przyszłą wartość kapitału początkowego wraz z szeregiem procentów składanych.
-INTRATE			= INTRATE			##	Zwraca wartość stopy procentowej papieru wartościowego całkowicie ulokowanego.
-IPMT			= IPMT				##	Zwraca wysokość spłaty oprocentowania lokaty za dany okres.
-IRR			= IRR				##	Zwraca wartość wewnętrznej stopy zwrotu dla serii przepływów gotówkowych.
-ISPMT			= ISPMT				##	Oblicza wysokość spłaty oprocentowania za dany okres lokaty.
-MDURATION		= MDURATION			##	Zwraca wartość zmodyfikowanego okresu Macauleya dla papieru wartościowego o założonej wartości nominalnej 100 zł.
-MIRR			= MIRR				##	Zwraca wartość wewnętrznej stopy zwrotu dla przypadku, gdy dodatnie i ujemne przepływy gotówkowe mają różne stopy.
-NOMINAL			= NOMINAL			##	Zwraca wysokość nominalnej rocznej stopy procentowej.
-NPER			= NPER				##	Zwraca liczbę okresów dla lokaty.
-NPV			= NPV				##	Zwraca wartość bieżącą netto lokaty na podstawie szeregu okresowych przepływów gotówkowych i stopy dyskontowej.
-ODDFPRICE		= ODDFPRICE			##	Zwraca cenę za 100 zł wartości nominalnej papieru wartościowego z nietypowym pierwszym okresem.
-ODDFYIELD		= ODDFYIELD			##	Zwraca rentowność papieru wartościowego z nietypowym pierwszym okresem.
-ODDLPRICE		= ODDLPRICE			##	Zwraca cenę za 100 zł wartości nominalnej papieru wartościowego z nietypowym ostatnim okresem.
-ODDLYIELD		= ODDLYIELD			##	Zwraca rentowność papieru wartościowego z nietypowym ostatnim okresem.
-PMT			= PMT				##	Zwraca wartość okresowej płatności raty rocznej.
-PPMT			= PPMT				##	Zwraca wysokość spłaty kapitału w przypadku lokaty dla danego okresu.
-PRICE			= PRICE				##	Zwraca cenę za 100 zł wartości nominalnej papieru wartościowego z oprocentowaniem okresowym.
-PRICEDISC		= PRICEDISC			##	Zwraca cenę za 100 zł wartości nominalnej papieru wartościowego zdyskontowanego.
-PRICEMAT		= PRICEMAT			##	Zwraca cenę za 100 zł wartości nominalnej papieru wartościowego z oprocentowaniem w terminie wykupu.
-PV			= PV				##	Zwraca wartość bieżącą lokaty.
-RATE			= RATE				##	Zwraca wysokość stopy procentowej w okresie raty rocznej.
-RECEIVED		= RECEIVED			##	Zwraca wartość kapitału otrzymanego przy wykupie papieru wartościowego całkowicie ulokowanego.
-SLN			= SLN				##	Zwraca amortyzację środka trwałego za jeden okres metodą liniową.
-SYD			= SYD				##	Zwraca amortyzację środka trwałego za dany okres metodą sumy cyfr lat amortyzacji.
-TBILLEQ			= TBILLEQ			##	Zwraca rentowność ekwiwalentu obligacji dla bonu skarbowego.
-TBILLPRICE		= TBILLPRICE			##	Zwraca cenę za 100 zł wartości nominalnej bonu skarbowego.
-TBILLYIELD		= TBILLYIELD			##	Zwraca rentowność bonu skarbowego.
-VDB			= VDB				##	Oblicza amortyzację środka trwałego w danym okresie lub jego części metodą degresywną.
-XIRR			= XIRR				##	Zwraca wartość wewnętrznej stopy zwrotu dla serii rozłożonych w czasie przepływów gotówkowych, niekoniecznie okresowych.
-XNPV			= XNPV				##	Zwraca wartość bieżącą netto dla serii rozłożonych w czasie przepływów gotówkowych, niekoniecznie okresowych.
-YIELD			= YIELD				##	Zwraca rentowność papieru wartościowego z oprocentowaniem okresowym.
-YIELDDISC		= YIELDDISC			##	Zwraca roczną rentowność zdyskontowanego papieru wartościowego, na przykład bonu skarbowego.
-YIELDMAT		= YIELDMAT			##	Zwraca roczną rentowność papieru wartościowego oprocentowanego przy wykupie.
-
-
-##
-##	Information functions				Funkcje informacyjne
-##
-CELL			= KOMÓRKA			##	Zwraca informacje o formacie, położeniu lub zawartości komórki.
-ERROR.TYPE		= NR.BŁĘDU			##	Zwraca liczbę odpowiadającą typowi błędu.
-INFO			= INFO				##	Zwraca informację o aktualnym środowisku pracy.
-ISBLANK			= CZY.PUSTA			##	Zwraca wartość PRAWDA, jeśli wartość jest pusta.
-ISERR			= CZY.BŁ			##	Zwraca wartość PRAWDA, jeśli wartość jest dowolną wartością błędu, z wyjątkiem #N/D!.
-ISERROR			= CZY.BŁĄD			##	Zwraca wartość PRAWDA, jeśli wartość jest dowolną wartością błędu.
-ISEVEN			= ISEVEN			##	Zwraca wartość PRAWDA, jeśli liczba jest parzysta.
-ISLOGICAL		= CZY.LOGICZNA			##	Zwraca wartość PRAWDA, jeśli wartość jest wartością logiczną.
-ISNA			= CZY.BRAK			##	Zwraca wartość PRAWDA, jeśli wartość jest wartością błędu #N/D!.
-ISNONTEXT		= CZY.NIE.TEKST			##	Zwraca wartość PRAWDA, jeśli wartość nie jest tekstem.
-ISNUMBER		= CZY.LICZBA			##	Zwraca wartość PRAWDA, jeśli wartość jest liczbą.
-ISODD			= ISODD				##	Zwraca wartość PRAWDA, jeśli liczba jest nieparzysta.
-ISREF			= CZY.ADR			##	Zwraca wartość PRAWDA, jeśli wartość jest odwołaniem.
-ISTEXT			= CZY.TEKST			##	Zwraca wartość PRAWDA, jeśli wartość jest tekstem.
-N			= L				##	Zwraca wartość przekonwertowaną na postać liczbową.
-NA			= BRAK				##	Zwraca wartość błędu #N/D!.
-TYPE			= TYP				##	Zwraca liczbę wskazującą typ danych wartości.
-
-
-##
-##	Logical functions				Funkcje logiczne
-##
-AND			= ORAZ				##	Zwraca wartość PRAWDA, jeśli wszystkie argumenty mają wartość PRAWDA.
-FALSE			= FAŁSZ				##	Zwraca wartość logiczną FAŁSZ.
-IF			= JEŻELI			##	Określa warunek logiczny do sprawdzenia.
-IFERROR			= JEŻELI.BŁĄD			##	Zwraca określoną wartość, jeśli wynikiem obliczenia formuły jest błąd; w przeciwnym przypadku zwraca wynik formuły.
-NOT			= NIE				##	Odwraca wartość logiczną argumentu.
-OR			= LUB				##	Zwraca wartość PRAWDA, jeśli co najmniej jeden z argumentów ma wartość PRAWDA.
-TRUE			= PRAWDA			##	Zwraca wartość logiczną PRAWDA.
-
-
-##
-##	Lookup and reference functions			Funkcje wyszukiwania i odwołań
-##
-ADDRESS			= ADRES				##	Zwraca odwołanie do jednej komórki w arkuszu jako wartość tekstową.
-AREAS			= OBSZARY			##	Zwraca liczbę obszarów występujących w odwołaniu.
-CHOOSE			= WYBIERZ			##	Wybiera wartość z listy wartości.
-COLUMN			= NR.KOLUMNY			##	Zwraca numer kolumny z odwołania.
-COLUMNS			= LICZBA.KOLUMN			##	Zwraca liczbę kolumn dla danego odwołania.
-HLOOKUP			= WYSZUKAJ.POZIOMO		##	Przegląda górny wiersz tablicy i zwraca wartość wskazanej komórki.
-HYPERLINK		= HIPERŁĄCZE			##	Tworzy skrót lub skok, który pozwala otwierać dokument przechowywany na serwerze sieciowym, w sieci intranet lub w Internecie.
-INDEX			= INDEKS			##	Używa indeksu do wybierania wartości z odwołania lub tablicy.
-INDIRECT		= ADR.POŚR			##	Zwraca odwołanie określone przez wartość tekstową.
-LOOKUP			= WYSZUKAJ			##	Wyszukuje wartości w wektorze lub tablicy.
-MATCH			= PODAJ.POZYCJĘ			##	Wyszukuje wartości w odwołaniu lub w tablicy.
-OFFSET			= PRZESUNIĘCIE			##	Zwraca adres przesunięty od danego odwołania.
-ROW			= WIERSZ			##	Zwraca numer wiersza odwołania.
-ROWS			= ILE.WIERSZY			##	Zwraca liczbę wierszy dla danego odwołania.
-RTD			= RTD				##	Pobiera dane w czasie rzeczywistym z programu obsługującego automatyzację COM (Automatyzacja: Sposób pracy z obiektami aplikacji pochodzącymi z innej aplikacji lub narzędzia projektowania. Nazywana wcześniej Automatyzacją OLE, Automatyzacja jest standardem przemysłowym i funkcją obiektowego modelu składników (COM, Component Object Model).).
-TRANSPOSE		= TRANSPONUJ			##	Zwraca transponowaną tablicę.
-VLOOKUP			= WYSZUKAJ.PIONOWO		##	Przeszukuje pierwszą kolumnę tablicy i przechodzi wzdłuż wiersza, aby zwrócić wartość komórki.
-
-
-##
-##	Math and trigonometry functions			Funkcje matematyczne i trygonometryczne
-##
-ABS			= MODUŁ.LICZBY			##	Zwraca wartość absolutną liczby.
-ACOS			= ACOS				##	Zwraca arcus cosinus liczby.
-ACOSH			= ACOSH				##	Zwraca arcus cosinus hiperboliczny liczby.
-ASIN			= ASIN				##	Zwraca arcus sinus liczby.
-ASINH			= ASINH				##	Zwraca arcus sinus hiperboliczny liczby.
-ATAN			= ATAN				##	Zwraca arcus tangens liczby.
-ATAN2			= ATAN2				##	Zwraca arcus tangens liczby na podstawie współrzędnych x i y.
-ATANH			= ATANH				##	Zwraca arcus tangens hiperboliczny liczby.
-CEILING			= ZAOKR.W.GÓRĘ			##	Zaokrągla liczbę do najbliższej liczby całkowitej lub do najbliższej wielokrotności dokładności.
-COMBIN			= KOMBINACJE			##	Zwraca liczbę kombinacji dla danej liczby obiektów.
-COS			= COS				##	Zwraca cosinus liczby.
-COSH			= COSH				##	Zwraca cosinus hiperboliczny liczby.
-DEGREES			= STOPNIE			##	Konwertuje radiany na stopnie.
-EVEN			= ZAOKR.DO.PARZ			##	Zaokrągla liczbę w górę do najbliższej liczby parzystej.
-EXP			= EXP				##	Zwraca wartość liczby e podniesionej do potęgi określonej przez podaną liczbę.
-FACT			= SILNIA			##	Zwraca silnię liczby.
-FACTDOUBLE		= FACTDOUBLE			##	Zwraca podwójną silnię liczby.
-FLOOR			= ZAOKR.W.DÓŁ			##	Zaokrągla liczbę w dół, w kierunku zera.
-GCD			= GCD				##	Zwraca największy wspólny dzielnik.
-INT			= ZAOKR.DO.CAŁK			##	Zaokrągla liczbę w dół do najbliższej liczby całkowitej.
-LCM			= LCM				##	Zwraca najmniejszą wspólną wielokrotność.
-LN			= LN				##	Zwraca logarytm naturalny podanej liczby.
-LOG			= LOG				##	Zwraca logarytm danej liczby przy zadanej podstawie.
-LOG10			= LOG10				##	Zwraca logarytm dziesiętny liczby.
-MDETERM			= WYZNACZNIK.MACIERZY		##	Zwraca wyznacznik macierzy tablicy.
-MINVERSE		= MACIERZ.ODW			##	Zwraca odwrotność macierzy tablicy.
-MMULT			= MACIERZ.ILOCZYN		##	Zwraca iloczyn macierzy dwóch tablic.
-MOD			= MOD				##	Zwraca resztę z dzielenia.
-MROUND			= MROUND			##	Zwraca liczbę zaokrągloną do żądanej wielokrotności.
-MULTINOMIAL		= MULTINOMIAL			##	Zwraca wielomian dla zbioru liczb.
-ODD			= ZAOKR.DO.NPARZ		##	Zaokrągla liczbę w górę do najbliższej liczby nieparzystej.
-PI			= PI				##	Zwraca wartość liczby Pi.
-POWER			= POTĘGA			##	Zwraca liczbę podniesioną do potęgi.
-PRODUCT			= ILOCZYN			##	Mnoży argumenty.
-QUOTIENT		= QUOTIENT			##	Zwraca iloraz (całkowity).
-RADIANS			= RADIANY			##	Konwertuje stopnie na radiany.
-RAND			= LOS				##	Zwraca liczbę pseudolosową z zakresu od 0 do 1.
-RANDBETWEEN		= RANDBETWEEN			##	Zwraca liczbę pseudolosową z zakresu określonego przez podane argumenty.
-ROMAN			= RZYMSKIE			##	Konwertuje liczbę arabską na rzymską jako tekst.
-ROUND			= ZAOKR				##	Zaokrągla liczbę do określonej liczby cyfr.
-ROUNDDOWN		= ZAOKR.DÓŁ			##	Zaokrągla liczbę w dół, w kierunku zera.
-ROUNDUP			= ZAOKR.GÓRA			##	Zaokrągla liczbę w górę, w kierunku od zera.
-SERIESSUM		= SERIESSUM			##	Zwraca sumę szeregu potęgowego na podstawie wzoru.
-SIGN			= ZNAK.LICZBY			##	Zwraca znak liczby.
-SIN			= SIN				##	Zwraca sinus danego kąta.
-SINH			= SINH				##	Zwraca sinus hiperboliczny liczby.
-SQRT			= PIERWIASTEK			##	Zwraca dodatni pierwiastek kwadratowy.
-SQRTPI			= SQRTPI			##	Zwraca pierwiastek kwadratowy iloczynu (liczba * Pi).
-SUBTOTAL		= SUMY.POŚREDNIE		##	Zwraca sumę częściową listy lub bazy danych.
-SUM			= SUMA				##	Dodaje argumenty.
-SUMIF			= SUMA.JEŻELI			##	Dodaje komórki określone przez podane kryterium.
-SUMIFS			= SUMA.WARUNKÓW			##	Dodaje komórki w zakresie, które spełniają wiele kryteriów.
-SUMPRODUCT		= SUMA.ILOCZYNÓW		##	Zwraca sumę iloczynów odpowiednich elementów tablicy.
-SUMSQ			= SUMA.KWADRATÓW		##	Zwraca sumę kwadratów argumentów.
-SUMX2MY2		= SUMA.X2.M.Y2			##	Zwraca sumę różnic kwadratów odpowiednich wartości w dwóch tablicach.
-SUMX2PY2		= SUMA.X2.P.Y2			##	Zwraca sumę sum kwadratów odpowiednich wartości w dwóch tablicach.
-SUMXMY2			= SUMA.XMY.2			##	Zwraca sumę kwadratów różnic odpowiednich wartości w dwóch tablicach.
-TAN			= TAN				##	Zwraca tangens liczby.
-TANH			= TANH				##	Zwraca tangens hiperboliczny liczby.
-TRUNC			= LICZBA.CAŁK			##	Przycina liczbę do wartości całkowitej.
-
-
-##
-##	Statistical functions				Funkcje statystyczne
-##
-AVEDEV			= ODCH.ŚREDNIE			##	Zwraca średnią wartość odchyleń absolutnych punktów danych od ich wartości średniej.
-AVERAGE			= ŚREDNIA			##	Zwraca wartość średnią argumentów.
-AVERAGEA		= ŚREDNIA.A			##	Zwraca wartość średnią argumentów, z uwzględnieniem liczb, tekstów i wartości logicznych.
-AVERAGEIF		= ŚREDNIA.JEŻELI		##	Zwraca średnią (średnią arytmetyczną) wszystkich komórek w zakresie, które spełniają podane kryteria.
-AVERAGEIFS		= ŚREDNIA.WARUNKÓW		##	Zwraca średnią (średnią arytmetyczną) wszystkich komórek, które spełniają jedno lub więcej kryteriów.
-BETADIST		= ROZKŁAD.BETA			##	Zwraca skumulowaną funkcję gęstości prawdopodobieństwa beta.
-BETAINV			= ROZKŁAD.BETA.ODW		##	Zwraca odwrotność skumulowanej funkcji gęstości prawdopodobieństwa beta.
-BINOMDIST		= ROZKŁAD.DWUM			##	Zwraca pojedynczy składnik dwumianowego rozkładu prawdopodobieństwa.
-CHIDIST			= ROZKŁAD.CHI			##	Zwraca wartość jednostronnego prawdopodobieństwa rozkładu chi-kwadrat.
-CHIINV			= ROZKŁAD.CHI.ODW		##	Zwraca odwrotność wartości jednostronnego prawdopodobieństwa rozkładu chi-kwadrat.
-CHITEST			= TEST.CHI			##	Zwraca test niezależności.
-CONFIDENCE		= UFNOŚĆ			##	Zwraca interwał ufności dla średniej populacji.
-CORREL			= WSP.KORELACJI			##	Zwraca współczynnik korelacji dwóch zbiorów danych.
-COUNT			= ILE.LICZB			##	Zlicza liczby znajdujące się na liście argumentów.
-COUNTA			= ILE.NIEPUSTYCH		##	Zlicza wartości znajdujące się na liście argumentów.
-COUNTBLANK		= LICZ.PUSTE			##	Zwraca liczbę pustych komórek w pewnym zakresie.
-COUNTIF			= LICZ.JEŻELI			##	Zlicza komórki wewnątrz zakresu, które spełniają podane kryteria.
-COUNTIFS		= LICZ.WARUNKI			##	Zlicza komórki wewnątrz zakresu, które spełniają wiele kryteriów.
-COVAR			= KOWARIANCJA			##	Zwraca kowariancję, czyli średnią wartość iloczynów odpowiednich odchyleń.
-CRITBINOM		= PRÓG.ROZKŁAD.DWUM		##	Zwraca najmniejszą wartość, dla której skumulowany rozkład dwumianowy jest mniejszy niż wartość kryterium lub równy jej.
-DEVSQ			= ODCH.KWADRATOWE		##	Zwraca sumę kwadratów odchyleń.
-EXPONDIST		= ROZKŁAD.EXP			##	Zwraca rozkład wykładniczy.
-FDIST			= ROZKŁAD.F			##	Zwraca rozkład prawdopodobieństwa F.
-FINV			= ROZKŁAD.F.ODW			##	Zwraca odwrotność rozkładu prawdopodobieństwa F.
-FISHER			= ROZKŁAD.FISHER		##	Zwraca transformację Fishera.
-FISHERINV		= ROZKŁAD.FISHER.ODW		##	Zwraca odwrotność transformacji Fishera.
-FORECAST		= REGLINX			##	Zwraca wartość trendu liniowego.
-FREQUENCY		= CZĘSTOŚĆ			##	Zwraca rozkład częstotliwości jako tablicę pionową.
-FTEST			= TEST.F			##	Zwraca wynik testu F.
-GAMMADIST		= ROZKŁAD.GAMMA			##	Zwraca rozkład gamma.
-GAMMAINV		= ROZKŁAD.GAMMA.ODW		##	Zwraca odwrotność skumulowanego rozkładu gamma.
-GAMMALN			= ROZKŁAD.LIN.GAMMA		##	Zwraca logarytm naturalny funkcji gamma, Γ(x).
-GEOMEAN			= ŚREDNIA.GEOMETRYCZNA		##	Zwraca średnią geometryczną.
-GROWTH			= REGEXPW			##	Zwraca wartości trendu wykładniczego.
-HARMEAN			= ŚREDNIA.HARMONICZNA		##	Zwraca średnią harmoniczną.
-HYPGEOMDIST		= ROZKŁAD.HIPERGEOM		##	Zwraca rozkład hipergeometryczny.
-INTERCEPT		= ODCIĘTA			##	Zwraca punkt przecięcia osi pionowej z linią regresji liniowej.
-KURT			= KURTOZA			##	Zwraca kurtozę zbioru danych.
-LARGE			= MAX.K				##	Zwraca k-tą największą wartość ze zbioru danych.
-LINEST			= REGLINP			##	Zwraca parametry trendu liniowego.
-LOGEST			= REGEXPP			##	Zwraca parametry trendu wykładniczego.
-LOGINV			= ROZKŁAD.LOG.ODW		##	Zwraca odwrotność rozkładu logarytmu naturalnego.
-LOGNORMDIST		= ROZKŁAD.LOG			##	Zwraca skumulowany rozkład logarytmu naturalnego.
-MAX			= MAX				##	Zwraca maksymalną wartość listy argumentów.
-MAXA			= MAX.A				##	Zwraca maksymalną wartość listy argumentów, z uwzględnieniem liczb, tekstów i wartości logicznych.
-MEDIAN			= MEDIANA			##	Zwraca medianę podanych liczb.
-MIN			= MIN				##	Zwraca minimalną wartość listy argumentów.
-MINA			= MIN.A				##	Zwraca najmniejszą wartość listy argumentów, z uwzględnieniem liczb, tekstów i wartości logicznych.
-MODE			= WYST.NAJCZĘŚCIEJ		##	Zwraca wartość najczęściej występującą w zbiorze danych.
-NEGBINOMDIST		= ROZKŁAD.DWUM.PRZEC		##	Zwraca ujemny rozkład dwumianowy.
-NORMDIST		= ROZKŁAD.NORMALNY		##	Zwraca rozkład normalny skumulowany.
-NORMINV			= ROZKŁAD.NORMALNY.ODW		##	Zwraca odwrotność rozkładu normalnego skumulowanego.
-NORMSDIST		= ROZKŁAD.NORMALNY.S		##	Zwraca standardowy rozkład normalny skumulowany.
-NORMSINV		= ROZKŁAD.NORMALNY.S.ODW	##	Zwraca odwrotność standardowego rozkładu normalnego skumulowanego.
-PEARSON			= PEARSON			##	Zwraca współczynnik korelacji momentu iloczynu Pearsona.
-PERCENTILE		= PERCENTYL			##	Wyznacza k-ty percentyl wartości w zakresie.
-PERCENTRANK		= PROCENT.POZYCJA		##	Zwraca procentową pozycję wartości w zbiorze danych.
-PERMUT			= PERMUTACJE			##	Zwraca liczbę permutacji dla danej liczby obiektów.
-POISSON			= ROZKŁAD.POISSON		##	Zwraca rozkład Poissona.
-PROB			= PRAWDPD			##	Zwraca prawdopodobieństwo, że wartości w zakresie leżą pomiędzy dwiema granicami.
-QUARTILE		= KWARTYL			##	Wyznacza kwartyl zbioru danych.
-RANK			= POZYCJA			##	Zwraca pozycję liczby na liście liczb.
-RSQ			= R.KWADRAT			##	Zwraca kwadrat współczynnika korelacji momentu iloczynu Pearsona.
-SKEW			= SKOŚNOŚĆ			##	Zwraca skośność rozkładu.
-SLOPE			= NACHYLENIE			##	Zwraca nachylenie linii regresji liniowej.
-SMALL			= MIN.K				##	Zwraca k-tą najmniejszą wartość ze zbioru danych.
-STANDARDIZE		= NORMALIZUJ			##	Zwraca wartość znormalizowaną.
-STDEV			= ODCH.STANDARDOWE		##	Szacuje odchylenie standardowe na podstawie próbki.
-STDEVA			= ODCH.STANDARDOWE.A		##	Szacuje odchylenie standardowe na podstawie próbki, z uwzględnieniem liczb, tekstów i wartości logicznych.
-STDEVP			= ODCH.STANDARD.POPUL		##	Oblicza odchylenie standardowe na podstawie całej populacji.
-STDEVPA			= ODCH.STANDARD.POPUL.A		##	Oblicza odchylenie standardowe na podstawie całej populacji, z uwzględnieniem liczb, teksów i wartości logicznych.
-STEYX			= REGBŁSTD			##	Zwraca błąd standardowy przewidzianej wartości y dla każdej wartości x w regresji.
-TDIST			= ROZKŁAD.T			##	Zwraca rozkład t-Studenta.
-TINV			= ROZKŁAD.T.ODW			##	Zwraca odwrotność rozkładu t-Studenta.
-TREND			= REGLINW			##	Zwraca wartości trendu liniowego.
-TRIMMEAN		= ŚREDNIA.WEWN			##	Zwraca średnią wartość dla wnętrza zbioru danych.
-TTEST			= TEST.T			##	Zwraca prawdopodobieństwo związane z testem t-Studenta.
-VAR			= WARIANCJA			##	Szacuje wariancję na podstawie próbki.
-VARA			= WARIANCJA.A			##	Szacuje wariancję na podstawie próbki, z uwzględnieniem liczb, tekstów i wartości logicznych.
-VARP			= WARIANCJA.POPUL		##	Oblicza wariancję na podstawie całej populacji.
-VARPA			= WARIANCJA.POPUL.A		##	Oblicza wariancję na podstawie całej populacji, z uwzględnieniem liczb, tekstów i wartości logicznych.
-WEIBULL			= ROZKŁAD.WEIBULL		##	Zwraca rozkład Weibulla.
-ZTEST			= TEST.Z			##	Zwraca wartość jednostronnego prawdopodobieństwa testu z.
-
-
-##
-##	Text functions					Funkcje tekstowe
-##
-ASC			= ASC				##	Zamienia litery angielskie lub katakana o pełnej szerokości (dwubajtowe) w ciągu znaków na znaki o szerokości połówkowej (jednobajtowe).
-BAHTTEXT		= BAHTTEXT			##	Konwertuje liczbę na tekst, stosując format walutowy ß (baht).
-CHAR			= ZNAK				##	Zwraca znak o podanym numerze kodu.
-CLEAN			= OCZYŚĆ			##	Usuwa z tekstu wszystkie znaki, które nie mogą być drukowane.
-CODE			= KOD				##	Zwraca kod numeryczny pierwszego znaku w ciągu tekstowym.
-CONCATENATE		= ZŁĄCZ.TEKSTY			##	Łączy kilka oddzielnych tekstów w jeden tekst.
-DOLLAR			= KWOTA				##	Konwertuje liczbę na tekst, stosując format walutowy $ (dolar).
-EXACT			= PORÓWNAJ			##	Sprawdza identyczność dwóch wartości tekstowych.
-FIND			= ZNAJDŹ			##	Znajduje jedną wartość tekstową wewnątrz innej (z uwzględnieniem wielkich i małych liter).
-FINDB			= ZNAJDŹB			##	Znajduje jedną wartość tekstową wewnątrz innej (z uwzględnieniem wielkich i małych liter).
-FIXED			= ZAOKR.DO.TEKST		##	Formatuje liczbę jako tekst przy stałej liczbie miejsc dziesiętnych.
-JIS			= JIS				##	Zmienia litery angielskie lub katakana o szerokości połówkowej (jednobajtowe) w ciągu znaków na znaki o pełnej szerokości (dwubajtowe).
-LEFT			= LEWY				##	Zwraca skrajne lewe znaki z wartości tekstowej.
-LEFTB			= LEWYB				##	Zwraca skrajne lewe znaki z wartości tekstowej.
-LEN			= DŁ				##	Zwraca liczbę znaków ciągu tekstowego.
-LENB			= DŁ.B				##	Zwraca liczbę znaków ciągu tekstowego.
-LOWER			= LITERY.MAŁE			##	Konwertuje wielkie litery tekstu na małe litery.
-MID			= FRAGMENT.TEKSTU		##	Zwraca określoną liczbę znaków z ciągu tekstowego, zaczynając od zadanej pozycji.
-MIDB			= FRAGMENT.TEKSTU.B		##	Zwraca określoną liczbę znaków z ciągu tekstowego, zaczynając od zadanej pozycji.
-PHONETIC		= PHONETIC			##	Wybiera znaki fonetyczne (furigana) z ciągu tekstowego.
-PROPER			= Z.WIELKIEJ.LITERY		##	Zastępuje pierwszą literę każdego wyrazu tekstu wielką literą.
-REPLACE			= ZASTĄP			##	Zastępuje znaki w tekście.
-REPLACEB		= ZASTĄP.B			##	Zastępuje znaki w tekście.
-REPT			= POWT				##	Powiela tekst daną liczbę razy.
-RIGHT			= PRAWY				##	Zwraca skrajne prawe znaki z wartości tekstowej.
-RIGHTB			= PRAWYB			##	Zwraca skrajne prawe znaki z wartości tekstowej.
-SEARCH			= SZUKAJ.TEKST			##	Wyszukuje jedną wartość tekstową wewnątrz innej (bez uwzględniania wielkości liter).
-SEARCHB			= SZUKAJ.TEKST.B		##	Wyszukuje jedną wartość tekstową wewnątrz innej (bez uwzględniania wielkości liter).
-SUBSTITUTE		= PODSTAW			##	Podstawia nowy tekst w miejsce poprzedniego tekstu w ciągu tekstowym.
-T			= T				##	Konwertuje argumenty na tekst.
-TEXT			= TEKST				##	Formatuje liczbę i konwertuje ją na tekst.
-TRIM			= USUŃ.ZBĘDNE.ODSTĘPY		##	Usuwa spacje z tekstu.
-UPPER			= LITERY.WIELKIE		##	Konwertuje znaki tekstu na wielkie litery.
-VALUE			= WARTOŚĆ			##	Konwertuje argument tekstowy na liczbę.
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/config
deleted file mode 100644
index e99aad6bea4..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= R$
-
-
-##
-##	Excel Error Codes	(For future use)
-##
-NULL	= #NULO!
-DIV0	= #DIV/0!
-VALUE	= #VALOR!
-REF	= #REF!
-NAME	= #NOME?
-NUM	= #NÚM!
-NA	= #N/D
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/functions
deleted file mode 100644
index a062a7fad51..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/functions
+++ /dev/null
@@ -1,408 +0,0 @@
-##
-##	Add-in and Automation functions			Funções Suplemento e Automação
-##
-GETPIVOTDATA		= INFODADOSTABELADINÂMICA	##	Retorna os dados armazenados em um relatório de tabela dinâmica
-
-
-##
-##	Cube functions					Funções de Cubo
-##
-CUBEKPIMEMBER		= MEMBROKPICUBO			##	Retorna o nome de um KPI (indicador de desempenho-chave), uma propriedade e uma medida e exibe o nome e a propriedade na célula. Um KPI é uma medida quantificável, como o lucro bruto mensal ou a rotatividade trimestral dos funcionários, usada para monitorar o desempenho de uma organização.
-CUBEMEMBER		= MEMBROCUBO			##	Retorna um membro ou tupla em uma hierarquia de cubo. Use para validar se o membro ou tupla existe no cubo.
-CUBEMEMBERPROPERTY	= PROPRIEDADEMEMBROCUBO		##	Retorna o valor da propriedade de um membro no cubo. Usada para validar a existência do nome do membro no cubo e para retornar a propriedade especificada para esse membro.
-CUBERANKEDMEMBER	= MEMBROCLASSIFICADOCUBO	##	Retorna o enésimo membro, ou o membro ordenado, em um conjunto. Use para retornar um ou mais elementos em um conjunto, assim como o melhor vendedor ou os dez melhores alunos.
-CUBESET			= CONJUNTOCUBO			##	Define um conjunto calculado de membros ou tuplas enviando uma expressão do conjunto para o cubo no servidor, que cria o conjunto e o retorna para o Microsoft Office Excel.
-CUBESETCOUNT		= CONTAGEMCONJUNTOCUBO		##	Retorna o número de itens em um conjunto.
-CUBEVALUE		= VALORCUBO			##	Retorna um valor agregado de um cubo.
-
-
-##
-##	Database functions				Funções de banco de dados
-##
-DAVERAGE		= BDMÉDIA			##	Retorna a média das entradas selecionadas de um banco de dados
-DCOUNT			= BDCONTAR			##	Conta as células que contêm números em um banco de dados
-DCOUNTA			= BDCONTARA			##	Conta células não vazias em um banco de dados
-DGET			= BDEXTRAIR			##	Extrai de um banco de dados um único registro que corresponde a um critério específico
-DMAX			= BDMÁX				##	Retorna o valor máximo de entradas selecionadas de um banco de dados
-DMIN			= BDMÍN				##	Retorna o valor mínimo de entradas selecionadas de um banco de dados
-DPRODUCT		= BDMULTIPL			##	Multiplica os valores em um campo específico de registros que correspondem ao critério em um banco de dados
-DSTDEV			= BDEST				##	Estima o desvio padrão com base em uma amostra de entradas selecionadas de um banco de dados
-DSTDEVP			= BDDESVPA			##	Calcula o desvio padrão com base na população inteira de entradas selecionadas de um banco de dados
-DSUM			= BDSOMA			##	Adiciona os números à coluna de campos de registros do banco de dados que correspondem ao critério
-DVAR			= BDVAREST			##	Estima a variância com base em uma amostra de entradas selecionadas de um banco de dados
-DVARP			= BDVARP			##	Calcula a variância com base na população inteira de entradas selecionadas de um banco de dados
-
-
-##
-##	Date and time functions				Funções de data e hora
-##
-DATE			= DATA				##	Retorna o número de série de uma data específica
-DATEVALUE		= DATA.VALOR			##	Converte uma data na forma de texto para um número de série
-DAY			= DIA				##	Converte um número de série em um dia do mês
-DAYS360			= DIAS360			##	Calcula o número de dias entre duas datas com base em um ano de 360 dias
-EDATE			= DATAM				##	Retorna o número de série da data que é o número indicado de meses antes ou depois da data inicial
-EOMONTH			= FIMMÊS			##	Retorna o número de série do último dia do mês antes ou depois de um número especificado de meses
-HOUR			= HORA				##	Converte um número de série em uma hora
-MINUTE			= MINUTO			##	Converte um número de série em um minuto
-MONTH			= MÊS				##	Converte um número de série em um mês
-NETWORKDAYS		= DIATRABALHOTOTAL		##	Retorna o número de dias úteis inteiros entre duas datas
-NOW			= AGORA				##	Retorna o número de série seqüencial da data e hora atuais
-SECOND			= SEGUNDO			##	Converte um número de série em um segundo
-TIME			= HORA				##	Retorna o número de série de uma hora específica
-TIMEVALUE		= VALOR.TEMPO			##	Converte um horário na forma de texto para um número de série
-TODAY			= HOJE				##	Retorna o número de série da data de hoje
-WEEKDAY			= DIA.DA.SEMANA			##	Converte um número de série em um dia da semana
-WEEKNUM			= NÚMSEMANA			##	Converte um número de série em um número que representa onde a semana cai numericamente em um ano
-WORKDAY			= DIATRABALHO			##	Retorna o número de série da data antes ou depois de um número específico de dias úteis
-YEAR			= ANO				##	Converte um número de série em um ano
-YEARFRAC		= FRAÇÃOANO			##	Retorna a fração do ano que representa o número de dias entre data_inicial e data_final
-
-
-##
-##	Engineering functions				Funções de engenharia
-##
-BESSELI			= BESSELI			##	Retorna a função de Bessel In(x) modificada
-BESSELJ			= BESSELJ			##	Retorna a função de Bessel Jn(x)
-BESSELK			= BESSELK			##	Retorna a função de Bessel Kn(x) modificada
-BESSELY			= BESSELY			##	Retorna a função de Bessel Yn(x)
-BIN2DEC			= BIN2DEC			##	Converte um número binário em decimal
-BIN2HEX			= BIN2HEX			##	Converte um número binário em hexadecimal
-BIN2OCT			= BIN2OCT			##	Converte um número binário em octal
-COMPLEX			= COMPLEX			##	Converte coeficientes reais e imaginários e um número complexo
-CONVERT			= CONVERTER			##	Converte um número de um sistema de medida para outro
-DEC2BIN			= DECABIN			##	Converte um número decimal em binário
-DEC2HEX			= DECAHEX			##	Converte um número decimal em hexadecimal
-DEC2OCT			= DECAOCT			##	Converte um número decimal em octal
-DELTA			= DELTA				##	Testa se dois valores são iguais
-ERF			= FUNERRO			##	Retorna a função de erro
-ERFC			= FUNERROCOMPL			##	Retorna a função de erro complementar
-GESTEP			= DEGRAU			##	Testa se um número é maior do que um valor limite
-HEX2BIN			= HEXABIN			##	Converte um número hexadecimal em binário
-HEX2DEC			= HEXADEC			##	Converte um número hexadecimal em decimal
-HEX2OCT			= HEXAOCT			##	Converte um número hexadecimal em octal
-IMABS			= IMABS				##	Retorna o valor absoluto (módulo) de um número complexo
-IMAGINARY		= IMAGINÁRIO			##	Retorna o coeficiente imaginário de um número complexo
-IMARGUMENT		= IMARG				##	Retorna o argumento teta, um ângulo expresso em radianos
-IMCONJUGATE		= IMCONJ			##	Retorna o conjugado complexo de um número complexo
-IMCOS			= IMCOS				##	Retorna o cosseno de um número complexo
-IMDIV			= IMDIV				##	Retorna o quociente de dois números complexos
-IMEXP			= IMEXP				##	Retorna o exponencial de um número complexo
-IMLN			= IMLN				##	Retorna o logaritmo natural de um número complexo
-IMLOG10			= IMLOG10			##	Retorna o logaritmo de base 10 de um número complexo
-IMLOG2			= IMLOG2			##	Retorna o logaritmo de base 2 de um número complexo
-IMPOWER			= IMPOT				##	Retorna um número complexo elevado a uma potência inteira
-IMPRODUCT		= IMPROD			##	Retorna o produto de números complexos
-IMREAL			= IMREAL			##	Retorna o coeficiente real de um número complexo
-IMSIN			= IMSENO			##	Retorna o seno de um número complexo
-IMSQRT			= IMRAIZ			##	Retorna a raiz quadrada de um número complexo
-IMSUB			= IMSUBTR			##	Retorna a diferença entre dois números complexos
-IMSUM			= IMSOMA			##	Retorna a soma de números complexos
-OCT2BIN			= OCTABIN			##	Converte um número octal em binário
-OCT2DEC			= OCTADEC			##	Converte um número octal em decimal
-OCT2HEX			= OCTAHEX			##	Converte um número octal em hexadecimal
-
-
-##
-##	Financial functions				Funções financeiras
-##
-ACCRINT			= JUROSACUM			##	Retorna a taxa de juros acumulados de um título que paga uma taxa periódica de juros
-ACCRINTM		= JUROSACUMV			##	Retorna os juros acumulados de um título que paga juros no vencimento
-AMORDEGRC		= AMORDEGRC			##	Retorna a depreciação para cada período contábil usando o coeficiente de depreciação
-AMORLINC		= AMORLINC			##	Retorna a depreciação para cada período contábil
-COUPDAYBS		= CUPDIASINLIQ			##	Retorna o número de dias do início do período de cupom até a data de liquidação
-COUPDAYS		= CUPDIAS			##	Retorna o número de dias no período de cupom que contém a data de quitação
-COUPDAYSNC		= CUPDIASPRÓX			##	Retorna o número de dias da data de liquidação até a data do próximo cupom
-COUPNCD			= CUPDATAPRÓX			##	Retorna a próxima data de cupom após a data de quitação
-COUPNUM			= CUPNÚM			##	Retorna o número de cupons pagáveis entre as datas de quitação e vencimento
-COUPPCD			= CUPDATAANT			##	Retorna a data de cupom anterior à data de quitação
-CUMIPMT			= PGTOJURACUM			##	Retorna os juros acumulados pagos entre dois períodos
-CUMPRINC		= PGTOCAPACUM			##	Retorna o capital acumulado pago sobre um empréstimo entre dois períodos
-DB			= BD				##	Retorna a depreciação de um ativo para um período especificado, usando o método de balanço de declínio fixo
-DDB			= BDD				##	Retorna a depreciação de um ativo com relação a um período especificado usando o método de saldos decrescentes duplos ou qualquer outro método especificado por você
-DISC			= DESC				##	Retorna a taxa de desconto de um título
-DOLLARDE		= MOEDADEC			##	Converte um preço em formato de moeda, na forma fracionária, em um preço na forma decimal
-DOLLARFR		= MOEDAFRA			##	Converte um preço, apresentado na forma decimal, em um preço apresentado na forma fracionária
-DURATION		= DURAÇÃO			##	Retorna a duração anual de um título com pagamentos de juros periódicos
-EFFECT			= EFETIVA			##	Retorna a taxa de juros anual efetiva
-FV			= VF				##	Retorna o valor futuro de um investimento
-FVSCHEDULE		= VFPLANO			##	Retorna o valor futuro de um capital inicial após a aplicação de uma série de taxas de juros compostas
-INTRATE			= TAXAJUROS			##	Retorna a taxa de juros de um título totalmente investido
-IPMT			= IPGTO				##	Retorna o pagamento de juros para um investimento em um determinado período
-IRR			= TIR				##	Retorna a taxa interna de retorno de uma série de fluxos de caixa
-ISPMT			= ÉPGTO				##	Calcula os juros pagos durante um período específico de um investimento
-MDURATION		= MDURAÇÃO			##	Retorna a duração de Macauley modificada para um título com um valor de paridade equivalente a R$ 100
-MIRR			= MTIR				##	Calcula a taxa interna de retorno em que fluxos de caixa positivos e negativos são financiados com diferentes taxas
-NOMINAL			= NOMINAL			##	Retorna a taxa de juros nominal anual
-NPER			= NPER				##	Retorna o número de períodos de um investimento
-NPV			= VPL				##	Retorna o valor líquido atual de um investimento com base em uma série de fluxos de caixa periódicos e em uma taxa de desconto
-ODDFPRICE		= PREÇOPRIMINC			##	Retorna o preço por R$ 100 de valor nominal de um título com um primeiro período indefinido
-ODDFYIELD		= LUCROPRIMINC			##	Retorna o rendimento de um título com um primeiro período indefinido
-ODDLPRICE		= PREÇOÚLTINC			##	Retorna o preço por R$ 100 de valor nominal de um título com um último período de cupom indefinido
-ODDLYIELD		= LUCROÚLTINC			##	Retorna o rendimento de um título com um último período indefinido
-PMT			= PGTO				##	Retorna o pagamento periódico de uma anuidade
-PPMT			= PPGTO				##	Retorna o pagamento de capital para determinado período de investimento
-PRICE			= PREÇO				##	Retorna a preço por R$ 100,00 de valor nominal de um título que paga juros periódicos
-PRICEDISC		= PREÇODESC			##	Retorna o preço por R$ 100,00 de valor nominal de um título descontado
-PRICEMAT		= PREÇOVENC			##	Retorna o preço por R$ 100,00 de valor nominal de um título que paga juros no vencimento
-PV			= VP				##	Retorna o valor presente de um investimento
-RATE			= TAXA				##	Retorna a taxa de juros por período de uma anuidade
-RECEIVED		= RECEBER			##	Retorna a quantia recebida no vencimento de um título totalmente investido
-SLN			= DPD				##	Retorna a depreciação em linha reta de um ativo durante um período
-SYD			= SDA				##	Retorna a depreciação dos dígitos da soma dos anos de um ativo para um período especificado
-TBILLEQ			= OTN				##	Retorna o rendimento de um título equivalente a uma obrigação do Tesouro
-TBILLPRICE		= OTNVALOR			##	Retorna o preço por R$ 100,00 de valor nominal de uma obrigação do Tesouro
-TBILLYIELD		= OTNLUCRO			##	Retorna o rendimento de uma obrigação do Tesouro
-VDB			= BDV				##	Retorna a depreciação de um ativo para um período especificado ou parcial usando um método de balanço declinante
-XIRR			= XTIR				##	Fornece a taxa interna de retorno para um programa de fluxos de caixa que não é necessariamente periódico
-XNPV			= XVPL				##	Retorna o valor presente líquido de um programa de fluxos de caixa que não é necessariamente periódico
-YIELD			= LUCRO				##	Retorna o lucro de um título que paga juros periódicos
-YIELDDISC		= LUCRODESC			##	Retorna o rendimento anual de um título descontado. Por exemplo, uma obrigação do Tesouro
-YIELDMAT		= LUCROVENC			##	Retorna o lucro anual de um título que paga juros no vencimento
-
-
-##
-##	Information functions				Funções de informação
-##
-CELL			= CÉL				##	Retorna informações sobre formatação, localização ou conteúdo de uma célula
-ERROR.TYPE		= TIPO.ERRO			##	Retorna um número correspondente a um tipo de erro
-INFO			= INFORMAÇÃO			##	Retorna informações sobre o ambiente operacional atual
-ISBLANK			= ÉCÉL.VAZIA			##	Retorna VERDADEIRO se o valor for vazio
-ISERR			= ÉERRO				##	Retorna VERDADEIRO se o valor for um valor de erro diferente de #N/D
-ISERROR			= ÉERROS			##	Retorna VERDADEIRO se o valor for um valor de erro
-ISEVEN			= ÉPAR				##	Retorna VERDADEIRO se o número for par
-ISLOGICAL		= ÉLÓGICO			##	Retorna VERDADEIRO se o valor for um valor lógico
-ISNA			= É.NÃO.DISP			##	Retorna VERDADEIRO se o valor for o valor de erro #N/D
-ISNONTEXT		= É.NÃO.TEXTO			##	Retorna VERDADEIRO se o valor for diferente de texto
-ISNUMBER		= ÉNÚM				##	Retorna VERDADEIRO se o valor for um número
-ISODD			= ÉIMPAR			##	Retorna VERDADEIRO se o número for ímpar
-ISREF			= ÉREF				##	Retorna VERDADEIRO se o valor for uma referência
-ISTEXT			= ÉTEXTO			##	Retorna VERDADEIRO se o valor for texto
-N			= N				##	Retorna um valor convertido em um número
-NA			= NÃO.DISP			##	Retorna o valor de erro #N/D
-TYPE			= TIPO				##	Retorna um número indicando o tipo de dados de um valor
-
-
-##
-##	Logical functions				Funções lógicas
-##
-AND			= E				##	Retorna VERDADEIRO se todos os seus argumentos forem VERDADEIROS
-FALSE			= FALSO				##	Retorna o valor lógico FALSO
-IF			= SE				##	Especifica um teste lógico a ser executado
-IFERROR			= SEERRO			##	Retornará um valor que você especifica se uma fórmula for avaliada para um erro; do contrário, retornará o resultado da fórmula
-NOT			= NÃO				##	Inverte o valor lógico do argumento
-OR			= OU				##	Retorna VERDADEIRO se um dos argumentos for VERDADEIRO
-TRUE			= VERDADEIRO			##	Retorna o valor lógico VERDADEIRO
-
-
-##
-##	Lookup and reference functions			Funções de pesquisa e referência
-##
-ADDRESS			= ENDEREÇO			##	Retorna uma referência como texto para uma única célula em uma planilha
-AREAS			= ÁREAS				##	Retorna o número de áreas em uma referência
-CHOOSE			= ESCOLHER			##	Escolhe um valor a partir de uma lista de valores
-COLUMN			= COL				##	Retorna o número da coluna de uma referência
-COLUMNS			= COLS				##	Retorna o número de colunas em uma referência
-HLOOKUP			= PROCH				##	Procura na linha superior de uma matriz e retorna o valor da célula especificada
-HYPERLINK		= HYPERLINK			##	Cria um atalho ou salto que abre um documento armazenado em um servidor de rede, uma intranet ou na Internet
-INDEX			= ÍNDICE			##	Usa um índice para escolher um valor de uma referência ou matriz
-INDIRECT		= INDIRETO			##	Retorna uma referência indicada por um valor de texto
-LOOKUP			= PROC				##	Procura valores em um vetor ou em uma matriz
-MATCH			= CORRESP			##	Procura valores em uma referência ou em uma matriz
-OFFSET			= DESLOC			##	Retorna um deslocamento de referência com base em uma determinada referência
-ROW			= LIN				##	Retorna o número da linha de uma referência
-ROWS			= LINS				##	Retorna o número de linhas em uma referência
-RTD			= RTD				##	Recupera dados em tempo real de um programa que ofereça suporte a automação COM (automação: uma forma de trabalhar com objetos de um aplicativo a partir de outro aplicativo ou ferramenta de desenvolvimento. Chamada inicialmente de automação OLE, a automação é um padrão industrial e um recurso do modelo de objeto componente (COM).)
-TRANSPOSE		= TRANSPOR			##	Retorna a transposição de uma matriz
-VLOOKUP			= PROCV				##	Procura na primeira coluna de uma matriz e move ao longo da linha para retornar o valor de uma célula
-
-
-##
-##	Math and trigonometry functions			Funções matemáticas e trigonométricas
-##
-ABS			= ABS				##	Retorna o valor absoluto de um número
-ACOS			= ACOS				##	Retorna o arco cosseno de um número
-ACOSH			= ACOSH				##	Retorna o cosseno hiperbólico inverso de um número
-ASIN			= ASEN				##	Retorna o arco seno de um número
-ASINH			= ASENH				##	Retorna o seno hiperbólico inverso de um número
-ATAN			= ATAN				##	Retorna o arco tangente de um número
-ATAN2			= ATAN2				##	Retorna o arco tangente das coordenadas x e y especificadas
-ATANH			= ATANH				##	Retorna a tangente hiperbólica inversa de um número
-CEILING			= TETO				##	Arredonda um número para o inteiro mais próximo ou para o múltiplo mais próximo de significância
-COMBIN			= COMBIN			##	Retorna o número de combinações de um determinado número de objetos
-COS			= COS				##	Retorna o cosseno de um número
-COSH			= COSH				##	Retorna o cosseno hiperbólico de um número
-DEGREES			= GRAUS				##	Converte radianos em graus
-EVEN			= PAR				##	Arredonda um número para cima até o inteiro par mais próximo
-EXP			= EXP				##	Retorna e elevado à potência de um número especificado
-FACT			= FATORIAL			##	Retorna o fatorial de um número
-FACTDOUBLE		= FATDUPLO			##	Retorna o fatorial duplo de um número
-FLOOR			= ARREDMULTB			##	Arredonda um número para baixo até zero
-GCD			= MDC				##	Retorna o máximo divisor comum
-INT			= INT				##	Arredonda um número para baixo até o número inteiro mais próximo
-LCM			= MMC				##	Retorna o mínimo múltiplo comum
-LN			= LN				##	Retorna o logaritmo natural de um número
-LOG			= LOG				##	Retorna o logaritmo de um número de uma base especificada
-LOG10			= LOG10				##	Retorna o logaritmo de base 10 de um número
-MDETERM			= MATRIZ.DETERM			##	Retorna o determinante de uma matriz de uma variável do tipo matriz
-MINVERSE		= MATRIZ.INVERSO		##	Retorna a matriz inversa de uma matriz
-MMULT			= MATRIZ.MULT			##	Retorna o produto de duas matrizes
-MOD			= RESTO				##	Retorna o resto da divisão
-MROUND			= MARRED			##	Retorna um número arredondado ao múltiplo desejado
-MULTINOMIAL		= MULTINOMIAL			##	Retorna o multinomial de um conjunto de números
-ODD			= ÍMPAR				##	Arredonda um número para cima até o inteiro ímpar mais próximo
-PI			= PI				##	Retorna o valor de Pi
-POWER			= POTÊNCIA			##	Fornece o resultado de um número elevado a uma potência
-PRODUCT			= MULT				##	Multiplica seus argumentos
-QUOTIENT		= QUOCIENTE			##	Retorna a parte inteira de uma divisão
-RADIANS			= RADIANOS			##	Converte graus em radianos
-RAND			= ALEATÓRIO			##	Retorna um número aleatório entre 0 e 1
-RANDBETWEEN		= ALEATÓRIOENTRE		##	Retorna um número aleatório entre os números especificados
-ROMAN			= ROMANO			##	Converte um algarismo arábico em romano, como texto
-ROUND			= ARRED				##	Arredonda um número até uma quantidade especificada de dígitos
-ROUNDDOWN		= ARREDONDAR.PARA.BAIXO		##	Arredonda um número para baixo até zero
-ROUNDUP			= ARREDONDAR.PARA.CIMA		##	Arredonda um número para cima, afastando-o de zero
-SERIESSUM		= SOMASEQÜÊNCIA			##	Retorna a soma de uma série polinomial baseada na fórmula
-SIGN			= SINAL				##	Retorna o sinal de um número
-SIN			= SEN				##	Retorna o seno de um ângulo dado
-SINH			= SENH				##	Retorna o seno hiperbólico de um número
-SQRT			= RAIZ				##	Retorna uma raiz quadrada positiva
-SQRTPI			= RAIZPI			##	Retorna a raiz quadrada de (núm* pi)
-SUBTOTAL		= SUBTOTAL			##	Retorna um subtotal em uma lista ou em um banco de dados
-SUM			= SOMA				##	Soma seus argumentos
-SUMIF			= SOMASE			##	Adiciona as células especificadas por um determinado critério
-SUMIFS			= SOMASE			##	Adiciona as células em um intervalo que atende a vários critérios
-SUMPRODUCT		= SOMARPRODUTO			##	Retorna a soma dos produtos de componentes correspondentes de matrizes
-SUMSQ			= SOMAQUAD			##	Retorna a soma dos quadrados dos argumentos
-SUMX2MY2		= SOMAX2DY2			##	Retorna a soma da diferença dos quadrados dos valores correspondentes em duas matrizes
-SUMX2PY2		= SOMAX2SY2			##	Retorna a soma da soma dos quadrados dos valores correspondentes em duas matrizes
-SUMXMY2			= SOMAXMY2			##	Retorna a soma dos quadrados das diferenças dos valores correspondentes em duas matrizes
-TAN			= TAN				##	Retorna a tangente de um número
-TANH			= TANH				##	Retorna a tangente hiperbólica de um número
-TRUNC			= TRUNCAR			##	Trunca um número para um inteiro
-
-
-##
-##	Statistical functions				Funções estatísticas
-##
-AVEDEV			= DESV.MÉDIO			##	Retorna a média aritmética dos desvios médios dos pontos de dados a partir de sua média
-AVERAGE			= MÉDIA				##	Retorna a média dos argumentos
-AVERAGEA		= MÉDIAA			##	Retorna a média dos argumentos, inclusive números, texto e valores lógicos
-AVERAGEIF		= MÉDIASE			##	Retorna a média (média aritmética) de todas as células em um intervalo que atendem a um determinado critério
-AVERAGEIFS		= MÉDIASES			##	Retorna a média (média aritmética) de todas as células que atendem a múltiplos critérios.
-BETADIST		= DISTBETA			##	Retorna a função de distribuição cumulativa beta
-BETAINV			= BETA.ACUM.INV			##	Retorna o inverso da função de distribuição cumulativa para uma distribuição beta especificada
-BINOMDIST		= DISTRBINOM			##	Retorna a probabilidade de distribuição binomial do termo individual
-CHIDIST			= DIST.QUI			##	Retorna a probabilidade unicaudal da distribuição qui-quadrada
-CHIINV			= INV.QUI			##	Retorna o inverso da probabilidade uni-caudal da distribuição qui-quadrada
-CHITEST			= TESTE.QUI			##	Retorna o teste para independência
-CONFIDENCE		= INT.CONFIANÇA			##	Retorna o intervalo de confiança para uma média da população
-CORREL			= CORREL			##	Retorna o coeficiente de correlação entre dois conjuntos de dados
-COUNT			= CONT.NÚM			##	Calcula quantos números há na lista de argumentos
-COUNTA			= CONT.VALORES			##	Calcula quantos valores há na lista de argumentos
-COUNTBLANK		= CONTAR.VAZIO			##	Conta o número de células vazias no intervalo especificado
-COUNTIF			= CONT.SE			##	Calcula o número de células não vazias em um intervalo que corresponde a determinados critérios
-COUNTIFS		= CONT.SES			##	Conta o número de células dentro de um intervalo que atende a múltiplos critérios
-COVAR			= COVAR				##	Retorna a covariância, a média dos produtos dos desvios pares
-CRITBINOM		= CRIT.BINOM			##	Retorna o menor valor para o qual a distribuição binomial cumulativa é menor ou igual ao valor padrão
-DEVSQ			= DESVQ				##	Retorna a soma dos quadrados dos desvios
-EXPONDIST		= DISTEXPON			##	Retorna a distribuição exponencial
-FDIST			= DISTF				##	Retorna a distribuição de probabilidade F
-FINV			= INVF				##	Retorna o inverso da distribuição de probabilidades F
-FISHER			= FISHER			##	Retorna a transformação Fisher
-FISHERINV		= FISHERINV			##	Retorna o inverso da transformação Fisher
-FORECAST		= PREVISÃO			##	Retorna um valor ao longo de uma linha reta
-FREQUENCY		= FREQÜÊNCIA			##	Retorna uma distribuição de freqüência como uma matriz vertical
-FTEST			= TESTEF			##	Retorna o resultado de um teste F
-GAMMADIST		= DISTGAMA			##	Retorna a distribuição gama
-GAMMAINV		= INVGAMA			##	Retorna o inverso da distribuição cumulativa gama
-GAMMALN			= LNGAMA			##	Retorna o logaritmo natural da função gama, G(x)
-GEOMEAN			= MÉDIA.GEOMÉTRICA		##	Retorna a média geométrica
-GROWTH			= CRESCIMENTO			##	Retorna valores ao longo de uma tendência exponencial
-HARMEAN			= MÉDIA.HARMÔNICA		##	Retorna a média harmônica
-HYPGEOMDIST		= DIST.HIPERGEOM		##	Retorna a distribuição hipergeométrica
-INTERCEPT		= INTERCEPÇÃO			##	Retorna a intercepção da linha de regressão linear
-KURT			= CURT				##	Retorna a curtose de um conjunto de dados
-LARGE			= MAIOR				##	Retorna o maior valor k-ésimo de um conjunto de dados
-LINEST			= PROJ.LIN			##	Retorna os parâmetros de uma tendência linear
-LOGEST			= PROJ.LOG			##	Retorna os parâmetros de uma tendência exponencial
-LOGINV			= INVLOG			##	Retorna o inverso da distribuição lognormal
-LOGNORMDIST		= DIST.LOGNORMAL		##	Retorna a distribuição lognormal cumulativa
-MAX			= MÁXIMO			##	Retorna o valor máximo em uma lista de argumentos
-MAXA			= MÁXIMOA			##	Retorna o maior valor em uma lista de argumentos, inclusive números, texto e valores lógicos
-MEDIAN			= MED				##	Retorna a mediana dos números indicados
-MIN			= MÍNIMO			##	Retorna o valor mínimo em uma lista de argumentos
-MINA			= MÍNIMOA			##	Retorna o menor valor em uma lista de argumentos, inclusive números, texto e valores lógicos
-MODE			= MODO				##	Retorna o valor mais comum em um conjunto de dados
-NEGBINOMDIST		= DIST.BIN.NEG			##	Retorna a distribuição binomial negativa
-NORMDIST		= DIST.NORM			##	Retorna a distribuição cumulativa normal
-NORMINV			= INV.NORM			##	Retorna o inverso da distribuição cumulativa normal
-NORMSDIST		= DIST.NORMP			##	Retorna a distribuição cumulativa normal padrão
-NORMSINV		= INV.NORMP			##	Retorna o inverso da distribuição cumulativa normal padrão
-PEARSON			= PEARSON			##	Retorna o coeficiente de correlação do momento do produto Pearson
-PERCENTILE		= PERCENTIL			##	Retorna o k-ésimo percentil de valores em um intervalo
-PERCENTRANK		= ORDEM.PORCENTUAL		##	Retorna a ordem percentual de um valor em um conjunto de dados
-PERMUT			= PERMUT			##	Retorna o número de permutações de um determinado número de objetos
-POISSON			= POISSON			##	Retorna a distribuição Poisson
-PROB			= PROB				##	Retorna a probabilidade de valores em um intervalo estarem entre dois limites
-QUARTILE		= QUARTIL			##	Retorna o quartil do conjunto de dados
-RANK			= ORDEM				##	Retorna a posição de um número em uma lista de números
-RSQ			= RQUAD				##	Retorna o quadrado do coeficiente de correlação do momento do produto de Pearson
-SKEW			= DISTORÇÃO			##	Retorna a distorção de uma distribuição
-SLOPE			= INCLINAÇÃO			##	Retorna a inclinação da linha de regressão linear
-SMALL			= MENOR				##	Retorna o menor valor k-ésimo do conjunto de dados
-STANDARDIZE		= PADRONIZAR			##	Retorna um valor normalizado
-STDEV			= DESVPAD			##	Estima o desvio padrão com base em uma amostra
-STDEVA			= DESVPADA			##	Estima o desvio padrão com base em uma amostra, inclusive números, texto e valores lógicos
-STDEVP			= DESVPADP			##	Calcula o desvio padrão com base na população total
-STDEVPA			= DESVPADPA			##	Calcula o desvio padrão com base na população total, inclusive números, texto e valores lógicos
-STEYX			= EPADYX			##	Retorna o erro padrão do valor-y previsto para cada x da regressão
-TDIST			= DISTT				##	Retorna a distribuição t de Student
-TINV			= INVT				##	Retorna o inverso da distribuição t de Student
-TREND			= TENDÊNCIA			##	Retorna valores ao longo de uma tendência linear
-TRIMMEAN		= MÉDIA.INTERNA			##	Retorna a média do interior de um conjunto de dados
-TTEST			= TESTET			##	Retorna a probabilidade associada ao teste t de Student
-VAR			= VAR				##	Estima a variância com base em uma amostra
-VARA			= VARA				##	Estima a variância com base em uma amostra, inclusive números, texto e valores lógicos
-VARP			= VARP				##	Calcula a variância com base na população inteira
-VARPA			= VARPA				##	Calcula a variância com base na população total, inclusive números, texto e valores lógicos
-WEIBULL			= WEIBULL			##	Retorna a distribuição Weibull
-ZTEST			= TESTEZ			##	Retorna o valor de probabilidade uni-caudal de um teste-z
-
-
-##
-##	Text functions			Funções de texto
-##
-ASC			= ASC				##	Altera letras do inglês ou katakana de largura total (bytes duplos) dentro de uma seqüência de caracteres para caracteres de meia largura (byte único)
-BAHTTEXT		= BAHTTEXT			##	Converte um número em um texto, usando o formato de moeda ß (baht)
-CHAR			= CARACT			##	Retorna o caractere especificado pelo número de código
-CLEAN			= TIRAR				##	Remove todos os caracteres do texto que não podem ser impressos
-CODE			= CÓDIGO			##	Retorna um código numérico para o primeiro caractere de uma seqüência de caracteres de texto
-CONCATENATE		= CONCATENAR			##	Agrupa vários itens de texto em um único item de texto
-DOLLAR			= MOEDA				##	Converte um número em texto, usando o formato de moeda $ (dólar)
-EXACT			= EXATO				##	Verifica se dois valores de texto são idênticos
-FIND			= PROCURAR			##	Procura um valor de texto dentro de outro (diferencia maiúsculas de minúsculas)
-FINDB			= PROCURARB			##	Procura um valor de texto dentro de outro (diferencia maiúsculas de minúsculas)
-FIXED			= DEF.NÚM.DEC			##	Formata um número como texto com um número fixo de decimais
-JIS			= JIS				##	Altera letras do inglês ou katakana de meia largura (byte único) dentro de uma seqüência de caracteres para caracteres de largura total (bytes duplos)
-LEFT			= ESQUERDA			##	Retorna os caracteres mais à esquerda de um valor de texto
-LEFTB			= ESQUERDAB			##	Retorna os caracteres mais à esquerda de um valor de texto
-LEN			= NÚM.CARACT			##	Retorna o número de caracteres em uma seqüência de texto
-LENB			= NÚM.CARACTB			##	Retorna o número de caracteres em uma seqüência de texto
-LOWER			= MINÚSCULA			##	Converte texto para minúsculas
-MID			= EXT.TEXTO			##	Retorna um número específico de caracteres de uma seqüência de texto começando na posição especificada
-MIDB			= EXT.TEXTOB			##	Retorna um número específico de caracteres de uma seqüência de texto começando na posição especificada
-PHONETIC		= FONÉTICA			##	Extrai os caracteres fonéticos (furigana) de uma seqüência de caracteres de texto
-PROPER			= PRI.MAIÚSCULA			##	Coloca a primeira letra de cada palavra em maiúscula em um valor de texto
-REPLACE			= MUDAR				##	Muda os caracteres dentro do texto
-REPLACEB		= MUDARB			##	Muda os caracteres dentro do texto
-REPT			= REPT				##	Repete o texto um determinado número de vezes
-RIGHT			= DIREITA			##	Retorna os caracteres mais à direita de um valor de texto
-RIGHTB			= DIREITAB			##	Retorna os caracteres mais à direita de um valor de texto
-SEARCH			= LOCALIZAR			##	Localiza um valor de texto dentro de outro (não diferencia maiúsculas de minúsculas)
-SEARCHB			= LOCALIZARB			##	Localiza um valor de texto dentro de outro (não diferencia maiúsculas de minúsculas)
-SUBSTITUTE		= SUBSTITUIR			##	Substitui um novo texto por um texto antigo em uma seqüência de texto
-T			= T				##	Converte os argumentos em texto
-TEXT			= TEXTO				##	Formata um número e o converte em texto
-TRIM			= ARRUMAR			##	Remove espaços do texto
-UPPER			= MAIÚSCULA			##	Converte o texto em maiúsculas
-VALUE			= VALOR				##	Converte um argumento de texto em um número
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/config
deleted file mode 100644
index 36df63cc012..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= €
-
-
-##
-##	Excel Error Codes	(For future use)
-##
-NULL	= #NULO!
-DIV0	= #DIV/0!
-VALUE	= #VALOR!
-REF	= #REF!
-NAME	= #NOME?
-NUM	= #NÚM!
-NA	= #N/D
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/functions
deleted file mode 100644
index ba4eb471bad..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/functions
+++ /dev/null
@@ -1,408 +0,0 @@
-##
-##	Add-in and Automation functions			Funções de Suplemento e Automatização
-##
-GETPIVOTDATA		= OBTERDADOSDIN			##	Devolve dados armazenados num relatório de Tabela Dinâmica
-
-
-##
-##	Cube functions					Funções de cubo
-##
-CUBEKPIMEMBER		= MEMBROKPICUBO			##	Devolve o nome, propriedade e medição de um KPI (key performance indicator) e apresenta o nome e a propriedade na célula. Um KPI é uma medida quantificável, como, por exemplo, o lucro mensal bruto ou a rotatividade trimestral de pessoal, utilizada para monitorizar o desempenho de uma organização.
-CUBEMEMBER		= MEMBROCUBO			##	Devolve um membro ou cadeia de identificação numa hierarquia de cubo. Utilizada para validar a existência do membro ou cadeia de identificação no cubo.
-CUBEMEMBERPROPERTY	= PROPRIEDADEMEMBROCUBO		##	Devolve o valor de uma propriedade de membro no cubo. Utilizada para validar a existência de um nome de membro no cubo e para devolver a propriedade especificada para esse membro.
-CUBERANKEDMEMBER	= MEMBROCLASSIFICADOCUBO	##	Devolve o enésimo ou a classificação mais alta num conjunto. Utilizada para devolver um ou mais elementos num conjunto, tal como o melhor vendedor ou os 10 melhores alunos.
-CUBESET			= CONJUNTOCUBO			##	Define um conjunto calculado de membros ou cadeias de identificação enviando uma expressão de conjunto para o cubo no servidor, que cria o conjunto e, em seguida, devolve o conjunto ao Microsoft Office Excel.
-CUBESETCOUNT		= CONTARCONJUNTOCUBO		##	Devolve o número de itens num conjunto.
-CUBEVALUE		= VALORCUBO			##	Devolve um valor agregado do cubo.
-
-
-##
-##	Database functions				Funções de base de dados
-##
-DAVERAGE		= BDMÉDIA			##	Devolve a média das entradas da base de dados seleccionadas
-DCOUNT			= BDCONTAR			##	Conta as células que contêm números numa base de dados
-DCOUNTA			= BDCONTAR.VAL			##	Conta as células que não estejam em branco numa base de dados
-DGET			= BDOBTER			##	Extrai de uma base de dados um único registo que corresponde aos critérios especificados
-DMAX			= BDMÁX				##	Devolve o valor máximo das entradas da base de dados seleccionadas
-DMIN			= BDMÍN				##	Devolve o valor mínimo das entradas da base de dados seleccionadas
-DPRODUCT		= BDMULTIPL			##	Multiplica os valores de um determinado campo de registos que correspondem aos critérios numa base de dados
-DSTDEV			= BDDESVPAD			##	Calcula o desvio-padrão com base numa amostra de entradas da base de dados seleccionadas
-DSTDEVP			= BDDESVPADP			##	Calcula o desvio-padrão com base na população total das entradas da base de dados seleccionadas
-DSUM			= BDSOMA			##	Adiciona os números na coluna de campo dos registos de base de dados que correspondem aos critérios
-DVAR			= BDVAR				##	Calcula a variância com base numa amostra das entradas de base de dados seleccionadas
-DVARP			= BDVARP			##	Calcula a variância com base na população total das entradas de base de dados seleccionadas
-
-
-##
-##	Date and time functions				Funções de data e hora
-##
-DATE			= DATA				##	Devolve o número de série de uma determinada data
-DATEVALUE		= DATA.VALOR			##	Converte uma data em forma de texto num número de série
-DAY			= DIA				##	Converte um número de série num dia do mês
-DAYS360			= DIAS360			##	Calcula o número de dias entre duas datas com base num ano com 360 dias
-EDATE			= DATAM				##	Devolve um número de série de data que corresponde ao número de meses indicado antes ou depois da data de início
-EOMONTH			= FIMMÊS			##	Devolve o número de série do último dia do mês antes ou depois de um número de meses especificado
-HOUR			= HORA				##	Converte um número de série numa hora
-MINUTE			= MINUTO			##	Converte um número de série num minuto
-MONTH			= MÊS				##	Converte um número de série num mês
-NETWORKDAYS		= DIATRABALHOTOTAL		##	Devolve o número total de dias úteis entre duas datas
-NOW			= AGORA				##	Devolve o número de série da data e hora actuais
-SECOND			= SEGUNDO			##	Converte um número de série num segundo
-TIME			= TEMPO				##	Devolve o número de série de um determinado tempo
-TIMEVALUE		= VALOR.TEMPO			##	Converte um tempo em forma de texto num número de série
-TODAY			= HOJE				##	Devolve o número de série da data actual
-WEEKDAY			= DIA.SEMANA			##	Converte um número de série num dia da semana
-WEEKNUM			= NÚMSEMANA			##	Converte um número de série num número que representa o número da semana num determinado ano
-WORKDAY			= DIA.TRABALHO			##	Devolve o número de série da data antes ou depois de um número de dias úteis especificado
-YEAR			= ANO				##	Converte um número de série num ano
-YEARFRAC		= FRACÇÃOANO			##	Devolve a fracção de ano que representa o número de dias inteiros entre a data_de_início e a data_de_fim
-
-
-##
-##	Engineering functions				Funções de engenharia
-##
-BESSELI			= BESSELI			##	Devolve a função de Bessel modificada In(x)
-BESSELJ			= BESSELJ			##	Devolve a função de Bessel Jn(x)
-BESSELK			= BESSELK			##	Devolve a função de Bessel modificada Kn(x)
-BESSELY			= BESSELY			##	Devolve a função de Bessel Yn(x)
-BIN2DEC			= BINADEC			##	Converte um número binário em decimal
-BIN2HEX			= BINAHEX			##	Converte um número binário em hexadecimal
-BIN2OCT			= BINAOCT			##	Converte um número binário em octal
-COMPLEX			= COMPLEXO			##	Converte coeficientes reais e imaginários num número complexo
-CONVERT			= CONVERTER			##	Converte um número de um sistema de medida noutro
-DEC2BIN			= DECABIN			##	Converte um número decimal em binário
-DEC2HEX			= DECAHEX			##	Converte um número decimal em hexadecimal
-DEC2OCT			= DECAOCT			##	Converte um número decimal em octal
-DELTA			= DELTA				##	Testa se dois valores são iguais
-ERF			= FUNCERRO			##	Devolve a função de erro
-ERFC			= FUNCERROCOMPL			##	Devolve a função de erro complementar
-GESTEP			= DEGRAU			##	Testa se um número é maior do que um valor limite
-HEX2BIN			= HEXABIN			##	Converte um número hexadecimal em binário
-HEX2DEC			= HEXADEC			##	Converte um número hexadecimal em decimal
-HEX2OCT			= HEXAOCT			##	Converte um número hexadecimal em octal
-IMABS			= IMABS				##	Devolve o valor absoluto (módulo) de um número complexo
-IMAGINARY		= IMAGINÁRIO			##	Devolve o coeficiente imaginário de um número complexo
-IMARGUMENT		= IMARG				##	Devolve o argumento Teta, um ângulo expresso em radianos
-IMCONJUGATE		= IMCONJ			##	Devolve o conjugado complexo de um número complexo
-IMCOS			= IMCOS				##	Devolve o co-seno de um número complexo
-IMDIV			= IMDIV				##	Devolve o quociente de dois números complexos
-IMEXP			= IMEXP				##	Devolve o exponencial de um número complexo
-IMLN			= IMLN				##	Devolve o logaritmo natural de um número complexo
-IMLOG10			= IMLOG10			##	Devolve o logaritmo de base 10 de um número complexo
-IMLOG2			= IMLOG2			##	Devolve o logaritmo de base 2 de um número complexo
-IMPOWER			= IMPOT				##	Devolve um número complexo elevado a uma potência inteira
-IMPRODUCT		= IMPROD			##	Devolve o produto de números complexos
-IMREAL			= IMREAL			##	Devolve o coeficiente real de um número complexo
-IMSIN			= IMSENO			##	Devolve o seno de um número complexo
-IMSQRT			= IMRAIZ			##	Devolve a raiz quadrada de um número complexo
-IMSUB			= IMSUBTR			##	Devolve a diferença entre dois números complexos
-IMSUM			= IMSOMA			##	Devolve a soma de números complexos
-OCT2BIN			= OCTABIN			##	Converte um número octal em binário
-OCT2DEC			= OCTADEC			##	Converte um número octal em decimal
-OCT2HEX			= OCTAHEX			##	Converte um número octal em hexadecimal
-
-
-##
-##	Financial functions				Funções financeiras
-##
-ACCRINT			= JUROSACUM			##	Devolve os juros acumulados de um título que paga juros periódicos
-ACCRINTM		= JUROSACUMV			##	Devolve os juros acumulados de um título que paga juros no vencimento
-AMORDEGRC		= AMORDEGRC			##	Devolve a depreciação correspondente a cada período contabilístico utilizando um coeficiente de depreciação
-AMORLINC		= AMORLINC			##	Devolve a depreciação correspondente a cada período contabilístico
-COUPDAYBS		= CUPDIASINLIQ			##	Devolve o número de dias entre o início do período do cupão e a data de regularização
-COUPDAYS		= CUPDIAS			##	Devolve o número de dias no período do cupão que contém a data de regularização
-COUPDAYSNC		= CUPDIASPRÓX			##	Devolve o número de dias entre a data de regularização e a data do cupão seguinte
-COUPNCD			= CUPDATAPRÓX			##	Devolve a data do cupão seguinte após a data de regularização
-COUPNUM			= CUPNÚM			##	Devolve o número de cupões a serem pagos entre a data de regularização e a data de vencimento
-COUPPCD			= CUPDATAANT			##	Devolve a data do cupão anterior antes da data de regularização
-CUMIPMT			= PGTOJURACUM			##	Devolve os juros cumulativos pagos entre dois períodos
-CUMPRINC		= PGTOCAPACUM			##	Devolve o capital cumulativo pago a título de empréstimo entre dois períodos
-DB			= BD				##	Devolve a depreciação de um activo relativo a um período especificado utilizando o método das quotas degressivas fixas
-DDB			= BDD				##	Devolve a depreciação de um activo relativo a um período especificado utilizando o método das quotas degressivas duplas ou qualquer outro método especificado
-DISC			= DESC				##	Devolve a taxa de desconto de um título
-DOLLARDE		= MOEDADEC			##	Converte um preço em unidade monetária, expresso como uma fracção, num preço em unidade monetária, expresso como um número decimal
-DOLLARFR		= MOEDAFRA			##	Converte um preço em unidade monetária, expresso como um número decimal, num preço em unidade monetária, expresso como uma fracção
-DURATION		= DURAÇÃO			##	Devolve a duração anual de um título com pagamentos de juros periódicos
-EFFECT			= EFECTIVA			##	Devolve a taxa de juros anual efectiva
-FV			= VF				##	Devolve o valor futuro de um investimento
-FVSCHEDULE		= VFPLANO			##	Devolve o valor futuro de um capital inicial após a aplicação de uma série de taxas de juro compostas
-INTRATE			= TAXAJUROS			##	Devolve a taxa de juros de um título investido na totalidade
-IPMT			= IPGTO				##	Devolve o pagamento dos juros de um investimento durante um determinado período
-IRR			= TIR				##	Devolve a taxa de rentabilidade interna para uma série de fluxos monetários
-ISPMT			= É.PGTO			##	Calcula os juros pagos durante um período específico de um investimento
-MDURATION		= MDURAÇÃO			##	Devolve a duração modificada de Macauley de um título com um valor de paridade equivalente a € 100
-MIRR			= MTIR				##	Devolve a taxa interna de rentabilidade em que os fluxos monetários positivos e negativos são financiados com taxas diferentes
-NOMINAL			= NOMINAL			##	Devolve a taxa de juros nominal anual
-NPER			= NPER				##	Devolve o número de períodos de um investimento
-NPV			= VAL				##	Devolve o valor actual líquido de um investimento com base numa série de fluxos monetários periódicos e numa taxa de desconto
-ODDFPRICE		= PREÇOPRIMINC			##	Devolve o preço por € 100 do valor nominal de um título com um período inicial incompleto
-ODDFYIELD		= LUCROPRIMINC			##	Devolve o lucro de um título com um período inicial incompleto
-ODDLPRICE		= PREÇOÚLTINC			##	Devolve o preço por € 100 do valor nominal de um título com um período final incompleto
-ODDLYIELD		= LUCROÚLTINC			##	Devolve o lucro de um título com um período final incompleto
-PMT			= PGTO				##	Devolve o pagamento periódico de uma anuidade
-PPMT			= PPGTO				##	Devolve o pagamento sobre o capital de um investimento num determinado período
-PRICE			= PREÇO				##	Devolve o preço por € 100 do valor nominal de um título que paga juros periódicos
-PRICEDISC		= PREÇODESC			##	Devolve o preço por € 100 do valor nominal de um título descontado
-PRICEMAT		= PREÇOVENC			##	Devolve o preço por € 100 do valor nominal de um título que paga juros no vencimento
-PV			= VA				##	Devolve o valor actual de um investimento
-RATE			= TAXA				##	Devolve a taxa de juros por período de uma anuidade
-RECEIVED		= RECEBER			##	Devolve o montante recebido no vencimento de um título investido na totalidade
-SLN			= AMORT				##	Devolve uma depreciação linear de um activo durante um período
-SYD			= AMORTD			##	Devolve a depreciação por algarismos da soma dos anos de um activo durante um período especificado
-TBILLEQ			= OTN				##	Devolve o lucro de um título equivalente a uma Obrigação do Tesouro
-TBILLPRICE		= OTNVALOR			##	Devolve o preço por € 100 de valor nominal de uma Obrigação do Tesouro
-TBILLYIELD		= OTNLUCRO			##	Devolve o lucro de uma Obrigação do Tesouro
-VDB			= BDV				##	Devolve a depreciação de um activo relativo a um período específico ou parcial utilizando um método de quotas degressivas
-XIRR			= XTIR				##	Devolve a taxa interna de rentabilidade de um plano de fluxos monetários que não seja necessariamente periódica
-XNPV			= XVAL				##	Devolve o valor actual líquido de um plano de fluxos monetários que não seja necessariamente periódico
-YIELD			= LUCRO				##	Devolve o lucro de um título que paga juros periódicos
-YIELDDISC		= LUCRODESC			##	Devolve o lucro anual de um título emitido abaixo do valor nominal, por exemplo, uma Obrigação do Tesouro
-YIELDMAT		= LUCROVENC			##	Devolve o lucro anual de um título que paga juros na data de vencimento
-
-
-##
-##	Information functions				Funções de informação
-##
-CELL			= CÉL				##	Devolve informações sobre a formatação, localização ou conteúdo de uma célula
-ERROR.TYPE		= TIPO.ERRO			##	Devolve um número correspondente a um tipo de erro
-INFO			= INFORMAÇÃO			##	Devolve informações sobre o ambiente de funcionamento actual
-ISBLANK			= É.CÉL.VAZIA			##	Devolve VERDADEIRO se o valor estiver em branco
-ISERR			= É.ERROS			##	Devolve VERDADEIRO se o valor for um valor de erro diferente de #N/D
-ISERROR			= É.ERRO			##	Devolve VERDADEIRO se o valor for um valor de erro
-ISEVEN			= ÉPAR				##	Devolve VERDADEIRO se o número for par
-ISLOGICAL		= É.LÓGICO			##	Devolve VERDADEIRO se o valor for lógico
-ISNA			= É.NÃO.DISP			##	Devolve VERDADEIRO se o valor for o valor de erro #N/D
-ISNONTEXT		= É.NÃO.TEXTO			##	Devolve VERDADEIRO se o valor não for texto
-ISNUMBER		= É.NÚM				##	Devolve VERDADEIRO se o valor for um número
-ISODD			= ÉÍMPAR			##	Devolve VERDADEIRO se o número for ímpar
-ISREF			= É.REF				##	Devolve VERDADEIRO se o valor for uma referência
-ISTEXT			= É.TEXTO			##	Devolve VERDADEIRO se o valor for texto
-N			= N				##	Devolve um valor convertido num número
-NA			= NÃO.DISP			##	Devolve o valor de erro #N/D
-TYPE			= TIPO				##	Devolve um número que indica o tipo de dados de um valor
-
-
-##
-##	Logical functions				Funções lógicas
-##
-AND			= E				##	Devolve VERDADEIRO se todos os respectivos argumentos corresponderem a VERDADEIRO
-FALSE			= FALSO				##	Devolve o valor lógico FALSO
-IF			= SE				##	Especifica um teste lógico a ser executado
-IFERROR			= SE.ERRO			##	Devolve um valor definido pelo utilizador se ocorrer um erro na fórmula, e devolve o resultado da fórmula se não ocorrer nenhum erro
-NOT			= NÃO				##	Inverte a lógica do respectivo argumento
-OR			= OU				##	Devolve VERDADEIRO se qualquer argumento for VERDADEIRO
-TRUE			= VERDADEIRO			##	Devolve o valor lógico VERDADEIRO
-
-
-##
-##	Lookup and reference functions			Funções de pesquisa e referência
-##
-ADDRESS			= ENDEREÇO			##	Devolve uma referência a uma única célula numa folha de cálculo como texto
-AREAS			= ÁREAS				##	Devolve o número de áreas numa referência
-CHOOSE			= SELECCIONAR			##	Selecciona um valor a partir de uma lista de valores
-COLUMN			= COL				##	Devolve o número da coluna de uma referência
-COLUMNS			= COLS				##	Devolve o número de colunas numa referência
-HLOOKUP			= PROCH				##	Procura na linha superior de uma matriz e devolve o valor da célula indicada
-HYPERLINK		= HIPERLIGAÇÃO			##	Cria um atalho ou hiperligação que abre um documento armazenado num servidor de rede, numa intranet ou na Internet
-INDEX			= ÍNDICE			##	Utiliza um índice para escolher um valor de uma referência ou de uma matriz
-INDIRECT		= INDIRECTO			##	Devolve uma referência indicada por um valor de texto
-LOOKUP			= PROC				##	Procura valores num vector ou numa matriz
-MATCH			= CORRESP			##	Procura valores numa referência ou numa matriz
-OFFSET			= DESLOCAMENTO			##	Devolve o deslocamento de referência de uma determinada referência
-ROW			= LIN				##	Devolve o número da linha de uma referência
-ROWS			= LINS				##	Devolve o número de linhas numa referência
-RTD			= RTD				##	Obtém dados em tempo real a partir de um programa que suporte automatização COM (automatização: modo de trabalhar com objectos de uma aplicação a partir de outra aplicação ou ferramenta de desenvolvimento. Anteriormente conhecida como automatização OLE, a automatização é uma norma da indústria de software e uma funcionalidade COM (Component Object Model).)
-TRANSPOSE		= TRANSPOR			##	Devolve a transposição de uma matriz
-VLOOKUP			= PROCV				##	Procura na primeira coluna de uma matriz e percorre a linha para devolver o valor de uma célula
-
-
-##
-##	Math and trigonometry functions			Funções matemáticas e trigonométricas
-##
-ABS			= ABS				##	Devolve o valor absoluto de um número
-ACOS			= ACOS				##	Devolve o arco de co-seno de um número
-ACOSH			= ACOSH				##	Devolve o co-seno hiperbólico inverso de um número
-ASIN			= ASEN				##	Devolve o arco de seno de um número
-ASINH			= ASENH				##	Devolve o seno hiperbólico inverso de um número
-ATAN			= ATAN				##	Devolve o arco de tangente de um número
-ATAN2			= ATAN2				##	Devolve o arco de tangente das coordenadas x e y
-ATANH			= ATANH				##	Devolve a tangente hiperbólica inversa de um número
-CEILING			= ARRED.EXCESSO			##	Arredonda um número para o número inteiro mais próximo ou para o múltiplo de significância mais próximo
-COMBIN			= COMBIN			##	Devolve o número de combinações de um determinado número de objectos
-COS			= COS				##	Devolve o co-seno de um número
-COSH			= COSH				##	Devolve o co-seno hiperbólico de um número
-DEGREES			= GRAUS				##	Converte radianos em graus
-EVEN			= PAR				##	Arredonda um número por excesso para o número inteiro mais próximo
-EXP			= EXP				##	Devolve e elevado à potência de um determinado número
-FACT			= FACTORIAL			##	Devolve o factorial de um número
-FACTDOUBLE		= FACTDUPLO			##	Devolve o factorial duplo de um número
-FLOOR			= ARRED.DEFEITO			##	Arredonda um número por defeito até zero
-GCD			= MDC				##	Devolve o maior divisor comum
-INT			= INT				##	Arredonda um número por defeito para o número inteiro mais próximo
-LCM			= MMC				##	Devolve o mínimo múltiplo comum
-LN			= LN				##	Devolve o logaritmo natural de um número
-LOG			= LOG				##	Devolve o logaritmo de um número com uma base especificada
-LOG10			= LOG10				##	Devolve o logaritmo de base 10 de um número
-MDETERM			= MATRIZ.DETERM			##	Devolve o determinante matricial de uma matriz
-MINVERSE		= MATRIZ.INVERSA		##	Devolve o inverso matricial de uma matriz
-MMULT			= MATRIZ.MULT			##	Devolve o produto matricial de duas matrizes
-MOD			= RESTO				##	Devolve o resto da divisão
-MROUND			= MARRED			##	Devolve um número arredondado para o múltiplo pretendido
-MULTINOMIAL		= POLINOMIAL			##	Devolve o polinomial de um conjunto de números
-ODD			= ÍMPAR				##	Arredonda por excesso um número para o número inteiro ímpar mais próximo
-PI			= PI				##	Devolve o valor de pi
-POWER			= POTÊNCIA			##	Devolve o resultado de um número elevado a uma potência
-PRODUCT			= PRODUTO			##	Multiplica os respectivos argumentos
-QUOTIENT		= QUOCIENTE			##	Devolve a parte inteira de uma divisão
-RADIANS			= RADIANOS			##	Converte graus em radianos
-RAND			= ALEATÓRIO			##	Devolve um número aleatório entre 0 e 1
-RANDBETWEEN		= ALEATÓRIOENTRE		##	Devolve um número aleatório entre os números especificados
-ROMAN			= ROMANO			##	Converte um número árabe em romano, como texto
-ROUND			= ARRED				##	Arredonda um número para um número de dígitos especificado
-ROUNDDOWN		= ARRED.PARA.BAIXO		##	Arredonda um número por defeito até zero
-ROUNDUP			= ARRED.PARA.CIMA		##	Arredonda um número por excesso, afastando-o de zero
-SERIESSUM		= SOMASÉRIE			##	Devolve a soma de uma série de potências baseada na fórmula
-SIGN			= SINAL				##	Devolve o sinal de um número
-SIN			= SEN				##	Devolve o seno de um determinado ângulo
-SINH			= SENH				##	Devolve o seno hiperbólico de um número
-SQRT			= RAIZQ				##	Devolve uma raiz quadrada positiva
-SQRTPI			= RAIZPI			##	Devolve a raiz quadrada de (núm * pi)
-SUBTOTAL		= SUBTOTAL			##	Devolve um subtotal numa lista ou base de dados
-SUM			= SOMA				##	Adiciona os respectivos argumentos
-SUMIF			= SOMA.SE			##	Adiciona as células especificadas por um determinado critério
-SUMIFS			= SOMA.SE.S			##	Adiciona as células num intervalo que cumpre vários critérios
-SUMPRODUCT		= SOMARPRODUTO			##	Devolve a soma dos produtos de componentes de matrizes correspondentes
-SUMSQ			= SOMARQUAD			##	Devolve a soma dos quadrados dos argumentos
-SUMX2MY2		= SOMAX2DY2			##	Devolve a soma da diferença dos quadrados dos valores correspondentes em duas matrizes
-SUMX2PY2		= SOMAX2SY2			##	Devolve a soma da soma dos quadrados dos valores correspondentes em duas matrizes
-SUMXMY2			= SOMAXMY2			##	Devolve a soma dos quadrados da diferença dos valores correspondentes em duas matrizes
-TAN			= TAN				##	Devolve a tangente de um número
-TANH			= TANH				##	Devolve a tangente hiperbólica de um número
-TRUNC			= TRUNCAR			##	Trunca um número para um número inteiro
-
-
-##
-##	Statistical functions				Funções estatísticas
-##
-AVEDEV			= DESV.MÉDIO			##	Devolve a média aritmética dos desvios absolutos à média dos pontos de dados
-AVERAGE			= MÉDIA				##	Devolve a média dos respectivos argumentos
-AVERAGEA		= MÉDIAA			##	Devolve uma média dos respectivos argumentos, incluindo números, texto e valores lógicos
-AVERAGEIF		= MÉDIA.SE			##	Devolve a média aritmética de todas as células num intervalo que cumprem determinado critério
-AVERAGEIFS		= MÉDIA.SE.S			##	Devolve a média aritmética de todas as células que cumprem múltiplos critérios
-BETADIST		= DISTBETA			##	Devolve a função de distribuição cumulativa beta
-BETAINV			= BETA.ACUM.INV			##	Devolve o inverso da função de distribuição cumulativa relativamente a uma distribuição beta específica
-BINOMDIST		= DISTRBINOM			##	Devolve a probabilidade de distribuição binomial de termo individual
-CHIDIST			= DIST.CHI			##	Devolve a probabilidade unicaudal da distribuição qui-quadrada
-CHIINV			= INV.CHI			##	Devolve o inverso da probabilidade unicaudal da distribuição qui-quadrada
-CHITEST			= TESTE.CHI			##	Devolve o teste para independência
-CONFIDENCE		= INT.CONFIANÇA			##	Devolve o intervalo de confiança correspondente a uma média de população
-CORREL			= CORREL			##	Devolve o coeficiente de correlação entre dois conjuntos de dados
-COUNT			= CONTAR			##	Conta os números que existem na lista de argumentos
-COUNTA			= CONTAR.VAL			##	Conta os valores que existem na lista de argumentos
-COUNTBLANK		= CONTAR.VAZIO			##	Conta o número de células em branco num intervalo
-COUNTIF			= CONTAR.SE			##	Calcula o número de células num intervalo que corresponde aos critérios determinados
-COUNTIFS		= CONTAR.SE.S			##	Conta o número de células num intervalo que cumprem múltiplos critérios
-COVAR			= COVAR				##	Devolve a covariância, que é a média dos produtos de desvios de pares
-CRITBINOM		= CRIT.BINOM			##	Devolve o menor valor em que a distribuição binomial cumulativa é inferior ou igual a um valor de critério
-DEVSQ			= DESVQ				##	Devolve a soma dos quadrados dos desvios
-EXPONDIST		= DISTEXPON			##	Devolve a distribuição exponencial
-FDIST			= DISTF				##	Devolve a distribuição da probabilidade F
-FINV			= INVF				##	Devolve o inverso da distribuição da probabilidade F
-FISHER			= FISHER			##	Devolve a transformação Fisher
-FISHERINV		= FISHERINV			##	Devolve o inverso da transformação Fisher
-FORECAST		= PREVISÃO			##	Devolve um valor ao longo de uma tendência linear
-FREQUENCY		= FREQUÊNCIA			##	Devolve uma distribuição de frequência como uma matriz vertical
-FTEST			= TESTEF			##	Devolve o resultado de um teste F
-GAMMADIST		= DISTGAMA			##	Devolve a distribuição gama
-GAMMAINV		= INVGAMA			##	Devolve o inverso da distribuição gama cumulativa
-GAMMALN			= LNGAMA			##	Devolve o logaritmo natural da função gama, Γ(x)
-GEOMEAN			= MÉDIA.GEOMÉTRICA		##	Devolve a média geométrica
-GROWTH			= CRESCIMENTO			##	Devolve valores ao longo de uma tendência exponencial
-HARMEAN			= MÉDIA.HARMÓNICA		##	Devolve a média harmónica
-HYPGEOMDIST		= DIST.HIPERGEOM		##	Devolve a distribuição hipergeométrica
-INTERCEPT		= INTERCEPTAR			##	Devolve a intercepção da linha de regressão linear
-KURT			= CURT				##	Devolve a curtose de um conjunto de dados
-LARGE			= MAIOR				##	Devolve o maior valor k-ésimo de um conjunto de dados
-LINEST			= PROJ.LIN			##	Devolve os parâmetros de uma tendência linear
-LOGEST			= PROJ.LOG			##	Devolve os parâmetros de uma tendência exponencial
-LOGINV			= INVLOG			##	Devolve o inverso da distribuição normal logarítmica
-LOGNORMDIST		= DIST.NORMALLOG		##	Devolve a distribuição normal logarítmica cumulativa
-MAX			= MÁXIMO			##	Devolve o valor máximo numa lista de argumentos
-MAXA			= MÁXIMOA			##	Devolve o valor máximo numa lista de argumentos, incluindo números, texto e valores lógicos
-MEDIAN			= MED				##	Devolve a mediana dos números indicados
-MIN			= MÍNIMO			##	Devolve o valor mínimo numa lista de argumentos
-MINA			= MÍNIMOA			##	Devolve o valor mínimo numa lista de argumentos, incluindo números, texto e valores lógicos
-MODE			= MODA				##	Devolve o valor mais comum num conjunto de dados
-NEGBINOMDIST		= DIST.BIN.NEG			##	Devolve a distribuição binominal negativa
-NORMDIST		= DIST.NORM			##	Devolve a distribuição cumulativa normal
-NORMINV			= INV.NORM			##	Devolve o inverso da distribuição cumulativa normal
-NORMSDIST		= DIST.NORMP			##	Devolve a distribuição cumulativa normal padrão
-NORMSINV		= INV.NORMP			##	Devolve o inverso da distribuição cumulativa normal padrão
-PEARSON			= PEARSON			##	Devolve o coeficiente de correlação momento/produto de Pearson
-PERCENTILE		= PERCENTIL			##	Devolve o k-ésimo percentil de valores num intervalo
-PERCENTRANK		= ORDEM.PERCENTUAL		##	Devolve a ordem percentual de um valor num conjunto de dados
-PERMUT			= PERMUTAR			##	Devolve o número de permutações de um determinado número de objectos
-POISSON			= POISSON			##	Devolve a distribuição de Poisson
-PROB			= PROB				##	Devolve a probabilidade dos valores num intervalo se encontrarem entre dois limites
-QUARTILE		= QUARTIL			##	Devolve o quartil de um conjunto de dados
-RANK			= ORDEM				##	Devolve a ordem de um número numa lista numérica
-RSQ			= RQUAD				##	Devolve o quadrado do coeficiente de correlação momento/produto de Pearson
-SKEW			= DISTORÇÃO			##	Devolve a distorção de uma distribuição
-SLOPE			= DECLIVE			##	Devolve o declive da linha de regressão linear
-SMALL			= MENOR				##	Devolve o menor valor de k-ésimo de um conjunto de dados
-STANDARDIZE		= NORMALIZAR			##	Devolve um valor normalizado
-STDEV			= DESVPAD			##	Calcula o desvio-padrão com base numa amostra
-STDEVA			= DESVPADA			##	Calcula o desvio-padrão com base numa amostra, incluindo números, texto e valores lógicos
-STDEVP			= DESVPADP			##	Calcula o desvio-padrão com base na população total
-STDEVPA			= DESVPADPA			##	Calcula o desvio-padrão com base na população total, incluindo números, texto e valores lógicos
-STEYX			= EPADYX			##	Devolve o erro-padrão do valor de y previsto para cada x na regressão
-TDIST			= DISTT				##	Devolve a distribuição t de Student
-TINV			= INVT				##	Devolve o inverso da distribuição t de Student
-TREND			= TENDÊNCIA			##	Devolve valores ao longo de uma tendência linear
-TRIMMEAN		= MÉDIA.INTERNA			##	Devolve a média do interior de um conjunto de dados
-TTEST			= TESTET			##	Devolve a probabilidade associada ao teste t de Student
-VAR			= VAR				##	Calcula a variância com base numa amostra
-VARA			= VARA				##	Calcula a variância com base numa amostra, incluindo números, texto e valores lógicos
-VARP			= VARP				##	Calcula a variância com base na população total
-VARPA			= VARPA				##	Calcula a variância com base na população total, incluindo números, texto e valores lógicos
-WEIBULL			= WEIBULL			##	Devolve a distribuição Weibull
-ZTEST			= TESTEZ			##	Devolve o valor de probabilidade unicaudal de um teste-z
-
-
-##
-##	Text functions					Funções de texto
-##
-ASC			= ASC				##	Altera letras ou katakana de largura total (byte duplo) numa cadeia de caracteres para caracteres de largura média (byte único)
-BAHTTEXT		= TEXTO.BAHT			##	Converte um número em texto, utilizando o formato monetário ß (baht)
-CHAR			= CARÁCT			##	Devolve o carácter especificado pelo número de código
-CLEAN			= LIMPAR			##	Remove do texto todos os caracteres não imprimíveis
-CODE			= CÓDIGO			##	Devolve um código numérico correspondente ao primeiro carácter numa cadeia de texto
-CONCATENATE		= CONCATENAR			##	Agrupa vários itens de texto num único item de texto
-DOLLAR			= MOEDA				##	Converte um número em texto, utilizando o formato monetário € (Euro)
-EXACT			= EXACTO			##	Verifica se dois valores de texto são idênticos
-FIND			= LOCALIZAR			##	Localiza um valor de texto dentro de outro (sensível às maiúsculas e minúsculas)
-FINDB			= LOCALIZARB			##	Localiza um valor de texto dentro de outro (sensível às maiúsculas e minúsculas)
-FIXED			= FIXA				##	Formata um número como texto com um número fixo de decimais
-JIS			= JIS				##	Altera letras ou katakana de largura média (byte único) numa cadeia de caracteres para caracteres de largura total (byte duplo)
-LEFT			= ESQUERDA			##	Devolve os caracteres mais à esquerda de um valor de texto
-LEFTB			= ESQUERDAB			##	Devolve os caracteres mais à esquerda de um valor de texto
-LEN			= NÚM.CARACT			##	Devolve o número de caracteres de uma cadeia de texto
-LENB			= NÚM.CARACTB			##	Devolve o número de caracteres de uma cadeia de texto
-LOWER			= MINÚSCULAS			##	Converte o texto em minúsculas
-MID			= SEG.TEXTO			##	Devolve um número específico de caracteres de uma cadeia de texto, a partir da posição especificada
-MIDB			= SEG.TEXTOB			##	Devolve um número específico de caracteres de uma cadeia de texto, a partir da posição especificada
-PHONETIC		= FONÉTICA			##	Retira os caracteres fonéticos (furigana) de uma cadeia de texto
-PROPER			= INICIAL.MAIÚSCULA		##	Coloca em maiúsculas a primeira letra de cada palavra de um valor de texto
-REPLACE			= SUBSTITUIR			##	Substitui caracteres no texto
-REPLACEB		= SUBSTITUIRB			##	Substitui caracteres no texto
-REPT			= REPETIR			##	Repete texto um determinado número de vezes
-RIGHT			= DIREITA			##	Devolve os caracteres mais à direita de um valor de texto
-RIGHTB			= DIREITAB			##	Devolve os caracteres mais à direita de um valor de texto
-SEARCH			= PROCURAR			##	Localiza um valor de texto dentro de outro (não sensível a maiúsculas e minúsculas)
-SEARCHB			= PROCURARB			##	Localiza um valor de texto dentro de outro (não sensível a maiúsculas e minúsculas)
-SUBSTITUTE		= SUBST				##	Substitui texto novo por texto antigo numa cadeia de texto
-T			= T				##	Converte os respectivos argumentos em texto
-TEXT			= TEXTO				##	Formata um número e converte-o em texto
-TRIM			= COMPACTAR			##	Remove espaços do texto
-UPPER			= MAIÚSCULAS			##	Converte texto em maiúsculas
-VALUE			= VALOR				##	Converte um argumento de texto num número
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/config
deleted file mode 100644
index 205c342ada4..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= р
-
-
-##
-##	Excel Error Codes	(For future use)
-##
-NULL	= #ПУСТО!
-DIV0	= #ДЕЛ/0!
-VALUE	= #ЗНАЧ!
-REF	= #ССЫЛ!
-NAME	= #ИМЯ?
-NUM	= #ЧИСЛО!
-NA	= #Н/Д
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
deleted file mode 100644
index 324c3df2a81..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
+++ /dev/null
@@ -1,438 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Calculation
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-## Data in this file derived from information provided by web-junior (http://www.web-junior.net/)
-##
-##
-
-
-##
-##	Add-in and Automation functions				Функции надстроек и автоматизации
-##
-GETPIVOTDATA		= ПОЛУЧИТЬ.ДАННЫЕ.СВОДНОЙ.ТАБЛИЦЫ	##	Возвращает данные, хранящиеся в отчете сводной таблицы.
-
-
-##
-##	Cube functions						Функции Куб
-##
-CUBEKPIMEMBER		= КУБЭЛЕМЕНТКИП				##	Возвращает свойство ключевого индикатора производительности «(КИП)» и отображает имя «КИП» в ячейке. «КИП» представляет собой количественную величину, такую как ежемесячная валовая прибыль или ежеквартальная текучесть кадров, используемой для контроля эффективности работы организации.
-CUBEMEMBER		= КУБЭЛЕМЕНТ				##	Возвращает элемент или кортеж из куба. Используется для проверки существования элемента или кортежа в кубе.
-CUBEMEMBERPROPERTY	= КУБСВОЙСТВОЭЛЕМЕНТА			##	Возвращает значение свойства элемента из куба. Используется для проверки существования имени элемента в кубе и возвращает указанное свойство для этого элемента.
-CUBERANKEDMEMBER	= КУБПОРЭЛЕМЕНТ				##	Возвращает n-ый или ранжированный элемент в множество. Используется для возвращения одного или нескольких элементов в множество, например, лучшего продавца или 10 лучших студентов.
-CUBESET			= КУБМНОЖ				##	Определяет вычислительное множество элементов или кортежей, отправляя на сервер выражение, которое создает множество, а затем возвращает его в Microsoft Office Excel.
-CUBESETCOUNT		= КУБЧИСЛОЭЛМНОЖ			##	Возвращает число элементов множества.
-CUBEVALUE		= КУБЗНАЧЕНИЕ				##	Возвращает обобщенное значение из куба.
-
-
-##
-##	Database functions					Функции для работы с базами данных
-##
-DAVERAGE		= ДСРЗНАЧ				##	Возвращает среднее значение выбранных записей базы данных.
-DCOUNT			= БСЧЁТ					##	Подсчитывает количество числовых ячеек в базе данных.
-DCOUNTA			= БСЧЁТА				##	Подсчитывает количество непустых ячеек в базе данных.
-DGET			= БИЗВЛЕЧЬ				##	Извлекает из базы данных одну запись, удовлетворяющую заданному условию.
-DMAX			= ДМАКС					##	Возвращает максимальное значение среди выделенных записей базы данных.
-DMIN			= ДМИН					##	Возвращает минимальное значение среди выделенных записей базы данных.
-DPRODUCT		= БДПРОИЗВЕД				##	Перемножает значения определенного поля в записях базы данных, удовлетворяющих условию.
-DSTDEV			= ДСТАНДОТКЛ				##	Оценивает стандартное отклонение по выборке для выделенных записей базы данных.
-DSTDEVP			= ДСТАНДОТКЛП				##	Вычисляет стандартное отклонение по генеральной совокупности для выделенных записей базы данных
-DSUM			= БДСУММ				##	Суммирует числа в поле для записей базы данных, удовлетворяющих условию.
-DVAR			= БДДИСП				##	Оценивает дисперсию по выборке из выделенных записей базы данных
-DVARP			= БДДИСПП				##	Вычисляет дисперсию по генеральной совокупности для выделенных записей базы данных
-
-
-##
-##	Date and time functions					Функции даты и времени
-##
-DATE			= ДАТА					##	Возвращает заданную дату в числовом формате.
-DATEVALUE		= ДАТАЗНАЧ				##	Преобразует дату из текстового формата в числовой формат.
-DAY			= ДЕНЬ					##	Преобразует дату в числовом формате в день месяца.
-DAYS360			= ДНЕЙ360				##	Вычисляет количество дней между двумя датами на основе 360-дневного года.
-EDATE			= ДАТАМЕС				##	Возвращает дату в числовом формате, отстоящую на заданное число месяцев вперед или назад от начальной даты.
-EOMONTH			= КОНМЕСЯЦА				##	Возвращает дату в числовом формате для последнего дня месяца, отстоящего вперед или назад на заданное число месяцев.
-HOUR			= ЧАС					##	Преобразует дату в числовом формате в часы.
-MINUTE			= МИНУТЫ				##	Преобразует дату в числовом формате в минуты.
-MONTH			= МЕСЯЦ					##	Преобразует дату в числовом формате в месяцы.
-NETWORKDAYS		= ЧИСТРАБДНИ				##	Возвращает количество рабочих дней между двумя датами.
-NOW			= ТДАТА					##	Возвращает текущую дату и время в числовом формате.
-SECOND			= СЕКУНДЫ				##	Преобразует дату в числовом формате в секунды.
-TIME			= ВРЕМЯ					##	Возвращает заданное время в числовом формате.
-TIMEVALUE		= ВРЕМЗНАЧ				##	Преобразует время из текстового формата в числовой формат.
-TODAY			= СЕГОДНЯ				##	Возвращает текущую дату в числовом формате.
-WEEKDAY			= ДЕНЬНЕД				##	Преобразует дату в числовом формате в день недели.
-WEEKNUM			= НОМНЕДЕЛИ				##	Преобразует числовое представление в число, которое указывает, на какую неделю года приходится указанная дата.
-WORKDAY			= РАБДЕНЬ				##	Возвращает дату в числовом формате, отстоящую вперед или назад на заданное количество рабочих дней.
-YEAR			= ГОД					##	Преобразует дату в числовом формате в год.
-YEARFRAC		= ДОЛЯГОДА				##	Возвращает долю года, которую составляет количество дней между начальной и конечной датами.
-
-
-##
-##	Engineering functions					Инженерные функции
-##
-BESSELI			= БЕССЕЛЬ.I	 			##	Возвращает модифицированную функцию Бесселя In(x).
-BESSELJ			= БЕССЕЛЬ.J				##	Возвращает функцию Бесселя Jn(x).
-BESSELK			= БЕССЕЛЬ.K				##	Возвращает модифицированную функцию Бесселя Kn(x).
-BESSELY			= БЕССЕЛЬ.Y				##	Возвращает функцию Бесселя Yn(x).
-BIN2DEC			= ДВ.В.ДЕС				##	Преобразует двоичное число в десятичное.
-BIN2HEX			= ДВ.В.ШЕСТН				##	Преобразует двоичное число в шестнадцатеричное.
-BIN2OCT			= ДВ.В.ВОСЬМ				##	Преобразует двоичное число в восьмеричное.
-COMPLEX			= КОМПЛЕКСН				##	Преобразует коэффициенты при вещественной и мнимой частях комплексного числа в комплексное число.
-CONVERT			= ПРЕОБР				##	Преобразует число из одной системы единиц измерения в другую.
-DEC2BIN			= ДЕС.В.ДВ				##	Преобразует десятичное число в двоичное.
-DEC2HEX			= ДЕС.В.ШЕСТН				##	Преобразует десятичное число в шестнадцатеричное.
-DEC2OCT			= ДЕС.В.ВОСЬМ				##	Преобразует десятичное число в восьмеричное.
-DELTA			= ДЕЛЬТА				##	Проверяет равенство двух значений.
-ERF			= ФОШ					##	Возвращает функцию ошибки.
-ERFC			= ДФОШ					##	Возвращает дополнительную функцию ошибки.
-GESTEP			= ПОРОГ					##	Проверяет, не превышает ли данное число порогового значения.
-HEX2BIN			= ШЕСТН.В.ДВ				##	Преобразует шестнадцатеричное число в двоичное.
-HEX2DEC			= ШЕСТН.В.ДЕС				##	Преобразует шестнадцатеричное число в десятичное.
-HEX2OCT			= ШЕСТН.В.ВОСЬМ				##	Преобразует шестнадцатеричное число в восьмеричное.
-IMABS			= МНИМ.ABS				##	Возвращает абсолютную величину (модуль) комплексного числа.
-IMAGINARY		= МНИМ.ЧАСТЬ				##	Возвращает коэффициент при мнимой части комплексного числа.
-IMARGUMENT		= МНИМ.АРГУМЕНТ				##	Возвращает значение аргумента комплексного числа (тета) — угол, выраженный в радианах.
-IMCONJUGATE		= МНИМ.СОПРЯЖ				##	Возвращает комплексно-сопряженное комплексное число.
-IMCOS			= МНИМ.COS				##	Возвращает косинус комплексного числа.
-IMDIV			= МНИМ.ДЕЛ				##	Возвращает частное от деления двух комплексных чисел.
-IMEXP			= МНИМ.EXP				##	Возвращает экспоненту комплексного числа.
-IMLN			= МНИМ.LN				##	Возвращает натуральный логарифм комплексного числа.
-IMLOG10			= МНИМ.LOG10				##	Возвращает обычный (десятичный) логарифм комплексного числа.
-IMLOG2			= МНИМ.LOG2				##	Возвращает двоичный логарифм комплексного числа.
-IMPOWER			= МНИМ.СТЕПЕНЬ				##	Возвращает комплексное число, возведенное в целую степень.
-IMPRODUCT		= МНИМ.ПРОИЗВЕД				##	Возвращает произведение от 2 до 29 комплексных чисел.
-IMREAL			= МНИМ.ВЕЩ				##	Возвращает коэффициент при вещественной части комплексного числа.
-IMSIN			= МНИМ.SIN				##	Возвращает синус комплексного числа.
-IMSQRT			= МНИМ.КОРЕНЬ				##	Возвращает значение квадратного корня из комплексного числа.
-IMSUB			= МНИМ.РАЗН				##	Возвращает разность двух комплексных чисел.
-IMSUM			= МНИМ.СУММ				##	Возвращает сумму комплексных чисел.
-OCT2BIN			= ВОСЬМ.В.ДВ				##	Преобразует восьмеричное число в двоичное.
-OCT2DEC			= ВОСЬМ.В.ДЕС				##	Преобразует восьмеричное число в десятичное.
-OCT2HEX			= ВОСЬМ.В.ШЕСТН				##	Преобразует восьмеричное число в шестнадцатеричное.
-
-
-##
-##	Financial functions					Финансовые функции
-##
-ACCRINT			= НАКОПДОХОД				##	Возвращает накопленный процент по ценным бумагам с периодической выплатой процентов.
-ACCRINTM		= НАКОПДОХОДПОГАШ			##	Возвращает накопленный процент по ценным бумагам, проценты по которым выплачиваются в срок погашения.
-AMORDEGRC		= АМОРУМ				##	Возвращает величину амортизации для каждого периода, используя коэффициент амортизации.
-AMORLINC		= АМОРУВ				##	Возвращает величину амортизации для каждого периода.
-COUPDAYBS		= ДНЕЙКУПОНДО				##	Возвращает количество дней от начала действия купона до даты соглашения.
-COUPDAYS		= ДНЕЙКУПОН				##	Возвращает число дней в периоде купона, содержащем дату соглашения.
-COUPDAYSNC		= ДНЕЙКУПОНПОСЛЕ			##	Возвращает число дней от даты соглашения до срока следующего купона.
-COUPNCD			= ДАТАКУПОНПОСЛЕ			##	Возвращает следующую дату купона после даты соглашения.
-COUPNUM			= ЧИСЛКУПОН				##	Возвращает количество купонов, которые могут быть оплачены между датой соглашения и сроком вступления в силу.
-COUPPCD			= ДАТАКУПОНДО				##	Возвращает предыдущую дату купона перед датой соглашения.
-CUMIPMT			= ОБЩПЛАТ				##	Возвращает общую выплату, произведенную между двумя периодическими выплатами.
-CUMPRINC		= ОБЩДОХОД				##	Возвращает общую выплату по займу между двумя периодами.
-DB			= ФУО					##	Возвращает величину амортизации актива для заданного периода, рассчитанную методом фиксированного уменьшения остатка.
-DDB			= ДДОБ					##	Возвращает величину амортизации актива за данный период, используя метод двойного уменьшения остатка или иной явно указанный метод.
-DISC			= СКИДКА				##	Возвращает норму скидки для ценных бумаг.
-DOLLARDE		= РУБЛЬ.ДЕС				##	Преобразует цену в рублях, выраженную в виде дроби, в цену в рублях, выраженную десятичным числом.
-DOLLARFR		= РУБЛЬ.ДРОБЬ				##	Преобразует цену в рублях, выраженную десятичным числом, в цену в рублях, выраженную в виде дроби.
-DURATION		= ДЛИТ					##	Возвращает ежегодную продолжительность действия ценных бумаг с периодическими выплатами по процентам.
-EFFECT			= ЭФФЕКТ				##	Возвращает действующие ежегодные процентные ставки.
-FV			= БС					##	Возвращает будущую стоимость инвестиции.
-FVSCHEDULE		= БЗРАСПИС				##	Возвращает будущую стоимость первоначальной основной суммы после начисления ряда сложных процентов.
-INTRATE			= ИНОРМА				##	Возвращает процентную ставку для полностью инвестированных ценных бумаг.
-IPMT			= ПРПЛТ					##	Возвращает величину выплаты прибыли на вложения за данный период.
-IRR			= ВСД					##	Возвращает внутреннюю ставку доходности для ряда потоков денежных средств.
-ISPMT			= ПРОЦПЛАТ				##	Вычисляет выплаты за указанный период инвестиции.
-MDURATION		= МДЛИТ					##	Возвращает модифицированную длительность Маколея для ценных бумаг с предполагаемой номинальной стоимостью 100 рублей.
-MIRR			= МВСД					##	Возвращает внутреннюю ставку доходности, при которой положительные и отрицательные денежные потоки имеют разные значения ставки.
-NOMINAL			= НОМИНАЛ				##	Возвращает номинальную годовую процентную ставку.
-NPER			= КПЕР					##	Возвращает общее количество периодов выплаты для данного вклада.
-NPV			= ЧПС					##	Возвращает чистую приведенную стоимость инвестиции, основанной на серии периодических денежных потоков и ставке дисконтирования.
-ODDFPRICE		= ЦЕНАПЕРВНЕРЕГ				##	Возвращает цену за 100 рублей нарицательной стоимости ценных бумаг с нерегулярным первым периодом.
-ODDFYIELD		= ДОХОДПЕРВНЕРЕГ			##	Возвращает доход по ценным бумагам с нерегулярным первым периодом.
-ODDLPRICE		= ЦЕНАПОСЛНЕРЕГ				##	Возвращает цену за 100 рублей нарицательной стоимости ценных бумаг с нерегулярным последним периодом.
-ODDLYIELD		= ДОХОДПОСЛНЕРЕГ			##	Возвращает доход по ценным бумагам с нерегулярным последним периодом.
-PMT			= ПЛТ					##	Возвращает величину выплаты за один период аннуитета.
-PPMT			= ОСПЛТ					##	Возвращает величину выплат в погашение основной суммы по инвестиции за заданный период.
-PRICE			= ЦЕНА					##	Возвращает цену за 100 рублей нарицательной стоимости ценных бумаг, по которым производится периодическая выплата процентов.
-PRICEDISC		= ЦЕНАСКИДКА				##	Возвращает цену за 100 рублей номинальной стоимости ценных бумаг, на которые сделана скидка.
-PRICEMAT		= ЦЕНАПОГАШ				##	Возвращает цену за 100 рублей номинальной стоимости ценных бумаг, проценты по которым выплачиваются в срок погашения.
-PV			= ПС					##	Возвращает приведенную (к текущему моменту) стоимость инвестиции.
-RATE			= СТАВКА				##	Возвращает процентную ставку по аннуитету за один период.
-RECEIVED		= ПОЛУЧЕНО				##	Возвращает сумму, полученную к сроку погашения полностью обеспеченных ценных бумаг.
-SLN			= АПЛ					##	Возвращает величину линейной амортизации актива за один период.
-SYD			= АСЧ					##	Возвращает величину амортизации актива за данный период, рассчитанную методом суммы годовых чисел.
-TBILLEQ			= РАВНОКЧЕК				##	Возвращает эквивалентный облигации доход по казначейскому чеку.
-TBILLPRICE		= ЦЕНАКЧЕК				##	Возвращает цену за 100 рублей нарицательной стоимости для казначейского чека.
-TBILLYIELD		= ДОХОДКЧЕК				##	Возвращает доход по казначейскому чеку.
-VDB			= ПУО					##	Возвращает величину амортизации актива для указанного или частичного периода при использовании метода сокращающегося баланса.
-XIRR			= ЧИСТВНДОХ				##	Возвращает внутреннюю ставку доходности для графика денежных потоков, которые не обязательно носят периодический характер.
-XNPV			= ЧИСТНЗ				##	Возвращает чистую приведенную стоимость для денежных потоков, которые не обязательно являются периодическими.
-YIELD			= ДОХОД					##	Возвращает доход от ценных бумаг, по которым производятся периодические выплаты процентов.
-YIELDDISC		= ДОХОДСКИДКА				##	Возвращает годовой доход по ценным бумагам, на которые сделана скидка (пример — казначейские чеки).
-YIELDMAT		= ДОХОДПОГАШ				##	Возвращает годовой доход от ценных бумаг, проценты по которым выплачиваются в срок погашения.
-
-
-##
-##	Information functions					Информационные функции
-##
-CELL			= ЯЧЕЙКА				##	Возвращает информацию о формате, расположении или содержимом ячейки.
-ERROR.TYPE		= ТИП.ОШИБКИ				##	Возвращает числовой код, соответствующий типу ошибки.
-INFO			= ИНФОРМ				##	Возвращает информацию о текущей операционной среде.
-ISBLANK			= ЕПУСТО				##	Возвращает значение ИСТИНА, если аргумент является ссылкой на пустую ячейку.
-ISERR			= ЕОШ					##	Возвращает значение ИСТИНА, если аргумент ссылается на любое значение ошибки, кроме #Н/Д.
-ISERROR			= ЕОШИБКА				##	Возвращает значение ИСТИНА, если аргумент ссылается на любое значение ошибки.
-ISEVEN			= ЕЧЁТН					##	Возвращает значение ИСТИНА, если значение аргумента является четным числом.
-ISLOGICAL		= ЕЛОГИЧ				##	Возвращает значение ИСТИНА, если аргумент ссылается на логическое значение.
-ISNA			= ЕНД					##	Возвращает значение ИСТИНА, если аргумент ссылается на значение ошибки #Н/Д.
-ISNONTEXT		= ЕНЕТЕКСТ				##	Возвращает значение ИСТИНА, если значение аргумента не является текстом.
-ISNUMBER		= ЕЧИСЛО				##	Возвращает значение ИСТИНА, если аргумент ссылается на число.
-ISODD			= ЕНЕЧЁТ				##	Возвращает значение ИСТИНА, если значение аргумента является нечетным числом.
-ISREF			= ЕССЫЛКА				##	Возвращает значение ИСТИНА, если значение аргумента является ссылкой.
-ISTEXT			= ЕТЕКСТ				##	Возвращает значение ИСТИНА, если значение аргумента является текстом.
-N			= Ч					##	Возвращает значение, преобразованное в число.
-NA			= НД					##	Возвращает значение ошибки #Н/Д.
-TYPE			= ТИП					##	Возвращает число, обозначающее тип данных значения.
-
-
-##
-##	Logical functions					Логические функции
-##
-AND			= И					##	Renvoie VRAI si tous ses arguments sont VRAI.
-FALSE			= ЛОЖЬ					##	Возвращает логическое значение ЛОЖЬ.
-IF			= ЕСЛИ					##	Выполняет проверку условия.
-IFERROR			= ЕСЛИОШИБКА				##	Возвращает введённое значение, если вычисление по формуле вызывает ошибку; в противном случае функция возвращает результат вычисления.
-NOT			= НЕ					##	Меняет логическое значение своего аргумента на противоположное.
-OR			= ИЛИ					##	Возвращает значение ИСТИНА, если хотя бы один аргумент имеет значение ИСТИНА.
-TRUE			= ИСТИНА				##	Возвращает логическое значение ИСТИНА.
-
-
-##
-##	Lookup and reference functions				Функции ссылки и поиска
-##
-ADDRESS			= АДРЕС					##	Возвращает ссылку на отдельную ячейку листа в виде текста.
-AREAS			= ОБЛАСТИ				##	Возвращает количество областей в ссылке.
-CHOOSE			= ВЫБОР					##	Выбирает значение из списка значений по индексу.
-COLUMN			= СТОЛБЕЦ				##	Возвращает номер столбца, на который указывает ссылка.
-COLUMNS			= ЧИСЛСТОЛБ				##	Возвращает количество столбцов в ссылке.
-HLOOKUP			= ГПР					##	Ищет в первой строке массива и возвращает значение отмеченной ячейки
-HYPERLINK		= ГИПЕРССЫЛКА				##	Создает ссылку, открывающую документ, который находится на сервере сети, в интрасети или в Интернете.
-INDEX			= ИНДЕКС				##	Использует индекс для выбора значения из ссылки или массива.
-INDIRECT		= ДВССЫЛ				##	Возвращает ссылку, заданную текстовым значением.
-LOOKUP			= ПРОСМОТР				##	Ищет значения в векторе или массиве.
-MATCH			= ПОИСКПОЗ				##	Ищет значения в ссылке или массиве.
-OFFSET			= СМЕЩ					##	Возвращает смещение ссылки относительно заданной ссылки.
-ROW			= СТРОКА				##	Возвращает номер строки, определяемой ссылкой.
-ROWS			= ЧСТРОК				##	Возвращает количество строк в ссылке.
-RTD			= ДРВ					##	Извлекает данные реального времени из программ, поддерживающих автоматизацию COM (Программирование объектов. Стандартное средство для работы с объектами некоторого приложения из другого приложения или средства разработки. Программирование объектов (ранее называемое программированием OLE) является функцией модели COM (Component Object Model, модель компонентных объектов).).
-TRANSPOSE		= ТРАНСП				##	Возвращает транспонированный массив.
-VLOOKUP			= ВПР					##	Ищет значение в первом столбце массива и возвращает значение из ячейки в найденной строке и указанном столбце.
-
-
-##
-##	Math and trigonometry functions				Математические и тригонометрические функции
-##
-ABS			= ABS					##	Возвращает модуль (абсолютную величину) числа.
-ACOS			= ACOS					##	Возвращает арккосинус числа.
-ACOSH			= ACOSH					##	Возвращает гиперболический арккосинус числа.
-ASIN			= ASIN					##	Возвращает арксинус числа.
-ASINH			= ASINH					##	Возвращает гиперболический арксинус числа.
-ATAN			= ATAN					##	Возвращает арктангенс числа.
-ATAN2			= ATAN2					##	Возвращает арктангенс для заданных координат x и y.
-ATANH			= ATANH					##	Возвращает гиперболический арктангенс числа.
-CEILING			= ОКРВВЕРХ				##	Округляет число до ближайшего целого или до ближайшего кратного указанному значению.
-COMBIN			= ЧИСЛКОМБ				##	Возвращает количество комбинаций для заданного числа объектов.
-COS			= COS					##	Возвращает косинус числа.
-COSH			= COSH					##	Возвращает гиперболический косинус числа.
-DEGREES			= ГРАДУСЫ				##	Преобразует радианы в градусы.
-EVEN			= ЧЁТН					##	Округляет число до ближайшего четного целого.
-EXP			= EXP					##	Возвращает число e, возведенное в указанную степень.
-FACT			= ФАКТР					##	Возвращает факториал числа.
-FACTDOUBLE		= ДВФАКТР				##	Возвращает двойной факториал числа.
-FLOOR			= ОКРВНИЗ				##	Округляет число до ближайшего меньшего по модулю значения.
-GCD			= НОД					##	Возвращает наибольший общий делитель.
-INT			= ЦЕЛОЕ					##	Округляет число до ближайшего меньшего целого.
-LCM			= НОК					##	Возвращает наименьшее общее кратное.
-LN			= LN					##	Возвращает натуральный логарифм числа.
-LOG			= LOG					##	Возвращает логарифм числа по заданному основанию.
-LOG10			= LOG10					##	Возвращает десятичный логарифм числа.
-MDETERM			= МОПРЕД				##	Возвращает определитель матрицы массива.
-MINVERSE		= МОБР					##	Возвращает обратную матрицу массива.
-MMULT			= МУМНОЖ				##	Возвращает произведение матриц двух массивов.
-MOD			= ОСТАТ					##	Возвращает остаток от деления.
-MROUND			= ОКРУГЛТ				##	Возвращает число, округленное с требуемой точностью.
-MULTINOMIAL		= МУЛЬТИНОМ				##	Возвращает мультиномиальный коэффициент множества чисел.
-ODD			= НЕЧЁТ					##	Округляет число до ближайшего нечетного целого.
-PI			= ПИ					##	Возвращает число пи.
-POWER			= СТЕПЕНЬ				##	Возвращает результат возведения числа в степень.
-PRODUCT			= ПРОИЗВЕД				##	Возвращает произведение аргументов.
-QUOTIENT		= ЧАСТНОЕ				##	Возвращает целую часть частного при делении.
-RADIANS			= РАДИАНЫ				##	Преобразует градусы в радианы.
-RAND			= СЛЧИС					##	Возвращает случайное число в интервале от 0 до 1.
-RANDBETWEEN		= СЛУЧМЕЖДУ				##	Возвращает случайное число в интервале между двумя заданными числами.
-ROMAN			= РИМСКОЕ				##	Преобразует арабские цифры в римские в виде текста.
-ROUND			= ОКРУГЛ				##	Округляет число до указанного количества десятичных разрядов.
-ROUNDDOWN		= ОКРУГЛВНИЗ				##	Округляет число до ближайшего меньшего по модулю значения.
-ROUNDUP			= ОКРУГЛВВЕРХ				##	Округляет число до ближайшего большего по модулю значения.
-SERIESSUM		= РЯД.СУММ				##	Возвращает сумму степенного ряда, вычисленную по формуле.
-SIGN			= ЗНАК					##	Возвращает знак числа.
-SIN			= SIN					##	Возвращает синус заданного угла.
-SINH			= SINH					##	Возвращает гиперболический синус числа.
-SQRT			= КОРЕНЬ				##	Возвращает положительное значение квадратного корня.
-SQRTPI			= КОРЕНЬПИ				##	Возвращает квадратный корень из значения выражения (число * ПИ).
-SUBTOTAL		= ПРОМЕЖУТОЧНЫЕ.ИТОГИ			##	Возвращает промежуточный итог в списке или базе данных.
-SUM			= СУММ					##	Суммирует аргументы.
-SUMIF			= СУММЕСЛИ				##	Суммирует ячейки, удовлетворяющие заданному условию.
-SUMIFS			= СУММЕСЛИМН				##	Суммирует диапазон ячеек, удовлетворяющих нескольким условиям. 
-SUMPRODUCT		= СУММПРОИЗВ				##	Возвращает сумму произведений соответствующих элементов массивов.
-SUMSQ			= СУММКВ				##	Возвращает сумму квадратов аргументов.
-SUMX2MY2		= СУММРАЗНКВ				##	Возвращает сумму разностей квадратов соответствующих значений в двух массивах.
-SUMX2PY2		= СУММСУММКВ				##	Возвращает сумму сумм квадратов соответствующих элементов двух массивов.
-SUMXMY2			= СУММКВРАЗН				##	Возвращает сумму квадратов разностей соответствующих значений в двух массивах.
-TAN			= TAN					##	Возвращает тангенс числа.
-TANH			= TANH					##	Возвращает гиперболический тангенс числа.
-TRUNC			= ОТБР					##	Отбрасывает дробную часть числа.
-
-
-##
-##	Statistical functions					Статистические функции
-##
-AVEDEV			= СРОТКЛ				##	Возвращает среднее арифметическое абсолютных значений отклонений точек данных от среднего.
-AVERAGE			= СРЗНАЧ				##	Возвращает среднее арифметическое аргументов.
-AVERAGEA		= СРЗНАЧА				##	Возвращает среднее арифметическое аргументов, включая числа, текст и логические значения.
-AVERAGEIF		= СРЗНАЧЕСЛИ 				##	Возвращает среднее значение (среднее арифметическое) всех ячеек в диапазоне, которые удовлетворяют данному условию.
-AVERAGEIFS		= СРЗНАЧЕСЛИМН 				##	Возвращает среднее значение (среднее арифметическое) всех ячеек, которые удовлетворяют нескольким условиям. 
-BETADIST		= БЕТАРАСП				##	Возвращает интегральную функцию бета-распределения.
-BETAINV			= БЕТАОБР				##	Возвращает обратную интегральную функцию указанного бета-распределения.
-BINOMDIST		= БИНОМРАСП				##	Возвращает отдельное значение биномиального распределения.
-CHIDIST			= ХИ2РАСП				##	Возвращает одностороннюю вероятность распределения хи-квадрат.
-CHIINV			= ХИ2ОБР				##	Возвращает обратное значение односторонней вероятности распределения хи-квадрат.
-CHITEST			= ХИ2ТЕСТ				##	Возвращает тест на независимость.
-CONFIDENCE		= ДОВЕРИТ				##	Возвращает доверительный интервал для среднего значения по генеральной совокупности.
-CORREL			= КОРРЕЛ				##	Возвращает коэффициент корреляции между двумя множествами данных.
-COUNT			= СЧЁТ					##	Подсчитывает количество чисел в списке аргументов.
-COUNTA			= СЧЁТЗ					##	Подсчитывает количество значений в списке аргументов.
-COUNTBLANK		= СЧИТАТЬПУСТОТЫ			##	Подсчитывает количество пустых ячеек в диапазоне
-COUNTIF			= СЧЁТЕСЛИ 				##	Подсчитывает количество ячеек в диапазоне, удовлетворяющих заданному условию
-COUNTIFS		= СЧЁТЕСЛИМН				##	Подсчитывает количество ячеек внутри диапазона, удовлетворяющих нескольким условиям.
-COVAR			= КОВАР					##	Возвращает ковариацию, среднее произведений парных отклонений
-CRITBINOM		= КРИТБИНОМ				##	Возвращает наименьшее значение, для которого интегральное биномиальное распределение меньше или равно заданному критерию.
-DEVSQ			= КВАДРОТКЛ				##	Возвращает сумму квадратов отклонений.
-EXPONDIST		= ЭКСПРАСП				##	Возвращает экспоненциальное распределение.
-FDIST			= FРАСП					##	Возвращает F-распределение вероятности.
-FINV			= FРАСПОБР				##	Возвращает обратное значение для F-распределения вероятности.
-FISHER			= ФИШЕР					##	Возвращает преобразование Фишера.
-FISHERINV		= ФИШЕРОБР				##	Возвращает обратное преобразование Фишера.
-FORECAST		= ПРЕДСКАЗ				##	Возвращает значение линейного тренда.
-FREQUENCY		= ЧАСТОТА				##	Возвращает распределение частот в виде вертикального массива.
-FTEST			= ФТЕСТ					##	Возвращает результат F-теста.
-GAMMADIST		= ГАММАРАСП				##	Возвращает гамма-распределение.
-GAMMAINV		= ГАММАОБР				##	Возвращает обратное гамма-распределение.
-GAMMALN			= ГАММАНЛОГ				##	Возвращает натуральный логарифм гамма функции, Γ(x).
-GEOMEAN			= СРГЕОМ				##	Возвращает среднее геометрическое.
-GROWTH			= РОСТ					##	Возвращает значения в соответствии с экспоненциальным трендом.
-HARMEAN			= СРГАРМ				##	Возвращает среднее гармоническое.
-HYPGEOMDIST		= ГИПЕРГЕОМЕТ				##	Возвращает гипергеометрическое распределение.
-INTERCEPT		= ОТРЕЗОК				##	Возвращает отрезок, отсекаемый на оси линией линейной регрессии.
-KURT			= ЭКСЦЕСС				##	Возвращает эксцесс множества данных.
-LARGE			= НАИБОЛЬШИЙ				##	Возвращает k-ое наибольшее значение в множестве данных.
-LINEST			= ЛИНЕЙН				##	Возвращает параметры линейного тренда.
-LOGEST			= ЛГРФПРИБЛ				##	Возвращает параметры экспоненциального тренда.
-LOGINV			= ЛОГНОРМОБР				##	Возвращает обратное логарифмическое нормальное распределение.
-LOGNORMDIST		= ЛОГНОРМРАСП				##	Возвращает интегральное логарифмическое нормальное распределение.
-MAX			= МАКС					##	Возвращает наибольшее значение в списке аргументов.
-MAXA			= МАКСА					##	Возвращает наибольшее значение в списке аргументов, включая числа, текст и логические значения.
-MEDIAN			= МЕДИАНА				##	Возвращает медиану заданных чисел.
-MIN			= МИН					##	Возвращает наименьшее значение в списке аргументов.
-MINA			= МИНА					##	Возвращает наименьшее значение в списке аргументов, включая числа, текст и логические значения.
-MODE			= МОДА					##	Возвращает значение моды множества данных.
-NEGBINOMDIST		= ОТРБИНОМРАСП				##	Возвращает отрицательное биномиальное распределение.
-NORMDIST		= НОРМРАСП				##	Возвращает нормальную функцию распределения.
-NORMINV			= НОРМОБР				##	Возвращает обратное нормальное распределение.
-NORMSDIST		= НОРМСТРАСП				##	Возвращает стандартное нормальное интегральное распределение.
-NORMSINV		= НОРМСТОБР				##	Возвращает обратное значение стандартного нормального распределения.
-PEARSON			= ПИРСОН				##	Возвращает коэффициент корреляции Пирсона.
-PERCENTILE		= ПЕРСЕНТИЛЬ				##	Возвращает k-ую персентиль для значений диапазона.
-PERCENTRANK		= ПРОЦЕНТРАНГ				##	Возвращает процентную норму значения в множестве данных.
-PERMUT			= ПЕРЕСТ				##	Возвращает количество перестановок для заданного числа объектов.
-POISSON			= ПУАССОН				##	Возвращает распределение Пуассона.
-PROB			= ВЕРОЯТНОСТЬ				##	Возвращает вероятность того, что значение из диапазона находится внутри заданных пределов.
-QUARTILE		= КВАРТИЛЬ				##	Возвращает квартиль множества данных.
-RANK			= РАНГ					##	Возвращает ранг числа в списке чисел.
-RSQ			= КВПИРСОН				##	Возвращает квадрат коэффициента корреляции Пирсона.
-SKEW			= СКОС					##	Возвращает асимметрию распределения.
-SLOPE			= НАКЛОН				##	Возвращает наклон линии линейной регрессии.
-SMALL			= НАИМЕНЬШИЙ				##	Возвращает k-ое наименьшее значение в множестве данных.
-STANDARDIZE		= НОРМАЛИЗАЦИЯ				##	Возвращает нормализованное значение.
-STDEV			= СТАНДОТКЛОН				##	Оценивает стандартное отклонение по выборке.
-STDEVA			= СТАНДОТКЛОНА				##	Оценивает стандартное отклонение по выборке, включая числа, текст и логические значения.
-STDEVP			= СТАНДОТКЛОНП				##	Вычисляет стандартное отклонение по генеральной совокупности.
-STDEVPA			= СТАНДОТКЛОНПА				##	Вычисляет стандартное отклонение по генеральной совокупности, включая числа, текст и логические значения.
-STEYX			= СТОШYX				##	Возвращает стандартную ошибку предсказанных значений y для каждого значения x в регрессии.
-TDIST			= СТЬЮДРАСП				##	Возвращает t-распределение Стьюдента.
-TINV			= СТЬЮДРАСПОБР				##	Возвращает обратное t-распределение Стьюдента.
-TREND			= ТЕНДЕНЦИЯ				##	Возвращает значения в соответствии с линейным трендом.
-TRIMMEAN		= УРЕЗСРЕДНЕЕ				##	Возвращает среднее внутренности множества данных.
-TTEST			= ТТЕСТ					##	Возвращает вероятность, соответствующую критерию Стьюдента.
-VAR			= ДИСП					##	Оценивает дисперсию по выборке.
-VARA			= ДИСПА					##	Оценивает дисперсию по выборке, включая числа, текст и логические значения.
-VARP			= ДИСПР					##	Вычисляет дисперсию для генеральной совокупности.
-VARPA			= ДИСПРА				##	Вычисляет дисперсию для генеральной совокупности, включая числа, текст и логические значения.
-WEIBULL			= ВЕЙБУЛЛ				##	Возвращает распределение Вейбулла.
-ZTEST			= ZТЕСТ					##	Возвращает двустороннее P-значение z-теста.
-
-
-##
-##	Text functions						Текстовые функции
-##
-ASC			= ASC					##	Для языков с двухбайтовыми наборами знаков (например, катакана) преобразует полноширинные (двухбайтовые) знаки в полуширинные (однобайтовые).
-BAHTTEXT		= БАТТЕКСТ				##	Преобразует число в текст, используя денежный формат ß (БАТ).
-CHAR			= СИМВОЛ				##	Возвращает знак с заданным кодом.
-CLEAN			= ПЕЧСИМВ				##	Удаляет все непечатаемые знаки из текста.
-CODE			= КОДСИМВ				##	Возвращает числовой код первого знака в текстовой строке.
-CONCATENATE		= СЦЕПИТЬ				##	Объединяет несколько текстовых элементов в один.
-DOLLAR			= РУБЛЬ					##	Преобразует число в текст, используя денежный формат.
-EXACT			= СОВПАД				##	Проверяет идентичность двух текстовых значений.
-FIND			= НАЙТИ					##	Ищет вхождения одного текстового значения в другом (с учетом регистра).
-FINDB			= НАЙТИБ				##	Ищет вхождения одного текстового значения в другом (с учетом регистра).
-FIXED			= ФИКСИРОВАННЫЙ				##	Форматирует число и преобразует его в текст с заданным числом десятичных знаков.
-JIS			= JIS					##	Для языков с двухбайтовыми наборами знаков (например, катакана) преобразует полуширинные (однобайтовые) знаки в текстовой строке в полноширинные (двухбайтовые).
-LEFT			= ЛЕВСИМВ				##	Возвращает крайние слева знаки текстового значения.
-LEFTB			= ЛЕВБ					##	Возвращает крайние слева знаки текстового значения.
-LEN			= ДЛСТР					##	Возвращает количество знаков в текстовой строке.
-LENB			= ДЛИНБ					##	Возвращает количество знаков в текстовой строке.
-LOWER			= СТРОЧН				##	Преобразует все буквы текста в строчные.
-MID			= ПСТР					##	Возвращает заданное число знаков из строки текста, начиная с указанной позиции.
-MIDB			= ПСТРБ					##	Возвращает заданное число знаков из строки текста, начиная с указанной позиции.
-PHONETIC		= PHONETIC				##	Извлекает фонетические (фуригана) знаки из текстовой строки.
-PROPER			= ПРОПНАЧ				##	Преобразует первую букву в каждом слове текста в прописную.
-REPLACE			= ЗАМЕНИТЬ				##	Заменяет знаки в тексте.
-REPLACEB		= ЗАМЕНИТЬБ				##	Заменяет знаки в тексте.
-REPT			= ПОВТОР				##	Повторяет текст заданное число раз.
-RIGHT			= ПРАВСИМВ				##	Возвращает крайние справа знаки текстовой строки.
-RIGHTB			= ПРАВБ					##	Возвращает крайние справа знаки текстовой строки.
-SEARCH			= ПОИСК					##	Ищет вхождения одного текстового значения в другом (без учета регистра).
-SEARCHB			= ПОИСКБ				##	Ищет вхождения одного текстового значения в другом (без учета регистра).
-SUBSTITUTE		= ПОДСТАВИТЬ				##	Заменяет в текстовой строке старый текст новым.
-T			= Т					##	Преобразует аргументы в текст.
-TEXT			= ТЕКСТ					##	Форматирует число и преобразует его в текст.
-TRIM			= СЖПРОБЕЛЫ				##	Удаляет из текста пробелы.
-UPPER			= ПРОПИСН				##	Преобразует все буквы текста в прописные.
-VALUE			= ЗНАЧЕН				##	Преобразует текстовый аргумент в число.
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/config
deleted file mode 100644
index 454e52ef52f..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= kr
-
-
-##
-##	Excel Error Codes	(For future use)
-##
-NULL	= #Skärning!
-DIV0	= #Division/0!
-VALUE	= #Värdefel!
-REF	= #Referens!
-NAME	= #Namn?
-NUM	= #Ogiltigt!
-NA	= #Saknas!
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/functions
deleted file mode 100644
index 73b2deb5eb2..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/functions
+++ /dev/null
@@ -1,408 +0,0 @@
-##
-##	Add-in and Automation functions			Tilläggs- och automatiseringsfunktioner
-##
-GETPIVOTDATA		= HÄMTA.PIVOTDATA		##	Returnerar data som lagrats i en pivottabellrapport
-
-
-##
-##	Cube functions					Kubfunktioner
-##
-CUBEKPIMEMBER		= KUBKPIMEDLEM			##	Returnerar namn, egenskap och mått för en KPI och visar namnet och egenskapen i cellen. En KPI, eller prestandaindikator, är ett kvantifierbart mått, t.ex. månatlig bruttovinst eller personalomsättning per kvartal, som används för att analysera ett företags resultat.
-CUBEMEMBER		= KUBMEDLEM			##	Returnerar en medlem eller ett par i en kubhierarki. Används för att verifiera att medlemmen eller paret finns i kuben.
-CUBEMEMBERPROPERTY	= KUBMEDLEMSEGENSKAP		##	Returnerar värdet för en medlemsegenskap i kuben. Används för att verifiera att ett medlemsnamn finns i kuben, samt för att returnera den angivna egenskapen för medlemmen.
-CUBERANKEDMEMBER	= KUBRANGORDNADMEDLEM		##	Returnerar den n:te, eller rangordnade, medlemmen i en uppsättning. Används för att returnera ett eller flera element i en uppsättning, till exempelvis den bästa försäljaren eller de tio bästa eleverna.
-CUBESET			= KUBINSTÄLLNING		##	Definierar en beräknad uppsättning medlemmar eller par genom att skicka ett bestämt uttryck till kuben på servern, som skapar uppsättningen och sedan returnerar den till Microsoft Office Excel.
-CUBESETCOUNT		= KUBINSTÄLLNINGANTAL		##	Returnerar antalet objekt i en uppsättning.
-CUBEVALUE		= KUBVÄRDE			##	Returnerar ett mängdvärde från en kub.
-
-
-##
-##	Database functions				Databasfunktioner
-##
-DAVERAGE		= DMEDEL			##	Returnerar medelvärdet av databasposterna
-DCOUNT			= DANTAL			##	Räknar antalet celler som innehåller tal i en databas
-DCOUNTA			= DANTALV			##	Räknar ifyllda celler i en databas
-DGET			= DHÄMTA			##	Hämtar en enstaka post från en databas som uppfyller de angivna villkoren
-DMAX			= DMAX				##	Returnerar det största värdet från databasposterna
-DMIN			= DMIN				##	Returnerar det minsta värdet från databasposterna
-DPRODUCT		= DPRODUKT			##	Multiplicerar värdena i ett visst fält i poster som uppfyller villkoret
-DSTDEV			= DSTDAV			##	Uppskattar standardavvikelsen baserat på ett urval av databasposterna
-DSTDEVP			= DSTDAVP			##	Beräknar standardavvikelsen utifrån hela populationen av valda databasposter
-DSUM			= DSUMMA			##	Summerar talen i kolumnfält i databasposter som uppfyller villkoret
-DVAR			= DVARIANS			##	Uppskattar variansen baserat på ett urval av databasposterna
-DVARP			= DVARIANSP			##	Beräknar variansen utifrån hela populationen av valda databasposter
-
-
-##
-##	Date and time functions				Tid- och datumfunktioner
-##
-DATE			= DATUM				##	Returnerar ett serienummer för ett visst datum
-DATEVALUE		= DATUMVÄRDE			##	Konverterar ett datum i textformat till ett serienummer
-DAY			= DAG				##	Konverterar ett serienummer till dag i månaden
-DAYS360			= DAGAR360			##	Beräknar antalet dagar mellan två datum baserat på ett 360-dagarsår
-EDATE			= EDATUM			##	Returnerar serienumret för ett datum som infaller ett visst antal månader före eller efter startdatumet
-EOMONTH			= SLUTMÅNAD			##	Returnerar serienumret för sista dagen i månaden ett visst antal månader tidigare eller senare
-HOUR			= TIMME				##	Konverterar ett serienummer till en timme
-MINUTE			= MINUT				##	Konverterar ett serienummer till en minut
-MONTH			= MÅNAD				##	Konverterar ett serienummer till en månad
-NETWORKDAYS		= NETTOARBETSDAGAR		##	Returnerar antalet hela arbetsdagar mellan två datum
-NOW			= NU				##	Returnerar serienumret för dagens datum och aktuell tid
-SECOND			= SEKUND			##	Konverterar ett serienummer till en sekund
-TIME			= KLOCKSLAG			##	Returnerar serienumret för en viss tid
-TIMEVALUE		= TIDVÄRDE			##	Konverterar en tid i textformat till ett serienummer
-TODAY			= IDAG				##	Returnerar serienumret för dagens datum
-WEEKDAY			= VECKODAG			##	Konverterar ett serienummer till en dag i veckan
-WEEKNUM			= VECKONR			##	Konverterar ett serienummer till ett veckonummer
-WORKDAY			= ARBETSDAGAR			##	Returnerar serienumret för ett datum ett visst antal arbetsdagar tidigare eller senare
-YEAR			= ÅR				##	Konverterar ett serienummer till ett år
-YEARFRAC		= ÅRDEL				##	Returnerar en del av ett år som representerar antalet hela dagar mellan start- och slutdatum
-
-
-##
-##	Engineering functions				Tekniska funktioner
-##
-BESSELI			= BESSELI			##	Returnerar den modifierade Bessel-funktionen In(x)
-BESSELJ			= BESSELJ			##	Returnerar Bessel-funktionen Jn(x)
-BESSELK			= BESSELK			##	Returnerar den modifierade Bessel-funktionen Kn(x)
-BESSELY			= BESSELY			##	Returnerar Bessel-funktionen Yn(x)
-BIN2DEC			= BIN.TILL.DEC			##	Omvandlar ett binärt tal till decimalt
-BIN2HEX			= BIN.TILL.HEX			##	Omvandlar ett binärt tal till hexadecimalt
-BIN2OCT			= BIN.TILL.OKT			##	Omvandlar ett binärt tal till oktalt
-COMPLEX			= KOMPLEX			##	Omvandlar reella och imaginära koefficienter till ett komplext tal
-CONVERT			= KONVERTERA			##	Omvandlar ett tal från ett måttsystem till ett annat
-DEC2BIN			= DEC.TILL.BIN			##	Omvandlar ett decimalt tal till binärt
-DEC2HEX			= DEC.TILL.HEX			##	Omvandlar ett decimalt tal till hexadecimalt
-DEC2OCT			= DEC.TILL.OKT			##	Omvandlar ett decimalt tal till oktalt
-DELTA			= DELTA				##	Testar om två värden är lika
-ERF			= FELF				##	Returnerar felfunktionen
-ERFC			= FELFK				##	Returnerar den komplementära felfunktionen
-GESTEP			= SLSTEG			##	Testar om ett tal är större än ett tröskelvärde
-HEX2BIN			= HEX.TILL.BIN			##	Omvandlar ett hexadecimalt tal till binärt
-HEX2DEC			= HEX.TILL.DEC			##	Omvandlar ett hexadecimalt tal till decimalt
-HEX2OCT			= HEX.TILL.OKT			##	Omvandlar ett hexadecimalt tal till oktalt
-IMABS			= IMABS				##	Returnerar absolutvärdet (modulus) för ett komplext tal
-IMAGINARY		= IMAGINÄR			##	Returnerar den imaginära koefficienten för ett komplext tal
-IMARGUMENT		= IMARGUMENT			##	Returnerar det komplexa talets argument, en vinkel uttryckt i radianer
-IMCONJUGATE		= IMKONJUGAT			##	Returnerar det komplexa talets konjugat
-IMCOS			= IMCOS				##	Returnerar cosinus för ett komplext tal
-IMDIV			= IMDIV				##	Returnerar kvoten för två komplexa tal
-IMEXP			= IMEUPPHÖJT			##	Returnerar exponenten för ett komplext tal
-IMLN			= IMLN				##	Returnerar den naturliga logaritmen för ett komplext tal
-IMLOG10			= IMLOG10			##	Returnerar 10-logaritmen för ett komplext tal
-IMLOG2			= IMLOG2			##	Returnerar 2-logaritmen för ett komplext tal
-IMPOWER			= IMUPPHÖJT			##	Returnerar ett komplext tal upphöjt till en exponent
-IMPRODUCT		= IMPRODUKT			##	Returnerar produkten av komplexa tal
-IMREAL			= IMREAL			##	Returnerar den reella koefficienten för ett komplext tal
-IMSIN			= IMSIN				##	Returnerar sinus för ett komplext tal
-IMSQRT			= IMROT				##	Returnerar kvadratroten av ett komplext tal
-IMSUB			= IMDIFF			##	Returnerar differensen mellan två komplexa tal
-IMSUM			= IMSUM				##	Returnerar summan av komplexa tal
-OCT2BIN			= OKT.TILL.BIN			##	Omvandlar ett oktalt tal till binärt
-OCT2DEC			= OKT.TILL.DEC			##	Omvandlar ett oktalt tal till decimalt
-OCT2HEX			= OKT.TILL.HEX			##	Omvandlar ett oktalt tal till hexadecimalt
-
-
-##
-##	Financial functions				Finansiella funktioner
-##
-ACCRINT			= UPPLRÄNTA			##	Returnerar den upplupna räntan för värdepapper med periodisk ränta
-ACCRINTM		= UPPLOBLRÄNTA			##	Returnerar den upplupna räntan för ett värdepapper som ger avkastning på förfallodagen
-AMORDEGRC		= AMORDEGRC			##	Returnerar avskrivningen för varje redovisningsperiod med hjälp av en avskrivningskoefficient
-AMORLINC		= AMORLINC			##	Returnerar avskrivningen för varje redovisningsperiod
-COUPDAYBS		= KUPDAGBB			##	Returnerar antal dagar från början av kupongperioden till likviddagen
-COUPDAYS		= KUPDAGARS			##	Returnerar antalet dagar i kupongperioden som innehåller betalningsdatumet
-COUPDAYSNC		= KUPDAGNK			##	Returnerar antalet dagar från betalningsdatumet till nästa kupongdatum
-COUPNCD			= KUPNKD			##	Returnerar nästa kupongdatum efter likviddagen
-COUPNUM			= KUPANT			##	Returnerar kuponger som förfaller till betalning mellan likviddagen och förfallodagen
-COUPPCD			= KUPFKD			##	Returnerar föregående kupongdatum före likviddagen
-CUMIPMT			= KUMRÄNTA			##	Returnerar den ackumulerade räntan som betalats mellan två perioder
-CUMPRINC		= KUMPRIS			##	Returnerar det ackumulerade kapitalbeloppet som betalats på ett lån mellan två perioder
-DB			= DB				##	Returnerar avskrivningen för en tillgång under en angiven tid enligt metoden för fast degressiv avskrivning
-DDB			= DEGAVSKR			##	Returnerar en tillgångs värdeminskning under en viss period med hjälp av dubbel degressiv avskrivning eller någon annan metod som du anger
-DISC			= DISK				##	Returnerar diskonteringsräntan för ett värdepapper
-DOLLARDE		= DECTAL			##	Omvandlar ett pris uttryckt som ett bråk till ett decimaltal
-DOLLARFR		= BRÅK				##	Omvandlar ett pris i kronor uttryckt som ett decimaltal till ett bråk
-DURATION		= LÖPTID			##	Returnerar den årliga löptiden för en säkerhet med periodiska räntebetalningar
-EFFECT			= EFFRÄNTA			##	Returnerar den årliga effektiva räntesatsen
-FV			= SLUTVÄRDE			##	Returnerar det framtida värdet på en investering
-FVSCHEDULE		= FÖRRÄNTNING			##	Returnerar det framtida värdet av ett begynnelsekapital beräknat på olika räntenivåer
-INTRATE			= ÅRSRÄNTA			##	Returnerar räntesatsen för ett betalt värdepapper
-IPMT			= RBETALNING			##	Returnerar räntedelen av en betalning för en given period
-IRR			= IR				##	Returnerar internräntan för en serie betalningar
-ISPMT			= RALÅN				##	Beräknar räntan som har betalats under en specifik betalningsperiod
-MDURATION		= MLÖPTID			##	Returnerar den modifierade Macauley-löptiden för ett värdepapper med det antagna nominella värdet 100 kr
-MIRR			= MODIR				##	Returnerar internräntan där positiva och negativa betalningar finansieras med olika räntor
-NOMINAL			= NOMRÄNTA			##	Returnerar den årliga nominella räntesatsen
-NPER			= PERIODER			##	Returnerar antalet perioder för en investering
-NPV			= NETNUVÄRDE			##	Returnerar nuvärdet av en serie periodiska betalningar vid en given diskonteringsränta
-ODDFPRICE		= UDDAFPRIS			##	Returnerar priset per 100 kr nominellt värde för ett värdepapper med en udda första period
-ODDFYIELD		= UDDAFAVKASTNING		##	Returnerar avkastningen för en säkerhet med en udda första period
-ODDLPRICE		= UDDASPRIS			##	Returnerar priset per 100 kr nominellt värde för ett värdepapper med en udda sista period
-ODDLYIELD		= UDDASAVKASTNING		##	Returnerar avkastningen för en säkerhet med en udda sista period
-PMT			= BETALNING			##	Returnerar den periodiska betalningen för en annuitet
-PPMT			= AMORT				##	Returnerar amorteringsdelen av en annuitetsbetalning för en given period
-PRICE			= PRIS				##	Returnerar priset per 100 kr nominellt värde för ett värdepapper som ger periodisk ränta
-PRICEDISC		= PRISDISK			##	Returnerar priset per 100 kr nominellt värde för ett diskonterat värdepapper
-PRICEMAT		= PRISFÖRF			##	Returnerar priset per 100 kr nominellt värde för ett värdepapper som ger ränta på förfallodagen
-PV			= PV				##	Returnerar nuvärdet av en serie lika stora periodiska betalningar
-RATE			= RÄNTA				##	Returnerar räntesatsen per period i en annuitet
-RECEIVED		= BELOPP			##	Returnerar beloppet som utdelas på förfallodagen för ett betalat värdepapper
-SLN			= LINAVSKR			##	Returnerar den linjära avskrivningen för en tillgång under en period
-SYD			= ÅRSAVSKR			##	Returnerar den årliga avskrivningssumman för en tillgång under en angiven period
-TBILLEQ			= SSVXEKV			##	Returnerar avkastningen motsvarande en obligation för en statsskuldväxel
-TBILLPRICE		= SSVXPRIS			##	Returnerar priset per 100 kr nominellt värde för en statsskuldväxel
-TBILLYIELD		= SSVXRÄNTA			##	Returnerar avkastningen för en statsskuldväxel
-VDB			= VDEGRAVSKR			##	Returnerar avskrivningen för en tillgång under en angiven period (med degressiv avskrivning)
-XIRR			= XIRR				##	Returnerar internräntan för en serie betalningar som inte nödvändigtvis är periodiska
-XNPV			= XNUVÄRDE			##	Returnerar det nuvarande nettovärdet för en serie betalningar som inte nödvändigtvis är periodiska
-YIELD			= NOMAVK			##	Returnerar avkastningen för ett värdepapper som ger periodisk ränta
-YIELDDISC		= NOMAVKDISK			##	Returnerar den årliga avkastningen för diskonterade värdepapper, exempelvis en statsskuldväxel
-YIELDMAT		= NOMAVKFÖRF			##	Returnerar den årliga avkastningen för ett värdepapper som ger ränta på förfallodagen
-
-
-##
-##	Information functions				Informationsfunktioner
-##
-CELL			= CELL				##	Returnerar information om formatering, plats och innehåll i en cell
-ERROR.TYPE		= FEL.TYP			##	Returnerar ett tal som motsvarar ett felvärde
-INFO			= INFO				##	Returnerar information om operativsystemet
-ISBLANK			= ÄRREF				##	Returnerar SANT om värdet är tomt
-ISERR			= Ä				##	Returnerar SANT om värdet är ett felvärde annat än #SAKNAS!
-ISERROR			= ÄRFEL				##	Returnerar SANT om värdet är ett felvärde
-ISEVEN			= ÄRJÄMN			##	Returnerar SANT om talet är jämnt
-ISLOGICAL		= ÄREJTEXT			##	Returnerar SANT om värdet är ett logiskt värde
-ISNA			= ÄRLOGISK			##	Returnerar SANT om värdet är felvärdet #SAKNAS!
-ISNONTEXT		= ÄRSAKNAD			##	Returnerar SANT om värdet inte är text
-ISNUMBER		= ÄRTAL				##	Returnerar SANT om värdet är ett tal
-ISODD			= ÄRUDDA			##	Returnerar SANT om talet är udda
-ISREF			= ÄRTOM				##	Returnerar SANT om värdet är en referens
-ISTEXT			= ÄRTEXT			##	Returnerar SANT om värdet är text
-N			= N				##	Returnerar ett värde omvandlat till ett tal
-NA			= SAKNAS			##	Returnerar felvärdet #SAKNAS!
-TYPE			= VÄRDETYP			##	Returnerar ett tal som anger värdets datatyp
-
-
-##
-##	Logical functions				Logiska funktioner
-##
-AND			= OCH				##	Returnerar SANT om alla argument är sanna
-FALSE			= FALSKT			##	Returnerar det logiska värdet FALSKT
-IF			= OM				##	Anger vilket logiskt test som ska utföras
-IFERROR			= OMFEL				##	Returnerar ett värde som du anger om en formel utvärderar till ett fel; annars returneras resultatet av formeln
-NOT			= ICKE				##	Inverterar logiken för argumenten
-OR			= ELLER				##	Returnerar SANT om något argument är SANT
-TRUE			= SANT				##	Returnerar det logiska värdet SANT
-
-
-##
-##	Lookup and reference functions			Sök- och referensfunktioner
-##
-ADDRESS			= ADRESS			##	Returnerar en referens som text till en enstaka cell i ett kalkylblad
-AREAS			= OMRÅDEN			##	Returnerar antalet områden i en referens
-CHOOSE			= VÄLJ				##	Väljer ett värde i en lista över värden
-COLUMN			= KOLUMN			##	Returnerar kolumnnumret för en referens
-COLUMNS			= KOLUMNER			##	Returnerar antalet kolumner i en referens
-HLOOKUP			= LETAKOLUMN			##	Söker i den översta raden i en matris och returnerar värdet för angiven cell
-HYPERLINK		= HYPERLÄNK			##	Skapar en genväg eller ett hopp till ett dokument i nätverket, i ett intranät eller på Internet
-INDEX			= INDEX				##	Använder ett index för ett välja ett värde i en referens eller matris
-INDIRECT		= INDIREKT			##	Returnerar en referens som anges av ett textvärde
-LOOKUP			= LETAUPP			##	Letar upp värden i en vektor eller matris
-MATCH			= PASSA				##	Letar upp värden i en referens eller matris
-OFFSET			= FÖRSKJUTNING			##	Returnerar en referens förskjuten i förhållande till en given referens
-ROW			= RAD				##	Returnerar radnumret för en referens
-ROWS			= RADER				##	Returnerar antalet rader i en referens
-RTD			= RTD				##	Hämtar realtidsdata från ett program som stöder COM-automation (Automation: Ett sätt att arbeta med ett programs objekt från ett annat program eller utvecklingsverktyg. Detta kallades tidigare för OLE Automation, och är en branschstandard och ingår i Component Object Model (COM).)
-TRANSPOSE		= TRANSPONERA			##	Transponerar en matris
-VLOOKUP			= LETARAD			##	Letar i den första kolumnen i en matris och flyttar över raden för att returnera värdet för en cell
-
-
-##
-##	Math and trigonometry functions			Matematiska och trigonometriska funktioner
-##
-ABS			= ABS				##	Returnerar absolutvärdet av ett tal
-ACOS			= ARCCOS			##	Returnerar arcus cosinus för ett tal
-ACOSH			= ARCCOSH			##	Returnerar inverterad hyperbolisk cosinus för ett tal
-ASIN			= ARCSIN			##	Returnerar arcus cosinus för ett tal
-ASINH			= ARCSINH			##	Returnerar hyperbolisk arcus sinus för ett tal
-ATAN			= ARCTAN			##	Returnerar arcus tangens för ett tal
-ATAN2			= ARCTAN2			##	Returnerar arcus tangens för en x- och en y- koordinat
-ATANH			= ARCTANH			##	Returnerar hyperbolisk arcus tangens för ett tal
-CEILING			= RUNDA.UPP			##	Avrundar ett tal till närmaste heltal eller närmaste signifikanta multipel
-COMBIN			= KOMBIN			##	Returnerar antalet kombinationer för ett givet antal objekt
-COS			= COS				##	Returnerar cosinus för ett tal
-COSH			= COSH				##	Returnerar hyperboliskt cosinus för ett tal
-DEGREES			= GRADER			##	Omvandlar radianer till grader
-EVEN			= JÄMN				##	Avrundar ett tal uppåt till närmaste heltal
-EXP			= EXP				##	Returnerar e upphöjt till ett givet tal
-FACT			= FAKULTET			##	Returnerar fakulteten för ett tal
-FACTDOUBLE		= DUBBELFAKULTET		##	Returnerar dubbelfakulteten för ett tal
-FLOOR			= RUNDA.NED			##	Avrundar ett tal nedåt mot noll
-GCD			= SGD				##	Returnerar den största gemensamma nämnaren
-INT			= HELTAL			##	Avrundar ett tal nedåt till närmaste heltal
-LCM			= MGM				##	Returnerar den minsta gemensamma multipeln
-LN			= LN				##	Returnerar den naturliga logaritmen för ett tal
-LOG			= LOG				##	Returnerar logaritmen för ett tal för en given bas
-LOG10			= LOG10				##	Returnerar 10-logaritmen för ett tal
-MDETERM			= MDETERM			##	Returnerar matrisen som är avgörandet av en matris
-MINVERSE		= MINVERT			##	Returnerar matrisinversen av en matris
-MMULT			= MMULT				##	Returnerar matrisprodukten av två matriser
-MOD			= REST				##	Returnerar resten vid en division
-MROUND			= MAVRUNDA			##	Returnerar ett tal avrundat till en given multipel
-MULTINOMIAL		= MULTINOMIAL			##	Returnerar multinomialen för en uppsättning tal
-ODD			= UDDA				##	Avrundar ett tal uppåt till närmaste udda heltal
-PI			= PI				##	Returnerar värdet pi
-POWER			= UPPHÖJT.TILL			##	Returnerar resultatet av ett tal upphöjt till en exponent
-PRODUCT			= PRODUKT			##	Multiplicerar argumenten
-QUOTIENT		= KVOT				##	Returnerar heltalsdelen av en division
-RADIANS			= RADIANER			##	Omvandlar grader till radianer
-RAND			= SLUMP				##	Returnerar ett slumptal mellan 0 och 1
-RANDBETWEEN		= SLUMP.MELLAN			##	Returnerar ett slumptal mellan de tal som du anger
-ROMAN			= ROMERSK			##	Omvandlar vanliga (arabiska) siffror till romerska som text
-ROUND			= AVRUNDA			##	Avrundar ett tal till ett angivet antal siffror
-ROUNDDOWN		= AVRUNDA.NEDÅT			##	Avrundar ett tal nedåt mot noll
-ROUNDUP			= AVRUNDA.UPPÅT			##	Avrundar ett tal uppåt, från noll
-SERIESSUM		= SERIESUMMA			##	Returnerar summan av en potensserie baserat på formeln
-SIGN			= TECKEN			##	Returnerar tecknet för ett tal
-SIN			= SIN				##	Returnerar sinus för en given vinkel
-SINH			= SINH				##	Returnerar hyperbolisk sinus för ett tal
-SQRT			= ROT				##	Returnerar den positiva kvadratroten
-SQRTPI			= ROTPI				##	Returnerar kvadratroten för (tal * pi)
-SUBTOTAL		= DELSUMMA			##	Returnerar en delsumma i en lista eller databas
-SUM			= SUMMA				##	Summerar argumenten
-SUMIF			= SUMMA.OM			##	Summerar celler enligt ett angivet villkor
-SUMIFS			= SUMMA.OMF			##	Lägger till cellerna i ett område som uppfyller flera kriterier
-SUMPRODUCT		= PRODUKTSUMMA			##	Returnerar summan av produkterna i motsvarande matriskomponenter
-SUMSQ			= KVADRATSUMMA			##	Returnerar summan av argumentens kvadrater
-SUMX2MY2		= SUMMAX2MY2			##	Returnerar summan av differensen mellan kvadraterna för motsvarande värden i två matriser
-SUMX2PY2		= SUMMAX2PY2			##	Returnerar summan av summan av kvadraterna av motsvarande värden i två matriser
-SUMXMY2			= SUMMAXMY2			##	Returnerar summan av kvadraten av skillnaden mellan motsvarande värden i två matriser
-TAN			= TAN				##	Returnerar tangens för ett tal
-TANH			= TANH				##	Returnerar hyperbolisk tangens för ett tal
-TRUNC			= AVKORTA			##	Avkortar ett tal till ett heltal
-
-
-##
-##	Statistical functions				Statistiska funktioner
-##
-AVEDEV			= MEDELAVV			##	Returnerar medelvärdet för datapunkters absoluta avvikelse från deras medelvärde
-AVERAGE			= MEDEL				##	Returnerar medelvärdet av argumenten
-AVERAGEA		= AVERAGEA			##	Returnerar medelvärdet av argumenten, inklusive tal, text och logiska värden
-AVERAGEIF		= MEDELOM			##	Returnerar medelvärdet (aritmetiskt medelvärde) för alla celler i ett område som uppfyller ett givet kriterium
-AVERAGEIFS		= MEDELOMF			##	Returnerar medelvärdet (det aritmetiska medelvärdet) för alla celler som uppfyller flera villkor.
-BETADIST		= BETAFÖRD			##	Returnerar den kumulativa betafördelningsfunktionen
-BETAINV			= BETAINV			##	Returnerar inversen till den kumulativa fördelningsfunktionen för en viss betafördelning
-BINOMDIST		= BINOMFÖRD			##	Returnerar den individuella binomialfördelningen
-CHIDIST			= CHI2FÖRD			##	Returnerar den ensidiga sannolikheten av c2-fördelningen
-CHIINV			= CHI2INV			##	Returnerar inversen av chi2-fördelningen
-CHITEST			= CHI2TEST			##	Returnerar oberoendetesten
-CONFIDENCE		= KONFIDENS			##	Returnerar konfidensintervallet för en populations medelvärde
-CORREL			= KORREL			##	Returnerar korrelationskoefficienten mellan två datamängder
-COUNT			= ANTAL				##	Räknar hur många tal som finns bland argumenten
-COUNTA			= ANTALV			##	Räknar hur många värden som finns bland argumenten
-COUNTBLANK		= ANTAL.TOMMA			##	Räknar antalet tomma celler i ett område
-COUNTIF			= ANTAL.OM			##	Räknar antalet celler i ett område som uppfyller angivna villkor.
-COUNTIFS		= ANTAL.OMF			##	Räknar antalet celler i ett område som uppfyller flera villkor.
-COVAR			= KOVAR				##	Returnerar kovariansen, d.v.s. medelvärdet av produkterna för parade avvikelser
-CRITBINOM		= KRITBINOM			##	Returnerar det minsta värdet för vilket den kumulativa binomialfördelningen är mindre än eller lika med ett villkorsvärde
-DEVSQ			= KVADAVV			##	Returnerar summan av kvadrater på avvikelser
-EXPONDIST		= EXPONFÖRD			##	Returnerar exponentialfördelningen
-FDIST			= FFÖRD				##	Returnerar F-sannolikhetsfördelningen
-FINV			= FINV				##	Returnerar inversen till F-sannolikhetsfördelningen
-FISHER			= FISHER			##	Returnerar Fisher-transformationen
-FISHERINV		= FISHERINV			##	Returnerar inversen till Fisher-transformationen
-FORECAST		= PREDIKTION			##	Returnerar ett värde längs en linjär trendlinje
-FREQUENCY		= FREKVENS			##	Returnerar en frekvensfördelning som en lodrät matris
-FTEST			= FTEST				##	Returnerar resultatet av en F-test
-GAMMADIST		= GAMMAFÖRD			##	Returnerar gammafördelningen
-GAMMAINV		= GAMMAINV			##	Returnerar inversen till den kumulativa gammafördelningen
-GAMMALN			= GAMMALN			##	Returnerar den naturliga logaritmen för gammafunktionen, G(x)
-GEOMEAN			= GEOMEDEL			##	Returnerar det geometriska medelvärdet
-GROWTH			= EXPTREND			##	Returnerar värden längs en exponentiell trend
-HARMEAN			= HARMMEDEL			##	Returnerar det harmoniska medelvärdet
-HYPGEOMDIST		= HYPGEOMFÖRD			##	Returnerar den hypergeometriska fördelningen
-INTERCEPT		= SKÄRNINGSPUNKT		##	Returnerar skärningspunkten för en linjär regressionslinje
-KURT			= TOPPIGHET			##	Returnerar toppigheten av en mängd data
-LARGE			= STÖRSTA			##	Returnerar det n:te största värdet i en mängd data
-LINEST			= REGR				##	Returnerar parametrar till en linjär trendlinje
-LOGEST			= EXPREGR			##	Returnerar parametrarna i en exponentiell trend
-LOGINV			= LOGINV			##	Returnerar inversen till den lognormala fördelningen
-LOGNORMDIST		= LOGNORMFÖRD			##	Returnerar den kumulativa lognormala fördelningen
-MAX			= MAX				##	Returnerar det största värdet i en lista av argument
-MAXA			= MAXA				##	Returnerar det största värdet i en lista av argument, inklusive tal, text och logiska värden
-MEDIAN			= MEDIAN			##	Returnerar medianen för angivna tal
-MIN			= MIN				##	Returnerar det minsta värdet i en lista med argument
-MINA			= MINA				##	Returnerar det minsta värdet i en lista över argument, inklusive tal, text och logiska värden
-MODE			= TYPVÄRDE			##	Returnerar det vanligaste värdet i en datamängd
-NEGBINOMDIST		= NEGBINOMFÖRD			##	Returnerar den negativa binomialfördelningen
-NORMDIST		= NORMFÖRD			##	Returnerar den kumulativa normalfördelningen
-NORMINV			= NORMINV			##	Returnerar inversen till den kumulativa normalfördelningen
-NORMSDIST		= NORMSFÖRD			##	Returnerar den kumulativa standardnormalfördelningen
-NORMSINV		= NORMSINV			##	Returnerar inversen till den kumulativa standardnormalfördelningen
-PEARSON			= PEARSON			##	Returnerar korrelationskoefficienten till Pearsons momentprodukt
-PERCENTILE		= PERCENTIL			##	Returnerar den n:te percentilen av värden i ett område
-PERCENTRANK		= PROCENTRANG			##	Returnerar procentrangen för ett värde i en datamängd
-PERMUT			= PERMUT			##	Returnerar antal permutationer för ett givet antal objekt
-POISSON			= POISSON			##	Returnerar Poisson-fördelningen
-PROB			= SANNOLIKHET			##	Returnerar sannolikheten att värden i ett område ligger mellan två gränser
-QUARTILE		= KVARTIL			##	Returnerar kvartilen av en mängd data
-RANK			= RANG				##	Returnerar rangordningen för ett tal i en lista med tal
-RSQ			= RKV				##	Returnerar kvadraten av Pearsons produktmomentkorrelationskoefficient
-SKEW			= SNEDHET			##	Returnerar snedheten för en fördelning
-SLOPE			= LUTNING			##	Returnerar lutningen på en linjär regressionslinje
-SMALL			= MINSTA			##	Returnerar det n:te minsta värdet i en mängd data
-STANDARDIZE		= STANDARDISERA			##	Returnerar ett normaliserat värde
-STDEV			= STDAV				##	Uppskattar standardavvikelsen baserat på ett urval
-STDEVA			= STDEVA			##	Uppskattar standardavvikelsen baserat på ett urval, inklusive tal, text och logiska värden
-STDEVP			= STDAVP			##	Beräknar standardavvikelsen baserat på hela populationen
-STDEVPA			= STDEVPA			##	Beräknar standardavvikelsen baserat på hela populationen, inklusive tal, text och logiska värden
-STEYX			= STDFELYX			##	Returnerar standardfelet för ett förutspått y-värde för varje x-värde i regressionen
-TDIST			= TFÖRD				##	Returnerar Students t-fördelning
-TINV			= TINV				##	Returnerar inversen till Students t-fördelning
-TREND			= TREND				##	Returnerar värden längs en linjär trend
-TRIMMEAN		= TRIMMEDEL			##	Returnerar medelvärdet av mittpunkterna i en datamängd
-TTEST			= TTEST				##	Returnerar sannolikheten beräknad ur Students t-test
-VAR			= VARIANS			##	Uppskattar variansen baserat på ett urval
-VARA			= VARA				##	Uppskattar variansen baserat på ett urval, inklusive tal, text och logiska värden
-VARP			= VARIANSP			##	Beräknar variansen baserat på hela populationen
-VARPA			= VARPA				##	Beräknar variansen baserat på hela populationen, inklusive tal, text och logiska värden
-WEIBULL			= WEIBULL			##	Returnerar Weibull-fördelningen
-ZTEST			= ZTEST				##	Returnerar det ensidiga sannolikhetsvärdet av ett z-test
-
-
-##
-##	Text functions					Textfunktioner
-##
-ASC			= ASC				##	Ändrar helbredds (dubbel byte) engelska bokstäver eller katakana inom en teckensträng till tecken med halvt breddsteg (enkel byte)
-BAHTTEXT		= BAHTTEXT			##	Omvandlar ett tal till text med valutaformatet ß (baht)
-CHAR			= TECKENKOD			##	Returnerar tecknet som anges av kod
-CLEAN			= STÄDA				##	Tar bort alla icke utskrivbara tecken i en text
-CODE			= KOD				##	Returnerar en numerisk kod för det första tecknet i en textsträng
-CONCATENATE		= SAMMANFOGA			##	Sammanfogar flera textdelar till en textsträng
-DOLLAR			= VALUTA			##	Omvandlar ett tal till text med valutaformat
-EXACT			= EXAKT				##	Kontrollerar om två textvärden är identiska
-FIND			= HITTA				##	Hittar en text i en annan (skiljer på gemener och versaler)
-FINDB			= HITTAB			##	Hittar en text i en annan (skiljer på gemener och versaler)
-FIXED			= FASTTAL			##	Formaterar ett tal som text med ett fast antal decimaler
-JIS			= JIS				##	Ändrar halvbredds (enkel byte) engelska bokstäver eller katakana inom en teckensträng till tecken med helt breddsteg (dubbel byte)
-LEFT			= VÄNSTER			##	Returnerar tecken längst till vänster i en sträng
-LEFTB			= VÄNSTERB			##	Returnerar tecken längst till vänster i en sträng
-LEN			= LÄNGD				##	Returnerar antalet tecken i en textsträng
-LENB			= LÄNGDB			##	Returnerar antalet tecken i en textsträng
-LOWER			= GEMENER			##	Omvandlar text till gemener
-MID			= EXTEXT			##	Returnerar angivet antal tecken från en text med början vid den position som du anger
-MIDB			= EXTEXTB			##	Returnerar angivet antal tecken från en text med början vid den position som du anger
-PHONETIC		= PHONETIC			##	Returnerar de fonetiska (furigana) tecknen i en textsträng
-PROPER			= INITIAL			##	Ändrar första bokstaven i varje ord i ett textvärde till versal
-REPLACE			= ERSÄTT			##	Ersätter tecken i text
-REPLACEB		= ERSÄTTB			##	Ersätter tecken i text
-REPT			= REP				##	Upprepar en text ett bestämt antal gånger
-RIGHT			= HÖGER				##	Returnerar tecken längst till höger i en sträng
-RIGHTB			= HÖGERB			##	Returnerar tecken längst till höger i en sträng
-SEARCH			= SÖK				##	Hittar ett textvärde i ett annat (skiljer inte på gemener och versaler)
-SEARCHB			= SÖKB				##	Hittar ett textvärde i ett annat (skiljer inte på gemener och versaler)
-SUBSTITUTE		= BYT.UT			##	Ersätter gammal text med ny text i en textsträng
-T			= T				##	Omvandlar argumenten till text
-TEXT			= TEXT				##	Formaterar ett tal och omvandlar det till text
-TRIM			= RENSA				##	Tar bort blanksteg från text
-UPPER			= VERSALER			##	Omvandlar text till versaler
-VALUE			= TEXTNUM			##	Omvandlar ett textargument till ett tal
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/config
deleted file mode 100644
index 8a103d3c196..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= YTL
-
-
-##
-##	Excel Error Codes	(For future use)
-##
-NULL	= #BOŞ!
-DIV0	= #SAYI/0!
-VALUE	= #DEĞER!
-REF	= #BAŞV!
-NAME	= #AD?
-NUM	= #SAYI!
-NA	= #YOK
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
deleted file mode 100644
index 79645214714..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
+++ /dev/null
@@ -1,438 +0,0 @@
-##
-## PHPExcel
-##
-## Copyright (c) 2006 - 2013 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Calculation
-## @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
-##
-##
-
-
-##
-##	Add-in and Automation functions			Eklenti ve Otomasyon fonksiyonları
-##
-GETPIVOTDATA		= ÖZETVERİAL	##	Bir Özet Tablo raporunda saklanan verileri verir.
-
-
-##
-##	Cube functions					Küp işlevleri
-##
-CUBEKPIMEMBER		= KÜPKPIÜYE			##	Kilit performans göstergesi (KPI-Key Performance Indicator) adını, özelliğini ve ölçüsünü verir ve hücredeki ad ve özelliği gösterir. KPI, bir kurumun performansını izlemek için kullanılan aylık brüt kâr ya da üç aylık çalışan giriş çıkışları gibi ölçülebilen bir birimdir.
-CUBEMEMBER			= KÜPÜYE			##	Bir küp hiyerarşisinde bir üyeyi veya kaydı verir. Üye veya kaydın küpte varolduğunu doğrulamak için kullanılır.
-CUBEMEMBERPROPERTY	= KÜPÜYEÖZELLİĞİ	##	Bir küpte bir üyenin özelliğinin değerini verir. Küp içinde üye adının varlığını doğrulamak ve bu üyenin belli özelliklerini getirmek için kullanılır.
-CUBERANKEDMEMBER	= KÜPÜYESIRASI 		##	Bir küme içindeki üyenin derecesini veya kaçıncı olduğunu verir. En iyi satış elemanı, veya en iyi on öğrenci gibi bir kümedeki bir veya daha fazla öğeyi getirmek için kullanılır.
-CUBESET				= KÜPKÜME			##	Kümeyi oluşturan ve ardından bu kümeyi Microsoft Office Excel'e getiren sunucudaki küpe küme ifadelerini göndererek hesaplanan üye veya kayıt kümesini tanımlar.
-CUBESETCOUNT		= KÜPKÜMESAY		##	Bir kümedeki öğelerin sayısını getirir.
-CUBEVALUE			= KÜPDEĞER 			##	Bir küpten toplam değeri getirir.
-
-
-##
-##	Database functions				Veritabanı işlevleri
-##
-DAVERAGE		= VSEÇORT			##	Seçili veritabanı girdilerinin ortalamasını verir.
-DCOUNT			= VSEÇSAY			##	Veritabanında sayı içeren hücre sayısını hesaplar.
-DCOUNTA			= VSEÇSAYDOLU		##	Veritabanındaki boş olmayan hücreleri sayar.
-DGET			= VAL				##	Veritabanından, belirtilen ölçütlerle eşleşen tek bir rapor çıkarır.
-DMAX			= VSEÇMAK			##	Seçili veritabanı girişlerinin en yüksek değerini verir.
-DMIN			= VSEÇMİN			##	Seçili veritabanı girişlerinin en düşük değerini verir.
-DPRODUCT		= VSEÇÇARP			##	Kayıtların belli bir alanında bulunan, bir veritabanındaki ölçütlerle eşleşen değerleri çarpar.
-DSTDEV			= VSEÇSTDSAPMA		##	Seçili veritabanı girişlerinden oluşan bir örneğe dayanarak, standart sapmayı tahmin eder.
-DSTDEVP			= VSEÇSTDSAPMAS		##	Standart sapmayı, seçili veritabanı girişlerinin tüm popülasyonunu esas alarak hesaplar.
-DSUM			= VSEÇTOPLA			##	Kayıtların alan sütununda bulunan, ölçütle eşleşen sayıları toplar.
-DVAR			= VSEÇVAR			##	Seçili veritabanı girişlerinden oluşan bir örneği esas alarak farkı tahmin eder.
-DVARP			= VSEÇVARS			##	Seçili veritabanı girişlerinin tüm popülasyonunu esas alarak farkı hesaplar.
-
-
-##
-##	Date and time functions				Tarih ve saat işlevleri
-##
-DATE			= TARİH				##	Belirli bir tarihin seri numarasını verir.
-DATEVALUE		= TARİHSAYISI		##	Metin biçimindeki bir tarihi seri numarasına dönüştürür.
-DAY				= GÜN				##	Seri numarasını, ayın bir gününe dönüştürür.
-DAYS360			= GÜN360			##	İki tarih arasındaki gün sayısını, 360 günlük yılı esas alarak hesaplar.
-EDATE			= SERİTARİH			##	Başlangıç tarihinden itibaren, belirtilen ay sayısından önce veya sonraki tarihin seri numarasını verir.
-EOMONTH			= SERİAY			##	Belirtilen sayıda ay önce veya sonraki ayın son gününün seri numarasını verir.
-HOUR			= SAAT				##	Bir seri numarasını saate dönüştürür.
-MINUTE			= DAKİKA			##	Bir seri numarasını dakikaya dönüştürür.
-MONTH			= AY				##	Bir seri numarasını aya dönüştürür.
-NETWORKDAYS		= TAMİŞGÜNÜ			##	İki tarih arasındaki tam çalışma günlerinin sayısını verir.
-NOW				= ŞİMDİ				##	Geçerli tarihin ve saatin seri numarasını verir.
-SECOND			= SANİYE			##	Bir seri numarasını saniyeye dönüştürür.
-TIME			= ZAMAN				##	Belirli bir zamanın seri numarasını verir.
-TIMEVALUE		= ZAMANSAYISI		##	Metin biçimindeki zamanı seri numarasına dönüştürür.
-TODAY			= BUGÜN				##	Bugünün tarihini seri numarasına dönüştürür.
-WEEKDAY			= HAFTANINGÜNÜ		##	Bir seri numarasını, haftanın gününe dönüştürür.
-WEEKNUM			= HAFTASAY			##	Dizisel değerini, haftanın yıl içinde bulunduğu konumu sayısal olarak gösteren sayıya dönüştürür.
-WORKDAY			= İŞGÜNÜ			##	Belirtilen sayıda çalışma günü öncesinin ya da sonrasının tarihinin seri numarasını verir.
-YEAR			= YIL				##	Bir seri numarasını yıla dönüştürür.
-YEARFRAC		= YILORAN			##	Başlangıç_tarihi ve bitiş_tarihi arasındaki tam günleri gösteren yıl kesrini verir.
-
-
-##
-##	Engineering functions				Mühendislik işlevleri
-##
-BESSELI			= BESSELI			##	Değiştirilmiş Bessel fonksiyonu In(x)'i verir.
-BESSELJ			= BESSELJ			##	Bessel fonksiyonu Jn(x)'i verir.
-BESSELK			= BESSELK			##	Değiştirilmiş Bessel fonksiyonu Kn(x)'i verir.
-BESSELY			= BESSELY			##	Bessel fonksiyonu Yn(x)'i verir.
-BIN2DEC			= BIN2DEC			##	İkili bir sayıyı, ondalık sayıya dönüştürür.
-BIN2HEX			= BIN2HEX			##	İkili bir sayıyı, onaltılıya dönüştürür.
-BIN2OCT			= BIN2OCT			##	İkili bir sayıyı, sekizliye dönüştürür.
-COMPLEX			= KARMAŞIK			##	Gerçek ve sanal katsayıları, karmaşık sayıya dönüştürür.
-CONVERT			= ÇEVİR				##	Bir sayıyı, bir ölçüm sisteminden bir başka ölçüm sistemine dönüştürür.
-DEC2BIN			= DEC2BIN			##	Ondalık bir sayıyı, ikiliye dönüştürür.
-DEC2HEX			= DEC2HEX			##	Ondalık bir sayıyı, onaltılıya dönüştürür.
-DEC2OCT			= DEC2OCT			##	Ondalık bir sayıyı sekizliğe dönüştürür.
-DELTA			= DELTA				##	İki değerin eşit olup olmadığını sınar.
-ERF				= HATAİŞLEV			##	Hata işlevini verir.
-ERFC			= TÜMHATAİŞLEV		##	Tümleyici hata işlevini verir.
-GESTEP			= BESINIR			##	Bir sayının eşik değerinden büyük olup olmadığını sınar.
-HEX2BIN			= HEX2BIN			##	Onaltılı bir sayıyı ikiliye dönüştürür.
-HEX2DEC			= HEX2DEC			##	Onaltılı bir sayıyı ondalığa dönüştürür.
-HEX2OCT			= HEX2OCT			##	Onaltılı bir sayıyı sekizliğe dönüştürür.
-IMABS			= SANMUTLAK			##	Karmaşık bir sayının mutlak değerini (modül) verir.
-IMAGINARY		= SANAL				##	Karmaşık bir sayının sanal katsayısını verir.
-IMARGUMENT		= SANBAĞ_DEĞİŞKEN	##	Radyanlarla belirtilen bir açı olan teta bağımsız değişkenini verir.
-IMCONJUGATE		= SANEŞLENEK		##	Karmaşık bir sayının karmaşık eşleniğini verir.
-IMCOS			= SANCOS			##	Karmaşık bir sayının kosinüsünü verir.
-IMDIV			= SANBÖL			##	İki karmaşık sayının bölümünü verir.
-IMEXP			= SANÜS				##	Karmaşık bir sayının üssünü verir.
-IMLN			= SANLN				##	Karmaşık bir sayının doğal logaritmasını verir.
-IMLOG10			= SANLOG10			##	Karmaşık bir sayının, 10 tabanında logaritmasını verir.
-IMLOG2			= SANLOG2			##	Karmaşık bir sayının 2 tabanında logaritmasını verir.
-IMPOWER			= SANÜSSÜ			##	Karmaşık bir sayıyı, bir tamsayı üssüne yükseltilmiş olarak verir.
-IMPRODUCT		= SANÇARP			##	Karmaşık sayıların çarpımını verir.
-IMREAL			= SANGERÇEK			##	Karmaşık bir sayının, gerçek katsayısını verir.
-IMSIN			= SANSIN			##	Karmaşık bir sayının sinüsünü verir.
-IMSQRT			= SANKAREKÖK		##	Karmaşık bir sayının karekökünü verir.
-IMSUB			= SANÇIKAR			##	İki karmaşık sayının farkını verir.
-IMSUM			= SANTOPLA			##	Karmaşık sayıların toplamını verir.
-OCT2BIN			= OCT2BIN			##	Sekizli bir sayıyı ikiliye dönüştürür.
-OCT2DEC			= OCT2DEC			##	Sekizli bir sayıyı ondalığa dönüştürür.
-OCT2HEX			= OCT2HEX			##	Sekizli bir sayıyı onaltılıya dönüştürür.
-
-
-##
-##	Financial functions				Finansal fonksiyonlar
-##
-ACCRINT			= GERÇEKFAİZ		##	Dönemsel faiz ödeyen hisse senedine ilişkin tahakkuk eden faizi getirir.
-ACCRINTM		= GERÇEKFAİZV		##	Vadesinde ödeme yapan bir tahvilin tahakkuk etmiş faizini verir.
-AMORDEGRC		= AMORDEGRC			##	Yıpranma katsayısı kullanarak her hesap döneminin değer kaybını verir.
-AMORLINC		= AMORLINC			##	Her hesap dönemi içindeki yıpranmayı verir.
-COUPDAYBS		= KUPONGÜNBD		##	Kupon süresinin başlangıcından alış tarihine kadar olan süredeki gün sayısını verir.
-COUPDAYS		= KUPONGÜN			##	Kupon süresindeki, gün sayısını, alış tarihini de içermek üzere, verir.
-COUPDAYSNC		= KUPONGÜNDSK		##	Alış tarihinden bir sonraki kupon tarihine kadar olan gün sayısını verir.
-COUPNCD			= KUPONGÜNSKT		##	Alış tarihinden bir sonraki kupon tarihini verir.
-COUPNUM			= KUPONSAYI			##	Alış tarihiyle vade tarihi arasında ödenecek kuponların sayısını verir.
-COUPPCD			= KUPONGÜNÖKT		##	Alış tarihinden bir önceki kupon tarihini verir.
-CUMIPMT			= AİÇVERİMORANI		##	İki dönem arasında ödenen kümülatif faizi verir.
-CUMPRINC		= ANA_PARA_ÖDEMESİ	##	İki dönem arasında bir borç üzerine ödenen birikimli temeli verir.
-DB				= AZALANBAKİYE		##	Bir malın belirtilen bir süre içindeki yıpranmasını, sabit azalan bakiye yöntemini kullanarak verir.
-DDB				= ÇİFTAZALANBAKİYE	##	Bir malın belirtilen bir süre içindeki yıpranmasını, çift azalan bakiye yöntemi ya da sizin belirttiğiniz başka bir yöntemi kullanarak verir.
-DISC			= İNDİRİM			##	Bir tahvilin indirim oranını verir.
-DOLLARDE		= LİRAON			##	Kesir olarak tanımlanmış lira fiyatını, ondalık sayı olarak tanımlanmış lira fiyatına dönüştürür.
-DOLLARFR		= LİRAKES			##	Ondalık sayı olarak tanımlanmış lira fiyatını, kesir olarak tanımlanmış lira fiyatına dönüştürür.
-DURATION		= SÜRE				##	Belli aralıklarla faiz ödemesi yapan bir tahvilin yıllık süresini verir.
-EFFECT			= ETKİN				##	Efektif yıllık faiz oranını verir.
-FV				= ANBD				##	Bir yatırımın gelecekteki değerini verir.
-FVSCHEDULE		= GDPROGRAM			##	Bir seri birleşik faiz oranı uyguladıktan sonra, bir başlangıçtaki anaparanın gelecekteki değerini verir.
-INTRATE			= FAİZORANI			##	Tam olarak yatırım yapılmış bir tahvilin faiz oranını verir.
-IPMT			= FAİZTUTARI		##	Bir yatırımın verilen bir süre için faiz ödemesini verir.
-IRR				= İÇ_VERİM_ORANI	##	Bir para akışı serisi için, iç verim oranını verir.
-ISPMT			= ISPMT				##	Yatırımın belirli bir dönemi boyunca ödenen faizi hesaplar.
-MDURATION		= MSÜRE				##	Varsayılan par değeri 10.000.000 lira olan bir tahvil için Macauley değiştirilmiş süreyi verir.
-MIRR			= D_İÇ_VERİM_ORANI	##	Pozitif ve negatif para akışlarının farklı oranlarda finanse edildiği durumlarda, iç verim oranını verir.
-NOMINAL			= NOMİNAL			##	Yıllık nominal faiz oranını verir.
-NPER			= DÖNEM_SAYISI		##	Bir yatırımın dönem sayısını verir.
-NPV				= NBD				##	Bir yatırımın bugünkü net değerini, bir dönemsel para akışları serisine ve bir indirim oranına bağlı olarak verir.
-ODDFPRICE		= TEKYDEĞER			##	Tek bir ilk dönemi olan bir tahvilin değerini, her 100.000.000 lirada bir verir.
-ODDFYIELD		= TEKYÖDEME			##	Tek bir ilk dönemi olan bir tahvilin ödemesini verir.
-ODDLPRICE		= TEKSDEĞER			##	Tek bir son dönemi olan bir tahvilin fiyatını her 10.000.000 lirada bir verir.
-ODDLYIELD		= TEKSÖDEME			##	Tek bir son dönemi olan bir tahvilin ödemesini verir.
-PMT				= DEVRESEL_ÖDEME	##	Bir yıllık dönemsel ödemeyi verir.
-PPMT			= ANA_PARA_ÖDEMESİ	##	Verilen bir süre için, bir yatırımın anaparasına dayanan ödemeyi verir.
-PRICE			= DEĞER				##	Dönemsel faiz ödeyen bir tahvilin fiyatını 10.000.00 liralık değer başına verir.
-PRICEDISC		= DEĞERİND			##	İndirimli bir tahvilin fiyatını 10.000.000 liralık nominal değer başına verir.
-PRICEMAT		= DEĞERVADE			##	Faizini vade sonunda ödeyen bir tahvilin fiyatını 10.000.000 nominal değer başına verir.
-PV				= BD				##	Bir yatırımın bugünkü değerini verir.
-RATE			= FAİZ_ORANI		##	Bir yıllık dönem başına düşen faiz oranını verir.
-RECEIVED		= GETİRİ			##	Tam olarak yatırılmış bir tahvilin vadesinin bitiminde alınan miktarı verir.
-SLN				= DA				##	Bir malın bir dönem içindeki doğrusal yıpranmasını verir.
-SYD				= YAT				##	Bir malın belirli bir dönem için olan amortismanını verir.
-TBILLEQ			= HTAHEŞ			##	Bir Hazine bonosunun bono eşdeğeri ödemesini verir.
-TBILLPRICE		= HTAHDEĞER			##	Bir Hazine bonosunun değerini, 10.000.000 liralık nominal değer başına verir.
-TBILLYIELD		= HTAHÖDEME			##	Bir Hazine bonosunun ödemesini verir.
-VDB				= DAB				##	Bir malın amortismanını, belirlenmiş ya da kısmi bir dönem için, bir azalan bakiye yöntemi kullanarak verir.
-XIRR			= AİÇVERİMORANI		##	Dönemsel olması gerekmeyen bir para akışları programı için, iç verim oranını verir.
-XNPV			= ANBD				##	Dönemsel olması gerekmeyen bir para akışları programı için, bugünkü net değeri verir.
-YIELD			= ÖDEME				##	Belirli aralıklarla faiz ödeyen bir tahvilin ödemesini verir.
-YIELDDISC		= ÖDEMEİND			##	İndirimli bir tahvilin yıllık ödemesini verir; örneğin, bir Hazine bonosunun.
-YIELDMAT		= ÖDEMEVADE			##	Vadesinin bitiminde faiz ödeyen bir tahvilin yıllık ödemesini verir.
-
-
-##
-##	Information functions				Bilgi fonksiyonları
-##
-CELL			= HÜCRE			##	Bir hücrenin biçimlendirmesi, konumu ya da içeriği hakkında bilgi verir.
-ERROR.TYPE		= HATA.TİPİ		##	Bir hata türüne ilişkin sayıları verir.
-INFO			= BİLGİ			##	Geçerli işletim ortamı hakkında bilgi verir.
-ISBLANK			= EBOŞSA		##	Değer boşsa, DOĞRU verir.
-ISERR			= EHATA			##	Değer, #YOK dışındaki bir hata değeriyse, DOĞRU verir.
-ISERROR			= EHATALIYSA	##	Değer, herhangi bir hata değeriyse, DOĞRU verir.
-ISEVEN			= ÇİFTTİR		##	Sayı çiftse, DOĞRU verir.
-ISLOGICAL		= EMANTIKSALSA	##	Değer, mantıksal bir değerse, DOĞRU verir.
-ISNA			= EYOKSA		##	Değer, #YOK hata değeriyse, DOĞRU verir.
-ISNONTEXT		= EMETİNDEĞİLSE	##	Değer, metin değilse, DOĞRU verir.
-ISNUMBER		= ESAYIYSA		##	Değer, bir sayıysa, DOĞRU verir.
-ISODD			= TEKTİR		##	Sayı tekse, DOĞRU verir.
-ISREF			= EREFSE		##	Değer bir başvuruysa, DOĞRU verir.
-ISTEXT			= EMETİNSE		##	Değer bir metinse DOĞRU verir.
-N				= N				##	Sayıya dönüştürülmüş bir değer verir.
-NA				= YOKSAY		##	#YOK hata değerini verir.
-TYPE			= TİP			##	Bir değerin veri türünü belirten bir sayı verir.
-
-
-##
-##	Logical functions				Mantıksal fonksiyonlar
-##
-AND				= VE			##	Bütün bağımsız değişkenleri DOĞRU ise, DOĞRU verir.
-FALSE			= YANLIŞ		##	YANLIŞ mantıksal değerini verir.
-IF				= EĞER			##	Gerçekleştirilecek bir mantıksal sınama belirtir.
-IFERROR			= EĞERHATA		##	Formül hatalıysa belirttiğiniz değeri verir; bunun dışındaki durumlarda formülün sonucunu verir.
-NOT				= DEĞİL			##	Bağımsız değişkeninin mantığını tersine çevirir.
-OR				= YADA			##	Bağımsız değişkenlerden herhangi birisi DOĞRU ise, DOĞRU verir.
-TRUE			= DOĞRU			##	DOĞRU mantıksal değerini verir.
-
-
-##
-##	Lookup and reference functions			Arama ve Başvuru fonksiyonları
-##
-ADDRESS			= ADRES				##	Bir başvuruyu, çalışma sayfasındaki tek bir hücreye metin olarak verir.
-AREAS			= ALANSAY			##	Renvoie le nombre de zones dans une référence.
-CHOOSE			= ELEMAN			##	Değerler listesinden bir değer seçer.
-COLUMN			= SÜTUN				##	Bir başvurunun sütun sayısını verir.
-COLUMNS			= SÜTUNSAY			##	Bir başvurudaki sütunların sayısını verir.
-HLOOKUP			= YATAYARA			##	Bir dizinin en üst satırına bakar ve belirtilen hücrenin değerini verir.
-HYPERLINK		= KÖPRÜ				##	Bir ağ sunucusunda, bir intranette ya da Internet'te depolanan bir belgeyi açan bir kısayol ya da atlama oluşturur.
-INDEX			= İNDİS				##	Başvurudan veya diziden bir değer seçmek için, bir dizin kullanır.
-INDIRECT		= DOLAYLI			##	Metin değeriyle belirtilen bir başvuru verir.
-LOOKUP			= ARA				##	Bir vektördeki veya dizideki değerleri arar.
-MATCH			= KAÇINCI			##	Bir başvurudaki veya dizideki değerleri arar.
-OFFSET			= KAYDIR			##	Verilen bir başvurudan, bir başvuru kaydırmayı verir.
-ROW				= SATIR				##	Bir başvurunun satır sayısını verir.
-ROWS			= SATIRSAY			##	Bir başvurudaki satırların sayısını verir.
-RTD				= RTD				##	COM otomasyonunu destekleyen programdan gerçek zaman verileri alır.
-TRANSPOSE		= DEVRİK_DÖNÜŞÜM	##	Bir dizinin devrik dönüşümünü verir.
-VLOOKUP			= DÜŞEYARA			##	Bir dizinin ilk sütununa bakar ve bir hücrenin değerini vermek için satır boyunca hareket eder.
-
-
-##
-##	Math and trigonometry functions			Matematik ve trigonometri fonksiyonları
-##
-ABS				= MUTLAK			##	Bir sayının mutlak değerini verir.
-ACOS			= ACOS				##	Bir sayının ark kosinüsünü verir.
-ACOSH			= ACOSH				##	Bir sayının ters hiperbolik kosinüsünü verir.
-ASIN			= ASİN				##	Bir sayının ark sinüsünü verir.
-ASINH			= ASİNH				##	Bir sayının ters hiperbolik sinüsünü verir.
-ATAN			= ATAN				##	Bir sayının ark tanjantını verir.
-ATAN2			= ATAN2				##	Ark tanjantı, x- ve y- koordinatlarından verir.
-ATANH			= ATANH				##	Bir sayının ters hiperbolik tanjantını verir.
-CEILING			= TAVANAYUVARLA		##	Bir sayıyı, en yakın tamsayıya ya da en yakın katına yuvarlar.
-COMBIN			= KOMBİNASYON		##	Verilen sayıda öğenin kombinasyon sayısını verir.
-COS				= COS				##	Bir sayının kosinüsünü verir.
-COSH			= COSH				##	Bir sayının hiperbolik kosinüsünü verir.
-DEGREES			= DERECE			##	Radyanları dereceye dönüştürür.
-EVEN			= ÇİFT				##	Bir sayıyı, en yakın daha büyük çift tamsayıya yuvarlar.
-EXP				= ÜS				##	e'yi, verilen bir sayının üssüne yükseltilmiş olarak verir.
-FACT			= ÇARPINIM			##	Bir sayının faktörünü verir.
-FACTDOUBLE		= ÇİFTFAKTÖR		##	Bir sayının çift çarpınımını verir.
-FLOOR			= TABANAYUVARLA		##	Bir sayıyı, daha küçük sayıya, sıfıra yakınsayarak yuvarlar.
-GCD				= OBEB				##	En büyük ortak böleni verir.
-INT				= TAMSAYI			##	Bir sayıyı aşağıya doğru en yakın tamsayıya yuvarlar.
-LCM				= OKEK				##	En küçük ortak katı verir.
-LN				= LN				##	Bir sayının doğal logaritmasını verir.
-LOG				= LOG				##	Bir sayının, belirtilen bir tabandaki logaritmasını verir.
-LOG10			= LOG10				##	Bir sayının 10 tabanında logaritmasını verir.
-MDETERM			= DETERMİNANT		##	Bir dizinin dizey determinantını verir.
-MINVERSE		= DİZEY_TERS		##	Bir dizinin dizey tersini verir.
-MMULT			= DÇARP				##	İki dizinin dizey çarpımını verir.
-MOD				= MODÜLO			##	Bölmeden kalanı verir.
-MROUND			= KYUVARLA			##	İstenen kata yuvarlanmış bir sayı verir.
-MULTINOMIAL		= ÇOKTERİMLİ		##	Bir sayılar kümesinin çok terimlisini verir.
-ODD				= TEK				##	Bir sayıyı en yakın daha büyük tek sayıya yuvarlar.
-PI				= Pİ				##	Pi değerini verir.
-POWER			= KUVVET			##	Bir üsse yükseltilmiş sayının sonucunu verir.
-PRODUCT			= ÇARPIM			##	Bağımsız değişkenlerini çarpar.
-QUOTIENT		= BÖLÜM				##	Bir bölme işleminin tamsayı kısmını verir.
-RADIANS			= RADYAN			##	Dereceleri radyanlara dönüştürür.
-RAND			= S_SAYI_ÜRET		##	0 ile 1 arasında rastgele bir sayı verir.
-RANDBETWEEN		= RASTGELEARALIK	##	Belirttiğiniz sayılar arasında rastgele bir sayı verir.
-ROMAN			= ROMEN				##	Bir normal rakamı, metin olarak, romen rakamına çevirir.
-ROUND			= YUVARLA			##	Bir sayıyı, belirtilen basamak sayısına yuvarlar.
-ROUNDDOWN		= AŞAĞIYUVARLA		##	Bir sayıyı, daha küçük sayıya, sıfıra yakınsayarak yuvarlar.
-ROUNDUP			= YUKARIYUVARLA		##	Bir sayıyı daha büyük sayıya, sıfırdan ıraksayarak yuvarlar.
-SERIESSUM		= SERİTOPLA			##	Bir üs serisinin toplamını, formüle bağlı olarak verir.
-SIGN			= İŞARET			##	Bir sayının işaretini verir.
-SIN				= SİN				##	Verilen bir açının sinüsünü verir.
-SINH			= SİNH				##	Bir sayının hiperbolik sinüsünü verir.
-SQRT			= KAREKÖK			##	Pozitif bir karekök verir.
-SQRTPI			= KAREKÖKPİ			##	(* Pi sayısının) kare kökünü verir.
-SUBTOTAL		= ALTTOPLAM			##	Bir listedeki ya da veritabanındaki bir alt toplamı verir.
-SUM				= TOPLA				##	Bağımsız değişkenlerini toplar.
-SUMIF			= ETOPLA			##	Verilen ölçütle belirlenen hücreleri toplar.
-SUMIFS			= SUMIFS			##	Bir aralıktaki, birden fazla ölçüte uyan hücreleri ekler.
-SUMPRODUCT		= TOPLA.ÇARPIM		##	İlişkili dizi bileşenlerinin çarpımlarının toplamını verir.
-SUMSQ			= TOPKARE			##	Bağımsız değişkenlerin karelerinin toplamını verir.
-SUMX2MY2		= TOPX2EY2			##	İki dizideki ilişkili değerlerin farkının toplamını verir.
-SUMX2PY2		= TOPX2AY2			##	İki dizideki ilişkili değerlerin karelerinin toplamının toplamını verir.
-SUMXMY2			= TOPXEY2			##	İki dizideki ilişkili değerlerin farklarının karelerinin toplamını verir.
-TAN				= TAN				##	Bir sayının tanjantını verir.
-TANH			= TANH				##	Bir sayının hiperbolik tanjantını verir.
-TRUNC			= NSAT				##	Bir sayının, tamsayı durumuna gelecek şekilde, fazlalıklarını atar.
-
-
-##
-##	Statistical functions				İstatistiksel fonksiyonlar
-##
-AVEDEV			= ORTSAP			##	Veri noktalarının ortalamalarından mutlak sapmalarının ortalamasını verir.
-AVERAGE			= ORTALAMA			##	Bağımsız değişkenlerinin ortalamasını verir.
-AVERAGEA		= ORTALAMAA			##	Bağımsız değişkenlerinin, sayılar, metin ve mantıksal değerleri içermek üzere ortalamasını verir.
-AVERAGEIF		= EĞERORTALAMA 		##	Verili ölçütü karşılayan bir aralıktaki bütün hücrelerin ortalamasını (aritmetik ortalama) hesaplar.
-AVERAGEIFS		= EĞERLERORTALAMA 	##	Birden çok ölçüte uyan tüm hücrelerin ortalamasını (aritmetik ortalama) hesaplar.
-BETADIST		= BETADAĞ			##	Beta birikimli dağılım fonksiyonunu verir.
-BETAINV			= BETATERS			##	Belirli bir beta dağılımı için birikimli dağılım fonksiyonunun tersini verir.
-BINOMDIST		= BİNOMDAĞ			##	Tek terimli binom dağılımı olasılığını verir.
-CHIDIST			= KİKAREDAĞ			##	Kikare dağılımın tek kuyruklu olasılığını verir.
-CHIINV			= KİKARETERS		##	Kikare dağılımın kuyruklu olasılığının tersini verir.
-CHITEST			= KİKARETEST		##	Bağımsızlık sınamalarını verir.
-CONFIDENCE		= GÜVENİRLİK		##	Bir popülasyon ortalaması için güvenirlik aralığını verir.
-CORREL			= KORELASYON		##	İki veri kümesi arasındaki bağlantı katsayısını verir.
-COUNT			= BAĞ_DEĞ_SAY		##	Bağımsız değişkenler listesinde kaç tane sayı bulunduğunu sayar.
-COUNTA			= BAĞ_DEĞ_DOLU_SAY	##	Bağımsız değişkenler listesinde kaç tane değer bulunduğunu sayar.
-COUNTBLANK		= BOŞLUKSAY 		##	Aralıktaki boş hücre sayısını hesaplar.
-COUNTIF			= EĞERSAY 			##	Verilen ölçütlere uyan bir aralık içindeki hücreleri sayar.
-COUNTIFS		= ÇOKEĞERSAY 		##	Birden çok ölçüte uyan bir aralık içindeki hücreleri sayar.
-COVAR			= KOVARYANS 		##	Eşleştirilmiş sapmaların ortalaması olan kovaryansı verir.
-CRITBINOM		= KRİTİKBİNOM		##	Birikimli binom dağılımının bir ölçüt değerinden küçük veya ölçüt değerine eşit olduğu en küçük değeri verir.
-DEVSQ			= SAPKARE			##	Sapmaların karelerinin toplamını verir.
-EXPONDIST		= ÜSTELDAĞ			##	Üstel dağılımı verir.
-FDIST			= FDAĞ				##	F olasılık dağılımını verir.
-FINV			= FTERS				##	F olasılık dağılımının tersini verir.
-FISHER			= FISHER			##	Fisher dönüşümünü verir.
-FISHERINV		= FISHERTERS		##	Fisher dönüşümünün tersini verir.
-FORECAST		= TAHMİN			##	Bir doğrusal eğilim boyunca bir değer verir.
-FREQUENCY		= SIKLIK			##	Bir sıklık dağılımını, dikey bir dizi olarak verir.
-FTEST			= FTEST				##	Bir F-test'in sonucunu verir.
-GAMMADIST		= GAMADAĞ			##	Gama dağılımını verir.
-GAMMAINV		= GAMATERS			##	Gama kümülatif dağılımının tersini verir.
-GAMMALN			= GAMALN			##	Gama fonksiyonunun (?(x)) doğal logaritmasını verir.
-GEOMEAN			= GEOORT			##	Geometrik ortayı verir.
-GROWTH			= BÜYÜME			##	Üstel bir eğilim boyunca değerler verir.
-HARMEAN			= HARORT			##	Harmonik ortayı verir.
-HYPGEOMDIST		= HİPERGEOMDAĞ		##	Hipergeometrik dağılımı verir.
-INTERCEPT		= KESMENOKTASI		##	Doğrusal çakıştırma çizgisinin kesişme noktasını verir.
-KURT			= BASIKLIK			##	Bir veri kümesinin basıklığını verir.
-LARGE			= BÜYÜK				##	Bir veri kümesinde k. en büyük değeri verir.
-LINEST			= DOT				##	Doğrusal bir eğilimin parametrelerini verir.
-LOGEST			= LOT				##	Üstel bir eğilimin parametrelerini verir.
-LOGINV			= LOGTERS			##	Bir lognormal dağılımının tersini verir.
-LOGNORMDIST		= LOGNORMDAĞ		##	Birikimli lognormal dağılımını verir.
-MAX				= MAK				##	Bir bağımsız değişkenler listesindeki en büyük değeri verir.
-MAXA			= MAKA				##	Bir bağımsız değişkenler listesindeki, sayılar, metin ve mantıksal değerleri içermek üzere, en büyük değeri verir.
-MEDIAN			= ORTANCA			##	Belirtilen sayıların orta değerini verir.
-MIN				= MİN				##	Bir bağımsız değişkenler listesindeki en küçük değeri verir.
-MINA			= MİNA				##	Bir bağımsız değişkenler listesindeki, sayılar, metin ve mantıksal değerleri de içermek üzere, en küçük değeri verir.
-MODE			= ENÇOK_OLAN		##	Bir veri kümesindeki en sık rastlanan değeri verir.
-NEGBINOMDIST	= NEGBİNOMDAĞ		##	Negatif binom dağılımını verir.
-NORMDIST		= NORMDAĞ			##	Normal birikimli dağılımı verir.
-NORMINV			= NORMTERS			##	Normal kümülatif dağılımın tersini verir.
-NORMSDIST		= NORMSDAĞ			##	Standart normal birikimli dağılımı verir.
-NORMSINV		= NORMSTERS			##	Standart normal birikimli dağılımın tersini verir.
-PEARSON			= PEARSON			##	Pearson çarpım moment korelasyon katsayısını verir.
-PERCENTILE		= YÜZDEBİRLİK		##	Bir aralık içerisinde bulunan değerlerin k. frekans toplamını verir.
-PERCENTRANK		= YÜZDERANK			##	Bir veri kümesindeki bir değerin yüzde mertebesini verir.
-PERMUT			= PERMÜTASYON		##	Verilen sayıda nesne için permütasyon sayısını verir.
-POISSON			= POISSON			##	Poisson dağılımını verir.
-PROB			= OLASILIK			##	Bir aralıktaki değerlerin iki sınır arasında olması olasılığını verir.
-QUARTILE		= DÖRTTEBİRLİK		##	Bir veri kümesinin dörtte birliğini verir.
-RANK			= RANK				##	Bir sayılar listesinde bir sayının mertebesini verir.
-RSQ				= RKARE				##	Pearson çarpım moment korelasyon katsayısının karesini verir.
-SKEW			= ÇARPIKLIK			##	Bir dağılımın çarpıklığını verir.
-SLOPE			= EĞİM				##	Doğrusal çakışma çizgisinin eğimini verir.
-SMALL			= KÜÇÜK				##	Bir veri kümesinde k. en küçük değeri verir.
-STANDARDIZE		= STANDARTLAŞTIRMA	##	Normalleştirilmiş bir değer verir.
-STDEV			= STDSAPMA			##	Bir örneğe dayanarak standart sapmayı tahmin eder.
-STDEVA			= STDSAPMAA			##	Standart sapmayı, sayılar, metin ve mantıksal değerleri içermek üzere, bir örneğe bağlı olarak tahmin eder.
-STDEVP			= STDSAPMAS			##	Standart sapmayı, tüm popülasyona bağlı olarak hesaplar.
-STDEVPA			= STDSAPMASA		##	Standart sapmayı, sayılar, metin ve mantıksal değerleri içermek üzere, tüm popülasyona bağlı olarak hesaplar.
-STEYX			= STHYX				##	Regresyondaki her x için tahmini y değerinin standart hatasını verir.
-TDIST			= TDAĞ				##	T-dağılımını verir.
-TINV			= TTERS				##	T-dağılımının tersini verir.
-TREND			= EĞİLİM			##	Doğrusal bir eğilim boyunca değerler verir.
-TRIMMEAN		= KIRPORTALAMA		##	Bir veri kümesinin içinin ortalamasını verir.
-TTEST			= TTEST				##	T-test'le ilişkilendirilmiş olasılığı verir.
-VAR				= VAR				##	Varyansı, bir örneğe bağlı olarak tahmin eder.
-VARA			= VARA				##	Varyansı, sayılar, metin ve mantıksal değerleri içermek üzere, bir örneğe bağlı olarak tahmin eder.
-VARP			= VARS				##	Varyansı, tüm popülasyona dayanarak hesaplar.
-VARPA			= VARSA				##	Varyansı, sayılar, metin ve mantıksal değerleri içermek üzere, tüm popülasyona bağlı olarak hesaplar.
-WEIBULL			= WEIBULL			##	Weibull dağılımını hesaplar.
-ZTEST			= ZTEST				##	Z-testinin tek kuyruklu olasılık değerini hesaplar.
-
-
-##
-##	Text functions					Metin fonksiyonları
-##
-ASC				= ASC 				##	Bir karakter dizesindeki çift enli (iki bayt) İngilizce harfleri veya katakanayı yarım enli (tek bayt) karakterlerle değiştirir.
-BAHTTEXT		= BAHTTEXT 			##	Sayıyı, ß (baht) para birimi biçimini kullanarak metne dönüştürür.
-CHAR			= DAMGA 			##	Kod sayısıyla belirtilen karakteri verir.
-CLEAN			= TEMİZ				##	Metindeki bütün yazdırılamaz karakterleri kaldırır.
-CODE			= KOD				##	Bir metin dizesindeki ilk karakter için sayısal bir kod verir.
-CONCATENATE		= BİRLEŞTİR			##	Pek çok metin öğesini bir metin öğesi olarak birleştirir.
-DOLLAR			= LİRA				##	Bir sayıyı YTL (yeni Türk lirası) para birimi biçimini kullanarak metne dönüştürür.
-EXACT			= ÖZDEŞ				##	İki metin değerinin özdeş olup olmadığını anlamak için, değerleri denetler.
-FIND			= BUL				##	Bir metin değerini, bir başkasının içinde bulur (büyük küçük harf duyarlıdır).
-FINDB			= BULB				##	Bir metin değerini, bir başkasının içinde bulur (büyük küçük harf duyarlıdır).
-FIXED			= SAYIDÜZENLE		##	Bir sayıyı, sabit sayıda ondalıkla, metin olarak biçimlendirir.
-JIS				= JIS				##	Bir karakter dizesindeki tek enli (tek bayt) İngilizce harfleri veya katakanayı çift enli (iki bayt) karakterlerle değiştirir.
-LEFT			= SOL				##	Bir metin değerinden en soldaki karakterleri verir.
-LEFTB			= SOLB				##	Bir metin değerinden en soldaki karakterleri verir.
-LEN				= UZUNLUK			##	Bir metin dizesindeki karakter sayısını verir.
-LENB			= UZUNLUKB			##	Bir metin dizesindeki karakter sayısını verir.
-LOWER			= KÜÇÜKHARF			##	Metni küçük harfe çevirir.
-MID				= ORTA				##	Bir metin dizesinden belirli sayıda karakteri, belirttiğiniz konumdan başlamak üzere verir.
-MIDB			= ORTAB				##	Bir metin dizesinden belirli sayıda karakteri, belirttiğiniz konumdan başlamak üzere verir.
-PHONETIC		= SES				##	Metin dizesinden ses (furigana) karakterlerini ayıklar.
-PROPER			= YAZIM.DÜZENİ		##	Bir metin değerinin her bir sözcüğünün ilk harfini büyük harfe çevirir.
-REPLACE			= DEĞİŞTİR			##	Metnin içindeki karakterleri değiştirir.
-REPLACEB		= DEĞİŞTİRB			##	Metnin içindeki karakterleri değiştirir.
-REPT			= YİNELE			##	Metni belirtilen sayıda yineler.
-RIGHT			= SAĞ				##	Bir metin değerinden en sağdaki karakterleri verir.
-RIGHTB			= SAĞB				##	Bir metin değerinden en sağdaki karakterleri verir.
-SEARCH			= BUL				##	Bir metin değerini, bir başkasının içinde bulur (büyük küçük harf duyarlı değildir).
-SEARCHB			= BULB				##	Bir metin değerini, bir başkasının içinde bulur (büyük küçük harf duyarlı değildir).
-SUBSTITUTE		= YERİNEKOY			##	Bir metin dizesinde, eski metnin yerine yeni metin koyar.
-T				= M					##	Bağımsız değerlerini metne dönüştürür.
-TEXT			= METNEÇEVİR		##	Bir sayıyı biçimlendirir ve metne dönüştürür.
-TRIM			= KIRP				##	Metindeki boşlukları kaldırır.
-UPPER			= BÜYÜKHARF			##	Metni büyük harfe çevirir.
-VALUE			= SAYIYAÇEVİR		##	Bir metin bağımsız değişkenini sayıya dönüştürür.
diff --git a/htdocs/includes/phpoffice/phpexcel/changelog.txt b/htdocs/includes/phpoffice/phpexcel/changelog.txt
deleted file mode 100644
index 29377308d80..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/changelog.txt
+++ /dev/null
@@ -1,1430 +0,0 @@
-**************************************************************************************
-* PHPExcel
-*
-* Copyright (c) 2006 - 2014 PHPExcel
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*
-* @copyright  Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
-* @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
-* @version    1.8.1, 2015-04-30
-**************************************************************************************
-
-2015-04-30 (v1.8.1):
-- Bugfix:   (goncons)         Work Item GH-397  - Fix for Writing an Open Document cell with non-numeric formula
-- Bugfix:   (sarciszewski)    Work Item GH-329  - Avoid potential divide by zero in basedrawing
-- Bugfix:   (ymaerschalck)    Work Item GH-405  - XML External Entity (XXE) Processing, different behaviour between simplexml_load_string() and simplexml_load_file().
-- Bugfix:   (MBaker)                            - Fix to ensure that current cell is maintained when executing formula calculations
-- Bugfix:   (MBaker)          Work Item GH-350  - Keep/set the value on Reader _loadSheetsOnly as NULL, courtesy of Restless-ET 
-- Bugfix:   (MBaker)          Work Item CP18105 - Loading an Excel 2007 spreadsheet throws an "Autofilter must be set on a range of cells" exception
-- Bugfix:   (MBaker)          Work Item GH-388  - Fix to autoloader registration for backward compatibility with PHP 5.2.0 not accepting the prepend flag
-- Bugfix:   (MBaker)          Work Item GH-384  - DOM loadHTMLFile() failing with options flags when using PHP < 5.4.0
-- Bugfix:   (MBaker)                            - Fix for percentage operator in formulae for BIFF Writer
-- Bugfix:   (MBaker)                            - Fix to getStyle() call for cell object
-- Bugfix:   (MBaker)                            - Discard Autofilters in Excel2007 Reader when filter range isn't a valid range
-- Bugfix:   (frozenstupidity) Work Item GH-423  - Fix invalid NA return in VLOOKUP
-- Bugfix:   (wiseloren)       Work Item CP21454 - "No Impact" conditional formatting fix for NumberFormat
-- Bugfix:   (bobwitlox)       Work Item GH-467  - Bug in Excel2003XML reader, parsing merged cells
-- Bugfix:   (MBaker)          Work Item GH-302  - Fix for CEIL() and FLOOR() when number argument is zero
-- Bugfix:   (MBaker)                            - Remove cells cleanly when calling RemoveRow() or RemoveColumn()
-- General:  (MBaker)                            - Small performance improvement for autosize columns
-- General:  (frost-nzcr4)     Work Item GH-379  - Change the getter/setter for zeroHeight to camel case
-- General:  (MBaker)          Work Item GH-394  - DefaultValueBinder is too much aggressive when converting string to numeric
-- General:  (MBaker)                            - Default precalculate formulas to false for writers
-- General:  (MBaker)                            - Set default Cyclic Reference behaviour to 1 to eliminate exception when using a single cyclic iteration in formulae
-- General:  (MBaker)          Work Item GH-396  - Some Excel writer libraries erroneously use Codepage 21010 for UTF-16LE
-- Feature:  (WiktrzGE)        Work Item GH-404  - Methods to manage most of the existing options for Chart Axis, Major Grid-lines and Minor Grid-lines
-- Feature:  (frost-nzcr4)     Work Item GH-403  - ODS read/write comments in the cell
-- Feature:  (CQD)             Work Item GH-389  - Additional Mac CJK codepage definitions
-- Feature:  (bolovincev)      Work Item GH-269  - Update Worksheet.php getStyleByColumnAndRow() to allow a range of cells rather than just a single cell
-- Feature:  (MBaker)                            - New methods added for testing cell status within merge groups
-- Feature:  (cifren/MBaker)   Work Item GH-205  - Handling merge cells in HTML Reader
-- Feature:  (MBaker)                            - Helper to convert basic HTML markup to a Rich Text object
-- Feature:  (MBaker)                            - Improved Iterators
-                                                    New Column Iterator
-                                                    Support for row and column ranges
-                                                    Improved handling for next/prev
-- Security: (MBaker)                            - XML filescan in XML-based Readers to prevent XML Entity Expansion (XEE)
-                                                    (see http://projects.webappsec.org/w/page/13247002/XML%20Entity%20Expansion for an explanation of XEE injection) attacks
-                                                  Reference CVE-2015-3542 - Identification of problem courtesy of Dawid Golunski (Pentest Ltd.)
-
-
-                                                  2014-03-02 (v1.8.0):
-- Bugfix:   (MBaker)          Work item CP19830 - Undefined variable: fileHandle in CSV Reader
-- Bugfix:   (MBaker)          Work item CP19968 - Out of memory in style/supervisor.php
-- Bugfix:   (MBaker)                            - Style error with merged cells in PDF Writer
-- Bugfix:   (MBaker)                            - Problem with cloning worksheets
-- Bugfix:   (tavoarcila)      Work Item GH-259  - Bug fix reading Open Office files
-- Bugfix:   (MBaker)          Work item CP20397 - Serious bug in absolute cell reference used in shared formula
-                                                  Would also have affected insert/delete column/row
-- Bugfix:   (RomanSyroeshko)  Work Item GH-267  - CHOOSE() returns "#VALUE!" if the 1st entry is chosen
-- Bugfix:   (Gemorroj)        Work Item GH-268  - When duplicating styles, styles shifted by one column to the right
-                                                  Fix also applied to duplicating conditional styles
-- Bugfix:   (IndrekHaav)      Work Item GH-212  - Fix for formulae that reference a sheet whose name begins with a digit:
-                                                  these were erroneously identified as numeric values, causing the parser to throw an undefined variable error.
-- Bugfix:   (IndrekHaav)      Work Item CP16208 - Fixed undefined variable error due to $styleArray being used before it's initialised
-- Bugfix:   (PowerKiKi)       Work Item GH-273  - ISTEXT() return wrong result if referencing an empty but formatted cell
-- Bugfix:   (PowerKiKi)       Work Item GH-270/GH-31  - Binary comparison of strings are case insensitive
-- Bugfix:   (MBaker)          Work Item GH-275  - Insert New Row/Column Before is not correctly updating formula references
-- Bugfix:   (MBaker)          Work Item GH-257  - Passing an array of cells to _generateRow() in the HTML/PDF Writer causes caching problems with last cell in the range
-- Bugfix:   (MBaker)          Work Item GH-193  - Fix to empty worksheet garbage collection when using cell caching
-- Bugfix:   (Jazzo)           Work Item GH-248  - Excel2007 does not correctly mark rows as hidden
-- Bugfix:   (Roy Shahbazian)  Work Item GH-299  - Fixed typo in Chart/Layout set/getYMode()
-- Bugfix:   (EliuFlorez)      Work item GH-279  - Fatal error: Call to a member function cellExists() line: 3327 in calculation.php if referenced worksheet doesn't exist
-- Bugfix:   (MBaker)          Work Item GH-290  - AdvancedValueBinder "Division by zero"-error
-- Bugfix:   (MBaker)          Work Item CP20604 - Adding Sheet to Workbook Bug
-- Bugfix:   (MBaker)          Work item CP20703 - Calculation engine incorrectly evaluates empty cells as #VALUE
-- Bugfix:   (MBaker)          Work item CP20760 - Formula references to cell on another sheet in ODS files
-- Bugfix:   (MBaker)          Work item GH321,GH158,CP17824 - LibreOffice created XLSX files results in an empty file.
-- Feature:  (amerov)                            - Implementation of the Excel HLOOKUP() function
-- Feature:  (MBaker)                            - Added "Quote Prefix" to style settings (Excel2007 Reader and Writer only)
-- Feature:  (MBaker)                            - Added Horizontal FILL alignment for Excel5 and Excel2007 Readers/Writers, and Horizontal DISTRIBUTED alignment for Excel2007 Reader/Writer
-- Feature:  (trvrnrth)        Work Item GH-261  - Add support for reading protected (RC4 encrypted) .xls files
-- Feature:  (LWol)            Work Item GH-252  - Adding support for macros, Ribbon in Excel 2007
-- General:  (cdhutch)         Work item CP20055 - Remove array_shift in ReferenceHelper::insertNewBefore improves column or row delete speed
-- General:  (MBaker)                            - Improve stock chart handling and rendering, with help from Swashata Ghosh
-- General:  (MBaker)                            - Fix to calculation properties for Excel2007 so that the opening application will only recalculate on load if it's actually required
-- General:  (MBaker)                            - Modified Excel2007 Writer to default preCalculateFormulas to false
-                                                  Note that autosize columns will still recalculate affected formulae internally
-- General:  (dresenhista)     Work Item GH-242  - Functionality to getHighestRow() for a specified column, and getHighestColumn() for a specified row
-- General:  (adamriyadi)      Work Item GH-247  - Modify PHPExcel_Reader_Excel2007 to use zipClass from PHPExcel_Settings::getZipClass()
-                                                  This allows the use of PCLZip when reading for people that don't have access to ZipArchive
-- General:  (infojunkie)      Work Item GH-276  - Convert properties to string in OOCalc reader
-- Security: (maartenba)       Work Item GH-322  - Disable libxml external entity loading by default.
-                                                  This is to prevent XML External Entity Processing (XXE) injection attacks (see http://websec.io/2012/08/27/Preventing-XEE-in-PHP.html for an explanation of XXE injection).
-                                                  Reference CVE-2014-2054
-
-
-2013-06-02 (v1.7.9):
-- Feature:  (MBaker)    Include charts option for HTML Writer
-- Feature:  (MBaker)    Added composer file
-- Feature:  (MBaker)    Added getStyle() method to Cell object
-- Bugfix:   (Asker)     Work item 18777  - Error in PHPEXCEL/Calculation.php script on line 2976 (stack pop check)
-- Bugfix:   (MBaker)    Work item 18794  - CSV files without a file extension being identified as HTML
-- Bugfix:   (AndreKR)   Work item GH-66  - Wrong check for maximum number of rows in Excel5 Writer
-- Bugfix:   (MBaker)    Work item GH-67  - Cache directory for DiscISAM cache storage cannot be set
-- Bugfix:   (MBaker)    Work item 17976  - Fix to Excel2007 Reader for hyperlinks with an anchor fragment (following a #), otherwise they were treated as sheet references
-- Bugfix:   (MBaker)    Work item 18963  - getSheetNames() fails on numeric (floating point style) names with trailing zeroes
-- Bugfix:   (MBaker)    Work item GH-130 - Single cell print area
-- General:  (kea)       Work item GH-69  - Improved AdvancedValueBinder for currency
-- General:  (MBaker)    Work items 17936 and 17840 - Fix for environments where there is no access to /tmp but to upload_tmp_dir
-                        Provided an option to set the sys_get_temp_dir() call to use the upload_tmp_dir; though by default the standard temp directory will still be used
-- General:  (amironov ) Work item GH-84  - Search style by identity in PHPExcel_Worksheet::duplicateStyle()
-- General:  (karak)     Work item GH-85  - Fill SheetView IO in Excel5
-- General:  (cfhay)     Work item 18958  - Memory and Speed improvements in PHPExcel_Reader_Excel5
-- General:  (MBaker)    Work item GH-78  - Modify listWorksheetNames() and listWorksheetInfo to use XMLReader with streamed XML rather than SimpleXML
-- General:  (dbonsch)                      Restructuring of PHPExcel Exceptions
-- General:  (MBaker)    Work items 16926 and 15145 - Refactor Calculation Engine from singleton to a Multiton
-                        Ensures that calculation cache is maintained independently for different workbooks
-- General:  (MBaker)                       Modify cell's getCalculatedValue() method to return the content of RichText objects rather than the RichText object itself
-- Bugfix:   (techhead)  Work item GH-70  - Fixed formula/formatting bug when removing rows
-- Bugfix:   (alexgann)  Work item GH-63  - Fix to cellExists for non-existent namedRanges
-- Bugfix:   (MBaker)    Work item 18844  - cache_in_memory_gzip "eats" last worksheet line, cache_in_memory doesn't
-- Feature:  (Progi1984) Work item GH-22  - Sheet View in Excel5 Writer
-- Bugfix:   (amironov)  Work item GH-82  - PHPExcel_Worksheet::getCellCollection() may not return last cached cell
-- Bugfix:   (teso)      Work item 18551  - Rich Text containing UTF-8 characters creating unreadable content with Excel5 Writer
-- Bugfix:   (MBaker)    Work item GH-104 - echo statements in HTML.php
-- Feature:  (Progi1984) Work item GH-8/CP11704 : Conditional formatting in Excel 5 Writer
-- Bugfix:   (MBaker)    Work item GH-113 - canRead() Error for GoogleDocs ODS files: in ODS files from Google Docs there is no mimetype file
-- Bugfix:   (MBaker)    Work item GH-80  - "Sheet index is out of bounds." Exception
-- Bugfix:   (ccorliss)  Work item GH-105 - Fixed number format fatal error
-- Bugfix:   (MBaker)                     - Add DROP TABLE in destructor for SQLite and SQLite3 cache controllers
-- Bugfix:   (alexgann)  Work item GH-154 - Fix merged-cell borders on HTML/PDF output
-- Bugfix:   (Shanto)    Work item GH-161 - Fix: Hyperlinks break when removing rows
-- Bugfix:   (neclimdul) Work item GH-166 - Fix Extra Table Row From Images and Charts
-
-
-2012-10-12 (v1.7.8):
-- Special:  (kkamkou)    Phar builder script to add phar file as a distribution option
-- Feature:  (MBaker)     Refactor PDF Writer to allow use with a choice of PDF Rendering library
-                         rather than restricting to tcPDF
-                         Current options are tcPDF, mPDF, DomPDF
-                         tcPDF Library has now been removed from the deployment bundle
-- Feature:  (MBaker)     Initial version of HTML Reader
-- Feature:  (Progi1984) & (blazzy) Work items 9605 - Implement support for AutoFilter in PHPExcel_Writer_Excel5
-- Feature:  (MBaker)     Modified ERF and ERFC Engineering functions to accept Excel 2010's modified acceptance of negative arguments
-- Feature:  (k1LoW)      Support SheetView `view` attribute (Excel2007)
-- Feature:  (MBaker)     Excel compatibility option added for writing CSV files
-                         While Excel 2010 can read CSV files with a simple UTF-8 BOM, Excel2007 and earlier require UTF-16LE encoded tab-separated files.
-                         The new setExcelCompatibility(TRUE) option for the CSV Writer will generate files with this formatting for easy import into Excel2007 and below.
-- Feature:  (MBaker)     Language implementations for Turkish (tr)
-- Feature:  (MBaker)     Added fraction tests to advanced value binder
-- Feature:  (MBaker)     Allow call to font setUnderline() for underline format to specify a simple boolean for UNDERLINE_NONE or UNDERLINE_SINGLE
-- General:  (alexgann)   Add Currency detection to the Advanced Value Binder
-- General:  (MBaker)     Work item 18404 - setCellValueExplicitByColumnAndRow() do not return PHPExcel_Worksheet
-- General:  (MBaker)     Work item 18324 - Reader factory doesn't read anymore XLTX and XLT files
-- General:  (MBaker)     Magic __toString() method added to Cell object to return raw data value as a string
-- General:  (alexgann)   Add cell indent to html rendering
-- General:  (Raghav1981) ZeroHeight for rows in sheet format
-- Bugfix:   (cyberconte) Patch 12318 - OOCalc cells containing <text:span> inside the <text:p> tag
-- Bugfix:   (schir1964)  Fix to listWorksheetInfo() method for OOCalc Reader
-- Bugfix:   (MBaker)     Support for "e" (epoch) date format mask
-                         Rendered as a 4-digit CE year in non-Excel outputs
-- Bugfix:   (MBaker)     Work items 15799 and 18278 - Background color cell is always black when editing cell
-- Bugfix:   (MBaker)     Work items 15905 and 18183 - Allow "no impact" to formats on Conditional Formatting
-- Bugfix:   (wackonline) OOCalc Reader fix for NULL cells
-- Bugfix:   (seltzlab)   Fix to excel2007 Chart Writer when a $plotSeriesValues is empty
-- Bugfix:   (MBaker)     Various fixes to Chart handling
-- Bugfix:   (MBaker)     Work item 18370 - Error loading xlsx file with column breaks
-- Bugfix:   (MBaker)     OOCalc Reader now handles percentage and currency data types
-- Bugfix:   (MBaker)     Work Item 18415 - mb_stripos empty delimiter
-- Bugfix:   (takaakik)   Work Item 15455 - getNestingLevel() Error on Excel5 Read
-- Bugfix:   (MBaker)     Fix to Excel5 Reader when cell annotations are defined before their referenced text objects
-- Bugfix:   (MBaker)     OOCalc Reader modified to process number-rows-repeated
-- Bugfix:   (MBaker)     Work item 18377 - Chart Title compatibility on Excel 2007
-- Bugfix:   (MBaker)     Work item 18146 - Chart Refresh returning cell reference rather than values
-- Bugfix:   (MBaker)     Work item 18145 - Autoshape being identified in twoCellAnchor when includeCharts is TRUE triggering load error
-- Bugfix:   (MBaker)     Work item 18325 - v-type texts for series labels now recognised and parsed correctly
-- Bugfix:   (wolf5x)     Work item 18492 - load file failed if the file has no extensionType
-- Bugfix:   (dverspui)   Pattern fill colours in Excel2007 Style Writer
-- Bugfix:   (MBaker)     Excel2007 Writer order of font style elements to conform with Excel2003 using compatibility pack
-- Bugfix:   (MBaker)     Work item 18425 - Problems with $_activeSheetIndex when decreased below 0.
-- Bugfix:   (MBaker)     Work item 18597 - PHPExcel_CachedObjectStorage_SQLite3::cacheMethodIsAvailable() uses class_exists - autoloader throws error
-- Bugfix:   (MBaker)     Work item 18598 - Cannot access private property PHPExcel_CachedObjectStorageFactory::$_cacheStorageMethod
-- Bugfix:   (MBaker)     Work item 18397 - Data titles for charts
-                         PHPExcel_Chart_Layout now has methods for getting/setting switches for displaying/hiding chart data labels
-- Bugfix:   (MBaker)     Discard single cell merge ranges when reading (stupid that Excel allows them in the first place)
-- Bugfix:   (MBaker)     Discard hidden autoFilter named ranges
-
-
-2012-05-19 (v1.7.7):
-- Bugfix:   (Progi1984) Work item 8916 - Support for Rich-Text in PHPExcel_Writer_Excel5
-- Bugfix:   (cyberconte) Work item 17471 - OOCalc cells contain same data bug?
-- Feature:  (schir1964) listWorksheetInfo() method added to Readers... courtesy of Christopher Mullins
-- Feature:  (MBaker)    Options for cell caching using Igbinary and SQLite/SQlite3.
-- Feature:  (MBaker)    Additional row iterator options: allow a start row to be defined in the constructor; seek(), and prev() methods added.
-- Feature:  (Progi1984) Work item 9759 - Implement document properties in Excel5 writer
-- Feature:  (MBaker)    Work item 16 - Implement chart functionality (EXPERIMENTAL)
-                        Initial definition of chart objects.
-                        Reading Chart definitions through the Excel2007 Reader
-                        Facility to render charts to images using the 3rd-party jpgraph library
-                        Writing Charts using the Excel2007 Writer
-- General:  (MBaker)    Fix to build to ensure that Examples are included with the documentation
-- General:  (MBaker)    Reduce cell caching overhead using dirty flag to ensure that cells are only rewritten to the cache if they have actually been changed
-- General:  (MBaker)    Improved memory usage in CSV Writer
-- General:  (MBaker)    Improved speed and memory usage in Excel5 Writer
-- General:  (MBaker)    Experimental -
-                        Added getHighestDataColumn(), getHighestDataRow(), getHighestRowAndColumn() and calculateWorksheetDataDimension() methods for the worksheet that return the highest row and column that have cell records
-- General:  (MBaker)    Change iterators to implement Iterator rather than extend CachingIterator, as a fix for PHP 5.4. changes in SPL
-- Bugfix:   (MBaker)    Work item 15459 - Invalid cell coordinate in Autofilter for Excel2007 Writer
-- Bugfix:   (MBaker)    Work item 15518 - PCLZip library issue
-- Bugfix:   (MBaker)    Work item 15537 - Excel2007 Reader canRead function bug
-- Bugfix:   (MBaker)    Support for Excel functions whose return can be used as either a value or as a cell reference depending on its context within a formula
-- Bugfix:   (gilles06)  Work item 15707 - ini_set() call in Calculation class destructor
-- Bugfix:   (MBaker)    Work item 15786 - RangeToArray strange array keys
-- Bugfix:   (MBaker)    Work item 15762 - INDIRECT() function doesn't work with named ranges
-- Bugfix:   (MBaker)    Locale-specific fix to text functions when passing a boolean argument instead of a string
-- Bugfix:   (MBaker)    Work item 16246 - reader/CSV fails on this file
-                        auto_detect_line_endings now set in CSV reader
-- Bugfix:   (MBaker)    Work item 16212 - $arguments improperly used in CachedObjectStorage/PHPTemp.php
-- Bugfix:   (MBaker)    Work item 16643 - Bug In Cache System (cell reference when throwing caching errors)
-- Bugfix:   (MBaker)    Work item 16895 - PHP Invalid index notice on writing excel file when active sheet has been deleted
-- Bugfix:   (MBaker)    Work item 16956 - External links in Excel2010 files cause Fatal error
-- Bugfix:   (MBaker)    Work item 16960 - Previous calculation engine error conditions trigger cyclic reference errors
-- Bugfix:   (mkopinsky) Work item 16266 - PHPExcel_Style::applyFromArray() returns null rather than style object in advanced mode
-- Bugfix:   (fauvel)    Work item 16958 - Cell::getFormattedValue returns RichText object instead of string
-- Bugfix:   (MBaker)    Work item 17166 - Indexed colors do not refer to Excel's indexed colors?
-- Bugfix:   (MBaker)    Work item 17199 - Indexed colors should be consistent with Excel and start from 1 (current index starts at 0)
-- Bugfix:   (MBaker)    Work item 17262 - Named Range definition in .xls when sheet reeference is quote wrapped
-- Bugfix:   (MBaker)    Work item 17403 - duplicateStyle() method doesn't duplicate conditional formats
-                                          Added an equivalent duplicateConditionalStyle() method for duplicating conditional styles
-- Bugfix:   (bnr)       Work item 17501 - =sumproduct(A,B) <> =sumproduct(B,A) in xlsx
-- Bugfix:   (Progi1984) Work item 8916  - Support for Rich-Text in PHPExcel_Writer_Excel5
-- General:  (MBaker)    Work item 15405 - Two easy to fix Issues concerning PHPExcel_Token_Stack (l10n/UC)
-- General:  (MBaker)    Work item 15461 - Locale file paths not fit for windows
-- General:  (MBaker)    Work item 16643 - Add file directory as a cache option for cache_to_discISAM
-- General:  (MBaker)    Work item 16923 - Datatype.php & constant TYPE_NULL
-- General:  (MBaker)    Ensure use of system temp directory for all temporary work files, unless explicitly specified
-- General:  (char101)   Work item 16359 - [Patch] faster stringFromColumnIndex()
-- General:  (whit1206)  Work item 16028 - Fix for projects that still use old autoloaders
-- General:  (atz)       Work item 17024 - Unknown codepage: 10007
-                        Additional Mac codepages
-
-
-2011-02-27 (v1.7.6):
-- Feature:  (MBaker)  Provide option to use PCLZip as an alternative to ZipArchive.
-                      This allows the writing of Excel2007 files, even without ZipArchive enabled (it does require zlib), or when php_zip is one of the buggy PHP 5.2.6 or 5.2.8 versions
-                      It can be enabled using PHPExcel_Settings::setZipClass(PHPExcel_Settings::PCLZIP);
-                      Note that it is not yet implemented as an alternative to ZipArchive for those Readers that are extracting from zips
-- Feature:  (MBaker)  Work item 14979 - Added listWorksheetNames() method to Readers that support multiple worksheets in a workbook, allowing a user to extract a list of all the worksheet names from a file without parsing/loading the whole file.
-- Feature:  (MBaker)  Speed boost and memory reduction in the Worksheet toArray() method.
-- Feature:  (MBaker)  Added new rangeToArray() and namedRangeToArray() methods to the PHPExcel_Worksheet object.
-                      Functionally, these are identical to the toArray() method, except that they take an additional first parameter of a Range (e.g. 'B2:C3') or a Named Range name.
-                      Modified the toArray() method so that it actually uses rangeToArray().
-- Feature:  (MBaker)  Added support for cell comments in the OOCalc, Gnumeric and Excel2003XML Readers, and in the Excel5 Reader
-- Feature:  (MBaker)  Improved toFormattedString() handling for Currency and Accounting formats to render currency symbols
-- Feature:  (MBaker)  Work Item  2346 - Implement more Excel calculation functions
-                      Implemented the DAVERAGE(), DCOUNT(), DCOUNTA(), DGET(), DMAX(), DMIN(), DPRODUCT(), DSTDEV(), DSTDEVP(), DSUM(), DVAR() and DVARP() Database functions
-- Bugfix:   (MBaker)  Work item 14888 - Simple =IF() formula disappears
-- Bugfix:   (MBaker)  Work item 14898 - PHP Warning: preg_match(): Compilation failed: PCRE does not support \\L, \\l, \\N, \\P, \\p, \\U, \\u, or \\X
-- Bugfix:   (MBaker)  Work item 14901 - VLOOKUP choking on parameters in PHPExcel.1.7.5/PHPExcel_Writer_Excel2007
-- Bugfix:   (MBaker)  Work item 14973 - PHPExcel_Cell::isInRange() incorrect results - offset by one column
-- Bugfix:   (MBaker)  Treat CodePage of 0 as CP1251 (for .xls files written by applications that don't set the CodePage correctly, such as Apple Numbers)
-- Bugfix:   (MB)      Work item 11583 - Need method for removing autoFilter
-- Bugfix:   (MBaker)  Work item 15029 - coordinateFromString throws exception for rows greater than 99,999
-- Bugfix:   (MBaker)  Work item 14999 - PHPExcel Excel2007 Reader colour problems with solidfill
-- Bugfix:   (MBaker)  Work item 13215 - Formatting get lost and edit a template XLSX file
-- Bugfix:   (MBaker)  Work item 14029 - Excel 2007 Reader /writer lost fontcolor
-- Bugfix:   (MBaker)  Work item 13374 - file that makes cells go black
-- Bugfix:   (MBaker)  Minor patchfix for Excel2003XML Reader when XML is defined with a charset attribute
-- Bugfix:   (MBaker)  Work item 15089 - PHPExcel_Worksheet->toArray() index problem
-- Bugfix:   (MBaker)  Work item 15094 - Merge cells 'un-merge' when using an existing spreadsheet
-- Bugfix:   (MBaker)  Work item 15129 - Worksheet fromArray() only working with 2-D arrays
-- Bugfix:   (xkeshav) Work item 15172 - rangeToarray function modified for non-existent cells
-- Bugfix:   (MBaker)  Work item 14980 - Images not getting copyied with the ->clone function
-- Bugfix:   (MBaker)  Work item 11576 - AdvancedValueBinder.php: String sometimes becomes a date when it shouldn't
-- Bugfix:   (MBaker)  Fix Excel5 Writer so that it only writes column dimensions for columns that are actually used rather than the full range (A to IV)
-- Bugfix:   (MBaker)  Work item 15198 - FreezePane causing damaged or modified error
-                      The freezePaneByColumnAndRow() method row argument should default to 1 rather than 0.
-                      Default row argument for all __ByColumnAndRow() methods should be 1
-- Bugfix:   (MBaker)  Work item 15121 - Column reference rather than cell reference in Print Area definition
-                      Fix Excel2007 Writer to handle print areas that are defined as row or column ranges rather than just as cell ranges
-- Bugfix:   (MBaker)  Reduced false positives from isDateTimeFormatCode() method by suppressing testing within quoted strings
-- Bugfix:   (MBaker)  Work item 15312 - Caching and tmp partition exhaustion
-- Bugfix:   (MBaker)  Work item 15308 - Writing to Variable No Longer Works. $_tmp_dir Missing in PHPExcel\PHPExcel\Shared\OLE\PPS\Root.php
-- Bugfix:   (MBaker)  Work item 15379 - Named ranges with dot don't get parsed properly
-- Bugfix:   (MBaker)  Work item 15096 - insertNewRowBefore fails to consistently update references
-- Bugfix:   (MBaker)  "i" is not a valid character for Excel date format masks (in isDateTimeFormatCode() method)
-- Bugfix:   (MKunert) Work item 15421 - PHPExcel_ReferenceHelper::insertNewBefore() is missing an 'Update worksheet: comments' section
-- Bugfix:   (MBaker)  Work item 15409 - Full column/row references in named ranges not supported by updateCellReference()
-- General:  (MBaker)  Improved performance (speed), for building the Shared Strings table in the Excel2007 Writer.
-- General:  (MBaker)  Improved performance (speed), for PHP to Excel date conversions
-- General:  (MBaker)  Enhanced SheetViews element structures in the Excel2007 Writer for frozen panes.
-- General:  (MBaker)  Removed Serialized Reader/Writer as these no longer work.
-
-
-2010-12-10 (v1.7.5):
-- Feature:  (MBaker)    Work item 8769 - Implement Gnumeric File Format
-                        Initial work on Gnumeric Reader (Worksheet Data, Document Properties and basic Formatting)
-- Feature:  (MBaker)    (incorporating part of Workitem 9759) - Support for Extended Workbook Properties in Excel2007, Excel5 and OOCalc Readers; support for User-defined Workbook Properties in Excel2007 and OOCalc Readers
-- Feature:  (MBaker)    Support for Extended and User-defined Workbook Properties in Excel2007 Writer
-- Feature:  (MBaker)    Provided a setGenerateSheetNavigationBlock(false); option to suppress generation of the sheet navigation block when writing multiple worksheets to HTML
-- Feature:  (MBaker)    Advanced Value Binder now recognises TRUE/FALSE strings (locale-specific) and converts to boolean
-- Feature:  (MBaker)    Work item 14301 - PHPExcel_Worksheet->toArray() is returning truncated values
-- Feature:  (MBaker)    Configure PDF Writer margins based on Excel Worksheet Margin Settings value
-- Feature:  (MBaker)    Added Contiguous flag for the CSV Reader, when working with Read Filters
-- Feature:  (MBaker)    Added getFormattedValue() method for cell object
-- Feature:  (MBaker)    Added strictNullComparison argument to the worksheet fromArray() method
-- Feature:  (MBaker)    Fix to toFormattedString() method in PHPExcel_Style_NumberFormat to handle fractions with a # code for the integer part
-- Bugfix:   (MB)        Work item 14143 - NA() doesn't propagate in matrix calc - quick fix in JAMA/Matrix.php
-- Bugfix:   (Progi1984) Work item 7895 - Excel5 : Formula : String constant containing double quotation mark
-- Bugfix:   (Progi1984) Work item 7895 - Excel5 : Formula : Percent
-- Bugfix:   (Progi1984) Work item 7895 - Excel5 : Formula : Error constant
-- Bugfix:   (Progi1984) Work item 7895 - Excel5 : Formula : Concatenation operator
-- Bugfix:   (MBaker)    Work item 14146 - Worksheet clone broken for CachedObjectStorage_Memory
-- Bugfix:   (MBaker)    Work item 12998 - PHPExcel_Reader_Excel2007 fails when gradient fill without type is present in a file
-- Bugfix:   (MBaker)    Work item 14176 - @ format for numeric strings in XLSX to CSV conversion
-- Bugfix:   (MBaker)    Work item 14223 - Advanced Value Binder Not Working?
-- Bugfix:   (MBaker)    Work item 14226 - unassigned object variable in PHPExcel->removeCellXfByIndex
-- Bugfix:   (MBaker)    Work item 14236 - problem with getting cell values from another worksheet... (if cell doesn't exist)
-- Bugfix:   (MBaker)    Work items 14260 & 14233 - Setting cell values to one char strings & Trouble reading one character string (thanks gorfou)
-- Bugfix:   (MBaker)    Work item 14256 - Worksheet title exception when duplicate worksheet is being renamed but exceeds the 31 character limit
-- Bugfix:   (MBaker)    Work item 14086 - Named range with sheet name that contains the $ throws exception when getting the cell
-- Bugfix:   (MBaker)    Added autoloader to DefaultValueBinder and AdvancedValueBinder
-- Bugfix:   (MBaker)    Modified PHPExcel_Shared_Date::isDateTimeFormatCode() to return false if format code begins with "_" or with "0 " to prevent false positives
-                        These leading characters are most commonly associated with number, currency or accounting (or occasionally fraction) formats
-- Bugfix:   (MBaker)    Work item 14374 - BUG : Excel5 and setReadFilter ?
-- Bugfix:   (MBaker)    Work item 14425 - Wrong exception message while deleting column
-- Bugfix:   (MBaker)    Work item 14679 - Formula evaluation fails with Japanese sheet refs
-- Bugfix:   (MBaker)    Work item 13559 - PHPExcel_Writer_PDF does not handle cell borders correctly
-- Bugfix:   (MBaker)    Work item 14831 - Style : applyFromArray() for 'allborders' not working
-- Bugfix:   (MBaker)    Work item 14837 - Using $this when not in object context in Excel5 Reader
-- General:  (MBaker)    Applied patch 6609 - Removes a unnecessary loop through each cell when applying conditional formatting to a range.
-- General:  (MBaker)    Applied patch 7169 - Removed spurious PHP end tags (?>)
-- General:  (MBaker)    Improved performance (speed) and reduced memory overheads, particularly for the Writers, but across the whole library.
-
-
-2010-08-26 (v1.7.4):
-- Bugfix:   (Progi1984) Work item 7895 - Excel5 : Formula : Power
-- Bugfix:   (Progi1984) Work item 7895 - Excel5 : Formula : Unary plus
-- Bugfix:   (Progi1984) Excel5 : Just write the Escher stream if necessary in Worksheet
-- Bugfix:   (MBaker)    Work item 13433 - Syntax errors in memcache.php 1.7.3c
-- Bugfix:   (MBaker)    Work item 13450 - Standard Deviation functions returning DIV/0 Error when Standard Deviation is zero
-- Feature:  (MBaker)    Support for print area with several ranges in the Excel2007 reader, and improved features for editing print area with several ranges
-- Feature:  (MBaker)    Work item 13769 - Improved Cell Exception Reporting
-- Feature:  (MBaker)    Support for row or column ranges in the calculation engine, e.g. =SUM(C:C) or =SUM(1:2)
-                        Also support in the calculation engine for absolute row or column ranges e.g. =SUM($C:$E) or =SUM($3:5)
-- Bugfix:   (ET)        Work item 13455 - Picture problem with Excel 2003
-- Bugfix:   (MBaker)    Work item 13484 - Wrong variable used in addExternalSheet in PHPExcel.php
-- Bugfix:   (MBaker)    Work item 13515 - "Invalid cell coordinate" error when formula access data from an other sheet
-- Bugfix:   (MBaker)    (related to Work item 13515) Calculation engine confusing cell range worksheet when referencing cells in a different worksheet to the formula
-- Bugfix:   (MBaker)    Work item 13752 - Wrong var naming in Worksheet->garbageCollect()
-- Bugfix:   (MBaker)    Work item 13764 - PHPExcel_Style_*::__clone() methods cause cloning loops?
-- Bugfix:   (MBaker)    Work item 11488 - Recent builds causing problems loading xlsx files? (ZipArchive issue?)
-- Bugfix:   (MBaker)    Work item 13856 - cache_to_apc causes fatal error when processing large data sets
-- Bugfix:   (MBaker)    Work item 13880 - OOCalc reader misses first line if it's a 'table-header-row'
-- Bugfix:   (MBaker)    Work item 14011 - using cache with copy or clone bug?
-                                        Fixed $worksheet->copy() or clone $worksheet when using cache_in_memory, cache_in_memory_gzip, cache_in_memory_serialized, cache_to_discISAM, cache_to_phpTemp, cache_to_apc and cache_to_memcache;
-                                        Fixed but untested when using cache_to_wincache.
-- Bugfix:   (MBaker)    Fixed problems with reading Excel2007 Properties
-- General:  (MB)        Applied patch 6324 - PHP Strict Standards: Non-static method PHPExcel_Shared_String::utf16_decode() should not be called statically
-- General:  (MBaker)    Applied patch 6360 - Array functions were ignored when loading an existing file containing them, and as a result, they would lose their 'cse' status.
-- General:  (MBaker)    Minor memory tweaks to Excel2007 Writer
-- General:  (MBaker)    Modified ReferenceHelper updateFormulaReferences() method to handle updates to row and column cell ranges (including absolute references e.g. =SUM(A:$E) or =SUM($5:5), and range/cell references that reference a worksheet by name), and to provide both performance and memory improvements.
-- General:  (MBaker)    Modified Excel2007 Reader so that ReferenceHelper class is instantiated only once rather than for every shared formula in a workbook.
-- General:  (MBaker)    Correct handling for additional (synonym) formula tokens in Excel5 Reader
-- General:  (MBaker)    Additional reading of some Excel2007 Extended Properties (Company, Manager)
-
-
-2010-06-01 (v1.7.3c):
-- Bugfix:   (MB)     Work item 13012 - Fatal error: Class 'ZipArchive' not found... ...Reader/Excel2007.php on line 217
-- Bugfix:   (MBaker) Work item 13398 - PHPExcel_Writer_Excel2007 error after 1.7.3b
-
-
-2010-05-31 (v1.7.3b):
-- Bugfix:   (MBaker) Work item 12903 - Infinite loop when reading
-- Bugfix:   (MB)     Work item 13381 - Wrong method chaining on PHPExcel_Worksheet class
-
-
-2010-05-17 (v1.7.3):
-- General:  (ET)     Applied patch 4990 (modified)
-- General:  (MB)     Applied patch 5568 (modified)
-- General:  (MB)     Applied patch 5943
-- General:  (MB)     Work item 13042 - Upgrade build script to use Phing
-- General:  (ET)     Work item 11586 - Replacing var with public/private
-- General:  (MBaker) Applied Anthony's Sterling's Class Autoloader to reduce memory overhead by "Lazy Loading" of classes
-- General:  (MBaker) Modification to functions that accept a date parameter to support string values containing ordinals as per Excel (English language only)
-- General:  (MBaker) Modify PHPExcel_Style_NumberFormat::toFormattedString() to handle dates that fall outside of PHP's 32-bit date range
-- General:  (MBaker) Applied patch 5207
-- General:  (ET)     Work item 11970 - PHPExcel developer documentation: Set page margins
-- Feature:  (ET)     Work item 11038 - Special characters and accents in SYLK reader
-- Feature:  (MBaker) Work Item  2346 - Implement more Excel calculation functions
-                     - Implemented the COUPDAYS(), COUPDAYBS(), COUPDAYSNC(), COUPNCD(), COUPPCD() and PRICE() Financial functions
-                     - Implemented the N() and TYPE() Information functions
-                     - Implemented the HYPERLINK() Lookup and Reference function
-- Feature:  (ET)     Work item 11526 - Horizontal page break support in PHPExcel_Writer_PDF
-- Feature:  (ET)     Work item 11529 - Introduce method setActiveSheetIndexByName()
-- Feature:  (ET)     Work item 11550 - AdvancedValueBinder.php: Automatically wrap text when there is new line in string (ALT+"Enter")
-- Feature:  (ET)     Work item 10300 - Data validation support in PHPExcel_Reader_Excel5 and PHPExcel_Writer_Excel5
-- Feature:  (MB)     Work item 11616 - Improve autosize calculation
-- Feature:  (MBaker) Methods to translate locale-specific function names in formulae
-                     - Language implementations for Czech (cs), Danish (da), German (de), English (uk), Spanish (es), Finnish (fi), French (fr), Hungarian (hu), Italian (it), Dutch (nl), Norwegian (no), Polish (pl), Portuguese (pt), Brazilian Portuguese (pt_br), Russian (ru) and Swedish (sv)
-- Feature:  (ET)     Work item 9759 - Implement document properties in Excel5 reader/writer
-                     - Fixed so far for PHPExcel_Reader_Excel5
-- Feature:  (ET)     Work item 11849 - Show/hide row and column headers in worksheet
-- Feature:  (ET)     Work item 11919 - Can't set font on writing PDF (by key)
-- Feature:  (ET)     Work item 12096 - Thousands scale (1000^n) support in PHPExcel_Style_NumberFormat::toFormattedString
-- Feature:  (ET)     Work item  6911 - Implement repeating rows in PDF and HTML writer
-- Feature:  (ET)     Work item 12289 - Sheet tabs in PHPExcel_Writer_HTML
-- Feature:  (MB)     Work item 13041 - Add Wincache CachedObjectProvider
-- Feature:  (MBaker) Configure PDF Writer paper size based on Excel Page Settings value, and provided methods to override paper size and page orientation with the writer
-                     - Note PHPExcel defaults to Letter size, while the previous PDF writer enforced A4 size, so PDF writer will now default to Letter
-- Feature:  (MBaker) Initial implementation of cell caching: allowing larger workbooks to be managed, but at a cost in speed
-- Feature:  (MBaker) Added an identify() method to the IO Factory that identifies the reader which will be used to load a particular file without actually loading it.
-- Bugfix:   (MBaker) Work item 10979 - Warning messages with INDEX function having 2 arguments
-- Bugfix:   (ET)     Work item 11473 - setValue('=') should result in string instead of formula
-- Bugfix:   (MBaker) Work item 11471 - method _raiseFormulaError should no be private
-- Bugfix:   (ET)     Work item 11485 - Fatal error: Call to undefined function mb_substr() in ...Classes\PHPExcel\Reader\Excel5.php on line 2903
-- Bugfix:   (ET)     Work item 11487 - getBold(), getItallic(), getStrikeThrough() not always working with PHPExcel_Reader_Excel2007
-- Bugfix:   (ET)     Work item 11492 - AdvancedValueBinder.php not working correctly for $cell->setValue('hh:mm:ss')
-- Bugfix:   (MBaker) Fixed leap year handling for the YEARFRAC() Date/Time function when basis ia 1 (Actual/actual)
-- Bugfix:   (MBaker) Work item 11490 - Warning messages
-                     - Calculation Engine code modified to enforce strict standards for pass by reference
-- Bugfix:   (ET)     Work item 11483 - PHPExcel_Cell_AdvancedValueBinder doesnt work for dates in far future
-- Bugfix:   (ET)     Work item 11528 - MSODRAWING bug with long CONTINUE record in PHPExcel_Reader_Excel5
-- Bugfix:   (ET)     Work item 11571 - PHPExcel_Reader_Excel2007 reads print titles as named range when there is more than one sheet
-- Bugfix:   (ET)     Work item 11561 - missing @return in phpdocblock in reader classes
-- Bugfix:   (ET)     Work item 11576 - AdvancedValueBinder.php: String sometimes becomes a date when it shouldn't
-- Bugfix:   (ET)     Work item 11588 - Small numbers escape treatment in PHPExcel_Style_NumberFormat::toFormattedString()
-- Bugfix:   (ET)     Work item 11590 - Blank styled cells are not blank in output by HTML writer due to &nbsp;
-- Bugfix:   (MBaker) Work item 11587 - Calculation engine bug: Existing, blank cell + number gives #NUM
-- Bugfix:   (ET)     Work item 11608 - AutoSize only measures length of first line in cell with multiple lines (ALT+Enter)
-- Bugfix:   (ET)     Work item 11608 - Fatal error running Tests/12serializedfileformat.php (PHPExcel 1.7.2)
-- Bugfix:   (MBaker) Fixed various errors in the WORKDAY() and NETWORKDAYS() Date/Time functions (particularly related to holidays)
-- Bugfix:   (ET)     Work item 11660 - Uncaught exception 'Exception' with message 'Valid scale is between 10 and 400.' in Classes/PHPExcel/Worksheet/SheetView.php:115
-- Bugfix:   (ET)     Work item 11551 - "Unrecognized token 39 in formula" with PHPExcel_Reader_Excel5 (occuring with add-in functions)
-- Bugfix:   (ET)     Work item 11668 - Excel2007 reader not reading PHPExcel_Style_Conditional::CONDITION_EXPRESSION
-- Bugfix:   (MBaker) Fix to the BESSELI(), BESSELJ(), BESSELK(), BESSELY() and COMPLEX() Engineering functions to use correct default values for parameters
-- Bugfix:   (MBaker) Work item 11525 - DATEVALUE function not working for pure time values + allow DATEVALUE() function to handle partial dates (e.g. "1-Jun" or "12/2010")
-- Bugfix:   (MBaker) Fix for empty quoted strings in formulae
-- Bugfix:   (MBaker) Trap for division by zero in Bessel functions
-- Bugfix:   (MBaker) Fix to OOCalc Reader to convert semi-colon (;) argument separator in formulae to a comma (,)
-- Bugfix:   (ET)     Work item 11693 - PHPExcel_Writer_Excel5_Parser cannot parse formula like =SUM(C$5:C5)
-- Bugfix:   (MBaker) Fix to OOCalc Reader to handle dates that fall outside 32-bit PHP's date range
-- Bugfix:   (ET)     Work item 11692 - File->sys_get_temp_dir() can fail in safe mode
-- Bugfix:   (ET)     Work item 11727 - Sheet references in Excel5 writer do not work when referenced sheet title contains non-Latin symbols
-- Bugfix:   (ET)     Work item 11743 - Bug in HTML writer can result in missing rows in output
-- Bugfix:   (ET)     Work item 11674 - setShowGridLines(true) not working with PHPExcel_Writer_PDF
-- Bugfix:   (ET)     Work item 11836 - PHPExcel_Worksheet_RowIterator initial position incorrect
-- Bugfix:   (ET)     Work item 11835 - PHPExcel_Worksheet_HeaderFooterDrawing Strict Exception thrown (by jshaw86)
-- Bugfix:   (ET)     Work item 11850 - Parts of worksheet lost when there are embedded charts (Excel5 reader)
-- Bugfix:   (MBaker) VLOOKUP() function error when lookup value is passed as a cell reference rather than an absolute value
-- Bugfix:   (ET)     Work item 12041 - First segment of Rich-Text not read correctly by PHPExcel_Reader_Excel2007
-- Bugfix:   (MBaker) Work item 12048 - Fatal Error with getCell('name') when name matches the pattern for a cell reference
-- Bugfix:   (ET)     Work item 12039 - excel5 writer appears to be swapping image locations
-- Bugfix:   (ET)     Work item 11954 - Undefined index: host in ZipStreamWrapper.php, line 94 and line 101
-- Bugfix:   (ET)     Work item 11672 - BIFF8 File Format problem (too short COLINFO record)
-- Bugfix:   (ET)     Work item 12121 - Column width sometimes changed after read/write with Excel2007 reader/writer
-- Bugfix:   (ET)     Work item 11964 - Worksheet.php throws a fatal error when styling is turned off via setReadDataOnly on the reader
-- Bugfix:   (MBaker) Work item 11851 - Checking for Circular References in Formulae
-                     - Calculation Engine code now traps for cyclic references, raising an error or throwing an exception, or allows 1 or more iterations through cyclic references, based on a configuration setting
-- Bugfix:   (ET)     Work item 12244 - PNG transparency using Excel2007 writer
-- Bugfix:   (ET)     Work item 12221 - Custom readfilter error when cell formulas reference excluded cells (Excel5 reader)
-- Bugfix:   (ET)     Work item 12288 - Protection problem in XLS
-- Bugfix:   (ET)     Work item 12300 - getColumnDimension()->setAutoSize() incorrect on cells with Number Formatting
-- Bugfix:   (ET)     Work item 12378 - Notices reading Excel file with Add-in funcitons (PHPExcel_Reader_Excel5)
-- Bugfix:   (ET)     Work item 12380 - Excel5 reader not reading formulas with deleted sheet references
-- Bugfix:   (ET)     Work item 12404 - Named range (defined name) scope problems for in PHPExcel
-- Bugfix:   (ET)     Work item 12423 - PHP Parse error: syntax error, unexpected T_PUBLIC in PHPExcel/Calculation.php on line 3482
-- Bugfix:   (ET)     Work item 12505 - Named ranges don't appear in name box using Excel5 writer
-- Bugfix:   (ET)     Work item 12509 - Many merged cells + autoSize column -> slows down the writer
-- Bugfix:   (ET)     Work item 12539 - Incorrect fallback order comment in Shared/Strings.php ConvertEncoding()
-- Bugfix:   (ET)     Work item 12538 - IBM AIX iconv() will not work, should revert to mbstring etc. instead
-- Bugfix:   (ET)     Work item 12568 - Excel5 writer and mbstring functions overload
-- Bugfix:   (MBaker) Work item 12672 - OFFSET needs to flattenSingleValue the $rows and $columns args
-- Bugfix:   (MBaker) Work item 12546 - Formula with DMAX(): Notice: Undefined offset: 2 in ...\PHPExcel\Calculation.php on line 2365
-                     - Note that the Database functions have not yet been implemented
-- Bugfix:   (MBaker) Work item 12839 - Call to a member function getParent() on a non-object in Classes\\PHPExcel\\Calculation.php Title is required
-- Bugfix:   (MBaker) Work item 12935 - Cyclic Reference in Formula
-- Bugfix:   (MBaker) Work item 13025 - Memory error...data validation?
-
-
-2010/01/11 (v1.7.2):
-- General:  (ET)     Applied patch 4362
-- General:  (ET)     Applied patch 4363 (modified)
-- General:  (MBaker) Work item 10874 - 1.7.1 Extremely Slow - Refactored PHPExcel_Calculation_Functions::flattenArray() method and set calculation cache timer default to 2.5 seconds
-- General:  (MBaker) Allow formulae to contain line breaks
-- General:  (ET)     Work item 10910 - split() function deprecated in PHP 5.3.0
-- General:  (ET)     sys_get_temp_dir() requires PHP 5.2.1, not PHP 5.2 [provide fallback function for PHP 5.2.0]
-- General:  (MBaker) Applied patch 4640 - Implementation of the ISPMT() Financial function by Matt Groves
-- General:  (MBaker) Work item 11052 - Put the example of formula with more arguments in documentation
-- General:  (MBaker) Improved accuracy for the GAMMAINV() Statistical Function
-- Feature:  (ET)     Work item 10409 - XFEXT record support to fix colors change from Excel5 reader, and copy/paste color change with Excel5 writer
-                     - Excel5 reader reads RGB color information in XFEXT records for borders, font color and fill color
-- Feature:  (MBaker) Work Item  2346 - Implement more Excel calculation functions
-                     - Implemented the FVSCHEDULE(), XNPV(), IRR(), MIRR(), XIRR() and RATE() Financial functions
-                     - Implemented the SUMPRODUCT() Mathematical function
-                     - Implemented the ZTEST() Statistical Function
-- Feature:  (ET)     Work item 10919 - Multiple print areas in one sheet
-- Feature:  (ET)     Work item 10930 - Store calculated values in output by PHPExcel_Writer_Excel5
-- Feature:  (ET)     Work item 10939 - Sheet protection options in Excel5 reader/writer
-- Feature:  (MBaker) Modification of the COUNT(), AVERAGE(), AVERAGEA(), DEVSQ, AVEDEV(), STDEV(), STDEVA(), STDEVP(), STDEVPA(), VARA() and VARPA() SKEW() and KURT() functions to correctly handle boolean values depending on whether they're passed in as values, values within a matrix or values within a range of cells.
-- Feature:  (ET)     Work item  9932 - Cell range selection
-- Feature:  (MB)     Work item 10266 - Root-relative path handling
-- Feature:  (ET)     Work item 11315 - Named Ranges not working with PHPExcel_Writer_Excel5
-- Bugfix:   (MB)     Work item 11206 - Excel2007 Reader fails to load Apache POI generated Excel
-- Bugfix:   (MB)     Work item 11154 - Number format is broken when system's thousands separator is empty
-- Bugfix:   (MB)     Work item 11401 - ReferenceHelper::updateNamedFormulas throws errors if oldName is empty
-- Bugfix:   (MB)     Work item 11296 - parse_url() fails to parse path to an image in xlsx
-- Bugfix:   (ET)     Work item 10876 - Workaround for iconv_substr() bug in PHP 5.2.0
-- Bugfix:   (ET)     Work item 10877 - 1 pixel error for image width and height with PHPExcel_Writer_Excel5
-- Bugfix:   (MBaker) Fix to GEOMEAN() Statistical function
-- Bugfix:   (ET)     Work item 10884 - setValue('-') and setValue('.') sets numeric 0 instead of 1-character string
-- Bugfix:   (ET)     Work item 10885 - Row height sometimes much too low after read with PHPExcel_Reader_Excel5
-- Bugfix:   (ET)     Work item 10888 - Diagonal border. Miscellaneous missing support.
-                     - Constant PHPExcel_Style_Borders::DIAGONAL_BOTH added to support double-diagonal (cross)
-                     - PHPExcel_Reader_Excel2007 not always reading diagonal borders (only recognizes 'true' and not '1')
-                     - PHPExcel_Reader_Excel5 support for diagonal borders
-                     - PHPExcel_Writer_Excel5 support for diagonal borders
-- Bugfix:   (ET)     Work item 10894 - Session bug: Fatal error: Call to a member function bindValue() on a non-object in ...\Classes\PHPExcel\Cell.php on line 217
-- Bugfix:   (ET)     Work item 10896 - Colors messed up saving twice with same instance of PHPExcel_Writer_Excel5 (regression since 1.7.0)
-- Bugfix:   (ET)     Work item 10917 - Method PHPExcel_Worksheet::setDefaultStyle is not working
-- Bugfix:   (ET)     Work item 10897 - PHPExcel_Reader_CSV::canRead() sometimes says false when it shouldn't
-- Bugfix:   (ET)     Work item 10922 - Changes in workbook not picked up between two saves with PHPExcel_Writer_Excel2007
-- Bugfix:   (ET)     Work item 10913 - Decimal and thousands separators missing in HTML and PDF output
-- Bugfix:   (ET)     Work item 10936 - Notices with PHPExcel_Reader_Excel5 and named array constants
-- Bugfix:   (MBaker) Work item 10938 - Calculation engine limitation on 32-bit platform with integers > 2147483647
-- Bugfix:   (ET)     Work item 10959 - Shared(?) formulae containing absolute cell references not read correctly using Excel5 Reader
-- Bugfix:   (MBaker) Work item 10962 - Warning messages with intersection operator involving single cell
-- Bugfix:   (ET)     Work item 10980 - Infinite loop in Excel5 reader caused by zero-length string in SST
-- Bugfix:   (ET)     Work item 10983 - Remove unnecessary cell sorting to improve speed by approx. 18% in HTML and PDF writers
-- Bugfix:   (MBaker) Work item 10977 - Cannot read A1 cell content - OO_Reader
-- Bugfix:   (ET)     Work item 11000 - Transliteration failed, invalid encoding
-
-
-2009/11/02 (v1.7.1):
-- General:  (ET) Work item 10687 - ereg() function deprecated in PHP 5.3.0
-- General:  (MB) Work item 10739 - Writer Interface Inconsequence - setTempDir and setUseDiskCaching
-- General:  (ET) Upgrade to TCPDF 4.8.009
-- Feature:  (ET) Work item  7333 - Support for row and column styles (feature request)
-            -   Basic implementation for Excel2007/Excel5 reader/writer
-- Feature:  (ET) Work item 10459 - Hyperlink to local file in Excel5 reader/writer
-- Feature:  (MB) Work item 10472 - Color Tab (Color Sheet's name)
-- Feature:  (ET) Work item 10488 - Border style "double" support in PHPExcel_Writer_HTML
-- Feature:  (ET) Work item 10492 - Multi-section number format support in HTML/PDF/CSV writers
-- Feature:  (MBaker) - Some additional performance tweaks in the calculation engine
-- Feature:  (MBaker) - Fix result of DB() and DDB() Financial functions to 2dp when in Gnumeric Compatibility mode
-- Feature:  (MBaker) - Added AMORDEGRC(), AMORLINC() and COUPNUM() Financial function (no validation of parameters yet)
-- Feature:  (MBaker) - Improved accuracy of TBILLEQ(), TBILLPRICE() and TBILLYIELD() Financial functions when in Excel or Gnumeric mode
-- Feature:  (MBaker) - Added INDIRECT() Lookup/Reference function (only supports full addresses at the moment)
-- Feature:  (MB) Work item 10498 - PHPExcel_Reader_CSV::canRead() improvements
-- Feature:  (ET) Work item 10500 - Input encoding option for PHPExcel_Reader_CSV
-- Feature:  (ET) Work item 10493 - Colored number format support, e.g. [Red], in HTML/PDF output
-- Feature:  (ET) Work item 10559 - Color Tab (Color Sheet's name) [Excel5 reader/writer support]
-- Feature:  (MBaker) Initial version of SYLK (slk) and Excel 2003 XML Readers (Cell data and basic cell formatting)
-- Feature:  (MBaker) Initial version of Open Office Calc (ods) Reader (Cell data only)
-- Feature:  (MBaker) Initial use of "pass by reference" in the calculation engine for ROW() and COLUMN() Lookup/Reference functions
-- Feature:  (MBaker) Work item 2346 - COLUMNS() and ROWS() Lookup/Reference functions, and SUBSTITUTE() Text function
-- Feature:  (ET) Work item 10502 - AdvancedValueBinder(): Re-enable zero-padded string-to-number conversion, e.g '0004' -> 4
-- Feature:  (ET) Work item 10600 - Make PHP type match Excel datatype
-- Feature:  (MB) Work item 10630 - Change first page number on header
-- Feature:  (MB) Applied patch 3941
-- Feature:  (MB,ET) Work item 10745 - Hidden sheets
-- Feature:  (ET) Work item 10761 - mbstring fallback when iconv is broken
-- Feature:  (MBaker) Added support for matrix/value comparisons (e.g. ={1,2;3,4}>=3 or 2<>{1,2;3,4}) - Note, can't yet handle comparison of two matrices
-- Feature:  (MBaker) Improved handling for validation and error trapping in a number of functions
-- Feature:  (MBaker) Improved support for fraction number formatting
-- Feature:  (ET) Work item 10455 - Support Reading CSV with Byte Order Mark (BOM)
-- Feature:  (ET) Work item 10860 - addExternalSheet() at specified index
-- Bugfix:   (MBaker) Work item 10684 - Named range can no longer be passed to worksheet->getCell()
-- Bugfix:   (ET) Work item 10455 - RichText HTML entities no longer working in PHPExcel 1.7.0
-- Bugfix:   (ET) Work item  7610 - Fit-to-width value of 1 is lost after read/write of Excel2007 spreadsheet [+ support for simultaneous scale/fitToPage]
-- Bugfix:   (MB) Work item 10469 - Performance issue identified by profiling
-- Bugfix:   (ET) Work item 10473 - setSelectedCell is wrong
-- Bugfix:   (ET) Work item 10481 - Images get squeezed/stretched with (Mac) Verdana 10 Excel files using Excel5 reader/writer
-- Bugfix:   (MBaker) Work item 10482 - Error in argument count for DATEDIF() function
-- Bugfix:   (MBaker) Work item 10452 - updateFormulaReferences is buggy
-- Bugfix:   (MB) Work item 10485 - CellIterator returns null Cell if onlyExistingCells is set and key() is in use
-- Bugfix:   (MBaker) Work item 10453 - Wrong RegEx for parsing cell references in formulas
-- Bugfix:   (MB) Work item 10486 - Optimisation subverted to devastating effect if IterateOnlyExistingCells is clear
-- Bugfix:   (ET) Work item 10494 - Fatal error: Uncaught exception 'Exception' with message 'Unrecognized token 6C in formula'... with PHPExcel_Reader_Excel5
-- Bugfix:   (MBaker) Work item 10490 - Fractions stored as text are not treated as numbers by PHPExcel's calculation engine
-- Bugfix:   (ET) Work item 10503 - AutoFit (autosize) row height not working in PHPExcel_Writer_Excel5
-- Bugfix:   (MBaker) Fixed problem with null values breaking the calculation stack
-- Bugfix:   (ET) Work item 10524 - Date number formats sometimes fail with PHPExcel_Style_NumberFormat::toFormattedString, e.g. [$-40047]mmmm d yyyy
-- Bugfix:   (MBaker) Fixed minor problem with DATEDIFF YM calculation
-- Bugfix:   (MB) Applied patch 3695
-- Bugfix:   (ET) Work item 10536 - setAutosize() and Date cells not working properly
-- Bugfix:   (ET) Work item 10556 - Time value hour offset in output by HTML/PDF/CSV writers (system timezone problem)
-- Bugfix:   (ET) Work item 10558 - Control characters 0x14-0x1F are not treated by PHPExcel
-- Bugfix:   (ET) Work item 10560 - PHPExcel_Writer_Excel5 not working when open_basedir restriction is in effect
-- Bugfix:   (MBaker) Work item 10563 - IF formula calculation problem in PHPExcel 1.7.0 (string comparisons)
-- Bugfix:   (MBaker) Improved CODE() Text function result for UTF-8 characters
-- Bugfix:   (ET) Work item 10568 - Empty rows are collapsed with HTML/PDF writer
-- Bugfix:   (ET) Work item 10569 - Gaps between rows in output by PHPExcel_Writer_PDF (Upgrading to TCPDF 4.7.003)
-- Bugfix:   (ET) Work item 10575 - Problem reading formulas (Excel5 reader problem with "fake" shared formulas)
-- Bugfix:   (MBaker) Work item 10588 - Error type in formula: "_raiseFormulaError message is Formula Error: An unexpected error occured"
-- Bugfix:   (ET) Work item 10599 - Miscellaneous column width problems in Excel5/Excel2007 writer
-- Bugfix:   (ET) Work item 10615 - Reader/Excel5 'Unrecognized token 2D in formula' in latest version
-- Bugfix:   (ET) Work item 10623 - on php 5.3 PHPExcel 1.7 Excel 5 reader fails in _getNextToken, token = 2C, throws exception
-- Bugfix:   (ET) Work item 10617 - Fatal error when altering styles after workbook has been saved
-- Bugfix:   (ET) Work item 10661 - Images vertically stretched or squeezed when default font size is changed (PHPExcel_Writer_Excel5)
-- Bugfix:   (ET) Work item 10676 - Styles not read in "manipulated" Excel2007 workbook
-- Bugfix:   (ET) Work item 10059 - Windows 7 says corrupt file by PHPExcel_Writer_Excel5 when opening in Excel
-- Bugfix:   (MBaker) Work item 10708 - Calculations sometimes not working with cell references to other sheets
-- Bugfix:   (ET) Work item 10706 - Problem with merged cells after insertNewRowBefore()
-- Bugfix:   (MBaker) Applied patch 4023
-- Bugfix:   (MBaker) Fix to SUMIF() and COUNTIF() Statistical functions for when condition is a match against a string value
-- Bugfix:   (ET) Work item 10721 - PHPExcel_Cell::coordinateFromString should throw exception for bad string parameter
-- Bugfix:   (ET) Work item 10723 - EucrosiaUPC (Thai font) not working with PHPExcel_Writer_Excel5
-- Bugfix:   (MBaker) Improved the return of calculated results when the result value is an array
-- Bugfix:   (MBaker) Allow calculation engine to support Functions prefixed with @ within formulae
-- Bugfix:   (MBaker) Work item 10632 - Intersection operator (space operator) fatal error with calculation engine
-- Bugfix:   (ET) Work item 10742 - Chinese, Japanese, Korean characters show as squares in PDF
-- Bugfix:   (ET) Work item 10756 - sheet title allows invalid characters
-- Bugfix:   (ET) Work item 10757 - Sheet!$A$1 as function argument in formula causes infinite loop in Excel5 writer
-- Bugfix:   (MBaker) Work item 10740 - Cell range involving name not working with calculation engine - Modified calculation parser to handle range operator (:), but doesn't currently handle worksheet references with spaces or other non-alphameric characters, or trap erroneous references
-- Bugfix:   (MBaker) Work item 10798 - DATE function problem with calculation engine (says too few arguments given)
-- Bugfix:   (MBaker) Work item 10799 - Blank cell can cause wrong calculated value
-- Bugfix:   (MBaker) Modified ROW() and COLUMN() Lookup/Reference Functions to return an array when passed a cell range, plus some additional work on INDEX()
-- Bugfix:   (ET) Work item 10817 - Images not showing in Excel 97 using PHPExcel_Writer_Excel5 (patch by Jordi Gutiérrez Hermoso)
-- Bugfix:   (ET) Work item 10785 - When figures are contained in the excel sheet, Reader was stopped
-- Bugfix:   (MBaker) Work item 10818 - Formulas changed after insertNewRowBefore()
-- Bugfix:   (ET) Work item 10825 - Cell range row offset problem with shared formulas using PHPExcel_Reader_Excel5
-- Bugfix:   (MBaker) Work item 10832 - Warning: Call-time pass-by-reference has been deprecated
-- Bugfix:   (ET) Work item 10849 - Image should "Move but don't size with cells" instead of "Move and size with cells" with PHPExcel_Writer_Excel5
-- Bugfix:   (ET) Work item 10856 - Opening a Excel5 generated XLS in Excel 2007 results in header/footer entry not showing on input
-- Bugfix:   (ET) Work item 10859 - addExternalSheet() not returning worksheet
-- Bugfix:   (MBaker) Work item 10629 - Invalid results in formulas with named ranges
-
-
-2009/08/10 (v1.7.0):
-- General:  (ET) Work item  9893 - Expand documentation: Number formats
-- General:  (ET) Work item  9941 - Class 'PHPExcel_Cell_AdvancedValueBinder' not found
-- General:  (MB) Work item  9960 - Change return type of date functions to PHPExcel_Calculation_Functions::RETURNDATE_EXCEL
-- Feature:  (MBaker) - New RPN and stack-based calculation engine for improved performance of formula calculation
-            -   Faster (anything between 2 and 12 times faster than the old parser, depending on the complexity and nature of the formula)
-            -   Significantly more memory efficient when formulae reference cells across worksheets
-            -   Correct behaviour when referencing Named Ranges that exist on several worksheets
-            -   Support for Excel ^ (Exponential) and % (Percentage) operators
-            -   Support for matrices within basic arithmetic formulae (e.g. ={1,2,3;4,5,6;7,8,9}/2)
-            -   Better trapping/handling of NaN and infinity results (return #NUM! error)
-            -   Improved handling of empty parameters for Excel functions
-            -   Optional logging of calculation steps
-- Feature:  (MBaker) - New calculation engine can be accessed independently of workbooks (for use as a standalone calculator)
-- Feature:  (MBaker) Work Item  2346 - Implement more Excel calculation functions
-            -   Initial implementation of the COUNTIF() and SUMIF() Statistical functions
-            -   Added ACCRINT() Financial function
-- Feature:  (MBaker) - Modifications to number format handling for dddd and ddd masks in dates, use of thousand separators even when locale only implements it for money, and basic fraction masks (0 ?/? and ?/?)
-- Feature:  (ET) Work item  9794 - Support arbitrary fixed number of decimals in PHPExcel_Style_NumberFormat::toFormattedString()
-- Feature:  (ET) Work item  6857 - Improving performance and memory on data dumps
-            -    Various style optimizations (merging from branch wi6857-memory)
-            -    Moving hyperlink and dataValidation properties from cell to worksheet for lower PHP memory usage
-- Feature:  (MB) Work item  9869 - Provide fluent interfaces where possible
-- Feature:  (ET) Work item  9899 - Make easy way to apply a border to a rectangular selection
-- Feature:  (ET) Work item  9906 - Support for system window colors in PHPExcel_Reader_Excel5
-- Feature:  (ET) Work item  9911 - Horizontal center across selection
-- Feature:  (ET) Work item  9919 - Merged cells record, write to full record size in PHPExcel_Writer_Excel5
-- Feature:  (MB) Work item  9895 - Add page break between sheets in exported PDF
-- Feature:  (ET) Work item  9902 - Sanitization of UTF-8 input for cell values
-- Feature:  (ET) Work item  9930 - Read cached calculated value with PHPExcel_Reader_Excel5
-- Feature:  (ET) Work item  9896 - Miscellaneous CSS improvements for PHPExcel_Writer_HTML
-- Feature:  (ET) Work item  9947 - getProperties: setCompany feature request
-- Feature:  (MB) Patch 2981 - Insert worksheet at a specified index
-- Feature:  (MB) Patch 3018 - Change worksheet index
-- Feature:  (MB) Patch 3039 - Readfilter for CSV reader
-- Feature:  (ET) Work item 10172 - Check value of mbstring.func_overload when saving with PHPExcel_Writer_Excel5
-- Feature:  (ET) Work item 10251 - Eliminate dependency of an include path pointing to class directory
-- Feature:  (ET) Work item 10292 - Method for getting the correct reader for a certain file (contribution)
-- Feature:  (ET) Work item 10287 - Choosing specific row in fromArray method
-- Feature:  (ET) Work item 10319 - Shared formula support in PHPExcel_Reader_Excel5
-- Feature:  (MB,ET) Work item 10345 - Right-to-left column direction in worksheet
-- Bugfix:   (ET) Work item  9824 - PHPExcel_Reader_Excel5 not reading PHPExcel_Style_NumberFormat::FORMAT_NUMBER ('0')
-- Bugfix:   (ET) Work item  9858 - Fractional row height in locale other than English results in corrupt output using PHPExcel_Writer_Excel2007
-- Bugfix:   (ET) Work item  9846 - Fractional (decimal) numbers not inserted correctly when locale is other than English
-- Bugfix:   (ET) Work item  9863 - Fractional calculated value in locale other than English results in corrupt output using PHPExcel_Writer_Excel2007
-- Bugfix:   (ET) Work item  9830 - Locale aware decimal and thousands separator in exported formats HTML, CSV, PDF
-- Bugfix:   (MB) Work item  9819 - Cannot Add Image with Space on its Name
-- Bugfix:   (ET) Work item  9884 - Black line at top of every page in output by PHPExcel_Writer_PDF
-- Bugfix:   (ET) Work item  9885 - Border styles and border colors not showing in HTML output (regression since 1.6.4)
-- Bugfix:   (ET) Work item  9888 - Hidden screen gridlines setting in worksheet not read by PHPExcel_Reader_Excel2007
-- Bugfix:   (MB) Work item  9913 - Some valid sheet names causes corrupt output using PHPExcel_Writer_Excel2007
-- Bugfix:   (ET) Work item  9934 - More than 32,767 characters in a cell gives corrupt Excel file
-- Bugfix:   (ET) Work item  9937 - Images not getting copyied with the ->copy() function
-- Bugfix:   (ET) Work item  9940 - Bad calculation of column width setAutoSize(true) function
-- Bugfix:   (ET) Work item  9968 - Dates are sometimes offset by 1 day in output by HTML and PDF writers depending on system timezone setting
-- Bugfix:   (ET) Work item 10003 - Wingdings symbol fonts not working with PHPExcel_Writer_Excel5
-- Bugfix:   (MB) Work item 10010 - White space string prefix stripped by PHPExcel_Writer_Excel2007
-- Bugfix:   (ET) Work item 10023 - The name of the Workbook stream MUST be "Workbook", not "Book"
-- Bugfix:   (ET) Work item 10030 - Avoid message "Microsoft Excel recalculates formulas..." when closing xls file from Excel
-- Bugfix:   (ET) Work item 10031 - Non-unique newline representation causes problems with LEN formula
-- Bugfix:   (ET) Work item 10033 - Newline in cell not showing with PHPExcel_Writer_HTML and PHPExcel_Writer_PDF
-- Bugfix:   (ET) Work item 10046 - Rich-Text strings get prefixed by &nbsp; when output by HTML writer
-- Bugfix:   (ET) Work item 10052 - Leading spaces do not appear in output by HTML/PDF writers
-- Bugfix:   (MB) Work item 10061 - Empty Apache POI-generated file can not be read
-- Bugfix:   (ET) Work item 10068 - Column width not scaling correctly with font size in HTML and PDF writers
-- Bugfix:   (ET) Work item 10069 - Inaccurate row heights with HTML writer
-- Bugfix:   (MB) Patch 2992 - Reference helper
-- Bugfix:   (MBaker)  - Excel 5 Named ranges should not be local to the worksheet, but accessible from all worksheets
-- Bugfix:   (ET) Work item 10088 - Row heights are ignored by PHPExcel_Writer_PDF
-- Bugfix:   (MB) Patch 3003 - Write raw XML
-- Bugfix:   (ET) Work item 10098 - removeRow(), removeColumn() not always clearing cell values
-- Bugfix:   (ET) Work item 10142 - Problem reading certain hyperlink records with PHPExcel_Reader_Excel5
-- Bugfix:   (ET) Work item 10143 - Hyperlink cell range read failure with PHPExcel_Reader_Excel2007
-- Bugfix:   (MB) Work item 10149 - 'Column string index can not be empty.'
-- Bugfix:   (ET) Work item 10204 - getHighestColumn() sometimes says there are 256 columns with PHPExcel_Reader_Excel5
-- Bugfix:   (ET) Work item 10220 - extractSheetTitle fails when sheet title contains exclamation mark (!)
-- Bugfix:   (ET) Work item 10221 - setTitle() sometimes erroneously appends integer to sheet name
-- Bugfix:   (ET) Work item 10229 - Mac BIFF5 Excel file read failure (missing support for Mac OS Roman character set)
-- Bugfix:   (ET) Work item 10230 - BIFF5 header and footer incorrectly read by PHPExcel_Reader_Excel5
-- Bugfix:   (ET) Work item 10259 - iconv notices when reading hyperlinks with PHPExcel_Reader_Excel5
-- Bugfix:   (ET) Work item 10252 - Excel5 reader OLE read failure with small Mac BIFF5 Excel files
-- Bugfix:   (ET) Work item 10272 - Problem in reading formula : IF( IF ) with PHPExcel_Reader_Excel5
-- Bugfix:   (ET) Work item 10274 - Error reading formulas referencing external sheets with PHPExcel_Reader_Excel5
-- Bugfix:   (ET) Work item 10291 - Image horizontally stretched when default font size is increased (PHPExcel_Writer_Excel5)
-- Bugfix:   (ET) Work item 10333 - Undefined offset in Reader\Excel5.php on line 3572
-- Bugfix:   (MB) Work item 10340 - PDF output different then XLS (copied data)
-- Bugfix:   (ET) Work item 10352 - Internal hyperlinks with UTF-8 sheet names not working in PHPExcel_Writer_Excel5
-- Bugfix:   (ET) Work item 10361 - String shared formula result read error with PHPExcel_Reader_Excel5
-- Bugfix:   (ET) Work item 10363 - Uncaught exception 'Exception' with message 'Valid scale is between 10 and 400.' in Classes/PHPExcel/Worksheet/PageSetup.php:338
-- Bugfix:   (ET) Work item 10355 - Using setLoadSheetsOnly fails if you do not use setReadDataOnly(true) and sheet is not the first sheet
-- Bugfix:   (MB) Work item 10362 - getCalculatedValue() sometimes incorrect with IF formula and 0-values
-- Bugfix:   (MBaker) Work Item  10198 - Excel Reader 2007 problem with "shared" formulae when "master" is an error
-- Bugfix:   (MBaker) Work Item  10106 - Named Range Bug, using the same range name on different worksheets
-- Bugfix:   (MBaker) Work Item  10004 - Java code in JAMA classes
-- Bugfix:   (MBaker) Work Item  9659 - getCalculatedValue() not working with some formulas involving error types
-- Bugfix:   (MBaker) Work Item  9447 - evaluation of both return values in an IF() statement returning an error if either result was an error, irrespective of the IF evaluation
-- Bugfix:   (MBaker) Work Item  6203 - Power in formulas: new calculation engine no longer treats ^ as a bitwise XOR operator
-- Bugfix:   (MBaker) - Bugfixes and improvements to many of the Excel functions in PHPExcel
-            -   Added optional "places" parameter in the BIN2HEX(), BIN2OCT, DEC2BIN(), DEC2OCT(), DEC2HEX(), HEX2BIN(), HEX2OCT(), OCT2BIN() and OCT2HEX() Engineering Functions
-            -    Trap for unbalanced matrix sizes in MDETERM() and MINVERSE() Mathematic and Trigonometric functions
-            -    Fix for default characters parameter value for LEFT() and RIGHT() Text functions
-            -    Fix for GCD() and LCB() Mathematical functions when the parameters include a zero (0) value
-            -    Fix for BIN2OCT() Engineering Function for 2s complement values (which were returning hex values)
-            -    Fix for BESSELK() and BESSELY() Engineering functions
-            -    Fix for IMDIV() Engineering Function when result imaginary component is positive (wasn't setting the sign)
-            -    Fix for ERF() Engineering Function when called with an upper limit value for the integration
-            -    Fix to DATE() Date/Time Function for year value of 0
-            -    Set ISPMT() function as category FINANCIAL
-            -    Fix for DOLLARDE() and DOLLARFR() Financial functions
-            -    Fix to EFFECT() Financial function (treating $nominal_rate value as a variable name rather than a value)
-            -    Fix to CRITBINOM() Statistical function (CurrentValue and EssentiallyZero treated as constants rather than variables)
-                     Note that an Error in the function logic can still lead to a permanent loop
-            -    Fix to MOD() Mathematical function to work with floating point results
-            -    Fix for QUOTIENT() Mathematical function
-            -    Fix to HOUR(), MINUTE() and SECOND() Date/Time functions to return an error when passing in a floating point value of 1.0 or greater, or less than 0
-            -    LOG() Function now correctly returns base-10 log when called with only one parameter, rather than the natural log as the default base
-            -    Modified text functions to handle multibyte character set (UTF-8).
-
-
-2009/04/22 (v1.6.7):
-- General:  (MB) Work item 9416 - Deprecate misspelled setStriketrough() and getStriketrough() methods
-- General:  (MB) Work item 9526 - Performance improvement when saving file
-- Feature:  (MB) Work item 9598 - Check that sheet title has maximum 31 characters
-- Feature:  (MB, ET) Work item 9631 - True support for Excel built-in number format codes
-- Feature:  (ET) Work item 9683 - Ability to read defect BIFF5 Excel file without CODEPAGE record
-- Feature:  (MB) Work item 9701 - Auto-detect which reader to invoke
-- Feature:  (ET) Work item 9214 - Deprecate insertion of dates using PHP-time (Unix time) [request for removal of feature]
-- Feature:  (ET) Work item 9747 - Support for entering time values like '9:45', '09:45' using AdvancedValueBinder
-- Feature:  (ET) Work item 9797 - DataType dependent horizontal alignment in HTML and PDF writer
-- Bugfix:   (MB) Work item 9375 - Cloning data validation object causes script to stop
-- Bugfix:   (ET) Work item 9400 - Simultaneous repeating rows and repeating columns not working with PHPExcel_Writer_Excel5
-- Bugfix:   (MB) Work item 9399 - Simultaneous repeating rows and repeating columns not working with PHPExcel_Writer_Excel2007
-- Bugfix:   (ET) Work item 9437 - Row outline level not working with PHPExcel_Writer_Excel5
-- Bugfix:   (ET) Work item 9452 - Occasional notices with PHPExcel_Reader_Excel5 when Excel file contains drawing elements
-- Bugfix:   (ET) Work item 9453 - PHPExcel_Reader_Excel5 fails as a whole when workbook contains images other than JPEG/PNG
-- Bugfix:   (ET) Work item 9444 - Excel5 writer checks for iconv but does not necessarily use it
-- Bugfix:   (ET) Work item 9463 - Altering a style on copied worksheet alters also the original
-- Bugfix:   (MB) Work item 9480 - Formulas are incorrectly updated when a sheet is renamed
-- Bugfix:   (MB) Work item 9513 - PHPExcel_Worksheet::extractSheetTitle not treating single quotes correctly
-- Bugfix:   (MB) Work item 9477 - PHP Warning raised in function array_key_exists
-- Bugfix:   (MB) Work item 9599 - getAlignWithMargins() gives wrong value when using PHPExcel_Reader_Excel2007
-- Bugfix:   (MB) Work item 9600 - getScaleWithDocument() gives wrong value when using PHPExcel_Reader_Excel2007
-- Bugfix:   (MB) Work item 9630 - PHPExcel_Reader_Excel2007 not reading the first user-defined number format
-- Bugfix:   (MB) Work item 9647 - Print area converted to uppercase after read with PHPExcel_Reader_Excel2007
-- Bugfix:   (MB) Work item 9661 - Incorrect reading of scope for named range using PHPExcel_Reader_Excel2007
-- Bugfix:   (MB) Work item 9690 - Error with pattern (getFillType) and rbg (getRGB)
-- Bugfix:   (ET) Work item 9712 - AdvancedValueBinder affected by system timezone setting when inserting date values
-- Bugfix:   (ET) Work item 9743 - PHPExcel_Reader_Excel2007 not reading value of active sheet index
-- Bugfix:   (ET) Work item 9742 - getARGB() sometimes returns SimpleXMLElement object instead of string with PHPExcel_Reader_Excel2007
-- Bugfix:   (ET) Work item 9731 - Negative image offset causes defects in 14excel5.xls and 20readexcel5.xlsx
-- Bugfix:   (ET) Work item 9758 - HTML & PDF Writer not working with mergeCells (regression since 1.6.5)
-- Bugfix:   (ET) Work item 9774 - Too wide columns with HTML and PDF writer
-- Bugfix:   (MB) Work item 9775 - PDF and cyrillic fonts
-- Bugfix:   (ET) Work item 9793 - Percentages not working correctly with HTML and PDF writers (shows 0.25% instead of 25%)
-- Bugfix:   (ET) Work item 9791 - PHPExcel_Writer_HTML creates extra borders around cell contents using setUseInlineCss(true)
-- Bugfix:   (ET) Work item 9784 - Problem with text wrap + merged cells in HTML and PDF writer
-- Bugfix:   (ET) Work item 9814 - Adjacent path separators in include_path causing IOFactory to violate open_basedir restriction
-
-
---------------------------------------------------------------------------------
-BREAKING CHANGE! In previous versions of PHPExcel up to and including 1.6.6,
-when a cell had a date-like number format code, it was possible to enter a date
-directly using an integer PHP-time without converting to Excel date format.
-
-Starting with PHPExcel 1.6.7 this is no longer supported. Refer to the developer
-documentation for more information on entering dates into a cell.
---------------------------------------------------------------------------------
-
-
-2009/03/02 (v1.6.6):
-- General:  (MB) Work item 9102 - Improve support for built-in number formats in PHPExcel_Reader_Excel2007
-- General:  (ET) Work item 9281 - Source files are in both UNIX and DOS formats - changed to UNIX
-- General:  (MB) Work item 9338 - Update documentation: Which language to write formulas in?
-- Feature:  (ET) Work item 8817 - Ignore DEFCOLWIDTH records with value 8 in PHPExcel_Reader_Excel5
-- Feature:  (ET) Work item 8847 - Support for width, height, offsetX, offsetY for images in PHPExcel_Reader_Excel5
-- Feature:  (MB) Work item 8870 - Disk Caching in specific folder
-- Feature:  (MBaker) Work item 2346 - Added SUMX2MY2, SUMX2PY2, SUMXMY2, MDETERM and MINVERSE Mathematical and Trigonometric Functions
-- Feature:  (MBaker) Work item 2346 - Added CONVERT Engineering Function
-- Feature:  (MBaker) Work item 2346 - Added DB, DDB, DISC, DOLLARDE, DOLLARFR, INTRATE, IPMT, PPMT, PRICEDISC, PRICEMAT and RECEIVED Financial Functions
-- Feature:  (MBaker) Work item 2346 - Added ACCRINTM, CUMIPMT, CUMPRINC, TBILLEQ, TBILLPRICE, TBILLYIELD, YIELDDISC and YIELDMAT Financial Functions
-- Feature:  (MBaker) Work item 2346 - Added DOLLAR Text Function
-- Feature:  (MBaker) Work item 2346 - Added CORREL, COVAR, FORECAST, INTERCEPT, RSQ, SLOPE and STEYX Statistical Functions
-- Feature:  (MBaker) Work item 2346 - Added PEARSON Statistical Functions as a synonym for CORREL
-- Feature:  (MBaker) Work item 2346 - Added LINEST, LOGEST (currently only valid for stats = false), TREND and GROWTH Statistical Functions
-- Feature:  (MBaker) Work item 2346 - Added RANK and PERCENTRANK Statistical Functions
-- Feature:  (MBaker) Work item 2346 - Added ROMAN Mathematical Function (Classic form only)
-- Feature:  (MB) Work item 8931 - Update documentation to show example of getCellByColumnAndRow($col, $row)
-- Feature:  (MB) Work item 8770 - Implement worksheet, row and cell iterators
-- Feature:  (MB) Work item 9001 - Support for arbitrary defined names (named range)
-- Feature:  (MB, ET) Work item 9016 - Update formulas when sheet title / named range title changes
-- Feature:  (MB) Work item 9103 - Ability to read cached calculated value
-- Feature:  (MBaker, ET) Work item 8483 - Support for Excel 1904 calendar date mode (Mac)
-- Feature:  (ET) Work item 9194 - PHPExcel_Writer_Excel5 improvements writing shared strings table
-- Feature:  (ET) Work item 9248 - PHPExcel_Writer_Excel5 iconv fallback when mbstring extension is not enabled
-- Feature:  (ET) Work item 9253 - UTF-8 support in font names in PHPExcel_Writer_Excel5
-- Feature:  (MB) Work item 9215 - Implement value binding architecture
-- Feature:  (MB) Work item 6742 - PDF writer not working with UTF-8
-- Feature:  (ET) Work item 9355 - Eliminate duplicate style entries in multisheet workbook written by PHPExcel_Writer_Excel5
-- Bugfix:   (ET) Work item 8810 - Redirect to client browser fails due to trailing white space in class definitions
-- Bugfix:   (MB) Work item 8816 - Spurious column dimension element introduced in blank worksheet after using PHPExcel_Writer_Excel2007
-- Bugfix:   (ET) Work item 8830 - Image gets slightly narrower than expected when using PHPExcel_Writer_Excel5
-- Bugfix:   (ET) Work item 8831 - Image laid over non-visible row gets squeezed in height when using PHPExcel_Writer_Excel5
-- Bugfix:   (ET) Work item 8860 - PHPExcel_Reader_Excel5 fails when there are 10 or more images in the workbook
-- Bugfix:   (MB) Work item 8909 - Different header/footer images in different sheets not working with PHPExcel_Writer_Excel2007
-- Bugfix:   (MB, ET) Work item 8924 - Fractional seconds disappear when using PHPExcel_Reader_Excel2007 and PHPExcel_Reader_Excel5
-- Bugfix:   (ET) Work item 7994 - Images not showing in OpenOffice when using PHPExcel_Writer_Excel5
-- Bugfix:   (ET) Work item 9047 - Images not showing on print using PHPExcel_Writer_Excel5
-- Bugfix:   (ET) Work item 9085 - PHPExcel_Writer_Excel5 maximum allowed record size 4 bytes too short
-- Bugfix:   (MB) Work item 9119 - Not numeric strings are formatted as dates and numbers using worksheet's toArray method
-- Bugfix:   (ET) Work item 9132 - Excel5 simple formula parsing error
-- Bugfix:   (ET) Work item 9206 - Problems writing dates with CSV
-- Bugfix:   (ET) Work item 9203 - PHPExcel_Reader_Excel5 reader fails with fatal error when reading group shapes
-- Bugfix:   (ET) Work item 9231 - PHPExcel_Writer_Excel5 fails completely when workbook contains more than 57 colors
-- Bugfix:   (ET) Work item 9244 - PHPExcel_Writer_PDF not compatible with autoload
-- Bugfix:   (ET) Work item 9250 - Fatal error: Call to a member function getNestingLevel() on a non-object in PHPExcel/Reader/Excel5.php on line 690
-- Bugfix:   (MB) Work item 9246 - Notices when running test 04printing.php on PHP 5.2.8
-- Bugfix:   (MB) Work item 9294 - insertColumn() spawns creation of spurious RowDimension
-- BugFix:   (MBaker) Work item 9296 - Fix declarations for methods in extended Trend classes
-- Bugfix:   (MBaker) Work item 2346 - Fix to parameters for the FORECAST Statistical Function
-- Bugfix:   (MB) Work item 7083 - PDF writer problems with cell height and text wrapping
-- Bugfix:   (MBaker) Work Item 9337 - Fix test for calculated value in case the returned result is an array
-- Bugfix:   (ET) Work Item 9354 - Column greater than 256 results in corrupt Excel file using PHPExcel_Writer_Excel5
-- Bugfix:   (MB) Work item 9351 - Excel Numberformat 0.00 results in non internal decimal places values in toArray() Method
-- Bugfix:   (MB,ET) Work item 9356 - setAutoSize not taking into account text rotation
-- Bugfix:   (ET) Work item 9372 - Call to undefined method PHPExcel_Worksheet_MemoryDrawing::getPath() in PHPExcel/Writer/HTML.php
-
-
-2009/01/05 (v1.6.5):
-- General:  (MB) Applied patch 2063
-- General:  (MB) Applied patch from work item 8073 - Optimise Shared Strings
-- General:  (MB) Applied patch from work item 8074 - Optimise Cell Sorting
-- General:  (MB) Applied patch from work item 8075 - Optimise Style Hashing
-- General:  (ET) Applied patch from work item 8245 - UTF-8 enhancements
-- General:  (ET) Applied patch from work item 8283 - PHPExcel_Writer_HTML validation errors against strict HTML 4.01 / CSS 2.1
-- General:  (MB) Documented work items 6203 and 8110 in manual
-- General:  (ET) Restructure package hierachy so classes can be found more easily in auto-generated API (from work item 8468)
-- General:  (MB) Work item 8806 - Redirect output to a client's browser: Update recommendation in documentation
-- Feature:  (ET) Work item 7897 - PHPExcel_Reader_Excel5 support for print gridlines
-- Feature:  (ET) Work item 7899 - Screen gridlines support in Excel5 reader/writer
-- Feature:  (MB, ET) Work item 7552 - Option for adding image to spreadsheet from image resource in memory
-- Feature:  (ET) Work item 7862 - PHPExcel_Reader_Excel5 style support for BIFF5 files (Excel 5.0 - Excel 95)
-- Feature:  (ET) Work item 7918 - PHPExcel_Reader_Excel5 support for user-defined colors and special built-in colors
-- Feature:  (ET) Work item 7992 - Support for freeze panes in PHPExcel_Reader_Excel5
-- Feature:  (ET) Work item 7996 - Support for header and footer margins in PHPExcel_Reader_Excel5
-- Feature:  (ET) Work item 7997 - Support for active sheet index in Excel5 reader/writer
-- Feature:  (MB) Work item 7991 - Freeze panes not read by PHPExcel_Reader_Excel2007
-- Feature:  (MB, ET) Work item 7993 - Support for screen zoom level (feature request)
-- Feature:  (ET) Work item 8012 - Support for default style in PHPExcel_Reader_Excel5
-- Feature:  (MB) Work item 8094 - Apple iWork / Numbers.app incompatibility
-- Feature:  (MB) Work item 7931 - Support "between rule" in conditional formatting
-- Feature:  (MB) Work item 8308 - Comment size, width and height control (feature request)
-- Feature:  (ET) Work item 8418 - Improve method for storing MERGEDCELLS records in PHPExcel_Writer_Excel5
-- Feature:  (ET) Work item 8435 - Support for protectCells() in Excel5 reader/writer
-- Feature:  (ET) Work item 8472 - Support for fitToWidth and fitToHeight pagesetup properties in PHPExcel_Reader_Excel5
-- Feature:  (ET) Work item 8489 - Support for setShowSummaryBelow() and setShowSummaryRight() in PHPExcel_Writer_Excel5
-- Feature:  (MB) Work item 8483 - Support for Excel 1904 calendar date mode (Mac)
-- Feature:  (ET) Work item 7538 - Excel5 reader: Support for reading images (bitmaps)
-- Feature:  (ET) Work item 8787 - Support for default style in PHPExcel_Writer_Excel5
-- Feature:  (MBaker) Modified calculate() method to return either an array or the first value from the array for those functions that return arrays rather than single values (e.g the MMULT and TRANSPOSE function). This performance can be modified based on the $returnArrayAsType which can be set/retrieved by calling the setArrayReturnType() and getArrayReturnType() methods of the PHPExcel_Calculation class.
-- Feature:  (MBaker) Work item 2346 - Added ERROR.TYPE Information Function, MMULT Mathematical and Trigonometry Function, and TRANSPOSE Lookup and Reference Function
-- Bugfix:   (ET) Work item 7896 - setPrintGridlines(true) not working with PHPExcel_Writer_Excel5
-- Bugfix:   (ET) Work item 7907 - Incorrect mapping of fill patterns in PHPExcel_Writer_Excel5
-- Bugfix:   (MB) Work item 7898 - setShowGridlines(false) not working with PHPExcel_Writer_Excel2007
-- Bugfix:   (MB) Work item 7905 - getShowGridlines() gives inverted value when reading sheet with PHPExcel_Reader_Excel2007
-- Bugfix:   (ET) Work item 7944 - User-defined column width becomes slightly larger after read/write with Excel5
-- Bugfix:   (ET) Work item 7949 - Incomplete border style support in PHPExcel_Writer_Excel5
-- Bugfix:   (MB) Work item 7928 - Conditional formatting "containsText" read/write results in MS Office Excel 2007 crash
-- Bugfix:   (MB) Work item 7995 - All sheets are always selected in output when using PHPExcel_Writer_Excel2007
-- Bugfix:   (MB) Work item 8013 - COLUMN function warning message during plain read/write
-- Bugfix:   (MB) Work item 8155 - setValue(0) results in string data type '0'
-- Bugfix:   (MB) Work item 8226 - Styles not removed when removing rows from sheet
-- Bugfix:   (MB) Work item 8301 - =IF formula causes fatal error during $objWriter->save() in Excel2007 format
-- Bugfix:   (ET) Work item 8333 - Exception thrown reading valid xls file: "Excel file is corrupt. Didn't find CONTINUE record while reading shared strings"
-- Bugfix:   (ET) Work item 8320 - MS Outlook corrupts files generated by PHPExcel_Writer_Excel5
-- Bugfix:   (MB) Work item 8351 - Undefined method PHPExcel_Worksheet::setFreezePane() in ReferenceHelper.php on line 271
-- Bugfix:   (MB) Work item 8401 - Ampersands (&), left and right angles (<, >) in Rich-Text strings leads to corrupt output using PHPExcel_Writer_Excel2007
-- Bugfix:   (ET) Work item 8408 - Print header and footer not supporting UTF-8 in PHPExcel_Writer_Excel5
-- Bugfix:   (ET) Work item 8463 - Vertical page breaks not working with PHPExcel_Writer_Excel5
-- Bugfix:   (ET) Work item 8476 - Missing support for accounting underline types in PHPExcel_Writer_Excel5
-- Bugfix:   (ET) Work item 8482 - Infinite loops when reading corrupt xls file using PHPExcel_Reader_Excel5
-- Bugfix:   (ET) Work item 8566 - Sheet protection password not working with PHPExcel_Writer_Excel5
-- Bugfix:   (ET) Work item 8596 - PHPExcel_Style_NumberFormat::FORMAT_NUMBER ignored by PHPExcel_Writer_Excel5
-- Bugfix:   (ET) Work item 8781 - PHPExcel_Reader_Excel5 fails a whole when workbook contains a chart
-- Bugfix:   (ET) Work item 8788 - Occasional loss of column widths using PHPExcel_Writer_Excel5
-- Bugfix:   (ET) Work item 8795 - Notices while reading formulas with deleted sheet references using PHPExcel_Reader_Excel5
-- Bugfix:   (MB) Work item 8807 - Default style not read by PHPExcel_Reader_Excel2007
-- Bugfix:   (MB) Work item 9341 - Blank rows occupy too much space in file generated by PHPExcel_Writer_Excel2007
-
-
-2008/10/27 (v1.6.4):
-- General:  (ET) Work item 7882 - RK record number error in MS developer documentation: 0x007E should be 0x027E
-- Feature:  (MBaker) Work item 7878 - getHighestColumn() returning "@" for blank worksheet causes corrupt output
-- Feature:  (MBaker) Work item 2346 - Implement ROW and COLUMN Lookup/Reference Functions (when specified with a parameter)
-- Feature:  (MBaker) Work item 2346 - Implement initial work on OFFSET Lookup/Reference Function (returning address rather than value at address)
-- Feature:  (ET) Work item 7416 - Excel5 reader: Page margins
-- Feature:  (ET) Work item 7417 - Excel5 reader: Header & Footer
-- Feature:  (ET) Work item 7449 - Excel5 reader support for page setup (paper size etc.)
-- Feature:  (MB) Work item 7445 - Improve speed and memory consumption of PHPExcel_Writer_CSV
-- Feature:  (MB) Work item 7432 - Better recognition of number format in HTML, CSV, and PDF writer
-- Feature:  (MB) Work item 7485 - Font support: Superscript and Subscript
-- Feature:  (ET) Work item 7509 - Excel5 reader font support: Super- and subscript
-- Feature:  (ET) Work item 7521 - Excel5 reader style support: Text rotation and stacked text
-- Feature:  (ET) Work item 7530 - Excel5 reader: Support for hyperlinks
-- Feature:  (MB, ET) Work item 7557 - Import sheet by request
-- Feature:  (ET) Work item 7607 - PHPExcel_Reader_Excel5 support for page breaks
-- Feature:  (ET) Work item 7622 - PHPExcel_Reader_Excel5 support for shrink-to-fit
-- Feature:  (MB, ET) Work item 7675 - Support for error types
-- Feature:  (ET) Work item 7388 - Excel5 reader true formula support
-- Feature:  (ET) Work item 7701 - Support for named ranges (defined names) in PHPExcel_Reader_Excel5
-- Feature:  (ET) Work item 7781 - Support for repeating rows and repeating columns (print titles) in PHPExcel_Reader_Excel5
-- Feature:  (ET) Work item 7783 - Support for print area in PHPExcel_Reader_Excel5
-- Feature:  (ET) Work item 7795 - Excel5 reader and writer support for horizontal and vertical centering of page
-- Feature:  (MB) Applied patch 1962
-- Feature:  (ET) Work item 7866 - Excel5 reader and writer support for hidden cells (formulas)
-- Feature:  (MB, ET) Work item 7612 - Support for indentation in cells (feature request)
-- Feature:  (MB, ET) Work item 7828 - Option for reading only specified interval of rows in a sheet
-- Bugfix:   (MBaker) Work item 7367 - PHPExcel_Calculation_Functions::DATETIMENOW() and PHPExcel_Calculation_Functions::DATENOW() to force UTC
-- Bugfix:   (MBaker) Work item 7395 - Modified PHPExcel_Shared_Date::FormattedPHPToExcel() and PHPExcel_Shared_Date::ExcelToPHP to force datatype for return values
-- Bugfix:   (ET) Work item 7450 - Excel5 reader not producing UTF-8 strings with BIFF5 files
-- Bugfix:   (MB) Work item 7470 - Array constant in formula gives run-time notice with Excel2007 writer
-- Bugfix:   (MB) Work item 7494 - PHPExcel_Reader_Excel2007 setReadDataOnly(true) returns Rich-Text
-- Bugfix:   (ET) Work item 7496 - PHPExcel_Reader_Excel5 setReadDataOnly(true) returns Rich-Text
-- Bugfix:   (MB) Work item 7497 - Characters before superscript or subscript losing style
-- Bugfix:   (MB) Work item 7507 - Subscript not working with HTML writer
-- Bugfix:   (MB) Work item 7508 - DefaultColumnDimension not working on first column (A)
-- Bugfix:   (MB) Work item 7527 - Negative numbers are stored as text in PHPExcel_Writer_2007
-- Bugfix:   (ET) Work item 7531 - Text rotation and stacked text not working with PHPExcel_Writer_Excel5
-- Bugfix:   (MB) Work item 7536 - PHPExcel_Shared_Date::isDateTimeFormatCode erroneously says true
-- Bugfix:   (MB) Work item 7559 - Different images with same filename in separate directories become duplicates
-- Bugfix:   (ET) Work item 7568 - PHPExcel_Reader_Excel5 not returning sheet names as UTF-8 using for Excel 95 files
-- Bugfix:   (MB) Work item 7575 - setAutoSize(true) on empty column gives column width of 10 using PHPExcel_Writer_Excel2007
-- Bugfix:   (MB, ET) Work item 7573 - setAutoSize(true) on empty column gives column width of 255 using PHPExcel_Writer_Excel5
-- Bugfix:   (MB) Work item 7514 - Worksheet_Drawing bug
-- Bugfix:   (MB) Work item 7593 - getCalculatedValue() with REPT function causes script to stop
-- Bugfix:   (MB) Work item 7594 - getCalculatedValue() with LEN function causes script to stop
-- Bugfix:   (MB) Work item 7600 - Explicit fit-to-width (page setup) results in fit-to-height becoming 1
-- Bugfix:   (MB) Work item 7610 - Fit-to-width value of 1 is lost after read/write of Excel2007 spreadsheet
-- Bugfix:   (MB) Work item 7516 - Conditional styles not read properly using PHPExcel_Reader_Excel2007
-- Bugfix:   (MB) Work item 7611 - PHPExcel_Writer_2007: Default worksheet style works only for first sheet
-- Bugfix:   (ET) Work item 6940 - Cannot Lock Cells using PHPExcel_Writer_Excel5
-- Bugfix:   (ET) Work item 7621 - Incorrect cell protection values found when using Excel5 reader
-- Bugfix:   (ET) Work item 7623 - Default row height not working above highest row using PHPExcel_Writer_Excel5
-- Bugfix:   (ET) Work item 7637 - Default column width does not get applied when using PHPExcel_Writer_Excel5
-- Bugfix:   (ET) Work item 7642 - Broken support for UTF-8 string formula results in PHPExcel_Reader_Excel5
-- Bugfix:   (ET) Work item 7643 - UTF-8 sheet names not working with PHPExcel_Writer_Excel5
-- Bugfix:   (MB) Work item 7631 - getCalculatedValue() with ISNONTEXT function causes script to stop
-- Bugfix:   (ET) Work item 7652 - Missing BIFF3 functions in PHPExcel_Writer_Excel5: USDOLLAR (YEN), FINDB, SEARCHB, REPLACEB, LEFTB, RIGHTB, MIDB, LENB, ASC, DBCS (JIS)
-- Bugfix:   (ET) Work item 7663 - Excel5 reader doesn't read numbers correctly in 64-bit systems
-- Bugfix:   (ET) Work item 7667 - Missing BIFF5 functions in PHPExcel_Writer_Excel5: ISPMT, DATEDIF, DATESTRING, NUMBERSTRING
-- Bugfix:   (ET) Work item 7668 - Missing BIFF8 functions in PHPExcel_Writer_Excel5: GETPIVOTDATA, HYPERLINK, PHONETIC, AVERAGEA, MAXA, MINA, STDEVPA, VARPA, STDEVA, VARA
-- Bugfix:   (MB) Work item 7657 - Wrong host value in PHPExcel_Shared_ZipStreamWrapper::stream_open()
-- Bugfix:   (ET) Work item 7676 - PHPExcel_Reader_Excel5 not reading explicitly entered error types in cells
-- Bugfix:   (ET) Work item 7678 - Boolean and error data types not preserved for formula results in PHPExcel_Reader_Excel5
-- Bugfix:   (MB) Work item 7695 - PHPExcel_Reader_Excel2007 ignores cell data type
-- Bugfix:   (ET) Work item 7712 - PHPExcel_Reader_Excel5 ignores cell data type
-- Bugfix:   (ET) Work item 7587 - PHPExcel_Writer_Excel5 not aware of data type
-- Bugfix:   (ET) Work item 7713 - Long strings sometimes truncated when using PHPExcel_Reader_Excel5
-- Bugfix:   (ET) Work item 7727 - Direct entry of boolean or error type in cell not supported by PHPExcel_Writer_Excel5
-- Bugfix:   (MB) Work item 7714 - PHPExcel_Reader_Excel2007: Error reading cell with data type string, date number format, and numeric-like cell value
-- Bugfix:   (ET) Work item 7735 - Row and column outlines (group indent level) not showing after using PHPExcel_Writer_Excel5
-- Bugfix:   (ET) Work item 7737 - Missing UTF-8 support in number format codes for PHPExcel_Writer_Excel5
-- Bugfix:   (ET) Work item 7750 - Missing UTF-8 support with PHPExcel_Writer_Excel5 for explicit string in formula
-- Bugfix:   (MB) Work item 7726 - Problem with class constants in PHPExcel_Style_NumberFormat
-- Bugfix:   (ET) Work item 7758 - Sometimes errors with PHPExcel_Reader_Excel5 reading hyperlinks
-- Bugfix:   (ET) Work item 7759 - Hyperlink in cell always results in string data type when using PHPExcel_Writer_Excel5
-- Bugfix:   (ET) Work item 7771 - Excel file with blank sheet seen as broken in MS Office Excel 2007 when created by PHPExcel_Writer_Excel5
-- Bugfix:   (ET) Work item 7785 - PHPExcel_Reader_Excel5: Incorrect reading of formula with explicit string containing (escaped) double-quote
-- Bugfix:   (MB) Work item 7787 - getCalculatedValue() fails on formula with sheet name containing (escaped) single-quote
-- Bugfix:   (MB) Work item 7786 - getCalculatedValue() fails on formula with explicit string containing (escaped) double-quote
-- Bugfix:   (MB) Work item 7780 - Problems with simultaneous repeatRowsAtTop and repeatColumnsAtLeft using Excel2007 reader and writer
-- Bugfix:   (ET) Work item 7802 - PHPExcel_Reader_Excel5: Error reading formulas with sheet reference containing special characters
-- Bugfix:   (ET) Work item 7831 - Off-sheet references sheet!A1 not working with PHPExcel_Writer_Excel5
-- Bugfix:   (ET) Work item 7834 - Repeating rows/columns (print titles), print area not working with PHPExcel_Writer_Excel5
-- Bugfix:   (ET) Work item 7849 - Formula having datetime number format shows as text when using PHPExcel_Writer_Excel5
-- Bugfix:   (MBaker) Work item 7863 - Cannot set formula to hidden using applyFromArray()
-- Bugfix:   (MBaker) Work item 7805 - HTML/PDF Writers limited to 26 columns by calculateWorksheetDimension (erroneous comparison in getHighestColumn() method)
-- Bugfix:   (MB) Work item 7873 - Formula returning error type is lost when read by PHPExcel_Reader_Excel2007
-- Bugfix:   (ET) Work item 7883 - PHPExcel_Reader_Excel5: Cell style lost for last column in group of blank cells
-- Bugfix:   (MB) Work item 7886 - Column width sometimes collapses to auto size using Excel2007 reader/writer
-- Bugfix:   (MB) Work item 9343 - Data Validation Formula = 0 crashes Excel
-
-
-2008/08/25 (v1.6.3):
-- Bugfix:   (MBaker) Work item 7367 - Modified PHPExcel_Shared_Date::PHPToExcel() to force UTC
-- General:  (MB) Applied patch 1629
-- General:  (MB) Applied patch 1644
-- General:  (MB) Work item 6485 - Implement repeatRow and repeatColumn in Excel5 writer
-- General:  (MB) Work item 6838 - Remove scene3d filter in Excel2007 drawing
-- Feature:  (MBaker) Work item 2346 - Implement CHOOSE and INDEX Lookup/Reference Functions
-- Feature:  (MBaker) Work item 2346 - Implement CLEAN Text Functions
-- Feature:  (MBaker) Work item 2346 - Implement YEARFRAC Date/Time Functions
-- Feature:  (MB) Work item 6508 - Implement 2 options for print/show gridlines
-- Feature:  (MB) Work item 7270 - Add VLOOKUP function (contribution)
-- Feature:  (MB) Work item 7182 - Implemented: ShrinkToFit
-- Feature:  (MB) Work item 7218 - Row heights not updated correctly when inserting new rows
-- Feature:  (MB) Work item 7157 - Copy worksheets within the same workbook
-- Feature:  (ET) Work item 7290 - Excel5 reader style support: horizontal and vertical alignment plus text wrap
-- Feature:  (ET) Work item 7294 - Excel5 reader support for merged cells
-- Feature:  (ET) Work item 7296 - Excel5 reader: Sheet Protection
-- Feature:  (ET) Work item 7297 - Excel5 reader: Password for sheet protection
-- Feature:  (ET) Work item 7299 - Excel5 reader: Column width
-- Feature:  (ET) Work item 7301 - Excel5 reader: Row height
-- Feature:  (ET) Work item 7304 - Excel5 reader: Font support
-- Feature:  (ET) Work item 7324 - Excel5 reader: support for locked cells
-- Feature:  (ET) Work item 7330 - Excel5 reader style support: Fill (background colors and patterns)
-- Feature:  (ET) Work item 7332 - Excel5 reader style support: Borders (style and color)
-- Feature:  (ET) Work item 7346 - Excel5 reader: Rich-Text support
-- Feature:  (MB) Work item 7313 - Read Excel built-in number formats with Excel 2007 reader
-- Feature:  (ET) Work item 7317 - Excel5 reader: Number format support
-- Feature:  (MB) Work item 7362 - Creating a copy of PHPExcel object
-- Feature:  (ET) Work item 7373 - Excel5 reader: support for row / column outline (group)
-- Feature:  (MB) Work item 7380 - Implement default row/column sizes
-- Feature:  (MB) Work item 7364 - Writer HTML - option to return styles and table separately
-- Feature:  (ET) Work item 7393 - Excel5 reader: Support for remaining built-in number formats
-- Bugfix:   (MBaker) Fixed rounding in HOUR MINUTE and SECOND Time functions, and improved performance for these
-- Bugfix:   (MBaker) Fix to TRIM function
-- Bugfix:   (MBaker) Fixed range validation in TIME Functions.php
-- Bugfix:   (MBaker) EDATE and EOMONTH functions now return date values based on the returnDateType flag
-- Bugfix:   (MBaker) Write date values that are the result of a calculation function correctly as Excel serialized dates rather than PHP serialized date values
-- Bugfix:   (MB) Work item 6690 - Excel2007 reader not always reading boolean correctly
-- Bugfix:   (MB) Work item 6275 - Columns above IZ
-- Bugfix:   (MB) Work item 6853 - Other locale than English causes Excel2007 writer to produce broken xlsx
-- Bugfix:   (MB) Work item 7061 - Typo: Number_fromat in NumberFormat.php
-- Bugfix:   (MB) Work item 6865 - Bug in Worksheet_BaseDrawing setWidth()
-- Bugfix:   (MB) Work item 6891 - PDF writer collapses column width for merged cells
-- Bugfix:   (MB) Work item 6867 - Issues with drawings filenames
-- Bugfix:   (MB) Work item 7073 - fromArray() local variable isn't defined
-- Bugfix:   (MB) Work item 7276 - PHPExcel_Writer_Excel5->setTempDir() not passed to all classes involved in writing to a file
-- Bugfix:   (MB) Work item 7277 - Excel5 reader not handling UTF-8 properly
-- Bugfix:   (MB) Work item 7327 - If you write a 0 value in cell, cell shows as empty
-- Bugfix:   (MB) Work item 7302 - Excel2007 writer: Row height ignored for empty rows
-- Bugfix:   (MB) Work item 7281 - Excel2007 (comments related error)
-- Bugfix:   (MB) Work item 7345 - Column width in other locale
-- Bugfix:   (MB) Work item 7347 - Excel2007 reader not reading underlined Rich-Text
-- Bugfix:   (ET) Work item 7357 - Excel5 reader converting booleans to strings
-- Bugfix:   (MB) Work item 7365 - Recursive Object Memory Leak
-- Bugfix:   (MB) Work item 7372 - Excel2007 writer ignoring row dimensions without cells
-- Bugfix:   (ET) Work item 7382 - Excel5 reader is converting formatted numbers / dates to strings
-
-
-2008/06/23 (v1.6.2):
-- General:  (MB) Work item 6088 - Document style array values
-- General:  (MB) Applied patch 1195
-- General:  (MB) Work item 6178 - Redirecting output to a client’s web browser - http headers
-- General:  (MB) Work item 6187 - Improve worksheet garbage collection
-- General:  (MBaker) Functions that return date values can now be configured to return as Excel serialized date/time, PHP serialized date/time, or a PHP date/time object.
-- General:  (MBaker) Functions that explicitly accept dates as parameters now permit values as Excel serialized date/time, PHP serialized date/time, a valid date string, or a PHP date/time object.
-- General:  (MBaker) Implement ACOSH, ASINH and ATANH functions for those operating platforms/PHP versions that don't include these functions
-- General:  (MBaker) Implement ATAN2 logic reversing the arguments as per Excel
-- General:  (MBaker) Additional validation of parameters for COMBIN
-- General:  (MBaker) Fixed validation for CEILING and FLOOR when the value and significance parameters have different signs; and allowed default value of 1 or -1 for significance when in GNUMERIC compatibility mode
-- Feature:  (MBaker) Work item 2346 - Implement ADDRESS, ISLOGICAL, ISTEXT and ISNONTEXT functions
-- Feature:  (MBaker) Work item 2346 - Implement COMPLEX, IMAGINARY, IMREAL, IMARGUMENT, IMCONJUGATE, IMABS, IMSUB, IMDIV, IMSUM, IMPRODUCT, IMSQRT, IMEXP, IMLN, IMLOG10, IMLOG2, IMPOWER IMCOS and IMSIN Engineering functions
-- Feature:  (MBaker) Work item 2346 - Implement NETWORKDAYS and WORKDAY Date/Time functions
-- Feature:  (MB) Work item 6100 - Make cell column AAA available
-- Feature:  (MB) Work item 6095 - Mark particular cell as selected when opening Excel
-- Feature:  (MB) Work item 6120 - Multiple sheets in PDF and HTML
-- Feature:  (MB) Work item 6227 - Implement PHPExcel_ReaderFactory and PHPExcel_WriterFactory
-- Feature:  (MB) Work item 6249 - Set image root of PHPExcel_Writer_HTML
-- Feature:  (MB) Work item 6264 - Enable/disable calculation cache
-- Feature:  (MB) Work item 6259 - PDF writer and multi-line text
-- Feature:  (MB) Work item 6350 - Feature request - setCacheExpirationTime()
-- Feature:  (JB) Work item 6370 - Implement late-binding mechanisms to reduce memory footprint
-- Feature:  (JB) Work item 6430 - Implement shared styles
-- Feature:  (MB) Work item 6391 - Copy sheet from external Workbook to active Workbook
-- Feature:  (MB) Work item 6428 - Functions in Conditional Formatting
-- Bugfix:   (MB) Work item 6096 - Default Style in Excel5
-- Bugfix:   (MB) Work item 6150 - Numbers starting with '+' cause Excel 2007 errors
-- Bugfix:   (MB) Work item 6092 - ExcelWriter5 is not PHP5 compatible, using it with E_STRICT results in a bunch of errors (applied patches)
-- Bugfix:   (MB) Work item 6179 - Error Reader Excel2007 line 653 foreach ($relsDrawing->Relationship as $ele)
-- Bugfix:   (MB) Work item 6229 - Worksheet toArray() screws up DATE
-- Bugfix:   (MB) Work item 6253 - References to a Richtext cell in a formula
-- Bugfix:   (MB) Work item 6285 - insertNewColumnBefore Bug
-- Bugfix:   (MB) Work item 6319 - Error reading Excel2007 file with shapes
-- Bugfix:   (MBaker) Work item 6302 - Determine whether date values need conversion from PHP dates to Excel dates before writing to file, based on the data type (float or integer)
-- Bugfix:   (MBaker) Fixes to DATE function when it is given negative input parameters
-- Bugfix:   (MB) Work item 6347 - PHPExcel handles empty cells other than Excel
-- Bugfix:   (MB) Work item 6348 - PHPExcel handles 0 and "" as being the same
-- Bugfix:   (MB) Work item 6357 - Problem Using Excel2007 Reader for Spreadsheets containing images
-- Bugfix:   (MB) Work item 6359 - ShowGridLines ignored when reading/writing Excel 2007
-- Bugfix:   (MB) Work item 6426 - Bug With Word Wrap in Excel 2007 Reader
-
-
-2008/04/28 (v1.6.1):
-- General:  (MB) Work item 5532 - Fix documentation printing
-- General:  (MB) Work item 5586 - Memory usage improvements
-- General:  (MB) Applied patch 990
-- General:  (MB) Applied patch 991
-- Feature:  (BM) Work item 2841 - Implement PHPExcel_Reader_Excel5
-- Feature:  (MB) Work item 5564 - Implement "toArray" and "fromArray" method
-- Feature:  (MB) Work item 5665 - Read shared formula
-- Feature:  (MB) Work item 5681 - Read image twoCellAnchor
-- Feature:  (MB) Work item 4446 - &G Image as bg for headerfooter
-- Feature:  (MB) Work item 5834 - Implement page layout functionality for Excel5 format
-- Feature:  (MB) Work item 6039 - Feature request: PHPExcel_Writer_PDF
-- Bugfix:   (MB) Work item 5517 - DefinedNames null check
-- Bugfix:   (MB) Work item 5463 - Hyperlinks should not always have trailing slash
-- Bugfix:   (MB) Work item 5592 - Saving Error - Uncaught exception (#REF! named range)
-- Bugfix:   (MB) Work item 5634 - Error when creating Zip file on Linux System (Not Windows)
-- Bugfix:   (MB) Work item 5876 - Time incorrecly formated
-- Bugfix:   (MB) Work item 5914 - Conditional formatting - second rule not applied
-- Bugfix:   (MB) Work item 5978 - PHPExcel_Reader_Excel2007 cannot load PHPExcel_Shared_File
-- Bugfix:   (MB) Work item 6020 - Output redirection to web browser
-
-
-2008/02/14 (v1.6.0):
-- General:  (MB) Work item 3156 - Use PHPExcel datatypes in formula calculation
-- Feature:  (MB) Work item 5019 - Center on page when printing
-- Feature:  (MB) Work item 5099 - Hyperlink to other spreadsheet
-- Feature:  (MB) Work item 5104 - Set the print area of a worksheet
-- Feature:  (MB) Work item 5118 - Read "definedNames" property of worksheet
-- Feature:  (MB) Work item 5338 - Set default style for all cells
-- Feature:  (MB) Work item 4216 - Named Ranges
-- Feature:  (MB) Work item 5398 - Implement worksheet references (Sheet1!A1)
-- Bugfix:   (MB) Work item 4967 - Redirect output to a client's web browser
-- Bugfix:   (MB) Work item 5008 - "File Error: data may have been lost." seen in Excel 2007 and Excel 2003 SP3 when opening XLS file
-- Bugfix:   (MB) Work item 5165 - Bug in style's getHashCode()
-- Bugfix:   (MB) Work item 5165 - PHPExcel_Reader not correctly reading numeric values
-- Bugfix:   (MB) Work item 5324 - Text rotation is read incorrectly
-- Bugfix:   (MB) Work item 5326 - Enclosure " and data " result a bad data : \" instead of ""
-- Bugfix:   (MB) Work item 5332 - Formula parser - IF statement returning array instead of scalar
-- Bugfix:   (MB) Work item 5351 - setFitToWidth(nbpage) & setFitToWidth(nbpage) work partially
-- Bugfix:   (MB) Work item 5361 - Worksheet::setTitle() causes unwanted renaming
-- Bugfix:   (MB) Work item 5407 - Hyperlinks not working. Results in broken xlsx file.
-
-
-2007/12/24 (v1.5.5):
-- General:  (MB) Work item 4135 - Grouping Rows
-- General:  (MB) Work item 4427 - Semi-nightly builds
-- Feature:  (MB) Work item 3155 - Implement "date" datatype
-- Feature:  (MB) Work item 4150 - Date format not honored in CSV writer
-- Feature:  (MB) Work item 4199 - RichText and sharedStrings
-- Feature:  (MB) Work item 2346 - Implement more Excel calculation functions
-            -    Addition of DATE, DATEDIF, DATEVALUE, DAY, DAYS360
-- Feature:  (MBaker) Work item 2346 - Implement more Excel calculation functions
-            -    Addition of AVEDEV, HARMEAN and GEOMEAN
-            -    Addition of the BINOMDIST (Non-cumulative only), COUNTBLANK, EXPONDIST, FISHER, FISHERINV, NORMDIST, NORMSDIST, PERMUT, POISSON (Non-cumulative only) and STANDARDIZE Statistical Functions
-            -    Addition of the CEILING, COMBIN, EVEN, FACT, FACTDOUBLE, FLOOR, MULTINOMIAL, ODD, ROUNDDOWN, ROUNDUP, SIGN, SQRTPI and SUMSQ Mathematical Functions
-            -    Addition of the NORMINV, NORMSINV, CONFIDENCE and SKEW Statistical Functions
-            -    Addition of the CRITBINOM, HYPGEOMDIST, KURT, LOGINV, LOGNORMDIST, NEGBINOMDIST and WEIBULL Statistical Functions
-            -    Addition of the LARGE, PERCENTILE, QUARTILE, SMALL and TRIMMEAN Statistical Functions
-            -    Addition of the BIN2HEX, BIN2OCT, DELTA, ERF, ERFC, GESTEP, HEX2BIN, HEX2DEC, HEX2OCT, OCT2BIN and OCT2HEX Engineering Functions
-            -    Addition of the CHIDIST, GAMMADIST and GAMMALN Statistical Functions
-            -    Addition of the GCD, LCM, MROUND and SUBTOTAL Mathematical Functions
-            -    Addition of the LOWER, PROPER and UPPER Text Functions
-            -    Addition of the BETADIST and BETAINV Statistical Functions
-            -    Addition of the CHIINV and GAMMAINV Statistical Functions
-            -    Addition of the SERIESSUM Mathematical Function
-            -    Addition of the CHAR, CODE, FIND, LEN, REPT, SEARCH, T, TRIM Text Functions
-            -    Addition of the FALSE and TRUE Boolean Functions
-            -    Addition of the TDIST and TINV Statistical Functions
-            -    Addition of the EDATE, EOMONTH, YEAR, MONTH, TIME, TIMEVALUE, HOUR, MINUTE, SECOND, WEEKDAY, WEEKNUM, NOW, TODAY and Date/Time Function
-            -    Addition of the BESSELI, BESSELJ, BESSELK and BESSELY Engineering Functions
-            -    Addition of the SLN and SYD Financial Functions
-            -    reworked MODE calculation to handle floating point numbers
-            -    Improved error trapping for invalid input values
-            -    Fix to SMALL, LARGE, PERCENTILE and TRIMMEAN to eliminate non-numeric values
-            -    Added CDF to BINOMDIST and POISSON
-            -    Fix to a potential endless loop in CRITBINOM, together with other bugfixes to the algorithm
-            -    Fix to SQRTPI so that it will work with a real value parameter rather than just integers
-            -    Trap for passing negative values to FACT
-            -    Improved accuracy of the NORMDIST cumulative function, and of the ERF and ERFC functions
-            -    Replicated Excel data-type and error handling for BIN, DEC, OCT and HEX conversion functions
-            -    Replicated Excel data-type and error handling for AND and OR Boolean functions
-            -    Bugfix to MROUND
-            -    Rework of the DATE, DATEVALUE, DAY, DAYS360 and DATEDIF date/Time functions to use Excel dates rather than straight PHP dates
-            -    Rework of the AND, OR Boolean functions to ignore string values
-            -    Rework of the BIN2DEC, BIN2HEX, BIN2OCT, DEC2BIN, DEC2HEX, DEC2OCT Engineering functions to handle two's complement
-            -    Excel, Gnumeric and OpenOffice Calc compatibility flag for functions
-                 Note, not all functions have yet been written to work with the Gnumeric and OpenOffice Calc compatibility flags
-            -    1900 or 1904 Calendar flag for date functions
-            -    Reworked ExcelToPHP date method to handle the Excel 1900 leap year
-                 Note that this will not correctly return values prior to 13-Dec-1901 20:45:52 as this is the minimum value that PHP date serial values can handle. If you need to work with dates prior to this, then an ExcelToPHPObject method has been added which will work correctly with values between Excel's 1900 calendar base date of 1-Jan-1900, and 13-Dec-1901
-            -    Addition of ExcelToPHPObject date method to return a PHP DateTime object from an Excel date serial value
-            -    PHPToExcel method modified to accept either PHP date serial numbers or PHP DateTime objects
-            -    Addition of FormattedPHPToExcel which will accept a date and time broken to into year, month, day, hour, minute, second and return an Excel date serial value
-- Feature:  (MB) Work item 4485 - Control characters in Excel 2007
-- Feature:  (MB) Work item 4796 - BaseDrawing::setWidthAndHeight method request
-- Feature:  (MB) Work item 4798 - Page Setup -> Print Titles -> Sheet -> 'Rows to repeat at top'
-- Feature:  (MB) Work item 4433 - Comment functionality
-- Bugfix:   (MB) Work item 4124 - Undefined variable in PHPExcel_Writer_Serialized
-- Bugfix:   (MB) Work item 4125 - Notice: Object of class PHPExcel_RichText could not be converted to int
-- Bugfix:   (MB) Work item 4126 - Excel5Writer: utf8 string not converted to utf16
-- Bugfix:   (MB) Work item 4180 - PHPExcel_RichText and autosize
-- Bugfix:   (MB) Work item 4574 - Excel5Writer produces broken xls files after change mentioned in work item 4126
-- Bugfix:   (MB) Work item 4797 - Small bug in PHPExcel_Reader_Excel2007 function _readStyle
-
-
-2007/10/23 (v 1.5.0):
-- General:  (MB) Work item 3265 - Refactor PHPExcel Drawing
-- Feature:  (CS) Work item 3079 - Update Shared/OLE.php to latest version from PEAR
-- Feature:  (MB) Work item 3217 - Excel2007 vs Excel2003 compatibility pack
-- Feature:  (MB) Work item 3234 - Cell protection (lock/unlock)
-- Feature:  (MB) Work item 3543 - Create clickable links (hyperlinks)
-- Feature:  (MB) Work item 3241 - Additional page setup parameters
-- Feature:  (MB) Work item 3300 - Make temporary file path configurable (Excel5)
-- Feature:  (MB) Work item 3306 - Small addition to applyFromArray for font
-- Feature:  (MB) Work item 3373 - Better feedback when save of file is not possible
-- Bugfix:   (MB) Work item 3181 - Text Rotation
-- Bugfix:   (MB) Work item 3237 - Small bug in Page Orientation
-- Bugfix:   (MB) Work item 3812 - insertNewColumnBeforeByColumn undefined
-- Bugfix:   (MB) Work item 3893 - Sheet references not working in formula (Excel5 Writer)
-
-
-2007/08/23 (v 1.4.5):
-- General:  (MB) Work item 3003 - Class file endings
-- General:  (MB) Work item 3081 - Different calculation engine improvements
-- General:  (MB) Work item 3082 - Different improvements in PHPExcel_Reader_Excel2007
-- General:  (MB) Work item 3146 - Set XML indentation in PHPExcel_Writer_Excel2007
-- Feature:  (MB) Work item 3159 -  Optionally store temporary Excel2007 writer data in file instead of memory
-- Feature:  (MB) Work item 3063 - Implement show/hide gridlines
-- Feature:  (MB) Work item 3064 - Implement option to read only data
-- Feature:  (MB) Work item 3080 - Optionally disable formula precalculation
-- Feature:  (MB) Work item 3154 - Explicitly set cell datatype
-- Feature:  (MBaker) Work item 2346 - Implement more Excel calculation functions
-             -    Addition of MINA, MAXA, COUNTA, AVERAGEA, MEDIAN, MODE, DEVSQ, STDEV, STDEVA, STDEVP, STDEVPA, VAR, VARA, VARP and VARPA Excel Functions
-             -    Fix to SUM, PRODUCT, QUOTIENT, MIN, MAX, COUNT and AVERAGE functions when cell contains a numeric value in a string datatype, bringing it in line with MS Excel behaviour
-- Bugfix:   (MB) Work item 2881 - File_exists on ZIP fails on some installations
-- Bugfix:   (MB) Work item 2879 - Argument in textRotation should be -90..90
-- Bugfix:   (MB) Work item 2883 - Excel2007 reader/writer not implementing OpenXML/SpreadsheetML styles 100% correct
-- Bugfix:   (MB) Work item 2513 - Active sheet index not read/saved
-- Bugfix:   (MB) Work item 2935 - Print and print preview of generated XLSX causes Excel2007 to crash
-- Bugfix:   (MB) Work item 2952 - Error in Calculations - COUNT() function
-- Bugfix:   (MB) Work item 3002 - HTML and CSV writer not writing last row
-- Bugfix:   (MB) Work item 3017 - Memory leak in Excel5 writer
-- Bugfix:   (MB) Work item 3044 - Printing (PHPExcel_Writer_Excel5)
-- Bugfix:   (MB) Work item 3046 - Problems reading zip://
-- Bugfix:   (MB) Work item 3047 - Error reading conditional formatting
-- Bugfix:   (MB) Work item 3067 - Bug in Excel5 writer (storePanes)
-- Bugfix:   (MB) Work item 3077 - Memory leak in PHPExcel_Style_Color
-
-
-2007/07/23 (v 1.4.0):
-- General:  (MB) Work item 2687 - Coding convention / code cleanup
-- General:  (MB) Work item 2717 - Use set_include_path in tests
-- General:  (MB) Work item 2812 - Move PHPExcel_Writer_Excel5 OLE to PHPExcel_Shared_OLE
-- Feature:  (MB) Work item 2679 - Hide/Unhide Column or Row
-- Feature:  (MB) Work item 2271 - Implement multi-cell styling
-- Feature:  (MB) Work item 2720 - Implement CSV file format (reader/writer)
-- Feature:  (MB) Work item 2845 - Implement HTML file format
-- Bugfix:   (MB) Work item 2513 - Active sheet index not read/saved
-- Bugfix:   (MB) Work item 2678 - Freeze Panes with PHPExcel_Writer_Excel5
-- Bugfix:   (MB) Work item 2680 - OLE.php
-- Bugfix:   (MB) Work item 2736 - Copy and pasting multiple drop-down list cells breaks reader
-- Bugfix:   (MB) Work item 2775 - Function setAutoFilterByColumnAndRow takes wrong arguments
-- Bugfix:   (MB) Work item 2858 - Simplexml_load_file fails on ZipArchive
-
-
-2007/06/27 (v 1.3.5):
-- General:  (MB) Work item 15   - Documentation
-- Feature:  (JV) PHPExcel_Writer_Excel5
-- Feature:  (JV) PHPExcel_Reader_Excel2007: Image shadows
-- Feature:  (MB) Work item 2385 - Data validation
-- Feature:  (MB) Work item  187 - Implement richtext strings
-- Bugfix:   (MB) Work item 2443 - Empty relations when adding image to any sheet but the first one
-- Bugfix:   (MB) Work item 2536 - Excel2007 crashes on print preview
-
-
-2007/06/05 (v 1.3.0):
-- General:  (MB) Work item 1942 - Create PEAR package
-- General:  (MB) Work item 2331 - Replace *->duplicate() by __clone()
-- Feature:  (JV) PHPExcel_Reader_Excel2007: Column auto-size, Protection, Merged cells, Wrap text, Page breaks, Auto filter, Images
-- Feature:  (MB) Work item 245  - Implement "freezing" panes
-- Feature:  (MB) Work item 2273 - Cell addressing alternative
-- Feature:  (MB) Work item 2270 - Implement cell word-wrap attribute
-- Feature:  (MB) Work item 2282 - Auto-size column
-- Feature:  (MB) Work item 241  - Implement formula calculation
-- Feature:  (MB) Work item 2375 - Insert/remove row/column
-- Bugfix:   (MB) Work item 1931 - PHPExcel_Worksheet::getCell() should not accept absolute coordinates
-- Bugfix:   (MB) Work item 2272 - Cell reference without row number
-- Bugfix:   (MB) Work item 2276 - Styles with same coordinate but different worksheet
-- Bugfix:   (MB) Work item 2290 - PHPExcel_Worksheet->getCellCollection() usort error
-- Bugfix:   (SS) Work item 2353 - Bug in PHPExcel_Cell::stringFromColumnIndex
-- Bugfix:   (JV) Work item 2353 - Reader: numFmts can be missing, use cellStyleXfs instead of cellXfs in styles
-
-
-2007/04/26 (v 1.2.0):
-- General:  (MB) Stringtable attribute "count" not necessary, provides wrong info to Excel sometimes...
-- General:  (MB) Updated tests to address more document properties
-- General:  (MB) Some refactoring in PHPExcel_Writer_Excel2007_Workbook
-- General:  (MB) New package: PHPExcel_Shared
-- General:  (MB) Password hashing algorithm implemented in PHPExcel_Shared_PasswordHasher
-- General:  (MB) Moved pixel conversion functions to PHPExcel_Shared_Drawing
-- General:  (MB) Work item 244 - Switch over to LGPL license
-- General:  (MB) Work item 5 - Include PHPExcel version in file headers
-- Feature:  (MB) Work item 6 - Autofilter
-- Feature:  (MB) Work item 7 - Extra document property: keywords
-- Feature:  (MB) Work item 8 - Extra document property: category
-- Feature:  (MB) Work item 9 - Document security
-- Feature:  (MB) Work item 10 - PHPExcel_Writer_Serialized and PHPExcel_Reader_Serialized
-- Feature:  (MB) Work item 11 - Alternative syntax: Addressing a cell
-- Feature:  (MB) Work item 12 - Merge cells
-- Feature:  (MB) Work item 13 - Protect ranges of cells with a password
-- Bugfix:   (JV) Work item 14 - (style/fill/patternFill/fgColor or bgColor can be empty)
-
-
-2007/03/26 (v 1.1.1):
-- Bugfix:   (MB) Work item 1250 - Syntax error in "Classes/PHPExcel/Writer/Excel2007.php" on line 243
-- General:  (MB) Work item 1282 - Reader should check if file exists and throws an exception when it doesn't
-
-
-2007/03/22 (v 1.1.0):
-- Changed filenames of tests
-- Bugfix:   (MB) Work item 836 - Style information lost after passing trough Excel2007_Reader
-- Bugfix:   (MB) Work item 913 - Number of columns > AZ fails fixed in PHPExcel_Cell::columnIndexFromString
-- General:  (MB) Added a brief file with installation instructions
-- Feature:  (MB) Page breaks (horizontal and vertical)
-- Feature:  (MB) Image shadows
-
-
-
-2007/02/22 (v 1.0.0):
-- Changelog now includes developer initials
-- Bugfix:   (JV) PHPExcel->removeSheetByIndex now re-orders sheets after deletion, so no array indexes are lost
-- Bugfix:   (JV) PHPExcel_Writer_Excel2007_Worksheet::_writeCols() used direct assignment to $pSheet->getColumnDimension('A')->Width instead of $pSheet->getColumnDimension('A')->setWidth()
-- Bugfix:   (JV) DocumentProperties used $this->LastModifiedBy instead of $this->_lastModifiedBy.
-- Bugfix:   (JV) Only first = should be removed when writing formula in PHPExcel_Writer_Excel2007_Worksheet.
-- General:  (JV) Consistency of method names to camelCase
-- General:  (JV) Updated tests to match consistency changes
-- General:  (JV) Detection of mime-types now with image_type_to_mime_type()
-- General:  (JV) Constants now hold string value used in Excel 2007
-- General:  (MB) Fixed folder name case (WorkSheet -> Worksheet)
-- Feature:  (MB) PHPExcel classes (not the Writer classes) can be duplicated, using a duplicate() method.
-- Feature:  (MB) Cell styles can now be duplicated to a range of cells using PHPExcel_Worksheet->duplicateStyle()
-- Feature:  (MB) Conditional formatting
-- Feature:  (JV) Reader for Excel 2007 (not supporting full specification yet!)
-
-
-
-2007/01/31 (v 1.0.0 RC):
-- Project name has been changed to PHPExcel
-- Project homepage is now http://www.codeplex.com/PHPExcel
-- Started versioning at number: PHPExcel 1.0.0 RC
-
-
-
-2007/01/22:
-- Fixed some performance issues on large-scale worksheets (mainly loops vs. indexed arrays)
-- Performance on creating StringTable has been increased
-- Performance on writing Excel2007 worksheet has been increased
-
-
-
-2007/01/18:
-- Images can now be rotated
-- Fixed bug: When drawings have full path specified, no mime type can be deducted
-- Fixed bug: Only one drawing can be added to a worksheet
-
-
-
-2007/01/12:
-- Refactoring of some classes to use ArrayObject instead of array()
-- Cell style now has support for number format (i.e. #,##0)
-- Implemented embedding images
-
-
-
-2007/01/02:
-- Cell style now has support for fills, including gradient fills
-- Cell style now has support for fonts
-- Cell style now has support for border colors
-- Cell style now has support for font colors
-- Cell style now has support for alignment
-
-
-
-2006/12/21:
-- Support for cell style borders
-- Support for cell styles
-- Refactoring of Excel2007 Writer into multiple classes in package SpreadSheet_Writer_Excel2007
-- Refactoring of all classes, changed public members to public properties using getter/setter
-- Worksheet names are now unique. On duplicate worksheet names, a number is appended.
-- Worksheet now has parent SpreadSheet object
-- Worksheet now has support for page header and footer
-- Worksheet now has support for page margins
-- Worksheet now has support for page setup (only Paper size and Orientation)
-- Worksheet properties now accessible by using getProperties()
-- Worksheet now has support for row and column dimensions (height / width)
-- Exceptions thrown have a more clear description
-
-
-
-Initial version:
-- Create a Spreadsheet object
-- Add one or more Worksheet objects
-- Add cells to Worksheet objects
-- Export Spreadsheet object to Excel 2007 OpenXML format
-- Each cell supports the following data formats: string, number, formula, boolean.
\ No newline at end of file
diff --git a/htdocs/includes/phpoffice/phpexcel/composer.json b/htdocs/includes/phpoffice/phpexcel/composer.json
deleted file mode 100644
index 5f4ee460baa..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/composer.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"name" : "phpoffice/phpexcel",
-	"description" : "PHPExcel - OpenXML - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine",
-	"keywords" : [
-		"PHP",
-		"Excel",
-		"OpenXML",
-		"xlsx",
-		"xls",
-		"spreadsheet"
-	],
-	"homepage" : "http://phpexcel.codeplex.com",
-	"type" : "library",
-	"license" : "LGPL",
-	"authors" : [{
-			"name" : "Maarten Balliauw",
-			"homepage" : "http://blog.maartenballiauw.be"
-		}, {
-			"name" : "Mark Baker"
-		}, {
-			"name" : "Franck Lefevre",
-			"homepage" : "http://blog.rootslabs.net"
-		}, {
-			"name" : "Erik Tilt"
-		}
-	],
-	"require" : {
-		"php" : ">=5.2.0",
-		"ext-xml" : "*",
-		"ext-xmlwriter" : "*"
-	},
-	"recommend" : {
-		"ext-zip" : "*",
-		"ext-gd2" : "*"
-	},
-	"autoload" : {
-		"psr-0" : {
-			"PHPExcel" : "Classes/"
-		}
-	}
-}
\ No newline at end of file
diff --git a/htdocs/includes/phpoffice/phpexcel/install.txt b/htdocs/includes/phpoffice/phpexcel/install.txt
deleted file mode 100644
index 1a999d258e8..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/install.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-**************************************************************************************
-* PHPExcel
-*
-* Copyright (c) 2006 - 2011 PHPExcel
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*
-* @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
-* @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-* @version    ##VERSION##, ##DATE##
-**************************************************************************************
-
-Requirements
-------------
-
-The following requirements should be met prior to using PHPExcel:
-* PHP version 5.2.0 or higher
-* PHP extension php_zip enabled *)
-* PHP extension php_xml enabled
-* PHP extension php_gd2 enabled (if not compiled in)
-
-*) php_zip is only needed by PHPExcel_Reader_Excel2007, PHPExcel_Writer_Excel2007,
-   PHPExcel_Reader_OOCalc. In other words, if you need PHPExcel to handle .xlsx or .ods
-   files you will need the zip extension, but otherwise not.
-
-
-
-Installation instructions
--------------------------
-
-Installation is quite easy: copy the contents of the Classes folder to any location
-in your application required.
-
-Example:
-
-If your web root folder is /var/www/ you may want to create a subfolder called
-/var/www/Classes/ and copy the files into that folder so you end up with files:
-
-/var/www/Classes/PHPExcel.php
-/var/www/Classes/PHPExcel/Calculation.php
-/var/www/Classes/PHPExcel/Cell.php
-...
-
-
-
-Getting started
----------------
-
-A good way to get started is to run some of the tests included in the download.
-Copy the "Examples" folder next to your "Classes" folder from above so you end up with:
-
-/var/www/Examples/01simple.php
-/var/www/Examples/02types.php
-...
-
-Start running the test by pointing your browser to the test scripts:
-
-http://example.com/Examples/01simple.php
-http://example.com/Examples/02types.php
-...
-
-Note: It may be necessary to modify the include/require statements at the beginning of
-each of the test scripts if your "Classes" folder from above is named differently.
diff --git a/htdocs/includes/phpoffice/phpexcel/license.md b/htdocs/includes/phpoffice/phpexcel/license.md
deleted file mode 100644
index 57b74d4c746..00000000000
--- a/htdocs/includes/phpoffice/phpexcel/license.md
+++ /dev/null
@@ -1,345 +0,0 @@
-GNU LESSER GENERAL PUBLIC LICENSE
-
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/htdocs/includes/symfony/var-dumper/.gitignore b/htdocs/includes/symfony/var-dumper/.gitignore
new file mode 100644
index 00000000000..5414c2c655e
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/.gitignore
@@ -0,0 +1,3 @@
+composer.lock
+phpunit.xml
+vendor/
diff --git a/htdocs/includes/symfony/var-dumper/composer.json b/htdocs/includes/symfony/var-dumper/composer.json
index a90729b6bbe..05955f69430 100644
--- a/htdocs/includes/symfony/var-dumper/composer.json
+++ b/htdocs/includes/symfony/var-dumper/composer.json
@@ -1,44 +1,41 @@
 {
-	"name" : "symfony/var-dumper",
-	"type" : "library",
-	"description" : "Symfony mechanism for exploring and dumping PHP variables",
-	"keywords" : [
-		"dump",
-		"debug"
-	],
-	"homepage" : "https://symfony.com",
-	"license" : "MIT",
-	"authors" : [{
-			"name" : "Nicolas Grekas",
-			"email" : "p@tchwork.com"
-		}, {
-			"name" : "Symfony Community",
-			"homepage" : "https://symfony.com/contributors"
-		}
-	],
-	"require" : {
-		"php" : ">=5.5.9",
-		"symfony/polyfill-mbstring" : "~1.0"
-	},
-	"require-dev" : {
-		"twig/twig" : "~1.20|~2.0"
-	},
-	"suggest" : {},
-	"autoload" : {
-		"files" : [
-			"Resources/functions/dump.php"
-		],
-		"psr-4" : {
-			"Symfony\\Component\\VarDumper\\" : ""
-		},
-		"exclude-from-classmap" : [
-			"/Tests/"
-		]
-	},
-	"minimum-stability" : "dev",
-	"extra" : {
-		"branch-alias" : {
-			"dev-master" : "3.0-dev"
-		}
-	}
-}
\ No newline at end of file
+    "name": "symfony/var-dumper",
+    "type": "library",
+    "description": "Symfony mechanism for exploring and dumping PHP variables",
+    "keywords": ["dump", "debug"],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Nicolas Grekas",
+            "email": "p@tchwork.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=5.5.9",
+        "symfony/polyfill-mbstring": "~1.0"
+    },
+    "require-dev": {
+        "twig/twig": "~1.20|~2.0"
+    },
+    "suggest": {
+        "ext-symfony_debug": ""
+    },
+    "autoload": {
+        "files": [ "Resources/functions/dump.php" ],
+        "psr-4": { "Symfony\\Component\\VarDumper\\": "" },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "minimum-stability": "dev",
+    "extra": {
+        "branch-alias": {
+            "dev-master": "3.0-dev"
+        }
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/phpunit.xml.dist b/htdocs/includes/symfony/var-dumper/phpunit.xml.dist
new file mode 100644
index 00000000000..bb16a3a4ec0
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/phpunit.xml.dist
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+    </php>
+
+    <testsuites>
+        <testsuite name="Symfony VarDumper Component Test Suite">
+            <directory>./Tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>./</directory>
+            <exclude>
+                <directory>./Resources</directory>
+                <directory>./Tests</directory>
+                <directory>./vendor</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/htdocs/includes/tecnickcom/tcpdf/.gitignore b/htdocs/includes/tecnickcom/tcpdf/.gitignore
new file mode 100644
index 00000000000..56fd659871f
--- /dev/null
+++ b/htdocs/includes/tecnickcom/tcpdf/.gitignore
@@ -0,0 +1,2 @@
+/examples/
+/tools/
\ No newline at end of file
diff --git a/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_fonts.php b/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_fonts.php
index 218fb6df1e5..8681dfbdbfa 100644
--- a/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_fonts.php
+++ b/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_fonts.php
@@ -1149,7 +1149,7 @@ class TCPDF_FONTS {
 								$subsetglyphs[$g] = true;
 							}
 						}
-					}	
+					}
 					break;
 				}
 				case 6: { // Format 6: Trimmed table mapping
diff --git a/htdocs/index.php b/htdocs/index.php
index 4eea2353d3e..a4060278c50 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -68,7 +68,7 @@ if (GETPOST('addbox'))	// Add box (when submit is done from a form when ajax dis
  * View
  */
 
-if (!is_object($form)) $form = new Form($db);
+if (!isset($form) || !is_object($form)) $form = new Form($db);
 
 // Title
 $title = $langs->trans("HomeArea").' - Dolibarr '.DOL_VERSION;
@@ -101,8 +101,6 @@ if (!empty($conf->global->MAIN_MOTD))
 
 
 
-
-
 /*
  * Dashboard Dolibarr states (statistics)
  * Hidden for external users
@@ -295,7 +293,7 @@ if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS))
 				$class = $classes[$val];
 				// Search in cache if load_state_board is already realized
 				$classkeyforcache = $class;
-				if ($classkeyforcache == 'ProductService') $classkeyforcache = 'Product';	// ProductService use same load_state_board than Product
+				if ($classkeyforcache == 'ProductService') $classkeyforcache = 'Product'; // ProductService use same load_state_board than Product
 
 				if (!isset($boardloaded[$classkeyforcache]) || !is_object($boardloaded[$classkeyforcache]))
 				{
@@ -593,9 +591,10 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 	//Remove any invalid response
 	//load_board can return an integer if failed or WorkboardResponse if OK
 	$valid_dashboardlines = array();
-	foreach ($dashboardlines as $infoKey => $tmp) {
+	foreach ($dashboardlines as $workboardid => $tmp) {
 		if ($tmp instanceof WorkboardResponse) {
-			$valid_dashboardlines[$infoKey] = $tmp;
+			$tmp->id = $workboardid; // Complete the object to add its id into its name
+			$valid_dashboardlines[$workboardid] = $tmp;
 		}
 	}
 
@@ -651,7 +650,6 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 
 		foreach ($dashboardgroup as $groupKey => $groupElement) {
 			$boards = array();
-
 			if (empty($conf->global->MAIN_DISABLE_NEW_OPENED_DASH_BOARD)) {
 				foreach ($groupElement['stats'] as $infoKey) {
 					if (!empty($valid_dashboardlines[$infoKey])) {
@@ -698,15 +696,18 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 				// Show the span for the total of record
 				if (!empty($groupElement['globalStats'])) {
 					$globalStatInTopOpenedDashBoard[] = $globalStatsKey;
-					$openedDashBoard .= '		<span class="info-box-icon-text" title="'.$groupElement['globalStats']['text'].'">'.$nbTotal.'</span>'."\n";
+					$openedDashBoard .= '<span class="info-box-icon-text" title="'.$groupElement['globalStats']['text'].'">'.$nbTotal.'</span>';
 				}
 
-				$openedDashBoard .= '		</span>'."\n";
-				$openedDashBoard .= '		<div class="info-box-content">'."\n";
+				$openedDashBoard .= '</span>'."\n";
+				$openedDashBoard .= '<div class="info-box-content">'."\n";
 
-				$openedDashBoard .= '			<span class="info-box-title" title="'.strip_tags($groupName).'">'.$groupName.'</span>'."\n";
+				$openedDashBoard .= '<div class="info-box-title" title="'.strip_tags($groupName).'">'.$groupName.'</div>'."\n";
+				$openedDashBoard .= '<div class="info-box-lines">'."\n";
 
 				foreach ($boards as $board) {
+					$openedDashBoard .= '<div class="info-box-line">';
+
 					if (!empty($board->labelShort)) {
 						$infoName = '<span title="'.$board->label.'">'.$board->labelShort.'</span>';
 					} else {
@@ -716,15 +717,17 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 					$textLateTitle = $langs->trans("NActionsLate", $board->nbtodolate);
 					$textLateTitle .= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
 
+					if ($board->id == 'bank_account') {
+						$textLateTitle .= '<br><span class="opacitymedium">'.$langs->trans("IfYouDontReconcileDisableProperty", $langs->transnoentitiesnoconv("Conciliable")).'</span>';
+					}
+
 					$textLate = '';
 					if ($board->nbtodolate > 0) {
-						$textLate .= '<span title="'.dol_htmlentities($textLateTitle).'" class="classfortooltip badge badge-warning">';
+						$textLate .= '<span title="'.dol_escape_htmltag($textLateTitle).'" class="classfortooltip badge badge-warning">';
 						$textLate .= '<i class="fa fa-exclamation-triangle"></i> '.$board->nbtodolate;
 						$textLate .= '</span>';
 					}
 
-					$openedDashBoard .= '<div class="info-box-line">';
-
 					$nbtodClass = '';
 					if ($board->nbtodo > 0) {
 						$nbtodClass = 'badge badge-info';
@@ -745,11 +748,12 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 					if ($board->total > 0 && !empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX)) {
 						$openedDashBoard .= '<a href="'.$board->url.'" class="info-box-text">'.$langs->trans('Total').' : '.price($board->total).'</a>';
 					}
-
-					$openedDashBoard .= '</div>';
+					$openedDashBoard .= '</div>'."\n";
 				}
 
-				$openedDashBoard .= '		</div><!-- /.info-box-content -->'."\n";
+				// TODO Add hook here to add more "info-box-line"
+
+				$openedDashBoard .= '		</div><!-- /.info-box-lines --></div><!-- /.info-box-content -->'."\n";
 				$openedDashBoard .= '	</div><!-- /.info-box -->'."\n";
 				$openedDashBoard .= '</div><!-- /.box-flex-item-with-margin -->'."\n";
 				$openedDashBoard .= '</div><!-- /.box-flex-item -->'."\n";
@@ -776,7 +780,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 			$weatherDashBoard .= img_weather('', $weather->level, '', 0, 'valignmiddle width50');
 			$weatherDashBoard .= '       </span>'."\n";
 			$weatherDashBoard .= '		<div class="info-box-content">'."\n";
-			$weatherDashBoard .= '			<span class="info-box-title">'.$langs->trans('GlobalOpenedElemView').'</span>'."\n";
+			$weatherDashBoard .= '			<div class="info-box-title">'.$langs->trans('GlobalOpenedElemView').'</div>'."\n";
 
 			if ($totallatePercentage > 0 && !empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
 				$weatherDashBoard .= '			<span class="info-box-number">'.$langs->transnoentitiesnoconv("NActionsLate",
@@ -882,7 +886,7 @@ print '<div class="fichecenter fichecenterbis">';
 
 
 /*
- * Show boxes
+ * Show widgets (boxes)
  */
 
 $boxlist .= '<div class="twocolumns">';
@@ -914,7 +918,7 @@ if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS))
 		$boxstat .= '<div class="box">';
 		$boxstat .= '<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable boxtablenobottom nohover widgetstats" width="100%">';
 		$boxstat .= '<tr class="liste_titre box_titre">';
-		$boxstat .= '<td class="liste_titre">';
+		$boxstat .= '<td>';
 		$boxstat .= '<div class="inline-block valignmiddle">'.$langs->trans("DolibarrStateBoard").'</div>';
 		$boxstat .= '</td>';
 		$boxstat .= '</tr>';
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 267e1629f36..93b99680b92 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -68,10 +68,10 @@ print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg
 $useragent = $_SERVER['HTTP_USER_AGENT'];
 if (!empty($useragent))
 {
-    $tmp = getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
-    $browserversion = $tmp['browserversion'];
-    $browsername = $tmp['browsername'];
-    if ($browsername == 'ie' && $browserversion < 7) print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("WarningBrowserTooOld")."<br>\n";
+	$tmp = getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
+	$browserversion = $tmp['browserversion'];
+	$browsername = $tmp['browsername'];
+	if ($browsername == 'ie' && $browserversion < 7) print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("WarningBrowserTooOld")."<br>\n";
 }
 
 
@@ -84,8 +84,8 @@ if (versioncompare(versionphparray(), $arrayphpminversionerror) < 0)        // M
 	$checksok = 0; // 0=error, 1=warning
 } elseif (versioncompare(versionphparray(), $arrayphpminversionwarning) < 0)    // Minimum supported (warning if lower)
 {
-    print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionwarning));
-    $checksok = 0; // 0=error, 1=warning
+	print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionwarning));
+	$checksok = 0; // 0=error, 1=warning
 } else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPVersion")." ".versiontostring(versionphparray());
 }
@@ -93,8 +93,8 @@ if (empty($force_install_nophpinfo)) print ' (<a href="phpinfo.php" target="_bla
 print "<br>\n";
 
 
-// Check PHP support for $_POST
-if (!isset($_GET["testget"]) && !isset($_POST["testpost"]))
+// Check PHP support for $_GET and $_POST
+if (!isset($_GET["testget"]) && !isset($_POST["testpost"]))	// We must keep $_GET and $_POST here
 {
 	print '<img src="../theme/eldy/img/warning.png" alt="Warning"> '.$langs->trans("PHPSupportPOSTGETKo");
 	print ' (<a href="'.$_SERVER["PHP_SELF"].'?testget=ok">'.$langs->trans("Recheck").'</a>)';
@@ -129,19 +129,19 @@ if (!function_exists("imagecreate"))
 // Check if Curl supported
 if (!function_exists("curl_init"))
 {
-    $langs->load("errors");
-    print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportCurl")."<br>\n";
-    // $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
+	$langs->load("errors");
+	print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportCurl")."<br>\n";
+	// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
 } else {
-    print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportCurl")."<br>\n";
+	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportCurl")."<br>\n";
 }
 
 // Check if PHP calendar extension is available
 if (!function_exists("easter_date"))
 {
-    print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportCalendar")."<br>\n";
+	print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportCalendar")."<br>\n";
 } else {
-    print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportCalendar")."<br>\n";
+	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportCalendar")."<br>\n";
 }
 
 
@@ -161,11 +161,11 @@ if (empty($_SERVER["SERVER_ADMIN"]) || $_SERVER["SERVER_ADMIN"] != 'doliwamp@loc
 {
 	if (!function_exists("locale_get_primary_language") || !function_exists("locale_get_region"))
 	{
-	    $langs->load("errors");
-	    print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportIntl")."<br>\n";
-	    // $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
+		$langs->load("errors");
+		print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportIntl")."<br>\n";
+		// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
 	} else {
-	    print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportIntl")."<br>\n";
+		print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportIntl")."<br>\n";
 	}
 }
 
@@ -307,35 +307,35 @@ if (!file_exists($conffile))
 			{
 				if (!file_exists($dolibarr_main_document_root."/core/lib/admin.lib.php"))
 				{
-                    print '<span class="error">A '.$conffiletoshow.' file exists with a dolibarr_main_document_root to '.$dolibarr_main_document_root.' that seems wrong. Try to fix or remove the '.$conffiletoshow.' file.</span><br>'."\n";
-				    dol_syslog("A '".$conffiletoshow."' file exists with a dolibarr_main_document_root to ".$dolibarr_main_document_root." that seems wrong. Try to fix or remove the '".$conffiletoshow."' file.", LOG_WARNING);
+					print '<span class="error">A '.$conffiletoshow.' file exists with a dolibarr_main_document_root to '.$dolibarr_main_document_root.' that seems wrong. Try to fix or remove the '.$conffiletoshow.' file.</span><br>'."\n";
+					dol_syslog("A '".$conffiletoshow."' file exists with a dolibarr_main_document_root to ".$dolibarr_main_document_root." that seems wrong. Try to fix or remove the '".$conffiletoshow."' file.", LOG_WARNING);
 				} else {
-                    require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
+					require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
 
-                    // If password is encoded, we decode it
-                    if (preg_match('/crypted:/i', $dolibarr_main_db_pass) || !empty($dolibarr_main_db_encrypted_pass))
-                    {
-                        require_once $dolibarr_main_document_root.'/core/lib/security.lib.php';
-                        if (preg_match('/crypted:/i', $dolibarr_main_db_pass))
-                        {
-                            $dolibarr_main_db_encrypted_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass); // We need to set this as it is used to know the password was initially crypted
-                            $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
-                        } else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
-                    }
+					// If password is encoded, we decode it
+					if (preg_match('/crypted:/i', $dolibarr_main_db_pass) || !empty($dolibarr_main_db_encrypted_pass))
+					{
+						require_once $dolibarr_main_document_root.'/core/lib/security.lib.php';
+						if (preg_match('/crypted:/i', $dolibarr_main_db_pass))
+						{
+							$dolibarr_main_db_encrypted_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass); // We need to set this as it is used to know the password was initially crypted
+							$dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
+						} else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
+					}
 
-    				// $conf already created in inc.php
-    				$conf->db->type = $dolibarr_main_db_type;
-    				$conf->db->host = $dolibarr_main_db_host;
-    				$conf->db->port = $dolibarr_main_db_port;
-    				$conf->db->name = $dolibarr_main_db_name;
-    				$conf->db->user = $dolibarr_main_db_user;
-    				$conf->db->pass = $dolibarr_main_db_pass;
-                    $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);
-    				if ($db->connected && $db->database_selected)
-    				{
-    					$ok = true;
-    				}
-                }
+					// $conf already created in inc.php
+					$conf->db->type = $dolibarr_main_db_type;
+					$conf->db->host = $dolibarr_main_db_host;
+					$conf->db->port = $dolibarr_main_db_port;
+					$conf->db->name = $dolibarr_main_db_name;
+					$conf->db->user = $dolibarr_main_db_user;
+					$conf->db->pass = $dolibarr_main_db_pass;
+					$db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);
+					if ($db->connected && $db->database_selected)
+					{
+						$ok = true;
+					}
+				}
 			}
 		}
 
@@ -361,8 +361,8 @@ if (!file_exists($conffile))
 		// Show title
 		if (!empty($conf->global->MAIN_VERSION_LAST_UPGRADE) || !empty($conf->global->MAIN_VERSION_LAST_INSTALL))
 		{
-            print $langs->trans("VersionLastUpgrade").': <b><span class="ok">'.(empty($conf->global->MAIN_VERSION_LAST_UPGRADE) ? $conf->global->MAIN_VERSION_LAST_INSTALL : $conf->global->MAIN_VERSION_LAST_UPGRADE).'</span></b> - ';
-            print $langs->trans("VersionProgram").': <b><span class="ok">'.DOL_VERSION.'</span></b>';
+			print $langs->trans("VersionLastUpgrade").': <b><span class="ok">'.(empty($conf->global->MAIN_VERSION_LAST_UPGRADE) ? $conf->global->MAIN_VERSION_LAST_INSTALL : $conf->global->MAIN_VERSION_LAST_UPGRADE).'</span></b> - ';
+			print $langs->trans("VersionProgram").': <b><span class="ok">'.DOL_VERSION.'</span></b>';
 			//print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired"));
 			print '<br>';
 			print '<br>';
@@ -373,19 +373,19 @@ if (!file_exists($conffile))
 
 		$foundrecommandedchoice = 0;
 
-        $available_choices = array();
-        $notavailable_choices = array();
+		$available_choices = array();
+		$notavailable_choices = array();
 
-        if (empty($dolibarr_main_db_host))	// This means install process was not run
-        {
-        	$foundrecommandedchoice = 1; // To show only once
-        }
+		if (empty($dolibarr_main_db_host))	// This means install process was not run
+		{
+			$foundrecommandedchoice = 1; // To show only once
+		}
 
-        // Show line of first install choice
-        $choice  = '<tr class="trlineforchoice'.($foundrecommandedchoice ? ' choiceselected' : '').'">'."\n";
-        $choice .= '<td class="nowrap center"><b>'.$langs->trans("FreshInstall").'</b>';
+		// Show line of first install choice
+		$choice  = '<tr class="trlineforchoice'.($foundrecommandedchoice ? ' choiceselected' : '').'">'."\n";
+		$choice .= '<td class="nowrap center"><b>'.$langs->trans("FreshInstall").'</b>';
 		$choice .= '</td>';
-        $choice .= '<td class="listofchoicesdesc">';
+		$choice .= '<td class="listofchoicesdesc">';
 		$choice .= $langs->trans("FreshInstallDesc");
 		if (empty($dolibarr_main_db_host))	// This means install process was not run
 		{
@@ -395,23 +395,23 @@ if (!file_exists($conffile))
 			// <img src="../theme/eldy/img/tick.png" alt="Ok"> ';
 		}
 
-        $choice .= '</td>';
-        $choice .= '<td class="center">';
+		$choice .= '</td>';
+		$choice .= '<td class="center">';
 		if ($allowinstall)
 		{
-            $choice .= '<a class="button" href="fileconf.php?selectlang='.$setuplang.'">'.$langs->trans("Start").'</a>';
+			$choice .= '<a class="button" href="fileconf.php?selectlang='.$setuplang.'">'.$langs->trans("Start").'</a>';
 		} else {
 			$choice .= ($foundrecommandedchoice ? '<span class="warning">' : '').$langs->trans("InstallNotAllowed").($foundrecommandedchoice ? '</span>' : '');
 		}
-        $choice .= '</td>'."\n";
-        $choice .= '</tr>'."\n";
+		$choice .= '</td>'."\n";
+		$choice .= '</tr>'."\n";
 
-        $positionkey = ($foundrecommandedchoice ? 999 : 0);
-        if ($allowinstall) {
-        	$available_choices[$positionkey] = $choice;
-        } else {
-        	$notavailable_choices[$positionkey] = $choice;
-        }
+		$positionkey = ($foundrecommandedchoice ? 999 : 0);
+		if ($allowinstall) {
+			$available_choices[$positionkey] = $choice;
+		} else {
+			$notavailable_choices[$positionkey] = $choice;
+		}
 
 		// Show upgrade lines
 		$allowupgrade = true;
@@ -445,64 +445,64 @@ if (!file_exists($conffile))
 		$count = 0;
 		foreach ($migrationscript as $migarray)
 		{
-            $choice = '';
+			$choice = '';
 
 			$count++;
-            $recommended_choice = false;
-            $version = DOL_VERSION;
+			$recommended_choice = false;
+			$version = DOL_VERSION;
 			$versionfrom = $migarray['from'];
-            $versionto = $migarray['to'];
-            $versionarray = preg_split('/[\.-]/', $version);
-            $dolibarrversionfromarray = preg_split('/[\.-]/', $versionfrom);
-            $dolibarrversiontoarray = preg_split('/[\.-]/', $versionto);
-            // Define string newversionxxx that are used for text to show
-            $newversionfrom = preg_replace('/(\.[0-9]+)$/i', '.*', $versionfrom);
-            $newversionto = preg_replace('/(\.[0-9]+)$/i', '.*', $versionto);
-            $newversionfrombis = '';
-            if (versioncompare($dolibarrversiontoarray, $versionarray) < -2)	// From x.y.z -> x.y.z+1
-            {
-            	$newversionfrombis = ' '.$langs->trans("or").' '.$versionto;
-            }
+			$versionto = $migarray['to'];
+			$versionarray = preg_split('/[\.-]/', $version);
+			$dolibarrversionfromarray = preg_split('/[\.-]/', $versionfrom);
+			$dolibarrversiontoarray = preg_split('/[\.-]/', $versionto);
+			// Define string newversionxxx that are used for text to show
+			$newversionfrom = preg_replace('/(\.[0-9]+)$/i', '.*', $versionfrom);
+			$newversionto = preg_replace('/(\.[0-9]+)$/i', '.*', $versionto);
+			$newversionfrombis = '';
+			if (versioncompare($dolibarrversiontoarray, $versionarray) < -2)	// From x.y.z -> x.y.z+1
+			{
+				$newversionfrombis = ' '.$langs->trans("or").' '.$versionto;
+			}
 
-            if ($ok)
-            {
-                if (count($dolibarrlastupgradeversionarray) >= 2)	// If database access is available and last upgrade version is known
-                {
-                    // Now we check if this is the first qualified choice
-                    if ($allowupgrade && empty($foundrecommandedchoice) &&
-                        (versioncompare($dolibarrversiontoarray, $dolibarrlastupgradeversionarray) > 0 || versioncompare($dolibarrversiontoarray, $versionarray) < -2)
-                    )
-                    {
-                        $foundrecommandedchoice = 1; // To show only once
-                        $recommended_choice = true;
-                    }
-                } else {
-                    // We cannot recommend a choice.
-                    // A version of install may be known, but we need last upgrade.
-                }
-            }
+			if ($ok)
+			{
+				if (count($dolibarrlastupgradeversionarray) >= 2)	// If database access is available and last upgrade version is known
+				{
+					// Now we check if this is the first qualified choice
+					if ($allowupgrade && empty($foundrecommandedchoice) &&
+						(versioncompare($dolibarrversiontoarray, $dolibarrlastupgradeversionarray) > 0 || versioncompare($dolibarrversiontoarray, $versionarray) < -2)
+					)
+					{
+						$foundrecommandedchoice = 1; // To show only once
+						$recommended_choice = true;
+					}
+				} else {
+					// We cannot recommend a choice.
+					// A version of install may be known, but we need last upgrade.
+				}
+			}
 
-            $choice .= "\n".'<!-- choice '.$count.' -->'."\n";
-            $choice .= '<tr'.($recommended_choice ? ' class="choiceselected"' : '').'>';
-            $choice .= '<td class="nowrap center"><b>'.$langs->trans("Upgrade").'<br>'.$newversionfrom.$newversionfrombis.' -> '.$newversionto.'</b></td>';
-            $choice .= '<td class="listofchoicesdesc">';
-            $choice .= $langs->trans("UpgradeDesc");
+			$choice .= "\n".'<!-- choice '.$count.' -->'."\n";
+			$choice .= '<tr'.($recommended_choice ? ' class="choiceselected"' : '').'>';
+			$choice .= '<td class="nowrap center"><b>'.$langs->trans("Upgrade").'<br>'.$newversionfrom.$newversionfrombis.' -> '.$newversionto.'</b></td>';
+			$choice .= '<td class="listofchoicesdesc">';
+			$choice .= $langs->trans("UpgradeDesc");
 
-            if ($recommended_choice)
-            {
-                $choice .= '<br>';
-                //print $langs->trans("InstallChoiceRecommanded",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE);
-                $choice .= '<div class="center">';
-                $choice .= '<div class="ok suggestedchoice">'.$langs->trans("InstallChoiceSuggested").'</div>';
-                if ($count < count($migarray))	// There are other choices after
-                {
-                    print $langs->trans("MigrateIsDoneStepByStep", DOL_VERSION);
-                }
-                $choice .= '</div>';
-            }
+			if ($recommended_choice)
+			{
+				$choice .= '<br>';
+				//print $langs->trans("InstallChoiceRecommanded",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE);
+				$choice .= '<div class="center">';
+				$choice .= '<div class="ok suggestedchoice">'.$langs->trans("InstallChoiceSuggested").'</div>';
+				if ($count < count($migarray))	// There are other choices after
+				{
+					print $langs->trans("MigrateIsDoneStepByStep", DOL_VERSION);
+				}
+				$choice .= '</div>';
+			}
 
-            $choice .= '</td>';
-            $choice .= '<td class="center">';
+			$choice .= '</td>';
+			$choice .= '<td class="center">';
 			if ($allowupgrade)
 			{
 				$disabled = false;
@@ -515,22 +515,22 @@ if (!file_exists($conffile))
 					$foundrecommandedchoice = 2;
 				}
 				if ($disabled)
-                {
-                    $choice .= '<span class="opacitymedium">'.$langs->trans("NotYetAvailable").'</span>';
-                } else {
-                    $choice .= '<a class="button runupgrade" href="upgrade.php?action=upgrade'.($count < count($migrationscript) ? '_'.$versionto : '').'&amp;selectlang='.$setuplang.'&amp;versionfrom='.$versionfrom.'&amp;versionto='.$versionto.'">'.$langs->trans("Start").'</a>';
-                }
+				{
+					$choice .= '<span class="opacitymedium">'.$langs->trans("NotYetAvailable").'</span>';
+				} else {
+					$choice .= '<a class="button runupgrade" href="upgrade.php?action=upgrade'.($count < count($migrationscript) ? '_'.$versionto : '').'&amp;selectlang='.$setuplang.'&amp;versionfrom='.$versionfrom.'&amp;versionto='.$versionto.'">'.$langs->trans("Start").'</a>';
+				}
 			} else {
-                $choice .= $langs->trans("NotAvailable");
+				$choice .= $langs->trans("NotAvailable");
 			}
-            $choice .= '</td>';
-            $choice .= '</tr>'."\n";
+			$choice .= '</td>';
+			$choice .= '</tr>'."\n";
 
-            if ($allowupgrade) {
-                $available_choices[$count] = $choice;
-            } else {
-                $notavailable_choices[$count] = $choice;
-            }
+			if ($allowupgrade) {
+				$available_choices[$count] = $choice;
+			} else {
+				$notavailable_choices[$count] = $choice;
+			}
 		}
 
 		// If there is no choice at all, we show all of them.
@@ -540,32 +540,32 @@ if (!file_exists($conffile))
 			$notavailable_choices = array();
 		}
 
-        // Array of install choices
+		// Array of install choices
 		krsort($available_choices, SORT_NATURAL);
-        print"\n";
-        print '<table width="100%" class="listofchoices">';
-        foreach ($available_choices as $choice) {
-            print $choice;
-        }
+		print"\n";
+		print '<table width="100%" class="listofchoices">';
+		foreach ($available_choices as $choice) {
+			print $choice;
+		}
 
-        print '</table>'."\n";
+		print '</table>'."\n";
 
-        if (count($notavailable_choices)) {
-            print '<br><div id="AShowChoices" style="opacity: 0.5">';
-            print '> '.$langs->trans('ShowNotAvailableOptions').'...';
-            print '</div>';
+		if (count($notavailable_choices)) {
+			print '<br><div id="AShowChoices" style="opacity: 0.5">';
+			print '> '.$langs->trans('ShowNotAvailableOptions').'...';
+			print '</div>';
 
-            print '<div id="navail_choices" style="display:none">';
-            print "<br>\n";
-            print '<table width="100%" class="listofchoices">';
-            foreach ($notavailable_choices as $choice) {
-                print $choice;
-            }
+			print '<div id="navail_choices" style="display:none">';
+			print "<br>\n";
+			print '<table width="100%" class="listofchoices">';
+			foreach ($notavailable_choices as $choice) {
+				print $choice;
+			}
 
-            print '</table>'."\n";
-            print '</div>';
-        }
-    }
+			print '</table>'."\n";
+			print '</div>';
+		}
+	}
 }
 
 print '<script type="text/javascript">
diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index b7fd69d9ecb..ca397d1ca40 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -233,10 +233,10 @@ table.listofchoices, table.listofchoices tr, table.listofchoices td {
 
 /* OK */
 div.ok {
-	color: #114466;
+	color: #009933;
 }
 span.ok {
-	color: #114466;
+	color: #009933;
 }
 
 /* Warning */
diff --git a/htdocs/install/doctemplates/websites/website_template-corporate.zip b/htdocs/install/doctemplates/websites/website_template-corporate.zip
index 9186b95fdb684c5901f0376c18780fdfba7fa4d9..473d7377fc2ba876562a4c90f831c8ff5ca1cb6b 100644
GIT binary patch
delta 236955
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

delta 390880
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%0D^8kIwzSm$
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%0DW
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%0A#!M@*;#bFF(^_O$$
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

diff --git a/htdocs/install/doctemplates/websites/website_template-stellar.zip b/htdocs/install/doctemplates/websites/website_template-stellar.zip
index 399a32e579dafcd12f6b50e671e7071a75a91395..7607cb9bd8a8f8eced0b8a38296dfbbc9eb8520b 100644
GIT binary patch
delta 17440
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

delta 17135
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
N2}T_@?)^YR7y!v&0x|#q

diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 4e914e1a4f3..ec626a79903 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -60,8 +60,8 @@ $useforcedwizard = false;
 $forcedfile = "./install.forced.php";
 if ($conffile == "/etc/dolibarr/conf.php") $forcedfile = "/etc/dolibarr/install.forced.php"; // Must be after inc.php
 if (@file_exists($forcedfile)) {
-    $useforcedwizard = true;
-    include_once $forcedfile;
+	$useforcedwizard = true;
+	include_once $forcedfile;
 }
 
 
@@ -77,18 +77,18 @@ pHeader($langs->trans("ConfigurationFile"), "step1", "set", "", (empty($force_do
 // Test if we can run a first install process
 if (!is_writable($conffile))
 {
-    print $langs->trans("ConfFileIsNotWritable", $conffiletoshow);
-    dolibarr_install_syslog("fileconf: config file is not writable", LOG_WARNING);
-    dolibarr_install_syslog("- fileconf: end");
-    pFooter(1, $setuplang, 'jscheckparam');
-    exit;
+	print $langs->trans("ConfFileIsNotWritable", $conffiletoshow);
+	dolibarr_install_syslog("fileconf: config file is not writable", LOG_WARNING);
+	dolibarr_install_syslog("- fileconf: end");
+	pFooter(1, $setuplang, 'jscheckparam');
+	exit;
 }
 
 if (!empty($force_install_message))
 {
-    print '<div><br>'.$langs->trans($force_install_message).'</div>';
+	print '<div><br>'.$langs->trans($force_install_message).'</div>';
 
-    /*print '<script type="text/javascript">';
+	/*print '<script type="text/javascript">';
     print '	jQuery(document).ready(function() {
 				jQuery("#linktoshowtechnicalparam").click(function() {
 					jQuery(".hidewhenedit").hide();
@@ -210,7 +210,7 @@ if (!empty($force_install_noedit)) {
 
 	<?php
 	if (!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') {   // Enabled if the installation process is "https://"
-	    ?>
+		?>
 	<tr>
                     <td class="label"><label for="main_force_https"><?php echo $langs->trans("ForceHttps"); ?></label></td>
                     <td class="label">
@@ -254,7 +254,7 @@ if (!empty($force_install_noedit)) {
 	<?php
 	if (!isset($dolibarr_main_db_host))
 	{
-	    $dolibarr_main_db_host = "localhost";
+		$dolibarr_main_db_host = "localhost";
 	}
 	?>
 	<tr>
@@ -275,48 +275,48 @@ if (!empty($force_install_noedit)) {
 		$handle = opendir($dir);
 		if (is_resource($handle))
 		{
-		    while (($file = readdir($handle)) !== false)
-		    {
-		        if (is_readable($dir."/".$file) && preg_match('/^(.*)\.class\.php$/i', $file, $reg))
-		        {
-		            $type = $reg[1];
-                    if ($type === 'DoliDB') continue; // Skip abstract class
-                    $class = 'DoliDB'.ucfirst($type);
-                    include_once $dir."/".$file;
+			while (($file = readdir($handle)) !== false)
+			{
+				if (is_readable($dir."/".$file) && preg_match('/^(.*)\.class\.php$/i', $file, $reg))
+				{
+					$type = $reg[1];
+					if ($type === 'DoliDB') continue; // Skip abstract class
+					$class = 'DoliDB'.ucfirst($type);
+					include_once $dir."/".$file;
 
-                    if ($type == 'sqlite') continue; // We hide sqlite because support can't be complete until sqlite does not manage foreign key creation after table creation (ALTER TABLE child ADD CONSTRAINT not supported)
-                    if ($type == 'sqlite3') continue; // We hide sqlite3 because support can't be complete until sqlite does not manage foreign key creation after table creation (ALTER TABLE child ADD CONSTRAINT not supported)
+					if ($type == 'sqlite') continue; // We hide sqlite because support can't be complete until sqlite does not manage foreign key creation after table creation (ALTER TABLE child ADD CONSTRAINT not supported)
+					if ($type == 'sqlite3') continue; // We hide sqlite3 because support can't be complete until sqlite does not manage foreign key creation after table creation (ALTER TABLE child ADD CONSTRAINT not supported)
 
-		            // Version min of database
-                    $versionbasemin = explode('.', $class::VERSIONMIN);
-                    $note = '('.$class::LABEL.' >= '.$class::VERSIONMIN.')';
+					// Version min of database
+					$versionbasemin = explode('.', $class::VERSIONMIN);
+					$note = '('.$class::LABEL.' >= '.$class::VERSIONMIN.')';
 
-		            // Switch to mysql if mysqli is not present
-		            if ($defaultype == 'mysqli' && !function_exists('mysqli_connect')) $defaultype = 'mysql';
+					// Switch to mysql if mysqli is not present
+					if ($defaultype == 'mysqli' && !function_exists('mysqli_connect')) $defaultype = 'mysql';
 
-		            // Show line into list
-		            if ($type == 'mysql') { $testfunction = 'mysql_connect'; $testclass = ''; }
-		            if ($type == 'mysqli') { $testfunction = 'mysqli_connect'; $testclass = ''; }
-		            if ($type == 'pgsql') { $testfunction = 'pg_connect'; $testclass = ''; }
-		            if ($type == 'mssql') { $testfunction = 'mssql_connect'; $testclass = ''; }
-		        	if ($type == 'sqlite') { $testfunction = ''; $testclass = 'PDO'; }
-		            if ($type == 'sqlite3') { $testfunction = ''; $testclass = 'SQLite3'; }
-		            $option .= '<option value="'.$type.'"'.($defaultype == $type ? ' selected' : '');
-		            if ($testfunction && !function_exists($testfunction)) $option .= ' disabled';
-		            if ($testclass && !class_exists($testclass)) $option .= ' disabled';
-		            $option .= '>';
-		            $option .= $type.'&nbsp; &nbsp;';
-		            if ($note) $option .= ' '.$note;
-		            // Deprecated and experimental
+					// Show line into list
+					if ($type == 'mysql') { $testfunction = 'mysql_connect'; $testclass = ''; }
+					if ($type == 'mysqli') { $testfunction = 'mysqli_connect'; $testclass = ''; }
+					if ($type == 'pgsql') { $testfunction = 'pg_connect'; $testclass = ''; }
+					if ($type == 'mssql') { $testfunction = 'mssql_connect'; $testclass = ''; }
+					if ($type == 'sqlite') { $testfunction = ''; $testclass = 'PDO'; }
+					if ($type == 'sqlite3') { $testfunction = ''; $testclass = 'SQLite3'; }
+					$option .= '<option value="'.$type.'"'.($defaultype == $type ? ' selected' : '');
+					if ($testfunction && !function_exists($testfunction)) $option .= ' disabled';
+					if ($testclass && !class_exists($testclass)) $option .= ' disabled';
+					$option .= '>';
+					$option .= $type.'&nbsp; &nbsp;';
+					if ($note) $option .= ' '.$note;
+					// Deprecated and experimental
 					if ($type == 'mysql') $option .= ' '.$langs->trans("Deprecated");
-		            elseif ($type == 'mssql')  $option .= ' '.$langs->trans("VersionExperimental");
-		            elseif ($type == 'sqlite') $option .= ' '.$langs->trans("VersionExperimental");
-		            elseif ($type == 'sqlite3') $option .= ' '.$langs->trans("VersionExperimental");
-		            // No available
-		            elseif (!function_exists($testfunction)) $option .= ' - '.$langs->trans("FunctionNotAvailableInThisPHP");
-		            $option .= '</option>';
-		        }
-		    }
+					elseif ($type == 'mssql')  $option .= ' '.$langs->trans("VersionExperimental");
+					elseif ($type == 'sqlite') $option .= ' '.$langs->trans("VersionExperimental");
+					elseif ($type == 'sqlite3') $option .= ' '.$langs->trans("VersionExperimental");
+					// No available
+					elseif (!function_exists($testfunction)) $option .= ' - '.$langs->trans("FunctionNotAvailableInThisPHP");
+					$option .= '</option>';
+				}
+			}
 		}
 		?>
 			<select id="db_type"
@@ -409,13 +409,13 @@ if (!empty($force_install_noedit)) {
 			       name="db_pass"
 			       value="
 				<?php
-			    // If $force_install_databasepass is on, we don't want to set password, we just show '***'. Real value will be extracted from the forced install file at step1.
-			    $autofill = ((!empty($_SESSION['dol_save_pass'])) ? $_SESSION['dol_save_pass'] : str_pad('', strlen($force_install_databasepass), '*'));
-			    if (!empty($dolibarr_main_prod)) {
-				    $autofill = '';
-			    }
-			    print dol_escape_htmltag($autofill);
-			    ?>"
+				// If $force_install_databasepass is on, we don't want to set password, we just show '***'. Real value will be extracted from the forced install file at step1.
+				$autofill = ((!empty($_SESSION['dol_save_pass'])) ? $_SESSION['dol_save_pass'] : str_pad('', strlen($force_install_databasepass), '*'));
+				if (!empty($dolibarr_main_prod)) {
+					$autofill = '';
+				}
+				print dol_escape_htmltag($autofill);
+				?>"
 				<?php if ($force_install_noedit == 2 && $force_install_databasepass !== null) { print ' disabled'; } ?>
 			>
 		</td>
@@ -479,19 +479,19 @@ if (!empty($force_install_noedit)) {
 			       name="db_pass_root"
 			       class="needroot"
 			       value="<?php
-			        // If $force_install_databaserootpass is on, we don't want to set password here, we just show '***'. Real value will be extracted from the forced install file at step1.
-			        $autofill = ((!empty($force_install_databaserootpass)) ? str_pad('', strlen($force_install_databaserootpass), '*') : @$db_pass_root);
-			        if (!empty($dolibarr_main_prod)) {
-				        $autofill = '';
-			        }
-				    // Do not autofill password if instance is a production instance
-                    if (!empty($_SERVER["SERVER_NAME"]) && !in_array($_SERVER["SERVER_NAME"],
-					    array('127.0.0.1', 'localhost', 'localhostgit'))
-			        ) {
-				        $autofill = '';
-			        }    // Do not autofill password for remote access
-			        print dol_escape_htmltag($autofill);
-			        ?>"
+					// If $force_install_databaserootpass is on, we don't want to set password here, we just show '***'. Real value will be extracted from the forced install file at step1.
+					$autofill = ((!empty($force_install_databaserootpass)) ? str_pad('', strlen($force_install_databaserootpass), '*') : @$db_pass_root);
+					if (!empty($dolibarr_main_prod)) {
+						$autofill = '';
+					}
+					// Do not autofill password if instance is a production instance
+					if (!empty($_SERVER["SERVER_NAME"]) && !in_array($_SERVER["SERVER_NAME"],
+						array('127.0.0.1', 'localhost', 'localhostgit'))
+					) {
+						$autofill = '';
+					}    // Do not autofill password for remote access
+					print dol_escape_htmltag($autofill);
+					?>"
 				<?php if ($force_install_noedit > 0 && !empty($force_install_databaserootpass)) { print ' disabled'; /* May be removed by javascript*/ } ?>
 			>
 		</td>
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index ff983618c41..12bab777edb 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -36,9 +36,9 @@ require_once '../filefunc.inc.php';
 if (!defined('DOL_DOCUMENT_ROOT'))	    define('DOL_DOCUMENT_ROOT', '..');
 if (!defined('ADODB_PATH'))
 {
-    $foundpath = DOL_DOCUMENT_ROOT.'/includes/adodbtime/';
-    if (!is_dir($foundpath)) $foundpath = '/usr/share/php/adodb/';
-    define('ADODB_PATH', $foundpath);
+	$foundpath = DOL_DOCUMENT_ROOT.'/includes/adodbtime/';
+	if (!is_dir($foundpath)) $foundpath = '/usr/share/php/adodb/';
+	define('ADODB_PATH', $foundpath);
 }
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
@@ -61,7 +61,7 @@ $_REQUEST["logtohtml"] = 1;
 // et non path absolu.
 if (isset($_SERVER["DOCUMENT_URI"]) && $_SERVER["DOCUMENT_URI"])
 {
-    $_SERVER["PHP_SELF"] = $_SERVER["DOCUMENT_URI"];
+	$_SERVER["PHP_SELF"] = $_SERVER["DOCUMENT_URI"];
 }
 
 
@@ -81,54 +81,54 @@ $conffiletoshow = "htdocs/conf/conf.php";
 // Load conf file if it is already defined
 if (!defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) > 8) // Test on filesize is to ensure that conf file is more that an empty template with just <?php in first line
 {
-    $result = include_once $conffile; // Load conf file
-    if ($result)
-    {
+	$result = include_once $conffile; // Load conf file
+	if ($result)
+	{
 		if (empty($dolibarr_main_db_type)) $dolibarr_main_db_type = 'mysqli'; // For backward compatibility
 
-        //Mysql driver support has been removed in favor of mysqli
-        if ($dolibarr_main_db_type == 'mysql') {
-            $dolibarr_main_db_type = 'mysqli';
-        }
+		//Mysql driver support has been removed in favor of mysqli
+		if ($dolibarr_main_db_type == 'mysql') {
+			$dolibarr_main_db_type = 'mysqli';
+		}
 
 		if (empty($dolibarr_main_db_port) && ($dolibarr_main_db_type == 'mysqli')) $dolibarr_main_db_port = '3306'; // For backward compatibility
 
 		// Clean parameters
 		$dolibarr_main_data_root = isset($dolibarr_main_data_root) ?trim($dolibarr_main_data_root) : DOL_DOCUMENT_ROOT.'/../documents';
-    	$dolibarr_main_url_root         = isset($dolibarr_main_url_root) ?trim($dolibarr_main_url_root) : '';
-    	$dolibarr_main_url_root_alt     = isset($dolibarr_main_url_root_alt) ?trim($dolibarr_main_url_root_alt) : '';
-    	$dolibarr_main_document_root    = isset($dolibarr_main_document_root) ?trim($dolibarr_main_document_root) : '';
-    	$dolibarr_main_document_root_alt = isset($dolibarr_main_document_root_alt) ?trim($dolibarr_main_document_root_alt) : '';
+		$dolibarr_main_url_root         = isset($dolibarr_main_url_root) ?trim($dolibarr_main_url_root) : '';
+		$dolibarr_main_url_root_alt     = isset($dolibarr_main_url_root_alt) ?trim($dolibarr_main_url_root_alt) : '';
+		$dolibarr_main_document_root    = isset($dolibarr_main_document_root) ?trim($dolibarr_main_document_root) : '';
+		$dolibarr_main_document_root_alt = isset($dolibarr_main_document_root_alt) ?trim($dolibarr_main_document_root_alt) : '';
 
-        // Remove last / or \ on directories or url value
-        if (!empty($dolibarr_main_document_root) && !preg_match('/^[\\/]+$/', $dolibarr_main_document_root))		$dolibarr_main_document_root = preg_replace('/[\\/]+$/', '', $dolibarr_main_document_root);
-        if (!empty($dolibarr_main_url_root) && !preg_match('/^[\\/]+$/', $dolibarr_main_url_root))			$dolibarr_main_url_root = preg_replace('/[\\/]+$/', '', $dolibarr_main_url_root);
-        if (!empty($dolibarr_main_data_root) && !preg_match('/^[\\/]+$/', $dolibarr_main_data_root))			$dolibarr_main_data_root = preg_replace('/[\\/]+$/', '', $dolibarr_main_data_root);
-        if (!empty($dolibarr_main_document_root_alt) && !preg_match('/^[\\/]+$/', $dolibarr_main_document_root_alt))	$dolibarr_main_document_root_alt = preg_replace('/[\\/]+$/', '', $dolibarr_main_document_root_alt);
-        if (!empty($dolibarr_main_url_root_alt) && !preg_match('/^[\\/]+$/', $dolibarr_main_url_root_alt))		$dolibarr_main_url_root_alt = preg_replace('/[\\/]+$/', '', $dolibarr_main_url_root_alt);
+		// Remove last / or \ on directories or url value
+		if (!empty($dolibarr_main_document_root) && !preg_match('/^[\\/]+$/', $dolibarr_main_document_root))		$dolibarr_main_document_root = preg_replace('/[\\/]+$/', '', $dolibarr_main_document_root);
+		if (!empty($dolibarr_main_url_root) && !preg_match('/^[\\/]+$/', $dolibarr_main_url_root))			$dolibarr_main_url_root = preg_replace('/[\\/]+$/', '', $dolibarr_main_url_root);
+		if (!empty($dolibarr_main_data_root) && !preg_match('/^[\\/]+$/', $dolibarr_main_data_root))			$dolibarr_main_data_root = preg_replace('/[\\/]+$/', '', $dolibarr_main_data_root);
+		if (!empty($dolibarr_main_document_root_alt) && !preg_match('/^[\\/]+$/', $dolibarr_main_document_root_alt))	$dolibarr_main_document_root_alt = preg_replace('/[\\/]+$/', '', $dolibarr_main_document_root_alt);
+		if (!empty($dolibarr_main_url_root_alt) && !preg_match('/^[\\/]+$/', $dolibarr_main_url_root_alt))		$dolibarr_main_url_root_alt = preg_replace('/[\\/]+$/', '', $dolibarr_main_url_root_alt);
 
-        // Create conf object
-        if (!empty($dolibarr_main_document_root))
-        {
-            $result = conf($dolibarr_main_document_root);
-        }
-        // Load database driver
-        if ($result)
-        {
-            if (!empty($dolibarr_main_document_root) && !empty($dolibarr_main_db_type))
-            {
-                $result = include_once $dolibarr_main_document_root."/core/db/".$dolibarr_main_db_type.'.class.php';
-                if (!$result)
-                {
-                    $includeconferror = 'ErrorBadValueForDolibarrMainDBType';
-                }
-            }
-        } else {
-            $includeconferror = 'ErrorBadValueForDolibarrMainDocumentRoot';
-        }
-    } else {
-        $includeconferror = 'ErrorBadFormatForConfFile';
-    }
+		// Create conf object
+		if (!empty($dolibarr_main_document_root))
+		{
+			$result = conf($dolibarr_main_document_root);
+		}
+		// Load database driver
+		if ($result)
+		{
+			if (!empty($dolibarr_main_document_root) && !empty($dolibarr_main_db_type))
+			{
+				$result = include_once $dolibarr_main_document_root."/core/db/".$dolibarr_main_db_type.'.class.php';
+				if (!$result)
+				{
+					$includeconferror = 'ErrorBadValueForDolibarrMainDBType';
+				}
+			}
+		} else {
+			$includeconferror = 'ErrorBadValueForDolibarrMainDocumentRoot';
+		}
+	} else {
+		$includeconferror = 'ErrorBadFormatForConfFile';
+	}
 }
 $conf->global->MAIN_ENABLE_LOG_TO_HTML = 1;
 
@@ -156,12 +156,12 @@ if (empty($conf->db->user)) $conf->db->user = '';
 $conf->file->dol_document_root = array(DOL_DOCUMENT_ROOT);
 if (!empty($dolibarr_main_document_root_alt))
 {
-    // dolibarr_main_document_root_alt contains several directories
-    $values = preg_split('/[;,]/', $dolibarr_main_document_root_alt);
-    foreach ($values as $value)
-    {
-        $conf->file->dol_document_root[] = $value;
-    }
+	// dolibarr_main_document_root_alt contains several directories
+	$values = preg_split('/[;,]/', $dolibarr_main_document_root_alt);
+	foreach ($values as $value)
+	{
+		$conf->file->dol_document_root[] = $value;
+	}
 }
 
 
@@ -175,13 +175,13 @@ if (preg_match('/install\.lock/i', $_SERVER["SCRIPT_FILENAME"]))
 	}
 	$langs->load("install");
 	print $langs->trans("YouTryInstallDisabledByDirLock");
-    if (!empty($dolibarr_main_url_root))
-    {
-        print 'Click on following link, <a href="'.$dolibarr_main_url_root.'/admin/index.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"]) ? '&username='.urlencode($_POST["login"]) : '').'">';
-        print $langs->trans("ClickHereToGoToApp");
-        print '</a>';
-    }
-    exit;
+	if (!empty($dolibarr_main_url_root))
+	{
+		print 'Click on following link, <a href="'.$dolibarr_main_url_root.'/admin/index.php?mainmenu=home&leftmenu=setup'.(GETPOSTISSET("login") ? '&username='.urlencode(GETPOST("login")) : '').'">';
+		print $langs->trans("ClickHereToGoToApp");
+		print '</a>';
+	}
+	exit;
 }
 
 $lockfile = DOL_DATA_ROOT.'/install.lock';
@@ -199,16 +199,16 @@ if (@file_exists($lockfile))
 	}
 	$langs->load("install");
 	print $langs->trans("YouTryInstallDisabledByFileLock");
-    if (!empty($dolibarr_main_url_root))
-    {
-        print $langs->trans("ClickOnLinkOrRemoveManualy").'<br>';
-        print '<a href="'.$dolibarr_main_url_root.'/admin/index.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"]) ? '&username='.urlencode($_POST["login"]) : '').'">';
-        print $langs->trans("ClickHereToGoToApp");
-        print '</a>';
-    } else {
-        print 'If you always reach this page, you must remove install.lock file manually.<br>';
-    }
-    exit;
+	if (!empty($dolibarr_main_url_root))
+	{
+		print $langs->trans("ClickOnLinkOrRemoveManualy").'<br>';
+		print '<a href="'.$dolibarr_main_url_root.'/admin/index.php?mainmenu=home&leftmenu=setup'.(GETPOSTISSET("login") ? '&username='.urlencode(GETPOST("login")) : '').'">';
+		print $langs->trans("ClickHereToGoToApp");
+		print '</a>';
+	} else {
+		print 'If you always reach this page, you must remove install.lock file manually.<br>';
+	}
+	exit;
 }
 
 
@@ -261,75 +261,75 @@ else $langs->setDefaultLang('auto');
  */
 function conf($dolibarr_main_document_root)
 {
-    global $conf;
-    global $dolibarr_main_db_type;
-    global $dolibarr_main_db_host;
-    global $dolibarr_main_db_port;
-    global $dolibarr_main_db_name;
-    global $dolibarr_main_db_user;
-    global $dolibarr_main_db_pass;
-    global $character_set_client;
+	global $conf;
+	global $dolibarr_main_db_type;
+	global $dolibarr_main_db_host;
+	global $dolibarr_main_db_port;
+	global $dolibarr_main_db_name;
+	global $dolibarr_main_db_user;
+	global $dolibarr_main_db_pass;
+	global $character_set_client;
 
-    $return = include_once $dolibarr_main_document_root.'/core/class/conf.class.php';
-    if (!$return) return -1;
+	$return = include_once $dolibarr_main_document_root.'/core/class/conf.class.php';
+	if (!$return) return -1;
 
-    $conf = new Conf();
-    $conf->db->type = trim($dolibarr_main_db_type);
-    $conf->db->host = trim($dolibarr_main_db_host);
-    $conf->db->port = trim($dolibarr_main_db_port);
-    $conf->db->name = trim($dolibarr_main_db_name);
-    $conf->db->user = trim($dolibarr_main_db_user);
-    $conf->db->pass = trim($dolibarr_main_db_pass);
+	$conf = new Conf();
+	$conf->db->type = trim($dolibarr_main_db_type);
+	$conf->db->host = trim($dolibarr_main_db_host);
+	$conf->db->port = trim($dolibarr_main_db_port);
+	$conf->db->name = trim($dolibarr_main_db_name);
+	$conf->db->user = trim($dolibarr_main_db_user);
+	$conf->db->pass = trim($dolibarr_main_db_pass);
 
-    // Mysql driver support has been removed in favor of mysqli
-    if ($conf->db->type == 'mysql') $conf->db->type = 'mysqli';
-    if (empty($character_set_client)) $character_set_client = "UTF-8";
-    $conf->file->character_set_client = strtoupper($character_set_client);
-    if (empty($dolibarr_main_db_character_set)) $dolibarr_main_db_character_set = ($conf->db->type == 'mysqli' ? 'utf8' : '');
-    $conf->db->character_set = $dolibarr_main_db_character_set;
-    if (empty($dolibarr_main_db_collation)) $dolibarr_main_db_collation = ($conf->db->type == 'mysqli' ? 'utf8_unicode_ci' : '');
-    $conf->db->dolibarr_main_db_collation = $dolibarr_main_db_collation;
-    if (empty($dolibarr_main_db_encryption)) $dolibarr_main_db_encryption = 0;
-    $conf->db->dolibarr_main_db_encryption = $dolibarr_main_db_encryption;
-    if (empty($dolibarr_main_db_cryptkey)) $dolibarr_main_db_cryptkey = '';
-    $conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey;
+	// Mysql driver support has been removed in favor of mysqli
+	if ($conf->db->type == 'mysql') $conf->db->type = 'mysqli';
+	if (empty($character_set_client)) $character_set_client = "UTF-8";
+	$conf->file->character_set_client = strtoupper($character_set_client);
+	if (empty($dolibarr_main_db_character_set)) $dolibarr_main_db_character_set = ($conf->db->type == 'mysqli' ? 'utf8' : '');
+	$conf->db->character_set = $dolibarr_main_db_character_set;
+	if (empty($dolibarr_main_db_collation)) $dolibarr_main_db_collation = ($conf->db->type == 'mysqli' ? 'utf8_unicode_ci' : '');
+	$conf->db->dolibarr_main_db_collation = $dolibarr_main_db_collation;
+	if (empty($dolibarr_main_db_encryption)) $dolibarr_main_db_encryption = 0;
+	$conf->db->dolibarr_main_db_encryption = $dolibarr_main_db_encryption;
+	if (empty($dolibarr_main_db_cryptkey)) $dolibarr_main_db_cryptkey = '';
+	$conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey;
 
-    // Force usage of log file for install and upgrades
-    $conf->syslog->enabled = 1;
-    $conf->global->SYSLOG_LEVEL = constant('LOG_DEBUG');
-    if (!defined('SYSLOG_HANDLERS')) define('SYSLOG_HANDLERS', '["mod_syslog_file"]');
-    if (!defined('SYSLOG_FILE'))	// To avoid warning on systems with constant already defined
-    {
-        if (@is_writable('/tmp')) define('SYSLOG_FILE', '/tmp/dolibarr_install.log');
-        elseif (!empty($_ENV["TMP"]) && @is_writable($_ENV["TMP"]))  define('SYSLOG_FILE', $_ENV["TMP"].'/dolibarr_install.log');
-        elseif (!empty($_ENV["TEMP"]) && @is_writable($_ENV["TEMP"])) define('SYSLOG_FILE', $_ENV["TEMP"].'/dolibarr_install.log');
-        elseif (@is_writable('../../../../') && @file_exists('../../../../startdoliwamp.bat')) define('SYSLOG_FILE', '../../../../dolibarr_install.log'); // For DoliWamp
-        elseif (@is_writable('../../')) define('SYSLOG_FILE', '../../dolibarr_install.log'); // For others
-        //print 'SYSLOG_FILE='.SYSLOG_FILE;exit;
-    }
-    if (defined('SYSLOG_FILE')) $conf->global->SYSLOG_FILE = constant('SYSLOG_FILE');
-    if (!defined('SYSLOG_FILE_NO_ERROR')) define('SYSLOG_FILE_NO_ERROR', 1);
-    // We init log handler for install
-    $handlers = array('mod_syslog_file');
-    foreach ($handlers as $handler)
-    {
-    	$file = DOL_DOCUMENT_ROOT.'/core/modules/syslog/'.$handler.'.php';
-    	if (!file_exists($file))
-    	{
-    		throw new Exception('Missing log handler file '.$handler.'.php');
-    	}
+	// Force usage of log file for install and upgrades
+	$conf->syslog->enabled = 1;
+	$conf->global->SYSLOG_LEVEL = constant('LOG_DEBUG');
+	if (!defined('SYSLOG_HANDLERS')) define('SYSLOG_HANDLERS', '["mod_syslog_file"]');
+	if (!defined('SYSLOG_FILE'))	// To avoid warning on systems with constant already defined
+	{
+		if (@is_writable('/tmp')) define('SYSLOG_FILE', '/tmp/dolibarr_install.log');
+		elseif (!empty($_ENV["TMP"]) && @is_writable($_ENV["TMP"]))  define('SYSLOG_FILE', $_ENV["TMP"].'/dolibarr_install.log');
+		elseif (!empty($_ENV["TEMP"]) && @is_writable($_ENV["TEMP"])) define('SYSLOG_FILE', $_ENV["TEMP"].'/dolibarr_install.log');
+		elseif (@is_writable('../../../../') && @file_exists('../../../../startdoliwamp.bat')) define('SYSLOG_FILE', '../../../../dolibarr_install.log'); // For DoliWamp
+		elseif (@is_writable('../../')) define('SYSLOG_FILE', '../../dolibarr_install.log'); // For others
+		//print 'SYSLOG_FILE='.SYSLOG_FILE;exit;
+	}
+	if (defined('SYSLOG_FILE')) $conf->global->SYSLOG_FILE = constant('SYSLOG_FILE');
+	if (!defined('SYSLOG_FILE_NO_ERROR')) define('SYSLOG_FILE_NO_ERROR', 1);
+	// We init log handler for install
+	$handlers = array('mod_syslog_file');
+	foreach ($handlers as $handler)
+	{
+		$file = DOL_DOCUMENT_ROOT.'/core/modules/syslog/'.$handler.'.php';
+		if (!file_exists($file))
+		{
+			throw new Exception('Missing log handler file '.$handler.'.php');
+		}
 
-    	require_once $file;
-    	$loghandlerinstance = new $handler();
-    	if (!$loghandlerinstance instanceof LogHandlerInterface)
-    	{
-    		throw new Exception('Log handler does not extend LogHandlerInterface');
-    	}
+		require_once $file;
+		$loghandlerinstance = new $handler();
+		if (!$loghandlerinstance instanceof LogHandlerInterface)
+		{
+			throw new Exception('Log handler does not extend LogHandlerInterface');
+		}
 
 		if (empty($conf->loghandlers[$handler])) $conf->loghandlers[$handler] = $loghandlerinstance;
-    }
+	}
 
-    return 1;
+	return 1;
 }
 
 
@@ -346,70 +346,70 @@ function conf($dolibarr_main_document_root)
  */
 function pHeader($subtitle, $next, $action = 'set', $param = '', $forcejqueryurl = '', $csstable = 'main-inside')
 {
-    global $conf;
-    global $langs;
-    $langs->load("main");
-    $langs->load("admin");
+	global $conf;
+	global $langs;
+	$langs->load("main");
+	$langs->load("admin");
 	$langs->load("install");
 
-    $jquerytheme = 'base';
+	$jquerytheme = 'base';
 
-    if ($forcejqueryurl)
-    {
-        $jQueryCustomPath = $forcejqueryurl;
-        $jQueryUiCustomPath = $forcejqueryurl;
-    } else {
-        $jQueryCustomPath = (defined('JS_JQUERY') && constant('JS_JQUERY')) ? JS_JQUERY : false;
-        $jQueryUiCustomPath = (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) ? JS_JQUERY_UI : false;
-    }
+	if ($forcejqueryurl)
+	{
+		$jQueryCustomPath = $forcejqueryurl;
+		$jQueryUiCustomPath = $forcejqueryurl;
+	} else {
+		$jQueryCustomPath = (defined('JS_JQUERY') && constant('JS_JQUERY')) ? JS_JQUERY : false;
+		$jQueryUiCustomPath = (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) ? JS_JQUERY_UI : false;
+	}
 
-    // We force the content charset
-    header("Content-type: text/html; charset=".$conf->file->character_set_client);
-    header("X-Content-Type-Options: nosniff");
+	// We force the content charset
+	header("Content-type: text/html; charset=".$conf->file->character_set_client);
+	header("X-Content-Type-Options: nosniff");
 
-    print '<!DOCTYPE HTML>'."\n";
-    print '<html>'."\n";
-    print '<head>'."\n";
-    print '<meta charset="'.$conf->file->character_set_client.'">'."\n";
-    print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";
-    print '<meta name="generator" content="Dolibarr installer">'."\n";
-    print '<link rel="stylesheet" type="text/css" href="default.css">'."\n";
+	print '<!DOCTYPE HTML>'."\n";
+	print '<html>'."\n";
+	print '<head>'."\n";
+	print '<meta charset="'.$conf->file->character_set_client.'">'."\n";
+	print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";
+	print '<meta name="generator" content="Dolibarr installer">'."\n";
+	print '<link rel="stylesheet" type="text/css" href="default.css">'."\n";
 
-    print '<!-- Includes CSS for JQuery -->'."\n";
-    if ($jQueryUiCustomPath) print '<link rel="stylesheet" type="text/css" href="'.$jQueryUiCustomPath.'css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n"; // JQuery
-    else print '<link rel="stylesheet" type="text/css" href="../includes/jquery/css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n"; // JQuery
+	print '<!-- Includes CSS for JQuery -->'."\n";
+	if ($jQueryUiCustomPath) print '<link rel="stylesheet" type="text/css" href="'.$jQueryUiCustomPath.'css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n"; // JQuery
+	else print '<link rel="stylesheet" type="text/css" href="../includes/jquery/css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n"; // JQuery
 
-    print '<!-- Includes JS for JQuery -->'."\n";
-    if ($jQueryCustomPath) print '<script type="text/javascript" src="'.$jQueryCustomPath.'jquery.min.js"></script>'."\n";
-    else print '<script type="text/javascript" src="../includes/jquery/js/jquery.min.js"></script>'."\n";
-    if ($jQueryUiCustomPath) print '<script type="text/javascript" src="'.$jQueryUiCustomPath.'jquery-ui.min.js"></script>'."\n";
-    else print '<script type="text/javascript" src="../includes/jquery/js/jquery-ui.min.js"></script>'."\n";
+	print '<!-- Includes JS for JQuery -->'."\n";
+	if ($jQueryCustomPath) print '<script type="text/javascript" src="'.$jQueryCustomPath.'jquery.min.js"></script>'."\n";
+	else print '<script type="text/javascript" src="../includes/jquery/js/jquery.min.js"></script>'."\n";
+	if ($jQueryUiCustomPath) print '<script type="text/javascript" src="'.$jQueryUiCustomPath.'jquery-ui.min.js"></script>'."\n";
+	else print '<script type="text/javascript" src="../includes/jquery/js/jquery-ui.min.js"></script>'."\n";
 
-    print '<title>'.$langs->trans("DolibarrSetup").'</title>'."\n";
-    print '</head>'."\n";
+	print '<title>'.$langs->trans("DolibarrSetup").'</title>'."\n";
+	print '</head>'."\n";
 
-    print '<body>'."\n";
+	print '<body>'."\n";
 
-    print '<div class="divlogoinstall" style="text-align:center">';
-    print '<img class="imglogoinstall" src="../theme/dolibarr_logo.svg" alt="Dolibarr logo" width="300px"><br>';
-    print DOL_VERSION;
-    print '</div><br>';
+	print '<div class="divlogoinstall" style="text-align:center">';
+	print '<img class="imglogoinstall" src="../theme/dolibarr_logo.svg" alt="Dolibarr logo" width="300px"><br>';
+	print DOL_VERSION;
+	print '</div><br>';
 
-    print '<span class="titre">'.$langs->trans("DolibarrSetup");
-    if ($subtitle) {
-        print ' - '.$subtitle;
-    }
-    print '</span>'."\n";
+	print '<span class="titre">'.$langs->trans("DolibarrSetup");
+	if ($subtitle) {
+		print ' - '.$subtitle;
+	}
+	print '</span>'."\n";
 
-    print '<form name="forminstall" style="width: 100%" action="'.$next.'.php'.($param ? '?'.$param : '').'" method="POST"';
-    if ($next == 'step5') print ' autocomplete="off"';
-    print '>'."\n";
-    print '<input type="hidden" name="testpost" value="ok">'."\n";
-    print '<input type="hidden" name="action" value="'.$action.'">'."\n";
+	print '<form name="forminstall" style="width: 100%" action="'.$next.'.php'.($param ? '?'.$param : '').'" method="POST"';
+	if ($next == 'step5') print ' autocomplete="off"';
+	print '>'."\n";
+	print '<input type="hidden" name="testpost" value="ok">'."\n";
+	print '<input type="hidden" name="action" value="'.$action.'">'."\n";
 
-    print '<table class="main" width="100%"><tr><td>'."\n";
+	print '<table class="main" width="100%"><tr><td>'."\n";
 
-    print '<table class="'.$csstable.'" width="100%"><tr><td>'."\n";
+	print '<table class="'.$csstable.'" width="100%"><tr><td>'."\n";
 }
 
 /**
@@ -423,52 +423,53 @@ function pHeader($subtitle, $next, $action = 'set', $param = '', $forcejqueryurl
  */
 function pFooter($nonext = 0, $setuplang = '', $jscheckfunction = '', $withpleasewait = 0)
 {
-    global $conf, $langs;
+	global $conf, $langs;
 
-    $langs->load("main");
-    $langs->load("other");
-    $langs->load("admin");
+	$langs->loadLangs(array("main", "other", "admin"));
 
-    print '</td></tr></table>'."\n";
-    print '</td></tr></table>'."\n";
+	print '</td></tr></table>'."\n";
+	print '</td></tr></table>'."\n";
 
-    if (!$nonext || ($nonext == '2'))
-    {
-        print '<div class="nextbutton" id="nextbutton">';
-        if ($nonext == '2')
+	if (!$nonext || ($nonext == '2'))
+	{
+		print '<div class="nextbutton" id="nextbutton">';
+		if ($nonext == '2')
 		{
-			print $langs->trans("ErrorFoundDuringMigration", isset($_SERVER["REQUEST_URI"]) ? $_SERVER["REQUEST_URI"].'&ignoreerrors=1' : '').'<br><br>';
+			print '<span class="warning">';
+			print $langs->trans("ErrorFoundDuringMigration", isset($_SERVER["REQUEST_URI"]) ? $_SERVER["REQUEST_URI"].'&ignoreerrors=1' : '');
+			print '</span>';
+			print '<br><br>';
 		}
 
-        print '<input type="submit" '.($nonext == '2' ? 'disabled="disabled" ' : '').'value="'.$langs->trans("NextStep").' ->"';
-        if ($jscheckfunction) print ' onClick="return '.$jscheckfunction.'();"';
-        print '></div>';
-        if ($withpleasewait) print '<div style="visibility: hidden;" class="pleasewait" id="pleasewait"><br>'.$langs->trans("NextStepMightLastALongTime").'<br><br><div class="blinkwait">'.$langs->trans("PleaseBePatient").'</div></div>';
-    }
-    if ($setuplang)
-    {
-        print '<input type="hidden" name="selectlang" value="'.$setuplang.'">';
-    }
+		print '<input type="submit" '.($nonext == '2' ? 'disabled="disabled" ' : '').'value="'.$langs->trans("NextStep").' ->"';
+		if ($jscheckfunction) print ' onClick="return '.$jscheckfunction.'();"';
+		print '></div>';
+		if ($withpleasewait) print '<div style="visibility: hidden;" class="pleasewait" id="pleasewait"><br>'.$langs->trans("NextStepMightLastALongTime").'<br><br><div class="blinkwait">'.$langs->trans("PleaseBePatient").'</div></div>';
+	}
+	if ($setuplang)
+	{
+		print '<input type="hidden" name="selectlang" value="'.$setuplang.'">';
+	}
 
-    print '</form>'."\n";
+	print '</form>'."\n";
 
-    // If there is some logs in buffer to show
-    if (isset($conf->logbuffer) && count($conf->logbuffer))
-    {
-        print "\n";
-        print "<!-- Start of log output\n";
-        //print '<div class="hidden">'."\n";
-        foreach ($conf->logbuffer as $logline)
-        {
-            print $logline."<br>\n";
-        }
-        //print '</div>'."\n";
-        print "End of log output -->\n";
-        print "\n";
-    }
+	// If there is some logs in buffer to show
+	if (isset($conf->logbuffer) && count($conf->logbuffer))
+	{
+		print "\n";
+		print "<!-- Start of log output\n";
+		//print '<div class="hidden">'."\n";
+		foreach ($conf->logbuffer as $logline)
+		{
+			print $logline."<br>\n";
+		}
+		//print '</div>'."\n";
+		print "End of log output -->\n";
+		print "\n";
+	}
 
-    print '</body>'."\n";
-    print '</html>'."\n";
+	print '</body>'."\n";
+	print '</html>'."\n";
 }
 
 /**
@@ -480,8 +481,8 @@ function pFooter($nonext = 0, $setuplang = '', $jscheckfunction = '', $withpleas
  */
 function dolibarr_install_syslog($message, $level = LOG_DEBUG)
 {
-    if (!defined('LOG_DEBUG')) define('LOG_DEBUG', 6);
-    dol_syslog($message, $level);
+	if (!defined('LOG_DEBUG')) define('LOG_DEBUG', 6);
+	dol_syslog($message, $level);
 }
 
 /**
diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql
index bbb7af35bb7..43d2652298f 100644
--- a/htdocs/install/mysql/data/llx_10_c_regions.sql
+++ b/htdocs/install/mysql/data/llx_10_c_regions.sql
@@ -380,3 +380,7 @@ insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,931,
 insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,932, '新',0,'新疆维吾尔自治区');
 insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,933, '港',0,'香港特别行政区');
 insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,934, '澳',0,'澳门特别行政区');
+
+-- Regions Angola (rowid country=35)
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES (35, 35001, 'AO', NULL, 'Angola');
+
diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql
index 54ab237c9b8..00f30fab0be 100644
--- a/htdocs/install/mysql/data/llx_20_c_departements.sql
+++ b/htdocs/install/mysql/data/llx_20_c_departements.sql
@@ -1606,3 +1606,23 @@ INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('20204', 'SI038', NULL, NULL, 'UPPER CARNIOLA', 'Upper Carniola');
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('20204', 'SI043', NULL, NULL, 'GORIZIA', 'Gorizia');
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('20204', 'SI044', NULL, NULL, 'COASTAL–KARST', 'Coastal–Karst');
+
+-- Provinces (postal districts) Angola (rowid country=35)
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-ABO', NULL, NULL, 'BENGO', 'Bengo');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-BGU', NULL, NULL, 'BENGUELA', 'Benguela');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-BIE', NULL, NULL, 'BIÉ', 'Bié');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-CAB', NULL, NULL, 'CABINDA', 'Cabinda');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-CCU', NULL, NULL, 'KUANDO KUBANGO', 'Kuando Kubango');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-CNO', NULL, NULL, 'KWANZA NORTE', 'Kwanza Norte');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-CUS', NULL, NULL, 'KWANZA SUL', 'Kwanza Sul');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-CNN', NULL, NULL, 'CUNENE', 'Cunene');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-HUA', NULL, NULL, 'HUAMBO', 'Huambo');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-HUI', NULL, NULL, 'HUÍLA', 'Huila');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-LUA', NULL, NULL, 'LUANDA', 'Luanda');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-LNO', NULL, NULL, 'LUNDA-NORTE', 'Lunda-Norte');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-LSU',NULL, NULL,  'LUNDA-SUL', 'Lunda-Sul');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-MAL', NULL, NULL, 'MALANGE', 'Malange');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-MOX', NULL, NULL, 'MOXICO', 'Moxico');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-NAM', NULL, NULL, 'NAMÍBE', 'Namíbe');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-UIG', NULL, NULL, 'UÍGE', 'Uíge');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-ZAI', NULL, NULL, 'ZAÍRE', 'Zaíre');
diff --git a/htdocs/install/mysql/data/llx_accounting_abc.sql b/htdocs/install/mysql/data/llx_accounting_abc.sql
index d3f9ad5fd69..9118b7a4651 100644
--- a/htdocs/install/mysql/data/llx_accounting_abc.sql
+++ b/htdocs/install/mysql/data/llx_accounting_abc.sql
@@ -8,7 +8,12 @@
 -- Copyright (C) 2011-2018 Alexandre Spangaro   <aspangaro@open-dsi.fr>
 -- Copyright (C) 2015-2017 Juanjo Menent        <jmenent@2byte.es>
 -- Copyright (C) 2018      Abbes bahfir         <dolipar@dolipar.org>
+-- Copyright (C) 2020      Udo Tamm             <dev@dolibit.de>
 --
+--
+--------------------------------------------------------------------------------------
+-- License
+-- #######
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
 -- the Free Software Foundation; either version 3 of the License, or
@@ -22,14 +27,25 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <https://www.gnu.org/licenses/>.
 --
---
+--------------------------------------------------------------------------------------
 
+-- Comment
+-- #######
+-- (EN)
+-- Do not place a comment at the end of the line, this file is parsed at the end of the line.
+-- from the install and all '--' are removed.
 --
+-- (FR)
 -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
 -- de l'install et tous les sigles '--' sont supprimés.
 --
+--------------------------------------------------------------------------------------
+-- PCG = Plan Comptable Général (FR) - General Accounting Plan (EN)
+--------------------------------------------------------------------------------------
 
 
+-- Accounting Journals 
+
 INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('VT',  'ACCOUNTING_SELL_JOURNAL',          2, 1, 1);
 INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('AC',  'ACCOUNTING_PURCHASE_JOURNAL',      3, 1, 1);
 INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('BQ',  'FinanceJournal',                   4, 1, 1);
@@ -39,6 +55,9 @@ INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES
 INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('INV', 'InventoryJournal',                 8, 1, 1);
 
 
+
+-- Accounting Charts / Plans (Templates) for Countries
+
 -- Description of chart of account FR PCG99-ABREGE
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  1, 'PCG99-ABREGE', 'The simple accountancy french plan', 1);
 -- Description of chart of account FR PCG99-BASE
@@ -56,8 +75,9 @@ INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUE
 -- Description of chart of account ES PCG08-PYME
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  4, 'PCG08-PYME', 'The PYME accountancy spanish plan', 1);
 
--- Description of chart of account DE SKR03
+-- Description of chart of account DE SKR-03
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  5, 'SKR03', 'Standardkontenrahmen SKR 03', 1);
+-- Description of chart of account DE SKR-04
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  5, 'SKR04', 'Standardkontenrahmen SKR 04', 1);
 
 -- Description of chart of account CH PCG_SUISSE
@@ -69,6 +89,18 @@ INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUE
 -- Description of chart of account TN PCT
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 10, 'PCT', 'The Tunisia plan', 1);
 
+-- Description of chart of account MA PCG
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 12, 'PCG', 'The Moroccan chart of accounts', 1);
+
+-- Description of chart of account DZ NSCF
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 13, 'NSCF', 'Nouveau système comptable financier', 1);
+
+-- Description of chart of account NL NL-VERKORT
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 17, 'NL-VERKORT', 'Verkort rekeningschema', 1);
+
+-- Description of chart of account SE BAS-K1-MINI
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 20, 'BAS-K1-MINI', 'The Swedish mini chart of accounts', 1);
+
 -- Description of chart of account AT AT-BASE
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 41, 'AT-BASE', 'Plan Austria', 1);
 
@@ -78,54 +110,60 @@ INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUE
 -- Description of chart of account DK DK-STD
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 80, 'DK-STD', 'Standardkontoplan fra SKAT', 1);
 
+-- Description of chart of account EC EC-SUPERCIAS
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 84, 'EC-SUPERCIAS', 'Plan de cuentas Ecuador', 1);
+
+
 -- Description of chart of account LU PCN-LUXEMBURG
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (140, 'PCN-LUXEMBURG', 'Plan comptable normalisé Luxembourgeois', 1);
 
--- Description of chart of account MA PCG
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 12, 'PCG', 'The Moroccan chart of accounts', 1);
 
--- Description of chart of account SE BAS-K1-MINI
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 20, 'BAS-K1-MINI', 'The Swedish mini chart of accounts', 1);
+-- Description of chart of account RO RO-BASE
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (188, 'RO-BASE', 'Plan de conturi romanesc', 1);
+
+
 
 
 --DELETE FROM llx_accounting_system WHERE pcg_version = 'SYSCOHADA';
 
+-- Plans SYSCOAHA Western Africa -- sorted alphabetical by countries abbreviations
+
 -- Description of chart of account BJ SYSCOHADA
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 49,'SYSCOHADA-BJ', 'Plan comptable Ouest-Africain', 1);
 
 -- Description of chart of account BF SYSCOHADA
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 60,'SYSCOHADA-BF', 'Plan comptable Ouest-Africain', 1);
 
--- Description of chart of account CM SYSCOHADA
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 24,'SYSCOHADA-CM', 'Plan comptable Ouest-Africain', 1);
+-- Description of chart of account CD SYSCOHADA
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 73,'SYSCOHADA-CD', 'Plan comptable Ouest-Africain', 1);
 
 -- Description of chart of account CF SYSCOHADA
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 65,'SYSCOHADA-CF', 'Plan comptable Ouest-Africain', 1);
 
--- Description of chart of account KM SYSCOHADA
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 71,'SYSCOHADA-KM', 'Plan comptable Ouest-Africain', 1);
-
 -- Description of chart of account CG SYSCOHADA
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 72,'SYSCOHADA-CG', 'Plan comptable Ouest-Africain', 1);
 
 -- Description of chart of account CI SYSCOHADA
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 21,'SYSCOHADA-CI', 'Plan comptable Ouest-Africain', 1);
 
+-- Description of chart of account CM SYSCOHADA
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 24,'SYSCOHADA-CM', 'Plan comptable Ouest-Africain', 1);
+
 -- Description of chart of account GA SYSCOHADA
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 16,'SYSCOHADA-GA', 'Plan comptable Ouest-Africain', 1);
 
 -- Description of chart of account GQ SYSCOHADA
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 87,'SYSCOHADA-GQ', 'Plan comptable Ouest-Africain', 1);
 
+-- Description of chart of account KM SYSCOHADA
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 71,'SYSCOHADA-KM', 'Plan comptable Ouest-Africain', 1);
+
 -- Description of chart of account ML SYSCOHADA
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (147,'SYSCOHADA-ML', 'Plan comptable Ouest-Africain', 1);
 
 -- Description of chart of account NE SYSCOHADA
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (168,'SYSCOHADA-NE', 'Plan comptable Ouest-Africain', 1);
 
--- Description of chart of account CD SYSCOHADA
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 73,'SYSCOHADA-CD', 'Plan comptable Ouest-Africain', 1);
-
 -- Description of chart of account SN SYSCOHADA
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 22,'SYSCOHADA-SN', 'Plan comptable Ouest-Africain', 1);
 
@@ -135,14 +173,3 @@ INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUE
 -- Description of chart of account TG SYSCOHADA
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 15,'SYSCOHADA-TG', 'Plan comptable Ouest-Africain', 1);
 
--- Description of chart of account RO RO-BASE
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  188, 'RO-BASE', 'Plan de conturi romanesc', 1);
-
--- Description of chart of account DZ NSCF
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  13, 'NSCF', 'Nouveau système comptable financier', 1);
-
--- Description of chart of account NL NL-VERKORT
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  17, 'NL-VERKORT', 'Verkort rekeningschema', 1);
-
--- Description of chart of account EC EC-SUPERCIAS
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  84, 'EC-SUPERCIAS', 'Plan de cuentas Ecuador', 1);
\ No newline at end of file
diff --git a/htdocs/install/mysql/data/llx_accounting_account_ca.sql b/htdocs/install/mysql/data/llx_accounting_account_ca.sql
index 45d856414c5..e219ad7e67f 100644
--- a/htdocs/install/mysql/data/llx_accounting_account_ca.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_ca.sql
@@ -32,157 +32,157 @@
 -- ID 1000 - 9999
 -- ADD 1400000 to rowid # Do no remove this comment --
 
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1000,'CA-ENG-BASE','ASSETS',         'XXXXXX',   '1',   '0', 'Assets', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 2000,'CA-ENG-BASE','LIABILITIES',    'XXXXXX',   '2',   '0', 'Liabilities', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 3000,'CA-ENG-BASE','CAPITAL',        'XXXXXX',   '3',   '0', 'Equity', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 4000,'CA-ENG-BASE','INCOME',        'XXXXXX',   '4',   '0', 'Revenue', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 5000,'CA-ENG-BASE','COGS',           'XXXXXX',   '5',   '0', 'Cost of Goods Sold', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 6000,'CA-ENG-BASE','EXPENSE',       'XXXXXX',   '6',   '0', 'Expenses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1000,'CA-ENG-BASE','ASSETS',   '1',   '0', 'Assets', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 2000,'CA-ENG-BASE','LIABILITIES',   '2',   '0', 'Liabilities', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 3000,'CA-ENG-BASE','CAPITAL',   '3',   '0', 'Equity', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4000,'CA-ENG-BASE','INCOME',   '4',   '0', 'Revenue', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 5000,'CA-ENG-BASE','COGS',   '5',   '0', 'Cost of Goods Sold', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 6000,'CA-ENG-BASE','EXPENSE',   '6',   '0', 'Expenses', 1);
 
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1010, 'CA-ENG-BASE', 'ASSETS', 'CASH', '1010', '1000', 'Cash', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1011, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1030', '1000', 'Investments and Securities', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1012, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1100', '1000', 'Accounts Receivable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1013, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1120', '1000', 'Other Receivables', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1014, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1140', '1000', 'Allowance for Doubtful Accounts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1015, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1160', '1000', 'Customers Account Receivable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1016, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1200', '1000', 'Raw Materials Inventory', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1017, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1220', '1000', 'Supplies Inventory', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1018, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1240', '1000', 'Work in Progress Inventory', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1019, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1260', '1000', 'Finished Goods Inventory', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1020, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1300', '1000', 'Prepaid Expenses', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1021, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1350', '1000', 'Employee Advances', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1022, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1400', '1000', 'Notes Receivable - Current', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1023, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1430', '1000', 'Prepaid Interest', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1024, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1450', '1000', 'Other Current Assets', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1025, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1500', '1000', 'Furniture and Fixtures', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1026, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1520', '1000', 'Equipment', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1027, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1540', '1000', 'Vehicles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1028, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1560', '1000', 'Other Depreciable Property', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1029, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1580', '1000', 'Buildings', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1030, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1600', '1000', 'Building Improvements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1031, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1620', '1000', 'Land', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1032, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1640', '1000', 'Accumulated Depreciation, Furniture and Fixtures', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1033, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1660', '1000', 'Accumulated Depreciation, Equipment', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1034, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1680', '1000', 'Accumulated Depreciation, Vehicles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1035, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1700', '1000', 'Accumulated Depreciation, Buildings', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1036, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1720', '1000', 'Accumulated Depreciation, Building Improvements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1037, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1740', '1000', 'Accumulated Depreciation, Other', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1038, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1760', '1000', 'Goods and Services Tax (GST) Receivable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1039, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1800', '1000', 'Harmonized Sales Tax (HST) Receivable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1040, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1820', '1000', 'Provincial Sales Tax (PST) Receivable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1041, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1840', '1000', 'Québec Sales Tax (QST) Receivable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1042, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1860', '1000', 'Deposits', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1043, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1880', '1000', 'Accumulated Amortization', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1044, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1900', '1000', 'Notes Receivable - Non-current', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1045, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1940', '1000', 'Other Non-current Assets', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1046, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2100', '2000', 'Accounts Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1047, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2200', '2000', 'Accrued Expenses', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1048, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2300', '2000', 'Current Financial Debts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1049, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2320', '2000', 'Employment Insurance Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1050, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2321', '2000', 'Employment insurance (EI) Employees Contribution', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1051, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2322', '2000', 'Employment insurance (EI) Employer Contribution', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1052, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2340', '2000', 'Federal Income Tax', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1053, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2350', '2000', 'Annuities Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1054, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2351', '2000', 'Annuities - Employee Contribution', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1055, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2352', '2000', 'Annuities - Employer Contribution', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1056, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2360', '2000', 'Health Services Fund Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1057, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2370', '2000', 'Labour Health and Safety Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1058, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2380', '2000', 'Labour Standards to Pay', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1059, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2390', '2000', 'Parental Insurance Plan Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1060, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2391', '2000', 'Parental Insurance Plan Payable - Employee Contribution', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1061, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2392', '2000', 'Parental Insurance Plan Payable - Employer Contribution', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1062, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2400', '2000', 'Provincial Income Tax', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1063, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2410', '2000', 'Other Accounts Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1064, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2420', '2000', 'Goods and Services Tax (GST) Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1065, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2430', '2000', 'Harmonized Sales Tax (HST) Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1066, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2440', '2000', 'Provincial Sales Tax (PST) Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1067, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2450', '2000', 'Québec Sales Tax (QST) Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1068, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2460', '2000', 'Other Taxes Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1069, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2470', '2000', 'Employee Benefits Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1070, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2480', '2000', 'Deposits from Customers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1071, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2490', '2000', 'Other Current Liabilities', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1072, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2500', '2000', 'Notes Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1073, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2600', '2000', 'Land Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1074, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2630', '2000', 'Equipment Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1075, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2660', '2000', 'Vehicles Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1076, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2700', '2000', 'Bank Loans Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1077, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2730', '2000', 'Non-current Financial Debts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1078, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2760', '2000', 'Other Non-current Liabilities', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1079, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2800', '2000', 'Deferred Revenue', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1080, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2900', '2000', 'Deferred Fees', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1081, 'CA-ENG-BASE', 'CAPITAL', 'XXXXXX', '3100', '3000', 'Common Shares', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1082, 'CA-ENG-BASE', 'CAPITAL', 'XXXXXX', '3200', '3000', 'Preferred Shares (Voting)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1083, 'CA-ENG-BASE', 'CAPITAL', 'XXXXXX', '3300', '3000', 'Preferred Shares (Non-voting)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1084, 'CA-ENG-BASE', 'CAPITAL', 'XXXXXX', '3400', '3000', 'Contributed Surplus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1085, 'CA-ENG-BASE', 'CAPITAL', 'XXXXXX', '3500', '3000', 'Retained Earnings', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1086, 'CA-ENG-BASE', 'CAPITAL', 'XXXXXX', '3600', '3000', 'Dividends', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1087, 'CA-ENG-BASE', 'INCOME', 'XXXXXX', '4100', '4000', 'Harmonized Provinces Sales', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1088, 'CA-ENG-BASE', 'INCOME', 'XXXXXX', '4200', '4000', 'Non-Harmonized Provinces Sales', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1089, 'CA-ENG-BASE', 'INCOME', 'XXXXXX', '4300', '4000', 'Inside Sales', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1090, 'CA-ENG-BASE', 'INCOME', 'XXXXXX', '4400', '4000', 'International Sales', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1091, 'CA-ENG-BASE', 'INCOME', 'XXXXXX', '4500', '4000', 'Reimbursible Expenses', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1092, 'CA-ENG-BASE', 'INCOME', 'XXXXXX', '4600', '4000', 'Shipping Charges Reimbursed', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1093, 'CA-ENG-BASE', 'INCOME', 'XXXXXX', '4700', '4000', 'Other Operating Revenues', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1094, 'CA-ENG-BASE', 'INCOME', 'XXXXXX', '4800', '4000', 'Interests', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1095, 'CA-ENG-BASE', 'INCOME', 'XXXXXX', '4900', '4000', 'Other Non-operating Revenues', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1096, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5010', '5000', 'Inside Purchases', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1097, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5050', '5000', 'International Purchases', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1098, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5100', '5000', 'Purchases in Harmonized Provinces', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1099, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5150', '5000', 'Purchases in Non-harmonized Provinces', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1100, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5200', '5000', 'Direct Labor Costs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1101, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5250', '5000', 'Indirect Labor Costs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1102, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5270', '5000', 'Heat and Power', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1103, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5300', '5000', 'Commissions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1104, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5350', '5000', 'Miscellaneous Factory Costs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1105, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5400', '5000', 'Cost of Goods Sold, Salaries and Wages', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1106, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5450', '5000', 'Cost of Goods Sold, Contract Labor', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1107, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5500', '5000', 'Cost of Goods Sold, Freight', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1108, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5550', '5000', 'Cost of Goods Sold, Other', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1109, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5600', '5000', 'Inventory Adjustments', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1110, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5700', '5000', 'Purchase Returns and Allowances', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1111, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6010', '6000', 'Federal Income Tax', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1112, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6020', '6000', 'Health Services Fund', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1113, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6030', '6000', 'Holidays', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1114, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6040', '6000', 'Labour Health and Safety', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1115, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6050', '6000', 'Labour Standards', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1116, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6060', '6000', 'Parental Insurance', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1117, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6080', '6000', 'Provincial Income Tax', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1118, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6100', '6000', 'Salaries, wages', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1119, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6130', '6000', 'Employee Benefit Expense, Pension Plans', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1120, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6160', '6000', 'Employee Benefit Expense, Profit Sharing Plan', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1121, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6180', '6000', 'Employee Benefit Expense, Other', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1122, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6200', '6000', 'Commissions and Fees Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1123, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6230', '6000', 'Annuities', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1124, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6250', '6000', 'Employment Insurance', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1125, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6280', '6000', 'Insurance Expense, Product Liability', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1126, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6300', '6000', 'Insurance Expense, Vehicle', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1127, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6340', '6000', 'Payroll Tax Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1128, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6360', '6000', 'Penalties and Fines Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1129, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6380', '6000', 'Other Taxes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1130, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6400', '6000', 'Advertising Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1131, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6420', '6000', 'Amortization Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1132, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6460', '6000', 'Auto Expenses', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1133, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6480', '6000', 'Legal and Professional Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1134, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6500', '6000', 'Licenses Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1135, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6520', '6000', 'Maintenance Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1136, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6540', '6000', 'Repair and Maintenance Expense, Office', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1137, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6560', '6000', 'Repair and Maintenance Expense, Vehicle', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1138, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6580', '6000', 'Office Supplies Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1139, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6600', '6000', 'Telephone Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1140, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6610', '6000', 'Training Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1141, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6630', '6000', 'Travel Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1142, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6650', '6000', 'Utilities Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1143, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6670', '6000', 'Postage Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1144, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6690', '6000', 'Freight Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1145, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6700', '6000', 'Rent or Lease Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1146, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6720', '6000', 'Meals and Entertainment Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1147, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6730', '6000', 'Gain/Loss on Sale of Assets', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1148, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6740', '6000', 'Depreciation Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1149, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6750', '6000', 'Bad Debt Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1150, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6760', '6000', 'Bank Fees', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1151, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6790', '6000', 'Loss on Non-sufficient Funds Checks', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1152, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6800', '6000', 'Gifts Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1153, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6820', '6000', 'Charitable Contributions Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1154, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6840', '6000', 'Other Operating Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1155, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6860', '6000', 'Interests Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1156, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6900', '6000', 'Other Non-operating Expense', 1);
\ No newline at end of file
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1010, 'CA-ENG-BASE', 'ASSETS', '1010', '1000', 'Cash', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1011, 'CA-ENG-BASE', 'ASSETS', '1030', '1000', 'Investments and Securities', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1012, 'CA-ENG-BASE', 'ASSETS', '1100', '1000', 'Accounts Receivable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1013, 'CA-ENG-BASE', 'ASSETS', '1120', '1000', 'Other Receivables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1014, 'CA-ENG-BASE', 'ASSETS', '1140', '1000', 'Allowance for Doubtful Accounts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1015, 'CA-ENG-BASE', 'ASSETS', '1160', '1000', 'Customers Account Receivable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1016, 'CA-ENG-BASE', 'ASSETS', '1200', '1000', 'Raw Materials Inventory', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1017, 'CA-ENG-BASE', 'ASSETS', '1220', '1000', 'Supplies Inventory', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1018, 'CA-ENG-BASE', 'ASSETS', '1240', '1000', 'Work in Progress Inventory', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1019, 'CA-ENG-BASE', 'ASSETS', '1260', '1000', 'Finished Goods Inventory', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1020, 'CA-ENG-BASE', 'ASSETS', '1300', '1000', 'Prepaid Expenses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1021, 'CA-ENG-BASE', 'ASSETS', '1350', '1000', 'Employee Advances', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1022, 'CA-ENG-BASE', 'ASSETS', '1400', '1000', 'Notes Receivable - Current', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1023, 'CA-ENG-BASE', 'ASSETS', '1430', '1000', 'Prepaid Interest', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1024, 'CA-ENG-BASE', 'ASSETS', '1450', '1000', 'Other Current Assets', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1025, 'CA-ENG-BASE', 'ASSETS', '1500', '1000', 'Furniture and Fixtures', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1026, 'CA-ENG-BASE', 'ASSETS', '1520', '1000', 'Equipment', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1027, 'CA-ENG-BASE', 'ASSETS', '1540', '1000', 'Vehicles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1028, 'CA-ENG-BASE', 'ASSETS', '1560', '1000', 'Other Depreciable Property', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1029, 'CA-ENG-BASE', 'ASSETS', '1580', '1000', 'Buildings', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1030, 'CA-ENG-BASE', 'ASSETS', '1600', '1000', 'Building Improvements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1031, 'CA-ENG-BASE', 'ASSETS', '1620', '1000', 'Land', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1032, 'CA-ENG-BASE', 'ASSETS', '1640', '1000', 'Accumulated Depreciation, Furniture and Fixtures', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1033, 'CA-ENG-BASE', 'ASSETS', '1660', '1000', 'Accumulated Depreciation, Equipment', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1034, 'CA-ENG-BASE', 'ASSETS', '1680', '1000', 'Accumulated Depreciation, Vehicles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1035, 'CA-ENG-BASE', 'ASSETS', '1700', '1000', 'Accumulated Depreciation, Buildings', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1036, 'CA-ENG-BASE', 'ASSETS', '1720', '1000', 'Accumulated Depreciation, Building Improvements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1037, 'CA-ENG-BASE', 'ASSETS', '1740', '1000', 'Accumulated Depreciation, Other', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1038, 'CA-ENG-BASE', 'ASSETS', '1760', '1000', 'Goods and Services Tax (GST) Receivable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1039, 'CA-ENG-BASE', 'ASSETS', '1800', '1000', 'Harmonized Sales Tax (HST) Receivable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1040, 'CA-ENG-BASE', 'ASSETS', '1820', '1000', 'Provincial Sales Tax (PST) Receivable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1041, 'CA-ENG-BASE', 'ASSETS', '1840', '1000', 'Québec Sales Tax (QST) Receivable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1042, 'CA-ENG-BASE', 'ASSETS', '1860', '1000', 'Deposits', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1043, 'CA-ENG-BASE', 'ASSETS', '1880', '1000', 'Accumulated Amortization', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1044, 'CA-ENG-BASE', 'ASSETS', '1900', '1000', 'Notes Receivable - Non-current', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1045, 'CA-ENG-BASE', 'ASSETS', '1940', '1000', 'Other Non-current Assets', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1046, 'CA-ENG-BASE', 'LIABILITIES', '2100', '2000', 'Accounts Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1047, 'CA-ENG-BASE', 'LIABILITIES', '2200', '2000', 'Accrued Expenses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1048, 'CA-ENG-BASE', 'LIABILITIES', '2300', '2000', 'Current Financial Debts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1049, 'CA-ENG-BASE', 'LIABILITIES', '2320', '2000', 'Employment Insurance Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1050, 'CA-ENG-BASE', 'LIABILITIES', '2321', '2000', 'Employment insurance (EI) Employees Contribution', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1051, 'CA-ENG-BASE', 'LIABILITIES', '2322', '2000', 'Employment insurance (EI) Employer Contribution', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1052, 'CA-ENG-BASE', 'LIABILITIES', '2340', '2000', 'Federal Income Tax', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1053, 'CA-ENG-BASE', 'LIABILITIES', '2350', '2000', 'Annuities Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1054, 'CA-ENG-BASE', 'LIABILITIES', '2351', '2000', 'Annuities - Employee Contribution', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1055, 'CA-ENG-BASE', 'LIABILITIES', '2352', '2000', 'Annuities - Employer Contribution', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1056, 'CA-ENG-BASE', 'LIABILITIES', '2360', '2000', 'Health Services Fund Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1057, 'CA-ENG-BASE', 'LIABILITIES', '2370', '2000', 'Labour Health and Safety Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1058, 'CA-ENG-BASE', 'LIABILITIES', '2380', '2000', 'Labour Standards to Pay', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1059, 'CA-ENG-BASE', 'LIABILITIES', '2390', '2000', 'Parental Insurance Plan Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1060, 'CA-ENG-BASE', 'LIABILITIES', '2391', '2000', 'Parental Insurance Plan Payable - Employee Contribution', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1061, 'CA-ENG-BASE', 'LIABILITIES', '2392', '2000', 'Parental Insurance Plan Payable - Employer Contribution', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1062, 'CA-ENG-BASE', 'LIABILITIES', '2400', '2000', 'Provincial Income Tax', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1063, 'CA-ENG-BASE', 'LIABILITIES', '2410', '2000', 'Other Accounts Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1064, 'CA-ENG-BASE', 'LIABILITIES', '2420', '2000', 'Goods and Services Tax (GST) Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1065, 'CA-ENG-BASE', 'LIABILITIES', '2430', '2000', 'Harmonized Sales Tax (HST) Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1066, 'CA-ENG-BASE', 'LIABILITIES', '2440', '2000', 'Provincial Sales Tax (PST) Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1067, 'CA-ENG-BASE', 'LIABILITIES', '2450', '2000', 'Québec Sales Tax (QST) Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1068, 'CA-ENG-BASE', 'LIABILITIES', '2460', '2000', 'Other Taxes Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1069, 'CA-ENG-BASE', 'LIABILITIES', '2470', '2000', 'Employee Benefits Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1070, 'CA-ENG-BASE', 'LIABILITIES', '2480', '2000', 'Deposits from Customers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1071, 'CA-ENG-BASE', 'LIABILITIES', '2490', '2000', 'Other Current Liabilities', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1072, 'CA-ENG-BASE', 'LIABILITIES', '2500', '2000', 'Notes Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1073, 'CA-ENG-BASE', 'LIABILITIES', '2600', '2000', 'Land Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1074, 'CA-ENG-BASE', 'LIABILITIES', '2630', '2000', 'Equipment Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1075, 'CA-ENG-BASE', 'LIABILITIES', '2660', '2000', 'Vehicles Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1076, 'CA-ENG-BASE', 'LIABILITIES', '2700', '2000', 'Bank Loans Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1077, 'CA-ENG-BASE', 'LIABILITIES', '2730', '2000', 'Non-current Financial Debts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1078, 'CA-ENG-BASE', 'LIABILITIES', '2760', '2000', 'Other Non-current Liabilities', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1079, 'CA-ENG-BASE', 'LIABILITIES', '2800', '2000', 'Deferred Revenue', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1080, 'CA-ENG-BASE', 'LIABILITIES', '2900', '2000', 'Deferred Fees', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1081, 'CA-ENG-BASE', 'CAPITAL', '3100', '3000', 'Common Shares', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1082, 'CA-ENG-BASE', 'CAPITAL', '3200', '3000', 'Preferred Shares (Voting)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1083, 'CA-ENG-BASE', 'CAPITAL', '3300', '3000', 'Preferred Shares (Non-voting)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1084, 'CA-ENG-BASE', 'CAPITAL', '3400', '3000', 'Contributed Surplus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1085, 'CA-ENG-BASE', 'CAPITAL', '3500', '3000', 'Retained Earnings', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1086, 'CA-ENG-BASE', 'CAPITAL', '3600', '3000', 'Dividends', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1087, 'CA-ENG-BASE', 'INCOME', '4100', '4000', 'Harmonized Provinces Sales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1088, 'CA-ENG-BASE', 'INCOME', '4200', '4000', 'Non-Harmonized Provinces Sales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1089, 'CA-ENG-BASE', 'INCOME', '4300', '4000', 'Inside Sales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1090, 'CA-ENG-BASE', 'INCOME', '4400', '4000', 'International Sales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1091, 'CA-ENG-BASE', 'INCOME', '4500', '4000', 'Reimbursible Expenses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1092, 'CA-ENG-BASE', 'INCOME', '4600', '4000', 'Shipping Charges Reimbursed', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1093, 'CA-ENG-BASE', 'INCOME', '4700', '4000', 'Other Operating Revenues', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1094, 'CA-ENG-BASE', 'INCOME', '4800', '4000', 'Interests', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1095, 'CA-ENG-BASE', 'INCOME', '4900', '4000', 'Other Non-operating Revenues', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1096, 'CA-ENG-BASE', 'COGS', '5010', '5000', 'Inside Purchases', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1097, 'CA-ENG-BASE', 'COGS', '5050', '5000', 'International Purchases', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1098, 'CA-ENG-BASE', 'COGS', '5100', '5000', 'Purchases in Harmonized Provinces', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1099, 'CA-ENG-BASE', 'COGS', '5150', '5000', 'Purchases in Non-harmonized Provinces', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1100, 'CA-ENG-BASE', 'COGS', '5200', '5000', 'Direct Labor Costs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1101, 'CA-ENG-BASE', 'COGS', '5250', '5000', 'Indirect Labor Costs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1102, 'CA-ENG-BASE', 'COGS', '5270', '5000', 'Heat and Power', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1103, 'CA-ENG-BASE', 'COGS', '5300', '5000', 'Commissions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1104, 'CA-ENG-BASE', 'COGS', '5350', '5000', 'Miscellaneous Factory Costs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1105, 'CA-ENG-BASE', 'COGS', '5400', '5000', 'Cost of Goods Sold, Salaries and Wages', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1106, 'CA-ENG-BASE', 'COGS', '5450', '5000', 'Cost of Goods Sold, Contract Labor', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1107, 'CA-ENG-BASE', 'COGS', '5500', '5000', 'Cost of Goods Sold, Freight', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1108, 'CA-ENG-BASE', 'COGS', '5550', '5000', 'Cost of Goods Sold, Other', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1109, 'CA-ENG-BASE', 'COGS', '5600', '5000', 'Inventory Adjustments', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1110, 'CA-ENG-BASE', 'COGS', '5700', '5000', 'Purchase Returns and Allowances', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1111, 'CA-ENG-BASE', 'EXPENSE', '6010', '6000', 'Federal Income Tax', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1112, 'CA-ENG-BASE', 'EXPENSE', '6020', '6000', 'Health Services Fund', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1113, 'CA-ENG-BASE', 'EXPENSE', '6030', '6000', 'Holidays', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1114, 'CA-ENG-BASE', 'EXPENSE', '6040', '6000', 'Labour Health and Safety', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1115, 'CA-ENG-BASE', 'EXPENSE', '6050', '6000', 'Labour Standards', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1116, 'CA-ENG-BASE', 'EXPENSE', '6060', '6000', 'Parental Insurance', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1117, 'CA-ENG-BASE', 'EXPENSE', '6080', '6000', 'Provincial Income Tax', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1118, 'CA-ENG-BASE', 'EXPENSE', '6100', '6000', 'Salaries, wages', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1119, 'CA-ENG-BASE', 'EXPENSE', '6130', '6000', 'Employee Benefit Expense, Pension Plans', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1120, 'CA-ENG-BASE', 'EXPENSE', '6160', '6000', 'Employee Benefit Expense, Profit Sharing Plan', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1121, 'CA-ENG-BASE', 'EXPENSE', '6180', '6000', 'Employee Benefit Expense, Other', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1122, 'CA-ENG-BASE', 'EXPENSE', '6200', '6000', 'Commissions and Fees Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1123, 'CA-ENG-BASE', 'EXPENSE', '6230', '6000', 'Annuities', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1124, 'CA-ENG-BASE', 'EXPENSE', '6250', '6000', 'Employment Insurance', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1125, 'CA-ENG-BASE', 'EXPENSE', '6280', '6000', 'Insurance Expense, Product Liability', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1126, 'CA-ENG-BASE', 'EXPENSE', '6300', '6000', 'Insurance Expense, Vehicle', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1127, 'CA-ENG-BASE', 'EXPENSE', '6340', '6000', 'Payroll Tax Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1128, 'CA-ENG-BASE', 'EXPENSE', '6360', '6000', 'Penalties and Fines Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1129, 'CA-ENG-BASE', 'EXPENSE', '6380', '6000', 'Other Taxes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1130, 'CA-ENG-BASE', 'EXPENSE', '6400', '6000', 'Advertising Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1131, 'CA-ENG-BASE', 'EXPENSE', '6420', '6000', 'Amortization Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1132, 'CA-ENG-BASE', 'EXPENSE', '6460', '6000', 'Auto Expenses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1133, 'CA-ENG-BASE', 'EXPENSE', '6480', '6000', 'Legal and Professional Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1134, 'CA-ENG-BASE', 'EXPENSE', '6500', '6000', 'Licenses Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1135, 'CA-ENG-BASE', 'EXPENSE', '6520', '6000', 'Maintenance Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1136, 'CA-ENG-BASE', 'EXPENSE', '6540', '6000', 'Repair and Maintenance Expense, Office', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1137, 'CA-ENG-BASE', 'EXPENSE', '6560', '6000', 'Repair and Maintenance Expense, Vehicle', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1138, 'CA-ENG-BASE', 'EXPENSE', '6580', '6000', 'Office Supplies Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1139, 'CA-ENG-BASE', 'EXPENSE', '6600', '6000', 'Telephone Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1140, 'CA-ENG-BASE', 'EXPENSE', '6610', '6000', 'Training Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1141, 'CA-ENG-BASE', 'EXPENSE', '6630', '6000', 'Travel Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1142, 'CA-ENG-BASE', 'EXPENSE', '6650', '6000', 'Utilities Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1143, 'CA-ENG-BASE', 'EXPENSE', '6670', '6000', 'Postage Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1144, 'CA-ENG-BASE', 'EXPENSE', '6690', '6000', 'Freight Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1145, 'CA-ENG-BASE', 'EXPENSE', '6700', '6000', 'Rent or Lease Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1146, 'CA-ENG-BASE', 'EXPENSE', '6720', '6000', 'Meals and Entertainment Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1147, 'CA-ENG-BASE', 'EXPENSE', '6730', '6000', 'Gain/Loss on Sale of Assets', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1148, 'CA-ENG-BASE', 'EXPENSE', '6740', '6000', 'Depreciation Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1149, 'CA-ENG-BASE', 'EXPENSE', '6750', '6000', 'Bad Debt Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1150, 'CA-ENG-BASE', 'EXPENSE', '6760', '6000', 'Bank Fees', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1151, 'CA-ENG-BASE', 'EXPENSE', '6790', '6000', 'Loss on Non-sufficient Funds Checks', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1152, 'CA-ENG-BASE', 'EXPENSE', '6800', '6000', 'Gifts Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1153, 'CA-ENG-BASE', 'EXPENSE', '6820', '6000', 'Charitable Contributions Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1154, 'CA-ENG-BASE', 'EXPENSE', '6840', '6000', 'Other Operating Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1155, 'CA-ENG-BASE', 'EXPENSE', '6860', '6000', 'Interests Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1156, 'CA-ENG-BASE', 'EXPENSE', '6900', '6000', 'Other Non-operating Expense', 1);
diff --git a/htdocs/install/mysql/data/llx_accounting_account_fr.sql b/htdocs/install/mysql/data/llx_accounting_account_fr.sql
index 34e8882609d..d49e509a5be 100644
--- a/htdocs/install/mysql/data/llx_accounting_account_fr.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_fr.sql
@@ -468,7 +468,7 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  413,'PCG99-BASE','INCOME',    '754', '409', 'Ristournes perçues des coopératives (provenant des excédents)', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  414,'PCG99-BASE','INCOME',    '755', '409', 'Quotes-parts de résultat sur opérations faites en commun', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  415,'PCG99-BASE','INCOME',    '758', '409', 'Produits divers de gestion courante', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  416,'PCG99-BASE','INCOME',     'FIN',   '76','1507', 'Produits financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  416,'PCG99-BASE','INCOME',     '76','1507', 'Produits financiers', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  417,'PCG99-BASE','INCOME',    '761', '416', 'Produits de participations', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  418,'PCG99-BASE','INCOME',    '762', '416', 'Produits des autres immobilisations financières', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  419,'PCG99-BASE','INCOME',    '763', '416', 'Revenus des autres créances', 1);
@@ -476,7 +476,7 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  421,'PCG99-BASE','INCOME',    '765', '416', 'Escomptes obtenus', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  422,'PCG99-BASE','INCOME',    '766', '416', 'Gains de change', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  423,'PCG99-BASE','INCOME',    '767', '416', 'Produits nets sur cessions de valeurs mobilières de placement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  424,'PCG99-BASE','INCOME',     'FIN',  '768', '416', 'Autres produits financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  424,'PCG99-BASE','INCOME',    '768', '416', 'Autres produits financiers', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  425,'PCG99-BASE','INCOME',     '77','1507', 'Produits exceptionnels', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  426,'PCG99-BASE','INCOME',    '771', '425', 'Produits exceptionnels sur opérations de gestion', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  427,'PCG99-BASE','INCOME',    '772', '425', '(Compte à la disposition des entités pour enregistrer, en cours d''exercice, les produits sur exercices antérieurs)', 1);
diff --git a/htdocs/install/mysql/data/llx_c_currencies.sql b/htdocs/install/mysql/data/llx_c_currencies.sql
index caa76d491cd..d05015721c8 100644
--- a/htdocs/install/mysql/data/llx_c_currencies.sql
+++ b/htdocs/install/mysql/data/llx_c_currencies.sql
@@ -1,11 +1,12 @@
--- Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
--- Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
--- Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
--- Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
--- Copyright (C) 2004      Guillaume Delecourt  <guillaume.delecourt@opensides.be>
--- Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
--- Copyright (C) 2007 	   Patrick Raguin       <patrick.raguin@gmail.com>
--- Copyright (C) 2011 	   Juanjo Menent        <jmenent@2byte.es>
+-- Copyright (C) 2001-2004  Rodolphe Quiedeville  <rodolphe@quiedeville.org>
+-- Copyright (C) 2003       Jean-Louis Bergamo    <jlb@j1b.org>
+-- Copyright (C) 2004-2012  Laurent Destailleur   <eldy@users.sourceforge.net>
+-- Copyright (C) 2004       Benoit Mortier        <benoit.mortier@opensides.be>
+-- Copyright (C) 2004       Guillaume Delecourt   <guillaume.delecourt@opensides.be>
+-- Copyright (C) 2005-2012  Regis Houssin         <regis.houssin@inodbox.com>
+-- Copyright (C) 2007 	    Patrick Raguin        <patrick.raguin@gmail.com>
+-- Copyright (C) 2011 	    Juanjo Menent         <jmenent@2byte.es>
+-- Copyright (C) 2020 	    Udo Tamm              <dev@dolibit.de>
 --
 -- 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
@@ -20,8 +21,11 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <https://www.gnu.org/licenses/>.
 --
---
+-----------------------------------------------------------------------------
 
+--
+-- Do not place a comment at the end of the line, this file is parsed when
+-- of the install and all the acronyms '--' are removed.
 --
 -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
 -- de l'install et tous les sigles '--' sont supprimés.
@@ -31,149 +35,153 @@
 -- Currencies (primary code - code ISO4217 - libelle us)
 --
 
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ALL', '[76,101,107]', 1,		'Albania Lek');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'DZD', NULL, 1,					'Algeria Dinar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'AFN', '[1547]', 1,				'Afghanistan Afghani');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ARS', '[36]', 1,				'Argentino Peso');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'AWG', '[402]', 1,				'Aruba Guilder');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'AUD', '[36]', 1,				'Australia Dollar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'AZN', '[1084,1072,1085]', 1,	'Azerbaijan New Manat');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BHD', NULL, 1,					'Bahrain');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BSD', '[36]', 1,				'Bahamas Dollar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BBD', '[36]', 1,				'Barbados Dollar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ALL', '[76,101,107]', 1,	  'Albania Lek');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'DZD', NULL, 1,              'Algeria Dinar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'AOA', NULL, 1,					    'Angola Kwanza');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'AFN', '[1547]', 1,				  'Afghanistan Afghani');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ARS', '[36]', 1,            'Argentino Peso');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'AWG', '[402]', 1,				    'Aruba Guilder');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'AUD', '[36]', 1,				    'Australia Dollar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'AZN', '[1084,1072,1085]', 1, 'Azerbaijan New Manat');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BHD', NULL, 1,              'Bahrain');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BSD', '[36]', 1,				    'Bahamas Dollar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BBD', '[36]', 1,				    'Barbados Dollar');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BDT', '[2547]', 1,			    'Bangladeshi Taka');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BYR', '[112,46]', 1,			'Belarus Ruble');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BYR', '[112,46]', 1,			  'Belarus Ruble');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BZD', '[66,90,36]', 1,			'Belize Dollar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BMD', '[36]', 1,				'Bermuda Dollar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BOB', '[36,98]', 1,				'Bolivia Boliviano');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BAM', '[75,77]', 1,				'Bosnia and Herzegovina Convertible Marka');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BWP', '[80]', 1,				'Botswana Pula');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BMD', '[36]', 1,				    'Bermuda Dollar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BOB', '[36,98]', 1,				  'Bolivia Boliviano');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BAM', '[75,77]', 1,			  	'Bosnia and Herzegovina Convertible Marka');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BWP', '[80]', 1,				    'Botswana Pula');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BGN', '[1083,1074]', 1,			'Bulgaria Lev');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BRL', '[82,36]', 1,				'Brazil Real');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BND', '[36]', 1,				'Brunei Darussalam Dollar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'KHR', '[6107]', 1,				'Cambodia Riel');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'CAD', '[36]', 1,				'Canada Dollar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'KYD', '[36]', 1,				'Cayman Islands Dollar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'CLP', '[36]', 1,				'Chile Peso');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'CNY', '[165]', 1,				'China Yuan Renminbi'); 
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'COP', '[36]', 1,				'Colombia Peso');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'CRC', '[8353]', 1,				'Costa Rica Colon');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'HRK', '[107,110]', 1,			'Croatia Kuna');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'CUP', '[8369]', 1,				'Cuba Peso');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'CZK', '[75,269]', 1,			'Czech Republic Koruna');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'DKK', '[107,114]', 1,			'Denmark Krone');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BRL', '[82,36]', 1,				  'Brazil Real');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BND', '[36]', 1,				    'Brunei Darussalam Dollar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'KHR', '[6107]', 1,			  	'Cambodia Riel');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'CAD', '[36]', 1,				    'Canada Dollar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'CVE', '[4217]', 1,          'Cap Verde Escudo');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'KYD', '[36]', 1,	    			'Cayman Islands Dollar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'CLP', '[36]', 1,			    	'Chile Peso');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'CNY', '[165]', 1,			    	'China Yuan Renminbi'); 
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'COP', '[36]', 1,	    			'Colombia Peso');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'CRC', '[8353]', 1,		  		'Costa Rica Colon');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'HRK', '[107,110]', 1,		  	'Croatia Kuna');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'CUP', '[8369]', 1,		  		'Cuba Peso');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'CZK', '[75,269]', 1,		  	'Czech Republic Koruna');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'DKK', '[107,114]', 1,	  		'Denmark Krone');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'DOP', '[82,68,36]', 1,			'Dominican Republic Peso');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'XCD', '[36]', 1,				'East Caribbean Dollar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'EGP', '[163]', 1,				'Egypt Pound');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'SVC', '[36]', 1,				'El Salvador Colon');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'EEK', '[107,114]', 1,			'Estonia Kroon');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'EUR', '[8364]', 1,				'Euro Member Countries'); 
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'FKP', '[163]', 1,				'Falkland Islands (Malvinas) Pound');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'FJD', '[36]', 1,				'Fiji Dollar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'GHC', '[162]', 1,				'Ghana Cedis');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'GNF', '[70,71]', 1,				'Franc Guinéen');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'GIP', '[163]', 1,				'Gibraltar Pound');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'GTQ', '[81]', 1,				'Guatemala Quetzal');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'GGP', '[163]', 1,				'Guernsey Pound');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'GYD', '[36]', 1,				'Guyana Dollar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'HNL', '[76]', 1,				'Honduras Lempira');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'HKD', '[36]', 1,				'Hong Kong Dollar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'HUF', '[70,116]', 1,			'Hungary Forint');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ISK', '[107,114]', 1,			'Iceland Krona');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'INR', '[8377]', 1,				'India Rupee'); 
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'IDR', '[82,112]', 1,			'Indonesia Rupiah');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'IRR', '[65020]', 1,				'Iran Rial');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'IMP', '[163]', 1,				'Isle of Man Pound');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ILS', '[8362]', 1,				'Israel Shekel');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'JMD', '[74,36]', 1,				'Jamaica Dollar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'JPY', '[165]', 1,				'Japan Yen');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'JEP', '[163]', 1,				'Jersey Pound');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'KES', NULL, 1,				'Kenya Shilling');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'XCD', '[36]', 1,		    		'East Caribbean Dollar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'EGP', '[163]', 1,	    			'Egypt Pound');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'SVC', '[36]', 1,			    	'El Salvador Colon');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'EEK', '[107,114]', 1,	  		'Estonia Kroon');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'EUR', '[8364]', 1,		  		'Euro Member Countries'); 
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'FKP', '[163]', 1,	    			'Falkland Islands (Malvinas) Pound');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'FJD', '[36]', 1,		    		'Fiji Dollar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'GHC', '[162]', 1,		    		'Ghana Cedis');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'GNF', '[70,71]', 1,			  	'Guinea Franc');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'GIP', '[163]', 1,			      'Gibraltar Pound');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'GTQ', '[81]', 1,			    	'Guatemala Quetzal');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'GGP', '[163]', 1,		    		'Guernsey Pound');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'GYD', '[36]', 1,			    	'Guyana Dollar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'HNL', '[76]', 1,	    			'Honduras Lempira');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'HKD', '[36]', 1,			    	'Hong Kong Dollar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'HUF', '[70,116]', 1,		  	'Hungary Forint');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ISK', '[107,114]', 1,	  		'Iceland Krona');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'INR', '[8377]', 1,			  	'India Rupee'); 
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'IDR', '[82,112]', 1,		  	'Indonesia Rupiah');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'IRR', '[65020]', 1,			  	'Iran Rial');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'IMP', '[163]', 1,			    	'Isle of Man Pound');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ILS', '[8362]', 1,		  		'Israel Shekel');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'JMD', '[74,36]', 1,			  	'Jamaica Dollar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'JPY', '[165]', 1,			    	'Japan Yen');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'JEP', '[163]', 1,		    		'Jersey Pound');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'KES', NULL, 1,			      	'Kenya Shilling');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'KZT', '[1083,1074]', 1,			'Kazakhstan Tenge');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'KPW', '[8361]', 1,				'Korea (North) Won');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'KRW', '[8361]', 1,				'Korea (South) Won');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'KPW', '[8361]', 1,		  		'Korea (North) Won');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'KRW', '[8361]', 1,			  	'Korea (South) Won');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'KGS', '[1083,1074]', 1,			'Kyrgyzstan Som');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'LAK', '[8365]', 1,				'Laos Kip');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'LVL', '[76,115]', 1,			'Latvia Lat');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'LBP', '[163]', 1,				'Lebanon Pound');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'LRD', '[36]', 1,				'Liberia Dollar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'LTL', '[76,116]', 1,			'Lithuania Litas');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'MGA', NULL, 1,					'Ariary');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'LAK', '[8365]', 1,		  		'Laos Kip');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'LVL', '[76,115]', 1,		  	'Latvia Lat');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'LBP', '[163]', 1,			    	'Lebanon Pound');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'LRD', '[36]', 1,			  	  'Liberia Dollar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'LTL', '[76,116]', 1,		  	'Lithuania Litas');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'MGA', NULL, 1,			    		'Ariary');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'MKD', '[1076,1077,1085]', 1,	'Macedonia Denar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'MYR', '[82,77]', 1,				'Malaysia Ringgit');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'MRO', NULL, 1,					'Mauritania Ouguiya');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'MUR', '[8360]', 1,				'Mauritius Rupee');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'MXN', '[36]', 1,				'Mexico Peso');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'MNT', '[8366]', 1,				'Mongolia Tughrik');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'MAD', NULL, 1,					'Morocco Dirham');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'MZN', '[77,84]', 1,				'Mozambique Metical');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'NAD', '[36]', 1,				'Namibia Dollar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'NPR', '[8360]', 1,				'Nepal Rupee');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ANG', '[402]', 1,				'Netherlands Antilles Guilder');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'NZD', '[36]', 1,				'New Zealand Dollar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'NIO', '[67,36]', 1,				'Nicaragua Cordoba');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'NGN', '[8358]', 1,				'Nigeria Naira');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'NOK', '[107,114]', 1,			'Norway Krone');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'OMR', '[65020]', 1,				'Oman Rial');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'PKR', '[8360]', 1,				'Pakistan Rupee');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'MYR', '[82,77]', 1,		  		'Malaysia Ringgit');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'MRO', NULL, 1,			    		'Mauritania Ouguiya');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'MUR', '[8360]', 1,	  			'Mauritius Rupee');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'MXN', '[36]', 1,	    			'Mexico Peso');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'MDL', NULL, 1,	  	        'Moldova Leu');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'MNT', '[8366]', 1,	  			'Mongolia Tughrik');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'MAD', NULL, 1,			    		'Morocco Dirham');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'MZN', '[77,84]', 1,	  			'Mozambique Metical');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'NAD', '[36]', 1,			    	'Namibia Dollar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'NPR', '[8360]', 1,  				'Nepal Rupee');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ANG', '[402]', 1,		    		'Netherlands Antilles Guilder');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'NZD', '[36]', 1,		    		'New Zealand Dollar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'NIO', '[67,36]', 1,			  	'Nicaragua Cordoba');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'NGN', '[8358]', 1,		  		'Nigeria Naira');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'NOK', '[107,114]', 1,		  	'Norway Krone');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'OMR', '[65020]', 1,	  			'Oman Rial');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'PKR', '[8360]', 1,		  		'Pakistan Rupee');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'PAB', '[66,47,46]', 1,			'Panama Balboa');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'PYG', '[71,115]', 1,			'Paraguay Guarani');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'PYG', '[71,115]', 1,		  	'Paraguay Guarani');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'PEN', '[83,47,46]', 1,			'Peru Nuevo Sol');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'PHP', '[8369]', 1,				'Philippines Peso');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'PLN', '[122,322]', 1,			'Poland Zloty');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'QAR', '[65020]', 1,				'Qatar Riyal');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'PHP', '[8369]', 1,			  	'Philippines Peso');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'PLN', '[122,322]', 1,	  		'Poland Zloty');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'QAR', '[65020]', 1,		  		'Qatar Riyal');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'RON', '[108,101,105]', 1,		'Romania New Leu');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'RUB', '[1088,1091,1073]', 1,	'Russia Ruble');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'SHP', '[163]', 1,				'Saint Helena Pound');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'SAR', '[65020]', 1,				'Saudi Arabia Riyal');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'RUB', '[1088,1091,1073]', 1, 'Russia Ruble');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'SHP', '[163]', 1,		    		'Saint Helena Pound');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'SAR', '[65020]', 1,			  	'Saudi Arabia Riyal');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'RSD', '[1044,1080,1085,46]', 1,	'Serbia Dinar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'SCR', '[8360]', 1,				'Seychelles Rupee');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'SGD', '[36]', 1,				'Singapore Dollar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'SBD', '[36]', 1,				'Solomon Islands Dollar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'SOS', '[83]', 1,				'Somalia Shilling');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ZAR', '[82]', 1,				'South Africa Rand');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'LKR', '[8360]', 1,				'Sri Lanka Rupee');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'SEK', '[107,114]', 1,			'Sweden Krona');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'SCR', '[8360]', 1,		  		'Seychelles Rupee');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'SGD', '[36]', 1,		    		'Singapore Dollar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'SBD', '[36]', 1,		    		'Solomon Islands Dollar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'SOS', '[83]', 1,		    		'Somalia Shilling');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ZAR', '[82]', 1,	  	  		'South Africa Rand');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'LKR', '[8360]', 1,		  		'Sri Lanka Rupee');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'SEK', '[107,114]', 1,		  	'Sweden Krona');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'CHF', '[67,72,70]', 1,			'Switzerland Franc');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'SRD', '[36]', 1,				'Suriname Dollar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'SYP', '[163]', 1,				'Syria Pound');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'SRD', '[36]', 1,		    		'Suriname Dollar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'SYP', '[163]', 1,			    	'Syria Pound');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'TWD', '[78,84,36]', 1,			'Taiwan New Dollar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'THB', '[3647]', 1,				'Thailand Baht');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'THB', '[3647]', 1,			  	'Thailand Baht');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'TTD', '[84,84,36]', 1,			'Trinidad and Tobago Dollar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'TND', NULL, 1,					'Tunisia Dinar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'TRL', '[84,76]', 1,				'Turkey Lira');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'TRY', '[8356]', 1,				'Turkey Lira');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'TVD', '[36]', 1,				'Tuvalu Dollar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'UAH', '[8372]', 1,				'Ukraine Hryvna');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'AED', NULL, 1,					'United Arab Emirates Dirham');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'GBP', '[163]', 1,				'United Kingdom Pound');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'USD', '[36]', 1,				'United States Dollar');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'UYU', '[36,85]', 1,				'Uruguay Peso');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'TND', NULL, 1,				    	'Tunisia Dinar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'TRY', '[8356]', 1,		  		'Turkey Lira');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'TVD', '[36]', 1,		    		'Tuvalu Dollar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'UAH', '[8372]', 1,	  			'Ukraine Hryvna');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'AED', NULL, 1,			     		'United Arab Emirates Dirham');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'GBP', '[163]', 1,	  	  		'United Kingdom Pound');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'USD', '[36]', 1,		    		'United States Dollar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'UYU', '[36,85]', 1,		  		'Uruguay Peso');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'UZS', '[1083,1074]', 1,			'Uzbekistan Som');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'VEF', '[66,115]', 1,			'Venezuela Bolivar Fuerte');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'VND', '[8363]', 1,				'Viet Nam Dong');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'XAF', NULL, 1,					'Communaute Financiere Africaine (BEAC) CFA Franc');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'XOF', NULL, 1,					'Communaute Financiere Africaine (BCEAO) Franc');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'XPF', '[70]', 1,                'Franc CFP');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'YER', '[65020]', 1,				'Yemen Rial');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ZWD', '[90,36]', 1,				'Zimbabwe Dollar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'VEF', '[66,115]', 1,		  	'Venezuela Bolivar Fuerte');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'VND', '[8363]', 1,		  		'Viet Nam Dong');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'XAF', NULL, 1,	    				'Communaute Financiere Africaine (BEAC) CFA Franc');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'XOF', NULL, 1,			    		'Communaute Financiere Africaine (BCEAO) Franc');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'XPF', '[70]', 1,            'Franc CFP');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'YER', '[65020]', 1,		  		'Yemen Rial');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ZWD', '[90,36]', 1,			  	'Zimbabwe Dollar');
 
 -- obsolete
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ATS', NULL, 0,	'Shiliing autrichiens');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BEF', NULL, 0,	'Francs belges');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'DEM', NULL, 0,	'Deutsch mark');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ESP', NULL, 0,	'Pesete');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'FIM', NULL, 0,	'Mark finlandais'); 
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'FRF', NULL, 0,	'Francs francais');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'GRD', NULL, 0,	'Drachme (grece)');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'IEP', NULL, 0,	'Livres irlandaises');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ITL', NULL, 0,	'Lires');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'LUF', NULL, 0,	'Francs luxembourgeois');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'NLG', NULL, 0,	'Florins');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'PTE', NULL, 0,	'Escudos');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'SKK', NULL, 0,	'Couronnes slovaques');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'SUR', NULL, 0,	'Rouble');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'XEU', NULL, 0,	'Ecus');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ATS', NULL, 0,	    'Shiliing autrichiens');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BEF', NULL, 0,  	  'Francs belges');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'DEM', NULL, 0,      'Deutsche Mark');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ESP', NULL, 0,      'Pesete');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'FIM', NULL, 0,      'Mark finlandais'); 
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'FRF', NULL, 0,      'Francs francais');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'GRD', NULL, 0,      'Drachme (grece)');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'IEP', NULL, 0,      'Livres irlandaises');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ITL', NULL, 0,      'Lires');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'LUF', NULL, 0,      'Francs luxembourgeois');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'NLG', NULL, 0,      'Florins');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'PTE', NULL, 0,      'Escudos');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'SKK', NULL, 0,      'Couronnes slovaques');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'SUR', NULL, 0,      'Rouble');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'XEU', NULL, 0,      'Ecus');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'TRL', '[84,76]', 0,	'Turkey Lira');
+
 
 -- invalid (for compatibility)
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ARP', NULL, 0,	'Pesos argentins');
diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql
index a51b2bbd70f..7b02ee60ffa 100644
--- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql
+++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql
@@ -84,6 +84,8 @@ insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'19','Perso
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'21','Indivision');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'22','Société créée de fait');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'23','Société en participation');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'24','Société coopérative d''interet collectif (SCIC)');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'25','Société coopérative de production à responsabilité limitée (SCOP)');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'27','Paroisse hors zone concordataire');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'29','Groupement de droit privé non doté de la personnalité morale');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'31','Personne morale de droit étranger, immatriculée au RCS');
diff --git a/htdocs/install/mysql/data/llx_c_product_nature.sql b/htdocs/install/mysql/data/llx_c_product_nature.sql
new file mode 100644
index 00000000000..8351ff2ab79
--- /dev/null
+++ b/htdocs/install/mysql/data/llx_c_product_nature.sql
@@ -0,0 +1,28 @@
+-- Copyright (C) 2020 florian HENRY florian.henry@scopen.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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+--
+
+--
+-- Do not place a comment at the end of the line, this file is parsed when
+-- from the install and all '--' are removed.
+--
+-- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
+-- de l'install et tous les sigles '--' sont supprimés.
+--
+
+INSERT INTO llx_c_product_nature (code, label, active) VALUES (0, 'RowMaterial', 1);
+INSERT INTO llx_c_product_nature (code, label, active) VALUES (1, 'Finished', 1);
+
diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql
index af3cf09f9f8..0dd00f27bb4 100644
--- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql
+++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql
@@ -37,3 +37,9 @@ INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active)
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (6,'KIALA','KIALA','Relais Kiala','http://www.kiala.fr/tnt/delivery/{TRACKID}', 0);
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (7,'GLS','GLS','General Logistics Systems','https://gls-group.eu/FR/fr/suivi-colis?match={TRACKID}', 0);
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (8,'CHRONO','Chronopost','Chronopost','http://www.chronopost.fr/expedier/inputLTNumbersNoJahia.do?listeNumeros={TRACKID}', 0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (9,'INPERSON', 'In person at your site', NULL, NULL, 0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (10,'FEDEX', 'Fedex', NULL, 'https://www.fedex.com/apps/fedextrack/index.html?tracknumbers={TRACKID}', 0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (11,'TNT', 'TNT', NULL, 'https://www.tnt.com/express/fr_fr/site/outils-expedition/suivi.html?searchType=con&cons=={TRACKID}', 0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (12,'DHL', 'DHL', NULL, 'https://www.dhl.com/fr-fr/home/tracking/tracking-global-forwarding.html?submit=1&tracking-id={TRACKID}', 0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (13,'DPD', 'DPD', NULL, 'https://www.dpd.fr/trace/{TRACKID}', 0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (14,'MAINFREIGHT', 'Mainfreight', NULL, 'https://www.mainfreight.com/track?{TRACKID}', 0);
diff --git a/htdocs/install/mysql/data/llx_c_transport_mode.sql b/htdocs/install/mysql/data/llx_c_transport_mode.sql
new file mode 100644
index 00000000000..69f6ac7f6b8
--- /dev/null
+++ b/htdocs/install/mysql/data/llx_c_transport_mode.sql
@@ -0,0 +1,31 @@
+-- Copyright (C) 2019-2020  Open-DSI			<support@open-dsi.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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+--
+
+--
+-- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
+-- de l'install et tous les sigles '--' sont supprimés.
+--
+
+
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('MAR', 'Transport maritime (y compris camions ou wagons sur bateau)', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('TRA', 'Transport par chemin de fer (y compris camions sur wagon)', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('ROU', 'Transport par route', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('AIR', 'Transport par air', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('POS', 'Envois postaux', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('OLE', 'Installations de transport fixe (oléoduc)', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('NAV', 'Transport par navigation intérieure', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('PRO', 'Propulsion propre', 1);
diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index 831097ebf48..793b29ab640 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -123,10 +123,11 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 5
 insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1021, 102,   0, 0, '0', 0, '0', 0, 'Μηδενικό Φ.Π.Α.', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1022, 102,  24, 0, '0', 0, '0', 0, 'Κανονικός Φ.Π.Α.', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1023, 102,  13, 0, '0', 0, '0', 0, 'Μειωμένος Φ.Π.Α.', 1);
-insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1024, 102, 6.5, 0, '0', 0, '0', 0, 'Υπερμειωμένος Φ.Π.Α.', 1);
+insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1024, 102,   6, 0, '0', 0, '0', 0, 'Υπερμειωμένος Φ.Π.Α.', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1025, 102,  16, 0, '0', 0, '0', 0, 'Νήσων κανονικός Φ.Π.Α.', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1026, 102,   9, 0, '0', 0, '0', 0, 'Νήσων μειωμένος Φ.Π.Α.', 1);
-insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1027, 102,   5, 0, '0', 0, '0', 0, 'Νήσων υπερμειωμένος Φ.Π.Α.', 1);
+insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1027, 102,   4, 0, '0', 0, '0', 0, 'Νήσων υπερμειωμένος Φ.Π.Α.', 1);
+insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1028, 102,  17, 0, '0', 0, '0', 0, 'Νήσων υπερμειωμένος Φ.Π.Α.', 1);
 
 -- ICELAND (id country=116)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1161, 116,   '0','0','VAT rate 0',1);
@@ -365,6 +366,10 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 1
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 132, 13,  '9','0','TVA 9%',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 133, 13,     '19','0','TVA 19%',   1);
 
+-- ANGOLA (id country=35)
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 351,  35,   '0','0','VAT Rate 0', 1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 352,  35,   '7','0','VAT reduced rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 353,  35,  '14','0','VAT standard rate',1);
 
 -- Example of code to insert a vat rate 0 for each country
 --delete from llx_c_tva where rowid = 1181;		-- to delete a record that does not follow rules for rowid (fk_pays+'1')
diff --git a/htdocs/install/mysql/data/llx_c_type_contact.sql b/htdocs/install/mysql/data/llx_c_type_contact.sql
index d7ec13f5833..f16cf5ca5df 100644
--- a/htdocs/install/mysql/data/llx_c_type_contact.sql
+++ b/htdocs/install/mysql/data/llx_c_type_contact.sql
@@ -74,13 +74,13 @@ insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) v
 insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (150, 'dolresource','internal', 'USERINCHARGE',     'In charge of resource', 1);
 insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (151, 'dolresource','external', 'THIRDINCHARGE',    'In charge of resource', 1);
 
--- All project code must start with 'PROJECT'
+-- All project code can start with 'PROJECT'
 insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (160, 'project',  'internal', 'PROJECTLEADER', 'Chef de Projet', 1);
 insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (161, 'project',  'internal', 'PROJECTCONTRIBUTOR', 'Intervenant', 1);
 insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (170, 'project',  'external', 'PROJECTLEADER', 'Chef de Projet', 1);
 insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (171, 'project',  'external', 'PROJECTCONTRIBUTOR', 'Intervenant', 1);
 
--- All task code must start with 'TASK'
+-- All task code can start with 'TASK'
 insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (180, 'project_task',  'internal', 'TASKEXECUTIVE', 'Responsable', 1);
 insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (181, 'project_task',  'internal', 'TASKCONTRIBUTOR', 'Intervenant', 1);
 insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (190, 'project_task',  'external', 'TASKEXECUTIVE', 'Responsable', 1);
diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql
index 99da23f53a5..7cd039a2c19 100644
--- a/htdocs/install/mysql/data/llx_const.sql
+++ b/htdocs/install/mysql/data/llx_const.sql
@@ -47,17 +47,17 @@ insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_U
 -- Hidden but specific to one entity
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_ENABLE_OVERWRITE_TRANSLATION','1','chaine','Enable translation overwrite',0,1);
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_ENABLE_DEFAULT_VALUES','1','chaine','Enable default value overwrite',0,1);
-insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MONNAIE','EUR','chaine','Monnaie',0,1);
+insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MONNAIE','EUR','chaine','Currency',0,1);
 
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MAIL_SMTP_SERVER','','chaine','Host or ip address for SMTP server',0,1);
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MAIL_SMTP_PORT','','chaine','Port for SMTP server',0,1);
-insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MAIL_EMAIL_FROM','robot@domain.com','chaine','EMail emetteur pour les emails automatiques Dolibarr',0,1);
+insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MAIL_EMAIL_FROM','robot@domain.com','chaine','email emitter for Dolibarr automatic emails',0,1);
 
 --
 -- IHM
 --
-insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SIZE_LISTE_LIMIT','25','chaine','Longueur maximum des listes',0,0);
-insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SIZE_SHORTLIST_LIMIT','3','chaine','Longueur maximum des listes courtes (fiche client)',0,0);
+insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SIZE_LISTE_LIMIT','25','chaine','Maximum length of lists',0,0);
+insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SIZE_SHORTLIST_LIMIT','3','chaine','Maximum length of short lists',0,0);
 
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MENU_STANDARD','eldy_menu.php','chaine','Menu manager for internal users',0,0);
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MENUFRONT_STANDARD','eldy_menu.php','chaine','Menu manager for external users',0,0);
diff --git a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
index b66d205ef40..9bb097d10b2 100644
--- a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
+++ b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
@@ -119,7 +119,7 @@ ALTER TABLE llx_categorie_warehouse ADD CONSTRAINT fk_categorie_warehouse_fk_war
 create table llx_holiday_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -135,7 +135,7 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 create table llx_entrepot_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -165,7 +165,7 @@ ALTER TABLE llx_events ADD COLUMN prefix_session varchar(255) NULL;
 create table llx_payment_salary_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- salary payment id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
@@ -183,8 +183,8 @@ ALTER TABLE llx_oauth_token ADD COLUMN fk_soc integer DEFAULT NULL after token;
 
 ALTER TABLE llx_adherent_type ADD COLUMN duration varchar(6) DEFAULT NULL after morphy;
 
-ALTER TABLE llx_mailing ADD COLUMN tms timestamp;
-ALTER TABLE llx_mailing_cibles ADD COLUMN tms timestamp;
+ALTER TABLE llx_mailing ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
+ALTER TABLE llx_mailing_cibles ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
 ALTER TABLE llx_projet ADD COLUMN usage_opportunity integer DEFAULT 0;
 ALTER TABLE llx_projet ADD COLUMN usage_task integer DEFAULT 1;
@@ -458,7 +458,7 @@ create table llx_c_shipment_package_type
 
 CREATE TABLE llx_product_fournisseur_price_extrafields (
 	rowid               integer AUTO_INCREMENT PRIMARY KEY,
-	tms                 timestamp,
+	tms                 timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_object           integer NOT NULL,
 	import_key          varchar(14) -- import key
 ) ENGINE=innodb;
@@ -478,7 +478,7 @@ CREATE TABLE llx_mrp_mo(
     note_private text,
     date_creation datetime NOT NULL,
     date_valid datetime NULL,
-    tms timestamp,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     fk_user_creat integer NOT NULL,
     fk_user_modif integer,
     fk_user_valid integer,
@@ -514,7 +514,7 @@ ALTER TABLE llx_mrp_mo ADD INDEX idx_mrp_mo_fk_project (fk_project);
 create table llx_mrp_mo_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                                 -- import key
 ) ENGINE=innodb;
@@ -551,7 +551,7 @@ CREATE TABLE llx_mrp_production(
 	fk_mrp_production integer,		-- if role = 'consumed', id of line with role 'toconsume', if role = 'produced' id of line with role 'toproduce'
 	fk_stock_movement integer,		-- id of stock movement when movements are validated
 	date_creation datetime NOT NULL,
-	tms timestamp,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_creat integer NOT NULL,
 	fk_user_modif integer,
 	import_key varchar(14)
@@ -576,7 +576,7 @@ ALTER TABLE llx_facture_rec MODIFY COLUMN fk_cond_reglement integer NOT NULL DEF
 create table llx_commande_fournisseur_dispatch_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
@@ -587,7 +587,7 @@ ALTER TABLE llx_commande_fournisseur_dispatch_extrafields ADD INDEX idx_commande
 create table llx_facturedet_rec_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index 994e5d89495..3e2a9b37278 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -36,7 +36,7 @@ UPDATE llx_c_units set scale = 86400 where code = 'D' and unit_type = 'time';
 create table llx_commande_fournisseur_dispatch_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
@@ -57,7 +57,7 @@ create table llx_c_shipment_package_type
 create table llx_facturedet_rec_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
@@ -69,7 +69,7 @@ ALTER TABLE llx_facture_rec MODIFY COLUMN titre varchar(200) NOT NULL;
 create table llx_mrp_mo_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                                 -- import key
 ) ENGINE=innodb;
@@ -303,7 +303,7 @@ ALTER TABLE llx_categorie_website_page ADD CONSTRAINT fk_categorie_website_page_
 ALTER TABLE llx_categorie_website_page ADD CONSTRAINT fk_categorie_website_page_website_page_rowid FOREIGN KEY (fk_website_page) REFERENCES llx_website_page (rowid);
 
 ALTER TABLE llx_categorie ADD COLUMN date_creation	datetime;
-ALTER TABLE llx_categorie ADD COLUMN tms     		timestamp;
+ALTER TABLE llx_categorie ADD COLUMN tms     		timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 ALTER TABLE llx_categorie ADD COLUMN fk_user_creat	integer;
 ALTER TABLE llx_categorie ADD COLUMN fk_user_modif	integer;
 
@@ -335,3 +335,20 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (72
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (722, 72,   '18','0', '0.9', '1', 'VAT Rate 18+0.9', 1);
 
 ALTER TABLE llx_expedition ADD COLUMN billed smallint    DEFAULT 0;
+
+-- VMYSQL4.3 ALTER TABLE llx_mrp_mo MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
+
+ALTER TABLE llx_commande_fournisseurdet ADD INDEX idx_commande_fournisseurdet_fk_commande (fk_commande);
+ALTER TABLE llx_commande_fournisseurdet ADD INDEX idx_commande_fournisseurdet_fk_product (fk_product);
+
+
+-- VMYSQL4.3 ALTER TABLE llx_c_shipment_mode MODIFY COLUMN tracking varchar(255) NULL;
+
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (9,'INPERSON', 'In person at your site', NULL, NULL, 0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (10,'FEDEX', 'Fedex', NULL, 'https://www.fedex.com/apps/fedextrack/index.html?tracknumbers={TRACKID}', 0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (11,'TNT', 'TNT', NULL, 'https://www.tnt.com/express/fr_fr/site/outils-expedition/suivi.html?searchType=con&cons=={TRACKID}', 0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (12,'DHL', 'DHL', NULL, 'https://www.dhl.com/fr-fr/home/tracking/tracking-global-forwarding.html?submit=1&tracking-id={TRACKID}', 0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (13,'DPD', 'DPD', NULL, 'https://www.dpd.fr/trace/{TRACKID}', 0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (14,'MAINFREIGHT', 'Mainfreight', NULL, 'https://www.mainfreight.com/track?{TRACKID}', 0);
+
+
diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index cae368aea21..e391787479d 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -30,8 +30,13 @@
 
 -- Missing in v12 or lower
 
+ALTER TABLE llx_payment_salary MODIFY COLUMN ref varchar(30) NULL;
+ALTER TABLE llx_payment_various MODIFY COLUMN ref varchar(30) NULL;
+
 ALTER TABLE llx_prelevement_bons ADD COLUMN type varchar(16) DEFAULT 'debit-order';
 
+ALTER TABLE llx_prelevement_facture CHANGE COLUMN fk_facture_foun fk_facture_fourn integer NULL;
+
 ALTER TABLE llx_prelevement_facture_demande ADD INDEX idx_prelevement_facture_demande_fk_facture (fk_facture);
 ALTER TABLE llx_prelevement_facture_demande ADD INDEX idx_prelevement_facture_demande_fk_facture_fourn (fk_facture_fourn);
 
@@ -44,7 +49,7 @@ ALTER TABLE llx_bom_bom_extrafields ADD INDEX idx_bom_bom_extrafields_fk_object
 create table llx_mrp_mo_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                                 -- import key
 ) ENGINE=innodb;
@@ -56,6 +61,10 @@ ALTER TABLE llx_mrp_mo_extrafields ADD INDEX idx_mrp_mo_fk_object(fk_object);
 
 -- For v13
 
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (111,11,     '0','0','No Sales Tax',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (112,11,     '4','0','Sales Tax 4%',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (113,11,     '6','0','Sales Tax 6%',1);
+
 ALTER TABLE llx_bom_bom ADD COLUMN bomtype integer DEFAULT 0;
 
 UPDATE llx_emailcollector_emailcollector SET ref = 'Collect_Ticket_Requests' WHERE ref = 'Collect_Ticket_Requets';
@@ -97,36 +106,79 @@ ALTER TABLE llx_user DROP COLUMN googleplus;
 ALTER TABLE llx_user DROP COLUMN youtube;
 ALTER TABLE llx_user DROP COLUMN whatsapp;
 
+ALTER TABLE llx_user ADD COLUMN datelastpassvalidation datetime;
 ALTER TABLE llx_user ADD COLUMN datestartvalidity datetime;
 ALTER TABLE llx_user ADD COLUMN dateendvalidity   datetime;
 
+ALTER TABLE llx_user ADD COLUMN idpers1 varchar(128);
+ALTER TABLE llx_user ADD COLUMN idpers2	varchar(128);
+ALTER TABLE llx_user ADD COLUMN idpers3	varchar(128);
+
+
+-- Intracomm Report
+CREATE TABLE llx_c_transport_mode (
+  rowid     integer AUTO_INCREMENT PRIMARY KEY,
+  entity    integer	DEFAULT 1 NOT NULL,	-- multi company id
+  code      varchar(3) NOT NULL,
+  label     varchar(255) NOT NULL,
+  active    tinyint DEFAULT 1  NOT NULL
+) ENGINE=innodb;
+
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('MAR', 'Transport maritime (y compris camions ou wagons sur bateau)', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('TRA', 'Transport par chemin de fer (y compris camions sur wagon)', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('ROU', 'Transport par route', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('AIR', 'Transport par air', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('POS', 'Envois postaux', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('OLE', 'Installations de transport fixe (oléoduc)', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('NAV', 'Transport par navigation intérieure', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('PRO', 'Propulsion propre', 1);
+
+ALTER TABLE llx_facture ADD COLUMN fk_transport_mode integer after location_incoterms;
+ALTER TABLE llx_facture_fourn ADD COLUMN fk_transport_mode integer after location_incoterms;
+
+ALTER TABLE llx_societe ADD COLUMN transport_mode tinyint after cond_reglement;
+ALTER TABLE llx_societe ADD COLUMN transport_mode_supplier tinyint after cond_reglement_supplier;
+
+CREATE TABLE llx_intracommreport
+(
+  rowid				integer AUTO_INCREMENT PRIMARY KEY,
+
+  ref				varchar(30)        NOT NULL,			-- report reference number
+  entity			integer  DEFAULT 1 NOT NULL,			-- multi company id
+  type_declaration	varchar(32),
+  periods			varchar(32),
+  mode				varchar(32),
+  content_xml		text,
+  type_export		varchar(10),
+  datec             datetime,
+  tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+)ENGINE=innodb;
+
 ALTER TABLE llx_c_incoterms ADD COLUMN label varchar(100) NULL;
 
-
-
 CREATE TABLE llx_recruitment_recruitmentjobposition(
-	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
-	ref varchar(128) DEFAULT '(PROV)' NOT NULL, 
-	entity INTEGER DEFAULT 1 NOT NULL, 
-	label varchar(255) NOT NULL, 
-	qty integer DEFAULT 1 NOT NULL, 
-	fk_soc integer, 
-	fk_project integer, 
-	fk_user_recruiter integer, 
-	fk_user_supervisor integer, 
-	fk_establishment integer, 
-	date_planned date, 
-	remuneration_suggested varchar(255), 
-	description text, 
-	note_public text, 
-	note_private text, 
-	date_creation datetime NOT NULL, 
-	tms timestamp, 
-	fk_user_creat integer NOT NULL, 
-	fk_user_modif integer, 
-	last_main_doc varchar(255), 
-	import_key varchar(14), 
-	model_pdf varchar(255), 
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+	ref varchar(128) DEFAULT '(PROV)' NOT NULL,
+	entity INTEGER DEFAULT 1 NOT NULL,
+	label varchar(255) NOT NULL,
+	qty integer DEFAULT 1 NOT NULL,
+	fk_soc integer,
+	fk_project integer,
+	fk_user_recruiter integer,
+	fk_user_supervisor integer,
+	fk_establishment integer,
+	date_planned date,
+	remuneration_suggested varchar(255),
+	description text,
+	note_public text,
+	note_private text,
+	date_creation datetime NOT NULL,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+	fk_user_creat integer NOT NULL,
+	fk_user_modif integer,
+	last_main_doc varchar(255),
+	import_key varchar(14),
+	model_pdf varchar(255),
 	status smallint NOT NULL
 ) ENGINE=innodb;
 
@@ -147,7 +199,7 @@ ALTER TABLE llx_recruitment_recruitmentjobposition ADD COLUMN remuneration_sugge
 create table llx_recruitment_recruitmentjobposition_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -160,24 +212,24 @@ CREATE TABLE llx_recruitment_recruitmentcandidature(
 	-- BEGIN MODULEBUILDER FIELDS
 	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
 	entity integer NOT NULL DEFAULT 1,
-	fk_recruitmentjobposition INTEGER NULL, 
-	ref varchar(128) DEFAULT '(PROV)' NOT NULL, 
-	description text, 
-	note_public text, 
-	note_private text, 
-	date_creation datetime NOT NULL, 
-	tms timestamp, 
-	fk_user_creat integer NOT NULL, 
-	fk_user_modif integer, 
-	import_key varchar(14), 
-	model_pdf varchar(255), 
-	status smallint NOT NULL, 
-	firstname varchar(128), 
+	fk_recruitmentjobposition INTEGER NULL,
+	ref varchar(128) DEFAULT '(PROV)' NOT NULL,
+	description text,
+	note_public text,
+	note_private text,
+	date_creation datetime NOT NULL,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+	fk_user_creat integer NOT NULL,
+	fk_user_modif integer,
+	import_key varchar(14),
+	model_pdf varchar(255),
+	status smallint NOT NULL,
+	firstname varchar(128),
 	lastname varchar(128),
 	email varchar(255),
 	phone varchar(64),
 	date_birth date,
-	remuneration_requested integer, 
+	remuneration_requested integer,
 	remuneration_proposed integer,
 	email_msgid varchar(255),
 	fk_recruitment_origin INTEGER NULL
@@ -197,7 +249,7 @@ ALTER TABLE llx_recruitment_recruitmentcandidature ADD INDEX idx_recruitment_rec
 create table llx_recruitment_recruitmentcandidature_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -272,8 +324,9 @@ ALTER TABLE llx_recruitment_recruitmentcandidature ADD UNIQUE INDEX uk_recruitme
 
 ALTER TABLE llx_product MODIFY COLUMN seuil_stock_alerte float;
 ALTER TABLE llx_product MODIFY COLUMN desiredstock float;
-ALTER TABLE llx_product_warehouse_properties MODIFY COLUMN seuil_stock_alerte float; 
-ALTER TABLE llx_product_warehouse_properties MODIFY COLUMN desiredstock float; 
+
+ALTER TABLE llx_product_warehouse_properties MODIFY COLUMN seuil_stock_alerte float;
+ALTER TABLE llx_product_warehouse_properties MODIFY COLUMN desiredstock float;
 
 ALTER TABLE llx_product ADD COLUMN fk_state integer DEFAULT NULL;
 
@@ -287,8 +340,9 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_SENTBYMAIL','Mails sent from third party card','Executed when you send email from contact adress card','contact',51);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_DELETE','Contact address deleted','Executed when a contact is deleted','contact',52);
 
-ALTER TABLE llx_ecm_directories CHANGE COLUMN date_m tms timestamp;
-ALTER TABLE llx_ecm_files CHANGE COLUMN date_m tms timestamp;
+ALTER TABLE llx_opensurvey_sondage CHANGE COLUMN tms tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
+ALTER TABLE llx_ecm_directories CHANGE COLUMN date_m tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
+ALTER TABLE llx_ecm_files CHANGE COLUMN date_m tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
 INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,enabled,active,topic,content,content_lines,joinfiles) VALUES (0,'recruitment','recruitmentcandidature_send','',0,null,null,'(AnswerCandidature)'                    ,100,'$conf->recruitment->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourCandidature)__',       '__(Hello)__ __CANDIDATE_FULLNAME__,<br><br>\n\n__(YourCandidatureAnswer)__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
 
@@ -306,6 +360,7 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 ALTER TABLE llx_actioncomm_reminder ADD COLUMN entity integer NOT NULL DEFAULT 1;
 ALTER TABLE llx_actioncomm_reminder ADD COLUMN fk_actioncomm integer NOT NULL;
 ALTER TABLE llx_actioncomm_reminder ADD COLUMN fk_email_template integer;
+ALTER TABLE llx_actioncomm_reminder ADD COLUMN lasterror varchar(128) NULL;
 
 ALTER TABLE llx_actioncomm_reminder DROP INDEX uk_actioncomm_reminder_unique;
 ALTER TABLE llx_actioncomm_reminder ADD UNIQUE uk_actioncomm_reminder_unique (fk_user, typeremind, offsetvalue, offsetunit, fk_actioncomm);
@@ -321,6 +376,10 @@ ALTER TABLE llx_facturedet ADD COLUMN ref_ext varchar(255) AFTER multicurrency_t
 ALTER TABLE llx_c_ticket_category ADD COLUMN fk_parent integer DEFAULT 0 NOT NULL;
 ALTER TABLE llx_c_ticket_category ADD COLUMN force_severity varchar(32) NULL;
 
+ALTER TABLE llx_c_ticket_severity CHANGE color color VARCHAR(10) NULL;
+
+ALTER TABLE llx_expensereport ADD COLUMN fk_user_creat integer NULL;
+
 ALTER TABLE llx_expensereport_ik ADD COLUMN ikoffset double DEFAULT 0 NOT NULL;
 
 ALTER TABLE llx_paiement ADD COLUMN ref_ext varchar(255) AFTER ref;
@@ -331,5 +390,165 @@ ALTER TABLE llx_bank ADD COLUMN import_key varchar(14);
 
 ALTER TABLE llx_menu MODIFY COLUMN enabled text;
 
+CREATE TABLE llx_ecm_files_extrafields
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)                             -- import key
+) ENGINE=innodb;
+
+ALTER TABLE llx_ecm_files_extrafields ADD INDEX idx_ecm_files_extrafields (fk_object);
+
+CREATE TABLE llx_ecm_directories_extrafields
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)                             -- import key
+) ENGINE=innodb;
+
+ALTER TABLE llx_ecm_directories_extrafields ADD INDEX idx_ecm_directories_extrafields (fk_object);
+ALTER TABLE llx_website_page ADD COLUMN allowed_in_frames integer DEFAULT 0;
 ALTER TABLE llx_website_page ADD COLUMN object_type varchar(255);
 ALTER TABLE llx_website_page ADD COLUMN fk_object varchar(255);
+
+DELETE FROM llx_const WHERE name in ('MAIN_INCLUDE_ZERO_VAT_IN_REPORTS');
+
+UPDATE llx_projet_task_time SET tms = null WHERE tms = 0;
+ALTER TABLE llx_projet_task_time MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
+
+ALTER TABLE llx_projet_task_time MODIFY COLUMN datec datetime;
+
+
+DELETE FROM llx_user_rights WHERE fk_id IN (SELECT id FROM llx_rights_def where module = 'holiday' and perms = 'lire_tous');
+DELETE FROM llx_rights_def where module = 'holiday' and perms = 'lire_tous';
+UPDATE llx_rights_def set perms = 'readall' WHERE perms = 'read_all' and module = 'holiday';
+
+CREATE TABLE llx_c_product_nature (
+      rowid integer AUTO_INCREMENT PRIMARY KEY,
+      code tinyint NOT NULL,
+      label varchar(100),
+      active tinyint DEFAULT 1  NOT NULL
+) ENGINE=innodb;
+
+ALTER TABLE llx_c_product_nature ADD UNIQUE INDEX uk_c_product_nature(code, active);
+
+INSERT INTO llx_c_product_nature (code, label, active) VALUES (0, 'RowMaterial', 1);
+INSERT INTO llx_c_product_nature (code, label, active) VALUES (1, 'Finished', 1);
+
+ALTER TABLE llx_product MODIFY COLUMN finished tinyint DEFAULT NULL;
+ALTER TABLE llx_product ADD CONSTRAINT fk_product_finished FOREIGN KEY (finished) REFERENCES llx_c_product_nature (code);
+
+-- MIGRATION TO DO AFTER RENAMING AN OBJECT
+
+-- drop constraint
+ALTER TABLE llx_livraison DROP FOREIGN KEY  fk_livraison_fk_soc;
+ALTER TABLE llx_livraison DROP FOREIGN KEY  fk_livraison_fk_user_author;
+ALTER TABLE llx_livraison DROP FOREIGN KEY  fk_livraison_fk_user_valid;
+
+-- rename Table
+ALTER TABLE llx_livraison RENAME TO llx_delivery;
+ALTER TABLE llx_livraison_extrafields RENAME TO llx_delivery_extrafields;
+ALTER TABLE llx_livraisondet RENAME TO llx_deliverydet;
+ALTER TABLE llx_livraisondet_extrafields RENAME TO llx_deliverydet_extrafields;
+
+-- rename index
+ALTER TABLE llx_delivery DROP INDEX idx_livraison_uk_ref;
+ALTER TABLE llx_delivery ADD UNIQUE INDEX idx_delivery_uk_ref (ref, entity);
+ALTER TABLE llx_delivery DROP INDEX idx_livraison_fk_soc;
+ALTER TABLE llx_delivery ADD INDEX idx_delivery_fk_soc (fk_soc);
+ALTER TABLE llx_delivery DROP INDEX idx_livraison_fk_user_author;
+ALTER TABLE llx_delivery ADD INDEX idx_delivery_fk_user_author (fk_user_author);
+ALTER TABLE llx_delivery DROP INDEX idx_livraison_fk_user_valid;
+ALTER TABLE llx_delivery ADD INDEX idx_delivery_fk_user_valid (fk_user_valid);
+
+-- drop constraint
+ALTER TABLE llx_delivery DROP FOREIGN KEY  fk_livraison_fk_soc;
+ALTER TABLE llx_delivery DROP FOREIGN KEY  fk_livraison_fk_user_author;
+ALTER TABLE llx_delivery DROP FOREIGN KEY  fk_livraison_fk_user_valid;
+
+-- add constraint
+ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_soc			FOREIGN KEY (fk_soc)			REFERENCES llx_societe (rowid);
+ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_user_author	FOREIGN KEY (fk_user_author)	REFERENCES llx_user (rowid);
+ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_user_valid	FOREIGN KEY (fk_user_valid)	REFERENCES llx_user (rowid);
+
+ALTER TABLE llx_deliverydet DROP FOREIGN KEY  fk_livraisondet_fk_livraison;
+ALTER TABLE llx_deliverydet DROP INDEX idx_livraisondet_fk_expedition;
+ALTER TABLE llx_deliverydet CHANGE COLUMN fk_livraison fk_delivery integer;
+ALTER TABLE llx_deliverydet ADD INDEX idx_deliverydet_fk_delivery (fk_delivery);
+ALTER TABLE llx_deliverydet ADD CONSTRAINT fk_deliverydet_fk_delivery FOREIGN KEY (fk_delivery) REFERENCES llx_delivery (rowid);
+
+UPDATE llx_extrafields SET elementtype = 'delivery' WHERE elementtype = 'livraison';
+UPDATE llx_extrafields SET elementtype = 'deliverydet' WHERE elementtype = 'livraisondet';
+
+-- update llx_ecm_files
+UPDATE llx_ecm_files SET src_object_type = 'delivery' WHERE src_object_type = 'livraison';
+
+-- update llx_links
+UPDATE llx_links SET objecttype = 'delivery' WHERE objecttype = 'livraison';
+
+-- update llx_document_model
+UPDATE llx_document_model SET type = 'delivery' WHERE type = 'livraison';
+
+-- update llx_object_lang
+UPDATE llx_object_lang SET type_object = 'delivery' WHERE type_object = 'livraison';
+
+-- update llx_c_type_contact
+UPDATE llx_c_type_contact SET element = 'delivery' WHERE element = 'livraison';
+
+-- update llx_c_email_template
+UPDATE llx_c_email_template SET type_template = 'delivery' WHERE type_template = 'livraison';
+
+-- update llx_element_element
+UPDATE llx_element_element SET sourcetype = 'delivery' WHERE sourcetype = 'livraison';
+UPDATE llx_element_element SET targettype = 'delivery' WHERE targettype = 'livraison';
+
+-- update llx_actioncomm
+UPDATE llx_actioncomm SET element_type = 'delivery' WHERE element_type = 'livraison';
+
+-- update llx_const
+UPDATE llx_const set name = 'DELIVERY_ADDON_NUMBER' WHERE name = 'LIVRAISON_ADDON_NUMBER';
+UPDATE llx_const set value = 'mod_delivery_jade' WHERE value = 'mod_livraison_jade' AND name = 'DELIVERY_ADDON_NUMBER';
+UPDATE llx_const set value = 'mod_delivery_saphir' WHERE value = 'mod_livraison_saphir' AND name = 'DELIVERY_ADDON_NUMBER';
+
+-- update llx_rights_def
+UPDATE llx_rights_def set perms = 'delivery' WHERE perms = 'livraison' and module = 'expedition';
+UPDATE llx_rights_def set perms = 'delivery_advance' WHERE perms = 'livraison_advance' and module = 'expedition';
+
+
+ALTER TABLE llx_commande_fournisseurdet ADD INDEX idx_commande_fournisseurdet_fk_commande (fk_commande);
+ALTER TABLE llx_commande_fournisseurdet ADD INDEX idx_commande_fournisseurdet_fk_product (fk_product);
+
+
+CREATE TABLE llx_zapier_hook(
+    rowid integer AUTO_INCREMENT PRIMARY KEY,
+    entity integer DEFAULT 1 NOT NULL,
+    url varchar(255),
+    event varchar(255),
+    module varchar(128),
+    action varchar(128),
+    status integer,
+    date_creation datetime NOT NULL,
+    fk_user integer NOT NULL,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    import_key varchar(14)
+) ENGINE=innodb;
+
+
+CREATE TABLE llx_session(
+  session_id varchar(50) PRIMARY KEY,
+  session_variable text,
+  last_accessed datetime NOT NULL,
+  fk_user integer NOT NULL,
+  remote_ip varchar(64) NULL,
+  user_agent varchar(128) NULL
+)ENGINE=innodb;
+
+INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'github', 'Github', 'https://github.com/{socialid}', 'fa-github', 1);
+
+-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT  'box_funnel_of_prospection.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_funnel_of_prospection.php' AND entity = 1);
+-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT  'box_customers_outstanding_bill_reached.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_customers_outstanding_bill_reached.php' AND entity = 1);
+-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT  'box_scheduled_jobs.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_scheduled_jobs.php' AND entity = 1);
+
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN packaging varchar(64);
diff --git a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql
index a4ab666299d..4104d74da51 100644
--- a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql
+++ b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql
@@ -419,19 +419,19 @@ update llx_actioncomm set elementtype='order' where elementtype='commande';
 update llx_actioncomm set elementtype='contract' where elementtype='contrat';
 
 
-alter table llx_propal add column   tms             timestamp after fk_projet;
+alter table llx_propal add column   tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP after fk_projet;
 
 
 create table llx_product_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL
 ) ENGINE=innodb;
 create table llx_societe_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL
 ) ENGINE=innodb;
 
@@ -487,7 +487,7 @@ ALTER TABLE llx_don ADD   phone           varchar(24) after email;
 ALTER TABLE llx_element_element MODIFY sourcetype varchar(32) NOT NULL;
 ALTER TABLE llx_element_element MODIFY targettype varchar(32) NOT NULL;
 
-ALTER TABLE llx_societe_prices MODIFY tms timestamp NULL;
+ALTER TABLE llx_societe_prices MODIFY tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 -- ALTER TABLE llx_societe_prices ALTER COLUMN tms DROP NOT NULL;
 
 -- Fix: It seems this is missing for some users
diff --git a/htdocs/install/mysql/migration/3.1.0-3.2.0.sql b/htdocs/install/mysql/migration/3.1.0-3.2.0.sql
index 044b1652029..c7356cc18ff 100644
--- a/htdocs/install/mysql/migration/3.1.0-3.2.0.sql
+++ b/htdocs/install/mysql/migration/3.1.0-3.2.0.sql
@@ -62,7 +62,7 @@ ALTER TABLE llx_societe MODIFY code_compta varchar(24);
 ALTER TABLE llx_societe MODIFY code_compta_fournisseur varchar(24);
 
   
-ALTER TABLE llx_chargesociales ADD COLUMN tms                   timestamp;
+ALTER TABLE llx_chargesociales ADD COLUMN tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 ALTER TABLE llx_chargesociales ADD COLUMN date_creation         datetime; 
 ALTER TABLE llx_chargesociales ADD COLUMN date_valid            datetime;
 
@@ -118,7 +118,7 @@ CREATE TABLE llx_localtax
 (
 	rowid			integer		AUTO_INCREMENT PRIMARY KEY,
 	entity			integer			NOT NULL DEFAULT '1',
-	tms				timestamp,
+	tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	datep			date			DEFAULT NULL,
 	datev			date			DEFAULT NULL,
 	amount			double			NOT NULL DEFAULT '0',
diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
index c0efe6d68b3..07b390f32c4 100644
--- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
+++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
@@ -39,7 +39,7 @@ ALTER TABLE llx_societe DROP COLUMN description;
 ALTER TABLE llx_societe DROP COLUMN services;
 ALTER TABLE llx_societe MODIFY COLUMN ref_ext varchar(128);
 
-ALTER TABLE llx_bank ADD COLUMN tms timestamp after datec;
+ALTER TABLE llx_bank ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP after datec;
   
 -- Monaco VAT Rates
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 271,  27,'19.6','0','VAT standard rate (France hors DOM-TOM)',1);
@@ -267,7 +267,7 @@ ALTER TABLE llx_extrafields ADD COLUMN fieldrequired INTEGER DEFAULT 0;
 create table llx_socpeople_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                                 -- import key
 ) ENGINE=innodb;
@@ -276,7 +276,7 @@ ALTER TABLE llx_socpeople_extrafields ADD INDEX idx_socpeople_extrafields (fk_ob
 create table llx_actioncomm_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -835,7 +835,7 @@ CREATE TABLE llx_product_price_by_qty
 (
   rowid			integer AUTO_INCREMENT PRIMARY KEY,
   fk_product_price	integer NOT NULL,
-  date_price		timestamp,
+  date_price		timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   price			double (24,8) DEFAULT 0,
   price_ttc		double (24,8) DEFAULT 0,
   qty_min		real DEFAULT 0
@@ -910,7 +910,7 @@ ALTER TABLE llx_bank_account MODIFY COLUMN code_banque varchar(8);
 create table llx_user_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- member id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql
index 88d9ae1b685..edc2c931ee1 100644
--- a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql
+++ b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql
@@ -23,7 +23,7 @@ ALTER TABLE llx_menu MODIFY COLUMN leftmenu varchar(100);
 create table llx_adherent_type_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -115,7 +115,7 @@ ALTER TABLE llx_c_shipment_mode ADD COLUMN tracking VARCHAR(255) NOT NULL DEFAUL
 
 -- VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
 -- VPGSQL8.2 DROP table llx_c_shipment_mode;
--- VPGSQL8.2 CREATE TABLE llx_c_shipment_mode (rowid SERIAL PRIMARY KEY, tms timestamp, code varchar(30) NOT NULL, libelle varchar(50) NOT NULL, description text, tracking varchar(255) NOT NULL, active integer DEFAULT 0, module varchar(32) NULL);
+-- VPGSQL8.2 CREATE TABLE llx_c_shipment_mode (rowid SERIAL PRIMARY KEY, tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, code varchar(30) NOT NULL, libelle varchar(50) NOT NULL, description text, tracking varchar(255) NOT NULL, active integer DEFAULT 0, module varchar(32) NULL);
 -- VPGSQL8.2 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (1,'CATCH','Catch','Catch by client','',1);
 -- VPGSQL8.2 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (2,'TRANS','Transporter','Generic transporter','',1);
 -- VPGSQL8.2 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi','',0);
@@ -136,7 +136,7 @@ ALTER TABLE llx_stock_mouvement MODIFY COLUMN value real;
 create table llx_propal_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -145,7 +145,7 @@ ALTER TABLE llx_propal_extrafields ADD INDEX idx_propal_extrafields (fk_object);
 create table llx_facture_extrafields
 (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object integer NOT NULL,
   import_key varchar(14) -- import key
 ) ENGINE=innodb;
@@ -205,7 +205,7 @@ ALTER TABLE llx_facturedet DROP COLUMN fk_export_compta;
 CREATE TABLE llx_cronjob 
 (
 	rowid 			integer AUTO_INCREMENT PRIMARY KEY,
-	tms 			timestamp,
+	tms 			timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	datec 			datetime,
 	jobtype			varchar(10) NOT NULL,
   	label 			text NOT NULL,
@@ -249,7 +249,7 @@ DROP TABLE llx_printer_ipp;
 CREATE TABLE llx_printer_ipp 
 (
 	rowid integer AUTO_INCREMENT PRIMARY KEY,
-	tms 	timestamp,
+	tms 	timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	datec 	datetime,
 	printer_name text NOT NULL, 
 	printer_location text NOT NULL,
@@ -265,7 +265,7 @@ ALTER TABLE llx_adherent MODIFY COLUMN ref_ext varchar(128);
 create table llx_commande_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)
 ) ENGINE=innodb;
@@ -299,7 +299,7 @@ ALTER TABLE llx_socpeople CHANGE COLUMN note note_private text;
 create table llx_projet_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -308,7 +308,7 @@ ALTER TABLE llx_projet_extrafields ADD INDEX idx_projet_extrafields (fk_object);
 create table llx_projet_task_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -319,7 +319,7 @@ CREATE TABLE llx_opensurvey_comments (
     id_comment INTEGER unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
     id_sondage CHAR(16) NOT NULL,
     comment text NOT NULL,
-    tms timestamp,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     usercomment text
 ) ENGINE=InnoDB;
 
@@ -336,7 +336,7 @@ CREATE TABLE llx_opensurvey_sondage (
        survey_link_visible integer DEFAULT 1,
 	   canedit integer DEFAULT 0,
        origin varchar(64),
-       tms timestamp,
+       tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	   sujet TEXT
 ) ENGINE=InnoDB;
 CREATE TABLE llx_opensurvey_user_studs (
@@ -344,7 +344,7 @@ CREATE TABLE llx_opensurvey_user_studs (
     nom VARCHAR(64) NOT NULL,
     id_sondage VARCHAR(16) NOT NULL,
     reponses VARCHAR(100) NOT NULL,
-    tms timestamp
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=InnoDB;
 
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN id_sondage_admin CHAR(24);
@@ -367,7 +367,7 @@ UPDATE llx_extrafields SET elementtype='societe' WHERE elementtype='company';
 create table llx_commande_fournisseur_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)
 ) ENGINE=innodb;
@@ -376,7 +376,7 @@ ALTER TABLE llx_commande_fournisseur_extrafields ADD INDEX idx_commande_fourniss
 create table llx_facture_fourn_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/3.4.0-3.5.0.sql b/htdocs/install/mysql/migration/3.4.0-3.5.0.sql
index c6dc0ff9bd7..af3ea13fa5c 100644
--- a/htdocs/install/mysql/migration/3.4.0-3.5.0.sql
+++ b/htdocs/install/mysql/migration/3.4.0-3.5.0.sql
@@ -43,7 +43,7 @@ ALTER TABLE llx_socpeople ADD COLUMN statut tinyint DEFAULT 1 NOT NULL AFTER imp
 create table llx_fichinter_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -55,7 +55,7 @@ ALTER TABLE llx_product ADD COLUMN desiredstock integer DEFAULT 0;
 create table llx_commandedet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    
   import_key       varchar(14)      	
 )ENGINE=innodb;
@@ -69,7 +69,7 @@ ALTER TABLE llx_facturedet_rec ADD COLUMN info_bits	integer DEFAULT 0 after tota
 create table llx_facturedet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
@@ -79,7 +79,7 @@ ALTER TABLE llx_facturedet_extrafields ADD INDEX idx_facturedet_extrafields (fk_
 create table llx_propaldet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
@@ -314,7 +314,7 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 
 -- Add ref_ext on bordereau_cheque
 ALTER TABLE llx_bordereau_cheque ADD ref_ext VARCHAR(255);
-ALTER TABLE llx_bordereau_cheque ADD tms timestamp;
+ALTER TABLE llx_bordereau_cheque ADD tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
 
 -- Task 1011
@@ -337,7 +337,7 @@ ALTER TABLE llx_contratdet ADD column product_type integer DEFAULT 1 after total
 create table llx_contrat_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
index 5727b946bcb..32ed4c32538 100644
--- a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
+++ b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
@@ -74,7 +74,7 @@ ALTER TABLE llx_bookmark MODIFY COLUMN url varchar(255) NOT NULL;
 -- VMYSQL4.3 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN date_fin DATETIME NULL DEFAULT NULL;
 -- VPGSQL8.2 ALTER TABLE llx_opensurvey_sondage ALTER COLUMN date_fin DROP NOT NULL;
 
--- VMYSQL4.1 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP;
+-- VMYSQL4.1 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
 
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN entity integer DEFAULT 1 NOT NULL;
@@ -108,7 +108,7 @@ create table llx_product_customer_price
   rowid					integer AUTO_INCREMENT PRIMARY KEY,
   entity				integer DEFAULT 1 NOT NULL,	   -- multi company id
   datec					datetime,
-  tms					timestamp,
+  tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product			integer NOT NULL,
   fk_soc				integer NOT NULL,
   price						double(24,8) DEFAULT 0,
@@ -164,7 +164,7 @@ ALTER TABLE llx_product ADD COLUMN tobatch tinyint DEFAULT 0 NOT NULL;
 
 CREATE TABLE llx_product_batch (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product_stock integer NOT NULL,
   eatby datetime DEFAULT NULL,
   sellby datetime DEFAULT NULL,
@@ -187,7 +187,7 @@ CREATE TABLE llx_expeditiondet_batch (
 --DROP TABLE llx_payment_salary
 CREATE TABLE llx_payment_salary (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user integer NOT NULL,
   datep date,
   datev date,
@@ -229,7 +229,7 @@ ALTER TABLE llx_projet_task_time ADD thm double(24,8) AFTER fk_user;
 create table llx_categories_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -283,7 +283,7 @@ CREATE TABLE llx_resource
   fk_code_type_resource varchar(32),
   note_public     		text,
   note_private    		text,
-  tms         			timestamp
+  tms         			timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=innodb;
 
 ALTER TABLE llx_resource ADD INDEX fk_code_type_resource_idx (fk_code_type_resource);
@@ -298,7 +298,7 @@ CREATE TABLE llx_element_resources
   busy			  integer,
   mandatory		  integer,
   fk_user_create   integer,
-  tms             timestamp
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=innodb;
 
 ALTER TABLE llx_element_resources ADD UNIQUE INDEX idx_element_resources_idx1 (resource_id, resource_type, element_id, element_type);
diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
index 6dc2521ca5d..640f22e4bee 100644
--- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
+++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
@@ -137,7 +137,7 @@ DROP TABLE llx_compta_compte_generaux;
 -- Align size for accounting account
 ALTER TABLE llx_accountingaccount MODIFY COLUMN account_number varchar(32);
 ALTER TABLE llx_accountingaccount MODIFY COLUMN account_parent varchar(32);
-ALTER TABLE llx_accountingaccount add column tms timestamp AFTER datec;
+ALTER TABLE llx_accountingaccount add column tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP AFTER datec;
 ALTER TABLE llx_accountingdebcred MODIFY COLUMN account_number varchar(32);
 ALTER TABLE llx_bank_account MODIFY COLUMN account_number varchar(32);
 ALTER TABLE llx_c_chargesociales MODIFY COLUMN accountancy_code varchar(32);
@@ -233,7 +233,7 @@ create table llx_accounting_fiscalyear
 	statut			tinyint DEFAULT 0 NOT NULL,
 	entity			integer DEFAULT 1 NOT NULL,	  -- multi company id
 	datec			datetime NOT NULL,
-	tms				timestamp,
+	tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_author	integer NULL,
 	fk_user_modif	integer NULL
 )ENGINE=innodb;
@@ -1050,7 +1050,7 @@ create table llx_c_email_templates
   private         smallint DEFAULT 0 NOT NULL,    -- Template public or private
   fk_user         integer,                        -- Id utilisateur si modele prive, sinon null
   datec           datetime,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   label           varchar(255),					  -- Label of predefined email
   position        smallint,					      -- Position
   active          tinyint DEFAULT 1  NOT NULL,
@@ -1112,7 +1112,7 @@ ALTER TABLE llx_projet_task MODIFY COLUMN planned_workload real DEFAULT 0 NULL;
 CREATE TABLE llx_fichinterdet_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -1121,7 +1121,7 @@ ALTER TABLE llx_fichinterdet_extrafields ADD INDEX idx_ficheinterdet_extrafields
 
 CREATE TABLE llx_usergroup_extrafields (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
index ca677fc5224..00bf30f6672 100644
--- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
+++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
@@ -49,7 +49,7 @@ create table llx_loan
   rowid							integer AUTO_INCREMENT PRIMARY KEY,
   entity						integer DEFAULT 1 NOT NULL,
   datec							datetime,
-  tms							timestamp,
+  tms							timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   label							varchar(80) NOT NULL,
   fk_bank						integer,
   capital						real     DEFAULT 0 NOT NULL,
@@ -75,7 +75,7 @@ create table llx_payment_loan
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   fk_loan			integer,
   datec				datetime,
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep				datetime,
   amount_capital	real DEFAULT 0,
   amount_insurance	real DEFAULT 0,
@@ -145,7 +145,7 @@ ALTER TABLE llx_product ADD COLUMN lifo double(24,8) AFTER fifo;
 CREATE TABLE llx_printing
 (
  rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp,
+ tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
  datec datetime,
  printer_name text NOT NULL,
  printer_location text NOT NULL,
@@ -177,7 +177,7 @@ DELETE from llx_const where name = 'MAIN_USE_JQUERY_MULTISELECT' and value = '1'
 create table llx_bank_account_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -198,7 +198,7 @@ ALTER TABLE llx_bank_account_extrafields ADD INDEX idx_bank_account_extrafields
 create table llx_contratdet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
@@ -210,7 +210,7 @@ ALTER TABLE llx_product_fournisseur_price ADD COLUMN delivery_time_days integer;
 
 ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN comment	varchar(255);
 ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN status integer;
-ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN tms timestamp;
+ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN batch varchar(30) DEFAULT NULL;
 ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN eatby date DEFAULT NULL;
 ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN sellby date DEFAULT NULL;
@@ -240,7 +240,7 @@ CREATE TABLE llx_expensereport (
   date_approve		datetime,
   date_refuse 		datetime,
   date_cancel 		datetime,
-  tms 		 		timestamp,
+  tms 		 		timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_author 	integer NOT NULL,
   fk_user_modif 	integer DEFAULT NULL,
   fk_user_valid 	integer DEFAULT NULL,
@@ -297,7 +297,7 @@ create table llx_payment_expensereport
   rowid                   integer AUTO_INCREMENT PRIMARY KEY,
   fk_expensereport        integer,
   datec                   datetime,           -- date de creation
-  tms                     timestamp,
+  tms                     timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep                   datetime,           -- payment date
   amount                  real DEFAULT 0,
   fk_typepayment          integer NOT NULL,
@@ -316,7 +316,7 @@ ALTER TABLE llx_societe ADD COLUMN name_alias varchar(128) NULL;
 create table llx_commande_fournisseurdet_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)
 ) ENGINE=innodb;
@@ -327,7 +327,7 @@ ALTER TABLE llx_commande_fournisseurdet_extrafields ADD INDEX idx_commande_fourn
 create table llx_facture_fourn_det_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -357,7 +357,7 @@ CREATE TABLE llx_askpricesupplier (
   ref_int varchar(255) DEFAULT NULL,
   fk_soc integer DEFAULT NULL,
   fk_projet integer DEFAULT NULL,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec datetime DEFAULT NULL,
   date_valid datetime DEFAULT NULL,
   date_cloture datetime DEFAULT NULL,
@@ -422,14 +422,14 @@ CREATE TABLE llx_askpricesupplierdet (
 
 CREATE TABLE llx_askpricesupplier_extrafields (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object integer NOT NULL,
   import_key varchar(14) DEFAULT NULL
 ) ENGINE=innodb;
 
 CREATE TABLE llx_askpricesupplierdet_extrafields (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object integer NOT NULL,
   import_key varchar(14) DEFAULT NULL
 ) ENGINE=innodb;
@@ -491,7 +491,7 @@ ALTER TABLE llx_don CHANGE COLUMN fk_project fk_projet integer NULL;
 create table llx_don_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -503,7 +503,7 @@ create table llx_payment_donation
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   fk_donation     integer,
   datec           datetime,           -- date de creation
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep           datetime,           -- payment date
   amount          real DEFAULT 0,
   fk_typepayment  integer NOT NULL,
@@ -585,7 +585,7 @@ CREATE TABLE IF NOT EXISTS llx_propal_merge_pdf_product (
   fk_user_author integer DEFAULT NULL,
   fk_user_mod integer NOT NULL,
   datec datetime NOT NULL,
-  tms timestamp NOT NULL,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   import_key varchar(14) DEFAULT NULL
 ) ENGINE=InnoDB;
 
diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index f749e57b432..363288708d4 100644
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -146,7 +146,7 @@ CREATE TABLE llx_ecm_files
   cover             text,                           -- is this file a file to use for a cover
   extraparams		varchar(255),					-- for stock other parameters with json format
   date_c			datetime,
-  date_m			timestamp,
+  date_m			timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_c			integer,
   fk_user_m			integer,
   acl				text							-- for future permission 'per file'
@@ -227,7 +227,7 @@ CREATE TABLE IF NOT EXISTS llx_establishment (
   fk_user_author 	integer NOT NULL,
   fk_user_mod		integer NOT NULL,
   datec				datetime NOT NULL,
-  tms				timestamp NOT NULL,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   status            smallint DEFAULT 1
 ) ENGINE=InnoDB;
 
@@ -236,7 +236,7 @@ CREATE TABLE IF NOT EXISTS llx_user_rib (
   fk_user        integer      NOT NULL,
   entity         integer DEFAULT 1 NOT NULL,	-- multi company id
   datec          datetime,
-  tms            timestamp,
+  tms            timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   label          varchar(30),
   bank           varchar(255),  -- bank name
   code_banque    varchar(128),  -- bank code
@@ -263,7 +263,7 @@ create table llx_stock_lotserial
   eatby           date DEFAULT NULL,			-- Eatby date
   sellby          date DEFAULT NULL, 			-- Sellby date
   datec         datetime,
-  tms           timestamp,
+  tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat integer,
   fk_user_modif integer,
   import_key    integer  
@@ -282,7 +282,7 @@ create table llx_budget
   date_start	date,
   date_end		date,
   datec         datetime,
-  tms           timestamp,
+  tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat integer,
   fk_user_modif integer,
   import_key    integer  
@@ -296,7 +296,7 @@ create table llx_budget_lines
   fk_project_ids	varchar(255) NOT NULL,		-- List of project ids related to this budget. If budget is dedicated to projects not yet started, we recommand to create a project 'Projects to come'.
   amount		double(24,8) NOT NULL,
   datec         datetime,
-  tms           timestamp,
+  tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat integer,
   fk_user_modif integer,
   import_key    integer  
@@ -369,7 +369,7 @@ create table llx_categorie_project
 create table llx_expedition_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -379,7 +379,7 @@ ALTER TABLE llx_expedition_extrafields ADD INDEX idx_expedition_extrafields (fk_
 create table llx_expeditiondet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
@@ -392,7 +392,7 @@ ALTER TABLE llx_expeditiondet_extrafields ADD INDEX idx_expeditiondet_extrafield
 create table llx_livraison_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -402,7 +402,7 @@ ALTER TABLE llx_livraison_extrafields ADD INDEX idx_livraison_extrafields (fk_ob
 create table llx_livraisondet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
@@ -595,7 +595,7 @@ insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays
 
 ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN doc_ref varchar(300) NOT NULL;
 
-ALTER TABLE llx_holiday ADD COLUMN tms timestamp;
+ALTER TABLE llx_holiday ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 ALTER TABLE llx_holiday ADD COLUMN entity integer DEFAULT 1 NOT NULL;
 ALTER TABLE llx_holiday ADD INDEX idx_holiday_entity (entity);
 
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 6ec4fc35f92..6bf230df12a 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -54,7 +54,7 @@ CREATE TABLE llx_product_lot (
   eatby           date DEFAULT NULL,			-- Eatby date
   sellby          date DEFAULT NULL, 			-- Sellby date
   datec         datetime,
-  tms           timestamp,
+  tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat integer,
   fk_user_modif integer,
   import_key    integer
@@ -140,7 +140,7 @@ CREATE TABLE llx_website
 	fk_default_home integer,
     date_creation     datetime,
     date_modification datetime,
-	tms           timestamp
+	tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=innodb;
 ALTER TABLE llx_website ADD COLUMN fk_default_home integer;
 ALTER TABLE llx_website CHANGE COLUMN shortname ref varchar(24) NOT NULL;
@@ -158,7 +158,7 @@ CREATE TABLE llx_website_page
     status        integer,
     date_creation     datetime,
     date_modification datetime,
-	tms           timestamp
+	tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=innodb;
 
 ALTER TABLE llx_website_page ADD UNIQUE INDEX uk_website_page_url (fk_website,pageurl);
@@ -475,7 +475,7 @@ CREATE TABLE llx_advtargetemailing
   fk_user_author integer NOT NULL,
   datec datetime NOT NULL,
   fk_user_mod integer NOT NULL,
-  tms timestamp NOT NULL
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=InnoDB;
 
 ALTER TABLE llx_advtargetemailing ADD UNIQUE INDEX uk_advtargetemailing_name (name);
diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
index 175e03ec179..7578c633be4 100644
--- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
+++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
@@ -114,7 +114,7 @@ ALTER TABLE llx_societe_remise ADD COLUMN entity	integer DEFAULT 1 NOT NULL afte
 create table llx_expensereport_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -133,7 +133,7 @@ UPDATE llx_adherent_type SET subscription = '1' WHERE subscription = 'yes';
 CREATE TABLE llx_product_lot_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -145,7 +145,7 @@ ALTER TABLE llx_website_page MODIFY COLUMN content MEDIUMTEXT;
 CREATE TABLE llx_product_warehouse_properties
 (
   rowid           		integer AUTO_INCREMENT PRIMARY KEY,
-  tms             		timestamp,
+  tms             		timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product      		integer NOT NULL,
   fk_entrepot     		integer NOT NULL,
   seuil_stock_alerte    integer DEFAULT 0,
@@ -156,7 +156,7 @@ CREATE TABLE llx_product_warehouse_properties
 ALTER TABLE llx_accounting_bookkeeping ADD COLUMN entity integer DEFAULT 1 NOT NULL;
 ALTER TABLE llx_accounting_bookkeeping ADD COLUMN fk_user_modif     integer;
 ALTER TABLE llx_accounting_bookkeeping ADD COLUMN date_creation		datetime;
-ALTER TABLE llx_accounting_bookkeeping ADD COLUMN tms               timestamp;
+ALTER TABLE llx_accounting_bookkeeping ADD COLUMN tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 -- VMYSQL4.3 ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN numero_compte varchar(32) NOT NULL;
 -- VMYSQL4.3 ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN code_journal varchar(32) NOT NULL;
 -- VPGSQL8.2 ALTER TABLE llx_accounting_bookkeeping ALTER COLUMN numero_compte SET NOT NULL;
@@ -186,7 +186,7 @@ ALTER TABLE llx_entrepot ADD COLUMN fk_parent integer DEFAULT 0;
 create table llx_resource_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -222,7 +222,7 @@ create table llx_user_employment
   ref_ext			varchar(50),				-- reference into an external system (not used by dolibarr)
   fk_user			integer,
   datec             datetime,
-  tms               timestamp,
+  tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat     integer,
   fk_user_modif     integer,
   job				varchar(128),				-- job position. may be a dictionary
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index b53b25f93b1..87eda0668b1 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -61,7 +61,7 @@ ALTER TABLE llx_supplier_proposaldet CHANGE COLUMN fk_askpricesupplier fk_suppli
 -- VMYSQL4.3 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN date_fin DATETIME NULL DEFAULT NULL;
 -- VPGSQL8.2 ALTER TABLE llx_opensurvey_sondage ALTER COLUMN date_fin DROP NOT NULL;
 
--- VMYSQL4.1 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP;
+-- VMYSQL4.1 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN fk_user_creat integer NOT NULL DEFAULT 0;
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN status integer DEFAULT 1 after date_fin;
@@ -160,7 +160,7 @@ ALTER TABLE llx_projet ADD COLUMN fk_user_modif integer;
 ALTER TABLE llx_projet_task ADD COLUMN fk_user_modif integer;
 
 ALTER TABLE llx_projet_task_time ADD COLUMN datec date;
-ALTER TABLE llx_projet_task_time ADD COLUMN tms timestamp;
+ALTER TABLE llx_projet_task_time ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
 ALTER TABLE llx_product_price ADD COLUMN fk_multicurrency integer;
 ALTER TABLE llx_product_price ADD COLUMN multicurrency_code	varchar(255);
@@ -171,12 +171,12 @@ ALTER TABLE llx_product_price ADD COLUMN multicurrency_price_ttc double(24,8) DE
 ALTER TABLE llx_product_price_by_qty ADD COLUMN fk_user_creat integer;
 ALTER TABLE llx_product_price_by_qty ADD COLUMN fk_user_modif integer;
 ALTER TABLE llx_product_price_by_qty DROP COLUMN date_price;
-ALTER TABLE llx_product_price_by_qty ADD COLUMN tms timestamp;
+ALTER TABLE llx_product_price_by_qty ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 ALTER TABLE llx_product_price_by_qty ADD COLUMN import_key varchar(14);
 
 ALTER TABLE llx_user ADD COLUMN import_key varchar(14);
 
-ALTER TABLE llx_facture_rec ADD COLUMN tms timestamp;
+ALTER TABLE llx_facture_rec ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 UPDATE llx_facture_rec SET tms = datec where tms < '2000-01-01';
 
 CREATE TABLE llx_product_attribute
@@ -295,7 +295,7 @@ CREATE TABLE llx_accounting_bookkeeping_tmp
   fk_user_author        integer NOT NULL,			-- 					| user creating
   fk_user_modif         integer,					-- 					| user making last change
   date_creation         datetime,					-- FEC:EcritureDate	| creation date
-  tms                   timestamp,					--					| date last modification 
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,					--					| date last modification 
   import_key            varchar(14),
   code_journal          varchar(32) NOT NULL,		-- FEC:JournalCode
   journal_label         varchar(255),				-- FEC:JournalLib
@@ -391,7 +391,7 @@ ALTER TABLE llx_contratdet ADD COLUMN vat_src_code varchar(10) DEFAULT '';
 CREATE TABLE llx_payment_various
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  tms                   timestamp,
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec                 datetime,
   datep                 date,
   datev                 date,
@@ -438,7 +438,7 @@ rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
 entity integer DEFAULT 0, 
 ref varchar(48),
 datec datetime DEFAULT NULL,
-tms timestamp, 
+tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 fk_user_author	integer,
 fk_user_modif     integer,
 fk_user_valid		integer,
@@ -453,7 +453,7 @@ CREATE TABLE llx_inventorydet
 ( 
 rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
 datec datetime DEFAULT NULL,
-tms timestamp, 
+tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 fk_inventory integer DEFAULT 0, 
 fk_warehouse integer DEFAULT 0,
 fk_product integer DEFAULT 0,  
@@ -467,7 +467,7 @@ new_pmp double DEFAULT 0
 )ENGINE=InnoDB;
 
 ALTER TABLE llx_inventory ADD COLUMN datec datetime DEFAULT NULL;
-ALTER TABLE llx_inventory ADD COLUMN tms timestamp;
+ALTER TABLE llx_inventory ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
 ALTER TABLE llx_inventory ADD INDEX idx_inventory_tms (tms);
 ALTER TABLE llx_inventory ADD INDEX idx_inventory_datec (datec);
@@ -502,7 +502,7 @@ CREATE TABLE llx_loan_schedule
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   fk_loan			integer,
   datec				datetime,         
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep				datetime,         
   amount_capital	real DEFAULT 0,
   amount_insurance	real DEFAULT 0,
@@ -547,7 +547,7 @@ CREATE TABLE llx_website_page
     fk_user_create integer,
     fk_user_modif  integer,
     date_creation  datetime,
-	tms            timestamp
+	tms            timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=innodb;
 
 ALTER TABLE llx_website_page ADD UNIQUE INDEX uk_website_page_url (fk_website,pageurl);
@@ -566,7 +566,7 @@ UPDATE llx_extrafields set elementtype='categorie' where elementtype='categories
 CREATE TABLE llx_blockedlog 
 ( 
 	rowid integer AUTO_INCREMENT PRIMARY KEY, 
-	tms	timestamp,
+	tms	timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	action varchar(50), 
 	amounts real NOT NULL, 
 	signature varchar(100) NOT NULL, 
@@ -593,7 +593,7 @@ CREATE TABLE llx_blockedlog_authority
 	rowid integer AUTO_INCREMENT PRIMARY KEY, 
 	blockchain longtext NOT NULL,
 	signature varchar(100) NOT NULL,
-	tms timestamp
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=innodb;
 
 ALTER TABLE llx_blockedlog_authority ADD INDEX signature (signature);
@@ -613,7 +613,7 @@ ALTER TABLE llx_mailing_cibles MODIFY COLUMN source_url varchar(255);
 CREATE TABLE llx_facture_rec_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)
 ) ENGINE=innodb;
@@ -623,7 +623,7 @@ ALTER TABLE llx_facture_rec_extrafields ADD INDEX idx_facture_rec_extrafields (f
 CREATE TABLE llx_facturedet_rec_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,
   import_key       varchar(14)
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
index ff6a1fe03fb..93a7a447c18 100644
--- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
+++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
@@ -265,7 +265,7 @@ ALTER TABLE llx_menu MODIFY fk_leftmenu varchar(100);
 CREATE TABLE llx_website_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -285,7 +285,7 @@ CREATE TABLE llx_website_account(
     date_last_login     datetime,
     date_previous_login datetime,
 	date_creation       datetime NOT NULL, 
-	tms                 timestamp, 
+	tms                 timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat       integer NOT NULL, 
 	fk_user_modif       integer, 
 	import_key          varchar(14), 
@@ -307,7 +307,7 @@ ALTER TABLE llx_website_account ADD CONSTRAINT llx_website_account_fk_website FO
 CREATE TABLE llx_website_account_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -326,7 +326,7 @@ alter table llx_user add column pass_encoding varchar(24) NULL;
 CREATE TABLE IF NOT EXISTS llx_expensereport_ik (
     rowid           integer  AUTO_INCREMENT PRIMARY KEY,
     datec           datetime  DEFAULT NULL,
-    tms             timestamp,
+    tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     fk_c_exp_tax_cat integer DEFAULT 0 NOT NULL,
     fk_range        integer DEFAULT 0 NOT NULL,
     coef            double DEFAULT 0 NOT NULL,
@@ -441,7 +441,7 @@ INSERT INTO llx_c_exp_tax_range (rowid,fk_c_exp_tax_cat,range_ik, entity, active
 CREATE TABLE llx_expensereport_rules (
     rowid integer AUTO_INCREMENT PRIMARY KEY,
     datec datetime  DEFAULT NULL,
-    tms timestamp,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     dates datetime NOT NULL,
     datee datetime NOT NULL,
     amount numeric(24,8) NOT NULL,
@@ -464,7 +464,7 @@ ALTER TABLE llx_extrafields ADD COLUMN fk_user_author integer;
 ALTER TABLE llx_extrafields ADD COLUMN fk_user_modif integer;
 ALTER TABLE llx_extrafields ADD COLUMN datec datetime;
 ALTER TABLE llx_extrafields ADD COLUMN enabled varchar(255) DEFAULT '1';
-ALTER TABLE llx_extrafields ADD COLUMN tms timestamp;
+ALTER TABLE llx_extrafields ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
 -- We fix value of 'list' from 0 to 1 for all extrafields created before this migration
 --VMYSQL4.1 UPDATE llx_extrafields SET list = 1 WHERE list = 0 AND fk_user_author IS NULL and fk_user_modif IS NULL and datec IS NULL;		
@@ -528,7 +528,7 @@ DROP TABLE llx_projet_task_comment;
 CREATE TABLE llx_comment (
     rowid integer AUTO_INCREMENT PRIMARY KEY,
     datec datetime  DEFAULT NULL,
-    tms timestamp,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     description text NOT NULL,
     fk_user_author integer DEFAULT NULL,
     fk_element integer DEFAULT NULL,
@@ -572,7 +572,7 @@ create table llx_c_email_senderprofile
   entity		  integer DEFAULT 1 NOT NULL,	  -- multi company id
   private         smallint DEFAULT 0 NOT NULL,    -- Template public or private
   date_creation   datetime,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   label           varchar(255),					  -- Label of predefined email
   email           varchar(255),					  -- Email
   signature		  text,                           -- Predefined signature
@@ -655,7 +655,7 @@ create table llx_onlinesignature
   object_type               varchar(32) NOT NULL,
   object_id					integer NOT NULL,
   datec                     datetime NOT NULL,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   name						varchar(255) NOT NULL,
   ip						varchar(128),
   pathoffile				varchar(255)
@@ -709,7 +709,7 @@ ALTER TABLE llx_resource ADD CONSTRAINT fk_resource_fk_country FOREIGN KEY (fk_c
 create table llx_facture_rec_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/7.0.0-8.0.0.sql b/htdocs/install/mysql/migration/7.0.0-8.0.0.sql
index 380c64c28fc..888f4fefdd0 100644
--- a/htdocs/install/mysql/migration/7.0.0-8.0.0.sql
+++ b/htdocs/install/mysql/migration/7.0.0-8.0.0.sql
@@ -149,7 +149,7 @@ CREATE TABLE llx_societe_remise_supplier
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   entity			integer DEFAULT 1 NOT NULL,			-- multi company id
   fk_soc			integer NOT NULL,
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec				datetime,							-- creation date
   fk_user_author	integer,							-- creation user
   remise_supplier	double(6,3)  DEFAULT 0 NOT NULL,	-- discount
@@ -246,7 +246,7 @@ CREATE TABLE llx_ticket
 	date_read datetime,
 	date_close datetime,
 	notify_tiers_at_create tinyint,
-	tms timestamp
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=innodb;
 
 ALTER TABLE llx_ticket ADD COLUMN notify_tiers_at_create integer;
@@ -271,7 +271,7 @@ ALTER TABLE llx_ticket_msg ADD CONSTRAINT fk_ticket_msg_fk_track_id FOREIGN KEY
 CREATE TABLE llx_ticket_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    
   import_key       varchar(14)
 )ENGINE=innodb;
@@ -279,7 +279,7 @@ CREATE TABLE llx_ticket_extrafields
 create table llx_facture_rec_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)
 ) ENGINE=innodb;
@@ -371,7 +371,7 @@ CREATE TABLE llx_societe_account(
     date_last_login   datetime,
     date_previous_login datetime,
 	date_creation datetime NOT NULL, 
-	tms timestamp NOT NULL, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
 	import_key varchar(14), 
@@ -433,7 +433,7 @@ CREATE TABLE llx_asset(
 	note_public text,
 	note_private text,
 	date_creation datetime NOT NULL,
-	tms timestamp NOT NULL,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_creat integer NOT NULL,
 	fk_user_modif integer,
 	import_key varchar(14),
@@ -449,7 +449,7 @@ ALTER TABLE llx_asset ADD INDEX idx_asset_fk_asset_type (fk_asset_type);
 create table llx_asset_extrafields
 (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object integer NOT NULL,
   import_key varchar(14)
 ) ENGINE=innodb;
@@ -458,7 +458,7 @@ create table llx_asset_type
 (
   rowid                                 integer AUTO_INCREMENT PRIMARY KEY,
   entity                                integer DEFAULT 1 NOT NULL,	-- multi company id
-  tms                                   timestamp,
+  tms                                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   label                                 varchar(50) NOT NULL,
   accountancy_code_asset                varchar(32),
   accountancy_code_depreciation_asset   varchar(32),
@@ -473,7 +473,7 @@ ALTER TABLE llx_asset ADD CONSTRAINT fk_asset_asset_type FOREIGN KEY (fk_asset_t
 create table llx_asset_type_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
index b7fe131c3f9..36a15d5b85d 100644
--- a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
+++ b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
@@ -43,7 +43,7 @@ ALTER TABLE llx_facture ADD COLUMN pos_source varchar(32);
 create table llx_facture_rec_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)
 ) ENGINE=innodb;
@@ -182,7 +182,7 @@ CREATE TABLE llx_emailcollector_emailcollector(
         note_public text,
         note_private text,
         date_creation datetime NOT NULL,
-        tms timestamp NOT NULL,
+        tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
         fk_user_creat integer NOT NULL,
         fk_user_modif integer,
         import_key varchar(14),
@@ -202,7 +202,7 @@ CREATE TABLE llx_emailcollector_emailcollectorfilter(
 	type varchar(128) NOT NULL,
 	rulevalue varchar(128) NULL,
 	date_creation datetime NOT NULL,
-	tms timestamp NOT NULL,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_creat integer NOT NULL,
 	fk_user_modif integer,
 	import_key varchar(14),
@@ -217,7 +217,7 @@ CREATE TABLE llx_emailcollector_emailcollectoraction(
 	type varchar(128) NOT NULL,
 	actionparam varchar(255) NULL,
 	date_creation datetime NOT NULL,
-	tms timestamp NOT NULL,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_creat integer NOT NULL,
 	fk_user_modif integer,
 	position integer DEFAULT 0,
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 a56cb45e4fe..b9a406515ec 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
@@ -87,7 +87,7 @@ create table llx_mailing_unsubscribe
   unsubscribegroup	varchar(128) DEFAULT '',
   ip				varchar(128),
   date_creat		datetime,                            -- creation date
-  tms               timestamp
+  tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=innodb;
 
 ALTER TABLE llx_mailing_unsubscribe ADD UNIQUE uk_mailing_unsubscribe(email, entity, unsubscribegroup);
@@ -223,7 +223,7 @@ CREATE TABLE llx_bom_bom(
 	qty double(24,8),
 	efficiency double(8,4),
 	date_creation datetime NOT NULL,
-	tms timestamp,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	date_valid datetime, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
@@ -240,7 +240,7 @@ ALTER TABLE llx_bom_bom ADD COLUMN date_valid datetime;
 create table llx_bom_bom_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -266,7 +266,7 @@ ALTER TABLE llx_bom_bomline ADD COLUMN position integer NOT NULL;
 create table llx_bom_bomline_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -335,7 +335,7 @@ UPDATE llx_c_shipment_mode SET label = 'https://www.laposte.fr/outils/suivre-vos
 create table llx_reception
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  tms                   timestamp,
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   ref                   varchar(30)        NOT NULL,
   entity                integer  DEFAULT 1 NOT NULL,	-- multi company id
   fk_soc                integer            NOT NULL,
@@ -383,7 +383,7 @@ ALTER TABLE llx_reception ADD INDEX idx_reception_fk_shipping_method (fk_shippin
 create table llx_reception_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index aa5ab65d3ff..033db4620d1 100644
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -91,8 +91,8 @@ delete from llx_commandedet where fk_commande in (select rowid from llx_commande
 delete from llx_commande where ref = '';
 delete from llx_propaldet where fk_propal in (select rowid from llx_propal where ref = '');
 delete from llx_propal where ref = '';
-delete from llx_livraisondet where fk_livraison in (select rowid from llx_livraison where ref = '');
-delete from llx_livraison where ref = '';
+delete from llx_deliverydet where fk_delivery in (select rowid from llx_delivery where ref = '');
+delete from llx_delivery where ref = '';
 delete from llx_expeditiondet where fk_expedition in (select rowid from llx_expedition where ref = '');
 delete from llx_expedition where ref = '';
 delete from llx_holiday_logs where fk_user_update not IN (select rowid from llx_user);
@@ -185,10 +185,11 @@ delete from llx_categorie_project where fk_categorie not in (select rowid from l
 
 -- Fix: delete orphelins in ecm_files
 delete from llx_ecm_files where src_object_type = 'expensereport' and src_object_id NOT IN (select rowid from llx_expensereport);
+delete from llx_ecm_files where (src_object_type = 'contrat' OR src_object_type = 'contract') and src_object_id NOT IN (select rowid from llx_contrat);
 
 -- Fix: delete orphelin deliveries. Note: deliveries are linked to shipment by llx_element_element only. No other links.
-delete from llx_livraisondet where fk_livraison not in (select fk_target from llx_element_element where targettype = 'delivery') AND fk_livraison not in (select fk_source from llx_element_element where sourcetype = 'delivery');
-delete from llx_livraison    where rowid not in (select fk_target from llx_element_element where targettype = 'delivery') AND rowid not in (select fk_source from llx_element_element where sourcetype = 'delivery');
+delete from llx_deliverydet where fk_delivery not in (select fk_target from llx_element_element where targettype = 'delivery') AND fk_delivery not in (select fk_source from llx_element_element where sourcetype = 'delivery');
+delete from llx_delivery    where rowid not in (select fk_target from llx_element_element where targettype = 'delivery') AND rowid not in (select fk_source from llx_element_element where sourcetype = 'delivery');
 
 
 -- Fix delete element_element orphelins (right side)
@@ -383,6 +384,7 @@ delete from llx_commande_fournisseur_dispatch where fk_commandefourndet = 0 or f
 delete from llx_menu where menu_handler = 'smartphone';
 
 update llx_expedition set date_valid = date_creation where fk_statut = 1 and date_valid IS NULL;
+update llx_expedition set date_valid = NOW() where fk_statut = 1 and date_valid IS NULL;
 
 -- Detect bad consistency between duraction_effective of a task and sum of time of tasks
 -- select pt.rowid, pt.duration_effective, SUM(ptt.task_duration) as y from llx_projet_task as pt, llx_projet_task_time as ptt where ptt.fk_task = pt.rowid group by pt.rowid, pt.duration_effective having pt.duration_effective <> y;
@@ -468,6 +470,14 @@ UPDATE llx_chargesociales SET date_creation = tms WHERE date_creation IS NULL;
 -- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
 -- VMYSQL4.1 update llx_facture_fourn set date_lim_reglement = null where DATE(STR_TO_DATE(date_lim_reglement, '%Y-%m-%d')) IS NULL;
 
+-- VMYSQL4.1 SET sql_mode = 'ALLOW_INVALID_DATES';
+-- VMYSQL4.1 update llx_inventory set date_cre = null where DATE(STR_TO_DATE(date_cre, '%Y-%m-%d')) IS NULL;
+-- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
+-- VMYSQL4.1 update llx_inventory set date_cre = null where DATE(STR_TO_DATE(date_cre, '%Y-%m-%d')) IS NULL;
+
+-- Note that you can manually set the default value of a date to CURRENT_TIMESTAMP with:
+--ALTER TABLE llx_table modify column columnname datetime DEFAULT CURRENT_TIMESTAMP;
+
 
 -- Backport a change of value into the hourly rate. 
 -- update llx_projet_task_time as ptt set ptt.thm = (SELECT thm from llx_user as u where ptt.fk_user = u.rowid) where (ptt.thm is null)
diff --git a/htdocs/install/mysql/tables/llx_accounting_account.sql b/htdocs/install/mysql/tables/llx_accounting_account.sql
index 7af83585c7f..893cb19d9ab 100644
--- a/htdocs/install/mysql/tables/llx_accounting_account.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_account.sql
@@ -24,7 +24,7 @@ create table llx_accounting_account
   rowid                     bigint AUTO_INCREMENT PRIMARY KEY,
   entity                    integer DEFAULT 1 NOT NULL,
   datec                     datetime,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_pcg_version            varchar(32)  NOT NULL,			  -- Chart system
   pcg_type                  varchar(20)  NOT NULL,			  -- First part of Key for predefined groups
   account_number            varchar(32)  NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
index cf1c3334092..23e7d489e09 100644
--- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
@@ -45,7 +45,7 @@ CREATE TABLE llx_accounting_bookkeeping
   fk_user_author        integer NOT NULL,			-- 					| user creating
   fk_user_modif         integer,					-- 					| user making last change
   date_creation         datetime,					-- FEC:EcritureDate	| creation date
-  tms                   timestamp,					--					| date last modification
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,					--					| last modification date
   fk_user               integer NULL,               -- The id of user that validate the accounting source document
   code_journal          varchar(32) NOT NULL,		-- FEC:JournalCode
   journal_label         varchar(255),				-- FEC:JournalLib
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql
index cbf387b9b70..2b8277c70bd 100644
--- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql
@@ -44,7 +44,7 @@ CREATE TABLE llx_accounting_bookkeeping_tmp
   fk_user_author        integer NOT NULL,			-- 					| user creating
   fk_user_modif         integer,					-- 					| user making last change
   date_creation         datetime,					-- FEC:EcritureDate	| creation date
-  tms                   timestamp,					--					| date last modification
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,					--					| last modification date
   fk_user               integer NULL,				-- The id of user that validate the accounting source document
   code_journal          varchar(32) NOT NULL,		-- FEC:JournalCode
   journal_label         varchar(255),				-- FEC:JournalLib
diff --git a/htdocs/install/mysql/tables/llx_accounting_fiscalyear.sql b/htdocs/install/mysql/tables/llx_accounting_fiscalyear.sql
index 90590fb427d..17e9d9dccfb 100644
--- a/htdocs/install/mysql/tables/llx_accounting_fiscalyear.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_fiscalyear.sql
@@ -25,7 +25,7 @@ create table llx_accounting_fiscalyear
 	statut			tinyint DEFAULT 0 NOT NULL,
 	entity			integer DEFAULT 1 NOT NULL,	  -- multi company id
 	datec			datetime NOT NULL,
-	tms				timestamp,
+	tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_author	integer DEFAULT NULL,
 	fk_user_modif	integer DEFAULT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql
index 857e6270b90..82d97d3ec98 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm.sql
@@ -33,7 +33,7 @@ create table llx_actioncomm
   code				varchar(50) NULL,				-- code of action for automatic action ('AC_OTH_AUTO' for automatic actions, 'AC_EMAILIN_AUTO' for email input, 'AC_xxx' for manual action...) 
   
   datec				datetime,						-- date creation
-  tms				timestamp,						-- date modification
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,						-- last modification date
   fk_user_author	integer,						-- user id of user that has created record
   fk_user_mod		integer,						-- user id of user that has modified record
 
diff --git a/htdocs/install/mysql/tables/llx_actioncomm_extrafields.sql b/htdocs/install/mysql/tables/llx_actioncomm_extrafields.sql
index c820feac430..95a415116ab 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_actioncomm_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_actioncomm_reminder.sql b/htdocs/install/mysql/tables/llx_actioncomm_reminder.sql
index 78dd00d6ea5..bc09c2e80dc 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm_reminder.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm_reminder.sql
@@ -23,6 +23,7 @@ CREATE TABLE llx_actioncomm_reminder(
 	offsetvalue integer NOT NULL, 
 	offsetunit varchar(1) NOT NULL,
 	status integer NOT NULL DEFAULT 0,
+	lasterror varchar(128) NULL,
 	entity integer NOT NULL DEFAULT 1,
 	fk_actioncomm integer NOT NULL,
 	fk_email_template integer
diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql
index 1917e80c81a..6b5490b282d 100644
--- a/htdocs/install/mysql/tables/llx_adherent.sql
+++ b/htdocs/install/mysql/tables/llx_adherent.sql
@@ -72,7 +72,7 @@ create table llx_adherent
   model_pdf		   varchar(255),
   datevalid        datetime,  -- date de validation
   datec            datetime,  -- date de creation
-  tms              timestamp, -- date de modification
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, -- last modification date
   fk_user_author   integer,   -- can be null because member can be create by a guest
   fk_user_mod      integer,
   fk_user_valid    integer,
diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql
index 50f47c7954b..6b67944a321 100644
--- a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql
@@ -21,7 +21,7 @@
 create table llx_adherent_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- member id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_adherent_type.sql b/htdocs/install/mysql/tables/llx_adherent_type.sql
index 7e9270b89dc..bdce18ef0bc 100644
--- a/htdocs/install/mysql/tables/llx_adherent_type.sql
+++ b/htdocs/install/mysql/tables/llx_adherent_type.sql
@@ -26,7 +26,7 @@ create table llx_adherent_type
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
   entity           integer DEFAULT 1 NOT NULL,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   statut           smallint NOT NULL DEFAULT 0,
   libelle          varchar(50) NOT NULL,
   morphy           varchar(3) NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_adherent_type_extrafields.sql b/htdocs/install/mysql/tables/llx_adherent_type_extrafields.sql
index 2950147730b..d13056a2894 100644
--- a/htdocs/install/mysql/tables/llx_adherent_type_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_adherent_type_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_adherent_type_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_advtargetemailing.sql b/htdocs/install/mysql/tables/llx_advtargetemailing.sql
index 22d49768887..34bd7eb53bf 100644
--- a/htdocs/install/mysql/tables/llx_advtargetemailing.sql
+++ b/htdocs/install/mysql/tables/llx_advtargetemailing.sql
@@ -28,5 +28,5 @@ CREATE TABLE llx_advtargetemailing
   fk_user_author integer NOT NULL,
   datec datetime NOT NULL,
   fk_user_mod integer NOT NULL,
-  tms timestamp NOT NULL
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_asset.sql b/htdocs/install/mysql/tables/llx_asset.sql
index b5bb1d1bfe2..52eeda3ba58 100644
--- a/htdocs/install/mysql/tables/llx_asset.sql
+++ b/htdocs/install/mysql/tables/llx_asset.sql
@@ -26,7 +26,7 @@ CREATE TABLE llx_asset(
 	note_public text,
 	note_private text,
 	date_creation datetime NOT NULL,
-	tms timestamp,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_creat integer NOT NULL,
 	fk_user_modif integer,
 	import_key varchar(14),
diff --git a/htdocs/install/mysql/tables/llx_asset_extrafields.sql b/htdocs/install/mysql/tables/llx_asset_extrafields.sql
index 364f0e3d08f..c93fac7b20a 100644
--- a/htdocs/install/mysql/tables/llx_asset_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_asset_extrafields.sql
@@ -16,7 +16,7 @@
 create table llx_asset_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_asset_type.sql b/htdocs/install/mysql/tables/llx_asset_type.sql
index bd1c300d087..1205acb959b 100644
--- a/htdocs/install/mysql/tables/llx_asset_type.sql
+++ b/htdocs/install/mysql/tables/llx_asset_type.sql
@@ -17,7 +17,7 @@ create table llx_asset_type
 (
   rowid                                 integer AUTO_INCREMENT PRIMARY KEY,
   entity                                integer DEFAULT 1 NOT NULL,	-- multi company id
-  tms                                   timestamp,
+  tms                                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   label                                 varchar(50) NOT NULL,
   accountancy_code_asset                varchar(32),
   accountancy_code_depreciation_asset   varchar(32),
diff --git a/htdocs/install/mysql/tables/llx_asset_type_extrafields.sql b/htdocs/install/mysql/tables/llx_asset_type_extrafields.sql
index 59ebe94c7d8..7ff09176216 100644
--- a/htdocs/install/mysql/tables/llx_asset_type_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_asset_type_extrafields.sql
@@ -16,7 +16,7 @@
 create table llx_asset_type_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql
index 8dfdba27baa..0e1dbc403da 100644
--- a/htdocs/install/mysql/tables/llx_bank.sql
+++ b/htdocs/install/mysql/tables/llx_bank.sql
@@ -21,7 +21,7 @@ create table llx_bank
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   datec           datetime,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datev           date,                      -- date de valeur
   dateo           date,                      -- date operation
   amount          double(24,8) NOT NULL default 0,
diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql
index 28a1a0baf34..4ac90dd961d 100644
--- a/htdocs/install/mysql/tables/llx_bank_account.sql
+++ b/htdocs/install/mysql/tables/llx_bank_account.sql
@@ -26,7 +26,7 @@ create table llx_bank_account
 (
   rowid						integer AUTO_INCREMENT PRIMARY KEY,
   datec						datetime,
-  tms						timestamp,
+  tms						timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   ref						varchar(12) NOT NULL,
   label						varchar(30) NOT NULL,
   entity					integer DEFAULT 1 NOT NULL,	-- multi company id
diff --git a/htdocs/install/mysql/tables/llx_bank_account_extrafields.sql b/htdocs/install/mysql/tables/llx_bank_account_extrafields.sql
index 5d9d8847154..a30e81ab96c 100644
--- a/htdocs/install/mysql/tables/llx_bank_account_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_bank_account_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_bank_account_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_blockedlog.sql b/htdocs/install/mysql/tables/llx_blockedlog.sql
index 889b28d7a73..f8145718ea6 100644
--- a/htdocs/install/mysql/tables/llx_blockedlog.sql
+++ b/htdocs/install/mysql/tables/llx_blockedlog.sql
@@ -21,7 +21,7 @@ CREATE TABLE llx_blockedlog
 	rowid integer AUTO_INCREMENT PRIMARY KEY, 
 	entity integer DEFAULT 1 NOT NULL, 
 	date_creation	datetime,
-	tms timestamp,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	action varchar(50), 
 	amounts double(24,8) NOT NULL, 
 	element varchar(50), 
diff --git a/htdocs/install/mysql/tables/llx_blockedlog_authority.sql b/htdocs/install/mysql/tables/llx_blockedlog_authority.sql
index 9e7dae8f23c..eb491f93af4 100644
--- a/htdocs/install/mysql/tables/llx_blockedlog_authority.sql
+++ b/htdocs/install/mysql/tables/llx_blockedlog_authority.sql
@@ -3,5 +3,5 @@ CREATE TABLE llx_blockedlog_authority
 	rowid integer AUTO_INCREMENT PRIMARY KEY, 
 	blockchain longtext NOT NULL,
 	signature varchar(100) NOT NULL,
-	tms timestamp
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_bom_bom.sql b/htdocs/install/mysql/tables/llx_bom_bom.sql
index 45c5fce3485..01ec2e63a3e 100644
--- a/htdocs/install/mysql/tables/llx_bom_bom.sql
+++ b/htdocs/install/mysql/tables/llx_bom_bom.sql
@@ -31,7 +31,7 @@ CREATE TABLE llx_bom_bom(
 	duration double(24,8) DEFAULT NULL,
 	date_creation datetime NOT NULL,
 	date_valid datetime,
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL,
 	fk_user_modif integer, 
 	fk_user_valid integer, 
diff --git a/htdocs/install/mysql/tables/llx_bom_bom_extrafields.sql b/htdocs/install/mysql/tables/llx_bom_bom_extrafields.sql
index 10c44459a8b..15210546fda 100644
--- a/htdocs/install/mysql/tables/llx_bom_bom_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_bom_bom_extrafields.sql
@@ -16,7 +16,7 @@
 create table llx_bom_bom_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_bom_bomline_extrafields.sql b/htdocs/install/mysql/tables/llx_bom_bomline_extrafields.sql
index 1b468da3a22..8ed3e96bd11 100644
--- a/htdocs/install/mysql/tables/llx_bom_bomline_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_bom_bomline_extrafields.sql
@@ -16,7 +16,7 @@
 create table llx_bom_bomline_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql
index 3050b831eec..9b1d6e24ad4 100644
--- a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql
+++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql
@@ -33,7 +33,7 @@ create table llx_bordereau_cheque
   fk_bank_account   integer,
   fk_user_author    integer,
   statut            smallint NOT NULL DEFAULT 0,
-  tms               timestamp,
+  tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   note              text,
   entity            integer DEFAULT 1 NOT NULL			-- multi company id
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_boxes_def.sql b/htdocs/install/mysql/tables/llx_boxes_def.sql
index 285bbc22603..fbdf0e3ed36 100644
--- a/htdocs/install/mysql/tables/llx_boxes_def.sql
+++ b/htdocs/install/mysql/tables/llx_boxes_def.sql
@@ -23,6 +23,6 @@ create table llx_boxes_def
   rowid       integer AUTO_INCREMENT PRIMARY KEY,
   file        varchar(200) NOT NULL,        -- Do not increase this as file+note must be small to allow index
   entity      integer DEFAULT 1 NOT NULL,	-- multi company id
-  tms         timestamp,  
+  tms         timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,  
   note        varchar(130)                  -- Do not increase this as file+note must be small to allow index
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_budget.sql b/htdocs/install/mysql/tables/llx_budget.sql
index d67e65e8f2b..ab9ed79a64a 100644
--- a/htdocs/install/mysql/tables/llx_budget.sql
+++ b/htdocs/install/mysql/tables/llx_budget.sql
@@ -26,7 +26,7 @@ create table llx_budget
   date_start	date,
   date_end		date,
   datec         datetime,
-  tms           timestamp,
+  tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat integer,
   fk_user_modif integer,
   import_key    integer  
diff --git a/htdocs/install/mysql/tables/llx_budget_lines.sql b/htdocs/install/mysql/tables/llx_budget_lines.sql
index 1397b604316..ffdf33aa38f 100644
--- a/htdocs/install/mysql/tables/llx_budget_lines.sql
+++ b/htdocs/install/mysql/tables/llx_budget_lines.sql
@@ -23,7 +23,7 @@ create table llx_budget_lines
   fk_project_ids	varchar(180) NOT NULL,		-- 'IDS:x,y' = List of project ids related to this budget. If budget is dedicated to projects not yet started, we recommand to create a project 'Projects to come'. 'FILTER:ref=*ABC' or 'FILTER:categid=123' = Can also be a dynamic rule to select projects.
   amount			double(24,8) NOT NULL,
   datec        		datetime,
-  tms           	timestamp,
+  tms           	timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat 	integer,
   fk_user_modif 	integer,
   import_key    	integer  
diff --git a/htdocs/install/mysql/tables/llx_c_email_senderprofile.sql b/htdocs/install/mysql/tables/llx_c_email_senderprofile.sql
index cd81eb4c42a..8b99059acdd 100644
--- a/htdocs/install/mysql/tables/llx_c_email_senderprofile.sql
+++ b/htdocs/install/mysql/tables/llx_c_email_senderprofile.sql
@@ -23,7 +23,7 @@ create table llx_c_email_senderprofile
   entity		  integer DEFAULT 1 NOT NULL,	  -- multi company id
   private         smallint DEFAULT 0 NOT NULL,    -- Template public (0) or private (id of user)
   date_creation   datetime,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   label           varchar(255),					  -- Label of predefined email
   email           varchar(255) NOT NULL,		  -- Email
   signature		  text,                           -- Predefined signature
diff --git a/htdocs/install/mysql/tables/llx_c_email_templates.sql b/htdocs/install/mysql/tables/llx_c_email_templates.sql
index 3fd97fb2804..04130a208fe 100644
--- a/htdocs/install/mysql/tables/llx_c_email_templates.sql
+++ b/htdocs/install/mysql/tables/llx_c_email_templates.sql
@@ -27,7 +27,7 @@ create table llx_c_email_templates
   private         smallint DEFAULT 0 NOT NULL,    -- Template public or private
   fk_user         integer,                        -- Id user owner if template is private, or null
   datec           datetime,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   label           varchar(180),					  -- Label of predefined email
   position        smallint,					      -- Position
   enabled         varchar(255) DEFAULT '1',		  -- Condition to have this module visible
diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql
index c99bfe91690..9177228b363 100644
--- a/htdocs/install/mysql/tables/llx_c_field_list.sql
+++ b/htdocs/install/mysql/tables/llx_c_field_list.sql
@@ -24,7 +24,7 @@
 create table llx_c_field_list
 (
   rowid			integer  AUTO_INCREMENT PRIMARY KEY,
-  tms			timestamp,
+  tms			timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   element		varchar(64)        			NOT NULL,		-- name of element list
   entity		integer			DEFAULT 1 	NOT NULL,		-- entity id
   name			varchar(32)        			NOT NULL,		-- name of field with table alias (ex: p.ref)
diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.sql b/htdocs/install/mysql/tables/llx_c_input_reason.sql
index d82e39eb6f5..dba58dbbecc 100644
--- a/htdocs/install/mysql/tables/llx_c_input_reason.sql
+++ b/htdocs/install/mysql/tables/llx_c_input_reason.sql
@@ -17,6 +17,8 @@
 --
 -- ========================================================================
 
+--  This is the dictionary of sales orders origin
+
 create table llx_c_input_reason
 (
   rowid		integer AUTO_INCREMENT PRIMARY KEY,
diff --git a/htdocs/install/mysql/tables/llx_c_product_nature.key.sql b/htdocs/install/mysql/tables/llx_c_product_nature.key.sql
new file mode 100644
index 00000000000..b6a3d2130bf
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_product_nature.key.sql
@@ -0,0 +1 @@
+ALTER TABLE llx_c_product_nature ADD UNIQUE INDEX uk_c_product_nature(code, active);
diff --git a/htdocs/install/mysql/tables/llx_c_product_nature.sql b/htdocs/install/mysql/tables/llx_c_product_nature.sql
new file mode 100644
index 00000000000..3c467ce7cf8
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_product_nature.sql
@@ -0,0 +1,24 @@
+-- ========================================================================
+-- Copyright (C) 2020 Florian HENRY  <florian.henry@scopen.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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ========================================================================
+
+CREATE TABLE llx_c_product_nature (
+     rowid integer AUTO_INCREMENT PRIMARY KEY,
+     code tinyint NOT NULL,
+     label varchar(100),
+     active tinyint DEFAULT 1  NOT NULL
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql
index 9adc6b3cb0c..6f49f682f24 100644
--- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql
+++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql
@@ -20,7 +20,7 @@ create table llx_c_shipment_mode
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
   entity				   integer	DEFAULT 1 NOT NULL,	-- multi company id
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   code             varchar(30) NOT NULL,
   libelle          varchar(50) NOT NULL,
   description      text,
diff --git a/htdocs/install/mysql/tables/llx_c_ticket_severity.sql b/htdocs/install/mysql/tables/llx_c_ticket_severity.sql
index bb8a75abaa9..b9f565c4395 100644
--- a/htdocs/install/mysql/tables/llx_c_ticket_severity.sql
+++ b/htdocs/install/mysql/tables/llx_c_ticket_severity.sql
@@ -22,7 +22,7 @@ create table llx_c_ticket_severity
   code			varchar(32)				NOT NULL,
   pos			varchar(32)				NOT NULL,
   label			varchar(128)			NOT NULL,
-  color			varchar(10)				NOT NULL,
+  color			varchar(10)				NULL,
   active		integer DEFAULT 1,
   use_default	integer DEFAULT 1,
   description	varchar(255)
diff --git a/htdocs/install/mysql/tables/llx_c_transport_mode.key.sql b/htdocs/install/mysql/tables/llx_c_transport_mode.key.sql
new file mode 100644
index 00000000000..4a7d5e89009
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_transport_mode.key.sql
@@ -0,0 +1,19 @@
+-- ===================================================================
+-- Copyright (C) 2019      Open-DSI			<support@open-dsi.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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+ALTER TABLE llx_c_transport_mode ADD UNIQUE INDEX uk_c_transport_mode (code, entity);
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_c_transport_mode.sql b/htdocs/install/mysql/tables/llx_c_transport_mode.sql
new file mode 100644
index 00000000000..a2634f2a0bf
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_transport_mode.sql
@@ -0,0 +1,26 @@
+-- ========================================================================
+-- Copyright (C) 2019      Open-DSI			<support@open-dsi.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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ========================================================================
+
+CREATE TABLE llx_c_transport_mode (
+  rowid     integer AUTO_INCREMENT PRIMARY KEY,
+  entity    integer	DEFAULT 1 NOT NULL,	-- multi company id
+  code      varchar(3) NOT NULL,
+  label     varchar(255) NOT NULL,
+  active    tinyint DEFAULT 1  NOT NULL
+) ENGINE=innodb;
+
diff --git a/htdocs/install/mysql/tables/llx_categorie.sql b/htdocs/install/mysql/tables/llx_categorie.sql
index cf1df953ba5..29cb5a260e6 100644
--- a/htdocs/install/mysql/tables/llx_categorie.sql
+++ b/htdocs/install/mysql/tables/llx_categorie.sql
@@ -32,7 +32,7 @@ create table llx_categorie
 	fk_soc          integer DEFAULT NULL,				-- not used by default. Used when option CATEGORY_ASSIGNED_TO_A_CUSTOMER is set.
 	visible         tinyint DEFAULT 1 NOT NULL,			-- determine if the products are visible or not
     date_creation	datetime,							-- date creation 
-    tms     		timestamp,							-- date modification
+    tms     		timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,							-- last modification date
     fk_user_creat	integer,							-- user making creation
     fk_user_modif	integer,							-- user making last change
     import_key      varchar(14)							-- Import key
diff --git a/htdocs/install/mysql/tables/llx_categories_extrafields.sql b/htdocs/install/mysql/tables/llx_categories_extrafields.sql
index 8a2a82f7382..82c52f1b7ee 100644
--- a/htdocs/install/mysql/tables/llx_categories_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_categories_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_categories_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql
index 57434c93d98..db9e82ac779 100644
--- a/htdocs/install/mysql/tables/llx_chargesociales.sql
+++ b/htdocs/install/mysql/tables/llx_chargesociales.sql
@@ -25,7 +25,7 @@ create table llx_chargesociales
   date_ech          datetime NOT NULL,              -- date echeance
   libelle           varchar(80) NOT NULL,
   entity            integer DEFAULT 1 NOT NULL,     -- multi company id
-  tms               timestamp,
+  tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   date_creation     datetime,                       -- date de creation 
   date_valid        datetime,                       -- date de validation
   fk_user_author    integer,                        -- user making creation
diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql
index aa237383452..add836ce5d5 100644
--- a/htdocs/install/mysql/tables/llx_commande.sql
+++ b/htdocs/install/mysql/tables/llx_commande.sql
@@ -32,7 +32,7 @@ create table llx_commande
   fk_soc					integer NOT NULL,
   fk_projet					integer DEFAULT NULL,			-- projet auquel est rattache la commande
 
-  tms						timestamp,
+  tms						timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   date_creation				datetime,						-- date de creation 
   date_valid				datetime,						-- date de validation
   date_cloture				datetime,						-- date de cloture
diff --git a/htdocs/install/mysql/tables/llx_commande_extrafields.sql b/htdocs/install/mysql/tables/llx_commande_extrafields.sql
index e6f3f768489..922bcd820a1 100644
--- a/htdocs/install/mysql/tables/llx_commande_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_commande_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_commande_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
index bc5cadea228..a9f155a2abb 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
@@ -32,7 +32,7 @@ create table llx_commande_fournisseur
   fk_soc					integer NOT NULL,
   fk_projet					integer DEFAULT 0,             -- project id
 
-  tms						timestamp,
+  tms						timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   date_creation				datetime,                      -- date de creation 
   date_valid				datetime,                      -- date de validation
   date_approve				datetime,                      -- date de approve
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
index 22a0e241dd6..b5f85fea250 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
@@ -36,5 +36,5 @@ create table llx_commande_fournisseur_dispatch
   sellby         date DEFAULT NULL,
   status         integer,
   datec          datetime,
-  tms            timestamp
+  tms            timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.sql
index c30cc1c75dd..2c85521ea84 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_commande_fournisseur_dispatch_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_extrafields.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_extrafields.sql
index 6f72a447f10..40c5785dbad 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_extrafields.sql
@@ -23,7 +23,7 @@
 create table llx_commande_fournisseur_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql
index 4c576f16f51..c75e9718526 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql
@@ -20,7 +20,7 @@
 create table llx_commande_fournisseur_log
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datelog          datetime NOT NULL,
   fk_commande      integer NOT NULL,
   fk_statut        smallint NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.key.sql
index 6c2da9cf094..5d30ddf8817 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.key.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.key.sql
@@ -17,3 +17,6 @@
 -- ============================================================================
 
 ALTER TABLE llx_commande_fournisseurdet ADD CONSTRAINT fk_commande_fournisseurdet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid);
+
+ALTER TABLE llx_commande_fournisseurdet ADD INDEX idx_commande_fournisseurdet_fk_commande (fk_commande);
+ALTER TABLE llx_commande_fournisseurdet ADD INDEX idx_commande_fournisseurdet_fk_product (fk_product);
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet_extrafields.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet_extrafields.sql
index 189b4d7d593..cc22da09720 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet_extrafields.sql
@@ -24,7 +24,7 @@
 create table llx_commande_fournisseurdet_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_commandedet_extrafields.sql b/htdocs/install/mysql/tables/llx_commandedet_extrafields.sql
index 37b7dd6a349..331a3fbe54a 100644
--- a/htdocs/install/mysql/tables/llx_commandedet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_commandedet_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_commandedet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_comment.sql b/htdocs/install/mysql/tables/llx_comment.sql
index 22b2c40b9f1..3e839d83b4c 100644
--- a/htdocs/install/mysql/tables/llx_comment.sql
+++ b/htdocs/install/mysql/tables/llx_comment.sql
@@ -19,7 +19,7 @@
 CREATE TABLE llx_comment (
     rowid integer AUTO_INCREMENT PRIMARY KEY,
     datec datetime  DEFAULT NULL,
-    tms timestamp,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     description text NOT NULL,
     fk_user_author integer DEFAULT NULL,
     fk_user_modif integer DEFAULT NULL,
diff --git a/htdocs/install/mysql/tables/llx_const.sql b/htdocs/install/mysql/tables/llx_const.sql
index fcca5f57023..96594bb60b4 100644
--- a/htdocs/install/mysql/tables/llx_const.sql
+++ b/htdocs/install/mysql/tables/llx_const.sql
@@ -32,7 +32,7 @@ create table llx_const
   type        varchar(64) DEFAULT 'string', -- null or 'encrypted' if param has been encrypted 
   visible     tinyint DEFAULT 1 NOT NULL,
   note        text,
-  tms         timestamp
+  tms         timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=innodb;
 
 -- 
diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql
index fbb36a5674b..dcdc1288d37 100644
--- a/htdocs/install/mysql/tables/llx_contrat.sql
+++ b/htdocs/install/mysql/tables/llx_contrat.sql
@@ -26,7 +26,7 @@ create table llx_contrat
   ref_supplier				varchar(255),		            -- supplier contract ref
   ref_ext					varchar(255),		            -- external contract ref
   entity					integer DEFAULT 1 NOT NULL,		-- multi company id
-  tms						timestamp,
+  tms						timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec						datetime,                   	-- creation date
   date_contrat				datetime,
   statut					smallint DEFAULT 0,				-- not used. deprecated
diff --git a/htdocs/install/mysql/tables/llx_contrat_extrafields.sql b/htdocs/install/mysql/tables/llx_contrat_extrafields.sql
index 7ab3dfbbdc9..f93ab94d4ca 100644
--- a/htdocs/install/mysql/tables/llx_contrat_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_contrat_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_contrat_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql
index 4705bbab218..bbe19955e33 100644
--- a/htdocs/install/mysql/tables/llx_contratdet.sql
+++ b/htdocs/install/mysql/tables/llx_contratdet.sql
@@ -20,7 +20,7 @@
 create table llx_contratdet
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  tms                   timestamp,
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 
   fk_contrat            integer       NOT NULL,
   fk_product            integer       NULL,                -- doit pouvoir etre nul pour ligne detail sans produits
@@ -53,7 +53,7 @@ create table llx_contratdet
   total_localtax1       double(24,8)  DEFAULT 0,	   		   -- Total Local tax 1 de la ligne
   total_localtax2       double(24,8)  DEFAULT 0,	   		   -- Total Local tax 2 de la ligne
   total_ttc             double(24,8)  DEFAULT 0,	   		   -- Total TTC de la ligne toute quantite et incluant remise ligne et globale
-  product_type			integer       DEFAULT 1,               -- Product type (1=service by default)
+  product_type			integer       DEFAULT 1,               -- Type of line (1=service by default)
   info_bits		        integer DEFAULT 0, 		               -- TVA NPR ou non
 
   buy_price_ht          double(24,8)  DEFAULT NULL,            -- buying price
diff --git a/htdocs/install/mysql/tables/llx_contratdet_extrafields.sql b/htdocs/install/mysql/tables/llx_contratdet_extrafields.sql
index 8933fa66e16..ccd0846e81e 100644
--- a/htdocs/install/mysql/tables/llx_contratdet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_contratdet_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_contratdet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.sql b/htdocs/install/mysql/tables/llx_contratdet_log.sql
index b13791f4832..f52ced561c7 100644
--- a/htdocs/install/mysql/tables/llx_contratdet_log.sql
+++ b/htdocs/install/mysql/tables/llx_contratdet_log.sql
@@ -19,7 +19,7 @@
 create table llx_contratdet_log
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  tms                   timestamp,
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_contratdet         integer NOT NULL,
   date                  datetime NOT NULL,
   statut                smallint NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_cronjob.sql b/htdocs/install/mysql/tables/llx_cronjob.sql
index 97057e6f41e..a9aa8960991 100644
--- a/htdocs/install/mysql/tables/llx_cronjob.sql
+++ b/htdocs/install/mysql/tables/llx_cronjob.sql
@@ -21,7 +21,7 @@
 CREATE TABLE llx_cronjob 
 (
 	rowid 			integer AUTO_INCREMENT PRIMARY KEY,
-	tms 			timestamp,
+	tms 			timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	datec 			datetime,
 	jobtype			varchar(10) NOT NULL,
   	label 			text NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_livraison.key.sql b/htdocs/install/mysql/tables/llx_delivery.key.sql
similarity index 58%
rename from htdocs/install/mysql/tables/llx_livraison.key.sql
rename to htdocs/install/mysql/tables/llx_delivery.key.sql
index e0e21c13451..4eb3b96f2a0 100644
--- a/htdocs/install/mysql/tables/llx_livraison.key.sql
+++ b/htdocs/install/mysql/tables/llx_delivery.key.sql
@@ -18,12 +18,12 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_livraison ADD UNIQUE INDEX idx_livraison_uk_ref (ref, entity);
+ALTER TABLE llx_delivery ADD UNIQUE INDEX idx_delivery_uk_ref (ref, entity);
 
-ALTER TABLE llx_livraison ADD INDEX idx_livraison_fk_soc (fk_soc);
-ALTER TABLE llx_livraison ADD INDEX idx_livraison_fk_user_author (fk_user_author);
-ALTER TABLE llx_livraison ADD INDEX idx_livraison_fk_user_valid (fk_user_valid);
+ALTER TABLE llx_delivery ADD INDEX idx_delivery_fk_soc (fk_soc);
+ALTER TABLE llx_delivery ADD INDEX idx_delivery_fk_user_author (fk_user_author);
+ALTER TABLE llx_delivery ADD INDEX idx_delivery_fk_user_valid (fk_user_valid);
 
-ALTER TABLE llx_livraison ADD CONSTRAINT fk_livraison_fk_soc			FOREIGN KEY (fk_soc)			REFERENCES llx_societe (rowid);
-ALTER TABLE llx_livraison ADD CONSTRAINT fk_livraison_fk_user_author	FOREIGN KEY (fk_user_author)	REFERENCES llx_user (rowid);
-ALTER TABLE llx_livraison ADD CONSTRAINT fk_livraison_fk_user_valid	FOREIGN KEY (fk_user_valid)	REFERENCES llx_user (rowid);
+ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_soc			FOREIGN KEY (fk_soc)			REFERENCES llx_societe (rowid);
+ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_user_author	FOREIGN KEY (fk_user_author)	REFERENCES llx_user (rowid);
+ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_user_valid	FOREIGN KEY (fk_user_valid)	REFERENCES llx_user (rowid);
diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_delivery.sql
similarity index 95%
rename from htdocs/install/mysql/tables/llx_livraison.sql
rename to htdocs/install/mysql/tables/llx_delivery.sql
index 31af38edfb6..8216b5cf145 100644
--- a/htdocs/install/mysql/tables/llx_livraison.sql
+++ b/htdocs/install/mysql/tables/llx_delivery.sql
@@ -17,10 +17,10 @@
 --
 -- ===================================================================
 
-create table llx_livraison
+create table llx_delivery
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  tms                   timestamp,
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   ref                   varchar(30)  NOT NULL,			-- delivery number
   entity                integer DEFAULT 1 NOT NULL,		-- multi company id
   fk_soc                integer      NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_livraison_extrafields.key.sql b/htdocs/install/mysql/tables/llx_delivery_extrafields.key.sql
similarity index 90%
rename from htdocs/install/mysql/tables/llx_livraison_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_delivery_extrafields.key.sql
index 87d8931d27c..a9118a2493b 100644
--- a/htdocs/install/mysql/tables/llx_livraison_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_delivery_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_livraison_extrafields ADD INDEX idx_livraison_extrafields (fk_object);
+ALTER TABLE llx_delivery_extrafields ADD INDEX idx_delivery_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_livraison_extrafields.sql b/htdocs/install/mysql/tables/llx_delivery_extrafields.sql
similarity index 89%
rename from htdocs/install/mysql/tables/llx_livraison_extrafields.sql
rename to htdocs/install/mysql/tables/llx_delivery_extrafields.sql
index 70248d0ceca..2639902e0a5 100644
--- a/htdocs/install/mysql/tables/llx_livraison_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_delivery_extrafields.sql
@@ -16,10 +16,10 @@
 --
 -- ========================================================================
 
-create table llx_livraison_extrafields
+create table llx_delivery_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_livraisondet.key.sql b/htdocs/install/mysql/tables/llx_deliverydet.key.sql
similarity index 81%
rename from htdocs/install/mysql/tables/llx_livraisondet.key.sql
rename to htdocs/install/mysql/tables/llx_deliverydet.key.sql
index 3006d520907..ce302383f4b 100644
--- a/htdocs/install/mysql/tables/llx_livraisondet.key.sql
+++ b/htdocs/install/mysql/tables/llx_deliverydet.key.sql
@@ -18,5 +18,5 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_livraisondet ADD INDEX idx_livraisondet_fk_expedition (fk_livraison);
-ALTER TABLE llx_livraisondet ADD CONSTRAINT fk_livraisondet_fk_livraison FOREIGN KEY (fk_livraison) REFERENCES llx_livraison (rowid);
+ALTER TABLE llx_deliverydet ADD INDEX idx_deliverydet_fk_delivery (fk_delivery);
+ALTER TABLE llx_deliverydet ADD CONSTRAINT fk_deliverydet_fk_delivery FOREIGN KEY (fk_delivery) REFERENCES llx_delivery (rowid);
diff --git a/htdocs/install/mysql/tables/llx_livraisondet.sql b/htdocs/install/mysql/tables/llx_deliverydet.sql
similarity index 96%
rename from htdocs/install/mysql/tables/llx_livraisondet.sql
rename to htdocs/install/mysql/tables/llx_deliverydet.sql
index 3b30da9a955..97ea193b045 100644
--- a/htdocs/install/mysql/tables/llx_livraisondet.sql
+++ b/htdocs/install/mysql/tables/llx_deliverydet.sql
@@ -17,10 +17,10 @@
 --
 -- ===================================================================
 
-create table llx_livraisondet
+create table llx_deliverydet
 (
   rowid             integer AUTO_INCREMENT PRIMARY KEY,
-  fk_livraison      integer,
+  fk_delivery       integer,
   fk_origin_line    integer,                         -- Correspondance de la ligne avec le document d'origine (propal, commande)
   fk_product        integer,
   description       text,
diff --git a/htdocs/install/mysql/tables/llx_livraisondet_extrafields.key.sql b/htdocs/install/mysql/tables/llx_deliverydet_extrafields.key.sql
similarity index 90%
rename from htdocs/install/mysql/tables/llx_livraisondet_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_deliverydet_extrafields.key.sql
index cc9ee6673d0..3bce2b47a3b 100644
--- a/htdocs/install/mysql/tables/llx_livraisondet_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_deliverydet_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_livraisondet_extrafields ADD INDEX idx_livraisondet_extrafields (fk_object);
+ALTER TABLE llx_deliverydet_extrafields ADD INDEX idx_deliverydet_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_livraisondet_extrafields.sql b/htdocs/install/mysql/tables/llx_deliverydet_extrafields.sql
similarity index 89%
rename from htdocs/install/mysql/tables/llx_livraisondet_extrafields.sql
rename to htdocs/install/mysql/tables/llx_deliverydet_extrafields.sql
index cb6300a8ca1..00f240211c3 100644
--- a/htdocs/install/mysql/tables/llx_livraisondet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_deliverydet_extrafields.sql
@@ -16,10 +16,10 @@
 --
 -- ===================================================================
 
-create table llx_livraisondet_extrafields
+create table llx_deliverydet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_deplacement.sql b/htdocs/install/mysql/tables/llx_deplacement.sql
index 8b9fa2a04ae..50bfe8d7cfd 100644
--- a/htdocs/install/mysql/tables/llx_deplacement.sql
+++ b/htdocs/install/mysql/tables/llx_deplacement.sql
@@ -24,7 +24,7 @@ create table llx_deplacement
   ref				varchar(30) DEFAULT NULL,		-- Ref donation (TODO change to NOT NULL)
   entity			integer DEFAULT 1 NOT NULL,		-- multi company id
   datec				datetime NOT NULL,
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   dated				datetime,
   fk_user			integer NOT NULL,
   fk_user_author	integer,
diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql
index f03e82d6143..95181a3b30e 100644
--- a/htdocs/install/mysql/tables/llx_don.sql
+++ b/htdocs/install/mysql/tables/llx_don.sql
@@ -25,7 +25,7 @@ create table llx_don
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   ref             varchar(30) DEFAULT NULL,     -- Ref donation (TODO change to NOT NULL)
   entity          integer DEFAULT 1 NOT NULL,	-- multi company id
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_statut       smallint NOT NULL DEFAULT 0,  -- Status of donation promise or validate
   datedon         datetime,                     -- Date of the donation/promise
   amount          double(24,8) DEFAULT 0,
diff --git a/htdocs/install/mysql/tables/llx_don_extrafields.sql b/htdocs/install/mysql/tables/llx_don_extrafields.sql
index bf2b780fcee..a4a560d0f8a 100644
--- a/htdocs/install/mysql/tables/llx_don_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_don_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_don_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.sql b/htdocs/install/mysql/tables/llx_ecm_directories.sql
index 1fa1467e296..4616a763b81 100644
--- a/htdocs/install/mysql/tables/llx_ecm_directories.sql
+++ b/htdocs/install/mysql/tables/llx_ecm_directories.sql
@@ -30,7 +30,7 @@ CREATE TABLE llx_ecm_directories
   fullpath    		varchar(750),
   extraparams		varchar(255),					-- for stock other parameters with json format
   date_c			datetime,
-  date_m			timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_c			integer,
   fk_user_m			integer,
   acl				text
diff --git a/htdocs/install/mysql/tables/llx_ecm_directories_extrafields.key.sql b/htdocs/install/mysql/tables/llx_ecm_directories_extrafields.key.sql
new file mode 100644
index 00000000000..a84fa2c845c
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_ecm_directories_extrafields.key.sql
@@ -0,0 +1,20 @@
+-- ===================================================================
+-- Copyright (C) 2020      Frédéric 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+
+ALTER TABLE llx_ecm_directories_extrafields ADD INDEX idx_ecm_directories_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_ecm_directories_extrafileds.sql b/htdocs/install/mysql/tables/llx_ecm_directories_extrafileds.sql
new file mode 100644
index 00000000000..8bb7d98c592
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_ecm_directories_extrafileds.sql
@@ -0,0 +1,26 @@
+-- ========================================================================
+-- Copyright (C) 2020      Frédéric 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ========================================================================
+
+CREATE TABLE llx_ecm_directories_extrafields
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)                             -- import key
+) ENGINE=innodb;
+
diff --git a/htdocs/install/mysql/tables/llx_ecm_files.sql b/htdocs/install/mysql/tables/llx_ecm_files.sql
index c459e2ca219..635945a256d 100644
--- a/htdocs/install/mysql/tables/llx_ecm_files.sql
+++ b/htdocs/install/mysql/tables/llx_ecm_files.sql
@@ -35,7 +35,7 @@ CREATE TABLE llx_ecm_files
   gen_or_uploaded   varchar(12),                    -- 'generated' or 'uploaded' 
   extraparams		varchar(255),					-- for stocking other parameters with json format
   date_c			datetime,
-  date_m			timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_c			integer,
   fk_user_m			integer,
   acl				text							-- for future permission 'per file'
diff --git a/htdocs/install/mysql/tables/llx_ecm_files_extrafields.key.sql b/htdocs/install/mysql/tables/llx_ecm_files_extrafields.key.sql
new file mode 100644
index 00000000000..3ebd3712184
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_ecm_files_extrafields.key.sql
@@ -0,0 +1,20 @@
+-- ===================================================================
+-- Copyright (C) 2020      Frédéric 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+
+ALTER TABLE llx_ecm_files_extrafields ADD INDEX idx_ecm_files_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_ecm_files_extrafields.sql b/htdocs/install/mysql/tables/llx_ecm_files_extrafields.sql
new file mode 100644
index 00000000000..485db3a0f72
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_ecm_files_extrafields.sql
@@ -0,0 +1,26 @@
+-- ========================================================================
+-- Copyright (C) 2020      Frédéric 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ========================================================================
+
+CREATE TABLE llx_ecm_files_extrafields
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)                             -- import key
+) ENGINE=innodb;
+
diff --git a/htdocs/install/mysql/tables/llx_element_resources.sql b/htdocs/install/mysql/tables/llx_element_resources.sql
index 95ee9b5a751..693a2f990f0 100644
--- a/htdocs/install/mysql/tables/llx_element_resources.sql
+++ b/htdocs/install/mysql/tables/llx_element_resources.sql
@@ -28,5 +28,5 @@ CREATE TABLE llx_element_resources
   mandatory		  integer,
   duree				real,               -- total duration of using ressource
   fk_user_create  integer,
-  tms             timestamp
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql b/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql
index 87581f418e8..389093241ce 100644
--- a/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql
+++ b/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql
@@ -35,7 +35,7 @@ CREATE TABLE llx_emailcollector_emailcollector(
         note_public text, 
         note_private text, 
         date_creation datetime NOT NULL, 
-        tms timestamp, 
+        tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
         fk_user_creat integer NOT NULL, 
         fk_user_modif integer, 
         import_key varchar(14), 
diff --git a/htdocs/install/mysql/tables/llx_emailcollector_emailcollectoraction.sql b/htdocs/install/mysql/tables/llx_emailcollector_emailcollectoraction.sql
index 226f74ce884..c45a3dcd1c4 100644
--- a/htdocs/install/mysql/tables/llx_emailcollector_emailcollectoraction.sql
+++ b/htdocs/install/mysql/tables/llx_emailcollector_emailcollectoraction.sql
@@ -21,7 +21,7 @@ CREATE TABLE llx_emailcollector_emailcollectoraction(
 	type varchar(128) NOT NULL, 
 	actionparam varchar(255) NULL, 
 	date_creation datetime NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
 	position integer DEFAULT 0,
diff --git a/htdocs/install/mysql/tables/llx_emailcollector_emailcollectorfilter.sql b/htdocs/install/mysql/tables/llx_emailcollector_emailcollectorfilter.sql
index 5f49227f655..4e708116e21 100644
--- a/htdocs/install/mysql/tables/llx_emailcollector_emailcollectorfilter.sql
+++ b/htdocs/install/mysql/tables/llx_emailcollector_emailcollectorfilter.sql
@@ -21,7 +21,7 @@ CREATE TABLE llx_emailcollector_emailcollectorfilter(
 	type varchar(128) NOT NULL, 
 	rulevalue varchar(128) NULL, 
 	date_creation datetime NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
 	import_key varchar(14), 
diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql
index 2cabb457016..2a390f008e2 100644
--- a/htdocs/install/mysql/tables/llx_entrepot.sql
+++ b/htdocs/install/mysql/tables/llx_entrepot.sql
@@ -23,7 +23,7 @@ create table llx_entrepot
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   ref             varchar(255) NOT NULL,
   datec           datetime,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   entity          integer DEFAULT 1 NOT NULL,	-- multi company id
   description     text,
   lieu            varchar(64),					-- resume lieu situation
diff --git a/htdocs/install/mysql/tables/llx_entrepot_extrafields.sql b/htdocs/install/mysql/tables/llx_entrepot_extrafields.sql
index 9fa75455f19..95a78b4ce6c 100644
--- a/htdocs/install/mysql/tables/llx_entrepot_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_entrepot_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_entrepot_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_establishment.sql b/htdocs/install/mysql/tables/llx_establishment.sql
index 0d487e94e5f..7159a53059c 100644
--- a/htdocs/install/mysql/tables/llx_establishment.sql
+++ b/htdocs/install/mysql/tables/llx_establishment.sql
@@ -36,7 +36,7 @@ CREATE TABLE llx_establishment (
   fk_user_author 	integer NOT NULL,
   fk_user_mod		integer,
   datec				datetime NOT NULL,
-  tms				timestamp NOT NULL,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL,
   status            tinyint DEFAULT 1
 ) ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_events.sql b/htdocs/install/mysql/tables/llx_events.sql
index c3ae55f47e2..ffa4f1029e7 100644
--- a/htdocs/install/mysql/tables/llx_events.sql
+++ b/htdocs/install/mysql/tables/llx_events.sql
@@ -24,7 +24,7 @@
 create table llx_events
 (
   rowid          integer AUTO_INCREMENT PRIMARY KEY,
-  tms            timestamp,                   -- date creation/modification
+  tms            timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,                   -- last modification date
   type           varchar(32)  NOT NULL,       -- action type
   entity         integer DEFAULT 1 NOT NULL,	-- multi company id
   prefix_session varchar(255) NULL,				  -- prefix of session, obtained with dol_getprefix
diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql
index e4c216f3da4..4214fef7f44 100644
--- a/htdocs/install/mysql/tables/llx_expedition.sql
+++ b/htdocs/install/mysql/tables/llx_expedition.sql
@@ -22,7 +22,7 @@
 create table llx_expedition
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  tms                   timestamp,
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   ref                   varchar(30)        NOT NULL,
   entity                integer  DEFAULT 1 NOT NULL,	-- multi company id
   fk_soc                integer            NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_expedition_extrafields.sql b/htdocs/install/mysql/tables/llx_expedition_extrafields.sql
index af4228efb41..6b9721a2826 100644
--- a/htdocs/install/mysql/tables/llx_expedition_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_expedition_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_expedition_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_expeditiondet_extrafields.sql b/htdocs/install/mysql/tables/llx_expeditiondet_extrafields.sql
index 112e41e9578..a71b45946a1 100644
--- a/htdocs/install/mysql/tables/llx_expeditiondet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_expeditiondet_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_expeditiondet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_expensereport.sql b/htdocs/install/mysql/tables/llx_expensereport.sql
index a212bc55273..772888620fb 100644
--- a/htdocs/install/mysql/tables/llx_expensereport.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport.sql
@@ -34,8 +34,9 @@ CREATE TABLE llx_expensereport (
   date_approve		datetime,
   date_refuse 		datetime,
   date_cancel 		datetime,
-  tms 		 		timestamp,
+  tms 		 		timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_author 	integer NOT NULL,				-- not the user author but the user the expense report is for
+  fk_user_creat 	integer DEFAULT NULL,			-- the use author
   fk_user_modif 	integer DEFAULT NULL,
   fk_user_valid 	integer DEFAULT NULL,
   fk_user_validator integer DEFAULT NULL,
diff --git a/htdocs/install/mysql/tables/llx_expensereport_extrafields.sql b/htdocs/install/mysql/tables/llx_expensereport_extrafields.sql
index 8b6ad4e998f..1e78afb8513 100644
--- a/htdocs/install/mysql/tables/llx_expensereport_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_expensereport_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_expensereport_ik.sql b/htdocs/install/mysql/tables/llx_expensereport_ik.sql
index ddc7fa4d3c7..839fbac8e9a 100644
--- a/htdocs/install/mysql/tables/llx_expensereport_ik.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport_ik.sql
@@ -21,7 +21,7 @@
 CREATE TABLE IF NOT EXISTS llx_expensereport_ik (
     rowid           integer  AUTO_INCREMENT PRIMARY KEY,
     datec           datetime  DEFAULT NULL,
-    tms             timestamp,
+    tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     fk_c_exp_tax_cat integer DEFAULT 0 NOT NULL,
     fk_range        integer DEFAULT 0 NOT NULL,	  	  
     coef            double DEFAULT 0 NOT NULL,  
diff --git a/htdocs/install/mysql/tables/llx_expensereport_rules.sql b/htdocs/install/mysql/tables/llx_expensereport_rules.sql
index 2a10cc24a7d..ae8f9b09496 100644
--- a/htdocs/install/mysql/tables/llx_expensereport_rules.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport_rules.sql
@@ -20,7 +20,7 @@
 CREATE TABLE llx_expensereport_rules (
   rowid						integer AUTO_INCREMENT PRIMARY KEY,
   datec						datetime  DEFAULT NULL,
-  tms						timestamp,
+  tms						timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   dates						datetime NOT NULL,
   datee						datetime NOT NULL,
   amount					double(24,8) NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql
index 3578414d98b..1ade8502bf5 100644
--- a/htdocs/install/mysql/tables/llx_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_extrafields.sql
@@ -43,5 +43,5 @@ create table llx_extrafields
 	fk_user_author	integer,									-- user making creation
 	fk_user_modif	integer,	                                -- user making last change
 	datec			datetime,									-- date de creation
-	tms             timestamp									-- date of last update
+	tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP									-- last modification date
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql
index 429095e1111..010cf1c1573 100644
--- a/htdocs/install/mysql/tables/llx_facture.sql
+++ b/htdocs/install/mysql/tables/llx_facture.sql
@@ -39,7 +39,7 @@ create table llx_facture
   datef					date,									-- date invoice
   date_pointoftax		date DEFAULT NULL,									-- date point of tax (for GB)
   date_valid			date,									-- date validation
-  tms					timestamp,								-- date creation/modification
+  tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,								-- last modification date
   date_closing				datetime,						-- date de cloture
   paye					smallint DEFAULT 0 NOT NULL,
   --amount				double(24,8)     DEFAULT 0 NOT NULL,
@@ -86,6 +86,8 @@ create table llx_facture
   fk_incoterms          integer,								-- for incoterms
   location_incoterms    varchar(255),							-- for incoterms
 
+  fk_mode_transport     integer,								-- for intracomm report
+
   situation_cycle_ref smallint,  -- situation cycle reference
   situation_counter   smallint,  -- situation counter
   situation_final     smallint,  -- is the situation final ?
diff --git a/htdocs/install/mysql/tables/llx_facture_extrafields.sql b/htdocs/install/mysql/tables/llx_facture_extrafields.sql
index 4f7b902c97f..bc826d72ce4 100644
--- a/htdocs/install/mysql/tables/llx_facture_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_facture_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_facture_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql
index 78b06370d8d..ef7e980b8aa 100644
--- a/htdocs/install/mysql/tables/llx_facture_fourn.sql
+++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql
@@ -35,7 +35,7 @@ create table llx_facture_fourn
   datef					date,                          -- date de la facture
   date_pointoftax		date DEFAULT NULL,			   -- date point of tax (for GB)
   date_valid			date,						   -- date validation
-  tms					timestamp,                     -- date creation/modification
+  tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,                     -- last modification date
   libelle				varchar(255),
   paye					smallint         DEFAULT 0 NOT NULL,
   amount				double(24,8)     DEFAULT 0 NOT NULL,
@@ -70,6 +70,9 @@ create table llx_facture_fourn
   note_public			text,
   fk_incoterms          integer,						-- for incoterms
   location_incoterms    varchar(255),					-- for incoterms
+
+  fk_mode_transport     integer,						-- for intracomm report
+
   model_pdf				varchar(255),
   last_main_doc			varchar(255),					-- relative filepath+filename of last main generated document
 
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det_extrafields.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det_extrafields.sql
index 7be8ff1c552..7fca2588bdf 100644
--- a/htdocs/install/mysql/tables/llx_facture_fourn_det_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_facture_fourn_det_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_facture_fourn_det_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_extrafields.sql b/htdocs/install/mysql/tables/llx_facture_fourn_extrafields.sql
index 8fb018cbfcc..48556ec6d33 100644
--- a/htdocs/install/mysql/tables/llx_facture_fourn_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_facture_fourn_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_facture_fourn_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql
index 220c1fa608a..0db78d62252 100644
--- a/htdocs/install/mysql/tables/llx_facture_rec.sql
+++ b/htdocs/install/mysql/tables/llx_facture_rec.sql
@@ -26,7 +26,7 @@ create table llx_facture_rec
   entity             integer DEFAULT 1 NOT NULL,	 -- multi company id
   fk_soc             integer NOT NULL,
   datec              datetime,            -- date de creation
-  tms				 timestamp,           -- date creation/modification
+  tms				 timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,           -- last modification date
 
   suspended          integer DEFAULT 0,					-- 1=suspended
   
diff --git a/htdocs/install/mysql/tables/llx_facture_rec_extrafields.sql b/htdocs/install/mysql/tables/llx_facture_rec_extrafields.sql
index 6895a7e2291..8a51efb2914 100644
--- a/htdocs/install/mysql/tables/llx_facture_rec_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_facture_rec_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_facture_rec_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql
index 73e64fa1c6a..3b1ea86cc0e 100644
--- a/htdocs/install/mysql/tables/llx_facturedet.sql
+++ b/htdocs/install/mysql/tables/llx_facturedet.sql
@@ -36,7 +36,7 @@ create table llx_facturedet
   localtax1_type			 	varchar(10)	 NULL, 				 	-- localtax1 type
   localtax2_tx               	double(6,3)  DEFAULT 0,    		 	-- localtax2 rate
   localtax2_type			 	varchar(10)	 NULL, 				 	-- localtax2 type
-  qty							real,								-- Quantity (exemple 2)
+  qty							real,								-- Quantity (exemple 2). Note: for credit note, the price is negative, not the quantity. Like for discount, price is negative, not quantity.
   remise_percent				real       DEFAULT 0,				-- % de la remise ligne (exemple 20%)
   remise						real       DEFAULT 0,				-- Montant calcule de la remise % sur PU HT (exemple 20)
   fk_remise_except				integer    NULL,					-- Lien vers table des remises fixes
diff --git a/htdocs/install/mysql/tables/llx_facturedet_extrafields.sql b/htdocs/install/mysql/tables/llx_facturedet_extrafields.sql
index 693abf00001..99f0b87a943 100644
--- a/htdocs/install/mysql/tables/llx_facturedet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_facturedet_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_facturedet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec_extrafields.sql b/htdocs/install/mysql/tables/llx_facturedet_rec_extrafields.sql
index da2314ecffb..c220a7e0f0f 100644
--- a/htdocs/install/mysql/tables/llx_facturedet_rec_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_facturedet_rec_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_facturedet_rec_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql
index e2508c372ca..7c1ef4cf184 100644
--- a/htdocs/install/mysql/tables/llx_fichinter.sql
+++ b/htdocs/install/mysql/tables/llx_fichinter.sql
@@ -26,7 +26,7 @@ create table llx_fichinter
   ref				varchar(30) NOT NULL,       -- number
   ref_ext			varchar(255),
   entity			integer DEFAULT 1 NOT NULL, -- multi company id
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec				datetime,                   -- date de creation 
   date_valid		datetime,                   -- date de validation
   datei				date,						-- date de livraison du bon d'intervention
diff --git a/htdocs/install/mysql/tables/llx_fichinter_extrafields.sql b/htdocs/install/mysql/tables/llx_fichinter_extrafields.sql
index 13c7dd15dab..c866669d667 100644
--- a/htdocs/install/mysql/tables/llx_fichinter_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_fichinter_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_fichinter_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_fichinterdet_extrafields.sql b/htdocs/install/mysql/tables/llx_fichinterdet_extrafields.sql
index 65584c02201..f2ced33ec0d 100644
--- a/htdocs/install/mysql/tables/llx_fichinterdet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_fichinterdet_extrafields.sql
@@ -19,7 +19,7 @@
 CREATE TABLE llx_fichinterdet_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_holiday.sql b/htdocs/install/mysql/tables/llx_holiday.sql
index e8116c477a8..3cd5727d867 100644
--- a/htdocs/install/mysql/tables/llx_holiday.sql
+++ b/htdocs/install/mysql/tables/llx_holiday.sql
@@ -42,7 +42,7 @@ fk_user_cancel integer DEFAULT NULL,
 detail_refuse  varchar( 250 ) DEFAULT NULL,
 note_private   text,
 note_public    text,
-tms            timestamp,
+tms            timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 import_key			varchar(14),
 extraparams			varchar(255)				-- for other parameters with json format
 ) 
diff --git a/htdocs/install/mysql/tables/llx_holiday_extrafields.sql b/htdocs/install/mysql/tables/llx_holiday_extrafields.sql
index 29881bbb0cb..8b6e3ef8dc9 100644
--- a/htdocs/install/mysql/tables/llx_holiday_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_holiday_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_holiday_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_intracommreport.sql b/htdocs/install/mysql/tables/llx_intracommreport.sql
new file mode 100644
index 00000000000..d3d2956e4ab
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_intracommreport.sql
@@ -0,0 +1,32 @@
+-- ===================================================================
+-- Copyright (C) 2015       ATM Consulting      <support@atm-consulting.fr>
+-- Copyright (C) 2019       Open-DSI			<support@open-dsi.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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+create table llx_intracommreport
+(
+  rowid				integer AUTO_INCREMENT PRIMARY KEY,
+  ref				varchar(30)        NOT NULL,			-- report reference number
+  entity			integer  DEFAULT 1 NOT NULL,			-- multi company id
+  type_declaration	varchar(32),
+  periods			varchar(32),
+  mode				varchar(32),
+  content_xml		text,
+  type_export		varchar(10),
+  datec             datetime,
+  tms               timestamp
+)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_inventory.sql b/htdocs/install/mysql/tables/llx_inventory.sql
index 4ccb234e26e..aa35ebb0c42 100644
--- a/htdocs/install/mysql/tables/llx_inventory.sql
+++ b/htdocs/install/mysql/tables/llx_inventory.sql
@@ -23,7 +23,7 @@ CREATE TABLE llx_inventory
   entity integer DEFAULT 0, 
   ref varchar(48),
   date_creation datetime DEFAULT NULL,
-  tms timestamp, 
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
   fk_user_creat	integer,					-- user making creation
   fk_user_modif integer,                    -- user making last change
   fk_user_valid integer,                    -- valideur de la fiche
diff --git a/htdocs/install/mysql/tables/llx_inventorydet.sql b/htdocs/install/mysql/tables/llx_inventorydet.sql
index 8c770895194..ce23fe0f749 100644
--- a/htdocs/install/mysql/tables/llx_inventorydet.sql
+++ b/htdocs/install/mysql/tables/llx_inventorydet.sql
@@ -21,7 +21,7 @@ CREATE TABLE llx_inventorydet
 ( 
 	rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
 	datec datetime DEFAULT NULL,
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_inventory integer DEFAULT 0, 
 	fk_warehouse integer DEFAULT 0,
 	fk_product integer DEFAULT 0,  
diff --git a/htdocs/install/mysql/tables/llx_loan.sql b/htdocs/install/mysql/tables/llx_loan.sql
index a1a187b5ba4..f82597c71c5 100644
--- a/htdocs/install/mysql/tables/llx_loan.sql
+++ b/htdocs/install/mysql/tables/llx_loan.sql
@@ -22,7 +22,7 @@ create table llx_loan
   rowid							integer AUTO_INCREMENT PRIMARY KEY,
   entity						integer DEFAULT 1 NOT NULL,
   datec							datetime,
-  tms							timestamp,
+  tms							timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 
   label							varchar(80) NOT NULL,
   fk_bank						integer,
diff --git a/htdocs/install/mysql/tables/llx_loan_schedule.sql b/htdocs/install/mysql/tables/llx_loan_schedule.sql
index e23bc678e71..dd68a426e61 100644
--- a/htdocs/install/mysql/tables/llx_loan_schedule.sql
+++ b/htdocs/install/mysql/tables/llx_loan_schedule.sql
@@ -22,7 +22,7 @@ create table llx_loan_schedule
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   fk_loan			integer,
   datec				datetime,         -- creation date
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep				datetime,         -- payment date
   amount_capital	double(24,8) DEFAULT 0,
   amount_insurance	double(24,8) DEFAULT 0,
diff --git a/htdocs/install/mysql/tables/llx_localtax.sql b/htdocs/install/mysql/tables/llx_localtax.sql
index b7aa682567f..b883c710f7b 100644
--- a/htdocs/install/mysql/tables/llx_localtax.sql
+++ b/htdocs/install/mysql/tables/llx_localtax.sql
@@ -22,7 +22,7 @@ create table llx_localtax
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   entity          integer DEFAULT 1 NOT NULL,
   localtaxtype    tinyint,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep           date,								-- date of payment
   datev           date,								-- date of value
   amount          double,
diff --git a/htdocs/install/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing.sql
index 8706159ad46..d9fc0832045 100644
--- a/htdocs/install/mysql/tables/llx_mailing.sql
+++ b/htdocs/install/mysql/tables/llx_mailing.sql
@@ -43,7 +43,7 @@ create table llx_mailing
   date_valid		datetime,                            -- 
   date_appro		datetime,                            -- 
   date_envoi		datetime,                            -- date d'envoi
-  tms				timestamp,  
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,  
   fk_user_creat		integer,                             -- user creator
   fk_user_valid		integer,                             -- user validator
   fk_user_appro		integer,                             -- not used
diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.sql
index b523c1d11eb..096142b10ad 100644
--- a/htdocs/install/mysql/tables/llx_mailing_cibles.sql
+++ b/htdocs/install/mysql/tables/llx_mailing_cibles.sql
@@ -34,6 +34,6 @@ create table llx_mailing_cibles
   source_id			integer,
   source_type		varchar(16),
   date_envoi		datetime,
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   error_text		varchar(255)						-- text with error if statut is -1
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_mailing_unsubscribe.sql b/htdocs/install/mysql/tables/llx_mailing_unsubscribe.sql
index 00424256957..543015f5829 100644
--- a/htdocs/install/mysql/tables/llx_mailing_unsubscribe.sql
+++ b/htdocs/install/mysql/tables/llx_mailing_unsubscribe.sql
@@ -26,5 +26,5 @@ create table llx_mailing_unsubscribe
   unsubscribegroup	varchar(128) DEFAULT '',
   ip				varchar(128),
   date_creat		datetime,                            -- creation date
-  tms               timestamp
+  tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql
index 4408cb69627..9cff110981a 100644
--- a/htdocs/install/mysql/tables/llx_menu.sql
+++ b/htdocs/install/mysql/tables/llx_menu.sql
@@ -39,8 +39,8 @@ CREATE TABLE llx_menu
 	langs         varchar(100),								-- Lang file to load for translation
 	level         smallint,									-- Deprecated. Not used.
 	perms         text,										-- Condition to show enabled or disabled
-	enabled       text NULL default '1', 		            -- Condition to show or hide
+	enabled       text NULL, 					            -- Condition to show or hide
 	usertype      integer NOT NULL DEFAULT 0,				-- 0 if menu for all users, 1 for external only, 2 for internal only
-	tms           timestamp
+	tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 	
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_mrp_mo.sql b/htdocs/install/mysql/tables/llx_mrp_mo.sql
index d3aa294104b..de1933ccfed 100644
--- a/htdocs/install/mysql/tables/llx_mrp_mo.sql
+++ b/htdocs/install/mysql/tables/llx_mrp_mo.sql
@@ -27,7 +27,7 @@ CREATE TABLE llx_mrp_mo(
 	note_private text, 
 	date_creation datetime NOT NULL, 
 	date_valid datetime NULL,
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer,
 	fk_user_valid integer,
diff --git a/htdocs/install/mysql/tables/llx_mrp_mo_extrafields.sql b/htdocs/install/mysql/tables/llx_mrp_mo_extrafields.sql
index 97eab584cc7..517c269cf0f 100644
--- a/htdocs/install/mysql/tables/llx_mrp_mo_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_mrp_mo_extrafields.sql
@@ -16,7 +16,7 @@
 create table llx_mrp_mo_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_mrp_production.sql b/htdocs/install/mysql/tables/llx_mrp_production.sql
index 509d78a5c0e..bd0cd722f1a 100644
--- a/htdocs/install/mysql/tables/llx_mrp_production.sql
+++ b/htdocs/install/mysql/tables/llx_mrp_production.sql
@@ -28,7 +28,7 @@ CREATE TABLE llx_mrp_production(
 	fk_mrp_production integer,		-- if role = 'consumed', id of line with role 'toconsume', if role = 'produced' id of line with role 'toproduce'
 	fk_stock_movement integer,		-- id of stock movement when movements are validated
 	date_creation datetime NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
 	import_key varchar(14)
diff --git a/htdocs/install/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql
index 3ec7d05268e..d2e3bf93076 100644
--- a/htdocs/install/mysql/tables/llx_notify.sql
+++ b/htdocs/install/mysql/tables/llx_notify.sql
@@ -22,7 +22,7 @@
 create table llx_notify
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   daten           datetime,           -- date de la notification
   fk_action       integer NOT NULL,
   fk_soc          integer NULL,
diff --git a/htdocs/install/mysql/tables/llx_notify_def.sql b/htdocs/install/mysql/tables/llx_notify_def.sql
index bb516444b04..aed10027347 100644
--- a/htdocs/install/mysql/tables/llx_notify_def.sql
+++ b/htdocs/install/mysql/tables/llx_notify_def.sql
@@ -21,7 +21,7 @@
 create table llx_notify_def
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec           date,             			-- date de creation
   fk_action       integer NOT NULL,
   fk_soc          integer,
diff --git a/htdocs/install/mysql/tables/llx_online_signatures.sql b/htdocs/install/mysql/tables/llx_online_signatures.sql
index 312cde50671..fbba814dd4d 100644
--- a/htdocs/install/mysql/tables/llx_online_signatures.sql
+++ b/htdocs/install/mysql/tables/llx_online_signatures.sql
@@ -22,7 +22,7 @@ create table llx_onlinesignature
   object_type               varchar(32) NOT NULL,
   object_id					integer NOT NULL,
   datec                     datetime NOT NULL,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   name						varchar(255) NOT NULL,
   ip						varchar(128),
   pathoffile				varchar(255)
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_comments.sql b/htdocs/install/mysql/tables/llx_opensurvey_comments.sql
index 3fcc5a0abf9..52d938b7c47 100644
--- a/htdocs/install/mysql/tables/llx_opensurvey_comments.sql
+++ b/htdocs/install/mysql/tables/llx_opensurvey_comments.sql
@@ -19,7 +19,7 @@ CREATE TABLE llx_opensurvey_comments (
     id_comment INTEGER unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
     id_sondage CHAR(16) NOT NULL,
     comment text NOT NULL,
-    tms timestamp,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     usercomment text
 ) ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql b/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
index 0521f533fdd..e1723ccaea0 100644
--- a/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
+++ b/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
@@ -29,6 +29,6 @@ CREATE TABLE llx_opensurvey_sondage (
 	mailsonde tinyint NOT NULL DEFAULT 0,
 	allow_comments tinyint NOT NULL DEFAULT 1,
 	allow_spy tinyint NOT NULL DEFAULT 1,
-	tms TIMESTAMP,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	sujet TEXT									-- Not filled if format = 'F'. Question are into table llx_opensurvey_formquestions
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql b/htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql
index a2ddafa1b54..03ad9b35ec5 100644
--- a/htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql
+++ b/htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql
@@ -20,5 +20,5 @@ CREATE TABLE llx_opensurvey_user_studs (
     nom VARCHAR(64) NOT NULL,
     id_sondage VARCHAR(16) NOT NULL,
     reponses VARCHAR(100) NOT NULL,		-- Not used for 'F' surveys
-    tms timestamp
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_paiement.sql b/htdocs/install/mysql/tables/llx_paiement.sql
index dabe261798b..bbf7d52e6c7 100644
--- a/htdocs/install/mysql/tables/llx_paiement.sql
+++ b/htdocs/install/mysql/tables/llx_paiement.sql
@@ -25,7 +25,7 @@ create table llx_paiement
   ref_ext          varchar(255) NULL,                    -- payment external reference
   entity           integer   DEFAULT 1 NOT NULL,		-- Multi company id
   datec            datetime,							-- date de creation
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep            datetime,							-- payment date
   amount           double(24,8) DEFAULT 0,				-- amount paid in Dolibarr currency
   multicurrency_amount double(24,8) DEFAULT 0,			-- amount paid in invoice currency	
diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql
index b489588777a..640f5f0af54 100644
--- a/htdocs/install/mysql/tables/llx_paiementcharge.sql
+++ b/htdocs/install/mysql/tables/llx_paiementcharge.sql
@@ -21,7 +21,7 @@ create table llx_paiementcharge
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   fk_charge       integer,
   datec           datetime,           -- date de creation
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep           datetime,           -- payment date
   amount          double(24,8) DEFAULT 0,
   fk_typepaiement integer NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql
index 519526f764a..04066435f20 100644
--- a/htdocs/install/mysql/tables/llx_paiementfourn.sql
+++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql
@@ -22,7 +22,7 @@ create table llx_paiementfourn
   rowid					integer AUTO_INCREMENT PRIMARY KEY,
   ref					varchar(30),
   entity				integer DEFAULT 1,
-  tms					timestamp,
+  tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec					datetime,          -- date de creation de l'enregistrement
   datep					datetime,          -- date de paiement
   amount				double(24,8) DEFAULT 0,    -- montant
diff --git a/htdocs/install/mysql/tables/llx_payment_donation.sql b/htdocs/install/mysql/tables/llx_payment_donation.sql
index 6573bcb7119..088138bf96f 100644
--- a/htdocs/install/mysql/tables/llx_payment_donation.sql
+++ b/htdocs/install/mysql/tables/llx_payment_donation.sql
@@ -21,7 +21,7 @@ create table llx_payment_donation
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   fk_donation     integer,
   datec           datetime,           -- date de creation
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep           datetime,           -- payment date
   amount          double(24,8) DEFAULT 0,
   fk_typepayment  integer NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_payment_expensereport.sql b/htdocs/install/mysql/tables/llx_payment_expensereport.sql
index 8a75bfcdbfd..a83c0c926a4 100644
--- a/htdocs/install/mysql/tables/llx_payment_expensereport.sql
+++ b/htdocs/install/mysql/tables/llx_payment_expensereport.sql
@@ -21,7 +21,7 @@ create table llx_payment_expensereport
   rowid                   integer AUTO_INCREMENT PRIMARY KEY,
   fk_expensereport        integer,
   datec                   datetime,           -- date de creation
-  tms                     timestamp,
+  tms                     timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep                   datetime,           -- payment date
   amount                  double(24,8) DEFAULT 0,
   fk_typepayment          integer NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_payment_loan.sql b/htdocs/install/mysql/tables/llx_payment_loan.sql
index a646ba1917b..0e080a1bdb7 100644
--- a/htdocs/install/mysql/tables/llx_payment_loan.sql
+++ b/htdocs/install/mysql/tables/llx_payment_loan.sql
@@ -22,7 +22,7 @@ create table llx_payment_loan
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   fk_loan			integer,
   datec				datetime,         -- creation date
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep				datetime,         -- payment date
   amount_capital	double(24,8) DEFAULT 0,
   amount_insurance	double(24,8) DEFAULT 0,
diff --git a/htdocs/install/mysql/tables/llx_payment_salary.sql b/htdocs/install/mysql/tables/llx_payment_salary.sql
index cc4aaf94ccb..d6ad2ffcfed 100644
--- a/htdocs/install/mysql/tables/llx_payment_salary.sql
+++ b/htdocs/install/mysql/tables/llx_payment_salary.sql
@@ -20,7 +20,7 @@ create table llx_payment_salary
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   ref             varchar(30) NULL,           -- payment reference number (currently NULL because there is no numbering manager yet)
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec           datetime,                   -- Create date
   fk_user         integer NOT NULL,
   datep           date,                       -- payment date
diff --git a/htdocs/install/mysql/tables/llx_payment_salary_extrafields.sql b/htdocs/install/mysql/tables/llx_payment_salary_extrafields.sql
index 3bfed602cff..5f15918ef18 100644
--- a/htdocs/install/mysql/tables/llx_payment_salary_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_payment_salary_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_payment_salary_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- salary payment id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_payment_various.sql b/htdocs/install/mysql/tables/llx_payment_various.sql
index 4b48c649578..17bbf7c7a16 100644
--- a/htdocs/install/mysql/tables/llx_payment_various.sql
+++ b/htdocs/install/mysql/tables/llx_payment_various.sql
@@ -22,7 +22,7 @@ create table llx_payment_various
   ref                   varchar(30) NULL,           -- payment reference number (currently NULL because there is no numbering manager yet)
   num_payment           varchar(50),				-- num cheque or other
   label                 varchar(255),
-  tms                   timestamp,
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec                 datetime,                   -- Create date
   datep                 date,                       -- date de paiement
   datev                 date,                       -- date de valeur (this field should not be here, only into bank tables)
diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.sql
index dbe2cb85f84..53a329f4376 100644
--- a/htdocs/install/mysql/tables/llx_prelevement_facture.sql
+++ b/htdocs/install/mysql/tables/llx_prelevement_facture.sql
@@ -20,7 +20,7 @@ create table llx_prelevement_facture
 (
   rowid                  integer AUTO_INCREMENT PRIMARY KEY,
   fk_facture             integer NULL,
-  fk_facture_foun        integer NULL,
+  fk_facture_fourn        integer NULL,
   fk_prelevement_lignes  integer NOT NULL
 
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_printing.sql b/htdocs/install/mysql/tables/llx_printing.sql
index 0f0c7c71d1b..ecfe050240b 100644
--- a/htdocs/install/mysql/tables/llx_printing.sql
+++ b/htdocs/install/mysql/tables/llx_printing.sql
@@ -20,7 +20,7 @@
 CREATE TABLE llx_printing 
 (
  rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp,
+ tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
  datec datetime,
  printer_name text NOT NULL, 
  printer_location text NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql
index c3dd33c88c5..c0526a8f2cc 100644
--- a/htdocs/install/mysql/tables/llx_product.key.sql
+++ b/htdocs/install/mysql/tables/llx_product.key.sql
@@ -33,6 +33,7 @@ ALTER TABLE llx_product ADD INDEX idx_product_fk_barcode_type (fk_barcode_type);
 ALTER TABLE llx_product ADD INDEX idx_product_fk_project (fk_project);
 ALTER TABLE llx_product ADD UNIQUE INDEX uk_product_barcode (barcode, fk_barcode_type, entity);
 ALTER TABLE llx_product ADD CONSTRAINT fk_product_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid);
+ALTER TABLE llx_product ADD CONSTRAINT fk_product_finished FOREIGN KEY (finished) REFERENCES llx_c_product_nature (code);
 
 ALTER TABLE  llx_product ADD CONSTRAINT fk_product_fk_country FOREIGN KEY (fk_country) REFERENCES  llx_c_country (rowid);
 ALTER TABLE  llx_product ADD CONSTRAINT fk_product_barcode_type FOREIGN KEY (fk_barcode_type) REFERENCES  llx_c_barcode_type (rowid);
diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql
index 714a342a652..2431c884c62 100644
--- a/htdocs/install/mysql/tables/llx_product.sql
+++ b/htdocs/install/mysql/tables/llx_product.sql
@@ -30,7 +30,7 @@ create table llx_product
   ref_ext                       varchar(128),                       -- reference into an external system (not used by dolibarr)
 
   datec                         datetime,
-  tms                           timestamp,
+  tms                           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_parent                     integer	  DEFAULT 0,                -- Not used. Used by external modules. Virtual product id
 
   label                         varchar(255) NOT NULL,
@@ -92,7 +92,7 @@ create table llx_product
   lifo                          double(24,8),                       -- To store valuation of stock calculated using lifo method, for this product. TODO Not used, should be replaced by stock value stored into movement table.
   fk_default_warehouse          integer      DEFAULT NULL,
   canvas                        varchar(32)  DEFAULT NULL,
-  finished                      tinyint      DEFAULT NULL,          -- 1=manufactured product, 0=matiere premiere
+  finished                      tinyint      DEFAULT NULL,          -- see dictionnary c_product_nature
   hidden                        tinyint      DEFAULT 0,             -- Not used. Deprecated.
   import_key                    varchar(14),                        -- Import key
   model_pdf                     varchar(255),                       -- model save dodument used
diff --git a/htdocs/install/mysql/tables/llx_product_batch.sql b/htdocs/install/mysql/tables/llx_product_batch.sql
index 9b736278e3a..7300c49874f 100644
--- a/htdocs/install/mysql/tables/llx_product_batch.sql
+++ b/htdocs/install/mysql/tables/llx_product_batch.sql
@@ -20,7 +20,7 @@
 
 CREATE TABLE llx_product_batch (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product_stock integer NOT NULL,
   eatby datetime DEFAULT NULL,			-- deprecated. should not be used here but should be stored into a table llx_product_lot
   sellby datetime DEFAULT NULL,			-- deprecated. should not be used here but should be stored into a table llx_product_lot
diff --git a/htdocs/install/mysql/tables/llx_product_customer_price.sql b/htdocs/install/mysql/tables/llx_product_customer_price.sql
index c7b6f1eb1a2..7cd481c3c75 100644
--- a/htdocs/install/mysql/tables/llx_product_customer_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_customer_price.sql
@@ -25,7 +25,7 @@ create table llx_product_customer_price
   rowid					integer AUTO_INCREMENT PRIMARY KEY,
   entity				integer DEFAULT 1 NOT NULL,	   -- multi company id
   datec					datetime,
-  tms					timestamp,
+  tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product			integer NOT NULL,
   fk_soc				integer NOT NULL,	   
   price						double(24,8) DEFAULT 0,
diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.sql b/htdocs/install/mysql/tables/llx_product_extrafields.sql
index b265340d11c..24e53d9bda6 100644
--- a/htdocs/install/mysql/tables/llx_product_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_product_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_product_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
index 7e61a2df6b1..4e1d75dd1dd 100644
--- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
@@ -24,7 +24,7 @@ create table llx_product_fournisseur_price
   rowid					integer AUTO_INCREMENT PRIMARY KEY,
   entity				integer DEFAULT 1 NOT NULL,	   -- multi company id
   datec					datetime,
-  tms					timestamp,
+  tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product			integer,
   fk_soc				integer,
   ref_fourn				varchar(30),
@@ -50,6 +50,7 @@ create table llx_product_fournisseur_price
   import_key			varchar(14),                -- Import key
   delivery_time_days    integer,
   supplier_reputation varchar(10),
+  packaging			    varchar(64),
   
   fk_multicurrency		integer,
   multicurrency_code	varchar(255),
diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_extrafields.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_extrafields.sql
index 51d5499e825..728915521a7 100644
--- a/htdocs/install/mysql/tables/llx_product_fournisseur_price_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price_extrafields.sql
@@ -18,7 +18,7 @@
 
 Create Table llx_product_fournisseur_price_extrafields (
 	rowid               integer AUTO_INCREMENT PRIMARY KEY,
-	tms                 timestamp,
+	tms                 timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_object           integer NOT NULL,
 	import_key          varchar(14) -- import key
 ) ENGINE=innodb;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_product_lot.sql b/htdocs/install/mysql/tables/llx_product_lot.sql
index 4d59a46c153..86cca7d0f04 100644
--- a/htdocs/install/mysql/tables/llx_product_lot.sql
+++ b/htdocs/install/mysql/tables/llx_product_lot.sql
@@ -25,7 +25,7 @@ CREATE TABLE llx_product_lot (
   eatby           date DEFAULT NULL,			-- Eatby date
   sellby          date DEFAULT NULL, 			-- Sellby date
   datec         datetime,
-  tms           timestamp,
+  tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat integer,
   fk_user_modif integer,
   import_key    integer
diff --git a/htdocs/install/mysql/tables/llx_product_lot_extrafields.sql b/htdocs/install/mysql/tables/llx_product_lot_extrafields.sql
index b3843ed9ba6..8fbbbde1bc5 100644
--- a/htdocs/install/mysql/tables/llx_product_lot_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_product_lot_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_product_lot_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql
index 75a5355afe7..ff862e427e0 100644
--- a/htdocs/install/mysql/tables/llx_product_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_price.sql
@@ -25,7 +25,7 @@ create table llx_product_price
 (
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   entity			integer   DEFAULT 1 NOT NULL,		-- Multi company id
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product		integer NOT NULL,
   date_price		datetime NOT NULL,
   price_level		smallint NULL DEFAULT 1,
diff --git a/htdocs/install/mysql/tables/llx_product_price_by_qty.sql b/htdocs/install/mysql/tables/llx_product_price_by_qty.sql
index 7cb8b327b4d..dc3a21bfedb 100644
--- a/htdocs/install/mysql/tables/llx_product_price_by_qty.sql
+++ b/htdocs/install/mysql/tables/llx_product_price_by_qty.sql
@@ -40,6 +40,6 @@ create table llx_product_price_by_qty
   multicurrency_price	double(24,8) DEFAULT NULL,
   multicurrency_price_ttc	double(24,8) DEFAULT NULL,
   
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   import_key    	varchar(14)
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql
index 586c5b410c7..c5a2f4ad005 100644
--- a/htdocs/install/mysql/tables/llx_product_stock.sql
+++ b/htdocs/install/mysql/tables/llx_product_stock.sql
@@ -21,7 +21,7 @@
 create table llx_product_stock
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product      integer NOT NULL,
   fk_entrepot     integer NOT NULL,
   reel            real,           			-- physical stock
diff --git a/htdocs/install/mysql/tables/llx_product_stock_entrepot.sql b/htdocs/install/mysql/tables/llx_product_stock_entrepot.sql
index 903bd59b524..d6d5e57e549 100644
--- a/htdocs/install/mysql/tables/llx_product_stock_entrepot.sql
+++ b/htdocs/install/mysql/tables/llx_product_stock_entrepot.sql
@@ -21,7 +21,7 @@
 create table llx_product_warehouse_properties
 (
   rowid           		integer AUTO_INCREMENT PRIMARY KEY,
-  tms             		timestamp,
+  tms             		timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product      		integer NOT NULL,
   fk_entrepot     		integer NOT NULL,
   seuil_stock_alerte    float DEFAULT '0',
diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql
index f783597653f..a36adb3a672 100644
--- a/htdocs/install/mysql/tables/llx_projet.sql
+++ b/htdocs/install/mysql/tables/llx_projet.sql
@@ -22,7 +22,7 @@ create table llx_projet
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
   fk_soc           integer,
   datec            datetime,					-- date creation project
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   dateo            date,						-- date start project
   datee            date,						-- date end project
   ref              varchar(50),
diff --git a/htdocs/install/mysql/tables/llx_projet_extrafields.sql b/htdocs/install/mysql/tables/llx_projet_extrafields.sql
index 8a96a715b05..0001d4e8876 100644
--- a/htdocs/install/mysql/tables/llx_projet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_projet_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_projet_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql
index cc1088cf7a7..01edb857738 100644
--- a/htdocs/install/mysql/tables/llx_projet_task.sql
+++ b/htdocs/install/mysql/tables/llx_projet_task.sql
@@ -25,7 +25,7 @@ create table llx_projet_task
   fk_projet				integer NOT NULL,
   fk_task_parent		integer DEFAULT 0 NOT NULL,
   datec					datetime,						-- date creation
-  tms					timestamp,						-- date creation/modification
+  tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,						-- last modification date
   dateo					datetime,						-- date start task
   datee					datetime,						-- date end task
   datev					datetime,						-- date validation
diff --git a/htdocs/install/mysql/tables/llx_projet_task_extrafields.sql b/htdocs/install/mysql/tables/llx_projet_task_extrafields.sql
index 256c9025dc0..bf3d25e6922 100644
--- a/htdocs/install/mysql/tables/llx_projet_task_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_projet_task_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_projet_task_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql
index e1c857af2c3..786d8907588 100644
--- a/htdocs/install/mysql/tables/llx_projet_task_time.sql
+++ b/htdocs/install/mysql/tables/llx_projet_task_time.sql
@@ -29,7 +29,7 @@ create table llx_projet_task_time
   invoice_id       integer DEFAULT NULL,				-- If we need to invoice each line of timespent, we can save invoice id here
   invoice_line_id  integer DEFAULT NULL,                -- If we need to invoice each line of timespent, we can save invoice line id here
   import_key	   varchar(14),					-- Import key
-  datec            date,						-- Date creation time
-  tms              timestamp,					-- Date update time
+  datec            datetime,					-- date creation time
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,					-- last modification date
   note             text							-- A comment
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql
index d21d9ef2d7e..662db791094 100644
--- a/htdocs/install/mysql/tables/llx_propal.sql
+++ b/htdocs/install/mysql/tables/llx_propal.sql
@@ -32,7 +32,7 @@ create table llx_propal
   fk_soc				integer,
   fk_projet				integer     DEFAULT NULL,		-- projet auquel est rattache la propale
 
-  tms					timestamp,
+  tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec					datetime,						-- date de creation 
   datep					date,							-- date de la propal
   fin_validite			datetime,						-- date de fin de validite
diff --git a/htdocs/install/mysql/tables/llx_propal_extrafields.sql b/htdocs/install/mysql/tables/llx_propal_extrafields.sql
index f6ccb68b39b..31201e37b55 100644
--- a/htdocs/install/mysql/tables/llx_propal_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_propal_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_propal_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql b/htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql
index 0c636b2507c..b599702d560 100644
--- a/htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql
+++ b/htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql
@@ -22,7 +22,7 @@ CREATE TABLE llx_propal_merge_pdf_product (
   fk_user_author integer DEFAULT NULL,
   fk_user_mod integer NOT NULL,
   datec datetime NOT NULL,
-  tms timestamp NOT NULL,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   import_key varchar(14) DEFAULT NULL
 ) ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_propaldet_extrafields.sql b/htdocs/install/mysql/tables/llx_propaldet_extrafields.sql
index 74986b1c641..7235d65eccd 100644
--- a/htdocs/install/mysql/tables/llx_propaldet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_propaldet_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_propaldet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_reception.sql b/htdocs/install/mysql/tables/llx_reception.sql
index 05ed6ca4604..7989f80cf58 100644
--- a/htdocs/install/mysql/tables/llx_reception.sql
+++ b/htdocs/install/mysql/tables/llx_reception.sql
@@ -22,14 +22,14 @@
 create table llx_reception
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  tms                   timestamp,
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   ref                   varchar(30)        NOT NULL,
   entity                integer  DEFAULT 1 NOT NULL,	-- multi company id
   fk_soc                integer            NOT NULL,
   fk_projet  		integer  DEFAULT NULL,
   
   ref_ext               varchar(30),					-- reference into an external system (not used by dolibarr)
-  ref_int				varchar(30),					-- reference into an internal system (used by dolibarr to store extern id like paypal info)
+  ref_int				        varchar(30),					-- reference into an internal system (deprecated)
   ref_supplier          varchar(30),					-- customer number
   
   date_creation         datetime,						-- date de creation
diff --git a/htdocs/install/mysql/tables/llx_reception_extrafields.sql b/htdocs/install/mysql/tables/llx_reception_extrafields.sql
index e2f83794a0b..13d3be5fe77 100644
--- a/htdocs/install/mysql/tables/llx_reception_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_reception_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_reception_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature.sql
index f135c1af72f..ded61d49e8b 100644
--- a/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature.sql
+++ b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature.sql
@@ -24,7 +24,7 @@ CREATE TABLE llx_recruitment_recruitmentcandidature(
 	note_public text, 
 	note_private text, 
 	date_creation datetime NOT NULL,
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
 	import_key varchar(14), 
diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields.sql
index d0fb92fead9..77cf71b9b00 100644
--- a/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields.sql
@@ -16,7 +16,7 @@
 create table llx_recruitment_recruitmentcandidature_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition.sql
index b342156ccd1..4ad1198d808 100644
--- a/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition.sql
+++ b/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition.sql
@@ -33,7 +33,7 @@ CREATE TABLE llx_recruitment_recruitmentjobposition(
 	note_public text, 
 	note_private text, 
 	date_creation datetime NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
 	last_main_doc varchar(255), 
diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields.sql
index 07ae2ef5153..21b1ec081bf 100644
--- a/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields.sql
@@ -16,7 +16,7 @@
 create table llx_recruitment_recruitmentjobposition_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_resource.sql b/htdocs/install/mysql/tables/llx_resource.sql
index 7dc709ad83a..30bd2bcbbf3 100644
--- a/htdocs/install/mysql/tables/llx_resource.sql
+++ b/htdocs/install/mysql/tables/llx_resource.sql
@@ -34,5 +34,5 @@ CREATE TABLE llx_resource
   import_key			varchar(14),
   extraparams			varchar(255),					-- for stock other parameters with json format
   fk_country          integer DEFAULT NULL,          -- Optional id of original country
-  tms         			  timestamp
+  tms         			  timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_resource_extrafields.sql b/htdocs/install/mysql/tables/llx_resource_extrafields.sql
index 6e828258339..88bcc7606c8 100644
--- a/htdocs/install/mysql/tables/llx_resource_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_resource_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_resource_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_session.sql b/htdocs/install/mysql/tables/llx_session.sql
new file mode 100644
index 00000000000..5be31733c22
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_session.sql
@@ -0,0 +1,28 @@
+-- ========================================================================
+-- Copyright (C) 2020 Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- This table can be used for user defined session management
+-- ========================================================================
+
+create table llx_session
+(
+  session_id varchar(50) PRIMARY KEY,
+  session_variable text,
+  last_accessed datetime NOT NULL,
+  fk_user integer NOT NULL,
+  remote_ip varchar(64) NULL,
+  user_agent varchar(128) NULL
+)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql
index a98be7912f7..ea02b7be8ad 100644
--- a/htdocs/install/mysql/tables/llx_societe.sql
+++ b/htdocs/install/mysql/tables/llx_societe.sql
@@ -92,8 +92,10 @@ create table llx_societe
   remise_supplier          real           DEFAULT 0,            		-- discount by default granted by this supplier
   mode_reglement           tinyint,                             		-- payment mode customer
   cond_reglement           tinyint,                             		-- payment term customer
+  transport_mode           tinyint,                             		-- transport mode customer (Intracomm report)
   mode_reglement_supplier  tinyint,                             		-- payment mode supplier
   cond_reglement_supplier  tinyint,                             		-- payment term supplier
+  transport_mode_supplier  tinyint,                             		-- transport mode supplier (Intracomm report)
   fk_shipping_method       integer,                                     -- preferred shipping method id
   tva_assuj                tinyint        DEFAULT 1,	        		-- assujeti ou non a la TVA
   localtax1_assuj          tinyint        DEFAULT 0,	        		-- assujeti ou non a local tax 1
@@ -114,7 +116,7 @@ create table llx_societe
   webservices_url          varchar(255),                            	-- supplier webservice url
   webservices_key          varchar(128),                            	-- supplier webservice key
 
-  tms                      timestamp,									-- last modification date
+  tms                      timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,									-- last modification date
   datec	                   datetime,                            		-- creation date
   fk_user_creat            integer NULL,                        		-- utilisateur qui a cree l'info
   fk_user_modif            integer,                             		-- utilisateur qui a modifie l'info
diff --git a/htdocs/install/mysql/tables/llx_societe_account.sql b/htdocs/install/mysql/tables/llx_societe_account.sql
index 6a78a9a7839..b200d4f3854 100644
--- a/htdocs/install/mysql/tables/llx_societe_account.sql
+++ b/htdocs/install/mysql/tables/llx_societe_account.sql
@@ -33,7 +33,7 @@ CREATE TABLE llx_societe_account(
 	date_last_login   datetime,
 	date_previous_login datetime,
 	date_creation datetime NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
 	import_key varchar(14), 
diff --git a/htdocs/install/mysql/tables/llx_societe_address.sql b/htdocs/install/mysql/tables/llx_societe_address.sql
index 626b0155519..2b5f2d57146 100644
--- a/htdocs/install/mysql/tables/llx_societe_address.sql
+++ b/htdocs/install/mysql/tables/llx_societe_address.sql
@@ -21,7 +21,7 @@ create table llx_societe_address
 (
   rowid              integer AUTO_INCREMENT PRIMARY KEY,
   datec	             datetime,                            -- creation date
-  tms                timestamp,                           -- modification date
+  tms                timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,                           -- last modification date
   label              varchar(30),                         --
   fk_soc	         integer        DEFAULT 0,            --
   name               varchar(60),                         -- company name
diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.sql
index e277db15821..a4b5b269358 100644
--- a/htdocs/install/mysql/tables/llx_societe_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_societe_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_societe_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_societe_prices.sql b/htdocs/install/mysql/tables/llx_societe_prices.sql
index 2b88340e611..2e9178774f5 100644
--- a/htdocs/install/mysql/tables/llx_societe_prices.sql
+++ b/htdocs/install/mysql/tables/llx_societe_prices.sql
@@ -20,7 +20,7 @@ create table llx_societe_prices
 (
   rowid              integer AUTO_INCREMENT PRIMARY KEY,
   fk_soc             integer   DEFAULT 0,
-  tms                timestamp, 
+  tms                timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
   datec	             datetime,
   fk_user_author     integer,
   price_level        tinyint   DEFAULT 1
diff --git a/htdocs/install/mysql/tables/llx_societe_remise.sql b/htdocs/install/mysql/tables/llx_societe_remise.sql
index a3a265cce5f..2d4e3a9c258 100644
--- a/htdocs/install/mysql/tables/llx_societe_remise.sql
+++ b/htdocs/install/mysql/tables/llx_societe_remise.sql
@@ -24,7 +24,7 @@ create table llx_societe_remise
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   entity			integer DEFAULT 1 NOT NULL,			-- multi company id
   fk_soc			integer NOT NULL,
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec				datetime,							-- creation date
   fk_user_author	integer,							-- creation user
   remise_client		double(6,3)  DEFAULT 0 NOT NULL,	-- discount
diff --git a/htdocs/install/mysql/tables/llx_societe_remise_supplier.sql b/htdocs/install/mysql/tables/llx_societe_remise_supplier.sql
index 3786b16b76a..d6dfdc20d9d 100644
--- a/htdocs/install/mysql/tables/llx_societe_remise_supplier.sql
+++ b/htdocs/install/mysql/tables/llx_societe_remise_supplier.sql
@@ -24,7 +24,7 @@ create table llx_societe_remise_supplier
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   entity			integer DEFAULT 1 NOT NULL,			-- multi company id
   fk_soc			integer NOT NULL,
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec				datetime,							-- creation date
   fk_user_author	integer,							-- creation user
   remise_supplier	double(6,3)  DEFAULT 0 NOT NULL,	-- discount
diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql
index 7d00d9fb1dd..ece4b2edffe 100644
--- a/htdocs/install/mysql/tables/llx_societe_rib.sql
+++ b/htdocs/install/mysql/tables/llx_societe_rib.sql
@@ -27,7 +27,7 @@ create table llx_societe_rib
   label          varchar(200),
   fk_soc         integer NOT NULL,
   datec          datetime,
-  tms            timestamp,
+  tms            timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 
   -- For BAN
   bank           varchar(255),  -- bank name
diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql
index 2a1b551beb9..decc229e3e7 100644
--- a/htdocs/install/mysql/tables/llx_socpeople.sql
+++ b/htdocs/install/mysql/tables/llx_socpeople.sql
@@ -23,7 +23,7 @@ create table llx_socpeople
 (
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   datec				datetime,
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_soc			integer,									-- lien vers la societe
   entity			integer DEFAULT 1 NOT NULL,					-- multi company id
   ref_ext           varchar(255),                               -- reference into an external system (not used by dolibarr)
diff --git a/htdocs/install/mysql/tables/llx_socpeople_extrafields.sql b/htdocs/install/mysql/tables/llx_socpeople_extrafields.sql
index 66220ce7e98..f2f594e12f3 100644
--- a/htdocs/install/mysql/tables/llx_socpeople_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_socpeople_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_socpeople_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql
index 94501a516dd..2cd094c1b05 100644
--- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql
+++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql
@@ -20,7 +20,7 @@
 create table llx_stock_mouvement
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datem           datetime,						-- Date and hour of movement
   fk_product      integer NOT NULL,				-- Id of product
   batch           varchar(128) DEFAULT NULL,	-- Lot or serial number
diff --git a/htdocs/install/mysql/tables/llx_subscription.sql b/htdocs/install/mysql/tables/llx_subscription.sql
index 03d24c68f6e..8e86e216d3f 100644
--- a/htdocs/install/mysql/tables/llx_subscription.sql
+++ b/htdocs/install/mysql/tables/llx_subscription.sql
@@ -19,7 +19,7 @@
 create table llx_subscription
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec           datetime,
   fk_adherent     integer,
   fk_type         integer,
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposal.sql b/htdocs/install/mysql/tables/llx_supplier_proposal.sql
index 5e7393112d8..e63c4ff64c7 100644
--- a/htdocs/install/mysql/tables/llx_supplier_proposal.sql
+++ b/htdocs/install/mysql/tables/llx_supplier_proposal.sql
@@ -23,7 +23,7 @@ CREATE TABLE llx_supplier_proposal (
   ref_int varchar(255) DEFAULT NULL,
   fk_soc integer DEFAULT NULL,
   fk_projet integer DEFAULT NULL,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec datetime DEFAULT NULL,
   date_valid datetime DEFAULT NULL,
   date_cloture datetime DEFAULT NULL,
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.sql b/htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.sql
index a13c74d0d04..8dfed18bbbc 100644
--- a/htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.sql
@@ -17,7 +17,7 @@
 
 CREATE TABLE llx_supplier_proposal_extrafields (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object integer NOT NULL,
   import_key varchar(14) DEFAULT NULL
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql b/htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql
index 0501aecc68b..df6b5216c21 100644
--- a/htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql
@@ -17,7 +17,7 @@
 
 CREATE TABLE llx_supplier_proposaldet_extrafields (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object integer NOT NULL,
   import_key varchar(14) DEFAULT NULL
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_ticket.sql b/htdocs/install/mysql/tables/llx_ticket.sql
index 4440bce5cec..c053e787dfa 100644
--- a/htdocs/install/mysql/tables/llx_ticket.sql
+++ b/htdocs/install/mysql/tables/llx_ticket.sql
@@ -39,6 +39,6 @@ CREATE TABLE llx_ticket
 	date_close datetime,
 	notify_tiers_at_create tinyint,
 	email_msgid varchar(255),				-- if ticket is created by email collector, we store here MSG ID
-	tms timestamp,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     import_key        varchar(14)
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_ticket_extrafields.sql b/htdocs/install/mysql/tables/llx_ticket_extrafields.sql
index 538da09692e..31f82064461 100644
--- a/htdocs/install/mysql/tables/llx_ticket_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_ticket_extrafields.sql
@@ -18,7 +18,7 @@
 create table llx_ticket_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- ticket id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql
index 2804d410e7d..6cf97e6b4c6 100644
--- a/htdocs/install/mysql/tables/llx_tva.sql
+++ b/htdocs/install/mysql/tables/llx_tva.sql
@@ -20,7 +20,7 @@
 create table llx_tva
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec           datetime,                   -- Create date
   datep           date,                       -- date de paiement
   datev           date,                       -- date de valeur
diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql
index b49feba85d6..8aa0d381e26 100644
--- a/htdocs/install/mysql/tables/llx_user.sql
+++ b/htdocs/install/mysql/tables/llx_user.sql
@@ -25,11 +25,13 @@ create table llx_user
   ref_ext			varchar(50),				-- reference into an external system (not used by dolibarr)
   ref_int			varchar(50),				-- reference into an internal system (deprecated)
 
+  admin             smallint DEFAULT 0,			-- user has admin profile
+
   employee          tinyint        DEFAULT 1,	-- 1 if user is an employee
   fk_establishment  integer        DEFAULT 0,
 
   datec             datetime,
-  tms               timestamp,
+  tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat     integer,
   fk_user_modif     integer,
   login             varchar(50) NOT NULL,
@@ -55,27 +57,30 @@ create table llx_user
   personal_mobile   varchar(20),
   email             varchar(255),
   personal_email    varchar(255),
+  signature         text DEFAULT NULL,
 
   socialnetworks    text DEFAULT NULL,       -- json with socialnetworks
 
-  signature         text DEFAULT NULL,
-  admin             smallint DEFAULT 0,
+  --module_comm       smallint DEFAULT 1,
+  --module_compta     smallint DEFAULT 1,
   
-  module_comm       smallint DEFAULT 1,
-  module_compta     smallint DEFAULT 1,
-  
-  fk_soc			integer,
-  fk_socpeople      integer,
-  fk_member         integer,
-  fk_user           integer,					-- Hierarchic parent
+  fk_soc			integer,					-- id thirdparty if user linked to a company (external user)
+  fk_socpeople      integer,					-- id contact origin if user linked to a contact
+  fk_member         integer,					-- if member if suer linked to a member
+  fk_user           integer,					-- Supervisor, hierarchic parent
   fk_user_expense_validator           integer,
   fk_user_holiday_validator           integer,
   
+  idpers1			varchar(128),
+  idpers2			varchar(128),
+  idpers3			varchar(128),
+  
   note_public		text,
   note              text DEFAULT NULL,
   model_pdf         varchar(255) DEFAULT NULL,
   datelastlogin     datetime,
   datepreviouslogin datetime,
+  datelastpassvalidation datetime,				-- last date we change password or we made a disconnect all
   datestartvalidity datetime,
   dateendvalidity   datetime,
   iplastlogin       varchar(250),
@@ -103,5 +108,5 @@ create table llx_user
   import_key        varchar(14),				-- import key
   default_range     integer,
   default_c_exp_tax_cat     integer,
-  fk_warehouse     integer
+  fk_warehouse      integer						-- default warehouse os user
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_user_employment.sql b/htdocs/install/mysql/tables/llx_user_employment.sql
index ff2a87028d4..c06df0189d2 100644
--- a/htdocs/install/mysql/tables/llx_user_employment.sql
+++ b/htdocs/install/mysql/tables/llx_user_employment.sql
@@ -25,7 +25,7 @@ create table llx_user_employment
   ref_ext			varchar(50),				-- reference into an external system (not used by dolibarr)
   fk_user			integer,
   datec             datetime,
-  tms               timestamp,
+  tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat     integer,
   fk_user_modif     integer,
   job				varchar(128),				-- job position. may be a dictionary
diff --git a/htdocs/install/mysql/tables/llx_user_extrafields.sql b/htdocs/install/mysql/tables/llx_user_extrafields.sql
index b7ba9116630..c38e9435a63 100644
--- a/htdocs/install/mysql/tables/llx_user_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_user_extrafields.sql
@@ -21,7 +21,7 @@
 create table llx_user_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- member id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_user_rib.sql b/htdocs/install/mysql/tables/llx_user_rib.sql
index 1349e77a77b..4463a1f6f2b 100644
--- a/htdocs/install/mysql/tables/llx_user_rib.sql
+++ b/htdocs/install/mysql/tables/llx_user_rib.sql
@@ -22,7 +22,7 @@ create table llx_user_rib
   fk_user        integer      NOT NULL,
   entity         integer DEFAULT 1 NOT NULL,	-- multi company id
   datec          datetime,
-  tms            timestamp,
+  tms            timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   label          varchar(30),
   bank           varchar(255),  -- bank name
   code_banque    varchar(128),  -- bank code
diff --git a/htdocs/install/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql
index 43bbba9dbb1..959dfbca3d9 100644
--- a/htdocs/install/mysql/tables/llx_usergroup.sql
+++ b/htdocs/install/mysql/tables/llx_usergroup.sql
@@ -24,7 +24,7 @@ create table llx_usergroup
   nom           varchar(180) NOT NULL,
   entity        integer DEFAULT 1 NOT NULL,	-- multi company id
   datec         datetime,
-  tms           timestamp,
+  tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   note          text,
   model_pdf     varchar(255) DEFAULT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql b/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql
index e2e96f142d9..ea358509eff 100644
--- a/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql
@@ -18,7 +18,7 @@
 
 CREATE TABLE llx_usergroup_extrafields (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_website.sql b/htdocs/install/mysql/tables/llx_website.sql
index 717052f795c..b2103177972 100644
--- a/htdocs/install/mysql/tables/llx_website.sql
+++ b/htdocs/install/mysql/tables/llx_website.sql
@@ -36,6 +36,6 @@ CREATE TABLE llx_website
     fk_user_modif integer,
     date_creation datetime,
     position      integer DEFAULT 0,
-	tms           timestamp,
+	tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     import_key    varchar(14)      -- import key	
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_website_extrafields.sql b/htdocs/install/mysql/tables/llx_website_extrafields.sql
index ff39e2c51c4..b3fd6786a09 100644
--- a/htdocs/install/mysql/tables/llx_website_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_website_extrafields.sql
@@ -16,7 +16,7 @@
 CREATE TABLE llx_website_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_website_page.sql b/htdocs/install/mysql/tables/llx_website_page.sql
index e2bec4a8a24..499bf23d1f5 100644
--- a/htdocs/install/mysql/tables/llx_website_page.sql
+++ b/htdocs/install/mysql/tables/llx_website_page.sql
@@ -29,7 +29,8 @@ CREATE TABLE llx_website_page
 	image         varchar(255),						
 	keywords      varchar(255),
 	lang          varchar(6),
-	fk_page       integer,          
+	fk_page       integer,
+	allowed_in_frames  integer DEFAULT 0,
 	htmlheader	  text,
 	content		  mediumtext,		-- text is not enough in size
     status        integer DEFAULT 1,
@@ -38,8 +39,8 @@ CREATE TABLE llx_website_page
     fk_user_modif integer,
     author_alias  varchar(64),
     date_creation datetime,
-	tms           timestamp,
+	tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     import_key    varchar(14),      -- import key
-    object_type varchar(255),
-    fk_object     varchar(255)
+    object_type   varchar(255),		-- To link page to an object
+    fk_object     varchar(255)		-- To link page to an object
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_zapier_hook.sql b/htdocs/install/mysql/tables/llx_zapier_hook.sql
index 27d56352bff..b54fbc0d348 100644
--- a/htdocs/install/mysql/tables/llx_zapier_hook.sql
+++ b/htdocs/install/mysql/tables/llx_zapier_hook.sql
@@ -22,8 +22,8 @@ CREATE TABLE llx_zapier_hook(
     module varchar(128),
     action varchar(128),
     status integer,
-    date_creation DATETIME NOT NULL,
+    date_creation datetime NOT NULL,
     fk_user integer NOT NULL,
-    tms TIMESTAMP NOT NULL,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     import_key varchar(14)
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_zapier_hook_extrafields.sql b/htdocs/install/mysql/tables/llx_zapier_hook_extrafields.sql
deleted file mode 100644
index 09fef4cc399..00000000000
--- a/htdocs/install/mysql/tables/llx_zapier_hook_extrafields.sql
+++ /dev/null
@@ -1,23 +0,0 @@
--- Copyright (C) ---Put here your own copyright and developer email---
---
--- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License
--- along with this program. If not, see http://www.gnu.org/licenses/.
-
-create table llx_zapier_hook_extrafields
-(
-  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
-  fk_object                 integer NOT NULL,
-  import_key                varchar(14)                          -- import key
-) ENGINE=innodb;
-
diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql
index 309343b7789..cd98cdfef2e 100644
--- a/htdocs/install/pgsql/functions/functions.sql
+++ b/htdocs/install/pgsql/functions/functions.sql
@@ -124,7 +124,7 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_facturedet_extrafiel
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_fichinter FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_fichinter_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_fichinterdet_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_livraison FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_delivery FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_loan FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_localtax FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_mailing FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index e8965adedb3..14138dc5664 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -225,7 +225,7 @@ if ($ok && GETPOST('standard', 'alpha'))
 	$listofmodulesextra = array('societe'=>'societe', 'adherent'=>'adherent', 'product'=>'product',
 				'socpeople'=>'socpeople', 'commande'=>'commande', 'facture'=>'facture',
 				'supplier_proposal'=>'supplier_proposal', 'commande_fournisseur'=>'commande_fournisseur', 'facture_fourn'=>'facture_fourn',
-				'actioncomm'=>'actioncomm',
+				'actioncomm'=>'actioncomm', 'bom_bom'=>'bom_bom', 'mrp_mo'=>'mrp_mo',
 				'adherent_type'=>'adherent_type', 'user'=>'user', 'projet'=>'projet', 'projet_task'=>'projet_task');
 	print '<tr><td colspan="2"><br>*** Check fields into extra table structure match table of definition. If not add column into table</td></tr>';
 	foreach ($listofmodulesextra as $tablename => $elementtype)
@@ -1473,7 +1473,7 @@ if (empty($actiondone))
 
 if ($oneoptionset)
 {
-	print '<div class="center" style="padding-top: 10px"><a href="../index.php?mainmenu=home&leftmenu=home'.(isset($_POST["login"]) ? '&username='.urlencode($_POST["login"]) : '').'">';
+	print '<div class="center" style="padding-top: 10px"><a href="../index.php?mainmenu=home&leftmenu=home'.(GETPOSTISSET("login") ? '&username='.urlencode(GETPOST("login")) : '').'">';
 	print $langs->trans("GoToDolibarr");
 	print '</a></div>';
 } else {
diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index 9d0d0a99038..5b99649cf1a 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -64,6 +64,8 @@ $main_use_alt_dir = ((GETPOST("main_use_alt_dir", 'alpha') == '' || (GETPOST("ma
 // Alternative root directory name
 $main_alt_dir_name = ((GETPOST("main_alt_dir_name", 'alpha') && GETPOST("main_alt_dir_name", 'alpha') != '') ? GETPOST("main_alt_dir_name", 'alpha') : 'custom');
 
+$dolibarr_main_distrib = 'standard';
+
 session_start(); // To be able to keep info into session (used for not losing password during navigation. The password must not transit through parameters)
 
 // Save a flag to tell to restore input value if we go back
@@ -127,6 +129,10 @@ if (@file_exists($forcedfile)) {
 			$main_force_https = $force_install_mainforcehttps;
 		}
 	}
+
+	if (!empty($force_install_distrib)) {
+		$dolibarr_main_distrib = $force_install_distrib;
+	}
 }
 
 
@@ -144,9 +150,9 @@ pHeader($langs->trans("ConfigurationFile"), "step2");
 // Test if we can run a first install process
 if (!is_writable($conffile))
 {
-    print $langs->trans("ConfFileIsNotWritable", $conffiletoshow);
-    pFooter(1, $setuplang, 'jscheckparam');
-    exit;
+	print $langs->trans("ConfFileIsNotWritable", $conffiletoshow);
+	pFooter(1, $setuplang, 'jscheckparam');
+	exit;
 }
 
 
@@ -154,30 +160,30 @@ if (!is_writable($conffile))
 $is_sqlite = false;
 if (empty($db_type))
 {
-    print '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentities("DatabaseType")).'</div>';
-    $error++;
+	print '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentities("DatabaseType")).'</div>';
+	$error++;
 } else {
 	$is_sqlite = ($db_type === 'sqlite' || $db_type === 'sqlite3');
 }
 if (empty($db_host) && !$is_sqlite)
 {
-    print '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentities("Server")).'</div>';
-    $error++;
+	print '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentities("Server")).'</div>';
+	$error++;
 }
 if (empty($db_name))
 {
-    print '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentities("DatabaseName")).'</div>';
-    $error++;
+	print '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentities("DatabaseName")).'</div>';
+	$error++;
 }
 if (empty($db_user) && !$is_sqlite)
 {
-    print '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentities("Login")).'</div>';
-    $error++;
+	print '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentities("Login")).'</div>';
+	$error++;
 }
 if (!empty($db_port) && !is_numeric($db_port))
 {
-    print '<div class="error">'.$langs->trans("ErrorBadValueForParameter", $db_port, $langs->transnoentities("Port")).'</div>';
-    $error++;
+	print '<div class="error">'.$langs->trans("ErrorBadValueForParameter", $db_port, $langs->transnoentities("Port")).'</div>';
+	$error++;
 }
 if (!empty($db_prefix) && !preg_match('/^[a-z0-9]+_$/i', $db_prefix))
 {
@@ -189,563 +195,563 @@ if (!empty($db_prefix) && !preg_match('/^[a-z0-9]+_$/i', $db_prefix))
 // Remove last / into dans main_dir
 if (substr($main_dir, dol_strlen($main_dir) - 1) == "/")
 {
-    $main_dir = substr($main_dir, 0, dol_strlen($main_dir) - 1);
+	$main_dir = substr($main_dir, 0, dol_strlen($main_dir) - 1);
 }
 
 // Remove last / into dans main_url
 if (!empty($main_url) && substr($main_url, dol_strlen($main_url) - 1) == "/")
 {
-    $main_url = substr($main_url, 0, dol_strlen($main_url) - 1);
+	$main_url = substr($main_url, 0, dol_strlen($main_url) - 1);
 }
 
 // Test database connection
 if (!$error) {
-    $result = @include_once $main_dir."/core/db/".$db_type.'.class.php';
-    if ($result)
-    {
-        // If we require database or user creation we need to connect as root, so we need root login credentials
-        if (!empty($db_create_database) && !$userroot) {
-            print '<div class="error">'.$langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect", $db_name).'</div>';
-            print '<br>';
-            print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
-            print $langs->trans("ErrorGoBackAndCorrectParameters");
-            $error++;
-        }
-        if (!empty($db_create_user) && !$userroot) {
-            print '<div class="error">'.$langs->trans("YouAskLoginCreationSoDolibarrNeedToConnect", $db_user).'</div>';
-            print '<br>';
-            print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
-            print $langs->trans("ErrorGoBackAndCorrectParameters");
-            $error++;
-        }
+	$result = @include_once $main_dir."/core/db/".$db_type.'.class.php';
+	if ($result)
+	{
+		// If we require database or user creation we need to connect as root, so we need root login credentials
+		if (!empty($db_create_database) && !$userroot) {
+			print '<div class="error">'.$langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect", $db_name).'</div>';
+			print '<br>';
+			print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
+			print $langs->trans("ErrorGoBackAndCorrectParameters");
+			$error++;
+		}
+		if (!empty($db_create_user) && !$userroot) {
+			print '<div class="error">'.$langs->trans("YouAskLoginCreationSoDolibarrNeedToConnect", $db_user).'</div>';
+			print '<br>';
+			print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
+			print $langs->trans("ErrorGoBackAndCorrectParameters");
+			$error++;
+		}
 
-        // If we need root access
-        if (!$error && (!empty($db_create_database) || !empty($db_create_user))) {
-            $databasefortest = $db_name;
-            if (!empty($db_create_database)) {
-                if ($db_type == 'mysql' || $db_type == 'mysqli')
-                {
-                    $databasefortest = 'mysql';
-                } elseif ($db_type == 'pgsql')
-                {
-                    $databasefortest = 'postgres';
-                } else {
-                    $databasefortest = 'master';
-                }
-            }
-            //print $_POST["db_type"].",".$_POST["db_host"].",$userroot,$passroot,$databasefortest,".$_POST["db_port"];
+		// If we need root access
+		if (!$error && (!empty($db_create_database) || !empty($db_create_user))) {
+			$databasefortest = $db_name;
+			if (!empty($db_create_database)) {
+				if ($db_type == 'mysql' || $db_type == 'mysqli')
+				{
+					$databasefortest = 'mysql';
+				} elseif ($db_type == 'pgsql')
+				{
+					$databasefortest = 'postgres';
+				} else {
+					$databasefortest = 'master';
+				}
+			}
+			//print $_POST["db_type"].",".$_POST["db_host"].",$userroot,$passroot,$databasefortest,".$_POST["db_port"];
 
-            $db = getDoliDBInstance($db_type, $db_host, $userroot, $passroot, $databasefortest, $db_port);
+			$db = getDoliDBInstance($db_type, $db_host, $userroot, $passroot, $databasefortest, $db_port);
 
-            dol_syslog("databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected, LOG_DEBUG);
-            //print "databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected;
+			dol_syslog("databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected, LOG_DEBUG);
+			//print "databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected;
 
 			if (empty($db_create_database) && $db->connected && !$db->database_selected) {
-                print '<div class="error">'.$langs->trans("ErrorConnectedButDatabaseNotFound", $db_name).'</div>';
-                print '<br>';
-                if (!$db->connected) print $langs->trans("IfDatabaseNotExistsGoBackAndUncheckCreate").'<br><br>';
-                print $langs->trans("ErrorGoBackAndCorrectParameters");
-                $error++;
-            } elseif ($db->error && !(!empty($db_create_database) && $db->connected)) {
-            	// Note: you may experience error here with message "No such file or directory" when mysql was installed for the first time but not yet launched.
-                if ($db->error == "No such file or directory") print '<div class="error">'.$langs->trans("ErrorToConnectToMysqlCheckInstance").'</div>';
-                else print '<div class="error">'.$db->error.'</div>';
-                if (!$db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
-                //print '<a href="#" onClick="javascript: history.back();">';
-                print $langs->trans("ErrorGoBackAndCorrectParameters");
-                //print '</a>';
-                $error++;
-            }
-        }
-        // If we need simple access
-        if (!$error && (empty($db_create_database) && empty($db_create_user))) {
-            $db = getDoliDBInstance($db_type, $db_host, $db_user, $db_pass, $db_name, $db_port);
+				print '<div class="error">'.$langs->trans("ErrorConnectedButDatabaseNotFound", $db_name).'</div>';
+				print '<br>';
+				if (!$db->connected) print $langs->trans("IfDatabaseNotExistsGoBackAndUncheckCreate").'<br><br>';
+				print $langs->trans("ErrorGoBackAndCorrectParameters");
+				$error++;
+			} elseif ($db->error && !(!empty($db_create_database) && $db->connected)) {
+				// Note: you may experience error here with message "No such file or directory" when mysql was installed for the first time but not yet launched.
+				if ($db->error == "No such file or directory") print '<div class="error">'.$langs->trans("ErrorToConnectToMysqlCheckInstance").'</div>';
+				else print '<div class="error">'.$db->error.'</div>';
+				if (!$db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
+				//print '<a href="#" onClick="javascript: history.back();">';
+				print $langs->trans("ErrorGoBackAndCorrectParameters");
+				//print '</a>';
+				$error++;
+			}
+		}
+		// If we need simple access
+		if (!$error && (empty($db_create_database) && empty($db_create_user))) {
+			$db = getDoliDBInstance($db_type, $db_host, $db_user, $db_pass, $db_name, $db_port);
 
-            if ($db->error)
-            {
-                print '<div class="error">'.$db->error.'</div>';
-                if (!$db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
-                //print '<a href="#" onClick="javascript: history.back();">';
-                print $langs->trans("ErrorGoBackAndCorrectParameters");
-                //print '</a>';
-                $error++;
-            }
-        }
-    } else {
-        print "<br>\nFailed to include_once(\"".$main_dir."/core/db/".$db_type.".class.php\")<br>\n";
-        print '<div class="error">'.$langs->trans("ErrorWrongValueForParameter", $langs->transnoentities("WebPagesDirectory")).'</div>';
-        //print '<a href="#" onClick="javascript: history.back();">';
-        print $langs->trans("ErrorGoBackAndCorrectParameters");
-        //print '</a>';
-        $error++;
-    }
+			if ($db->error)
+			{
+				print '<div class="error">'.$db->error.'</div>';
+				if (!$db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
+				//print '<a href="#" onClick="javascript: history.back();">';
+				print $langs->trans("ErrorGoBackAndCorrectParameters");
+				//print '</a>';
+				$error++;
+			}
+		}
+	} else {
+		print "<br>\nFailed to include_once(\"".$main_dir."/core/db/".$db_type.".class.php\")<br>\n";
+		print '<div class="error">'.$langs->trans("ErrorWrongValueForParameter", $langs->transnoentities("WebPagesDirectory")).'</div>';
+		//print '<a href="#" onClick="javascript: history.back();">';
+		print $langs->trans("ErrorGoBackAndCorrectParameters");
+		//print '</a>';
+		$error++;
+	}
 } else {
-    if (isset($db)) print $db->lasterror();
-    if (isset($db) && !$db->connected) print '<br>'.$langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
-    print $langs->trans("ErrorGoBackAndCorrectParameters");
-    $error++;
+	if (isset($db)) print $db->lasterror();
+	if (isset($db) && !$db->connected) print '<br>'.$langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
+	print $langs->trans("ErrorGoBackAndCorrectParameters");
+	$error++;
 }
 
 if (!$error && $db->connected)
 {
-    if (!empty($db_create_database)) {
-        $result = $db->select_db($db_name);
-        if ($result)
-        {
-            print '<div class="error">'.$langs->trans("ErrorDatabaseAlreadyExists", $db_name).'</div>';
-            print $langs->trans("IfDatabaseExistsGoBackAndCheckCreate").'<br><br>';
-            print $langs->trans("ErrorGoBackAndCorrectParameters");
-            $error++;
-        }
-    }
+	if (!empty($db_create_database)) {
+		$result = $db->select_db($db_name);
+		if ($result)
+		{
+			print '<div class="error">'.$langs->trans("ErrorDatabaseAlreadyExists", $db_name).'</div>';
+			print $langs->trans("IfDatabaseExistsGoBackAndCheckCreate").'<br><br>';
+			print $langs->trans("ErrorGoBackAndCorrectParameters");
+			$error++;
+		}
+	}
 }
 
 // Define $defaultCharacterSet and $defaultDBSortingCollation
 if (!$error && $db->connected)
 {
-    if (!empty($db_create_database))    // If we create database, we force default value
-    {
-        // Default values come from the database handler
+	if (!empty($db_create_database))    // If we create database, we force default value
+	{
+		// Default values come from the database handler
 
-        $defaultCharacterSet = $db->forcecharset;
-    	$defaultDBSortingCollation = $db->forcecollate;
-    } else // If already created, we take current value
-    {
-        $defaultCharacterSet = $db->getDefaultCharacterSetDatabase();
-        $defaultDBSortingCollation = $db->getDefaultCollationDatabase();
-    }
+		$defaultCharacterSet = $db->forcecharset;
+		$defaultDBSortingCollation = $db->forcecollate;
+	} else // If already created, we take current value
+	{
+		$defaultCharacterSet = $db->getDefaultCharacterSetDatabase();
+		$defaultDBSortingCollation = $db->getDefaultCollationDatabase();
+	}
 
-    // Force to avoid utf8mb4 because index on field char 255 reach limit of 767 char for indexes (example with mysql 5.6.34 = mariadb 10.0.29)
-    // TODO Remove this when utf8mb4 is supported
-    if ($defaultCharacterSet == 'utf8mb4' || $defaultDBSortingCollation == 'utf8mb4_unicode_ci')
-    {
-        $defaultCharacterSet = 'utf8';
-        $defaultDBSortingCollation = 'utf8_unicode_ci';
-    }
+	// Force to avoid utf8mb4 because index on field char 255 reach limit of 767 char for indexes (example with mysql 5.6.34 = mariadb 10.0.29)
+	// TODO Remove this when utf8mb4 is supported
+	if ($defaultCharacterSet == 'utf8mb4' || $defaultDBSortingCollation == 'utf8mb4_unicode_ci')
+	{
+		$defaultCharacterSet = 'utf8';
+		$defaultDBSortingCollation = 'utf8_unicode_ci';
+	}
 
-    print '<input type="hidden" name="dolibarr_main_db_character_set" value="'.$defaultCharacterSet.'">';
-    print '<input type="hidden" name="dolibarr_main_db_collation" value="'.$defaultDBSortingCollation.'">';
-    $db_character_set = $defaultCharacterSet;
-    $db_collation = $defaultDBSortingCollation;
-    dolibarr_install_syslog("step1: db_character_set=".$db_character_set." db_collation=".$db_collation);
+	print '<input type="hidden" name="dolibarr_main_db_character_set" value="'.$defaultCharacterSet.'">';
+	print '<input type="hidden" name="dolibarr_main_db_collation" value="'.$defaultDBSortingCollation.'">';
+	$db_character_set = $defaultCharacterSet;
+	$db_collation = $defaultDBSortingCollation;
+	dolibarr_install_syslog("step1: db_character_set=".$db_character_set." db_collation=".$db_collation);
 }
 
 
 // Create config file
 if (!$error && $db->connected && $action == "set")
 {
-    umask(0);
-    if (is_array($_POST))
-    {
-        foreach ($_POST as $key => $value)
-        {
-            if (!preg_match('/^db_pass/i', $key)) {
-    			dolibarr_install_syslog("step1: choice for ".$key." = ".$value);
-    		}
-        }
-    }
+	umask(0);
+	if (is_array($_POST))
+	{
+		foreach ($_POST as $key => $value)
+		{
+			if (!preg_match('/^db_pass/i', $key)) {
+				dolibarr_install_syslog("step1: choice for ".$key." = ".$value);
+			}
+		}
+	}
 
-    // Show title of step
-    print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/gear.svg" width="20" alt="Configuration"> '.$langs->trans("ConfigurationFile").'</h3>';
-    print '<table cellspacing="0" width="100%" cellpadding="1" border="0">';
+	// Show title of step
+	print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/gear.svg" width="20" alt="Configuration"> '.$langs->trans("ConfigurationFile").'</h3>';
+	print '<table cellspacing="0" width="100%" cellpadding="1" border="0">';
 
-    // Check parameter main_dir
-    if (!$error)
-    {
-        if (!is_dir($main_dir))
-        {
-            dolibarr_install_syslog("step1: directory '".$main_dir."' is unavailable or can't be accessed");
+	// Check parameter main_dir
+	if (!$error)
+	{
+		if (!is_dir($main_dir))
+		{
+			dolibarr_install_syslog("step1: directory '".$main_dir."' is unavailable or can't be accessed");
 
-            print "<tr><td>";
-            print $langs->trans("ErrorDirDoesNotExists", $main_dir).'<br>';
-            print $langs->trans("ErrorWrongValueForParameter", $langs->transnoentitiesnoconv("WebPagesDirectory")).'<br>';
-            print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
-            print '</td><td>';
-            print $langs->trans("Error");
-            print "</td></tr>";
-            $error++;
-        }
-    }
+			print "<tr><td>";
+			print $langs->trans("ErrorDirDoesNotExists", $main_dir).'<br>';
+			print $langs->trans("ErrorWrongValueForParameter", $langs->transnoentitiesnoconv("WebPagesDirectory")).'<br>';
+			print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
+			print '</td><td>';
+			print $langs->trans("Error");
+			print "</td></tr>";
+			$error++;
+		}
+	}
 
-    if (!$error)
-    {
-        dolibarr_install_syslog("step1: directory '".$main_dir."' exists");
-    }
+	if (!$error)
+	{
+		dolibarr_install_syslog("step1: directory '".$main_dir."' exists");
+	}
 
 
-    // Create subdirectory main_data_dir
-    if (!$error)
-    {
-        // Create directory for documents
-        if (!is_dir($main_data_dir))
-        {
-            dol_mkdir($main_data_dir);
-        }
+	// Create subdirectory main_data_dir
+	if (!$error)
+	{
+		// Create directory for documents
+		if (!is_dir($main_data_dir))
+		{
+			dol_mkdir($main_data_dir);
+		}
 
-        if (!is_dir($main_data_dir))
-        {
-            print "<tr><td>".$langs->trans("ErrorDirDoesNotExists", $main_data_dir);
-            print ' '.$langs->trans("YouMustCreateItAndAllowServerToWrite");
-            print '</td><td>';
-            print '<span class="error">'.$langs->trans("Error").'</span>';
-            print "</td></tr>";
-            print '<tr><td colspan="2"><br>'.$langs->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'].'?testget=ok').'</td></tr>';
-            $error++;
-        } else {
-            // Create .htaccess file in document directory
-            $pathhtaccess = $main_data_dir.'/.htaccess';
-            if (!file_exists($pathhtaccess))
-            {
-                dolibarr_install_syslog("step1: .htaccess file did not exist, we created it in '".$main_data_dir."'");
-                $handlehtaccess = @fopen($pathhtaccess, 'w');
-                if ($handlehtaccess)
-                {
-                    fwrite($handlehtaccess, 'Order allow,deny'."\n");
-                    fwrite($handlehtaccess, 'Deny from all'."\n");
+		if (!is_dir($main_data_dir))
+		{
+			print "<tr><td>".$langs->trans("ErrorDirDoesNotExists", $main_data_dir);
+			print ' '.$langs->trans("YouMustCreateItAndAllowServerToWrite");
+			print '</td><td>';
+			print '<span class="error">'.$langs->trans("Error").'</span>';
+			print "</td></tr>";
+			print '<tr><td colspan="2"><br>'.$langs->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'].'?testget=ok').'</td></tr>';
+			$error++;
+		} else {
+			// Create .htaccess file in document directory
+			$pathhtaccess = $main_data_dir.'/.htaccess';
+			if (!file_exists($pathhtaccess))
+			{
+				dolibarr_install_syslog("step1: .htaccess file did not exist, we created it in '".$main_data_dir."'");
+				$handlehtaccess = @fopen($pathhtaccess, 'w');
+				if ($handlehtaccess)
+				{
+					fwrite($handlehtaccess, 'Order allow,deny'."\n");
+					fwrite($handlehtaccess, 'Deny from all'."\n");
 
-                    fclose($handlehtaccess);
-                    dolibarr_install_syslog("step1: .htaccess file created");
-                }
-            }
+					fclose($handlehtaccess);
+					dolibarr_install_syslog("step1: .htaccess file created");
+				}
+			}
 
-            // Documents are stored above the web pages root to prevent being downloaded without authentification
-            $dir = array();
-            $dir[] = $main_data_dir."/mycompany";
-            $dir[] = $main_data_dir."/medias";
-            $dir[] = $main_data_dir."/users";
-            $dir[] = $main_data_dir."/facture";
-            $dir[] = $main_data_dir."/propale";
-            $dir[] = $main_data_dir."/ficheinter";
-            $dir[] = $main_data_dir."/produit";
-            $dir[] = $main_data_dir."/doctemplates";
+			// Documents are stored above the web pages root to prevent being downloaded without authentification
+			$dir = array();
+			$dir[] = $main_data_dir."/mycompany";
+			$dir[] = $main_data_dir."/medias";
+			$dir[] = $main_data_dir."/users";
+			$dir[] = $main_data_dir."/facture";
+			$dir[] = $main_data_dir."/propale";
+			$dir[] = $main_data_dir."/ficheinter";
+			$dir[] = $main_data_dir."/produit";
+			$dir[] = $main_data_dir."/doctemplates";
 
-            // Loop on each directory of dir [] to create them if they do not exist
-            $num = count($dir);
-            for ($i = 0; $i < $num; $i++)
-            {
-                if (is_dir($dir[$i]))
-                {
-                    dolibarr_install_syslog("step1: directory '".$dir[$i]."' exists");
-                } else {
-                    if (dol_mkdir($dir[$i]) < 0)
-                    {
-                        print "<tr><td>";
-                        print "Failed to create directory: ".$dir[$i];
-                        print '</td><td>';
-                        print $langs->trans("Error");
-                        print "</td></tr>";
-                        $error++;
-                    } else {
-                        dolibarr_install_syslog("step1: directory '".$dir[$i]."' created");
-                    }
-                }
-            }
+			// Loop on each directory of dir [] to create them if they do not exist
+			$num = count($dir);
+			for ($i = 0; $i < $num; $i++)
+			{
+				if (is_dir($dir[$i]))
+				{
+					dolibarr_install_syslog("step1: directory '".$dir[$i]."' exists");
+				} else {
+					if (dol_mkdir($dir[$i]) < 0)
+					{
+						print "<tr><td>";
+						print "Failed to create directory: ".$dir[$i];
+						print '</td><td>';
+						print $langs->trans("Error");
+						print "</td></tr>";
+						$error++;
+					} else {
+						dolibarr_install_syslog("step1: directory '".$dir[$i]."' created");
+					}
+				}
+			}
 
-            require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-            // Copy directory medias
-            $srcroot = $main_dir.'/install/medias';
-            $destroot = $main_data_dir.'/medias';
-            dolCopyDir($srcroot, $destroot, 0, 0);
+			// Copy directory medias
+			$srcroot = $main_dir.'/install/medias';
+			$destroot = $main_data_dir.'/medias';
+			dolCopyDir($srcroot, $destroot, 0, 0);
 
-            if ($error)
-            {
-                print "<tr><td>".$langs->trans("ErrorDirDoesNotExists", $main_data_dir);
-                print ' '.$langs->trans("YouMustCreateItAndAllowServerToWrite");
-                print '</td><td>';
-                print '<span class="error">'.$langs->trans("Error").'</span>';
-                print "</td></tr>";
-                print '<tr><td colspan="2"><br>'.$langs->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'].'?testget=ok').'</td></tr>';
-            } else {
-            	//ODT templates
-            	$srcroot = $main_dir.'/install/doctemplates';
-            	$destroot = $main_data_dir.'/doctemplates';
-            	$docs = array(
-            		'contracts' => 'contract',
-            		'invoices' => 'invoice',
-            		'orders' => 'order',
-            		'products' => 'product',
-            		'projects' => 'project',
-            		'proposals' => 'proposal',
-            		'shipments' => 'shipment',
-            		'supplier_proposals' => 'supplier_proposal',
-            		'tasks' => 'task_summary',
-            		'thirdparties' => 'thirdparty',
-            		'usergroups' => 'usergroups',
-            		'users' => 'user',
-            	);
-            	foreach ($docs as $cursordir => $cursorfile)
-            	{
-            		$src = $srcroot.'/'.$cursordir.'/template_'.$cursorfile.'.odt';
-            		$dirodt = $destroot.'/'.$cursordir;
-            		$dest = $dirodt.'/template_'.$cursorfile.'.odt';
+			if ($error)
+			{
+				print "<tr><td>".$langs->trans("ErrorDirDoesNotExists", $main_data_dir);
+				print ' '.$langs->trans("YouMustCreateItAndAllowServerToWrite");
+				print '</td><td>';
+				print '<span class="error">'.$langs->trans("Error").'</span>';
+				print "</td></tr>";
+				print '<tr><td colspan="2"><br>'.$langs->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'].'?testget=ok').'</td></tr>';
+			} else {
+				//ODT templates
+				$srcroot = $main_dir.'/install/doctemplates';
+				$destroot = $main_data_dir.'/doctemplates';
+				$docs = array(
+					'contracts' => 'contract',
+					'invoices' => 'invoice',
+					'orders' => 'order',
+					'products' => 'product',
+					'projects' => 'project',
+					'proposals' => 'proposal',
+					'shipments' => 'shipment',
+					'supplier_proposals' => 'supplier_proposal',
+					'tasks' => 'task_summary',
+					'thirdparties' => 'thirdparty',
+					'usergroups' => 'usergroups',
+					'users' => 'user',
+				);
+				foreach ($docs as $cursordir => $cursorfile)
+				{
+					$src = $srcroot.'/'.$cursordir.'/template_'.$cursorfile.'.odt';
+					$dirodt = $destroot.'/'.$cursordir;
+					$dest = $dirodt.'/template_'.$cursorfile.'.odt';
 
-            		dol_mkdir($dirodt);
-            		$result = dol_copy($src, $dest, 0, 0);
-            		if ($result < 0)
-            		{
-            			print '<tr><td colspan="2"><br>'.$langs->trans('ErrorFailToCopyFile', $src, $dest).'</td></tr>';
-            		}
-            	}
-            }
-        }
-    }
+					dol_mkdir($dirodt);
+					$result = dol_copy($src, $dest, 0, 0);
+					if ($result < 0)
+					{
+						print '<tr><td colspan="2"><br>'.$langs->trans('ErrorFailToCopyFile', $src, $dest).'</td></tr>';
+					}
+				}
+			}
+		}
+	}
 
-    // Table prefix
-    $main_db_prefix = (!empty($db_prefix) ? $db_prefix : 'llx_');
+	// Table prefix
+	$main_db_prefix = (!empty($db_prefix) ? $db_prefix : 'llx_');
 
-    // Write conf file on disk
-    if (!$error)
-    {
-        // Save old conf file on disk
-        if (file_exists("$conffile"))
-        {
-            // We must ignore errors as an existing old file may already exist and not be replaceable or
-            // the installer (like for ubuntu) may not have permission to create another file than conf.php.
-            // Also no other process must be able to read file or we expose the new file, so content with password.
-            @dol_copy($conffile, $conffile.'.old', '0400');
-        }
+	// Write conf file on disk
+	if (!$error)
+	{
+		// Save old conf file on disk
+		if (file_exists("$conffile"))
+		{
+			// We must ignore errors as an existing old file may already exist and not be replaceable or
+			// the installer (like for ubuntu) may not have permission to create another file than conf.php.
+			// Also no other process must be able to read file or we expose the new file, so content with password.
+			@dol_copy($conffile, $conffile.'.old', '0400');
+		}
 
-        $error += write_conf_file($conffile);
-    }
+		$error += write_conf_file($conffile);
+	}
 
-    // Create database and admin user database
-    if (!$error)
-    {
-        // We reload configuration file
-        conf($dolibarr_main_document_root);
+	// Create database and admin user database
+	if (!$error)
+	{
+		// We reload configuration file
+		conf($dolibarr_main_document_root);
 
-        print '<tr><td>';
-        print $langs->trans("ConfFileReload");
-        print '</td>';
-        print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
+		print '<tr><td>';
+		print $langs->trans("ConfFileReload");
+		print '</td>';
+		print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
 
-        // Create database user if requested
-        if (isset($db_create_user) && ($db_create_user == "1" || $db_create_user == "on")) {
-            dolibarr_install_syslog("step1: create database user: ".$dolibarr_main_db_user);
+		// Create database user if requested
+		if (isset($db_create_user) && ($db_create_user == "1" || $db_create_user == "on")) {
+			dolibarr_install_syslog("step1: create database user: ".$dolibarr_main_db_user);
 
-            //print $conf->db->host." , ".$conf->db->name." , ".$conf->db->user." , ".$conf->db->port;
-            $databasefortest = $conf->db->name;
-            if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
-            {
-                $databasefortest = 'mysql';
-            } elseif ($conf->db->type == 'pgsql')
-            {
-                $databasefortest = 'postgres';
-            } elseif ($conf->db->type == 'mssql')
-            {
-                $databasefortest = 'master';
-            }
+			//print $conf->db->host." , ".$conf->db->name." , ".$conf->db->user." , ".$conf->db->port;
+			$databasefortest = $conf->db->name;
+			if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
+			{
+				$databasefortest = 'mysql';
+			} elseif ($conf->db->type == 'pgsql')
+			{
+				$databasefortest = 'postgres';
+			} elseif ($conf->db->type == 'mssql')
+			{
+				$databasefortest = 'master';
+			}
 
-            // Check database connection
+			// Check database connection
 
-            $db = getDoliDBInstance($conf->db->type, $conf->db->host, $userroot, $passroot, $databasefortest, $conf->db->port);
+			$db = getDoliDBInstance($conf->db->type, $conf->db->host, $userroot, $passroot, $databasefortest, $conf->db->port);
 
-            if ($db->error)
-            {
-                print '<div class="error">'.$db->error.'</div>';
-                $error++;
-            }
+			if ($db->error)
+			{
+				print '<div class="error">'.$db->error.'</div>';
+				$error++;
+			}
 
-            if (!$error)
-            {
-                if ($db->connected)
-                {
-                    $resultbis = 1;
+			if (!$error)
+			{
+				if ($db->connected)
+				{
+					$resultbis = 1;
 
-                    // Create user
-                    $result = $db->DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
+					// Create user
+					$result = $db->DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
 
-                    // Create user bis
-                    if ($databasefortest == 'mysql')
-                    {
-                        if (!in_array($dolibarr_main_db_host, array('127.0.0.1', '::1', 'localhost', 'localhost.local')))
-                        {
-                            $resultbis = $db->DDLCreateUser('%', $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
-                        }
-                    }
+					// Create user bis
+					if ($databasefortest == 'mysql')
+					{
+						if (!in_array($dolibarr_main_db_host, array('127.0.0.1', '::1', 'localhost', 'localhost.local')))
+						{
+							$resultbis = $db->DDLCreateUser('%', $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
+						}
+					}
 
-                    if ($result > 0 && $resultbis > 0)
-                    {
-                        print '<tr><td>';
-                        print $langs->trans("UserCreation").' : ';
-                        print $dolibarr_main_db_user;
-                        print '</td>';
-                        print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
-                    } else {
-                        if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS'
-                        || $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS'
-                        || $db->errno() == 'DB_ERROR_USER_ALREADY_EXISTS')
-                        {
-                            dolibarr_install_syslog("step1: user already exists");
-                            print '<tr><td>';
-                            print $langs->trans("UserCreation").' : ';
-                            print $dolibarr_main_db_user;
-                            print '</td>';
-                            print '<td>'.$langs->trans("LoginAlreadyExists").'</td></tr>';
-                        } else {
-                            dolibarr_install_syslog("step1: failed to create user", LOG_ERR);
-                            print '<tr><td>';
-                            print $langs->trans("UserCreation").' : ';
-                            print $dolibarr_main_db_user;
-                            print '</td>';
-                            print '<td>'.$langs->trans("Error").': '.$db->errno().' '.$db->error().($db->error ? '. '.$db->error : '')."</td></tr>";
-                        }
-                    }
+					if ($result > 0 && $resultbis > 0)
+					{
+						print '<tr><td>';
+						print $langs->trans("UserCreation").' : ';
+						print $dolibarr_main_db_user;
+						print '</td>';
+						print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
+					} else {
+						if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS'
+						|| $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS'
+						|| $db->errno() == 'DB_ERROR_USER_ALREADY_EXISTS')
+						{
+							dolibarr_install_syslog("step1: user already exists");
+							print '<tr><td>';
+							print $langs->trans("UserCreation").' : ';
+							print $dolibarr_main_db_user;
+							print '</td>';
+							print '<td>'.$langs->trans("LoginAlreadyExists").'</td></tr>';
+						} else {
+							dolibarr_install_syslog("step1: failed to create user", LOG_ERR);
+							print '<tr><td>';
+							print $langs->trans("UserCreation").' : ';
+							print $dolibarr_main_db_user;
+							print '</td>';
+							print '<td>'.$langs->trans("Error").': '.$db->errno().' '.$db->error().($db->error ? '. '.$db->error : '')."</td></tr>";
+						}
+					}
 
-                    $db->close();
-                } else {
-                    print '<tr><td>';
-                    print $langs->trans("UserCreation").' : ';
-                    print $dolibarr_main_db_user;
-                    print '</td>';
-                    print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td>';
-                    print '</tr>';
+					$db->close();
+				} else {
+					print '<tr><td>';
+					print $langs->trans("UserCreation").' : ';
+					print $dolibarr_main_db_user;
+					print '</td>';
+					print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td>';
+					print '</tr>';
 
-                    // warning message due to connection failure
-                    print '<tr><td colspan="2"><br>';
-                    print $langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect", $dolibarr_main_db_user, $dolibarr_main_db_host, $userroot);
-                    print '<br>';
-                    print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
-                    print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
-                    print '</td></tr>';
+					// warning message due to connection failure
+					print '<tr><td colspan="2"><br>';
+					print $langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect", $dolibarr_main_db_user, $dolibarr_main_db_host, $userroot);
+					print '<br>';
+					print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
+					print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
+					print '</td></tr>';
 
-                    $error++;
-                }
-            }
-        }   // end of user account creation
+					$error++;
+				}
+			}
+		}   // end of user account creation
 
 
-        // If database creation was asked, we create it
-        if (!$error && (isset($db_create_database) && ($db_create_database == "1" || $db_create_database == "on"))) {
-            dolibarr_install_syslog("step1: create database: ".$dolibarr_main_db_name." ".$dolibarr_main_db_character_set." ".$dolibarr_main_db_collation." ".$dolibarr_main_db_user);
-        	$newdb = getDoliDBInstance($conf->db->type, $conf->db->host, $userroot, $passroot, '', $conf->db->port);
-            //print 'eee'.$conf->db->type." ".$conf->db->host." ".$userroot." ".$passroot." ".$conf->db->port." ".$newdb->connected." ".$newdb->forcecharset;exit;
+		// If database creation was asked, we create it
+		if (!$error && (isset($db_create_database) && ($db_create_database == "1" || $db_create_database == "on"))) {
+			dolibarr_install_syslog("step1: create database: ".$dolibarr_main_db_name." ".$dolibarr_main_db_character_set." ".$dolibarr_main_db_collation." ".$dolibarr_main_db_user);
+			$newdb = getDoliDBInstance($conf->db->type, $conf->db->host, $userroot, $passroot, '', $conf->db->port);
+			//print 'eee'.$conf->db->type." ".$conf->db->host." ".$userroot." ".$passroot." ".$conf->db->port." ".$newdb->connected." ".$newdb->forcecharset;exit;
 
-            if ($newdb->connected)
-            {
-                $result = $newdb->DDLCreateDb($dolibarr_main_db_name, $dolibarr_main_db_character_set, $dolibarr_main_db_collation, $dolibarr_main_db_user);
+			if ($newdb->connected)
+			{
+				$result = $newdb->DDLCreateDb($dolibarr_main_db_name, $dolibarr_main_db_character_set, $dolibarr_main_db_collation, $dolibarr_main_db_user);
 
-                if ($result)
-                {
-                    print '<tr><td>';
-                    print $langs->trans("DatabaseCreation")." (".$langs->trans("User")." ".$userroot.") : ";
-                    print $dolibarr_main_db_name;
-                    print '</td>';
-                    print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
+				if ($result)
+				{
+					print '<tr><td>';
+					print $langs->trans("DatabaseCreation")." (".$langs->trans("User")." ".$userroot.") : ";
+					print $dolibarr_main_db_name;
+					print '</td>';
+					print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
 
-                    $newdb->select_db($dolibarr_main_db_name);
-                    $check1 = $newdb->getDefaultCharacterSetDatabase();
-                    $check2 = $newdb->getDefaultCollationDatabase();
-                    dolibarr_install_syslog('step1: new database is using charset='.$check1.' collation='.$check2);
+					$newdb->select_db($dolibarr_main_db_name);
+					$check1 = $newdb->getDefaultCharacterSetDatabase();
+					$check2 = $newdb->getDefaultCollationDatabase();
+					dolibarr_install_syslog('step1: new database is using charset='.$check1.' collation='.$check2);
 
-                    // If values differs, we save conf file again
-                    //if ($check1 != $dolibarr_main_db_character_set) dolibarr_install_syslog('step1: value for character_set is not the one asked for database creation', LOG_WARNING);
-                    //if ($check2 != $dolibarr_main_db_collation)     dolibarr_install_syslog('step1: value for collation is not the one asked for database creation', LOG_WARNING);
-                } else {
-                    // warning message
-                    print '<tr><td colspan="2"><br>';
-                    print $langs->trans("ErrorFailedToCreateDatabase", $dolibarr_main_db_name).'<br>';
-                    print $newdb->lasterror().'<br>';
-                    print $langs->trans("IfDatabaseExistsGoBackAndCheckCreate");
-                    print '<br>';
-                    print '</td></tr>';
+					// If values differs, we save conf file again
+					//if ($check1 != $dolibarr_main_db_character_set) dolibarr_install_syslog('step1: value for character_set is not the one asked for database creation', LOG_WARNING);
+					//if ($check2 != $dolibarr_main_db_collation)     dolibarr_install_syslog('step1: value for collation is not the one asked for database creation', LOG_WARNING);
+				} else {
+					// warning message
+					print '<tr><td colspan="2"><br>';
+					print $langs->trans("ErrorFailedToCreateDatabase", $dolibarr_main_db_name).'<br>';
+					print $newdb->lasterror().'<br>';
+					print $langs->trans("IfDatabaseExistsGoBackAndCheckCreate");
+					print '<br>';
+					print '</td></tr>';
 
-                    dolibarr_install_syslog('step1: failed to create database '.$dolibarr_main_db_name.' '.$newdb->lasterrno().' '.$newdb->lasterror(), LOG_ERR);
-                    $error++;
-                }
-                $newdb->close();
-            } else {
-                print '<tr><td>';
-                print $langs->trans("DatabaseCreation")." (".$langs->trans("User")." ".$userroot.") : ";
-                print $dolibarr_main_db_name;
-                print '</td>';
-                print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td>';
-                print '</tr>';
+					dolibarr_install_syslog('step1: failed to create database '.$dolibarr_main_db_name.' '.$newdb->lasterrno().' '.$newdb->lasterror(), LOG_ERR);
+					$error++;
+				}
+				$newdb->close();
+			} else {
+				print '<tr><td>';
+				print $langs->trans("DatabaseCreation")." (".$langs->trans("User")." ".$userroot.") : ";
+				print $dolibarr_main_db_name;
+				print '</td>';
+				print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td>';
+				print '</tr>';
 
-                // warning message
-                print '<tr><td colspan="2"><br>';
-                print $langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect", $dolibarr_main_db_user, $dolibarr_main_db_host, $userroot);
-                print '<br>';
-                print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
-                print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
-                print '</td></tr>';
+				// warning message
+				print '<tr><td colspan="2"><br>';
+				print $langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect", $dolibarr_main_db_user, $dolibarr_main_db_host, $userroot);
+				print '<br>';
+				print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
+				print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
+				print '</td></tr>';
 
-                $error++;
-            }
-        }   // end of create database
+				$error++;
+			}
+		}   // end of create database
 
 
-        // We test access with dolibarr database user (not admin)
-        if (!$error)
-        {
-            dolibarr_install_syslog("step1: connection type=".$conf->db->type." on host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name);
-            //print "connexion de type=".$conf->db->type." sur host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name;
+		// We test access with dolibarr database user (not admin)
+		if (!$error)
+		{
+			dolibarr_install_syslog("step1: connection type=".$conf->db->type." on host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name);
+			//print "connexion de type=".$conf->db->type." sur host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name;
 
-            $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);
+			$db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);
 
-            if ($db->connected)
-            {
-                dolibarr_install_syslog("step1: connection to server by user ".$conf->db->user." ok");
-                print "<tr><td>";
-                print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
-                print $dolibarr_main_db_host;
-                print "</td><td>";
-                print '<img src="../theme/eldy/img/tick.png" alt="Ok">';
-                print "</td></tr>";
+			if ($db->connected)
+			{
+				dolibarr_install_syslog("step1: connection to server by user ".$conf->db->user." ok");
+				print "<tr><td>";
+				print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
+				print $dolibarr_main_db_host;
+				print "</td><td>";
+				print '<img src="../theme/eldy/img/tick.png" alt="Ok">';
+				print "</td></tr>";
 
-                // server access ok, basic access ok
-                if ($db->database_selected)
-                {
-                    dolibarr_install_syslog("step1: connection to database ".$conf->db->name." by user ".$conf->db->user." ok");
-                    print "<tr><td>";
-                    print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
-                    print $dolibarr_main_db_name;
-                    print "</td><td>";
-                    print '<img src="../theme/eldy/img/tick.png" alt="Ok">';
-                    print "</td></tr>";
+				// server access ok, basic access ok
+				if ($db->database_selected)
+				{
+					dolibarr_install_syslog("step1: connection to database ".$conf->db->name." by user ".$conf->db->user." ok");
+					print "<tr><td>";
+					print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
+					print $dolibarr_main_db_name;
+					print "</td><td>";
+					print '<img src="../theme/eldy/img/tick.png" alt="Ok">';
+					print "</td></tr>";
 
-                    $error = 0;
-                } else {
-                    dolibarr_install_syslog("step1: connection to database ".$conf->db->name." by user ".$conf->db->user." failed", LOG_ERR);
-                    print "<tr><td>";
-                    print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
-                    print $dolibarr_main_db_name;
-                    print '</td><td>';
-                    print '<img src="../theme/eldy/img/error.png" alt="Error">';
-                    print "</td></tr>";
+					$error = 0;
+				} else {
+					dolibarr_install_syslog("step1: connection to database ".$conf->db->name." by user ".$conf->db->user." failed", LOG_ERR);
+					print "<tr><td>";
+					print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
+					print $dolibarr_main_db_name;
+					print '</td><td>';
+					print '<img src="../theme/eldy/img/error.png" alt="Error">';
+					print "</td></tr>";
 
-                    // warning message
-                    print '<tr><td colspan="2"><br>';
-                    print $langs->trans('CheckThatDatabasenameIsCorrect', $dolibarr_main_db_name).'<br>';
-                    print $langs->trans('IfAlreadyExistsCheckOption').'<br>';
-                    print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
-                    print '</td></tr>';
+					// warning message
+					print '<tr><td colspan="2"><br>';
+					print $langs->trans('CheckThatDatabasenameIsCorrect', $dolibarr_main_db_name).'<br>';
+					print $langs->trans('IfAlreadyExistsCheckOption').'<br>';
+					print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
+					print '</td></tr>';
 
-                    $error++;
-                }
-            } else {
-                dolibarr_install_syslog("step1: connection to server by user ".$conf->db->user." failed", LOG_ERR);
-                print "<tr><td>";
-                print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
-                print $dolibarr_main_db_host;
-                print '</td><td>';
-                print '<img src="../theme/eldy/img/error.png" alt="Error">';
-                print "</td></tr>";
+					$error++;
+				}
+			} else {
+				dolibarr_install_syslog("step1: connection to server by user ".$conf->db->user." failed", LOG_ERR);
+				print "<tr><td>";
+				print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
+				print $dolibarr_main_db_host;
+				print '</td><td>';
+				print '<img src="../theme/eldy/img/error.png" alt="Error">';
+				print "</td></tr>";
 
-                // warning message
-                print '<tr><td colspan="2"><br>';
-                print $langs->trans("ErrorConnection", $conf->db->host, $conf->db->name, $conf->db->user);
-                print $langs->trans('IfLoginDoesNotExistsCheckCreateUser').'<br>';
-                print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
-                print '</td></tr>';
+				// warning message
+				print '<tr><td colspan="2"><br>';
+				print $langs->trans("ErrorConnection", $conf->db->host, $conf->db->name, $conf->db->user);
+				print $langs->trans('IfLoginDoesNotExistsCheckCreateUser').'<br>';
+				print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
+				print '</td></tr>';
 
-                $error++;
-            }
-        }
-    }
+				$error++;
+			}
+		}
+	}
 
-    print '</table>';
+	print '</table>';
 }
 
 ?>
@@ -787,15 +793,15 @@ if ($ret) exit($ret);
  */
 function write_main_file($mainfile, $main_dir)
 {
-    $fp = @fopen("$mainfile", "w");
-    if ($fp)
-    {
-        clearstatcache();
-        fputs($fp, '<?php'."\n");
-        fputs($fp, "// Wrapper to include main into htdocs\n");
-        fputs($fp, "include_once '".$main_dir."/main.inc.php';\n");
-        fclose($fp);
-    }
+	$fp = @fopen("$mainfile", "w");
+	if ($fp)
+	{
+		clearstatcache();
+		fputs($fp, '<?php'."\n");
+		fputs($fp, "// Wrapper to include main into htdocs\n");
+		fputs($fp, "include_once '".$main_dir."/main.inc.php';\n");
+		fclose($fp);
+	}
 }
 
 
@@ -808,15 +814,15 @@ function write_main_file($mainfile, $main_dir)
  */
 function write_master_file($masterfile, $main_dir)
 {
-    $fp = @fopen("$masterfile", "w");
-    if ($fp)
-    {
-        clearstatcache();
-        fputs($fp, '<?php'."\n");
-        fputs($fp, "// Wrapper to include master into htdocs\n");
-        fputs($fp, "include_once '".$main_dir."/master.inc.php';\n");
-        fclose($fp);
-    }
+	$fp = @fopen("$masterfile", "w");
+	if ($fp)
+	{
+		clearstatcache();
+		fputs($fp, '<?php'."\n");
+		fputs($fp, "// Wrapper to include master into htdocs\n");
+		fputs($fp, "include_once '".$main_dir."/master.inc.php';\n");
+		fclose($fp);
+	}
 }
 
 
@@ -828,47 +834,48 @@ function write_master_file($masterfile, $main_dir)
  */
 function write_conf_file($conffile)
 {
-    global $conf, $langs;
-    global $main_url, $main_dir, $main_data_dir, $main_force_https, $main_use_alt_dir, $main_alt_dir_name, $main_db_prefix;
-    global $dolibarr_main_url_root, $dolibarr_main_document_root, $dolibarr_main_data_root, $dolibarr_main_db_host;
-    global $dolibarr_main_db_port, $dolibarr_main_db_name, $dolibarr_main_db_user, $dolibarr_main_db_pass;
-    global $dolibarr_main_db_type, $dolibarr_main_db_character_set, $dolibarr_main_db_collation, $dolibarr_main_authentication;
-    global $db_host, $db_port, $db_name, $db_user, $db_pass, $db_type, $db_character_set, $db_collation;
-    global $conffile, $conffiletoshow, $conffiletoshowshort;
-    global $force_dolibarr_lib_ADODB_PATH, $force_dolibarr_lib_NUSOAP_PATH;
-    global $force_dolibarr_lib_TCPDF_PATH, $force_dolibarr_lib_FPDI_PATH;
-    global $force_dolibarr_lib_PHPEXCEL_PATH, $force_dolibarr_lib_GEOIP_PATH;
-    global $force_dolibarr_lib_ODTPHP_PATH, $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP;
-    global $force_dolibarr_js_CKEDITOR, $force_dolibarr_js_JQUERY, $force_dolibarr_js_JQUERY_UI;
-    global $force_dolibarr_font_DOL_DEFAULT_TTF, $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD;
+	global $conf, $langs;
+	global $main_url, $main_dir, $main_data_dir, $main_force_https, $main_use_alt_dir, $main_alt_dir_name, $main_db_prefix;
+	global $dolibarr_main_url_root, $dolibarr_main_document_root, $dolibarr_main_data_root, $dolibarr_main_db_host;
+	global $dolibarr_main_db_port, $dolibarr_main_db_name, $dolibarr_main_db_user, $dolibarr_main_db_pass;
+	global $dolibarr_main_db_type, $dolibarr_main_db_character_set, $dolibarr_main_db_collation, $dolibarr_main_authentication;
+	global $dolibarr_main_distrib;
+	global $db_host, $db_port, $db_name, $db_user, $db_pass, $db_type, $db_character_set, $db_collation;
+	global $conffile, $conffiletoshow, $conffiletoshowshort;
+	global $force_dolibarr_lib_ADODB_PATH, $force_dolibarr_lib_NUSOAP_PATH;
+	global $force_dolibarr_lib_TCPDF_PATH, $force_dolibarr_lib_FPDI_PATH;
+	global $force_dolibarr_lib_GEOIP_PATH;
+	global $force_dolibarr_lib_ODTPHP_PATH, $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP;
+	global $force_dolibarr_js_CKEDITOR, $force_dolibarr_js_JQUERY, $force_dolibarr_js_JQUERY_UI;
+	global $force_dolibarr_font_DOL_DEFAULT_TTF, $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD;
 
-    $error = 0;
+	$error = 0;
 
-    $key = md5(uniqid(mt_rand(), true)); // Generate random hash
+	$key = md5(uniqid(mt_rand(), true)); // Generate random hash
 
-    $fp = fopen("$conffile", "w");
-    if ($fp)
-    {
-        clearstatcache();
+	$fp = fopen("$conffile", "w");
+	if ($fp)
+	{
+		clearstatcache();
 
-        fputs($fp, '<?php'."\n");
-        fputs($fp, '//'."\n");
-        fputs($fp, '// File generated by Dolibarr installer '.DOL_VERSION.' on '.dol_print_date(dol_now(), '')."\n");
-        fputs($fp, '//'."\n");
-        fputs($fp, '// Take a look at conf.php.example file for an example of '.$conffiletoshowshort.' file'."\n");
-        fputs($fp, '// and explanations for all possibles parameters.'."\n");
-        fputs($fp, '//'."\n");
+		fputs($fp, '<?php'."\n");
+		fputs($fp, '//'."\n");
+		fputs($fp, '// File generated by Dolibarr installer '.DOL_VERSION.' on '.dol_print_date(dol_now(), '')."\n");
+		fputs($fp, '//'."\n");
+		fputs($fp, '// Take a look at conf.php.example file for an example of '.$conffiletoshowshort.' file'."\n");
+		fputs($fp, '// and explanations for all possibles parameters.'."\n");
+		fputs($fp, '//'."\n");
 
-        fputs($fp, '$dolibarr_main_url_root=\''.str_replace("'", "\'", trim($main_url)).'\';');
-        fputs($fp, "\n");
+		fputs($fp, '$dolibarr_main_url_root=\''.str_replace("'", "\'", trim($main_url)).'\';');
+		fputs($fp, "\n");
 
-        fputs($fp, '$dolibarr_main_document_root=\''.str_replace("'", "\'", trim($main_dir)).'\';');
-        fputs($fp, "\n");
+		fputs($fp, '$dolibarr_main_document_root=\''.str_replace("'", "\'", trim($main_dir)).'\';');
+		fputs($fp, "\n");
 
-        fputs($fp, $main_use_alt_dir.'$dolibarr_main_url_root_alt=\''.str_replace("'", "\'", trim("/".$main_alt_dir_name)).'\';');
-        fputs($fp, "\n");
+		fputs($fp, $main_use_alt_dir.'$dolibarr_main_url_root_alt=\''.str_replace("'", "\'", trim("/".$main_alt_dir_name)).'\';');
+		fputs($fp, "\n");
 
-        fputs($fp, $main_use_alt_dir.'$dolibarr_main_document_root_alt=\''.str_replace("'", "\'", trim($main_dir."/".$main_alt_dir_name)).'\';');
+		fputs($fp, $main_use_alt_dir.'$dolibarr_main_document_root_alt=\''.str_replace("'", "\'", trim($main_dir."/".$main_alt_dir_name)).'\';');
 		fputs($fp, "\n");
 
 		fputs($fp, '$dolibarr_main_data_root=\''.str_replace("'", "\'", trim($main_data_dir)).'\';');
@@ -900,87 +907,88 @@ function write_conf_file($conffile)
 		fputs($fp, '$dolibarr_main_db_collation=\''.str_replace("'", "\'", trim($db_collation)).'\';');
 		fputs($fp, "\n");
 
-		/* Authentication */
+		// Authentication
 		fputs($fp, '// Authentication settings');
-        fputs($fp, "\n");
+		fputs($fp, "\n");
 
 		fputs($fp, '$dolibarr_main_authentication=\'dolibarr\';');
 		fputs($fp, "\n\n");
 
-        fputs($fp, '//$dolibarr_main_demo=\'autologin,autopass\';');
-        fputs($fp, "\n");
+		fputs($fp, '//$dolibarr_main_demo=\'autologin,autopass\';');
+		fputs($fp, "\n");
 
 		fputs($fp, '// Security settings');
-        fputs($fp, "\n");
-
-        fputs($fp, '$dolibarr_main_prod=\'0\';');
-        fputs($fp, "\n");
-
-        fputs($fp, '$dolibarr_main_force_https=\''.$main_force_https.'\';');
 		fputs($fp, "\n");
 
-        fputs($fp, '$dolibarr_main_restrict_os_commands=\'mysqldump, mysql, pg_dump, pgrestore\';');
+		fputs($fp, '$dolibarr_main_prod=\'0\';');
 		fputs($fp, "\n");
 
-        fputs($fp, '$dolibarr_nocsrfcheck=\'0\';');
-        fputs($fp, "\n");
+		fputs($fp, '$dolibarr_main_force_https=\''.$main_force_https.'\';');
+		fputs($fp, "\n");
+
+		fputs($fp, '$dolibarr_main_restrict_os_commands=\'mysqldump, mysql, pg_dump, pgrestore\';');
+		fputs($fp, "\n");
+
+		fputs($fp, '$dolibarr_nocsrfcheck=\'0\';');
+		fputs($fp, "\n");
 
 		fputs($fp, '$dolibarr_main_instance_unique_id=\''.$key.'\';');
 		fputs($fp, "\n");
 
 		fputs($fp, '$dolibarr_mailing_limit_sendbyweb=\'0\';');
-        fputs($fp, "\n");
+		fputs($fp, "\n");
 
-        // Write params to overwrites default lib path
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_lib_FPDF_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_FPDF_PATH = ''; }
-        fputs($fp, '$dolibarr_lib_FPDF_PATH=\''.$force_dolibarr_lib_FPDF_PATH.'\';');
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_lib_TCPDF_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_TCPDF_PATH = ''; }
-        fputs($fp, '$dolibarr_lib_TCPDF_PATH=\''.$force_dolibarr_lib_TCPDF_PATH.'\';');
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_lib_FPDI_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_FPDI_PATH = ''; }
-        fputs($fp, '$dolibarr_lib_FPDI_PATH=\''.$force_dolibarr_lib_FPDI_PATH.'\';');
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_lib_TCPDI_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_TCPDI_PATH = ''; }
-        fputs($fp, '$dolibarr_lib_TCPDI_PATH=\''.$force_dolibarr_lib_TCPDI_PATH.'\';');
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_lib_ADODB_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_ADODB_PATH = ''; }
-        fputs($fp, '$dolibarr_lib_ADODB_PATH=\''.$force_dolibarr_lib_ADODB_PATH.'\';');
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_lib_GEOIP_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_GEOIP_PATH = ''; }
-        fputs($fp, '$dolibarr_lib_GEOIP_PATH=\''.$force_dolibarr_lib_GEOIP_PATH.'\';');
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_lib_NUSOAP_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_NUSOAP_PATH = ''; }
-        fputs($fp, '$dolibarr_lib_NUSOAP_PATH=\''.$force_dolibarr_lib_NUSOAP_PATH.'\';');
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_lib_PHPEXCEL_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_PHPEXCEL_PATH = ''; }
-        fputs($fp, '$dolibarr_lib_PHPEXCEL_PATH=\''.$force_dolibarr_lib_PHPEXCEL_PATH.'\';');
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_lib_ODTPHP_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_ODTPHP_PATH = ''; }
-        fputs($fp, '$dolibarr_lib_ODTPHP_PATH=\''.$force_dolibarr_lib_ODTPHP_PATH.'\';');
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_lib_ODTPHP_PATHTOPCLZIP)) { fputs($fp, '//'); $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP = ''; }
-        fputs($fp, '$dolibarr_lib_ODTPHP_PATHTOPCLZIP=\''.$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP.'\';');
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_js_CKEDITOR)) { fputs($fp, '//'); $force_dolibarr_js_CKEDITOR = ''; }
-        fputs($fp, '$dolibarr_js_CKEDITOR=\''.$force_dolibarr_js_CKEDITOR.'\';');
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_js_JQUERY)) { fputs($fp, '//'); $force_dolibarr_js_JQUERY = ''; }
-        fputs($fp, '$dolibarr_js_JQUERY=\''.$force_dolibarr_js_JQUERY.'\';');
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_js_JQUERY_UI)) { fputs($fp, '//'); $force_dolibarr_js_JQUERY_UI = ''; }
-        fputs($fp, '$dolibarr_js_JQUERY_UI=\''.$force_dolibarr_js_JQUERY_UI.'\';');
-        fputs($fp, "\n");
+		// Write params to overwrites default lib path
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_lib_FPDF_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_FPDF_PATH = ''; }
+		fputs($fp, '$dolibarr_lib_FPDF_PATH=\''.$force_dolibarr_lib_FPDF_PATH.'\';');
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_lib_TCPDF_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_TCPDF_PATH = ''; }
+		fputs($fp, '$dolibarr_lib_TCPDF_PATH=\''.$force_dolibarr_lib_TCPDF_PATH.'\';');
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_lib_FPDI_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_FPDI_PATH = ''; }
+		fputs($fp, '$dolibarr_lib_FPDI_PATH=\''.$force_dolibarr_lib_FPDI_PATH.'\';');
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_lib_TCPDI_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_TCPDI_PATH = ''; }
+		fputs($fp, '$dolibarr_lib_TCPDI_PATH=\''.$force_dolibarr_lib_TCPDI_PATH.'\';');
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_lib_ADODB_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_ADODB_PATH = ''; }
+		fputs($fp, '$dolibarr_lib_ADODB_PATH=\''.$force_dolibarr_lib_ADODB_PATH.'\';');
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_lib_GEOIP_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_GEOIP_PATH = ''; }
+		fputs($fp, '$dolibarr_lib_GEOIP_PATH=\''.$force_dolibarr_lib_GEOIP_PATH.'\';');
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_lib_NUSOAP_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_NUSOAP_PATH = ''; }
+		fputs($fp, '$dolibarr_lib_NUSOAP_PATH=\''.$force_dolibarr_lib_NUSOAP_PATH.'\';');
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_lib_ODTPHP_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_ODTPHP_PATH = ''; }
+		fputs($fp, '$dolibarr_lib_ODTPHP_PATH=\''.$force_dolibarr_lib_ODTPHP_PATH.'\';');
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_lib_ODTPHP_PATHTOPCLZIP)) { fputs($fp, '//'); $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP = ''; }
+		fputs($fp, '$dolibarr_lib_ODTPHP_PATHTOPCLZIP=\''.$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP.'\';');
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_js_CKEDITOR)) { fputs($fp, '//'); $force_dolibarr_js_CKEDITOR = ''; }
+		fputs($fp, '$dolibarr_js_CKEDITOR=\''.$force_dolibarr_js_CKEDITOR.'\';');
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_js_JQUERY)) { fputs($fp, '//'); $force_dolibarr_js_JQUERY = ''; }
+		fputs($fp, '$dolibarr_js_JQUERY=\''.$force_dolibarr_js_JQUERY.'\';');
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_js_JQUERY_UI)) { fputs($fp, '//'); $force_dolibarr_js_JQUERY_UI = ''; }
+		fputs($fp, '$dolibarr_js_JQUERY_UI=\''.$force_dolibarr_js_JQUERY_UI.'\';');
+		fputs($fp, "\n");
 
-        // Write params to overwrites default font path
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_font_DOL_DEFAULT_TTF)) { fputs($fp, '//'); $force_dolibarr_font_DOL_DEFAULT_TTF = ''; }
+		// Write params to overwrites default font path
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_font_DOL_DEFAULT_TTF)) { fputs($fp, '//'); $force_dolibarr_font_DOL_DEFAULT_TTF = ''; }
    		fputs($fp, '$dolibarr_font_DOL_DEFAULT_TTF=\''.$force_dolibarr_font_DOL_DEFAULT_TTF.'\';');
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_font_DOL_DEFAULT_TTF_BOLD)) { fputs($fp, '//'); $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD = ''; }
-        fputs($fp, '$dolibarr_font_DOL_DEFAULT_TTF_BOLD=\''.$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD.'\';');
-        fputs($fp, "\n");
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_font_DOL_DEFAULT_TTF_BOLD)) { fputs($fp, '//'); $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD = ''; }
+		fputs($fp, '$dolibarr_font_DOL_DEFAULT_TTF_BOLD=\''.$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD.'\';');
+		fputs($fp, "\n");
+
+		// Other
+		fputs($fp, '$dolibarr_main_distrib=\''.str_replace("'", "\'", trim($dolibarr_main_distrib)).'\';');
+		fputs($fp, "\n");
 
 		fclose($fp);
 
diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php
index 25fde52dd58..20c57cb0ccf 100644
--- a/htdocs/install/step2.php
+++ b/htdocs/install/step2.php
@@ -80,517 +80,517 @@ pHeader($langs->trans("CreateDatabaseObjects"), "step4");
 // Test if we can run a first install process
 if (!is_writable($conffile))
 {
-    print $langs->trans("ConfFileIsNotWritable", $conffiletoshow);
-    pFooter(1, $setuplang, 'jscheckparam');
-    exit;
+	print $langs->trans("ConfFileIsNotWritable", $conffiletoshow);
+	pFooter(1, $setuplang, 'jscheckparam');
+	exit;
 }
 
 if ($action == "set")
 {
-    print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> '.$langs->trans("Database").'</h3>';
+	print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> '.$langs->trans("Database").'</h3>';
 
-    print '<table cellspacing="0" style="padding: 4px 4px 4px 0" border="0" width="100%">';
-    $error = 0;
+	print '<table cellspacing="0" style="padding: 4px 4px 4px 0" border="0" width="100%">';
+	$error = 0;
 
-    $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);
+	$db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);
 
-    if ($db->connected)
-    {
-        print "<tr><td>";
-        print $langs->trans("ServerConnection")." : ".$conf->db->host.'</td><td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
-        $ok = 1;
-    } else {
-        print "<tr><td>Failed to connect to server : ".$conf->db->host.'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
-    }
+	if ($db->connected)
+	{
+		print "<tr><td>";
+		print $langs->trans("ServerConnection")." : ".$conf->db->host.'</td><td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
+		$ok = 1;
+	} else {
+		print "<tr><td>Failed to connect to server : ".$conf->db->host.'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
+	}
 
-    if ($ok)
-    {
-        if ($db->database_selected)
-        {
-            dolibarr_install_syslog("step2: successful connection to database: ".$conf->db->name);
-        } else {
-            dolibarr_install_syslog("step2: failed connection to database :".$conf->db->name, LOG_ERR);
-            print "<tr><td>Failed to select database ".$conf->db->name.'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
-            $ok = 0;
-        }
-    }
+	if ($ok)
+	{
+		if ($db->database_selected)
+		{
+			dolibarr_install_syslog("step2: successful connection to database: ".$conf->db->name);
+		} else {
+			dolibarr_install_syslog("step2: failed connection to database :".$conf->db->name, LOG_ERR);
+			print "<tr><td>Failed to select database ".$conf->db->name.'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
+			$ok = 0;
+		}
+	}
 
 
-    // Affiche version
-    if ($ok)
-    {
-        $version = $db->getVersion();
-        $versionarray = $db->getVersionArray();
-        print '<tr><td>'.$langs->trans("DatabaseVersion").'</td>';
-        print '<td>'.$version.'</td></tr>';
-        //print '<td class="right">'.join('.',$versionarray).'</td></tr>';
+	// Affiche version
+	if ($ok)
+	{
+		$version = $db->getVersion();
+		$versionarray = $db->getVersionArray();
+		print '<tr><td>'.$langs->trans("DatabaseVersion").'</td>';
+		print '<td>'.$version.'</td></tr>';
+		//print '<td class="right">'.join('.',$versionarray).'</td></tr>';
 
-        print '<tr><td>'.$langs->trans("DatabaseName").'</td>';
-        print '<td>'.$db->database_name.'</td></tr>';
-        //print '<td class="right">'.join('.',$versionarray).'</td></tr>';
-    }
+		print '<tr><td>'.$langs->trans("DatabaseName").'</td>';
+		print '<td>'.$db->database_name.'</td></tr>';
+		//print '<td class="right">'.join('.',$versionarray).'</td></tr>';
+	}
 
-    $requestnb = 0;
+	$requestnb = 0;
 
-    // To disable some code, so you can call step2 with url like
-    // http://localhost/dolibarrnew/install/step2.php?action=set&createtables=0&createkeys=0&createfunctions=0&createdata=llx_20_c_departements
-    $createtables = isset($_GET['createtables']) ?GETPOST('createtables') : 1;
-    $createkeys = isset($_GET['createkeys']) ?GETPOST('createkeys') : 1;
-    $createfunctions = isset($_GET['createfunctions']) ?GETPOST('createfunction') : 1;
-    $createdata = isset($_GET['createdata']) ?GETPOST('createdata') : 1;
+	// To disable some code, so you can call step2 with url like
+	// http://localhost/dolibarrnew/install/step2.php?action=set&createtables=0&createkeys=0&createfunctions=0&createdata=llx_20_c_departements
+	$createtables = isset($_GET['createtables']) ?GETPOST('createtables') : 1;
+	$createkeys = isset($_GET['createkeys']) ?GETPOST('createkeys') : 1;
+	$createfunctions = isset($_GET['createfunctions']) ?GETPOST('createfunction') : 1;
+	$createdata = isset($_GET['createdata']) ?GETPOST('createdata') : 1;
 
 
-    // To say sql requests are escaped for mysql so we need to unescape them
-    $db->unescapeslashquot = true;
+	// To say sql requests are escaped for mysql so we need to unescape them
+	$db->unescapeslashquot = true;
 
 
-    /**************************************************************************************
+	/**************************************************************************************
      *
      * Chargement fichiers tables/*.sql (non *.key.sql)
      * A faire avant les fichiers *.key.sql
      *
      ***************************************************************************************/
-    if ($ok && $createtables)
-    {
-        // We always choose in mysql directory (Conversion is done by driver to translate SQL syntax)
-        $dir = "mysql/tables/";
+	if ($ok && $createtables)
+	{
+		// We always choose in mysql directory (Conversion is done by driver to translate SQL syntax)
+		$dir = "mysql/tables/";
 
-        $ok = 0;
-        $handle = opendir($dir);
-        dolibarr_install_syslog("step2: open tables directory ".$dir." handle=".$handle);
-        $tablefound = 0;
-        $tabledata = array();
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (preg_match('/\.sql$/i', $file) && preg_match('/^llx_/i', $file) && !preg_match('/\.key\.sql$/i', $file))
-                {
-                    $tablefound++;
-                    $tabledata[] = $file;
-                }
-            }
-            closedir($handle);
-        }
+		$ok = 0;
+		$handle = opendir($dir);
+		dolibarr_install_syslog("step2: open tables directory ".$dir." handle=".$handle);
+		$tablefound = 0;
+		$tabledata = array();
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (preg_match('/\.sql$/i', $file) && preg_match('/^llx_/i', $file) && !preg_match('/\.key\.sql$/i', $file))
+				{
+					$tablefound++;
+					$tabledata[] = $file;
+				}
+			}
+			closedir($handle);
+		}
 
-        // Sort list of sql files on alphabetical order (load order is important)
-        sort($tabledata);
-        foreach ($tabledata as $file)
-        {
-            $name = substr($file, 0, dol_strlen($file) - 4);
-            $buffer = '';
-            $fp = fopen($dir.$file, "r");
-            if ($fp)
-            {
-                while (!feof($fp))
-                {
-                    $buf = fgets($fp, 4096);
-                    if (substr($buf, 0, 2) <> '--')
-                    {
-                        $buf = preg_replace('/--(.+)*/', '', $buf);
-                        $buffer .= $buf;
-                    }
-                }
-                fclose($fp);
+		// Sort list of sql files on alphabetical order (load order is important)
+		sort($tabledata);
+		foreach ($tabledata as $file)
+		{
+			$name = substr($file, 0, dol_strlen($file) - 4);
+			$buffer = '';
+			$fp = fopen($dir.$file, "r");
+			if ($fp)
+			{
+				while (!feof($fp))
+				{
+					$buf = fgets($fp, 4096);
+					if (substr($buf, 0, 2) <> '--')
+					{
+						$buf = preg_replace('/--(.+)*/', '', $buf);
+						$buffer .= $buf;
+					}
+				}
+				fclose($fp);
 
-                $buffer = trim($buffer);
-                if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')	// For Mysql 5.5+, we must replace type=innodb with ENGINE=innodb
-                {
-                    $buffer = preg_replace('/type=innodb/i', 'ENGINE=innodb', $buffer);
-                } else {
-                    // Keyword ENGINE is MySQL-specific, so scrub it for
-                    // other database types (mssql, pgsql)
-                    $buffer = preg_replace('/type=innodb/i', '', $buffer);
-                    $buffer = preg_replace('/ENGINE=innodb/i', '', $buffer);
-                }
+				$buffer = trim($buffer);
+				if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')	// For Mysql 5.5+, we must replace type=innodb with ENGINE=innodb
+				{
+					$buffer = preg_replace('/type=innodb/i', 'ENGINE=innodb', $buffer);
+				} else {
+					// Keyword ENGINE is MySQL-specific, so scrub it for
+					// other database types (mssql, pgsql)
+					$buffer = preg_replace('/type=innodb/i', '', $buffer);
+					$buffer = preg_replace('/ENGINE=innodb/i', '', $buffer);
+				}
 
-                // Replace the prefix tables
-                if ($dolibarr_main_db_prefix != 'llx_')
-                {
-                	$buffer = preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
-                }
+				// Replace the prefix tables
+				if ($dolibarr_main_db_prefix != 'llx_')
+				{
+					$buffer = preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
+				}
 
-                //print "<tr><td>Creation de la table $name/td>";
-                $requestnb++;
+				//print "<tr><td>Creation de la table $name/td>";
+				$requestnb++;
 
-                dolibarr_install_syslog("step2: request: ".$buffer);
-                $resql = $db->query($buffer, 0, 'dml');
-                if ($resql)
-                {
-                    // print "<td>OK requete ==== $buffer</td></tr>";
-                    $db->free($resql);
-                } else {
-                    if ($db->errno() == 'DB_ERROR_TABLE_ALREADY_EXISTS' ||
-                    $db->errno() == 'DB_ERROR_TABLE_OR_KEY_ALREADY_EXISTS')
-                    {
-                        //print "<td>Deja existante</td></tr>";
-                    } else {
-                        print "<tr><td>".$langs->trans("CreateTableAndPrimaryKey", $name);
-                        print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$buffer.' <br>Executed query : '.$db->lastquery;
-                        print "\n</td>";
-                        print '<td><span class="error">'.$langs->trans("ErrorSQL")." ".$db->errno()." ".$db->error().'</span></td></tr>';
-                        $error++;
-                    }
-                }
-            } else {
-                print "<tr><td>".$langs->trans("CreateTableAndPrimaryKey", $name);
-                print "</td>";
-                print '<td><span class="error">'.$langs->trans("Error").' Failed to open file '.$dir.$file.'</span></td></tr>';
-                $error++;
-                dolibarr_install_syslog("step2: failed to open file ".$dir.$file, LOG_ERR);
-            }
-        }
+				dolibarr_install_syslog("step2: request: ".$buffer);
+				$resql = $db->query($buffer, 0, 'dml');
+				if ($resql)
+				{
+					// print "<td>OK requete ==== $buffer</td></tr>";
+					$db->free($resql);
+				} else {
+					if ($db->errno() == 'DB_ERROR_TABLE_ALREADY_EXISTS' ||
+					$db->errno() == 'DB_ERROR_TABLE_OR_KEY_ALREADY_EXISTS')
+					{
+						//print "<td>Deja existante</td></tr>";
+					} else {
+						print "<tr><td>".$langs->trans("CreateTableAndPrimaryKey", $name);
+						print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$buffer.' <br>Executed query : '.$db->lastquery;
+						print "\n</td>";
+						print '<td><span class="error">'.$langs->trans("ErrorSQL")." ".$db->errno()." ".$db->error().'</span></td></tr>';
+						$error++;
+					}
+				}
+			} else {
+				print "<tr><td>".$langs->trans("CreateTableAndPrimaryKey", $name);
+				print "</td>";
+				print '<td><span class="error">'.$langs->trans("Error").' Failed to open file '.$dir.$file.'</span></td></tr>';
+				$error++;
+				dolibarr_install_syslog("step2: failed to open file ".$dir.$file, LOG_ERR);
+			}
+		}
 
-        if ($tablefound)
-        {
-            if ($error == 0)
-            {
-                print '<tr><td>';
-                print $langs->trans("TablesAndPrimaryKeysCreation").'</td><td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
-                $ok = 1;
-            }
-        } else {
-            print '<tr><td>'.$langs->trans("ErrorFailedToFindSomeFiles", $dir).'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
-            dolibarr_install_syslog("step2: failed to find files to create database in directory ".$dir, LOG_ERR);
-        }
-    }
+		if ($tablefound)
+		{
+			if ($error == 0)
+			{
+				print '<tr><td>';
+				print $langs->trans("TablesAndPrimaryKeysCreation").'</td><td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
+				$ok = 1;
+			}
+		} else {
+			print '<tr><td>'.$langs->trans("ErrorFailedToFindSomeFiles", $dir).'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
+			dolibarr_install_syslog("step2: failed to find files to create database in directory ".$dir, LOG_ERR);
+		}
+	}
 
 
-    /***************************************************************************************
+	/***************************************************************************************
      *
      * Chargement fichiers tables/*.key.sql
      * A faire apres les fichiers *.sql
      *
      ***************************************************************************************/
-    if ($ok && $createkeys)
-    {
-        // We always choose in mysql directory (Conversion is done by driver to translate SQL syntax)
-        $dir = "mysql/tables/";
+	if ($ok && $createkeys)
+	{
+		// We always choose in mysql directory (Conversion is done by driver to translate SQL syntax)
+		$dir = "mysql/tables/";
 
-        $okkeys = 0;
-        $handle = opendir($dir);
-        dolibarr_install_syslog("step2: open keys directory ".$dir." handle=".$handle);
-        $tablefound = 0;
-        $tabledata = array();
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (preg_match('/\.sql$/i', $file) && preg_match('/^llx_/i', $file) && preg_match('/\.key\.sql$/i', $file))
-                {
-                    $tablefound++;
-                    $tabledata[] = $file;
-                }
-            }
-            closedir($handle);
-        }
+		$okkeys = 0;
+		$handle = opendir($dir);
+		dolibarr_install_syslog("step2: open keys directory ".$dir." handle=".$handle);
+		$tablefound = 0;
+		$tabledata = array();
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (preg_match('/\.sql$/i', $file) && preg_match('/^llx_/i', $file) && preg_match('/\.key\.sql$/i', $file))
+				{
+					$tablefound++;
+					$tabledata[] = $file;
+				}
+			}
+			closedir($handle);
+		}
 
-        // Sort list of sql files on alphabetical order (load order is important)
-        sort($tabledata);
-        foreach ($tabledata as $file)
-        {
-            $name = substr($file, 0, dol_strlen($file) - 4);
-            //print "<tr><td>Creation de la table $name</td>";
-            $buffer = '';
-            $fp = fopen($dir.$file, "r");
-            if ($fp)
-            {
-                while (!feof($fp))
-                {
-                    $buf = fgets($fp, 4096);
+		// Sort list of sql files on alphabetical order (load order is important)
+		sort($tabledata);
+		foreach ($tabledata as $file)
+		{
+			$name = substr($file, 0, dol_strlen($file) - 4);
+			//print "<tr><td>Creation de la table $name</td>";
+			$buffer = '';
+			$fp = fopen($dir.$file, "r");
+			if ($fp)
+			{
+				while (!feof($fp))
+				{
+					$buf = fgets($fp, 4096);
 
-                    // Special case of lines allowed for some version only
-                    if ($choix == 1 && preg_match('/^--\sV([0-9\.]+)/i', $buf, $reg))
-                    {
-                        $versioncommande = explode('.', $reg[1]);
-                        //print var_dump($versioncommande);
-                        //print var_dump($versionarray);
-                        if (count($versioncommande) && count($versionarray)
-                        && versioncompare($versioncommande, $versionarray) <= 0)
-                        {
-                            // Version qualified, delete SQL comments
-                            $buf = preg_replace('/^--\sV([0-9\.]+)/i', '', $buf);
-                            //print "Ligne $i qualifiee par version: ".$buf.'<br>';
-                        }
-                    }
-                    if ($choix == 2 && preg_match('/^--\sPOSTGRESQL\sV([0-9\.]+)/i', $buf, $reg))
-                    {
-                        $versioncommande = explode('.', $reg[1]);
-                        //print var_dump($versioncommande);
-                        //print var_dump($versionarray);
-                        if (count($versioncommande) && count($versionarray)
-                        && versioncompare($versioncommande, $versionarray) <= 0)
-                        {
-                            // Version qualified, delete SQL comments
-                            $buf = preg_replace('/^--\sPOSTGRESQL\sV([0-9\.]+)/i', '', $buf);
-                            //print "Ligne $i qualifiee par version: ".$buf.'<br>';
-                        }
-                    }
+					// Special case of lines allowed for some version only
+					if ($choix == 1 && preg_match('/^--\sV([0-9\.]+)/i', $buf, $reg))
+					{
+						$versioncommande = explode('.', $reg[1]);
+						//print var_dump($versioncommande);
+						//print var_dump($versionarray);
+						if (count($versioncommande) && count($versionarray)
+						&& versioncompare($versioncommande, $versionarray) <= 0)
+						{
+							// Version qualified, delete SQL comments
+							$buf = preg_replace('/^--\sV([0-9\.]+)/i', '', $buf);
+							//print "Ligne $i qualifiee par version: ".$buf.'<br>';
+						}
+					}
+					if ($choix == 2 && preg_match('/^--\sPOSTGRESQL\sV([0-9\.]+)/i', $buf, $reg))
+					{
+						$versioncommande = explode('.', $reg[1]);
+						//print var_dump($versioncommande);
+						//print var_dump($versionarray);
+						if (count($versioncommande) && count($versionarray)
+						&& versioncompare($versioncommande, $versionarray) <= 0)
+						{
+							// Version qualified, delete SQL comments
+							$buf = preg_replace('/^--\sPOSTGRESQL\sV([0-9\.]+)/i', '', $buf);
+							//print "Ligne $i qualifiee par version: ".$buf.'<br>';
+						}
+					}
 
-                    // Ajout ligne si non commentaire
-                    if (!preg_match('/^--/i', $buf)) $buffer .= $buf;
-                }
-                fclose($fp);
+					// Ajout ligne si non commentaire
+					if (!preg_match('/^--/i', $buf)) $buffer .= $buf;
+				}
+				fclose($fp);
 
-                // Si plusieurs requetes, on boucle sur chaque
-                $listesql = explode(';', $buffer);
-                foreach ($listesql as $req)
-                {
-                    $buffer = trim($req);
-                    if ($buffer)
-                    {
-                    	// Replace the prefix tables
-                    	if ($dolibarr_main_db_prefix != 'llx_')
-                    	{
-                    		$buffer = preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
-                    	}
+				// Si plusieurs requetes, on boucle sur chaque
+				$listesql = explode(';', $buffer);
+				foreach ($listesql as $req)
+				{
+					$buffer = trim($req);
+					if ($buffer)
+					{
+						// Replace the prefix tables
+						if ($dolibarr_main_db_prefix != 'llx_')
+						{
+							$buffer = preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
+						}
 
-                        //print "<tr><td>Creation des cles et index de la table $name: '$buffer'</td>";
-                        $requestnb++;
+						//print "<tr><td>Creation des cles et index de la table $name: '$buffer'</td>";
+						$requestnb++;
 
-                        dolibarr_install_syslog("step2: request: ".$buffer);
-                        $resql = $db->query($buffer, 0, 'dml');
-                        if ($resql)
-                        {
-                            //print "<td>OK requete ==== $buffer</td></tr>";
-                            $db->free($resql);
-                        } else {
-                            if ($db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS' ||
-                            $db->errno() == 'DB_ERROR_CANNOT_CREATE' ||
-                            $db->errno() == 'DB_ERROR_PRIMARY_KEY_ALREADY_EXISTS' ||
-                            $db->errno() == 'DB_ERROR_TABLE_OR_KEY_ALREADY_EXISTS' ||
-                            preg_match('/duplicate key name/i', $db->error()))
-                            {
-                                //print "<td>Deja existante</td></tr>";
-                                $key_exists = 1;
-                            } else {
-                                print "<tr><td>".$langs->trans("CreateOtherKeysForTable", $name);
-                                print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$db->lastqueryerror();
-                                print "\n</td>";
-                                print '<td><span class="error">'.$langs->trans("ErrorSQL")." ".$db->errno()." ".$db->error().'</span></td></tr>';
-                                $error++;
-                            }
-                        }
-                    }
-                }
-            } else {
-                print "<tr><td>".$langs->trans("CreateOtherKeysForTable", $name);
-                print "</td>";
-                print '<td><span class="error">'.$langs->trans("Error")." Failed to open file ".$dir.$file."</span></td></tr>";
-                $error++;
-                dolibarr_install_syslog("step2: failed to open file ".$dir.$file, LOG_ERR);
-            }
-        }
+						dolibarr_install_syslog("step2: request: ".$buffer);
+						$resql = $db->query($buffer, 0, 'dml');
+						if ($resql)
+						{
+							//print "<td>OK requete ==== $buffer</td></tr>";
+							$db->free($resql);
+						} else {
+							if ($db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS' ||
+							$db->errno() == 'DB_ERROR_CANNOT_CREATE' ||
+							$db->errno() == 'DB_ERROR_PRIMARY_KEY_ALREADY_EXISTS' ||
+							$db->errno() == 'DB_ERROR_TABLE_OR_KEY_ALREADY_EXISTS' ||
+							preg_match('/duplicate key name/i', $db->error()))
+							{
+								//print "<td>Deja existante</td></tr>";
+								$key_exists = 1;
+							} else {
+								print "<tr><td>".$langs->trans("CreateOtherKeysForTable", $name);
+								print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$db->lastqueryerror();
+								print "\n</td>";
+								print '<td><span class="error">'.$langs->trans("ErrorSQL")." ".$db->errno()." ".$db->error().'</span></td></tr>';
+								$error++;
+							}
+						}
+					}
+				}
+			} else {
+				print "<tr><td>".$langs->trans("CreateOtherKeysForTable", $name);
+				print "</td>";
+				print '<td><span class="error">'.$langs->trans("Error")." Failed to open file ".$dir.$file."</span></td></tr>";
+				$error++;
+				dolibarr_install_syslog("step2: failed to open file ".$dir.$file, LOG_ERR);
+			}
+		}
 
-        if ($tablefound && $error == 0)
-        {
-            print '<tr><td>';
-            print $langs->trans("OtherKeysCreation").'</td><td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
-            $okkeys = 1;
-        }
-    }
+		if ($tablefound && $error == 0)
+		{
+			print '<tr><td>';
+			print $langs->trans("OtherKeysCreation").'</td><td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
+			$okkeys = 1;
+		}
+	}
 
 
-    /***************************************************************************************
+	/***************************************************************************************
      *
      * Chargement fichier functions.sql
      *
      ***************************************************************************************/
-    if ($ok && $createfunctions)
-    {
-        // For this file, we use a directory according to database type
-        if ($choix == 1) $dir = "mysql/functions/";
-        elseif ($choix == 2) $dir = "pgsql/functions/";
-        elseif ($choix == 3) $dir = "mssql/functions/";
+	if ($ok && $createfunctions)
+	{
+		// For this file, we use a directory according to database type
+		if ($choix == 1) $dir = "mysql/functions/";
+		elseif ($choix == 2) $dir = "pgsql/functions/";
+		elseif ($choix == 3) $dir = "mssql/functions/";
 		elseif ($choix == 4) { $dir = "sqlite3/functions/"; }
 
-        // Creation donnees
-        $file = "functions.sql";
-        if (file_exists($dir.$file))
-        {
-            $fp = fopen($dir.$file, "r");
-            dolibarr_install_syslog("step2: open function file ".$dir.$file." handle=".$fp);
-            if ($fp)
-            {
-                $buffer = '';
-                while (!feof($fp))
-                {
-                    $buf = fgets($fp, 4096);
-                    if (substr($buf, 0, 2) <> '--')
-                    {
-                        $buffer .= $buf."§";
-                    }
-                }
-                fclose($fp);
-            }
-            //$buffer=preg_replace('/;\';/',";'§",$buffer);
+		// Creation donnees
+		$file = "functions.sql";
+		if (file_exists($dir.$file))
+		{
+			$fp = fopen($dir.$file, "r");
+			dolibarr_install_syslog("step2: open function file ".$dir.$file." handle=".$fp);
+			if ($fp)
+			{
+				$buffer = '';
+				while (!feof($fp))
+				{
+					$buf = fgets($fp, 4096);
+					if (substr($buf, 0, 2) <> '--')
+					{
+						$buffer .= $buf."§";
+					}
+				}
+				fclose($fp);
+			}
+			//$buffer=preg_replace('/;\';/',";'§",$buffer);
 
-            // If several requests, we loop on each of them
-            $listesql = explode('§', $buffer);
-            foreach ($listesql as $buffer)
-            {
-                $buffer = trim($buffer);
-                if ($buffer)
-                {
-                    // Replace the prefix in table names
-                    if ($dolibarr_main_db_prefix != 'llx_')
-                    {
-                        $buffer = preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
-                    }
-                    dolibarr_install_syslog("step2: request: ".$buffer);
-                    print "<!-- Insert line : ".$buffer."<br>-->\n";
-                    $resql = $db->query($buffer, 0, 'dml');
-                    if ($resql)
-                    {
-                        $ok = 1;
-                        $db->free($resql);
-                    } else {
-                        if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS'
-                        || $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS')
-                        {
-                            //print "Insert line : ".$buffer."<br>\n";
-                        } else {
-                            $ok = 0;
+			// If several requests, we loop on each of them
+			$listesql = explode('§', $buffer);
+			foreach ($listesql as $buffer)
+			{
+				$buffer = trim($buffer);
+				if ($buffer)
+				{
+					// Replace the prefix in table names
+					if ($dolibarr_main_db_prefix != 'llx_')
+					{
+						$buffer = preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
+					}
+					dolibarr_install_syslog("step2: request: ".$buffer);
+					print "<!-- Insert line : ".$buffer."<br>-->\n";
+					$resql = $db->query($buffer, 0, 'dml');
+					if ($resql)
+					{
+						$ok = 1;
+						$db->free($resql);
+					} else {
+						if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS'
+						|| $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS')
+						{
+							//print "Insert line : ".$buffer."<br>\n";
+						} else {
+							$ok = 0;
 
-                            print "<tr><td>".$langs->trans("FunctionsCreation");
-                            print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$buffer;
-                            print "\n</td>";
-                            print '<td><span class="error">'.$langs->trans("ErrorSQL")." ".$db->errno()." ".$db->error().'</span></td></tr>';
-                            $error++;
-                        }
-                    }
-                }
-            }
+							print "<tr><td>".$langs->trans("FunctionsCreation");
+							print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$buffer;
+							print "\n</td>";
+							print '<td><span class="error">'.$langs->trans("ErrorSQL")." ".$db->errno()." ".$db->error().'</span></td></tr>';
+							$error++;
+						}
+					}
+				}
+			}
 
-            print "<tr><td>".$langs->trans("FunctionsCreation")."</td>";
-            if ($ok)
-            {
-                print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
-            } else {
-                print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
-                $ok = 1;
-            }
-        }
-    }
+			print "<tr><td>".$langs->trans("FunctionsCreation")."</td>";
+			if ($ok)
+			{
+				print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
+			} else {
+				print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
+				$ok = 1;
+			}
+		}
+	}
 
 
-    /***************************************************************************************
+	/***************************************************************************************
      *
      * Load files data/*.sql
      *
      ***************************************************************************************/
-    if ($ok && $createdata)
-    {
-        // We always choose in mysql directory (Conversion is done by driver to translate SQL syntax)
-        $dir = "mysql/data/";
+	if ($ok && $createdata)
+	{
+		// We always choose in mysql directory (Conversion is done by driver to translate SQL syntax)
+		$dir = "mysql/data/";
 
-        // Insert data
-        $handle = opendir($dir);
-        dolibarr_install_syslog("step2: open directory data ".$dir." handle=".$handle);
-        $tablefound = 0;
-        $tabledata = array();
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (preg_match('/\.sql$/i', $file) && preg_match('/^llx_/i', $file))
-                {
-                	if (preg_match('/^llx_accounting_account_/', $file)) continue; // We discard data file of chart of account. Will be loaded when a chart is selected.
+		// Insert data
+		$handle = opendir($dir);
+		dolibarr_install_syslog("step2: open directory data ".$dir." handle=".$handle);
+		$tablefound = 0;
+		$tabledata = array();
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (preg_match('/\.sql$/i', $file) && preg_match('/^llx_/i', $file))
+				{
+					if (preg_match('/^llx_accounting_account_/', $file)) continue; // We discard data file of chart of account. Will be loaded when a chart is selected.
 
-                    //print 'x'.$file.'-'.$createdata.'<br>';
-                    if (is_numeric($createdata) || preg_match('/'.preg_quote($createdata).'/i', $file))
-                    {
-                        $tablefound++;
-                        $tabledata[] = $file;
-                    }
-                }
-            }
-            closedir($handle);
-        }
+					//print 'x'.$file.'-'.$createdata.'<br>';
+					if (is_numeric($createdata) || preg_match('/'.preg_quote($createdata).'/i', $file))
+					{
+						$tablefound++;
+						$tabledata[] = $file;
+					}
+				}
+			}
+			closedir($handle);
+		}
 
-        // Sort list of data files on alphabetical order (load order is important)
-        sort($tabledata);
-        foreach ($tabledata as $file)
-        {
-            $name = substr($file, 0, dol_strlen($file) - 4);
-            $fp = fopen($dir.$file, "r");
-            dolibarr_install_syslog("step2: open data file ".$dir.$file." handle=".$fp);
-            if ($fp)
-            {
-                $arrayofrequests = array();
-                $linefound = 0;
-                $linegroup = 0;
-                $sizeofgroup = 1; // Grouping request to have 1 query for several requests does not works with mysql, so we use 1.
+		// Sort list of data files on alphabetical order (load order is important)
+		sort($tabledata);
+		foreach ($tabledata as $file)
+		{
+			$name = substr($file, 0, dol_strlen($file) - 4);
+			$fp = fopen($dir.$file, "r");
+			dolibarr_install_syslog("step2: open data file ".$dir.$file." handle=".$fp);
+			if ($fp)
+			{
+				$arrayofrequests = array();
+				$linefound = 0;
+				$linegroup = 0;
+				$sizeofgroup = 1; // Grouping request to have 1 query for several requests does not works with mysql, so we use 1.
 
-                // Load all requests
-                while (!feof($fp))
-                {
-                    $buffer = fgets($fp, 4096);
-                    $buffer = trim($buffer);
-                    if ($buffer)
-                    {
-                        if (substr($buffer, 0, 2) == '--') continue;
+				// Load all requests
+				while (!feof($fp))
+				{
+					$buffer = fgets($fp, 4096);
+					$buffer = trim($buffer);
+					if ($buffer)
+					{
+						if (substr($buffer, 0, 2) == '--') continue;
 
-                        if ($linefound && ($linefound % $sizeofgroup) == 0)
-                        {
-                            $linegroup++;
-                        }
-                        if (empty($arrayofrequests[$linegroup])) $arrayofrequests[$linegroup] = $buffer;
-                        else $arrayofrequests[$linegroup] .= " ".$buffer;
+						if ($linefound && ($linefound % $sizeofgroup) == 0)
+						{
+							$linegroup++;
+						}
+						if (empty($arrayofrequests[$linegroup])) $arrayofrequests[$linegroup] = $buffer;
+						else $arrayofrequests[$linegroup] .= " ".$buffer;
 
-                        $linefound++;
-                    }
-                }
-                fclose($fp);
+						$linefound++;
+					}
+				}
+				fclose($fp);
 
-                dolibarr_install_syslog("step2: found ".$linefound." records, defined ".count($arrayofrequests)." group(s).");
+				dolibarr_install_syslog("step2: found ".$linefound." records, defined ".count($arrayofrequests)." group(s).");
 
-                $okallfile = 1;
-                $db->begin();
+				$okallfile = 1;
+				$db->begin();
 
-                // We loop on each requests of file
-                foreach ($arrayofrequests as $buffer)
-                {
-                	// Replace the prefix tables
-                	if ($dolibarr_main_db_prefix != 'llx_')
-                	{
-                		$buffer = preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
-                	}
+				// We loop on each requests of file
+				foreach ($arrayofrequests as $buffer)
+				{
+					// Replace the prefix tables
+					if ($dolibarr_main_db_prefix != 'llx_')
+					{
+						$buffer = preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
+					}
 
-                    //dolibarr_install_syslog("step2: request: " . $buffer);
-                    $resql = $db->query($buffer, 1);
-                    if ($resql)
-                    {
-                        //$db->free($resql);     // Not required as request we launch here does not return memory needs.
-                    } else {
-                        if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-                        {
-                            //print "<tr><td>Insertion ligne : $buffer</td><td>";
-                        } else {
-                            $ok = 0;
-                            $okallfile = 0;
-                            print '<span class="error">'.$langs->trans("ErrorSQL")." : ".$db->lasterrno()." - ".$db->lastqueryerror()." - ".$db->lasterror()."</span><br>";
-                        }
-                    }
-                }
+					//dolibarr_install_syslog("step2: request: " . $buffer);
+					$resql = $db->query($buffer, 1);
+					if ($resql)
+					{
+						//$db->free($resql);     // Not required as request we launch here does not return memory needs.
+					} else {
+						if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+						{
+							//print "<tr><td>Insertion ligne : $buffer</td><td>";
+						} else {
+							$ok = 0;
+							$okallfile = 0;
+							print '<span class="error">'.$langs->trans("ErrorSQL")." : ".$db->lasterrno()." - ".$db->lastqueryerror()." - ".$db->lasterror()."</span><br>";
+						}
+					}
+				}
 
-                if ($okallfile) $db->commit();
-                else $db->rollback();
-            }
-        }
+				if ($okallfile) $db->commit();
+				else $db->rollback();
+			}
+		}
 
-        print "<tr><td>".$langs->trans("ReferenceDataLoading")."</td>";
-        if ($ok)
-        {
-            print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
-        } else {
-            print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
-            $ok = 1; // Data loading are not blocking errors
-        }
-    }
-    print '</table>';
+		print "<tr><td>".$langs->trans("ReferenceDataLoading")."</td>";
+		if ($ok)
+		{
+			print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
+		} else {
+			print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
+			$ok = 1; // Data loading are not blocking errors
+		}
+	}
+	print '</table>';
 } else {
-    print 'Parameter action=set not defined';
+	print 'Parameter action=set not defined';
 }
 
 
diff --git a/htdocs/install/step4.php b/htdocs/install/step4.php
index b780f9d3b0f..ca188ae4d5b 100644
--- a/htdocs/install/step4.php
+++ b/htdocs/install/step4.php
@@ -62,9 +62,9 @@ pHeader($langs->trans("AdminAccountCreation"), "step5");
 // Test if we can run a first install process
 if (!is_writable($conffile))
 {
-    print $langs->trans("ConfFileIsNotWritable", $conffiletoshow);
-    pFooter(1, $setuplang, 'jscheckparam');
-    exit;
+	print $langs->trans("ConfFileIsNotWritable", $conffiletoshow);
+	pFooter(1, $setuplang, 'jscheckparam');
+	exit;
 }
 
 
@@ -79,36 +79,36 @@ $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf
 
 if ($db->ok)
 {
-    print '<tr><td><label for="login">'.$langs->trans("Login").' :</label></td><td>';
+	print '<tr><td><label for="login">'.$langs->trans("Login").' :</label></td><td>';
 	print '<input id="login" name="login" type="text" value="'.(!empty($_GET["login"]) ? GETPOST("login", 'alpha') : (isset($force_install_dolibarrlogin) ? $force_install_dolibarrlogin : '')).'"'.(@$force_install_noedit == 2 && $force_install_dolibarrlogin !== null ? ' disabled' : '').'></td></tr>';
-    print '<tr><td><label for="pass">'.$langs->trans("Password").' :</label></td><td>';
-    print '<input type="password" id="pass" name="pass" autocomplete="new-password"></td></tr>';
-    print '<tr><td><label for="pass_verif">'.$langs->trans("PasswordAgain").' :</label></td><td>';
-    print '<input type="password" id="pass_verif" name="pass_verif" autocomplete="new-password"></td></tr>';
-    print '</table>';
+	print '<tr><td><label for="pass">'.$langs->trans("Password").' :</label></td><td>';
+	print '<input type="password" id="pass" name="pass" autocomplete="new-password"></td></tr>';
+	print '<tr><td><label for="pass_verif">'.$langs->trans("PasswordAgain").' :</label></td><td>';
+	print '<input type="password" id="pass_verif" name="pass_verif" autocomplete="new-password"></td></tr>';
+	print '</table>';
 
-    if (isset($_GET["error"]) && $_GET["error"] == 1)
-    {
-        print '<br>';
-        print '<div class="error">'.$langs->trans("PasswordsMismatch").'</div>';
-        $error = 0; // We show button
-    }
+	if (isset($_GET["error"]) && $_GET["error"] == 1)
+	{
+		print '<br>';
+		print '<div class="error">'.$langs->trans("PasswordsMismatch").'</div>';
+		$error = 0; // We show button
+	}
 
-    if (isset($_GET["error"]) && $_GET["error"] == 2)
-    {
-        print '<br>';
-        print '<div class="error">';
-        print $langs->trans("PleaseTypePassword");
-        print '</div>';
-        $error = 0; // We show button
-    }
+	if (isset($_GET["error"]) && $_GET["error"] == 2)
+	{
+		print '<br>';
+		print '<div class="error">';
+		print $langs->trans("PleaseTypePassword");
+		print '</div>';
+		$error = 0; // We show button
+	}
 
-    if (isset($_GET["error"]) && $_GET["error"] == 3)
-    {
-        print '<br>';
-        print '<div class="error">'.$langs->trans("PleaseTypeALogin").'</div>';
-        $error = 0; // We show button
-    }
+	if (isset($_GET["error"]) && $_GET["error"] == 3)
+	{
+		print '<br>';
+		print '<div class="error">'.$langs->trans("PleaseTypeALogin").'</div>';
+		$error = 0; // We show button
+	}
 }
 
 $ret = 0;
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index af05fb374d2..29b51746a14 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -39,7 +39,7 @@
 include_once 'inc.php';
 if (!file_exists($conffile))
 {
-    print 'Error: Dolibarr config file was not found. This may means that Dolibarr is not installed yet. Please call the page "/install/index.php" instead of "/install/upgrade.php").';
+	print 'Error: Dolibarr config file was not found. This may means that Dolibarr is not installed yet. Please call the page "/install/index.php" instead of "/install/upgrade.php").';
 }
 require_once $conffile;
 require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
@@ -104,106 +104,106 @@ $actiondone = 0;
 // Action to launch the migrate script
 if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ09')))
 {
-    $actiondone = 1;
+	$actiondone = 1;
 
-    print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> '.$langs->trans("DatabaseMigration").'</h3>';
+	print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> '.$langs->trans("DatabaseMigration").'</h3>';
 
-    print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
-    $error = 0;
+	print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
+	$error = 0;
 
-    // If password is encoded, we decode it
-    if (preg_match('/crypted:/i', $dolibarr_main_db_pass) || !empty($dolibarr_main_db_encrypted_pass))
-    {
-        require_once $dolibarr_main_document_root.'/core/lib/security.lib.php';
-        if (preg_match('/crypted:/i', $dolibarr_main_db_pass))
-        {
-            $dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);
-            $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_pass);
-            $dolibarr_main_db_encrypted_pass = $dolibarr_main_db_pass; // We need to set this as it is used to know the password was initially crypted
-        } else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
-    }
+	// If password is encoded, we decode it
+	if (preg_match('/crypted:/i', $dolibarr_main_db_pass) || !empty($dolibarr_main_db_encrypted_pass))
+	{
+		require_once $dolibarr_main_document_root.'/core/lib/security.lib.php';
+		if (preg_match('/crypted:/i', $dolibarr_main_db_pass))
+		{
+			$dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);
+			$dolibarr_main_db_pass = dol_decode($dolibarr_main_db_pass);
+			$dolibarr_main_db_encrypted_pass = $dolibarr_main_db_pass; // We need to set this as it is used to know the password was initially crypted
+		} else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
+	}
 
-    // $conf is already instancied inside inc.php
-    $conf->db->type = $dolibarr_main_db_type;
-    $conf->db->host = $dolibarr_main_db_host;
-    $conf->db->port = $dolibarr_main_db_port;
-    $conf->db->name = $dolibarr_main_db_name;
-    $conf->db->user = $dolibarr_main_db_user;
-    $conf->db->pass = $dolibarr_main_db_pass;
+	// $conf is already instancied inside inc.php
+	$conf->db->type = $dolibarr_main_db_type;
+	$conf->db->host = $dolibarr_main_db_host;
+	$conf->db->port = $dolibarr_main_db_port;
+	$conf->db->name = $dolibarr_main_db_name;
+	$conf->db->user = $dolibarr_main_db_user;
+	$conf->db->pass = $dolibarr_main_db_pass;
 
-    // Load type and crypt key
-    if (empty($dolibarr_main_db_encryption)) $dolibarr_main_db_encryption = 0;
-    $conf->db->dolibarr_main_db_encryption = $dolibarr_main_db_encryption;
-    if (empty($dolibarr_main_db_cryptkey)) $dolibarr_main_db_cryptkey = '';
-    $conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey;
+	// Load type and crypt key
+	if (empty($dolibarr_main_db_encryption)) $dolibarr_main_db_encryption = 0;
+	$conf->db->dolibarr_main_db_encryption = $dolibarr_main_db_encryption;
+	if (empty($dolibarr_main_db_cryptkey)) $dolibarr_main_db_cryptkey = '';
+	$conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey;
 
-    $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);
+	$db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);
 
-    // Create the global $hookmanager object
-    include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-    $hookmanager = new HookManager($db);
+	// Create the global $hookmanager object
+	include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+	$hookmanager = new HookManager($db);
 
-    if ($db->connected)
-    {
-        print '<tr><td class="nowrap">';
-        print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td align=\"right\">".$langs->trans("OK")."</td></tr>\n";
-        dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ServerConnection").": $dolibarr_main_db_host ".$langs->transnoentities("OK"));
-        $ok = 1;
-    } else {
-        print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)."</td><td align=\"right\">".$langs->transnoentities("Error")."</td></tr>\n";
-        dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
-        $ok = 0;
-    }
+	if ($db->connected)
+	{
+		print '<tr><td class="nowrap">';
+		print $langs->trans("ServerConnection")." : ".$dolibarr_main_db_host.'</td><td class="right"><span class="neutral">'.$langs->trans("OK").'</span></td></tr>'."\n";
+		dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ServerConnection").": $dolibarr_main_db_host ".$langs->transnoentities("OK"));
+		$ok = 1;
+	} else {
+		print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name).'</td><td class="right"><span class="error">'.$langs->transnoentities("Error")."</span></td></tr>\n";
+		dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
+		$ok = 0;
+	}
 
-    if ($ok)
-    {
-        if ($db->database_selected)
-        {
-            print '<tr><td class="nowrap">';
-            print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."</td><td align=\"right\">".$langs->trans("OK")."</td></tr>\n";
-            dolibarr_install_syslog("upgrade: Database connection successful: ".$dolibarr_main_db_name);
-            $ok = 1;
-        } else {
-            print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)."</td><td align=\"right\">".$langs->trans("Error")."</td></tr>\n";
-            dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
-            $ok = 0;
-        }
-    }
+	if ($ok)
+	{
+		if ($db->database_selected)
+		{
+			print '<tr><td class="nowrap">';
+			print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name.'</td><td class="right"><span class="neutral">'.$langs->trans("OK")."</span></td></tr>\n";
+			dolibarr_install_syslog("upgrade: Database connection successful: ".$dolibarr_main_db_name);
+			$ok = 1;
+		} else {
+			print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name).'</td><td class="right"><span class="ok">'.$langs->trans("Error")."</span></td></tr>\n";
+			dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
+			$ok = 0;
+		}
+	}
 
-    // Affiche version
-    if ($ok)
-    {
-        $version = $db->getVersion();
-        $versionarray = $db->getVersionArray();
-        print '<tr><td>'.$langs->trans("ServerVersion").'</td>';
-        print '<td class="right">'.$version.'</td></tr>';
-        dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ServerVersion").": ".$version);
-        if ($db->type == 'mysqli' && function_exists('mysqli_get_charset'))
-        {
-        	$tmparray = $db->db->get_charset();
-        	print '<tr><td>'.$langs->trans("ClientCharset").'</td>';
-        	print '<td class="right">'.$tmparray->charset.'</td></tr>';
-        	dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ClientCharset").": ".$tmparray->charset);
-        	print '<tr><td>'.$langs->trans("ClientSortingCharset").'</td>';
-        	print '<td class="right">'.$tmparray->collation.'</td></tr>';
-        	dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ClientCollation").": ".$tmparray->collation);
-        }
+	// Affiche version
+	if ($ok)
+	{
+		$version = $db->getVersion();
+		$versionarray = $db->getVersionArray();
+		print '<tr><td>'.$langs->trans("ServerVersion").'</td>';
+		print '<td class="right">'.$version.'</td></tr>';
+		dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ServerVersion").": ".$version);
+		if ($db->type == 'mysqli' && function_exists('mysqli_get_charset'))
+		{
+			$tmparray = $db->db->get_charset();
+			print '<tr><td>'.$langs->trans("ClientCharset").'</td>';
+			print '<td class="right">'.$tmparray->charset.'</td></tr>';
+			dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ClientCharset").": ".$tmparray->charset);
+			print '<tr><td>'.$langs->trans("ClientSortingCharset").'</td>';
+			print '<td class="right">'.$tmparray->collation.'</td></tr>';
+			dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ClientCollation").": ".$tmparray->collation);
+		}
 
-        // Test database version requirement
-        $versionmindb = explode('.', $db::VERSIONMIN);
-        //print join('.',$versionarray).' - '.join('.',$versionmindb);
-        if (count($versionmindb) && count($versionarray)
-        	&& versioncompare($versionarray, $versionmindb) < 0)
-        {
-        	// Warning: database version too low.
-        	print "<tr><td>".$langs->trans("ErrorDatabaseVersionTooLow", join('.', $versionarray), join('.', $versionmindb))."</td><td class=\"right\">".$langs->trans("Error")."</td></tr>\n";
-        	dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorDatabaseVersionTooLow", join('.', $versionarray), join('.', $versionmindb)));
-        	$ok = 0;
-        }
+		// Test database version requirement
+		$versionmindb = explode('.', $db::VERSIONMIN);
+		//print join('.',$versionarray).' - '.join('.',$versionmindb);
+		if (count($versionmindb) && count($versionarray)
+			&& versioncompare($versionarray, $versionmindb) < 0)
+		{
+			// Warning: database version too low.
+			print "<tr><td>".$langs->trans("ErrorDatabaseVersionTooLow", join('.', $versionarray), join('.', $versionmindb)).'</td><td class="right"><span class="error">'.$langs->trans("Error")."</span></td></tr>\n";
+			dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorDatabaseVersionTooLow", join('.', $versionarray), join('.', $versionmindb)));
+			$ok = 0;
+		}
 
-        // Test database version is not forbidden for migration
-        if (empty($ignoredbversion))
-        {
+		// Test database version is not forbidden for migration
+		if (empty($ignoredbversion))
+		{
 			$dbversion_disallowed = array(
 				array('type'=>'mysql', 'version'=>array(5, 5, 40)),
 				array('type'=>'mysqli', 'version'=>array(5, 5, 40)) //,
@@ -217,196 +217,196 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 			}
 			foreach ($dbversion_disallowed as $dbversion_totest)
 			{
-		        //print $db->type.' - '.join('.',$versionarray).' - '.versioncompare($dbversion_totest['version'],$versionarray)."<br>\n";
-		        if ($dbversion_totest['type'] == $db->type
-		        	&& (versioncompare($dbversion_totest['version'], $versionarray) == 0 || versioncompare($dbversion_totest['version'], $versionarray) <= -4 || versioncompare($dbversion_totest['version'], $versionarray) >= 4)
-		        )
-		        {
-		        	// Warning: database version too low.
-		        	print '<tr><td><div class="warning">'.$langs->trans("ErrorDatabaseVersionForbiddenForMigration", join('.', $versionarray), $listofforbiddenversion)."</div></td><td class=\"right\">".$langs->trans("Error")."</td></tr>\n";
-		        	dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorDatabaseVersionForbiddenForMigration", join('.', $versionarray), $listofforbiddenversion));
-		        	$ok = 0;
-		        	break;
-		        }
+				//print $db->type.' - '.join('.',$versionarray).' - '.versioncompare($dbversion_totest['version'],$versionarray)."<br>\n";
+				if ($dbversion_totest['type'] == $db->type
+					&& (versioncompare($dbversion_totest['version'], $versionarray) == 0 || versioncompare($dbversion_totest['version'], $versionarray) <= -4 || versioncompare($dbversion_totest['version'], $versionarray) >= 4)
+				)
+				{
+					// Warning: database version too low.
+					print '<tr><td><div class="warning">'.$langs->trans("ErrorDatabaseVersionForbiddenForMigration", join('.', $versionarray), $listofforbiddenversion)."</div></td><td class=\"right\">".$langs->trans("Error")."</td></tr>\n";
+					dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorDatabaseVersionForbiddenForMigration", join('.', $versionarray), $listofforbiddenversion));
+					$ok = 0;
+					break;
+				}
 			}
-        }
-    }
+		}
+	}
 
-    // Force l'affichage de la progression
-    if ($ok)
-    {
-	    print '<tr><td colspan="2">'.$langs->trans("PleaseBePatient").'</td></tr>';
-	    flush();
-    }
+	// Force l'affichage de la progression
+	if ($ok)
+	{
+		print '<tr><td colspan="2">'.$langs->trans("PleaseBePatient").'</td></tr>';
+		flush();
+	}
 
 
 	/*
 	 * Remove deprecated indexes and constraints for Mysql
 	 */
-    if ($ok && preg_match('/mysql/', $db->type))
-    {
-        $versioncommande = array(4, 0, 0);
-        if (count($versioncommande) && count($versionarray)
-        && versioncompare($versioncommande, $versionarray) <= 0)	// Si mysql >= 4.0
-        {
-        	dolibarr_install_syslog("Clean database from bad named constraints");
+	if ($ok && preg_match('/mysql/', $db->type))
+	{
+		$versioncommande = array(4, 0, 0);
+		if (count($versioncommande) && count($versionarray)
+		&& versioncompare($versioncommande, $versionarray) <= 0)	// Si mysql >= 4.0
+		{
+			dolibarr_install_syslog("Clean database from bad named constraints");
 
-            // Suppression vieilles contraintes sans noms et en doubles
-            // Les contraintes indesirables ont un nom qui commence par 0_ ou se termine par ibfk_999
-            $listtables = array(
-            					MAIN_DB_PREFIX.'adherent_options',
-            					MAIN_DB_PREFIX.'bank_class',
-            					MAIN_DB_PREFIX.'c_ecotaxe',
-            					MAIN_DB_PREFIX.'c_methode_commande_fournisseur', // table renamed
-    		                    MAIN_DB_PREFIX.'c_input_method'
-            );
+			// Suppression vieilles contraintes sans noms et en doubles
+			// Les contraintes indesirables ont un nom qui commence par 0_ ou se termine par ibfk_999
+			$listtables = array(
+								MAIN_DB_PREFIX.'adherent_options',
+								MAIN_DB_PREFIX.'bank_class',
+								MAIN_DB_PREFIX.'c_ecotaxe',
+								MAIN_DB_PREFIX.'c_methode_commande_fournisseur', // table renamed
+								MAIN_DB_PREFIX.'c_input_method'
+			);
 
-            $listtables = $db->DDLListTables($conf->db->name, '');
-            foreach ($listtables as $val)
-            {
-            	// Database prefix filter
-            	if (preg_match('/^'.MAIN_DB_PREFIX.'/', $val))
-            	{
-            		//print "x".$val."<br>";
-            		$sql = "SHOW CREATE TABLE ".$val;
-            		$resql = $db->query($sql);
-            		if ($resql)
-            		{
-            			$values = $db->fetch_array($resql);
-            			$i = 0;
-            			$createsql = $values[1];
-            			while (preg_match('/CONSTRAINT `(0_[0-9a-zA-Z]+|[_0-9a-zA-Z]+_ibfk_[0-9]+)`/i', $createsql, $reg) && $i < 100)
-            			{
-            				$sqldrop = "ALTER TABLE ".$val." DROP FOREIGN KEY ".$reg[1];
-            				$resqldrop = $db->query($sqldrop);
-            				if ($resqldrop)
-            				{
-            					print '<tr><td colspan="2">'.$sqldrop.";</td></tr>\n";
-            				}
-            				$createsql = preg_replace('/CONSTRAINT `'.$reg[1].'`/i', 'XXX', $createsql);
-            				$i++;
-            			}
-            			$db->free($resql);
-            		} else {
-            			if ($db->lasterrno() != 'DB_ERROR_NOSUCHTABLE')
-            			{
-            				print '<tr><td colspan="2"><span class="error">'.$sql.' : '.$db->lasterror()."</font></td></tr>\n";
-            			}
-            		}
-            	}
-            }
-        }
-    }
+			$listtables = $db->DDLListTables($conf->db->name, '');
+			foreach ($listtables as $val)
+			{
+				// Database prefix filter
+				if (preg_match('/^'.MAIN_DB_PREFIX.'/', $val))
+				{
+					//print "x".$val."<br>";
+					$sql = "SHOW CREATE TABLE ".$val;
+					$resql = $db->query($sql);
+					if ($resql)
+					{
+						$values = $db->fetch_array($resql);
+						$i = 0;
+						$createsql = $values[1];
+						while (preg_match('/CONSTRAINT `(0_[0-9a-zA-Z]+|[_0-9a-zA-Z]+_ibfk_[0-9]+)`/i', $createsql, $reg) && $i < 100)
+						{
+							$sqldrop = "ALTER TABLE ".$val." DROP FOREIGN KEY ".$reg[1];
+							$resqldrop = $db->query($sqldrop);
+							if ($resqldrop)
+							{
+								print '<tr><td colspan="2">'.$sqldrop.";</td></tr>\n";
+							}
+							$createsql = preg_replace('/CONSTRAINT `'.$reg[1].'`/i', 'XXX', $createsql);
+							$i++;
+						}
+						$db->free($resql);
+					} else {
+						if ($db->lasterrno() != 'DB_ERROR_NOSUCHTABLE')
+						{
+							print '<tr><td colspan="2"><span class="error">'.$sql.' : '.$db->lasterror()."</font></td></tr>\n";
+						}
+					}
+				}
+			}
+		}
+	}
 
-    /*
+	/*
      *	Load sql files
      */
-    if ($ok)
-    {
-        $dir = "mysql/migration/"; // We use mysql migration scripts whatever is database driver
+	if ($ok)
+	{
+		$dir = "mysql/migration/"; // We use mysql migration scripts whatever is database driver
 		if (!empty($dirmodule)) $dir = dol_buildpath('/'.$dirmodule.'/sql/', 0);
 		dolibarr_install_syslog("Scan sql files for migration files in ".$dir);
 
 		// Clean last part to exclude minor version x.y.z -> x.y
-        $newversionfrom = preg_replace('/(\.[0-9]+)$/i', '.0', $versionfrom);
-        $newversionto = preg_replace('/(\.[0-9]+)$/i', '.0', $versionto);
+		$newversionfrom = preg_replace('/(\.[0-9]+)$/i', '.0', $versionfrom);
+		$newversionto = preg_replace('/(\.[0-9]+)$/i', '.0', $versionto);
 
-        $filelist = array();
-        $i = 0;
-        $ok = 0;
-        $from = '^'.$newversionfrom;
-        $to = $newversionto.'\.sql$';
+		$filelist = array();
+		$i = 0;
+		$ok = 0;
+		$from = '^'.$newversionfrom;
+		$to = $newversionto.'\.sql$';
 
-        // Get files list
-        $filesindir = array();
-        $handle = opendir($dir);
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-            	if (preg_match('/\.sql$/i', $file)) $filesindir[] = $file;
-            }
-            sort($filesindir);
-        } else {
-            print '<div class="error">'.$langs->trans("ErrorCanNotReadDir", $dir).'</div>';
-        }
+		// Get files list
+		$filesindir = array();
+		$handle = opendir($dir);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (preg_match('/\.sql$/i', $file)) $filesindir[] = $file;
+			}
+			sort($filesindir);
+		} else {
+			print '<div class="error">'.$langs->trans("ErrorCanNotReadDir", $dir).'</div>';
+		}
 
-        // Define which file to run
-        foreach ($filesindir as $file)
-        {
-            if (preg_match('/'.$from.'/i', $file))
-            {
-                $filelist[] = $file;
-            } elseif (preg_match('/'.$to.'/i', $file))	// First test may be false if we migrate from x.y.* to x.y.*
-            {
-                $filelist[] = $file;
-            }
-        }
+		// Define which file to run
+		foreach ($filesindir as $file)
+		{
+			if (preg_match('/'.$from.'/i', $file))
+			{
+				$filelist[] = $file;
+			} elseif (preg_match('/'.$to.'/i', $file))	// First test may be false if we migrate from x.y.* to x.y.*
+			{
+				$filelist[] = $file;
+			}
+		}
 
-        if (count($filelist) == 0)
-        {
-        	print '<div class="error">'.$langs->trans("ErrorNoMigrationFilesFoundForParameters").'</div>';
-        } else {
+		if (count($filelist) == 0)
+		{
+			print '<div class="error">'.$langs->trans("ErrorNoMigrationFilesFoundForParameters").'</div>';
+		} else {
 			$listoffileprocessed = array(); // Protection to avoid to process twice the same file
 
-	        // Loop on each migrate files
-	        foreach ($filelist as $file)
-	        {
-	        	if (in_array($dir.$file, $listoffileprocessed)) continue;
+			// Loop on each migrate files
+			foreach ($filelist as $file)
+			{
+				if (in_array($dir.$file, $listoffileprocessed)) continue;
 
-	        	print '<tr><td colspan="2"><hr></td></tr>';
-	            print '<tr><td class="nowrap">'.$langs->trans("ChoosedMigrateScript").'</td><td class="right">'.$file.'</td></tr>'."\n";
+				print '<tr><td colspan="2"><hr style="border-color: #ccc; border-top-style: none;"></td></tr>';
+				print '<tr><td class="nowrap">'.$langs->trans("ChoosedMigrateScript").'</td><td class="right">'.$file.'</td></tr>'."\n";
 
-	            // Run sql script
-	            $ok = run_sql($dir.$file, 0, '', 1);
-	            $listoffileprocessed[$dir.$file] = $dir.$file;
+				// Run sql script
+				$ok = run_sql($dir.$file, 0, '', 1);
+				$listoffileprocessed[$dir.$file] = $dir.$file;
 
-	            // Scan if there is migration scripts that depends of Dolibarr version
-	            // for modules htdocs/module/sql or htdocs/custom/module/sql (files called "dolibarr_x.y.z-a.b.c.sql")
-	            $modulesfile = array();
-	            foreach ($conf->file->dol_document_root as $type => $dirroot)
-	            {
-	            	$handlemodule = @opendir($dirroot); // $dirroot may be '..'
-	            	if (is_resource($handlemodule))
-	            	{
-	            		while (($filemodule = readdir($handlemodule)) !== false)
-	            		{
-	            			if (!preg_match('/\./', $filemodule) && is_dir($dirroot.'/'.$filemodule.'/sql'))	// We exclude filemodule that contains . (are not directories) and are not directories.
-	            			{
-	            				//print "Scan for ".$dirroot . '/' . $filemodule . '/sql/'.$file;
-	            				if (is_file($dirroot.'/'.$filemodule.'/sql/dolibarr_'.$file))
-	            				{
-	            					$modulesfile[$dirroot.'/'.$filemodule.'/sql/dolibarr_'.$file] = '/'.$filemodule.'/sql/dolibarr_'.$file;
-	            				}
-	            			}
-	            		}
-	            		closedir($handlemodule);
-	            	}
-	            }
+				// Scan if there is migration scripts that depends of Dolibarr version
+				// for modules htdocs/module/sql or htdocs/custom/module/sql (files called "dolibarr_x.y.z-a.b.c.sql")
+				$modulesfile = array();
+				foreach ($conf->file->dol_document_root as $type => $dirroot)
+				{
+					$handlemodule = @opendir($dirroot); // $dirroot may be '..'
+					if (is_resource($handlemodule))
+					{
+						while (($filemodule = readdir($handlemodule)) !== false)
+						{
+							if (!preg_match('/\./', $filemodule) && is_dir($dirroot.'/'.$filemodule.'/sql'))	// We exclude filemodule that contains . (are not directories) and are not directories.
+							{
+								//print "Scan for ".$dirroot . '/' . $filemodule . '/sql/'.$file;
+								if (is_file($dirroot.'/'.$filemodule.'/sql/dolibarr_'.$file))
+								{
+									$modulesfile[$dirroot.'/'.$filemodule.'/sql/dolibarr_'.$file] = '/'.$filemodule.'/sql/dolibarr_'.$file;
+								}
+							}
+						}
+						closedir($handlemodule);
+					}
+				}
 
-	            foreach ($modulesfile as $modulefilelong => $modulefileshort)
-	            {
-	            	if (in_array($modulefilelong, $listoffileprocessed)) continue;
+				foreach ($modulesfile as $modulefilelong => $modulefileshort)
+				{
+					if (in_array($modulefilelong, $listoffileprocessed)) continue;
 
-	            	print '<tr><td colspan="2"><hr></td></tr>';
-	            	print '<tr><td class="nowrap">'.$langs->trans("ChoosedMigrateScript").' (external modules)</td><td class="right">'.$modulefileshort.'</td></tr>'."\n";
+					print '<tr><td colspan="2"><hr></td></tr>';
+					print '<tr><td class="nowrap">'.$langs->trans("ChoosedMigrateScript").' (external modules)</td><td class="right">'.$modulefileshort.'</td></tr>'."\n";
 
-		            // Run sql script
-	            	$okmodule = run_sql($modulefilelong, 0, '', 1); // Note: Result of migration of external module should not decide if we continue migration of Dolibarr or not.
-	            	$listoffileprocessed[$modulefilelong] = $modulefilelong;
-	            }
-	        }
+					// Run sql script
+					$okmodule = run_sql($modulefilelong, 0, '', 1); // Note: Result of migration of external module should not decide if we continue migration of Dolibarr or not.
+					$listoffileprocessed[$modulefilelong] = $modulefilelong;
+				}
+			}
 		}
-    }
+	}
 
-    print '</table>';
+	print '</table>';
 
-    if ($db->connected) $db->close();
+	if ($db->connected) $db->close();
 }
 
 if (empty($actiondone))
 {
-    print '<div class="error">'.$langs->trans("ErrorWrongParameters").'</div>';
+	print '<div class="error">'.$langs->trans("ErrorWrongParameters").'</div>';
 }
 
 $ret = 0;
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 6c154ca062a..2d84e234cf2 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -41,7 +41,7 @@
 include_once 'inc.php';
 if (!file_exists($conffile))
 {
-    print 'Error: Dolibarr config file was not found. This may means that Dolibarr is not installed yet. Please call the page "/install/index.php" instead of "/install/upgrade.php").';
+	print 'Error: Dolibarr config file was not found. This may means that Dolibarr is not installed yet. Please call the page "/install/index.php" instead of "/install/upgrade.php").';
 }
 require_once $conffile;
 require_once $dolibarr_main_document_root.'/compta/facture/class/facture.class.php';
@@ -111,353 +111,353 @@ pHeader('', 'step5', GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'upg
 
 if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ09')))
 {
-    print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> '.$langs->trans('DataMigration').'</h3>';
+	print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> '.$langs->trans('DataMigration').'</h3>';
 
-    print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
+	print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
 
-    // If password is encoded, we decode it
-    if (preg_match('/crypted:/i', $dolibarr_main_db_pass) || !empty($dolibarr_main_db_encrypted_pass))
-    {
-        require_once $dolibarr_main_document_root.'/core/lib/security.lib.php';
-        if (preg_match('/crypted:/i', $dolibarr_main_db_pass))
-        {
-            $dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);
-            $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_pass);
-            $dolibarr_main_db_encrypted_pass = $dolibarr_main_db_pass; // We need to set this as it is used to know the password was initially crypted
-        } else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
-    }
+	// If password is encoded, we decode it
+	if (preg_match('/crypted:/i', $dolibarr_main_db_pass) || !empty($dolibarr_main_db_encrypted_pass))
+	{
+		require_once $dolibarr_main_document_root.'/core/lib/security.lib.php';
+		if (preg_match('/crypted:/i', $dolibarr_main_db_pass))
+		{
+			$dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);
+			$dolibarr_main_db_pass = dol_decode($dolibarr_main_db_pass);
+			$dolibarr_main_db_encrypted_pass = $dolibarr_main_db_pass; // We need to set this as it is used to know the password was initially crypted
+		} else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
+	}
 
-    // $conf is already instancied inside inc.php
-    $conf->db->type = $dolibarr_main_db_type;
-    $conf->db->host = $dolibarr_main_db_host;
-    $conf->db->port = $dolibarr_main_db_port;
-    $conf->db->name = $dolibarr_main_db_name;
-    $conf->db->user = $dolibarr_main_db_user;
-    $conf->db->pass = $dolibarr_main_db_pass;
+	// $conf is already instancied inside inc.php
+	$conf->db->type = $dolibarr_main_db_type;
+	$conf->db->host = $dolibarr_main_db_host;
+	$conf->db->port = $dolibarr_main_db_port;
+	$conf->db->name = $dolibarr_main_db_name;
+	$conf->db->user = $dolibarr_main_db_user;
+	$conf->db->pass = $dolibarr_main_db_pass;
 
-    $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);
+	$db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);
 
-    // Create the global $hookmanager object
-    include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-    $hookmanager = new HookManager($db);
-    $hookmanager->initHooks(array('upgrade'));
+	// Create the global $hookmanager object
+	include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+	$hookmanager = new HookManager($db);
+	$hookmanager->initHooks(array('upgrade'));
 
-    if (!$db->connected)
-    {
-        print '<tr><td colspan="4">'.$langs->trans("ErrorFailedToConnectToDatabase", $conf->db->name).'</td><td class="right">'.$langs->trans('Error').'</td></tr>';
-        dolibarr_install_syslog('upgrade2: failed to connect to database :'.$conf->db->name.' on '.$conf->db->host.' for user '.$conf->db->user, LOG_ERR);
-        $error++;
-    }
+	if (!$db->connected)
+	{
+		print '<tr><td colspan="4">'.$langs->trans("ErrorFailedToConnectToDatabase", $conf->db->name).'</td><td class="right">'.$langs->trans('Error').'</td></tr>';
+		dolibarr_install_syslog('upgrade2: failed to connect to database :'.$conf->db->name.' on '.$conf->db->host.' for user '.$conf->db->user, LOG_ERR);
+		$error++;
+	}
 
-    if (!$error)
-    {
-        if ($db->database_selected)
-        {
-            dolibarr_install_syslog('upgrade2: database connection successful :'.$dolibarr_main_db_name);
-        } else {
-            $error++;
-        }
-    }
+	if (!$error)
+	{
+		if ($db->database_selected)
+		{
+			dolibarr_install_syslog('upgrade2: database connection successful :'.$dolibarr_main_db_name);
+		} else {
+			$error++;
+		}
+	}
 
-    if (empty($dolibarr_main_db_encryption)) $dolibarr_main_db_encryption = 0;
-    $conf->db->dolibarr_main_db_encryption = $dolibarr_main_db_encryption;
-    if (empty($dolibarr_main_db_cryptkey)) $dolibarr_main_db_cryptkey = '';
-    $conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey;
+	if (empty($dolibarr_main_db_encryption)) $dolibarr_main_db_encryption = 0;
+	$conf->db->dolibarr_main_db_encryption = $dolibarr_main_db_encryption;
+	if (empty($dolibarr_main_db_cryptkey)) $dolibarr_main_db_cryptkey = '';
+	$conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey;
 
-    // Chargement config
-    if (!$error)
-    {
-    	$conf->setValues($db);
-    	// Reset forced setup after the setValues
-    	if (defined('SYSLOG_FILE')) $conf->global->SYSLOG_FILE = constant('SYSLOG_FILE');
-    	$conf->global->MAIN_ENABLE_LOG_TO_HTML = 1;
-    }
+	// Chargement config
+	if (!$error)
+	{
+		$conf->setValues($db);
+		// Reset forced setup after the setValues
+		if (defined('SYSLOG_FILE')) $conf->global->SYSLOG_FILE = constant('SYSLOG_FILE');
+		$conf->global->MAIN_ENABLE_LOG_TO_HTML = 1;
+	}
 
 
-    /***************************************************************************************
+	/***************************************************************************************
      *
      * Migration of data
      *
      ***************************************************************************************/
-    $db->begin();
+	$db->begin();
 
-    if (!$error)
-    {
-        // Current version is $conf->global->MAIN_VERSION_LAST_UPGRADE
-        // Version to install is DOL_VERSION
-        $dolibarrlastupgradeversionarray = preg_split('/[\.-]/', isset($conf->global->MAIN_VERSION_LAST_UPGRADE) ? $conf->global->MAIN_VERSION_LAST_UPGRADE : (isset($conf->global->MAIN_VERSION_LAST_INSTALL) ? $conf->global->MAIN_VERSION_LAST_INSTALL : ''));
+	if (!$error)
+	{
+		// Current version is $conf->global->MAIN_VERSION_LAST_UPGRADE
+		// Version to install is DOL_VERSION
+		$dolibarrlastupgradeversionarray = preg_split('/[\.-]/', isset($conf->global->MAIN_VERSION_LAST_UPGRADE) ? $conf->global->MAIN_VERSION_LAST_UPGRADE : (isset($conf->global->MAIN_VERSION_LAST_INSTALL) ? $conf->global->MAIN_VERSION_LAST_INSTALL : ''));
 
-        // Chaque action de migration doit renvoyer une ligne sur 4 colonnes avec
-        // dans la 1ere colonne, la description de l'action a faire
-        // dans la 4eme colonne, le texte 'OK' si fait ou 'AlreadyDone' si rien n'est fait ou 'Error'
+		// Chaque action de migration doit renvoyer une ligne sur 4 colonnes avec
+		// dans la 1ere colonne, la description de l'action a faire
+		// dans la 4eme colonne, le texte 'OK' si fait ou 'AlreadyDone' si rien n'est fait ou 'Error'
 
-        $versiontoarray = explode('.', $versionto);
-        $versionranarray = explode('.', DOL_VERSION);
+		$versiontoarray = explode('.', $versionto);
+		$versionranarray = explode('.', DOL_VERSION);
 
 
-        // Force to execute this at begin to avoid the new core code into Dolibarr to be broken.
-        $sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN birth date';
-        $db->query($sql, 1);
-        $sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN dateemployment date';
-        $db->query($sql, 1);
-        $sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN dateemploymentend date';
-        $db->query($sql, 1);
-        $sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN default_range integer';
-        $db->query($sql, 1);
-        $sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN default_c_exp_tax_cat integer';
-        $db->query($sql, 1);
-        $sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'extrafields ADD COLUMN langs varchar(24)';
-        $db->query($sql, 1);
-        $sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'extrafields ADD COLUMN fieldcomputed text';
-        $db->query($sql, 1);
-        $sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'extrafields ADD COLUMN fielddefault varchar(255)';
-        $db->query($sql, 1);
-        $sql = 'ALTER TABLE '.MAIN_DB_PREFIX."extrafields ADD COLUMN enabled varchar(255) DEFAULT '1'";
-        $db->query($sql, 1);
-        $sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'extrafields ADD COLUMN help text';
-        $db->query($sql, 1);
-        $sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user_rights ADD COLUMN entity integer DEFAULT 1 NOT NULL';
-        $db->query($sql, 1);
+		// Force to execute this at begin to avoid the new core code into Dolibarr to be broken.
+		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN birth date';
+		$db->query($sql, 1);
+		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN dateemployment date';
+		$db->query($sql, 1);
+		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN dateemploymentend date';
+		$db->query($sql, 1);
+		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN default_range integer';
+		$db->query($sql, 1);
+		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN default_c_exp_tax_cat integer';
+		$db->query($sql, 1);
+		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'extrafields ADD COLUMN langs varchar(24)';
+		$db->query($sql, 1);
+		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'extrafields ADD COLUMN fieldcomputed text';
+		$db->query($sql, 1);
+		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'extrafields ADD COLUMN fielddefault varchar(255)';
+		$db->query($sql, 1);
+		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX."extrafields ADD COLUMN enabled varchar(255) DEFAULT '1'";
+		$db->query($sql, 1);
+		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'extrafields ADD COLUMN help text';
+		$db->query($sql, 1);
+		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user_rights ADD COLUMN entity integer DEFAULT 1 NOT NULL';
+		$db->query($sql, 1);
 
 
-        $afterversionarray = explode('.', '2.0.0');
-        $beforeversionarray = explode('.', '2.7.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-            // Script pour V2 -> V2.1
-            migrate_paiements($db, $langs, $conf);
+		$afterversionarray = explode('.', '2.0.0');
+		$beforeversionarray = explode('.', '2.7.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			// Script pour V2 -> V2.1
+			migrate_paiements($db, $langs, $conf);
 
-            migrate_contracts_det($db, $langs, $conf);
+			migrate_contracts_det($db, $langs, $conf);
 
-            migrate_contracts_date1($db, $langs, $conf);
+			migrate_contracts_date1($db, $langs, $conf);
 
-            migrate_contracts_date2($db, $langs, $conf);
+			migrate_contracts_date2($db, $langs, $conf);
 
-            migrate_contracts_date3($db, $langs, $conf);
+			migrate_contracts_date3($db, $langs, $conf);
 
-            migrate_contracts_open($db, $langs, $conf);
+			migrate_contracts_open($db, $langs, $conf);
 
-            migrate_modeles($db, $langs, $conf);
+			migrate_modeles($db, $langs, $conf);
 
-            migrate_price_propal($db, $langs, $conf);
+			migrate_price_propal($db, $langs, $conf);
 
-            migrate_price_commande($db, $langs, $conf);
+			migrate_price_commande($db, $langs, $conf);
 
-            migrate_price_commande_fournisseur($db, $langs, $conf);
+			migrate_price_commande_fournisseur($db, $langs, $conf);
 
-            migrate_price_contrat($db, $langs, $conf);
+			migrate_price_contrat($db, $langs, $conf);
 
-            migrate_paiementfourn_facturefourn($db, $langs, $conf);
+			migrate_paiementfourn_facturefourn($db, $langs, $conf);
 
 
-            // Script pour V2.1 -> V2.2
-            migrate_paiements_orphelins_1($db, $langs, $conf);
+			// Script pour V2.1 -> V2.2
+			migrate_paiements_orphelins_1($db, $langs, $conf);
 
-            migrate_paiements_orphelins_2($db, $langs, $conf);
+			migrate_paiements_orphelins_2($db, $langs, $conf);
 
-            migrate_links_transfert($db, $langs, $conf);
+			migrate_links_transfert($db, $langs, $conf);
 
 
-            // Script pour V2.2 -> V2.4
-            migrate_commande_expedition($db, $langs, $conf);
+			// Script pour V2.2 -> V2.4
+			migrate_commande_expedition($db, $langs, $conf);
 
-            migrate_commande_livraison($db, $langs, $conf);
+			migrate_commande_livraison($db, $langs, $conf);
 
-            migrate_detail_livraison($db, $langs, $conf);
+			migrate_detail_livraison($db, $langs, $conf);
 
 
-            // Script pour V2.5 -> V2.6
-            migrate_stocks($db, $langs, $conf);
+			// Script pour V2.5 -> V2.6
+			migrate_stocks($db, $langs, $conf);
 
 
-            // Script pour V2.6 -> V2.7
-            migrate_menus($db, $langs, $conf);
+			// Script pour V2.6 -> V2.7
+			migrate_menus($db, $langs, $conf);
 
-            migrate_commande_deliveryaddress($db, $langs, $conf);
+			migrate_commande_deliveryaddress($db, $langs, $conf);
 
-            migrate_restore_missing_links($db, $langs, $conf);
+			migrate_restore_missing_links($db, $langs, $conf);
 
-            migrate_rename_directories($db, $langs, $conf, '/compta', '/banque');
+			migrate_rename_directories($db, $langs, $conf, '/compta', '/banque');
 
-            migrate_rename_directories($db, $langs, $conf, '/societe', '/mycompany');
-        }
+			migrate_rename_directories($db, $langs, $conf, '/societe', '/mycompany');
+		}
 
-        // Script for 2.8
-        $afterversionarray = explode('.', '2.7.9');
-        $beforeversionarray = explode('.', '2.8.9');
-        //print $versionto.' '.versioncompare($versiontoarray,$afterversionarray).' '.versioncompare($versiontoarray,$beforeversionarray);
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-            migrate_price_facture($db, $langs, $conf); // Code of this function works for 2.8+ because need a field tva_tx
+		// Script for 2.8
+		$afterversionarray = explode('.', '2.7.9');
+		$beforeversionarray = explode('.', '2.8.9');
+		//print $versionto.' '.versioncompare($versiontoarray,$afterversionarray).' '.versioncompare($versiontoarray,$beforeversionarray);
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			migrate_price_facture($db, $langs, $conf); // Code of this function works for 2.8+ because need a field tva_tx
 
-            migrate_relationship_tables($db, $langs, $conf, 'co_exp', 'fk_commande', 'commande', 'fk_expedition', 'shipping');
+			migrate_relationship_tables($db, $langs, $conf, 'co_exp', 'fk_commande', 'commande', 'fk_expedition', 'shipping');
 
-            migrate_relationship_tables($db, $langs, $conf, 'pr_exp', 'fk_propal', 'propal', 'fk_expedition', 'shipping');
+			migrate_relationship_tables($db, $langs, $conf, 'pr_exp', 'fk_propal', 'propal', 'fk_expedition', 'shipping');
 
-            migrate_relationship_tables($db, $langs, $conf, 'pr_liv', 'fk_propal', 'propal', 'fk_livraison', 'delivery');
+			migrate_relationship_tables($db, $langs, $conf, 'pr_liv', 'fk_propal', 'propal', 'fk_livraison', 'delivery');
 
-            migrate_relationship_tables($db, $langs, $conf, 'co_liv', 'fk_commande', 'commande', 'fk_livraison', 'delivery');
+			migrate_relationship_tables($db, $langs, $conf, 'co_liv', 'fk_commande', 'commande', 'fk_livraison', 'delivery');
 
-            migrate_relationship_tables($db, $langs, $conf, 'co_pr', 'fk_propale', 'propal', 'fk_commande', 'commande');
+			migrate_relationship_tables($db, $langs, $conf, 'co_pr', 'fk_propale', 'propal', 'fk_commande', 'commande');
 
-            migrate_relationship_tables($db, $langs, $conf, 'fa_pr', 'fk_propal', 'propal', 'fk_facture', 'facture');
+			migrate_relationship_tables($db, $langs, $conf, 'fa_pr', 'fk_propal', 'propal', 'fk_facture', 'facture');
 
-            migrate_relationship_tables($db, $langs, $conf, 'co_fa', 'fk_commande', 'commande', 'fk_facture', 'facture');
+			migrate_relationship_tables($db, $langs, $conf, 'co_fa', 'fk_commande', 'commande', 'fk_facture', 'facture');
 
-            migrate_project_user_resp($db, $langs, $conf);
+			migrate_project_user_resp($db, $langs, $conf);
 
-            migrate_project_task_actors($db, $langs, $conf);
-        }
+			migrate_project_task_actors($db, $langs, $conf);
+		}
 
-        // Script for 2.9
-        $afterversionarray = explode('.', '2.8.9');
-        $beforeversionarray = explode('.', '2.9.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-            migrate_project_task_time($db, $langs, $conf);
+		// Script for 2.9
+		$afterversionarray = explode('.', '2.8.9');
+		$beforeversionarray = explode('.', '2.9.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			migrate_project_task_time($db, $langs, $conf);
 
-            migrate_customerorder_shipping($db, $langs, $conf);
+			migrate_customerorder_shipping($db, $langs, $conf);
 
-            migrate_shipping_delivery($db, $langs, $conf);
+			migrate_shipping_delivery($db, $langs, $conf);
 
-            migrate_shipping_delivery2($db, $langs, $conf);
-        }
+			migrate_shipping_delivery2($db, $langs, $conf);
+		}
 
-        // Script for 3.0
-        $afterversionarray = explode('.', '2.9.9');
-        $beforeversionarray = explode('.', '3.0.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-            // No particular code
-        }
+		// Script for 3.0
+		$afterversionarray = explode('.', '2.9.9');
+		$beforeversionarray = explode('.', '3.0.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			// No particular code
+		}
 
-        // Script for 3.1
-        $afterversionarray = explode('.', '3.0.9');
-        $beforeversionarray = explode('.', '3.1.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-            migrate_rename_directories($db, $langs, $conf, '/rss', '/externalrss');
+		// Script for 3.1
+		$afterversionarray = explode('.', '3.0.9');
+		$beforeversionarray = explode('.', '3.1.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			migrate_rename_directories($db, $langs, $conf, '/rss', '/externalrss');
 
-            migrate_actioncomm_element($db, $langs, $conf);
-        }
+			migrate_actioncomm_element($db, $langs, $conf);
+		}
 
-        // Script for 3.2
-        $afterversionarray = explode('.', '3.1.9');
-        $beforeversionarray = explode('.', '3.2.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-            migrate_price_contrat($db, $langs, $conf);
+		// Script for 3.2
+		$afterversionarray = explode('.', '3.1.9');
+		$beforeversionarray = explode('.', '3.2.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			migrate_price_contrat($db, $langs, $conf);
 
-        	migrate_mode_reglement($db, $langs, $conf);
+			migrate_mode_reglement($db, $langs, $conf);
 
-        	migrate_clean_association($db, $langs, $conf);
-        }
+			migrate_clean_association($db, $langs, $conf);
+		}
 
-        // Script for 3.3
-        $afterversionarray = explode('.', '3.2.9');
-        $beforeversionarray = explode('.', '3.3.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-        	migrate_categorie_association($db, $langs, $conf);
-        }
+		// Script for 3.3
+		$afterversionarray = explode('.', '3.2.9');
+		$beforeversionarray = explode('.', '3.3.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			migrate_categorie_association($db, $langs, $conf);
+		}
 
 		// Script for 3.4
 		// No specific scripts
 
-        // Tasks to do always and only into last targeted version
-        $afterversionarray = explode('.', '3.6.9'); // target is after this
-        $beforeversionarray = explode('.', '3.7.9'); // target is before this
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-       	    migrate_event_assignement($db, $langs, $conf);
-        }
+		// Tasks to do always and only into last targeted version
+		$afterversionarray = explode('.', '3.6.9'); // target is after this
+		$beforeversionarray = explode('.', '3.7.9'); // target is before this
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+	   		migrate_event_assignement($db, $langs, $conf);
+		}
 
-        // Scripts for 3.9
-        $afterversionarray = explode('.', '3.7.9');
-        $beforeversionarray = explode('.', '3.8.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-        	// No particular code
-        }
+		// Scripts for 3.9
+		$afterversionarray = explode('.', '3.7.9');
+		$beforeversionarray = explode('.', '3.8.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			// No particular code
+		}
 
-        // Scripts for 4.0
-        $afterversionarray = explode('.', '3.9.9');
-        $beforeversionarray = explode('.', '4.0.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-            migrate_rename_directories($db, $langs, $conf, '/fckeditor', '/medias');
-        }
+		// Scripts for 4.0
+		$afterversionarray = explode('.', '3.9.9');
+		$beforeversionarray = explode('.', '4.0.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			migrate_rename_directories($db, $langs, $conf, '/fckeditor', '/medias');
+		}
 
-        // Scripts for 5.0
-        $afterversionarray = explode('.', '4.0.9');
-        $beforeversionarray = explode('.', '5.0.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-            // Migrate to add entity value into llx_societe_remise
-            migrate_remise_entity($db, $langs, $conf);
+		// Scripts for 5.0
+		$afterversionarray = explode('.', '4.0.9');
+		$beforeversionarray = explode('.', '5.0.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			// Migrate to add entity value into llx_societe_remise
+			migrate_remise_entity($db, $langs, $conf);
 
-            // Migrate to add entity value into llx_societe_remise_except
-            migrate_remise_except_entity($db, $langs, $conf);
-        }
+			// Migrate to add entity value into llx_societe_remise_except
+			migrate_remise_except_entity($db, $langs, $conf);
+		}
 
-        // Scripts for 6.0
-        $afterversionarray = explode('.', '5.0.9');
-        $beforeversionarray = explode('.', '6.0.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-        	if (!empty($conf->multicompany->enabled))
-        	{
-        		global $multicompany_transverse_mode;
+		// Scripts for 6.0
+		$afterversionarray = explode('.', '5.0.9');
+		$beforeversionarray = explode('.', '6.0.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			if (!empty($conf->multicompany->enabled))
+			{
+				global $multicompany_transverse_mode;
 
-        		// Only if the transverse mode is not used
-        		if (empty($multicompany_transverse_mode))
-        		{
-        			// Migrate to add entity value into llx_user_rights
-        			migrate_user_rights_entity($db, $langs, $conf);
+				// Only if the transverse mode is not used
+				if (empty($multicompany_transverse_mode))
+				{
+					// Migrate to add entity value into llx_user_rights
+					migrate_user_rights_entity($db, $langs, $conf);
 
-        			// Migrate to add entity value into llx_usergroup_rights
-        			migrate_usergroup_rights_entity($db, $langs, $conf);
-        		}
-        	}
-        }
+					// Migrate to add entity value into llx_usergroup_rights
+					migrate_usergroup_rights_entity($db, $langs, $conf);
+				}
+			}
+		}
 
-        // Scripts for 7.0
-        $afterversionarray = explode('.', '6.0.9');
-        $beforeversionarray = explode('.', '7.0.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-            // Migrate contact association
-        	migrate_event_assignement_contact($db, $langs, $conf);
+		// Scripts for 7.0
+		$afterversionarray = explode('.', '6.0.9');
+		$beforeversionarray = explode('.', '7.0.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			// Migrate contact association
+			migrate_event_assignement_contact($db, $langs, $conf);
 
-        	migrate_reset_blocked_log($db, $langs, $conf);
-        }
+			migrate_reset_blocked_log($db, $langs, $conf);
+		}
 
-        // Scripts for 8.0
-        $afterversionarray = explode('.', '7.0.9');
-        $beforeversionarray = explode('.', '8.0.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-        	migrate_rename_directories($db, $langs, $conf, '/contracts', '/contract');
-        }
+		// Scripts for 8.0
+		$afterversionarray = explode('.', '7.0.9');
+		$beforeversionarray = explode('.', '8.0.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			migrate_rename_directories($db, $langs, $conf, '/contracts', '/contract');
+		}
 
-        // Scripts for 9.0
-        $afterversionarray = explode('.', '8.0.9');
-        $beforeversionarray = explode('.', '9.0.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-        	migrate_user_photospath();
-        }
+		// Scripts for 9.0
+		$afterversionarray = explode('.', '8.0.9');
+		$beforeversionarray = explode('.', '9.0.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			migrate_user_photospath();
+		}
 
-        // Scripts for 11.0
-        $afterversionarray = explode('.', '10.0.9');
-        $beforeversionarray = explode('.', '11.0.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
-            migrate_users_socialnetworks();
-            migrate_members_socialnetworks();
-            migrate_contacts_socialnetworks();
-            migrate_thirdparties_socialnetworks();
-        }
-    }
+		// Scripts for 11.0
+		$afterversionarray = explode('.', '10.0.9');
+		$beforeversionarray = explode('.', '11.0.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
+			migrate_users_socialnetworks();
+			migrate_members_socialnetworks();
+			migrate_contacts_socialnetworks();
+			migrate_thirdparties_socialnetworks();
+		}
+	}
 
 	// Code executed only if migration is LAST ONE. Must always be done.
 	if (versioncompare($versiontoarray, $versionranarray) >= 0 || versioncompare($versiontoarray, $versionranarray) <= -3)
@@ -497,86 +497,86 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 		migrate_reload_menu($db, $langs, $conf);
 	}
 
-    // Can force activation of some module during migration with parameter 'enablemodules=MAIN_MODULE_XXX,MAIN_MODULE_YYY,...'
-    // In most cases (online install or upgrade) $enablemodules is empty. Can be forced when ran from command line.
-    if (!$error && $enablemodules)
-    {
-        // Reload modules (this must be always done and only into last targeted version)
-        $listofmodules = array();
-        $enablemodules = preg_replace('/enablemodules=/', '', $enablemodules);
-        $tmplistofmodules = explode(',', $enablemodules);
-        foreach ($tmplistofmodules as $value)
-        {
-            $listofmodules[$value] = 'forceactivate';
-        }
-        migrate_reload_modules($db, $langs, $conf, $listofmodules, 1);
-    }
+	// Can force activation of some module during migration with parameter 'enablemodules=MAIN_MODULE_XXX,MAIN_MODULE_YYY,...'
+	// In most cases (online install or upgrade) $enablemodules is empty. Can be forced when ran from command line.
+	if (!$error && $enablemodules)
+	{
+		// Reload modules (this must be always done and only into last targeted version)
+		$listofmodules = array();
+		$enablemodules = preg_replace('/enablemodules=/', '', $enablemodules);
+		$tmplistofmodules = explode(',', $enablemodules);
+		foreach ($tmplistofmodules as $value)
+		{
+			$listofmodules[$value] = 'forceactivate';
+		}
+		migrate_reload_modules($db, $langs, $conf, $listofmodules, 1);
+	}
 
 
-    // Can call a dedicated external upgrade process
-    if (!$error)
-    {
-        $parameters = array('versionfrom'=>$versionfrom, 'versionto='.$versionto);
-        $object = new stdClass();
-        $action = "upgrade";
-        $reshook = $hookmanager->executeHooks('doUpgrade2', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-        if ($hookmanager->resNbOfHooks > 0)
-        {
-            if ($reshook < 0)
-            {
-                print '<tr><td colspan="4">';
-                print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: ';
-                print $hookmanager->error;
-                print "<!-- (".$reshook.") -->";
-                print '</td></tr>';
-            } else {
-                print '<tr><td colspan="4">';
-                print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: OK';
-                print "<!-- (".$reshook.") -->";
-                print '</td></tr>';
-            }
-        } else {
-            //if (! empty($conf->modules))
-            if (!empty($conf->modules_parts['hooks']))     // If there is at least one module with one hook, we show message to say nothing was done
-            {
-                print '<tr><td colspan="4">';
-                print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: '.$langs->trans("None");
-                print '</td></tr>';
-            }
-        }
-    }
+	// Can call a dedicated external upgrade process
+	if (!$error)
+	{
+		$parameters = array('versionfrom'=>$versionfrom, 'versionto='.$versionto);
+		$object = new stdClass();
+		$action = "upgrade";
+		$reshook = $hookmanager->executeHooks('doUpgrade2', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+		if ($hookmanager->resNbOfHooks > 0)
+		{
+			if ($reshook < 0)
+			{
+				print '<tr><td colspan="4">';
+				print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: ';
+				print $hookmanager->error;
+				print "<!-- (".$reshook.") -->";
+				print '</td></tr>';
+			} else {
+				print '<tr><td colspan="4">';
+				print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: <span class="ok">OK</span>';
+				print "<!-- (".$reshook.") -->";
+				print '</td></tr>';
+			}
+		} else {
+			//if (! empty($conf->modules))
+			if (!empty($conf->modules_parts['hooks']))     // If there is at least one module with one hook, we show message to say nothing was done
+			{
+				print '<tr><td colspan="4">';
+				print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: '.$langs->trans("None");
+				print '</td></tr>';
+			}
+		}
+	}
 
-    print '</table>';
+	print '</table>';
 
 
-    $sql = 'UPDATE '.MAIN_DB_PREFIX."const SET VALUE = 'torefresh' WHERE name = 'MAIN_FIRST_PING_OK_ID'";
-    $db->query($sql, 1);
+	$sql = 'UPDATE '.MAIN_DB_PREFIX."const SET VALUE = 'torefresh' WHERE name = 'MAIN_FIRST_PING_OK_ID'";
+	$db->query($sql, 1);
 
 
-    // We always commit.
-    // Process is designed so we can run it several times whatever is situation.
-    $db->commit();
-    $db->close();
+	// We always commit.
+	// Process is designed so we can run it several times whatever is situation.
+	$db->commit();
+	$db->close();
 
 
-    // Copy directory medias
-    $srcroot = DOL_DOCUMENT_ROOT.'/install/medias';
-    $destroot = DOL_DATA_ROOT.'/medias';
-    dolCopyDir($srcroot, $destroot, 0, 0);
+	// Copy directory medias
+	$srcroot = DOL_DOCUMENT_ROOT.'/install/medias';
+	$destroot = DOL_DATA_ROOT.'/medias';
+	dolCopyDir($srcroot, $destroot, 0, 0);
 
 
-    // Actions for all versions (no database change but delete some files and directories)
-    migrate_delete_old_files($db, $langs, $conf);
-    migrate_delete_old_dir($db, $langs, $conf);
-    // Actions for all versions (no database change but create some directories)
-    dol_mkdir(DOL_DATA_ROOT.'/bank');
-    // Actions for all versions (no database change but rename some directories)
-    migrate_rename_directories($db, $langs, $conf, '/banque/bordereau', '/bank/checkdeposits');
+	// Actions for all versions (no database change but delete some files and directories)
+	migrate_delete_old_files($db, $langs, $conf);
+	migrate_delete_old_dir($db, $langs, $conf);
+	// Actions for all versions (no database change but create some directories)
+	dol_mkdir(DOL_DATA_ROOT.'/bank');
+	// Actions for all versions (no database change but rename some directories)
+	migrate_rename_directories($db, $langs, $conf, '/banque/bordereau', '/bank/checkdeposits');
 
-    print '<div><br>'.$langs->trans("MigrationFinished").'</div>';
+	print '<div><br>'.$langs->trans("MigrationFinished").'</div>';
 } else {
-    print '<div class="error">'.$langs->trans('ErrorWrongParameters').'</div>';
-    $error++;
+	print '<div class="error">'.$langs->trans('ErrorWrongParameters').'</div>';
+	$error++;
 }
 
 $ret = 0;
@@ -603,78 +603,78 @@ if ($ret) exit($ret);
  */
 function migrate_paiements($db, $langs, $conf)
 {
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationPaymentsUpdate')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationPaymentsUpdate')."</b><br>\n";
 
-    $result = $db->DDLDescTable(MAIN_DB_PREFIX."paiement", "fk_facture");
-    $obj = $db->fetch_object($result);
-    if ($obj)
-    {
-        $sql = "SELECT p.rowid, p.fk_facture, p.amount";
-        $sql .= " FROM ".MAIN_DB_PREFIX."paiement as p";
-        $sql .= " WHERE p.fk_facture > 0";
+	$result = $db->DDLDescTable(MAIN_DB_PREFIX."paiement", "fk_facture");
+	$obj = $db->fetch_object($result);
+	if ($obj)
+	{
+		$sql = "SELECT p.rowid, p.fk_facture, p.amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."paiement as p";
+		$sql .= " WHERE p.fk_facture > 0";
 
-        $resql = $db->query($sql);
+		$resql = $db->query($sql);
 
-        dolibarr_install_syslog("upgrade2::migrate_paiements");
-        if ($resql)
-        {
-            $i = 0;
-            $row = array();
-            $num = $db->num_rows($resql);
+		dolibarr_install_syslog("upgrade2::migrate_paiements");
+		if ($resql)
+		{
+			$i = 0;
+			$row = array();
+			$num = $db->num_rows($resql);
 
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
-                $row[$i][0] = $obj->rowid;
-                $row[$i][1] = $obj->fk_facture;
-                $row[$i][2] = $obj->amount;
-                $i++;
-            }
-        } else {
-            dol_print_error($db);
-        }
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
+				$row[$i][0] = $obj->rowid;
+				$row[$i][1] = $obj->fk_facture;
+				$row[$i][2] = $obj->amount;
+				$i++;
+			}
+		} else {
+			dol_print_error($db);
+		}
 
-        if ($num)
-        {
-            print $langs->trans('MigrationPaymentsNumberToUpdate', $num)."<br>\n";
-            if ($db->begin())
-            {
-                $res = 0;
-                $num = count($row);
-                for ($i = 0; $i < $num; $i++)
-                {
-                    $sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement_facture (fk_facture, fk_paiement, amount)";
-                    $sql .= " VALUES (".$row[$i][1].",".$row[$i][0].",".$row[$i][2].")";
+		if ($num)
+		{
+			print $langs->trans('MigrationPaymentsNumberToUpdate', $num)."<br>\n";
+			if ($db->begin())
+			{
+				$res = 0;
+				$num = count($row);
+				for ($i = 0; $i < $num; $i++)
+				{
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement_facture (fk_facture, fk_paiement, amount)";
+					$sql .= " VALUES (".$row[$i][1].",".$row[$i][0].",".$row[$i][2].")";
 
-                    $res += $db->query($sql);
+					$res += $db->query($sql);
 
-                    $sql = "UPDATE ".MAIN_DB_PREFIX."paiement SET fk_facture = 0 WHERE rowid = ".$row[$i][0];
+					$sql = "UPDATE ".MAIN_DB_PREFIX."paiement SET fk_facture = 0 WHERE rowid = ".$row[$i][0];
 
-                    $res += $db->query($sql);
+					$res += $db->query($sql);
 
-                    print $langs->trans('MigrationProcessPaymentUpdate', $row[$i][0])."<br>\n";
-                }
-            }
+					print $langs->trans('MigrationProcessPaymentUpdate', $row[$i][0])."<br>\n";
+				}
+			}
 
-            if ($res == (2 * count($row)))
-            {
-                $db->commit();
-                print $langs->trans('MigrationSuccessfullUpdate')."<br>";
-            } else {
-                $db->rollback();
-                print $langs->trans('MigrationUpdateFailed').'<br>';
-            }
-        } else {
-            print $langs->trans('MigrationPaymentsNothingToUpdate')."<br>\n";
-        }
-    } else {
-        print $langs->trans('MigrationPaymentsNothingToUpdate')."<br>\n";
-    }
+			if ($res == (2 * count($row)))
+			{
+				$db->commit();
+				print $langs->trans('MigrationSuccessfullUpdate')."<br>";
+			} else {
+				$db->rollback();
+				print $langs->trans('MigrationUpdateFailed').'<br>';
+			}
+		} else {
+			print $langs->trans('MigrationPaymentsNothingToUpdate')."<br>\n";
+		}
+	} else {
+		print $langs->trans('MigrationPaymentsNothingToUpdate')."<br>\n";
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -689,109 +689,109 @@ function migrate_paiements($db, $langs, $conf)
  */
 function migrate_paiements_orphelins_1($db, $langs, $conf)
 {
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationPaymentsUpdate')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationPaymentsUpdate')."</b><br>\n";
 
-    $result = $db->DDLDescTable(MAIN_DB_PREFIX."paiement", "fk_facture");
-    $obj = $db->fetch_object($result);
-    if ($obj)
-    {
-        // Tous les enregistrements qui sortent de cette requete devrait avoir un pere dans llx_paiement_facture
-        $sql = "SELECT distinct p.rowid, p.datec, p.amount as pamount, bu.fk_bank, b.amount as bamount,";
-        $sql .= " bu2.url_id as socid";
-        $sql .= " FROM (".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."bank_url as bu, ".MAIN_DB_PREFIX."bank as b)";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON pf.fk_paiement = p.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu2 ON (bu.fk_bank=bu2.fk_bank AND bu2.type = 'company')";
-        $sql .= " WHERE pf.rowid IS NULL AND (p.rowid=bu.url_id AND bu.type='payment') AND bu.fk_bank = b.rowid";
-        $sql .= " AND b.rappro = 1";
-        $sql .= " AND (p.fk_facture = 0 OR p.fk_facture IS NULL)";
+	$result = $db->DDLDescTable(MAIN_DB_PREFIX."paiement", "fk_facture");
+	$obj = $db->fetch_object($result);
+	if ($obj)
+	{
+		// Tous les enregistrements qui sortent de cette requete devrait avoir un pere dans llx_paiement_facture
+		$sql = "SELECT distinct p.rowid, p.datec, p.amount as pamount, bu.fk_bank, b.amount as bamount,";
+		$sql .= " bu2.url_id as socid";
+		$sql .= " FROM (".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."bank_url as bu, ".MAIN_DB_PREFIX."bank as b)";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON pf.fk_paiement = p.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu2 ON (bu.fk_bank=bu2.fk_bank AND bu2.type = 'company')";
+		$sql .= " WHERE pf.rowid IS NULL AND (p.rowid=bu.url_id AND bu.type='payment') AND bu.fk_bank = b.rowid";
+		$sql .= " AND b.rappro = 1";
+		$sql .= " AND (p.fk_facture = 0 OR p.fk_facture IS NULL)";
 
-        $resql = $db->query($sql);
+		$resql = $db->query($sql);
 
-        dolibarr_install_syslog("upgrade2::migrate_paiements_orphelins_1");
-        $row = array();
-        if ($resql)
-        {
-            $i = $j = 0;
-            $num = $db->num_rows($resql);
+		dolibarr_install_syslog("upgrade2::migrate_paiements_orphelins_1");
+		$row = array();
+		if ($resql)
+		{
+			$i = $j = 0;
+			$num = $db->num_rows($resql);
 
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
-                if ($obj->pamount == $obj->bamount && $obj->socid)	// Pour etre sur d'avoir bon cas
-                {
-                    $row[$j]['paymentid'] = $obj->rowid; // paymentid
-                    $row[$j]['pamount'] = $obj->pamount;
-                    $row[$j]['fk_bank'] = $obj->fk_bank;
-                    $row[$j]['bamount'] = $obj->bamount;
-                    $row[$j]['socid'] = $obj->socid;
-                    $row[$j]['datec'] = $obj->datec;
-                    $j++;
-                }
-                $i++;
-            }
-        } else {
-            dol_print_error($db);
-        }
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
+				if ($obj->pamount == $obj->bamount && $obj->socid)	// Pour etre sur d'avoir bon cas
+				{
+					$row[$j]['paymentid'] = $obj->rowid; // paymentid
+					$row[$j]['pamount'] = $obj->pamount;
+					$row[$j]['fk_bank'] = $obj->fk_bank;
+					$row[$j]['bamount'] = $obj->bamount;
+					$row[$j]['socid'] = $obj->socid;
+					$row[$j]['datec'] = $obj->datec;
+					$j++;
+				}
+				$i++;
+			}
+		} else {
+			dol_print_error($db);
+		}
 
-        if (count($row))
-        {
-            print $langs->trans('OrphelinsPaymentsDetectedByMethod', 1).': '.count($row)."<br>\n";
-            $db->begin();
+		if (count($row))
+		{
+			print $langs->trans('OrphelinsPaymentsDetectedByMethod', 1).': '.count($row)."<br>\n";
+			$db->begin();
 
-            $res = 0;
-            $num = count($row);
-            for ($i = 0; $i < $num; $i++)
-            {
-                if ($conf->global->MAIN_FEATURES_LEVEL == 2) print '* '.$row[$i]['datec'].' paymentid='.$row[$i]['paymentid'].' pamount='.$row[$i]['pamount'].' fk_bank='.$row[$i]['fk_bank'].' bamount='.$row[$i]['bamount'].' socid='.$row[$i]['socid'].'<br>';
+			$res = 0;
+			$num = count($row);
+			for ($i = 0; $i < $num; $i++)
+			{
+				if ($conf->global->MAIN_FEATURES_LEVEL == 2) print '* '.$row[$i]['datec'].' paymentid='.$row[$i]['paymentid'].' pamount='.$row[$i]['pamount'].' fk_bank='.$row[$i]['fk_bank'].' bamount='.$row[$i]['bamount'].' socid='.$row[$i]['socid'].'<br>';
 
-                // On cherche facture sans lien paiement et du meme montant et pour meme societe.
-                $sql = " SELECT distinct f.rowid from ".MAIN_DB_PREFIX."facture as f";
-                $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
-                $sql .= " WHERE f.fk_statut in (2,3) AND fk_soc = ".$row[$i]['socid']." AND total_ttc = ".$row[$i]['pamount'];
-                $sql .= " AND pf.fk_facture IS NULL";
-                $sql .= " ORDER BY f.fk_statut";
-                //print $sql.'<br>';
-                $resql = $db->query($sql);
-                if ($resql)
-                {
-                    $num = $db->num_rows($resql);
-                    //print 'Nb of invoice found for this amount and company :'.$num.'<br>';
-                    if ($num >= 1)
-                    {
-                        $obj = $db->fetch_object($resql);
-                        $facid = $obj->rowid;
+				// On cherche facture sans lien paiement et du meme montant et pour meme societe.
+				$sql = " SELECT distinct f.rowid from ".MAIN_DB_PREFIX."facture as f";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
+				$sql .= " WHERE f.fk_statut in (2,3) AND fk_soc = ".$row[$i]['socid']." AND total_ttc = ".$row[$i]['pamount'];
+				$sql .= " AND pf.fk_facture IS NULL";
+				$sql .= " ORDER BY f.fk_statut";
+				//print $sql.'<br>';
+				$resql = $db->query($sql);
+				if ($resql)
+				{
+					$num = $db->num_rows($resql);
+					//print 'Nb of invoice found for this amount and company :'.$num.'<br>';
+					if ($num >= 1)
+					{
+						$obj = $db->fetch_object($resql);
+						$facid = $obj->rowid;
 
-                        $sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement_facture (fk_facture, fk_paiement, amount)";
-                        $sql .= " VALUES (".$facid.",".$row[$i]['paymentid'].",".$row[$i]['pamount'].")";
+						$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement_facture (fk_facture, fk_paiement, amount)";
+						$sql .= " VALUES (".$facid.",".$row[$i]['paymentid'].",".$row[$i]['pamount'].")";
 
-                        $res += $db->query($sql);
+						$res += $db->query($sql);
 
-                        print $langs->trans('MigrationProcessPaymentUpdate', 'facid='.$facid.'-paymentid='.$row[$i]['paymentid'].'-amount='.$row[$i]['pamount'])."<br>\n";
-                    }
-                } else {
-                    print 'ERROR';
-                }
-            }
+						print $langs->trans('MigrationProcessPaymentUpdate', 'facid='.$facid.'-paymentid='.$row[$i]['paymentid'].'-amount='.$row[$i]['pamount'])."<br>\n";
+					}
+				} else {
+					print 'ERROR';
+				}
+			}
 
-            if ($res > 0)
-            {
-                print $langs->trans('MigrationSuccessfullUpdate')."<br>";
-            } else {
-                print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
-            }
+			if ($res > 0)
+			{
+				print $langs->trans('MigrationSuccessfullUpdate')."<br>";
+			} else {
+				print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
+			}
 
-            $db->commit();
-        } else {
-            print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
-        }
-    } else {
-        print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
-    }
+			$db->commit();
+		} else {
+			print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
+		}
+	} else {
+		print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -806,124 +806,124 @@ function migrate_paiements_orphelins_1($db, $langs, $conf)
  */
 function migrate_paiements_orphelins_2($db, $langs, $conf)
 {
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationPaymentsUpdate')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationPaymentsUpdate')."</b><br>\n";
 
-    $result = $db->DDLDescTable(MAIN_DB_PREFIX."paiement", "fk_facture");
-    $obj = $db->fetch_object($result);
-    if ($obj)
-    {
-        // Tous les enregistrements qui sortent de cette requete devrait avoir un pere dans llx_paiement_facture
-        $sql = "SELECT distinct p.rowid, p.datec, p.amount as pamount, bu.fk_bank, b.amount as bamount,";
-        $sql .= " bu2.url_id as socid";
-        $sql .= " FROM (".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."bank_url as bu, ".MAIN_DB_PREFIX."bank as b)";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON pf.fk_paiement = p.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu2 ON (bu.fk_bank = bu2.fk_bank AND bu2.type = 'company')";
-        $sql .= " WHERE pf.rowid IS NULL AND (p.fk_bank = bu.fk_bank AND bu.type = 'payment') AND bu.fk_bank = b.rowid";
-        $sql .= " AND (p.fk_facture = 0 OR p.fk_facture IS NULL)";
+	$result = $db->DDLDescTable(MAIN_DB_PREFIX."paiement", "fk_facture");
+	$obj = $db->fetch_object($result);
+	if ($obj)
+	{
+		// Tous les enregistrements qui sortent de cette requete devrait avoir un pere dans llx_paiement_facture
+		$sql = "SELECT distinct p.rowid, p.datec, p.amount as pamount, bu.fk_bank, b.amount as bamount,";
+		$sql .= " bu2.url_id as socid";
+		$sql .= " FROM (".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."bank_url as bu, ".MAIN_DB_PREFIX."bank as b)";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON pf.fk_paiement = p.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu2 ON (bu.fk_bank = bu2.fk_bank AND bu2.type = 'company')";
+		$sql .= " WHERE pf.rowid IS NULL AND (p.fk_bank = bu.fk_bank AND bu.type = 'payment') AND bu.fk_bank = b.rowid";
+		$sql .= " AND (p.fk_facture = 0 OR p.fk_facture IS NULL)";
 
-        $resql = $db->query($sql);
+		$resql = $db->query($sql);
 
-        dolibarr_install_syslog("upgrade2::migrate_paiements_orphelins_2");
-        $row = array();
-        if ($resql)
-        {
-            $i = $j = 0;
-            $num = $db->num_rows($resql);
+		dolibarr_install_syslog("upgrade2::migrate_paiements_orphelins_2");
+		$row = array();
+		if ($resql)
+		{
+			$i = $j = 0;
+			$num = $db->num_rows($resql);
 
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
-                if ($obj->pamount == $obj->bamount && $obj->socid)	// Pour etre sur d'avoir bon cas
-                {
-                    $row[$j]['paymentid'] = $obj->rowid; // paymentid
-                    $row[$j]['pamount'] = $obj->pamount;
-                    $row[$j]['fk_bank'] = $obj->fk_bank;
-                    $row[$j]['bamount'] = $obj->bamount;
-                    $row[$j]['socid'] = $obj->socid;
-                    $row[$j]['datec'] = $obj->datec;
-                    $j++;
-                }
-                $i++;
-            }
-        } else {
-            dol_print_error($db);
-        }
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
+				if ($obj->pamount == $obj->bamount && $obj->socid)	// Pour etre sur d'avoir bon cas
+				{
+					$row[$j]['paymentid'] = $obj->rowid; // paymentid
+					$row[$j]['pamount'] = $obj->pamount;
+					$row[$j]['fk_bank'] = $obj->fk_bank;
+					$row[$j]['bamount'] = $obj->bamount;
+					$row[$j]['socid'] = $obj->socid;
+					$row[$j]['datec'] = $obj->datec;
+					$j++;
+				}
+				$i++;
+			}
+		} else {
+			dol_print_error($db);
+		}
 
-        $nberr = 0;
+		$nberr = 0;
 
-        $num = count($row);
-        if ($num)
-        {
-            print $langs->trans('OrphelinsPaymentsDetectedByMethod', 2).': '.count($row)."<br>\n";
-            $db->begin();
+		$num = count($row);
+		if ($num)
+		{
+			print $langs->trans('OrphelinsPaymentsDetectedByMethod', 2).': '.count($row)."<br>\n";
+			$db->begin();
 
-            $res = 0;
-            for ($i = 0; $i < $num; $i++)
-            {
-                if ($conf->global->MAIN_FEATURES_LEVEL == 2) print '* '.$row[$i]['datec'].' paymentid='.$row[$i]['paymentid'].' '.$row[$i]['pamount'].' fk_bank='.$row[$i]['fk_bank'].' '.$row[$i]['bamount'].' socid='.$row[$i]['socid'].'<br>';
+			$res = 0;
+			for ($i = 0; $i < $num; $i++)
+			{
+				if ($conf->global->MAIN_FEATURES_LEVEL == 2) print '* '.$row[$i]['datec'].' paymentid='.$row[$i]['paymentid'].' '.$row[$i]['pamount'].' fk_bank='.$row[$i]['fk_bank'].' '.$row[$i]['bamount'].' socid='.$row[$i]['socid'].'<br>';
 
-                // On cherche facture sans lien paiement et du meme montant et pour meme societe.
-                $sql = " SELECT distinct f.rowid from ".MAIN_DB_PREFIX."facture as f";
-                $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
-                $sql .= " WHERE f.fk_statut in (2,3) AND fk_soc = ".$row[$i]['socid']." AND total_ttc = ".$row[$i]['pamount'];
-                $sql .= " AND pf.fk_facture IS NULL";
-                $sql .= " ORDER BY f.fk_statut";
-                //print $sql.'<br>';
-                $resql = $db->query($sql);
-                if ($resql)
-                {
-                    $num = $db->num_rows($resql);
-                    //print 'Nb of invoice found for this amount and company :'.$num.'<br>';
-                    if ($num >= 1)
-                    {
-                        $obj = $db->fetch_object($resql);
-                        $facid = $obj->rowid;
+				// On cherche facture sans lien paiement et du meme montant et pour meme societe.
+				$sql = " SELECT distinct f.rowid from ".MAIN_DB_PREFIX."facture as f";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
+				$sql .= " WHERE f.fk_statut in (2,3) AND fk_soc = ".$row[$i]['socid']." AND total_ttc = ".$row[$i]['pamount'];
+				$sql .= " AND pf.fk_facture IS NULL";
+				$sql .= " ORDER BY f.fk_statut";
+				//print $sql.'<br>';
+				$resql = $db->query($sql);
+				if ($resql)
+				{
+					$num = $db->num_rows($resql);
+					//print 'Nb of invoice found for this amount and company :'.$num.'<br>';
+					if ($num >= 1)
+					{
+						$obj = $db->fetch_object($resql);
+						$facid = $obj->rowid;
 
-                        $sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement_facture (fk_facture, fk_paiement, amount)";
-                        $sql .= " VALUES (".$facid.",".$row[$i]['paymentid'].",".$row[$i]['pamount'].")";
-                        $res += $db->query($sql);
+						$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement_facture (fk_facture, fk_paiement, amount)";
+						$sql .= " VALUES (".$facid.",".$row[$i]['paymentid'].",".$row[$i]['pamount'].")";
+						$res += $db->query($sql);
 
-                        print $langs->trans('MigrationProcessPaymentUpdate', 'facid='.$facid.'-paymentid='.$row[$i]['paymentid'].'-amount='.$row[$i]['pamount'])."<br>\n";
-                    }
-                } else {
-                    print 'ERROR';
-                    $nberr++;
-                }
-            }
+						print $langs->trans('MigrationProcessPaymentUpdate', 'facid='.$facid.'-paymentid='.$row[$i]['paymentid'].'-amount='.$row[$i]['pamount'])."<br>\n";
+					}
+				} else {
+					print 'ERROR';
+					$nberr++;
+				}
+			}
 
-            if ($res > 0)
-            {
-                print $langs->trans('MigrationSuccessfullUpdate')."<br>";
-            } else {
-                print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
-            }
+			if ($res > 0)
+			{
+				print $langs->trans('MigrationSuccessfullUpdate')."<br>";
+			} else {
+				print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
+			}
 
-            $db->commit();
-        } else {
-            print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
-        }
+			$db->commit();
+		} else {
+			print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
+		}
 
-        // Delete obsolete fields fk_facture
-        $db->begin();
+		// Delete obsolete fields fk_facture
+		$db->begin();
 
-        $sql = "ALTER TABLE ".MAIN_DB_PREFIX."paiement DROP COLUMN fk_facture";
-        $db->query($sql);
+		$sql = "ALTER TABLE ".MAIN_DB_PREFIX."paiement DROP COLUMN fk_facture";
+		$db->query($sql);
 
-        if (!$nberr)
-        {
-            $db->commit();
-        } else {
-            print 'ERROR';
-            $db->rollback();
-        }
-    } else {
-        print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
-    }
+		if (!$nberr)
+		{
+			$db->commit();
+		} else {
+			print 'ERROR';
+			$db->rollback();
+		}
+	} else {
+		print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 
@@ -937,84 +937,84 @@ function migrate_paiements_orphelins_2($db, $langs, $conf)
  */
 function migrate_contracts_det($db, $langs, $conf)
 {
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    $nberr = 0;
+	$nberr = 0;
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationContractsUpdate')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationContractsUpdate')."</b><br>\n";
 
-    $sql = "SELECT c.rowid as cref, c.date_contrat, c.statut, c.fk_product, c.fk_facture, c.fk_user_author,";
-    $sql .= " p.ref, p.label, p.description, p.price, p.tva_tx, p.duration, cd.rowid";
-    $sql .= " FROM ".MAIN_DB_PREFIX."contrat as c";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p";
-    $sql .= " ON c.fk_product = p.rowid";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd";
-    $sql .= " ON c.rowid=cd.fk_contrat";
-    $sql .= " WHERE cd.rowid IS NULL AND p.rowid IS NOT NULL";
-    $resql = $db->query($sql);
+	$sql = "SELECT c.rowid as cref, c.date_contrat, c.statut, c.fk_product, c.fk_facture, c.fk_user_author,";
+	$sql .= " p.ref, p.label, p.description, p.price, p.tva_tx, p.duration, cd.rowid";
+	$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p";
+	$sql .= " ON c.fk_product = p.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd";
+	$sql .= " ON c.rowid=cd.fk_contrat";
+	$sql .= " WHERE cd.rowid IS NULL AND p.rowid IS NOT NULL";
+	$resql = $db->query($sql);
 
-    dolibarr_install_syslog("upgrade2::migrate_contracts_det");
-    if ($resql)
-    {
-        $i = 0;
-        $row = array();
-        $num = $db->num_rows($resql);
+	dolibarr_install_syslog("upgrade2::migrate_contracts_det");
+	if ($resql)
+	{
+		$i = 0;
+		$row = array();
+		$num = $db->num_rows($resql);
 
-        if ($num)
-        {
-            print $langs->trans('MigrationContractsNumberToUpdate', $num)."<br>\n";
-            $db->begin();
+		if ($num)
+		{
+			print $langs->trans('MigrationContractsNumberToUpdate', $num)."<br>\n";
+			$db->begin();
 
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                $sql = "INSERT INTO ".MAIN_DB_PREFIX."contratdet (";
-                $sql .= "fk_contrat, fk_product, statut, label, description,";
-                $sql .= "date_ouverture_prevue, date_ouverture, date_fin_validite, tva_tx, qty,";
-                $sql .= "subprice, price_ht, fk_user_author, fk_user_ouverture)";
-                $sql .= " VALUES (";
-                $sql .= $obj->cref.", ".($obj->fk_product ? $obj->fk_product : 0).", ";
-                $sql .= "0, ";
-                $sql .= "'".$db->escape($obj->label)."', null, ";
-                $sql .= ($obj->date_contrat ? "'".$db->escape($obj->date_contrat)."'" : "null").", ";
-                $sql .= "null, ";
-                $sql .= "null, ";
-                $sql .= "'".$db->escape($obj->tva_tx)."' , 1, ";
-                $sql .= "'".$db->escape($obj->price)."', '".$db->escape($obj->price)."', ".$obj->fk_user_author.",";
-                $sql .= "null";
-                $sql .= ")";
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."contratdet (";
+				$sql .= "fk_contrat, fk_product, statut, label, description,";
+				$sql .= "date_ouverture_prevue, date_ouverture, date_fin_validite, tva_tx, qty,";
+				$sql .= "subprice, price_ht, fk_user_author, fk_user_ouverture)";
+				$sql .= " VALUES (";
+				$sql .= $obj->cref.", ".($obj->fk_product ? $obj->fk_product : 0).", ";
+				$sql .= "0, ";
+				$sql .= "'".$db->escape($obj->label)."', null, ";
+				$sql .= ($obj->date_contrat ? "'".$db->escape($obj->date_contrat)."'" : "null").", ";
+				$sql .= "null, ";
+				$sql .= "null, ";
+				$sql .= "'".$db->escape($obj->tva_tx)."' , 1, ";
+				$sql .= "'".$db->escape($obj->price)."', '".$db->escape($obj->price)."', ".$obj->fk_user_author.",";
+				$sql .= "null";
+				$sql .= ")";
 
-                if ($db->query($sql))
-                {
-                    print $langs->trans('MigrationContractsLineCreation', $obj->cref)."<br>\n";
-                } else {
-                    dol_print_error($db);
-                    $nberr++;
-                }
+				if ($db->query($sql))
+				{
+					print $langs->trans('MigrationContractsLineCreation', $obj->cref)."<br>\n";
+				} else {
+					dol_print_error($db);
+					$nberr++;
+				}
 
-                $i++;
-            }
+				$i++;
+			}
 
-            if (!$nberr)
-            {
-                //      $db->rollback();
-                $db->commit();
-                print $langs->trans('MigrationSuccessfullUpdate')."<br>";
-            } else {
-                $db->rollback();
-                print $langs->trans('MigrationUpdateFailed').'<br>';
-            }
-        } else {
-            print $langs->trans('MigrationContractsNothingToUpdate')."<br>\n";
-        }
-    } else {
-        print $langs->trans('MigrationContractsFieldDontExist')."<br>\n";
-        //    dol_print_error($db);
-    }
+			if (!$nberr)
+			{
+				//      $db->rollback();
+				$db->commit();
+				print $langs->trans('MigrationSuccessfullUpdate')."<br>";
+			} else {
+				$db->rollback();
+				print $langs->trans('MigrationUpdateFailed').'<br>';
+			}
+		} else {
+			print $langs->trans('MigrationContractsNothingToUpdate')."<br>\n";
+		}
+	} else {
+		print $langs->trans('MigrationContractsFieldDontExist')."<br>\n";
+		//    dol_print_error($db);
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -1027,73 +1027,73 @@ function migrate_contracts_det($db, $langs, $conf)
  */
 function migrate_links_transfert($db, $langs, $conf)
 {
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    $nberr = 0;
+	$nberr = 0;
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationBankTransfertsUpdate')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationBankTransfertsUpdate')."</b><br>\n";
 
-    $sql = "SELECT ba.rowid as barowid, bb.rowid as bbrowid";
-    $sql .= " FROM ".MAIN_DB_PREFIX."bank as bb, ".MAIN_DB_PREFIX."bank as ba";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu ON bu.fk_bank = ba.rowid";
-    $sql .= " WHERE ba.amount = -bb.amount AND ba.fk_account <> bb.fk_account";
-    $sql .= " AND ba.datev = bb.datev AND ba.datec = bb.datec";
-    $sql .= " AND bu.fk_bank IS NULL";
-    $resql = $db->query($sql);
+	$sql = "SELECT ba.rowid as barowid, bb.rowid as bbrowid";
+	$sql .= " FROM ".MAIN_DB_PREFIX."bank as bb, ".MAIN_DB_PREFIX."bank as ba";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu ON bu.fk_bank = ba.rowid";
+	$sql .= " WHERE ba.amount = -bb.amount AND ba.fk_account <> bb.fk_account";
+	$sql .= " AND ba.datev = bb.datev AND ba.datec = bb.datec";
+	$sql .= " AND bu.fk_bank IS NULL";
+	$resql = $db->query($sql);
 
-    dolibarr_install_syslog("upgrade2::migrate_links_transfert");
-    if ($resql)
-    {
-        $i = 0;
-        $row = array();
-        $num = $db->num_rows($resql);
+	dolibarr_install_syslog("upgrade2::migrate_links_transfert");
+	if ($resql)
+	{
+		$i = 0;
+		$row = array();
+		$num = $db->num_rows($resql);
 
-        if ($num)
-        {
-            print $langs->trans('MigrationBankTransfertsToUpdate', $num)."<br>\n";
-            $db->begin();
+		if ($num)
+		{
+			print $langs->trans('MigrationBankTransfertsToUpdate', $num)."<br>\n";
+			$db->begin();
 
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                $sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_url (";
-                $sql .= "fk_bank, url_id, url, label, type";
-                $sql .= ")";
-                $sql .= " VALUES (";
-                $sql .= $obj->barowid.",".$obj->bbrowid.", '/compta/bank/line.php?rowid=', '(banktransfert)', 'banktransfert'";
-                $sql .= ")";
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_url (";
+				$sql .= "fk_bank, url_id, url, label, type";
+				$sql .= ")";
+				$sql .= " VALUES (";
+				$sql .= $obj->barowid.",".$obj->bbrowid.", '/compta/bank/line.php?rowid=', '(banktransfert)', 'banktransfert'";
+				$sql .= ")";
 
-                print $sql.'<br>';
-                dolibarr_install_syslog("migrate_links_transfert");
+				print $sql.'<br>';
+				dolibarr_install_syslog("migrate_links_transfert");
 
-                if (!$db->query($sql))
-                {
-                    dol_print_error($db);
-                    $nberr++;
-                }
+				if (!$db->query($sql))
+				{
+					dol_print_error($db);
+					$nberr++;
+				}
 
-                $i++;
-            }
+				$i++;
+			}
 
-            if (!$nberr)
-            {
-                //      $db->rollback();
-                $db->commit();
-                print $langs->trans('MigrationSuccessfullUpdate')."<br>";
-            } else {
-                $db->rollback();
-                print $langs->trans('MigrationUpdateFailed').'<br>';
-            }
-        } else {
-            print $langs->trans('MigrationBankTransfertsNothingToUpdate')."<br>\n";
-        }
-    } else {
-        dol_print_error($db);
-    }
+			if (!$nberr)
+			{
+				//      $db->rollback();
+				$db->commit();
+				print $langs->trans('MigrationSuccessfullUpdate')."<br>";
+			} else {
+				$db->rollback();
+				print $langs->trans('MigrationUpdateFailed').'<br>';
+			}
+		} else {
+			print $langs->trans('MigrationBankTransfertsNothingToUpdate')."<br>\n";
+		}
+	} else {
+		dol_print_error($db);
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -1106,28 +1106,28 @@ function migrate_links_transfert($db, $langs, $conf)
  */
 function migrate_contracts_date1($db, $langs, $conf)
 {
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationContractsEmptyDatesUpdate')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationContractsEmptyDatesUpdate')."</b><br>\n";
 
-    $sql = "update ".MAIN_DB_PREFIX."contrat set date_contrat=tms where date_contrat is null";
-    dolibarr_install_syslog("upgrade2::migrate_contracts_date1");
-    $resql = $db->query($sql);
-    if (!$resql) dol_print_error($db);
-    if ($db->affected_rows($resql) > 0)
-    print $langs->trans('MigrationContractsEmptyDatesUpdateSuccess')."<br>\n";
-    else print $langs->trans('MigrationContractsEmptyDatesNothingToUpdate')."<br>\n";
+	$sql = "update ".MAIN_DB_PREFIX."contrat set date_contrat=tms where date_contrat is null";
+	dolibarr_install_syslog("upgrade2::migrate_contracts_date1");
+	$resql = $db->query($sql);
+	if (!$resql) dol_print_error($db);
+	if ($db->affected_rows($resql) > 0)
+	print $langs->trans('MigrationContractsEmptyDatesUpdateSuccess')."<br>\n";
+	else print $langs->trans('MigrationContractsEmptyDatesNothingToUpdate')."<br>\n";
 
-    $sql = "update ".MAIN_DB_PREFIX."contrat set datec=tms where datec is null";
-    dolibarr_install_syslog("upgrade2::migrate_contracts_date1");
-    $resql = $db->query($sql);
-    if (!$resql) dol_print_error($db);
-    if ($db->affected_rows($resql) > 0)
-    print $langs->trans('MigrationContractsEmptyCreationDatesUpdateSuccess')."<br>\n";
-    else print $langs->trans('MigrationContractsEmptyCreationDatesNothingToUpdate')."<br>\n";
+	$sql = "update ".MAIN_DB_PREFIX."contrat set datec=tms where datec is null";
+	dolibarr_install_syslog("upgrade2::migrate_contracts_date1");
+	$resql = $db->query($sql);
+	if (!$resql) dol_print_error($db);
+	if ($db->affected_rows($resql) > 0)
+	print $langs->trans('MigrationContractsEmptyCreationDatesUpdateSuccess')."<br>\n";
+	else print $langs->trans('MigrationContractsEmptyCreationDatesNothingToUpdate')."<br>\n";
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -1140,62 +1140,62 @@ function migrate_contracts_date1($db, $langs, $conf)
  */
 function migrate_contracts_date2($db, $langs, $conf)
 {
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    $nberr = 0;
+	$nberr = 0;
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationContractsInvalidDatesUpdate')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationContractsInvalidDatesUpdate')."</b><br>\n";
 
-    $sql = "SELECT c.rowid as cref, c.datec, c.date_contrat, MIN(cd.date_ouverture) as datemin";
-    $sql .= " FROM ".MAIN_DB_PREFIX."contrat as c,";
-    $sql .= " ".MAIN_DB_PREFIX."contratdet as cd";
-    $sql .= " WHERE c.rowid=cd.fk_contrat AND cd.date_ouverture IS NOT NULL";
-    $sql .= " GROUP BY c.rowid, c.date_contrat";
-    $resql = $db->query($sql);
+	$sql = "SELECT c.rowid as cref, c.datec, c.date_contrat, MIN(cd.date_ouverture) as datemin";
+	$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c,";
+	$sql .= " ".MAIN_DB_PREFIX."contratdet as cd";
+	$sql .= " WHERE c.rowid=cd.fk_contrat AND cd.date_ouverture IS NOT NULL";
+	$sql .= " GROUP BY c.rowid, c.date_contrat";
+	$resql = $db->query($sql);
 
-    dolibarr_install_syslog("upgrade2::migrate_contracts_date2");
-    if ($resql)
-    {
-        $i = 0;
-        $row = array();
-        $num = $db->num_rows($resql);
+	dolibarr_install_syslog("upgrade2::migrate_contracts_date2");
+	if ($resql)
+	{
+		$i = 0;
+		$row = array();
+		$num = $db->num_rows($resql);
 
-        if ($num)
-        {
-            $nbcontratsmodifie = 0;
-            $db->begin();
+		if ($num)
+		{
+			$nbcontratsmodifie = 0;
+			$db->begin();
 
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
-                if ($obj->date_contrat > $obj->datemin)
-                {
-                	$datemin = $db->jdate($obj->datemin);
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
+				if ($obj->date_contrat > $obj->datemin)
+				{
+					$datemin = $db->jdate($obj->datemin);
 
-                    print $langs->trans('MigrationContractsInvalidDateFix', $obj->cref, $obj->date_contrat, $obj->datemin)."<br>\n";
-                    $sql = "UPDATE ".MAIN_DB_PREFIX."contrat";
-                    $sql .= " SET date_contrat='".$db->idate($datemin)."'";
-                    $sql .= " WHERE rowid=".$obj->cref;
-                    $resql2 = $db->query($sql);
-                    if (!$resql2) dol_print_error($db);
+					print $langs->trans('MigrationContractsInvalidDateFix', $obj->cref, $obj->date_contrat, $obj->datemin)."<br>\n";
+					$sql = "UPDATE ".MAIN_DB_PREFIX."contrat";
+					$sql .= " SET date_contrat='".$db->idate($datemin)."'";
+					$sql .= " WHERE rowid=".$obj->cref;
+					$resql2 = $db->query($sql);
+					if (!$resql2) dol_print_error($db);
 
-                    $nbcontratsmodifie++;
-                }
-                $i++;
-            }
+					$nbcontratsmodifie++;
+				}
+				$i++;
+			}
 
-            $db->commit();
+			$db->commit();
 
-            if ($nbcontratsmodifie)
-            print $langs->trans('MigrationContractsInvalidDatesNumber', $nbcontratsmodifie)."<br>\n";
-            else print  $langs->trans('MigrationContractsInvalidDatesNothingToUpdate')."<br>\n";
-        }
-    } else {
-        dol_print_error($db);
-    }
+			if ($nbcontratsmodifie)
+			print $langs->trans('MigrationContractsInvalidDatesNumber', $nbcontratsmodifie)."<br>\n";
+			else print  $langs->trans('MigrationContractsInvalidDatesNothingToUpdate')."<br>\n";
+		}
+	} else {
+		dol_print_error($db);
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -1208,20 +1208,20 @@ function migrate_contracts_date2($db, $langs, $conf)
  */
 function migrate_contracts_date3($db, $langs, $conf)
 {
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationContractsIncoherentCreationDateUpdate')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationContractsIncoherentCreationDateUpdate')."</b><br>\n";
 
-    $sql = "update ".MAIN_DB_PREFIX."contrat set datec=date_contrat where datec is null or datec > date_contrat";
-    dolibarr_install_syslog("upgrade2::migrate_contracts_date3");
-    $resql = $db->query($sql);
-    if (!$resql) dol_print_error($db);
-    if ($db->affected_rows($resql) > 0)
-    print $langs->trans('MigrationContractsIncoherentCreationDateUpdateSuccess')."<br>\n";
-    else print $langs->trans('MigrationContractsIncoherentCreationDateNothingToUpdate')."<br>\n";
+	$sql = "update ".MAIN_DB_PREFIX."contrat set datec=date_contrat where datec is null or datec > date_contrat";
+	dolibarr_install_syslog("upgrade2::migrate_contracts_date3");
+	$resql = $db->query($sql);
+	if (!$resql) dol_print_error($db);
+	if ($db->affected_rows($resql) > 0)
+	print $langs->trans('MigrationContractsIncoherentCreationDateUpdateSuccess')."<br>\n";
+	else print $langs->trans('MigrationContractsIncoherentCreationDateNothingToUpdate')."<br>\n";
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -1234,51 +1234,51 @@ function migrate_contracts_date3($db, $langs, $conf)
  */
 function migrate_contracts_open($db, $langs, $conf)
 {
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationReopeningContracts')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationReopeningContracts')."</b><br>\n";
 
-    $sql = "SELECT c.rowid as cref FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."contratdet as cd";
-    $sql .= " WHERE cd.statut = 4 AND c.statut=2 AND c.rowid=cd.fk_contrat";
-    dolibarr_install_syslog("upgrade2::migrate_contracts_open");
-    $resql = $db->query($sql);
-    if (!$resql) dol_print_error($db);
-    if ($db->affected_rows($resql) > 0) {
-        $i = 0;
-        $row = array();
-        $num = $db->num_rows($resql);
+	$sql = "SELECT c.rowid as cref FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."contratdet as cd";
+	$sql .= " WHERE cd.statut = 4 AND c.statut=2 AND c.rowid=cd.fk_contrat";
+	dolibarr_install_syslog("upgrade2::migrate_contracts_open");
+	$resql = $db->query($sql);
+	if (!$resql) dol_print_error($db);
+	if ($db->affected_rows($resql) > 0) {
+		$i = 0;
+		$row = array();
+		$num = $db->num_rows($resql);
 
-        if ($num)
-        {
-            $nbcontratsmodifie = 0;
-            $db->begin();
+		if ($num)
+		{
+			$nbcontratsmodifie = 0;
+			$db->begin();
 
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                print $langs->trans('MigrationReopenThisContract', $obj->cref)."<br>\n";
-                $sql = "UPDATE ".MAIN_DB_PREFIX."contrat";
-                $sql .= " SET statut=1";
-                $sql .= " WHERE rowid=".$obj->cref;
-                $resql2 = $db->query($sql);
-                if (!$resql2) dol_print_error($db);
+				print $langs->trans('MigrationReopenThisContract', $obj->cref)."<br>\n";
+				$sql = "UPDATE ".MAIN_DB_PREFIX."contrat";
+				$sql .= " SET statut=1";
+				$sql .= " WHERE rowid=".$obj->cref;
+				$resql2 = $db->query($sql);
+				if (!$resql2) dol_print_error($db);
 
-                $nbcontratsmodifie++;
+				$nbcontratsmodifie++;
 
-                $i++;
-            }
+				$i++;
+			}
 
-            $db->commit();
+			$db->commit();
 
-            if ($nbcontratsmodifie)
-            print $langs->trans('MigrationReopenedContractsNumber', $nbcontratsmodifie)."<br>\n";
-            else print $langs->trans('MigrationReopeningContractsNothingToUpdate')."<br>\n";
-        }
-    } else print $langs->trans('MigrationReopeningContractsNothingToUpdate')."<br>\n";
+			if ($nbcontratsmodifie)
+			print $langs->trans('MigrationReopenedContractsNumber', $nbcontratsmodifie)."<br>\n";
+			else print $langs->trans('MigrationReopeningContractsNothingToUpdate')."<br>\n";
+		}
+	} else print $langs->trans('MigrationReopeningContractsNothingToUpdate')."<br>\n";
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -1291,101 +1291,101 @@ function migrate_contracts_open($db, $langs, $conf)
  */
 function migrate_paiementfourn_facturefourn($db, $langs, $conf)
 {
-    global $bc;
+	global $bc;
 
-    print '<tr><td colspan="4">';
-    print '<br>';
-    print '<b>'.$langs->trans('SuppliersInvoices')."</b><br>\n";
-    print '</td></tr>';
+	print '<tr><td colspan="4">';
+	print '<br>';
+	print '<b>'.$langs->trans('SuppliersInvoices')."</b><br>\n";
+	print '</td></tr>';
 
-    $result = $db->DDLDescTable(MAIN_DB_PREFIX."paiementfourn", "fk_facture_fourn");
-    $obj = $db->fetch_object($result);
-    if ($obj)
-    {
-        $error = 0;
-        $nb = 0;
+	$result = $db->DDLDescTable(MAIN_DB_PREFIX."paiementfourn", "fk_facture_fourn");
+	$obj = $db->fetch_object($result);
+	if ($obj)
+	{
+		$error = 0;
+		$nb = 0;
 
-        $select_sql = 'SELECT rowid, fk_facture_fourn, amount';
-        $select_sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn';
-        $select_sql .= ' WHERE fk_facture_fourn IS NOT NULL';
+		$select_sql = 'SELECT rowid, fk_facture_fourn, amount';
+		$select_sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn';
+		$select_sql .= ' WHERE fk_facture_fourn IS NOT NULL';
 
-        dolibarr_install_syslog("upgrade2::migrate_paiementfourn_facturefourn");
-        $select_resql = $db->query($select_sql);
-        if ($select_resql)
-        {
-            $select_num = $db->num_rows($select_resql);
-            $i = 0;
-            $var = true;
+		dolibarr_install_syslog("upgrade2::migrate_paiementfourn_facturefourn");
+		$select_resql = $db->query($select_sql);
+		if ($select_resql)
+		{
+			$select_num = $db->num_rows($select_resql);
+			$i = 0;
+			$var = true;
 
-            // Pour chaque paiement fournisseur, on insere une ligne dans paiementfourn_facturefourn
-            while (($i < $select_num) && (!$error))
-            {
-                $var = !$var;
-                $select_obj = $db->fetch_object($select_resql);
+			// Pour chaque paiement fournisseur, on insere une ligne dans paiementfourn_facturefourn
+			while (($i < $select_num) && (!$error))
+			{
+				$var = !$var;
+				$select_obj = $db->fetch_object($select_resql);
 
-                // Verifier si la ligne est deja dans la nouvelle table. On ne veut pas inserer de doublons.
-                $check_sql = 'SELECT fk_paiementfourn, fk_facturefourn';
-                $check_sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn';
-                $check_sql .= ' WHERE fk_paiementfourn = '.$select_obj->rowid.' AND fk_facturefourn = '.$select_obj->fk_facture_fourn;
-                $check_resql = $db->query($check_sql);
-                if ($check_resql)
-                {
-                    $check_num = $db->num_rows($check_resql);
-                    if ($check_num == 0)
-                    {
-                        $db->begin();
+				// Verifier si la ligne est deja dans la nouvelle table. On ne veut pas inserer de doublons.
+				$check_sql = 'SELECT fk_paiementfourn, fk_facturefourn';
+				$check_sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn';
+				$check_sql .= ' WHERE fk_paiementfourn = '.$select_obj->rowid.' AND fk_facturefourn = '.$select_obj->fk_facture_fourn;
+				$check_resql = $db->query($check_sql);
+				if ($check_resql)
+				{
+					$check_num = $db->num_rows($check_resql);
+					if ($check_num == 0)
+					{
+						$db->begin();
 
-                        if ($nb == 0)
-                        {
-                            print '<tr><td colspan="4" class="nowrap"><b>'.$langs->trans('SuppliersInvoices').'</b></td></tr>';
-                            print '<tr><td>fk_paiementfourn</td><td>fk_facturefourn</td><td>'.$langs->trans('Amount').'</td><td>&nbsp;</td></tr>';
-                        }
+						if ($nb == 0)
+						{
+							print '<tr><td colspan="4" class="nowrap"><b>'.$langs->trans('SuppliersInvoices').'</b></td></tr>';
+							print '<tr><td>fk_paiementfourn</td><td>fk_facturefourn</td><td>'.$langs->trans('Amount').'</td><td>&nbsp;</td></tr>';
+						}
 
-                        print '<tr class="oddeven">';
-                        print '<td>'.$select_obj->rowid.'</td><td>'.$select_obj->fk_facture_fourn.'</td><td>'.$select_obj->amount.'</td>';
+						print '<tr class="oddeven">';
+						print '<td>'.$select_obj->rowid.'</td><td>'.$select_obj->fk_facture_fourn.'</td><td>'.$select_obj->amount.'</td>';
 
-                        $insert_sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiementfourn_facturefourn SET ';
-                        $insert_sql .= ' fk_paiementfourn = \''.$select_obj->rowid.'\',';
-                        $insert_sql .= ' fk_facturefourn  = \''.$select_obj->fk_facture_fourn.'\',';
-                        $insert_sql .= ' amount           = \''.$select_obj->amount.'\'';
-                        $insert_resql = $db->query($insert_sql);
+						$insert_sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiementfourn_facturefourn SET ';
+						$insert_sql .= ' fk_paiementfourn = \''.$select_obj->rowid.'\',';
+						$insert_sql .= ' fk_facturefourn  = \''.$select_obj->fk_facture_fourn.'\',';
+						$insert_sql .= ' amount           = \''.$select_obj->amount.'\'';
+						$insert_resql = $db->query($insert_sql);
 
-                        if ($insert_resql)
-                        {
-                            $nb++;
-                            print '<td><span style="color:green">'.$langs->trans("OK").'</span></td>';
-                        } else {
-                            print '<td><span style="color:red">Error on insert</span></td>';
-                            $error++;
-                        }
-                        print '</tr>';
-                    }
-                } else {
-                    $error++;
-                }
-                $i++;
-            }
-        } else {
-            $error++;
-        }
+						if ($insert_resql)
+						{
+							$nb++;
+							print '<td><span class="ok">'.$langs->trans("OK").'</span></td>';
+						} else {
+							print '<td><span class="error">Error on insert</span></td>';
+							$error++;
+						}
+						print '</tr>';
+					}
+				} else {
+					$error++;
+				}
+				$i++;
+			}
+		} else {
+			$error++;
+		}
 
-        if (!$error)
-        {
-            if (!$nb)
-            {
-                print '<tr><td>'.$langs->trans("AlreadyDone").'</td></tr>';
-            }
-            $db->commit();
+		if (!$error)
+		{
+			if (!$nb)
+			{
+				print '<tr><td>'.$langs->trans("AlreadyDone").'</td></tr>';
+			}
+			$db->commit();
 
-            $sql = "ALTER TABLE ".MAIN_DB_PREFIX."paiementfourn DROP COLUMN fk_facture_fourn";
-            $db->query($sql);
-        } else {
-            print '<tr><td>'.$langs->trans("Error").'</td></tr>';
-            $db->rollback();
-        }
-    } else {
-        print '<tr><td>'.$langs->trans("AlreadyDone").'</td></tr>';
-    }
+			$sql = "ALTER TABLE ".MAIN_DB_PREFIX."paiementfourn DROP COLUMN fk_facture_fourn";
+			$db->query($sql);
+		} else {
+			print '<tr><td>'.$langs->trans("Error").'</td></tr>';
+			$db->rollback();
+		}
+	} else {
+		print '<tr><td>'.$langs->trans("AlreadyDone").'</td></tr>';
+	}
 }
 
 /**
@@ -1398,105 +1398,105 @@ function migrate_paiementfourn_facturefourn($db, $langs, $conf)
  */
 function migrate_price_facture($db, $langs, $conf)
 {
-    $err = 0;
+	$err = 0;
 
-    $tmpmysoc = new Societe($db);
-    $tmpmysoc->setMysoc($conf);
+	$tmpmysoc = new Societe($db);
+	$tmpmysoc->setMysoc($conf);
 
-    $db->begin();
+	$db->begin();
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationInvoice')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationInvoice')."</b><br>\n";
 
-    // List of invoice lines not up to date
-    $sql = "SELECT fd.rowid, fd.qty, fd.subprice, fd.remise_percent, fd.tva_tx as vatrate, fd.total_ttc, fd.info_bits,";
-    $sql .= " f.rowid as facid, f.remise_percent as remise_percent_global, f.total_ttc as total_ttc_f";
-    $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd, ".MAIN_DB_PREFIX."facture as f";
-    $sql .= " WHERE fd.fk_facture = f.rowid";
-    $sql .= " AND (((fd.total_ttc = 0 AND fd.remise_percent != 100) or fd.total_ttc IS NULL) or f.total_ttc IS NULL)";
-    //print $sql;
+	// List of invoice lines not up to date
+	$sql = "SELECT fd.rowid, fd.qty, fd.subprice, fd.remise_percent, fd.tva_tx as vatrate, fd.total_ttc, fd.info_bits,";
+	$sql .= " f.rowid as facid, f.remise_percent as remise_percent_global, f.total_ttc as total_ttc_f";
+	$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd, ".MAIN_DB_PREFIX."facture as f";
+	$sql .= " WHERE fd.fk_facture = f.rowid";
+	$sql .= " AND (((fd.total_ttc = 0 AND fd.remise_percent != 100) or fd.total_ttc IS NULL) or f.total_ttc IS NULL)";
+	//print $sql;
 
-    dolibarr_install_syslog("upgrade2::migrate_price_facture");
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
-        if ($num)
-        {
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+	dolibarr_install_syslog("upgrade2::migrate_price_facture");
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                $rowid = $obj->rowid;
-                $qty = $obj->qty;
-                $pu = $obj->subprice;
-                $vatrate = $obj->vatrate;
-                $remise_percent = $obj->remise_percent;
-                $remise_percent_global = $obj->remise_percent_global;
-                $total_ttc_f = $obj->total_ttc_f;
-                $info_bits = $obj->info_bits;
+				$rowid = $obj->rowid;
+				$qty = $obj->qty;
+				$pu = $obj->subprice;
+				$vatrate = $obj->vatrate;
+				$remise_percent = $obj->remise_percent;
+				$remise_percent_global = $obj->remise_percent_global;
+				$total_ttc_f = $obj->total_ttc_f;
+				$info_bits = $obj->info_bits;
 
-                // On met a jour les 3 nouveaux champs
-                $facligne = new FactureLigne($db);
-                $facligne->fetch($rowid);
+				// On met a jour les 3 nouveaux champs
+				$facligne = new FactureLigne($db);
+				$facligne->fetch($rowid);
 
-                $result = calcul_price_total($qty, $pu, $remise_percent, $vatrate, 0, 0, $remise_percent_global, 'HT', $info_bits, $facligne->product_type, $tmpmysoc);
-                $total_ht  = $result[0];
-                $total_tva = $result[1];
-                $total_ttc = $result[2];
+				$result = calcul_price_total($qty, $pu, $remise_percent, $vatrate, 0, 0, $remise_percent_global, 'HT', $info_bits, $facligne->product_type, $tmpmysoc);
+				$total_ht  = $result[0];
+				$total_tva = $result[1];
+				$total_ttc = $result[2];
 
-                $facligne->total_ht  = $total_ht;
-                $facligne->total_tva = $total_tva;
-                $facligne->total_ttc = $total_ttc;
+				$facligne->total_ht  = $total_ht;
+				$facligne->total_tva = $total_tva;
+				$facligne->total_ttc = $total_ttc;
 
-                dolibarr_install_syslog("upgrade2: line ".$rowid.": facid=".$obj->facid." pu=".$pu." qty=".$qty." vatrate=".$vatrate." remise_percent=".$remise_percent." remise_global=".$remise_percent_global." -> ".$total_ht.", ".$total_tva.", ".$total_ttc);
-                print ". ";
-                $facligne->update_total();
+				dolibarr_install_syslog("upgrade2: line ".$rowid.": facid=".$obj->facid." pu=".$pu." qty=".$qty." vatrate=".$vatrate." remise_percent=".$remise_percent." remise_global=".$remise_percent_global." -> ".$total_ht.", ".$total_tva.", ".$total_ttc);
+				print ". ";
+				$facligne->update_total();
 
 
-                /* On touche a facture mere uniquement si total_ttc = 0 */
-                if (!$total_ttc_f)
-                {
-                    $facture = new Facture($db);
-                    $facture->id = $obj->facid;
+				/* On touche a facture mere uniquement si total_ttc = 0 */
+				if (!$total_ttc_f)
+				{
+					$facture = new Facture($db);
+					$facture->id = $obj->facid;
 
-                    if ($facture->fetch($facture->id) >= 0)
-                    {
-                        if ($facture->update_price() > 0)
-                        {
-                            //print $facture->id;
-                        } else {
-                            print "Error id=".$facture->id;
-                            $err++;
-                        }
-                    } else {
-                        print "Error #3";
-                        $err++;
-                    }
-                }
-                print " ";
+					if ($facture->fetch($facture->id) >= 0)
+					{
+						if ($facture->update_price() > 0)
+						{
+							//print $facture->id;
+						} else {
+							print "Error id=".$facture->id;
+							$err++;
+						}
+					} else {
+						print "Error #3";
+						$err++;
+					}
+				}
+				print " ";
 
-                $i++;
-            }
-        } else {
-            print $langs->trans("AlreadyDone");
-        }
-        $db->free($resql);
+				$i++;
+			}
+		} else {
+			print $langs->trans("AlreadyDone");
+		}
+		$db->free($resql);
 
-        $db->commit();
-    } else {
-        print "Error #1 ".$db->error();
-        $err++;
+		$db->commit();
+	} else {
+		print "Error #1 ".$db->error();
+		$err++;
 
-        $db->rollback();
-    }
+		$db->rollback();
+	}
 
-    print '<br>';
+	print '<br>';
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -1512,59 +1512,59 @@ function migrate_price_propal($db, $langs, $conf)
    	$tmpmysoc = new Societe($db);
 	$tmpmysoc->setMysoc($conf);
 
-    $db->begin();
+	$db->begin();
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationProposal')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationProposal')."</b><br>\n";
 
-    // List of proposal lines not up to date
-    $sql = "SELECT pd.rowid, pd.qty, pd.subprice, pd.remise_percent, pd.tva_tx as vatrate, pd.info_bits,";
-    $sql .= " p.rowid as propalid, p.remise_percent as remise_percent_global";
-    $sql .= " FROM ".MAIN_DB_PREFIX."propaldet as pd, ".MAIN_DB_PREFIX."propal as p";
-    $sql .= " WHERE pd.fk_propal = p.rowid";
-    $sql .= " AND ((pd.total_ttc = 0 AND pd.remise_percent != 100) or pd.total_ttc IS NULL)";
+	// List of proposal lines not up to date
+	$sql = "SELECT pd.rowid, pd.qty, pd.subprice, pd.remise_percent, pd.tva_tx as vatrate, pd.info_bits,";
+	$sql .= " p.rowid as propalid, p.remise_percent as remise_percent_global";
+	$sql .= " FROM ".MAIN_DB_PREFIX."propaldet as pd, ".MAIN_DB_PREFIX."propal as p";
+	$sql .= " WHERE pd.fk_propal = p.rowid";
+	$sql .= " AND ((pd.total_ttc = 0 AND pd.remise_percent != 100) or pd.total_ttc IS NULL)";
 
-    dolibarr_install_syslog("upgrade2::migrate_price_propal");
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
-        if ($num)
-        {
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+	dolibarr_install_syslog("upgrade2::migrate_price_propal");
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                $rowid = $obj->rowid;
-                $qty = $obj->qty;
-                $pu = $obj->subprice;
-                $vatrate = $obj->vatrate;
-                $remise_percent = $obj->remise_percent;
-                $remise_percent_global = $obj->remise_percent_global;
-                $info_bits = $obj->info_bits;
+				$rowid = $obj->rowid;
+				$qty = $obj->qty;
+				$pu = $obj->subprice;
+				$vatrate = $obj->vatrate;
+				$remise_percent = $obj->remise_percent;
+				$remise_percent_global = $obj->remise_percent_global;
+				$info_bits = $obj->info_bits;
 
-                // On met a jour les 3 nouveaux champs
-                $propalligne = new PropaleLigne($db);
-                $propalligne->fetch($rowid);
+				// On met a jour les 3 nouveaux champs
+				$propalligne = new PropaleLigne($db);
+				$propalligne->fetch($rowid);
 
-                $result = calcul_price_total($qty, $pu, $remise_percent, $vatrate, 0, 0, $remise_percent_global, 'HT', $info_bits, $propalligne->product_type, $tmpmysoc);
-                $total_ht  = $result[0];
-                $total_tva = $result[1];
-                $total_ttc = $result[2];
+				$result = calcul_price_total($qty, $pu, $remise_percent, $vatrate, 0, 0, $remise_percent_global, 'HT', $info_bits, $propalligne->product_type, $tmpmysoc);
+				$total_ht  = $result[0];
+				$total_tva = $result[1];
+				$total_ttc = $result[2];
 
-                $propalligne->total_ht  = $total_ht;
-                $propalligne->total_tva = $total_tva;
-                $propalligne->total_ttc = $total_ttc;
+				$propalligne->total_ht  = $total_ht;
+				$propalligne->total_tva = $total_tva;
+				$propalligne->total_ttc = $total_ttc;
 
-                dolibarr_install_syslog("upgrade2: Line ".$rowid.": propalid=".$obj->rowid." pu=".$pu." qty=".$qty." vatrate=".$vatrate." remise_percent=".$remise_percent." remise_global=".$remise_percent_global." -> ".$total_ht.", ".$total_tva.", ".$total_ttc);
-                print ". ";
-                $propalligne->update_total();
+				dolibarr_install_syslog("upgrade2: Line ".$rowid.": propalid=".$obj->rowid." pu=".$pu." qty=".$qty." vatrate=".$vatrate." remise_percent=".$remise_percent." remise_global=".$remise_percent_global." -> ".$total_ht.", ".$total_tva.", ".$total_ttc);
+				print ". ";
+				$propalligne->update_total();
 
 
-                /* On touche pas a propal mere
+				/* On touche pas a propal mere
                  $propal = new Propal($db);
                  $propal->id=$obj->rowid;
                  if ( $propal->fetch($propal->id) >= 0 )
@@ -1583,24 +1583,24 @@ function migrate_price_propal($db, $langs, $conf)
                  print "Error #3";
                  }
                  */
-                $i++;
-            }
-        } else {
-            print $langs->trans("AlreadyDone");
-        }
+				$i++;
+			}
+		} else {
+			print $langs->trans("AlreadyDone");
+		}
 
-        $db->free($resql);
+		$db->free($resql);
 
-        $db->commit();
-    } else {
-        print "Error #1 ".$db->error();
+		$db->commit();
+	} else {
+		print "Error #1 ".$db->error();
 
-        $db->rollback();
-    }
+		$db->rollback();
+	}
 
-    print '<br>';
+	print '<br>';
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -1613,79 +1613,79 @@ function migrate_price_propal($db, $langs, $conf)
  */
 function migrate_price_contrat($db, $langs, $conf)
 {
-    $db->begin();
+	$db->begin();
 
    	$tmpmysoc = new Societe($db);
 	$tmpmysoc->setMysoc($conf);
-    if (empty($tmpmysoc->country_id)) $tmpmysoc->country_id = 0; // Ti not have this set to '' or will make sql syntax error.
+	if (empty($tmpmysoc->country_id)) $tmpmysoc->country_id = 0; // Ti not have this set to '' or will make sql syntax error.
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationContract')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationContract')."</b><br>\n";
 
-    // List of contract lines not up to date
-    $sql = "SELECT cd.rowid, cd.qty, cd.subprice, cd.remise_percent, cd.tva_tx as vatrate, cd.info_bits,";
-    $sql .= " c.rowid as contratid";
-    $sql .= " FROM ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
-    $sql .= " WHERE cd.fk_contrat = c.rowid";
-    $sql .= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100 AND cd.subprice > 0) or cd.total_ttc IS NULL)";
+	// List of contract lines not up to date
+	$sql = "SELECT cd.rowid, cd.qty, cd.subprice, cd.remise_percent, cd.tva_tx as vatrate, cd.info_bits,";
+	$sql .= " c.rowid as contratid";
+	$sql .= " FROM ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
+	$sql .= " WHERE cd.fk_contrat = c.rowid";
+	$sql .= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100 AND cd.subprice > 0) or cd.total_ttc IS NULL)";
 
-    dolibarr_install_syslog("upgrade2::migrate_price_contrat");
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
-        if ($num)
-        {
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+	dolibarr_install_syslog("upgrade2::migrate_price_contrat");
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                $rowid = $obj->rowid;
-                $qty = $obj->qty;
-                $pu = $obj->subprice;
-                $vatrate = $obj->vatrate;
-                $remise_percent = $obj->remise_percent;
-                $info_bits = $obj->info_bits;
+				$rowid = $obj->rowid;
+				$qty = $obj->qty;
+				$pu = $obj->subprice;
+				$vatrate = $obj->vatrate;
+				$remise_percent = $obj->remise_percent;
+				$info_bits = $obj->info_bits;
 
-                // On met a jour les 3 nouveaux champs
-                $contratligne = new ContratLigne($db);
-                //$contratligne->fetch($rowid); Non requis car le update_total ne met a jour que chp redefinis
-                $contratligne->fetch($rowid);
+				// On met a jour les 3 nouveaux champs
+				$contratligne = new ContratLigne($db);
+				//$contratligne->fetch($rowid); Non requis car le update_total ne met a jour que chp redefinis
+				$contratligne->fetch($rowid);
 
-                $result = calcul_price_total($qty, $pu, $remise_percent, $vatrate, 0, 0, 0, 'HT', $info_bits, $contratligne->product_type, $tmpmysoc);
-                $total_ht  = $result[0];
-                $total_tva = $result[1];
-                $total_ttc = $result[2];
+				$result = calcul_price_total($qty, $pu, $remise_percent, $vatrate, 0, 0, 0, 'HT', $info_bits, $contratligne->product_type, $tmpmysoc);
+				$total_ht  = $result[0];
+				$total_tva = $result[1];
+				$total_ttc = $result[2];
 
-                $contratligne->total_ht  = $total_ht;
-                $contratligne->total_tva = $total_tva;
-                $contratligne->total_ttc = $total_ttc;
+				$contratligne->total_ht  = $total_ht;
+				$contratligne->total_tva = $total_tva;
+				$contratligne->total_ttc = $total_ttc;
 
-                dolibarr_install_syslog("upgrade2: Line ".$rowid.": contratdetid=".$obj->rowid." pu=".$pu." qty=".$qty." vatrate=".$vatrate." remise_percent=".$remise_percent."  -> ".$total_ht.", ".$total_tva." , ".$total_ttc);
-                print ". ";
-                $contratligne->update_total();
+				dolibarr_install_syslog("upgrade2: Line ".$rowid.": contratdetid=".$obj->rowid." pu=".$pu." qty=".$qty." vatrate=".$vatrate." remise_percent=".$remise_percent."  -> ".$total_ht.", ".$total_tva." , ".$total_ttc);
+				print ". ";
+				$contratligne->update_total();
 
-                $i++;
-            }
-        } else {
-            print $langs->trans("AlreadyDone");
-        }
+				$i++;
+			}
+		} else {
+			print $langs->trans("AlreadyDone");
+		}
 
-        $db->free($resql);
+		$db->free($resql);
 
-        $db->commit();
-    } else {
-        print "Error #1 ".$db->error();
+		$db->commit();
+	} else {
+		print "Error #1 ".$db->error();
 
-        $db->rollback();
-    }
+		$db->rollback();
+	}
 
-    print '<br>';
+	print '<br>';
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -1698,61 +1698,61 @@ function migrate_price_contrat($db, $langs, $conf)
  */
 function migrate_price_commande($db, $langs, $conf)
 {
-    $db->begin();
+	$db->begin();
 
-    $tmpmysoc = new Societe($db);
-    $tmpmysoc->setMysoc($conf);
+	$tmpmysoc = new Societe($db);
+	$tmpmysoc->setMysoc($conf);
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationOrder')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationOrder')."</b><br>\n";
 
-    // List of sales orders lines not up to date
-    $sql = "SELECT cd.rowid, cd.qty, cd.subprice, cd.remise_percent, cd.tva_tx as vatrate, cd.info_bits,";
-    $sql .= " c.rowid as commandeid, c.remise_percent as remise_percent_global";
-    $sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd, ".MAIN_DB_PREFIX."commande as c";
-    $sql .= " WHERE cd.fk_commande = c.rowid";
-    $sql .= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100) or cd.total_ttc IS NULL)";
+	// List of sales orders lines not up to date
+	$sql = "SELECT cd.rowid, cd.qty, cd.subprice, cd.remise_percent, cd.tva_tx as vatrate, cd.info_bits,";
+	$sql .= " c.rowid as commandeid, c.remise_percent as remise_percent_global";
+	$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd, ".MAIN_DB_PREFIX."commande as c";
+	$sql .= " WHERE cd.fk_commande = c.rowid";
+	$sql .= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100) or cd.total_ttc IS NULL)";
 
-    dolibarr_install_syslog("upgrade2::migrate_price_commande");
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
-        if ($num)
-        {
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+	dolibarr_install_syslog("upgrade2::migrate_price_commande");
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                $rowid = $obj->rowid;
-                $qty = $obj->qty;
-                $pu = $obj->subprice;
-                $vatrate = $obj->vatrate;
-                $remise_percent = $obj->remise_percent;
-                $remise_percent_global = $obj->remise_percent_global;
-                $info_bits = $obj->info_bits;
+				$rowid = $obj->rowid;
+				$qty = $obj->qty;
+				$pu = $obj->subprice;
+				$vatrate = $obj->vatrate;
+				$remise_percent = $obj->remise_percent;
+				$remise_percent_global = $obj->remise_percent_global;
+				$info_bits = $obj->info_bits;
 
-                // On met a jour les 3 nouveaux champs
-                $commandeligne = new OrderLine($db);
-                $commandeligne->fetch($rowid);
+				// On met a jour les 3 nouveaux champs
+				$commandeligne = new OrderLine($db);
+				$commandeligne->fetch($rowid);
 
-                $result = calcul_price_total($qty, $pu, $remise_percent, $vatrate, 0, 0, $remise_percent_global, 'HT', $info_bits, $commandeligne->product_type, $tmpmysoc);
-                $total_ht  = $result[0];
-                $total_tva = $result[1];
-                $total_ttc = $result[2];
+				$result = calcul_price_total($qty, $pu, $remise_percent, $vatrate, 0, 0, $remise_percent_global, 'HT', $info_bits, $commandeligne->product_type, $tmpmysoc);
+				$total_ht  = $result[0];
+				$total_tva = $result[1];
+				$total_ttc = $result[2];
 
-                $commandeligne->total_ht  = $total_ht;
-                $commandeligne->total_tva = $total_tva;
-                $commandeligne->total_ttc = $total_ttc;
+				$commandeligne->total_ht  = $total_ht;
+				$commandeligne->total_tva = $total_tva;
+				$commandeligne->total_ttc = $total_ttc;
 
-                dolibarr_install_syslog("upgrade2: Line ".$rowid." : commandeid=".$obj->rowid." pu=".$pu." qty=".$qty." vatrate=".$vatrate." remise_percent=".$remise_percent." remise_global=".$remise_percent_global."  -> ".$total_ht.", ".$total_tva.", ".$total_ttc);
-                print ". ";
-                $commandeligne->update_total();
+				dolibarr_install_syslog("upgrade2: Line ".$rowid." : commandeid=".$obj->rowid." pu=".$pu." qty=".$qty." vatrate=".$vatrate." remise_percent=".$remise_percent." remise_global=".$remise_percent_global."  -> ".$total_ht.", ".$total_tva.", ".$total_ttc);
+				print ". ";
+				$commandeligne->update_total();
 
-                /* On touche pas a facture mere
+				/* On touche pas a facture mere
                  $commande = new Commande($db);
                  $commande->id = $obj->rowid;
                  if ( $commande->fetch($commande->id) >= 0 )
@@ -1771,15 +1771,15 @@ function migrate_price_commande($db, $langs, $conf)
                  print "Error #3";
                  }
                  */
-                $i++;
-            }
-        } else {
-            print $langs->trans("AlreadyDone");
-        }
+				$i++;
+			}
+		} else {
+			print $langs->trans("AlreadyDone");
+		}
 
-        $db->free($resql);
+		$db->free($resql);
 
-        /*
+		/*
          $sql = "DELETE FROM ".MAIN_DB_PREFIX."commandedet";
          $sql.= " WHERE price = 0 and total_ttc = 0 and total_tva = 0 and total_ht = 0 AND remise_percent = 0";
          $resql=$db->query($sql);
@@ -1789,16 +1789,16 @@ function migrate_price_commande($db, $langs, $conf)
          }
          */
 
-        $db->commit();
-    } else {
-        print "Error #1 ".$db->error();
+		$db->commit();
+	} else {
+		print "Error #1 ".$db->error();
 
-        $db->rollback();
-    }
+		$db->rollback();
+	}
 
-    print '<br>';
+	print '<br>';
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -1811,61 +1811,61 @@ function migrate_price_commande($db, $langs, $conf)
  */
 function migrate_price_commande_fournisseur($db, $langs, $conf)
 {
-    $db->begin();
+	$db->begin();
 
-    $tmpmysoc = new Societe($db);
-    $tmpmysoc->setMysoc($conf);
+	$tmpmysoc = new Societe($db);
+	$tmpmysoc->setMysoc($conf);
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationSupplierOrder')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationSupplierOrder')."</b><br>\n";
 
-    // List of purchase order lines not up to date
-    $sql = "SELECT cd.rowid, cd.qty, cd.subprice, cd.remise_percent, cd.tva_tx as vatrate, cd.info_bits,";
-    $sql .= " c.rowid as commandeid, c.remise_percent as remise_percent_global";
-    $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd, ".MAIN_DB_PREFIX."commande_fournisseur as c";
-    $sql .= " WHERE cd.fk_commande = c.rowid";
-    $sql .= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100) or cd.total_ttc IS NULL)";
+	// List of purchase order lines not up to date
+	$sql = "SELECT cd.rowid, cd.qty, cd.subprice, cd.remise_percent, cd.tva_tx as vatrate, cd.info_bits,";
+	$sql .= " c.rowid as commandeid, c.remise_percent as remise_percent_global";
+	$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd, ".MAIN_DB_PREFIX."commande_fournisseur as c";
+	$sql .= " WHERE cd.fk_commande = c.rowid";
+	$sql .= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100) or cd.total_ttc IS NULL)";
 
-    dolibarr_install_syslog("upgrade2::migrate_price_commande_fournisseur");
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
-        if ($num)
-        {
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+	dolibarr_install_syslog("upgrade2::migrate_price_commande_fournisseur");
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                $rowid = $obj->rowid;
-                $qty = $obj->qty;
-                $pu = $obj->subprice;
-                $vatrate = $obj->vatrate;
-                $remise_percent = $obj->remise_percent;
-                $remise_percent_global = $obj->remise_percent_global;
-                $info_bits = $obj->info_bits;
+				$rowid = $obj->rowid;
+				$qty = $obj->qty;
+				$pu = $obj->subprice;
+				$vatrate = $obj->vatrate;
+				$remise_percent = $obj->remise_percent;
+				$remise_percent_global = $obj->remise_percent_global;
+				$info_bits = $obj->info_bits;
 
-                // On met a jour les 3 nouveaux champs
-                $commandeligne = new CommandeFournisseurLigne($db);
-                $commandeligne->fetch($rowid);
+				// On met a jour les 3 nouveaux champs
+				$commandeligne = new CommandeFournisseurLigne($db);
+				$commandeligne->fetch($rowid);
 
-                $result = calcul_price_total($qty, $pu, $remise_percent, $vatrate, 0, 0, $remise_percent_global, 'HT', $info_bits, $commandeligne->product_type, $tmpsoc);
-                $total_ht  = $result[0];
-                $total_tva = $result[1];
-                $total_ttc = $result[2];
+				$result = calcul_price_total($qty, $pu, $remise_percent, $vatrate, 0, 0, $remise_percent_global, 'HT', $info_bits, $commandeligne->product_type, $tmpsoc);
+				$total_ht  = $result[0];
+				$total_tva = $result[1];
+				$total_ttc = $result[2];
 
-                $commandeligne->total_ht  = $total_ht;
-                $commandeligne->total_tva = $total_tva;
-                $commandeligne->total_ttc = $total_ttc;
+				$commandeligne->total_ht  = $total_ht;
+				$commandeligne->total_tva = $total_tva;
+				$commandeligne->total_ttc = $total_ttc;
 
-                dolibarr_install_syslog("upgrade2: Line ".$rowid.": commandeid=".$obj->rowid." pu=".$pu."  qty=".$qty." vatrate=".$vatrate." remise_percent=".$remise_percent." remise_global=".$remise_percent_global." -> ".$total_ht.", ".$total_tva.", ".$total_ttc);
-                print ". ";
-                $commandeligne->update_total();
+				dolibarr_install_syslog("upgrade2: Line ".$rowid.": commandeid=".$obj->rowid." pu=".$pu."  qty=".$qty." vatrate=".$vatrate." remise_percent=".$remise_percent." remise_global=".$remise_percent_global." -> ".$total_ht.", ".$total_tva.", ".$total_ttc);
+				print ". ";
+				$commandeligne->update_total();
 
-                /* On touche pas a facture mere
+				/* On touche pas a facture mere
                  $commande = new Commande($db);
                  $commande->id = $obj->rowid;
                  if ( $commande->fetch($commande->id) >= 0 )
@@ -1884,15 +1884,15 @@ function migrate_price_commande_fournisseur($db, $langs, $conf)
                  print "Error #3";
                  }
                  */
-                $i++;
-            }
-        } else {
-            print $langs->trans("AlreadyDone");
-        }
+				$i++;
+			}
+		} else {
+			print $langs->trans("AlreadyDone");
+		}
 
-        $db->free($resql);
+		$db->free($resql);
 
-        /*
+		/*
          $sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseurdet";
          $sql.= " WHERE subprice = 0 and total_ttc = 0 and total_tva = 0 and total_ht = 0";
          $resql=$db->query($sql);
@@ -1902,16 +1902,16 @@ function migrate_price_commande_fournisseur($db, $langs, $conf)
          }
          */
 
-        $db->commit();
-    } else {
-        print "Error #1 ".$db->error();
+		$db->commit();
+	} else {
+		print "Error #1 ".$db->error();
 
-        $db->rollback();
-    }
+		$db->rollback();
+	}
 
-    print '<br>';
+	print '<br>';
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -1924,51 +1924,51 @@ function migrate_price_commande_fournisseur($db, $langs, $conf)
  */
 function migrate_modeles($db, $langs, $conf)
 {
-    //print '<br>';
-    //print '<b>'.$langs->trans('UpdateModelsTable')."</b><br>\n";
+	//print '<br>';
+	//print '<b>'.$langs->trans('UpdateModelsTable')."</b><br>\n";
 
-    dolibarr_install_syslog("upgrade2::migrate_modeles");
+	dolibarr_install_syslog("upgrade2::migrate_modeles");
 
-    if (!empty($conf->facture->enabled))
-    {
-        include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
-        $modellist = ModelePDFFactures::liste_modeles($db);
-        if (count($modellist) == 0)
-        {
-            // Aucun model par defaut.
-            $sql = " insert into ".MAIN_DB_PREFIX."document_model(nom,type) values('crabe','invoice')";
-            $resql = $db->query($sql);
-            if (!$resql) dol_print_error($db);
-        }
-    }
+	if (!empty($conf->facture->enabled))
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
+		$modellist = ModelePDFFactures::liste_modeles($db);
+		if (count($modellist) == 0)
+		{
+			// Aucun model par defaut.
+			$sql = " insert into ".MAIN_DB_PREFIX."document_model(nom,type) values('crabe','invoice')";
+			$resql = $db->query($sql);
+			if (!$resql) dol_print_error($db);
+		}
+	}
 
-    if (!empty($conf->commande->enabled))
-    {
-        include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
-        $modellist = ModelePDFCommandes::liste_modeles($db);
-        if (count($modellist) == 0)
-        {
-            // Aucun model par defaut.
-            $sql = " insert into ".MAIN_DB_PREFIX."document_model(nom,type) values('einstein','order')";
-            $resql = $db->query($sql);
-            if (!$resql) dol_print_error($db);
-        }
-    }
+	if (!empty($conf->commande->enabled))
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
+		$modellist = ModelePDFCommandes::liste_modeles($db);
+		if (count($modellist) == 0)
+		{
+			// Aucun model par defaut.
+			$sql = " insert into ".MAIN_DB_PREFIX."document_model(nom,type) values('einstein','order')";
+			$resql = $db->query($sql);
+			if (!$resql) dol_print_error($db);
+		}
+	}
 
-    if (!empty($conf->expedition->enabled))
-    {
-        include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
-        $modellist = ModelePDFExpedition::liste_modeles($db);
-        if (count($modellist) == 0)
-        {
-            // Aucun model par defaut.
-            $sql = " insert into ".MAIN_DB_PREFIX."document_model(nom,type) values('rouget','shipping')";
-            $resql = $db->query($sql);
-            if (!$resql) dol_print_error($db);
-        }
-    }
+	if (!empty($conf->expedition->enabled))
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
+		$modellist = ModelePDFExpedition::liste_modeles($db);
+		if (count($modellist) == 0)
+		{
+			// Aucun model par defaut.
+			$sql = " insert into ".MAIN_DB_PREFIX."document_model(nom,type) values('rouget','shipping')";
+			$resql = $db->query($sql);
+			if (!$resql) dol_print_error($db);
+		}
+	}
 
-    //print $langs->trans("AlreadyDone");
+	//print $langs->trans("AlreadyDone");
 }
 
 
@@ -1982,65 +1982,65 @@ function migrate_modeles($db, $langs, $conf)
  */
 function migrate_commande_expedition($db, $langs, $conf)
 {
-    dolibarr_install_syslog("upgrade2::migrate_commande_expedition");
+	dolibarr_install_syslog("upgrade2::migrate_commande_expedition");
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationShipmentOrderMatching')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationShipmentOrderMatching')."</b><br>\n";
 
-    $result = $db->DDLDescTable(MAIN_DB_PREFIX."expedition", "fk_commande");
-    $obj = $db->fetch_object($result);
-    if ($obj)
-    {
-        $error = 0;
+	$result = $db->DDLDescTable(MAIN_DB_PREFIX."expedition", "fk_commande");
+	$obj = $db->fetch_object($result);
+	if ($obj)
+	{
+		$error = 0;
 
-        $db->begin();
+		$db->begin();
 
-        $sql = "SELECT e.rowid, e.fk_commande FROM ".MAIN_DB_PREFIX."expedition as e";
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $i = 0;
-            $num = $db->num_rows($resql);
+		$sql = "SELECT e.rowid, e.fk_commande FROM ".MAIN_DB_PREFIX."expedition as e";
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$i = 0;
+			$num = $db->num_rows($resql);
 
-            if ($num)
-            {
-                while ($i < $num)
-                {
-                    $obj = $db->fetch_object($resql);
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
 
-                    $sql = "INSERT INTO ".MAIN_DB_PREFIX."co_exp (fk_expedition,fk_commande)";
-                    $sql .= " VALUES (".$obj->rowid.",".$obj->fk_commande.")";
-                    $resql2 = $db->query($sql);
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."co_exp (fk_expedition,fk_commande)";
+					$sql .= " VALUES (".$obj->rowid.",".$obj->fk_commande.")";
+					$resql2 = $db->query($sql);
 
-                    if (!$resql2)
-                    {
-                        $error++;
-                        dol_print_error($db);
-                    }
-                    print ". ";
-                    $i++;
-                }
-            }
+					if (!$resql2)
+					{
+						$error++;
+						dol_print_error($db);
+					}
+					print ". ";
+					$i++;
+				}
+			}
 
-            if ($error == 0)
-            {
-                $db->commit();
-                $sql = "ALTER TABLE ".MAIN_DB_PREFIX."expedition DROP COLUMN fk_commande";
-                print $langs->trans('FieldRenamed')."<br>\n";
-                $db->query($sql);
-            } else {
-                $db->rollback();
-            }
-        } else {
-            dol_print_error($db);
-            $db->rollback();
-        }
-    } else {
-        print $langs->trans('AlreadyDone')."<br>\n";
-    }
-    print '</td></tr>';
+			if ($error == 0)
+			{
+				$db->commit();
+				$sql = "ALTER TABLE ".MAIN_DB_PREFIX."expedition DROP COLUMN fk_commande";
+				print $langs->trans('FieldRenamed')."<br>\n";
+				$db->query($sql);
+			} else {
+				$db->rollback();
+			}
+		} else {
+			dol_print_error($db);
+			$db->rollback();
+		}
+	} else {
+		print $langs->trans('AlreadyDone')."<br>\n";
+	}
+	print '</td></tr>';
 }
 
 /**
@@ -2053,81 +2053,81 @@ function migrate_commande_expedition($db, $langs, $conf)
  */
 function migrate_commande_livraison($db, $langs, $conf)
 {
-    dolibarr_install_syslog("upgrade2::migrate_commande_livraison");
+	dolibarr_install_syslog("upgrade2::migrate_commande_livraison");
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationDeliveryOrderMatching')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationDeliveryOrderMatching')."</b><br>\n";
 
-    $result = $db->DDLDescTable(MAIN_DB_PREFIX."livraison", "fk_commande");
-    $obj = $db->fetch_object($result);
-    if ($obj)
-    {
-        $error = 0;
+	$result = $db->DDLDescTable(MAIN_DB_PREFIX."livraison", "fk_commande");
+	$obj = $db->fetch_object($result);
+	if ($obj)
+	{
+		$error = 0;
 
-        $db->begin();
+		$db->begin();
 
-        $sql = "SELECT l.rowid, l.fk_commande";
-        $sql .= ", c.ref_client, c.date_livraison";
-        $sql .= " FROM ".MAIN_DB_PREFIX."livraison as l, ".MAIN_DB_PREFIX."commande as c";
-        $sql .= " WHERE c.rowid = l.fk_commande";
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $i = 0;
-            $num = $db->num_rows($resql);
+		$sql = "SELECT l.rowid, l.fk_commande,";
+		$sql .= " c.ref_client, c.date_livraison as delivery_date";
+		$sql .= " FROM ".MAIN_DB_PREFIX."livraison as l, ".MAIN_DB_PREFIX."commande as c";
+		$sql .= " WHERE c.rowid = l.fk_commande";
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$i = 0;
+			$num = $db->num_rows($resql);
 
-            if ($num)
-            {
-                while ($i < $num)
-                {
-                    $obj = $db->fetch_object($resql);
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
 
-                    $sql = "INSERT INTO ".MAIN_DB_PREFIX."co_liv (fk_livraison,fk_commande)";
-                    $sql .= " VALUES (".$obj->rowid.",".$obj->fk_commande.")";
-                    $resql2 = $db->query($sql);
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."co_liv (fk_livraison,fk_commande)";
+					$sql .= " VALUES (".$obj->rowid.",".$obj->fk_commande.")";
+					$resql2 = $db->query($sql);
 
-                    if ($resql2)
-                    {
-                    	$date_livraison = $db->jdate($obj->date_livraison);
+					if ($resql2)
+					{
+						$delivery_date = $db->jdate($obj->delivery_date);
 
-                        $sqlu = "UPDATE ".MAIN_DB_PREFIX."livraison SET";
-                        $sqlu .= " ref_client='".$db->escape($obj->ref_client)."'";
-                        $sqlu .= ", date_livraison='".$db->idate($date_livraison)."'";
-                        $sqlu .= " WHERE rowid = ".$obj->rowid;
-                        $resql3 = $db->query($sqlu);
-                        if (!$resql3)
-                        {
-                            $error++;
-                            dol_print_error($db);
-                        }
-                    } else {
-                        $error++;
-                        dol_print_error($db);
-                    }
-                    print ". ";
-                    $i++;
-                }
-            }
+						$sqlu = "UPDATE ".MAIN_DB_PREFIX."livraison SET";
+						$sqlu .= " ref_client='".$db->escape($obj->ref_client)."'";
+						$sqlu .= ", date_livraison='".$db->idate($delivery_date)."'";
+						$sqlu .= " WHERE rowid = ".$obj->rowid;
+						$resql3 = $db->query($sqlu);
+						if (!$resql3)
+						{
+							$error++;
+							dol_print_error($db);
+						}
+					} else {
+						$error++;
+						dol_print_error($db);
+					}
+					print ". ";
+					$i++;
+				}
+			}
 
-            if ($error == 0)
-            {
-                $db->commit();
-                $sql = "ALTER TABLE ".MAIN_DB_PREFIX."livraison DROP COLUMN fk_commande";
-                print $langs->trans('FieldRenamed')."<br>\n";
-                $db->query($sql);
-            } else {
-                $db->rollback();
-            }
-        } else {
-            dol_print_error($db);
-            $db->rollback();
-        }
-    } else {
-        print $langs->trans('AlreadyDone')."<br>\n";
-    }
-    print '</td></tr>';
+			if ($error == 0)
+			{
+				$db->commit();
+				$sql = "ALTER TABLE ".MAIN_DB_PREFIX."livraison DROP COLUMN fk_commande";
+				print $langs->trans('FieldRenamed')."<br>\n";
+				$db->query($sql);
+			} else {
+				$db->rollback();
+			}
+		} else {
+			dol_print_error($db);
+			$db->rollback();
+		}
+	} else {
+		print $langs->trans('AlreadyDone')."<br>\n";
+	}
+	print '</td></tr>';
 }
 
 /**
@@ -2140,105 +2140,105 @@ function migrate_commande_livraison($db, $langs, $conf)
  */
 function migrate_detail_livraison($db, $langs, $conf)
 {
-    dolibarr_install_syslog("upgrade2::migrate_detail_livraison");
+	dolibarr_install_syslog("upgrade2::migrate_detail_livraison");
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationDeliveryDetail')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationDeliveryDetail')."</b><br>\n";
 
-    // This is done if field fk_commande_ligne exists.
-    // If not this means migration was already done.
-    $result = $db->DDLDescTable(MAIN_DB_PREFIX."livraisondet", "fk_commande_ligne");
-    $obj = $db->fetch_object($result);
-    if ($obj)
-    {
-        $error = 0;
+	// This is done if field fk_commande_ligne exists.
+	// If not this means migration was already done.
+	$result = $db->DDLDescTable(MAIN_DB_PREFIX."livraisondet", "fk_commande_ligne");
+	$obj = $db->fetch_object($result);
+	if ($obj)
+	{
+		$error = 0;
 
-        $db->begin();
+		$db->begin();
 
-        $sql = "SELECT cd.rowid, cd.fk_product, cd.description, cd.subprice, cd.total_ht";
-        $sql .= ", ld.fk_livraison";
-        $sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd, ".MAIN_DB_PREFIX."livraisondet as ld";
-        $sql .= " WHERE ld.fk_commande_ligne = cd.rowid";
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $i = 0;
-            $num = $db->num_rows($resql);
+		$sql = "SELECT cd.rowid, cd.fk_product, cd.description, cd.subprice, cd.total_ht";
+		$sql .= ", ld.fk_livraison";
+		$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd, ".MAIN_DB_PREFIX."livraisondet as ld";
+		$sql .= " WHERE ld.fk_commande_ligne = cd.rowid";
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$i = 0;
+			$num = $db->num_rows($resql);
 
-            if ($num)
-            {
-                while ($i < $num)
-                {
-                    $obj = $db->fetch_object($resql);
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
 
-                    $sql = "UPDATE ".MAIN_DB_PREFIX."livraisondet SET";
-                    $sql .= " fk_product=".$obj->fk_product;
-                    $sql .= ",description='".$db->escape($obj->description)."'";
-                    $sql .= ",subprice='".$db->escape($obj->subprice)."'";
-                    $sql .= ",total_ht='".$db->escape($obj->total_ht)."'";
-                    $sql .= " WHERE fk_commande_ligne = ".$obj->rowid;
-                    $resql2 = $db->query($sql);
+					$sql = "UPDATE ".MAIN_DB_PREFIX."livraisondet SET";
+					$sql .= " fk_product=".$obj->fk_product;
+					$sql .= ",description='".$db->escape($obj->description)."'";
+					$sql .= ",subprice='".$db->escape($obj->subprice)."'";
+					$sql .= ",total_ht='".$db->escape($obj->total_ht)."'";
+					$sql .= " WHERE fk_commande_ligne = ".$obj->rowid;
+					$resql2 = $db->query($sql);
 
-                    if ($resql2)
-                    {
-                        $sql = "SELECT total_ht";
-                        $sql .= " FROM ".MAIN_DB_PREFIX."livraison";
-                        $sql .= " WHERE rowid = ".$obj->fk_livraison;
-                        $resql3 = $db->query($sql);
+					if ($resql2)
+					{
+						$sql = "SELECT total_ht";
+						$sql .= " FROM ".MAIN_DB_PREFIX."livraison";
+						$sql .= " WHERE rowid = ".$obj->fk_livraison;
+						$resql3 = $db->query($sql);
 
-                        if ($resql3)
-                        {
-                            $obju = $db->fetch_object($resql3);
-                            $total_ht = $obju->total_ht + $obj->total_ht;
+						if ($resql3)
+						{
+							$obju = $db->fetch_object($resql3);
+							$total_ht = $obju->total_ht + $obj->total_ht;
 
-                            $sqlu = "UPDATE ".MAIN_DB_PREFIX."livraison SET";
-                            $sqlu .= " total_ht='".$db->escape($total_ht)."'";
-                            $sqlu .= " WHERE rowid=".$obj->fk_livraison;
-                            $resql4 = $db->query($sqlu);
-                            if (!$resql4)
-                            {
-                                $error++;
-                                dol_print_error($db);
-                            }
-                        } else {
-                            $error++;
-                            dol_print_error($db);
-                        }
-                    } else {
-                        $error++;
-                        dol_print_error($db);
-                    }
-                    print ". ";
-                    $i++;
-                }
-            }
+							$sqlu = "UPDATE ".MAIN_DB_PREFIX."livraison SET";
+							$sqlu .= " total_ht='".$db->escape($total_ht)."'";
+							$sqlu .= " WHERE rowid=".$obj->fk_livraison;
+							$resql4 = $db->query($sqlu);
+							if (!$resql4)
+							{
+								$error++;
+								dol_print_error($db);
+							}
+						} else {
+							$error++;
+							dol_print_error($db);
+						}
+					} else {
+						$error++;
+						dol_print_error($db);
+					}
+					print ". ";
+					$i++;
+				}
+			}
 
-            if ($error == 0)
-            {
-                $db->commit();
-                $sql = "ALTER TABLE ".MAIN_DB_PREFIX."livraisondet CHANGE fk_commande_ligne fk_origin_line integer";
-                print $langs->trans('FieldRenamed')."<br>\n";
-                $db->query($sql);
-            } else {
-                $db->rollback();
-            }
-        } else {
-            dol_print_error($db);
-            $db->rollback();
-        }
-    } else {
-        $result = $db->DDLDescTable(MAIN_DB_PREFIX."livraisondet", "fk_origin_line");
-        $obj = $db->fetch_object($result);
-        if (!$obj)
-        {
-            $sql = "ALTER TABLE ".MAIN_DB_PREFIX."livraisondet ADD COLUMN fk_origin_line integer after fk_livraison";
-            $db->query($sql);
-        }
-        print $langs->trans('AlreadyDone')."<br>\n";
-    }
-    print '</td></tr>';
+			if ($error == 0)
+			{
+				$db->commit();
+				$sql = "ALTER TABLE ".MAIN_DB_PREFIX."livraisondet CHANGE fk_commande_ligne fk_origin_line integer";
+				print $langs->trans('FieldRenamed')."<br>\n";
+				$db->query($sql);
+			} else {
+				$db->rollback();
+			}
+		} else {
+			dol_print_error($db);
+			$db->rollback();
+		}
+	} else {
+		$result = $db->DDLDescTable(MAIN_DB_PREFIX."livraisondet", "fk_origin_line");
+		$obj = $db->fetch_object($result);
+		if (!$obj)
+		{
+			$sql = "ALTER TABLE ".MAIN_DB_PREFIX."livraisondet ADD COLUMN fk_origin_line integer after fk_livraison";
+			$db->query($sql);
+		}
+		print $langs->trans('AlreadyDone')."<br>\n";
+	}
+	print '</td></tr>';
 }
 
 /**
@@ -2251,60 +2251,60 @@ function migrate_detail_livraison($db, $langs, $conf)
  */
 function migrate_stocks($db, $langs, $conf)
 {
-    dolibarr_install_syslog("upgrade2::migrate_stocks");
+	dolibarr_install_syslog("upgrade2::migrate_stocks");
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationStockDetail')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationStockDetail')."</b><br>\n";
 
-    $error = 0;
+	$error = 0;
 
-    $db->begin();
+	$db->begin();
 
-    $sql = "SELECT SUM(reel) as total, fk_product";
-    $sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
-    $sql .= " GROUP BY fk_product";
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $i = 0;
-        $num = $db->num_rows($resql);
+	$sql = "SELECT SUM(reel) as total, fk_product";
+	$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
+	$sql .= " GROUP BY fk_product";
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$i = 0;
+		$num = $db->num_rows($resql);
 
-        if ($num)
-        {
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                $sql = "UPDATE ".MAIN_DB_PREFIX."product SET";
-                $sql .= " stock = '".$db->escape($obj->total)."'";
-                $sql .= " WHERE rowid=".$obj->fk_product;
+				$sql = "UPDATE ".MAIN_DB_PREFIX."product SET";
+				$sql .= " stock = '".$db->escape($obj->total)."'";
+				$sql .= " WHERE rowid=".$obj->fk_product;
 
-                $resql2 = $db->query($sql);
-                if ($resql2)
-                {
-                } else {
-                    $error++;
-                    dol_print_error($db);
-                }
-                print ". ";
-                $i++;
-            }
-        }
+				$resql2 = $db->query($sql);
+				if ($resql2)
+				{
+				} else {
+					$error++;
+					dol_print_error($db);
+				}
+				print ". ";
+				$i++;
+			}
+		}
 
-        if ($error == 0)
-        {
-            $db->commit();
-        } else {
-            $db->rollback();
-        }
-    } else {
-        dol_print_error($db);
-        $db->rollback();
-    }
+		if ($error == 0)
+		{
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
+	} else {
+		dol_print_error($db);
+		$db->rollback();
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -2318,66 +2318,66 @@ function migrate_stocks($db, $langs, $conf)
  */
 function migrate_menus($db, $langs, $conf)
 {
-    dolibarr_install_syslog("upgrade2::migrate_menus");
+	dolibarr_install_syslog("upgrade2::migrate_menus");
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationMenusDetail')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationMenusDetail')."</b><br>\n";
 
-    $error = 0;
+	$error = 0;
 
-    if ($db->DDLInfoTable(MAIN_DB_PREFIX."menu_constraint"))
-    {
-        $db->begin();
+	if ($db->DDLInfoTable(MAIN_DB_PREFIX."menu_constraint"))
+	{
+		$db->begin();
 
-        $sql = "SELECT m.rowid, mc.action";
-        $sql .= " FROM ".MAIN_DB_PREFIX."menu_constraint as mc, ".MAIN_DB_PREFIX."menu_const as md, ".MAIN_DB_PREFIX."menu as m";
-        $sql .= " WHERE md.fk_menu = m.rowid AND md.fk_constraint = mc.rowid";
-        $sql .= " AND m.enabled = '1'";
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $i = 0;
-            $num = $db->num_rows($resql);
-            if ($num)
-            {
-                while ($i < $num)
-                {
-                    $obj = $db->fetch_object($resql);
+		$sql = "SELECT m.rowid, mc.action";
+		$sql .= " FROM ".MAIN_DB_PREFIX."menu_constraint as mc, ".MAIN_DB_PREFIX."menu_const as md, ".MAIN_DB_PREFIX."menu as m";
+		$sql .= " WHERE md.fk_menu = m.rowid AND md.fk_constraint = mc.rowid";
+		$sql .= " AND m.enabled = '1'";
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$i = 0;
+			$num = $db->num_rows($resql);
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
 
-                    $sql = "UPDATE ".MAIN_DB_PREFIX."menu SET";
-                    $sql .= " enabled = '".$db->escape($obj->action)."'";
-                    $sql .= " WHERE rowid=".$obj->rowid;
-                    $sql .= " AND enabled = '1'";
+					$sql = "UPDATE ".MAIN_DB_PREFIX."menu SET";
+					$sql .= " enabled = '".$db->escape($obj->action)."'";
+					$sql .= " WHERE rowid=".$obj->rowid;
+					$sql .= " AND enabled = '1'";
 
-                    $resql2 = $db->query($sql);
-                    if ($resql2)
-                    {
-                    } else {
-                        $error++;
-                        dol_print_error($db);
-                    }
-                    print ". ";
-                    $i++;
-                }
-            }
+					$resql2 = $db->query($sql);
+					if ($resql2)
+					{
+					} else {
+						$error++;
+						dol_print_error($db);
+					}
+					print ". ";
+					$i++;
+				}
+			}
 
-            if ($error == 0)
-            {
-                $db->commit();
-            } else {
-                $db->rollback();
-            }
-        } else {
-            dol_print_error($db);
-            $db->rollback();
-        }
-    } else {
-        print $langs->trans('AlreadyDone')."<br>\n";
-    }
+			if ($error == 0)
+			{
+				$db->commit();
+			} else {
+				$db->rollback();
+			}
+		} else {
+			dol_print_error($db);
+			$db->rollback();
+		}
+	} else {
+		print $langs->trans('AlreadyDone')."<br>\n";
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -2391,69 +2391,69 @@ function migrate_menus($db, $langs, $conf)
  */
 function migrate_commande_deliveryaddress($db, $langs, $conf)
 {
-    dolibarr_install_syslog("upgrade2::migrate_commande_deliveryaddress");
+	dolibarr_install_syslog("upgrade2::migrate_commande_deliveryaddress");
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationDeliveryAddress')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationDeliveryAddress')."</b><br>\n";
 
-    $error = 0;
+	$error = 0;
 
-    if ($db->DDLInfoTable(MAIN_DB_PREFIX."co_exp"))
-    {
-        $db->begin();
+	if ($db->DDLInfoTable(MAIN_DB_PREFIX."co_exp"))
+	{
+		$db->begin();
 
-        $sql = "SELECT c.fk_adresse_livraison, ce.fk_expedition";
-        $sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
-        $sql .= ", ".MAIN_DB_PREFIX."co_exp as ce";
-        $sql .= " WHERE c.rowid = ce.fk_commande";
-        $sql .= " AND c.fk_adresse_livraison IS NOT NULL AND c.fk_adresse_livraison != 0";
+		$sql = "SELECT c.fk_adresse_livraison, ce.fk_expedition";
+		$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
+		$sql .= ", ".MAIN_DB_PREFIX."co_exp as ce";
+		$sql .= " WHERE c.rowid = ce.fk_commande";
+		$sql .= " AND c.fk_adresse_livraison IS NOT NULL AND c.fk_adresse_livraison != 0";
 
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $i = 0;
-            $num = $db->num_rows($resql);
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$i = 0;
+			$num = $db->num_rows($resql);
 
-            if ($num)
-            {
-                while ($i < $num)
-                {
-                    $obj = $db->fetch_object($resql);
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
 
-                    $sql = "UPDATE ".MAIN_DB_PREFIX."expedition SET";
-                    $sql .= " fk_adresse_livraison = '".$db->escape($obj->fk_adresse_livraison)."'";
-                    $sql .= " WHERE rowid=".$obj->fk_expedition;
+					$sql = "UPDATE ".MAIN_DB_PREFIX."expedition SET";
+					$sql .= " fk_adresse_livraison = '".$db->escape($obj->fk_adresse_livraison)."'";
+					$sql .= " WHERE rowid=".$obj->fk_expedition;
 
-                    $resql2 = $db->query($sql);
-                    if (!$resql2)
-                    {
-                        $error++;
-                        dol_print_error($db);
-                    }
-                    print ". ";
-                    $i++;
-                }
-            } else {
-                print $langs->trans('AlreadyDone')."<br>\n";
-            }
+					$resql2 = $db->query($sql);
+					if (!$resql2)
+					{
+						$error++;
+						dol_print_error($db);
+					}
+					print ". ";
+					$i++;
+				}
+			} else {
+				print $langs->trans('AlreadyDone')."<br>\n";
+			}
 
-            if ($error == 0)
-            {
-                $db->commit();
-            } else {
-                $db->rollback();
-            }
-        } else {
-            dol_print_error($db);
-            $db->rollback();
-        }
-    } else {
-        print $langs->trans('AlreadyDone')."<br>\n";
-    }
+			if ($error == 0)
+			{
+				$db->commit();
+			} else {
+				$db->rollback();
+			}
+		} else {
+			dol_print_error($db);
+			$db->rollback();
+		}
+	} else {
+		print $langs->trans('AlreadyDone')."<br>\n";
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -2467,139 +2467,139 @@ function migrate_commande_deliveryaddress($db, $langs, $conf)
  */
 function migrate_restore_missing_links($db, $langs, $conf)
 {
-    dolibarr_install_syslog("upgrade2::migrate_restore_missing_links");
+	dolibarr_install_syslog("upgrade2::migrate_restore_missing_links");
 
-    if (($db->type == 'mysql' || $db->type == 'mysqli'))
-    {
-        if (versioncompare($db->getVersionArray(), array(4, 0)) < 0)
-        {
-            dolibarr_install_syslog("upgrade2::migrate_restore_missing_links Version of database too old to make this migrate action");
-            return 0;
-        }
-    }
-    print '<tr><td colspan="4">';
+	if (($db->type == 'mysql' || $db->type == 'mysqli'))
+	{
+		if (versioncompare($db->getVersionArray(), array(4, 0)) < 0)
+		{
+			dolibarr_install_syslog("upgrade2::migrate_restore_missing_links Version of database too old to make this migrate action");
+			return 0;
+		}
+	}
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationFixData')."</b> (1)<br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationFixData')."</b> (1)<br>\n";
 
-    $error = 0;
+	$error = 0;
 
 
-    // Restore missing link for this cross foreign key (link 1 <=> 1). Direction 1.
-    $table1 = 'facturedet'; $field1 = 'fk_remise_except';
-    $table2 = 'societe_remise_except'; $field2 = 'fk_facture_line';
+	// Restore missing link for this cross foreign key (link 1 <=> 1). Direction 1.
+	$table1 = 'facturedet'; $field1 = 'fk_remise_except';
+	$table2 = 'societe_remise_except'; $field2 = 'fk_facture_line';
 
-    $db->begin();
+	$db->begin();
 
-    $sql = "SELECT t1.rowid, t1.".$field1." as field";
-    $sql .= " FROM ".MAIN_DB_PREFIX.$table1." as t1";
-    $sql .= " WHERE t1.".$field1." IS NOT NULL AND t1.".$field1." NOT IN";
-    $sql .= " (SELECT t2.rowid FROM ".MAIN_DB_PREFIX.$table2." as t2";
-    $sql .= " WHERE t1.rowid = t2.".$field2.")";
+	$sql = "SELECT t1.rowid, t1.".$field1." as field";
+	$sql .= " FROM ".MAIN_DB_PREFIX.$table1." as t1";
+	$sql .= " WHERE t1.".$field1." IS NOT NULL AND t1.".$field1." NOT IN";
+	$sql .= " (SELECT t2.rowid FROM ".MAIN_DB_PREFIX.$table2." as t2";
+	$sql .= " WHERE t1.rowid = t2.".$field2.")";
 
-    dolibarr_install_syslog("upgrade2::migrate_restore_missing_links DIRECTION 1");
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $i = 0;
-        $num = $db->num_rows($resql);
+	dolibarr_install_syslog("upgrade2::migrate_restore_missing_links DIRECTION 1");
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$i = 0;
+		$num = $db->num_rows($resql);
 
-        if ($num)
-        {
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                print 'Line '.$obj->rowid.' in '.$table1.' is linked to record '.$obj->field.' in '.$table2.' that has no link to '.$table1.'. We fix this.<br>';
-                $sql = "UPDATE ".MAIN_DB_PREFIX.$table2." SET";
-                $sql .= " ".$field2." = '".$db->escape($obj->rowid)."'";
-                $sql .= " WHERE rowid=".$obj->field;
+				print 'Line '.$obj->rowid.' in '.$table1.' is linked to record '.$obj->field.' in '.$table2.' that has no link to '.$table1.'. We fix this.<br>';
+				$sql = "UPDATE ".MAIN_DB_PREFIX.$table2." SET";
+				$sql .= " ".$field2." = '".$db->escape($obj->rowid)."'";
+				$sql .= " WHERE rowid=".$obj->field;
 
-                $resql2 = $db->query($sql);
-                if (!$resql2)
-                {
-                    $error++;
-                    dol_print_error($db);
-                }
-                //print ". ";
-                $i++;
-            }
-        } else print $langs->trans('AlreadyDone')."<br>\n";
+				$resql2 = $db->query($sql);
+				if (!$resql2)
+				{
+					$error++;
+					dol_print_error($db);
+				}
+				//print ". ";
+				$i++;
+			}
+		} else print $langs->trans('AlreadyDone')."<br>\n";
 
-        if ($error == 0)
-        {
-            $db->commit();
-        } else {
-            $db->rollback();
-        }
-    } else {
-        dol_print_error($db);
-        $db->rollback();
-    }
+		if ($error == 0)
+		{
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
+	} else {
+		dol_print_error($db);
+		$db->rollback();
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationFixData')."</b> (2)<br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationFixData')."</b> (2)<br>\n";
 
-    // Restore missing link for this cross foreign key (link 1 <=> 1). Direction 2.
-    $table2 = 'facturedet'; $field2 = 'fk_remise_except';
-    $table1 = 'societe_remise_except'; $field1 = 'fk_facture_line';
+	// Restore missing link for this cross foreign key (link 1 <=> 1). Direction 2.
+	$table2 = 'facturedet'; $field2 = 'fk_remise_except';
+	$table1 = 'societe_remise_except'; $field1 = 'fk_facture_line';
 
-    $db->begin();
+	$db->begin();
 
-    $sql = "SELECT t1.rowid, t1.".$field1." as field";
-    $sql .= " FROM ".MAIN_DB_PREFIX.$table1." as t1";
-    $sql .= " WHERE t1.".$field1." IS NOT NULL AND t1.".$field1." NOT IN";
-    $sql .= " (SELECT t2.rowid FROM ".MAIN_DB_PREFIX.$table2." as t2";
-    $sql .= " WHERE t1.rowid = t2.".$field2.")";
+	$sql = "SELECT t1.rowid, t1.".$field1." as field";
+	$sql .= " FROM ".MAIN_DB_PREFIX.$table1." as t1";
+	$sql .= " WHERE t1.".$field1." IS NOT NULL AND t1.".$field1." NOT IN";
+	$sql .= " (SELECT t2.rowid FROM ".MAIN_DB_PREFIX.$table2." as t2";
+	$sql .= " WHERE t1.rowid = t2.".$field2.")";
 
-    dolibarr_install_syslog("upgrade2::migrate_restore_missing_links DIRECTION 2");
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $i = 0;
-        $num = $db->num_rows($resql);
+	dolibarr_install_syslog("upgrade2::migrate_restore_missing_links DIRECTION 2");
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$i = 0;
+		$num = $db->num_rows($resql);
 
-        if ($num)
-        {
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                print 'Line '.$obj->rowid.' in '.$table1.' is linked to record '.$obj->field.' in '.$table2.' that has no link to '.$table1.'. We fix this.<br>';
-                $sql = "UPDATE ".MAIN_DB_PREFIX.$table2." SET";
-                $sql .= " ".$field2." = '".$db->escape($obj->rowid)."'";
-                $sql .= " WHERE rowid=".$obj->field;
+				print 'Line '.$obj->rowid.' in '.$table1.' is linked to record '.$obj->field.' in '.$table2.' that has no link to '.$table1.'. We fix this.<br>';
+				$sql = "UPDATE ".MAIN_DB_PREFIX.$table2." SET";
+				$sql .= " ".$field2." = '".$db->escape($obj->rowid)."'";
+				$sql .= " WHERE rowid=".$obj->field;
 
-                $resql2 = $db->query($sql);
-                if (!$resql2)
-                {
-                    $error++;
-                    dol_print_error($db);
-                }
-                //print ". ";
-                $i++;
-            }
-        } else {
-            print $langs->trans('AlreadyDone')."<br>\n";
-        }
+				$resql2 = $db->query($sql);
+				if (!$resql2)
+				{
+					$error++;
+					dol_print_error($db);
+				}
+				//print ". ";
+				$i++;
+			}
+		} else {
+			print $langs->trans('AlreadyDone')."<br>\n";
+		}
 
-        if ($error == 0)
-        {
-            $db->commit();
-        } else {
-            $db->rollback();
-        }
-    } else {
-        dol_print_error($db);
-        $db->rollback();
-    }
+		if ($error == 0)
+		{
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
+	} else {
+		dol_print_error($db);
+		$db->rollback();
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -2612,83 +2612,83 @@ function migrate_restore_missing_links($db, $langs, $conf)
  */
 function migrate_project_user_resp($db, $langs, $conf)
 {
-    dolibarr_install_syslog("upgrade2::migrate_project_user_resp");
+	dolibarr_install_syslog("upgrade2::migrate_project_user_resp");
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationProjectUserResp')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationProjectUserResp')."</b><br>\n";
 
-    $result = $db->DDLDescTable(MAIN_DB_PREFIX."projet", "fk_user_resp");
-    $obj = $db->fetch_object($result);
-    if ($obj)
-    {
-        $error = 0;
+	$result = $db->DDLDescTable(MAIN_DB_PREFIX."projet", "fk_user_resp");
+	$obj = $db->fetch_object($result);
+	if ($obj)
+	{
+		$error = 0;
 
-        $db->begin();
+		$db->begin();
 
-        $sql = "SELECT rowid, fk_user_resp FROM ".MAIN_DB_PREFIX."projet";
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $i = 0;
-            $num = $db->num_rows($resql);
+		$sql = "SELECT rowid, fk_user_resp FROM ".MAIN_DB_PREFIX."projet";
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$i = 0;
+			$num = $db->num_rows($resql);
 
-            if ($num)
-            {
-                while ($i < $num)
-                {
-                    $obj = $db->fetch_object($resql);
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
 
-                    $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."element_contact (";
-                    $sql2 .= "datecreate";
-                    $sql2 .= ", statut";
-                    $sql2 .= ", element_id";
-                    $sql2 .= ", fk_c_type_contact";
-                    $sql2 .= ", fk_socpeople";
-                    $sql2 .= ") VALUES (";
-                    $sql2 .= "'".$db->idate(dol_now())."'";
-                    $sql2 .= ", '4'";
-                    $sql2 .= ", ".$obj->rowid;
-                    $sql2 .= ", '160'";
-                    $sql2 .= ", ".$obj->fk_user_resp;
-                    $sql2 .= ")";
+					$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."element_contact (";
+					$sql2 .= "datecreate";
+					$sql2 .= ", statut";
+					$sql2 .= ", element_id";
+					$sql2 .= ", fk_c_type_contact";
+					$sql2 .= ", fk_socpeople";
+					$sql2 .= ") VALUES (";
+					$sql2 .= "'".$db->idate(dol_now())."'";
+					$sql2 .= ", '4'";
+					$sql2 .= ", ".$obj->rowid;
+					$sql2 .= ", '160'";
+					$sql2 .= ", ".$obj->fk_user_resp;
+					$sql2 .= ")";
 
-                    if ($obj->fk_user_resp > 0)
-                    {
-                        $resql2 = $db->query($sql2);
-                        if (!$resql2)
-                        {
-                            $error++;
-                            dol_print_error($db);
-                        }
-                    }
-                    print ". ";
+					if ($obj->fk_user_resp > 0)
+					{
+						$resql2 = $db->query($sql2);
+						if (!$resql2)
+						{
+							$error++;
+							dol_print_error($db);
+						}
+					}
+					print ". ";
 
-                    $i++;
-                }
-            }
+					$i++;
+				}
+			}
 
-            if ($error == 0)
-            {
-                $sqlDrop = "ALTER TABLE ".MAIN_DB_PREFIX."projet DROP COLUMN fk_user_resp";
-                if ($db->query($sqlDrop))
-                {
-                    $db->commit();
-                } else {
-                    $db->rollback();
-                }
-            } else {
-                $db->rollback();
-            }
-        } else {
-            dol_print_error($db);
-            $db->rollback();
-        }
-    } else {
-        print $langs->trans('AlreadyDone')."<br>\n";
-    }
-    print '</td></tr>';
+			if ($error == 0)
+			{
+				$sqlDrop = "ALTER TABLE ".MAIN_DB_PREFIX."projet DROP COLUMN fk_user_resp";
+				if ($db->query($sqlDrop))
+				{
+					$db->commit();
+				} else {
+					$db->rollback();
+				}
+			} else {
+				$db->rollback();
+			}
+		} else {
+			dol_print_error($db);
+			$db->rollback();
+		}
+	} else {
+		print $langs->trans('AlreadyDone')."<br>\n";
+	}
+	print '</td></tr>';
 }
 
 /**
@@ -2701,78 +2701,78 @@ function migrate_project_user_resp($db, $langs, $conf)
  */
 function migrate_project_task_actors($db, $langs, $conf)
 {
-    dolibarr_install_syslog("upgrade2::migrate_project_task_actors");
+	dolibarr_install_syslog("upgrade2::migrate_project_task_actors");
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationProjectTaskActors')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationProjectTaskActors')."</b><br>\n";
 
-    if ($db->DDLInfoTable(MAIN_DB_PREFIX."projet_task_actors"))
-    {
-        $error = 0;
+	if ($db->DDLInfoTable(MAIN_DB_PREFIX."projet_task_actors"))
+	{
+		$error = 0;
 
-        $db->begin();
+		$db->begin();
 
-        $sql = "SELECT fk_projet_task as fk_project_task, fk_user FROM ".MAIN_DB_PREFIX."projet_task_actors";
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $i = 0;
-            $num = $db->num_rows($resql);
+		$sql = "SELECT fk_projet_task as fk_project_task, fk_user FROM ".MAIN_DB_PREFIX."projet_task_actors";
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$i = 0;
+			$num = $db->num_rows($resql);
 
-            if ($num)
-            {
-                while ($i < $num)
-                {
-                    $obj = $db->fetch_object($resql);
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
 
-                    $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."element_contact (";
-                    $sql2 .= "datecreate";
-                    $sql2 .= ", statut";
-                    $sql2 .= ", element_id";
-                    $sql2 .= ", fk_c_type_contact";
-                    $sql2 .= ", fk_socpeople";
-                    $sql2 .= ") VALUES (";
-                    $sql2 .= "'".$db->idate(dol_now())."'";
-                    $sql2 .= ", '4'";
-                    $sql2 .= ", ".$obj->fk_project_task;
-                    $sql2 .= ", '180'";
-                    $sql2 .= ", ".$obj->fk_user;
-                    $sql2 .= ")";
+					$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."element_contact (";
+					$sql2 .= "datecreate";
+					$sql2 .= ", statut";
+					$sql2 .= ", element_id";
+					$sql2 .= ", fk_c_type_contact";
+					$sql2 .= ", fk_socpeople";
+					$sql2 .= ") VALUES (";
+					$sql2 .= "'".$db->idate(dol_now())."'";
+					$sql2 .= ", '4'";
+					$sql2 .= ", ".$obj->fk_project_task;
+					$sql2 .= ", '180'";
+					$sql2 .= ", ".$obj->fk_user;
+					$sql2 .= ")";
 
-                    $resql2 = $db->query($sql2);
+					$resql2 = $db->query($sql2);
 
-                    if (!$resql2)
-                    {
-                        $error++;
-                        dol_print_error($db);
-                    }
-                    print ". ";
-                    $i++;
-                }
-            }
+					if (!$resql2)
+					{
+						$error++;
+						dol_print_error($db);
+					}
+					print ". ";
+					$i++;
+				}
+			}
 
-            if ($error == 0)
-            {
-                $sqlDrop = "DROP TABLE ".MAIN_DB_PREFIX."projet_task_actors";
-                if ($db->query($sqlDrop))
-                {
-                    $db->commit();
-                } else {
-                    $db->rollback();
-                }
-            } else {
-                $db->rollback();
-            }
-        } else {
-            dol_print_error($db);
-            $db->rollback();
-        }
-    } else {
-        print $langs->trans('AlreadyDone')."<br>\n";
-    }
-    print '</td></tr>';
+			if ($error == 0)
+			{
+				$sqlDrop = "DROP TABLE ".MAIN_DB_PREFIX."projet_task_actors";
+				if ($db->query($sqlDrop))
+				{
+					$db->commit();
+				} else {
+					$db->rollback();
+				}
+			} else {
+				$db->rollback();
+			}
+		} else {
+			dol_print_error($db);
+			$db->rollback();
+		}
+	} else {
+		print $langs->trans('AlreadyDone')."<br>\n";
+	}
+	print '</td></tr>';
 }
 
 /**
@@ -2790,80 +2790,80 @@ function migrate_project_task_actors($db, $langs, $conf)
  */
 function migrate_relationship_tables($db, $langs, $conf, $table, $fk_source, $sourcetype, $fk_target, $targettype)
 {
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationRelationshipTables', MAIN_DB_PREFIX.$table)."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationRelationshipTables', MAIN_DB_PREFIX.$table)."</b><br>\n";
 
-    $error = 0;
+	$error = 0;
 
-    if ($db->DDLInfoTable(MAIN_DB_PREFIX.$table))
-    {
-        dolibarr_install_syslog("upgrade2::migrate_relationship_tables table = ".MAIN_DB_PREFIX.$table);
+	if ($db->DDLInfoTable(MAIN_DB_PREFIX.$table))
+	{
+		dolibarr_install_syslog("upgrade2::migrate_relationship_tables table = ".MAIN_DB_PREFIX.$table);
 
-        $db->begin();
+		$db->begin();
 
-        $sqlSelect = "SELECT ".$fk_source.", ".$fk_target;
-        $sqlSelect .= " FROM ".MAIN_DB_PREFIX.$table;
+		$sqlSelect = "SELECT ".$fk_source.", ".$fk_target;
+		$sqlSelect .= " FROM ".MAIN_DB_PREFIX.$table;
 
-        $resql = $db->query($sqlSelect);
-        if ($resql)
-        {
-            $i = 0;
-            $num = $db->num_rows($resql);
+		$resql = $db->query($sqlSelect);
+		if ($resql)
+		{
+			$i = 0;
+			$num = $db->num_rows($resql);
 
-            if ($num)
-            {
-                while ($i < $num)
-                {
-                    $obj = $db->fetch_object($resql);
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
 
-                    $sqlInsert = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
-                    $sqlInsert .= "fk_source";
-                    $sqlInsert .= ", sourcetype";
-                    $sqlInsert .= ", fk_target";
-                    $sqlInsert .= ", targettype";
-                    $sqlInsert .= ") VALUES (";
-                    $sqlInsert .= $obj->$fk_source;
-                    $sqlInsert .= ", '".$db->escape($sourcetype)."'";
-                    $sqlInsert .= ", ".$obj->$fk_target;
-                    $sqlInsert .= ", '".$db->escape($targettype)."'";
-                    $sqlInsert .= ")";
+					$sqlInsert = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
+					$sqlInsert .= "fk_source";
+					$sqlInsert .= ", sourcetype";
+					$sqlInsert .= ", fk_target";
+					$sqlInsert .= ", targettype";
+					$sqlInsert .= ") VALUES (";
+					$sqlInsert .= $obj->$fk_source;
+					$sqlInsert .= ", '".$db->escape($sourcetype)."'";
+					$sqlInsert .= ", ".$obj->$fk_target;
+					$sqlInsert .= ", '".$db->escape($targettype)."'";
+					$sqlInsert .= ")";
 
-                    $result = $db->query($sqlInsert);
-                    if (!$result)
-                    {
-                        $error++;
-                        dol_print_error($db);
-                    }
-                    print ". ";
-                    $i++;
-                }
-            } else {
-                print $langs->trans('AlreadyDone')."<br>\n";
-            }
+					$result = $db->query($sqlInsert);
+					if (!$result)
+					{
+						$error++;
+						dol_print_error($db);
+					}
+					print ". ";
+					$i++;
+				}
+			} else {
+				print $langs->trans('AlreadyDone')."<br>\n";
+			}
 
-            if ($error == 0)
-            {
-                $sqlDrop = "DROP TABLE ".MAIN_DB_PREFIX.$table;
-                if ($db->query($sqlDrop))
-                {
-                    $db->commit();
-                } else {
-                    $db->rollback();
-                }
-            } else {
-                $db->rollback();
-            }
-        } else {
-            dol_print_error($db);
-            $db->rollback();
-        }
-    } else {
-        print $langs->trans('AlreadyDone')."<br>\n";
-    }
+			if ($error == 0)
+			{
+				$sqlDrop = "DROP TABLE ".MAIN_DB_PREFIX.$table;
+				if ($db->query($sqlDrop))
+				{
+					$db->commit();
+				} else {
+					$db->rollback();
+				}
+			} else {
+				$db->rollback();
+			}
+		} else {
+			dol_print_error($db);
+			$db->rollback();
+		}
+	} else {
+		print $langs->trans('AlreadyDone')."<br>\n";
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -2876,103 +2876,103 @@ function migrate_relationship_tables($db, $langs, $conf, $table, $fk_source, $so
  */
 function migrate_project_task_time($db, $langs, $conf)
 {
-    dolibarr_install_syslog("upgrade2::migrate_project_task_time");
+	dolibarr_install_syslog("upgrade2::migrate_project_task_time");
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationProjectTaskTime')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationProjectTaskTime')."</b><br>\n";
 
-    $error = 0;
+	$error = 0;
 
-    $db->begin();
+	$db->begin();
 
-    $sql = "SELECT rowid, fk_task, task_duration";
-    $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time";
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $i = 0;
-        $num = $db->num_rows($resql);
+	$sql = "SELECT rowid, fk_task, task_duration";
+	$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time";
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$i = 0;
+		$num = $db->num_rows($resql);
 
-        if ($num)
-        {
-            $totaltime = array();
-            $oldtime = 0;
+		if ($num)
+		{
+			$totaltime = array();
+			$oldtime = 0;
 
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                if ($obj->task_duration > 0)
-                {
-                    // convert to second
-                    // only for int time and float time ex: 1,75 for 1h45
-                    list($hour, $min) = explode('.', $obj->task_duration);
-                    $hour = $hour * 60 * 60;
-                    $min = ($min / 100) * 60 * 60;
-                    $newtime = $hour + $min;
+				if ($obj->task_duration > 0)
+				{
+					// convert to second
+					// only for int time and float time ex: 1,75 for 1h45
+					list($hour, $min) = explode('.', $obj->task_duration);
+					$hour = $hour * 60 * 60;
+					$min = ($min / 100) * 60 * 60;
+					$newtime = $hour + $min;
 
-                    $sql2 = "UPDATE ".MAIN_DB_PREFIX."projet_task_time SET";
-                    $sql2 .= " task_duration = ".$newtime;
-                    $sql2 .= " WHERE rowid = ".$obj->rowid;
+					$sql2 = "UPDATE ".MAIN_DB_PREFIX."projet_task_time SET";
+					$sql2 .= " task_duration = ".$newtime;
+					$sql2 .= " WHERE rowid = ".$obj->rowid;
 
-                    $resql2 = $db->query($sql2);
-                    if (!$resql2)
-                    {
-                        $error++;
-                        dol_print_error($db);
-                    }
-                    print ". ";
-                    $oldtime++;
-                    if (!empty($totaltime[$obj->fk_task])) $totaltime[$obj->fk_task] += $newtime;
-                    else $totaltime[$obj->fk_task] = $newtime;
-                } else {
-                    if (!empty($totaltime[$obj->fk_task])) $totaltime[$obj->fk_task] += $obj->task_duration;
-                    else $totaltime[$obj->fk_task] = $obj->task_duration;
-                }
+					$resql2 = $db->query($sql2);
+					if (!$resql2)
+					{
+						$error++;
+						dol_print_error($db);
+					}
+					print ". ";
+					$oldtime++;
+					if (!empty($totaltime[$obj->fk_task])) $totaltime[$obj->fk_task] += $newtime;
+					else $totaltime[$obj->fk_task] = $newtime;
+				} else {
+					if (!empty($totaltime[$obj->fk_task])) $totaltime[$obj->fk_task] += $obj->task_duration;
+					else $totaltime[$obj->fk_task] = $obj->task_duration;
+				}
 
-                $i++;
-            }
+				$i++;
+			}
 
-            if ($error == 0)
-            {
-                if ($oldtime > 0)
-                {
-                    foreach ($totaltime as $taskid => $total_duration)
-                    {
-                        $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task SET";
-                        $sql .= " duration_effective = ".$total_duration;
-                        $sql .= " WHERE rowid = ".$taskid;
+			if ($error == 0)
+			{
+				if ($oldtime > 0)
+				{
+					foreach ($totaltime as $taskid => $total_duration)
+					{
+						$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task SET";
+						$sql .= " duration_effective = ".$total_duration;
+						$sql .= " WHERE rowid = ".$taskid;
 
-                        $resql = $db->query($sql);
-                        if (!$resql)
-                        {
-                            $error++;
-                            dol_print_error($db);
-                        }
-                    }
-                } else {
-                    print $langs->trans('AlreadyDone')."<br>\n";
-                }
-            } else {
-                dol_print_error($db);
-            }
-        } else {
-            print $langs->trans('AlreadyDone')."<br>\n";
-        }
-    } else {
-        dol_print_error($db);
-    }
+						$resql = $db->query($sql);
+						if (!$resql)
+						{
+							$error++;
+							dol_print_error($db);
+						}
+					}
+				} else {
+					print $langs->trans('AlreadyDone')."<br>\n";
+				}
+			} else {
+				dol_print_error($db);
+			}
+		} else {
+			print $langs->trans('AlreadyDone')."<br>\n";
+		}
+	} else {
+		dol_print_error($db);
+	}
 
-    if ($error == 0)
-    {
-        $db->commit();
-    } else {
-        $db->rollback();
-    }
+	if ($error == 0)
+	{
+		$db->commit();
+	} else {
+		$db->rollback();
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -2985,85 +2985,85 @@ function migrate_project_task_time($db, $langs, $conf)
  */
 function migrate_customerorder_shipping($db, $langs, $conf)
 {
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationCustomerOrderShipping')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationCustomerOrderShipping')."</b><br>\n";
 
-    $error = 0;
+	$error = 0;
 
-    $result1 = $db->DDLDescTable(MAIN_DB_PREFIX."expedition", "ref_customer");
-    $result2 = $db->DDLDescTable(MAIN_DB_PREFIX."expedition", "date_delivery");
-    $obj1 = $db->fetch_object($result1);
-    $obj2 = $db->fetch_object($result2);
-    if (!$obj1 && !$obj2)
-    {
-        dolibarr_install_syslog("upgrade2::migrate_customerorder_shipping");
+	$result1 = $db->DDLDescTable(MAIN_DB_PREFIX."expedition", "ref_customer");
+	$result2 = $db->DDLDescTable(MAIN_DB_PREFIX."expedition", "date_delivery");
+	$obj1 = $db->fetch_object($result1);
+	$obj2 = $db->fetch_object($result2);
+	if (!$obj1 && !$obj2)
+	{
+		dolibarr_install_syslog("upgrade2::migrate_customerorder_shipping");
 
-        $db->begin();
+		$db->begin();
 
-        $sqlAdd1 = "ALTER TABLE ".MAIN_DB_PREFIX."expedition ADD COLUMN ref_customer varchar(30) AFTER entity";
-        $sqlAdd2 = "ALTER TABLE ".MAIN_DB_PREFIX."expedition ADD COLUMN date_delivery date DEFAULT NULL AFTER date_expedition";
+		$sqlAdd1 = "ALTER TABLE ".MAIN_DB_PREFIX."expedition ADD COLUMN ref_customer varchar(30) AFTER entity";
+		$sqlAdd2 = "ALTER TABLE ".MAIN_DB_PREFIX."expedition ADD COLUMN date_delivery date DEFAULT NULL AFTER date_expedition";
 
-        if ($db->query($sqlAdd1) && $db->query($sqlAdd2))
-        {
-            $sqlSelect = "SELECT e.rowid as shipping_id, c.ref_client, c.date_livraison";
-            $sqlSelect .= " FROM ".MAIN_DB_PREFIX."expedition as e";
-            $sqlSelect .= ", ".MAIN_DB_PREFIX."element_element as el";
-            $sqlSelect .= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON c.rowid = el.fk_source AND el.sourcetype = 'commande'";
-            $sqlSelect .= " WHERE e.rowid = el.fk_target";
-            $sqlSelect .= " AND el.targettype = 'shipping'";
+		if ($db->query($sqlAdd1) && $db->query($sqlAdd2))
+		{
+			$sqlSelect = "SELECT e.rowid as shipping_id, c.ref_client, c.date_livraison as delivery_date";
+			$sqlSelect .= " FROM ".MAIN_DB_PREFIX."expedition as e";
+			$sqlSelect .= ", ".MAIN_DB_PREFIX."element_element as el";
+			$sqlSelect .= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON c.rowid = el.fk_source AND el.sourcetype = 'commande'";
+			$sqlSelect .= " WHERE e.rowid = el.fk_target";
+			$sqlSelect .= " AND el.targettype = 'shipping'";
 
-            $resql = $db->query($sqlSelect);
-            if ($resql)
-            {
-                $i = 0;
-                $num = $db->num_rows($resql);
+			$resql = $db->query($sqlSelect);
+			if ($resql)
+			{
+				$i = 0;
+				$num = $db->num_rows($resql);
 
-                if ($num)
-                {
-                    while ($i < $num)
-                    {
-                        $obj = $db->fetch_object($resql);
+				if ($num)
+				{
+					while ($i < $num)
+					{
+						$obj = $db->fetch_object($resql);
 
-                        $sqlUpdate = "UPDATE ".MAIN_DB_PREFIX."expedition SET";
-                        $sqlUpdate .= " ref_customer = '".$db->escape($obj->ref_client)."'";
-                        $sqlUpdate .= ", date_delivery = '".$db->escape($obj->date_livraison ? $obj->date_livraison : 'null')."'";
-                        $sqlUpdate .= " WHERE rowid = ".$obj->shipping_id;
+						$sqlUpdate = "UPDATE ".MAIN_DB_PREFIX."expedition SET";
+						$sqlUpdate .= " ref_customer = '".$db->escape($obj->ref_client)."'";
+						$sqlUpdate .= ", date_delivery = '".$db->escape($obj->delivery_date ? $obj->delivery_date : 'null')."'";
+						$sqlUpdate .= " WHERE rowid = ".$obj->shipping_id;
 
-                        $result = $db->query($sqlUpdate);
-                        if (!$result)
-                        {
-                            $error++;
-                            dol_print_error($db);
-                        }
-                        print ". ";
-                        $i++;
-                    }
-                } else {
-                    print $langs->trans('AlreadyDone')."<br>\n";
-                }
+						$result = $db->query($sqlUpdate);
+						if (!$result)
+						{
+							$error++;
+							dol_print_error($db);
+						}
+						print ". ";
+						$i++;
+					}
+				} else {
+					print $langs->trans('AlreadyDone')."<br>\n";
+				}
 
-                if ($error == 0)
-                {
-                    $db->commit();
-                } else {
-                    dol_print_error($db);
-                    $db->rollback();
-                }
-            } else {
-                dol_print_error($db);
-                $db->rollback();
-            }
-        } else {
-            dol_print_error($db);
-            $db->rollback();
-        }
-    } else {
-        print $langs->trans('AlreadyDone')."<br>\n";
-    }
+				if ($error == 0)
+				{
+					$db->commit();
+				} else {
+					dol_print_error($db);
+					$db->rollback();
+				}
+			} else {
+				dol_print_error($db);
+				$db->rollback();
+			}
+		} else {
+			dol_print_error($db);
+			$db->rollback();
+		}
+	} else {
+		print $langs->trans('AlreadyDone')."<br>\n";
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -3076,95 +3076,95 @@ function migrate_customerorder_shipping($db, $langs, $conf)
  */
 function migrate_shipping_delivery($db, $langs, $conf)
 {
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationShippingDelivery')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationShippingDelivery')."</b><br>\n";
 
-    $error = 0;
+	$error = 0;
 
-    $result = $db->DDLDescTable(MAIN_DB_PREFIX."livraison", "fk_expedition");
-    $obj = $db->fetch_object($result);
-    if ($obj)
-    {
-        dolibarr_install_syslog("upgrade2::migrate_shipping_delivery");
+	$result = $db->DDLDescTable(MAIN_DB_PREFIX."livraison", "fk_expedition");
+	$obj = $db->fetch_object($result);
+	if ($obj)
+	{
+		dolibarr_install_syslog("upgrade2::migrate_shipping_delivery");
 
-        $db->begin();
+		$db->begin();
 
-        $sqlSelect = "SELECT rowid, fk_expedition";
-        $sqlSelect .= " FROM ".MAIN_DB_PREFIX."livraison";
-        $sqlSelect .= " WHERE fk_expedition is not null";
+		$sqlSelect = "SELECT rowid, fk_expedition";
+		$sqlSelect .= " FROM ".MAIN_DB_PREFIX."livraison";
+		$sqlSelect .= " WHERE fk_expedition is not null";
 
-        $resql = $db->query($sqlSelect);
-        if ($resql)
-        {
-            $i = 0;
-            $num = $db->num_rows($resql);
+		$resql = $db->query($sqlSelect);
+		if ($resql)
+		{
+			$i = 0;
+			$num = $db->num_rows($resql);
 
-            if ($num)
-            {
-                while ($i < $num)
-                {
-                    $obj = $db->fetch_object($resql);
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
 
-                    $sqlInsert = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
-                    $sqlInsert .= "fk_source";
-                    $sqlInsert .= ", sourcetype";
-                    $sqlInsert .= ", fk_target";
-                    $sqlInsert .= ", targettype";
-                    $sqlInsert .= ") VALUES (";
-                    $sqlInsert .= $obj->fk_expedition;
-                    $sqlInsert .= ", 'shipping'";
-                    $sqlInsert .= ", ".$obj->rowid;
-                    $sqlInsert .= ", 'delivery'";
-                    $sqlInsert .= ")";
+					$sqlInsert = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
+					$sqlInsert .= "fk_source";
+					$sqlInsert .= ", sourcetype";
+					$sqlInsert .= ", fk_target";
+					$sqlInsert .= ", targettype";
+					$sqlInsert .= ") VALUES (";
+					$sqlInsert .= $obj->fk_expedition;
+					$sqlInsert .= ", 'shipping'";
+					$sqlInsert .= ", ".$obj->rowid;
+					$sqlInsert .= ", 'delivery'";
+					$sqlInsert .= ")";
 
-                    $result = $db->query($sqlInsert);
-                    if ($result)
-                    {
-                        $sqlUpdate = "UPDATE ".MAIN_DB_PREFIX."livraison SET fk_expedition = NULL";
-                        $sqlUpdate .= " WHERE rowid = ".$obj->rowid;
+					$result = $db->query($sqlInsert);
+					if ($result)
+					{
+						$sqlUpdate = "UPDATE ".MAIN_DB_PREFIX."livraison SET fk_expedition = NULL";
+						$sqlUpdate .= " WHERE rowid = ".$obj->rowid;
 
-                        $result = $db->query($sqlUpdate);
-                        if (!$result)
-                        {
-                            $error++;
-                            dol_print_error($db);
-                        }
-                        print ". ";
-                    } else {
-                        $error++;
-                        dol_print_error($db);
-                    }
-                    $i++;
-                }
-            } else {
-                print $langs->trans('AlreadyDone')."<br>\n";
-            }
+						$result = $db->query($sqlUpdate);
+						if (!$result)
+						{
+							$error++;
+							dol_print_error($db);
+						}
+						print ". ";
+					} else {
+						$error++;
+						dol_print_error($db);
+					}
+					$i++;
+				}
+			} else {
+				print $langs->trans('AlreadyDone')."<br>\n";
+			}
 
-            if ($error == 0)
-            {
-                $sqlDelete = "DELETE FROM ".MAIN_DB_PREFIX."element_element WHERE sourcetype = 'commande' AND targettype = 'delivery'";
-                $db->query($sqlDelete);
+			if ($error == 0)
+			{
+				$sqlDelete = "DELETE FROM ".MAIN_DB_PREFIX."element_element WHERE sourcetype = 'commande' AND targettype = 'delivery'";
+				$db->query($sqlDelete);
 
-                $db->commit();
+				$db->commit();
 
-                // DDL commands must not be inside a transaction
-                $sqlDrop = "ALTER TABLE ".MAIN_DB_PREFIX."livraison DROP COLUMN fk_expedition";
-                $db->query($sqlDrop);
-            } else {
-                dol_print_error($db);
-                $db->rollback();
-            }
-        } else {
-            dol_print_error($db);
-            $db->rollback();
-        }
-    } else {
-        print $langs->trans('AlreadyDone')."<br>\n";
-    }
+				// DDL commands must not be inside a transaction
+				$sqlDrop = "ALTER TABLE ".MAIN_DB_PREFIX."livraison DROP COLUMN fk_expedition";
+				$db->query($sqlDrop);
+			} else {
+				dol_print_error($db);
+				$db->rollback();
+			}
+		} else {
+			dol_print_error($db);
+			$db->rollback();
+		}
+	} else {
+		print $langs->trans('AlreadyDone')."<br>\n";
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -3178,72 +3178,72 @@ function migrate_shipping_delivery($db, $langs, $conf)
  */
 function migrate_shipping_delivery2($db, $langs, $conf)
 {
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationShippingDelivery2')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationShippingDelivery2')."</b><br>\n";
 
-    $error = 0;
+	$error = 0;
 
-    dolibarr_install_syslog("upgrade2::migrate_shipping_delivery2");
+	dolibarr_install_syslog("upgrade2::migrate_shipping_delivery2");
 
-    $db->begin();
+	$db->begin();
 
-    $sqlSelect = "SELECT l.rowid as delivery_id, e.ref_customer, e.date_delivery";
-    $sqlSelect .= " FROM ".MAIN_DB_PREFIX."livraison as l,";
-    $sqlSelect .= " ".MAIN_DB_PREFIX."element_element as el,";
-    $sqlSelect .= " ".MAIN_DB_PREFIX."expedition as e";
-    $sqlSelect .= " WHERE l.rowid = el.fk_target";
-    $sqlSelect .= " AND el.targettype = 'delivery'";
-    $sqlSelect .= " AND e.rowid = el.fk_source AND el.sourcetype = 'shipping'";
-    $sqlSelect .= " AND (e.ref_customer IS NOT NULL OR e.date_delivery IS NOT NULL)"; // Useless to process this record if both are null
-    // Add condition to know if we never migrate this record
-    $sqlSelect .= " AND (l.ref_customer IS NULL".($db->type != 'pgsql' ? " or l.ref_customer = ''" : "").")";
-    $sqlSelect .= " AND (l.date_delivery IS NULL".($db->type != 'pgsql' ? " or l.date_delivery = ''" : "").")";
+	$sqlSelect = "SELECT l.rowid as delivery_id, e.ref_customer, e.date_delivery";
+	$sqlSelect .= " FROM ".MAIN_DB_PREFIX."livraison as l,";
+	$sqlSelect .= " ".MAIN_DB_PREFIX."element_element as el,";
+	$sqlSelect .= " ".MAIN_DB_PREFIX."expedition as e";
+	$sqlSelect .= " WHERE l.rowid = el.fk_target";
+	$sqlSelect .= " AND el.targettype = 'delivery'";
+	$sqlSelect .= " AND e.rowid = el.fk_source AND el.sourcetype = 'shipping'";
+	$sqlSelect .= " AND (e.ref_customer IS NOT NULL OR e.date_delivery IS NOT NULL)"; // Useless to process this record if both are null
+	// Add condition to know if we never migrate this record
+	$sqlSelect .= " AND (l.ref_customer IS NULL".($db->type != 'pgsql' ? " or l.ref_customer = ''" : "").")";
+	$sqlSelect .= " AND (l.date_delivery IS NULL".($db->type != 'pgsql' ? " or l.date_delivery = ''" : "").")";
 
-    $resql = $db->query($sqlSelect);
-    if ($resql)
-    {
-        $i = 0;
-        $num = $db->num_rows($resql);
+	$resql = $db->query($sqlSelect);
+	if ($resql)
+	{
+		$i = 0;
+		$num = $db->num_rows($resql);
 
-        if ($num)
-        {
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                $sqlUpdate = "UPDATE ".MAIN_DB_PREFIX."livraison SET";
-                $sqlUpdate .= " ref_customer = '".$db->escape($obj->ref_customer)."',";
-                $sqlUpdate .= " date_delivery = ".($obj->date_delivery ? "'".$db->escape($obj->date_delivery)."'" : 'null');
-                $sqlUpdate .= " WHERE rowid = ".$obj->delivery_id;
+				$sqlUpdate = "UPDATE ".MAIN_DB_PREFIX."livraison SET";
+				$sqlUpdate .= " ref_customer = '".$db->escape($obj->ref_customer)."',";
+				$sqlUpdate .= " date_delivery = ".($obj->date_delivery ? "'".$db->escape($obj->date_delivery)."'" : 'null');
+				$sqlUpdate .= " WHERE rowid = ".$obj->delivery_id;
 
-                $result = $db->query($sqlUpdate);
-                if (!$result)
-                {
-                    $error++;
-                    dol_print_error($db);
-                }
-                print ". ";
-                $i++;
-            }
-        } else {
-            print $langs->trans('AlreadyDone')."<br>\n";
-        }
+				$result = $db->query($sqlUpdate);
+				if (!$result)
+				{
+					$error++;
+					dol_print_error($db);
+				}
+				print ". ";
+				$i++;
+			}
+		} else {
+			print $langs->trans('AlreadyDone')."<br>\n";
+		}
 
-        if ($error == 0)
-        {
-            $db->commit();
-        } else {
-            dol_print_error($db);
-            $db->rollback();
-        }
-    } else {
-        dol_print_error($db);
-        $db->rollback();
-    }
+		if ($error == 0)
+		{
+			$db->commit();
+		} else {
+			dol_print_error($db);
+			$db->rollback();
+		}
+	} else {
+		dol_print_error($db);
+		$db->rollback();
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -3413,76 +3413,76 @@ function migrate_mode_reglement($db, $langs, $conf)
  */
 function migrate_clean_association($db, $langs, $conf)
 {
-    $result = $db->DDLDescTable(MAIN_DB_PREFIX."categorie_association");
-    if ($result)	// result defined for version 3.2 or -
-    {
-        $obj = $db->fetch_object($result);
-        if ($obj)	// It table categorie_association exists
-        {
-            $couples = array();
-            $filles = array();
-            $sql = "SELECT fk_categorie_mere, fk_categorie_fille";
-            $sql .= " FROM ".MAIN_DB_PREFIX."categorie_association";
-            dolibarr_install_syslog("upgrade: search duplicate");
-            $resql = $db->query($sql);
-            if ($resql)
-            {
-                $num = $db->num_rows($resql);
-                while ($obj = $db->fetch_object($resql))
-                {
-                    if (!isset($filles[$obj->fk_categorie_fille]))	// Only one record as child (a child has only on parent).
-                    {
-                        if ($obj->fk_categorie_mere != $obj->fk_categorie_fille)
-                        {
-                            $filles[$obj->fk_categorie_fille] = 1; // Set record for this child
-                            $couples[$obj->fk_categorie_mere.'_'.$obj->fk_categorie_fille] = array('mere'=>$obj->fk_categorie_mere, 'fille'=>$obj->fk_categorie_fille);
-                        }
-                    }
-                }
+	$result = $db->DDLDescTable(MAIN_DB_PREFIX."categorie_association");
+	if ($result)	// result defined for version 3.2 or -
+	{
+		$obj = $db->fetch_object($result);
+		if ($obj)	// It table categorie_association exists
+		{
+			$couples = array();
+			$filles = array();
+			$sql = "SELECT fk_categorie_mere, fk_categorie_fille";
+			$sql .= " FROM ".MAIN_DB_PREFIX."categorie_association";
+			dolibarr_install_syslog("upgrade: search duplicate");
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$num = $db->num_rows($resql);
+				while ($obj = $db->fetch_object($resql))
+				{
+					if (!isset($filles[$obj->fk_categorie_fille]))	// Only one record as child (a child has only on parent).
+					{
+						if ($obj->fk_categorie_mere != $obj->fk_categorie_fille)
+						{
+							$filles[$obj->fk_categorie_fille] = 1; // Set record for this child
+							$couples[$obj->fk_categorie_mere.'_'.$obj->fk_categorie_fille] = array('mere'=>$obj->fk_categorie_mere, 'fille'=>$obj->fk_categorie_fille);
+						}
+					}
+				}
 
-                dolibarr_install_syslog("upgrade: result is num=".$num." count(couples)=".count($couples));
+				dolibarr_install_syslog("upgrade: result is num=".$num." count(couples)=".count($couples));
 
-                // If there is duplicates couples or child with two parents
-                if (count($couples) > 0 && $num > count($couples))
-                {
-                    $error = 0;
+				// If there is duplicates couples or child with two parents
+				if (count($couples) > 0 && $num > count($couples))
+				{
+					$error = 0;
 
-                    $db->begin();
+					$db->begin();
 
-                    // We delete all
-                    $sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_association";
-                    dolibarr_install_syslog("upgrade: delete association");
-                    $resqld = $db->query($sql);
-                    if ($resqld)
-                    {
-                        // And we insert only each record once
-                        foreach ($couples as $key => $val)
-                        {
-                            $sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_association(fk_categorie_mere,fk_categorie_fille)";
-                            $sql .= " VALUES(".$val['mere'].", ".$val['fille'].")";
-                            dolibarr_install_syslog("upgrade: insert association");
-                            $resqli = $db->query($sql);
-                            if (!$resqli) $error++;
-                        }
-                    }
+					// We delete all
+					$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_association";
+					dolibarr_install_syslog("upgrade: delete association");
+					$resqld = $db->query($sql);
+					if ($resqld)
+					{
+						// And we insert only each record once
+						foreach ($couples as $key => $val)
+						{
+							$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_association(fk_categorie_mere,fk_categorie_fille)";
+							$sql .= " VALUES(".$val['mere'].", ".$val['fille'].")";
+							dolibarr_install_syslog("upgrade: insert association");
+							$resqli = $db->query($sql);
+							if (!$resqli) $error++;
+						}
+					}
 
-                    if (!$error)
-                    {
-                        print '<tr><td>'.$langs->trans("MigrationCategorieAssociation").'</td>';
-                        print '<td class="right">'.$langs->trans("RemoveDuplicates").' '.$langs->trans("Success").' ('.$num.'=>'.count($couples).')</td></tr>';
-                        $db->commit();
-                    } else {
-                        print '<tr><td>'.$langs->trans("MigrationCategorieAssociation").'</td>';
-                        print '<td class="right">'.$langs->trans("RemoveDuplicates").' '.$langs->trans("Failed").'</td></tr>';
-                        $db->rollback();
-                    }
-                }
-            } else {
-                print '<tr><td>'.$langs->trans("Error").'</td>';
-                print '<td class="right"><div class="error">'.$db->lasterror().'</div></td></tr>';
-            }
-        }
-    }
+					if (!$error)
+					{
+						print '<tr><td>'.$langs->trans("MigrationCategorieAssociation").'</td>';
+						print '<td class="right">'.$langs->trans("RemoveDuplicates").' '.$langs->trans("Success").' ('.$num.'=>'.count($couples).')</td></tr>';
+						$db->commit();
+					} else {
+						print '<tr><td>'.$langs->trans("MigrationCategorieAssociation").'</td>';
+						print '<td class="right">'.$langs->trans("RemoveDuplicates").' '.$langs->trans("Failed").'</td></tr>';
+						$db->rollback();
+					}
+				}
+			} else {
+				print '<tr><td>'.$langs->trans("Error").'</td>';
+				print '<td class="right"><div class="error">'.$db->lasterror().'</div></td></tr>';
+			}
+		}
+	}
 }
 
 
@@ -4144,13 +4144,13 @@ function migrate_usergroup_rights_entity($db, $langs, $conf)
  */
 function migrate_rename_directories($db, $langs, $conf, $oldname, $newname)
 {
-    dolibarr_install_syslog("upgrade2::migrate_rename_directories");
+	dolibarr_install_syslog("upgrade2::migrate_rename_directories");
 
-    if (is_dir(DOL_DATA_ROOT.$oldname) && !file_exists(DOL_DATA_ROOT.$newname))
-    {
-        dolibarr_install_syslog("upgrade2::migrate_rename_directories move ".DOL_DATA_ROOT.$oldname.' into '.DOL_DATA_ROOT.$newname);
-        @rename(DOL_DATA_ROOT.$oldname, DOL_DATA_ROOT.$newname);
-    }
+	if (is_dir(DOL_DATA_ROOT.$oldname) && !file_exists(DOL_DATA_ROOT.$newname))
+	{
+		dolibarr_install_syslog("upgrade2::migrate_rename_directories move ".DOL_DATA_ROOT.$oldname.' into '.DOL_DATA_ROOT.$newname);
+		@rename(DOL_DATA_ROOT.$oldname, DOL_DATA_ROOT.$newname);
+	}
 }
 
 
@@ -4164,78 +4164,78 @@ function migrate_rename_directories($db, $langs, $conf, $oldname, $newname)
  */
 function migrate_delete_old_files($db, $langs, $conf)
 {
-    $result = true;
+	$result = true;
 
-    dolibarr_install_syslog("upgrade2::migrate_delete_old_files");
+	dolibarr_install_syslog("upgrade2::migrate_delete_old_files");
 
-    // List of files to delete
-    $filetodeletearray = array(
-        '/core/triggers/interface_demo.class.php',
-        '/core/menus/barre_left/default.php',
-        '/core/menus/barre_top/default.php',
-        '/core/modules/modComptabiliteExpert.class.php',
-        '/core/modules/modCommercial.class.php',
-        '/core/modules/modProduit.class.php',
-        '/core/modules/modSkype.class.php',
-        '/phenix/inc/triggers/interface_modPhenix_Phenixsynchro.class.php',
-        '/webcalendar/inc/triggers/interface_modWebcalendar_webcalsynchro.class.php',
-        '/core/triggers/interface_modWebcalendar_Webcalsynchro.class.php',
-        '/core/triggers/interface_modCommande_Ecotax.class.php',
-        '/core/triggers/interface_modCommande_fraisport.class.php',
-        '/core/triggers/interface_modPropale_PropalWorkflow.class.php',
-        '/core/menus/smartphone/iphone.lib.php',
-        '/core/menus/smartphone/iphone_backoffice.php',
-        '/core/menus/smartphone/iphone_frontoffice.php',
-        '/core/menus/standard/auguria_backoffice.php',
-        '/core/menus/standard/auguria_frontoffice.php',
-        '/core/menus/standard/eldy_backoffice.php',
-        '/core/menus/standard/eldy_frontoffice.php',
-        '/core/modules/mailings/contacts2.modules.php',
-        '/core/modules/mailings/contacts3.modules.php',
-        '/core/modules/mailings/contacts4.modules.php',
-        '/core/modules/mailings/framboise.modules.php',
-        '/core/modules/mailings/dolibarr_services_expired.modules.php',
-        '/core/modules/mailings/peche.modules.php',
-        '/core/modules/mailings/poire.modules.php',
-        '/core/modules/mailings/kiwi.modules.php',
-        '/core/modules/facture/pdf_crabe.modules.php',
-        '/core/modules/facture/pdf_oursin.modules.php',
+	// List of files to delete
+	$filetodeletearray = array(
+		'/core/triggers/interface_demo.class.php',
+		'/core/menus/barre_left/default.php',
+		'/core/menus/barre_top/default.php',
+		'/core/modules/modComptabiliteExpert.class.php',
+		'/core/modules/modCommercial.class.php',
+		'/core/modules/modProduit.class.php',
+		'/core/modules/modSkype.class.php',
+		'/phenix/inc/triggers/interface_modPhenix_Phenixsynchro.class.php',
+		'/webcalendar/inc/triggers/interface_modWebcalendar_webcalsynchro.class.php',
+		'/core/triggers/interface_modWebcalendar_Webcalsynchro.class.php',
+		'/core/triggers/interface_modCommande_Ecotax.class.php',
+		'/core/triggers/interface_modCommande_fraisport.class.php',
+		'/core/triggers/interface_modPropale_PropalWorkflow.class.php',
+		'/core/menus/smartphone/iphone.lib.php',
+		'/core/menus/smartphone/iphone_backoffice.php',
+		'/core/menus/smartphone/iphone_frontoffice.php',
+		'/core/menus/standard/auguria_backoffice.php',
+		'/core/menus/standard/auguria_frontoffice.php',
+		'/core/menus/standard/eldy_backoffice.php',
+		'/core/menus/standard/eldy_frontoffice.php',
+		'/core/modules/mailings/contacts2.modules.php',
+		'/core/modules/mailings/contacts3.modules.php',
+		'/core/modules/mailings/contacts4.modules.php',
+		'/core/modules/mailings/framboise.modules.php',
+		'/core/modules/mailings/dolibarr_services_expired.modules.php',
+		'/core/modules/mailings/peche.modules.php',
+		'/core/modules/mailings/poire.modules.php',
+		'/core/modules/mailings/kiwi.modules.php',
+		'/core/modules/facture/pdf_crabe.modules.php',
+		'/core/modules/facture/pdf_oursin.modules.php',
 
-    	'/api/class/api_generic.class.php',
-    	'/categories/class/api_category.class.php',
-    	'/categories/class/api_deprecated_category.class.php',
-    	'/compta/facture/class/api_invoice.class.php',
-        '/commande/class/api_commande.class.php',
-        '/user/class/api_user.class.php',
-        '/product/class/api_product.class.php',
-        '/societe/class/api_contact.class.php',
-        '/societe/class/api_thirdparty.class.php',
-        '/support/online.php',
-        '/takepos/class/actions_takepos.class.php',
+		'/api/class/api_generic.class.php',
+		'/categories/class/api_category.class.php',
+		'/categories/class/api_deprecated_category.class.php',
+		'/compta/facture/class/api_invoice.class.php',
+		'/commande/class/api_commande.class.php',
+		'/user/class/api_user.class.php',
+		'/product/class/api_product.class.php',
+		'/societe/class/api_contact.class.php',
+		'/societe/class/api_thirdparty.class.php',
+		'/support/online.php',
+		'/takepos/class/actions_takepos.class.php',
 
-    	'/install/mysql/tables/llx_c_ticketsup_category.key.sql',
-    	'/install/mysql/tables/llx_c_ticketsup_category.sql',
-    	'/install/mysql/tables/llx_c_ticketsup_severity.key.sql',
-    	'/install/mysql/tables/llx_c_ticketsup_severity.sql',
-    	'/install/mysql/tables/llx_c_ticketsup_type.key.sql',
-    	'/install/mysql/tables/llx_c_ticketsup_type.sql'
-    );
+		'/install/mysql/tables/llx_c_ticketsup_category.key.sql',
+		'/install/mysql/tables/llx_c_ticketsup_category.sql',
+		'/install/mysql/tables/llx_c_ticketsup_severity.key.sql',
+		'/install/mysql/tables/llx_c_ticketsup_severity.sql',
+		'/install/mysql/tables/llx_c_ticketsup_type.key.sql',
+		'/install/mysql/tables/llx_c_ticketsup_type.sql'
+	);
 
-    foreach ($filetodeletearray as $filetodelete) {
-        //print '<b>'DOL_DOCUMENT_ROOT.$filetodelete."</b><br>\n";
-        $result = 1;
-        if (file_exists(DOL_DOCUMENT_ROOT.$filetodelete)) {
-            $result = dol_delete_file(DOL_DOCUMENT_ROOT.$filetodelete, 0, 0, 0, null, true, false);
-            if (!$result) {
-                $langs->load("errors");
-                print '<div class="error">'.$langs->trans("Error").': '.$langs->trans("ErrorFailToDeleteFile", DOL_DOCUMENT_ROOT.$filetodelete);
-                print ' '.$langs->trans("RemoveItManuallyAndPressF5ToContinue").'</div>';
-            } else {
-                //print $langs->trans("FileWasRemoved", $filetodelete).'<br>';
-            }
-        }
-    }
-    return $result;
+	foreach ($filetodeletearray as $filetodelete) {
+		//print '<b>'DOL_DOCUMENT_ROOT.$filetodelete."</b><br>\n";
+		$result = 1;
+		if (file_exists(DOL_DOCUMENT_ROOT.$filetodelete)) {
+			$result = dol_delete_file(DOL_DOCUMENT_ROOT.$filetodelete, 0, 0, 0, null, true, false);
+			if (!$result) {
+				$langs->load("errors");
+				print '<div class="error">'.$langs->trans("Error").': '.$langs->trans("ErrorFailToDeleteFile", DOL_DOCUMENT_ROOT.$filetodelete);
+				print ' '.$langs->trans("RemoveItManuallyAndPressF5ToContinue").'</div>';
+			} else {
+				//print $langs->trans("FileWasRemoved", $filetodelete).'<br>';
+			}
+		}
+	}
+	return $result;
 }
 
 /**
@@ -4248,28 +4248,28 @@ function migrate_delete_old_files($db, $langs, $conf)
  */
 function migrate_delete_old_dir($db, $langs, $conf)
 {
-    $result = true;
+	$result = true;
 
-    dolibarr_install_syslog("upgrade2::migrate_delete_old_dir");
+	dolibarr_install_syslog("upgrade2::migrate_delete_old_dir");
 
-    // List of files to delete
-    $filetodeletearray = array(
-        DOL_DOCUMENT_ROOT.'/core/modules/facture/terre',
-        DOL_DOCUMENT_ROOT.'/core/modules/facture/mercure',
-    );
+	// List of files to delete
+	$filetodeletearray = array(
+		DOL_DOCUMENT_ROOT.'/core/modules/facture/terre',
+		DOL_DOCUMENT_ROOT.'/core/modules/facture/mercure',
+	);
 
-    foreach ($filetodeletearray as $filetodelete) {
-        //print '<b>'.$filetodelete."</b><br>\n";
-        if (file_exists($filetodelete)) {
-            $result = dol_delete_dir_recursive($filetodelete);
-        }
-        if (!$result) {
-            $langs->load("errors");
-            print '<div class="error">'.$langs->trans("Error").': '.$langs->trans("ErrorFailToDeleteDir", $filetodelete);
-            print ' '.$langs->trans("RemoveItManuallyAndPressF5ToContinue").'</div>';
-        }
-    }
-    return $result;
+	foreach ($filetodeletearray as $filetodelete) {
+		//print '<b>'.$filetodelete."</b><br>\n";
+		if (file_exists($filetodelete)) {
+			$result = dol_delete_dir_recursive($filetodelete);
+		}
+		if (!$result) {
+			$langs->load("errors");
+			print '<div class="error">'.$langs->trans("Error").': '.$langs->trans("ErrorFailToDeleteDir", $filetodelete);
+			print ' '.$langs->trans("RemoveItManuallyAndPressF5ToContinue").'</div>';
+		}
+	}
+	return $result;
 }
 
 
@@ -4530,35 +4530,35 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
  */
 function migrate_reload_menu($db, $langs, $conf)
 {
-    global $conf;
-    dolibarr_install_syslog("upgrade2::migrate_reload_menu");
+	global $conf;
+	dolibarr_install_syslog("upgrade2::migrate_reload_menu");
 
-    // Define list of menu handlers to initialize
-    $listofmenuhandler = array();
-    if ($conf->global->MAIN_MENU_STANDARD == 'auguria_menu' || $conf->global->MAIN_MENU_SMARTPHONE == 'auguria_menu'
-    	|| $conf->global->MAIN_MENUFRONT_STANDARD == 'auguria_menu' || $conf->global->MAIN_MENUFRONT_SMARTPHONE == 'auguria_menu')
-    {
-    	$listofmenuhandler['auguria'] = 1; // We set here only dynamic menu handlers
-    }
+	// Define list of menu handlers to initialize
+	$listofmenuhandler = array();
+	if ($conf->global->MAIN_MENU_STANDARD == 'auguria_menu' || $conf->global->MAIN_MENU_SMARTPHONE == 'auguria_menu'
+		|| $conf->global->MAIN_MENUFRONT_STANDARD == 'auguria_menu' || $conf->global->MAIN_MENUFRONT_SMARTPHONE == 'auguria_menu')
+	{
+		$listofmenuhandler['auguria'] = 1; // We set here only dynamic menu handlers
+	}
 
-    foreach ($listofmenuhandler as $key => $val)
-    {
-        print '<tr><td colspan="4">';
+	foreach ($listofmenuhandler as $key => $val)
+	{
+		print '<tr><td colspan="4">';
 
-        //print "x".$key;
-        print '<br>';
-        print '<b>'.$langs->trans('Upgrade').'</b>: '.$langs->trans('MenuHandler')." ".$key."<br>\n";
+		//print "x".$key;
+		print '<br>';
+		print '<b>'.$langs->trans('Upgrade').'</b>: '.$langs->trans('MenuHandler')." ".$key."<br>\n";
 
-        // Load sql ini_menu_handler.sql file
-        $dir = DOL_DOCUMENT_ROOT."/core/menus/";
-        $file = 'init_menu_'.$key.'.sql';
-        if (file_exists($dir.$file))
-        {
-            $result = run_sql($dir.$file, 1, '', 1, $key);
-        }
+		// Load sql ini_menu_handler.sql file
+		$dir = DOL_DOCUMENT_ROOT."/core/menus/";
+		$file = 'init_menu_'.$key.'.sql';
+		if (file_exists($dir.$file))
+		{
+			$result = run_sql($dir.$file, 1, '', 1, $key);
+		}
 
-        print '</td></tr>';
-    }
+		print '</td></tr>';
+	}
 }
 
 /**
@@ -4608,44 +4608,44 @@ function migrate_user_photospath()
 				if (dol_is_dir($origin))
 				{
 					$handle = opendir($origin_osencoded);
-			        if (is_resource($handle))
-			        {
-			        	while (($file = readdir($handle)) !== false)
-			    		{
-			    			if ($file == '.' || $file == '..') continue;
+					if (is_resource($handle))
+					{
+						while (($file = readdir($handle)) !== false)
+						{
+							if ($file == '.' || $file == '..') continue;
 
-			     			if (dol_is_dir($origin.'/'.$file))	// it is a dir (like 'thumbs')
-			    			{
-			    				$thumbs = opendir($origin_osencoded.'/'.$file);
-			    				if (is_resource($thumbs))
-			        			{
-				     				dol_mkdir($destin.'/'.$file);
-				     				while (($thumb = readdir($thumbs)) !== false)
-					    			{
-					    				if (!dol_is_file($destin.'/'.$file.'/'.$thumb))
-					    				{
-					    					if ($thumb == '.' || $thumb == '..') continue;
+				 			if (dol_is_dir($origin.'/'.$file))	// it is a dir (like 'thumbs')
+							{
+								$thumbs = opendir($origin_osencoded.'/'.$file);
+								if (is_resource($thumbs))
+								{
+					 				dol_mkdir($destin.'/'.$file);
+					 				while (($thumb = readdir($thumbs)) !== false)
+									{
+										if (!dol_is_file($destin.'/'.$file.'/'.$thumb))
+										{
+											if ($thumb == '.' || $thumb == '..') continue;
 
-					    					//print $origin.'/'.$file.'/'.$thumb.' -> '.$destin.'/'.$file.'/'.$thumb.'<br>'."\n";
-					    					print '.';
-					    					dol_copy($origin.'/'.$file.'/'.$thumb, $destin.'/'.$file.'/'.$thumb, 0, 0);
-					    					//var_dump('aaa');exit;
-					    				}
-					    			}
+											//print $origin.'/'.$file.'/'.$thumb.' -> '.$destin.'/'.$file.'/'.$thumb.'<br>'."\n";
+											print '.';
+											dol_copy($origin.'/'.$file.'/'.$thumb, $destin.'/'.$file.'/'.$thumb, 0, 0);
+											//var_dump('aaa');exit;
+										}
+									}
 									// dol_delete_dir($origin.'/'.$file);
-			        			}
-			    			} else // it is a file
-			    			{
-			    				if (!dol_is_file($destin.'/'.$file))
-			    				{
-			    					//print $origin.'/'.$file.' -> '.$destin.'/'.$file.'<br>'."\n";
-			    					print '.';
-			    					dol_copy($origin.'/'.$file, $destin.'/'.$file, 0, 0);
-			    					//var_dump('eee');exit;
-			    				}
-			    			}
-			    		}
-			        }
+								}
+							} else // it is a file
+							{
+								if (!dol_is_file($destin.'/'.$file))
+								{
+									//print $origin.'/'.$file.' -> '.$destin.'/'.$file.'<br>'."\n";
+									print '.';
+									dol_copy($origin.'/'.$file, $destin.'/'.$file, 0, 0);
+									//var_dump('eee');exit;
+								}
+							}
+						}
+					}
 				}
 			}
 		}
@@ -4673,87 +4673,87 @@ and rowid in (...)
  */
 function migrate_users_socialnetworks()
 {
-    global $db, $langs;
-    // skype,twitter,facebook,linkedin,instagram,snapchat,googleplus,youtube,whatsapp
-    $error = 0;
-    $db->begin();
-    print '<tr><td colspan="4">';
-    $sql = 'SELECT rowid, socialnetworks';
-    $sql .= ', skype, twitter, facebook, linkedin, instagram, snapchat, googleplus, youtube, whatsapp FROM '.MAIN_DB_PREFIX.'user WHERE';
-    $sql .= " skype IS NOT NULL OR skype <> ''";
-    $sql .= " OR twitter IS NOT NULL OR twitter <> ''";
-    $sql .= " OR facebook IS NOT NULL OR facebook <> ''";
-    $sql .= " OR linkedin IS NOT NULL OR linkedin <> ''";
-    $sql .= " OR instagram IS NOT NULL OR instagram <> ''";
-    $sql .= " OR snapchat IS NOT NULL OR snapchat <> ''";
-    $sql .= " OR googleplus IS NOT NULL OR googleplus <> ''";
-    $sql .= " OR youtube IS NOT NULL OR youtube <> ''";
-    $sql .= " OR whatsapp IS NOT NULL OR whatsapp <> ''";
-    //print $sql;
-    $resql = $db->query($sql);
-    if ($resql) {
-        while ($obj = $db->fetch_object($resql)) {
-            $arraysocialnetworks = array();
-            if (!empty($obj->skype)) {
-                $arraysocialnetworks['skype'] = $obj->skype;
-            }
-            if (!empty($obj->twitter)) {
-                $arraysocialnetworks['twitter'] = $obj->twitter;
-            }
-            if (!empty($obj->facebook)) {
-                $arraysocialnetworks['facebook'] = $obj->facebook;
-            }
-            if (!empty($obj->linkedin)) {
-                $arraysocialnetworks['linkedin'] = $obj->linkedin;
-            }
-            if (!empty($obj->instagram)) {
-                $arraysocialnetworks['instagram'] = $obj->instagram;
-            }
-            if (!empty($obj->snapchat)) {
-                $arraysocialnetworks['snapchat'] = $obj->snapchat;
-            }
-            if (!empty($obj->googleplus)) {
-                $arraysocialnetworks['googleplus'] = $obj->googleplus;
-            }
-            if (!empty($obj->youtube)) {
-                $arraysocialnetworks['youtube'] = $obj->youtube;
-            }
-            if (!empty($obj->whatsapp)) {
-                $arraysocialnetworks['whatsapp'] = $obj->whatsapp;
-            }
-            if ($obj->socialnetworks == '' || is_null($obj->socialnetworks)) {
-                $obj->socialnetworks = '[]';
-            }
-            $socialnetworks = array_merge($arraysocialnetworks, json_decode($obj->socialnetworks, true));
-            $sqlupd = 'UPDATE '.MAIN_DB_PREFIX."user SET socialnetworks='".$db->escape(json_encode($socialnetworks, true))."'";
-            $sqlupd .= ', skype=null';
-            $sqlupd .= ', twitter=null';
-            $sqlupd .= ', facebook=null';
-            $sqlupd .= ', linkedin=null';
-            $sqlupd .= ', instagram=null';
-            $sqlupd .= ', snapchat=null';
-            $sqlupd .= ', googleplus=null';
-            $sqlupd .= ', youtube=null';
-            $sqlupd .= ', whatsapp=null';
-            $sqlupd .= ' WHERE rowid='.$obj->rowid;
-            //print $sqlupd."<br>";
-            $resqlupd = $db->query($sqlupd);
-            if (!$resqlupd) {
-                dol_print_error($db);
-                $error++;
-            }
-        }
-    } else {
-        $error++;
-    }
-    if (!$error) {
-        $db->commit();
-    } else {
-        dol_print_error($db);
-        $db->rollback();
-    }
-    print '<b>'.$langs->trans('MigrationFieldsSocialNetworks', 'Users')."</b><br>\n";
-    print '</td></tr>';
+	global $db, $langs;
+	// skype,twitter,facebook,linkedin,instagram,snapchat,googleplus,youtube,whatsapp
+	$error = 0;
+	$db->begin();
+	print '<tr><td colspan="4">';
+	$sql = 'SELECT rowid, socialnetworks';
+	$sql .= ', skype, twitter, facebook, linkedin, instagram, snapchat, googleplus, youtube, whatsapp FROM '.MAIN_DB_PREFIX.'user WHERE';
+	$sql .= " skype IS NOT NULL OR skype <> ''";
+	$sql .= " OR twitter IS NOT NULL OR twitter <> ''";
+	$sql .= " OR facebook IS NOT NULL OR facebook <> ''";
+	$sql .= " OR linkedin IS NOT NULL OR linkedin <> ''";
+	$sql .= " OR instagram IS NOT NULL OR instagram <> ''";
+	$sql .= " OR snapchat IS NOT NULL OR snapchat <> ''";
+	$sql .= " OR googleplus IS NOT NULL OR googleplus <> ''";
+	$sql .= " OR youtube IS NOT NULL OR youtube <> ''";
+	$sql .= " OR whatsapp IS NOT NULL OR whatsapp <> ''";
+	//print $sql;
+	$resql = $db->query($sql);
+	if ($resql) {
+		while ($obj = $db->fetch_object($resql)) {
+			$arraysocialnetworks = array();
+			if (!empty($obj->skype)) {
+				$arraysocialnetworks['skype'] = $obj->skype;
+			}
+			if (!empty($obj->twitter)) {
+				$arraysocialnetworks['twitter'] = $obj->twitter;
+			}
+			if (!empty($obj->facebook)) {
+				$arraysocialnetworks['facebook'] = $obj->facebook;
+			}
+			if (!empty($obj->linkedin)) {
+				$arraysocialnetworks['linkedin'] = $obj->linkedin;
+			}
+			if (!empty($obj->instagram)) {
+				$arraysocialnetworks['instagram'] = $obj->instagram;
+			}
+			if (!empty($obj->snapchat)) {
+				$arraysocialnetworks['snapchat'] = $obj->snapchat;
+			}
+			if (!empty($obj->googleplus)) {
+				$arraysocialnetworks['googleplus'] = $obj->googleplus;
+			}
+			if (!empty($obj->youtube)) {
+				$arraysocialnetworks['youtube'] = $obj->youtube;
+			}
+			if (!empty($obj->whatsapp)) {
+				$arraysocialnetworks['whatsapp'] = $obj->whatsapp;
+			}
+			if ($obj->socialnetworks == '' || is_null($obj->socialnetworks)) {
+				$obj->socialnetworks = '[]';
+			}
+			$socialnetworks = array_merge($arraysocialnetworks, json_decode($obj->socialnetworks, true));
+			$sqlupd = 'UPDATE '.MAIN_DB_PREFIX."user SET socialnetworks='".$db->escape(json_encode($socialnetworks, true))."'";
+			$sqlupd .= ', skype=null';
+			$sqlupd .= ', twitter=null';
+			$sqlupd .= ', facebook=null';
+			$sqlupd .= ', linkedin=null';
+			$sqlupd .= ', instagram=null';
+			$sqlupd .= ', snapchat=null';
+			$sqlupd .= ', googleplus=null';
+			$sqlupd .= ', youtube=null';
+			$sqlupd .= ', whatsapp=null';
+			$sqlupd .= ' WHERE rowid='.$obj->rowid;
+			//print $sqlupd."<br>";
+			$resqlupd = $db->query($sqlupd);
+			if (!$resqlupd) {
+				dol_print_error($db);
+				$error++;
+			}
+		}
+	} else {
+		$error++;
+	}
+	if (!$error) {
+		$db->commit();
+	} else {
+		dol_print_error($db);
+		$db->rollback();
+	}
+	print '<b>'.$langs->trans('MigrationFieldsSocialNetworks', 'Users')."</b><br>\n";
+	print '</td></tr>';
 }
 
 /**
@@ -4763,88 +4763,88 @@ function migrate_users_socialnetworks()
  */
 function migrate_members_socialnetworks()
 {
-    global $db, $langs;
+	global $db, $langs;
 
-    print '<tr><td colspan="4">';
-    $error = 0;
-    $db->begin();
-    print '<tr><td colspan="4">';
-    $sql = 'SELECT rowid, socialnetworks';
-    $sql .= ', skype, twitter, facebook, linkedin, instagram, snapchat, googleplus, youtube, whatsapp FROM '.MAIN_DB_PREFIX.'adherent WHERE ';
-    $sql .= " skype IS NOT NULL OR skype <> ''";
-    $sql .= " OR twitter IS NOT NULL OR twitter <> ''";
-    $sql .= " OR facebook IS NOT NULL OR facebook <> ''";
-    $sql .= " OR linkedin IS NOT NULL OR linkedin <> ''";
-    $sql .= " OR instagram IS NOT NULL OR instagram <> ''";
-    $sql .= " OR snapchat IS NOT NULL OR snapchat <> ''";
-    $sql .= " OR googleplus IS NOT NULL OR googleplus <> ''";
-    $sql .= " OR youtube IS NOT NULL OR youtube <> ''";
-    $sql .= " OR whatsapp IS NOT NULL OR whatsapp <> ''";
-    //print $sql;
-    $resql = $db->query($sql);
-    if ($resql) {
-        while ($obj = $db->fetch_object($resql)) {
-            $arraysocialnetworks = array();
-            if (!empty($obj->skype)) {
-                $arraysocialnetworks['skype'] = $obj->skype;
-            }
-            if (!empty($obj->twitter)) {
-                $arraysocialnetworks['twitter'] = $obj->twitter;
-            }
-            if (!empty($obj->facebook)) {
-                $arraysocialnetworks['facebook'] = $obj->facebook;
-            }
-            if (!empty($obj->linkedin)) {
-                $arraysocialnetworks['linkedin'] = $obj->linkedin;
-            }
-            if (!empty($obj->instagram)) {
-                $arraysocialnetworks['instagram'] = $obj->instagram;
-            }
-            if (!empty($obj->snapchat)) {
-                $arraysocialnetworks['snapchat'] = $obj->snapchat;
-            }
-            if (!empty($obj->googleplus)) {
-                $arraysocialnetworks['googleplus'] = $obj->googleplus;
-            }
-            if (!empty($obj->youtube)) {
-                $arraysocialnetworks['youtube'] = $obj->youtube;
-            }
-            if (!empty($obj->whatsapp)) {
-                $arraysocialnetworks['whatsapp'] = $obj->whatsapp;
-            }
-            if ($obj->socialnetworks == '' || is_null($obj->socialnetworks)) {
-                $obj->socialnetworks = '[]';
-            }
-            $socialnetworks = array_merge($arraysocialnetworks, json_decode($obj->socialnetworks, true));
-            $sqlupd = 'UPDATE '.MAIN_DB_PREFIX."adherent SET socialnetworks='".$db->escape(json_encode($socialnetworks, true))."'";
-            $sqlupd .= ', skype=null';
-            $sqlupd .= ', twitter=null';
-            $sqlupd .= ', facebook=null';
-            $sqlupd .= ', linkedin=null';
-            $sqlupd .= ', instagram=null';
-            $sqlupd .= ', snapchat=null';
-            $sqlupd .= ', googleplus=null';
-            $sqlupd .= ', youtube=null';
-            $sqlupd .= ', whatsapp=null';
-            $sqlupd .= ' WHERE rowid='.$obj->rowid;
-            //print $sqlupd."<br>";
-            $resqlupd = $db->query($sqlupd);
-            if (!$resqlupd) {
-                dol_print_error($db);
-                $error++;
-            }
-        }
-    } else {
-        $error++;
-    }
-    if (!$error) {
-        $db->commit();
-    } else {
-        dol_print_error($db);
-        $db->rollback();
-    }
-    print '<b>'.$langs->trans('MigrationFieldsSocialNetworks', 'Members')."</b><br>\n";
-    print '</td></tr>';
+	print '<tr><td colspan="4">';
+	$error = 0;
+	$db->begin();
+	print '<tr><td colspan="4">';
+	$sql = 'SELECT rowid, socialnetworks';
+	$sql .= ', skype, twitter, facebook, linkedin, instagram, snapchat, googleplus, youtube, whatsapp FROM '.MAIN_DB_PREFIX.'adherent WHERE ';
+	$sql .= " skype IS NOT NULL OR skype <> ''";
+	$sql .= " OR twitter IS NOT NULL OR twitter <> ''";
+	$sql .= " OR facebook IS NOT NULL OR facebook <> ''";
+	$sql .= " OR linkedin IS NOT NULL OR linkedin <> ''";
+	$sql .= " OR instagram IS NOT NULL OR instagram <> ''";
+	$sql .= " OR snapchat IS NOT NULL OR snapchat <> ''";
+	$sql .= " OR googleplus IS NOT NULL OR googleplus <> ''";
+	$sql .= " OR youtube IS NOT NULL OR youtube <> ''";
+	$sql .= " OR whatsapp IS NOT NULL OR whatsapp <> ''";
+	//print $sql;
+	$resql = $db->query($sql);
+	if ($resql) {
+		while ($obj = $db->fetch_object($resql)) {
+			$arraysocialnetworks = array();
+			if (!empty($obj->skype)) {
+				$arraysocialnetworks['skype'] = $obj->skype;
+			}
+			if (!empty($obj->twitter)) {
+				$arraysocialnetworks['twitter'] = $obj->twitter;
+			}
+			if (!empty($obj->facebook)) {
+				$arraysocialnetworks['facebook'] = $obj->facebook;
+			}
+			if (!empty($obj->linkedin)) {
+				$arraysocialnetworks['linkedin'] = $obj->linkedin;
+			}
+			if (!empty($obj->instagram)) {
+				$arraysocialnetworks['instagram'] = $obj->instagram;
+			}
+			if (!empty($obj->snapchat)) {
+				$arraysocialnetworks['snapchat'] = $obj->snapchat;
+			}
+			if (!empty($obj->googleplus)) {
+				$arraysocialnetworks['googleplus'] = $obj->googleplus;
+			}
+			if (!empty($obj->youtube)) {
+				$arraysocialnetworks['youtube'] = $obj->youtube;
+			}
+			if (!empty($obj->whatsapp)) {
+				$arraysocialnetworks['whatsapp'] = $obj->whatsapp;
+			}
+			if ($obj->socialnetworks == '' || is_null($obj->socialnetworks)) {
+				$obj->socialnetworks = '[]';
+			}
+			$socialnetworks = array_merge($arraysocialnetworks, json_decode($obj->socialnetworks, true));
+			$sqlupd = 'UPDATE '.MAIN_DB_PREFIX."adherent SET socialnetworks='".$db->escape(json_encode($socialnetworks, true))."'";
+			$sqlupd .= ', skype=null';
+			$sqlupd .= ', twitter=null';
+			$sqlupd .= ', facebook=null';
+			$sqlupd .= ', linkedin=null';
+			$sqlupd .= ', instagram=null';
+			$sqlupd .= ', snapchat=null';
+			$sqlupd .= ', googleplus=null';
+			$sqlupd .= ', youtube=null';
+			$sqlupd .= ', whatsapp=null';
+			$sqlupd .= ' WHERE rowid='.$obj->rowid;
+			//print $sqlupd."<br>";
+			$resqlupd = $db->query($sqlupd);
+			if (!$resqlupd) {
+				dol_print_error($db);
+				$error++;
+			}
+		}
+	} else {
+		$error++;
+	}
+	if (!$error) {
+		$db->commit();
+	} else {
+		dol_print_error($db);
+		$db->rollback();
+	}
+	print '<b>'.$langs->trans('MigrationFieldsSocialNetworks', 'Members')."</b><br>\n";
+	print '</td></tr>';
 }
 
 /**
@@ -4854,92 +4854,92 @@ function migrate_members_socialnetworks()
  */
 function migrate_contacts_socialnetworks()
 {
-    global $db, $langs;
-    // jabberid,skype,twitter,facebook,linkedin,instagram,snapchat,googleplus,youtube,whatsapp
-    $error = 0;
-    $db->begin();
-    print '<tr><td colspan="4">';
-    $sql = 'SELECT rowid, socialnetworks';
-    $sql .= ', jabberid, skype, twitter, facebook, linkedin, instagram, snapchat, googleplus, youtube, whatsapp FROM '.MAIN_DB_PREFIX.'socpeople WHERE ';
-    $sql .= " jabberid IS NOT NULL OR jabberid <> ''";
-    $sql .= " OR skype IS NOT NULL OR skype <> ''";
-    $sql .= " OR twitter IS NOT NULL OR twitter <> ''";
-    $sql .= " OR facebook IS NOT NULL OR facebook <> ''";
-    $sql .= " OR linkedin IS NOT NULL OR linkedin <> ''";
-    $sql .= " OR instagram IS NOT NULL OR instagram <> ''";
-    $sql .= " OR snapchat IS NOT NULL OR snapchat <> ''";
-    $sql .= " OR googleplus IS NOT NULL OR googleplus <> ''";
-    $sql .= " OR youtube IS NOT NULL OR youtube <> ''";
-    $sql .= " OR whatsapp IS NOT NULL OR whatsapp <> ''";
-    //print $sql;
-    $resql = $db->query($sql);
-    if ($resql) {
-        while ($obj = $db->fetch_object($resql)) {
-            $arraysocialnetworks = array();
-            if (!empty($obj->jabberid)) {
-                $arraysocialnetworks['jabber'] = $obj->jabberid;
-            }
-            if (!empty($obj->skype)) {
-                $arraysocialnetworks['skype'] = $obj->skype;
-            }
-            if (!empty($obj->twitter)) {
-                $arraysocialnetworks['twitter'] = $obj->twitter;
-            }
-            if (!empty($obj->facebook)) {
-                $arraysocialnetworks['facebook'] = $obj->facebook;
-            }
-            if (!empty($obj->linkedin)) {
-                $arraysocialnetworks['linkedin'] = $obj->linkedin;
-            }
-            if (!empty($obj->instagram)) {
-                $arraysocialnetworks['instagram'] = $obj->instagram;
-            }
-            if (!empty($obj->snapchat)) {
-                $arraysocialnetworks['snapchat'] = $obj->snapchat;
-            }
-            if (!empty($obj->googleplus)) {
-                $arraysocialnetworks['googleplus'] = $obj->googleplus;
-            }
-            if (!empty($obj->youtube)) {
-                $arraysocialnetworks['youtube'] = $obj->youtube;
-            }
-            if (!empty($obj->whatsapp)) {
-                $arraysocialnetworks['whatsapp'] = $obj->whatsapp;
-            }
-            if ($obj->socialnetworks == '' || is_null($obj->socialnetworks)) {
-                $obj->socialnetworks = '[]';
-            }
-            $socialnetworks = array_merge($arraysocialnetworks, json_decode($obj->socialnetworks, true));
-            $sqlupd = 'UPDATE '.MAIN_DB_PREFIX."socpeople SET socialnetworks='".$db->escape(json_encode($socialnetworks, true))."'";
-            $sqlupd .= ', jabberid=null';
-            $sqlupd .= ', skype=null';
-            $sqlupd .= ', twitter=null';
-            $sqlupd .= ', facebook=null';
-            $sqlupd .= ', linkedin=null';
-            $sqlupd .= ', instagram=null';
-            $sqlupd .= ', snapchat=null';
-            $sqlupd .= ', googleplus=null';
-            $sqlupd .= ', youtube=null';
-            $sqlupd .= ', whatsapp=null';
-            $sqlupd .= ' WHERE rowid='.$obj->rowid;
-            //print $sqlupd."<br>";
-            $resqlupd = $db->query($sqlupd);
-            if (!$resqlupd) {
-                dol_print_error($db);
-                $error++;
-            }
-        }
-    } else {
-        $error++;
-    }
-    if (!$error) {
-        $db->commit();
-    } else {
-        dol_print_error($db);
-        $db->rollback();
-    }
-    print '<b>'.$langs->trans('MigrationFieldsSocialNetworks', 'Contacts')."</b><br>\n";
-    print '</td></tr>';
+	global $db, $langs;
+	// jabberid,skype,twitter,facebook,linkedin,instagram,snapchat,googleplus,youtube,whatsapp
+	$error = 0;
+	$db->begin();
+	print '<tr><td colspan="4">';
+	$sql = 'SELECT rowid, socialnetworks';
+	$sql .= ', jabberid, skype, twitter, facebook, linkedin, instagram, snapchat, googleplus, youtube, whatsapp FROM '.MAIN_DB_PREFIX.'socpeople WHERE ';
+	$sql .= " jabberid IS NOT NULL OR jabberid <> ''";
+	$sql .= " OR skype IS NOT NULL OR skype <> ''";
+	$sql .= " OR twitter IS NOT NULL OR twitter <> ''";
+	$sql .= " OR facebook IS NOT NULL OR facebook <> ''";
+	$sql .= " OR linkedin IS NOT NULL OR linkedin <> ''";
+	$sql .= " OR instagram IS NOT NULL OR instagram <> ''";
+	$sql .= " OR snapchat IS NOT NULL OR snapchat <> ''";
+	$sql .= " OR googleplus IS NOT NULL OR googleplus <> ''";
+	$sql .= " OR youtube IS NOT NULL OR youtube <> ''";
+	$sql .= " OR whatsapp IS NOT NULL OR whatsapp <> ''";
+	//print $sql;
+	$resql = $db->query($sql);
+	if ($resql) {
+		while ($obj = $db->fetch_object($resql)) {
+			$arraysocialnetworks = array();
+			if (!empty($obj->jabberid)) {
+				$arraysocialnetworks['jabber'] = $obj->jabberid;
+			}
+			if (!empty($obj->skype)) {
+				$arraysocialnetworks['skype'] = $obj->skype;
+			}
+			if (!empty($obj->twitter)) {
+				$arraysocialnetworks['twitter'] = $obj->twitter;
+			}
+			if (!empty($obj->facebook)) {
+				$arraysocialnetworks['facebook'] = $obj->facebook;
+			}
+			if (!empty($obj->linkedin)) {
+				$arraysocialnetworks['linkedin'] = $obj->linkedin;
+			}
+			if (!empty($obj->instagram)) {
+				$arraysocialnetworks['instagram'] = $obj->instagram;
+			}
+			if (!empty($obj->snapchat)) {
+				$arraysocialnetworks['snapchat'] = $obj->snapchat;
+			}
+			if (!empty($obj->googleplus)) {
+				$arraysocialnetworks['googleplus'] = $obj->googleplus;
+			}
+			if (!empty($obj->youtube)) {
+				$arraysocialnetworks['youtube'] = $obj->youtube;
+			}
+			if (!empty($obj->whatsapp)) {
+				$arraysocialnetworks['whatsapp'] = $obj->whatsapp;
+			}
+			if ($obj->socialnetworks == '' || is_null($obj->socialnetworks)) {
+				$obj->socialnetworks = '[]';
+			}
+			$socialnetworks = array_merge($arraysocialnetworks, json_decode($obj->socialnetworks, true));
+			$sqlupd = 'UPDATE '.MAIN_DB_PREFIX."socpeople SET socialnetworks='".$db->escape(json_encode($socialnetworks, true))."'";
+			$sqlupd .= ', jabberid=null';
+			$sqlupd .= ', skype=null';
+			$sqlupd .= ', twitter=null';
+			$sqlupd .= ', facebook=null';
+			$sqlupd .= ', linkedin=null';
+			$sqlupd .= ', instagram=null';
+			$sqlupd .= ', snapchat=null';
+			$sqlupd .= ', googleplus=null';
+			$sqlupd .= ', youtube=null';
+			$sqlupd .= ', whatsapp=null';
+			$sqlupd .= ' WHERE rowid='.$obj->rowid;
+			//print $sqlupd."<br>";
+			$resqlupd = $db->query($sqlupd);
+			if (!$resqlupd) {
+				dol_print_error($db);
+				$error++;
+			}
+		}
+	} else {
+		$error++;
+	}
+	if (!$error) {
+		$db->commit();
+	} else {
+		dol_print_error($db);
+		$db->rollback();
+	}
+	print '<b>'.$langs->trans('MigrationFieldsSocialNetworks', 'Contacts')."</b><br>\n";
+	print '</td></tr>';
 }
 
 /**
@@ -4949,85 +4949,85 @@ function migrate_contacts_socialnetworks()
  */
 function migrate_thirdparties_socialnetworks()
 {
-    global $db, $langs;
-    // skype,twitter,facebook,linkedin,instagram,snapchat,googleplus,youtube,whatsapp
-    $error = 0;
-    $db->begin();
-    print '<tr><td colspan="4">';
-    $sql = 'SELECT rowid, socialnetworks';
-    $sql .= ', skype, twitter, facebook, linkedin, instagram, snapchat, googleplus, youtube, whatsapp FROM '.MAIN_DB_PREFIX.'societe WHERE ';
-    $sql .= " skype IS NOT NULL OR skype <> ''";
-    $sql .= " OR twitter IS NOT NULL OR twitter <> ''";
-    $sql .= " OR facebook IS NOT NULL OR facebook <> ''";
-    $sql .= " OR linkedin IS NOT NULL OR linkedin <> ''";
-    $sql .= " OR instagram IS NOT NULL OR instagram <> ''";
-    $sql .= " OR snapchat IS NOT NULL OR snapchat <> ''";
-    $sql .= " OR googleplus IS NOT NULL OR googleplus <> ''";
-    $sql .= " OR youtube IS NOT NULL OR youtube <> ''";
-    $sql .= " OR whatsapp IS NOT NULL OR whatsapp <> ''";
-    //print $sql;
-    $resql = $db->query($sql);
-    if ($resql) {
-        while ($obj = $db->fetch_object($resql)) {
-            $arraysocialnetworks = array();
-            if (!empty($obj->skype)) {
-                $arraysocialnetworks['skype'] = $obj->skype;
-            }
-            if (!empty($obj->twitter)) {
-                $arraysocialnetworks['twitter'] = $obj->twitter;
-            }
-            if (!empty($obj->facebook)) {
-                $arraysocialnetworks['facebook'] = $obj->facebook;
-            }
-            if (!empty($obj->linkedin)) {
-                $arraysocialnetworks['linkedin'] = $obj->linkedin;
-            }
-            if (!empty($obj->instagram)) {
-                $arraysocialnetworks['instagram'] = $obj->instagram;
-            }
-            if (!empty($obj->snapchat)) {
-                $arraysocialnetworks['snapchat'] = $obj->snapchat;
-            }
-            if (!empty($obj->googleplus)) {
-                $arraysocialnetworks['googleplus'] = $obj->googleplus;
-            }
-            if (!empty($obj->youtube)) {
-                $arraysocialnetworks['youtube'] = $obj->youtube;
-            }
-            if (!empty($obj->whatsapp)) {
-                $arraysocialnetworks['whatsapp'] = $obj->whatsapp;
-            }
-            if ($obj->socialnetworks == '' || is_null($obj->socialnetworks)) {
-                $obj->socialnetworks = '[]';
-            }
-            $socialnetworks = array_merge($arraysocialnetworks, json_decode($obj->socialnetworks, true));
-            $sqlupd = 'UPDATE '.MAIN_DB_PREFIX."societe SET socialnetworks='".$db->escape(json_encode($socialnetworks, true))."'";
-            $sqlupd .= ', skype=null';
-            $sqlupd .= ', twitter=null';
-            $sqlupd .= ', facebook=null';
-            $sqlupd .= ', linkedin=null';
-            $sqlupd .= ', instagram=null';
-            $sqlupd .= ', snapchat=null';
-            $sqlupd .= ', googleplus=null';
-            $sqlupd .= ', youtube=null';
-            $sqlupd .= ', whatsapp=null';
-            $sqlupd .= ' WHERE rowid='.$obj->rowid;
-            //print $sqlupd."<br>";
-            $resqlupd = $db->query($sqlupd);
-            if (!$resqlupd) {
-                dol_print_error($db);
-                $error++;
-            }
-        }
-    } else {
-        $error++;
-    }
-    if (!$error) {
-        $db->commit();
-    } else {
-        dol_print_error($db);
-        $db->rollback();
-    }
-    print '<b>'.$langs->trans('MigrationFieldsSocialNetworks', 'Thirdparties')."</b><br>\n";
-    print '</td></tr>';
+	global $db, $langs;
+	// skype,twitter,facebook,linkedin,instagram,snapchat,googleplus,youtube,whatsapp
+	$error = 0;
+	$db->begin();
+	print '<tr><td colspan="4">';
+	$sql = 'SELECT rowid, socialnetworks';
+	$sql .= ', skype, twitter, facebook, linkedin, instagram, snapchat, googleplus, youtube, whatsapp FROM '.MAIN_DB_PREFIX.'societe WHERE ';
+	$sql .= " skype IS NOT NULL OR skype <> ''";
+	$sql .= " OR twitter IS NOT NULL OR twitter <> ''";
+	$sql .= " OR facebook IS NOT NULL OR facebook <> ''";
+	$sql .= " OR linkedin IS NOT NULL OR linkedin <> ''";
+	$sql .= " OR instagram IS NOT NULL OR instagram <> ''";
+	$sql .= " OR snapchat IS NOT NULL OR snapchat <> ''";
+	$sql .= " OR googleplus IS NOT NULL OR googleplus <> ''";
+	$sql .= " OR youtube IS NOT NULL OR youtube <> ''";
+	$sql .= " OR whatsapp IS NOT NULL OR whatsapp <> ''";
+	//print $sql;
+	$resql = $db->query($sql);
+	if ($resql) {
+		while ($obj = $db->fetch_object($resql)) {
+			$arraysocialnetworks = array();
+			if (!empty($obj->skype)) {
+				$arraysocialnetworks['skype'] = $obj->skype;
+			}
+			if (!empty($obj->twitter)) {
+				$arraysocialnetworks['twitter'] = $obj->twitter;
+			}
+			if (!empty($obj->facebook)) {
+				$arraysocialnetworks['facebook'] = $obj->facebook;
+			}
+			if (!empty($obj->linkedin)) {
+				$arraysocialnetworks['linkedin'] = $obj->linkedin;
+			}
+			if (!empty($obj->instagram)) {
+				$arraysocialnetworks['instagram'] = $obj->instagram;
+			}
+			if (!empty($obj->snapchat)) {
+				$arraysocialnetworks['snapchat'] = $obj->snapchat;
+			}
+			if (!empty($obj->googleplus)) {
+				$arraysocialnetworks['googleplus'] = $obj->googleplus;
+			}
+			if (!empty($obj->youtube)) {
+				$arraysocialnetworks['youtube'] = $obj->youtube;
+			}
+			if (!empty($obj->whatsapp)) {
+				$arraysocialnetworks['whatsapp'] = $obj->whatsapp;
+			}
+			if ($obj->socialnetworks == '' || is_null($obj->socialnetworks)) {
+				$obj->socialnetworks = '[]';
+			}
+			$socialnetworks = array_merge($arraysocialnetworks, json_decode($obj->socialnetworks, true));
+			$sqlupd = 'UPDATE '.MAIN_DB_PREFIX."societe SET socialnetworks='".$db->escape(json_encode($socialnetworks, true))."'";
+			$sqlupd .= ', skype=null';
+			$sqlupd .= ', twitter=null';
+			$sqlupd .= ', facebook=null';
+			$sqlupd .= ', linkedin=null';
+			$sqlupd .= ', instagram=null';
+			$sqlupd .= ', snapchat=null';
+			$sqlupd .= ', googleplus=null';
+			$sqlupd .= ', youtube=null';
+			$sqlupd .= ', whatsapp=null';
+			$sqlupd .= ' WHERE rowid='.$obj->rowid;
+			//print $sqlupd."<br>";
+			$resqlupd = $db->query($sqlupd);
+			if (!$resqlupd) {
+				dol_print_error($db);
+				$error++;
+			}
+		}
+	} else {
+		$error++;
+	}
+	if (!$error) {
+		$db->commit();
+	} else {
+		dol_print_error($db);
+		$db->rollback();
+	}
+	print '<b>'.$langs->trans('MigrationFieldsSocialNetworks', 'Thirdparties')."</b><br>\n";
+	print '</td></tr>';
 }
diff --git a/htdocs/intracommreport/admin/index.html b/htdocs/intracommreport/admin/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/intracommreport/admin/intracommreport.php b/htdocs/intracommreport/admin/intracommreport.php
new file mode 100644
index 00000000000..9947e844e40
--- /dev/null
+++ b/htdocs/intracommreport/admin/intracommreport.php
@@ -0,0 +1,208 @@
+<?php
+/* Copyright (C) 2015      ATM Consulting       <support@atm-consulting.fr>
+ * Copyright (C) 2019-2020 Open-DSI             <support@open-dsi.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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file		htdocs/admin/intracommreport.php
+ *      \ingroup	intracommreport
+ *      \brief		Page to setup the module intracomm report
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/intracommreport.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("admin", "intracommreport"));
+
+if (!$user->admin) accessforbidden();
+
+$action = GETPOST('action', 'aZ09');
+
+// Parameters INTRACOMMREPORT_* and others
+$list_DEB = array(
+	'INTRACOMMREPORT_NUM_AGREMENT',
+);
+
+$list_DES = array(
+	'INTRACOMMREPORT_NUM_DECLARATION',
+);
+
+if ($action == 'update') {
+	$error = 0;
+
+	if (!$error)
+	{
+		foreach ($list_DEB as $constname)
+		{
+			$constvalue = GETPOST($constname, 'alpha');
+
+			if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+				$error++;
+			}
+		}
+
+		foreach ($list_DES as $constname)
+		{
+			$constvalue = GETPOST($constname, 'alpha');
+
+			if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+				$error++;
+			}
+		}
+
+		dolibarr_set_const($db, "INTRACOMMREPORT_TYPE_ACTEUR", GETPOST("INTRACOMMREPORT_TYPE_ACTEUR", 'alpha'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "INTRACOMMREPORT_ROLE_ACTEUR", GETPOST("INTRACOMMREPORT_ROLE_ACTEUR", 'alpha'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION", GETPOST("INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION", 'alpha'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION", GETPOST("INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION", 'alpha'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "INTRACOMMREPORT_CATEG_FRAISDEPORT", GETPOST("INTRACOMMREPORT_CATEG_FRAISDEPORT", 'alpha'), 'chaine', 0, '', $conf->entity);
+
+		if ($error) {
+			setEventMessages($langs->trans("Error"), null, 'errors');
+		}
+	}
+
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	}
+}
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$formother = new FormOther($db);
+
+llxHeader('', $langs->trans("IntracommReportSetup"));
+
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("IntracommReportSetup"), $linkback, 'title_setup');
+
+$head = intracommReportAdminPrepareHead();
+
+print dol_get_fiche_head($head, 'general', $langs->trans("IntracommReport"), -1, "intracommreport");
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update">';
+
+print load_fiche_titre($langs->trans("Parameters").' (DEB)');
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Description").'</td>';
+print '<td>'.$langs->trans("Value").'</td>';
+print '</tr>';
+
+foreach ($list_DEB as $key)
+{
+	print '<tr class="oddeven value">';
+
+	// Param
+	$label = $langs->trans($key);
+	print '<td>'.$label.'</td>';
+	// Value
+	print '<td class="left">';
+	print '<input type="text" class="maxwidth100" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
+	print '</td>';
+
+	print '</tr>';
+}
+
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("INTRACOMMREPORT_TYPE_ACTEUR").'</td>';
+$arraychoices = array(''=>$langs->trans("None"), 'PSI'=>'Déclarant pour son compte', 'TDP'=>'Tiers déclarant');
+print '<td>';
+print $form->selectarray('INTRACOMMREPORT_TYPE_ACTEUR', $arraychoices, $conf->global->INTRACOMMREPORT_TYPE_ACTEUR, 0);
+print '</td>';
+print "</tr>\n";
+
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("INTRACOMMREPORT_ROLE_ACTEUR").'</td>';
+$arraychoices = array(''=>$langs->trans("None"), 'sender'=>'Emetteur', 'PSI'=>'Déclarant');
+print '<td>';
+print $form->selectarray('INTRACOMMREPORT_ROLE_ACTEUR', $arraychoices, $conf->global->INTRACOMMREPORT_ROLE_ACTEUR, 0);
+print '</td>';
+print "</tr>\n";
+
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION").'</td>';
+$arraychoices = array(1=>'Seuil de 460 000 €', 2=>'En dessous de 460 000 €');
+print '<td>';
+print $form->selectarray('INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION', $arraychoices, $conf->global->INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION, 0);
+print '</td>';
+print "</tr>\n";
+
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION").'</td>';
+$arraychoices = array(3=>'Seuil de 460 000 €', 4=>'En dessous de 460 000 €');
+print '<td>';
+print $form->selectarray('INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION', $arraychoices, $conf->global->INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION, 0);
+print '</td>';
+print "</tr>\n";
+
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("INTRACOMMREPORT_CATEG_FRAISDEPORT").'</td>';
+$arraychoices = array(3=>'Seuil de 460 000 €', 4=>'En dessous de 460 000 €');
+print '<td>';
+print $formother->select_categories(0, $conf->global->INTRACOMMREPORT_CATEG_FRAISDEPORT, 'INTRACOMMREPORT_CATEG_FRAISDEPORT');
+print '</td>';
+print "</tr>\n";
+
+print '</table>';
+
+
+print load_fiche_titre($langs->trans("Parameters").' (DES)');
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Description").'</td>';
+print '<td>'.$langs->trans("Value").'</td>';
+print '</tr>';
+
+foreach ($list_DES as $key)
+{
+	print '<tr class="oddeven value">';
+
+	// Param
+	$label = $langs->trans($key);
+	print '<td>'.$label.'</td>';
+	// Value
+	print '<td class="left">';
+	print '<input type="text" class="maxwidth100" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
+	print '</td>';
+
+	print '</tr>';
+}
+
+print '</table>';
+
+print '<div class="tabsAction">';
+print '<div class="inline-block divButAction">';
+print '<input type="submit" name="bt_save" class="butAction button-save" value="'.$langs->trans("Save").'" />';
+print '</div>';
+print '</div>';
+
+print '</form>';
+
+print dol_get_fiche_end();
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/intracommreport/card.php b/htdocs/intracommreport/card.php
new file mode 100644
index 00000000000..f0a4bd5f070
--- /dev/null
+++ b/htdocs/intracommreport/card.php
@@ -0,0 +1,333 @@
+<?php
+/* Copyright (C) 2015       ATM Consulting          <support@atm-consulting.fr>
+ * Copyright (C) 2019-2020  Open-DSI                <support@open-dsi.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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/intracommreport/card.php
+ *	\ingroup    Intracomm report
+ *	\brief      Page to manage intracomm report export
+ */
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/intracommreport/class/intracommreport.class.php';
+
+$langs->loadLangs(array("intracommreport"));
+
+$action = GETPOST('action');
+$exporttype = GETPOST('exporttype'); // DEB ou DES
+if (empty($exporttype)) {
+	$exporttype = 'deb';
+}
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$year = GETPOST('year');
+$month = GETPOST('month');
+$label = (string) GETPOST('label', 'alphanohtml');
+$type_declaration = GETPOSTINT('type');
+$backtopage = GETPOST('backtopage', 'alpha');
+$declaration = array(
+	"deb" => $langs->trans("DEB"),
+	"des" => $langs->trans("DES"),
+);
+
+/*
+ * 	Actions
+ */
+
+if ($user->rights->intracommreport->delete && $action == 'confirm_delete' && $confirm == 'yes') {
+	$result = $object->delete($id, $user);
+	if ($result > 0) {
+		if (!empty($backtopage)) {
+			header("Location: ".$backtopage);
+			exit;
+		} else {
+			header("Location: list.php");
+			exit;
+		}
+	} else {
+		$errmesg = $object->error;
+	}
+}
+
+if ($action == 'add' && $user->rights->intracommreport->write) {
+	$object->label = trim($label);
+	$object->type = trim($exporttype);
+	$object->type_declaration =  $type_declaration;
+	$object->subscription = (int) $subscription;
+
+	// Fill array 'array_options' with data from add form
+	$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
+	if ($ret < 0) {
+		$error++;
+	}
+
+	if (empty($object->label)) {
+		$error++;
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
+	} else {
+		$sql = "SELECT libelle FROM ".MAIN_DB_PREFIX."adherent_type WHERE libelle='".$db->escape($object->label)."'";
+		$result = $db->query($sql);
+		if ($result) {
+			$num = $db->num_rows($result);
+		}
+		if ($num) {
+			$error++;
+			$langs->load("errors");
+			setEventMessages($langs->trans("ErrorLabelAlreadyExists", $login), null, 'errors');
+		}
+	}
+
+	if (!$error) {
+		$id = $object->create($user);
+		if ($id > 0) {
+			header("Location: ".$_SERVER["PHP_SELF"]);
+			exit;
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action = 'create';
+		}
+	} else {
+		$action = 'create';
+	}
+}
+
+/*
+ * View
+ */
+
+// Creation mode
+if ($action == 'create') {
+	$title = $langs->trans("IntracommReportTitle");
+	llxHeader("", $title);
+	print load_fiche_titre($langs->trans("IntracommReportTitle"));
+
+	print '<form name="charge" method="post" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="add" />';
+
+	print dol_get_fiche_head();
+
+	print '<table class="border" width="100%">';
+
+	// Label
+	print '<tr><td class="titlefieldcreate">'.$langs->trans("Label").'</td><td><input type="text" class="minwidth200" name="label" autofocus="autofocus"></td></tr>';
+
+	// Declaration
+	print '<tr><td class="fieldrequired">'.$langs->trans("Declaration")."</td><td>\n";
+	print $form->selectarray("declaration", $declaration, GETPOST('declaration', 'alpha') ? GETPOST('declaration', 'alpha') : $object->declaration, 0);
+	print "</td>\n";
+
+	// Analysis period
+	print '<tr>';
+	print '<td class="titlefieldcreate fieldrequired">';
+	print $langs->trans("AnalysisPeriod");
+	print '</td>';
+	print '<td>';
+	print $formother->select_month($month ? date('M') : $month, 'month', 0, 1, 'widthauto valignmiddle ');
+	print $formother->select_year($year ? date('Y') : $year, 'year', 0, 3, 3);
+	print '</td>';
+	print '</tr>';
+
+	// Type of declaration
+	$typeOfDeclaration["introduction"] = $langs->trans("Introduction");
+	$typeOfDeclaration["expedition"] = $langs->trans("Expedition");
+	print '<tr><td class="fieldrequired">'.$langs->trans("TypeOfDeclaration")."</td><td>\n";
+	print $form->selectarray("type_declaration", $typeOfDeclaration, GETPOST('type_declaration', 'alpha') ?GETPOST('type_declaration', 'alpha') : $object->type_declaration, 0);
+	print "</td>\n";
+
+	print '</table>';
+
+	print dol_get_fiche_end();
+
+	print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+	print '</div>';
+
+	print '</form>';
+}
+
+if ($id > 0 && $action != 'edit') {
+	/* ************************************************************************** */
+	/*                                                                            */
+	/* View mode                                                                  */
+	/*                                                                            */
+	/* ************************************************************************** */
+	$res = $object->fetch($id);
+	if ($res < 0) {
+		dol_print_error($db, $object->error);
+		exit;
+	}
+
+	/*
+	 * Show tabs
+	 */
+	$head = intracommreport_prepare_head($object);
+
+	print dol_get_fiche_head($head, 'general', $langs->trans("IntracommReport"), -1, 'user');
+
+	// Confirm remove report
+	if ($action == 'delete') {
+		$formquestion = array();
+		if ($backtopage) {
+			$formquestion[] = array(
+				'type' => 'hidden',
+				'name' => 'backtopage',
+				'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"])
+			);
+		}
+		print $form->formconfirm(
+			"card.php?rowid=".$id,
+			$langs->trans("DeleteReport"),
+			$langs->trans("ConfirmDeleteReport"),
+			"confirm_delete",
+			$formquestion,
+			'no',
+			1
+		);
+	}
+
+	$linkback = '<a href="'.DOL_URL_ROOT.'/intracommreport/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
+	dol_banner_tab($object, 'rowid', $linkback);
+
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border tableforfield centpercent">';
+
+	// Type
+	print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td class="valeur">'.$object->declaration."</td></tr>\n";
+
+	// Analysis Period
+	print '<tr><td>'.$langs->trans("AnalysisPeriod").'</td><td class="valeur">'.$object->period.'</td>';
+	print '</tr>';
+
+	// Type of Declaration
+	print '<tr><td>'.$langs->trans("TypeOfDeclaration").'</td><td class="valeur">'.$object->type_declaration.'</td>';
+	print '</tr>';
+
+	print "</table>\n";
+
+	print "</div></div></div>\n";
+	print '<div style="clear:both"></div>';
+
+	print dol_get_fiche_end();
+}
+
+	/*
+	switch($action) {
+		case 'generateXML':
+			$obj = new TDebProdouane($PDOdb);
+			$obj->load($PDOdb, GETPOST('id_declaration'));
+			$obj->generateXMLFile();
+			break;
+		case 'list':
+			_liste($exporttype);
+			break;
+		case 'export':
+			if ($exporttype == 'deb') _export_xml_deb($type_declaration, $year, str_pad($month, 2, 0, STR_PAD_LEFT));
+			else _export_xml_des($type_declaration, $year, str_pad($month, 2, 0, STR_PAD_LEFT));
+		default:
+			if ($exporttype == 'deb') _print_form_deb();
+			else _print_form_des();
+			break;
+	}
+
+	function _print_form_des()
+	{
+		global $langs, $formother, $year, $month, $type_declaration;
+
+		$title = $langs->trans("IntracommReportDESTitle");
+		llxHeader("", $title);
+		print load_fiche_titre($langs->trans("IntracommReportDESTitle"));
+
+		print dol_get_fiche_head();
+
+		print '<form action="'.$_SERVER['PHP_SELF'].'" name="save" method="POST">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="action" value="export" />';
+		print '<input type="hidden" name="exporttype" value="des" />';
+		print '<input type="hidden" name="type" value="expedition" />'; // Permet d'utiliser le bon select de la requête sql
+
+		print '<table width="100%" class="noborder">';
+
+		print '<tr class="liste_titre"><td colspan="2">';
+		print 'Paramètres de l\'export';
+		print '</td></tr>';
+
+		print '<tr>';
+		print '<td>Période d\'analyse</td>';
+		print '<td>';
+		$TabMonth = array();
+		for($i=1;$i<=12;$i++) $TabMonth[$i] = $langs->trans('Month'.str_pad($i, 2, 0, STR_PAD_LEFT));
+		//print $ATMform->combo('','month', $TabMonth, empty($month) ? date('m') : $month);
+		print $formother->selectyear(empty($year) ? date('Y') : $year,'year',0, 20, 5);
+		print '</td>';
+		print '</tr>';
+
+		print '</table>';
+
+		print '<div class="tabsAction">';
+		print '<input class="butAction" type="submit" value="Exporter XML" />';
+		print '</div>';
+
+		print '</form>';
+	}
+
+	function _export_xml_deb($type_declaration, $period_year, $period_month) {
+
+		global $db, $conf;
+
+		$obj = new TDebProdouane($db);
+		$obj->entity = $conf->entity;
+		$obj->mode = 'O';
+		$obj->periode = $period_year.'-'.$period_month;
+		$obj->type_declaration = $type_declaration;
+		$obj->numero_declaration = $obj->getNextNumeroDeclaration();
+		$obj->content_xml = $obj->getXML('O', $type_declaration, $period_year.'-'.$period_month);
+		if(empty($obj->errors)) {
+			$obj->save($PDOdb);
+			$obj->generateXMLFile();
+		}
+		else setEventMessage($obj->errors, 'warnings');
+	}
+
+	function _export_xml_des($type_declaration, $period_year, $period_month) {
+
+		global $PDOdb, $conf;
+
+		$obj = new TDebProdouane($PDOdb);
+		$obj->entity = $conf->entity;
+		$obj->periode = $period_year.'-'.$period_month;
+		$obj->type_declaration = $type_declaration;
+		$obj->exporttype = 'des';
+		$obj->numero_declaration = $obj->getNextNumeroDeclaration();
+		$obj->content_xml = $obj->getXMLDes($period_year, $period_month, $type_declaration);
+		if(empty($obj->errors)) {
+			$obj->save($PDOdb);
+			$obj->generateXMLFile();
+		}
+		else setEventMessage($obj->errors, 'warnings');
+	}
+	*/
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/intracommreport/class/index.html b/htdocs/intracommreport/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/intracommreport/class/intracommreport.class.php b/htdocs/intracommreport/class/intracommreport.class.php
new file mode 100644
index 00000000000..d1145dcf806
--- /dev/null
+++ b/htdocs/intracommreport/class/intracommreport.class.php
@@ -0,0 +1,449 @@
+<?php
+/* Copyright (C) 2015       ATM Consulting          <support@atm-consulting.fr>
+ * Copyright (C) 2019-2020  Open-DSI                <support@open-dsi.fr>
+ * Copyright (C) 2020       Frédéric 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/intracommreport/class/intracommreport.class.php
+ *  \ingroup    Intracomm report
+ *  \brief      File of class to manage intracomm report
+ */
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+
+/**
+ * Class to manage intracomm report
+ */
+class IntracommReport extends CommonObject
+{
+	/**
+	 * @var string ID to identify managed object
+	 */
+	public $element = 'intracommreport';
+
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'intracommreport';
+
+	/**
+	 * @var string Field with ID of parent key if this field has a parent
+	 */
+	public $fk_element = 'fk_intracommreport';
+
+	/**
+	 * @var string declaration number
+	 */
+	public $declaration_number;
+
+	/**
+	 * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	 * @var int
+	 */
+	public $ismultientitymanaged = 1;
+
+	/**
+	 * DEB - Product
+	 */
+	const TYPE_DEB = 0;
+
+	/**
+	 * DES - Service
+	 */
+	const TYPE_DES = 1;
+
+	public static $type = array(
+		'introduction'=>'Introduction',
+		'expedition'=>'Expédition'
+	);
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handle
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
+		$this->exporttype = 'deb';
+	}
+
+	/**
+	 * Generate XML file
+	 *
+	 * @param int		$mode 				O for create, R for regenerate (Look always 0 ment toujours 0 within the framework of XML exchanges according to documentation)
+	 * @param string	$type 				Declaration type by default - introduction or expedition (always 'expedition' for Des)
+	 * @param string	$period_reference	Period of reference
+	 * @return void
+	 */
+	public function getXML($mode = 'O', $type = 'introduction', $period_reference = '')
+	{
+
+		global $conf, $mysoc;
+
+		/**************Construction de quelques variables********************/
+		$party_id = substr(strtr($mysoc->tva_intra, array(' '=>'')), 0, 4).$mysoc->idprof2;
+		$declarant = substr($mysoc->managers, 0, 14);
+		$id_declaration = self::getDeclarationNumber($this->numero_declaration);
+		/********************************************************************/
+
+		/**************Construction du fichier XML***************************/
+		$e = new SimpleXMLElement('<?xml version="1.0" encoding="utf-8" standalone="yes"?><INSTAT></INSTAT>');
+
+		$enveloppe = $e->addChild('Envelope');
+		$enveloppe->addChild('envelopeId', $conf->global->INTRACOMMREPORT_NUM_AGREMENT);
+		$date_time = $enveloppe->addChild('DateTime');
+		$date_time->addChild('date', date('Y-m-d'));
+		$date_time->addChild('time', date('H:i:s'));
+		$party = $enveloppe->addChild('Party');
+		$party->addAttribute('partType', $conf->global->INTRACOMMREPORT_TYPE_ACTEUR);
+		$party->addAttribute('partyRole', $conf->global->INTRACOMMREPORT_ROLE_ACTEUR);
+		$party->addChild('partyId', $party_id);
+		$party->addChild('partyName', $declarant);
+		$enveloppe->addChild('softwareUsed', 'Dolibarr');
+		$declaration = $enveloppe->addChild('Declaration');
+		$declaration->addChild('declarationId', $id_declaration);
+		$declaration->addChild('referencePeriod', $period_reference);
+		if ($conf->global->INTRACOMMREPORT_TYPE_ACTEUR === 'PSI') {
+			$psiId = $party_id;
+		} else {
+			$psiId = 'NA';
+		}
+		$declaration->addChild('PSIId', $psiId);
+		$function = $declaration->addChild('Function');
+		$functionCode = $function->addChild('functionCode', $mode);
+		$declaration->addChild('declarationTypeCode', $conf->global->{'INTRACOMMREPORT_NIV_OBLIGATION_'.strtoupper($type)});
+		$declaration->addChild('flowCode', ($type == 'introduction' ? 'A' : 'D'));
+		$declaration->addChild('currencyCode', $conf->global->MAIN_MONNAIE);
+		/********************************************************************/
+
+		/**************Ajout des lignes de factures**************************/
+		$res = $this->addItemsFact($declaration, $type, $period_reference);
+		/********************************************************************/
+
+		$this->errors = array_unique($this->errors);
+
+		if (!empty($res)) {
+			return $e->asXML();
+		} else {
+			return 0;
+		}
+	}
+
+	/**
+	 * Generate XMLDes file
+	 *
+	 * @param int		$period_year		Year of declaration
+	 * @param int		$period_month		Month of declaration
+	 * @param string	$type_declaration	Declaration type by default - introduction or expedition (always 'expedition' for Des)
+	 * @return void
+	 */
+	public function getXMLDes($period_year, $period_month, $type_declaration = 'expedition')
+	{
+		global $mysoc;
+
+		$e = new SimpleXMLElement('<?xml version="1.0" encoding="utf-8" ?><fichier_des></fichier_des>');
+
+		$declaration_des = $e->addChild('declaration_des');
+		$declaration_des->addChild('num_des', self::getDeclarationNumber($this->numero_declaration));
+		$declaration_des->addChild('num_tvaFr', $mysoc->tva_intra); // /^FR[a-Z0-9]{2}[0-9]{9}$/  // Doit faire 13 caractères
+		$declaration_des->addChild('mois_des', $period_month);
+		$declaration_des->addChild('an_des', $period_year);
+
+		/**************Ajout des lignes de factures**************************/
+		$res = $this->addItemsFact($declaration_des, $type_declaration, $period_year.'-'.$period_month, 'des');
+		/********************************************************************/
+
+		$this->errors = array_unique($this->errors);
+
+		if (!empty($res)) {
+			return $e->asXML();
+		} else {
+			return 0;
+		}
+	}
+
+	/**
+	 *  Add line from invoice
+	 *
+	 *  @param	SimpleXMLElement	$declaration		Reference declaration
+	 *  @param	string				$type				Declaration type by default - introduction or expedition (always 'expedition' for Des)
+	 *  @param	int					$period_reference	Reference period
+	 *  @param	string				$exporttype	    	deb=DEB, des=DES
+	 *  @return	int       			  					<0 if KO, >0 if OK
+	 */
+	public function addItemsFact(&$declaration, $type, $period_reference, $exporttype = 'deb')
+	{
+		global $conf;
+
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+
+		$sql = $this->getSQLFactLines($type, $period_reference, $exporttype);
+
+		$resql = $this->db->query($sql);
+
+		if ($resql) {
+			$i = 1;
+
+			if (empty($resql->num_rows)) {
+				$this->errors[] = 'No data for this period';
+				return 0;
+			}
+
+			if ($exporttype == 'deb' && $conf->global->INTRACOMMREPORT_CATEG_FRAISDEPORT > 0) {
+				$categ_fraisdeport = new Categorie($this->db);
+				$categ_fraisdeport->fetch($conf->global->INTRACOMMREPORT_CATEG_FRAISDEPORT);
+				$TLinesFraisDePort = array();
+			}
+
+			while ($res = $this->db->fetch_object($resql)) {
+				if ($exporttype == 'des') {
+					$this->addItemXMlDes($declaration, $res, $i);
+				} else {
+					if (empty($res->fk_pays)) {
+						// We don't stop the loop because we want to know all the third parties who don't have an informed country
+						$this->errors[] = 'Country not filled in for the third party <a href="'.dol_buildpath('/societe/soc.php', 1).'?socid='.$res->id_client.'">'.$res->nom.'</a>';
+					} else {
+						if ($conf->global->INTRACOMMREPORT_CATEG_FRAISDEPORT > 0 && $categ_fraisdeport->containsObject('product', $res->id_prod)) {
+							$TLinesFraisDePort[] = $res;
+						} else {
+							$this->addItemXMl($declaration, $res, $i, '');
+						}
+					}
+				}
+
+				$i++;
+			}
+
+			if (!empty($TLinesFraisDePort)) {
+				$this->addItemFraisDePort($declaration, $TLinesFraisDePort, $type, $categ_fraisdeport, $i);
+			}
+
+			if (count($this->errors) > 0) {
+				return 0;
+			}
+		}
+
+		return 1;
+	}
+
+	/**
+	 *  Add invoice line
+	 *
+	 *  @param      string	$type				Declaration type by default - introduction or expedition (always 'expedition' for Des)
+	 *  @param      int		$period_reference	Reference declaration
+	 *  @param      string	$exporttype	    	deb=DEB, des=DES
+	 *  @return     int       			  		<0 if KO, >0 if OK
+	 */
+	public function getSQLFactLines($type, $period_reference, $exporttype = 'deb')
+	{
+		global $mysoc, $conf;
+
+		if ($type == 'expedition' || $exporttype == 'des') {
+			$sql = 'SELECT f.facnumber, f.total as total_ht';
+			$table = 'facture';
+			$table_extraf = 'facture_extrafields';
+			$tabledet = 'facturedet';
+			$field_link = 'fk_facture';
+		} else { // Introduction
+			$sql = 'SELECT f.ref_supplier as facnumber, f.total_ht';
+			$table = 'facture_fourn';
+			$table_extraf = 'facture_fourn_extrafields';
+			$tabledet = 'facture_fourn_det';
+			$field_link = 'fk_facture_fourn';
+		}
+		$sql .= ', l.fk_product, l.qty
+				, p.weight, p.rowid as id_prod, p.customcode
+				, s.rowid as id_client, s.nom, s.zip, s.fk_pays, s.tva_intra
+				, c.code
+				, ext.mode_transport
+				FROM '.MAIN_DB_PREFIX.$tabledet.' l
+				INNER JOIN '.MAIN_DB_PREFIX.$table.' f ON (f.rowid = l.'.$field_link.')
+				LEFT JOIN '.MAIN_DB_PREFIX.$table_extraf.' ext ON (ext.fk_object = f.rowid)
+				INNER JOIN '.MAIN_DB_PREFIX.'product p ON (p.rowid = l.fk_product)
+				INNER JOIN '.MAIN_DB_PREFIX.'societe s ON (s.rowid = f.fk_soc)
+				LEFT JOIN '.MAIN_DB_PREFIX.'c_country c ON (c.rowid = s.fk_pays)
+				WHERE f.fk_statut > 0
+				AND l.product_type = '.($exporttype == 'des' ? 1 : 0).'
+				AND f.entity = '.$conf->entity.'
+				AND (s.fk_pays <> '.$mysoc->country_id.' OR s.fk_pays IS NULL)
+				AND f.datef BETWEEN "'.$period_reference.'-01" AND "'.$period_reference.'-'.date('t').'"';
+
+		return $sql;
+	}
+
+	/**
+	 *	Add item for DEB
+	 *
+	 * 	@param	SimpleXMLElement	$declaration		Reference declaration
+	 * 	@param	Resource			$res				Result of request SQL
+	 *  @param	int					$i					Line Id
+	 * 	@param	string				$code_douane_spe	Specific customs authorities code
+	 *  @return	void
+	 */
+	public function addItemXMl(&$declaration, &$res, $i, $code_douane_spe = '')
+	{
+		$item = $declaration->addChild('Item');
+		$item->addChild('ItemNumber', $i);
+		$cn8 = $item->addChild('CN8');
+		if (empty($code_douane_spe)) {
+			$code_douane = $res->customcode;
+		} else {
+			$code_douane = $code_douane_spe;
+		}
+		$cn8->addChild('CN8Code', $code_douane);
+		if (!empty($res->tva_intra)) {
+			$item->addChild('partnerId', $res->tva_intra);
+		}
+		$item->addChild('MSConsDestCode', $res->code); // code iso pays client
+		$item->addChild('netMass', $res->weight * $res->qty); // Poids du produit
+		$item->addChild('quantityInSU', $res->qty); // Quantité de produit dans la ligne
+		$item->addChild('invoicedAmount', round($res->total_ht)); // Montant total ht de la facture (entier attendu)
+		$item->addChild('invoicedNumber', $res->facnumber); // Numéro facture
+		$item->addChild('statisticalProcedureCode', '11');
+		$nature_of_transaction = $item->addChild('NatureOfTransaction');
+		$nature_of_transaction->addChild('natureOfTransactionACode', 1);
+		$nature_of_transaction->addChild('natureOfTransactionBCode', 1);
+		$item->addChild('modeOfTransportCode', $res->mode_transport);
+		$item->addChild('regionCode', substr($res->zip, 0, 2));
+	}
+
+	/**
+	 *	Add item for DES
+	 *
+	 * 	@param	SimpleXMLElement	$declaration		Reference declaration
+	 * 	@param	esurce				$res				Result of request SQL
+	 *  @param	int					$i					Line Id
+	 *  @return	void
+	 */
+	public function addItemXMlDes($declaration, &$res, $i)
+	{
+		$item = $declaration->addChild('ligne_des');
+		$item->addChild('numlin_des', $i);
+		$item->addChild('valeur', round($res->total_ht)); // Total amount excl. tax of the invoice (whole amount expected)
+		$item->addChild('partner_des', $res->tva_intra); // Represents the foreign customer's VAT number
+	}
+
+	/**
+	 *	This function adds an item by retrieving the customs code of the product with the highest amount in the invoice
+	 *
+	 * 	@param	SimpleXMLElement	$declaration		Reference declaration
+	 * 	@param	array				$TLinesFraisDePort	Data of shipping costs line
+	 *  @param	string	    		$type				Declaration type by default - introduction or expedition (always 'expedition' for Des)
+	 *  @param	Categorie			$categ_fraisdeport	category of shipping costs
+	 *  @param	int		    		$i					Line Id
+	 *  @return	void
+	 */
+	public function addItemFraisDePort(&$declaration, &$TLinesFraisDePort, $type, &$categ_fraisdeport, $i)
+	{
+
+		global $conf;
+
+		if ($type == 'expedition') {
+			$table = 'facture';
+			$tabledet = 'facturedet';
+			$field_link = 'fk_facture';
+			$more_sql = 'f.facnumber';
+		} else { // Introduction
+			$table = 'facture_fourn';
+			$tabledet = 'facture_fourn_det';
+			$field_link = 'fk_facture_fourn';
+			$more_sql = 'f.ref_supplier';
+		}
+
+		foreach ($TLinesFraisDePort as $res) {
+			$sql = 'SELECT p.customcode
+					FROM '.MAIN_DB_PREFIX.$tabledet.' d
+					INNER JOIN '.MAIN_DB_PREFIX.$table.' f ON (f.rowid = d.'.$field_link.')
+					INNER JOIN '.MAIN_DB_PREFIX.'product p ON (p.rowid = d.fk_product)
+					WHERE d.fk_product IS NOT NULL
+					AND f.entity = '.$conf->entity.'
+					AND '.$more_sql.' = "'.$res->facnumber.'"
+					AND d.total_ht =
+					(
+						SELECT MAX(d.total_ht)
+						FROM '.MAIN_DB_PREFIX.$tabledet.' d
+						INNER JOIN '.MAIN_DB_PREFIX.$table.' f ON (f.rowid = d.'.$field_link.')
+						WHERE d.fk_product IS NOT NULL
+						AND '.$more_sql.' = "'.$res->facnumber.'"
+						AND d.fk_product NOT IN
+						(
+							SELECT fk_product
+							FROM '.MAIN_DB_PREFIX.'categorie_product
+							WHERE fk_categorie = '.$categ_fraisdeport->id.'
+						)
+					)';
+
+			$resql = $this->db->query($sql);
+			$ress = $this->db->fetch_object($resql);
+
+			$this->addItemXMl($declaration, $res, $i, $ress->customcode);
+
+			$i++;
+		}
+	}
+
+	/**
+	 *	Return next reference of declaration not already used (or last reference)
+	 *
+	 *	@return    string					free ref or last ref
+	 */
+	public function getNextDeclarationNumber()
+	{
+		$resql = $this->db->query('SELECT MAX(numero_declaration) as max_declaration_number FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE exporttype="'.$this->exporttype.'"');
+		if ($resql) {
+			$res = $this->db->fetch_object($resql);
+		}
+
+		return ($res->max_declaration_number + 1);
+	}
+
+	/**
+	 *	Verify declaration number. Positive integer of a maximum of 6 characters recommended by the documentation
+	 *
+	 *	@param     	string		$number		Number to verify / convert
+	 *	@return		string 				Number
+	 */
+	public static function getDeclarationNumber($number)
+	{
+		return str_pad($number, 6, 0, STR_PAD_LEFT);
+	}
+
+	/**
+	 *	Generate XML file
+	 *
+	 *	@return		void
+	 */
+	public function generateXMLFile()
+	{
+
+		$name = $this->periode.'.xml';
+		$fname = sys_get_temp_dir().'/'.$name;
+		$f = fopen($fname, 'w+');
+		fwrite($f, $this->content_xml);
+		fclose($f);
+
+		header('Content-Description: File Transfer');
+		header('Content-Type: application/xml');
+		header('Content-Disposition: attachment; filename="'.$name.'"');
+		header('Expires: 0');
+		header('Cache-Control: must-revalidate');
+		header('Pragma: public');
+		header('Content-Length: '.filesize($fname));
+		readfile($fname);
+		exit;
+	}
+}
diff --git a/htdocs/intracommreport/index.html b/htdocs/intracommreport/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php
new file mode 100644
index 00000000000..1530e07d84e
--- /dev/null
+++ b/htdocs/intracommreport/list.php
@@ -0,0 +1,538 @@
+<?php
+/* Copyright (C) 2015       ATM Consulting          <support@atm-consulting.fr>
+ * Copyright (C) 2019-2020  Open-DSI                <support@open-dsi.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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/intracommreport/list.php
+ *  \ingroup    Intracomm Report
+ *  \brief      Page to list intracomm report
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/intracommreport/class/intracommreport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('intracommreport'));
+
+$action = GETPOST('action', 'alpha');
+$massaction = GETPOST('massaction', 'alpha');
+$show_files = GETPOST('show_files', 'int');
+$confirm = GETPOST('confirm', 'alpha');
+$toselect = GETPOST('toselect', 'array');
+
+$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$search_ref = GETPOST("search_ref", 'alpha');
+$search_type = GETPOST("search_type", 'int');
+$fourn_id = GETPOST("fourn_id", 'int');
+$catid = GETPOST('catid', 'int');
+$optioncss = GETPOST('optioncss', 'alpha');
+$type = GETPOST("type", "int");
+
+$diroutputmassaction = $conf->product->dir_output.'/temp/massgeneration/'.$user->id;
+
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = (GETPOST("page", 'int') ?GETPOST("page", 'int') : 0);
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortfield) {
+	$sortfield = "i.ref";
+}
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+
+// Initialize context for list
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'intracommreportlist';
+if ((string) $type == '1') {
+	$contextpage = 'DESlist'; if ($search_type == '') {
+		$search_type = '1';
+	}
+}
+if ((string) $type == '0') {
+	$contextpage = 'DEBlist'; if ($search_type == '') {
+		$search_type = '0';
+	}
+}
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks
+$object = new IntracommReport($db);
+$hookmanager->initHooks(array('intracommreportlist'));
+$extrafields = new ExtraFields($db);
+$form = new Form($db);
+
+/*
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label('intracommreport');
+$search_array_options=$extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+*/
+
+if (empty($action)) {
+	$action = 'list';
+}
+
+// Get object canvas (By default, this is not defined, so standard usage of dolibarr)
+$canvas = GETPOST("canvas");
+$objcanvas = null;
+if (!empty($canvas)) {
+	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
+	$objcanvas = new Canvas($db, $action);
+	$objcanvas->getCanvas('product', 'list', $canvas);
+}
+
+// Security check
+/*
+if ($search_type=='0') $result=restrictedArea($user, 'produit', '', '', '', '', '', $objcanvas);
+elseif ($search_type=='1') $result=restrictedArea($user, 'service', '', '', '', '', '', $objcanvas);
+else $result=restrictedArea($user, 'produit|service', '', '', '', '', '', $objcanvas);
+*/
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array(
+	'i.ref'=>"Ref",
+	'pfi.ref_fourn'=>"RefSupplier",
+	'i.label'=>"ProductLabel",
+	'i.description'=>"Description",
+	"i.note"=>"Note",
+);
+
+$isInEEC = isInEEC($mysoc);
+
+// Definition of fields for lists
+$arrayfields = array(
+	'i.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+	'i.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
+	'i.fk_product_type'=>array('label'=>$langs->trans("Type"), 'checked'=>0, 'enabled'=>(!empty($conf->produit->enabled) && !empty($conf->service->enabled))),
+);
+/*
+// Extra fields
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']))
+{
+	foreach($extrafields->attributes[$object->table_element]['label'] as $key => $val)
+	{
+		if (! empty($extrafields->attributes[$object->table_element]['list'][$key]))
+			$arrayfields["ef.".$key]=array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key]<0)?0:1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key])!=3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
+	}
+}
+*/
+$object->fields = dol_sort_array($object->fields, 'position');
+$arrayfields = dol_sort_array($arrayfields, 'position');
+
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($reshook)) {
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+		$sall = "";
+		$search_ref = "";
+		$search_label = "";
+		//$search_type='';						// There is 2 types of list: a list of product and a list of services. No list with both. So when we clear search criteria, we must keep the filter on type.
+
+		$show_childproducts = '';
+		$search_array_options = array();
+	}
+
+	// Mass actions
+	$objectclass = 'Product';
+	if ((string) $search_type == '1') {
+		$objectlabel = 'Services';
+	}
+	if ((string) $search_type == '0') {
+		$objectlabel = 'Products';
+	}
+
+	$permtoread = $user->rights->produit->lire;
+	$permtodelete = $user->rights->produit->supprimer;
+	$uploaddir = $conf->product->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+}
+
+
+/*
+ * View
+ */
+$formother = new FormOther($db);
+
+$title = $langs->trans('IntracommReportList'.$type);
+
+$sql = 'SELECT DISTINCT i.rowid, i.type_declaration, i.type_export, i.periods, i.mode, i.entity';
+/*
+// Add fields from extrafields
+if (! empty($extrafields->attributes[$object->table_element]['label'])) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+}
+*/
+// Add fields from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+
+$sql .= ' FROM '.MAIN_DB_PREFIX.'intracommreport as i';
+
+// if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."intracommreport_extrafields as ef on (i.rowid = ef.fk_object)";
+
+$sql .= ' WHERE i.entity IN ('.getEntity('intracommreport').')';
+
+if ($sall) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
+}
+// if the type is not 1, we show all products (type = 0,2,3)
+if (dol_strlen($search_type) && $search_type != '-1') {
+	if ($search_type == 1) {
+		$sql .= " AND i.type = 1";
+	} else {
+		$sql .= " AND i.type = 0";
+	}
+}
+
+/*
+if ($search_ref)     $sql .= natural_search('i.ref', $search_ref);
+if ($search_label)   $sql .= natural_search('i.label', $search_label);
+if ($search_barcode) $sql .= natural_search('i.barcode', $search_barcode);
+if (isset($search_tosell) && dol_strlen($search_tosell) > 0  && $search_tosell!=-1) $sql.= " AND i.tosell = ".$db->escape($search_tosell);
+if (isset($search_tobuy) && dol_strlen($search_tobuy) > 0  && $search_tobuy!=-1)   $sql.= " AND i.tobuy = ".$db->escape($search_tobuy);
+if (dol_strlen($canvas) > 0)                    $sql.= " AND i.canvas = '".$db->escape($canvas)."'";
+*/
+
+/*
+// Add where from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+*/
+// Add where from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+
+$sql .= " GROUP BY i.rowid";
+
+/*
+// Add fields from extrafields
+if (! empty($extrafields->attributes[$object->table_element]['label'])) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key : '');
+}
+*/
+
+// Add fields from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldSelect', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+
+$sql .= $db->order($sortfield, $sortorder);
+
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+		$page = 0;
+		$offset = 0;
+	}
+}
+
+$sql .= $db->plimit($limit + 1, $offset);
+
+$resql = $db->query($sql);
+
+if ($resql) {
+	$num = $db->num_rows($resql);
+
+	$arrayofselected = is_array($toselect) ? $toselect : array();
+
+	$helpurl = 'EN:Module_IntracommReport|FR:Module_ProDouane';
+	llxHeader('', $title, $helpurl, '');
+
+	// Displays product removal confirmation
+	if (GETPOST('delreport')) {
+		setEventMessages($langs->trans("IntracommReportDeleted", GETPOST('delreport')), null, 'mesgs');
+	}
+
+	$param = '';
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		$param .= '&contextpage='.urlencode($contextpage);
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.urlencode($limit);
+	}
+	if ($sall) {
+		$param .= "&sall=".urlencode($sall);
+	}
+	if ($search_ref) {
+		$param = "&search_ref=".urlencode($search_ref);
+	}
+	if ($search_label) {
+		$param .= "&search_label=".urlencode($search_label);
+	}
+
+	// Add $param from extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+
+	// List of mass actions available
+	$arrayofmassactions = array(
+		'generate_doc'=>$langs->trans("ReGeneratePDF"),
+		//'builddoc'=>$langs->trans("PDFMerge"),
+		//'presend'=>$langs->trans("SendByMail"),
+	);
+	if ($user->rights->intracommreport->delete) {
+		$arrayofmassactions['predelete'] = "<span class='fa fa-trash paddingrightonly'></span>".$langs->trans("Delete");
+	}
+	if (in_array($massaction, array('presend', 'predelete'))) {
+		$arrayofmassactions = array();
+	}
+	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+
+	$newcardbutton = '';
+	if ($user->rights->intracommreport->write) {
+		$newcardbutton .= dolGetButtonTitle($langs->trans("NewDeclaration"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/intracommreport/card.php?action=create&amp;type='.$type);
+	}
+
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
+	if ($optioncss != '') {
+		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	}
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="type" value="'.$type.'">';
+	if (empty($arrayfields['i.fk_product_type']['checked'])) {
+		print '<input type="hidden" name="search_type" value="'.dol_escape_htmltag($search_type).'">';
+	}
+
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_products.png', 0, $newcardbutton, '', $limit);
+
+	$topicmail = "Information";
+	$modelmail = "product";
+	$objecttmp = new IntracommReport($db);
+	$trackid = 'prod'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+
+	if ($sall) {
+		foreach ($fieldstosearchall as $key => $val) {
+			$fieldstosearchall[$key] = $langs->trans($val);
+		}
+		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+	}
+
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+	if (empty($reshook)) {
+		$moreforfilter .= $hookmanager->resPrint;
+	} else {
+		$moreforfilter = $hookmanager->resPrint;
+	}
+
+	if ($moreforfilter) {
+		print '<div class="liste_titre liste_titre_bydiv centpercent">';
+		print $moreforfilter;
+		print '</div>';
+	}
+
+	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	if ($massactionbutton) {
+		$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+	}
+
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+
+	// Lines with input filters
+	print '<tr class="liste_titre_filter">';
+	if (!empty($arrayfields['i.ref']['checked'])) {
+		print '<td class="liste_titre left">';
+		print '<input class="flat" type="text" name="search_ref" size="8" value="'.dol_escape_htmltag($search_ref).'">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['i.label']['checked'])) {
+		print '<td class="liste_titre left">';
+		print '<input class="flat" type="text" name="search_label" size="12" value="'.dol_escape_htmltag($search_label).'">';
+		print '</td>';
+	}
+	// Type
+	// Type (customer/prospect/supplier)
+	if (!empty($arrayfields['customerorsupplier']['checked'])) {
+		print '<td class="liste_titre maxwidthonsmartphone center">';
+		if ($type != '') {
+			print '<input type="hidden" name="type" value="'.$type.'">';
+		}
+		print $formcompany->selectProspectCustomerType($search_type, 'search_type', 'search_type', 'list');
+		print '</select></td>';
+	}
+
+	if (!empty($arrayfields['i.fk_product_type']['checked'])) {
+		print '<td class="liste_titre left">';
+		$array = array('-1'=>'&nbsp;', '0'=>$langs->trans('Product'), '1'=>$langs->trans('Service'));
+		print $form->selectarray('search_type', $array, $search_type);
+		print '</td>';
+	}
+
+	/*
+	// Extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
+	*/
+	// Fields from hook
+	$parameters = array('arrayfields'=>$arrayfields);
+	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	// Date creation
+	if (!empty($arrayfields['i.datec']['checked'])) {
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
+	// Date modification
+	if (!empty($arrayfields['i.tms']['checked'])) {
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
+	print '<td class="liste_titre center maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+
+	print '</tr>';
+
+	print '<tr class="liste_titre">';
+	if (!empty($arrayfields['i.ref']['checked'])) {
+		print_liste_field_titre($arrayfields['i.ref']['label'], $_SERVER["PHP_SELF"], "i.ref", "", $param, "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['i.label']['checked'])) {
+		print_liste_field_titre($arrayfields['i.label']['label'], $_SERVER["PHP_SELF"], "i.label", "", $param, "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['i.fk_product_type']['checked'])) {
+		print_liste_field_titre($arrayfields['i.fk_product_type']['label'], $_SERVER["PHP_SELF"], "i.fk_product_type", "", $param, "", $sortfield, $sortorder);
+	}
+
+	/*
+	// Extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+	*/
+	// Hook fields
+	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	if (!empty($arrayfields['i.datec']['checked'])) {
+		print_liste_field_titre($arrayfields['i.datec']['label'], $_SERVER["PHP_SELF"], "i.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
+	if (!empty($arrayfields['i.tms']['checked'])) {
+		print_liste_field_titre($arrayfields['i.tms']['label'], $_SERVER["PHP_SELF"], "i.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
+
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+	print "</tr>\n";
+
+
+	$intracommreport_static = new IntracommReport($db);
+
+	$i = 0;
+	$totalarray = array();
+	while ($i < min($num, $limit)) {
+		$obj = $db->fetch_object($resql);
+
+		$intracommreport_static->id = $obj->rowid;
+		$intracommreport_static->ref = $obj->ref;
+		$intracommreport_static->ref_fourn = $obj->ref_supplier;
+		$intracommreport_static->label = $obj->label;
+		$intracommreport_static->type = $obj->fk_product_type;
+		$intracommreport_static->status_buy = $obj->tobuy;
+		$intracommreport_static->status     = $obj->tosell;
+		$intracommreport_static->status_batch = $obj->tobatch;
+		$intracommreport_static->entity = $obj->entity;
+
+		print '<tr class="oddeven">';
+
+		// Ref
+		if (!empty($arrayfields['i.ref']['checked'])) {
+			print '<td class="tdoverflowmax200">';
+			print $intracommreport_static->getNomUrl(1);
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Label
+		if (!empty($arrayfields['i.label']['checked'])) {
+			print '<td class="tdoverflowmax200">'.dol_trunc($obj->label, 80).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Type
+		if (!empty($arrayfields['i.fk_product_type']['checked'])) {
+			print '<td>'.$obj->fk_product_type.'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Action
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($obj->rowid, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+
+		print "</tr>\n";
+		$i++;
+	}
+
+	$db->free($resql);
+
+	print "</table>";
+	print "</div>";
+	print '</form>';
+} else {
+	dol_print_error($db);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/langs/am_ET/accountancy.lang b/htdocs/langs/am_ET/accountancy.lang
index 7b59e33b296..3211a0b62df 100644
--- a/htdocs/langs/am_ET/accountancy.lang
+++ b/htdocs/langs/am_ET/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting expert
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=Journals
+Journals=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Chart of accounts
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bank accounts
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=By year
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/am_ET/admin.lang b/htdocs/langs/am_ET/admin.lang
index d7c4eb282cd..f1c41a3b62b 100644
--- a/htdocs/langs/am_ET/admin.lang
+++ b/htdocs/langs/am_ET/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
 CurrentTimeZone=TimeZone PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Interventions
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
+Permission13=Invalidate customer invoices
 Permission14=Validate customer invoices
 Permission15=Send customer invoices by email
 Permission16=Create payments for customer invoices
@@ -688,6 +694,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Read members
 Permission72=Create/modify members
 Permission74=Delete members
@@ -718,6 +728,7 @@ Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
@@ -825,10 +836,11 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Edition of field %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1282,7 +1322,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Global parameters
@@ -1523,7 +1564,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Level
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
@@ -1629,7 +1672,7 @@ AdvancedEditor=Advanced editor
 ActivateFCKeditor=Activate advanced editor for:
 FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
 FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
-MailToProject=Projects page
+MailToProject=Projects
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/am_ET/banks.lang b/htdocs/langs/am_ET/banks.lang
index 75f9549dca5..9500a5b8b2e 100644
--- a/htdocs/langs/am_ET/banks.lang
+++ b/htdocs/langs/am_ET/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/am_ET/categories.lang b/htdocs/langs/am_ET/categories.lang
index 9bb71984ecf..ba37a43b4ec 100644
--- a/htdocs/langs/am_ET/categories.lang
+++ b/htdocs/langs/am_ET/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/am_ET/companies.lang b/htdocs/langs/am_ET/companies.lang
index 92674363ced..dadff6a7894 100644
--- a/htdocs/langs/am_ET/companies.lang
+++ b/htdocs/langs/am_ET/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
 ProspectLevel=Prospect potential
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Currency
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/am_ET/ecm.lang b/htdocs/langs/am_ET/ecm.lang
index 369ac6dfdfa..71df60734fb 100644
--- a/htdocs/langs/am_ET/ecm.lang
+++ b/htdocs/langs/am_ET/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Search by keywords
 ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to vendor proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/am_ET/hrm.lang b/htdocs/langs/am_ET/hrm.lang
index 6cc7f6bef24..3b8f137e103 100644
--- a/htdocs/langs/am_ET/hrm.lang
+++ b/htdocs/langs/am_ET/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Employees
 Employee=Employee
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/am_ET/install.lang b/htdocs/langs/am_ET/install.lang
index 2d708c04147..63947dad154 100644
--- a/htdocs/langs/am_ET/install.lang
+++ b/htdocs/langs/am_ET/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=This PHP supports sessions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/am_ET/intracommreport.lang b/htdocs/langs/am_ET/intracommreport.lang
new file mode 100644
index 00000000000..3060300b974
--- /dev/null
+++ b/htdocs/langs/am_ET/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=List
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/am_ET/languages.lang b/htdocs/langs/am_ET/languages.lang
index cc80b9f1719..ba187326705 100644
--- a/htdocs/langs/am_ET/languages.lang
+++ b/htdocs/langs/am_ET/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/am_ET/main.lang b/htdocs/langs/am_ET/main.lang
index 0af5c66f0e0..96c68cdcfa3 100644
--- a/htdocs/langs/am_ET/main.lang
+++ b/htdocs/langs/am_ET/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Remove link
 AddToDraft=Add to draft
 Update=Update
 Close=Close
+CloseAs=Set status to
 CloseBox=Remove widget from your dashboard
 Confirm=Confirm
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Re-Open
 Upload=Upload
 ToLink=Link
 Select=Select
+SelectAll=Select all
 Choose=Choose
 Resize=Resize
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=Cards
 Card=Card
 Now=Now
 HourStart=Start hour
+Deadline=Deadline
 Date=Date
 DateAndHour=Date and hour
 DateToday=Today's date
@@ -264,8 +267,10 @@ DateStart=Start date
 DateEnd=End date
 DateCreation=Creation date
 DateCreationShort=Creat. date
+IPCreation=Creation IP
 DateModification=Modification date
 DateModificationShort=Modif. date
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
@@ -319,6 +324,7 @@ Morning=Morning
 Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Month of the day
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Rate
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Amount tax 2
 AmountLT2=Amount tax 3
 AmountLT1ES=Amount RE
@@ -487,6 +494,7 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
+at=at
 to=to
 To=to
 and=and
@@ -509,6 +517,7 @@ Draft=Draft
 Drafts=Drafts
 StatusInterInvoiced=Invoiced
 Validated=Validated
+ValidatedToProduce=Validated (To produce)
 Opened=Open
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Response
 Priority=Priority
 SendByMail=Send by email
 MailSentBy=Email sent by
+NotSent=Not sent
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
@@ -836,6 +846,7 @@ ListOfTemplates=List of templates
 Gender=Gender
 Genderman=Man
 Genderwoman=Woman
+Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Comments
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Information
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Date of birth
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/am_ET/members.lang b/htdocs/langs/am_ET/members.lang
index 5ef946ddf67..5812248b129 100644
--- a/htdocs/langs/am_ET/members.lang
+++ b/htdocs/langs/am_ET/members.lang
@@ -19,14 +19,12 @@ MembersCards=Members business cards
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
 SubscriptionId=Subscription id
+WithoutSubscription=Without subscription
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@@ -81,7 +80,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/am_ET/mrp.lang b/htdocs/langs/am_ET/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/am_ET/mrp.lang
+++ b/htdocs/langs/am_ET/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/am_ET/products.lang b/htdocs/langs/am_ET/products.lang
index b59aa2f7080..97db059594f 100644
--- a/htdocs/langs/am_ET/products.lang
+++ b/htdocs/langs/am_ET/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/am_ET/recruitment.lang b/htdocs/langs/am_ET/recruitment.lang
index 73e9a7fa07f..b775e78552e 100644
--- a/htdocs/langs/am_ET/recruitment.lang
+++ b/htdocs/langs/am_ET/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/am_ET/stocks.lang b/htdocs/langs/am_ET/stocks.lang
index 81163e8d4b0..660443bcded 100644
--- a/htdocs/langs/am_ET/stocks.lang
+++ b/htdocs/langs/am_ET/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/am_ET/suppliers.lang b/htdocs/langs/am_ET/suppliers.lang
index 51562b8bb7a..03b03c75269 100644
--- a/htdocs/langs/am_ET/suppliers.lang
+++ b/htdocs/langs/am_ET/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/am_ET/website.lang b/htdocs/langs/am_ET/website.lang
index 4b5294d5e43..03e042e4be6 100644
--- a/htdocs/langs/am_ET/website.lang
+++ b/htdocs/langs/am_ET/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/ar_EG/propal.lang b/htdocs/langs/ar_EG/propal.lang
index 4037a3b428b..bd57090dbd4 100644
--- a/htdocs/langs/ar_EG/propal.lang
+++ b/htdocs/langs/ar_EG/propal.lang
@@ -44,7 +44,6 @@ RefProposal=مرجع العرض تجاري
 SendPropalByMail=إرسال عرض تجاري عن طريق البريد
 DatePropal=تاريخ العرض
 ValidityDuration=مدة الصلاحية
-CloseAs=اضبط الحالة على
 SetAcceptedRefused=مقبول / مرفوض
 ErrorPropalNotFound=العرض %s غير موجود
 AddToDraftProposals=أضف إلى مسودة العرض
diff --git a/htdocs/langs/ar_EG/suppliers.lang b/htdocs/langs/ar_EG/suppliers.lang
index 7a683513e08..14963000391 100644
--- a/htdocs/langs/ar_EG/suppliers.lang
+++ b/htdocs/langs/ar_EG/suppliers.lang
@@ -42,5 +42,4 @@ NotTheGoodQualitySupplier=جودة منخفضة
 ReputationForThisProduct=سمعة
 BuyerName=اسم المشتري
 AllProductServicePrices=أسعار جميع المنتجات / الخدمات
-AllProductReferencesOfSupplier=جميع مراجع المنتج / الخدمة للمورد
 BuyingPriceNumShort=أسعار المورد
diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index cf3e6a34fc5..0809eff3c9f 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=إعدادات وحدة الخبير المحاسبي
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=دفاتر اليومية
+Journals=دفاتر اليومية
 JournalFinancial=دفاتر اليومية المالية
 BackToChartofaccounts=العودة لشجرة الحسابات
 Chartofaccounts=جدول الحسابات
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=إضافة حساب محاسبي
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=الحسابات المصرفية
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=دفتر البيع اليومي
 ACCOUNTING_PURCHASE_JOURNAL=دفتر الشراء اليومي
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=بحلول العام
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=دفتر المالية اليومي
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=دفتر المالية اليومي المتضمن لجميع الدفعات عن طريق الحساب المصرفي
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 2e014d03b3f..6b8e53c6c3b 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=إزالة قفل الإتصال
 YourSession=الجلسة الخاصة بك
 Sessions=Users Sessions
 WebUserGroup=خادم الويب المستخدم / المجموعة
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=الترميز الخاص بقاعدة البيانات لتخزين المعلومات
 DBSortingCharset=الترميز الخاص بقاعدة البيانات لتخزين المعلومات
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=أيضا إذا كان لديك عدد كبير من الأحزاب الثالثة (> 100 000)، يمكنك زيادة السرعة عن طريق وضع COMPANY_DONOTSEARCH_ANYWHERE ثابت إلى 1 في الإعداد، <أخرى. وبعد ذلك البحث أن يقتصر على بداية السلسلة.
 UseSearchToSelectContactTooltip=أيضا إذا كان لديك عدد كبير من الأحزاب الثالثة (> 100 000)، يمكنك زيادة السرعة عن طريق وضع CONTACT_DONOTSEARCH_ANYWHERE ثابت إلى 1 في الإعداد، <أخرى. وبعد ذلك البحث أن يقتصر على بداية السلسلة.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=الجافا سكربت معطل
 UsePreviewTabs=إستخدم زر المعاينة
 ShowPreview=آظهر المعاينة
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=المعاينة غير متاحة
 ThemeCurrentlyActive=الثيم النشط حالياً
 CurrentTimeZone=حسب توقيت خادم البي إتش بي
@@ -271,7 +274,7 @@ NoticePeriod=فترة إشعار
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=انقر للاتصال
 Module58Desc=ClickToDial التكامل
-Module59Name=Bookmark4u
-Module59Desc=إضافة مهمة لتوليد Bookmark4u الحساب من حساب Dolibarr
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=المداخلات
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=استطلاع للرأي، أو مسح التصويت
@@ -671,7 +677,7 @@ Module63000Name=مصادر
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=قراءة الفواتير
 Permission12=إنشاء / تعديل فواتير العملاء
-Permission13=تعديل الفواتير
+Permission13=Invalidate customer invoices
 Permission14=التحقق من صحة الفواتير
 Permission15=ارسال الفواتير عن طريق البريد الإلكتروني
 Permission16=إنشاء مدفوعات الفواتير العملاء
@@ -688,6 +694,7 @@ Permission32=إنشاء / تعديل المنتجات
 Permission34=حذف المنتجات
 Permission36=انظر / إدارة المنتجات المخفية
 Permission38=منتجات التصدير
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=قراءة التدخلات
 Permission62=إنشاء / تعديل التدخلات
 Permission64=حذف التدخلات
 Permission67=تصدير التدخلات
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=قراءة الأعضاء
 Permission72=إنشاء / تعديل أعضاء
 Permission74=حذف أعضاء
@@ -718,6 +728,7 @@ Permission95=قراءة تقارير
 Permission101=قراءة الإرسال
 Permission102=إنشاء / تعديل الإرسال
 Permission104=صحة الإرسال
+Permission105=Send sendings by email
 Permission106=sendings التصدير
 Permission109=حذف الإرسال
 Permission111=قراءة الحسابات المالية
@@ -825,10 +836,11 @@ Permission402=إنشاء / تعديل الخصومات
 Permission403=تحقق من الخصومات
 Permission404=حذف خصومات
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=رواتب التصدير
+Permission517=Read payments of salaries of everybody
+Permission519=رواتب التصدير
 Permission520=قراءة القروض
 Permission522=إنشاء / تعديل القروض
 Permission524=حذف القروض
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=ونتيجة للحصول على التصدير
 Permission1202=إنشاء / تعديل للتصدير
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=ادارة الدمار الواردات الخارجية الب
 Permission1321=تصدير العملاء والفواتير والمدفوعات والصفات
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=قراءة مهمة مجدولة
 Permission23002=إنشاء / تحديث المجدولة وظيفة
 Permission23003=حذف مهمة مجدولة
 Permission23004=تنفيذ مهمة مجدولة
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=قراءة المعاملات
 Permission50202=استيراد المعاملات
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=الإعداد المحفوظة
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=العلامة التي يستخدمها التقصير إذ
 LabelOnDocuments=علامة على وثائق
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=في نهاية الشهر
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=اسم المتصفح
 BrowserOS=متصفح OS
 ListOfSecurityEvents=قائمة الأحداث الأمنية Dolibarr
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=استيراد MySQL
-ForcedToByAModule= هذه القاعدة <b>%s</b> الى جانب تفعيل وحدة
+ForcedToByAModule=هذه القاعدة <b>%s</b> الى جانب تفعيل وحدة
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=طبعة من ميدان%s
 FillThisOnlyIfRequired=مثال: +2 (ملء إلا إذا تعوض توقيت المشاكل من ذوي الخبرة)
@@ -1282,7 +1322,7 @@ GetBarCode=الحصول على الباركود
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=عودة كلمة سر ولدت الداخلية وفقا لخوارزمية Dolibarr : 8 أحرف مشتركة تتضمن الأرقام والحروف في حرف صغير.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=ترجع كلمة المرور الخاصة بك وفقا لتكوين المعرفة شخصيا.
 SetupPerso=وفقا لتكوين الخاصة بك
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=مربع لإرسال الرسائل للأعضاء تأكيدا على افتراضي
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP الإعداد
 LDAPGlobalParameters=المعايير العالمية
@@ -1523,7 +1564,9 @@ LDAPDescValues=مثال قيم تهدف <b>لOpenLDAP</b> مع مخططات بع
 ForANonAnonymousAccess=لصحتها accès (لكتابة الحصول على سبيل المثال)
 PerfDolibarr=الإعداد أداء / تحسين تقرير
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=مخبأ تطبيقي
 MemcachedNotAvailable=لم يتم العثور على مخبأ تطبيقي. يمكنك تحسين الأداء عن طريق تثبيت أعطها مخبأ خادم وحدة قادرة على استخدام هذا الخادم ذاكرة التخزين المؤقت. <br> مزيد من المعلومات هنا <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN.</a> <br> لاحظ أن الكثير من مزود استضافة المواقع لا توفر مثل هذا الخادم ذاكرة التخزين المؤقت.
 MemcachedModuleAvailableButNotSetup=وحدة أعطها لمخبأ تطبيقي وجدت ولكن الإعداد من وحدة ليست كاملة.
@@ -1571,9 +1614,9 @@ SyslogLevel=المستوى
 SyslogFilename=اسم الملف ومسار
 YouCanUseDOL_DATA_ROOT=يمكنك استخدام DOL_DATA_ROOT / dolibarr.log لملف الدخول في Dolibarr "وثائق" دليل. يمكنك أن تحدد مسارا مختلفا لتخزين هذا الملف.
 ErrorUnknownSyslogConstant=ثابت %s ليس ثابت سيسلوغ معروفة
-OnlyWindowsLOG_USER=نوافذ يعتمد فقط LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=وحدة الإعداد للتبرع
@@ -1629,7 +1672,7 @@ AdvancedEditor=محرر متقدم
 ActivateFCKeditor=تفعيل محرر متقدم ل:
 FCKeditorForCompany=WYSIWIG إنشاء / الطبعة شركات ووصف المذكرة
 FCKeditorForProduct=WYSIWIG إنشاء / الطبعة المنتجات / الخدمات ووصف المذكرة
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG إنشاء / الطبعة بالبريد
 FCKeditorForUserSignature=إنشاء WYSIWIG / طبعة التوقيع المستعمل
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=حذف من القائمة
+Menu=Menu
 Menus=القوائم
 TreeMenuPersonalized=شخصي قوائم
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=قائمة جديدة
-Menu=اختيار قائمة
 MenuHandler=قائمة مناول
 MenuModule=مصدر في وحدة
 HideUnauthorizedMenu= إخفاء القوائم غير المصرح به (الرمادي)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=انقر لإعداد وحدة الاتصال الهاتفي
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=يشمل المسار (المحدد في متغير%s)
 ExpenseReportsSetup=إعداد تقارير المصروفات وحدة
 TemplatePDFExpenseReports=قوالب المستند لتوليد حساب ثيقة تقرير
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=تم تفعيل أي وحدة قادرة على إدارة زيادة المخزون التلقائي. وسوف يتم زيادة الأسهم على الإدخال اليدوي فقط.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=أطراف ثالثة
 MailToMember=أعضاء
 MailToUser=المستخدمين
-MailToProject=Projects page
+MailToProject=مشاريع
 MailToTicket=Tickets
 ByDefaultInList=تظهر بشكل افتراضي على عرض القائمة
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=الرمز البريدي
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/ar_SA/banks.lang b/htdocs/langs/ar_SA/banks.lang
index 2c19df5172d..5b82860bea7 100644
--- a/htdocs/langs/ar_SA/banks.lang
+++ b/htdocs/langs/ar_SA/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=مدفوعات متنوعة
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=تفويض سيبا الخاص بك
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/ar_SA/categories.lang b/htdocs/langs/ar_SA/categories.lang
index 88750f89628..fa97cbaba63 100644
--- a/htdocs/langs/ar_SA/categories.lang
+++ b/htdocs/langs/ar_SA/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=إعداد العلامات / الفئات
 CategorieRecursiv=ربط مع العلامة / الفئة الاب تلقائيا
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=أضف المنتج / الخدمة التالية
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=إظهار العلامة / الفئة
 ByDefaultInList=افتراضيا في القائمة
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/ar_SA/companies.lang b/htdocs/langs/ar_SA/companies.lang
index b033fe22e3b..a17eed9cf32 100644
--- a/htdocs/langs/ar_SA/companies.lang
+++ b/htdocs/langs/ar_SA/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=البروفيسور رقم 1 (USt.-IdNr)
 ProfId2AT=البروفيسور رقم 2 (USt.-العدد)
 ProfId3AT=البروفيسور رقم 3 (Handelsregister-العدد).
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=الأستاذ عيد 1 (ايه. بي.)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=الأستاذ عيد 1 (عدد المهنية)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao المحلي)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=الأستاذ عيد 1 (عدد الاتحادية)
 ProfId4CH=الأستاذ عيد 2 (رقم السجل التجاري)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=الأستاذ رقم 1 (شبق)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=الأستاذ عيد 1 (USt. - IdNr)
 ProfId2DE=الأستاذ عيد 2 (رقم USt. -)
 ProfId3DE=الأستاذ عيد 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=(CNAE)
 ProfId2ES=(رقم الضمان الاجتماعي)
 ProfId3ES=(IAE)
 ProfId4ES=(عدد الجماعية)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=الأستاذ عيد 1 (صفارة إنذار)
 ProfId2FR=الأستاذ عيد 2 (SIRET)
 ProfId3FR=الأستاذ عيد 3 (NAF ، البالغ من العمر قرد)
 ProfId4FR=الأستاذ عيد 4 (نظام المنسقين المقيمين / لجمهورية مقدونيا)
-ProfId5FR=الأستاذ رقم 5
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=الأستاذ عيد 1 (رقم التسجيل)
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=معرف البروفيسور 3
 ProfId4IN=معرف البروفيسور 4
 ProfId5IN=الأستاذ رقم 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=الرقم أ. 1 (RC)
 ProfId2MA=الرقم أ. 2 (Patente)
 ProfId3MA=الرقم أ. 3 (إذا)
 ProfId4MA=الرقم أ. 4 (CNSS)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=الأستاذ رقم 1 (RFC).
 ProfId2MX=الأستاذ رقم 2 (ر. P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK نومير
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=الأستاذ عيد 1 (NIPC)
 ProfId2PT=الأستاذ عيد 2 (رقم الضمان الاجتماعي)
 ProfId3PT=الأستاذ عيد 3 (رقم السجل التجاري)
 ProfId4PT=الأستاذ عيد 4 (يضم)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=الأستاذ رقم 1 (OGRN)
 ProfId2RU=الأستاذ رقم 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=وليس من الممكن التحقق. تأكد من خدمة لا تقدمها دولة عضو (في المائة).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=الموظفين
 ProspectLevelShort=المحتملة
 ProspectLevel=آفاق محتملة
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=العملة
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/ar_SA/ecm.lang b/htdocs/langs/ar_SA/ecm.lang
index 0450e0d86f2..7ad2d6317de 100644
--- a/htdocs/langs/ar_SA/ecm.lang
+++ b/htdocs/langs/ar_SA/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=بحث الكلمات الرئيسية
 ECMSearchByEntity=بحث عن وجوه
 ECMSectionOfDocuments=أدلة وثائق
 ECMTypeAuto=التلقائي
-ECMDocsBySocialContributions=المستندات المرتبطة بالضرائب الاجتماعية أو المالية
-ECMDocsByThirdParties=وثائق مرتبطة أطراف ثالثة
-ECMDocsByProposals=وثائق مرتبطة مقترحات
-ECMDocsByOrders=وثائق مرتبطة أوامر العملاء
-ECMDocsByContracts=وثائق مرتبطة بعقود
-ECMDocsByInvoices=وثائق مرتبطة عملاء الفواتير
-ECMDocsByProducts=الوثائق المرتبطة بالمنتجات
-ECMDocsByProjects=المستندات المرتبطة بالمشاريع
-ECMDocsByUsers=وثائق مرتبطة المستخدمين
-ECMDocsByInterventions=وثائق مرتبطة بالتدخلات
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=لا الدليل
 ShowECMSection=وتظهر الدليل
 DeleteSection=إزالة الدليل
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/ar_SA/hrm.lang b/htdocs/langs/ar_SA/hrm.lang
index 8ba763a357b..0cfee9469dd 100644
--- a/htdocs/langs/ar_SA/hrm.lang
+++ b/htdocs/langs/ar_SA/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=الموظفين
 Employee=الموظف
 NewEmployee=موظف جديد
+ListOfEmployees=قائمة الموظفين 
diff --git a/htdocs/langs/ar_SA/install.lang b/htdocs/langs/ar_SA/install.lang
index 601db720bee..3eadf6f4ba7 100644
--- a/htdocs/langs/ar_SA/install.lang
+++ b/htdocs/langs/ar_SA/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=ملف الإعداد <b>%s</b> قابل للكتابة.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=يدعم هذا الـ PHP ميزة الجلسات الزمنية.
 PHPSupportPOSTGETOk=يدعم هذا الـ PHP وظائف POST و GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=يدعم هذا الـ PHP ميزة الجلسات الزمنية.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=تم إعداد الجلسة الزمنية للذاكرة في  PHP الى <b>%s</b> . من المفترض ان تكون كافية.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/ar_SA/intracommreport.lang b/htdocs/langs/ar_SA/intracommreport.lang
new file mode 100644
index 00000000000..a95f6d10e9e
--- /dev/null
+++ b/htdocs/langs/ar_SA/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=قائمة
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/ar_SA/languages.lang b/htdocs/langs/ar_SA/languages.lang
index 065aec3d17b..e239913fec6 100644
--- a/htdocs/langs/ar_SA/languages.lang
+++ b/htdocs/langs/ar_SA/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=الإسبانية (بنما)
 Language_es_PY=الأسبانية (باراغواي)
 Language_es_PE=الإسبانية (بيرو)
 Language_es_PR=الأسبانية (بورتو ريكو)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=الإسبانية (فنزويلا)
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index aab36cc5808..7e4057e374a 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -155,6 +155,7 @@ RemoveLink=نلغي
 AddToDraft=Add to draft
 Update=تحديث
 Close=إغلاق
+CloseAs=Set status to
 CloseBox=Remove widget from your dashboard
 Confirm=تأكيد
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=إعادة فتح
 Upload=Upload
 ToLink=حلقة الوصل
 Select=اختار
+SelectAll=Select all
 Choose=أختر
 Resize=تغيير
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=بطاقات
 Card=بطاقة
 Now=الآن
 HourStart=بدء ساعة
+Deadline=Deadline
 Date=التاريخ
 DateAndHour=التاريخ و الساعة
 DateToday=Today's date
@@ -264,8 +267,10 @@ DateStart=تاريخ البدء
 DateEnd=تاريخ الانتهاء
 DateCreation=تاريخ الإنشاء
 DateCreationShort=يخلق. التاريخ
+IPCreation=Creation IP
 DateModification=تاريخ التعديل
 DateModificationShort=Modif. التاريخ
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=تاريخ التحقق من الصحة
 DateClosing=الموعد النهائي
@@ -319,6 +324,7 @@ Morning=صباح
 Afternoon=بعد الزوال
 Quadri=قادري
 MonthOfDay=شهر من اليوم
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=مليون
 Rate=معدل
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=مبلغ الضريبة 2
 AmountLT2=مبلغ الضريبة 3
 AmountLT1ES=كمية RE
@@ -487,6 +494,7 @@ By=بواسطة
 From=من عند
 FromDate=من عند
 FromLocation=من عند
+at=at
 to=إلى
 To=إلى
 and=و
@@ -509,6 +517,7 @@ Draft=مسودة
 Drafts=الداما
 StatusInterInvoiced=Invoiced
 Validated=التحقق من صحة
+ValidatedToProduce=Validated (To produce)
 Opened=فتح
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=رد
 Priority=الأولوية
 SendByMail=Send by email
 MailSentBy=البريد الإلكتروني التي بعث بها
+NotSent=لم يرسل
 TextUsedInTheMessageBody=هيئة البريد الإلكتروني
 SendAcknowledgementByMail=Send confirmation email
 SendMail=إرسال بريد إلكتروني
@@ -836,6 +846,7 @@ ListOfTemplates=قائمة القوالب
 Gender=جنس
 Genderman=رجل
 Genderwoman=امرأة
+Genderother=الآخر
 ViewList=عرض القائمة
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=متفرقات
 Calendar=التقويم
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=تقارير المصاريف
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=مدفوعات متنوعة
 CommentLink=تعليقات
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=معلومات
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=تاريخ الميلاد
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/ar_SA/members.lang b/htdocs/langs/ar_SA/members.lang
index 8793c6b77cd..98666fd6674 100644
--- a/htdocs/langs/ar_SA/members.lang
+++ b/htdocs/langs/ar_SA/members.lang
@@ -19,14 +19,12 @@ MembersCards=أعضاء طباعة البطاقات
 MembersList=قائمة الأعضاء
 MembersListToValid=قائمة مشاريع أعضاء (ينبغي التأكد من صحة)
 MembersListValid=قائمة أعضاء صالحة
-MembersListUpToDate=قائمة الأعضاء صالحة لغاية تاريخ الاكتتاب
-MembersListNotUpToDate=قائمة صحيحة مع أعضاء من تاريخ الاكتتاب
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=قائمة الأعضاء المؤهلين
 MenuMembersToValidate=أعضاء مشروع
 MenuMembersValidated=صادق أعضاء
-MenuMembersUpToDate=حتى الآن من أعضاء
-MenuMembersNotUpToDate=وحتى الآن من أصل أعضاء
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=أعضاء مع اشتراك لتلقي
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=تاريخ الاكتتاب
 DateEndSubscription=تاريخ انتهاء الاكتتاب
 EndSubscription=انتهاء الاكتتاب
 SubscriptionId=الاكتتاب معرف
+WithoutSubscription=Without subscription
 MemberId=عضو المعرف
 NewMember=عضو جديد
 MemberType=عضو نوع
@@ -81,7 +80,7 @@ DeleteType=حذف
 VoteAllowed=يسمح التصويت
 Physical=المادية
 Moral=الأخلاقية
-MorPhy=طبيعة
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=أعضاء إحصاءات الولاية / المقاط
 MembersStatisticsByTown=أعضاء إحصاءات بلدة
 MembersStatisticsByRegion=إحصائيات الأعضاء حسب المنطقة
 NbOfMembers=عدد الأعضاء
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=العثور على أي أعضاء التحقق من صحة
 MembersByCountryDesc=هذه الشاشة تظهر لك إحصاءات عن أعضاء من الدول. لكن الرسم يعتمد على خدمة غوغل الرسم البياني على الإنترنت ويتوفر فقط إذا كان على اتصال بالإنترنت ويعمل.
 MembersByStateDesc=هذه الشاشة تظهر لك إحصاءات عن أفراد من قبل الدولة / المحافظات / كانتون.
@@ -176,6 +177,7 @@ MenuMembersStats=إحصائيات
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=معلومات علنية
 NewMemberbyWeb=وأضاف عضو جديد. تنتظر الموافقة
 NewMemberForm=الأعضاء الجدد في شكل
diff --git a/htdocs/langs/ar_SA/mrp.lang b/htdocs/langs/ar_SA/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/ar_SA/mrp.lang
+++ b/htdocs/langs/ar_SA/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index 6515241f6e6..0db9c6d5673 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=عدد من السعر
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=عدد المنتجات التي تنتج هذا المنتج الإفتراضي
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=عدد منتج التعبئة الاب
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=إذا كان 0، هذا المنتج ليس منتج إفتراضي
-IfZeroItIsNotUsedByVirtualProduct=إذا كان 0، لا يتم استخدام هذا المنتج من قبل أي منتج إفتراضي
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=فلتر الكلمة المقتاحية
 CategoryFilter=فلتر التصنيف
 ProductToAddSearch= إبحث عن منتج لإضافتة
 NoMatchFound=لا يوجد نتائج متطابقة
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=قائمة من المنتجات / الخدمات الإفتراضية مع هذا المنتج كعنصر مكون
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=واحد من اختيار المنتج الأم الحالية المنتج
 DeleteProduct=حذف منتج / خدمة
 ConfirmDeleteProduct=هل أنت متأكد من حذف هذا المنتج / الخدمة؟
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=القيم العالمية المتاحة:
 PriceMode=وضع السعر
 PriceNumeric=عدد
 DefaultPrice=سعر افتراضي
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=زيادة / نقصان الأسهم على التغيير الأم
 ComposedProduct=Child products
 MinSupplierPrice=الحد الأدنى من سعر الشراء
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/ar_SA/recruitment.lang b/htdocs/langs/ar_SA/recruitment.lang
index a3f61ffc4ff..9c348486cdb 100644
--- a/htdocs/langs/ar_SA/recruitment.lang
+++ b/htdocs/langs/ar_SA/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/ar_SA/stocks.lang b/htdocs/langs/ar_SA/stocks.lang
index 681a987ef17..09cf9dbae0b 100644
--- a/htdocs/langs/ar_SA/stocks.lang
+++ b/htdocs/langs/ar_SA/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=منطقة المستودعات
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=عوضا عن
 LocationSummary=باختصار اسم الموقع
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=أن تأمر
 Replenishment=التجديد
 ReplenishmentOrders=أوامر التجديد
-VirtualDiffersFromPhysical=وفقا للزيادة / نقصان خيارات الأسهم، والمخزون المادي والأسهم الظاهري (الطلبات الحالية المادية +) قد تختلف
-UseVirtualStockByDefault=استخدام الأسهم الظاهري افتراضيا، بدلا من المخزون المادي، لميزة تجديد
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=استخدام الأسهم الظاهري
 UsePhysicalStock=استخدام المخزون المادي
 CurentSelectionMode=وضع التحديد الحالي
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=فئة فلتر
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/ar_SA/suppliers.lang b/htdocs/langs/ar_SA/suppliers.lang
index dfdc55be12c..70bcc53eddb 100644
--- a/htdocs/langs/ar_SA/suppliers.lang
+++ b/htdocs/langs/ar_SA/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/ar_SA/website.lang b/htdocs/langs/ar_SA/website.lang
index 2324aec419b..f271ef38fe8 100644
--- a/htdocs/langs/ar_SA/website.lang
+++ b/htdocs/langs/ar_SA/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=صفحة
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=تغذية RSS
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/az_AZ/accountancy.lang b/htdocs/langs/az_AZ/accountancy.lang
index 7b59e33b296..3211a0b62df 100644
--- a/htdocs/langs/az_AZ/accountancy.lang
+++ b/htdocs/langs/az_AZ/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting expert
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=Journals
+Journals=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Chart of accounts
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bank accounts
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=By year
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/az_AZ/admin.lang b/htdocs/langs/az_AZ/admin.lang
index d7c4eb282cd..f1c41a3b62b 100644
--- a/htdocs/langs/az_AZ/admin.lang
+++ b/htdocs/langs/az_AZ/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
 CurrentTimeZone=TimeZone PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Interventions
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
+Permission13=Invalidate customer invoices
 Permission14=Validate customer invoices
 Permission15=Send customer invoices by email
 Permission16=Create payments for customer invoices
@@ -688,6 +694,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Read members
 Permission72=Create/modify members
 Permission74=Delete members
@@ -718,6 +728,7 @@ Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
@@ -825,10 +836,11 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Edition of field %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1282,7 +1322,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Global parameters
@@ -1523,7 +1564,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Level
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
@@ -1629,7 +1672,7 @@ AdvancedEditor=Advanced editor
 ActivateFCKeditor=Activate advanced editor for:
 FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
 FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
-MailToProject=Projects page
+MailToProject=Projects
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/az_AZ/banks.lang b/htdocs/langs/az_AZ/banks.lang
index 75f9549dca5..9500a5b8b2e 100644
--- a/htdocs/langs/az_AZ/banks.lang
+++ b/htdocs/langs/az_AZ/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/az_AZ/categories.lang b/htdocs/langs/az_AZ/categories.lang
index 9bb71984ecf..ba37a43b4ec 100644
--- a/htdocs/langs/az_AZ/categories.lang
+++ b/htdocs/langs/az_AZ/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/az_AZ/companies.lang b/htdocs/langs/az_AZ/companies.lang
index 92674363ced..dadff6a7894 100644
--- a/htdocs/langs/az_AZ/companies.lang
+++ b/htdocs/langs/az_AZ/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
 ProspectLevel=Prospect potential
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Currency
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/az_AZ/ecm.lang b/htdocs/langs/az_AZ/ecm.lang
index 369ac6dfdfa..71df60734fb 100644
--- a/htdocs/langs/az_AZ/ecm.lang
+++ b/htdocs/langs/az_AZ/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Search by keywords
 ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to vendor proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/az_AZ/hrm.lang b/htdocs/langs/az_AZ/hrm.lang
index 6cc7f6bef24..3b8f137e103 100644
--- a/htdocs/langs/az_AZ/hrm.lang
+++ b/htdocs/langs/az_AZ/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Employees
 Employee=Employee
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/az_AZ/install.lang b/htdocs/langs/az_AZ/install.lang
index 2d708c04147..63947dad154 100644
--- a/htdocs/langs/az_AZ/install.lang
+++ b/htdocs/langs/az_AZ/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=This PHP supports sessions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/az_AZ/intracommreport.lang b/htdocs/langs/az_AZ/intracommreport.lang
new file mode 100644
index 00000000000..3060300b974
--- /dev/null
+++ b/htdocs/langs/az_AZ/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=List
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/az_AZ/languages.lang b/htdocs/langs/az_AZ/languages.lang
index cc80b9f1719..ba187326705 100644
--- a/htdocs/langs/az_AZ/languages.lang
+++ b/htdocs/langs/az_AZ/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/az_AZ/main.lang b/htdocs/langs/az_AZ/main.lang
index 0af5c66f0e0..96c68cdcfa3 100644
--- a/htdocs/langs/az_AZ/main.lang
+++ b/htdocs/langs/az_AZ/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Remove link
 AddToDraft=Add to draft
 Update=Update
 Close=Close
+CloseAs=Set status to
 CloseBox=Remove widget from your dashboard
 Confirm=Confirm
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Re-Open
 Upload=Upload
 ToLink=Link
 Select=Select
+SelectAll=Select all
 Choose=Choose
 Resize=Resize
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=Cards
 Card=Card
 Now=Now
 HourStart=Start hour
+Deadline=Deadline
 Date=Date
 DateAndHour=Date and hour
 DateToday=Today's date
@@ -264,8 +267,10 @@ DateStart=Start date
 DateEnd=End date
 DateCreation=Creation date
 DateCreationShort=Creat. date
+IPCreation=Creation IP
 DateModification=Modification date
 DateModificationShort=Modif. date
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
@@ -319,6 +324,7 @@ Morning=Morning
 Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Month of the day
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Rate
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Amount tax 2
 AmountLT2=Amount tax 3
 AmountLT1ES=Amount RE
@@ -487,6 +494,7 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
+at=at
 to=to
 To=to
 and=and
@@ -509,6 +517,7 @@ Draft=Draft
 Drafts=Drafts
 StatusInterInvoiced=Invoiced
 Validated=Validated
+ValidatedToProduce=Validated (To produce)
 Opened=Open
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Response
 Priority=Priority
 SendByMail=Send by email
 MailSentBy=Email sent by
+NotSent=Not sent
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
@@ -836,6 +846,7 @@ ListOfTemplates=List of templates
 Gender=Gender
 Genderman=Man
 Genderwoman=Woman
+Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Comments
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Information
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Date of birth
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/az_AZ/members.lang b/htdocs/langs/az_AZ/members.lang
index 5ef946ddf67..5812248b129 100644
--- a/htdocs/langs/az_AZ/members.lang
+++ b/htdocs/langs/az_AZ/members.lang
@@ -19,14 +19,12 @@ MembersCards=Members business cards
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
 SubscriptionId=Subscription id
+WithoutSubscription=Without subscription
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@@ -81,7 +80,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/az_AZ/mrp.lang b/htdocs/langs/az_AZ/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/az_AZ/mrp.lang
+++ b/htdocs/langs/az_AZ/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/az_AZ/products.lang b/htdocs/langs/az_AZ/products.lang
index b59aa2f7080..97db059594f 100644
--- a/htdocs/langs/az_AZ/products.lang
+++ b/htdocs/langs/az_AZ/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/az_AZ/recruitment.lang b/htdocs/langs/az_AZ/recruitment.lang
index 73e9a7fa07f..b775e78552e 100644
--- a/htdocs/langs/az_AZ/recruitment.lang
+++ b/htdocs/langs/az_AZ/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/az_AZ/stocks.lang b/htdocs/langs/az_AZ/stocks.lang
index 81163e8d4b0..660443bcded 100644
--- a/htdocs/langs/az_AZ/stocks.lang
+++ b/htdocs/langs/az_AZ/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/az_AZ/suppliers.lang b/htdocs/langs/az_AZ/suppliers.lang
index 51562b8bb7a..03b03c75269 100644
--- a/htdocs/langs/az_AZ/suppliers.lang
+++ b/htdocs/langs/az_AZ/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/az_AZ/website.lang b/htdocs/langs/az_AZ/website.lang
index 4b5294d5e43..03e042e4be6 100644
--- a/htdocs/langs/az_AZ/website.lang
+++ b/htdocs/langs/az_AZ/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
index 2841467f8c7..89ff86ac06d 100644
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=По подразбиране за услуга
 DefaultForProduct=По подразбиране за продукт
 CantSuggest=Не може да се предложи
 AccountancySetupDoneFromAccountancyMenu=Повечето настройки на счетоводството се извършват от менюто %s
-ConfigAccountingExpert=Конфигурация на модул за експертно счетоводство
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Осчетоводяване
-Journaux=Журнали
+Journals=Журнали
 JournalFinancial=Финансови журнали
 BackToChartofaccounts=Връщане към сметкоплана
 Chartofaccounts=Сметкоплан
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Текуща специална сметка
 AssignDedicatedAccountingAccount=Нова сметка за присвояване
 InvoiceLabel=Име за фактура
@@ -33,8 +35,8 @@ OtherInfo=Друга информация
 DeleteCptCategory=Премахване на счетоводна сметка от група
 ConfirmDeleteCptCategory=Сигурни ли сте, че искате да премахнете тази счетоводна сметка от групата счетоводни сметки?
 JournalizationInLedgerStatus=Статус на осчетоводяване
-AlreadyInGeneralLedger=Вече осчетоводено в главната счетоводна книга
-NotYetInGeneralLedger=Все още не е осчетоводено в главната счетоводна книга
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Групата е празна, проверете настройката на персонализираната счетоводна група
 DetailByAccount=Показване на детайли по сметка
 AccountWithNonZeroValues=Сметки с различни от нула стойности
@@ -43,7 +45,9 @@ CountriesInEEC=Държави в ЕИО
 CountriesNotInEEC=Държави извън ЕИО
 CountriesInEECExceptMe=Държави в ЕИО, с изключение на %s
 CountriesExceptMe=Всички държави с изключение на %s
-AccountantFiles=Експортиране на счетоводни документи
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Основна счетоводна сметка за клиенти, която не е дефинирана в настройката
 MainAccountForSuppliersNotDefined=Основна счетоводна сметка за доставчици, която не е дефинирана в настройката
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=СТЪПКА %s: Добавете или промен
 
 AccountancyAreaDescClosePeriod=СТЪПКА %s: Приключете периода, за да не може да се правят промени в бъдеще.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=Задължителна стъпка в настройката не е завършена (счетоводен код на журнал не е определен за всички банкови сметки)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Изберете активен сметкоплан
 ChangeAndLoad=Променяне и зареждане
 Addanaccount=Добавяне на счетоводна сметка
@@ -89,6 +93,8 @@ SubledgerAccount=Счетоводна сметка
 SubledgerAccountLabel=Име на счетоводна сметка
 ShowAccountingAccount=Показване на счетоводна сметка
 ShowAccountingJournal=Показване на счетоводен журнал
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Предложена счетоводна сметка
 MenuDefaultAccounts=Сметки по подразбиране
 MenuBankAccounts=Банкови сметки
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Обвързващ на разходен отчет
 CreateMvts=Създаване на нова транзакция
 UpdateMvts=Променяне на транзакция
 ValidTransaction=Валидиране на транзакция
-WriteBookKeeping=Регистриране на транзакции в главната счетоводна книга
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Главна счетоводна книга
+BookkeepingSubAccount=Subledger
 AccountBalance=Салдо по сметка
 ObjectsRef=Обект №
 CAHTF=Обща покупка от доставчик преди ДДС
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Деактивиране на директно доб
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Активиране на експортиране на журнали в състояние на чернова
 ACCOUNTANCY_COMBO_FOR_AUX=Активиране на комбиниран списък за дъщерна сметка (може да създаде забавяне, ако имате много контрагенти)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Журнал за продажби
 ACCOUNTING_PURCHASE_JOURNAL=Журнал за покупки
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Счетоводна сметка за изчакв
 DONATION_ACCOUNTINGACCOUNT=Счетоводна сметка за регистриране на дарения
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Счетоводен акаунт за регистриране на членски внос
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Счетоводна сметка по подразбиране за закупени продукти (използва се, ако не е определена в продуктовата карта)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Счетоводна сметка по подразбиране за закупени продукти в ЕИО (използва се, ако не е дефинирана в картата на продукта)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Счетоводна сметка по подразбиране за закупени продукти и внесени отвън ЕИО (използва се, ако не е дефинирана в картата на продукта)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=По предварително определени 
 ByPersonalizedAccountGroups=По персонализирани групи
 ByYear=По година
 NotMatch=Не е зададено
-DeleteMvt=Изтриване на редове от книгата
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Месец за изтриване
 DelYear=Година за изтриване
 DelJournal=Журнал за изтриване
-ConfirmDeleteMvt=Това ще изтрие всички редове в главната книгата за годината / месеца и / или от конкретен журнал (изисква се поне един критерий). Ще трябва да използвате повторно функцията „Регистриране в счетоводство“, за да върнете изтрития запис обратно в главната книга.
-ConfirmDeleteMvtPartial=Това ще изтрие транзакцията от книгата (всички редове, свързани с една и съща транзакция ще бъдат изтрити)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Финансов журнал
 ExpenseReportsJournal=Журнал за разходни отчети
 DescFinanceJournal=Финансов журнал, включващ всички видове плащания по банкова сметка
-DescJournalOnlyBindedVisible=Това е преглед на запис, който е свързан към счетоводна сметка и може да бъде добавен в книгата.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined= Не е определена сметка за ДДС
 ThirdpartyAccountNotDefined=Не е определена сметка за контрагент
 ProductAccountNotDefined=Не е определена сметка за продукт
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Този журнал вече се изпо
 AccountingAccountForSalesTaxAreDefinedInto=Бележка: Счетоводната сметка за данък върху продажбите е дефинирана в меню <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Брой записи
 NumberOfAccountancyMovements=Брой движения
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Експортиране на журнал в чернова
@@ -326,6 +339,8 @@ Modelcsv_configurable=Експортиране в конфигурируем CSV
 Modelcsv_FEC=Експортиране за FEC
 Modelcsv_Sage50_Swiss=Експортиране за Sage 50 Швейцария
 Modelcsv_winfic=Експортиране за Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Идентификатор на сметкоплан
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index cd0b1e059b1..d40a4f22556 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Разрешаване на свързването
 YourSession=Вашата сесия
 Sessions=Потребителски сесии
 WebUserGroup=Уеб сървър потребител / група
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Изглежда, че вашата PHP конфигурация не позволява изброяване на активни сесии. Директорията, използвана за запазване на сесии (<b> %s </b>), може да е защитена (например от права на операционната система или от директивата PHP open_basedir).
 DBStoringCharset=Кодиране на знаците при съхраняване в базата данни
 DBSortingCharset=Кодиране на знаците при сортиране в базата данни
@@ -71,7 +73,7 @@ DisableJavascriptNote=Забележка: За тестови цели или з
 UseSearchToSelectCompanyTooltip=Също така, ако имате голям брой контрагенти (> 100 000) може да увеличите скоростта като зададете стойност 1 за константата COMPANY_DONOTSEARCH_ANYWHERE в Настройки -> Други настройки. След това търсенето ще бъде ограничено до началото на низ.
 UseSearchToSelectContactTooltip=Също така, ако имате голям брой контакти (> 100 000) може да увеличите скоростта като зададете стойност 1 за константата CONTACT_DONOTSEARCH_ANYWHERE в Настройки -> Други настройки. След това търсенето ще бъде ограничено до началото на низ.
 DelaiedFullListToSelectCompany=Изчаква натискането на клавиш, преди да зареди съдържание в списъка с контрагенти. <br> Това може да увеличи производителността, ако имате голям брой контрагенти, но е по-малко удобно.
-DelaiedFullListToSelectContact=Изчаква натискането на клавиш, преди да зареди съдържание в списъка с контакти. <br> Това може да увеличи производителността, ако имате голям брой контакти, но е по-малко удобно
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Брой знаци предизвикващи търсене: %s
 NumberOfBytes=Брой байтове
 SearchString=Низ за търсене
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=В документ на контраген
 JavascriptDisabled=JavaScript е деактивиран
 UsePreviewTabs=Използвайте разделите за преглед
 ShowPreview=Показване на преглед
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Прегледът не е налице
 ThemeCurrentlyActive=Темата е активна в момента
 CurrentTimeZone=Времева зона на PHP (сървър)
@@ -271,7 +274,7 @@ NoticePeriod=Период на предизвестие
 NewByMonth=Нови на месец
 Emails=Имейли
 EMailsSetup=Настройка за имейл известяване
-EMailsDesc=Тази страница позволява да замените стандартните си PHP параметри за изпращане на имейли. В повечето случаи в Unix / Linux OS, PHP настройката е правилна и тези параметри не са необходими.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Профили за изходяща електронна поща
 EMailsSenderProfileDesc=Може да запазите тази секция празна. Ако въведете имейли тук, те ще бъдат добавени като възможни податели в комбинирания списък, когато пишете нов имейл.
 MAIN_MAIL_SMTP_PORT=SMTP / SMTPS порт (стойност по подразбиране в php.ini: <b> %s </b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP потребителско име (ако изпраща
 MAIN_MAIL_SMTPS_PW=SMTP парола (ако изпращащият сървър изисква удостоверяване)
 MAIN_MAIL_EMAIL_TLS=Използване на TLS (SSL) криптиране
 MAIN_MAIL_EMAIL_STARTTLS=Използване на TLS (STARTTLS) криптиране
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Използване на DKIM (DomainKeys Identified Mail) удостоверяване за генериране на подпис на имейл
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Имейл домейн за използване с DKIM
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Селектор на DKIM
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Оставяйки това поле празно о
 ExtrafieldParamHelpselect=Списъкът със стойности трябва да бъде във формат key,value (където key не може да бъде '0';) <br><br> например: <br> 1,value1 <br> 2,value2 <br> code3,value3 <br> ... <br><br> За да имате списъка в зависимост от друг допълнителен списък с атрибути: <br> 1,value1|options_ <i>parent_list_code</i>:parent_key<br>2,value2|options_ <i>parent_list_code</i>:parent_key <br><br> За да имате списъка в зависимост от друг списък: <br> 1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Списъкът със стойности трябва да бъде във формат key,value (където key не може да бъде '0') <br><br> например: <br> 1,value1 <br>2,value2 <br>3,value3<br> ...
 ExtrafieldParamHelpradio=Списъкът със стойности трябва да бъде във формат key,value (където key не може да бъде '0') <br><br> например: <br> 1,value1 <br>2,value2 <br>3,value3<br> ...
-ExtrafieldParamHelpsellist=Списъкът на стойностите идва от таблица <br>Синтаксис: table_name:label_field:id_field::filter<br> Пример: c_typent: libelle:id::filter <br><br> - idfilter е задължително основен int key <br> - филтърът може да бъде прост тест (например active = 1), за да се покаже само активна стойност <br> Може също да използвате $ID$ във филтъра, който е текущият идентификатор на текущия обект. <br>За да направите SELECT във филтъра, използвайте $SEL$ <br> ако искате да филтрирате по допълнителни полета, използвайте синтаксис extra.fieldcode=...(където кодът на полето е кодът на допълнителното поле) <br><br> За да имате списъка в зависимост от друг допълнителен списък с атрибути: <br> c_typent:libelle:id:options_ <i>parent_list_code</i>|parent_column:филтер<br><br> За да имате списъка в зависимост от друг списък: <br> c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Списъкът на стойностите идва от таблица <br> Синтаксис: table_name:label_field:id_field::filter <br> Пример: c_typent:libelle:id::filter <br><br> филтърът може да бъде прост тест (например active = 1), за да се покаже само активна стойност <br> Можете също да използвате $ID$ във филтъра, който е текущият идентификатор на текущия обект <br> За да направите SELECT във филтъра, използвайте $SEL$ <br> ако искате да филтрирате по допълнителни полета, използвайте синтаксис extra.fieldcode=...(където кодът на полето е кодът на екстра полето) <br><br> За да имате списъка в зависимост от друг допълнителен списък с атрибути: <br>c_typent:libelle:id:options_ <i>parent_list_code</i>|parent_column:filter<br><br> За да имате списъка в зависимост от друг списък: <br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Параметрите трябва да са ObjectName:Classpath<br>Синтаксис: ObjectName:Classpath<br>Примери: <br> Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Оставете празно за обикновен разделител<br>Посочете стойност 1 за разделител, който се свива (отворен по подразбиране за нова сесия, а след това състоянието се запазва за всяка потребителска сесия)<br>Посочете стойност 2 за разделител, който се свива (свит по подразбиране за нова сесия, а след това състоянието се запазва за всяка потребителска сесия).
 LibraryToBuildPDF=Използвана библиотека за създаване на PDF файлове
 LocalTaxDesc=Някои държави могат да прилагат два или три данъка към всеки ред във фактурата. Ако случаят е такъв, изберете вида на втория и третия данък и съответната данъчна ставка. Възможен тип са:<br>1: местен данък върху продукти и услуги без ДДС (местния данък се изчислява върху сумата без данък)<br>2: местен данък върху продукти и услуги с ДДС (местният данък се изчислява върху сумата + основния данък)<br>3: местен данък върху продукти без ДДС (местният данък се изчислява върху сумата без данък)<br>4: местен данък върху продукти с ДДС (местният данък се изчислява върху сумата + основния данък)<br>5: местен данък върху услуги без ДДС (местният данък се изчислява върху сумата без данък)<br>6: местен данък върху услуги с ДДС (местният данък се изчислява върху сумата + основния данък)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s, последвано от съкрате
 ModuleCompanyCodeSupplierDigitaria=%s, последвано от съкратеното име на доставчика според броя на знаци: %s за счетоводния код на доставчика.
 Use3StepsApproval=По подразбиране поръчките за покупки трябва да бъдат създадени и одобрени от двама различни потребители (една стъпка / потребител за създаване и друга стъпка / потребител за одобрение. Обърнете внимание, че ако потребителят има разрешение да създава и одобрява, една стъпка / потребител ще бъде достатъчно). С тази опция може да поискате да въведете трета стъпка / потребител за одобрение, ако сумата е по-висока от определена стойност (така ще са необходими 3 стъпки: 1 = валидиране, 2 = първо одобрение и 3 = второ одобрение, ако количеството е достатъчно).<br> Оставете това поле празно, ако едно одобрение (в 2 стъпки) е достатъчно или посочете много ниска стойност (например: 0,1), за да се изисква винаги второ одобрение (в 3 стъпки).
 UseDoubleApproval=Използване на одобрение в 3 стъпки, когато сумата (без данък) е по-голяма от...
-WarningPHPMail=ВНИМАНИЕ: За предпочитане е да настроите изпращането на имейли,  да използва имейл сървъра на вашия доставчик, вместо настройката по подразбиране. Някои доставчици на електронна поща (като Yahoo) не позволяват да изпращате имейл от друг сървър, освен от собствения им сървър. Текущата настройка използва сървъра на приложението за изпращане на имейли, а не на сървъра на вашия доставчик на електронна поща, така че някои получатели (съвместими с ограничителния DMARC протокол), ще попитат вашия доставчик на електронна поща дали могат да приемат имейлът ви, а някои доставчици на електронна поща (като Yahoo) ще отговорят "не", защото сървърът не е техен, така че някои от изпратените имейли може да не бъдат приети (бъдете внимателни и с квотата за изпращане на вашия имейл доставчик).<br>Ако вашият доставчик на имейл (като Yahoo) има това ограничение, трябва да промените настройката и да изберете другия метод "SMTP сървър" и да въведете SMTP сървъра и идентификационните данни, предоставени от вашия доставчик на електронна поща.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=Ако вашият SMTP доставчик трябва да ограничи имейл клиента до някои IP адреси (много рядко), това е IP адресът на потребителския агент за поща (MUA) за вашето ERP CRM приложение: <strong>%s</strong> .
-WarningPHPMailSPF=Ако името на домейна във вашият имейл адрес за изпращане е защитен от SPF (попитайте вашия имейл доставчик), то трябва да включите следните IP адреси в SPF записа на DNS на вашия домейн: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Кликнете, за да се покаже описание
 DependsOn=Този модул се нуждае от модул(и)
 RequiredBy=Този модул изисква модул(и)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Интегриране на система ClickToDial (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Добавяне на функция за генериране на Bookmark4u профил от Dolibarr профил
 Module60Name=Стикери
 Module60Desc=Управление на стикери
 Module70Name=Интервенции
@@ -656,7 +662,7 @@ Module50200Desc=Предлага на клиентите PayPal страница
 Module50300Name=Stripe
 Module50300Desc=Предлага на клиентите Stripe страница за онлайн плащане (чрез кредитни / дебитни карти). Позволява на клиентите да извършват необходими плащания или плащания, свързани с определен Dolibarr обект (фактура, поръчка и т.н.)
 Module50400Name=Счетоводство (двойно записване)
-Module50400Desc=Управление на счетоводство (двойни вписвания, поддържат се общи и спомагателни счетоводни книги). Експортиране на счетоводната книга в други формати за счетоводен софтуер.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Директен печат (без отваряне на документи), чрез използване на Cups IPP интерфейс (Принтерът трябва да се вижда от сървъра, a CUPS трябва да бъде инсталиран на сървъра).
 Module55000Name=Анкети, проучвания и гласоподаване
@@ -671,7 +677,7 @@ Module63000Name=Ресурси
 Module63000Desc=Управление на ресурси (принтери, коли, стаи, ...) с цел разпределяне по събития
 Permission11=Преглед на фактури за продажба
 Permission12=Създаване / променяне на фактури на продажба
-Permission13=Анулиране на фактури за продажба
+Permission13=Invalidate customer invoices
 Permission14=Валидиране на фактури за продажба
 Permission15=Изпращане на фактури за продажба по имейл
 Permission16=Създаване на плащания по фактури за продажба
@@ -688,6 +694,7 @@ Permission32=Създаване / променяне на продукти
 Permission34=Изтриване на продукти
 Permission36=Преглед / управление на скрити продукти
 Permission38=Експортиране на продукти
+Permission39=Ignore minimum price
 Permission41=Преглед на проекти и задачи (споделени проекти и проекти, в които съм определен за контакт). Въвеждане на отделено време, за служителя или неговите подчинени, по възложени задачи (График)
 Permission42=Създаване / променяне на проекти (споделени проекти и проекти, в които съм определен за контакт). Създаване на задачи и възлагане на проекти и задачи на потребители
 Permission44=Изтриване на проекти (споделени проекти и проекти, в които съм определен за контакт)
@@ -696,6 +703,9 @@ Permission61=Преглед на интервенции
 Permission62=Създаване / променяне на интервенции
 Permission64=Изтриване на интервенции
 Permission67=Експортиране на интервенции
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Преглед на членове
 Permission72=Създаване / променяне на членове
 Permission74=Изтриване на членове
@@ -718,6 +728,7 @@ Permission95=Преглед на справки
 Permission101=Преглед на пратки
 Permission102=Създаване / променяне на пратки
 Permission104=Валидиране на пратки
+Permission105=Send sendings by email
 Permission106=Експортиране на пратки
 Permission109=Изтриване на пратки
 Permission111=Преглед на финансови сметки
@@ -825,10 +836,11 @@ Permission402=Създаване / променяне на отстъпки
 Permission403=Валидиране на отстъпки
 Permission404=Изтриване на отстъпки
 Permission430=Използване на инструменти за отстраняване на грешки
-Permission511=Преглед на плащания на заплати
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Създаване / променяне на плащания на заплати
 Permission514=Изтриване на плащания на заплати
-Permission517=Експортиране на заплати
+Permission517=Read payments of salaries of everybody
+Permission519=Експортиране на заплати
 Permission520=Преглед на кредити
 Permission522=Създаване / променяне на кредити
 Permission524=Изтриване на кредити
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Преглед на спецификации
 Permission651=Създаване / променяне на спецификации
 Permission652=Изтриване на спецификации
@@ -884,7 +899,9 @@ Permission1185=Одобряване на поръчки за покупка
 Permission1186=Поръчка на поръчки за покупка
 Permission1187=Потвърждаване на получаването на поръчка за покупка
 Permission1188=Изтриване на поръчки за покупка
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Одобряване (второ одобрение) на поръчки за покупка
+Permission1191=Export supplier orders and their attributes
 Permission1201=Получаване на резултат с експортирани данни
 Permission1202=Създаване / променяне на експортирани данни
 Permission1231=Преглед на фактури за доставка
@@ -898,6 +915,8 @@ Permission1251=Извършване на масово импортиране н
 Permission1321=Експортиране на фактури за продажба, атрибути и плащания
 Permission1322=Повторно отваряне на платена фактура
 Permission1421=Експортиране на поръчки за продажба и атрибути
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Преглед на действия (събития или задачи), свързани с потребителя (ако е собственик на събитие или му е възложено)
 Permission2402=Създаване / променяне на действия (събития или задачи), свързани с потребителя (ако е собственик на събитие)
 Permission2403=Изтриване на действия (събития или задачи), свързани с потребителя (ако е собственик на събитие)
@@ -932,9 +951,13 @@ Permission23001=Преглед на планирани задачи
 Permission23002=Създаване / променяне на планирани задачи
 Permission23003=Изтриване на планирани задачи
 Permission23004=Стартиране на планирани задачи
-Permission50101=Използване на точка на продажба
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Преглед на транзакции
 Permission50202=Импортиране на транзакции
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Свързване на продукти и фактури със счетоводни сметки
 Permission50411=Преглед на операции в счетоводна книга
 Permission50412=Създаване / променяне на операции в счетоводна книга
@@ -958,6 +981,17 @@ Permission63001=Преглед на ресурси
 Permission63002=Създаване / променяне на ресурси
 Permission63003=Изтриване на ресурси
 Permission63004=Свързване на ресурси към събития от календара
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Видове контрагенти
 DictionaryCompanyJuridicalType=Правна форма на контрагенти
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Видове отпуск
 DictionaryOpportunityStatus=Статус на възможността за проект / възможност
 DictionaryExpenseTaxCat=Разходен отчет - Транспортни категории
 DictionaryExpenseTaxRange=Разходен отчет - Обхват на транспортни категории
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Настройката е запазена
 SetupNotSaved=Настройката не е запазена
 BackToModuleList=Назад към списъка с модули
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Име, използвано по подразбиране, 
 LabelOnDocuments=Текст в документи
 LabelOrTranslationKey=Име или ключ за превод
 ValueOfConstantKey=Стойност на конфигурационна константа
+ConstantIsOn=Option %s is on
 NbOfDays=Брой дни
 AtEndOfMonth=В края на месеца
 CurrentNext=Текущ/Следващ
@@ -1145,6 +1182,7 @@ InfoWebServer=Относно уеб сървър
 InfoDatabase=Относно база данни
 InfoPHP=Относно PHP
 InfoPerf=Относно производителност
+InfoSecurity=About Security
 BrowserName=Име на браузър
 BrowserOS=ОС на браузър
 ListOfSecurityEvents=Списък на събития относно сигурността в Dolibarr
@@ -1194,7 +1232,8 @@ RestoreDesc=Възстановяването на Dolibarr от архивно 
 RestoreDesc2=Възстановете от архивният файл (например zip файл) директорията "documents" в нова Dolibarr инсталация или в "documents" директорията на текущата инсталация (<b>%s</b>).
 RestoreDesc3=Възстановете структурата на базата данни и данните от архивния файл в базата данни на новата Dolibarr инсталация или в базата данни (<b>%s</b>) на настоящата инсталация. Внимание, след като възстановяването приключи, трябва да използвате  потребителско име и парола, които са били налични по време на архивирането / инсталацията, за да се свържете отново.<br>За да възстановите архивирана база данни в тази текущата инсталация, може да използвате следния асистент.
 RestoreMySQL=Импортиране на MySQL
-ForcedToByAModule= Това правило е принудено да <b>%s</b>, чрез активиран модул
+ForcedToByAModule=Това правило е принудено да <b>%s</b>, чрез активиран модул
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Съществуващи архивни файлове
 PreviousArchiveFiles=Съществуващи архивни файлове
 WeekStartOnDay=Първи ден от седмицата
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP компонент %s е зареден
 PreloadOPCode=Използва се предварително зареден OPCode
 AddRefInList=Показване на кода на клиента / доставчика в списъка (select list или combobox) и повечето от хипервръзките.<br>Контрагентите ще се появят с формат на името "CC12345 - SC45678 - Голяма фирма ЕООД", вместо "Голяма фирма ЕООД"
 AddAdressInList=Показване на списъка с информация за адреса на клиента / доставчика (изборен списък или комбиниран списък).<br>Контрагентите ще се появят с формат на името на "Име на фирма - Адрес Пощ. код Град - Държава", вместо "Име на фирма".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Запитване към контрагенти за предпочитан начин на доставка
 FieldEdition=Издание на поле %s
 FillThisOnlyIfRequired=Пример: +2 (попълнете само ако има проблеми с компенсирането на часовата зона)
@@ -1282,7 +1322,7 @@ GetBarCode=Получаване на баркод
 NumberingModules=Модели за номериране
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Връщане на парола, генерирана според вътрешния Dolibarr алгоритъм: 8 символа, съдържащи споделени числа и символи с малки букви
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Да не се предлага генерирана парола. Паролата трябва да бъде въведена ръчно.
 PasswordGenerationPerso=Връщане на парола според вашата лично дефинирана конфигурация
 SetupPerso=Според вашата конфигурация
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Необходим е имейл при създаване
 MemberSendInformationByMailByDefault=По подразбиране е активирано изпращането на потвърждение, чрез имейл до членове (валидиране или нов абонамент)
 VisitorCanChooseItsPaymentMode=Посетителят може да избира от наличните начини на плащане
 MEMBER_REMINDER_EMAIL=Активиране на автоматично напомняне, <b>чрез имейл </b> за изтекли абонаменти. Забележка: Модул <strong>%s</strong> трябва да е активиран и правилно настроен за изпращане на напомняния.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=Настройка на LDAP
 LDAPGlobalParameters=Глобални параметри
@@ -1523,7 +1564,9 @@ LDAPDescValues=Примерните стойности са предназнач
 ForANonAnonymousAccess=За удостоверен достъп (например за достъп за писане)
 PerfDolibarr=Настройка за производителност / отчет за оптимизация
 YouMayFindPerfAdviceHere=Тази страница предоставя някои проверки или съвети, свързани с производителността.
-NotInstalled=Не е инсталирано, така че вашият сървър не се забавя от това.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Приложим кеш
 MemcachedNotAvailable=Не е намерен приложим кеш. Може да подобрите производителността, чрез инсталиране на кеш сървър Memcached и модул, който може да използва този кеш сървър. <br> Повече информация може да откриете тук <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>. <br> Имайте предвид, че много уеб хостинг доставчици не предоставят такъв кеш сървър.
 MemcachedModuleAvailableButNotSetup=Намерен е модул Memcached за приложим кеш, но настройката на модула не е завършена.
@@ -1571,9 +1614,9 @@ SyslogLevel=Ниво
 SyslogFilename=Име на файла и път
 YouCanUseDOL_DATA_ROOT=Може да използвате DOL_DATA_ROOT/dolibarr.log за регистрационен файл в Dolibarr "documents" директорията. Може да зададете различен път за съхранение на този файл.
 ErrorUnknownSyslogConstant=Константата %s не е известна константа на Syslog
-OnlyWindowsLOG_USER=Windows поддържа само LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Компресиране и архивиране на журнали за грешки (генерирани от модула Журнали за отстраняване на грешки)
-SyslogFileNumberOfSaves=Архивирани журнали
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Конфигурирайте планираната задача за почистване, за да зададете честотата на архивиране на журнала
 ##### Donations #####
 DonationsSetup=Настройка на модула за дарения
@@ -1629,7 +1672,7 @@ AdvancedEditor=Разширен редактор
 ActivateFCKeditor=Активиране на разширен редактор за:
 FCKeditorForCompany=WYSIWIG създаване / промяна на описание на елементите и бележки (с изключение на продукти / услуги)
 FCKeditorForProduct=WYSIWIG  създаване / промяна на описание на продукти / услуги
-FCKeditorForProductDetails=WYSIWIG създаване / променяне на продуктови редове за всички обекти (предложения, поръчки, фактури и др.). <font class="warning">Внимание: Използването на тази опция не се препоръчва, тъй като може да създаде проблеми с някои специални символи и при форматиране на страниците, по време на генериране на PDF файловете.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG създаване / промяна на масови имейли (Инструменти -> Масови имейли)
 FCKeditorForUserSignature=WYSIWIG създаване / промяна на подпис на потребители
 FCKeditorForMail=WYSIWIG създаване / променяне на цялата поща (с изключение на Настройка -> Имейли)
@@ -1639,11 +1682,11 @@ StockSetup=Настройка на модул Наличности
 IfYouUsePointOfSaleCheckModule=Ако използвате модула точка за продажби (ПОС), предоставен по подразбиране или чрез външен модул, тази настройка може да бъде игнорирана от вашия ПОС модул. Повечето ПОС модули по подразбиране са разработени да създават веднага фактура, след което да намаляват наличностите, независимо от опциите тук. В случай, че имате нужда или не от автоматично намаляване на наличностите при регистриране на продажба от ПОС проверете и настройката на вашия ПОС модул.
 ##### Menu #####
 MenuDeleted=Менюто е изтрито
+Menu=Menu
 Menus=Менюта
 TreeMenuPersonalized=Персонализирани менюта
 NotTopTreeMenuPersonalized=Персонализирани менюта, които не са свързани с главното меню
 NewMenu=Ново меню
-Menu=Избор на меню
 MenuHandler=Манипулатор на меню
 MenuModule=Модул източник
 HideUnauthorizedMenu= Скриване на неоторизирани (сиви) менюта
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Автоматично задаване на ст
 AGENDA_DEFAULT_FILTER_TYPE=Автоматично задаване на стойност по подразбиране за вид събитие във филтъра за търсене на календара
 AGENDA_DEFAULT_FILTER_STATUS=Автоматично задаване на стойност по подразбиране за статус на събитие във филтъра за търсене на календара
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Активиране на напомняне за събития, <b>чрез имейли</b> (опцията за напомняне / закъснение може да бъде определена за всяко събитие). Забележка: Модулът <strong>%s</strong> трябва да бъде активиран и правилно настроен, за да се изпращат напомняния в определеното време.
-AGENDA_REMINDER_BROWSER=Активиране на напомняне за събития <b>в браузъра на потребителя</b> (когато бъде достигната датата на събитието, всеки потребител може да отхвърли известието от браузъра)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Активиране на звуково известяване
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Показване на свързания обект в календара
 ##### Clicktodial #####
 ClickToDialSetup=Настройка на модула за набиране (ClickToDial)
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0: Начин на плащане за клиент, 1: Начи
 IncludePath=Включва път (дефиниран в променлива %s)
 ExpenseReportsSetup=Настройка на модула за разходни отчети
 TemplatePDFExpenseReports=Шаблони на документи за разходни отчети
-ExpenseReportsIkSetup=Настройка на модул Разходни отчети - Показания на километража
 ExpenseReportsRulesSetup=Настройка на модул Разходни отчети - Правила
 ExpenseReportNumberingModules=Модул за номериране на разходни отчети
 NoModueToManageStockIncrease=Не е активиран модул, способен да управлява автоматичното увеличаване на наличности. Увеличаването на наличности ще се извършва само при ръчно въвеждане.
@@ -1864,7 +1907,7 @@ MailToSendReception=Стокови разписки
 MailToThirdparty=Контрагенти
 MailToMember=Членове
 MailToUser=Потребители
-MailToProject=Страница "Проекти"
+MailToProject=Проекти
 MailToTicket=Тикети
 ByDefaultInList=Показване по подразбиране в списъчен изглед
 YouUseLastStableVersion=Използвате последната стабилна версия
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Зареждане на името на контраге
 LoadThirdPartyFromNameOrCreate=Зареждане на името на контрагента от %s (да се създаде, ако не е намерено)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Код на меню (главно меню)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Деактивиране на функция за с
 EnableResourceUsedInEventCheck=Активиране на функция за проверка дали даден ресурс се използва в събитие
 ConfirmUnactivation=Потвърдете задаването на първоначални настройки на модула
 OnMobileOnly=Само при малък екран (смартфон)
-DisableProspectCustomerType=Деактивиране на типа контрагент "Перспектива + Клиент" (контрагента трябва да бъде Перспектива или Клиент, но не може да бъде и двете)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Опростяване на интерфейса за незрящ човек
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Активирайте тази опция за незрящ човек или ако използвате приложението от текстов браузър като Lynx или Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Промяна на цвета на интерфейса за човек с нарушено цветоусещане
@@ -1996,13 +2041,15 @@ UseDebugBar=Използване на инструменти за отстран
 DEBUGBAR_LOGS_LINES_NUMBER=Брой последни редове на журнал, които да се пазят в конзолата
 WarningValueHigherSlowsDramaticalyOutput=Внимание, по-високите стойности забавят драматично производителността
 ModuleActivated=Модул %s е активиран и забавя интерфейса
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Моделите за експортиране се споделят с всички
 ExportSetup=Настройка на модула за експортиране на данни
 ImportSetup=Настройка на модула за импортиране на данни
 InstanceUniqueID=Уникален идентификатор на инстанцията
 SmallerThan=По-малък от
 LargerThan=По-голям от
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=С GMail акаунт, ако сте активирали валидирането в 2 стъпки е препоръчително да създадете специална втора парола за приложението, вместо да използвате своята парола за акаунта от https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=Може да използвате това действие, за да намерите и заредите съществуващ контрагент във вашата база данни, чрез съдържанието на имейла. Намереният (или създаден) контрагент ще бъде използван при следващи действия, които се нуждаят от това. В полето на параметъра може да използвате, например 'EXTRACT:BODY:Name:\\s([^\\s]*)', ако искате да извлечете името на контрагента от низ 'Name: name to find', който е открит в съдържанието на имейла.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/bg_BG/banks.lang b/htdocs/langs/bg_BG/banks.lang
index 475fb7e6e5b..234d788aaa4 100644
--- a/htdocs/langs/bg_BG/banks.lang
+++ b/htdocs/langs/bg_BG/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Разнородно плащане
 VariousPayments=Разнородни плащания
 ShowVariousPayment=Показване на разнородно плащане
 AddVariousPayment=Добавяне на разнородно плащане
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA нареждане
 YourSEPAMandate=Вашите SEPA нареждания
 FindYourSEPAMandate=Това е вашето SEPA нареждане, с което да упълномощите нашата фирма да направи поръчка за директен дебит към вашата банка. Върнете го подписано (сканиран подписан документ) или го изпратете по пощата на
@@ -176,3 +179,4 @@ BankColorizeMovement=Оцветяване на движения
 BankColorizeMovementDesc=Ако тази функция е активирана може да изберете конкретен цвят на фона за дебитни или кредитни движения
 BankColorizeMovementName1=Цвят на фона за дебитно движение
 BankColorizeMovementName2=Цвят на фона за кредитно движение
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/bg_BG/categories.lang b/htdocs/langs/bg_BG/categories.lang
index ea044ebf97a..717f1a5fadd 100644
--- a/htdocs/langs/bg_BG/categories.lang
+++ b/htdocs/langs/bg_BG/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Настройка на тагове / категории
 CategorieRecursiv=Автоматично свързване с главния таг / категория
 CategorieRecursivHelp=Ако опцията е включена, когато добавите продукт в подкатегория, продуктът ще бъде добавен също и в главната категория.
 AddProductServiceIntoCategory=Добавяне на следния продукт / услуга
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Показване на таг / категория
 ByDefaultInList=По подразбиране в списъка
 ChooseCategory=Избиране на категория
-StocksCategoriesArea=Секция с категории на складове
-ActionCommCategoriesArea=Секция с категории за събития
-WebsitePagesCategoriesArea=Секция с категории за контейнери за страници
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Използване или оператор за категории
diff --git a/htdocs/langs/bg_BG/companies.lang b/htdocs/langs/bg_BG/companies.lang
index f637b36087f..267abddeb98 100644
--- a/htdocs/langs/bg_BG/companies.lang
+++ b/htdocs/langs/bg_BG/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=Може да проверите също така ръчн
 ErrorVATCheckMS_UNAVAILABLE=Проверка не е възможна. Услугата за проверка не се предоставя от държавата-членка (%s).
 NorProspectNorCustomer=Нито потенциален клиент, нито клиент
 JuridicalStatus=Правна форма
+Workforce=Workforce
 Staff=Служители
 ProspectLevelShort=Потенциал
 ProspectLevel=Потенциал
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Условия на плащане - Доставчик
 PaymentTypeBoth=Начин на плащане - клиент и доставчик
 MulticurrencyUsed=Използване на няколко валути
 MulticurrencyCurrency=Валута
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/bg_BG/ecm.lang b/htdocs/langs/bg_BG/ecm.lang
index 160f2dcc5ca..032fc7c015a 100644
--- a/htdocs/langs/bg_BG/ecm.lang
+++ b/htdocs/langs/bg_BG/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Търсене по ключови думи
 ECMSearchByEntity=Търсене по обект
 ECMSectionOfDocuments=Директории с документи
 ECMTypeAuto=Автоматично
-ECMDocsBySocialContributions=Документи свързани със социални или фискални такси
-ECMDocsByThirdParties=Документи свързани с контрагенти
-ECMDocsByProposals=Документи свързани с предложения
-ECMDocsByOrders=Документи свързани с поръчки за продажба
-ECMDocsByContracts=Документи свързани с договори
-ECMDocsByInvoices=Документи свързани с фактури за продажба
-ECMDocsByProducts=Документи свързани с продукти
-ECMDocsByProjects=Документи свързани с проекти
-ECMDocsByUsers=Документи свързани с потребители
-ECMDocsByInterventions=Документи свързани с интервенции
-ECMDocsByExpenseReports=Документи свързани с разходни отчети
-ECMDocsByHolidays=Документи свързани с отпуски
-ECMDocsBySupplierProposals=Документи свързани със запитвания към доставчици
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=Няма създадена директория
 ShowECMSection=Показване на директория
 DeleteSection=Изтриване на директория
@@ -50,3 +38,6 @@ ReSyncListOfDir=Синхронизиране на списъка с директ
 HashOfFileContent=Хеш код на файла
 NoDirectoriesFound=Няма намерени директории
 FileNotYetIndexedInDatabase=Файлът все още не е индексиран в базата данни (опитайте да го качите отново)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/bg_BG/hrm.lang b/htdocs/langs/bg_BG/hrm.lang
index f9df9510e1b..0279096bd62 100644
--- a/htdocs/langs/bg_BG/hrm.lang
+++ b/htdocs/langs/bg_BG/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=ЧР - Длъжности
 Employees=Служители
 Employee=Служител
 NewEmployee=Нов служител
+ListOfEmployees=Списък на служителите
diff --git a/htdocs/langs/bg_BG/install.lang b/htdocs/langs/bg_BG/install.lang
index 6de645ed856..d493acb7829 100644
--- a/htdocs/langs/bg_BG/install.lang
+++ b/htdocs/langs/bg_BG/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Конфигурационният файл <b> %s </b> н
 ConfFileIsWritable=Конфигурационният файл <b>%s</b> е презаписваем.
 ConfFileMustBeAFileNotADir=Конфигурационният файл <b>%s</b> трябва да е файл, а не директория.
 ConfFileReload=Презареждане на параметри от конфигурационен файл.
-PHPSupportSessions=PHP поддържа сесии.
 PHPSupportPOSTGETOk=PHP поддържа променливи POST и GET.
 PHPSupportPOSTGETKo=Възможно е вашата настройка на PHP да не поддържа променливи POST и/или GET. Проверете параметъра <b> variables_order </b> в php.ini.
-PHPSupportGD=PHP поддържа GD графични функции.
-PHPSupportCurl=PHP поддържа Curl.
-PHPSupportCalendar=PHP поддържа разширения на календари.
-PHPSupportUTF8=PHP поддържа UTF8 функции.
-PHPSupportIntl=PHP поддържа Intl функции.
-PHPSupportxDebug=PHP поддържа разширени функции за отстраняване на грешки.
+PHPSupportSessions=PHP поддържа сесии.
 PHPSupport=PHP поддържа %s функции.
 PHPMemoryOK=Максималният размер на паметта за PHP сесия е настроен на <b>%s</b>. Това трябва да е достатъчно.
 PHPMemoryTooLow=Вашият максимален размер на паметта за PHP сесия е настроен на <b> %s </b> байта. Това е твърде ниско. Променете <b> php.ini </b> като зададете стойност на параметър <b> memory_limit </b> поне <b> %s </b> байта.
diff --git a/htdocs/langs/bg_BG/intracommreport.lang b/htdocs/langs/bg_BG/intracommreport.lang
new file mode 100644
index 00000000000..cfacc2dd21e
--- /dev/null
+++ b/htdocs/langs/bg_BG/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=Списък
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/bg_BG/languages.lang b/htdocs/langs/bg_BG/languages.lang
index a6d388a20f9..110313b194e 100644
--- a/htdocs/langs/bg_BG/languages.lang
+++ b/htdocs/langs/bg_BG/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Испански (Панама)
 Language_es_PY=Испански (Парагвай)
 Language_es_PE=Испански (Перу)
 Language_es_PR=Испански (Пуерто Рико)
+Language_es_US=Spanish (USA)
 Language_es_UY=Испански (Уругвай)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Испански (Венецуела)
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index f0cf63d6366..335801537fa 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Премахване на връзка
 AddToDraft=Добавяне към чернова
 Update=Актуализиране
 Close=Приключване
+CloseAs=Предложението е
 CloseBox=Премахнете джаджата от таблото си за управление
 Confirm=Потвърждаване
 ConfirmSendCardByMail=Наистина ли искате да изпратите съдържанието на тази карта по имейл до <b> %s </b>?
@@ -196,6 +197,7 @@ ReOpen=Повторно отваряне
 Upload=Прикачи
 ToLink=Свържи
 Select=Изберете
+SelectAll=Select all
 Choose=Избор
 Resize=Оразмеряване
 ResizeOrCrop=Оразмеряване или изрязване
@@ -256,6 +258,7 @@ Cards=Карти
 Card=Карта
 Now=Сега
 HourStart=Начален час
+Deadline=Deadline
 Date=Дата
 DateAndHour=Дата и час
 DateToday=Днешна дата
@@ -264,8 +267,10 @@ DateStart=Начална дата
 DateEnd=Крайна дата
 DateCreation=Дата на създаване
 DateCreationShort=Създаване
+IPCreation=Creation IP
 DateModification=Дата на промяна
 DateModificationShort=Промяна
+IPModification=Modification IP
 DateLastModification=Дата на последна промяна
 DateValidation=Дата на валидиране
 DateClosing=Дата на приключване
@@ -319,6 +324,7 @@ Morning=сутрин
 Afternoon=следобед
 Quadri=Quadri
 MonthOfDay=Месец на деня
+DaysOfWeek=Days of week
 HourShort=ч
 MinuteShort=мин
 Rate=Курс
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Сума на плащане, оригинална в
 MulticurrencyAmountHT=Сума (без ДДС), оригинална валута
 MulticurrencyAmountTTC=Сума (с ДДС), оригинална валута
 MulticurrencyAmountVAT=Размер на ДДС, оригинална валута
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Размер на данък 2
 AmountLT2=Размер на данък 3
 AmountLT1ES=Размер на RE
@@ -487,6 +494,7 @@ By=От
 From=От
 FromDate=От
 FromLocation=От
+at=at
 to=за
 To=за
 and=и
@@ -509,6 +517,7 @@ Draft=Чернова
 Drafts=Чернови
 StatusInterInvoiced=Фактурирано
 Validated=Валидирано
+ValidatedToProduce=Validated (To produce)
 Opened=Активен
 OpenAll=Отворено (всички)
 ClosedAll=Затворено (всички)
@@ -655,6 +664,7 @@ Response=Отговор
 Priority=Приоритет
 SendByMail=Изпращане по имейл
 MailSentBy=Изпратено по имейл от
+NotSent=Неизпратен
 TextUsedInTheMessageBody=Текст на имейла
 SendAcknowledgementByMail=Изпращане на имейл потвърждение
 SendMail=Изпращане на имейл
@@ -836,6 +846,7 @@ ListOfTemplates=Списък с шаблони
 Gender=Пол
 Genderman=Мъж
 Genderwoman=Жена
+Genderother=Други
 ViewList=Списъчен изглед
 ViewGantt=Gantt изглед
 ViewKanban=Kanban изглед
@@ -877,6 +888,8 @@ Miscellaneous=Разни
 Calendar=Календар
 GroupBy=Групиране по...
 ViewFlatList=Преглед на плосък списък
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Премахване на низ „%s“
 SomeTranslationAreUncomplete=Някои от предлаганите езици могат да бъдат само частично преведени или да съдържат грешки. Моля, помогнете ни да коригираме езика ви като се регистрирате на адрес <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a>, за да добавите подобренията си.
 DirectDownloadLink=Директна връзка за изтегляне (публична / външна)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Клиентски пратки
 SearchIntoExpenseReports=Разходни отчети
 SearchIntoLeaves=Отпуск
 SearchIntoTickets=Тикети
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Плащания към доставчици
+SearchIntoMiscPayments=Разнородни плащания
 CommentLink=Коментари
 NbComments=Брой коментари
 CommentPage=Място за коментари
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Информация
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Дата на раждане
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/bg_BG/members.lang b/htdocs/langs/bg_BG/members.lang
index 49b94a21117..5cb008f47a5 100644
--- a/htdocs/langs/bg_BG/members.lang
+++ b/htdocs/langs/bg_BG/members.lang
@@ -19,14 +19,12 @@ MembersCards=Визитни картички на членове
 MembersList=Списък на членове
 MembersListToValid=Списък на чернови членове (за валидиране)
 MembersListValid=Списък на валидирани членове
-MembersListUpToDate=Списък на членове с платен абонамент
-MembersListNotUpToDate=Списък на членове с неплатен абонамент
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=Списък на деактивирани членове
 MembersListQualified=Списък на квалифицирани членове
 MenuMembersToValidate=Чернови членове
 MenuMembersValidated=Валидирани членове
-MenuMembersUpToDate=С платен абонамент
-MenuMembersNotUpToDate=С неплатен абонамент
 MenuMembersResiliated=Деактивирани членове
 MembersWithSubscriptionToReceive=Членове с абонамент за получаване
 MembersWithSubscriptionToReceiveShort=Абонамент за получаване
@@ -34,6 +32,7 @@ DateSubscription=Дата на абонамент
 DateEndSubscription=Крайна дата на абонамент
 EndSubscription=Край на абонамент
 SubscriptionId=Идентификатор на абонамент
+WithoutSubscription=Without subscription
 MemberId=Идентификатор на член
 NewMember=Нов член
 MemberType=Тип член
@@ -81,7 +80,7 @@ DeleteType=Изтриване
 VoteAllowed=Може да гласува
 Physical=Реален
 Moral=Морален
-MorPhy=Същност
+MorAndPhy=Moral and Physical
 Reenable=Повторно активиране
 ResiliateMember=Деактивиране на член
 ConfirmResiliateMember=Сигурни ли сте, че искате да деактивирате този член?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Изпращане на имейл при вал
 SendingEmailOnNewSubscription=Изпращане на имейл при нов абонамент
 SendingReminderForExpiredSubscription=Изпращане на напомняне за изтекли абонаменти
 SendingEmailOnCancelation=Изпращане на имейл при анулиране
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Вашата молба за членство е получена
 YourMembershipWasValidated=Вашата молба за членство е валидирана
@@ -167,6 +167,7 @@ MembersStatisticsByState=Статистика за членове по обла
 MembersStatisticsByTown=Статистика за членове по град
 MembersStatisticsByRegion=Статистика за членове по регион
 NbOfMembers=Брой членове
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=Не са намерени валидирани членове
 MembersByCountryDesc=Този екран показва статистически данни за членове по държави. Графиката зависи от онлайн услугата за графики на Google и е достъпна само, ако е налична интернет връзка.
 MembersByStateDesc=Този екран показва статистически данни за членове по области.
@@ -176,6 +177,7 @@ MenuMembersStats=Статистика
 LastMemberDate=Дата на последен член
 LatestSubscriptionDate=Последна дата на абонамент
 MemberNature=Произход на член
+MembersNature=Nature of members
 Public=Информацията е публична
 NewMemberbyWeb=Добавен е нов член. Очаква одобрение.
 NewMemberForm=Формуляр за нов член
diff --git a/htdocs/langs/bg_BG/mrp.lang b/htdocs/langs/bg_BG/mrp.lang
index a3c2904513a..f35119307bb 100644
--- a/htdocs/langs/bg_BG/mrp.lang
+++ b/htdocs/langs/bg_BG/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Поръчки за производство
-MO=Поръчка за производство
 MOs=Manufacturing orders
+ManufacturingOrder=Поръчка за производство
 MRPDescription=Модул за управление на поръчки за производство (ПП)
 MRPArea=Секция за планиране на материални изисквания
 MrpSetupPage=Настройка на модул за планиране на материални изисквания
@@ -76,3 +76,5 @@ ProductsToProduce=Продукти за производство
 UnitCost=Единична цена
 TotalCost=Обща цена
 BOMTotalCost=Разходите за производство на този списък с материали въз основа на разходите за всяко количество и продукт, които ще се използват (използвайте себестойност, ако е дефинирана, иначе средно претеглена цена, ако е определена, или най-добра покупна цена).
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index 48218d729b0..02ca66e192d 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Множество ценови сегменти за продукт / услуга (всеки клиент е в един ценови сегмент)
 MultiPricesNumPrices=Брой цени
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Активиране на виртуални продукти (комплекти)
-AssociatedProducts=Виртуални продукти
-AssociatedProductsNumber=Брой продукти, съставящи този виртуален продукт
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Брой основни опаковащи продукти
 ParentProducts=Основни продукти
-IfZeroItIsNotAVirtualProduct=Ако е 0, този продукт не е виртуален продукт
-IfZeroItIsNotUsedByVirtualProduct=Ако е 0, този продукт не се използва от никой виртуален продукт
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Филтър по ключова дума
 CategoryFilter=Филтър по категория
 ProductToAddSearch=Търсене на продукт за добавяне
 NoMatchFound=Не са намерени съвпадения
 ListOfProductsServices=Списък на продукти / услуги
-ProductAssociationList=Списък на продукти / услуги, които са компонент(и) на този виртуален продукт (комплект)
-ProductParentList=Списък на продукти / услуги с този продукт като компонент
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=Един от избраните продукти е основен за текущия продукт
 DeleteProduct=Изтриване на продукт / услуга
 ConfirmDeleteProduct=Сигурни ли сте, че желаете да изтриете този продукт / услуга?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Налични глобални стойности:
 PriceMode=Ценови режим
 PriceNumeric=Номер
 DefaultPrice=Цена по подразбиране
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Увеличаване / намаляване на наличност при промяна на основен продукт
 ComposedProduct=Съставни продукти
 MinSupplierPrice=Минимална покупната цена
@@ -339,6 +340,7 @@ UseProductFournDesc=Добавяне на функция за дефиниран
 ProductSupplierDescription=Описание на продукта от доставчик
 UseProductSupplierPackaging=Използване на пакетиране по цени на доставчик (преизчислява количествата според пакетирането, определено чрез доставната цена, когато добавяте / актуализирате ред в документите на доставчика)
 PackagingForThisProduct=Пакетиране
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=Количеството за реда е преизчислено според пакетирането на доставчика
 
 #Attributes
diff --git a/htdocs/langs/bg_BG/recruitment.lang b/htdocs/langs/bg_BG/recruitment.lang
index 30dc001edfa..2dfffcd1215 100644
--- a/htdocs/langs/bg_BG/recruitment.lang
+++ b/htdocs/langs/bg_BG/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Длъжност
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/bg_BG/stocks.lang b/htdocs/langs/bg_BG/stocks.lang
index 49166064915..a2a308ad231 100644
--- a/htdocs/langs/bg_BG/stocks.lang
+++ b/htdocs/langs/bg_BG/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Идентификатор на движение %d
 ListMouvementStockProject=Списък на движения на стокови наличности, свързани с проекта
 StocksArea=Секция със складове
 AllWarehouses=Всички складове
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Включва чернови поръчки
 Location=Местоположение
 LocationSummary=Кратко име на местоположение
@@ -122,8 +122,9 @@ DesiredStockDesc=Тази стойност ще бъде използвана з
 StockToBuy=За поръчка
 Replenishment=Попълване на наличности
 ReplenishmentOrders=Поръчки за попълване
-VirtualDiffersFromPhysical=Според опциите за увеличаване / намаляване на наличности, физическите и виртуални наличности (физически + текущи поръчки) могат да се различават
-UseVirtualStockByDefault=Използване на виртуални наличности по подразбиране (вместо физически наличности) при използване на функцията за попълване на наличности
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Използване на виртуални наличности
 UsePhysicalStock=Използване на физически наличности
 CurentSelectionMode=Текущ режим на избор
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=Този продукт е вече в сп
 SelectCategory=Филтър по категория
 SelectFournisseur=Филтър по доставчик
 inventoryOnDate=Инвентаризация
-INVENTORY_DISABLE_VIRTUAL=Виртуален продукт (комплект): не намалявайте наличността на съставен продукт
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Използване на покупната цена, ако не може да бъде намерена последна цена за покупка
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Движенията на наличности ще имат датата на инвентаризация (вместо датата на валидиране на инвентаризация)
 inventoryChangePMPPermission=Променяне на стойността на СИЦ (средно изчислена цена) за даден продукт
 ColumnNewPMP=Нова СИЦ
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/bg_BG/suppliers.lang b/htdocs/langs/bg_BG/suppliers.lang
index 125f6e9a528..2f3e0c1898c 100644
--- a/htdocs/langs/bg_BG/suppliers.lang
+++ b/htdocs/langs/bg_BG/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Поръчки за покупка за фактури
 NbDaysToDelivery=Забавяне на доставка (дни)
 DescNbDaysToDelivery=Най-дълго забавяне на доставка за продукти от тази поръчка
 SupplierReputation=Репутация на доставчика
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Не поръчвайте
 NotTheGoodQualitySupplier=Ниско качество
 ReputationForThisProduct=Репутация
diff --git a/htdocs/langs/bg_BG/website.lang b/htdocs/langs/bg_BG/website.lang
index 33ff2bd1922..7378ad1189a 100644
--- a/htdocs/langs/bg_BG/website.lang
+++ b/htdocs/langs/bg_BG/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Добавяне на уебсайт
 Webpage=Уеб страница / контейнер
 AddPage=Добавяне на страница / контейнер
 HomePage=Начална страница
-PageContainer=Страница / контейнер
+PageContainer=Страница
 PreviewOfSiteNotYetAvailable=Преглед на вашия уебсайт <strong>%s</strong> все още не е наличен. Първо трябва да '<strong>Импортирате пълен шаблон за уебсайт</strong>' или просто да '<strong>Добавите страница / контейнер</strong>'.
 RequestedPageHasNoContentYet=Заявената страница с id %s все още няма съдържание или кеш файлът .tpl.php е бил премахнат. Редактирайте съдържанието на страницата, за да коригирате това.
 SiteDeleted=Уебсайта '%s' е изтрит
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS емисия
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/bn_BD/accountancy.lang b/htdocs/langs/bn_BD/accountancy.lang
index 7b59e33b296..3211a0b62df 100644
--- a/htdocs/langs/bn_BD/accountancy.lang
+++ b/htdocs/langs/bn_BD/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting expert
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=Journals
+Journals=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Chart of accounts
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bank accounts
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=By year
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index d7c4eb282cd..f1c41a3b62b 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
 CurrentTimeZone=TimeZone PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Interventions
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
+Permission13=Invalidate customer invoices
 Permission14=Validate customer invoices
 Permission15=Send customer invoices by email
 Permission16=Create payments for customer invoices
@@ -688,6 +694,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Read members
 Permission72=Create/modify members
 Permission74=Delete members
@@ -718,6 +728,7 @@ Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
@@ -825,10 +836,11 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Edition of field %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1282,7 +1322,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Global parameters
@@ -1523,7 +1564,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Level
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
@@ -1629,7 +1672,7 @@ AdvancedEditor=Advanced editor
 ActivateFCKeditor=Activate advanced editor for:
 FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
 FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
-MailToProject=Projects page
+MailToProject=Projects
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/bn_BD/banks.lang b/htdocs/langs/bn_BD/banks.lang
index caf3d4243c0..5cddfdaf30c 100644
--- a/htdocs/langs/bn_BD/banks.lang
+++ b/htdocs/langs/bn_BD/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/bn_BD/categories.lang b/htdocs/langs/bn_BD/categories.lang
index 9349ecc5135..84e5796763e 100644
--- a/htdocs/langs/bn_BD/categories.lang
+++ b/htdocs/langs/bn_BD/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/bn_BD/companies.lang b/htdocs/langs/bn_BD/companies.lang
index ebc9f8f5ce2..ee3854f04f8 100644
--- a/htdocs/langs/bn_BD/companies.lang
+++ b/htdocs/langs/bn_BD/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
 ProspectLevel=Prospect potential
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Currency
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/bn_BD/ecm.lang b/htdocs/langs/bn_BD/ecm.lang
index 43ddd3bf36f..71df60734fb 100644
--- a/htdocs/langs/bn_BD/ecm.lang
+++ b/htdocs/langs/bn_BD/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Search by keywords
 ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/bn_BD/hrm.lang b/htdocs/langs/bn_BD/hrm.lang
index 6cc7f6bef24..3b8f137e103 100644
--- a/htdocs/langs/bn_BD/hrm.lang
+++ b/htdocs/langs/bn_BD/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Employees
 Employee=Employee
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/bn_BD/install.lang b/htdocs/langs/bn_BD/install.lang
index 2d708c04147..63947dad154 100644
--- a/htdocs/langs/bn_BD/install.lang
+++ b/htdocs/langs/bn_BD/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=This PHP supports sessions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/bn_BD/intracommreport.lang b/htdocs/langs/bn_BD/intracommreport.lang
new file mode 100644
index 00000000000..3060300b974
--- /dev/null
+++ b/htdocs/langs/bn_BD/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=List
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/bn_BD/languages.lang b/htdocs/langs/bn_BD/languages.lang
index cc80b9f1719..ba187326705 100644
--- a/htdocs/langs/bn_BD/languages.lang
+++ b/htdocs/langs/bn_BD/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang
index 0149ae4d2ce..49a5986c0df 100644
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Remove link
 AddToDraft=Add to draft
 Update=Update
 Close=Close
+CloseAs=Set status to
 CloseBox=Remove widget from your dashboard
 Confirm=Confirm
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Re-Open
 Upload=Upload
 ToLink=Link
 Select=Select
+SelectAll=Select all
 Choose=Choose
 Resize=Resize
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=Cards
 Card=Card
 Now=Now
 HourStart=Start hour
+Deadline=Deadline
 Date=Date
 DateAndHour=Date and hour
 DateToday=Today's date
@@ -264,8 +267,10 @@ DateStart=Start date
 DateEnd=End date
 DateCreation=Creation date
 DateCreationShort=Creat. date
+IPCreation=Creation IP
 DateModification=Modification date
 DateModificationShort=Modif. date
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
@@ -319,6 +324,7 @@ Morning=Morning
 Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Month of the day
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Rate
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Amount tax 2
 AmountLT2=Amount tax 3
 AmountLT1ES=Amount RE
@@ -487,6 +494,7 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
+at=at
 to=to
 To=to
 and=and
@@ -509,6 +517,7 @@ Draft=Draft
 Drafts=Drafts
 StatusInterInvoiced=Invoiced
 Validated=Validated
+ValidatedToProduce=Validated (To produce)
 Opened=Opened
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Response
 Priority=Priority
 SendByMail=Send by email
 MailSentBy=Email sent by
+NotSent=Not sent
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
@@ -836,6 +846,7 @@ ListOfTemplates=List of templates
 Gender=Gender
 Genderman=Man
 Genderwoman=Woman
+Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Comments
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Information
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Date of birth
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/bn_BD/members.lang b/htdocs/langs/bn_BD/members.lang
index 5ef946ddf67..5812248b129 100644
--- a/htdocs/langs/bn_BD/members.lang
+++ b/htdocs/langs/bn_BD/members.lang
@@ -19,14 +19,12 @@ MembersCards=Members business cards
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
 SubscriptionId=Subscription id
+WithoutSubscription=Without subscription
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@@ -81,7 +80,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/bn_BD/mrp.lang b/htdocs/langs/bn_BD/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/bn_BD/mrp.lang
+++ b/htdocs/langs/bn_BD/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/bn_BD/products.lang b/htdocs/langs/bn_BD/products.lang
index b59aa2f7080..97db059594f 100644
--- a/htdocs/langs/bn_BD/products.lang
+++ b/htdocs/langs/bn_BD/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/bn_BD/recruitment.lang b/htdocs/langs/bn_BD/recruitment.lang
index 73e9a7fa07f..b775e78552e 100644
--- a/htdocs/langs/bn_BD/recruitment.lang
+++ b/htdocs/langs/bn_BD/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/bn_BD/stocks.lang b/htdocs/langs/bn_BD/stocks.lang
index 81163e8d4b0..660443bcded 100644
--- a/htdocs/langs/bn_BD/stocks.lang
+++ b/htdocs/langs/bn_BD/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/bn_BD/suppliers.lang b/htdocs/langs/bn_BD/suppliers.lang
index 51562b8bb7a..03b03c75269 100644
--- a/htdocs/langs/bn_BD/suppliers.lang
+++ b/htdocs/langs/bn_BD/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/bn_BD/website.lang b/htdocs/langs/bn_BD/website.lang
index 4b5294d5e43..03e042e4be6 100644
--- a/htdocs/langs/bn_BD/website.lang
+++ b/htdocs/langs/bn_BD/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/bn_IN/accountancy.lang b/htdocs/langs/bn_IN/accountancy.lang
index 7b59e33b296..3211a0b62df 100644
--- a/htdocs/langs/bn_IN/accountancy.lang
+++ b/htdocs/langs/bn_IN/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting expert
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=Journals
+Journals=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Chart of accounts
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bank accounts
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=By year
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/bn_IN/admin.lang b/htdocs/langs/bn_IN/admin.lang
index d7c4eb282cd..f1c41a3b62b 100644
--- a/htdocs/langs/bn_IN/admin.lang
+++ b/htdocs/langs/bn_IN/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
 CurrentTimeZone=TimeZone PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Interventions
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
+Permission13=Invalidate customer invoices
 Permission14=Validate customer invoices
 Permission15=Send customer invoices by email
 Permission16=Create payments for customer invoices
@@ -688,6 +694,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Read members
 Permission72=Create/modify members
 Permission74=Delete members
@@ -718,6 +728,7 @@ Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
@@ -825,10 +836,11 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Edition of field %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1282,7 +1322,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Global parameters
@@ -1523,7 +1564,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Level
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
@@ -1629,7 +1672,7 @@ AdvancedEditor=Advanced editor
 ActivateFCKeditor=Activate advanced editor for:
 FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
 FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
-MailToProject=Projects page
+MailToProject=Projects
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/bn_IN/banks.lang b/htdocs/langs/bn_IN/banks.lang
index 75f9549dca5..9500a5b8b2e 100644
--- a/htdocs/langs/bn_IN/banks.lang
+++ b/htdocs/langs/bn_IN/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/bn_IN/categories.lang b/htdocs/langs/bn_IN/categories.lang
index 9bb71984ecf..ba37a43b4ec 100644
--- a/htdocs/langs/bn_IN/categories.lang
+++ b/htdocs/langs/bn_IN/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/bn_IN/companies.lang b/htdocs/langs/bn_IN/companies.lang
index 92674363ced..dadff6a7894 100644
--- a/htdocs/langs/bn_IN/companies.lang
+++ b/htdocs/langs/bn_IN/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
 ProspectLevel=Prospect potential
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Currency
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/bn_IN/ecm.lang b/htdocs/langs/bn_IN/ecm.lang
index 369ac6dfdfa..71df60734fb 100644
--- a/htdocs/langs/bn_IN/ecm.lang
+++ b/htdocs/langs/bn_IN/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Search by keywords
 ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to vendor proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/bn_IN/hrm.lang b/htdocs/langs/bn_IN/hrm.lang
index 6cc7f6bef24..3b8f137e103 100644
--- a/htdocs/langs/bn_IN/hrm.lang
+++ b/htdocs/langs/bn_IN/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Employees
 Employee=Employee
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/bn_IN/install.lang b/htdocs/langs/bn_IN/install.lang
index 2d708c04147..63947dad154 100644
--- a/htdocs/langs/bn_IN/install.lang
+++ b/htdocs/langs/bn_IN/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=This PHP supports sessions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/bn_IN/intracommreport.lang b/htdocs/langs/bn_IN/intracommreport.lang
new file mode 100644
index 00000000000..3060300b974
--- /dev/null
+++ b/htdocs/langs/bn_IN/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=List
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/bn_IN/languages.lang b/htdocs/langs/bn_IN/languages.lang
index cc80b9f1719..ba187326705 100644
--- a/htdocs/langs/bn_IN/languages.lang
+++ b/htdocs/langs/bn_IN/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/bn_IN/main.lang b/htdocs/langs/bn_IN/main.lang
index 0af5c66f0e0..96c68cdcfa3 100644
--- a/htdocs/langs/bn_IN/main.lang
+++ b/htdocs/langs/bn_IN/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Remove link
 AddToDraft=Add to draft
 Update=Update
 Close=Close
+CloseAs=Set status to
 CloseBox=Remove widget from your dashboard
 Confirm=Confirm
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Re-Open
 Upload=Upload
 ToLink=Link
 Select=Select
+SelectAll=Select all
 Choose=Choose
 Resize=Resize
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=Cards
 Card=Card
 Now=Now
 HourStart=Start hour
+Deadline=Deadline
 Date=Date
 DateAndHour=Date and hour
 DateToday=Today's date
@@ -264,8 +267,10 @@ DateStart=Start date
 DateEnd=End date
 DateCreation=Creation date
 DateCreationShort=Creat. date
+IPCreation=Creation IP
 DateModification=Modification date
 DateModificationShort=Modif. date
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
@@ -319,6 +324,7 @@ Morning=Morning
 Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Month of the day
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Rate
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Amount tax 2
 AmountLT2=Amount tax 3
 AmountLT1ES=Amount RE
@@ -487,6 +494,7 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
+at=at
 to=to
 To=to
 and=and
@@ -509,6 +517,7 @@ Draft=Draft
 Drafts=Drafts
 StatusInterInvoiced=Invoiced
 Validated=Validated
+ValidatedToProduce=Validated (To produce)
 Opened=Open
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Response
 Priority=Priority
 SendByMail=Send by email
 MailSentBy=Email sent by
+NotSent=Not sent
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
@@ -836,6 +846,7 @@ ListOfTemplates=List of templates
 Gender=Gender
 Genderman=Man
 Genderwoman=Woman
+Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Comments
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Information
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Date of birth
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/bn_IN/members.lang b/htdocs/langs/bn_IN/members.lang
index 5ef946ddf67..5812248b129 100644
--- a/htdocs/langs/bn_IN/members.lang
+++ b/htdocs/langs/bn_IN/members.lang
@@ -19,14 +19,12 @@ MembersCards=Members business cards
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
 SubscriptionId=Subscription id
+WithoutSubscription=Without subscription
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@@ -81,7 +80,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/bn_IN/mrp.lang b/htdocs/langs/bn_IN/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/bn_IN/mrp.lang
+++ b/htdocs/langs/bn_IN/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/bn_IN/products.lang b/htdocs/langs/bn_IN/products.lang
index b59aa2f7080..97db059594f 100644
--- a/htdocs/langs/bn_IN/products.lang
+++ b/htdocs/langs/bn_IN/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/bn_IN/recruitment.lang b/htdocs/langs/bn_IN/recruitment.lang
index 73e9a7fa07f..b775e78552e 100644
--- a/htdocs/langs/bn_IN/recruitment.lang
+++ b/htdocs/langs/bn_IN/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/bn_IN/stocks.lang b/htdocs/langs/bn_IN/stocks.lang
index 81163e8d4b0..660443bcded 100644
--- a/htdocs/langs/bn_IN/stocks.lang
+++ b/htdocs/langs/bn_IN/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/bn_IN/suppliers.lang b/htdocs/langs/bn_IN/suppliers.lang
index 51562b8bb7a..03b03c75269 100644
--- a/htdocs/langs/bn_IN/suppliers.lang
+++ b/htdocs/langs/bn_IN/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/bn_IN/website.lang b/htdocs/langs/bn_IN/website.lang
index 4b5294d5e43..03e042e4be6 100644
--- a/htdocs/langs/bn_IN/website.lang
+++ b/htdocs/langs/bn_IN/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
index b21215a1589..27f2742906e 100644
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Pretpostavljeno za proizvod
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Podešavanje modula eksperta računovodstva
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Prenos u dnevnik
-Journaux=Dnevnici
+Journals=Dnevnici
 JournalFinancial=Finansijski dnevnici
 BackToChartofaccounts=Vraćanje na pregled računa
 Chartofaccounts=Chart of accounts
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Odaberi aktivnog pregleda računa
 ChangeAndLoad=Change and load
 Addanaccount=Dodaj računovodstveni račun
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Predloženi računovodstveni račun
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Žiro računi
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modifikacija transakcije
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Dnevnik prodaje
 ACCOUNTING_PURCHASE_JOURNAL=Dnevnik nabavki
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=Po godini
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index 48a667ba744..4149ca416ca 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Ukloni zaključavanje veze
 YourSession=Vaša sesija
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=Onemogućena JavaScript
 UsePreviewTabs=Koristi kartice pretpregleda
 ShowPreview=Prikaži pretpregled
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Pretpregled nije moguć
 ThemeCurrentlyActive=Trenutno aktivna tema
 CurrentTimeZone=Vremenska zona PHP (servera)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Intervencije
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Resursi
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
+Permission13=Invalidate customer invoices
 Permission14=Validate customer invoices
 Permission15=Send customer invoices by email
 Permission16=Create payments for customer invoices
@@ -688,6 +694,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Read members
 Permission72=Create/modify members
 Permission74=Delete members
@@ -718,6 +728,7 @@ Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
@@ -825,10 +836,11 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Postavke snimljene
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Edition of field %s
 FillThisOnlyIfRequired=Primjer: +2 (popuniti samo ako imate problema sa ofsetima vremenskih zona)
@@ -1282,7 +1322,7 @@ GetBarCode=Preuzeti barkod
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Globalni parametri
@@ -1523,7 +1564,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Izvještaj o perfomansama postavki/optimizacije
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Aplikativni cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Level
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
@@ -1629,7 +1672,7 @@ AdvancedEditor=Advanced editor
 ActivateFCKeditor=Activate advanced editor for:
 FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
 FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Subjekti
 MailToMember=Članovi
 MailToUser=Korisnici
-MailToProject=Projects page
+MailToProject=Projekti
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/bs_BA/banks.lang b/htdocs/langs/bs_BA/banks.lang
index 5acc0fba6e6..696a6ff35f6 100644
--- a/htdocs/langs/bs_BA/banks.lang
+++ b/htdocs/langs/bs_BA/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Razna plaćanja
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Vaš SEPA mandat
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/bs_BA/categories.lang b/htdocs/langs/bs_BA/categories.lang
index cb6c6a88aa4..0672e7c4bc7 100644
--- a/htdocs/langs/bs_BA/categories.lang
+++ b/htdocs/langs/bs_BA/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/bs_BA/companies.lang b/htdocs/langs/bs_BA/companies.lang
index 1987d742cd4..f1b1949d9a9 100644
--- a/htdocs/langs/bs_BA/companies.lang
+++ b/htdocs/langs/bs_BA/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-Id br.)
 ProfId2AT=Prof Id 2 (USt.-br.)
 ProfId3AT=Prof Id 3 (br. trgovačkog registra)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federalni broj)
 ProfId4CH=Prof Id 2 (Broj komercijalnog zapisa)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-Id br.)
 ProfId2DE=Prof Id 2 (USt.-br.)
 ProfId3DE=Prof Id 3 (br. trgovačkog registra)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (broj socijalnog osiguranja)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (broj udruženja)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, stari APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registracijski broj
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC porez)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luksemburg)
 ProfId2LU=Id. prof. 2 (dozvola za rad)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patent)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK broj
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Broj usluga građanima (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (broj socijalnog osiguranja)
 ProfId3PT=Prof Id 3 (broj komercijalnog zapisa)
 ProfId4PT=Prof Id 4 (konzervator)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Provjera nije moguća. Servis za provjeru nije naveden od stran države članice (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potencijal
 ProspectLevel=Potencijal mogućeg klijenta
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=valuta
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/bs_BA/ecm.lang b/htdocs/langs/bs_BA/ecm.lang
index ae71bd9dbcc..cd3c2cab853 100644
--- a/htdocs/langs/bs_BA/ecm.lang
+++ b/htdocs/langs/bs_BA/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Traži po ključnim riječima
 ECMSearchByEntity=Traži po objektu
 ECMSectionOfDocuments=Direktoriji dokumenata
 ECMTypeAuto=Automatski
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Dokumenti vezani sza subjekte
-ECMDocsByProposals=Dokumenti vezani za prijedloge
-ECMDocsByOrders=Dokumenti vezani za narudžbe kupaca
-ECMDocsByContracts=Dokumenti vezani za ugovore
-ECMDocsByInvoices=Dokumenti vezani za fakture klijenata
-ECMDocsByProducts=Dokumenti vezani za proizvode
-ECMDocsByProjects=Dokumenti vezani za projekte
-ECMDocsByUsers=Dokumenti povezani s korisnicima
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=Nema kreiranih direktorija
 ShowECMSection=Prikaži direktorij
 DeleteSection=Ukloni direktorij
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/bs_BA/hrm.lang b/htdocs/langs/bs_BA/hrm.lang
index 1415c9117c3..df8b7b1b849 100644
--- a/htdocs/langs/bs_BA/hrm.lang
+++ b/htdocs/langs/bs_BA/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Employees
 Employee=Zaposlenik
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/bs_BA/install.lang b/htdocs/langs/bs_BA/install.lang
index 1b167f54b87..e8f358a7aab 100644
--- a/htdocs/langs/bs_BA/install.lang
+++ b/htdocs/langs/bs_BA/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Konfiguracijska datoteka <b>%s</b> je slobodna za pisanje.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=Ovaj PHP podržava sesije.
 PHPSupportPOSTGETOk=Ovaj PHP podržava varijable POST i GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=Ovaj PHP podržava sesije.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Vaša maksimalna memorija za PHP  sesiju je postavljena na <b>%s</b>. To bi trebalo biti dovoljno.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/bs_BA/intracommreport.lang b/htdocs/langs/bs_BA/intracommreport.lang
new file mode 100644
index 00000000000..31fa2869e88
--- /dev/null
+++ b/htdocs/langs/bs_BA/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=Spisak
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/bs_BA/languages.lang b/htdocs/langs/bs_BA/languages.lang
index f30cffc94c2..203d794aa05 100644
--- a/htdocs/langs/bs_BA/languages.lang
+++ b/htdocs/langs/bs_BA/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Španjolski (Paragvaj)
 Language_es_PE=Španjolski (Peru)
 Language_es_PR=Španjolski (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index 477e64c7237..53577a4ab73 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Ukloni link
 AddToDraft=Dodaj u nacrt
 Update=Ažuriraj
 Close=Zatvori
+CloseAs=Set status to
 CloseBox=Ukloni kutijicu sa svoje nadzorne ploče
 Confirm=Potvrdi
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Opet otvori
 Upload=Upload
 ToLink=Link
 Select=Odaberi
+SelectAll=Select all
 Choose=Izaberi
 Resize=Promjena veličine
 ResizeOrCrop=Promijeni veličinu ili izreži
@@ -256,6 +258,7 @@ Cards=Kartice
 Card=Kartica
 Now=Sada
 HourStart=Početno vrijeme
+Deadline=Deadline
 Date=Datum
 DateAndHour=Datum i vrijeme
 DateToday=Današnji datum
@@ -264,8 +267,10 @@ DateStart=Datum početka
 DateEnd=Datum završetka
 DateCreation=Datum kreiranja
 DateCreationShort=Datum pravlj.
+IPCreation=Creation IP
 DateModification=Datum izmjene
 DateModificationShort=Datum izmj.
+IPModification=Modification IP
 DateLastModification=Datum zadnje izmjene
 DateValidation=Datum potvrde
 DateClosing=Datum zatvaranja
@@ -319,6 +324,7 @@ Morning=Jutro
 Afternoon=Večer
 Quadri=Četvoro
 MonthOfDay=Mjesec dana
+DaysOfWeek=Days of week
 HourShort=h
 MinuteShort=min
 Rate=Stopa
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Iznos za plaćanje, orig. valuta
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Iznos (uklj. porez), origin. valuta
 MulticurrencyAmountVAT=Iznos poreza, orig. valuta
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Iznos poreza 2
 AmountLT2=Iznos poreza 3
 AmountLT1ES=Iznos RE
@@ -487,6 +494,7 @@ By=Od
 From=Od
 FromDate=Od
 FromLocation=Od
+at=at
 to=za
 To=za
 and=i
@@ -509,6 +517,7 @@ Draft=Nacrt
 Drafts=Uzorak
 StatusInterInvoiced=Invoiced
 Validated=Potvrđeno
+ValidatedToProduce=Validated (To produce)
 Opened=Otvori
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Odgovor
 Priority=Prioritet
 SendByMail=Send by email
 MailSentBy=Email je poslao
+NotSent=Nije poslano
 TextUsedInTheMessageBody=Tekst emaila
 SendAcknowledgementByMail=Pošalji konfirmacijski email
 SendMail=Pošalji e-mail
@@ -836,6 +846,7 @@ ListOfTemplates=Spisak šablona
 Gender=Spol
 Genderman=Muškarac
 Genderwoman=Žena
+Genderother=Ostalo
 ViewList=Lista
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Razno
 Calendar=Kalendar
 GroupBy=Grupiranje po...
 ViewFlatList=Vidi čisti spisak
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Ukloni pojam '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direktni link preuzimanja (javni/vanjski)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Slanje kupcu
 SearchIntoExpenseReports=Izvještaj o troškovima
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Razna plaćanja
 CommentLink=Komentari
 NbComments=Broj komentara
 CommentPage=Prostor komentara
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Inromacije
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Date of birth
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/bs_BA/members.lang b/htdocs/langs/bs_BA/members.lang
index 70359336519..bca9a43ae4c 100644
--- a/htdocs/langs/bs_BA/members.lang
+++ b/htdocs/langs/bs_BA/members.lang
@@ -19,14 +19,12 @@ MembersCards=Members business cards
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
 SubscriptionId=Subscription id
+WithoutSubscription=Without subscription
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@@ -81,7 +80,7 @@ DeleteType=Obriši
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistika
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/bs_BA/mrp.lang b/htdocs/langs/bs_BA/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/bs_BA/mrp.lang
+++ b/htdocs/langs/bs_BA/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index 4b43f471d39..23be1f760b5 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Broj
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimalna kupovna cijena
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/bs_BA/recruitment.lang b/htdocs/langs/bs_BA/recruitment.lang
index babb96232f7..1d485508eff 100644
--- a/htdocs/langs/bs_BA/recruitment.lang
+++ b/htdocs/langs/bs_BA/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Pozicija
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/bs_BA/stocks.lang b/htdocs/langs/bs_BA/stocks.lang
index 73ea1445906..9dbb5dd7df2 100644
--- a/htdocs/langs/bs_BA/stocks.lang
+++ b/htdocs/langs/bs_BA/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Lokacija
 LocationSummary=Skraćeni naziv lokacije
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=Za narudžbu
 Replenishment=Nadopuna
 ReplenishmentOrders=Narudžne za nadopunu
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventar
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/bs_BA/suppliers.lang b/htdocs/langs/bs_BA/suppliers.lang
index eb8fe5c46fb..86861419bf5 100644
--- a/htdocs/langs/bs_BA/suppliers.lang
+++ b/htdocs/langs/bs_BA/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/bs_BA/website.lang b/htdocs/langs/bs_BA/website.lang
index 32ced04bd3e..8aa0ca84eb0 100644
--- a/htdocs/langs/bs_BA/website.lang
+++ b/htdocs/langs/bs_BA/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Stranica
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index 3cee41a264d..6146dd28e9f 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -18,14 +18,16 @@ DefaultForService=Defecte per al servei
 DefaultForProduct=Defecte per al producte
 CantSuggest=No es pot suggerir
 AccountancySetupDoneFromAccountancyMenu=La major part de la configuració de la comptabilitat es realitza des del menú %s
-ConfigAccountingExpert=Configuració del mòdul Compatibilitat avançada
+ConfigAccountingExpert=Configuració del mòdul de comptabilitat (doble entrada)
 Journalization=Registrament al diari
-Journaux=Diaris
+Journals=Diaris
 JournalFinancial=Diaris financers
 BackToChartofaccounts=Tornar al Pla comptable
 Chartofaccounts=Pla comptable
+ChartOfSubaccounts=Pla de comptes individuals
+ChartOfIndividualAccountsOfSubsidiaryLedger=Pla de comptes individuals del llibre major
 CurrentDedicatedAccountingAccount=Compte dedicat actual
-AssignDedicatedAccountingAccount=Nou compte per assignar
+AssignDedicatedAccountingAccount=Compte nou per a assignar
 InvoiceLabel=Etiqueta de factura
 OverviewOfAmountOfLinesNotBound=Vista general de la quantitat de línies no comptabilitzades en un compte comptable
 OverviewOfAmountOfLinesBound=Vista general de la quantitat de línies ja comptabilitzades en un compte comptable
@@ -33,8 +35,8 @@ OtherInfo=Altra informació
 DeleteCptCategory=Eliminar el compte comptable del grup
 ConfirmDeleteCptCategory=Estàs segur que vols eliminar aquest compte comptable del grup de comptabilitat?
 JournalizationInLedgerStatus=Estat del diari
-AlreadyInGeneralLedger=Registrat en el Llibre Major
-NotYetInGeneralLedger=No s'ha registrat en el Llibre Major
+AlreadyInGeneralLedger=Ja transferit als diaris comptables i llibres majors
+NotYetInGeneralLedger=Encara no s'ha transferit als diaris ni llibres comptables
 GroupIsEmptyCheckSetup=El grup està buit, comproveu la configuració del grup de comptabilitat personalitzat
 DetailByAccount=Mostra detalls per compte
 AccountWithNonZeroValues=Compte amb valors no nuls
@@ -43,7 +45,9 @@ CountriesInEEC=Països a la CEE
 CountriesNotInEEC=Països no integrats a la CEE
 CountriesInEECExceptMe=Països a la CEE excepte %s
 CountriesExceptMe=Tots els països, excepte %s
-AccountantFiles=Exporta transaccions i extractes
+AccountantFiles=Exporta documents d'origen
+ExportAccountingSourceDocHelp=Amb aquesta eina, podeu exportar els esdeveniments d'origen (llista i PDF) que es van utilitzar per generar la vostra comptabilitat. Per exportar els vostres diaris, utilitzeu l’entrada de menú %s - %s.
+VueByAccountAccounting=Veure per compte comptable
 
 MainAccountForCustomersNotDefined=Compte comptable per a clients no definida en la configuració
 MainAccountForSuppliersNotDefined=Compte comptable principal per a proveïdors no definit a la configuració
@@ -54,15 +58,15 @@ MainAccountForSubscriptionPaymentNotDefined=Compte comptable per a IVA no defini
 AccountancyArea=Àrea de comptabilitat
 AccountancyAreaDescIntro=L'ús del mòdul de comptabilitat es realitza en diverses etapes:
 AccountancyAreaDescActionOnce=Les següents accions s'executen normalment per una sola vegada, o un cop l'any ...
-AccountancyAreaDescActionOnceBis=Els passos següents s'han de fer per estalviar-vos temps en el futur suggerint-vos el compte comptable per defecte correcte al fer els diaris (escriptura dels registres en els diaris i el Llibre Major)
+AccountancyAreaDescActionOnceBis=Els passos següents s'han de fer per a estalviar-vos temps en el futur suggerint-vos el compte comptable per defecte correcte al fer els diaris (escriptura dels registres en els diaris i Llibre Major)
 AccountancyAreaDescActionFreq=Les següents accions s'executen normalment cada mes, setmana o dia per empreses molt grans ...
 
 AccountancyAreaDescJournalSetup=PAS %s: Crea o consulta el contingut dels teus diaris des del menú %s
-AccountancyAreaDescChartModel=PAS %s: Comprovar que existeix un model de pla de compte o crear-ne un des del menu %s
-AccountancyAreaDescChart=PAS %s: Seleccionar i/o completar el vostre pla de compte des del menu %s
+AccountancyAreaDescChartModel=PAS %s: Comproveu que existeix un model de pla comptable o creeu-ne un des del menú %s
+AccountancyAreaDescChart=PAS %s: Seleccioneu i/o completeu el vostre pla comptable al menú %s
 
 AccountancyAreaDescVat=PAS %s: Defineix comptes comptables per cada tipus d'IVA. Per això, utilitzeu l'entrada del menú %s.
-AccountancyAreaDescDefault=STEP %s: Definir comptes comptables predeterminats. Per això, utilitzeu l'entrada del menú %s.
+AccountancyAreaDescDefault=PAS %s: Definiu comptes comptables per defecte. Per a això, utilitzeu l'entrada de menú %s.
 AccountancyAreaDescExpenseReport=PAS %s: Defineix els comptes comptables per defecte per a cada tipus d'informe de despeses. Per això, utilitzeu l'entrada del menú %s.
 AccountancyAreaDescSal=PAS %s: Defineix comptes comptables per defecte per al pagament de salaris. Per això, utilitzeu l'entrada del menú %s.
 AccountancyAreaDescContrib=PAS %s: defineix comptes de comptabilitat per defecte per a despeses especials (impostos diversos). Per això, utilitzeu l'entrada del menú %s.
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=PAS %s: Afegir o editar transaccions existents i gene
 
 AccountancyAreaDescClosePeriod=PAS %s: Tancar el període de forma que no pot fer modificacions en un futur.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=No s'ha completat un pas obligatori en la configuració (el codi comptable diari no està definit per a tots els comptes bancaris)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=No s'ha completat un pas obligatori en la configuració (no s'ha definit el codi comptable diari per a tots els comptes bancaris)
 Selectchartofaccounts=Seleccionar el pla de comptes actiu
 ChangeAndLoad=Canviar i carregar
 Addanaccount=Afegir un compte comptable
@@ -89,13 +93,15 @@ SubledgerAccount=Subcompte comptable
 SubledgerAccountLabel=Títol del subcompte comptable
 ShowAccountingAccount=Mostrar diari de comptes
 ShowAccountingJournal=Mostrar diari comptable
+ShowAccountingAccountInLedger=Mostra el compte comptable al Llibre major
+ShowAccountingAccountInJournals=Mostra el compte comptable als diaris
 AccountAccountingSuggest=Compte comptable suggerit
 MenuDefaultAccounts=Comptes per defecte
 MenuBankAccounts=Comptes bancaris
 MenuVatAccounts=Comptes d'IVA
 MenuTaxAccounts=Comptes relacionats amb impostos
 MenuExpenseReportAccounts=Comptes d'informes de despeses
-MenuLoanAccounts=Comptes de prèstecs
+MenuLoanAccounts=Comptes de préstecs
 MenuProductsAccounts=Comptes comptables de producte
 MenuClosureAccounts=Comptes de tancament
 MenuAccountancyClosure=Tancament
@@ -107,11 +113,12 @@ Binding=Comptabilitzar en comptes
 CustomersVentilation=Comptabilització de factura de client
 SuppliersVentilation=Comptabilització de la factura del proveïdor
 ExpenseReportsVentilation=Comptabilització d'informes de despeses
-CreateMvts=Crea una nova transacció
+CreateMvts=Crea una transacció nova
 UpdateMvts=Modificació d'una transacció
 ValidTransaction=Valida l'assentament
-WriteBookKeeping=Registreu les transaccions a Ledger
+WriteBookKeeping=Registra transaccions en comptabilitat
 Bookkeeping=Llibre major
+BookkeepingSubAccount=Subcompte
 AccountBalance=Compte saldo
 ObjectsRef=Referència de l'objecte origen
 CAHTF=Total de compra a Proveïdor abans d'impostos
@@ -149,7 +156,8 @@ ACCOUNTING_MANAGE_ZERO=Gestiona un nombre diferent de zero al final d'un compte
 BANK_DISABLE_DIRECT_INPUT=Des-habilitar l'enregistrament directe de transaccions al compte bancari 
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Habilita l'exportació d'esborrany en el diari
 ACCOUNTANCY_COMBO_FOR_AUX=Activa la llista de combo per al compte subsidiari (pot ser lent si tens molts tercers)
-ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DATE_START_BINDING=Definiu una data per començar la vinculació i transferència a la comptabilitat. Per sota d’aquesta data, les transaccions no es transferiran a la comptabilitat.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=En el cas de transferència de comptabilitat, seleccioneu el període a mostrar per defecte
 
 ACCOUNTING_SELL_JOURNAL=Diari de venda
 ACCOUNTING_PURCHASE_JOURNAL=Diari de compra
@@ -166,9 +174,11 @@ ACCOUNTING_ACCOUNT_TRANSFER_CASH=Compte de comptabilitat de la transferència ba
 TransitionalAccount=Compte de transferència bancària transitòria
 
 ACCOUNTING_ACCOUNT_SUSPENSE=Compte comptable d'espera
-DONATION_ACCOUNTINGACCOUNT=Compte comptable per registrar les donacions
+DONATION_ACCOUNTINGACCOUNT=Compte comptable per a registrar les donacions
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Compte comptable per a registrar les donacions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Compte comptable per defecte per registrar el dipòsit del client
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Compte comptable per defecte per als productes comprats (utilitzat si no es defineix en el producte)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Compte de comptabilitat per defecte dels productes comprats a la CEE (utilitzat si no està definit a la taula de productes)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Compte de comptabilitat per defecte dels productes comprats i importats fora de la CEE (utilitzat si no està definit a la taula de productes)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Per grups predefinits
 ByPersonalizedAccountGroups=Per grups personalitzats
 ByYear=Per any
 NotMatch=No definit
-DeleteMvt=Elimina línies del Llibre Major
+DeleteMvt=Elimina algunes línies d'operació de la comptabilitat
 DelMonth=Mes a eliminar
 DelYear=Any a eliminar
 DelJournal=Diari per esborrar
-ConfirmDeleteMvt=Això eliminarà totes les línies del Llibre Major de l'any/mes i/o d'un diari específic (requerit almenys un criteri). S'haurà de d'utilitzar la funció 'Registre en comptabilitat' per a que el registre eliminat torni al llibre major.
-ConfirmDeleteMvtPartial=Això eliminarà l'assentament del Llibre Major (se suprimiran totes les línies relacionades amb el mateix assentament)
+ConfirmDeleteMvt=Això suprimirà totes les línies d'operació de la comptabilitat de l'any/mes i/o d'un diari específic (cal un criteri com a mínim). Haureu de tornar a utilitzar la funció '%s' per a que el registre suprimit torni al llibre major.
+ConfirmDeleteMvtPartial=Això suprimirà la transacció de la comptabilitat (se suprimiran totes les línies d’operació relacionades amb la mateixa transacció)
 FinanceJournal=Diari de finances
 ExpenseReportsJournal=Informe-diari de despeses
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=Aquesta és una vista de registres que estan comptabilitzats a un compte comptable i que poden registrar-se al Llibre major.
+DescJournalOnlyBindedVisible=Aquesta és una vista de registre que està vinculada a un compte comptable i que es pot registrar als diaris i llibres majors.
 VATAccountNotDefined=Comptes comptables de IVA sense definir
 ThirdpartyAccountNotDefined=Comptes comptables de tercers (clients o proveïdors) sense definir
 ProductAccountNotDefined=Comptes comptables per al producte sense definir
@@ -220,7 +230,7 @@ FeeAccountNotDefined=Compte per tarifa no definit
 BankAccountNotDefined=Comptes comptables per al banc sense definir
 CustomerInvoicePayment=Pagament de factura de client
 ThirdPartyAccount=Compte de tercer
-NewAccountingMvt=Nova transacció
+NewAccountingMvt=Transacció nova
 NumMvts=Número de transacció
 ListeMvts=Llista de moviments
 ErrorDebitCredit=El dèbit i el crèdit no poden tenir valors alhora
@@ -254,12 +264,12 @@ DescVentilDoneCustomer=Consulta aquí la llista de línies de factures a clients
 DescVentilTodoCustomer=Comptabilitza les línies de factura encara no comptabilitzades amb un compte comptable de producte
 ChangeAccount=Canvia el compte comptable de producte/servei per les línies seleccionades amb el següent compte comptable:
 Vide=-
-DescVentilSupplier=Consulteu aquí la llista de les línies de facturació dels proveïdor vinculades o encara no lligades a un compte de comptable de producte (només es poden veure els registres no transferits a comptabilitat)
+DescVentilSupplier=Consulteu aquí la llista de les línies de facturació dels proveïdors vinculades o encara no lligades a un compte comptable de producte (només es poden veure els registres no transferits a comptabilitat)
 DescVentilDoneSupplier=Consulteu aquí la llista de les línies de venedors de factures i el seu compte comptable
 DescVentilTodoExpenseReport=Línies d'informes de despeses comptabilitzades encara no comptabilitzades amb un compte comptable de tarifa
 DescVentilExpenseReport=Consulteu aquí la llista de les línies d'informe de despeses vinculada (o no) a un compte comptable corresponent a tarifa
-DescVentilExpenseReportMore=Si tu poses el compte comptable sobre les línies del informe per tipus de despesa, l'aplicació serà capaç de fer tots els vincles entre les línies del informe i els comptes comptables del teu pla comptable, només amb un clic amb el botó <strong>"%s"</strong>. Si el compte no estava al diccionari de tarifes o si encara hi ha línies no vinculades a cap compte, hauràs de fer-ho manualment a partir del menú "<strong>%s</strong>".
-DescVentilDoneExpenseReport=Consulteu aquí la llista de les línies dels informes de despeses i les seves comptes comptables corresponent a les tarifes
+DescVentilExpenseReportMore=Si tu poses el compte comptable sobre les línies de l'informe per tipus de despesa, l'aplicació serà capaç de fer tots els vincles entre les línies de l'informe i els comptes comptables del teu pla comptable, només amb un clic amb el botó <strong>"%s"</strong>. Si el compte no estava al diccionari de tarifes o si encara hi ha línies no vinculades a cap compte, hauràs de fer-ho manualment a partir del menú "<strong>%s</strong>".
+DescVentilDoneExpenseReport=Consulteu aquí la llista de les línies d'informes de despeses i el seu compte comptable de comissions
 
 DescClosure=Consulteu aquí el nombre de moviments per mes que no són validats i els exercicis ja oberts
 OverviewOfMovementsNotValidated=Pas 1 / Visió general dels moviments no validats. (Cal tancar un exercici)
@@ -285,13 +295,13 @@ ShowTutorial=Mostrar Tutorial
 NotReconciled=No conciliat
 
 ## Admin
-BindingOptions=Binding options
+BindingOptions=Opcions d'enquadernació
 ApplyMassCategories=Aplica categories massives
 AddAccountFromBookKeepingWithNoCategories=Compte disponible encara no al grup personalitzat
-CategoryDeleted=La categoria per al compte contable ha sigut eliminada
+CategoryDeleted=S'ha eliminat la categoria per al compte comptable
 AccountingJournals=Diari de comptabilitat
 AccountingJournal=Diari comptable
-NewAccountingJournal=Nou diari comptable
+NewAccountingJournal=Diari comptable nou
 ShowAccountingJournal=Mostrar diari comptable
 NatureOfJournal=Naturalesa del diari
 AccountingJournalType1=Operacions diverses
@@ -303,8 +313,11 @@ AccountingJournalType8=Inventari
 AccountingJournalType9=Haver
 ErrorAccountingJournalIsAlreadyUse=Aquest diari ja està en ús
 AccountingAccountForSalesTaxAreDefinedInto=Nota: el compte de comptes de l'impost de vendes es defineix al menú <b> %s </b> - <b> %s </b>
-NumberOfAccountancyEntries=Número d'entrades
-NumberOfAccountancyMovements=Número de moviments
+NumberOfAccountancyEntries=Nombre d'entrades
+NumberOfAccountancyMovements=Nombre de moviments
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Desactiva la vinculació i transferència de comptabilitat en vendes (les factures dels clients no es tindran en compte a la comptabilitat)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Desactiva la vinculació i transferència a la comptabilitat de les compres (les factures de proveïdors no es tindran en compte a la comptabilitat)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Desactiva la vinculació i transferència de comptes en els informes de despeses (els informes de despeses no es tindran en compte a la comptabilitat)
 
 ## Export
 ExportDraftJournal=Exportar esborranys del llibre 
@@ -326,12 +339,14 @@ Modelcsv_configurable=Exporta CSV configurable
 Modelcsv_FEC=Exporta FEC
 Modelcsv_Sage50_Swiss=Exportació per Sage 50 Switzerland
 Modelcsv_winfic=Exportar Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Exporta per a Gestinum (v3)
+Modelcsv_Gestinumv5Export per a Gestinum (v5)
 ChartofaccountsId=Id pla comptable
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Inicialitza la comptabilitat
 InitAccountancyDesc=Aquesta pàgina es pot utilitzar per inicialitzar un compte de comptabilitat en productes i serveis que no tenen compte comptable definit per a vendes i compres.
-DefaultBindingDesc=Aquesta pàgina pot ser utilitzat per establir un compte per defecte que s'utilitzarà per enllaçar registre de transaccions sobre els pagament de salaris, donació, impostos i IVA quan no hi ha encara compte comptable específic definit.
+DefaultBindingDesc=Aquesta pàgina es pot utilitzar per establir un compte predeterminat que s'utilitzarà per enllaçar el registre de transaccions sobre el pagament de salaris, donacions, impostos i IVA quan encara no s'hagi establert cap compte comptable específic.
 DefaultClosureDesc=Aquesta pàgina es pot utilitzar per definir els paràmetres usats per als tancaments de comptabilitat.
 Options=Opcions
 OptionModeProductSell=En mode vendes
@@ -349,8 +364,8 @@ OptionModeProductBuyExportDesc=Mostra tots els productes amb compte comptable pe
 CleanFixHistory=Eliminar el codi comptable de les línies que no existeixen als gràfics de compte
 CleanHistory=Reinicia tota la comptabilització per l'any seleccionat
 PredefinedGroups=Grups predefinits
-WithoutValidAccount=Sense compte dedicada vàlida
-WithValidAccount=Amb compte dedicada vàlida
+WithoutValidAccount=Sense compte dedicat vàlid
+WithValidAccount=Amb un compte dedicat vàlid
 ValueNotIntoChartOfAccount=Aquest compte comptable no existeix al pla comptable
 AccountRemovedFromGroup=S'ha eliminat el compte del grup
 SaleLocal=Venda local
@@ -366,7 +381,7 @@ Formula=Fórmula
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=No s'han fet alguns passos obligatoris de configuració, si us plau, completeu-los
-ErrorNoAccountingCategoryForThisCountry=No hi ha cap grup comptable disponible per al país %s (Veure Inici - Configuració - Diccionaris)
+ErrorNoAccountingCategoryForThisCountry=No hi ha cap grup de comptes comptables disponible per al país %s (Vegeu Inici - Configuració - Diccionaris)
 ErrorInvoiceContainsLinesNotYetBounded=Intenta actualitzar algunes línies de la factura <strong> %s </strong>, però algunes altres encara no estan vinculades al compte de comptabilitat. Es rebutja el registre comptable de totes les línies d'aquesta factura.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Algunes línies a la factura no estan vinculades al compte de comptabilitat.
 ExportNotSupported=El format d'exportació configurat no està suportat en aquesta pàgina
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index b524a7b8a73..7d1f089796c 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -30,13 +30,15 @@ SessionSaveHandler=Modalitat de desar sessions
 SessionSavePath=Desa la ubicació de la sessió
 PurgeSessions=Purga de sessions
 ConfirmPurgeSessions=Estàs segur de voler purgar totes les sessions? Es desconnectaran tots els usuaris (excepte tu mateix)
-NoSessionListWithThisHandler=El gestor de sessions configurat al seu PHP no permiteix mostrar les sessions en curs
+NoSessionListWithThisHandler=El gestor de sessions configurat al vostre PHP no permet llistar totes les sessions en execució.
 LockNewSessions=Bloquejar connexions noves
 ConfirmLockNewSessions=Esteu segur de voler restringir l'accés a Dolibarr únicament al seu usuari? Només el login <b>%s</b> podrà connectar si confirma.
 UnlockNewSessions=Eliminar bloqueig de connexions
 YourSession=La seva sessió
 Sessions=Sessions d'usuaris
 WebUserGroup=Servidor web usuari/grup
+PermissionsOnFilesInWebRoot=Permisos als fitxers del directori arrel web
+PermissionsOnFile=Permisos al fitxer %s
 NoSessionFound=Sembla que el seu PHP no pot llistar les sessions actives. El directori de salvaguardat de sessions (<b>%s</b>) pot estar protegit (per exemple, pels permisos del sistema operatiu o per la directiva open_basedir del seu PHP).
 DBStoringCharset=Codificació base de dades per emmagatzematge de dades
 DBSortingCharset=Codificació base de dades per classificar les dades
@@ -52,10 +54,10 @@ InternalUsers=Usuaris interns
 ExternalUsers=Usuaris externs
 GUISetup=Entorn
 SetupArea=Configuració
-UploadNewTemplate=Carrega nova plantilla(s)
+UploadNewTemplate=Carrega plantilles noves
 FormToTestFileUploadForm=Formulari de prova de càrrega de fitxer (segons opcions escollides)
 IfModuleEnabled=Nota: sí només és eficaç si el mòdul <b>%s</b> està activat
-RemoveLock=Esborreu el fitxer <b>%s</b>, si existeix, per permetre la utilitat d'actualització.
+RemoveLock=Elimineu/renombreu el fitxer <b> %s </b> si existeix, per a permetre l'ús de l'eina d'actualització/instal·lació.
 RestoreLock=Substituir un arxiu <b>%s</b>, donant-li només drets de lectura a aquest arxiu per tal de prohibir noves actualitzacions.
 SecuritySetup=Configuració de seguretat
 SecurityFilesDesc=Defineix les opcions relacionades amb la seguretat de càrrega de fitxers.
@@ -68,10 +70,10 @@ ErrorReservedTypeSystemSystemAuto=L'ús del tipus 'system' i 'systemauto' està
 ErrorCodeCantContainZero=El codi no pot contenir el valor 0
 DisableJavascript=Desactivar les funcions Javascript
 DisableJavascriptNote=Nota: per a propòsits de prova o de depuració. Per a l’optimització dels navegadors cec o de text, és possible que preferiu utilitzar la configuració en el perfil de l’usuari
-UseSearchToSelectCompanyTooltip=També si tenen un gran número de tercers (> 100.000), pot augmentar la velocitat mitjançant l'estableciement COMPANY_DONOTSEARCH_ANYWHERE amb la constant a 1 a Configuració --> Altres. La cerca serà limitada a la creació de la cadena
-UseSearchToSelectContactTooltip=També si vostè té un gran número de tercers (> 100.000), pot augmentar la velocitat mitjançant l'estableciment. CONTACT_DONOTSEARCH_ANYWHERE amb la constant a 1 a Configuració --> Altres. La cerca serà limitada a la creació de la cadena
+UseSearchToSelectCompanyTooltip=A més, si teniu un gran nombre de tercers (> 100.000), podeu augmentar la velocitat establint la constant COMPANY_DONOTSEARCH_ANYWHERE a 1 a Configuració->Altres. La cerca es limitarà a l'inici de la cadena.
+UseSearchToSelectContactTooltip=A més, si teniu un gran nombre de tercers (> 100.000), podeu augmentar la velocitat establint la constant CONTACT_DONOTSEARCH_ANYWHERE a 1 a Configuració->Altres. La cerca es limitarà a l'inici de la cadena.
 DelaiedFullListToSelectCompany=Esperar fins que es prem una tecla abans de carregar el contingut de la llista combinada de Tercers. <br> Això pot augmentar el rendiment si teniu un gran nombre de tercers, però és menys convenient.
-DelaiedFullListToSelectContact=Esperar fins que es prem una tecla abans de carregar el contingut de la llista combinada de Contactes. <br>Això pot augmentar el rendiment si teniu un gran nombre de tercers, però és menys convenient.
+DelaiedFullListToSelectContact=Espereu fins que es prem una tecla abans de carregar el contingut de la llista combinada de contactes. <br> Això pot augmentar el rendiment si teniu un gran nombre de contactes, però és menys convenient.
 NumberOfKeyToSearch=Nombre de caràcters per activar la cerca: %s
 NumberOfBytes=Nombre de bytes
 SearchString=Cerca cadena
@@ -80,11 +82,12 @@ AllowToSelectProjectFromOtherCompany=En un document d'un tercer, pots triar un p
 JavascriptDisabled=Javascript desactivat
 UsePreviewTabs=Veure fitxes "vista prèvia"
 ShowPreview=Veure previsualització
+ShowHideDetails=Mostra-Amaga els detalls
 PreviewNotAvailable=Vista prèvia no disponible
 ThemeCurrentlyActive=Tema actualment actiu
 CurrentTimeZone=Fus horari PHP (Servidor)
 MySQLTimeZone=Zona horària MySql (base de dades)
-TZHasNoEffect=Les dates es guarden i tornen pel servidor de la base de dedes tal com si les haguessin enviat com una cadena. La zona horària només te efecte si s'utilitza la funció UNIX_TIMESTAMP (que no deuria ser utilitzada per dolibarr, per el que la zona horària de la base de dades no hauria de tenir efecte, encara que s'hagi canviat després d'introduir les dades).
+TZHasNoEffect=El servidor de base de dades emmagatzema i retorna les dates com si les haguessin enviat com una cadena. La zona horària només té efecte quan s’utilitza la funció UNIX_TIMESTAMP (que Dolibarr no hauria d’utilitzar, de manera que la base de dades TZ no hauria de tenir cap efecte, fins i tot si es canvia després d’introduir les dades).
 Space=Àrea
 Table=Taula
 Fields=Camps
@@ -100,9 +103,9 @@ NoMaxSizeByPHPLimit=Cap limitació interna en el seu servidor PHP
 MaxSizeForUploadedFiles=Tamany màxim dels documents a pujar (0 per prohibir la pujada)
 UseCaptchaCode=Utilització de codi gràfic (CAPTCHA) en el login
 AntiVirusCommand=Ruta completa cap al comandament antivirus
-AntiVirusCommandExample=Exemple per al dimoni ClamAv (requerix clamav-daemon): /usr/bin/clamdscan<br>Exemple per a ClamWin (molt molt lent): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusCommandExample=Exemple per al dimoni ClamAv (requereix clamav-daemon): /usr/bin/clamdscan<br>Exemple per a ClamWin (molt molt lent): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Paràmetres complementaris en la línia de comandes
-AntiVirusParamExample=Exemple per al dimoni de ClamAv: --fdpass <br> Exemple per a ClamWin: --database = "C: \\ Program Files (x86) \\ ClamWin \\ lib"
+AntiVirusParamExample=Exemple per al dimoni de ClamAv: --fdpass<br>Exemple per a ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Configuració del mòdul Comptabilitat
 UserSetup=Configuració de gestió d'usuaris
 MultiCurrencySetup=Configuració multi-divisa
@@ -119,7 +122,7 @@ OtherSetup=Altres configuracions
 CurrentValueSeparatorDecimal=Separador decimal
 CurrentValueSeparatorThousand=Separador milers
 Destination=Destinació
-IdModule=ID del modul
+IdModule=ID del mòdul
 IdPermissions=ID de permisos
 LanguageBrowserParameter=Variable %s
 LocalisationDolibarrParameters=Paràmetres de localització
@@ -134,7 +137,7 @@ YouCanEditPHPTZ=Per establir una zona horària PHP diferent (no és necessari),
 HoursOnThisPageAreOnServerTZ=Avís, al contrari d'altres pantalles, les hores d'aquesta pàgina no són a la vostra zona horària local, sinó a la zona horària del servidor.
 Box=Panell
 Boxes=Panells
-MaxNbOfLinesForBoxes=Màxim número de línies pels panells
+MaxNbOfLinesForBoxes=Màx. nombre de línies pels panells
 AllWidgetsWereEnabled=Tots els widgets disponibles estan habilitats
 PositionByDefault=Posició per defecte
 Position=Lloc
@@ -193,21 +196,21 @@ NameColumn=Nom de les columnes
 ExtendedInsert=Instruccions INSERT esteses
 NoLockBeforeInsert=Sense intrucció LOCK abans del INSERT
 DelayedInsert=Insercions amb retard
-EncodeBinariesInHexa=Codificar els camps binaris en hexacesimal
+EncodeBinariesInHexa=Codifica les dades binàries en hexadecimal
 IgnoreDuplicateRecords=Ignorar errors de registres duplicats (INSERT IGNORE)
 AutoDetectLang=Autodetecta (idioma del navegador)
 FeatureDisabledInDemo=Opció deshabilitada en demo
 FeatureAvailableOnlyOnStable=Funcionalitat disponible únicament en versions estables oficials 
 BoxesDesc=Els panells són components que mostren algunes dades que poden afegir-se per personalitzar algunes pàgines. Pots triar entre mostrar el panell o no seleccionant la pàgina de destí i fent clic a 'Activar', o fent clic en la paperera per desactivar.
 OnlyActiveElementsAreShown=Només els elements de <a href="%s"> mòduls activats</a> són mostrats
-ModulesDesc=Els mòduls / aplicacions determinen quines funcions estan disponibles al programari. Alguns mòduls requereixen concedir permisos als usuaris després d'activar el mòdul. Feu clic al botó on / off <span class="small valignmiddle"> %s </span> de cada mòdul per habilitar o desactivar un mòdul / aplicació.
+ModulesDesc=Els mòduls/aplicacions determinen quines funcions estan disponibles al programari. Alguns mòduls requereixen que es concedeixin permisos als usuaris després d'activar-lo. Feu clic al botó d'encesa/apagada <span class="small valignmiddle">%s</span> de cada mòdul per a habilitar o desactivar un mòdul/aplicació.
 ModulesMarketPlaceDesc=Pots trobar més mòduls per descarregar en pàgines web externes per internet...
-ModulesDeployDesc=Si els permisos en el seu sistema d'arxius ho permiteixen, pot utilitzar aquesta ferramente per instal·lar un mòdul extern. El mòdul estarà aleshores visible en la pestanya <strong>%s</strong>
+ModulesDeployDesc=Si els permisos del vostre sistema de fitxers ho permeten, podeu utilitzar aquesta eina per desplegar un mòdul extern. El mòdul serà visible a la pestanya <strong> %s </strong>.
 ModulesMarketPlaces=Trobar mòduls/complements externs
 ModulesDevelopYourModule=Desenvolupeu els vostres mòduls/aplicacions
 ModulesDevelopDesc=Podeu desenvolupar o trobar un partner que desenvolupi per a vostè, el vostre mòdul personalitzat
 DOLISTOREdescriptionLong=En lloc d'anar al lloc web <a href="https://www.dolistore.com">www.dolistore.com</a> per trobar un mòdul extern, podeu utilitzar aquesta eina incrustada que farà la cerca en la tenda per vosaltres (pot ser lent, necessiteu un accés a internet)...
-NewModule=Nou mòdul
+NewModule=Mòdul nou
 FreeModule=Gratuït
 CompatibleUpTo=Compatible amb la versió %s
 NotCompatible=Aquest mòdul no sembla compatible amb el vostre Dolibarr %s (Mín %s - Màx %s).
@@ -220,7 +223,7 @@ AchatTelechargement=Comprar / Descarregar
 GoModuleSetupArea=Per desplegar / instal·lar un nou mòdul, aneu a l'àrea de configuració del mòdul: <a href="%s"> %s </a>.
 DoliStoreDesc=DoliStore, el lloc oficial de mòduls complementaris per Dolibarr ERP / CRM
 DoliPartnersDesc=Llista d’empreses que ofereixen mòduls o funcions desenvolupades a mida. <br> Nota: ja que Dolibarr és una aplicació de codi obert, <i> qualsevol usuari </i> experimentat en la programació PHP hauria de poder desenvolupar un mòdul.
-WebSiteDesc=Llocs web de referència per trobar més mòduls (no core)...
+WebSiteDesc=Llocs web de referència per a trobar més mòduls (no core)...
 DevelopYourModuleDesc=Algunes solucions per desenvolupar el vostre propi mòdul...
 URL=URL
 RelativeURL=URL relativa
@@ -271,7 +274,7 @@ NoticePeriod=Preavís
 NewByMonth=Nou per mes
 Emails=Correus electrònics
 EMailsSetup=Configuració de correu electrònic
-EMailsDesc=Aquesta pàgina permet reescriure els paràmetres del PHP en quan a l'enviament de correus. A la majoria dels casos, al sistema operatiu Unix/Linux, la configuració per defecte del PHP és correcta i no calen aquests paràmetres.
+EMailsDesc=Aquesta pàgina et permet establir paràmetres o opcions per a l'enviament de correu electrònic.
 EmailSenderProfiles=Perfils de remitents de correus electrònics
 EMailsSenderProfileDesc=Podeu mantenir aquesta secció buida. Si introduïu aquí alguns emails, aquests seran afegits a la llista de possibles remitents al desplegable quan escrigueu un correu electrònic nou.
 MAIN_MAIL_SMTP_PORT=Port del servidor SMTP (Per defecte a php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=ID d'autenticació SMTP (si el servidor requereix autenticaci
 MAIN_MAIL_SMTPS_PW=Contrasenya SMTP (si el servidor requereix autenticació)
 MAIN_MAIL_EMAIL_TLS=Utilitza el xifratge TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Ús d'encriptació TLS (STARTTLS)
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autoritza els certificats autosignats
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Utilitzar DKIM per a generar firma d'email
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Domini d'email per a utilitzar amb dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Nom del selector dkim
@@ -331,18 +335,18 @@ UnpackPackageInModulesRoot=Per instal·lar un mòdul extern, descomprimir l'arxi
 SetupIsReadyForUse=La instal·lació del mòdul ha finalitzat. No obstant, ha d'habilitar i configurar el mòdul en la seva aplicació, aneu a la pàgina per configurar els mòduls: <a href="%s">%s</a>.
 NotExistsDirect=No s'ha definit el directori arrel alternatiu a un directori existent.<br>
 InfDirAlt=Des de la versió 3, és possible definir un directori arrel alternatiu. Això li permet emmagatzemar, en un directori dedicat, plug-ins i plantilles personalitzades.<br>Només ha de crear un directori a l'arrel de Dolibarr (per exemple: custom).<br>
-InfDirExample=<br>Declareu-lo al fitxer <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>Si aquestes línies ja hi són però comentades amb un "#",  llavors simplement descomenteu-les treient aquest caràcter.
-YouCanSubmitFile=Podeu pujar el fitxer .zip del paquet de mòdul des d’aquí:
+InfDirExample=Llavors <br>declareu-ho a l'arxiu <strong>conf.php </strong><br> $dolibarr_main_url_root_alt='/custom'<br> $dolibarr_main_document_root_alt='/ruta/del/dolibarr/htdocs/custom'<br> Si aquestes línies estan comentades amb "#", per a activar-les simplement descomenteu-les traient el caràcter "#".
+YouCanSubmitFile=Podeu pujar el fitxer .zip del paquet del mòdul des d’aquí:
 CurrentVersion=Versió actual de Dolibarr
 CallUpdatePage=Ves a la pàgina que actualitza l'estructura de base de dades i les dades: %s
 LastStableVersion=Última versió estable
 LastActivationDate=Data de l'última activació
 LastActivationAuthor=Últim autor d'activació
 LastActivationIP=Última IP d'activació
-UpdateServerOffline=Actualitzacións del servidor fora de línia
+UpdateServerOffline=Actualitza el servidor fora de línia
 WithCounter=Gestiona un comptador
-GenericMaskCodes=Podeu introduir qualsevol màscara numèrica. En aquesta màscara, pot utilitzar les següents etiquetes:<br><b>{000000}</b> correspon a un número que s'incrementa en cadascun %s. Introduïu tants zeros com longuitud desitgi mostrar. El comptador es completarà a partir de zeros per l'esquerra per tal de tenir tants zeros com la màscara. <br><b>{000000+000}</b>Igual que l'anterior, amb una compensació corresponent al número a la dreta del signe + s'aplica a partir del primer %s.<br><b>{000000@x}</b>igual que l'anterior, però el comptador es restableix a zero quan s'arriba a x mesos (x entre 1 i 12). Si aquesta opció s'utilitza i x és de 2 o superior, llavors la seqüència {yy}{mm} ó {yyyy}{mm} també és necessària.<br><b>  {dd}  </b> dies (01 a 31).<br><b> {mm}</b> mes (01 a 12).<br><b> {yy} </ b>, <b> {yyyy</ b> ó <b>{y} </b> any en 2, 4 ó 1 xifra.<br>
-GenericMaskCodes2=<b>{cccc}</b> el codi de client amb n caracters<br><b>{cccc000}</b> el codi de client amb n caracters seguit d'un contador dedicat pel client. Aquest contador dedicar al client es reinícia al mateix temps que el contador global.<br><b>{tttt}</b> El codi del tipus de tercer amb n caracters (veure menú Inici - Configuració - Diccionaris - Tipus de tercer). Si afegeixes aquesta etiqueta, el contador serà diferent per a cada tipus de tercer.<br>
+GenericMaskCodes=Podeu introduir qualsevol màscara numèrica. En aquesta màscara es podrien utilitzar les etiquetes següents:<br><b> {000000}</b> correspon a un número que s'incrementarà a cada %s. Introduïu tants zeros com la longitud desitjada del comptador. El comptador es completarà amb zeros per l'esquerra per tal de tenir tants zeros com la màscara. <br><b> {000000+000} </b> igual que l'anterior, però s'aplica un desplaçament corresponent al número a la dreta del signe + a partir del primer %s. <br> <b>{000000@x}</b> igual que l'anterior, però el comptador es restableix a zero quan s'arriba al mes x (x entre 1 i 12, o 0 per utilitzar els primers mesos de l'any fiscal definits a la configuració o 99 per restablir-los a zero cada mes). Si s’utilitza aquesta opció i x és 2 o superior, també és obligatòria la seqüència {yy}{mm} o {yyyy}{mm}. <br><b>{dd}</b> dia (de l'1 al 31). <br> <b>{mm}</b> mes (01 a 12). <br><b> {aa} </b>, <b>{aaaa}</b> o <b>{y}</b> any en 2, 4 o 1 xifra. <br>
+GenericMaskCodes2=<b>{cccc}</b> el codi de client amb n caràcters<br><b>{cccc000}</b> el codi de client amb n caràcters seguit d'un comptador dedicat pel client. Aquest comptador dedicat al client es reinicia al mateix temps que el comptador global.<br><b>{tttt}</b> El codi del tipus de tercer amb n caràcters (vegeu el menú Inici - Configuració - Diccionaris - Tipus de tercers). Si afegeixes aquesta etiqueta, el comptador serà diferent per a cada tipus de tercer.<br>
 GenericMaskCodes3=Qualsevol altre caràcter a la màscara es quedarà sense canvis. <br> No es permeten espais<br>
 GenericMaskCodes4a=<u>Exemple en el 99 %s del tercer L'Empresa, amb data 31/01/2007:</u><br>
 GenericMaskCodes4b=<u>Exemple sobre un tercer creat el 31/03/2007: </u> <br>
@@ -362,14 +366,14 @@ SeeWikiForAllTeam=Mira a la pàgina Wiki per veure una llista de contribuents i
 UseACacheDelay= Demora en memòria cau de l'exportació en segons (0 o buit sense memòria)
 DisableLinkToHelpCenter=Amagar l'enllaç "Necessita suport o ajuda" a la pàgina de login
 DisableLinkToHelp=Amaga l'enllaç a l'ajuda en línia "<b>%s</b>"
-AddCRIfTooLong=No hi ha línies de tall automátic, així que si el text es massa llarg no es mostrarà en els documents. Per favor afegeix un salt de línia a l'àrea de text si fos necessari.
+AddCRIfTooLong=No hi ha cap tall de text automàtic, el text massa llarg no es mostrarà als documents. Si cal, afegiu devolucions de carro a l'àrea de text.
 ConfirmPurge=Estàs segur de voler realitzar aquesta purga? <br> Això esborrarà definitivament totes les dades dels seus fitxers (àrea GED, arxius adjunts etc.).
-MinLength=Longuitud mínima
+MinLength=Longitud mínima
 LanguageFilesCachedIntoShmopSharedMemory=arxius .lang en memòria compartida
 LanguageFile=Fitxer d'idioma
 ExamplesWithCurrentSetup=Exemples amb configuració actual
 ListOfDirectories=Llistat de directoris de plantilles OpenDocument
-ListOfDirectoriesForModelGenODT=Llista de directoris que contenen fitxers de plantilles amb format OpenDocument.<br><br>Posa aqui el l'adreça completa dels directoris.<br>Afegeix un "intro" entre cada directori.<br>Per afegir un directori del mòdul GED, afegeix aquí <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Els fitxers d'aquests directoris han de tenir l'extensió <b>.odt</b> o <b>.ods</b>.
+ListOfDirectoriesForModelGenODT=Llista de directoris que contenen fitxers de plantilles amb format OpenDocument.<br><br>Posa aquí l'adreça completa dels directoris.<br>Afegeix un "intro" entre cada directori.<br>Per afegir un directori del mòdul GED, afegeix aquí <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Els fitxers d'aquests directoris han de tenir l'extensió <b>.odt</b> o <b>.ods</b>.
 NumberOfModelFilesFound=Nombre d'arxius de plantilles ODT/ODS trobats en aquest(s) directori(s)
 ExampleOfDirectoriesForModelGen=Exemples de sintaxi:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=Posant les següents etiquetes a la plantilla, obtindrà una substitució amb el valor personalitzat en generar el document:
@@ -378,7 +382,7 @@ FirstnameNamePosition=Posició del Nom/Cognoms
 DescWeather=Les imatges següents es mostraran al tauler de control quan el nombre d'accions posteriors arriba als valors següents:
 KeyForWebServicesAccess=Clau per utilitzar els Web Services (paràmetre "dolibarrkey" en els webservices)
 TestSubmitForm=Formulari de proves
-ThisForceAlsoTheme=Utilitzar aquest gestor de menús predetermina també el tema, sigui quina sigui l'elecció de l'usuari. A més, aquest gestor de menús, especial per a smartphones, només funciona en alguns telèfons. Utilitzar un altre gestor Si veieu qualsevol problema.
+ThisForceAlsoTheme=L’ús d’aquest gestor de menús també farà servir el seu propi tema sigui quina sigui l’opció de l’usuari. A més, aquest gestor de menú especialitzat per a telèfons intel·ligents no funciona en tots els telèfons intel·ligents. Utilitzeu un altre gestor de menús si teniu problemes amb el vostre.
 ThemeDir=Directori dels temes
 ConnectionTimeout=Temps d'espera de connexió
 ResponseTimeout=Timeout de resposta
@@ -416,8 +420,8 @@ HtmlText=Text Html
 Int=Enter
 Float=Decimal
 DateAndTime=Data i hora
-Unique=Unic
-Boolean=Boleà (una casella de verificació)
+Unique=Únic
+Boolean=Boleà (una casella de selecció)
 ExtrafieldPhone = Telèfon
 ExtrafieldPrice = Preu
 ExtrafieldMail = Correu electrònic
@@ -427,26 +431,26 @@ ExtrafieldSelectList = Llista de selecció de table
 ExtrafieldSeparator=Separador (no és un camp)
 ExtrafieldPassword=Contrasenya
 ExtrafieldRadio=Botons tipus radio (només una opció)
-ExtrafieldCheckBox=Caselles de verificació
-ExtrafieldCheckBoxFromList=Caselles de verificació des de taula
+ExtrafieldCheckBox=Caselles de selecció
+ExtrafieldCheckBoxFromList=Caselles de selecció des d'una taula
 ExtrafieldLink=Enllaç a un objecte
 ComputedFormula=Camp calculat
-ComputedFormulaDesc=Podeu introduir aquí una fórmula utilitzant altres propietats de l’objecte o qualsevol codi PHP per obtenir un valor calculat dinàmicament. Podeu utilitzar qualsevol fórmula compatible amb PHP, inclós l'operador condicional "?"  i els següents objectes globals: <strong> $db, $conf, $langs, $mysoc, $user, $object </strong>. <br> <strong> ATENCIÓ </strong>: Només poden estar disponibles algunes propietats de $object. Si necessiteu una propietat no carregada, només cal que incorporeu l'objecte a la vostra fórmula com en el segon exemple. <br> Utilitzar un camp calculat implica que no podreu introduir cap valor des de la interfície. A més, si hi ha un error de sintaxi, la fórmula pot no tornar res. <br> <br> Exemple de fórmula: <br> $object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2 ) <br> <br> Exemple per tornar a carregar l'objecte <br>  (($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br> <br> Un altre exemple de fórmula per forçar la càrrega de l'objecte i el seu objecte pare: <br> (($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=Podeu introduir aquí una fórmula utilitzant altres propietats de l’objecte o qualsevol codi PHP per obtenir un valor calculat dinàmicament. Podeu utilitzar qualsevol fórmula compatible amb PHP, inclòs l'operador condicional "?"  i els següents objectes globals: <strong> $db, $conf, $langs, $mysoc, $user, $object </strong>. <br> <strong> ATENCIÓ </strong>: Només poden estar disponibles algunes propietats de $object. Si necessiteu una propietat no carregada, només cal que incorporeu l'objecte a la vostra fórmula com en el segon exemple. <br> Utilitzar un camp calculat implica que no podreu introduir cap valor des de la interfície. A més, si hi ha un error de sintaxi, la fórmula pot no tornar res. <br> <br> Exemple de fórmula: <br> $object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2 ) <br> <br> Exemple per tornar a carregar l'objecte <br>  (($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br> <br> Un altre exemple de fórmula per forçar la càrrega de l'objecte i el seu objecte pare: <br> (($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Emmagatzemar el camp computat
 ComputedpersistentDesc=Els camps addicionals computats s’emmagatzemaran a la base de dades, però, el valor només es tornarà a calcular quan l’objecte d’aquest camp s’ha canviat. Si el camp calculat depèn d'altres objectes o dades globals, aquest valor podria estar equivocat !!
 ExtrafieldParamHelpPassword=Mantenir aquest camp buit significa que el valor s'emmagatzema sense xifrar (el camp només ha d'estar amagat amb una estrella sobre la pantalla). <br> Establiu aquí el valor 'auto' per utilitzar la regla de xifrat per defecte per guardar la contrasenya a la base de dades (el valor llegit serà només el "hash", no hi haurà cap manera de recuperar el valor original)
 ExtrafieldParamHelpselect=La llista de valors ha de ser un conjunt de línies amb un par del tipus clau,valor (on la clau no pot ser '0') <br><br> per exemple : <br>clau1,valor1<br>clau2,valor2<br>clau3,valor3<br>...<br><br>Per tenir la llista depenent d'una altra llista d'atributs complementaris: <br>1,valor1|options_<i>codi_llista_pare</i>:clau_pare<br>2,valor2|options_<i>codi_llista_pare</i>:clau_pare <br><br>Per tenir la llista depenent d'una altra llista:<br>1,valor1|<i>codi_llista_pare</i>:clau_pare<br>2,valor2|<i>codi_llista_pare</i>:clau_pare
 ExtrafieldParamHelpcheckbox=La llista de valor ha de ser un conjunt de línies del tipus clau,valor (a on la clau no pot ser '0')<br><br> per exemple : <br>1,valor1<br>2,valor2<br>3,valor3<br>...
 ExtrafieldParamHelpradio=La llista de valor ha de ser un conjunt de línies del tipus clau,valor (a on la clau no pot ser '0')<br><br> per exemple : <br>1,valor1<br>2,valor2<br>3,valor3<br>...
-ExtrafieldParamHelpsellist=Llista de valors que provenen d'una taula<br>Sintaxi: nom_taula:nom_camp:id_camp::filtre<br>Exemple : c_typent:libelle:id::filter<br><br>- idfilter ha de ser necessàriament una "primary int key" <br>- el filtre pot ser una comprovació senzilla (eg active=1) per mostrar només valors actius<br>També es pot emprar $ID$ al filtre per representar el ID de l'actual objecte en curs<br>Per fer un SELECT al filtre empreu $SEL$<br>Si voleu filtrar per algun camp extra ("extrafields") empreu la sintaxi extra.codicamp=... (a on codicamp és el codi del camp extra)<br><br>Per tenir la llista depenent d'una altre llista d'atributs complementaris:<br>c_typent:libelle:id:options_<i>codi_llista_pare</i>|parent_column:filter <br><br>Per tenir la llista depenent d'una altra llista:<br>c_typent:libelle:id:<i>codi_llista_pare</i>|parent_column:filter
+ExtrafieldParamHelpsellist=Llista de valors que provenen d’una taula<br>Sintaxi: nom_taula:nom_camp:id_camp::filtre<br>Exemple: c_typent:libelle:id::filtre<br><br>- id_camp ha de ser necessàriament una "primary int key"<br>- el filtre pot ser una comprovació senzilla (p.e. active=1) per mostrar només els valors actius<br>També pots utilitzar $ID$ al filtre per representar el ID de l'actual objecte en curs<br>Per utilitzar un SELECT al filtre, utilitzeu la paraula clau $SEL$ per evitar la protecció antiinjecció.<br>Si vols filtrar camps addicionals utilitza la sintaxi extra.nom_camp=... (on nom_camp és el codi del camp addicional)<br><br>Per tenir la llista en funció d’una altra llista d’atributs complementaris:<br>c_typent:libelle:id:options_<i>codi_llista_mare</i>|parent_column:filtre <br><br>Per tenir la llista en funció d'una altra llista:<br>c_typent:libelle:id:<i>codi_llista_mare</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=La llista de valors prové d'una taula <br> Sintaxi: nom_taula:nom_camp:id_camp::filtre <br> Exemple: c_typent:libelle:id::filter<br> <br> filtre pot ser una comprovació simple (p. ex. active=1) per mostrar només el valor actiu <br> També podeu utilitzar $ID$ en el filtre per representar l'ID actual de l'objecte en curs <br>Per fer un SELECT en el filtre utilitzeu $SEL$ <br> si voleu filtrar per camps extra utilitzeu sintaxi extra.fieldcode=... (on el codi de camp és el codi del extrafield) <br> <br>Per tenir la llista depenent d'una altra llista d'atributs complementaris: <br>c_typent:libelle:id:options_<i>codi_llista_pare</i>|parent_column: filter  <br><br>Per tenir la llista depenent d'una altra llista: c_typent:libelle:id:<i>codi_llista_pare</i>|parent_column:filter
-ExtrafieldParamHelplink=Els paràmetres han de ser ObjectName: Classpath<br>Sintaxi: ObjectName:Classpath<br>Exemples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Els paràmetres han de ser ObjectName:Classpath <br>Sintaxi: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Manteniu-lo buit per un simple separador <br> Configureu-ho a 1 per a un separador col·lapsador (obert per defecte per a la sessió nova, i es mantindrà l'estat de cada sessió d'usuari) <br> Configureu-ho a 2 per a un separador col·lapsat (es va desplomar per defecte per a la sessió nova, i es mantindrà l'estat per a cada sessió d'usuari)
 LibraryToBuildPDF=Llibreria utilitzada per generar PDF
 LocalTaxDesc=Alguns països apliquen 2 o 3 impostos en cada línia de factura. Si aquest és el cas, escull el tipus pel segon i el tercer impost i el seu valor. Els tipus possibles són: <br>1: impostos locals aplicats en productes i serveis sense IVA (l'impost local serà calculat en el total sense impostos)<br>2: impost local aplicat en productes i serveis amb IVA (l'impost local serà calculat amb el total + l'impost principal)<br>3: impost local aplicat en productes sense IVA (l'impost local serà calculat en el total sense impost)<br>4: impost local aplicat en productes amb IVA (l'impost local serà calculat amb el total + l'impost principal)<br>5: impost local aplicat en serveis sense IVA (l'impost local serà calculat amb el total sense impost)<br>6: impost local aplicat en serveis amb IVA inclòs (l'impost local serà calculat amb el total + IVA)
 SMS=SMS
 LinkToTestClickToDial=Introduïu un número de telèfon que voleu marcar per provar l'enllaç de crida ClickToDial per a l'usuari <strong>%s</strong>
-RefreshPhoneLink=Refrescar enllaç
+RefreshPhoneLink=Actualitza l'enllaç
 LinkToTest=Enllaç seleccionable per l'usuari <strong>%s</strong> (feu clic al número per provar)
 KeepEmptyToUseDefault=Deixa-ho buit per usar el valor per defecte
 KeepThisEmptyInMostCases=En la majoria dels casos, pots deixar aquest camp buit.
@@ -464,12 +468,12 @@ ConfirmEraseAllCurrentBarCode=Esteu segur que voleu esborrar tots els valors de
 AllBarcodeReset=S'han eliminat tots els valors de codi de barres
 NoBarcodeNumberingTemplateDefined=No hi ha cap plantilla de codi de barres habilitada a la configuració del mòdul de codi de barres.
 EnableFileCache=Habilita la caché de fitxers
-ShowDetailsInPDFPageFoot=Afegiu més detail al peu de pàgina, com l'adreça de la empresa o els noms dels gestors (a més dels ids dels professionals, capital de la empresa o el nº d'IVA).
+ShowDetailsInPDFPageFoot=Afegiu més detalls al peu de pàgina, com ara l'adreça de l'empresa o els noms dels gestors (a més d'identificadors professionals, capital de l'empresa i número de NIF/CIF).
 NoDetails=No hi ha detalls addicionals al peu de pàgina
 DisplayCompanyInfo=Mostra l'adreça de l'empresa
 DisplayCompanyManagers=Mostra el gestor de noms
-DisplayCompanyInfoAndManagers=Mostra l'adreça de l'empresa i els noms del gerència
-EnableAndSetupModuleCron=Si vols tenir aquesta factura recurrent generada automàticament, el mòdul *%s* s'ha d'habilitar i configurar correctament. D'altra banda, la generació de factures s'ha de fer manualment des d'aquesta plantilla amb el bóto "Crea". Tingues en compte que si actives la generació automàtica, pots continuar generant factures manuals. No és possible la generació de duplicitats pel mateix període. 
+DisplayCompanyInfoAndManagers=Mostra l'adreça de l'empresa i els noms de la persona gestora
+EnableAndSetupModuleCron=Si voleu que aquesta factura periòdica es generi automàticament, el mòdul * %s * s’ha d’habilitar i configurar correctament. En cas contrari, la generació de factures s’ha de fer manualment des d’aquesta plantilla mitjançant el botó *Crea*. Tingueu en compte que, fins i tot si heu activat la generació automàtica, encara podeu iniciar la generació manual amb seguretat. No es pot generar duplicats per al mateix període.
 ModuleCompanyCodeCustomerAquarium=%s seguit de codi de client de tercers per obtenir un codi de comptabilitat de clients
 ModuleCompanyCodeSupplierAquarium=%s seguit del codi de proveïdor per a un codi de comptabilitat del proveïdor 
 ModuleCompanyCodePanicum=Retorna un codi comptable buit.
@@ -478,20 +482,24 @@ ModuleCompanyCodeCustomerDigitaria=%s seguit pel nom abreujat del client pel nom
 ModuleCompanyCodeSupplierDigitaria=%s seguit pel nom abreujat del proveïdor pel nombre de caràcters: %s pel codi del compte de proveïdor
 Use3StepsApproval=Per defecte, les comandes de compra necessiten ser creades i aprovades per 2 usuaris diferents (el primer pas/usuari és per a crear i un altre pas/usuari per aprovar. Noteu que si un usuari te permisos tant per crear com per aprovar, un sol pas/usuari serà suficient). Amb aquesta opció, tens la possibilitat d'introduir un tercer pas/usuari per a l'aprovació, si l'import es superior a un determinat valor (d'aquesta manera són necessaris 3 passos: 1=validació, 2=primera aprovació i 3=segona aprovació si l'import és suficient).<br>Deixa-ho en blanc si només vols un nivell d'aprovació (2 passos); posa un valor encara que sigui molt baix (0,1) si vols una segona aprovació (3 passos).
 UseDoubleApproval=Utilitza una aprovació en 3 passos quan l'import (sense impostos) sigui més gran que...
-WarningPHPMail=ADVERTIMENT: Sovint és millor configurar correus electrònics de sortida per utilitzar el servidor de correu electrònic del vostre proveïdor en comptes de la configuració predeterminada. Alguns proveïdors de correu electrònic (com Yahoo) no us permeten enviar un correu electrònic des d'un altre servidor que el seu propi servidor. La configuració actual utilitza el servidor de l'aplicació per enviar correus electrònics i no el servidor del proveïdor de correu electrònic, de manera que alguns destinataris (el que sigui compatible amb el protocol restrictiu de DMARC), us preguntaran al vostre proveïdor de correu electrònic si poden acceptar el vostre correu electrònic i alguns proveïdors de correu electrònic (com Yahoo) poden respondre "no" perquè el servidor no és del seu, així que pocs dels correus electrònics enviats no poden ser acceptats (vés amb compte també de la quota d'enviament del proveïdor de correu electrònic). <br> Si el vostre proveïdor de correu electrònic (com Yahoo) té aquesta restricció, heu de canviar la configuració de correu electrònic per triar l'altre mètode "servidor SMTP" i introduir el servidor SMTP i les credencials proporcionades pel vostre proveïdor de correu electrònic.
+WarningPHPMail=ADVERTÈNCIA: la configuració per enviar correus electrònics des de l'aplicació utilitza la configuració genèrica predeterminada. Sovint és millor configurar els correus electrònics de sortida per utilitzar el servidor de correu electrònic del vostre proveïdor de serveis de correu electrònic en lloc de la configuració predeterminada per diversos motius:
+WarningPHPMailA=- L’ús del servidor del proveïdor de serveis de correu electrònic augmenta la confiança del vostre correu electrònic, de manera que augmenta l'enviament sense ser marcat com a SPAM
+WarningPHPMailB=- Alguns proveïdors de serveis de correu electrònic (com Yahoo) no us permeten enviar un correu electrònic des d'un altre servidor que el seu propi servidor. La configuració actual utilitza el servidor de l’aplicació per enviar correus electrònics i no el servidor del vostre proveïdor de correu electrònic, de manera que alguns destinataris (el compatible amb el protocol DMARC restrictiu) demanaran al vostre proveïdor de correu electrònic si poden acceptar el vostre correu electrònic i alguns proveïdors de correu electrònic. (com Yahoo) pot respondre "no" perquè el servidor no és seu, de manera que és possible que pocs dels vostres correus electrònics enviats no s'acceptin per al lliurament (tingueu cura també de la quota d'enviament del vostre proveïdor de correu electrònic).
+WarningPHPMailC=- També és interessant utilitzar el servidor SMTP del vostre proveïdor de serveis de correu electrònic per enviar correus electrònics, de manera que tots els correus electrònics enviats des de l’aplicació també es guardaran al directori "Enviats" de la vostra bústia de correu.
+WarningPHPMailD=Si el mètode "PHP Mail" és realment el mètode que voleu utilitzar, podeu eliminar aquest advertiment afegint la constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP a 1 a Inici - Configuració - Altres.
 WarningPHPMail2=Si el vostre proveïdor SMTP necessita restringir al client de correu a una adreça IP (és raro), aquesta és la IP de l'agent d'usuari de correu (MUA) per la vostra aplicació ERP CRM: <strong>%s</strong>.
-WarningPHPMailSPF=Si el nom de domini de la vostra adreça de correu electrònic del remitent està protegit per SPF (demaneu-li al proveïdor de correu electrònic), heu d’incloure les següents IP al registre SPF del DNS del vostre domini: <strong> %s </strong>.
+WarningPHPMailSPF=Si el nom de domini de l’adreça de correu electrònic del remitent està protegit per un registre SPF (pregunteu-li al vostre registrador de noms de domini), heu d’afegir les següents IP al registre SPF del DNS del vostre domini: <strong> %s </strong>.
 ClickToShowDescription=Clica per mostrar la descripció
-DependsOn=Aquest mòdul necesita el mòdul(s)
+DependsOn=Aquest mòdul necessita els mòduls
 RequiredBy=Aquest mòdul és requerit pel/s mòdul/s
-TheKeyIsTheNameOfHtmlField=Aquest és el nom del camp HTML. Son necessaris coneixements tècnics per llegir el contingut de la pàgina HTML per obtenir el nom clau d'un camp.
+TheKeyIsTheNameOfHtmlField=Aquest és el nom del camp HTML. Es necessiten coneixements tècnics per llegir el contingut de la pàgina HTML per a obtenir el nom clau d’un camp.
 PageUrlForDefaultValues=Has d'introduir aquí l'URL relatiu de la pàgina. Si inclous paràmetres a l'URL, els valors predeterminats seran efectius si tots els paràmetres s'estableixen en el mateix valor.
 PageUrlForDefaultValuesCreate=<br> Exemple: <br> Per al formulari per crear una nou tercer, és <strong> %s </strong>. <br> Per a l'URL dels mòduls externs instal·lats al directori personalitzat, no incloeu "custom/", així que utilitzeu una ruta com <strong> mymodule / mypage.php </strong> i no custom/mymodule/mypage.php. <br> Si voleu un valor predeterminat només si la url té algun paràmetre, podeu utilitzar <strong> %s</strong>
 PageUrlForDefaultValuesList=<br> Exemple: <br> Per a la pàgina que llista els tercers, és <strong> %s </strong>. <br> Per a l'URL dels mòduls externs instal·lats al directori personalitzat, no incloeu "custom/" utilitzeu una ruta com <strong> mymodule/mypagelist.php </strong> i no custom/mymodule/mypagelist.php. <br> Si voleu un valor predeterminat només si la url té algun paràmetre, podeu utilitzar <strong> %s</strong>
 AlsoDefaultValuesAreEffectiveForActionCreate=També tingueu en compte que sobreescriure valors predeterminats per a la creació de formularis funciona només per a pàgines dissenyades correctament (de manera que amb el paràmetre action = create o presend ...)
 EnableDefaultValues=Activa la personalització dels valors predeterminats
 EnableOverwriteTranslation=Habilita l'ús de la traducció sobreescrita
-GoIntoTranslationMenuToChangeThis=S'ha trobat una traducció per a la clau amb aquest codi. Per canviar aquest valor, heu d'editar-lo des de  Inici-Configuració-Traducció.
+GoIntoTranslationMenuToChangeThis=S'ha trobat una traducció de la clau amb aquest codi. Per a canviar aquest valor, l’heu d’editar des d'Inici-Configuració-Traducció.
 WarningSettingSortOrder=Avís, establir un ordre de classificació predeterminat pot provocar un error tècnic en passar a la pàgina de la llista si el camp és un camp desconegut. Si experimentes aquest error, torna a aquesta pàgina per eliminar l'ordre de classificació predeterminat i restablir el comportament predeterminat.
 Field=Camp
 ProductDocumentTemplates=Plantilles de documents per generar document de producte
@@ -507,7 +515,7 @@ DAV_ALLOW_PRIVATE_DIRTooltip=El directori privat genèric és un directori WebDA
 DAV_ALLOW_PUBLIC_DIR=Habiliteu el directori públic genèric (directori dedicat de WebDAV anomenat "públic": no cal iniciar sessió
 DAV_ALLOW_PUBLIC_DIRTooltip=El directori públic genèric és un directori WebDAV que tothom pot accedir (en mode de lectura i escriptura), sense necessitat d’autorització (compte d’inici / contrasenya).
 DAV_ALLOW_ECM_DIR=Habiliteu el directori privat DMS / ECM (directori arrel del mòdul DMS / ECM)
-DAV_ALLOW_ECM_DIRTooltip=El directori arrel on tots els fitxers son carregats manualment quan s'utilitza el mòdul GED. Al igual que per a la funció de l'interfície web, es necessitarà un nom/contrasenya vàlid amb permisos adequats per accedir a ella.
+DAV_ALLOW_ECM_DIRTooltip=El directori arrel on es carreguen manualment tots els fitxers quan s’utilitza el mòdul GED. De manera similar a l'accés des de la interfície web, necessitareu un usuari/contrasenya vàlids amb permisos adequats per a accedir-hi.
 # Modules
 Module0Name=Usuaris i grups
 Module0Desc=Gestió d'usuaris / empleats i grups
@@ -537,7 +545,7 @@ Module50Name=Productes
 Module50Desc=Gestió de productes
 Module51Name=Correus massius
 Module51Desc=Administració i enviament de correu de paper en massa
-Module52Name=Stocks de productes
+Module52Name=Estocs
 Module52Desc=Gestió d'estoc
 Module53Name=Serveis
 Module53Desc=Gestió de serveis
@@ -547,12 +555,10 @@ Module55Name=Codis de barra
 Module55Desc=Gestió dels codis de barra
 Module56Name=Pagament per transferència bancària
 Module56Desc=Gestió del pagament de proveïdors mitjançant comandes de transferència de crèdit. Inclou la generació de fitxers SEPA per a països europeus.
-Module57Name=Pagaments mitjançant dèbit directe
+Module57Name=Cobraments per domiciliació bancària
 Module57Desc=Gestió de comandes de dèbit directe. Inclou la generació de fitxers SEPA per a països europeus.
 Module58Name=ClickToDial
 Module58Desc=Integració amb ClickToDial
-Module59Name=Bookmark4u
-Module59Desc=Afegeix funció per generar un compte Bookmark4u des d'un compte Dolibarr
 Module60Name=Enganxines
 Module60Desc=Gestió d’enganxines
 Module70Name=Intervencions
@@ -582,7 +588,7 @@ Module320Desc=Afegeix un fil RSS a les pàgines de Dolibarr
 Module330Name=Marcadors i Dreceres
 Module330Desc=Crear marcadors, sempre accessibles, a les pàgines internes o externes a les quals accediu sovint
 Module400Name=Projectes o Oportunitats
-Module400Desc=Gestió de projectes, oportunitats/leads i/o tasques. Pots asignar també qualsevol element (factura, comanda, pressupost, intervenció...) a un projecte i obtindre una vista transversal del projecte.
+Module400Desc=Gestió de projectes, oportunitats/leads i/o tasques. També podeu assignar qualsevol element (factura, comanda, pressupost, intervenció, ...) a un projecte i obtenir una vista transversal del projecte.
 Module410Name=Webcalendar
 Module410Desc=Interface amb el calendari webcalendar
 Module500Name=Impostos i Despeses especials
@@ -615,7 +621,7 @@ Module2200Desc=Utilitza expressions matemàtiques per a la generació automàtic
 Module2300Name=Tasques programades
 Module2300Desc=Gestió de tasques programades (alias cron o taula chrono)
 Module2400Name=Esdeveniments/Agenda
-Module2400Desc=Seguiment d'esdeveniments. Registre d'esdeveniments automàtics per fer el seguiment o registrar esdeveniments manuals o reunions. Aquest és el mòdul principal per a una bona gestió del client o la relació de proveïdors.
+Module2400Desc=Seguiment d'esdeveniments. Registre d'esdeveniments automàtics per a fer el seguiment o registrar esdeveniments manuals o reunions. Aquest és el mòdul principal per a una bona gestió de la relació amb clients o proveïdors.
 Module2500Name=SGD / GCE
 Module2500Desc=Sistema de gestió de documents / Gestió de continguts electrònics. Organització automàtica dels vostres documents generats o emmagatzemats. Compartiu-los quan ho necessiteu.
 Module2600Name=Serveis API/WEB (servidor SOAP)
@@ -656,9 +662,9 @@ Module50200Desc=Ofereix als clients una pàgina de pagament en línia de PayPal
 Module50300Name=Stripe
 Module50300Desc=Oferiu als clients una pàgina de pagament en línia de Stripe (targetes de crèdit / dèbit). Això es pot utilitzar per permetre als vostres clients fer pagaments o pagaments ad-hoc relacionats amb un objecte Dolibarr específic (factura, ordre, etc ...)
 Module50400Name=Comptabilitat (doble entrada)
-Module50400Desc=Gestió comptable (entrades dobles, suport general i llibres majors auxiliars). Exporta el llibre major en diversos altres formats de programari de comptabilitat.
+Module50400Desc=Gestió comptable (entrades dobles, suport de comptabilitats generals i subsidiàries). Exporteu el llibre major en altres formats de programari de comptabilitat.
 Module54000Name=PrintIPP
-Module54000Desc=L'impressió directa (sense obrir els documents) utilitza l'interfície Cups IPP (L'impressora té que ser visible pel servidor i CUPS té que estar instal·lat en el servidor)
+Module54000Desc=Impressió directa (sense obrir els documents) mitjançant la interfície Cups IPP (la impressora ha de ser visible des del servidor i CUPS ha d’estar instal·lat al servidor).
 Module55000Name=Enquesta o votació
 Module55000Desc=Creeu enquestes o vots en línia (com Doodle, Studs, RDVz, etc.)
 Module59000Name=Marges
@@ -671,7 +677,7 @@ Module63000Name=Recursos
 Module63000Desc=Gestiona els recursos (impressores, cotxes, habitacions...) que pots compartir en esdeveniments
 Permission11=Consulta factures de client
 Permission12=Crear/Modificar factures
-Permission13=Devalidar factures
+Permission13=Invalida les factures dels clients
 Permission14=Validar factures
 Permission15=Envia factures per e-mail
 Permission16=Crear cobraments per factures de client
@@ -688,6 +694,7 @@ Permission32=Crear/modificar productes
 Permission34=Elimina productes
 Permission36=Veure/gestionar els productes ocults
 Permission38=Exportar productes
+Permission39=Ignora el preu mínim
 Permission41=Llegir projectes i tasques (projectes compartits i projectes dels que sóc contacte). També pot introduir temps consumits, per a mi o els meus subordinats, en tasques assignades (Fulls de temps).
 Permission42=Crea/modifica projectes (projectes compartits i projectes dels que sóc contacte). També pot crear tasques i assignar usuaris a projectes i tasques
 Permission44=Elimina projectes (projectes compartits i projectes dels que en sóc contacte)
@@ -696,6 +703,9 @@ Permission61=Consulta intervencions
 Permission62=Crea/modifica intervencions
 Permission64=Elimina intervencions
 Permission67=Exporta intervencions
+Permission68=Envia intervencions per correu electrònic
+Permission69=Valida intervencions
+Permission70=Invalida les intervencions
 Permission71=Consulta socis
 Permission72=Crea/modifica socis
 Permission74=Elimina socis
@@ -718,6 +728,7 @@ Permission95=Consulta informes
 Permission101=Consulta expedicions
 Permission102=Crear/modificar expedicions
 Permission104=Validar expedicions
+Permission105=Envia enviaments per correu electrònic
 Permission106=Exportar expedicions
 Permission109=Eliminar expedicions
 Permission111=Consultar comptes financers (comptes bancaris, caixes)
@@ -775,7 +786,7 @@ Permission214=Configurar la telefonia
 Permission215=Configurar proveïdors
 Permission221=Consulta enviaments de correu electrònic
 Permission222=Crear/modificar E-Mails (assumpte, destinataris, etc.)
-Permission223=Validar E-Mails (permet l'enviament)
+Permission223=Validar enviaments per correu electrònic (permet l’enviament)
 Permission229=Eliminar E-Mails
 Permission237=Veure els destinataris i la informació
 Permission238=Enviar els e-mails manualment
@@ -825,10 +836,11 @@ Permission402=Crear/modificar havers
 Permission403=Validar havers
 Permission404=Eliminar havers
 Permission430=Utilitzeu la barra de depuració
-Permission511=Consulta el pagament dels salaris
+Permission511=Consulta els pagaments dels sous (vostres i subordinats)
 Permission512=Crea/modifica el pagament dels salaris
 Permission514=Elimina pagament de salaris
-Permission517=Exportació salaris
+Permission517=Consulta els pagaments dels sous de tothom
+Permission519=Exportació salaris
 Permission520=Consulta préstecs
 Permission522=Crear/modificar préstecs
 Permission524=Eliminar préstecs
@@ -839,33 +851,36 @@ Permission532=Crear/modificar serveis
 Permission534=Eliminar serveis
 Permission536=Veure / gestionar els serveis ocults
 Permission538=Exportar serveis
-Permission561=Read payment orders by credit transfer
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
-Permission564=Record Debits/Rejections of credit transfer
+Permission561=Llegeix les ordres de pagament per transferència de crèdit
+Permission562=Crea/modifica ordres de pagament per transferència de crèdit
+Permission563=Envia/Transmet ordre de pagament mitjançant transferència de crèdit
+Permission564=Registra dèbits/rebutjos de transferència de crèdit
+Permission601=Consulta adhesius
+Permission602=Crea/modifica adhesius
+Permission609=Elimina adhesius
 Permission650=Llegeix llistes de materials
 Permission651=Crea / actualitza llistes de materials
 Permission652=Elimina llistes de materials
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
+Permission660=Consulta l'ordre de fabricació (OF)
+Permission661=Creació/actualització de l'ordre de fabricació (OF)
+Permission662=Suprimeix l'ordre de fabricació (OF)
 Permission701=Consultar donacions
 Permission702=Crear/modificar donacions
 Permission703=Eliminar donacions
 Permission771=Consulta informes de despeses (propis i dels subordinats)
 Permission772=Crear/modificar informe de despeses
 Permission773=Eliminar els informes de despeses
-Permission774=Consulta tots els informes de despeses (inclòs els usuaris no subordinats)
+Permission774=Consulta tots els informes de despeses (fins i tot per a usuaris no subordinats)
 Permission775=Aprovar els informes de despeses
 Permission776=Pagar informes de despeses
-Permission777=Read expense reports of everybody
-Permission778=Create/modify expense reports of everybody
+Permission777=Llegeix els informes de despeses de tothom
+Permission778=Crea/modifica informes de despeses de tothom
 Permission779=Exportar informes de despeses
-Permission1001=Consultar stocks
+Permission1001=Consulta d'estocs
 Permission1002=Crear/modificar els magatzems
 Permission1003=Eliminar magatzems
-Permission1004=Consultar moviments de stock
-Permission1005=Crear/modificar moviments de stock
+Permission1004=Consulta moviments d'estoc
+Permission1005=Crea/modifica moviments d'estoc
 Permission1101=Consulta els rebuts d'entrega
 Permission1102=Crea/modifica els rebuts d'entrega
 Permission1104=Validar els rebuts d'entrega
@@ -884,7 +899,9 @@ Permission1185=Aprova les comandes de compra
 Permission1186=Envia comandes de compra
 Permission1187=Rebut de confirmació de comandes de compra
 Permission1188=Suprimeix comandes de compra
+Permission1189=Marca/Desmarca la recepció d’una comanda de compra
 Permission1190=Aprova (segona aprovació) les comandes de compra 
+Permission1191=Exporta les comandes dels proveïdors i els seus atributs
 Permission1201=Obté el resultat d'una exportació
 Permission1202=Crear/modificar exportacions
 Permission1231=Consulta factures de proveïdor
@@ -898,6 +915,8 @@ Permission1251=Llançar les importacions en massa a la base de dades (càrrega d
 Permission1321=Exporta factures de client, atributs i cobraments
 Permission1322=Reobrir una factura pagada
 Permission1421=Exporta ordres de vendes i atributs
+Permission1521=Consulta documents
+Permission1522=Elimina documents
 Permission2401=Llegeix les accions (esdeveniments o tasques) enllaçades amb el seu compte d’usuari (si és propietari d’un esdeveniment o només el té assignat)
 Permission2402=Crear / modificar accions (esdeveniments o tasques) enllaçades amb el seu compte d'usuari (si és propietari de l'esdeveniment)
 Permission2403=Suprimeix les accions (esdeveniments o tasques) enllaçades al seu compte d'usuari (si és propietari de l'esdeveniment)
@@ -912,7 +931,7 @@ Permission2515=Configuració carpetes de documents
 Permission2801=Utilitzar el client FTP en mode lectura (només explorar i descarregar)
 Permission2802=Utilitzar el client FTP en mode escriptura (esborrar o pujar arxius)
 Permission3200=Llegiu els esdeveniments arxivats i les empremtes dactilars
-Permission3301=Generate new modules
+Permission3301=Genera mòduls nous
 Permission4001=Vegeu empleats
 Permission4002=Crea empleats
 Permission4003=Suprimeix els empleats
@@ -924,17 +943,21 @@ Permission10005=Suprimeix el contingut del lloc web
 Permission20001=Consulta els dies de lliure disposició (els propis i els dels teus subordinats)
 Permission20002=Crea/modifica els teus dies de lliure disposició (els propis i els dels teus subordinats)
 Permission20003=Elimina les peticions de dies lliures retribuïts
-Permission20004=Consulta tots els dies de lliure disposició (inclòs els usuaris no subordinats)
-Permission20005=Crea/modifica els dies de lliure disposició per tothom (inclòs els usuaris no subordinats)
+Permission20004=Consulta totes les sol·licituds de permís (fins i tot dels usuaris no subordinats)
+Permission20005=Crea/modifica sol·licituds de permís per a tothom (fins i tot per a usuaris no subordinats)
 Permission20006=Administra els dies de lliure disposició (configura i actualitza el balanç)
 Permission20007=Aproveu sol·licituds de dies lliures
 Permission23001=Consulta les tasques programades
 Permission23002=Crear/Modificar les tasques programades
 Permission23003=Eliminar tasques programades
 Permission23004=Executar tasca programada
-Permission50101=Utilitza el punt de venda
+Permission50101=Utilitza el Punt de venda (SimplePOS)
+Permission50151=Utilitza el Punt de venda (TakePOS)
 Permission50201=Consultar les transaccions
 Permission50202=Importar les transaccions
+Permission50330=Consulta objectes de Zapier
+Permission50331=Crea/actualitza objectes de Zapier
+Permission50332=Elimina objectes de Zapier
 Permission50401=Enllaçar productes i factures amb comptes comptables
 Permission50411=Llegeix les operacions en el llibre major
 Permission50412=Escriure / editar les operacions en el llibre major
@@ -958,6 +981,17 @@ Permission63001=Consulta recursos
 Permission63002=Crea/modifica recursos
 Permission63003=Elimina recursos
 Permission63004=Enllaça recursos en esdeveniments de l'agenda
+Permission64001=Permet la impressió directa
+Permission67000=Permet imprimir rebuts
+Permission68001=Consulta l'informe intracomm
+Permission68002=Crea/modifica un informe intracomm
+Permission68004=Elimina l'informe intracomm
+Permission941601=Llegeix els rebuts
+Permission941602=Crea i modifica rebuts
+Permission941603=Valida els rebuts
+Permission941604=Envia rebuts per correu electrònic
+Permission941605=Exporta rebuts
+Permission941606=Esborra els rebuts
 DictionaryCompanyType=Tipus de tercer
 DictionaryCompanyJuridicalType=Formes jurídiques de tercers
 DictionaryProspectLevel=Nivell potencial de perspectiva per a empreses
@@ -994,9 +1028,11 @@ DictionarySocialNetworks=Xarxes socials
 DictionaryProspectStatus=Estat de perspectiva de les empreses
 DictionaryProspectContactStatus=Estat de perspectiva dels contactes
 DictionaryHolidayTypes=Tipus de dies lliures
-DictionaryOpportunityStatus=Estat de d'oportunitat pel projecte/oportunitat
+DictionaryOpportunityStatus=Estat d'oportunitat del projecte/oportunitat
 DictionaryExpenseTaxCat=Informe de despeses - Categories de transport
 DictionaryExpenseTaxRange=Informe de despeses - Rang per categoria de transport
+DictionaryTransportMode=Informe intracomm: mode de transport
+TypeOfUnit=Tipus d’unitat
 SetupSaved=Configuració desada
 SetupNotSaved=Configuració no desada
 BackToModuleList=Torna a la llista de mòduls
@@ -1032,7 +1068,7 @@ LocalTax2IsUsedDescES=El tipus d'IRPF proposat per defecte en les creacions de p
 LocalTax2IsNotUsedDescES=El tipus d'IRPF proposat per defecte es 0. Final de regla.
 LocalTax2IsUsedExampleES=A Espanya, es tracta de persones físiques: autònoms i professionals independents que presten serveis i empreses que han triat el règim fiscal de mòduls.
 LocalTax2IsNotUsedExampleES=A Espanya, es tracta d'empreses no subjectes al règim fiscal de mòduls.
-RevenueStampDesc=El "segell fiscal" o "segell de ingressos" és un impost fix per factura (no depèn de la quantitat de la factura). També pot ser un impost percentual, però utilitzar el segon o tercer tipus d’impost és millor per a impostos percentuals ja que els segells d’impostos no proporcionen cap mena d’informació. Només uns pocs països utilitzen aquest tipus d’impostos.
+RevenueStampDesc=El "segell d'impostos" o "segell d'ingressos" és un impost fix per factura (no depèn de l'import de la factura). També pot ser un percentatge d’impostos, però és millor utilitzar el segon o tercer tipus d’impostos per al percentatge d’impostos, ja que els segells d’impostos no proporcionen cap informe. Només uns pocs països utilitzen aquest tipus d’impostos.
 UseRevenueStamp=Utilitzar un segell fiscal
 UseRevenueStampExample=El valor del segell fiscal està definit per defecte en la configuració dels diccionaris (%s - %s - %s)
 CalcLocaltax=Informes d'impostos locals
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Etiqueta utilitzada per defecte si no es troba cap traducció
 LabelOnDocuments=Etiqueta sobre documents
 LabelOrTranslationKey=Clau de traducció o cadena
 ValueOfConstantKey=Valor d’una constant de configuració
+ConstantIsOn=L'opció %s està activada
 NbOfDays=Nº de dies
 AtEndOfMonth=A final de mes
 CurrentNext=Actual/Següent
@@ -1079,10 +1116,10 @@ SummarySystem=Resum de la informació de sistemes Dolibarr
 SummaryConst=Llista de tots els paràmetres de configuració Dolibarr
 MenuCompanySetup=Empresa/Organització
 DefaultMenuManager= Gestor del menú estàndard
-DefaultMenuSmartphoneManager=Gestor de menú smartphone
+DefaultMenuSmartphoneManager=Gestor de menús per a telèfons intel·ligents
 Skin=Tema visual
-DefaultSkin=Tema visual por defecte
-MaxSizeList=Longuitud màxima de llistats
+DefaultSkin=Tema visual predeterminat
+MaxSizeList=Longitud màxima per llistats
 DefaultMaxSizeList=Longitud màxima per defecte per a les llistes
 DefaultMaxSizeShortList=Longitud màxima per defecte en llistes curtes (per exemple, en la fitxa de client)
 MessageOfDay=Missatge del dia
@@ -1091,7 +1128,7 @@ LoginPage=Pàgina de login
 BackgroundImageLogin=Imatge de fons
 PermanentLeftSearchForm=Zona de recerca permanent del menú de l'esquerra
 DefaultLanguage=Idioma per defecte
-EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
+EnableMultilangInterface=Activa el suport multilingüe per a les relacions amb el client o el proveïdor
 EnableShowLogo=Mostra el logotip de l'organització al menú
 CompanyInfo=Empresa/Organització
 CompanyIds=Identitats d'empresa/organització
@@ -1099,7 +1136,7 @@ CompanyName=Nom/Raó social
 CompanyAddress=Adreça
 CompanyZip=Codi postal
 CompanyTown=Població
-CompanyCountry=Pais
+CompanyCountry=País
 CompanyCurrency=Divisa principal
 CompanyObject=Objecte de l'empresa
 IDCountry=ID de país
@@ -1107,7 +1144,7 @@ Logo=Logo
 LogoDesc=Logotip principal de l'empresa. S'utilitzarà en documents generats (PDF, ...)
 LogoSquarred=Logo (quadrat)
 LogoSquarredDesc=Ha de ser una icona quadrada (amplada = alçada). Aquest logotip s'utilitzarà com a icona preferida o com a altra necessitat, com a la barra de menús superior (si no està desactivada en la configuració de l'entorn).
-DoNotSuggestPaymentMode=No sugerir
+DoNotSuggestPaymentMode=No ho suggereixis
 NoActiveBankAccountDefined=Cap compte bancari actiu definit
 OwnerOfBankAccount=Titular del compte %s
 BankModuleNotActive=Mòdul comptes bancaris no activat
@@ -1145,6 +1182,7 @@ InfoWebServer=Sobre Servidor web
 InfoDatabase=Sobre Base de dades
 InfoPHP=Sobre PHP
 InfoPerf=Sobre prestacions
+InfoSecurity=Quant a la seguretat
 BrowserName=Nom del navegador
 BrowserOS=S.O. del navegador
 ListOfSecurityEvents=Llistat d'esdeveniments de seguretat Dolibarr
@@ -1159,7 +1197,7 @@ AccountantFileNumber=Número de fila
 DisplayDesc=Els paràmetres que afecten l'aspecte i el comportament de Dolibarr es poden modificar aquí.
 AvailableModules=Mòduls/complements disponibles
 ToActivateModule=Per activar els mòduls, aneu a l'àrea de Configuració (Inici->Configuració->Mòduls).
-SessionTimeOut=Timeout de sesions
+SessionTimeOut=Temps de desconnexió per a la sessió
 SessionExplanation=Aquest número garanteix que la sessió no caduqui abans d'aquest retard, si el netejador de sessió es fa mitjançant un netejador de sessió de PHP intern (i res més). El netejador de sessió intern de PHP no garanteix que la sessió expire després d'aquest retard. Caducarà, després d'aquest retard, i quan s'executi el netejador de sessió, de manera que cada accés <b> %s / %s </b>, però només durant l'accés fet per altres sessions (si el valor és 0, significa que l'eliminació de la sessió només es fa mitjançant un extern procés). <br> Nota: en alguns servidors amb un mecanisme de neteja de sessió externa (cron sota debian, ubuntu ...), les sessions es poden destruir després d'un període definit per una configuració externa, independentment del valor introduït aquí.
 SessionsPurgedByExternalSystem=Sembla que les sessions en aquest servidor són netejades mitjançant un mecanisme extern (cron sota debian, ubuntu ...), probablement cada  <b> %s </b> segons (= el valor del paràmetre  sessió.gc_maxlifetime ), així que modificant aquest valor aquí no té cap efecte, Heu de sol·licitar a l’administrador del servidor que canviï la durada de la sessió.
 TriggersAvailable=Triggers disponibles
@@ -1171,7 +1209,7 @@ TriggerActiveAsModuleActive=Triggers d'aquest arxiu actius ja que el mòdul <b>%
 GeneratedPasswordDesc=Trieu el mètode que s'utilitzarà per a les contrasenyes auto-generades.
 DictionaryDesc=Afegeix totes les dades de referència. Pots afegir els teus valors per defecte.
 ConstDesc=Aquesta pàgina permet editar (anul·lar) paràmetres no disponibles en altres pàgines. Aquests són paràmetres reservats només per a desenvolupadors o solucions avançades de problemes.
-MiscellaneousDesc=Tots els altres paràmetres relacionats amb la seguretat es defineixen aqui.
+MiscellaneousDesc=Aquí es defineixen la resta de paràmetres relacionats amb la seguretat.
 LimitsSetup=Configuració de límits i precisions
 LimitsDesc=Podeu definir aquí els límits i precisions utilitzats per Dolibarr
 MAIN_MAX_DECIMALS_UNIT=Decimals màxims per als preus unitaris
@@ -1194,15 +1232,16 @@ RestoreDesc=Per restaurar una còpia de seguretat de Dolibarr, calen dos passos.
 RestoreDesc2=Restaura el fitxer de còpia de seguretat (fitxer zip, per exemple) del directori "documents" a una nova instal·lació de Dolibarr o en aquest directori de documents actual (<b> %s </b>).
 RestoreDesc3=Restaura l'estructura i les dades de la base de dades des d'un fitxer d'emmagatzematge de seguretat a la base de dades de la nova instal·lació de Dolibarr o bé a la base de dades d'aquesta instal·lació actual (<b> %s </b>). Avís, un cop finalitzada la restauració, haureu d'utilitzar un inici de sessió / contrasenya, que existia des de la còpia de seguretat / instal·lació per tornar a connectar-se. <br> Per restaurar una base de dades de còpia de seguretat en aquesta instal·lació actual, podeu seguir aquest assistent.
 RestoreMySQL=Importació MySQL
-ForcedToByAModule= Aquesta regla està forçada a <b>%s</b> per un dels mòduls activats
+ForcedToByAModule=Aquesta regla està forçada a <b>%s</b> per un dels mòduls activats
+ValueIsForcedBySystem=Aquest valor és forçat pel sistema. No es pot canviar.
 PreviousDumpFiles=Fitxers de còpia de seguretat existents
 PreviousArchiveFiles=Fitxers d’arxiu existents
 WeekStartOnDay=Primer dia de la setmana
-RunningUpdateProcessMayBeRequired=Sembla necessari realitzar el procés d'actualizació (la versió del programa %s difereix de la versió de la base de dades %s)
+RunningUpdateProcessMayBeRequired=Sembla que cal executar el procés d’actualització (la versió del programa %s és diferent de la versió de la base de dades %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Ha d'executar la comanda des d'un shell després d'haver iniciat sessió amb el compte <b>%s</b>.
 YourPHPDoesNotHaveSSLSupport=Funcions SSL no disponibles al vostre PHP
 DownloadMoreSkins=Més temes per descarregar
-SimpleNumRefModelDesc=Retorna el número de referència amb el format %syymm-nnnn on yy és l'any, mm és mes i nnnn és seqüencial sense reset
+SimpleNumRefModelDesc=Retorna el número de referència amb el format %syymm-nnnn on yy és l'any, mm és el mes i nnnn és el seqüencial sense inicialitzar
 ShowProfIdInAddress=Mostra l'identificador professional amb adreces
 ShowVATIntaInAddress=Amaga el número d'IVA intracomunitari amb adreces
 TranslationUncomplete=Traducció parcial
@@ -1211,7 +1250,7 @@ MeteoStdMod=Mode estàndard
 MeteoStdModEnabled=Mode estàndard habilitat
 MeteoPercentageMod=Mode percentual
 MeteoPercentageModEnabled=Mode de percentatge activat
-MeteoUseMod=Prèmer per utilitzar %s
+MeteoUseMod=Feu clic per utilitzar %s
 TestLoginToAPI=Comprovar connexió a l'API
 ProxyDesc=Algunes característiques de Dolibarr requereixen accés a Internet. Definiu aquí els paràmetres de connexió a Internet, com ara l'accés a través d'un servidor proxy, si és necessari.
 ExternalAccess=Accés extern / accés a Internet
@@ -1246,13 +1285,13 @@ SendmailOptionMayHurtBuggedMTA=La característica per enviar correus mitjançant
 TranslationSetup=Configuració de traducció
 TranslationKeySearch=Cerca una clau o cadena de traducció
 TranslationOverwriteKey=Sobreescriu una cadena de traducció
-TranslationDesc=Com configurar l'idioma de visualització: <br> * Per defecte / Sistema tot: menú <strong> Inici -> Configuració -> Pantalla </strong> <br> * Per usuari: fes clic al nom d'usuari a la part superior de la pantalla i modifiqueu la pestanya 0xe65d071f6fc9 de l'usuari de <strong> a l'usuari targeta.
+TranslationDesc=Com configurar l'idioma de visualització: <br> * Per defecte / a tot el sistema: menú <strong>Inici -> Configuració -> Entorn</strong><br> * Per usuari: Feu clic al nom d'usuari a la part superior de la pantalla i modifiqueu la pestanya <strong>Configuració d'entorn d'usuari</strong> de la fitxa d'usuari.
 TranslationOverwriteDesc=També pot reemplaçar cadenes omplint la taula següent. Triï el seu idioma a la llista desplegable "%s", inserta la clau de la traducció a "%s" i la seva nova traducció a "%s"
 TranslationOverwriteDesc2=Podeu utilitzar l'altra pestanya per ajudar-vos a saber quina clau de traducció voleu utilitzar
 TranslationString=Cadena de traducció
 CurrentTranslationString=Cadena de traducció actual
 WarningAtLeastKeyOrTranslationRequired=Es necessita un criteri de cerca com a mínim per cadena o clau de traducció
-NewTranslationStringToShow=Nova cadena de traducció a mostrar
+NewTranslationStringToShow=Cadena de traducció nova per mostrar
 OriginalValueWas=La traducció original s'ha sobreescrit. El valor original era: <br><br>%s
 TransKeyWithoutOriginalValue=Heu obligat una nova traducció de la clau de traducció '<strong> %s </strong>' que no existeix en cap fitxer d'idioma
 TitleNumberOfActivatedModules=Mòduls activats
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=Es carrega el component PHP %s
 PreloadOPCode=S'utilitza un codi OPC precarregat
 AddRefInList=Mostrar client / proveïdor ref. llista d'informació (llista de selecció o combobox) i la majoria d'hipervincle. <br> Els tercers apareixeran amb un format de nom de "CC12345 - SC45678 - The Big Company corp". en lloc de "The Big Company corp".
 AddAdressInList=Mostra la llista d'informació de la direcció de client / proveïdor (llista de selecció o combobox) <br> Els tercers apareixeran amb un format de nom de "The Big Company corp. - 21 jump street 123456 Big town - USA" en lloc de "The Big Company corp".
+AddEmailPhoneTownInContactList=Mostra el correu electrònic de contacte (o els telèfons si no està definit) i la llista d'informació de la ciutat (llista de selecció o llista desplegable) <br>Els contactes apareixeran amb un format de nom "Dupond Durand - dupond.durand@email.com - Paris" o "Dupond Durand - 06 07 59 65 66 - París "en lloc de" Dupond Durand".
 AskForPreferredShippingMethod=Demaneu un mètode d'enviament preferit per a tercers.
 FieldEdition=Edició del camp %s
 FillThisOnlyIfRequired=Exemple: +2 (Completi només si es registre una desviació del temps en l'exportació)
@@ -1282,13 +1322,13 @@ GetBarCode=Obté el codi de barres
 NumberingModules=Models de numeració
 DocumentModules=Models de documents
 ##### Module password generation
-PasswordGenerationStandard=Retorna una contrasenya generada per l'algoritme intern Dolibarr: 8 caràcters, números i caràcters en minúscules barrejades.
+PasswordGenerationStandard=Retorna una contrasenya generada segons l'algorisme intern de Dolibarr: %s caràcters amb barreja de números i caràcters en minúscula.
 PasswordGenerationNone=No suggereixis una contrasenya generada. La contrasenya s'ha d'escriure manualment.
 PasswordGenerationPerso=Retorna una contrasenya d'acord a la seva configuració personalitzada.
 SetupPerso=D'acord a la teva configuració
 PasswordPatternDesc=Descripció patró contrasenya
 ##### Users setup #####
-RuleForGeneratedPasswords=Regles per generar i validar contrasenyes
+RuleForGeneratedPasswords=Regles per a generar i validar contrasenyes
 DisableForgetPasswordLinkOnLogonPage=No mostri l'enllaç "Contrasenya oblidada" a la pàgina d'inici de sessió
 UsersSetup=Configuració del mòdul usuaris
 UserMailRequired=Es necessita un correu electrònic per crear un nou usuari
@@ -1312,7 +1352,7 @@ JSOnPaimentBill=Activar funció per autocompletar les línies de pagament a les
 CompanyIdProfChecker=Regles sobre els IDs professionals
 MustBeUnique=Ha de ser únic?
 MustBeMandatory=Obligatori per crear tercers (si es defineix el número d'IVA o el tipus d'empresa)?
-MustBeInvoiceMandatory=Obligatori per validar factures?
+MustBeInvoiceMandatory=És obligatori per a validar les factures?
 TechnicalServicesProvided=Prestació de serveis tècnics
 #####DAV #####
 WebDAVSetupDesc=Aquest és l'enllaç per accedir al directori WebDAV. Conté un missatge "públic" obert a qualsevol usuari que conegui l'URL (si es permet l'accés al directori públic) i un directori "privat" que necessita un compte d'inici de sessió / contrasenya existent per a l'accés.
@@ -1345,7 +1385,7 @@ BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar compte bancari del pressupost
 ##### SupplierProposal #####
 SupplierProposalSetup=Configuració del mòdul Sol·licituds a proveïdor
 SupplierProposalNumberingModules=Models de numeració de sol·licitud de preus a proveïdor
-SupplierProposalPDFModules=Models de documents de sol·licituts de preus a proveïdors
+SupplierProposalPDFModules=Models de documents de sol·licituds de preus a proveïdors
 FreeLegalTextOnSupplierProposal=Text lliure en sol·licituds de preus a proveïdors
 WatermarkOnDraftSupplierProposal=Marca d'aigua en sol·licituds de preus a proveïdors (en cas d'estar buit)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Preguntar per compte bancari per utilitzar en el pressupost
@@ -1368,7 +1408,7 @@ FicheinterNumberingModules=Models de numeració d'intervencions
 TemplatePDFInterventions=Models de documents de les fitxes d'intervenció
 WatermarkOnDraftInterventionCards=Marca d'aigua en fitxes d'intervenció (en cas d'estar buit)
 ##### Contracts #####
-ContractsSetup=Configuració del modul contractes/subscripcions
+ContractsSetup=Configuració del mòdul de contractes/subscripcions
 ContractsNumberingModules=Mòduls de numeració de contractes
 TemplatePDFContracts=Models de documents de contractes
 FreeLegalTextOnContracts=Text lliure en contractes
@@ -1378,9 +1418,10 @@ MembersSetup=Configuració del mòdul Socis
 MemberMainOptions=Opcions principals
 AdherentLoginRequired= Gestiona un compte d'usuari per a cada soci
 AdherentMailRequired=Es necessita un correu electrònic per crear un nou membre
-MemberSendInformationByMailByDefault=Casella de verificació per enviar un missatge de confirmació als socis (validació o nova subscripció) activada per defecte
+MemberSendInformationByMailByDefault=La casella de selecció per enviar una confirmació per correu electrònic als socis (validació o nova subscripció) està activada per defecte
 VisitorCanChooseItsPaymentMode=El visitant pot triar entre els modes de pagament disponibles
 MEMBER_REMINDER_EMAIL=Activa el recordatori automàtic <b> per correu electrònic </b> de les subscripcions caducades. Nota: El mòdul <strong> %s </strong> s'ha d'habilitar i configurar correctament per enviar recordatoris.
+MembersDocModules=Plantilles de documents per a documents generats a partir del registre de socis
 ##### LDAP setup #####
 LDAPSetup=Configuració de LDAP
 LDAPGlobalParameters=Paràmetres globals
@@ -1411,11 +1452,11 @@ LDAPAdminDn=DN del administrador
 LDAPAdminDnExample=DN complet (ex: cn=admin,dc=example,dc=com o cn=Administrator,cn=Users,dc=example,dc=com per active directory)
 LDAPPassword=Contrasenya de l'administrador
 LDAPUserDn=DN dels usuaris
-LDAPUserDnExample=DN complet (ej: ou=users,dc=example,dc=com)
+LDAPUserDnExample=DN complet (ex: ou=usuaris,dc=exemple,dc=com)
 LDAPGroupDn=DN dels grups
-LDAPGroupDnExample=DN complet (ej: ou=groups,dc=example,dc=com)
-LDAPServerExample=Adreça del servidor (ej: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=DN complet (ej: dc=example,dc=com)
+LDAPGroupDnExample=DN complet (ex: ou=grups,dc=exemple,dc=com)
+LDAPServerExample=Adreça del servidor (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
+LDAPServerDnExample=DN complet (ex: dc=exemple,dc=com)
 LDAPDnSynchroActive=Sincronització d'usuaris i grups
 LDAPDnSynchroActiveExample=Sincronització LDAP vers Dolibarr ó Dolibarr vers LDAP
 LDAPDnContactActive=Sincronització de contactes
@@ -1425,7 +1466,7 @@ LDAPDnMemberActiveExample=Sincronització activada/desactivada
 LDAPDnMemberTypeActive=Sincronització de tipus de membres
 LDAPDnMemberTypeActiveExample=Sincronització activada/desactivada
 LDAPContactDn=DN dels contactes Dolibarr
-LDAPContactDnExample=DN complet (ej: ou=contacts,dc=example,dc=com)
+LDAPContactDnExample=DN complet (ex: ou=contactes,dc=exemple,dc=com)
 LDAPMemberDn=DN dels socis de Dolibarr
 LDAPMemberDnExample=DN complet (ex: ou=members,dc=example,dc=com)
 LDAPMemberObjectClassList=Llista de objectClass
@@ -1490,7 +1531,7 @@ LDAPFieldZip=Codi postal
 LDAPFieldZipExample=Exemple: codi postal
 LDAPFieldTown=Població
 LDAPFieldTownExample=Exemple: l
-LDAPFieldCountry=Pais
+LDAPFieldCountry=País
 LDAPFieldDescription=Descripció
 LDAPFieldDescriptionExample=Exemple: descripció
 LDAPFieldNotePublic=Nota publica
@@ -1523,11 +1564,13 @@ LDAPDescValues=Els valors d'exemples s'adapten a <b>OpenLDAP</b> amb els schemas
 ForANonAnonymousAccess=Per un accés autentificat
 PerfDolibarr=Configuració rendiment/informe d'optimització
 YouMayFindPerfAdviceHere=Aquesta pàgina ofereix alguns controls o consells relacionats amb el rendiment.
-NotInstalled=No està instal·lat, de manera que el vostre servidor no s'alenteix amb això.
+NotInstalled=No està instal·lat.
+NotSlowedDownByThis=No frenat per això.
+NotRiskOfLeakWithThis=No hi ha risc de filtració amb això.
 ApplicativeCache=Aplicació memòria cau
 MemcachedNotAvailable=No s'ha trobat una aplicació de cache. Pot millorar el rendiment instal·lant un cache server Memcached i un mòdul capaç d'utilitzar aquest servidor de cache.<br>Mes informació aquí <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Tingui en compte que alguns hostings no ofereixen servidors cache.
-MemcachedModuleAvailableButNotSetup=Mòdul de memoria cache actiu, però la configuració del mòdul no està completa.
-MemcachedAvailableAndSetup=Modul de memoria cache dedicada a utilitzar el servidor memcached està habilitat.
+MemcachedModuleAvailableButNotSetup=S'ha trobat el mòdul memcached per a la aplicació de memòria cau, però la configuració del mòdul no està completa.
+MemcachedAvailableAndSetup=El mòdul memcached dedicat a utilitzar el servidor memcached està habilitat.
 OPCodeCache=OPCode memòria cau
 NoOPCodeCacheFound=No s'ha trobat cap memòria cau OPCode. Potser utilitzeu una memòria cau OPCode diferent de XCache o eAccelerator (bé), o potser no tingueu la memòria cau OPCode (molt dolenta).
 HTTPCacheStaticResources=Memòria cau HTTP per a estadístiques de recursos (css, img, javascript)
@@ -1553,9 +1596,9 @@ ServiceSetup=Configuració del mòdul Serveis
 ProductServiceSetup=Configuració dels mòduls Productes i Serveis
 NumberOfProductShowInSelect=Nombre màxim de productes que es mostraran a les llistes de selecció combo (0 = sense límit)
 ViewProductDescInFormAbility=Mostra les descripcions dels productes en els formularis (en cas contrari es mostra en una finestra emergent de suggeriments)
-MergePropalProductCard=Activa en la pestanya fitxers adjunts de productes/serveis una opció per convinar el document de producte en PDF a un pressupost en PDF (si el producte/servei es troba en el pressupost)
+MergePropalProductCard=Activeu a la pestanya Fitxers adjunts de productes/serveis una opció per combinar el document PDF del producte amb el PDF del pressupost si el producte/servei es troba en ell
 ViewProductDescInThirdpartyLanguageAbility=Mostra les descripcions dels productes en l'idioma del tercer
-UseSearchToSelectProductTooltip=A més, si teniu una gran quantitat de productes (> 100 000), podeu augmentar la velocitat establint constant PRODUCT_DONOTSEARCH_ANYHERE a 1 a Setup-> Other. La cerca es limitarà al començament de la cadena.
+UseSearchToSelectProductTooltip=A més, si teniu un gran nombre de productes (> 100.000), podeu augmentar la velocitat establiint la constant PRODUCT_DONOTSEARCH_ANYWHERE a 1 a Configuració->Altres. La cerca es limitarà a l'inici de la cadena.
 UseSearchToSelectProduct=Espereu fins que premeu una tecla abans de carregar el contingut de la llista combinada del producte (això pot augmentar el rendiment si teniu una gran quantitat de productes, però és menys convenient)
 SetDefaultBarcodeTypeProducts=Tipus de codi de barres utilitzat per defecte per als productes
 SetDefaultBarcodeTypeThirdParties=Tipus de codi de barres utilitzat per defecte per als tercers
@@ -1571,9 +1614,9 @@ SyslogLevel=Nivell
 SyslogFilename=Nom i ruta de l'arxiu
 YouCanUseDOL_DATA_ROOT=Utilitza DOL_DATA_ROOT/dolibarr.log per un fitxer de registre en la carpeta documents de Dolibarr. Tanmateix, es pot definir una carpeta diferent per guardar aquest fitxer.
 ErrorUnknownSyslogConstant=La constant %s no és una constant syslog coneguda
-OnlyWindowsLOG_USER=Windows només suporta LOG_USER
+OnlyWindowsLOG_USER=En Windows, només s'admetrà la funció LOG_USER
 CompressSyslogs=Compressió i còpia de seguretat dels fitxers de registre de depuració (generats pel mòdul Log per depurar)
-SyslogFileNumberOfSaves=Còpies del log
+SyslogFileNumberOfSaves=Nombre de registres de còpia de seguretat que cal conservar
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configura la tasca programada de neteja per establir la freqüència de còpia de seguretat del registre
 ##### Donations #####
 DonationsSetup=Configuració del mòdul donacions
@@ -1595,19 +1638,19 @@ BarcodeDescDATAMATRIX=Codi de barres de tipus Datamatrix
 BarcodeDescQRCODE=Codi de barres de tipus QR
 GenbarcodeLocation=Generador de codi de barres (utilitzat pel motor intern per a alguns tipus de codis de barres). Ha de ser compatible amb "genbarcode".<br>Per exemple: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Motor intern
-BarCodeNumberManager=Configuració de la numeració automatica de codis de barres
+BarCodeNumberManager=Gestor per definir automàticament els números de codi de barres
 ##### Prelevements #####
 WithdrawalsSetup=Configuració dels pagaments de dèbit directe del mòdul
 ##### ExternalRSS #####
 ExternalRSSSetup=Configuració de les importacions del flux RSS
-NewRSS=Sindicació de un nou flux RSS
+NewRSS=Canal RSS nou
 RSSUrl=URL del RSS
 RSSUrlExample=Un flux RSS interessant
 ##### Mailing #####
 MailingSetup=Configuració del mòdul E-Mailing
 MailingEMailFrom=Correu electrònic del remitent (des de) per a correus electrònics enviats per mòdul de correu electrònic
 MailingEMailError=Retornar correus electrònics (errors) a correus electrònics amb errors
-MailingDelay=Segons d'espera despres d'enviar el missatge següent
+MailingDelay=Segons d'espera després d'enviar el següent missatge
 ##### Notification #####
 NotificationSetup=Configuració del mòdul de notificació per correu electrònic
 NotificationEMailFrom=Correu electrònic del remitent (des de) per als correus electrònics enviats pel mòdul de notificacions
@@ -1629,21 +1672,21 @@ AdvancedEditor=Editor avançat
 ActivateFCKeditor=Activar editor avançat per a :
 FCKeditorForCompany=Creació/edició WYSIWIG de la descripció i notes dels tercers
 FCKeditorForProduct=Creació/edició WYSIWIG de la descripció i notes dels productes/serveis
-FCKeditorForProductDetails=Creació / edició de productes WYSIWIG línies de detalls per a totes les entitats (propostes, comandes, factures, etc ...). 0x558520917bb7 Avís: L'ús d'aquesta opció per a aquest cas no es recomana seriosament, ja que pot crear problemes amb caràcters especials i format de pàgina quan es creïn fitxers PDF. </font>
+FCKeditorForProductDetails=Creació/edició WYSIWIG de línies de detalls de productes per a totes les entitats (pressupostos, comandes, factures, etc.). <span class="warning"> Advertiment: no es recomana utilitzar aquesta opció per a aquest cas, ja que pot crear problemes amb caràcters especials i format de pàgina en crear fitxers PDF. </span>
 FCKeditorForMailing= Creació/edició WYSIWIG dels E-Mails
 FCKeditorForUserSignature=Creació/edició WYSIWIG de la signatura de l'usuari
 FCKeditorForMail=Edició/creació WYSIWIG per tots els e-mails (excepte Eines->eMailing)
 FCKeditorForTicket=Creació / edició de WYSIWIG per a entrades
 ##### Stock #####
-StockSetup=Configuració del mòdul de Estoc
+StockSetup=Configuració del mòdul d'Estoc
 IfYouUsePointOfSaleCheckModule=Si utilitzeu el mòdul Point of Sale (POS) proporcionat per defecte o un mòdul extern, aquesta configuració pot ser ignorada pel vostre mòdul POS. La majoria dels mòduls de POS estan dissenyats per defecte per crear una factura immediatament i disminuir l'estoc, independentment de les opcions aquí. Així, si necessiteu o no una disminució de les existències al registrar una venda de la vostra TPV, consulteu també la vostra configuració del mòdul POS.
 ##### Menu #####
 MenuDeleted=Menú eliminat
+Menu=Menú
 Menus=Menús
 TreeMenuPersonalized=Menús personalitzats
 NotTopTreeMenuPersonalized=Els menús personalitzats no estan enllaçats a una entrada de menú de capçalera
-NewMenu=Nou menú
-Menu=Selecció dels menús
+NewMenu=Menú nou
 MenuHandler=Gestor de menús
 MenuModule=Mòdul origen
 HideUnauthorizedMenu= Amaga també els menús no autoritzats a usuaris interns (si no només atenuats)
@@ -1654,7 +1697,7 @@ DetailType=Tipus de menú (superior o esquerre)
 DetailTitre=Etiqueta de menú o codi d'etiqueta per traducció
 DetailUrl=URL de la pàgina cap a la qual el menú apunta
 DetailEnabled=Condició de mostrar o no
-DetailRight=Condició de visualització completa o vidrossa
+DetailRight=Condició per a mostrar menús grisos no autoritzats
 DetailLangs=Nom del fitxer Lang pel codi d'etiqueta de traducció
 DetailUser=Intern / Extern / Tots
 Target=Objectiu
@@ -1663,7 +1706,7 @@ DetailLevel=Nivell (-1:menú superior, 0:principal, >0 menú y submenú)
 ModifMenu=Modificació del menú
 DeleteMenu=Eliminar entrada de menú
 ConfirmDeleteMenu=Estàs segur que vols eliminar l'entrada de menú <b>%s</b> ?
-FailedToInitializeMenu=Error al inicialitzar el menú
+FailedToInitializeMenu=No s'ha pogut inicialitzar el menú
 ##### Tax #####
 TaxSetup=Configuració del mòdul d'impostos varis i dividends
 OptionVatMode=Opció de càrrega d'IVA
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Estableix automàticament aquest valor predetermin
 AGENDA_DEFAULT_FILTER_TYPE=Estableix automàticament aquest tipus d'esdeveniment al filtre de cerca de la vista d'agenda
 AGENDA_DEFAULT_FILTER_STATUS=Estableix automàticament aquest estat per a esdeveniments al filtre de cerca de la visualització d'agenda
 AGENDA_DEFAULT_VIEW=Quina vista voleu obrir de manera predeterminada en seleccionar el menú Agenda
-AGENDA_REMINDER_EMAIL=Activar el recordatori d'esdeveniments <b>per correu electrònic</b> (es pot definir l'opció retard en cada esdeveniment). Nota: el mòdul <strong>%s</strong> ha d'estar habilitat i configurat correctament per tenir un recordatori enviat amb la freqüència correcta.
-AGENDA_REMINDER_BROWSER=Activa el recordatori de l'esdeveniment <b> al navegador de l'usuari </b> (quan s'aconsegueix la data de l'esdeveniment, cada usuari pot rebutjar això des de la pregunta de confirmació del navegador)
+AGENDA_REMINDER_BROWSER=Activa el recordatori d'esdeveniments <b> al navegador de l'usuari </b> (Quan s'arriba a la data de recordatori, el navegador mostra una finestra emergent. Cada usuari pot desactivar aquestes notificacions des de la configuració de notificacions del navegador).
 AGENDA_REMINDER_BROWSER_SOUND=Habilita les notificacions sonores
+AGENDA_REMINDER_EMAIL=Activa el recordatori d'esdeveniments <b> per correu electrònic </b> (es pot definir l'opció de recordatori/retard a cada esdeveniment).
+AGENDA_REMINDER_EMAIL_NOTE=Nota: La freqüència de la tasca %s ha de ser suficient per a assegurar-se que els recordatoris s’envien en el moment correcte.
 AGENDA_SHOW_LINKED_OBJECT=Mostra l'objecte vinculat a la vista d'agenda
 ##### Clicktodial #####
 ClickToDialSetup=Configuració del mòdul Click To Dial
@@ -1713,8 +1757,8 @@ CashDeskBankAccountForSell=Compte per defecte a utilitzar pels cobraments en efe
 CashDeskBankAccountForCheque=Compte a utilitzar per defecte per rebre pagaments per xec
 CashDeskBankAccountForCB=Compte per defecte a utilitzar pels cobraments amb targeta de crèdit
 CashDeskBankAccountForSumup=Compte bancari per defecte que es farà servir per rebre pagaments de SumUp
-CashDeskDoNotDecreaseStock=Desactiveu la disminució d'existències quan es realitzi una venda des del punt de venda (si "no", la disminució de les existències es fa per cada venda realitzada des de POS, independentment de l'opció establerta en el mòdul Stock).
-CashDeskIdWareHouse=Forçar i restringir el magatzem a usar l'stock a disminuir
+CashDeskDoNotDecreaseStock=Desactiva la reducció d'estoc quan es realitza una venda des del punt de venda (si és "no", la reducció d'estoc es realitza per a cada venda realitzada des del TPV, independentment de l'opció establerta al mòdul Estoc).
+CashDeskIdWareHouse=Força i restringeix el magatzem a utilitzar per disminuir l'estoc
 StockDecreaseForPointOfSaleDisabled=La disminució d'estocs des del punt de venda està desactivat
 StockDecreaseForPointOfSaleDisabledbyBatch=La disminució d'accions en POS no és compatible amb el mòdul de gestió de Serial / Lot (actualment actiu) perquè la disminució de l'estoc està desactivada.
 CashDeskYouDidNotDisableStockDecease=No va desactivar la disminució de les existències en fer una venda des del punt de venda. Per tant, es requereix un magatzem.
@@ -1729,7 +1773,7 @@ NbOfBoomarkToShow=Nombre màxim de marcadors que es mostrarà en el menú
 WebServicesSetup=Configuració del mòdul webservices
 WebServicesDesc=Mitjançant l'activació d'aquest mòdul, Dolibarr es converteix en el servidor de serveis web oferint diversos serveis web.
 WSDLCanBeDownloadedHere=La descripció WSDL dels serveis prestats es poden recuperar aquí
-EndPointIs=Els clients SOAP hauran d'enviar les seves solicituds al punt final en la URL Dolibarr
+EndPointIs=Els clients SOAP han d’enviar les seves sol·licituds al punt final Dolibarr disponible a l’URL
 ##### API ####
 ApiSetup=Configuració del mòdul API
 ApiDesc=Habilitant aquest mòdul, Dolibarr serà un servidor REST per oferir varis serveis web.
@@ -1774,18 +1818,18 @@ UseSearchToSelectProject=Espereu fins que es prem una tecla abans de carregar el
 ##### Fiscal Year #####
 AccountingPeriods=Períodes comptables
 AccountingPeriodCard=Període comptable
-NewFiscalYear=Nou any fiscal
+NewFiscalYear=Any fiscal nou
 OpenFiscalYear=Obrir any fiscal
 CloseFiscalYear=Tancar any fiscal
 DeleteFiscalYear=Eliminar any fiscal
 ConfirmDeleteFiscalYear=Esteu segur d'eliminar aquest any fiscal?
-ShowFiscalYear=Mostrar periode contable
+ShowFiscalYear=Mostra el període comptable
 AlwaysEditable=Sempre es pot editar
 MAIN_APPLICATION_TITLE=Força veure el nom de l'aplicació (advertència: indicar el teu propi nom aquí pot trencar la característica d'auto-omplir l'inici de sessió en utilitzar l'aplicació mòbil DoliDroid)
 NbMajMin=Nombre mínim de caràcters en majúscules
 NbNumMin=Nombre mínim de caràcters numèrics
 NbSpeMin=Nombre mínim de caràcters especials
-NbIteConsecutive=Capacitat màxima per repetir mateixos caràcters
+NbIteConsecutive=Nombre màxim de repeticions dels mateixos caràcters
 NoAmbiCaracAutoGeneration=No utilitzar caràcters semblants ("1", "l", "i", "|", "0", "O") per a la generació automàtica
 SalariesSetup=Configuració del mòdul de salaris
 SortOrder=Ordre de classificació
@@ -1793,8 +1837,7 @@ Format=Format
 TypePaymentDesc=0:Forma de pagament a client, 1:Forma de pagament a proveïdor, 2:Mateixa forma de pagament per clients i proveïdors
 IncludePath=Incloure ruta (que es defineix a la variable %s)
 ExpenseReportsSetup=Configuració del mòdul Informe de Despeses
-TemplatePDFExpenseReports=Mòdels de documentació per generar informes de despeses
-ExpenseReportsIkSetup=Configurar mòdul Informe de despeses - Índex milles
+TemplatePDFExpenseReports=Plantilles de documents per a generar un document d’informe de despeses
 ExpenseReportsRulesSetup=Configurar mòdul Informes de despeses - Regles
 ExpenseReportNumberingModules=Número del mòdul Informe de despeses
 NoModueToManageStockIncrease=No esta activat el mòdul per gestionar automàticament l'increment d'estoc. L'increment d'estoc es realitzara només amb l'entrada manual
@@ -1827,8 +1870,8 @@ BackgroundTableTitleTextColor=Color del text per a la línia del títol de la ta
 BackgroundTableTitleTextlinkColor=Color del text per a la línia d'enllaç del títol de la taula
 BackgroundTableLineOddColor=Color de fons per les línies senars de les taules
 BackgroundTableLineEvenColor=Color de fons per les línies parells de les taules
-MinimumNoticePeriod=Període mínim de notificació (La solicitud de dia lliure serà donada abans d'aquest període)
-NbAddedAutomatically=Número de dies afegits en comptadors d'usuaris (automàticament) cada mes
+MinimumNoticePeriod=Període mínim d’avís (la vostra sol·licitud de permís s’ha de fer abans d’aquest període)
+NbAddedAutomatically=Nombre de dies afegits als comptadors d'usuaris (automàticament) cada mes
 EnterAnyCode=Aquest camp conté una referència a un identificador de línia. Introdueix qualsevol valor però sense caràcters especials.
 Enter0or1=Introdueix 0 o 1
 UnicodeCurrency=Introduïu aquí entre claudàtors, llista del número de bytes que representa el símbol monetari. Per exemple: per $, introduïu [36] - per Brasil real R $ [82,36] - per €, introduïu [8364]
@@ -1837,14 +1880,14 @@ PictoHelp=Nom de la icona en format dolibarr ("image.png" si es troba al directo
 PositionIntoComboList=Posició de la línia en llistes combo
 SellTaxRate=Valor de l'IVA
 RecuperableOnly=Sí per l'IVA "No percebut sinó recuperable" dedicat per a algun estat a França. Manteniu el valor "No" en tots els altres casos.
-UrlTrackingDesc=Si el proveïdor o servei de transport ofereix una pàgina o un lloc web per comprovar l'estat dels seus enviaments, podeu introduir-lo aquí. Podeu utilitzar la tecla {TRACKID} als paràmetres d'URL perquè el sistema la reemplacelli amb el número de seguiment que l'usuari ha introduït a la targeta de transport.
+UrlTrackingDesc=Si el proveïdor o el servei de transport ofereix una pàgina o un lloc web per comprovar l'estat dels vostres enviaments, podeu introduir-lo aquí. Podeu utilitzar la clau {TRACKID} als paràmetres d'URL perquè el sistema la substitueixi pel número de seguiment que l'usuari va introduir a la fitxa d'enviament.
 OpportunityPercent=Quan creeu un avantatge, definiran una quantitat estimada de projecte / avantatge. Segons l'estat del lideratge, aquesta quantitat es pot multiplicar per aquesta taxa per avaluar una quantitat total que pot generar tots els vostres clients potencials. El valor és un percentatge (entre 0 i 100).
 TemplateForElement=Aquest registre de plantilla es dedica a quin element
 TypeOfTemplate=Tipus de plantilla
 TemplateIsVisibleByOwnerOnly=La plantilla només és visible pel propietari
 VisibleEverywhere=Visible arreu
 VisibleNowhere=Visible enlloc
-FixTZ=Fixar zona horaria
+FixTZ=Correcció de zona horària
 FillFixTZOnlyIfRequired=Exemple: +2 (omple'l només si tens problemes)
 ExpectedChecksum=Checksum esperat
 CurrentChecksum=Checksum actual
@@ -1864,7 +1907,7 @@ MailToSendReception=Recepcions
 MailToThirdparty=Tercers
 MailToMember=Socis
 MailToUser=Usuaris
-MailToProject=Pàgina de projectes
+MailToProject=Projectes
 MailToTicket=Tiquets
 ByDefaultInList=Mostra per defecte en la vista del llistat
 YouUseLastStableVersion=Estàs utilitzant l'última versió estable
@@ -1872,9 +1915,9 @@ TitleExampleForMajorRelease=Exemple de missatge que es pot utilitzar per anuncia
 TitleExampleForMaintenanceRelease=Exemple de missatge que es pot utilitzar per anunciar aquesta actualització de manteniment (ets lliure d'utilitzar-ho a les teves webs)
 ExampleOfNewsMessageForMajorRelease=Disponible ERP/CRM Dolibarr %s. La versió %s és una versió major amb un munt de noves característiques, tant per a usuaris com per a desenvolupadors. Es pot descarregar des de la secció de descàrregues del portal https://www.dolibarr.org (subdirectori versions estables). Podeu llegir <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> per veure la llista completa dels canvis.
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s està disponible. La versió %s és una versió de manteniment, de manera que només conté correccions d'errors. Us recomanem que tots els usuaris actualitzeu aquesta versió. Un llançament de manteniment no introdueix novetats ni canvis a la base de dades. Podeu descarregar-lo des de l'àrea de descàrrega del portal https://www.dolibarr.org (subdirectori de les versions estables). Podeu llegir el <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> per obtenir una llista completa dels canvis.
-MultiPriceRuleDesc=Quan s'activa l'opció "Diversos nivells de preus per producte / servei", podeu definir preus diferents (un per preu) per a cada producte. Per estalviar-vos temps, aquí podeu introduir una regla per calcular automàticament un preu per a cada nivell en funció del preu del primer nivell, de manera que només haureu d'introduir un preu del primer nivell per a cada producte. Aquesta pàgina està dissenyada per estalviar temps, però és útil només si els preus de cada nivell són relatius al primer nivell. Podeu ignorar aquesta pàgina en la majoria dels casos.
+MultiPriceRuleDesc=Quan l'opció "Diversos nivells de preus per producte/servei" està activada, podeu definir preus diferents (un preu per nivell) per a cada producte. Per a estalviar-vos temps, aquí podeu introduir una regla per calcular automàticament un preu per a cada nivell en funció del preu del primer nivell, de manera que només haureu d'introduir un preu per al primer nivell per a cada producte. Aquesta pàgina està dissenyada per a estalviar-vos temps, però només és útil si els preus de cada nivell són relatius al primer nivell. Podeu ignorar aquesta pàgina en la majoria dels casos.
 ModelModulesProduct=Plantilles per documents de productes
-WarehouseModelModules=Templates for documents of warehouses
+WarehouseModelModules=Plantilles per a documents de magatzems
 ToGenerateCodeDefineAutomaticRuleFirst=Per poder generar codis automàticament, primer heu de definir un gestor per definir automàticament el número del codi de barres.
 SeeSubstitutionVars=Veure * nota per llistat de possibles variables de substitució
 SeeChangeLog=Veure el fitxer ChangeLog (només en anglès)
@@ -1935,11 +1978,11 @@ SwapSenderAndRecipientOnPDF=Intercanvieu la posició de l'adreça del remitent i
 FeatureSupportedOnTextFieldsOnly=Advertència, funció només compatible amb camps de text. També s'ha d'establir un paràmetre d'URL action = create o action = edit ha de ser OR el nom de la pàgina ha de finalitzar amb 'new.php' per activar aquesta funció.
 EmailCollector=Col lector de correu electrònic
 EmailCollectorDescription=Afegiu una tasca programada i una pàgina de configuració per escanejar regularment caixes de correu electrònic (utilitzant el protocol IMAP) i registreu els correus electrònics rebuts a la vostra aplicació, al lloc adequat i / o creeu alguns registres automàticament (com a clients potencials).
-NewEmailCollector=Nou col · lector de correu electrònic
+NewEmailCollector=Col·lector nou de correus electrònics
 EMailHost=Servidor IMAP de correu electrònic
 MailboxSourceDirectory=Directori d'origen de la bústia
 MailboxTargetDirectory=Directori de destinació de la bústia
-EmailcollectorOperations=Operacions a realitzar per col·leccionista
+EmailcollectorOperations=Operacions a fer per recol·lector
 MaxEmailCollectPerCollect=Nombre màxim de correus electrònics recopilats per recollida
 CollectNow=Recolliu ara
 ConfirmCloneEmailCollector=Esteu segur que voleu clonar el recollidor de correu electrònic %s?
@@ -1947,22 +1990,24 @@ DateLastCollectResult=Data del darrer intent de recollida
 DateLastcollectResultOk=Data de la darrera recollida amb èxit
 LastResult=Últim resultat
 EmailCollectorConfirmCollectTitle=Confirmació de recollida de correu electrònic
-EmailCollectorConfirmCollect=Voleu executar la col · lecció per aquest col · leccionista ara?
+EmailCollectorConfirmCollect=Voleu executar ara la recol·lecció d’aquest col·lector?
 NoNewEmailToProcess=No hi ha cap altre correu electrònic (filtres coincidents) per processar
 NothingProcessed=No s'ha fet res
 XEmailsDoneYActionsDone=%s correus electrònics qualificats, %s correus electrònics processats amb èxit (per %s registre / accions realitzades)
 RecordEvent=Registre d'esdeveniments de correu electrònic
 CreateLeadAndThirdParty=Crea Client Potencial (i tercer si és necessari)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+CreateTicketAndThirdParty=Crea un tiquet (i enllaça'l amb un tercer si es va carregar amb una operació anterior)
 CodeLastResult=Últim codi retornat
 NbOfEmailsInInbox=Nombre de correus electrònics en el directori font
 LoadThirdPartyFromName=Carregueu la cerca de tercers al %s (només carrega)
 LoadThirdPartyFromNameOrCreate=Carregueu la cerca de tercers a %s (crear si no es troba)
-WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
-WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
-CreateCandidature=Create candidature
+WithDolTrackingID=Missatge d'una conversa iniciada per un primer correu electrònic enviat des de Dolibarr
+WithoutDolTrackingID=Missatge d'una conversa iniciada per un primer correu electrònic NO enviat des de Dolibarr
+WithDolTrackingIDInMsgId=Missatge enviat des de Dolibarr
+WithoutDolTrackingIDInMsgId=Missatge NO enviat des de Dolibarr
+CreateCandidature=Crea candidatura
 FormatZip=Codi postal
-MainMenuCode=Codi d'entrada del menú (menu principal)
+MainMenuCode=Codi d'entrada del menú (menú principal)
 ECMAutoTree=Mostra l'arbre ECM automàtic
 OperationParamDesc=Definiu els valors a emprar per l'objecte de l'acció, o com extreure valors. Per exemple:<br>objproperty1=SET:el valor a assignar<br>objproperty2=SET:un valor am un valor amb substitució de __objproperty1__<br>objproperty3=SETIFEMPTY:valor usat si objproperty3 no ha estat definit<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:EL nom de la meva empresa és\\s([^\\s]*)<br><br>Empreu un punt i coma (;) com a separadorper a extreure o definir vàries propietats alhora.
 OpeningHours=Horari d'obertura
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Desactiva la funció per enllaçar un recurs als con
 EnableResourceUsedInEventCheck=Habilita la funció per comprovar si s’utilitza un recurs en un esdeveniment
 ConfirmUnactivation=Confirma el restabliment del mòdul
 OnMobileOnly=Només en pantalla petita (telèfon intel·ligent)
-DisableProspectCustomerType=Desactiveu el tipus de tercers "Prospect + Customer" (per tant, un tercer ha de ser Client o Client Potencial, però no pot ser ambdues)
+DisableProspectCustomerType=Desactiva el tipus de tercer "Potencial + Client" (per tant, el tercer ha de ser "Potencial" o "Client", però no pot ser tots dos)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplifica la interfície per a persones cegues
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Activa aquesta opció si ets cec o si fas servir l'aplicació des d'un navegador de text com ara Lynx o Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Canvia el color de la interfície per daltònic
@@ -1996,16 +2041,18 @@ UseDebugBar=Utilitzeu la barra de depuració
 DEBUGBAR_LOGS_LINES_NUMBER=Nombre d’últimes línies de registre que cal mantenir a la consola
 WarningValueHigherSlowsDramaticalyOutput=Advertència, els valors més alts frenen molt la producció
 ModuleActivated=El mòdul %s està activat i alenteix la interfície
+IfYouAreOnAProductionSetThis=Si esteu en un entorn de producció, s'hauria d'establir aquesta propietat en %s.
+AntivirusEnabledOnUpload=Antivirus activat als fitxers penjats
 EXPORTS_SHARE_MODELS=Els models d’exportació es comparteixen amb tothom
 ExportSetup=Configuració del mòdul Export
 ImportSetup=Configuració del mòdul Import
 InstanceUniqueID=ID únic de la instància
 SmallerThan=Menor que
 LargerThan=Major que
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Tingueu en compte que si es troba un identificador de seguiment d’un objecte al correu electrònic o si el correu electrònic és una resposta d’un correu electrònic que ja està recollit i enllaçat a un objecte, l’esdeveniment creat s’enllaçarà automàticament a l’objecte relacionat conegut.
 WithGMailYouCanCreateADedicatedPassword=Amb un compte de GMail, si heu activat la validació de dos passos, es recomana crear una segona contrasenya dedicada a l’aplicació en comptes d’utilitzar la contrasenya del vostre compte des de https://myaccount.google.com/.
 EmailCollectorTargetDir=Pot ser un comportament desitjat traslladar el correu electrònic a una altra etiqueta / directori quan s'ha processat correctament. Només heu de definir el nom del directori per utilitzar aquesta funció (NO utilitzeu caràcters especials en nom). Tingueu en compte que també heu d'utilitzar un compte d'inici de sessió de lectura / escriptura.
-EmailCollectorLoadThirdPartyHelp=Podeu utilitzar aquesta acció per utilitzar el contingut de correu electrònic per cercar i carregar una tercera part existent a la base de dades. La tercera part trobada (o creada) s'utilitzarà per a les accions que ho necessitin. Al camp del paràmetre podeu fer servir, per exemple, 'EXTRACT:BODY:Name:\\s([^\\s]*)' si voleu extreure el nom de la tercera part d'una cadena "Name: nom a trobar" que es troba a la cos.
+EmailCollectorLoadThirdPartyHelp=Podeu utilitzar aquesta acció per a utilitzar el contingut del correu electrònic per trobar i carregar un tercer existent a la vostra base de dades. El tercer trobat (o creat) s'utilitzarà per seguir les accions que ho necessitin. Al camp del paràmetre podeu utilitzar, per exemple, 'EXTRACT:BODY:Name:\\s([^\\s]*)' si voleu extreure el nom del tercer d'una cadena 'Name:name to find' que es troba al cos.
 EndPointFor=Punt final per %s: %s
 DeleteEmailCollector=Suprimeix el recollidor de correu electrònic
 ConfirmDeleteEmailCollector=Esteu segur que voleu suprimir aquest recollidor de correu electrònic?
@@ -2025,8 +2072,14 @@ FeatureNotAvailableWithReceptionModule=Funció no disponible quan el mòdul Rece
 RssNote=Nota: Cada definició de canal RSS proporciona un giny que heu d'habilitar per tenir-lo disponible al tauler de control
 JumpToBoxes=Vés a Configuració -> Ginys
 MeasuringUnitTypeDesc=Utilitzeu aquí un valor com "size", "surface", "volume", "weight", "time"
-MeasuringScaleDesc=La escala és el nombre de llocs que heu de moure la part decimal per coincidir amb la unitat de referència predeterminada. Per al tipus d'unitat "temps", és el nombre de segons. Valors entre 80 i 99 són valors reservats.
+MeasuringScaleDesc=L'escala és el nombre de llocs que heu de moure la part decimal per a coincidir amb la unitat de referència predeterminada. Per al tipus d'unitat de "temps", és el nombre de segons. Els valors entre 80 i 99 són valors reservats.
 TemplateAdded=S'ha afegit la plantilla
 TemplateUpdated=Plantilla actualitzada
 TemplateDeleted=S'ha suprimit la plantilla
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Correu electrònic de recordatori d'esdeveniments
+SwitchThisForABetterSecurity=Es recomana canviar aquest valor a %s per obtenir més seguretat
+DictionaryProductNature= Naturalesa del producte
+CountryIfSpecificToOneCountry=País (si és específic d'un país determinat)
+YouMayFindSecurityAdviceHere=Podeu trobar assessorament de seguretat aquí
+ModuleActivatedMayExposeInformation=Aquest mòdul pot exposar dades sensibles. Si no el necessiteu, desactiveu-lo.
+ModuleActivatedDoNotUseInProduction=S'ha habilitat un mòdul dissenyat per al desenvolupament. No l'activeu en un entorn de producció.
diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang
index 04ba47cdfb9..ac453608960 100644
--- a/htdocs/langs/ca_ES/agenda.lang
+++ b/htdocs/langs/ca_ES/agenda.lang
@@ -86,8 +86,8 @@ ProposalDeleted=Pressupost esborrat
 OrderDeleted=Comanda esborrada
 InvoiceDeleted=Factura esborrada
 DraftInvoiceDeleted=S'ha suprimit l'esborrany de factura
-CONTACT_CREATEInDolibarr=Contact %s created
-CONTACT_DELETEInDolibarr=Contact %s deleted
+CONTACT_CREATEInDolibarr=S'ha creat el contacte %s
+CONTACT_DELETEInDolibarr=S'ha eliminat el contacte %s
 PRODUCT_CREATEInDolibarr=Producte %s creat
 PRODUCT_MODIFYInDolibarr=Producte %s modificat
 PRODUCT_DELETEInDolibarr=Producte %s eliminat
@@ -115,10 +115,10 @@ BOM_CLOSEInDolibarr=Llista de materials desactivada
 BOM_REOPENInDolibarr=Llista de materials reoberta
 BOM_DELETEInDolibarr=Llista de materials eliminada
 MRP_MO_VALIDATEInDolibarr=OF validada
-MRP_MO_UNVALIDATEInDolibarr=S'ha definit l'estatus esborrany per a l'Ordre de Fabricació (MO)
+MRP_MO_UNVALIDATEInDolibarr=OF definida a l'estat d'esborrany
 MRP_MO_PRODUCEDInDolibarr=OF fabricada
 MRP_MO_DELETEInDolibarr=OF eliminada
-MRP_MO_CANCELInDolibarr=S'ha cancel·lat l'Ordre de Fabricació (MO)
+MRP_MO_CANCELInDolibarr=OF cancel·lada
 ##### End agenda events #####
 AgendaModelModule=Plantilles de documents per esdeveniments
 DateActionStart=Data d'inici
@@ -152,6 +152,7 @@ ActionType=Tipus d'esdeveniment
 DateActionBegin=Data d'inici de l'esdeveniment
 ConfirmCloneEvent=Estàs segur que vols clonar l'esdeveniment <b>%s</b>?
 RepeatEvent=Repeteix esdeveniment
+OnceOnly=Una sola vegada
 EveryWeek=Cada setmana
 EveryMonth=Cada mes
 DayOfMonth=Dia del mes
@@ -160,9 +161,9 @@ DateStartPlusOne=Data d'inici + 1 hora
 SetAllEventsToTodo=Definir tots els events com a pendents
 SetAllEventsToInProgress=Definir tots els events en progrés
 SetAllEventsToFinished=Definir tots els events com a enllestits
-ReminderTime=Reminder period before the event
-TimeType=Duration type
-ReminderType=Callback type
-AddReminder=Create an automatic reminder notification for this event
-ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+ReminderTime=Període de recordatori abans de l'esdeveniment
+TimeType=Tipus de durada
+ReminderType=Tipus de devolució de trucada
+AddReminder=Crea una notificació de recordatori automàtica per a aquest esdeveniment
+ErrorReminderActionCommCreation=S'ha produït un error en crear la notificació de recordatori per a aquest esdeveniment
+BrowserPush=Notificació del navegador
diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang
index d3ed5063135..593678f8d7d 100644
--- a/htdocs/langs/ca_ES/banks.lang
+++ b/htdocs/langs/ca_ES/banks.lang
@@ -2,7 +2,7 @@
 Bank=Banc
 MenuBankCash=Banc | Efectiu
 MenuVariousPayment=Pagaments varis
-MenuNewVariousPayment=Pagament extra nou
+MenuNewVariousPayment=Pagament divers nou
 BankName=Nom del banc
 FinancialAccount=Compte
 BankAccount=Compte bancari
@@ -49,11 +49,11 @@ BankAccountDomiciliation=Dades bancàries
 BankAccountCountry=País del compte
 BankAccountOwner=Nom del titular del compte
 BankAccountOwnerAddress=Direcció del titular del compte
-RIBControlError=Ha fallat el control d'integritat. Això significa que la informació d'aquest compte bancari és incompleta o incorrecta (comprova el pais, els dígits i l'IBAN)
+RIBControlError=Ha fallat la comprovació d’integritat dels valors. Això significa que la informació d’aquest número de compte no és completa o és incorrecta (comproveu el país, els números i l’IBAN).
 CreateAccount=Crear compte
-NewBankAccount=Nou compte
-NewFinancialAccount=Nou compte financer
-MenuNewFinancialAccount=Nou compte
+NewBankAccount=Compte nou
+NewFinancialAccount=Compte financer nou
+MenuNewFinancialAccount=Compte financer nou
 EditFinancialAccount=Edició compte
 LabelBankCashAccount=Etiqueta compte o caixa
 AccountType=Tipus de compte
@@ -161,18 +161,22 @@ CheckRejectedAndInvoicesReopened=Xecs retornats i factures re-obertes
 BankAccountModelModule=Plantilles de documents per comptes bancaris
 DocumentModelSepaMandate=Plantilla per a mandat SEPA. Vàlid només per a països europeus de la CEE.
 DocumentModelBan=Plantilla per imprimir una pàgina amb informació BAN
-NewVariousPayment=Nou pagament divers
+NewVariousPayment=Pagament divers nou
 VariousPayment=Pagament divers
 VariousPayments=Pagaments varis
 ShowVariousPayment=Mostra pagaments diversos
 AddVariousPayment=Afegiu pagaments diversos
+VariousPaymentId=ID de pagament divers
+VariousPaymentLabel=Etiqueta de pagament divers
+ConfirmCloneVariousPayment=Confirmeu el clon d'un pagament divers
 SEPAMandate=Mandat SEPA
 YourSEPAMandate=La vostra ordre SEPA
 FindYourSEPAMandate=Aquest és el vostre mandat de SEPA per autoritzar a la nostra empresa a realitzar un ordre de dèbit directe al vostre banc. Gràcies per retornar-la signada (escanejar el document signat) o envieu-lo per correu a
 AutoReportLastAccountStatement=Ompliu automàticament el camp "nombre d'extracte bancari" amb l'últim número de l'extracte al fer la conciliació
 CashControl=Tancar Efectiu del Punt de Venda
-NewCashFence=Nou tancament d'efectiu
+NewCashFence=Tancament d'efectiu nou
 BankColorizeMovement=Color de moviments
 BankColorizeMovementDesc=Si aquesta funció està habilitada, podeu triar un color de fons específic per als moviments de dèbit o de crèdit
 BankColorizeMovementName1=Color de fons pel moviment de dèbit
 BankColorizeMovementName2=Color de fons pel moviment de crèdit
+IfYouDontReconcileDisableProperty=Si no feu les conciliacions bancàries en alguns comptes bancaris, desactiveu la propietat "%s" per eliminar aquest advertiment.
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index 725581fa07d..61e70a38bea 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -92,8 +92,8 @@ PaymentConditions=Condicions de pagament
 PaymentConditionsShort=Condicions de pagament
 PaymentAmount=Import pagament
 PaymentHigherThanReminderToPay=Pagament superior a la resta a pagar
-HelpPaymentHigherThanReminderToPay=Atenció, l'import del pagament d'una o més factures és superior a la resta a pagar.<br>Corregiu la entrada, en cas contrari, confirmeu i pensi en crear un abonament d'allò percebut en excés per cada factura sobrepagada.
-HelpPaymentHigherThanReminderToPaySupplier=Atenció, l'import del pagament d'una o més factures és superior a la resta a pagar.<br>Corregiu la entrada, en cas contrari, confirmeu i pensi en crear un abonament d'allò percebut en excés per cada factura sobrepagada.
+HelpPaymentHigherThanReminderToPay=Atenció, l'import del pagament d'una o més factures és superior a l'import pendent de pagar. <br> Editeu la vostra entrada; en cas contrari, confirmeu i considereu la possibilitat de crear un abonament per l'excés rebut per cada factura pagada de més.
+HelpPaymentHigherThanReminderToPaySupplier=Atenció, l'import del pagament d'una o més factures és superior a l'import pendent de pagar.<br>Editeu l'entrada, en cas contrari, confirmeu i considereu la possibilitat de crear un abonament per l'excés pagat per cada factura pagada de més.
 ClassifyPaid=Classificar 'Pagat'
 ClassifyUnPaid=Classifica &quot;sense pagar&quot;
 ClassifyPaidPartially=Classificar 'Pagat parcialment'
@@ -298,7 +298,7 @@ CreditNotes=Abonaments
 CreditNotesOrExcessReceived=Notes de crèdit o excés rebut
 Deposit=Bestreta
 Deposits=Bestretes
-DiscountFromCreditNote=Descompte resultant del abonament %s
+DiscountFromCreditNote=Descompte de l'abonament %s
 DiscountFromDeposit=Pagaments de la factura de bestreta %s
 DiscountFromExcessReceived=Pagaments superiors a la factura %s
 DiscountFromExcessPaid=Pagaments superiors a la factura %s
@@ -531,6 +531,7 @@ TypeContact_invoice_supplier_external_SERVICE=Contacte proveïdor serveis
 InvoiceFirstSituationAsk=Primera factura de situació
 InvoiceFirstSituationDesc=Les <b>factures de situació</b> estan vinculades a situacions relacionades amb una progressió, per exemple, la progressió d'una construcció. Cada situació està lligada a una factura.
 InvoiceSituation=Factura de situació
+PDFInvoiceSituation=Factura de situació
 InvoiceSituationAsk=Factura que segueix una situació
 InvoiceSituationDesc=Crear una nova situació seguint una altra existent
 SituationAmount=Import (sense IVA) de la factura de situació
@@ -560,7 +561,7 @@ ToCreateARecurringInvoiceGene=Per generar futures factures regulars i manualment
 ToCreateARecurringInvoiceGeneAuto=Si necessites tenir cada factura generada automàticament, pregunta a l'administrador per habilitar i configurar el mòdul <strong>%s</strong>. Tingues en compte que ambdós mètodes (manual i automàtic) es poden utilitzar alhora sense risc de duplicats.
 DeleteRepeatableInvoice=Elimina la factura recurrent
 ConfirmDeleteRepeatableInvoice=Vols eliminar la plantilla de factura?
-CreateOneBillByThird=Crea una factura per tercer (per la resta, una factura per comanda)
+CreateOneBillByThird=Agrupa una factura per tercer (sinó, una factura per comanda)
 BillCreated=%s factura(es) creades
 StatusOfGeneratedDocuments=Estat de la generació de documents
 DoNotGenerateDoc=No generar cap fitxer de document
@@ -575,3 +576,7 @@ BILL_SUPPLIER_DELETEInDolibarr=S'ha suprimit la factura de proveïdor
 UnitPriceXQtyLessDiscount=Descompte - Preu unitari x Quantitat
 CustomersInvoicesArea=Àrea de facturació del client
 SupplierInvoicesArea=Àrea de facturació del proveïdor
+FacParentLine=Línia de factura origen
+SituationTotalRayToRest=Resta a pagar sense impostos
+PDFSituationTitle=Situació núm. %d
+SituationTotalProgress=Progrés total %d %%
diff --git a/htdocs/langs/ca_ES/boxes.lang b/htdocs/langs/ca_ES/boxes.lang
index e82b52c32a0..db7fab66a6b 100644
--- a/htdocs/langs/ca_ES/boxes.lang
+++ b/htdocs/langs/ca_ES/boxes.lang
@@ -45,7 +45,7 @@ BoxTitleLastContracts=Últims %s contractes modificats
 BoxTitleLastModifiedDonations=Últimes %s donacions modificades
 BoxTitleLastModifiedExpenses=Últimes %s despeses modificades
 BoxTitleLatestModifiedBoms=Últimes %s llistes de material modificades
-BoxTitleLatestModifiedMos=Últimes %s Ordres de Fabricació modificades
+BoxTitleLatestModifiedMos=Últimes %s ordres de fabricació modificades
 BoxGlobalActivity=Activitat global
 BoxGoodCustomers=Bons clients
 BoxTitleGoodCustomers=% bons clients
@@ -84,7 +84,7 @@ BoxTitleLastModifiedCustomerBills=Factures del client: últimes %s modificades
 BoxTitleLastModifiedCustomerOrders=Comandes de venda: últimes %s modificades
 BoxTitleLastModifiedPropals=Últims %s pressupostos modificats
 BoxTitleLatestModifiedJobPositions=Els darrers %s treballs modificats
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedCandidatures=Darreres candidatures modificades %s
 ForCustomersInvoices=Factures a clients
 ForCustomersOrders=Comandes de clients
 ForProposals=Pressupostos
@@ -104,3 +104,4 @@ BoxTitleLastCustomerShipments=Últims %s enviaments de clients
 NoRecordedShipments=Cap enviament de client registrat
 # Pages
 AccountancyHome=Comptabilitat
+ValidatedProjects=Projectes validats
diff --git a/htdocs/langs/ca_ES/cashdesk.lang b/htdocs/langs/ca_ES/cashdesk.lang
index c18d86147d6..c17e230f1ee 100644
--- a/htdocs/langs/ca_ES/cashdesk.lang
+++ b/htdocs/langs/ca_ES/cashdesk.lang
@@ -77,29 +77,29 @@ POSModule=Mòdul TPV
 BasicPhoneLayout=Utilitzeu el disseny bàsic dels telèfons
 SetupOfTerminalNotComplete=La configuració del terminal %s no està completa
 DirectPayment=Pagament directe
-DirectPaymentButton=Add a "Direct cash payment" button
+DirectPaymentButton=Afegeix un botó "Pagament directe en efectiu"
 InvoiceIsAlreadyValidated=La factura ja està validada
 NoLinesToBill=No hi ha línies a facturar
 CustomReceipt=Rebut personalitzat
 ReceiptName=Nom del rebut
 ProductSupplements=Suplements de producte
 SupplementCategory=Categoria de suplement
-ColorTheme=Tema del color
+ColorTheme=Color del tema
 Colorful=Colorit
 HeadBar=Barra de capçalera
-SortProductField=Camp per ordenar productes
+SortProductField=Camp per a ordenar productes
 Browser=Navegador
 BrowserMethodDescription=Impressió de rebuts senzilla i senzilla. Només uns quants paràmetres per configurar el rebut. Imprimeix a través del navegador.
 TakeposConnectorMethodDescription=Mòdul extern amb funcions addicionals. Possibilitat d’imprimir des del núvol.
 PrintMethod=Mètode d'impressió
 ReceiptPrinterMethodDescription=Mètode potent amb molts paràmetres. Completament personalitzable amb plantilles. No es pot imprimir des del núvol.
 ByTerminal=Per terminal
-TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
+TakeposNumpadUsePaymentIcon=Utilitzeu la icona en lloc del text als botons de pagament del teclat numèric
 CashDeskRefNumberingModules=Mòdul de numeració per a vendes del Punt de Venda (POS)
 CashDeskGenericMaskCodes6 = <br>l'etiqueta <b>{TN}</b> s'utilitza per afegir el numero de terminal
 TakeposGroupSameProduct=Agrupa les mateixes línies de productes
 StartAParallelSale=Inicia una nova venda paral·lela
-ControlCashOpening=Control cash box at opening POS
+ControlCashOpening=Control de caixa en obrir el TPV
 CloseCashFence=Tanca el recompte d'efectiu
 CashReport=Informe d'efectiu
 MainPrinterToUse=Impressora principal a utilitzar
@@ -117,8 +117,9 @@ HideCategoryImages=Amaga les imatges de la categoria
 HideProductImages=Amaga les imatges del producte
 NumberOfLinesToShow=Nombre de línies d'imatges a mostrar
 DefineTablePlan=Definiu el pla de les taules
-GiftReceiptButton=Add a "Gift receipt" button
+GiftReceiptButton=Afegiu un botó "Rebut de regal"
 GiftReceipt=Rebut de regal
 ModuleReceiptPrinterMustBeEnabled=La impressora de recepció del mòdul deu haver estat habilitada primer
-AllowDelayedPayment=Allow delayed payment
-PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+AllowDelayedPayment=Permet un pagament retardat
+PrintPaymentMethodOnReceipts=Imprimeix el mètode de pagament en els tiquets/rebuts
+WeighingScale=Balança de pesatge
diff --git a/htdocs/langs/ca_ES/categories.lang b/htdocs/langs/ca_ES/categories.lang
index 4156e6c3977..900f42e763a 100644
--- a/htdocs/langs/ca_ES/categories.lang
+++ b/htdocs/langs/ca_ES/categories.lang
@@ -19,7 +19,7 @@ ProjectsCategoriesArea=Àrea d'etiquetes de projectes
 UsersCategoriesArea=Àrea d'etiquetes d'usuaris
 SubCats=Subcategories
 CatList=Llistat d'etiquetes
-NewCategory=Nova etiqueta
+NewCategory=Etiqueta nova
 ModifCat=Modifica l'etiqueta
 CatCreated=Etiqueta creada
 CreateCat=Crea etiqueta
@@ -81,10 +81,12 @@ CategoriesSetup=Configuració d'etiquetes
 CategorieRecursiv=Enllaça amb l'etiqueta mare automàticament
 CategorieRecursivHelp=Si l'opció està activada, quan afegiu un producte a una subcategoria, el producte també s’afegirà a la categoria pare.
 AddProductServiceIntoCategory=Afegir el següent producte/servei
+AddCustomerIntoCategory=Assigna la categoria al client
+AddSupplierIntoCategory=Assigna la categoria al proveïdor
 ShowCategory=Mostra etiqueta
 ByDefaultInList=Per defecte en el llistat
 ChooseCategory=Tria la categoria
-StocksCategoriesArea=Zona de categories de magatzems
-ActionCommCategoriesArea=Àrea d'etiquetes d'esdeveniments
-WebsitePagesCategoriesArea=Àrea de categories de Pàgines/Contenidors
+StocksCategoriesArea=Categories de magatzems
+ActionCommCategoriesArea=Categories d'esdeveniments
+WebsitePagesCategoriesArea=Categories de Pàgines/Contenidors
 UseOrOperatorForCategories=Us o operador per categories
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index 25f37badd76..1ed63965f27 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -5,13 +5,13 @@ SelectThirdParty=Seleccionar un tercer
 ConfirmDeleteCompany=Esteu segur de voler eliminar aquesta empresa i tota la informació dependent?
 DeleteContact=Eliminar un contacte
 ConfirmDeleteContact=Esteu segur de voler eliminar aquest contacte i tota la seva informació dependent?
-MenuNewThirdParty=Nou tercer
-MenuNewCustomer=Nou client
-MenuNewProspect=Nou client potencial
-MenuNewSupplier=Nou proveïdor
-MenuNewPrivateIndividual=Nou particular
-NewCompany=Nova empresa (client potencial, client, proveïdor)
-NewThirdParty=Nou tercer (client potencial, client, proveïdor)
+MenuNewThirdParty=Tercer nou
+MenuNewCustomer=Client nou
+MenuNewProspect=Client potencial nou
+MenuNewSupplier=Proveïdor nou
+MenuNewPrivateIndividual=Particular nou
+NewCompany=Empresa nova (client potencial, client, proveïdor)
+NewThirdParty=Tercer nou (client potencial, client, proveïdor)
 CreateDolibarrThirdPartySupplier=Crea un tercer (proveïdor)
 CreateThirdPartyOnly=Crea tercer
 CreateThirdPartyAndContact=Crea un tercer + un contacte fill
@@ -26,7 +26,7 @@ CompanyName=Raó social
 AliasNames=Àlies (nom comercial, marca, ...)
 AliasNameShort=Nom comercial
 Companies=Empreses
-CountryIsInEEC=Pais dins de la Comunitat Econòmica Europea
+CountryIsInEEC=El país es troba dins de la Comunitat Econòmica Europea
 PriceFormatInCurrentLanguage=Format de visualització de preus en l'idioma i la moneda actuals
 ThirdPartyName=Nom del tercer
 ThirdPartyEmail=Correu electrònic del tercer
@@ -60,9 +60,9 @@ StateCode=Codi Estat/Província
 StateShort=Estat
 Region=Regió
 Region-State=Regió - Estat
-Country=Pais
-CountryCode=Codi pais
-CountryId=Id pais
+Country=País
+CountryCode=Codi del país
+CountryId=Id. de país
 Phone=Telèfon
 PhoneShort=Telèfon
 Skype=Skype
@@ -124,7 +124,7 @@ ProfId1AT=CIF/NIF
 ProfId2AT=Núm. seguretat social
 ProfId3AT=CNAE
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=Número EORI
 ProfId6AT=-
 ProfId1AU=CIF/NIF
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=CIF/NIF
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=Número EORI
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=Número UID
 ProfId2CH=-
 ProfId3CH=CIF/NIF
 ProfId4CH=Num registre de comerç
-ProfId5CH=-
+ProfId5CH=Número EORI
 ProfId6CH=-
 ProfId1CL=CIF/NIF
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=CIF/NIF
 ProfId2DE=Núm. seguretat social
 ProfId3DE=CNAE
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=Número EORI
 ProfId6DE=-
 ProfId1ES=CIF/NIF
 ProfId2ES=Núm. seguretat social
 ProfId3ES=CNAE
 ProfId4ES=Núm. col·legiat
-ProfId5ES=-
+ProfId5ES=Número EORI
 ProfId6ES=-
 ProfId1FR=CIF/NIF
 ProfId2FR=Núm. seguretat social
 ProfId3FR=CNAE
 ProfId4FR=RCS/RM
-ProfId5FR=-
+ProfId5FR=Número EORI
 ProfId6FR=-
 ProfId1GB=Número registre
 ProfId2GB=-
@@ -198,11 +198,16 @@ ProfId3IN=CNAE
 ProfId4IN=Id prof. 4
 ProfId5IN=Id prof. 5
 ProfId6IN=-
-ProfId1LU=CIF/NIF (R.C.S. Luxembourg)
-ProfId2LU=Núm. seguretat social (Business permit)
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=Número EORI
+ProfId1LU=CIF/NIF (R.C.S. Luxemburg)
+ProfId2LU=Núm. S.S. (permís comercial)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=Número EORI
 ProfId6LU=-
 ProfId1MA=CIF/NIF
 ProfId2MA=Núm. seguretat social
@@ -220,13 +225,13 @@ ProfId1NL=Número KVK
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL=-
+ProfId5NL=Número EORI
 ProfId6NL=-
 ProfId1PT=CIF/NIF
 ProfId2PT=Núm. seguretat social
 ProfId3PT=CNAE
 ProfId4PT=Conservatori
-ProfId5PT=-
+ProfId5PT=Número EORI
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=CUI
 ProfId2RO=Núm. Enmatriculare
 ProfId3RO=CAEN
-ProfId4RO=-
-ProfId5RO=EUID
+ProfId4RO=EUID
+ProfId5RO=Número EORI
 ProfId6RO=-
 ProfId1RU=CIF/NIF
 ProfId2RU=Núm. seguretat social
@@ -339,8 +344,8 @@ NoContactForAnyOrderOrShipments=Aquest contacte no és un contacte per cap coman
 NoContactForAnyProposal=Aquest contacte no és contacte de cap pressupost
 NoContactForAnyContract=Aquest contacte no és contacte de cap contracte
 NoContactForAnyInvoice=Aquest contacte no és contacte de cap factura
-NewContact=Nou contacte
-NewContactAddress=Nou contacte/adreça
+NewContact=Contacte nou
+NewContactAddress=Contacte/Adreça nova
 MyContacts=Els meus contactes
 Capital=Capital
 CapitalOf=Capital de %s
@@ -350,10 +355,11 @@ VATIntraCheck=Verificar
 VATIntraCheckDesc=L'enllaç <b>%s</b> permet consultar el NIF intracomunitari al servei de control europeu. Es requereix accés a internet per a que el servei funcioni.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Verifica el NIF Intracomunitari a la web de la Comissió Europea
-VATIntraManualCheck=Podeu també fer una verificació manual a la web de la comisió europea <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=També podeu verificar-ho manualment al lloc web de la Comissió Europea <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Comprovació impossible. El servei de comprovació no és prestat pel país membre (%s).
 NorProspectNorCustomer=Ni client, ni client potencial
 JuridicalStatus=Tipus d'entitat legal
+Workforce=Força de treball
 Staff=Empleats
 ProspectLevelShort=Potencial
 ProspectLevel=Nivell de client potencial
@@ -397,7 +403,7 @@ NoDolibarrAccess=Sense accés d'usuari
 ExportDataset_company_1=Tercers (empreses/entitats/persones físiques) i propietats
 ExportDataset_company_2=Contactes i propietats
 ImportDataset_company_1=Usuaris i les seves propietats
-ImportDataset_company_2=Contactes/Adreces i camps adicionals
+ImportDataset_company_2=Contactes/Adreces i atributs addicionals de tercers
 ImportDataset_company_3=Comptes Bancaris de tercers
 ImportDataset_company_4=Tercers/Comercials (Assigna usuaris comercials / tercers)
 PriceLevel=Nivell de preus
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Condicions de pagament - Proveïdor
 PaymentTypeBoth=Tipus de pagament: client i proveïdor
 MulticurrencyUsed=Emprar Multidivisa
 MulticurrencyCurrency=Divisa
+InEEC=Europa (CEE)
+RestOfEurope=Resta d'Europa (CEE)
+OutOfEurope=Fora d’Europa (CEE)
+CurrentOutstandingBillLate=Factura pendent actual en retard
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Ves amb compte, en funció de la configuració del preu del producte, has de canviar de tercer abans d’afegir el producte al TPV.
diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index a12ab3ac428..7cd6406d3ff 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Mostra un registre al vostre Llibre Major amb
 SeePageForSetup=Veure el menú <a href="%s"> %s </a> per configurar-lo
 DepositsAreNotIncluded=- Les factures de bestreta no estan incloses
 DepositsAreIncluded=- Les factures de bestreta estan incloses
+LT1ReportByMonth=Informe RE per mes
+LT2ReportByMonth=Informe IRPF per mes
 LT1ReportByCustomers=Informe impost 2 per part de tercers
 LT2ReportByCustomers=Informe impost 3 per part de tercers
 LT1ReportByCustomersES=Informe de RE per tercers
 LT2ReportByCustomersES=Informe per tercer del IRPF
 VATReport=Informe d'IVA de vendes
 VATReportByPeriods=Informe d'impostos sobre vendes per període
+VATReportByMonth=Informe de l'impost sobre les vendes per mes
 VATReportByRates=Informe d'impostos sobre vendes per taxes
 VATReportByThirdParties=Informe d'impostos sobre vendes per tercers
 VATReportByCustomers=Informe d'IVA sobre vendes per client
@@ -234,7 +237,7 @@ ACCOUNTING_ACCOUNT_SUPPLIER_Desc=El compte comptable dedicat definit a la fitxa
 ConfirmCloneTax=Confirma el clonat d'un impost social / fiscal
 CloneTaxForNextMonth=Clonar-la pel pròxim mes
 SimpleReport=Informe simple
-AddExtraReport=Informes extra (afegeix informes de clients extrangers i nacionals)
+AddExtraReport=Informes addicionals (afegeix l'informe de clients nacionals i estrangers)
 OtherCountriesCustomersReport=Informe de clients estrangers
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Basat en les dues primeres lletres del CIF que són diferents del codi de país de la teva empresa
 SameCountryCustomersWithVAT=Informe de clients nacionals
diff --git a/htdocs/langs/ca_ES/cron.lang b/htdocs/langs/ca_ES/cron.lang
index f4acfe40121..c2771dd9a03 100644
--- a/htdocs/langs/ca_ES/cron.lang
+++ b/htdocs/langs/ca_ES/cron.lang
@@ -14,6 +14,7 @@ FileToLaunchCronJobs=Línia de comando per verificar i executar tasques cron qua
 CronExplainHowToRunUnix=A entorns Unix s'ha d'utilitzar la següent entrada crontab per executar la comanda cada 5 minuts
 CronExplainHowToRunWin=En l'entorn de Microsoft (tm) de Windows, podeu utilitzar les Eines de tasques programades per executar la línia de comandaments cada 5 minuts
 CronMethodDoesNotExists=La classe %s no conté cap mètode %s
+CronMethodNotAllowed=El mètode %s de la classe %s es troba a la llista negra de mètodes prohibits
 CronJobDefDesc=Els perfils de tasques programades es defineixen a la fitxa del mòdul descriptor. Quan s'activa el mòdul, es carreguen i estan disponibles per poder administrar les tasques des del menú d'eines d'administració %s.
 CronJobProfiles=Llista de perfils predefinits de tasques programades
 # Menu
@@ -27,9 +28,9 @@ CronDelete=Elimina les tasques programades
 CronConfirmDelete=Vols eliminar aquests treballs programats?
 CronExecute=Llança la tasca programada
 CronConfirmExecute=Esteu segur que voleu executar aquestes tasques programades ara?
-CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
+CronInfo=El mòdul de tasques programades permet programar tasques per executar-les automàticament. Les tasques també es poden iniciar manualment.
 CronTask=Tasca
-CronNone=Ningún
+CronNone=Cap
 CronDtStart=No abans
 CronDtEnd=No després
 CronDtNextLaunch=Propera execució
@@ -46,6 +47,7 @@ CronNbRun=Nº execucions
 CronMaxRun=Número màxim d'execucions
 CronEach=Tota (s)
 JobFinished=Tasques llançades i finalitzades
+Scheduled=Programat
 #Page card
 CronAdd= Afegir una tasca
 CronEvery=Executa cada tasca
@@ -56,7 +58,7 @@ CronNote=Nota
 CronFieldMandatory=El camp %s és obligatori
 CronErrEndDateStartDt=La data de fi no pot ser anterior a la d'inici
 StatusAtInstall=Estat a la instal·lació del mòdul
-CronStatusActiveBtn=Activar
+CronStatusActiveBtn=Programa-ho
 CronStatusInactiveBtn=Desactivar
 CronTaskInactive=Aquesta tasca es troba desactivada
 CronId=Id
diff --git a/htdocs/langs/ca_ES/dict.lang b/htdocs/langs/ca_ES/dict.lang
index 995f49b3bf3..00988d0d397 100644
--- a/htdocs/langs/ca_ES/dict.lang
+++ b/htdocs/langs/ca_ES/dict.lang
@@ -47,7 +47,7 @@ CountryBS=Bahames
 CountryBH=Bahrain
 CountryBD=Bangla Desh
 CountryBB=Barbade
-CountryBY=Biélorusia
+CountryBY=Bielorússia
 CountryBZ=Belize
 CountryBJ=Benín
 CountryBM=Bermudes
@@ -322,12 +322,12 @@ PaperFormatUSLETTER=Format carta EE. UU.
 PaperFormatUSLEGAL=Format legal EE. UU.
 PaperFormatUSEXECUTIVE=Format executiu EE. UU.
 PaperFormatUSLEDGER=Format tabloide
-PaperFormatCAP1=Format canadec P1
-PaperFormatCAP2=Format canadec P2
-PaperFormatCAP3=Format canadec P3
-PaperFormatCAP4=Format canadec P4
-PaperFormatCAP5=Format canadec P5
-PaperFormatCAP6=Format canadec P6
+PaperFormatCAP1=Format P1 Canadà
+PaperFormatCAP2=Format P2 Canadà
+PaperFormatCAP3=Format P3 Canadà
+PaperFormatCAP4=Format P4 Canadà
+PaperFormatCAP5=Format P5 Canadà
+PaperFormatCAP6=Format P6 Canadà
 #### Expense report categories ####
 ExpAutoCat=Cotxe
 ExpCycloCat=Ciclomotor
diff --git a/htdocs/langs/ca_ES/donations.lang b/htdocs/langs/ca_ES/donations.lang
index 56769cf9716..cd56b4d10af 100644
--- a/htdocs/langs/ca_ES/donations.lang
+++ b/htdocs/langs/ca_ES/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Crear una donació
 NewDonation=Nova donació
 DeleteADonation=Elimina una donació
 ConfirmDeleteADonation=Vols eliminar aquesta donació?
-ShowDonation=Mostrar donació
 PublicDonation=Donació pública
 DonationsArea=Àrea de donacions
 DonationStatusPromiseNotValidated=Promesa no validada
@@ -30,6 +29,6 @@ FreeTextOnDonations=Text lliure a mostrar a peu de pàgina
 FrenchOptions=Opcions per a França
 DONATION_ART200=Mostrar article 200 del CGI si s'està interessat
 DONATION_ART238=Mostrar article 238 del CGI si s'està interessat
-DONATION_ART885=Mostrar article 885 del CGI si s'està interssat
+DONATION_ART885=Mostra l’article 885 de CGI si us preocupa
 DonationPayment=Pagament de la donació
 DonationValidated=Donació %s validada
diff --git a/htdocs/langs/ca_ES/ecm.lang b/htdocs/langs/ca_ES/ecm.lang
index 424d1150489..f26824bcc38 100644
--- a/htdocs/langs/ca_ES/ecm.lang
+++ b/htdocs/langs/ca_ES/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Cercar per paraules clau
 ECMSearchByEntity=Cercar per objecte
 ECMSectionOfDocuments=Carpetes de documents
 ECMTypeAuto=Automàtic
-ECMDocsBySocialContributions=Documents relacionats als impostos varis
-ECMDocsByThirdParties=Documents associats a tercers
-ECMDocsByProposals=Documents associats a pressupostos
-ECMDocsByOrders=Documents associats a comandes
-ECMDocsByContracts=Documents associats a contractes
-ECMDocsByInvoices=Documents associats a factures
-ECMDocsByProducts=Documents enllaçats a productes
-ECMDocsByProjects=Documents enllaçats a projectes
-ECMDocsByUsers=Documents referents a usuaris
-ECMDocsByInterventions=Documents relacionats amb les intervencions
-ECMDocsByExpenseReports=Documents relacionats als informes de despeses
-ECMDocsByHolidays=Documents enllaçats a les vacances
-ECMDocsBySupplierProposals=Documents enllaçats a pressupostos de proveïdor
+ECMDocsBy=Documents enllaçats a %s
 ECMNoDirectoryYet=No s'ha creat carpeta
 ShowECMSection=Mostrar carpeta
 DeleteSection=Eliminació carpeta
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resincronitzar la llista de directoris
 HashOfFileContent=Resum matemàtic ("hash") del contingut del fitxer
 NoDirectoriesFound=No s'han trobat directoris
 FileNotYetIndexedInDatabase=Fitxer encara no indexat a la base de dades (intenteu pujant-lo de nou)
+ExtraFieldsEcmFiles=Atributs addicionals dels fitxers ECM
+ExtraFieldsEcmDirectories=Atributs addicionals dels directoris ECM
+ECMSetup=Configuració de l'ECM
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index 5a2ffeb9abf..520515f844c 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -5,6 +5,7 @@ NoErrorCommitIsDone=Sense errors, és vàlid
 # Errors
 ErrorButCommitIsDone=Errors trobats, però és vàlid malgrat tot
 ErrorBadEMail=Correu electrònic %s és incorrecte
+ErrorBadMXDomain=El correu electrònic %s sembla incorrecte (el domini no té cap registre MX vàlid)
 ErrorBadUrl=Url %s invàlida
 ErrorBadValueForParamNotAString=Valor incorrecte del paràmetre. Acostuma a passar quan falta la traducció.
 ErrorLoginAlreadyExists=El login %s ja existeix.
@@ -38,18 +39,18 @@ ErrorSupplierCodeAlreadyUsed=Codi de proveïdor ja utilitzat
 ErrorBadParameters=Paràmetres incorrectes
 ErrorWrongParameters=Falten paràmetres o són incorrectes
 ErrorBadValueForParameter=Valor incorrecte '%s' del paràmetre '%s'
-ErrorBadImageFormat=L'arxiu de la imatge no és un format suportat (El seu PHP no suporta les funciones de conversió d'aquest format d'imatge)
+ErrorBadImageFormat=El fitxer d'imatge no té un format compatible (el vostre PHP no admet funcions per convertir imatges d'aquest format)
 ErrorBadDateFormat=El valor '%s' té un format de data no reconegut
 ErrorWrongDate=La data no es correcta!
 ErrorFailedToWriteInDir=No es pot escriure a la carpeta %s
-ErrorFoundBadEmailInFile=Trobada sintaxi incorrecta en email a %s línies en fitxer (exemple linia %s amb email=%s)
+ErrorFoundBadEmailInFile=S'ha trobat una sintaxi incorrecta del correu electrònic per a les línies %s al fitxer (exemple de la línia %s amb email=%s)
 ErrorUserCannotBeDelete=No es pot eliminar l'usuari. És possible que estigui relacionat amb entitats de Dolibarr.
 ErrorFieldsRequired=No s'han indicat alguns camps obligatoris
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Error en la creació d'una carpeta. Comprovi que l'usuari del servidor web té drets d'escriptura en les carpetes de documents de Dolibarr. Si el paràmetre <b>safe_mode</b> està actiu en aquest PHP, Comproveu que els fitxers php dolibarr pertanyen a l'usuari del servidor web.
 ErrorNoMailDefinedForThisUser=E-Mail no definit per a aquest usuari
 ErrorFeatureNeedJavascript=Aquesta funcionalitat requereix javascript actiu per funcionar. Modifiqueu en configuració->entorn.
-ErrorTopMenuMustHaveAParentWithId0=Un menú del tipus 'Superior' no pot tenir un menú pare. Poseu 0 en l'ID pare o busqueu un menu del tipus 'Esquerra'
+ErrorTopMenuMustHaveAParentWithId0=Un menú del tipus 'Superior' no pot tenir un menú pare. Poseu 0 al menú pare o trieu un menú del tipus 'Esquerra'.
 ErrorLeftMenuMustHaveAParentId=Un menú del tipus 'Esquerra' ha de tenir un ID de pare
 ErrorFileNotFound=Arxiu no trobat (ruta incorrecta, permisos incorrectes o accés prohibit pel paràmetre openbasedir)
 ErrorDirNotFound=Directori <b>%s</b> no trobat (Ruta incorrecta, permisos inadequats o accés prohibit pel paràmetre PHP openbasedir o safe_mode)
@@ -64,7 +65,7 @@ ErrorFieldTooLong=El camp %s és massa llarg.
 ErrorSizeTooLongForIntType=Longitud del camp massa llarg per al tipus int (màxim %s xifres)
 ErrorSizeTooLongForVarcharType=Longitud del camp massa llarg per al tipus cadena (màxim %s xifres)
 ErrorNoValueForSelectType=Els valors de la llista han de ser indicats
-ErrorNoValueForCheckBoxType=Els valors de la llista de la casella de verificacó han de ser indicats
+ErrorNoValueForCheckBoxType=Empleneu el valor de la llista de caselles de selecció
 ErrorNoValueForRadioType=Els valors de la llista han de ser indicats
 ErrorBadFormatValueList=La llista de valors no pot tenir més d'una coma: <u>%s</u>, però necessita com a mínim una: clau,valor
 ErrorFieldCanNotContainSpecialCharacters=El camp <b> %s </b> no pot contenir caràcters especials.
@@ -187,7 +188,7 @@ ErrorWarehouseRequiredIntoShipmentLine=El magatzem és obligatori en la línia a
 ErrorFileMustHaveFormat=El fitxer té format %s
 ErrorFilenameCantStartWithDot=El nom de fitxer no pot començar amb un '.'
 ErrorSupplierCountryIsNotDefined=El país d'aquest proveïdor no està definit. Corregeix-lo primer.
-ErrorsThirdpartyMerge=No es poden combinar els dos registres. Petició cancelada.
+ErrorsThirdpartyMerge=No s'han pogut combinar els dos registres. Sol·licitud cancel·lada.
 ErrorStockIsNotEnoughToAddProductOnOrder=No hi ha suficient estoc del producte %s per afegir-ho en una nova comanda.
 ErrorStockIsNotEnoughToAddProductOnInvoice=No hi ha suficient estoc del producte %s per afegir-ho en una nova factura.
 ErrorStockIsNotEnoughToAddProductOnShipment=No hi ha suficient estoc del producte %s per afegir-ho en una nova entrega.
@@ -216,7 +217,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Heu de triar si l'article és un
 ErrorDiscountLargerThanRemainToPaySplitItBefore=El descompte que intenteu aplicar és més gran que el que queda per pagar. Dividiu el descompte en 2 descomptes menors abans.
 ErrorFileNotFoundWithSharedLink=No s'ha trobat el fitxer. Pot ser que la clau compartida s'hagi modificat o el fitxer s'hagi eliminat recentment.
 ErrorProductBarCodeAlreadyExists=El codi de barres de producte %s ja existeix en la referència d'un altre producte.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Tingueu en compte també que no és possible tenir un producte virtual amb auto increment/decrement de subproductes quan almenys un subproducte (o subproducte de subproductes) necessita un número de sèrie/lot.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Tingueu en compte també que no és possible l'ús de kits per augmentar/disminuir automàticament els subproductes quan almenys un subproducte (o subproducte de subproductes) necessita un número de sèrie/lot.
 ErrorDescRequiredForFreeProductLines=La descripció és obligatòria per a línies amb producte de lliure edició
 ErrorAPageWithThisNameOrAliasAlreadyExists=La pàgina / contenidor <strong> %s </strong> té el mateix nom o àlies alternatiu que el que intenta utilitzar
 ErrorDuringChartLoad=S'ha produït un error en carregar el gràfic de comptes. Si pocs comptes no s'han carregat, podeu introduir-los manualment.
@@ -240,9 +241,11 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No hi ha quantitat suficien
 ErrorOnlyOneFieldForGroupByIsPossible=Només és possible un camp per a "GROUP BY" -agrupar per- (els altres són descartats)
 ErrorTooManyDifferentValueForSelectedGroupBy=S'han trobat massa valors diferents (més que <b> %s </b>) per al camp "<b> %s </b>", de manera que no es pot utilitzar com a 'GROUP BY' per gràfics. El camp 'GROUP BY' s'ha suprimit. Pot ser que vulgueu utilitzar-ho com a eix X?
 ErrorReplaceStringEmpty=Error, la cadena a on fer la substitució és buida
-ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
-ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
-ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorProductNeedBatchNumber=Error, el producte '<b> %s </b>' necessita un número de lot/sèrie
+ErrorProductDoesNotNeedBatchNumber=Error, el producte '<b> %s </b>' no accepta un número de lot/sèrie
+ErrorFailedToReadObject=Error, no s'ha pogut llegir l'objecte del tipus <b> %s </b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, el paràmetre <b> %s </b> s'ha d'activar a <b>conf/conf.php<b> per permetre l'ús de la interfície de línia d'ordres pel programador de treball intern
+ErrorLoginDateValidity=Error, aquest inici de sessió està fora de l'interval de dates de validesa
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=El paràmetre PHP upload_max_filesize (%s) és superior al paràmetre PHP post_max_size (%s). No es tracta d’una configuració consistent.
 WarningPasswordSetWithNoAccount=S'ha indicat una contrasenya per aquest soci. En canvi, no s'ha creat cap compte d'usuari, de manera que aquesta contrasenya s'ha desat però no pot ser utilitzada per entrar a Dolibarr. Es pot utilitzar per un mòdul/interfície extern, però si no cal definir cap usuari i contrasenya per un soci, pots deshabilitar la opció "Gestiona l'entrada per tots els socis" des de la configuració del mòdul Socis. Si necessites gestionar una entrada sense contrasenya, pots mantenir aquest camp buit i permetre aquest avís. Nota: El correu electrònic es pot utilitzar per entrar si el soci està enllaçat a un usuarí
@@ -267,6 +270,9 @@ WarningYourLoginWasModifiedPleaseLogin=El teu login s'ha modificat. Per segureta
 WarningAnEntryAlreadyExistForTransKey=Ja existeix una entrada per la clau de traducció d'aquest idioma
 WarningNumberOfRecipientIsRestrictedInMassAction=Advertència: el nombre de destinataris diferents està limitat a <b> %s </b> quan s'utilitzen les accions massives a les llistes.
 WarningDateOfLineMustBeInExpenseReportRange=Advertència, la data de la línia no està dins del rang de l'informe de despeses
+WarningProjectDraft=El projecte encara està en mode esborrany. No oblidis validar-lo si tens previst utilitzar tasques.
 WarningProjectClosed=El projecte està tancat. Heu de tornar a obrir primer.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Algunes transaccions bancàries es van suprimir després que es generés el rebut que les conté. Per tant, el nombre de xecs i el total de rebuts poden diferir del nombre i el total a la llista.
-WarningFailedToAddFileIntoDatabaseIndex=Alerta, no s'ha pogut afegir l'entrada al fitxer a la taula d'índexs de base de dades ECM
+WarningFailedToAddFileIntoDatabaseIndex=Advertiment: no s'ha pogut afegir l'entrada de fitxer a la taula d'índex de la base de dades ECM
+WarningTheHiddenOptionIsOn=Advertiment, l'opció oculta <b> %s </b> està activada.
+WarningCreateSubAccounts=Atenció, no podeu crear directament un subcompte, heu de crear un tercer o un usuari i assignar-los un codi comptable per trobar-los en aquesta llista.
diff --git a/htdocs/langs/ca_ES/exports.lang b/htdocs/langs/ca_ES/exports.lang
index 36d1fc98567..5a0d95fcf7d 100644
--- a/htdocs/langs/ca_ES/exports.lang
+++ b/htdocs/langs/ca_ES/exports.lang
@@ -35,11 +35,11 @@ FormatedImportDesc2=El primer pas és triar el tipus de dades que voleu importar
 FormatedExport=Assistent d'exportació
 FormatedExportDesc1=Aquestes eines permeten l'exportació de dades personalitzades mitjançant un assistent, per ajudar-vos en el procés sense necessitat de coneixements tècnics.
 FormatedExportDesc2=El primer pas és triar un conjunt de dades predefinit, després els camps que voleu exportar i en quin ordre.
-FormatedExportDesc3=Quan es seleccionen les dades per exportar, podeu triar el format del fitxer de sortida.
+FormatedExportDesc3=Quan se seleccionen les dades per exportar, podeu triar el format del fitxer de sortida.
 Sheet=Fulla
 NoImportableData=Sense taules de dades importables (cap mòdul amb les definicions dels perfils d'importació està actiu)
 FileSuccessfullyBuilt=Fitxer generat
-SQLUsedForExport=Consulta SQL utilitzada per extreure dades
+SQLUsedForExport=Consulta SQL utilitzada per a extreure dades
 LineId=ID de línia
 LineLabel=Etiqueta de la línia
 LineDescription=Descripció de línia
@@ -85,7 +85,7 @@ ErrorMissingMandatoryValue=Les dades obligatòries estan buides al fitxer de cod
 TooMuchErrors=Encara hi ha 0xaek83365837f %s </b> altres línies d'origen amb errors, però la producció ha estat limitada.
 TooMuchWarnings=Encara hi ha <b> %s </b> altres línies d'origen amb advertències, però la producció ha estat limitada.
 EmptyLine=Línia en blanc
-CorrectErrorBeforeRunningImport=Tu <b> ha de </b> corregir tots els errors <b> abans de </b> executant la importació definitiva.
+CorrectErrorBeforeRunningImport=<b>Haureu de corregir</b> tots els errors <b>abans</b> d'executar la importació definitiva.
 FileWasImported=El fitxer s'ha importat amb el número d'importació <b>%s</b>.
 YouCanUseImportIdToFindRecord=Podeu trobar tots els registres importats a la vostra base de dades filtrant-vos al camp <b> import_key = '%s' </b>.
 NbOfLinesOK=Nombre de línies sense errors ni warnings: <b>%s</b>.
@@ -115,7 +115,7 @@ ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filtres per un any / mes / dia <br> YYY
 ExportNumericFilter=NNNNN filtra per un valor<br>NNNNN+NNNNN filtra sobre un rang de valors<br>< NNNN filtra per valors menors<br>> NNNNN filtra per valors majors
 ImportFromLine=Importa començant des del número de línia
 EndAtLineNb=Final en el número de línia
-ImportFromToLine=Interval límit (de - a). Per exemple per ometre les línies de les capçaleres.
+ImportFromToLine=Interval límit (Des de - Fins a). Per exemple per a ometre les línies de capçalera.
 SetThisValueTo2ToExcludeFirstLine=Per exemple, estableixi aquest valor a 3 per excloure les 2 primeres línies. <br> Si no s'ometen les línies de capçalera, això provocarà diversos errors en la simulació d'importació.
 KeepEmptyToGoToEndOfFile=Mantingueu aquest camp buit per processar totes les línies al final del fitxer.
 SelectPrimaryColumnsForUpdateAttempt=Seleccioneu les columnes que s'utilitzaran com a clau principal per a una importació UPDATE
diff --git a/htdocs/langs/ca_ES/holiday.lang b/htdocs/langs/ca_ES/holiday.lang
index 5cf4cb81bb3..e1143a0ae38 100644
--- a/htdocs/langs/ca_ES/holiday.lang
+++ b/htdocs/langs/ca_ES/holiday.lang
@@ -105,7 +105,7 @@ LEAVE_OTHER=Altres sortides
 LEAVE_PAID_FR=Vacances pagades
 ## Configuration du Module ##
 LastUpdateCP=Última actualització automàtica de reserva de dies lliures
-MonthOfLastMonthlyUpdate=Mes de la última actualització automàtica de reserva de dies lliures
+MonthOfLastMonthlyUpdate=Mes de l'última actualització automàtica de reserva de dies lliures
 UpdateConfCPOK=Actualització efectuada correctament.
 Module27130Name= Gestió de dies lliures
 Module27130Desc= Gestió de dies lliures
diff --git a/htdocs/langs/ca_ES/hrm.lang b/htdocs/langs/ca_ES/hrm.lang
index ad4ee4e00b6..2952d702637 100644
--- a/htdocs/langs/ca_ES/hrm.lang
+++ b/htdocs/langs/ca_ES/hrm.lang
@@ -3,7 +3,7 @@
 HRM_EMAIL_EXTERNAL_SERVICE=Correu electrònic per prevenir serveis externs HRM
 Establishments=Establiments
 Establishment=Establiment
-NewEstablishment=Nou establiment
+NewEstablishment=Establiment nou
 DeleteEstablishment=Elimina l'establiment
 ConfirmDeleteEstablishment=Vols eliminar aquest establiment?
 OpenEtablishment=Obre l'establiment
@@ -15,4 +15,5 @@ DictionaryFunction=HRM: llocs de treball
 # Module
 Employees=Empleats
 Employee=Empleat
-NewEmployee=Nou empleat
+NewEmployee=Empleat nou
+ListOfEmployees=Llistat d'empleats
diff --git a/htdocs/langs/ca_ES/install.lang b/htdocs/langs/ca_ES/install.lang
index fe7dcfae281..98b6efbeb16 100644
--- a/htdocs/langs/ca_ES/install.lang
+++ b/htdocs/langs/ca_ES/install.lang
@@ -8,24 +8,18 @@ ConfFileIsNotWritable=L'arxiu de configuració <b>%s</b> no és modificable. Com
 ConfFileIsWritable=L'arxiu <b>%s</b> és modificable.
 ConfFileMustBeAFileNotADir=El fitxer de configuració <b> %s</b> ha de ser un fitxer, no un directori.
 ConfFileReload=Actualització dels paràmetres del fitxer de configuració.
-PHPSupportSessions=Aquest PHP suporta sessions
 PHPSupportPOSTGETOk=Aquest PHP suporta bé les variables POST i GET.
 PHPSupportPOSTGETKo=És possible que aquest PHP no suport les variables POST i/o GET. Comproveu el paràmetre <b>variables_order</b> del php.ini.
-PHPSupportGD=Aquest PHP és compatible amb les funcions gràfiques GD.
-PHPSupportCurl=Aquest PHP suporta Curl.
-PHPSupportCalendar=Aquest PHP admet extensions de calendaris.
-PHPSupportUTF8=Aquest PHP és compatible amb les funcions UTF8.
-PHPSupportIntl=Aquest PHP admet funcions Intl.
-PHPSupportxDebug=Aquest PHP admet funcions de depuració extres.
+PHPSupportSessions=Aquest PHP suporta sessions
 PHPSupport=Aquest PHP admet les funcions %s.
 PHPMemoryOK=La seva memòria màxima de sessió PHP està definida a <b>%s</b>. Això hauria de ser suficient.
 PHPMemoryTooLow=La seva memòria màxima de sessió PHP està definida a <b>%s</b> bytes. Això és molt poc. Es recomana modificar el paràmetre <b>memory_limit</b> del seu arxiu <b> php.ini</b> a almenys <b>%s</b> octets.
 Recheck=Faci clic aquí per realitzar un test més exhaustiu
 ErrorPHPDoesNotSupportSessions=La vostra instal·lació de PHP no suporta sessions. Aquesta característica és necessària per permetre que Dolibarr funcioni. Comproveu la configuració de PHP i els permisos del directori de sessions.
 ErrorPHPDoesNotSupportGD=La vostra instal·lació de PHP no és compatible amb les funcions gràfiques de GD. No hi haurà gràfics disponibles.
-ErrorPHPDoesNotSupportCurl=La teva instal·lació PHP no soporta Curl.
+ErrorPHPDoesNotSupportCurl=La vostra instal·lació de PHP no admet Curl.
 ErrorPHPDoesNotSupportCalendar=La vostra instal·lació de PHP no admet extensions de calendari php.
-ErrorPHPDoesNotSupportUTF8=Aquest PHP no suporta les funcions UTF8. Resolgui el problema abans d'instal lar Dolibarr ja que no funcionarà correctamete.
+ErrorPHPDoesNotSupportUTF8=La vostra instal·lació de PHP no admet funcions UTF8. Dolibarr no pot funcionar correctament. Resoleu-ho abans d’instal·lar Dolibarr.
 ErrorPHPDoesNotSupportIntl=La vostra instal·lació de PHP no admet funcions Intl.
 ErrorPHPDoesNotSupportxDebug=La vostra instal·lació de PHP no admet funcions de depuració extres.
 ErrorPHPDoesNotSupport=La teva instal·lació PHP no admet funcions %s.
@@ -34,12 +28,12 @@ ErrorGoBackAndCorrectParameters=Torneu enrere i verifiqueu / corregiu els paràm
 ErrorWrongValueForParameter=Ha indicat potser un valor incorrecte per al paràmetre '%s'.
 ErrorFailedToCreateDatabase=Error en crear la base de dades '%s'.
 ErrorFailedToConnectToDatabase=Error de connexió a la base de dades '%s'.
-ErrorDatabaseVersionTooLow=Versió de la base de dades (%s) demasiado antigua. massa antiga. Es requereix versió %s o superior.
+ErrorDatabaseVersionTooLow=La versió de la base de dades (%s) és massa antiga. Cal la versió %s o superior.
 ErrorPHPVersionTooLow=Versió del PHP massa antiga. Es requereix versió %s o superior.
 ErrorConnectedButDatabaseNotFound=S'ha trobat una connexió amb el servidor però la base de dades '%s' no s'ha trobat.
 ErrorDatabaseAlreadyExists=La base de dades '%s' ja existeix.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Si la base de dades no existeix, torna enrera i activa l'opció "Crear base de dades"
-IfDatabaseExistsGoBackAndCheckCreate=Si la base de dades ja existeix, torna enrera i desactiva l'opció "Crear base de dades".
+IfDatabaseNotExistsGoBackAndUncheckCreate=Si la base de dades no existeix, torneu enrere i marqueu l'opció "Crea una base de dades".
+IfDatabaseExistsGoBackAndCheckCreate=Si la base de dades ja existeix, torneu enrere i desmarqueu l'opció "Crea una base de dades".
 WarningBrowserTooOld=La versió del navegador és massa antiga. És molt recomanable actualitzar el vostre navegador a una versió recent de Firefox, Chrome o Opera.
 PHPVersion=Versió PHP
 License=Llicència d'ús
@@ -143,7 +137,7 @@ LastStepDesc=<strong> Darrer pas </strong>: definiu aquí l'inici de sessió i l
 ActivateModule=Activació del mòdul %s
 ShowEditTechnicalParameters=Premi aquí per veure/editar els paràmetres tècnics (mode expert)
 WarningUpgrade=Advertència:\nHas realitzat una còpia de seguretat de la base de dades primer?\nAixò és molt recomanable. La pèrdua de dades (per exemple, errors en mysql versió 5.5.40 / 41/42/43) pot ser possible durant aquest procés, per la qual cosa és essencial fer un abocament complet de la vostra base de dades abans de començar qualsevol migració.\n\nFeu clic a Accepta per iniciar el procés de migració ...
-ErrorDatabaseVersionForbiddenForMigration=La versió de la vostra base de dades és %s. Té un error crític, fent possible la pèrdua de dades si realitzeu canvis estructurals a la vostra base de dades, tal com ho requereix el procés de migració. Per la seva raó, la migració no es permetrà fins que actualitzeu la vostra base de dades a una versió de capa (parcheada) (llista de versions de buggy conegudes: %s)
+ErrorDatabaseVersionForbiddenForMigration=La versió de la vostra base de dades és %s. Té un error crític, que fa possible la pèrdua de dades si feu canvis estructurals a la base de dades, tals com requereix el procés de migració. Per la seva raó, la migració no es permetrà fins que no actualitzeu la base de dades a una versió actualitzada (llista de versions conegudes amb errors: %s)
 KeepDefaultValuesWamp=Heu utilitzat l'assistent de configuració Dolibarr de DoliWamp, de manera que els valors proposats aquí ja estan optimitzats. Canvieu-los només si saps el que estàs fent.
 KeepDefaultValuesDeb=Heu utilitzat l'assistent de configuració Dolibarr des d'un paquet Linux (Ubuntu, Debian, Fedora ...), de manera que els valors proposats aquí ja estan optimitzats. Només s'ha d'introduir la contrasenya del propietari de la base de dades per crear. Canvieu altres paràmetres només si saps el que estàs fent.
 KeepDefaultValuesMamp=Heu utilitzat l'assistent de configuració Dolibarr de DoliMamp, de manera que els valors proposats aquí ja estan optimitzats. Canvieu-los només si saps el que estàs fent.
@@ -170,13 +164,13 @@ MigrationPaymentsNothingToUpdate=No hi ha més pagaments orfes que hagin de corr
 MigrationPaymentsNothingUpdatable=No hi ha més pagaments per corregir
 MigrationContractsUpdate=Actualització dels contractes sense detalls (gestió del contracte + detall de contracte)
 MigrationContractsNumberToUpdate=%s contracte(s) a actualitzar
-MigrationContractsLineCreation=Creació linia contracte per contracte Ref. %s
+MigrationContractsLineCreation=Crea una línia de contracte per referència del contracte %s
 MigrationContractsNothingToUpdate=No hi ha més contractes (vinculats a un producte) sense línies de detalls que hagin de corregir.
 MigrationContractsFieldDontExist=El camp fk_facture ja no existeix. Res a fer.
 MigrationContractsEmptyDatesUpdate=Actualització de les dades de contractes no indicades
 MigrationContractsEmptyDatesUpdateSuccess=La correcció de la data buida del contracte s'ha realitzat correctament
-MigrationContractsEmptyDatesNothingToUpdate=No hi ha més properes dates de contractes.
-MigrationContractsEmptyCreationDatesNothingToUpdate=No hi ha més properes dates de creació.
+MigrationContractsEmptyDatesNothingToUpdate=No hi ha data de contracte buida per corregir
+MigrationContractsEmptyCreationDatesNothingToUpdate=No hi ha data de creació del contracte per corregir
 MigrationContractsInvalidDatesUpdate=Actualització dades contracte incorrectes (per contractes amb detall en servei)
 MigrationContractsInvalidDateFix=Corregir contracte %s (data contracte=%s, Data posada en servei min=%s)
 MigrationContractsInvalidDatesNumber=%s contractes modificats
@@ -187,7 +181,7 @@ MigrationContractsIncoherentCreationDateNothingToUpdate=No hi ha més dades de c
 MigrationReopeningContracts=Reobertura dels contractes que tenen almenys un servei actiu no tancat
 MigrationReopenThisContract=Reobertura contracte %s
 MigrationReopenedContractsNumber=%s contractes modificats
-MigrationReopeningContractsNothingToUpdate=No hi ha més contractes que hagin de reobrirse.
+MigrationReopeningContractsNothingToUpdate=No hi ha contractes tancats per a obrir
 MigrationBankTransfertsUpdate=Actualitza l'enllaç entre el registre bancari i la transferència bancària
 MigrationBankTransfertsNothingToUpdate=Cap vincle desfasat
 MigrationShipmentOrderMatching=Actualitzar rebuts de lliurament
diff --git a/htdocs/langs/ca_ES/interventions.lang b/htdocs/langs/ca_ES/interventions.lang
index fb490a2f6a8..ec994e9dd8d 100644
--- a/htdocs/langs/ca_ES/interventions.lang
+++ b/htdocs/langs/ca_ES/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Durada de la línia de la intervenció
 InterLineDesc=Descripció de la línia de la intervenció
 RepeatableIntervention=Plantilla d’intervenció
 ToCreateAPredefinedIntervention=Per crear una intervenció predefinida o recurrent, creeu una intervenció comuna i convertiu-la en plantilla d'intervenció
+Reopen=Reobrir
+ConfirmReopenIntervention=Esteu segur que voleu tornar a obrir la intervenció <b> %s </b>?
diff --git a/htdocs/langs/ca_ES/intracommreport.lang b/htdocs/langs/ca_ES/intracommreport.lang
new file mode 100644
index 00000000000..aa236205499
--- /dev/null
+++ b/htdocs/langs/ca_ES/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Informe intracomm
+Module68000Desc = Gestió d’informes intracomm (suport per al format francès DEB/DES)
+IntracommReportSetup = Configuració del mòdul d'informes intracomm
+IntracommReportAbout = Quant a l'informe intracomm
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Número d'acord (lliurat per la CISD)
+INTRACOMMREPORT_TYPE_ACTEUR=Tipus d’actor
+INTRACOMMREPORT_ROLE_ACTEUR=Role jugat per l'actor
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Nivell d'obligacions de les introduccions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Nivell d'obligacions de les expedicions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Categoria de serveis de tipus "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Número de declarant
+
+# Menu
+MenuIntracommReport=Informe intracomm
+MenuIntracommReportNew=Nova declaració
+MenuIntracommReportList=Llistat
+
+# View
+NewDeclaration=Nova declaració
+Declaration=Declaració
+AnalysisPeriod=Període d’anàlisi
+TypeOfDeclaration=Tipus de declaració
+DEB=Declaració de canvi de mercaderies (DEB)
+DES=Declaració d'intercanvi de serveis (DES)
+
+# Export page
+IntracommReportTitle=Preparació d’un fitxer XML en format ProDouane
+
+# List
+IntracommReportList=Llista de declaracions generades
+IntracommReportNumber=Número de declaració
+IntracommReportPeriod=Període d'anàlisi
+IntracommReportTypeDeclaration=Tipus de declaració
+IntracommReportDownload=descarrega fitxer XML
+
+# Invoice
+IntracommReportTransportMode=Mode de transport
diff --git a/htdocs/langs/ca_ES/languages.lang b/htdocs/langs/ca_ES/languages.lang
index 4cd7b0a8c33..9d2b881f655 100644
--- a/htdocs/langs/ca_ES/languages.lang
+++ b/htdocs/langs/ca_ES/languages.lang
@@ -14,7 +14,7 @@ Language_da_DA=Danès
 Language_da_DK=Danès
 Language_de_DE=Alemany
 Language_de_AT=Alemany (Austria)
-Language_de_CH=Aleman (Switzerland)
+Language_de_CH=Alemany (Suïssa)
 Language_el_GR=Grec
 Language_el_CY=Grec (Xipre)
 Language_en_AU=Anglès (Australia)
@@ -40,6 +40,7 @@ Language_es_PA=Espanyol (Panamà)
 Language_es_PY=Espanyol (Paraguai)
 Language_es_PE=Espanyol (Perú)
 Language_es_PR=Espanyol (Puerto Rico)
+Language_es_US=Espanyol (EUA)
 Language_es_UY=Espanyol (Uruguai)
 Language_es_GT=Espanyol (Guatemala)
 Language_es_VE=Espanyol (Veneçuela)
@@ -55,7 +56,7 @@ Language_fr_CM=Francès (Camerun)
 Language_fr_FR=Francès
 Language_fr_GA=Francès (Gabon)
 Language_fr_NC=Francès (Nova Caledònia)
-Language_fr_SN=French (Senegal)
+Language_fr_SN=Francès (Senegal)
 Language_fy_NL=Frisian
 Language_gl_ES=Gallec
 Language_he_IL=Hebreu
diff --git a/htdocs/langs/ca_ES/loan.lang b/htdocs/langs/ca_ES/loan.lang
index 18f46dd529c..ce9fae18c7b 100644
--- a/htdocs/langs/ca_ES/loan.lang
+++ b/htdocs/langs/ca_ES/loan.lang
@@ -18,7 +18,7 @@ ConfirmDeleteLoan=Confirma la eliminació del préstec
 LoanDeleted=Préstec eliminat correctament
 ConfirmPayLoan=Confirma la classificació del préstec com a pagat
 LoanPaid=Préstec pagat
-ListLoanAssociatedProject=Llistat de prèstecs associats al projecte
+ListLoanAssociatedProject=Llista de préstecs associats al projecte
 AddLoan=Crea un préstec
 FinancialCommitment=Compromís financer
 InterestAmount=Interessos
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index f38f6109954..c970c1697f3 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -65,7 +65,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, cap tipus d'IVA definit per al paí
 ErrorNoSocialContributionForSellerCountry=Error, cap tipus d'impost varis definit per al país '%s'.
 ErrorFailedToSaveFile=Error, el registre del fitxer ha fallat.
 ErrorCannotAddThisParentWarehouse=Esteu intentant afegir un magatzem primari que ja és fill d'un mag    atzem existent
-MaxNbOfRecordPerPage=Número màxim de registres per pàgina
+MaxNbOfRecordPerPage=Màx. nombre de registres per pàgina
 NotAuthorized=No està autoritzat per fer-ho.
 SetDate=Indica la data
 SelectDate=Seleccioneu una data
@@ -83,14 +83,14 @@ FileTransferComplete=El(s) fitxer(s) s'han carregat correctament
 FilesDeleted=El(s) fitxer(s) s'han eliminat correctament
 FileWasNotUploaded=Un arxiu ha estat seleccionat per adjuntar, però encara no ha estat pujat. Feu clic a "Adjuntar aquest arxiu" per a això.
 NbOfEntries=Nº d'entrades
-GoToWikiHelpPage=Llegeix l'ajuda online (cal tenir accés a internet)
+GoToWikiHelpPage=Llegiu l'ajuda en línia (cal tenir accés a Internet)
 GoToHelpPage=Consultar l'ajuda
 RecordSaved=Registre guardat
 RecordDeleted=Registre eliminat
 RecordGenerated=Registre generat
 LevelOfFeature=Nivell de funcions
 NotDefined=No definida
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr està configurat en mode d'autenticació <b>%s</b> en el fitxer de configuració <b>conf.php</b>.<br> Això significa que la la contrasenya de la base de dades és externa a Dolibarr, per això tota modificació d'aquest camp pot resultar sense cap efecte.
+DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr està configurat en mode d'autenticació <b>%s</b> al fitxer de configuració <b>conf.php</b>.<br> Això significa que la contrasenya de la base de dades és externa a Dolibarr, de manera que canviar aquest camp pot no tenir cap efecte.
 Administrator=Administrador
 Undefined=No definit
 PasswordForgotten=Heu oblidat la contrasenya?
@@ -103,7 +103,7 @@ PreviousValue=Valor anterior
 ConnectedOnMultiCompany=Connexió a l'entitat
 ConnectedSince=Connectat des
 AuthenticationMode=Mode autentificació
-RequestedUrl=Url solicitada
+RequestedUrl=URL sol·licitada
 DatabaseTypeManager=Tipus de gestor de base de dades
 RequestLastAccessInError=Últimes peticions d'accés a la base de dades amb error
 ReturnCodeLastAccessInError=Retorna el codi per les últimes peticions d'accés a la base de dades amb error
@@ -155,6 +155,7 @@ RemoveLink=Elimina enllaç
 AddToDraft=Afegeix a esborrany
 Update=Modificar
 Close=Tancar
+CloseAs=Indica l'estat 
 CloseBox=Elimina el panell de la taula de control
 Confirm=Confirmar
 ConfirmSendCardByMail=Realment voleu enviar el contingut d'aquesta fitxa per correu a <b>%s</b>?
@@ -171,7 +172,7 @@ NotValidated=No validat
 Save=Desa
 SaveAs=Desa com
 SaveAndStay=Desa i continua
-SaveAndNew=Guardar i nou
+SaveAndNew=Desa i nou
 TestConnection=Provar la connexió
 ToClone=Copiar
 ConfirmCloneAsk=Esteu segur que voleu clonar l'objecte <b> %s </b>?
@@ -196,6 +197,7 @@ ReOpen=Reobrir
 Upload=Carrega
 ToLink=Enllaç
 Select=Seleccionar
+SelectAll=Selecciona-ho tot
 Choose=Escollir
 Resize=Redimensionar
 ResizeOrCrop=Canviar la mida o tallar
@@ -217,7 +219,7 @@ Parameters=Paràmetres
 Value=Valor
 PersonalValue=Valor personalitzat
 NewObject=Nou %s
-NewValue=Nou valor
+NewValue=Valor nou
 CurrentValue=Valor actual
 Code=Codi
 Type=Tipus
@@ -228,7 +230,7 @@ Title=Títol
 Label=Etiqueta
 RefOrLabel=Ref. o etiqueta
 Info=Log
-Family=Familia
+Family=Família
 Description=Descripció
 Designation=Descripció
 DescriptionOfLine=Descripció de línia
@@ -256,6 +258,7 @@ Cards=Fitxes
 Card=Fitxa
 Now=Ara
 HourStart=Hora d'inici
+Deadline=Data límit
 Date=Data
 DateAndHour=Data i hora
 DateToday=Data d'avui
@@ -264,8 +267,10 @@ DateStart=Data inicial
 DateEnd=Data final
 DateCreation=Data de creació
 DateCreationShort=Data creació
+IPCreation=IP de creació
 DateModification=Data modificació
 DateModificationShort=Data modif.
+IPModification=IP de modificació
 DateLastModification=Data de l'última modificació
 DateValidation=Data validació
 DateClosing=Data tancament
@@ -319,6 +324,7 @@ Morning=Demati
 Afternoon=Tarda
 Quadri=Trimestre
 MonthOfDay=Mes del dia
+DaysOfWeek=Dies de la setmana
 HourShort=H
 MinuteShort=Minut
 Rate=Tipus
@@ -356,7 +362,7 @@ Amount=Import
 AmountInvoice=Import factura
 AmountInvoiced=Import facturat
 AmountInvoicedHT=Import facturat (sense impostos)
-AmountInvoicedTTC=Amount invoiced (inc. tax)
+AmountInvoicedTTC=Import facturat (impostos inclosos)
 AmountPayment=Import pagament
 AmountHTShort=Import (exclòs)
 AmountTTCShort=Import
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Import de pagament, moneda original
 MulticurrencyAmountHT=Import (sense IVA), moneda original
 MulticurrencyAmountTTC=Import total, moneda original
 MulticurrencyAmountVAT=Import IVA, moneda original
+MulticurrencySubPrice=Import de subpreu multimoneda
 AmountLT1=Import Impost 2
 AmountLT2=Import Impost 3
 AmountLT1ES=Import RE
@@ -477,7 +484,7 @@ TotalDuration=Duració total
 Summary=Resum
 DolibarrStateBoard=Estadístiques de base de dades
 DolibarrWorkBoard=Elements oberts
-NoOpenedElementToProcess=No hi han elements oberts per processar
+NoOpenedElementToProcess=No hi ha elements oberts per processar
 Available=Disponible
 NotYetAvailable=Encara no disponible
 NotAvailable=No disponible
@@ -487,6 +494,7 @@ By=Per
 From=De
 FromDate=De
 FromLocation=De
+at=a
 to=a
 To=a
 and=i
@@ -509,6 +517,7 @@ Draft=Esborrany
 Drafts=Esborranys
 StatusInterInvoiced=Facturat
 Validated=Validat
+ValidatedToProduce=Validat (per produir)
 Opened=Actiu
 OpenAll=Obre (tot)
 ClosedAll=Tancat (tot)
@@ -616,10 +625,10 @@ Example=Exemple
 Examples=Exemples
 NoExample=Sense exemple
 FindBug=Avisa d'un error
-NbOfThirdParties=Número de tercers
-NbOfLines=Números de línies
+NbOfThirdParties=Nombre de tercers
+NbOfLines=Nombre de línies
 NbOfObjects=Nombre d'objectes
-NbOfObjectReferers=Número de registres relacionats
+NbOfObjectReferers=Nombre d'elements relacionats
 Referers=Registres relacionats
 TotalQuantity=Quantitat total
 DateFromTo=De %s a %s
@@ -655,6 +664,7 @@ Response=Resposta
 Priority=Prioritat
 SendByMail=Enviar per correu electrònic
 MailSentBy=Mail enviat per
+NotSent=No enviat
 TextUsedInTheMessageBody=Text utilitzat en el cos del missatge
 SendAcknowledgementByMail=Envia el correu electrònic de confirmació
 SendMail=Envia e-mail
@@ -668,7 +678,7 @@ FollowingConstantsWillBeSubstituted=Les següents constants seran substituïdes
 Refresh=Refrescar
 BackToList=Tornar al llistat
 BackToTree=Torna a l'arbre
-GoBack=Tornar enrera
+GoBack=Torna
 CanBeModifiedIfOk=Pot modificar-se si és vàlid
 CanBeModifiedIfKo=Pot modificar-se si no és vàlid
 ValueIsValid=Valor vàlid
@@ -700,7 +710,7 @@ Color=Color
 Documents=Documents
 Documents2=Documents
 UploadDisabled=Pujada desactivada
-MenuAccountancy=Comptabilitat bàsica
+MenuAccountancy=Comptabilitat
 MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Socis
@@ -726,7 +736,7 @@ RootOfMedias=Arrel dels mitjans públics (/medias)
 Informations=Informació
 Page=Pàgina
 Notes=Notes
-AddNewLine=Afegir nova línia
+AddNewLine=Afegeix una línia nova
 AddFile=Afegir arxiu
 FreeZone=Producte de text lliure
 FreeLineOfType=Element de text lliure, escriviu:
@@ -765,7 +775,7 @@ After=Després
 IPAddress=Adreça IP
 Frequency=Freqüència
 IM=Missatgeria instantània
-NewAttribute=Nou atribut
+NewAttribute=Atribut nou
 AttributeCode=Codi atribut
 URLPhoto=Url de la foto/logo
 SetLinkToAnotherThirdParty=Enllaça amb un altre tercer
@@ -828,14 +838,15 @@ PrintFile=%s arxius a imprimir
 ShowTransaction=Mostra la transacció en el compte bancari
 ShowIntervention=Mostrar intervenció
 ShowContract=Mostrar contracte
-GoIntoSetupToChangeLogo=Ves a Inici - Configuració - Empresa per canviar el logo o ves a Inici - Configuració - Entorn per ocultar-lo.
+GoIntoSetupToChangeLogo=Aneu a Inici - Configuració - Empresa per a canviar el logotip o aneu a Inici - Configuració - Entorn per a ocultar-lo.
 Deny=Denegar
-Denied=Denegad
+Denied=Denegat
 ListOf=Llista de %s
 ListOfTemplates=Llistat de plantilles
 Gender=Sexe
 Genderman=Home
 Genderwoman=Dona
+Genderother=Altres
 ViewList=Vista llistat
 ViewGantt=Vista Gantt
 ViewKanban=Vista de Kanban
@@ -845,7 +856,7 @@ GoodBye=A reveure
 Sincerely=Sincerament
 ConfirmDeleteObject=Esteu segur que voleu suprimir aquest objecte?
 DeleteLine=Elimina la línia
-ConfirmDeleteLine=Esteu segur de voler eliminar aquesta línia ?
+ConfirmDeleteLine=Esteu segur que voleu suprimir aquesta línia?
 ErrorPDFTkOutputFileNotFound=Error: el fitxer no s'ha generat. Comproveu que la comanda "pdftk" estigui instal·lada en un directori inclòs a la variable d'entorn $ PATH (només linux / unix) o poseu-vos en contacte amb l'administrador del vostre sistema.
 NoPDFAvailableForDocGenAmongChecked=No hi havia PDF disponibles per a la generació de document entre els registre comprovats
 TooManyRecordForMassAction=S'ha seleccionat massa registres per a l'acció massiva. L'acció està restringida a una llista de %s registres.
@@ -877,6 +888,8 @@ Miscellaneous=Diversos
 Calendar=Calendari
 GroupBy=Agrupat per...
 ViewFlatList=Veure llista plana
+ViewAccountList=Veure llibre major
+ViewSubAccountList=Vegeu el subcompte del llibre major
 RemoveString=Eliminar cadena '%s'
 SomeTranslationAreUncomplete=Alguns idiomes poden estar traduïts parcialment o poden tenir errors. Si detectes algun, pots corregir els fitxers d'idiomes registrant-te a <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Enllaç de descàrrega directa (públic/extern)
@@ -911,7 +924,7 @@ Lead=Oportunitat
 Leads=Oportunitats
 ListOpenLeads=Llistat oportunitats obertes
 ListOpenProjects=Llistat projectes oberts
-NewLeadOrProject=Nova oportunitat/projecte
+NewLeadOrProject=Oportunitat o projecte nou
 Rights=Permisos
 LineNb=Núm. línia
 IncotermLabel=Incoterms
@@ -957,7 +970,7 @@ nine=nou
 ten=deu
 eleven=onze
 twelve=dotze
-thirteen=setze
+thirteen=tretze
 fourteen=catorze
 fifteen=quinze
 sixteen=setze
@@ -994,7 +1007,7 @@ SearchIntoMembers=Socis
 SearchIntoUsers=Usuaris
 SearchIntoProductsOrServices=Productes o serveis
 SearchIntoProjects=Projectes
-SearchIntoMO=Comandes de Fabricació
+SearchIntoMO=Ordres de fabricació
 SearchIntoTasks=Tasques
 SearchIntoCustomerInvoices=Factures a clients
 SearchIntoSupplierInvoices=Factures del proveïdor
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Enviaments de client
 SearchIntoExpenseReports=Informes de despeses
 SearchIntoLeaves=Dies lliures
 SearchIntoTickets=Tiquets
+SearchIntoCustomerPayments=Pagaments dels clients
+SearchIntoVendorPayments=Pagaments a proveïdors
+SearchIntoMiscPayments=Pagaments varis
 CommentLink=Comentaris
 NbComments=Nombre de comentaris
 CommentPage=Espai de comentaris
@@ -1076,10 +1092,18 @@ NotUsedForThisCustomer=No s'utilitza per a aquest client
 AmountMustBePositive=L'import ha de ser positiu
 ByStatus=Per estat
 InformationMessage=Informació
-Used=Used
+Used=Usat
 ASAP=El més aviat possible
-CREATEInDolibarr=Record %s create
-MODIFYInDolibarr=Record %s modified
-DELETEInDolibarr=Record %s deleted
-VALIDATEInDolibarr=Record %s validated
-APPROVEDInDolibarr=Record %s approved
+CREATEInDolibarr=Registre %s creat
+MODIFYInDolibarr=Registre %s modificat
+DELETEInDolibarr=Registre %s eliminat
+VALIDATEInDolibarr=Registre %s validat
+APPROVEDInDolibarr=Registre %s aprovat
+DefaultMailModel=Model de correu predeterminat
+PublicVendorName=Nom públic del venedor
+DateOfBirth=Data de naixement
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=El testimoni de seguretat ha caducat, de manera que s'ha cancel·lat l'acció. Torneu-ho a provar.
+UpToDate=Actualitzat
+OutOfDate=Obsolet
+EventReminder=Recordatori d'esdeveniments
+UpdateForAllLines=Actualització per a totes les línies
diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
index 7f27a36f24c..f2a3b4f400b 100644
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@@ -19,14 +19,12 @@ MembersCards=Carnets de socis
 MembersList=Llistat de socis
 MembersListToValid=Llistat de socis esborrany (per validar)
 MembersListValid=Llistat de socis validats
-MembersListUpToDate=Llistat de socis vàlids amb quotes al dia
-MembersListNotUpToDate=Llistat de socis vàlids amb quotes pendents
+MembersListUpToDate=Llista de socis vàlids amb quotes al dia
+MembersListNotUpToDate=Llista de socis vàlids amb quotes pendents
 MembersListResiliated=Llista de socis donats de baixa
 MembersListQualified=Llistat de socis qualificats
 MenuMembersToValidate=Socis esborrany
 MenuMembersValidated=Socis validats
-MenuMembersUpToDate=Socis al dia
-MenuMembersNotUpToDate=Socis no al dia
 MenuMembersResiliated=Socis donats de baixa
 MembersWithSubscriptionToReceive=Socis amb afiliació per rebre
 MembersWithSubscriptionToReceiveShort=Subscripcions per rebre
@@ -34,6 +32,7 @@ DateSubscription=Data afiliació
 DateEndSubscription=Data final d'afiliació
 EndSubscription=Final d'afiliació
 SubscriptionId=ID d'afiliació
+WithoutSubscription=Sense afiliació
 MemberId=ID de soci
 NewMember=Nou soci
 MemberType=Tipus de soci
@@ -81,7 +80,7 @@ DeleteType=Elimina
 VoteAllowed=Vot autoritzat
 Physical=Físic
 Moral=Moral
-MorPhy=Caràcter
+MorAndPhy=Moral i físic
 Reenable=Reactivar
 ResiliateMember=Dona de baixa un soci
 ConfirmResiliateMember=Vols donar de baixa aquest soci?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=S'està enviant un correu electrònic amb la vali
 SendingEmailOnNewSubscription=S'està enviant un correu electrònic amb una nova subscripció
 SendingReminderForExpiredSubscription=S'està enviant un recordatori per les subscripcions caducades
 SendingEmailOnCancelation=Enviant correu electrònic de cancel·lació
+SendingReminderActionComm=Enviament de recordatori de l’esdeveniment de l’agenda
 # Topic of email templates
 YourMembershipRequestWasReceived=S'ha rebut la vostra subscripció.
 YourMembershipWasValidated=S'ha validat la vostra subscripció
@@ -167,6 +167,7 @@ MembersStatisticsByState=Estadístiques de socis per província
 MembersStatisticsByTown=Estadístiques de socis per població
 MembersStatisticsByRegion=Estadístiques de socis per regió
 NbOfMembers=Nombre de socis
+NbOfActiveMembers=Nombre de socis actius actuals
 NoValidatedMemberYet=No s'ha trobat cap soci validat
 MembersByCountryDesc=Aquesta pantalla presenta una estadística del nombre de socis per país. No obstant això, el gràfic utilitza el servei en línia de gràfics de Google i només és operatiu quan es troba disponible una connexió a Internet.
 MembersByStateDesc=Aquesta pantalla presenta una estadística del nombre de socis per província
@@ -176,6 +177,7 @@ MenuMembersStats=Estadístiques
 LastMemberDate=Data de l'últim soci
 LatestSubscriptionDate=Data de l'última afiliació
 MemberNature=Naturalesa del membre
+MembersNature=Naturalesa dels socis
 Public=Informació pública
 NewMemberbyWeb=S'ha afegit un nou soci. A l'espera d'aprovació
 NewMemberForm=Formulari d'inscripció
diff --git a/htdocs/langs/ca_ES/modulebuilder.lang b/htdocs/langs/ca_ES/modulebuilder.lang
index 7c607a0e6d3..59936812c4a 100644
--- a/htdocs/langs/ca_ES/modulebuilder.lang
+++ b/htdocs/langs/ca_ES/modulebuilder.lang
@@ -77,7 +77,7 @@ IsAMeasure=És una mesura
 DirScanned=Directori escanejat
 NoTrigger=Sense activador (trigger)
 NoWidget=Sense widget
-GoToApiExplorer=Ves a l'explorador de l'API
+GoToApiExplorer=Explorador d'API
 ListOfMenusEntries=Llista d'entrades de menú
 ListOfDictionariesEntries=Llista d'entrades de diccionaris
 ListOfPermissionsDefined=Llista de permisos definits
@@ -135,7 +135,7 @@ ShowOnCombobox=Mostra el valor en un combobox
 KeyForTooltip=Clau per donar més informació
 CSSClass=Classe CSS
 NotEditable=No editable
-ForeignKey=Clau forània
+ForeignKey=Clau forana
 TypeOfFieldsHelp=Tipus de camps: <br> varchar(99), double (24,8), real, text, html, datetime, timestamp, integer, integer:ClassName: relativepath/to/classfile.class.php[:1[:filter]] ('1' significa que afegim un botó + després del desplegable per crear el registre, 'filtre' pot ser 'status=1 AND fk_user=__USER_ID AND entity IN (__SHARED_ENTITIES__)' per exemple)
 AsciiToHtmlConverter=Convertidor Ascii a HTML
 AsciiToPdfConverter=Convertidor Ascii a PDF
diff --git a/htdocs/langs/ca_ES/mrp.lang b/htdocs/langs/ca_ES/mrp.lang
index b37b577475c..32ad23c0c3a 100644
--- a/htdocs/langs/ca_ES/mrp.lang
+++ b/htdocs/langs/ca_ES/mrp.lang
@@ -1,7 +1,7 @@
-Mrp=Comandes de Fabricació
-MO=Comanda de fabricació
-MOs=Manufacturing orders
-MRPDescription=Mòdul per gestionar ordres de producció i fabricació (MO).
+Mrp=Ordres de fabricació
+MOs=Ordres de fabricació
+ManufacturingOrder=Ordre de fabricació
+MRPDescription=Mòdul per gestionar Ordres de Fabricació o producció (OF).
 MRPArea=Àrea MRP
 MrpSetupPage=Configuració del mòdul MRP
 MenuBOM=Llistes de material
@@ -11,8 +11,8 @@ Bom=Llista de materials
 BillOfMaterials=Llista de material
 BOMsSetup=Configuració del mòdul BOM
 ListOfBOMs=Llista de factures de material - BOM
-ListOfManufacturingOrders=Llista de comandes de fabricació
-NewBOM=Nova llista de material
+ListOfManufacturingOrders=Llista d'ordres de fabricació
+NewBOM=Llista nova de material
 ProductBOMHelp=Producte a crear amb aquest BOM. <br> Nota: els productes amb la propietat &quot;Natura del producte&quot; = &quot;Matèria primera&quot; no són visibles a aquesta llista.
 BOMsNumberingModules=Plantilles de numeració BOM
 BOMsModelModule=Plantilles de document BOM
@@ -32,8 +32,8 @@ DeleteBillOfMaterials=Suprimeix la llista de materials
 DeleteMo=Eliminar Ordre de Fabricació
 ConfirmDeleteBillOfMaterials=Estàs segur que vols suprimir aquesta llista de material?
 ConfirmDeleteMo=Esteu segur que voleu suprimir aquesta factura de material?
-MenuMRP=Comandes de Fabricació
-NewMO=Nova comanda de fabricació
+MenuMRP=Ordres de fabricació
+NewMO=Ordre de fabricació nova
 QtyToProduce=Quantitat per produir
 DateStartPlannedMo=Data d’inici prevista
 DateEndPlannedMo=Data prevista de finalització
@@ -70,9 +70,11 @@ AutoCloseMO=Tancar automàticament l’Ordre de Fabricació si s’arriba a les
 NoStockChangeOnServices=Sense canvi d’estoc en serveis
 ProductQtyToConsumeByMO=Quantitat de producte que encara es pot consumir amb OP obertes
 ProductQtyToProduceByMO=Quantitat de producte que encara es pot produir mitjançant OP obertes
-AddNewConsumeLines=Afegiu una nova línia per consumir
+AddNewConsumeLines=Afegiu una línia nova per consumir
 ProductsToConsume=Productes a consumir
 ProductsToProduce=Productes a produir
 UnitCost=Cost unitari
 TotalCost=Cost total
 BOMTotalCost=El cost de produir aquesta Llista de materials en funció del cost de cada quantitat i producte a consumir (utilitza el preu de cost si està definit, altrament el preu mitjà ponderat si està definit, altrament el millor preu de compra)
+GoOnTabProductionToProduceFirst=Per tancar una Ordre de fabricació primer heu d'iniciar la producció (vegeu la pestanya '%s'). Però sí podeu cancel·lar-la.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Un kit no es pot utilitzar en una llista de material o en una OF
diff --git a/htdocs/langs/ca_ES/multicurrency.lang b/htdocs/langs/ca_ES/multicurrency.lang
index 9298dbc1819..65919bb8818 100644
--- a/htdocs/langs/ca_ES/multicurrency.lang
+++ b/htdocs/langs/ca_ES/multicurrency.lang
@@ -20,3 +20,19 @@ MulticurrencyPaymentAmount=Import de pagament, moneda original
 AmountToOthercurrency=Import (en la moneda del compte que rep)
 CurrencyRateSyncSucceed=La sincronització de tipus de monedes s'ha fet amb èxit
 MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Utilitzar la moneda del document per als pagaments en línia
+TabTitleMulticurrencyRate=Llista de canvis
+ListCurrencyRate=Llista de tipus de canvi de la moneda
+CreateRate=Crea un canvi
+FormCreateRate=Creació de canvis
+FormUpdateRate=Modificació de canvis
+successRateCreate=El canvi de la moneda %s s'ha afegit a la base de dades
+ConfirmDeleteLineRate=Esteu segur que voleu eliminar el canvi %s de la moneda %s amb data %s?
+DeleteLineRate=Neteja el canvi
+successRateDelete=S'ha suprimit el canvi
+errorRateDelete=S'ha produït un error en suprimir el canvi
+successUpdateRate=Modificació realitzada
+ErrorUpdateRate=Error en modificar el canvi
+Codemulticurrency=codi de moneda
+UpdateRate=modifica el canvi
+CancelUpdate=cancel·la
+NoEmptyRate=El camp de canvi no pot estar buit
diff --git a/htdocs/langs/ca_ES/opensurvey.lang b/htdocs/langs/ca_ES/opensurvey.lang
index 9ebf7cf1122..a2a57bd1d8f 100644
--- a/htdocs/langs/ca_ES/opensurvey.lang
+++ b/htdocs/langs/ca_ES/opensurvey.lang
@@ -2,7 +2,7 @@
 Survey=Enquesta
 Surveys=Enquestes
 OrganizeYourMeetingEasily=Organitza fàcilment les teves reunions i enquestes. Primer, selecciona el tipus d'enquesta...
-NewSurvey=Nova enquesta
+NewSurvey=Enquesta nova
 OpenSurveyArea=Àrea enquestes
 AddACommentForPoll=Pot afegir un comentari a  l'enquesta...
 AddComment=Afegir comentari
@@ -27,7 +27,7 @@ UrlForSurvey=URL per indicar l'accés directe a l'enquesta
 PollOnChoice=Està creant una enquesta amb múltiples opcions. Primer introdueixi totes les opcions possibles per aquesta enquesta:
 CreateSurveyDate=Crear una enquesta de data
 CreateSurveyStandard=Crear una enquesta estàndard
-CheckBox=Casella de verificació simple
+CheckBox=Casella de selecció simple
 YesNoList=Llista (buit/sí/no)
 PourContreList=Llista (buit/a favor/en contra)
 AddNewColumn=Afegir nova columna
@@ -53,7 +53,7 @@ SelectDayDesc=Per a cada dia seleccionat, pot triar, o no, les hores de reunió
 BackToCurrentMonth=Tornar al mes actual
 ErrorOpenSurveyFillFirstSection=No ha emplenat la primera secció de la creació de l'enquesta
 ErrorOpenSurveyOneChoice=Introdueixi almenys una opció
-ErrorInsertingComment=S'ha produït un error ha l'inserir el seu comentari
+ErrorInsertingComment=S'ha produït un error en inserir el comentari
 MoreChoices=Introdueixi més opcions pels votants
 SurveyExpiredInfo=L'enquesta s'ha tancat o el temps de votació s'ha acabat.
 EmailSomeoneVoted=%s ha emplenat una línia.\nPot trobar la seva enquesta en l'enllaç:\n%s
diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang
index 50e1cad8180..ff1877a88a0 100644
--- a/htdocs/langs/ca_ES/orders.lang
+++ b/htdocs/langs/ca_ES/orders.lang
@@ -151,7 +151,7 @@ NoOrdersToInvoice=Sense comandes facturables
 CloseProcessedOrdersAutomatically=Classificar automàticament com "Processades" les comandes seleccionades.
 OrderCreation=Creació comanda
 Ordered=Comandat
-OrderCreated=Les seves comandes han estat creats
+OrderCreated=Les vostres comandes s'han creat
 OrderFail=S'ha produït un error durant la creació de les seves comandes
 CreateOrders=Crear comandes
 ToBillSeveralOrderSelectCustomer=Per crear una factura per nombroses comandes, faci primer clic sobre el client i després esculli "%s".
diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang
index ac055c9738c..acae89147c1 100644
--- a/htdocs/langs/ca_ES/other.lang
+++ b/htdocs/langs/ca_ES/other.lang
@@ -5,8 +5,6 @@ Tools=Utilitats
 TMenuTools=Utilitats
 ToolsDesc=Totes les eines no incloses en altres entrades del menú s'agrupen aquí. <br> Es pot accedir a totes les eines a través del menú de l'esquerra.
 Birthday=Aniversari
-BirthdayDate=Data d'aniversari
-DateToBirth=Data de naixement
 BirthdayAlertOn=alerta aniversari activada
 BirthdayAlertOff=alerta aniversari desactivada
 TransKey=Traducció de la clau TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Mes anterior (número 1-12) de la data de la factura
 TextPreviousMonthOfInvoice=Mes anterior (text) de la data de la factura
 NextMonthOfInvoice=Mes següent (número 1-12) de la data de la factura
 TextNextMonthOfInvoice=Mes següent (text) de la data de la factura
+PreviousMonth=Mes anterior
+CurrentMonth=Mes actual
 ZipFileGeneratedInto=Fitxer Zip generat a <b>%s</b>.
 DocFileGeneratedInto=Fitxer del document generat a <b>%s</b>.
 JumpToLogin=Desconnectat. Aneu a la pàgina d'inici de sessió ...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hola)__\n\nTrobeu l'enviament __REF__ adjun
 PredefinedMailContentSendFichInter=__(Hola)__\n\nTrobeu la intervenció __REF__ adjunta\n\n\n__ (Atentament) __\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Podeu fer clic a l'enllaç següent per fer el pagament si encara no està fet.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Recordatori d'esdeveniments "__EVENT_LABEL__" el dia __EVENT_DATE__ a les __EVENT_TIME__ <br> <br> Aquest és un missatge automàtic, no respongueu.
 DemoDesc=Dolibarr és un ERP/CRM per a la gestió de negocis (professionals o associacions), compost de mòduls funcionals independents i opcionals. Una demostració que incloga tots aquests mòduls no té sentit perquè no utilitzarà tots els mòduls al mateix temps. Per això, hi han disponibles diferents tipus de perfils de demostració.
 ChooseYourDemoProfil=Selecciona el perfil de demo que cobreixi millor les teves necessitats...
 ChooseYourDemoProfilMore=o construeix el teu perfil<br>(selecció de mòduls manual)
@@ -188,7 +189,7 @@ NumberOfSupplierProposals=Nombre de propostes de venedor
 NumberOfSupplierOrders=Nombre de comandes de compra
 NumberOfSupplierInvoices=Nombre de factures de venedor
 NumberOfContracts=Nombre de contractes
-NumberOfMos=Nombre de comandes de fabricació
+NumberOfMos=Nombre d'ordres de fabricació
 NumberOfUnitsProposals=Número d'unitats en pressupostos
 NumberOfUnitsCustomerOrders=Nombre d'unitats per comandes de venda
 NumberOfUnitsCustomerInvoices=Número d'unitats en factures de client
@@ -196,7 +197,7 @@ NumberOfUnitsSupplierProposals=Nombre d'unitats en propostes de venedor
 NumberOfUnitsSupplierOrders=Nombre d'unitats en comandes de compra
 NumberOfUnitsSupplierInvoices=Nombre d'unitats a les factures del venedor
 NumberOfUnitsContracts=Nombre d’unitats en contractes
-NumberOfUnitsMos=Nombre d'unitats a produir en comandes de fabricació
+NumberOfUnitsMos=Nombre d'unitats a produir en ordres de fabricació
 EMailTextInterventionAddedContact=S'ha assignat una nova intervenció %s.
 EMailTextInterventionValidated=Fitxa intervenció %s validada
 EMailTextInvoiceValidated=La factura %s ha estat validada.
diff --git a/htdocs/langs/ca_ES/printing.lang b/htdocs/langs/ca_ES/printing.lang
index 253d8bd0374..5153bbd1514 100644
--- a/htdocs/langs/ca_ES/printing.lang
+++ b/htdocs/langs/ca_ES/printing.lang
@@ -7,7 +7,7 @@ MenuDirectPrinting=Treballs de impressió automàtica
 DirectPrint=Impressió automàtica
 PrintingDriverDesc=Configuració variables pel driver d'impressió
 ListDrivers=Llista de controladors
-PrintTestDesc=Llista de impressores
+PrintTestDesc=Llista d'impressores.
 FileWasSentToPrinter=L'arxiu %s ha sigut enviat a la impressora
 ViaModule=a través del mòdul
 NoActivePrintingModuleFound=No hi ha cap controlador d'impressió actiu. Comproveu la configuració del mòdul %s.
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index b588c475cf3..49bfe4daa99 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -104,24 +104,24 @@ SetDefaultBarcodeType=Indica el tipus de codi de barres
 BarcodeValue=Valor del codi de barres
 NoteNotVisibleOnBill=Nota (no visible en les factures, pressupostos, etc.)
 ServiceLimitedDuration=Si el servei és de durada limitada:
-FillWithLastServiceDates=Fill with last service line dates
+FillWithLastServiceDates=Emplena les dates de l'última línia de servei
 MultiPricesAbility=Segments de preus múltiples per producte / servei (cada client està en un segment de preus)
 MultiPricesNumPrices=Nº de preus
 DefaultPriceType=Base de preus per defecte (contra impostos) en afegir preus de venda nous
-AssociatedProductsAbility=Activa els productes virtuals (kits)
-AssociatedProducts=Productes virtuals
-AssociatedProductsNumber=Nº de productes que composen aquest producte
+AssociatedProductsAbility=Activa els kits (productes virtuals)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Número de productes que componen aquest kit
 ParentProductsNumber=Nº de productes que aquest compon
 ParentProducts=Productes pare
-IfZeroItIsNotAVirtualProduct=Si 0, aquest producte no és un producte virtual
-IfZeroItIsNotUsedByVirtualProduct=Si 0, aquest producte no està sent utilitzat per cap producte virtual
+IfZeroItIsNotAVirtualProduct=Si és 0, aquest producte no és un kit
+IfZeroItIsNotUsedByVirtualProduct=Si és 0, aquest producte no s'utilitza en cap kit
 KeywordFilter=Filtre per clau
 CategoryFilter=Filtre per categoria
 ProductToAddSearch=Cerca productes a afegir
 NoMatchFound=No s'han trobat resultats
 ListOfProductsServices=Llista de productes/serveis
-ProductAssociationList=Llista de productes/serveis que són component(s) d'aquest producte/kit virtual
-ProductParentList=Llistat de productes/serveis amb aquest producte com a component
+ProductAssociationList=Llista de productes/serveis que són components d’aquest kit
+ProductParentList=Llista de kits amb aquest producte com a component
 ErrorAssociationIsFatherOfThis=Un dels productes seleccionats és pare del producte en curs
 DeleteProduct=Eliminar un producte/servei
 ConfirmDeleteProduct=Esteu segur de voler eliminar aquest producte/servei?
@@ -277,7 +277,7 @@ ForceUpdateChildPriceSoc=Indica el mateix preu a les filials dels clients
 PriceByCustomerLog=Registre de preus de clients anteriors
 MinimumPriceLimit=El preu mínim no pot ser inferior a %s
 MinimumRecommendedPrice=El preu mínim recomenat es: %s
-PriceExpressionEditor=Editor de expresió de preus
+PriceExpressionEditor=Editor d'expressions de preus
 PriceExpressionSelected=Expressió de preus seleccionat
 PriceExpressionEditorHelp1="price = 2 + 2" o "2 + 2" per configurar un preu. Utilitzi ; per separar expresions
 PriceExpressionEditorHelp2=Pots accedir als atributs complementaris amb variables com <b>#extrafield_myextrafieldkey#</b> i variables globals amb <b>#global_mycode#</b>
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Valors globals disponibles:
 PriceMode=Mètode de preu
 PriceNumeric=Número
 DefaultPrice=Preu per defecte
+DefaultPriceLog=Registre de preus predeterminats anteriors
 ComposedProductIncDecStock=Incrementar/Disminueix estoc en canviar el seu pare
 ComposedProduct=Productes Fills
 MinSupplierPrice=Preu mínim de compra
@@ -304,7 +305,7 @@ GlobalVariableUpdaterHelpFormat0=Format per a la sol·licitud {"URL": "http://ex
 GlobalVariableUpdaterType1=Dades WebService
 GlobalVariableUpdaterHelp1=Analitza dades WebService de l'URL especificada, NS especifica el namespace, VALUE especifica l'ubicació del valor pertinent, DATA conter les dades a enviar i METHOD és el mètode WS a trucar
 GlobalVariableUpdaterHelpFormat1=El format per a la sol·licitud és {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}}
-UpdateInterval=Interval d'actualizació (minuts)
+UpdateInterval=Interval d'actualització (minuts)
 LastUpdated=Última actualització
 CorrectlyUpdated=Actualitzat correctament
 PropalMergePdfProductActualFile=Els fitxers utilitzats per afegir-se en el PDF Azur són
@@ -334,11 +335,12 @@ SubProduct=Subproducte
 ProductSheet=Fulla de producte
 ServiceSheet=Fulla de servei
 PossibleValues=Valors possibles
-GoOnMenuToCreateVairants=Anar al menu %s - %s per preparar variants de l'atribut (com colors, mides, etc...)
+GoOnMenuToCreateVairants=Aneu al menú %s - %s per preparar variants d’atributs (com ara colors, mida, ...)
 UseProductFournDesc=Afegeix una funció per definir les descripcions dels productes definits pels proveïdors, a més de les descripcions pels clients
 ProductSupplierDescription=Descripció del venedor del producte
 UseProductSupplierPackaging=Utilitzeu els envasos als preus del proveïdor (calcular les quantitats segons els envasos fixats al preu del proveïdor quan afegiu / actualitzeu la línia dels documents del proveïdor)
 PackagingForThisProduct=Embalatge
+PackagingForThisProductDesc=En fer la comanda del proveïdor, s'ordenarà automàticament aquesta quantitat (o un múltiple d’aquesta quantitat). No pot ser inferior a la quantitat mínima de compra
 QtyRecalculatedWithPackaging=La quantitat de la línia es recalcula segons els envasos del proveïdor
 
 #Attributes
@@ -349,7 +351,7 @@ ProductAttribute=Atribut de variant
 ProductAttributeDeleteDialog=Estàs segur de voler eliminar aquest atribut? Tots els valors seran esborrats
 ProductAttributeValueDeleteDialog=Està segur d'eliminar el valor "%s" amb referència "%s" d'aquest atribut?
 ProductCombinationDeleteDialog=Està segur d'eliminar la variant del producte "<strong>%s</strong>"?
-ProductCombinationAlreadyUsed=Ha ocorregut un error al eliminar la variant. Comprovi que no siga utilitzada per algun objecte
+ProductCombinationAlreadyUsed=S'ha produït un error en suprimir la variant. Comproveu que no s’utilitzi en cap objecte
 ProductCombinations=Variants
 PropagateVariant=Propaga variants
 HideProductCombinations=Ocultar les variants en el selector de productes
@@ -362,19 +364,19 @@ SelectCombination=Selecciona la combinació
 ProductCombinationGenerator=Generador de variants
 Features=Funcionalitats
 PriceImpact=Impacte en el preu
-ImpactOnPriceLevel=Impact on price level %s
-ApplyToAllPriceImpactLevel= Apply to all levels
-ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
+ImpactOnPriceLevel=Impacte en el nivell de preus %s
+ApplyToAllPriceImpactLevel= Aplica a tots els nivells
+ApplyToAllPriceImpactLevelHelp=En fer clic aquí, establireu el mateix impacte de preu en tots els nivells
 WeightImpact=Impacte en el pes
 NewProductAttribute=Nou atribut
 NewProductAttributeValue=Nou valor de l'atribut
 ErrorCreatingProductAttributeValue=Ha ocorregut un error al crear el valor de l'atribut. Això pot ser perque ja no existeixca un valor amb aquesta referència
 ProductCombinationGeneratorWarning=Si continua, abans de generar noves variants, totes les anteriors seran ELIMINADES. Les ja existents s'actualitzaran amb els nous valors
 TooMuchCombinationsWarning=Generar una gran quantitat de variants pot donar lloc a un ús de CPU alta, ús de memòria i que Dolibarr no siga capaç de crearles. Habilitar l'opció "%s" pot ajudar a reduir l'ús de memòria.
-DoNotRemovePreviousCombinations=No borrar variants prèvies
+DoNotRemovePreviousCombinations=No elimineu les variants anteriors
 UsePercentageVariations=Utilitzar variants percentuals
 PercentageVariation=Variant percentual
-ErrorDeletingGeneratedProducts=S'ha produït un error al intentar eliminar les variants existents
+ErrorDeletingGeneratedProducts=S'ha produït un error en intentar suprimir les variants de producte existents
 NbOfDifferentValues=Nombre de valors diferents
 NbProducts=Nombre de productes
 ParentProduct=Producte pare
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index b1ca69ba454..d7b36bb013a 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -76,11 +76,11 @@ MyActivities=Les meves tasques/activitats
 MyProjects=Els meus projectes
 MyProjectsArea=Àrea dels meus projectes
 DurationEffective=Durada efectiva
-ProgressDeclared=Progressió declarada
+ProgressDeclared=Progressió real declarada
 TaskProgressSummary=Progrés de la tasca
 CurentlyOpenedTasks=Tasques obertes actualment
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=El progrés declarat és menys %s que la progressió calculada
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=El progrés declarat és més %s que la progressió calculada
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=El progrés real declarat és menor %s que el progrés calculat
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=El progrés real declarat és major %s que el progrés calculat
 ProgressCalculated=Progressió calculada
 WhichIamLinkedTo=al qual estic vinculat
 WhichIamLinkedToProject=que estic vinculat al projecte
@@ -102,7 +102,7 @@ ListDonationsAssociatedProject=Llista de donacions relacionades amb el projecte
 ListVariousPaymentsAssociatedProject=Llista de pagaments diversos relacionats amb el projecte
 ListSalariesAssociatedProject=Llista de pagaments de sous relacionats amb el projecte
 ListActionsAssociatedProject=Llista d'esdeveniments relacionats amb el projecte
-ListMOAssociatedProject=Llista de comandes de fabricació relacionades amb el projecte
+ListMOAssociatedProject=Llista d'ordres de fabricació relacionades amb el projecte
 ListTaskTimeUserProject=Llistat del temps consumit en tasques d'aquest projecte
 ListTaskTimeForTask=Llista de temps consumit a la tasca
 ActivityOnProjectToday=Activitat en el projecte avui
@@ -187,7 +187,7 @@ PlannedWorkload=Càrrega de treball prevista
 PlannedWorkloadShort=Càrrega de treball
 ProjectReferers=Registres relacionats
 ProjectMustBeValidatedFirst=El projecte primer ha de ser validat
-FirstAddRessourceToAllocateTime=Assigna un recurs d'usuari com a contacte del projecte per assignar temps
+FirstAddRessourceToAllocateTime=Assigneu un recurs d'usuari com a contacte del projecte per a assignar temps
 InputPerDay=Entrada per dia
 InputPerWeek=Entrada per setmana
 InputPerMonth=Entrada per mes
@@ -202,7 +202,7 @@ TimeSpentBy=Temps gastat per
 TasksAssignedTo=Tasques assignades a
 AssignTaskToMe=Assignar-me una tasca
 AssignTaskToUser=Assigna una tasca a %s
-SelectTaskToAssign=Selecciona una tasca per assignar...
+SelectTaskToAssign=Selecciona la tasca per a assignar ...
 AssignTask=Assigna
 ProjectOverview=Informació general
 ManageTasks=Utilitzeu projectes per seguir les tasques i / o informar el temps dedicat (fulls de temps)
@@ -211,9 +211,9 @@ ProjectNbProjectByMonth=Nombre de projectes creats per mes
 ProjectNbTaskByMonth=Nº de tasques creades per mes
 ProjectOppAmountOfProjectsByMonth=Quantitat de clients potencials per mes
 ProjectWeightedOppAmountOfProjectsByMonth=Quantitat ponderada de clients potencials per mes
-ProjectOpenedProjectByOppStatus=Open project|lead by lead status
-ProjectsStatistics=Statistics on projects or leads
-TasksStatistics=Statistics on tasks of projects or leads
+ProjectOpenedProjectByOppStatus=Projecte obert | lead per l'estat de lead
+ProjectsStatistics=Estadístiques de projectes o leads
+TasksStatistics=Estadístiques de tasques de projectes o leads
 TaskAssignedToEnterTime=Tasca assignada. És possible entrar els temps en aquesta tasca.
 IdTaskTime=Id de temps de tasca
 YouCanCompleteRef=Si voleu completar la referència amb algun sufix, es recomana afegir un caràcter per separar-lo, de manera que la numeració automàtica encara funcionarà correctament per als propers projectes. Per exemple %s-MYSUFFIX
diff --git a/htdocs/langs/ca_ES/propal.lang b/htdocs/langs/ca_ES/propal.lang
index 10e222fa27b..b6b30391954 100644
--- a/htdocs/langs/ca_ES/propal.lang
+++ b/htdocs/langs/ca_ES/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Envia pressupost per e-mail
 DatePropal=Data pressupost
 DateEndPropal=Data fi validesa
 ValidityDuration=Durada de validesa
-CloseAs=Indica l'estat 
 SetAcceptedRefused=Indica acceptat/refusat
 ErrorPropalNotFound=Pressupost %s inexistent
 AddToDraftProposals=Afegir a pressupost esborrany
@@ -57,7 +56,7 @@ CreateEmptyPropal=Creeu una proposta comercial buida o des de la llista de produ
 DefaultProposalDurationValidity=Termini de validesa per defecte (en dies)
 UseCustomerContactAsPropalRecipientIfExist=Utilitzeu el contacte / adreça amb el tipus "proposta de seguiment de contacte" si es defineix en comptes de l'adreça de tercers com a adreça de destinatari de la proposta
 ConfirmClonePropal=Estàs segur que vols clonar la proposta comercial <b>%s</b>?
-ConfirmReOpenProp=Estàs segur que vols tornar a obrir la proposta comercial <b>%s</b>?
+ConfirmReOpenProp=Esteu segur que voleu tornar a obrir el pressupost <b>%s</b>?
 ProposalsAndProposalsLines=Pressupostos a clients i línies de pressupostos
 ProposalLine=Línia de pressupost
 AvailabilityPeriod=Temps de lliurament
@@ -85,3 +84,8 @@ ProposalCustomerSignature=Acceptació per escrit, segell de l'empresa, data i si
 ProposalsStatisticsSuppliers=Estadístiques de propostes de proveïdors
 CaseFollowedBy=Cas seguit per
 SignedOnly=Només signat
+IdProposal=ID del pressupost
+IdProduct=ID de producte
+PrParentLine=Línia de pressupost origen
+LineBuyPriceHT=Preu de compra sense impostos per línia
+
diff --git a/htdocs/langs/ca_ES/receiptprinter.lang b/htdocs/langs/ca_ES/receiptprinter.lang
index 4d88941b42b..d0aa69ce402 100644
--- a/htdocs/langs/ca_ES/receiptprinter.lang
+++ b/htdocs/langs/ca_ES/receiptprinter.lang
@@ -9,7 +9,7 @@ ReceiptPrinterDesc=Configuració d'impresora de tiquets
 ReceiptPrinterTemplateDesc=Configuració de plantilles
 ReceiptPrinterTypeDesc=Descripció del tipus d'impresora de tiquets
 ReceiptPrinterProfileDesc=Descripció del perfil d'impresora de tiquets
-ListPrinters=Llista de impressores
+ListPrinters=Llista d'impressores
 SetupReceiptTemplate=Configuració de plantilla
 CONNECTOR_DUMMY=Impressora de proves
 CONNECTOR_NETWORK_PRINT=Impresora en xarxa
diff --git a/htdocs/langs/ca_ES/recruitment.lang b/htdocs/langs/ca_ES/recruitment.lang
index 47d4fb8d555..538b7c54ea1 100644
--- a/htdocs/langs/ca_ES/recruitment.lang
+++ b/htdocs/langs/ca_ES/recruitment.lang
@@ -29,8 +29,8 @@ RecruitmentSetup = Configuració de la contractació
 Settings = Configuració
 RecruitmentSetupPage = Introduïu aquí la configuració de les opcions principals del mòdul de contractació
 RecruitmentArea=Àrea de contractació
-PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
-EnablePublicRecruitmentPages=Enable public pages of open jobs
+PublicInterfaceRecruitmentDesc=Les pàgines públiques de feines són URL públiques per a mostrar i respondre a feines actives. Hi ha un enllaç diferent per a cada treball actiu que es troba a cada registre de la feina.
+EnablePublicRecruitmentPages=Activa les pàgines públiques de treballs actius
 
 #
 # About page
@@ -45,26 +45,31 @@ DateExpected=Data prevista
 FutureManager=Futur gerent
 ResponsibleOfRecruitement=Responsable de la contractació
 IfJobIsLocatedAtAPartner=Si la feina es troba en l'espai del client
-PositionToBeFilled=Oferta de feina a emplenar
-PositionsToBeFilled=S'han d'omplir les ofertes de treball
-ListOfPositionsToBeFilled=Llista d’ofertes de treball a complir
-NewPositionToBeFilled=S'han d'omplir les noves ofertes de treball
+PositionToBeFilled=Càrrec laboral
+PositionsToBeFilled=Llocs de treball
+ListOfPositionsToBeFilled=Llista de llocs de treball
+NewPositionToBeFilled=Llocs de treball nous
 
-JobOfferToBeFilled=Oferta de feina a emplenar
+JobOfferToBeFilled=Lloc de treball a cobrir
 ThisIsInformationOnJobPosition=Informació del lloc de treball a ocupar
-ContactForRecruitment=Contacte per contractació
+ContactForRecruitment=Contacte per a la contractació
 EmailRecruiter=El reclutador de correu electrònic
 ToUseAGenericEmail=Per utilitzar un correu electrònic genèric. Si no està definit, s’utilitzarà el correu electrònic del responsable de la contractació
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
-RequestedRemuneration=Requested remuneration
-ProposedRemuneration=Proposed remuneration
-ContractProposed=Contract proposed
-ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
-JobPositions=Job positions
+NewCandidature=Candidatura nova
+ListOfCandidatures=Llista de candidatures
+RequestedRemuneration=Retribució sol·licitada
+ProposedRemuneration=Retribució proposada
+ContractProposed=Contracte proposat
+ContractSigned=Contracte signat
+ContractRefused=Contracte denegat
+RecruitmentCandidature=Candidatura
+JobPositions=Llocs de treball
 RecruitmentCandidatures=Candidatures
-InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+InterviewToDo=Entrevista per a fer
+AnswerCandidature=Resposta de la candidatura
+YourCandidature=La teva candidatura
+YourCandidatureAnswerMessage=Gràcies per la teva candidatura. <br> ...
+JobClosedTextCandidateFound=L’oferta de feina està tancada. El lloc s'ha cobert.
+JobClosedTextCanceled=L’oferta de feina està tancada.
+ExtrafieldsJobPosition=Atributs complementaris (llocs de treball)
+ExtrafieldsCandidatures=Atributs complementaris (sol·licituds de feina)
diff --git a/htdocs/langs/ca_ES/sendings.lang b/htdocs/langs/ca_ES/sendings.lang
index 8c1db79f157..421112e34da 100644
--- a/htdocs/langs/ca_ES/sendings.lang
+++ b/htdocs/langs/ca_ES/sendings.lang
@@ -58,13 +58,14 @@ ProductQtyInCustomersOrdersRunning=Quantitat de producte en comandes de venda ob
 ProductQtyInSuppliersOrdersRunning=Quantitat de producte en comandes de compra obertes
 ProductQtyInShipmentAlreadySent=Quantitat de producte de comandes de vendes obertes ja enviades
 ProductQtyInSuppliersShipmentAlreadyRecevied=Quantitat de producte de comandes de compra obertes ja rebudes
-NoProductToShipFoundIntoStock=No s'ha trobat cap producte per enviar en el magatzem <b>%s</b>. Corregeix l'estoc o torna enrera per triar un altre magatzem.
+NoProductToShipFoundIntoStock=No s'ha trobat cap producte per enviar al magatzem <b>%s</b>. Corregiu l'estoc o torneu enrere per triar un altre magatzem.
 WeightVolShort=Pes/Vol.
 ValidateOrderFirstBeforeShipment=S'ha de validar la comanda abans de fer expedicions.
 
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Model complet de nota de lliurament (logo...)
+DocumentModelStorm=Model de document més complet pels rebuts de lliurament i compatibilitat de camps extra (logotip ...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER no definida
 SumOfProductVolumes=Suma del volum dels productes
 SumOfProductWeights=Suma del pes dels productes
diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang
index 080bbfd1d2c..a567ac331f0 100644
--- a/htdocs/langs/ca_ES/stocks.lang
+++ b/htdocs/langs/ca_ES/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=ID de moviment %d
 ListMouvementStockProject=Llista de moviments d'estoc associats al projecte
 StocksArea=Àrea de magatzems
 AllWarehouses=Tots els magatzems
-IncludeEmptyDesiredStock=Incloure també estoc desitjat indefinit
+IncludeEmptyDesiredStock=Inclou també estoc negatives amb estoc desitjat no definit
 IncludeAlsoDraftOrders=Inclou també projectes d'ordre
 Location=Lloc
 LocationSummary=Nom curt del lloc
@@ -97,13 +97,13 @@ RealStockWillAutomaticallyWhen=L'estoc real es modificarà d'acord amb aquesta r
 VirtualStock=Estoc virtual
 VirtualStockAtDate=Estoc virtual a la data
 VirtualStockAtDateDesc=Estoc virtual un cop totes les comandes pendents que es preveu fer abans de la data finalitzin
-VirtualStockDesc=L’acció virtual és l’estoc calculat disponible disponible un cop tancades totes les accions obertes / pendents (que afectin a les existències) (comandes de compra rebudes, comandes de venda enviades, comandes de fabricació produïdes, etc.)
+VirtualStockDesc=L’estoc virtual és l’estoc disponible calculat un cop tancades (comandes de compra rebudes, comandes de venda enviades, ordres de fabricació produïdes, etc.) totes les accions obertes/pendents (que afecten a les existències)
 IdWarehouse=Id. magatzem
 DescWareHouse=Descripció magatzem
 LieuWareHouse=Localització magatzem
 WarehousesAndProducts=Magatzems i productes
 WarehousesAndProductsBatchDetail=Magatzems i productes (amb detalls per lot/serie)
-AverageUnitPricePMPShort=Valor (PMP)
+AverageUnitPricePMPShort=Preu mitjà ponderat
 AverageUnitPricePMPDesc=El preu unitari mitjà d’entrada que hem de pagar als proveïdors per incorporar el producte a les nostres existències.
 SellPriceMin=Preu de venda unitari
 EstimatedStockValueSellShort=Valor per vendre
@@ -122,8 +122,9 @@ DesiredStockDesc=Aquest import d'estoc serà el valor utilitzat per omplir l'est
 StockToBuy=A demanar
 Replenishment=Reaprovisionament
 ReplenishmentOrders=Ordres de reaprovisionament
-VirtualDiffersFromPhysical=Segons els augments i disminucions de l'estoc, pot diferir l'estoc físic i l'estoc virtual (físic + comandes actuals)
-UseVirtualStockByDefault=Utilitzar estoc virtual per defecte, en lloc d'estoc físic, per la funció d'aprovisionament
+VirtualDiffersFromPhysical=Segons si augmenten / disminueixen les opcions d'existències, les existències físiques i les virtuals (Existències físiques + comandes obertes) poden variar
+UseRealStockByDefault=Utilitza estoc real, en lloc d’estoc virtual, per a la funció de reposició
+ReplenishmentCalculation=La quantitat a demanar serà (quantitat desitjada - estoc real) en lloc de (quantitat desitjada - estoc virtual)
 UseVirtualStock=Utilitza estoc virtual
 UsePhysicalStock=Utilitzar estoc físic
 CurentSelectionMode=Mode de sel·leció actual
@@ -136,12 +137,12 @@ IncludeProductWithUndefinedAlerts = Incloure també estocs negatius per als prod
 WarehouseForStockDecrease=Per la disminució d'estoc s'utilitzara el magatzem <b>%s</b>
 WarehouseForStockIncrease=Pe l'increment d'estoc s'utilitzara el magatzem <b>%s</b>
 ForThisWarehouse=Per aquest magatzem
-ReplenishmentStatusDesc=Es tracta d'una llista de tots els productes amb una borsa menor que l'estoc desitjat (o inferior al valor d'alerta si la casella de verificació "només alerta" està marcada). Amb la casella de verificació, podeu crear comandes de compra per omplir la diferència.
+ReplenishmentStatusDesc=Aquesta és una llista de tots els productes amb un estoc inferior a l'estoc desitjat (o inferior al valor d'alerta si la casella de selecció "només alerta" està marcada). Amb la casella de selecció, podeu crear comandes de compra per suplir la diferència.
 ReplenishmentStatusDescPerWarehouse=Si voleu una reposició basada en la quantitat desitjada definida per magatzem, heu d’afegir un filtre al magatzem.
 ReplenishmentOrdersDesc=Aquesta és una llista de totes les comandes de compra oberta incloent productes predefinits. Només s'obren ordres amb productes predefinits, de manera que les comandes que poden afectar les existències, són visibles aquí.
 Replenishments=reaprovisionament
 NbOfProductBeforePeriod=Quantitat del producte %s en estoc abans del periode seleccionat (< %s)
-NbOfProductAfterPeriod=Quantitat del producte %s en estoc despres del periode seleccionat (> %s)
+NbOfProductAfterPeriod=Quantitat de producte %s en estoc després del període seleccionat (> %s)
 MassMovement=Moviments en massa
 SelectProductInAndOutWareHouse=Seleccioneu un magatzem d'origen i un magatzem destí, un producte i una quantitat i feu clic a "%s". Un cop fet això per a tots els moviments necessaris, feu clic a "%s".
 RecordMovement=Registre de transferència
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=Aquest producte ja està en llista
 SelectCategory=Filtre per categoria
 SelectFournisseur=Categoria del proveïdor
 inventoryOnDate=Inventari
-INVENTORY_DISABLE_VIRTUAL=Producte virtual (kit): no disminueixi l'estoc d'un producte secundari
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Utilitza el preu de compra si no es pot trobar l'últim preu de compra
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Els moviments d’estoc tindran la data de l'inventari (en lloc de la data de validació de l'inventari)
 inventoryChangePMPPermission=Permet canviar el valor PMP d'un producte
 ColumnNewPMP=Nova unitat PMP
@@ -231,12 +230,13 @@ StockIncrease=Augment d'estoc
 StockDecrease=Disminució d'estoc
 InventoryForASpecificWarehouse=Inventari d’un magatzem específic
 InventoryForASpecificProduct=Inventari d’un producte específic
-StockIsRequiredToChooseWhichLotToUse=Es requereix estoc per escollir el lot que cal fer servir
+StockIsRequiredToChooseWhichLotToUse=Es requereix estoc per a triar quin lot utilitzar
 ForceTo=Obligar a
 AlwaysShowFullArbo=Mostra l'arbre complet de magatzems a la finestra emergent dels enllaços de magatzem (Advertència: pot disminuir el rendiment de manera espectacular)
 StockAtDatePastDesc=Podeu veure aquí el valor (accions reals) en una data determinada en el passat
 StockAtDateFutureDesc=Podeu veure aquí l'estoc (accions virtuals) en una data determinada en endavant
 CurrentStock=Estoc actual
 InventoryRealQtyHelp=Estableix el valor a 0 per restablir qty <br> Mantenir el camp buit o suprimir la línia per mantenir-la sense canvis
-UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaning=Actualitza per escaneig
+UpdateByScaningProductBarcode=Actualització per escaneig (codi de barres de producte)
+UpdateByScaningLot=Actualització per escaneig (codi de barres lot|sèrie)
diff --git a/htdocs/langs/ca_ES/stripe.lang b/htdocs/langs/ca_ES/stripe.lang
index 19c57e1fe44..70f55a466e2 100644
--- a/htdocs/langs/ca_ES/stripe.lang
+++ b/htdocs/langs/ca_ES/stripe.lang
@@ -28,7 +28,6 @@ AccountParameter=Paràmetres del compte
 UsageParameter=Paràmetres d'ús
 InformationToFindParameters=Informació per trobar la seva configuració de compte %s
 STRIPE_CGI_URL_V2=URL CGI del mòdul Stripe per al pagament
-VendorName=Nom del venedor
 CSSUrlForPaymentForm=Url del full d'estil CSS per al formulari de pagament
 NewStripePaymentReceived=S'ha rebut un nou pagament de Stripe
 NewStripePaymentFailed=S'ha intentat el pagament de Stripe però, ha fallat
@@ -69,4 +68,4 @@ ToOfferALinkForTestWebhook=Enllaç a la configuració de Stripe WebHook per truc
 ToOfferALinkForLiveWebhook=Enllaç a la configuració de Stripe WebHook per trucar a l’IPN (mode en directe)
 PaymentWillBeRecordedForNextPeriod=El pagament es registrarà per al període següent.
 ClickHereToTryAgain=<a href="%s">Feu clic aquí per tornar-ho a provar ...</a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=A causa de les fortes regles d'autenticació de clients, la creació d'una targeta s'ha de fer des del panell de Stripe. Podeu fer clic aquí per activar el registre de clients de Stripe: %s
+CreationOfPaymentModeMustBeDoneFromStripeInterface=A causa de les fortes regles d'autenticació de clients, la creació d'una fitxa s'ha de fer des del panell de Stripe. Podeu fer clic aquí per a activar el registre de clients de Stripe: %s
diff --git a/htdocs/langs/ca_ES/suppliers.lang b/htdocs/langs/ca_ES/suppliers.lang
index 2c6d50ed7a0..51901172a7b 100644
--- a/htdocs/langs/ca_ES/suppliers.lang
+++ b/htdocs/langs/ca_ES/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Comandes de compra a facturar
 NbDaysToDelivery=Retard de lliurament (dies)
 DescNbDaysToDelivery=El retard de lliurament més llarg dels productes d'aquesta comanda
 SupplierReputation=Reputació del proveïdor
+ReferenceReputation=Reputació de referència
 DoNotOrderThisProductToThisSupplier=No demanar
 NotTheGoodQualitySupplier=Baixa qualitat
 ReputationForThisProduct=Reputació
diff --git a/htdocs/langs/ca_ES/ticket.lang b/htdocs/langs/ca_ES/ticket.lang
index 712924a9dbd..ee5f34745e3 100644
--- a/htdocs/langs/ca_ES/ticket.lang
+++ b/htdocs/langs/ca_ES/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Tiquet - Tipus
 TicketDictCategory=Tiquet - Grups
 TicketDictSeverity=Tiquet - Severitats
 TicketDictResolution=Tiquet - Resolució
-TicketTypeShortBUGSOFT=Disfunció de la lògica
-TicketTypeShortBUGHARD=Disfunció de matèries
-TicketTypeShortCOM=Qüestió comercial
 
+TicketTypeShortCOM=Qüestió comercial
 TicketTypeShortHELP=Sol·licitud d'ajuda funcional
 TicketTypeShortISSUE=Incidència, error o problema
 TicketTypeShortREQUEST=Sol·licitud de canvi o millora
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Altres
 TicketSeverityShortLOW=Baix
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Alt
-TicketSeverityShortBLOCKING=Crucial/Bloqueig
+TicketSeverityShortBLOCKING=Crític, bloqueig
 
 ErrorBadEmailAddress=Camp '%s' incorrecte
 MenuTicketMyAssign=Els meus tiquets
@@ -114,9 +112,9 @@ TicketsLogEnableEmail=Activa el 'log' (registre d'activitat) per correu electrò
 TicketsLogEnableEmailHelp=En cada canvi, s'enviarà un correu ** a cada contacte ** associat al tiquet.
 TicketParams=Paràmetres
 TicketsShowModuleLogo=Mostra el logotip del mòdul a la interfície pública
-TicketsShowModuleLogoHelp=Activeu aquesta opció per ocultar el mòdul de logotip a les pàgines de la interfície pública
+TicketsShowModuleLogoHelp=Activeu aquesta opció per a ocultar el mòdul de logotip a les pàgines de la interfície pública
 TicketsShowCompanyLogo=Mostra el logotip de l'empresa en la interfície pública
-TicketsShowCompanyLogoHelp=Activeu aquesta opció per ocultar el logotip de l'empresa principal a les pàgines de la interfície pública
+TicketsShowCompanyLogoHelp=Activeu aquesta opció per a ocultar el logotip de l'empresa principal a les pàgines de la interfície pública
 TicketsEmailAlsoSendToMainAddress=També envieu notificacions a l'adreça electrònica principal
 TicketsEmailAlsoSendToMainAddressHelp=Activar aquesta opció per enviar un correu electrònic a l'adreça "Correu electrònic de notificació procedent de" (consulteu la configuració a continuació)
 TicketsLimitViewAssignedOnly=Restringir la visualització als tiquets assignats a l'usuari actual (no és efectiu per als usuaris externs, sempre estarà limitat al tercer de qui depengui)
@@ -286,7 +284,7 @@ NumberOfTicketsByMonth=Nombre d’entrades mensuals
 NbOfTickets=Nombre d’entrades
 # notifications
 TicketNotificationEmailSubject=Tiquet %s actualitzat
-TicketNotificationEmailBody=Aquest és un missatge automàtic per notificar-vos que el tiquet %s acaba d'estar actualitzat
+TicketNotificationEmailBody=Aquest és un missatge automàtic per a notificar-vos que el tiquet %s s'acaba d'actualitzar
 TicketNotificationRecipient=Destinatari de la notificació
 TicketNotificationLogMessage=Missatges de 'log' (registre d'activitat)
 TicketNotificationEmailBodyInfosTrackUrlinternal=Veure el tiquet a la interfície
diff --git a/htdocs/langs/ca_ES/trips.lang b/htdocs/langs/ca_ES/trips.lang
index 09f7a3419ad..04c987be86f 100644
--- a/htdocs/langs/ca_ES/trips.lang
+++ b/htdocs/langs/ca_ES/trips.lang
@@ -91,7 +91,7 @@ DATE_SAVE=Data de validació
 DATE_CANCEL=Data de cancelació
 DATE_PAIEMENT=Data de pagament
 BROUILLONNER=Reobrir
-ExpenseReportRef=Ref del informe de despeses
+ExpenseReportRef=Ref. de l'informe de despeses
 ValidateAndSubmit=Validar i sotmetre a aprovació
 ValidatedWaitingApproval=Validat (pendent d'aprovació)
 NOT_AUTHOR=No ets l'autor d'aquest informe de despeses. L'operació s'ha cancelat.
@@ -110,7 +110,7 @@ ExpenseReportPayment=Informe de despeses pagades
 ExpenseReportsToApprove=Informes de despeses per aprovar
 ExpenseReportsToPay=Informes de despeses a pagar
 ConfirmCloneExpenseReport=Estàs segur de voler clonar aquest informe de despeses ?
-ExpenseReportsIk=Índex d'informes de despesa en quilometratge
+ExpenseReportsIk=Configuració de les despeses de quilometratge
 ExpenseReportsRules=Normes d'informe de despeses
 ExpenseReportIkDesc=Podeu modificar el càlcul de les despeses de quilometratge per categoria i abast, els quals s'han definit anteriorment. <b>d</b> és la distància en quilòmetres
 ExpenseReportRulesDesc=Podeu crear o actualitzar les regles del càlcul. Aquesta part s'utilitzarà quan l'usuari crei un nou informe de despeses
@@ -132,7 +132,7 @@ ExpenseReportLimitAmount=Import límit
 ExpenseReportRestrictive=Restrictiu
 AllExpenseReport=Tot tipus d'informe de despeses
 OnExpense=Línia de despesa
-ExpenseReportRuleSave=S'ha desat la regla del informe de despeses
+ExpenseReportRuleSave=S'ha desat la regla de l'informe de despeses
 ExpenseReportRuleErrorOnSave=Error: %s
 RangeNum=Rang %d
 ExpenseReportConstraintViolationError=Violació de restricció de ID  [%s]: %s és superior a %s %s
@@ -145,7 +145,7 @@ nolimitbyEX_DAY=per dia (sense límits)
 nolimitbyEX_MON=per mes (sense límits)
 nolimitbyEX_YEA=per any (sense límits)
 nolimitbyEX_EXP=per línia (sense límits)
-CarCategory=Categoria de cotxe
+CarCategory=Categoria de vehicles
 ExpenseRangeOffset=Quantitat d'offset: %s
 RangeIk=Rang de quilometratge
 AttachTheNewLineToTheDocument=Adjunta la línia a un document carregat
diff --git a/htdocs/langs/ca_ES/users.lang b/htdocs/langs/ca_ES/users.lang
index bc3479618ed..8ec96cdf243 100644
--- a/htdocs/langs/ca_ES/users.lang
+++ b/htdocs/langs/ca_ES/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Eliminar del grup
 PasswordChangedAndSentTo=Contrasenya canviada i enviada a <b>%s</b>.
 PasswordChangeRequest=Sol·licitud per canviar la contrasenya de <b>%s</b>
 PasswordChangeRequestSent=Petició de canvi de contrasenya per a <b>%s</b> enviada a <b>%s</b>.
+IfLoginExistPasswordRequestSent=Si aquest inici de sessió és un compte vàlid, s'ha enviat un correu electrònic per restablir la contrasenya.
+IfEmailExistPasswordRequestSent=Si aquest correu electrònic és un compte vàlid, s'ha enviat un correu electrònic per restablir la contrasenya.
 ConfirmPasswordReset=Confirma la restauració de la contrasenya
 MenuUsersAndGroups=Usuaris i grups
 LastGroupsCreated=Últims %s grups creats
@@ -70,9 +72,10 @@ ExportDataset_user_1=Usuaris i les seves propietats
 DomainUser=Usuari de domini
 Reactivate=Reactivar
 CreateInternalUserDesc=Aquest formulari us permet crear un usuari intern a la vostra empresa / organització. Per crear un usuari extern (client, proveïdor, etc.), utilitzeu el botó 'Crear usuari Dolibarr' de la targeta de contacte d'un tercer.
-InternalExternalDesc=Un usuari <b> intern </b> és un usuari que forma part de la vostra empresa/organització. <br> Un usuari <b> extern </b> és un client, proveïdor o un altre. La creació d’un usuari extern per a un tercer es pot fer des de la fitxa del contacte d’aquest tercer. <br> <br> En ambdós casos, els permisos defineixen privilegis d'acció a Dolibarr, també un usuari extern pot tenir un gestor de menús diferent de l'usuari intern (vegeu Inici - Configuració - Visualització)
+InternalExternalDesc=Un usuari <b> intern </b> és un usuari que forma part de la vostra empresa/organització. <br> Un usuari <b> extern </b> és un client, proveïdor o un altre (La creació d’un usuari extern per a un tercer es pot fer des de la fitxa del contacte d’aquest tercer). <br> <br> En ambdós casos, els permisos defineixen privilegis d'acció a Dolibarr, també un usuari extern pot tenir un gestor de menús diferent de l'usuari intern (vegeu Inici - Configuració - Visualització)
 PermissionInheritedFromAGroup=El permís es concedeix ja que ho hereta d'un grup al qual pertany l'usuari.
 Inherited=Heretat
+UserWillBe=L'usuari creat serà
 UserWillBeInternalUser=L'usuari creat serà un usuari intern (ja que no està lligat a un tercer en particular)
 UserWillBeExternalUser=L'usuari creat serà un usuari extern (ja que està lligat a un tercer en particular)
 IdPhoneCaller=ID trucant (telèfon)
@@ -109,8 +112,10 @@ UserAccountancyCode=Codi comptable de l'usuari
 UserLogoff=Usuari desconnectat
 UserLogged=Usuari connectat
 DateOfEmployment=Data de treball
-DateEmployment=Data d'inici de l'ocupació
+DateEmployment=Ocupació
+DateEmploymentstart=Data d'inici de l'ocupació
 DateEmploymentEnd=Data de finalització de l'ocupació
+RangeOfLoginValidity=Interval de dates de validesa d'inici de sessió
 CantDisableYourself=No podeu desactivar el vostre propi registre d'usuari
 ForceUserExpenseValidator=Validador de l'informe de despeses obligatori
 ForceUserHolidayValidator=Forçar validador de sol·licitud d'abandonament
diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang
index 5b5dac6c952..7adb65909be 100644
--- a/htdocs/langs/ca_ES/website.lang
+++ b/htdocs/langs/ca_ES/website.lang
@@ -31,15 +31,15 @@ AddWebsite=Afegir lloc web
 Webpage=Pàgina/contenidor web
 AddPage=Afegeix pàgina/contenidor
 HomePage=Pàgina d'inici
-PageContainer=Pàgina/contenidor
+PageContainer=Pàgina
 PreviewOfSiteNotYetAvailable=Vista prèvia del seu lloc web <strong>%s</strong> encara no està disponible. Primer ha de '<strong>Importar plantilla web</strong>' o sols '<strong>Afegir pàgina/contenidor</strong>'.
 RequestedPageHasNoContentYet=La pàgina sol·licitada amb l'identificador %s encara no té contingut, o el fitxer de memòria cau .tpl.php s'ha eliminat. Edita el contingut de la pàgina per solucionar-ho.
 SiteDeleted=Lloc web '%s' eliminat
 PageContent=Pàgina/Contenidor
 PageDeleted=Pàgina/Contenidor '%s' del lloc web %s eliminat
 PageAdded=Pàgina/Contenidor '%s' afegit
-ViewSiteInNewTab=Mostra el lloc en una nova pestanya
-ViewPageInNewTab=Mostra la pàgina en una nova pestanya
+ViewSiteInNewTab=Mostra el lloc en una pestanya nova
+ViewPageInNewTab=Mostra la pàgina en una pestanya nova
 SetAsHomePage=Indica com a Pàgina principal
 RealURL=URL real
 ViewWebsiteInProduction=Mostra la pàgina web utilitzant les URLs d'inici
@@ -66,7 +66,7 @@ ClonePage=Clona la pàgina/contenidor
 CloneSite=Clona el lloc
 SiteAdded=S'ha afegit el lloc web
 ConfirmClonePage=Introduïu el codi/àlies de la pàgina nova i si és una traducció de la pàgina clonada.
-PageIsANewTranslation=La nova pàgina és una traducció de la pàgina actual?
+PageIsANewTranslation=La pàgina nova és una traducció de la pàgina actual?
 LanguageMustNotBeSameThanClonedPage=Cloneu una pàgina com a una traducció. L'idioma de la nova pàgina ha de ser diferent del llenguatge de la pàgina d'origen.
 ParentPageId=ID de la pàgina pare
 WebsiteId=ID del lloc web
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Substitució realitzada  %s pàgines o contenidors
 RSSFeed=Fils RSS
 RSSFeedDesc=Podeu obtenir un feed RSS dels darrers articles amb el tipus "blogpost" mitjançant aquesta URL
 PagesRegenerated=%s pàgina (es) / contenidor (s) regenerada
+RegenerateWebsiteContent=Regenera els fitxers de memòria cau del lloc web
+AllowedInFrames=Es permet en marcs
diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang
index 76f4b8e84ae..6d70774d3ac 100644
--- a/htdocs/langs/ca_ES/withdrawals.lang
+++ b/htdocs/langs/ca_ES/withdrawals.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Pagaments per ordres de domiciliació bancària
+CustomersStandingOrdersArea=Cobraments per ordres de domiciliació bancària
 SuppliersStandingOrdersArea=Pagaments per transferència bancària
 StandingOrdersPayment=Ordres de cobrament per domiciliació
 StandingOrderPayment=Ordre de cobrament per domiciliació
@@ -18,8 +18,8 @@ WithdrawalsLine=Línia d'ordre de domiciliació
 CreditTransferLine=Línia de transferència bancària
 WithdrawalsLines=Línies d'ordre de domiciliació
 CreditTransferLines=Línies de transferència bancària
-RequestStandingOrderToTreat=Peticions per a processar ordres de pagament per domiciliació
-RequestStandingOrderTreated=Peticions processades d'ordres de pagament per domiciliació
+RequestStandingOrderToTreat=Peticions per a processar ordres de cobrament per domiciliació
+RequestStandingOrderTreated=Peticions processades d'ordres de cobrament per domiciliació
 RequestPaymentsByBankTransferToTreat=Peticions de transferència bancària a processar
 RequestPaymentsByBankTransferTreated=Peticions de transferència bancària processades
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Encara no és possible. L'estat de la domiciliació ter que ser 'abonada' abans de poder realitzar devolucions a les seves línies
@@ -31,7 +31,7 @@ InvoiceWaitingWithdraw=Factura esperant per domiciliació bancària
 InvoiceWaitingPaymentByBankTransfer=Factura en espera de transferència bancària
 AmountToWithdraw=Import a domiciliar
 NoInvoiceToWithdraw=No hi ha cap factura oberta per a '%s'. Vés a la fitxa "%s" de la targeta de factura per sol·licitar una sol·licitud.
-NoSupplierInvoiceToWithdraw=No hi ha cap factura de proveïdor pendent amb "sol·licituds de crèdit directe" obertes. Aneu a la pestanya "%s" de la fitxa de la factura per fer una sol·licitud.
+NoSupplierInvoiceToWithdraw=No hi ha cap factura de proveïdor pendent amb "sol·licituds de crèdit directe" obertes. Aneu a la pestanya "%s" de la fitxa de la factura per a fer una sol·licitud.
 ResponsibleUser=Usuari responsable
 WithdrawalsSetup=Configuració del pagament mitjançant domiciliació bancària
 CreditTransferSetup=Configuració de transferència bancària
diff --git a/htdocs/langs/ca_ES/workflow.lang b/htdocs/langs/ca_ES/workflow.lang
index dfbe8ee6172..0cbac959060 100644
--- a/htdocs/langs/ca_ES/workflow.lang
+++ b/htdocs/langs/ca_ES/workflow.lang
@@ -3,10 +3,10 @@ WorkflowSetup=Configuració del mòdul workflow
 WorkflowDesc=Aquest mòdul ofereix algunes accions automàtiques. Per defecte, el flux de treball està obert (podeu fer les coses en l'ordre que vulgueu), però aquí podeu activar algunes accions automàtiques.
 ThereIsNoWorkflowToModify=No hi ha modificacions disponibles del fluxe de treball amb els mòduls activats.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crea automàticament una comanda de client després d'haver signat un pressupost (la nova comanda tindrà el mateixa import que el pressupost)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crea automàticament una factura del client després d'haver signat un pressupost (la nova factura tindrà el mateixa import que el pressupost)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crea automàticament una comanda de client després de signar un pressupost (la nova comanda tindrà el mateix import que el pressupost)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crea automàticament una factura del client després de signar un pressupost (la nova factura tindrà el mateix import que el pressupost)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crear automàticament una factura a client després de validar un contracte
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crea automàticament una factura de client després de tancar una comanda de client (la nova factura tindrà el mateixa import que la comanda)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crea automàticament una factura de client després de tancar una comanda de client (la nova factura tindrà el mateix import que la comanda)
 # Autoclassify customer proposal or order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classifica el pressupost d'origen com a facturat quan la comanda del client es posi com a facturada (i si l'import de la comanda és igual a l'import total del pressupost signat vinculat)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classifica els pressupostos vinculats d'origen com a facturats quan la factura del client es validi (i si l'import de la factura és igual a l'import total dels pressupostos signats vinculats)
@@ -16,8 +16,8 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classifica les comandes vinculades
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classifica el pressupost de proveïdor vinculat com facturat quan la factura de proveïdor és validada (i si l'import de la factura és igual a l'import total del pressupost vinculat)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classifica la comanda de proveïdor vinculada com facturada quan la factura de proveïdor és validada (i si l'import de la factura és igual a l'import total de la comanda vinculada)
-descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+descWORKFLOW_BILL_ON_RECEPTION=Classifica les recepcions com a "facturades" quan es valida una comanda de proveïdor enllaçada
 # Autoclose intervention
-descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Tanca totes les intervencions vinculades quan es tanca un tiquet
 AutomaticCreation=Creació automàtica
 AutomaticClassification=Classificació automàtica
diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang
index d95720c9bfd..cc61eeb86f0 100644
--- a/htdocs/langs/cs_CZ/accountancy.lang
+++ b/htdocs/langs/cs_CZ/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Výchozí nastavení pro službu
 DefaultForProduct=Výchozí produkt
 CantSuggest=Nelze navrhnout
 AccountancySetupDoneFromAccountancyMenu=Většina nastavení účetnictví se provádí z nabídky %s
-ConfigAccountingExpert=Konfigurace modulu účetního experta
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Jurnálizace
-Journaux=Deníky
+Journals=Deníky
 JournalFinancial=Finanční deníky
 BackToChartofaccounts=Vrátit schéma účtů
 Chartofaccounts=Graf účtů
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Aktuální vyhrazený účet
 AssignDedicatedAccountingAccount=Nový účet, který chcete přiřadit
 InvoiceLabel=faktura štítek
@@ -33,8 +35,8 @@ OtherInfo=Jiná informace
 DeleteCptCategory=Odstraňte účetní účet ze skupiny
 ConfirmDeleteCptCategory=Opravdu chcete tento účtovací účet odstranit ze skupiny účetních účtů?
 JournalizationInLedgerStatus=Stav žurnalizace
-AlreadyInGeneralLedger=Již v deníku do hlavní knihy
-NotYetInGeneralLedger=Zatím nebyl zaznamenán v knihách
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Skupina je prázdná, zkontrolujte nastavení personalizované účetní skupiny
 DetailByAccount=Zobrazit detail podle účtu
 AccountWithNonZeroValues=Účty s nenulovými hodnotami
@@ -43,7 +45,9 @@ CountriesInEEC=Země v EHS
 CountriesNotInEEC=Země, které nejsou v EHS
 CountriesInEECExceptMe=Země v EHS kromě %s
 CountriesExceptMe=Všechny země kromě %s
-AccountantFiles=Exportní účetní doklady
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Hlavní účetní účetnictví pro zákazníky, které nejsou definovány v nastavení
 MainAccountForSuppliersNotDefined=Hlavní účty účetnictví pro dodavatele, které nejsou definovány v nastavení
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=KROK %s: Přidání nebo úprava stávajících trans
 
 AccountancyAreaDescClosePeriod=KROK %s: Zavřete období, takže nemůžeme v budoucnu provádět změny.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=Povinný krok v nastavení nebyl úplný (časopis pro účetní záznamy není definován pro všechny bankovní účty)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Vybrat aktivní účtové osnovy
 ChangeAndLoad=Změna a načtení
 Addanaccount=Přidat účetní účet
@@ -89,6 +93,8 @@ SubledgerAccount=Podřízený účet
 SubledgerAccountLabel=Označení podřízeného účtu
 ShowAccountingAccount=Zobrazit účetní účet
 ShowAccountingJournal=Zobrazit účetní deník
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Účetní účet navrhl
 MenuDefaultAccounts=výchozí účty
 MenuBankAccounts=Bankovní účty
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Záväzná zpráva o výdajích
 CreateMvts=Vytvořit novou transakci
 UpdateMvts=Modifikace transakce
 ValidTransaction=Ověřte transakci
-WriteBookKeeping=Zaregistrujte transakce v knize
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=účetní kniha
+BookkeepingSubAccount=Subledger
 AccountBalance=Zůstatek na účtu
 ObjectsRef=Zdrojový objekt ref
 CAHTF=Celkový prodejce před zdaněním
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Zakázat přímé nahrávání transakce v bankovním
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Povolit návrh exportu v žurnálu
 ACCOUNTANCY_COMBO_FOR_AUX=Povolit seznam combo pro pomocný účet (může být pomalý, pokud máte spoustu třetích stran)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Prodejní deník
 ACCOUNTING_PURCHASE_JOURNAL=Nákupní deník
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Čekající účet
 DONATION_ACCOUNTINGACCOUNT=Účtování účet registrovaných darů
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Účtovací účet pro registraci předplatného
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Účetní účet ve výchozím nastavení pro zakoupené produkty (používá se, pokud není definováno v produktovém listu)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Účetní účet ve výchozím nastavení u zakoupených produktů v EHS (používá se, pokud není definováno v produktovém listu)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Účetní účet ve výchozím nastavení pro nakoupené produkty a dovážený z EHS (používá se, pokud není definován v listu produktu)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Podle předdefinovaných skupin
 ByPersonalizedAccountGroups=Individuálními skupinami
 ByYear=Podle roku
 NotMatch=Nenastaveno
-DeleteMvt=Odstraňte řádky knihy
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Měsíc k odstranění
 DelYear=Odstrannění roku
 DelJournal=Journal, který chcete smazat
-ConfirmDeleteMvt=Tím vymažete všechny řádky knihy pro rok / měsíc a / nebo z konkrétního deníku (je vyžadováno alespoň jedno kritérium). Budete muset znovu použít funkci 'Registrace v účetnictví', aby se vymazaný záznam vrátil do knihy.
-ConfirmDeleteMvtPartial=Tímto bude smazána transakce z Ledger (všechny řádky související se stejnou transakcí budou smazány)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finanční deník
 ExpenseReportsJournal=Výdajové zprávy journal
 DescFinanceJournal=Finanční deník včetně všech typů plateb prostřednictvím bankovního účtu
-DescJournalOnlyBindedVisible=Toto je pohled na záznam, který je vázán na účet a může být zaznamenán do knihy.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Účet pro DPH není definován
 ThirdpartyAccountNotDefined=Účet subjektu není definován
 ProductAccountNotDefined=Účet pro výrobek není definován
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Tento deník se již používá
 AccountingAccountForSalesTaxAreDefinedInto=Poznámka: Účtovací účet pro daň z prodeje je definován v menu <b> %s </b> - <b> %s </b>
 NumberOfAccountancyEntries=Počet vstupů
 NumberOfAccountancyMovements=Počet pohybů
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Exportovat deník návrhu
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV konfigurovatelný
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export pro Sage 50 Švýcarsko
 Modelcsv_winfic=Exportovat Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Schéma Id účtů
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index 966a28af104..4a4c07061e4 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Odstranit zámek spojení
 YourSession=Vaše relace
 Sessions=Uživatelské relace
 WebUserGroup=Web server uživatel / skupina
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Nastavení Vašeho PHP Vám neumožňuje výpis aktivních relací. Složka sloužící k uložení relací <b>(%s)</b> může být chráněna (např. nastavením oprávnění OS nebo PHP open_basedir).
 DBStoringCharset=Znaková sada pro databázi s daty
 DBSortingCharset=Znaková sada pro řazení databáze s daty
@@ -71,7 +73,7 @@ DisableJavascriptNote=Poznámka: Pro účely testování nebo ladění. Pro opti
 UseSearchToSelectCompanyTooltip=Také, pokud máte velký počet subjektů (> 100 000), můžete zvýšit rychlost nastavením konstantní COMPANY_DONOTSEARCH_ANYWHERE 1 v Setup-> Ostatní. Vyhledávání pak bude omezena na začátek řetězce.
 UseSearchToSelectContactTooltip=Také, pokud máte velký počet subjektů (> 100 000), můžete zvýšit rychlost nastavením konstantní CONTACT_DONOTSEARCH_ANYWHERE 1 v Setup-> Ostatní. Vyhledávání pak bude omezena na začátek řetězce.
 DelaiedFullListToSelectCompany=Počkejte, dokud nebude stisknuto tlačítko před vložením obsahu seznamu combo. <br> To může zvýšit výkon, pokud máte velký počet subjektů, ale je to méně výhodné.
-DelaiedFullListToSelectContact=Před vložením obsahu seznamu kontaktů do seznamu kontaktů počkejte, dokud nebude stisknuto tlačítko. <br> To může zvýšit výkon, pokud máte velký počet kontaktů, ale je méně vhodný)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Počet znaků pro vyhledávání: %s
 NumberOfBytes=Počet bytů
 SearchString=Vyhledávací řetězec
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=Na dokumentu subjektu si může vybrat proj
 JavascriptDisabled=JavaScript zablokován
 UsePreviewTabs=Použijte náhled
 ShowPreview=Zobrazit náhled
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Náhled není k dispozici
 ThemeCurrentlyActive=Téma aktivní
 CurrentTimeZone=Časové pásmo PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Výpovědní lhůta
 NewByMonth=Nově měsíčně
 Emails=Emaily
 EMailsSetup=Nastavení emailů
-EMailsDesc=Tato stránka vám umožňuje předcházet výchozí parametry PHP pro odesílání e-mailů. Ve většině případů v systému Unix / Linux je nastavení PHP správné a tyto parametry jsou zbytečné.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Profily odesílatelů e-mailů
 EMailsSenderProfileDesc=Tuto sekci můžete ponechat prázdnou. Pokud sem zadáte nějaké e-maily, budou při psaní nového e-mailu přidány do seznamu možných odesílatelů do combo boxu.
 MAIN_MAIL_SMTP_PORT=SMTP / SMTPS Port (Výchozí nastavení v php.ini:  <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=ID SMTP (pokud odesílající server vyžaduje ověření)
 MAIN_MAIL_SMTPS_PW=Heslo SMTP (pokud server pro odesílání vyžaduje ověření)
 MAIN_MAIL_EMAIL_TLS=Používejte šifrování TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Použít TLS (STARTTLS) šifrování
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Pomocí DKIM generujte podpis elektronické pošty
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=E-mailová doména pro použití s dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Název selektoru dkim
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Pokud ponecháte toto pole prázdné, znamená to, 
 ExtrafieldParamHelpselect=Seznam hodnot musí být řádky s formátovým klíčem, hodnota (kde klíč nemůže být '0') <br> <br> například: <br> 1, value1 <br> 2, value2 <br> code3, value3 <br> ... <br> <br> seznam v závislosti na dalším doplňkovém seznamu atributů: <br> 1, value1 | options_ <i> parent_list_code </i>: parent_key <br> 2, value2 | options_ <i> parent_list_code </i>: parent_key <br> <br> Chcete-li mít seznam v závislosti na jiném seznamu: <br> 1, hodnota1 | <i> parent_list_code </i>: parent_key <br> 2, hodnota2 | <i> parent_list_code </i>: parent_key
 ExtrafieldParamHelpcheckbox=Seznam hodnot musí být řádky s formátovým klíčem, hodnota (kde klíč nemůže být '0') <br> <br> například: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
 ExtrafieldParamHelpradio=Seznam hodnot musí být řádky s formátovým klíčem, hodnota (kde klíč nemůže být '0') <br> <br> například: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
-ExtrafieldParamHelpsellist=Seznam hodnot pochází z tabulky <br> Syntaxe: table_name: label_field: id_field :: filter <br> Příklad: c_typent: libelle: id :: filter <br> <br> - idfilter je nutně primární int klíč <br> - filtr může být jednoduchý test = 1) pro zobrazení pouze aktivní hodnoty <br> Můžete také použít $ ID $ ve filtru, který je aktuálním id aktuálního objektu <br> Chcete-li provést SELECT ve filtru, použijte $ SEL $ <br>, pokud chcete filtrovat na extrafields použít syntaxi extra.fieldcode = ... (kde kód pole je kód extrafield) <br> <br> Aby byl seznam v závislosti na jiném seznamu doplňkových atributů: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> Aby bylo možné mít seznam v závislosti na jiném seznamu: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filtr
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Seznam hodnot pochází z tabulky <br> Syntaxe: table_name: label_field: id_field :: filter <br> Příklad: c_typent: libelle: id :: filter <br> <br> filtr může být jednoduchý test (např. Aktivní = 1) pro zobrazení pouze aktivní hodnoty <br> You může také použít $ ID $ ve filtru, který je aktuální id aktuálního objektu <br> Chcete-li provést SELECT ve filtru, použijte $ SEL $ <br>, pokud chcete filtrovat na extrafields použijte syntaxi extra.fieldcode = ... (kde kód pole je code of extrafield) <br> <br> Aby byl seznam v závislosti na jiném seznamu doplňkových atributů: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> Aby byl seznam v závislosti na jiném seznamu: <br> c_typent: libelle: id: <i> parent_list_code </i> | nadřazený sloupec: filtr
-ExtrafieldParamHelplink=Parametry musí být ObjectName: Classpath <br> Syntaxe: Název_objektu: Classpath <br> Příklady: <br> Societe: societe / class / societe.class.php <br> Kontakt: contact / class / contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Ponechte prázdné pro jednoduchý oddělovač <br> Tuto hodnotu nastavíte na 1 pro odlučovač (výchozí nastavení je otevřeno pro novou relaci, poté je stav zachován pro každou uživatelskou relaci) <br>Nastavte tuto položku na 2 pro sbalující se oddělovač. (ve výchozím nastavení sbaleno pro novou relaci, pak je stav udržován pro každou relaci uživatele)
 LibraryToBuildPDF=Knihovna používaná pro generování PDF
 LocalTaxDesc=Některé země mohou na každou řádku faktury uplatnit dvě nebo tři daně. V takovém případě vyberte typ druhé a třetí daně a její sazbu. Možný typ je: <br> 1: místní daň se vztahuje na výrobky a služby bez DPH (místní daň se počítá na částku bez daně) <br> 2: místní daň se vztahuje na výrobky a služby včetně DPH (místní daň se počítá na částku + hlavní daň) <br> 3: místní daň se vztahuje na produkty bez DPH (místní daň se počítá na částku bez daně) <br> 4: místní daň se vztahuje na produkty včetně DPH (místní daň se počítá na částku + hlavní DPH) <br> 5: místní daň se vztahuje na služby bez DPH (vypočítá se místní daň na částku bez daně) <br> 6: místní daň se vztahuje na služby včetně DPH (místní daň se počítá na částku + daň)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s následovaný zkráceným jménem zákazn
 ModuleCompanyCodeSupplierDigitaria=%s následované zkráceným jménem dodavatele podle počtu znaků: %s pro účetní kód dodavatele.
 Use3StepsApproval=Ve výchozím nastavení musí být nákupní objednávky vytvořeny a schváleny dvěma různými uživateli (jeden krok / uživatel k vytvoření a jeden krok / uživatel ke schválení. Všimněte si, že pokud má uživatel oprávnění k vytvoření a schválení, stačí jeden krok / uživatel) . Touto volbou můžete požádat o zavedení třetího schvalovacího kroku / schválení uživatele, pokud je částka vyšší než určená hodnota (potřebujete tedy 3 kroky: 1 = ověření, 2 = první schválení a 3 = druhé schválení, pokud je dostatečné množství). <br> Pokud je zapotřebí jedno schvalování (2 kroky), nastavte jej na velmi malou hodnotu (0,1), pokud je vždy požadováno druhé schválení (3 kroky).
 UseDoubleApproval=Použijte schválení 3 kroky, kdy částka (bez DPH) je vyšší než ...
-WarningPHPMail=UPOZORNĚNÍ: Je často lepší nastavit odchozí e-maily, než použít výchozí nastavení poštovního serveru poskytovatele. Někteří poskytovatelé e-mailů (například Yahoo) vám neumožňují odeslat e-mail z jiného serveru, než je jejich vlastní server. Vaše současné nastavení používá server pro odesílání e-mailů a nikoli server vašeho poskytovatele e-mailu, takže někteří příjemci (ten, který je kompatibilní s omezujícím protokolem DMARC) požádá vašeho poskytovatele e-mailu, aby mohli přijmout váš e-mail a některé poskytovatele e-mailu (jako je Yahoo) může odpovědět "ne", protože server není jejich, takže nemnoho přijatých e-mailů nemůže být přijato (buďte opatrní také kvótou odesílatele vašeho e-mailu). <br> Pokud má váš poskytovatel e-mailu (například Yahoo) toto omezení, musíte změnit nastavení e-mailu a zvolit druhou metodu "SMTP server" a zadat server SMTP a pověření poskytnuté poskytovatelem e-mailu.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=Pokud je váš poskytovatel e-mailových služeb SMTP povinen omezit e-mailový klient na některé adresy IP (velmi vzácné), jedná se o adresu IP agentu uživatele pošty (MUA) pro aplikaci ERP CRM: <strong> %s </strong>.
-WarningPHPMailSPF=Pokud je název domény ve vaší e-mailové adrese odesílatele chráněn pomocí SPF (zeptejte se poskytovatele e-mailu), musíte do záznamu SPF DNS vaší domény zahrnout následující adresy IP: <strong> %s </strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Kliknutím zobrazíte popis
 DependsOn=Tento modul potřebuje modul (y)
 RequiredBy=Tento modul je vyžadován modulem (moduly)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integrace ClickToDial systému (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Přidat funkce pro generování Bookmark4u účet z účtu Dolibarr
 Module60Name=Nálepky
 Module60Desc=Správa nálepek
 Module70Name=Intervence
@@ -656,7 +662,7 @@ Module50200Desc=Nabídněte zákazníkům platební stránku PayPal online (úč
 Module50300Name=Proužek
 Module50300Desc=Nabídněte zákazníkům Stripe online platební stránku (kreditní / debetní karty). To může být použito k tomu, aby zákazníci mohli provádět ad hoc platby nebo platby související s konkrétním předmětem Dolibarr (faktura, objednávka atd.)
 Module50400Name=Účetnictví (Dvojitá položka)
-Module50400Desc=Správa účetnictví (dvojité vstupy, podpora obecných a pomocných knih). Exportujte knihu v několika dalších formátech účetního softwaru.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Přímý tisk (bez otevírání dokumentů) pomocí rozhraní Cups IPP (Tiskárna musí být viditelná ze serveru a CUPS musí být nainstalována na serveru).
 Module55000Name=Anketa, průzkum nebo hlasování
@@ -671,7 +677,7 @@ Module63000Name=Zdroje
 Module63000Desc=Spravujte prostředky (tiskárny, auta, místnosti, ...) pro přidělování událostí
 Permission11=Přečtěte si faktury zákazníků
 Permission12=Vytvářejte/upravujte zákaznické faktury
-Permission13=Neplatné faktury zákazníků
+Permission13=Invalidate customer invoices
 Permission14=Ověřte faktury zákazníků
 Permission15=Odesílejte faktury zákazníků emailem
 Permission16=Vytvořte platby za zákaznické faktury
@@ -688,6 +694,7 @@ Permission32=Vytvářejte/upravujte produkty
 Permission34=Odstranit produkty
 Permission36=Zobrazení/správa skrytých produktů
 Permission38=Export produktů
+Permission39=Ignore minimum price
 Permission41=Přečtěte si projekty a úkoly (sdílený projekt a projekty, pro které jsem kontakt). Může také zadat časově náročnou, pro mne nebo svou hierarchii, na přiřazené úkoly (Timesheet)
 Permission42=Vytvořte / upravte projekty (sdílený projekt a projekty, pro které jsem kontaktován). Může také vytvářet úkoly a přiřazovat uživatele k projektu a úkolům
 Permission44=Smazat projekty (sdílený projekt a projekty, pro které jsem kontakt)
@@ -696,6 +703,9 @@ Permission61=Přečtěte intervence
 Permission62=Vytvářejte/upravujte intervence
 Permission64=Odstranit intervence
 Permission67=Export intervence
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Přečtěte si členy
 Permission72=Vytvářejte/upravujte členy
 Permission74=Smazat členy
@@ -718,6 +728,7 @@ Permission95=Přečtěte si zprávy
 Permission101=Přečtěte si odesílání
 Permission102=Vytvořte/upravujte odesílání
 Permission104=Ověřte odesílání
+Permission105=Send sendings by email
 Permission106=Exportujte odesílání
 Permission109=Smazat odesílání
 Permission111=Přečtěte si finanční účty
@@ -825,10 +836,11 @@ Permission402=Vytvářejte/upravujte slevy
 Permission403=Ověřte slevy
 Permission404=Smazat slevy
 Permission430=Použijte ladicí panel
-Permission511=Přečtěte si platby mezd
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Vytvářejte/upravujte platby mezd
 Permission514=Odstranit platby mezd
-Permission517=Export mezd
+Permission517=Read payments of salaries of everybody
+Permission519=Export mezd
 Permission520=Přečtěte si půjčky
 Permission522=Vytvářejte/upravujte půjčky
 Permission524=Smazat půjčky
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Přečtěte si kusovníky
 Permission651=Vytvářejte/aktualizujte kusovníky
 Permission652=Smazat kusovníky
@@ -884,7 +899,9 @@ Permission1185=Schvalování nákupních objednávek
 Permission1186=Objednejte nákupní objednávky
 Permission1187=Potvrďte přijetí nákupních objednávek
 Permission1188=Smazat nákupní objednávky
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Schvalujte nákupní objednávky (druhé schválení)
+Permission1191=Export supplier orders and their attributes
 Permission1201=Získejte výsledek exportu
 Permission1202=Vytvořit/upravit export
 Permission1231=Přečtěte si faktury dodavatele
@@ -898,6 +915,8 @@ Permission1251=Spuštění hromadných importů externích dat do databáze (zat
 Permission1321=Exportujte zákaznické faktury, atributy a platby
 Permission1322=Znovu otevřete placený účet
 Permission1421=Export prodejních objednávek a atributů
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Čtení akcí (událostí nebo úkolů) spojených s jeho uživatelským účtem (pokud je vlastníkem události nebo je právě přiřazeno)
 Permission2402=Vytvářejte / upravujte akce (události nebo úkoly) spojené s jeho uživatelským účtem (pokud je vlastníkem události)
 Permission2403=Odstranit akce (události nebo úkoly) spojené s jeho uživatelským účtem (pokud je vlastníkem události)
@@ -932,9 +951,13 @@ Permission23001=Čtení naplánovaných úloh
 Permission23002=Vytvoření/aktualizace naplánované úlohy
 Permission23003=Smazat naplánovanou úlohu
 Permission23004=Provést naplánovanou úlohu
-Permission50101=Použijte prodejní místo
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Přečíst transakce
 Permission50202=Import transakcí
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Svázat produkty a faktury účetními účty
 Permission50411=Čtení operací v knize
 Permission50412=Zápis/editace operací v knize
@@ -958,6 +981,17 @@ Permission63001=číst zdroje
 Permission63002=Vytvořit/upravit zdroje
 Permission63003=Odstranit zdroje
 Permission63004=Propojte zdroje s událostmi programu
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Typy subjektů
 DictionaryCompanyJuridicalType=Právní formy subjektů
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Druhy dovolené
 DictionaryOpportunityStatus=Stav olova pro projekt / vedoucí
 DictionaryExpenseTaxCat=Zpráva o výdajích - Kategorie dopravy
 DictionaryExpenseTaxRange=Výkaz výdajů - Rozsah podle kategorie dopravy
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Nastavení uloženo
 SetupNotSaved=Nastavení nebylo uloženo
 BackToModuleList=Zpět na seznam modulů
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Štítek používaný ve výchozím nastavení, pokud nelze n
 LabelOnDocuments=Štítek na dokumenty
 LabelOrTranslationKey=Popisek nebo překladový klíč
 ValueOfConstantKey=Hodnota konfigurační konstanty
+ConstantIsOn=Option %s is on
 NbOfDays=Počet dní
 AtEndOfMonth=Na konci měsíce
 CurrentNext=Aktuální/Další
@@ -1145,6 +1182,7 @@ InfoWebServer=O webovém serveru
 InfoDatabase=o databázi
 InfoPHP=o PHP
 InfoPerf=o výkonech
+InfoSecurity=About Security
 BrowserName=Název prohlížeče
 BrowserOS=Prohlížeč OS
 ListOfSecurityEvents=Seznam bezpečnostních událostí Dolibarru
@@ -1194,7 +1232,8 @@ RestoreDesc=Pro obnovení zálohy Dolibarr jsou vyžadovány dva kroky.
 RestoreDesc2=Obnovte záložní soubor (například soubor zip) adresáře "documents" do nové instalace Dolibarr nebo do tohoto adresáře aktuálních dokumentů (<b> %s </b>).
 RestoreDesc3=Obnovte databázovou strukturu a data ze souboru zálohování do databáze nové instalace Dolibarr nebo do databáze této aktuální instalace (<b> %s </b>). Upozornění: po dokončení obnovy musíte použít přihlašovací jméno / heslo, které existovalo od času zálohování / instalace, abyste se znovu připojili. <br> Chcete-li obnovit zálohovací databázi do této aktuální instalace, můžete sledovat tento asistent.
 RestoreMySQL=MySQL import
-ForcedToByAModule= Toto pravidlo je nuceno na <b> %s </b> aktivovaným modulem
+ForcedToByAModule=Toto pravidlo je nuceno na <b> %s </b> aktivovaným modulem
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existující záložní soubory
 PreviousArchiveFiles=Existující archivní soubory
 WeekStartOnDay=První den v týdnu
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=Je načtena komponenta PHP %s
 PreloadOPCode=Používá se předinstalovaný OPCode
 AddRefInList=Zobrazit číslo zákazníka / dodavatele seznam informací (vyberte seznam nebo kombinace) a většinu hypertextových odkazů. <br> Zobrazí se třetí strany s názvem formátu "CC12345 - SC45678 - The Big Company corp". místo "The Big Company corp".
 AddAdressInList=Zobrazte seznam informací o adresách zákazníků / prodejců (vyberte seznam nebo kombinace) <br> Subjekty se objeví ve formátu "Big Company Corp. - 21 skokové ulici 123456 Big City - USA" namísto "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Požádejte o preferovanou způsob přepravy pro subjekty.
 FieldEdition=Editace položky %s
 FillThisOnlyIfRequired=Příklad: +2 (vyplňte pouze v případě, že se vyskytly problémy s posunem časových pásem)
@@ -1282,7 +1322,7 @@ GetBarCode=Získat čárový kód
 NumberingModules=Modely číslování
 DocumentModules=Modely dokumentů
 ##### Module password generation
-PasswordGenerationStandard=Vraťte heslo vygenerované podle interního algoritmu Dolibarr: 8 znaků obsahujících sdílená čísla a znaky malými písmeny.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Nevybírejte generované heslo. Heslo musí být zadáno ručně.
 PasswordGenerationPerso=Vrátit hesla dle Vašeho osobně definované konfiguraci.
 SetupPerso=Podle konfigurace
@@ -1381,6 +1421,7 @@ AdherentMailRequired=K vytvoření nového člena je třeba e-mail
 MemberSendInformationByMailByDefault=Zaškrtávací políčko poslat mailem potvrzení členům (validace nebo nové předplatné) je ve výchozím nastavení
 VisitorCanChooseItsPaymentMode=Návštěvník si může vybrat z dostupných způsobů platby
 MEMBER_REMINDER_EMAIL=Povolit automatické připomenutí <b> e-mailem </b> vypršel odběr. Poznámka: Modul <strong> %s </strong> musí být povolen a správně nastaven pro odeslání připomenutí.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=Nastavení LDAP
 LDAPGlobalParameters=Globální parametry
@@ -1523,7 +1564,9 @@ LDAPDescValues=Příkladové hodnoty jsou určeny pro <b> OpenLDAP </b> s násle
 ForANonAnonymousAccess=Pro ověřený přístup (pro přístup pro zápis například)
 PerfDolibarr=Zpráva o nastavení výkonu/optimalizaci
 YouMayFindPerfAdviceHere=Tato stránka obsahuje některé kontroly nebo rady týkající se výkonu.
-NotInstalled=Není nainstalován, takže váš server tím nezpomalí.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Aplikační vyrovnávací paměť
 MemcachedNotAvailable=Žádná aplikační mezipaměť nebyla nalezena. Výkon můžete zvýšit instalací serveru mezipaměti Memcached a modulu, který je schopen používat tento vyrovnávací server. <br> Více informací zde <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN"> http://wiki.dolibarr.org/index.php/Module_MemCached_EN </a>. <br> Všimněte si, že mnoho poskytovatelů webhostingu neposkytuje takový mezipaměťový server.
 MemcachedModuleAvailableButNotSetup=Modul memcached pro nalezenou mezipaměť, ale nastavení modulu není dokončeno.
@@ -1571,9 +1614,9 @@ SyslogLevel=Úroveň
 SyslogFilename=Název souboru a cesta
 YouCanUseDOL_DATA_ROOT=DOL_DATA_ROOT / dolibarr.log můžete použít pro soubor protokolu v adresáři Dolibarr "documents". Pro uložení tohoto souboru můžete nastavit jinou cestu.
 ErrorUnknownSyslogConstant=Konstanta %s není známou konstantou Syslog
-OnlyWindowsLOG_USER=Windows podporuje pouze LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Komprese a zálohování souborů protokolu ladění (generovaných modulem Log pro ladění)
-SyslogFileNumberOfSaves=Zálohování protokolů
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Konfigurovat čištění naplánované úlohy pro nastavení frekvence zálohování protokolu
 ##### Donations #####
 DonationsSetup=Nastavení modulu dárcovství
@@ -1629,7 +1672,7 @@ AdvancedEditor=Rozšířené editor
 ActivateFCKeditor=Aktivujte pokročilý editor pro:
 FCKeditorForCompany=WYSIWIG tvorba/vydání popisů prvků a poznámek (kromě produktů/služeb)
 FCKeditorForProduct=WYSIWIG vytvoření / edice produktů / služeb popis a poznámky
-FCKeditorForProductDetails=WYSIWIG tvorba / edice produktů podrobností řádky pro všechny subjekty (návrhy, objednávky, faktury, atd.). <font class="warning"> Upozornění: Použití této možnosti v tomto případě není vážně doporučeno, protože může při vytváření souborů PDF vytvářet problémy se speciálními znaky a formátováním stránky. </font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG tvorba/vydání pro hromadné eMailings (Nástroje-> eMailing)
 FCKeditorForUserSignature=WYSIWIG vytvoření / edice uživatelského podpisu
 FCKeditorForMail=Vytvoření WYSIWIG / edition pro veškerou poštu (s výjimkou Nástroje-> e-mailem)
@@ -1639,11 +1682,11 @@ StockSetup=Konfigurace modulu Sklady
 IfYouUsePointOfSaleCheckModule=Používáte-li standardně dodávaný modul POS (POS) nebo externí modul, může toto nastavení vaše POS modul ignorovat. Většina POS modulů je standardně navržena tak, aby okamžitě vytvořila fakturu a snížila zásobu bez ohledu na možnosti zde. Pokud tedy při registraci prodeje z vašeho POS potřebujete nebo nemáte pokles akcií, zkontrolujte také nastavení POS modulu.
 ##### Menu #####
 MenuDeleted=Nabídka byla smazána
+Menu=Menu
 Menus=Nabídky
 TreeMenuPersonalized=Personalizované menu
 NotTopTreeMenuPersonalized=Personalizované nabídky, které nejsou propojeny s položkou horního menu
 NewMenu=Nová nabídka
-Menu=Výběr menu
 MenuHandler=Ovládání nabídek
 MenuModule=Zdrojový modul
 HideUnauthorizedMenu= Skrýt neautorizovaná menu (šedá)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automaticky nastavte tuto výchozí hodnotu pro ty
 AGENDA_DEFAULT_FILTER_TYPE=Automaticky nastavte tento typ události ve filtru vyhledávání v agendě
 AGENDA_DEFAULT_FILTER_STATUS=Automaticky nastavte tento stav událostí ve filtru vyhledávání v agendě
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Povolení připomenutí události <b> pomocí e-mailů </b> (pro každou událost lze definovat možnost připomenutí / zpoždění). Poznámka: Modul <strong> %s </strong> musí být povolen a správně nastaven tak, aby bylo upozornění odesláno na správnou frekvenci.
-AGENDA_REMINDER_BROWSER=Povolení připomenutí události <b> v prohlížeči uživatele </b> (při dosažení data události je každý uživatel schopen odmítnout tuto otázku z potvrzení prohlížeče)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Povolit zvukové upozornění
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Zobrazit propojený objekt do zobrazení agendy
 ##### Clicktodial #####
 ClickToDialSetup=Klepněte na tlačítko Nastavení vytáčení modulu
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0: Typ platby pro zákazníka, 1: Typ platby pro dodavatele, 2:
 IncludePath=Zahrnout cestu (definováno v proměnné% s)
 ExpenseReportsSetup=Nastavení modulu Výkazy výdajů
 TemplatePDFExpenseReports=Šablon dokumentů ke generování dokumentu sestavy výdajů
-ExpenseReportsIkSetup=Nastavení výkazu výdajů modulu - index Milles
 ExpenseReportsRulesSetup=Nastavení výkazu výdajů modulu - pravidla
 ExpenseReportNumberingModules=Způsob číslování výkazů výdajů
 NoModueToManageStockIncrease=Nebyl aktivován žádný modul schopný zvládnout automatické zvýšení zásob. Zvýšení zásob bude provedeno pouze při ručním zadávání.
@@ -1864,7 +1907,7 @@ MailToSendReception=Recepce
 MailToThirdparty=Subjekty
 MailToMember=Členové
 MailToUser=Uživatelé
-MailToProject=Stránka projektů
+MailToProject=Projekty
 MailToTicket=Vstupenky
 ByDefaultInList=Zobrazit výchozí zobrazení seznamu
 YouUseLastStableVersion=Používáte nejnovější stabilní verzi
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Načíst vyhledávání subjektem na adrese %s (pouze na
 LoadThirdPartyFromNameOrCreate=Načíst vyhledávání subjektů na adrese %s (vytvořit, pokud nebyly nalezeny)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Vstupní kód nabídky (hlavní menu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Zakázat funkci propojit prostředek s kontakty
 EnableResourceUsedInEventCheck=Povolte funkci a zkontrolujte, zda se zdroj používá v události
 ConfirmUnactivation=Potvrďte resetování modulu
 OnMobileOnly=Pouze na malé obrazovce (smartphone)
-DisableProspectCustomerType=Zakázat typ subjektu "Prospekt + zákazník" (takže subjekt musí být prospekt nebo zákazník, ale nemůže být oběma)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Zjednodušte rozhraní pro nevidomé
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Povolte tuto možnost, pokud jste osoba slepá, nebo pokud používáte aplikaci z textového prohlížeče, jako je Lynx nebo Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Změňte barvu rozhraní pro nevidomé barvy
@@ -1996,13 +2041,15 @@ UseDebugBar=Použijte ladicí lištu
 DEBUGBAR_LOGS_LINES_NUMBER=Počet posledních řádků protokolu, které se mají uchovávat v konzole
 WarningValueHigherSlowsDramaticalyOutput=Varování, vyšší hodnoty dramaticky zpomalují výstup
 ModuleActivated=Je aktivován modul %s a zpomaluje rozhraní
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Exportní modely jsou sdílené s každým
 ExportSetup=Nastavení modulu Export
 ImportSetup=Nastavení modulu Import
 InstanceUniqueID=Jedinečné ID instance
 SmallerThan=Menší než
 LargerThan=Větší než
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=Pokud jste s účtem GMail povolili ověření ve 2 - dvou krocích, doporučuje se pro aplikaci vytvořit vyhrazené druhé heslo namísto použití hesla pro vlastní účet z adresy https://myaccount.google.com/.
 EmailCollectorTargetDir=Po úspěšném zpracování může být žádoucí chování při přesunu e-mailu do jiné značky/adresáře. Chcete-li tuto funkci použít, stačí zadat název adresáře (NEPOUŽÍVEJTE v názvu speciální znaky). Musíte také použít přihlašovací účet pro čtení a zápis.
 EmailCollectorLoadThirdPartyHelp=Pomocí této akce můžete pomocí obsahu e-mailu najít a načíst existující třetí stranu ve vaší databázi. Nalezená (nebo vytvořená) třetí strana bude použita pro následující akce, které ji potřebují. V poli parametrů můžete použít například 'EXTRACT: BODY: Name: \\ s ([^ \\ s] *)', pokud chcete extrahovat jméno třetí strany z řetězce 'Name: name to find' nalezeného do tělo.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=Měřítko je počet míst, která musíte přesunout desítk
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Druh produktu
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/cs_CZ/banks.lang b/htdocs/langs/cs_CZ/banks.lang
index 8188134be65..5dea684e67a 100644
--- a/htdocs/langs/cs_CZ/banks.lang
+++ b/htdocs/langs/cs_CZ/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Různé platby
 VariousPayments=Různé platby
 ShowVariousPayment=Zobrazit různé platby
 AddVariousPayment=Přidat další platbu
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=Mandát SEPA
 YourSEPAMandate=Váš mandát SEPA
 FindYourSEPAMandate=Toto je vaše mandát SEPA, který autorizuje naši společnost, aby inkasovala inkasní příkaz k vaší bance. Vraťte jej podepsanou (skenování podepsaného dokumentu) nebo pošlete jej poštou
@@ -176,3 +179,4 @@ BankColorizeMovement=Zbarvujte pohyby
 BankColorizeMovementDesc=Pokud je tato funkce povolena, můžete vybrat konkrétní barvu pozadí pro pohyby debetů nebo kreditů
 BankColorizeMovementName1=Barva pozadí pro debetní pohyb
 BankColorizeMovementName2=Barva pozadí pro pohyb úvěru
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/cs_CZ/categories.lang b/htdocs/langs/cs_CZ/categories.lang
index 5c978c52c12..53d6caa3877 100644
--- a/htdocs/langs/cs_CZ/categories.lang
+++ b/htdocs/langs/cs_CZ/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Nastavení tagů/kategorií
 CategorieRecursiv=Odkaz na nadřazený tag/kategorii automaticky
 CategorieRecursivHelp=Pokud je volba zapnuta, při přidání produktu do podkategorie bude produkt také přidán do nadřazené kategorie.
 AddProductServiceIntoCategory=Přidejte následující produkt/službu
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Zobrazit tag/kategorii
 ByDefaultInList=Ve výchozím nastavení je v seznamu
 ChooseCategory=Vyberte kategorii
-StocksCategoriesArea=Oblast kategorií skladů
-ActionCommCategoriesArea=Oblast kategorie událostí 
-WebsitePagesCategoriesArea=Oblast kategorií obsahu stránky
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Použití nebo operátor pro kategorie
diff --git a/htdocs/langs/cs_CZ/companies.lang b/htdocs/langs/cs_CZ/companies.lang
index d083dc74be8..19b9513ae7c 100644
--- a/htdocs/langs/cs_CZ/companies.lang
+++ b/htdocs/langs/cs_CZ/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Prof. číslo)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao obecní)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federální číslo)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Číslo sociálního pojištění)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate číslo)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registrační číslo
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Obchodní povolení)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (patent)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=ID Id 1 (CUI)
 ProfId2RO=Id Id 2 (č. Matikulare)
 ProfId3RO=ID Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof ID 5 (EUID)
+ProfId4RO=Prof ID 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=Můžete také zkontrolovat ručně na evropských stránká
 ErrorVATCheckMS_UNAVAILABLE=Kontrola není možná. Služba není členským státem poskytována (%s).
 NorProspectNorCustomer=Ani cíl, ani zákazník
 JuridicalStatus=Typ právnické osoby
+Workforce=Workforce
 Staff=Zaměstnanci
 ProspectLevelShort=Potenciální
 ProspectLevel=Potenciální cíl
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Platební termín - dodavatel
 PaymentTypeBoth=Druh platby - zákazník a prodejce
 MulticurrencyUsed=Použití více měn
 MulticurrencyCurrency=Měna
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/cs_CZ/ecm.lang b/htdocs/langs/cs_CZ/ecm.lang
index d180702cbee..69a334d98d8 100644
--- a/htdocs/langs/cs_CZ/ecm.lang
+++ b/htdocs/langs/cs_CZ/ecm.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=No. of documents in directory
+ECMNbOfDocs=Počet dokumentů v adresáři
 ECMSection=Adresář
 ECMSectionManual=Manuální adresář
 ECMSectionAuto=Automatický adresář
 ECMSectionsManual=Ruční strom
 ECMSectionsAuto=Automatický strom
 ECMSections=Adresáře
-ECMRoot=ECM Root
+ECMRoot=Kořen ECM
 ECMNewSection=Nový adresář
 ECMAddSection=Přidat adresář
 ECMCreationDate=Datum vytvoření
@@ -14,39 +14,30 @@ ECMNbOfFilesInDir=Počet souborů v adresáři
 ECMNbOfSubDir=Počet podadresářů
 ECMNbOfFilesInSubDir=Počet souborů v podadresářích
 ECMCreationUser=Tvůrce
-ECMArea=DMS/ECM area
-ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMArea=Oblast DMS/ECM
+ECMAreaDesc=DMS/ECM (Document Management System / Electronic Content Management) umožňuje rychle ukládat, sdílet a vyhledávat všechny dokumenty v Dolibarru.
 ECMAreaDesc2=* Automatické adresáře jsou vyplněny automaticky při přidávání dokumentů z karty prvku. <br> * Manuální adresáře lze použít k uložení dokladů, které nejsou spojené s konkrétním prvkem.
 ECMSectionWasRemoved=Rejstřík <b>%s</b> byl vymazán.
-ECMSectionWasCreated=Directory <b>%s</b> has been created.
+ECMSectionWasCreated=Adresář <b> %s </b> byl vytvořen.
 ECMSearchByKeywords=Vyhledávání podle klíčových slov
 ECMSearchByEntity=Hledat podle objektu
 ECMSectionOfDocuments=Adresáře dokumentů
 ECMTypeAuto=Automatický
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Dokumenty související se třetími stranami
-ECMDocsByProposals=Dokumenty související s návrhy
-ECMDocsByOrders=Dokumenty související s objednávkami zákazníků
-ECMDocsByContracts=Dokumenty související se smlouvami
-ECMDocsByInvoices=Dokumenty související s fakturami zákazníků
-ECMDocsByProducts=Dokumenty související s produkty
-ECMDocsByProjects=Dokumenty související s projekty
-ECMDocsByUsers=Dokumenty spojené s uživateli
-ECMDocsByInterventions=Dokumenty spojené s intervencemi
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=Nevytvořený adresář
 ShowECMSection=Zobrazit adresář
 DeleteSection=Odstraňte adresář
-ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
+ConfirmDeleteSection=Můžete potvrdit, že chcete smazat adresář <b>%s</b> ?
 ECMDirectoryForFiles=Relativní adresář pro soubory
-CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
-CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=Odstranění není možné, protože obsahuje některé soubory nebo podadresáře
+CannotRemoveDirectoryContainsFiles=Odstranění není možné, protože obsahuje některé soubory
 ECMFileManager=Správce souborů
-ECMSelectASection=Select a directory in the tree...
-DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
-ReSyncListOfDir=Resync list of directories
-HashOfFileContent=Hash of file content
-NoDirectoriesFound=No directories found
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ECMSelectASection=Vyberte adresář ve stromu ...
+DirNotSynchronizedSyncFirst=Zdá se, že tento adresář je vytvořen nebo upraven mimo modul ECM. Musíte nejprve kliknout na tlačítko Resync pro synchronizaci disku a databáze, abyste dostali obsah tohoto adresáře.
+ReSyncListOfDir=Znovu vytvořit seznam adresářů
+HashOfFileContent=Hash obsah souboru
+NoDirectoriesFound=Nebyly nalezeny žádné adresáře
+FileNotYetIndexedInDatabase=Soubor dosud není indexován do databáze (zkuste jej znovu nahrát)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/cs_CZ/hrm.lang b/htdocs/langs/cs_CZ/hrm.lang
index 3ea1914898c..d0850c4a89b 100644
--- a/htdocs/langs/cs_CZ/hrm.lang
+++ b/htdocs/langs/cs_CZ/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Pracovní pozice
 Employees=Zaměstnanci
 Employee=Zaměstnanec
 NewEmployee=Nový zaměstnanec
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/cs_CZ/install.lang b/htdocs/langs/cs_CZ/install.lang
index 5d0bb610b03..0c9f0d9bff9 100644
--- a/htdocs/langs/cs_CZ/install.lang
+++ b/htdocs/langs/cs_CZ/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Konfigurační soubor <b> %s </b> není zapisovatelný. Zk
 ConfFileIsWritable=Konfigurační soubor <b>%s</b> je zapisovatelný.
 ConfFileMustBeAFileNotADir=Konfigurační soubor <b> %s </b> musí být soubor, nikoli adresář.
 ConfFileReload=Znovu načíst parametry z konfiguračního souboru.
-PHPSupportSessions=Tato PHP instalace podporuje relace.
 PHPSupportPOSTGETOk=Tato PHP instalace podporuje proměnné POST a GET.
 PHPSupportPOSTGETKo=Je možné, že vaše instalace PHP nepodporuje proměnné POST a/nebo GET. Zkontrolujte parametr <b>variables_order</b> ve Vašem php.ini.
-PHPSupportGD=Tato PHP instalace podporuje GD grafické funkce.
-PHPSupportCurl=Tato konfigurace PHP podporuje Curl.
-PHPSupportCalendar=Tento PHP podporuje rozšíření kalendářů.
-PHPSupportUTF8=Tato PHP instalace podporuje UTF8 funkce.
-PHPSupportIntl=Tato instalace PHP podporuje funkce Intl.
-PHPSupportxDebug=Toto PHP podporuje rozšířené funkce ladění.
+PHPSupportSessions=Tato PHP instalace podporuje relace.
 PHPSupport=Toto PHP podporuje funkce %s.
 PHPMemoryOK=Maximální velikost relace je nastavena na <b>%s.</b> To by mělo stačit.
 PHPMemoryTooLow=Maximální velikost relace je nastavena na <b>%s</b> bajtů. To bohužel nestačí. Zvyšte svůj parametr <b>memory_limit</b> ve Vašem <b>php.ini</b> na minimální velikost <b>%s</b> bajtů.
diff --git a/htdocs/langs/cs_CZ/intracommreport.lang b/htdocs/langs/cs_CZ/intracommreport.lang
new file mode 100644
index 00000000000..1c207976418
--- /dev/null
+++ b/htdocs/langs/cs_CZ/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=Seznam
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/cs_CZ/languages.lang b/htdocs/langs/cs_CZ/languages.lang
index b551ca150a1..893180a35d7 100644
--- a/htdocs/langs/cs_CZ/languages.lang
+++ b/htdocs/langs/cs_CZ/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Španělština (Paraguay)
 Language_es_PE=Španělština (Peru)
 Language_es_PR=Španělština (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Španělština (Urugway)
 Language_es_GT=Španělština (Guatemala)
 Language_es_VE=Španělština (Venezuela)
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index 94780679f14..b2fcda76ae4 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Odebrat odkaz
 AddToDraft=Přidat k návrhům
 Update=Aktualizovat
 Close=Zavřít
+CloseAs=Nastavte stav na
 CloseBox=Odebrat widget z panelu
 Confirm=Potvrdit
 ConfirmSendCardByMail=Opravdu chcete poslat obsah této karty mailem na <b>%s?</b>
@@ -196,6 +197,7 @@ ReOpen=Znovu otevřít
 Upload=Nahrát
 ToLink=Odkaz
 Select=Vybrat
+SelectAll=Select all
 Choose=Zvolit
 Resize=Změna velikosti
 ResizeOrCrop=Změnit velikost nebo oříznout
@@ -256,6 +258,7 @@ Cards=Karty
 Card=Karta
 Now=Nyní
 HourStart=Startovní hodina
+Deadline=Deadline
 Date=Datum
 DateAndHour=Datum a hodina
 DateToday=Dnešní datum
@@ -264,8 +267,10 @@ DateStart=Datum zahájení
 DateEnd=Datum ukončení
 DateCreation=Datum vytvoření
 DateCreationShort=Vytvořit datum
+IPCreation=Creation IP
 DateModification=Datum změny
 DateModificationShort=Datum úpravy
+IPModification=Modification IP
 DateLastModification=Datum poslední změny
 DateValidation=Datum ověření
 DateClosing=Uzávěrka
@@ -319,6 +324,7 @@ Morning=Ráno
 Afternoon=Odpoledne
 Quadri=Quadri
 MonthOfDay=Měsíce ode dne
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Sazba
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Výše platby, původní měna
 MulticurrencyAmountHT=Částka (bez daně), původní měna
 MulticurrencyAmountTTC=Částka (vč. Daně), původní měně
 MulticurrencyAmountVAT=Výše daní, původní měna
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Částka daně z 2
 AmountLT2=Částka daně 3
 AmountLT1ES=Množství RE
@@ -487,6 +494,7 @@ By=Podle
 From=Z
 FromDate=Z
 FromLocation=Z
+at=at
 to=na
 To=na
 and=a
@@ -509,6 +517,7 @@ Draft=Návrh
 Drafts=Návrhy
 StatusInterInvoiced=Fakturováno
 Validated=Ověřené
+ValidatedToProduce=Validated (To produce)
 Opened=Otevřeno
 OpenAll=Otevřít (všechny)
 ClosedAll=Uzavřeno (všechny)
@@ -655,6 +664,7 @@ Response=Odpověď
 Priority=Priorita
 SendByMail=Odeslat emailem
 MailSentBy=E-mail odeslán
+NotSent=Neodesláno
 TextUsedInTheMessageBody=E-mail obsah
 SendAcknowledgementByMail=Zaslat potvrzovací e-mail
 SendMail=Odeslat e-mail
@@ -836,6 +846,7 @@ ListOfTemplates=Seznam šablon
 Gender=Pohlaví
 Genderman=Muž
 Genderwoman=Žena
+Genderother=Jiný
 ViewList=Zobrazení seznamu
 ViewGantt=Ganttův pohled
 ViewKanban=Kanban pohled
@@ -877,6 +888,8 @@ Miscellaneous=Smíšený
 Calendar=Kalendář
 GroupBy=Skupina vytvořená...
 ViewFlatList=Zobrazit seznam plochý
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Odstraňte řetězec ‚%s‘
 SomeTranslationAreUncomplete=Některé nabízené jazyky mohou být pouze částečně přeloženy nebo mohou obsahovat chyby. Český překlad je jen základní a orientační, může být nepřesný a mimo kontext. Pomozte prosím opravit svůj jazyk registrováním na <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> a přidejte své vylepšení.
 DirectDownloadLink=Přímý odkaz ke stažení (veřejné / externí)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=zásilky zákazník
 SearchIntoExpenseReports=Zpráva výdajů
 SearchIntoLeaves=Listy
 SearchIntoTickets=Vstupenky
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Platby dodavatele
+SearchIntoMiscPayments=Různé platby
 CommentLink=Komentáře
 NbComments=Počet komentářů
 CommentPage=Místo pro komentáře
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Informace
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Datum narození
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/cs_CZ/members.lang b/htdocs/langs/cs_CZ/members.lang
index 50770d35641..d8ec8bdfbf6 100644
--- a/htdocs/langs/cs_CZ/members.lang
+++ b/htdocs/langs/cs_CZ/members.lang
@@ -19,14 +19,12 @@ MembersCards=Vizitky členů
 MembersList=Seznam členů
 MembersListToValid=Seznam členů návrhu (bude ověřeno)
 MembersListValid=Seznam platných členů
-MembersListUpToDate=Seznam platných členů s aktuální předplatné
-MembersListNotUpToDate=Seznam platných členů s předplatným zastaralým
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=Seznam ukončených členů
 MembersListQualified=Seznam kvalifikovaných členů
 MenuMembersToValidate=Návrh členů
 MenuMembersValidated=Ověření členové
-MenuMembersUpToDate=Aktuální členové
-MenuMembersNotUpToDate=Neaktuální členové
 MenuMembersResiliated=Ukončené členové
 MembersWithSubscriptionToReceive=Členové s předplatným k přijímání
 MembersWithSubscriptionToReceiveShort=Předplatné k odběru
@@ -34,6 +32,7 @@ DateSubscription=Vstupní data
 DateEndSubscription=Datum ukončení předplatného
 EndSubscription=Konec odběru
 SubscriptionId=ID předplatného
+WithoutSubscription=Without subscription
 MemberId=ID člena
 NewMember=Nový člen
 MemberType=Členské typ
@@ -81,7 +80,7 @@ DeleteType=Vymazat
 VoteAllowed=Hlasování povoleno
 Physical=Fyzický
 Moral=Morální
-MorPhy=Příroda
+MorAndPhy=Moral and Physical
 Reenable=Znovu povolit
 ResiliateMember=Ukončit člena
 ConfirmResiliateMember=Jste si jisti, že chcete ukončit tyto členy?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Odeslání e-mailu na ověření nových členů
 SendingEmailOnNewSubscription=Odesílání e-mailů na nové předplatné
 SendingReminderForExpiredSubscription=Odeslání upomínky na uplynulé odběry
 SendingEmailOnCancelation=Odeslání e-mailu na zrušení
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Vaše členství bylo přijato.
 YourMembershipWasValidated=Vaše členství bylo ověřeno
@@ -167,6 +167,7 @@ MembersStatisticsByState=Členové statistika stát / provincie
 MembersStatisticsByTown=Členové statistika podle města
 MembersStatisticsByRegion=Členové statistiky podle krajů
 NbOfMembers=Počet členů
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=Nebyli nalezeni validovaní členové
 MembersByCountryDesc=Tato obrazovka vám ukáže statistiku členů jednotlivých zemích. Grafika však závisí na Google on-line služby grafu a je k dispozici pouze v případě, je připojení k internetu funguje.
 MembersByStateDesc=Tato obrazovka vám ukáže statistiku členů podle státu / provincie / Canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistika
 LastMemberDate=Nejnovější datum člena
 LatestSubscriptionDate=Poslední datum přihlášení
 MemberNature=Povaha člena
+MembersNature=Nature of members
 Public=Informace jsou veřejné
 NewMemberbyWeb=Nový uživatel přidán. Čeká na schválení
 NewMemberForm=Nový formulář člena
diff --git a/htdocs/langs/cs_CZ/mrp.lang b/htdocs/langs/cs_CZ/mrp.lang
index ee97c7b368f..a3e64ead7a8 100644
--- a/htdocs/langs/cs_CZ/mrp.lang
+++ b/htdocs/langs/cs_CZ/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Výrobní zakázky
-MO=Výrobní zakázka
 MOs=Manufacturing orders
+ManufacturingOrder=Výrobní zakázka
 MRPDescription=Modul pro správu výrobních a výrobních objednávek (MO).
 MRPArea=Oblast MRP
 MrpSetupPage=Nastavení modulu MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Výrobky k výrobě
 UnitCost=Jednotková cena
 TotalCost=Celkové náklady
 BOMTotalCost=Náklady na výrobu tohoto kusovníku na základě nákladů na každé spotřebované množství a produkt (použijte cenu Cena, pokud je definována, jinak průměrná vážená cena, pokud je definována, jinak nejlepší kupní cena)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index 4a14c6581fc..239f764a81b 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Více cenových segmentů na produkt / službu (každý zákazník je v jednom cenovém segmentu)
 MultiPricesNumPrices=Počet cen
 DefaultPriceType=Základ cen za prodlení (s versus bez daně) při přidávání nových prodejních cen
-AssociatedProductsAbility=Aktivovat virtuální produkty (sady)
-AssociatedProducts=Virtuální produkty
-AssociatedProductsNumber=Počet výrobků tvořících tento virtuální produkt
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Počet výchozích balení výrobku
 ParentProducts=Hlavní produkty
-IfZeroItIsNotAVirtualProduct=Pokud je 0, tento produkt není virtuální produkt
-IfZeroItIsNotUsedByVirtualProduct=Pokud je 0, tento produkt nepoužívá žádný virtuální produkt
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Filtr klíčového slova
 CategoryFilter=Filtr kategorie
 ProductToAddSearch=Hledat produkt pro přidání
 NoMatchFound=Shoda nenalezena
 ListOfProductsServices=Seznam produktů/služeb
-ProductAssociationList=Seznam produktů/služeb, které jsou součást(i)í tohoto virtuálního produktu/sady
-ProductParentList=Seznam virtuálních produktů/služeb s tímto produktem jako komponentou
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=Jeden vybraný produkt je nadřazený současnému produktu
 DeleteProduct=Odstranění produktu/služby
 ConfirmDeleteProduct=Jste si jisti, že chcete smazat tento výrobek/službu?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Dostupné globální hodnoty:
 PriceMode=Režim ceny
 PriceNumeric=Číslo
 DefaultPrice=Výchozí cena
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Zvýšit/snížit zásoby na výchozí změny
 ComposedProduct=Subprodukt
 MinSupplierPrice=Minimální nákupní cena
@@ -339,6 +340,7 @@ UseProductFournDesc=Přidání funkce pro definování popisů produktů definov
 ProductSupplierDescription=Popis dodavatele produktu
 UseProductSupplierPackaging=Použijte obaly na dodavatelské ceny (při přidávání / aktualizaci řádku v dodavatelských dokumentech přepočítávejte množství podle balení stanoveného na dodavatelskou cenu)
 PackagingForThisProduct=Obal
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=Množství linky bylo přepočítáno podle obalu dodavatele
 
 #Attributes
diff --git a/htdocs/langs/cs_CZ/recruitment.lang b/htdocs/langs/cs_CZ/recruitment.lang
index 25cc7d16349..e8f2b878873 100644
--- a/htdocs/langs/cs_CZ/recruitment.lang
+++ b/htdocs/langs/cs_CZ/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Pracovní pozice
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/cs_CZ/stocks.lang b/htdocs/langs/cs_CZ/stocks.lang
index ef9fbfdb1eb..25558173d1a 100644
--- a/htdocs/langs/cs_CZ/stocks.lang
+++ b/htdocs/langs/cs_CZ/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=ID pohybu %d
 ListMouvementStockProject=Seznam pohybů zásob spojené s projektem
 StocksArea=Skladové prostory
 AllWarehouses=Všechny sklady
-IncludeEmptyDesiredStock=Zahrňte také nedefinované požadované zásoby
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Zahrnout také návrhy objednávek
 Location=Umístění
 LocationSummary=Krátký název umístění
@@ -122,8 +122,9 @@ DesiredStockDesc=Tato částka bude hodnota použitá k vyplnění zásoby podle
 StockToBuy=Chcete-li objednat
 Replenishment=Naplnění
 ReplenishmentOrders=Doplňování objednávky
-VirtualDiffersFromPhysical=Podle zvýšení/snížení skladové možnosti se fyzické a virtuální zásoby (fyzické aktuální objednávky) mohou lišit.
-UseVirtualStockByDefault=Použijte virtuální sklad ve výchozím nastavení, namísto fyzického skladu pro funkci doplňování
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Použít virtuální zásoby
 UsePhysicalStock=Použít fyzický sklad
 CurentSelectionMode=Režim Aktuální výběr
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=Tento produkt je již v seznamu
 SelectCategory=Filtr kategorie
 SelectFournisseur=Filtr prodejců
 inventoryOnDate=Inventář
-INVENTORY_DISABLE_VIRTUAL=Virtuální produkt (sada): neklesněte zásobu dětského produktu
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Použijte kupní cenu, pokud není k dispozici žádná poslední kupní cena
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Pohyby akcií budou mít datum inventury (místo data ověření zásob)
 inventoryChangePMPPermission=Povolit změnu hodnoty PMP pro produkt
 ColumnNewPMP=Nová jednotka PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=Zde si můžete zobrazit akcie (skutečné zásoby) k daném
 StockAtDateFutureDesc=Zde si můžete v budoucnu zobrazit akcie (virtuální akcie) k danému datu
 CurrentStock=Aktuální stav
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/cs_CZ/suppliers.lang b/htdocs/langs/cs_CZ/suppliers.lang
index ce2434b6a84..35368f625bb 100644
--- a/htdocs/langs/cs_CZ/suppliers.lang
+++ b/htdocs/langs/cs_CZ/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Objednávky k fakturám
 NbDaysToDelivery=Dodací lhůta (dny)
 DescNbDaysToDelivery=Nejdelší dodací lhůta produktů z této objednávky
 SupplierReputation=Reputace prodejce
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Ne objednávejte
 NotTheGoodQualitySupplier=Nízká kvalita
 ReputationForThisProduct=Pověst
diff --git a/htdocs/langs/cs_CZ/website.lang b/htdocs/langs/cs_CZ/website.lang
index a91cf601e84..cf30e5bd64d 100644
--- a/htdocs/langs/cs_CZ/website.lang
+++ b/htdocs/langs/cs_CZ/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Přidat webovou stránku
 Webpage=Webová stránka / kontejner
 AddPage=Přidat stránku / kontejner
 HomePage=Domovská stránka
-PageContainer=Stránka / kontejner
+PageContainer=Strana
 PreviewOfSiteNotYetAvailable=Náhled vašeho webu <strong> %s </strong> zatím není k dispozici. Nejprve musíte '<strong> Importovat celou šablonu webových stránek </strong>' nebo jen '<strong> Přidat stránku / kontejner </strong>'.
 RequestedPageHasNoContentYet=Požadovaná stránka s ID %s nemá dosud žádný obsah nebo byl odstraněn soubor cache .tpl.php. Upravte obsah stránky pro vyřešení tohoto problému.
 SiteDeleted=Webová stránka '%s' byla smazána
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Výměna se provádí na stránkách nebo kontejnerech %
 RSSFeed=RSS Feed
 RSSFeedDesc=Pomocí této adresy URL můžete získat RSS kanál nejnovějších článků typu blogpost
 PagesRegenerated=%s regenerováno stránky / kontejnery
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index b600c4805fe..3af2cf33fbc 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -11,19 +11,21 @@ ACCOUNTING_EXPORT_DEVISE=Eksporter valuta
 Selectformat=Vælg formatet til filen
 ACCOUNTING_EXPORT_FORMAT=Vælg formatet til filen
 ACCOUNTING_EXPORT_ENDLINE=Vælg linjeskift type
-ACCOUNTING_EXPORT_PREFIX_SPEC=Angiv præfiks for filnavn
+ACCOUNTING_EXPORT_PREFIX_SPEC=Angiv præfiks for filnavnet
 ThisService=Denne ydelse
 ThisProduct=Dette produkt
 DefaultForService=forvalg ydelse
 DefaultForProduct=Forvalg produkt
 CantSuggest=Kan ikke foreslå
 AccountancySetupDoneFromAccountancyMenu=Hovedparten af opsætningen for regnskabet sker fra menuen %s
-ConfigAccountingExpert=Konfiguration af ekspert Regnskabsmodulet
+ConfigAccountingExpert=Konfiguration af modulregnskabet (dobbelt indtastning)
 Journalization=Bogføring
-Journaux=Kladder
+Journals=Kladder
 JournalFinancial=Finanskladde
 BackToChartofaccounts=Tilbage til kontoplan
 Chartofaccounts=Kontoplan
+ChartOfSubaccounts=Diagram over individuelle konti
+ChartOfIndividualAccountsOfSubsidiaryLedger=Diagram over underregnskabets individuelle konti
 CurrentDedicatedAccountingAccount=Aktuel tildelt konto
 AssignDedicatedAccountingAccount=Ny konto, der skal tildeles
 InvoiceLabel=Fakturaetiket
@@ -33,8 +35,8 @@ OtherInfo=Anden information
 DeleteCptCategory=Fjern regnskabskonto fra gruppe
 ConfirmDeleteCptCategory=Er du sikker på, du vil fjerne denne regnskabskonto fra gruppen?
 JournalizationInLedgerStatus=Status for bogføring
-AlreadyInGeneralLedger=Allerede bogført
-NotYetInGeneralLedger=Kladder der ikke er bogført endnu
+AlreadyInGeneralLedger=Allerede overført i regnskabsjournaler og hovedbog
+NotYetInGeneralLedger=Endnu ikke overført i accouting tidsskrifter og hovedbog
 GroupIsEmptyCheckSetup=Gruppen er tom, kontroller opsætningen af ​​den brugerdefinerede regnskabsgruppe
 DetailByAccount=Vis detaljer efter konto
 AccountWithNonZeroValues=Konti med ikke-nul-værdier
@@ -43,7 +45,9 @@ CountriesInEEC=Lande i EØF
 CountriesNotInEEC=Lande ikke i EØF
 CountriesInEECExceptMe=Lande i EØF undtagen %s
 CountriesExceptMe=Alle lande undtagen %s
-AccountantFiles=Eksporter regnskabs dokumenter
+AccountantFiles=Eksporter kildedokumenter
+ExportAccountingSourceDocHelp=Med dette værktøj kan du eksportere de kildehændelser (liste og PDF-filer), der blev brugt til at generere din regnskab. For at eksportere dine tidsskrifter skal du bruge menuindgangen %s - %s.
+VueByAccountAccounting=Vis efter regnskabskonto
 
 MainAccountForCustomersNotDefined=Standardkonto for kunder, der ikke er defineret i opsætningen
 MainAccountForSuppliersNotDefined=Hoved kontokort for leverandører, der ikke er defineret i opsætningen
@@ -58,7 +62,7 @@ AccountancyAreaDescActionOnceBis=Næste skridt skal gøres for at spare tid i fr
 AccountancyAreaDescActionFreq=Følgende handlinger udføres normalt hver måned, uge ​​eller dag for meget store virksomheder ...
 
 AccountancyAreaDescJournalSetup=Trin %s: Opret eller tjek indholdet af din list med kladder fra menuen %s
-AccountancyAreaDescChartModel=TRIN: %s Kontroller, at der findes en model af kontoplan, eller opret en fra menuen %s
+AccountancyAreaDescChartModel=Trin %s: Kontroller, at der findes en skabelon til en kontoplan eller opret en fra menuen %s
 AccountancyAreaDescChart=TRIN %s:Vælg og/eller udfyld dit kontoplan fra menuen %s
 
 AccountancyAreaDescVat=Trin %s: Definer regnskabskonto for hver momssats. Til dette skal du bruge menupunktet %s.
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=Trin %s: Tilføj eller rediger eksisterende transakti
 
 AccountancyAreaDescClosePeriod=Trin %s: Luk periode, så vi kan ikke foretage ændringer i fremtiden.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=Et obligatorisk trin i opsætningen er ikke gennemført (regnskabskode ikke defineret for alle bankkonti)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Et obligatorisk trin i opsætningen er ikke afsluttet (regnskabskodejournal ikke defineret for alle bankkonti)
 Selectchartofaccounts=Vælg aktiv kontoplan
 ChangeAndLoad=Ret og indlæs
 Addanaccount=Tilføj en regnskabskonto
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger-konto
 SubledgerAccountLabel=Subledger-kontoetiket
 ShowAccountingAccount=Vis regnskabskonto
 ShowAccountingJournal=Vis kontokladde
+ShowAccountingAccountInLedger=Vis regnskabskonto i hovedbog
+ShowAccountingAccountInJournals=Vis regnskabskonto i tidsskrifter
 AccountAccountingSuggest=Forelslået regnskabskonto
 MenuDefaultAccounts=Standardkonti
 MenuBankAccounts=Bankkonti
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Bogfør Udgiftsrapport
 CreateMvts=Opret ny transaktion
 UpdateMvts=Rediger en transaktion
 ValidTransaction=Bekræft transaktion
-WriteBookKeeping=Registrer transaktioner i Ledger
+WriteBookKeeping=Registrer transaktioner i regnskab
 Bookkeeping=Hovedbog
+BookkeepingSubAccount=Underleverandør
 AccountBalance=Kontobalance
 ObjectsRef=Objektreference
 CAHTF=Samlet købeleverandør før skat
@@ -149,7 +156,8 @@ ACCOUNTING_MANAGE_ZERO=Tillad at administrere forskellige antal nuller i slutnin
 BANK_DISABLE_DIRECT_INPUT=Deaktiver direkte registrering af transaktionen på bankkonto
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Aktivér udkast til eksport på Journal
 ACCOUNTANCY_COMBO_FOR_AUX=Aktivér kombinationsliste for subsidiær konto (kan være langsom, hvis du har en masse tredjeparter)
-ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DATE_START_BINDING=Definer en dato for start af binding og overførsel i regnskab. Under denne dato overføres transaktionerne ikke til regnskab.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Ved regnskabsoverførsel skal du vælge periode som standard
 
 ACCOUNTING_SELL_JOURNAL=Salgskladde
 ACCOUNTING_PURCHASE_JOURNAL=Indkøbskladde
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Regnskabskonto for afventning
 DONATION_ACCOUNTINGACCOUNT=Regnskabskonto til registrering af donationer
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Regnskabskonto for at registrere abonnementer
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Regnskabskonto er som standard for at registrere kundeindbetaling
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Regnskabskonto som standard for de købte produkter (bruges hvis ikke defineret i produktarket)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Regnskabskonto som standard for de købte produkter i EØF (brugt, hvis ikke defineret i produktarket)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Regnskabskonto som standard for de købte produkter og importeret ud af EØF (brugt, hvis ikke defineret i produktarket)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Efter foruddefinerede grupper
 ByPersonalizedAccountGroups=Efter brugerdefinerede grupper
 ByYear=År
 NotMatch=Ikke angivet
-DeleteMvt=Slet posteringer i hovedbogen
+DeleteMvt=Slet nogle operationslinjer fra regnskabet
 DelMonth=Måned at slette
 DelYear=År, der skal slettes
 DelJournal=Kladde, der skal slettes
-ConfirmDeleteMvt=Dette vil slette alle linjer i hovedbogen for året / måneden og / eller fra en bestemt journal (Der kræves mindst et kriterium). Du bliver nødt til at genbruge funktionen 'Registrering i regnskab' for at få den slettede post tilbage i hovedbogen.
-ConfirmDeleteMvtPartial=Dette vil slette transaktionen fra Ledger (alle linjer, der er relateret til samme transaktion vil blive slettet)
+ConfirmDeleteMvt=Dette sletter alle driftslinjer i regnskabet for året / måneden og / eller for en bestemt journal (mindst et kriterium er påkrævet). Du bliver nødt til at genbruge funktionen '%s' for at få den slettede post tilbage i hovedbogen.
+ConfirmDeleteMvtPartial=Dette sletter transaktionen fra regnskabet (alle driftslinjer relateret til den samme transaktion slettes)
 FinanceJournal=Finanskladde
 ExpenseReportsJournal=Udgiftskladder
 DescFinanceJournal=Regnskabskladde inkl. alle betalingstyper med bankkonto
-DescJournalOnlyBindedVisible=Dette er en opfattelse af post, der er bundet til en regnskabsmæssig betragtning og kan være registreret i Regnskabet.
+DescJournalOnlyBindedVisible=Dette er en oversigt over poster, der er bundet til en regnskabskonto og kan registreres i tidsskrifterne og hovedbogen.
 VATAccountNotDefined=Momskonto ikke defineret
 ThirdpartyAccountNotDefined=Tredjepartskonto ikke defineret
 ProductAccountNotDefined=Varekonto ikke defineret
@@ -285,7 +295,7 @@ ShowTutorial=Vis selvstudie
 NotReconciled=Ikke afstemt
 
 ## Admin
-BindingOptions=Binding options
+BindingOptions=Bindende muligheder
 ApplyMassCategories=Anvend massekategorier
 AddAccountFromBookKeepingWithNoCategories=Tilgængelig konto endnu ikke i den personaliserede gruppe
 CategoryDeleted=Kategori for regnskabskonto er blevet slettet
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Denne kladde er allerede i brug
 AccountingAccountForSalesTaxAreDefinedInto=Bemærk: Regnskabskonto for salgsmoms er defineret i menuen <b> %s </b> - <b> %s </b>
 NumberOfAccountancyEntries=Antal poster
 NumberOfAccountancyMovements=Antal bevægelser
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Deaktiver binding og overførsel i regnskab ved salg (kundefakturaer tages ikke med i regnskabet)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Deaktiver binding og overførsel i regnskab ved køb (leverandørfakturaer tages ikke med i regnskabet)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Deaktiver binding og overførsel i regnskab på udgiftsrapporter (udgiftsrapporter tages ikke med i regnskabet)
 
 ## Export
 ExportDraftJournal=Eksporter udkast til kladde
@@ -326,6 +339,8 @@ Modelcsv_configurable=Eksporter CSV Konfigurerbar
 Modelcsv_FEC=Eksport FEC
 Modelcsv_Sage50_Swiss=Eksport til Sage 50 Schweiz
 Modelcsv_winfic=Eksport Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Eksport til Gestinum (v3)
+Modelcsv_Gestinumv5Export til Gestinum (v5)
 ChartofaccountsId=ID for kontoplan
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 2d6fe963905..d7714c0c1df 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -2,9 +2,9 @@
 Foundation=Fundament
 Version=Version
 Publisher=Forlægger
-VersionProgram=Programversion
-VersionLastInstall=Første installationsversion
-VersionLastUpgrade=Nyeste version
+VersionProgram=Program version
+VersionLastInstall=Første version installeret 
+VersionLastUpgrade=Seneste stabile version
 VersionExperimental=Eksperimentel
 VersionDevelopment=Udvikling
 VersionUnknown=Ukendt
@@ -37,6 +37,8 @@ UnlockNewSessions=Fjern forbindelseslås
 YourSession=Din session
 Sessions=Brugere Sessioner
 WebUserGroup=Webserver bruger / gruppe
+PermissionsOnFilesInWebRoot=Tilladelser til filer i web-rodmappen
+PermissionsOnFile=Tilladelser på fil %s
 NoSessionFound=Din PHP-konfiguration tillade ikke optagelse af aktive sessioner. Den mappe, der bruges til at gemme sessioner (<b> %s </b>), kan være beskyttet (for eksempel via operativsystemet eller ved PHP-direktivet open_basedir).
 DBStoringCharset=Database charset til at gemme data
 DBSortingCharset=Database charset for at sortere data
@@ -71,7 +73,7 @@ DisableJavascriptNote=Bemærk: Til test- eller fejlfindingsformål. For optimeri
 UseSearchToSelectCompanyTooltip=Også hvis du har et stort antal tredjeparter (> 100 000), kan du øge hastigheden ved at indstille konstant COMPANY_DONOTSEARCH_ANYWHERE til 1 i Setup-> Other. Søgningen er så begrænset til starten af ​​strengen.
 UseSearchToSelectContactTooltip=Også hvis du har et stort antal tredjeparter (> 100 000), kan du øge hastigheden ved at indstille konstant CONTACT_DONOTSEARCH_ANYWHERE til 1 i Setup-> Other. Søgningen er så begrænset til starten af ​​strengen.
 DelaiedFullListToSelectCompany=Vent, indtil der trykkes på en nøgle, inden du læser indholdet i kombinationslisten fra tredjepart. <br> Dette kan øge ydeevnen, hvis du har et stort antal tredjeparter, men det er mindre praktisk.
-DelaiedFullListToSelectContact=Vent, indtil der trykkes på en tast, inden du lægger indholdet på kontakt-kombinationsliste. <br> Dette kan øge ydeevnen, hvis du har et stort antal kontakter, men det er mindre praktisk)
+DelaiedFullListToSelectContact=Vent, indtil der trykkes på en tast, inden du indlæser indholdet på kontaktlisten. <br> Dette kan øge ydeevnen, hvis du har et stort antal kontakter, men det er mindre praktisk.
 NumberOfKeyToSearch=Antal tegn, der skal udløses søgning: %s
 NumberOfBytes=Antal byte
 SearchString=Søg streng
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=På tredjeparts dokument kan man vælge et
 JavascriptDisabled=JavaScript slået
 UsePreviewTabs=Brug forhåndsvisning faner
 ShowPreview=Vis forhåndsvisning
+ShowHideDetails=Vis skjul detaljer
 PreviewNotAvailable=Preview ikke tilgængeligt
 ThemeCurrentlyActive=Tema aktuelt aktive
 CurrentTimeZone=Aktuelle tidszone
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=Ny efter måned
 Emails=E-Post
 EMailsSetup=E-post sætop
-EMailsDesc=Denne side giver dig mulighed for at tilsidesætte dine standard PHP-parametre til afsendelse af e-mails. I de fleste tilfælde på Unix / Linux OS er PHP-opsætningen korrekt, og disse parametre er unødvendige.
+EMailsDesc=Denne side giver dig mulighed for at indstille parametre eller muligheder for afsendelse af e-mail.
 EmailSenderProfiles=E-mails afsender profiler
 EMailsSenderProfileDesc=Du kan holde denne sektion tom. Hvis du indtaster nogle e-mails her, vil de blive tilføjet til listen over mulige afsendere i kombinationsfeltet når din skrive en ny e-mail.
 MAIN_MAIL_SMTP_PORT=SMTP / SMTPS-port (standardværdi i php.ini: <b> %s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (hvis afsendelse af server kræver godkendelse)
 MAIN_MAIL_SMTPS_PW=SMTP-adgangskode (hvis afsendelse af server kræver godkendelse)
 MAIN_MAIL_EMAIL_TLS=Brug TLS (SSL) kryptering
 MAIN_MAIL_EMAIL_STARTTLS=Brug TLS (STARTTLS) kryptering
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Godkend autocertifikater til certificeringer
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Brug DKIM til at generere e-mail signatur
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain til brug med dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Navn på dkim selector
@@ -409,9 +413,9 @@ PriceBaseTypeToChange=Rediger priser med basisreferenceværdi defineret på
 MassConvert=Start bulkkonvertering
 PriceFormatInCurrentLanguage=Prisformat på nuværende sprog
 String=String
-String1Line=String (1 line)
+String1Line=Streng (1 linje)
 TextLong=Lang tekst
-TextLongNLines=Long text (n lines)
+TextLongNLines=Lang tekst (n linjer)
 HtmlText=Html tekst
 Int=Heltal
 Float=Float
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Blankt felt her betyder, at denne værdi vil blive g
 ExtrafieldParamHelpselect=Liste over værdier skal være linjer med formatnøgle, værdi (hvor nøglen ikke kan være '0') <br> <br> for eksempel: <br> 1, værdi1 <br> 2, værdi2 <br> kode3, værdi3 <br> ... <br> <br> For at få liste afhængig af en anden komplementær attributliste: <br> 1, værdi1 | options_ <i> parent_list_code </i>: parent_key <br> 2, value2 | options_ <i> parent_list_code </i>: parent_key <br> <br> For at få listen afhængig af en anden liste: <br> 1, værdi1 | <i> parent_list_code </i>: parent_key <br> 2, value2 | <i> parent_list_code </i>: parent_key
 ExtrafieldParamHelpcheckbox=Liste over værdier skal være linjer med formatnøgle, værdi (hvor nøglen ikke kan være '0') <br> <br> for eksempel: <br> 1, værdi1 <br> 2, værdi2 <br> 3, værdi3 <br> ...
 ExtrafieldParamHelpradio=Liste over værdier skal være linjer med formatnøgle, værdi (hvor nøglen ikke kan være '0') <br> <br> for eksempel: <br> 1, værdi1 <br> 2, værdi2 <br> 3, værdi3 <br> ...
-ExtrafieldParamHelpsellist=Liste over værdier kommer fra en tabel <br> Syntaks: tabelnavn: label_field: id_field :: filter <br> Eksempel: c_typent: libelle: id :: filter <br> <br> - idfilter er nødvendigvis en primær int nøgle <br> - filteret kan være en simpel test = 1) for at vise kun aktiv værdi <br> Du kan også bruge $ ID $ i filter heks er det nuværende id for nuværende objekt <br> For at gøre et SELECT i filter brug $ SEL $ <br> hvis du vil filtrere på ekstrafelter brug syntax extra.fieldcode = ... (hvor feltkode er koden for ekstrafelt) <br> <br> For at få listen afhængig af en anden komplementær attributliste: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> For at have listen afhænger af en anden liste: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
+ExtrafieldParamHelpsellist=Liste over værdier kommer fra en tabel <br> Syntaks: tabelnavn: label_field: id_field :: filter <br> Eksempel: c_typent: libelle: id :: filter <br> <br> - id_field er nødvendigvis en primær nøgle = 1) for kun at vise aktiv værdi <br> Du kan også bruge $ ID $ i filteret, som er det aktuelle id for det aktuelle objekt <br> For at bruge en SELECT i filteret skal du bruge nøgleordet $ SEL $ til at omgå anti-injektionsbeskyttelse. <br> hvis du vil filtrere på ekstrafelter skal du bruge syntaks ekstra.fieldcode = ... (hvor feltkode er koden for extrafield) <br> <br> For at få listen afhængig af en anden supplerende attributliste: <br> c_t: <i> parent_list_code </i> | parent_column: filter <br> <br> For at få listen afhængig af en anden liste: <br> c_typent: libelle: id: a049
 ExtrafieldParamHelpchkbxlst=Liste over værdier kommer fra en tabel <br> Syntaks: tabelnavn: label_field: id_field :: filter <br> Eksempel: c_typent: libelle: id :: filter <br> <br> filter kan være en simpel test (f.eks. Aktiv = 1) for at vise kun aktiv værdi <br> Du kan også bruge $ ID $ i filter heks er det nuværende id for nuværende objekt <br> For at gøre et SELECT i filter bruger $ SEL $ <br> hvis du vil filtrere på ekstrafelter brug syntax extra.fieldcode = ... (hvor feltkode er kode for ekstrafelt) <br> <br> For at få listen afhængig af en anden komplementær attributliste: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> For at få listen afhængig af en anden liste: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
-ExtrafieldParamHelplink=Parametre skal være ObjectName: Classpath <br> Syntaks: Objektnavn: Klassepath <br> Eksempler: <br> Societe: societe / class / societe.class.php <br> Kontakt: kontakt / class / contact.class.php
+ExtrafieldParamHelplink=Parametre skal være ObjectName: Classpath <br> Syntaks: ObjectName: Classpath
 ExtrafieldParamHelpSeparator=Hold tomt for en simpel separator <br> Indstil dette til 1 for en sammenklappende separator (åben som standard for ny session, og derefter bevares status for hver brugersession) <br> Indstil dette til 2 for en sammenklappende separator (kollapset som standard for ny session, derefter holdes status foran hver brugersession)
 LibraryToBuildPDF=Bibliotek, der bruges for PDF generation
 LocalTaxDesc=Nogle lande kan anmode om to eller tre skatter på hver faktura linje. Hvis dette er tilfældet, skal du vælge typen for den anden og tredje skat og dens sats. Mulig type er:<br>1: Lokal afgift gælder for varer og ydelser uden moms (lokal moms beregnes efter beløb uden skat)<br>2: Lokal afgift gælder for varer og tjenesteydelser inklusive moms (lokal moms beregnes på beløb + hovedafgift)<br>3: lokal skat gælder for varer uden moms (lokal moms beregnes på beløb uden skat)<br>4: lokal skat gælder for varer inklusive moms (lokal moms beregnes på beløb + hovedstol)<br>5: lokal skat gælder for tjenester uden moms på beløb uden skat)<br>6: Lokal afgift gælder for tjenester inklusive moms (lokal moms er beregnet på beløb + skat)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s efterfulgt af det afkortede kundenavn med
 ModuleCompanyCodeSupplierDigitaria=%s efterfulgt af det afkortede leverandørnavn med antallet af tegn: %s for leverandørens regnskabskode.
 Use3StepsApproval=Som standard skal indkøbsordrer oprettes og godkendes af 2 forskellige brugere (et trin / bruger til oprettelse og et trin / bruger at godkende. Bemærk at hvis brugeren har begge tilladelser til at oprette og godkende, er et trin / bruger tilstrækkeligt) . Du kan spørge med denne mulighed for at indføre et tredje trin / brugergodkendelse, hvis mængden er højere end en dedikeret værdi (så 3 trin vil være nødvendige: 1 = bekræftelse, 2 = første godkendelse og 3 = anden godkendelse, hvis mængden er tilstrækkelig). <br> Indstil dette til tomt, hvis en godkendelse (2 trin) er tilstrækkelig, angiv den til en meget lav værdi (0,1), hvis der kræves en anden godkendelse (3 trin).
 UseDoubleApproval=Brug en 3-trins godkendelse, når beløbet (uden skat) er højere end ...
-WarningPHPMail=ADVARSEL: Det er ofte bedre at opsætte udgående e-mails for at bruge e-mail-serveren hos din udbyder i stedet for standardopsætningen. Nogle email-udbydere (som Yahoo) tillader dig ikke at sende en mail fra en anden server end deres egen server. Din nuværende opsætning bruger serveren til applikationen til at sende e-mail og ikke din e-mail-udbyder, så nogle modtagere (den, der er kompatibel med den restriktive DMARC-protokol), vil spørge din e-mail-udbyder, hvis de kan acceptere din e-mail og nogle emailudbydere (som Yahoo) kan svare "nej", fordi serveren ikke er deres, så få af dine sendte e-mails muligvis ikke accepteres (pas også på din e-mail-udbyders sendekvote). <br> Hvis din e-mail-udbyder (som Yahoo) har denne begrænsning, skal du ændre e-mailopsætning for at vælge den anden metode "SMTP-server" og indtaste SMTP-serveren og legitimationsoplysningerne fra din e-mailudbyder.
+WarningPHPMail=ADVARSEL: Opsætningen til at sende e-mails fra applikationen bruger standardgenerisk opsætning. Det er ofte bedre at konfigurere udgående e-mails for at bruge e-mail-udbyderens e-mail-server i stedet for standardopsætningen af flere grunde:
+WarningPHPMailA=- Brug af e-mail-udbyderens server øger pålideligheden af din e-mail, så det øger leverings pålidelighed  uden at blive markeret som SPAM
+WarningPHPMailB=- Nogle e-mail-tjenesteudbydere (som Yahoo) tillader dig ikke at sende en e-mail fra en anden server end deres egen server. Din nuværende opsætning bruger programmets server til at sende e-mail og ikke din e-mail-udbyders server, så nogle modtagere (den der er kompatibel med den restriktive DMARC-protokol) vil spørge din e-mail-udbyder, om de kan acceptere din e-mail og nogle e-mail-udbydere (som Yahoo) svarer muligvis "nej", fordi serveren ikke er deres, så få af dine sendte e-mails accepteres muligvis ikke til levering (pas også på din e-mail-udbyders afsendekvote).
+WarningPHPMailC=- Brug af din egen e-mail-tjenesteudbyders SMTP-server til at sende e-mails er også interessant, så alle e-mails, der sendes fra applikationen, gemmes også i din "Sendte" mappe i din postkasse.
+WarningPHPMailD=Hvis metoden 'PHP Mail' virkelig er den metode, du gerne vil bruge, kan du fjerne denne advarsel ved at tilføje konstanten MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP til 1 i Home - Setup - Other.
 WarningPHPMail2=Hvis din e-mail SMTP udbyder skal begrænse e-mail klienten til nogle IP-adresser (meget sjælden), er dette IP-adressen til e-mail bruger agenten (MUA) til din ERP CRM-applikation: <strong> %s </strong>.
-WarningPHPMailSPF=Hvis domænenavnet i din afsender-e-mail-adresse er beskyttet af SPF (spørg din e-mail-udbyder), skal du inkludere følgende IP'er i SPF-posten til DNS for dit domæne:<strong>%s</strong>.
+WarningPHPMailSPF=Hvis domænenavnet i din afsender-e-mail-adresse er beskyttet af en SPF-post (spørg dit domænenavn til registrering), skal du tilføje følgende IP'er i SPF-registreringen af DNS for dit domæne: <strong> %s </strong>.
 ClickToShowDescription=Klik for at vise beskrivelse
 DependsOn=Dette modul har brug for modulet / modulerne
 RequiredBy=Dette modul er påkrævet efter modul (er)
@@ -546,13 +554,11 @@ Module54Desc=Forvaltning af kontrakter (tjenester eller tilbagevendende abonneme
 Module55Name=Stregkoder
 Module55Desc=Stregkoder administration
 Module56Name=Betaling med kreditoverførsel
-Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Payments by Direct Debit
-Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
+Module56Desc=Styring af betaling af leverandører via ordrer med kreditoverførsel. Det inkluderer generering af SEPA-fil til europæiske lande.
+Module57Name=Betalinger med Direct Debit
+Module57Desc=Forvaltning af Direct Debit. Det inkluderer generering af SEPA-fil til europæiske lande.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial integration
-Module59Name=Bookmark4u
-Module59Desc=Tilføj funktion til at generere Bookmark4u konto fra en Dolibarr konto
 Module60Name=mærkater
 Module60Desc=Håndtering af mærkater
 Module70Name=Interventioner
@@ -656,7 +662,7 @@ Module50200Desc=Tilbyde kunder en PayPal-betalingssideside (PayPal-konto eller k
 Module50300Name=Stribe
 Module50300Desc=Tilbyde kunder en Stripe online betalingsside (kredit / betalingskort). Dette kan bruges til at give dine kunder mulighed for at foretage ad hoc-betalinger eller betalinger relateret til et bestemt Dolibarr-objekt (faktura, bestilling osv.)
 Module50400Name=Regnskab (dobbeltindtastning)
-Module50400Desc=Regnskabsadministration (dobbelt poster, støtte generel og ekstra ledger). Eksporter højboksen i flere andre regnskabsmæssige softwareformater.
+Module50400Desc=Regnskabshåndtering (dobbelt poster, support hoved- og datterselskaber). Eksporter hovedbogen i flere andre regnskabssoftwareformater.
 Module54000Name=PrintIPP
 Module54000Desc=Direkte udskrivning (uden at åbne dokumenterne) ved hjælp af IPP-konnektorer (Printer skal være synlig fra serveren, og CUPS skal installeres på serveren).
 Module55000Name=Afstemning, Undersøgelse eller Afstemning
@@ -671,7 +677,7 @@ Module63000Name=Ressourcer
 Module63000Desc=Administrer ressourcer (printere, biler, værelser, ...) til tildeling til arrangementer
 Permission11=Læs fakturaer
 Permission12=Opret/rediger kundefakturaer
-Permission13=Unvalidate fakturaer
+Permission13=Ugyldig kundefakturaer
 Permission14=Bekræft fakturaer
 Permission15=Send fakturaer via e-mail
 Permission16=Opret betalinger for fakturaer
@@ -688,6 +694,7 @@ Permission32=Opret/rediger varer/ydelser
 Permission34=Slet varer/ydelser
 Permission36=Se/administrer skjulte varer
 Permission38=Eksportere produkter
+Permission39=Ignorer mindsteprisen
 Permission41=Læs projekter og opgaver (delt projekt og projekter jeg er kontakt til). Kan også indtaste tidskrævet, for mig eller mit hierarki, på tildelte opgaver (Tidsskema)
 Permission42=Opret / rediger projekter (delt projekt og projekter jeg er kontakt til). Kan også oprette opgaver og tildele brugere projekt og opgaver
 Permission44=Slet projekter (delte projekter og projekter jeg er kontaktperson for)
@@ -696,6 +703,9 @@ Permission61=Læs interventioner
 Permission62=Opret/rediger indgreb
 Permission64=Slet interventioner
 Permission67=Eksporter interventioner
+Permission68=Send interventioner via e-mail
+Permission69=Valider indgreb
+Permission70=Ugyldige indgreb
 Permission71=Læs medlemmer
 Permission72=Opret/rediger medlemmer
 Permission74=Slet medlemmer
@@ -718,6 +728,7 @@ Permission95=Læs rapporter
 Permission101=Læs sendings
 Permission102=Opret/rediger forsendelser
 Permission104=Bekræft forsendelser
+Permission105=Send afsendelser via e-mail
 Permission106=Eksporter forsendelser
 Permission109=Slet forsendelser
 Permission111=Læs finanskonti
@@ -825,10 +836,11 @@ Permission402=Opret/rediger rabatter
 Permission403=Bekræft rabatter
 Permission404=Slet rabatter
 Permission430=Brug Debug Bar
-Permission511=Læs lønudbetalinger
+Permission511=Læs lønudbetalinger (dine og underordnede)
 Permission512=Opret / modificer lønudbetalinger
 Permission514=Slet betaling af lønninger
-Permission517=Eksport lønninger
+Permission517=Læs alle lønninger
+Permission519=Eksportlønninger
 Permission520=Læs lån
 Permission522=Opret / modificer lån
 Permission524=Slet lån
@@ -839,16 +851,19 @@ Permission532=Opret/rediger ydelser
 Permission534=Slet ydelser
 Permission536=Se/administrer skjulte ydelser
 Permission538=Eksport af tjenesteydelser
-Permission561=Read payment orders by credit transfer
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
-Permission564=Record Debits/Rejections of credit transfer
+Permission561=Læs betalingsordrer ved kreditoverførsel
+Permission562=Opret / rediger betalingsordre ved kreditoverførsel
+Permission563=Send / send betalingsordre ved kreditoverførsel
+Permission564=Registrer debiteringer / afvisninger af kreditoverførsel
+Permission601=Læs stickers
+Permission602=Opret / rediger stickers
+Permission609=Slet stickers
 Permission650=Læs regninger af materialer
 Permission651=Opret / opdater materialeregninger
 Permission652=Slet materialeregninger
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
+Permission660=Læs fremstillingsordre (MO)
+Permission661=Opret / opdater produktionsordre (MO)
+Permission662=Slet produktionsordre (MO)
 Permission701=Læs donationer
 Permission702=Opret/rediger donationer
 Permission703=Slet donationer
@@ -858,8 +873,8 @@ Permission773=Slet udgiftsrapporter
 Permission774=Læs alle udgiftsrapporter (selv for brugere, der ikke er underordnede)
 Permission775=Godkendelse af udgiftsrapporter
 Permission776=Betalingsomkostningsrapporter
-Permission777=Read expense reports of everybody
-Permission778=Create/modify expense reports of everybody
+Permission777=Læs udgiftsrapporter fra alle
+Permission778=Opret / rediger udgiftsrapporter for alle
 Permission779=Eksportudgiftsrapporter
 Permission1001=Læs bestande
 Permission1002=Opret/rediger varehuse
@@ -884,7 +899,9 @@ Permission1185=Godkend købsordrer
 Permission1186=Bestil indkøbsordrer
 Permission1187=Bekræft modtagelse af købsordrer
 Permission1188=Slet indkøbsordrer
+Permission1189=Marker / fjern markeringen i en indkøbsordres modtagelse
 Permission1190=Godkend (anden godkendelse) købsordrer
+Permission1191=Eksportér leverandørordrer og deres attributter
 Permission1201=Få resultatet af en eksport
 Permission1202=Opret/rediger en eksport
 Permission1231=Læs leverandørfakturaer
@@ -898,6 +915,8 @@ Permission1251=Kør massen import af eksterne data i databasen (data belastning)
 Permission1321=Eksporter kunde fakturaer, attributter og betalinger
 Permission1322=Genåb en betalt regning
 Permission1421=Eksporter salgsordrer og attributter
+Permission1521=Læs dokumenter
+Permission1522=Slet dokumenter
 Permission2401=Læs handlinger (begivenheder eller opgaver), der er knyttet til hans brugerkonto (hvis ejer af begivenheden eller bare er tildelt)
 Permission2402=Opret / rediger handlinger (begivenheder eller opgaver), der er knyttet til hans brugerkonto (hvis ejeren af begivenheden)
 Permission2403=Slet handlinger (begivenheder eller opgaver), der er knyttet til hans brugerkonto (hvis ejeren af begivenheden)
@@ -912,7 +931,7 @@ Permission2515=Opsæt dokumentdokumenter
 Permission2801=Brug FTP-klient i læsemodus (kun gennemse og download)
 Permission2802=Brug FTP-klient i skrivefunktion (slet eller upload filer)
 Permission3200=Læs arkiverede begivenheder og fingeraftryk
-Permission3301=Generate new modules
+Permission3301=Generer nye moduler
 Permission4001=Se medarbejdere
 Permission4002=Opret medarbejdere
 Permission4003=Slet medarbejdere
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Brug Point of Sale
+Permission50101=Brug salgssted (SimplePOS)
+Permission50151=Brug salgssted (TakePOS)
 Permission50201=Læs transaktioner
 Permission50202=Import transaktioner
+Permission50330=Læs genstande fra Zapier
+Permission50331=Opret / opdater objekter af Zapier
+Permission50332=Slet objekter fra Zapier
 Permission50401=Bind produkter og fakturaer med regnskabskonti
 Permission50411=Læs operationer i hovedbok
 Permission50412=Skriv / rediger handlinger i hovedbok
@@ -958,10 +981,21 @@ Permission63001=Læs ressourcer
 Permission63002=Opret / modificer ressourcer
 Permission63003=Slet ressourcer
 Permission63004=Link ressourcer til begivenheder i tidsplan
+Permission64001=Tillad direkte udskrivning
+Permission67000=Tillad udskrivning af kvitteringer
+Permission68001=Læs intracomm rapport
+Permission68002=Opret / rediger intracomm-rapport
+Permission68004=Slet intracomm-rapport
+Permission941601=Læs kvitteringer
+Permission941602=Opret og rediger kvitteringer
+Permission941603=Valider kvitteringer
+Permission941604=Send kvitteringer via e-mail
+Permission941605=Eksportkvitteringer
+Permission941606=Slet kvitteringer
 DictionaryCompanyType=Tredjepartstyper
 DictionaryCompanyJuridicalType=Tredjeparts juridiske enheder
-DictionaryProspectLevel=Prospect potential level for companies
-DictionaryProspectContactLevel=Prospect potential level for contacts
+DictionaryProspectLevel=prospekt potentiale niveau for virksomheder
+DictionaryProspectContactLevel=Prospekt potentiale niveau for kontakter
 DictionaryCanton=Stater / provinser
 DictionaryRegion=Regioner
 DictionaryCountry=Lande
@@ -991,12 +1025,14 @@ DictionaryEMailTemplates=Email skabeloner
 DictionaryUnits=Enheder
 DictionaryMeasuringUnits=Måleenheder
 DictionarySocialNetworks=Sociale netværk
-DictionaryProspectStatus=Prospect status for companies
-DictionaryProspectContactStatus=Prospect status for contacts
+DictionaryProspectStatus=Prospektstatus for virksomheder
+DictionaryProspectContactStatus=Prospektstatus for kontakter
 DictionaryHolidayTypes=Typer af orlov
 DictionaryOpportunityStatus=Ledestatus for projekt / bly
 DictionaryExpenseTaxCat=Udgiftsrapport - Transportkategorier
 DictionaryExpenseTaxRange=Omkostningsrapport - Område efter transportkategori
+DictionaryTransportMode=Intracomm rapport - Transporttilstand
+TypeOfUnit=Type af enhed
 SetupSaved=Opsætning gemt
 SetupNotSaved=Opsætning er ikke gemt
 BackToModuleList=Tilbage til modul listen
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Etiket, som bruges som standard, hvis ingen oversættelse kan
 LabelOnDocuments=Etiketten på dokumenter
 LabelOrTranslationKey=Etiket eller oversættelsestast
 ValueOfConstantKey=Værdi af en konfigurationskonstant
+ConstantIsOn=Mulighed %s er aktiveret
 NbOfDays=Antal dage
 AtEndOfMonth=Ved udgangen af måneden
 CurrentNext=Aktuel / Næste
@@ -1091,7 +1128,7 @@ LoginPage=Login side
 BackgroundImageLogin=Baggrundsbillede
 PermanentLeftSearchForm=Faste search form på venstre menu
 DefaultLanguage=Standard sprog
-EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
+EnableMultilangInterface=Aktiver understøttelse af flere sprog for kunde- eller leverandørrelationer
 EnableShowLogo=Vis firmaets logo i menuen
 CompanyInfo=Virksomhed/Organisation
 CompanyIds=Virksomhed / Organisations identiteter
@@ -1145,6 +1182,7 @@ InfoWebServer=Om webserver
 InfoDatabase=Om Database
 InfoPHP=Om PHP
 InfoPerf=Om forestillinger
+InfoSecurity=Om sikkerhed
 BrowserName=Browser navn
 BrowserOS=Browser OS
 ListOfSecurityEvents=Liste over Dolibarr sikkerhed begivenheder
@@ -1194,7 +1232,8 @@ RestoreDesc=For at gendanne en Dolibarr-backup, kræves der to trin.
 RestoreDesc2=Gendan sikkerhedskopieringsfilen (f.eks. Zip-fil) af "dokumenter" -mappen til en ny Dolibarr-installation eller i denne aktuelle dokumentmappe (<b> %s </b>).
 RestoreDesc3=Gendan database struktur og data fra en backup dump fil i databasen af den nye Dolibarr installation eller i databasen af denne nuværende installation (<b> %s </b>). Advarsel, når genoprettelsen er færdig, skal du bruge et login / adgangskode, der eksisterede fra backuptidspunktet / installationen for at oprette forbindelse igen. <br> For at gendanne en backup database til denne nuværende installation, kan du følge denne assistent.
 RestoreMySQL=MySQL import
-ForcedToByAModule= Denne regel er tvunget til <b>at %s</b> ved en aktiveret modul
+ForcedToByAModule=Denne regel er tvunget til <b>at %s</b> ved en aktiveret modul
+ValueIsForcedBySystem=Denne værdi tvinges af systemet. Du kan ikke ændre det.
 PreviousDumpFiles=Eksisterende backup filer
 PreviousArchiveFiles=Eksisterende arkivfiler
 WeekStartOnDay=Første dag i ugen
@@ -1255,8 +1294,8 @@ WarningAtLeastKeyOrTranslationRequired=Et søgekriterium kræves i det mindste f
 NewTranslationStringToShow=Ny oversættelsestreng, der skal vises
 OriginalValueWas=Den oprindelige oversættelse overskrives. Oprindelig værdi var: <br> <br> %s
 TransKeyWithoutOriginalValue=Du har tvinget en ny oversættelse til oversættelsessnøglen '<strong> %s </ strong>', der ikke findes i nogen sprogfiler
-TitleNumberOfActivatedModules=Activated modules
-TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Aktiverede moduler
+TotalNumberOfActivatedModules=Aktiverede moduler: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Du skal i det mindste aktivere 1 modul
 ClassNotFoundIntoPathWarning=Klasse %s ikke fundet i PHP-sti
 YesInSummer=Ja om sommeren
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP-komponent %s indlæses
 PreloadOPCode=Forudindlæst OPCode bruges
 AddRefInList=Vis kunde / sælger ref. info liste (vælg liste eller combobox) og det meste af hyperlink. <br> Tredjeparter vil blive vist med et navneformat af "CC12345 - SC45678 - The Big Company corp." i stedet for "The Big Company Corp".
 AddAdressInList=Vis kunde / leverandør adresse info liste (vælg liste eller combobox) <br> Tredjeparter vil blive vist med et navneformat af "The Big Company Corp. - 21 Jump Street 123456 Big Town - USA" i stedet for "The Big Company Corp".
+AddEmailPhoneTownInContactList=Vis kontakt-e-mail (eller telefoner, hvis ikke defineret) og byinfo-liste (vælg liste eller kombinationsboks) <br> Kontakter vises med navnet format "Dupond Durand - dupond.durand@email.com - Paris" eller "Dupond Durand - 06 07 59 65 66 - Paris "i stedet for" Dupond Durand ".
 AskForPreferredShippingMethod=Anmod om en foretrukket forsendelsesmetode for tredjeparter.
 FieldEdition=Område udgave %s
 FillThisOnlyIfRequired=Eksempel: +2 (kun udfyld hvis problemer med tidszoneforskydning opstår)
@@ -1282,7 +1322,7 @@ GetBarCode=Få stregkode
 NumberingModules=Nummerering modeller
 DocumentModules=Dokumentmodeller
 ##### Module password generation
-PasswordGenerationStandard=Returnere en adgangskode, der genereres i henhold til interne Dolibarr algoritme: 8 tegn indeholder delt tal og tegn med små bogstaver.
+PasswordGenerationStandard=Returner en adgangskode, der er genereret i henhold til intern Dolibarr-algoritme: %s tegn, der indeholder delte tal og tegn i små bogstaver.
 PasswordGenerationNone=Foreslå ikke en genereret adgangskode. Adgangskoden skal indtastes manuelt.
 PasswordGenerationPerso=Ret en adgangskode i overensstemmelse med din personligt definerede konfiguration.
 SetupPerso=Ifølge din konfiguration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email er påkrævet for at oprette et nyt medlem
 MemberSendInformationByMailByDefault=Checkbox til at sende mail bekræftelse til medlemmerne er slået til som standard
 VisitorCanChooseItsPaymentMode=Besøgende kan vælge mellem tilgængelige betalingsformer
 MEMBER_REMINDER_EMAIL=Aktivér automatisk påmindelse <b> via e-mail </b> af udløbne abonnementer. Bemærk: Modul <strong> %s </strong> skal være aktiveret og korrekt konfigureret til at sende påmindelser.
+MembersDocModules=Dokumentskabeloner til dokumenter genereret fra medlemsregistrering
 ##### LDAP setup #####
 LDAPSetup=LDAP-opsætning
 LDAPGlobalParameters=Globale parametre
@@ -1523,7 +1564,9 @@ LDAPDescValues=Eksempel værdier er konstrueret til <b>OpenLDAP</b> med følgend
 ForANonAnonymousAccess=For en autentificeret adgang (for en skriveadgangen for eksempel)
 PerfDolibarr=Prestationsopsætning / optimeringsrapport
 YouMayFindPerfAdviceHere=Denne side giver nogle checks eller råd vedrørende performance.
-NotInstalled=Ikke installeret, så din server er ikke bremset af dette.
+NotInstalled=Ikke installeret.
+NotSlowedDownByThis=Ikke bremset af dette.
+NotRiskOfLeakWithThis=Ikke risiko for lækage med dette.
 ApplicativeCache=Applikationsbuffer
 MemcachedNotAvailable=Ingen applikationsbuffer fundet. Du kan forbedre ydeevnen ved at installere en cache-server Memcached og et modul, der kan bruge denne cache-server. <br> Mere information her <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN"> http: //wiki.dolibarr.org/index.php/Module_MemCached_EN </a>. <br> Bemærk, at en masse web hosting udbyder ikke giver sådan cache server.
 MemcachedModuleAvailableButNotSetup=Modul memcached for applikationscache fundet, men opsætning af modul er ikke komplet.
@@ -1571,9 +1614,9 @@ SyslogLevel=Niveau
 SyslogFilename=Filnavn og sti
 YouCanUseDOL_DATA_ROOT=Du kan bruge DOL_DATA_ROOT / dolibarr.log for en logfil i Dolibarr "dokumenter" mappen. Du kan indstille en anden vej til at gemme denne fil.
 ErrorUnknownSyslogConstant=Konstant %s er ikke en kendt syslog konstant
-OnlyWindowsLOG_USER=Windows understøtter kun LOG_USER
+OnlyWindowsLOG_USER=På Windows understøttes kun LOG_USER-faciliteten
 CompressSyslogs=Komprimering og backup af fejlfindingslogfiler (genereret af modul Log til fejlfinding)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Antal sikkerhedskopilogfiler, der skal gemmes
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Konfigurer rengøringsplanlagt job for at indstille log backupfrekvens
 ##### Donations #####
 DonationsSetup=Indstilling af donationsmodul
@@ -1629,7 +1672,7 @@ AdvancedEditor=Avanceret tekstredigeringsværktøj
 ActivateFCKeditor=Aktivér FCKeditor for:
 FCKeditorForCompany=WYSIWIG oprettelse/redigering af beskrivelseselementer og noter (undtagen varer/ydelser)
 FCKeditorForProduct=WYSIWIG oprettelse/redigering af beskrivelse/noter for varer/ydelser
-FCKeditorForProductDetails=WYSIWIG oprettelse / udgave af produkter detaljer linjer for alle enheder (forslag, ordrer, fakturaer osv. ..). <font class="warning">Advarsel: Aktivering af denne indstilling anbefales ikke, da det kan skabe problemer med specialtegn og sideformatering, når du bygger PDF-filer.</font>
+FCKeditorForProductDetails=WYSIWIG oprettelse / udgave af produkt detaljers linjer for alle enheder (forslag, ordrer, fakturaer osv ...). <span class="warning"> Advarsel: Brug af denne indstilling til denne sag anbefales ikke, da det kan skabe problemer med specialtegn og sideformatering, når du bygger PDF-filer. </span>
 FCKeditorForMailing= WYSIWIG oprettelsen / udgave af postforsendelser
 FCKeditorForUserSignature=WYSIWIG oprettelse / udgave af bruger signatur
 FCKeditorForMail=WYSIWIG oprettelse / udgave for al mail (undtagen Værktøjer-> eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Opsætning af lagermodul
 IfYouUsePointOfSaleCheckModule=Hvis du bruger standardmodulet (POS) som standard eller et eksternt modul, kan denne opsætning ignoreres af dit POS-modul. De fleste POS-moduler er som standard designet til at oprette en faktura med det samme og reducere lager uanset valgmulighederne her. Så hvis du har brug for eller ikke har et lagerfald, når du registrerer et salg fra din POS, skal du også kontrollere din POS-modulopsætning.
 ##### Menu #####
 MenuDeleted=Menu slettet
+Menu=Menu
 Menus=Menuer
 TreeMenuPersonalized=Tilpassede menuer
 NotTopTreeMenuPersonalized=Personlige menuer, der ikke er knyttet til en topmenuindgang
 NewMenu=Ny menu
-Menu=Udvælgelse af menuen
 MenuHandler=Menu handling
 MenuModule=Kilde modul
 HideUnauthorizedMenu= Skjul uautoriserede menuer (grå)
@@ -1694,15 +1737,16 @@ AGENDA_USE_EVENT_TYPE=Brug begivenhedstyper (styret i menuopsætning -> Ordbøge
 AGENDA_USE_EVENT_TYPE_DEFAULT=Indstil denne standardværdi automatisk for type begivenhed i begivenhedsoprettelsesformular
 AGENDA_DEFAULT_FILTER_TYPE=Indstil denne type begivenhed automatisk i søgefilter i dagsordblik
 AGENDA_DEFAULT_FILTER_STATUS=Indstil denne status automatisk for begivenheder i søgefilter i dagsordblik
-AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Aktivér hændelsespåmindelse <b> via e-mails </b> (påmindelsesindstilling / forsinkelse kan defineres på hver hændelse). Bemærk: Modul <strong> %s </strong> skal være aktiveret og korrekt konfigureret for at få påmindelse sendt med den korrekte frekvens.
-AGENDA_REMINDER_BROWSER=Aktivér hændelsespåmindelse <b> på brugerens browser </ b> (når hændelsesdatoen er nået, kan hver bruger nægte dette fra browserbekræftelsesspørgsmålet)
+AGENDA_DEFAULT_VIEW=Hvilken visning vil du åbne som standard, når du vælger menu Agenda
+AGENDA_REMINDER_BROWSER=Aktivér påmindelse om begivenhed <b> i brugerens browser </b> (Når påmindelsesdato er nået, vises en popup af browseren. Hver bruger kan deaktivere sådanne underretninger fra sin browseropsætning).
 AGENDA_REMINDER_BROWSER_SOUND=Aktivér lydmeddelelse
+AGENDA_REMINDER_EMAIL=Aktiver påmindelse om begivenhed <b> via e-mails </b> (påmindelsesmulighed / forsinkelse kan defineres for hver begivenhed).
+AGENDA_REMINDER_EMAIL_NOTE=Bemærk: Frekvensen af opgaven %s skal være tilstrækkelig til at være sikker på, at påmindelsen sendes på det rigtige tidspunkt.
 AGENDA_SHOW_LINKED_OBJECT=Vis linkede objekter i tidsplanvisning
 ##### Clicktodial #####
 ClickToDialSetup=Opsætning af Klik-for-at-ringe-modulet
 ClickToDialUrlDesc=Url kaldes, når man klikke på telefon billed. I URL kan du bruge tags <br> <b> __ PHONETO __ </b>, der vil blive erstattet med telefonnummeret til den person, der skal ringe <br> <b> __ PHONEFROM __ </b>, der vil blive erstattet med telefonnummeret til opkaldet person (din) <br> <b> __ LOGIN __ </b>, der vil blive erstattet med clicktodial login (defineret på brugerkort) <br> <b> __ PASS __ </b>, der vil blive erstattet med clicktodial adgangskode (defineret på bruger kort).
-ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
+ClickToDialDesc=Dette modul ændrer telefonnumre, når du bruger en stationær computer, til klikbare links. Et klik ringer op til nummeret. Dette kan bruges til at starte telefonopkaldet, når du bruger en blød telefon på skrivebordet eller når du f.eks. Bruger et CTI-system baseret på SIP-protokol. Bemærk: Når du bruger en smartphone, er telefonnumre altid klikbare.
 ClickToDialUseTelLink=Brug kun et link "tel:" på telefonnumre
 ClickToDialUseTelLinkDesc=Brug denne metode, hvis dine brugere har en softphone eller en software-grænseflade installeret på samme computer som browseren, og kaldes, når du klikker på et link i din browser, der starter med "tel:". Hvis du har brug for en fuld serverløsning (uden brug af lokal softwareinstallation), skal du indstille dette til "Nej" og udfylde næste felt.
 ##### Point Of Sale (CashDesk) #####
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0: Kunde betalingstype, 1: Leverandør betalingstype, 2: Både k
 IncludePath=Inkluder sti (defineret i variabel %s)
 ExpenseReportsSetup=Opsætning af modul Expense Reports
 TemplatePDFExpenseReports=Dokumentskabeloner til at generere regningsrapportdokument
-ExpenseReportsIkSetup=Opsætning af modul Expense Reports - Milles indeks
 ExpenseReportsRulesSetup=Opsætning af modul Expense Reports - Regler
 ExpenseReportNumberingModules=Udgiftsrapporter nummereringsmodul
 NoModueToManageStockIncrease=Intet modul, der er i stand til at styre automatisk lagerforhøjelse, er blevet aktiveret. Lagerforøgelse vil kun ske ved manuel indlæsning.
@@ -1833,7 +1876,7 @@ EnterAnyCode=Dette felt indeholder en reference til at identificere linje. Indta
 Enter0or1=Tryk 0 eller 1
 UnicodeCurrency=Indtast her mellem seler, liste over byte nummer, der repræsenterer valutasymbolet. For eksempel: for $, indtast [36] - for Brasilien real R $ [82,36] - for €, indtast [8364]
 ColorFormat=RGB-farven er i HEX-format, fx: FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
+PictoHelp=Ikonnavn i dolibarr-format ('image.png' hvis det er i det aktuelle temabibliotek, 'image.png@nom_du_module' hvis det er i biblioteket / img / i et modul)
 PositionIntoComboList=Linjens placering i kombinationslister
 SellTaxRate=Salgsskattesats
 RecuperableOnly=Ja for moms "Ikke opfattet, men genoprettelig" dedikeret til nogle stater i Frankrig. Hold værdi til "Nej" i alle andre tilfælde.
@@ -1864,7 +1907,7 @@ MailToSendReception=Modtagelse
 MailToThirdparty=Tredjepart
 MailToMember=Medlemmer
 MailToUser=Brugere
-MailToProject=Projekter side
+MailToProject=Projekter
 MailToTicket=Opgaver
 ByDefaultInList=Vis som standard i listevisning
 YouUseLastStableVersion=Du bruger den seneste stabile version
@@ -1874,7 +1917,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s er tilgængelig. Versi
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s er tilgængelig. Version %s er en vedligeholdelsesversion, der indeholder kun fejlrettelser. Vi anbefaler alle brugere at opgradere til denne version. En vedligeholdelsesfrigivelse introducerer ikke nye funktioner eller ændringer i databasen. Du kan hente den fra downloadområdet på https://www.dolibarr.org portal (underkatalog Stable versioner). Du kan læse <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> for en komplet liste over ændringer.
 MultiPriceRuleDesc=Når valgmuligheden "Flere prisniveauer pr. Produkt / service" er aktiveret, kan du definere forskellige priser (et pr. Prisniveau) for hvert produkt. For at spare tid, kan du her angive en regel for at autokalulere en pris for hvert niveau baseret på prisen på første niveau, så du skal kun angive en pris for første niveau for hvert produkt. Denne side er designet til at spare dig tid, men er kun nyttig, hvis dine priser for hvert niveau er i forhold til første niveau. Du kan ignorere denne side i de fleste tilfælde.
 ModelModulesProduct=Skabeloner til produktdokumenter
-WarehouseModelModules=Templates for documents of warehouses
+WarehouseModelModules=Skabeloner til dokumenter på lager
 ToGenerateCodeDefineAutomaticRuleFirst=For at kunne generere koder automatisk skal du først definere en manager for at definere stregkodenummeret automatisk.
 SeeSubstitutionVars=Se * note for liste over mulige substitutionsvariabler
 SeeChangeLog=Se ChangeLog-fil (kun engelsk)
@@ -1953,14 +1996,16 @@ NothingProcessed=Intet gjort
 XEmailsDoneYActionsDone=%s e-mails kvalificerede, %s e-mails er behandlet (for %s-registrering / handlinger udført)
 RecordEvent=Optag email-begivenhed
 CreateLeadAndThirdParty=Opret ledelse (og tredjepart om nødvendigt)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+CreateTicketAndThirdParty=Opret billet (og link til tredjepart, hvis den blev indlæst af en tidligere operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Antal e-mails i kildekataloget
 LoadThirdPartyFromName=Indlæs tredjeparts søgning på %s (kun belastning)
 LoadThirdPartyFromNameOrCreate=Indlæs tredjepartssøgning på %s (opret hvis ikke fundet)
-WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
-WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
-CreateCandidature=Create candidature
+WithDolTrackingID=Besked fra en samtale startet af en første e-mail sendt fra Dolibarr
+WithoutDolTrackingID=Besked fra en samtale startet af en første e-mail, der IKKE blev sendt fra Dolibarr
+WithDolTrackingIDInMsgId=Besked sendt fra Dolibarr
+WithoutDolTrackingIDInMsgId=Besked IKKE sendt fra Dolibarr
+CreateCandidature=Opret kandidatur
 FormatZip=Postnummer
 MainMenuCode=Menu indtastningskode (hovedmenu)
 ECMAutoTree=Vis automatisk ECM-træ
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Deaktiver funktion for at forbinde en ressource til
 EnableResourceUsedInEventCheck=Aktivér funktion til at kontrollere, om en ressource er i brug i en begivenhed
 ConfirmUnactivation=Bekræft modul reset
 OnMobileOnly=Kun på lille skærm (smartphone)
-DisableProspectCustomerType=Deaktiver "Emner + Kunder" tredjeparts type (så tredjepart skal være Emner eller Kunder, men kan ikke begge)
+DisableProspectCustomerType=Deaktiver tredjepartstypen "Prospekt + Kunder" (så tredjepart skal være "Prospekt" eller "Kunder", men kan ikke være begge)
 MAIN_OPTIMIZEFORTEXTBROWSER=Forenkle brugergrænsefladen til blindperson
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Aktivér denne indstilling, hvis du er blind person, eller hvis du bruger programmet fra en tekstbrowser som Lynx eller Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Skift interfacefarve til farveblind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Brug fejlfindingslinjen
 DEBUGBAR_LOGS_LINES_NUMBER=Antal sidste loglinjer, der skal holdes i konsollen
 WarningValueHigherSlowsDramaticalyOutput=Advarsel, højere værdier bremser dramatisk output
 ModuleActivated=Modul %s er aktiveret og forsinker grænsefladen
+IfYouAreOnAProductionSetThis=Hvis du er i et produktionsmiljø, skal du indstille denne egenskab til %s.
+AntivirusEnabledOnUpload=Antivirus aktiveret på uploadede filer
 EXPORTS_SHARE_MODELS=Eksportmodeller deles med alle
 ExportSetup=Opsætning af modul Eksport
 ImportSetup=Opsætning af modul til import
 InstanceUniqueID=Forekomstets unikke ID
 SmallerThan=Mindre end
 LargerThan=Større end
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Bemærk, at hvis et sporings-id for et objekt findes i e-mailen, eller hvis e-mailen er et svar fra en e-mail-område, der er indsamlet og linket til et objekt, vil den oprettede begivenhed automatisk blive linket til det kendte relaterede objekt.
 WithGMailYouCanCreateADedicatedPassword=Hvis du aktiverer valideringen af 2 trin med en GMail konto, anbefales det at oprette en dedikeret anden adgangskode til applikationen i stedet for at bruge dit eget kontos kodeord fra https://myaccount.google.com/.
 EmailCollectorTargetDir=Det kan være en ønsket opførsel at flytte e-mailen til et andet tag/bibliotek, når den blev behandlet med succes. Angiv blot navnet på kataloget her for at bruge denne funktion (Brug IKKE specialtegn i navnet). Bemærk, at du også skal bruge en læse/skrive logind konto.
 EmailCollectorLoadThirdPartyHelp=Du kan bruge denne handling til at bruge e-mail-indholdet til at finde og indlæse en eksisterende tredjepart i din database. Den fundne (eller oprettede) tredjepart bruges til følgende handlinger, der har brug for det. I parameterfeltet kan du bruge f.eks. 'UDTAGELSE: KROPP: Navn: \\ s ([^ \\ s] *)', hvis du vil udpakke navnet på tredjeparten fra en streng 'Navn: navn for at finde' fundet i legeme.
@@ -2026,7 +2073,13 @@ RssNote=Bemærk: Hver RSS-feed-definition indeholder en widget, som du skal akti
 JumpToBoxes=Gå til Opsætning -> Widgets
 MeasuringUnitTypeDesc=Brug her en værdi som "størrelse", "overflade", "volumen", "vægt", "tid"
 MeasuringScaleDesc=Skalaen er antallet af steder, du skal flytte decimaldelen for at matche standardreferenceenheden. For "tid" -enhedstype er det antallet af sekunder. Værdier mellem 80 og 99 er reserverede værdier.
-TemplateAdded=Template added
-TemplateUpdated=Template updated
-TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+TemplateAdded=Skabelon tilføjet
+TemplateUpdated=Skabelonen opdateret
+TemplateDeleted=Skabelonen blev slettet
+MailToSendEventPush=E-mail om påmindelse om begivenhed
+SwitchThisForABetterSecurity=Det anbefales at skifte denne værdi til %s for mere sikkerhed
+DictionaryProductNature= Produktets art
+CountryIfSpecificToOneCountry=Land (hvis det er specifikt for et givet land)
+YouMayFindSecurityAdviceHere=Du kan finde sikkerhedsrådgivning her
+ModuleActivatedMayExposeInformation=Dette modul kan udsætte følsomme data. Hvis du ikke har brug for det, skal du deaktivere det.
+ModuleActivatedDoNotUseInProduction=Et modul designet til udviklingen er blevet aktiveret. Aktivér det ikke i et produktionsmiljø.
diff --git a/htdocs/langs/da_DK/banks.lang b/htdocs/langs/da_DK/banks.lang
index 81e842e525c..add4d042a86 100644
--- a/htdocs/langs/da_DK/banks.lang
+++ b/htdocs/langs/da_DK/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Diverse betalinger
 VariousPayments=Diverse betalinger
 ShowVariousPayment=Vis diverse betalinger
 AddVariousPayment=Tilføj diverse betalinger
+VariousPaymentId=Diverse betalings-id
+VariousPaymentLabel=Diverse betalingsetiketter
+ConfirmCloneVariousPayment=Bekræft klonen for en anden betaling
 SEPAMandate=SEPA mandat
 YourSEPAMandate=Dit SEPA mandat
 FindYourSEPAMandate=Dette er dit SEPA-mandat til at give vores firma tilladelse til at foretage en direkte debitering til din bank. Ret det underskrevet (scan af det underskrevne dokument) eller send det pr. Mail til
@@ -176,3 +179,4 @@ BankColorizeMovement=Farvelæg bevægelser
 BankColorizeMovementDesc=Hvis denne funktion er aktiveret, kan du vælge specifik baggrundsfarve til debet- eller kreditbevægelser
 BankColorizeMovementName1=Baggrundsfarve til debetbevægelse
 BankColorizeMovementName2=Baggrundsfarve til kreditbevægelse
+IfYouDontReconcileDisableProperty=Hvis du ikke foretager bankafstemninger på nogle bankkonti, skal du deaktivere ejerskab "%s" på dem for at fjerne denne advarsel.
diff --git a/htdocs/langs/da_DK/categories.lang b/htdocs/langs/da_DK/categories.lang
index fcc87cedca7..18b12b53318 100644
--- a/htdocs/langs/da_DK/categories.lang
+++ b/htdocs/langs/da_DK/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/kategorier opsætning
 CategorieRecursiv=Link med forældre tag/kategori automatisk
 CategorieRecursivHelp=Hvis indstillingen er aktiveret, tilføjes et produkt i en underkategori, tilføjes også produktet til den overordnede kategori.
 AddProductServiceIntoCategory=Tilføj følgende produkt/tjeneste
+AddCustomerIntoCategory=Tildel kategori til kunde
+AddSupplierIntoCategory=Tildel kategori til leverandør
 ShowCategory=Vis tag/kategori
 ByDefaultInList=Som standard i liste
 ChooseCategory=Vælg kategori
-StocksCategoriesArea=Lager kategorier Område
-ActionCommCategoriesArea=Arrangementer Kategorier Område
-WebsitePagesCategoriesArea=Område med sidekontainerkategorier
+StocksCategoriesArea=Lagerkategorier
+ActionCommCategoriesArea=Begivenhedskategorier
+WebsitePagesCategoriesArea=Side-containerkategorier
 UseOrOperatorForCategories=Brug eller operator til kategorier
diff --git a/htdocs/langs/da_DK/companies.lang b/htdocs/langs/da_DK/companies.lang
index 4757c3ae15e..76b286db769 100644
--- a/htdocs/langs/da_DK/companies.lang
+++ b/htdocs/langs/da_DK/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI-nummer
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (professionelt ID)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI-nummer
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal nummer)
 ProfId4CH=Prof Id 2 (CVR-nummer)
-ProfId5CH=-
+ProfId5CH=EORI-nummer
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (RUT)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI-nummer
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF / NIF)
 ProfId2ES=Prof Id 2 (Social Security Number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate nummer)
-ProfId5ES=-
+ProfId5ES=EORI-nummer
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, gamle APE)
 ProfId4FR=Prof Id 4 (RCS / RM)
-ProfId5FR=Prof Id 5
+ProfId5FR=EORI-nummer
 ProfId6FR=-
 ProfId1GB=Prof ID 1 (Registration Number)
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI-nummer
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (erhvervstilladelse)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI-nummer
 ProfId6LU=-
 ProfId1MA=Id prof.. 1 (RC)
 ProfId2MA=Id prof.. 2 (Patente)
 ProfId3MA=Id prof.. 3 (IF)
 ProfId4MA=Id prof.. 4 (CNSS)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (RFC).
 ProfId2MX=Prof Id 2 (R.. P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK Nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL=-
+ProfId5NL=EORI-nummer
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof ID 2 (Social Security Number)
 ProfId3PT=Prof Id 3 (CVR-nummer)
 ProfId4PT=Prof Id 4 (konservatorium)
-ProfId5PT=-
+ProfId5PT=EORI-nummer
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=Ninea
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Registreringsnummer)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI-nummer
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=Du kan også tjekke manuelt på Europa-Kommissionens websted
 ErrorVATCheckMS_UNAVAILABLE=Kontrol er ikke muligt. Denne service leveres ikke af medlemsstaten (%s).
 NorProspectNorCustomer=Ikke mulighedder eller kunde
 JuridicalStatus=Juridisk enhedstype
+Workforce=Arbejdskraft
 Staff=Medarbejdere
 ProspectLevelShort=Potentiale
 ProspectLevel=Kundepotentiale
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Betalingsperiode - Leverandør
 PaymentTypeBoth=Betalingstype - kunde og levendør
 MulticurrencyUsed=Brug flere valutaer
 MulticurrencyCurrency=Valuta
+InEEC=Europa (EØF)
+RestOfEurope=Resten af Europa (EØF)
+OutOfEurope=Uden for Europa (EØF)
+CurrentOutstandingBillLate=Nuværende udestående regning sent
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Vær forsigtig, afhængigt af dine produktindstillinger, skal du ændre tredjepart, før du tilføjer produktet til POS.
diff --git a/htdocs/langs/da_DK/ecm.lang b/htdocs/langs/da_DK/ecm.lang
index a00bb2167b3..804876f5f38 100644
--- a/htdocs/langs/da_DK/ecm.lang
+++ b/htdocs/langs/da_DK/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Søg på nøgleord
 ECMSearchByEntity=Søg på objektet
 ECMSectionOfDocuments=Abonnentfortegnelser af dokumenter
 ECMTypeAuto=Automatisk
-ECMDocsBySocialContributions=Dokumenter linket til skatter/afgifter
-ECMDocsByThirdParties=Dokumenter knyttet til tredjemand
-ECMDocsByProposals=Dokumenter knyttet til tilbud
-ECMDocsByOrders=Dokumenter knyttet til kundernes ordrer
-ECMDocsByContracts=Dokumenter i forbindelse med kontrakter
-ECMDocsByInvoices=Dokumenter knyttet til kunder fakturaer
-ECMDocsByProducts=Dokumenter i tilknytning til produkter
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Dokumenter, der er knyttet til helligdage
-ECMDocsBySupplierProposals=Dokumenter, der er knyttet til leverandørforslag
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=Ingen mappe oprettet
 ShowECMSection=Vis mappe
 DeleteSection=Fjern mappe
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync liste over mapper
 HashOfFileContent=Hash af fil indhold
 NoDirectoriesFound=Ingen mapper fundet
 FileNotYetIndexedInDatabase=Filen er endnu ikke indekseret i database (prøv at genoplaste den)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/da_DK/hrm.lang b/htdocs/langs/da_DK/hrm.lang
index 2f0207525d3..123e22908c8 100644
--- a/htdocs/langs/da_DK/hrm.lang
+++ b/htdocs/langs/da_DK/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job stillinger
 Employees=Medarbejdere
 Employee=Employee
 NewEmployee=Ny medarbejder
+ListOfEmployees=Liste over medarbejdere
diff --git a/htdocs/langs/da_DK/install.lang b/htdocs/langs/da_DK/install.lang
index 044aafcb0cd..202e7f17fc7 100644
--- a/htdocs/langs/da_DK/install.lang
+++ b/htdocs/langs/da_DK/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Konfigurationsfilen <b> %s </ b> kan ikke skrives. Tjek ti
 ConfFileIsWritable=<b>Konfigurationsfil %s</b> er skrivbar.
 ConfFileMustBeAFileNotADir=Konfigurationsfil <b> %s </b>skal være en fil, ikke en mappe.
 ConfFileReload=Genindlæsning af parametre fra konfigurationsfilen.
-PHPSupportSessions=Denne PHP understøtter sessioner.
 PHPSupportPOSTGETOk=Denne PHP understøtter variablerne POST og GET.
 PHPSupportPOSTGETKo=Det er muligt, at din PHP opsætning ikke understøtter variabler POST og / eller GET. Kontroller parameteren <b> variables_order </ b> i php.ini.
-PHPSupportGD=Dette PHP understøtter GD grafiske funktioner.
-PHPSupportCurl=Dette PHP understøtter Curl.
-PHPSupportCalendar=Denne PHP understøtter kalenderudvidelser.
-PHPSupportUTF8=Dette PHP understøtter UTF8 funktioner.
-PHPSupportIntl=Denne PHP understøtter Intl funktioner.
-PHPSupportxDebug=Denne PHP understøtter udvidet debug funktioner.
+PHPSupportSessions=Denne PHP understøtter sessioner.
 PHPSupport=Denne PHP understøtter %s funktioner.
 PHPMemoryOK=Din PHP max session hukommelse er sat <b>til %s.</b> Dette skulle være nok.
 PHPMemoryTooLow=Din PHP max-sessionshukommelse er indstillet til <b> %s </ b> bytes. Dette er for lavt. Skift din <b> php.ini </ b> for at indstille parameteren <b> memory_limit </ b> til mindst <b> %s </ b> bytes.
diff --git a/htdocs/langs/da_DK/intracommreport.lang b/htdocs/langs/da_DK/intracommreport.lang
new file mode 100644
index 00000000000..69850cd0bf0
--- /dev/null
+++ b/htdocs/langs/da_DK/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=Liste
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/da_DK/languages.lang b/htdocs/langs/da_DK/languages.lang
index 9a8b424fdfe..e0b80a8963a 100644
--- a/htdocs/langs/da_DK/languages.lang
+++ b/htdocs/langs/da_DK/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Spansk (Paraguay)
 Language_es_PE=Spansk (Peru)
 Language_es_PR=Spansk (Puerto Rico)
+Language_es_US=Spansk (USA)
 Language_es_UY=Spansk (Uruguay)
 Language_es_GT=Spansk (Guatemala)
 Language_es_VE=Spanish (Venezuela)
@@ -55,7 +56,7 @@ Language_fr_CM=Fransk (Cameroun)
 Language_fr_FR=Fransk
 Language_fr_GA=Fransk (Gabon)
 Language_fr_NC=Fransk (Ny Kaledonien)
-Language_fr_SN=French (Senegal)
+Language_fr_SN=Fransk (Senegal)
 Language_fy_NL=Frisian
 Language_gl_ES=galicisk
 Language_he_IL=Hebræisk
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index 3ca6eed1fa6..b388aeabcdd 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Fjern link
 AddToDraft=Tilføj til udkast
 Update=Opdatering
 Close=Luk
+CloseAs=Sæt status til
 CloseBox=Fjern widget fra dit dashboard
 Confirm=Bekræft
 ConfirmSendCardByMail=Vil du virkelig sende indholdet af dette kort pr. Mail til <b> %s </ b>?
@@ -196,6 +197,7 @@ ReOpen=Genåbne
 Upload=Upload
 ToLink=Link
 Select=Vælg
+SelectAll=Vælg alle
 Choose=Vælge
 Resize=Tilpasse størrelsen
 ResizeOrCrop=Tilpasse størrelsen eller Beskær
@@ -256,6 +258,7 @@ Cards=Kort
 Card=Kort
 Now=Nu
 HourStart=Start time
+Deadline=Deadline
 Date=Dato
 DateAndHour=Dato og tid
 DateToday=Dags dato
@@ -264,8 +267,10 @@ DateStart=Startdato
 DateEnd=Slutdato
 DateCreation=Lavet dato
 DateCreationShort=Creat. dato
+IPCreation=Oprettelse IP
 DateModification=Ændringsdatoen
 DateModificationShort=Modif. dato
+IPModification=Ændring IP
 DateLastModification=Seneste ændring dato
 DateValidation=Bekræftelsesdato
 DateClosing=Udløbsdato
@@ -319,6 +324,7 @@ Morning=Morgen
 Afternoon=Eftermiddag
 Quadri=Kvatal
 MonthOfDay=Måned fra den dato
+DaysOfWeek=Ugedage
 HourShort=T
 MinuteShort=min
 Rate=Hyppighed
@@ -356,7 +362,7 @@ Amount=Beløb
 AmountInvoice=Fakturabeløbet
 AmountInvoiced=Beløb faktureres
 AmountInvoicedHT=Faktureret beløb (ekskl. Moms)
-AmountInvoicedTTC=Amount invoiced (inc. tax)
+AmountInvoicedTTC=Faktureret beløb (inkl. Moms)
 AmountPayment=Indbetalingsbeløb
 AmountHTShort=Beløb (ekskl.)
 AmountTTCShort=Beløb (inkl. moms)
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Betalingsbeløb, oprindelig valuta
 MulticurrencyAmountHT=Beløb (ekskl. Skat), original valuta
 MulticurrencyAmountTTC=Beløb (inkl. Moms), oprindelig valuta
 MulticurrencyAmountVAT=Momsbeløb, oprindelige valuta
+MulticurrencySubPrice=Beløb subpris multi valuta
 AmountLT1=Momsbeløb 2
 AmountLT2=Momsbeløb 3
 AmountLT1ES=Beløb RE
@@ -487,6 +494,7 @@ By=Ved
 From=Fra
 FromDate=Fra
 FromLocation=Fra
+at=på
 to=til
 To=til
 and=og
@@ -509,6 +517,7 @@ Draft=Udkast
 Drafts=Udkast
 StatusInterInvoiced=faktureret
 Validated=Godkendt
+ValidatedToProduce=Valideret (til produktion)
 Opened=Åben
 OpenAll=Åben (alle)
 ClosedAll=Lukket (Alle)
@@ -655,6 +664,7 @@ Response=Responds
 Priority=Prioritet
 SendByMail=Send via email
 MailSentBy=Email sendt fra
+NotSent=Ikke sendt
 TextUsedInTheMessageBody=Email indhold
 SendAcknowledgementByMail=Send bekræftelses Email
 SendMail=Send Email
@@ -688,7 +698,7 @@ Method=Metode
 Receive=Modtag
 CompleteOrNoMoreReceptionExpected=Komplet eller intet mere at forvente
 ExpectedValue=Forventet værdi
-ExpectedQty=Expected Qty
+ExpectedQty=Forventet antal
 PartialWoman=Delvis
 TotalWoman=I alt
 NeverReceived=Aldrig modtaget
@@ -836,6 +846,7 @@ ListOfTemplates=Liste over skabeloner
 Gender=Køn
 Genderman=Mand
 Genderwoman=Kvinde
+Genderother=Andre
 ViewList=Vis liste
 ViewGantt=Gentt udsigt
 ViewKanban=Kanban udsigt
@@ -877,6 +888,8 @@ Miscellaneous=Diverse
 Calendar=Kalender
 GroupBy=Gruppér efter
 ViewFlatList=Se flad liste
+ViewAccountList=Vis hovedbog
+ViewSubAccountList=Se underkonto hovedbog
 RemoveString=Fjern streng '%s'
 SomeTranslationAreUncomplete=Nogle af de sprog, der tilbydes, kan kun oversættes eller måske indeholde fejl. Hjælp venligst med at korrigere dit sprog ved at registrere dig på <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> at tilføje dine forbedringer.
 DirectDownloadLink=Direkte download link (offentlig/ekstern)
@@ -945,39 +958,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=L
 ShortSunday=S
-one=one
-two=two
-three=three
-four=four
-five=five
-six=six
-seven=seven
-eight=eight
-nine=nine
-ten=ten
-eleven=eleven
-twelve=twelve
-thirteen=thirdteen
-fourteen=fourteen
-fifteen=fifteen
-sixteen=sixteen
-seventeen=seventeen
-eighteen=eighteen
-nineteen=nineteen
-twenty=twenty
-thirty=thirty
-forty=forty
-fifty=fifty
-sixty=sixty
-seventy=seventy
-eighty=eighty
-ninety=ninety
-hundred=hundred
-thousand=thousand
+one=en
+two=to
+three=tre
+four=fire
+five=fem
+six=seks
+seven=syv
+eight=otte
+nine=ni
+ten=ti
+eleven=elleve
+twelve=tolv
+thirteen=tretten
+fourteen=fjorten
+fifteen=femten
+sixteen=seksten
+seventeen=sytten
+eighteen=atten
+nineteen=nitten
+twenty=tyve
+thirty=tredive
+forty=fyrre
+fifty=halvtreds
+sixty=tres
+seventy=halvfjerds
+eighty=firs
+ninety=halvfems
+hundred=hundrede
+thousand=tusind
 million=million
-billion=billion
-trillion=trillion
-quadrillion=quadrillion
+billion=milliard
+trillion=billioner
+quadrillion=kvadrillion
 SelectMailModel=Vælg en Email-skabelon
 SetRef=Sæt ref.
 Select2ResultFoundUseArrows=Nogle resultater fundet. Brug pilene til at vælge.
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Kundeforsendelser
 SearchIntoExpenseReports=Udgiftsrapporter
 SearchIntoLeaves=Forlade
 SearchIntoTickets=Opgaver
+SearchIntoCustomerPayments=Kundebetalinger
+SearchIntoVendorPayments=Leverandørbetalinger
+SearchIntoMiscPayments=Diverse betalinger
 CommentLink=Kommentarer
 NbComments=Antal kommentarer
 CommentPage=Kommentarer plads
@@ -1076,10 +1092,18 @@ NotUsedForThisCustomer=Ikke brugt til denne kunde
 AmountMustBePositive=Beløbet skal være positivt
 ByStatus=Efter status
 InformationMessage=Information
-Used=Used
-ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
-MODIFYInDolibarr=Record %s modified
-DELETEInDolibarr=Record %s deleted
-VALIDATEInDolibarr=Record %s validated
-APPROVEDInDolibarr=Record %s approved
+Used=Brugt
+ASAP=Så hurtigt som muligt
+CREATEInDolibarr=Optag %s oprettet
+MODIFYInDolibarr=Optag %s ændret
+DELETEInDolibarr=Optagelse %s slettet
+VALIDATEInDolibarr=Optag %s valideret
+APPROVEDInDolibarr=Optag %s godkendt
+DefaultMailModel=Standard mail model
+PublicVendorName=Sælgers offentlige navn
+DateOfBirth=Dato for fødsel
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Sikkerhedstoken er udløbet, så handlingen er annulleret. Prøv igen.
+UpToDate=Opdateret
+OutOfDate=Umoderne
+EventReminder=Påmindelse om begivenhed
+UpdateForAllLines=Opdatering til alle linjer
diff --git a/htdocs/langs/da_DK/members.lang b/htdocs/langs/da_DK/members.lang
index 13cf5a491bc..dbf397604a5 100644
--- a/htdocs/langs/da_DK/members.lang
+++ b/htdocs/langs/da_DK/members.lang
@@ -19,14 +19,12 @@ MembersCards=Medlemmer udskrive kort
 MembersList=Liste over medlemmer
 MembersListToValid=Liste over udkast til medlemmer (der skal bekræftes)
 MembersListValid=Liste over gyldige medlemmer
-MembersListUpToDate=Liste over gyldige medlemmer ajour abonnement
-MembersListNotUpToDate=Liste over gyldige medlemmer med abonnement uaktuel
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=Liste over opsatte medlemmer
 MembersListQualified=Liste over kvalificerede medlemmer
 MenuMembersToValidate=Udkast til medlemmer
 MenuMembersValidated=Bekræftet medlemmer
-MenuMembersUpToDate=Ajour medlemmer
-MenuMembersNotUpToDate=Uaktuel medlemmer
 MenuMembersResiliated=Afsluttede medlemmer
 MembersWithSubscriptionToReceive=Medlemmer med abonnement for at modtage
 MembersWithSubscriptionToReceiveShort=Abonnement til at modtage
@@ -34,6 +32,7 @@ DateSubscription=Subscription dato
 DateEndSubscription=Subscription slutdato
 EndSubscription=End abonnement
 SubscriptionId=Abonnements-id
+WithoutSubscription=Without subscription
 MemberId=Medlem id
 NewMember=Nyt medlem
 MemberType=Medlem type
@@ -81,7 +80,7 @@ DeleteType=Slet
 VoteAllowed=Afstemning tilladt
 Physical=Fysisk
 Moral=Moral
-MorPhy=Natur
+MorAndPhy=Moral and Physical
 Reenable=Genaktivere
 ResiliateMember=Afslut en medlem
 ConfirmResiliateMember=Er du sikker på at du vil opsige denne medlem?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Afsendelse af e-mail ved bekræftelse af nye medl
 SendingEmailOnNewSubscription=Afsendelse af e-mail på nyt abonnement
 SendingReminderForExpiredSubscription=Sender påmindelse om udløbne abonnementer
 SendingEmailOnCancelation=Afsendelse af e-mail ved annullering
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Dit medlemskab blev modtaget.
 YourMembershipWasValidated=Dit medlemskab blev bekræftet
@@ -167,6 +167,7 @@ MembersStatisticsByState=Medlemmer statistikker stat / provins
 MembersStatisticsByTown=Medlemmer statistikker byen
 MembersStatisticsByRegion=Medlemsstatistik efter region
 NbOfMembers=Antal medlemmer
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=Ingen bekræftede medlemmer fundet
 MembersByCountryDesc=Denne skærm viser dig statistikker over medlemmer af lande. Grafisk afhænger dog på Google online-graf service og er kun tilgængelig, hvis en internetforbindelse virker.
 MembersByStateDesc=Denne skærm viser dig statistikker om medlemmer fra staten / provinser / Canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistik
 LastMemberDate=Seneste medlem dato
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Medlemmernes art
+MembersNature=Nature of members
 Public=Information er offentlige
 NewMemberbyWeb=Nyt medlem tilføjet. Afventer godkendelse
 NewMemberForm=Nyt medlem formular
diff --git a/htdocs/langs/da_DK/mrp.lang b/htdocs/langs/da_DK/mrp.lang
index f9474dbaaf5..063976415c0 100644
--- a/htdocs/langs/da_DK/mrp.lang
+++ b/htdocs/langs/da_DK/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Fremstillingsordrer
-MO=Fremstillingsordre
-MOs=Manufacturing orders
+MOs=Produktionsordrer
+ManufacturingOrder=Produktionsordre
 MRPDescription=Modul til styring af produktions- og produktionsordrer (MO).
 MRPArea=MRP-område
 MrpSetupPage=Opsætning af modul MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Produkter til at producere
 UnitCost=Enhedspris
 TotalCost=Udgifter i alt
 BOMTotalCost=Omkostningerne til at fremstille denne BOM baseret på prisen for hver mængde og produkt, der skal forbruges (brug Prisen, hvis defineret, ellers Gennemsnit Vægtet pris, hvis defineret, ellers den bedste købspris)
+GoOnTabProductionToProduceFirst=Du skal først have startet produktionen for at lukke en produktionsordre (se fanen '%s'). Men du kan annullere det.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Et sæt kan ikke bruges i en stykliste eller en MO
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index 9a5409b6002..d266cdfa657 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Flere prissegmenter pr. Produkt / service (hver kunde er i et prissegment)
 MultiPricesNumPrices=Antal priser
 DefaultPriceType=Prisgrundlag pr. Standard (med eller uden skat) ved tilføjelse af nye salgspriser
-AssociatedProductsAbility=Aktivér virtuelle produkter (sæt)
-AssociatedProducts=Virtuelle produkter
-AssociatedProductsNumber=Antal varer, der udgør denne virtuelle vare
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Antal forældrevarer
 ParentProducts=Moderselskaber
-IfZeroItIsNotAVirtualProduct=Hvis 0, er denne vare ikke en virtuel vare
-IfZeroItIsNotUsedByVirtualProduct=Hvis 0, bruges dette produkt ikke af noget virtuel produkt
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Kategori filter
 ProductToAddSearch=Søg produkt for at tilføje
 NoMatchFound=Ingen match fundet
 ListOfProductsServices=Liste over produkter / tjenester
-ProductAssociationList=Liste over produkter / tjenester, der er komponent (er) i dette virtuelle produkt / kit
-ProductParentList=Liste over produkter / services med dette produkt som en komponent
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=En af valgte produkt er moderselskab med aktuelle produkt
 DeleteProduct=Slet en vare/ydelse
 ConfirmDeleteProduct=Er du sikker på du vil slette denne vare/ydelse?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Tilgængelige globale værdier:
 PriceMode=Pris-tilstand
 PriceNumeric=Numero
 DefaultPrice=Standard pris
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Forøg / sænk lagerbeholdning ved forældreændring
 ComposedProduct=Børneprodukter
 MinSupplierPrice=Min købskurs
@@ -339,6 +340,7 @@ UseProductFournDesc=Tilføj en funktion til at definere beskrivelser af produkte
 ProductSupplierDescription=Leverandørbeskrivelse for produktet
 UseProductSupplierPackaging=Brug emballage til leverandørpriser (genberegn mængder i henhold til emballage, der er angivet på leverandørpris, når du tilføjer / opdaterer linje i leverandørdokumenter)
 PackagingForThisProduct=Emballage
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=Mængden af linjen blev beregnet om efter leverandøremballage
 
 #Attributes
diff --git a/htdocs/langs/da_DK/recruitment.lang b/htdocs/langs/da_DK/recruitment.lang
index c17570af6f4..3895222dc56 100644
--- a/htdocs/langs/da_DK/recruitment.lang
+++ b/htdocs/langs/da_DK/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Forventet dato
 FutureManager=Fremtidig leder
 ResponsibleOfRecruitement=Ansættelsesansvarlig
 IfJobIsLocatedAtAPartner=Hvis jobbet er placeret på en partner sted
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Stilling
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/da_DK/stocks.lang b/htdocs/langs/da_DK/stocks.lang
index b2db5f656a3..5c024d33a93 100644
--- a/htdocs/langs/da_DK/stocks.lang
+++ b/htdocs/langs/da_DK/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Bevægelses-id %d
 ListMouvementStockProject=Liste over lagerbevægelser forbundet med projektet
 StocksArea=Pakhuse
 AllWarehouses=Alle lagre
-IncludeEmptyDesiredStock=Medtag også udefineret ønsket lager
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Medtag også udkast til ordrer
 Location=Placering
 LocationSummary=Kort placerings navn
@@ -122,8 +122,9 @@ DesiredStockDesc=Dette lagerbeløb er den værdi, der bruges til at fylde lagere
 StockToBuy=At bestille
 Replenishment=genopfyldning
 ReplenishmentOrders=Replenishment ordrer
-VirtualDiffersFromPhysical=Ifølge stigning / nedsættelse af aktieoptioner kan fysisk lager og virtuelle aktier (fysiske + nuværende ordrer) afvige
-UseVirtualStockByDefault=Brug virtuelt lager som standard, i stedet for fysisk lager, til genopfyldningsfunktion
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Brug virtuelt lager
 UsePhysicalStock=Brug fysisk lager
 CurentSelectionMode=Aktuel valgtilstand
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=Dette produkt er allerede på listen
 SelectCategory=Kategorifilter
 SelectFournisseur=Sælgerfilter
 inventoryOnDate=Beholdning
-INVENTORY_DISABLE_VIRTUAL=Virtuelt produkt (kit): Forkort ikke lagerbeholdningen af et børneprodukt
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Brug købsprisen, hvis der ikke findes nogen sidste købspris
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Aktiebevægelser har datoen for lagerbeholdningen (i stedet for datoen for varebeholdningens validering)
 inventoryChangePMPPermission=Tillad at ændre PMP-værdi for en vare
 ColumnNewPMP=Ny enhed PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=Du kan her se aktien (ægte aktier) på en given dato i fort
 StockAtDateFutureDesc=Du kan her se bestanden (virtuel bestand) på en given dato fremover
 CurrentStock=Aktuel lager
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/da_DK/suppliers.lang b/htdocs/langs/da_DK/suppliers.lang
index 8a16ebe031f..c0df693ec2c 100644
--- a/htdocs/langs/da_DK/suppliers.lang
+++ b/htdocs/langs/da_DK/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Indkøbsordrer til faktura
 NbDaysToDelivery=Leveringsforsinkelse (dage)
 DescNbDaysToDelivery=Den længste leveringsforsinkelse af produkterne fra denne ordre
 SupplierReputation=Leverandør ry
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Bestil ikke
 NotTheGoodQualitySupplier=Lav kvalitet
 ReputationForThisProduct=Omdømme
diff --git a/htdocs/langs/da_DK/website.lang b/htdocs/langs/da_DK/website.lang
index eda2f0c760c..35d95b5bc5e 100644
--- a/htdocs/langs/da_DK/website.lang
+++ b/htdocs/langs/da_DK/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Tilføj hjemmeside
 Webpage=Webside / container
 AddPage=Tilføj side / container
 HomePage=Hjemmeside
-PageContainer=Side / beholder
+PageContainer=Side
 PreviewOfSiteNotYetAvailable=Forhåndsvisning af dit websted <strong> %s </ strong> endnu ikke tilgængeligt. Du skal først <strong> Importer en fuld hjemmeside skabelon </ strong> 'eller bare <strong> Tilføj en side / container </ strong>'.
 RequestedPageHasNoContentYet=Den ønskede side med id %s har intet indhold endnu, eller cache-filen .tpl.php blev fjernet. Rediger indholdet på siden for at løse dette.
 SiteDeleted=Webstedet '%s' slettet
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Udskiftning udført i %s sider eller containere
 RSSFeed=RSS Feed
 RSSFeedDesc=Du kan få et RSS-feed af de nyeste artikler med typen 'blogpost' ved hjælp af denne URL
 PagesRegenerated=%sside (r) / container (r) regenereret
+RegenerateWebsiteContent=Genopret cache-filer på webstedet
+AllowedInFrames=Tilladt i rammer
diff --git a/htdocs/langs/de_AT/main.lang b/htdocs/langs/de_AT/main.lang
index 124392e3512..b00bc342fde 100644
--- a/htdocs/langs/de_AT/main.lang
+++ b/htdocs/langs/de_AT/main.lang
@@ -84,3 +84,4 @@ Events=Termine
 SearchIntoContacts=Kontakt
 SearchIntoInterventions=Eingriffe
 AssignedTo=zugewisen an
+DateOfBirth=Geburtstdatum
diff --git a/htdocs/langs/de_AT/members.lang b/htdocs/langs/de_AT/members.lang
index 6686b3d49f0..071f33fcbff 100644
--- a/htdocs/langs/de_AT/members.lang
+++ b/htdocs/langs/de_AT/members.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - members
 SetLinkToUser=Mit Benutzer verknüpfen
 SetLinkToThirdParty=Mit Partner verknüpfen
-MenuMembersNotUpToDate=Veraltete Mitglieder
 DateSubscription=Abonnierungsdatum
 DateEndSubscription=Abonnementauslaufdatum
 EndSubscription=Abonnementende
diff --git a/htdocs/langs/de_AT/products.lang b/htdocs/langs/de_AT/products.lang
index 272a2cf3d92..d4e36dd82c8 100644
--- a/htdocs/langs/de_AT/products.lang
+++ b/htdocs/langs/de_AT/products.lang
@@ -30,3 +30,4 @@ ListProductByPopularity=Liste der Produkte/Services nach Beliebtheit
 ListServiceByPopularity=Liste der Services nach Beliebtheit
 Finished=Eigenerzeugung
 NewRefForClone=Artikel Nr. des neuen Produkts/Services
+CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/de_CH/accountancy.lang b/htdocs/langs/de_CH/accountancy.lang
index 1ee50a1a423..afe0da5d99f 100644
--- a/htdocs/langs/de_CH/accountancy.lang
+++ b/htdocs/langs/de_CH/accountancy.lang
@@ -15,7 +15,6 @@ DefaultForService=Standard für Leistungen
 DefaultForProduct=Standard für Produkte
 CantSuggest=Ich habe keinen Vorschlag
 AccountancySetupDoneFromAccountancyMenu=Die meisten Einstellungen der Buchhaltung setzt du im Menu %s
-ConfigAccountingExpert=Einstellungen des erweiterten Buchhaltungsmoduls
 Journalization=Journalisierung
 JournalFinancial=Finanzjournal
 BackToChartofaccounts=Zeige Kontenrahmen
@@ -27,8 +26,6 @@ OverviewOfAmountOfLinesNotBound=Positionen ohne Verknüpfung zu einem Buchhaltun
 OverviewOfAmountOfLinesBound=Positionen mit Verknüpfung zu einem Buchhaltungskonto
 OtherInfo=Weitere Informationen
 ConfirmDeleteCptCategory=Möchten Sie dieses Konto wirklich aus der Kontogruppe entfernen?
-AlreadyInGeneralLedger=Bereits im Hauptbuch eingetragen
-NotYetInGeneralLedger=Nicht im Hauptbuch eingetragen
 GroupIsEmptyCheckSetup=Das Feld Gruppe ist leer, bitte prüfe die Einstellungen deiner Kontengruppen.
 DetailByAccount=Zeige Details nach Konto geordnet
 AccountWithNonZeroValues=Konten mit Werten > 0
@@ -37,7 +34,6 @@ CountriesInEEC=EWR - Staaten
 CountriesNotInEEC=Nicht EWR - Staaten
 CountriesInEECExceptMe=Länder im EWR ausser %s
 CountriesExceptMe=Alle Staaten, ausser %s
-AccountantFiles=Buchhaltungsbelege exportieren
 MainAccountForCustomersNotDefined=Es ist kein kein Buchhaltungskonto für Kunden eingerichtet.
 MainAccountForSuppliersNotDefined=Es ist kein kein Buchhaltungskonto für Anbieter eingerichtet.
 MainAccountForUsersNotDefined=Es ist kein kein Buchhaltungskonto für Kontakte eingerichtet.
@@ -64,7 +60,6 @@ AccountancyAreaDescBind=Schritt %s: Prüfe die Verknüpfungen von %s mit passend
 AccountancyAreaDescWriteRecords=Schritt %s: Lass alle Transaktionen ins Hauptbuch übertragen. Wechsle dazu in das Menu <strong>%s</strong>, und Klicke auf <strong>%s</strong>.
 AccountancyAreaDescAnalyze=Schritt %s: Erzeuge oder ergänze Transaktionen für Berichte und Exporte.
 AccountancyAreaDescClosePeriod=Schritt %s: Schliesse eine Geschäftsperiode ab, damit Sie nicht mehr abgeändert werden kann.
-TheJournalCodeIsNotDefinedOnSomeBankAccount=Hoppla - nicht alle Bankkonten haben ein Buchhaltungskonto zugewiesen - bitte korrigiere das so:
 Selectchartofaccounts=Wähle deinen Kontenrahmen.
 ChangeAndLoad=Lade und ersetze
 Addanaccount=Buchhaltungskonto hinzüfügen
@@ -88,7 +83,6 @@ ExpenseReportsVentilation=Verknüpfung für Spesenabrechnungen
 CreateMvts=Neue Transaktion
 UpdateMvts=Transaktion bearbeiten
 ValidTransaction=Transaktion freigeben
-WriteBookKeeping=Transaktionen im Hauptbuch eintragen
 AccountBalance=Saldo
 ObjectsRef=Referenz des Quellobjektes
 CAHTF=Einkaufsaufwand von Steuern
@@ -151,15 +145,11 @@ ByAccounts=Nach Konto
 ByPredefinedAccountGroups=Nach Gruppe
 ByPersonalizedAccountGroups=Nach eigenen Gruppen
 NotMatch=Nicht hinterlegt
-DeleteMvt=Hauptbucheinträge löschen
 DelMonth=Zu löschender Monat
 DelYear=Zu löschendes Jahr
 DelJournal=Zu löschendes Journal
-ConfirmDeleteMvt=Hier kannst du alle Hauptbucheinträge des gewählten Jahres (Monates) und/oder für einzelne Journale löschen. Gib mindestens eines von beidem an.\nDie gelöschten Eintrage kannst du danach wieder über die Zuweisungsfunktionen ins Hauptbuch eintragen.
-ConfirmDeleteMvtPartial=Hier kannst du die Transaktion im Hauptbuch löschen. Alle zugehörigen Positionen werden ebenfalls entfernt.
 ExpenseReportsJournal=Spesenabrechnungs - Journal
 DescFinanceJournal=Finanzjournal mit allen Zahlungsarten nach Konto.
-DescJournalOnlyBindedVisible=Du siehst hier alle mit einem Buchhaltungskonto verbundenen Journaleinträge. Diese kannst du im Hauptbuch eintragen.
 VATAccountNotDefined=Leider ist kein MWST - Konto definiert.
 ThirdpartyAccountNotDefined=Leider ist kein Partner definiert.
 ProductAccountNotDefined=Leider ist kein Konto für das Produkt definiert.
diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang
index 07ca78d80ee..951b6e8c534 100644
--- a/htdocs/langs/de_CH/admin.lang
+++ b/htdocs/langs/de_CH/admin.lang
@@ -41,7 +41,6 @@ DisableJavascriptNote=Obacht, das ist nur zu Test- und Debugzwecken. Eingabehilf
 UseSearchToSelectCompanyTooltip=Wenn Sie eine grosse Anzahl von Geschäftspartnern (> 100'000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante COMPANY_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn des Strings.
 UseSearchToSelectContactTooltip=Wenn Sie eine grosse Anzahl von Kontakten (> 100.000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante CONTACT_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn des Strings.
 DelaiedFullListToSelectCompany=Nicht so eingängig, aber schneller geht's in der Combo List - Ansicht, wenn ich auf Tastendruck warten soll, bevor ich die Partnerliste lade.
-DelaiedFullListToSelectContact=Nicht so eingängig, aber schneller geht's in der Combo List - Ansicht, wenn ich auf Tastendruck warten soll, bevor ich die Kontaktliste lade.
 NumberOfKeyToSearch=Anzahl der Zeichen, die die Suche auslösen sollen:  1 %s
 NumberOfBytes=Anzahl Bytes
 SearchString=Suchtext
@@ -134,7 +133,6 @@ SpaceX=Leerraum X
 SpaceY=Leerraum Y
 NoticePeriod=Kündigungsfrist
 EMailsSetup=E-Mail Einstellungen
-EMailsDesc=Normalerweise gibt es hier nichts zu ändern. - Wenn der Mailversand nicht einfach so funktioniert, kannst du hier trotzdem die Mail - Einstellungen deiner Webserverumbegung übersteuern.
 EmailSenderProfiles=Absenderprofil
 MAIN_MAIL_SMTP_PORT=SMTP / SMTPS - Portnummer (aktuelle Konfiguration in PHP ist: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS - Portnummer (aktuelle Konfiguration in PHP ist: <b>%s</b>)
@@ -245,7 +243,6 @@ ModuleCompanyCodeSupplierAquarium=%sgefolgt von der Lieferantennummer für den K
 ModuleCompanyCodePanicum=Leeren Kontierungscode zurückgeben.
 Use3StepsApproval=Standardmässig, Einkaufsaufträge müssen durch zwei unterschiedlichen Benutzer erstellt und freigegeben werden (ein Schritt/Benutzer zum Erstellen und ein Schritt/Benutzer für die Freigabe). Beachten Sie, wenn ein Benutzer beide Rechte hat - zum Erstellen und Freigeben, dann reicht ein Benutzer für diesen Vorgang. Optional können Sie einen zusätzlichen Schritt/User für die Freigabe einrichten, wenn der Betrag einen bestimmten dedizierten Wert übersteigt (wenn der Betrag höher wird, werden 3 Stufen notwendig: 1=Validierung, 2=erste Freigabe und 3=Gegenfreigabe.<br>Lassen Sie das Feld leer, wenn eine Freigabe (2 Schritte) ausreicht; tragen Sie einen sehr niedrigen Wert (0.1) ein, wenn eine zweite Freigabe notwendig ist.
 UseDoubleApproval=3-fach Verarbeitungsschritte verwenden, wenn der Betrag (ohne Steuer) höher ist als ...
-WarningPHPMail=Obacht: Wenn du eine externe Mailadresse verwendest (also nicht die deines aktuellen Hostings hier, gibst du hier den Mailserver, der zu deiner gewünschten E-Mail Adresse passt, ein (z.B. den SMTP von GMX, wenn du eine GMX - Adresse hinterlegst.)<br/> Trage hier also Mailserver / Benutzer / Passwort deines externen Anbieters ein.<br/> Sonst kann es vorkommen, dass Mails hier nicht herausgeschickt werden, weil der lokale Maildienst einen Absender mit falscher Domäne erhält, und das blockiert.
 WarningPHPMail2=Falls dein Anbieter Mailclients auf einen IP-Adressbereich einschränkt, hier die IP deines E-Mail Benutzerprogramms hier in Dolibarr: <strong>%s</strong>.
 ClickToShowDescription=Klicken um die Beschreibung zu sehen
 DependsOn=Dieses Modul benötigt die folgenden Module
@@ -278,6 +275,7 @@ Module52Name=Produktbestände
 Module53Desc=Dienstleistungen
 Module54Name=Verträge/Abonnements
 Module70Name=Arbeitseinsätze
+Module70Desc=Serviceverwaltung
 Module80Name=Auslieferungen
 Module80Desc=Versand und Lieferverfolgung
 Module85Name=Bankkonten & Bargeld
@@ -322,7 +320,6 @@ Module50150Name=Take POS
 Module50200Desc=PayPal Zahlungsmaske aktivieren. So können deine Kunden Dolibarr - Rechnungen via PayPal oder Kreditkarte bezahlen.
 Module50300Desc=Stripe Zahlungsmaske aktivieren. So können deine Kunden Dolibarr - Rechnungen via Wallets oder Kreditkarte (plus weitere Stripe Zahlungsmöglichkeiten) bezahlen.
 Module50400Name=Doppelte Buchhaltung
-Module50400Desc=Buchhaltungsverwaltung (doppelte Buchhaltung, unterstützt Haupt- und Nebenbücher). Export des Hauptbuchs in verschiedene andere Buchhaltungssoftware-Formate.
 Module54000Desc=Direktdruck (ohne die Dokumente zu öffnen) mittels CUPS IPP.\nDer Server muss dazu CUPS am Laufen haben und Zugriff auf einen Drucker haben.
 Module55000Name=Befragung, Umfrage oder Abstimmung
 Module55000Desc=Modul zur Erstellung von Online-Umfragen, Umfragen oder Abstimmungen (wie Doodle, Studs, Rdvz,....)
@@ -353,10 +350,8 @@ Permission300=Barcodes auslesen
 Permission301=Barcodes erzeugen und ändern.
 Permission311=Leistungen einsehen
 Permission331=Lesezeichen einsehen
-Permission332=Lesezeichen erstellen/bearbeiten
 Permission401=Rabatte einsehen
 Permission430=PHP Debug Bar verwenden
-Permission511=Lohnzahlungen einsehen
 Permission512=Lohnzahlungen erstellen und bearbeiten
 Permission514=Lohnzahlungen löschen
 Permission520=Darlehen einsehen
@@ -488,16 +483,13 @@ NotificationSetup=E-Mail Benachrichtigunen konfigurieren
 NotificationEMailFrom=Absender E-Mail (From:) des Benachrichtigungsmoduls
 SendingsSetup=Modul Versand einrichten
 FCKeditorForCompany=WYSIWIG Erstellung/Bearbeitung der Firmennformationen und Notizen (ausser Produkte/Services)
-FCKeditorForProductDetails=Freihand - Editor für Produkte und alle Objekte.<font class="warning">Obacht: Das kann für die PDF - Generierung grosse Probleme in Layout und Satz bedeuten! - Für diesen Fall bitte nicht verwenden.</font>
 FCKeditorForMail=WYSIWYG Erstellung/Bearbeitung für gesamte Mail (ausser Werkzeuge->Massenmaling)
 StockSetup=Modul Lagerverwaltung einrichten
 DetailTitre=Menübezeichner oder Bezeichnungs-Code für Übersetzung
 DetailLangs=Sprachdateiname für Bezeichnungsübersetzung
 OptionVatMode=MwSt. fällig
-AGENDA_REMINDER_EMAIL=E-Mail - Benachrichtigung bei Ereignissen.<br>Obacht: Dazu muss das Modul <strong>'%s'</strong> aktiv - und richtig konfiguriert sein.
 CashDeskSetup=Modul Kasse (POS) einrichten
 BookmarkSetup=Lesezeichenmoduleinstellungen
-NbOfBoomarkToShow=Maximale Anzeigeanzahl Lesezeichen im linken Menü
 ApiSetup=API-Modul-Setup
 BankOrderESDesc=Spanisch Anzeigereihenfolge
 ChequeReceiptsNumberingModule=Modul Cheques - Verwaltung
@@ -507,7 +499,6 @@ TestGeoIPResult=Test einer Umwandlung IP -> Land
 TasksNumberingModules=Aufgaben-Nummerierungs-Modul
 NbMajMin=Mindestanzahl Grossbuchstaben
 TemplatePDFExpenseReports=Dokumentvorlagen zur Spesenabrechnung Dokument erstellen
-ExpenseReportsIkSetup=Modul Spesenabrechnungen (Milles Index) einrichten
 ExpenseReportsRulesSetup=Modul Spesenabrechnungen (Regeln) einrichten
 ExpenseReportNumberingModules=Modul Spesenabrechnung (Numerierung)
 YouMayFindNotificationsFeaturesIntoModuleNotification=Du kannst automatische Benachrichtigungen im Modul "Benachrichtigungen" festlegen und verwalten.
diff --git a/htdocs/langs/de_CH/companies.lang b/htdocs/langs/de_CH/companies.lang
index ea69af8c32c..552d590f169 100644
--- a/htdocs/langs/de_CH/companies.lang
+++ b/htdocs/langs/de_CH/companies.lang
@@ -33,6 +33,9 @@ StateCode=Kanton
 Region-State=Land / Region
 CountryCode=Ländercode
 PhoneShort=Telefon
+PhonePro=Telefon berufl.
+PhonePerso=Telefon privat
+PhoneMobile=Mobiltelefon
 No_Email=E-Mail kampagnen ablehnen
 DefaultLang=Standardsprache
 VATIsUsed=MWST - pflichtig
@@ -58,7 +61,6 @@ ProfId1BE=Prof Id 1 (Anzahl Professionnel)
 ProfId1BR=CNPJ
 ProfId2BR=IE (Staatliche Behörde)
 ProfId3BR=IM (kommunale Behörde)
-ProfId1CH=--
 ProfId3CH=Prof Id 1 (Bundes-Nummer)
 ProfId4CH=Prof Id 2 (Commercial Record-Nummer)
 ProfId1DE=Umsatzsteuer-Identifikationsnummer
@@ -68,7 +70,6 @@ ProfId2ES=Prof Id 2 (Social Security Number)
 ProfId4ES=Prof Id 4 (Collegiate Anzahl)
 ProfId3FR=Prof Id 3 (NAF, alte APE)
 ProfId4FR=Prof Id 4 (RCS / RM)
-ProfId5FR=Prof Id 5
 ProfId1GB=Prof Id 1 (Registration Number)
 ProfId3GB=Prof Id 3 (SIC)
 ProfId2IN=Prof Id 2
@@ -77,9 +78,7 @@ ProfId1LU=Id prof. 1 (R.C.S. Luxemburg)
 ProfId2LU=Id. Prof. 2
 ProfId3LU=Id. Prof. 3
 ProfId4LU=Id. Prof. 4
-ProfId5LU=Id. Prof. 5
 ProfId6LU=Id. Prof. 6
-ProfId5MA=Id prof. 5 (C.I.C.E)
 ProfId4NL=-
 ProfId2PT=Prof Id 2 (Social Security Number)
 ProfId3PT=Prof Id 3 (Commercial Record-Nummer)
@@ -95,7 +94,7 @@ ProfId6US=Id. Prof. 6
 ProfId1RO=Firmennummer CUI
 ProfId2RO=Firmennummer (Nr. Înmatriculare)
 ProfId3RO=Firmennummer CAEN
-ProfId5RO=Firmennummer EUID
+ProfId4RO=Firmennummer EUID
 ProfId1RU=Prof ID 1 (OGRN)
 ProfId3DZ=TIN – Steuer-Identifikationsnummer (EU)
 VATIntra=MWST - Nummer
diff --git a/htdocs/langs/de_CH/ecm.lang b/htdocs/langs/de_CH/ecm.lang
index edf769c70f1..3b0af95b9ed 100644
--- a/htdocs/langs/de_CH/ecm.lang
+++ b/htdocs/langs/de_CH/ecm.lang
@@ -3,11 +3,15 @@ ECMSectionManual=Manuelle Ordner
 ECMSectionAuto=Automatische Ordner
 ECMSectionsManual=Manuelle Hierarchie
 ECMSectionsAuto=Automatische Hierarchie
+ECMSections=Ordner
+ECMAddSection=Ordner hinzufügen
 ECMNbOfFilesInDir=Anzahl der Dateien in Ordner
 ECMNbOfSubDir=Anzahl der Unterordner
+ECMNbOfFilesInSubDir=Anzahl Dateien in Unterordnern
 ECMAreaDesc2=* In den automatischen Verzeichnissen werden die vom System erzeugeten Dokumente abgelegt. <br> * Die manuellen Verzeichnisse können Sie selbst verwalten und zusätzliche nicht direkt zuordenbare Dokument hinterlegen.
 ECMSectionWasRemoved=Der Ordner <b>%s</b> wurde gelöscht.
 ECMSearchByKeywords=Suche nach Stichwörter
-ECMDocsBySocialContributions=Verlinke Dokumente zu Sozialabgaben oder Steuerinformationen
-ECMDocsByThirdParties=Mit Geschäftspartnern verknüpfte Dokumente
-ECMDocsByInterventions=Mit Eingriffen verknüpfte Dokumente
+ECMSearchByEntity=Suche nach Objekt
+ECMNoDirectoryYet=Noch kein Ordner erstellt
+ShowECMSection=Ordner anzeigen
+ECMDirectoryForFiles=Relatives Verzeichnis für Dateien
diff --git a/htdocs/langs/de_CH/intracommreport.lang b/htdocs/langs/de_CH/intracommreport.lang
new file mode 100644
index 00000000000..a58a312dfb9
--- /dev/null
+++ b/htdocs/langs/de_CH/intracommreport.lang
@@ -0,0 +1,11 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+Module68000Name =Intracomm-Bericht
+Module68000Desc =Intracomm-Berichtsverwaltung (Unterstützt das französische DEB / DES-Format)
+IntracommReportSetup =Einrichtung des Intracommreport-Moduls
+IntracommReportAbout =Über Intracommreport
+MenuIntracommReport=Intracomm-Bericht
+DEB=Warenaustauscherklärung (DEB)
+DES=Erklärung zum Austausch von Dienstleistungen (DES)
+IntracommReportTitle=Vorbereitung einer XML-Datei im ProDouane-Format
+IntracommReportList=Liste der generierten Deklarationen
+IntracommReportTransportMode=Transportmodus
diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang
index 3e5caad9224..672bfdcc6f9 100644
--- a/htdocs/langs/de_CH/main.lang
+++ b/htdocs/langs/de_CH/main.lang
@@ -217,6 +217,7 @@ ExpandAll=Alle ausklappen
 UndoExpandAll=Ausklappen rückgängig machen
 SeeAll=Zeige alles an
 CloseWindow=Fenster schliessen
+NotSent=Nicht gesendet
 SendAcknowledgementByMail=Bestätigungsemail senden
 SendMail=sende E-Mail
 NoEMail=Keine E-Mail
@@ -332,6 +333,7 @@ SearchIntoInterventions=Arbeitseinsätze
 SearchIntoCustomerShipments=Kundenlieferungen
 SearchIntoExpenseReports=Spesenrapporte
 SearchIntoLeaves=Ferien
+SearchIntoVendorPayments=Lieferantenzahlungen
 NbComments=Anzahl Kommentare
 CommentPage=Kommentare
 CommentDeleted=Kommentar entfernt
diff --git a/htdocs/langs/de_CH/members.lang b/htdocs/langs/de_CH/members.lang
index 4f52f16aa71..a7d6c581920 100644
--- a/htdocs/langs/de_CH/members.lang
+++ b/htdocs/langs/de_CH/members.lang
@@ -11,7 +11,6 @@ SetLinkToThirdParty=Verknüpfung zu Dolibarr Partner
 MembersList=Mitgliederliste
 MembersListToValid=Liste der zu verifizierenden Mitglieder
 MembersListValid=Liste der verifizierten Mitglieder
-MembersListUpToDate=Liste der verifizierten aktiven Mitglieder
 DateSubscription=Start des Abonnements
 DateEndSubscription=Ende des Abonnements
 EndSubscription=Abo-Ende
diff --git a/htdocs/langs/de_CH/paybox.lang b/htdocs/langs/de_CH/paybox.lang
index 0e0d5570c7e..cf8cd91b2e0 100644
--- a/htdocs/langs/de_CH/paybox.lang
+++ b/htdocs/langs/de_CH/paybox.lang
@@ -6,6 +6,5 @@ SetupPayBoxToHavePaymentCreatedAutomatically=Paybox mit der URL <b>%s</b> einric
 YourPaymentHasBeenRecorded=Diese Seite bestätigt, dass Ihre Zahlung erfasst wurde. Vielen Dank.
 YourPaymentHasNotBeenRecorded=Hoppla, deine Zahlung wurde nicht ausgeführt und die Transaktion abgebrochen...
 PAYBOX_CGI_URL_V2=Url für das Paybox Zahlungsmodul "CGI Modul"
-VendorName=Name des Anbieters
 PAYBOX_PAYONLINE_SENDEMAIL=Email - Adresse für Zahlungsbestätigungen und -fehler
 PAYBOX_HMAC_KEY=HMAC - Schlüssel
diff --git a/htdocs/langs/de_CH/products.lang b/htdocs/langs/de_CH/products.lang
index 1d7fd648719..ea19db34f53 100644
--- a/htdocs/langs/de_CH/products.lang
+++ b/htdocs/langs/de_CH/products.lang
@@ -38,15 +38,8 @@ ServicesArea=Leistungs-Übersicht
 SupplierCard=Anbieterkarte
 SetDefaultBarcodeType=Wählen Sie den standardmässigen Barcode-Typ
 MultiPricesAbility=Preisstufen pro Produkt / Dienstleistung\n(Kunden werden einem Segment zugewiesen)
-AssociatedProductsAbility=Pakete (aus Produkten und / oder Dienstleistungen) aktivieren
-AssociatedProducts=Pakete
-AssociatedProductsNumber=Anzahl Einzelprodukte
 ParentProducts=Übergeordnetes Produkt
-IfZeroItIsNotAVirtualProduct="0" heisst: Das ist kein Produktpaket.
-IfZeroItIsNotUsedByVirtualProduct="0" heisst: dieses Produkt kommt in keinem Produktpaket vor.
 ListOfProductsServices=Liste der Produkte und Dienstleistungen
-ProductAssociationList=Liste der Produkte und Dienstleistungen dieses Paketes
-ProductParentList=Liste der Pakete mit diesem Produkt drin.
 QtyMin=Mindestmenge
 PriceQtyMin=Mindestmengenpreis
 PriceQtyMinCurrency=Mengenpreis (gem. Währung) Brutto
diff --git a/htdocs/langs/de_CH/stocks.lang b/htdocs/langs/de_CH/stocks.lang
index b9344b1a49c..50f00fefcad 100644
--- a/htdocs/langs/de_CH/stocks.lang
+++ b/htdocs/langs/de_CH/stocks.lang
@@ -5,16 +5,17 @@ NumberOfProducts=Anzahl der Produkte
 CorrectStock=Lagerbestand anpassen
 TransferStock=Lagerumbuchung
 MassStockTransferShort=Massen Lagerumbuchungen
+QtyDispatched=Versandmenge
 DeStockOnShipment=Verringere reale Bestände bei Bestädigung von Lieferungen
 StockOnReception=Lagerbestand anpassen, sobald Lieferung frei gegeben wird.
 StockOnReceptionOnClosing=Lagerbestand anpassen, sobald die Lieferung geschlossen wird.
+NoPredefinedProductToDispatch=Keine vordefinierten Produkte für dieses Objekt. Also kein Versand im Lager erforderlich ist.
 DispatchVerb=Versand
 StockLimitShort=Alarmschwelle
 StockLimit=Sicherungsbestand für autom. Benachrichtigung
 RealStock=Realer Lagerbestand
 VirtualStock=Theoretisches Warenlager
 DesiredStockDesc=Dieser Bestand wird für die Nachbestellfunktion verwendet.
-UseVirtualStockByDefault=Nutze theoretische Lagerbestände anstatt des physischem Bestands für die Nachbestellungsfunktion
 UseVirtualStock=theoretisches Warenlager verwenden
 UsePhysicalStock=Physisches Warenlager verwenden
 CurentlyUsingVirtualStock=Theoretisches Warenlager
diff --git a/htdocs/langs/de_CH/suppliers.lang b/htdocs/langs/de_CH/suppliers.lang
index b9d8e2e366c..a026cbf2f84 100644
--- a/htdocs/langs/de_CH/suppliers.lang
+++ b/htdocs/langs/de_CH/suppliers.lang
@@ -3,6 +3,7 @@ ShowSupplierInvoice=Lieferantenrechnung anzeigen
 NewSupplier=Erzeuge Lieferant
 ListOfSuppliers=Lieferantenliste
 ShowSupplier=Lieferant anzeigen
+BuyingPriceMin=Bester Einkaufspreis
 BuyingPriceMinShort=Bester Einkaufspreis
 TotalBuyingPriceMinShort=Summe der Einkaufspreise der Unterprodukte
 TotalSellingPriceMinShort=Summe der Verkaufspreise der Unterprodukte
@@ -24,6 +25,7 @@ ListOfSupplierProductForSupplier=Produkte und Preise von <b>%s</b>
 SentToSuppliers=An Lieferant verschickt
 ListOfSupplierOrders=Lieferantenbestellungen
 MenuOrdersSupplierToBill=Lieferantenbestellungen zum bezahlen
+NbDaysToDelivery=Lieferverzug in Tagen
 DescNbDaysToDelivery=Bestellpositionen mit der höchsten Lieferverzögerung
 SupplierReputation=Lieferantenbewertung
 DoNotOrderThisProductToThisSupplier=Nicht bestellen
@@ -31,4 +33,3 @@ NotTheGoodQualitySupplier=Mindere Qualität
 ReputationForThisProduct=Bewertung
 BuyerName=Einkäufer
 AllProductServicePrices=Alle Preise für Produkte und Dienstleisitungen
-AllProductReferencesOfSupplier=Alle dem Lieferanten zugewiesenen Produkte und Dienstleistungen
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index 296314e7df6..112d1879d15 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Standard für Leistung
 DefaultForProduct=Standard für Produkt
 CantSuggest=Kann keines vorschlagen
 AccountancySetupDoneFromAccountancyMenu=Die wichtigste Teil der Konfiguration der Buchhaltung aus dem Menü %s wurde erledigt
-ConfigAccountingExpert=Konfiguration des Experten-Buchhaltungsmoduls
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalisieren
-Journaux=Journale
+Journals=Journale
 JournalFinancial=Finanzjournale
 BackToChartofaccounts=Zurück zum  Kontenplan
 Chartofaccounts=Kontenplan
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Aktuelles dediziertes Konto
 AssignDedicatedAccountingAccount=Neues Konto zuweisen
 InvoiceLabel=Rechnungsanschrift
@@ -33,8 +35,8 @@ OtherInfo=Zusatzinformationen
 DeleteCptCategory=Buchhaltungskonto aus Gruppe entfernen
 ConfirmDeleteCptCategory=Soll dieses Buchhaltungskonto wirklich aus der Gruppe entfernt werden?
 JournalizationInLedgerStatus=Status der Journalisierung
-AlreadyInGeneralLedger=Schon ins Hauptbuch übernommen
-NotYetInGeneralLedger=Noch nicht ins Hauptbuch übernommen
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Gruppe ist leer, kontrollieren Sie die persönlichen Kontogruppen
 DetailByAccount=Detail pro Konto zeigen
 AccountWithNonZeroValues=Konto mit Werten != 0
@@ -43,7 +45,9 @@ CountriesInEEC=EU-Länder
 CountriesNotInEEC=Nicht-EU Länder
 CountriesInEECExceptMe=EU-Länder außer %s
 CountriesExceptMe=Alle Länder außer %s
-AccountantFiles=Buchhaltungsdokumente exportieren
+AccountantFiles=Belegdokumente exportieren
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=Ansicht nach Buchhaltungskonto
 
 MainAccountForCustomersNotDefined=Standardkonto für Kunden im Setup nicht definiert
 MainAccountForSuppliersNotDefined=Standardkonto für Lieferanten die nicht im Setup definiert sind
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=SCHRITT %s: Vorhandene Transaktionen hinzufügen oder
 
 AccountancyAreaDescClosePeriod=SCHRITT %s: Schließen Sie die Periode, damit wir in Zukunft keine Veränderungen vornehmen können.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=Eine erforderliche Einrichtung wurde nicht abgeschlossen. (Kontierungsinformationen fehlen bei einigen Bankkonten)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Aktiven Kontenplan wählen
 ChangeAndLoad=ändern & laden
 Addanaccount=Fügen Sie ein Buchhaltungskonto hinzu
@@ -89,6 +93,8 @@ SubledgerAccount=Nebenbuchkonto
 SubledgerAccountLabel=Nebenbuchkonto-Bezeichnung
 ShowAccountingAccount=Buchhaltungskonten anzeigen
 ShowAccountingJournal=Buchhaltungsjournal anzeigen
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Buchhaltungskonto Vorschlag
 MenuDefaultAccounts=Standardkonten
 MenuBankAccounts=Bankkonten
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Spesenabrechnung Zuordnung
 CreateMvts=neue Transaktion erstellen
 UpdateMvts=Änderung einer Transaktion
 ValidTransaction=Transaktion bestätigen
-WriteBookKeeping=Transaktionen ins Hauptbuch übernehmen
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Hauptbuch
+BookkeepingSubAccount=Nebenbuch
 AccountBalance=Saldo Sachkonten
 ObjectsRef=Quellreferenz
 CAHTF=Gesamtbetrag Lieferant vor Steuern
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Deaktivieren der direkte Aufzeichnung von Transaktion
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Entwurfexport für Journal aktivieren
 ACCOUNTANCY_COMBO_FOR_AUX=Kombinationsliste für Nebenkonto aktivieren \n(kann langsam sein, wenn Sie viele Geschäftspartner haben)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Verkaufsjournal
 ACCOUNTING_PURCHASE_JOURNAL=Einkaufsjournal
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Buchhaltungskonto in Wartestellung
 DONATION_ACCOUNTINGACCOUNT=Buchhaltungskonto für Spenden
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Buchhaltungskonto für Abonnements
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standard-Buchhaltungskonto für gekaufte Produkte \n(wenn nicht anders im Produktblatt definiert)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Standardmäßig Buchhaltungskonto für die gekauften Produkte in der EU (wird verwendet, wenn nicht im Produktblatt definiert)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Standardmäßig Buchhaltungskonto für die gekauften und aus der EU importierten Produkte (wird verwendet, wenn nicht im Produktblatt definiert)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Pro vordefinierten Gruppen
 ByPersonalizedAccountGroups=Pro persönlichen Gruppierung
 ByYear=pro Jahr
 NotMatch=undefiniert
-DeleteMvt=Zeilen im Hauptbuch löschen
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Monat zum Löschen
 DelYear=Jahr zu entfernen
 DelJournal=Journal zu entfernen
-ConfirmDeleteMvt=Dadurch werden alle Zeilen des Hauptbuchs für das Jahr / den Monat und / oder aus einem bestimmten Journal gelöscht (mindestens ein Kriterium ist erforderlich). Sie müssen die Funktion "Registrierung in der Buchhaltung" erneut verwenden, um den gelöschten Datensatz wieder im Hauptbuch zu haben.
-ConfirmDeleteMvtPartial=Die Buchung wird aus dem Hauptbuch gelöscht (Alle Einträge aus dieser Buchung werden gelöscht)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finanzjournal
 ExpenseReportsJournal=Spesenabrechnungsjournal
 DescFinanceJournal=Finanzjournal inklusive aller Arten von Zahlungen mit Bankkonto
-DescJournalOnlyBindedVisible=Ansicht der Datensätze, die an Buchhaltungskonto  gebunden sind und in das Hauptbuch übernommen werden können.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Steuerkonto nicht definiert
 ThirdpartyAccountNotDefined=Konto für Geschäftspartner nicht definiert
 ProductAccountNotDefined=Konto für Produkt nicht definiert
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Dieses Journal wird bereits verwendet
 AccountingAccountForSalesTaxAreDefinedInto=Hinweis: Buchaltungskonten für Steuern sind im Menü <b>%s</b> - <b>%s</b> definiert
 NumberOfAccountancyEntries=Anzahl der Einträge
 NumberOfAccountancyMovements=Anzahl der Bewegungen
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Entwurfsjournal exportieren
@@ -326,6 +339,8 @@ Modelcsv_configurable=konfigurierbarer CSV-Export
 Modelcsv_FEC=Export nach FEC
 Modelcsv_Sage50_Swiss=Export für Sage 50 (Schweiz)
 Modelcsv_winfic=Exportiere Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Kontenplan ID
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index c93ae8157fe..7af899574d9 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -37,10 +37,12 @@ UnlockNewSessions=Sperrung neuer Sitzungen aufheben
 YourSession=Ihre Sitzung
 Sessions=Benutzersitzungen
 WebUserGroup=WebServer Benutzer/Gruppen
+PermissionsOnFilesInWebRoot=Berechtigungen für Dateien im Stammverzeichnis Web
+PermissionsOnFile=Berechtigungen für die Datei %s
 NoSessionFound=Ihre PHP -Konfiguration scheint keine Auflistung aktiver Sitzungen zuzulassen. Eventuell ist die Speicherung im Verzeichnis (<b>%s</b>) durch fehlende Berechtigungen blockiert (zum Beispiel: Betriebssystemberechtigungen oder open_basedir-Beschränkungen). 
 DBStoringCharset=Zeichensatz der Datenbank-Speicherung
 DBSortingCharset=Datenbank-Zeichensatz zum Sortieren von Daten
-HostCharset=Host-Datensatz
+HostCharset=Host  Zeichensatz
 ClientCharset=Client-Zeichensatz
 ClientSortingCharset=Client Sortierreihenfolge
 WarningModuleNotActive=Modul <b>%s</b> muss aktiviert sein
@@ -71,7 +73,7 @@ DisableJavascriptNote=Hinweis: Zu Test- oder Debug-Zwecken. Zur Optimierung für
 UseSearchToSelectCompanyTooltip=Wenn Sie eine große Anzahl von Partnern (> 100.000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante COMPANY_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn des Strings.
 UseSearchToSelectContactTooltip=Wenn Sie eine große Anzahl von Kontakten (> 100.000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante CONTACT_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn des Strings.
 DelaiedFullListToSelectCompany=Warte auf Tastendruck, bevor der Inhalt der Partner-Combo-Liste geladen wird <br> Dies kann die Leistung verbessern, wenn Sie eine große Zahl von Partnern haben.
-DelaiedFullListToSelectContact=Warte auf Tastendruck, bevor der Inhalt der Kontakt-Combo-Liste geladen wird <br> Dies kann die Leistung verbessern, wenn Sie eine große Zahl von Kontakte haben).
+DelaiedFullListToSelectContact=Wartet, bis eine Taste gedrückt wird, bevor der Inhalt der Kontakt-Kombinationsliste geladen wird. <br> Dies kann die Leistung erhöhen, wenn Sie eine große Anzahl von Kontakten haben, ist jedoch weniger praktisch.
 NumberOfKeyToSearch=Zahl der Zeichen, die die Suche auslösen sollen: %s
 NumberOfBytes=Anzahl an Bytes
 SearchString=Suchbegriff
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=Bei den Elementen eines Partners, ist es m
 JavascriptDisabled=JavaScript deaktiviert
 UsePreviewTabs=Vorschau-Tabs verwenden
 ShowPreview=Vorschau anzeigen
+ShowHideDetails=Details ein-/ausblenden
 PreviewNotAvailable=Vorschau nicht verfügbar
 ThemeCurrentlyActive=derzeit aktivierte grafische Oberfläche
 CurrentTimeZone=Aktuelle Zeitzone des PHP-Servers
@@ -271,7 +274,7 @@ NoticePeriod=Einreichefrist
 NewByMonth=Neu nach Monat
 Emails=E-Mail
 EMailsSetup=E-Mail-Einstellungen
-EMailsDesc=Auf dieser Seite können Sie Ihre Standardparameter für den e-Mail-Versand überschreiben. In den meisten Fällen ist das PHP-Setup unter Unix/Linux-Betriebssystem korrekt und diese Parameter sind unnötig.
+EMailsDesc=Auf dieser Seite können Sie Parameter oder Optionen für das Senden von E-Mails festlegen.
 EmailSenderProfiles=E-Mail-Signaturen
 EMailsSenderProfileDesc=Sie können diesen Bereich leer lassen. Wenn Sie hier E-Mail-Adressen angeben, werden diese beim Schreiben einer neuen E-Mail in die Liste der möglichen Absender aufgenommen.
 MAIN_MAIL_SMTP_PORT=SMTP(S)-Port (Standardwert Ihrer php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP-Benutzer (falls der Server eine Authentifizierung benöt
 MAIN_MAIL_SMTPS_PW=SMTP-Passwort (falls der Server eine Authentifizierung benötigt) 
 MAIN_MAIL_EMAIL_TLS=TLS (SSL) Verschlüsselung verwenden
 MAIN_MAIL_EMAIL_STARTTLS=TLS (STARTTLS) Verschlüsselung verwenden
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autorisieren der automatischen Signaturen der Zertifikate
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Verwende DKIM um die e-Mail Signatur zu erstellen
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=e-Mail Domain für die Verwendung mit DKIM
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name des DKIM-Selektors
@@ -300,9 +304,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Standard Absender e-Mail für manuelle Sendungen (Ben
 UserEmail=E-Mail des Benutzers
 CompanyEmail=Unternehmens-E-Mail 
 FeatureNotAvailableOnLinux=Diese Funktion ist auf Unix-Umgebungen nicht verfügbar. Testen Sie Ihr Programm sendmail lokal.
-FixOnTransifex=Fix the translation on the online translation platform of project
+FixOnTransifex=Die Übersetzung in der Online-Übersetzungs-Plattform des Projektes korrigieren
 SubmitTranslation=Wenn die Übersetzung für diese Sprache nicht vollständig ist oder Sie Fehler finden, können Sie dies korrigieren, indem Sie Dateien im Verzeichnis <b>langs/%s</b> bearbeiten und Ihre Änderung an www.transifex.com/dolibarr-association/dolibarr/ senden.
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
+SubmitTranslationENUS=Ist die Übersetzung für diese Sprache nicht vollständig oder fehlerhaft, kann das durch editieren der Dateien im Verzeichnis  <b>langs/%s</b> korrigiert werden und modifizierte Dateien sollen auch auf dolibarr.org/forum gepostet oder, als Entwickler, mit einer PR auf github.com/Dolibarr/dolibarr bekanntgeben werden
 ModuleSetup=Moduleinstellung
 ModulesSetup=Modul-/Anwendungseinstellungen
 ModuleFamilyBase=System
@@ -387,12 +391,12 @@ ModuleMustBeEnabledFirst=Modul <b>%s</b> muss aktiviert sein, wenn Sie dieses Fe
 SecurityToken=Schlüssel um die URLs zu entschlüsseln
 NoSmsEngine=Kein SMS-Sendermanager verfügbar. Ein SMS-Sendermanager ist nicht mit der Standardverteilung installiert, da er von einem externen Anbieter abhängig ist, können Sie einige davon finden unter %s
 PDF=PDF
-PDFDesc=Global options for PDF generation
-PDFAddressForging=Rules for address section
+PDFDesc=Globale Einstellungen für die PDF-Erzeugung
+PDFAddressForging=Regeln für die Auswahl der Adressen
 HideAnyVATInformationOnPDF=Alle Informationen zu Steuern und MWSt. im generierten PDF ausblenden
 PDFRulesForSalesTax=Regeln für Umsatzsteuer / MwSt.
 PDFLocaltax=Regeln für %s
-HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
+HideLocalTaxOnPDF=Steuersatz %s in der Spalte Verkauf Steuer / Mwst. ausblenden
 HideDescOnPDF=Verstecke Produktbeschreibung
 HideRefOnPDF=Artikelnummer nicht anzeigen
 HideDetailsOnPDF=Verstecke Produkt-Zeilen Details
@@ -409,9 +413,9 @@ PriceBaseTypeToChange=Ändern Sie den Basispreis definierte nach
 MassConvert=Starte Massenkonvertierung
 PriceFormatInCurrentLanguage=Preisformat in der aktuellen Sprache
 String=Zeichenkette
-String1Line=String (1 line)
+String1Line=String (1 Zeile)
 TextLong=Langer Text
-TextLongNLines=Long text (n lines)
+TextLongNLines=Langer Text (n Zeilen)
 HtmlText=HTML-Text
 Int=Ganzzahl
 Float=Fließkommazahl
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Wenn Sie dieses Feld leer lassen, wird dieser Wert u
 ExtrafieldParamHelpselect=Die Liste der Werte muss aus Zeilen mit dem Format Schlüssel, Wert bestehen (wobei Schlüssel nicht '0' sein darf) <br><br> zum Beispiel: <br> 1, value1 <br> 2, value2 <br> Code3, Wert3 <br> ... <br><br> Damit die Liste von einer anderen ergänzenden Attributliste abhängt: <br> 1, value1 | options_ <i>parent_list_code</i> : parent_key <br> 2, value2 | options_ <i>parent_list_code</i> : parent_key <br><br> Um die Liste von einer anderen Liste abhängig zu machen: <br> 1, value1 | <i>parent_list_code</i> : parent_key <br> 2, value2 | <i>parent_list_code</i> : parent_key
 ExtrafieldParamHelpcheckbox=Die Liste der Werte muss aus Zeilen mit dem Format Schlüssel, Wert bestehen (wobei Schlüssel nicht '0' sein darf) <br><br> zum Beispiel: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
 ExtrafieldParamHelpradio=Die Liste der Werte muss aus Zeilen mit dem Format Schlüssel, Wert bestehen (wobei Schlüssel nicht '0' sein darf) <br><br> zum Beispiel: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
-ExtrafieldParamHelpsellist=Die Liste der Werte stammt aus einer Tabelle <br> Syntax: table_name: label_field: id_field :: filter <br> Beispiel: c_typent: libelle: id :: filter <br><br> - idfilter ist notwendigerweise ein primärer int-Schlüssel <br> - Filter kann ein einfacher Test sein (z. B. aktiv = 1), um nur den aktiven Wert anzuzeigen <br> Sie können $ ID $ auch in Filtern verwenden, bei denen es sich um die aktuelle ID des aktuellen Objekts handelt <br> Verwenden Sie $ SEL $, um ein SELECT im Filter durchzuführen <br> Wenn Sie nach Extrafeldern filtern möchten, verwenden Sie die Syntax extra.fieldcode = ... (wobei field code der Code des Extrafelds ist) <br><br> Damit die Liste von einer anderen ergänzenden Attributliste abhängt: <br> c_typent: libelle: id: options_ <i>parent_list_code</i> | parent_column: filter <br><br> Um die Liste von einer anderen Liste abhängig zu machen: <br> c_typent: libelle: id: <i>parent_list_code</i> | parent_column: filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Die Liste der Werte stammt aus einer Tabelle <br> Syntax: table_name: label_field: id_field :: filter <br> Beispiel: c_typent: libelle: id :: filter <br><br> Filter kann ein einfacher Test sein (z. B. aktiv = 1), um nur den aktiven Wert anzuzeigen <br> Sie können $ ID $ auch in Filtern verwenden, bei denen es sich um die aktuelle ID des aktuellen Objekts handelt <br> Verwenden Sie $ SEL $, um ein SELECT im Filter durchzuführen <br> Wenn Sie nach Extrafeldern filtern möchten, verwenden Sie die Syntax extra.fieldcode = ... (wobei field code der Code des Extrafelds ist) <br><br> Damit die Liste von einer anderen ergänzenden Attributliste abhängt: <br> c_typent: libelle: id: options_ <i>parent_list_code</i> | parent_column: filter <br><br> Um die Liste von einer anderen Liste abhängig zu machen: <br> c_typent: libelle: id: <i>parent_list_code</i> | parent_column: filter
-ExtrafieldParamHelplink=Parameter müssen folgendes Format haben: ObjektName:Klassenpfad<br>Syntax: ObjektName:Klassenpfad<br> Beispiele:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Die Parameter müssen ObjectName: Classpath <br> sein. Syntax: ObjectName: Classpath
 ExtrafieldParamHelpSeparator=Für ein einfaches Trennzeichen leer lassen <br> Setzen Sie diesen Wert für ein ausblendendes Trennzeichen auf 1 (standardmäßig für eine neue Sitzung geöffnet, der Status wird für jede Benutzersitzung beibehalten) <br> Setzen Sie diesen Wert für ein ausblendendes Trennzeichen auf 2 (standardmäßig für ausgeblendet) neue Sitzung, dann bleibt der Status für jede Benutzersitzung erhalten)
 LibraryToBuildPDF=Bibliothek zum Erstellen von PDF-Dateien
 LocalTaxDesc=Einige Länder erheben möglicherweise zwei oder drei Steuern auf jede Rechnungsposition. Wenn dies der Fall ist, wählen Sie den Typ für die zweite und dritte Steuer und ihren Steuersatz. Mögliche Typen sind: <br> 1: auf Produkte und Dienstleistungen ohne Mehrwertsteuer wird eine örtliche Steuer erhoben (die örtliche Steuer wird auf den Betrag ohne Mehrwertsteuer berechnet) <br> 2: Für Produkte und Dienstleistungen einschließlich Mehrwertsteuer wird eine lokale Steuer erhoben (die lokale Steuer wird auf den Betrag + die Hauptsteuer berechnet). <br> 3: auf Produkte ohne Mehrwertsteuer wird eine lokale Steuer erhoben (die lokale Steuer wird auf den Betrag ohne Mehrwertsteuer berechnet) <br> 4: Für Produkte einschließlich Mehrwertsteuer wird eine lokale Steuer erhoben (die Mehrwertsteuer wird auf den Betrag + die Haupt-Mehrwertsteuer berechnet). <br> 5: auf Dienstleistungen ohne Mehrwertsteuer wird eine lokale Steuer erhoben (die lokale Steuer wird auf den Betrag ohne Mehrwertsteuer berechnet) <br> 6: Für Dienstleistungen einschließlich Mehrwertsteuer wird eine lokale Steuer erhoben (die lokale Steuer wird auf den Betrag und die Steuer berechnet).
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s, gefolgt vom abgeschnittenen Kundennamen u
 ModuleCompanyCodeSupplierDigitaria=%s, gefolgt vom verkürzten Lieferantennamen und der Anzahl der Zeichen: %s für den Lieferantenbuchhaltungscode.
 Use3StepsApproval=Standardmäßig, Einkaufsaufträge müssen durch zwei unterschiedlichen Benutzer erstellt und freigegeben werden (ein Schritt/Benutzer zu erstellen und ein Schritt/Benutzer für die Freigabe). Beachten Sie wenn ein Benutzer beide Rechte hat - zum erstellen und freigeben, dann reicht ein Benutzer für diesen Vorgang. Optional können Sie ein zusätzlicher Schritt/User für die Freigabe einrichten, wenn der Betrag einen bestimmten dedizierten Wert übersteigt (wenn der Betrag übersteigt wird, werden 3 Stufen notwendig: 1=Validierung, 2=erste Freigabe und 3=Gegenfreigabe.<br>Lassen Sie den Feld leer wenn eine Freigabe (2 Schritte) ausreicht; Tragen Sie einen sehr niedrigen Wert (0.1) wenn eine zweite Freigabe notwendig ist.
 UseDoubleApproval=3-Fach Verarbeitungsschritte verwenden wenn der Betrag (ohne Steuer) höher ist als ...
-WarningPHPMail=WARNUNG: Es ist häufig besser, ausgehende E-Mails so einzurichten, dass der E-Mail-Server Ihres Providers anstelle der Standardeinstellung verwendet wird. Einige E-Mail-Anbieter (wie Yahoo) erlauben es Ihnen nicht, eine E-Mail von einem anderen Server als ihrem eigenen Server zu senden. Ihre aktuelle Konfiguration verwendet den Server der Anwendung zum Senden von E-Mails und nicht den Server Ihres E-Mail-Anbieters. Einige Empfänger (derjenige, der mit dem restriktiven DMARC-Protokoll kompatibel ist) fragen Ihren E-Mail-Anbieter, ob sie Ihre E-Mail und einige E-Mail-Anbieter akzeptieren können (wie Yahoo) antworten Sie möglicherweise mit &quot;Nein&quot;, da der Server nicht dem Server gehört. Daher werden möglicherweise nur wenige Ihrer gesendeten E-Mails nicht akzeptiert (achten Sie auch auf das Sendekontingent Ihres E-Mail-Anbieters). <br> Wenn Ihr E-Mail-Anbieter (wie Yahoo) diese Einschränkung hat, müssen Sie das E-Mail-Setup ändern, um die andere Methode &quot;SMTP-Server&quot; zu wählen und den SMTP-Server und die von Ihrem E-Mail-Anbieter bereitgestellten Anmeldeinformationen einzugeben.
+WarningPHPMail=WARNUNG: Das Setup zum Senden von E-Mails aus der Anwendung verwendet das generische Standard-Setup. Aus mehreren Gründen ist es häufig besser, ausgehende E-Mails so einzurichten, dass sie den E-Mail-Server Ihres E-Mail-Dienstanbieters verwenden, anstatt die Standardeinstellung:
+WarningPHPMailA=- Die Verwendung des Servers des E-Mail-Dienstanbieters erhöht die Vertrauenswürdigkeit Ihrer E-Mail, sodass die Zustellbarkeit erhöht wird, ohne als SPAM gekennzeichnet zu werden
+WarningPHPMailB=- Bei einigen E-Mail-Dienstanbietern (wie Yahoo) können Sie keine E-Mails von einem anderen Server als deren eigenen Server senden. Ihr aktuelles Setup verwendet den Server der Anwendung zum Senden von E-Mails und nicht den Server Ihres E-Mail-Anbieters. Einige Empfänger (die mit dem restriktiven DMARC-Protokoll kompatibel sind) fragen Ihren E-Mail-Anbieter, ob sie Ihre E-Mail und einige E-Mail-Anbieter akzeptieren können (wie Yahoo) antwortet möglicherweise mit "Nein", da der Server nicht ihnen gehört. Daher werden möglicherweise einige Ihrer gesendeten E-Mails nicht zur Zustellung angenommen (achten Sie auch auf das Sendekontingent Ihres E-Mail-Anbieters).
+WarningPHPMailC=- Interessant ist auch die Verwendung des SMTP-Servers Ihres eigenen E-Mail-Dienstanbieters zum Senden von E-Mails, sodass alle von der Anwendung gesendeten E-Mails auch in dem Verzeichnis "Gesendet" Ihrer Mailbox gespeichert werden.
+WarningPHPMailD=Wenn die Methode 'PHP Mail' wirklich die Methode ist, die Sie verwenden möchten, können Sie diese Warnung entfernen, indem Sie die Konstante MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP unter Start - Einstellungen - Erweiterte Einstellungen zu 1 hinzufügen.
 WarningPHPMail2=Wenn Ihr E-Mail-SMTP-Anbieter den E-Mail-Client auf einige IP-Adressen beschränken muss (sehr selten), dann ist dies die IP-Adresse des Mail User Agent (MUA) für ihr Dolibarr-System: <strong>%s</strong>.
-WarningPHPMailSPF=Ist der Domainname der Absender E-Mail mit SPF geschützt (beim E-Mail-Provider erfragen), müssen die folgenden IP-Adressen im SPF-Record des DNS deiner Domain eingetragen werden: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Klicke um die Beschreibung zu sehen
 DependsOn=Diese Modul benötigt folgenden Module
 RequiredBy=Diese Modul ist für folgende Module notwendig
@@ -547,16 +555,14 @@ Module55Name=Barcodes
 Module55Desc=Barcode-Verwaltung
 Module56Name=Zahlung per Überweisung
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Payments by Direct Debit
+Module57Name=Zahlungen per Lastschrifteinzug
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial-Integration
-Module59Name=Bookmark4u
-Module59Desc=Neues Bookmark4u Konto zu Systembenutzerkonto hinzufügen
 Module60Name=Etiketten
 Module60Desc=Verwaltung der Etiketten
 Module70Name=Serviceaufträge
-Module70Desc=Serviceverwaltung
+Module70Desc=Verwaltung von Serviceaufträgen (Kundendiensteinsätze, Hotline-Support usw.)
 Module75Name=Spesen- und Reiseaufzeichnungen
 Module75Desc=Reise- und Fahrtspesenverwaltung
 Module80Name=Lieferungen
@@ -656,7 +662,7 @@ Module50200Desc=Bieten Sie Kunden eine PayPal-Online-Zahlungsseite (PayPal-Konto
 Module50300Name=Stripe
 Module50300Desc=Bietet Kunden eine Stripe-Online-Zahlungsseite an (Kredit-/Debit-Karten). Diese Seite kann verwendet werden, um Ihren Kunden Ad-hoc-Zahlungen oder Zahlungen mit Bezug auf ein bestimmtes Dolibarr-Objekt (Rechnung, Bestellung etc...) zu ermöglichen.
 Module50400Name=Buchhaltung (erweitert) 
-Module50400Desc=Verwaltung der Buchhaltung (Doppelte Buchführung, Unterstützung von Haupt- und Nebenbüchern). Exportiert das Hauptbuch in verschiedene andere Formate von Buchhaltungssoftware.
+Module50400Desc=Buchhaltungsmanagement (doppelte Einträge, Unterstützung von Haupt- und Nebenbüchern). Exportieren Sie das Hauptbuch in verschiedene andere Buchhaltungssoftwareformate.
 Module54000Name=PrintIPP
 Module54000Desc=Direktdruck (ohne die Dokumente zu öffnen) mittels CUPS IPP (Drucker muss vom Server aus sichtbar sein, auf dem Server muss CUPS installiert sein)
 Module55000Name=Umfrage- und Terminfindungsmodul
@@ -671,7 +677,7 @@ Module63000Name=Ressourcen
 Module63000Desc=Verwalten Sie Ressourcen (Drucker, Autos, Räume, ...) für zugeordnete Ereignisse
 Permission11=Rechnungen einsehen
 Permission12=Rechnungen erstellen/bearbeiten
-Permission13=Rechnungsfreigabe aufheben
+Permission13=Ungültige Kundenrechnungen
 Permission14=Rechnungen freigeben
 Permission15=Rechnungen per E-Mail versenden
 Permission16=Rechnungszahlungen erstellen
@@ -688,6 +694,7 @@ Permission32=Produkte/Leistungen erstellen/bearbeiten
 Permission34=Produkte/Leistungen löschen
 Permission36=Projekte/Leistungen exportieren
 Permission38=Produkte exportieren
+Permission39=Minimalpreis ignorieren
 Permission41=Lesen Sie Projekte und Aufgaben (gemeinsames Projekt und Projekte, für die ich Kontakt habe). Kann auch die für mich oder meine Hierarchie verbrauchte Zeit für zugewiesene Aufgaben eingeben (Arbeitszeittabelle)
 Permission42=Erstellen und Ändern von Projekten (geteilte Projekte und solche, in denen ich Kontakt bin). Kann auch Aufgaben erstellen und Benutzer dem Projekt und den Aufgaben zuweisen.
 Permission44=Projekte löschen (gemeinsame Projekte und Projekte, in denen ich Ansprechpartner bin)
@@ -696,6 +703,9 @@ Permission61=Serviceaufträge ansehen
 Permission62=Serviceaufträge erstellen/bearbeiten
 Permission64=Serviceaufträge löschen
 Permission67=Leistungen exportieren
+Permission68=Serviceaufträge per E-Mail versenden 
+Permission69=Serviceaufträge validieren
+Permission70=Serviceaufträge ungültig machen
 Permission71=Mitglieder einsehen
 Permission72=Mitglieder erstellen/bearbeiten
 Permission74=Mitglieder löschen
@@ -718,6 +728,7 @@ Permission95=Buchhaltung einsehen
 Permission101=Auslieferungen einsehen
 Permission102=Auslieferungen erstellen/bearbeiten
 Permission104=Auslieferungen freigeben
+Permission105=Send sendings by email
 Permission106=Auslieferungen exportieren
 Permission109=Sendungen löschen
 Permission111=Finanzkonten einsehen
@@ -808,8 +819,8 @@ Permission301=Barcodes erstellen/bearbeiten
 Permission302=Barcodes löschen
 Permission311=Leistungen anzeigen
 Permission312=Leistung/Abonnement einem Vertrag zuordnen
-Permission331=Favoriten anzeigen
-Permission332=Favoriten erstellen/bearbeiten
+Permission331=Lesezeichen anzeigen
+Permission332=Lesezeichen erstellen/bearbeiten
 Permission333=Lesezeichen löschen
 Permission341=Eigene Berechtigungen einsehen
 Permission342=Eigene Benutzerinformationen erstellen/bearbeiten
@@ -825,10 +836,11 @@ Permission402=Rabatte erstellen/bearbeiten
 Permission403=Rabatte freigeben
 Permission404=Rabatte löschen
 Permission430=Debug Bar nutzen
-Permission511=Lohn-/Gehaltszahlungen anzeigen
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Lohnzahlungen anlegen / ändern
 Permission514=Lohn-/Gehaltszahlungen löschen
-Permission517=Löhne exportieren
+Permission517=Read payments of salaries of everybody
+Permission519=Löhne exportieren
 Permission520=Darlehen anzeigen
 Permission522=Darlehen erstellen/bearbeiten
 Permission524=Lösche Darlehen
@@ -843,12 +855,15 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Aufkleber lesen
+Permission602=Erstellen / Ändern von Aufklebern
+Permission609=Aufkleber löschen
 Permission650=Stücklisten anzeigen
 Permission651=Stücklisten erstellen / aktualisieren
 Permission652=Stücklisten löschen
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
+Permission660=Fertigungsauftrag (MO) anzeigen
+Permission661=Fertigungsauftrag (MO) erstellen/aktualisieren
+Permission662=Fertigungsauftrag (MO) löschen
 Permission701=Spenden anzeigen
 Permission702=Spenden erstellen/bearbeiten
 Permission703=Spenden löschen
@@ -858,8 +873,8 @@ Permission773=Spesenabrechnung löschen
 Permission774=Spesenabrechnungen einsehen  (Alle Benutzer auch die nicht Untergebenen)
 Permission775=Spesenabrechnung genehmigen
 Permission776=Spesenabrechnung bezahlen
-Permission777=Read expense reports of everybody
-Permission778=Create/modify expense reports of everybody
+Permission777=Lesen Sie die Spesenabrechnungen aller
+Permission778=Spesenabrechnungen aller erstellen / ändern
 Permission779=Spesenabrechnung exportieren
 Permission1001=Warenbestände einsehen
 Permission1002=Warenlager erstellen/ändern
@@ -884,7 +899,9 @@ Permission1185=Lieferantenbestellungen bestätigen/genehmigen
 Permission1186=Lieferantenbestellungen übermitteln
 Permission1187=Eingang von Lieferantenbestellungen bestätigen
 Permission1188=Lieferantenbestellungen löschen
+Permission1189=Aktivieren / Deaktivieren Sie einen Bestellempfang
 Permission1190=Lieferantenbestellungen bestätigen (zweite Bestätigung)
+Permission1191=Exportieren Sie Lieferantenaufträge und deren Attribute
 Permission1201=Exportresultate einsehen
 Permission1202=Export erstellen/bearbeiten
 Permission1231=Lieferantenrechnungen anzeigen
@@ -898,6 +915,8 @@ Permission1251=Massenimports von externen Daten ausführen (data load)
 Permission1321=Kundenrechnungen, -attribute und -zahlungen exportieren
 Permission1322=Eine bezahlte Rechnung wieder öffnen
 Permission1421=Kundenaufträge und Attribute exportieren
+Permission1521=Dokumente lesen
+Permission1522=Dokumente löschen
 Permission2401=Aktionen (Ereignisse oder Aufgaben) lesen, die mit seinem Benutzerkonto verknüpft sind (wenn Eigentümer des Ereignisses oder gerade zugewiesen)
 Permission2402=Aktionen (Ereignisse oder Aufgaben) erstellen / ändern, die mit seinem Benutzerkonto verknüpft sind (wenn Eigentümer des Ereignisses)
 Permission2403=Mit seinem Benutzerkonto verknüpfte Aktionen (Ereignisse oder Aufgaben) löschen (wenn Eigentümer des Ereignisses)
@@ -912,7 +931,7 @@ Permission2515=Dokumentverzeichnisse verwalten
 Permission2801=FTP-Client im Lesemodus nutzen (nur ansehen und herunterladen)
 Permission2802=FTP-Client im Schreibmodus nutzen (Dateien löschen oder hochladen)
 Permission3200=Eingetragene Ereignisse und Fingerprints lesen
-Permission3301=Generate new modules
+Permission3301=Neues Module erstellen
 Permission4001=Mitarbeiter anzeigen
 Permission4002=Mitarbeiter erstellen
 Permission4003=Mitarbeiter löschen
@@ -932,9 +951,13 @@ Permission23001=anzeigen cronjobs
 Permission23002=erstellen/ändern cronjobs
 Permission23003=cronjobs löschen
 Permission23004=cronjobs ausführen
-Permission50101=benutze Kasse (POS)
+Permission50101=Verwenden des Kassenmoduls (SimplePOS)
+Permission50151=Verwenden des Kassenmoduls (TakePOS)
 Permission50201=Transaktionen einsehen
 Permission50202=Transaktionen importieren
+Permission50330=Lesen Sie Objekte von Zapier
+Permission50331=Objekte von Zapier erstellen / aktualisieren
+Permission50332=Objekte von Zapier löschen
 Permission50401=Produkte und Rechnungen mit Sachkonten verbinden
 Permission50411=Hauptbuch-Vorgänge lesen
 Permission50412=Hauptbuch-Vorgänge schreiben/bearbeiten
@@ -958,10 +981,21 @@ Permission63001=Ressourcen anzeigen
 Permission63002=Ressource erstellen/bearbeiten
 Permission63003=Ressource löschen
 Permission63004=Verbinden von  Ressourcen zu Ereignissen
+Permission64001=Direkt drucken erlauben
+Permission67000=Drucken von Quittungen erlauben
+Permission68001=Lesen Sie den Intracomm-Bericht
+Permission68002=Intracomm-Bericht erstellen / ändern
+Permission68004=Intracomm-Bericht löschen
+Permission941601=Quittungen einlesen
+Permission941602=Erstellen und ändern von Quittungen
+Permission941603=Quittungen bestätigen
+Permission941604=Quittungen per E-Mail senden
+Permission941605=Quittungen exportieren
+Permission941606=Quittungen löschen
 DictionaryCompanyType=Arten von Partnern 
 DictionaryCompanyJuridicalType=Rechtsformen von Partnern
-DictionaryProspectLevel=Prospect potential level for companies
-DictionaryProspectContactLevel=Prospect potential level for contacts
+DictionaryProspectLevel=Level für Interessentenstatus - Unternehmen
+DictionaryProspectContactLevel=Level für Interessentenstatus - Kontakte
 DictionaryCanton=Bundesland/Kanton
 DictionaryRegion=Regionen
 DictionaryCountry=Länder
@@ -991,12 +1025,14 @@ DictionaryEMailTemplates=E-Mail-Vorlagen
 DictionaryUnits=Einheiten
 DictionaryMeasuringUnits=Maßeinheiten
 DictionarySocialNetworks=Soziale Netzwerke
-DictionaryProspectStatus=Prospect status for companies
-DictionaryProspectContactStatus=Prospect status for contacts
+DictionaryProspectStatus=Interessentenstatus für Unternehmen
+DictionaryProspectContactStatus=Interessentenstatus für Kontakte
 DictionaryHolidayTypes=Urlaubsarten
 DictionaryOpportunityStatus=Verkaufschancen für Projekt/Lead
 DictionaryExpenseTaxCat=Spesenbericht - Mobilität
 DictionaryExpenseTaxRange=Spesenreport - Bereich pro Transportkategorie
+DictionaryTransportMode=Intracomm-Bericht - Transportmodus
+TypeOfUnit=Art der Einheit
 SetupSaved=Einstellungen gespeichert
 SetupNotSaved=Einstellungen nicht gespeichert
 BackToModuleList=Zurück zur Modulübersicht
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Bezeichnung wird verwendet falls keine Übersetzung für den
 LabelOnDocuments=Bezeichnung auf Dokumenten
 LabelOrTranslationKey=Bezeichung oder Übersetzungsschlüssel
 ValueOfConstantKey=Wert einer Konfigurationskonstante
+ConstantIsOn=Option %s ist aktiviert
 NbOfDays=Anzahl der Tage
 AtEndOfMonth=Am Monatsende
 CurrentNext=Aktueller/ Nächster
@@ -1091,7 +1128,7 @@ LoginPage=Anmeldeseite
 BackgroundImageLogin=Hintergrundbild
 PermanentLeftSearchForm=Ständiges Suchfeld auf der linken Seite
 DefaultLanguage=Standardsprache
-EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
+EnableMultilangInterface=Mehrsprachen-Support für Kunden- oder Lieferanten-Beziehungen zulassen
 EnableShowLogo=Firmenlogo im Menü anzgeigen
 CompanyInfo=Firma oder Institution
 CompanyIds=Firmen-/Organisations-IDs
@@ -1145,6 +1182,7 @@ InfoWebServer=Über Ihren Webserver
 InfoDatabase=Über Ihre Datenbank
 InfoPHP=Über PHP
 InfoPerf=Leistungs-Informationen
+InfoSecurity=About Security
 BrowserName=Browsername
 BrowserOS=Betriebssystem des Browsers
 ListOfSecurityEvents=Liste der sicherheitsrelevanten Ereignisse
@@ -1194,7 +1232,8 @@ RestoreDesc=Um eine vollständige Systemsicherung wiederherzustellen sind folgen
 RestoreDesc2=Stellen Sie die Sicherungsdatei (z. B. ZIP-Datei) des Verzeichnisses "documents" in einer neuen Dolibarr-Installation oder in diesem aktuellen Dokumentverzeichnis wieder her (<b> %s </b>).
 RestoreDesc3=Stellen Sie die Datenbankstruktur und die Daten aus einer Sicherungskopiedatei in der Datenbank der neuen Dolibarr-Installation oder in der Datenbank dieser aktuellen Installation wieder her (<b> %s </b>). Warnung: Nach Abschluss der Wiederherstellung müssen Sie ein Login / Passwort verwenden, das zum Zeitpunkt der Sicherung / Installation vorhanden war, um erneut eine Verbindung herzustellen. <br> Um eine Sicherungsdatenbank in dieser aktuellen Installation wiederherzustellen, können Sie diesem Assistenten folgen.
 RestoreMySQL=MySQL Import
-ForcedToByAModule= Diese Regel wird <b>%s</b> durch ein aktiviertes Modul aufgezwungen
+ForcedToByAModule=Diese Regel wird <b>%s</b> durch ein aktiviertes Modul aufgezwungen
+ValueIsForcedBySystem=Dieser Wert wird vom System erzwungen. Sie können ihn nicht ändern.
 PreviousDumpFiles=bestehende Datensicherungsdateien
 PreviousArchiveFiles=Bestehende Archivdateien
 WeekStartOnDay=Wochenstart
@@ -1255,8 +1294,8 @@ WarningAtLeastKeyOrTranslationRequired=Es sind mindestens ein Suchkriterium erfo
 NewTranslationStringToShow=Meine Übersetzung
 OriginalValueWas=Original-Übersetzung überschrieben. Der frühere Wert war:<br><br>%s
 TransKeyWithoutOriginalValue=Sie haben eine neue Übersetzung für den Schlüssel '<strong>%s</strong>' erzwungen, der in keiner der Sprachdateien vorhanden ist.
-TitleNumberOfActivatedModules=Activated modules
-TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Aktivierte Module
+TotalNumberOfActivatedModules=Aktivierte Module: <b>%s</b>/<b>%s</b>
 YouMustEnableOneModule=Sie müssen mindestens 1 Modul aktivieren
 ClassNotFoundIntoPathWarning=Klasse %s nicht im PHP-Pfad gefunden
 YesInSummer=Ja im Sommer
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP Komponente %s ist geladen
 PreloadOPCode=Vorgeladener OPCode wird verwendet
 AddRefInList=Anzeigen der Info-Liste mit Kunden- / Lieferantenreferenz (Auswahlliste oder Combobox) und die meisten Hyperlinks. <br> Drittanbieter werden mit dem Namensformat "CC12345 - SC45678 - The Big Company corp." anstelle von "The Big Company corp" angezeigt.
 AddAdressInList=Anzeigen der Info-Liste mit Kunden- / Lieferantenadressen (Auswahlliste oder Kombinationsfeld) <br> Dritte werden mit dem Namensformat "The Big Company Corp. - 21 jump street 123456 Big Town - USA" anstelle von "The Big Company Corp." angezeigt.
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Nach der bevorzugten Versandart für Drittanbieter fragen.
 FieldEdition=Bearbeitung von Feld %s
 FillThisOnlyIfRequired=Beispiel: +2 (nur ausfüllen, wenn Sie Probleme mit der Zeitzone haben)
@@ -1282,7 +1322,7 @@ GetBarCode=Übernehmen
 NumberingModules=Nummerierungsmodelle
 DocumentModules=Dokumentvorlagen
 ##### Module password generation
-PasswordGenerationStandard=Generiere ein Passwort nach dem internen Systemalgorithmus: 8 Zeichen, Zahlen und Kleinbuchstaben.
+PasswordGenerationStandard=Gibt ein Kennwort zurück, das gemäß dem internen Dolibarr-Algorithmus generiert wurde: %s Zeichen, die gemeinsam genutzte Zahlen und Zeichen in Kleinbuchstaben enthalten.
 PasswordGenerationNone=Kein generiertes Passwort vorschlagen. Das Passwort muss manuell eingegeben werden.
 PasswordGenerationPerso=Ein Passwort entsprechend der persönlich definierten Konfiguration zurückgeben.
 SetupPerso=Nach Ihrer Konfiguration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Für das Anlegen eines neuen Mitglieds ist eine E-Mail-Adre
 MemberSendInformationByMailByDefault=Das Kontrollkästchen für den automatischen Versand einer E-Mail-Bestätigung an Mitglieder (bei Freigabe oder neuem Abonnement) ist standardmäßig aktiviert
 VisitorCanChooseItsPaymentMode=Der Besucher kann aus verschiedenen Zahlungsmethoden auswählen
 MEMBER_REMINDER_EMAIL=Aktivieren Sie die automatische Erinnerung <b> per E-Mail </b> an abgelaufene Abonnements. Hinweis: Das Modul <strong> %s </strong> muss aktiviert und ordnungsgemäß eingerichtet sein, damit Erinnerungen gesendet werden können.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP-Einstellungen
 LDAPGlobalParameters=Globale LDAP-Parameter
@@ -1523,7 +1564,9 @@ LDAPDescValues=Die Beispielwerte für <b>OpenLDAP</b> verfügen über folgende M
 ForANonAnonymousAccess=Für einen authentifizierten Zugang (z.B. für Schreibzugriff)
 PerfDolibarr=Leistungs-Einstellungen/Optimierungsreport
 YouMayFindPerfAdviceHere=Auf dieser Seite finden Sie einige Überprüfungen oder Hinweise zur Leistung.
-NotInstalled=Nicht installiert, Ihr Server wird dadurch nicht verlangsamt.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=geeigneter Cache
 MemcachedNotAvailable=Kein Cache Anwendung gefunden. \nSie können die Leistung durch die Installation des Cache-Server Memcached und die Aktivierung des Moduls Anwendungscache<br>hier mehr Informationen <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>\nverbessern.\nBeachten Sie, dass viele Billig-Provider keine solche Cache-Server in ihrer Infrastruktur anbieten.
 MemcachedModuleAvailableButNotSetup=Module memcached für geeigneten Cache gefunden, aber Setup-Modul ist nicht vollständig.
@@ -1571,9 +1614,9 @@ SyslogLevel=Level
 SyslogFilename=Dateiname und-pfad
 YouCanUseDOL_DATA_ROOT=Sie können DOL_DATA_ROOT/dolibarr.log als Protokolldatei in Ihrem Dokumentenverzeichnis verwenden. Bei Bedarf können Sie auch den Pfad der Datei anpassen.
 ErrorUnknownSyslogConstant=Konstante %s ist nicht als Protokoll-Konstante definiert
-OnlyWindowsLOG_USER=Windows unterstützt nur LOG_USER
+OnlyWindowsLOG_USER=Unter Windows wird nur die Funktion LOG_USER unterstützt
 CompressSyslogs=Komprimierung von Datensicherung- und Debuglogs (Generiert durch das Logmodul)
-SyslogFileNumberOfSaves=Backuplogs
+SyslogFileNumberOfSaves=Anzahl der zu behaltenden Backup-Logs
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Konfigurieren Sie einen geplanten Job um die Logbackups zu automatisieren
 ##### Donations #####
 DonationsSetup=Spendenmoduleinstellungen
@@ -1629,7 +1672,7 @@ AdvancedEditor=Erweiterter Editor
 ActivateFCKeditor=FCKEditor aktivieren für:
 FCKeditorForCompany=WYSIWIG Erstellung/Bearbeitung der Partnerinformationen und Notizen
 FCKeditorForProduct=WYSIWIG Erstellung/Bearbeitung von Produkt-/Serviceinformationen und Notizen
-FCKeditorForProductDetails=WYSIWG Erstellung/Bearbeitung der Produktdetails für alle Dokumente( Angebote, Bestellungen, Rechnungen etc...) Achtung: Die Option führt potentiell zu Problemen mit Umlauten und Sonderzeichen und wird daher nicht empfohlen.
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG Erstellung/Bearbeitung von E-Mails
 FCKeditorForUserSignature=WYSIWIG Erstellung/Bearbeitung von Benutzer-Signaturen
 FCKeditorForMail=WYSIWYG-Erstellung/Bearbeitung für alle E-Mails (außer Werkzeuge->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Lagerverwaltung Einstellungen
 IfYouUsePointOfSaleCheckModule=Wenn Sie das standardmäßig bereitgestellte POS-Modul oder ein externes Modul verwenden, wird dieses Setup möglicherweise von Ihrem POS-Modul ignoriert. Die meisten POS-Module sind standardmäßig so konzipiert, dass sie sofort eine Rechnung erstellen und den Lagerbestand unabhängig von den hier angegebenen Optionen verringern. Wenn Sie also bei der Registrierung eines Verkaufs an Ihrem POS eine Bestandsreduzierung benötigen oder nicht, überprüfen Sie auch die Einrichtung Ihres POS-Moduls.
 ##### Menu #####
 MenuDeleted=Menü gelöscht
+Menu=Menü
 Menus=Menüs
 TreeMenuPersonalized=Personalisierte Baumansicht
 NotTopTreeMenuPersonalized=Personalisierte Menüs die nicht mit dem Top-Menü verknüpft sind
 NewMenu=Neues Menü
-Menu=Menüauswahl
 MenuHandler=Menü-Handler
 MenuModule=Quellmodul
 HideUnauthorizedMenu= Hide unbefugte Menüs (grau)
@@ -1694,15 +1737,16 @@ AGENDA_USE_EVENT_TYPE=Verwenden Ereignissarten \nEinstellen unter (Start -> Eins
 AGENDA_USE_EVENT_TYPE_DEFAULT=Diesen Standardwert automatisch als Ereignistyp im  Ereignis Erstell-Formular verwenden.
 AGENDA_DEFAULT_FILTER_TYPE=Diesen Ereignisstatus automatisch in den Suchfilter für die Agenda-Ansicht übernehmen
 AGENDA_DEFAULT_FILTER_STATUS=Diesen Ereignisstatus automatisch in den Suchfilter für die Agenda-Ansicht übernehmen
-AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Aktiviere Terminbenachrichtigungen <b>via E-Mail</b> (Die Benachrichtigungszeit/Frequenz kann auf dem jeweiligen Termin eingestellt werden). Info: Modul <strong>%s</strong> muss aktiviert und richtig konfiguriert sein, damit die Erinnerungen korrekt versendet werden können.
-AGENDA_REMINDER_BROWSER=Ereigniserinnerung aktivieren <b> im Browser des Benutzers </b> (Wenn das Ereignisdatum erreicht ist, kann jeder Benutzer dies in der Frage zur Browserbestätigung ablehnen.)
+AGENDA_DEFAULT_VIEW=Welche Standardansicht soll geöffnet werden, wenn das Menü 'Agenda' geöffnet wird
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Aktiviere Tonbenachrichtigung
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Verknüpfte Objekte in Agenda anzeigen
 ##### Clicktodial #####
 ClickToDialSetup=Click-to-Dial Moduleinstellungen
 ClickToDialUrlDesc=URL, die bei einem Klick auf das Telefonsymbol aufgerufen werden soll. In dieser URL können die folgenden Tags verwendet werden: <br><b>__PHONETO__</b> Telefonnummer des Angerufenen<br><b>__PHONEFROM__</b> Telefonnummer des Anrufers (Ihre)<br><b>__LOGIN__</b> Ihren Benutzernamen für Click-to-Dial (siehe Benutzerdaten)<br><b>__PASS__</b> Ihr Click-to-Dial-Passwort (siehe Benutzerdaten).
-ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
+ClickToDialDesc=Dieses Modul formatiert Telefonnummern als direkt anklickbare Links auf Desktop-PCs. Ein Klick wählt die Nummer. Damit kann ein Telefonanruf direkt gestartet werden, wenn Softphones oder SIP-Telefone verwendet werden. Hinweis: Auf Smartphones sind Telefonnummern immer anklickbar.
 ClickToDialUseTelLink=Nur einen Link "Tel:" bei Telefonnummern verwenden
 ClickToDialUseTelLinkDesc=Benutzen Sie diese Methode, wenn Ihre Benutzer ein Software-Telefon oder ein Interface für ein Telefon auf demselben Computer wie der Browser installiert haben. Dieses Telefon/Interface wird aufgerufen, wenn Sie auf einen Link klicken, der mit "tel:" beginnt. Wenn Sie eine vollständige Server-Lösung nutzen wollen (ohne lokale Software-Installation), wählen Sie hier "Nein" und füllen das nächste Feld.
 ##### Point Of Sale (CashDesk) #####
@@ -1722,9 +1766,9 @@ CashDeskForceDecreaseStockLabel=Eine Bestandsreduktion für Produktposten wurde
 CashDeskForceDecreaseStockDesc=Verringern Sie zuerst ausgehend vom ältesten Mindesthaltbarkeitsdatum oder Verbrauchsdatum.
 CashDeskReaderKeyCodeForEnter=Schlüsselcode für "Enter" im Barcodeleser definiert (Beispiel: 13)
 ##### Bookmark #####
-BookmarkSetup=Favoriten-Moduleinstellungen
-BookmarkDesc=Dieses Modul ermöglicht die Verwaltung von Favoriten. Außerdem können Sie hiermit Verknüpfungen zu internen und externen Seiten im linken Menü anlegen.
-NbOfBoomarkToShow=Maximale Anzeigeanzahl Favoriten im linken Menü
+BookmarkSetup=Lesezeichen-Moduleinstellungen
+BookmarkDesc=Dieses Modul ermöglicht die Verwaltung von Lesezeichen. Außerdem können Sie hiermit Verknüpfungen zu internen und externen Seiten im linken Menü anlegen.
+NbOfBoomarkToShow=Maximale Anzeigeanzahl Lesezeichen im linken Menü
 ##### WebServices #####
 WebServicesSetup=Webservices-Moduleinstellungen
 WebServicesDesc=Über Aktivierung dieses Moduls können Sie dolibarr zur Anbindung an externe Webservices konfigurieren
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0: Zahlungsart Kunde  /  1: Zahlungsart Lieferant  /  2: Zahlung
 IncludePath=Include-Pfad (in Variable '%s' definiert)
 ExpenseReportsSetup=Einstellungen des Moduls Spesenabrechnung
 TemplatePDFExpenseReports=Dokumentvorlagen zur Erstellung einer Spesenabrechnung
-ExpenseReportsIkSetup=Einstellungen vom Modul Spesenabrechnungen - Meilenindex
 ExpenseReportsRulesSetup=Einrichtung vom Modul Spesenabrechnungen - Regeln
 ExpenseReportNumberingModules=Modul zur Nummerierung von Spesenabrechnungen
 NoModueToManageStockIncrease=Kein Modul zur automatische Bestandserhöhung ist aktiviert. Lager Bestandserhöhung kann nur durch manuelle Eingabe erfolgen.
@@ -1833,7 +1876,7 @@ EnterAnyCode=Dieses Feld enthält eine Referenz um die Zeile zu identifizieren.
 Enter0or1=Gib 0 oder 1 ein
 UnicodeCurrency=Geben Sie hier zwischen geschweiften Klammern die Liste der Bytes ein, die das Währungssymbol darstellen. Zum Beispiel: Geben Sie für $ [36] ein - für brasilianische Real-R $ [82,36] - geben Sie für € [8364] ein
 ColorFormat=Die RGB Farben sind im Hexformat, zB. FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
+PictoHelp=Symbolname im Dolibarr-Format ('image.png' im aktuellen Themenverzeichnis, 'image.png@nom_du_module' im Verzeichnis / img / eines Moduls)
 PositionIntoComboList=Zeilenposition in der Combo-Listen
 SellTaxRate=Mehrwertsteuersatz
 RecuperableOnly=Ja für USt. "Wahrgenommene nicht Erstattungsfähig" für einige Regionen in Frankreich. Nein für alle anderen Fälle.
@@ -1864,7 +1907,7 @@ MailToSendReception=Wareneingänge
 MailToThirdparty=Partner
 MailToMember=Mitglieder
 MailToUser=Benutzer
-MailToProject=Projektseiten
+MailToProject=Projekte
 MailToTicket=Tickets
 ByDefaultInList=Standardanzeige als Listenansicht
 YouUseLastStableVersion=Sie verwenden die letzte stabile Version
@@ -1874,7 +1917,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s ist verfügbar. Versio
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s ist verfügbar. Version %s ist ein Wartungsupdate, das nur Fehlerbereinigungen enthält. Wir empfehlen allen Benutzern ein Upgrade auf diese Version. Wie bei jedem Wartungsupdate sind keinen neuen Features oder Änderungen in den Datenstrukturen enthalten. Sie können die Version aus dem Downloadbereich des Portals https://www.dolibarr.org laden (Unterverzeichnis &quot;stabile Versionen&quot;). Lesen Sie die komplette Liste der Änderungen im <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a>.
 MultiPriceRuleDesc=Wenn die Option "Mehrere Preisstufen pro Produkt / Dienstleistung" aktiviert ist, können Sie für jedes Produkt unterschiedliche Preise definieren (einen pro Preisstufe). Um Zeit zu sparen, können Sie hier eine Regel eingeben, um einen Preis für jede Ebene auf der Grundlage des Preises der ersten Ebene automatisch zu berechnen, sodass Sie für jedes Produkt nur einen Preis für die erste Ebene eingeben müssen. Diese Seite soll Ihnen Zeit sparen, ist jedoch nur dann nützlich, wenn Ihre Preise für jedes Level im Verhältnis zum ersten Level stehen. Sie können diese Seite in den meisten Fällen ignorieren.
 ModelModulesProduct=Vorlagen für Produktdokumente
-WarehouseModelModules=Templates for documents of warehouses
+WarehouseModelModules=Vorlagen für Lagerdokumente
 ToGenerateCodeDefineAutomaticRuleFirst=Um Codes automatisch generieren zu können, muß zuerst ein Manager für die automatische Generierung von Barcode-Nummer festgelegt werden.
 SeeSubstitutionVars=Siehe * für einen Liste möglicher Ersetzungsvariablen
 SeeChangeLog=Siehe ChangeLog-Datei (nur Englisch)
@@ -1913,7 +1956,7 @@ MAIN_PDF_MARGIN_LEFT=Linker Rand im PDF
 MAIN_PDF_MARGIN_RIGHT=Rechter Rand im PDF
 MAIN_PDF_MARGIN_TOP=Oberer Rand im PDF
 MAIN_PDF_MARGIN_BOTTOM=Unterer Rand im PDF
-MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Höhe des Logos im PDF
 NothingToSetup=Dieses Modul benötigt keine speziellen Einstellungen.
 SetToYesIfGroupIsComputationOfOtherGroups=Setzen Sie dieses Fehld auf Ja, wenn diese Gruppe eine Berechnung von anderen Gruppen ist
 EnterCalculationRuleIfPreviousFieldIsYes=Berechnungsregel eingeben, falls das vorangehende Feld auf Ja gesetzt ist. (Beispiel: 'CODEGPR1+CODEGRP2')
@@ -1953,14 +1996,16 @@ NothingProcessed=Nicht ausgeführt
 XEmailsDoneYActionsDone=%sE-Mail(s) qualifiziert, %s E-Mail(s) erfolgreich verarbeitet (für %s Aufzeichnung(en) / Aktion(en) durchgeführt)
 RecordEvent=eMail-Ereignis aufzeichnen/registrieren
 CreateLeadAndThirdParty=als potentiellen Verkaufskontakt anlegen
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+CreateTicketAndThirdParty=Ticket erstellen (und mit einem Dritten verknüpfen, wenn es von einem vorherigen Vorgang geladen wurde)
 CodeLastResult=Letzter Resultatcode
 NbOfEmailsInInbox=Anzahl E-Mails im Quellverzeichnis
 LoadThirdPartyFromName=Drittanbieter-Suche auf %s laden (nur laden)
 LoadThirdPartyFromNameOrCreate=Drittanbieter-Suche auf %s laden (erstellen, wenn nicht gefunden)
-WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
-WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
-CreateCandidature=Create candidature
+WithDolTrackingID=Nachricht einer Unterhaltung die durch eine erste von Dolibarr gesendete E-Mail initiiert wurde 
+WithoutDolTrackingID=Nachricht einer Unterhaltung die NICHT durch eine erste von Dolibarr gesendete E-Mail initiiert wurde 
+WithDolTrackingIDInMsgId=Nachricht von Dolibarr gesendet
+WithoutDolTrackingIDInMsgId=Nachricht NICHT von Dolibarr gesendet
+CreateCandidature=Bewerbung erstellen
 FormatZip=PLZ
 MainMenuCode=Menüpunktcode (Hauptmenü)
 ECMAutoTree=Automatischen ECM-Baum anzeigen
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Funktion zum deaktivieren, dass eine Resource mit Ko
 EnableResourceUsedInEventCheck=Aktivieren Sie diese Funktion, um zu überprüfen, ob eine Ressource in einem Ereignis verwendet wird
 ConfirmUnactivation=Modul zurücksetzen bestätigen
 OnMobileOnly=Nur auf kleinen Bildschirmen (Smartphones)
-DisableProspectCustomerType=Deaktivieren Sie den Drittanbietertyp "Interessent + Kunde" (d.h. ein Drittanbieter muss ein Interessent oder Kunde sein, kann aber nicht beides sein).
+DisableProspectCustomerType=Deaktivieren Sie den Drittanbieter-Typ "Interessent + Kunde" (d.h. der Drittanbieter muss "Interessent" oder "Kunde" sein, kann aber nicht beides sein).
 MAIN_OPTIMIZEFORTEXTBROWSER=Vereinfachte Benutzeroberfläche für Blinde
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Aktivieren Sie diese Option, wenn Sie eine blinde Person sind, oder wenn Sie die Anwendung über einen Textbrowser wie Lynx oder Links verwenden.
 MAIN_OPTIMIZEFORCOLORBLIND=Farben der Benutzeroberfläche für Farbenblinde ändern.
@@ -1996,15 +2041,17 @@ UseDebugBar=Verwenden Sie die Debug Leiste
 DEBUGBAR_LOGS_LINES_NUMBER=Zahl der letzten Protokollzeilen, die in der Konsole verbleiben sollen
 WarningValueHigherSlowsDramaticalyOutput=Warnung, höhere Werte verlangsamen die Ausgabe erheblich.
 ModuleActivated=Modul %s is aktiviert und verlangsamt die Overfläche
+IfYouAreOnAProductionSetThis=Wenn Sie sich in einer Produktionsumgebung befinden, sollten Sie diese Eigenschaft auf %s setzen.
+AntivirusEnabledOnUpload=Antivirus für hochgeladene Dateien aktiviert
 EXPORTS_SHARE_MODELS=Exportmodelle sind für jeden zugänglich.
 ExportSetup=Einrichtung Modul Export
 ImportSetup=Einrichtung des Modulimports
 InstanceUniqueID=Eindeutige ID dieser Instanz
 SmallerThan=Kleiner als
 LargerThan=Größer als
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Beachten Sie, dass das erstellte Ereignis automatisch mit dem bekannten verwandten Objekt verknüpft wird, wenn eine Tracking-ID eines Objekts in einer E-Mail gefunden wird oder wenn die E-Mail eine Antwort auf eine E-Mail ist, die bereits gesammelt und mit einem Objekt verknüpft wurde.
 WithGMailYouCanCreateADedicatedPassword=Wenn Sie bei einem GMail-Konto die 2-stufige Validierung aktiviert haben, wird empfohlen, ein spezielles zweites Passwort für die Anwendung zu erstellen, anstatt Ihr eigenes Konto-Passwort von https://myaccount.google.com/. zu verwenden.
-EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
+EmailCollectorTargetDir=Es kann ein erwünscht sein, die E-Mail in ein anderes Tag / Verzeichnis zu verschieben, wenn sie erfolgreich verarbeitet wurde. Legen Sie hier einfach den Namen des Verzeichnisses fest, um diese Funktion zu verwenden (verwenden Sie KEINE Sonderzeichen im Namen). Beachten Sie, dass Sie auch ein Lese- / Schreib-Anmeldekonto verwenden müssen.
 EmailCollectorLoadThirdPartyHelp=Mit dieser Aktion können Sie den E-Mail-Inhalt verwenden, um einen vorhandenen Dritten in Ihrer Datenbank zu suchen und zu laden. Der gefundene (oder erstellte) Drittanbieter wird für die folgenden erforderlichen Aktionen verwendet. Im Parameterfeld können Sie zum Beispiel 'EXTRACT: BODY: Name: \\ s ([^ \\ s] *)' verwenden, wenn Sie den Namen des Drittanbieters aus einer Zeichenfolge 'Name: Name zu finden' extrahieren, und in den body einfügen möchten.
 EndPointFor=Endpunkt für %s:%s
 DeleteEmailCollector=Lösche eMail-Collector
@@ -2026,7 +2073,13 @@ RssNote=Hinweis: Jede RSS-Feed-Definition enthält ein Widget, das Sie aktiviere
 JumpToBoxes=Wechseln Sie zu Einstellungen -> Widgets
 MeasuringUnitTypeDesc=Verwenden Sie hier einen Wert wie "Größe", "Oberfläche", "Volumen", "Gewicht", "Zeit".
 MeasuringScaleDesc=Die Skala gibt die Anzahl der Stellen an, an denen Sie den Dezimalteil verschieben müssen, um mit der Standardreferenzeinheit übereinzustimmen. Für den Einheitentyp "Zeit" ist dies die Anzahl der Sekunden. Werte zwischen 80 und 99 sind reservierte Werte.
-TemplateAdded=Template added
-TemplateUpdated=Template updated
-TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+TemplateAdded=Vorlage hinzugefügt
+TemplateUpdated=Vorlage aktualisiert
+TemplateDeleted=Vorlage gelöscht
+MailToSendEventPush=Ereigniserinnerungs-E-Mail
+SwitchThisForABetterSecurity=Das Ändern dieses Werts auf %s wird aus Sicherheitsgründen empfohlen
+DictionaryProductNature= Art des Produkts
+CountryIfSpecificToOneCountry=Land (falls spezifisch für ein bestimmtes Land)
+YouMayFindSecurityAdviceHere=Hier finden Sie Sicherheitshinweise
+ModuleActivatedMayExposeInformation=Dieses Modul kann vertrauliche Daten verfügbar machen. Wenn Sie es nicht benötigen, deaktivieren Sie es.
+ModuleActivatedDoNotUseInProduction=Ein für die Entwicklung entwickeltes Modul wurde aktiviert. Aktivieren Sie es nicht in einer Produktionsumgebung.
diff --git a/htdocs/langs/de_DE/agenda.lang b/htdocs/langs/de_DE/agenda.lang
index 84e9a4c07dd..73e7c40f93c 100644
--- a/htdocs/langs/de_DE/agenda.lang
+++ b/htdocs/langs/de_DE/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Anzahl der Ereignisse
 ListOfActions=Liste Ereignisse
 EventReports=Ereignisbericht
 Location=Ort
-ToUserOfGroup=Ereignis, für jeden Benutzer in einer Gruppe zugewiesen ist
+ToUserOfGroup=Ereignis, das einem Benutzer in der Gruppe zugewiesen ist
 EventOnFullDay=Ganztägig
 MenuToDoActions=Alle unvollst. Termine
 MenuDoneActions=Alle abgeschlossenen Termine
@@ -86,8 +86,8 @@ ProposalDeleted=Angebot gelöscht
 OrderDeleted=Auftrag gelöscht
 InvoiceDeleted=Rechnung gelöscht
 DraftInvoiceDeleted=Rechnungsentwurf gelöscht
-CONTACT_CREATEInDolibarr=Contact %s created
-CONTACT_DELETEInDolibarr=Contact %s deleted
+CONTACT_CREATEInDolibarr=Kontakt %s erstellt
+CONTACT_DELETEInDolibarr=Kontakt %s gelöscht
 PRODUCT_CREATEInDolibarr=Produkt %s erstellt
 PRODUCT_MODIFYInDolibarr=Produkt %s geändert
 PRODUCT_DELETEInDolibarr=Produkt %s gelöscht
@@ -152,6 +152,7 @@ ActionType=Ereignistyp
 DateActionBegin=Startzeit des Ereignis
 ConfirmCloneEvent=Möchten Sie dieses Ereignis <b>%s</b> wirklich duplizieren?
 RepeatEvent=Wiederhole Ereignis
+OnceOnly=Nur einmal
 EveryWeek=Jede Woche
 EveryMonth=Jeden Monat
 DayOfMonth=Tag des Monat
@@ -160,9 +161,9 @@ DateStartPlusOne=Startdatum + 1 Stunde
 SetAllEventsToTodo=Setze alle Ereignisse auf Status 'zu erledigen'
 SetAllEventsToInProgress=Setze alle Ereignisse auf Status 'in Bearbeitung'
 SetAllEventsToFinished=Setze alle Ereignisse auf Status 'Abgeschlossen'
-ReminderTime=Reminder period before the event
-TimeType=Duration type
-ReminderType=Callback type
-AddReminder=Create an automatic reminder notification for this event
-ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+ReminderTime=Erinnerungsintervall vor dem Ereignis
+TimeType=Erinnerungsdauer
+ReminderType=Erinnerungstyp
+AddReminder=Erstellt eine automatische Erinnerungsbenachrichtigung für dieses Ereignis
+ErrorReminderActionCommCreation=Fehler beim Erstellen der Erinnerungsbenachrichtigung für dieses Ereignis
+BrowserPush=Browser Benachrichtigung
diff --git a/htdocs/langs/de_DE/assets.lang b/htdocs/langs/de_DE/assets.lang
index 02fb914fdfc..cfc0ae0e7a0 100644
--- a/htdocs/langs/de_DE/assets.lang
+++ b/htdocs/langs/de_DE/assets.lang
@@ -27,7 +27,7 @@ AssetTypeModified=Anlagentyp geändert
 AssetType=Anlagetyp
 AssetsLines=Anlagen
 DeleteType=Lösche Gruppe
-DeleteAnAssetType=Lösche eine Resourcenart
+DeleteAnAssetType=Lösche einen Anlagetyp
 ConfirmDeleteAssetType=Möchten Sie diesen Anlagetyp wirklich löschen?
 ShowTypeCard=Zeige Typ '%s'
 
diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang
index dd8f1a9db3e..a5c59fe2608 100644
--- a/htdocs/langs/de_DE/banks.lang
+++ b/htdocs/langs/de_DE/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Sonstige Bezahlung
 VariousPayments=Sonstige Zahlungen
 ShowVariousPayment=Sonstige Zahlung anzeigen
 AddVariousPayment=Sonstige Zahlung hinzufügen
+VariousPaymentId=Sonstige Zahlungs-ID
+VariousPaymentLabel=Sonstige Zahlungs-Beschreibung
+ConfirmCloneVariousPayment=Bestätigen Sie das Duplizieren einer sonstigen Zahlung
 SEPAMandate=SEPA Mandat
 YourSEPAMandate=Ihr SEPA-Mandat
 FindYourSEPAMandate=Dies ist Ihr SEPA-Mandat, um unser Unternehmen zu ermächtigen, Lastschriftaufträge bei Ihrer Bank zu tätigen. Senden Sie es unterschrieben (Scan des unterschriebenen Dokuments) oder per Post an
@@ -176,3 +179,4 @@ BankColorizeMovement=Bewegungen färben
 BankColorizeMovementDesc=Wenn diese Funktion aktiviert ist, können Sie eine bestimmte Hintergrundfarbe für Debit- oder Kreditbewegungen auswählen
 BankColorizeMovementName1=Hintergrundfarbe für Debit-Bewegung
 BankColorizeMovementName2=Hintergrundfarbe für Kredit-Bewegung
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index 43059614877..597455e1fda 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -531,6 +531,7 @@ TypeContact_invoice_supplier_external_SERVICE=Händler-Servicekontakt
 InvoiceFirstSituationAsk=Erste Fortschritt-Rechnung
 InvoiceFirstSituationDesc=Die <b>Situation Rechnungen</b> auf Situationen zu einer Progression bezogen gebunden, beispielsweise das Fortschreiten einer Konstruktion. Jede Situation ist mit einer Rechnung gebunden.
 InvoiceSituation=Rechnung nach Fortschritt
+PDFInvoiceSituation=Rechnung nach Fortschritt
 InvoiceSituationAsk=Rechnung folgende Situation
 InvoiceSituationDesc=Erstellen Sie eine neue Situation im Anschluss an eine bereits bestehende
 SituationAmount=Situation Rechnungsbetrag (ohne USt.)
@@ -575,3 +576,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Lieferantenrechnung gelöscht
 UnitPriceXQtyLessDiscount=Stückpreis x Anzahl - Rabatt
 CustomersInvoicesArea=Abrechnungsbereich Kunden
 SupplierInvoicesArea=Abrechnungsbereich Lieferanten
+FacParentLine=Übergeordnete Rechnungszeile
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation Nr. %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/de_DE/categories.lang b/htdocs/langs/de_DE/categories.lang
index 5b48f9de69a..c8fc85f28c9 100644
--- a/htdocs/langs/de_DE/categories.lang
+++ b/htdocs/langs/de_DE/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Kategorie-Einstellungen
 CategorieRecursiv=Automatisch mit übergeordneter Kategorie verbinden
 CategorieRecursivHelp=Wenn die Option aktiviert ist, wird beim Hinzufügen eines Produkts zu einer Unterkategorie das Produkt auch automatisch zur übergeordneten Kategorie hinzugefügt.
 AddProductServiceIntoCategory=Folgendes Produkt / folgende Leistung dieser Kategorie hinzufügen:
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Zeige Kategorie
 ByDefaultInList=Standardwert in Liste
 ChooseCategory=Kategorie auswählen
-StocksCategoriesArea=Bereich Lagerort-Kategorien
-ActionCommCategoriesArea=Bereich Ereignis-Kategorien
-WebsitePagesCategoriesArea=Bereich für Seitencontainer-Kategorien
+StocksCategoriesArea=Lagerort-Kategorien
+ActionCommCategoriesArea=Ereignis-Kategorien
+WebsitePagesCategoriesArea=Seiteninhalte-Kategorien
 UseOrOperatorForCategories=Benutzer oder Operator für Kategorien
diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index c5bb6749519..f8bad6b3a9e 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -124,19 +124,19 @@ ProfId1AT=Steuernummer (Finanzamt)
 ProfId2AT=Gerichtsstand
 ProfId3AT=Firmenbuchnummer
 ProfId4AT=DVR-Nummer
-ProfId5AT=-
+ProfId5AT=EORI-Nummer
 ProfId6AT=-
 ProfId1AU=Prof ID 1
-ProfId2AU=--
-ProfId3AU=--
-ProfId4AU=--
-ProfId5AU=--
+ProfId2AU=-
+ProfId3AU=-
+ProfId4AU=-
+ProfId5AU=-
 ProfId6AU=-
 ProfId1BE=Prof ID 1
-ProfId2BE=--
-ProfId3BE=--
-ProfId4BE=--
-ProfId5BE=--
+ProfId2BE=-
+ProfId3BE=-
+ProfId4BE=-
+ProfId5BE=EORI-Nummer
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=Bundes-/Landesbehörde
@@ -144,11 +144,11 @@ ProfId3BR=Kommunalbehörde
 ProfId4BR=Bildungsgutschein
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=UID-Nummer (Nummer des Finanzamt für juristische Personen)
-ProfId2CH=--
+ProfId1CH=UID-Nummer
+ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI-Nummer
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,26 +166,26 @@ ProfId1DE=Steuernummer
 ProfId2DE=Amtsgericht
 ProfId3DE=Handelsregister-Nummer
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI-Nummer
 ProfId6DE=-
 ProfId1ES=NIF (Frankreich): Numéro d'identification fiscale\nCIF (Spanien): Código de identificación fiscal
 ProfId2ES=Sozialversicherungsnummer
 ProfId3ES=Klassifikation der Wirtschaftszweige
 ProfId4ES=Stiftungsverzeichnis
-ProfId5ES=-
+ProfId5ES=EORI-Nummer
 ProfId6ES=-
 ProfId1FR=SIREN (Frankreich): Système d'identification du répertoire des entreprises
 ProfId2FR=SIRET (Frankreich): Système d’identification du répertoire des établissements
 ProfId3FR=NAF (Frankreich): Statistik-Code
 ProfId4FR=RCS (Frankreich): Registre du Commerce et des Sociétés\n(hier: Code im Handels- und Firmenregister)
-ProfId5FR=Prof ID 5
+ProfId5FR=EORI-Nummer
 ProfId6FR=-
 ProfId1GB=Registration Number
-ProfId2GB=--
+ProfId2GB=-
 ProfId3GB=SIC
-ProfId4GB=--
-ProfId5GB=--
-ProfId6GB=--
+ProfId4GB=-
+ProfId5GB=-
+ProfId6GB=-
 ProfId1HN=Id prof. 1 (RTN)
 ProfId2HN=-
 ProfId3HN=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof ID 4
 ProfId5IN=Prof ID 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI-Nummer
 ProfId1LU=R.C.S. Luxemburg
 ProfId2LU=Prof ID 2 (Gewerbe-Erlaubnis)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
-ProfId6LU=--
+ProfId5LU=EORI-Nummer
+ProfId6LU=-
 ProfId1MA=Prof ID 1  (R.C.)
 ProfId2MA=Prof ID 2
 ProfId3MA=Prof ID 3
 ProfId4MA=Prof ID 4
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=Prof ID 1 KVK (Handelsregister-Nummer)
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Prof ID 2 BSN (Bürgerservicenummer)
-ProfId5NL=-
+ProfId5NL=EORI-Nummer
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof ID 3
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI-Nummer
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -241,17 +246,17 @@ ProfId4TN=BAN
 ProfId5TN=-
 ProfId6TN=-
 ProfId1US=Prof Id (FEIN)
-ProfId2US=DVR-Nummer
-ProfId3US=DVR-Nummer
-ProfId4US=DVR-Nummer
-ProfId5US=DVR-Nummer
-ProfId6US=DVR-Nummer
+ProfId2US=-
+ProfId3US=-
+ProfId4US=-
+ProfId5US=-
+ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=DVR-Nummer
-ProfId5RO=Prof Id 5 (EUID)
-ProfId6RO=DVR-Nummer
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI-Nummer
+ProfId6RO=-
 ProfId1RU=OGRN
 ProfId2RU=INN
 ProfId3RU=KPP
@@ -354,6 +359,7 @@ VATIntraManualCheck=Sie können die Überprüfung auch manuell auf der Internets
 ErrorVATCheckMS_UNAVAILABLE=Anfrage nicht möglich. Überprüfungsdienst wird vom Mitgliedsland nicht angeboten (%s).
 NorProspectNorCustomer=kein Interessent / kein Kunde
 JuridicalStatus=Rechtsform
+Workforce=Mitarbeiter/innen
 Staff=Mitarbeiter
 ProspectLevelShort=Potenzial
 ProspectLevel=Interessenten-Potenzial
@@ -368,7 +374,7 @@ PL_UNKNOWN=Unbekannt
 PL_LOW=Niedrig
 PL_MEDIUM=Mittel
 PL_HIGH=Hoch
-TE_UNKNOWN=--
+TE_UNKNOWN=-
 TE_STARTUP=Startup
 TE_GROUP=Großunternehmen
 TE_MEDIUM=Mittleres Unternehmen
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Zahlungsbedingung - Lieferant
 PaymentTypeBoth=Zahlungsart - Kunde und Lieferant
 MulticurrencyUsed=Mehrere Währungen benutzen
 MulticurrencyCurrency=Währung
+InEEC=Europa (EU / EWG)
+RestOfEurope=übriges Europa (EU / EWG)
+OutOfEurope=außerhalb Europas (EU / EWG)
+CurrentOutstandingBillLate=Offene Posten
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Seien Sie vorsichtig: Abhängig von Ihren Produktpreiseinstellungen sollten Sie den Drittanbieter wechseln, bevor Sie das Produkt zum POS hinzufügen.
diff --git a/htdocs/langs/de_DE/ecm.lang b/htdocs/langs/de_DE/ecm.lang
index 35b0520a78f..8dffa1f324e 100644
--- a/htdocs/langs/de_DE/ecm.lang
+++ b/htdocs/langs/de_DE/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Suche nach Stichwörtern
 ECMSearchByEntity=Suche nach Objekten/Belegarten
 ECMSectionOfDocuments=Dokumentenordner
 ECMTypeAuto=Automatisch
-ECMDocsBySocialContributions=mit Sozialabgaben oder Steuerinformationen verknüpfte Dokumente
-ECMDocsByThirdParties=mit Partnern verknüpfte Dokumente
-ECMDocsByProposals=mit Angeboten verknüpfte Dokumente
-ECMDocsByOrders=mit Kundenaufträgen verknüpfte Dokumente
-ECMDocsByContracts=mit Verträgen verknüpfte Dokumente
-ECMDocsByInvoices=mit Kundenrechnungen verknüpfte Dokumente
-ECMDocsByProducts=mit Produkten verknüpfte Dokumente
-ECMDocsByProjects=mit Projekten verknüpfte Dokumente
-ECMDocsByUsers=mit Benutzern verknüpfte Dokumente
-ECMDocsByInterventions=mit Serviceaufträgen verknüpfte Dokumente
-ECMDocsByExpenseReports=mit Spesenabrechnungen verknüpfte Dokumente
-ECMDocsByHolidays=mit Feier-/Urlaubstagen verknüpfte Dokumente
-ECMDocsBySupplierProposals=mit Lieferantenangeboten verknüpfte Dokumente
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=noch kein Verzeichnis erstellt
 ShowECMSection=Verzeichnis anzeigen
 DeleteSection=Verzeichnis löschen
@@ -50,3 +38,6 @@ ReSyncListOfDir=Liste der Verzeichnisse nochmal synchronisieren
 HashOfFileContent=Hashwert der Datei
 NoDirectoriesFound=Keine Verzeichnisse gefunden
 FileNotYetIndexedInDatabase=Datei noch nicht in Datenbank indiziert (bitte Datei nochmals hochladen)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/de_DE/hrm.lang b/htdocs/langs/de_DE/hrm.lang
index dcfae812e33..c3bf5170ae6 100644
--- a/htdocs/langs/de_DE/hrm.lang
+++ b/htdocs/langs/de_DE/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Stellenangebote
 Employees=Mitarbeiter
 Employee=Mitarbeiter/in
 NewEmployee=neuer Mitarbeiter
+ListOfEmployees=Liste der Mitarbeiter
diff --git a/htdocs/langs/de_DE/install.lang b/htdocs/langs/de_DE/install.lang
index b38d1b4b6d9..3c46aa0f189 100644
--- a/htdocs/langs/de_DE/install.lang
+++ b/htdocs/langs/de_DE/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Die Konfigurationsdatei <b>%s</b> ist nicht beschreibbar.
 ConfFileIsWritable=Die Konfigurationsdatei <b>%s</b> ist beschreibbar.
 ConfFileMustBeAFileNotADir=Die Konfigurationsdatei <b> %s </b> muss eine Datei und kein Verzeichnis sein.
 ConfFileReload=Parameter aus der Konfigurationsdatei neu laden.
-PHPSupportSessions=Ihre PHP-Konfiguration unterstützt Sessions.
 PHPSupportPOSTGETOk=Ihre PHP-Konfiguration unterstützt GET- und POST-Variablen.
 PHPSupportPOSTGETKo=Ihre PHP-Konfiguration scheint GET- und/oder POST-Variablen nicht zu unterstützen. Überprüfen Sie in der php.ini den Parameter <b>variables_order</b>.
-PHPSupportGD=Ihre PHP-Konfiguration unterstützt GD-gestütze Funktionen zur dynamischen Erzeugung und Manipulation von Grafiken.
-PHPSupportCurl=Ihre PHP-Konfiguration unterstützt cURL.
-PHPSupportCalendar=Ihre PHP-Konfiguration unterstützt die Kalender-Erweiterungen.
-PHPSupportUTF8=Ihre PHP-Konfiguration unterstützt die UTF8-Funktionen.
-PHPSupportIntl=Ihre PHP-Konfiguration unterstützt die Internationalisierungs-Funktionen.
-PHPSupportxDebug=Dieses PHP unterstützt erweiterte Debug-Funktionen.
+PHPSupportSessions=Ihre PHP-Konfiguration unterstützt Sessions.
 PHPSupport=Dieses PHP unterstützt %s-Funktionen.
 PHPMemoryOK=Die Sitzungsspeicherbegrenzung ihrer PHP-Konfiguration steht auf <b>%s</b>. Dies sollte ausreichend sein.
 PHPMemoryTooLow=Der maximale PHP-Sitzungsspeicher ist auf <b>%s</b> Bytes gesetzt. Dieser Wert ist zu niedrig. Ändern sie den Parameter <b>memory_limit</b> in der <b>php.ini</b> auf mindestens <b>%s</b> Bytes!
diff --git a/htdocs/langs/de_DE/intracommreport.lang b/htdocs/langs/de_DE/intracommreport.lang
new file mode 100644
index 00000000000..4ce6f017ea5
--- /dev/null
+++ b/htdocs/langs/de_DE/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm-Report
+Module68000Desc = Berichtsverwaltung (französisches DEB/DES-Format)
+IntracommReportSetup = Modul Intracomm-Report einrichten
+IntracommReportAbout = Über Intracomm-Report
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Genehmigungsnummer (ausgestellt von der CISD des Anhangs)
+INTRACOMMREPORT_TYPE_ACTEUR=Art des Beteiligten
+INTRACOMMREPORT_ROLE_ACTEUR=Funktion des Beteiligten
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Höhe des Imports
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Höhe des Versands
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Servicekategorie Porti
+
+INTRACOMMREPORT_NUM_DECLARATION=Erklärungsnummer
+
+# Menu
+MenuIntracommReport=Bericht innergemeinschaftlicher Handel
+MenuIntracommReportNew=Neue Erklärung
+MenuIntracommReportList=Liste
+
+# View
+NewDeclaration=Neue Erklärung
+Declaration=Erklärung
+AnalysisPeriod=Analysezeitraum
+TypeOfDeclaration=Art der Erklärung
+DEB=Warenaustauscherklärung
+DES=Leistungsaustauscherklärung
+
+# Export page
+IntracommReportTitle=XML-Datei der Zollerklärung vorbereiten
+
+# List
+IntracommReportList=Liste der Erkärungen
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Art der Erklärung
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Versandweg
diff --git a/htdocs/langs/de_DE/languages.lang b/htdocs/langs/de_DE/languages.lang
index 8cb1b4fe32c..0c63da65bab 100644
--- a/htdocs/langs/de_DE/languages.lang
+++ b/htdocs/langs/de_DE/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Spanisch (Paraguay)
 Language_es_PE=Spanisch (Peru)
 Language_es_PR=Spanisch (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanisch (Uruguay)
 Language_es_GT=Spanisch (Guatemala)
 Language_es_VE=Spanisch (Venezuela)
@@ -55,7 +56,7 @@ Language_fr_CM=Französisch (Kamerun)
 Language_fr_FR=Französisch
 Language_fr_GA=Französisch (Gabon)
 Language_fr_NC=Französisch (Neukaledonien)
-Language_fr_SN=French (Senegal)
+Language_fr_SN=Französisch (Senegal)
 Language_fy_NL=Friesisch
 Language_gl_ES=Galizisch
 Language_he_IL=Hebräisch
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index 24a97f6c837..3b75f3e7964 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Entferne Link
 AddToDraft=Zum Entwurf hinzufügen
 Update=Aktualisieren
 Close=Schließen
+CloseAs=Status ändern in 
 CloseBox=Widget von Ihrer Startseite entfernen
 Confirm=Bestätigen
 ConfirmSendCardByMail=Möchten Sie wirklich die Inhalte dieser Karteikarte per E-Mail an <b>%s</b> senden?
@@ -196,6 +197,7 @@ ReOpen=Wiedereröffnen
 Upload=Upload
 ToLink=Link
 Select=Wählen Sie
+SelectAll=Select all
 Choose=Wählen
 Resize=Skalieren
 ResizeOrCrop=Grösse ändern oder zuschneiden
@@ -256,6 +258,7 @@ Cards=Karten
 Card=Übersicht
 Now=Jetzt
 HourStart=Startzeit
+Deadline=Deadline
 Date=Datum
 DateAndHour=Datum und Uhrzeit
 DateToday=heutiges Datum
@@ -264,8 +267,10 @@ DateStart=Startdatum
 DateEnd=Enddatum
 DateCreation=Erstellungsdatum
 DateCreationShort=Erstelldatum
+IPCreation=Creation IP
 DateModification=Änderungsdatum
 DateModificationShort=Änderungsdatum
+IPModification=Modification IP
 DateLastModification=Datum letzte Änderung
 DateValidation=Freigabedatum
 DateClosing=Schließungsdatum
@@ -319,6 +324,7 @@ Morning=Morgen
 Afternoon=Nachmittag
 Quadri=vierfach
 MonthOfDay=Tag des Monats
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Rate
@@ -356,7 +362,7 @@ Amount=Betrag
 AmountInvoice=Rechnungsbetrag
 AmountInvoiced=berechneter Betrag
 AmountInvoicedHT=Rechnungsbetrag (ohne MwSt.)
-AmountInvoicedTTC=Amount invoiced (inc. tax)
+AmountInvoicedTTC=fakturierter Betrag (Steuern inbegriffen)
 AmountPayment=Zahlungsbetrag
 AmountHTShort=Nettobetrag
 AmountTTCShort=Bruttobetrag
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Zahlungsbetrag, Originalwährung
 MulticurrencyAmountHT=Nettobetrag, Originalwährung
 MulticurrencyAmountTTC=Betrag (Brutto), Originalwährung
 MulticurrencyAmountVAT=Steuerbetrag, Originalwährung
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=USt.-Betrag 2
 AmountLT2=USt.-Betrag 3
 AmountLT1ES=RE Betrag
@@ -487,6 +494,7 @@ By=Durch
 From=Von
 FromDate=von
 FromLocation=von
+at=at
 to=An
 To=An
 and=und
@@ -509,6 +517,7 @@ Draft=Entwurf
 Drafts=Entwürfe
 StatusInterInvoiced=Berechnet
 Validated=Bestätigt
+ValidatedToProduce=Validated (To produce)
 Opened=Geöffnet
 OpenAll=Öffnen (Alle)
 ClosedAll=Schließen (Alle)
@@ -655,6 +664,7 @@ Response=Antwort
 Priority=Wichtigkeit
 SendByMail=Per E-Mail versenden
 MailSentBy=E-Mail Absender
+NotSent=nicht gesendet
 TextUsedInTheMessageBody=E-Mail Text
 SendAcknowledgementByMail=Bestätigungsmail senden
 SendMail=E-Mail versenden
@@ -688,7 +698,7 @@ Method=Methode
 Receive=Erhalten
 CompleteOrNoMoreReceptionExpected=Vollständig oder nichts mehr erwartet
 ExpectedValue=Erwarteter Wert
-ExpectedQty=Expected Qty
+ExpectedQty=Erwartete Menge
 PartialWoman=Teilweise
 TotalWoman=Vollständig
 NeverReceived=Nie erhalten
@@ -836,6 +846,7 @@ ListOfTemplates=Liste der Vorlagen
 Gender=Geschlecht
 Genderman=männlich
 Genderwoman=weiblich
+Genderother=Sonstige
 ViewList=Listenansicht
 ViewGantt=Gantt-Ansicht
 ViewKanban=Kanban-Ansicht
@@ -877,6 +888,8 @@ Miscellaneous=Verschiedenes
 Calendar=Terminkalender
 GroupBy=Gruppiere nach ...
 ViewFlatList=Listenansicht zeigen
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Entfernen Sie die Zeichenfolge '%s'
 SomeTranslationAreUncomplete=Einige Sprachen sind nur teilweise übersetzt oder enthalten Fehler. Wenn Sie dies feststellen, können Sie die Übersetzungen unter <a href="https://www.transifex.com/dolibarr-association/dolibarr/translate/#de_DE/" target="_blank">https://www.transifex.com/dolibarr-association/dolibarr/translate/#de_DE/</a> verbessern bzw. ergänzen.
 DirectDownloadLink=Direkter Download Link
@@ -945,17 +958,17 @@ ShortThursday=Do
 ShortFriday=Fr
 ShortSaturday=Sa
 ShortSunday=So
-one=one
-two=two
-three=three
-four=four
-five=five
-six=six
-seven=seven
-eight=eight
-nine=nine
-ten=ten
-eleven=eleven
+one=Eins
+two=Zwei
+three=Drei
+four=Vier
+five=Fünf
+six=Sechs
+seven=Sieben
+eight=Acht
+nine=Neun
+ten=Zehn
+eleven=Elf
 twelve=twelve
 thirteen=thirdteen
 fourteen=fourteen
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Kunden Lieferungen
 SearchIntoExpenseReports=Spesenabrechnungen
 SearchIntoLeaves=Urlaub
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Lieferanten Zahlung
+SearchIntoMiscPayments=Sonstige Zahlungen
 CommentLink=Kommentare
 NbComments=Anzahl der Kommentare
 CommentPage=Kommentare Leerzeichen
@@ -1077,9 +1093,17 @@ AmountMustBePositive=Der Betrag muss positiv sein
 ByStatus=Nach Status
 InformationMessage=Information
 Used=Used
-ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
-MODIFYInDolibarr=Record %s modified
-DELETEInDolibarr=Record %s deleted
-VALIDATEInDolibarr=Record %s validated
-APPROVEDInDolibarr=Record %s approved
+ASAP=So schnell wie möglich
+CREATEInDolibarr=Datensatz %s erstellt
+MODIFYInDolibarr=Datensatz %s geändert
+DELETEInDolibarr=Datensatz %s gelöscht
+VALIDATEInDolibarr=Datensatz %s bestätigt
+APPROVEDInDolibarr=Datensatz %s genehmigt
+DefaultMailModel=Standard E-Mail Modell
+PublicVendorName=Public name of vendor
+DateOfBirth=Geburtsdatum
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Ereignis-Erinnerung
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/de_DE/members.lang b/htdocs/langs/de_DE/members.lang
index a500c379f9a..b7b526b5b12 100644
--- a/htdocs/langs/de_DE/members.lang
+++ b/htdocs/langs/de_DE/members.lang
@@ -19,14 +19,12 @@ MembersCards=Visitenkarten der Mitglieder
 MembersList=Liste der Mitglieder
 MembersListToValid=Liste freizugebender Mitglieder
 MembersListValid=Liste freigegebener Mitglieder
-MembersListUpToDate=Liste freigegebener Mitglieder mit aktuellem Beitrag
-MembersListNotUpToDate=Liste freigegebener Mitglieder mit veraltetem Abonnement
+MembersListUpToDate=Aktuelle Mitgliederliste
+MembersListNotUpToDate=Ehemalige Mitglieder
 MembersListResiliated=Liste der deaktivierten Mitglieder
 MembersListQualified=Liste der qualifizierten Mitglieder
 MenuMembersToValidate=Freizugebende
 MenuMembersValidated=Freigegebene Mitglieder
-MenuMembersUpToDate=Aktuelle Mitglieder
-MenuMembersNotUpToDate=Deaktivierte Mitglieder
 MenuMembersResiliated=Deaktivierte Mitglieder
 MembersWithSubscriptionToReceive=Mitglieder mit ausstehendem Beitrag
 MembersWithSubscriptionToReceiveShort=Zu registrierende Mitglieder
@@ -34,6 +32,7 @@ DateSubscription=Beitragsbeginn
 DateEndSubscription=Ablauf Beitragszeitraum
 EndSubscription=Beitragsende
 SubscriptionId=Beitrag-ID
+WithoutSubscription=Ohne Mitgliedschaft
 MemberId=Mitglied-ID
 NewMember=Neues Mitglied
 MemberType=Mitgliedsart
@@ -81,7 +80,7 @@ DeleteType=Löschen
 VoteAllowed=Stimmrecht
 Physical=natürliche Person
 Moral=juristische Person
-MorPhy=Art
+MorAndPhy=Moral and Physical
 Reenable=Reaktivieren
 ResiliateMember=Mitglied deaktivieren
 ConfirmResiliateMember=Möchten Sie dieses Mitglied wirklich deaktivieren?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=E-Mail bei Mitgliedsbestätigung senden
 SendingEmailOnNewSubscription=E-Mail bei neuem Beitrag senden
 SendingReminderForExpiredSubscription=Per E-Mail an ablaufende Beitragszeiträume erinnern
 SendingEmailOnCancelation=E-Mail bei Stornierung senden
+SendingReminderActionComm=Sende eine Erinnerung für ein Agenda-Ereignis
 # Topic of email templates
 YourMembershipRequestWasReceived=Ihr Mitgliedsantrag ist angekommen.
 YourMembershipWasValidated=Ihre Mitgliedschaft wurde bestätigt
@@ -167,6 +167,7 @@ MembersStatisticsByState=Mitgliederstatistik nach Bundesländern/Provinzen/Kanto
 MembersStatisticsByTown=Mitgliederstatistik nach Städten
 MembersStatisticsByRegion=Mitgliederstatistik nach Regionen
 NbOfMembers=Anzahl der Mitglieder
+NbOfActiveMembers=Aktuelle Mitgliederzahl
 NoValidatedMemberYet=Keine freizugebenden Mitglieder gefunden
 MembersByCountryDesc=Anzeige der Mitgliederstatistik nach Staaten. (Die Grafik basiert auf Googles Online-Grafikservice und funktioniert nur, wenn eine Internetverbindung besteht.)
 MembersByStateDesc=Anzeige der Mitgliederstatistik nach Bundesland/Provinz/Kanton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistik
 LastMemberDate=Letztes Mitgliedschaftsdatum
 LatestSubscriptionDate=Letztes Beitragsdatum
 MemberNature=Art des Mitglieds
+MembersNature=Nature of members
 Public=Informationen sind öffentlich
 NewMemberbyWeb=Neues Mitglied hinzugefügt, wartet auf Genehmigung.
 NewMemberForm=Formular neues Mitglied
diff --git a/htdocs/langs/de_DE/mrp.lang b/htdocs/langs/de_DE/mrp.lang
index abb37ad22ba..731e122fa42 100644
--- a/htdocs/langs/de_DE/mrp.lang
+++ b/htdocs/langs/de_DE/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Fertigungsaufträge
-MO=Fertigungsauftrag
-MOs=Manufacturing orders
+MOs=Produktionsaufträge
+ManufacturingOrder=Fertigungsauftrag
 MRPDescription=Modul zur Verwaltung von Produktions- und Fertigungsaufträgen (MO).
 MRPArea=MRP Bereich
 MrpSetupPage=Einrichtung des Moduls MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Produkte zu produzieren
 UnitCost=Kosten pro Einheit
 TotalCost=Gesamtsumme Kosten
 BOMTotalCost=Die Herstellungskosten dieser Stückliste, basierend auf den Kosten jeder Menge und jeden verbrauchten Produktes (nutzt den Selbstkostenpreis wenn er definiert ist, ansonsten den Durchschnittspreis sofern definiert oder den besten Einkaufspreis)
+GoOnTabProductionToProduceFirst=Die Produktion muss begonnen sein, um einen Produktionsauftrag zu schließen (siehe Tab '%s'). Alternativ kann er storniert werden.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index b3b7d721c8a..fca33bebb23 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Mehrere Preissegmente pro Produkt / Dienstleistung (jeder Kunde befindet sich in einem Preissegment)
 MultiPricesNumPrices=Anzahl Preise
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Virtuelle Produkte (Kits) aktivieren
-AssociatedProducts=Unterprodukte
-AssociatedProductsNumber=Anzahl der Unterprodukte
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Anzahl der übergeordneten Produkte
 ParentProducts=Verwandte Produkte
-IfZeroItIsNotAVirtualProduct=Fall 0 eingestellt ist, ist das Produkt kein Unterprodukt
-IfZeroItIsNotUsedByVirtualProduct=Fall 0 eingestellt ist, wird das Produkt von keinem Unterprodukt verwendet
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Stichwortfilter
 CategoryFilter=Kategoriefilter
 ProductToAddSearch=Suche hinzuzufügendes Produkt
 NoMatchFound=Kein Eintrag gefunden
 ListOfProductsServices=Liste der Produkte/Leistungen
-ProductAssociationList=Liste der Produkte / Dienstleistungen, die Bestandteil dieses virtuellen Produkts / Kits sind
-ProductParentList=Liste der Produkte / Dienstleistungen mit diesem Produkt als ein Bestandteil
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=Eines der ausgewählten Produkte ist Elternteil des aktuellen Produkts
 DeleteProduct=Produkt/Leistung löschen
 ConfirmDeleteProduct=Möchten Sie dieses Produkt/Leistung wirklich löschen?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=verfügbare globale Werte:
 PriceMode=Preisfindungsmethode
 PriceNumeric=Nummer
 DefaultPrice=Standardpreis
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Erhöhen/Verringern des Lagerbestands bei verknüpften Produkten
 ComposedProduct=Kinderprodukte
 MinSupplierPrice=Minimaler Kaufpreis
@@ -339,6 +340,7 @@ UseProductFournDesc=Fügen Sie eine Funktion hinzu, um die Beschreibungen der vo
 ProductSupplierDescription=Lieferantenbeschreibung für das Produkt
 UseProductSupplierPackaging=Berechne die Verpackung bei Lieferantenpreisen (berechnet neue Mengen / Lieferantenpreise gemäß der eingesetzten Verpackung, wenn Zeilen in den Lieferantendokumenten hinzugefügt / aktualisiert werden).
 PackagingForThisProduct=Verpackung
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=Die Menge der Zeile wurde entsprechend der Lieferantenverpackung neu berechnet
 
 #Attributes
@@ -362,9 +364,9 @@ SelectCombination=Kombination wählen
 ProductCombinationGenerator=Varianten-Generator
 Features=Funktionen
 PriceImpact=Auswirkungen auf die Preise
-ImpactOnPriceLevel=Impact on price level %s
-ApplyToAllPriceImpactLevel= Apply to all levels
-ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
+ImpactOnPriceLevel=Einfluss auf das Preisniveau %s
+ApplyToAllPriceImpactLevel= Auf alle Preisniveaus anwenden
+ApplyToAllPriceImpactLevelHelp=Mit Klick wird der gleiche Preiseinfluss auf alle Preisniveaus angewendet
 WeightImpact=Auswirkungen auf Gewicht
 NewProductAttribute=Neues Attribut
 NewProductAttributeValue=Wert des neuen Attributs
diff --git a/htdocs/langs/de_DE/recruitment.lang b/htdocs/langs/de_DE/recruitment.lang
index 18910b48d3d..f7bd9daa1bd 100644
--- a/htdocs/langs/de_DE/recruitment.lang
+++ b/htdocs/langs/de_DE/recruitment.lang
@@ -20,51 +20,56 @@
 # Module label 'ModuleRecruitmentName'
 ModuleRecruitmentName = Rekrutierung
 # Module description 'ModuleRecruitmentDesc'
-ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+ModuleRecruitmentDesc = Verwalten und verfolgen Sie Personalbeschaffung-Kampagnen für neue Job-Positionen.
 
 #
 # Admin page
 #
-RecruitmentSetup = Recruitment setup
+RecruitmentSetup = Personalbeschaffungs-Konfiguration
 Settings = Einstellungen
-RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
-RecruitmentArea=Recruitement area
-PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
-EnablePublicRecruitmentPages=Enable public pages of open jobs
+RecruitmentSetupPage = Geben Sie hier die Konfiguration der Haupteinstellungen für das Modul Personalbeschaffung ein
+RecruitmentArea=Personalbeschaffungs-Bereich
+PublicInterfaceRecruitmentDesc=Öffentliche Seiten von Stellen sind öffentliche URLs um offene Stellen anzeigen und darauf antworten zu können. Für jede offene Stelle existiert ein eigener Link zu jedem Stelleneintrag.
+EnablePublicRecruitmentPages=Öffentliche Seiten von offenen Stellen aktivieren
 
 #
 # About page
 #
 About = Über
-RecruitmentAbout = About Recruitment
+RecruitmentAbout = Über Personalbeschaffung
 RecruitmentAboutPage = Recruitment about page
 NbOfEmployeesExpected=Expected nb of employees
-JobLabel=Label of job position
+JobLabel=Bezeichnung der beruflichen Position
 WorkPlace=Arbeitsplatz
 DateExpected=Erwartetes Datum
 FutureManager=Zukünftiger Manager
 ResponsibleOfRecruitement=Verantwortlich für die Rekrutierung
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Zu besetzendes Stellenangebot
-PositionsToBeFilled=Zu besetzende Stellenangebote
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Position
+PositionsToBeFilled=Berufspositionen
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Zu besetzendes Stellenangebot
-ThisIsInformationOnJobPosition=Information of the job position to be filled
-ContactForRecruitment=Contact for recruitment
-EmailRecruiter=Email recruiter
+JobOfferToBeFilled=Job position to be filled
+ThisIsInformationOnJobPosition=Information über die zu besetzende Position
+ContactForRecruitment=Kontakt für die Personalbeschaffung
+EmailRecruiter=Recruiter per E-Mail anschreiben
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
-RequestedRemuneration=Requested remuneration
-ProposedRemuneration=Proposed remuneration
-ContractProposed=Contract proposed
-ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
-JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
-InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+NewCandidature=New application
+ListOfCandidatures=List of applications
+RequestedRemuneration=gewünschtes Gehalt
+ProposedRemuneration=vorgeschlagenes Gehalt
+ContractProposed=Vertrag unterbreitet
+ContractSigned=Vertrag unterschrieben
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
+JobPositions=Berufspositionen
+RecruitmentCandidatures=Applications
+InterviewToDo=Bewerbungsgespräch machen
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index c134bf06907..9361b1582d6 100644
--- a/htdocs/langs/de_DE/stocks.lang
+++ b/htdocs/langs/de_DE/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Lagerbewegung Nr. %d
 ListMouvementStockProject=Lagerbewegungen für Projekt
 StocksArea=Warenlager - Übersicht
 AllWarehouses=Alle Warenlager
-IncludeEmptyDesiredStock=Schließen Sie auch undefinierten gewünschten Bestand ein
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Fügen Sie auch Auftragsentwürfe hinzu
 Location=Standort
 LocationSummary=Kurzbezeichnung Standort
@@ -68,7 +68,7 @@ MainDefaultWarehouse=Standardlager
 MainDefaultWarehouseUser=Verwenden Sie für jeden Benutzer ein Standardlager
 MainDefaultWarehouseUserDesc=By activating this option, during creation of a product, the warehouse assigned to the product will be defined on this one. If no warehouse is defined on the user, the default warehouse is defined.
 IndependantSubProductStock=Produkt- und Unterproduktbestände sind unabhängig voneinander
-QtyDispatched=Versandmenge
+QtyDispatched=Liefermenge
 QtyDispatchedShort=Menge versandt
 QtyToDispatchShort=Menge zu versenden
 OrderDispatch=Wareneingang
@@ -85,7 +85,7 @@ StockOnReception=Erhöhe die realen Lagerbestände bei der Inventur
 StockOnReceptionOnClosing=Erhöhe die realen Lagerbestände, wenn der Wareneingang geschlossen wird
 OrderStatusNotReadyToDispatch=Auftrag wurde noch nicht oder nicht mehr ein Status, der Erzeugnisse auf Lager Hallen Versand ermöglicht.
 StockDiffPhysicTeoric=Begründung für Differenz  zwischen Inventurbestand und Lagerbestand
-NoPredefinedProductToDispatch=Keine vordefinierten Produkte für dieses Objekt. Also kein Versand im Lager erforderlich ist.
+NoPredefinedProductToDispatch=Es erfolgt keine Lagerbestandsänderung da keine vordefinierten Produkte enthalten sind. \n
 DispatchVerb=Position(en) verbuchen
 StockLimitShort=Grenzwert für Alarm
 StockLimit=Mindestbestand vor Warnung
@@ -122,8 +122,9 @@ DesiredStockDesc=Dieser Lagerbestand wird von der Nachbestellfunktion verwendet.
 StockToBuy=zu bestellen
 Replenishment=Nachbestellung
 ReplenishmentOrders=Nachbestellungen
-VirtualDiffersFromPhysical=Je nach den Einstellungen zur Erhöhung/Minderung des Lagerbestands können physischer und theoretischer Bestand (tatsächliche + laufende Bestellungen) voneinander abweichen
-UseVirtualStockByDefault=Nutze theoretische Lagerbestände anstatt des physischen Lagerbestands für die Nachbestellfunktion
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Theoretischen Lagerbestand benutzen
 UsePhysicalStock=Ist-Bestand verwenden
 CurentSelectionMode=Aktueller Auswahl-Modus
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=Dieses Produkt ist schon in der Liste
 SelectCategory=Kategoriefilter
 SelectFournisseur=Herstellerfilter
 inventoryOnDate=Inventur
-INVENTORY_DISABLE_VIRTUAL=Virtuelles Produkt (Kit): den Bestand von untergeordneten Produkten nicht verringern
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Verwendet den Kaufpreis, wenn kein letzter Kaufpreis gefunden werden kann
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Lagerbewegungen haben das Datum der Bestandsaufnahme (anstelle des Datums der Inventur).
 inventoryChangePMPPermission=Durchschnittspreis änderbar
 ColumnNewPMP=Neuer Durchschnittsstückpreis
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Aktueller Lagerbestand
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update durch Scannen
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/de_DE/suppliers.lang b/htdocs/langs/de_DE/suppliers.lang
index ecd657c9db9..6e13202b243 100644
--- a/htdocs/langs/de_DE/suppliers.lang
+++ b/htdocs/langs/de_DE/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Bestellungen zu Rechnungen
 NbDaysToDelivery=Lieferverzug (Tage)
 DescNbDaysToDelivery=Die längste Lieferverzögerung der Produkte aus dieser Bestellung
 SupplierReputation=Lieferanten-Reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=hier nicht bestellen
 NotTheGoodQualitySupplier=Geringe Qualität
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/de_DE/website.lang b/htdocs/langs/de_DE/website.lang
index 7d91f729fba..2170414d12f 100644
--- a/htdocs/langs/de_DE/website.lang
+++ b/htdocs/langs/de_DE/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Website hinzufügen
 Webpage=Webseite / Container
 AddPage=Seite / Container hinzufügen
 HomePage=Startseite
-PageContainer=Seite / Container
+PageContainer=Seite
 PreviewOfSiteNotYetAvailable=Vorschau ihrer Webseite <strong>%s</strong> noch nicht verfügbar. Zuerst muss eine '<strong>Webseiten-Vorlage importiert</strong>' oder '<strong>Seite / Container hinzugefügt</strong>' werden.
 RequestedPageHasNoContentYet=Die Seite mit id %s hat keinen Inhalt oder die Cachedatei .tpl.php wurde gelöscht. Editieren Sie den Inhalt der Seite um das Problem zu lösen.
 SiteDeleted=Website '%s' gelöscht
@@ -58,10 +58,10 @@ NoPageYet=Noch keine Seiten
 YouCanCreatePageOrImportTemplate=Sie können eine neue Seite erstellen oder eine komplette Website-Vorlage importieren
 SyntaxHelp=Hilfe zu bestimmten Syntaxtipps
 YouCanEditHtmlSourceckeditor=Sie können den HTML-Quellcode über die Schaltfläche "Quelle" im Editor bearbeiten.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br> <span class="fa fa-bug"> </span> Sie können PHP-Code mit den Tags <strong>&lt;?php ?&gt;</strong> in diese Quelle einfügen. Die folgenden globalen Variablen sind verfügbar: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $ pagelangs. <br><br> <span class="fa fa-bug"> </span> Mit der folgenden Syntax können Sie auch den Inhalt einer anderen Seite/eines anderen Containers einschließen: <br> <strong> &lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong> <br> <br> <span class="fa fa-bug"></span> Mit der folgenden Syntax können Sie eine Umleitung auf eine andere Seite/einen anderen Container machen (Anmerkung: keinen Inhalt vor einer Umleitung ausgeben): <br> <strong>&lt; php redirectToContainer ( 'alias_of_container_to_redirect_to'); ?</strong> <br><br><span class="fa fa-link"></span> Um einen Link zu einer anderen Seite hinzuzufügen, benutzen Sie die Syntax:<br> <strong>&lt;a href="alias_of_page_to_link_to.php" &gt;mylink&lt;a&gt; </strong> <br><br>  <span class="fa fa-download"> </span> Um einen <strong> Link zum Download </strong> hinzuzufügen, der eine Datei in das Verzeichnis <strong>Dokumente</strong> speichert, nutzen Sie den <strong>document.php</strong>wrapper:<br> Beispiel für eine Datei in Dokumente / ecm (muss aufgezeichnet werden), ist die Syntax: <br> <strong> &lt;a href = "/document.php modulepart = ecm & file = [relative_dir/]filename.ext "&gt; </strong> <br> Für eine Datei in Dokumente / Medien (offenes Verzeichnis für den öffentlichen Zugriff) lautet die Syntax: <br> <strong> &lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br> Für eine mit einem Freigabelink freigegebene Datei ( offener Zugang unter Nutzung des sharing hash key der Datei), lautet die Syntax:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br> <span class="fa fa-picture-o"> </span> Um ein  <strong>Bild </strong> in das <strong>Dokumente </strong> Verzeichnis zu speichern, verwenden Sie die  <strong>viewimage.php</strong>  Wrapper:<br>  Beispiel für ein Bild in Dokumente / Medien (offen Verzeichnis für den Zugang der Öffentlichkeit), Syntax:<br><strong>&lt;img src = "/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt</strong><br>
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource2=Für Bilder, die über einen Link geteilt werden (öffentlicher Zugriff über den geteilten Hash-Schlüssel der Datei) gilt folgende Syntax:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSourceMore=<br>Weitere Beispiele von HTML- oder dynamischem Code ist in <a href="%s" target="_blank">der Wiki-Dokumentaion</a> verfügbar.<br>
 ClonePage=Seite / Container klonen
 CloneSite=Website klonen
 SiteAdded=Website hinzugefügt 
@@ -124,7 +124,7 @@ ShowSubContainersOnOff=Ausführungs-Modus für 'dynamischen Inhalt' ist %s
 GlobalCSSorJS=Globale CSS / JS / Header-Datei der Website
 BackToHomePage=Zurück zur Startseite...
 TranslationLinks=Übersetzungslinks
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
+YouTryToAccessToAFileThatIsNotAWebsitePage=Sie versuchen, eine Seite aufzurufen, welche nicht vorhanden ist.<br>(ref=%s, type=%s, status=%s)
 UseTextBetween5And70Chars=Verwende für gute SEO-Ergebnisse einen Text zwischen 5 und 70 Zeichen
 MainLanguage=Hauptsprache
 OtherLanguages=Andere Sprachen
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Ersetzt in %s Seiten oder Containern
 RSSFeed=RSS Feed
 RSSFeedDesc=Über diese URL können Sie einen RSS-Feed mit den neuesten Artikeln vom Typ "Blogpost" abrufen
 PagesRegenerated=%s Seite(n) / Container neu generiert
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/el_CY/products.lang b/htdocs/langs/el_CY/products.lang
new file mode 100644
index 00000000000..6e900475275
--- /dev/null
+++ b/htdocs/langs/el_CY/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index 598f5dc9ab5..1189c759ce7 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Προεπιλογή για υπηρεσία
 DefaultForProduct=Προεπιλογή για το προϊόν
 CantSuggest=Δεν μπορώ να προτείνω
 AccountancySetupDoneFromAccountancyMenu=Η μεγαλύτερη ρύθμιση της λογιστικής γίνεται από το μενού %s
-ConfigAccountingExpert=Διαμόρφωση της μονάδας λογιστικής expert
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Περιοδικότητα
-Journaux=Ημερολόγια
+Journals=Ημερολόγια
 JournalFinancial=Οικονομικά ημερολόγια
 BackToChartofaccounts=Επιστροφή στο διάγραμμα των λογαριασμών
 Chartofaccounts=Διάγραμμα λογαριασμών
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Τρέχον ειδικό λογαριασμό
 AssignDedicatedAccountingAccount=Νέος λογαριασμός προς ανάθεση
 InvoiceLabel=Ετικέτα τιμολογίου
@@ -33,8 +35,8 @@ OtherInfo=Αλλες πληροφορίες
 DeleteCptCategory=Κατάργηση λογαριασμού λογιστικής από την ομάδα
 ConfirmDeleteCptCategory=Είστε βέβαιοι ότι θέλετε να καταργήσετε αυτόν τον λογαριασμό λογιστικής από την ομάδα λογαριασμών λογαριασμού;
 JournalizationInLedgerStatus=Κατάσταση της περιοδικής εγγραφής
-AlreadyInGeneralLedger=Έχει ήδη κυκλοφορήσει σε ημερολόγια
-NotYetInGeneralLedger=Δεν έχει ακόμη καταχωρηθεί σε ημερολόγια
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Η ομάδα είναι κενή, ελέγξτε τη ρύθμιση της εξατομικευμένης ομάδας λογιστικής
 DetailByAccount=Εμφάνιση λεπτομερειών βάσει λογαριασμού
 AccountWithNonZeroValues=Λογαριασμοί με μη μηδενικές τιμές
@@ -43,7 +45,9 @@ CountriesInEEC=Χώρες στην ΕΟΚ
 CountriesNotInEEC=Χώρες που δεν βρίσκονται στην ΕΟΚ
 CountriesInEECExceptMe=Χώρες στην ΕΟΚ εκτός από το %s
 CountriesExceptMe=Όλες οι χώρες εκτός από το %s
-AccountantFiles=Εξαγωγή λογιστικών εγγράφων
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Κύριος λογαριασμός λογιστικής για πελάτες που δεν έχουν οριστεί στη ρύθμιση
 MainAccountForSuppliersNotDefined=Κύριος λογαριασμός λογιστικής για προμηθευτές που δεν καθορίζονται στη ρύθμιση
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Προσθέστε ή επεξεργαστε
 
 AccountancyAreaDescClosePeriod=STEP %s: Κλείστε την περίοδο έτσι δεν μπορούμε να κάνουμε αλλαγές σε ένα μέλλον.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=Ένα υποχρεωτικό βήμα στη ρύθμιση δεν ήταν πλήρης (το λογιστικό περιοδικό δεν καθορίστηκε για όλους τους τραπεζικούς λογαριασμούς)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Επιλέξτε ενεργό πίνακα λογαριασμών
 ChangeAndLoad=Αλλαγή και φόρτωση
 Addanaccount=Προσθέστε ένα λογιστικό λογαριασμό
@@ -89,6 +93,8 @@ SubledgerAccount=Λογαριασμός χρέωσης
 SubledgerAccountLabel=Ετικέτα λογαριασμού
 ShowAccountingAccount=Εμφάνιση λογαριασμού λογιστικής
 ShowAccountingJournal=Εμφάνιση λογιστικού περιοδικού
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Λογαριασμός λογιστικής πρότεινε
 MenuDefaultAccounts=Προεπιλεγμένοι λογαριασμοί
 MenuBankAccounts=Τραπεζικοί Λογαριασμοί
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Αναφορά σύνδεσης εξόδων
 CreateMvts=Δημιουργήστε μία νέα συναλλαγή
 UpdateMvts=Τροποποίηση συναλλαγής
 ValidTransaction=Επικύρωση συναλλαγής
-WriteBookKeeping=Εγγραφή συναλλαγών στο Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Καθολικό
+BookkeepingSubAccount=Subledger
 AccountBalance=Υπόλοιπο λογαριασμού
 ObjectsRef=Αναφορά αντικειμένου προέλευσης
 CAHTF=Συνολικός προμηθευτής αγοράς προ φόρων
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Απενεργοποιήστε την απευθεία
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Ενεργοποιήστε το σχέδιο εξαγωγής στο περιοδικό
 ACCOUNTANCY_COMBO_FOR_AUX=Ενεργοποίηση σύνθετης λίστας για επικουρικό λογαριασμό (μπορεί να είναι αργή αν έχετε πολλούς τρίτους)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Ημερολόγιο πωλήσεων
 ACCOUNTING_PURCHASE_JOURNAL=Ημερολόγιο αγορών
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Λογαριασμός λογιστικής αναμ
 DONATION_ACCOUNTINGACCOUNT=Λογαριασμός λογιστικής για την εγγραφή δωρεών
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Λογαριασμός λογιστικής για την εγγραφή συνδρομών
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Λογαριασμός λογιστικής από προεπιλογή για τα αγορασμένα προϊόντα (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντων)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Λογαριασμός από προεπιλογή για τα προϊόντα που αγοράστηκαν στην ΕΟΚ (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντος)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Λογαριασμός από προεπιλογή για τα προϊόντα που αγοράστηκαν και εισάγονται εκτός ΕΟΚ (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντος)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Με προκαθορισμένες ομάδες
 ByPersonalizedAccountGroups=Με εξατομικευμένες ομάδες
 ByYear=Με χρόνια
 NotMatch=Δεν έχει οριστεί
-DeleteMvt=Διαγραφή γραμμών Ledger
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Μήνας προς διαγραφή
 DelYear=Έτος προς διαγραφή
 DelJournal=Ημερολόγιο προς διαγραφή
-ConfirmDeleteMvt=Αυτό θα διαγράψει όλες τις γραμμές του Ημερολογίου Λογιστικής για το έτος / μήνα ή / και από μία συγκεκριμένη περίοδο (Απαιτείται τουλάχιστον ένα κριτήριο). Θα χρειαστεί να επαναχρησιμοποιήσετε τη λειτουργία "Εγγραφή στη λογιστική" για να έχετε το διαγραμμένο αρχείο πίσω στο ημερολόγιο.
-ConfirmDeleteMvtPartial=Αυτό θα διαγράψει τη συναλλαγή από το Ledger (όλες οι γραμμές που σχετίζονται με την ίδια συναλλαγή θα διαγραφούν)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Ημερολόγιο οικονομικών
 ExpenseReportsJournal=Έκθεση εκθέσεων δαπανών
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=Πρόκειται για μια καταγραφή που συνδέεται με έναν λογαριασμό λογιστικής και μπορεί να καταγραφεί στον Λογαριασμό.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Δεν έχει οριστεί λογαριασμός για ΦΠΑ
 ThirdpartyAccountNotDefined=Ο λογαριασμός για τρίτους δεν έχει οριστεί
 ProductAccountNotDefined=Λογαριασμός για το προϊόν δεν έχει οριστεί
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Αυτό το περιοδικό χρησιμ
 AccountingAccountForSalesTaxAreDefinedInto=Σημείωση: Ο λογαριασμός λογιστικής για τον φόρο πωλήσεων ορίζεται στο μενού <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Αριθμός καταχωρήσεων
 NumberOfAccountancyMovements=Αριθμός κινήσεων
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Εξαγωγή σχεδίου περιοδικού
@@ -326,6 +339,8 @@ Modelcsv_configurable=Εξαγωγή CSV εξαγωγής
 Modelcsv_FEC=Εξαγωγή FEC
 Modelcsv_Sage50_Swiss=Εξαγωγή για Sage 50 Ελβετία
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Λογαριασμός Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index a5208c3615a..9066b5bbf90 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Κατάργηση κλειδώματος σύνδεσης
 YourSession=Η σύνοδος σας
 Sessions=Συνεδρίες χρηστών
 WebUserGroup=Χειριστής/Ομάδα Διακομιστή Web
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Η διαμόρφωση της PHP σας φαίνεται να μην επιτρέπει την καταχώρηση των ενεργοποιημένων συνδεγριών. Ο κατάλογος που χρησιμοποιείται για την αποθήκευση των περιόδων σύνδεσης (<b>%s</b>) μπορεί να προστατεύεται (για παράδειγμα, από τα δικαιώματα των λειτουργικών συστημάτων ή από την οδηγία PHP open_basedir).
 DBStoringCharset=Σύνολο χαρακτήρων βάσης δεδομένων για την αποθήκευση δεδομένων
 DBSortingCharset=Σετ χαρακτήρων βάσης δεδομένων για ταξινόμηση δεδομένων
@@ -71,7 +73,7 @@ DisableJavascriptNote=Σημείωση: Για σκοπούς δοκιμής ή
 UseSearchToSelectCompanyTooltip=Επίσης, αν έχετε ένα μεγάλο αριθμό Πελ./Προμ. (> 100 000), μπορείτε να αυξήσετε την ταχύτητα με τον καθορισμό της σταθερά COMPANY_DONOTSEARCH_ANYWHERE σε 1 στο Setup->Other. Η αναζήτηση στη συνέχεια θα περιορίζεται από την έναρξη της σειράς.
 UseSearchToSelectContactTooltip=Επίσης, αν έχετε ένα μεγάλο αριθμό Πελ./Προμ. (> 100 000), μπορείτε να αυξήσετε την ταχύτητα με τον καθορισμό της σταθερά COMPANY_DONOTSEARCH_ANYWHERE σε 1 στο Setup->Other. Η αναζήτηση στη συνέχεια θα περιορίζεται από την έναρξη της σειράς.
 DelaiedFullListToSelectCompany=Περιμένετε μέχρι να πατηθεί κάποιο πλήκτρο πριν φορτώσετε το περιεχόμενο της λίστας συνδυασμών τρίτων μερών. <br>Αυτό μπορεί να αυξήσει την απόδοση εάν έχετε μεγάλο αριθμό τρίτων, αλλά είναι λιγότερο βολικό.
-DelaiedFullListToSelectContact=Περιμένετε έως ότου πατήσετε ένα πλήκτρο πριν φορτώσετε το περιεχόμενο της λίστας επαφών combo.<br>Αυτό μπορεί να αυξήσει την απόδοση εάν έχετε μεγάλο αριθμό επαφών, αλλά είναι λιγότερο βολικό)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Αριθμός χαρακτήρων που ενεργοποιούν την αναζήτηση: %s
 NumberOfBytes=Αριθμόςαπό Bytes
 SearchString=Αναζήτηση συμβόλων
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=Σε έγγραφο τρίτου μέρου
 JavascriptDisabled=Η JavaScript είναι απενεργοποιημένη
 UsePreviewTabs=Χρήση καρτελών προ επισκόπησης
 ShowPreview=Εμφάνιση προ επισκόπησης
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Η προ επισκόπηση δεν είναι διαθέσιμη
 ThemeCurrentlyActive=Θεματική Επι του Παρόντος Ενεργή
 CurrentTimeZone=TimeZone PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Περίοδος ειδοποίησης
 NewByMonth=Νέο μήνα
 Emails=Ηλεκτρονικά μηνύματα
 EMailsSetup=Ρύθμιση ηλεκτρονικού ταχυδρομείου
-EMailsDesc=Αυτή η σελίδα σάς επιτρέπει να αντικαταστήσετε τις προεπιλεγμένες παραμέτρους PHP για αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου. Στις περισσότερες περιπτώσεις στο λειτουργικό σύστημα Unix / Linux, η ρύθμιση PHP είναι σωστή και αυτές οι παράμετροι είναι περιττές.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Προφίλ αποστολέων ηλεκτρονικού ταχυδρομείου
 EMailsSenderProfileDesc=Μπορείτε να αφήσετε αυτή την ενότητα κενή. Αν εισάγετε email, εδώ θα προστεθούν στη λίστα πιθανών αποστολέων όταν γράφετε ένα νέο email. 
 MAIN_MAIL_SMTP_PORT=Θύρα SMTP / SMTPS (προεπιλεγμένη τιμή στο php.ini: <b>%s</b> )
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=Αναγνωριστικό SMTP (αν ο διακομιστή
 MAIN_MAIL_SMTPS_PW=Κωδικός πρόσβασης SMTP (εάν ο διακομιστής αποστολής απαιτεί έλεγχο ταυτότητας)
 MAIN_MAIL_EMAIL_TLS=Χρησιμοποιήστε κρυπτογράφηση TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Χρησιμοποιήστε κρυπτογράφηση TLS (STARTTLS)
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Χρησιμοποιήστε το DKIM για να δημιουργήσετε υπογραφή ηλεκτρονικού ταχυδρομείου
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain για χρήση με dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Όνομα επιλογέα dkim
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Αφήνοντας αυτό το πεδίο κενό
 ExtrafieldParamHelpselect=Ο κατάλογος τιμών πρέπει να είναι γραμμές με κλειδί μορφής, τιμή (όπου το κλειδί δεν μπορεί να είναι &#39;0&#39;) <br><br> για παράδειγμα: <br> 1, τιμή1 <br> 2, τιμή2 <br> code3, value3 <br> ... <br><br> Προκειμένου ο κατάλογος να εξαρτάται από μια άλλη λίστα συμπληρωματικών χαρακτηριστικών: <br> 1, τιμή1 | επιλογές_επαφ <i>._ορισμός_κώδικα</i> : γονικό_κλειδί <br> 2, value2 | options_ <i>parent_list_code:</i> parent_key <br><br> Προκειμένου να υπάρχει η λίστα ανάλογα με μια άλλη λίστα: <br> 1, τιμή1 | <i>parent_list_code</i> : parent_key <br> 2, value2 | <i>parent_list_code</i> : parent_key
 ExtrafieldParamHelpcheckbox=Ο κατάλογος τιμών πρέπει να είναι γραμμές με κλειδί μορφής, τιμή (όπου το κλειδί δεν μπορεί να είναι &#39;0&#39;) <br><br> για παράδειγμα: <br> 1, τιμή1 <br> 2, τιμή2 <br> 3, value3 <br> ...
 ExtrafieldParamHelpradio=Ο κατάλογος τιμών πρέπει να είναι γραμμές με κλειδί μορφής, τιμή (όπου το κλειδί δεν μπορεί να είναι &#39;0&#39;) <br><br> για παράδειγμα: <br> 1, τιμή1 <br> 2, τιμή2 <br> 3, value3 <br> ...
-ExtrafieldParamHelpsellist=Ο κατάλογος των τιμών προέρχεται από έναν πίνακα <br> Σύνταξη: table_name: label_field: id_field :: filter <br> Παράδειγμα: c_typent: libelle: id :: φίλτρο <br><br> - το idfilter είναι απαραίτητα ένα βασικό κλειδί int <br> - το φίλτρο μπορεί να είναι μια απλή δοκιμή (π.χ. ενεργή = 1) για να εμφανίζει μόνο την ενεργή τιμή <br> Μπορείτε επίσης να χρησιμοποιήσετε το $ ID $ στο φίλτρο που είναι το τρέχον id του τρέχοντος αντικειμένου <br> Για να κάνετε ένα SELECT στο φίλτρο, χρησιμοποιήστε το $ SEL $ <br> αν θέλετε να φιλτράρετε σε extrafields χρησιμοποιήστε syntax extra.fieldcode = ... (όπου ο κωδικός πεδίου είναι ο κωδικός του extrafield) <br><br> Προκειμένου ο κατάλογος να εξαρτάται από μια άλλη λίστα συμπληρωματικών χαρακτηριστικών: <br> c_typent: libelle: id: options_ <i>parent_list_code</i> | parent_column: φίλτρο <br><br> Προκειμένου να υπάρχει η λίστα ανάλογα με μια άλλη λίστα: <br> c_typent: libelle: id: <i>parent_list_code</i> | parent_column: φίλτρο
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Ο κατάλογος των τιμών προέρχεται από έναν πίνακα <br> Σύνταξη: table_name: label_field: id_field :: filter <br> Παράδειγμα: c_typent: libelle: id :: φίλτρο <br><br> το φίλτρο μπορεί να είναι μια απλή δοκιμή (π.χ. ενεργή = 1) για να εμφανίζει μόνο την ενεργή τιμή <br> Μπορείτε επίσης να χρησιμοποιήσετε το $ ID $ στο φίλτρο που είναι το τρέχον id του τρέχοντος αντικειμένου <br> Για να κάνετε ένα SELECT στο φίλτρο, χρησιμοποιήστε το $ SEL $ <br> αν θέλετε να φιλτράρετε σε extrafields χρησιμοποιήστε syntax extra.fieldcode = ... (όπου ο κωδικός πεδίου είναι ο κωδικός του extrafield) <br><br> Προκειμένου ο κατάλογος να εξαρτάται από μια άλλη λίστα συμπληρωματικών χαρακτηριστικών: <br> c_typent: libelle: id: options_ <i>parent_list_code</i> | parent_column: φίλτρο <br><br> Προκειμένου να υπάρχει η λίστα ανάλογα με μια άλλη λίστα: <br> c_typent: libelle: id: <i>parent_list_code</i> | parent_column: φίλτρο
-ExtrafieldParamHelplink=Οι παράμετροι πρέπει να είναι ObjectName: Classpath <br> Σύνταξη: ObjectName: Classpath <br> Παραδείγματα: <br> Societe: societe / class / societe.class.php <br> Επικοινωνία: contact / class / contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Κρατήστε κενό για έναν απλό διαχωριστή <br> Ρυθμίστε το σε 1 για έναν διαχωριστή που αναδιπλώνεται (ανοίγει από προεπιλογή για νέα σύνοδο και στη συνέχεια διατηρείται η κατάσταση για κάθε περίοδο λειτουργίας χρήστη) <br> Ρυθμίστε αυτό σε 2 για ένα πτυσσόμενο διαχωριστικό (συρρικνώνεται από προεπιλογή για νέα συνεδρία, τότε η κατάσταση διατηρείται για κάθε συνεδρία χρήστη)
 LibraryToBuildPDF=Βιβλιοθήκη δημιουργίας PDF
 LocalTaxDesc=Ορισμένες χώρες μπορούν να εφαρμόσουν δύο ή τρεις φόρους σε κάθε γραμμή τιμολογίου. Εάν συμβαίνει αυτό, επιλέξτε τον τύπο για τον δεύτερο και τον τρίτο φόρο και το ποσοστό του. Πιθανός τύπος είναι: <br> 1: ο τοπικός φόρος ισχύει για τα προϊόντα και τις υπηρεσίες χωρίς ναύλωση (το τοπικό ποσό υπολογίζεται σε ποσό χωρίς φόρο) <br> 2: ο τοπικός φόρος ισχύει για τα προϊόντα και τις υπηρεσίες, συμπεριλαμβανομένης της δεξαμενής (το τοπικό ποσό υπολογίζεται σε ποσό + κύριο φόρο) <br> 3: ο τοπικός φόρος ισχύει για τα προϊόντα χωρίς το βαρέλι (το localtax υπολογίζεται σε ποσό χωρίς φόρο) <br> 4: ο τοπικός φόρος ισχύει για τα προϊόντα συμπεριλαμβανομένης της δεξαμενής (τοπικό tax υπολογίζεται στο ποσό + κύρια δεξαμενή) <br> 5: ο τοπικός φόρος ισχύει για τις υπηρεσίες χωρίς τακτοποίηση (το τοπικό ποσό υπολογίζεται σε ποσό χωρίς φόρο) <br> 6: ο τοπικός φόρος ισχύει για τις υπηρεσίες, συμπεριλαμβανομένης της δεξαμενής (το τοπικό ποσό υπολογίζεται επί του ποσού + του φόρου)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s που ακολουθείται από τ
 ModuleCompanyCodeSupplierDigitaria=%s που ακολουθείται από το αποκομμένο όνομα προμηθευτή με τον αριθμό χαρακτήρων: %s για τον προμηθευτή λογιστικό κωδικό.
 Use3StepsApproval=Από προεπιλογή, οι Εντολές Αγοράς πρέπει να δημιουργηθούν και να εγκριθούν από 2 διαφορετικούς χρήστες (ένα βήμα / χρήστης για δημιουργία και ένα βήμα / χρήστης για έγκριση). Σημειώστε ότι εάν ο χρήστης έχει τόσο άδεια να δημιουργήσει και να εγκρίνει, ένα βήμα / χρήστης θα είναι αρκετό) . Μπορείτε να ζητήσετε με αυτή την επιλογή να εισαγάγετε ένα τρίτο βήμα / έγκριση του χρήστη, εάν το ποσό είναι υψηλότερο από μια ειδική τιμή (ώστε να είναι απαραίτητα 3 βήματα: 1 = επικύρωση, 2 = πρώτη έγκριση και 3 = δεύτερη έγκριση, εάν το ποσό είναι αρκετό). <br> Ρυθμίστε αυτό το κενό, εάν είναι αρκετή μία έγκριση (2 βήματα), αλλάξτε τη τιμή σε πολύ χαμηλή τιμή (0,1) εάν απαιτείται πάντα μια δεύτερη έγκριση (3 βήματα).
 UseDoubleApproval=Χρησιμοποιήστε έγκριση 3 βημάτων όταν το ποσό (χωρίς φόρο) είναι υψηλότερο από ...
-WarningPHPMail=ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Είναι συχνά καλύτερο να ρυθμίσετε τα εξερχόμενα μηνύματα ηλεκτρονικού ταχυδρομείου για να χρησιμοποιήσετε το διακομιστή ηλεκτρονικού ταχυδρομείου του παρόχου σας αντί για την προεπιλεγμένη ρύθμιση. Ορισμένοι παροχείς ηλεκτρονικού ταχυδρομείου (όπως το Yahoo) δεν σας επιτρέπουν να στείλετε ένα μήνυμα ηλεκτρονικού ταχυδρομείου από άλλο διακομιστή παρά από το δικό του διακομιστή. Η τρέχουσα ρύθμισή σας χρησιμοποιεί τον διακομιστή της εφαρμογής για την αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου και όχι του διακομιστή του παροχέα ηλεκτρονικού ταχυδρομείου σας, έτσι ώστε ορισμένοι παραλήπτες (αυτός που είναι συμβατός με το περιοριστικό πρωτόκολλο DMARC) θα ρωτήσουν τον παροχέα email σας εάν μπορούν να αποδεχθούν το email σας και ορισμένους παροχείς ηλεκτρονικού ταχυδρομείου (όπως το Yahoo) μπορεί να ανταποκριθεί &quot;όχι&quot; επειδή ο διακομιστής δεν είναι δικό τους, έτσι λίγα από τα αποσταλμένα σας μηνύματα ηλεκτρονικού ταχυδρομείου ενδέχεται να μην γίνονται αποδεκτά (προσέξτε επίσης την ποσόστωση αποστολής του παροχέα email σας). <br> Εάν ο παροχέας σας ηλεκτρονικού ταχυδρομείου (όπως το Yahoo) έχει αυτόν τον περιορισμό, πρέπει να αλλάξετε τη ρύθμιση Email για να επιλέξετε την άλλη μέθοδο &quot;SMTP server&quot; και να πληκτρολογήσετε τον διακομιστή SMTP και τα διαπιστευτήρια που παρέχει ο πάροχος Email.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=Εάν ο πάροχος ηλεκτρονικού ταχυδρομείου σας SMTP πρέπει να περιορίσει τον πελάτη ηλεκτρονικού ταχυδρομείου σε ορισμένες διευθύνσεις IP (πολύ σπάνιες), αυτή είναι η διεύθυνση IP του παράγοντα χρήστη αλληλογραφίας (MUA) για την εφαρμογή ERP CRM: <strong>%s</strong> .
-WarningPHPMailSPF=Εάν το όνομα τομέα στη διεύθυνση ηλεκτρονικού ταχυδρομείου του αποστολέα σας προστατεύεται από το SPF (ζητήστε από τον πάροχο ηλεκτρονικού ταχυδρομείου), πρέπει να συμπεριλάβετε τις ακόλουθες διευθύνσεις IP στην εγγραφή SPF του DNS του τομέα σας: <strong> %s </strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Κάντε κλικ για να εμφανιστεί η περιγραφή
 DependsOn=Αυτή η ενότητα χρειάζεται τις ενότητες
 RequiredBy=Αυτή η ενότητα απαιτείται από τις ενότητες
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Ενοποίηση ενός συστήματος ClickToDial (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Προσθήκη λειτουργίας για την δημιουργία λογαριασμού Bookmark4u από ένα λογαριασμό Dolibarr
 Module60Name=Αυτοκόλλητες ετικέτες
 Module60Desc=Διαχείριση αυτοκόλλητων ετικετών
 Module70Name=Παρεμβάσεις
@@ -656,7 +662,7 @@ Module50200Desc=Προσφέρετε στους πελάτες μια σελίδ
 Module50300Name=Ταινία
 Module50300Desc=Προσφέρετε στους πελάτες μια σελίδα Stripe online πληρωμής (πιστωτικές / χρεωστικές κάρτες). Αυτό μπορεί να χρησιμοποιηθεί για να επιτρέψει στους πελάτες σας να πραγματοποιούν ad hoc πληρωμές ή πληρωμές που σχετίζονται με ένα συγκεκριμένο αντικείμενο Dolibarr (τιμολόγιο, παραγγελία κ.λπ.)
 Module50400Name=Λογιστική (διπλή εγγραφή)
-Module50400Desc=Λογιστική διαχείριση (διπλές καταχωρήσεις, υποστήριξη γενικών και βοηθητικών βιβλίων). Εξαγωγή του βιβλίου σε πολλές άλλες μορφές λογισμικού λογισμικού.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Άμεση εκτύπωση (χωρίς το άνοιγμα των εγγράφων) χρησιμοποιώντας τη διεπαφή IPP κυπέλλων (ο εκτυπωτής πρέπει να είναι ορατός από το διακομιστή και το CUPS πρέπει να εγκατασταθεί στον διακομιστή).
 Module55000Name=Δημοσκόπηση, έρευνα ή ψηφοφορία
@@ -671,7 +677,7 @@ Module63000Name=Πόροι
 Module63000Desc=Διαχειριστείτε τους πόρους (εκτυπωτές, αυτοκίνητα, δωμάτια, ...) για την εκχώρηση σε εκδηλώσεις
 Permission11=Διαβάστε τιμολόγια πελατών
 Permission12=Δημιουργία / τροποποίηση τιμολογίων πελατών
-Permission13=Μη επικυρωμένα τιμολόγια πελάτη
+Permission13=Invalidate customer invoices
 Permission14=Επικύρωση τιμολογίων πελατών
 Permission15=Αποστολή τιμολογίων πελατών μέσω ηλεκτρονικού ταχυδρομείου
 Permission16=Δημιουργία πληρωμών για τιμολόγια πελατών
@@ -688,6 +694,7 @@ Permission32=Δημιουργία / τροποποίηση προϊόντων
 Permission34=Διαγραφή προϊόντων
 Permission36=Δείτε / διαχειριστείτε κρυφά προϊόντα
 Permission38=Εξαγωγή προϊόντων
+Permission39=Ignore minimum price
 Permission41=Διαβάστε τα έργα και τα καθήκοντα (κοινό σχέδιο και έργα για τα οποία είμαι υπεύθυνος). Μπορεί επίσης να εισάγει χρόνο που καταναλώνεται, για μένα ή για την ιεραρχία μου, σε εκχωρημένες εργασίες (Timesheet)
 Permission42=Δημιουργία / τροποποίηση έργων (κοινό έργο και έργα για τα οποία έχω επικοινωνία). Μπορεί επίσης να δημιουργήσει εργασίες και να εκχωρήσει τους χρήστες σε έργα και εργασίες
 Permission44=Διαγραφή έργων (κοινό έργο και έργα για τα οποία είμαι υπεύθυνος)
@@ -696,6 +703,9 @@ Permission61=Διαβάστε τις παρεμβάσεις
 Permission62=Δημιουργία / τροποποίηση παρεμβάσεων
 Permission64=Διαγραφή παρεμβάσεων
 Permission67=Εξαγωγή παρεμβάσεων
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Διάβασμα μελών
 Permission72=Δημιουργία / τροποποίηση μελών
 Permission74=Διαγραφή μελών
@@ -718,6 +728,7 @@ Permission95=Διάβασμα αναφορών
 Permission101=Διάβασμα αποστολών
 Permission102=Δημιουργία / τροποποίηση αποστολών
 Permission104=Επικύρωση αποστολών
+Permission105=Send sendings by email
 Permission106=Εξαγωγή αποστολών
 Permission109=Διαγραφή αποστολών
 Permission111=Διάβασμα οικονομικών λογαριασμών
@@ -825,10 +836,11 @@ Permission402=Δημιουργία / τροποποίηση εκπτώσεων
 Permission403=Επικύρωση εκπτώσεων
 Permission404=Διαγραφή εκπτώσεων
 Permission430=Χρησιμοποιήστε τη γραμμή εντοπισμού σφαλμάτων
-Permission511=Διαβάστε τις πληρωμές των μισθών
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Δημιουργία / τροποποίηση πληρωμών μισθών
 Permission514=Διαγραφή πληρωμών μισθών
-Permission517=Εξαγωγή μισθών
+Permission517=Read payments of salaries of everybody
+Permission519=Εξαγωγή μισθών
 Permission520=Ανάγνωση δανείων
 Permission522=Δημιουργία/μεταβολή δανείων
 Permission524=Διαγραφή δανείων
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Διαβάστε τα Γραμμάτια Υλικών
 Permission651=Δημιουργία / Ενημέρωση τιμολογίων
 Permission652=Διαγραφή λογαριασμών
@@ -884,7 +899,9 @@ Permission1185=Εγκρίνετε τις παραγγελίες αγοράς
 Permission1186=Παραγγείλετε παραγγελίες αγοράς
 Permission1187=Αναγνώριση παραλαβής εντολών αγοράς
 Permission1188=Διαγραφή εντολών αγοράς
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Εγκρίνετε τις εντολές αγοράς (δεύτερη έγκριση)
+Permission1191=Export supplier orders and their attributes
 Permission1201=Λάβετε αποτέλεσμα μιας εξαγωγής
 Permission1202=Δημιουργία / Τροποποίηση εξαγωγής
 Permission1231=Διαβάστε τιμολόγια προμηθευτή
@@ -898,6 +915,8 @@ Permission1251=Εκτελέστε μαζικές εισαγωγές εξωτερ
 Permission1321=Εξαγωγή τιμολογίων πελατών, χαρακτηριστικών και πληρωμών
 Permission1322=Ανοίξτε ξανά έναν πληρωμένο λογαριασμό
 Permission1421=Εξαγωγή παραγγελιών και χαρακτηριστικών πωλήσεων
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Ανάγνωση ενεργειών (συμβάντων ή εργασιών) που συνδέονται με το λογαριασμό χρήστη του (εάν είναι κάτοχος του συμβάντος ή απλώς έχει ανατεθεί)
 Permission2402=Δημιουργία / τροποποίηση ενεργειών (συμβάντων ή εργασιών) που συνδέονται με το λογαριασμό χρήστη του (εάν είναι κάτοχος του συμβάντος)
 Permission2403=Διαγραφή ενεργειών (συμβάντων ή εργασιών) που συνδέονται με το λογαριασμό χρήστη του (εάν είναι κάτοχος του συμβάντος)
@@ -932,9 +951,13 @@ Permission23001=Λεπτομέρειες προγραμματισμένης ερ
 Permission23002=Δημιουργήστε/ενημερώστε μια προγραμματισμένη εργασία
 Permission23003=Διαγράψτε μια προγραμματισμένη εργασία
 Permission23004=Εκτελέστε μια προγραμματισμένη εργασία
-Permission50101=Χρήση σημείου πώλησης
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Διαβάστε τις συναλλαγές
 Permission50202=Πράξεις εισαγωγής
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Δεσμεύστε προϊόντα και τιμολόγια με λογιστικούς λογαριασμούς
 Permission50411=Διαβάστε τις λειτουργίες στο βιβλίο
 Permission50412=Εγγραφή / Επεξεργασία εργασιών στο ημερολόγιο
@@ -958,6 +981,17 @@ Permission63001=Διαβάστε τους πόρους
 Permission63002=Δημιουργία / τροποποίηση πόρων
 Permission63003=Διαγράψτε τους πόρους
 Permission63004=Συνδέστε τους πόρους στις εκδηλώσεις της ατζέντας
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Τύποι τρίτου μέρους
 DictionaryCompanyJuridicalType=Νομικές οντότητες τρίτων
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Είδη αδειών
 DictionaryOpportunityStatus=Κατάσταση μολύβδου για έργο / μόλυβδο
 DictionaryExpenseTaxCat=Έκθεση δαπανών - Κατηγορίες μεταφορών
 DictionaryExpenseTaxRange=Έκθεση εξόδων - Εύρος ανά κατηγορία μεταφοράς
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Οι ρυθμίσεις αποθηκεύτηκαν
 SetupNotSaved=Το πρόγραμμα εγκατάστασης δεν αποθηκεύτηκε
 BackToModuleList=Επιστροφή στη λίστα λειτουργιών
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Ετικέτα που χρησιμοποιείται από 
 LabelOnDocuments=Ετικέτα στα έγγραφα
 LabelOrTranslationKey=Κλειδί ετικέτας ή μετάφρασης
 ValueOfConstantKey=Τιμή σταθεράς διαμόρφωσης
+ConstantIsOn=Option %s is on
 NbOfDays=Αριθ. Ημερών
 AtEndOfMonth=Στο τέλος του μήνα
 CurrentNext=Τρέχουσα / Επόμενη
@@ -1145,6 +1182,7 @@ InfoWebServer=Πληροφορίες Web Server
 InfoDatabase=Πληροφορίες Συστήματος ΒΔ
 InfoPHP=Πληροφορίες PHP
 InfoPerf=Πληροφορίες επιδόσεων
+InfoSecurity=About Security
 BrowserName=Όνομα φυλλομετρητή
 BrowserOS=Λειτουργικό σύστημα φυλλομετρητή
 ListOfSecurityEvents=Λίστα συμβάντων ασφαλείας Dolibarr
@@ -1194,7 +1232,8 @@ RestoreDesc=Για να επαναφέρετε ένα αντίγραφο ασφ
 RestoreDesc2=Επαναφέρετε το αρχείο αντιγράφων ασφαλείας (για παράδειγμα, αρχείο zip) του καταλόγου &quot;έγγραφα&quot; σε μια νέα εγκατάσταση Dolibarr ή σε αυτόν τον τρέχοντα κατάλογο εγγράφων ( <b>%s</b> ).
 RestoreDesc3=Επαναφέρετε τη δομή βάσης δεδομένων και τα δεδομένα από ένα αρχείο εφεδρικών αντιγράφων στη βάση δεδομένων της νέας εγκατάστασης Dolibarr ή στη βάση δεδομένων αυτής της τρέχουσας εγκατάστασης ( <b>%s</b> ). Προειδοποίηση, αφού ολοκληρωθεί η επαναφορά, πρέπει να χρησιμοποιήσετε ένα login / password, που υπήρχε από το χρόνο / εγκατάσταση του backup για να συνδεθείτε ξανά. <br> Για να επαναφέρετε μια εφεδρική βάση δεδομένων σε αυτήν την τρέχουσα εγκατάσταση, μπορείτε να ακολουθήσετε αυτόν τον βοηθό.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Υπάρχοντα αρχεία αντιγράφων ασφαλείας
 PreviousArchiveFiles=Υπάρχοντα αρχεία αρχειοθέτησης
 WeekStartOnDay=Πρώτη μέρα της εβδομάδας
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=Το στοιχείο PHP %s έχει φορτωθεί
 PreloadOPCode=Χρησιμοποιείται προ-φορτωμένο OPCode
 AddRefInList=Εμφάνιση αναφοράς πελατών / προμηθευτή λίστα πληροφοριών (επιλέξτε κατάλογο ή combobox) και το μεγαλύτερο μέρος της υπερσύνδεσης. <br> Τα Τρίτα Μέρη θα εμφανιστούν με τη μορφή ονόματος &quot;CC12345 - SC45678 - The Big Company corp&quot;. αντί του &quot;The Big Company corp&quot;.
 AddAdressInList=Εμφάνιση λίστας πληροφοριών διευθύνσεων πελατών / προμηθευτών (επιλέξτε κατάλογο ή συνδυασμός) <br> Τα Τρίτα Μέρη θα εμφανιστούν με τη μορφή ονόματι &quot;The Big Company Corp. - 21 άλμα δρόμου 123456 Μεγάλη πόλη - ΗΠΑ&quot; αντί για &quot;Το Big Company corp&quot;.
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ζητήστε την προτιμώμενη μέθοδο αποστολής για τρίτους.
 FieldEdition=Έκδοση στο πεδίο %s
 FillThisOnlyIfRequired=Παράδειγμα: +2 (συμπληρώστε μόνο αν ζώνη ώρας αντισταθμίσουν τα προβλήματα για προβλήματα που προέκυψαν)
@@ -1282,7 +1322,7 @@ GetBarCode=Πάρτε barcode
 NumberingModules=Μοντέλα αρίθμησης
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Μην προτείνετε έναν κωδικό πρόσβασης που δημιουργείται. Ο κωδικός πρόσβασης πρέπει να πληκτρολογηθεί μη αυτόματα.
 PasswordGenerationPerso=Επιστρέψτε έναν κωδικό πρόσβασης σύμφωνα με τις προσωπικές σας ρυθμίσεις.
 SetupPerso=Σύμφωνα με τη διαμόρφωσή σας
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Απαιτείται ηλεκτρονικό ταχυδρο
 MemberSendInformationByMailByDefault=Τσέκαρε το πλαίσιο ελέγχου για την αποστολή επιβεβαίωσης αλληλογραφίας στα μέλη (επικύρωση ή νέα συνδρομή) είναι ενεργοποιημένη από προεπιλογή
 VisitorCanChooseItsPaymentMode=Ο επισκέπτης μπορεί να επιλέξει μεταξύ των διαθέσιμων τρόπων πληρωμής
 MEMBER_REMINDER_EMAIL=Ενεργοποιήστε την αυτόματη υπενθύμιση <b>μέσω ηλεκτρονικού ταχυδρομείου</b> των συνδρομών που έχουν λήξει. Σημείωση: Η ενότητα <strong>%s</strong> πρέπει να ενεργοποιηθεί και να ρυθμιστεί σωστά για να στείλετε υπενθυμίσεις.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Global parameters
@@ -1523,7 +1564,9 @@ LDAPDescValues=Οι τιμές παραδειγμάτων σχεδιάζοντα
 ForANonAnonymousAccess=Για μια επαληθευμένη πρόσβαση (για παράδειγμα, για πρόσβαση εγγραφής)
 PerfDolibarr=Επιδόσεις ρύθμισης/βελτιστοποίηση της αναφοράς
 YouMayFindPerfAdviceHere=Αυτή η σελίδα παρέχει μερικές επιταγές ή συμβουλές σχετικά με την απόδοση.
-NotInstalled=Δεν έχει εγκατασταθεί, οπότε ο διακομιστής σας δεν επιβραδύνεται από αυτό.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Εφαρμογή Cache
 MemcachedNotAvailable=Δεν βρέθηκε applicative προσωρινή μνήμη. Μπορείτε να βελτιώσετε την απόδοση με την εγκατάσταση ενός Memcached διακομιστή προσωρινής μνήμης και ένα module θα είναι σε θέση να χρησιμοποίηση το διακομιστή προσωρινής μνήμης.<br>Περισσότερες πληροφορίες εδώ <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Σημειώστε ότι πολλοί πάροχοι web hosting δεν παρέχουν διακομιστή cache.
 MemcachedModuleAvailableButNotSetup=Το module memcached για εφαρμογή cache βρέθηκε, αλλά η εγκατάσταση του module δεν είναι πλήρης.
@@ -1571,9 +1614,9 @@ SyslogLevel=Επίπεδο
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=Μπορείτε να χρησιμοποιήσετε το DOL_DATA_ROOT / dolibarr.log για ένα αρχείο καταγραφής στον κατάλογο Dolibarr "documents". Μπορείτε να ορίσετε μια διαφορετική διαδρομή για να αποθηκεύσετε αυτό το αρχείο.
 ErrorUnknownSyslogConstant=Η σταθερά %s δεν είναι η γνωστή σταθερά Syslog
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Συμπίεση και δημιουργία αντιγράφων ασφαλείας των αρχείων καταγραφής εντοπισμού σφαλμάτων (που δημιουργούνται από την ενότητα Καταγραφή για σφάλμα)
-SyslogFileNumberOfSaves=Δημιουργία αντιγράφων ασφαλείας αρχείων
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Ρυθμίστε τη διαμόρφωση της προγραμματισμένης εργασίας για να ορίσετε την εφεδρική συχνότητα καταγραφής
 ##### Donations #####
 DonationsSetup=Ρύθμιση ενθέματος δωρεάς
@@ -1629,7 +1672,7 @@ AdvancedEditor=Εξελιγμένο πρόγραμμα επεξεργασίας
 ActivateFCKeditor=Ενεργοποιήστε το προηγμένο πρόγραμμα επεξεργασίας για:
 FCKeditorForCompany=Δημιουργία / έκδοση WYSIWIG στοιχείων περιγραφής και σημειώσεων (εκτός από προϊόντα / υπηρεσίες)
 FCKeditorForProduct=Δημιουργία / έκδοση WYSIWIG  των προϊόντων / υπηρεσιών περιγραφής και σημείωσης
-FCKeditorForProductDetails=Η δημιουργία / έκδοση WYSIWIG παραθέτει λεπτομέρειες για όλες τις οντότητες (προτάσεις, παραγγελίες, τιμολόγια κ.λπ.). <font class="warning">Προειδοποίηση: Η χρήση αυτής της επιλογής για αυτήν την περίπτωση δεν συνιστάται σοβαρά, καθώς μπορεί να δημιουργήσει προβλήματα με ειδικούς χαρακτήρες και μορφοποίηση σελίδων κατά την δημιουργία αρχείων PDF.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= Δημιουργία / έκδοση WYSIWIG για μαζικά eMailings (Εργαλεία-> eMailing)
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=Δημιουργία / έκδοση WYSIWIG για όλα τα μηνύματα (εκτός από τα εργαλεία-&gt; eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Ρύθμιση μονάδας αποθέματος
 IfYouUsePointOfSaleCheckModule=Εάν χρησιμοποιείτε τη μονάδα POS (Point of Sale) που παρέχεται εξ ορισμού ή μια εξωτερική μονάδα, αυτή η ρύθμιση ενδέχεται να αγνοηθεί από τη μονάδα POS. Οι περισσότερες μονάδες POS σχεδιάζονται από προεπιλογή για να δημιουργήσουν άμεσα ένα τιμολόγιο και να μειώσουν το απόθεμα ανεξάρτητα από τις επιλογές εδώ. Επομένως, εάν χρειάζεστε ή όχι να μειώσετε το απόθεμα κατά την εγγραφή μιας πώλησης από το POS σας, ελέγξτε επίσης τη ρύθμιση της μονάδας POS.
 ##### Menu #####
 MenuDeleted=Το μενού διαγράφηκε
+Menu=Menu
 Menus=Μενού
 TreeMenuPersonalized=Εξατομικευμένα μενού
 NotTopTreeMenuPersonalized=Εξατομικευμένα μενού που δεν συνδέονται με μια καταχώρηση κορυφαίου μενού
 NewMenu=New menu
-Menu=Επιλογή του μενού
 MenuHandler=Χειριστής μενού
 MenuModule=Source module
 HideUnauthorizedMenu= Απόκρυψη μη εξουσιοδοτημένων μενού (γκρι)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Αυτόματη ρύθμιση αυτής της
 AGENDA_DEFAULT_FILTER_TYPE=Αυτόματη ρύθμιση αυτού του τύπου συμβάντος στο φίλτρο αναζήτησης της προβολής ατζέντας
 AGENDA_DEFAULT_FILTER_STATUS=Αυτόματη ρύθμιση αυτής της κατάστασης για συμβάντα στο φίλτρο αναζήτησης της προβολής ατζέντας
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Ενεργοποιήστε την υπενθύμιση συμβάντων <b>μέσω μηνυμάτων ηλεκτρονικού ταχυδρομείου</b> (η επιλογή επιλογής / καθυστέρησης μπορεί να οριστεί σε κάθε συμβάν). Σημείωση: Η ενότητα <strong>%s</strong> πρέπει να ενεργοποιηθεί και να ρυθμιστεί σωστά ώστε να έχει αποσταλεί υπενθύμιση στη σωστή συχνότητα.
-AGENDA_REMINDER_BROWSER=Ενεργοποίηση υπενθύμισης συμβάντων <b>στο πρόγραμμα περιήγησης του χρήστη</b> (όταν φτάσει η ημερομηνία συμβάντος, κάθε χρήστης μπορεί να το αρνηθεί από την ερώτηση επιβεβαίωσης του προγράμματος περιήγησης)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Ενεργοποίηση ειδοποίησης ήχου
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Εμφάνιση συνδεδεμένου αντικειμένου στην προβολή ατζέντας
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0: Είδος πληρωμής πελάτη, 1: Τύπος πλ
 IncludePath=Συμπεριλάβετε τη διαδρομή (οριστεί σε μεταβλητή %s)
 ExpenseReportsSetup=Ρύθμιση εκθέσεων δαπανών ενότητας
 TemplatePDFExpenseReports=Πρότυπα εγγράφων για τη δημιουργία εγγράφου αναφοράς δαπανών
-ExpenseReportsIkSetup=Ρύθμιση εκθέσεων δαπανών ενότητας - δείκτης Milles
 ExpenseReportsRulesSetup=Ρύθμιση εκθέσεων εξόδων για τους module - Κανόνες
 ExpenseReportNumberingModules=Μονάδα αρίθμησης αναφορών εξόδων
 NoModueToManageStockIncrease=Δεν έχει ενεργοποιηθεί καμία ενότητα ικανή να διαχειριστεί την αυτόματη αύξηση των αποθεμάτων. Η αύξηση των αποθεμάτων θα γίνεται μόνο με χειροκίνητη εισαγωγή.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Πελ./Προμ.
 MailToMember=Μέλη
 MailToUser=Χρήστες
-MailToProject=Σελίδα έργων
+MailToProject=Έργα
 MailToTicket=Εισιτήρια
 ByDefaultInList=Εμφάνιση από προεπιλογή στην προβολή λίστας
 YouUseLastStableVersion=Χρησιμοποιείτε την πιο πρόσφατη σταθερή έκδοση
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Φόρτωση αναζήτησης τρίτου μέρο
 LoadThirdPartyFromNameOrCreate=Φόρτωση αναζήτησης τρίτου μέρους στο %s (δημιουργία αν δεν βρεθεί)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Κωδικός εισόδου μενού (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Απενεργοποιήστε τη δυνατότη
 EnableResourceUsedInEventCheck=Ενεργοποίηση λειτουργίας για να ελέγξετε αν χρησιμοποιείται ένας πόρος σε ένα συμβάν
 ConfirmUnactivation=Επιβεβαιώστε την επαναφορά της μονάδας
 OnMobileOnly=Σε μικρή οθόνη (smartphone) μόνο
-DisableProspectCustomerType=Απενεργοποιήστε τον τύπο τρίτου μέρους &quot;Prospect + Πελάτης&quot; (οπότε το τρίτο μέρος πρέπει να είναι Prospect ή Πελάτης, αλλά δεν μπορεί να είναι και οι δύο)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Απλοποιήστε τη διεπαφή για τυφλό άτομο
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Ενεργοποιήστε αυτήν την επιλογή εάν είστε τυφλός ή χρησιμοποιείτε την εφαρμογή από ένα πρόγραμμα περιήγησης κειμένου όπως Lynx ή Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Αλλάξτε το χρώμα της διεπαφής για τον τυφλό χρώμα
@@ -1996,13 +2041,15 @@ UseDebugBar=Χρησιμοποιήστε τη γραμμή εντοπισμού
 DEBUGBAR_LOGS_LINES_NUMBER=Αριθμός τελευταίων γραμμών καταγραφής που διατηρούνται στην κονσόλα
 WarningValueHigherSlowsDramaticalyOutput=Προειδοποίηση, οι υψηλότερες τιμές επιβραδύνουν την δραματική παραγωγή
 ModuleActivated=Η ενότητα %s ενεργοποιείται και επιβραδύνει τη διεπαφή
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Τα μοντέλα εξαγωγής είναι κοινά με όλους
 ExportSetup=Ρύθμιση εξαγωγής της ενότητας
 ImportSetup=Ρύθμιση εισαγωγής λειτουργικής μονάδας
 InstanceUniqueID=Μοναδικό αναγνωριστικό της παρουσίας
 SmallerThan=Μικρότερη από
 LargerThan=Μεγαλύτερο από
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=Με ένα λογαριασμό GMail, εάν έχετε ενεργοποιήσει την επικύρωση 2 βημάτων, σας συνιστούμε να δημιουργήσετε έναν ειδικό δευτερεύοντα κωδικό πρόσβασης για την εφαρμογή αντί να χρησιμοποιήσετε τη δική σας passsword από https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=Μπορείτε να χρησιμοποιήσετε αυτήν την ενέργεια για να χρησιμοποιήσετε το περιεχόμενο ηλεκτρονικού ταχυδρομείου για να βρείτε και να φορτώσετε ένα υπάρχον τρίτο μέρος στη βάση δεδομένων σας. Το τρίτο μέρος που βρέθηκε (ή δημιουργήθηκε) θα χρησιμοποιηθεί για τις ακόλουθες ενέργειες που το χρειάζονται. Στο πεδίο παραμέτρων μπορείτε να χρησιμοποιήσετε για παράδειγμα το EXTRACT: BODY: Name: \\ s ([^ \\ s] *) εάν θέλετε να εξαγάγετε το όνομα του τρίτου μέρους από μια συμβολοσειρά 'Name: name to find' μέσα στο σώμα της εντολής.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=Η κλίμακα είναι ο αριθμός των θέσ
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/el_GR/banks.lang b/htdocs/langs/el_GR/banks.lang
index f4e87ef0145..7cd78ac18a0 100644
--- a/htdocs/langs/el_GR/banks.lang
+++ b/htdocs/langs/el_GR/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Διάφορες πληρωμές
 VariousPayments=Διάφορες πληρωμές
 ShowVariousPayment=Εμφάνιση διαφόρων πληρωμών
 AddVariousPayment=Προσθήκη διαφόρων πληρωμών
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=Εντολές άμεσης χρέωσης
 YourSEPAMandate=Οι εντολές άμεσης χρέωσης σας.
 FindYourSEPAMandate=Αυτή είναι η εντολή ΕΧΠΕ για να εξουσιοδοτήσετε την εταιρεία μας να κάνει άμεση εντολή χρέωσης στην τράπεζά σας. Επιστρέψτε το υπογεγραμμένο (σάρωση του υπογεγραμμένου εγγράφου) ή στείλτε το ταχυδρομικώς η με mail
@@ -176,3 +179,4 @@ BankColorizeMovement=Χρωματισμός κινήσεων
 BankColorizeMovementDesc=Εάν αυτή η λειτουργία είναι ενεργή, μπορείτε να επιλέξετε συγκεκριμένο χρώμα φόντου για χρεωστικές ή πιστωτικές κινήσεις
 BankColorizeMovementName1=Χρώμα φόντου για την κίνηση χρέωσης
 BankColorizeMovementName2=Χρώμα φόντου για την πιστωτική κίνηση
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/el_GR/categories.lang b/htdocs/langs/el_GR/categories.lang
index 88578934023..258447b74e0 100644
--- a/htdocs/langs/el_GR/categories.lang
+++ b/htdocs/langs/el_GR/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Ρύθμιση ετικετών/κατηγοριών
 CategorieRecursiv=Αυτόματη σύνδεση με μητρική ετικέτα/κατηγορία
 CategorieRecursivHelp=Εάν είναι ενεργοποιημένη η επιλογή, όταν προσθέσετε ένα προϊόν σε μια υποκατηγορία, το προϊόν θα προστεθεί επίσης στην κατηγορία γονέων.
 AddProductServiceIntoCategory=Προσθέστε το ακόλουθο προϊόν/υπηρεσία
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Εμφάνιση ετικέτας/κατηγορίας
 ByDefaultInList=By default in list
 ChooseCategory=Επιλέξτε κατηγορία
-StocksCategoriesArea=Αποθήκες Κατηγορίες Περιοχή
-ActionCommCategoriesArea=Περιοχή κατηγοριών Εκδηλώσεων 
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Χρήση ή χειριστής για κατηγορίες
diff --git a/htdocs/langs/el_GR/companies.lang b/htdocs/langs/el_GR/companies.lang
index 5f197c22491..318aa1d98d3 100644
--- a/htdocs/langs/el_GR/companies.lang
+++ b/htdocs/langs/el_GR/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Αριθμός Εμπορικής Εγγραφής)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Ο καθηγητής Id 1 (RUT)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=Καθ ID 5
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Prof Id 1 (Registration Number)
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN=Καθ ID 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (RC)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (ΑΝ)
 ProfId4MA=Id prof. 4 (CNSS)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Ο καθηγητής Id 1 (RFC).
 ProfId2MX=Ο καθηγητής ID 2 (R.. Π. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Αριθμός Εμπορικής Εγγραφής)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Πρότυπο Id 1 (CUI)
 ProfId2RO=Πρότυπο Id 2 (Nr. Înmatriculare)
 ProfId3RO=Πρότυπο Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Πρότυπο Id 5 (EUID)
+ProfId4RO=Πρότυπο Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Καθ Id 1 (OGRN)
 ProfId2RU=Καθ Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=Μπορείτε επίσης να ελέγξετε χειρ
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Δεν προοπτική, ούτε πελάτης
 JuridicalStatus=Τύπος νομικού προσώπου
+Workforce=Workforce
 Staff=Εργαζόμενοι
 ProspectLevelShort=Δυναμική
 ProspectLevel=Δυναμική προοπτικής
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Όρος πληρωμής - Πωλητής
 PaymentTypeBoth=Τύπος Πληρωμής - Πελάτης και Πωλητής
 MulticurrencyUsed=Χρησιμοποιήστε το Πολλαπλάσιο
 MulticurrencyCurrency=Νόμισμα
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/el_GR/ecm.lang b/htdocs/langs/el_GR/ecm.lang
index 17590e0b196..1984f48b63e 100644
--- a/htdocs/langs/el_GR/ecm.lang
+++ b/htdocs/langs/el_GR/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=No. of documents in directory
+ECMNbOfDocs=Αριθμός εγγράφων στον κατάλογο
 ECMSection=Directory
 ECMSectionManual=Manual directory
 ECMSectionAuto=Automatic directory
@@ -14,39 +14,30 @@ ECMNbOfFilesInDir=Number of files in directory
 ECMNbOfSubDir=Number of sub-directories
 ECMNbOfFilesInSubDir=Αριθμός αρχείων σε υπο-καταλόγους
 ECMCreationUser=Δημιουργός
-ECMArea=DMS/ECM area
-ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMArea=Περιοχή DMS / ECM
+ECMAreaDesc=Η περιοχή DMS / ECM (Συστήματα Διαχείρισης Εγγράφων / Ηλεκτρονική Διαχείριση Περιεχομένου) σας επιτρέπει να αποθηκεύετε, να μοιράζεστε και να αναζητάτε γρήγορα όλα τα είδη εγγράφων στο Dolibarr.
 ECMAreaDesc2=* Automatic directories are filled automatically when adding documents from card of an element.<br>* Manual directories can be used to save documents not linked to a particular element.
 ECMSectionWasRemoved=Directory <b>%s</b> has been deleted.
-ECMSectionWasCreated=Directory <b>%s</b> has been created.
+ECMSectionWasCreated=Ο κατάλογος <b>%s</b> έχει δημιουργηθεί.
 ECMSearchByKeywords=Search by keywords
 ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeAuto=Αυτόματα
-ECMDocsBySocialContributions=Έγγραφα που συνδέονται με την κοινωνική εισφορά ή φόρους
-ECMDocsByThirdParties=Έγγραφα συνδεδεμένα με στοιχεία
-ECMDocsByProposals=Έγγραφα που σχετίζονται με τις προτάσεις
-ECMDocsByOrders=Έγγραφα συνδεδεμένα με παραγγελίες πελατών
-ECMDocsByContracts=Έγγραφα συνδεδεμένα με συμβόλαια
-ECMDocsByInvoices=Έγγραφα συνδεδεμένα με τιμολόγια πελατών
-ECMDocsByProducts=Έγγραφα συνδεδεμένα με προϊόντα
-ECMDocsByProjects=Έγγραφα που συνδέονται με σχέδια
-ECMDocsByUsers=Έγγραφα που συνδέονται με χρήστες
-ECMDocsByInterventions=Έγγραφα που συνδέονται με τις παρεμβάσεις
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=Δεν δημιουργήθηκε φάκελος
 ShowECMSection=Εμφάνιση φακέλου
 DeleteSection=Διαγραφή φακέλου
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Relative directory for files
-CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
-CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=Η κατάργηση δεν είναι δυνατή επειδή περιέχει ορισμένα αρχεία ή δευτερεύοντες καταλόγους
+CannotRemoveDirectoryContainsFiles=Η αφαίρεση δεν είναι δυνατή επειδή περιέχει ορισμένα αρχεία
 ECMFileManager=Διαχειριστής Αρχείων
-ECMSelectASection=Select a directory in the tree...
-DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
-ReSyncListOfDir=Resync list of directories
-HashOfFileContent=Hash of file content
-NoDirectoriesFound=No directories found
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ECMSelectASection=Επιλέξτε έναν κατάλογο στο δέντρο ...
+DirNotSynchronizedSyncFirst=Αυτός ο κατάλογος φαίνεται να δημιουργείται ή να τροποποιείται εκτός της μονάδας ECM. Πρέπει πρώτα να κάνετε κλικ στο κουμπί &quot;Επανασύνδεση&quot; για να συγχρονίσετε το δίσκο και τη βάση δεδομένων για να αποκτήσετε περιεχόμενο αυτού του καταλόγου.
+ReSyncListOfDir=Επανασυνδέστε τη λίστα των καταλόγων
+HashOfFileContent=Διαγραφή περιεχομένου αρχείου
+NoDirectoriesFound=Δεν βρέθηκαν κατάλογοι
+FileNotYetIndexedInDatabase=Αρχείο που δεν έχει ακόμη ευρετηριαστεί στη βάση δεδομένων (δοκιμάστε να το μεταφορτώσετε ξανά)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/el_GR/hrm.lang b/htdocs/langs/el_GR/hrm.lang
index b7dcc4da1b8..6800960626f 100644
--- a/htdocs/langs/el_GR/hrm.lang
+++ b/htdocs/langs/el_GR/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Εργαζόμενοι
 Employee=Υπάλληλος
 NewEmployee=Νέος εργαζόμενος
+ListOfEmployees=Λίστα  εργαζομένων
diff --git a/htdocs/langs/el_GR/install.lang b/htdocs/langs/el_GR/install.lang
index 2622954a63d..c08d1890daa 100644
--- a/htdocs/langs/el_GR/install.lang
+++ b/htdocs/langs/el_GR/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Το αρχείο διαμόρφωσης <b>%s</b> δεν
 ConfFileIsWritable=Το αρχείο ρυθμίσεων <b>%s</b> είναι εγγράψιμο.
 ConfFileMustBeAFileNotADir=Το αρχείο διαμόρφωσης <b>%s</b> πρέπει να είναι ένα αρχείο, όχι ένας κατάλογος.
 ConfFileReload=Επαναφόρτωση παραμέτρων από αρχείο ρυθμίσεων.
-PHPSupportSessions=Η PHP υποστηρίζει συνεδρίες.
 PHPSupportPOSTGETOk=Η PHP υποστηρίζει μεταβλητές POST και GET.
 PHPSupportPOSTGETKo=Είναι πιθανό η ρύθμισή σας PHP να μην υποστηρίζει τις μεταβλητές POST ή / και GET. Ελέγξτε την παράμετρο <b>variables_order</b> στο php.ini.
-PHPSupportGD=Αυτή η PHP υποστηρίζει GD γραφικές λειτουργίες.
-PHPSupportCurl=Αυτή η PHP υποστηρίζει το Curl.
-PHPSupportCalendar=Αυτή η PHP υποστηρίζει επεκτάσεις ημερολογίων.
-PHPSupportUTF8=Αυτή η PHP υποστηρίζει τις λειτουργίες UTF8.
-PHPSupportIntl=Αυτή η PHP υποστηρίζει τις λειτουργίες Intl.
-PHPSupportxDebug=Αυτό το PHP υποστηρίζει εκτεταμένες λειτουργίες εντοπισμού σφαλμάτων.
+PHPSupportSessions=Η PHP υποστηρίζει συνεδρίες.
 PHPSupport=Η PHP υποστηρίζει %s λειτουργίες .
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Η μνήμη συνεδρίας PHP max έχει οριστεί σε <b>%s</b> bytes. Αυτό είναι πολύ χαμηλό. Αλλάξτε το <b>php.ini</b> για να ρυθμίσετε την παράμετρο <b>memory_limit</b> σε τουλάχιστον bytes <b>%s</b> .
diff --git a/htdocs/langs/el_GR/intracommreport.lang b/htdocs/langs/el_GR/intracommreport.lang
new file mode 100644
index 00000000000..a861533e391
--- /dev/null
+++ b/htdocs/langs/el_GR/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=Λίστα
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/el_GR/languages.lang b/htdocs/langs/el_GR/languages.lang
index da99fbcb992..35076749bf2 100644
--- a/htdocs/langs/el_GR/languages.lang
+++ b/htdocs/langs/el_GR/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Ισπανικά (Παραγουάη)
 Language_es_PE=Ισπανικά (Περού)
 Language_es_PR=Ισπανικά (Πουέρτο Ρίκο)
+Language_es_US=Spanish (USA)
 Language_es_UY=Ισπανικά (Ουρουγουάη)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Ισπανικά (Βενεζουέλας)
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index fcac93efc25..420fc166108 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Αφαίρεση συνδέσμου
 AddToDraft=Προσθήκη στο προσχέδιο
 Update=Ανανέωση
 Close=Κλείσιμο
+CloseAs=Αλλαγή κατάστασης σε
 CloseBox=Καταργήστε το γραφικό στοιχείο από τον πίνακα ελέγχου
 Confirm=Επιβεβαίωση
 ConfirmSendCardByMail=Θέλετε πραγματικά να στείλετε το περιεχόμενο αυτής της κάρτας μέσω ταχυδρομείου στο <b>%s</b> ;
@@ -196,6 +197,7 @@ ReOpen=Εκ νέου άνοιγμα
 Upload=Ανεβάστε
 ToLink=Σύνδεσμος
 Select=Επιλογή
+SelectAll=Select all
 Choose=Επιλογή
 Resize=Αλλαγή διαστάσεων
 ResizeOrCrop=Αλλαγή μεγέθους ή περικοπή
@@ -256,6 +258,7 @@ Cards=Καρτέλες
 Card=Καρτέλα
 Now=Τώρα
 HourStart=Έναρξη ωρών
+Deadline=Deadline
 Date=Ημερομηνία
 DateAndHour=Ημερομηνία και ώρα
 DateToday=Σημερινή ημερομηνία
@@ -264,8 +267,10 @@ DateStart=Ημερομηνία έναρξης
 DateEnd=Ημερομηνία λήξης
 DateCreation=Ημερομηνία Δημιουργίας
 DateCreationShort=Ημερομηνία δημιουργίας
+IPCreation=Creation IP
 DateModification=Ημερομηνία Τροποποίησης
 DateModificationShort=Ημερ. Τροπ.
+IPModification=Modification IP
 DateLastModification=Τελευταία ημερομηνία τροποποίησης
 DateValidation=Ημερομηνία Επικύρωσης
 DateClosing=Ημερομηνία Κλεισίματος
@@ -319,6 +324,7 @@ Morning=Πρωί
 Afternoon=Απόγευμα
 Quadri=Τετραπλής
 MonthOfDay=Μήνας από την ημέρα
+DaysOfWeek=Days of week
 HourShort=Ω
 MinuteShort=mn
 Rate=Βαθμός
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Ποσό πληρωμής, αρχικό νόμισμ
 MulticurrencyAmountHT=Ποσό (εκτός φόρου), αρχικό νόμισμα
 MulticurrencyAmountTTC=Ποσό (με φόρους), αρχικό νόμισμα
 MulticurrencyAmountVAT=Ποσό φόρων, αρχικό νόμισμα
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Ποσό Φόρου 2
 AmountLT2=Ποσό Φόρου 3
 AmountLT1ES=Ποσό RE
@@ -487,6 +494,7 @@ By=Από
 From=Από
 FromDate=Από
 FromLocation=Από
+at=at
 to=πρός
 To=πρός
 and=και
@@ -509,6 +517,7 @@ Draft=Προσχέδιο
 Drafts=Προσχέδια
 StatusInterInvoiced=Τιμολογήθηκε
 Validated=Επικυρωμένο
+ValidatedToProduce=Validated (To produce)
 Opened=Άνοιγμα
 OpenAll=Άνοιγμα (Όλα)
 ClosedAll=Κλειστό (Όλα)
@@ -655,6 +664,7 @@ Response=Απάντηση
 Priority=Προτεραιότητα
 SendByMail=Απόστειλε μέσω ηλεκτρονικού ταχυδρομείου
 MailSentBy=Το email στάλθηκε από
+NotSent=Δεν αποστέλλεται
 TextUsedInTheMessageBody=Κείμενο email
 SendAcknowledgementByMail=Αποστολή email επιβεβαίωσης
 SendMail=Αποστολή email
@@ -836,6 +846,7 @@ ListOfTemplates=Κατάλογος των προτύπων
 Gender=Φύλο
 Genderman=Άνδρας
 Genderwoman=Γυναίκα
+Genderother=Άλλο
 ViewList=Προβολή λίστας
 ViewGantt=Gantt θέα
 ViewKanban=Θέα στο Kanban
@@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous
 Calendar=Ημερολόγιο
 GroupBy=Ομαδοποίηση κατά...
 ViewFlatList=Προβολή λίστας
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Αφαιρέστε τη συμβολοσειρά &#39;%s&#39;
 SomeTranslationAreUncomplete=Ορισμένες από τις γλώσσες που προσφέρονται μπορούν να μεταφραστούν μόνο μερικώς ή ενδέχεται να περιέχουν σφάλματα. Βοηθήστε να διορθώσετε τη γλώσσα σας, εγγραφείτε στη <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">διεύθυνση https://transifex.com/projects/p/dolibarr/</a> για να προσθέσετε τις βελτιώσεις σας.
 DirectDownloadLink=Άμεση σύνδεση λήψης (δημόσια / εξωτερική)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Αποστολές Πελάτη
 SearchIntoExpenseReports=Αναφορές εξόδων
 SearchIntoLeaves=Αδεια
 SearchIntoTickets=Εισιτήρια
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Πληρωμές προμηθευτών
+SearchIntoMiscPayments=Διάφορες πληρωμές
 CommentLink=Σχόλια
 NbComments=Αριθμός σχολίων
 CommentPage=Χώρος σχολίων
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Πληροφορίες
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Ημερομηνία γεννήσεως
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Υπενθύμιση συμβάντος
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/el_GR/members.lang b/htdocs/langs/el_GR/members.lang
index 5cc7769499e..a73055746fb 100644
--- a/htdocs/langs/el_GR/members.lang
+++ b/htdocs/langs/el_GR/members.lang
@@ -19,14 +19,12 @@ MembersCards=Επιχειρηματικές κάρτες μελών
 MembersList=Λίστα μελών
 MembersListToValid=Λίστα πρόχειρων Μελών (προς επικύρωση)
 MembersListValid=Λίστα έγκυρων μελών
-MembersListUpToDate=Λίστα επικυρωμένων μελών που έχουν συνδρομή
-MembersListNotUpToDate=Λίστα επικυρωμένων μελών που δεν έχουν συνδρομή
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=Κατάλογος καταγγελθέντων μελών
 MembersListQualified=Λίστα επικυρωμένων μελών
 MenuMembersToValidate=Πρόχειρα Μέλη
 MenuMembersValidated=Επικυρωμένα μέλη
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Καταλήγοντας μέλη
 MembersWithSubscriptionToReceive=Μέλη αναμένοντα για  λήψη συνδρομής
 MembersWithSubscriptionToReceiveShort=Εγγραφή για λήψη
@@ -34,6 +32,7 @@ DateSubscription=Ημερομηνία συνδρομής
 DateEndSubscription=Ημερομηνία Λήξης Συνδρομής
 EndSubscription=Λήξη συνδρομής
 SubscriptionId=Κωδ. συνδρομής
+WithoutSubscription=Without subscription
 MemberId=id Μέλους
 NewMember=Νέο μέλος
 MemberType=Τύπος μέλους
@@ -81,7 +80,7 @@ DeleteType=Διαγραφή
 VoteAllowed=Δικαίωμα ψήφου
 Physical=Φυσικό
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Επανενεργοποίηση
 ResiliateMember=Τερματίστε ένα μέλος
 ConfirmResiliateMember=Είστε σίγουροι για τη διακοπή της συνδρομής του Μέλους;
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Αποστολή μηνύματος ηλεκτρ
 SendingEmailOnNewSubscription=Αποστολή μηνύματος ηλεκτρονικού ταχυδρομείου σε νέα συνδρομή
 SendingReminderForExpiredSubscription=Αποστολή υπενθύμισης για συνδρομές που έχουν λήξει
 SendingEmailOnCancelation=Αποστολή μηνύματος ηλεκτρονικού ταχυδρομείου σχετικά με την ακύρωση
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Η πρόσβασή σας έγινε δεκτή.
 YourMembershipWasValidated=Η ιδιότητα μέλους σας επικυρώθηκε
@@ -167,6 +167,7 @@ MembersStatisticsByState=Τα μέλη στατιστικών στοιχείων
 MembersStatisticsByTown=Τα μέλη στατιστικών στοιχείων από την πόλη
 MembersStatisticsByRegion=Στατιστικά Μελών ανά περιοχή
 NbOfMembers=Αριθμός μελών
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=Δεν επικυρώνονται τα μέλη βρέθηκαν
 MembersByCountryDesc=Αυτή η οθόνη σας δείξει στατιστικά στοιχεία σχετικά με τα μέλη από τις χώρες. Graphic εξαρτάται, ωστόσο, στην υπηρεσία της Google online διάγραμμα και είναι διαθέσιμο μόνο αν μια σύνδεση στο Διαδίκτυο είναι λειτουργεί.
 MembersByStateDesc=Αυτή η οθόνη σας δείξει στατιστικά στοιχεία σχετικά με τα μέλη από το κράτος / επαρχίες / Canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Στατιστικά
 LastMemberDate=Τελευταία ημερομηνία μέλους
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Φύση του μέλους
+MembersNature=Nature of members
 Public=Δημόσιο
 NewMemberbyWeb=Νέο μέλος πρόσθεσε. Εν αναμονή έγκρισης
 NewMemberForm=Νέα μορφή μέλος
diff --git a/htdocs/langs/el_GR/mrp.lang b/htdocs/langs/el_GR/mrp.lang
index b3936567cdd..25e91a2a182 100644
--- a/htdocs/langs/el_GR/mrp.lang
+++ b/htdocs/langs/el_GR/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Παραγγελίες Παραγωγής
-MO=Παραγγελία Παραγωγής
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Ενότητα για τη διαχείριση της παραγωγής και των Παραγγελιών Παραγωγής (MO).
 MRPArea=Περιοχή MRP
 MrpSetupPage=Ρύθμιση της μονάδας MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Προϊόντα για παραγωγή
 UnitCost=Κόστος μονάδας
 TotalCost=Συνολικό κόστος
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index 4ecc503cf8d..6570f5f1b60 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Πολλαπλά τμήματα τιμών ανά προϊόν / υπηρεσία (κάθε πελάτης βρίσκεται σε ένα τμήμα τιμών)
 MultiPricesNumPrices=Αριθμός τιμής
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Ενεργοποίηση εικονικών προϊόντων (κιτ)
-AssociatedProducts=Εικονικά προϊόντα
-AssociatedProductsNumber=Πλήθος προϊόντων που συνθέτουν αυτό το προϊόν
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Αριθμός μητρικής συσκευασίας προϊόντος
 ParentProducts=Μητρικά προϊόντα
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Φίλτρο λέξης-κλειδιού
 CategoryFilter=Φίλτρο κατηγορίας
 ProductToAddSearch=Εύρεση προϊόντος προς προσθήκη
 NoMatchFound=Δεν βρέθηκε κατάλληλη εγγραφή
 ListOfProductsServices=Κατάλογος προϊόντων / υπηρεσιών
-ProductAssociationList=Κατάλογος προϊόντων / υπηρεσιών που αποτελούν συνιστώσες αυτού του εικονικού προϊόντος / κιτ
-ProductParentList=Κατάλογος των προϊόντων / υπηρεσιών με αυτό το προϊόν ως συστατικό
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=Ένα από τα προϊόντα που θα επιλεγούν είναι γονέας με την τρέχουσα προϊόν
 DeleteProduct=Διαγραφή προϊόντος/υπηρεσίας
 ConfirmDeleteProduct=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το προϊόν / υπηρεσία;
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Διαθέσιμες συνολικές τιμές:
 PriceMode=Λειτουργία Τιμής
 PriceNumeric=Αριθμός
 DefaultPrice=Προεπιλεγμένη τιμή
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Αύξηση/Μείωση αποθεμάτων στην μητρική
 ComposedProduct=Παιδικά προϊόντα
 MinSupplierPrice=Ελάχιστη τιμή αγοράς
@@ -339,6 +340,7 @@ UseProductFournDesc=Προσθέστε μια δυνατότητα για να 
 ProductSupplierDescription=Περιγραφή του πωλητή για το προϊόν
 UseProductSupplierPackaging=Χρησιμοποιήστε τη συσκευασία στις τιμές προμηθευτή (επανυπολογίστε τις ποσότητες σύμφωνα με τη συσκευασία που καθορίζεται στην τιμή προμηθευτή κατά την προσθήκη / ενημέρωση της γραμμής στα έγγραφα προμηθευτών)
 PackagingForThisProduct=Συσκευασία
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=Η ποσότητα της γραμμής υπολογίστηκε εκ νέου σύμφωνα με τη συσκευασία του προμηθευτή
 
 #Attributes
diff --git a/htdocs/langs/el_GR/recruitment.lang b/htdocs/langs/el_GR/recruitment.lang
index 56b5b4347f5..979cbd02335 100644
--- a/htdocs/langs/el_GR/recruitment.lang
+++ b/htdocs/langs/el_GR/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Θέση εργασίας
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang
index d812268d788..50808768598 100644
--- a/htdocs/langs/el_GR/stocks.lang
+++ b/htdocs/langs/el_GR/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Αναγνωριστικό κίνησης %d
 ListMouvementStockProject=Κατάλογος των κινήσεων αποθεμάτων που σχετίζονται με το έργο
 StocksArea=Περιοχή αποθηκών
 AllWarehouses=Όλες οι αποθήκες
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Συμπεριλάβετε επίσης σχέδια παραγγελιών
 Location=Τοποθεσία
 LocationSummary=Σύντομη τοποθεσία όνομα
@@ -122,8 +122,9 @@ DesiredStockDesc=Αυτό το ποσό μετοχών θα είναι η τιμ
 StockToBuy=Για να παραγγείλετε
 Replenishment=Αναπλήρωση
 ReplenishmentOrders=Αναπλήρωση παραγγελίων
-VirtualDiffersFromPhysical=Σύμφωνα με τις επιλογές αύξησης / μείωσης των μετοχών, το φυσικό απόθεμα και το εικονικό απόθεμα (φυσικές + τρέχουσες παραγγελίες) μπορεί να διαφέρουν
-UseVirtualStockByDefault=Χρησιμοποιήστε το εικονικό απόθεμα από προεπιλογή, αντί των φυσικών αποθεμάτων, για τη \nλειτουργία αναπλήρωσης
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Χρησιμοποιήστε το εικονικό απόθεμα
 UsePhysicalStock=Χρησιμοποιήστε το φυσικό απόθεμα
 CurentSelectionMode=Τρέχουσα μέθοδος επιλογής
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=Αυτό το προϊόν βρίσκετα
 SelectCategory=Φίλτρο κατηγορίας
 SelectFournisseur=Φίλτρο προμηθευτή
 inventoryOnDate=Καταγραφή εμπορευμάτων
-INVENTORY_DISABLE_VIRTUAL=Εικονικό προϊόν (κιτ): Μην μειώνετε το απόθεμα ενός παιδικού προϊόντος
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Χρησιμοποιήστε την τιμή αγοράς αν δεν μπορείτε να βρείτε την τελευταία τιμή αγοράς
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Οι κινήσεις των αποθεμάτων θα έχουν την ημερομηνία απογραφής (αντί της ημερομηνίας επικύρωσης του αποθέματος)
 inventoryChangePMPPermission=Επιτρέψτε να αλλάξετε την τιμή PMP για ένα προϊόν
 ColumnNewPMP=Νέα μονάδα PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/el_GR/suppliers.lang b/htdocs/langs/el_GR/suppliers.lang
index 542e6305bd1..1142d55088d 100644
--- a/htdocs/langs/el_GR/suppliers.lang
+++ b/htdocs/langs/el_GR/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Παραγγελίες αγοράς στο τιμολό
 NbDaysToDelivery=Παράταση παράδοσης (ημέρες)
 DescNbDaysToDelivery=Η μεγαλύτερη καθυστέρηση παράδοσης των προϊόντων από αυτήν την παραγγελία
 SupplierReputation=Φήμη πωλητή
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Να μην γίνει παραγγελία
 NotTheGoodQualitySupplier=Χαμηλή ποιότητα
 ReputationForThisProduct=Φήμη
diff --git a/htdocs/langs/el_GR/website.lang b/htdocs/langs/el_GR/website.lang
index f5029a325e7..50dd8e48759 100644
--- a/htdocs/langs/el_GR/website.lang
+++ b/htdocs/langs/el_GR/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Προσθήκη ιστοτόπου
 Webpage=Ιστοσελίδα / δοχείο
 AddPage=Προσθήκη σελίδας / δοχείου
 HomePage=Αρχική σελίδα
-PageContainer=Σελίδα / δοχείο
+PageContainer=Σελίδα
 PreviewOfSiteNotYetAvailable=<strong>Δεν</strong> είναι ακόμα διαθέσιμη η προεπισκόπηση του ιστοτόπου σας <strong>%s</strong> . Πρέπει πρώτα να <strong>εισαγάγετε ένα πλήρες πρότυπο ιστότοπου</strong> ή απλά να <strong>προσθέσετε μια σελίδα / κοντέινερ</strong> .
 RequestedPageHasNoContentYet=Η σελίδα που ζητήθηκε με id %s δεν έχει ακόμα περιεχόμενο, ή το αρχείο cache .tpl.php καταργήθηκε. Επεξεργαστείτε το περιεχόμενο της σελίδας για να το επιλύσετε.
 SiteDeleted=Ο ιστότοπος &quot;%s&quot; διαγράφηκε
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Η αντικατάσταση έγινε σε σελίδ
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/en_AU/intracommreport.lang b/htdocs/langs/en_AU/intracommreport.lang
new file mode 100644
index 00000000000..76825d9b4ab
--- /dev/null
+++ b/htdocs/langs/en_AU/intracommreport.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+IntracommReportPeriod=Period of nalysis
diff --git a/htdocs/langs/en_AU/main.lang b/htdocs/langs/en_AU/main.lang
index 102482cbd63..dac6a875c2d 100644
--- a/htdocs/langs/en_AU/main.lang
+++ b/htdocs/langs/en_AU/main.lang
@@ -35,4 +35,3 @@ TTC=Incl GST
 VAT=GST
 VATRate=GST Rate
 Check=Cheque
-CREATEInDolibarr=Record %s create
diff --git a/htdocs/langs/en_AU/products.lang b/htdocs/langs/en_AU/products.lang
new file mode 100644
index 00000000000..6e900475275
--- /dev/null
+++ b/htdocs/langs/en_AU/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/en_AU/stocks.lang b/htdocs/langs/en_AU/stocks.lang
deleted file mode 100644
index 0cf57e3a1c3..00000000000
--- a/htdocs/langs/en_AU/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/en_CA/compta.lang b/htdocs/langs/en_CA/compta.lang
new file mode 100644
index 00000000000..c7c41488180
--- /dev/null
+++ b/htdocs/langs/en_CA/compta.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - compta
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/en_CA/intracommreport.lang b/htdocs/langs/en_CA/intracommreport.lang
new file mode 100644
index 00000000000..76825d9b4ab
--- /dev/null
+++ b/htdocs/langs/en_CA/intracommreport.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+IntracommReportPeriod=Period of nalysis
diff --git a/htdocs/langs/en_CA/main.lang b/htdocs/langs/en_CA/main.lang
index 2fcf148aea0..6d4ce6e30f2 100644
--- a/htdocs/langs/en_CA/main.lang
+++ b/htdocs/langs/en_CA/main.lang
@@ -26,4 +26,3 @@ TotalVAT=Total GST
 TotalLT1=Total PST
 VAT=GST
 VATRate=GST rate
-CREATEInDolibarr=Record %s create
diff --git a/htdocs/langs/en_CA/products.lang b/htdocs/langs/en_CA/products.lang
new file mode 100644
index 00000000000..6e900475275
--- /dev/null
+++ b/htdocs/langs/en_CA/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/en_CA/stocks.lang b/htdocs/langs/en_CA/stocks.lang
deleted file mode 100644
index 0cf57e3a1c3..00000000000
--- a/htdocs/langs/en_CA/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/en_GB/accountancy.lang b/htdocs/langs/en_GB/accountancy.lang
index e87b321f445..9a42aff0270 100644
--- a/htdocs/langs/en_GB/accountancy.lang
+++ b/htdocs/langs/en_GB/accountancy.lang
@@ -1,14 +1,11 @@
 # Dolibarr language file - Source file is en_US - accountancy
 ACCOUNTING_EXPORT_PIECE=Export the number of pieces
-ConfigAccountingExpert=Configuration for the financial expert module
 Journalization=Journalisation
 BackToChartofaccounts=Return to chart of accounts
 OverviewOfAmountOfLinesNotBound=Overview of number of lines not bound to an finance account
 OverviewOfAmountOfLinesBound=Overview of number of lines already bound to an finance account
 DeleteCptCategory=Remove finance account from group
 JournalizationInLedgerStatus=Status of journals
-AlreadyInGeneralLedger=Already journalised in ledgers
-NotYetInGeneralLedger=Not yet journalised in ledgers
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalised finance group
 MainAccountForCustomersNotDefined=Main finance account for customers not defined in setup
 MainAccountForUsersNotDefined=Main finance account for users not defined in setup
@@ -26,7 +23,6 @@ AccountancyAreaDescProd=STEP %s: Define finance accounts for your products/servi
 AccountancyAreaDescBind=STEP %s: Checking links between existing %s lines and finance account is done, so application will be able to journalise transactions in Ledger with one click. To complete missing links use the menu entry %s.
 AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click button <strong>%s</strong>.
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make future modifications.
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not completed (accounting code journal not defined for all bank accounts)
 Addanaccount=Add a financial account
 AccountAccounting=Financial Account
 ShowAccountingAccount=Show finance account
@@ -71,8 +67,6 @@ AccountingCategory=Personalised groups
 GroupByAccountAccounting=Group by finance account
 AccountingAccountGroupsDesc=Here you can define some groups of financial accounts. They will be used for personalised accounting reports.
 ByPersonalizedAccountGroups=By personalised groups
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to this transaction will be deleted)
-DescJournalOnlyBindedVisible=This is a view of records that are linked to a finance account and can be posted into the Ledger.
 FeeAccountNotDefined=Account for fees not defined
 CustomerInvoicePayment=Payment by customer invoice
 NumMvts=Transaction Number
diff --git a/htdocs/langs/en_GB/intracommreport.lang b/htdocs/langs/en_GB/intracommreport.lang
new file mode 100644
index 00000000000..76825d9b4ab
--- /dev/null
+++ b/htdocs/langs/en_GB/intracommreport.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+IntracommReportPeriod=Period of nalysis
diff --git a/htdocs/langs/en_GB/main.lang b/htdocs/langs/en_GB/main.lang
index 9fb796ec07a..5617fe77778 100644
--- a/htdocs/langs/en_GB/main.lang
+++ b/htdocs/langs/en_GB/main.lang
@@ -40,4 +40,3 @@ Canceled=Cancelled
 Color=Colour
 NoPhotoYet=No picture available yet
 SearchIntoSupplierProposals=Vendor quotes
-CREATEInDolibarr=Record %s create
diff --git a/htdocs/langs/en_GB/products.lang b/htdocs/langs/en_GB/products.lang
index e707e316257..844ae30d7c1 100644
--- a/htdocs/langs/en_GB/products.lang
+++ b/htdocs/langs/en_GB/products.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - products
+CustomCode=Customs / Commodity / HS code
 PrintsheetForOneBarCode=Print several labels for one barcode
diff --git a/htdocs/langs/en_GB/stocks.lang b/htdocs/langs/en_GB/stocks.lang
index d1dcfa24f6f..ba358dbb241 100644
--- a/htdocs/langs/en_GB/stocks.lang
+++ b/htdocs/langs/en_GB/stocks.lang
@@ -8,10 +8,8 @@ NoPredefinedProductToDispatch=No predefined products for this object. So no disp
 IdWarehouse=Warehouse ID
 LieuWareHouse=Locality of warehouse
 EstimatedStockValueSellShort=Value of stock at selling price
-VirtualDiffersFromPhysical=According to stock movement options, physical stock (physical + current orders) and virtual stock may differ
 RuleForStockReplenishment=Rule for stock replenishment
 IsInPackage=Packaged
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different useby or sellby dates (found <strong>%s</strong> but you entered <strong>%s</strong>).
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so total of stock by sales value can't be calculated
 AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock level
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/en_GB/suppliers.lang b/htdocs/langs/en_GB/suppliers.lang
deleted file mode 100644
index 1028dda9bbc..00000000000
--- a/htdocs/langs/en_GB/suppliers.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - suppliers
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=This supplier is already associated with a Product: %s
diff --git a/htdocs/langs/en_IN/ecm.lang b/htdocs/langs/en_IN/ecm.lang
deleted file mode 100644
index 5df451bb632..00000000000
--- a/htdocs/langs/en_IN/ecm.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - ecm
-ECMDocsByProposals=Documents linked to quotations
diff --git a/htdocs/langs/en_IN/intracommreport.lang b/htdocs/langs/en_IN/intracommreport.lang
new file mode 100644
index 00000000000..76825d9b4ab
--- /dev/null
+++ b/htdocs/langs/en_IN/intracommreport.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+IntracommReportPeriod=Period of nalysis
diff --git a/htdocs/langs/en_IN/main.lang b/htdocs/langs/en_IN/main.lang
index 2012bdeac9d..46aef779403 100644
--- a/htdocs/langs/en_IN/main.lang
+++ b/htdocs/langs/en_IN/main.lang
@@ -23,4 +23,3 @@ CommercialProposalsShort=Quotations
 LinkToProposal=Link to quotation
 SearchIntoCustomerProposals=Quotations
 ContactDefault_propal=Quotation
-CREATEInDolibarr=Record %s create
diff --git a/htdocs/langs/en_IN/products.lang b/htdocs/langs/en_IN/products.lang
new file mode 100644
index 00000000000..6e900475275
--- /dev/null
+++ b/htdocs/langs/en_IN/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/en_IN/stocks.lang b/htdocs/langs/en_IN/stocks.lang
deleted file mode 100644
index 0cf57e3a1c3..00000000000
--- a/htdocs/langs/en_IN/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/en_SG/compta.lang b/htdocs/langs/en_SG/compta.lang
new file mode 100644
index 00000000000..c7c41488180
--- /dev/null
+++ b/htdocs/langs/en_SG/compta.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - compta
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/en_SG/intracommreport.lang b/htdocs/langs/en_SG/intracommreport.lang
new file mode 100644
index 00000000000..76825d9b4ab
--- /dev/null
+++ b/htdocs/langs/en_SG/intracommreport.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+IntracommReportPeriod=Period of nalysis
diff --git a/htdocs/langs/en_SG/main.lang b/htdocs/langs/en_SG/main.lang
index d7e1fe7e8a5..2e691473326 100644
--- a/htdocs/langs/en_SG/main.lang
+++ b/htdocs/langs/en_SG/main.lang
@@ -19,4 +19,3 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
-CREATEInDolibarr=Record %s create
diff --git a/htdocs/langs/en_SG/products.lang b/htdocs/langs/en_SG/products.lang
new file mode 100644
index 00000000000..6e900475275
--- /dev/null
+++ b/htdocs/langs/en_SG/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/en_SG/stocks.lang b/htdocs/langs/en_SG/stocks.lang
deleted file mode 100644
index 0cf57e3a1c3..00000000000
--- a/htdocs/langs/en_SG/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index adb87bcb8ca..41a4cfa59d5 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -20,10 +20,12 @@ CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
 ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=Journals
+Journals=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Chart of accounts
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
@@ -89,8 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
-ShowAccountingAccountInBookKeeping=Show accounting account in ledger
-ShowAccountingAccountInBookKeepingByAccount=Show accounting account in ledger by account
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bank accounts
@@ -112,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -193,7 +198,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -208,16 +214,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=By year
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -334,6 +340,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 1e64a5bfd04..b6784b75835 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
 CurrentTimeZone=TimeZone PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -372,7 +375,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=List of OpenDocument templates directories
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Position of Name/Lastname
@@ -403,7 +406,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -439,7 +442,7 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
@@ -450,7 +453,7 @@ LinkToTestClickToDial=Enter a phone number to call to show a link to test the Cl
 RefreshPhoneLink=Refresh link
 LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
 KeepEmptyToUseDefault=Keep empty to use default value
-KeepThisEmptyInMostCases=In most cases, you can keep this field empy. 
+KeepThisEmptyInMostCases=In most cases, you can keep this field empy.
 DefaultLink=Default link
 SetAsDefault=Set as default
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
@@ -480,9 +483,10 @@ ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
-WarningPHPMailA=- Using the server of the Email Service Provider increase the trustability of your email, so it increase the deliverablity without being flagging as SPAM
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
 WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
 WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
@@ -658,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -832,10 +836,11 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -978,6 +983,9 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 Permission64001=Allow direct printing
 Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
 Permission941601=Read receipts
 Permission941602=Create and modify receipts
 Permission941603=Validate receipts
@@ -1023,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1172,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1221,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1302,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Edition of field %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1320,8 +1333,8 @@ DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link o
 UsersSetup=Users module setup
 UserMailRequired=Email required to create a new user
 UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
-UsersDocModules=Document templates for documents generated from user record 
-GroupsDocModules=Document templates for documents generated from a group record 
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
@@ -1408,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Global parameters
@@ -1550,7 +1564,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1656,7 +1672,7 @@ AdvancedEditor=Advanced editor
 ActivateFCKeditor=Activate advanced editor for:
 FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
 FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1666,14 +1682,14 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu handler where to show new menu
 DetailMenuModule=Module name if menu entry come from a module
@@ -1722,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1890,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
-MailToProject=Projects page
+MailToProject=Projects
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -2002,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -2024,6 +2041,8 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2033,7 +2052,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\s([^\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body. 
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\s([^\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2057,5 +2076,14 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
 SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
\ No newline at end of file
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index 4ab87aa8420..8971e80a8f8 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -166,5 +166,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
-EventReminder=Event Reminder
\ No newline at end of file
+BrowserPush=Browser Popup Notification
\ No newline at end of file
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index 3cfa7ad2538..a0dc27f86c4 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -168,13 +168,15 @@ ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
 VariousPaymentId=Miscellaneous payment ID
 VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index d5d418affc6..76ea80b53c8 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -531,6 +531,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -575,3 +576,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/en_US/blockedlog.lang b/htdocs/langs/en_US/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/en_US/blockedlog.lang
+++ b/htdocs/langs/en_US/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index 14db79809bc..b8ba5073d03 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -102,6 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index 549646ab110..8e529fe92f2 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,8 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+ControlCashOpening=Control cash desk at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang
index c813f6d694f..ba37a43b4ec 100644
--- a/htdocs/langs/en_US/categories.lang
+++ b/htdocs/langs/en_US/categories.lang
@@ -81,6 +81,8 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 923ce91d74a..8a18520c2fc 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer 
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
 ProspectLevel=Prospect potential
@@ -458,4 +464,6 @@ MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Currency
 InEEC=Europe (EEC)
 RestOfEurope=Rest of Europe (EEC)
-OutOfEurope=Out of Europe (EEC)
\ No newline at end of file
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 715c3dfb8f5..18ee01eb3bb 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang
index bb61ed13bbe..2ebdda1e685 100644
--- a/htdocs/langs/en_US/cron.lang
+++ b/htdocs/langs/en_US/cron.lang
@@ -7,8 +7,8 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup=Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
@@ -47,6 +47,7 @@ CronNbRun=Number of launches
 CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -57,7 +58,7 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
@@ -83,3 +84,8 @@ MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
 DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/en_US/deliveries.lang b/htdocs/langs/en_US/deliveries.lang
index 1f48c01de75..fdfd6404a8a 100644
--- a/htdocs/langs/en_US/deliveries.lang
+++ b/htdocs/langs/en_US/deliveries.lang
@@ -27,5 +27,6 @@ Recipient=Recipient
 ErrorStockIsNotEnough=There's not enough stock
 Shippable=Shippable
 NonShippable=Not Shippable
+ShowShippableStatus=Show shippable status
 ShowReceiving=Show delivery receipt
 NonExistentOrder=Nonexistent order
diff --git a/htdocs/langs/en_US/ecm.lang b/htdocs/langs/en_US/ecm.lang
index 369ac6dfdfa..71df60734fb 100644
--- a/htdocs/langs/en_US/ecm.lang
+++ b/htdocs/langs/en_US/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Search by keywords
 ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to vendor proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index ba3beb753b5..501a3005860 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
 ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
@@ -245,6 +248,11 @@ ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
 ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -269,7 +277,9 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
 WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang
index 3549e3f8b23..a0eb7161ef2 100644
--- a/htdocs/langs/en_US/exports.lang
+++ b/htdocs/langs/en_US/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/en_US/hrm.lang b/htdocs/langs/en_US/hrm.lang
index 6cc7f6bef24..3b8f137e103 100644
--- a/htdocs/langs/en_US/hrm.lang
+++ b/htdocs/langs/en_US/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Employees
 Employee=Employee
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index 2d708c04147..63947dad154 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=This PHP supports sessions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/en_US/intracommreport.lang b/htdocs/langs/en_US/intracommreport.lang
new file mode 100644
index 00000000000..93c46f112bb
--- /dev/null
+++ b/htdocs/langs/en_US/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=List
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of analysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/en_US/languages.lang b/htdocs/langs/en_US/languages.lang
index 574ac2146dd..015e6dcfa25 100644
--- a/htdocs/langs/en_US/languages.lang
+++ b/htdocs/langs/en_US/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (USA)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 7e34db3d8b8..906394eb9c1 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -129,8 +129,8 @@ NotificationsAuto=Notifications Auto.
 NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
-AddNewNotification=Activate a new automatic email notification target/event
-ListOfActiveNotifications=List all active targets/events for automatic email notification
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
 ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
@@ -141,7 +141,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -163,9 +163,9 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
 DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 427a5a80d45..c32e4d01ddd 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -85,6 +85,8 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
+DedicatedPageAvailable=This is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -197,6 +199,7 @@ ReOpen=Re-Open
 Upload=Upload
 ToLink=Link
 Select=Select
+SelectAll=Select all
 Choose=Choose
 Resize=Resize
 ResizeOrCrop=Resize or Crop
@@ -257,6 +260,7 @@ Cards=Cards
 Card=Card
 Now=Now
 HourStart=Start hour
+Deadline=Deadline
 Date=Date
 DateAndHour=Date and hour
 DateToday=Today's date
@@ -265,8 +269,10 @@ DateStart=Start date
 DateEnd=End date
 DateCreation=Creation date
 DateCreationShort=Creat. date
+IPCreation=Creation IP
 DateModification=Modification date
 DateModificationShort=Modif. date
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
@@ -490,6 +496,7 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
+at=at
 to=to
 To=to
 and=and
@@ -883,6 +890,8 @@ Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1014,6 +1023,8 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
 SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Comments
 NbComments=Number of comments
@@ -1096,3 +1107,5 @@ DateOfBirth=Date of birth
 SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
 UpToDate=Up-to-date
 OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
\ No newline at end of file
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 1a1419aa6da..5812248b129 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -80,7 +80,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -177,6 +177,7 @@ MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang
index f4c6eb9246a..902f167d819 100644
--- a/htdocs/langs/en_US/mrp.lang
+++ b/htdocs/langs/en_US/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -77,4 +77,4 @@ UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
 GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
- 
\ No newline at end of file
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
\ No newline at end of file
diff --git a/htdocs/langs/en_US/multicurrency.lang b/htdocs/langs/en_US/multicurrency.lang
index bfcbd11fb7c..26313c6bfb9 100644
--- a/htdocs/langs/en_US/multicurrency.lang
+++ b/htdocs/langs/en_US/multicurrency.lang
@@ -20,3 +20,19 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 AmountToOthercurrency=Amount To (in currency of receiving account)
 CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
 MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
+TabTitleMulticurrencyRate=Rate list
+ListCurrencyRate=List of exchange rates for the currency
+CreateRate=Create a rate
+FormCreateRate=Rate creation
+FormUpdateRate=Rate modification
+successRateCreate=Rate for currency %s has been added to the database
+ConfirmDeleteLineRate=Are you sure you want to remove the %s rate for currency %s on %s date?
+DeleteLineRate=Clear rate
+successRateDelete=Rate deleted
+errorRateDelete=Error when deleting the rate
+successUpdateRate=Modification made
+ErrorUpdateRate=Error when changing the rate
+Codemulticurrency=currency code
+UpdateRate=change the rate
+CancelUpdate=cancel
+NoEmptyRate=The rate field must not be empty
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 51f547dbdce..8c30b2e02c1 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -167,8 +167,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +241,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
@@ -287,6 +289,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
@@ -339,6 +342,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/en_US/recruitment.lang b/htdocs/langs/en_US/recruitment.lang
index 52290baf926..437445f25dc 100644
--- a/htdocs/langs/en_US/recruitment.lang
+++ b/htdocs/langs/en_US/recruitment.lang
@@ -45,28 +45,32 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
-JobClosedTextCandidateFound=The job offer is closed. The position has been filled.
-JobClosedTextCanceled=The job offer is closed.
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index e1cb168500a..73bd9aebd42 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Other shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Shipments to validate
 StatusSendingCanceled=Canceled
+StatusSendingCanceledShort=Canceled
 StatusSendingDraft=Draft
 StatusSendingValidated=Validated (products to ship or already shipped)
 StatusSendingProcessed=Processed
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index ac97c24085c..d2c1b2cb382 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock) 
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang
index 51562b8bb7a..03b03c75269 100644
--- a/htdocs/langs/en_US/suppliers.lang
+++ b/htdocs/langs/en_US/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index cf370fbdca0..68a8f708741 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -231,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index d6ffb849aa8..996ba20ab7d 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -75,6 +75,7 @@ CreateInternalUserDesc=This form allows you to create an internal user in your c
 InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
+UserWillBe=Created user will be
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
 UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
 IdPhoneCaller=Id phone caller
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index c32fcd06f09..b6dbee28994 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -135,4 +134,6 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
-RegenerateWebsiteContent=Regenerate web site cache files
\ No newline at end of file
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
\ No newline at end of file
diff --git a/htdocs/langs/es_AR/accountancy.lang b/htdocs/langs/es_AR/accountancy.lang
index 840011bc481..96c58aaf400 100644
--- a/htdocs/langs/es_AR/accountancy.lang
+++ b/htdocs/langs/es_AR/accountancy.lang
@@ -11,9 +11,8 @@ ACCOUNTING_EXPORT_PREFIX_SPEC=Especificar el prefijo para el nombre de archivo
 DefaultForService=Predeterminado para servicio
 DefaultForProduct=Predeterminado para producto
 AccountancySetupDoneFromAccountancyMenu=La mayor parte de la configuración de la contabilidad se hace desde el menú %s
-ConfigAccountingExpert=Experto en la configuración del módulo contabilidad
 Journalization=Contabilización
-Journaux=Diarios Contables
+Journals=Diarios Contables
 JournalFinancial=Diarios Financieros
 AssignDedicatedAccountingAccount=Nueva cuenta para asignar
 InvoiceLabel=Etiqueta de la factura
diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang
index 716fc69f6c6..6b938db0388 100644
--- a/htdocs/langs/es_AR/admin.lang
+++ b/htdocs/langs/es_AR/admin.lang
@@ -54,7 +54,6 @@ DisableJavascriptNote=Nota: Para fines de prueba o debug. Para la optimización
 UseSearchToSelectCompanyTooltip=Además, si tiene un gran número de terceros (> 100 000), puede aumentar la velocidad configurando la constante COMPANY_DONOTSEARCH_ANYWHERE en 1 en Configuración-> Otro. La búsqueda se limitará entonces al inicio de la cadena.
 UseSearchToSelectContactTooltip=Además, si tiene un gran número de terceros (> 100 000), puede aumentar la velocidad configurando la constante CONTACT_DONOTSEARCH_ANYWHERE en 1 en Configuración-> Otro. La búsqueda se limitará entonces al inicio de la cadena.
 DelaiedFullListToSelectCompany=Espere hasta que se presione una tecla antes de cargar el contenido de la lista de combo de terceros<br>. Esto puede aumentar el rendimiento si tiene un gran número de terceros, pero es menos conveniente.
-DelaiedFullListToSelectContact=Espere hasta que se presione una tecla antes de cargar el contenido de la lista de combo de contactos. <br> Esto puede aumentar el rendimiento si tiene una gran cantidad de contactos, pero es menos conveniente.
 NumberOfKeyToSearch=Número de caracteres para ejecutar la búsqueda: %s
 NumberOfBytes=Cantidad de bytes
 NotAvailableWhenAjaxDisabled=No disponible cuando Ajax deshabilitado
@@ -196,7 +195,6 @@ SpaceX=Espacio X
 SpaceY=Espacio Y
 Emails=Correos electronicos
 EMailsSetup=Configuración de correos electrónicos
-EMailsDesc=Esta página le permite anular sus parámetros de PHP predeterminados para el envío de correo electrónico. En la mayoría de los casos en Unix / Linux OS, la configuración de PHP es correcta y estos parámetros no son necesarios.
 EmailSenderProfiles=Perfil del enviador de correos electrónicos
 EMailsSenderProfileDesc=Puedes dejar esta sección vacía. Si ingresas algunos correos aquí, se agregarán a la lista de posibles remitentes en el cuadro combinado cuando escribas un nuevo correo.
 MAIN_MAIL_SMTP_PORT=Puerto SMTP / SMTPS (valor predeterminado en php.ini: <b> %s </b>)
@@ -415,7 +413,6 @@ AddRefInList=Mostrar la lista de referencia cliente / vendedor (lista de selecci
 AddAdressInList=Mostrar la lista de información de la dirección del cliente / proveedor (seleccionar lista o combobox) <br> Los terceros aparecerán con un formato de nombre de "The Big Company corp. - 21 jump street 123456 Big town - USA" en lugar de "The Big Company corp".
 AskForPreferredShippingMethod=Pregunte por el método de envío preferido para terceros.
 FillThisOnlyIfRequired=Ejemplo: +2 (rellenar solo si se experimentan problemas de compensación de zona horaria)
-PasswordGenerationStandard=Devuelva una contraseña generada de acuerdo con el algoritmo interno de Dolibarr: 8 caracteres que contienen números compartidos y caracteres en minúscula.
 PasswordGenerationNone=No sugiera una contraseña generada. La contraseña debe escribirse manualmente.
 PasswordGenerationPerso=Devuelva una contraseña de acuerdo con su configuración definida personalmente.
 SetupPerso=Según su configuración
@@ -554,7 +551,7 @@ MailToSendSupplierRequestForQuotation=Solicitud de presupuesto
 MailToSendSupplierOrder=Ordenes de compra
 MailToSendSupplierInvoice=Facturas de proveedores
 MailToSendContract=Los contratos
-MailToProject=Página de proyectos
+MailToProject=Projectos
 ByDefaultInList=Mostrar por defecto en la vista de lista
 YouUseLastStableVersion=Usas la última versión estable
 TitleExampleForMajorRelease=Ejemplo de mensaje que puede usar para anunciar esta versión principal (no dude en usarlo en sus sitios web)
@@ -623,5 +620,4 @@ DisabledResourceLinkUser=Deshabilitar la función para vincular un recurso a los
 DisabledResourceLinkContact=Deshabilitar función para vincular un recurso a contactos
 ConfirmUnactivation=Confirmar el reinicio del módulo
 OnMobileOnly=Solo en pantalla pequeña (teléfono inteligente)
-DisableProspectCustomerType=Deshabilite el tipo de tercero "Prospect + Customer" (por lo tanto, el tercero debe ser Prospect o Customer pero no pueden ser ambos)
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_AR/companies.lang b/htdocs/langs/es_AR/companies.lang
index 615e978d85a..5e7e576b77f 100644
--- a/htdocs/langs/es_AR/companies.lang
+++ b/htdocs/langs/es_AR/companies.lang
@@ -119,7 +119,6 @@ ProfId1MA=ID Prof 1 (RC)
 ProfId2MA=ID Prof 2 (Patente)
 ProfId3MA=ID Prof 3 (IF)
 ProfId4MA=ID Prof 4 (CNSS)
-ProfId5MA=ID Prof 5 (ICE)
 ProfId1MX=ID Prof 1 (RFC)
 ProfId2MX=ID Prof 2 (RP IMSS)
 ProfId3MX=ID Prof 3 (Charter Profesional)
@@ -136,7 +135,7 @@ ProfId1US=ID Prof (FEIN)
 ProfId1RO=ID Prof 1 (CUI)
 ProfId2RO=ID Prof 2 (NI)
 ProfId3RO=ID Prof 3 (CAEN)
-ProfId5RO=ID Prof 5 (EUID)
+ProfId4RO=ID Prof 5 (EUID)
 ProfId1RU=ID Prof 1 (OGRN)
 ProfId2RU=ID Prof 2 (INN)
 ProfId3RU=ID Prof 3 (KPP)
@@ -189,6 +188,7 @@ CompanyDeleted=Empresa "%s" eliminada de la base de datos
 ListOfContacts=Lista de contactos/direcciones
 ListOfContactsAddresses=Lista de contactos/direcciones
 ListOfThirdParties=Lista de terceros
+ShowContact=Contacto-Dirección
 ContactType=Tipo de Contacto
 ContactForOrders=Contacto de la orden
 ContactForOrdersOrShipments=Contacto de la orden o su envío
@@ -269,6 +269,7 @@ SaleRepresentativeFirstname=Nombre del vendedor
 SaleRepresentativeLastname=Apellido del vendedor
 ErrorThirdpartiesMerge=Se produjo un error al eliminar los terceros. Por favor revisa el registro. Los cambios se han reversado.
 NewCustomerSupplierCodeProposed=Código de cliente o proveedor ya utilizado, se ha sugerido un nuevo código
+KeepEmptyIfGenericAddress=Mantenga este campo vacío si esta dirección es una dirección genérica
 PaymentTypeBoth=Tipo de pago - cliente y proveedor
 MulticurrencyUsed=Usar diferentes monedas
 MulticurrencyCurrency=Moneda
diff --git a/htdocs/langs/es_AR/ecm.lang b/htdocs/langs/es_AR/ecm.lang
index 960a8ceef4d..a668d35a6b8 100644
--- a/htdocs/langs/es_AR/ecm.lang
+++ b/htdocs/langs/es_AR/ecm.lang
@@ -21,19 +21,6 @@ ECMSectionWasCreated=Carpeta <b>%s</b> ha sido creada.
 ECMSearchByKeywords=Búsqueda por palabras clave
 ECMSearchByEntity=Búsqueda por objeto
 ECMSectionOfDocuments=Carpetas de documentos
-ECMDocsBySocialContributions=Documentos vinculados a impuestos fiscales o sociales
-ECMDocsByThirdParties=Documentos vinculados a terceros
-ECMDocsByProposals=Documentos vinculados a propuestas
-ECMDocsByOrders=Documentos vinculados a órdenes de cliente
-ECMDocsByContracts=Documentos vinculados a contratos
-ECMDocsByInvoices=Documentos vinculados a facturas de cliente
-ECMDocsByProducts=Documentos vinculados a productos
-ECMDocsByProjects=Documentos vinculados a proyectos
-ECMDocsByUsers=Documentos vinculados a usuarios
-ECMDocsByInterventions=Documentos vinculados a intervenciones
-ECMDocsByExpenseReports=Documentos vinculados a reportes de gastos
-ECMDocsByHolidays=Documentos vinculados a vacaciones
-ECMDocsBySupplierProposals=Documentos vinculados a propuestas de proveedor
 ECMNoDirectoryYet=No hay carpetas creadas
 ShowECMSection=Mostrar carpeta
 DeleteSection=Eliminar carpeta
diff --git a/htdocs/langs/es_AR/intracommreport.lang b/htdocs/langs/es_AR/intracommreport.lang
new file mode 100644
index 00000000000..0f08616a628
--- /dev/null
+++ b/htdocs/langs/es_AR/intracommreport.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+MenuIntracommReportList=Lista
+IntracommReportPeriod=Period of nalysis
diff --git a/htdocs/langs/es_AR/members.lang b/htdocs/langs/es_AR/members.lang
index 89e31bb3375..1c0210878b3 100644
--- a/htdocs/langs/es_AR/members.lang
+++ b/htdocs/langs/es_AR/members.lang
@@ -13,13 +13,10 @@ MembersCards=Cartas de presentación de miembros
 MembersList=Lista de miembros
 MembersListToValid=Lista de miembros en estado borrador (a ser validados)
 MembersListValid=Lista de miembros válidos
-MembersListUpToDate=Lista de miembros válidos con suscripción al día
-MembersListNotUpToDate=Lista de miembros válidos con suscripción vencida
 MembersListResiliated=Lista de miembros terminados
 MembersListQualified=Lista de miembros calificados
 MenuMembersToValidate=Miembros en Borrador
 MenuMembersValidated=Miembros válidos
-MenuMembersNotUpToDate=Miembros vencidos
 MenuMembersResiliated=Miembros terminados
 MembersWithSubscriptionToReceive=Miembros con suscripción para recibir
 MembersWithSubscriptionToReceiveShort=Suscripción para recibir
diff --git a/htdocs/langs/es_AR/mrp.lang b/htdocs/langs/es_AR/mrp.lang
index a8b70a8377e..0fcf28a866f 100644
--- a/htdocs/langs/es_AR/mrp.lang
+++ b/htdocs/langs/es_AR/mrp.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - mrp
 Mrp=Ordenes de Fabricación
-MO=Orden de Fabricación
+ManufacturingOrder=Orden de Fabricación
 MRPDescription=Módulo para administrar producción y Ordenes de Fabricación (OF).
 MRPArea=Area MRP
 MrpSetupPage=Configuración de módulo MRP
diff --git a/htdocs/langs/es_AR/paybox.lang b/htdocs/langs/es_AR/paybox.lang
index cfb35349278..54d629f8cee 100644
--- a/htdocs/langs/es_AR/paybox.lang
+++ b/htdocs/langs/es_AR/paybox.lang
@@ -16,7 +16,6 @@ YourPaymentHasBeenRecorded=Esta página confirma que su pago ha sido registrado.
 YourPaymentHasNotBeenRecorded=Su pago NO ha sido registrado y la transacción ha sido cancelada. Gracias.
 InformationToFindParameters=Ayuda para encontrar la información de su cuenta %s
 PAYBOX_CGI_URL_V2=URL del módulo CGI para pago con Paybox
-VendorName=Nombre del proveedor
 CSSUrlForPaymentForm=URL de hoja de estilo CSS para formulario de pago
 NewPayboxPaymentReceived=Nuevo pago de Paybox recibido
 NewPayboxPaymentFailed=Se intentó un nuevo pago de Paybox pero falló
diff --git a/htdocs/langs/es_AR/products.lang b/htdocs/langs/es_AR/products.lang
index 10ea57249c6..1b8705686ca 100644
--- a/htdocs/langs/es_AR/products.lang
+++ b/htdocs/langs/es_AR/products.lang
@@ -63,7 +63,6 @@ PriceRemoved=Precio removido
 SetDefaultBarcodeType=Definir tipo de código de barras
 NoteNotVisibleOnBill=Nota (No visible en facturas, presupuestos...)
 ServiceLimitedDuration=Si un producto es un servicio con duración limitada:
-AssociatedProducts=Productos virtuales
 KeywordFilter=Filtro por Palabra Clave
 CategoryFilter=Filtro por Categoría
 ExportDataset_produit_1=Productos
@@ -74,3 +73,4 @@ PriceQtyMin=Precio para cantidad mín.
 PriceQtyMinCurrency=Precio (moneda) para esta cant. (sin descuento)
 PredefinedProductsToSell=Producto Predefinido
 SuppliersPrices=Precio de Proveedor
+CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/es_AR/recruitment.lang b/htdocs/langs/es_AR/recruitment.lang
index 63df7968f48..d9a525fe50a 100644
--- a/htdocs/langs/es_AR/recruitment.lang
+++ b/htdocs/langs/es_AR/recruitment.lang
@@ -7,8 +7,5 @@ RecruitmentAbout =Acerca de contrataciones
 RecruitmentAboutPage =Sitio de Acerca de contrataciones
 NbOfEmployeesExpected=Cantidad esperada de trabajadores
 JobLabel=Etiqueta de puesto de trabajo
-WorkPlace=Lugar de trabajo
-DateExpected=Fecha esperada
-FutureManager=Futuro gerente
 ResponsibleOfRecruitement=Responsable de contrataciones
 IfJobIsLocatedAtAPartner=Si el trabajo se encuentra en un lugar asociado
diff --git a/htdocs/langs/es_AR/suppliers.lang b/htdocs/langs/es_AR/suppliers.lang
index dc19381abf8..e6c3154b840 100644
--- a/htdocs/langs/es_AR/suppliers.lang
+++ b/htdocs/langs/es_AR/suppliers.lang
@@ -1,17 +1,15 @@
 # Dolibarr language file - Source file is en_US - suppliers
 SuppliersInvoice=Factura de Proveedor
 ShowSupplierInvoice=Mostrar Factura de Proveedor
-NewSupplier=Nuevo Proveedor
-ListOfSuppliers=Lista de Proveedores
+ListOfSuppliers=Lista de proveedores
 ShowSupplier=Mostrar Proveedor
 OrderDate=Fecha de la Orden
 TotalBuyingPriceMinShort=Total de precios de compra de subproductos
 TotalSellingPriceMinShort=Total de precios de venta de subproductos
 AddSupplierPrice=Agregar precio de compra
-SupplierPrices=Precio de Proveedor
+SupplierPrices=Precios de proveedor
 NoRecordedSuppliers=No hay proveedor registrado
-SupplierPayment=Pago de Proveedor
-SuppliersArea=Area de Proveedor
+SuppliersArea=Area de proveedores
 RefSupplierShort=Ref. Proveedor
 ExportDataset_fournisseur_1=Facturas de proveedor y su detalle
 ExportDataset_fournisseur_2=Facturas de proveedor y sus pagos
@@ -33,5 +31,5 @@ DoNotOrderThisProductToThisSupplier=No solicitar
 NotTheGoodQualitySupplier=Baja calidad
 BuyerName=Nombre de comprador
 AllProductServicePrices=Todos los precios de productos / servicios
-AllProductReferencesOfSupplier=Todas las referencias de proveedor de productos / servicios
-BuyingPriceNumShort=Precio de Proveedor
+AllProductReferencesOfSupplier=Todas las referencias de proveedor
+BuyingPriceNumShort=Precio de proveedor
diff --git a/htdocs/langs/es_BO/compta.lang b/htdocs/langs/es_BO/compta.lang
new file mode 100644
index 00000000000..c7c41488180
--- /dev/null
+++ b/htdocs/langs/es_BO/compta.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - compta
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/es_BO/intracommreport.lang b/htdocs/langs/es_BO/intracommreport.lang
new file mode 100644
index 00000000000..76825d9b4ab
--- /dev/null
+++ b/htdocs/langs/es_BO/intracommreport.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+IntracommReportPeriod=Period of nalysis
diff --git a/htdocs/langs/es_BO/products.lang b/htdocs/langs/es_BO/products.lang
new file mode 100644
index 00000000000..6e900475275
--- /dev/null
+++ b/htdocs/langs/es_BO/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/es_CL/accountancy.lang b/htdocs/langs/es_CL/accountancy.lang
index 82fd0408318..764defc64a4 100644
--- a/htdocs/langs/es_CL/accountancy.lang
+++ b/htdocs/langs/es_CL/accountancy.lang
@@ -13,9 +13,8 @@ DefaultForService=Predeterminado para servicio
 DefaultForProduct=Predeterminado para producto
 CantSuggest=No puedo sugerir
 AccountancySetupDoneFromAccountancyMenu=La mayoría de las configuraciones de la contabilidad se realizan desde el menú %s
-ConfigAccountingExpert=Configuración del módulo Contabilidad Experta
 Journalization=Periodización
-Journaux=Revistas
+Journals=Revistas
 JournalFinancial=Diarios financieras
 BackToChartofaccounts=Volver al gráfico de cuentas
 Chartofaccounts=Gráfico de cuentas
@@ -26,13 +25,10 @@ OverviewOfAmountOfLinesNotBound=Descripción general de la cantidad de líneas n
 OverviewOfAmountOfLinesBound=Descripción general de la cantidad de líneas ya vinculadas a una cuenta de contabilidad
 ConfirmDeleteCptCategory=¿Está seguro de que desea eliminar esta cuenta contable del grupo de cuentas contables?
 JournalizationInLedgerStatus=Estado de la periodización
-AlreadyInGeneralLedger=Ya se ha contabilizado en libros mayores
-NotYetInGeneralLedger=Aún no se ha contabilizado en libros mayores
 GroupIsEmptyCheckSetup=El grupo está vacío, verifique la configuración del grupo de contabilidad personalizado
 DetailByAccount=Mostrar detalles por cuenta
 AccountWithNonZeroValues=Cuentas con valores distintos de cero.
 CountriesInEECExceptMe=Países en EEC excepto %s
-AccountantFiles=Documentos contables de exportación
 MainAccountForCustomersNotDefined=Cuenta de contabilidad principal para los clientes no definidos en la configuración
 MainAccountForSuppliersNotDefined=Cuenta de contabilidad principal para proveedores no definidos en la configuración
 MainAccountForUsersNotDefined=Cuenta de contabilidad principal para los usuarios no definidos en la configuración
@@ -58,7 +54,6 @@ AccountancyAreaDescBind=PASO %s: verifique que el enlace entre las líneas %s ex
 AccountancyAreaDescWriteRecords=PASO %s: Escriba transacciones en el Libro mayor. Para esto, vaya al menú <strong>%s</strong>, y haga clic en el botón <strong>%s</strong>.
 AccountancyAreaDescAnalyze=PASO %s: Agregue o edite las transacciones existentes y genere informes y exportaciones.
 AccountancyAreaDescClosePeriod=PASO %s: Cierre el período para que no podamos realizar modificaciones en el futuro.
-TheJournalCodeIsNotDefinedOnSomeBankAccount=Un paso obligatorio en la configuración no fue completo (diario de códigos de contabilidad no definido para todas las cuentas bancarias)
 Selectchartofaccounts=Seleccione gráfico de cuentas activo
 Addanaccount=Agregar cuenta contable
 SubledgerAccount=Cuenta auxiliar
@@ -79,7 +74,6 @@ ExpenseReportsVentilation=Encuadernación del informe de gastos
 CreateMvts=Crear nueva transacción
 UpdateMvts=Modificación de una transacción
 ValidTransaction=Validar transacción
-WriteBookKeeping=Registrar transacciones en Ledger
 Bookkeeping=Libro mayor
 ObjectsRef=Referencia de objeto de origen
 CAHTF=Total vendedor comprado antes de impuestos
@@ -134,13 +128,11 @@ JournalLabel=Etiqueta de revista
 NumPiece=Pieza número
 TransactionNumShort=Num. transacción
 AccountingAccountGroupsDesc=Puede definir aquí algunos grupos de cuentas contables. Se usarán para informes de contabilidad personalizados.
-DeleteMvt=Eliminar líneas de libro mayor
 DelYear=Año para borrar
 DelJournal=Diario para eliminar
 FinanceJournal=Diario de finanzas
 ExpenseReportsJournal=Diario de informes de gastos
 DescFinanceJournal=Diario financiero que incluye todos los tipos de pagos por cuenta bancaria
-DescJournalOnlyBindedVisible=Esta es una vista de registro que está vinculada a una cuenta de contabilidad y se puede registrar en el Libro mayor.
 VATAccountNotDefined=Cuenta para el IVA no definido
 ThirdpartyAccountNotDefined=Cuenta para un tercero no definido
 ProductAccountNotDefined=Cuenta para producto no definido
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index c4fae1266ad..71fb8fe9887 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -52,7 +52,6 @@ DisableJavascriptNote=Nota: Para propósitos de prueba o depuración. Para la op
 UseSearchToSelectCompanyTooltip=Además, si tiene un gran número de terceros (> 100 000), puede aumentar la velocidad estableciendo constante COMPANY_DONOTSEARCH_ANYWHERE en 1 en Configuración-> Otro. La búsqueda se limitará al inicio de la cadena.
 UseSearchToSelectContactTooltip=Además, si tiene un gran número de terceros (> 100 000), puede aumentar la velocidad estableciendo CONTACT_DONOTSEARCH_ANYWHERE constante en 1 en Configuración-> Otro. La búsqueda se limitará al inicio de la cadena.
 DelaiedFullListToSelectCompany=Espere hasta que se presione una tecla antes de cargar el contenido de la lista de combo de Terceros. <br> Esto puede aumentar el rendimiento si tiene un gran número de terceros, pero es menos conveniente.
-DelaiedFullListToSelectContact=Espere hasta que se presione una tecla antes de cargar el contenido de la lista de combo de contactos. <br> Esto puede aumentar el rendimiento si tiene una gran cantidad de contactos, pero es menos conveniente.
 NumberOfKeyToSearch=Número de caracteres para activar la búsqueda: %s
 NumberOfBytes=Número de bytes
 SearchString=Cadena de búsqueda
@@ -186,7 +185,6 @@ SpaceX=Espacio X
 SpaceY=Espacio Y
 Emails=Correos electrónicos
 EMailsSetup=Configuración de correos electrónicos
-EMailsDesc=Esta página le permite anular sus parámetros de PHP predeterminados para el envío de correo electrónico. En la mayoría de los casos en Unix / Linux OS, la configuración de PHP es correcta y estos parámetros no son necesarios.
 EmailSenderProfiles=Perfiles de remitentes de correos electrónicos
 EMailsSenderProfileDesc=Puedes mantener esta sección vacía. Si ingresa algunos correos electrónicos aquí, se agregarán a la lista de posibles remitentes en el cuadro combinado cuando escriba un nuevo correo electrónico.
 MAIN_MAIL_SMTP_PORT=Puerto SMTP / SMTPS (valor predeterminado en php.ini: <b>%s</b> )
@@ -314,9 +312,7 @@ ExtrafieldParamHelpPassword=Si deja este campo en blanco, significa que este val
 ExtrafieldParamHelpselect=La lista de valores debe ser líneas con clave de formato, valor (donde la clave no puede ser &#39;0&#39;) <br><br> por ejemplo: <br> 1, valor1 <br> 2, valor2 <br> código3, valor3 <br> ... <br><br> Para tener la lista dependiendo de otra lista de atributos complementarios: <br> 1, value1 | options_ <i>parent_list_code</i> : parent_key <br> 2, value2 | options_ <i>parent_list_code</i> : parent_key <br><br> Para tener la lista dependiendo de otra lista: <br> 1, valor1 | <i>parent_list_code</i> : parent_key <br> 2, valor2 | <i>parent_list_code</i> : parent_key
 ExtrafieldParamHelpcheckbox=La lista de valores debe ser líneas con clave de formato, valor (donde la clave no puede ser &#39;0&#39;) <br><br> por ejemplo: <br> 1, valor1 <br> 2, valor2 <br> 3, valor3 <br> ...
 ExtrafieldParamHelpradio=La lista de valores debe ser líneas con clave de formato, valor (donde la clave no puede ser &#39;0&#39;) <br><br> por ejemplo: <br> 1, valor1 <br> 2, valor2 <br> 3, valor3 <br> ...
-ExtrafieldParamHelpsellist=La lista de valores proviene de una tabla. <br> Sintaxis: table_name: label_field: id_field :: filter <br> Ejemplo: c_typent: libelle: id :: filter <br><br> - idfilter es necesariamente una clave int primaria <br> - el filtro puede ser una prueba simple (por ejemplo, activo = 1) para mostrar solo el valor activo <br> También puede usar $ ID $ en el filtro, que es la identificación actual del objeto actual <br> Para hacer un SELECCIONAR en filtro usa $ SEL $ <br> Si desea filtrar en campos adicionales use la sintaxis extra.fieldcode = ... (donde código de campo es el código de campo adicional) <br><br> Para tener la lista dependiendo de otra lista de atributos complementarios: <br> c_typent: libelle: id: options_ <i>parent_list_code</i> | parent_column: filter <br><br> Para tener la lista dependiendo de otra lista: <br> c_typent: libelle: id: <i>parent_list_code</i> | parent_column: filter
 ExtrafieldParamHelpchkbxlst=La lista de valores proviene de una tabla. <br> Sintaxis: table_name: label_field: id_field :: filter <br> Ejemplo: c_typent: libelle: id :: filter <br><br> El filtro puede ser una prueba simple (por ejemplo, activo = 1) para mostrar solo el valor activo <br> También puede usar $ ID $ en el filtro, que es la identificación actual del objeto actual <br> Para hacer un SELECCIONAR en filtro usa $ SEL $ <br> Si desea filtrar en campos adicionales use la sintaxis extra.fieldcode = ... (donde código de campo es el código de campo adicional) <br><br> Para tener la lista dependiendo de otra lista de atributos complementarios: <br> c_typent: libelle: id: options_ <i>parent_list_code</i> | parent_column: filter <br><br> Para tener la lista dependiendo de otra lista: <br> c_typent: libelle: id: <i>parent_list_code</i> | parent_column: filter
-ExtrafieldParamHelplink=Los parámetros deben ser ObjectName: Classpath <br> Sintaxis: ObjectName: Classpath <br> Ejemplos: <br> Societe: societe / class / societe.class.php <br> Contacto: contact / class / contact.class.php
 ExtrafieldParamHelpSeparator=Mantener vacío para un separador simple <br> Establezca esto en 1 para un separador de colapso (abierto de forma predeterminada para una nueva sesión, luego el estado se mantiene para cada sesión de usuario) <br> Establezca esto en 2 para un separador de colapso (colapsado por defecto para una nueva sesión, luego el estado se mantiene para cada sesión de usuario)
 LibraryToBuildPDF=Biblioteca utilizada para la generación de PDF
 LocalTaxDesc=Algunos países pueden aplicar dos o tres impuestos en cada línea de factura. Si este es el caso, elija el tipo para el segundo y tercer impuesto y su tasa. Los tipos posibles son: <br> 1: el impuesto local se aplica a los productos y servicios sin IVA (el impuesto local se calcula sobre el monto sin impuestos) <br> 2: el impuesto local se aplica a los productos y servicios, incluido el IVA <br> 3: el impuesto local se aplica a los productos sin IVA (el impuesto local se calcula sobre el monto sin impuestos) <br> 4: el impuesto local se aplica a los productos, incluido el IVA <br> 5: el impuesto local se aplica a los servicios sin IVA (el impuesto local se calcula sobre el monto sin impuestos) <br> 6: el impuesto local se aplica a los servicios, incluido el IVA (el impuesto local se calcula sobre el monto + impuesto)
@@ -346,7 +342,6 @@ ModuleCompanyCodeCustomerDigitaria=%s seguido del nombre del cliente truncado po
 ModuleCompanyCodeSupplierDigitaria=%s seguido del nombre del proveedor truncado por el número de caracteres: %s para el código de contabilidad del proveedor.
 Use3StepsApproval=De forma predeterminada, los pedidos de compra deben ser creados y aprobados por 2 usuarios diferentes (un paso / usuario para crear y un paso / usuario para aprobar. Tenga en cuenta que si el usuario tiene ambos permisos para crear y aprobar, un paso / usuario será suficiente) . Puede solicitar con esta opción que presente un tercer paso / aprobación del usuario, si el monto es mayor que un valor dedicado (por lo que se necesitarán 3 pasos: 1 = validación, 2 = primera aprobación y 3 = segunda aprobación si el monto es suficiente). <br> Configure esto como vacío si una aprobación (2 pasos) es suficiente, configúrelo a un valor muy bajo (0.1) si siempre se requiere una segunda aprobación (3 pasos).
 UseDoubleApproval=Utilice una aprobación de 3 pasos cuando la cantidad (sin impuestos) sea más alta que ...
-WarningPHPMail=ADVERTENCIA: a menudo es mejor configurar los correos electrónicos salientes para usar el servidor de correo electrónico de su proveedor en lugar de la configuración predeterminada. Algunos proveedores de correo electrónico (como Yahoo) no le permiten enviar un correo electrónico desde otro servidor que no sea su propio servidor. Su configuración actual utiliza el servidor de la aplicación para enviar correo electrónico y no el servidor de su proveedor de correo electrónico, por lo que algunos destinatarios (el compatible con el protocolo DMARC restrictivo) le preguntarán a su proveedor de correo electrónico si pueden aceptar su correo electrónico y algunos proveedores de correo electrónico. (como Yahoo) puede responder &quot;no&quot; porque el servidor no es de ellos, por lo que pocos de sus correos electrónicos enviados no serán aceptados (tenga cuidado también con la cuota de envío de su proveedor de correo electrónico). <br> Si su proveedor de correo electrónico (como Yahoo) tiene esta restricción, debe cambiar la configuración de correo electrónico para elegir el otro método &quot;Servidor SMTP&quot; e ingresar el servidor SMTP y las credenciales proporcionadas por su proveedor de correo electrónico.
 WarningPHPMail2=Si su proveedor SMTP de correo electrónico necesita restringir el cliente de correo electrónico a algunas direcciones IP (muy raras), esta es la dirección IP del agente de usuario de correo (MUA) para su aplicación ERP CRM: <strong> %s </ strong>.
 ClickToShowDescription=Haga clic para mostrar la descripción
 DependsOn=Este módulo necesita el módulo (s)
@@ -391,7 +386,6 @@ Module52Desc=Gestion de Stocks
 Module54Desc=Gestión de contratos (servicios o suscripciones recurrentes).
 Module55Desc=Gestión del código de barras
 Module58Desc=Integración de un sistema ClickToDial (Asterisk, ...)
-Module59Desc=Agregar función para generar una cuenta de Bookmark4u desde una cuenta de Dolibarr
 Module70Desc=Gestión de intervención
 Module75Name=Notas de gastos y viaje
 Module75Desc=Gestión de gastos y viajes
@@ -460,7 +454,6 @@ Module50200Desc=Ofrezca a los clientes una página de pago en línea de PayPal (
 Module50300Name=Raya
 Module50300Desc=Ofrezca a los clientes una página de pago en línea de Stripe (tarjetas de crédito / débito). Esto se puede usar para permitir que sus clientes realicen pagos ad-hoc o pagos relacionados con un objeto Dolibarr específico (factura, pedido, etc.)
 Module50400Name=Contabilidad (doble entrada)
-Module50400Desc=Gestión contable (entradas dobles, soporte de contabilidad general y auxiliar). Exportar el libro mayor en varios otros formatos de software de contabilidad.
 Module54000Desc=Impresión directa (sin abrir los documentos) mediante la interfaz IPP de Cups (la impresora debe estar visible desde el servidor y CUPS debe estar instalada en el servidor).
 Module55000Name=Encuesta, encuesta o voto
 Module55000Desc=Cree encuestas en línea, encuestas o votos (como Doodle, Studs, RDVz, etc.)
@@ -470,7 +463,6 @@ Module62000Desc=Añadir características para gestionar Incoterms.
 Module63000Desc=Gestionar recursos (impresoras, coches, salas, ...) para asignar a eventos.
 Permission11=Lea las facturas de los clientes
 Permission12=Crear/modificar facturas de clientes
-Permission13=Desvalorizar facturas de clientes
 Permission14=Validar facturas de clientes
 Permission15=Enviar facturas de clientes por correo electrónico
 Permission16=Crear pagos para facturas de clientes
@@ -593,10 +585,8 @@ Permission402=Crear/modificar descuentos
 Permission403=Validar descuentos
 Permission404=Eliminar descuentos
 Permission430=Utilice la barra de depuración
-Permission511=Leer pagos de salarios.
 Permission512=Crear / modificar pagos de salarios.
 Permission514=Eliminar pagos de salarios.
-Permission517=Salarios de exportación
 Permission520=Leer préstamos
 Permission522=Crear/modificar préstamos
 Permission524=Eliminar préstamos
@@ -669,7 +659,6 @@ Permission23001=Leer trabajo programado
 Permission23002=Crear / actualizar trabajo programado
 Permission23003=Eliminar trabajo programado
 Permission23004=Ejecutar trabajo programado
-Permission50101=Use el punto de venta
 Permission50201=Leer transacciones
 Permission50202=Transacciones de importación
 Permission50401=Enlazar productos y facturas con cuentas contables.
@@ -904,7 +893,6 @@ AddRefInList=Mostrar cliente / vendedor ref. Lista de información (lista de sel
 AddAdressInList=Mostrar la lista de información de la dirección del cliente / proveedor (seleccionar lista o cuadro combinado) <br> Aparecerán terceros con el formato de nombre &quot;The Big Company corp. - 21 jump street 123456 Big town - USA&quot; en lugar de &quot;The Big Company corp&quot;.
 AskForPreferredShippingMethod=Pregunte por el método de envío preferido para terceros.
 FillThisOnlyIfRequired=Ejemplo: +2 (llenar solo si se experimentan problemas de compensación de zona horaria)
-PasswordGenerationStandard=Devuelve una contraseña generada de acuerdo con el algoritmo interno de Dolibarr: 8 caracteres que contienen números compartidos y caracteres en minúscula.
 PasswordGenerationNone=No sugiera una contraseña generada. La contraseña debe escribirse manualmente.
 PasswordGenerationPerso=Devuelve una contraseña de acuerdo a tu configuración definida personalmente.
 SetupPerso=De acuerdo con tu configuración
@@ -1073,7 +1061,6 @@ LDAPDescValues=Los valores de ejemplo están diseñados para <b> OpenLDAP </ b>
 ForANonAnonymousAccess=Para un acceso autenticado (para un acceso de escritura, por ejemplo)
 PerfDolibarr=Configuración de rendimiento / informe de optimización
 YouMayFindPerfAdviceHere=Esta página proporciona algunas verificaciones o consejos relacionados con el rendimiento.
-NotInstalled=No está instalado, por lo que su servidor no se ralentiza por esto.
 ApplicativeCache=Caché aplicable
 MemcachedNotAvailable=No se encontró caché aplicativo. Puede mejorar el rendimiento instalando un servidor de caché Memcached y un módulo capaz de usar este servidor de caché. Más información aquí <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN"> http: //wiki.dolibarr.org/index.php/Module_MemCached_EN </a>. <br> Tenga en cuenta que muchos proveedores de alojamiento web no proporcionan dicho servidor de caché.
 MemcachedModuleAvailableButNotSetup=El módulo memcached para la memoria caché aplicativa se encuentra pero la configuración del módulo no está completa.
@@ -1116,8 +1103,6 @@ SyslogFacility=Instalaciones
 SyslogFilename=Nombre de archivo y ruta
 YouCanUseDOL_DATA_ROOT=Puede usar DOL_DATA_ROOT / dolibarr.log para un archivo de registro en el directorio "documentos" de Dolibarr. Puede establecer una ruta diferente para almacenar este archivo.
 ErrorUnknownSyslogConstant=Constante %s no es una constante de Syslog conocida
-OnlyWindowsLOG_USER=Windows solo es compatible con LOG_USER
-SyslogFileNumberOfSaves=Copias de seguridad de registro
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configurar el trabajo programado de limpieza para establecer la frecuencia de copia de seguridad de registro
 DonationsSetup=Configuración del módulo de donación
 DonationsReceiptModel=Plantilla de recibo de donación
@@ -1158,7 +1143,6 @@ FreeLegalTextOnDeliveryReceipts=Texto libre en recibos de entrega
 ActivateFCKeditor=Activa el editor avanzado para:
 FCKeditorForCompany=Creación / edición WYSIWIG de descripción y nota de elementos (excepto productos / servicios)
 FCKeditorForProduct=WYSIWIG creación / edición de productos / servicios descripción y nota
-FCKeditorForProductDetails=Creación / edición WYSIWIG de líneas de detalles de productos para todas las entidades (propuestas, pedidos, facturas, etc.). <font class="warning">Advertencia: el uso de esta opción para este caso no se recomienda seriamente, ya que puede crear problemas con los caracteres especiales y el formato de página al crear archivos PDF.</font>
 FCKeditorForMailing=Creación / edición WYSIWIG para eMailings masivos (Herramientas-> eMailing)
 FCKeditorForUserSignature=Creación / edición WYSIWIG de la firma del usuario
 FCKeditorForMail=Creación / edición WYSIWIG para todo el correo (excepto Herramientas-> correo electrónico)
@@ -1167,7 +1151,6 @@ StockSetup=Configuración del módulo de stock
 IfYouUsePointOfSaleCheckModule=Si utiliza el módulo de Punto de Venta (POS) provisto por defecto o un módulo externo, su configuración puede ser ignorada por su módulo de POS. La mayoría de los módulos de POS están diseñados de forma predeterminada para crear una factura de inmediato y disminuir el stock, independientemente de las opciones aquí. Por lo tanto, si necesita o no una disminución de existencias al registrar una venta desde su POS, verifique también la configuración de su módulo POS.
 MenuDeleted=Menú borrado
 NotTopTreeMenuPersonalized=Menús personalizados no vinculados a una entrada del menú superior
-Menu=Selección de menú
 MenuHandler=Controlador de menú
 MenuModule=Módulo fuente
 HideUnauthorizedMenu=Ocultar menús no autorizados (gris)
@@ -1210,8 +1193,6 @@ AGENDA_USE_EVENT_TYPE=Usar tipos de eventos (administrados en el menú Configura
 AGENDA_USE_EVENT_TYPE_DEFAULT=Establecer automáticamente este valor predeterminado para el tipo de evento en el formulario de creación de evento
 AGENDA_DEFAULT_FILTER_TYPE=Configure automáticamente este tipo de evento en el filtro de búsqueda de la vista de agenda
 AGENDA_DEFAULT_FILTER_STATUS=Establecer automáticamente este estado para eventos en el filtro de búsqueda de la vista de agenda
-AGENDA_REMINDER_EMAIL=Habilite el recordatorio de eventos <b>por correo electrónico</b>  (la opción recordar/demorar se puede definir en cada evento). Nota: El módulo <strong>%s</strong> debe estar habilitado y configurado correctamente para que el recordatorio se envíe con la frecuencia correcta.
-AGENDA_REMINDER_BROWSER=Active el recordatorio de eventos <b>en el navegador del usuario</b> (cuando se alcanza la fecha del evento, cada usuario puede rechazar esto de la pregunta de confirmación del navegador)
 AGENDA_REMINDER_BROWSER_SOUND=Habilitar notificación de sonido
 AGENDA_SHOW_LINKED_OBJECT=Mostrar objeto vinculado en la vista de agenda
 ClickToDialUrlDesc=Se llama a Url cuando se hace clic en el picto de un teléfono. En la URL, puede usar etiquetas <br> <b> __ PHONETO __ </ b> que se reemplazarán por el número de teléfono de la persona a quien llamar <br> <b> __ PHONEFROM __ </ b> que se reemplazará por el número de teléfono de la llamada persona (suya) <br> <b> __ LOGIN __ </ b> que se reemplazará con clicktodial de inicio de sesión (definido en la tarjeta de usuario) <br> <b> __ PASS __ </ b> que se reemplazará con clicktodial contraseña (definida en usuario tarjeta).
@@ -1277,7 +1258,6 @@ TypePaymentDesc=0: Tipo de pago del cliente, 1: Tipo de pago del proveedor, 2: T
 IncludePath=Incluir ruta (definida en la variable %s)
 ExpenseReportsSetup=Configuración del módulo Informes de gastos
 TemplatePDFExpenseReports=Plantillas de documentos para generar el documento de informe de gastos
-ExpenseReportsIkSetup=Configuración del módulo Informes de gastos: índice Milles
 NoModueToManageStockIncrease=No se ha activado ningún módulo capaz de gestionar el aumento automático de existencias. El aumento de existencias se realizará solo con la entrada manual.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Puede encontrar opciones para notificaciones por correo electrónico habilitando y configurando el módulo &quot;Notificación&quot;.
 ListOfNotificationsPerUser=Lista de notificaciones automáticas por usuario *
@@ -1325,7 +1305,6 @@ MailToSendInvoice=Facturas de cliente
 MailToSendSupplierRequestForQuotation=Solicitud de presupuesto
 MailToSendSupplierOrder=Ordenes de compra
 MailToSendSupplierInvoice=Facturas del vendedor
-MailToProject=Página de proyectos
 ByDefaultInList=Mostrar de forma predeterminada en la vista de lista
 YouUseLastStableVersion=Usas la última versión estable
 TitleExampleForMajorRelease=Ejemplo de mensaje que puede usar para anunciar esta versión principal (no dude en utilizarla en sus sitios web)
@@ -1408,7 +1387,6 @@ DisabledResourceLinkContact=Deshabilitar característica para vincular un recurs
 EnableResourceUsedInEventCheck=Habilite la función para verificar si un recurso está en uso en un evento
 ConfirmUnactivation=Confirmar restablecimiento del módulo
 OnMobileOnly=Sólo en pantalla pequeña (teléfono inteligente)
-DisableProspectCustomerType=Deshabilite el tipo de tercero &quot;Prospecto + Cliente&quot; (por lo tanto, el tercero debe ser Prospecto o Cliente, pero no pueden ser ambos)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplificar la interfaz para ciegos.
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Habilite esta opción si es una persona ciega o si utiliza la aplicación desde un navegador de texto como Lynx o Links.
 ThisValueCanOverwrittenOnUserLevel=Este valor puede ser sobrescrito por cada usuario desde su página de usuario - pestaña &#39;%s&#39;
diff --git a/htdocs/langs/es_CL/categories.lang b/htdocs/langs/es_CL/categories.lang
index 1af6a813239..e6f54ab9caa 100644
--- a/htdocs/langs/es_CL/categories.lang
+++ b/htdocs/langs/es_CL/categories.lang
@@ -73,4 +73,3 @@ CategorieRecursiv=Enlace con la etiqueta / categoría principal automáticamente
 AddProductServiceIntoCategory=Agregue el siguiente producto / servicio
 ShowCategory=Mostrar etiqueta / categoría
 ChooseCategory=Elegir la categoría
-StocksCategoriesArea=Área de Categorías de Almacenes
diff --git a/htdocs/langs/es_CL/companies.lang b/htdocs/langs/es_CL/companies.lang
index 51017d9026b..a1b385f9d95 100644
--- a/htdocs/langs/es_CL/companies.lang
+++ b/htdocs/langs/es_CL/companies.lang
@@ -79,7 +79,6 @@ ProfId4FR=Prof Id 4 (RCS / RM)
 ProfId1GB=Número de Registro
 ProfId1LU=Carné de identidad. profe. 1 (R.C.S. Luxemburgo)
 ProfId2LU=Carné de identidad. profe. 2 (Permiso comercial)
-ProfId5MA=Carné de identidad. profe. 5 (I.C.E.)
 ProfId3MX=Prof Id 3 (Charter Profesional)
 ProfId1NL=Nummer KVK
 ProfId2PT=Prof Id 2 (Número de seguridad social)
diff --git a/htdocs/langs/es_CL/ecm.lang b/htdocs/langs/es_CL/ecm.lang
index eb90a48c10f..c8bda73008d 100644
--- a/htdocs/langs/es_CL/ecm.lang
+++ b/htdocs/langs/es_CL/ecm.lang
@@ -9,19 +9,6 @@ ECMAreaDesc=El área DMS / ECM (Sistema de gestión de documentos / gestión de
 ECMAreaDesc2=* Los directorios automáticos se rellenan automáticamente al agregar documentos desde la tarjeta de un elemento. <br> * Los directorios manuales se pueden usar para guardar documentos no vinculados a un elemento en particular.
 ECMSectionWasRemoved=El directorio <b>%s</b> ha sido borrado.
 ECMSectionWasCreated=El directorio <b>%s</b> ha sido creado.
-ECMDocsBySocialContributions=Documentos vinculados a impuestos sociales o fiscales
-ECMDocsByThirdParties=Documentos vinculados a terceros
-ECMDocsByProposals=Documentos asociados a cotizaciones
-ECMDocsByOrders=Documentos vinculados a pedidos de clientes
-ECMDocsByContracts=Documentos vinculados a contratos
-ECMDocsByInvoices=Documentos vinculados a las facturas de los clientes
-ECMDocsByProducts=Documentos vinculados a productos
-ECMDocsByProjects=Documentos vinculados a proyectos
-ECMDocsByUsers=Documentos vinculados a usuarios
-ECMDocsByInterventions=Documentos vinculados a intervenciones
-ECMDocsByExpenseReports=Documentos vinculados a informes de gastos
-ECMDocsByHolidays=Documentos vinculados a vacaciones
-ECMDocsBySupplierProposals=Documentos vinculados a propuestas de proveedores.
 ECMNoDirectoryYet=Sin directorio creado
 DeleteSection=Eliminar directorio
 ConfirmDeleteSection=¿Puedes confirmar que quieres borrar el directorio <b>%s</b>?
diff --git a/htdocs/langs/es_CL/install.lang b/htdocs/langs/es_CL/install.lang
index 038a4960f1b..ca221130e38 100644
--- a/htdocs/langs/es_CL/install.lang
+++ b/htdocs/langs/es_CL/install.lang
@@ -7,13 +7,9 @@ ConfFileIsNotWritable=El archivo de configuración <b>%s</b> no se puede escribi
 ConfFileIsWritable=El archivo de configuración <b>%s</b> es escribible.
 ConfFileMustBeAFileNotADir=El archivo de configuración <b>%s</b> debe ser un archivo, no un directorio.
 ConfFileReload=Recarga de parámetros desde archivo de configuración.
-PHPSupportSessions=Este PHP admite sesiones.
 PHPSupportPOSTGETOk=Este PHP soporta variables POST y GET.
 PHPSupportPOSTGETKo=Es posible que su configuración de PHP no admita las variables POST y / o GET. Verifique el parámetro <b>variables_order</b> en php.ini.
-PHPSupportGD=Este PHP soporta funciones gráficas GD.
-PHPSupportCurl=Este PHP soporta Curl.
-PHPSupportUTF8=Este PHP soporta funciones UTF8.
-PHPSupportIntl=Este PHP soporta funciones de Intl.
+PHPSupportSessions=Este PHP admite sesiones.
 PHPMemoryOK=Su memoria de sesión máxima de PHP está configurada en <b>%s</b>. Esto debería ser suficiente.
 PHPMemoryTooLow=La memoria de sesión máxima de PHP se establece en <b>%s</b> bytes. Esto es demasiado bajo. Cambie su <b>php.ini</b> para establecer el parámetro <b>memory_limit</b> en al menos <b>%s</b> bytes.
 Recheck=Haga clic aquí para una prueba más detallada
diff --git a/htdocs/langs/es_CL/intracommreport.lang b/htdocs/langs/es_CL/intracommreport.lang
new file mode 100644
index 00000000000..76825d9b4ab
--- /dev/null
+++ b/htdocs/langs/es_CL/intracommreport.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+IntracommReportPeriod=Period of nalysis
diff --git a/htdocs/langs/es_CL/main.lang b/htdocs/langs/es_CL/main.lang
index 6895438fd44..b40800298bc 100644
--- a/htdocs/langs/es_CL/main.lang
+++ b/htdocs/langs/es_CL/main.lang
@@ -515,6 +515,8 @@ SearchIntoCustomerShipments=Envíos de clientes
 SearchIntoExpenseReports=Reporte de gastos
 SearchIntoLeaves=Salir
 SearchIntoTickets=Entradas
+SearchIntoVendorPayments=Pagos de proveedores
+SearchIntoMiscPayments=Pagos diversos
 NbComments=Numero de comentarios
 CommentAdded=Comentario agregado
 Everybody=Todos
diff --git a/htdocs/langs/es_CL/members.lang b/htdocs/langs/es_CL/members.lang
index e77bd64bf9b..64ee25cbe89 100644
--- a/htdocs/langs/es_CL/members.lang
+++ b/htdocs/langs/es_CL/members.lang
@@ -14,12 +14,8 @@ MembersCards=Tarjetas de socios
 MembersList=Lista de miembros
 MembersListToValid=Lista de miembros del borrador (por validar)
 MembersListValid=Lista de miembros válidos
-MembersListUpToDate=Lista de miembros válidos con suscripción actualizada
-MembersListNotUpToDate=Lista de miembros válidos con suscripción fuera de fecha
 MembersListResiliated=Lista de miembros finalizados
 MembersListQualified=Lista de miembros calificados
-MenuMembersUpToDate=Miembros actualizados
-MenuMembersNotUpToDate=Miembros desactualizados
 MenuMembersResiliated=Miembros finalizados
 MembersWithSubscriptionToReceive=Miembros con suscripción para recibir
 MembersWithSubscriptionToReceiveShort=Suscripción para recibir
diff --git a/htdocs/langs/es_CL/mrp.lang b/htdocs/langs/es_CL/mrp.lang
index c523e0836b6..f43c1d88ba9 100644
--- a/htdocs/langs/es_CL/mrp.lang
+++ b/htdocs/langs/es_CL/mrp.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - mrp
 Mrp=Ordenes de Fabricación
-MO=Orden de Fabricación
+ManufacturingOrder=Orden de Fabricación
 MrpSetupPage=Configuración del módulo de MRP
 MenuBOM=Facturas de material
 LatestBOMModified=Últimas %s Cuentas de materiales modificadas
diff --git a/htdocs/langs/es_CL/products.lang b/htdocs/langs/es_CL/products.lang
index 240314a9d61..5619277c9d4 100644
--- a/htdocs/langs/es_CL/products.lang
+++ b/htdocs/langs/es_CL/products.lang
@@ -61,20 +61,13 @@ NoteNotVisibleOnBill=Nota (no visible en las facturas, cotizaciones, etc.)
 ServiceLimitedDuration=Si el producto es un servicio de duración limitada:
 MultiPricesAbility=Múltiples segmentos de precios por producto / servicio (cada cliente está en un segmento de precios)
 MultiPricesNumPrices=Cantidad de precios
-AssociatedProductsAbility=Activar productos virtuales (kits)
-AssociatedProducts=Productos virtuales
-AssociatedProductsNumber=Cantidad de productos que componen este producto virtual
 ParentProductsNumber=Número de producto de embalaje principal
 ParentProducts=Productos para padres
-IfZeroItIsNotAVirtualProduct=Si es 0, este producto no es un producto virtual
-IfZeroItIsNotUsedByVirtualProduct=Si es 0, este producto no es usado por ningún producto virtual
 KeywordFilter=Filtro de palabras clave
 CategoryFilter=Filtro de categoría
 ProductToAddSearch=Buscar producto para agregar
 NoMatchFound=No se encontraron coincidencias
 ListOfProductsServices=Lista de productos / servicios
-ProductAssociationList=Lista de productos / servicios que son componentes de este producto / kit virtual
-ProductParentList=Lista de productos/servicios virtuales con este producto como componente
 ErrorAssociationIsFatherOfThis=Uno de los productos seleccionados es el padre con el producto actual
 ConfirmDeleteProduct=¿Seguro que quieres eliminar este producto/servicio?
 ProductDeleted=Producto / Servicio "%s" borrado de la base de datos.
diff --git a/htdocs/langs/es_CL/stocks.lang b/htdocs/langs/es_CL/stocks.lang
index 57c3d5885ac..a4ea45fcfbc 100644
--- a/htdocs/langs/es_CL/stocks.lang
+++ b/htdocs/langs/es_CL/stocks.lang
@@ -78,8 +78,6 @@ DesiredStockDesc=Esta cantidad de stock será el valor utilizado para rellenar e
 StockToBuy=Ordenar
 Replenishment=Reposición
 ReplenishmentOrders=Pedidos de reabastecimiento
-VirtualDiffersFromPhysical=De acuerdo con las opciones de acciones de aumento / disminución, las existencias físicas y las existencias virtuales (órdenes físicas + actuales) pueden diferir
-UseVirtualStockByDefault=Utilice stock virtual de forma predeterminada, en lugar de stock físico, para la función de reaprovisionamiento
 UseVirtualStock=Use stock virtual
 UsePhysicalStock=Usa material físico
 CurentlyUsingPhysicalStock=Stock fisico
@@ -127,8 +125,6 @@ inventoryErrorQtyAdd=Error: una cantidad es menor que cero
 inventoryWarningProductAlreadyExists=Este producto ya está en la lista
 SelectCategory=Filtro de categoría
 SelectFournisseur=Filtro de proveedor
-INVENTORY_DISABLE_VIRTUAL=Producto virtual (kit): no disminuir el stock de un producto infantil
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Utilice el precio de compra si no se puede encontrar el último precio de compra
 inventoryChangePMPPermission=Permitir cambiar el valor de PMP para un producto
 OnlyProdsInStock=No agregue productos sin stock
 TheoricalQty=Cantidad teórica
diff --git a/htdocs/langs/es_CL/suppliers.lang b/htdocs/langs/es_CL/suppliers.lang
index 454867a7125..8868eb66cea 100644
--- a/htdocs/langs/es_CL/suppliers.lang
+++ b/htdocs/langs/es_CL/suppliers.lang
@@ -35,5 +35,4 @@ SupplierReputation=Reputación del vendedor
 DoNotOrderThisProductToThisSupplier=No ordene
 NotTheGoodQualitySupplier=Baja calidad
 AllProductServicePrices=Todos los precios de productos/servicios
-AllProductReferencesOfSupplier=Todas las referencias de productos / servicios del vendedor.
 BuyingPriceNumShort=Precios del proveedor
diff --git a/htdocs/langs/es_CL/website.lang b/htdocs/langs/es_CL/website.lang
index 51df9222310..4f997504810 100644
--- a/htdocs/langs/es_CL/website.lang
+++ b/htdocs/langs/es_CL/website.lang
@@ -16,7 +16,6 @@ EditMedias=Editar medios
 EditPageMeta=Edita prop pag/contenedor
 Webpage=Página web / contenedor
 AddPage=Añadir página / contenedor
-PageContainer=Página / contenedor
 PreviewOfSiteNotYetAvailable=Vista previa de su sitio web <strong>%s</strong> aún no está disponible. Primero debe &#39; <strong>Importar una plantilla de sitio web completa</strong> &#39; o simplemente &#39; <strong>Agregar una página / contenedor</strong> &#39;.
 RequestedPageHasNoContentYet=La página solicitada con el id. %s aún no tiene contenido o el archivo de caché .tpl.php fue eliminado. Edita el contenido de la página para resolver esto.
 SiteDeleted=Sitio web &#39;%s&#39; eliminado
diff --git a/htdocs/langs/es_CO/accountancy.lang b/htdocs/langs/es_CO/accountancy.lang
index 265a743bee3..ccd905cc761 100644
--- a/htdocs/langs/es_CO/accountancy.lang
+++ b/htdocs/langs/es_CO/accountancy.lang
@@ -12,9 +12,7 @@ ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique el prefijo para el nombre del archivo.
 DefaultForService=Por defecto para el servicio
 DefaultForProduct=Predeterminado para producto
 CantSuggest=No puedo sugerir
-ConfigAccountingExpert=Configuración del módulo experto en contabilidad.
 Journalization=Periodización
-Journaux=Revistas
 JournalFinancial=Revistas financieras
 BackToChartofaccounts=Tabla de retorno de cuentas
 Chartofaccounts=Catálogo de cuentas
@@ -25,8 +23,6 @@ OverviewOfAmountOfLinesNotBound=Resumen de la cantidad de líneas no vinculadas
 OverviewOfAmountOfLinesBound=Resumen de la cantidad de líneas ya unidas a una cuenta contable
 DeleteCptCategory=Eliminar cuenta contable del grupo
 JournalizationInLedgerStatus=Estado de la periodización
-AlreadyInGeneralLedger=Ya publicado en libros de contabilidad.
-NotYetInGeneralLedger=Aún no se ha publicado en los libros de contabilidad.
 GroupIsEmptyCheckSetup=El grupo está vacío, verifique la configuración del grupo de contabilidad personalizado
 DetailByAccount=Mostrar detalle por cuenta
 AccountWithNonZeroValues=Cuentas con valores distintos de cero.
@@ -54,7 +50,6 @@ AccountancyAreaDescBind=PASO %s: verifique el enlace entre las líneas %s existe
 AccountancyAreaDescWriteRecords=PASO %s: Escriba transacciones en el Libro mayor. Para esto, vaya al menú <strong> %s </strong> y haga clic en el botón <strong> %s </strong>.
 AccountancyAreaDescAnalyze=PASO %s: agregue o edite transacciones existentes y genere informes y exportaciones.
 AccountancyAreaDescClosePeriod=PASO %s: Cierre el período para que no podamos realizar modificaciones en el futuro.
-TheJournalCodeIsNotDefinedOnSomeBankAccount=Un paso obligatorio en la configuración no se completó (el diario del código contable no está definido para todas las cuentas bancarias)
 Selectchartofaccounts=Seleccionar plan de cuentas activo
 ChangeAndLoad=Cambio y carga
 ShowAccountingAccount=Mostrar cuenta contable
@@ -115,14 +110,11 @@ TransactionNumShort=Num. transacción
 GroupByAccountAccounting=Grupo por cuenta contable
 AccountingAccountGroupsDesc=Puede definir aquí algunos grupos de cuentas contables. Serán utilizados para informes contables personalizados.
 ByPredefinedAccountGroups=Por grupos predefinidos.
-DeleteMvt=Eliminar líneas de libro mayor
 DelYear=Año para borrar
 DelJournal=Diario para eliminar
-ConfirmDeleteMvtPartial=Esto eliminará la transacción del Libro mayor (se eliminarán todas las líneas relacionadas con la misma transacción)
 FinanceJournal=Revista de finanzas
 ExpenseReportsJournal=Diario de informes de gastos
 DescFinanceJournal=Revista financiera que incluye todos los tipos de pagos por cuenta bancaria.
-DescJournalOnlyBindedVisible=Esta es una vista de registro que está vinculada a una cuenta de contabilidad y se puede registrar en el Libro mayor.
 VATAccountNotDefined=Cuenta para el IVA no definido
 ThirdpartyAccountNotDefined=Cuenta por tercero no definida.
 ProductAccountNotDefined=Cuenta por producto no definido.
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index 0fbbffc35f6..f9161cc6931 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -45,7 +45,6 @@ ErrorCodeCantContainZero=El código no puede contener un valor de 0
 UseSearchToSelectCompanyTooltip=Además, si tiene un gran número de terceros (> 100 000), puede aumentar la velocidad configurando la constante COMPANY_DONOTSEARCH_ANYWHERE en 1 en Configuración-> Otro. La búsqueda se limitará entonces al inicio de la cadena.
 UseSearchToSelectContactTooltip=Además, si tiene un gran número de terceros (> 100 000), puede aumentar la velocidad configurando la constante CONTACT_DONOTSEARCH_ANYWHERE en 1 en Configuración-> Otro. La búsqueda se limitará entonces al inicio de la cadena.
 DelaiedFullListToSelectCompany=Espere hasta que se presione una tecla antes de cargar el contenido de la lista de combo de Terceros. Esto puede aumentar el rendimiento si tiene un gran número de terceros, pero es menos conveniente.
-DelaiedFullListToSelectContact=Espere hasta que se presione una tecla antes de cargar el contenido de la lista de combo de contactos. Esto puede aumentar el rendimiento si tiene una gran cantidad de contactos, pero es menos conveniente.
 NotAvailableWhenAjaxDisabled=No disponible con Ajax desactivado
 AllowToSelectProjectFromOtherCompany=En el documento de un tercero, puede elegir un proyecto vinculado a otro tercero
 JavascriptDisabled=JavaScript desactivado
@@ -172,7 +171,6 @@ SpaceX=Espacio x
 SpaceY=Espacio y
 Emails=Correos electronicos
 EMailsSetup=Configuración de correos electrónicos
-EMailsDesc=Esta página le permite anular sus parámetros de PHP predeterminados para el envío de correo electrónico. En la mayoría de los casos en sistemas operativos Unix / Linux, la configuración de PHP es correcta y estos parámetros son innecesarios.
 EmailSenderProfiles=Correos electrónicos remitentes perfiles
 MAIN_MAIL_SMTP_PORT=Puerto SMTP / SMTPS (valor predeterminado en php.ini: <b> %s </b>)
 MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS Host (valor predeterminado en php.ini: <b> %s </b>)
@@ -330,7 +328,6 @@ Module54Name=Contratos / Suscripciones
 Module54Desc=Gestión de contratos (servicios o suscripciones recurrentes).
 Module55Desc=Gestión de códigos de barras
 Module58Desc=Integración de un sistema ClickToDial (Asterisco, ...)
-Module59Desc=Agregar función para generar una cuenta Bookmark4u desde una cuenta Dolibarr
 Module70Desc=Gestión de la intervención
 Module75Name=Gastos y notas de viaje.
 Module75Desc=Gestión de gastos y notas de viaje.
@@ -373,7 +370,6 @@ Module6000Desc=Gestión del flujo de trabajo (creación automática de objeto y
 Module40000Name=Multi moneda
 Module40000Desc=Utilizar monedas alternativas en precios y documentos.
 Module50000Name=Caja de pago
-Module50400Desc=Gestión contable (entradas dobles, soporte general y auxiliares de contabilidad). Exportar el libro mayor en varios otros formatos de software de contabilidad.
 Module54000Desc=Impresión directa (sin abrir los documentos) mediante la interfaz IPP de Cups (la impresora debe estar visible desde el servidor y CUPS debe estar instalada en el servidor).
 Module55000Name=Encuesta, encuesta o voto
 Module59000Desc=Módulo para gestionar márgenes.
@@ -381,7 +377,6 @@ Module60000Desc=Módulo para gestionar comisiones.
 Module62000Desc=Añadir características para gestionar Incoterms.
 Permission11=Lea las facturas de los clientes.
 Permission12=Crear / modificar facturas de clientes.
-Permission13=No validar las facturas de los clientes.
 Permission14=Validar facturas de clientes.
 Permission15=Enviar facturas de clientes por correo electrónico.
 Permission16=Crear pagos para las facturas de los clientes.
@@ -502,10 +497,8 @@ Permission401=Leer descuentos
 Permission402=Crear / modificar descuentos.
 Permission403=Validar descuentos
 Permission404=Eliminar descuentos
-Permission511=Leer pagos de salarios
 Permission512=Crear / modificar pagos de salarios.
 Permission514=Eliminar pagos de salarios.
-Permission517=Salarios de exportación
 Permission520=Leer prestamos
 Permission522=Crear / modificar préstamos.
 Permission524=Borrar prestamos
@@ -715,7 +708,6 @@ BrowserIsOK=Está utilizando el navegador web %s. Este navegador está bien para
 BrowserIsKO=Está utilizando el navegador web %s. Se sabe que este navegador es una mala elección para la seguridad, el rendimiento y la confiabilidad. Recomendamos el uso de Firefox, Chrome, Opera o Safari.
 AskForPreferredShippingMethod=Pregunte por el método de envío preferido para terceros.
 FillThisOnlyIfRequired=Ejemplo: +2 (rellenar solo si se experimentan problemas de compensación de zona horaria)
-PasswordGenerationStandard=Devuelva una contraseña generada de acuerdo con el algoritmo interno de Dolibarr: 8 caracteres que contienen números compartidos y caracteres en minúscula.
 PasswordGenerationNone=No sugiera una contraseña generada. La contraseña debe escribirse manualmente.
 PasswordGenerationPerso=Devuelva una contraseña de acuerdo con su configuración definida personalmente.
 SetupPerso=Según su configuración
@@ -846,7 +838,6 @@ LDAPDescValues=Los valores de ejemplo están diseñados para <b> OpenLDAP </b> c
 ForANonAnonymousAccess=Para un acceso autenticado (por ejemplo, para un acceso de escritura)
 PerfDolibarr=Configuración de rendimiento / informe de optimización
 YouMayFindPerfAdviceHere=Esta página proporciona algunas verificaciones o consejos relacionados con el rendimiento.
-NotInstalled=No está instalado, por lo que su servidor no se ralentiza por esto.
 ApplicativeCache=Caché aplicativo
 MemcachedNotAvailable=No se encontró ningún caché aplicativo. Puede mejorar el rendimiento instalando un servidor de caché Memcached y un módulo capaz de usar este servidor de caché. Más información aquí <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN"> http: //wiki.dolibarr.org/index.php/Module_MemCached_EN </a>. Tenga en cuenta que muchos proveedores de alojamiento web no proporcionan dicho servidor de caché.
 MemcachedModuleAvailableButNotSetup=Se encontró el módulo memcached para el caché de aplicación, pero la configuración del módulo no está completa.
@@ -887,9 +878,7 @@ SyslogFacility=Instalaciones
 SyslogFilename=Nombre de archivo y ruta
 YouCanUseDOL_DATA_ROOT=Puede usar DOL_DATA_ROOT / dolibarr.log para un archivo de registro en el directorio de "documentos" de Dolibarr. Puede establecer una ruta diferente para almacenar este archivo.
 ErrorUnknownSyslogConstant=La constante %s no es una constante de Syslog conocida
-OnlyWindowsLOG_USER=Windows solo es compatible con LOG_USER
 CompressSyslogs=Compresión y copia de seguridad de los archivos de registro de depuración (generados por el módulo Registro para depuración)
-SyslogFileNumberOfSaves=Registrar copias de seguridad
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure la tarea de limpieza programada para establecer la frecuencia de copia de seguridad del registro
 DonationsSetup=Configuración del módulo de donación.
 DonationsReceiptModel=Plantilla de recibo de donación
@@ -927,7 +916,6 @@ FreeLegalTextOnDeliveryReceipts=Texto libre en los recibos de entrega
 ActivateFCKeditor=Activar editor avanzado para:
 FCKeditorForCompany=Creación / edición de WYSIWIG de elementos, descripción y nota (excepto productos / servicios)
 FCKeditorForProduct=WYSIWIG creación / edición de productos / servicios descripción y nota
-FCKeditorForProductDetails=Creación / edición WYSIWIG de líneas de detalles de productos para todas las entidades (propuestas, pedidos, facturas, etc.). <font class = "warning"> Advertencia: el uso de esta opción para este caso no se recomienda seriamente, ya que puede crear problemas con los caracteres especiales y el formato de página al crear archivos PDF. </font>
 FCKeditorForMailing=Creación / edición WYSIWIG para eMailings masivos (Herramientas-> eMailing)
 FCKeditorForUserSignature=Creación / edición WYSIWIG de la firma del usuario.
 FCKeditorForMail=Creación / edición WYSIWIG para todo el correo (excepto Herramientas-> eMailing)
@@ -935,7 +923,6 @@ StockSetup=Configuración del módulo de stock
 IfYouUsePointOfSaleCheckModule=Si usa el módulo de Punto de Venta (POS) provisto por defecto o un módulo externo, su configuración puede ser ignorada por su módulo de POS. La mayoría de los módulos POS están diseñados de forma predeterminada para crear una factura inmediatamente y disminuir el stock, independientemente de las opciones aquí. Por lo tanto, si necesita o no una disminución de stock al registrar una venta desde su POS, verifique también la configuración de su módulo POS.
 NotTopTreeMenuPersonalized=Menús personalizados no vinculados a una entrada del menú superior
 NewMenu=Nuevo menu
-Menu=Selección de menú
 MenuHandler=Manejador de menú
 MenuModule=Módulo fuente
 HideUnauthorizedMenu=Ocultar menús no autorizados (gris)
@@ -978,8 +965,6 @@ AGENDA_USE_EVENT_TYPE=Usar tipos de eventos (administrados en el menú Configura
 AGENDA_USE_EVENT_TYPE_DEFAULT=Establecer automáticamente este valor predeterminado para el tipo de evento en el formulario de creación de evento
 AGENDA_DEFAULT_FILTER_TYPE=Configure automáticamente este tipo de evento en el filtro de búsqueda de la vista de agenda
 AGENDA_DEFAULT_FILTER_STATUS=Establecer automáticamente este estado para eventos en el filtro de búsqueda de la vista de agenda
-AGENDA_REMINDER_EMAIL=Habilite el recordatorio del evento <b> por correos electrónicos </b> (la opción de recordatorio / retraso se puede definir en cada evento). Nota: el módulo <strong> %s </strong> debe estar habilitado y configurado correctamente para que se envíe un recordatorio con la frecuencia correcta.
-AGENDA_REMINDER_BROWSER=Habilite el recordatorio de evento <b> en el navegador del usuario </b> (cuando se alcanza la fecha del evento, cada usuario puede rechazar esto de la pregunta de confirmación del navegador)
 AGENDA_REMINDER_BROWSER_SOUND=Habilitar notificación de sonido
 AGENDA_SHOW_LINKED_OBJECT=Mostrar objeto vinculado en vista de agenda
 ClickToDialSetup=Haga clic para configurar el módulo de marcado.
@@ -1037,7 +1022,6 @@ Format=Formato
 IncludePath=Incluir ruta (definida en la variable %s)
 ExpenseReportsSetup=Configuración de los informes de gastos del módulo
 TemplatePDFExpenseReports=Plantillas de documentos para generar documentos de informe de gastos.
-ExpenseReportsIkSetup=Configuración de los informes de gastos del módulo - Índice Milles
 ExpenseReportsRulesSetup=Configuración de los informes de gastos del módulo - Reglas
 ExpenseReportNumberingModules=Módulo de numeración de informes de gastos.
 NoModueToManageStockIncrease=No se ha activado ningún módulo capaz de gestionar el aumento automático de stock. El aumento de stock se realizará solo con entrada manual.
@@ -1079,7 +1063,6 @@ MailToSendSupplierRequestForQuotation=Solicitud de presupuesto
 MailToSendSupplierOrder=Ordenes de compra
 MailToSendSupplierInvoice=Facturas de proveedores
 MailToSendContract=Los contratos
-MailToProject=Página de proyectos
 ByDefaultInList=Mostrar por defecto en la vista de lista
 YouUseLastStableVersion=Usas la última versión estable
 TitleExampleForMajorRelease=Ejemplo de mensaje que puede usar para anunciar esta versión principal (siéntase libre de usarlo en sus sitios web)
@@ -1135,5 +1118,4 @@ DisabledResourceLinkUser=Deshabilitar la función para vincular un recurso a los
 DisabledResourceLinkContact=Deshabilitar función para vincular un recurso a contactos
 ConfirmUnactivation=Confirmar el reinicio del módulo
 OnMobileOnly=Solo en pantalla pequeña (teléfono inteligente)
-DisableProspectCustomerType=Deshabilite el tipo de tercero "Prospect + Customer" (por lo tanto, el tercero debe ser Prospect o Customer pero no pueden ser ambos)
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_CO/banks.lang b/htdocs/langs/es_CO/banks.lang
index 026dd844524..56fc77c7d64 100644
--- a/htdocs/langs/es_CO/banks.lang
+++ b/htdocs/langs/es_CO/banks.lang
@@ -7,3 +7,4 @@ StatusAccountOpened=Activo
 StatusAccountClosed=Cerrado
 SocialContributionPayment=Pago de impuestos sociales / fiscales
 TransferTo=A
+Graph=Graficas
diff --git a/htdocs/langs/es_CO/categories.lang b/htdocs/langs/es_CO/categories.lang
index c3bc80d45d8..bd65c7847a9 100644
--- a/htdocs/langs/es_CO/categories.lang
+++ b/htdocs/langs/es_CO/categories.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - categories
 Rubriques=Etiquetas / Categorías
+ImpossibleAddCat=Imposible agregar etiqueta/categoria %s
 ExtraFieldsCategories=Atributos complementarios
diff --git a/htdocs/langs/es_CO/install.lang b/htdocs/langs/es_CO/install.lang
index e870861947c..fe8e362f7ef 100644
--- a/htdocs/langs/es_CO/install.lang
+++ b/htdocs/langs/es_CO/install.lang
@@ -8,12 +8,9 @@ ConfFileIsNotWritable=El archivo de configuración <b> %s </b> no se puede escri
 ConfFileIsWritable=El archivo de configuración <b> %s </b> se puede escribir.
 ConfFileMustBeAFileNotADir=El archivo de configuración <b> %s </b> debe ser un archivo, no un directorio.
 ConfFileReload=Recarga de parámetros desde archivo de configuración.
-PHPSupportSessions=Este PHP soporta sesiones.
 PHPSupportPOSTGETOk=Este PHP soporta las variables POST y GET.
 PHPSupportPOSTGETKo=Es posible que su configuración de PHP no admita las variables POST y / o GET. Verifique el parámetro <b> variables_order </b> en php.ini.
-PHPSupportGD=Este PHP soporta funciones gráficas GD.
-PHPSupportCurl=Este PHP soporta Curl.
-PHPSupportUTF8=Este PHP soporta funciones UTF8.
+PHPSupportSessions=Este PHP soporta sesiones.
 PHPMemoryOK=La memoria de sesión de PHP max está configurada en <b> %s </b>. Esto debería ser suficiente.
 PHPMemoryTooLow=La memoria de sesión de PHP max está configurada en <b> %s </b> bytes. Esto es demasiado bajo. Cambie su <b> php.ini </b> para establecer el parámetro <b> memory_limit </b> en al menos <b> %s </b> bytes.
 Recheck=Haga clic aquí para una prueba más detallada
diff --git a/htdocs/langs/es_CO/intracommreport.lang b/htdocs/langs/es_CO/intracommreport.lang
new file mode 100644
index 00000000000..76825d9b4ab
--- /dev/null
+++ b/htdocs/langs/es_CO/intracommreport.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+IntracommReportPeriod=Period of nalysis
diff --git a/htdocs/langs/es_CO/products.lang b/htdocs/langs/es_CO/products.lang
index 897242503e0..2493b627165 100644
--- a/htdocs/langs/es_CO/products.lang
+++ b/htdocs/langs/es_CO/products.lang
@@ -54,19 +54,13 @@ BarcodeValue=Valor de código de barras
 NoteNotVisibleOnBill=Nota (no visible en facturas, propuestas ...)
 ServiceLimitedDuration=Si el producto es un servicio con duración limitada:
 MultiPricesNumPrices=Numero de precios
-AssociatedProductsAbility=Activar productos virtuales (kits)
-AssociatedProducts=Productos virtuales
-AssociatedProductsNumber=Número de productos que componen este producto virtual.
 ParentProductsNumber=Número de producto de embalaje principal
 ParentProducts=Productos para padres
-IfZeroItIsNotAVirtualProduct=Si es 0, este producto no es un producto virtual.
-IfZeroItIsNotUsedByVirtualProduct=Si es 0, este producto no es utilizado por ningún producto virtual
 KeywordFilter=Filtro de palabras clave
 CategoryFilter=Filtro de categoria
 ProductToAddSearch=Buscar producto para añadir
 NoMatchFound=No se encontraron coincidencias
 ListOfProductsServices=Lista de productos / servicios
-ProductParentList=Lista de productos / servicios virtuales con este producto como componente
 ErrorAssociationIsFatherOfThis=Uno de los productos seleccionados es padre con el producto actual
 DeleteProduct=Eliminar un producto / servicio
 ConfirmDeleteProduct=¿Estás seguro de que quieres eliminar este producto / servicio?
diff --git a/htdocs/langs/es_DO/compta.lang b/htdocs/langs/es_DO/compta.lang
new file mode 100644
index 00000000000..c7c41488180
--- /dev/null
+++ b/htdocs/langs/es_DO/compta.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - compta
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/es_DO/intracommreport.lang b/htdocs/langs/es_DO/intracommreport.lang
new file mode 100644
index 00000000000..76825d9b4ab
--- /dev/null
+++ b/htdocs/langs/es_DO/intracommreport.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+IntracommReportPeriod=Period of nalysis
diff --git a/htdocs/langs/es_DO/products.lang b/htdocs/langs/es_DO/products.lang
new file mode 100644
index 00000000000..6e900475275
--- /dev/null
+++ b/htdocs/langs/es_DO/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/es_EC/accountancy.lang b/htdocs/langs/es_EC/accountancy.lang
index 38d192220d7..ffe1b3a23e6 100644
--- a/htdocs/langs/es_EC/accountancy.lang
+++ b/htdocs/langs/es_EC/accountancy.lang
@@ -10,8 +10,7 @@ ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique el prefijo para el nombre de archivo
 DefaultForService=Predeterminado para servicio
 CantSuggest=No puedo sugerir
 AccountancySetupDoneFromAccountancyMenu=La mayoría de la configuración de la contabilidad se realiza desde el menú%s
-ConfigAccountingExpert=Configuración del experto en contabilidad de módulos
-Journaux=Revistas
+Journals=Revistas
 JournalFinancial=Revistas financieras
 BackToChartofaccounts=Retorno gráfico de cuentas
 Chartofaccounts=Catálogo de cuentas
@@ -23,8 +22,6 @@ OverviewOfAmountOfLinesBound=Descripción general de la cantidad de líneas ya v
 DeleteCptCategory=Eliminar cuenta de contabilidad del grupo
 ConfirmDeleteCptCategory=¿Está seguro de que desea eliminar esta cuenta contable del grupo de cuentas contables?
 JournalizationInLedgerStatus=Estado de la publicación
-AlreadyInGeneralLedger=Ya registrado en diarios
-NotYetInGeneralLedger=No se ha registrado en los libros mayores
 GroupIsEmptyCheckSetup=El grupo está vacío, compruebe la configuración del grupo de contabilidad personalizado
 DetailByAccount=Mostrar detalles por cuenta
 AccountWithNonZeroValues=Cuentas con valores distintos de cero.
@@ -53,7 +50,6 @@ AccountancyAreaDescBind=PASO%s: Compruebe la vinculación entre las líneas%s ex
 AccountancyAreaDescWriteRecords=PASO%s: Escribir transacciones en el Libro mayor. Para ello, vaya al menú <strong>%s</strong> y haga clic en el botón <strong>%s</strong>.
 AccountancyAreaDescAnalyze=PASO%s: Añadir o editar transacciones existentes y generar informes y exportaciones.
 AccountancyAreaDescClosePeriod=PASO%s: Período de cierre para que no podamos hacer modificaciones en un futuro.
-TheJournalCodeIsNotDefinedOnSomeBankAccount=Un paso obligatorio en la instalación no estaba completo (diario de código de contabilidad no definido para todas las cuentas bancarias)
 Selectchartofaccounts=Seleccionar el plan de cuentas activo
 Addanaccount=Agregar una cuenta de contabilidad
 AccountAccounting=Cuenta de contabilidad
@@ -75,7 +71,6 @@ ExpenseReportsVentilation=Relación de informes de gastos
 CreateMvts=Crear nueva transacción
 UpdateMvts=Modificación de una transacción
 ValidTransaction=Validar transacción
-WriteBookKeeping=Registrar transacciones en Ledger
 Bookkeeping=Libro mayor
 ObjectsRef=Objeto fuente ref
 CAHTF=Proveedor de compra total antes de impuestos
@@ -133,14 +128,11 @@ NumPiece=Número de pieza
 TransactionNumShort=Num. transacción
 GroupByAccountAccounting=Grupo por cuenta contable
 AccountingAccountGroupsDesc=Puede definir aquí algunos grupos de cuentas contables. Se usarán para informes de contabilidad personalizados.
-DeleteMvt=Eliminar líneas de libro mayor
 DelMonth=Mes para borrar
 DelJournal=Diario para borrar
-ConfirmDeleteMvt=Esto eliminará todas las líneas del Libro mayor para el año / mes y / o de una revista específica (se requiere al menos un criterio). Deberá volver a utilizar la función 'Registro en contabilidad' para que el registro eliminado vuelva al libro mayor.
 FinanceJournal=Diario de finanzas
 ExpenseReportsJournal=Diario de informes de gastos
 DescFinanceJournal=Revista financiera que incluye todos los tipos de pagos por cuenta bancaria
-DescJournalOnlyBindedVisible=Esta es una vista de registro que está vinculada a una cuenta de contabilidad y se puede registrar en el Libro mayor.
 VATAccountNotDefined=Cuenta IVA no definida
 ThirdpartyAccountNotDefined=Cuenta para terceros no definida
 ProductAccountNotDefined=Cuenta para producto no definido
diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
index 130c6ec61a6..63854f4450c 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -52,7 +52,6 @@ DisableJavascriptNote=Nota: Para fines de prueba o depuración. Para la optimiza
 UseSearchToSelectCompanyTooltip=Además, si tiene un gran número de clientes (> 100 000), puede aumentar la velocidad estableciendo COMPANY_DONOTSEARCH_ANYWHERE constante en 1 en: configuración-> Otros. La búsqueda se limitará entonces al inicio de la cadena.
 UseSearchToSelectContactTooltip=Además, si tiene una gran cantidad de clientes (> 100 000), puede aumentar la velocidad estableciendo constante CONTACT_DONOTSEARCH_ANYWHERE es 1 en: configuración-> Otros. La búsqueda se limitará entonces al inicio de la cadena.
 DelaiedFullListToSelectCompany=Espere hasta que se presione una tecla antes de cargar el contenido de la lista de combo de Terceros. Esto puede aumentar el rendimiento si tiene un gran número de terceros, pero es menos conveniente.
-DelaiedFullListToSelectContact=Espere hasta que se presione una tecla antes de cargar el contenido de la lista de combo de contactos. Esto puede aumentar el rendimiento si tiene una gran cantidad de contactos, pero es menos conveniente.
 NumberOfKeyToSearch=Número de caracteres para activar la búsqueda: 1%s
 NumberOfBytes=Número de bytes
 SearchString=Cadena de búsqueda
@@ -200,7 +199,6 @@ SpaceY=Espacio Y
 NoticePeriod=Periodo de notificación
 Emails=Correos electrónicos
 EMailsSetup=Configuración de correo electrónico
-EMailsDesc=Esta página le permite anular sus parámetros de PHP predeterminados para el envío de correo electrónico. En la mayoría de los casos en Unix / Linux OS, la configuración de PHP es correcta y estos parámetros no son necesarios.
 EmailSenderProfiles=Perfiles de remitentes de correos electrónicos
 EMailsSenderProfileDesc=Puedes mantener esta sección vacía. Si ingresa algunos correos electrónicos aquí, se agregarán a la lista de posibles remitentes en el cuadro combinado cuando escriba un nuevo correo electrónico.
 MAIN_MAIL_SMTP_PORT=Puerto SMTP / SMTPS (valor predeterminado en php.ini: <b>%s</b>)
@@ -340,9 +338,7 @@ ExtrafieldParamHelpPassword=Dejar este campo en blanco significa que este valor
 ExtrafieldParamHelpselect=La lista de valores debe ser líneas con clave de formato, valor (donde la clave no puede ser '0') <br> <br> por ejemplo: <br> 1, value1 <br> 2, value2 <br> code3, value3 < br> ... <br> <br> Para tener la lista dependiendo de otra lista de atributos complementarios: <br> 1, value1 | options_ <i> parent_list_code </i>: parent_key <br> 2, value2 | options_ <i> parent_list_code </i>: parent_key <br> <br> Para que la lista dependa de otra lista: <br> 1, value1 | <i> parent_list_code </i>: parent_key <br> 2, value2 | <i> parent_list_code </i>: parent_key
 ExtrafieldParamHelpcheckbox=La lista de valores debe ser líneas con clave de formato, valor (donde la clave no puede ser '0') <br> <br> por ejemplo: <br> 1, value1 <br> 2, value2 <br> 3, value3 < br> ...
 ExtrafieldParamHelpradio=La lista de valores debe ser líneas con clave de formato, valor (donde la clave no puede ser '0') <br> <br> por ejemplo: <br> 1, value1 <br> 2, value2 <br> 3, value3 < br> ...
-ExtrafieldParamHelpsellist=La lista de valores proviene de una tabla <br> Sintaxis: table_name: label_field: id_field :: filter <br> Ejemplo: c_typent: libelle: id :: filter <br> <br> - idfilter es necesariamente una clave int primaria <br> - el filtro puede ser una prueba simple (por ejemplo, activo = 1) para mostrar solo el valor activo <br> También puede usar $ ID $ en el filtro, que es el ID actual del objeto actual. Para realizar una SELECCIÓN en el filtro, use $ SEL $ <br> si desea filtrar en campos adicionales use la sintaxis extra.fieldcode = ... (donde el código de campo es el código de campo extra) <br> <br> Para tener la lista dependiendo de otro atributo complementario de la lista: < br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> Para tener la lista dependiendo de otra lista: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
 ExtrafieldParamHelpchkbxlst=La lista de valores proviene de una tabla <br> Sintaxis: table_name: label_field: id_field :: filter <br> Ejemplo: c_typent: libelle: id :: filter <br> <br> filter puede ser una prueba simple (por ejemplo, active = 1 ) para mostrar solo el valor activo <br> También puede usar $ ID $ en el filtro, que es el ID actual del objeto actual. Para hacer un SELECCIONAR en el filtro, use $ SEL $ <br> si desea filtrar en campos adicionales. syntax extra.fieldcode = ... (donde código de campo es el código de campo extra) <br> <br> Para tener la lista dependiendo de otra lista de atributos complementarios: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> Para que la lista dependa de otra lista: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
-ExtrafieldParamHelplink=Los parámetros deben ser ObjectName: Classpath <br> Sintaxis: ObjectName: Classpath <br> Ejemplos: <br> Societe: societe / class / societe.class.php <br> Contacto: contact / class / contact.class.php
 ExtrafieldParamHelpSeparator=Mantener vacío para un separador simple <br> Establezca esto en 1 para un separador de colapso (abierto de forma predeterminada para una nueva sesión, luego el estado se mantiene para cada sesión de usuario) <br> Establezca esto en 2 para un separador de colapso (colapsado de manera predeterminada para una nueva sesión, luego el estado se mantiene antes de cada sesión de usuario)
 LibraryToBuildPDF=Biblioteca utilizada para la generación de PDF
 LocalTaxDesc=Algunos países pueden aplicar dos o tres impuestos en cada línea de factura. Si este es el caso, elija el tipo para el segundo y tercer impuesto y su tasa. Los tipos posibles son: <br> 1: el impuesto local se aplica a productos y servicios sin IVA (localtax se calcula sobre el monto sin impuestos) <br> 2: el impuesto local se aplica a productos y servicios, incluido el IVA (localtax se calcula sobre el monto + impuesto principal ) <br> 3: el impuesto local se aplica a productos sin IVA (el impuesto local se calcula sobre el monto sin impuestos) <br> 4: el impuesto local se aplica a productos que incluyen el IVA (impuesto local se calcula sobre el monto + IVA principal) <br> 5: local los impuestos se aplican a los servicios sin IVA (el impuesto local se calcula sobre la cantidad sin impuestos) <br> 6: el impuesto local se aplica a los servicios que incluyen impuestos (el impuesto local se calcula sobre la cantidad + impuestos)
@@ -373,7 +369,6 @@ ModuleCompanyCodeCustomerDigitaria=%s seguido del nombre del cliente truncado po
 ModuleCompanyCodeSupplierDigitaria=%s seguido del nombre del proveedor truncado por el número de caracteres: %s para el código de contabilidad del proveedor.
 Use3StepsApproval=De forma predeterminada, las órdenes de compra deben ser creadas y aprobadas por dos usuarios diferentes (un paso / usuario para crear y un paso / usuario para aprobar.) Nota: si el usuario tiene permiso para crear y aprobar, un paso / usuario será suficiente). Puede dar con esta opción. 3 pasos: 1 = validación, 2 = primera aprobación y 3 = segunda aprobación si la cantidad es suficiente. ). <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br>.
 UseDoubleApproval=3 pasos cuando la cantidad es mayor que ...
-WarningPHPMail=ADVERTENCIA: a menudo es mejor configurar los correos electrónicos salientes para usar el servidor de correo electrónico de su proveedor en lugar de la configuración predeterminada. Algunos proveedores de correo electrónico (como Yahoo) no le permiten enviar un correo electrónico desde otro servidor que no sea su propio servidor. Su configuración actual utiliza el servidor de la aplicación para enviar correos electrónicos y no el servidor de su proveedor de correo electrónico, por lo que algunos destinatarios (el compatible con el protocolo DMARC restrictivo) le preguntarán a su proveedor de correo electrónico si pueden aceptar su correo electrónico y algunos proveedores de correo electrónico. (como Yahoo) puede responder "no" porque el servidor no es de ellos, por lo que pocos de sus correos electrónicos enviados no serán aceptados (tenga cuidado también de la cuota de envío de su proveedor de correo electrónico). Si su proveedor de correo electrónico (como Yahoo) tiene esta restricción, debe cambiar la configuración del correo electrónico para elegir el otro método "Servidor SMTP" e ingresar el servidor SMTP y las credenciales proporcionadas por su proveedor de correo electrónico.
 WarningPHPMail2=Si su proveedor SMTP de correo electrónico necesita restringir el cliente de correo electrónico a algunas direcciones IP (muy raras), esta es la dirección IP del usuario de correo (MUA) para su aplicación ERP CRM: <strong> %s </strong> .
 ClickToShowDescription=Haga clic para mostrar la descripción
 DependsOn=Este módulo necesita el módulo (s)
@@ -422,7 +417,6 @@ Module54Name=Contratos / Suscripciones
 Module54Desc=Gestión de contratos (servicios o suscripciones recurrentes).
 Module55Desc=Administración de código de barras
 Module58Desc=Integración de un sistema ClickToDial (Asterisco, ...)
-Module59Desc=Añadir función para generar una cuenta Bookmark4u desde una cuenta de Dolibarr
 Module60Name=Adhesivos
 Module60Desc=Manejo de adhesivos
 Module70Desc=Administración de la intervención
@@ -498,7 +492,6 @@ Module50200Desc=Ofrezca a los clientes una página de pago en línea de PayPal (
 Module50300Name=Raya
 Module50300Desc=Ofrezca a los clientes una página de pago en línea de Stripe (tarjetas de crédito / débito). Esto se puede utilizar para permitir que sus clientes realicen pagos ad-hoc o pagos relacionados con un objeto Dolibarr específico (factura, pedido, etc.)
 Module50400Name=Contabilidad (doble entrada)
-Module50400Desc=Gestión contable (entradas dobles, soporte general y auxiliares de contabilidad). Exportar el libro mayor en varios otros formatos de software de contabilidad.
 Module54000Desc=Impresión directa (sin abrir los documentos) utilizando la interfaz IPP de Cups (la impresora debe estar visible desde el servidor y CUPS debe estar instalada en el servidor).
 Module55000Name=Sondeo, encuesta o votación
 Module55000Desc=Cree encuestas en línea, encuestas o votos (como Doodle, Studs, RDVz, etc.)
@@ -508,7 +501,6 @@ Module62000Desc=Añadir características para gestionar Incoterms.
 Module63000Desc=Gestionar recursos (impresoras, coches, salas, ...) para asignar a eventos.
 Permission11=Leer facturas de clientes
 Permission12=Crear / modificar facturas de clientes
-Permission13=No validar facturas de clientes
 Permission14=Validar facturas de clientes
 Permission15=Enviar facturas de cliente por correo electrónico
 Permission16=Crear pagos para facturas de clientes
@@ -637,7 +629,6 @@ Permission402=Crear / modificar descuentos
 Permission403=Validar descuentos
 Permission404=Eliminar descuentos
 Permission430=Usar barra de depuración
-Permission511=Leer pagos de salarios
 Permission512=Crear / modificar pagos de salarios.
 Permission514=Eliminar pagos de salarios.
 Permission520=Leer Préstamos
@@ -715,7 +706,6 @@ Permission23001=Leer trabajo programado
 Permission23002=Crear / actualizar trabajo programado
 Permission23003=Programa de trabajo
 Permission23004=Ejecutar trabajo programado
-Permission50101=Use el punto de venta
 Permission50201=Leer transacciones
 Permission50202=Importar transacciones
 Permission50401=Vincula productos y facturas con cuentas contables
@@ -964,7 +954,6 @@ AddAdressInList=Mostrar la lista de información de dirección del cliente / pro
 AskForPreferredShippingMethod=Pregunte por el método de envío preferido para terceros.
 FillThisOnlyIfRequired=Ejemplo: +2 (llenar sólo si se experimentan problemas de compensación de zona horaria)
 NumberingModules=Modelos de numeración
-PasswordGenerationStandard=Devuelve una contraseña generada de acuerdo con el algoritmo interno de Dolibarr: 8 caracteres que contienen números de números y caracteres en minúsculas, compartidos.
 PasswordGenerationNone=No sugiera una contraseña generada. La contraseña debe escribirse manualmente.
 PasswordGenerationPerso=Una contraseña de acuerdo con su configuración personal definida previamente.
 SetupPerso=Según su configuración
@@ -1147,7 +1136,6 @@ LDAPDescValues=Los valores de los ejemplos están disponibles para <b> OpenLDAP
 ForANonAnonymousAccess=Para un acceso autenticado (por ejemplo, para un acceso de escritura)
 PerfDolibarr=Configuración del rendimiento / optimización del informe
 YouMayFindPerfAdviceHere=Esta página proporciona algunas verificaciones o consejos relacionados con el rendimiento.
-NotInstalled=No está instalado, por lo que su servidor no se ralentiza por esto.
 ApplicativeCache=Caché aplicable
 MemcachedNotAvailable=No se encontró caché de aplicaciones. Se puede mejorar el rendimiento mediante la instalación de un servidor de caché y un módulo capaz de utilizar este servidor de caché. <br> Más información aquí <a href
 MemcachedModuleAvailableButNotSetup=Módulo memcached para caché de aplicaciones encontradas, pero la configuración del módulo no está completa.
@@ -1189,8 +1177,6 @@ SyslogFacility=Instalaciones
 SyslogFilename=Nombre de archivo y ruta de acceso
 YouCanUseDOL_DATA_ROOT=Puede utilizar DOL_DATA_ROOT / dolibarr.log para un archivo de registro en el directorio "documentos" de Dolibarr. Puede establecer una ruta de acceso diferente para almacenar este archivo.
 ErrorUnknownSyslogConstant=Constante %s no es una constante Syslog conocida
-OnlyWindowsLOG_USER=Windows sólo admite LOG_USER
-SyslogFileNumberOfSaves=Copias de seguridad de registro
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configurar la programación de la limpieza para establecer la frecuencia de la copia de seguridad
 DonationsSetup=Configuración del módulo de donación
 DonationsReceiptModel=Plantilla de recibo de donación
@@ -1232,7 +1218,6 @@ FreeLegalTextOnDeliveryReceipts=Texto libre en los recibos de entrega
 ActivateFCKeditor=Activar editor avanzado para:
 FCKeditorForCompany=WYSIWIG creación / edición de elementos descripción y nota (excepto productos / servicios)
 FCKeditorForProduct=WYSIWIG creación / edición de productos / servicios descripción y nota
-FCKeditorForProductDetails=Creación / edición WYSIWIG de líneas de detalles de productos para todas las entidades (propuestas, pedidos, facturas, etc.). <clase de letra
 FCKeditorForMailing= WYSIWIG creación / edición para eMailings masivos (Herramientas-> eMailing)
 FCKeditorForUserSignature=WYSIWIG creación / edición de firma de usuario
 FCKeditorForMail=WYSIWIG Creación / edición para todo el correo (excepto Herramientas-> eMailing)
@@ -1240,7 +1225,6 @@ FCKeditorForTicket=Creación/edición de WYSIWIG para entradas
 StockSetup=Configuración del módulo de stock / inventario
 IfYouUsePointOfSaleCheckModule=Si utiliza el módulo de Punto de Venta (POS) provisto por defecto o un módulo externo, su configuración puede ser ignorada por su módulo de POS. La mayoría de los módulos de POS están diseñados de forma predeterminada para crear una factura de inmediato y disminuir el stock, independientemente de las opciones aquí. Por lo tanto, si necesita o no una disminución de existencias al registrar una venta desde su POS, verifique también su POS
 NotTopTreeMenuPersonalized=Menús personalizados no vinculados a una entrada de menú superior
-Menu=Selección del menú
 MenuHandler=Manejador de menús
 MenuModule=Módulo fuente
 HideUnauthorizedMenu= Ocultar menús no autorizados
@@ -1284,8 +1268,6 @@ AGENDA_USE_EVENT_TYPE=Usar tipos de eventos (administrados en el menú Configura
 AGENDA_USE_EVENT_TYPE_DEFAULT=Establecer automáticamente este valor predeterminado para el tipo de evento en el formulario de creación de evento
 AGENDA_DEFAULT_FILTER_TYPE=Configure automáticamente este tipo de evento en el filtro de búsqueda de la vista de agenda
 AGENDA_DEFAULT_FILTER_STATUS=Establecer automáticamente este estado para eventos en el filtro de búsqueda de la vista de agenda
-AGENDA_REMINDER_EMAIL=Habilite el recordatorio de eventos <b> por correo electrónico </b> (la opción recordar / demora se puede definir en cada evento). Nota: El módulo <strong> %s </strong> debe estar habilitado y configurado correctamente para enviar un recordatorio a la frecuencia correcta.
-AGENDA_REMINDER_BROWSER=Habilite el recordatorio de evento <b> en el navegador del usuario </b> (cuando se alcanza la fecha del evento, cada usuario puede rechazar esto de la pregunta de confirmación del navegador)
 AGENDA_REMINDER_BROWSER_SOUND=Habilitar la notificación de sonido
 AGENDA_SHOW_LINKED_OBJECT=Mostrar objeto relacionado en la vista de la agenda
 ClickToDialSetup=Configuración del módulo - Haga clic para marcar
@@ -1410,7 +1392,6 @@ MailToSendSupplierRequestForQuotation=Solicitud de presupuesto / cotización
 MailToSendSupplierOrder=Ordenes de compra
 MailToSendSupplierInvoice=Facturas del vendedor / proveedor
 MailToThirdparty=Clientes / Proveedores
-MailToProject=Página de proyectos
 ByDefaultInList=Mostrar de forma predeterminada en la vista de lista
 YouUseLastStableVersion=Utiliza la última versión estable
 TitleExampleForMajorRelease=Ejemplo de mensaje que se puede usar para anunciar esta versión principal
@@ -1493,7 +1474,6 @@ DisabledResourceLinkContact=Deshabilitar la característica para vincular un rec
 EnableResourceUsedInEventCheck=Habilite la función para verificar si un recurso está en uso en un evento
 ConfirmUnactivation=Confirmar restablecimiento del módulo
 OnMobileOnly=Solo en pantalla pequeña (teléfono inteligente)
-DisableProspectCustomerType=Deshabilite el tipo de tercero "Prospecto + Cliente" (por lo tanto, el tercero debe ser Prospecto o Cliente, pero no pueden ser ambos)
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Active esta opción si es una persona ciega o si usa la aplicación desde un navegador de texto como Lynx o Links.
 ThisValueCanOverwrittenOnUserLevel=Cada usuario puede sobrescribir este valor desde su página de usuario - pestaña '%s'
 DefaultCustomerType=Tipo de tercero predeterminado para el formulario de creación "Nuevo cliente"
diff --git a/htdocs/langs/es_EC/categories.lang b/htdocs/langs/es_EC/categories.lang
index ae193783e1d..48cdc8b6202 100644
--- a/htdocs/langs/es_EC/categories.lang
+++ b/htdocs/langs/es_EC/categories.lang
@@ -57,5 +57,3 @@ ExtraFieldsCategories=Atributos complementarios
 CategorieRecursiv=Vincular automáticamente con la etiqueta/categoría principal
 AddProductServiceIntoCategory=Agregue el siguiente producto/servicio
 ChooseCategory=Elegir la categoría
-StocksCategoriesArea=Área de Categorías de Almacenes
-ActionCommCategoriesArea=Área de Categorías de Eventos
diff --git a/htdocs/langs/es_EC/companies.lang b/htdocs/langs/es_EC/companies.lang
index 067eeb2932e..398cf5448d1 100644
--- a/htdocs/langs/es_EC/companies.lang
+++ b/htdocs/langs/es_EC/companies.lang
@@ -117,7 +117,6 @@ ProfId4IN=ID Prof. 4
 ProfId5IN=ID Prof. 5
 ProfId1LU=ID Prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=ID Prof. 2 (Permiso de negocio)
-ProfId5MA=ID Prof. 5 (I.C.E.)
 ProfId1MX=ID Prof. 1 (R.F.C).
 ProfId2MX=ID Prof. 2 (R..P. IMSS)
 ProfId3MX=ID Prof. 3 (Profesional Charter)
@@ -134,7 +133,7 @@ ProfId1US=Id del Prof (FEIN)
 ProfId1RO=Id profesional 1 (CUI)
 ProfId2RO=Id profesional 2 (Nr. Înmatriculare)
 ProfId3RO=Id profesional 3 (CAEN)
-ProfId5RO=Id profesional 5 (EUID)
+ProfId4RO=Id profesional 5 (EUID)
 ProfId1RU=ID Prof. 1 (OGRN)
 ProfId2RU=ID Prof. 2 (INN)
 ProfId3RU=ID Prof. 3 (KPP)
diff --git a/htdocs/langs/es_EC/ecm.lang b/htdocs/langs/es_EC/ecm.lang
index b63b9896fda..7f8d9157910 100644
--- a/htdocs/langs/es_EC/ecm.lang
+++ b/htdocs/langs/es_EC/ecm.lang
@@ -10,19 +10,6 @@ ECMSectionWasRemoved=Se ha eliminado el directorio <b>%s</b>.
 ECMSectionWasCreated=Directorio <b>%s</b> ha sido creado.
 ECMSearchByKeywords=Búsqueda por palabras clave
 ECMSearchByEntity=Búsqueda por objeto
-ECMDocsBySocialContributions=Documentos vinculados a impuestos sociales o fiscales
-ECMDocsByThirdParties=Documentos vinculados a cliente/proveedor
-ECMDocsByProposals=Documentos vinculados a propuestas
-ECMDocsByOrders=Documentos vinculados a pedidos de clientes
-ECMDocsByContracts=Documentos vinculados a contratos
-ECMDocsByInvoices=Documentos vinculados a facturas de clientes
-ECMDocsByProducts=Documentos vinculados a los productos
-ECMDocsByProjects=Documentos vinculados a proyectos
-ECMDocsByUsers=Documentos vinculados a usuarios
-ECMDocsByInterventions=Documentos relacionados con las intervenciones
-ECMDocsByExpenseReports=Documentos vinculados a los informes de gastos
-ECMDocsByHolidays=Documentos vinculados a vacaciones
-ECMDocsBySupplierProposals=Documentos vinculados a propuestas de proveedores
 ECMNoDirectoryYet=Ningún directorio creado
 DeleteSection=Eliminar directorio
 ConfirmDeleteSection=¿Puede confirmar que desea eliminar el directorio <b>%s</b>?
diff --git a/htdocs/langs/es_EC/install.lang b/htdocs/langs/es_EC/install.lang
index ce151d5abbf..e70c7d299e8 100644
--- a/htdocs/langs/es_EC/install.lang
+++ b/htdocs/langs/es_EC/install.lang
@@ -8,13 +8,9 @@ ConfFileIsNotWritable=El archivo de configuración <b>%s</b> no se puede escribi
 ConfFileIsWritable=El archivo de configuración<b>%s</b> puede escribirse.
 ConfFileMustBeAFileNotADir=El archivo de configuración <b>%s</b> debe ser un archivo, no un directorio.
 ConfFileReload=Recarga de parámetros desde un archivo de configuración.
-PHPSupportSessions=Este PHP soporta sesiones.
 PHPSupportPOSTGETOk=Este PHP soporta las variables POST y GET.
 PHPSupportPOSTGETKo=Es posible que su configuración de PHP no admita las variables POST y/o GET. Compruebe el parámetro <b>variables_order</b> en php.ini.
-PHPSupportGD=Este PHP soporta funciones gráficas GD.
-PHPSupportCurl=Este PHP soporta Curl.
-PHPSupportUTF8=Este PHP soporta funciones UTF8.
-PHPSupportIntl=Este PHP soporta funciones Intl.
+PHPSupportSessions=Este PHP soporta sesiones.
 PHPSupport=Este PHP admite funciones %s.
 PHPMemoryOK=La memoria de sesión PHP max está configurada en<b>%s</b>. Esto debería ser suficiente.
 PHPMemoryTooLow=Su memoria de sesión de PHP max está configurada en <b>%s</b> bytes. Esto es demasiado bajo. Cambie su <b>php.ini</b> para establecer el parámetro <b>memory_limit</b> en al menos <b>%s</b>bytes.
diff --git a/htdocs/langs/es_EC/intracommreport.lang b/htdocs/langs/es_EC/intracommreport.lang
new file mode 100644
index 00000000000..0f08616a628
--- /dev/null
+++ b/htdocs/langs/es_EC/intracommreport.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+MenuIntracommReportList=Lista
+IntracommReportPeriod=Period of nalysis
diff --git a/htdocs/langs/es_EC/main.lang b/htdocs/langs/es_EC/main.lang
index a8b753d0290..f7bc16c0fc9 100644
--- a/htdocs/langs/es_EC/main.lang
+++ b/htdocs/langs/es_EC/main.lang
@@ -534,6 +534,7 @@ SearchIntoSupplierProposals=Propuestas del vendedor
 SearchIntoCustomerShipments=Envíos de clientes
 SearchIntoExpenseReports=Reporte de gastos
 SearchIntoLeaves=Hoja
+SearchIntoVendorPayments=Pagos a proveedores
 CommentPage=Espacio para comentarios
 Everybody=Todos
 AssignedTo=Asignado a
diff --git a/htdocs/langs/es_EC/members.lang b/htdocs/langs/es_EC/members.lang
index 97fc61a0f8d..38de273817a 100644
--- a/htdocs/langs/es_EC/members.lang
+++ b/htdocs/langs/es_EC/members.lang
@@ -14,13 +14,9 @@ MembersCards=Tarjetas de visita de los miembros
 MembersList=Lista de miembros
 MembersListToValid=Lista de proyectos de miembros (a validar)
 MembersListValid=Lista de miembros válidos
-MembersListUpToDate=Lista de miembros válidos con suscripción actualizada
-MembersListNotUpToDate=Lista de miembros válidos con suscripción desactualizada
 MembersListResiliated=Lista de miembros terminados
 MembersListQualified=Lista de miembros calificados
 MenuMembersToValidate=Miembros del draft
-MenuMembersUpToDate=Miembros actualizados
-MenuMembersNotUpToDate=Miembros fuera de fecha
 MenuMembersResiliated=Miembros terminados
 MembersWithSubscriptionToReceive=Miembros con suscripción para recibir
 MembersWithSubscriptionToReceiveShort=Suscripción para recibir
diff --git a/htdocs/langs/es_EC/products.lang b/htdocs/langs/es_EC/products.lang
index ce575da3b7c..59bf558386b 100644
--- a/htdocs/langs/es_EC/products.lang
+++ b/htdocs/langs/es_EC/products.lang
@@ -61,19 +61,13 @@ NoteNotVisibleOnBill=Nota (no visible en facturas, propuestas...)
 ServiceLimitedDuration=Si el producto es un servicio con duración limitada:
 MultiPricesAbility=Múltiples segmentos de precios por producto / servicio (cada cliente está en un segmento de precios)
 MultiPricesNumPrices=Número de precios
-AssociatedProductsAbility=Activar productos virtuales (kits)
-AssociatedProducts=Productos virtuales
-AssociatedProductsNumber=Número de productos que componen este producto virtual
 ParentProductsNumber=Número de producto de embalaje principal
 ParentProducts=Productos para los padres
-IfZeroItIsNotUsedByVirtualProduct=Si 0, este producto no es utilizado por ningún producto virtual
 KeywordFilter=Filtro de palabras clave
 CategoryFilter=Filtro de categoría
 ProductToAddSearch=Buscar producto para agregar
 NoMatchFound=No se encontraron coincidencias
 ListOfProductsServices=Lista de productos/servicios
-ProductAssociationList=Lista de productos / servicios que son componente(s) de este producto/kit virtual
-ProductParentList=Lista de productos/servicios virtuales con este producto como un componente
 ErrorAssociationIsFatherOfThis=Uno del producto seleccionado es padre con el producto actual
 ConfirmDeleteProduct=¿Está seguro de que desea eliminar este producto/servicio?
 ProductDeleted=Producto/Servicio "%s" eliminado de la base de datos.
diff --git a/htdocs/langs/es_EC/propal.lang b/htdocs/langs/es_EC/propal.lang
index 552a01bc521..79174992708 100644
--- a/htdocs/langs/es_EC/propal.lang
+++ b/htdocs/langs/es_EC/propal.lang
@@ -39,7 +39,6 @@ SendPropalByMail=Enviar propuesta comercial por correo
 DatePropal=Fecha de la propuesta
 DateEndPropal=Fecha de finalización de la validez
 ValidityDuration=Duración de la validez
-CloseAs=Establecer el estado en
 ErrorPropalNotFound=Propal%s no encontrado
 AddToDraftProposals=Añadir a proyecto de propuesta
 NoDraftProposals=Ningún proyecto de propuesta
diff --git a/htdocs/langs/es_EC/recruitment.lang b/htdocs/langs/es_EC/recruitment.lang
index f7b234800a0..5bd33f2a0c6 100644
--- a/htdocs/langs/es_EC/recruitment.lang
+++ b/htdocs/langs/es_EC/recruitment.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - recruitment
 About =page
+PositionToBeFilled=Cargo
diff --git a/htdocs/langs/es_EC/stocks.lang b/htdocs/langs/es_EC/stocks.lang
index 00cba31ae26..cb52d69ad69 100644
--- a/htdocs/langs/es_EC/stocks.lang
+++ b/htdocs/langs/es_EC/stocks.lang
@@ -87,8 +87,6 @@ DesiredStockDesc=Esta cantidad de inventario será el valor utilizado para llena
 StockToBuy=Ordenar
 Replenishment=Reposición
 ReplenishmentOrders=Órdenes de reabastecimiento
-VirtualDiffersFromPhysical=De acuerdo con las opciones de acciones de aumento/disminución, el Inventario físico y el Inventario virtual (órdenes físicas y actuales) pueden diferir
-UseVirtualStockByDefault=Utilizar el inventario virtual de forma predeterminada, en lugar del inventario físico, para la función de reposición
 UseVirtualStock=Utilizar Inventario virtual
 UsePhysicalStock=Usar inventario físico
 CurentlyUsingVirtualStock=Inventario Virtual
@@ -139,8 +137,6 @@ inventoryErrorQtyAdd=Error: una cantidad es menor que cero
 inventoryWarningProductAlreadyExists=Este producto ya está en la lista
 SelectCategory=Filtro de categoría
 SelectFournisseur=Filtro de proveedores
-INVENTORY_DISABLE_VIRTUAL=Producto virtual (kit): no disminuya el stock de un producto hijo
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Utilice el precio de compra si no se puede encontrar el último precio de compra
 inventoryChangePMPPermission=Permitir cambiar el valor PMP de un producto
 OnlyProdsInStock=No añada producto sin inventario
 TheoricalQty=Cantidad teórica
diff --git a/htdocs/langs/es_EC/suppliers.lang b/htdocs/langs/es_EC/suppliers.lang
index 6b01cbb42a3..4e550c17661 100644
--- a/htdocs/langs/es_EC/suppliers.lang
+++ b/htdocs/langs/es_EC/suppliers.lang
@@ -32,5 +32,4 @@ SupplierReputation=Reputación del vendedor
 DoNotOrderThisProductToThisSupplier=No ordenes
 NotTheGoodQualitySupplier=Baja calidad
 AllProductServicePrices=Todos los precios de productos / servicios
-AllProductReferencesOfSupplier=Todas las referencias de producto / servicio del vendedor
 BuyingPriceNumShort=Precios del proveedor
diff --git a/htdocs/langs/es_EC/website.lang b/htdocs/langs/es_EC/website.lang
index f13a3162157..fb174b10601 100644
--- a/htdocs/langs/es_EC/website.lang
+++ b/htdocs/langs/es_EC/website.lang
@@ -14,7 +14,6 @@ EditCss=Editar propiedades web
 EditMenu=Editar menú
 EditPageMeta=Editar propiedades
 Webpage=Página web/contenedor
-HomePage=Página Principal
 PreviewOfSiteNotYetAvailable=Vista previa de su sitio web <strong>%s</strong> aún no disponible. Primero debe '<strong>Importar una plantilla de sitio web completa</strong>' o simplemente '<strong>Agregar una página / contenedor</strong>'.
 RequestedPageHasNoContentYet=La página solicitada con id %s todavía no tiene contenido o el archivo de caché .tpl.php fue eliminado. Editar el contenido de la página para resolver esto.
 PageContent=Página/Contenair
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index 59f43c94cc7..62560e80262 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Predeterminado para el servicio
 DefaultForProduct=Predeterminado para el producto
 CantSuggest=No se puede sugerir
 AccountancySetupDoneFromAccountancyMenu=La mayor parte de la configuración de la contabilidad se realiza desde el menú %s
-ConfigAccountingExpert=Configuración del módulo contable
+ConfigAccountingExpert=Configuración de la contabilidad del módulo (doble entrada)
 Journalization=Procesar diarios
-Journaux=Diarios
+Journals=Diarios
 JournalFinancial=Diarios financieros
 BackToChartofaccounts=Volver al plan contable
 Chartofaccounts=Plan contable
+ChartOfSubaccounts=Plan de cuentas individuales
+ChartOfIndividualAccountsOfSubsidiaryLedger=Plan de cuentas individuales del libro auxiliar
 CurrentDedicatedAccountingAccount=Cuenta contable dedicada
 AssignDedicatedAccountingAccount=Nueva cuenta a asignar
 InvoiceLabel=Etiqueta factura
@@ -33,8 +35,8 @@ OtherInfo=Otra información
 DeleteCptCategory=Eliminar la cuenta contable del grupo
 ConfirmDeleteCptCategory=¿Está seguro de querer eliminar esta cuenta contable del grupo de cuentas contables?
 JournalizationInLedgerStatus=Estado de diario
-AlreadyInGeneralLedger=Registrado en el Libro Mayor
-NotYetInGeneralLedger=No se ha registrado en el Libro Mayor
+AlreadyInGeneralLedger=Ya transferido en diarios contables y libro mayor
+NotYetInGeneralLedger=Aún no se ha transferido a los diarios y al libro mayor
 GroupIsEmptyCheckSetup=El grupo está vacío, compruebe la configuración de grupos contables
 DetailByAccount=Ver detalles por cuenta
 AccountWithNonZeroValues=Cuentas con valores no cero
@@ -43,7 +45,9 @@ CountriesInEEC=Países en la CEE
 CountriesNotInEEC=Países no incluidos en la CEE
 CountriesInEECExceptMe=Países en la CEE excepto %s
 CountriesExceptMe=Todos los países excepto %s
-AccountantFiles=Exportar documentos contables
+AccountantFiles=Exportar documentos de origen
+ExportAccountingSourceDocHelp=Con esta herramienta, puede exportar los eventos de origen (lista y PDF) que se utilizaron para generar su contabilidad. Para exportar sus diarios, use la entrada de menú %s - %s.
+VueByAccountAccounting=Ver por cuenta contable
 
 MainAccountForCustomersNotDefined=Cuenta contable para clientes no definida en la configuración
 MainAccountForSuppliersNotDefined=Cuenta contable para proveedores no definida en la configuración
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=PASO %s: Añadir o editar transacciones existentes, g
 
 AccountancyAreaDescClosePeriod=PASO %s: Cerrar periodo, por lo que no podrá hacer modificaciones en un futuro.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=No se ha completado un paso obligatorio en la configuración (cuenta contable no definida en todas las cuentas bancarias)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=No se ha completado un paso obligatorio en la configuración (el diario de códigos de contabilidad no está definido para todas las cuentas bancarias)
 Selectchartofaccounts=Seleccione un plan contable activo
 ChangeAndLoad=Cambiar y cargar
 Addanaccount=Añadir una cuenta contable
@@ -89,6 +93,8 @@ SubledgerAccount=Subcuenta contable
 SubledgerAccountLabel=Etiqueta subcuenta contable
 ShowAccountingAccount=Mostrar diario de cuentas
 ShowAccountingJournal=Mostrar diario contable
+ShowAccountingAccountInLedger=Mostrar cuenta contable en el libro mayor
+ShowAccountingAccountInJournals=Mostrar cuenta contable en diarios
 AccountAccountingSuggest=Cuenta contable sugerida
 MenuDefaultAccounts=Cuentas contables por defecto
 MenuBankAccounts=Cuentas Bancarias
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Contabilizar informes de gastos
 CreateMvts=Crear nuevo movimiento
 UpdateMvts=Modificar transacción
 ValidTransaction=Transacción validada
-WriteBookKeeping=Registrar movimientos en el Libro Mayor
+WriteBookKeeping=Registrar transacciones en contabilidad
 Bookkeeping=Libro Mayor
+BookkeepingSubAccount=Libro mayor auxiliar
 AccountBalance=Saldo de la cuenta
 ObjectsRef=Referencia de objeto origen
 CAHTF=Total compras a proveedor antes de impuestos
@@ -149,7 +156,8 @@ ACCOUNTING_MANAGE_ZERO=Gestiona el cero al final de una cuenta contable. Necesar
 BANK_DISABLE_DIRECT_INPUT=Desactivar transacciones directas en cuenta bancaria
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Habilitar exportación de borradores al diario
 ACCOUNTANCY_COMBO_FOR_AUX=Habilitar la lista combinada para la cuenta subsidiaria (puede ser lento si tiene muchos terceros)
-ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DATE_START_BINDING=Defina una fecha para comenzar a vincular y transferir en contabilidad. Por debajo de esta fecha, las transacciones no se transferirán a contabilidad.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=En la transferencia de contabilidad, seleccione el período que se muestra de forma predeterminada
 
 ACCOUNTING_SELL_JOURNAL=Diario de ventas
 ACCOUNTING_PURCHASE_JOURNAL=Diario de compras
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Cuenta operaciones pendientes de asignar
 DONATION_ACCOUNTINGACCOUNT=Cuenta contable para registrar donaciones
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Cuenta contable para registrar subscripciones
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Cuenta contable por defecto para registrar el depósito del cliente
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cuenta contable predeterminada para los productos comprados (si no se define en el producto)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Cuenta contable por defecto para los productos comprados en EEC (se usa si no se define en la hoja de productos)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Cuenta contable por defecto para los productos comprados e importados fuera de la EEC (usado si no está definido en la hoja de productos)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Por grupos predefinidos
 ByPersonalizedAccountGroups=Por grupos personalizados
 ByYear=Por año
 NotMatch=No establecido
-DeleteMvt=Eliminar líneas del Libro Mayor
+DeleteMvt=Eliminar algunas líneas de operación de la contabilidad
 DelMonth=Mes a eliminar
 DelYear=Año a eliminar
 DelJournal=Diario a eliminar
-ConfirmDeleteMvt=Esto eliminará todas las líneas del Libro mayor para el año/mes y/o de un diario específico (se requiere al menos un criterio). Deberá volver a utilizar la función 'Registro en contabilidad' para que el registro eliminado vuelva al libro mayor.
-ConfirmDeleteMvtPartial=Esto eliminará la transacción del libro mayor (se eliminarán todas las líneas relacionadas con la misma transacción)
+ConfirmDeleteMvt=Esto eliminará todas las líneas de operación de la contabilidad para el año / mes y / o para un diario específico (se requiere al menos un criterio). Tendrá que reutilizar la función '%s' para que el registro eliminado vuelva al libro mayor.
+ConfirmDeleteMvtPartial=Esto eliminará la transacción de la contabilidad (se eliminarán todas las líneas de operación relacionadas con la misma transacción)
 FinanceJournal=Diario financiero
 ExpenseReportsJournal=Diario informe de gastos
 DescFinanceJournal=El diario financiero incluye todos los tipos de pagos por cuenta bancaria
-DescJournalOnlyBindedVisible=Esta es una vista del registro vinculado a una cuenta contable y que se puede registrar en el Libro Mayor.
+DescJournalOnlyBindedVisible=Esta es una vista de registro que está vinculada a una cuenta de contabilidad y se puede registrar en Diarios y Libro mayor.
 VATAccountNotDefined=Cuenta contable para IVA no definida
 ThirdpartyAccountNotDefined=Cuenta contable de tercero no definida
 ProductAccountNotDefined=Cuenta contable de producto no definida
@@ -285,7 +295,7 @@ ShowTutorial=Ver Tutorial
 NotReconciled=No reconciliado
 
 ## Admin
-BindingOptions=Binding options
+BindingOptions=Opciones de enlace
 ApplyMassCategories=Aplicar categorías en masa
 AddAccountFromBookKeepingWithNoCategories=Cuenta disponible sin grupo personalizado
 CategoryDeleted=La categoría para la cuenta contable ha sido eliminada
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Este diario ya esta siendo usado
 AccountingAccountForSalesTaxAreDefinedInto=Nota: La cuenta contable del IVA a las ventas se define en el menú <b> %s</b> - <b> %s</b>
 NumberOfAccountancyEntries=Número de entradas
 NumberOfAccountancyMovements=Número de movimientos
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Deshabilitar la vinculación y la transferencia en la contabilidad de ventas (las facturas de los clientes no se tendrán en cuenta en la contabilidad)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Deshabilitar la vinculación y transferencia en contabilidad en compras (las facturas de proveedores no se tendrán en cuenta en la contabilidad)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Desactive la vinculación y transferencia en contabilidad en informes de gastos (los informes de gastos no se tendrán en cuenta en la contabilidad)
 
 ## Export
 ExportDraftJournal=Exportar libro borrador
@@ -326,6 +339,8 @@ Modelcsv_configurable=Exportación CSV Configurable
 Modelcsv_FEC=Exportación FEC
 Modelcsv_Sage50_Swiss=Exportación a Sage 50 Suiza
 Modelcsv_winfic=Exportar Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Id plan contable
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 31204078eb6..12d860d8ecc 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Eliminar bloqueo de conexiones
 YourSession=Su sesión
 Sessions=Sesiones de usuarios
 WebUserGroup=Servidor web usuario/grupo
+PermissionsOnFilesInWebRoot=Permisos de ficheros en directorio raiz web
+PermissionsOnFile=Permisos en el fichero %s
 NoSessionFound=Parece que su PHP no puede listar las sesiones activas. El directorio de salvaguardado de sesiones (<b>%s</b>) puede estar protegido (por ejemplo, por los permisos del sistema operativo o por la directiva open_basedir de su PHP).
 DBStoringCharset=Codificación de la base de datos para el almacenamiento de datos
 DBSortingCharset=Codificación de la base de datos para clasificar los datos
@@ -71,7 +73,7 @@ DisableJavascriptNote=Nota: Para propósitos de prueba o depuración. Para la op
 UseSearchToSelectCompanyTooltip=También si tiene un gran número de terceros (> 100 000), puede aumentar la velocidad mediante el establecimiento COMPANY_DONOTSEARCH_ANYWHERE constante a 1 en Configuración-> Otros. La búsqueda será limitada a la creación de cadena.
 UseSearchToSelectContactTooltip=También si usted tiene un gran número de terceros (> 100 000), puede aumentar la velocidad mediante el establecimiento CONTACT_DONOTSEARCH_ANYWHERE constante a 1 en Configuración-> Otros. La búsqueda será limitada a la creación de cadena.
 DelaiedFullListToSelectCompany=Esperar a que presione una tecla antes de cargar el contenido de la lista combinada de terceros <br>Esto puede incrementar el rendimiento si tiene un gran número de terceros, pero es menos conveniente.
-DelaiedFullListToSelectContact=Esperar a que presione una tecla antes de cargar el contenido de la lista combinada de contactos. <br> Esto puede incrementar el rendimiento si tiene un gran número de contactos, pero es menos conveniente.
+DelaiedFullListToSelectContact=Espera a que presione una tecla antes de cargar el contenido de la lista de contactos. <br> Esto puede incrementar el rendimiento si tiene un gran número de contactos, pero es menos conveniente.
 NumberOfKeyToSearch=Número de caracteres para desencadenar la búsqueda: %s
 NumberOfBytes=Número de Bytes
 SearchString=Buscar cadena
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=En un documento de un tercero, puede elegir
 JavascriptDisabled=Javascript desactivado
 UsePreviewTabs=Ver fichas "vista previa"
 ShowPreview=Ver vista previa
+ShowHideDetails=Mostrar-Ocultar detalles
 PreviewNotAvailable=Vista previa no disponible
 ThemeCurrentlyActive=Tema actualmente activo
 CurrentTimeZone=Zona horaria PHP (Servidor)
@@ -219,7 +222,7 @@ Nouveauté=Novedad
 AchatTelechargement=Comprar/Descargar
 GoModuleSetupArea=Para instalar un nuevo módulo, vaya al área de configuración de módulos en <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, el sitio oficial de módulos complementarios y para Dolibarr ERP/CRM
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
+DoliPartnersDesc=Listado de empresas que ofrecen módulos y desarrollos a medida.<br> Nota: dado que Dolibarr es una aplicación de código abierto, <i>cualquier persona</i> con experiencia en programación PHP puede desarrollar un módulo.
 WebSiteDesc=Sitios web de referencia para encontrar más módulos (no core)...
 DevelopYourModuleDesc=Algunas soluciones para desarrollar su propio módulo ...
 URL=URL
@@ -271,7 +274,7 @@ NoticePeriod=Plazo de aviso
 NewByMonth=Nuevo por mes
 Emails=E-Mails
 EMailsSetup=Configuración e-mails
-EMailsDesc=Esta página le permite sobrescribir sus parámetros de PHP para el envío de correos electrónicos. En la mayoría de los casos, en el sistema operativo Unix/Linux, su configuración de PHP es correcta y estos parámetros son innecesarios.
+EMailsDesc=Esta página le permite definir las opciones para enviar e-mails.
 EmailSenderProfiles=Perfiles de remitentes de e-mails
 EMailsSenderProfileDesc=Puede mantener esta sección vacía. Si indica algunos e-mails aquí, se agregarán a la lista de posibles remitentes en el combobox cuando escriba un nuevo e-mail
 MAIN_MAIL_SMTP_PORT=Puerto del servidor SMTP (Por defecto en php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=ID de autentificación SMTP  (si el servidor requiere autenti
 MAIN_MAIL_SMTPS_PW=Contraseña SMTP (si el servidor requiere autentificación)
 MAIN_MAIL_EMAIL_TLS=Usar encriptación TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Uso de encriptación TLS (STARTTLS)
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autorizar los certificados auto-firmados
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Usar DKIM para generar firma de e-mail
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Dominio de e-mail para usar con dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Nombre del selector dkim
@@ -300,9 +304,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Remitente de e-mails para envíos manuales (e-mail de
 UserEmail=e-mail de usuario
 CompanyEmail=E-mail de empresa
 FeatureNotAvailableOnLinux=Funcionalidad no disponible en sistemas  Unix. Pruebe su sendmail localmente.
-FixOnTransifex=Fix the translation on the online translation platform of project
+FixOnTransifex=Corrija la traducción en la plataforma de traducción en línea del proyecto.
 SubmitTranslation=Si la traducción de este idioma no está completa o si encuentra errores, puede corregir esto editando los archivos en el directorio <b>langs/%s</b> y enviar su cambio a www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
+SubmitTranslationENUS=Si la traducción de este idioma es incompleta o si encuentra errores, puede corregirlos mediante la edición de los archivos en el directorio <b>langs/%s</b> y el envío los cambios al foro www.dolibarr.es o, si es desarrollador, con un PR en github.com/Dolibarr/dolibarr.
 ModuleSetup=Configuración del módulo
 ModulesSetup=Configuración de los módulos
 ModuleFamilyBase=Sistema
@@ -387,12 +391,12 @@ ModuleMustBeEnabledFirst=El módulo <b>%s</b> debe ser activado antes si necesit
 SecurityToken=Clave para encriptar urls
 NoSmsEngine=No hay disponible ningún gestor de envío de SMS. Los gestores de envío de SMS no se instalan por defecto ya que dependen de cada proveedor, sin embargo puede encontrarlos en la plataforma %s
 PDF=PDF
-PDFDesc=Global options for PDF generation
-PDFAddressForging=Rules for address section
+PDFDesc=Opciones globales para la generación de PDF.
+PDFAddressForging=Reglas para las direcciones
 HideAnyVATInformationOnPDF=Ocultar toda la información relacionada con el Impuesto/IVA
 PDFRulesForSalesTax=Reglas de IVA
 PDFLocaltax=Reglas para %s
-HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
+HideLocalTaxOnPDF=Ocultar la tasa %s en la columna de impuesto / IVA
 HideDescOnPDF=Ocultar descripción de los productos
 HideRefOnPDF=Ocultar referencia de los productos
 HideDetailsOnPDF=Ocultar detalles de las líneas de productos
@@ -409,9 +413,9 @@ PriceBaseTypeToChange=Cambiar el precio cuya referencia de base es
 MassConvert=Lanzar la conversión en masa
 PriceFormatInCurrentLanguage=Formato de precio en el idioma actual
 String=Cadena de texto
-String1Line=String (1 line)
+String1Line=Texto (1 línea)
 TextLong=Texto largo
-TextLongNLines=Long text (n lines)
+TextLongNLines=Texto largo (n líneas)
 HtmlText=Texto html
 Int=Numérico entero
 Float=Decimal
@@ -440,7 +444,7 @@ ExtrafieldParamHelpcheckbox=El listado de valores tiene que ser líneas con el f
 ExtrafieldParamHelpradio=El listado de valores tiene que ser líneas con el formato key,valor (donde key no puede ser 0)<br><br> por ejemplo: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpsellist=Lista de valores proviene de una tabla <br> Sintaxis: nombre_tabla: etiqueta_field: id_field :: filtro <br> Ejemplo: c_typent: libelle: id :: filtro <br> <br> filtro puede ser una prueba simple (por ejemplo, activa = 1) Para mostrar sólo el valor activo <br> También puede utilizar $ ID $ en el filtro witch es el actual id del objeto actual <br> Para hacer un SELECT en el filtro de uso $ SEL $ <br> si desea filtrar en campos adicionales utilizar la sintaxis Extra.fieldcode = ... (donde código de campo es el código de campo adicional) <br> <br> Para que la lista dependa de otra lista de campos adicionales: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> Para que la lista dependa de otra lista: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
 ExtrafieldParamHelpchkbxlst=Lista de valores proviene de una tabla <br> Sintaxis: nombre_tabla: etiqueta_field: id_field :: filtro <br> Ejemplo: c_typent: libelle: id :: filtro <br> <br> filtro puede ser una prueba simple (por ejemplo, activa = 1) Para mostrar sólo el valor activo <br> También puede utilizar $ ID $ en el filtro witch es el id actual del objeto actual <br> Para hacer un SELECT en el filtro de uso $ SEL $ <br> si desea filtrar en campos adicionales utilizar la sintaxis Extra.fieldcode = ... (donde código de campo es el código de campo adicional) <br> <br> Para que la lista dependa de otra lista de campos adicionales: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> Para que la lista dependa de otra lista: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
-ExtrafieldParamHelplink=Los parámetros deben ser ObjectName: Classpath<br>Sintaxis: ObjectName:Classpath<br>Ejemplo: <br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Los parámetros deben ser NombreObjeto:RutaClase <br>Sintaxis: NombreObjeto:RutaClase
 ExtrafieldParamHelpSeparator=Mantener vacío para un separador simple <br> Establezca a 1 para un separador de colapso (abierto de forma predeterminada para una nueva sesión, luego el estado se mantiene para cada sesión de usuario) <br> Establezca a 2 para un separador de colapso (colapsado por defecto para una nueva sesión, luego el estado se mantiene para cada sesión de usuario)
 LibraryToBuildPDF=Libreria usada en la generación de los PDF
 LocalTaxDesc=Algunos países aplican 2 o 3 tasas a cada línea de factura. Si es el caso, escoja el tipo de la segunda y tercera tasa y su valor. Los posibles tipos son:<br>1 : tasa local aplicable a productos y servicios sin IVA (tasa local es calculada sobre la base imponible)<br>2 : tasa local se aplica a productos y servicios incluyendo el IVA (tasa local es calculada sobre base imponible+IVA)<br>3 : tasa local se aplica a productos sin IVA (tasa local es calculada sobre la base imponible)<br>4 : tasa local se aplica a productos incluyendo el IVA (tasa local es calculada sobre base imponible+IVA)<br>5 : tasa local se aplica a servicios sin IVA (tasa local es calculada sobre base imponible)<br>6 : tasa local se aplica a servicios incluyendo el IVA (tasa local es calculada sobre base imponible+IVA)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s seguido del nombre del cliente truncado po
 ModuleCompanyCodeSupplierDigitaria=%s seguido del nombre del proveedor truncado por el número de caracteres: %s para el código contable del proveedor.
 Use3StepsApproval=De forma predeterminada, los pedidos a proveedor deben ser creados y aprobados por 2 usuarios diferentes (un paso/usuario para crear y un paso/usuario para aprobar. Tenga en cuenta que si el usuario tiene tanto el permiso para crear y aprobar, un paso usuario será suficiente) . Puede pedir con esta opción introducir una tercera etapa de aprobación/usuario, si la cantidad es superior a un valor específico (por lo que serán necesarios 3 pasos: 1 validación, 2=primera aprobación y 3=segunda aprobación si la cantidad es suficiente).<br>Deje vacío si una aprobación (2 pasos) es suficiente, si se establece en un valor muy bajo (0,1) se requiere siempre una segunda aprobación (3 pasos).
 UseDoubleApproval=Usar 3 pasos de aprobación si el importe (sin IVA) es mayor que...
-WarningPHPMail=ADVERTENCIA: A menudo es mejor configurar el email para usar el servidor de tu proveedor en lugar de la configuración por defecto. Algunos proveedores de correo electrónico (como Yahoo) no le permiten enviar un e-mail desde otro servidor que no sea el servidor de Yahoo. Tu configuración actual usa el servidor de la aplicación para enviar emails y no el servidor de tu proveedor de correo, así que algunos destinatarios (aquellos compatibles con el protocolo restrictivo DMARC), preguntarán a tu proveedor de correo si pueden aceptar el correo y otros proveedores (como Yahoo) pueden responder "no" porque el servidor no es uno de sus servidores, así que tus correos enviados pueden no ser aceptados (vigila también la cuota de envío de tu servidor de correo). <br>Si su proveedor de correo electrónico (como Yahoo) tiene esta restricción, debe cambiar la configuración de e-mail para elegir el método "servidor SMTP" y introducir el servidor SMTP y credenciales proporcionadas por su proveedor de correo electrónico (pregunte a su proveedor de correo electrónico las credenciales SMTP para su cuenta).
+WarningPHPMail=ADVERTENCIA: La configuración para enviar correos electrónicos desde la aplicación utiliza la configuración genérica predeterminada. A menudo es mejor configurar los correos electrónicos salientes para utilizar el servidor de correo electrónico de su proveedor de servicios de correo electrónico en lugar de la configuración predeterminada por varias razones:
+WarningPHPMailA=- El uso del servidor del proveedor de servicios de correo electrónico aumenta la confiabilidad de su correo electrónico, por lo que aumenta la entrega sin ser marcado como SPAM
+WarningPHPMailB=- Algunos proveedores de servicios de correo electrónico (como Yahoo) no le permiten enviar un correo electrónico desde otro servidor que no sea su propio servidor. Su configuración actual utiliza el servidor de la aplicación para enviar correo electrónico y no el servidor de su proveedor de correo electrónico, por lo que algunos destinatarios (el que es compatible con el protocolo restrictivo DMARC) le preguntarán a su proveedor de correo electrónico si pueden aceptar su correo electrónico y algunos proveedores de correo electrónico. (como Yahoo) puede responder "no" porque el servidor no es de ellos, por lo que es posible que algunos de sus correos electrónicos enviados no sean aceptados para la entrega (tenga cuidado también con la cuota de envío de su proveedor de correo electrónico).
+WarningPHPMailC=- El uso del servidor SMTP de su propio proveedor de servicios de correo electrónico para enviar correos electrónicos también es interesante, por lo que todos los correos electrónicos enviados desde la aplicación también se guardarán en el directorio "Enviados" de su buzón.
+WarningPHPMailD=Si el método 'Correo PHP' es realmente el método que le gustaría usar, puede eliminar esta advertencia agregando la constante MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP a 1 en Inicio - Configuración - Otro.
 WarningPHPMail2=Si su proveedor SMTP de correo electrónico necesita restringir el cliente de correo electrónico a algunas direcciones IP (muy raro), esta es la dirección IP de su aplicación ERP CRM: <strong>%s</strong>.
-WarningPHPMailSPF=Si el nombre de dominio en la dirección de correo electrónico del remitente está protegido por SPF (pregunte a su proveedor de correo electrónico), debe incluir las siguientes IP en el registro SPF del DNS de su dominio: <strong> %s </strong>.
+WarningPHPMailSPF=Si el nombre de dominio en la dirección de correo electrónico del remitente está protegido por un registro SPF (pregunte a su registro de nombre de dominio), debe agregar las siguientes IP en el registro SPF del DNS de su dominio: <strong> %s </strong>.
 ClickToShowDescription=Clic para ver la descripción
 DependsOn=Este módulo necesita el módulo(s)
 RequiredBy=Este módulo es requerido por los módulos
@@ -546,13 +554,11 @@ Module54Desc=Gestión de contratos (servicios o suscripciones recurrentes)
 Module55Name=Códigos de barras
 Module55Desc=Gestión de los códigos de barras
 Module56Name=Pago por transferencia bancaria
-Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Payments by Direct Debit
-Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
+Module56Desc=Gestión de pagos a proveedores mediante órdenes de transferencia bancaria. Incluye la generación de archivos SEPA para países europeos.
+Module57Name=Pagos por domiciliación bancaria
+Module57Desc=Gestión de domiciliaciones. También incluye generación de archivo SEPA para los países europeos.
 Module58Name=ClickToDial
 Module58Desc=Integración con ClickToDial
-Module59Name=Bookmark4u
-Module59Desc=Añade función para generar una cuenta Bookmark4u desde una cuenta Dolibarr
 Module60Name=Pegatinas
 Module60Desc=Gestión de pegatinas
 Module70Name=Intervenciones
@@ -656,7 +662,7 @@ Module50200Desc=Ofrece a los clientes pagos online  vía PayPal (cuenta PayPal o
 Module50300Name=Stripe
 Module50300Desc=Ofrece a los clientes pagos online vía Stripe (tarjetas de crédito/débito). Esto puede ser usado para permitir a sus clientes realizar pagos libres o pagos en un objeto de Dolibarr en particular (factura, pedido...)
 Module50400Name=Contabilidad (doble partida)
-Module50400Desc=Gestión contable (doble partida, libros generales y auxiliares). Exporte a varios formatos de software de contabilidad.
+Module50400Desc=Gestión contable (partidas dobles, soporte de libros mayores y auxiliares). Exporte el libro mayor en varios otros formatos de software de contabilidad.
 Module54000Name=PrintIPP
 Module54000Desc=La impresión directa (sin abrir los documentos) usa el interfaz Cups IPP (La impresora debe ser visible por el servidor y CUPS debe estar instalado en el servidor)
 Module55000Name=Encuesta o Voto
@@ -671,7 +677,7 @@ Module63000Name=Recursos
 Module63000Desc=Gestiona recursos (impresoras, automóviles, salas, ...) para compartirlos en  los eventos
 Permission11=Consultar facturas
 Permission12=Crear/Modificar facturas
-Permission13=De-validar facturas
+Permission13=Desvalidar facturas de cliente
 Permission14=Validar facturas
 Permission15=Enviar facturas por correo
 Permission16=Emitir pagos de facturas
@@ -688,6 +694,7 @@ Permission32=Crear/modificar productos
 Permission34=Eliminar productos
 Permission36=Ver/gestionar los productos ocultos
 Permission38=Exportar productos
+Permission39=Ignorar precio mínimo
 Permission41=Leer proyectos y tareas (proyectos compartidos y proyectos de los que soy contacto). También puede introducir tiempos consumidos, para mí o mis subordinados, en tareas asignadas (Hojas de tiempo).
 Permission42=Crear/modificar proyectos (proyectos compartidos y proyectos de los que soy contacto). También puede crear tareas y asignar usuarios a proyectos y tareas
 Permission44=Eliminar proyectos (compartidos o soy contacto)
@@ -696,6 +703,9 @@ Permission61=Consultar intervenciones
 Permission62=Crear/modificar intervenciones
 Permission64=Eliminar intervenciones
 Permission67=Exportar intervenciones
+Permission68=Enviar intervenciones por email
+Permission69=Validar intervenciones
+Permission70=Desvalidar intervenciones
 Permission71=Consultar miembros
 Permission72=Crear/modificar miembros
 Permission74=Eliminar miembros
@@ -718,6 +728,7 @@ Permission95=Consultar balances y resultados
 Permission101=Consultar expediciones
 Permission102=Crear/modificar expediciones
 Permission104=Validar expediciones
+Permission105=Enviar expediciones por email
 Permission106=Exportar expediciones
 Permission109=Eliminar expediciones
 Permission111=Consultar cuentas financieras (cuentas bancarias, cajas)
@@ -825,10 +836,11 @@ Permission402=Crear/modificar haberes
 Permission403=Validar haberes
 Permission404=Eliminar haberes
 Permission430=Usa barra de debug
-Permission511=Consultar pagos de salarios
+Permission511=Leer pagos de salarios (suyos y subordinados)
 Permission512=Crear/modificar pagos de salarios
 Permission514=Eliminar pagos de salarios
-Permission517=Exportar salarios
+Permission517=Leer pagos de salarios de todos
+Permission519=Exportar salarios
 Permission520=Consultar Créditos
 Permission522=Crear/modificar Créditos
 Permission524=Eliminar Crédito
@@ -839,16 +851,19 @@ Permission532=Crear/modificar servicios
 Permission534=Eliminar servicios
 Permission536=Ver/gestionar los servicios ocultos
 Permission538=Exportar servicios
-Permission561=Read payment orders by credit transfer
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
-Permission564=Record Debits/Rejections of credit transfer
+Permission561=Leer órdenes de pago mediante transferencia bancaria
+Permission562=Crear/modificar orden de pago mediante transferencia bancaria
+Permission563=Enviar/transmitir orden de pago mediante transferencia bancaria
+Permission564=Registrar Abonos/Devoluciones de transferencias bancarias
+Permission601=Leer pegatinas
+Permission602=Crear / modificar pegatinas
+Permission609=Eliminar pegatinas
 Permission650=Leer lista de materiales
 Permission651=Crear/Actualizar lista de material
 Permission652=Eliminar lista de material
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
+Permission660=Leer orden de fabricación (OF)
+Permission661=Crear/modificar orden de fabricación (OF)
+Permission662=Eliminar orden de fabricación (OF)
 Permission701=Consultar donaciones
 Permission702=Crear/modificar donaciones
 Permission703=Eliminar donaciones
@@ -858,8 +873,8 @@ Permission773=Eliminar informe de gastos
 Permission774=Leer todos los informes de gastos (incluidos los no subordinados)
 Permission775=Aprobar informe de gastos
 Permission776=Pagar informe de gastos
-Permission777=Read expense reports of everybody
-Permission778=Create/modify expense reports of everybody
+Permission777=Leer los informes de gastos de todos
+Permission778=Crear/modificar informes de gastos de todos
 Permission779=Exportar informe de gastos
 Permission1001=Consultar stocks
 Permission1002=Crear/modificar almacenes
@@ -884,7 +899,9 @@ Permission1185=Aprobar pedidos a proveedor
 Permission1186=Ordenar pedidos a proveedores
 Permission1187=Generar acuse de recibo de los pedidos de proveedor
 Permission1188=Eliminar pedidos a proveedor
+Permission1189=Marcar / desmarcar la recepción de una orden de compra
 Permission1190=Aprobar (segunda aprobación) pedidos a proveedores
+Permission1191=Exportar pedidos a proveedor y sus atributos
 Permission1201=Obtener resultado de una exportación
 Permission1202=Crear/codificar exportaciones
 Permission1231=Leer facturas de proveedor
@@ -898,6 +915,8 @@ Permission1251=Lanzar las importaciones en masa a la base de datos (carga de dat
 Permission1321=Exportar facturas a clientes, campos adicionales y cobros
 Permission1322=Reabrir una factura pagada
 Permission1421=Exportar pedidos y atributos
+Permission1521=Consultar documentos
+Permission1522=Eliminar documentos
 Permission2401=Leer acciones (eventos o tareas) vinculadas a su cuenta de usuario (si es el propietario del evento o si se le acaba de asignar)
 Permission2402=Crear/modificar acciones (eventos o tareas) vinculadas a su cuenta de usuario (si es propietario del evento)
 Permission2403=Eliminar acciones (eventos o tareas) vinculadas a su cuenta de usuario (si es propietario del evento)
@@ -912,7 +931,7 @@ Permission2515=Configuración directorios de documentos
 Permission2801=Utilizar el cliente FTP en modo lectura (sólo explorar y descargar)
 Permission2802=Utilizar el cliente FTP en modo escritura (borrar o subir archivos)
 Permission3200=Leer eventos archivados y huellas digitales
-Permission3301=Generate new modules
+Permission3301=Generar nuevos módulos
 Permission4001=Ver empleados
 Permission4002=Crear empleados
 Permission4003=Eliminar empleados
@@ -932,9 +951,13 @@ Permission23001=Consultar Trabajo programado
 Permission23002=Crear/actualizar Trabajo programado
 Permission23003=Borrar Trabajo Programado
 Permission23004=Ejecutar Trabajo programado
-Permission50101=Utilizar TPV
+Permission50101=Usar punto de venta (TPV simple)
+Permission50151=Usar punto de venta (TakePOS)
 Permission50201=Consultar las transacciones
 Permission50202=Importar las transacciones
+Permission50330=Consultar objetos de Zapier
+Permission50331=Crear/modificar objetos de Zapier
+Permission50332=Eliminar objetos de Zapier
 Permission50401=Contabilizar productos y facturas con cuentas contables
 Permission50411=Leer operaciones del Libro Mayor
 Permission50412=Registrar/Editar operaciones en el Libro Mayor
@@ -958,10 +981,21 @@ Permission63001=Leer recursos
 Permission63002=Crear/modificar recursos
 Permission63003=Eliminar recursos
 Permission63004=Enlazar recursos a eventos de la agenda
+Permission64001=Permitir impresión directa
+Permission67000=Permitir la impresión de recibos
+Permission68001=Leer informe intracomm
+Permission68002=Crear / modificar informe intracomunitario
+Permission68004=Eliminar informe intracomunitario
+Permission941601=Leer recibos
+Permission941602=Crear y modificar recibos
+Permission941603=Validar recibos
+Permission941604=Enviar recibos por correo electrónico
+Permission941605=Recibos de exportación
+Permission941606=Eliminar recibos
 DictionaryCompanyType=Tipos de Terceros
 DictionaryCompanyJuridicalType=Tipo de entidad legar para Terceros
-DictionaryProspectLevel=Prospect potential level for companies
-DictionaryProspectContactLevel=Prospect potential level for contacts
+DictionaryProspectLevel=Perspectiva nivel para empresas
+DictionaryProspectContactLevel=Perspectiva nivel para contactos
 DictionaryCanton=Provincias
 DictionaryRegion=Regiones
 DictionaryCountry=Países
@@ -991,12 +1025,14 @@ DictionaryEMailTemplates=Plantillas E-Mails
 DictionaryUnits=Unidades
 DictionaryMeasuringUnits=Unidades de Medida
 DictionarySocialNetworks=Redes sociales
-DictionaryProspectStatus=Prospect status for companies
-DictionaryProspectContactStatus=Prospect status for contacts
+DictionaryProspectStatus=Estado prospección para empresas
+DictionaryProspectContactStatus=Estado prospección para contactos
 DictionaryHolidayTypes=Tipos de vacaciones
 DictionaryOpportunityStatus=Estado de oportunidad para el proyecto/oportunidad
 DictionaryExpenseTaxCat=Informe de gastos - Categorías de transporte
 DictionaryExpenseTaxRange=Informe de gastos - Rango por categoría de transporte
+DictionaryTransportMode=Informe intracomm: modo de transporte
+TypeOfUnit=Tipo de unidad
 SetupSaved=Configuración guardada
 SetupNotSaved=Configuración no guardada
 BackToModuleList=Volver al listado de módulos
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Etiqueta que se utilizará si no se encuentra traducción par
 LabelOnDocuments=Etiqueta sobre documentos
 LabelOrTranslationKey=Clave de traducción o cadena
 ValueOfConstantKey=Valor de una constante de configuración
+ConstantIsOn=La opción %s está activada
 NbOfDays=Nº de días
 AtEndOfMonth=A fin de mes
 CurrentNext=Actual/Siguiente
@@ -1091,7 +1128,7 @@ LoginPage=Página de login
 BackgroundImageLogin=Imagen de fondo
 PermanentLeftSearchForm=Zona de búsqueda permanente del menú izquierdo
 DefaultLanguage=Idioma predeterminado
-EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
+EnableMultilangInterface=Activar soporte multi-idioma en las relaciones con clientes o proveedores
 EnableShowLogo=Mostrar el logo de la empresa en el menú
 CompanyInfo=Empresa/Organización
 CompanyIds=Identificación de la empresa/organización
@@ -1145,6 +1182,7 @@ InfoWebServer=Acerca del Servidor Web
 InfoDatabase=Acerca de la base de datos
 InfoPHP=Acerca de PHP
 InfoPerf=Acerca del rendimiento
+InfoSecurity=Sobre seguridad
 BrowserName=Nombre del navegador
 BrowserOS=S.O. del navegador
 ListOfSecurityEvents=Listado de eventos de seguridad Dolibarr
@@ -1194,7 +1232,8 @@ RestoreDesc=Para restaurar una copia de seguridad de Dolibarr, usted debe:
 RestoreDesc2=Tomar el archivo (archivo zip, por ejemplo) del directorio de los documentos y descomprimirlo en el directorio de los documentos de una nueva instalación de Dolibarr o en la carpeta de los documentos de esta instalación (<b>%s</b>).
 RestoreDesc3=Restaurar el archivo de volcado guardado en la base de datos de la nueva instalación de Dolibarr o de esta instalación (<b>%s</b>). Atención, una vez realizada la restauración, deberá utilizar un login/contraseña de administrador existente en el momento de la copia de seguridad para conectarse.<br>Para restaurar la base de datos en la instalación actual, puede utilizar el asistente a continuación.
 RestoreMySQL=Importación MySQL
-ForcedToByAModule= Esta regla está forzada a <b>%s</b> por uno de los módulos activados
+ForcedToByAModule=Esta regla está forzada a <b>%s</b> por uno de los módulos activados
+ValueIsForcedBySystem=Este valor es forzado por el sistema. No puedes cambiarlo.
 PreviousDumpFiles=Archivos de copia de seguridad existentes
 PreviousArchiveFiles=Archivos existentes
 WeekStartOnDay=Primer día de la semana
@@ -1255,8 +1294,8 @@ WarningAtLeastKeyOrTranslationRequired=Se necesita un criterio de búsqueda al m
 NewTranslationStringToShow=Nueva cadena traducida a mostrar
 OriginalValueWas=La traducción original se ha sobreescrito. El valor original era:<br><br>%s
 TransKeyWithoutOriginalValue=Forzó una nueva traducción para la clave de traducción '<strong>%s</strong>' que no existe en ningún archivo de idioma
-TitleNumberOfActivatedModules=Activated modules
-TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Módulos activados
+TotalNumberOfActivatedModules=Módulos activados: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Debe activar al menos un módulo.
 ClassNotFoundIntoPathWarning=No se ha encontrado la clase %s en su path PHP
 YesInSummer=Sí en verano
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=El componente PHP %s está cargado
 PreloadOPCode=Se utiliza OPCode precargado
 AddRefInList=Mostrar código de cliente/proveedor en los listados (y selectores) y enlaces.<br>Los terceros aparecerán con el nombre "CC12345 - SC45678 - The big company coorp", en lugar de "The big company coorp".
 AddAdressInList=Mostrar la dirección del cliente/proveedor en los listados (y selectores) <br>Los terceros aparecerán con el nombre "The big company coorp - 21 jump street 123456 Big town - USA ", en lugar de "The big company coorp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Consultar por el método preferido de envío a terceros.
 FieldEdition=Edición del campo %s
 FillThisOnlyIfRequired=Ejemplo: +2 (Complete sólo si se registra una desviación del tiempo en la exportación)
@@ -1282,7 +1322,7 @@ GetBarCode=Obtener código de barras
 NumberingModules=Módulos de numeración
 DocumentModules=Modelos de documento
 ##### Module password generation
-PasswordGenerationStandard=Devuelve una contraseña generada por el algoritmo interno Dolibarr: 8 caracteres, números y caracteres en minúsculas mezcladas.
+PasswordGenerationStandard=Devuelve una contraseña generada de acuerdo con el algoritmo interno de Dolibarr: %s caracteres que contienen números compartidos y caracteres en minúsculas.
 PasswordGenerationNone=No sugerir ninguna contraseña generada. La contraseña debe ser escrita manualmente.
 PasswordGenerationPerso=Devuelve una contraseña según la configuración definida.
 SetupPerso=Obteniendo tu configuración
@@ -1381,6 +1421,7 @@ AdherentMailRequired=E-Mail obligatorio para crear un miembro nuevo
 MemberSendInformationByMailByDefault=Casilla de verificación para enviar el correo de confirmación (validación ó nueva cotización) a los miembros es por defecto "sí"
 VisitorCanChooseItsPaymentMode=El visitante puede elegir entre los modos de pago disponibles
 MEMBER_REMINDER_EMAIL=Habilitar recordatorio de eventos <b>por e-mail</b> de suscripciones expiradas. Nota: El módulo <strong>%s</strong> debe estar habilitado y configurado correctamente para que el recordatorio se envíe.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=Configuración del módulo LDAP
 LDAPGlobalParameters=Parámetros globales
@@ -1523,7 +1564,9 @@ LDAPDescValues=Los valores de ejemplos se adaptan a <b>OpenLDAP</b> con los sche
 ForANonAnonymousAccess=Para un acceso autentificado
 PerfDolibarr=Configuración rendimiento/informe de optimización
 YouMayFindPerfAdviceHere=En esta página encontrará varias pruebas y consejos relacionados con el rendimiento.
-NotInstalled=No instalado,  por lo que su servidor no baja de rendimiento con esto.
+NotInstalled=No instalado
+NotSlowedDownByThis=No se ralentiza por esto.
+NotRiskOfLeakWithThis=No hay riesgo de fuga con esto
 ApplicativeCache=Aplicación caché
 MemcachedNotAvailable=No se ha encontrado una aplicación de cache. Puede mejorar el rendimiento instalando un cache server Memcached y un módulo capaz de usar ese servidor de cache.<br>Más información aquí <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Tenga en cuenta que algunos hostings no ofrecen servidores de cache.
 MemcachedModuleAvailableButNotSetup=Módulo memcached para el caché aplicativo encontrado pero la configuración del módulo no está completa.
@@ -1571,9 +1614,9 @@ SyslogLevel=Nivel
 SyslogFilename=Nombre y ruta del archivo
 YouCanUseDOL_DATA_ROOT=Puede utilizar DOL_DATA_ROOT/dolibarr.log para un registro en el directorio "documentos" de Dolibarr. Sin embargo, puede establecer un directorio diferente para guardar este archivo.
 ErrorUnknownSyslogConstant=La constante %s no es una constante syslog conocida
-OnlyWindowsLOG_USER=Windows sólo soporta LOG_USER
+OnlyWindowsLOG_USER=En Windows, solo la opción LOG_USER será soportada
 CompressSyslogs=Compresión y copia de seguridad de los archivos de registro de depuración (generados por el módulo Log para la depuración)
-SyslogFileNumberOfSaves=Copias de seguridad de log
+SyslogFileNumberOfSaves=Número de registros de copia de seguridad para mantener
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configurar tareas programados de limpieza para establecer la frecuencia de copia de seguridad del log
 ##### Donations #####
 DonationsSetup=Configuración del módulo donaciones
@@ -1629,7 +1672,7 @@ AdvancedEditor=Editor avanzado
 ActivateFCKeditor=Activar editor avanzado para :
 FCKeditorForCompany=Creación/edición WYSIWIG de la descripción y notas de los terceros
 FCKeditorForProduct=Creación/edición WYSIWIG de la descripción y notas de los productos/servicios
-FCKeditorForProductDetails=Creación/edición WYSIWIG de las líneas de detalle de los productos (pedidos, presupuestos, facturas, etc.). <font class="warning">Atención: El uso de esta opción no es recomendable ya que puede crear problemas con los caracteres especiales y el formateo de página al generar archivos PDF.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= Creación/edición WYSIWIG de los E-Mails (Utilidades->E-Mailings)
 FCKeditorForUserSignature=Creación/edición WYSIWIG de la firma de usuarios
 FCKeditorForMail=Creación/edición WYSIWIG de todos los e-mails ( excepto Utilidades->E-Mailings)
@@ -1639,11 +1682,11 @@ StockSetup=Configuración del módulo Almacenes
 IfYouUsePointOfSaleCheckModule=Si utiliza un módulo de Punto de Venta (módulo TPV por defecto u otro módulo externo), esta configuración puede ser ignorada por su módulo de Punto de Venta. La mayor parte de módulos TPV están diseñados para crear inmediatamente una factura y decrementar stocks cualquiera que sean estas opciones. Por lo tanto, si usted necesita o no decrementar stocks  en el registro de una venta de su punto de venta, controle también la configuración de su módulo TPV.
 ##### Menu #####
 MenuDeleted=Menú eliminado
+Menu=Carta
 Menus=Menús
 TreeMenuPersonalized=Menús personalizados
 NotTopTreeMenuPersonalized=Menús personalizados no enlazados a un menú superior
 NewMenu=Nuevo menú
-Menu=Selección de los menús
 MenuHandler=Gestor de menús
 MenuModule=Módulo origen
 HideUnauthorizedMenu= Ocultar también los menús no autorizados a usuarios internos (si no sólo atenuados)
@@ -1694,15 +1737,16 @@ AGENDA_USE_EVENT_TYPE=Usar tipos de evento (gestionados en el menú Configuraci
 AGENDA_USE_EVENT_TYPE_DEFAULT=Establecer automáticamente este valor por defecto para el tipo de evento en la creación de un evento
 AGENDA_DEFAULT_FILTER_TYPE=Establecer por defecto este tipo de evento en el filtro de búsqueda en la vista de la agenda
 AGENDA_DEFAULT_FILTER_STATUS=Establecer por defecto este estado de eventos en el filtro de búsqueda en la vista de la agenda
-AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Habilitar recordatorio de eventos por <b>e-mail</b> (definido en cada evento). Nota: El módulo <strong>%s</strong> debe estar habilitado y configurado correctamente para que el recordatorio se envíe a la frecuencia correcta.
-AGENDA_REMINDER_BROWSER=Habilitar recordatorio de eventos en el <b>navegador de los usuarios</b> (cuando llega la fecha del evento, cada usuario puede rechazar esto desde la pregunta de confirmación del navegador)
+AGENDA_DEFAULT_VIEW=Establecer la vista por defecto al seleccionar el menú Agenda
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Activar sonido de notificación
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Mostrar el link en la agenda
 ##### Clicktodial #####
 ClickToDialSetup=Configuración del módulo Click To Dial
 ClickToDialUrlDesc=Url llamada cuando se hace clic en el icono de teléfono. En la URL, puede usar los tags <br><b>__PHONETO__</b> que se reemplazará con el número de teléfono de la persona a llamar  <br><b>__PHONEFROM__</b>  que será reemplazado por el número de teléfono de la persona que llama (suyo)<br><b>__LOGIN__</b> que se reemplazará con el login clicktodial (definido en la tarjeta de usuario)<br><b>__PASS__</b> que será Sustituido por la contraseña clicktodial (definida en la ficha de usuario).
-ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
+ClickToDialDesc=Este módulo cambia los números de teléfono, cuando se usa una computadora de escritorio, en enlaces en los que se puede hacer clic. Un clic llamará al número. Esto se puede usar para iniciar una llamada telefónica cuando usa un softphone en su escritorio o cuando usa un sistema CTI basado en el protocolo SIP, por ejemplo. Nota: cuando se usa un teléfono inteligente, siempre se puede hacer clic en los números de teléfono.
 ClickToDialUseTelLink=Utilice el enlace "tel:" que aparece en los números de teléfono
 ClickToDialUseTelLinkDesc=Utilice este método si los usuarios tienen un softphone o una interfaz de software instalado en mismo equipo que el navegador, y se llama al hacer clic en un enlace en el navegador que comienza con "tel:". Si necesita una solución de servidor completa (sin necesidad de instalación de software local), debe establecer este en "No" y rellenar siguiente campo.
 ##### Point Of Sale (CashDesk) #####
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Pago cliente,1:Pago proveedor,2:Tanto pago de cliente como de
 IncludePath=Include path (definida en la variable %s)
 ExpenseReportsSetup=Configuración del módulo Informe de Gastos
 TemplatePDFExpenseReports=Modelos de documento para generar informes de gastos
-ExpenseReportsIkSetup=Configuración del módulo Informes de gastos - Índice Milles
 ExpenseReportsRulesSetup=Configuración del módulo Informes de gastos - Reglas
 ExpenseReportNumberingModules=Módulo de numeración de informes de gastos
 NoModueToManageStockIncrease=No hay activado módulo para gestionar automáticamente el incremento de stock. El incremento de stock se realizará solamente con entrada manual
@@ -1833,7 +1876,7 @@ EnterAnyCode=Este campo contiene una referencia para identificar la línea. Intr
 Enter0or1=Introduzca 0 o 1
 UnicodeCurrency=Ingrese aquí entre llaves, lista con número de byte que representa el símbolo de moneda. Por ejemplo: para $, introduzca [36] - para Brasil Real R$ [82,36] - para €, introduzca [8364]
 ColorFormat=El color RGB es en formato HEX, ej: FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
+PictoHelp=Nombre del icono en formato dolibarr ('image.png' si está en el directorio del tema actual, 'image.png@nombre_del_modulo' si está en el directorio /img/ de un módulo)
 PositionIntoComboList=Posición de la línea en listas de combo
 SellTaxRate=Tasa de IVA
 RecuperableOnly=Sí para el IVA "Non Perçue Récupérable" usados en algunas provincias en Francia. Mantenga el valor a "No" en los demás casos.
@@ -1864,7 +1907,7 @@ MailToSendReception=Recepciones
 MailToThirdparty=Terceros
 MailToMember=Miembros
 MailToUser=Usuarios
-MailToProject=Página proyectos
+MailToProject=Proyectos
 MailToTicket=Tickets
 ByDefaultInList=Mostrar por defecto en modo lista
 YouUseLastStableVersion=Usa la última versión estable
@@ -1874,7 +1917,7 @@ ExampleOfNewsMessageForMajorRelease=Disponible ERP/CRM Dolibarr %s. La versión
 ExampleOfNewsMessageForMaintenanceRelease=Disponible ERP/CRM Dolibarr %s. La versión %s es una versión de mantenimiento, por lo que sólo contiene correcciones de errores. Recomendamos a todo el mundo que use una versión anterior que actualice a esta. Como cualquier versión de mantenimiento, no hay novedades. Se puede descargar desde la sección de descargas del portal https://www.dolibarr.org (subdirectorio versiones estables subdirectorio). Puede leer <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> para ver la lista completa de los cambios.
 MultiPriceRuleDesc=Cuando la opción "Diferentes niveles de precios por productos/servicios" esta activada, puede definir diferentes precios (uno por nivel de precios) para cada producto.  Para ahorrarle tiempo, puede escribir una regla para auto calcular un precio basado en el precio del primer nivel para cada producto, así solo tendrá que poner un solo precio para el primer nivel de cada producto. Esta página esta diseñada para ahorrarle tiempo, pero solamente será útil si los precios para cada nivel son relativos al primero. Puede ignorar esta página en la mayoría de los casos.
 ModelModulesProduct=Plantillas de documentos de productos
-WarehouseModelModules=Templates for documents of warehouses
+WarehouseModelModules=Plantillas de documentos de almacenes
 ToGenerateCodeDefineAutomaticRuleFirst=Para poder generar códigos automáticamente, primero debe indicar un gestor para autogenerar códigos de barras
 SeeSubstitutionVars=Vea * nota para un listado de posibles variables de sustitución
 SeeChangeLog=Ver archivo ChangeLog (solo inglés)
@@ -1913,7 +1956,7 @@ MAIN_PDF_MARGIN_LEFT=Margen izquierdo en PDF
 MAIN_PDF_MARGIN_RIGHT=Margen derecho en PDF
 MAIN_PDF_MARGIN_TOP=Margen superior en PDF
 MAIN_PDF_MARGIN_BOTTOM=Margen inferior en PDF
-MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Altura del logo en PDF
 NothingToSetup=No hay ninguna configuración a realizar en este módulo.
 SetToYesIfGroupIsComputationOfOtherGroups=Establezca esto a sí si este grupo es un cálculo de otros grupos
 EnterCalculationRuleIfPreviousFieldIsYes=Ingrese regla de cálculo si el campo anterior se estableció en Sí (por ejemplo, 'CODEGRP1 + CODEGRP2')
@@ -1953,14 +1996,16 @@ NothingProcessed=Nada hecho
 XEmailsDoneYActionsDone=%s e-mails analizados, %s e-mails procesados ​​con éxito (para %s registro/acciones realizadas)
 RecordEvent=Registro de evento de email
 CreateLeadAndThirdParty=Crear lead (y tercero si es necesario)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+CreateTicketAndThirdParty=Crear ticket (y vincular a un tercero si ha sido cargado en una operación anterior)
 CodeLastResult=Resultado último código
 NbOfEmailsInInbox=Número de emails en el directorio fuente
 LoadThirdPartyFromName=Cargar terceros buscando en %s (solo carga)
 LoadThirdPartyFromNameOrCreate=Cargar terceros terceros buscando en %s (crear si no se encuentra)
-WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
-WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
-CreateCandidature=Create candidature
+WithDolTrackingID=Mensaje de una conversación iniciada por un primer e-mail enviado desde Dolibarr
+WithoutDolTrackingID=Mensaje de una conversación iniciada por un primer e-mail NO enviado desde Dolibarr
+WithDolTrackingIDInMsgId=Mensaje enviado desde Dolibarr
+WithoutDolTrackingIDInMsgId=Mensaje NO enviado desde Dolibarr
+CreateCandidature=Crear candidatura
 FormatZip=Código postal
 MainMenuCode=Código de entrada del menú (menú principal)
 ECMAutoTree=Mostrar arbol automático GED
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Desactivar funcionalidad de enlazar recurso a contac
 EnableResourceUsedInEventCheck=Habilitar verificación si un recurso está en uso en un evento
 ConfirmUnactivation=Confirme el restablecimiento del módulo
 OnMobileOnly=Sólo en pantalla pequeña (smartphone)
-DisableProspectCustomerType=Deshabilitar el tipo de tercero "Cliente Potencial/Cliente" (por lo tanto, el tercero debe ser Cliente Potencial o Cliente pero no pueden ser ambos)
+DisableProspectCustomerType=Deshabilite el tipo de tercero "Cliente potencial + Cliente" (por lo que el tercero debe ser "Cliente potencial" o "Cliente", pero no puede ser ambos)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplificar interfaz para ciegos.
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Active esta opción sí es usted ciego, or sí usa la aplicación de un navegador de texto como Lynx o Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Cambiar el color de la interfaz para personas daltónicas
@@ -1996,15 +2041,17 @@ UseDebugBar=Usa la barra de debug
 DEBUGBAR_LOGS_LINES_NUMBER=Número de últimas líneas de registro para mantener en la consola.
 WarningValueHigherSlowsDramaticalyOutput=Advertencia, los valores altos ralentizan dramáticamente la salida.
 ModuleActivated=El módulo %s está activado y ralentiza dramáticamente la interfaz
+IfYouAreOnAProductionSetThis=Si esta en un entorno de produccion, deberia establecer esta propiedad  a %s
+AntivirusEnabledOnUpload=Antivirus habilitado en los ficheros subidos
 EXPORTS_SHARE_MODELS=Los modelos de exportación son compartidos con todos.
 ExportSetup=Configuración del módulo de exportación.
 ImportSetup=Configuración del módulo Importar
 InstanceUniqueID=ID única de la instancia
 SmallerThan=Menor que
 LargerThan=Mayor que
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Tenga en cuenta que si se encuentra un ID de seguimiento de un objeto en un correo electrónico, o si el correo electrónico es una respuesta de un correo electrónico ya recopilado y vinculado a un objeto, el evento creado se vinculará automáticamente al objeto relacionado conocido.
 WithGMailYouCanCreateADedicatedPassword=Con una cuenta de GMail, si habilitó la validación de 2 pasos, se recomienda crear una segunda contraseña dedicada para la aplicación en lugar de usar su propia contraseña de https://myaccount.google.com/.
-EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
+EmailCollectorTargetDir=Puede desear mover el e-mail a otra etiqueta/directorio cuando se procesó correctamente. Simplemente configure el nombre del directorio aquí para usar esta función (NO use caracteres especiales en el nombre). Tenga en cuenta que también debe utilizar un login de lectura/escritura.
 EmailCollectorLoadThirdPartyHelp=Puede usar esta acción para usar el contenido del email para encontrar y cargar un tercero existente en su base de datos. El tercero encontrado (o creado) se utilizará para las siguientes acciones que lo necesiten. En el campo de parámetros puede usar, por ejemplo, 'EXTRACT: BODY: Name: \\ s ([^ \\ s] *)' si desea extraer el nombre del tercero de una cadena 'Name: nombre a encontrar' encontrado en el body.
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Eliminar el recolector de e-mail
@@ -2026,7 +2073,13 @@ RssNote=Nota: Cada definición de fuente RSS proporciona un widget que debe habi
 JumpToBoxes=Vaya a Configuración -> Módulos
 MeasuringUnitTypeDesc=Utilice aquí un valor como "tamaño", "superficie", "volumen", "peso", "tiempo"
 MeasuringScaleDesc=La escala es el número de lugares que tiene que mover la parte decimal para que coincida con la unidad de referencia predeterminada. Para el tipo de unidad de "tiempo", es el número de segundos. Los valores entre 80 y 99 son valores reservados.
-TemplateAdded=Template added
-TemplateUpdated=Template updated
-TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+TemplateAdded=Plantilla añadida
+TemplateUpdated=Plantilla actualizada
+TemplateDeleted=Plantilla eliminada
+MailToSendEventPush=Correo electrónico de recordatorio de evento
+SwitchThisForABetterSecurity=Cambiar el valor a %s es lo recomendado para una mayor seguridad
+DictionaryProductNature= Naturaleza del producto
+CountryIfSpecificToOneCountry=País (si es específico de un país determinado)
+YouMayFindSecurityAdviceHere=Puede encontrar un aviso de seguridad aqui.
+ModuleActivatedMayExposeInformation=Este modulo puede exponer datos sensibles. Si no lo necesita, desactivelo.
+ModuleActivatedDoNotUseInProduction=Un modulo diseñado para desarrollo ha sido habilitado. No lo habilite en un entorno de produccion.
diff --git a/htdocs/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang
index ecd31149c25..38c78945dc7 100644
--- a/htdocs/langs/es_ES/banks.lang
+++ b/htdocs/langs/es_ES/banks.lang
@@ -37,7 +37,7 @@ IbanValid=BAN válido
 IbanNotValid=BAN no válido
 StandingOrders=Domiciliaciones
 StandingOrder=Domiciliación
-PaymentByDirectDebit=Payment by direct debit
+PaymentByDirectDebit=Cobro por domiciliación bancaria
 PaymentByBankTransfers=Pagos por transferencia bancaria
 PaymentByBankTransfer=Pago por transferencia bancaria
 AccountStatement=Extracto
@@ -106,8 +106,8 @@ SupplierInvoicePayment=Pago a proveedor
 SubscriptionPayment=Pago cuota
 WithdrawalPayment=Domiciliación
 SocialContributionPayment=Pago impuesto social/fiscal
-BankTransfer=Credit transfer
-BankTransfers=Credit transfers
+BankTransfer=Transferencia bancaria
+BankTransfers=Transferencias bancarias
 MenuBankInternalTransfer=Transferencia interna
 TransferDesc=Al crear una transferencia de una de sus cuentas bancarias hacia otra, Dolibarr crea dos registros contables (uno de débito en una cuenta y otro de crédito, del mismo importe, en la otra cuenta. Se utiliza para los dos registros la misma etiqueta de transferencia y la misma fecha)
 TransferFrom=De
@@ -166,6 +166,9 @@ VariousPayment=Pago varios
 VariousPayments=Pagos varios
 ShowVariousPayment=Mostrar pago varios
 AddVariousPayment=Añadir pago varios
+VariousPaymentId=ID de pago varios
+VariousPaymentLabel=Etiqueta de pago miscelánea
+ConfirmCloneVariousPayment=Confirmar el clon de un pago misceláneo
 SEPAMandate=Mandato SEPA
 YourSEPAMandate=Su mandato SEPA
 FindYourSEPAMandate=Este es su mandato SEPA para autorizar a nuestra empresa a realizar un petición de débito directo a su banco. Gracias por devolverlo firmado (escaneo del documento firmado) o enviado por correo a
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorear movimientos
 BankColorizeMovementDesc=Si esta función está activada, puede elegir un color de fondo específico para los movimientos de débito o crédito
 BankColorizeMovementName1=Color de fondo para el movimiento de débito
 BankColorizeMovementName2=Color de fondo para el movimiento de crédito
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index ddd77ebb1fd..fadf06b8e3b 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -441,8 +441,8 @@ BankAccountNumberKey=DC
 Residence=Dirección
 IBANNumber=Número de cuenta IBAN
 IBAN=IBAN
-CustomerIBAN=IBAN of customer
-SupplierIBAN=IBAN of vendor
+CustomerIBAN=IBAN del cliente
+SupplierIBAN=IBAN del proveedor
 BIC=BIC/SWIFT
 BICNumber=Código BIC/SWIFT
 ExtraInfos=Informaciones complementarias
@@ -531,6 +531,7 @@ TypeContact_invoice_supplier_external_SERVICE=Contacto proveedor servicios
 InvoiceFirstSituationAsk=Factura de primera situación
 InvoiceFirstSituationDesc=Las <b>facturas de situación</b> están ligadas a situaciones relacionadas con una progresión, por ejemplo, la progresión de una construcción. Cada situación está ligada a una factura.
 InvoiceSituation=Factura de situación
+PDFInvoiceSituation=Factura de situación
 InvoiceSituationAsk=Factura de seguimiento de situación
 InvoiceSituationDesc=Creación de una nueva situación que seguirá a una posición ya abierta.
 SituationAmount=Importe Factura situación (Sin IVA)
@@ -575,3 +576,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Factura de proveedor eliminada
 UnitPriceXQtyLessDiscount=Precio unitario x Cantidad - Descuento
 CustomersInvoicesArea=Área de facturación a clientes
 SupplierInvoicesArea=Área de facturación de proveedores
+FacParentLine=Línea de factura principal
+SituationTotalRayToRest=Resto a pagar sin impuestos
+PDFSituationTitle=Situación n ° %d
+SituationTotalProgress=Progreso total %d %%
diff --git a/htdocs/langs/es_ES/categories.lang b/htdocs/langs/es_ES/categories.lang
index 7b8ec9d86bd..a48a95c6da2 100644
--- a/htdocs/langs/es_ES/categories.lang
+++ b/htdocs/langs/es_ES/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Configuración de etiquetas/categorías
 CategorieRecursiv=Enlazar con la etiqueta/categoría automáticamente
 CategorieRecursivHelp=Si la opción está activada, cuando agrega un producto a una subcategoría, el producto también se agregará a la categoría principal.
 AddProductServiceIntoCategory=Añadir el siguiente producto/servicio
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Mostrar etiqueta/categoría
 ByDefaultInList=Por defecto en lista
 ChooseCategory=Elija una categoría
-StocksCategoriesArea=Área Categorías de Almacenes
-ActionCommCategoriesArea=Área Categorías de Eventos
-WebsitePagesCategoriesArea=Área de categorías de contenedores de páginas
+StocksCategoriesArea=Categorías de almacenes
+ActionCommCategoriesArea=Categorías de eventos
+WebsitePagesCategoriesArea=Categorías de contenedor de página
 UseOrOperatorForCategories=Uso u operador para categorías
diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index 1ceb2726c47..6a1e2a35020 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=ABN
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=N° colegiado
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Número federado
 ProfId4CH=Num registro de comercio
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=R.U.T.
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Id prof. 1 (USt.-IdNr)
 ProfId2DE=Id prof. 2 (USt.-Nr)
 ProfId3DE=Id prof. 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=CIF/NIF
 ProfId2ES=Núm. seguridad social
 ProfId3ES=CNAE
 ProfId4ES=Núm. colegiado
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=SIREN
 ProfId2FR=SIRET
 ProfId3FR=NAF (Ex APE)
 ProfId4FR=RCS/RM
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Número registro
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Id prof. 3
 ProfId4IN=Id prof. 4
 ProfId5IN=Id prof. 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=R.F.C.
 ProfId2MX=Registro Patronal IMSS
@@ -220,13 +225,13 @@ ProfId1NL=Número KVK
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=NIPC
 ProfId2PT=Núm. seguridad social
 ProfId3PT=Num reg. comercial
 ProfId4PT=Conservatorio
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=CUI
 ProfId2RO=Prof ID 2 (Numero de registro)
 ProfId3RO=CAEN
-ProfId4RO=-
-ProfId5RO=EUID
+ProfId4RO=EUID
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=OGRN
 ProfId2RU=INN
@@ -354,6 +359,7 @@ VATIntraManualCheck=Puede también realizar una verificación manual en la web d
 ErrorVATCheckMS_UNAVAILABLE=Comprobación imposible. El servicio de comprobación no es prestado por el país país miembro (%s).
 NorProspectNorCustomer=Ni cliente, ni cliente potencial
 JuridicalStatus=Forma jurídica
+Workforce=Personal
 Staff=Empleados
 ProspectLevelShort=Potencial
 ProspectLevel=Cliente potencial
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Condiciones de pago - Proveedor
 PaymentTypeBoth=Tipo de pago: cliente y proveedor
 MulticurrencyUsed=Usar Multimoneda
 MulticurrencyCurrency=Divisa
+InEEC=Europa (CEE)
+RestOfEurope=Resto de Europa (CEE)
+OutOfEurope=Fuera de Europa (CEE)
+CurrentOutstandingBillLate=Factura actual pendiente con retraso
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Tenga cuidado, dependiendo de la configuración del precio de su producto, debe cambiar de tercero antes de agregar el producto al POS.
diff --git a/htdocs/langs/es_ES/ecm.lang b/htdocs/langs/es_ES/ecm.lang
index fb443e7bd8c..54ec4c75ac9 100644
--- a/htdocs/langs/es_ES/ecm.lang
+++ b/htdocs/langs/es_ES/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Buscar por palabras clave
 ECMSearchByEntity=Buscar por objeto
 ECMSectionOfDocuments=Directorios de documentos
 ECMTypeAuto=Automático
-ECMDocsBySocialContributions=Documentos enlazados a tasas sociales o fiscales
-ECMDocsByThirdParties=Documentos asociados a terceros
-ECMDocsByProposals=Documentos asociados a presupuestos
-ECMDocsByOrders=Documentos asociados a pedidos
-ECMDocsByContracts=Documentos asociados a contratos
-ECMDocsByInvoices=Documentos asociados a facturas
-ECMDocsByProducts=Documentos enlazados a productos
-ECMDocsByProjects=Documentos enlazados a proyectos
-ECMDocsByUsers=Documentos enlazados a usuarios
-ECMDocsByInterventions=Documentos enlazados a intervenciones
-ECMDocsByExpenseReports=Documentos enlazados a informes de gastos
-ECMDocsByHolidays=Documentos vinculados a días libres
-ECMDocsBySupplierProposals=Documentos vinculados a presupuestos de proveedores.
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=No se ha creado el directorio
 ShowECMSection=Mostrar directorio
 DeleteSection=Eliminación directorio
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resincronizar la lista de directorios
 HashOfFileContent=Hash de contenido de archivo
 NoDirectoriesFound=No se encontraron directorios
 FileNotYetIndexedInDatabase=Archivo aún no indexado en la base de datos (intente volver a cargarlo)
+ExtraFieldsEcmFiles=Archivos Ecm de campos extra
+ExtraFieldsEcmDirectories=Directorios Ecm de campos extra
+ECMSetup=Configuración de ECM
diff --git a/htdocs/langs/es_ES/hrm.lang b/htdocs/langs/es_ES/hrm.lang
index d3d06082c67..29509408597 100644
--- a/htdocs/langs/es_ES/hrm.lang
+++ b/htdocs/langs/es_ES/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=R.R.H.H. - Puestos de trabajo
 Employees=Empleados
 Employee=Empleado
 NewEmployee=Nuevo empleado
+ListOfEmployees=Listado de empleados
diff --git a/htdocs/langs/es_ES/install.lang b/htdocs/langs/es_ES/install.lang
index b27d34717c6..cf53fbdae48 100644
--- a/htdocs/langs/es_ES/install.lang
+++ b/htdocs/langs/es_ES/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=El archivo <b>%s</b> no es modificable. Para una primera i
 ConfFileIsWritable=El archivo <b>%s</b> es modificable.
 ConfFileMustBeAFileNotADir=El archivo de configuración <b>%s</b> tiene que ser un archivo, no un directorio.
 ConfFileReload=Recargar toda la información del archivo de configuración.
-PHPSupportSessions=Este PHP soporta sesiones
 PHPSupportPOSTGETOk=Este PHP soporta bien las variables POST y GET.
 PHPSupportPOSTGETKo=Es posible que este PHP no soporte las variables POST y/o GET. Compruebe el parámetro <b>variables_order</b> del php.ini.
-PHPSupportGD=Este PHP soporta las funciones gráficas GD.
-PHPSupportCurl=Este PHP soporta Curl
-PHPSupportCalendar=Este PHP admite extensiones de calendarios.
-PHPSupportUTF8=Este PHP soporta las funciones UTF8.
-PHPSupportIntl=Este PHP soporta las funciones Intl.
-PHPSupportxDebug=Este PHP admite funciones de depuración extendidas.
+PHPSupportSessions=Este PHP soporta sesiones
 PHPSupport=Este PHP soporta las funciones %s.
 PHPMemoryOK=Su memoria máxima de sesión PHP esta definida a <b>%s</b>. Esto debería ser suficiente.
 PHPMemoryTooLow=Su memoria máxima de sesión PHP está definida en <b>%s</b> bytes. Esto es muy poco. Se recomienda modificar el parámetro <b>memory_limit</b> de su archivo <b>php.ini</b> a por lo menos <b>%s</b> bytes.
diff --git a/htdocs/langs/es_ES/intracommreport.lang b/htdocs/langs/es_ES/intracommreport.lang
new file mode 100644
index 00000000000..6931efda553
--- /dev/null
+++ b/htdocs/langs/es_ES/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Informe intracomunitario
+Module68000Desc = Gestión de informes intracomm (soporte para formato francés DEB / DES)
+IntracommReportSetup = Configuración del módulo de intracommreport
+IntracommReportAbout = Acerca de intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Número de aprobación (emitido por el CISD de adjunto)
+INTRACOMMREPORT_TYPE_ACTEUR=Tipo de actor
+INTRACOMMREPORT_ROLE_ACTEUR=Papel interpretado por el actor
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Nivel de obligación sobre presentaciones
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Nivel de obligación sobre envíos
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Categoría de servicio del tipo "Franqueo"
+
+INTRACOMMREPORT_NUM_DECLARATION=Número de declarante
+
+# Menu
+MenuIntracommReport=Informe intracomunitario
+MenuIntracommReportNew=Nueva declaracion
+MenuIntracommReportList=Listado
+
+# View
+NewDeclaration=Nueva declaracion
+Declaration=Declaración
+AnalysisPeriod=Periodo de análisis
+TypeOfDeclaration=Tipo de declaración
+DEB=Declaración de intercambio de mercancías (DEB)
+DES=Declaración de intercambio de servicios (DES)
+
+# Export page
+IntracommReportTitle=Preparación de un archivo XML en formato ProDouane
+
+# List
+IntracommReportList=Lista de declaraciones generadas
+IntracommReportNumber=Número de declaración
+IntracommReportPeriod=Período de análisis
+IntracommReportTypeDeclaration=Tipo de declaración
+IntracommReportDownload=descargar archivo XML
+
+# Invoice
+IntracommReportTransportMode=Modo de transporte
diff --git a/htdocs/langs/es_ES/languages.lang b/htdocs/langs/es_ES/languages.lang
index ad58634371b..d8a30708395 100644
--- a/htdocs/langs/es_ES/languages.lang
+++ b/htdocs/langs/es_ES/languages.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
-Language_am_ET=Ethiopian
+Language_am_ET=Etíope
 Language_ar_AR=Árabe
 Language_ar_EG=Árabe (Egipto)
 Language_ar_SA=Árabe
-Language_az_AZ=Azerbaijani
+Language_az_AZ=Azerbaiyano
 Language_bn_BD=Bengalí
-Language_bn_IN=Bengali (India)
+Language_bn_IN=Bengalí (India)
 Language_bg_BG=Búlgaro
 Language_bs_BA=Bosnio
 Language_ca_ES=Catalán
@@ -23,7 +23,7 @@ Language_en_GB=Inglés (Reino Unido)
 Language_en_IN=Inglés (India)
 Language_en_NZ=Inglés (Nueva Zelanda)
 Language_en_SA=Inglés (Arabia Saudita)
-Language_en_SG=English (Singapore)
+Language_en_SG=Inglés (Singapur)
 Language_en_US=Inglés (Estados Unidos)
 Language_en_ZA=Inglés (Sudáfrica)
 Language_es_ES=Español
@@ -33,15 +33,16 @@ Language_es_CL=Español (Chile)
 Language_es_CO=Español (Colombia)
 Language_es_DO=Español (República Dominicana)
 Language_es_EC=Español (Ecuador)
-Language_es_GT=Spanish (Guatemala)
+Language_es_GT=Español (Guatemala)
 Language_es_HN=Español (Honduras)
 Language_es_MX=Español (México)
 Language_es_PA=Español (Panamá)
 Language_es_PY=Español (Paraguay)
 Language_es_PE=Español (Perú)
 Language_es_PR=Español (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Español (Uruguay)
-Language_es_GT=Spanish (Guatemala)
+Language_es_GT=Español (Guatemala)
 Language_es_VE=Español (Venezuela)
 Language_et_EE=Estonio
 Language_eu_ES=Vasco
@@ -50,14 +51,14 @@ Language_fi_FI=Finés
 Language_fr_BE=Francés (Bélgica)
 Language_fr_CA=Francés (Canadá)
 Language_fr_CH=Francés (Suiza)
-Language_fr_CI=French (Cost Ivory)
-Language_fr_CM=French (Cameroun)
+Language_fr_CI=Francés (Costa de Marfil)
+Language_fr_CM=Francés (Camerún)
 Language_fr_FR=Francés
-Language_fr_GA=French (Gabon)
+Language_fr_GA=Francés (Gabón)
 Language_fr_NC=Francés (Nueva Caledonia)
-Language_fr_SN=French (Senegal)
+Language_fr_SN=Francés (Senegal)
 Language_fy_NL=Frisio
-Language_gl_ES=Galician
+Language_gl_ES=Gallego
 Language_he_IL=Hebreo
 Language_hi_IN=Hindi (India)
 Language_hr_HR=Croata
@@ -65,7 +66,7 @@ Language_hu_HU=Húngaro
 Language_id_ID=Indonesio
 Language_is_IS=Islandés
 Language_it_IT=Italiano
-Language_it_CH=Italian (Switzerland)
+Language_it_CH=Italiano (Suiza)
 Language_ja_JP=Japonés
 Language_ka_GE=Georgiano
 Language_km_KH=Jemer
@@ -77,7 +78,7 @@ Language_lv_LV=Latvio
 Language_mk_MK=Macedonio
 Language_mn_MN=Mongol
 Language_nb_NO=Noruego (Bokmål)
-Language_ne_NP=Nepali
+Language_ne_NP=Nepalí
 Language_nl_BE=Neerlandés (Bélgica)
 Language_nl_NL=Holandés
 Language_pl_PL=Polaco
@@ -100,5 +101,5 @@ Language_uz_UZ=Uzbeco
 Language_vi_VN=Vietnamita
 Language_zh_CN=Chino
 Language_zh_TW=Chino (Tradicional)
-Language_zh_HK=Chinese (Hong Kong)
+Language_zh_HK=Chino (Hong Kong)
 Language_bh_MY=Malayo
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index 20639672a7d..e60664f5d0f 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Eliminar enlace
 AddToDraft=Añadir a borrador
 Update=Modificar
 Close=Cerrar
+CloseAs=Establecer estado a
 CloseBox=Eliminar panel de su  tablero
 Confirm=Confirmar
 ConfirmSendCardByMail=¿Quiere enviar el contenido de esta ficha por e-mail a <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Reabrir
 Upload=Enviar archivo
 ToLink=Enlace
 Select=Seleccionar
+SelectAll=Select all
 Choose=Elegir
 Resize=Redimensionar
 ResizeOrCrop=Cambiar el tamaño o cortar
@@ -256,6 +258,7 @@ Cards=Fichas
 Card=Ficha
 Now=Ahora
 HourStart=Hora de inicio
+Deadline=Deadline
 Date=Fecha
 DateAndHour=Fecha y hora
 DateToday=Fecha de hoy
@@ -264,8 +267,10 @@ DateStart=Fecha de inicio
 DateEnd=Fecha de fin
 DateCreation=Fecha de creación
 DateCreationShort=Fecha creación
+IPCreation=Creation IP
 DateModification=Fecha de modificación
 DateModificationShort=Fecha modif.
+IPModification=Modification IP
 DateLastModification=Última fecha de modificación
 DateValidation=Fecha de validación
 DateClosing=Fecha de cierre
@@ -319,6 +324,7 @@ Morning=Mañana
 Afternoon=Tarde
 Quadri=Trimestre
 MonthOfDay=Mes del día
+DaysOfWeek=Días de la semana
 HourShort=H
 MinuteShort=min
 Rate=Tipo
@@ -356,7 +362,7 @@ Amount=Importe
 AmountInvoice=Importe factura
 AmountInvoiced=Importe facturado
 AmountInvoicedHT=Importe facturado (sin impuestos)
-AmountInvoicedTTC=Amount invoiced (inc. tax)
+AmountInvoicedTTC=Cantidad facturada (impuestos incluidos)
 AmountPayment=Importe pago
 AmountHTShort=Base imp.
 AmountTTCShort=Importe
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Importe total, divisa original
 MulticurrencyAmountHT=Base imponible, divisa original
 MulticurrencyAmountTTC=Total, divisa original
 MulticurrencyAmountVAT=Importe IVA, divisa original
+MulticurrencySubPrice=Importe subprecio multidivisa
 AmountLT1=Importe Impuesto 2
 AmountLT2=Importe Impuesto 3
 AmountLT1ES=Importe RE
@@ -487,6 +494,7 @@ By=Por
 From=De
 FromDate=De
 FromLocation=De
+at=a
 to=a
 To=a
 and=y
@@ -509,6 +517,7 @@ Draft=Borrador
 Drafts=Borradores
 StatusInterInvoiced=Facturada
 Validated=Validado
+ValidatedToProduce=Validado (A producir)
 Opened=Activo
 OpenAll=Abierto (todo)
 ClosedAll=Cerrado (Todo)
@@ -655,6 +664,7 @@ Response=Respuesta
 Priority=Prioridad
 SendByMail=Enviar por e-mail
 MailSentBy=Mail enviado por
+NotSent=No enviado
 TextUsedInTheMessageBody=Texto utilizado en el cuerpo del mensaje
 SendAcknowledgementByMail=Enviar email de confirmación
 SendMail=Enviar e-mail
@@ -688,7 +698,7 @@ Method=Método
 Receive=Recepción
 CompleteOrNoMoreReceptionExpected=Completado o no se espera más
 ExpectedValue=Valor esperado
-ExpectedQty=Expected Qty
+ExpectedQty=Cant. Esperada
 PartialWoman=Parcial
 TotalWoman=Total
 NeverReceived=Nunca recibido
@@ -705,7 +715,7 @@ MenuECM=Documentos
 MenuAWStats=AWStats
 MenuMembers=Miembros
 MenuAgendaGoogle=Agenda Google
-MenuTaxesAndSpecialExpenses=Taxes | Special expenses
+MenuTaxesAndSpecialExpenses=Impuestos | Gastos especiales
 ThisLimitIsDefinedInSetup=Límite Dolibarr (Menú inicio-configuración-seguridad): %s Kb, PHP limit: %s Kb
 NoFileFound=No hay documentos guardados en este directorio
 CurrentUserLanguage=Idioma actual
@@ -728,7 +738,7 @@ Page=Página
 Notes=Notas
 AddNewLine=Añadir nueva línea
 AddFile=Añadir archivo
-FreeZone=Free-text product
+FreeZone=Producto de texto libre
 FreeLineOfType=Entrada libre del tipo
 CloneMainAttributes=Clonar el objeto con estos atributos principales
 ReGeneratePDF=Regenerar PDF
@@ -836,6 +846,7 @@ ListOfTemplates=Listado de plantillas
 Gender=Sexo
 Genderman=Hombre
 Genderwoman=Mujer
+Genderother=Otro
 ViewList=Vista de listado
 ViewGantt=Vista de Gantt
 ViewKanban=Vista Kanban
@@ -877,6 +888,8 @@ Miscellaneous=Miscelánea
 Calendar=Calendario
 GroupBy=Agrupado por...
 ViewFlatList=Ver lista plana
+ViewAccountList=Ver libro mayor
+ViewSubAccountList=Ver libro mayor de subcuenta
 RemoveString=Eliminar cadena '%s'
 SomeTranslationAreUncomplete=Algunos de los idiomas ofrecidos pueden estar parcialmente traducidos o pueden contener errores. Si detecta algunos, puede corregir los archivos de idiomas registrándose en <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Enlace de descarga directa
@@ -945,39 +958,39 @@ ShortThursday=J
 ShortFriday=V
 ShortSaturday=S
 ShortSunday=D
-one=one
-two=two
-three=three
-four=four
-five=five
-six=six
-seven=seven
-eight=eight
-nine=nine
-ten=ten
-eleven=eleven
-twelve=twelve
-thirteen=thirdteen
-fourteen=fourteen
-fifteen=fifteen
-sixteen=sixteen
-seventeen=seventeen
-eighteen=eighteen
-nineteen=nineteen
-twenty=twenty
-thirty=thirty
-forty=forty
-fifty=fifty
-sixty=sixty
-seventy=seventy
-eighty=eighty
-ninety=ninety
-hundred=hundred
-thousand=thousand
-million=million
-billion=billion
-trillion=trillion
-quadrillion=quadrillion
+one=uno
+two=dos
+three=tres
+four=cuatro
+five=cinco
+six=seis
+seven=siete
+eight=ocho
+nine=nueve
+ten=diez
+eleven=once
+twelve=doce
+thirteen=trece
+fourteen=catorce
+fifteen=quince
+sixteen=dieciséis
+seventeen=diecisiete
+eighteen=dieciocho
+nineteen=diecinueve
+twenty=veinte
+thirty=treinta
+forty=cuarenta
+fifty=cincuenta
+sixty=sesenta
+seventy=setenta
+eighty=ochenta
+ninety=noventa
+hundred=cien
+thousand=mil
+million=millón
+billion=billón
+trillion=trillón
+quadrillion=cuatrillón
 SelectMailModel=Seleccione una plantilla de e-mail
 SetRef=Establecer ref
 Select2ResultFoundUseArrows=Varios resultados encontrados. Use las flechas para seleccionar.
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Envíos a clientes
 SearchIntoExpenseReports=Informes de gastos
 SearchIntoLeaves=Día libre
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Pagos de clientes
+SearchIntoVendorPayments=Pagos a proveedor
+SearchIntoMiscPayments=Pagos varios
 CommentLink=Comentarios
 NbComments=Número de comentarios
 CommentPage=Espacio de comentarios
@@ -1073,13 +1089,21 @@ DeleteFileText=¿Realmente quieres eliminar este archivo?
 ShowOtherLanguages=Mostrar otros idiomas
 SwitchInEditModeToAddTranslation=Cambie al modo de edición para agregar traducciones para este idioma
 NotUsedForThisCustomer=No se utiliza para este cliente.
-AmountMustBePositive=Amount must be positive
-ByStatus=By status
+AmountMustBePositive=El importe debe ser positivo
+ByStatus=Por estado
 InformationMessage=Información
-Used=Used
-ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
-MODIFYInDolibarr=Record %s modified
-DELETEInDolibarr=Record %s deleted
-VALIDATEInDolibarr=Record %s validated
-APPROVEDInDolibarr=Record %s approved
+Used=Usado
+ASAP=Tan pronto como sea posible
+CREATEInDolibarr=Registro %s creado
+MODIFYInDolibarr=Registro %s modificado
+DELETEInDolibarr=Registro %s eliminado
+VALIDATEInDolibarr=Registro %s validado
+APPROVEDInDolibarr=Registro %s aprobado
+DefaultMailModel=Model de email por defecto
+PublicVendorName=Nombre público del proveedor
+DateOfBirth=Fecha de nacimiento
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=El token de seguridad ha expirado, así que la acción ha sido cancelada. Por favor, vuelve a intentarlo.
+UpToDate=A hoy
+OutOfDate=Fuera de plazo
+EventReminder=Recordatorio evento
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang
index 21c55f7972a..abe80887b89 100644
--- a/htdocs/langs/es_ES/members.lang
+++ b/htdocs/langs/es_ES/members.lang
@@ -19,14 +19,12 @@ MembersCards=Carnés de miembros
 MembersList=Listado de miembros
 MembersListToValid=Listado de miembros borrador (a validar)
 MembersListValid=Listado de miembros validados
-MembersListUpToDate=Listado de los miembros válidos al día de adhesión
-MembersListNotUpToDate=Listado de los miembros válidos no al día de adhesión
+MembersListUpToDate=Lista de miembros válidos con suscripción actualizada
+MembersListNotUpToDate=Lista de miembros válidos con suscripción desactualizada
 MembersListResiliated=Listado de los miembros dados de baja
 MembersListQualified=Listado de los miembros cualificados
 MenuMembersToValidate=Miembros borrador
 MenuMembersValidated=Miembros validados
-MenuMembersUpToDate=Miembros al día
-MenuMembersNotUpToDate=Miembros no al día
 MenuMembersResiliated=Miembros de baja
 MembersWithSubscriptionToReceive=Miembros a la espera de recibir afiliación
 MembersWithSubscriptionToReceiveShort=Suscripción a recibir
@@ -34,6 +32,7 @@ DateSubscription=Fecha afiliación
 DateEndSubscription=Fecha fin afiliación
 EndSubscription=Fin afiliación
 SubscriptionId=ID afiliación
+WithoutSubscription=Sin suscripción
 MemberId=ID miembro
 NewMember=Nuevo miembro
 MemberType=Tipo de miembro
@@ -81,7 +80,7 @@ DeleteType=Eliminar
 VoteAllowed=Voto autorizado
 Physical=Físico
 Moral=Jurídico
-MorPhy=Naturaleza
+MorAndPhy=Moral y Físico
 Reenable=Reactivar
 ResiliateMember=Dar de baja un miembro
 ConfirmResiliateMember=¿Está seguro de querer dar de baja a este miembro?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Enviar E-Mail en la validación de un nuevo miemb
 SendingEmailOnNewSubscription=Enviar E-Mail en una nueva suscripción
 SendingReminderForExpiredSubscription=Enviar un recordatorio para suscripción caducada
 SendingEmailOnCancelation=Enviar E-Mail en una cancelación
+SendingReminderActionComm=Envío de recordatorio para el evento de la agenda
 # Topic of email templates
 YourMembershipRequestWasReceived=Su membresía fue recibida.
 YourMembershipWasValidated=Su membresía ha sido validada.
@@ -167,6 +167,7 @@ MembersStatisticsByState=Estadísticas de miembros por departamento/provincia/re
 MembersStatisticsByTown=Estadísticas de miembros por población
 MembersStatisticsByRegion=Estadísticas de miembros por región
 NbOfMembers=Número de miembros
+NbOfActiveMembers=Número de miembros activos actuales
 NoValidatedMemberYet=Ningún miembro validado encontrado
 MembersByCountryDesc=Esta pantalla presenta una estadística del número de miembros por países. Sin embargo, el gráfico utiliza el servicio en línea  de gráficos de Google y sólo es operativo cuando se encuentra disponible una conexión a Internet.
 MembersByStateDesc=Esta pantalla presenta una estadística del número de miembros por departamentos/provincias/regiones
@@ -176,6 +177,7 @@ MenuMembersStats=Estadísticas
 LastMemberDate=Última fecha de miembro
 LatestSubscriptionDate=Fecha de la última cotización
 MemberNature=Naturaleza del miembro
+MembersNature=Naturaleza de los miembros
 Public=Información pública
 NewMemberbyWeb=Nuevo miembro añadido. En espera de validación
 NewMemberForm=Formulario de inscripción
diff --git a/htdocs/langs/es_ES/mrp.lang b/htdocs/langs/es_ES/mrp.lang
index 47ae2fc9595..34538f681bb 100644
--- a/htdocs/langs/es_ES/mrp.lang
+++ b/htdocs/langs/es_ES/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Órdenes de fabricación
-MO=Orden de fabricación
-MOs=Manufacturing orders
+MOs=Órdenes de fabricación
+ManufacturingOrder=Orden de fabricación
 MRPDescription=Módulo para gestionar producción y Órdenes de Fabricación (OF).
 MRPArea=Área MRP
 MrpSetupPage=Configuración del módulo MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Productos para producir
 UnitCost=Costo unitario
 TotalCost=Coste total
 BOMTotalCost=El costo para producir esta Lista de Materiales en función del costo de cada cantidad y producto a consumir (use el precio de costo si está definido, de lo contrario, el precio promedio ponderado si está definido, o el mejor precio de compra)
+GoOnTabProductionToProduceFirst=Primero debe haber iniciado la producción para cerrar una orden de fabricación (consulte la pestaña '%s'). Pero puedes cancelarlo.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/es_ES/multicurrency.lang b/htdocs/langs/es_ES/multicurrency.lang
index 21b73c00556..858b5a9a695 100644
--- a/htdocs/langs/es_ES/multicurrency.lang
+++ b/htdocs/langs/es_ES/multicurrency.lang
@@ -20,3 +20,19 @@ MulticurrencyPaymentAmount=Importe total, divisa original
 AmountToOthercurrency=Cantidad a (en moneda de la cuenta receptora)
 CurrencyRateSyncSucceed=La sincronización de la tasa de cambio se realizó con éxito
 MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use la moneda del documento para pagos en línea
+TabTitleMulticurrencyRate=Lista de tarifas
+ListCurrencyRate=Lista de tipos de cambio de la moneda
+CreateRate=Crea una tarifa
+FormCreateRate=Tasa de creación
+FormUpdateRate=Modificación de tarifas
+successRateCreate=La tasa de la moneda %s se ha agregado a la base de datos
+ConfirmDeleteLineRate=¿Está seguro de que desea eliminar la tasa %s de la moneda %s en la fecha %s?
+DeleteLineRate=Limpiar tasa
+successRateDelete=Tarifa eliminada
+errorRateDelete=Error al borrar la tarifa
+successUpdateRate=Modificación realizada
+ErrorUpdateRate=Error al cambiar la tarifa
+Codemulticurrency=código de moneda
+UpdateRate=cambiar la tarifa
+CancelUpdate=cancelar
+NoEmptyRate=El campo de tarifa no debe estar vacío
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index a4b527c3730..340ead2edf3 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -104,24 +104,24 @@ SetDefaultBarcodeType=Defina el tipo de código de barras
 BarcodeValue=Valor del código de barras
 NoteNotVisibleOnBill=Nota (no visible en las facturas, presupuestos, etc.)
 ServiceLimitedDuration=Si el servicio es de duración limitada :
-FillWithLastServiceDates=Fill with last service line dates
+FillWithLastServiceDates=Complete con las fechas de la última línea de servicio
 MultiPricesAbility=Varios segmentos de precios por producto/servicio (cada cliente está en un segmento)
 MultiPricesNumPrices=Nº de precios
-DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activar productos compuestos (kits)
-AssociatedProducts=Productos compuestos
-AssociatedProductsNumber=Nº de productos que componen este producto
+DefaultPriceType=Base de precios por defecto (con versus sin impuestos) al agregar nuevos precios de venta
+AssociatedProductsAbility=Activar kits (productos virtuales)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Número de productos que componen este kit
 ParentProductsNumber=Nº de productos que este producto compone
 ParentProducts=Productos padre
-IfZeroItIsNotAVirtualProduct=Si 0, este producto no es un producto virtual
-IfZeroItIsNotUsedByVirtualProduct=Si 0, este producto no está siendo utilizado por ningún producto virtual
+IfZeroItIsNotAVirtualProduct=Si es 0, este producto no es un kit
+IfZeroItIsNotUsedByVirtualProduct=Si es 0, este producto no es utilizado por ningún kit.
 KeywordFilter=Filtro por clave
 CategoryFilter=Filtro por categoría
 ProductToAddSearch=Buscar productos a adjuntar
 NoMatchFound=No se han encontrado resultados
 ListOfProductsServices=Listado de productos/servicios
-ProductAssociationList=Listado de productos/servicios que componen este producto compuesto
-ProductParentList=Listado de productos/servicios con este producto como componente
+ProductAssociationList=Lista de productos / servicios que son componentes de este kit
+ProductParentList=Lista de kits con este producto como componente
 ErrorAssociationIsFatherOfThis=Uno de los productos seleccionados es padre del producto en curso
 DeleteProduct=Eliminar un producto/servicio
 ConfirmDeleteProduct=¿Está seguro de querer eliminar este producto/servicio?
@@ -170,8 +170,8 @@ SuppliersPricesOfProductsOrServices=Precios de proveedores (productos o servicio
 CustomCode=Código aduanero
 CountryOrigin=País de origen
 Nature=Naturaleza del producto (materia prima/producto acabado)
-NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductShort=Naturaleza del producto
+NatureOfProductDesc=Materia prima o producto terminado
 ShortLabel=Etiqueta corta
 Unit=Unidad
 p=u.
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Valores globales disponibles:
 PriceMode=Modo precio
 PriceNumeric=Número
 DefaultPrice=Precio por defecto
+DefaultPriceLog=Historial de precios por defecto
 ComposedProductIncDecStock=Incrementar/Decrementar stock al cambiar su padre
 ComposedProduct=Sub-producto
 MinSupplierPrice=Precio mínimo de compra
@@ -339,6 +340,7 @@ UseProductFournDesc=Añade una funcionalidad para definir las descripciones de l
 ProductSupplierDescription=Descripción del proveedor para el producto.
 UseProductSupplierPackaging=Utilice el embalaje según los precios del proveedor (recalcule las cantidades según el conjunto de envases según el precio del proveedor al agregar / actualizar la línea en los documentos del proveedor)
 PackagingForThisProduct=Embalaje
+PackagingForThisProductDesc=En el pedido del proveedor, solicitará automáticamente esta cantidad (o un múltiplo de esta cantidad). No puede ser inferior a la cantidad mínima de compra
 QtyRecalculatedWithPackaging=La cantidad de la línea se recalculó de acuerdo con el embalaje del proveedor.
 
 #Attributes
@@ -362,9 +364,9 @@ SelectCombination=Seleccione combinación
 ProductCombinationGenerator=Generador de variantes
 Features=Funciones
 PriceImpact=Impacto en el precio
-ImpactOnPriceLevel=Impact on price level %s
-ApplyToAllPriceImpactLevel= Apply to all levels
-ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
+ImpactOnPriceLevel=Impacto en el nivel de precios %s
+ApplyToAllPriceImpactLevel= Aplicar a todos los niveles
+ApplyToAllPriceImpactLevelHelp=Al hacer clic aquí, establece el mismo impacto de precio en todos los niveles
 WeightImpact=Impacto en el peso
 NewProductAttribute=Nuevo atributo
 NewProductAttributeValue=Nuevo valor de atributo
diff --git a/htdocs/langs/es_ES/recruitment.lang b/htdocs/langs/es_ES/recruitment.lang
index 30961723abb..e542b1ec190 100644
--- a/htdocs/langs/es_ES/recruitment.lang
+++ b/htdocs/langs/es_ES/recruitment.lang
@@ -18,53 +18,58 @@
 #
 
 # Module label 'ModuleRecruitmentName'
-ModuleRecruitmentName = Recruitment
+ModuleRecruitmentName = Contratación
 # Module description 'ModuleRecruitmentDesc'
-ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+ModuleRecruitmentDesc = Gestionar y seguir campañas de contratación para nuevos puestos de trabajo.
 
 #
 # Admin page
 #
-RecruitmentSetup = Recruitment setup
+RecruitmentSetup = Configuración de contratación
 Settings = Configuraciones
-RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
-RecruitmentArea=Recruitement area
-PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
-EnablePublicRecruitmentPages=Enable public pages of open jobs
+RecruitmentSetupPage = Indique aquí la configuración de las principales opciones para el módulo de contratación
+RecruitmentArea=Área de contratación
+PublicInterfaceRecruitmentDesc=Las páginas públicas de trabajos son URL públicas para mostrar y responder a trabajos abiertos. Hay un enlace diferente para cada trabajo abierto, que se encuentra en cada registro de trabajo.
+EnablePublicRecruitmentPages=Habilitar páginas públicas de trabajos abiertos
 
 #
 # About page
 #
 About = Acerca de
-RecruitmentAbout = About Recruitment
-RecruitmentAboutPage = Recruitment about page
-NbOfEmployeesExpected=Expected nb of employees
-JobLabel=Label of job position
-WorkPlace=Work place
-DateExpected=Expected date
-FutureManager=Future manager
-ResponsibleOfRecruitement=Responsible of recruitment
-IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+RecruitmentAbout = Acerca de contratación
+RecruitmentAboutPage = Información de contratación
+NbOfEmployeesExpected=Número de empleados esperado
+JobLabel=Etiqueta del puesto de trabajo
+WorkPlace=Lugar de trabajo
+DateExpected=Fecha esperada
+FutureManager=Futuro gerente
+ResponsibleOfRecruitement=Responsable de la contratación
+IfJobIsLocatedAtAPartner=Si el trabajo se encuentra en un partner
+PositionToBeFilled=Puesto de trabajo
+PositionsToBeFilled=Puestos de trabajo
+ListOfPositionsToBeFilled=Listado de puestos de trabajo
+NewPositionToBeFilled=Nuevos puestos de trabajo
 
-JobOfferToBeFilled=Job offer to be filled
-ThisIsInformationOnJobPosition=Information of the job position to be filled
-ContactForRecruitment=Contact for recruitment
-EmailRecruiter=Email recruiter
-ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
-RequestedRemuneration=Requested remuneration
-ProposedRemuneration=Proposed remuneration
-ContractProposed=Contract proposed
-ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
-JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
-InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+JobOfferToBeFilled=Puesto de trabajo a rellenar
+ThisIsInformationOnJobPosition=Información del puesto de trabajo a cubrir
+ContactForRecruitment=Contacto de contratación
+EmailRecruiter=E-mail contratador
+ToUseAGenericEmail=Utilizar un e-mail genérico. Si no se define, se utilizará el e-mail del responsable de contratación
+NewCandidature=Nueva aplicación
+ListOfCandidatures=Listado de aplicaciones
+RequestedRemuneration=Retribución solicitada
+ProposedRemuneration=Retribución propuesta
+ContractProposed=Contrato propuesto
+ContractSigned=Contrato firmado
+ContractRefused=Contrato rechazado
+RecruitmentCandidature=Aplicacion
+JobPositions=Puestos de trabajo
+RecruitmentCandidatures=Aplicaciones
+InterviewToDo=Entrevista para realizar
+AnswerCandidature=Respuesta de la aplicación
+YourCandidature=Su aplicación
+YourCandidatureAnswerMessage=Gracias por su aplicación. <br> ...
+JobClosedTextCandidateFound=El puesto de trabajo esta cerrado. El puesto ha sido ocupado.
+JobClosedTextCanceled=El puesto de trabajo esta cerrado
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index d496387ada5..75b1e30418d 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -17,10 +17,10 @@ CancelSending=Anular envío
 DeleteSending=Eliminar envío
 Stock=Stock
 Stocks=Stocks
-MissingStocks=Missing stocks
-StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+MissingStocks=Stock faltante
+StockAtDate=Stock a fecha
+StockAtDateInPast=Fecha en el pasado
+StockAtDateInFuture=Fecha en el futuro
 StocksByLotSerial=Stocks por lotes/serie
 LotSerial=Lotes/Series
 LotSerialList=Listado de lotes/series
@@ -34,7 +34,7 @@ StockMovementForId=ID movimiento %d
 ListMouvementStockProject=Listado de movimientos de stock asociados al proyecto
 StocksArea=Área almacenes
 AllWarehouses=Todos los almacenes
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Incluir también pedidos borrador
 Location=Lugar
 LocationSummary=Nombre corto del lugar
@@ -65,8 +65,8 @@ RuleForWarehouse=Regla para almacenes
 WarehouseAskWarehouseDuringOrder=Indicar un almacén en pedidos de clientes
 UserDefaultWarehouse=Indicar un almacén en usuarios
 MainDefaultWarehouse=Almacén por defecto
-MainDefaultWarehouseUser=Use a default warehouse for each user
-MainDefaultWarehouseUserDesc=By activating this option, during creation of a product, the warehouse assigned to the product will be defined on this one. If no warehouse is defined on the user, the default warehouse is defined.
+MainDefaultWarehouseUser=Usar un almacén predeterminado para cada usuario
+MainDefaultWarehouseUserDesc=Al activar esta opción, durante la creación de un producto, se definirá el almacén asignado al producto en este. Si no se define ningún almacén en el usuario, se define el almacén predeterminado.
 IndependantSubProductStock=Stock del producto y stock del subproducto son independientes
 QtyDispatched=Cantidad recibida
 QtyDispatchedShort=Cant. recibida
@@ -95,16 +95,16 @@ RealStock=Stock real
 RealStockDesc=El stock físico o real es la stock que tiene actualmente en sus almacenes.
 RealStockWillAutomaticallyWhen=El stock real cambiará automáticamente de acuerdo con esta regla (según configuración del módulo de stock):
 VirtualStock=Stock virtual
-VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+VirtualStockAtDate=Stock virtual a fecha
+VirtualStockAtDateDesc=Stock virtual una vez que se procesen todos los pedidos pendientes que se planea realizar antes de la fecha
+VirtualStockDesc=El stock virtual es el stock que obtendrá una vez que todas las acciones abiertas/pendientes (que afecten al stock) serán cerradas (pedidos a proveedor del proveedor recibidos, pedidos de clientes enviados, ...)
 IdWarehouse=Id. almacén
 DescWareHouse=Descripción almacén
 LieuWareHouse=Localización almacén
 WarehousesAndProducts=Almacenes y productos
 WarehousesAndProductsBatchDetail=Almacenes y productos (con detalle por lote/serie)
 AverageUnitPricePMPShort=Valor (PMP)
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=El precio unitario promedio de entrada que tuvimos que pagar a los proveedores para que el producto estuviera en nuestras existencias.
 SellPriceMin=Precio de venta unitario
 EstimatedStockValueSellShort=Valor de venta
 EstimatedStockValueSell=Valor de venta
@@ -122,8 +122,9 @@ DesiredStockDesc=Esta cantidad será el valor que se utilizará para llenar el s
 StockToBuy=A pedir
 Replenishment=Reaprovisionamiento
 ReplenishmentOrders=Ordenes de reaprovisionamiento
-VirtualDiffersFromPhysical=Según las opciones de aumento/disminución, el stock físico y virtual (pedidos en curso+stock físico) puede diferir
-UseVirtualStockByDefault=Usar stock virtual por defecto, en lugar de stock físico, para la funcionalidad de aprovisionamiento
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Usar stock virtual
 UsePhysicalStock=Usar stock físico
 CurentSelectionMode=Modo de selección actual
@@ -132,18 +133,18 @@ CurentlyUsingPhysicalStock=Stock físico
 RuleForStockReplenishment=Regla para el reaprovisionamiento de stock
 SelectProductWithNotNullQty=Seleccie al menos un producto con una cantidad distinta de cero y un proveedor
 AlertOnly= Sólo alertas
-IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
+IncludeProductWithUndefinedAlerts = Incluir también stock negativo para productos sin cantidad deseada definida, para restaurarlos a 0
 WarehouseForStockDecrease=Para el decremento de stock se usará el almacén <b>%s</b>
 WarehouseForStockIncrease=Para el incremento de stock se usará el almacén <b>%s</b>
 ForThisWarehouse=Para este almacén
 ReplenishmentStatusDesc=Este es un listado de todos los productos con un stock menor al deseado (o menor al valor de alerta si la casilla de verificación "alerta" está marcada). Mediante la casilla de verificación, puede crear pedidos a proveedor para suplir la diferencia.
-ReplenishmentStatusDescPerWarehouse=If you want a replenishment based on desired quantity defined per warehouse, you must add a filter on the warehouse.
+ReplenishmentStatusDescPerWarehouse=Si desea un reabastecimiento basado en la cantidad deseada definida por almacén, debe agregar un filtro en el almacén.
 ReplenishmentOrdersDesc=Este es un listado de todos los pedidos a proveedores abiertos con productos predefinidos. Sólo los pedidos abiertos con productos predefinidos (por lo que los pedidos puedan afectar a los stocks) son visibles aquí.
 Replenishments=Reaprovisionamiento
 NbOfProductBeforePeriod=Cantidad del producto %s en stock antes del periodo seleccionado (< %s)
 NbOfProductAfterPeriod=Cantidad del producto %s en stock después del periodo seleccionado (> %s)
 MassMovement=Movimientos en masa
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Selecccione un producto, una cantidad, un almacén origen y un almacén destino, seguidamente haga clic "%s". Una vez seleccionados todos los movimientos, haga clic en "%s".
 RecordMovement=Registrar transferencia
 ReceivingForSameOrder=Recepciones de este pedido
 StockMovementRecorded=Movimiento de stock registrado
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=Este producto ya se encuentra en el listado
 SelectCategory=Filtro por categoría
 SelectFournisseur=Filtro proveedor
 inventoryOnDate=Inventario
-INVENTORY_DISABLE_VIRTUAL=Permitir no decrementar el stock del producto hijo de un kit en el inventario
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Usar el precio de compra si no se puede encontrar el último precio de compra
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Los movimientos de stock tendrán la fecha de inventario (en lugar de la fecha de validación de inventario)
 inventoryChangePMPPermission=Permitir cambiar el PMP de un producto
 ColumnNewPMP=Nueva unidad PMP
@@ -234,9 +233,10 @@ InventoryForASpecificProduct=Inventario de un producto específico
 StockIsRequiredToChooseWhichLotToUse=Se requiere stock para elegir qué lote usar
 ForceTo=Forzar
 AlwaysShowFullArbo=Mostrar el árbol completo del almacén en la ventana emergente de enlaces del almacén (Advertencia: esto puede disminuir drásticamente el rendimiento)
-StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
-CurrentStock=Current stock
-InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+StockAtDatePastDesc=Puede ver aquí el stock (stock real) en una fecha determinada en el pasado
+StockAtDateFutureDesc=Puede ver aquí el stock (stock virtual) en una fecha determinada en el futuro
+CurrentStock=Stock actual
+InventoryRealQtyHelp=Establezca el valor en 0 para restablecer la cantidad <br> Mantenga el campo vacío o elimine la línea para mantenerlo sin cambios
+UpdateByScaning=Actualizar escaneando
+UpdateByScaningProductBarcode=Actualización por escaneo (código de barras del producto)
+UpdateByScaningLot=Actualización por escaneo (lote | código de barras de serie)
diff --git a/htdocs/langs/es_ES/suppliers.lang b/htdocs/langs/es_ES/suppliers.lang
index f0577abc0f4..17b9bc3a831 100644
--- a/htdocs/langs/es_ES/suppliers.lang
+++ b/htdocs/langs/es_ES/suppliers.lang
@@ -38,10 +38,11 @@ MenuOrdersSupplierToBill=Pedidos a proveedor a facturar
 NbDaysToDelivery=Tiempo de entrega en días
 DescNbDaysToDelivery=El mayor retraso en las entregas de productos de este pedido
 SupplierReputation=Reputación del proveedor
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=No realizar pedidos
 NotTheGoodQualitySupplier=Mala calidad
 ReputationForThisProduct=Reputación
 BuyerName=Nombre del comprador
 AllProductServicePrices=Todos los precios de producto / servicio
-AllProductReferencesOfSupplier=All references of vendor
+AllProductReferencesOfSupplier=Todas las referencias del proveedor
 BuyingPriceNumShort=Precios de proveedores
diff --git a/htdocs/langs/es_ES/website.lang b/htdocs/langs/es_ES/website.lang
index cea9424a904..56cb631183f 100644
--- a/htdocs/langs/es_ES/website.lang
+++ b/htdocs/langs/es_ES/website.lang
@@ -16,7 +16,7 @@ WEBSITE_ROBOT=Archivo de robots (robots.txt)
 WEBSITE_HTACCESS=Archivo .htaccess del sitio web
 WEBSITE_MANIFEST_JSON=Archivo manifest.json del sitio web
 WEBSITE_README=Archivo README.md
-WEBSITE_KEYWORDSDesc=Use a comma to separate values
+WEBSITE_KEYWORDSDesc=Usar coma para separar valores
 EnterHereLicenseInformation=Ingrese aquí metadatos o información de licencia para llenar un archivo README.md. si distribuye su sitio web como plantilla, el archivo se incluirá en el paquete template.
 HtmlHeaderPage=Encabezado HTML (específico de esta página solamente)
 PageNameAliasHelp=Nombre o alias de la página.<br>Este alias es utilizado también para construir una URL SEO cuando el website sea lanzado desde un Host Virtual de un servidor (como Apache, Nginx...). Usar el botón "<strong>%s</strong>" para editar este alias.
@@ -31,7 +31,7 @@ AddWebsite=Añadir sitio web
 Webpage=Página web/Contenedor
 AddPage=Añadir página/contenedor
 HomePage=Página de inicio
-PageContainer=Página/contenedor
+PageContainer=Página
 PreviewOfSiteNotYetAvailable=La vista previa de su sitio web <strong>%s</strong> aún no está disponible. Primero debe '<strong>Importar una plantilla de sitio web completa</strong>' o simplemente '<strong>Agregar una página/contenedor</strong>'.
 RequestedPageHasNoContentYet=La página pedida con id %s todavía no tiene contenido, o cache file.tpl.php ha sido eliminado. Editar el contenido de la página para resolverlo.
 SiteDeleted=Sitio web '%s' eliminado
@@ -58,10 +58,10 @@ NoPageYet=No hay páginas todavía
 YouCanCreatePageOrImportTemplate=Puede crear una nueva página o importar una plantilla de sitio web completa
 SyntaxHelp=Ayuda en la sintaxis del código
 YouCanEditHtmlSourceckeditor=Puede editar código fuente HTML utilizando el botón "Origen" en el editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Puede incluir código PHP en este fuente usando los tags <strong>&lt;?php ?&gt;</strong>. Dispone de estas variables globales: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> También puede incluir contenido de otra Página/Contenedor con la siguiente sintaxis:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> Para incluir un <strong>enlace para descargar</strong> un archivo guardado en el directorio <strong>documents</strong>, use el wrapper <strong>document.php</strong> :<br>Por ejemplo, para un archivo de documents/ecm (es necesario estar logueado), la sintaxis:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Para un archivo de into documents/medias (directorio abierto para acceso público), la sintaxis es:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>Para un archivo compartido mediante un enlace compartido (acceso abierto utilizando la clave hash para compartir del archivo), la sintaxis es:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> Para incluir una <strong>imagen</strong> guardada en el directorio <strong>documents</strong> , use el wrapper <strong>viewimage.php</strong> :<br>Ejemplo para una imagen de documents/medias (acceso abierto), la sintaxis es:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource2=Para una imagen compartida con un enlace para compartir (acceso abierto usando la clave hash para compartir del archivo), la sintaxis es: <br><strong> &lt;img src="/viewimage.php? Hashp=12345679012 ..."&gt;</strong><br>
+YouCanEditHtmlSourceMore= <br>Más ejemplos de código HTML o dinámico disponibles en <a href="%s" target="_blank">la documentación wiki </a><br>.
 ClonePage=Clonar página/contenedor
 CloneSite=Clonar sitio
 SiteAdded=Sitio web agregado
@@ -124,7 +124,7 @@ ShowSubContainersOnOff=El modo para ejecutar 'dynamic content' es %s
 GlobalCSSorJS=Archivo global CSS/JS/Header del sitio web
 BackToHomePage=Volver a la página de inicio...
 TranslationLinks=Enlaces de traducción
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
+YouTryToAccessToAFileThatIsNotAWebsitePage=Intenta acceder a una página que no está disponible.<br>(ref=%s, tipo=%s, estado=%s)
 UseTextBetween5And70Chars=Para buenas prácticas de SEO, use un texto de entre 5 y 70 caracteres.
 MainLanguage=Lenguaje principal
 OtherLanguages=Otros idiomas
@@ -134,4 +134,6 @@ AvailableLanguagesAreDefinedIntoWebsiteProperties=Los idiomas disponibles se def
 ReplacementDoneInXPages=Reemplazo realizado en páginas o contenedores %s
 RSSFeed=Hilos RSS
 RSSFeedDesc=Puede obtener una fuente RSS de los últimos artículos con el tipo 'blogpost' usando esta URL
-PagesRegenerated=%s page(s)/container(s) regenerated
+PagesRegenerated=%s página(s)/contenedor(s) regenerados
+RegenerateWebsiteContent=Regenerar archivos de caché del sitio web
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/es_GT/compta.lang b/htdocs/langs/es_GT/compta.lang
new file mode 100644
index 00000000000..c7c41488180
--- /dev/null
+++ b/htdocs/langs/es_GT/compta.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - compta
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/es_GT/intracommreport.lang b/htdocs/langs/es_GT/intracommreport.lang
new file mode 100644
index 00000000000..76825d9b4ab
--- /dev/null
+++ b/htdocs/langs/es_GT/intracommreport.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+IntracommReportPeriod=Period of nalysis
diff --git a/htdocs/langs/es_GT/products.lang b/htdocs/langs/es_GT/products.lang
new file mode 100644
index 00000000000..6e900475275
--- /dev/null
+++ b/htdocs/langs/es_GT/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/es_HN/compta.lang b/htdocs/langs/es_HN/compta.lang
new file mode 100644
index 00000000000..c7c41488180
--- /dev/null
+++ b/htdocs/langs/es_HN/compta.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - compta
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/es_HN/intracommreport.lang b/htdocs/langs/es_HN/intracommreport.lang
new file mode 100644
index 00000000000..76825d9b4ab
--- /dev/null
+++ b/htdocs/langs/es_HN/intracommreport.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+IntracommReportPeriod=Period of nalysis
diff --git a/htdocs/langs/es_HN/products.lang b/htdocs/langs/es_HN/products.lang
new file mode 100644
index 00000000000..6e900475275
--- /dev/null
+++ b/htdocs/langs/es_HN/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/es_MX/accountancy.lang b/htdocs/langs/es_MX/accountancy.lang
index 37fdb0db710..073d5f060b7 100644
--- a/htdocs/langs/es_MX/accountancy.lang
+++ b/htdocs/langs/es_MX/accountancy.lang
@@ -13,7 +13,6 @@ OverviewOfAmountOfLinesNotBound=Resumen de la cantidad de líneas no vinculadas
 OverviewOfAmountOfLinesBound=Resumen de la cantidad de líneas ya vinculadas a una cuenta contable
 DeleteCptCategory=Eliminar cuenta contable del grupo
 ConfirmDeleteCptCategory=¿Está seguro de que desea eliminar esta cuenta contable del grupo de cuentas contables?
-AlreadyInGeneralLedger=Ya registrado en diarios
 GroupIsEmptyCheckSetup=El grupo está vacío, verifique la configuración del grupo de contabilidad personalizado
 DetailByAccount=Mostrar detalles por cuenta
 AccountWithNonZeroValues=Cuentas con valores distintos de cero
@@ -43,7 +42,6 @@ AccountancyAreaDescBind=PASO %s: Compruebe el enlace entre las líneas %s existe
 AccountancyAreaDescWriteRecords=PASO %s: Escriba las transacciones en el libro mayor. Para esto, vaya al menú <strong> %s </strong>, y haga clic en el botón <strong> %s </strong>.
 AccountancyAreaDescAnalyze=PASO %s: Agregue o edite transacciones existentes y genere informes y exportaciones.
 AccountancyAreaDescClosePeriod=PASO %s: Cierre el período para que no podamos realizar modificaciones en el futuro.
-TheJournalCodeIsNotDefinedOnSomeBankAccount=No se completó un paso obligatorio en la configuración (el diario del código de contabilidad no está definido para todas las cuentas bancarias)
 Selectchartofaccounts=Seleccionar gráfico activo de cuentas
 SubledgerAccount=Cuenta auxiliar
 SubledgerAccountLabel=Etiqueta de la cuenta auxiliar
@@ -62,7 +60,6 @@ ExpenseReportsVentilation=Enlace de reporte de gastos
 CreateMvts=Crear nueva transaccion
 UpdateMvts=Modificación de una transacción
 ValidTransaction=Validar transacción
-WriteBookKeeping=Registrar transacciones en el Libro Mayor
 Bookkeeping=Libro mayor
 ObjectsRef=Referencia del objeto fuente
 CAHTF=Compra total de proveedor antes de impuestos
diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
index 574d1db4a09..522f487bfb6 100644
--- a/htdocs/langs/es_MX/admin.lang
+++ b/htdocs/langs/es_MX/admin.lang
@@ -48,7 +48,6 @@ DisableJavascript=Deshabilitar funciones JavaScript y Ajax
 DisableJavascriptNote=Nota: Para propósito de prueba o depuración. Para optimización para una persona invidente o navegadores de texto, tu podrías  preferir usar el ajuste en el perfil de usuario
 UseSearchToSelectCompanyTooltip=Asi mismo si tu tienes un gran número de terceras partes (> 100 000), puedes incrementar la velocidad al establecer la constante COMPANY_DONOTSEARCH_ANYWHERE to 1 en Configuración->Otro. La búsqueda entonces será limitada al inicio de la cadena.
 DelaiedFullListToSelectCompany=Esperar hasta que una tecla sea presionada antes de cargar contenido del listado desplegable de terceros.<br>Esto podria incrementar el desempeño si tu tienes un gran numero de terceros, pero no se recomienda.
-DelaiedFullListToSelectContact=Esperar hasta que una tecla sea presionada antes de cargar contenido del listado desplegable de contactos.<br>Esto podria incrementar el desempeño si tu tienes un gran numero de contactos, pero no se recomienda)
 NumberOfKeyToSearch=Numero de caracteres para activar la búsqueda %s
 NumberOfBytes=Numero de Octetos
 SearchString=Cadena de búsqueda
@@ -189,7 +188,6 @@ HelpCenterDesc2=Algunos de estos recursos solo están disponibles en <b>inglés<
 CurrentMenuHandler=Administrador de menú actual
 Emails=Correos electrónicos
 EMailsSetup=Configuración de correos electrónicos
-EMailsDesc=Esta página le permite sobrescribir sus parámetros PHP predeterminados para el envío de correo electrónico. En la mayoría de los casos en el sistema operativo Unix / Linux, la configuración de PHP es correcta y estos parámetros son innecesarios.
 MAIN_MAIL_SMTP_PORT=Puerto SMTP / SMTPS (valor predeterminado en php.ini: <b>%s</b> )
 MAIN_MAIL_SMTP_SERVER=Host SMTP / SMTPS (valor predeterminado en php.ini: <b>%s</b> )
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Puerto SMTP / SMTPS (no definido en PHP en sistemas tipo Unix)
@@ -225,6 +223,7 @@ DisableLinkToHelpCenter=Ocultar enlace &quot; <b>Necesita ayuda o soporte</b> &q
 DisableLinkToHelp=Ocultar enlace a ayuda en línea &quot; <b>%s</b> &quot;
 WarningSettingSortOrder=Advertencia, establecer un orden predeterminado puede resultar en un error técnico al pasar a la página de lista si "campo" es un campo desconocido. Si experimenta un error de este tipo, vuelva a esta página para eliminar el orden predeterminado y restaurar el comportamiento predeterminado.
 Module20Name=Propuestas
+Module25Name=Ordenes de venta
 Module30Name=Facturas
 Module40Name=Vendedores
 DictionaryAccountancyJournal=Diarios de contabilidad
diff --git a/htdocs/langs/es_MX/companies.lang b/htdocs/langs/es_MX/companies.lang
index e03c2bd72da..94d7e8f6bd4 100644
--- a/htdocs/langs/es_MX/companies.lang
+++ b/htdocs/langs/es_MX/companies.lang
@@ -2,11 +2,9 @@
 ErrorCompanyNameAlreadyExists=El nombre de la empresa %s ya existe. Elige uno diferente.
 ErrorSetACountryFirst=Ajusta primero el país
 SelectThirdParty=Selecciona un tercero
-ConfirmDeleteCompany=¿Estás seguro que quieres borrar esta compañía y toda la información heredada?
+ConfirmDeleteCompany=¿Estás seguro que quieres borrar esta compañía y toda la información relacionada?
 DeleteContact=Eliminar un contacto/dirección
 ConfirmDeleteContact=¿Estás seguro que quieres borrar este contacto y toda la información heredada?
-MenuNewProspect=Nuevo prospecto
-MenuNewSupplier=Nuevo vendedor
 NewCompany=Nueva compañía (cliente potencial, cliente, proveedor)
 NewThirdParty=Nuevo tercero (cleinte potencial, cliente, proveedor)
 CreateThirdPartyAndContact=Crear un tercero + un contacto hijo
@@ -15,14 +13,13 @@ IdCompany=ID de empresa
 IdContact=ID de contacto
 ThirdPartyContacts=Contactos de terceros
 ThirdPartyContact=Contacto/dirección de terceros
-CompanyName=Nombre de empresa
+CompanyName=Nombre de la empresa
 AliasNames=Nombre simple (comercial, marca registrada, ...)
 AliasNameShort=Alias
 CountryIsInEEC=El país está dentro de la Comunidad Económica Europea.
 PriceFormatInCurrentLanguage=Formato de visualización de precios en el idioma y moneda actuales
 ThirdPartyEmail=Correo electrónico del tercero
 ThirdPartyCustomersWithIdProf12=Clientes con %s o %s
-ThirdPartySuppliers=Vendedores
 ToCreateContactWithSameName=Creará automáticamente un contacto/dirección con la misma información en tercero. En la mayoría de los casos, incluso si su tercero es una persona física, la creación de un tercero solo es suficiente.
 ParentCompany=Empresa matriz
 ReportByQuarter=Reporte por tasa
@@ -44,15 +41,15 @@ VATIsUsed=Impuesto a las ventas utilizado
 VATIsUsedWhenSelling=Esto define si este tercero incluye un impuesto de venta o no cuando realiza una factura a sus propios clientes
 VATIsNotUsed=No se utiliza impuesto sobre las ventas
 CopyAddressFromSoc=Copiar dirección de detalles de terceros
-ThirdpartyNotCustomerNotSupplierSoNoRef=Tercero no es ni cliente ni vendedor, no hay objetos de referencia disponibles
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Tercero no es ni cliente ni vendedor, los descuentos no están disponibles.
-OverAllProposals=Propuestas
+ThirdpartyNotCustomerNotSupplierSoNoRef=Tercero no es ni cliente ni proveedor, no hay objetos de referencia disponibles
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Tercero no es ni cliente ni proveedor, los descuentos no están disponibles.
+OverAllProposals=Cotizaciones
 OverAllSupplierProposals=Solicitudes de precios
 LocalTax1IsUsed=Usar segundo impuesto
 LocalTax1IsUsedES=RE se utiliza
 LocalTax2IsUsed=Usar tercer impuesto
 WrongCustomerCode=Código de cliente inválido
-WrongSupplierCode=Código de proveedor no válido
+WrongSupplierCode=Código de proveedor inválido
 CustomerCodeModel=Modelo de código de cliente
 SupplierCodeModel=Modelo de código de proveedor
 ProfId1Short=ID Prof. 1
@@ -102,14 +99,13 @@ ProfId1MA=ID Prof. 1 (R.C.)
 ProfId2MA=ID Prof. 2 (Patente)
 ProfId3MA=Id Prof. 3 (I.F.)
 ProfId4MA=ID Prof. 4 (C.N.S.S.)
-ProfId5MA=ID. prof. 5 (I.C.E.)
 ProfId2MX=R.P. IMSS
 ProfId3PT=Prof Id 3 (número de registro comercial)
 ProfId1US=ID del profesional (FEIN)
 ProfId1RO=ID 1 (CUI)
 ProfId2RO=ID2 ( Fiscal matricule)
 ProfId3RO=ID 3 (CAEN)
-ProfId5RO=ID 5 (EUID)
+ProfId4RO=ID 5 (EUID)
 VATIntra=ID de IVA
 VATIntraShort=ID de IVA
 VATIntraSyntaxIsValid=La sintaxis es válida
@@ -136,6 +132,7 @@ CustomerAbsoluteDiscountMy=Descuento absoluto para el cliente (autorizado por us
 SupplierAbsoluteDiscountAllUsers=Descuento absoluto con proveedor (dado por todos los usuarios)
 SupplierAbsoluteDiscountMy=Descuento absoluto con proveedor (dado por usted mismo)
 DiscountNone=Ninguno
+Contact=Dirección de contacto
 Contacts=Contactos/Direcciones
 ContactId=ID de contacto
 NoContactDefinedForThirdParty=No se ha definido un contacto para este tercero
@@ -157,6 +154,7 @@ CompanyDeleted=Empresa "%s" eliminada de la base de datos.
 ListOfContacts=Lista de contactos/direcciones
 ListOfContactsAddresses=Lista de contactos/direcciones
 ListOfThirdParties=Lista de terceros
+ShowContact=Dirección de contacto
 ContactsAllShort=Todos (Sin filtro)
 ContactForOrdersOrShipments=Contacto de la orden o del envío
 ContactForInvoices=Contacto de facturación
@@ -211,6 +209,7 @@ ListSuppliersShort=Lista de proveedores
 ListProspectsShort=Lista de clientes potenciales
 ListCustomersShort=Lista de clientes
 ThirdPartiesArea=Terceros/Contactos
+LastModifiedThirdParties=Último %s modificado Terceros
 UniqueThirdParties=Total de terceros
 InActivity=Abierta
 OutstandingBillReached=Max. para la cuenta pendiente alcanzada
@@ -226,7 +225,7 @@ SaleRepresentativeLogin=Inicio de sesión del representante de ventas
 SaleRepresentativeFirstname=Nombre del representante de ventas
 SaleRepresentativeLastname=Apellido del representante de ventas
 ErrorThirdpartiesMerge=Hubo un error al eliminar los terceros. Por favor compruebe el log. Los cambios han sido revertidos.
+KeepEmptyIfGenericAddress=Mantenga este campo vacío si esta dirección es una dirección genérica
 PaymentTypeSupplier=Tipo de pago: proveedor
-PaymentTermsSupplier=Condiciones de pago - Vendedor
 MulticurrencyUsed=Utilizar monedas múltiples
 MulticurrencyCurrency=Moneda
diff --git a/htdocs/langs/es_MX/ecm.lang b/htdocs/langs/es_MX/ecm.lang
index 3b832e37704..d8398fef21e 100644
--- a/htdocs/langs/es_MX/ecm.lang
+++ b/htdocs/langs/es_MX/ecm.lang
@@ -1,2 +1,11 @@
 # Dolibarr language file - Source file is en_US - ecm
+ECMNbOfDocs=No. de documentos en el directorio
+ECMNewSection=Nueva carpeta
+ECMAddSection=Agregar carpeta
 ECMCreationDate=Fecha de creación
+ECMNbOfFilesInDir=Número de archivos en la carpeta
+ECMNbOfSubDir=Número de sub carpetas
+ECMNbOfFilesInSubDir=Número de archivos en sub-carpetas
+ECMArea=Área de DMS / ECM
+ECMSectionWasRemoved=La carpeta <b>%s</b> ha sido eliminada.
+ECMSectionWasCreated=Se ha creado la carpeta <b>%s</b>.
diff --git a/htdocs/langs/es_MX/install.lang b/htdocs/langs/es_MX/install.lang
index 32549c46947..a936800f65d 100644
--- a/htdocs/langs/es_MX/install.lang
+++ b/htdocs/langs/es_MX/install.lang
@@ -3,8 +3,8 @@ InstallEasy=Sólo tienes que seguir las instrucciones paso a paso.
 MiscellaneousChecks=Verificación de requisitos previos
 ConfFileCouldBeCreated=El archivo de configuración <b>%s</b> existe pudo ser creado.
 ConfFileIsWritable=El archivo de configuración <b>%s</b> tiene permisos de escritura.
-PHPSupportSessions=Este PHP soporta sesiones.
 PHPSupportPOSTGETOk=Este PHP soporta variables POST y GET.
+PHPSupportSessions=Este PHP soporta sesiones.
 PHPMemoryOK=Su memória máxima de sesiones PHP está configurado en <b>%s</b>. Esto debe ser suficiente.
 ErrorDirDoesNotExists=El directorio %s no existe.
 ErrorWrongValueForParameter=Puede haber escrito un valor incorrecto para el parámetro '%s'.
diff --git a/htdocs/langs/es_MX/intracommreport.lang b/htdocs/langs/es_MX/intracommreport.lang
new file mode 100644
index 00000000000..0f08616a628
--- /dev/null
+++ b/htdocs/langs/es_MX/intracommreport.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+MenuIntracommReportList=Lista
+IntracommReportPeriod=Period of nalysis
diff --git a/htdocs/langs/es_MX/main.lang b/htdocs/langs/es_MX/main.lang
index 4d0eb80f605..d2d2407adfe 100644
--- a/htdocs/langs/es_MX/main.lang
+++ b/htdocs/langs/es_MX/main.lang
@@ -271,5 +271,7 @@ SearchIntoSupplierOrders=Ordenes de compra
 SearchIntoCustomerProposals=Propuestas comerciales
 SearchIntoExpenseReports=Reporte de gastos
 AssignedTo=Asignado a
+ToProcess=Procesar
 ContactDefault_agenda=Evento
+ContactDefault_order_supplier=Orden de compra
 ContactDefault_propal=Cotización
diff --git a/htdocs/langs/es_MX/productbatch.lang b/htdocs/langs/es_MX/productbatch.lang
index a6a3013a50e..997e8f021db 100644
--- a/htdocs/langs/es_MX/productbatch.lang
+++ b/htdocs/langs/es_MX/productbatch.lang
@@ -1,3 +1,19 @@
 # Dolibarr language file - Source file is en_US - productbatch
-SellByDate=Venta-por fecha
+ManageLotSerial=Usar el número de lote/serie
+ProductStatusOnBatch=Sí (lote/serie) requerido
+ProductStatusNotOnBatch=No (lote/serie no utilizado)
+atleast1batchfield=Fecha de caducidad o Fecha de venta o número de Lote/serie
+batch_number=Número de Lote/Serie
+SellByDate=Fecha de venta
+DetailBatchNumber=Detalles del Lote/Serie
+printBatch=Lote/Serie: %s
+printEatby=Fecha de caducidad: %s
+printSellby=Vender-por: %s
+printQty=Cantidad: %d
 AddDispatchBatchLine=Agregar una linea de Vida Útil para despacho
+WhenProductBatchModuleOnOptionAreForced=Cuando el módulo Lote/Serie está encendido, el stock automático es forzado a 'Disminuir las existencias reales en la validación del envío' y el modo de incremento automático es forzado a 'Aumentar las existencias reales en el envío manual a los almacenes' y no puede ser editado. Otras opciones pueden ser definidas si lo desea.
+ProductDoesNotUseBatchSerial=Este producto no utiliza el número de lote/serie
+ProductLotSetup=Configuración del módulo lote/serie
+ShowCurrentStockOfLot=Mostrar las existencias actuales para la relación producto/lote
+ShowLogOfMovementIfLot=Mostrar el registro de los movimientos para la  relación producto/lote
+StockDetailPerBatch=Detalle de las existencias por lote
diff --git a/htdocs/langs/es_MX/products.lang b/htdocs/langs/es_MX/products.lang
index 8ade985e293..8bd908672b5 100644
--- a/htdocs/langs/es_MX/products.lang
+++ b/htdocs/langs/es_MX/products.lang
@@ -10,6 +10,7 @@ NoMatchFound=No se encontraron coincidencias
 DeleteProduct=Eliminar un producto / servicio
 ExportDataset_produit_1=Productos
 ImportDataset_produit_1=productos
+CustomCode=Customs / Commodity / HS code
 BarCodePrintsheet=Imprimir código de barras
 GlobalVariableUpdaterType0=Datos JSON
 GlobalVariableUpdaterHelp0=Analiza los datos JSON de la URL especificada, VALUE especifica la ubicación del valor relevante,
diff --git a/htdocs/langs/es_MX/recruitment.lang b/htdocs/langs/es_MX/recruitment.lang
index e6b91c78167..fdb6a07d8e8 100644
--- a/htdocs/langs/es_MX/recruitment.lang
+++ b/htdocs/langs/es_MX/recruitment.lang
@@ -6,9 +6,5 @@ RecruitmentArea=Área de reclutamiento
 RecruitmentAbout =Sobre el reclutamiento
 RecruitmentAboutPage =Página acerca de reclutamiento
 NbOfEmployeesExpected=Número esperado de empleados
-JobLabel=Etiqueta del puesto de trabajo
-WorkPlace=Lugar de trabajo
-DateExpected=Fecha esperada
-FutureManager=Futuro gerente
 ResponsibleOfRecruitement=Responsable de reclutamiento
 IfJobIsLocatedAtAPartner=Si el trabajo se encuentra en un el lugar de un asociado
diff --git a/htdocs/langs/es_MX/ticket.lang b/htdocs/langs/es_MX/ticket.lang
index 9ad74f9a47a..59745fa1759 100644
--- a/htdocs/langs/es_MX/ticket.lang
+++ b/htdocs/langs/es_MX/ticket.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortBUGSOFT=Malfuncionamiento del software
 Closed=Cerrada
 TicketSettings=Configuraciónes
 TicketMessageMailIntroText=Hola, <br> Se envió una nueva respuesta en un ticket con el que se comunicó. Aquí está el mensaje: <br>
diff --git a/htdocs/langs/es_MX/website.lang b/htdocs/langs/es_MX/website.lang
index c290dfeb729..ff12c0bdb52 100644
--- a/htdocs/langs/es_MX/website.lang
+++ b/htdocs/langs/es_MX/website.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - website
-HomePage=Página Principal
 NoPageYet=Sin páginas aun
 GrabImagesInto=Insertar también las imágenes encontradas en CSS y página.
diff --git a/htdocs/langs/es_PA/compta.lang b/htdocs/langs/es_PA/compta.lang
new file mode 100644
index 00000000000..c7c41488180
--- /dev/null
+++ b/htdocs/langs/es_PA/compta.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - compta
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/es_PA/intracommreport.lang b/htdocs/langs/es_PA/intracommreport.lang
new file mode 100644
index 00000000000..76825d9b4ab
--- /dev/null
+++ b/htdocs/langs/es_PA/intracommreport.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+IntracommReportPeriod=Period of nalysis
diff --git a/htdocs/langs/es_PA/products.lang b/htdocs/langs/es_PA/products.lang
new file mode 100644
index 00000000000..6e900475275
--- /dev/null
+++ b/htdocs/langs/es_PA/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/es_PE/accountancy.lang b/htdocs/langs/es_PE/accountancy.lang
index d6c4ce35cbc..3fa654ee77c 100644
--- a/htdocs/langs/es_PE/accountancy.lang
+++ b/htdocs/langs/es_PE/accountancy.lang
@@ -9,8 +9,7 @@ ACCOUNTING_EXPORT_DEVISE=Moneda de exportación
 ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique el prefijo del nombre del fichero
 DefaultForService=Servicio por defecto
 DefaultForProduct=Producto por defecto
-ConfigAccountingExpert=Configuración del módulo experto en contabilidad
-Journaux=Revistas
+Journals=Revistas
 JournalFinancial=Revistas financieras
 BackToChartofaccounts=Retornar gráfico de cuentas
 Selectchartofaccounts=Seleccione el plan de cuentas activo
diff --git a/htdocs/langs/es_PE/intracommreport.lang b/htdocs/langs/es_PE/intracommreport.lang
new file mode 100644
index 00000000000..76825d9b4ab
--- /dev/null
+++ b/htdocs/langs/es_PE/intracommreport.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+IntracommReportPeriod=Period of nalysis
diff --git a/htdocs/langs/es_PE/main.lang b/htdocs/langs/es_PE/main.lang
index 541a023bb7c..02f38a9869b 100644
--- a/htdocs/langs/es_PE/main.lang
+++ b/htdocs/langs/es_PE/main.lang
@@ -26,6 +26,10 @@ EmptySearchString=No ingrese criterios de búsqueda vacíos
 NoRecordFound=No se encontró registro
 NoRecordDeleted=No se borró el registro
 NoError=Sin error
+ErrorFieldRequired=Campo '%s' es requerido
+ErrorFieldFormat=Campo '%s' es un valor incorrecto
+ErrorFileDoesNotExists=Archivo %s no existe
+ErrorFailedToOpenFile=Falló al brir el archivo %s
 ErrorNoVATRateDefinedForSellerCountry=Error, no hay tasas de IGV definidas para el país '%s'.
 NotClosed=No se ha cerrado
 AddLink=Añadir enlace
diff --git a/htdocs/langs/es_PE/mrp.lang b/htdocs/langs/es_PE/mrp.lang
index 8488907e055..df2c3df2e0b 100644
--- a/htdocs/langs/es_PE/mrp.lang
+++ b/htdocs/langs/es_PE/mrp.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - mrp
 Mrp=Órdenes de Fabricación
-MO=Orden de Fabricación
+MOs=Órdenes de Fabricación
+ManufacturingOrder=Orden de Fabricación
 MRPDescription=Modulo para gestionar la producción y órdenes de fabricación (OF).
 MRPArea=Área PRM
 MrpSetupPage=Configuración del modulo PRM
@@ -58,3 +59,5 @@ ProductQtyToConsumeByMO=Cantidad de producto pendiente para consumir por MO abie
 ProductQtyToProduceByMO=Cantidad de producto pendiente para producir por MO abierto.
 AddNewConsumeLines=Agregar nueva linea para consumir
 TotalCost=Costo total
+BOMTotalCost=El costo a producir este BOM es basado sobre el costo de cantidad y producto a consumir (Se usa si el precio de costo está definido, de lo contario usa el precio promedio ponderado, o en todo caso el mejor precio de compra)
+GoOnTabProductionToProduceFirst=Debe primero empezar la producción para cerrar una orden de fabricación (Ver tab '%s'). Pero puede cancelarlo.
diff --git a/htdocs/langs/es_PE/products.lang b/htdocs/langs/es_PE/products.lang
index d29e3ce3677..2e576f6187d 100644
--- a/htdocs/langs/es_PE/products.lang
+++ b/htdocs/langs/es_PE/products.lang
@@ -4,3 +4,4 @@ ProductLabel=Etiqueta del producto
 ProductServiceCard=Ficha Productos/Servicios
 ProductOrService=Producto o Servicio
 ExportDataset_produit_1=Productos
+CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/es_PY/compta.lang b/htdocs/langs/es_PY/compta.lang
new file mode 100644
index 00000000000..c7c41488180
--- /dev/null
+++ b/htdocs/langs/es_PY/compta.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - compta
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/es_PY/intracommreport.lang b/htdocs/langs/es_PY/intracommreport.lang
new file mode 100644
index 00000000000..76825d9b4ab
--- /dev/null
+++ b/htdocs/langs/es_PY/intracommreport.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+IntracommReportPeriod=Period of nalysis
diff --git a/htdocs/langs/es_PY/products.lang b/htdocs/langs/es_PY/products.lang
new file mode 100644
index 00000000000..6e900475275
--- /dev/null
+++ b/htdocs/langs/es_PY/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/es_US/compta.lang b/htdocs/langs/es_US/compta.lang
new file mode 100644
index 00000000000..c7c41488180
--- /dev/null
+++ b/htdocs/langs/es_US/compta.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - compta
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/es_US/intracommreport.lang b/htdocs/langs/es_US/intracommreport.lang
new file mode 100644
index 00000000000..76825d9b4ab
--- /dev/null
+++ b/htdocs/langs/es_US/intracommreport.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+IntracommReportPeriod=Period of nalysis
diff --git a/htdocs/langs/es_US/products.lang b/htdocs/langs/es_US/products.lang
new file mode 100644
index 00000000000..6e900475275
--- /dev/null
+++ b/htdocs/langs/es_US/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/es_UY/compta.lang b/htdocs/langs/es_UY/compta.lang
new file mode 100644
index 00000000000..c7c41488180
--- /dev/null
+++ b/htdocs/langs/es_UY/compta.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - compta
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/es_UY/intracommreport.lang b/htdocs/langs/es_UY/intracommreport.lang
new file mode 100644
index 00000000000..76825d9b4ab
--- /dev/null
+++ b/htdocs/langs/es_UY/intracommreport.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+IntracommReportPeriod=Period of nalysis
diff --git a/htdocs/langs/es_UY/products.lang b/htdocs/langs/es_UY/products.lang
new file mode 100644
index 00000000000..6e900475275
--- /dev/null
+++ b/htdocs/langs/es_UY/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/es_VE/intracommreport.lang b/htdocs/langs/es_VE/intracommreport.lang
new file mode 100644
index 00000000000..76825d9b4ab
--- /dev/null
+++ b/htdocs/langs/es_VE/intracommreport.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+IntracommReportPeriod=Period of nalysis
diff --git a/htdocs/langs/es_VE/main.lang b/htdocs/langs/es_VE/main.lang
index 6db9ce60111..55e67bea58a 100644
--- a/htdocs/langs/es_VE/main.lang
+++ b/htdocs/langs/es_VE/main.lang
@@ -38,6 +38,7 @@ ValidatePayment=Validar este pago
 NewAttribute=Nuevo atributo
 AttributeCode=Código atributo
 LinkToOrder=Enlazar a un pedido
+Genderother=Otra
 Progress=Progresión
 Export=Exportación
 ExpenseReports=Gastos
diff --git a/htdocs/langs/es_VE/products.lang b/htdocs/langs/es_VE/products.lang
index 7c5fda8bea0..7347e866031 100644
--- a/htdocs/langs/es_VE/products.lang
+++ b/htdocs/langs/es_VE/products.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - products
 TMenuProducts=Productos y servicios
 ProductStatusNotOnBuyShort=Fuera compra
+CustomCode=Customs / Commodity / HS code
 PriceExpressionEditorHelp2=Puede acceder a los atributos adicionales con variables como <b>#extrafield_myextrafieldkey#</b> y variables globales con <b>#global_mycode#</b>
diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang
index e6ecde693aa..682433c526e 100644
--- a/htdocs/langs/et_EE/accountancy.lang
+++ b/htdocs/langs/et_EE/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting expert
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=Journals
+Journals=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Kontoplaan
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Pangakontod
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=Aasta järgi
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index 9a9f6dc2925..268ecfbe48e 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Luba uued ühendused
 YourSession=Sinu sessioon
 Sessions=Kasutajate sessioonid
 WebUserGroup=Veebiserveri kasutaja/grupp
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Märgistik, mida kasutatakse andmete salvestamiseks andmebaasi
 DBSortingCharset=Märgistik, mida kasutada andmete sorteerimiseks andmebaasis
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Suure kolmandate isikute arvu korral (> 100 000) saab kiiruse suurendamiseks seadistada Seadistamine->Muu menüüs konstandi COMPANY_DONOTSEARCH_ANYWHERE väärtuseks 1. Sellisel juhul piirdub otsing sõne algusega.
 UseSearchToSelectContactTooltip=Suure kolmandate isikute arvu korral (> 100 000) saab kiiruse suurendamiseks seadistada Seadistamine->Muu menüüs konstandi CONTACT_DONOTSEARCH_ANYWHERE väärtuseks 1. Sellisel juhul piirdub otsing sõne algusega.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript on välja lülitatud
 UsePreviewTabs=Kasuta eelvaate sakke
 ShowPreview=Kuva eelvaade
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Eelvaade pole saadaval
 ThemeCurrentlyActive=Hetkel kasutatav teema
 CurrentTimeZone=PHP ajavöönd (serveri ajavöönd)
@@ -271,7 +274,7 @@ NoticePeriod=Teavitamisperiood
 NewByMonth=New by month
 Emails=E-postid
 EMailsSetup=E-posti seadistamine
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP-ID (kui saatev server nõuab autentimist)
 MAIN_MAIL_SMTPS_PW=SMTP parool (kui saatev server nõuab autentimist)
 MAIN_MAIL_EMAIL_TLS=Kasutage TLS (SSL) krüpteerimist
 MAIN_MAIL_EMAIL_STARTTLS=Kasutage TLS (STARTTLS) krüpteerimist
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=E-posti allkirja loomiseks kasutage DKIM-i
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Klõpsake kirjelduse nägemiseks
 DependsOn=See moodul vajab moodulit
 RequiredBy=See moodul on mooduli(te) poolt nõutav
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial süsteemiga (Asterisk jne) integreerimine
-Module59Name=Bookmark4u
-Module59Desc=Lisa Dolibarri kontost Bookmark4u konto genereerimise funktsioo
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Sekkumised
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Ressursid
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Müügiarvete vaatamine
 Permission12=Müügiarvete loomine/toimetamine
-Permission13=Müügiarvete muutmine
+Permission13=Invalidate customer invoices
 Permission14=Müügiarvete kinnitamine
 Permission15=Müügiarvete saatmine e-postiga
 Permission16=Müügiarvetega seotud maksete loomine
@@ -688,6 +694,7 @@ Permission32=Toodete loomine/muutmine
 Permission34=Toodete kustutamine
 Permission36=Peidetud toodete vaatamine/haldamine
 Permission38=Toodete eksport
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Sekkumiste vaatamine
 Permission62=Sekkumiste loomine/muutmine
 Permission64=Sekkumiste kustutamine
 Permission67=Sekkumiste eksport
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Liikmete vaatamine
 Permission72=Liikmete loomine/muutmine
 Permission74=Liikmete kustutamine
@@ -718,6 +728,7 @@ Permission95=Aruannete vaatamine
 Permission101=Saatmiste vaatamine
 Permission102=Saatmiste loomine/muutmine
 Permission104=Saatmiste kinnitamine
+Permission105=Send sendings by email
 Permission106=Saatmiste ekspor
 Permission109=Saatmiste kustutamine
 Permission111=Finantskontode vaatamine
@@ -825,10 +836,11 @@ Permission402=Allahindluste loomine/muutmine
 Permission403=Allahindluste kinnitamine
 Permission404=Allahindluste kustutamine
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Palkade eksportimine
+Permission517=Read payments of salaries of everybody
+Permission519=Palkade eksportimine
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Eksportimise tulemuse kätte saamine
 Permission1202=Ekspordi loomine/muutmine
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Väliste andmete massiline import andmebaasi (andmete laadimine)
 Permission1321=Müügiarvete, atribuutide ja maksete eksport
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Tehingute vaatamine
 Permission50202=Tehingute impor
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Seadistused salvestatud
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Vaikimisi kasutatav silt, kui koodile ei leitud tõlke vastet
 LabelOnDocuments=Dokumentide silt
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=Kuu lõpus
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Sirvija nimi
 BrowserOS=Sirvija operatsioonisüsteem
 ListOfSecurityEvents=Dolibarri turvasündmuste nimekiri
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQLi import
-ForcedToByAModule= Aktiveeritud moodul on antud reegli väärtuseks sundinud <b>%s</b>
+ForcedToByAModule=Aktiveeritud moodul on antud reegli väärtuseks sundinud <b>%s</b>
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Välja %s muutmine
 FillThisOnlyIfRequired=Näide: +2 (täida vaid siis, kui koged ajavööndi nihkega probleeme)
@@ -1282,7 +1322,7 @@ GetBarCode=Hangi triipkood
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Tagastab parooli, mis vastab Dolibarri sisemisele algoritmile: 8 tähemärki pikk ja koosneb väikestest tähtedest ja numbritest.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Liikmetele e-kirja kinnituse saatmise (kinnitamise või uue tellimuse puhul) märkeruut on vaikimisi valitud
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP seadistamine
 LDAPGlobalParameters=Üldised parameetrid
@@ -1523,7 +1564,9 @@ LDAPDescValues=Näiteväärtused on mõeldud <b>OpenLDAP</b> tarbeks koos järgn
 ForANonAnonymousAccess=Autenditud ligipääsu jaoks (näiteks kirjutusõiguse jaoks)
 PerfDolibarr=Jõudluse seadistamise/optimeerimise aruanne
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Rakenduse vahemälu
 MemcachedNotAvailable=Puhvermälu ei leitud. Jõudluse suurendamiseks paigalda puhverserver Memcached ja selle kasutamist võimaldav moodul.<br>Rohkem infot siit <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Pane tähele, et paljud veebimajutused sellist serverit teenusena ei paku.
 MemcachedModuleAvailableButNotSetup=Puhvri jaoks kasutatav moodul memcached on olemas, kuid mooduli seadistamine on lõpuni viimata
@@ -1571,9 +1614,9 @@ SyslogLevel=Tase
 SyslogFilename=Faili nimi ja rada
 YouCanUseDOL_DATA_ROOT=Võid kasutada DOL_DATA_ROOT/dolibarr.log Dolibarri "documents" kausta faili salvestamiseks, aga logifaili salvestamiseks võib ka mõnda muud rada kasutada.
 ErrorUnknownSyslogConstant=Konstant %s ei ole tuntud Syslogi konstant
-OnlyWindowsLOG_USER=Windows toetab vaid LOG_USER direktiivi
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Annetuste mooduli seadistamine
@@ -1629,7 +1672,7 @@ AdvancedEditor=Keerulisem toimeti
 ActivateFCKeditor=Aktiveeri keerulisem toimeti järgmistel lehtedel:
 FCKeditorForCompany=WYSIWIG loomine/muutmine elementide kirjeldustes ja märkustes (välja arvatud tooted/teenused)
 FCKeditorForProduct=WYSIWIG loomine/muutmine toodete/teenuste kirjeldustes ja märkustes
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG loomine/muutmine masspostitusel (Tööriistad->E-kirjad)
 FCKeditorForUserSignature=WYSIWIG loomine/muutmine kasutaja allkirjas
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menüü kustutatud
+Menu=Menu
 Menus=Menüüd
 TreeMenuPersonalized=Isikustatud menüüd
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Uus menüü
-Menu=Menüü valik
 MenuHandler=Menüü töötleja
 MenuModule=Lähtekoodi moodul
 HideUnauthorizedMenu= Peida volitamata menüüd (hall)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial mooduli seadistamine
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Kolmandad isikud
 MailToMember=Liikmed
 MailToUser=Kasutajad
-MailToProject=Projects page
+MailToProject=Projektid
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Postiindeks
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/et_EE/banks.lang b/htdocs/langs/et_EE/banks.lang
index 9ede8f3e1e2..60e4f3457b4 100644
--- a/htdocs/langs/et_EE/banks.lang
+++ b/htdocs/langs/et_EE/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Mitmesugused maksed
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/et_EE/categories.lang b/htdocs/langs/et_EE/categories.lang
index b2ad6020b51..ac9524d0f0d 100644
--- a/htdocs/langs/et_EE/categories.lang
+++ b/htdocs/langs/et_EE/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/et_EE/companies.lang b/htdocs/langs/et_EE/companies.lang
index 3fe3d3aef83..7689d22553b 100644
--- a/htdocs/langs/et_EE/companies.lang
+++ b/htdocs/langs/et_EE/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Reg nr 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Reg kood (Äriregistri registrikood)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF / NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (sireen)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, vana APE)
 ProfId4FR=Prof Id 4 (RCS / RM)
-ProfId5FR=Prof Id 5
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registrinumber
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (RC)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (IF)
 ProfId4MA=Id prof. 4 (CNSS)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (RFC).
 ProfId2MX=Prof Id 2 (R.. P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (sotsiaalkindlustus number)
 ProfId3PT=Prof Id 3 (Commercial rekordarv)
 ProfId4PT=Prof Id 4 (Konservatooriumis)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Kontrollida pole võimalik. Kontrolli, et liikmesriik (%s) võimaldab teenust kasutada.
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Töötajad
 ProspectLevelShort=Potentsiaalne
 ProspectLevel=Huvilise potentsiaal
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Valuuta
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/et_EE/ecm.lang b/htdocs/langs/et_EE/ecm.lang
index 4e49c8f289b..b234192073f 100644
--- a/htdocs/langs/et_EE/ecm.lang
+++ b/htdocs/langs/et_EE/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Otsi märksõnade järgi
 ECMSearchByEntity=Otsi objekti järgi
 ECMSectionOfDocuments=Dokumentide kaustad
 ECMTypeAuto=Automaatne
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Kolmandate isikutega seotud dokumendid
-ECMDocsByProposals=Pakkumistega seotud dokumendid
-ECMDocsByOrders=Müügitellimustega seotud dokumendid
-ECMDocsByContracts=Lepingutega seotud dokumendid
-ECMDocsByInvoices=Müügiarvetega seotud dokumendid
-ECMDocsByProducts=Toodetega seotud dokumendid
-ECMDocsByProjects=Projektidega seotud dokumendid
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=Ühtki kausta pole loodud
 ShowECMSection=Näita kausta
 DeleteSection=Eemalda kaust
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/et_EE/hrm.lang b/htdocs/langs/et_EE/hrm.lang
index 92c7798e63f..ea89f34be48 100644
--- a/htdocs/langs/et_EE/hrm.lang
+++ b/htdocs/langs/et_EE/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Töötajad
 Employee=Töötaja
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/et_EE/install.lang b/htdocs/langs/et_EE/install.lang
index 00052c3e2ca..f89a2c5d868 100644
--- a/htdocs/langs/et_EE/install.lang
+++ b/htdocs/langs/et_EE/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Seadistusfail <b>%s</b> on kirjutatav.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=Antud PHP toetab sessioone.
 PHPSupportPOSTGETOk=Antud PHP toetab POST ja GET muutujaid.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=Antud PHP toetab sessioone.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Antud PHP poolt kasutatav sessiooni maksimaalne mälu on <b>%s</b>. See peaks olema piisav.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/et_EE/intracommreport.lang b/htdocs/langs/et_EE/intracommreport.lang
new file mode 100644
index 00000000000..69a39218ef8
--- /dev/null
+++ b/htdocs/langs/et_EE/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=Loend
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/et_EE/languages.lang b/htdocs/langs/et_EE/languages.lang
index b352df45118..ef1fe82cda5 100644
--- a/htdocs/langs/et_EE/languages.lang
+++ b/htdocs/langs/et_EE/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Hispaania (Paraguay)
 Language_es_PE=Hispaania (Peruu)
 Language_es_PR=Hispaania (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index c4b68666af8..813ad00b669 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Remove link
 AddToDraft=Add to draft
 Update=Uuenda
 Close=Sulge
+CloseAs=Set status to
 CloseBox=Remove widget from your dashboard
 Confirm=Kinnita
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Ava uuesti
 Upload=Upload
 ToLink=Seosta
 Select=Vali
+SelectAll=Select all
 Choose=Vali
 Resize=Muuda suurust
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=Kaardid
 Card=Kaart
 Now=Nüüd
 HourStart=Algustund
+Deadline=Deadline
 Date=Kuupäev
 DateAndHour=Päev ja tund
 DateToday=Today's date
@@ -264,8 +267,10 @@ DateStart=Alguskuupäev
 DateEnd=Lõppkuupäev
 DateCreation=Loomise kuupäev
 DateCreationShort=Creat. date
+IPCreation=Creation IP
 DateModification=Muutmise kuupäev
 DateModificationShort=Muutm kuupäev
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Kinnitamise kuupäev
 DateClosing=Lõpetamise kuupäev
@@ -319,6 +324,7 @@ Morning=Hommik
 Afternoon=Pärastlõuna
 Quadri=Kvartal
 MonthOfDay=Kuu päev
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Määr
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Maksu summa 2
 AmountLT2=Maksu summa 3
 AmountLT1ES=RE summa
@@ -487,6 +494,7 @@ By=Isik
 From=Kellelt
 FromDate=Kellelt
 FromLocation=Kellelt
+at=at
 to=kellele
 To=kellele
 and=ja
@@ -509,6 +517,7 @@ Draft=Mustand
 Drafts=Mustandid
 StatusInterInvoiced=Invoiced
 Validated=Kinnitatud
+ValidatedToProduce=Validated (To produce)
 Opened=Ava
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Vastus
 Priority=Tähtsus
 SendByMail=Send by email
 MailSentBy=E-posti saatis
+NotSent=Saatmata
 TextUsedInTheMessageBody=E-kirja sisu
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Saada e-kiri
@@ -836,6 +846,7 @@ ListOfTemplates=List of templates
 Gender=Gender
 Genderman=Man
 Genderwoman=Woman
+Genderother=Muu
 ViewList=Nimekirja vaade
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Muu
 Calendar=Kalender
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Tarnija maksed
+SearchIntoMiscPayments=Mitmesugused maksed
 CommentLink=Kommentaarid
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Informatsioon
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Sünniaeg
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/et_EE/members.lang b/htdocs/langs/et_EE/members.lang
index 3df1d30b7d9..fc49d7214b9 100644
--- a/htdocs/langs/et_EE/members.lang
+++ b/htdocs/langs/et_EE/members.lang
@@ -19,14 +19,12 @@ MembersCards=Liikmete visiitkaardid
 MembersList=Liikmete nimekiri
 MembersListToValid=Mustandi staatuses olevate liikmete nimekiri (vajab kinnitamist)
 MembersListValid=Kinnitatud liikmete nimekiri
-MembersListUpToDate=Kinnitatud liikmed, kelle liikmemaks ei ole aegunud
-MembersListNotUpToDate=Kinnitatud liikmete nimekiri, kelle liikmemaks on aegunud
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=Kvalifitseeritud liikmete nimekiri
 MenuMembersToValidate=Liikmete mustand
 MenuMembersValidated=Kinnitatud liikmed
-MenuMembersUpToDate=Ajakohased liikmed
-MenuMembersNotUpToDate=Aegunud liikmed
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Kasutajad, kelle liikmemaks on saada
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Liikmemaksu kuupäev
 DateEndSubscription=Liikmemaksu  lõppkuupäev
 EndSubscription=Lõpeta liikmemaks
 SubscriptionId=Liikemaksu ID
+WithoutSubscription=Without subscription
 MemberId=Liikme ID
 NewMember=Uus liige
 MemberType=Liikme tüüp
@@ -81,7 +80,7 @@ DeleteType=Kustuta
 VoteAllowed=Hääletamine lubatud
 Physical=Füüsiline
 Moral=Moraalne
-MorPhy=Loomus
+MorAndPhy=Moral and Physical
 Reenable=Luba uuesti
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Liikmete statistika osariigi/provintsi alusel
 MembersStatisticsByTown=Liikmete statistika linna alusel
 MembersStatisticsByRegion=Liikmete statistika piirkonna järgi
 NbOfMembers=Liikmeid
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=Ei leinud ühtki kinnitatud liiget
 MembersByCountryDesc=See kuva näitab liikmete statistikat riikide alusel. Graafika töötamiseks peab olema ligipääs Google online graafikute teenusele ja see on kättesaadav vaid töötava internetiühendusega.
 MembersByStateDesc=See riik näitab liikmete statistikat osariigi/provintsi/kantoni alusel.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistika
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Informatsioon on avalik
 NewMemberbyWeb=Uus liige lisatud, ootab heaks kiitmist
 NewMemberForm=Uue liikme vorm
diff --git a/htdocs/langs/et_EE/mrp.lang b/htdocs/langs/et_EE/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/et_EE/mrp.lang
+++ b/htdocs/langs/et_EE/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index 74cf8f08516..9cd6afef593 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Hindasid
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Toodete arv, millest antud virtuaalne toode koosenb
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=Kui 0, siis ei ole tegu virtuaalse tootega
-IfZeroItIsNotUsedByVirtualProduct=Kui 0, siis ei kasuta seda toodet ükski virtuaalne toode
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Märksõnade filter
 CategoryFilter=Kategooriate filter
 ProductToAddSearch=Otsi lisamiseks toodet
 NoMatchFound=Ühtki vastet ei leitud
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=Virtuaalsete toodete/teenuste nimekiri, mis kasutavad ühe komponendina antud toodet
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=Üks valitud toodetest kasutab antud toodet
 DeleteProduct=Kustuta toode/teenus
 ConfirmDeleteProduct=Kas oled täiesti kindel, et soovid antud toote/teenuse kustutada?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Arv
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimaalne ostuhind
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/et_EE/recruitment.lang b/htdocs/langs/et_EE/recruitment.lang
index 02a90af05dc..8f3197e0311 100644
--- a/htdocs/langs/et_EE/recruitment.lang
+++ b/htdocs/langs/et_EE/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Ametikoht
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/et_EE/stocks.lang b/htdocs/langs/et_EE/stocks.lang
index 20dd3c22617..51bb0035e42 100644
--- a/htdocs/langs/et_EE/stocks.lang
+++ b/htdocs/langs/et_EE/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Asukoht
 LocationSummary=Asukoha lühike nimi
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=Tellida
 Replenishment=Värskendamine
 ReplenishmentOrders=Tellimuste värskendamine
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Kasuta virtuaalset ladu
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Kategooriate filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/et_EE/suppliers.lang b/htdocs/langs/et_EE/suppliers.lang
index 86a9e774975..217a3267e3a 100644
--- a/htdocs/langs/et_EE/suppliers.lang
+++ b/htdocs/langs/et_EE/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/et_EE/website.lang b/htdocs/langs/et_EE/website.lang
index ca36c3e11fa..b1d332fe020 100644
--- a/htdocs/langs/et_EE/website.lang
+++ b/htdocs/langs/et_EE/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Lehekülg
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS voog
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang
index 7b59e33b296..3211a0b62df 100644
--- a/htdocs/langs/eu_ES/accountancy.lang
+++ b/htdocs/langs/eu_ES/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting expert
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=Journals
+Journals=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Chart of accounts
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bank accounts
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=By year
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index d667dfe0be5..4e1e3f4f917 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Konexioaren blokeoa kendu
 YourSession=Zure sesioa
 Sessions=Users Sessions
 WebUserGroup=Web-zerbitzariaren erabiltzailea/taldea
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript ezgaituta
 UsePreviewTabs=Aurreikuspen fitxak erabili
 ShowPreview=Aurreikuspena aurkeztu
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Aurreikuspena ez dago eskuragarri
 ThemeCurrentlyActive=Aktibatuta dagoen gaia
 CurrentTimeZone=TimeZone PHP (zerbitzaria)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Interventions
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Bezeroen fakturak ikusi
 Permission12=Bezeroen fakturak sortu/aldatu
-Permission13=Bezeroaren fakturak baliogabetu
+Permission13=Invalidate customer invoices
 Permission14=Bezeroaren fakturak balioztatu
 Permission15=Bezeroaren faktura e-postaz bidali
 Permission16=Create payments for customer invoices
@@ -688,6 +694,7 @@ Permission32=Create/modify products
 Permission34=Produktuak ezabatu
 Permission36=See/manage hidden products
 Permission38=Produktuak esportatu
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Read members
 Permission72=Create/modify members
 Permission74=Delete members
@@ -718,6 +728,7 @@ Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
@@ -825,10 +836,11 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Edition of field %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1282,7 +1322,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP konfigurazioa
 LDAPGlobalParameters=Parametro orokorrak
@@ -1523,7 +1564,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Maila
 SyslogFilename=Fitxategiaren izena eta kokapena
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=%s konstantea ez da Syslog-eko konstante ezaguna
-OnlyWindowsLOG_USER=Windows-ek LOG_USER soilik jasaten du
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
@@ -1629,7 +1672,7 @@ AdvancedEditor=Advanced editor
 ActivateFCKeditor=Activate advanced editor for:
 FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
 FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Kideak
 MailToUser=Erabiltzaileak
-MailToProject=Projects page
+MailToProject=Proiektuak
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/eu_ES/banks.lang b/htdocs/langs/eu_ES/banks.lang
index 91a30683b36..cd868f74239 100644
--- a/htdocs/langs/eu_ES/banks.lang
+++ b/htdocs/langs/eu_ES/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/eu_ES/categories.lang b/htdocs/langs/eu_ES/categories.lang
index 9bb71984ecf..ba37a43b4ec 100644
--- a/htdocs/langs/eu_ES/categories.lang
+++ b/htdocs/langs/eu_ES/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/eu_ES/companies.lang b/htdocs/langs/eu_ES/companies.lang
index fbf687b3dd0..50a8223fe7c 100644
--- a/htdocs/langs/eu_ES/companies.lang
+++ b/htdocs/langs/eu_ES/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
 ProspectLevel=Prospect potential
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Currency
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/eu_ES/ecm.lang b/htdocs/langs/eu_ES/ecm.lang
index 43ddd3bf36f..71df60734fb 100644
--- a/htdocs/langs/eu_ES/ecm.lang
+++ b/htdocs/langs/eu_ES/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Search by keywords
 ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/eu_ES/hrm.lang b/htdocs/langs/eu_ES/hrm.lang
index 5417c180124..97a33211e6f 100644
--- a/htdocs/langs/eu_ES/hrm.lang
+++ b/htdocs/langs/eu_ES/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Employees
 Employee=Langilea
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/eu_ES/install.lang b/htdocs/langs/eu_ES/install.lang
index 2d708c04147..63947dad154 100644
--- a/htdocs/langs/eu_ES/install.lang
+++ b/htdocs/langs/eu_ES/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=This PHP supports sessions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/eu_ES/intracommreport.lang b/htdocs/langs/eu_ES/intracommreport.lang
new file mode 100644
index 00000000000..3060300b974
--- /dev/null
+++ b/htdocs/langs/eu_ES/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=List
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/eu_ES/languages.lang b/htdocs/langs/eu_ES/languages.lang
index aac76345a55..2717b18e96e 100644
--- a/htdocs/langs/eu_ES/languages.lang
+++ b/htdocs/langs/eu_ES/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Gaztelania (Peru)
 Language_es_PR=Spanish (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index 6a5f8a75250..ce139e4fb15 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Remove link
 AddToDraft=Add to draft
 Update=Berritu
 Close=Itxi
+CloseAs=Set status to
 CloseBox=Remove widget from your dashboard
 Confirm=Confirm
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Re-Open
 Upload=Upload
 ToLink=Esteka
 Select=Select
+SelectAll=Select all
 Choose=Choose
 Resize=Resize
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=Cards
 Card=Card
 Now=Orain
 HourStart=Start hour
+Deadline=Deadline
 Date=Data
 DateAndHour=Data eta ordua
 DateToday=Today's date
@@ -264,8 +267,10 @@ DateStart=Start date
 DateEnd=End date
 DateCreation=Creation date
 DateCreationShort=Creat. date
+IPCreation=Creation IP
 DateModification=Modification date
 DateModificationShort=Modif. date
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
@@ -319,6 +324,7 @@ Morning=Morning
 Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Month of the day
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Rate
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Amount tax 2
 AmountLT2=Amount tax 3
 AmountLT1ES=Amount RE
@@ -487,6 +494,7 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
+at=at
 to=to
 To=to
 and=and
@@ -509,6 +517,7 @@ Draft=Draft
 Drafts=Drafts
 StatusInterInvoiced=Invoiced
 Validated=Validated
+ValidatedToProduce=Validated (To produce)
 Opened=Open
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Response
 Priority=Priority
 SendByMail=Send by email
 MailSentBy=Email sent by
+NotSent=Not sent
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
 SendMail=e-posta bidali
@@ -836,6 +846,7 @@ ListOfTemplates=List of templates
 Gender=Gender
 Genderman=Man
 Genderwoman=Woman
+Genderother=Besteak
 ViewList=List view
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous
 Calendar=Egutegia
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Comments
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Informazioa
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Date of birth
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/eu_ES/members.lang b/htdocs/langs/eu_ES/members.lang
index e133e2ae77f..25c40cd7806 100644
--- a/htdocs/langs/eu_ES/members.lang
+++ b/htdocs/langs/eu_ES/members.lang
@@ -19,14 +19,12 @@ MembersCards=Members business cards
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
 SubscriptionId=Subscription id
+WithoutSubscription=Without subscription
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@@ -81,7 +80,7 @@ DeleteType=Ezabatu
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/eu_ES/mrp.lang b/htdocs/langs/eu_ES/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/eu_ES/mrp.lang
+++ b/htdocs/langs/eu_ES/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
index 84be483e557..63ff9381818 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_ES/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Zenbakia
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/eu_ES/recruitment.lang b/htdocs/langs/eu_ES/recruitment.lang
index 73e9a7fa07f..b775e78552e 100644
--- a/htdocs/langs/eu_ES/recruitment.lang
+++ b/htdocs/langs/eu_ES/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/eu_ES/stocks.lang b/htdocs/langs/eu_ES/stocks.lang
index c53f1607dd0..d709920da07 100644
--- a/htdocs/langs/eu_ES/stocks.lang
+++ b/htdocs/langs/eu_ES/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Kokapena
 LocationSummary=Short name location
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/eu_ES/suppliers.lang b/htdocs/langs/eu_ES/suppliers.lang
index 51562b8bb7a..03b03c75269 100644
--- a/htdocs/langs/eu_ES/suppliers.lang
+++ b/htdocs/langs/eu_ES/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/eu_ES/website.lang b/htdocs/langs/eu_ES/website.lang
index bb26cb14ba4..f00254a6c66 100644
--- a/htdocs/langs/eu_ES/website.lang
+++ b/htdocs/langs/eu_ES/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS kanala
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
index 00e11436d1a..be45e5ff3ed 100644
--- a/htdocs/langs/fa_IR/accountancy.lang
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=پیش‌فرض برای خدمات
 DefaultForProduct=پیش‌فرض برای محصول
 CantSuggest=امکان پیش‌نهاد نیست
 AccountancySetupDoneFromAccountancyMenu=اکثر برپاسازی حساب‌داری برای فهرست %s انجام شده است
-ConfigAccountingExpert=پیکربندی بخش کارشناس حسابداری
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=دفترنویسی
-Journaux=دفاتر
+Journals=دفاتر
 JournalFinancial=دفاتر مالی
 BackToChartofaccounts=بازگشت به نمودار حساب‌ها
 Chartofaccounts=نمودار حساب‌ها
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=حسابی اختصاصی کنونی
 AssignDedicatedAccountingAccount=نسبت دادن حساب جدید
 InvoiceLabel=عنوان صورت‌حساب
@@ -33,8 +35,8 @@ OtherInfo=سایر اطلاعات
 DeleteCptCategory=حذف حساب حساب‌درای از گروه
 ConfirmDeleteCptCategory=اطمینان دارید که می‌خواهید این حساب حساب‌داری را از گروه حساب حساب‌داری حذف کنید؟
 JournalizationInLedgerStatus=وضعیت دفترنویسی
-AlreadyInGeneralLedger=قبلا در دفترکل دفترنویسی شده
-NotYetInGeneralLedger=فعلا در دفترکل دفترنویسی نشده
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=گروه خالی است، برپاسازی گروه حساب‌داری انفرادی را بررسی کنید
 DetailByAccount=نمایش جزئیات مربوط به حساب
 AccountWithNonZeroValues=حساب‌هائی که صفر نیستند
@@ -43,7 +45,9 @@ CountriesInEEC=کشورهائی که در اتحادیۀ اروپا هستند
 CountriesNotInEEC=کشورهائی که در اتحادیۀ اروپا نیستند
 CountriesInEECExceptMe=کشورهائی که در اتحادیۀ اروپا هستند به استثناء %s
 CountriesExceptMe=همۀ کشورها باستثناء %s
-AccountantFiles=صادرات مستندات حساب‌داری
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=در برپاسازی برای مشتریان حساب حساب‌داری اصلی تعریف نشده است
 MainAccountForSuppliersNotDefined=در برپاسازی برای تامین کنندگان حساب حساب‌داری اصلی تعریف نشده است
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=گام %s: تراکنش‌های موجود را اض
 
 AccountancyAreaDescClosePeriod=گام %s: بازۀ زمانی را ببندید تا دیگر در آینده قابل ویرایش نباشد.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=روند گام‌به‌گام الزامی کامل نیست ( کد حساب دفترنویسی برای همۀ حساب‌های بانک تعریف نشده است )
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=انتخاب نمودار فعالی از حساب‌ها
 ChangeAndLoad=تغییر و بارگذاری
 Addanaccount=افزودن یک حساب حسابداری
@@ -89,6 +93,8 @@ SubledgerAccount=حساب دفترمعین
 SubledgerAccountLabel=برچسب حساب دفترمعین
 ShowAccountingAccount=نمایش حساب حساب‌داری
 ShowAccountingJournal=نمایش دفترنویسی حساب‌داری
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=حساب حسابداری پیشنهاد شده
 MenuDefaultAccounts=حساب‌های پیش‌فرض
 MenuBankAccounts=حسابهای بانکی
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=بندشدن به گزارش هزینه‌ها
 CreateMvts=ایجاد تراکنش جدید
 UpdateMvts=ویرایش تراکنش
 ValidTransaction=اعتباردهی به تراکنش
-WriteBookKeeping=ثبت تراکنش در دفترکل
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=دفترکل
+BookkeepingSubAccount=Subledger
 AccountBalance=موجودی حساب
 ObjectsRef=مرجع شیء منبع
 CAHTF=خرید کل تامین کننده قبل از مالیات
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=غیرفعال کردن ثبت مستقیم تراکن
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=فعال کردن خروجی پیش‌نویس از دفتر
 ACCOUNTANCY_COMBO_FOR_AUX=فعال کردن فهرست ترکیبی برای حساب وابسته(ممکن است در صورتی که شخص‌سوم‌های زیادی داشته باشید، کند باشد)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=دفتر فروش
 ACCOUNTING_PURCHASE_JOURNAL=دفتر خرید
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=حساب حساب‌داری انتظار
 DONATION_ACCOUNTINGACCOUNT=حساب حساب‌داری ثبت کمک و اعانه
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=حساب حساب‌داری ثبت اشتراک‌ها
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=به واسطۀ  گروه‌های از پیش‌تع
 ByPersonalizedAccountGroups=به واسطۀ گروه‌های دل‌خواه
 ByYear=به واسطۀ سال
 NotMatch=تعیین نشده
-DeleteMvt=حذف سطور دفترکل
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=حذف سال
 DelJournal=حذف دفتر
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=این کار باعث حذف تراکنش از دفترکل می‌شود (همۀ سطور مربوط به این تراکنش نیز حذف خواهند شد)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=دفتر مالی
 ExpenseReportsJournal=دفتر گزارش هزینه
 DescFinanceJournal=دفتر مالی که شامل همۀ انواع پرداخت بواسطۀ حساب بانکی می‌شود
-DescJournalOnlyBindedVisible=این نمائی از ردیف‌هائی است که به یک حساب حسابداری بند شده‌اند و امکان ثبت آن‌ها در دفتر کل وجود دارد.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=حساب مالیات‌بر‌ارزش‌افزوده تعریف نشده است
 ThirdpartyAccountNotDefined=حساب شخص‌سوم تعریف نشده است
 ProductAccountNotDefined=حساب محصول تعریف نشده است
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=این دفتر فعلا در حال استف
 AccountingAccountForSalesTaxAreDefinedInto=نکته: حساب حساب‌داری برای مالیات بر فروش در گزینۀ <b>%s</b> - <b>%s</b> قابل تعریف است
 NumberOfAccountancyEntries=تعداد ورودی‌ها
 NumberOfAccountancyMovements=تعداد جابجائی‌ها
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=صادرکردن پیش‌نویس دفتر
@@ -326,6 +339,8 @@ Modelcsv_configurable= صدور قابل پیکربندی CSV
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=صادرکردن برای Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=ساختار شناسۀ حساب‌‌ها
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index 71e01680216..047c4802f96 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=حذف قفل اتصال
 YourSession=نشست شما
 Sessions=نشست‌های کاربران
 WebUserGroup=کاربرِ/گروهِ سرویس‌دهندۀ‌وب 
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=به نظر می‌رسد پیکربندی PHP شما امکان فهرست‌کردن نشست‌های فعال را نداشته باشد. ممکن است پوشه‌ای که برای ذخیرۀ نشست‌ها مورد استفاده است (<b>%s</b>)  حفاظت شده باشد (مثلا بواسطۀ مجوزهای سیستم‌عامل یا با تمهیدات   open_basedir در PHP).
 DBStoringCharset=تنظیمات کدبندی Charset بانک داده برای ذخیره داده‌ها
 DBSortingCharset=تنظیمات کدبندی Charset بانک داده برای مرتب‌سازی داده‌ها
@@ -71,7 +73,7 @@ DisableJavascriptNote=نکته: برای اهداف آزمایشی یا اشکا
 UseSearchToSelectCompanyTooltip=در صورتی که تعداد اشخاص‌سوم شما بسیار زیاد باشد (مثلا بیشتر از 100000)، شما می‌توانید از واحد برپاسازی->سایر با استفاده از تغییر مقدارثابت COMPANY_DONOTSEARCH_ANYWHERE به عدد 1، سرعت را زیاد کنید. جستجو در این حالت تنها به شروع عبارت محدود خواهد شد.
 UseSearchToSelectContactTooltip=در صورتی که تعداد اشخاص‌سوم شما بسیار زیاد باشد (مثلا بیشتر از 100000)، شما می‌توانید از واحد برپاسازی->سایر با استفاده از تغییر مقدارثابت CONTACT_DONOTSEARCH_ANYWHERE به عدد 1، سرعت را زیاد کنید. جستجو در این حالت تنها به شروع عبارت محدود خواهد شد.
 DelaiedFullListToSelectCompany=انتظار تا هنگام فشرده شدن یک کلید قبل از بارگذاری فهرست ترکیبی اشخاص‌سوم. <br> در صورتی که تعداد زیادی شخص‌سوم داشته باشید این باعث افزایش کارآمدی خواهد شد اما راحتی آن کم‌تر است.
-DelaiedFullListToSelectContact=انتظار تا هنگام فشرده شدن یک کلید قبل از بارگذاری فهرست ترکیبی تماس‌ها در صورتی که تعداد زیادی ورودی تماس داشته باشید <br> این باعث افزایش کارآمدی خواهد شد اما راحتی آن کم‌تر است)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=تعداد حروفی که عامل جستجو می‌شود: %s
 NumberOfBytes=مقدار بایت‌ها
 SearchString=عبارت جستجو
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=بر روی اسناد مربوط به یک
 JavascriptDisabled=جاوا اسکریپت غیر فعال شده
 UsePreviewTabs=استفاده‌از زبانه‌های پیش‌نمایش
 ShowPreview=نمایش پیش‌نمایش
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=پیش‌نمایش در دسترس نیست
 ThemeCurrentlyActive=محیطی که اکنون فعال است
 CurrentTimeZone=منطقه زمانی PHP (سرور)
@@ -271,7 +274,7 @@ NoticePeriod=بازۀ یادآوری
 NewByMonth=جدید بر حسب ماه
 Emails=رایانامه‌ها
 EMailsSetup=برپاسازی رایانامه‌ها
-EMailsDesc=این صفحه به شما امکان نادیده‌انگاری مؤلفه‌های پیش‌فرض PHP برای ارسال رایانامه را می‌دهد. در بیشتر موارد روی سیستم عامل لینوکس/یونیکس، برپاسازی PHP صحیح است و تنظیم این مؤلفه‌ها ضروری نیست.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=نمایه‌های ارسال‌کنندۀ رایانامه
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=درگاه SMTP/SMTPS (مقدار پیش‌فرض در php.ini : <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=شناسۀ SMTP (شناسه‌ای که سرویس دهنده
 MAIN_MAIL_SMTPS_PW=گذرواژۀ SMTP ( در صورتی که سرویس‌دهندۀ ارسال کننده نیازمند اعتبار ورود باشد)
 MAIN_MAIL_EMAIL_TLS=استفاده از رمزبندی TLS از (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=استفاده از رمزبندی TLS از (STARTTLS)
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=استفاده از DKIM برای تولید امضای رایانامه
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=دامنۀ رایانامه برای استفاده به همراه DKIM
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=نام انتخاب کنندۀ DKIM
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=خالی رها کردن این بخش به معنا
 ExtrafieldParamHelpselect=فهرست مقادیر باید به صورت سطور به شکل  key,value باشد (که key نمی‌تواند برابر با 0 باشد.)<br><br> برای مثال: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>برای برخورداری از فهرستی وابسته به فهرست دیگری از مشخصات تکمیلی:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>برای برخورداری از یک فهرست وابسته به یک فهرست دیگر:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=فهرست مقادیر باید سطوری به شکل key,value باشد که (که key نمی‌تواند برابر با 0 باشد) <br><br> برای مثال: <br>1,value1<br>2,value2 <br>3,value3<br>...
 ExtrafieldParamHelpradio=فهرست مقادیر باید سطوری به شکل key,value باشد که (که key نمی‌تواند برابر با 0 باشد) <br><br> برای مثال: <br>1,value1<br>2,value2 <br>3,value3<br>...
-ExtrafieldParamHelpsellist=فهرست مقادیری که از یک جدول گرفته می‌شود<br>روش درج: table_name:label_field:id_field::filter<br>مثال: c_typent:libelle:id::filter<br><br>- idfilter برای  primary int key ضروری است<br>- فیلتر می‌تواند یک آزمایش ساده باشد (مثلا active=1) تا صرفا مقدار فعال را نمایش دهد. <br>شما همچنین در فیلتر می‌توانید از $ID$ استفاده کنید که برابر با شناسۀ کنونی شیء کنونی است <br>برای انجام یک جستار  SELECT در فیلتر از  $SEL$ استفاده نمائید.<br>در صورتی که بخواهید بخش‌های دیگر - extrafields را فیلتر کنید از این روش استفاده کنید   extra.fieldcode=... (که fieldcode درآن کد مربوط به آن extrafield است)<br><br>برای دریافت یک فهرست بسته به یک فهرست تکمیلی از مشخصه‌های دیگر:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>برای دریافت فهرستی که مبتنی بر فهرستی دیگر است:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=فهرست مقادیری که از یک جدول گرفته می‌شود <br>روش درج: table_name:label_field:id_field::filter<br>مثال: c_typent:libelle:id::filter<br><br>filter می‌تواند یک آزمایش ساده باشد (مثال active=1) برای نمایش مقدار فعال <br> شما همچنین می‌توانید از  $ID$ در فیلتر استفاده نمائید که شناسۀ کنونی شیء فعلی است <br>برای انجام جستار  SELECTدر فیلتر از  $SEL$<br>اگر بخواهید از extrafields در فیلتر استفاده نمائید، از روش‌درج extra.fieldcode=...  استفاده نمائید، (که کد فیلتر، همان کد extrafiled است)<br><br> باری دریافت ک فهرست وابسته به یک فهرست تکمیلی از مشخصه‌ها دیگر:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>برای دریافت یک فهرست وابسته به یک فهرست دیگر:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=مؤلفه‌ها باید به شکل ObjectName:Classpath باشد، <br>روش درج: ObjectName:Classpath <br> مثال‌ها: <br> Societe:societe/class/societe.class.php <br> Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=کتابخانۀ قابل استفاده برای تولید PDF
 LocalTaxDesc=برخی کشورها دو یا سه سطر مالیات در خصوص هر سطر از صورت‌حساب دارند. در این حالت، نوع مالیات دوم و سوم و نرخ آن را تعیین کنید. انواع قابل درج عبارتند از: <br>1: مالیات محلی به محصولات و خدمات بدون مالیات‌برارزش‌افزوده اختصاص داده می‌شود (مالیات محلی بر مبنای مبلغ بدون مالیات بر ارزش افزوده محاسبه می‌شود) <br>2: مالیات محلی بر محصولات و خدمات به‌همراه مالیات‌بر‌ارزش‌افزوده (مالیات‌محلی بر مبنای مبلغ + مالیات اصلی محاسبه می‌شود)  <br>3: مالیات محلی بر محصولات بدون مالیات بر ارزش افزوده (مالیات محلی بر اساس مبلع بدون مالیات حساب می‌شود) <br>4: مالیت محلی بر محصولات به همراه مالیات بر ارزش افزوده محاسبه می‌شود (مالیات محلی بر اساس مبلغ + مالیات بر ارزش افزوده اصلی محاسبه می‌شود)  <br>5: مالیات محلی بر بر خدمات بدون مالیات بر ارزش افزوده محاسبه می‌شود (مالیات محلی بر اساس مبلغ بدون مالیات بر ارزش افزوده) <br>6: مالیات محلی بر خدمات و شامل مالیات بر ارزش افزوده ( مالیات محلی بر اساس مبلغ + مالیات بر ارزش افزوده)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=به طور پیش‌فرض، سفارشات خرید باید توسط دو کاربر متفاوت ثبت و تائید بشود (یک گام/کاربر برای ساخت سفارش و یک گام/کاربر برای تائید سفارش. توجه داشته باشید در صورتی که کاربر اجازۀ ثبت و تائید سفارش داشته باشد، یک گام/کاربر کافی است). شما می‌توانید این گزینه را طوری تنظیم کنید که یک گام/کاربر سوم نیز برای تائید وجود داشته باشد. این در شرایطی که مثلا مبلغ بالاتر از یک مقدار خاص باشد مقدور است (پس، 3 گام ضروری است: 1=ثبت و اعتباردهی 2=تائید اول 3=تائید سوم در صورتی که مبلغ به اندازۀ کافی بالاست). <br> این واحد را در صورتی که حالت پیش‌فرض کافی است خالی بگذارید (دو گام)، ثبت آن به یک مقدار بسیار پائین (0.1) برای تائید دوم (سه گام) مورد نیاز است.
 UseDoubleApproval=استفاده از 3 گام تائید در حالتی که مبلغ (بدون مالیات) بالاتر از ....
-WarningPHPMail=هشدار: همواره بهتر است که رایانامه‌های خروجی را برای استفاده از سرویس‌دهندۀ رایانامۀ سرور خود به جای گزینۀ پیش‌فرض استفاده کنید. برخی ارائه‌دهندگان رایانامه (مانند Yahoo) به شما اجازۀ ارسال رایانامه از سرور دیگری را نمی‌دهند. برپاسازی فعلی شما از سرور برنامه برای ارسال رایانامه استفاده می‌کند، نه از سرور ارائه‌دهندۀ رایانامۀ شما، بنابراین برخی دریافت‌کنندگان (آن‌هائی که با قرارداد محدودیت DMARC سازگارند)، در صورتی که امکان دریافت رایانامۀ شما را داشته باشند، از ارائه دهندۀ خدمات رایانامۀ شما یا برخی ارائه‌دهندگان رایانامه (مثل Yahoo) خواهند پرسید و پاسخ "no" خواهند فرستاد چون سرور، مربوط به آن‌ها نیست، بنابراین ممکن است تعدادی از رایانامه‌های شما پذیرفته نشود (همچنین به محدودیت تعداد ارسال رایانامه در ارائه‌دهندۀ خدمات خود دقت کنید). <br> در صورتی که ارائه دهندۀ خدمات رایانامۀ شما (مانند Yahoo) این محدودیت را داشته باشد، شما باید تنظیمات رایانامه را طوری تغییر دهید و گزینۀ دیگر یعنی "سرور SMTP" را برگزینید و مشخصات فنی و مجوزهای ورود به سرور SMTP مربوط به سرور ارائه دهندۀ خدمات رایانامه را وارد نمائید.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=در صورتی که ارائۀ خدمات رایانامۀ SMTP شما نیازمند محدود کردن مشتری خدمات رایانامه به درگاه‌های اینترنتی خاص است (در موارد معدود)، این نشانی درگاه اینترنتی کاربر رایانامه (MUA) برای برنامۀ ERP CRM شماست: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=برای دریافت توضیحات کلیک کنید
 DependsOn=این واحد نیازمند فعالیت واحد‌(های) دیگر است
 RequiredBy=این واحد توسط واحد(های) دیگر مورد نیاز است
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=کلیک برای تماس
 Module58Desc=یکپارچه سازی سیستم ClickToDial (استریسک، ...)
-Module59Name=Bookmark4u
-Module59Desc=اضافه کردن تابع برای ایجاد حساب کاربری Bookmark4u از یک حساب Dolibarr
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=واسطه‌گری
@@ -656,7 +662,7 @@ Module50200Desc=امکان پرداخت از طریق PayPal برای مشتری
 Module50300Name=Stripe
 Module50300Desc=امکان پرداخت از طریق Stripe برای مشتریان (کارتهای اعتباری/نقدی). این به کاربران امکان پرداخت‌های اختصاصی برای اشیاء Dolibarr را می‌دهد (صورت‌حساب، سفارش و غیره)
 Module50400Name=حساب‌داری (دو طرفه)
-Module50400Desc=مدیریت حساب‌داری (ورودی‌های دوگانه-حسابداری دوبل، پشتیبانی از دفتر کل و معین). صادرات دفترکل به شکل سایر نرم‌افزارهای مختلف حساب‌داری.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=چاپ مستقیم (بدون باز کردن مستندات) با استفده از رابط Cups IPP (چاپ‌گر باید برای سرور قابل دیدن باشد و CUPS باید روی سرور نصب شده باشد).
 Module55000Name=رای‌گیری و نظرسنجی
@@ -671,7 +677,7 @@ Module63000Name=منابع
 Module63000Desc=مدیریت منابع (چاپ‌گرها، خودروها، اتاق‌ها و غیره) برای انتساب به رخدادها
 Permission11=ملاحظۀ صورت‌حساب‌های مشتریان
 Permission12=ایجاد/ویرایش صورت‌حساب مشتریان
-Permission13=نقض‌اعتبار صورت‌حساب مشتریان
+Permission13=Invalidate customer invoices
 Permission14=اعتباردهی صورت‌حساب مشتریان
 Permission15=ارسال صورت‌حساب مشتریان به‌وسیلۀ رایانامه
 Permission16=پرداخت صورت‌حساب مشتریان
@@ -688,6 +694,7 @@ Permission32=ساخت/ویرایش محصولات
 Permission34=حذف محصول
 Permission36=مشاهده/مدیریت محصولات پنهان
 Permission38=صادرکردن محصولات
+Permission39=Ignore minimum price
 Permission41=ملاحظۀ طرح‌ها و وظایف‌کاری ( طرح‌های مشترک و طرح‌هائی که من در آن طرفم). همچنین امکان درج زمان صرف شده برای من و شبکۀ من در خصوص وظایف نسبت داده شده است (برگۀ زمان)
 Permission42=ساخت/ویرایش طرح‌ها (طرح‌های مشترک و طرح‌هائی که من در آن طرف هستم). همچنین امکان ساخت وظایف و نسبت دادن کاربران به طرح‌ها و وظایف است
 Permission44=حذف طرح‌ها (پروژۀ مشترک و پروژه‌هائی که من در آن طرف هستم)
@@ -696,6 +703,9 @@ Permission61=ملاحظۀ واسطه‌گری‌ها
 Permission62=ساخت/ویرایش واسطه‌گری‌ها
 Permission64=حذف واسطه‌گری‌ها
 Permission67=صادرکردن واسطه‌گری‌ها
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=ملاحظۀ اعضا
 Permission72=خواندن/ویرایش عضوها
 Permission74=حذف عضوها
@@ -718,6 +728,7 @@ Permission95=ملاحظۀ گزارش‌ها
 Permission101=ملاحظۀ ارسال‌ها
 Permission102=ساخت/ویرایش ارسال‌ها
 Permission104=اعتباردهی ارسال‌ها
+Permission105=Send sendings by email
 Permission106=صادرکردن ارسال‌ها
 Permission109=حذف ارسال‌ها
 Permission111=ملاحظۀ حساب‌های تجاری
@@ -825,10 +836,11 @@ Permission402=ساخت/ویرایش تخفیف‌ها
 Permission403=اعتباردهی تخفیف‌ها
 Permission404=حذف تخفیف‌ها
 Permission430=استفاده از نوار اشکال‌یابی
-Permission511=ملاحظۀ پرداخت حقوق‌ها
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=ساخت/ویرایش پرداخت حقوق
 Permission514=حذف پرداخت حقوق
-Permission517=صادرکردن حقوق
+Permission517=Read payments of salaries of everybody
+Permission519=صادرکردن حقوق
 Permission520=ملاحظۀ وام‌ها
 Permission522=ساخت/ویرایش وام‌ها
 Permission524=حذف وام‌ها
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=خواندن صورت‌حساب‌های مواد
 Permission651=ایجاد/به‌هنگام سازی صورت‌حساب‌های موا
 Permission652=حذف صورت‌حساب‌های مواد
@@ -884,7 +899,9 @@ Permission1185=تائید سفارشات خرید
 Permission1186=سفارش/ترتیب‌دهی سفارشات خرید
 Permission1187=تصدیق اعلام وصول سفارش خرید
 Permission1188=حذف سفارش خرید
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=تائید (تائید دوم) سفارش خرید
+Permission1191=Export supplier orders and their attributes
 Permission1201=دریافت نتیجۀ صادرات
 Permission1202=ایجاد/ویرایش صادرات
 Permission1231=ملاحظۀ صورت‌حساب‌های فروشندگان
@@ -898,6 +915,8 @@ Permission1251=اجرای واردات گستردۀ داده‌های خارجی
 Permission1321=صادرکردن صورت‌حساب‌های مشتریان، صفت‌ها و پرداخت‌ها
 Permission1322=بازکردن دوبارۀ یک صورت‌حساب پرداخت‌شده
 Permission1421=صادرکردن سفارش‌های فروش و صفات
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=ملاحظۀ وظایف زمان‌بندی‌شده
 Permission23002=ساخت/ویرایش  وظایف زمان‌بندی‌شده
 Permission23003=حذف  وظایف زمان‌بندی‌شده
 Permission23004=اجرای  وظایف زمان‌بندی‌شده
-Permission50101=استفاده از صندوق POS
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=ملاحظۀ تراکنش‌ها
 Permission50202=واردکردن تراکنش‌ها
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=بندکردن محصولات و صورت‌حساب‌های با حساب‌های حساب‌داری
 Permission50411=خواندن عملیات موجود در دفترکل
 Permission50412=نوشتن/ویرایش عملیات در دفترکل
@@ -958,6 +981,17 @@ Permission63001=ملاحظۀ منابع
 Permission63002=ساخت/ویرایش منابع
 Permission63003=حذف منابع
 Permission63004=پیونددادن منابع به روی‌داد جلسه
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=انواع شخص‌سوم
 DictionaryCompanyJuridicalType=موجودیت حقوقی شخص‌سوم
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=انواع مرخصی
 DictionaryOpportunityStatus=وضعیت سرنخ برای طرح/سرنخ
 DictionaryExpenseTaxCat=گزارش هزینه - دسته‌بندی‌های حمل‌ونقل
 DictionaryExpenseTaxRange=گزارش هزینه - محدودۀ دسته‌بندی‌های حمل‌ونقل
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=تنظیمات برپاسازی ذخیره شد
 SetupNotSaved=تنظیمات برپاسازی ذخیره نشد
 BackToModuleList=بازگشت به فهرست واحد‌ها
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=این برچسب در حالتی که هیچ ترجمه‌ا
 LabelOnDocuments=برچسب روی مستندات
 LabelOrTranslationKey=برچسب یا کلید ترجمه
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=تعداد روزها
 AtEndOfMonth=در پایان ماه
 CurrentNext=فعلی/بعدی
@@ -1145,6 +1182,7 @@ InfoWebServer=دربارۀ سرور وب
 InfoDatabase=دربارۀ پایگاه‌داده
 InfoPHP=دربارۀ PHP
 InfoPerf=دربارۀ کارائی
+InfoSecurity=About Security
 BrowserName=نام مرورگر
 BrowserOS=سیستم عامل مرورگر
 ListOfSecurityEvents=فهرست رویدادهای امنیتی Dolibarr
@@ -1194,7 +1232,8 @@ RestoreDesc=برای بازآوری یک نسخۀ پشتیبان Dolibarr، دو
 RestoreDesc2=بازآوری فایل پشتیبان (مثلا یک فایل zip) مربوط به پوشۀ documents به یک نسخۀ جدید نصب شدۀ Dolibarr یا نسخۀ فعلی (<b>%s</b>).
 RestoreDesc3=بازآوری ساختار و داده‌های پایگاه داده از یک فایل dump-رونوشت پشتیبان به یک نسخۀ نصب شدۀ جدید یا نسخۀ فعلی Dolibarr (<b>%s</b>). هشدار، به محض‌اینکه بازیابی کامل شد، شما باید نام‌کاربری/گذرواژه‌ای را استفاده کنید که در نصب و زمان قبلی وجود داشته است. <br> برای بازیابی یک پایگاه‌داده در نصب فعلی، شما می‌توانید از دستیار زیر استفاده نمائید.
 RestoreMySQL=وارد‌کردن MySQL
-ForcedToByAModule= این مقررات برای <b>%s</b> توسط یک واحد فعال، الزام شده است
+ForcedToByAModule=این مقررات برای <b>%s</b> توسط یک واحد فعال، الزام شده است
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=فایل‌های موجود پشتیبان
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=اولین روز هفته
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=بخش %s در PHP بارگذاری شده است
 PreloadOPCode=OPCode از پیش بارگذاری شده مورد استفاده است
 AddRefInList=نمایش فهرست اطلاعات مرجع -ref. فروشنده/مشتری (فهرست انتخابی یا ترکیبی) و اکثر ابَرپیوند. <br> نام طرف‌های سوم به شکل  " CC12345 - SC45678 - شرکت بزرگ سازمانی " به جای "شرکت بزرگ سازمانی" نمایش داده خواهد شد.
 AddAdressInList=نمایش فهرست اطلاعات نشانی‌های فروشنده/مشتری (فهرست انتخابی یا ترکیبی) <br>شخص سوم‌ها به شکل "شرکت بزرگ سازمانی - شمارۀ 21 خیابان 123456 شهر بزرگ ایران" به جای "شرکت بزرگ سازمانی" نمایش داده خواهند شد.
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=پرسش برای روش ارسال ترجیحی برای اشخاص سوم
 FieldEdition=ویرایش بخش %s
 FillThisOnlyIfRequired=مثال: +2 (تنها در صورتی که با مشکل ناحیۀ زمانی مواجه شوید)
@@ -1282,7 +1322,7 @@ GetBarCode=دریافت بارکد
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=بازگرداندن یک گذرواژه که با توجه به الگوریتم‌ Dolibarr تولید شده است: 8 نویسه، متشکل از اعداد و حروف کوچک.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=گذرواژۀ پیشنهادی ارائه نشود. گذرواژه‌ها باید به شکل دستی وارد شوند.
 PasswordGenerationPerso=بازگرداندن یک گذرواژه با توجه به پیکربندی که شما تعریف کرده‌اید.
 SetupPerso=بسته به پیکربندی تعیین شدۀ شما
@@ -1381,6 +1421,7 @@ AdherentMailRequired=برای ساخت یک عضو یک رایانامه لاز
 MemberSendInformationByMailByDefault=کادرتائید برای ارسال تصدیق رایانامه برای اعضا (اعتباردهی یا عضویت جدید) به شکل پیش‌فرض فعال است
 VisitorCanChooseItsPaymentMode=کاربر می‌تواند از انواع روش پرداخت موجود استفاده نماید
 MEMBER_REMINDER_EMAIL=فعال‌کردن یادآور خودکار <b>توسط رایانامه</b> برای عضویت‌های منقضی‌شده. توجه: واحد <strong>%s</strong> برای ارسال صحیح یادآورها نیازمند فعال‌سازی و پیکربندی صحیح است.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=برپاسازی LDAP
 LDAPGlobalParameters=مقادیر سراسری
@@ -1523,7 +1564,9 @@ LDAPDescValues=مقادیر مثالی طراحی شده برای <b>OpenLDAP</b
 ForANonAnonymousAccess=برای یک دسترسی تائید شده (مثلا برای دسترسی نوشتاری)
 PerfDolibarr=برپاسازی کارآمدی/گزارش بهینه‌سازی
 YouMayFindPerfAdviceHere=این صفحه برخی بررسی‌ها و توصیه‌های مربوط به کارآمدی را ارائه می‌دهد.
-NotInstalled=نصب نشده، بنابراین سرور شما به‌واسطۀ این بخش کند نخواهد شد.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=میان‌گیر عملیاتی
 MemcachedNotAvailable=هیچ میان‌گیر عملیاتی پیدا نشده. شما می‌توانید با نصب سرور میان‌گیر از قبیل Memcached و یک واحد قابل نصب که قابلیت استفاده از این سرور را دارد کارائی را افزایش دهید. <br>اطلاعات بیشتر در این پیوند <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>. <br>نکته این‌که بسیاری از ارائه‌دهندگان خدمات میزبانی از چنین سرویس‌دهندۀ میان‌گیری پشتیبانی نمی‌نمایند.
 MemcachedModuleAvailableButNotSetup=واحد memcached برای میان‌گیری عملیاتی یافت می‌شود اما پیکربندی آن کامل نیست.
@@ -1571,9 +1614,9 @@ SyslogLevel=سطح
 SyslogFilename=نام فایل و مسیر
 YouCanUseDOL_DATA_ROOT=می‌توانید از DOL_DATA_ROOT/dolibarr.log برای یک فایل گزارش در پوشۀ documents مربوط به Dolibarr استفاده نمائید. شما می‌توانید مسیر متفاوتی برای ذخیرۀ این فایل استفاده نمائید.
 ErrorUnknownSyslogConstant=مقدارثابت %s به‌عنوان یک مقدار ثابت برای گزارش‌سامانه شناخته نشده است
-OnlyWindowsLOG_USER=ویندوز تنها از LOG_USER پشتیبانی می‌نماید
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=فشرده‌سازی و پشتیبان‌گیری از فایل‌های اشکال‌گیری (تولید شده توسط واحد گزارش‌گیری برای مقاصد اشکال‌گیری)
-SyslogFileNumberOfSaves=پشتیبان‌های گزارش‌ها
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=پیکربندی حذف وظایف زمان‌بندی شده برای اجرای متداول پشتیبان‌گیری از گزارش‌ها
 ##### Donations #####
 DonationsSetup=برپاسازی واحد کمک‌های‌مالی
@@ -1629,7 +1672,7 @@ AdvancedEditor=ویرایشگر پیشرفته
 ActivateFCKeditor=فعال کردن ویرایشگر پیشرفته برای:
 FCKeditorForCompany=ساخت/ویرایش عناصر توضیح و یادآوری به شکل WYSIWIG (باستثناء محصولات/خدمات)
 FCKeditorForProduct=ساخت/ویرایش عناصر توضیح و یادآوری به شکل WYSIWIG
-FCKeditorForProductDetails=ساخت/ویرایش سطور جزئیات برای همۀ موجودیت‌های محصولات (پیشنهادها، سفارش‌ها، صورت‌حساب‌ها و غیره) با WYSIWIG. <font class="warning">هشدار: استفده از این گزینه برای این مورد اساسا توصیه نمی‌شود زیرا ممکن است در هنگام ساخت فایل‌های PDF در خصوص نویسه‌های خاص در هنگام شکل‌دهی صفحه مشکل ایجاد نماید.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= ساخت/ویرایش WYSIWIG برای ارسال رایانامۀ انبوه (ابزار->ارسال رایانامه)
 FCKeditorForUserSignature=ساخت/ویرایش امضای کاربر توسط WYSIWIG
 FCKeditorForMail=ساخت/ویرایش همۀ رایانامه‌ها با WYSIWIG (منهای ابزار->ارسال رایانامه)
@@ -1639,11 +1682,11 @@ StockSetup=برپاسازی واحد انبار
 IfYouUsePointOfSaleCheckModule=در صورتی که از صندوق (POS) پیش‌فرض ارائه شده یا از یک واحد خارجی استفاده می‌نمائید، این تنظیمات ممکن است توسط واحد صندوق شما نادیده گرفته شود. اکثر واحدهای POS به‌طور پیش‌فرض طوری طراحی شده‌اند که فورا یک صورت‌حساب ایجاد کرده و بدون‌توجه به گزینه‌های ذیل، از آمار انبار را کاهش بدهند. بنابراین در صورتی که لازم باشد/یا نباشد در هنگام ثبت فروش از طریق صندوق، آمار انبار دست‌کاری شود، باید تنظیمات مربوط به واحد صندوق نصب شدۀ خود را نیز بررسی کنید.
 ##### Menu #####
 MenuDeleted=فهرست حذف شد
+Menu=Menu
 Menus=فهرست‌ها
 TreeMenuPersonalized=فهرست‌های شخصی
 NotTopTreeMenuPersonalized=فهرست‌های شخصی که به یکی از قسمت‌های فهرست‌اصلی پیوند نشده‌اند
 NewMenu=فهرست جدید
-Menu=انتخاب فهرست
 MenuHandler=اداره‌کنندۀ فهرست
 MenuModule=واحد منبع
 HideUnauthorizedMenu= پنهان کردن فهرست‌های غیرمجاز (خاکستری)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=ثبت خودکار این مقدار پیش‌ف
 AGENDA_DEFAULT_FILTER_TYPE=ثبت خودکار این نوع از رخداد در صافی جستجوی نمای جلسات
 AGENDA_DEFAULT_FILTER_STATUS=ثبت خودکار این وضعیت جلسه در صافی جستجوی نمای جلسات
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=فعال‌کردن یادآوری رخدادها <b>توسط رایانامه</b> (توجه داشته بشید در خصوص هر رخداد گزینه‌ها/تاخیر قابل تعریف هستند). نکته:  برای ارسال با بسامد صحیح رایانامه‌های یادآوری واحد <strong>%s</strong> باید فعال بوده و به‌‌درستی پیکربندی شده باشد.
-AGENDA_REMINDER_BROWSER=فعال‌کردن یادآوری رخداد <b>روی مرورگر کاربر</b> (در هنگامی که رخداد سررسید، هر کاربر می‌تواند این کار را از طریق سوال تائید مرورگر نفی کند)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=فعال‌کردن آگاهی‌رسانی صوتی
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=نمایش شیء پیوند شده به نمای جلسه
 ##### Clicktodial #####
 ClickToDialSetup=برپاسازی واحد کلیک برای شماره‌گیری
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:نوع پرداخت مشتری، 1:نوع پرداخت فرو
 IncludePath=دربرگرفتن مسر (تعریف شده در متغیر %s)
 ExpenseReportsSetup=برپاسازی واحد گزارش‌هزینه‌ها
 TemplatePDFExpenseReports=قالب مستند برای تولید سند گزارش هزینه‌ها
-ExpenseReportsIkSetup=برپاسازی واحد گزارش هزینه‌ها - شاخص Milles
 ExpenseReportsRulesSetup=برپاسازی واحد گزارش هزینه‌ها - قواعد
 ExpenseReportNumberingModules=واحد شماره‌گذاری گزارش هزینه‌ها
 NoModueToManageStockIncrease=هیچ واحدی که قادر به افزایش خودکار موجودی انبار باشد فعال نشده است. افزایش موجودی انبار تنها به صورت دستی انجام خواهد شد.
@@ -1864,7 +1907,7 @@ MailToSendReception=دریافت‌های کالا
 MailToThirdparty=طرف‌های سوم
 MailToMember=اعضا
 MailToUser=کاربران
-MailToProject=صفحۀ طرح‌ها
+MailToProject=طرح‌ها
 MailToTicket=برگه‌های پشتیبانی
 ByDefaultInList=نمایش پیش‌فرض نمای فهرستی
 YouUseLastStableVersion=استفاده از آخرین نسخۀ پایدار
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=بارگذاری جستجوی شخص‌سوم روی %s (
 LoadThirdPartyFromNameOrCreate=بارگذاری جستجوی شخص سوم روی %s (ساختن در صورت عدم یافتن)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=کدپستی
 MainMenuCode=کد ورودی فهرست (فهرست اصلی)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=این قابلیت را برای پیونددادن
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=تائید نوسازی واحد
 OnMobileOnly=تنها روی صفحات کوچک (تلفن‌هوشمند)
-DisableProspectCustomerType=غیرفعال کردن نوع طرف سوم "مشتری احتمالی + مشتری" (بنابراین شخص‌سوم باید یک مشتری احتمالی یا یک مشتری باشد و نمی‌تواند هر دو با هم باشد)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=ساده‌کردن رابط‌کاربری برای افراد نابینا
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=این گزینه برای افراد نابینتا استفاده می‌شود یا این‌که از برنامه از یک مرورگر نوشتاری همانند Lynx یا Links استفاده می‌نمائید.
 MAIN_OPTIMIZEFORCOLORBLIND=تغییر رنگ‌های صفحه برای استفادۀ افرادی که عارضۀ کوررنگی دارند
@@ -1996,13 +2041,15 @@ UseDebugBar=استفاده از نوار اشکال‌یابی
 DEBUGBAR_LOGS_LINES_NUMBER=تعداد آخرین سطور گزارش‌کار برای حفظ در کنسول
 WarningValueHigherSlowsDramaticalyOutput=هشدار! مقادیر بزرگ خروجی را به‌شدت کند می‌کند
 ModuleActivated=واحد %s فعال شده و باعث کاهش سرعت رابط کاربری می‌شود
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=اشکال صادارات با همگان به اشتراک گذاشته شدند
 ExportSetup=برپاسازی واحد صادرات
 ImportSetup=Setup of module Import
 InstanceUniqueID=شناسۀ منحصر به‌فرد نمونه
 SmallerThan=کوچک‌تر از
 LargerThan=بزرگتر از
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=با یک حساب GMail در صورتی که تائید 2 گامی را انتخاب کرده باشید، پیشنهاد می‌شود یک گذرواژۀ دوم برای استفادۀ برنامه به‌جای گذرواژۀ خودتان برای حساب بسازید. این کار از https://myaccount.google.com/ قابل انجام است.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/fa_IR/banks.lang b/htdocs/langs/fa_IR/banks.lang
index fb945a8cf81..b2492377312 100644
--- a/htdocs/langs/fa_IR/banks.lang
+++ b/htdocs/langs/fa_IR/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=پرداخت متفرقه
 VariousPayments=پرداخت‌های متفرقه
 ShowVariousPayment=نمایش پرداخت متفرقه
 AddVariousPayment=افزودن پرداخت متفرقه
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=تعهدنامۀ SEPA
 YourSEPAMandate=تعهدنامۀ SEPAی شما
 FindYourSEPAMandate=این تعهدنامۀ SEPAی شماست تا شرکت ما را مجاز کند سفارش پرداخت مستقیم از بانک داشته باشد. آن را امضا شده بازگردانید (نسخۀ اسکن‌شدۀ برگۀ امضا شده) یا آن را توسط رایانامه ارسال کنید:
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/fa_IR/categories.lang b/htdocs/langs/fa_IR/categories.lang
index 3c6512de70b..adc3e73cfdb 100644
--- a/htdocs/langs/fa_IR/categories.lang
+++ b/htdocs/langs/fa_IR/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=برپاسازی کلیدواژه/دسته‌بندی‌
 CategorieRecursiv=پیوند خودکار با کلیدواژه/دسته‌بندی والد
 CategorieRecursivHelp=اگر این گزینه روشن باشد، در هنگام افزودن یک محصول به یک زیردسته، محصول مورد نظر به دسته‌بندی وارد نیز اضافه خواهد شد
 AddProductServiceIntoCategory=افزودن پیگیری محصول/سرویس
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=نمایش کلیدواژه/دسته‌بندی
 ByDefaultInList=به طور پیش‌فرض در فهرست
 ChooseCategory=انتخاب دسته‌بندی
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/fa_IR/companies.lang b/htdocs/langs/fa_IR/companies.lang
index 6ec56674436..9a4bc483b57 100644
--- a/htdocs/langs/fa_IR/companies.lang
+++ b/htdocs/langs/fa_IR/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=شناسۀ کاری 1 (USt.-IdNr)
 ProfId2AT=شناسۀ کاری 2 (USt.-Nr)
 ProfId3AT=شناسۀ کاری 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=شناسۀ کاری 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=شناسۀ کاری 1 (شمارۀ حرفه‌ای)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=شناسۀ حرفه‌ای 1 (Federal number)
 ProfId4CH=شناسۀ حرفه‌ای 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=شناسۀ حرفه‌ای 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE= شناسۀ کاری 1 (USt.-IdNr)
 ProfId2DE=شناسۀ کاری 2 (USt.-Nr)
 ProfId3DE=شناسۀ کاری 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=شناسۀ کاری 1 (CIF/NIF)
 ProfId2ES=شناسۀ کاری 2 (شمارۀ امنیت اجتماعی)
 ProfId3ES=شناسۀ کاری 3 (CNAE)
 ProfId4ES=شناسۀ کاری 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=شناسۀ کاری 1 (SIREN)
 ProfId2FR=شناسۀ کاری 2 (SIRET)
 ProfId3FR=شناسۀ کاری 3 (NAF, old APE)
 ProfId4FR=شناسۀ کاری 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=شمارۀ ثبت
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=شناسۀ کاری 3 (SRVC TAX)
 ProfId4IN=شناسۀ کاری 4
 ProfId5IN=شناسۀ کاری 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=شناسۀ کاری 1 (R.C.S. Luxembourg)
 ProfId2LU=شناسۀ کاری 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=شناسۀ کاری 1 (R.C.)
 ProfId2MA=شناسۀ کاری 2 (Patente)
 ProfId3MA=شناسۀ کاری 3 (I.F.)
 ProfId4MA=شناسۀ کاری 4 (C.N.S.S.)
-ProfId5MA=شناسۀ کاری 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=شناسۀ کاری 1 (R.F.C).
 ProfId2MX=شناسۀ کاری 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=nummer KVK
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=شناسۀ کاری 1 (NIPC)
 ProfId2PT=شناسۀ کاری 2 (شمارۀ تامین اجتماعی)
 ProfId3PT=شناسۀ کاری 3 (Commercial Record number)
 ProfId4PT=شناسۀ کاری 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=شناسۀ کاری 1 (OGRN)
 ProfId2RU=شناسۀ کاری 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=همچنین می‌توانید به‌طور دستی رو
 ErrorVATCheckMS_UNAVAILABLE=بررسی مقدور نبود. خدمات بررسی برای کشور عضو (%s) ارائه نمی‌شود.
 NorProspectNorCustomer=مشتری‌احتمالی نیست/مشتری نیست
 JuridicalStatus=نوع موجودیت قانونی
+Workforce=Workforce
 Staff=کارمندان
 ProspectLevelShort=توان‌بالقوه-پتانسیل
 ProspectLevel=مشتری‌احتمالی بالقوه
@@ -456,3 +462,8 @@ PaymentTermsSupplier=شرایط پرداخت - فروشنده
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=استفادۀ چند‌واحدپولی
 MulticurrencyCurrency=واحد‌پولی
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/fa_IR/ecm.lang b/htdocs/langs/fa_IR/ecm.lang
index d4994b3b7e7..b1e4bd200ec 100644
--- a/htdocs/langs/fa_IR/ecm.lang
+++ b/htdocs/langs/fa_IR/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=جستجو با کلمات‌کلیدی
 ECMSearchByEntity=جستجوی اشیاء
 ECMSectionOfDocuments=پوشه‌های سند
 ECMTypeAuto=خودکار
-ECMDocsBySocialContributions=اسناد مربوط به مالیات‌های ساختاری/اجتماعی
-ECMDocsByThirdParties=اسناد مربوط به شخص‌سوم‌ها
-ECMDocsByProposals=اسناد مربوط به پیشنهادها
-ECMDocsByOrders=اسناد مربوط به سفار مشتریان
-ECMDocsByContracts=اسناد مربوط به قراردادها
-ECMDocsByInvoices=اسناد مربوط به صورت‌حساب مشتریان
-ECMDocsByProducts=اسناد مربوط به محصولات
-ECMDocsByProjects=اسناد مربوط به طرح‌ه
-ECMDocsByUsers=اسناد مربوط به کاربران
-ECMDocsByInterventions=اسناد مربوط به پادرمیانی‌ها
-ECMDocsByExpenseReports=اسناد مربوط به گزارش‌های هزینه
-ECMDocsByHolidays=اسناد مربوط به روزهای تعطیل
-ECMDocsBySupplierProposals=اسناد مربوط به پیشنهادهای فروشندگان
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=پوشه‌ای ساخته نشد
 ShowECMSection=نمایش پوشه
 DeleteSection=حذف پوشه
@@ -50,3 +38,6 @@ ReSyncListOfDir=بازهمگامی فهرست پوشه‌ها
 HashOfFileContent=هاشور محتوای فایل
 NoDirectoriesFound=پوشه‌ای پیدا نشد
 FileNotYetIndexedInDatabase=فایل‌ها در پایگاه داده فهرست‌ نشده‌اند (تلاش کنید دوباره بالاگذاری کنید)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/fa_IR/hrm.lang b/htdocs/langs/fa_IR/hrm.lang
index 382a1c9bb9d..590bc8b6434 100644
--- a/htdocs/langs/fa_IR/hrm.lang
+++ b/htdocs/langs/fa_IR/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=کارمندان
 Employee=کارمند
 NewEmployee=کارمند جدید
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/fa_IR/install.lang b/htdocs/langs/fa_IR/install.lang
index a172cad730d..88f93c2c2b8 100644
--- a/htdocs/langs/fa_IR/install.lang
+++ b/htdocs/langs/fa_IR/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=فایل پیکربندی <b>%s</b> قابل نوشتن ن
 ConfFileIsWritable=فایل پیکربندی <b>%s</b> قابل نوشتن است
 ConfFileMustBeAFileNotADir=فایل پیکربندی <b>%s</b>باید یک فایل باشد، نه یک پوشه. 
 ConfFileReload=بارگذاری مجدد مقادیر از فایل پیکربندی.
-PHPSupportSessions=این PHP از قابلیت نشست‌ پشتیبانی می‌کند.
 PHPSupportPOSTGETOk=این PHP از قابلیت GET و POST متغیرها پشتیبانی می‌کند.
 PHPSupportPOSTGETKo=ممکن است برپاسازی PHP شما از قابلیت POST و یا GET متغیرها پشتیبانی نمی‌کند. در php.ini مقدار <b>variables_order</b> را بررسی کنید. 
-PHPSupportGD=این PHP از کارکردهای گرافیکی GD پشتیبانی می‌کند.
-PHPSupportCurl=این PHP از Curl پشتیبان می‌کند.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=این PHP از توابع UTF8 پشتیبانی می‌کند.
-PHPSupportIntl=این PHP از توابع Intl پشتیبانی می‌کند
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=این PHP از قابلیت نشست‌ پشتیبانی می‌کند.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=حداکثر حافظۀ اختصاص داده شده به نشست به <b>%s</b> تنظیم شده است. این باید کافی باشد.
 PHPMemoryTooLow=حداکثر حافظۀ مورد استفاده در یک نشست در PHP شما در حد <b>%s</b> بایت تنظیم شده است. این میزان بسیار کمی است. فایل <b>php.ini</b> را ویرایش نموده و مقدار <b>memory_limit</b> را حداقل برابر <b>%s</b> بایت تنظیم کنید
diff --git a/htdocs/langs/fa_IR/intracommreport.lang b/htdocs/langs/fa_IR/intracommreport.lang
new file mode 100644
index 00000000000..ff63ea2b38e
--- /dev/null
+++ b/htdocs/langs/fa_IR/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=فهرست
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/fa_IR/languages.lang b/htdocs/langs/fa_IR/languages.lang
index e3a6fbcac16..a94c8c643c1 100644
--- a/htdocs/langs/fa_IR/languages.lang
+++ b/htdocs/langs/fa_IR/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=اسپانیائی (پاناما)
 Language_es_PY=اسپانیایی پروگوئه
 Language_es_PE=اسپانیایی پرو
 Language_es_PR=اسپانیایی (پورتوریکو)
+Language_es_US=Spanish (USA)
 Language_es_UY=اسپانیائی (اروگوئه)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=اسپانیائی (ونزوئلا)
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index 7392e0e2498..c53d9860524 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -155,6 +155,7 @@ RemoveLink=حذف پیون
 AddToDraft=افزودن به پیش‌نویس
 Update=به‌روز‌رسانی
 Close=بستن
+CloseAs=Set status to
 CloseBox=حذف این وسیله از صفحۀ پیشخوان شما
 Confirm=تائید
 ConfirmSendCardByMail=آیا واقعا می‌خواهید محتوای این کارت را توسط رایانامه به <b>%s</b> بفرستید؟
@@ -196,6 +197,7 @@ ReOpen=دوباره باز کردن
 Upload=بالاگذاری
 ToLink=پیوند
 Select=انتخاب
+SelectAll=Select all
 Choose=انتخاب‌کردن
 Resize=تغییر اندازه
 ResizeOrCrop=تغییراندازه یا برش
@@ -256,6 +258,7 @@ Cards=کارت
 Card=کارت
 Now=اکنون
 HourStart=تاریخ شروع
+Deadline=Deadline
 Date=تاریخ
 DateAndHour=تاریخ و ساعت
 DateToday=تاریخ امروز
@@ -264,8 +267,10 @@ DateStart=تاریخ شروع
 DateEnd=تاریخ پایان
 DateCreation=تاریخ ایجاد
 DateCreationShort=تاریخ ساخت
+IPCreation=Creation IP
 DateModification=تاریخ اصلاح
 DateModificationShort=تاریخ اصلاح
+IPModification=Modification IP
 DateLastModification=آخرین تاریخ اصلاح
 DateValidation=تاریخ اعتباردهی
 DateClosing=تاریخ بسته شدن
@@ -319,6 +324,7 @@ Morning=صبح
 Afternoon=بعدازظهر
 Quadri=چهارتایی
 MonthOfDay=ماه از روز
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=نرخ
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=مبلغ پرداخت، واحدپولی اصلی
 MulticurrencyAmountHT=مبلغ (بدون مالیات)، واحدپولی اصلی
 MulticurrencyAmountTTC=مبلغ (بامالیات)، واحد پولی اصلی
 MulticurrencyAmountVAT=مالیات مبلغ، واحدپولی اصلی
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=مالیات مبلغ 2
 AmountLT2=مالیات مبلغ 3
 AmountLT1ES=مبلغ RE
@@ -487,6 +494,7 @@ By=توسط
 From=از
 FromDate=از
 FromLocation=از
+at=at
 to=به
 To=به
 and=و
@@ -509,6 +517,7 @@ Draft=پیش‌نویس
 Drafts=پیش‌نویس‌ها
 StatusInterInvoiced=صورت‌حساب‌شده
 Validated=تائیدشده
+ValidatedToProduce=Validated (To produce)
 Opened=باز
 OpenAll=باز (همه)
 ClosedAll=بسته (همه)
@@ -655,6 +664,7 @@ Response=واکنش
 Priority=اولویت
 SendByMail=ارسال توسط رایانامه
 MailSentBy=رایانامه‌های ارسالیِ
+NotSent=ارسال نشده
 TextUsedInTheMessageBody=متن رایانامه
 SendAcknowledgementByMail=ارسال رایانامۀ تائید
 SendMail=ارسال رایانامه
@@ -836,6 +846,7 @@ ListOfTemplates=فهرست قالب‌ها
 Gender=جنسیت
 Genderman=مرد
 Genderwoman=زن
+Genderother=سایر
 ViewList=نمای فهرستی
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=متفرقه
 Calendar=تقویم
 GroupBy=گروه‌بندی توسط...
 ViewFlatList=نمایش فهرست خطی
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=حذف عبارت '%s'
 SomeTranslationAreUncomplete=برخی از زبان‌های قابل انتخاب ممکن است تنها به شکل ناقص ترجمه شده باشد یا دارای خطا باشند. لطفا برای تکمیل و تصحیح زبان مورد نظر خود در <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> ثبت نام نمائید و اصلاحات مورد نظر خود را انجام دهید.
 DirectDownloadLink=پیوند دریافت مستقیم (عمومی/خارجی)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=حمل‌ونقل مشتریان
 SearchIntoExpenseReports=گزارش‌هزینه‌ها
 SearchIntoLeaves=ترک
 SearchIntoTickets=برگه‌های پشتیبانی
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=پرداخت‌های فروشندگان
+SearchIntoMiscPayments=پرداخت‌های متفرقه
 CommentLink=نظرات
 NbComments=تعداد نظرات
 CommentPage=محل نظرات
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=اطلاعات
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=تاریخ تولد
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/fa_IR/members.lang b/htdocs/langs/fa_IR/members.lang
index b729941a1c7..d3f532cc95e 100644
--- a/htdocs/langs/fa_IR/members.lang
+++ b/htdocs/langs/fa_IR/members.lang
@@ -19,14 +19,12 @@ MembersCards=کاربران کارت های کسب و کار
 MembersList=فهرست کاربران
 MembersListToValid=لیست اعضای پیش نویس (به اعتبار شود)
 MembersListValid=لیست اعضای معتبر
-MembersListUpToDate=فهرست کاربران معتبر با به اشتراک عضویت
-MembersListNotUpToDate=فهرست کاربران معتبر با اشتراک از تاریخ
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=لیست اعضای واجد شرایط
 MenuMembersToValidate=عضو پیش نویس
 MenuMembersValidated=اعضای اعتبار
-MenuMembersUpToDate=تا اعضای تاریخ
-MenuMembersNotUpToDate=از اعضای تاریخ
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=کاربران با اشتراک برای دریافت
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=تاریخ ثبت نام
 DateEndSubscription=تاریخ پایان ثبت نام
 EndSubscription=اشتراک پایان
 SubscriptionId=شناسه اشتراک
+WithoutSubscription=Without subscription
 MemberId=نام کاربری
 NewMember=عضو جدید
 MemberType=نوع کاربران
@@ -81,7 +80,7 @@ DeleteType=حذف کردن
 VoteAllowed=رای اجازه
 Physical=فیزیکی
 Moral=اخلاقی
-MorPhy=طبیعت
+MorAndPhy=Moral and Physical
 Reenable=را دوباره فعال کنید
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=آمار کاربران توسط ایالت / استا
 MembersStatisticsByTown=آمار کاربران توسط شهر
 MembersStatisticsByRegion=آمار کاربران بر اساس منطقه
 NbOfMembers=تعداد اعضا
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=هیچ اعتبار یافت
 MembersByCountryDesc=این صفحه آمار در اعضا را با کشورهای به شما نشان دهد. گرافیک در گوگل خدمات گراف آنلاین بستگی دارد با این حال و در دسترس است تنها در صورت اتصال به اینترنت در حال کار است.
 MembersByStateDesc=این صفحه آمار در عضو های دولتی / استان / کانتون شما نشان می دهد.
@@ -176,6 +177,7 @@ MenuMembersStats=ارقام
 LastMemberDate=Latest member date
 LatestSubscriptionDate=آخرین تاریخ عضویت
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=اطلاعات عمومی
 NewMemberbyWeb=عضو جدید اضافه شده است. در انتظار تایید
 NewMemberForm=فرم عضو جدید
diff --git a/htdocs/langs/fa_IR/mrp.lang b/htdocs/langs/fa_IR/mrp.lang
index 74aa70bfac9..5edbad940c2 100644
--- a/htdocs/langs/fa_IR/mrp.lang
+++ b/htdocs/langs/fa_IR/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=بخش برنامه‌ریزی مواد اولیه
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index 64c5b787fb4..2a07d19a11f 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=چند قسمت قیمتی در هر محصول/خدمات (هر مشتری در یک قسمت قیمتی است)
 MultiPricesNumPrices=تعداد قیمت‌ها
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=فعال‌کردن محصولات مجازی (بسته‌ها)
-AssociatedProducts=محصولات مجازی
-AssociatedProductsNumber=تعداد محصولاتی که این محصول مجازی را درست می‌کنند
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=تعداد محصولات بسته‌بندی مادر
 ParentProducts=محصولات مادر
-IfZeroItIsNotAVirtualProduct=در صورتی که برابر با 0 باشد، این محصول یک محصول مجازی نیست
-IfZeroItIsNotUsedByVirtualProduct=در صورتی که برابر با 0 باشد، این محصول توسط هیچ محصول مجازی مورد استفاده قرار نگرفته است
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=صافی کلیدواژه
 CategoryFilter=صافی دسته‌بندی
 ProductToAddSearch=جستجوی محصول برای اضافه‌کردن
 NoMatchFound=هیچ نتیجه‌ای نداشت
 ListOfProductsServices=فهرست محصولات/خدمات
-ProductAssociationList=فهرست محصولات/خدماتی که بخش‌های تشکیل دهندۀ این محصول‌مجازی(بسته) هستند
-ProductParentList=فهرست محصولات/خدمات مجازی که از این محصول به‌عنوان یک جزء تشکیل شده‌اند
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=یکی از محصولات انتخاب شده مادر همین محصول است
 DeleteProduct=حذف یک محصول/خدما
 ConfirmDeleteProduct=آیا مطمئن‌هستید می‌خواهید این محصول/خدمات را حذف کنید؟
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=مقادیر فعال سراسری:
 PriceMode=حالت قیمت
 PriceNumeric=عدد
 DefaultPrice=قیمت‌پیش‌فرض
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=کم/زیاد کردن موجودی در هنگام تغییر مادر
 ComposedProduct=محصولات فرزند
 MinSupplierPrice=حداقل قیمت خرید
@@ -339,6 +340,7 @@ UseProductFournDesc=ایجاد یک قابلیت برای تعریف توضیح
 ProductSupplierDescription=توضیحات فروشنده برای محصول
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/fa_IR/recruitment.lang b/htdocs/langs/fa_IR/recruitment.lang
index f8aab043f93..082b58f6499 100644
--- a/htdocs/langs/fa_IR/recruitment.lang
+++ b/htdocs/langs/fa_IR/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=مرتبۀ شغلی
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/fa_IR/stocks.lang b/htdocs/langs/fa_IR/stocks.lang
index 9542e4071fb..2ebf520b14e 100644
--- a/htdocs/langs/fa_IR/stocks.lang
+++ b/htdocs/langs/fa_IR/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=شناسۀ جابجائی %d
 ListMouvementStockProject=فهرست جابجائی‌های مربوط به یک طرح
 StocksArea=ناحیۀ انبارها
 AllWarehouses=همۀ انبارها
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=دربرگرفتن سفارش‌های پیش‌نویس
 Location=محل
 LocationSummary=نام‌کوتاه محل
@@ -122,8 +122,9 @@ DesiredStockDesc=این میزان موجودی به‌عنوان معیار د
 StockToBuy=برای سفارش
 Replenishment=دوباره پر کردن موجودی
 ReplenishmentOrders=سفارشات دوباره‌پرکردن موجودی
-VirtualDiffersFromPhysical=با توجه به گزینه‌های افزایش/کاهش موجودی، موجودی فیزیکی و موجودی مجازی (سفارشات فیزیکی/فعلی) ممکن است متفاوت باشد
-UseVirtualStockByDefault=به‌شکل‌پیش‌فرض در خصوص قابلیت دوباره‌پرسازی به‌جای موجودی فیزیکی از موجودی مجازی استفاده شود
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=استفاده از موجودی مجازی
 UsePhysicalStock=استفاده از موجودی فیزیکی
 CurentSelectionMode=وضعیت منتخب کنونی
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=این محصول قبلا در فهرست
 SelectCategory=صافی دسته‌بندی
 SelectFournisseur=صافی فروشنده
 inventoryOnDate=فهرست‌موجودی
-INVENTORY_DISABLE_VIRTUAL=محصول مجازی (بسته-کیت): عدم کاهش موجودی محصولات مولود
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=استفاده مبلغ خرید در صورتی‌کی هیچ مبلغی برای خرید آخر پیدا نشود
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=اجازۀ تغییر مقدار PMP محصول
 ColumnNewPMP=واحد جدید PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/fa_IR/suppliers.lang b/htdocs/langs/fa_IR/suppliers.lang
index 56671fe59be..6bd62edc318 100644
--- a/htdocs/langs/fa_IR/suppliers.lang
+++ b/htdocs/langs/fa_IR/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=سفارش‌های خرید به صورت‌حساب
 NbDaysToDelivery=تاخیر تحویل (روز)
 DescNbDaysToDelivery=حداکثر تاخیر ممکن برای تحویل این محصولات
 SupplierReputation=اعتبار فروشنده
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=عدم انجام سفارش
 NotTheGoodQualitySupplier=کم کیفیت
 ReputationForThisProduct=اعتبار
diff --git a/htdocs/langs/fa_IR/website.lang b/htdocs/langs/fa_IR/website.lang
index 1a1d063ed4e..3c1ada31ac4 100644
--- a/htdocs/langs/fa_IR/website.lang
+++ b/htdocs/langs/fa_IR/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=صفحه
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=خوراک RSS
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang
index a702faa322c..2e529b15833 100644
--- a/htdocs/langs/fi_FI/accountancy.lang
+++ b/htdocs/langs/fi_FI/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Oletusarvo palvelulle
 DefaultForProduct=Oletusarvo tuotteelle
 CantSuggest=Ei ehdotuksia
 AccountancySetupDoneFromAccountancyMenu=Kirjanpidon asetukset tehdään pääasiassa valikosta %s
-ConfigAccountingExpert=Moduulin kirjanpitoasiantuntijan määrittäminen
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=Päiväkirjat
+Journals=Päiväkirjat
 JournalFinancial=Rahoituspäiväkirjat
 BackToChartofaccounts=Palauta tilikartta
 Chartofaccounts=Tilikartta
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Laskun etiketti
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Poista kirjanpitotili ryhmästä
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Yksityiskohtaiset tiedot tileittäin
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=EU-alueen maat
 CountriesNotInEEC=EU: n ulkopuoliset maat
 CountriesInEECExceptMe=EU-alueen maat, poislukien %s
 CountriesExceptMe=Kaikki maat, poislukien %s
-AccountantFiles=Kirjanpitodokumenttien vienti
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Valitse aktiivinen tilikartta
 ChangeAndLoad=Change and load
 Addanaccount=Lisää kirjanpitotili
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Ehdotettu kirjanpitotili
 MenuDefaultAccounts=Oletustilit
 MenuBankAccounts=Pankkitilit
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Kuluraportin kiinnittäminen
 CreateMvts=Luo uusi transaktio
 UpdateMvts=Transaktion muuttaminen
 ValidTransaction=Hyväksy transaktio
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Pääkirjanpito
+BookkeepingSubAccount=Subledger
 AccountBalance=Tilin saldo
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Myyntipäiväkirja
 ACCOUNTING_PURCHASE_JOURNAL=Ostopäiväkirja
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=Vuoden mukaan
 NotMatch=Not Set
-DeleteMvt=Poista pääkirjan rivit
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Poistettava vuosi
 DelJournal=Poistettava päiväkirja
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=ALV tiliä ei ole määritelty
 ThirdpartyAccountNotDefined=Sidosryhmän tiliä ei ole määritetty
 ProductAccountNotDefined=Tuotteen tiliä ei ole määritetty
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index 221c3dd5919..59cee45e755 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Poista yhteyksien esto
 YourSession=Istuntosi
 Sessions=Käyttäjien istunnot
 WebUserGroup=Web-palvelimen käyttäjä / ryhmä
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=PHP:n asetukset estävät aktiivisten istuntojen listaamisen. Istuntojen tallennushakemisto (<b>%s</b>) voi olla suojattu (Käyttöjärjestelmäoikeudet tai PHP: n open_basedir).
 DBStoringCharset=Tietokannan merkistö tietojen tallennukseen
 DBSortingCharset=Tietokannan merkistö tietojen lajitteluun
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Haun aloittamiseksi tarvittavien merkkien määrä: %s
 NumberOfBytes=Tavujen lukumäärä
 SearchString=Haettava merkkijono
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript ei käytössä
 UsePreviewTabs=Käytä esikatselu - välilehtiä
 ShowPreview=Näytä esikatselu
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Esikatselu ei ole käytettävissä
 ThemeCurrentlyActive=Aktiivinen teema
 CurrentTimeZone=Aikavyöhyke PHP (palvelin)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Sähköpostit
 EMailsSetup=Sähköpostien asetukset
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=TLS (SSL) - salaus
 MAIN_MAIL_EMAIL_STARTTLS=TLS (STARTTLS) - salaus
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Käytä DKIM:iä sähköpostin allekirjoituksen luontiin
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=DKIM:in kanssa käytetty sähköpostidomain
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Käytettävä kirjasto PDF:n luomiseen
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Klikkaa näyttääksesi kuvaus
 DependsOn=Tämä moduuli tarvitsee moduulit
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial yhdentyminen
-Module59Name=Bookmark4u
-Module59Desc=Lisää toiminto tuottaa Bookmark4u tilin käyttämisestä Dolibarr huomioon
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Interventions
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=Tulosta IPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Vaalit, Kysely vai Äänestys
@@ -671,7 +677,7 @@ Module63000Name=Resurssit
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Lue laskut
 Permission12=Luo laskut
-Permission13=Vahvistamattomat laskut
+Permission13=Invalidate customer invoices
 Permission14=Vahvistetut laskut
 Permission15=Lähetä laskut sähköpostilla
 Permission16=Luo maksut laskuille
@@ -688,6 +694,7 @@ Permission32=Luoda / muuttaa tuotetta / palvelua
 Permission34=Poista tuotteita / palveluita
 Permission36=Vienti tuotteet / palvelut
 Permission38=Vie tuotteita
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Lue interventioiden
 Permission62=Luoda / muuttaa interventioiden
 Permission64=Poista interventioiden
 Permission67=Vienti interventioiden
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Lue jäseniä
 Permission72=Luoda / muuttaa jäsenten
 Permission74=Poista jäseniä
@@ -718,6 +728,7 @@ Permission95=Lue raportit
 Permission101=Lue sendings
 Permission102=Luoda / muuttaa sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Poista sendings
 Permission111=Lue tilinpäätös
@@ -825,10 +836,11 @@ Permission402=Luoda / muuttaa alennukset
 Permission403=Validate alennukset
 Permission404=Poista alennukset
 Permission430=Use Debug Bar
-Permission511=Lue palkanmaksut
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Luo/Muokkaa palkanmaksuja
 Permission514=Poista palkanmaksuja
-Permission517=Vie palkat
+Permission517=Read payments of salaries of everybody
+Permission519=Vie palkat
 Permission520=Lue Lainat
 Permission522=Luo/muokkaa Lainat
 Permission524=Poista Lainat
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Lue materiaaliluettelo
 Permission651=Luo/päivitä materiaaliluettelo
 Permission652=Poista materiaaliluettelo
@@ -884,7 +899,9 @@ Permission1185=Hyväksy ostotilaukset
 Permission1186=Lähetä ostotilaukset
 Permission1187=Tilausvahvistus
 Permission1188=Poista ostotilaus
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Hyväksy (toinen vaihe) ostotilaukset
+Permission1191=Export supplier orders and their attributes
 Permission1201=Hanki seurauksena vienti
 Permission1202=Luo / Muuta vienti
 Permission1231=Lue toimittajien laskut
@@ -898,6 +915,8 @@ Permission1251=Suorita massa tuonnin ulkoisten tiedot tietokantaan (tiedot kuorm
 Permission1321=Vienti asiakkaan laskut, ominaisuudet ja maksut
 Permission1322=Avaa uudelleen maksettu lasku
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Selaa ajastetut työt
 Permission23002=Luo/päivitä Ajastettu työ
 Permission23003=Poista Ajastettu työ
 Permission23004=Suorita Ajastettu työ
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Lue liiketoimet
 Permission50202=Tuo liiketoimet
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Vapaan tyyppi
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Asetukset tallennettu
 SetupNotSaved=Asetuksia ei tallennettu
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label käyttää oletusarvoisesti, jos ei ole käännös löy
 LabelOnDocuments=Label asiakirjoihin
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=Päivien lukumäärä
 AtEndOfMonth=Kuukauden lopussa
 CurrentNext=Nykyinen / Seuraava
@@ -1145,6 +1182,7 @@ InfoWebServer=Tietoja Netti Serveristä
 InfoDatabase=Tietoja Tietokannasta
 InfoPHP=Tietoja PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Selaimen nimi
 BrowserOS=Selaimen OS
 ListOfSecurityEvents=Luettelo Dolibarr turvallisuus tapahtumat
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL vienti
-ForcedToByAModule= Tämä sääntö on <b>pakko %s</b> on aktivoitu moduuli
+ForcedToByAModule=Tämä sääntö on <b>pakko %s</b> on aktivoitu moduuli
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Olemassa olevat varmuuskopiot
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=Ensimmäinen viikonpäivä
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP:n laajennus %sladattu
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Alalla painos %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1282,7 +1322,7 @@ GetBarCode=Hanki viivakoodi
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Palauta salasana luodaan mukaan sisäinen Dolibarr algoritmi: 8 merkkiä sisältävät jaettua numerot ja merkit pieniä.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox lähettää vahvistusviestin jäsenille on oletusarvoisesti
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP-asetukset
 LDAPGlobalParameters=Parametrit
@@ -1523,7 +1564,9 @@ LDAPDescValues=Esimerkki arvot on suunniteltu <b>OpenLDAP</b> kanssa seuraavat l
 ForANonAnonymousAccess=Jotta autentikoitu acces (for a kirjoitusoikeuksia esimerkiksi)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Taso
 SyslogFilename=Tiedoston nimi ja polku
 YouCanUseDOL_DATA_ROOT=Voit käyttää DOL_DATA_ROOT / dolibarr.log varten lokitiedoston Dolibarr "asiakirjoihin" hakemistoon. Voit valita eri reitin tallentaa tiedoston.
 ErrorUnknownSyslogConstant=Constant %s ei ole tunnettu syslog vakio
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Lahjoitus-moduulin asetukset
@@ -1629,7 +1672,7 @@ AdvancedEditor=Kehittynyt editori
 ActivateFCKeditor=Ota FCKeditor varten:
 FCKeditorForCompany=WYSIWIG luominen / painos yritysten kuvaus ja huomaa
 FCKeditorForProduct=WYSIWIG luominen / painos tuotteiden / palvelujen kuvaus ja huomaa
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG luominen / painos postitusten
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup='Varasto' - moduulin asetukset
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Valikko poistettu
+Menu=Menu
 Menus=Valikot
 TreeMenuPersonalized=Henkikökohtaiset valikot
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Uusi valikko
-Menu=Valinta-valikossa
 MenuHandler=Valikko huolitsijan
 MenuModule=Lähde moduuli
 HideUnauthorizedMenu= Piilota luvaton valikot (harmaa)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Ota käyttöön ilmoitusäänet
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup='Click To Dial'-moduulin asetukset
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Kuluraportit moduulin asetukset
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Sidosryhmät
 MailToMember=Jäsenet
 MailToUser=Käyttäjät
-MailToProject=Projects page
+MailToProject=Projektit
 MailToTicket=Tiketit
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Postinumero
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Vaihda käyttöliittymän väriä värisokeille sopivaksi
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Konsolissa pidettävien lokirivien määrä
 WarningValueHigherSlowsDramaticalyOutput=Varoitus, suuremmat arvot hidastavat merkittävästi ohjelmaa
 ModuleActivated=Moduuli %son aktiivinen ja hidastaa ohjelmaa
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Vienti-moduulin asetukset
 ImportSetup=Setup of module Import
 InstanceUniqueID=Instanssin ID
 SmallerThan=Pienempi kuin
 LargerThan=Suurempi kuin
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/fi_FI/banks.lang b/htdocs/langs/fi_FI/banks.lang
index ce815e33aef..ef24faa1c72 100644
--- a/htdocs/langs/fi_FI/banks.lang
+++ b/htdocs/langs/fi_FI/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Muut maksut
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=SEPA-toimeksiantonne
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/fi_FI/categories.lang b/htdocs/langs/fi_FI/categories.lang
index bdb8af99b57..371a1c6cbb7 100644
--- a/htdocs/langs/fi_FI/categories.lang
+++ b/htdocs/langs/fi_FI/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/fi_FI/companies.lang b/htdocs/langs/fi_FI/companies.lang
index 7efa6cc83b4..a542eed8fcc 100644
--- a/htdocs/langs/fi_FI/companies.lang
+++ b/htdocs/langs/fi_FI/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (professionnel numero)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (liittovaltion numero)
 ProfId4CH=Prof Id 2 (Commercial Record numero)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Professori Id 1 (RUT)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Y-tunnus 1 (USt.-IdNr)
 ProfId2DE=ALV-numero 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=ALV-numero 1 (CIF / NIF  Espanja)
 ProfId2ES=Prof Id 2 (Henkilötunnus)
 ProfId3ES=Prof tunnus 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate numero)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (Siret)
 ProfId3FR=Prof Id 3 (NAF, vanha APE)
 ProfId4FR=Prof Id 4 (RCS / RM)
-ProfId5FR=Prof Id 5
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Prof Id 1 (Registration Number)
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (RC)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (IF)
 ProfId4MA=Id prof. 4 (CNSS)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Professori Id 1 (RFC).
 ProfId2MX=Professori Id 2 (R. P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KvK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Sosiaaliturva numero)
 ProfId3PT=Prof Id 3 (Commercial Record numero)
 ProfId4PT=Prof Id 4 (konservatorio)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Professori Id 1 (OGRN)
 ProfId2RU=Professori Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=Voit tehdä tarkastuksen myös käsin E.U: n sivuilla <a hre
 ErrorVATCheckMS_UNAVAILABLE=Tarkistaminen ei mahdollista. Jäsenvaltio ei toimita tarkastuspalvelua ( %s).
 NorProspectNorCustomer=Ei mahdollinen asiakas eikä asiakas
 JuridicalStatus=Yritysmuoto
+Workforce=Workforce
 Staff=Työntekijät
 ProspectLevelShort=Potenttiaali
 ProspectLevel=Prospekti potentiaali
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Maksuehdot - Toimittaja
 PaymentTypeBoth=Maksutapa - Asiakas ja toimittaja
 MulticurrencyUsed=Usean valuutan käyttö
 MulticurrencyCurrency=Valuutta
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/fi_FI/ecm.lang b/htdocs/langs/fi_FI/ecm.lang
index a2b191e12b3..c086c8f47c7 100644
--- a/htdocs/langs/fi_FI/ecm.lang
+++ b/htdocs/langs/fi_FI/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Etsi avainsanoilla
 ECMSearchByEntity=Etsi objektilla
 ECMSectionOfDocuments=Asiakirjahakemistot
 ECMTypeAuto=Automaattinen
-ECMDocsBySocialContributions=Sosiaalisiin tai fiskaalisiin veroihin liitetyt asiakirjat
-ECMDocsByThirdParties=Sidosryhmiin liitetyt asiakirjat
-ECMDocsByProposals=Ehdotuksiin liittyvät asiakirjat
-ECMDocsByOrders=Asiakkaiden tilauksiin liittyvät asiakirjat
-ECMDocsByContracts=Sopimuksiin liittyvät asiakirjat
-ECMDocsByInvoices=Asiakkaiden laskuihin liittyvät asiakirjat
-ECMDocsByProducts=Tuotteisiin liittyvät asiakirjat
-ECMDocsByProjects=Projekteihin liittyvät asiakirjat
-ECMDocsByUsers=Käyttäjiin liittyvät asiakirjat
-ECMDocsByInterventions=Väliintuloon liittyvät asiakirjat
-ECMDocsByExpenseReports=Kuluraportteihin liittyvät asiakirjat
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=Hakemistoa ei luotu
 ShowECMSection=Näytä hakemisto
 DeleteSection=Poista hakemisto
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/fi_FI/hrm.lang b/htdocs/langs/fi_FI/hrm.lang
index 2046c190b42..0dd22e38f05 100644
--- a/htdocs/langs/fi_FI/hrm.lang
+++ b/htdocs/langs/fi_FI/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Työntekijät
 Employee=Työntekijä
 NewEmployee=Uusi työntekijä
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/fi_FI/install.lang b/htdocs/langs/fi_FI/install.lang
index 06b5fa648b1..bc79f570b30 100644
--- a/htdocs/langs/fi_FI/install.lang
+++ b/htdocs/langs/fi_FI/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration <b>file %s</b> on kirjoitettavissa.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=Tämä PHP tukee istuntoja.
 PHPSupportPOSTGETOk=Tämä PHP tukee muuttujat POST ja GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=Tämä PHP tukee istuntoja.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Sinun PHP max istuntojakson muisti on <b>asetettu %s.</b> Tämän pitäisi olla tarpeeksi.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/fi_FI/intracommreport.lang b/htdocs/langs/fi_FI/intracommreport.lang
new file mode 100644
index 00000000000..f025b6c734d
--- /dev/null
+++ b/htdocs/langs/fi_FI/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=Luettelo
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/fi_FI/languages.lang b/htdocs/langs/fi_FI/languages.lang
index 51d52f45896..e68bff8db24 100644
--- a/htdocs/langs/fi_FI/languages.lang
+++ b/htdocs/langs/fi_FI/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Espanja (Panama)
 Language_es_PY=Espanja (Paraguay)
 Language_es_PE=Espanja (Peru)
 Language_es_PR=Espanja (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Espanja (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Espanja (Venezuela)
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index 9000c0a2800..a9649731ddb 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Poista linkki
 AddToDraft=Add to draft
 Update=Päivittää
 Close=Sulje
+CloseAs=Aseta tilaksi
 CloseBox=Poista widgetti kojelaudaltasi
 Confirm=Vahvista
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Avaa uudelleen
 Upload=Upload
 ToLink=Linkki
 Select=Valitse
+SelectAll=Select all
 Choose=Valitse
 Resize=Muuta kokoa
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=Kortit
 Card=Kortti
 Now=Nyt
 HourStart=Aloitus tunti
+Deadline=Deadline
 Date=Päivä
 DateAndHour=Päivämäärä ja tunti
 DateToday=Päivämäärä tänään
@@ -264,8 +267,10 @@ DateStart=Aloituspäivämäärä
 DateEnd=Lopetuspäivä
 DateCreation=Luotu
 DateCreationShort=Luonti päivämäärä
+IPCreation=Creation IP
 DateModification=Muokattu
 DateModificationShort=Muokattu
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Vahvistettu
 DateClosing=Suljettu
@@ -319,6 +324,7 @@ Morning=Aamu
 Afternoon=Iltapäivä
 Quadri=Quadri
 MonthOfDay=Kuukaudenpäivä
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=min
 Rate=Kurssi
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Suorituksen summa, alkuperäinen valuutta
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Summa (verollinen), alkuperäisessä valuutassa
 MulticurrencyAmountVAT=Veron määrä, alkuperäinen valuutta
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Verot 2
 AmountLT2=Verot 3
 AmountLT1ES=Määrä RE
@@ -487,6 +494,7 @@ By=Mennessä
 From=Mistä
 FromDate=Laskuttaja
 FromLocation=Laskuttaja
+at=at
 to=on
 To=on
 and=ja
@@ -509,6 +517,7 @@ Draft=Vedos
 Drafts=Vedokset
 StatusInterInvoiced=Laskutettu
 Validated=Vahvistetut
+ValidatedToProduce=Validated (To produce)
 Opened=Avoinna
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Vastaus
 Priority=Prioriteetti
 SendByMail=Send by email
 MailSentBy=Sähköpostin lähetti
+NotSent=Ei lähetetty
 TextUsedInTheMessageBody=Sähköpostiviesti
 SendAcknowledgementByMail=Lähetä vahvistussähköposti
 SendMail=Lähetä sähköpostia
@@ -836,6 +846,7 @@ ListOfTemplates=Luettelo Pohjista
 Gender=Sukupuoli
 Genderman=Mies
 Genderwoman=Nainen
+Genderother=Muu
 ViewList=Näytä lista
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous
 Calendar=Kalenteri
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Suora latauslinkki (julkinen/ulkoinen)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Asiakas lähetykset
 SearchIntoExpenseReports=Kuluraportit
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tiketit
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Toimittajien maksut
+SearchIntoMiscPayments=Muut maksut
 CommentLink=Kommentit
 NbComments=Kommenttien määrä
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Information
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Päiväys syntyvyyden
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/fi_FI/members.lang b/htdocs/langs/fi_FI/members.lang
index 06fa737473e..ada2de4e243 100644
--- a/htdocs/langs/fi_FI/members.lang
+++ b/htdocs/langs/fi_FI/members.lang
@@ -19,14 +19,12 @@ MembersCards=Jäsenet tulostaa kortit
 MembersList=Luettelo jäsenistä
 MembersListToValid=Luettelo luonnoksen jäsenten (jotka on vahvistettu)
 MembersListValid=Luettelo voimassa jäseniä
-MembersListUpToDate=Luettelo voimassa jäsenille ajantasaista tilaamisesta
-MembersListNotUpToDate=Luettelo voimassa jäsenten tilaajamaksut vanhentunut
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=Luettelo pätevistä jäsenistä
 MenuMembersToValidate=Luonnos jäseniä
 MenuMembersValidated=Validoidut jäseniä
-MenuMembersUpToDate=Ajan jäsenten
-MenuMembersNotUpToDate=Vanhentunut jäseniä
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Jäsenet Merkintäoikeuksien vastaanottaa
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Tilaus päivämäärän
 DateEndSubscription=Tilaus lopetuspäivämäärää
 EndSubscription=Lopeta tilaus
 SubscriptionId=Tilaus id
+WithoutSubscription=Without subscription
 MemberId=Jäsen id
 NewMember=Uusi jäsen
 MemberType=Jäsen tyyppi
@@ -81,7 +80,7 @@ DeleteType=Poistaa
 VoteAllowed=Äänestys sallittua
 Physical=Fyysinen
 Moral=Moraalinen
-MorPhy=Luonto
+MorAndPhy=Moral and Physical
 Reenable=Ottaa ne uudelleen
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Jäsenten tilastot valtio / lääni
 MembersStatisticsByTown=Jäsenten tilastot kaupunki
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Jäsenmäärä
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=Ei validoitu jäsenet pitivät
 MembersByCountryDesc=Tämä ruutu näyttää tilastoja jäseniä maittain. Graphic riippuu kuitenkin Googlen online-käyrä palvelu ja on käytettävissä vain, jos internet-yhteys toimii.
 MembersByStateDesc=Tämä ruutu näyttää tilastoja jäsenistä valtion / maakuntien / kantonissa.
@@ -176,6 +177,7 @@ MenuMembersStats=Tilasto
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Tiedot ovat julkisia
 NewMemberbyWeb=Uusi jäsen. Odottaa hyväksyntää
 NewMemberForm=Uusi jäsen lomake
diff --git a/htdocs/langs/fi_FI/mrp.lang b/htdocs/langs/fi_FI/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/fi_FI/mrp.lang
+++ b/htdocs/langs/fi_FI/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index bf71d42d33f..fb19101c1ee 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Hintojen lukumäärä
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Määrä vastaavat tuotteet
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Hakusanalla suodatin
 CategoryFilter=Luokka suodatin
 ProductToAddSearch=Hae tuote lisätä
 NoMatchFound=Ei hakutuloksia löytyi
 ListOfProductsServices=Luettelo Tuotteet/Palvelut
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=Luettelo tuotteista / palveluista tämän tuotteen komponentti
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=Yksi valittu tuote on vanhempi nykyinen tuote
 DeleteProduct=Poista tuotteen / palvelun
 ConfirmDeleteProduct=Oletko varma, että haluat poistaa tämän tuotteen / palvelun?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Numero
 DefaultPrice=Oletus hinta
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimi ostohinta
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/fi_FI/recruitment.lang b/htdocs/langs/fi_FI/recruitment.lang
index 7451732ec87..eb65908493a 100644
--- a/htdocs/langs/fi_FI/recruitment.lang
+++ b/htdocs/langs/fi_FI/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Asema
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/fi_FI/stocks.lang b/htdocs/langs/fi_FI/stocks.lang
index 217e28589fb..3bd141f559b 100644
--- a/htdocs/langs/fi_FI/stocks.lang
+++ b/htdocs/langs/fi_FI/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Lieu
 LocationSummary=Lyhyt nimi sijainti
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Luokka suodatin
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/fi_FI/suppliers.lang b/htdocs/langs/fi_FI/suppliers.lang
index e928b322281..ced411126ca 100644
--- a/htdocs/langs/fi_FI/suppliers.lang
+++ b/htdocs/langs/fi_FI/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Älä tilaa
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Maine
diff --git a/htdocs/langs/fi_FI/website.lang b/htdocs/langs/fi_FI/website.lang
index 9392f375afc..5ecbd8e3ca4 100644
--- a/htdocs/langs/fi_FI/website.lang
+++ b/htdocs/langs/fi_FI/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Lisää sivusto
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Kotisivu
-PageContainer=Page/container
+PageContainer=Sivu
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS-syöte
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/fr_BE/accountancy.lang b/htdocs/langs/fr_BE/accountancy.lang
index 1071dd5c68b..11b91eb3db3 100644
--- a/htdocs/langs/fr_BE/accountancy.lang
+++ b/htdocs/langs/fr_BE/accountancy.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - accountancy
-ConfigAccountingExpert=Configuration du module de compta expert
 Processing=Exécution
 Lineofinvoice=Lignes de facture
 Doctype=Type de document
diff --git a/htdocs/langs/fr_BE/intracommreport.lang b/htdocs/langs/fr_BE/intracommreport.lang
new file mode 100644
index 00000000000..76825d9b4ab
--- /dev/null
+++ b/htdocs/langs/fr_BE/intracommreport.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+IntracommReportPeriod=Period of nalysis
diff --git a/htdocs/langs/fr_BE/products.lang b/htdocs/langs/fr_BE/products.lang
new file mode 100644
index 00000000000..6e900475275
--- /dev/null
+++ b/htdocs/langs/fr_BE/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/fr_BE/stocks.lang b/htdocs/langs/fr_BE/stocks.lang
deleted file mode 100644
index 0cf57e3a1c3..00000000000
--- a/htdocs/langs/fr_BE/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/fr_CA/accountancy.lang b/htdocs/langs/fr_CA/accountancy.lang
index 18532f2fd92..c34f7d4c7ad 100644
--- a/htdocs/langs/fr_CA/accountancy.lang
+++ b/htdocs/langs/fr_CA/accountancy.lang
@@ -23,8 +23,6 @@ OverviewOfAmountOfLinesBound=Aperçu du nombre de lignes déjà liées à un com
 DeleteCptCategory=Supprimer le compte comptable du groupe
 ConfirmDeleteCptCategory=Voulez-vous vraiment supprimer ce compte du groupe de comptes?
 JournalizationInLedgerStatus=État de la journalisation
-AlreadyInGeneralLedger=Déjà journalisé dans les livres
-NotYetInGeneralLedger=Pas encore journalisé dans les livres
 GroupIsEmptyCheckSetup=Le groupe est vide, vérifiez la configuration du groupe comptable personnalisé
 DetailByAccount=Voir le détail par compte
 AccountWithNonZeroValues=Comptes avec des valeurs différentes de zéro
@@ -32,7 +30,6 @@ CountriesInEEC=Pays membres du CEE
 CountriesNotInEEC=Pays non membres du CEE
 CountriesInEECExceptMe=Pays membres du CEE sauf %s
 CountriesExceptMe=Tous le pays sauf %s
-AccountantFiles=Exporter un document comptable
 MainAccountForCustomersNotDefined=Compte comptable principal pour les clients non défini dans la configuration
 MainAccountForSuppliersNotDefined=Compte comptable principal pour les vendeurs non défini dans la configuration
 MainAccountForUsersNotDefined=Compte comptable principal pour les utilisateurs non défini dans la configuration
@@ -58,7 +55,6 @@ AccountancyAreaDescBind=ÉTAPE %s: Vérifiez la liaison entre les lignes %s exis
 AccountancyAreaDescWriteRecords=ÉTAPE %s: Écrivez des transactions dans le Ledger. Pour cela, accédez au menu <strong>%s</strong>, et cliquez sur le bouton <strong>%s</strong>.
 AccountancyAreaDescAnalyze=ÉTAPE %s: Ajoutez ou modifiez des transactions existantes et générez des rapports et des exportations.
 AccountancyAreaDescClosePeriod=ÉTAPE%s: Période de fermeture afin que nous ne puissions faire aucune modification dans un futur.
-TheJournalCodeIsNotDefinedOnSomeBankAccount=Étape obligatoire de configuration non terminée (journal des codes comptables non défini pour tous les comptes bancaires)
 Selectchartofaccounts=Sélectionnez le plan des comptes actif
 SubledgerAccountLabel=Étiquette de compte auxiliaire
 ShowAccountingJournal=Afficher le journal comptable
@@ -76,7 +72,6 @@ SuppliersVentilation=Reliure de facture fournisseur
 ExpenseReportsVentilation=Rapport de dépenses liant
 CreateMvts=Créer une nouvelle transaction
 ValidTransaction=Valider une transaction
-WriteBookKeeping=Enregistrer des transactions dans le grand livre
 AccountBalance=Solde du compte
 ObjectsRef=Référence à un objet source
 CAHTF=Fournisseur d'achat total avant taxes
@@ -104,7 +99,6 @@ ACCOUNTING_SERVICE_BUY_ACCOUNT=Compte comptable par défaut pour les services ac
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Compte comptable par défaut pour les services vendus (utilisé si non défini dans la fiche de service)
 GroupByAccountAccounting=Groupe par compte comptable
 NotMatch=Pas encore défini
-DeleteMvt=Effacer les lignes du grand livre
 FinanceJournal=Journal des finances
 ExpenseReportsJournal=Journal des rapports de dépenses
 DescFinanceJournal=Journal de banque comprenant tous les types de règlements autres que espèce\t
diff --git a/htdocs/langs/fr_CA/ecm.lang b/htdocs/langs/fr_CA/ecm.lang
index 83afa095513..d660995b9f5 100644
--- a/htdocs/langs/fr_CA/ecm.lang
+++ b/htdocs/langs/fr_CA/ecm.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nb de documents dans l'annuaire
 ECMSectionManual=Annuaire manuel
 ECMSectionAuto=Annuaire automatique
 ECMSectionsManual=Arbre manuel
@@ -9,17 +8,6 @@ ECMCreationDate=Date création
 ECMAreaDesc2=* Les répertoires automatiques sont remplis automatiquement lors de l'ajout de documents à partir d'une carte d'un élément. <br> * Les répertoires manuels peuvent être utilisés pour enregistrer des documents non liés à un élément particulier.
 ECMSectionWasRemoved=Le répertoire <b>%s</b> a été supprimé.
 ECMSectionOfDocuments=Répertoires de documents
-ECMDocsBySocialContributions=Documents liés aux impôts sociaux ou fiscaux
-ECMDocsByThirdParties=Documents liés à des tiers
-ECMDocsByProposals=Documents liés aux propositions
-ECMDocsByOrders=Documents liés aux commandes clients
-ECMDocsByContracts=Documents liés aux contrats
-ECMDocsByInvoices=Documents liés aux factures des clients
-ECMDocsByProducts=Documents liés aux produits
-ECMDocsByProjects=Documents liés à des projets
-ECMDocsByUsers=Documents liés aux utilisateurs
-ECMDocsByInterventions=Documents liés aux interventions
-ECMDocsByExpenseReports=Documents liés aux rapports de dépenses
 ShowECMSection=Afficher le répertoire
 DeleteSection=Supprimer le répertoire
 ConfirmDeleteSection=Pouvez-vous confirmer que vous souhaitez supprimer le répertoire <b>%s</b>?
diff --git a/htdocs/langs/fr_CA/intracommreport.lang b/htdocs/langs/fr_CA/intracommreport.lang
new file mode 100644
index 00000000000..76825d9b4ab
--- /dev/null
+++ b/htdocs/langs/fr_CA/intracommreport.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+IntracommReportPeriod=Period of nalysis
diff --git a/htdocs/langs/fr_CA/members.lang b/htdocs/langs/fr_CA/members.lang
index 94325f44baa..6734cb9fec0 100644
--- a/htdocs/langs/fr_CA/members.lang
+++ b/htdocs/langs/fr_CA/members.lang
@@ -18,14 +18,10 @@ MembersCards=Cartes de visite Membres
 MembersList=Liste des membres
 MembersListToValid=Liste des membres préliminaires (à valider)
 MembersListValid=Liste des membres valides
-MembersListUpToDate=Liste des membres valides avec abonnement à jour
-MembersListNotUpToDate=Liste des membres valides avec une souscription périmée
 MembersListResiliated=Liste des membres licenciés
 MembersListQualified=Liste des membres qualifiés
 MenuMembersToValidate=Ébauche de membres
 MenuMembersValidated=Membres validés
-MenuMembersUpToDate=Membres à jour
-MenuMembersNotUpToDate=Membres périmés
 MenuMembersResiliated=Membres résiliés
 MembersWithSubscriptionToReceive=Membres avec abonnement à recevoir
 DateSubscription=Date de souscription
@@ -41,7 +37,6 @@ MembersTypes=Types de membres
 MemberStatusActive=Validé (en attente d'abonnement)
 MemberStatusActiveShort=Validée
 MemberStatusActiveLate=L'abonnement est expiré
-MemberStatusActiveLateShort=Expiré
 MemberStatusPaid=Abonnement à jour
 MemberStatusPaidShort=À jour
 MemberStatusResiliated=Membre résilié
@@ -63,7 +58,6 @@ ListOfSubscriptions=Liste des abonnements
 AddMember=Créer un membre
 NoTypeDefinedGoToSetup=Aucun type de membre n'est défini. Aller au menu "Types de membres"
 SubscriptionRequired=Abonnement requis
-MorPhy=La nature
 Reenable=Reignable
 ResiliateMember=Terminer un membre
 ConfirmResiliateMember=Êtes-vous sûr de vouloir mettre fin à ce membre?
diff --git a/htdocs/langs/fr_CA/other.lang b/htdocs/langs/fr_CA/other.lang
index ba425feb946..23fbaaa759a 100644
--- a/htdocs/langs/fr_CA/other.lang
+++ b/htdocs/langs/fr_CA/other.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - other
 NumberingShort=N °
-BirthdayDate=Date d'anniversaire
 BirthdayAlertOn=Alerte d'anniversaire active
 BirthdayAlertOff=Alerte d'anniversaire inactive
 PreviousMonthOfInvoice=Mois précédent (numéro 1-12) de la date de facturation
diff --git a/htdocs/langs/fr_CA/products.lang b/htdocs/langs/fr_CA/products.lang
index c7337859322..313aab6abb2 100644
--- a/htdocs/langs/fr_CA/products.lang
+++ b/htdocs/langs/fr_CA/products.lang
@@ -53,16 +53,13 @@ SetDefaultBarcodeType=Définir le type de code à barres
 BarcodeValue=Valeur du code à barres
 NoteNotVisibleOnBill=Note (non visible sur les factures, propositions ...)
 ServiceLimitedDuration=Si le produit est un service à durée limitée:
-AssociatedProductsNumber=Nombre de produits composant ce produit virtuel
 ParentProductsNumber=Nombre de produits d'emballage pour les parents
 ParentProducts=Produits parentaux
-IfZeroItIsNotUsedByVirtualProduct=Si 0, ce produit n'est utilisé par aucun produit virtuel
 KeywordFilter=Filtre à mots clés
 CategoryFilter=Filtre de catégorie
 ProductToAddSearch=Rechercher un produit à ajouter
 NoMatchFound=Pas de résultat trouvé
 ListOfProductsServices=Liste des produits / services
-ProductParentList=Liste des produits / services virtuels avec ce produit en tant que composant
 ErrorAssociationIsFatherOfThis=L'un des produits sélectionnés est le parent avec le produit actuel
 DeleteProduct=Supprimer un produit / service
 ConfirmDeleteProduct=Êtes-vous sûr de vouloir supprimer ce produit / service?
@@ -83,6 +80,7 @@ NewRefForClone=Réf. De nouveau produit / service
 SellingPrices=Prix ​​de vente
 BuyingPrices=Prix ​​d'achat
 CustomerPrices=Prix ​​client
+CustomCode=Customs / Commodity / HS code
 ShortLabel=Étiquette courte
 p=U.
 s=S
diff --git a/htdocs/langs/fr_CA/propal.lang b/htdocs/langs/fr_CA/propal.lang
index 50d06c795c8..62d0f0fdc10 100644
--- a/htdocs/langs/fr_CA/propal.lang
+++ b/htdocs/langs/fr_CA/propal.lang
@@ -19,7 +19,6 @@ ActionsOnPropal=Événements sur proposition
 RefProposal=Référence de la proposition commerciale
 SendPropalByMail=Envoyer proposition commerciale par courriel
 DateEndPropal=Date de validité se terminant
-CloseAs=Définir l'état sur
 SetAcceptedRefused=Accepté/refusé
 ErrorPropalNotFound=Pas de proposition %s trouvées
 AddToDraftProposals=Ajouter un brouillon de proposition
diff --git a/htdocs/langs/fr_CA/recruitment.lang b/htdocs/langs/fr_CA/recruitment.lang
new file mode 100644
index 00000000000..cb70b6f1b17
--- /dev/null
+++ b/htdocs/langs/fr_CA/recruitment.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - recruitment
+PositionToBeFilled=Poste
diff --git a/htdocs/langs/fr_CA/stocks.lang b/htdocs/langs/fr_CA/stocks.lang
index 387c0a20f85..de1faa14427 100644
--- a/htdocs/langs/fr_CA/stocks.lang
+++ b/htdocs/langs/fr_CA/stocks.lang
@@ -48,8 +48,6 @@ NoStockAction=Pas de stock action
 DesiredStockDesc=Ce montant de stock sera la valeur utilisée pour remplir le stock par fonctionnalité de réapprovisionnement.
 StockToBuy=Commander
 ReplenishmentOrders=Ordres de réapprovisionnement
-VirtualDiffersFromPhysical=Selon l'augmentation / diminution des options d'achat d'actions, les stocks physiques et les stocks virtuels (commandes physiques et actuelles) peuvent différer
-UseVirtualStockByDefault=Utilisez le stock virtuel par défaut, au lieu du stock physique, pour la fonctionnalité de réapprovisionnement
 UseVirtualStock=Utiliser un stock virtuel
 UsePhysicalStock=Utiliser un stock physique
 CurentSelectionMode=Mode de sélection actuel
@@ -89,7 +87,6 @@ inventoryValidate=Validée
 inventoryDraft=Fonctionnement
 inventorySelectWarehouse=Choix d'entrepôt
 SelectCategory=Filtre de catégorie
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Utilisez le prix d'achat si aucun dernier prix d'achat ne peut être trouvé
 inventoryChangePMPPermission=Autoriser à modifier la valeur PMP pour un produit
 OnlyProdsInStock=Ne pas ajouter de produit sans stock
 TheoricalQty=Quantité théorique
@@ -102,4 +99,3 @@ InventoryFlushed=Inventaire rincé
 ExitEditMode=Édition de sortie
 inventoryDeleteLine=Suppression de ligne
 RegulateStock=Réglez Stock
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/fr_CA/suppliers.lang b/htdocs/langs/fr_CA/suppliers.lang
index 70dab4e61d8..704dc1a11bc 100644
--- a/htdocs/langs/fr_CA/suppliers.lang
+++ b/htdocs/langs/fr_CA/suppliers.lang
@@ -2,13 +2,10 @@
 TotalBuyingPriceMinShort=Total de sous-produits par prix d'achat
 SomeSubProductHaveNoPrices=Certains sous-produits n'ont pas de prix défini
 ChangeSupplierPrice=Changer le prix d'achat
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ce fournisseur de référence est déjà associé à une référence : %s
 Availability=Disponible
 ApproveThisOrder=Approuver cette commande
 ConfirmApproveThisOrder=Êtes-vous sûr de vouloir approuver la commande <b> %s</b>?
 ConfirmDenyingThisOrder=Êtes-vous sûr de vouloir refuser cette commande <b> %s</b>?
 ConfirmCancelThisOrder=Êtes-vous sûr de vouloir annuler cette commande <b> %s</b>?
-DescNbDaysToDelivery=Délai de livraison maximum pour les produits de cette commande
 DoNotOrderThisProductToThisSupplier=Ne commandez pas
-NotTheGoodQualitySupplier=Qualité incorrecte
 AllProductServicePrices=Tous les prix des produits / services
diff --git a/htdocs/langs/fr_CH/compta.lang b/htdocs/langs/fr_CH/compta.lang
new file mode 100644
index 00000000000..c7c41488180
--- /dev/null
+++ b/htdocs/langs/fr_CH/compta.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - compta
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/fr_CH/intracommreport.lang b/htdocs/langs/fr_CH/intracommreport.lang
new file mode 100644
index 00000000000..76825d9b4ab
--- /dev/null
+++ b/htdocs/langs/fr_CH/intracommreport.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+IntracommReportPeriod=Period of nalysis
diff --git a/htdocs/langs/fr_CH/main.lang b/htdocs/langs/fr_CH/main.lang
index 65f49b2ef5e..2888af9c5df 100644
--- a/htdocs/langs/fr_CH/main.lang
+++ b/htdocs/langs/fr_CH/main.lang
@@ -3,19 +3,19 @@ DIRECTION=ltr
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
-SeparatorThousand=,
-FormatDateShort=%d/%m/%Y
-FormatDateShortInput=%d/%m/%Y
-FormatDateShortJava=dd/MM/yyyy
-FormatDateShortJavaInput=dd/MM/yyyy
-FormatDateShortJQuery=dd/mm/yy
-FormatDateShortJQueryInput=dd/mm/yy
+SeparatorThousand=Space
+FormatDateShort=%d.%m.%Y
+FormatDateShortInput=%d.%m.%Y
+FormatDateShortJava=dd.MM.yyyy
+FormatDateShortJavaInput=dd.MM.yyyy
+FormatDateShortJQuery=dd.mm.yy
+FormatDateShortJQueryInput=dd.mm.yy
 FormatHourShortJQuery=HH:MI
-FormatHourShort=%I:%M %p
+FormatHourShort=%H:%M %p
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d %b %Y
 FormatDateText=%d %B %Y
-FormatDateHourShort=%d/%m/%Y %I:%M %p
-FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p
-FormatDateHourTextShort=%d %b %Y, %I:%M %p
-FormatDateHourText=%d %B %Y, %I:%M %p
+FormatDateHourShort=%d.%m.%Y %H:%M %p
+FormatDateHourSecShort=%d.%m.%Y %H:%M:%S %p
+FormatDateHourTextShort=%d %b %Y, %H:%M %p
+FormatDateHourText=%d %B %Y, %H:%M %p
diff --git a/htdocs/langs/fr_CH/products.lang b/htdocs/langs/fr_CH/products.lang
new file mode 100644
index 00000000000..6e900475275
--- /dev/null
+++ b/htdocs/langs/fr_CH/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/fr_CH/stocks.lang b/htdocs/langs/fr_CH/stocks.lang
deleted file mode 100644
index 0cf57e3a1c3..00000000000
--- a/htdocs/langs/fr_CH/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/fr_CI/compta.lang b/htdocs/langs/fr_CI/compta.lang
new file mode 100644
index 00000000000..c7c41488180
--- /dev/null
+++ b/htdocs/langs/fr_CI/compta.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - compta
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/fr_CI/intracommreport.lang b/htdocs/langs/fr_CI/intracommreport.lang
new file mode 100644
index 00000000000..76825d9b4ab
--- /dev/null
+++ b/htdocs/langs/fr_CI/intracommreport.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+IntracommReportPeriod=Period of nalysis
diff --git a/htdocs/langs/fr_CI/products.lang b/htdocs/langs/fr_CI/products.lang
new file mode 100644
index 00000000000..6e900475275
--- /dev/null
+++ b/htdocs/langs/fr_CI/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/fr_CI/stocks.lang b/htdocs/langs/fr_CI/stocks.lang
deleted file mode 100644
index 0cf57e3a1c3..00000000000
--- a/htdocs/langs/fr_CI/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/fr_CM/compta.lang b/htdocs/langs/fr_CM/compta.lang
new file mode 100644
index 00000000000..c7c41488180
--- /dev/null
+++ b/htdocs/langs/fr_CM/compta.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - compta
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/fr_CM/intracommreport.lang b/htdocs/langs/fr_CM/intracommreport.lang
new file mode 100644
index 00000000000..76825d9b4ab
--- /dev/null
+++ b/htdocs/langs/fr_CM/intracommreport.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+IntracommReportPeriod=Period of nalysis
diff --git a/htdocs/langs/fr_CM/products.lang b/htdocs/langs/fr_CM/products.lang
new file mode 100644
index 00000000000..6e900475275
--- /dev/null
+++ b/htdocs/langs/fr_CM/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/fr_CM/stocks.lang b/htdocs/langs/fr_CM/stocks.lang
deleted file mode 100644
index 0cf57e3a1c3..00000000000
--- a/htdocs/langs/fr_CM/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index 6381caebbec..7937bfcebbf 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Défaut pour les services
 DefaultForProduct=Défaut pour les produits
 CantSuggest=Suggestion no possible
 AccountancySetupDoneFromAccountancyMenu=La partie principale de la configuration de la comptabilité se fait depuis le menu %s
-ConfigAccountingExpert=Configuration du module comptabilité expert
+ConfigAccountingExpert=Configuration du module de comptabilité (partie double)
 Journalization=Ventilation
-Journaux=Journaux
+Journals=Journaux
 JournalFinancial=Journaux financiers
 BackToChartofaccounts=Retour au plan comptable
 Chartofaccounts=Plan comptable
+ChartOfSubaccounts=Plan des comptes auxiliaires
+ChartOfIndividualAccountsOfSubsidiaryLedger=Plan des comptes auxiliaires
 CurrentDedicatedAccountingAccount=Compte dédié courant
 AssignDedicatedAccountingAccount=Nouveau compte à assigner
 InvoiceLabel=Description de la facture
@@ -33,8 +35,8 @@ OtherInfo=Autre information
 DeleteCptCategory=Supprimer le code comptable du groupe
 ConfirmDeleteCptCategory=Êtes-vous sur de vouloir supprimer ce compte comptable du groupe comptable ?
 JournalizationInLedgerStatus=Statut de journalisation
-AlreadyInGeneralLedger=Enregistrement déjà présent dans le grand livre
-NotYetInGeneralLedger=Pas encore envoyé dans le grand livre
+AlreadyInGeneralLedger=Déjà transféré en comptabilité
+NotYetInGeneralLedger=Pas encore transféré en comptabilité
 GroupIsEmptyCheckSetup=Le groupe est vide. Vérifier la configuration du groupe personnalisé
 DetailByAccount=Afficher le détail par compte
 AccountWithNonZeroValues=Comptes avec des valeurs non nulles
@@ -43,7 +45,9 @@ CountriesInEEC=Pays de la CEE
 CountriesNotInEEC=Pays hors CEE
 CountriesInEECExceptMe=Pays de la CEE sauf %s
 CountriesExceptMe=Tous les pays sauf %s
-AccountantFiles=Exporter des documents comptables
+AccountantFiles=Exporter les documents sources
+ExportAccountingSourceDocHelp=Avec cet outil, vous pouvez exporter les événements sources (liste et PDF) qui ont été utilisés pour générer votre comptabilité. Pour exporter vos journaux, utilisez l'entrée de menu %s - %s.
+VueByAccountAccounting=Vue par comptes comptables
 
 MainAccountForCustomersNotDefined=Compte comptable général pour les clients non défini dans la configuration
 MainAccountForSuppliersNotDefined=Compte comptable général pour les fournisseurs non défini dans la configuration
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=Étape %s : Ajouter ou modifier les opérations exist
 
 AccountancyAreaDescClosePeriod=Étape %s : Fermer la période pour ne plus pouvoir faire de modification à l'avenir.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=Une étape obligatoire dans la configuration n'était pas terminée (journal de code de comptabilité non défini pour tous les comptes bancaires)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Une étape obligatoire dans la configuration n'a pas été terminée (journal de code de comptabilité non défini pour tous les comptes bancaires)
 Selectchartofaccounts=Sélectionnez le plan de compte actif
 ChangeAndLoad=Changer et charger
 Addanaccount=Ajouter un compte comptable
@@ -89,6 +93,8 @@ SubledgerAccount=Compte auxiliaire
 SubledgerAccountLabel=Libellé du compte auxiliaire
 ShowAccountingAccount=Afficher le compte comptable
 ShowAccountingJournal=Afficher le journal
+ShowAccountingAccountInLedger=Afficher le compte comptable dans le grand livre
+ShowAccountingAccountInJournals=Afficher le compte comptable dans les journaux
 AccountAccountingSuggest=Code comptable suggéré
 MenuDefaultAccounts=Comptes par défaut
 MenuBankAccounts=Comptes bancaires
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Liaison notes de frais
 CreateMvts=Créer nouvelle transaction
 UpdateMvts=Modification d'une transaction
 ValidTransaction=Valider la transaction
-WriteBookKeeping=Inscrire les transactions dans le grand livre
+WriteBookKeeping=Enregistrer les écritures en comptabilité
 Bookkeeping=Grand livre
+BookkeepingSubAccount=Grand livre auxiliaire
 AccountBalance=Balance des comptes
 ObjectsRef=Référence de l'objet source
 CAHTF=Total achat fournisseur HT
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Désactiver la saisie directe de transactions en banqu
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Activer l'export brouillon sur les journaux comptables
 ACCOUNTANCY_COMBO_FOR_AUX=Activer la liste déroulante pour le compte auxiliaire (peut être lent si vous avez beaucoup de tiers)
 ACCOUNTING_DATE_START_BINDING=Définissez une date pour commencer la liaison et le transfert en comptabilité. En dessous de cette date, les transactions ne seront jamais transférées à la comptabilité.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Choix de la période des factures pour le transfert en comptabilité
 
 ACCOUNTING_SELL_JOURNAL=Journal des ventes
 ACCOUNTING_PURCHASE_JOURNAL=Journal des achats
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Compte comptable d'attente
 DONATION_ACCOUNTINGACCOUNT=Compte comptable pour l'enregistrement des dons
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Compte comptable pour enregistrer les adhésions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Compte comptable par défaut pour les acomptes clients
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Compte comptable par défaut pour les produits achetés (utilisé si non défini dans la fiche produit)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Compte comptable par défaut pour les produits achetés dans la CEE (utilisé si non défini dans la fiche produit)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Compte comptable par défaut pour les produits achetés et importés hors de la CEE (utilisé si non défini dans la fiche produit)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Par groupes prédéfinis
 ByPersonalizedAccountGroups=Par groupes personnalisés
 ByYear=Par année
 NotMatch=Non défini
-DeleteMvt=Supprimer les lignes du grand livre
+DeleteMvt=Supprimer des lignes d'opérations de la comptabilité
 DelMonth=Mois à effacer
 DelYear=Année à supprimer
 DelJournal=Journal à supprimer
-ConfirmDeleteMvt=Cela supprimera toutes les lignes du grand livre de l'année/du mois et/ou d'un journal spécifique (au moins un critère est requis). Vous devrez réutiliser la fonction "Enregistrer en comptabilité" pour passer l'enregistrement supprimé à nouveau dans le grand livre.
-ConfirmDeleteMvtPartial=Cette action effacera les écritures de votre grand livre (toutes les lignes liées à une même transaction seront effacées)
+ConfirmDeleteMvt=Cette action supprime les lignes des opérations pour l'année/mois et/ou pour le journal sélectionné (au moins un critère est requis). Vous devrez utiliser de nouveau la fonctionnalité '%s' pour retrouver vos écritures dans la comptabilité.
+ConfirmDeleteMvtPartial=Cette action supprime l'écriture de la comptabilité (toutes les lignes opérations liées à une même écriture seront effacées).
 FinanceJournal=Journal de trésorerie
 ExpenseReportsJournal=Journal des notes de frais
 DescFinanceJournal=Journal de trésorerie comprenant tous les types de paiements par compte bancaire / caisse
-DescJournalOnlyBindedVisible=Ceci est une vue des enregistrements qui sont liés à un compte comptable produits/services et qui peuvent être enregistrés dans le grand livre.
+DescJournalOnlyBindedVisible=Il s'agit d'une vue des éléments liés à un compte comptable et qui peuvent être enregistrés dans les journaux et le grand livre.
 VATAccountNotDefined=Compte de la TVA non défini
 ThirdpartyAccountNotDefined=Compte pour le tiers non défini
 ProductAccountNotDefined=Compte pour le produit non défini
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Le journal est déjà utilisé
 AccountingAccountForSalesTaxAreDefinedInto=Remarque: Le compte comptable pour la TVA est défini dans le menu <b> %s </b> - <b> %s </b>
 NumberOfAccountancyEntries=Nombre d'entrées
 NumberOfAccountancyMovements=Nombre de mouvements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Désactiver la liaison et le transfert en comptabilité des factures de ventes (les factures clients ne seront pas prises en compte en comptabilité).
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Désactiver la liaison et le transfert en comptabilité des factures d'achats (les factures fournisseurs ne seront pas prises en compte en comptabilité).
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Désactiver la liaison et le transfert en comptabilité des notes de frais (les notes de frais ne seront pas prises en compte en comptabilité).
 
 ## Export
 ExportDraftJournal=Exporter le journal brouillon
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export pour Sage 50 Suisse
 Modelcsv_winfic=Export pour Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export vers Gestinum (v3)
+Modelcsv_Gestinumv5Export Pour Gestinum (V5)
 ChartofaccountsId=Id plan comptable
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index d7842084c17..601ed14f0c1 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Lever blocage des connexions
 YourSession=Votre session
 Sessions=Sessions utilisateurs
 WebUserGroup=Utilisateur/groupe du serveur Web
+PermissionsOnFilesInWebRoot=Permissions sur les fichiers du répertoire racine
+PermissionsOnFile=Permissions sur le fichier %s
 NoSessionFound=Votre PHP ne semble pas pouvoir lister les sessions actives. Le répertoire de sauvegarde des sessions (<b>%s</b>) est peut être protégé (Par exemple, par les permissions de l'OS ou par la directive open_basedir de votre PHP, ce qui d'un point de vue sécurité est une bonne chose).
 DBStoringCharset=Encodage base pour stockage données
 DBSortingCharset=Encodage base pour tri des données
@@ -71,7 +73,7 @@ DisableJavascriptNote=Remarque: à des fins de test ou de débogage. Pour une op
 UseSearchToSelectCompanyTooltip=Si vous avez un nombre important de tiers (>100 000), vous pourrez améliorer les performances en positionnant la constante COMPANY_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limité au début des chaines.
 UseSearchToSelectContactTooltip=Si vous avez un nombre important de contacts (>100 000), vous pourrez améliorer les performances en positionnant la constante CONTACT_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limité au début des chaines.
 DelaiedFullListToSelectCompany=Attendre que vous ayez appuyé sur une touche avant de charger le contenu de la liste déroulante des tiers. <br>Cela peut augmenter les performances si vous avez un grand nombre de tiers, mais cela est moins convivial.
-DelaiedFullListToSelectContact=Attendre que vous ayez appuyé sur une touche avant de charger le contenu de la liste déroulante des adresses de contact. <br>Cela peut augmenter les performances si vous avez un grand nombre de contacts, mais cela est moins convivial
+DelaiedFullListToSelectContact=Attendre que vous ayez appuyé sur une touche avant de charger le contenu de la liste déroulante des contacts/adresses. <br>Cela peut augmenter les performances si vous avez un grand nombre de contacts, mais cela est moins convivial
 NumberOfKeyToSearch=Nb de caractère déclenchant la recherche : %s
 NumberOfBytes=Nombre d'octets
 SearchString=Chaîne de recherche
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=Sur les éléments d'un tiers, autorise la
 JavascriptDisabled=Javascript désactivé
 UsePreviewTabs=Afficher les onglets "Aperçu"
 ShowPreview=Afficher aperçu
+ShowHideDetails=Afficher/masquer les détails
 PreviewNotAvailable=Aperçu non disponible
 ThemeCurrentlyActive=Thème actif actuellement
 CurrentTimeZone=Fuseau horaire PHP (serveur)
@@ -102,7 +105,7 @@ UseCaptchaCode=Utilisation du code graphique (CAPTCHA) sur la page de connexion
 AntiVirusCommand=Chemin complet vers la commande antivirus
 AntiVirusCommandExample=Exemple pour ClamAv Daemon (nécessite clamav-daemon): /usr/bin/clamdscan <br> Exemple pour ClamWin (très très lent): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Paramètres supplémentaires sur la ligne de commande
-AntiVirusParamExample=Exemple pour le démon ClamAv: --fdpass <br> Exemple pour ClamWin: --database = "C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Exemple pour le ClamAv Daemon: --fdpass <br> Exemple pour ClamWin: --database = "C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Configuration du module Comptabilité
 UserSetup=Configuration de la gestion des utilisateurs
 MultiCurrencySetup=Configuration du module Multi-devise
@@ -271,7 +274,7 @@ NoticePeriod=Délai de prévenance
 NewByMonth=Mois suivant
 Emails=Emails
 EMailsSetup=Configuration Emails
-EMailsDesc=Cette page permet de remplacer les paramètres PHP en rapport avec l'envoi d'emails. Dans la plupart des cas, sur des OS comme Unix/Linux, les paramètres PHP sont déjà corrects et cette page est inutile.
+EMailsDesc=Cette page permet de définir les paramètres et options d'envoi des e-mails.
 EmailSenderProfiles=Expéditeur des e-mails
 EMailsSenderProfileDesc=Vous pouvez garder cette section vide. Si vous entrez des emails ici, ils seront ajoutés à la liste des expéditeurs possibles dans la liste déroulante lorsque vous écrivez un nouvel email.
 MAIN_MAIL_SMTP_PORT=Nom d'hôte ou adresse IP du serveur SMTP/SMTPS (Par défaut dans php.ini: <b>%s</b>)
@@ -289,7 +292,7 @@ MAIN_MAIL_SMTPS_ID=ID SMTP (si le serveur d'envoi nécessite une authentificatio
 MAIN_MAIL_SMTPS_PW=Mot de passe SMTP (si le serveur d'envoi nécessite une authentification)
 MAIN_MAIL_EMAIL_TLS=Utilisation du chiffrement TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Utiliser le cryptage TTS (STARTTLS)
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autoriser les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Utiliser DKIM pour signer les emails
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Nom de domaine pour la signature DKIM
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Nom du sélecteur DKIM
@@ -439,12 +442,12 @@ ExtrafieldParamHelpPassword=Laissez ce champ vide signifie que la valeur sera st
 ExtrafieldParamHelpselect=La liste doit être de la forme clef,valeur (où la clé ne peut être '0')<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...<br><br>Pour afficher une liste dépendant d'une autre liste attribut complémentaire: <br>1, valeur1|options_<i>code_liste_parente</i>:clé_parente<br> 2,valeur2|options_<i>ode_liste_parente</i>:clé_parente<br><br>Pour que la liste soit dépendante d'une autre liste:<br>1,valeur1|<i>code_liste_parent</i>:clef_parent<br>2,valeur2|<i>code_liste_parent</i>:clef_parent
 ExtrafieldParamHelpcheckbox=La liste doit être de la forme clef,valeur (où la clé ne peut être '0')<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...
 ExtrafieldParamHelpradio=La liste doit être de la forme clef,valeur (où la clé ne peut être '0')<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...
-ExtrafieldParamHelpsellist=Les paramètres de la liste viennent d'une table<br>Syntax : table_name:label_field:id_field::filter<br>Exemple : c_typent:libelle:id::filter<br><br>-idfilter est nécessairement une clé primaire int<br>- filter peut être un simple test (e.g. active=1) pour seulement montrer les valeurs actives<br>Vous pouvez aussi utiliser $ID$ dans le filtre qui est le ID actuel de l'objet<br>Pour faire un SELECT dans le filtre, utilisez $SEL$<br>Si vous voulez filtrer sur un extrafield, utilisez la syntaxe extra.fieldcode=... (ou fieldcode est le code de l'extrafield)<br><br>Pour avoir une liste qui dépend d'un autre attribut complémentaire:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>Pour avoir une liste qui dépend d'une autre liste:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=Les paramètres de la liste viennent d'une table<br>Syntax : table_name:label_field:id_field::filter<br>Exemple : c_typent:libelle:id::filter<br><br>- id_field est nécessairement une clé primaire de type int<br>- filter peut être un simple test (e.g. active=1 pour seulement montrer les valeurs actives)<br>Vous pouvez aussi utiliser $ID$ dans le filtre qui est le ID actuel de l'objet<br>Pour faire un SELECT dans le filtre, utilisez le mot clé $SEL$ pour passer outre la protection système anti-injection<br>Si vous voulez filtrer sur un extrafield, utilisez la syntaxe extra.fieldcode=... (ou fieldcode est le code de l'extrafield)<br><br>Pour avoir une liste qui dépend d'un autre attribut complémentaire:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>Pour avoir une liste qui dépend d'une autre liste:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Les paramètres de la liste proviennent d'une table<br>:Syntaxe : nom_de_la_table:libelle_champ:id_champ::filtre<br>Exemple : c_typent:libelle:id::filter<br><br>le filtre peut n'est qu'un test (ex : active=1) pour n'afficher que les valeurs actives.<br>Vous pouvez aussi utiliser $ID$ dans les filtres pour indiquer l'ID de l'élément courant.<br>Pour utiliser un SELECT dans un filtre, utilisez $SEL$<br>Pour filtrer sur un attribut supplémentaire, utilisez la syntaxeextra.fieldcode=... (ou fieldcode est le code de l'attribut supplémentaire)<br><br>Pour afficher une liste dépendant d'un autre attribut supplémentaire : <br>c_typent:libelle:id:options_<i>code_liste_parente</i>|colonne_parente:filtre <br><br>Pour afficher une liste dépendant d'une autre liste : <br>c_typent:libelle:id:<i>code_liste_parente</i>|colonne_parente:filter
-ExtrafieldParamHelplink=Les paramètres doivent être ObjectName:Classpath <br> Syntaxe: ObjectName:Classpath <br> Exemples: <br> Societe:societe/class/societe.class.php <br> Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Les paramètres doivent être ObjectName:Classpath <br> Syntaxe: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Garder vide pour un simple séparateur <br> Définissez-le sur 1 pour un séparateur auto-déroulant (ouvert par défaut pour une nouvelle session, puis le statut est conservé pour la session de l'utilisateur) <br> Définissez ceci sur 2 pour un séparateur auto-déroulant (réduit par défaut pour une nouvelle session, puis l'état est conservé pour chaque session d'utilisateur).
 LibraryToBuildPDF=Bibliothèque utilisée pour la génération des PDF
-LocalTaxDesc=Certains pays appliquent 2 voire 3 taux sur chaque ligne de facture. Si c'est le cas, choisissez le type du deuxième et troisième taux et sa valeur. Les types possibles sont:<br>1 : taxe locale sur les produits et services hors tva (la taxe locale est calculée sur le montant hors taxe)<br>2 : taxe locale sur les produits et services avant tva (la taxe locale est calculée sur le montant + tva)<br>3 : taxe locale uniquement sur les produits hors tva (la taxe locale est calculée sur le montant hors taxe)<br>4 : taxe locale uniquement sur les produits avant tva (la taxe locale est calculée sur le montant + tva)<br>5 : taxe locale uniquement sur les services hors tva (la taxe locale est calculée sur le montant hors taxe)<br>6 : taxe locale uniquement sur les service avant tva (la taxe locale est calculée sur le montant + tva)
+LocalTaxDesc=Certains pays appliquent 2 voire 3 taxes sur chaque ligne de facture. Si c'est le cas, choisissez le type du deuxième et troisième taxe et son taux. Les types possibles sont:<br>1 : taxe locale sur les produits et services hors tva (la taxe locale est calculée sur le montant hors taxe)<br>2 : taxe locale sur les produits et services incluant la tva (la taxe locale est calculée sur le montant + tva)<br>3 : taxe locale uniquement sur les produits hors tva (la taxe locale est calculée sur le montant hors taxe)<br>4 : taxe locale uniquement sur les produits incluant la tva (la taxe locale est calculée sur le montant + tva)<br>5 : taxe locale uniquement sur les services hors tva (la taxe locale est calculée sur le montant hors taxe)<br>6 : taxe locale uniquement sur les service incluant la tva (la taxe locale est calculée sur le montant + tva)
 SMS=SMS
 LinkToTestClickToDial=Entrez un numéro de téléphone à appeler pour tester le lien d'appel « ClickToDial » pour l'utilisateur <strong>%s</strong>
 RefreshPhoneLink=Rafraichir lien
@@ -479,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s suivi du nom de client tronqué du nombre
 ModuleCompanyCodeSupplierDigitaria=%s suivi du nom du fournisseur tronqué du nombre de caractères: %s pour le code comptable fournisseur.
 Use3StepsApproval=Par défaut, les commandes fournisseurs nécessitent d'être créées et approuvées par 2 utilisateurs différents (une étape/utilisateur pour créer et une étape/utilisateur pour approuver. Notez que si un utilisateur à les deux permissions, ces deux actions sont effectuées en une seule fois). Cette option ajoute la nécessité d'une approbation par une troisième étape/utilisateur, si le montant de la commande est supérieur au montant d'une valeur définie (soit 3 étapes nécessaire: 1 =Validation, 2=Première approbation et 3=seconde approbation si le montant l'exige).<br>Laissez le champ vide si une seule approbation (2 étapes) est suffisante, placez une valeur très faible (0.1) si une deuxième approbation (3 étapes) est toujours exigée.
 UseDoubleApproval=Activer l'approbation en trois étapes si le montant HT est supérieur à...
-WarningPHPMail=Attention : La configuration d'envoi d'email utilise une configuration par défaut. Il est préférable de configurer les emails sortant pour utiliser le serveur email de votre fournisseur plutôt que la configuration par défaut pour plusieurs raisons:
+WarningPHPMail=AVERTISSEMENT: la configuration pour envoyer des e-mails à partir de l'application utilise la configuration générique par défaut. Il est souvent préférable de configurer les e-mails sortants pour utiliser le serveur de messagerie de votre fournisseur de services de messagerie au lieu de la configuration par défaut pour plusieurs raisons:
+WarningPHPMailA= - L'utilisation des serveurs de prestataires de messagerie augmente le niveau confiance des e-mails, cela augmente donc les chances de délivrabilité en n'étant pas considéré comme spam.
+WarningPHPMailB=- Certains fournisseurs de services de messagerie (comme Yahoo) ne vous permettent pas d'envoyer un e-mail à partir d'un autre serveur que leur propre serveur. Votre configuration actuelle utilise le serveur de l'application pour envoyer des e-mails et non le serveur de votre fournisseur de messagerie, donc certains destinataires (ceux compatibles avec le protocole DMARC restrictif), demanderont à votre fournisseur de messagerie si ils peuvent accepter votre message et ce fournisseur de messagerie (comme Yahoo) peut répondre «non» parce que le serveur d'envoi n'est pas le leur, aussi une partie de vos e-mails envoyés peuvent ne pas être acceptés pour la livraison (faites également attention au quota d'envoi de votre fournisseur de messagerie).
+WarningPHPMailC=- Utiliser le serveur SMTP de votre propre fournisseur de services de messagerie pour envoyer des e-mails est également intéressant afin que tous les e-mails envoyés depuis l'application soient également enregistrés dans votre répertoire "Envoyés" de votre boîte aux lettres.
+WarningPHPMailD=Si PHP est vraiment la méthode d'envoi des e-mails que vous avez choisi d'utiliser, supprimer cette alerte en activant à 1 la constante MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP  dans Accueil - Configuration - Divers
 WarningPHPMail2=Si votre fournisseur de messagerie SMTP a besoin de restreindre le client de messagerie à certaines adresses IP (très rare), voici l'adresse IP du mail user agent (MUA) de votre application CRM ERP : <strong> %s </strong>.
-WarningPHPMailSPF=Si le nom de domaine de votre adresse e-mail d'expéditeur est protégé par SPF (demandez à votre fournisseur d'e-mail), vous devez inclure les adresses IP suivantes dans l'enregistrement SPF du DNS de votre domaine: <strong> %s </strong>.
+WarningPHPMailSPF=Si le nom de domaine de votre adresse e-mail d'expéditeur est protégé par un enregistrement SPF (demandez à votre fournisseur de nom de domaine), vous devez inclure les adresses IP suivantes dans l'enregistrement SPF du DNS de votre domaine: <strong> %s </strong>.
 ClickToShowDescription=Cliquer pour afficher la description
 DependsOn=Ce module a besoin du(des) module(s)
 RequiredBy=Ce module est requis par le ou les module(s)
@@ -500,7 +507,7 @@ FreeLegalTextOnExpenseReports=Mention complémentaire sur les notes de frais
 WatermarkOnDraftExpenseReports=Filigrane sur les notes de frais
 AttachMainDocByDefault=Définissez cette valeur sur 1 si vous souhaitez joindre le document principal au courrier électronique par défaut (si applicable)
 FilesAttachedToEmail=Joindre le fichier
-SendEmailsReminders=Envoyer des alertes agenda par e-mails
+SendEmailsReminders=Envoyer des rappels agenda par e-mails
 davDescription=Ajout d'un composant pour devenir un serveur DAV
 DAVSetup=Configuration du module DAV
 DAV_ALLOW_PRIVATE_DIR=Activer le répertoire privé générique (répertoire dédié WebDAV nommé "private" - identification requise)
@@ -552,8 +559,6 @@ Module57Name=Règlement par Prélèvement
 Module57Desc=Gestion des règlements clients par prélèvements. Est incluse la génération des fichiers SEPA pour les pays européens.
 Module58Name=ClickToDial
 Module58Desc=Intégration d'un système de « ClickToDial » (Asterisk, …)
-Module59Name=Bookmark4u
-Module59Desc=Ajoute une fonction pour générer un compte Bookmark4u depuis un compte Dolibarr
 Module60Name=Autocollants
 Module60Desc=Gestion des pages d'autocollants
 Module70Name=Interventions
@@ -657,7 +662,7 @@ Module50200Desc=Module permettant d'offrir une page de paiement en ligne par car
 Module50300Name=Stripe
 Module50300Desc=Offrez aux clients une page de paiement en ligne Stripe (cartes de crédit/débit). Ceci peut être utilisé pour permettre à vos clients d'effectuer des paiements libres ou liés à un objet Dolibarr spécifique (facture, commande, etc.).
 Module50400Name=Comptabilité (partie double)
-Module50400Desc=Gestion de la comptabilité (double partie, comptabilité général et auxiliaire). Export du grand livre dans différent formats de logiciels comptables.
+Module50400Desc=Gestion de la comptabilité (en partie double, supporte le grand livre général et la comptabilité auxiliaire). Permet l'export des journaux formatés pour différents logiciels comptables.
 Module54000Name=PrintIPP
 Module54000Desc=Impression directe (sans ouvrir les documents) en utilisant l'interface Cups IPP (l'imprimante doit être visible depuis le serveur, et CUPS doit être installé sur le serveur).
 Module55000Name=Sondage ou Vote
@@ -689,6 +694,7 @@ Permission32=Créer/modifier les produits
 Permission34=Supprimer les produits
 Permission36=Voir/gérer les produits cachés
 Permission38=Exporter les produits
+Permission39=Ignorer le prix minimum
 Permission41=Lire les projets et tâches (partagés ou dont vous n'êtes pas contact). Permet la saisie de temps passé, pour vous-même et votre hiérarchie (vos subordonnés), sur les tâches assignées (Feuilles de temps).
 Permission42=Créer/modifier les projets (projets partagés et projets pour lesquels je suis contact). Permet aussi de créer des tâches et d'assigner des utilisateurs aux projets et tâches.
 Permission44=Supprimer les projets et tâches (partagés ou dont je suis contact)
@@ -697,6 +703,9 @@ Permission61=Consulter les interventions
 Permission62=Créer/modifier les interventions
 Permission64=Supprimer les interventions
 Permission67=Exporter les interventions
+Permission68=Envoyer les interventions par e-mail
+Permission69=Valider les interventions
+Permission70=Dévalider les fiches d'intervention
 Permission71=Consulter les fiches adhérents
 Permission72=Créer/modifier les adhérents
 Permission74=Supprimer les adhérents
@@ -719,6 +728,7 @@ Permission95=Consulter CA, bilans et résultats
 Permission101=Consulter les expéditions
 Permission102=Créer/modifier les expéditions
 Permission104=Valider les expéditions
+Permission105=Envoyer les fiches expéditions par e-mail
 Permission106=Exporter les expéditions
 Permission109=Supprimer les expéditions
 Permission111=Consulter les comptes financiers (comptes bancaires, caisses)
@@ -826,10 +836,11 @@ Permission402=Créer/modifier les avoirs
 Permission403=Valider les avoirs
 Permission404=Supprimer les avoirs
 Permission430=Utilisez la barre de débogage
-Permission511=Lire les règlements de salaires
+Permission511=Lire ses paiements de salaires (le vôtres et ceux de vos subordonnées)
 Permission512=Créer/modifier les règlements de salaires
 Permission514=Supprimer les paiements de salaires
-Permission517=Exporter les salaires
+Permission517=Lire les paiements de salaires de tout le monde
+Permission519=Exporter les salaires
 Permission520=Consulter les emprunts
 Permission522=Créer/Modifier les emprunts
 Permission524=Supprimer les emprunts
@@ -840,16 +851,19 @@ Permission532=Créer/modifier les services
 Permission534=Supprimer les services
 Permission536=Voir/gérer les services cachés
 Permission538=Exporter les services
-Permission561=Read payment orders by credit transfer
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
-Permission564=Record Debits/Rejections of credit transfer
+Permission561=Lire les ordres de paiement par virement
+Permission562=Créer / modifier les ordres de paiement par virement bancaire
+Permission563=Envoyer/transmettre les ordres de paiement par virement bancaire
+Permission564=Enregistrer les débits / refus de virement
+Permission601=Lire les étiquettes
+Permission602=Créer/Modifier les étiquettes
+Permission609=Supprimer les étiquettes
 Permission650=Lire les Nomenclatures (BOM)
 Permission651=Créer/modifier les Nomenclatures (BOM)
 Permission652=Supprimer les Nomenclatures (BOM)
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
+Permission660=Lire les ordres de fabrication (OF)
+Permission661=Créer/mettre à jour les ordres de fabrication (OF)
+Permission662=Supprimer les ordres de fabrication (OF)
 Permission701=Consulter les dons
 Permission702=Créer/modifier les dons
 Permission703=Supprimer les dons
@@ -859,8 +873,8 @@ Permission773=Supprimer les notes de frais
 Permission774=Lire toutes les notes de frais (même pour les utilisateurs en dehors de ma hierarchie)
 Permission775=Approuver les notes de frais
 Permission776=Payer les notes de frais
-Permission777=Read expense reports of everybody
-Permission778=Create/modify expense reports of everybody
+Permission777=Lisez les notes de frais de tout le monde
+Permission778=Créer / modifier les notes de frais de tout le monde
 Permission779=Exporter les notes de frais
 Permission1001=Consulter les stocks
 Permission1002=Créer/modifier entrepôts
@@ -885,7 +899,9 @@ Permission1185=Approuver les commandes fournisseurs
 Permission1186=Commander les commandes fournisseur
 Permission1187=Réceptionner les commandes fournisseurs
 Permission1188=Supprimer les commandes fournisseur
+Permission1189=Vérifier les réceptions de commandes fournisseurs
 Permission1190=Approuver les commandes fournisseur (second niveau)
+Permission1191=Exporter les commandes fournisseurs et leurs attributs
 Permission1201=Récupérer le résultat d'un export
 Permission1202=Créer/modifier un export
 Permission1231=Consulter les factures fournisseur
@@ -899,6 +915,8 @@ Permission1251=Lancer des importations en masse dans la base (chargement de donn
 Permission1321=Exporter les factures clients, attributs et règlements
 Permission1322=Rouvrir une facture payée
 Permission1421=Exporter les commandes clients et attributs
+Permission1521=Lire les documents
+Permission1522=Supprimer les documents
 Permission2401=Lire les actions (événements ou tâches) liées à son compte utilisateur (si propriétaire de l’événement ou simplement assigné à l'événement)
 Permission2402=Créer/modifier des actions (événements ou tâches) liées à son compte utilisateur (si propriétaire de l'événement)
 Permission2403=Supprimer des actions (événements ou tâches) liées à son compte utilisateur (si propriétaire de l'événement)
@@ -913,7 +931,7 @@ Permission2515=Administrer les rubriques de documents
 Permission2801=Utiliser un client FTP en mode lecture (parcours et téléchargement de fichiers)
 Permission2802=Utiliser un client FTP en mode écriture (suppression et envoi de fichiers)
 Permission3200=Lire les événements archivés et leurs empreintes
-Permission3301=Generate new modules
+Permission3301=Générer de nouveaux modules
 Permission4001=Voir les employés
 Permission4002=Créer/modifier les employés
 Permission4003=Supprimer les employés
@@ -933,9 +951,13 @@ Permission23001=Voir les travaux planifiés
 Permission23002=Créer/Modifier des travaux planifiées
 Permission23003=Effacer travail planifié
 Permission23004=Exécuter travail planifié
-Permission50101=Utiliser le point de vente
+Permission50101=Utiliser le Point De Vente (SimplePOS)
+Permission50151=Utiliser le Point de Vente (TakePOS)
 Permission50201=Consulter les transactions
 Permission50202=Importer les transactions
+Permission50330=Lire les objets de Zapier
+Permission50331=Créer/modifier les objets de Zapier
+Permission50332=Supprimer les objets de Zapier
 Permission50401=Lier les produits et factures avec des comptes comptables
 Permission50411=Lire les opérations du Grand livre
 Permission50412=Créer/modifier des opérations dans le Grand livre
@@ -959,6 +981,17 @@ Permission63001=Lire les ressources
 Permission63002=Créer/modifier les ressources
 Permission63003=Supprimer les ressources
 Permission63004=Lier les ressources aux événements de l'agenda
+Permission64001=Autoriser l'impression directe
+Permission67000=Autoriser l'impression des bons de réceptions
+Permission68001=Lire les déclarations d'échanges intracommunautaires
+Permission68002=Créer/modifier les déclarations d'échanges intracommunautaires
+Permission68004=Supprimer les déclarations d'échanges intracommunautaires
+Permission941601=Lire les fiches de réceptions
+Permission941602=Créer et modifier les reçus
+Permission941603=Valider les fiches de réception
+Permission941604=Envoyer les fiches d'expéditions par e-mails
+Permission941605=Exporter les fiches d'expéditions
+Permission941606=Supprimer les bons de réceptions
 DictionaryCompanyType=Type de Tiers
 DictionaryCompanyJuridicalType=Formes juridiques des Tiers
 DictionaryProspectLevel=Niveau de prospection des sociétés
@@ -998,6 +1031,8 @@ DictionaryHolidayTypes=Type de congés
 DictionaryOpportunityStatus=Statut d'opportunités pour les affaires/projets
 DictionaryExpenseTaxCat=Note de frais - catégories de déplacement
 DictionaryExpenseTaxRange=Note de frais - Tri par catégorie de déplacement
+DictionaryTransportMode=Déclaration d'échanges intracommunautaires - Mode de transport
+TypeOfUnit=Type d'unité
 SetupSaved=Configuration sauvegardée
 SetupNotSaved=Configuration non enregistrée
 BackToModuleList=Retour liste des modules
@@ -1048,6 +1083,7 @@ LabelUsedByDefault=Libellé qui sera utilisé si aucune traduction n'est trouvé
 LabelOnDocuments=Libellé sur les documents
 LabelOrTranslationKey=Libellé ou clé de traduction
 ValueOfConstantKey=Valeur de constante de configuration
+ConstantIsOn=L'option %s est activée
 NbOfDays=Nb. de jours
 AtEndOfMonth=En fin de mois
 CurrentNext=Current/Next
@@ -1146,6 +1182,7 @@ InfoWebServer=Infos web server
 InfoDatabase=Infos base de données
 InfoPHP=Infos PHP
 InfoPerf=Infos performances
+InfoSecurity=Infos sécurité
 BrowserName=Nom du navigateur
 BrowserOS=OS du navigateur
 ListOfSecurityEvents=Liste des événements de sécurité Dolibarr
@@ -1195,7 +1232,8 @@ RestoreDesc=Pour restaurer une sauvegarde Dolibarr, deux étapes sont nécessair
 RestoreDesc2=Restaurez le fichier archive (fichier zip par exemple) du répertoire "documents" en extrayant son contenu dans le répertoire documents d'une nouvelle installation de Dolibarr ou dans le répertoire documents de cette installation (<b>%s</b>).
 RestoreDesc3=Restaurez les données, depuis le fichier "dump" de sauvegarde, dans  la base de données d'une nouvelle installation de Dolibarr ou de cette instance en cours (<b>%s</b>). Attention, une fois la restauration faite, il faudra utiliser un identifiant/mot de passe administrateur existant à l'époque de la sauvegarde pour se connecter. Pour restaurer la base dans l'installation actuelle, vous pouvez utiliser l'assistant suivant.
 RestoreMySQL=Importation MySQL
-ForcedToByAModule= Cette règle est forcée à <b>%s</b> par un des modules activés
+ForcedToByAModule=Cette règle est forcée à <b>%s</b> par un des modules activés
+ValueIsForcedBySystem=Cette valeur est imposée par le système. Sa modification n'est pas permise.
 PreviousDumpFiles=Fichiers de sauvegarde de base de données existant
 PreviousArchiveFiles=Fichiers d'archive existants
 WeekStartOnDay=Premier jour de la semaine
@@ -1276,6 +1314,7 @@ PHPModuleLoaded=Le composant PHP %s est chargé
 PreloadOPCode=Le code OP préchargé est utilisé
 AddRefInList=Afficher les références client/fournisseur dans les listes (listes déroulantes ou à autocomplétion) et les libellés des liens clicables.<br>Les tiers apparaîtront alors sous la forme "CC12345 - SC45678 - La big company coorp", au lieu de "La big company coorp".
 AddAdressInList=Affiche les informations sur l’adresse du client/fournisseur (liste de sélection ou liste déroulante) <br> Les tiers apparaîtront avec le format de nom suivant: "The Big Company corp. - 21, rue du saut 123456 Big town - USA" au lieu de "The Big Company corp".
+AddEmailPhoneTownInContactList=Afficher l'adresse e-mail du contact (ou les téléphones si non définis) et la ville <br> Les contacts apparaîtront avec un nom au format "Dupond Durand - dupond.durand@email.com - Paris" ou "Dupond Durand - 06 07 59 65 66 - Paris" au lieu de "Dupond Durand".
 AskForPreferredShippingMethod=Demander la méthode d'expédition préférée pour les Tiers
 FieldEdition=Édition du champ %s
 FillThisOnlyIfRequired=Exemple: +2 (ne remplir que si un décalage d'heure est constaté dans l'export)
@@ -1283,7 +1322,7 @@ GetBarCode=Récupérer code barre
 NumberingModules=Modèles de numérotation
 DocumentModules=Modèles de documents
 ##### Module password generation
-PasswordGenerationStandard=Renvoie un mot de passe généré selon l'algorithme interne de Dolibarr : 8 caractères, chiffres et caractères en minuscules mélangés.
+PasswordGenerationStandard=Renvoie un mot de passe généré selon l'algorythme interne de Dolibarr :%s caractères contenant chiffres et minuscules
 PasswordGenerationNone=Ne pas suggérer un mot de passe généré. Le mot de passe doit être entré manuellement. 
 PasswordGenerationPerso=Retourner un mot de passe en fonction de votre configuration personnellement défini.
 SetupPerso=Selon votre configuration
@@ -1382,6 +1421,7 @@ AdherentMailRequired=Email obligatoire pour créer un nouvel adhérent
 MemberSendInformationByMailByDefault=Case à cocher pour envoyer un email de confirmation (validation ou nouvelle cotisation) aux adhérents est à oui par défaut.
 VisitorCanChooseItsPaymentMode=Le visiteur peut choisir parmi les modes de paiement disponibles
 MEMBER_REMINDER_EMAIL=Activer le rappel automatique <b> par e-mail </b> des adhésions expirées. Remarque: le module <strong> %s </strong> doit être activé et configuré correctement pour qu'un rappel soit envoyé.
+MembersDocModules=Modèle de document pour le document généré depuis la fiche d'un adhérent
 ##### LDAP setup #####
 LDAPSetup=Configuration du module LDAP
 LDAPGlobalParameters=Paramètres globaux
@@ -1524,7 +1564,9 @@ LDAPDescValues=Les valeurs exemples sont adaptées à <b>OpenLDAP</b> avec les s
 ForANonAnonymousAccess=Pour un accès authentifié (pour accès en écriture par exemple)
 PerfDolibarr=Rapport de configuration/optimisation sur la performance
 YouMayFindPerfAdviceHere=Sur cette page vous trouverez quelques indicateurs ou conseils pour optimiser la performance.
-NotInstalled=Non installé, aussi votre serveur n'est pas ralentit par cela.
+NotInstalled=Non installé.
+NotSlowedDownByThis=Non ralenti par cela.
+NotRiskOfLeakWithThis=Pas de risque de fuite de données avec cela.
 ApplicativeCache=Cache applicatif
 MemcachedNotAvailable=Aucun cache applicatif trouvé. Vous pouvez accélérer les performances de Dolibarr en installant un serveur de cache Memcached et un module de cache applicatif exploitant ce serveur.<br>Plus d'info sur la page <a href="http://wiki.dolibarr.org/index.php/Module_MemCached">http://wiki.dolibarr.org/index.php/Module_MemCached</a>. Notez que de nombreux hébergeurs low-cost ne fournissent pas de tels serveurs de cache dans leur infrastructure.
 MemcachedModuleAvailableButNotSetup=Le module memcached pour le cache applicatif a été trouvé mais la configuration de ce module n'est pas complète.
@@ -1572,9 +1614,9 @@ SyslogLevel=Niveau
 SyslogFilename=Nom et chemin du fichier
 YouCanUseDOL_DATA_ROOT=Vous pouvez utiliser DOL_DATA_ROOT/dolibarr.log pour un journal dans le répertoire "documents" de Dolibarr. Vous pouvez néanmoins définir un chemin différent pour stocker ce fichier.
 ErrorUnknownSyslogConstant=La constante %s n'est pas une constante syslog connue
-OnlyWindowsLOG_USER=Windows ne prend en charge que LOG_USER
+OnlyWindowsLOG_USER=Sur Windows, seule la facility LOG_USER est prise en charge
 CompressSyslogs=Compression et sauvegarde des fichiers journaux de débogage (générés par le module Log pour le débogage)
-SyslogFileNumberOfSaves=Sauvegardes de Log
+SyslogFileNumberOfSaves=Nombre de fichiers de sauvegarde à conserver
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configurer le travail planifié de nettoyage pour définir la fréquence de sauvegarde de log
 ##### Donations #####
 DonationsSetup=Configuration du module Dons
@@ -1630,7 +1672,7 @@ AdvancedEditor=Editeur avancé
 ActivateFCKeditor=Activer l'éditeur avancé pour :
 FCKeditorForCompany=Création/édition WYSIWIG de la description et note des éléments (autre que produits/services)
 FCKeditorForProduct=Création/édition WYSIWIG de la description et note des produits/services
-FCKeditorForProductDetails=Création/édition WYSIWIG des lignes détails produits sur tous les éléments (commandes, propales, factures, etc...). <font class="warning">Attention: L'utilisation pour ce cas est fortement déconseillée car peut poser des problèmes dans la gestion de caractères et mise en page des fichiers PDF générés.</font>
+FCKeditorForProductDetails=Création/édition WYSIWYG des lignes de détails produits sur tous les éléments (commandes, propales, factures, etc...). <span class="warning">Attention: L'utilisation pour ce cas est fortement déconseillée car peut créer des problèmes dans la gestion de caractères et mise en page des fichiers PDF générés.</span>
 FCKeditorForMailing= Création/édition WYSIWIG des emailings (Outils->Emailings)
 FCKeditorForUserSignature=Création/édition WYSIWIG de la signature des utilisateurs
 FCKeditorForMail=Création/édition WYSIWIG tous les emails (sauf Outils->Emailings)
@@ -1640,11 +1682,11 @@ StockSetup=Configuration du module Stock / Entrepôt
 IfYouUsePointOfSaleCheckModule=Si vous utilisez un module Point de Vente (module POS fourni par défaut ou un autre module externe), cette configuration peut être ignoré par votre module point de vente. La plupart de modules Point de Vente sont conçus pour créer immédiatement une facture et de réduire les stocks par défaut quelles que soient les options ici. Donc, si vous avez besoin ou non d'avoir une diminution du stock lors de l'enregistrement d'une vente dans votre Point de Vente, vérifiez également la configuration de votre module POS.
 ##### Menu #####
 MenuDeleted=Menu supprimé
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Menus personnalisés
 NotTopTreeMenuPersonalized=Menus personalisés non liés à un menu haut
 NewMenu=Nouveau menu
-Menu=Sélection des menus
 MenuHandler=Gestionnaire de menu
 MenuModule=Module source
 HideUnauthorizedMenu= Masquer les menus non autorisés aussi pour les utilisateurs internes (sinon juste grisés)
@@ -1664,7 +1706,7 @@ DetailLevel=Niveau (-1:menu haut, 0:entête menu, >0 menu et sous menu)
 ModifMenu=Modification du menu
 DeleteMenu=Effacer entrée de menu
 ConfirmDeleteMenu=Êtes-vous sûr de vouloir supprimer l'entrée de menu <b>%s</b> ?
-FailedToInitializeMenu=Échec à inisialiser le menu
+FailedToInitializeMenu=L'initialisation du menu a échouée
 ##### Tax #####
 TaxSetup=Configuration du module TVA, charges fiscales ou sociales et dividendes
 OptionVatMode=Option d'exigibilité de TVA par défaut
@@ -1696,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Configurez automatiquement cette valeur par défau
 AGENDA_DEFAULT_FILTER_TYPE=Positionner automatiquement ce type d'événement dans le filtre de recherche de la vue agenda
 AGENDA_DEFAULT_FILTER_STATUS=Positionner automatiquement ce statut d'événement dans le filtre de recherche de la vue agenda
 AGENDA_DEFAULT_VIEW=Quel onglet voulez-vous voir ouvrir par défaut quand on choisit le menu Agenda
-AGENDA_REMINDER_EMAIL=Activer le rappel d'événement <b> par e-mail </b> (l'option de rappel / délai peut être défini pour chaque événement). Remarque: Le module <strong> %s </strong> doit être activé et configuré correctement pour que le rappel soit envoyé à la bonne fréquence.
-AGENDA_REMINDER_BROWSER=Activer le rappel d'événement <b> sur le navigateur de l'utilisateur </b> (lorsque la date de l'événement est atteinte, chaque utilisateur peut le refuser à partir de la question de confirmation du navigateur)
+AGENDA_REMINDER_BROWSER=Activer le rappel d'événement <b> sur le navigateur de l'utilisateur </b> (lorsque la date de l'événement est atteinte, une popup est affichée sur la navigateur. Chaque utilisateur peut désactiver de telles notification depuis la configuration des notifications de son navigateur)
 AGENDA_REMINDER_BROWSER_SOUND=Activer les notifications sonores.
+AGENDA_REMINDER_EMAIL=Activer le rappel d'événement <b> par e-mail </b> (l'option de rappel / délai peut être défini pour chaque événement).
+AGENDA_REMINDER_EMAIL_NOTE=Note : la fréquence d'exécution de la tâche %s doit être suffisante pour être sûr que le rappel soit envoyé au bon moment..
 AGENDA_SHOW_LINKED_OBJECT=Afficher l'objet lié dans la vue agenda
 ##### Clicktodial #####
 ClickToDialSetup=Configuration du module Click To Dial
@@ -1795,7 +1838,6 @@ TypePaymentDesc=0:Type paiement client, 1:Type paiement fournisseur, 2:Type paie
 IncludePath=Chemin Include (défini dans la variable %s)
 ExpenseReportsSetup=Configuration du module Notes de frais
 TemplatePDFExpenseReports=Modèles de documents pour générer les document de Notes de frais
-ExpenseReportsIkSetup=Configuration du module Notes de frais - Index des frais kilométriques
 ExpenseReportsRulesSetup=Configuration du module Notes de frais - Règles
 ExpenseReportNumberingModules=Modèle de numérotation des notes de frais
 NoModueToManageStockIncrease=Aucun module capable d'assurer l'augmentation de stock en automatique a été activé. La réduction de stock se fera donc uniquement sur mise à jour manuelle.
@@ -1823,11 +1865,11 @@ BackgroundColor=Couleur de fond
 TopMenuBackgroundColor=Couleur de fond pour le menu Haut
 TopMenuDisableImages=Cacher les images du menu principal
 LeftMenuBackgroundColor=Couleur de fond pour le menu Gauche
-BackgroundTableTitleColor=Couleur de fond pour la ligne de titres des liste/tableaux
+BackgroundTableTitleColor=Couleur de fond pour la ligne de titres des listes/tableaux
 BackgroundTableTitleTextColor=Couleur du texte pour la ligne de titre des tableaux
 BackgroundTableTitleTextlinkColor=Couleur du texte pour la ligne des titres liens des tableaux
 BackgroundTableLineOddColor=Couleur de fond pour les lignes impaires des tables
-BackgroundTableLineEvenColor=Couleur de fond pour les lignes paires des tales
+BackgroundTableLineEvenColor=Couleur de fond pour les lignes paires des tables
 MinimumNoticePeriod=Période de préavis minimum (Votre demande de congé doit être faite avant ce délai)
 NbAddedAutomatically=Nombre de jours ajoutés aux compteurs des utilisateurs (automatiquement) chaque mois
 EnterAnyCode=Ce champ contient une référence pour identifier le champ. Entrez une valeur de votre choix, mais sans caractères spéciaux.
@@ -1961,6 +2003,8 @@ LoadThirdPartyFromName=Charger le Tiers en cherchant sur %s (chargement uniqueme
 LoadThirdPartyFromNameOrCreate=Charger le Tiers en cherchant sur %s (créer si non trouvé)
 WithDolTrackingID=Message d'une conversation initiée par un premier mail envoyé depuis Dolibarr
 WithoutDolTrackingID=Message d'une conversation initiée par un premier e-mail NON envoyé depuis Dolibarr
+WithDolTrackingIDInMsgId=Message envoyé depuis Dolibarr
+WithoutDolTrackingIDInMsgId=Message NON envoyé depuis Dolibarr
 CreateCandidature=Créer une candidature
 FormatZip=Zip
 MainMenuCode=Code d'entrée du menu (mainmenu)
@@ -1975,7 +2019,7 @@ DisabledResourceLinkContact=Désactiver la fonctionnalité pour lier une ressour
 EnableResourceUsedInEventCheck=Activer la fonctionnalité pour vérifier si une ressource est utilisée dans un événement
 ConfirmUnactivation=Confirmer réinitialisation du module
 OnMobileOnly=Sur petit écran (smartphone) uniquement
-DisableProspectCustomerType=Désactiver le type de tiers "Prospect + Client" (le tiers doit donc être un client potentiel ou un client, mais ne peut pas être les deux)
+DisableProspectCustomerType=Désactive le type de tiers "Prospect + Client" (les tiers seront donc "Prospect" OU "Client", mais ne peuvent être les deux).
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplifier l'interface pour les malvoyants
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Activez cette option si vous êtes une personne malvoyante ou si vous utilisez l'application à partir d'un navigateur de texte tel que Lynx ou Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Changer la couleur de l'interface pour daltoniens
@@ -1997,13 +2041,15 @@ UseDebugBar=Utilisez la barre de débogage
 DEBUGBAR_LOGS_LINES_NUMBER=Nombre de dernières lignes de logs à conserver dans la console
 WarningValueHigherSlowsDramaticalyOutput=Attention, les valeurs élevées ralentissent considérablement les affichages
 ModuleActivated=Le module %s est activé et ralentit l'interface
+IfYouAreOnAProductionSetThis=Sur un environnement de production, vous devriez régler ce paramètre sur %s.
+AntivirusEnabledOnUpload=Antivirus activé sur le téléversement des fichiers
 EXPORTS_SHARE_MODELS=Les modèles d'exportation sont partagés avec tout le monde
 ExportSetup=Configuration du module Export
 ImportSetup=Configuration du module Import
 InstanceUniqueID=ID unique de l'instance
 SmallerThan=Plus petit que
 LargerThan=Plus grand que
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Notez que si un ID de suivi d'un objet est trouvé dans le courrier électronique, ou si l'email est une réponse d'un email déjà collecté et lié à un objet, l'événement sera aussi automatiquement lié à l'objet en question.
 WithGMailYouCanCreateADedicatedPassword=Avec un compte GMail, si vous avez activé la validation en 2 étapes, il est recommandé de créer un deuxième mot de passe dédié à l'application, au lieu d'utiliser votre propre mot de passe de compte, à partir de https://myaccount.google.com/.
 EmailCollectorTargetDir=Il peut être souhaitable de déplacer l'e-mail dans un autre tag/répertoire lorsqu'il a été traité avec succès. Définissez simplement une valeur ici pour utiliser cette fonction (N'utilisez PAS de caractères spéciaux dans le nom). Notez que vous devez également utiliser un compte de connexion en lecture/écriture.
 EmailCollectorLoadThirdPartyHelp=Vous pouvez utiliser cette action pour utiliser le contenu de l'e-mail pour rechercher et charger un tiers existant dans votre base de données. Le tiers trouvé (ou créé) sera utilisée pour les actions suivantes qui en ont besoin. Dans le champ 'Paramètre', vous pouvez utiliser par exemple 'EXTRACT: BODY:Name:\\s([^\\s]*)' si vous souhaitez extraire le nom du tiers d'une chaîne 'Name: nom du tiers' trouvé dans le corps du message.
@@ -2025,9 +2071,15 @@ FafaIconSocialNetworksDesc=Entrez ici le code d'une icône FontAwesome. Si vous
 FeatureNotAvailableWithReceptionModule=Fonction non disponible lorsque le module Réception est activée
 RssNote=Remarque: Chaque définition de flux RSS fournit un widget que vous devez activer pour qu'il soit disponible dans le tableau de bord
 JumpToBoxes=Aller à la Configuration -> Widgets
-MeasuringUnitTypeDesc=Utilisez ici une valeur comme "taille", "surface", "volume", "poids", "temps"
+MeasuringUnitTypeDesc=Utilisez ici une valeur comme "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=L'échelle est le nombre de positions où vous devez déplacer la partie décimale pour qu'elle corresponde à l'unité de référence par défaut. Pour le type d'unité "temps", c'est le nombre de secondes. Les valeurs comprises entre 80 et 99 sont des valeurs réservées.
 TemplateAdded=Modèle ajouté
 TemplateUpdated=Modèle mis à jour
 TemplateDeleted=Modèle supprimé
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Rappel d'événement par e-mail
+SwitchThisForABetterSecurity=Remplacer cette valeur par %s est recommandé pour plus de sécurité
+DictionaryProductNature= Nature de produit
+CountryIfSpecificToOneCountry=Pays (si spécifique à un pays donné)
+YouMayFindSecurityAdviceHere=Trouvez ici des conseils de sécurité.
+ModuleActivatedMayExposeInformation=Ce module peut exposer des données sensibles. Si il n'est pas nécessaire, désactivez-le.
+ModuleActivatedDoNotUseInProduction=Un module conçu pour le développement a été activé. Ne l'activez pas sur un environnement de production
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index 6e6d0e26b4a..17a6d56823f 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Paiement divers
 VariousPayments=Opérations diverses
 ShowVariousPayment=Afficher les paiements divers
 AddVariousPayment=Créer paiement divers
+VariousPaymentId=Identifiant du paiement divers
+VariousPaymentLabel=Libellé de paiement divers
+ConfirmCloneVariousPayment=Confirmation du clonage du paiement divers
 SEPAMandate=Mandat SEPA
 YourSEPAMandate=Votre mandat SEPA
 FindYourSEPAMandate=Voici votre mandat SEPA pour autoriser notre société à réaliser les prélèvements depuis votre compte bancaire. Merci de retourner ce mandat signé (scan du document signé) ou en l'envoyant par courrier à 
@@ -176,3 +179,4 @@ BankColorizeMovement=Coloriser les mouvements
 BankColorizeMovementDesc=Si cette fonction est activée, vous pouvez choisir une couleur de fond spécifique pour les mouvements de débit ou de crédit.
 BankColorizeMovementName1=Couleur de fond pour les mouvements de débit
 BankColorizeMovementName2=Couleur de fond pour le mouvement de crédit
+IfYouDontReconcileDisableProperty=Si vous ne réalisez pas le rapprochement bancaire sur certains comptes bancaires, désactivez la fonctionnalité "%s" pour ne plus afficher cette alerte.
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 5da6bda8133..b5588c21df3 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -43,7 +43,7 @@ ConsumedBy=Consommé par
 NotConsumed=Non consommé
 NoReplacableInvoice=Pas de facture remplaçable
 NoInvoiceToCorrect=Pas de facture à corriger
-InvoiceHasAvoir=Cette facture a déjà fait l'objet d'un ou plusieurs avoirs.
+InvoiceHasAvoir=Cette facture a déjà fait l'objet d'avoirs
 CardBill=Fiche facture
 PredefinedInvoices=Facture modèles
 Invoice=Facture
@@ -58,7 +58,7 @@ SuppliersInvoices=Factures fournisseurs
 SupplierBill=Facture fournisseur
 SupplierBills=Factures fournisseurs
 Payment=Règlement
-PaymentBack=Rembourser
+PaymentBack=Remboursement
 CustomerInvoicePaymentBack=Rembourser
 Payments=Règlements
 PaymentsBack=Remboursements
@@ -212,7 +212,7 @@ AmountOfBillsByMonthHT=Montant de factures par mois (HT)
 UseSituationInvoices=Autoriser les factures de situation
 UseSituationInvoicesCreditNote=Autoriser les avoirs de factures de situation
 Retainedwarranty=Retenue de garantie
-AllowedInvoiceForRetainedWarranty=Rendre la retenue de garantie utilisable sur les types de factures suivants
+AllowedInvoiceForRetainedWarranty=Garantie conservée utilisable sur les types de factures suivants
 RetainedwarrantyDefaultPercent=Pourcentage par défaut de la retenue de garantie
 RetainedwarrantyOnlyForSituation=Rendre la "retenue de garantie" disponible uniquement pour les factures de situation
 RetainedwarrantyOnlyForSituationFinal=Sur les factures de situation, la déduction globale pour "retenue de garantie" n'est appliquée que sur la facture de situation finale
@@ -531,6 +531,7 @@ TypeContact_invoice_supplier_external_SERVICE=Contact fournisseur prestation
 InvoiceFirstSituationAsk=Première facture de situation
 InvoiceFirstSituationDesc=Les <b>factures de situation</b> sont des factures établies en fonction d'un état d'avancement, par exemple, une progression de construction de bâtiment. Chaque point de situation donne lieu à une facture.
 InvoiceSituation=Facture de situation
+PDFInvoiceSituation=Facture de situation
 InvoiceSituationAsk=Facture suivant situation
 InvoiceSituationDesc=Créer une nouvelle situation à la suite d'un autre
 SituationAmount=Montant de facture de situation (HT)
@@ -575,3 +576,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Facture fournisseur supprimée
 UnitPriceXQtyLessDiscount=Prix unitaire x Qté - Remise
 CustomersInvoicesArea=Zone de facturation client
 SupplierInvoicesArea=Zone de facturation fournisseur
+FacParentLine=Ligne de facture parente
+SituationTotalRayToRest=Reste à payer HT
+PDFSituationTitle=Situation n°%d
+SituationTotalProgress=Avancement total %d %%
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index a7aa6836bdc..580e98a38e9 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Configuration des tags/catégories
 CategorieRecursiv=Lier automatiquement avec le(a) tag/catégorie parent(e)
 CategorieRecursivHelp=Si l'option est activé, quand un produit est ajouté dans une sous-catégorie, le produit sera ajouté aussi dans la catégorie parente.
 AddProductServiceIntoCategory=Ajouter le produit/service suivant
+AddCustomerIntoCategory=Assigner cette catégorie au client
+AddSupplierIntoCategory=Assigner cette catégorie au fournisseur
 ShowCategory=Afficher tag/catégorie
 ByDefaultInList=Par défaut dans la liste
 ChooseCategory=Choisissez une catégorie
-StocksCategoriesArea=Espace Catégories d'entrepôts
-ActionCommCategoriesArea=Espace catégories d'événements
-WebsitePagesCategoriesArea=Espace catégories des Pages-Containeurs
+StocksCategoriesArea=Catégories d'entrepôts
+ActionCommCategoriesArea=Catégories d'évènements
+WebsitePagesCategoriesArea=Catégories des pages-conteneurs
 UseOrOperatorForCategories=Utiliser l'opérateur 'ou' pour les catégories
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index f2e509ecb91..1fc19440a1c 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Id. prof. 1 (USt.-IdNr)
 ProfId2AT=Id. prof. 2 (USt.-Nr)
 ProfId3AT=Id. prof. 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=Numéro EORI
 ProfId6AT=-
 ProfId1AU=Id. prof. 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Id. prof. 1 (N° professionnel)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=Numéro EORI
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Numéro fédéral
 ProfId4CH=Num. registre du commerce
-ProfId5CH=-
+ProfId5CH=Numéro EORI
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Id. prof. 1 (USt.-IdNr)
 ProfId2DE=Id. prof. 2 (USt.-Nr)
 ProfId3DE=Id. prof. 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=Numéro EORI
 ProfId6DE=-
 ProfId1ES=Id. prof. 1 (CIF/NIF)
 ProfId2ES=Id. prof. 2 (Num. sécurité social)
 ProfId3ES=Id. prof. 3 (CNAE)
 ProfId4ES=Id. prof. 4 (Num. Collégiale)
-ProfId5ES=-
+ProfId5ES=Numéro EORI
 ProfId6ES=-
 ProfId1FR=Id. prof. 1 (SIREN)
 ProfId2FR=Id. prof. 2 (SIRET)
 ProfId3FR=Id. prof. 3 (NAF-APE)
 ProfId4FR=Id. prof. 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=Numéro EORI
 ProfId6FR=-
 ProfId1GB=Numéro d'enregistrement
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Id. prof. 3 (SRVC TAX)
 ProfId4IN=Id. prof. 4
 ProfId5IN=Id. prof. 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=Numéro EORI
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=Numéro EORI
 ProfId6LU=-
 ProfId1MA=Id. prof. 1 (R.C.)
 ProfId2MA=Id. prof. 2 (Patente)
 ProfId3MA=Id. prof. 3 (I.F.)
 ProfId4MA=Id. prof. 4 (C.N.S.S.)
-ProfId5MA=Id prof. 5 (I.C.E.)
+ProfId5MA=Identifiant Commun de l’Entreprise (ICE)
 ProfId6MA=-
 ProfId1MX=Id. prof. 1 (R.F.C).
 ProfId2MX=ID. prof. 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=Numéro EORI
 ProfId6NL=-
 ProfId1PT=Id. prof. 1 (NIPC)
 ProfId2PT=Id. prof. 2 (Num. sécurité social)
 ProfId3PT=Id. prof. 3 (Num. enreg. commercial)
 ProfId4PT=Id. prof. 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=Numéro EORI
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Id. prof. 1 (CUI)
 ProfId2RO=Id. prof. 2 (Nr. Înmatriculare)
 ProfId3RO=Id. prof. 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Id prof 5 (EUID)
+ProfId4RO=Id prof 5 (EUID)
+ProfId5RO=Numéro EORI
 ProfId6RO=-
 ProfId1RU=Id. prof.1 (OGRN)
 ProfId2RU=Id. prof.2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=Vous pouvez aussi vérifier manuellement via le site de la c
 ErrorVATCheckMS_UNAVAILABLE=Vérification impossible. Le service de vérification n'est pas fourni par ce pays membre (%s).
 NorProspectNorCustomer=Ni client, ni prospect
 JuridicalStatus=Type d'entité légale
+Workforce=Effectifs
 Staff=Salariés
 ProspectLevelShort=Potentiel
 ProspectLevel=Potentiel du prospect
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Conditions de paiement - fournisseur
 PaymentTypeBoth=Type de paiement - Client et fournisseur
 MulticurrencyUsed=Utiliser plusieurs devises
 MulticurrencyCurrency=Devise
+InEEC=Union Européenne (UE)
+RestOfEurope=Reste de l'Union Européenne (UE)
+OutOfEurope=Hors Union Européenne (UE)
+CurrentOutstandingBillLate=Montant impayé arrivé à échéance
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Attention : selon votre configuration des prix des produits/services, vous devriez changer le tiers avant d'ajouter le produit
diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang
index 38c6d34650d..b154c5de72c 100644
--- a/htdocs/langs/fr_FR/cron.lang
+++ b/htdocs/langs/fr_FR/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Supprimer une tâche planifiée
 Permission23104 = Exécuter une tâche planifiée
 # Admin
 CronSetup=Page de configuration du module - Gestion des travaux programmés
-URLToLaunchCronJobs=URL pour vérifier ou lancer les travaux planifiés qualifiés
-OrToLaunchASpecificJob=Ou pour vérifier et lancer un travail programmé spécifique
+URLToLaunchCronJobs=URL pour vérifier et lancer les travaux planifiés qualifiés depuis un navigateur
+OrToLaunchASpecificJob=Ou pour vérifier et lancer une tâche planifiée spécifique depuis un navigateur
 KeyForCronAccess=Clé de sécurité pour l'URL de lancement des travaux programmés
 FileToLaunchCronJobs=Ligne de commande pour vérifier et lancer les travaux programmés qualifiés
 CronExplainHowToRunUnix=Sur un environnement Unix vous pouvez utiliser l'entrée suivante en crontab pour exécuter la ligne de commande toutes les 5 minutes
 CronExplainHowToRunWin=Sous Microsoft (tm) Windows, vous pouvez utiliser les outils Tâches programmées pour exécuter la ligne de commande toutes les 5 minutes.
 CronMethodDoesNotExists=La classe %s ne contient aucune méthode %s
+CronMethodNotAllowed=La méthode %s de la classe %s est dans la liste noire des méthodes interdites
 CronJobDefDesc=Les travaux planifiés sont définis dans le fichier descripteur de module. Lorsque le module est activé, ils sont chargés et disponibles afin que vous puissiez administrer les travaux à partir du menu des outils d'administration %s.
 CronJobProfiles=Liste des profils de travaux planifiés prédéfinis
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Nb. de lancements
 CronMaxRun=Nb max de lancement
 CronEach=Tous les
 JobFinished=Travail lancé et terminé
+Scheduled=Programmé
 #Page card
 CronAdd= Ajoutez des travaux
 CronEvery=Exécuter chaque tâche
@@ -56,7 +58,7 @@ CronNote=Commentaire
 CronFieldMandatory=Le champ %s est obligatoire
 CronErrEndDateStartDt=La date de fin ne peux être avant la date de début
 StatusAtInstall=Statut lors de l'installation du module
-CronStatusActiveBtn=Activer
+CronStatusActiveBtn=Planifier
 CronStatusInactiveBtn=Désactiver
 CronTaskInactive=Cette tâche est désactivée
 CronId=Id
@@ -81,3 +83,5 @@ JobDisabled=Travail désactivé
 MakeLocalDatabaseDumpShort=Sauvegarde locale de base
 MakeLocalDatabaseDump=Créez un fichier dump de base local. Les paramètres sont: compression ('gz' ou 'bz' ou 'none'), type de sauvegarde ('mysql', 'pgsql', 'auto'), 1, 'auto' ou nom du fichier à générer, nombre de fichiers de sauvegarde à garder
 WarningCronDelayed=Attention, à des fins de performance, quelle que soit la prochaine date d'exécution des travaux activés, vos travaux peuvent être retardés jusqu'à %s heures avant d'être exécutés.
+DATAPOLICYJob=Nettoyeur de données et anonymiseur
+JobXMustBeEnabled=Le poste %s doit être activé
diff --git a/htdocs/langs/fr_FR/deliveries.lang b/htdocs/langs/fr_FR/deliveries.lang
index ff244a08917..29cbd5736cf 100644
--- a/htdocs/langs/fr_FR/deliveries.lang
+++ b/htdocs/langs/fr_FR/deliveries.lang
@@ -27,5 +27,6 @@ Recipient=Destinataire
 ErrorStockIsNotEnough=Le stock est insuffisant
 Shippable=Expédiable
 NonShippable=Non expédiable
+ShowShippableCommand=Afficher statut expédiabilité
 ShowReceiving=Afficher le bon de réception
 NonExistentOrder=Commande inexistante
diff --git a/htdocs/langs/fr_FR/ecm.lang b/htdocs/langs/fr_FR/ecm.lang
index daea9b744da..37fb3ee4a69 100644
--- a/htdocs/langs/fr_FR/ecm.lang
+++ b/htdocs/langs/fr_FR/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Recherche par mots-clés
 ECMSearchByEntity=Recherche par objet
 ECMSectionOfDocuments=Répertoires des documents
 ECMTypeAuto=Automatique
-ECMDocsBySocialContributions=Documents liés aux taxes fiscales ou sociales
-ECMDocsByThirdParties=Documents associés aux tiers
-ECMDocsByProposals=Documents associés aux propositions
-ECMDocsByOrders=Documents associés aux commandes
-ECMDocsByContracts=Documents associés aux contrats
-ECMDocsByInvoices=Documents associés aux factures
-ECMDocsByProducts=Documents associés aux produits
-ECMDocsByProjects=Documents associés aux projets
-ECMDocsByUsers=Documents associés aux utilisateurs
-ECMDocsByInterventions=Documents associés aux interventions
-ECMDocsByExpenseReports=Documents associés aux notes de frais
-ECMDocsByHolidays=Documents liés aux congès
-ECMDocsBySupplierProposals=Documents liés aux propositions fournisseurs
+ECMDocsBy=Documents liés à %s
 ECMNoDirectoryYet=Aucun répertoire créé
 ShowECMSection=Afficher répertoire
 DeleteSection=Suppression répertoire
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resynchroniser la liste des répertoires
 HashOfFileContent=Hash du contenu du fichier
 NoDirectoriesFound=Aucun répertoire trouvé
 FileNotYetIndexedInDatabase=Fichier non indexé dans la base de données. Téléchargez le à nouveau
+ExtraFieldsEcmFiles=Attributs supplémentaires des fichiers de la GED
+ExtraFieldsEcmDirectories=Attributs supplémentaires des dossiers de la GED
+ECMSetup=Configuration du module de gestion de documents (GED)
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 97d3e48f512..abd1c6ec9f9 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -7,6 +7,7 @@ ErrorButCommitIsDone=Erreurs trouvées mais on valide malgré tout
 ErrorBadEMail=email %s invalide
 ErrorBadUrl=Url %s invalide
 ErrorBadValueForParamNotAString=Mauvaise valeur de paramètre. Ceci arrive lors d'une tentative de traduction d'une clé non renseignée.
+ErrorRefAlreadyExists=La référence %s existe déjà.
 ErrorLoginAlreadyExists=L'identifiant %s existe déjà.
 ErrorGroupAlreadyExists=Le groupe %s existe déjà.
 ErrorRecordNotFound=Enregistrement non trouvé.
diff --git a/htdocs/langs/fr_FR/exports.lang b/htdocs/langs/fr_FR/exports.lang
index 3055d51e2ad..3de20e83d20 100644
--- a/htdocs/langs/fr_FR/exports.lang
+++ b/htdocs/langs/fr_FR/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Clé à utiliser pour mettre à jour les données
 NbInsert=Nombre de lignes insérées: %s
 NbUpdate=Nombre de lignes mises à jour: %s
 MultipleRecordFoundWithTheseFilters=Plusieurs enregistrements ont été trouvés avec ces filtres: %s
+StocksWithBatch=Stocks et emplacements (entrepôts) des produits avec numéros de lots/séries
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/hrm.lang b/htdocs/langs/fr_FR/hrm.lang
index 1a009ca38b0..083d42df0b1 100644
--- a/htdocs/langs/fr_FR/hrm.lang
+++ b/htdocs/langs/fr_FR/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=GRH - Liste des fonctions
 Employees=Salariés
 Employee=Salarié
 NewEmployee=Nouveau salarié
+ListOfEmployees=List des salariés
diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang
index aeff546c8e8..29d8c39b8b3 100644
--- a/htdocs/langs/fr_FR/install.lang
+++ b/htdocs/langs/fr_FR/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Le fichier <b>%s</b> n'est pas modifiable. Pour une premi
 ConfFileIsWritable=Le fichier <b>%s</b> est modifiable.
 ConfFileMustBeAFileNotADir=Le fichier de configuration <b> %s </b> doit être un fichier, pas un répertoire.
 ConfFileReload=Rechargement des paramètres depuis le fichier de configuration.
-PHPSupportSessions=Ce PHP prend en charge les sessions.
 PHPSupportPOSTGETOk=Ce PHP prend bien en charge les variables POST et GET.
 PHPSupportPOSTGETKo=Il est possible que votre configuration PHP ne supporte pas les variables POST et / ou GET. Vérifiez le paramètre <b> variables_order </b> dans le fichier php.ini.
-PHPSupportGD=Ce PHP prend en charge les fonctions graphiques GD.
-PHPSupportCurl=PHP supporte l'extension Curl
-PHPSupportCalendar=Ce PHP supporte les extensions calendar.
-PHPSupportUTF8=Ce PHP prend en charge les fonctions UTF8.
-PHPSupportIntl=Ce PHP supporte les fonctions Intl.
-PHPSupportxDebug=Ce PHP prend en charge les fonctions de débogage étendues.
+PHPSupportSessions=Ce PHP prend en charge les sessions.
 PHPSupport=Ce PHP prend en charge les fonctions %s.
 PHPMemoryOK=Votre mémoire maximum de session PHP est définie à <b>%s</b>. Ceci devrait être suffisant.
 PHPMemoryTooLow=Votre mémoire maximum de session PHP est définie à <b>%s</b> octets. Ceci est trop faible. Il est recommandé de modifier le paramètre <b>memory_limit</b> de votre fichier <b>php.ini</b> à au moins <b>%s</b> octets.
diff --git a/htdocs/langs/fr_FR/intracommreport.lang b/htdocs/langs/fr_FR/intracommreport.lang
new file mode 100644
index 00000000000..0142787fc95
--- /dev/null
+++ b/htdocs/langs/fr_FR/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Déclaration d'échanges intracommunautaires
+Module68000Desc = Gestion des déclarations d'échanges intracommunautaires (y compris l'export aux formats DEB/DES des douanes françaises)
+IntracommReportSetup = Configuration du module 'Déclaration des échanges intracommunautaires' - intracommreport
+IntracommReportAbout = A propos du module 'Déclaration des échanges intracommunautaires' - intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditionsa
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Déclaration d'échanges intracommunautaires
+MenuIntracommReportNew=Nouvelle déclaration
+MenuIntracommReportList=Liste
+
+# View
+NewDeclaration=Nouvelle déclaration
+Declaration=Déclaration
+AnalysisPeriod=Période d'analyse
+TypeOfDeclaration=Type de Déclaration
+DEB=Déclaration d'échange de biens (DEB)
+DES=Déclaration d'échange de services (DES)
+
+# Export page
+IntracommReportTitle=Préparation d'un fichier XML au format du portail des Douanes Françaises.
+
+# List
+IntracommReportList=Liste des déclarations produites
+IntracommReportNumber=Numéro de déclaration
+IntracommReportPeriod=Période d'analyse
+IntracommReportTypeDeclaration=Type de Déclaration
+IntracommReportDownload=Télécharger le fichier XML
+
+# Invoice
+IntracommReportTransportMode=Mode de transport
diff --git a/htdocs/langs/fr_FR/languages.lang b/htdocs/langs/fr_FR/languages.lang
index 6cde9682397..12b99eab661 100644
--- a/htdocs/langs/fr_FR/languages.lang
+++ b/htdocs/langs/fr_FR/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Espagnol (Panama)
 Language_es_PY=Espagnol (Paraguay)
 Language_es_PE=Espagnol (Peru)
 Language_es_PR=Espagnol (Puerto Rico)
+Language_es_US=Espagnol (USA)
 Language_es_UY=Espagnol (Uruguay)
 Language_es_GT=Espagnol (Guatemala)
 Language_es_VE=Espagnol (Venezuela)
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index e0df096ca2b..4756a52b6a2 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Supprimer le lien
 AddToDraft=Ajouter au brouillon
 Update=Modifier
 Close=Clôturer
+CloseAs=Positionner le statut à
 CloseBox=Supprimer le widget du tableau de bord
 Confirm=Confirmer
 ConfirmSendCardByMail=Voulez vous envoyer le contenu de cette fiche par email à l'adresse <b>%s</b> ?
@@ -196,6 +197,7 @@ ReOpen=Réouvrir
 Upload=Envoyer fichier
 ToLink=Lier
 Select=Sélectionner
+SelectAll=Sélectionner tout
 Choose=Choisir
 Resize=Redimensionner
 ResizeOrCrop=Redimensionner ou Recadrer
@@ -256,6 +258,7 @@ Cards=Fiches
 Card=Fiche
 Now=Maintenant
 HourStart=Heure de début
+Deadline=Echéance
 Date=Date
 DateAndHour=Date et heure
 DateToday=Date du jour
@@ -264,8 +267,10 @@ DateStart=Date début
 DateEnd=Date fin
 DateCreation=Date création
 DateCreationShort=Date de création
+IPCreation=Création IP
 DateModification=Date modification
 DateModificationShort=Date modif.
+IPModification=Modification IP
 DateLastModification=Date de dernière modification
 DateValidation=Date validation
 DateClosing=Date clôture
@@ -319,6 +324,7 @@ Morning=Matin
 Afternoon=Après-midi
 Quadri=Trimestre
 MonthOfDay=Mois du jour
+DaysOfWeek=Jours de la semaine
 HourShort=H
 MinuteShort=mn
 Rate=Taux
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Montant du règlement (devise d'origine)
 MulticurrencyAmountHT=Montant HT, devise d'origine
 MulticurrencyAmountTTC=Montant TTC, devise d'origine
 MulticurrencyAmountVAT=Montant TVA, devise d'origine
+MulticurrencySubPrice=Montant sous-prix multi devises
 AmountLT1=Montant Tax 2
 AmountLT2=Montant Tax 3
 AmountLT1ES=Montant RE
@@ -487,6 +494,7 @@ By=Par
 From=Du
 FromDate=A partir du
 FromLocation=A partir du
+at=à
 to=au
 To=au
 and=et
@@ -509,6 +517,7 @@ Draft=Brouillon
 Drafts=Brouillons
 StatusInterInvoiced=Facturé
 Validated=Validé
+ValidatedToProduce=Validé (à produire)
 Opened=Ouvert
 OpenAll=Ouvert (tout)
 ClosedAll=Fermé (tout)
@@ -655,6 +664,7 @@ Response=Réponse
 Priority=Priorité
 SendByMail=Envoyer email
 MailSentBy=Mail envoyé par
+NotSent=Non envoyé
 TextUsedInTheMessageBody=Corps du message
 SendAcknowledgementByMail=Envoi A.R. par email
 SendMail=Envoyer email
@@ -836,6 +846,7 @@ ListOfTemplates=Liste des modèles
 Gender=Genre
 Genderman=Homme
 Genderwoman=Femme
+Genderother=Autre
 ViewList=Vue liste
 ViewGantt=Vue Gantt
 ViewKanban=Vue Kanban
@@ -877,6 +888,8 @@ Miscellaneous=Divers
 Calendar=Calendrier
 GroupBy=Grouper par...
 ViewFlatList=Voir vue liste
+ViewAccountList=Voir le grand livre
+ViewSubAccountList=Voir le grand livre auxiliaire
 RemoveString=Supprimer la chaine '%s'
 SomeTranslationAreUncomplete=Certaines des langues proposées peuvent n'être traduites que partiellement ou contenir des erreurs. Aidez-nous à corriger votre langue en vous inscrivant à l'adresse <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/</a> pour ajouter vos améliorations.
 DirectDownloadLink=Lien de téléchargement direct (public/externe)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Expéditions clients
 SearchIntoExpenseReports=Notes de frais
 SearchIntoLeaves=Congés
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Règlements clients
+SearchIntoVendorPayments=Règlements fournisseurs
+SearchIntoMiscPayments=Paiements divers
 CommentLink=Commentaires
 NbComments=Nombre de commentaires
 CommentPage=Commentaires
@@ -1076,10 +1092,18 @@ NotUsedForThisCustomer=Non utilisé pour ce client
 AmountMustBePositive=Le montant doit être positif.
 ByStatus=Par statut
 InformationMessage=Information
-Used=Used
+Used=Utilisé
 ASAP=Dès que possible
-CREATEInDolibarr=Record %s create
-MODIFYInDolibarr=Record %s modified
-DELETEInDolibarr=Record %s deleted
-VALIDATEInDolibarr=Record %s validated
-APPROVEDInDolibarr=Record %s approved
+CREATEInDolibarr=Enregistrement %s effectué
+MODIFYInDolibarr=Enregistrement %s modifié
+DELETEInDolibarr=Enregistrement %s supprimé
+VALIDATEInDolibarr=Enregistrement %s validé
+APPROVEDInDolibarr=Enregistrement %s approuvé
+DefaultMailModel=Modèle d'e-mail par défaut
+PublicVendorName=Nom publique du vendeur
+DateOfBirth=Date de naissance
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Le jeton de sécurité a expiré, aussi l'action a été annulée. Merci de ré-essayer.
+UpToDate=Adhésion à jour
+OutOfDate=Adhésion expirée
+EventReminder=Rappel d'événement
+UpdateForAllLines=Mise à jour de toutes les lignes
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index c7b3fedbdc4..ea52dc21d7a 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -19,14 +19,12 @@ MembersCards=Cartes d'adhérent
 MembersList=Liste des adhérents
 MembersListToValid=Liste des adhérents brouillons (à valider)
 MembersListValid=Liste des adhérents valides
-MembersListUpToDate=Liste des adhérents valides à jour d'adhésion
-MembersListNotUpToDate=Liste des adhérents valides non à jour d'adhésion
+MembersListUpToDate=Liste des adhérents validés avec une adhésion à jour
+MembersListNotUpToDate=Liste des adhérents validés avec une adhésion expirée
 MembersListResiliated=Liste des adhérents résiliés
 MembersListQualified=Liste des adhérents qualifiés
 MenuMembersToValidate=Adhérents brouillons
 MenuMembersValidated=Adhérents validés
-MenuMembersUpToDate=Adhérents à jour
-MenuMembersNotUpToDate=Adhérents non à jour
 MenuMembersResiliated=Adhérents résiliés
 MembersWithSubscriptionToReceive=Adhérents avec cotisation à recevoir
 MembersWithSubscriptionToReceiveShort=Cotisations à recevoir
@@ -34,6 +32,7 @@ DateSubscription=Date adhésion
 DateEndSubscription=Date fin adhésion
 EndSubscription=Fin adhésion
 SubscriptionId=Id adhésion
+WithoutSubscription=Sans adhésion
 MemberId=Id adhérent
 NewMember=Nouvel adhérent
 MemberType=Type d'adhérent
@@ -45,7 +44,7 @@ MemberStatusDraftShort=Brouillon
 MemberStatusActive=Validé (attente cotisation)
 MemberStatusActiveShort=Validé
 MemberStatusActiveLate=Adhésion/cotisation expirée
-MemberStatusActiveLateShort=Non à jour
+MemberStatusActiveLateShort=Expiré
 MemberStatusPaid=Adhésions à jour
 MemberStatusPaidShort=A jour
 MemberStatusResiliated=Adhérent résilié
@@ -81,7 +80,7 @@ DeleteType=Supprimer
 VoteAllowed=Vote autorisé
 Physical=Physique
 Moral=Morale
-MorPhy=Nature
+MorAndPhy=Morales et physiques
 Reenable=Réactiver
 ResiliateMember=Résilier un adhérent
 ConfirmResiliateMember=Êtes-vous sûr de vouloir résilier cet adhérent ?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Envoie d'email à la validation d'un nouvel adhé
 SendingEmailOnNewSubscription=Envoyer un email sur une nouvelle adhésion
 SendingReminderForExpiredSubscription=Envoi d'un rappel pour les adhésions expirées
 SendingEmailOnCancelation=Envoie d'email à l'annulation
+SendingReminderActionComm=Envoyer un rappel pour un événement d'agenda
 # Topic of email templates
 YourMembershipRequestWasReceived=Votre demande d'adhésion a été reçue.
 YourMembershipWasValidated=Votre adhésion a été enregistrée
@@ -167,6 +167,7 @@ MembersStatisticsByState=Statistiques des membres par département/province/cant
 MembersStatisticsByTown=Statistiques des membres par ville
 MembersStatisticsByRegion=Statistiques des membres par région
 NbOfMembers=Nombre de membres
+NbOfActiveMembers=Nombre d'adhérents actifs en cours
 NoValidatedMemberYet=Aucun membre validé trouvé
 MembersByCountryDesc=Cet écran vous présente une vue statistique du nombre d'adhérents par pays. Le graphique utilise toutefois le service en ligne de graphique de Google et n'est opérationnel uniquement que si une connexion internet est disponible.
 MembersByStateDesc=Cet écran vous présente une vue statistique du nombre d'adhérents par département/province/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistiques
 LastMemberDate=Date dernier adhérent
 LatestSubscriptionDate=Date de dernière adhésion
 MemberNature=Nature d'adhérent
+MembersNature=Nature des adhérents
 Public=Informations publiques
 NewMemberbyWeb=Nouvel adhérent ajouté. En attente de validation
 NewMemberForm=Nouvel Adhérent form
diff --git a/htdocs/langs/fr_FR/mrp.lang b/htdocs/langs/fr_FR/mrp.lang
index 32d53d270cd..f1eaeffdfed 100644
--- a/htdocs/langs/fr_FR/mrp.lang
+++ b/htdocs/langs/fr_FR/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Ordres de fabrication
-MO=Ordre de fabrication
-MOs=Manufacturing orders
+MOs=Ordres de fabrication
+ManufacturingOrder=Ordre de fabrication
 MRPDescription=Module de gestion de production et Ordres de Fabrication (OF).
 MRPArea=Espace MRP
 MrpSetupPage=Configuration du module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Produits à produire
 UnitCost=Coût unitaire
 TotalCost=Coût total
 BOMTotalCost=Le coût de production de cette nomenclature basé sur chaque quantité et produit à consommer (utilise le prix de revient si défini, sinon le PMP si défini, sinon le meilleur prix d'achat)
+GoOnTabProductionToProduceFirst=Vous devez avoir la production pour clôturer un Ordre de Fabrication (voir onglet '%s'). Mais vous pouvez l'annuler.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Un kit ne peut pas être utilisé dans une nomenclature ou un ordre de fabrication.
diff --git a/htdocs/langs/fr_FR/multicurrency.lang b/htdocs/langs/fr_FR/multicurrency.lang
index 73dd1aa7cf6..9b55cd006fb 100644
--- a/htdocs/langs/fr_FR/multicurrency.lang
+++ b/htdocs/langs/fr_FR/multicurrency.lang
@@ -18,3 +18,21 @@ MulticurrencyReceived=Reçu, devise originale
 MulticurrencyRemainderToTake=Montant restant, devise d'origine
 MulticurrencyPaymentAmount=Montant du règlement (devise d'origine)
 AmountToOthercurrency=Montant destination (en devise du compte de réception)
+CurrencyRateSyncSucceed=Synchronisation du taux de change effectuée avec succès
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Utilisez la devise du document pour les paiements en ligne
+TabTitleMulticurrencyRate=Liste des taux de change
+ListCurrencyRate=Liste des taux de change pour cette devise
+CreateRate=Créer un taux de change
+FormCreateRate=Création du taux de change
+FormUpdateRate=Modification du taux de change
+successRateCreate=Le taux de change %sa été ajouté à la base de données
+ConfirmDeleteLineRate=Êtes-vous sur de vouloir supprimer le taux de change %s pour la devise %s en date du %s ?
+DeleteLineRate=Effacer le taux de change
+successRateDelete=Taux de change supprimé
+errorRateDelete=Erreur lors de la suppression du taux de change
+successUpdateRate=Modification effecutée
+ErrorUpdateRate=Erreur lors du changement du taux de change
+Codemulticurrency=Code de la devise
+UpdateRate=Modifier le taux de change
+CancelUpdate=Annuler
+NoEmptyRate=Le champ taux de change ne doit pas être vide
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index f32a30d9a81..c380edd77f3 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Remplissez avec la date de la dernière ligne de servic
 MultiPricesAbility=Plusieurs niveaux de prix par produit/service (chaque client est dans un et un seul niveau)
 MultiPricesNumPrices=Nombre de prix
 DefaultPriceType=Base des prix par défaut (avec ou hors taxes) lors de l’ajout de nouveaux prix de vente
-AssociatedProductsAbility=Pris en charge des produits virtuels (kits)
-AssociatedProducts=Produits virtuels
-AssociatedProductsNumber=Nbre de sous-produits constituant ce produit virtuel
+AssociatedProductsAbility=Activer les kits (produits virtuels)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Nombre de sous-produits constituant ce kit
 ParentProductsNumber=Nbre de produits virtuels/packages parent
 ParentProducts=Produits parents
-IfZeroItIsNotAVirtualProduct=Si 0, ce produit n'est pas un produit virtuel
-IfZeroItIsNotUsedByVirtualProduct=Si 0, ce produit n'est pas utilisé par un produit virtuel
+IfZeroItIsNotAVirtualProduct=Si 0, ce produit n'est pas un kit
+IfZeroItIsNotUsedByVirtualProduct=Si 0, ce produis n'est utilisé dans aucun kit
 KeywordFilter=Filtre par mot-clé
 CategoryFilter=Filtre par catégorie
 ProductToAddSearch=Recherche des produits à ajouter
 NoMatchFound=Aucun résultat n'a été trouvé
 ListOfProductsServices=Liste des produits/services
-ProductAssociationList=Liste des produits/services constituant ce produit virtuel
-ProductParentList=Liste des produits/services virtuels avec ce produit comme composante
+ProductAssociationList=Liste des produits/services composant ce kit
+ProductParentList=Liste des kits composés au moins de ce produit
 ErrorAssociationIsFatherOfThis=L'un des produits sélectionnés est parent du produit en cours
 DeleteProduct=Supprimer un produit/service
 ConfirmDeleteProduct=Êtes-vous sûr de vouloir supprimer ce produit/service ?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Valeurs globales disponibles:
 PriceMode=Mode de tarification
 PriceNumeric=Nombre
 DefaultPrice=Prix par défaut
+DefaultPriceLog=Historique des prix par défaut
 ComposedProductIncDecStock=Augmenter/Réduire le stock sur changement du stock du père
 ComposedProduct=Produits fils
 MinSupplierPrice=Prix d'achat minimum
@@ -339,6 +340,7 @@ UseProductFournDesc=Ajouter une fonctionnalité pour définir les descriptions d
 ProductSupplierDescription=Description du fournisseur du produit
 UseProductSupplierPackaging=Utiliser le conditionnement/emballage sur les prix fournisseur (recalculer les quantités en fonction de l'emballage défini sur le prix fournisseur lors de l'ajout / mise à jour de la ligne dans les documents fournisseurs)
 PackagingForThisProduct=Emballage
+PackagingForThisProductDesc=Sur une commande fournisseur, vous commanderez automatiquement cette quantité ou un multiple. Vous ne pourrez pas saisir un montant inférieur
 QtyRecalculatedWithPackaging=La quantité de la ligne a été recalculée en fonction de l'emballage du fournisseur
 
 #Attributes
diff --git a/htdocs/langs/fr_FR/recruitment.lang b/htdocs/langs/fr_FR/recruitment.lang
index 2ceb91db78e..bea2b2fa539 100644
--- a/htdocs/langs/fr_FR/recruitment.lang
+++ b/htdocs/langs/fr_FR/recruitment.lang
@@ -45,10 +45,10 @@ DateExpected=Date souhaitée
 FutureManager=Responsable futur
 ResponsibleOfRecruitement=Responsable du recrutement
 IfJobIsLocatedAtAPartner=Si le poste est localisé chez un partenaire
-PositionToBeFilled=Poste à pourvoir
-PositionsToBeFilled=Postes à pourvoir
-ListOfPositionsToBeFilled=Liste des postes à pourvoir
-NewPositionToBeFilled=Nouveau poste à pourvoir
+PositionToBeFilled=Poste/fonction
+PositionsToBeFilled=Offres d'emploi
+ListOfPositionsToBeFilled=Liste des postes
+NewPositionToBeFilled=Nouveaux postes
 
 JobOfferToBeFilled=Poste à pourvoir
 ThisIsInformationOnJobPosition=Informations sur le poste à pourvoir
@@ -61,10 +61,15 @@ RequestedRemuneration=Rémunération demandée
 ProposedRemuneration=Rémunération proposée
 ContractProposed=Contrat proposé
 ContractSigned=Contrat signé
+ContractRefused=Contrat refusé
 RecruitmentCandidature=Candidature
 JobPositions=Offres d'emploi
 RecruitmentCandidatures=Candidatures
 InterviewToDo=Entretien à faire
 AnswerCandidature=Réponse de candidature
 YourCandidature=Votre candidature
-YourCandidatureAnswerMessage=Merci pour votre candidature. <br> ...
+YourCandidatureAnswerMessage=Merci de votre candidature.<br>...
+JobClosedTextCandidateFound=Le poste n'est plus ouvert. Le poste a été pourvu.
+JobClosedTextCanceled=Le poste n'est plus ouvert.
+ExtrafieldsJobPosition=Attributs complémentaires (postes)
+ExtrafieldsCandidatures=Attributs complémentaires (candidature)
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index 8cc6c9d0abd..f5c3c9453e3 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=ID mouvement %d
 ListMouvementStockProject=Liste des mouvements de stocks associés au projet
 StocksArea=Espace entrepôts
 AllWarehouses=Tous les entrepôts
-IncludeEmptyDesiredStock=Inclure également le stock souhaité non défini
+IncludeEmptyDesiredStock=Inclure aussi les stocks négatifs quand le stock désiré optimal n'est pas défini
 IncludeAlsoDraftOrders=Inclure également les commandes brouillons
 Location=Lieu
 LocationSummary=Nom court du lieu
@@ -122,8 +122,9 @@ DesiredStockDesc=Le stock optimal sera la valeur utilisée pour remplir le stock
 StockToBuy=À commander
 Replenishment=Réapprovisionnement
 ReplenishmentOrders=Commandes de réapprovisionnement
-VirtualDiffersFromPhysical=Selon les options d'augmentation/décrémentation de stock, le stock physique et le stock virtuel (stock physique + commandes actuelles) peuvent différer
-UseVirtualStockByDefault=Utilisez le stock virtuel par défaut, au lieu du stock réel, pour la fonction de réapprovisionnement
+VirtualDiffersFromPhysical=Selon les paramètres d'incrémentation et décrémentation des stocks, le stock réel et le stock virtuel (stock physique + commandes et fabrications en cours) peuvent différer
+UseRealStockByDefault=Utiliser le stock réel, plutôt que le stock virtuel, pour le réapprovisionnement
+ReplenishmentCalculation=La quantité à commander sera (quantité souhaitée - stock réel) au lieu de (quantité souhaitée - stock virtuel)
 UseVirtualStock=Utilisation du stock virtuel
 UsePhysicalStock=Utilisation du stock réel
 CurentSelectionMode=Mode de sélection en cours
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=Ce produit est déjà dans la liste
 SelectCategory=Filtre par catégorie
 SelectFournisseur=Filtre fournisseur
 inventoryOnDate=Inventaire
-INVENTORY_DISABLE_VIRTUAL=Autoriser à ne pas déstocker les produits enfants d'un produit virtuel (kit) dans l'inventaire
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Utiliser le prix d'achat si aucun dernier prix d'achat n'a pu être trouvé
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Les mouvements de stocks auront la date de l'inventaire (au lieu de la date de validation de l'inventaire)
 inventoryChangePMPPermission=Autoriser à changer la valeur PMP d'un produit
 ColumnNewPMP=Nouvelle unité PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=Vous pouvez voir ici le stock (stock réel) à une date donn
 StockAtDateFutureDesc=Vous pouvez voir ici le stock (stock virtuel) à une date donnée dans le futur
 CurrentStock=Stock actuel
 InventoryRealQtyHelp=Définissez la valeur sur 0 pour réinitialiser la quantité <br> Gardez le champ vide ou supprimez la ligne pour qu'il reste inchangé
+UpdateByScaning=Mise à jour par scan
 UpdateByScaningProductBarcode=Mettre à jour par scan (code-barres produit)
-UpdateByScaningLot=Mettre à jour par scan (code-barres lot/série)
+UpdateByScaningLot=Mise à jour par scan (code barres lot/série)
diff --git a/htdocs/langs/fr_FR/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang
index 2b4ab9dcf70..c3d4873d1bd 100644
--- a/htdocs/langs/fr_FR/suppliers.lang
+++ b/htdocs/langs/fr_FR/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Commandes fournisseurs en facture
 NbDaysToDelivery=Délai de livraison en jours
 DescNbDaysToDelivery=Le plus gros délai de livraison parmi les produits de cette commande
 SupplierReputation=Réputation du fournisseur
+ReferenceReputation=Réputation
 DoNotOrderThisProductToThisSupplier=Ne pas commander
 NotTheGoodQualitySupplier=Mauvaise qualité
 ReputationForThisProduct=Réputation
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index e89cd5779c3..0db2af94537 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Ajouter site web
 Webpage=Page/container Web
 AddPage=Ajouter une page/container
 HomePage=Page d'accueil
-PageContainer=Page/container
+PageContainer=Page
 PreviewOfSiteNotYetAvailable=La prévisualisation de votre site web <strong>%s</strong> n'est pas disponible actuellement. Vous devez d'abord '<strong>Importer un modèle de site web complet</strong>' ou juste '<strong>Ajouter une page/container</strong>.
 RequestedPageHasNoContentYet=La page demandée avec l'id=%s ne présente encore aucun contenu ou le fichier cache .tpl.php a été supprimé. Ajoutez du contenu à la page pour résoudre cela.
 SiteDeleted=Site Web '%s' supprimé
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Remplacement effectué dans %s pages ou des conteneurs
 RSSFeed=Flux RSS
 RSSFeedDesc=Vous pouvez obtenir un flux RSS des derniers articles de type 'blogpost' en utilisant cette URL
 PagesRegenerated=%s page(s)/conteneur(s) régénéré(s)
+RegenerateWebsiteContent=Régénérer les fichiers de cache du site Web
+AllowedInFrames=Autorisé dans les cadres
diff --git a/htdocs/langs/fr_GA/admin.lang b/htdocs/langs/fr_GA/admin.lang
index c1d306ec390..8c6135dc874 100644
--- a/htdocs/langs/fr_GA/admin.lang
+++ b/htdocs/langs/fr_GA/admin.lang
@@ -1,3 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
+Module20Name=Devis
+Module30Name=Factures
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_GA/boxes.lang b/htdocs/langs/fr_GA/boxes.lang
new file mode 100644
index 00000000000..d40636b6c78
--- /dev/null
+++ b/htdocs/langs/fr_GA/boxes.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - boxes
+BoxTitleMemberNextBirthdays=Anniversaires de ce mois (utilisateurs)
+BoxTitleCurrentAccounts=Balance des comptes ouverts
+ForProposals=Devis
diff --git a/htdocs/langs/fr_GA/commercial.lang b/htdocs/langs/fr_GA/commercial.lang
new file mode 100644
index 00000000000..445c859fc68
--- /dev/null
+++ b/htdocs/langs/fr_GA/commercial.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - commercial
+LastProspectDoNotContact=Ne pas contacter
+LastProspectNeverContacted=Jamais contacté
+LastProspectContactDone=Contacté
+StatusProsp=Statut du prospect
diff --git a/htdocs/langs/fr_GA/companies.lang b/htdocs/langs/fr_GA/companies.lang
new file mode 100644
index 00000000000..b055edace88
--- /dev/null
+++ b/htdocs/langs/fr_GA/companies.lang
@@ -0,0 +1,25 @@
+# Dolibarr language file - Source file is en_US - companies
+State=Province
+Zip=Boîte Postale
+OverAllProposals=Devis
+ProfId1=N° Statistique
+ProfId2=CNSS
+ProfId3=CNAMGS
+ProfId4=RCCM
+ProfId5=NIM
+ProfId6=NIF
+Contact=Contact / Adresse
+Contacts=Contacts / Adresses
+ContactsAddresses=Contacts / Adresses
+NewContactAddress=Nouveau Contact / Adresse
+NorProspectNorCustomer=Ni prospect, ni client
+Staff=Employés
+ProspectStatus=Statut du prospect
+StatusProspect3=Contacté
+ChangeDoNotContact=Changer le statut en "Ne pas contacter"
+ChangeNeverContacted=Changer le statut en "Jamais contacté"
+ChangeToContact=Changer le statut en "À contacter"
+ChangeContactInProcess=Changer le statut en "Contact en cours"
+ChangeContactDone=Changer le statut en "Contacté"
+ProspectsByStatus=Prospects par statut
+AddAddress=Ajoutez l'adresse
diff --git a/htdocs/langs/fr_GA/compta.lang b/htdocs/langs/fr_GA/compta.lang
new file mode 100644
index 00000000000..c7c41488180
--- /dev/null
+++ b/htdocs/langs/fr_GA/compta.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - compta
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/fr_GA/hrm.lang b/htdocs/langs/fr_GA/hrm.lang
new file mode 100644
index 00000000000..72a8f0e7911
--- /dev/null
+++ b/htdocs/langs/fr_GA/hrm.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - hrm
+Employees=Employés
diff --git a/htdocs/langs/fr_GA/intracommreport.lang b/htdocs/langs/fr_GA/intracommreport.lang
new file mode 100644
index 00000000000..76825d9b4ab
--- /dev/null
+++ b/htdocs/langs/fr_GA/intracommreport.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+IntracommReportPeriod=Period of nalysis
diff --git a/htdocs/langs/fr_GA/products.lang b/htdocs/langs/fr_GA/products.lang
new file mode 100644
index 00000000000..6e900475275
--- /dev/null
+++ b/htdocs/langs/fr_GA/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/fr_GA/stocks.lang b/htdocs/langs/fr_GA/stocks.lang
deleted file mode 100644
index 0cf57e3a1c3..00000000000
--- a/htdocs/langs/fr_GA/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/gl_ES/accountancy.lang b/htdocs/langs/gl_ES/accountancy.lang
index 2c6f92c301b..1aa15550b74 100644
--- a/htdocs/langs/gl_ES/accountancy.lang
+++ b/htdocs/langs/gl_ES/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Predeterminado para o servizo
 DefaultForProduct=Predeterminado para o produto
 CantSuggest=Non pode suxerirse
 AccountancySetupDoneFromAccountancyMenu=A maior parte da configuración da contabilidade realizase dende o menú %s
-ConfigAccountingExpert=Configuración do módulo contabilidade avanzada
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Procesar diarios
-Journaux=Diarios
+Journals=Diarios
 JournalFinancial=Diarios financieiros
 BackToChartofaccounts=Voltar ao plan contable
 Chartofaccounts=Plan contable
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Conta contable adicada
 AssignDedicatedAccountingAccount=Nova conta a asignar
 InvoiceLabel=Etiqueta factura
@@ -33,8 +35,8 @@ OtherInfo=Outra información
 DeleteCptCategory=Eliminar a conta contable do grupo
 ConfirmDeleteCptCategory=¿Está certo de querer eliminar esta conta contable do grupo de contas contables?
 JournalizationInLedgerStatus=Estado de diario
-AlreadyInGeneralLedger=Xa rexistrado no Libro Maior
-NotYetInGeneralLedger=Non foi rexistrado aínda no Libro Maior
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=O grupo está baleiro, comprobe a configuración da personalización de grupos contables
 DetailByAccount=Amosar detalles por conta
 AccountWithNonZeroValues=Contas con valores non cero
@@ -43,7 +45,9 @@ CountriesInEEC=Países na CEE
 CountriesNotInEEC=Países non CEE
 CountriesInEECExceptMe=Todos os paises incluidos na CEE excepto %s
 CountriesExceptMe=Todos os países excepto %s
-AccountantFiles=Exportar documentos contables
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Conta contable principal para clientes non definida na configuración
 MainAccountForSuppliersNotDefined=Conta contable principal para provedores non definida na configuración
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=PASO %s: Engadir ou editar transaccións existentes,
 
 AccountancyAreaDescClosePeriod=PASO %s: Pechar periodo, polo que non poderá facer modificacións nun futuro.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=Non foi completado un paso obrigatorio na configuración (conta contable non definida en todas as contas bancarias)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Seleccione un plan contable activo
 ChangeAndLoad=Cambiar e cargar
 Addanaccount=Engadir unha conta contable
@@ -89,6 +93,8 @@ SubledgerAccount=Subconta contable
 SubledgerAccountLabel=Etiqueta subconta contable
 ShowAccountingAccount=Amosar contabilidade
 ShowAccountingJournal=Amosar diario contable
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Conta contable suxerida
 MenuDefaultAccounts=Contas contables por defecto
 MenuBankAccounts=Contas Bancarias
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Contabilizar informes de gastos
 CreateMvts=Crear nova transacción
 UpdateMvts=Modificación dunha transacción
 ValidTransaction=Transacción validada
-WriteBookKeeping=Rexistrar movimentos no Libro Maior
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Libro Maior
+BookkeepingSubAccount=Subledger
 AccountBalance=Saldo da conta
 ObjectsRef=Referencia de obxecto orixe
 CAHTF=Total compras a provedor antes de impostos
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Desactivar transaccións directas en conta bancaria
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Habilitar exportación de borradores al diario
 ACCOUNTANCY_COMBO_FOR_AUX=Habilita a listaxe combinada para a conta subsidiaria (pode ser lento se ten moitos terceiros)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Diario de vendas
 ACCOUNTING_PURCHASE_JOURNAL=Diario de compras
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Conta contable de operacións pendentes de asignar
 DONATION_ACCOUNTINGACCOUNT=Conta contable de rexistro de doacións/subvencións
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Conta contable de rexistro subscricións
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Conta contable predeterminada para produtos comprados (usada se non están definidos na folla de produtos)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Por grupos predefinidos
 ByPersonalizedAccountGroups=Por grupos persoalizados
 ByYear=Por ano
 NotMatch=Non establecido
-DeleteMvt=Eliminar liñas do Libro Maior
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Mes a eliminar
 DelYear=Ano a eliminar
 DelJournal=Diario a eliminar
-ConfirmDeleteMvt=Isto eliminará todas as liñas do Libro Maior do ano e/ou dun diario específico. Precísase alo menos un criterio.
-ConfirmDeleteMvtPartial=Isto eliminará a transacción do libro maior (serán  eliminadas todas as liñas relacionadas coa mesma transacción)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Diario financiero
 ExpenseReportsJournal=Diario informe de gastos
 DescFinanceJournal=O diario financiero inclúe todos os tipos de pagos por conta bancaria
-DescJournalOnlyBindedVisible=Ista é una vista do rexistro ligada a unha conta contable e que pode ser rexistrada no Libro Maior.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Conta contable para IVE non definida
 ThirdpartyAccountNotDefined=Conta contable para terceiro non definida
 ProductAccountNotDefined=Conta contable para produto non definida
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Este diario xa está a ser utilizado
 AccountingAccountForSalesTaxAreDefinedInto=Nota: A conta contable do IVE nas vendas defínese no menú <b> %s</b> - <b> %s</b>
 NumberOfAccountancyEntries=Número de entradas
 NumberOfAccountancyMovements=Número de movementos
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Exportar libro borrador
@@ -326,6 +339,8 @@ Modelcsv_configurable=Exportar a CSV Configurable
 Modelcsv_FEC=Exportar FEC (Art. L47 A)
 Modelcsv_Sage50_Swiss=Exportar a Sage 50 Suiza
 Modelcsv_winfic=Exportar a Winfic - eWinfic - WinSis Conta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Id do plan contable
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/gl_ES/admin.lang b/htdocs/langs/gl_ES/admin.lang
index 8b46f093b21..dc2f2aa0a84 100644
--- a/htdocs/langs/gl_ES/admin.lang
+++ b/htdocs/langs/gl_ES/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Eliminar bloqueo de conexións
 YourSession=A súa sesión
 Sessions=Sesións de usuarios
 WebUserGroup=Usuario/grupo do servidor web
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Parece que o seu PHP non pode listar as sesións activas. El directorio de salvaguardado de sesións (<b>%s</b>) puede estar protegido (por ejemplo, por los permisos del sistema operativo o por la directiva open_basedir de su PHP).
 DBStoringCharset=Codificación da base de datos para o almacenamento de datos
 DBSortingCharset=Codificación da base de datos para clasificar os datos
@@ -71,7 +73,7 @@ DisableJavascriptNote=Nota: Para propósitos de proba ou depuración. Para a opt
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Agardar a que presione unha tecla antes de cargar o contido da listaxe combinada de terceiros <br>Isto pode incrementar o rendemento se ten un grande número de terceiros, pero é menos convinte.
-DelaiedFullListToSelectContact=Agardar a que presione unha tecla antes de cargar o contido da listaxe combinada de contactos. <br> Isto pode incrementar o rendemento se ten un grande número de contactos, pero é menos convinte.
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Nº de caracteres para desencadenar a busca: %s
 NumberOfBytes=Número de Bytes
 SearchString=Buscar cadea
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=Nun documento dun terceiro, pode escoller u
 JavascriptDisabled=Javascript desactivado
 UsePreviewTabs=Ver lapelas vista previa
 ShowPreview=Ver vista previa
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Vista previa non dispoñible
 ThemeCurrentlyActive=Tema actualmente activo
 CurrentTimeZone=Zona horaria PHP (Servidor)
@@ -271,7 +274,7 @@ NoticePeriod=Prazo de aviso
 NewByMonth=Novo por mes
 Emails=E-Mails
 EMailsSetup=Configuración e-mails
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Perfís de remitentes de e-mails
 EMailsSenderProfileDesc=Pode gardar esta sección baleira. Se vostede introduce algúns enderezos de correo aquí, estes serán engadidos a listaxe de posibles emisores dentro da caixa cando escribe un novo enderezo.
 MAIN_MAIL_SMTP_PORT=Porto do servidor SMTP (Por defecto en php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=De forma predeterminada, os pedimentos a provedor teñen que ser creados e aprobados por 2 usuarios diferentes (un paso/usuario para crear e un paso/usuario para aprobar. Teña conta de que se o usuario ten tanto o permiso para crear e aprobar, un paso/usuario será suficiente. Pode pedir con esta opción introducir unha terceira etapa de aprobación/usuario, se a cantidade é superior a un valor específico (polo que serán precisos 3 pasos: 1 validación, 2=primeira aprobación e 3=segunda aprobación se a cantidade é suficiente).<br>Deixe baleiro se unha aprobación (2 pasos) é suficiente, se establece un valor moi baixo (0,1) requírese unha segunda aprobación sempre (3 pasos).
 UseDoubleApproval=Usar 3 pasos de aprobación se o importe (sen IVE) é maior que...
-WarningPHPMail=ADVERTENCIA: A miudo é mellor configurar o email para usar o servidor do seu provedor en lugar da configuración por defecto. Algúns provedores de correo electrónico (como Yahoo) non permiten enviar un e-mail dende outro servidor que non sexa o servidor de Yahoo. A  súa configuración actual usa o servidor da aplicación para enviar emails e non o servidor do seu provedor de correo, así que algúns destinatarios (aqueles compatibles co protocolo restrictivo DMARC), preguntarán ao seu provedor de correo se  poden aceptar o correo e outros provedores (como Yahoo) poden respostar "non" porque o servidor non é un dos seus servidores, así que os seus correos enviados poden non ser aceptados (vixíe tamén a cota de envío do seu servidor de correo). <br>Se o seu provedor de correo electrónico (como Yahoo) ten esta restricción, debe cambiar a configuración de e-mail para escoller o método "servidor SMTP" e introducir o servidor SMTP e credenciais proporcionadas polo seu provedor de correo electrónico (pregunte ao seu provedor de correo electrónico as credenciaias SMTP para a súa conta).
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=Se o seu provedor SMTP de correo electrónico precisa restrinxir o cliente de correo electrónico a algunhos enderezos IP (moi raro), este é o seu enderezo IP da súa aplicación ERP CRM: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Clic para ver a descrición
 DependsOn=Este módulo precisa o módulo(s)
 RequiredBy=Este módulo é requirido polos módulos
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integración con sistema ClickToDial (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Engade función para xerar unha conta Bookmark4u dende unha conta Dolibarr
 Module60Name=Pegatinas
 Module60Desc=Xestión de pegatinas
 Module70Name=Intervencións
@@ -656,7 +662,7 @@ Module50200Desc=Ofrece aos clientes pagamentos online  vía PayPal (cuenta PayPa
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Contabilidade (avanzada)
-Module50400Desc=Xestión contable (dobre partida, libros xerais e auxiliares). Exporte a varios formatos de software de contabilidade.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Enquisa ou Voto
@@ -671,7 +677,7 @@ Module63000Name=Recursos
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Consultar facturas de cliente
 Permission12=Crear/Modificar facturas de cliente
-Permission13=Invalidar facturas de cliente
+Permission13=Invalidate customer invoices
 Permission14=Validar facturas de cliente
 Permission15=Enviar facturas de cliente por correo
 Permission16=Emitir pagamentos de facturas de cliente
@@ -688,6 +694,7 @@ Permission32=Crear/modificar produtos
 Permission34=Eliminar produtos
 Permission36=Ver/xestionar produtos ocultos
 Permission38=Exportar produtos
+Permission39=Ignore minimum price
 Permission41=Consultar proxectos e tarefas (proxectos compartidos e proxectos dos que son contacto). Tamén pode introducir tempos consumidos, para mín ou os meus subordinados, en tarefas asignadas (Follas de tempo).
 Permission42=Crear/modificar proxectos (proxectos compartidos e proxectos dos que son contacto). Tamén pode crear tarefas e asignar usuarios a proxectos e tarefas
 Permission44=Eliminar proxectos (compartidos ou son contacto)
@@ -696,6 +703,9 @@ Permission61=Consultar intervencións
 Permission62=Crear/modificar intervencións
 Permission64=Eliminar intervencións
 Permission67=Exportar intervencións
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Consultar membros
 Permission72=Crear/modificar membros
 Permission74=Eliminar membros
@@ -718,6 +728,7 @@ Permission95=Consultar balances e resultados
 Permission101=Consultar expedicións
 Permission102=Crear/modificar expedicións
 Permission104=Validar expedicións
+Permission105=Send sendings by email
 Permission106=Exportar expedicións
 Permission109=Eliminar expedicións
 Permission111=Consultar contas financieras
@@ -825,10 +836,11 @@ Permission402=Crear/modificar haberes
 Permission403=Validar haberes
 Permission404=Eliminar haberes
 Permission430=Usa barra de debug
-Permission511=Consultar pagamentos de salarios
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Crear/modificar pagamentos de salarios
 Permission514=Eliminar pagamentos de salarios
-Permission517=Exportar salarios
+Permission517=Read payments of salaries of everybody
+Permission519=Exportar salarios
 Permission520=Consultar Créditos
 Permission522=Crear/modificar Créditos
 Permission524=Eliminar Crédito
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Consultar lista de materiais
 Permission651=Crear/Actualizar lista de material
 Permission652=Eliminar lista de material
@@ -884,7 +899,9 @@ Permission1185=Aprobar pedimentos a provedores
 Permission1186=Enviar pedimentos a provedores
 Permission1187=Recibir pedimentos de provedores
 Permission1188=Pechar pedimentos a provedores
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Aprobar (segunda aprobación) pedimentos a provedores
+Permission1191=Export supplier orders and their attributes
 Permission1201=Obter resultado dunha exportación
 Permission1202=Crear/codificar exportacións
 Permission1231=Consultar facturas de provedores
@@ -898,6 +915,8 @@ Permission1251=Lanzar as importacións en masa á base de datos (carga de datos)
 Permission1321=Exportar facturas a clientes, campos adicionais e cobros
 Permission1322=Reabrir unha factura pagada
 Permission1421=Exportar pedimentos de clientes e campos adicionais
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Consultar accións (eventos ou tarefas) ligadas a súa conta
 Permission2402=Crear/modificar accións (eventos ou tarefas) ligadas a súa conta
 Permission2403=Eliminar accións (eventos ou tarefas) ligadas a súa conta
@@ -932,9 +951,13 @@ Permission23001=Consultar. Traballo programado
 Permission23002=Crear/actualizar. Traballo programado
 Permission23003=Borrar. Traballo Programado
 Permission23004=Executar. Traballo programado
-Permission50101=Usar TPV
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Consultar as transaccións
 Permission50202=Importar as transaccións
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Contabilizar produtos e facturas con contas contables
 Permission50411=Consultar operacións do Libro Maior
 Permission50412=Rexistrar/Editar operacións no Libro Maior
@@ -958,6 +981,17 @@ Permission63001=Consultar recursos
 Permission63002=Crear/modificar recursos
 Permission63003=Eliminar recursos
 Permission63004=Ligar recursos a eventos da axenda
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Tipos de terceiros
 DictionaryCompanyJuridicalType=Formas xurídicas de terceiros
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Tipos de vacacións
 DictionaryOpportunityStatus=Estado de oportunidade para o proxecto/oportunidade
 DictionaryExpenseTaxCat=Informe de gastos - Categorías de transporte
 DictionaryExpenseTaxRange=Informe de gastos - Rango por categoría de transporte
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Configuración gardada
 SetupNotSaved=Configuración non gardada
 BackToModuleList=Voltar á lista de módulos
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Etiqueta que se utilizará se non se atopa tradución para es
 LabelOnDocuments=Etiqueta sobre documentos
 LabelOrTranslationKey=Clave de tradución ou cadea
 ValueOfConstantKey=Valor da constante
+ConstantIsOn=Option %s is on
 NbOfDays=Nº de días
 AtEndOfMonth=A fin de mes
 CurrentNext=Actual/Seguinte
@@ -1145,6 +1182,7 @@ InfoWebServer=Sobre o Servidor Web
 InfoDatabase=Sobre a base de datos
 InfoPHP=Sobre o PHP
 InfoPerf=Sobre o rendimento
+InfoSecurity=About Security
 BrowserName=Nome do navegador
 BrowserOS=S.O. do navegador
 ListOfSecurityEvents=Listaxe de eventos de seguridade Dolibarr
@@ -1194,7 +1232,8 @@ RestoreDesc=Para restaurar unha copia de seguridade de Dolibarr, vostede debe:
 RestoreDesc2=Tomar o ficheiro (ficheiro zip, por exemplo) do directorio dos documentos e descomprimilo no directorio dos documentos dunha nova instalación de Dolibarr ou na carpeta dos documentos desta instalación (<b>%s</b>).
 RestoreDesc3=Restaurar o ficheiro de volcado gardado na base de datos da nova instalación de Dolibarr ou desta instalación (<b>%s</b>). Atención, unha vez realizada a restauración, deberá utilizar un login/contrasinal de administrador existente no momento da copia de seguridade para conectarse. Para restaurar a base de datos na instalación actual, pode utilizar o asistente a continuación.
 RestoreMySQL=Importación MySQL
-ForcedToByAModule= Esta regra está forzada a <b>%s</b> por un dos módulos activados
+ForcedToByAModule=Esta regra está forzada a <b>%s</b> por un dos módulos activados
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Copias de seguridade da base de datos realizadas anteriormente
 PreviousArchiveFiles=Copias de seguridade do directorio documentos realizadas anteriormente
 WeekStartOnDay=Primeiro día da semana
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Pregarca de OPCode está activa
 AddRefInList=Amosar código de cliente/provedor nas listaxes (e selectores) e ligazóns.<br>Os terceiros aparecerán co nome "CC12345 - SC45678 - The big company coorp", no lugar de "The big company coorp".
 AddAdressInList=Amosar o enderezo do cliente/provedor nas listaxes (e selectores) <br>Os terceiros aparecerán co nome "The big company coorp - 21 jump street 123456 Big town - USA ", no lugar de "The big company coorp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Consultar polo método preferido de envío a terceiros.
 FieldEdition=Edición do campo %s
 FillThisOnlyIfRequired=Exemplo: +2 (Complete só se rexistra unha desviación do tempo na exportación)
@@ -1282,7 +1322,7 @@ GetBarCode=Obter código de barras
 NumberingModules=Modelos de numeración
 DocumentModules=Modelos de documento
 ##### Module password generation
-PasswordGenerationStandard=Volta un contrasinal xerada polo algoritmo interno Dolibarr: 8 caracteres, números e caracteres en minúsculas mesturadas.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Non suxerir ningún contrasinal xerada. O contrasinal debe ser escrito manualmente.
 PasswordGenerationPerso=Volta un contrasinal segundo a configuración definida.
 SetupPerso=Segundo a túa configuración
@@ -1381,6 +1421,7 @@ AdherentMailRequired=E-Mail obrigatorio para crear un membro novo
 MemberSendInformationByMailByDefault=Caixa de verificación para enviar o correo de confirmación (validación ou nova cotización) aos membros é por defecto "sí"
 VisitorCanChooseItsPaymentMode=O visitante pode escoller entre os modos de pagamento dispoñibles
 MEMBER_REMINDER_EMAIL=Habilitar recordatorio de eventos <b>por e-mail</b> de suscripcións expiradas. Nota: O módulo <strong>%s</strong> debe estar habilitado e configurado correctamente para que o recordatorio sexa enviado.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=Configuración do módulo LDAP
 LDAPGlobalParameters=Parámetros globais
@@ -1523,7 +1564,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=Nesta páxina atopará varias probas e consellos relacionados co rendemento.
-NotInstalled=Non instalado, polo que o seu servidor non baixa de rendemento con isto.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Aplicación caché
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Nivel
 SyslogFilename=Nome e ruta do ficheiro
 YouCanUseDOL_DATA_ROOT=Pode utilizar DOL_DATA_ROOT/dolibarr.log para un rexistro no directorio "documentos" de Dolibarr. Porén, pode establecer un directorio diferente para gardar este ficheiro.
 ErrorUnknownSyslogConstant=A constante %s non é unha constante syslog coñecida
-OnlyWindowsLOG_USER=Windows só soporta LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compresión e copia de seguridade dos ficheiros de rexistro de depuración (xerados polo módulo Log para a depuración)
-SyslogFileNumberOfSaves=Copias de seguridade de log
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configurar tareas programados de limpeza para establecer a frecuencia de copia de seguridade do log
 ##### Donations #####
 DonationsSetup=Configuración do módulo doacións/subvencións
@@ -1629,7 +1672,7 @@ AdvancedEditor=Editor avanzado
 ActivateFCKeditor=Activar editor avanzado para :
 FCKeditorForCompany=Creación/edición WYSIWIG da descrición e notas dos terceiros
 FCKeditorForProduct=Creación/edición WYSIWIG da descrición e notas dos produtos/servizos
-FCKeditorForProductDetails=Creación/edición WYSIWIG das liñas de detalle dos produtos (pedimentos, orzamentos, facturas, etc.). <font class="warning">Atención: O uso desta opción non é recomendable xa que puede crear problemas cos caracteres especiais e o formateo de páxina ao xerar ficheiros PDF.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= Creación/edición WYSIWIG dos E-Mails (Utilidades->E-Mailings)
 FCKeditorForUserSignature=Creación/edición WYSIWIG da sinatura de usuarios
 FCKeditorForMail=Creación/edición WYSIWIG de todos os e-mails ( excepto Utilidades->E-Mailings)
@@ -1639,11 +1682,11 @@ StockSetup=Configuración do módulo Almacéns
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menú eliminado
+Menu=Menu
 Menus=Menús
 TreeMenuPersonalized=Menús personalizados
 NotTopTreeMenuPersonalized=Menús personalizados non ligados a un menú superior
 NewMenu=Novo menú
-Menu=Selección dos menús
 MenuHandler=Xestor de menús
 MenuModule=Módulo orixe
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Pagamento cliente,1:Pagamento provedor,2:Tanto pagamento de cl
 IncludePath=Ruta incluida (definida na variable %s)
 ExpenseReportsSetup=Configuración do módulo Informe de Gastos
 TemplatePDFExpenseReports=Modelos de documento para xerar informes de gastos
-ExpenseReportsIkSetup=Configuración do módulo Informes de gastos - Índice Milles
 ExpenseReportsRulesSetup=Configuración do módulo Informes de gastos - Regras
 ExpenseReportNumberingModules=Módulo de numeración de informes de gastos
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Terceiros
 MailToMember=Membros
 MailToUser=Usuarios
-MailToProject=Páxina proxectos
+MailToProject=Proxectos
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Código postal
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use a barra de debug
 DEBUGBAR_LOGS_LINES_NUMBER=Número de últimas liñas de rexistro para manter na consola.
 WarningValueHigherSlowsDramaticalyOutput=Advertencia, os valores altos ralentizan dramáticamente a saída.
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Configuración do módulo de exportación.
 ImportSetup=Setup of module Import
 InstanceUniqueID=ID única da instancia
 SmallerThan=Menor que
 LargerThan=Maior que
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/gl_ES/banks.lang b/htdocs/langs/gl_ES/banks.lang
index 93160d3254e..bb0b955c32c 100644
--- a/htdocs/langs/gl_ES/banks.lang
+++ b/htdocs/langs/gl_ES/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Pagamento varios
 VariousPayments=Pagamentos varios
 ShowVariousPayment=Amosar pagamentos varios
 AddVariousPayment=Engadir pagamentos varios
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=Orde SEPA
 YourSEPAMandate=A súa orde SEPA
 FindYourSEPAMandate=Esta é a súa orde SEPA para autorizar a nosa empresa a realizar un petición de débito ao seu banco. Envíea de volta asinada (dixitalice o documento asinado) ou envíe por correo a
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/gl_ES/categories.lang b/htdocs/langs/gl_ES/categories.lang
index 1879baaec46..2aa1b892b01 100644
--- a/htdocs/langs/gl_ES/categories.lang
+++ b/htdocs/langs/gl_ES/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/gl_ES/companies.lang b/htdocs/langs/gl_ES/companies.lang
index 9968bdc6941..fa0e5afee91 100644
--- a/htdocs/langs/gl_ES/companies.lang
+++ b/htdocs/langs/gl_ES/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Id Prof 1 (USt.-IdNr)
 ProfId2AT=Id Prof 2 (USt.-Nr)
 ProfId3AT=Id Prof 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Id Prof 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Id Prof 1 (Número de colexiado)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscrición Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscrición Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Id Prof 1 (Número federal)
 ProfId4CH=Id Prof 2 (Número de rexistro comercial)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Id Prof 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Id prof. 1 (USt.-IdNr)
 ProfId2DE=Id prof. 2 (USt.-Nr)
 ProfId3DE=Id prof. 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=CIF/NIF
 ProfId2ES=Número Seguridade Social
 ProfId3ES=CNAE
 ProfId4ES=Número de colexiado
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Id Prof 1 (SIREN)
 ProfId2FR=Id Prof 2 (SIRET)
 ProfId3FR=Id Prof 3 (NAF, antigo APE)
 ProfId4FR=Id Prof 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Número rexistro
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Id prof. 3 (SRVC TAX)
 ProfId4IN=Id prof. 4
 ProfId5IN=Id prof. 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Negocios permitidos)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Id prof. 1 (R.F.C.)
 ProfId2MX=Id prof. 2 (Rexistro Patroal IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=Número KVK
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=NIPC
 ProfId2PT=Número segurança social
 ProfId3PT=Número rexistro comercial
 ProfId4PT=Conservatorio
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Id prof. 1 (OGRN)
 ProfId2RU=Id prof. 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=Pode tamén verificar manualmente na web da Comisión Europe
 ErrorVATCheckMS_UNAVAILABLE=Comprobación imposible. O servizo de comprobación non é fornecido polo Estado membro (%s).
 NorProspectNorCustomer=Nin cliente, nin cliente potencial
 JuridicalStatus=Forma xurídica
+Workforce=Workforce
 Staff=Empregados
 ProspectLevelShort=Potencial
 ProspectLevel=Cliente potencial
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Termos de pagamento - Provedor
 PaymentTypeBoth=Tipo de pagamento - Cliente e Provedor
 MulticurrencyUsed=Usa MultiMoeda
 MulticurrencyCurrency=Moeda
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/gl_ES/ecm.lang b/htdocs/langs/gl_ES/ecm.lang
index 348394f591b..ac1f38369d5 100644
--- a/htdocs/langs/gl_ES/ecm.lang
+++ b/htdocs/langs/gl_ES/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Buscar por palabras clave
 ECMSearchByEntity=Buscar por obxecto
 ECMSectionOfDocuments=Directorios de documentos
 ECMTypeAuto=Automático
-ECMDocsBySocialContributions=Documentos ligados a taxas sociais ou fiscais
-ECMDocsByThirdParties=Documentos ligados a terceiros
-ECMDocsByProposals=Documentos ligados a orzamentos
-ECMDocsByOrders=Documentos ligados a pedimentos
-ECMDocsByContracts=Documentos ligados a contratos
-ECMDocsByInvoices=Documentos ligados a facturas
-ECMDocsByProducts=Documentos ligados a produtos
-ECMDocsByProjects=Documentos ligados a proxectos
-ECMDocsByUsers=Documentos ligados a usuarios
-ECMDocsByInterventions=Documentos ligados a intervencións
-ECMDocsByExpenseReports=Documentos ligados a informes de gastos
-ECMDocsByHolidays=Documentos ligados a días libres
-ECMDocsBySupplierProposals=Documentos ligados a orzamentos de provedores.
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=Non foi creado o directorio
 ShowECMSection=Amosar directorio
 DeleteSection=Eliminación directorio
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resincronizar a listaxe de directorios
 HashOfFileContent=Hash do contido do ficheiro
 NoDirectoriesFound=Non foron atopados directorios
 FileNotYetIndexedInDatabase=Ficheiro aínda non indexado na base de datos (tente voltar cargalo)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/gl_ES/hrm.lang b/htdocs/langs/gl_ES/hrm.lang
index cb095d64e0d..bd222ac2e5e 100644
--- a/htdocs/langs/gl_ES/hrm.lang
+++ b/htdocs/langs/gl_ES/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Empregados
 Employee=Empregado
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/gl_ES/install.lang b/htdocs/langs/gl_ES/install.lang
index 665d97670a0..65fd314784a 100644
--- a/htdocs/langs/gl_ES/install.lang
+++ b/htdocs/langs/gl_ES/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=This PHP supports sessions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/gl_ES/intracommreport.lang b/htdocs/langs/gl_ES/intracommreport.lang
new file mode 100644
index 00000000000..576a0345c46
--- /dev/null
+++ b/htdocs/langs/gl_ES/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=Listaxe
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/gl_ES/languages.lang b/htdocs/langs/gl_ES/languages.lang
index 762cecb554f..ce9d78410c2 100644
--- a/htdocs/langs/gl_ES/languages.lang
+++ b/htdocs/langs/gl_ES/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Español (Paraguay)
 Language_es_PE=Español (Perú)
 Language_es_PR=Español (Porto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/gl_ES/main.lang b/htdocs/langs/gl_ES/main.lang
index a442449ba51..5ccf9173975 100644
--- a/htdocs/langs/gl_ES/main.lang
+++ b/htdocs/langs/gl_ES/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Eliminar vínculo
 AddToDraft=Engadir a borrador
 Update=Actualizar
 Close=Pechar
+CloseAs=Set status to
 CloseBox=Eliminar panel do seu taboleiro
 Confirm=Confirmar
 ConfirmSendCardByMail=¿Realmente quere enviar o contido desta ficha por correo a <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Reabrir
 Upload=Actualizar arquivo
 ToLink=Vínculo
 Select=Seleccionar
+SelectAll=Select all
 Choose=Escoller
 Resize=Redimensionar
 ResizeOrCrop=Cambiar o tamaño ou cortar
@@ -256,6 +258,7 @@ Cards=Fichas
 Card=Ficha
 Now=Agora
 HourStart=Hora de inicio
+Deadline=Deadline
 Date=Data
 DateAndHour=Data e hora
 DateToday=Data de hoxe
@@ -264,8 +267,10 @@ DateStart=Data de inicio
 DateEnd=Data de fin
 DateCreation=Data de creación
 DateCreationShort=Data creac.
+IPCreation=Creation IP
 DateModification=Data de modificación
 DateModificationShort=Data modif.
+IPModification=Modification IP
 DateLastModification=Última data de modificación
 DateValidation=Data de validación
 DateClosing=Data de peche
@@ -319,6 +324,7 @@ Morning=Na mañá
 Afternoon=Na tarde
 Quadri=Trimestre
 MonthOfDay=Mes do día
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=min
 Rate=Tipo
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Importe total na divisa orixinal
 MulticurrencyAmountHT=Base impoñible na divisa orixinal
 MulticurrencyAmountTTC=Total na divisa orixinal
 MulticurrencyAmountVAT=Importe IVE na divisa orixinal
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Importe Imposto 2
 AmountLT2=Importe IRPF
 AmountLT1ES=Importe RE
@@ -487,6 +494,7 @@ By=Por
 From=De
 FromDate=De
 FromLocation=De
+at=at
 to=a
 To=a
 and=e
@@ -509,6 +517,7 @@ Draft=Borrador
 Drafts=Borradores
 StatusInterInvoiced=Facturado
 Validated=Validado
+ValidatedToProduce=Validated (To produce)
 Opened=Activo
 OpenAll=Aberto (todo)
 ClosedAll=Pechado (Todo)
@@ -655,6 +664,7 @@ Response=Resposta
 Priority=Prioridade
 SendByMail=Enviar por e-mail
 MailSentBy=E-mail enviado por
+NotSent=Non enviado
 TextUsedInTheMessageBody=Texto no corpo da mensaxe
 SendAcknowledgementByMail=Enviar correo de confirmación
 SendMail=Enviar correo
@@ -836,6 +846,7 @@ ListOfTemplates=Listaxe de prantillas
 Gender=Sexo
 Genderman=Home
 Genderwoman=Muller
+Genderother=Outro
 ViewList=Vista de listaxe
 ViewGantt=Vista de Gantt
 ViewKanban=Vista de Kanban
@@ -877,6 +888,8 @@ Miscellaneous=Miscelánea
 Calendar=Calendario
 GroupBy=Agrupado por...
 ViewFlatList=Ver listaxe plana
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Eliminar cadea '%s'
 SomeTranslationAreUncomplete=Algúns dos idiomas ofrecidos poden estar parcialmente traducidos ou poden conter erros. Axuda a corrixir teu idioma rexistrándose en <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Ligazón de descarga directa (público/externo)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Envíos a clientes
 SearchIntoExpenseReports=Informes de gastos
 SearchIntoLeaves=Día libre
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Pagamentos a provedores
+SearchIntoMiscPayments=Pagamentos varios
 CommentLink=Comentarios
 NbComments=Número de comentarios
 CommentPage=Espazo de comentarios
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Información
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Date of birth
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/gl_ES/members.lang b/htdocs/langs/gl_ES/members.lang
index e1a665a28de..819a5522627 100644
--- a/htdocs/langs/gl_ES/members.lang
+++ b/htdocs/langs/gl_ES/members.lang
@@ -19,14 +19,12 @@ MembersCards=Carnés de membros
 MembersList=Listaxe de membros
 MembersListToValid=Listaxe de membros borrador (a validar)
 MembersListValid=Listaxe de membros validados
-MembersListUpToDate=Listaxe dos membros válidos ao día de adhesión
-MembersListNotUpToDate=Listaxe dos membros válidos non ao día de adhesión
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=Listaxe dos membros dados de baixa
 MembersListQualified=Listaxe dos membros cualificados
 MenuMembersToValidate=Membros borrador
 MenuMembersValidated=Membros validados
-MenuMembersUpToDate=Membros ao día
-MenuMembersNotUpToDate=Membros non ao día
 MenuMembersResiliated=Membros de baixa
 MembersWithSubscriptionToReceive=Membros agardando recibir afiliación
 MembersWithSubscriptionToReceiveShort=Agardando afiliación
@@ -34,6 +32,7 @@ DateSubscription=Data afiliación
 DateEndSubscription=Data fin afiliación
 EndSubscription=Fin afiliación
 SubscriptionId=ID afiliación
+WithoutSubscription=Without subscription
 MemberId=ID membro
 NewMember=Novo membro
 MemberType=Tipo de membro
@@ -81,7 +80,7 @@ DeleteType=Eliminar
 VoteAllowed=Voto autorizado
 Physical=Físico
 Moral=Xurídico
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reactivar
 ResiliateMember=Dar de baixa a un membro
 ConfirmResiliateMember=¿Está certo de querer dar de baixa a este membro?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Enviar mail na validación dun novo membro
 SendingEmailOnNewSubscription=Enviar mail nunha nova afiliación
 SendingReminderForExpiredSubscription=Enviar un recordatorio para afiliación caducada
 SendingEmailOnCancelation=Enviar mail nunha cancelación
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=A súa membresía foi recibida.
 YourMembershipWasValidated=A súa membresía foi validada.
@@ -167,6 +167,7 @@ MembersStatisticsByState=Estatísticas de membros por provincia/pais
 MembersStatisticsByTown=Estatísticas de membros por poboación
 MembersStatisticsByRegion=Estatísticas de membros por rexión
 NbOfMembers=Número de membros
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=Ningún membro validado atopado
 MembersByCountryDesc=Esta pantalla presenta unha estatística do número de membros por países. Porén, a gráfica utiliza o servizo en líña  de gráficas de Google e só é operativo cando ten operativa unha conexión a Internet.
 MembersByStateDesc=Esta pantalla presenta unha estatística do número de membros por paises/provincias/comunidades
@@ -176,6 +177,7 @@ MenuMembersStats=Estatísticas
 LastMemberDate=Última data de membro
 LatestSubscriptionDate=Data da última cotización
 MemberNature=Natureza do membro
+MembersNature=Nature of members
 Public=Información pública
 NewMemberbyWeb=Novo membro engadido. Agardando validación
 NewMemberForm=Novo formulario de membro
diff --git a/htdocs/langs/gl_ES/mrp.lang b/htdocs/langs/gl_ES/mrp.lang
index 14eee8d483e..84a0177e4de 100644
--- a/htdocs/langs/gl_ES/mrp.lang
+++ b/htdocs/langs/gl_ES/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Ordes de fabricación
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/gl_ES/products.lang b/htdocs/langs/gl_ES/products.lang
index fb884d5d1bc..585ebaf1788 100644
--- a/htdocs/langs/gl_ES/products.lang
+++ b/htdocs/langs/gl_ES/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=Se 0, este produto non é un produto virtual
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Filtro por clave
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=Listaxe de produtos/servizos que compoñen este produto virtual /produto/kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Eliminar un produto/servizo
 ConfirmDeleteProduct=¿Está certo de querer eliminar este produto/servizo?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Valores globais dispoñibles:
 PriceMode=Modo prezo
 PriceNumeric=Número
 DefaultPrice=Prezo por defecto
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Prezo mínimo de compra
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/gl_ES/recruitment.lang b/htdocs/langs/gl_ES/recruitment.lang
index 4b42eda77ec..f97c12e25bb 100644
--- a/htdocs/langs/gl_ES/recruitment.lang
+++ b/htdocs/langs/gl_ES/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Posto de traballo
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/gl_ES/stocks.lang b/htdocs/langs/gl_ES/stocks.lang
index 7f43c3ed9de..dbe81a57b5b 100644
--- a/htdocs/langs/gl_ES/stocks.lang
+++ b/htdocs/langs/gl_ES/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Localización
 LocationSummary=Short name location
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventario
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/gl_ES/suppliers.lang b/htdocs/langs/gl_ES/suppliers.lang
index eec158d1ff6..99bc16f91d3 100644
--- a/htdocs/langs/gl_ES/suppliers.lang
+++ b/htdocs/langs/gl_ES/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Pedidos de provedor a facturar
 NbDaysToDelivery=Tempo de entrega (días)
 DescNbDaysToDelivery=O maior atraso nas entregas de produtos deste pedido
 SupplierReputation=Reputación provedor
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Non realizar pedidos
 NotTheGoodQualitySupplier=Mala calidade
 ReputationForThisProduct=Reputación
diff --git a/htdocs/langs/gl_ES/website.lang b/htdocs/langs/gl_ES/website.lang
index 0e491ee17b6..e16ee97f8fa 100644
--- a/htdocs/langs/gl_ES/website.lang
+++ b/htdocs/langs/gl_ES/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Páxina
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=Fíos RSS
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang
index 7b59e33b296..3211a0b62df 100644
--- a/htdocs/langs/he_IL/accountancy.lang
+++ b/htdocs/langs/he_IL/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting expert
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=Journals
+Journals=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Chart of accounts
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bank accounts
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=By year
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index c79cf4ab028..e630e1c2258 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=הסרת הנעילה חיבור
 YourSession=הפגישה שלך
 Sessions=Users Sessions
 WebUserGroup=שרת אינטרנט המשתמש / קבוצה
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=מאגר המידע charset לאחסון נתונים
 DBSortingCharset=מאגר המידע charset למיין נתונים
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript מושבת
 UsePreviewTabs=השתמש בכרטיסיות תצוגה מקדימה
 ShowPreview=הצג תצוגה מקדימה
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=לא זמין תצוגה מקדימה
 ThemeCurrentlyActive=פעיל כרגע הנושא
 CurrentTimeZone=אזור PHP (שרת)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=שילוב של מערכת ClickToDial (כוכבית, ...)
-Module59Name=Bookmark4u
-Module59Desc=הוספת פונקציה ליצור חשבון Bookmark4u מחשבון Dolibarr
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=התערבויות
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=לקרוא חשבוניות של לקוחות
 Permission12=צור / לשנות חשבוניות של לקוחות
-Permission13=Unvalidate חשבוניות של לקוחות
+Permission13=Invalidate customer invoices
 Permission14=אימות חשבוניות של לקוחות
 Permission15=שלח חשבוניות ללקוח במייל
 Permission16=צור תשלומים עבור חשבוניות של לקוחות
@@ -688,6 +694,7 @@ Permission32=צור / לשנות מוצרים
 Permission34=מחק מוצרים
 Permission36=ראה / ניהול מוצרים מוסתרים
 Permission38=ייצוא מוצרים
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=לקרוא התערבויות
 Permission62=צור / לשנות התערבויות
 Permission64=מחק התערבויות
 Permission67=ייצוא התערבויות
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=קראו חברי
 Permission72=צור / לשנות חברים
 Permission74=מחיקת חברים
@@ -718,6 +728,7 @@ Permission95=לקרוא דוחות
 Permission101=לקרוא sendings
 Permission102=צור / לשנות sendings
 Permission104=אמת sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=מחק sendings
 Permission111=לקרוא דוחות כספיים
@@ -825,10 +836,11 @@ Permission402=יצירה / שינוי הנחות
 Permission403=אמת הנחות
 Permission404=מחק את הנחות
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=קבל תוצאה של יצוא
 Permission1202=יצירה / שינוי של הייצוא
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=הפעל יבוא המוני של נתונים חיצוניים 
 Permission1321=יצוא חשבוניות הלקוח, תכונות ותשלומים
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=לקרוא עסקאות
 Permission50202=ייבוא ​​עסקאות
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=הגדרת הציל
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=לייבל שימוש כברירת מחדל אם לא התר
 LabelOnDocuments=התווית על מסמכים
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=בסוף החודש
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=רשימת אירועים Dolibarr הביטחון
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= כלל זה הוא נאלץ <b>%s</b> ידי מודול מופעל
+ForcedToByAModule=כלל זה הוא נאלץ <b>%s</b> ידי מודול מופעל
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Edition of field %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1282,7 +1322,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=חזור הסיסמה שנוצר על פי אלגוריתם Dolibarr פנימי: 8 תווים המכילים מספרים ותווים משותפים באותיות קטנות.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=תיבת סימון לשלוח אישור בדואר לחברי (אימות או מנוי חדש) מופעלת כברירת מחדל
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=הגדרת LDAP
 LDAPGlobalParameters=גלובל פרמטרים
@@ -1523,7 +1564,9 @@ LDAPDescValues=ערכים לדוגמה מיועדים <b>OpenLDAP</b> עם סכ
 ForANonAnonymousAccess=לתקופה של acces מאומתים (גישה לכתוב למשל)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=רמה
 SyslogFilename=שם קובץ ונתיב
 YouCanUseDOL_DATA_ROOT=ניתן להשתמש DOL_DATA_ROOT / dolibarr.log עבור קובץ יומן בספרייה Dolibarr &quot;מסמכים&quot;. ניתן להגדיר בדרך אחרת כדי לאחסן קובץ זה.
 ErrorUnknownSyslogConstant=%s קבועים אינו ידוע Syslog מתמיד
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=מודול תרומה ההתקנה
@@ -1629,7 +1672,7 @@ AdvancedEditor=עורך מתקדם
 ActivateFCKeditor=הפעל עורך מתקדם עבור:
 FCKeditorForCompany=WYSIWIG יצירת / מהדורה של תיאור של רכיב הערה (למעט מוצרים / שירותים)
 FCKeditorForProduct=WYSIWIG יצירת / מהדורה של המוצרים / שירות של תיאור הערה
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG יצירת / מהדורה של דברי דואר
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=תפריט נמחק
+Menu=Menu
 Menus=תפריטים
 TreeMenuPersonalized=תפריטים מותאמים אישית
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=תפריט חדש
-Menu=בחירת התפריט
 MenuHandler=תפריט המטפל
 MenuModule=מקור מודול
 HideUnauthorizedMenu= הסתר תפריטים בלתי מורשים (אפור)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=לחץ כדי לחייג ההתקנה מודול
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=צדדים שלישיים
 MailToMember=משתמשים
 MailToUser=משתמשים
-MailToProject=Projects page
+MailToProject=פרוייקטים
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=רוכסן
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/he_IL/banks.lang b/htdocs/langs/he_IL/banks.lang
index 75f9549dca5..9500a5b8b2e 100644
--- a/htdocs/langs/he_IL/banks.lang
+++ b/htdocs/langs/he_IL/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/he_IL/categories.lang b/htdocs/langs/he_IL/categories.lang
index 0115a1a5dca..c8bfcef77e2 100644
--- a/htdocs/langs/he_IL/categories.lang
+++ b/htdocs/langs/he_IL/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/he_IL/companies.lang b/htdocs/langs/he_IL/companies.lang
index 673e594c9bc..2537b7e9b2f 100644
--- a/htdocs/langs/he_IL/companies.lang
+++ b/htdocs/langs/he_IL/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
 ProspectLevel=Prospect potential
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Currency
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/he_IL/ecm.lang b/htdocs/langs/he_IL/ecm.lang
index 62d76a0b7cf..d0ef90500e6 100644
--- a/htdocs/langs/he_IL/ecm.lang
+++ b/htdocs/langs/he_IL/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Search by keywords
 ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/he_IL/hrm.lang b/htdocs/langs/he_IL/hrm.lang
index 6cc7f6bef24..3b8f137e103 100644
--- a/htdocs/langs/he_IL/hrm.lang
+++ b/htdocs/langs/he_IL/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Employees
 Employee=Employee
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/he_IL/install.lang b/htdocs/langs/he_IL/install.lang
index 03d8c971ae7..9c06c5e26ed 100644
--- a/htdocs/langs/he_IL/install.lang
+++ b/htdocs/langs/he_IL/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=This PHP supports sessions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/he_IL/intracommreport.lang b/htdocs/langs/he_IL/intracommreport.lang
new file mode 100644
index 00000000000..3060300b974
--- /dev/null
+++ b/htdocs/langs/he_IL/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=List
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/he_IL/languages.lang b/htdocs/langs/he_IL/languages.lang
index 0289bdfbc68..4e177f741af 100644
--- a/htdocs/langs/he_IL/languages.lang
+++ b/htdocs/langs/he_IL/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=ספרדית (פרגוואי)
 Language_es_PE=ספרדית (פרו)
 Language_es_PR=ספרדית (פורטו ריקו)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index 1b6a09d3b5c..f6d4759a902 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Remove link
 AddToDraft=Add to draft
 Update=Update
 Close=Close
+CloseAs=Set status to
 CloseBox=Remove widget from your dashboard
 Confirm=Confirm
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Re-Open
 Upload=Upload
 ToLink=קשר
 Select=Select
+SelectAll=Select all
 Choose=Choose
 Resize=Resize
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=Cards
 Card=Card
 Now=Now
 HourStart=Start hour
+Deadline=Deadline
 Date=Date
 DateAndHour=Date and hour
 DateToday=Today's date
@@ -264,8 +267,10 @@ DateStart=Start date
 DateEnd=End date
 DateCreation=Creation date
 DateCreationShort=Creat. date
+IPCreation=Creation IP
 DateModification=Modification date
 DateModificationShort=Modif. date
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
@@ -319,6 +324,7 @@ Morning=Morning
 Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Month of the day
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Rate
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Amount tax 2
 AmountLT2=Amount tax 3
 AmountLT1ES=Amount RE
@@ -487,6 +494,7 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
+at=at
 to=to
 To=to
 and=and
@@ -509,6 +517,7 @@ Draft=Draft
 Drafts=Drafts
 StatusInterInvoiced=Invoiced
 Validated=Validated
+ValidatedToProduce=Validated (To produce)
 Opened=Open
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Response
 Priority=Priority
 SendByMail=Send by email
 MailSentBy=Email sent by
+NotSent=Not sent
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
@@ -836,6 +846,7 @@ ListOfTemplates=List of templates
 Gender=Gender
 Genderman=Man
 Genderwoman=Woman
+Genderother=אחר
 ViewList=List view
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=שונות
 Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Comments
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Information
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Date of birth
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/he_IL/members.lang b/htdocs/langs/he_IL/members.lang
index ca47f3c55c7..5940fb7ea57 100644
--- a/htdocs/langs/he_IL/members.lang
+++ b/htdocs/langs/he_IL/members.lang
@@ -19,14 +19,12 @@ MembersCards=Members business cards
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
 SubscriptionId=Subscription id
+WithoutSubscription=Without subscription
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@@ -81,7 +80,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/he_IL/mrp.lang b/htdocs/langs/he_IL/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/he_IL/mrp.lang
+++ b/htdocs/langs/he_IL/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index b8d4bc7a2d5..fe9deabbb4e 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/he_IL/recruitment.lang b/htdocs/langs/he_IL/recruitment.lang
index 73e9a7fa07f..b775e78552e 100644
--- a/htdocs/langs/he_IL/recruitment.lang
+++ b/htdocs/langs/he_IL/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/he_IL/stocks.lang b/htdocs/langs/he_IL/stocks.lang
index d91da3900ff..8907a4d5091 100644
--- a/htdocs/langs/he_IL/stocks.lang
+++ b/htdocs/langs/he_IL/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/he_IL/suppliers.lang b/htdocs/langs/he_IL/suppliers.lang
index 51562b8bb7a..03b03c75269 100644
--- a/htdocs/langs/he_IL/suppliers.lang
+++ b/htdocs/langs/he_IL/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/he_IL/website.lang b/htdocs/langs/he_IL/website.lang
index 2207acdf12f..bc14948946c 100644
--- a/htdocs/langs/he_IL/website.lang
+++ b/htdocs/langs/he_IL/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=עדכוני RSS
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/hi_IN/accountancy.lang b/htdocs/langs/hi_IN/accountancy.lang
index 9d20e82a9a3..0afe8f7a50d 100644
--- a/htdocs/langs/hi_IN/accountancy.lang
+++ b/htdocs/langs/hi_IN/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=सेवा के लिए डिफ़ॉल्ट
 DefaultForProduct=उत्पाद के लिए डिफ़ॉल्ट
 CantSuggest=सुझाव नहीं दे सकते
 AccountancySetupDoneFromAccountancyMenu=लेखाकर्म का अधिकांश सेटअप मेनू से किया जाता है %s
-ConfigAccountingExpert=मॉड्यूल लेखांकन विशेषज्ञ का कन्फ़िग्यर्एशन
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=रोज़नामचीकरण
-Journaux=बहीखाता
+Journals=बहीखाता
 JournalFinancial=वित्तीय बहीखाता
 BackToChartofaccounts=प्रतिफल लेखा जोखा का व्यौरा
 Chartofaccounts=लेखा जोखा का व्यौरा
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=चालू समर्पित खाता
 AssignDedicatedAccountingAccount=निर्दिष्ट करने के लिए नया खाता
 InvoiceLabel=चालान लेबल
@@ -33,8 +35,8 @@ OtherInfo=अन्य सूचना
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bank accounts
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=By year
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/hi_IN/admin.lang b/htdocs/langs/hi_IN/admin.lang
index 24ca75589d3..976284cbff1 100644
--- a/htdocs/langs/hi_IN/admin.lang
+++ b/htdocs/langs/hi_IN/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=कनेक्शन लॉक हटाए
 YourSession=आपका सत्र
 Sessions=उपयोगकर्ताओं का सत्र
 WebUserGroup=वेब सर्वर उपयोगकर्ता / समूह
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=आपका PHP कॉन्फ़िगरेशन सक्रिय सत्रों की सूची की अनुमति नहीं देता है। सत्र संरक्षण के लिए उपयोग की गई डायरेक्टरी ( <b>%s</b>) शायद संरक्षित की गई है (उदाहरण के लिए OS अनुमतियाँ या PHP निर्देशक द्वारा open_basedir)।
 DBStoringCharset=डेटाबेस डेटा संग्रहीत करने के लिए charset
 DBSortingCharset=डेटा को सॉर्ट करने के लिए डेटाबेस charset 
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
 CurrentTimeZone=TimeZone PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Interventions
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
+Permission13=Invalidate customer invoices
 Permission14=Validate customer invoices
 Permission15=Send customer invoices by email
 Permission16=Create payments for customer invoices
@@ -688,6 +694,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Read members
 Permission72=Create/modify members
 Permission74=Delete members
@@ -718,6 +728,7 @@ Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
@@ -825,10 +836,11 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Edition of field %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1282,7 +1322,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Global parameters
@@ -1523,7 +1564,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Level
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
@@ -1629,7 +1672,7 @@ AdvancedEditor=Advanced editor
 ActivateFCKeditor=Activate advanced editor for:
 FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
 FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
-MailToProject=Projects page
+MailToProject=Projects
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/hi_IN/banks.lang b/htdocs/langs/hi_IN/banks.lang
index 75f9549dca5..9500a5b8b2e 100644
--- a/htdocs/langs/hi_IN/banks.lang
+++ b/htdocs/langs/hi_IN/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/hi_IN/categories.lang b/htdocs/langs/hi_IN/categories.lang
index 9bb71984ecf..ba37a43b4ec 100644
--- a/htdocs/langs/hi_IN/categories.lang
+++ b/htdocs/langs/hi_IN/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/hi_IN/companies.lang b/htdocs/langs/hi_IN/companies.lang
index af8988fd3ef..e9f51f14885 100644
--- a/htdocs/langs/hi_IN/companies.lang
+++ b/htdocs/langs/hi_IN/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
 ProspectLevel=Prospect potential
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Currency
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/hi_IN/ecm.lang b/htdocs/langs/hi_IN/ecm.lang
index 369ac6dfdfa..71df60734fb 100644
--- a/htdocs/langs/hi_IN/ecm.lang
+++ b/htdocs/langs/hi_IN/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Search by keywords
 ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to vendor proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/hi_IN/hrm.lang b/htdocs/langs/hi_IN/hrm.lang
index 6cc7f6bef24..3b8f137e103 100644
--- a/htdocs/langs/hi_IN/hrm.lang
+++ b/htdocs/langs/hi_IN/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Employees
 Employee=Employee
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/hi_IN/install.lang b/htdocs/langs/hi_IN/install.lang
index 2d708c04147..63947dad154 100644
--- a/htdocs/langs/hi_IN/install.lang
+++ b/htdocs/langs/hi_IN/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=This PHP supports sessions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/hi_IN/intracommreport.lang b/htdocs/langs/hi_IN/intracommreport.lang
new file mode 100644
index 00000000000..3060300b974
--- /dev/null
+++ b/htdocs/langs/hi_IN/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=List
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/hi_IN/languages.lang b/htdocs/langs/hi_IN/languages.lang
index cc80b9f1719..ba187326705 100644
--- a/htdocs/langs/hi_IN/languages.lang
+++ b/htdocs/langs/hi_IN/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/hi_IN/main.lang b/htdocs/langs/hi_IN/main.lang
index 429e07287e1..50363abd476 100644
--- a/htdocs/langs/hi_IN/main.lang
+++ b/htdocs/langs/hi_IN/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Remove link
 AddToDraft=Add to draft
 Update=Update
 Close=Close
+CloseAs=Set status to
 CloseBox=Remove widget from your dashboard
 Confirm=Confirm
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Re-Open
 Upload=Upload
 ToLink=Link
 Select=Select
+SelectAll=Select all
 Choose=Choose
 Resize=Resize
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=Cards
 Card=Card
 Now=Now
 HourStart=Start hour
+Deadline=Deadline
 Date=Date
 DateAndHour=Date and hour
 DateToday=Today's date
@@ -264,8 +267,10 @@ DateStart=Start date
 DateEnd=End date
 DateCreation=Creation date
 DateCreationShort=Creat. date
+IPCreation=Creation IP
 DateModification=Modification date
 DateModificationShort=Modif. date
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
@@ -319,6 +324,7 @@ Morning=Morning
 Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Month of the day
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Rate
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Amount tax 2
 AmountLT2=Amount tax 3
 AmountLT1ES=Amount RE
@@ -487,6 +494,7 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
+at=at
 to=to
 To=to
 and=and
@@ -509,6 +517,7 @@ Draft=Draft
 Drafts=Drafts
 StatusInterInvoiced=Invoiced
 Validated=Validated
+ValidatedToProduce=Validated (To produce)
 Opened=Open
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Response
 Priority=Priority
 SendByMail=Send by email
 MailSentBy=Email sent by
+NotSent=Not sent
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
@@ -836,6 +846,7 @@ ListOfTemplates=List of templates
 Gender=Gender
 Genderman=Man
 Genderwoman=Woman
+Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Comments
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Information
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Date of birth
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/hi_IN/members.lang b/htdocs/langs/hi_IN/members.lang
index 5ef946ddf67..5812248b129 100644
--- a/htdocs/langs/hi_IN/members.lang
+++ b/htdocs/langs/hi_IN/members.lang
@@ -19,14 +19,12 @@ MembersCards=Members business cards
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
 SubscriptionId=Subscription id
+WithoutSubscription=Without subscription
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@@ -81,7 +80,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/hi_IN/mrp.lang b/htdocs/langs/hi_IN/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/hi_IN/mrp.lang
+++ b/htdocs/langs/hi_IN/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/hi_IN/products.lang b/htdocs/langs/hi_IN/products.lang
index b59aa2f7080..97db059594f 100644
--- a/htdocs/langs/hi_IN/products.lang
+++ b/htdocs/langs/hi_IN/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/hi_IN/recruitment.lang b/htdocs/langs/hi_IN/recruitment.lang
index 73e9a7fa07f..b775e78552e 100644
--- a/htdocs/langs/hi_IN/recruitment.lang
+++ b/htdocs/langs/hi_IN/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/hi_IN/stocks.lang b/htdocs/langs/hi_IN/stocks.lang
index 81163e8d4b0..660443bcded 100644
--- a/htdocs/langs/hi_IN/stocks.lang
+++ b/htdocs/langs/hi_IN/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/hi_IN/suppliers.lang b/htdocs/langs/hi_IN/suppliers.lang
index 51562b8bb7a..03b03c75269 100644
--- a/htdocs/langs/hi_IN/suppliers.lang
+++ b/htdocs/langs/hi_IN/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/hi_IN/website.lang b/htdocs/langs/hi_IN/website.lang
index 4b5294d5e43..03e042e4be6 100644
--- a/htdocs/langs/hi_IN/website.lang
+++ b/htdocs/langs/hi_IN/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
index ef969d9eba3..d3f1ceacc61 100644
--- a/htdocs/langs/hr_HR/accountancy.lang
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Napredno podešavanje modula računovodstva
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=Journals
+Journals=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Grafikon za račune
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Ostali podaci
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Dodaj obračunski račun
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bankovni računi
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Stanje računa
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=Po godini
 NotMatch=Nije postavljeno
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Godina za obrisati
 DelJournal=Dnevnik za obrisati
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Financijski izvještaj uključujući sve tipove plačanja po bankovnom računom
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index 7fc2fc655ff..073e9232710 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Otključaj spajanje
 YourSession=Vaša sesija
 Sessions=Users Sessions
 WebUserGroup=Web Server korisnik/grupa
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Charset baze za sortiranje podataka
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript onemogućen
 UsePreviewTabs=Koristi karticu pregleda
 ShowPreview=Prikaži pregled
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Pregled nije dostupan
 ThemeCurrentlyActive=Tema trenutno aktivna
 CurrentTimeZone=Vremenska zona PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Otkazni rok
 NewByMonth=New by month
 Emails=e-pošta
 EMailsSetup=podešavanje e-pošte
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Biblioteka korištena za kreiranje PDF-a
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Koristi 3 koraka odobravanja kada je iznos (bez poreza) veći od...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integracija ClickToDial sistema (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Intervencije
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Anketa, Upitnik ili Glasanje
@@ -671,7 +677,7 @@ Module63000Name=Sredstva
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Pregledaj izlazne račune
 Permission12=Izradi/promijeni izlazne račune
-Permission13=Ne ovjeravaj izlazni račun
+Permission13=Invalidate customer invoices
 Permission14=Ovjeri izlazni račun
 Permission15=Pošalji izlazni račun e-poštom
 Permission16=Unesi plaćanja izlaznih računa
@@ -688,6 +694,7 @@ Permission32=Izradi/izmjeni proizvod
 Permission34=Obriši proizvod
 Permission36=Pregled/upravljanje skrivenim proizvodima
 Permission38=izvoz proizvoda
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Čitaj intervencije
 Permission62=Izradi/promjeni intervencije
 Permission64=Obriši intervencije
 Permission67=Izvezi intervencije
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Čitaj članove
 Permission72=Izradi/izmjeni članove
 Permission74=Obriši članove
@@ -718,6 +728,7 @@ Permission95=Čitaj izvještaje
 Permission101=Čitaj slanja
 Permission102=Izradi/izmjeni slanja
 Permission104=Ovjeri slanja
+Permission105=Send sendings by email
 Permission106=Izvezi slanja
 Permission109=Obriši slanja
 Permission111=Čitanje financijskih računa
@@ -825,10 +836,11 @@ Permission402=Izradi/izmjeni popuste
 Permission403=Ovjeri popuste
 Permission404=Obriši popuste
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Izvoz plaća
+Permission517=Read payments of salaries of everybody
+Permission519=Izvoz plaća
 Permission520=Čitaj kredite
 Permission522=Izradi/izmjeni kredite
 Permission524=Obriši kredite
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -866,7 +881,7 @@ Permission1002=Izradi/izmjeni skladišta
 Permission1003=Obriši skladišta
 Permission1004=Čitaj kretanja zaliha
 Permission1005=Izradi/izmjeni kretanja zaliha
-Permission1101=Read delivery receipts
+Permission1101=Pregledaj otpremnice
 Permission1102=Create/modify delivery receipts
 Permission1104=Validate delivery receipts
 Permission1109=Delete delivery receipts
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Primi rezultat izvoza
 Permission1202=Izradi/izmjeni izvoz
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Pokreni masovni uvoz vanjskih podataka u bazu (učitavanje podata
 Permission1321=Izvezi račune kupaca, atribute i plačanja
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Pročitaj planirani posao
 Permission23002=Izradi/izmjeni Planirani posao
 Permission23003=Obriši planirani posao
 Permission23004=Izvrši planirani posao
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Čitaj transakcije
 Permission50202=Uvezi transakcije
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Čitaj sredstva
 Permission63002=Izradi/izmjeni sredstva
 Permission63003=Obriši sredstva
 Permission63004=Poveži sredstava sa događajima agende
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Vrste trećih osoba
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Postavi spremljeno
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Oznake korištene kao zadane ako ne postoji prijevoda za kod
 LabelOnDocuments=Oznake na dokumentima
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=Na kraju mjeseca
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=O Web serveru
 InfoDatabase=O bazi podataka
 InfoPHP=O PHP
 InfoPerf=O izvođenju
+InfoSecurity=About Security
 BrowserName=Naziv preglednika
 BrowserOS=OS preglednika
 ListOfSecurityEvents=Popis Dolibarr sigurnosnih događaja
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL uvoz
-ForcedToByAModule= Ovo pravilo je forsirano na <b>%s</b> od aktiviranog modula
+ForcedToByAModule=Ovo pravilo je forsirano na <b>%s</b> od aktiviranog modula
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Izdanje polja %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1282,7 +1322,7 @@ GetBarCode=Uzmi barkod
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Vrati lozinku prema vašoj osobno postavljenoj konfiguraciji.
 SetupPerso=Sukladno vašoj konfiguraciji
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=Podešavanje LDAP
 LDAPGlobalParameters=Globalni parametri
@@ -1523,7 +1564,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Nivo
 SyslogFilename=Naziv datoteke i putanja
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Podešavanje modula donacija
@@ -1629,7 +1672,7 @@ AdvancedEditor=Napredni uređivač
 ActivateFCKeditor=Aktiviraj napredni uređivač za: 
 FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
 FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Izbornik obrisan
+Menu=Menu
 Menus=Izbornici
 TreeMenuPersonalized=Personizirani izbornik
 NotTopTreeMenuPersonalized=Osobni izbornici nisu povezani na gornji izbornik
 NewMenu=Novi izbornik
-Menu=Odabir za izbornik
 MenuHandler=Nosioc izbornika
 MenuModule=Izvorni modul
 HideUnauthorizedMenu= Sakrij neautorizirane izbornike (sivo)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Podešavanje modula ClickToDial
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Podešavanje modula Izvještaji troškova
 TemplatePDFExpenseReports=Predlošci dokumenta za generiranje izvještaja troškova
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Treće osobe
 MailToMember=Članovi
 MailToUser=Korisnici
-MailToProject=Projects page
+MailToProject=Projekti
 MailToTicket=Tickets
 ByDefaultInList=Prikaži kao zadano na popisu
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=PBR
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/hr_HR/banks.lang b/htdocs/langs/hr_HR/banks.lang
index 98c1d34d3f0..722bbc6949d 100644
--- a/htdocs/langs/hr_HR/banks.lang
+++ b/htdocs/langs/hr_HR/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/hr_HR/categories.lang b/htdocs/langs/hr_HR/categories.lang
index f6a9205bc95..b3f785c8df7 100644
--- a/htdocs/langs/hr_HR/categories.lang
+++ b/htdocs/langs/hr_HR/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Podešavanje kategorija
 CategorieRecursiv=Poveži automatski sa matičnom kategorijom
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Dodaj sljedeće proizvode/usluge
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Prikaži kategoriju
 ByDefaultInList=Po predefiniranom na listi
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/hr_HR/companies.lang b/htdocs/langs/hr_HR/companies.lang
index b376da108d4..70f428267e7 100644
--- a/htdocs/langs/hr_HR/companies.lang
+++ b/htdocs/langs/hr_HR/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Dokaz ID 2 (broj komercijalnog podatka)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registracijski broj
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Dokaz ID 3 (broj komercijalnog podatka)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Provjera nije moguća. Servis za provjeru nije pružena od strane države članice (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Zaposlenici
 ProspectLevelShort=Potencijal
 ProspectLevel=Potencijalni kupac
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Valuta
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/hr_HR/ecm.lang b/htdocs/langs/hr_HR/ecm.lang
index b7500f845e2..7aec59051ed 100644
--- a/htdocs/langs/hr_HR/ecm.lang
+++ b/htdocs/langs/hr_HR/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Pretraživanje po ključnim riječima
 ECMSearchByEntity=Pretraživanje po objektu
 ECMSectionOfDocuments=Mape dokumenata
 ECMTypeAuto=Automatsko
-ECMDocsBySocialContributions=Dokumenti povezani za društvene ili fiskalne poreze
-ECMDocsByThirdParties=Dokumenti povezani za komitente
-ECMDocsByProposals=Dokumenti povezani za ponude
-ECMDocsByOrders=Dokumenti povezani za narudžbe kupaca
-ECMDocsByContracts=Dokumenti povezani za ugovore
-ECMDocsByInvoices=Dokumenti povezani za račune kupaca
-ECMDocsByProducts=Dokumenti povezani za proizvode
-ECMDocsByProjects=Dokumenti vezani za projekte
-ECMDocsByUsers=Dokumenti povezani za korisnike
-ECMDocsByInterventions=Dokumenti povezani za intervencije
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=Mapa nije kreirana
 ShowECMSection=Prikaži mapu
 DeleteSection=Obriši mapu
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/hr_HR/hrm.lang b/htdocs/langs/hr_HR/hrm.lang
index 99e3fb53219..e5bf98f9c0f 100644
--- a/htdocs/langs/hr_HR/hrm.lang
+++ b/htdocs/langs/hr_HR/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Zaposlenici
 Employee=Zaposlenik
 NewEmployee=Novi zaposlenik
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/hr_HR/install.lang b/htdocs/langs/hr_HR/install.lang
index b4c1ef013cb..78c882aec80 100644
--- a/htdocs/langs/hr_HR/install.lang
+++ b/htdocs/langs/hr_HR/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=This PHP supports sessions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/hr_HR/intracommreport.lang b/htdocs/langs/hr_HR/intracommreport.lang
new file mode 100644
index 00000000000..c1ad91d78c8
--- /dev/null
+++ b/htdocs/langs/hr_HR/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=Popis
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/hr_HR/languages.lang b/htdocs/langs/hr_HR/languages.lang
index eb963a3ad39..91789655f61 100644
--- a/htdocs/langs/hr_HR/languages.lang
+++ b/htdocs/langs/hr_HR/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Španjolski (Paragvaj)
 Language_es_PE=Španjolski (Peru)
 Language_es_PR=Španjolski (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Španjolski (Venezuela)
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index f7d01d6567f..8ef879f459d 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Makni poveznicu
 AddToDraft=Dodaj u skice
 Update=Nadogradi
 Close=Zatvori
+CloseAs=Postavi status na
 CloseBox=Makni prozorčić s početne stranice
 Confirm=Potvrdi
 ConfirmSendCardByMail=Jeste li sigurni da želite poslati zadržaj kartice<b>%s</b> e-poštom?
@@ -196,6 +197,7 @@ ReOpen=Ponovo otvori
 Upload=Podigni
 ToLink=Poveznica
 Select=Odaberi
+SelectAll=Select all
 Choose=Izaberi
 Resize=Promjeni veličinu
 ResizeOrCrop=Izmjena veličine ili obrezivanje
@@ -256,6 +258,7 @@ Cards=Kartice
 Card=Kartica
 Now=Sad
 HourStart=Početni sat
+Deadline=Deadline
 Date=Datum
 DateAndHour=Datum i vrijeme
 DateToday=Današnji datum
@@ -264,8 +267,10 @@ DateStart=Početni datum
 DateEnd=Završni datum
 DateCreation=Datum izrade
 DateCreationShort=Datum izrade
+IPCreation=Creation IP
 DateModification=Datum izmjene
 DateModificationShort=Datum izmjene
+IPModification=Modification IP
 DateLastModification=Datum zadnje izmjene
 DateValidation=Datum ovjere
 DateClosing=Datum zatvaranja
@@ -319,6 +324,7 @@ Morning=Ujutro
 Afternoon=Poslije podne
 Quadri=Četvrtgodišnje
 MonthOfDay=Jedan mjesec od dana
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Stopa
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Iznos plaćanja, u izvornoj valuti
 MulticurrencyAmountHT=Iznos (bez PDV-a), prvotna valuta
 MulticurrencyAmountTTC=Iznos (s porezom), u izvornoj valuti
 MulticurrencyAmountVAT=Iznos poreza, u izvornoj valuti
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Iznos poreza 2
 AmountLT2=Iznos poreza 3
 AmountLT1ES=Iznos RE
@@ -487,6 +494,7 @@ By=Od
 From=Od
 FromDate=Od
 FromLocation=Od
+at=at
 to=za
 To=za
 and=i
@@ -509,6 +517,7 @@ Draft=Skica
 Drafts=Skice
 StatusInterInvoiced=Zaračunato
 Validated=Ovjereno
+ValidatedToProduce=Validated (To produce)
 Opened=Otvoreno
 OpenAll=Otvoreno (sve)
 ClosedAll=Zatvoreno (sve)
@@ -655,6 +664,7 @@ Response=Odaziv
 Priority=Prioritet
 SendByMail=Pošalji e-poštom
 MailSentBy=E-poštu poslao
+NotSent=Nije poslano
 TextUsedInTheMessageBody=Tijelo e-pošte
 SendAcknowledgementByMail=Pošalji e-poštu s potvrdom primitka
 SendMail=Pošalji e-poštu
@@ -836,6 +846,7 @@ ListOfTemplates=Popis predložaka
 Gender=Spol
 Genderman=Muško
 Genderwoman=Žensko
+Genderother=Ostalo
 ViewList=Pregled popisa
 ViewGantt="Gantt" prikaz
 ViewKanban="Kanban" prikaz
@@ -877,6 +888,8 @@ Miscellaneous=Ostalo
 Calendar=Kalendar
 GroupBy=Grupiraj prema...
 ViewFlatList=Pregledaj popis bez grananja
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Ukloni redak '%s'
 SomeTranslationAreUncomplete=Neki od ponuđenih jezika možda su djelomično prevedeni ili sadrže greške. Molim vas pomozite ispraviti vaš jezik prijavom na <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>. Ne budite pizde!
 DirectDownloadLink=Poveznica za izravno preuzimanje (dostupno javno)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Pošiljke kupcu
 SearchIntoExpenseReports=Troškovnici
 SearchIntoLeaves=Napusti
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Napomene
 NbComments=Broj napomena
 CommentPage=Prostor za napomene
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Podatak
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Date of birth
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/hr_HR/members.lang b/htdocs/langs/hr_HR/members.lang
index 970c99a251f..93393c63c22 100644
--- a/htdocs/langs/hr_HR/members.lang
+++ b/htdocs/langs/hr_HR/members.lang
@@ -19,14 +19,12 @@ MembersCards=Članske vizit kartice
 MembersList=Popis članova
 MembersListToValid=Popis članova u skicama ( za ovjeru )
 MembersListValid=Popis valjanih članova
-MembersListUpToDate=Popis valjanih članova sa važećom pretplatom
-MembersListNotUpToDate=Popis valjanih članova sa isteklom pretplatom
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=Popis kvalificiranih članova
 MenuMembersToValidate=Skice članova
 MenuMembersValidated=Ovjereni članovi
-MenuMembersUpToDate=Važeći članovi
-MenuMembersNotUpToDate=Istekli članovi
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Članovi koji primaju pretplatu
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Datum pretplate
 DateEndSubscription=Datum kraja pretplate
 EndSubscription=Kraj pretplate
 SubscriptionId=Pretplata ID
+WithoutSubscription=Without subscription
 MemberId=Član ID
 NewMember=Novi član
 MemberType=Vrsta člana
@@ -81,7 +80,7 @@ DeleteType=Obriši
 VoteAllowed=Glasanje dozvoljeno
 Physical=Fizički
 Moral=Moralno
-MorPhy=Vrsta
+MorAndPhy=Moral and Physical
 Reenable=Ponovo omogući
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Statistika članova po regiji/provinciji
 MembersStatisticsByTown=Statistika članova po gradu
 MembersStatisticsByRegion=Statistika članova po regiji
 NbOfMembers=Broj članova
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=Nisu pronađeni valjani članovi
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistika
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Informacije su javne
 NewMemberbyWeb=Novi član je dodan. Čeka odobrenje
 NewMemberForm=Obrazac novog člana
diff --git a/htdocs/langs/hr_HR/mrp.lang b/htdocs/langs/hr_HR/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/hr_HR/mrp.lang
+++ b/htdocs/langs/hr_HR/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index e9b0791dbee..bceda0c20e6 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Broj cijena
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Broj matičnih grupiranih proizvoda
 ParentProducts=Matični proizvod
-IfZeroItIsNotAVirtualProduct=Ako je 0, ovaj proizvod nije virtualnni proizvod
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Filter po ključnim riječima
 CategoryFilter=Filter po kategoriji
 ProductToAddSearch=Pronađi proizvod za dodavanje
 NoMatchFound=Ništa slično nije pronađeno
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=Jedan od odabranih proizvoda je matični proizvod trenutnog proizvoda
 DeleteProduct=Obriši proizvod/uslugu
 ConfirmDeleteProduct=Jeste li sigurni da želite izbrisati ovaj proizvod/uslugu
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Dostupne globalne vrijednosti:
 PriceMode=Način cijena
 PriceNumeric=Broj
 DefaultPrice=Predefinirana cijena
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Povečaj/smanji zalihu po promjeni matičnog proizvoda
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/hr_HR/recruitment.lang b/htdocs/langs/hr_HR/recruitment.lang
index 974eaa66714..31f81481a9c 100644
--- a/htdocs/langs/hr_HR/recruitment.lang
+++ b/htdocs/langs/hr_HR/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Mjesto zaposlenja
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/hr_HR/stocks.lang b/htdocs/langs/hr_HR/stocks.lang
index ca6b7fe7231..20f7b0c745c 100644
--- a/htdocs/langs/hr_HR/stocks.lang
+++ b/htdocs/langs/hr_HR/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Skladište
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Lokacija
 LocationSummary=Kratki naziv lokacije
@@ -122,8 +122,9 @@ DesiredStockDesc=Ovaj iznos zalihe bit će korišten za popunjavanje zaliha.
 StockToBuy=Za naručiti
 Replenishment=Popunjavanje
 ReplenishmentOrders=Nadopunjavanje narudžbe
-VirtualDiffersFromPhysical=Sukladno opcija povečanja/smanjenja zaliha, fizička zaliha i umjetna zaliha (fizički + trenutne narudžbe) mogu se razlikovati
-UseVirtualStockByDefault=Za nadopunjavanje skladišta koristi virtualno stanje umjesto stvarnog.
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Koristi umjetnu zalihu
 UsePhysicalStock=Koristi fizičku zalihu
 CurentSelectionMode=Trenutno odabrani način
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Filter po kategoriji
 SelectFournisseur=Vendor filter
 inventoryOnDate=Zalihe
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/hr_HR/suppliers.lang b/htdocs/langs/hr_HR/suppliers.lang
index e122d0fcd3c..7c3d64f8d0b 100644
--- a/htdocs/langs/hr_HR/suppliers.lang
+++ b/htdocs/langs/hr_HR/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Nemoj naručiti
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputacija
diff --git a/htdocs/langs/hr_HR/website.lang b/htdocs/langs/hr_HR/website.lang
index 123242c3f79..41f2e8808aa 100644
--- a/htdocs/langs/hr_HR/website.lang
+++ b/htdocs/langs/hr_HR/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Strana
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index a30f5942c73..70ffa6bdfbb 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=A könyvvizsgáló szakértő modul beállítása
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=Naplók
+Journals=Naplók
 JournalFinancial=Pénzügyi mérleg naplók
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Chart of accounts
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Egyéb információk
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bankszámlák
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=Az év
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 6f0491d80dd..2beca20a1c0 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -37,10 +37,12 @@ UnlockNewSessions=Új kapcsolatok engedélyezése
 YourSession=Az Ön munkamenete
 Sessions=Felhasználói munkamenetek
 WebUserGroup=Webszerver felhasználója / csoportja
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Úgy tűnik, hogy a PHP-konfigurációja nem engedélyezi az aktív munkamenetek felsorolását. A munkamenetek mentéséhez használt könyvtár (<b>%s</b>) védett lehet (például operációs rendszer jogosultság vagy open_basedir PHP irányelv).
 DBStoringCharset=Az adatbázis adattárolási karakterkészlete
 DBSortingCharset=Az adatbázis adatrendezési karakterkészlete
-HostCharset=Host charset
+HostCharset=PC karakterkészlet
 ClientCharset=Ügyfél karakterkészlet
 ClientSortingCharset=Ügyfél karakterkészlet egyeztetés
 WarningModuleNotActive=A <b>%s</b> modult engedélyezni kell
@@ -71,7 +73,7 @@ DisableJavascriptNote=Megjegyzés: teszt vagy hibakeresés céljából. A vak va
 UseSearchToSelectCompanyTooltip=Ha nagyszámú partnerrel rendelkezik (> 100 000), akkor növelheti a sebességet, ha a COMPANY_DONOTSEARCH_ANYWHERE értéket 1-re állítja a Beállítás-> Egyéb menüben. A keresés ezután a karakterlánc elejére korlátozódik.
 UseSearchToSelectContactTooltip=Ha nagyszámú harmadik fél van (> 100 000), akkor növelheti a sebességet, ha a CONTACT_DONOTSEARCH_ANYWHERE állandó értéket 1-re állítja a Beállítás-> Egyéb menüben. A keresés ezután a karakterlánc elejére korlátozódik.
 DelaiedFullListToSelectCompany=A Partnerek kombinált listájának betöltése gombnyomásra vár. <br> Ez növelheti a teljesítményt, ha nagyszámú partnerrel rendelkezik, de ez kevésbé kényelmes.
-DelaiedFullListToSelectContact=A Névjegyek listájának betöltése gombnyomásra vár. <br> Ez növelheti a teljesítményt, ha nagyszámú névjegy van, de kevésbé kényelmes)
+DelaiedFullListToSelectContact=Billentyűnyomásra vár, mielőtt betölti a Kapcsolat lista tartalmát. <br> Ez növelheti a teljesítményt, ha nagy számú kapcsolata van, és kevésbé kényelmes.
 NumberOfKeyToSearch=A keresés elindításához szükséges karakterek száma: %s
 NumberOfBytes=Bájtok száma
 SearchString=Keresési karakterlánc
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=A Partner oldalán választhat egy másik p
 JavascriptDisabled=JavaScript letiltva
 UsePreviewTabs=Előnézeti lapok használata
 ShowPreview=Előnézet megtekintése
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Előnézet nem elérhető
 ThemeCurrentlyActive=Jelenleg aktív téma
 CurrentTimeZone=A PHP (szerver) időzónája
@@ -95,14 +98,14 @@ NextValueForInvoices=Következő érték (számlák)
 NextValueForCreditNotes=Következő érték (jóváírás)
 NextValueForDeposit=Következő érték (előleg)
 NextValueForReplacements=Következő érték (pótlások)
-MustBeLowerThanPHPLimit=Note: your PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+MustBeLowerThanPHPLimit=Megjegyzés: a PHP konfigurációja jelenleg korlátozza a feltöltés maximális fájlméretét <b>%s</b> %s, függetlenül a paraméter értékétől
 NoMaxSizeByPHPLimit=Megjegyzés: A PHP konfigurációban nincs beállítva korlátozás
 MaxSizeForUploadedFiles=A feltöltött fájlok maximális mérete (0 megtiltja a feltöltést)
 UseCaptchaCode=Grafikus kód (CAPTCHA) használata a bejelentkezési oldalon
 AntiVirusCommand=A vírusirtó parancs teljes elérési útvonala
-AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusCommandExample=Példa ClamAv démonra (clamav-démon szükséges): /usr/bin/clamdscan <br> Példa ClamWin-re (nagyon nagyon lassú): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= A parancssor további paraméterei
-AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Példa a ClamAv démonra: --fdpass <br> Példa a ClamWin-re: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Számviteli modul beállítása
 UserSetup=Felhasználói beállítások kezelése
 MultiCurrencySetup=Több valuta beállítása
@@ -200,14 +203,14 @@ FeatureDisabledInDemo=Demó módban kikapcsolva
 FeatureAvailableOnlyOnStable=A szolgáltatás csak a hivatalos stabil verziókban érhető el
 BoxesDesc=A modulok olyan összetevők, amelyek információkat mutatnak, s hozzáadhatóak az oldalak testreszabásához. Választhat úgy, hogy megjelenik-e a modul, vagy nem, ha kiválasztja a céloldalt és kattint az 'Aktiválás' gombra, vagy a kukára kattintva tilthatja le azt.
 OnlyActiveElementsAreShown=Csak a <a href="%s"> bekapcsolt modulok</a> elemei jelennek meg.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
+ModulesDesc=A modulok/alkalmazások határozzák meg, mely funkciók érhetők el a szoftverben. Egyes modulok engedélyek megadását igénylik a felhasználók számára a modul aktiválása után. Kattintson egy modul/alkalmazás engedélyezéséhez vagy letiltásához az egyes modulok <span class="small valignmiddle">%s</span> be/ki gombját.
 ModulesMarketPlaceDesc=Az interneten további modulokat találhat...
 ModulesDeployDesc=Ha a fájlrendszer engedélyei ezt lehetővé teszik, akkor ezt az eszközt használhatja egy külső modul telepítéséhez. A modul ezután a <strong>%s</strong> fülön lesz látható.
 ModulesMarketPlaces=Külső alkalmazások / modulok keresése
 ModulesDevelopYourModule=Fejlessze ki saját alkalmazását / moduljait
 ModulesDevelopDesc=Kidolgozhat saját modult is, vagy partnert találhat aki elkészíti az Ön számára.
 DOLISTOREdescriptionLong=Az <a href="https://www.dolistore.com"> www.dolistore.com </a> webhely bekapcsolása helyett egy külső modul megkereséséhez használhatja ezt a beágyazott eszközt, amely elvégzi a keresést a külső piacon az Ön számára (lehet, hogy lassú lesz, internetkapcsolat szükséges) ...
-NewModule=New module
+NewModule=Új modul
 FreeModule=Ingyenes
 CompatibleUpTo=Kompatibilis a(z) %s verzióval
 NotCompatible=Ez a modul nem tűnik kompatibilisnek a Dolibarr %s verzióval (Min %s - Max %s).
@@ -219,11 +222,11 @@ Nouveauté=Újdonság
 AchatTelechargement=Vásárlás / Letöltés
 GoModuleSetupArea=Új modul telepítéséhez / telepítéséhez ugorjon a Modul beállítása területre: <a href="%s"> %s </a>.
 DoliStoreDesc=DoliStore, a hivatalos Dolibarr ERP / CRM piactér külső modulok számára
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
+DoliPartnersDesc=Egyedi fejlesztésű modulokat vagy szolgáltatásokat kínáló vállalatok listája. <br> Megjegyzés: Mivel a Dolibarr nyílt forráskódú alkalmazás, <i> bárki, aki a PHP programozásban jártas </i>, képes lehet egy modul kifejlesztésére.
 WebSiteDesc=Külső webhelyek további kiegészítő (nem alapvető) modulokhoz ...
 DevelopYourModuleDesc=Néhány javaslat a saját modul fejlesztésére ...
 URL=URL elérési út
-RelativeURL=Relative URL
+RelativeURL=Relatív URL
 BoxesAvailable=Elérhető widgetek
 BoxesActivated=Aktivált widgetek
 ActivateOn=Aktiválás
@@ -271,7 +274,7 @@ NoticePeriod=Felmondási idő
 NewByMonth=Új hónap szerint
 Emails=e-mailek
 EMailsSetup=E-mailek beállítása
-EMailsDesc=Ezen az oldalon felülbírálhatja az alapértelmezett PHP-paramétereket az e-mail küldéshez. A legtöbb esetben az Unix / Linux operációs rendszeren a PHP beállítása helyes, és ezek a paraméterek nem szükségesek.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=E-mailben küldő profilok
 EMailsSenderProfileDesc=Ezt a részt üresen hagyhatja. Ha néhány e-mail címet beír ide, akkor új e-mail írásakor az esetleges feladók listájába kerülnek a kombinált mezőbe.
 MAIN_MAIL_SMTP_PORT=SMTP / SMTPS port (alapértelmezett érték a php.ini fájlban: <b> %s </b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP azonosító (ha a küldő szerver hitelesítést igénye
 MAIN_MAIL_SMTPS_PW=SMTP jelszó (ha a kiszolgáló küldése hitelesítést igényel)
 MAIN_MAIL_EMAIL_TLS=Használjon TLS (SSL) titkosítást
 MAIN_MAIL_EMAIL_STARTTLS=Használjon TLS (STARTTLS) titkosítást
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Engedélyezze a Les Certificats automatikus aláírását
 MAIN_MAIL_EMAIL_DKIM_ENABLED=DKIM használata e-mail aláírást generálásához
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=E-mail domain a DKIM használatához
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=A DKIM szelektor neve
@@ -300,9 +304,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Alapértelmezett feladó e-mail cím manuális küld
 UserEmail=Felhasználó email címe
 CompanyEmail=Vállalati e-mail
 FeatureNotAvailableOnLinux=A szolgáltatás nem elérhető Unix szerű rendszereken. Teszteld a sendmail programot helyben.
-FixOnTransifex=Fix the translation on the online translation platform of project
+FixOnTransifex=Javítsa ki a fordítást a projekt online fordítási platformján
 SubmitTranslation=Ha a nyelv fordítása nem teljes, vagy hibákat talál, akkor javítsa ki az <b> langs / %s </b> könyvtárban található fájlok szerkesztésével, és küldje be a változást a www.transifex.com/dolibarr-association/dolibarr/ webhelyre.
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
+SubmitTranslationENUS=Ha ennek a nyelvnek a fordítása nem teljes, vagy hibákat talál, javíthatja ezt a fájlok szerkesztésével az <b>langs/%s</b> könyvtárban, és módosított fájlokat küldhet be a dolibarr.org/forum címre, vagy, ha fejlesztő, akkor a github PR-jével .com/Dolibarr/dolibarr
 ModuleSetup=Modul beállítása
 ModulesSetup=Modulok / Alkalmazás beállításai
 ModuleFamilyBase=Rendszer
@@ -387,12 +391,12 @@ ModuleMustBeEnabledFirst=A funkció használatához a(z) <b>%s</b> modul bekapcs
 SecurityToken=Kulcs a biztonságos URL-ek
 NoSmsEngine=Nincs elérhető SMS küldő kezelő. Az SMS-küldő kezelőt nem telepíti az alapértelmezett disztribúcióval, mivel azok külső gyártótól függenek, de néhányat találhat az %s-on
 PDF=PDF
-PDFDesc=Global options for PDF generation
-PDFAddressForging=Rules for address section
+PDFDesc=Globális beállítások PDF létrehozására
+PDFAddressForging=A cím szekció szabályai
 HideAnyVATInformationOnPDF=A forgalmi adóval / ÁFA-val kapcsolatos összes információ elrejtése
 PDFRulesForSalesTax=A forgalmi adó / ÁFA szabályai
 PDFLocaltax=A(z) %s szabályai
-HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
+HideLocalTaxOnPDF=Az %s kulcs elrejtése az eladási adó/áfa oszlopban
 HideDescOnPDF=A termékleírás elrejtése
 HideRefOnPDF=Termékek hivatkozásainak elrejtése
 HideDetailsOnPDF=A termékcsalád részleteinek elrejtése
@@ -409,9 +413,9 @@ PriceBaseTypeToChange=Módosítsa az árakat a meghatározott alap referenciaér
 MassConvert=Tömeges konverzió indítása
 PriceFormatInCurrentLanguage=Árformátum az aktuális nyelven
 String=Szöveg
-String1Line=String (1 line)
+String1Line=Karakterlánc (1 sor)
 TextLong=Hosszú szöveg
-TextLongNLines=Long text (n lines)
+TextLongNLines=Hosszú szöveg (n sor)
 HtmlText=HTML szöveg
 Int=Egész
 Float=Lebegőpontos
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Ha ezt a mezőt üresen hagyja, akkor ez az érték
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Az értékek listájának soroknak kell lennie formátumkulccsal, értékkel (ahol a kulcs nem lehet „0”) <br> <br> például: <br>1,érték1<br>2,érték2<br>3, érték3<br> ...
 ExtrafieldParamHelpradio=Az értékek listájának soroknak kell lennie formátumkulccsal, értékkel (ahol a kulcs nem lehet „0”) <br> <br> például: <br>1,érték1<br>2,érték2<br>3, érték3<br> ...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=A paramétereknek ObjectName:Classpath -nek kell lenniük:<br> Szintaxis: ObjectName:Classpath <br> Példák: <br> Societe:societe/class/societe.class.php <br> Contact:contact/class/class.php
+ExtrafieldParamHelplink=A paramétereknek ObjectName:Classpath típusúnak kell lennie <br> Szintaxis: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=A PDF létrehozásához használt programkönyvtár
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -449,15 +453,15 @@ LinkToTestClickToDial=Írjon be egy telefonszámot, hogy kipróbálhassa a Click
 RefreshPhoneLink=Hivatkozás frissítése
 LinkToTest=Az alapérték használatához hagyja üresen
 KeepEmptyToUseDefault=Az alapérték használatához hagyja üresen
-KeepThisEmptyInMostCases=In most cases, you can keep this field empy.
+KeepThisEmptyInMostCases=A legtöbb esetben ez a mező üres.
 DefaultLink=Alapértelmezett hivatkozás
 SetAsDefault=Beállítás alapértelmezettként
 ValueOverwrittenByUserSetup=Figyelem, ezt az értéket a felhasználó-specifikus beállítás felülírhatja (minden felhasználó beállíthatja saját clicktodial URL-jét)
-ExternalModule=External module
-InstalledInto=Installed into directory %s
+ExternalModule=Külső modul
+InstalledInto=Telepítve az %s könyvtárba
 BarcodeInitForThirdparties=Tömeges vonalkód készítése partnereknek
 BarcodeInitForProductsOrServices=A termékek vagy szolgáltatások tömeges vonalkód-indítása vagy visszaállítása
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
+CurrentlyNWithoutBarCode=Jelenleg <strong>%s</strong> rekord van az <strong>%s</strong> %s vonalkód nélkül.
 InitEmptyBarCode=A következő %s üres rekord kezdeti értéke
 EraseAllCurrentBarCode=Törölje az összes jelenlegi vonalkód-értéket
 ConfirmEraseAllCurrentBarCode=Biztosan törli az összes jelenlegi vonalkód-értéket?
@@ -474,13 +478,17 @@ ModuleCompanyCodeCustomerAquarium=%s, amelyet az ügyfélkód követ egy ügyfé
 ModuleCompanyCodeSupplierAquarium=%s, amelyet szállítói kód követ a eladói számviteli kódhoz
 ModuleCompanyCodePanicum=Visszaad egy üres könyvelési kódot.
 ModuleCompanyCodeDigitaria=Egy összetett számviteli kódot ad vissza a partner neve szerint. A kód egy előtagból áll, amelyet az első pozícióban lehet meghatározni, amelyet a partnerl kódjában meghatározott karakterek száma követ.
-ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by the number of characters: %s for the customer accounting code.
-ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
+ModuleCompanyCodeCustomerDigitaria=%s, majd az ügyfél rövidített neve és a karakterek száma: %s az ügyfél könyvelési kódjához.
+ModuleCompanyCodeSupplierDigitaria=%s, majd a szállító rövidített neve és a karakterek száma: %s a beszállítói könyvelési kódhoz.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
-UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
-WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+UseDoubleApproval=Használjon 3 lépéses jóváhagyást, ha az összeg (adó nélkül) nagyobb, mint ...
+WarningPHPMail=FIGYELMEZTETÉS: Az e-mailek alkalmazásból történő küldéséhez használt beállítás az alapértelmezett általános beállítást használja. Gyakran jobb, ha a kimenő e-maileket úgy állítja be, hogy az alapértelmezett beállítás helyett az e-mail szolgáltató e-mail szerverét használja, több okból:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- A saját e-mail szolgáltatója SMTP szerverének használata e-mailek küldésére is megfelelő, így az alkalmazásból küldött összes e-mailt a postafiók "Elküldött" könyvtárába is elmentjük.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
+WarningPHPMail2=Ha az e-mail SMTP-szolgáltatójának bizonyos IP-címekre kell korlátoznia az e-mail klienst (nagyon ritka), akkor ez az ERP CRM-alkalmazás mail felhasználói ügynökének (MUA) IP-címe: <strong>%s</strong>.
+WarningPHPMailSPF=Ha a feladó e-mail címében szereplő tartománynevet SPF rekord védi (kérdezze meg a domain név regisztert), akkor a következő IP-ket kell hozzáadnia a tartomány DNS-jének SPF rekordjához: <strong>%s</strong>.
 ClickToShowDescription=Kattintson a leírás megjelenítéséhez
 DependsOn=Ehhez a modulhoz szükséges modul(ok)
 RequiredBy=Ezt a modult más modulok igénylik
@@ -495,7 +503,7 @@ GoIntoTranslationMenuToChangeThis=A kódhoz tartozó kulcshoz fordítás találh
 WarningSettingSortOrder=Figyelem, az alapértelmezett rendezési sorrend beállítása technikai hibát okozhat, ha a listaoldalra lép, és egy mező ismeretlen. Ha ilyen hibát tapasztal, térjen vissza erre az oldalra az alapértelmezett rendezési sorrend eltávolításához és az alapértelmezett viselkedés visszaállításához.
 Field=Mező
 ProductDocumentTemplates=Dokumentumsablonok a termékdokumentum létrehozásához
-FreeLegalTextOnExpenseReports=Free legal text on expense reports
+FreeLegalTextOnExpenseReports=Ingyenes jogi szöveg a költségjelentésekről
 WatermarkOnDraftExpenseReports=Vízjel a költségjelentések tervezetén
 AttachMainDocByDefault=Állítsa ezt az értéket 1-re, ha alapdokumentumot szeretne csatolni az e-mailhez alapértelmezés szerint (ha van)
 FilesAttachedToEmail=Fájl csatolása
@@ -545,14 +553,12 @@ Module54Name=Szerződések / Előfizetések
 Module54Desc=Szerződések kezelése (szolgáltatások vagy ismétlődő előfizetések)
 Module55Name=Vonalkódok
 Module55Desc=Vonalkód kezelés
-Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Payments by Direct Debit
-Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
+Module56Name=Fizetés átutalással
+Module56Desc=A beszállítók fizetésének kezelése átutalási megbízásokkal. Ez magában foglalja a SEPA fájl létrehozását az európai országok számára.
+Module57Name=Fizetés csoportos beszedési megbízással
+Module57Desc=A csoportos beszedési megbízások kezelése. Ez magában foglalja a SEPA fájl létrehozását az európai országok számára.
 Module58Name=Kattintson a híváshoz
 Module58Desc=Integrációja ClickToDial rendszer (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add függvényt generálni Bookmark4u figyelembe véve egy Dolibarr
 Module60Name=Matricák
 Module60Desc=Matricák kezelése
 Module70Name=Beavatkozások
@@ -592,7 +598,7 @@ Module510Desc=A munkavállalói kifizetések nyilvántartása és nyomon követ
 Module520Name=Hitelek
 Module520Desc=Hitelek kezelése
 Module600Name=Értesítések üzleti eseményről
-Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
+Module600Desc=Üzleti esemény által kiváltott e-mailes értesítések küldése: felhasználónként (a beállításokat minden felhasználó meghatározza), harmadik fél kapcsolattartóinként (a beállításokat minden harmadik fél meghatározza) vagy meghatározott e-mailek
 Module600Long=Vegye figyelembe, hogy ez a modul valós időben küld e-maileket, amikor egy adott üzleti esemény bekövetkezik. Ha olyan funkciót keres, amely e-mailben emlékeztetőt küld a napirend eseményeiről, akkor lépjen az Agenda (Napirend) modul beállításához.
 Module610Name=Termékváltozatok
 Module610Desc=Termékváltozatok készítése (szín, méret stb.)
@@ -656,7 +662,7 @@ Module50200Desc=Ajánlja az ügyfeleknek a PayPal online fizetési oldalt (PayPa
 Module50300Name=Stripe
 Module50300Desc=Ajánlja az ügyfeleknek a Stripe online fizetési oldalt (hitel-/bankkártyák). Ez arra használható, hogy az ügyfelek ad-hoc kifizetéseket vagy egy adott Dolibarr-objektumhoz kapcsolódó kifizetéseket (számla, megrendelés stb.) elvégezzenek.
 Module50400Name=Számvitel (kettős könyvelés)
-Module50400Desc=Számviteli menedzsment (kettős könyvelés, általános és segédkönyvek támogatása). Exportálja a főkönyvet számos más számviteli szoftver formátumban.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Közvetlen nyomtatás (a dokumentumok kinyitása nélkül) a Cups IPP felülettel (A nyomtatónak látnia kell a szervert, a CUPS-t pedig telepíteni kell a szerverre).
 Module55000Name=Szavazás, felmérés vagy választás
@@ -671,7 +677,7 @@ Module63000Name=Erőforrások
 Module63000Desc=Az eseményekhez elosztandó erőforrások (nyomtatók, autók, helyiségek, ...) kezelése
 Permission11=Olvassa vevői számlák
 Permission12=Létrehozza / módosítja vevői számlák
-Permission13=Unvalidate vevői számlák
+Permission13=Ügyfélszámlák érvénytelenítése
 Permission14=Érvényesítés vevői számlák
 Permission15=Küldés e-mailben vevői számlák
 Permission16=Készítsen kifizetések vevői számlák
@@ -688,7 +694,8 @@ Permission32=Létrehozza / módosítja termékek
 Permission34=Törlés termékek
 Permission36=Lásd / kezelhetik rejtett termékek
 Permission38=Export termékek
-Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
+Permission39=A minimális ár figyelmen kívül hagyása
+Permission41=Projektek és feladatok megtekintése (megosztott projekt és projektek, amelyekhez kapcsolatba lépek). Megadhatja az felhasznált időt nekem vagy a hierarchiámnak a kijelölt feladatoknál (munkaidő-nyilvántartás)
 Permission42=Projektek létrehozása / módosítása (megosztott projekt és projektek, amelyekkel kapcsolatba léptem). Feladatokat is létrehozhat, és felhasználókat rendelhet a projektekhez és feladatokhoz
 Permission44=Projekt törlése (megosztott projekt és azok a projektek, amelyekkel kapcsolatba léptem)
 Permission45=Projektek exportálása
@@ -696,6 +703,9 @@ Permission61=Olvassa beavatkozások
 Permission62=Létrehozza / módosítja beavatkozások
 Permission64=Törlés beavatkozások
 Permission67=Export beavatkozások
+Permission68=Küldje el a beavatkozásokat e-mailben
+Permission69=A beavatkozások érvényesítése
+Permission70=A beavatkozások érvénytelenítése
 Permission71=Olvassa tagjai
 Permission72=Létrehozza / módosítja tagjai
 Permission74=Törlés tagjai
@@ -718,6 +728,7 @@ Permission95=Olvassa jelentések
 Permission101=Olvassa küldések
 Permission102=Létrehozza / módosítja küldések
 Permission104=Érvényesítés küldések
+Permission105=Üzenetek elküldése e-mailben
 Permission106=Küldemények exportálása
 Permission109=Törlés küldések
 Permission111=Olvassa el a pénzügyi számlák
@@ -726,7 +737,7 @@ Permission113=Pénzügyi számlák beállítása (kategóriák létrehozása, ke
 Permission114=Tranzakciók összehangolása
 Permission115=Export ügyletek és számlakivonatok
 Permission116=Számlák közötti átcsoportosítás
-Permission117=Manage checks dispatching
+Permission117=A elküldés/feladás ellenőrzéseinek menedzselése
 Permission121=Olvassa harmadik fél kapcsolódó felhasználói
 Permission122=Létrehozza / módosítja harmadik fél kapcsolódó felhasználói
 Permission125=Törlés harmadik fél kapcsolódó felhasználói
@@ -825,10 +836,11 @@ Permission402=Létrehozza / módosítja kedvezmények
 Permission403=Kedvezmények érvényesítése
 Permission404=Törlés kedvezmények
 Permission430=Használja a Hibakeresősávot
-Permission511=Read payments of salaries
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission511=Read payments of salaries (yours and subordinates)
+Permission512=Fizetése létrehozása/módosítása
+Permission514=A fizetések kifizetésének törlése
+Permission517=Read payments of salaries of everybody
+Permission519=Fizetések exportálása
 Permission520=Hitelek megtekintése
 Permission522=Hitelek létrehozása/módosítása
 Permission524=Hitelek törlése
@@ -839,10 +851,13 @@ Permission532=Létrehozza / módosítja szolgáltatások
 Permission534=Törlés szolgáltatások
 Permission536=Lásd még: / szolgáltatások kezelésére rejtett
 Permission538=Export szolgáltatások
-Permission561=Read payment orders by credit transfer
+Permission561=A fizetési megbízások átutalással megtekintése
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Darabjegyzékek megtekintése
 Permission651=Darabjegyzék létrehozása / frissítése
 Permission652=Darabjegyzék törlése
@@ -884,7 +899,9 @@ Permission1185=Megrendelések jóváhagyása
 Permission1186=Order purchase orders
 Permission1187=Megrendelések kézhezvételének nyugtázása
 Permission1188=Megrendelések törlése
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Beszerzési rendelések jóváhagyása (második jóváhagyás)
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get eredményeképpen az export
 Permission1202=Létrehozása / módosítása a kiviteli
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Fuss tömeges import a külső adatok adatbázisba (adatok terhel
 Permission1321=Export vevői számlák, attribútumok és kifizetések
 Permission1322=Befizetett számla újranyitása
 Permission1421=Értékesítési megrendelések és attribútumok exportálása
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Felhasználói fiókjához kapcsolódó műveletek (eseményeket vagy feladatokat) megjelenítésa (ha az esemény tulajdonosa vagy csak hozzá van rendelve)
 Permission2402=A felhasználói fiókjához kapcsolódó tevékenységek (események vagy feladatok) létrehozása / módosítása (ha Ön az esemény tulajdonosa)
 Permission2403=Felhasználói fiókjához kapcsolódó műveletek (eseményeket vagy feladatokat) törlése (ha Ön az esemény tulajdonosa)
@@ -932,9 +951,13 @@ Permission23001=Ütemezett feladatok megtekintése
 Permission23002=Ütemezett feladatok létrehozása / frissítése
 Permission23003=Ütemezett feladatok törlése
 Permission23004=Ütemezett feladat végrehajtása
-Permission50101=Értékesítési pont használata
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Olvassa tranzakciók
 Permission50202=Import ügyletek
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Főkönyvi műveletek megtekintése
 Permission50412=Főkönyvi műveletek írása / szerkesztése
@@ -958,6 +981,17 @@ Permission63001=Erőforrások megtekintése
 Permission63002=Erőforrások létrehozása / módosítása
 Permission63003=Erőforrások törlése
 Permission63004=Erőforrások összekapcsolása a napirend eseményeivel
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Partnerek típusai
 DictionaryCompanyJuridicalType=Partner jogi képviselői
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Beállítás mentett
 SetupNotSaved=A beállítás nincs elmentve
 BackToModuleList=Vissza a modulok listájához
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label az alap, ha nincs fordítás megtalálható a kód
 LabelOnDocuments=Címke dokumentumok
 LabelOrTranslationKey=Címke vagy fordítási kulcs
 ValueOfConstantKey=Egy konfigurációs konstans értéke
+ConstantIsOn=Option %s is on
 NbOfDays=Napok száma
 AtEndOfMonth=A hónap végén
 CurrentNext=Jelenlegi / Következő
@@ -1145,6 +1182,7 @@ InfoWebServer=A webszerver jellemzői
 InfoDatabase=Az adatbázis jellemzői
 InfoPHP=A PHP jellemzői
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Böngésző neve
 BrowserOS=Böngésző operációs rendszere
 ListOfSecurityEvents=Listája Dolibarr biztonsági események
@@ -1194,7 +1232,8 @@ RestoreDesc=A Dolibarr biztonsági másolatának visszaállításához két lép
 RestoreDesc2=Másolja vissza a "documents" könyvtár biztonsági másolatát (például zip fájl) egy új Dolibarr telepítésre vagy a jelenlegi dokumentum könyvtárba (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= Ez a szabály arra kényszerül, hogy <b>%s</b> által aktivált modul
+ForcedToByAModule=Ez a szabály arra kényszerül, hogy <b>%s</b> által aktivált modul
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Meglévő biztonsági mentési fájlok
 PreviousArchiveFiles=Meglévő archív fájlok
 WeekStartOnDay=A hét első napja
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=Az %s PHP összetevő betöltődött
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=%s mező szerkesztése
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1282,7 +1322,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Vissza a jelszót generált szerint Belső Dolibarr algoritmus: 8 karakter tartalmazó közös számokat és karaktereket kisbetűvel.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Nem javasolt a generált jelszó. A jelszót manuálisan kell beírni.
 PasswordGenerationPerso=Egy jelszóval tér vissza a személyes beállításoknak megfelelően.
 SetupPerso=A beállításainak megfelelően
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox levelet küldeni visszaigazolást a tagok (jóváhagyás vagy új előfizetés) alapértelmezés szerint be van
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP beállítása
 LDAPGlobalParameters=Globális paraméterek
@@ -1523,7 +1564,9 @@ LDAPDescValues=Példaértékek tervezték <b>OpenLDAP</b> az alábbi betöltött
 ForANonAnonymousAccess=A hitelesített hozzáférés (egy írási például)
 PerfDolibarr=Teljesítménybeállítás/optimalizálás jelentés
 YouMayFindPerfAdviceHere=Ezen az oldalon található néhány ellenőrzés vagy tanácsadás a teljesítményhez kapcsolódóan.
-NotInstalled=Nincs telepítve, így a szervert ez nem lassítja le.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Alkalmazható gyorsítótár
 MemcachedNotAvailable=Nem található alkalmazható gyorsítótár. A teljesítmény javításához telepítheti a Memcached gyorsítótár-kiszolgálót és egy modult, amely képes használni ezt a gyorsítótár-kiszolgálót. <br> További információ itt <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN"> http://wiki.dolibarr.org/index.php/Module_MemCached_EN </a>. <br> Vegye figyelembe, hogy sok webtárhely-szolgáltató nem nyújt ilyen gyorsítótár-kiszolgálót.
 MemcachedModuleAvailableButNotSetup=Található memcached modul a gyorsítótár-kiszolgálóhoz, de a modul telepítése még nem fejeződött be.
@@ -1571,9 +1614,9 @@ SyslogLevel=Szint
 SyslogFilename=A fájl nevét és elérési útvonalát
 YouCanUseDOL_DATA_ROOT=Használhatja DOL_DATA_ROOT / dolibarr.log egy log fájlt Dolibarr &quot;Dokumentumok&quot; mappa. Beállíthatjuk, más utat kell tárolni ezt a fájlt.
 ErrorUnknownSyslogConstant=Constant %s nem ismert Syslog állandó
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Adomány modul beállítása
@@ -1629,7 +1672,7 @@ AdvancedEditor=Speciális szerkesztő
 ActivateFCKeditor=Aktiválja a fejlett szerkesztő:
 FCKeditorForCompany=WYSIWIG létrehozása / kiadás elem leírása és megjegyzés (kivéve a termékek / szolgáltatások)
 FCKeditorForProduct=WYSIWIG létrehozása / kiadásában termék / szolgáltatás 's leírása és megjegyzés
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG létrehozása / kiadás levelek
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menü törölve
+Menu=Menu
 Menus=Menük
 TreeMenuPersonalized=Személyre szabott menük
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Új menü
-Menu=A menü kiválasztása
 MenuHandler=Menü kezelő
 MenuModule=Forrás modul
 HideUnauthorizedMenu= Hide jogosulatlan menük (szürke)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Kattintson a Tárcsázás modul beállítása
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Partner
 MailToMember=Tagok
 MailToUser=Felhasználók
-MailToProject=Projects page
+MailToProject=Projektek
 MailToTicket=Jegyek
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/hu_HU/banks.lang b/htdocs/langs/hu_HU/banks.lang
index 4c8fc232f11..b526b83be5c 100644
--- a/htdocs/langs/hu_HU/banks.lang
+++ b/htdocs/langs/hu_HU/banks.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
 MenuBankCash=Banks | Cash
-MenuVariousPayment=Miscellaneous payments
+MenuVariousPayment=Egyéb fizetések
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=Bank neve
 FinancialAccount=Fiók
@@ -39,7 +39,7 @@ StandingOrders=Direct debit orders
 StandingOrder=Direct debit order
 PaymentByDirectDebit=Payment by direct debit
 PaymentByBankTransfers=Payments by credit transfer
-PaymentByBankTransfer=Payment by credit transfer
+PaymentByBankTransfer=Fizetés átutalással
 AccountStatement=Számlakivonat
 AccountStatementShort=Nyilatkozat
 AccountStatements=Számlakivonatok
@@ -163,9 +163,12 @@ DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payment
 VariousPayment=Miscellaneous payment
-VariousPayments=Miscellaneous payments
+VariousPayments=Egyéb fizetések
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/hu_HU/categories.lang b/htdocs/langs/hu_HU/categories.lang
index f857f60accc..741cab33de6 100644
--- a/htdocs/langs/hu_HU/categories.lang
+++ b/htdocs/langs/hu_HU/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/hu_HU/companies.lang b/htdocs/langs/hu_HU/companies.lang
index 3e3bc1f36a6..d6179acca4b 100644
--- a/htdocs/langs/hu_HU/companies.lang
+++ b/htdocs/langs/hu_HU/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Szakma ID 1 (USt.-IdNr)
 ProfId2AT=Szakma Id 2 (USt.-Nr)
 ProfId3AT=Szakma Id 3 (Kereskedelm kamarai szám)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof ID 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Szakma ID 1 (Szakma szám)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=RÁ (Regisztrált Állam)
@@ -144,11 +144,11 @@ ProfId3BR=RV (Regisztrált város)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Szakma ID 1 (szövetségi szám)
 ProfId4CH=Szakma ID 2 (Kereskedelmi azonosító)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Szakma ID 1 (RUT)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Szakma ID 1 (USt.-IdNr)
 ProfId2DE=Szakma Id 2 (USt.-Nr)
 ProfId3DE=Szakma Id 3 (Kereskedelm kamarai szám)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Szakma ID 1 (CIF / NIF)
 ProfId2ES=Szakma ID 2 (Társadalombiztosítási szám)
 ProfId3ES=Szakma Id 3 (CNAE)
 ProfId4ES=Szakma Id 4 (Collegiate szám)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Szakma ID 1 (SIREN)
 ProfId2FR=Szakma ID 2 (SIRET)
 ProfId3FR=Szakma Id 3 (NAF, régi APE)
 ProfId4FR=Szakma Id 4 (RCS / RM)
-ProfId5FR=Szakma Id 5
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Regisztrációs szám
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Szakma ID 3 (SRVC TAX)
 ProfId4IN=Szakma Id 4
 ProfId5IN=Szakma Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Technikai azonosító 1 (Luxemburg)
 ProfId2LU=Technikai azonosító 2 (Üzlet engedélye)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Szakma id 1 (RC)
 ProfId2MA=Szakma id 2 (Patente)
 ProfId3MA=Szakma id 3 (IF)
 ProfId4MA=Szakma id 4 (CNSS)
-ProfId5MA=Szakma id  5 (C.I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Szakma ID 1 (RFC).
 ProfId2MX=Szakma ID 2 (R.. P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK Szám
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Szakma ID 1 (NIPC)
 ProfId2PT=Szakma ID 2 (Társadalombiztosítási szám)
 ProfId3PT=Szakma Id 3 (Kereskedelmi azonosító szám)
 ProfId4PT=Szakma Id 4 (Konzervatórium)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Szakma id 1 (CUI)
 ProfId2RO=Szakma ID 2 (regisztrációs szám)
 ProfId3RO=Szakma ID 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Szakma ID 5 (EUID)
+ProfId4RO=Szakma ID 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Szakma ID 1 (OGRN)
 ProfId2RU=Szakma ID 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=Manuálisan ellenőrizheti az Európai Bizottság webhelyén
 ErrorVATCheckMS_UNAVAILABLE=Ellenőrzés nem lehetséges. A szolgáltatást a tagállam nem teszi lehetővé (%s).
 NorProspectNorCustomer=Nem leendő partner, nem ügyfél
 JuridicalStatus=Jogi személy típusa
+Workforce=Workforce
 Staff=Alkalmazottak
 ProspectLevelShort=Potenciális
 ProspectLevel=Jelentkezői potenciál
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Fizetési határidő - Eladó
 PaymentTypeBoth=Fizetés típusa - Vevő és eladó
 MulticurrencyUsed=Több pénznem használata
 MulticurrencyCurrency=Pénznem
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/hu_HU/ecm.lang b/htdocs/langs/hu_HU/ecm.lang
index 791299aff46..7665135017e 100644
--- a/htdocs/langs/hu_HU/ecm.lang
+++ b/htdocs/langs/hu_HU/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Kulcsszavak szerinti keresés
 ECMSearchByEntity=Objektum szerinti keresés
 ECMSectionOfDocuments=Dokumentumok könyvtárai
 ECMTypeAuto=Automatikus
-ECMDocsBySocialContributions=Adókhoz, járulékokhoz kapcsolódó dokumentumok 
-ECMDocsByThirdParties=Harmadik félhez kapcsolódó dokumentumok
-ECMDocsByProposals=Ajánlatokkal kapcsolatos dokumentumok
-ECMDocsByOrders=Megrendelésekkel kapcsolatos dokumentumok
-ECMDocsByContracts=Szerződésekkel kapcsolatos dokumentumok
-ECMDocsByInvoices=Ügyfélszámlákkal kapcsolatos dokumentumok
-ECMDocsByProducts=Termékekkel kapcsolatos dokumentumok
-ECMDocsByProjects=Projektekkel kapcsolatos dokumentumok
-ECMDocsByUsers=Felhasználókkal kapcsolatos dokumentumok
-ECMDocsByInterventions=Beavatkozásokkal kapcsolatos dokumentumok
-ECMDocsByExpenseReports=Költség-kimutatásokhoz kapcsolódó dokumentumok
-ECMDocsByHolidays=Ünnepekhez kapcsolódó dokumentumok
-ECMDocsBySupplierProposals=Az eladói ajánlatokhoz kapcsolódó dokumentumok
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=Nem lett könyvtár létrehozva
 ShowECMSection=Könyvtár mutatása
 DeleteSection=Könyvtár eltávolítása
@@ -50,3 +38,6 @@ ReSyncListOfDir=A könyvtárak újraszinkronizálása
 HashOfFileContent=A fájl tartalmának hash értéke
 NoDirectoriesFound=Nem található könyvtár
 FileNotYetIndexedInDatabase=A fájl még nincs indexelve az adatbázisba (próbálja meg újra feltölteni)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/hu_HU/hrm.lang b/htdocs/langs/hu_HU/hrm.lang
index c671aaf7500..38a5e58b39c 100644
--- a/htdocs/langs/hu_HU/hrm.lang
+++ b/htdocs/langs/hu_HU/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Munkahelyek
 Employees=Alkalmazottak
 Employee=Foglalkoztató
 NewEmployee=Új alkalmazott
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/hu_HU/install.lang b/htdocs/langs/hu_HU/install.lang
index cfba5a12a8c..f576818e1d1 100644
--- a/htdocs/langs/hu_HU/install.lang
+++ b/htdocs/langs/hu_HU/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Az <b> %s konfigurációs fájl  </b> nem írható. Ellen
 ConfFileIsWritable=<b>%s</b> konfigurációs fájl írható.
 ConfFileMustBeAFileNotADir=Az <b> %s konfigurációs fájl  </b> fájlnak kell lennie, nem könyvtárnak.
 ConfFileReload=Paraméterek újratöltése a konfigurációs fájlból.
-PHPSupportSessions=Ez a PHP verzió támogatja a munkameneteket.
 PHPSupportPOSTGETOk=Ez a PHP verzió támogatja POST és GET változókat.
 PHPSupportPOSTGETKo=Lehetséges, hogy a PHP beállítása nem támogatja a POST és / vagy a GET változókat. Ellenőrizze az <b>variables_order</b> paramétert a php.ini-ben.
-PHPSupportGD=Ez a PHP támogatja a GD grafikus funkcióit.
-PHPSupportCurl=Ez a PHP támogatja a Curl-t.
-PHPSupportCalendar=Ez a PHP támogatja a naptár-kiterjesztéseket.
-PHPSupportUTF8=Ez a PHP támogatja az UTF8 funkciókat.
-PHPSupportIntl=Ez a PHP támogatja a többnyelvű funkciókat.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=Ez a PHP verzió támogatja a munkameneteket.
 PHPSupport=Ez a PHP támogatja a(z) %s funkciókat.
 PHPMemoryOK=A munkamenetek maximális memóriája <b>%s</b>. Ennek elégnek kéne lennie.
 PHPMemoryTooLow=A PHP munkamenetmemóriája <b>%s</b> bájt maximumra van beállítva. Ez túl alacsony. Változtassa meg a <b>php.ini</b> fájlban a <b>memory_limit</b> paraméter értékét legalább <b>%s</b> bájtra.
diff --git a/htdocs/langs/hu_HU/intracommreport.lang b/htdocs/langs/hu_HU/intracommreport.lang
new file mode 100644
index 00000000000..8b6713062c8
--- /dev/null
+++ b/htdocs/langs/hu_HU/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=Lista
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/hu_HU/languages.lang b/htdocs/langs/hu_HU/languages.lang
index 31fa1647481..1242a9d40dd 100644
--- a/htdocs/langs/hu_HU/languages.lang
+++ b/htdocs/langs/hu_HU/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanyol (Panama)
 Language_es_PY=Spanyol (Paraguay)
 Language_es_PE=Spanyol (Peru)
 Language_es_PR=Spanyol (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanyol (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanyol (Venezuela)
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index ff000eb7c96..1cb2ef1cbf2 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -28,7 +28,7 @@ NoTemplateDefined=Ilyen e-mail típushoz nincs elérhető sablon
 AvailableVariables=Elérhető helyettesítő változók
 NoTranslation=Nincs fordítás
 Translation=Fordítás
-EmptySearchString=Enter non empty search criterias
+EmptySearchString=Adjon meg nem üres keresési feltételeket
 NoRecordFound=Rekord nem található
 NoRecordDeleted=Nincs törölt rekord
 NotEnoughDataYet=Nincs elég adat
@@ -155,6 +155,7 @@ RemoveLink=Hivatkozás megszüntetése
 AddToDraft=Adja a vázlathoz
 Update=Frissítés
 Close=Zár
+CloseAs=Állapot beállítása
 CloseBox=A widget eltávolítása a vezérlőpultról
 Confirm=Megerősít
 ConfirmSendCardByMail=Valóban el akarod küldeni levélben ezt a kártyát <b>%s</b> címre?
@@ -174,7 +175,7 @@ SaveAndStay=Mentés és maradj
 SaveAndNew=Mentés és új
 TestConnection=Kapcsolat tesztelése
 ToClone=Klónozás
-ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
+ConfirmCloneAsk=Biztosan klónozza az <b>%s</b> objektumot?
 ConfirmClone=Válassza ki a klónozni kívánt adatokat:
 NoCloneOptionsSpecified=Nincs klónozandó adat meghatározva.
 Of=birtokában
@@ -187,7 +188,7 @@ ShowCardHere=Kártyát mutat
 Search=Keres
 SearchOf=Keres
 SearchMenuShortCut=Ctrl + shift + f
-QuickAdd=Quick add
+QuickAdd=Gyors hozzáadás
 QuickAddMenuShortCut=Ctrl + shift + l
 Valid=Hiteles
 Approve=Jóváhagy
@@ -196,6 +197,7 @@ ReOpen=Újra megnyit
 Upload=Feltöltés
 ToLink=Link
 Select=Kiválaszt
+SelectAll=Select all
 Choose=Kiválaszt
 Resize=Átméretezés
 ResizeOrCrop=Átméretezés és levágás
@@ -256,6 +258,7 @@ Cards=Kártyák
 Card=Kártya
 Now=Most
 HourStart=Kezdés ideje
+Deadline=Deadline
 Date=Dátum
 DateAndHour=Dátum és idő
 DateToday=Mai dátum
@@ -264,8 +267,10 @@ DateStart=Kezdet dátuma
 DateEnd=Befejezés dátuma
 DateCreation=Létrehozás dátuma
 DateCreationShort=Létreh. dátuma
+IPCreation=Creation IP
 DateModification=Szerkesztés dátuma
 DateModificationShort=Szerk. dátuma
+IPModification=Modification IP
 DateLastModification=Utolsó módosítás dátuma
 DateValidation=Hitelesítés dátuma
 DateClosing=Lezárás dátuma
@@ -319,6 +324,7 @@ Morning=Reggel
 Afternoon=Délután
 Quadri=Negyed
 MonthOfDay=Nap hónapja
+DaysOfWeek=A hét napjai
 HourShort=Ó
 MinuteShort=p
 Rate=Arány
@@ -356,7 +362,7 @@ Amount=Mennyiség
 AmountInvoice=Számla mennyiség
 AmountInvoiced=Számlázott összeg
 AmountInvoicedHT=Számlázott összeg (ÁFA nélkül)
-AmountInvoicedTTC=Amount invoiced (inc. tax)
+AmountInvoicedTTC=Számlázott összeg (adóval együtt)
 AmountPayment=Fizetés mennyiség
 AmountHTShort=Összeg (ÁFA nélkül)
 AmountTTCShort=Mennyiség (bruttó)
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Fizetendő összeg, eredeti pénznem
 MulticurrencyAmountHT=Összeg (ÁFA nélkül), eredeti pénznem
 MulticurrencyAmountTTC=Összeg (ÁFA-val), eredeti pénznem
 MulticurrencyAmountVAT=ÁFA összeg, eredeti pénznem
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=ÁFA mennyiség 2
 AmountLT2=ÁFA mennyiség 3
 AmountLT1ES=RE mennyiség
@@ -428,7 +435,7 @@ Modules=Modulok/alkalmazások
 Option=Opció
 List=Lista
 FullList=Teljes lista
-FullConversation=Full conversation
+FullConversation=Teljes beszélgetés
 Statistics=Statisztika
 OtherStatistics=Egyéb statisztikák
 Status=Állapot
@@ -487,6 +494,7 @@ By=által
 From=Kitől?
 FromDate=Feladó
 FromLocation=Feladó
+at=at
 to=kinek
 To=kinek
 and=és
@@ -509,6 +517,7 @@ Draft=Piszkozat
 Drafts=Piszkozatok
 StatusInterInvoiced=Számlázva
 Validated=Hitelesítve
+ValidatedToProduce=Érvényesítve (gyártáshoz)
 Opened=Nyitott
 OpenAll=Megnyitás (összes)
 ClosedAll=Bezárás (összes)
@@ -655,6 +664,7 @@ Response=Válasz
 Priority=Prioritás
 SendByMail=Küldés e-mailben
 MailSentBy=Email feladója
+NotSent=Nem küldött
 TextUsedInTheMessageBody=Email tartalma
 SendAcknowledgementByMail=Megerősítő email küldése
 SendMail=E-mail küldése
@@ -667,7 +677,7 @@ Owner=Tulajdonos
 FollowingConstantsWillBeSubstituted=Az alábbi konstansok helyettesítve leszenek a hozzájuk tartozó értékekkel.
 Refresh=Frissítés
 BackToList=Vissza a listához
-BackToTree=Back to tree
+BackToTree=Vissza a fához
 GoBack=Vissza
 CanBeModifiedIfOk=Módosítható ha hitelesített
 CanBeModifiedIfKo=Módosítható ha nem hitelesített
@@ -688,7 +698,7 @@ Method=Módszer
 Receive=Kap
 CompleteOrNoMoreReceptionExpected=Teljes, vagy semmi több várható
 ExpectedValue=Várt érték
-ExpectedQty=Expected Qty
+ExpectedQty=Várható mennyiség
 PartialWoman=Részleges
 TotalWoman=Összes
 NeverReceived=Soha nem került átvételre
@@ -705,7 +715,7 @@ MenuECM=Dokumentumok
 MenuAWStats=AWStats
 MenuMembers=Tagok
 MenuAgendaGoogle=Google naptár
-MenuTaxesAndSpecialExpenses=Taxes | Special expenses
+MenuTaxesAndSpecialExpenses=Adók | Különleges kiadások
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
 NoFileFound=Nincs mentett dokumentum ebben a könyvtárban
 CurrentUserLanguage=Jelenlegi nyelv
@@ -728,7 +738,7 @@ Page=Oldal
 Notes=Megjegyzés
 AddNewLine=Új sor hozzáadása
 AddFile=Fájl hozzáadása
-FreeZone=Free-text product
+FreeZone=Szabad szöveges termék
 FreeLineOfType=Szabad szöveges leírás, válassz típust:
 CloneMainAttributes=Objektum klónozása a főbb jellemzőivel
 ReGeneratePDF=PDF újragenerálása
@@ -836,9 +846,10 @@ ListOfTemplates=Sablonok listája
 Gender=Nem
 Genderman=Férfi
 Genderwoman=Nő
+Genderother=Egyéb
 ViewList=Lista megtekintése
-ViewGantt=Gantt view
-ViewKanban=Kanban view
+ViewGantt=Gantt-nézet
+ViewKanban=Kanban nézet
 Mandatory=Kötelező kitölteni
 Hello=Hello
 GoodBye=Viszontlátásra
@@ -846,7 +857,7 @@ Sincerely=Tisztelettel
 ConfirmDeleteObject=Biztosan törli ezt az objektumot?
 DeleteLine=Sor törlése
 ConfirmDeleteLine=Biztos, hogy törölni akarja ezt a sort ?
-ErrorPDFTkOutputFileNotFound=Error: the file was not generated. Please check that the 'pdftk' command is installed in a directory included in the $PATH environment variable (linux/unix only) or contact your system administrator.
+ErrorPDFTkOutputFileNotFound=Hiba: a fájl nem lett létrehozva. Kérjük, ellenőrizze, hogy a 'pdftk' parancs telepítve van-e a $PATH környezeti változóban található könyvtárba (csak linux/unix), vagy vegye fel a kapcsolatot a rendszergazdával.
 NoPDFAvailableForDocGenAmongChecked=Az ellenőrzött rekordok között nem volt elérhető PDF a dokumentum előállításához
 TooManyRecordForMassAction=Túl sok rekord van kiválasztva a tömeges művelethez. A művelet %s rekord listájára korlátozódik.
 NoRecordSelected=Nincs kiválasztva rekord
@@ -877,6 +888,8 @@ Miscellaneous=Vegyes
 Calendar=Naptár
 GroupBy=Csoportosít...
 ViewFlatList=Lapos lista megtekintése
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Távolítsa el a '%s' karakterláncot
 SomeTranslationAreUncomplete=A felkínált nyelvek némelyike csak részben fordítható le, vagy hibákat tartalmazhat. Kérjük, segítsen nyelvének javításában az <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> címen regisztrálva.
 DirectDownloadLink=Közvetlen letöltési link (nyilvános / külső)
@@ -945,39 +958,39 @@ ShortThursday=Cs
 ShortFriday=P
 ShortSaturday=Szo
 ShortSunday=V
-one=one
-two=two
-three=three
-four=four
-five=five
-six=six
-seven=seven
-eight=eight
-nine=nine
-ten=ten
-eleven=eleven
-twelve=twelve
-thirteen=thirdteen
-fourteen=fourteen
-fifteen=fifteen
-sixteen=sixteen
-seventeen=seventeen
-eighteen=eighteen
-nineteen=nineteen
-twenty=twenty
-thirty=thirty
-forty=forty
-fifty=fifty
-sixty=sixty
-seventy=seventy
-eighty=eighty
-ninety=ninety
-hundred=hundred
-thousand=thousand
-million=million
-billion=billion
-trillion=trillion
-quadrillion=quadrillion
+one=egy
+two=kettő
+three=három
+four=négy
+five=öt
+six=hat
+seven=hét
+eight=nyolc
+nine=kilenc
+ten=tíz
+eleven=tizenegy
+twelve=tizenkettő
+thirteen=tizenhárom
+fourteen=tizennégy
+fifteen=tizenöt
+sixteen=tizenhat
+seventeen=tizenhét
+eighteen=tizennyolc
+nineteen=tizenkilenc
+twenty=húsz
+thirty=harminc
+forty=negyven
+fifty=ötven
+sixty=hatvan
+seventy=hetven
+eighty=nyolcvan
+ninety=kilencven
+hundred=száz
+thousand=ezer
+million=millió
+billion=milliárd
+trillion=billió
+quadrillion=kvadrillió
 SelectMailModel=Válasszon egy e-mail sablont
 SetRef=Set ref
 Select2ResultFoundUseArrows=Találati lista. Használja a nyilakat a kiválasztáshoz.
@@ -994,7 +1007,7 @@ SearchIntoMembers=Tagok
 SearchIntoUsers=Felhasználók
 SearchIntoProductsOrServices=Termékek vagy Szolgáltatások
 SearchIntoProjects=Projektek
-SearchIntoMO=Manufacturing Orders
+SearchIntoMO=Gyártási rendelések
 SearchIntoTasks=Tennivalók
 SearchIntoCustomerInvoices=Ügyfél számlák
 SearchIntoSupplierInvoices=Szállítói számlák
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Vásárlói kiszállítások
 SearchIntoExpenseReports=Költség kimutatások
 SearchIntoLeaves=Elhagy
 SearchIntoTickets=Jegyek
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Egyéb fizetések
 CommentLink=Megjegyzéske
 NbComments=Megjegyzések száma
 CommentPage=Megjegyzés helye
@@ -1067,19 +1083,27 @@ SelectYourGraphOptionsFirst=Válassza ki a grafikon beállításait a grafikon f
 Measures=Méretek
 XAxis=X-tengely
 YAxis=Y-tengely
-StatusOfRefMustBe=Status of %s must be %s
-DeleteFileHeader=Confirm file delete
-DeleteFileText=Do you really want delete this file?
-ShowOtherLanguages=Show other languages
-SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for this language
-NotUsedForThisCustomer=Not used for this customer
-AmountMustBePositive=Amount must be positive
-ByStatus=By status
+StatusOfRefMustBe=Az %s állapotának %s kell lennie
+DeleteFileHeader=A fájl törlésének megerősítése
+DeleteFileText=Tényleg törölni szeretné ezt a fájlt?
+ShowOtherLanguages=További nyelvek megjelenítése
+SwitchInEditModeToAddTranslation=Váltson szerkesztési módba, ha fordításokat szeretne hozzáadni ehhez a nyelvhez
+NotUsedForThisCustomer=Ehhez az ügyfélhez nem használt
+AmountMustBePositive=Az összegnek pozitívnak kell lennie
+ByStatus=Státusz szerint
 InformationMessage=Információ
-Used=Used
-ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
-MODIFYInDolibarr=Record %s modified
-DELETEInDolibarr=Record %s deleted
-VALIDATEInDolibarr=Record %s validated
-APPROVEDInDolibarr=Record %s approved
+Used=Használt
+ASAP=Amint lehetséges
+CREATEInDolibarr=%s rekord létrehozva
+MODIFYInDolibarr=%s rekord módosítva
+DELETEInDolibarr=%s rekord törölve
+VALIDATEInDolibarr=%s rekord érvényesítve
+APPROVEDInDolibarr=%s rekord jóváhagyva
+DefaultMailModel=Alapértelmezett levélminta
+PublicVendorName=Public name of vendor
+DateOfBirth=Dátum a születési
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/hu_HU/members.lang b/htdocs/langs/hu_HU/members.lang
index a0dc2f9a2df..c191087ddb9 100644
--- a/htdocs/langs/hu_HU/members.lang
+++ b/htdocs/langs/hu_HU/members.lang
@@ -19,14 +19,12 @@ MembersCards=Tagok névjegykártyák
 MembersList=A tagok listája
 MembersListToValid=Tagok listája tervezet (érvényesíteni kell)
 MembersListValid=Érvényes tagok listája
-MembersListUpToDate=Listája érvényes tagok naprakész előfizetés
-MembersListNotUpToDate=Tagok listája érvényes jegyzési elavult
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=Kilépett tagok listája
 MembersListQualified=Képesítéssel rendelkező tagok listája
 MenuMembersToValidate=Draft tagjai
 MenuMembersValidated=Jóváhagyott tagjai
-MenuMembersUpToDate=Naprakész tagoknak
-MenuMembersNotUpToDate=Elavult tagok
 MenuMembersResiliated=Kilépett tagok
 MembersWithSubscriptionToReceive=Tagok előfizetés kapni
 MembersWithSubscriptionToReceiveShort=Előfizetés a fogadáshoz
@@ -34,6 +32,7 @@ DateSubscription=Előfizetés dátum
 DateEndSubscription=Előfizetés záró dátum
 EndSubscription=Vége előfizetés
 SubscriptionId=Előfizetés azonosító
+WithoutSubscription=Without subscription
 MemberId=Tag azonosító
 NewMember=Új tag
 MemberType=Tagság típusa
@@ -81,7 +80,7 @@ DeleteType=Törlés
 VoteAllowed=Szavazz megengedett
 Physical=Fizikai
 Moral=Erkölcsi
-MorPhy=Természet
+MorAndPhy=Moral and Physical
 Reenable=Újra bekapcsolja
 ResiliateMember=Tag kiléptetése
 ConfirmResiliateMember=Valóban ki szeretné léptetni az adott tagot?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=E-mail küldése az új tag érvényesítésérő
 SendingEmailOnNewSubscription=E-mail küldése új előfizetésről
 SendingReminderForExpiredSubscription=Emlékeztető küldése lejárt előfizetésről
 SendingEmailOnCancelation=E-mail küldése a lemondásról
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=A tagságod megérkezett.
 YourMembershipWasValidated=Tagságod érvényesítve
@@ -167,6 +167,7 @@ MembersStatisticsByState=Tartományonkénti tagstatisztika.
 MembersStatisticsByTown=Városonkénti tagstatisztika.
 MembersStatisticsByRegion=Földrajzi régiónkénti tagstatisztika.
 NbOfMembers=Tagok száma
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=Nemérvényesített tag található
 MembersByCountryDesc=Ez a képernyő megmutatja statisztikát tagok országokban. Grafikus függ azonban a Google online grafikon szolgáltatást és csak akkor elérhető, ha az internet kapcsolat működik.
 MembersByStateDesc=Ez a képernyő a tagok statisztikát mutatja állam / tartomány / kanton szerint.
@@ -176,6 +177,7 @@ MenuMembersStats=Statisztika
 LastMemberDate=Legutóbbi tag dátum
 LatestSubscriptionDate=Utolsó feliratkozási dátum
 MemberNature=A tag jellege
+MembersNature=Nature of members
 Public=Információ nyilvánosak
 NewMemberbyWeb=Új tag hozzáadása megtörtént. Várakozás jóváhagyásra.
 NewMemberForm=Új tag ürlap
diff --git a/htdocs/langs/hu_HU/mrp.lang b/htdocs/langs/hu_HU/mrp.lang
index dd830a8e434..0a110b4dee4 100644
--- a/htdocs/langs/hu_HU/mrp.lang
+++ b/htdocs/langs/hu_HU/mrp.lang
@@ -1,6 +1,6 @@
-Mrp=Manufacturing Orders
-MO=Manufacturing Order
+Mrp=Gyártási rendelések
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -32,7 +32,7 @@ DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
 ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
 ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
-MenuMRP=Manufacturing Orders
+MenuMRP=Gyártási rendelések
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
 DateStartPlannedMo=Date start planned
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index 43667cffc4f..f260c21a8ac 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Több árszegmens termékenként / szolgáltatásonként (minden ügyfél egy árszegmensben van)
 MultiPricesNumPrices=Árak száma
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Virtuális termékek (készletek) aktiválása
-AssociatedProducts=Virtuális termékek
-AssociatedProductsNumber=Kapcsolódó termékek száma
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Főtermékek
-IfZeroItIsNotAVirtualProduct=Ha 0, ez a termék nem virtuális termék
-IfZeroItIsNotUsedByVirtualProduct=Ha 0, akkor ezt a terméket egyetlen virtuális termék sem használja
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Kulcsszó szűrés
 CategoryFilter=Kategória szűrés
 ProductToAddSearch=Termék keresése hozzáadáshoz
 NoMatchFound=Nincs találat
 ListOfProductsServices=Termékek / szolgáltatások felsorolása
-ProductAssociationList=A virtuális termék / készlet alkotóelemét képező termékek / szolgáltatások felsorolása
-ProductParentList=Jegyzéke termékek / szolgáltatások ezzel a termékkel, mint egy komponens
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=Az egyik kiválaszott termék szülője az aktuális terméknek
 DeleteProduct=Termék/szolgáltatás törlése
 ConfirmDeleteProduct=Biztos törölni akarja ezt a terméket/szolgáltatást?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Elérhető globális értékek:
 PriceMode=Ár mód
 PriceNumeric=Szám
 DefaultPrice=Alapár
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Növelje/csökkentse a készletet a szülő termék változásakor
 ComposedProduct=Gyermek termékek
 MinSupplierPrice=Minimális vételár
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Csomagolás
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/hu_HU/recruitment.lang b/htdocs/langs/hu_HU/recruitment.lang
index d886dbe3d61..17638802c51 100644
--- a/htdocs/langs/hu_HU/recruitment.lang
+++ b/htdocs/langs/hu_HU/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Várható dátum
 FutureManager=Jövőbeli vezető
 ResponsibleOfRecruitement=A toborzásért felelős
 IfJobIsLocatedAtAPartner=Amennyiben a munkapozíció partnernél található
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Állás pozíció
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/hu_HU/stocks.lang b/htdocs/langs/hu_HU/stocks.lang
index 8281f86d75e..c41ce038ee2 100644
--- a/htdocs/langs/hu_HU/stocks.lang
+++ b/htdocs/langs/hu_HU/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Mozgatás azonosítója %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Raktárak
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Hely
 LocationSummary=Hely rövid neve
@@ -122,8 +122,9 @@ DesiredStockDesc=Ez a készlet mennyiség lesz használatos a pótlási funkció
 StockToBuy=Rendelésre
 Replenishment=Feltöltés
 ReplenishmentOrders=Megrendelések pótlásra
-VirtualDiffersFromPhysical=A készletnövelés/csökkentés opcióinak megfelelően a fizikai és a virtuális (fizikai + aktív megrendelések) készlet különbözhet
-UseVirtualStockByDefault=Használja a virtuális készletet a fizikai helyett alapértelmezettként a pótlási funkció érdekében
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Virtuális készlet felhasználása
 UsePhysicalStock=Fizikai készlet használata
 CurentSelectionMode=Jelenlegi kiválasztási mód
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=Ez a termék már szerepel a listában
 SelectCategory=Kategória szűrés
 SelectFournisseur=Vendor filter
 inventoryOnDate=Készletnyilvántartás
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/hu_HU/suppliers.lang b/htdocs/langs/hu_HU/suppliers.lang
index 9c42f779316..ddee07d0144 100644
--- a/htdocs/langs/hu_HU/suppliers.lang
+++ b/htdocs/langs/hu_HU/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/hu_HU/website.lang b/htdocs/langs/hu_HU/website.lang
index cef2661b673..25d8faccd6d 100644
--- a/htdocs/langs/hu_HU/website.lang
+++ b/htdocs/langs/hu_HU/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Webhely hozzáadása
 Webpage=Weblap / tároló
 AddPage=Oldal / tároló hozzáadása
 HomePage=Honlap
-PageContainer=Oldal / konténer
+PageContainer=Oldal
 PreviewOfSiteNotYetAvailable=A weboldal előnézete <strong>%s</strong> még nem érhető el. Először &#39; <strong>Teljes weboldal-sablont</strong> kell <strong>importálnia</strong> &#39; vagy csak &#39; <strong>Oldal / tároló hozzáadása</strong> &#39; <strong>elemet</strong> .
 RequestedPageHasNoContentYet=Az %s azonosítóval kért oldalnak még nincs tartalma, vagy a .tpl.php gyorsítótár fájlt eltávolították. Szerkessze az oldal tartalmát ennek megoldásához.
 SiteDeleted=&#39;%s&#39; webhely törölve
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index ddaca2284f1..669c6b2ad04 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Standar untuk Layanan
 DefaultForProduct=Standar untuk Produk
 CantSuggest=Tidak bisa menyarankan
 AccountancySetupDoneFromAccountancyMenu=Kebanyakan aturan akutansi dilakukan dari bilah menu %s
-ConfigAccountingExpert=Konfigurasi modul ahli akuntansi
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Pencatatan Jurnal
-Journaux=Jurnal
+Journals=Jurnal
 JournalFinancial=Jurnal Keuangan
 BackToChartofaccounts=Akun grafik pembalik
 Chartofaccounts=Tabel Akun
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Akun sekarang yang dipakai
 AssignDedicatedAccountingAccount=Akun baru untuk ditambahkan
 InvoiceLabel=Label Tagihan
@@ -33,8 +35,8 @@ OtherInfo=Informasi lain
 DeleteCptCategory=Hilangkan akun akutansi dari grup
 ConfirmDeleteCptCategory=Apakah Anda yakin untuk menghilangkan akun akutansi ini dari grup akun akutansi?
 JournalizationInLedgerStatus=Status Pencatatan Jurnal
-AlreadyInGeneralLedger=Sudah dijurnal dalam buku besar
-NotYetInGeneralLedger=Belum dijurnal dalam buku besar
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Grup kosong, periksa pengaturan grup akuntansi yang dipersonalisasi
 DetailByAccount=Tampilkan rincian berdasarkan akun
 AccountWithNonZeroValues=Akun dengan nilai bukan nol
@@ -43,7 +45,9 @@ CountriesInEEC=Negara di EEC
 CountriesNotInEEC=Negara bukan di EEC
 CountriesInEECExceptMe=Negara di EEC kecuali %s
 CountriesExceptMe=Semua negara kecuali %s
-AccountantFiles=Ekspor dokumen akuntansi
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Akun akuntansi utama untuk pelanggan tidak ditentukan dalam pengaturan
 MainAccountForSuppliersNotDefined=Akun akuntansi utama untuk vendor tidak ditentukan dalam pengaturan
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=LANGKAH %s: Tambahkan atau sunting transaksi yang ada
 
 AccountancyAreaDescClosePeriod=LANGKAH %s: Tutup periode sehingga kita tidak dapat melakukan modifikasi di masa mendatang.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=Langkah wajib dalam penyiapan pengaturan tidak lengkap (jurnal kode akuntansi tidak ditentukan untuk semua rekening bank)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Pilih bagan akun aktif
 ChangeAndLoad=Ubah dan muat
 Addanaccount=Tambahkan sebuah akun akuntansi
@@ -89,6 +93,8 @@ SubledgerAccount=Akun sub Buku Besar
 SubledgerAccountLabel=Label akun sub Buku Besar
 ShowAccountingAccount=Tampilkan akun akuntansi
 ShowAccountingJournal=Tampilkan jurnal akuntansi
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Akun akuntansi yang disarankan
 MenuDefaultAccounts=Akun standar
 MenuBankAccounts=Akun bank
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Penjilidan laporan pengeluaran
 CreateMvts=Buat transaksi baru
 UpdateMvts=Modifikasi sebuah transaksi
 ValidTransaction=Validasi transaksi
-WriteBookKeeping=Daftarkan transaksi di Buku Besar
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Buku Besar
+BookkeepingSubAccount=Subledger
 AccountBalance=Saldo akun
 ObjectsRef=Referensi sumber objek
 CAHTF=Jumlah total pembelian vendor sebelum pajak
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Nonaktifkan pencatatan langsung transaksi di rekening
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Aktifkan konsep ekspor di jurnal
 ACCOUNTANCY_COMBO_FOR_AUX=Aktifkan daftar kombo untuk akun anak perusahaan (mungkin lambat jika Anda memiliki banyak pihak ketiga)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Jurnal Penjualan
 ACCOUNTING_PURCHASE_JOURNAL=Jurnal Pembelian
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Akun akuntansi tunggu
 DONATION_ACCOUNTINGACCOUNT=Akun akuntansi untuk mendaftarkan sumbangan
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Akun akuntansi untuk mendaftar langganan
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Akun akuntansi secara default untuk produk yang dibeli (digunakan jika tidak didefinisikan dalam lembar produk)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Akun akuntansi secara default untuk produk yang dibeli di EEC (digunakan jika tidak didefinisikan dalam lembar produk)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Akun akuntansi secara default untuk produk yang dibeli dan diimpor dari EEC (digunakan jika tidak didefinisikan dalam lembar produk)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Oleh kelompok yang telah ditentukan
 ByPersonalizedAccountGroups=Oleh grup yang dipersonalisasi
 ByYear=Tahun
 NotMatch=Tidak diatur
-DeleteMvt=Hapus baris Buku Besar
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Bulan untuk dihapus
 DelYear=Tahun untuk dihapus
 DelJournal=Jurnal untuk dihapus
-ConfirmDeleteMvt=Ini akan menghapus semua baris Buku Besar untuk tahun / bulan dan / atau dari jurnal tertentu (Setidaknya diperlukan satu kriteria). Anda harus menggunakan kembali fitur 'Pendaftaran dalam akuntansi' untuk memiliki catatan yang dihapus kembali dalam buku besar.
-ConfirmDeleteMvtPartial=Ini akan menghapus transaksi dari Buku Besar (semua baris yang terkait dengan transaksi yang sama akan dihapus)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Jurnal biaya laporan
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=Ini adalah tampilan catatan yang terikat ke akun akuntansi dan dapat direkam ke dalam Buku Besar.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Akun untuk PPN tidak ditentukan
 ThirdpartyAccountNotDefined=Akun untuk pihak ketiga tidak ditentukan
 ProductAccountNotDefined=Akun untuk produk tidak ditentukan
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Jurnal ini sudah digunakan
 AccountingAccountForSalesTaxAreDefinedInto=Catatan: Akun akuntansi untuk Pajak penjualan didefinisikan ke dalam menu<b>%s</b>-<b>%s </b>
 NumberOfAccountancyEntries=Jumlah entri
 NumberOfAccountancyMovements=Jumlah gerakan
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Ekspor draft jurnal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Ekspor CSV Dapat Dikonfigurasi
 Modelcsv_FEC=Ekspor FEC
 Modelcsv_Sage50_Swiss=Ekspor untuk Sage 50 Swiss
 Modelcsv_winfic=Ekspor Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Bagan akun Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index 6878f83da5e..d5b84801d2d 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Hapuskan penguncian koneksi.
 YourSession=Sesi Anda
 Sessions=Sesi Pengguna
 WebUserGroup=Server web pengguna / grup
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Konfigurasi PHP Anda tampaknya tidak diizinkan untuk membuat daftar untuk sesi yang aktif. Direktori yang digunakan untuk menyimpan sesi (<b>%s</b>) mungkin dilindungi (misalnya pengaturan izin OS atau oleh pengaturan direktif PHP open_basedir).
 DBStoringCharset=Karakter set atau charset dari basisdata untuk menyimpan data
 DBSortingCharset=Karakter set atau charset dari basisdata untuk penyortiran data
@@ -71,7 +73,7 @@ DisableJavascriptNote=Catatan: Untuk tujuan pengujian atau debug. Pengoptimasian
 UseSearchToSelectCompanyTooltip=Juga jika Anda memiliki banyak pihak ketiga (> 100.000), Anda dapat mempercepat dengan menetapkan konstanta COMPANY_DONOTSEARCH_ANYWHERE menjadi 1 pada Pengaturan-> Lainnya. Pencarian akan dibatasi kemudian untuk memulai string.
 UseSearchToSelectContactTooltip=Dan juga jika Anda memiliki banyak pihak ketiga (> 100.000), Anda dapat mempercepatnya dengan menetapkan konstanta CONTACT_DONOTSEARCH_ANYWHERE menjadi 1 di Pengaturan-> Lainnya. Pencarian akan kemudian dibatasi untuk memulai string.
 DelaiedFullListToSelectCompany=Tunggu hingga tombol ditekan sebelum memuat konten dari daftar kombo Pihak Ketiga.<br> Ini dapat meningkatkan kecepatan kinerja jika Anda memiliki banyak pihak ketiga, tetapi cara ini kurang nyaman.
-DelaiedFullListToSelectContact=Tunggu hingga tombol ditekan sebelum memuat konten dari daftar kombo Kontak.<br> Ini dapat meningkatkan kecepatan kinerja jika Anda memiliki banyak kontak, tetapi cara ini kurang nyaman)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Jumlah karakter yang memicu pencarian: %s
 NumberOfBytes=Jumlah Bytes
 SearchString=Cari string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=Pada dokumen pihak ketiga, dapat memilih pr
 JavascriptDisabled=JavaScript dinonaktifkan
 UsePreviewTabs=Gunakan tab pratinjau
 ShowPreview=Tampilkan pratinjau
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview tidak tersedia
 ThemeCurrentlyActive=Tema yang sedang aktif
 CurrentTimeZone=TimeZone PHP (Server)
@@ -271,7 +274,7 @@ NoticePeriod=Periode pemberitahuan
 NewByMonth=Baru setiap bulan
 Emails=Email
 EMailsSetup=Penyiapan email
-EMailsDesc=Halaman ini memungkinkan Anda mengganti parameter PHP default untuk pengiriman email. Dalam kebanyakan kasus di OS Unix / Linux, pengaturan PHP benar dan parameter ini tidak perlu.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Email profil pengirim
 EMailsSenderProfileDesc=Anda dapat menyimpan bagian ini kosong. Jika Anda memasukkan beberapa email di sini, mereka akan ditambahkan ke daftar kemungkinan pengirim ke kotak kombo saat Anda menulis email baru.
 MAIN_MAIL_SMTP_PORT=Port SMTP / SMTPS (nilai default dalam php.ini:<b>%s </b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=ID SMTP (jika server pengirim memerlukan otentikasi)
 MAIN_MAIL_SMTPS_PW=Kata Sandi SMTP (jika server pengirim memerlukan otentikasi)
 MAIN_MAIL_EMAIL_TLS=Gunakan enkripsi TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Gunakan enkripsi TLS (STARTTLS)
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Gunakan DKIM untuk menghasilkan tanda tangan email
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Domain Email untuk digunakan dengan dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Nama pemilih dkim
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Membiarkan baris ini kosong berarti nilai ini akan d
 ExtrafieldParamHelpselect=Daftar nilai harus berupa garis dengan kunci format, nilai (di mana kunci tidak boleh '0') <br> <br> misalnya: <br> 1, nilai1<br>2, nilai2 a0342fccfda0b3f0f0f0fb0f0f0fb03 daftar tergantung pada daftar atribut pelengkap lain: <br> 1, nilai1 | options_ <i> parent_list_code </i>: parent_key<br>2, value2 | options_ <i> parent_list_code </i>: parent_key <br> <br> dalam rangka untuk memiliki daftar tergantung pada daftar lain: <br> 1, nilai1 | <i> parent_list_code </i>: parent_key<br>2, value2 | <i> parent_list_code </i>: parent_key
 ExtrafieldParamHelpcheckbox=Daftar nilai harus berupa garis dengan kunci format, nilai (di mana kunci tidak boleh '0') <br> <br> misalnya: <br> 1, value1<br>2, value2 a0342fccfda2b3f0f3f0f3f
 ExtrafieldParamHelpradio=Daftar nilai harus berupa garis dengan kunci format, nilai (di mana kunci tidak boleh '0') <br> <br> misalnya: <br> 1, value1<br>2, value2 a0342fccfda2b3f0f3f0f3f
-ExtrafieldParamHelpsellist=Daftar nilai berasal dari tabel<br>Sintaks: table_name: label_field: id_field :: filter<br>Contoh: c_typent: libelle: id :: filter <br> <br> a = 1) untuk hanya menampilkan nilai aktif<br>Anda juga dapat menggunakan $ ID $ dalam penyihir filter adalah id saat ini dari objek saat ini<br>Untuk melakukan SELECT dalam menggunakan filter $ SEL $ <br> jika Anda ingin memfilter pada extrafields gunakan sintaks ekstra.fieldcode. = ... (di mana kode baris adalah kode extrafield) <br> <br> Untuk memiliki daftar tergantung pada daftar atribut pelengkap lain: <br> c_typent: libelle: id: options_ a049271e8641c0b0e_03_03_03_03_03_03_03_03_03_03_03_03_03_03_03_03_0_03 daftar tergantung pada daftar lain: <br> c_typent: libelle: id: <i> parent_list_code a0ae64758bac3 3z0 | parent_column: filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Daftar nilai berasal dari tabel<br>Sintaks: table_name: label_field: id_field :: filter<br>Contoh: c_typent: libelle: id :: filter <br> <br> filter a hanya dapat ditampilkan sebagai contoh a juga dapat menggunakan $ ID $ dalam penyihir filter adalah id saat ini dari objek saat ini<br>Untuk melakukan SELECT dalam menggunakan $ SEL $ <br> jika Anda ingin memfilter pada extrafields gunakan sintaks extra.fieldcode = ... (di mana kode baris adalah kode extrafield) <br> <br> dalam rangka untuk memiliki daftar tergantung pada daftar atribut pelengkap lain: <br> c_typent: Libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> dalam rangka untuk memiliki daftar tergantung pada daftar lain: c_typent <br>: libelle: id: <i> parent_list_code </i> | parent_column: filter
-ExtrafieldParamHelplink=Parameter harus ObjectName: Classpath<br>Sintaks: ObjectName: Classpath<br>Contoh: <br> Societe: societe / class / societe.class.php a0342fccfda19bpp kontak: kontak / kontak dengan kontak kelas
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Biarkan kosong untuk pemisah sederhana<br>Setel ini menjadi 1 untuk pemisah runtuh (buka secara default untuk sesi baru, kemudian status disimpan untuk setiap sesi pengguna) status disimpan sebelum setiap sesi pengguna)
 LibraryToBuildPDF=Perpustakaan digunakan untuk pembuatan PDF
 LocalTaxDesc=Beberapa negara dapat menerapkan dua atau tiga pajak pada setiap baris faktur. Jika demikian, pilih jenis untuk pajak kedua dan ketiga beserta tarifnya. Jenis yang mungkin adalah: <br> 1: pajak daerah berlaku untuk produk dan layanan tanpa PPN (pajak lokal dihitung berdasarkan jumlah tanpa pajak) <br> 2: pajak daerah berlaku untuk produk dan layanan termasuk PPN (pajak lokal dihitung berdasarkan jumlah + pajak utama) a0342fccfda19bz 3: pajak lokal berlaku untuk produk tanpa pajak (pajak lokal dihitung berdasarkan jumlah tanpa pajak) <br> 4: pajak lokal berlaku untuk produk termasuk pajak (pajak lokal dihitung atas jumlah + pajak utama) <br> 5: pajak lokal berlaku untuk layanan tanpa pajak (pajak lokal dihitung pada jumlah tanpa pajak) <br> 6: pajak lokal berlaku untuk layanan termasuk PPN (pajak lokal dihitung atas jumlah + pajak)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s diikuti oleh nama pelanggan terpotong deng
 ModuleCompanyCodeSupplierDigitaria=%s diikuti oleh nama pemasok terpotong dengan jumlah karakter: %s untuk kode akuntansi pemasok.
 Use3StepsApproval=Secara default, Pesanan Pembelian harus dibuat dan disetujui oleh 2 pengguna yang berbeda (satu langkah / pengguna untuk membuat dan satu langkah / pengguna untuk menyetujui. Perhatikan bahwa jika pengguna memiliki izin untuk membuat dan menyetujui, satu langkah / pengguna akan cukup) . Anda dapat bertanya dengan opsi ini untuk memperkenalkan langkah ketiga / persetujuan pengguna, jika jumlahnya lebih tinggi dari nilai yang ditentukan (jadi 3 langkah diperlukan: 1 = validasi, 2 = persetujuan pertama dan 3 = persetujuan kedua jika jumlahnya cukup). <br> Set ini menjadi kosong jika satu persetujuan (2 langkah) sudah cukup, setel ke nilai yang sangat rendah (0,1) jika persetujuan kedua (3 langkah) selalu diperlukan.
 UseDoubleApproval=Gunakan persetujuan 3 langkah saat jumlah (tanpa pajak) lebih tinggi dari ...
-WarningPHPMail=PERINGATAN: Seringkali lebih baik untuk mengatur email keluar untuk menggunakan server email penyedia Anda daripada pengaturan default. Beberapa penyedia email (seperti Yahoo) tidak memungkinkan Anda mengirim email dari server lain selain dari server mereka sendiri. Pengaturan Anda saat ini menggunakan server aplikasi untuk mengirim email dan bukan server penyedia email Anda, sehingga beberapa penerima (yang kompatibel dengan protokol DMARC terbatas), akan bertanya kepada penyedia email Anda apakah mereka dapat menerima email Anda dan beberapa penyedia email (seperti Yahoo) dapat menjawab "tidak" karena server bukan milik mereka, sehingga sedikit dari Email yang Anda kirimkan mungkin tidak dapat diterima (hati-hati juga dengan kuota pengiriman penyedia email Anda). <br> Jika penyedia Email Anda (seperti Yahoo) memiliki batasan ini, Anda harus mengubah pengaturan Email untuk memilih metode lain "SMTP server" dan masukkan server SMTP dan kredensial yang disediakan oleh penyedia Email Anda.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=Jika penyedia SMTP email Anda perlu membatasi klien email ke beberapa alamat IP (sangat jarang), ini adalah alamat IP dari agen pengguna email (MUA) untuk aplikasi ERP CRM Anda:<strong>%s </strong>.
-WarningPHPMailSPF=Jika nama domain di alamat email pengirim Anda dilindungi oleh SPF (tanyakan penyedia email Anda), Anda harus memasukkan IP berikut dalam catatan SPF DNS domain Anda:<strong>%s </strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Klik untuk menampilkan deskripsi
 DependsOn=Modul ini membutuhkan modul
 RequiredBy=Modul ini diperlukan oleh modul
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integrasi sistem ClickToDial (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Tambahkan fungsi untuk menghasilkan akun Bookmark4u dari akun Dolibarr
 Module60Name=Stiker
 Module60Desc=Manajemen stiker
 Module70Name=Intervensi
@@ -656,7 +662,7 @@ Module50200Desc=Menawarkan pelanggan halaman pembayaran online PayPal (akun PayP
 Module50300Name=Garis
 Module50300Desc=Menawarkan pelanggan halaman pembayaran online Stripe (kartu kredit / debit). Ini dapat digunakan untuk memungkinkan pelanggan Anda melakukan pembayaran ad-hoc atau pembayaran yang terkait dengan objek Dolibarr tertentu (faktur, pesanan, dll ...)
 Module50400Name=Akuntansi (entri ganda)
-Module50400Desc=Manajemen akuntansi (entri ganda, mendukung buku besar umum dan pembantu). Ekspor buku besar dalam beberapa format perangkat lunak akuntansi lainnya.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Cetak langsung (tanpa membuka dokumen) menggunakan antarmuka Cups IPP (Printer harus terlihat dari server, dan CUPS harus diinstal pada server).
 Module55000Name=Polling, Survei atau Vote
@@ -671,7 +677,7 @@ Module63000Name=Sumber daya
 Module63000Desc=Kelola sumber daya (printer, mobil, kamar, ...) untuk dialokasikan ke agenda
 Permission11=Membaca Nota Pelanggan
 Permission12=Membuat/Merubah Nota Pelanggan
-Permission13=Batalkan faktur pelanggan
+Permission13=Invalidate customer invoices
 Permission14=Validasi Nota Pelanggan
 Permission15=Mengirim Nota Pelanggan Menggunakan EMail
 Permission16=Mencatat Pembayaran Untuk Nota Pelanggan
@@ -688,6 +694,7 @@ Permission32=Membuat/Merubah produk
 Permission34=Menghapus Produk
 Permission36=Lihat / kelola produk tersembunyi
 Permission38=Produk ekspor
+Permission39=Ignore minimum price
 Permission41=Baca proyek dan tugas (proyek bersama dan proyek yang saya hubungi). Dapat juga memasukkan waktu yang dikonsumsi, untuk saya atau hierarki saya, pada tugas yang diberikan (absen)
 Permission42=Buat / modifikasi proyek (proyek bersama dan proyek yang saya hubungi). Dapat juga membuat tugas dan menetapkan pengguna untuk proyek dan tugas
 Permission44=Hapus proyek (proyek bersama dan proyek yang saya hubungi)
@@ -696,6 +703,9 @@ Permission61=Baca intervensi
 Permission62=Buat / modifikasi intervensi
 Permission64=Hapus intervensi
 Permission67=Intervensi ekspor
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Membaca Data Anggota
 Permission72=Membuat/Merubah Data Anggota
 Permission74=Menghapus Data Anggota
@@ -718,6 +728,7 @@ Permission95=Membaca Laporan
 Permission101=Baca kiriman
 Permission102=Buat / ubah pengiriman
 Permission104=Validasi pengiriman
+Permission105=Send sendings by email
 Permission106=Pengiriman ekspor
 Permission109=Hapus pengiriman
 Permission111=Baca akun keuangan
@@ -825,10 +836,11 @@ Permission402=Buat / ubah diskon
 Permission403=Validasi diskon
 Permission404=Hapus diskon
 Permission430=Gunakan Debug Bar
-Permission511=Baca pembayaran gaji
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Buat / ubah pembayaran gaji
 Permission514=Hapus pembayaran gaji
-Permission517=Gaji ekspor
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Baca Pinjaman
 Permission522=Buat / modifikasi pinjaman
 Permission524=Hapus pinjaman
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Baca Bills of Material
 Permission651=Buat / Perbarui Bills of Material
 Permission652=Hapus Bills of Material
@@ -884,7 +899,9 @@ Permission1185=Setujui pesanan pembelian
 Permission1186=Memesan pesanan pembelian
 Permission1187=Mengakui tanda terima pesanan pembelian
 Permission1188=Hapus pesanan pembelian
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Menyetujui (persetujuan kedua) pesanan pembelian
+Permission1191=Export supplier orders and their attributes
 Permission1201=Dapatkan hasil ekspor
 Permission1202=Buat / Ubah ekspor
 Permission1231=Baca faktur vendor
@@ -898,6 +915,8 @@ Permission1251=Menjalankan impor massal data eksternal ke dalam basis data (memu
 Permission1321=Ekspor faktur, atribut, dan pembayaran pelanggan
 Permission1322=Buka kembali tagihan yang dibayar
 Permission1421=Ekspor pesanan dan atribut penjualan
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Baca tindakan (agenda atau tugas) yang ditautkan dengan akun penggunanya (jika pemilik agenda atau baru saja ditugaskan)
 Permission2402=Buat / modifikasi tindakan (agenda atau tugas) yang ditautkan ke akun penggunanya (jika pemilik agenda)
 Permission2403=Hapus tindakan (agenda atau tugas) yang ditautkan ke akun penggunanya (jika pemilik agenda)
@@ -932,9 +951,13 @@ Permission23001=Baca pekerjaan terjadwal
 Permission23002=Buat / perbarui pekerjaan yang Dijadwalkan
 Permission23003=Hapus pekerjaan terjadwal
 Permission23004=Jalankan pekerjaan yang Dijadwalkan
-Permission50101=Gunakan Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Membaca Data Transaksi
 Permission50202=Transaksi impor
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Ikat produk dan faktur dengan akun akuntansi
 Permission50411=Baca operasi dalam buku besar
 Permission50412=Tulis / Edit operasi dalam buku besar
@@ -958,6 +981,17 @@ Permission63001=Baca sumber daya
 Permission63002=Buat / modifikasi sumber daya
 Permission63003=Hapus sumber daya
 Permission63004=Tautkan sumber daya ke agenda agenda
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Jenis pihak ketiga
 DictionaryCompanyJuridicalType=Badan hukum pihak ketiga
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Jenis cuti
 DictionaryOpportunityStatus=Status memimpin untuk proyek / prospek
 DictionaryExpenseTaxCat=Laporan biaya - Kategori transportasi
 DictionaryExpenseTaxRange=Laporan biaya - Kisaran berdasarkan kategori transportasi
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Pengaturan disimpan
 SetupNotSaved=Pengaturan tidak disimpan
 BackToModuleList=Kembali ke daftar Modul
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label digunakan secara default jika tidak ada terjemahan yang
 LabelOnDocuments=Beri label pada dokumen
 LabelOrTranslationKey=Label atau kunci terjemahan
 ValueOfConstantKey=Nilai konstanta konfigurasi
+ConstantIsOn=Option %s is on
 NbOfDays=Jumlah hari
 AtEndOfMonth=diakhir bulan
 CurrentNext=Sekarang / selanjutnya
@@ -1145,6 +1182,7 @@ InfoWebServer=Tentang Server Web
 InfoDatabase=Tentang Basis Data
 InfoPHP=Tentang PHP
 InfoPerf=Tentang Pertunjukan
+InfoSecurity=About Security
 BrowserName=Nama peramban
 BrowserOS=OS peramban
 ListOfSecurityEvents=Daftar agenda keamanan Dolibarr
@@ -1194,7 +1232,8 @@ RestoreDesc=Untuk mengembalikan cadangan Dolibarr, diperlukan dua langkah.
 RestoreDesc2=Kembalikan file cadangan (misalnya file zip) dari direktori "dokumen" ke instalasi Dolibarr baru atau ke direktori dokumen saat ini (<b> %s </b>).
 RestoreDesc3=Kembalikan struktur database dan data dari file dump cadangan ke dalam database instalasi Dolibarr baru atau ke dalam database instalasi saat ini (<b> %s </b>). Peringatan, setelah pemulihan selesai, Anda harus menggunakan login / kata sandi, yang ada dari waktu cadangan / instalasi untuk terhubung lagi. <br> Untuk mengembalikan database cadangan ke dalam instalasi saat ini, Anda dapat mengikuti asisten ini.
 RestoreMySQL=Impor MySQL
-ForcedToByAModule= Aturan ini dipaksa untuk<b>%s</b>oleh modul yang diaktifkan
+ForcedToByAModule=Aturan ini dipaksa untuk<b>%s</b>oleh modul yang diaktifkan
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=File cadangan yang ada
 PreviousArchiveFiles=File arsip yang ada
 WeekStartOnDay=Hari pertama dalam seminggu
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=Komponen PHP %s dimuat
 PreloadOPCode=OPCode preloaded digunakan
 AddRefInList=Tampilkan Pelanggan / Vendor ref. daftar info (daftar pilih atau kotak kombo) dan sebagian besar hyperlink. <br> Pihak Ketiga akan muncul dengan format nama "CC12345 - SC45678 - The Big Company corp." alih-alih "Perusahaan Besar Perusahaan".
 AddAdressInList=Tampilkan daftar info alamat Pelanggan / Vendor (daftar pilih atau kotak kombo) <br> Pihak Ketiga akan muncul dengan format nama "Korporasi Perusahaan Besar - 21 lompat jalan 123456 Kota besar - AS" alih-alih "Korps Perusahaan Besar".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Mintalah metode pengiriman pilihan untuk Pihak Ketiga.
 FieldEdition=Edisi baris %s
 FillThisOnlyIfRequired=Contoh: +2 (isi hanya jika masalah offset zona waktu dialami)
@@ -1282,7 +1322,7 @@ GetBarCode=Dapatkan barcode
 NumberingModules=Model penomoran
 DocumentModules=Model dokumen
 ##### Module password generation
-PasswordGenerationStandard=Kembalikan kata sandi yang dihasilkan sesuai dengan algoritma Dolibarr internal: 8 karakter yang berisi angka bersama dan karakter dalam huruf kecil.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Jangan menyarankan kata sandi yang dihasilkan. Kata sandi harus diketik secara manual.
 PasswordGenerationPerso=Kembalikan kata sandi sesuai dengan konfigurasi yang Anda tentukan secara pribadi.
 SetupPerso=Menurut konfigurasi Anda
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Diperlukan email untuk membuat anggota baru
 MemberSendInformationByMailByDefault=Kotak centang untuk mengirim konfirmasi email kepada anggota (validasi atau berlangganan baru) diaktifkan secara default
 VisitorCanChooseItsPaymentMode=Pengunjung dapat memilih dari mode pembayaran yang tersedia
 MEMBER_REMINDER_EMAIL=Aktifkan pengingat otomatis<b>melalui email</b>dari langganan yang kedaluwarsa. Catatan: Modul<strong>%s </strong> harus diaktifkan dan diatur dengan benar untuk mengirim pengingat.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=Pengaturan LDAP
 LDAPGlobalParameters=Parameter Global
@@ -1523,7 +1564,9 @@ LDAPDescValues=Nilai contoh dirancang untuk<b>OpenLDAP</b>dengan skema dimuat be
 ForANonAnonymousAccess=Untuk akses yang diautentikasi (misalnya untuk akses tulis)
 PerfDolibarr=Pengaturan kinerja / laporan optimalisasi
 YouMayFindPerfAdviceHere=Halaman ini menyediakan beberapa pemeriksaan atau saran yang berkaitan dengan kinerja.
-NotInstalled=Tidak terpasang, jadi server Anda tidak diperlambat oleh ini.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Cache yang berlaku
 MemcachedNotAvailable=Tidak ditemukan cache aplikatif. Anda dapat meningkatkan kinerja dengan menginstal server cache Memcached dan modul dapat menggunakan server cache ini. <br> Informasi lebih lanjut di sini <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN"> http://wiki.dolibarr.org/index.php/Module_MemCached_EN </a>. <br> Perhatikan bahwa banyak penyedia hosting web tidak menyediakan server cache seperti itu.
 MemcachedModuleAvailableButNotSetup=Modul memcached untuk cache aplikatif ditemukan tetapi pengaturan modul tidak lengkap.
@@ -1571,9 +1614,9 @@ SyslogLevel=Tingkat
 SyslogFilename=Nama file dan jalur
 YouCanUseDOL_DATA_ROOT=Anda dapat menggunakan DOL_DATA_ROOT / dolibarr.log untuk file log di direktori "dokumen" Dolibarr. Anda dapat mengatur jalur lain untuk menyimpan file ini.
 ErrorUnknownSyslogConstant=Constant %s bukan konstanta Syslog yang dikenal
-OnlyWindowsLOG_USER=Windows hanya mendukung LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Kompresi dan cadangan file log debug (dihasilkan oleh modul Log untuk debug)
-SyslogFileNumberOfSaves=Cadangan cadangan
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Konfigurasikan pekerjaan terjadwal untuk mengatur frekuensi cadangan log
 ##### Donations #####
 DonationsSetup=Pengaturan modul donasi
@@ -1629,7 +1672,7 @@ AdvancedEditor=Editor tingkat lanjut
 ActivateFCKeditor=Aktifkan editor lanjutan untuk:
 FCKeditorForCompany=WYSIWIG pembuatan / edisi deskripsi elemen dan catatan (kecuali produk / layanan)
 FCKeditorForProduct=WYSIWIG pembuatan / edisi deskripsi produk dan layanan / catatan
-FCKeditorForProductDetails=WYSIWIG membuat / edisi garis rincian produk untuk semua entitas (proposal, pesanan, faktur, dll ...). <font class="warning"> Peringatan: Menggunakan opsi ini untuk kasus ini sangat tidak disarankan karena dapat membuat masalah dengan karakter khusus dan pemformatan halaman saat membuat file PDF. </font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= Pembuatan / edisi WYSIWIG untuk eMailing massal (Alat-> eMailing)
 FCKeditorForUserSignature=WYSIWIG pembuatan / edisi tanda tangan pengguna
 FCKeditorForMail=Pembuatan / edisi WYSIWIG untuk semua email (kecuali Tools-> eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Pengaturan modul stok
 IfYouUsePointOfSaleCheckModule=Jika Anda menggunakan modul Point of Sale (POS) yang disediakan secara default atau modul eksternal, pengaturan ini mungkin diabaikan oleh modul POS Anda. Sebagian besar modul POS dirancang secara default untuk membuat faktur segera dan mengurangi stok terlepas dari opsi di sini. Jadi jika Anda perlu atau tidak memiliki penurunan stok saat mendaftarkan penjualan dari POS Anda, periksa juga pengaturan modul POS Anda.
 ##### Menu #####
 MenuDeleted=Menu dihapus
+Menu=Menu
 Menus=Menu
 TreeMenuPersonalized=Menu yang dipersonalisasi
 NotTopTreeMenuPersonalized=Menu yang dipersonalisasi tidak ditautkan ke entri menu teratas
 NewMenu=Menu baru
-Menu=Pemilihan menu
 MenuHandler=Penangan menu
 MenuModule=Modul sumber
 HideUnauthorizedMenu= Sembunyikan menu yang tidak sah (abu-abu)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Secara otomatis mengatur nilai default ini untuk j
 AGENDA_DEFAULT_FILTER_TYPE=Secara otomatis mengatur jenis agenda ini di filter pencarian tampilan agenda
 AGENDA_DEFAULT_FILTER_STATUS=Secara otomatis mengatur status ini untuk agenda di filter pencarian tampilan agenda
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Aktifkan pengingat agenda<b>melalui email</b>(opsi pengingat / penundaan dapat ditentukan pada setiap agenda). Catatan: Modul<strong>%s </strong> harus diaktifkan dan diatur dengan benar agar pengingat dikirim pada frekuensi yang benar.
-AGENDA_REMINDER_BROWSER=Aktifkan pengingat agenda<b>di browser pengguna</b>(ketika tanggal agenda tercapai, setiap pengguna dapat menolak ini dari pertanyaan konfirmasi browser)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Aktifkan pemberitahuan suara
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Tampilkan objek yang ditautkan ke tampilan agenda
 ##### Clicktodial #####
 ClickToDialSetup=Klik Untuk Memanggil pengaturan modul
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0: Jenis pembayaran pelanggan, 1: Jenis pembayaran vendor, 2: Ba
 IncludePath=Sertakan jalur (didefinisikan ke dalam variabel %s)
 ExpenseReportsSetup=Pengaturan Laporan Biaya modul
 TemplatePDFExpenseReports=Templat dokumen untuk menghasilkan dokumen laporan pengeluaran
-ExpenseReportsIkSetup=Pengaturan modul Laporan Biaya - Indeks Milles
 ExpenseReportsRulesSetup=Penyiapan modul Laporan Biaya - Aturan
 ExpenseReportNumberingModules=Modul penomoran laporan biaya
 NoModueToManageStockIncrease=Tidak ada modul yang dapat mengelola peningkatan stok otomatis yang diaktifkan. Peningkatan stok akan dilakukan hanya dengan input manual.
@@ -1864,7 +1907,7 @@ MailToSendReception=Penerimaan
 MailToThirdparty=Pihak Ketiga
 MailToMember=Anggota
 MailToUser=Pengguna
-MailToProject=Halaman proyek
+MailToProject=Projects
 MailToTicket=Tiket
 ByDefaultInList=Tampilkan secara default pada tampilan daftar
 YouUseLastStableVersion=Anda menggunakan versi stabil terbaru
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Muat pihak ketiga yang mencari di %s (hanya memuat)
 LoadThirdPartyFromNameOrCreate=Muat pencarian pihak ketiga di %s (buat jika tidak ditemukan)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Kode Pos
 MainMenuCode=Kode entri menu (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Nonaktifkan fitur untuk menautkan sumber daya ke kon
 EnableResourceUsedInEventCheck=Aktifkan fitur untuk memeriksa apakah sumber daya digunakan dalam suatu agenda
 ConfirmUnactivation=Konfirmasikan setel ulang modul
 OnMobileOnly=Hanya pada layar kecil (smartphone)
-DisableProspectCustomerType=Nonaktifkan jenis pihak ketiga "Prospek + Pelanggan" (jadi pihak ketiga harus Prospek atau Pelanggan tetapi tidak bisa keduanya)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Sederhanakan antarmuka untuk orang buta
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Aktifkan opsi ini jika Anda adalah orang buta, atau jika Anda menggunakan aplikasi dari peramban teks seperti Lynx atau Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Ubah warna antarmuka untuk orang buta warna
@@ -1996,13 +2041,15 @@ UseDebugBar=Gunakan bilah debug
 DEBUGBAR_LOGS_LINES_NUMBER=Jumlah baris log terakhir untuk disimpan di konsol
 WarningValueHigherSlowsDramaticalyOutput=Peringatan, nilai yang lebih tinggi memperlambat output yang dramatis
 ModuleActivated=Modul %s diaktifkan dan memperlambat antarmuka
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Model ekspor dibagi dengan semua orang
 ExportSetup=Pengaturan ekspor modul
 ImportSetup=Pengaturan impor modul
 InstanceUniqueID=ID unik dari instance
 SmallerThan=Lebih kecil dari
 LargerThan=lebih besar dari
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=Dengan akun GMail, jika Anda mengaktifkan validasi 2 langkah, disarankan untuk membuat kata sandi khusus kedua untuk aplikasi alih-alih menggunakan kata sandi akun Anda sendiri dari https://myaccount.google.com/.
 EmailCollectorTargetDir=Ini mungkin merupakan perilaku yang diinginkan untuk memindahkan email ke tag / direktori lain ketika berhasil diproses. Cukup atur nama direktori di sini untuk menggunakan fitur ini (JANGAN menggunakan karakter khusus dalam nama). Perhatikan bahwa Anda juga harus menggunakan akun login baca / tulis.
 EmailCollectorLoadThirdPartyHelp=Anda dapat menggunakan tindakan ini untuk menggunakan konten email untuk menemukan dan memuat pihak ketiga yang ada di database Anda. Pihak ketiga yang ditemukan (atau dibuat) akan digunakan untuk mengikuti tindakan yang membutuhkannya. Di baris parameter Anda dapat menggunakan misalnya 'EXTRACT: BODY: Name: \\ s ([^ \\ s] *)' jika Anda ingin mengekstrak nama pihak ketiga dari string 'Nama: nama untuk menemukan' ditemukan di dalam tubuh.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=Skala adalah jumlah tempat Anda harus memindahkan bagian desi
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/id_ID/banks.lang b/htdocs/langs/id_ID/banks.lang
index 0b560405473..4f6a68201fd 100644
--- a/htdocs/langs/id_ID/banks.lang
+++ b/htdocs/langs/id_ID/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Pembayaran lain-lain
 VariousPayments=Pembayaran lain-lain
 ShowVariousPayment=Tampilkan pembayaran lain-lain
 AddVariousPayment=Tambahkan pembayaran lain-lain
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=Mandat SEPA
 YourSEPAMandate=Mandat SEPA Anda
 FindYourSEPAMandate=Ini adalah mandat SEPA Anda untuk mengotorisasi perusahaan kami untuk melakukan pemesanan debit langsung ke bank Anda. Kembalikan ditandatangani (pindai dokumen yang ditandatangani) atau kirimkan melalui pos ke
@@ -176,3 +179,4 @@ BankColorizeMovement=Warnai gerakan
 BankColorizeMovementDesc=Jika fungsi ini diaktifkan, Anda dapat memilih warna latar belakang spesifik untuk gerakan debit atau kredit
 BankColorizeMovementName1=Warna latar belakang untuk pergerakan debit
 BankColorizeMovementName2=Warna latar belakang untuk pergerakan kredit
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/id_ID/categories.lang b/htdocs/langs/id_ID/categories.lang
index 1e3f50cd4e4..15b8b143200 100644
--- a/htdocs/langs/id_ID/categories.lang
+++ b/htdocs/langs/id_ID/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Pengaturan label/kategori
 CategorieRecursiv=Tautkan dengan label/kategori induk secara otomatis
 CategorieRecursivHelp=Jika opsi aktif, ketika Anda menambahkan produk ke dalam subkategori, produk juga akan ditambahkan ke dalam kategori induk.
 AddProductServiceIntoCategory=Tambahkan produk/layanan berikut
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Tampilkan label/kategori
 ByDefaultInList=Secara default dalam daftar
 ChooseCategory=Pilih Kategori
-StocksCategoriesArea=Kategori Gudang Area
-ActionCommCategoriesArea=Kategori Perihal Area
-WebsitePagesCategoriesArea=Halaman-Kategori Kategori Kontainer
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Gunakan atau operator untuk kategori
diff --git a/htdocs/langs/id_ID/companies.lang b/htdocs/langs/id_ID/companies.lang
index 52524b4b5e4..3dd19063424 100644
--- a/htdocs/langs/id_ID/companies.lang
+++ b/htdocs/langs/id_ID/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Id Prof 1 (nomor profesional)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Id Prof 1 (nomor Federal)
 ProfId4CH=Prof Id 2 (Nomor Catatan Komersial)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Id Prof 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Nomor jaminan sosial)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (nomor perguruan tinggi)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, APE lama)
 ProfId4FR=Id Prof 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Nomor pendaftaran
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (PAJAK SRVC)
 ProfId4IN=Id Prof 4
 ProfId5IN=Id Prof 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Indo. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Indo. prof. 2 (Izin usaha)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.)
-ProfId5MA=Indo. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Id Prof 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=Jumlah KVK
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Nomor jaminan sosial)
 ProfId3PT=Prof Id 3 (Nomor Catatan Komersial)
 ProfId4PT=Prof Id 4 (Konservatori)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Matnmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=Anda juga dapat memeriksa secara manual di situs web Komisi
 ErrorVATCheckMS_UNAVAILABLE=Periksa tidak mungkin. Layanan cek tidak disediakan oleh negara anggota (%s).
 NorProspectNorCustomer=Bukan prospek, bukan pelanggan
 JuridicalStatus=Jenis Badan Hukum
+Workforce=Workforce
 Staff=karyawan
 ProspectLevelShort=Potensi
 ProspectLevel=Potensi prospek
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Jangka Waktu Pembayaran - Vendor
 PaymentTypeBoth=Jenis Pembayaran - Pelanggan dan Vendor
 MulticurrencyUsed=Gunakan Multicurrency
 MulticurrencyCurrency=Mata uang
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/id_ID/ecm.lang b/htdocs/langs/id_ID/ecm.lang
index 842853af63a..3702ead5f33 100644
--- a/htdocs/langs/id_ID/ecm.lang
+++ b/htdocs/langs/id_ID/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Cari berdasarkan kata kunci
 ECMSearchByEntity=Cari berdasarkan objek
 ECMSectionOfDocuments=Direktori dokumen
 ECMTypeAuto=Otomatis
-ECMDocsBySocialContributions=Dokumen yang dikaitkan dengan pajak sosial atau fiskal
-ECMDocsByThirdParties=Dokumen terkait dengan pihak ketiga
-ECMDocsByProposals=Dokumen terkait dengan proposal
-ECMDocsByOrders=Dokumen terkait dengan pesanan pelanggan
-ECMDocsByContracts=Dokumen terkait dengan kontrak
-ECMDocsByInvoices=Dokumen yang ditautkan dengan faktur pelanggan
-ECMDocsByProducts=Dokumen terkait dengan produk
-ECMDocsByProjects=Dokumen terkait dengan proyek
-ECMDocsByUsers=Dokumen yang ditautkan dengan pengguna
-ECMDocsByInterventions=Dokumen terkait dengan intervensi
-ECMDocsByExpenseReports=Dokumen yang ditautkan dengan laporan pengeluaran
-ECMDocsByHolidays=Dokumen terkait dengan hari libur
-ECMDocsBySupplierProposals=Dokumen yang ditautkan dengan proposal vendor
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=Tidak ada direktori yang dibuat
 ShowECMSection=Tampilkan direktori
 DeleteSection=Hapus direktori
@@ -50,3 +38,6 @@ ReSyncListOfDir=Sinkronisasi ulang daftar direktori
 HashOfFileContent=Hash konten file
 NoDirectoriesFound=Tidak ada direktori yang ditemukan
 FileNotYetIndexedInDatabase=File belum diindeks ke dalam basis data (coba unggah kembali)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/id_ID/hrm.lang b/htdocs/langs/id_ID/hrm.lang
index 574bb5bd380..829bb3d48e9 100644
--- a/htdocs/langs/id_ID/hrm.lang
+++ b/htdocs/langs/id_ID/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Posisi pekerjaan
 Employees=karyawan
 Employee=karyawan
 NewEmployee=Karyawan Baru
+ListOfEmployees=Daftar Karyawan
diff --git a/htdocs/langs/id_ID/install.lang b/htdocs/langs/id_ID/install.lang
index eab837c416b..ec85aa3eaf9 100644
--- a/htdocs/langs/id_ID/install.lang
+++ b/htdocs/langs/id_ID/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=File konfigurasi<b>%s</b>tidak dapat ditulis. Periksa izin
 ConfFileIsWritable=File konfigurasi<b>%s</b>dapat ditulis.
 ConfFileMustBeAFileNotADir=File konfigurasi <b>%s</b> harus berupa berkas, bukan direktori.
 ConfFileReload=Memuat ulang parameter dari file konfigurasi.
-PHPSupportSessions=PHP ini mendukung sesi.
 PHPSupportPOSTGETOk=PHP ini mendukung variabel POST dan GET
 PHPSupportPOSTGETKo=Mungkin pengaturan PHP Anda tidak mendukung variabel POST dan / atau GET. Periksa parameter<b>variable_order</b>di php.ini.
-PHPSupportGD=PHP ini mendukung fungsi grafis GD.
-PHPSupportCurl=PHP ini mendukung Curl.
-PHPSupportCalendar=PHP ini mendukung ekstensi kalender.
-PHPSupportUTF8=PHP ini mendukung fungsi UTF8.
-PHPSupportIntl=PHP ini mendukung fungsi Intl.
-PHPSupportxDebug=PHP ini mendukung fungsi debug yang diperluas.
+PHPSupportSessions=PHP ini mendukung sesi.
 PHPSupport=PHP ini mendukung fungsi %s.
 PHPMemoryOK=Memori sesi maks PHP Anda diatur ke<b>%s </b>. Ini sudah cukup.
 PHPMemoryTooLow=Memori sesi maks PHP Anda diatur ke<b>%s</b>byte. Ini terlalu rendah. Ubah<b>php.ini</b>Anda untuk menetapkan<b>memory_limit parameter</b>ke setidaknya<b>%s a09a4b7
diff --git a/htdocs/langs/id_ID/intracommreport.lang b/htdocs/langs/id_ID/intracommreport.lang
new file mode 100644
index 00000000000..0e3f0dfebb4
--- /dev/null
+++ b/htdocs/langs/id_ID/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=Daftar
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/id_ID/languages.lang b/htdocs/langs/id_ID/languages.lang
index e8207abbf96..641ee7a5b60 100644
--- a/htdocs/langs/id_ID/languages.lang
+++ b/htdocs/langs/id_ID/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanyol (Panama)
 Language_es_PY=Spanyol (Paraguay)
 Language_es_PE=Spanyol (Peru)
 Language_es_PR=Spanyol (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanyol (Uruguay)
 Language_es_GT=Spanyol (Guatemala)
 Language_es_VE=Spanyol (Venezuela)
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index 04dbbf3fcba..def7208cb73 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Hapus tautan
 AddToDraft=Tambahkan ke konsep
 Update=Membarui
 Close=Menutup
+CloseAs=Set status to
 CloseBox=Hapus widget dari dasbor Anda
 Confirm=Konfirmasi
 ConfirmSendCardByMail=Apakah Anda benar-benar ingin mengirim konten kartu ini melalui pos ke<b>%s </b>?
@@ -196,6 +197,7 @@ ReOpen=Buka kembali
 Upload=Unggah
 ToLink=Link
 Select=Pilih
+SelectAll=Select all
 Choose=Memilih
 Resize=Ubah ukuran
 ResizeOrCrop=Ubah Ukuran atau Pangkas
@@ -256,6 +258,7 @@ Cards=Kartu-kartu
 Card=Kartu
 Now=Sekarang
 HourStart=Mulai jam
+Deadline=Deadline
 Date=Tanggal
 DateAndHour=Tanggal dan jam
 DateToday=Tanggal hari ini
@@ -264,8 +267,10 @@ DateStart=Tanggal mulai
 DateEnd=Tanggal Akhir
 DateCreation=Tangga dibuat
 DateCreationShort=Creat. tanggal
+IPCreation=Creation IP
 DateModification=Tanggal modifikasi
 DateModificationShort=Modif. tanggal
+IPModification=Modification IP
 DateLastModification=Tanggal modifikasi terbaru
 DateValidation=Tanggal validasi
 DateClosing=Tanggal Penutupan
@@ -319,6 +324,7 @@ Morning=Pagi
 Afternoon=Sore
 Quadri=Quadri
 MonthOfDay=Bulan dalam sehari
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=M N
 Rate=Menilai
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Jumlah pembayaran, mata uang asli
 MulticurrencyAmountHT=Jumlah (tidak termasuk pajak), mata uang asli
 MulticurrencyAmountTTC=Jumlah (termasuk pajak), mata uang asli
 MulticurrencyAmountVAT=Pajak jumlah, mata uang asli
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Jumlah pajak 2
 AmountLT2=Jumlah pajak 3
 AmountLT1ES=Jumlah RE
@@ -487,6 +494,7 @@ By=Oleh
 From=Dari
 FromDate=Dari
 FromLocation=Dari
+at=at
 to=untuk
 To=untuk
 and=dan
@@ -509,6 +517,7 @@ Draft=Konsep
 Drafts=Draf
 StatusInterInvoiced=Faktur
 Validated=Divalidasi
+ValidatedToProduce=Validated (To produce)
 Opened=Buka
 OpenAll=Buka semua)
 ClosedAll=Tertutup (Semua)
@@ -655,6 +664,7 @@ Response=Tanggapan
 Priority=Prioritas
 SendByMail=Kirim melalui email
 MailSentBy=Email dikirim oleh
+NotSent=Not sent
 TextUsedInTheMessageBody=Badan email
 SendAcknowledgementByMail=Kirim email konfirmasi
 SendMail=Mengirim email
@@ -836,6 +846,7 @@ ListOfTemplates=Daftar templat
 Gender=Jenis kelamin
 Genderman=Pria
 Genderwoman=Wanita
+Genderother=Lainnya
 ViewList=Tampilan daftar
 ViewGantt=Lihat saja
 ViewKanban=Tampilan kanban
@@ -877,6 +888,8 @@ Miscellaneous=Lain-lain
 Calendar=Kalender
 GroupBy=Kelompokkan oleh ...
 ViewFlatList=Lihat daftar datar
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Hapus string '%s'
 SomeTranslationAreUncomplete=Beberapa bahasa yang ditawarkan mungkin hanya diterjemahkan sebagian atau mengandung kesalahan. Tolong bantu untuk memperbaiki bahasa Anda dengan mendaftar di <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/</a> untuk menambahkan perbaikan dari Anda.
 DirectDownloadLink=Tautan unduhan langsung (publik / eksternal)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Pengiriman pelanggan
 SearchIntoExpenseReports=Laporan biaya
 SearchIntoLeaves=Keluar
 SearchIntoTickets=Tiket
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Komentar
 NbComments=Jumlah komentar
 CommentPage=Ruang komentar
@@ -1078,8 +1094,16 @@ ByStatus=Menurut status
 InformationMessage=Information
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Date of birth
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/id_ID/members.lang b/htdocs/langs/id_ID/members.lang
index 81d24556342..ca769abddcb 100644
--- a/htdocs/langs/id_ID/members.lang
+++ b/htdocs/langs/id_ID/members.lang
@@ -19,14 +19,12 @@ MembersCards=Kartu nama anggota
 MembersList=Daftar anggota
 MembersListToValid=Daftar anggota konsep (akan divalidasi)
 MembersListValid=Daftar anggota yang valid
-MembersListUpToDate=Daftar anggota yang valid dengan langganan terbaru
-MembersListNotUpToDate=Daftar anggota yang valid dengan langganan kedaluwarsa
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=Daftar anggota yang diberhentikan
 MembersListQualified=Daftar anggota yang memenuhi syarat
 MenuMembersToValidate=Anggota konsep
 MenuMembersValidated=Anggota yang divalidasi
-MenuMembersUpToDate=Anggota terkini
-MenuMembersNotUpToDate=Anggota yang kedaluwarsa
 MenuMembersResiliated=Anggota yang diberhentikan
 MembersWithSubscriptionToReceive=Anggota dengan berlangganan untuk menerima
 MembersWithSubscriptionToReceiveShort=Berlangganan untuk menerima
@@ -34,6 +32,7 @@ DateSubscription=Tanggal berlangganan
 DateEndSubscription=Tanggal akhir berlangganan
 EndSubscription=Akhiri berlangganan
 SubscriptionId=ID berlangganan
+WithoutSubscription=Without subscription
 MemberId=Tanda Anggota
 NewMember=Anggota baru
 MemberType=Tipe anggota
@@ -81,7 +80,7 @@ DeleteType=Hapus
 VoteAllowed=Vote diizinkan
 Physical=Fisik
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Diaktifkan kembali
 ResiliateMember=Hentikan anggota
 ConfirmResiliateMember=Anda yakin ingin memberhentikan anggota ini?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Mengirim email dengan validasi anggota baru
 SendingEmailOnNewSubscription=Mengirim email pada langganan baru
 SendingReminderForExpiredSubscription=Mengirim pengingat untuk langganan yang kedaluwarsa
 SendingEmailOnCancelation=Mengirim email saat pembatalan
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Keanggotaan Anda telah diterima.
 YourMembershipWasValidated=Keanggotaan Anda telah divalidasi
@@ -167,6 +167,7 @@ MembersStatisticsByState=Statistik anggota menurut negara bagian / provinsi
 MembersStatisticsByTown=Statistik anggota menurut kota
 MembersStatisticsByRegion=Statistik anggota berdasarkan wilayah
 NbOfMembers=Jumlah anggota
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=Tidak ada anggota yang divalidasi yang ditemukan
 MembersByCountryDesc=Layar ini menunjukkan statistik anggota berdasarkan negara. Grafik tergantung pada layanan grafik online Google dan hanya tersedia jika koneksi internet berfungsi.
 MembersByStateDesc=Layar ini menunjukkan statistik anggota berdasarkan negara bagian / provinsi / kanton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistik
 LastMemberDate=Tanggal anggota terbaru
 LatestSubscriptionDate=Tanggal berlangganan terbaru
 MemberNature=Sifat anggota
+MembersNature=Nature of members
 Public=Informasi bersifat publik
 NewMemberbyWeb=Anggota baru ditambahkan. Menunggu persetujuan
 NewMemberForm=Formulir anggota baru
diff --git a/htdocs/langs/id_ID/mrp.lang b/htdocs/langs/id_ID/mrp.lang
index 5d0342b3136..0dab77fbf41 100644
--- a/htdocs/langs/id_ID/mrp.lang
+++ b/htdocs/langs/id_ID/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Pesanan Manufaktur
-MO=Pesanan manufaktur
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Modul untuk mengelola produksi dan Pesanan Manufaktur (MO).
 MRPArea=Area MRP
 MrpSetupPage=Pengaturan MRP modul
@@ -76,3 +76,5 @@ ProductsToProduce=Produk yang akan diproduksi
 UnitCost=Biaya satuan
 TotalCost=Total biaya
 BOMTotalCost=Biaya untuk menghasilkan BOM ini berdasarkan pada biaya setiap kuantitas dan produk yang akan dikonsumsi (gunakan harga Biaya jika ditentukan, selain itu Harga Rata-rata Tertimbang jika ditentukan, selain itu harga pembelian Terbaik)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index 651f6e9750e..74921ca30f8 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Beberapa segmen harga per produk / layanan (setiap pelanggan berada dalam satu segmen harga)
 MultiPricesNumPrices=Jumlah harga
 DefaultPriceType=Basis harga per default (dengan versus tanpa pajak) saat menambahkan harga jual baru
-AssociatedProductsAbility=Aktifkan produk virtual (kit)
-AssociatedProducts=Produk virtual
-AssociatedProductsNumber=Jumlah produk yang menyusun produk virtual ini
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Jumlah produk kemasan induk
 ParentProducts=Produk induk
-IfZeroItIsNotAVirtualProduct=Jika 0, produk ini bukan produk virtual
-IfZeroItIsNotUsedByVirtualProduct=Jika 0, produk ini tidak digunakan oleh produk virtual mana pun
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Filter kata kunci
 CategoryFilter=Filter kategori
 ProductToAddSearch=Cari produk untuk ditambahkan
 NoMatchFound=Tidak ditemukan kecocokan
 ListOfProductsServices=Daftar produk / layanan
-ProductAssociationList=Daftar produk / layanan yang merupakan komponen dari produk / kit virtual ini
-ProductParentList=Daftar produk / layanan virtual dengan produk ini sebagai komponen
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=Salah satu produk yang dipilih adalah induk dengan produk saat ini
 DeleteProduct=Hapus produk / layanan
 ConfirmDeleteProduct=Anda yakin ingin menghapus produk / layanan ini?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Nilai global yang tersedia:
 PriceMode=Mode harga
 PriceNumeric=Jumlah
 DefaultPrice=Harga standar
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Tambah / Kurangi stok karena perubahan induk
 ComposedProduct=Produk anak-anak
 MinSupplierPrice=Harga beli minimal
@@ -339,6 +340,7 @@ UseProductFournDesc=Tambahkan fitur untuk mendefinisikan deskripsi produk yang d
 ProductSupplierDescription=Deskripsi vendor untuk produk
 UseProductSupplierPackaging=Gunakan kemasan pada harga pemasok (jumlah ulang sesuai dengan kemasan yang ditetapkan pada harga pemasok saat menambahkan / memperbarui baris dalam dokumen pemasok)
 PackagingForThisProduct=Pengemasan
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=Kuantitas saluran dihitung ulang sesuai dengan kemasan pemasok
 
 #Attributes
diff --git a/htdocs/langs/id_ID/recruitment.lang b/htdocs/langs/id_ID/recruitment.lang
index c0e50f5ddcf..e1e686e6d5f 100644
--- a/htdocs/langs/id_ID/recruitment.lang
+++ b/htdocs/langs/id_ID/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/id_ID/stocks.lang b/htdocs/langs/id_ID/stocks.lang
index 51b9473c02a..88ba7c376fd 100644
--- a/htdocs/langs/id_ID/stocks.lang
+++ b/htdocs/langs/id_ID/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=ID Gerakan %d
 ListMouvementStockProject=Daftar pergerakan stok yang terkait dengan proyek
 StocksArea=Area gudang
 AllWarehouses=Semua gudang
-IncludeEmptyDesiredStock=Termasuk juga stok yang tidak ditentukan
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Sertakan juga konsep pesanan
 Location=Tempat
 LocationSummary=Lokasi nama pendek
@@ -122,8 +122,9 @@ DesiredStockDesc=Jumlah stok ini akan menjadi nilai yang digunakan untuk mengisi
 StockToBuy=Untuk memesan
 Replenishment=Penambahan
 ReplenishmentOrders=Pesanan pengisian ulang
-VirtualDiffersFromPhysical=Menurut peningkatan/penurunan opsi stok, stok fisik dan stok virtual (pesanan fisik + saat ini) mungkin berbeda
-UseVirtualStockByDefault=Gunakan stok virtual secara default, alih-alih stok fisik, untuk fitur pengisian
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Gunakan stok virtual
 UsePhysicalStock=Gunakan stok fisik
 CurentSelectionMode=Mode pemilihan saat ini
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=Produk ini sudah ada dalam daftar
 SelectCategory=Filter kategori
 SelectFournisseur=Filter vendor
 inventoryOnDate=Inventaris
-INVENTORY_DISABLE_VIRTUAL=Produk virtual (kit): jangan mengurangi stok produk anak
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Gunakan harga beli jika tidak ada harga beli terakhir yang dapat ditemukan
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Pergerakan stok akan memiliki tanggal inventaris (bukan tanggal validasi inventaris)
 inventoryChangePMPPermission=Izinkan untuk mengubah nilai PMP untuk suatu produk
 ColumnNewPMP=PMP unit baru
@@ -238,5 +237,6 @@ StockAtDatePastDesc=Disini Anda dapat melihat pengadaan (pengadaan asli) pada wa
 StockAtDateFutureDesc=Disini Anda dapat melihat pengadaan (pengadaan virtual) pada waktu di kemudian hari
 CurrentStock=Stok saat ini
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/id_ID/suppliers.lang b/htdocs/langs/id_ID/suppliers.lang
index 767dcf77087..1147eaa92c5 100644
--- a/htdocs/langs/id_ID/suppliers.lang
+++ b/htdocs/langs/id_ID/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Beli pesanan untuk ditagih
 NbDaysToDelivery=Keterlambatan pengiriman (hari)
 DescNbDaysToDelivery=Penundaan pengiriman produk terlama dari pesanan ini
 SupplierReputation=Reputasi vendor
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Jangan memesan
 NotTheGoodQualitySupplier=Kualitas rendah
 ReputationForThisProduct=Reputasi
diff --git a/htdocs/langs/id_ID/website.lang b/htdocs/langs/id_ID/website.lang
index 149649e47b3..9d0b6cc0fe1 100644
--- a/htdocs/langs/id_ID/website.lang
+++ b/htdocs/langs/id_ID/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Tambahkan situs web
 Webpage=Halaman web / wadah
 AddPage=Tambahkan halaman / wadah
 HomePage=Halaman Depan
-PageContainer=Halaman / wadah
+PageContainer=Page
 PreviewOfSiteNotYetAvailable=Pratinjau situs web Anda<strong>%s </strong> belum tersedia. Anda harus terlebih dahulu '<strong> Impor template situs web lengkap </strong>' atau hanya '<strong> Tambahkan halaman / wadah </strong>'.
 RequestedPageHasNoContentYet=Halaman yang diminta dengan id %s belum memiliki konten, atau file cache .tpl.php telah dihapus. Edit konten halaman untuk menyelesaikan ini.
 SiteDeleted=Situs web '%s' dihapus
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Penggantian dilakukan di halaman atau wadah %s
 RSSFeed=Umpan RSS
 RSSFeedDesc=Anda bisa mendapatkan RSS feed dari artikel terbaru dengan mengetikkan 'blogpost' menggunakan URL ini
 PagesRegenerated=%s halaman / wadah dibuat ulang
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang
index 43dcc6fc6fe..c83c3cef1d6 100644
--- a/htdocs/langs/is_IS/accountancy.lang
+++ b/htdocs/langs/is_IS/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting expert
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=Journals
+Journals=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Chart of accounts
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bankareikningar
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=Ár
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index c9e545315ad..a97b287a176 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Fjarlægja tengingu læsa
 YourSession=Tími þinn
 Sessions=Users Sessions
 WebUserGroup=Vefþjóninn notandi / hópur
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Gagnasafn msgstr til að geyma gögn
 DBSortingCharset=Gagnasafn msgstr til að flokka gögn
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript fatlaðra
 UsePreviewTabs=Nota forsýning tabs
 ShowPreview=Sýna forskoðun
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Forskoðun er ekki í boði
 ThemeCurrentlyActive=Þema virk
 CurrentTimeZone=PHP-miðlara Tímasvæði
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial sameining
-Module59Name=Bookmark4u
-Module59Desc=Bæta við fall til að búa til Bookmark4u reikning frá Dolibarr reikning
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Íhlutun
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Gagnagrunnur
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Lesa reikningum
 Permission12=Búa til reikninga
-Permission13=Breyta/Staðfesta reikningum
+Permission13=Invalidate customer invoices
 Permission14=Staðfesta reikningum
 Permission15=Senda reikninga með tölvupósti
 Permission16=Búa til greiðslu fyrir reikninga
@@ -688,6 +694,7 @@ Permission32=Búa til / breyta vörur
 Permission34=Eyða vöru
 Permission36=Sjá / stjórna falinn vörur
 Permission38=Útflutningur vöru
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Lesa inngrip
 Permission62=Búa til / breyta inngrip
 Permission64=Eyða inngrip
 Permission67=Útflutningur inngrip
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Lesa meðlimir
 Permission72=Búa til / breyta meðlimir
 Permission74=Eyða meðlimir
@@ -718,6 +728,7 @@ Permission95=Lesa skýrslur
 Permission101=Lesa sendings
 Permission102=Búa til / breyta sendings
 Permission104=Staðfesta sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Eyða sendings
 Permission111=Lesa fjárhagslega reikninga
@@ -825,10 +836,11 @@ Permission402=Búa til / breyta afsláttur
 Permission403=Staðfesta afsláttur
 Permission404=Eyða afsláttur
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Fá vegna útflutnings
 Permission1202=Búa til / breyta útflutnings
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Setja massa innflutningi af ytri gögn inn í gagnagrunn (gögn 
 Permission1321=Útflutningur viðskiptavina reikninga, eiginleika og greiðslur
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Lesa viðskipti
 Permission50202=Flytja viðskipti
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Skipulag vistuð
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Merki notaður við vanræksla, ef ekki þýðingu er að fin
 LabelOnDocuments=Merki um skjöl
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=Í lok mánaðar
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=Listi yfir Dolibarr öryggi viðburðir
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= Þessi regla er þvinguð <b>til %s </b> með virkt mát
+ForcedToByAModule=Þessi regla er þvinguð <b>til %s </b> með virkt mát
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=%s viði útgáfa
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1282,7 +1322,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return lykilorð mynda samkvæmt innri Dolibarr reiknirit: 8 stafir sem innihalda hluti tölur og bókstafi í lágstafir.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox að senda póst staðfestingu á meðlimum (löggilding eða nýja áskrift) er sjálfgefið
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP Skipulag
 LDAPGlobalParameters=Global breytur
@@ -1523,7 +1564,9 @@ LDAPDescValues=Dæmi gildi eru hannaðar fyrir <b>OpenLDAP</b> með eftirfarandi
 ForANonAnonymousAccess=Til að staðfesta aðild (til a skrifa aðgangur til dæmis)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Stig
 SyslogFilename=Skráarnafn og slóði
 YouCanUseDOL_DATA_ROOT=Þú getur notað DOL_DATA_ROOT / dolibarr.log fyrir annálinn í Dolibarr "skjöl" skrá. Þú getur stillt mismunandi leið til að geyma þessa skrá.
 ErrorUnknownSyslogConstant=Constant %s  er ekki þekktur skrifað fasti
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Safnast mát skipulag
@@ -1629,7 +1672,7 @@ AdvancedEditor=Ítarlegri ritstjóri
 ActivateFCKeditor=Virkja FCKeditor fyrir:
 FCKeditorForCompany=WYSIWIG sköpun / útgáfa af lýsingu companie og athugaðu
 FCKeditorForProduct=s WYSIWIG sköpun / útgáfa af vörum / þjónustu "lýsingu og athugaðu
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG sköpun / útgáfa af póstlista
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Valmynd eytt
+Menu=Menu
 Menus=Matseðlar
 TreeMenuPersonalized=Persónulegar valmyndir
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Nýr matseðill
-Menu=Val á valmynd
 MenuHandler=Valmynd dýraþjálfari
 MenuModule=Heimild mát
 HideUnauthorizedMenu= Fela óviðkomandi valmyndir (grátt)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Smelltu til að hringja mát skipulag
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Í þriðja aðila
 MailToMember=Meðlimir
 MailToUser=Notendur
-MailToProject=Projects page
+MailToProject=Verkefni
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/is_IS/banks.lang b/htdocs/langs/is_IS/banks.lang
index 5c48d9a2ce8..ca4aef62431 100644
--- a/htdocs/langs/is_IS/banks.lang
+++ b/htdocs/langs/is_IS/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/is_IS/categories.lang b/htdocs/langs/is_IS/categories.lang
index 7192cb3eae7..12ea7e5e036 100644
--- a/htdocs/langs/is_IS/categories.lang
+++ b/htdocs/langs/is_IS/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/is_IS/companies.lang b/htdocs/langs/is_IS/companies.lang
index f53325c968e..1ec0e068f53 100644
--- a/htdocs/langs/is_IS/companies.lang
+++ b/htdocs/langs/is_IS/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional tala)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal tala)
 ProfId4CH=Prof Id 2 (Commercial Record tala)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (Rut)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF / nEf)
 ProfId2ES=Prof Id 2 (Kennitala)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate tala)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (Siren)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, gamall MANNAPI)
 ProfId4FR=Prof Id 4 (RCS / RM)
-ProfId5FR=Prof Id 5
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Prof Id 1 (Registration Number)
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id Prof. 1 (RC)
 ProfId2MA=Id Prof. 2 (Patente)
 ProfId3MA=Id Prof. 3 (IF)
 ProfId4MA=Id Prof. 4 (CNSS)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (RFC).
 ProfId2MX=Prof Id 2 (R.. P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=Kvk nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Kennitala)
 ProfId3PT=Prof Id 3 (Commercial Record tala)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Athuga ekki hægt. Athugaðu þjónusta er ekki veitt af aðildarríki ( %s ).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Möguleiki
 ProspectLevel=Prospect möguleiki
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Gjaldmiðill
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/is_IS/ecm.lang b/htdocs/langs/is_IS/ecm.lang
index b91336dc4a6..5e10a48494b 100644
--- a/htdocs/langs/is_IS/ecm.lang
+++ b/htdocs/langs/is_IS/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Leita eftir leitarorðum
 ECMSearchByEntity=Leita eftir hlut
 ECMSectionOfDocuments=Möppur skjöl
 ECMTypeAuto=Sjálfvirk
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Skjöl sem tengjast þriðju aðila
-ECMDocsByProposals=Skjöl tengd tillögum
-ECMDocsByOrders=Skjöl tengd viðskiptavinum pantanir
-ECMDocsByContracts=Skjöl tengd samningum
-ECMDocsByInvoices=Skjöl tengd viðskiptavinum reikninga
-ECMDocsByProducts=Skjöl sem tengjast vöru
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=Engin skrá búin til
 ShowECMSection=Sýna skrá
 DeleteSection=Fjarlægja möppu
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/is_IS/hrm.lang b/htdocs/langs/is_IS/hrm.lang
index 6cc7f6bef24..3b8f137e103 100644
--- a/htdocs/langs/is_IS/hrm.lang
+++ b/htdocs/langs/is_IS/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Employees
 Employee=Employee
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/is_IS/install.lang b/htdocs/langs/is_IS/install.lang
index aacd4ae0099..3913cf7e458 100644
--- a/htdocs/langs/is_IS/install.lang
+++ b/htdocs/langs/is_IS/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=<b>Stillingarskráin %s </b> er writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=Þetta PHP styður fundur.
 PHPSupportPOSTGETOk=Þetta PHP styður breytur POST og FÁ.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=Þetta PHP styður fundur.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max fundur minnið er stillt <b>á %s .</b> Þetta ætti að vera nóg.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/is_IS/intracommreport.lang b/htdocs/langs/is_IS/intracommreport.lang
new file mode 100644
index 00000000000..232cc9db672
--- /dev/null
+++ b/htdocs/langs/is_IS/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=Listi
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/is_IS/languages.lang b/htdocs/langs/is_IS/languages.lang
index d68088905cb..ad4840a820e 100644
--- a/htdocs/langs/is_IS/languages.lang
+++ b/htdocs/langs/is_IS/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Spænska (Paraguay)
 Language_es_PE=Spænska (Peru)
 Language_es_PR=Spænska (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index 278c752c71e..55729865831 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Remove link
 AddToDraft=Add to draft
 Update=Uppfæra
 Close=Loka
+CloseAs=Set status to
 CloseBox=Remove widget from your dashboard
 Confirm=Staðfesta
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Re-Open
 Upload=Upload
 ToLink=Link
 Select=Velja
+SelectAll=Select all
 Choose=Veldu
 Resize=Búa
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=Spil
 Card=Card
 Now=Nú
 HourStart=Start hour
+Deadline=Deadline
 Date=Dagsetning
 DateAndHour=Date and hour
 DateToday=Today's date
@@ -264,8 +267,10 @@ DateStart=Upphafsdagur
 DateEnd=Lokadagur
 DateCreation=Creation dagsetning
 DateCreationShort=Creat. date
+IPCreation=Creation IP
 DateModification=Breytingadagsetningu
 DateModificationShort=Modif. dagsetning
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Löggilding dagur
 DateClosing=Lokadegi
@@ -319,6 +324,7 @@ Morning=Morning
 Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Mánuður dagsins
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Verð
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Amount tax 2
 AmountLT2=Amount tax 3
 AmountLT1ES=Upphæð RE
@@ -487,6 +494,7 @@ By=Með því að
 From=Frá
 FromDate=Frá
 FromLocation=Frá
+at=at
 to=til
 To=til
 and=og
@@ -509,6 +517,7 @@ Draft=Víxill
 Drafts=Drög
 StatusInterInvoiced=Invoiced
 Validated=Staðfestar
+ValidatedToProduce=Validated (To produce)
 Opened=Opnaðu
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Svar
 Priority=Forgangur
 SendByMail=Send by email
 MailSentBy=Email sent
+NotSent=Ekki senda
 TextUsedInTheMessageBody=Email líkami
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Senda tölvupóst
@@ -836,6 +846,7 @@ ListOfTemplates=List of templates
 Gender=Gender
 Genderman=Man
 Genderwoman=Woman
+Genderother=Önnur
 ViewList=Skoða lista
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Ýmislegt
 Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Athugasemdir
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Information
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Dags til fæðingu
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/is_IS/members.lang b/htdocs/langs/is_IS/members.lang
index 1cc3a24b389..c1e58714440 100644
--- a/htdocs/langs/is_IS/members.lang
+++ b/htdocs/langs/is_IS/members.lang
@@ -19,14 +19,12 @@ MembersCards=Members prenta kort
 MembersList=Listi yfir meðlimi
 MembersListToValid=Listi yfir meðlimi drög (verður staðfest)
 MembersListValid=Listi yfir gildar meðlimir
-MembersListUpToDate=Listi yfir gildar aðilar með allt til þessa áskrift
-MembersListNotUpToDate=Listi yfir gildar meðlimir með áskrift af degi
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=Listi yfir viðurkennda meðlimir
 MenuMembersToValidate=Drög að meðlimir
 MenuMembersValidated=Fullgilt aðildarríki
-MenuMembersUpToDate=Upp til dagsetning meðlimi
-MenuMembersNotUpToDate=Út af meðlimum dagsetningu
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Meðlimir með áskrift að fá
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Áskrift dagsetningu
 DateEndSubscription=Áskrift lokadagur
 EndSubscription=End áskrift
 SubscriptionId=Áskrift persónuskilríki
+WithoutSubscription=Without subscription
 MemberId=Aðildarríkin persónuskilríki
 NewMember=Nýr meðlimur
 MemberType=Aðildarríkin tegund
@@ -81,7 +80,7 @@ DeleteType=Eyða
 VoteAllowed=Vote leyfðar
 Physical=Líkamleg
 Moral=Moral
-MorPhy=Náttúra
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Notendur tölfræði eftir fylki / hérað
 MembersStatisticsByTown=Notendur tölfræði eftir bænum
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Fjöldi félaga
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=Engar fullgiltar meðlimir fundust
 MembersByCountryDesc=Þessi skjár sýnir þér tölfræði á meðlimum með löndum. Grafísk veltur þó á Google netinu línurit þjónustu og er aðeins í boði ef nettengingin er er að vinna.
 MembersByStateDesc=Þessi skjár sýnir þér tölfræði á meðlimum ríkis / héruðum / Canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Tölfræði
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Upplýsingar eru almenningi
 NewMemberbyWeb=Nýr meðlimur bætt. Beðið eftir samþykki
 NewMemberForm=Nýr meðlimur mynd
diff --git a/htdocs/langs/is_IS/mrp.lang b/htdocs/langs/is_IS/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/is_IS/mrp.lang
+++ b/htdocs/langs/is_IS/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index 096639572fb..028eea77a82 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Fjöldi verð
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Fjöldi vara að semja þessa vöru
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Leitarorð sía
 CategoryFilter=Flokkur sía
 ProductToAddSearch=Leita vara til að bæta
 NoMatchFound=Engin samsvörun fannst
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=Listi yfir vörur og þjónustu með þessa vöru sem hluti
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=Einn af völdum vöru er foreldri með núverandi vöru
 DeleteProduct=Eyða vöru / þjónustu
 ConfirmDeleteProduct=Ertu viss um að þú viljir eyða þessari vöru / þjónustu?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Fjöldi
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Lágmark Kaupverð
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/is_IS/recruitment.lang b/htdocs/langs/is_IS/recruitment.lang
index b9e943394df..feaa40a6de2 100644
--- a/htdocs/langs/is_IS/recruitment.lang
+++ b/htdocs/langs/is_IS/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/is_IS/stocks.lang b/htdocs/langs/is_IS/stocks.lang
index b6b8134e906..eb22f8deba6 100644
--- a/htdocs/langs/is_IS/stocks.lang
+++ b/htdocs/langs/is_IS/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Staðsetning
 LocationSummary=Stutt nafn staðsetning
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Flokkur sía
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/is_IS/suppliers.lang b/htdocs/langs/is_IS/suppliers.lang
index 48d3a288d16..36840ab9189 100644
--- a/htdocs/langs/is_IS/suppliers.lang
+++ b/htdocs/langs/is_IS/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/is_IS/website.lang b/htdocs/langs/is_IS/website.lang
index f104163dd5a..5f3b13b98b1 100644
--- a/htdocs/langs/is_IS/website.lang
+++ b/htdocs/langs/is_IS/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/it_CH/compta.lang b/htdocs/langs/it_CH/compta.lang
new file mode 100644
index 00000000000..c7c41488180
--- /dev/null
+++ b/htdocs/langs/it_CH/compta.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - compta
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/it_CH/products.lang b/htdocs/langs/it_CH/products.lang
new file mode 100644
index 00000000000..6e900475275
--- /dev/null
+++ b/htdocs/langs/it_CH/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index 781085f58c4..efd66d86cb6 100644
--- a/htdocs/langs/it_IT/accountancy.lang
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Predefinito per servizio
 DefaultForProduct=Predefinito per prodotto
 CantSuggest=Non posso suggerire
 AccountancySetupDoneFromAccountancyMenu=La maggior parte del setup della contabilità è effettuata dal menù %s
-ConfigAccountingExpert=Configurazione del modulo contabilità esperta
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Giornali
-Journaux=Giornali
+Journals=Giornali
 JournalFinancial=Giornali finanziari
 BackToChartofaccounts=Ritorna alla lista dell'account
 Chartofaccounts=Piano dei conti
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Attuale account dedicato
 AssignDedicatedAccountingAccount=Nuovo account da assegnare
 InvoiceLabel=Etichetta fattura
@@ -33,8 +35,8 @@ OtherInfo=Altre informazioni
 DeleteCptCategory=Rimuovi conto corrente dal gruppo
 ConfirmDeleteCptCategory=Sei sicuro di voler rimuovere questo account contabile dal gruppo di account contabilità?
 JournalizationInLedgerStatus=Stato delle registrazioni
-AlreadyInGeneralLedger=Già registrato nei libri mastri
-NotYetInGeneralLedger=Non ancora registrato nei libri mastri
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Il gruppo è vuoto, controlla le impostazioni del gruppo personalizzato di contabilità
 DetailByAccount=Mostra dettagli dall'account
 AccountWithNonZeroValues=Account con valori non-zero
@@ -43,7 +45,9 @@ CountriesInEEC=Paesi nella CEE
 CountriesNotInEEC=Paesi al di fuori della CEE
 CountriesInEECExceptMe=Paesi nella CEE eccetto %s
 CountriesExceptMe=Tutti i paesi eccetto %s
-AccountantFiles=Esportare documenti contabili
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Account principale di contabilità per i clienti non definito nel setup
 MainAccountForSuppliersNotDefined=Account principale di contabilità per fornitori non definito nel setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Aggiunti o modifica le transazioni esistenti
 
 AccountancyAreaDescClosePeriod=STEP %s: Chiudo il periodo così non verranno fatte modifiche in futuro.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=Uno step obbligatorio non è stato completato (il codice del diario contabile non è stato definito per tutti i conti bancari)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Seleziona il piano dei conti attivo
 ChangeAndLoad=Cambia e carica
 Addanaccount=Aggiungi un conto di contabilità
@@ -89,6 +93,8 @@ SubledgerAccount=Conto del registro secondario
 SubledgerAccountLabel=Etichetta del conto Registro secondario
 ShowAccountingAccount=Mostra conti di contabilità
 ShowAccountingJournal=Mostra diario contabile
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Conto suggerito per contabilità
 MenuDefaultAccounts=Conti predefiniti
 MenuBankAccounts=Conti bancari
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Associa nota spese
 CreateMvts=Crea nuova transazione
 UpdateMvts=Modifica una transazione
 ValidTransaction=Valida transazione
-WriteBookKeeping=Registrare le transazioni nel Libro Mastro
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Libro contabile
+BookkeepingSubAccount=Subledger
 AccountBalance=Saldo
 ObjectsRef=Sorgente oggetto in riferimento
 CAHTF=Totale acquisto al lordo delle imposte
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disabilita la registrazione diretta della transazione
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Abilita la bozza di esportazione sul giornale
 ACCOUNTANCY_COMBO_FOR_AUX=Abilita l'elenco combinato per il conto secondario (potrebbe essere lento se hai un sacco di terze parti)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Giornale Vendite
 ACCOUNTING_PURCHASE_JOURNAL=Giornale Acquisti
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Conto di contabilità di attesa
 DONATION_ACCOUNTINGACCOUNT=Conto di contabilità per registrare le donazioni
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Conto contabile per registrare gli abbonamenti
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Conto di contabilità predefinito per i prodotti acquistati (se non definito nella scheda prodotto)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Conto contabile predefinito per i prodotti acquistati in CEE (usato se non definito nella scheda prodotto)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Conto contabile predefinito per i prodotti acquistati e importati al di fuori della CEE (usato se non definito nella scheda prodotto)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Per gruppi predefiniti
 ByPersonalizedAccountGroups=Gruppi personalizzati
 ByYear=Per anno
 NotMatch=Non impostato
-DeleteMvt=Cancella linee libro contabile
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Mese da cancellare
 DelYear=Anno da cancellare
 DelJournal=Giornale da cancellare
-ConfirmDeleteMvt=Questo cancellerà tutte le righe del libro mastro per l'anno e/o da un giornale specifico. È richiesto almeno un criterio.
-ConfirmDeleteMvtPartial=Questo cancellerà la transazione dal libro mastro (tutte le righe relative alla stessa transazione saranno cancellate)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Giornale delle finanze
 ExpenseReportsJournal=Rapporto spese
 DescFinanceJournal=Giornale finanziario che include tutti i tipi di pagamenti per conto bancario
-DescJournalOnlyBindedVisible=Questa è una vista del record che sono legati a un conto contabile e possono essere registrati nel libro mastro.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Conto per IVA non definito
 ThirdpartyAccountNotDefined=Conto per terze parti non definito
 ProductAccountNotDefined=Account per prodotto non definito
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Questo giornale è già in uso
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Esporta Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Id Piano dei Conti
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index ba994d63003..b20c40b7563 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -9,8 +9,8 @@ VersionExperimental=Sperimentale
 VersionDevelopment=Sviluppo
 VersionUnknown=Sconosciuta
 VersionRecommanded=Raccomandata
-FileCheck=Controllo integrità dei files
-FileCheckDesc=Questo strumento permette di verificare l'integrità dei files ed il setup dell'applicazione, confrontando ogni file con la versione ufficiale. Potrebbero essere verificati anche i valori di costanti in alcune impostazioni. Questo strumento permette di determinare se qualche file sia stato modificato (ad esempio da un pirata).
+FileCheck=Verifica integrità dei file
+FileCheckDesc=Questo strumento consente di verificare l'integrità dei file così come la configurazione dell'applicazione, confrontando ogni file con quello ufficiale. Possono anche essere verificati i valori di alcune costanti di configurazione. Questo strumento può essere utilizzato per determinare se un file è stato modificato (per esempio da un pirata).
 FileIntegrityIsStrictlyConformedWithReference=L'integrità dei file è strettamente conforme al riferimento.
 FileIntegrityIsOkButFilesWereAdded=La verifica di integrità dei file è stata superata, tuttavia sono stati aggiunti alcuni file.
 FileIntegritySomeFilesWereRemovedOrModified=Il controllo dell'integrità dei file è fallito. Alcuni file sono stati modificati, rimossi o aggiunti.
@@ -37,6 +37,8 @@ UnlockNewSessions=Rimuovi il blocco connessioni
 YourSession=La tua sessione
 Sessions=Sessioni utente
 WebUserGroup=Utente/gruppo del server web (per esempio www-data)
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=La tua configurazione PHP sembra non permetta di mostrare le sessioni attive. La directory utilizzata per salvare le sessioni (<b>%s</b>) potrebbe non essere protetta (per esempio tramite permessi SO oppure dalla direttiva PHP open_basedir).
 DBStoringCharset=Charset per il salvataggio dei dati nel database
 DBSortingCharset=Set di caratteri del database per ordinare i dati
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Numero di caratteri per attivare la ricerca: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript disattivato
 UsePreviewTabs=Utilizza i tabs per l'anteprima
 ShowPreview=Vedi anteprima
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Anteprima non disponibile
 ThemeCurrentlyActive=Tema attualmente attivo
 CurrentTimeZone=Fuso orario attuale
@@ -271,7 +274,7 @@ NoticePeriod=Periodo di avviso
 NewByMonth=New by month
 Emails=Email
 EMailsSetup=Impostazioni Email
-EMailsDesc=Questa pagina consente di sovrascrivere i parametri PHP predefiniti per l'invio delle email. Nella maggior parte dei casi, su sistemi Unix / Linux, l'installazione di PHP è corretta e non è necessario modificare questi parametri.
+EMailsDesc=Questa pagina ti permette di configurare i parametri o le opzioni per l'invio email.
 EmailSenderProfiles=Profili mittente email
 EMailsSenderProfileDesc=Puoi tenere vuota questa sezione. Se inserisci alcune e-mail qui, verranno aggiunte all'elenco dei possibili mittenti nella casella combinata quando scrivi una nuova e-mail.
 MAIN_MAIL_SMTP_PORT=Porta SMTP / SMTPS (predefinito in php.ini: <b>%s</b> )
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=Username SMTP (se il server richiede l'autenticazione)
 MAIN_MAIL_SMTPS_PW=Password SMTP (se il server richiede l'autenticazione)
 MAIN_MAIL_EMAIL_TLS=Usa la cifratura TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Libreria utilizzata per generare PDF
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s seguito dal nome del cliente troncato dal
 ModuleCompanyCodeSupplierDigitaria=%s seguito dal nome del fornitore troncato dal numero di caratteri: %s per il codice contabile del fornitore.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Utilizzare un'approvazione in 3 passaggi quando l'importo (senza tasse) è superiore a ...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=Se il nome di dominio nel tuo indirizzo e-mail del mittente è protetto da SPF (chiedi al tuo provider di posta elettronica), devi includere i seguenti IP nel record SPF del DNS del tuo dominio: <strong> %s </strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Clicca per mostrare la descrizione
 DependsOn=This module needs the module(s)
 RequiredBy=Questo modulo è richiesto dal modulo
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integrazione di un sistema ClickToDial (per esempio Asterisk)
-Module59Name=Bookmark4u
-Module59Desc=Aggiungi la possibilità di generare account Bookmark4u da un account Dolibarr
 Module60Name=Adesivi
 Module60Desc=Gestione stickers
 Module70Name=Interventi
@@ -656,7 +662,7 @@ Module50200Desc=Modulo per offrire una pagina di pagamento che accetti pagamenti
 Module50300Name=Stripe
 Module50300Desc=Offri ai clienti una pagina di pagamento online Stripe (carte di credito / debito). Questo modulo può essere usato per consentire ai tuoi clienti di effettuare pagamenti ad-hoc o pagamenti relativi a uno specifico oggetto Dolibarr (fattura, ordine ecc ...)
 Module50400Name=Contabilità (partita doppia)
-Module50400Desc=Gestione contabile (partita doppia, supporto per libri contabili principali e ausiliari). Esportazione del libro mastro in diversi altri formati per software contabili.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Sondaggio, Indagine o Votazione
@@ -671,7 +677,7 @@ Module63000Name=Risorse
 Module63000Desc=Gestione risorse (stampanti, automobili, locali, ...) e loro utilizzo all'interno degli eventi
 Permission11=Vedere le fatture attive
 Permission12=Creare fatture attive
-Permission13=Annullare le fatture attive
+Permission13=Invalidate customer invoices
 Permission14=Convalidare le fatture attive
 Permission15=Inviare le fatture attive via email
 Permission16=Creare pagamenti per fatture attive
@@ -688,6 +694,7 @@ Permission32=Creare/modificare  prodotti
 Permission34=Eliminare prodotti
 Permission36=Vedere/gestire prodotti nascosti
 Permission38=Esportare prodotti
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Vedere gli interventi
 Permission62=Creare/modificare gli interventi
 Permission64=Eliminare interventi
 Permission67=Esportare interventi
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Vedere schede membri
 Permission72=Creare/modificare membri
 Permission74=Eliminare membri
@@ -718,6 +728,7 @@ Permission95=Vedi resoconti
 Permission101=Vedere invii
 Permission102=Creare/modificare spedizioni
 Permission104=Convalidare spedizioni
+Permission105=Send sendings by email
 Permission106=Esporta gli invii
 Permission109=Eliminare spedizioni
 Permission111=Vedere i conti bancari
@@ -825,10 +836,11 @@ Permission402=Creare/modificare sconti
 Permission403=Convalidare sconti
 Permission404=Eliminare sconti
 Permission430=Usa la barra di debug
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Esporta stipendi
+Permission517=Read payments of salaries of everybody
+Permission519=Esporta stipendi
 Permission520=Read Loans
 Permission522=Crea/modifica prestiti
 Permission524=Elimina prestiti
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Ottieni il risultato di un esportazione
 Permission1202=Creare/Modificare esportazioni
 Permission1231=Visualizzare le fatture fornitori
@@ -898,6 +915,8 @@ Permission1251=Eseguire importazioni di massa di dati esterni nel database (data
 Permission1321=Esportare fatture attive, attributi e pagamenti
 Permission1322=Riaprire le fatture pagate
 Permission1421=Esporta Ordini Cliente e attributi
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Leggere le azioni (eventi o attività) collegate al suo account utente (se proprietario dell'evento)
 Permission2402=Creare/modificare azioni (eventi o compiti) personali
 Permission2403=Cancellare azioni (eventi o compiti) personali
@@ -932,9 +951,13 @@ Permission23001=Leggi lavoro pianificato
 Permission23002=Crea / Aggiorna lavoro pianificato
 Permission23003=Elimina lavoro pianificato
 Permission23004=Esegui lavoro pianificato
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Vedere transazioni
 Permission50202=Importare transazioni
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Leggi risorse
 Permission63002=Crea/modifica risorse
 Permission63003=Elimina risorsa
 Permission63004=Collega le risorse agli eventi
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Tipo di soggetto terzo
 DictionaryCompanyJuridicalType=Entità legali di terze parti
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Tipi di ferie/permessi
 DictionaryOpportunityStatus=Stato opportunità per progetto/clienti potenziali
 DictionaryExpenseTaxCat=Note spesa - Categorie di trasporto
 DictionaryExpenseTaxRange=Note spesa: intervallo per categoria di trasporto
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Impostazioni salvate
 SetupNotSaved=Impostazioni non salvate
 BackToModuleList=Torna all'elenco dei moduli
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Descrizione (utilizzata in tutti i documenti per cui non esis
 LabelOnDocuments=Descrizione sul documento
 LabelOrTranslationKey=Etichetta o chiave di traduzione
 ValueOfConstantKey=Valore di una costante
+ConstantIsOn=Option %s is on
 NbOfDays=Numero di giorni
 AtEndOfMonth=Alla fine del mese
 CurrentNext=Corrente/Successivo
@@ -1145,6 +1182,7 @@ InfoWebServer=Informazioni web server
 InfoDatabase=Informazioni database
 InfoPHP=Informazioni PHP
 InfoPerf=Informazioni prestazioni
+InfoSecurity=About Security
 BrowserName=Browser
 BrowserOS=Sistema operativo
 ListOfSecurityEvents=Elenco degli eventi di sicurezza Dolibarr
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=Importa MySQL
-ForcedToByAModule= Questa regola è impsotata su <b>%s</b> da un modulo attivo
+ForcedToByAModule=Questa regola è impsotata su <b>%s</b> da un modulo attivo
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Archivio files esistente
 WeekStartOnDay=Primo giorno della settimana
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Modifica del campo %s
 FillThisOnlyIfRequired=Per esempio: +2 (compilare solo se ci sono problemi di scostamento del fuso orario)
@@ -1282,7 +1322,7 @@ GetBarCode=Ottieni codice a barre
 NumberingModules=Modelli di numerazione
 DocumentModules=Modelli di documenti
 ##### Module password generation
-PasswordGenerationStandard=Genera una password in base all'algoritmo interno di  Dolibarr: 8 caratteri comprensivi di numeri e lettere minuscole.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=Secondo la tua configurazione
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox per inviare una mail di conferma per i membri (è attiva per impostazione predefinita)
 VisitorCanChooseItsPaymentMode=Il visitatore può scegliere tra le modalità di pagamento disponibili
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=Impostazioni del protocollo LDAP
 LDAPGlobalParameters=Parametri globali
@@ -1523,7 +1564,9 @@ LDAPDescValues=I valori di esempio sono progettati per <b>OpenLDAP</b> con i seg
 ForANonAnonymousAccess=Per un accesso autenticato (per esempio un accesso in scrittura)
 PerfDolibarr=Report di setup/ottimizzazione della performance
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Cache applicativa
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Livello
 SyslogFilename=Nome file e percorso
 YouCanUseDOL_DATA_ROOT=È possibile utilizzare DOL_DATA_ROOT/dolibarr.log come file di log per la directory "documenti". È anche possibile impostare un percorso diverso per tale file.
 ErrorUnknownSyslogConstant=La costante %s è sconosciuta a syslog.
-OnlyWindowsLOG_USER=Solo utenti Windows supportano LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Backup dei registri
+SyslogFileNumberOfSaves=Numero dei backup di log da mantenere
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Impostazioni modulo donazioni
@@ -1629,7 +1672,7 @@ AdvancedEditor=Editor avanzato
 ActivateFCKeditor=Attiva editor avanzato per:
 FCKeditorForCompany=Editor WYSIWIG per le società
 FCKeditorForProduct=Editor WYSIWIG per i prodotti/servizi
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= Editor WYSIWIG per le email
 FCKeditorForUserSignature=WYSIWIG creazione/modifica della firma utente
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Impostazioni modulo magazzino
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu soppresso
+Menu=Menù
 Menus=Menu
 TreeMenuPersonalized=Menu personalizzati
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Nuovo menu
-Menu=Selezione dei menu
 MenuHandler=Gestore menu
 MenuModule=Modulo sorgente
 HideUnauthorizedMenu= Nascondere i menu non autorizzati
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Attiva i suoni per le notifiche
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Impostazioni modulo ClickToDial (telefonate con un clic)
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Impostazioni del modulo note spese
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Modelli di numerazione delle note spesa
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Soggetti terzi
 MailToMember=Membri
 MailToUser=Utenti
-MailToProject=Pagina dei progetti
+MailToProject=Progetti
 MailToTicket=Ticket
 ByDefaultInList=Mostra per impostazione predefinita nella visualizzazione elenco
 YouUseLastStableVersion=Stai usando l'ultima versione stabile
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=CAP
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disattiva funzionalità per collegare una risorsa ai
 EnableResourceUsedInEventCheck=Abilitare la funzione per verificare se una risorsa è in uso in un evento
 ConfirmUnactivation=Conferma reset del modulo
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Semplifica l'interfaccia per i non vedenti
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Cambia il colore dell'interfaccia per i non vedenti
@@ -1996,13 +2041,15 @@ UseDebugBar=Usa la barra di debug
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Impostazione del modulo Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=Potrebbe essere un comportamento desiderato spostare l'e-mail in un altro tag / directory quando è stata elaborata correttamente. Basta impostare il nome della directory qui per utilizzare questa funzione (NON usare caratteri speciali nel nome). Si noti che è necessario utilizzare anche un account di accesso in lettura / scrittura.
 EmailCollectorLoadThirdPartyHelp=È possibile utilizzare questa azione per utilizzare il contenuto dell'email per trovare e caricare una terza parte esistente nel database. La terza parte trovata (o creata) verrà utilizzata per le seguenti azioni che ne hanno bisogno. Nel campo del parametro è possibile utilizzare ad esempio 'EXTRACT:BODY:Name:\\s([^\\s]*)' se si desidera estrarre il nome della terza parte da una stringa 'Nome: nome da trovare' trovato nel corpo.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=La scala è il numero di posizioni in cui è necessario spost
 TemplateAdded=Template aggiunto
 TemplateUpdated=Template aggiornato
 TemplateDeleted=Template eliminato
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Natura del prodotto
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang
index 99e5e05c812..67051003cf9 100644
--- a/htdocs/langs/it_IT/banks.lang
+++ b/htdocs/langs/it_IT/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Pagamenti vari
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=Mandato SEPA
 YourSEPAMandate=I tuoi mandati SEPA
 FindYourSEPAMandate=Questo è il tuo mandato SEPA che autorizza la nostra azienda ad effettuare un ordine di addebito diretto alla tua banca. Da restituire firmata (scansione del documento firmato) o inviato all'indirizzo email
@@ -176,3 +179,4 @@ BankColorizeMovement=Colora i movimenti
 BankColorizeMovementDesc=Se questa funzione è abilitata, è possibile scegliere il colore di sfondo specifico per i movimenti di debito o credito
 BankColorizeMovementName1=Colore di sfondo per il movimento di debito
 BankColorizeMovementName2=Colore di sfondo per il movimento del credito
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/it_IT/categories.lang b/htdocs/langs/it_IT/categories.lang
index 0907cae5aaa..7d60396caab 100644
--- a/htdocs/langs/it_IT/categories.lang
+++ b/htdocs/langs/it_IT/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Impostazioni Tag/categorie
 CategorieRecursiv=Collega automaticamente alla tag/categoria padre
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Aggiungi il seguente prodotto/servizio
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Mostra tag/categoria
 ByDefaultInList=Default nella lista
 ChooseCategory=Choose category
-StocksCategoriesArea=Area categorie magazzini
-ActionCommCategoriesArea=Area eventi categorie
-WebsitePagesCategoriesArea=Pagina contenitore Area categorie
+StocksCategoriesArea=Categorie magazzini
+ActionCommCategoriesArea=Categorie eventi
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Uso o operatore per le categorie
diff --git a/htdocs/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang
index bc8d25726e2..703fa6018f2 100644
--- a/htdocs/langs/it_IT/companies.lang
+++ b/htdocs/langs/it_IT/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=USt.-IdNr
 ProfId2AT=USt.-Nr
 ProfId3AT=Handelsregister-Nr.
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=Codice EORI
 ProfId6AT=-
 ProfId1AU=ABN
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Numero professionale)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=Codice EORI
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=numero federale
 ProfId4CH=numero registrazione commerciale
-ProfId5CH=-
+ProfId5CH=Codice EORI
 ProfId6CH=-
 ProfId1CL=RUT
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=USt.-IdNr
 ProfId2DE=USt.-Nr
 ProfId3DE=Handelsregister-Nr.
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=Codice EORI
 ProfId6DE=-
 ProfId1ES=CIF/NIF
 ProfId2ES=Núm seguridad social
 ProfId3ES=CNAE
 ProfId4ES=Núm colegiado
-ProfId5ES=-
+ProfId5ES=Codice EORI
 ProfId6ES=-
 ProfId1FR=SIREN
 ProfId2FR=SIRET
 ProfId3FR=NAF, vecchio APE
 ProfId4FR=RCS/RM
-ProfId5FR=-
+ProfId5FR=Codice EORI
 ProfId6FR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
@@ -198,11 +198,16 @@ ProfId3IN=-
 ProfId4IN=-
 ProfId5IN=-
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=Codice EORI
 ProfId1LU=Id. prof. 1 (R.C.S. Lussemburgo)
 ProfId2LU=Id. prof. 2 (Permesso d'affari)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=Codice EORI
 ProfId6LU=-
 ProfId1MA=RC
 ProfId2MA=Patente
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL=-
+ProfId5NL=Codice EORI
 ProfId6NL=-
 ProfId1PT=NIPC
 ProfId2PT=numero di sicurezza sociale
 ProfId3PT=numero registrazione commerciale
 ProfId4PT=Conservatorio
-ProfId5PT=-
+ProfId5PT=Codice EORI
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=Ninea
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof ID 1 (CUI)
 ProfId2RO=Prof ID 2 (Nr. Immatricolazione)
 ProfId3RO=Prof ID 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof ID 5 (EUID)
+ProfId4RO=Prof ID 5 (EUID)
+ProfId5RO=Codice EORI
 ProfId6RO=-
 ProfId1RU=OGRN
 ProfId2RU=INN
@@ -354,6 +359,7 @@ VATIntraManualCheck=È anche possibile controllare manualmente sul sito della Co
 ErrorVATCheckMS_UNAVAILABLE=Non è possibile effettuare il controllo. Servizio non previsto per lo stato membro ( %s).
 NorProspectNorCustomer=Né cliente, né cliente potenziale
 JuridicalStatus=Forma giuridica
+Workforce=Workforce
 Staff=Dipendenti
 ProspectLevelShort=Cl. Pot.
 ProspectLevel=Liv. cliente potenziale
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Termine di pagamento - Fornitore
 PaymentTypeBoth=Tipo di pagamento - Cliente e fornitore
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Valuta
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/it_IT/ecm.lang b/htdocs/langs/it_IT/ecm.lang
index 78b9b6f0f1b..f14a0514d5c 100644
--- a/htdocs/langs/it_IT/ecm.lang
+++ b/htdocs/langs/it_IT/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Ricerca per parole chiave
 ECMSearchByEntity=Ricerca per oggetto
 ECMSectionOfDocuments=Directory dei documenti
 ECMTypeAuto=Automatico
-ECMDocsBySocialContributions=Documenti collegati a tasse fiscali o sociali
-ECMDocsByThirdParties=Documenti collegati a soggetti terzi
-ECMDocsByProposals=Documenti collegati alle proposte
-ECMDocsByOrders=Documenti collegati agli ordini clienti
-ECMDocsByContracts=Documenti collegati ai contratti
-ECMDocsByInvoices=Documenti collegati alle fatture attive
-ECMDocsByProducts=Documenti collegati ai prodotti
-ECMDocsByProjects=Documenti collegati ai progetti
-ECMDocsByUsers=Documenti collegati agli utenti
-ECMDocsByInterventions=Documenti collegati agli interventi
-ECMDocsByExpenseReports=Documenti collegati a note spese
-ECMDocsByHolidays=Documenti collegati alle ferie
-ECMDocsBySupplierProposals=Documenti collegati alle proposte fornitore
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=Nessuna directory creata
 ShowECMSection=Visualizza la directory
 DeleteSection=Eliminare la directory
@@ -50,3 +38,6 @@ ReSyncListOfDir=Aggiorna la lista delle cartelle
 HashOfFileContent=Hash contenuto file
 NoDirectoriesFound=Nessuna cartella trovata
 FileNotYetIndexedInDatabase=File non indicizzato nel database (prova a caricarlo di nuovo)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/it_IT/hrm.lang b/htdocs/langs/it_IT/hrm.lang
index 74aac91da31..acf3452f8ea 100644
--- a/htdocs/langs/it_IT/hrm.lang
+++ b/htdocs/langs/it_IT/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Posizioni di lavoro
 Employees=Dipendenti
 Employee=Dipendente
 NewEmployee=Nuovo dipendente
+ListOfEmployees=Lista dei dipendenti
diff --git a/htdocs/langs/it_IT/install.lang b/htdocs/langs/it_IT/install.lang
index 465f5ecf63e..eafe366a91e 100644
--- a/htdocs/langs/it_IT/install.lang
+++ b/htdocs/langs/it_IT/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Il file di configurazione <b>%s</b> non è scrivibile, bis
 ConfFileIsWritable=Il file di configurazione <b>%s</b> è scrivibile.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=PHP supporta le sessioni.
 PHPSupportPOSTGETOk=PHP supporta le variabili GET e POST.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=Questo PHP supporta le estensioni dei calendari.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=Questo PHP supporta funzioni estese di debug.
+PHPSupportSessions=PHP supporta le sessioni.
 PHPSupport=La versione di PHP supporta la funzione %s.
 PHPMemoryOK=La memoria massima per la sessione è fissata dal PHP a <b>%s</b>. Dovrebbe essere sufficiente.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
@@ -106,7 +100,7 @@ DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Elaborazione dello script
 ChooseYourSetupMode=Scegli la modalità di impostazione e clicca "start"
 FreshInstall=Nuova installazione
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
+FreshInstallDesc=Utilizzare questa modalità se questa è la prima installazione. In caso contrario, questa modalità può riparare un'installazione precedente incompleta. Se vuoi aggiornare la tua versione, scegli la modalità "Aggiorna".
 Upgrade=Aggiornamento
 UpgradeDesc=Usare questo metodo per sostituire una vecchia installazione Dolibarr con una versione più recente. Ciò aggiornerà il database e i dati.
 Start=Inizio
diff --git a/htdocs/langs/it_IT/intracommreport.lang b/htdocs/langs/it_IT/intracommreport.lang
new file mode 100644
index 00000000000..37a7fc4d3bb
--- /dev/null
+++ b/htdocs/langs/it_IT/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=Elenco
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/it_IT/languages.lang b/htdocs/langs/it_IT/languages.lang
index 3d88ef5f267..5e5be267cc1 100644
--- a/htdocs/langs/it_IT/languages.lang
+++ b/htdocs/langs/it_IT/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spagnolo (Panama)
 Language_es_PY=Spagnolo (Paraguay)
 Language_es_PE=Spagnolo (Perù)
 Language_es_PR=Spagnolo (Portorico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spagnolo (Uruguay)
 Language_es_GT=Spagnolo (Guatemala)
 Language_es_VE=Spagnolo (Venezuela)
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index 1b80860c3bc..0be748325f0 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Rimuovere collegamento
 AddToDraft=Aggiungi alla bozza
 Update=Aggiornamento
 Close=Chiudi
+CloseAs=Imposta lo stato a
 CloseBox=Rimuovi widget dalla panoramica
 Confirm=Conferma
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -191,11 +192,12 @@ QuickAdd=Aggiunta rapida
 QuickAddMenuShortCut=CTRL + MAIUSC + L
 Valid=Convalida
 Approve=Approva
-Disapprove=Non approvare
+Disapprove=Riporta in Bozza
 ReOpen=Riapri
 Upload=Upload
 ToLink=Link
 Select=Seleziona
+SelectAll=Select all
 Choose=Scegli
 Resize=Ridimensiona
 ResizeOrCrop=Ridimensiona o ritaglia
@@ -232,8 +234,8 @@ Family=Famiglia
 Description=Descrizione
 Designation=Descrizione
 DescriptionOfLine=Linea Descrizione
-DateOfLine=Date of line
-DurationOfLine=Duration of line
+DateOfLine=Data
+DurationOfLine=Durata
 Model=Modello
 DefaultModel=Modello predefinito
 Action=Azione
@@ -256,6 +258,7 @@ Cards=Schede
 Card=Scheda
 Now=Adesso
 HourStart=Ora di inizio
+Deadline=Deadline
 Date=Data
 DateAndHour=Data e ora
 DateToday=Data odierna
@@ -264,8 +267,10 @@ DateStart=Data di inizio
 DateEnd=Data di fine
 DateCreation=Data di creazione
 DateCreationShort=Data di creazione
+IPCreation=Creation IP
 DateModification=Data di modifica
 DateModificationShort=Data modif.
+IPModification=Modification IP
 DateLastModification=Data ultima modifica
 DateValidation=Data di convalida
 DateClosing=Data di chiusura
@@ -319,6 +324,7 @@ Morning=Mattina
 Afternoon=Pomeriggio
 Quadri=Trimestre
 MonthOfDay=Mese del giorno
+DaysOfWeek=Days of week
 HourShort=Ora
 MinuteShort=min
 Rate=Tariffa
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Importo del pagamento, valuta originaria
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Importo (imposte incluse), valuta originaria
 MulticurrencyAmountVAT=Importo delle tasse, valuta originaria
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Valore tassa 2
 AmountLT2=Valore tassa 3
 AmountLT1ES=Importo RE (Spagna)
@@ -487,6 +494,7 @@ By=Per
 From=Da
 FromDate=Da
 FromLocation=A partire dal
+at=at
 to=a
 To=a
 and=e
@@ -507,8 +515,9 @@ Reporting=Reportistica
 Reportings=Reportistiche
 Draft=Bozza
 Drafts=Bozze
-StatusInterInvoiced=Invoiced
+StatusInterInvoiced=Fatturato
 Validated=Convalidato
+ValidatedToProduce=Validated (To produce)
 Opened=Aperto
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Risposta
 Priority=Priorità
 SendByMail=Invia per email
 MailSentBy=Email inviate da
+NotSent=Non inviato
 TextUsedInTheMessageBody=Testo dell'email
 SendAcknowledgementByMail=Invia email di conferma
 SendMail=Invia una email
@@ -836,6 +846,7 @@ ListOfTemplates=Elenco dei modelli
 Gender=Genere
 Genderman=Uomo
 Genderwoman=Donna
+Genderother=Altro
 ViewList=Vista elenco
 ViewGantt=Visualizzazione Gantt
 ViewKanban=Visualizzazione Kanban
@@ -877,6 +888,8 @@ Miscellaneous=Varie
 Calendar=Calendario
 GroupBy=Raggruppa per...
 ViewFlatList=Vedi lista semplice
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Rimuovi la stringa '%s'
 SomeTranslationAreUncomplete=Alcune traduzioni potrebbero essere incomplete, o contenere errori. In questi casi, registrandoti su <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">transifex.com/projects/p/dolibarr/</a>, avrai la possibilità di proporre modifiche, contribuendo così al miglioramento di Dolibarr.
 DirectDownloadLink=Link diretto per il download (pubblico/esterno)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Spedizioni cliente
 SearchIntoExpenseReports=Nota spese
 SearchIntoLeaves=Ferie / Permessi
 SearchIntoTickets=Ticket
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Pagamenti fornitori
+SearchIntoMiscPayments=Pagamenti vari
 CommentLink=Commenti
 NbComments=Numero dei commenti
 CommentPage=Spazio per i commenti
@@ -1078,8 +1094,16 @@ ByStatus=Per stato
 InformationMessage=Informazioni
 Used=Used
 ASAP=Il prima possibile
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Data di nascita
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/it_IT/members.lang b/htdocs/langs/it_IT/members.lang
index a21800a5013..6cc29b824a4 100644
--- a/htdocs/langs/it_IT/members.lang
+++ b/htdocs/langs/it_IT/members.lang
@@ -19,14 +19,12 @@ MembersCards=Schede membri
 MembersList=Elenco dei membri
 MembersListToValid=Elenco dei membri del progetto (da convalidare)
 MembersListValid=Elenco dei membri validi
-MembersListUpToDate=Elenco dei membri aggiornato
-MembersListNotUpToDate=Elenco dei membri non aggiornato
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=Elenco dei membri qualificati
 MenuMembersToValidate=Membri da convalidare
 MenuMembersValidated=Membri convalidati
-MenuMembersUpToDate=Membri aggiornati
-MenuMembersNotUpToDate=Membri non aggiornati
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Membri con adesione da riscuotere
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Data di adesione
 DateEndSubscription=Data fine adesione
 EndSubscription=Scadenza adesione
 SubscriptionId=Id adesione
+WithoutSubscription=Without subscription
 MemberId=ID
 NewMember=Nuovo membro
 MemberType=Tipo membro
@@ -81,7 +80,7 @@ DeleteType=Elimina
 VoteAllowed=E' permesso il voto
 Physical=Fisica
 Moral=Giuridica
-MorPhy=Natura
+MorAndPhy=Moral and Physical
 Reenable=Riattivare
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Statistiche per stato/provincia
 MembersStatisticsByTown=Statistiche per città
 MembersStatisticsByRegion=Statistiche membri per regioni
 NbOfMembers=Numero di membri
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=Nessun membro convalidato trovato
 MembersByCountryDesc=Questa schermata mostra le statistiche dei membri per paese. Il grafico dipende da servizi online di Google ed è disponibile solo se il server può connettersi ad internet.
 MembersByStateDesc=Questa schermata mostra le statistiche sui membri per stato/provincia/cantone.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistiche
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Data della sottoscrizione più recente
 MemberNature=Natura del membro
+MembersNature=Nature of members
 Public=Pubblico
 NewMemberbyWeb=Nuovo membro aggiunto. In attesa di approvazione
 NewMemberForm=Nuova modulo membri
diff --git a/htdocs/langs/it_IT/mrp.lang b/htdocs/langs/it_IT/mrp.lang
index 9db0cbe4008..e5048e22764 100644
--- a/htdocs/langs/it_IT/mrp.lang
+++ b/htdocs/langs/it_IT/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Ordini di produzione
-MO=Ordine di produzione
 MOs=Manufacturing orders
+ManufacturingOrder=Ordine di produzione
 MRPDescription=Modulo per la gestione degli ordini di produzione (MO).
 MRPArea=MRP Area
 MrpSetupPage=Configurazione del modulo MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Prodotti da produrre
 UnitCost=Costo unitario
 TotalCost=Costo totale
 BOMTotalCost=Il costo per produrre questa distinta base in base al costo di ciascuna quantità e prodotto da consumare (utilizzare il prezzo di costo se definito, altrimenti il prezzo medio ponderato se definito, altrimenti il miglior prezzo di acquisto)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index 6dd038a8389..46f0bfa0c75 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -105,23 +105,23 @@ BarcodeValue=Valore codice a barre
 NoteNotVisibleOnBill=Nota (non visibile su fatture, proposte ...)
 ServiceLimitedDuration=Se il prodotto è un servizio di durata limitata:
 FillWithLastServiceDates=Fill with last service line dates
-MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
+MultiPricesAbility=Diversi livelli di prezzo per prodotto/servizio (ogni cliente fa parte di un livello)
 MultiPricesNumPrices=Numero di prezzi per il multi-prezzi
 DefaultPriceType=Base dei prezzi per impostazione predefinita (con contro senza tasse) quando si aggiungono nuovi prezzi di vendita
-AssociatedProductsAbility=Attiva i prodotti virtuali (kits)
-AssociatedProducts=Prodotti virtuali
-AssociatedProductsNumber=Numero di prodotti associati
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Numero di prodotti associati che includono questo sottoprodotto
 ParentProducts=Prodotti genitore
-IfZeroItIsNotAVirtualProduct=Se 0, questo non è un prodotto virtuale
-IfZeroItIsNotUsedByVirtualProduct=Se 0, questo prodotto non è usata da alcun prodotto virtuale
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Filtro per parola chiave
 CategoryFilter=Filtro categoria
 ProductToAddSearch=Cerca prodotto da aggiungere
 NoMatchFound=Nessun risultato trovato
 ListOfProductsServices=Elenco prodotti/servizi
-ProductAssociationList=Elenco dei prodotti / servizi che sono componenti di questo prodotto / pacchetto virtuale
-ProductParentList=Elenco dei prodotti/servizi comprendenti questo prodotto
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=Uno dei prodotti selezionati è padre dell'attuale prodotto
 DeleteProduct=Elimina un prodotto/servizio
 ConfirmDeleteProduct=Vuoi davvero eliminare questo prodotto/servizio?
@@ -140,8 +140,8 @@ VATRateForSupplierProduct=Aliquota IVA (per questo fornitore / prodotto)
 DiscountQtyMin=Sconto per questa quantità
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
-PredefinedProductsToSell=Predefined Product
-PredefinedServicesToSell=Predefined Service
+PredefinedProductsToSell=Prodotto predefinito
+PredefinedServicesToSell=Servizio predefinito
 PredefinedProductsAndServicesToSell=Prodotti/servizi predefiniti per la vendita
 PredefinedProductsToPurchase=Prodotti predefiniti per l'acquisto
 PredefinedServicesToPurchase=Servizi predefiniti per l'acquisto
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Valori globali disponibili:
 PriceMode=Modalità di prezzo
 PriceNumeric=Numero
 DefaultPrice=Prezzo predefinito
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Aumenta e Diminuisci le scorte alla modifica del prodotto padre
 ComposedProduct=Sottoprodotto
 MinSupplierPrice=Prezzo d'acquisto minimo
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Utilizzare l'imballaggio sui prezzi del fornitore (ricalcolare le quantità in base all'imballaggio impostato sul prezzo del fornitore quando si aggiunge / aggiorna la riga nei documenti del fornitore)
 PackagingForThisProduct=Confezione
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=La quantità della linea è stata ricalcolata in base all'imballaggio del fornitore
 
 #Attributes
diff --git a/htdocs/langs/it_IT/recruitment.lang b/htdocs/langs/it_IT/recruitment.lang
index 13d11c2e3ea..3f136b5182e 100644
--- a/htdocs/langs/it_IT/recruitment.lang
+++ b/htdocs/langs/it_IT/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Data prevista
 FutureManager=Manager futuro
 ResponsibleOfRecruitement=Responsabile della selezione
 IfJobIsLocatedAtAPartner=Se il luogo di lavoro è presso partner
-PositionToBeFilled=Offerta di lavoro da compilare
-PositionsToBeFilled=Offerte di lavoro da compilare
-ListOfPositionsToBeFilled=Elenco delle offerte di lavoro da compilare
-NewPositionToBeFilled=Nuove offerte di lavoro da compilare
+PositionToBeFilled=Posizione lavorativa
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Offerta di lavoro da compilare
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Informazioni sulla posizione lavorativa da compilare
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang
index 6e47d0098fa..3e8770750a4 100644
--- a/htdocs/langs/it_IT/stocks.lang
+++ b/htdocs/langs/it_IT/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=ID movimento %d
 ListMouvementStockProject=Elenco dei movimenti delle scorte associati al progetto
 StocksArea=Area magazzino e scorte
 AllWarehouses=Tutti i magazzini
-IncludeEmptyDesiredStock=Includere anche stock desiderati non definiti
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Includi anche bozze di ordini
 Location=Ubicazione
 LocationSummary=Ubicazione abbreviata
@@ -122,8 +122,9 @@ DesiredStockDesc=Questa quantità sarà il valore utilizzato per rifornire il ma
 StockToBuy=Da ordinare
 Replenishment=Rifornimento
 ReplenishmentOrders=Ordini di rifornimento
-VirtualDiffersFromPhysical=In relazione alle opzioni di incremento/riduzione, le scorte fisiche e quelle virtuali (fisiche - ordini clienti + ordini fornitori) potrebbero differire
-UseVirtualStockByDefault=Utilizza scorte virtuali come default, invece delle scorte fisiche, per la funzione di rifornimento
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Usa scorte virtuale
 UsePhysicalStock=Usa scorte fisiche
 CurentSelectionMode=Modalità di selezione corrente
@@ -145,7 +146,7 @@ NbOfProductAfterPeriod=Quantità del prodotto %s in magazzino dopo il periodo se
 MassMovement=Movimentazione di massa
 SelectProductInAndOutWareHouse=Seleziona un magazzino di origine e un magazzino di destinazione, un prodotto e una quantità, quindi fai clic su "%s". Una volta fatto questo per tutti i movimenti richiesti, clicca su "%s".
 RecordMovement=Record transfer
-ReceivingForSameOrder=Ricevuta per questo ordine
+ReceivingForSameOrder=Ricezioni per questo ordine
 StockMovementRecorded=Movimentazione di scorte registrata
 RuleForStockAvailability=Regole sulla fornitura delle scorte
 StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Filtro categoria
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventario
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=I movimenti delle scorte avranno la data di inventario (anziché la data di convalida dell'inventario)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=È possibile visualizzare qui lo stock (stock reale) in una
 StockAtDateFutureDesc=È possibile visualizzare qui lo stock (stock virtuale) in una determinata data futura
 CurrentStock=Scorta attuale
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/it_IT/suppliers.lang b/htdocs/langs/it_IT/suppliers.lang
index a1654b03fa0..5138e9303e0 100644
--- a/htdocs/langs/it_IT/suppliers.lang
+++ b/htdocs/langs/it_IT/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Ordini d'acquisto da fatturare
 NbDaysToDelivery=Tempi di consegna (giorni)
 DescNbDaysToDelivery=Il tempo di consegna più lungo dei prodotti di questo ordine
 SupplierReputation=Reputazione fornitore
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Non ordinare
 NotTheGoodQualitySupplier=Bassa qualità
 ReputationForThisProduct=Reputazione
diff --git a/htdocs/langs/it_IT/website.lang b/htdocs/langs/it_IT/website.lang
index 44e82e1accc..2037c7d7c8d 100644
--- a/htdocs/langs/it_IT/website.lang
+++ b/htdocs/langs/it_IT/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Aggiungi sito web
 Webpage=Web page/container
 AddPage=Aggiungi pagina/contenitore
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Pagina
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Sostituzione eseguite in%spagine o contenitori
 RSSFeed=Feed RSS
 RSSFeedDesc=Puoi ottenere un feed RSS degli articoli più recenti con il tipo "blogpost" utilizzando questo URL
 PagesRegenerated=%s pagina(e)/contenitore(i) rigenerato
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/it_IT/workflow.lang b/htdocs/langs/it_IT/workflow.lang
index 98c533ca8d1..bafaa694180 100644
--- a/htdocs/langs/it_IT/workflow.lang
+++ b/htdocs/langs/it_IT/workflow.lang
@@ -9,8 +9,8 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Creare automaticamente una fattura atti
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crea automaticamente una fattura cliente dopo che un ordine cliente è stato chiuso (la nuova fattura avrà lo stesso importo dell'ordine)
 # Autoclassify customer proposal or order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classifica come "da fatturare" la/e proposta/e commerciale/i quando l'ordine cliente collegato è impostato come da fatturare (e se l'ammontare dell'ordine è lo stesso ammontare della proposta commerciale firmata e collegata)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classifica "da fatturare" le proposte collegate quando la fattura cliente è validata (e se l'importo della fattura è uguale all'importo totale delle proposte collegate)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classifica "da fatturare" gli ordini cliente collegati quando la fattura cliente è validata (e se l'importo della fattura è uguale all'importo totale di ordini collegati)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classifica "fatturate" le proposte collegate quando la fattura cliente è validata (e se l'importo della fattura è uguale all'importo totale delle proposte collegate)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classifica "fatturato" gli ordini cliente collegati quando la fattura cliente è validata (e se l'importo della fattura è uguale all'importo totale di ordini collegati)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classifica "da fatturare" gli ordini cliente collegati quando la fattura cliente è impostata su pagamento (e se l'importo della fattura è uguale all'importo totale di ordini collegati)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classifica "da spedire" l'ordine cliente collegato quando una spedizione viene convalidata (e se la quantità spedita da tutte le spedizioni è la stessa dell'ordine da aggiornare)
 # Autoclassify purchase order
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index 62e0a2c7bcd..03fca6294e9 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -1,384 +1,399 @@
 # Dolibarr language file - en_US - Accountancy (Double entries)
-Accountancy=会計学
+Accountancy=会計士
 Accounting=Accounting
 ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
 ACCOUNTING_EXPORT_DATE=Date format for export file
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
-ACCOUNTING_EXPORT_LABEL=Export label
-ACCOUNTING_EXPORT_AMOUNT=Export amount
-ACCOUNTING_EXPORT_DEVISE=Export currency
+ACCOUNTING_EXPORT_LABEL=ラベルのエクスポート
+ACCOUNTING_EXPORT_AMOUNT=総額のエクスポート
+ACCOUNTING_EXPORT_DEVISE=通貨のエクスポート
 Selectformat=Select the format for the file
 ACCOUNTING_EXPORT_FORMAT=Select the format for the file
-ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
+ACCOUNTING_EXPORT_ENDLINE=キャリッジリターン種別を選択する
 ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
-ThisService=This service
-ThisProduct=This product
-DefaultForService=Default for service
-DefaultForProduct=Default for product
-CantSuggest=Can't suggest
-AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=モジュール会計専門家の構成
-Journalization=Journalization
-Journaux=Journals
-JournalFinancial=Financial journals
+ThisService=このサービス
+ThisProduct=この製品
+DefaultForService=サービスのデフォルト
+DefaultForProduct=製品のデフォルト
+CantSuggest=提案できない
+AccountancySetupDoneFromAccountancyMenu=会計のほとんどの設定はメニュー%sから行われる
+ConfigAccountingExpert=モジュールアカウンティングの構成（複式簿記）
+Journalization=仕訳帳化
+Journals=仕訳日記帳
+JournalFinancial=財務仕訳帳
 BackToChartofaccounts=Return chart of accounts
-Chartofaccounts=Chart of accounts
-CurrentDedicatedAccountingAccount=Current dedicated account
-AssignDedicatedAccountingAccount=New account to assign
-InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
-OtherInfo=Other information
-DeleteCptCategory=Remove accounting account from group
-ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
-JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
-GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
-DetailByAccount=Show detail by account
-AccountWithNonZeroValues=Accounts with non-zero values
-ListOfAccounts=List of accounts
-CountriesInEEC=Countries in EEC
-CountriesNotInEEC=Countries not in EEC
-CountriesInEECExceptMe=Countries in EEC except %s
-CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+Chartofaccounts=勘定科目表
+ChartOfSubaccounts=個別勘定科目表
+ChartOfIndividualAccountsOfSubsidiaryLedger=補助元帳の個別勘定科目表
+CurrentDedicatedAccountingAccount=現在の専用科目
+AssignDedicatedAccountingAccount=割り当てる新規科目
+InvoiceLabel=請求書ラベル
+OverviewOfAmountOfLinesNotBound=会計科目にバインドされていない行数の概要
+OverviewOfAmountOfLinesBound=すでに会計科目にバインドされている行数の概要
+OtherInfo=他の情報
+DeleteCptCategory=グループから会計科目を削除する
+ConfirmDeleteCptCategory=この会計科目を会計科目グループから削除してもよいか？
+JournalizationInLedgerStatus=仕訳帳化の状況
+AlreadyInGeneralLedger=すでに会計仕訳帳と元帳に転送されている
+NotYetInGeneralLedger=会計仕訳帳と元帳にはまだ転送されていない
+GroupIsEmptyCheckSetup=グループが空です。パーソナライズされたアカウンティンググループの設定を確認すること
+DetailByAccount=科目ごとに詳細を表示
+AccountWithNonZeroValues=ゼロ以外の値の科目
+ListOfAccounts=勘定科目一覧
+CountriesInEEC=EECの国
+CountriesNotInEEC=EECにない国
+CountriesInEECExceptMe=%sを除くEECの国
+CountriesExceptMe=%sを除くすべての国
+AccountantFiles=ソースドキュメントのエクスポート
+ExportAccountingSourceDocHelp=このツールを使用すると、会計処理の生成に使用されたソースイベント（リストとPDF）をエクスポートできる。仕訳をエクスポートするには、メニューエントリ%s-%sを使用する。
+VueByAccountAccounting=会計科目順に表示
 
-MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
-MainAccountForUsersNotDefined=Main accounting account for users not defined in setup
-MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup
-MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscription payment not defined in setup
+MainAccountForCustomersNotDefined=設定で定義されていない顧客のメインアカウンティング科目
+MainAccountForSuppliersNotDefined=設定で定義されていないベンダーのメインアカウンティング科目
+MainAccountForUsersNotDefined=セットアップで定義されていないユーザーのメインアカウンティング科目
+MainAccountForVatPaymentNotDefined=設定で定義されていないVAT支払いのメインアカウンティング科目
+MainAccountForSubscriptionPaymentNotDefined=セットアップで定義されていないサブスクリプション支払いのメインアカウンティング科目
 
-AccountancyArea=Accounting area
-AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
-AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
-AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyArea=経理エリア
+AccountancyAreaDescIntro=会計モジュールの使用は、いくつかのステップで行われる。
+AccountancyAreaDescActionOnce=次のアクションは通常、1回だけ、または1年に1回実行される。
+AccountancyAreaDescActionOnceBis=次のステップは、仕訳帳化を行うときに正しいデフォルトの会計科目を提案することにより、将来の時間を節約するために実行する必要がある（仕訳帳および総勘定元帳にレコードを書き込む）
+AccountancyAreaDescActionFreq=次のアクションは通常、非常に大規模な企業の場合、毎月、毎週、または毎日実行される。
 
-AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
-AccountancyAreaDescChartModel=STEP %s: Check that a model of chart of account exists or create one from menu %s
-AccountancyAreaDescChart=STEP %s: Select and|or complete your chart of account from menu %s
+AccountancyAreaDescJournalSetup=ステップ%s：メニュー%sから仕訳帳リストのコンテンツを作成または確認する
+AccountancyAreaDescChartModel=ステップ%s：勘定科目表のモデルが存在することを確認するか、メニュー%sからモデルを作成する。
+AccountancyAreaDescChart=ステップ%s：メニュー%sから勘定科目表を選択および|または完成させる
 
-AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
-AccountancyAreaDescDefault=STEP %s: Define default accounting accounts. For this, use the menu entry %s.
-AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
-AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expenses (miscellaneous taxes). For this, use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
-AccountancyAreaDescSubscription=STEP %s: Define default accounting accounts for member subscription. For this, use the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Define mandatory default account and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
-AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+AccountancyAreaDescVat=ステップ%s：各VAT率の会計科目を定義する。これには、メニューエントリ%sを使用する。
+AccountancyAreaDescDefault=ステップ%s：デフォルトの会計科目を定義する。これには、メニューエントリ%sを使用する。
+AccountancyAreaDescExpenseReport=ステップ%s：経費報告書の種別ごとにデフォルトの会計科目を定義する。これには、メニューエントリ%sを使用する。
+AccountancyAreaDescSal=ステップ%s：給与支払いのデフォルトの会計科目を定義する。これには、メニューエントリ%sを使用する。
+AccountancyAreaDescContrib=ステップ%s：特別経費（雑税）のデフォルトの会計科目を定義する。これには、メニューエントリ%sを使用する。
+AccountancyAreaDescDonation=ステップ%s：寄付のデフォルトの会計科目を定義する。これには、メニューエントリ%sを使用する。
+AccountancyAreaDescSubscription=ステップ%s：メンバーサブスクリプションのデフォルトのアカウンティング科目を定義する。これには、メニューエントリ%sを使用する。
+AccountancyAreaDescMisc=ステップ%s：その他のトランザクションの必須のデフォルト科目とデフォルトのアカウンティング科目を定義する。これには、メニューエントリ%sを使用する。
+AccountancyAreaDescLoan=ステップ%s：ローンのデフォルトの会計科目を定義する。これには、メニューエントリ%sを使用する。
+AccountancyAreaDescBank=ステップ%s：各銀行および金融口座の会計口座と仕訳コードを定義する。これには、メニューエントリ%sを使用する。
+AccountancyAreaDescProd=ステップ%s：製品/サービスの会計科目を定義する。これには、メニューエントリ%sを使用する。
 
-AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
-AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
+AccountancyAreaDescBind=ステップ%s：既存の%s行と会計科目の間の紐付けが完了していることを確認する。これにより、アプリケーションはワンクリックで元帳のトランザクションを仕訳できるようになります。不足している紐付を完了する。これには、メニューエントリ%sを使用する。
+AccountancyAreaDescWriteRecords=ステップ%s：元帳にトランザクションを書き込みます。これを行うには、メニュー<strong> %s </strong>に移動し、ボタン<strong>%s</strong>をクリックする。
+AccountancyAreaDescAnalyze=ステップ%s：既存のトランザクションを追加または編集し、レポートとエクスポートを生成する。
 
-AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
+AccountancyAreaDescClosePeriod=ステップ%s：期間を閉じて、将来変更できないようにする。
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
-Selectchartofaccounts=Select active chart of accounts
-ChangeAndLoad=Change and load
-Addanaccount=Add an accounting account
-AccountAccounting=Accounting account
-AccountAccountingShort=Account
-SubledgerAccount=Subledger account
-SubledgerAccountLabel=Subledger account label
-ShowAccountingAccount=Show accounting account
-ShowAccountingJournal=Show accounting journal
-AccountAccountingSuggest=Accounting account suggested
-MenuDefaultAccounts=Default accounts
+TheJournalCodeIsNotDefinedOnSomeBankAccount=セットアップの必須ステップが完了していない（すべての銀行口座に対して会計コード仕訳帳が定義されていない）
+Selectchartofaccounts=アクティブな勘定科目表を選択する
+ChangeAndLoad=変更してロード
+Addanaccount=勘定科目を追加
+AccountAccounting=勘定科目
+AccountAccountingShort=科目
+SubledgerAccount=補助科目
+SubledgerAccountLabel=補助科目ラベル
+ShowAccountingAccount=勘定科目を表示
+ShowAccountingJournal=仕訳日記帳を表示
+ShowAccountingAccountInLedger=元帳で勘定科目を表示
+ShowAccountingAccountInJournals=日記帳で勘定科目を表示
+AccountAccountingSuggest=示唆された勘定科目
+MenuDefaultAccounts=規定の科目
 MenuBankAccounts=銀行口座
-MenuVatAccounts=Vat accounts
-MenuTaxAccounts=Tax accounts
-MenuExpenseReportAccounts=Expense report accounts
-MenuLoanAccounts=Loan accounts
-MenuProductsAccounts=Product accounts
-MenuClosureAccounts=Closure accounts
-MenuAccountancyClosure=Closure
-MenuAccountancyValidationMovements=Validate movements
-ProductsBinding=Products accounts
-TransferInAccounting=Transfer in accounting
-RegistrationInAccounting=Registration in accounting
-Binding=Binding to accounts
-CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Vendor invoice binding
-ExpenseReportsVentilation=Expense report binding
-CreateMvts=Create new transaction
-UpdateMvts=Modification of a transaction
-ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
-Bookkeeping=Ledger
-AccountBalance=Account balance
-ObjectsRef=Source object ref
-CAHTF=Total purchase vendor before tax
-TotalExpenseReport=Total expense report
-InvoiceLines=Lines of invoices to bind
-InvoiceLinesDone=Bound lines of invoices
-ExpenseReportLines=Lines of expense reports to bind
-ExpenseReportLinesDone=Bound lines of expense reports
-IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+MenuVatAccounts=消費税科目
+MenuTaxAccounts=租税公課
+MenuExpenseReportAccounts=経費報告書科目
+MenuLoanAccounts=借入金科目
+MenuProductsAccounts=製品科目
+MenuClosureAccounts=閉鎖口座
+MenuAccountancyClosure=閉鎖
+MenuAccountancyValidationMovements=動きを検証する
+ProductsBinding=製品科目
+TransferInAccounting=会計の転送
+RegistrationInAccounting=会計への登録
+Binding=科目への紐付け
+CustomersVentilation=顧客の請求書の紐付け
+SuppliersVentilation=ベンダーの請求書の紐付け
+ExpenseReportsVentilation=経費報告書の製本
+CreateMvts=新規トランザクションを作成する
+UpdateMvts=トランザクションの変更
+ValidTransaction=トランザクションを検証する
+WriteBookKeeping=会計に取引を登録する
+Bookkeeping=元帳
+BookkeepingSubAccount=補助元帳
+AccountBalance=勘定残高
+ObjectsRef=ソースオブジェクト参照
+CAHTF=税引前の合計購入ベンダー
+TotalExpenseReport=総経費レポート
+InvoiceLines=紐付けする請求書の行
+InvoiceLinesDone=請求書の境界線
+ExpenseReportLines=紐付けする経費報告書の行
+ExpenseReportLinesDone=経費報告書の境界線
+IntoAccount=会計科目との紐付け行
+TotalForAccount=会計科目の合計
 
 
-Ventilate=Bind
-LineId=Id line
+Ventilate=紐付
+LineId=IDライン
 Processing=Processing
-EndProcessing=Process terminated.
+EndProcessing=プロセスが終了した。
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-LineOfExpenseReport=Line of expense report
-NoAccountSelected=No accounting account selected
-VentilatedinAccount=Binded successfully to the accounting account
-NotVentilatedinAccount=Not bound to the accounting account
-XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
-XLineFailedToBeBinded=%s products/services were not bound to any accounting account
+LineOfExpenseReport=経費報告書
+NoAccountSelected=会計科目が選択されていない
+VentilatedinAccount=会計科目に正常に紐付けされた
+NotVentilatedinAccount=会計科目にバインドされていない
+XLineSuccessfullyBinded=%s製品/サービスがアカウンティング科目に正常にバインドされた
+XLineFailedToBeBinded=%s製品/サービスはどの会計科目にもバインドされていない
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=ページごとに表示される紐付けする要素の数（最大推奨：50）
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=「Bindingtodo」ページの最新の要素による並べ替えを開始する
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=「製本完了」ページの最新の要素による並べ替えを開始する
 
-ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
-ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
-BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
-ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
-ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_LENGTH_DESCRIPTION=x文字の後のリストの製品とサービスの説明を切り捨てます（ベスト= 50）
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=x文字の後のリストの製品とサービスの科目説明フォームを切り捨てます（ベスト= 50）
+ACCOUNTING_LENGTH_GACCOUNT=一般会計科目の長さ（ここで値を6に設定すると、勘定科目「706」は画面に「706000」のように表示される）
+ACCOUNTING_LENGTH_AACCOUNT=取引先のアカウンティング科目の長さ（ここで値を6に設定すると、科目「401」は画面に「401000」のように表示される）
+ACCOUNTING_MANAGE_ZERO=会計科目の最後に異なる数のゼロを管理できるようにする。一部の国（スイスなど）で必要です。オフ（デフォルト）に設定すると、次の2つのパラメーターを設定して、アプリケーションに仮想ゼロを追加するように要求できる。
+BANK_DISABLE_DIRECT_INPUT=銀行口座での取引の直接記録を無効にする
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=仕訳帳で下書きエクスポートを有効にする
+ACCOUNTANCY_COMBO_FOR_AUX=子会社科目のコンボリストを有効にする（取引先が多数ある場合は遅くなる可能性がある）
+ACCOUNTING_DATE_START_BINDING=会計で紐付け力と移転を開始する日付を定義する。この日付を下回ると、トランザクションはアカウンティングに転送されない。
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=会計転送では、デフォルトで期間表示を選択する
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
-ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
+ACCOUNTING_HAS_NEW_JOURNAL=新規仕訳帳がある
 
-ACCOUNTING_RESULT_PROFIT=Result accounting account (Profit)
-ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
-ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
+ACCOUNTING_RESULT_PROFIT=結果会計科目（利益）
+ACCOUNTING_RESULT_LOSS=結果会計科目（損失）
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=閉鎖の仕訳帳
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transitional bank transfer
-TransitionalAccount=Transitional bank transfer account
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=移行銀行振込の会計科目
+TransitionalAccount=暫定銀行振込口座
 
-ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
-DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
-ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
+ACCOUNTING_ACCOUNT_SUSPENSE=待機の会計科目
+DONATION_ACCOUNTINGACCOUNT=寄付を登録するための会計科目
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=サブスクリプションを登録するためのアカウンティング科目
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=顧客預金を登録するためのデフォルトの会計科目
 
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=購入した製品のデフォルトの会計科目（製品シートで定義されていない場合に使用）
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=EEC域内で購入した製品のデフォルト会計科目（製品シートで定義されていない場合に使用）
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=購入品で、EEC域外から輸入された製品のデフォルト会計科目（製品シートで定義されていない場合に使用）
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=販売された製品のデフォルトの会計科目（製品シートで定義されていない場合に使用）
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=EECで販売された製品のデフォルトの会計科目（製品シートで定義されていない場合に使用）
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=EECから販売およびエクスポートされた製品のデフォルトの会計科目（製品シートで定義されていない場合に使用）
 
-Doctype=Type of document
-Docdate=Date
-Docref=Reference
-LabelAccount=Label account
-LabelOperation=Label operation
+ACCOUNTING_SERVICE_BUY_ACCOUNT=購入したサービスのデフォルトのアカウンティング科目（サービスシートで定義されていない場合に使用）
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=EECで購入したサービスのデフォルトのアカウンティング科目（サービスシートで定義されていない場合に使用）
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=購入したサービスおよびEECからインポートされたサービスのデフォルトのアカウンティング科目（サービスシートで定義されていない場合に使用）
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=販売されたサービスのデフォルトのアカウンティング科目（サービスシートで定義されていない場合に使用）
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=EECで販売されるサービスのデフォルトのアカウンティング科目（サービスシートで定義されていない場合に使用）
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=EECから販売およびエクスポートされたサービスのデフォルトのアカウンティング科目（サービスシートで定義されていない場合に使用）
+
+Doctype=ドキュメントの種別
+Docdate=日付
+Docref=参照
+LabelAccount=ラベル科目
+LabelOperation=ラベル操作
 Sens=Sens
-LetteringCode=Lettering code
-Lettering=Lettering
-Codejournal=Journal
-JournalLabel=Journal label
-NumPiece=Piece number
-TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
-AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
-ByAccounts=By accounts
-ByPredefinedAccountGroups=By predefined groups
-ByPersonalizedAccountGroups=By personalized groups
+LetteringCode=レタリングコード
+Lettering=レタリング
+Codejournal=仕訳帳
+JournalLabel=仕訳帳ラベル
+NumPiece=個数番号
+TransactionNumShort=数トランザクション
+AccountingCategory=パーソナライズされたグループ
+GroupByAccountAccounting=会計科目によるグループ化
+AccountingAccountGroupsDesc=ここで、会計科目のいくつかのグループを定義できる。それらは、パーソナライズされた会計レポートに使用される。
+ByAccounts=科目別
+ByPredefinedAccountGroups=事前定義されたグループによる
+ByPersonalizedAccountGroups=パーソナライズされたグループによる
 ByYear=年度別
-NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
-DelMonth=Month to delete
-DelYear=Year to delete
-DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-FinanceJournal=Finance journal
-ExpenseReportsJournal=Expense reports journal
-DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
-VATAccountNotDefined=Account for VAT not defined
-ThirdpartyAccountNotDefined=Account for third party not defined
-ProductAccountNotDefined=Account for product not defined
-FeeAccountNotDefined=Account for fee not defined
-BankAccountNotDefined=Account for bank not defined
+NotMatch=設定されていない
+DeleteMvt=アカウンティングからいくつかの操作行を削除する
+DelMonth=削除する月
+DelYear=削除する年
+DelJournal=削除する仕訳帳
+ConfirmDeleteMvt=これにより、年/月および/または特定の仕訳帳の会計のすべての操作行が削除される（少なくとも1つの基準が必要です）。削除されたレコードを元帳に戻すには、機能「%s」を再利用する必要がある。
+ConfirmDeleteMvtPartial=これにより、トランザクションがアカウンティングから削除される（同じトランザクションに関連するすべての操作ラインが削除される）
+FinanceJournal=財務仕訳帳
+ExpenseReportsJournal=経費報告仕訳帳
+DescFinanceJournal=銀行口座による全種別の支払いを含む財務仕訳帳
+DescJournalOnlyBindedVisible=これは、会計科目にバインドされ、仕訳帳と元帳に記録できるレコードのビューです。
+VATAccountNotDefined=VATの科目が定義されていない
+ThirdpartyAccountNotDefined=定義されていない取引先の科目
+ProductAccountNotDefined=定義されていない製品の科目
+FeeAccountNotDefined=定義されていない料金の科目
+BankAccountNotDefined=銀行の口座が定義されていない
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Third-party account
-NewAccountingMvt=New transaction
-NumMvts=Numero of transaction
-ListeMvts=List of movements
+ThirdPartyAccount=取引先科目
+NewAccountingMvt=新規トランザクション
+NumMvts=取引の番号
+ListeMvts=動きのリスト
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-AddCompteFromBK=Add accounting accounts to the group
-ReportThirdParty=List third-party account
-DescThirdPartyReport=Consult here the list of third-party customers and vendors and their accounting accounts
-ListAccounts=List of the accounting accounts
-UnknownAccountForThirdparty=Unknown third-party account. We will use %s
-UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
-UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
-PaymentsNotLinkedToProduct=Payment not linked to any product / service
-OpeningBalance=Opening balance
-ShowOpeningBalance=Show opening balance
-HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+AddCompteFromBK=グループに会計科目を追加する
+ReportThirdParty=取引先科目を一覧表示する
+DescThirdPartyReport=取引先の顧客とベンダー、およびそれらの会計科目のリストをここで参照すること
+ListAccounts=会計科目のリスト
+UnknownAccountForThirdparty=不明な取引先科目。 %sを使用する
+UnknownAccountForThirdpartyBlocking=不明な取引先科目。ブロッキングエラー
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=取引先の科目が定義されていないか、取引先が不明です。 %sを使用する
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=第三者が不明で、補助元帳が支払いに定義されていない。補助元帳勘定の値は空のままにする。
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=取引先の科目が定義されていないか、取引先が不明です。ブロッキングエラー。
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=不明な取引先科目と待機中の科目が定義されていない。ブロッキングエラー
+PaymentsNotLinkedToProduct=支払いはどの製品/サービスにもリンクされていない
+OpeningBalance=期首残高
+ShowOpeningBalance=期首残高を表示する
+HideOpeningBalance=期首残高を非表示にする
+ShowSubtotalByGroup=グループごとに小計を表示
 
-Pcgtype=Group of account
-PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+Pcgtype=勘定科目のグループ
+PcgtypeDesc=科目のグループは、一部のアカウンティングレポートの事前定義された「フィルター」および「グループ化」基準として使用される。たとえば、「INCOME」または「EXPENSE」は、費用/収入レポートを作成するための製品の会計科目のグループとして使用される。
 
-Reconcilable=Reconcilable
+Reconcilable=調整可能
 
-TotalVente=Total turnover before tax
-TotalMarge=Total sales margin
+TotalVente=税引前総売上高
+TotalMarge=売上総利益
 
-DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
-DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not bound to an account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
-DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
-ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
+DescVentilCustomer=製品会計科目にバインドされている（またはバインドされていない）顧客請求書行のリストをここで参照すること
+DescVentilMore=ほとんどの場合、事前定義された製品またはサービスを使用し、製品/サービスカードに科目番号を設定すると、アプリケーションは、請求書の行と勘定科目表の会計科目の間のすべての紐付をボタン<strong> "%s" </strong>でワンクリックする。製品/サービスカードに科目が設定されていない場合、または科目に紐付けされていない行がまだある場合は、メニュー「<strong>%s</strong>」から手動で紐付けする必要がある。
+DescVentilDoneCustomer=請求書の顧客の行とその製品会計科目のリストをここで参照すること
+DescVentilTodoCustomer=製品会計科目にまだ紐付けされていない請求書行を紐付けする
+ChangeAccount=選択したラインの製品/サービス会計科目を次の会計科目に変更する。
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account (only record not already transfered in accountancy are visible)
-DescVentilDoneSupplier=Consult here the list of the lines of vendor invoices and their accounting account
-DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
-DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
-DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
+DescVentilSupplier=製品会計科目にバインドされている、またはまだバインドされていない仕入先請求書明細のリストをここで参照すること（会計でまだ転送されていないレコードのみが表示される）
+DescVentilDoneSupplier=ベンダーの請求書の行とその会計科目のリストをここで参照すること
+DescVentilTodoExpenseReport=まだ料金会計科目に紐付けされていない経費レポート行を紐付けする
+DescVentilExpenseReport=手数料会計科目にバインドされている（またはバインドされていない）経費報告行のリストをここで参照すること
+DescVentilExpenseReportMore=経費報告行の種別で会計科目を設定すると、アプリケーションは、ボタン<strong> "%s" </strong>をワンクリックするだけで、経費報告行と勘定科目表の会計科目の間のすべての紐付けを行うことができる。科目が料金辞書に設定されていない場合、または科目に紐付けされていない行がまだある場合は、メニュー「<strong>%s</strong>」から手動で紐付けする必要がある。
+DescVentilDoneExpenseReport=経費報告書の行とその手数料会計科目のリストをここで参照すること
 
-DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
-OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
-ValidateMovements=Validate movements
-DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
+DescClosure=検証されていない月ごとの動きの数とすでに開いている会計年度をここで参照すること
+OverviewOfMovementsNotValidated=ステップ1 /検証されていない動きの概要。 （決算期に必要）
+ValidateMovements=動きを検証する
+DescValidateMovements=書き込み、レタリング、削除の変更または削除は禁止される。演習のすべてのエントリを検証する必要がある。検証しないと、閉じることができない。
+SelectMonthAndValidate=月を選択し、動きを検証する
 
-ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+ValidateHistory=自動的に紐付け
+AutomaticBindingDone=自動紐付けが行われた
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
-Balancing=Balancing
-FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
-NoNewRecordSaved=No more record to journalize
-ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
-ChangeBinding=Change the binding
-Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
-ShowTutorial=Show Tutorial
-NotReconciled=Not reconciled
+MvtNotCorrectlyBalanced=動きのバランスが正しくない。借方= %s |クレジット= %s
+Balancing=バランシング
+FicheVentilation=製本カード
+GeneralLedgerIsWritten=トランザクションは元帳に書き込まれます
+GeneralLedgerSomeRecordWasNotRecorded=一部のトランザクションは仕訳帳化できないでした。他にエラーメッセージがない場合は、すでに仕訳帳化されている可能性がある。
+NoNewRecordSaved=仕訳帳化するレコードはもうない
+ListOfProductsWithoutAccountingAccount=会計科目にバインドされていない製品のリスト
+ChangeBinding=紐付を変更する
+Accounted=元帳に計上
+NotYetAccounted=元帳にはまだ計上されていない
+ShowTutorial=チュートリアルを表示
+NotReconciled=調整されていない
 
 ## Admin
-BindingOptions=Binding options
-ApplyMassCategories=Apply mass categories
-AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
-CategoryDeleted=Category for the accounting account has been removed
-AccountingJournals=Accounting journals
-AccountingJournal=Accounting journal
-NewAccountingJournal=New accounting journal
-ShowAccountingJournal=Show accounting journal
-NatureOfJournal=Nature of Journal
-AccountingJournalType1=Miscellaneous operations
+BindingOptions=製本オプション
+ApplyMassCategories=マスカテゴリを適用する
+AddAccountFromBookKeepingWithNoCategories=パーソナライズされたグループにまだない利用可能な科目
+CategoryDeleted=会計科目のカテゴリが削除された
+AccountingJournals=会計仕訳帳
+AccountingJournal=会計仕訳
+NewAccountingJournal=新規会計仕訳
+ShowAccountingJournal=仕訳日記帳を表示
+NatureOfJournal=仕訳帳の性質
+AccountingJournalType1=その他の操作
 AccountingJournalType2=販売
 AccountingJournalType3=購入
 AccountingJournalType4=バンク
-AccountingJournalType5=Expenses report
-AccountingJournalType8=Inventory
-AccountingJournalType9=Has-new
-ErrorAccountingJournalIsAlreadyUse=This journal is already use
-AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
-NumberOfAccountancyEntries=Number of entries
-NumberOfAccountancyMovements=Number of movements
+AccountingJournalType5=経費報告書
+AccountingJournalType8=在庫
+AccountingJournalType9=持っている-新規
+ErrorAccountingJournalIsAlreadyUse=この仕訳帳はすでに使用されている
+AccountingAccountForSalesTaxAreDefinedInto=注：消費税の会計科目は、メニュー<b> %s </b> --<b> %s</b>に定義されている。
+NumberOfAccountancyEntries=エントリー数
+NumberOfAccountancyMovements=楽章の数
+ACCOUNTING_DISABLE_BINDING_ON_SALES=販売の会計における紐付け力と移転を無効にする（顧客の請求書は会計に考慮されない）
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=購入時の会計における紐付け力と移転を無効にする（ベンダーの請求書は会計で考慮されない）
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=経費報告書の会計における紐付け力と移転を無効にする（経費報告書は会計で考慮されない）
 
 ## Export
-ExportDraftJournal=Export draft journal
-Modelcsv=Model of export
-Selectmodelcsv=Select a model of export
-Modelcsv_normal=Classic export
-Modelcsv_CEGID=Export for CEGID Expert Comptabilité
-Modelcsv_COALA=Export for Sage Coala
-Modelcsv_bob50=Export for Sage BOB 50
-Modelcsv_ciel=Export for Sage Ciel Compta or Compta Evolution
-Modelcsv_quadratus=Export for Quadratus QuadraCompta
-Modelcsv_ebp=Export for EBP
-Modelcsv_cogilog=Export for Cogilog
-Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
-Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
-Modelcsv_openconcerto=Export for OpenConcerto (Test)
-Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC
-Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
-Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
-ChartofaccountsId=Chart of accounts Id
+ExportDraftJournal=下書き仕訳帳のエクスポート
+Modelcsv=エクスポートのモデル
+Selectmodelcsv=エクスポートのモデルを選択
+Modelcsv_normal=Classic のエクスポート
+Modelcsv_CEGID=CEGID Expert Comptabilité のエクスポート
+Modelcsv_COALA=Sage Coala のエクスポート
+Modelcsv_bob50=Sage BOB50のエクスポート
+Modelcsv_ciel=Sage CielComptaまたはComptaEvolutionのエクスポート
+Modelcsv_quadratus=QuadratusQuadraComptaのエクスポート
+Modelcsv_ebp=EBPのエクスポート
+Modelcsv_cogilog=Cogilogのエクスポート
+Modelcsv_agiris=Agirisのエクスポート
+Modelcsv_LDCompta=LD Compta（v9）のエクスポート（テスト）
+Modelcsv_LDCompta10=LD Compta（v10以降）のエクスポート
+Modelcsv_openconcerto=OpenConcertoのエクスポート（テスト）
+Modelcsv_configurable=CSV構成可能のエクスポート
+Modelcsv_FEC=FECのエクスポート
+Modelcsv_Sage50_Swiss=セージ50スイスへのエクスポート
+Modelcsv_winfic=Winficのエクスポート-eWinfic-WinSisCompta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
+ChartofaccountsId=勘定科目表ID
 
 ## Tools - Init accounting account on product / service
-InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
-DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
-Options=Options
-OptionModeProductSell=Mode sales
-OptionModeProductSellIntra=Mode sales exported in EEC
-OptionModeProductSellExport=Mode sales exported in other countries
-OptionModeProductBuy=Mode purchases
-OptionModeProductBuyIntra=Mode purchases imported in EEC
-OptionModeProductBuyExport=Mode purchased imported from other countries
-OptionModeProductSellDesc=Show all products with accounting account for sales.
-OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
-OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
-OptionModeProductBuyDesc=Show all products with accounting account for purchases.
-OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
-OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
-CleanFixHistory=Remove accounting code from lines that not exists into charts of account
-CleanHistory=Reset all bindings for selected year
-PredefinedGroups=Predefined groups
-WithoutValidAccount=Without valid dedicated account
-WithValidAccount=With valid dedicated account
-ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
-AccountRemovedFromGroup=Account removed from group
-SaleLocal=Local sale
-SaleExport=Export sale
-SaleEEC=Sale in EEC
-SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
-SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
+InitAccountancy=初期会計
+InitAccountancyDesc=このページを使用して、販売および購入用に定義された会計科目がない製品およびサービスの会計科目を初期化できる。
+DefaultBindingDesc=このページを使用して、特定の会計科目がまだ設定されていない場合に、支払い給与、寄付、税金、および付加価値税に関するトランザクションレコードをリンクするために使用するデフォルトの科目を設定できる。
+DefaultClosureDesc=このページは、会計上の閉鎖に使用されるパラメーターを設定するために使用できる。
+Options=オプション
+OptionModeProductSell=モード販売
+OptionModeProductSellIntra=EECでエクスポートされたモード販売
+OptionModeProductSellExport=他の国にエクスポートされたモード販売
+OptionModeProductBuy=モード購入
+OptionModeProductBuyIntra=EECにインポートされたモード購入
+OptionModeProductBuyExport=他の国から輸入して購入したモード
+OptionModeProductSellDesc=販売の会計科目を持つすべての製品を表示する。
+OptionModeProductSellIntraDesc=EECでの販売の会計科目を持つすべての製品を表示する。
+OptionModeProductSellExportDesc=その他の海外販売の会計科目を持つすべての製品を表示する。
+OptionModeProductBuyDesc=購入の会計科目を持つすべての製品を表示する。
+OptionModeProductBuyIntraDesc=EECでの購入の会計科目を持つすべての製品を表示する。
+OptionModeProductBuyExportDesc=他の海外購入の会計科目を持つすべての製品を表示する。
+CleanFixHistory=勘定科目表に存在しない線から会計コードを削除する
+CleanHistory=選択した年のすべての紐付をリセットする
+PredefinedGroups=事前定義されたグループ
+WithoutValidAccount=有効な専用科目なし
+WithValidAccount=有効な専用科目で
+ValueNotIntoChartOfAccount=会計科目のこの値は勘定科目表に存在しない
+AccountRemovedFromGroup=科目がグループから削除された
+SaleLocal=ローカルセール
+SaleExport=エクスポート販売
+SaleEEC=EECでの販売
+SaleEECWithVAT=VATがnullではないEECでの販売。したがって、これは共同体内販売ではなく、提案された科目は標準の製品科目であると想定する。
+SaleEECWithoutVATNumber=VATなしのEECでの販売ですが、取引先のVATIDは定義されていない。標準販売の製品科目にフォールバックする。必要に応じて、取引先または製品科目のVATIDを修正できる。
 
 ## Dictionary
-Range=Range of accounting account
-Calculated=Calculated
-Formula=Formula
+Range=会計科目の範囲
+Calculated=計算済み
+Formula=式
 
 ## Error
-SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
-ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
-ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
-ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
-ExportNotSupported=The export format setuped is not supported into this page
-BookeppingLineAlreayExists=Lines already existing into bookkeeping
-NoJournalDefined=No journal defined
-Binded=Lines bound
-ToBind=Lines to bind
-UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to make the binding manually
+SomeMandatoryStepsOfSetupWereNotDone=セットアップのいくつかの必須の手順が実行されないでした。それらを完了すること
+ErrorNoAccountingCategoryForThisCountry=国%sで使用できる会計科目グループがない（ ホーム - 設定 - 辞書 を参照）
+ErrorInvoiceContainsLinesNotYetBounded=請求書<strong>%s </strong>の一部の行を仕訳しようとしたが、他の一部の行はまだ会計科目にバインドされていない。この請求書のすべての請求書行の仕訳は拒否される。
+ErrorInvoiceContainsLinesNotYetBoundedShort=請求書の一部の行は、会計科目にバインドされていない。
+ExportNotSupported=設定されたエクスポート形式は、このページではサポートされていない
+BookeppingLineAlreayExists=簿記にすでに存在する行
+NoJournalDefined=仕訳帳が定義されていない
+Binded=境界線
+ToBind=紐付けする行
+UseMenuToSetBindindManualy=まだ紐付けされていない行。メニュー<a href="%s">%s </a>を使用して、手動で紐付けする。
 
 ## Import
-ImportAccountingEntries=Accounting entries
-DateExport=Date export
-WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
-ExpenseReportJournal=Expense Report Journal
-InventoryJournal=Inventory Journal
+ImportAccountingEntries=会計仕訳
+DateExport=日付のエクスポート
+WarningReportNotReliable=警告、このレポートは元帳に基づいていないため、元帳で手動で変更されたトランザクションは含まれていない。仕訳帳化が最新の場合、簿記ビューはより正確です。
+ExpenseReportJournal=経費報告仕訳帳
+InventoryJournal=在庫仕訳帳
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index 8d1a5c7e46a..489bb909061 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -1,706 +1,716 @@
 # Dolibarr language file - Source file is en_US - admin
 Foundation=財団
 Version=バージョン
-Publisher=Publisher
-VersionProgram=バージョンのプログラム
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
+Publisher=出版社
+VersionProgram=バージョンプログラム
+VersionLastInstall=初期インストールバージョン
+VersionLastUpgrade=最新バージョンへの増強
 VersionExperimental=実験的
 VersionDevelopment=開発
 VersionUnknown=未知の
 VersionRecommanded=推奨される
-FileCheck=Fileset Integrity Checks
-FileCheckDesc=This tool allows you to check the integrity of files and the setup of your application, comparing each file with the official one. The value of some setup constants may also be checked. You can use this tool to determine if any files have been modified (e.g by a hacker).
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files have been added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FilesModified=Modified Files
-FilesAdded=Added Files
-FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when the application is installed from an official package
-XmlNotFound=Xml Integrity File of application not found
+FileCheck=ファイル整合性チェック
+FileCheckDesc=このツールで正規のものと比較し、ファイルの整合性とアプリの設定をチェックできる。設定用定数の一部もチェックできる。このツールでファイルが改変されたか(例えばハッカーによって)がわかる。
+FileIntegrityIsStrictlyConformedWithReference=ファイル整合性とは参照元に厳密に準拠すること。
+FileIntegrityIsOkButFilesWereAdded=ファイル整合性に合格しているが、新規ファイルが追加されている。
+FileIntegritySomeFilesWereRemovedOrModified=ファイル整合性に不合格。いくつかのファイルが改変、削除、追加されている。
+GlobalChecksum=グローバルチェックサム
+MakeIntegrityAnalysisFrom=アプリファイルの整合性分析をする材料：
+LocalSignature=埋め込みローカル署名(信頼性が一層低い)
+RemoteSignature=リモート遠隔署名(信頼性が一層強い)
+FilesMissing=消失ファイル
+FilesUpdated=更新ファイル
+FilesModified=変更ファイル
+FilesAdded=追加ファイル
+FileCheckDolibarr=アプリファイルの整合性をチェックする
+AvailableOnlyOnPackagedVersions=整合性チェック用のローカルファイルは、アプリケーションが公式パッケージからインストールされている場合にのみ使用できる。
+XmlNotFound=アプリのXML正規ファイルが見つからず
 SessionId=セッションID
 SessionSaveHandler=セッションを保存するためのハンドラ
-SessionSavePath=Session save location
+SessionSavePath=セッション保存位置
 PurgeSessions=セッションのパージ
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow listing all running sessions.
-LockNewSessions=新しい接続をロックする
-ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself? Only user <b>%s</b> will be able to connect after that.
+ConfirmPurgeSessions=本当にすべてのセッションを削除するか？これにより、すべてのユーザ ( 自分を除く ) が切断される。
+NoSessionListWithThisHandler=PHPで構成された保存セッションハンドラーでは、すべての実行中セッションを一覧表示できない。
+LockNewSessions=新規接続をロック
+ConfirmLockNewSessions=新規Dolibarr接続を自分自身に制限してもよいか？ユーザ<b> %s</b>のみが接続できることになる。
 UnlockNewSessions=接続ロックを解除する
-YourSession=セッション
-Sessions=Users Sessions
+YourSession=あなたのセッション
+Sessions=利用者のセッション
 WebUserGroup=Webサーバのユーザ/グループ
-NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
-DBStoringCharset=データを格納するデータベース·キャラクタ·セット
-DBSortingCharset=データをソートするには、データベース·キャラクタ·セット
-HostCharset=Host charset
-ClientCharset=Client charset
-ClientSortingCharset=Client collation
-WarningModuleNotActive=モジュール<b>%sを</b>有効<b>に</b>する必要<b>が</b>あります
-WarningOnlyPermissionOfActivatedModules=活性化されたモジュールに関連する権限のみがここに表示されます。あなたは、ホーム - &gt;セットアップ - &gt;モジュールページで他のモジュールをアクティブにすることができます。
+PermissionsOnFilesInWebRoot=Webルートディレクトリ内のファイルに対するアクセス許可
+PermissionsOnFile=ファイル%sのアクセス許可
+NoSessionFound=PHP構成では、アクティブなセッションの一覧表示が許可されていないもよう。セッションの保存に使用されるディレクトリ ( <b> %s </b> ) は、保護されている可能性がある ( たとえば、OSのアクセス許可またはPHPディレクティブopen_basedirによって ) 。
+DBStoringCharset=データ格納用のデータベース·キャラセット
+DBSortingCharset=データソート用のデータベース·キャラセット
+HostCharset=ホストのキャラセット
+ClientCharset=クライアントのキャラセット
+ClientSortingCharset=クライアントの文字照合則
+WarningModuleNotActive=モジュール<b>%sを</b>有効<b>に</b>する必要<b>が</b>ある
+WarningOnlyPermissionOfActivatedModules=ここには、活性化されたモジュールに関連する権限のみが表示される。ホーム->設定->モジュール ページで他のモジュールを活性化できる。
 DolibarrSetup=Dolibarrインストールまたはアップグレード
 InternalUser=内部ユーザ
-ExternalUser=外部ユーザー
-InternalUsers=内部ユーザー
-ExternalUsers=外部ユーザー
+ExternalUser=外部ユーザ
+InternalUsers=内部ユーザ
+ExternalUsers=外部ユーザ
 GUISetup=表示
-SetupArea=セットアップ
-UploadNewTemplate=Upload new template(s)
-FormToTestFileUploadForm=ファイルのアップロードをテストするために形成します（設定に応じて）
-IfModuleEnabled=注：[はい]は、モジュールの<b>%sが</b>有効<b>になっ</b>ている場合にのみ有効です
-RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
-RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
+SetupArea=設定
+UploadNewTemplate=新規テンプレート(s)をアップロード
+FormToTestFileUploadForm=ファイルのアップロードをテストするために形成する ( 設定に応じて ) 
+IfModuleEnabled=注：【はい】は、モジュールの<b>%sが</b>有効<b>になっ</b>ている場合にのみ有効 
+RemoveLock=ファイル<b>%s </b>が存在する場合、それを削除/改名することで、更新/インストール のツールが使用可能になる。
+RestoreLock=ファイル<b>%s </b>を読取権限のみで復元すると、これ以上の更新/インストール のツール使用が不可になる。
 SecuritySetup=セキュリティの設定
-SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=エラーは、このモジュールは、PHPのバージョン%s以上が必要です
-ErrorModuleRequireDolibarrVersion=エラー、このモジュールはDolibarrバージョン%s以上が必要です
-ErrorDecimalLargerThanAreForbidden=<b>%s</b>より精度の高いエラーは、サポートされていません。
-DictionarySetup=辞書のセットアップ
-Dictionary=Dictionaries
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
+SecurityFilesDesc=ファイルのアップロードに関するセキュリティ関連オプションをここで定義。
+ErrorModuleRequirePHPVersion=エラー、このモジュールは、PHPのバージョン%s以上が必要 
+ErrorModuleRequireDolibarrVersion=エラー、このモジュールはDolibarrバージョン%s以上が必要 
+ErrorDecimalLargerThanAreForbidden=<b>%s</b>より精度の高いエラーは、サポートされていない。
+DictionarySetup=辞書設定
+Dictionary=辞書
+ErrorReservedTypeSystemSystemAuto=種別の値 ’system' および 'systemauto' は予約されている。 値 'user' は自分自身のレコード追加に使用可能
+ErrorCodeCantContainZero=コード値に0は不可
 DisableJavascript=JavaScriptとAjaxの機能を無効にする
-DisableJavascriptNote=Note: For test or debug purpose. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Number of characters to trigger search: %s
-NumberOfBytes=Number of Bytes
-SearchString=Search string
-NotAvailableWhenAjaxDisabled=Ajaxが無効になったときには使用できません
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=JavaScriptが無効になって
-UsePreviewTabs=プレビュータブを使用し
-ShowPreview=プレビューを表示する
-PreviewNotAvailable=プレビューは利用できません
-ThemeCurrentlyActive=現在アクティブなテーマ
-CurrentTimeZone=TimeZoneはPHP（サーバー）
-MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
+DisableJavascriptNote=注：テストまたはデバッグの目的で。目の不自由な人やテキストブラウザの最適化のために、ユーザのプロファイルの設定を使用することをお勧めする
+UseSearchToSelectCompanyTooltip=また、取引先が多数 ( > 100 000 ) ある場合、【設定】-> 【その他】で定数 COMPANY_DONOTSEARCH_ANYWHERE を1に設定することで速度を上げることができる。その場合、検索は文字列の先頭に限定される。
+UseSearchToSelectContactTooltip=また、取引先が多数 ( > 100 000 ) ある場合、【設定】-> 【その他】で定数 CONTACT_DONOTSEARCH_ANYWHERE を1に設定することで速度を上げることができる。その場合、検索は文字列の先頭に限定される。
+DelaiedFullListToSelectCompany=キーが押されるまで待ち、取引先コンボリスト <br> のコンテンツは後からロードする。これで、取引先が多数ある場合にパフォーマンス向上を見込めるが、やや利便性は劣る。
+DelaiedFullListToSelectContact= キーが押されるまで待ち、取引先コンボリスト <br> のコンテンツは後からロードする。これで、取引先が多数ある場合にパフォーマンス向上を見込めるが、やや利便性は劣る。
+NumberOfKeyToSearch=検索をトリガーする文字数：%s
+NumberOfBytes=バイト数
+SearchString=検索文字列
+NotAvailableWhenAjaxDisabled=Ajaxが無効になったときには使用できない
+AllowToSelectProjectFromOtherCompany=取引先のドキュメントで、別の取引先にリンクされているプロジェクトを選択できる
+JavascriptDisabled=JavaScript無効
+UsePreviewTabs=プレビュータブを使用
+ShowPreview=プレビューを表示
+ShowHideDetails=詳細を 表示-非表示
+PreviewNotAvailable=プレビューは利用不可
+ThemeCurrentlyActive=現在有効なテーマ
+CurrentTimeZone=PHP(サーバー)のタイムゾーン
+MySQLTimeZone=MySql(データベース)のタイムゾーン
+TZHasNoEffect=日付は、送信された文字列として保持されているかのように、データベースサーバーによって保存され返される。タイムゾーンは、UNIX_TIMESTAMP関数を使用する場合にのみ有効 (Dolibarrでは不使用を推奨し、そうすると、データ入力後に変更があったとしても、データベースTZの影響を受けなくなる ) 。
 Space=スペース
-Table=Table
-Fields=フィールズ
-Index=Index
+Table=テーブル
+Fields=フィールド
+Index=インデックス
 Mask=マスク
 NextValue=次の値
-NextValueForInvoices=次の値（請求書）
-NextValueForCreditNotes=次の値（クレジットメモ）
-NextValueForDeposit=Next value (down payment)
-NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Note: your PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
-NoMaxSizeByPHPLimit=注：制限なしお使いのPHPの設定で設定されていません
-MaxSizeForUploadedFiles=アップロードファイルの最大サイズ（0は任意のアップロードを許可しないように）
-UseCaptchaCode=ログインページで、グラフィカルコード（CAPTCHA）を使用して
+NextValueForInvoices=次の値 ( 請求書 ) 
+NextValueForCreditNotes=次の値 ( クレジットメモ ) 
+NextValueForDeposit=次の値 ( 頭金 ) 
+NextValueForReplacements=次の値 ( 置換 ) 
+MustBeLowerThanPHPLimit=注：現在、PHP構成では、このパラメーターの値に関係なく、アップロードの最大ファイルサイズが<b> %s </b>%sに制限されている。
+NoMaxSizeByPHPLimit=注：お使いのPHP設定では無制限
+MaxSizeForUploadedFiles=アップロードファイルの最大サイズ ( 0 べてのアップロードを禁止 ) 
+UseCaptchaCode=ログインページで、グラフィカルコード ( CAPTCHA ) を使用して
 AntiVirusCommand=アンチウイルスのコマンドへのフルパス
-AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusCommandExample=ClamAvデーモンの例： ( clamav-daemonが必要 )  /usr/bin/clamdscan <br> ClamWinの例： ( 非常に非常に遅い )  c:\\Program~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= コマンドラインで複数のパラメータ
-AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=会計モジュールのセットアップ
-UserSetup=ユーザーの管理設定
-MultiCurrencySetup=Multi-currency setup
+AntiVirusParamExample=ClamAvデーモンの例：-fdpass <br> ClamWinの例：-database = "C:\\Program Files (x86)\\ClamWin\\lib"
+ComptaSetup=会計モジュールの設定
+UserSetup=ユーザの管理設定
+MultiCurrencySetup=多通貨設定
 MenuLimits=限界と精度
 MenuIdParent=親メニューのID
-DetailMenuIdParent=親メニューのID（上のメニューの場合は0）
+DetailMenuIdParent=親メニューのID ( 上のメニューの場合は0 ) 
 DetailPosition=メニューの位置を定義するには、ソート番号
 AllMenus=すべて
-NotConfigured=Module/Application not configured
+NotConfigured=モジュール/アプリが未設定
 Active=アクティブ
-SetupShort=セットアップ
+SetupShort=設定
 OtherOptions=その他のオプション
-OtherSetup=Other Setup
+OtherSetup=その他設定
 CurrentValueSeparatorDecimal=小数点の記号
 CurrentValueSeparatorThousand=桁区切り記号
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
+Destination=相手先
+IdModule=モジュールID
+IdPermissions=許可ID
 LanguageBrowserParameter=パラメータ%s
-LocalisationDolibarrParameters=Localization parameters
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=タイムゾーンは、PHPサーバー
-DaylingSavingTime=夏時間（ユーザー）
-CurrentHour=時間PHP（サーバー）
-CurrentSessionTimeOut=現在のセッションのタイムアウト
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a .htaccess file with a line like this "SetEnv TZ Europe/Paris"
-HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but of the timezone of the server.
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max. number of lines for widgets
-AllWidgetsWereEnabled=All available widgets are enabled
+LocalisationDolibarrParameters=L10N パラメータ
+ClientTZ=クライアントのタイムゾーン (ユーザ)
+ClientHour=クライアントの時刻 (ユーザ)
+OSTZ=サーバOSのタイムゾーン
+PHPTZ=PHPサーバのタイムゾーン
+DaylingSavingTime=夏時間
+CurrentHour=PHP時刻 ( サーバ ) 
+CurrentSessionTimeOut=現在セッションのタイムアウト
+YouCanEditPHPTZ=別のPHPタイムゾーンを設定するには ( 必須ではない ) 、 "SetEnv TZ Europe/Paris" のような行を含む.htaccessファイルを追加してみること。
+HoursOnThisPageAreOnServerTZ=警告、他の画面とは異なり、このページの時間はローカルタイムゾーンではなく、サーバーのタイムゾーン。
+Box=ウィジェット
+Boxes=ウィジェットs
+MaxNbOfLinesForBoxes=ウィジェットsの最大行数
+AllWidgetsWereEnabled=使用可能なすべてのウィジェットsが有効
 PositionByDefault=デフォルト順
 Position=位置
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br>Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=ユーザーのためのメニュー
-LangFile=ファイルです。LANG
-Language_en_US_es_MX_etc=Language (en_US, es_MX, ...)
+MenusDesc=メニューマネージャは、2つのメニューバー ( 水平および垂直 ) のコンテンツを設定する。
+MenusEditorDesc=メニューエディタを使用すると、カスタムメニューエントリを定義できる。不安定で永久に到達できないメニューエントリを避けるために、慎重に使用すること。 <br>一部のモジュールはメニューエントリを追加する ( メニューのほとんど<b>すべての</b> ) 。これらのエントリの一部を誤って削除した場合は、モジュールの無効化と再有効化で復元できる。
+MenuForUsers=ユーザのためのメニュー
+LangFile=.lang ファイル
+Language_en_US_es_MX_etc=言語 (en_US, ja_JP, ...)
 System=システム
 SystemInfo=システム情報
 SystemToolsArea=システムツールエリア
-SystemToolsAreaDesc=This area provides administration functions. Use the menu to choose the required feature.
-Purge=Purge
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
+SystemToolsAreaDesc=この領域は管理機能を提供する。メニューを使用して、必要な機能を選択する。
+Purge=パージ
+PurgeAreaDesc=このページでは、Dolibarrによって生成または保存されたすべてのファイル ( 一時ファイルまたは<b> %s </b>ディレクトリ内のすべてのファイル ) を削除できる。通常、この機能を使用する必要はない。これは、Webサーバーによって生成されたファイルを削除する権限を提供しないプロバイダーによってDolibarrがホストされているユーザの回避策として提供されている。
+PurgeDeleteLogFile=Syslogモジュール用に定義された<b>%s </b>を含むログファイルを削除する ( データを失うリスクはない ) 
+PurgeDeleteTemporaryFiles=すべての一時ファイルを削除する ( データを失うリスクはない ) 。注：削除は、一時ディレクトリが24時間前に作成された場合にのみ実行される。
+PurgeDeleteTemporaryFilesShort=一時ファイルを削除する
+PurgeDeleteAllFilesInDocumentsDir=ディレクトリ：<b> %s</b> 内のすべてのファイルを削除する。 <br>これにより、要素 ( 取引先、請求書など ) に関連する生成されたすべてのドキュメント、ECMモジュールにアップロードされたファイル、データベースのバックアップダンプ、および一時ファイルが削除される。
 PurgeRunNow=今パージ
-PurgeNothingToDelete=No directory or files to delete.
-PurgeNDirectoriesDeleted=<b>%sファイル</b>またはディレクトリが削除されました。
-PurgeNDirectoriesFailed=Failed to delete <b>%s</b> files or directories.
+PurgeNothingToDelete=削除するディレクトリやファイルはない。
+PurgeNDirectoriesDeleted=<b>%s</b> ファイルまたはディレクトリが削除された。
+PurgeNDirectoriesFailed=<b> %s</b>ファイルまたはディレクトリの削除に失敗した。
 PurgeAuditEvents=すべてのセキュリティイベントをパージする
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
+ConfirmPurgeAuditEvents=すべてのセキュリティイベントを削除してもよいか？すべてのセキュリティログが削除され、他のデータは削除されない。
 GenerateBackup=バックアップを生成
 Backup=バックアップ
 Restore=リストア
-RunCommandSummary=バックアップは、次のコマンドで起動されています
+RunCommandSummary=バックアップは、次のコマンドで起動されている
 BackupResult=バックアップ結果
-BackupFileSuccessfullyCreated=バックアップファイルが正常に生成され
-YouCanDownloadBackupFile=The generated file can now be downloaded
-NoBackupFileAvailable=使用可能なバックアップファイルはありません。
+BackupFileSuccessfullyCreated=バックアップファイルが正常に生成された
+YouCanDownloadBackupFile=生成されたファイルをダウンロードできるようになった
+NoBackupFileAvailable=使用可能なバックアップファイルはない。
 ExportMethod=エクスポート方法
 ImportMethod=インポート方法
-ToBuildBackupFileClickHere=バックアップファイルを作成するには、クリックして<a href="%s">ここに</a> 。
-ImportMySqlDesc=To import a MySQL backup file, you may use phpMyAdmin via your hosting or use the mysql command from the Command line.<br>For example:
-ImportPostgreSqlDesc=バックアップファイルをインポートするには、コマンドラインからpg_restoreのコマンドを使用する必要があります。
+ToBuildBackupFileClickHere=バックアップファイルを作成するには、<a href="%s">ここ</a>クリックすること 。
+ImportMySqlDesc=MySQLバックアップファイルをインポートするには、ホスティング経由でphpMyAdminを使用するか、コマンドラインからmysqlコマンドを使用する。 <br>例：
+ImportPostgreSqlDesc=バックアップファイルをインポートするには、コマンドラインからpg_restoreのコマンドを使用する必要がある。
 ImportMySqlCommand=%s %s &lt;mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=Filename for backup:
-Compression=Compression
+FileNameToGenerate=バックアップのファイル名：
+Compression=圧縮
 CommandsToDisableForeignKeysForImport=インポート時に外部キーを無効にするコマンド
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
+CommandsToDisableForeignKeysForImportWarning=後でSQLダンプを復元できるようにする場合は必須
 ExportCompatibility=生成されたエクスポート·ファイルの互換性
-ExportUseMySQLQuickParameter=Use the --quick parameter
-ExportUseMySQLQuickParameterHelp=The '--quick' parameter helps limit RAM consumption for large tables.
-MySqlExportParameters=MySQLのエクスポートパラメータ
-PostgreSqlExportParameters= PostgreSQL export parameters
+ExportUseMySQLQuickParameter=--quickパラメーターを使用する
+ExportUseMySQLQuickParameterHelp='--quick'パラメーターは、大きなテーブルのRAM消費を制限するのに役立つ。
+MySqlExportParameters=MySQLをエクスポートパラメータ
+PostgreSqlExportParameters= PostgreSQLエクスポートパラメータ
 UseTransactionnalMode=トランザクション·モードを使用する
 FullPathToMysqldumpCommand=mysqldumpコマンドへのフルパス
 FullPathToPostgreSQLdumpCommand=コマンドをpg_dumpをフルパス
-AddDropDatabase=DROP DATABASEコマンドを追加します。
-AddDropTable=DROP TABLEコマンドを追加します。
-ExportStructure=Structure
+AddDropDatabase=DROP DATABASEコマンドを追加する。
+AddDropTable=DROP TABLEコマンドを追加する。
+ExportStructure=構造
 NameColumn=名前の列
 ExtendedInsert=拡張されたINSERT
-NoLockBeforeInsert=INSERT周囲にロック·コマンドません
+NoLockBeforeInsert=INSERT周囲にロック·コマンドなし
 DelayedInsert=INSERT DELAYEDを
 EncodeBinariesInHexa=進数のバイナリデータをエンコード
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=自動検出（ブラウザの言語）
+IgnoreDuplicateRecords=重複レコードのエラーを無視する ( INSERT IGNORE ) 
+AutoDetectLang=自動検出 ( ブラウザの言語 ) 
 FeatureDisabledInDemo=デモで機能を無効にする
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
-OnlyActiveElementsAreShown=から要素のみ<a href="%s">対応のモジュールが</a>表示されます。
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external app/modules
-ModulesDevelopYourModule=Develop your own app/modules
-ModulesDevelopDesc=You may also develop your own module or find a partner to develop one for you.
-DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will perform the search on the external market place for you (may be slow, need an internet access)...
-NewModule=New module
-FreeModule=Free
-CompatibleUpTo=Compatible with version %s
-NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s).
-CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
-SeeInMarkerPlace=See in Market place
-SeeSetupOfModule=See setup of module %s
-Updated=Updated
-Nouveauté=Novelty
-AchatTelechargement=Buy / Download
-GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
+FeatureAvailableOnlyOnStable=公式の安定版でのみ利用可能な機能
+BoxesDesc=ウィジェットは、一部のページをパーソナライズするために追加できる情報を表示するコンポーネント。ターゲットページを選択して 'Activate' をクリックするか、ゴミ箱をクリックしてウィジェットを無効にすることで、ウィジェットを表示するかどうかを選択できる。
+OnlyActiveElementsAreShown=から要素のみ<a href="%s">対応のモジュールが</a>表示される。
+ModulesDesc=モジュール/アプリケーションは、ソフトウェアで使用できる機能を決定する。一部のモジュールでは、モジュールをアクティブ化した後、ユーザに権限を付与する必要がある。各モジュールのオン/オフボタン<span class="small valignmiddle">%s </span>をクリックして、モジュール/アプリケーションを有効または無効にする。
+ModulesMarketPlaceDesc=インターネット上の外部Webサイトでダウンロードするモジュールをさらに見つけることができる...
+ModulesDeployDesc=ファイルシステムのアクセス許可で許可されている場合は、このツールを使用して外部モジュールを展開できる。モジュールは、タブ<strong> %s</strong>に表示される。
+ModulesMarketPlaces=外部アプリ/モジュールを探す
+ModulesDevelopYourModule=独自のアプリ/モジュールを開発する
+ModulesDevelopDesc=また、独自のモジュールを開発したり、モジュールを開発するパートナーを見つけたりすることもできる。
+DOLISTOREdescriptionLong=<a href="https://www.dolistore.com"> www.dolistore.com </a> Webサイトをオンにして外部モジュールを見つける代わりに、この組み込みツールを使用して、外部マーケットプレイスで検索を実行できる ( 遅い場合があり、インターネットアクセスが必要  ) ...
+NewModule=新規モジュール
+FreeModule=自由
+CompatibleUpTo=バージョン%sと互換性がある
+NotCompatible=このモジュールは、Dolibarr %s ( 最小%s-最大%s ) と互換性がないもよう。
+CompatibleAfterUpdate=このモジュールでは、Dolibarr %s ( 最小%s-最大%s ) を更新する必要がある。
+SeeInMarkerPlace=マーケットプレイスで見る
+SeeSetupOfModule=モジュール%sの設定を参照すること
+Updated=更新した
+Nouveauté=ノベルティ
+AchatTelechargement=購入/ダウンロード
+GoModuleSetupArea=新規モジュールを展開/インストールするには、モジュール設定領域に移動する：<a href="%s"> %s</a>。
 DoliStoreDesc=DoliStore、Dolibarr ERP / CRM外部モジュールのための公式の市場の場所
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
-WebSiteDesc=External websites for more add-on (non-core) modules...
-DevelopYourModuleDesc=Some solutions to develop your own module...
+DoliPartnersDesc=カスタム開発されたモジュールまたは機能を提供している企業のリスト。<br>注:Dolibarrはオープンソースアプリケーション、 <i>誰でも</i> PHPプログラミングの経験があればモジュールを開発できてよい。
+WebSiteDesc=その他のアドオン ( 非コア ) モジュールの外部Webサイト...
+DevelopYourModuleDesc=独自のモジュールを開発するためのいくつかのソリューション...
 URL=URL
-RelativeURL=Relative URL
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
+RelativeURL=相対URL
+BoxesAvailable=利用可能なウィジェット
+BoxesActivated=ウィジェットがアクティブ化されました
 ActivateOn=でアクティブに
 ActiveOn=でアクティブ化
 SourceFile=ソースファイル
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=JavaScriptが無効になっていない場合にのみ使用可能
 Required=必須
-UsedOnlyWithTypeOption=Used by some agenda option only
+UsedOnlyWithTypeOption=一部の議題オプションでのみ使用
 Security=セキュリティー
 Passwords=パスワード
-DoNotStoreClearPassword=Encrypt passwords stored in database (NOT as plain-text). It is strongly recommended to activate this option.
-MainDbPasswordFileConfEncrypted=Encrypt database password stored in conf.php. It is strongly recommended to activate this option.
-InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
-InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
-ProtectAndEncryptPdfFiles=Protect generated PDF files. This is NOT recommended as it breaks bulk PDF generation.
-ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
+DoNotStoreClearPassword=データベースに保存されているパスワードを暗号化する ( プレーンテキストとしてではない ) 。このオプションを有効にすることを強くお勧めする。
+MainDbPasswordFileConfEncrypted=conf.phpに保存されているデータベースパスワードを暗号化する。このオプションを有効にすることを強くお勧めする。
+InstrucToEncodePass=パスワードを<b>conf.php </b>ファイルにエンコードするには、行<br> <b> $ dolibarr_main_db_pass = "..."を置き換える。 </b> <br> by <br> <b> $ dolibarr_main_db_pass = "crypted：%s"; </b>
+InstrucToClearPass=パスワードを<b>conf.php </b>ファイルにデコード ( クリア ) するには、行<br> <b> $ dolibarr_main_db_pass = "crypted：...";を置き換える。 </b> <br> by <br> <b> $ dolibarr_main_db_pass = "%s"; </b>
+ProtectAndEncryptPdfFiles=生成されたPDFファイルを保護する。大量のPDF生成が中断されるため、これはお勧めしません。
+ProtectAndEncryptPdfFilesDesc=PDFドキュメントを保護することで、PDFブラウザでの読み取りと印刷が可能になる。ただし、編集やコピーはできなくなった。この機能を使用すると、グローバルにマージされたPDFの作成が機能しなくなることに注意すること。
 Feature=機能
 DolibarrLicense=ライセンス
 Developpers=開発者/貢献者
-OfficialWebSite=Dolibarr official web site
-OfficialWebSiteLocal=Local web site (%s)
-OfficialWiki=Dolibarr documentation / Wiki
+OfficialWebSite=Dolibarr公式ウェブサイト
+OfficialWebSiteLocal=ローカルWebサイト ( %s ) 
+OfficialWiki=Dolibarrドキュメント/ Wiki
 OfficialDemo=Dolibarrオンラインデモ
 OfficialMarketPlace=外部モジュール/アドオンの公式市場の場所
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Other resources
-ExternalResources=External Resources
-SocialNetworks=Social Networks
-ForDocumentationSeeWiki=ユーザーまたは開発者のドキュメント（DOC、よくある質問（FAQ）...）のために、 <br> Dolibarr Wikiで見てみましょう。 <br> <a href="%s" target="_blank"><b>%s</b></a>
-ForAnswersSeeForum=他の質問/ヘルプについては、Dolibarrフォーラムを使用することができます。 <br> <a href="%s" target="_blank"><b>%s</b></a>
-HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
-HelpCenterDesc2=Some of these resources are only available in <b>english</b>.
+OfficialWebHostingService=参照されたウェブホスティングサービス ( クラウドホスティング ) 
+ReferencedPreferredPartners=優先パートナー
+OtherResources=その他のリソース
+ExternalResources=外部リソース
+SocialNetworks=ソーシャルネットワーク
+ForDocumentationSeeWiki=ユーザまたは開発者のドキュメント ( DOC、よくある質問 ( FAQ ) ... ) のために、 <br> Dolibarr Wikiで見てみましょう。 <br> <a href="%s" target="_blank"><b>%s</b></a>
+ForAnswersSeeForum=他の質問/ヘルプについては、Dolibarrフォーラムを使用することができる。 <br> <a href="%s" target="_blank"><b>%s</b></a>
+HelpCenterDesc1=Dolibarrのヘルプとサポートを受けるためのリソースをいくつか紹介する。
+HelpCenterDesc2=これらのリソースの一部は、<b>英語</b>でのみ利用できる。
 CurrentMenuHandler=現在のメニューハンドラ
 MeasuringUnit=測定ユニット
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Notice period
-NewByMonth=New by month
-Emails=Emails
-EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
-EmailSenderProfiles=Emails sender profiles
-EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (default value in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix-like systems)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix-like systems)
-MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (default value in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used for error returns emails (fields 'Errors-To' in emails sent)
-MAIN_MAIL_AUTOCOPY_TO= Copy (Bcc) all sent emails to
-MAIN_DISABLE_ALL_MAILS=Disable all email sending (for test purposes or demos)
-MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
-MAIN_MAIL_ENABLED_USER_DEST_SELECT=Suggest emails of employees (if defined) into the list of predefined recipient when writing a new email
-MAIN_MAIL_SENDMODE=Email sending method
-MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
-MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
-MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
-MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
-MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
-MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
-MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
-MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Private key for dkim signing
-MAIN_DISABLE_ALL_SMS=Disable all SMS sending (for test purposes or demos)
+LeftMargin=左マージン
+TopMargin=トップマージン
+PaperSize=紙の種類
+Orientation=オリエンテーション
+SpaceX=スペースX
+SpaceY=スペースY
+FontSize=フォントサイズ
+Content=コンテンツ
+NoticePeriod=通知期間
+NewByMonth=月ごとの新規
+Emails=メール
+EMailsSetup=メールの設定
+EMailsDesc=このページでは、電子メール送信のパラメータまたはオプションを設定できる。
+EmailSenderProfiles=メール送信者プロファイル
+EMailsSenderProfileDesc=このセクションは空のままにしておくことができる。ここにいくつかの電子メールを入力すると、新規電子メールを作成するときに、それらの電子メールがコンボボックスの可能な送信者のリストに追加される。
+MAIN_MAIL_SMTP_PORT=SMTP / SMTPSポート ( php.iniのデフォルト値：<b> %s </b> ) 
+MAIN_MAIL_SMTP_SERVER=SMTP / SMTPSホスト ( php.iniのデフォルト値：<b> %s </b> ) 
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPSポート ( UnixライクなシステムではPHPに定義されていない ) 
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPSホスト ( UnixライクなシステムではPHPに定義されていない ) 
+MAIN_MAIL_EMAIL_FROM=自動メールの送信者メール ( php.iniのデフォルト値：<b> %s </b> ) 
+MAIN_MAIL_ERRORS_TO=エラーに使用されたEメールはEメールを返する ( 送信されたEメールのフィールド「Errors-To」 ) 
+MAIN_MAIL_AUTOCOPY_TO= 送信されたすべてのメールをコピー ( Bcc ) 
+MAIN_DISABLE_ALL_MAILS=すべての電子メール送信を無効にする ( テスト目的またはデモ用 ) 
+MAIN_MAIL_FORCE_SENDTO=すべての電子メールを ( 実際の受信者ではなく、テスト目的で ) に送信する
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=新規電子メールを作成するときに、事前定義された受信者のリストに従業員の電子メール ( 定義されている場合 ) を提案する
+MAIN_MAIL_SENDMODE=メール送信方法
+MAIN_MAIL_SMTPS_ID=SMTP ID ( 送信サーバーが認証を必要とする場合 ) 
+MAIN_MAIL_SMTPS_PW=SMTPパスワード ( 送信サーバーが認証を必要とする場合 ) 
+MAIN_MAIL_EMAIL_TLS=TLS ( SSL ) 暗号化を使用する
+MAIN_MAIL_EMAIL_STARTTLS=TLS ( STARTTLS ) 暗号化を使用する
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=lescertificatsauto-signésを承認する
+MAIN_MAIL_EMAIL_DKIM_ENABLED=DKIMを使用して電子メールの署名を生成する
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=dkimで使用するためのメールドメイン
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=dkimセレクターの名前
+MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=dkim署名用の秘密鍵
+MAIN_DISABLE_ALL_SMS=すべてのSMS送信を無効にする ( テスト目的またはデモ用 ) 
 MAIN_SMS_SENDMODE=SMSを送信するために使用する方法
-MAIN_MAIL_SMS_FROM=Default sender phone number for SMS sending
-MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email or Company email)
-UserEmail=User email
-CompanyEmail=Company Email
-FeatureNotAvailableOnLinux=システムと同様にUnix上では使用できませんが備わっています。ローカルでsendmailプログラムをテストします。
-FixOnTransifex=Fix the translation on the online translation platform of project
-SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
-ModuleSetup=モジュールのセットアップ
-ModulesSetup=Modules/Application setup
+MAIN_MAIL_SMS_FROM=SMS送信のデフォルトの送信者電話番号
+MAIN_MAIL_DEFAULT_FROMTYPE=手動送信のデフォルトの送信者Eメール ( ユーザEメールまたは法人Eメール ) 
+UserEmail=ユーザのメール
+CompanyEmail=法人のメール
+FeatureNotAvailableOnLinux=システムと同様にUnix上では使用できないが備わっている。ローカルでsendmailプログラムをテストする。
+FixOnTransifex=プロジェクトのオンライン翻訳プラットフォームで翻訳を修正する
+SubmitTranslation=この言語の翻訳が完了していないか、エラーが見つかった場合は、ディレクトリ<b> langs/%s </b>のファイルを編集して、変更をwww.transifex.com/dolibarr-association/dolibarr/ に送信して修正できる。
+SubmitTranslationENUS=この言語の翻訳が完了していないか、エラーが見つかった場合は、ファイルをディレクトリ<b> langs/%s </b>に編集し、変更されたファイルをdolibarr.org/forumに送信するか、開発者の場合は github.com/Dolibarr/dolibarr のPRを使用して修正できる。
+ModuleSetup=モジュールの設定
+ModulesSetup=モジュール/アプリケーションの設定
 ModuleFamilyBase=システム
-ModuleFamilyCrm=Customer Relationship Management (CRM)
-ModuleFamilySrm=Vendor Relationship Management (VRM)
-ModuleFamilyProducts=Product Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
+ModuleFamilyCrm=顧客関係管理 ( CRM ) 
+ModuleFamilySrm=仕入先リレーションシップマネジメント ( VRM ) 
+ModuleFamilyProducts=製品管理 ( PM ) 
+ModuleFamilyHr=人事管理 ( HR ) 
 ModuleFamilyProjects=プロジェクト/共同作業
 ModuleFamilyOther=その他
 ModuleFamilyTechnic=Multi-モジュールツール
 ModuleFamilyExperimental=実験的なモジュール
-ModuleFamilyFinancial=金融モジュール（会計/財務）
-ModuleFamilyECM=電子コンテンツ管理（ECM）
-ModuleFamilyPortal=Websites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
+ModuleFamilyFinancial=金融モジュール ( 会計/財務 ) 
+ModuleFamilyECM=電子コンテンツ管理 ( ECM ) 
+ModuleFamilyPortal=ウェブサイトおよびその他の正面アプリケーション
+ModuleFamilyInterface=外部システムとのインターフェース
 MenuHandlers=メニューハンドラ
 MenuAdmin=メニューエディタ
-DoNotUseInProduction=Do not use in production
-ThisIsProcessToFollow=Upgrade procedure:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
+DoNotUseInProduction=本番環境では使用しないこと
+ThisIsProcessToFollow=アップグレード手順：
+ThisIsAlternativeProcessToFollow=これは、手動で処理するための代替設定。
 StepNb=ステップ%s
-FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
-DownloadPackageFromWebSite=Download package (for example from the official web site %s).
-UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
-SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going to the page setup modules: <a href="%s">%s</a>.
-NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
-InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=You can upload the .zip file of module package from here:
+FindPackageFromWebSite=必要な機能を提供するパッケージを見つけます ( たとえば、公式Webサイト%sで ) 。
+DownloadPackageFromWebSite=パッケージをダウンロードする ( たとえば、公式Webサイト%sから ) 。
+UnpackPackageInDolibarrRoot=パッケージ化されたファイルをDolibarrサーバーディレクトリに解凍/解凍する：<b> %s </b>
+UnpackPackageInModulesRoot=外部モジュールを展開/インストールするには、パッケージ化されたファイルを外部モジュール専用のサーバーディレクトリに解凍/解凍する。<br><b>%s </b>
+SetupIsReadyForUse=モジュールの展開が完了した。ただし、ページ設定モジュール <a href="%s"> %s </a> に移動し、アプリケーション内でモジュールを有効にして設定する必要がある。
+NotExistsDirect=代替ルートディレクトリは、既存のディレクトリに対して定義されていない。 <br>
+InfDirAlt=バージョン3以降、代替ルートディレクトリを定義することが可能。これにより、プラグインとカスタムテンプレートを専用のディレクトリに保存できる。 <br> Dolibarrのルートにディレクトリを作成するだけ  ( 例：カスタム ) 。 <br>
+InfDirExample=<br>次に、ファイル <strong>conf.php</strong>で宣言するのは<br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>もし、"#" でコメント化されている場合は、"#" 文字を削除してコメントを解除するだけ。
+YouCanSubmitFile=モジュールパッケージの.zipファイルはここからアップロードできる。
 CurrentVersion=Dolibarr現在のバージョン
-CallUpdatePage=Browse to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
-LastActivationAuthor=Latest activation author
-LastActivationIP=Latest activation IP
-UpdateServerOffline=Update server offline
-WithCounter=Manage a counter
-GenericMaskCodes=任意の番号マスクを入力することができます。このマスクには、以下のタグを使用することができます。 <br> <b>{00万}</b>各%sにインクリメントされる番号に対応しています。カウンタの希望の長さなどの多くのゼロとして入力します。カウンタは、マスクとして多くのゼロとして持たせるために、左からゼロで完了する予定です。 <br> <b>{00万000}</b>以前のが、最初の%sから始まる適用されている+記号の右にある数字に対応するオフセットと同じです。 <br> <b>{00万@ x}の</b>前のと同じですが、カウンタが月、xは（1〜12、または0の間でXコンフィギュレーションで定義された会計年度の初めに数ヶ月を使用する）に達したときにゼロにリセットされます。このオプションを使用すると、xが2以上ある場合、その列{YY} {ミリメートル}または{yyyyは} {}ミリメートルも要求されます。 <br> <b>{DD}</b>日（01〜31）。 <br> <b>{}ミリメートル</b>月（01〜12）。 <br> 2、4、または1の数値以上<b>{YY}、{探す}</b>または<b>{Y}</b>年。 <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
-GenericMaskCodes3=マスク内の他のすべての文字はそのまま残ります。 <br>スペースは許可されていません。 <br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>2007年3月1日で作成されたサードパーティの例：</u> <br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
-GenericNumRefModelDesc=定義されたマスクに応じてカスタマイズ可能な数を返します。
-ServerAvailableOnIPOrPort=サーバーはポート<b>%s</b>上のアドレス<b>%s</b>で入手できます。
-ServerNotAvailableOnIPOrPort=サーバーはポート<b>%s</b>上のアドレス<b>%s</b>では使用できません
+CallUpdatePage=データベース構造とデータを更新するページ%sを参照する。
+LastStableVersion=最新の安定バージョン
+LastActivationDate=最新のアクティベーション日
+LastActivationAuthor=最新のアクティベーション作成者
+LastActivationIP=最新のアクティベーションIP
+UpdateServerOffline=サーバーをオフラインで更新する
+WithCounter=カウンターを管理する
+GenericMaskCodes=任意の番号マスクを入力することができる。このマスクには、以下のタグを使用することができる。 <br> <b>{000000}</b>各%sにインクリメントされる番号に対応している。カウンタの希望の長さなどの多くのゼロとして入力する。カウンタは、マスクとして多くのゼロとして持たせるために、左からゼロで完了する予定。 <br> <b>{000000+000}</b>以前のが、最初の%sから始まる適用されている+記号の右にある数字に対応するオフセットと同じ。 <br> <b>{000000@x}</b>前のと同じ が、カウンタがx月に達した時にゼロにリセットされる (xは 1〜12、または0の間でコンフィギュレーションで定義された会計年度の初めの数ヶ月を使用するか、99で毎月ゼロにリセット ) 。このオプションを使用すると、xが2以上である場合、 {yy}{mm} または {yyyy}{mm} のシーケンスも要求される。 <br> <b>{dd}</b>日 ( 01〜31 ) 。 <br> <b>{mm}</b>月 ( 01〜12 ) 。 <br><b>{yy}</b>、<b>{yyyy}</b>または <b>{y}</b> 年は 2、4、または1桁の数値。 <br>
+GenericMaskCodes2= <b> {cccc} </b>n文字のクライアントコード<br><b> {cccc000} </b>n文字のクライアントコードの後にカウンターが続く。お客様専用のこのカウンターは、グローバルカウンターと同時にリセットされる。 <br> <b> {tttt} </b> n文字のt取引先種別のコード ( メニュー【ホーム】-【設定】-【辞書】-【取引先の種別】を参照 ) 。このタグを追加すると、取引先の種類ごとにカウンターが異なる。 <br>
+GenericMaskCodes3=マスク内の他のすべての文字はそのまま残る。 <br>スペースは許可されていない。 <br>
+GenericMaskCodes4a= <u>取引先 TheCompany の99番目の%sの例、日付 2007-01-31：</u> <br>
+GenericMaskCodes4b=<u>2007-03-01に作成された取引先の例：</u> <br>
+GenericMaskCodes4c= <u> 2007-03-01に作成された製品の例：</u> <br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b>で <b>ABC0701-000099</b>となり<br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> で <b>0199-ZZZ/31/XXX</b>となり<br><b>IN{yy}{mm}-{0000}-{t}</b> で <b>IN0701-0099-A</b> となる。ただし、法人の種別が 'Responsable Inscripto' で対応するコードが'A_RI'の場合。
+GenericNumRefModelDesc=定義されたマスクに応じてカスタマイズ可能な数を返する。
+ServerAvailableOnIPOrPort=サーバーはポート<b>%s</b>上のアドレス<b>%s</b>で入手できる。
+ServerNotAvailableOnIPOrPort=サーバーはポート<b>%s</b>上のアドレス<b>%s</b>では使用できない
 DoTestServerAvailability=テストサーバーへの接続
 DoTestSend=送信テスト
 DoTestSendHTML=HTMLを送信するテスト
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=エラー、シーケンス場合は、@オプションを使用することはできません{YY} {ミリメートル}または{探す} {mmは}マスクではありません。
-UMask=のUnix / Linux / BSDのファイルシステム上に新しいファイルのumaskパラメータ。
-UMaskExplanation=このパラメータは、（たとえば、アップロード中に）、サーバー上でDolibarrによって作成されたファイルは、デフォルトで設定されているアクセス許可を定義することができます。 <br>それは、8進値（例えば、0666の手段みんなのための読み取りおよび書き込み）である必要があります。 <br>このパラメータは、Windowsサーバー上では役に立ちません。
-SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
-UseACacheDelay= 秒単位で輸出応答をキャッシュするための遅延（0またはキャッシュなしの空の）
+ErrorCantUseRazIfNoYearInMask=エラー。シーケンス{yy}または{yyyy}がマスクされていない場合、オプション@を使用して毎年カウンターをリセットすることはできない。
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=エラー、シーケンス場合は、@オプションを使用することはできない{YY} {ミリメートル}または{探す} {mmは}マスクではない。
+UMask=のUnix / Linux / BSDのファイルシステム上に新規ファイルのumaskパラメータ。
+UMaskExplanation=このパラメータは、 ( たとえば、アップロード中に ) 、サーバー上でDolibarrによって作成されたファイルは、デフォルトで設定されているアクセス許可を定義することができる。 <br>それは、8進値 ( 例えば、0666が意味するのは全員に対して読取および書込 ) である必要がある。 <br>このパラメータは、Windowsサーバー上では役に立ちません。
+SeeWikiForAllTeam=寄稿者とその組織のリストについては、Wikiページをご覧ください。
+UseACacheDelay= 秒単位でをエクスポート応答をキャッシュするための遅延 ( 0またはキャッシュなしの空の ) 
 DisableLinkToHelpCenter=ログインページのリンク&quot; <b>ヘルプやサポートが必要</b> &quot; <b>を</b>隠す
-DisableLinkToHelp=Hide link to online help "<b>%s</b>"
-AddCRIfTooLong=There is no automatic text wrapping, text that is too long will not display on documents. Please add carriage returns in the text area if needed.
-ConfirmPurge=Are you sure you want to execute this purge?<br>This will permanently delete all your data files with no way to restore them (ECM files, attached files...).
+DisableLinkToHelp=オンラインヘルプへのリンクを非表示にする "<b> %s </b>"
+AddCRIfTooLong=自動テキスト折り返しはない。長すぎるテキストはドキュメントに表示されない。必要に応じて、テキスト領域にキャリッジリターンを追加すること。
+ConfirmPurge=このパージを実行してもよいか？ <br>これにより、すべてのデータファイルが完全に削除され、復元する方法はない ( ECMファイル、添付ファイルなど ) 。
 MinLength=最小長
 LanguageFilesCachedIntoShmopSharedMemory=ファイルlangは、共有メモリにロードされ
-LanguageFile=Language file
-ExamplesWithCurrentSetup=Examples with current configuration
+LanguageFile=言語ファイル
+ExamplesWithCurrentSetup=現在の構成の例
 ListOfDirectories=OpenDocumentをテンプレートディレクトリのリスト
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
+ListOfDirectoriesForModelGenODT=OpenDocument形式のテンプレートファイルを含むディレクトリのリスト。 <br><br>ここにディレクトリのフルパスを入力する。 <br>eahディレクトリ間にキャリッジリターンを追加する。 <br> GEDモジュールのディレクトリを追加するには、ここに<b> DOL_DATA_ROOT / ecm / yourdirectoryname</b>を追加する。 <br> <br>これらのディレクトリ内のファイルは、<b> .odt</b>または<b>.ods</b>で終わる必要がある。
+NumberOfModelFilesFound=これらのディレクトリで見つかったODT / ODSテンプレートファイルの数
 ExampleOfDirectoriesForModelGen=構文の例： <br> C：\\ mydirに<br> / home / mydirの<br> DOL_DATA_ROOT / ECM / ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>あなたのODTドキュメントテンプレートを作成する方法を知って、それらのディレクトリに格納する前に、ウィキのドキュメントをお読みください。
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=名/姓の位置
-DescWeather=The following images will be shown on the dashboard when the number of late actions reach the following values:
-KeyForWebServicesAccess=Webサービス（webservicesのパラメータ &quot;dolibarrkey&quot;）を使用するキー
+DescWeather=遅延アクションの数が次の値に達すると、ダッシュボードに次の画像が表示される。
+KeyForWebServicesAccess=Webサービス ( webservicesのパラメータ &quot;dolibarrkey&quot; ) を使用するキー
 TestSubmitForm=入力テストフォーム
-ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever the user choice. Also this menu manager specialized for smartphones does not work on all smartphone. Use another menu manager if you experience problems with yours.
+ThisForceAlsoTheme=このメニューマネージャーを使用すると、ユーザの選択に関係なく、独自のテーマも使用される。また、このスマートフォン専用のメニューマネージャーは、すべてのスマートフォンで動作するわけではない。問題が発生した場合は、別のメニューマネージャーを使用すること。
 ThemeDir=スキンディレクトリ
-ConnectionTimeout=Connection timeout
+ConnectionTimeout=接続タイムアウト
 ResponseTimeout=応答タイムアウト
 SmsTestMessage=_人のPHONEFROM__から__までのテストメッセージPHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
+ModuleMustBeEnabledFirst=この機能が必要な場合は、モジュール<b> %s</b>を最初に有効にする必要がある。
 SecurityToken=セキュリティで保護されたURLへの鍵
-NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
+NoSmsEngine=利用可能なSMS送信者マネージャーはない。 SMS送信者マネージャーは、外部仕入先に依存しているため、デフォルトのディストリビューションではインストールされないが、%sで見つけることができる。
 PDF=PDF
-PDFDesc=Global options for PDF generation
-PDFAddressForging=Rules for address section
-HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
-PDFRulesForSalesTax=Rules for Sales Tax / VAT
-PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
-HideDescOnPDF=Hide products description
-HideRefOnPDF=Hide products ref.
-HideDetailsOnPDF=Hide product lines details
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
+PDFDesc=PDF生成のグローバルオプション
+PDFAddressForging=アドレスセクションのルール
+HideAnyVATInformationOnPDF=消費税/ VATに関連するすべての情報を非表示にする
+PDFRulesForSalesTax=消費税/ VATのルール
+PDFLocaltax=%sのルール
+HideLocalTaxOnPDF=列SaleTax / VATで%sレートを非表示にする
+HideDescOnPDF=製品説明を非表示
+HideRefOnPDF=製品を非表示にするref。
+HideDetailsOnPDF=製品ラインの詳細を非表示
+PlaceCustomerAddressToIsoLocation=顧客の住所の位置には、フランスの標準位置 ( La Poste ) を使用する
 Library=図書館
 UrlGenerationParameters=URLを確保するためのパラメータ
 SecurityTokenIsUnique=各URLごとに一意securekeyパラメータを使用して、
-EnterRefToBuildUrl=オブジェクト%sの参照を入力します。
+EnterRefToBuildUrl=オブジェクト%sの参照を入力する。
 GetSecuredUrl=計算されたURLを取得する
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
-OldVATRates=Old VAT rate
-NewVATRates=New VAT rate
-PriceBaseTypeToChange=Modify on prices with base reference value defined on
-MassConvert=Launch bulk conversion
-PriceFormatInCurrentLanguage=Price Format In Current Language
+ButtonHideUnauthorized=灰色の無効なボタンを表示する代わりに、管理者以外のユーザの不正なアクションのボタンを非表示にする
+OldVATRates=古いVAT率
+NewVATRates=新規VAT率
+PriceBaseTypeToChange=で定義された基本参照値を使用して価格を変更する
+MassConvert=一括変換を開始
+PriceFormatInCurrentLanguage=現在の言語での価格フォーマット
 String=文字列
-String1Line=String (1 line)
-TextLong=Long text
-TextLongNLines=Long text (n lines)
-HtmlText=Html text
-Int=Integer
-Float=Float
-DateAndTime=Date and hour
-Unique=Unique
-Boolean=Boolean (one checkbox)
+String1Line=文字列 ( 1行 ) 
+TextLong=長いテキスト
+TextLongNLines=長いテキスト ( n行 ) 
+HtmlText=HTMLテキスト
+Int=整数
+Float=浮く
+DateAndTime=日付と時間
+Unique=ユニーク
+Boolean=ブール値 ( 1つのチェックボックス ) 
 ExtrafieldPhone = 電話
 ExtrafieldPrice = 価格
-ExtrafieldMail = Email
-ExtrafieldUrl = Url
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator (not a field)
+ExtrafieldMail = Eメール
+ExtrafieldUrl = URL
+ExtrafieldSelect = リストを選択
+ExtrafieldSelectList = 表から選択
+ExtrafieldSeparator=セパレーター ( フィールドではない ) 
 ExtrafieldPassword=パスワード
-ExtrafieldRadio=Radio buttons (one choice only)
-ExtrafieldCheckBox=Checkboxes
-ExtrafieldCheckBoxFromList=Checkboxes from table
-ExtrafieldLink=Link to an object
-ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
-Computedpersistent=Store computed field
-ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
-ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
-ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
-LibraryToBuildPDF=Library used for PDF generation
-LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
+ExtrafieldRadio=ラジオボタン ( 1つの選択肢のみ ) 
+ExtrafieldCheckBox=チェックボックス
+ExtrafieldCheckBoxFromList=テーブルのチェックボックス
+ExtrafieldLink=オブジェクトへのリンク
+ComputedFormula=計算フィールド
+ComputedFormulaDesc=ここに、オブジェクトの他のプロパティまたは任意のPHPコーディングを使用して数式を入力し、動的な計算値を取得できる。 "?" を含むPHP互換の数式を使用できる。条件演算子、および次のグローバルオブジェクト: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>警告</strong>: $objectの一部のプロパティのみが使用可能である可能性がある。 ロードされていないプロパティが必要な場合は、2番目の例のように、単純にオブジェクトを自分で数式にフェッチする。<br> 計算フィールドを使用すると、インターフェイスから値を入力できなくなる。また、構文エラーがある場合、数式は何も返さない場合がある。 <br><br>式の例:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>オブジェクトをリロードする例<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>オブジェクトとその親オブジェクトを強制的にロードする式のその他の例:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+Computedpersistent=計算フィールドを保存する
+ComputedpersistentDesc=計算された追加フィールドはデータベースに保存されるが、値はこのフィールドのオブジェクトが変更された場合にのみ再計算される。計算フィールドが他のオブジェクトまたはグローバルデータに依存している場合、この値は間違っている可能性がある!!
+ExtrafieldParamHelpPassword=このフィールドを空白のままにすると、この値は暗号化なしで保存される ( フィールドは画面上の星印でのみ非表示にする必要がある ) 。 <br>デフォルトの暗号化ルールを使用してパスワードをデータベースに保存するように「auto」を設定する ( この場合、読み取られる値はハッシュのみになり、元の値を取得する方法はない ) 
+ExtrafieldParamHelpselect=値のリストは、 key,value形式 (key は '0' 以外) の行であること。<br><br> 例: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>別の補完属性リストに応じたリストを作るには:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>別のリストに応じたリストを作るには:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=値のリストは、 key,value形式 (key は '0' 以外) の行であること<br><br>例 : <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpradio=値のリストは、 key,value形式 (key は '0' 以外) の行であること<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpsellist=値のリストはテーブルから取得される<br>構文：table_name：label_field：id_field :: filter <br>例：c_typent：libelle：id :: filter <br> <br> --id_fieldは必然的にプライマリintキーa0342fccfda = 1 ) アクティブな値のみを表示するには<br>現在のオブジェクトの現在のIDであるフィルターで$ ID $を使用することもできる<br>フィルターにSELECTを使用するには、キーワード$ SEL $を使用してインジェクション防止保護をバイパスする。 <br>エクストラフィールドでフィルタリングする場合は、構文extra.fieldcode = ... ( フィールドコードはエクストラフィールドのコード ) を使用する。<br><br>別の補完属性リストに依存するリストを作成するには：<br> c_typent：libelle：id：options_ <i> parent_list_code </i> | parent_column：filter <br> <br>リストを別のリストに依存させるには：<br> c_typent：libelle：id：<i> parent_list_code
+ExtrafieldParamHelpchkbxlst=値のリストはテーブルから取得される<br>構文：table_name：label_field：id_field :: filter <br>例：c_typent：libelle：id :: filter <br> <br>フィルターは、アクティブな値a0342cfのみを表示する簡単なテスト ( 例：active = 1 ) にすることができるフィルタで$ ID $を使用することもできる。witchは現在のオブジェクトの現在のID。<br>フィルタでSELECTを実行するには、エクストラフィールドでフィルタリングする場合は$ SEL $ <br>を使用する。構文extra.fieldcode = ...を使用する ( フィールドコードはエクストラフィールドのコード ) <br> <br>別の補完属性リストに依存するリストを作成するには、次のようにする。 libelle：id：<i> parent_list_code </i> | parent_column：filter
+ExtrafieldParamHelplink=パラメータはObjectName：Classpathでなければなりません<br>構文：ObjectName：Classpath
+ExtrafieldParamHelpSeparator=単純なセパレーターの場合は空のままにする<br>折りたたみセパレーターの場合はこれを1に設定する ( 新規セッションの場合はデフォルトで開き、ユーザセッションごとにステータスが保持される ) <br>折りたたみセパレーターの場合はこれを2に設定する ( 新規セッションの場合はデフォルトで折りたたむ。ステータスは各ユーザセッションの間保持される ) 
+LibraryToBuildPDF=PDF生成に使用されるライブラリ
+LocalTaxDesc=国によっては、各請求書の行に2つまたは3つの税金を適用する場合がある。その場合は、2番目と3番目の税の種類とその税率を選択すること。可能な種別は次のとおり。<br>1：VATなしの製品およびサービスに地方税が適用される ( 地方税は税抜きの金額に基づいて計算される ) <br> 2：VATを含む製品およびサービスに地方税が適用される ( 地方税は金額+主税に基づいて計算される ) <br> 3：地方税はVATのない製品に適用される ( 地方税は税抜金額に基づいて計算される ) <br> 4：地方税はVATを含む製品に適用される ( 地方税は金額+主VATに基づいて計算される ) <br> 5：地方税はVATのないサービスに適用される ( 地方税は計算される ) 税抜き金額 ) <br> 6：VATを含むサービスには地方税が適用される ( 地方税は金額+税で計算される ) 
 SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-KeepThisEmptyInMostCases=In most cases, you can keep this field empy.
-DefaultLink=Default link
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module
-InstalledInto=Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for third-parties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled in the Barcode module setup.
-EnableFileCache=Enable file cache
-ShowDetailsInPDFPageFoot=Add more details into footer, such as company address or manager names (in addition to professional ids, company capital and VAT number).
-NoDetails=No additional details in footer
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template using the *Create* button. Note that even if you enabled automatic generation, you can still safely launch manual generation. Generation of duplicates for the same period is not possible.
-ModuleCompanyCodeCustomerAquarium=%s followed by customer code for a customer accounting code
-ModuleCompanyCodeSupplierAquarium=%s followed by vendor code for a vendor accounting code
-ModuleCompanyCodePanicum=Return an empty accounting code.
-ModuleCompanyCodeDigitaria=Returns a compound accounting code according to the name of the third party. The code consists of a prefix that can be defined in the first position followed by the number of characters defined in the third party code.
-ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by the number of characters: %s for the customer accounting code.
-ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
-Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
-UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
-WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
-ClickToShowDescription=Click to show description
-DependsOn=This module needs the module(s)
-RequiredBy=This module is required by module(s)
-TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
-PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
-EnableDefaultValues=Enable customization of default values
-EnableOverwriteTranslation=Enable usage of overwritten translation
-GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
-WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+LinkToTestClickToDial=ユーザ<strong>%s</strong>のClickToDialURLをテストするためのリンクを表示するために呼び出す電話番号を入力する
+RefreshPhoneLink=リンクを更新
+LinkToTest=ユーザ用に生成されたクリック可能なリンク<strong>%s </strong> ( テストするには電話番号をクリックすること ) 
+KeepEmptyToUseDefault=デフォルト値を使用するには、空のままにする
+KeepThisEmptyInMostCases=ほとんどの場合、このフィールドを空に保つことができる。
+DefaultLink=デフォルトのリンク
+SetAsDefault=デフォルトとして設定
+ValueOverwrittenByUserSetup=警告、この値はユーザ固有の設定によって上書きされる可能性がある ( 各ユーザは独自のクリックダイヤルURLを設定できる ) 
+ExternalModule=外部モジュール
+InstalledInto=ディレクトリ%sにインストールされました
+BarcodeInitForThirdparties=取引先向けの大量バーコード初期化
+BarcodeInitForProductsOrServices=製品またはサービスの大量バーコードの初期化またはリセット
+CurrentlyNWithoutBarCode=現在、<strong>%s</strong>%sにバーコードが定義されていない<strong>%s</strong>レコードがある。
+InitEmptyBarCode=次の%s空レコードの初期値
+EraseAllCurrentBarCode=現在のバーコード値をすべて消去する
+ConfirmEraseAllCurrentBarCode=現在のバーコード値をすべて消去してもよいか？
+AllBarcodeReset=すべてのバーコード値が削除されました
+NoBarcodeNumberingTemplateDefined=バーコードモジュールの設定で番号付けバーコードテンプレートが有効になっていない。
+EnableFileCache=ファイルキャッシュを有効にする
+ShowDetailsInPDFPageFoot=法人の住所やマネージャーの名前 ( 専門家ID、法人の資本、VAT番号に加えて ) などの詳細をフッターに追加する。
+NoDetails=フッターに追加の詳細はない
+DisplayCompanyInfo=法人の住所を表示する
+DisplayCompanyManagers=ディスプレイマネージャー名
+DisplayCompanyInfoAndManagers=法人の住所とマネージャーの名前を表示する
+EnableAndSetupModuleCron=この定期的な請求書を自動的に生成する場合は、モジュール* %s *を有効にして、正しく設定する必要がある。それ以外の場合、請求書の生成は、【作成】ボタンを使用してこのテンプレートから手動で行う必要がある。自動生成を有効にしても、手動生成を安全に起動できることに注意すること。同じ期間の重複を生成することはできない。
+ModuleCompanyCodeCustomerAquarium=%sの後に、顧客会計コードの顧客コードが続きます
+ModuleCompanyCodeSupplierAquarium=%sの後に、仕入先会計コードの仕入先コードが続きます
+ModuleCompanyCodePanicum=空の会計コードを返する。
+ModuleCompanyCodeDigitaria=取引先の名前に従って複合会計コードを返する。コードは、最初の位置で定義できるプレフィックスと、それに続く取引先のコードで定義された文字数で構成される。
+ModuleCompanyCodeCustomerDigitaria=%sの後に、文字数で切り捨てられた顧客名が続く。顧客会計コードの場合は%s。
+ModuleCompanyCodeSupplierDigitaria=%sの後に、文字数で切り捨てられたサプライヤ名が続く。サプライヤ会計コードの場合は%s。
+Use3StepsApproval=デフォルトでは、発注書は2人の異なるユーザによって作成および承認される必要がある ( 作成する1つのステップ/ユーザと承認する1つのステップ/ユーザ。ユーザが作成と承認の両方の権限を持っている場合は、1つのステップ/ユーザで十分  )  。金額が専用の値よりも高い場合は、このオプションを使用して3番目のステップ/ユーザ承認を導入するように依頼できる ( したがって、3つのステップが必要になる：1 =検証、2 =最初の承認、3 =金額が十分な場合は2番目の承認 ) 。 <br> 1つの承認 ( 2ステップ ) で十分な場合はこれを空に設定し、2番目の承認 ( 3ステップ ) が常に必要な場合は非常に低い値 ( 0.1 ) に設定する。
+UseDoubleApproval=金額 ( 税抜き ) が...より高い場合は、3段階の承認を使用すること。
+WarningPHPMail=警告：アプリケーションから電子メールを送信するための設定は、デフォルトの汎用設定を使用している。多くの場合、いくつかの理由から、デフォルトの設定ではなく、メールサービスプロバイダーのメールサーバーを使用するように送信メールを設定することをお勧めする。
+WarningPHPMailA=-電子メールサービスプロバイダーのサーバーを使用すると、電子メールの信頼性が向上するため、スパムとしてフラグが立てられることなく配信可能性が向上する。
+WarningPHPMailB=-一部の電子メールサービスプロバイダー ( Yahooなど ) では、独自のサーバー以外のサーバーから電子メールを送信することを許可していない。現在の設定では、電子メールプロバイダーのサーバーではなく、アプリケーションのサーバーを使用して電子メールを送信するため、一部の受信者 ( 制限付きDMARCプロトコルと互換性のある受信者 ) は、電子メールプロバイダーと一部の電子メールプロバイダーを受け入れることができるかどうかを電子メールプロバイダーに尋ねる。  ( Yahooのように ) サーバーが彼らのものではないために「いいえ」と応答する場合がある。そのため、送信された電子メールの一部が配信を受け入れられない場合がある ( 電子メールプロバイダーの送信クォータにも注意すること ) 。
+WarningPHPMailC=-独自の電子メールサービスプロバイダーのSMTPサーバーを使用して電子メールを送信することも興味深いので、アプリケーションから送信されるすべての電子メールもメールボックスの「送信済み」ディレクトリに保存される。
+WarningPHPMailD=メソッド「PHPMail」が本当に使用したいメソッドである場合は、Home-Setup-Otherで定数MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUPを1に追加することで、この警告を削除できる。
+WarningPHPMail2=電子メールSMTPプロバイダーが電子メールクライアントをいくつかのIPアドレスに制限する必要がある場合 ( 非常にまれ  ) 、これはERP CRMアプリケーションのメールユーザエージェント ( MUA ) のIPアドレス ：<strong> %s</strong>。
+WarningPHPMailSPF=送信者のメールアドレスのドメイン名がSPFレコードで保護されている場合 ( ドメイン名登録事業者に尋ねる ) 、ドメインのDNSのSPFレコードに次のIPを追加する必要がある：<strong> %s</strong>。
+ClickToShowDescription=クリックして説明を表示
+DependsOn=このモジュールにはモジュールが必要 
+RequiredBy=このモジュールはモジュールに必要 
+TheKeyIsTheNameOfHtmlField=これはHTMLフィールドの名前。 HTMLページのコンテンツを読んでフィールドのキー名を取得するには、技術的な知識が必要。
+PageUrlForDefaultValues=ページURLの相対パスを入力する必要がある。 URLにパラメータを含める場合、すべてのパラメータが同じ値に設定されていれば、デフォルト値が有効になる。
+PageUrlForDefaultValuesCreate= <br>例：<br>新規取引先を作成するフォームの場合、<strong> %s</strong>。 <br>カスタムディレクトリにインストールされた外部モジュールのURLには、「custom /」を含めないため、custom/mymodule/mypage.phpではなく、<strong> mymodule/mypage.php</strong>のようなパスを使用する。 <br> URLに何らかのパラメータがある場合にのみデフォルト値が必要な場合は、<strong> %s</strong>を使用できる。
+PageUrlForDefaultValuesList= <br>例：<br>取引先を一覧表示するページの場合、<strong> %s</strong>。 <br>カスタムディレクトリにインストールされた外部モジュールのURLには、「custom /」を含めないため、custom/mymodule/mypagelist.phpではなく<strong>mymodule/mypagelist.php</strong>のようなパスを使用する。 <br> URLに何らかのパラメータがある場合にのみデフォルト値が必要な場合は、<strong> %s</strong>を使用できる。
+AlsoDefaultValuesAreEffectiveForActionCreate=また、フォーム作成のデフォルト値の上書きは、正しく設計されたページに対してのみ機能することに注意すること ( したがって、パラメーターaction = createまたはpresend ...を使用 ) 。
+EnableDefaultValues=デフォルト値のカスタマイズを有効にする
+EnableOverwriteTranslation=上書きされた翻訳の使用を有効にする
+GoIntoTranslationMenuToChangeThis=このコードのキーの翻訳が見つかりました。この値を変更するには、Home-Setup-translationから編集する必要がある。
+WarningSettingSortOrder=警告、デフォルトのソート順を設定すると、フィールドが不明なフィールドの場合、リストページに移動するときに技術エラーが発生する可能性がある。このようなエラーが発生した場合は、このページに戻ってデフォルトの並べ替え順序を削除し、デフォルトの動作を復元すること。
 Field=フィールド
-ProductDocumentTemplates=Document templates to generate product document
-FreeLegalTextOnExpenseReports=Free legal text on expense reports
-WatermarkOnDraftExpenseReports=Watermark on draft expense reports
-AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
-FilesAttachedToEmail=Attach file
-SendEmailsReminders=Send agenda reminders by emails
-davDescription=Setup a WebDAV server
-DAVSetup=Setup of module DAV
-DAV_ALLOW_PRIVATE_DIR=Enable the generic private directory (WebDAV dedicated directory named "private" - login required)
-DAV_ALLOW_PRIVATE_DIRTooltip=The generic private directory is a WebDAV directory anybody can access with its application login/pass.
-DAV_ALLOW_PUBLIC_DIR=Enable the generic public directory (WebDAV dedicated directory named "public" - no login required)
-DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account).
-DAV_ALLOW_ECM_DIR=Enable the DMS/ECM private directory (root directory of the DMS/ECM module - login required)
-DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adecuate permissions to access it.
+ProductDocumentTemplates=製品ドキュメントを生成するためのドキュメントテンプレート
+FreeLegalTextOnExpenseReports=経費報告書に関する無料の法的テキスト
+WatermarkOnDraftExpenseReports=ドラフト経費報告書の透かし
+AttachMainDocByDefault=メインドキュメントをデフォルトで電子メールに添付する場合は、これを1に設定する ( 該当する場合 ) 
+FilesAttachedToEmail=ファイルを添付する
+SendEmailsReminders=メールで議題のリマインダーを送信する
+davDescription=WebDAVサーバーを設定する
+DAVSetup=モジュールDAVの設定
+DAV_ALLOW_PRIVATE_DIR=汎用プライベートディレクトリを有効にする ( 「private」という名前のWebDAV専用ディレクトリ-ログインが必要  ) 
+DAV_ALLOW_PRIVATE_DIRTooltip=汎用プライベートディレクトリは、アプリケーションのログイン/パスを使用して誰でもアクセスできるWebDAVディレクトリ。
+DAV_ALLOW_PUBLIC_DIR=汎用パブリックディレクトリを有効にする ( 「public」という名前のWebDAV専用ディレクトリ-ログインは不要 ) 
+DAV_ALLOW_PUBLIC_DIRTooltip=汎用パブリックディレクトリは、誰でも ( 読み取りおよび書き込みモードで ) アクセスできるWebDAVディレクトリであり、認証は必要ない ( ログイン/パスワードアカウント ) 。
+DAV_ALLOW_ECM_DIR=DMS / ECMプライベートディレクトリを有効にする ( DMS / ECMモジュールのルートディレクトリ-ログインが必要  ) 
+DAV_ALLOW_ECM_DIRTooltip=DMS / ECMモジュールの使用時にすべてのファイルが手動でアップロードされるルートディレクトリ。同様に、Webインターフェイスからのアクセスと同様に、アクセスするには、適切な権限を持つ有効なログイン/パスワードが必要。
 # Modules
-Module0Name=ユーザーとグループ
-Module0Desc=Users / Employees and Groups management
-Module1Name=Third Parties
-Module1Desc=Companies and contacts management (customers, prospects...)
+Module0Name=ユーザとグループ
+Module0Desc=ユーザ/従業員およびグループの管理
+Module1Name=取引先
+Module1Desc=企業と連絡先の管理 ( 顧客、見込み客... ) 
 Module2Name=コマーシャル
 Module2Desc=商業管理
-Module10Name=Accounting (simplified)
-Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table.
+Module10Name=会計 ( 簡略化 ) 
+Module10Desc=データベースの内容に基づく単純な会計レポート ( ジャーナル、売上高 ) 。元帳テーブルを使用しません。
 Module20Name=提案
 Module20Desc=商業的な提案の管理
-Module22Name=Mass Emailings
-Module22Desc=Manage bulk emailing
+Module22Name=大量の電子メール
+Module22Desc=一括メールを管理する
 Module23Name=エネルギー
 Module23Desc=エネルギーの消費量を監視する
-Module25Name=Sales Orders
-Module25Desc=Sales order management
+Module25Name=受注
+Module25Desc=受注管理
 Module30Name=請求書
-Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
-Module40Name=Vendors
-Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
-Module42Name=Debug Logs
-Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module30Desc=顧客の請求書とクレジットノートの管理。サプライヤーの請求書とクレジットノートの管理
+Module40Name=仕入先s
+Module40Desc=仕入先と購入管理 ( 発注書とサプライヤーの請求書の請求 ) 
+Module42Name=デバッグログ
+Module42Desc=ロギング機能 ( ファイル、syslog、... ) 。このようなログは、技術/デバッグを目的としている。
 Module49Name=エディタ
 Module49Desc=エディタの管理
 Module50Name=製品
-Module50Desc=Management of Products
+Module50Desc=製品の管理
 Module51Name=大量のメール
 Module51Desc=大量の紙メーリングリストの管理
-Module52Name=ストック
-Module52Desc=Stock management
+Module52Name=在庫
+Module52Desc=在庫管理
 Module53Name=サービス
-Module53Desc=Management of Services
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or recurring subscriptions)
+Module53Desc=サービスの管理
+Module54Name=契約/サブスクリプション
+Module54Desc=契約の管理 ( サービスまたは定期購読 ) 
 Module55Name=バーコード
 Module55Desc=バーコードの管理
-Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Payments by Direct Debit
-Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
+Module56Name=クレジット振込によるお支払い
+Module56Desc=クレジット転送注文によるサプライヤーの支払いの管理。これには、ヨーロッパ諸国向けのSEPAファイルの生成が含まれる。
+Module57Name=口座振替による支払い
+Module57Desc=口座振替注文の管理。これには、ヨーロッパ諸国向けのSEPAファイルの生成が含まれる。
 Module58Name=ClickToDial
-Module58Desc=ClickToDialシステムの統合（アスタリスク、...）
-Module59Name=Bookmark4u
-Module59Desc=DolibarrアカウントからBookmark4uアカウントを生成する関数を追加します。
-Module60Name=Stickers
-Module60Desc=Management of stickers
-Module70Name=介入
-Module70Desc=介入の管理
+Module58Desc=ClickToDialシステムの統合 ( アスタリスク、... ) 
+Module60Name=ステッカー
+Module60Desc=ステッカーの管理
+Module70Name=出張
+Module70Desc=出張の管理
 Module75Name=費用と旅行ノート
 Module75Desc=費用と出張·ノートの管理
 Module80Name=出荷
-Module80Desc=Shipments and delivery note management
-Module85Name=Banks & Cash
-Module85Desc=銀行や現金アカウントの管理
-Module100Name=External Site
-Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu.
+Module80Desc=出荷および納品書の管理
+Module85Name=銀行と現金
+Module85Desc=銀行や現金勘定の管理
+Module100Name=外部サイト
+Module100Desc=メインメニューアイコンとして外部Webサイトへのリンクを追加する。ウェブサイトはトップメニューの下のフレームに表示される。
 Module105Name=Mailmanとすする
 Module105Desc=メンバーモジュールのための郵便配達またはSPIPインタフェース
 Module200Name=LDAP
-Module200Desc=LDAP directory synchronization
+Module200Desc=LDAPディレクトリの同期
 Module210Name=PostNuke
 Module210Desc=PostNuke統合
-Module240Name=データのエクスポート
-Module240Desc=Tool to export Dolibarr data (with assistance)
+Module240Name=データをエクスポート
+Module240Desc=Dolibarrデータをエクスポートためのツール ( 支援あり ) 
 Module250Name=データのインポート
-Module250Desc=Tool to import data into Dolibarr (with assistance)
+Module250Desc=Dolibarrにデータをインポートするためのツール ( 支援あり ) 
 Module310Name=メンバー
 Module310Desc=財団のメンバーの管理
 Module320Name=RSSフィード
-Module320Desc=Add a RSS feed to Dolibarr pages
-Module330Name=Bookmarks & Shortcuts
-Module330Desc=Create shortcuts, always accessible, to the internal or external pages to which you frequently access
-Module400Name=Projects or Leads
-Module400Desc=Management of projects, leads/opportunities and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
+Module320Desc=DolibarrページにRSSフィードを追加する
+Module330Name=ブックマークとショートカット
+Module330Desc=頻繁にアクセスする内部ページまたは外部ページへのショートカットを常にアクセスできるように作成する
+Module400Name=プロジェクトまたは引合
+Module400Desc=プロジェクト、引合/商談 および/または タスクの管理。また、任意の要素 ( 請求、注文、提案、出張など ) をプロジェクトに割り当て、プロジェクトビューから横断ビューを取得することもできる。
 Module410Name=のwebcalendar
 Module410Desc=のwebcalendar統合
-Module500Name=Taxes & Special Expenses
-Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
-Module510Name=Salaries
-Module510Desc=Record and track employee payments
-Module520Name=Loans
-Module520Desc=Management of loans
-Module600Name=Notifications on business event
-Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
-Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
-Module610Name=Product Variants
-Module610Desc=Creation of product variants (color, size etc.)
+Module500Name=税金と特別経費
+Module500Desc=その他の費用の管理 ( 消費税、社会税または財政税、配当金など ) 
+Module510Name=給与
+Module510Desc=従業員の支払いを記録および追跡する
+Module520Name=ローン
+Module520Desc=ローンの管理
+Module600Name=ビジネスイベントのお知らせ
+Module600Desc=ビジネスイベントによってトリガーされる電子メール通知を送信する：ユーザごと ( 各ユーザで定義された設定 ) 、取引先の連絡先ごと ( 各取引先で定義された設定 ) 、または特定の電子メール
+Module600Long=このモジュールは、特定のビジネスイベントが発生したときにリアルタイムで電子メールを送信することに注意すること。アジェンダイベントの電子メールリマインダーを送信する機能を探している場合は、モジュールアジェンダの設定に移動する。
+Module610Name=製品バリエーション
+Module610Desc=製品バリエーションの作成 ( 色、サイズなど ) 
 Module700Name=寄付
 Module700Desc=寄付金の管理
-Module770Name=Expense Reports
-Module770Desc=Manage expense reports claims (transportation, meal, ...)
-Module1120Name=Vendor Commercial Proposals
-Module1120Desc=Request vendor commercial proposal and prices
+Module770Name=経費報告書
+Module770Desc=経費報告書の請求を管理する ( 輸送、食事、... ) 
+Module1120Name=仕入先の商業提案
+Module1120Desc=仕入先の商業提案と価格を要求する
 Module1200Name=カマキリ
 Module1200Desc=カマキリの統合
-Module1520Name=Document Generation
-Module1520Desc=Mass email document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1520Name=ドキュメントの生成
+Module1520Desc=大量の電子メールドキュメントの生成
+Module1780Name=タグ/カテゴリ
+Module1780Desc=タグ/カテゴリ ( 製品、顧客、サプライヤー、連絡先、またはメンバー ) を作成する
 Module2000Name=WYSIWYGエディタ
-Module2000Desc=Allow text fields to be edited/formatted using CKEditor (html)
-Module2200Name=Dynamic Prices
-Module2200Desc=Use maths expressions for auto-generation of prices
-Module2300Name=Scheduled jobs
-Module2300Desc=Scheduled jobs management (alias cron or chrono table)
-Module2400Name=Events/Agenda
-Module2400Desc=Track events. Log automatic events for tracking purposes or record manual events or meetings. This is the principal module for good Customer or Vendor Relationship Management.
+Module2000Desc=CKEditor ( html ) を使用してテキストフィールドを編集/フォーマットできるようにする
+Module2200Name=ダイナミックプライシング
+Module2200Desc=価格の自動生成に数式を使用する
+Module2300Name=スケジュールされたジョブ
+Module2300Desc=スケジュールされたジョブ管理 ( 別名cronまたはクロノテーブル ) 
+Module2400Name=イベント/議題
+Module2400Desc=トラック競技。追跡目的で自動イベントをログに記録するか、手動のイベントまたは会議を記録する。これは、優れた顧客または仕入先関係管理の主要なモジュール。
 Module2500Name=DMS / ECM
-Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Only Purchase orders are currently supported.)
+Module2500Desc=ドキュメント管理システム/電子コンテンツ管理。生成または保存されたドキュメントの自動編成。必要なときに共有すること。
+Module2600Name=API / Webサービス ( SOAPサーバー ) 
+Module2600Desc=APIサービスを提供するDolibarrSOAPサーバーを有効にする
+Module2610Name=API / Webサービス ( RESTサーバー ) 
+Module2610Desc=APIサービスを提供するDolibarrRESTサーバーを有効にする
+Module2660Name=Webサービスの呼び出し ( SOAPクライアント ) 
+Module2660Desc=Dolibarr Webサービスクライアントを有効にする ( データ/要求を外部サーバーにプッシュするために使用できる。現在サポートされているのは発注書のみ  ) 。
 Module2700Name=グラバター
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Needs Internet access
-Module2800Desc=FTP Client
+Module2700Desc=オンラインのGravatarサービス ( www.gravatar.com ) を使用して、ユーザ/メンバーの写真を表示する ( メールに記載されている ) 。インターネットアクセスが必要
+Module2800Desc=FTPクライアント
 Module2900Name=GeoIPMaxmind
 Module2900Desc=のGeoIP Maxmindの変換機能
-Module3200Name=Unalterable Archives
-Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3200Name=変更不可能なアーカイブ
+Module3200Desc=ビジネスイベントの変更不可能なログを有効にする。イベントはリアルタイムでアーカイブされる。ログは、エクスポート可能な連鎖イベントの読み取り専用テーブル。このモジュールは、国によっては必須の場合がある。
 Module4000Name=HRM
-Module4000Desc=Human resources management (management of department, employee contracts and feelings)
-Module5000Name=マルチ会社
-Module5000Desc=あなたが複数の企業を管理することができます
-Module6000Name=Workflow
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
-Module10000Name=Websites
-Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
-Module20000Name=Leave Request Management
-Module20000Desc=Define and track employee leave requests
-Module39000Name=Product Lots
-Module39000Desc=Lots, serial numbers, eat-by/sell-by date management for products
-Module40000Name=Multicurrency
-Module40000Desc=Use alternative currencies in prices and documents
+Module4000Desc=人事管理 ( 部門の管理、従業員の契約と感情 ) 
+Module5000Name=マルチ法人
+Module5000Desc=あなたが複数の企業を管理することができる
+Module6000Name=ワークフロー
+Module6000Desc=ワークフロー管理 ( オブジェクトの自動作成および/または自動ステータス変更 ) 
+Module10000Name=ウェブサイト
+Module10000Desc=WYSIWYGエディターを使用してWebサイト ( 公開 ) を作成する。これはウェブマスターまたは開発者向けのCMS  ( HTMLとCSS言語を知っている方が良い  ) 。専用のDolibarrディレクトリを指すようにWebサーバー ( Apache、Nginxなど ) を設定するだけで、独自のドメイン名を使用してインターネット上でオンラインにできる。
+Module20000Name=リクエスト管理を終了
+Module20000Desc=従業員の休暇申請を定義および追跡する
+Module39000Name=製品ロット
+Module39000Desc=製品のロット、シリアル番号、イートバイ/セルバイ日付管理
+Module40000Name=多通貨
+Module40000Desc=価格とドキュメントで代替通貨を使用する
 Module50000Name=切符売り場
-Module50000Desc=Offer customers a PayBox online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50000Desc=PayBoxオンライン支払いページ ( クレジット/デビットカード ) を顧客に提供する。これを使用して、顧客がアドホック支払いまたは特定のDolibarrオブジェクト ( 請求書、注文など ) に関連する支払いを行えるようにすることができる。
 Module50100Name=POS SimplePOS
-Module50100Desc=Point of Sale module SimplePOS (simple POS).
+Module50100Desc=POSモジュールSimplePOS ( シンプルPOS ) 。
 Module50150Name=POS TakePOS
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+Module50150Desc=POSモジュールTakePOS ( タッチスクリーンPOS、ショップ、バー、レストラン用 ) 。
 Module50200Name=ペイパル
-Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
-Module50300Name=Stripe
-Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
-Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50200Desc=顧客にPayPalオンライン支払いページ ( PayPalアカウントまたはクレジット/デビットカード ) を提供する。これを使用して、顧客がアドホック支払いまたは特定のDolibarrオブジェクト ( 請求書、注文など ) に関連する支払いを行えるようにすることができる。
+Module50300Name=縞
+Module50300Desc=Stripeオンライン支払いページ ( クレジット/デビットカード ) を顧客に提供する。これを使用して、顧客がアドホック支払いまたは特定のDolibarrオブジェクト ( 請求書、注文など ) に関連する支払いを行えるようにすることができる。
+Module50400Name=会計 ( 複式簿記 ) 
+Module50400Desc=会計管理 ( ダブルエントリ、一般および子会社の元帳をサポート ) 。元帳を他のいくつかの会計ソフトウェア形式でエクスポートする。
 Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
-Module55000Name=Poll, Survey or Vote
-Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
-Module59000Name=Margins
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
+Module54000Desc=Cups IPPインターフェイスを使用した ( ドキュメントを開かずに ) 直接印刷 ( プリンターはサーバーから見える必要があり、CUPSはサーバーにインストールされている必要がある ) 。
+Module55000Name=投票、調査または投票
+Module55000Desc=オンライン投票、調査、投票を作成する ( Doodle、スタッド、RDVzなど ) 
+Module59000Name=マージン
+Module59000Desc=マージンを管理するモジュール
+Module60000Name=手数料
+Module60000Desc=手数料を管理するモジュール
 Module62000Name=インコタームズ
-Module62000Desc=Add features to manage Incoterms
+Module62000Desc=インコタームズを管理する機能を追加する
 Module63000Name=資源
-Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
+Module63000Desc=イベントに割り当てるためのリソース ( プリンター、車、部屋など ) を管理する
 Permission11=顧客の請求書をお読みください
 Permission12=顧客の請求書を作成/変更
-Permission13=顧客の請求書をUnvalidate
+Permission13=顧客の請求書を無効にする
 Permission14=顧客の請求書を検証する
 Permission15=電子メールで顧客の請求書を送る
-Permission16=顧客の請求書の支払いを作成します。
-Permission19=顧客の請求書を削除します。
+Permission16=顧客の請求書の支払いを作成する。
+Permission19=顧客の請求書を削除する。
 Permission21=商業的な提案を読む
 Permission22=商業的な提案を作成/変更
 Permission24=商業的な提案を検証する
 Permission25=商業的な提案を送る
 Permission26=商業的な提案を閉じる
-Permission27=商業的な提案を削除します。
-Permission28=商業的な提案をエクスポートする
+Permission27=商業的な提案を削除する。
+Permission28=売買提案書をエクスポート
 Permission31=製品をお読みください
 Permission32=製品を作成/変更
-Permission34=製品を削除します。
-Permission36=隠された製品を参照してください/管理
-Permission38=輸出製品
-Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
-Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects I'm contact for)
-Permission45=Export projects
-Permission61=介入を読む
-Permission62=介入を作成/変更
-Permission64=介入を削除します。
-Permission67=輸出の介入
+Permission34=製品を削除する。
+Permission36=隠された製品を参照すること/管理
+Permission38=製品をエクスポート
+Permission39=最低価格を無視する
+Permission41=プロジェクトとタスクを読みます ( 共有プロジェクトと私が連絡しているプロジェクト ) 。割り当てられたタスクで、私または私の階層に費やされた時間を入力することもできる ( タイムシート ) 
+Permission42=プロジェクトを作成/変更する ( 共有プロジェクトと連絡先のプロジェクト ) 。タスクを作成し、ユーザをプロジェクトとタスクに割り当てることもできる
+Permission44=プロジェクトを削除する ( 共有プロジェクトと連絡先のプロジェクト ) 
+Permission45=プロジェクトをエクスポート
+Permission61=出張を読む
+Permission62=出張を作成/変更
+Permission64=出張を削除する。
+Permission67=出張をエクスポート
+Permission68=電子メールで出張を送信する
+Permission69=出張を検証する
+Permission70=出張を無効にする
 Permission71=メンバを読み取る
 Permission72=メンバーを作成/変更
 Permission74=メンバーを削除する
-Permission75=Setup types of membership
-Permission76=Export data
+Permission75=メンバーシップの種類を設定する
+Permission76=データをエクスポート
 Permission78=サブスクリプションを読む
 Permission79=サブスクリプションを作成/変更
 Permission81=お客様の注文を読み取る
@@ -710,59 +720,60 @@ Permission86=お客様の注文を送る
 Permission87=閉じるお客さまの注文
 Permission88=お客様の注文を取り消す
 Permission89=お客様の注文を削除する
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
+Permission91=社会税または財政税と付加価値税を読む
+Permission92=社会税または財政税と付加価値税を作成/変更する
+Permission93=社会税または財政税と付加価値税を削除する
+Permission94=社会税または財政税をエクスポート
 Permission95=レポートを読む
 Permission101=sendingsを読む
 Permission102=sendingsを作成/変更
 Permission104=sendingsを検証する
-Permission106=Export sendings
-Permission109=sendingsを削除します。
+Permission105=メールで送信する
+Permission106=送信録をエクスポート
+Permission109=sendingsを削除する。
 Permission111=金融勘定を読む
 Permission112=作成/変更/削除して取引を比較する
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconcile transactions
-Permission115=輸出取引と口座のステートメント
+Permission113=金融勘定の設定 ( カテゴリの作成、管理 ) 
+Permission114=トランザクションを調整する
+Permission115=取引と口座ステートメントをエクスポート
 Permission116=アカウント間の転送
-Permission117=Manage checks dispatching
-Permission121=ユーザーにリンクされている第三者を読む
-Permission122=ユーザーにリンクされている第三者が作成/変更
-Permission125=ユーザーにリンクされている第三者を削除します。
-Permission126=第三者をエクスポートします。
-Permission141=Read all projects and tasks (also private projects for which I am not a contact)
-Permission142=Create/modify all projects and tasks (also private projects for which I am not a contact)
-Permission144=Delete all projects and tasks (also private projects i am not contact for)
+Permission117=小切手の発送を管理する
+Permission121=ユーザにリンクされている取引先を読む
+Permission122=ユーザにリンクされている取引先が作成/変更
+Permission125=ユーザにリンクされている取引先を削除する。
+Permission126=取引先をエクスポート
+Permission141=すべてのプロジェクトとタスクを読む ( 私が連絡先ではないプライベートプロジェクトも ) 
+Permission142=すべてのプロジェクトとタスクを作成/変更する ( 私が連絡先ではないプライベートプロジェクトも ) 
+Permission144=すべてのプロジェクトとタスクを削除する ( 私が連絡していないプライベートプロジェクトも削除する ) 
 Permission146=プロバイダを読む
 Permission147=統計を読む
-Permission151=Read direct debit payment orders
-Permission152=Create/modify a direct debit payment orders
-Permission153=Send/Transmit direct debit payment orders
-Permission154=Record Credits/Rejections of direct debit payment orders
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
+Permission151=口座振替の支払い注文を読む
+Permission152=口座振替の支払い注文を作成/変更する
+Permission153=口座振替の支払い注文の送信/送信
+Permission154=口座振替の支払い注文のクレジット/拒否を記録する
+Permission161=契約/サブスクリプションを読む
+Permission162=契約/サブスクリプションを作成/変更する
+Permission163=契約のサービス/サブスクリプションをアクティブ化する
+Permission164=契約のサービス/サブスクリプションを無効にする
+Permission165=契約/サブスクリプションを削除する
+Permission167=契約をエクスポート
+Permission171=旅行と経費を読む ( あなたとあなたの部下 ) 
+Permission172=旅行と経費を作成/変更する
+Permission173=旅行と経費を削除する
+Permission174=すべての旅行と経費を読む
+Permission178=旅行と経費をエクスポート
 Permission180=仕入先を読む
-Permission181=Read purchase orders
-Permission182=Create/modify purchase orders
-Permission183=Validate purchase orders
-Permission184=Approve purchase orders
-Permission185=Order or cancel purchase orders
-Permission186=Receive purchase orders
-Permission187=Close purchase orders
-Permission188=Cancel purchase orders
+Permission181=注文書を読む
+Permission182=注文書を作成/変更する
+Permission183=注文書を検証する
+Permission184=注文書を承認する
+Permission185=注文書の注文またはキャンセル
+Permission186=注文書を受け取る
+Permission187=注文書を閉じる
+Permission188=注文書をキャンセルする
 Permission192=線を作成する
 Permission193=線をキャンセルする
-Permission194=Read the bandwidth lines
+Permission194=帯域幅の線を読む
 Permission202=ADSL接続を作成する
 Permission203=順序接続順序
 Permission204=順序接続
@@ -771,290 +782,316 @@ Permission206=接続を読み取る
 Permission211=テレフォニーを読む
 Permission212=注文明細行
 Permission213=ラインをアクティブにする
-Permission214=セットアップテレフォニー
-Permission215=セットアップ·プロバイダー
+Permission214=設定テレフォニー
+Permission215=設定·プロバイダー
 Permission221=emailingsを読む
-Permission222=作成/変更emailings（トピック、受信...）
-Permission223=（送信できます）emailingsを検証
-Permission229=emailingsを削除します。
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
+Permission222=作成/変更emailings ( トピック、受信... ) 
+Permission223= ( 送信できる ) emailingsを検証
+Permission229=emailingsを削除する。
+Permission237=受信者と情報を表示する
+Permission238=手動でメールを送信する
+Permission239=検証後または送信後にメーリングを削除する
 Permission241=カテゴリを読む
 Permission242=カテゴリを作成/変更
-Permission243=カテゴリを削除します。
-Permission244=隠されたカテゴリの内容を参照してください。
-Permission251=他のユーザーおよびグループを読む
-PermissionAdvanced251=他のユーザーを読む
-Permission252=他のユーザーの読み取り権限を
-Permission253=Create/modify other users, groups and permissions
-PermissionAdvanced253=内部/外部ユーザーおよびアクセス許可を作成/変更
-Permission254=変更の作成/外部ユーザーのみ
-Permission255=他のユーザーのパスワードを変更する
-Permission256=他のユーザーを削除するか、または無効にする
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission243=カテゴリを削除する。
+Permission244=隠されたカテゴリの内容を参照すること。
+Permission251=他のユーザおよびグループを読む
+PermissionAdvanced251=他のユーザを読む
+Permission252=他のユーザの読み取り権限を
+Permission253=他のユーザ、グループ、権限を作成/変更する
+PermissionAdvanced253=内部/外部ユーザおよびアクセス許可を作成/変更
+Permission254=変更の作成/外部ユーザのみ
+Permission255=他のユーザのパスワードを変更する
+Permission256=他のユーザを削除するか、または無効にする
+Permission262=すべての取引先 ( そのユーザが営業担当者である取引先だけでなく ) へのアクセスを拡張する。 <br>外部ユーザには効果的ではない ( 提案、注文、請求書、契約などについては常に自分自身に限定される ) 。 <br>プロジェクトには効果的ではない ( プロジェクトの権限、可視性、および割り当てに関するルールのみが重要  ) 。
 Permission271=CAを読む
 Permission272=請求書をお読みください
 Permission273=問題の請求書
 Permission281=連絡先をお読みください
 Permission282=の作成/変更連絡先
 Permission283=連絡先を削除
-Permission286=連絡先のエクスポート
+Permission286=連絡先をエクスポート
 Permission291=関税を読む
 Permission292=関税のアクセス許可を設定する
-Permission293=Modify customer's tariffs
-Permission300=Read barcodes
-Permission301=Create/modify barcodes
-Permission302=Delete barcodes
+Permission293=顧客の料金を変更する
+Permission300=バーコードを読む
+Permission301=バーコードを作成/変更する
+Permission302=バーコードを削除する
 Permission311=サービスを読む
-Permission312=Assign service/subscription to contract
+Permission312=契約にサービス/サブスクリプションを割り当てる
 Permission331=ブックマークを読み込む
 Permission332=ブックマークを作成/変更
 Permission333=ブックマークを削除
 Permission341=独自の読み取りアクセス許可を
-Permission342=自分のユーザー情報を作成/変更
+Permission342=自分のユーザ情報を作成/変更
 Permission343=自分のパスワードを変更する
 Permission344=独自のパーミッションを変更する
 Permission351=グループを読む
 Permission352=グループの読み取りアクセス許可を
 Permission353=グループを作成/変更
 Permission354=グループを削除するか、または無効にする
-Permission358=ユーザーのエクスポート
+Permission358=ユーザをエクスポート
 Permission401=割引を読む
 Permission402=割引を作成/変更
 Permission403=割引を検証する
-Permission404=割引を削除します。
-Permission430=Use Debug Bar
-Permission511=Read payments of salaries
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
+Permission404=割引を削除する。
+Permission430=デバッグバーを使用する
+Permission511=給与の支払いを見る（自分と部下）
+Permission512=給与の支払いを作成/変更する
+Permission514=給与の支払いを削除する
+Permission517=全員の給料支払いを見る
+Permission519=給与をエクスポート
+Permission520=ローンを読む
+Permission522=ローンの作成/変更
+Permission524=ローンを削除する
+Permission525=アクセスローン計算機
+Permission527=ローンをエクスポート
 Permission531=サービスを読む
 Permission532=サービスを作成/変更
 Permission534=サービスを削除する
-Permission536=隠されたサービスを参照してください/管理
-Permission538=輸出サービス
-Permission561=Read payment orders by credit transfer
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
-Permission564=Record Debits/Rejections of credit transfer
-Permission650=Read Bills of Materials
-Permission651=Create/Update Bills of Materials
-Permission652=Delete Bills of Materials
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
+Permission536=隠されたサービスを参照すること/管理
+Permission538=サービスをエクスポート
+Permission561=クレジット転送による支払い注文の読み取り
+Permission562=クレジット転送による支払い注文の作成/変更
+Permission563=クレジット転送による支払い注文の送信/送信
+Permission564=借方/貸方振込の拒否を記録する
+Permission601=ステッカーを読む
+Permission602=ステッカーを作成/変更する
+Permission609=ステッカーを削除する
+Permission650=部品表を読む
+Permission651=部品表の作成/更新
+Permission652=部品表を削除する
+Permission660=製造オーダー ( MO ) を読む
+Permission661=製造指図 ( MO ) の作成/更新
+Permission662=製造オーダー ( MO ) の削除
 Permission701=寄付を読む
 Permission702=寄付を作成/変更
-Permission703=寄付を削除します。
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
-Permission778=Create/modify expense reports of everybody
-Permission779=Export expense reports
+Permission703=寄付を削除する。
+Permission771=経費報告書を読む ( あなたとあなたの部下 ) 
+Permission772=経費報告書の作成/変更
+Permission773=経費報告書を削除する
+Permission774=すべての経費報告書を読む ( 部下ではないユーザの場合でも ) 
+Permission775=経費報告書を承認する
+Permission776=経費報告書の支払い
+Permission777=みんなの経費報告書を読む
+Permission778=全員の経費報告書を作成/変更する
+Permission779=経費報告書をエクスポート
 Permission1001=株式を読む
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=倉庫の作成/変更
+Permission1003=倉庫を削除する
 Permission1004=株式の動きを読む
 Permission1005=株式の動きを作成/変更
-Permission1101=Read delivery receipts
-Permission1102=Create/modify delivery receipts
-Permission1104=Validate delivery receipts
-Permission1109=Delete delivery receipts
-Permission1121=Read supplier proposals
-Permission1122=Create/modify supplier proposals
-Permission1123=Validate supplier proposals
-Permission1124=Send supplier proposals
-Permission1125=Delete supplier proposals
-Permission1126=Close supplier price requests
+Permission1101=配達領収書を読む
+Permission1102=配達領収書を作成/変更する
+Permission1104=配達領収書を検証する
+Permission1109=領収書を削除する
+Permission1121=サプライヤーの提案を読む
+Permission1122=サプライヤー提案の作成/変更
+Permission1123=サプライヤーの提案を検証する
+Permission1124=サプライヤーの提案を送信する
+Permission1125=サプライヤー提案を削除する
+Permission1126=サプライヤーの価格要求を閉じる
 Permission1181=仕入先を読む
-Permission1182=Read purchase orders
-Permission1183=Create/modify purchase orders
-Permission1184=Validate purchase orders
-Permission1185=Approve purchase orders
-Permission1186=Order purchase orders
-Permission1187=Acknowledge receipt of purchase orders
-Permission1188=Delete purchase orders
-Permission1190=Approve (second approval) purchase orders
+Permission1182=注文書を読む
+Permission1183=注文書を作成/変更する
+Permission1184=注文書を検証する
+Permission1185=注文書を承認する
+Permission1186=注文書を注文する
+Permission1187=注文書の受領を確認する
+Permission1188=注文書を削除する
+Permission1189=注文書の受付を確認/確認解除する
+Permission1190=発注書を承認 ( 2回目の承認 ) する
+Permission1191=サプライヤーの注文とその属性をエクスポート
 Permission1201=エクスポートの結果を得る
 Permission1202=エクスポートを作成/変更
-Permission1231=Read vendor invoices
-Permission1232=Create/modify vendor invoices
-Permission1233=Validate vendor invoices
-Permission1234=Delete vendor invoices
-Permission1235=Send vendor invoices by email
-Permission1236=Export vendor invoices, attributes and payments
-Permission1237=Export purchase orders and their details
-Permission1251=データベース（データロード）に外部データの大量インポートを実行する
-Permission1321=顧客の請求書、属性、および支払いをエクスポートする
-Permission1322=Reopen a paid bill
-Permission1421=Export sales orders and attributes
-Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
-Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
-Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
-Permission2411=他のアクション（イベントまたはタスク）を読む
-Permission2412=他のアクション（イベントまたはタスク）を作成/変更
-Permission2413=他のアクション（イベントまたはタスク）を削除
-Permission2414=Export actions/tasks of others
+Permission1231=仕入先の請求書を読む
+Permission1232=仕入先の請求書を作成/変更する
+Permission1233=仕入先の請求書を検証する
+Permission1234=仕入先の請求書を削除する
+Permission1235=メールで仕入先の請求書を送信する
+Permission1236=仕入先の請求書、属性、支払いをエクスポート
+Permission1237=注文書とその詳細をエクスポート
+Permission1251=データベース ( データロード ) に外部データの大量インポートを実行する
+Permission1321=顧客の請求書、属性、および支払いをエクスポート
+Permission1322=支払い済みの請求書を再開する
+Permission1421=受注と属性をエクスポート
+Permission1521=ドキュメントを読む
+Permission1522=ドキュメントを削除する
+Permission2401=ユーザアカウントにリンクされているアクション ( イベントまたはタスク ) を読み取ります ( イベントの所有者または割り当てられたばかりの場合 ) 
+Permission2402=ユーザアカウントにリンクされたアクション ( イベントまたはタスク ) を作成/変更する ( イベントの所有者の場合 ) 
+Permission2403=ユーザアカウントにリンクされているアクション ( イベントまたはタスク ) を削除する ( イベントの所有者の場合 ) 
+Permission2411=他のアクション ( イベントまたはタスク ) を読む
+Permission2412=他のアクション ( イベントまたはタスク ) を作成/変更
+Permission2413=他のアクション ( イベントまたはタスク ) を削除
+Permission2414=他の人のアクション/タスクをエクスポート
 Permission2501=ドキュメントを読む/ダウンロード
 Permission2502=ドキュメントをダウンロードする
 Permission2503=書類の提出または削除
-Permission2515=セットアップのドキュメントディレクトリ
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
-Permission3200=Read archived events and fingerprints
-Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission10001=Read website content
-Permission10002=Create/modify website content (html and javascript content)
-Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
-Permission10005=Delete website content
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
-Permission20007=Approve leave requests
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission2515=設定のドキュメントディレクトリ
+Permission2801=FTPクライアントを読み取りモードで使用する ( 参照およびダウンロードのみ ) 
+Permission2802=FTPクライアントを書き込みモードで使用する ( ファイルを削除またはアップロードする ) 
+Permission3200=アーカイブされたイベントとフィンガープリントを読む
+Permission3301=新規モジュールを生成する
+Permission4001=従業員を見る
+Permission4002=従業員を作成する
+Permission4003=従業員を削除する
+Permission4004=従業員をエクスポート
+Permission10001=ウェブサイトのコンテンツを読む
+Permission10002=ウェブサイトのコンテンツ ( htmlおよびjavascriptコンテンツ ) を作成/変更する
+Permission10003=Webサイトのコンテンツ ( 動的PHPコード ) を作成/変更する。危険。制限された開発者に予約する必要がある。
+Permission10005=ウェブサイトのコンテンツを削除する
+Permission20001=休暇申請書 ( あなたの休暇と部下の休暇 ) を読む
+Permission20002=休暇申請 ( 休暇と部下の休暇 ) を作成/変更する
+Permission20003=休暇申請を削除する
+Permission20004=すべての休暇申請を読む ( 部下ではないユーザも ) 
+Permission20005=すべての人 ( 部下ではないユーザも含む ) の休暇申請を作成/変更する
+Permission20006=休職申請 ( 残高の設定と更新 ) 
+Permission20007=休暇申請を承認する
+Permission23001=スケジュールされたジョブを読む
+Permission23002=スケジュールされたジョブの作成/更新
+Permission23003=スケジュールされたジョブを削除する
+Permission23004=スケジュールされたジョブを実行する
+Permission50101=POS ( SimplePOS ) を使用する
+Permission50151=POS ( TakePOS ) を使用する
 Permission50201=トランザクションを読む
 Permission50202=輸入取引
-Permission50401=Bind products and invoices with accounting accounts
-Permission50411=Read operations in ledger
-Permission50412=Write/Edit operations in ledger
-Permission50414=Delete operations in ledger
-Permission50415=Delete all operations by year and journal in ledger
-Permission50418=Export operations of the ledger
-Permission50420=Report and export reports (turnover, balance, journals, ledger)
-Permission50430=Define fiscal periods. Validate transactions and close fiscal periods.
-Permission50440=Manage chart of accounts, setup of accountancy
-Permission51001=Read assets
-Permission51002=Create/Update assets
-Permission51003=Delete assets
-Permission51005=Setup types of asset
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
-DictionaryCompanyType=Third-party types
-DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect potential level for companies
-DictionaryProspectContactLevel=Prospect potential level for contacts
-DictionaryCanton=States/Provinces
+Permission50330=Zapierのオブジェクトを読む
+Permission50331=Zapierのオブジェクトを作成/更新する
+Permission50332=Zapierのオブジェクトを削除する
+Permission50401=製品と請求書を会計アカウントにバインドする
+Permission50411=元帳の読み取り操作
+Permission50412=元帳での書き込み/編集操作
+Permission50414=元帳の削除操作
+Permission50415=年ごとのすべての操作と元帳の仕訳を削除する
+Permission50418=元帳の操作をエクスポート
+Permission50420=レポートとエクスポートレポート ( 売上高、残高、仕訳帳、元帳 ) 
+Permission50430=会計期間を定義する。トランザクションを検証し、会計期間を閉じる。
+Permission50440=勘定科目表の管理、会計の設定
+Permission51001=アセットを読む
+Permission51002=アセットの作成/更新
+Permission51003=アセットを削除する
+Permission51005=アセットの種類を設定する
+Permission54001=印刷
+Permission55001=世論調査を読む
+Permission55002=投票の作成/変更
+Permission59001=売上総利益を読む
+Permission59002=売上総利益を定義する
+Permission59003=すべてのユーザ粗利を読む
+Permission63001=リソースを読む
+Permission63002=リソースの作成/変更
+Permission63003=リソースを削除する
+Permission63004=リソースを議題イベントにリンクする
+Permission64001=直接印刷を許可する
+Permission67000=領収書の印刷を許可する
+Permission68001=コム内レポートを読む
+Permission68002=コム内レポートの作成/変更
+Permission68004=コム内レポートを削除する
+Permission941601=領収書を読んで
+Permission941602=領収書を作成および変更する
+Permission941603=領収書を検証する
+Permission941604=メールで領収書を送る
+Permission941605=領収書をエクスポート
+Permission941606=領収書を削除する
+DictionaryCompanyType=取引先種別
+DictionaryCompanyJuridicalType=取引先の法人
+DictionaryProspectLevel=企業の潜在的なレベル
+DictionaryProspectContactLevel=連絡先の見込みレベル
+DictionaryCanton=州/県
 DictionaryRegion=地域
 DictionaryCountry=国
 DictionaryCurrency=通貨
-DictionaryCivility=Honorific titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Types of social or fiscal taxes
+DictionaryCivility=敬称
+DictionaryActions=議題イベントの種類
+DictionarySocialContributions=社会税または財政税の種類
 DictionaryVAT=VATレートまたは販売税率
-DictionaryRevenueStamp=Amount of tax stamps
-DictionaryPaymentConditions=Payment Terms
-DictionaryPaymentModes=Payment Modes
+DictionaryRevenueStamp=税印紙の額
+DictionaryPaymentConditions=支払い条件
+DictionaryPaymentModes=支払いモード
 DictionaryTypeContact=種類をお問い合わせ
-DictionaryTypeOfContainer=Website - Type of website pages/containers
-DictionaryEcotaxe=Ecotax（WEEE）
+DictionaryTypeOfContainer=ウェブサイト-ウェブサイトのページ/コンテナの種類
+DictionaryEcotaxe=Ecotax ( WEEE ) 
 DictionaryPaperFormat=紙の形式
-DictionaryFormatCards=Card formats
-DictionaryFees=Expense report - Types of expense report lines
+DictionaryFormatCards=カードフォーマット
+DictionaryFees=経費報告書-経費報告書の行の種類
 DictionarySendingMethods=配送方法
-DictionaryStaff=Number of Employees
+DictionaryStaff=就業者数
 DictionaryAvailability=配達遅延
 DictionaryOrderMethods=注文方法
 DictionarySource=提案/受注の起源
-DictionaryAccountancyCategory=Personalized groups for reports
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryAccountancyJournal=Accounting journals
-DictionaryEMailTemplates=Email Templates
+DictionaryAccountancyCategory=レポート用にパーソナライズされたグループ
+DictionaryAccountancysystem=勘定科目表のモデル
+DictionaryAccountancyJournal=会計仕訳帳
+DictionaryEMailTemplates=メールテンプレート
 DictionaryUnits=ユニット
-DictionaryMeasuringUnits=Measuring Units
-DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect status for companies
-DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
-DictionaryOpportunityStatus=Lead status for project/lead
-DictionaryExpenseTaxCat=Expense report - Transportation categories
-DictionaryExpenseTaxRange=Expense report - Range by transportation category
-SetupSaved=セットアップは、保存された
-SetupNotSaved=Setup not saved
-BackToModuleList=Back to Module list
-BackToDictionaryList=Back to Dictionaries list
-TypeOfRevenueStamp=Type of tax stamp
-VATManagement=Sales Tax Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependant on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
-VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies.
-VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
+DictionaryMeasuringUnits=測定単位
+DictionarySocialNetworks=ソーシャルネットワーク
+DictionaryProspectStatus=企業の見通し状況
+DictionaryProspectContactStatus=連絡先の見込み客のステータス
+DictionaryHolidayTypes=休暇の種類
+DictionaryOpportunityStatus=プロジェクト/引合の引合ステータス
+DictionaryExpenseTaxCat=経費報告書-輸送カテゴリ
+DictionaryExpenseTaxRange=経費報告書-輸送カテゴリ別の範囲
+DictionaryTransportMode=Intracom レポート-トランスポートモード
+TypeOfUnit=ユニットの種類
+SetupSaved=設定は、保存された
+SetupNotSaved=設定が保存されていない
+BackToModuleList=モジュールリストに戻る
+BackToDictionaryList=辞書リストに戻る
+TypeOfRevenueStamp=税印紙の種類
+VATManagement=消費税管理
+VATIsUsedDesc=見込み客、請求書、注文などを作成するときのデフォルトでは、消費税率はアクティブな標準ルールに従いる。<br>売り手が消費税の対象ではない場合、消費税はデフォルトで0になる。ルールの終了。 <br> ( 販売者の国=購入者の国 ) の場合、デフォルトでは、消費税は販売者の国での製品の消費税と等しくなる。ルールの終わり。 <br>販売者と購入者の両方が欧州共同体にあり、商品が輸送関連製品 ( 運送、配送、航空法人 ) の場合、デフォルトのVATは0。このルールは販売者の国によって異なる。会計士にご相談ください。 VATは、売り手ではなく、買い手が自国の税関に支払う必要がある。ルールの終わり。 <br>売り手と買い手が両方とも欧州共同体にいて、買い手が法人ではない場合 ( コミュニティ内のVAT番号が登録されている場合 ) 、VATはデフォルトで売り手の国のVAT率になる。ルールの終わり。 <br>売り手と買い手の両方が欧州共同体にあり、買い手が法人 ( コミュニティ内のVAT番号が登録されている ) である場合、VATはデフォルトで0。ルールの終わり。 <br>その他の場合、提案されたデフォルトは消費税= 0。ルールの終わり。
+VATIsNotUsedDesc=デフォルトでは、提案された消費税は0であり、協会、個人、または中小企業などの場合に使用できる。
+VATIsUsedExampleFR=フランスでは、実際の財政システム ( 簡略化された実際または通常の実際 ) を持っている企業または組織を意味する。 VATが申告されるシステム。
+VATIsNotUsedExampleFR=フランスでは、消費税が申告されていない団体、または零細企業の財政システム ( フランチャイズの消費税 ) を選択し、消費税の申告なしでフランチャイズの消費税を支払った企業、組織、またはリベラルな職業を意味する。この選択により、請求書に「該当しない消費税-CGIのart-293B」という参照が表示される。
 ##### Local Taxes #####
-TypeOfSaleTaxes=Type of sales tax
+TypeOfSaleTaxes=消費税の種類
 LTRate=率
-LocalTax1IsNotUsed=Do not use second tax
-LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than first one)
-LocalTax1Management=Second type of tax
+LocalTax1IsNotUsed=二次税を使用しないこと
+LocalTax1IsUsedDesc=2番目の種別の税金 ( 最初の税金以外 ) を使用する
+LocalTax1IsNotUsedDesc=他の種類の税金 ( 最初の税金以外 ) を使用しないこと
+LocalTax1Management=2番目の種別の税金
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than first one)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than first one)
-LocalTax2Management=Third type of tax
+LocalTax2IsNotUsed=3番目税は不使用
+LocalTax2IsUsedDesc=税金の3番目種別 ( 最初の税金以外 ) を使用する
+LocalTax2IsNotUsedDesc=他の種類の税金 ( 最初の税金以外 ) を使用しないこと
+LocalTax2Management=税金の3番目種別
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
 LocalTax1ManagementES=RE管理
-LocalTax1IsUsedDescES=The RE rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
-LocalTax1IsNotUsedDescES=デフォルトでは、提案されたREは0です。ルールの終わり。
-LocalTax1IsUsedExampleES=スペインでは、彼らはスペイン語IAEのいくつかの特定のセクションの対象に専門家です。
-LocalTax1IsNotUsedExampleES=スペインでは、彼らは専門家と社会とスペインIAEの特定のセクションにあります。
+LocalTax1IsUsedDescES=見込み客、請求書、注文などを作成するときのデフォルトのREレートは、アクティブな標準ルールに従いる。<br>バイヤーがREの対象ではない場合、デフォルトでRE = 0。ルールの終わり。 <br>購入者がREの対象となる場合、デフォルトではREが適用される。ルールの終わり。 <br>
+LocalTax1IsNotUsedDescES=デフォルトでは、提案されたREは0。ルールの終わり。
+LocalTax1IsUsedExampleES=スペインでは、彼らはスペイン語IAEのいくつかの特定のセクションの対象に専門家。
+LocalTax1IsNotUsedExampleES=スペインでは、彼らは専門家と社会とスペインIAEの特定のセクションにある。
 LocalTax2ManagementES=IRPF管理
-LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
-LocalTax2IsNotUsedDescES=デフォルトでは、提案されたIRPFは0です。ルールの終わり。
+LocalTax2IsUsedDescES=見込み客、請求書、注文などを作成するときのデフォルトのIRPFレートは、アクティブな標準ルールに従いる。<br>販売者がIRPFの対象ではない場合、デフォルトでIRPF = 0になる。ルールの終わり。 <br>売り手がIRPFの対象となる場合、デフォルトでIRPFが適用される。ルールの終わり。 <br>
+LocalTax2IsNotUsedDescES=デフォルトでは、提案されたIRPFは0。ルールの終わり。
 LocalTax2IsUsedExampleES=スペインでは、フリーランサーとサービスモジュールの税制を選択した企業に提供する独立した専門家。
-LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
-UseRevenueStamp=Use a tax stamp
-UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
+LocalTax2IsNotUsedExampleES=スペインでは、それらはモジュールの税制の対象とならない企業。
+RevenueStampDesc=「税印紙」または「収入印紙」は、請求書ごとの固定税  ( 請求書の金額には依存しません ) 。パーセント税にすることもできるが、税印紙はレポートを提供しないため、パーセント税には2番目または3番目の種別の税を使用する方が適している。この種の税金を使用している国はごくわずか。
+UseRevenueStamp=税印紙を使用する
+UseRevenueStampExample=税印紙の値は、デフォルトで辞書の設定に定義されている ( %s --%s --%s ) 
+CalcLocaltax=地方税に関するレポート
+CalcLocaltax1=販売-購入
+CalcLocaltax1Desc=地方税レポートは、地方税の売上と地方税の購入の差で計算される
 CalcLocaltax2=購入
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
+CalcLocaltax2Desc=地方税レポートは、地方税の購入の合計。
 CalcLocaltax3=販売
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+CalcLocaltax3Desc=地方税レポートは地方税の売上の合計 
+NoLocalTaxXForThisCountry=税金の設定 ( %s --%s --%sを参照 ) によると、あなたの国はそのような種別の税金を使用する必要はない
 LabelUsedByDefault=ない翻訳がコードに見つからない場合、デフォルトで使用されるラベル
 LabelOnDocuments=ドキュメントのラベル
-LabelOrTranslationKey=Label or translation key
-ValueOfConstantKey=Value of a configuration constant
-NbOfDays=No. of days
+LabelOrTranslationKey=ラベルまたは翻訳キー
+ValueOfConstantKey=構成定数の値
+ConstantIsOn=オプション%sがオンになっている
+NbOfDays=日数
 AtEndOfMonth=今月末に
-CurrentNext=Current/Next
+CurrentNext=現在/次へ
 Offset=オフセット
 AlwaysActive=常にアクティブ
 Upgrade=アップグレード
 MenuUpgrade=拡張/アップグレード
-AddExtensionThemeModuleOrOther=Deploy/install external app/module
+AddExtensionThemeModuleOrOther=外部アプリ/モジュールをデプロイ/インストールする
 WebServer=ウェブサーバー
 DocumentRootServer=Webサーバーのルートディレクトリ
 DataRootServer=データファイルのディレクトリ
@@ -1068,557 +1105,563 @@ Database=データベース
 DatabaseServer=データベースのホスト
 DatabaseName=データベース名
 DatabasePort=データベースポート
-DatabaseUser=データベース·ユーザーの
+DatabaseUser=データベース·ユーザの
 DatabasePassword=データベースのパスワード
 Tables=テーブル
 TableName=テーブル名
-NbOfRecord=No. of records
+NbOfRecord=レコード数
 Host=サーバ
 DriverType=ドライバの種類
 SummarySystem=システム情報の概要
-SummaryConst=すべてのDolibarrセットアップパラメータのリスト
-MenuCompanySetup=Company/Organization
+SummaryConst=すべてのDolibarr設定パラメータのリスト
+MenuCompanySetup=法人/組織
 DefaultMenuManager= 標準メニューマネージャ
 DefaultMenuSmartphoneManager=スマートフォンメニューマネージャ
 Skin=皮膚のテーマ
 DefaultSkin=デフォルトのスキンテーマ
 MaxSizeList=リストの最大長
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (i.e. in customer card)
+DefaultMaxSizeList=リストのデフォルトの最大長
+DefaultMaxSizeShortList=短いリストのデフォルトの最大長 ( つまり、顧客カード内 ) 
 MessageOfDay=その日のメッセージ
 MessageLogin=ログインページのメッセージ
-LoginPage=Login page
-BackgroundImageLogin=Background image
+LoginPage=ログインページ
+BackgroundImageLogin=背景画像
 PermanentLeftSearchForm=左側のメニューの恒久的な検索フォーム
-DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
-EnableShowLogo=Show the company logo in the menu
-CompanyInfo=Company/Organization
-CompanyIds=Company/Organization identities
+DefaultLanguage=既定の言語
+EnableMultilangInterface=顧客または仕入先との関係に対する多言語サポートを有効にする
+EnableShowLogo=メニューに法人のロゴを表示する
+CompanyInfo=法人/組織
+CompanyIds=法人/組織のアイデンティティ
 CompanyName=名
 CompanyAddress=アドレス
 CompanyZip=ZIP
 CompanyTown=町
 CompanyCountry=国
 CompanyCurrency=主な通貨
-CompanyObject=Object of the company
-IDCountry=ID country
-Logo=Logo
-LogoDesc=Main logo of company. Will be used into generated documents (PDF, ...)
-LogoSquarred=Logo (squarred)
-LogoSquarredDesc=Must be a squarred icon (width = height). This logo will be used as the favorite icon or other need like for the top menu bar (if not disabled into display setup).
+CompanyObject=法人の目的
+IDCountry=ID国
+Logo=ロゴ
+LogoDesc=法人のメインロゴ。生成されたドキュメントに使用される ( PDF、... ) 
+LogoSquarred=ロゴ ( 二乗 ) 
+LogoSquarredDesc=角張ったアイコンである必要がある ( 幅=高さ ) 。このロゴは、お気に入りのアイコンまたはトップメニューバーのような他のニーズとして使用される ( ディスプレイ設定で無効にされていない場合 ) 。
 DoNotSuggestPaymentMode=示唆していない
 NoActiveBankAccountDefined=定義された有効な銀行口座なし
-OwnerOfBankAccount=銀行口座の%sの所有者
-BankModuleNotActive=銀行が有効になっていないモジュールを占めて
-ShowBugTrackLink=Show link "<strong>%s</strong>"
+OwnerOfBankAccount=銀行口座 %sの所有者
+BankModuleNotActive=銀行口座モジュールは無効
+ShowBugTrackLink=リンクを表示 "<strong> %s </strong>"
 Alerts=アラート
-DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
-DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Planned events (agenda events) not completed
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Planned task (project tasks) not completed
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Order not processed
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Purchase order not processed
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Proposal not closed
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposal not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Service to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Expired service
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Unpaid vendor invoice
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Unpaid customer invoice
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Check deposit not done
-Delays_MAIN_DELAY_EXPENSEREPORTS=Expense report to approve
-Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
-SetupDescription1=Before starting to use Dolibarr some initial parameters must be defined and modules enabled/configured.
-SetupDescription2=The following two sections are mandatory (the two first entries in the Setup menu):
-SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
-SetupDescription5=Other Setup menu entries manage optional parameters.
+DelaysOfToleranceBeforeWarning=次の警告アラートを表示する前に遅延する。
+DelaysOfToleranceDesc=後期要素のアラートアイコン%sが画面に表示されるまでの遅延を設定する。
+Delays_MAIN_DELAY_ACTIONS_TODO=予定されているイベント ( 議題イベント ) が完了していない
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=プロジェクトは時間内に終了しません
+Delays_MAIN_DELAY_TASKS_TODO=計画されたタスク ( プロジェクトタスク ) が完了していない
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=注文は処理されない
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=注文書は処理されない
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=提案はクローズされていない
+Delays_MAIN_DELAY_PROPALS_TO_BILL=提案は請求されない
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=アクティベートするサービス
+Delays_MAIN_DELAY_RUNNING_SERVICES=期限切れのサービス
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=未払いの仕入先の請求書
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=未払いの顧客請求書
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=保留中の銀行照合
+Delays_MAIN_DELAY_MEMBERS=会費の遅延
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=預金の確認が行われていない
+Delays_MAIN_DELAY_EXPENSEREPORTS=承認する経費報告書
+Delays_MAIN_DELAY_HOLIDAYS=承認のリクエストを残す
+SetupDescription1=Dolibarrの使用を開始する前に、いくつかの初期パラメーターを定義し、モジュールを有効化/構成する必要がある。
+SetupDescription2=次の2つのセクションは必須  ( 【設定】メニューの最初の2つのエントリ ) 。
+SetupDescription3= <a href="%s"> %s-> %s </a> <br> <br>アプリケーションのデフォルトの動作をカスタマイズするために使用される基本パラメーター ( 国関連の機能など ) 。
+SetupDescription4= <a href="%s"> %s-> %s </a> <br> <br>このソフトウェアは、多くのモジュール/アプリケーションのスイート。ニーズに関連するモジュールを有効にして構成する必要がある。これらのモジュールをアクティブにすると、メニューエントリが表示される。
+SetupDescription5=その他の設定メニューエントリは、オプションのパラメータを管理する。
 LogEvents=セキュリティ監査イベント
 Audit=監査
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-BrowserName=Browser name
-BrowserOS=Browser OS
+InfoDolibarr=Dolibarrについて
+InfoBrowser=ブラウザについて
+InfoOS=OSについて
+InfoWebServer=Webサーバーについて
+InfoDatabase=データベースについて
+InfoPHP=PHPについて
+InfoPerf=公演について
+InfoSecurity=セキュリティについて
+BrowserName=ブラウザ名
+BrowserOS=ブラウザOS
 ListOfSecurityEvents=Dolibarrセキュリティイベントのリスト
 SecurityEventsPurged=セキュリティイベントのパージ
-LogEventDesc=Enable logging for specific security events. Administrators the log via menu <b>%s - %s</b>. Warning, this feature can generate a large amount of data in the database.
-AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
-SystemInfoDesc=システム情報では、読み取り専用モードでのみ管理者の目に見える得るその他の技術情報です。
-SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
-CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
-AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
-AccountantFileNumber=Accountant code
-DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
-AvailableModules=Available app/modules
-ToActivateModule=モジュールを有効にするには、設定エリア（ホーム - &gt;セットアップ - &gt;モジュール）に行く。
+LogEventDesc=特定のセキュリティイベントのログを有効にする。管理者はメニュー<b>%s-%s</b>を介してログを記録する。警告、この機能はデータベースに大量のデータを生成する可能性がある。
+AreaForAdminOnly=設定パラメータは、<b>管理者ユーザ</b>のみが設定できる。
+SystemInfoDesc=システム情報では、読み取り専用モードでのみ管理者の目に見える得るその他の技術情報。
+SystemAreaForAdminOnly=この領域は、管理者ユーザのみが使用できる。 Dolibarrのユーザ権限は、この制限を変更できない。
+CompanyFundationDesc=あなたの法人/組織の情報を編集する。完了したら、ページの下部にある「%s」ボタンをクリックする。
+AccountantDesc=外部の会計士/簿記係がいる場合は、ここでその情報を編集できる。
+AccountantFileNumber=会計士コード
+DisplayDesc=Dolibarrの外観と動作に影響を与えるパラメータはここで変更できる。
+AvailableModules=利用可能なアプリ/モジュール
+ToActivateModule=モジュールを有効にするには、設定エリア ( ホーム - &gt;設定 - &gt;モジュール ) に行く。
 SessionTimeOut=セッションのタイムアウト
-SessionExplanation=This number guarantees that the session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guarantee that the session will expire after this delay. It will expire, after this delay, and when the session cleaner is run, so every <b>%s/%s</b> access, but only during access made by other sessions (if value is 0, it means clearing of session is done only by an external process).<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by an external setup, no matter what the value entered here is.
-SessionsPurgedByExternalSystem=Sessions on this server seems to be cleaned by an external mechanism (cron under debian, ubuntu ...), probably every <b>%s</b> seconds (= value of parameter <b>session.gc_maxlifetime</b>), so changing the value here has no effect. You must ask the server administrator to change session delay.
+SessionExplanation=この数値は、セッションクリーナーが内部PHPセッションクリーナーによって実行された場合 ( および他に何も実行されない場合 ) 、この遅延の前にセッションが期限切れにならないことを保証する。内部PHPセッションクリーナーは、この遅延後にセッションが期限切れになることを保証しません。この遅延の後、セッションクリーナーが実行されると期限切れになるため、すべての<b> %s / %s </b>アクセス中のみ が、他のセッションによるアクセス中のみ  ( 値が0の場合、セッションのクリアは外部によってのみ行われることを意味する ) 。処理する ) 。 <br>注：外部セッションクリーニングメカニズム ( debianのcron、ubuntu ... ) を備えた一部のサーバーでは、ここに入力した値に関係なく、外部設定で定義された期間が経過するとセッションが破棄される可能性がある。
+SessionsPurgedByExternalSystem=このサーバー上のセッションは、外部メカニズム ( debianの下のcron、ubuntu ... ) 、おそらく<b> %s </b>秒 ( =パラメーター<b>セッションの値changeing the value so.gc_maxlifetime a09a4b739f17f8 ) によってクリーンアップされているもよう。サーバー管理者にセッション遅延の変更を依頼する必要がある。
 TriggersAvailable=使用可能なトリガ
-TriggersDesc=Triggers are files that will modify the behavior of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realize new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
-TriggerDisabledByName=このファイル内のトリガはその名前に<b>-NORUN</b>サフィックスは無効になっています。
-TriggerDisabledAsModuleDisabled=モジュール<b>%sが</b>無効<b>になっ</b>ているとして、このファイル内のトリガーが無効になっています。
-TriggerAlwaysActive=このファイル内のトリガーがアクティブにDolibarrモジュールであれ、常にアクティブです。
-TriggerActiveAsModuleActive=モジュール<b>%sが</b>有効<b>になっ</b>ているとして、このファイル内のトリガーがアクティブになります。
-GeneratedPasswordDesc=Choose the method to be used for auto-generated passwords.
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting only.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=制限/精密セットアップ
-LimitsDesc=You can define limits, precisions and optimizations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max. decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max. decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max. decimals for prices <b>shown on screen</b>. Add an ellipsis <b>...</b> after this parameter (e.g. "2...") if you want to see "<b>...</b>" suffixed to the truncated price.
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something other than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
+TriggersDesc=トリガーは、ディレクトリ<b> htdocs / core / triggers</b>にコピーされるとDolibarrワークフローの動作を変更するファイル。彼らは、Dolibarrイベントでアクティブ化された新規アクション ( 新規法人の作成、請求書の検証など ) を実現する。
+TriggerDisabledByName=このファイル内のトリガはその名前に<b>-NORUN</b>サフィックスは無効になっている。
+TriggerDisabledAsModuleDisabled=モジュール<b>%sが</b>無効<b>になっ</b>ているとして、このファイル内のトリガーが無効になっている。
+TriggerAlwaysActive=このファイル内のトリガーがアクティブにDolibarrモジュールであれ、常にアクティブ。
+TriggerActiveAsModuleActive=モジュール<b>%sが</b>有効<b>になっ</b>ているとして、このファイル内のトリガーがアクティブになる。
+GeneratedPasswordDesc=自動生成されたパスワードに使用する方法を選択する。
+DictionaryDesc=すべての参照データを挿入する。デフォルトに値を追加できる。
+ConstDesc=このページでは、他のページでは使用できないパラメーターを編集 ( オーバーライド ) できる。これらは主に、開発者/高度なトラブルシューティング専用の予約済みパラメーター。
+MiscellaneousDesc=他のすべてのセキュリティ関連パラメータはここで定義される。
+LimitsSetup=制限/精密設定
+LimitsDesc=Dolibarrが使用する制限、精度、最適化をここで定義できる
+MAIN_MAX_DECIMALS_UNIT=最大単価の小数
+MAIN_MAX_DECIMALS_TOT=最大合計価格の小数
+MAIN_MAX_DECIMALS_SHOWN=最大画面</b>に表示される価格<b>の小数。切り捨てられた価格の末尾に「<b> ... </b>」を付ける場合は、このパラメーターの後に省略記号<b> ... </b>を追加する ( 例：「2 ...」 ) 。
+MAIN_ROUNDING_RULE_TOT=丸め範囲のステップ ( 基数10以外で丸めが行われる国の場合。たとえば、丸めが0.05ステップで行われる場合は0.05を入力する ) 
 UnitPriceOfProduct=製品の売上単価
-TotalPriceAfterRounding=Total price (excl/vat/incl tax) after rounding
+TotalPriceAfterRounding=四捨五入後の合計金額 ( 税込/付加価値税/税込 ) 
 ParameterActiveForNextInputOnly=次の入力のための効果的なパラメータのみ
-NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit has not been enabled in the "Setup - Security - Events" page.
-NoEventFoundWithCriteria=No security event has been found for this search criteria.
-SeeLocalSendMailSetup=ローカルのsendmailの設定を参照してください。
-BackupDesc=A <b>complete</b> backup of a Dolibarr installation requires two steps.
-BackupDesc2=Backup the contents of the "documents" directory (<b>%s</b>) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
-BackupDesc3=Backup the structure and contents of your database (<b>%s</b>) into a dump file. For this, you can use the following assistant.
-BackupDescX=The archived directory should be stored in a secure place.
-BackupDescY=生成されたダンプ·ファイルは安全な場所に格納する必要があります。
-BackupPHPWarning=Backup cannot be guaranteed with this method. Previous one recommended.
-RestoreDesc=To restore a Dolibarr backup, two steps are required.
-RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
-RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
-RestoreMySQL=MySQL import
-ForcedToByAModule= このルールがアクティブ化モジュールによって<b>%s</b>に強制されます。
-PreviousDumpFiles=Existing backup files
-PreviousArchiveFiles=Existing archive files
-WeekStartOnDay=First day of the week
-RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
-YouMustRunCommandFromCommandLineAfterLoginToUser=あなたは、ユーザ<b>%s、</b>シェルへのログイン後にコマンドラインからこのコマンドを実行する必要がありますか、追加する必要があります-Wオプションをコマンドラインの末尾に<b>%s</b>パスワード<b>を</b>提供します。
-YourPHPDoesNotHaveSSLSupport=あなたのPHPでのSSLの機能は使用できません
+NoEventOrNoAuditSetup=セキュリティイベントはログに記録されていない。 【設定】-【セキュリティ】-【イベント】ページで監査が有効になっていない場合、これは正常。
+NoEventFoundWithCriteria=この検索条件のセキュリティイベントは見つからなかった。
+SeeLocalSendMailSetup=ローカルのsendmailの設定を参照すること。
+BackupDesc=Dolibarrインストールの<b>完全</b>バックアップには、2つの手順が必要。
+BackupDesc2=アップロードおよび生成されたすべてのファイルを含む「documents」ディレクトリ ( <b> %s </b> ) の内容をバックアップする。これには、ステップ1で生成されたすべてのダンプファイルも含まれる。この操作は数分続く場合がある。
+BackupDesc3=データベース ( <b> %s </b> ) の構造と内容をダンプファイルにバックアップする。これには、次のアシスタントを使用できる。
+BackupDescX=アーカイブされたディレクトリは安全な場所に保存する必要がある。
+BackupDescY=生成されたダンプ·ファイルは安全な場所に格納する必要がある。
+BackupPHPWarning=この方法ではバックアップを保証できない。前のものをお勧めする。
+RestoreDesc=Dolibarrバックアップを復元するには、2つの手順が必要。
+RestoreDesc2=「documents」ディレクトリのバックアップファイル ( zipファイルなど ) を新規Dolibarrインストールまたはこの現在のdocumentsディレクトリ ( <b> %s </b> ) に復元する。
+RestoreDesc3=データベース構造とデータをバックアップダンプファイルから、新規Dolibarrインストールのデータベースまたはこの現在のインストールのデータベース ( <b> %s </b> ) に復元する。警告、復元が完了したら、バックアップ時間/インストールから存在したログイン/パスワードを使用して再度接続する必要がある。 <br>バックアップデータベースをこの現在のインストールに復元するには、このアシスタントに従うことができる。
+RestoreMySQL=MySQLのインポート
+ForcedToByAModule=このルールがアクティブ化モジュールによって<b>%s</b>に強制される。
+ValueIsForcedBySystem=この値はシステムによって強制される。変更することはできない。
+PreviousDumpFiles=既存のバックアップファイル
+PreviousArchiveFiles=既存のアーカイブファイル
+WeekStartOnDay=週の最初の日
+RunningUpdateProcessMayBeRequired=アップグレードプロセスの実行が必要なよう  ( プログラムバージョン%sはデータベースバージョン%sとは異なる ) 
+YouMustRunCommandFromCommandLineAfterLoginToUser=あなたは、ユーザ<b>%s、</b>シェルへのログイン後にコマンドラインからこのコマンドを実行する必要があるか、追加する必要がある-Wオプションをコマンドラインの末尾に<b>%s</b>パスワード<b>を</b>提供する。
+YourPHPDoesNotHaveSSLSupport=あなたのPHPでのSSLの機能は使用できない
 DownloadMoreSkins=ダウンロードするには多くのスキン
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+SimpleNumRefModelDesc=%syymm-nnnnの形式で参照番号を返する。ここで、yyは年、mmは月、nnnnはリセットなしで連続している。
+ShowProfIdInAddress=住所とともにプロのIDを表示する
+ShowVATIntaInAddress=コミュニティ内のVAT番号を住所で非表示にする
 TranslationUncomplete=部分的な翻訳
-MAIN_DISABLE_METEO=Disable meteorological view
-MeteoStdMod=Standard mode
-MeteoStdModEnabled=Standard mode enabled
-MeteoPercentageMod=Percentage mode
-MeteoPercentageModEnabled=Percentage mode enabled
-MeteoUseMod=Click to use %s
-TestLoginToAPI=APIへのログインをテストします。
-ProxyDesc=Some features of Dolibarr require internet access. Define here the internet connection parameters such as access through a proxy server if necessary.
-ExternalAccess=External/Internet Access
-MAIN_PROXY_USE=Use a proxy server (otherwise access is direct to the internet)
-MAIN_PROXY_HOST=Proxy server: Name/Address
-MAIN_PROXY_PORT=Proxy server: Port
-MAIN_PROXY_USER=Proxy server: Login/User
-MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+MAIN_DISABLE_METEO=気象ビューを無効にする
+MeteoStdMod=標準モード
+MeteoStdModEnabled=標準モードが有効
+MeteoPercentageMod=パーセンテージモード
+MeteoPercentageModEnabled=パーセンテージモードが有効
+MeteoUseMod=クリックして%sを使用
+TestLoginToAPI=APIへのログインをテストする。
+ProxyDesc=Dolibarrの一部の機能にはインターネットアクセスが必要。必要に応じて、プロキシサーバーを介したアクセスなどのインターネット接続パラメータをここで定義する。
+ExternalAccess=外部/インターネットアクセス
+MAIN_PROXY_USE=プロキシサーバーを使用する ( それ以外の場合、アクセスはインターネットに直接行われる ) 
+MAIN_PROXY_HOST=プロキシサーバー：名前/住所
+MAIN_PROXY_PORT=プロキシサーバー：ポート
+MAIN_PROXY_USER=プロキシサーバー：ログイン/ユーザ
+MAIN_PROXY_PASS=プロキシサーバー：パスワード
+DefineHereComplementaryAttributes=ここで、含める追加/カスタム属性を定義する：%s
 ExtraFields=補完的な属性
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (third party)
-ExtraFieldsContacts=Complementary attributes (contacts/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldsSalaries=Complementary attributes (salaries)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendmailOptionNotComplete=警告は、一部のLinuxシステムでは、電子メールから電子メールを送信するためには、sendmailの実行セットアップする必要があります含むオプション-BA（パラメータmail.force_extra_parameters php.iniファイルに）。一部の受信者がメールを受信しない場合は、mail.force_extra_parameters =-BA）と、このPHPパラメータを編集してみてください。
+ExtraFieldsLines=補完的な属性 ( 行 ) 
+ExtraFieldsLinesRec=補完的な属性 ( 請求書行のテンプレート ) 
+ExtraFieldsSupplierOrdersLines=補完的な属性 ( 注文ライン ) 
+ExtraFieldsSupplierInvoicesLines=補完的な属性 ( 請求書の行 ) 
+ExtraFieldsThirdParties=補完的な属性 ( 取引先 ) 
+ExtraFieldsContacts=補完的な属性 ( 連絡先/住所 ) 
+ExtraFieldsMember=補完的な属性 ( メンバー ) 
+ExtraFieldsMemberType=補完属性 ( メンバー種別 ) 
+ExtraFieldsCustomerInvoices=補完的な属性 ( 請求書 ) 
+ExtraFieldsCustomerInvoicesRec=補完的な属性 ( 請求書のテンプレート ) 
+ExtraFieldsSupplierOrders=補完的な属性 ( 注文 ) 
+ExtraFieldsSupplierInvoices=補完的な属性 ( 請求書 ) 
+ExtraFieldsProject=補完的な属性 ( プロジェクト ) 
+ExtraFieldsProjectTask=補完的な属性 ( タスク ) 
+ExtraFieldsSalaries=補完的な属性 ( 給与 ) 
+ExtraFieldHasWrongValue=属性%sの値が間違っている。
+AlphaNumOnlyLowerCharsAndNoSpace=スペースのない英数字と小文字のみ
+SendmailOptionNotComplete=警告は、一部のLinuxシステムでは、電子メールから電子メールを送信するためには、sendmailの実行設定する必要がある含むオプション-BA ( パラメータmail.force_extra_parameters php.iniファイルに ) 。一部の受信者がメールを受信しない場合は、mail.force_extra_parameters =-BA ) と、このPHPパラメータを編集してみること。
 PathToDocuments=ドキュメントへのパス
 PathDirectory=ディレクトリ
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might not be parsed correctly by some receiving mail servers. The result is that some mails can't be read by people hosted by those bugged platforms. This is the case for some Internet providers (Ex: Orange in France). This is not a problem with Dolibarr or PHP but with the receiving mail server. You can however add an option MAIN_FIX_FOR_BUGGED_MTA to 1 in Setup - Other to modify Dolibarr to avoid this. However, you may experience problems with other servers that strictly use the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" which has no disadvantages.
-TranslationSetup=Setup of translation
-TranslationKeySearch=Search a translation key or string
-TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set the display language:<br>* Default/Systemwide: menu <strong>Home -> Setup -> Display</strong><br>* Per user: Click on the username at the top of the screen and modify the <strong>User Display Setup</strong> tab on the user card.
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
-TranslationOverwriteDesc2=You can use the other tab to help you know which translation key to use
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TitleNumberOfActivatedModules=Activated modules
-TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found in PHP path
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only the following modules are available to external users (irrespective of the permissions of such users) and only if permissions are granted:<br>
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s which is the best driver currently available.
-YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
-SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
-BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
-BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-PHPModuleLoaded=PHP component %s is loaded
-PreloadOPCode=Preloaded OPCode is used
-AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
-AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
+SendmailOptionMayHurtBuggedMTA=メソッド "PHP mail direct" を使用してメールを送信する機能は、一部の受信メールサーバーによって正しく解析されない可能性のあるメールメッセージを生成する。その結果、バグのあるプラットフォームでホストされているユーザが一部のメールを読むことができなくなる。これは一部のインターネットプロバイダーに当てはまる ( 例：フランスのOrange ) 。これは、DolibarrまたはPHPの問題ではなく、受信メールサーバーの問題。ただし、【設定】-【その他】でオプション MAIN_FIX_FOR_BUGGED_MTA を1で追加し、これを回避するようにDolibarrを変更できる。ただし、SMTP標準を厳密に使用する他のサーバーで問題が発生する可能性がある。もう1つの解決策 ( 推奨 ) は、欠点のない "SMTPソケットライブラリ" メソッドを使用すること。
+TranslationSetup=翻訳の設定
+TranslationKeySearch=翻訳キーまたは文字列を検索する
+TranslationOverwriteKey=翻訳文字列を上書きする
+TranslationDesc=表示言語の設定方法:<br>* Default/Systemwide: メニュー <strong>ホーム->設定->表示</strong><br>* Per user: 画面上部のユーザ名をクリックしユーザカードの <strong>ユーザ表示設定</strong> タブを変更。
+TranslationOverwriteDesc=次の表を埋める文字列を上書きすることもできる。 "%s" ドロップダウンから言語を選択し、翻訳キー文字列を "%s" に挿入し、新規翻訳を "%s" に挿入する。
+TranslationOverwriteDesc2=他のタブを使用して、使用する翻訳キーを知ることができる
+TranslationString=翻訳文字列
+CurrentTranslationString=現在の翻訳文字列
+WarningAtLeastKeyOrTranslationRequired=少なくともキーまたは翻訳文字列には検索条件が必要 
+NewTranslationStringToShow=表示する新規翻訳文字列
+OriginalValueWas=元の翻訳は上書きされる。元の値は次のとおり。<br><br>%s
+TransKeyWithoutOriginalValue=どの言語ファイルにも存在しない翻訳キー '<strong> %s</strong>'の新規翻訳を強制した
+TitleNumberOfActivatedModules=アクティブ化されたモジュール
+TotalNumberOfActivatedModules=アクティブ化されたモジュール：<b> %s </b> / <b> %s </b>
+YouMustEnableOneModule=少なくとも1つのモジュールを有効にする必要がある
+ClassNotFoundIntoPathWarning=クラス%sがPHPパスに見つかりません
+YesInSummer=はい夏に
+OnlyFollowingModulesAreOpenedToExternalUsers=次のモジュールのみが ( そのようなユーザのアクセス許可に関係なく ) 外部ユーザが使用でき、アクセス許可が付与されている場合にのみ使用できることに注意すること：<br>
+SuhosinSessionEncrypt=Suhosinによって暗号化されたセッションストレージ
+ConditionIsCurrently=状態は現在%s 
+YouUseBestDriver=現在利用可能な最高のドライバーであるドライバー%sを使用する。
+YouDoNotUseBestDriver=ドライバー%sを使用するが、ドライバー%sをお勧めする。
+NbOfObjectIsLowerThanNoPb=データベースには%s%sしかない。これには、特別な最適化は必要ない。
+SearchOptim=検索最適化
+YouHaveXObjectUseSearchOptim=データベースに%s%sがある。 Home-Setup-Otherで定数%sを1に追加する必要がある。検索を文字列の先頭に制限する。これにより、データベースでインデックスを使用できるようになり、すぐに応答が返される。
+YouHaveXObjectAndSearchOptimOn=データベースに%s%sがあり、Home-Setup-Otherで定数%sが1に設定されている。
+BrowserIsOK=%sWebブラウザーを使用している。このブラウザは、セキュリティとパフォーマンスに問題はない。
+BrowserIsKO=%sWebブラウザーを使用している。このブラウザは、セキュリティ、パフォーマンス、信頼性の点で悪い選択であることが知られている。 Firefox、Chrome、Opera、またはSafariの使用をお勧めする。
+PHPModuleLoaded=PHPコンポーネント%sがロードされる
+PreloadOPCode=プリロードされたOPCodeが使用される
+AddRefInList=顧客/仕入先参照を表示する。情報リスト ( 選択リストまたはコンボボックス ) およびほとんどのハイパーリンク。 <br>取引先は、「CC12345-SC45678-The BigCompanycorp。」という名前の形式で表示される。 「TheBigCompanycorp」の代わりに。
+AddAdressInList=顧客/仕入先の住所情報リストを表示する ( リストまたはコンボボックスを選択 ) <br>取引先は、「TheBigCompanycorp。」ではなく「TheBigCompanycorp。-21jumpstreet 123456Bigtown-USA」の名前形式で表示される。
+AddEmailPhoneTownInContactList=連絡先の電子メール（または未定義の場合は電話）と町の情報リスト（選択リストまたはコンボボックス）を表示<br>連絡先は以下の名称と形式で表記される："Dupond Durand" の形式でなく、 "Dupond Durand - dupond.durand@email.com - Paris" または "Dupond Durand - 06 07 59 65 66 - Paris" 。
+AskForPreferredShippingMethod=取引先の優先配送方法を尋ねる。
 FieldEdition=フィールド%sのエディション
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-GetBarCode=Get barcode
-NumberingModules=Numbering models
-DocumentModules=Document models
+FillThisOnlyIfRequired=例：+2 ( タイムゾーンオフセットの問題が発生した場合にのみ入力 ) 
+GetBarCode=バーコードを取得する
+NumberingModules=ナンバリングモデル
+DocumentModules=ドキュメントモデル
 ##### Module password generation
-PasswordGenerationStandard=小文字で共有数字と文字を含む8文字：内部Dolibarrアルゴリズムに従って生成されたパスワードを返します。
-PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
+PasswordGenerationStandard=内部Dolibarrアルゴリズムに従って生成されたパスワードを返する：%s共有番号と小文字を含む文字。
+PasswordGenerationNone=生成されたパスワードを提案しないこと。パスワードは手動で入力する必要がある。
+PasswordGenerationPerso=個人的に定義した構成に従ってパスワードを返する。
+SetupPerso=構成に応じて
+PasswordPatternDesc=パスワードパターンの説明
 ##### Users setup #####
-RuleForGeneratedPasswords=Rules to generate and validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
-UsersSetup=ユーザーモジュールのセットアップ
-UserMailRequired=Email required to create a new user
-UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
-UsersDocModules=Document templates for documents generated from user record
-GroupsDocModules=Document templates for documents generated from a group record
+RuleForGeneratedPasswords=パスワードを生成および検証するためのルール
+DisableForgetPasswordLinkOnLogonPage=ログインページに「パスワードを忘れた」リンクを表示しないこと
+UsersSetup=ユーザモジュールの設定
+UserMailRequired=新規ユーザを作成するにはメールが必要 
+UserHideInactive=非アクティブなユーザをユーザのすべてのコンボリストから非表示にする ( 非推奨：これは、一部のページで古いユーザをフィルタリングまたは検索できないことを意味する場合がある ) 
+UsersDocModules=ユーザレコードから生成されたドキュメントのドキュメントテンプレート
+GroupsDocModules=グループレコードから生成されたドキュメントのドキュメントテンプレート
 ##### HRM setup #####
-HRMSetup=HRM module setup
+HRMSetup=HRMモジュールの設定
 ##### Company setup #####
-CompanySetup=企業のモジュールのセットアップ
-CompanyCodeChecker=Options for automatic generation of customer/vendor codes
-AccountCodeManager=Options for automatic generation of customer/vendor accounting codes
-NotificationsDesc=Email notifications can be sent automatically for some Dolibarr events.<br>Recipients of notifications can be defined:
-NotificationsDescUser=* per user, one user at a time.
-NotificationsDescContact=* per third-party contacts (customers or vendors), one contact at a time.
-NotificationsDescGlobal=* or by setting global email addresses in this setup page.
-ModelModules=Document Templates
-DocumentModelOdt=Generate documents from OpenDocument templates (.ODT / .ODS files from LibreOffice, OpenOffice, KOffice, TextEdit,...)
+CompanySetup=企業のモジュールの設定
+CompanyCodeChecker=顧客/仕入先コードの自動生成のオプション
+AccountCodeManager=顧客/仕入先の会計コードの自動生成のオプション
+NotificationsDesc=一部のDolibarrイベントについては、電子メール通知を自動的に送信できる。 <br>通知の受信者を定義できる。
+NotificationsDescUser=*ユーザごとに、一度に1人のユーザ。
+NotificationsDescContact=*取引先の連絡先 ( 顧客または仕入先 ) ごとに、一度に1つの連絡先。
+NotificationsDescGlobal=*または、この設定ページでグローバルメールアドレスを設定する。
+ModelModules=ドキュメントテンプレート
+DocumentModelOdt=OpenDocumentテンプレートからドキュメントを生成する ( LibreOffice、OpenOffice、KOffice、TextEditなどの.ODT / .ODSファイル ) 
 WatermarkOnDraft=ドラフト文書に透かし
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Rules for Professional IDs
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties (if VAT number or type of company defined) ?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-TechnicalServicesProvided=Technical services provided
+JSOnPaimentBill=支払いフォームの支払い明細を自動入力する機能をアクティブ化する
+CompanyIdProfChecker=プロフェッショナルIDのルール
+MustBeUnique=ユニークでなければなりませんか？
+MustBeMandatory=取引先の作成が必須 ( VAT番号または法人の種類が定義されている場合 ) ？
+MustBeInvoiceMandatory=請求書の検証は必須 か？
+TechnicalServicesProvided=提供される技術サービス
 #####DAV #####
-WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that needs an existing login account/password for access.
-WebDavServer=Root URL of %s server: %s
+WebDAVSetupDesc=これは、WebDAVディレクトリにアクセスするためのリンク。これには、URLを知っているすべてのユーザに公開されている「パブリック」ディレクトリ ( パブリックディレクトリへのアクセスが許可されている場合 ) と、アクセスに既存のログインアカウント/パスワードが必要な「プライベート」ディレクトリが含まれる。
+WebDavServer=%sサーバーのルートURL：%s
 ##### Webcal setup #####
-WebCalUrlForVCalExport=<b>%s</b>形式にエクスポートするリンクは以下のリンクで入手可能です：%s
+WebCalUrlForVCalExport=<b>%s</b>形式のエクスポートリンクは以下のリンクから利用可能：%s
 ##### Invoices #####
-BillsSetup=請求書モジュールのセットアップ
+BillsSetup=請求書モジュールの設定
 BillsNumberingModule=モジュールの番号請求書とクレジットメモ
 BillsPDFModules=請求書ドキュメントモデル
-BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
-PaymentsPDFModules=Payment documents models
+BillsPDFModulesAccordindToInvoiceType=請求書種別に応じた請求書ドキュメントモデル
+PaymentsPDFModules=支払文書モデル
 ForceInvoiceDate=検証日に請求書の日付を強制的に
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
-SuggestPaymentByChequeToAddress=Suggest payment by check to
+SuggestedPaymentModesIfNotDefinedInInvoice=請求書に定義されていない場合、デフォルトで請求書の推奨支払いモード
+SuggestPaymentByRIBOnAccount=口座からの引出しによる支払いを提案
+SuggestPaymentByChequeToAddress=小切手による支払いを提案する
 FreeLegalTextOnInvoices=請求書のフリーテキスト
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
-PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Vendor payments
-SupplierPaymentSetup=Vendor payments setup
+WatermarkOnDraftInvoices=ドラフト請求書の透かし ( 空の場合はなし ) 
+PaymentsNumberingModule=支払い番号付けモデル
+SuppliersPayment=仕入先の支払い
+SupplierPaymentSetup=仕入先支払いの設定
 ##### Proposals #####
-PropalSetup=商業的な提案はモジュールのセットアップ
+PropalSetup=商業的な提案はモジュールの設定
 ProposalsNumberingModules=商業的な提案番号モジュール
 ProposalsPDFModules=商業的な提案文書のモデル
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+SuggestedPaymentModesIfNotDefinedInProposal=プロポーザルで定義されていない場合、デフォルトでプロポーザルの推奨支払いモード
 FreeLegalTextOnProposal=商業的な提案でフリーテキスト
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+WatermarkOnDraftProposal=ドラフト商業提案の透かし ( 空の場合はなし ) 
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=提案先の銀行口座を尋ねる
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
+SupplierProposalSetup=価格はサプライヤーモジュールの設定を要求する
+SupplierProposalNumberingModules=価格はサプライヤーにモデルの番号付けを要求する
+SupplierProposalPDFModules=価格要求サプライヤー文書モデル
+FreeLegalTextOnSupplierProposal=価格要求サプライヤーに関するフリーテキスト
+WatermarkOnDraftSupplierProposal=ドラフト価格要求サプライヤーの透かし ( 空の場合はなし ) 
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=価格要求の銀行口座の宛先を尋ねる
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=注文のために倉庫ソースを要求する
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=注文書の銀行口座の宛先を尋ねる
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
-OrdersSetup=Sales Orders management setup
+SuggestedPaymentModesIfNotDefinedInOrder=注文で定義されていない場合、デフォルトで販売注文の推奨支払いモード
+OrdersSetup=受注管理の設定
 OrdersNumberingModules=モジュールの番号受注
 OrdersModelModule=注文書のモデル
 FreeLegalTextOnOrders=受注上のフリーテキスト
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
+WatermarkOnDraftOrders=ドラフト注文の透かし ( 空の場合はなし ) 
+ShippableOrderIconInList=注文が発送可能かどうかを示すアイコンを注文リストに追加する
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=注文先の銀行口座を尋ねる
 ##### Interventions #####
-InterventionsSetup=介入モジュールのセットアップ
-FreeLegalTextOnInterventions=介入のドキュメント上でフリーテキスト
-FicheinterNumberingModules=介入番号モジュール
-TemplatePDFInterventions=介入カードのドキュメントモデル
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+InterventionsSetup=出張モジュールの設定
+FreeLegalTextOnInterventions=出張のドキュメント上でフリーテキスト
+FicheinterNumberingModules=出張番号モジュール
+TemplatePDFInterventions=出張カードのドキュメントモデル
+WatermarkOnDraftInterventionCards=出張カード文書の透かし ( 空の場合はなし ) 
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
+ContractsSetup=契約/サブスクリプションモジュールの設定
 ContractsNumberingModules=モジュールの番号付けの契約
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+TemplatePDFContracts=契約文書モデル
+FreeLegalTextOnContracts=契約に関するフリーテキスト
+WatermarkOnDraftContractCards=ドラフト契約の透かし ( 空の場合はなし ) 
 ##### Members #####
-MembersSetup=メンバーモジュールのセットアップ
+MembersSetup=メンバーモジュールの設定
 MemberMainOptions=主なオプション
 AdherentLoginRequired= 各メンバーのログインを管理する
-AdherentMailRequired=Email required to create a new member
-MemberSendInformationByMailByDefault=メンバー（検証や新しいサブスクリプション）にメールの確認を送信するチェックボックスはデフォルトでオンになっています
-VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
-MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+AdherentMailRequired=新規メンバーを作成するにはメールが必要 
+MemberSendInformationByMailByDefault=メンバー ( 検証や新規サブスクリプション ) にメールの確認を送信するチェックボックスはデフォルトでオンになっている
+VisitorCanChooseItsPaymentMode=訪問者は利用可能な支払いモードから選択できる
+MEMBER_REMINDER_EMAIL=期限切れのサブスクリプションの電子メール</b>によって自動リマインダー<b>を有効にする。注：モジュール<strong> %s </strong>を有効にして、リマインダーを送信するように正しく設定する必要がある。
+MembersDocModules=メンバーレコードから生成されたドキュメント用のドキュメントテンプレート
 ##### LDAP setup #####
 LDAPSetup=LDAPの設定
 LDAPGlobalParameters=グローバルパラメータ
-LDAPUsersSynchro=ユーザー
+LDAPUsersSynchro=ユーザ
 LDAPGroupsSynchro=グループ
 LDAPContactsSynchro=コンタクト
 LDAPMembersSynchro=メンバー
 LDAPMembersTypesSynchro=メンバーの種類
 LDAPSynchronization=LDAP同期
-LDAPFunctionsNotAvailableOnPHP=LDAP関数は、PHPで利用可能ではありません
+LDAPFunctionsNotAvailableOnPHP=LDAP関数は、PHPで利用可能ではない
 LDAPToDolibarr=LDAP  - &gt; Dolibarr
 DolibarrToLDAP=Dolibarr  - &gt; LDAP
 LDAPNamingAttribute=LDAP内のキー
-LDAPSynchronizeUsers=LDAP内のユーザーの組織
+LDAPSynchronizeUsers=LDAP内のユーザの組織
 LDAPSynchronizeGroups=LDAPのグループの組織
 LDAPSynchronizeContacts=LDAPの連絡組織
 LDAPSynchronizeMembers=LDAPの財団のメンバーの組織
-LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
+LDAPSynchronizeMembersTypes=LDAPでの財団のメンバー種別の編成
 LDAPPrimaryServer=プライマリサーバ
 LDAPSecondaryServer=セカンダリサーバ
 LDAPServerPort=サーバポート
-LDAPServerPortExample=Default port: 389
+LDAPServerPortExample=デフォルトのポート：389
 LDAPServerProtocolVersion=プロトコルのバージョン
 LDAPServerUseTLS=TLSを使用する
 LDAPServerUseTLSExample=LDAPサーバを使用するTLS
 LDAPServerDn=サーバーのDN
 LDAPAdminDn=管理者DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
+LDAPAdminDnExample=完全なDN ( 例：アクティブディレクトリの場合はcn = admin、dc = example、dc = comまたはcn = Administrator、cn = Users、dc = example、dc = com ) 
 LDAPPassword=管理者パスワード
-LDAPUserDn=ユーザーのDN
-LDAPUserDnExample=完全なDN（例：OU =ユーザー、DC =社会、dc = comなど）
+LDAPUserDn=ユーザのDN
+LDAPUserDnExample=完全なDN ( 例：OU =ユーザ、DC =社会、dc = comなど ) 
 LDAPGroupDn=グループのDN
-LDAPGroupDnExample=完全なDN（例：OU =グループ、DC =社会、dc = comなど）
-LDAPServerExample=サーバのアドレス（例：localhostを、192.168.0.2は、ldaps :/ / ldap.example.com /）
-LDAPServerDnExample=完全なDN（例：DC =会社、dc = comなど）
-LDAPDnSynchroActive=ユーザーとグループの同期
+LDAPGroupDnExample=完全なDN ( 例：OU =グループ、DC =社会、dc = comなど ) 
+LDAPServerExample=サーバのアドレス ( 例：localhostを、192.168.0.2は、ldaps :/ / ldap.example.com / ) 
+LDAPServerDnExample=完全なDN ( 例：DC =会社、dc = comなど ) 
+LDAPDnSynchroActive=ユーザとグループの同期
 LDAPDnSynchroActiveExample=LDAP同期にDolibarrまたはDolibarrへのLDAP
 LDAPDnContactActive=連絡先の同期
 LDAPDnContactActiveExample=活性化/不活性の同期
 LDAPDnMemberActive=メンバーの同期
 LDAPDnMemberActiveExample=活性化/不活性の同期
-LDAPDnMemberTypeActive=Members types' synchronization
+LDAPDnMemberTypeActive=メンバー種別の同期
 LDAPDnMemberTypeActiveExample=活性化/不活性の同期
 LDAPContactDn=Dolibarrの連絡先のDN
-LDAPContactDnExample=完全なDN（例：OU =連絡先、DC =社会、dc = comなど）
+LDAPContactDnExample=完全なDN ( 例：OU =連絡先、DC =社会、dc = comなど ) 
 LDAPMemberDn=DolibarrメンバーのDN
-LDAPMemberDnExample=完全なDN（例：OU =メンバー、DC =社会、dc = comなど）
+LDAPMemberDnExample=完全なDN ( 例：OU =メンバー、DC =社会、dc = comなど ) 
 LDAPMemberObjectClassList=オブジェクトクラスのリスト
-LDAPMemberObjectClassListExample=レコードの属性を定義するオブジェクトクラスのリスト（例：上は、inetOrgPersonまたはトップ、アクティブディレクトリのユーザ）
-LDAPMemberTypeDn=Dolibarr members types DN
-LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com)
+LDAPMemberObjectClassListExample=レコードの属性を定義するオブジェクトクラスのリスト ( 例：上は、inetOrgPersonまたはトップ、アクティブディレクトリのユーザ ) 
+LDAPMemberTypeDn=Dolibarrメンバー種別DN
+LDAPMemberTypepDnExample=完全なDN ( 例：ou = memberstypes、dc = example、dc = com ) 
 LDAPMemberTypeObjectClassList=オブジェクトクラスのリスト
-LDAPMemberTypeObjectClassListExample=レコードの属性を定義するオブジェクトクラスのリスト（例：上、groupOfUniqueNamesの）
+LDAPMemberTypeObjectClassListExample=レコードの属性を定義するオブジェクトクラスのリスト ( 例：上、groupOfUniqueNamesの ) 
 LDAPUserObjectClassList=オブジェクトクラスのリスト
-LDAPUserObjectClassListExample=レコードの属性を定義するオブジェクトクラスのリスト（例：上は、inetOrgPersonまたはトップ、アクティブディレクトリのユーザ）
+LDAPUserObjectClassListExample=レコードの属性を定義するオブジェクトクラスのリスト ( 例：上は、inetOrgPersonまたはトップ、アクティブディレクトリのユーザ ) 
 LDAPGroupObjectClassList=オブジェクトクラスのリスト
-LDAPGroupObjectClassListExample=レコードの属性を定義するオブジェクトクラスのリスト（例：上、groupOfUniqueNamesの）
+LDAPGroupObjectClassListExample=レコードの属性を定義するオブジェクトクラスのリスト ( 例：上、groupOfUniqueNamesの ) 
 LDAPContactObjectClassList=オブジェクトクラスのリスト
-LDAPContactObjectClassListExample=レコードの属性を定義するオブジェクトクラスのリスト（例：上は、inetOrgPersonまたはトップ、アクティブディレクトリのユーザ）
+LDAPContactObjectClassListExample=レコードの属性を定義するオブジェクトクラスのリスト ( 例：上は、inetOrgPersonまたはトップ、アクティブディレクトリのユーザ ) 
 LDAPTestConnect=LDAP接続をテストする
 LDAPTestSynchroContact=連絡先の同期をテスト
-LDAPTestSynchroUser=テストユーザーの同期
+LDAPTestSynchroUser=テストユーザの同期
 LDAPTestSynchroGroup=テストグループの同期
 LDAPTestSynchroMember=テストメンバーの同期
-LDAPTestSynchroMemberType=Test member type synchronization
-LDAPTestSearch= Test a LDAP search
+LDAPTestSynchroMemberType=メンバー種別の同期をテストする
+LDAPTestSearch= LDAP検索をテストする
 LDAPSynchroOK=同期テストに成功
 LDAPSynchroKO=失敗した同期のテスト
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that the connection to the server is correctly configured and allows LDAP updates
-LDAPTCPConnectOK=TCPは、LDAPサーバに成功（SERVER = %s、ポート= %s）に接続
-LDAPTCPConnectKO=TCPは、LDAPサーバへの接続（SERVER = %s、ポート= %s）に失敗しました
-LDAPBindOK=Connect/Authenticate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authenticate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPSynchroKOMayBePermissions=同期テストに失敗した。サーバーへの接続が正しく構成されており、LDAPの更新が許可されていることを確認すること
+LDAPTCPConnectOK=TCPは、LDAPサーバに成功 ( SERVER = %s、ポート= %s ) に接続
+LDAPTCPConnectKO=TCPは、LDAPサーバへの接続 ( SERVER = %s、ポート= %s ) に失敗した
+LDAPBindOK=LDAPサーバーへの接続/認証に成功した ( Server = %s、Port = %s、Admin = %s、Password = %s ) 
+LDAPBindKO=LDAPサーバーへの接続/認証に失敗した ( Server = %s、Port = %s、Admin = %s、Password = %s ) 
 LDAPSetupForVersion3=バージョン3用に設定されたLDAPサーバ
 LDAPSetupForVersion2=バージョン2用に設定されたLDAPサーバ
 LDAPDolibarrMapping=Dolibarrマッピング
 LDAPLdapMapping=LDAPのマッピング
-LDAPFieldLoginUnix=ログイン（UNIX）
-LDAPFieldLoginExample=Example: uid
+LDAPFieldLoginUnix=ログイン ( UNIX ) 
+LDAPFieldLoginExample=例：uid
 LDAPFilterConnection=検索フィルター
-LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=ログイン（サンバ、ActiveDirectoryを）
-LDAPFieldLoginSambaExample=Example: samaccountname
+LDAPFilterConnectionExample=例：＆ ( objectClass = inetOrgPerson ) 
+LDAPFieldLoginSamba=ログイン ( サンバ、ActiveDirectoryを ) 
+LDAPFieldLoginSambaExample=例：samaccountname
 LDAPFieldFullname=ファーストネーム
-LDAPFieldFullnameExample=Example: cn
-LDAPFieldPasswordNotCrypted=Password not encrypted
-LDAPFieldPasswordCrypted=Password encrypted
-LDAPFieldPasswordExample=Example: userPassword
-LDAPFieldCommonNameExample=Example: cn
+LDAPFieldFullnameExample=例：cn
+LDAPFieldPasswordNotCrypted=パスワードは暗号化されていない
+LDAPFieldPasswordCrypted=パスワードで暗号化
+LDAPFieldPasswordExample=例：userPassword
+LDAPFieldCommonNameExample=例：cn
 LDAPFieldName=名
-LDAPFieldNameExample=Example: sn
+LDAPFieldNameExample=例：sn
 LDAPFieldFirstName=ファーストネーム
-LDAPFieldFirstNameExample=Example: givenName
+LDAPFieldFirstNameExample=例：givenName
 LDAPFieldMail=メールアドレス
-LDAPFieldMailExample=Example: mail
+LDAPFieldMailExample=例：メール
 LDAPFieldPhone=プロの電話番号
-LDAPFieldPhoneExample=Example: telephonenumber
+LDAPFieldPhoneExample=例：電話番号
 LDAPFieldHomePhone=個人の電話番号
-LDAPFieldHomePhoneExample=Example: homephone
+LDAPFieldHomePhoneExample=例：自宅の電話
 LDAPFieldMobile=携帯電話
-LDAPFieldMobileExample=Example: mobile
+LDAPFieldMobileExample=例：モバイル
 LDAPFieldFax=ファクス番号
-LDAPFieldFaxExample=Example: facsimiletelephonenumber
+LDAPFieldFaxExample=例：ファクシミリ電話番号
 LDAPFieldAddress=ストリート
-LDAPFieldAddressExample=Example: street
+LDAPFieldAddressExample=例：通り
 LDAPFieldZip=ZIP
-LDAPFieldZipExample=Example: postalcode
+LDAPFieldZipExample=例：郵便番号
 LDAPFieldTown=町
-LDAPFieldTownExample=Example: l
+LDAPFieldTownExample=例：l
 LDAPFieldCountry=国
 LDAPFieldDescription=説明
-LDAPFieldDescriptionExample=Example: description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example: publicnote
+LDAPFieldDescriptionExample=例：説明
+LDAPFieldNotePublic=パブリックノート
+LDAPFieldNotePublicExample=例：publicnote
 LDAPFieldGroupMembers= グループメンバー
-LDAPFieldGroupMembersExample= Example: uniqueMember
+LDAPFieldGroupMembersExample= 例：uniqueMember
 LDAPFieldBirthdate=誕生日
-LDAPFieldCompany=会社
-LDAPFieldCompanyExample=Example: o
+LDAPFieldCompany=法人
+LDAPFieldCompanyExample=例：o
 LDAPFieldSid=SID
-LDAPFieldSidExample=Example: objectsid
+LDAPFieldSidExample=例：objectsid
 LDAPFieldEndLastSubscription=サブスクリプション終了の日付
 LDAPFieldTitle=職位
-LDAPFieldTitleExample=Example: title
-LDAPFieldGroupid=Group id
-LDAPFieldGroupidExample=Exemple : gidnumber
-LDAPFieldUserid=User id
-LDAPFieldUseridExample=Exemple : uidnumber
-LDAPFieldHomedirectory=Home directory
-LDAPFieldHomedirectoryExample=Exemple : homedirectory
-LDAPFieldHomedirectoryprefix=Home directory prefix
-LDAPSetupNotComplete=（他のタブに行く）LDAPセットアップ完了していません
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=いいえ、管理者またはパスワードが提供されません。 LDAPのアクセスは匿名で、読み取り専用モードになります。
-LDAPDescContact=このページでは、Dolibarr接点で検出された各データのためにLDAPツリー内のLDAP属性名を定義することができます。
-LDAPDescUsers=このページでは、Dolibarrユーザーで検出された各データのためにLDAPツリー内のLDAP属性名を定義することができます。
-LDAPDescGroups=このページでは、Dolibarrグループで検出された各データのためにLDAPツリー内のLDAP属性名を定義することができます。
-LDAPDescMembers=このページでは、Dolibarrメンバーモジュールで検出された各データのためにLDAPツリー内のLDAP属性名を定義することができます。
-LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types.
-LDAPDescValues=値の例は、次のロードされたスキーマを持つ<b>OpenLDAPの</b>ために設計されています<b>。core.schema、cosine.schema、inetorgperson.schema）。</b>あなたがthoose値とOpenLDAPを使用する場合は、すべてのthooseスキーマが読み込まれているように、LDAP設定<b>ファイル</b> slapd.conf <b>を</b>変更<b>します</b> 。
-ForANonAnonymousAccess=認証されたアクセスも（たとえば、書き込みアクセス用）
-PerfDolibarr=Performance setup/optimizing report
-YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
-ApplicativeCache=Applicative cache
-MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. Maybe you are using an OPCode cache other than XCache or eAccelerator (good), or maybe you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gif A2592000"
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
-DefaultValuesDesc=Here you may define the default value you wish to use when creating a new record, and/or default filters or the sort order when you list records.
-DefaultCreateForm=Default values (to use on forms)
-DefaultSearchFilters=Default search filters
-DefaultSortOrder=Default sort orders
-DefaultFocus=Default focus fields
-DefaultMandatory=Mandatory form fields
+LDAPFieldTitleExample=例：タイトル
+LDAPFieldGroupid=グループID
+LDAPFieldGroupidExample=例：gidnumber
+LDAPFieldUserid=ユーザID
+LDAPFieldUseridExample=例：uidnumber
+LDAPFieldHomedirectory=ホームディレクトリ
+LDAPFieldHomedirectoryExample=例：ホームディレクトリ
+LDAPFieldHomedirectoryprefix=ホームディレクトリプレフィックス
+LDAPSetupNotComplete= ( 他のタブに行く ) LDAP設定完了していない
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=いいえ、管理者またはパスワードが提供されない。 LDAPのアクセスは匿名で、読み取り専用モードになる。
+LDAPDescContact=このページでは、Dolibarr接点で検出された各データのためにLDAPツリー内のLDAP属性名を定義することができる。
+LDAPDescUsers=このページでは、Dolibarrユーザで検出された各データのためにLDAPツリー内のLDAP属性名を定義することができる。
+LDAPDescGroups=このページでは、Dolibarrグループで検出された各データのためにLDAPツリー内のLDAP属性名を定義することができる。
+LDAPDescMembers=このページでは、Dolibarrメンバーモジュールで検出された各データのためにLDAPツリー内のLDAP属性名を定義することができる。
+LDAPDescMembersTypes=このページでは、Dolibarrメンバー種別で見つかった各データのLDAPツリーでLDAP属性名を定義できる。
+LDAPDescValues=値の例は、次のロードされたスキーマを持つ<b>OpenLDAPの</b>ために設計されている<b>。core.schema、cosine.schema、inetorgperson.schema ) 。</b>あなたがthoose値とOpenLDAPを使用する場合は、すべてのthooseスキーマが読み込まれているように、LDAP設定<b>ファイル</b> slapd.conf <b>を</b>変更<b>する</b> 。
+ForANonAnonymousAccess=認証されたアクセスも ( たとえば、書き込みアクセス用 ) 
+PerfDolibarr=パフォーマンスの設定/最適化レポート
+YouMayFindPerfAdviceHere=このページでは、パフォーマンスに関連するいくつかのチェックまたはアドバイスを提供する。
+NotInstalled=インストールされていない。
+NotSlowedDownByThis=これによって遅くなることはない。
+NotRiskOfLeakWithThis=これで漏れのリスクはない。
+ApplicativeCache=適用可能なキャッシュ
+MemcachedNotAvailable=適用可能なキャッシュが見つかりません。キャッシュサーバーMemcachedと、このキャッシュサーバーを使用できるモジュールをインストールすることで、パフォーマンスを向上させることができる。 <br>詳細はこちら<a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http：//wiki.dolibarr.org/index.php/Module_MemCached_EN</a>。 <br>多くのウェブホスティングプロバイダーがそのようなキャッシュサーバーを提供していないことに注意すること。
+MemcachedModuleAvailableButNotSetup=適用キャッシュのモジュールmemcachedが見つかりましたが、モジュールの設定が完了していない。
+MemcachedAvailableAndSetup=memcachedサーバー専用のモジュールmemcachedが有効になっている。
+OPCodeCache=OPCodeキャッシュ
+NoOPCodeCacheFound=OPCodeキャッシュが見つかりません。 XCacheまたはeAccelerator以外のOPCodeキャッシュを使用している ( 良い ) か、OPCodeキャッシュを持っていない ( 非常に悪い ) 可能性がある。
+HTTPCacheStaticResources=静的リソース ( css、img、javascript ) のHTTPキャッシュ
+FilesOfTypeCached=種別%sのファイルはHTTPサーバーによってキャッシュされる
+FilesOfTypeNotCached=種別%sのファイルはHTTPサーバーによってキャッシュされない
+FilesOfTypeCompressed=種別%sのファイルはHTTPサーバーによって圧縮される
+FilesOfTypeNotCompressed=種別%sのファイルはHTTPサーバーによって圧縮されない
+CacheByServer=サーバーごとのキャッシュ
+CacheByServerDesc=たとえば、Apacheディレクティブ「ExpiresByTypeimage / gifA2592000」を使用する。
+CacheByClient=ブラウザによるキャッシュ
+CompressionOfResources=HTTP応答の圧縮
+CompressionOfResourcesDesc=たとえば、Apacheディレクティブ「AddOutputFilterByTypeDEFLATE」を使用する
+TestNotPossibleWithCurrentBrowsers=このような自動検出は、現在のブラウザでは不可能。
+DefaultValuesDesc=ここでは、新規レコードを作成するときに使用するデフォルト値や、レコードを一覧表示するときのデフォルトのフィルターまたは並べ替え順序を定義できる。
+DefaultCreateForm=デフォルト値 ( フォームで使用 ) 
+DefaultSearchFilters=デフォルトの検索フィルター
+DefaultSortOrder=デフォルトのソート順
+DefaultFocus=デフォルトのフォーカスフィールド
+DefaultMandatory=必須のフォームフィールド
 ##### Products #####
-ProductSetup=製品モジュールのセットアップ
-ServiceSetup=サービスモジュールのセットアップ
-ProductServiceSetup=製品とサービスモジュールのセットアップ
-NumberOfProductShowInSelect=Maximum number of products to show in combo select lists (0=no limit)
-ViewProductDescInFormAbility=Display product descriptions in forms (otherwise shown in a tooltip popup)
-MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in the language of the third party
-UseSearchToSelectProductTooltip=Also if you have a large number of products (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectProduct=Wait until you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
+ProductSetup=製品モジュールの設定
+ServiceSetup=サービスモジュールの設定
+ProductServiceSetup=製品とサービスモジュールの設定
+NumberOfProductShowInSelect=コンボ選択リストに表示する製品の最大数 ( 0 =制限なし ) 
+ViewProductDescInFormAbility=製品の説明をフォームに表示する ( それ以外の場合はツールチップポップアップに表示される ) 
+MergePropalProductCard=製品/サービスが提案に含まれている場合、製品/サービスの【添付ファイル】タブで、製品のPDFドキュメントを提案のPDFazurにマージするオプションをアクティブにする
+ViewProductDescInThirdpartyLanguageAbility=取引先の言語で製品の説明を表示する
+UseSearchToSelectProductTooltip=また、製品の数が多い ( > 100 000 ) 場合は、【設定】-> 【その他】で定数PRODUCT_DONOTSEARCH_ANYWHEREを1に設定することで速度を上げることができる。その後、検索は文字列の先頭に限定される。
+UseSearchToSelectProduct=キーを押すまで待ってから、製品コンボリストのコンテンツをロードすること ( これにより、製品の数が多い場合にパフォーマンスが向上する可能性があるが、あまり便利ではない ) 
 SetDefaultBarcodeTypeProducts=製品に使用するデフォルトのバーコードの種類
-SetDefaultBarcodeTypeThirdParties=第三者のために使用するデフォルトのバーコードの種類
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
-IsNotADir=is not a directory!
+SetDefaultBarcodeTypeThirdParties=取引先のために使用するデフォルトのバーコードの種類
+UseUnits=注文、提案、または請求書明細の編集時に数量の測定単位を定義する
+ProductCodeChecker= 製品コードの生成とチェックのためのモジュール ( 製品またはサービス ) 
+ProductOtherConf= 製品/サービスの構成
+IsNotADir=ディレクトリではない！
 ##### Syslog #####
-SyslogSetup=ログモジュールのセットアップ
+SyslogSetup=ログモジュールの設定
 SyslogOutput=ログ出力
 SyslogFacility=施設
 SyslogLevel=レベル
 SyslogFilename=ファイル名とパス
-YouCanUseDOL_DATA_ROOT=あなたがDolibarr &quot;ドキュメント&quot;ディレクトリ内のログ·ファイルのDOL_DATA_ROOT / dolibarr.logを使用することができます。このファイルを格納する別のパスを設定することができます。
-ErrorUnknownSyslogConstant=定数%sは知られているSyslogの定数ではありません。
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
-CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
-ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
+YouCanUseDOL_DATA_ROOT=あなたがDolibarr &quot;ドキュメント&quot;ディレクトリ内のログ·ファイルのDOL_DATA_ROOT / dolibarr.logを使用することができる。このファイルを格納する別のパスを設定することができる。
+ErrorUnknownSyslogConstant=定数%sは知られているSyslogの定数ではない。
+OnlyWindowsLOG_USER=Windowsでは、LOG_USER機能のみがサポートされる
+CompressSyslogs=デバッグログファイルの圧縮とバックアップ ( デバッグ用にモジュールLogによって生成される ) 
+SyslogFileNumberOfSaves=保持するバックアップログの数
+ConfigureCleaningCronjobToSetFrequencyOfSaves=ログのバックアップ頻度を設定するために、クリーニングスケジュールジョブを構成する
 ##### Donations #####
-DonationsSetup=寄付モジュールのセットアップ
+DonationsSetup=寄付モジュールの設定
 DonationsReceiptModel=寄付金の領収書のテンプレート
 ##### Barcode #####
-BarcodeSetup=バーコードのセットアップ
+BarcodeSetup=バーコードの設定
 PaperFormatModule=形式のモジュールを印刷する
-BarcodeEncodeModule=バーコードのエンコードタイプ
+BarcodeEncodeModule=バーコードのエンコード種別
 CodeBarGenerator=バーコードジェネレータ
 ChooseABarCode=定義されていない発電機
 FormatNotSupportedByGenerator=Format not supported by this generator
-BarcodeDescEAN8=タイプEAN8のバーコード
-BarcodeDescEAN13=タイプEAN13のバーコード
-BarcodeDescUPC=タイプUPCのバーコード
+BarcodeDescEAN8=種別EAN8のバーコード
+BarcodeDescEAN13=種別EAN13のバーコード
+BarcodeDescUPC=種別UPCのバーコード
 BarcodeDescISBN=型商品のバーコード
-BarcodeDescC39=タイプC39のバーコード
-BarcodeDescC128=タイプC128のバーコード
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
+BarcodeDescC39=種別C39のバーコード
+BarcodeDescC128=種別C128のバーコード
+BarcodeDescDATAMATRIX=Datamatrix種別のバーコード
+BarcodeDescQRCODE=QRコード種別のバーコード
+GenbarcodeLocation=バーコード生成コマンドラインツール ( 一部のバーコード種別の内部エンジンで使用される ) 。 "genbarcode" と互換性がある必要がある。 <br>例: /usr/local/bin/genbarcode
+BarcodeInternalEngine=内部エンジン
+BarCodeNumberManager=バーコード番号を自動定義するマネージャー
 ##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct Debit payments
+WithdrawalsSetup=モジュールの口座振替支払いの設定
 ##### ExternalRSS #####
-ExternalRSSSetup=外部のRSSをインポートセットアップ
-NewRSS=新しいRSSフィード
+ExternalRSSSetup=外部のRSSをインポート設定
+NewRSS=新規RSSフィード
 RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
+RSSUrlExample=興味深いRSSフィード
 ##### Mailing #####
-MailingSetup=モジュールのセットアップをメールで送信
-MailingEMailFrom=Sender email (From) for emails sent by emailing module
-MailingEMailError=Return Email (Errors-to) for emails with errors
-MailingDelay=Seconds to wait after sending next message
+MailingSetup=モジュールの設定をメールで送信
+MailingEMailFrom=電子メールモジュールによって送信された電子メールの送信者電子メール ( 差出人 ) 
+MailingEMailError=エラーのあるEメールのEメールを返す ( Errors-to ) 
+MailingDelay=次のメッセージを送信してから待機する秒数
 ##### Notification #####
-NotificationSetup=Email Notification module setup
-NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
+NotificationSetup=電子メール通知モジュールの設定
+NotificationEMailFrom=通知モジュールによって送信された電子メールの送信者電子メール ( 差出人 ) 
 FixedEmailTarget=受信者
 ##### Sendings #####
-SendingsSetup=Shipping module setup
+SendingsSetup=出荷モジュールの設定
 SendingsReceiptModel=領収書のモデルを送信する
 SendingsNumberingModules=モジュールの番号Sendings
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
+SendingsAbility=顧客への配送用の出荷シートをサポートする
+NoNeedForDeliveryReceipts=ほとんどの場合、出荷用シートは、顧客への配送用のシート ( 送信する製品のリスト ) と、顧客が受け取って署名するシートの両方として使用される。したがって、製品入庫受領書は重複した機能であり、有効化されることはめったにない。
+FreeLegalTextOnShippings=出荷に関するフリーテキスト
 ##### Deliveries #####
 DeliveryOrderNumberingModules=製品の納入領収書ナンバリングモジュール
 DeliveryOrderModel=製品の納入領収書モデル
@@ -1626,54 +1669,54 @@ DeliveriesOrderAbility=サポート製品の納入の領収書
 FreeLegalTextOnDeliveryReceipts=配達のレシートにフリーテキスト
 ##### FCKeditor #####
 AdvancedEditor=高度なエディタ
-ActivateFCKeditor=のための高度なエディタをアクティブにします。
-FCKeditorForCompany=要素の説明と注意事項のWYSIWIGエディタの作成/版（製品/サービスを除く）
+ActivateFCKeditor=のための高度なエディタをアクティブにする。
+FCKeditorForCompany=要素の説明と注意事項のWYSIWIGエディタの作成/版 ( 製品/サービスを除く ) 
 FCKeditorForProduct=製品/サービスの説明と注意事項のWYSIWIGエディタの作成/版
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= 郵送のWYSIWIGエディタの作成/版
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-FCKeditorForTicket=WYSIWIG creation/edition for tickets
+FCKeditorForUserSignature=WYSIWIGによるユーザ署名の作成/編集
+FCKeditorForMail=すべてのメールのWYSIWIG作成/エディション ( 【ツール】-> 【電子メール】を除く ) 
+FCKeditorForTicket=チケットのWYSIWIG作成/エディション
 ##### Stock #####
-StockSetup=Stock module setup
-IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
+StockSetup=在庫モジュールの設定
+IfYouUsePointOfSaleCheckModule=デフォルトで提供されているPOSモジュールまたは外部モジュールを使用する場合、この設定はPOSモジュールによって無視される可能性がある。ほとんどのPOSモジュールは、デフォルトで、ここでのオプションに関係なく、請求書をすぐに作成し、在庫を減らすように設計されている。したがって、POSから販売を登録するときに在庫を減らす必要があるかどうかにかかわらず、POSモジュールの設定も確認すること。
 ##### Menu #####
 MenuDeleted=メニューを削除
+Menu=メニュー
 Menus=メニュー
 TreeMenuPersonalized=パーソナライズメニュー
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
+NotTopTreeMenuPersonalized=トップメニューエントリにリンクされていないパーソナライズされたメニュー
 NewMenu=新メニュー
-Menu=メニューの選択
 MenuHandler=メニューハンドラ
 MenuModule=ソース·モジュール
-HideUnauthorizedMenu= 不正なメニュー（グレー）を非表示
+HideUnauthorizedMenu= 不正なメニュー ( グレー ) を非表示
 DetailId=idのメニュー
-DetailMenuHandler=新しいメニューを表示するメニューハンドラ
+DetailMenuHandler=新規メニューを表示するメニューハンドラ
 DetailMenuModule=モジュール名のメニューエントリは、モジュールから来る場合
-DetailType=メニューの種類（上または左）
+DetailType=メニューの種類 ( 上または左 ) 
 DetailTitre=翻訳のためのメニューラベルまたはラベルのコード
-DetailUrl=メニューがあなたを送るURL（絶対URLリンクの場合はhttp://を使用して外部リンク）
+DetailUrl=メニューがあなたを送るURL ( 絶対URLリンクの場合はhttp://を使用して外部リンク ) 
 DetailEnabled=エントリを表示したりしないように条件
 DetailRight=不正な灰色のメニューを表示するための条件
 DetailLangs=ラベルのコード変換のためにラングのファイル名
 DetailUser=インターン/エキスターン/すべて
 Target=ターゲット
-DetailTarget=Target for links (_blank top opens a new window)
-DetailLevel=レベル（-1：トップメニュー、0：ヘッダメニュー、&gt; 0でメニューやサブメニュー）
+DetailTarget=リンクのターゲット ( _blank topは新規ウィンドウを開きます ) 
+DetailLevel=レベル ( -1：トップメニュー、0：ヘッダメニュー、&gt; 0でメニューやサブメニュー ) 
 ModifMenu=メニューの変更
 DeleteMenu=メニューエントリを削除する
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
+ConfirmDeleteMenu=メニューエントリ<b>%s </b>を削除してもよいか？
+FailedToInitializeMenu=メニューの初期化に失敗した
 ##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
+TaxSetup=税金、社会税または財政税、配当モジュールの設定
 OptionVatMode=により、付加価値税
-OptionVATDefault=Standard basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on invoice (debit) for services
-OptionPaymentForProductAndServices=Cash basis for products and services
-OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
-SummaryOfVatExigibilityUsedByDefault=Time of VAT eligibility by default according to chosen option:
+OptionVATDefault=標準ベース
+OptionVATDebitOption=発生主義
+OptionVatDefaultDesc=付加価値税の支払い期限：<br>-商品の配達時 ( 請求日に基づく ) <br>-サービスの支払い時
+OptionVatDebitOptionDesc=VATの支払い期限：<br>-商品の配達時 ( 請求日に基づく ) <br>-サービスの請求書 ( 借方 ) 
+OptionPaymentForProductAndServices=製品およびサービスの現金ベース
+OptionPaymentForProductAndServicesDesc=付加価値税の支払い期限：<br>-商品の支払いについて<br>-サービスの支払いについて
+SummaryOfVatExigibilityUsedByDefault=選択したオプションに応じたデフォルトのVAT適格期間：
 OnDelivery=着払い
 OnPayment=支払いに
 OnInvoice=請求書
@@ -1682,351 +1725,361 @@ SupposedToBeInvoiceDate=使用される請求書の日付
 Buy=購入する
 Sell=販売
 InvoiceDateUsed=使用される請求書の日付
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
-AccountancyCode=Accounting Code
-AccountancyCodeSell=Sale account. code
-AccountancyCodeBuy=Purchase account. code
+YourCompanyDoesNotUseVAT=あなたの法人はVATを使用しないように定義されているため (【ホーム】-【設定】-【法人/組織】) 、設定するVATオプションはない。
+AccountancyCode=会計コード
+AccountancyCodeSell=販売会計コード
+AccountancyCodeBuy=購入会計コード
 ##### Agenda #####
-AgendaSetup=イベントと議題モジュールのセットアップ
+AgendaSetup=イベントと議題モジュールの設定
 PasswordTogetVCalExport=エクスポートのリンクを許可するキー
-PastDelayVCalExport=より古いイベントはエクスポートされません
-AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
-AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
-AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
-AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
-AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
-AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
+PastDelayVCalExport=より古いイベントはエクスポートしない
+AGENDA_USE_EVENT_TYPE=イベント種別を使用する ( メニューの【設定】-> 【辞書】-> 【アジェンダイベントの種別】で管理 ) 
+AGENDA_USE_EVENT_TYPE_DEFAULT=イベント作成フォームでイベントの種別にこのデフォルト値を自動的に設定する
+AGENDA_DEFAULT_FILTER_TYPE=アジェンダビューの検索フィルターでこの種別のイベントを自動的に設定する
+AGENDA_DEFAULT_FILTER_STATUS=アジェンダビューの検索フィルターでイベントのこのステータスを自動的に設定する
+AGENDA_DEFAULT_VIEW=メニューの議題を選択するときに、デフォルトでどのビューを開くか
+AGENDA_REMINDER_BROWSER=ユーザーのブラウザ</b>でイベントリマインダー<b>を有効にする（リマインダーの日付に達すると、ブラウザにポップアップが表示される。各ユーザーは、ブラウザの通知設定からそのような通知を無効にできる）。
+AGENDA_REMINDER_BROWSER_SOUND=音声通知を有効にする
+AGENDA_REMINDER_EMAIL=電子メール</b>でイベントリマインダー<b>を有効にする（リマインダーオプション/遅延は各イベントで定義できる）。
+AGENDA_REMINDER_EMAIL_NOTE=注：タスク%sの頻度は、リマインダーが正しいタイミングで送信されることを確認するのに十分でなければならない。
+AGENDA_SHOW_LINKED_OBJECT=リンクされたオブジェクトを議題ビューに表示する
 ##### Clicktodial #####
-ClickToDialSetup=モジュールのセットアップをダイヤルする]をクリックします
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
-ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialSetup=モジュールの設定をダイヤルする】をクリックする
+ClickToDialUrlDesc=電話のpictoをクリックすると、URLが呼び出される。 URLには、使用することができるタグ<br> <b> __PHONETO__ </b>その<br> <b> __PHONEFROM__ </b> clicktodialに置き換えられる人 ( あなた ) を呼び出すの電話番号<br> <b> __LOGIN__ </b>に置き換えられるそれを呼び出すために人の電話番号に置き換えられるログイン ( ユーザカードで定義 ) <br> <b> __PASS__ </b>これはクリックダイヤルパスワード ( ユーザカードで定義 ) に置き換えられる。
+ClickToDialDesc=このモジュールは、デスクトップコンピュータを使用している場合、電話番号をクリック可能なリンクに変更する。クリックするとその番号に電話がかかる。これは、デスクトップでソフトフォンを使用している場合や、SIPプロトコルに基づくCTIシステムを使用している場合などに、通話を開始するために使用できる。注：スマートフォンを使用する場合、電話番号は常にクリック可能。
+ClickToDialUseTelLink=電話番号にリンク「tel：」を使用する
+ClickToDialUseTelLinkDesc=ユーザがブラウザと同じコンピュータにソフトフォンまたはソフトウェアインターフェイスをインストールしていて、ブラウザで「tel：」で始まるリンクをクリックすると呼び出される場合は、この方法を使用する。完全なサーバーソリューションが必要な場合 ( ローカルソフトウェアをインストールする必要がない場合 ) 、これを「いいえ」に設定して、次のフィールドに入力する必要がある。
 ##### Point Of Sale (CashDesk) #####
-CashDesk=Point of Sale
-CashDeskSetup=Point of Sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sales
-CashDeskBankAccountForSell=現金支払いを受け取るために使用するデフォルトのアカウント
-CashDeskBankAccountForCheque=Default account to use to receive payments by check
-CashDeskBankAccountForCB=クレジットカードでの現金支払いを受け取るために使用するデフォルトのアカウント
-CashDeskBankAccountForSumup=Default bank account to use to receive payments by SumUp
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sale is done from Point of Sale (if "no", stock decrease is done for each sale done from POS, irrespective of the option set in module Stock).
-CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point of Sale disabled
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with module Serial/Lot management (currently active) so stock decrease is disabled.
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sale from Point of Sale. Hence a warehouse is required.
-CashDeskForceDecreaseStockLabel=Stock decrease for batch products was forced.
-CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
-CashDeskReaderKeyCodeForEnter=Key code for "Enter" defined in barcode reader (Example: 13)
+CashDesk=POS
+CashDeskSetup=POSモジュールの設定
+CashDeskThirdPartyForSell=販売に使用するデフォルトのジェネリック取引先
+CashDeskBankAccountForSell=現金支払いを受け取るために使用するデフォルトの勘定科目
+CashDeskBankAccountForCheque=小切手による支払いの受け取りに使用するデフォルトの勘定科目
+CashDeskBankAccountForCB=クレジットカードでの現金支払いを受け取るために使用するデフォルトの勘定科目
+CashDeskBankAccountForSumup=SumUpによる支払いの受け取りに使用するデフォルトの銀行口座
+CashDeskDoNotDecreaseStock=POSから販売が行われる場合、在庫減少を無効にする ( 「いいえ」の場合、在庫モジュールで設定されたオプションに関係なく、POSから行われた販売ごとに在庫減少が行われる ) 。
+CashDeskIdWareHouse=在庫減少に使用する倉庫を強制および制限する
+StockDecreaseForPointOfSaleDisabled=POSからの在庫減少が無効になった
+StockDecreaseForPointOfSaleDisabledbyBatch=POSの在庫減少は、モジュールシリアル/ロット管理 ( 現在アクティブ ) と互換性がないため、在庫減少は無効になっている。
+CashDeskYouDidNotDisableStockDecease=POSから販売するときに、在庫減少を無効にしなかった。したがって、倉庫が必要。
+CashDeskForceDecreaseStockLabel=バッチ製品の在庫減少を余儀なくされました。
+CashDeskForceDecreaseStockDesc=最も古いeatbyおよびsellbyの日付で最初に減らする。
+CashDeskReaderKeyCodeForEnter=バーコードリーダーで定義された「Enter」のキーコード ( 例：13 ) 
 ##### Bookmark #####
-BookmarkSetup=モジュールのセットアップをブックマーク
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or external web sites on your left menu.
+BookmarkSetup=モジュールの設定をブックマーク
+BookmarkDesc=このモジュールを使用すると、ブックマークを管理できる。左側のメニューで、Dolibarrページまたは外部Webサイトへのショートカットを追加することもできる。
 NbOfBoomarkToShow=左側のメニューに表示するブックマークの最大数
 ##### WebServices #####
-WebServicesSetup=ウェブサービスモジュールのセットアップ
-WebServicesDesc=このモジュールを有効にすることによって、Dolibarrでは、その他のウェブサービスを提供するWebサービスのサーバーになります。
-WSDLCanBeDownloadedHere=提供されるサービスのWSDL記述子ファイルはここからダウンロードできます。
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
+WebServicesSetup=ウェブサービスモジュールの設定
+WebServicesDesc=このモジュールを有効にすることによって、Dolibarrでは、その他のウェブサービスを提供するWebサービスのサーバーになる。
+WSDLCanBeDownloadedHere=提供されるサービスのWSDL記述子ファイルはここからダウンロードできる。
+EndPointIs=SOAPクライアントは、URLで入手可能なDolibarrエンドポイントにリクエストを送信する必要がある
 ##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore and test the APIs at URL
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
+ApiSetup=APIモジュールの設定
+ApiDesc=このモジュールを有効にすることで、DolibarrはさまざまなWebサービスを提供するRESTサーバーになる。
+ApiProductionMode=本番モードを有効にする ( これにより、サービス管理のためのキャッシュの使用がアクティブになる ) 
+ApiExporerIs=URLでAPIを調べてテストできる
+OnlyActiveElementsAreExposed=有効なモジュールの要素のみが公開される
+ApiKey=APIのキー
+WarningAPIExplorerDisabled=APIエクスプローラーが無効になっている。 APIサービスを提供するためにAPIエクスプローラーは必要ない。これは、開発者がRESTAPIを検索/テストするためのツール。このツールが必要な場合は、モジュールAPIRESTの設定に移動してアクティブにする。
 ##### Bank #####
-BankSetupModule=銀行のモジュールのセットアップ
-FreeLegalTextOnChequeReceipts=Free text on check receipts
+BankSetupModule=銀行のモジュールの設定
+FreeLegalTextOnChequeReceipts=小切手領収書のフリーテキスト
 BankOrderShow=&quot;詳細なバンク番号&quot;を使用して、国の銀行口座の順序を表示
 BankOrderGlobal=一般的な
 BankOrderGlobalDesc=一般的な表示順
 BankOrderES=スペイン語
 BankOrderESDesc=スペイン語の表示順​​序
-ChequeReceiptsNumberingModule=Check Receipts Numbering Module
+ChequeReceiptsNumberingModule=領収書番号付けモジュールを確認する
 ##### Multicompany #####
-MultiCompanySetup=マルチ会社のモジュールのセットアップ
+MultiCompanySetup=マルチ法人のモジュールの設定
 ##### Suppliers #####
-SuppliersSetup=Vendor module setup
-SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
-SuppliersInvoiceModel=Complete template of Vendor Invoice
-SuppliersInvoiceNumberingModel=Vendor invoices numbering models
-IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
+SuppliersSetup=仕入先モジュールの設定
+SuppliersCommandModel=注文書の完全なテンプレート
+SuppliersCommandModelMuscadet=注文書の完全なテンプレート ( cornasテンプレートの古い実装 ) 
+SuppliersInvoiceModel=仕入先請求書の完全なテンプレート
+SuppliersInvoiceNumberingModel=仕入先の請求書の番号付けモデル
+IfSetToYesDontForgetPermission=null以外の値に設定されている場合は、2回目の承認を許可されたグループまたはユーザにアクセス許可を提供することを忘れないこと
 ##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=のGeoIP Maxmindモジュールのセットアップ
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
-NoteOnPathLocation=国のデータファイルへのあなたのIPは、PHPが読み取ることができるディレクトリ内になければならないことに注意してください（お使いのPHPのopen_basedirの設定とファイルシステムのアクセス権を確認します）。
-YouCanDownloadFreeDatFileTo=あなたは%sでMaxmindののGeoIP国ファイルの<b>無料デモ版を</b>ダウンロード<b>する</b>こと<b>が</b>できます。
-YouCanDownloadAdvancedDatFileTo=また、%sでMaxmindののGeoIP国のファイルの<b>更新と</b> 、より<b>完全なバージョンを、</b>ダウンロードすることができます。
+GeoIPMaxmindSetup=のGeoIP Maxmindモジュールの設定
+PathToGeoIPMaxmindCountryDataFile=MaxmindIPから国への翻訳を含むファイルへのパス。 <br>例：<br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoLite2-Country.mmdb
+NoteOnPathLocation=国のデータファイルへのあなたのIPは、PHPが読み取ることができるディレクトリ内になければならないことに注意すること ( お使いのPHPのopen_basedirの設定とファイルシステムのアクセス権を確認する ) 。
+YouCanDownloadFreeDatFileTo=あなたは%sでMaxmindののGeoIP国ファイルの<b>無料デモ版を</b>ダウンロード<b>する</b>こと<b>が</b>できる。
+YouCanDownloadAdvancedDatFileTo=また、%sでMaxmindののGeoIP国のファイルの<b>更新と</b> 、より<b>完全なバージョンを、</b>ダウンロードすることができる。
 TestGeoIPResult=変換IPのテスト - &gt;国
 ##### Projects #####
 ProjectsNumberingModules=プロジェクトは、モジュールの番号
-ProjectsSetup=プロジェクトモジュールのセットアップ
+ProjectsSetup=プロジェクトモジュールの設定
 ProjectsModelModule=プロジェクトの報告書ドキュメントモデル
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
-UseSearchToSelectProject=Wait until a key is pressed before loading content of Project combo list.<br>This may improve performance if you have a large number of projects, but it is less convenient.
+TasksNumberingModules=タスク番号付けモジュール
+TaskModelModule=タスクレポートドキュメントモデル
+UseSearchToSelectProject=キーが押されるまで待ってから、プロジェクトコンボリストのコンテンツをロードすること。 <br>これにより、プロジェクトの数が多い場合にパフォーマンスが向上する可能性があるが、あまり便利ではない。
 ##### ECM (GED) #####
 ##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
-ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
-ExpenseReportNumberingModules=Expense reports numbering module
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of automatic notifications per user*
-ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
-ListOfFixedNotifications=List of automatic fixed notifications
-GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
-Threshold=Threshold
-BackupDumpWizard=Wizard to build the database dump file
-BackupZipWizard=Wizard to build the archive of documents directory
-SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
-SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
-InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
-HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
-HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
-HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
-TextTitleColor=Text color of Page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableTitleTextColor=Text color for Table title line
-BackgroundTableTitleTextlinkColor=Text color for Table title link line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
-Enter0or1=Enter 0 or 1
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-ColorFormat=The RGB color is in HEX format, eg: FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
-RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offers a page or web site to check the status of your shipments, you may enter it here. You can use the key {TRACKID} in the URL parameters so the system will replace it with the tracking number the user entered into the shipment card.
-OpportunityPercent=When you create a lead, you will define an estimated amount of project/lead. According to status of the lead, this amount may be multiplied by this rate to evaluate a total amount all your leads may generate. Value is a percentage (between 0 and 100).
-TemplateForElement=This template record is dedicated to which element
-TypeOfTemplate=Type of template
-TemplateIsVisibleByOwnerOnly=Template is visible to owner only
-VisibleEverywhere=Visible everywhere
-VisibleNowhere=Visible nowhere
-FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
-ExpectedSize=Expected size
-CurrentSize=Current size
-ForcedConstants=Required constant values
-MailToSendProposal=Customer proposals
-MailToSendOrder=Sales orders
-MailToSendInvoice=Customer invoices
+AccountingPeriods=会計期間
+AccountingPeriodCard=会計期間
+NewFiscalYear=新規会計期間
+OpenFiscalYear=オープン会計期間
+CloseFiscalYear=会計期間を閉じる
+DeleteFiscalYear=会計期間を削除する
+ConfirmDeleteFiscalYear=この会計期間を削除してもよいか？
+ShowFiscalYear=会計期間を表示する
+AlwaysEditable=いつでも編集可能
+MAIN_APPLICATION_TITLE=アプリケーションの表示名を強制する ( 警告：ここで自分の名前を設定すると、DoliDroidモバイルアプリケーションを使用しているときに自動入力ログイン機能が機能しなくなる可能性がある ) 
+NbMajMin=大文字の最小数
+NbNumMin=数字の最小数
+NbSpeMin=特殊文字の最小数
+NbIteConsecutive=同じ文字を繰り返す最大数
+NoAmbiCaracAutoGeneration=自動生成にあいまいな文字  ("1","l","i","|","0","O")  を使用しないこと
+SalariesSetup=モジュール給与の設定
+SortOrder=並べ替え順序
+Format=フォーマット
+TypePaymentDesc=0：顧客支払い種別、1：仕入先支払い種別、2：顧客とサプライヤーの両方の支払い種別
+IncludePath=インクルードパス ( 変数%sに定義 ) 
+ExpenseReportsSetup=モジュール経費報告書の設定
+TemplatePDFExpenseReports=経費報告書ドキュメントを生成するためのドキュメントテンプレート
+ExpenseReportsRulesSetup=モジュール経費報告書の設定-ルール
+ExpenseReportNumberingModules=経費報告書の番号付けモジュール
+NoModueToManageStockIncrease=自動在庫増加を管理できるモジュールはアクティブ化されていない。在庫増加は手動入力のみで行われる。
+YouMayFindNotificationsFeaturesIntoModuleNotification=モジュール「通知」を有効にして構成することにより、電子メール通知のオプションを見つけることができる。
+ListOfNotificationsPerUser=ユーザごとの自動通知のリスト*
+ListOfNotificationsPerUserOrContact=ユーザごと*または連絡先ごとに利用可能な ( ビジネスイベントでの ) 可能な自動通知のリスト**
+ListOfFixedNotifications=自動固定通知のリスト
+GoOntoUserCardToAddMore=ユーザの "通知" タブに移動して、ユーザへの通知を追加または削除する
+GoOntoContactCardToAddMore=取引先の ”通知” タブに移動して、連絡先/アドレスの通知を追加または削除する
+Threshold=しきい値
+BackupDumpWizard=データベースダンプファイルを作成するウィザード
+BackupZipWizard=ドキュメントディレクトリのアーカイブを構築するウィザード
+SomethingMakeInstallFromWebNotPossible=次の理由により、Webインターフェイスから外部モジュールをインストールすることはできない。
+SomethingMakeInstallFromWebNotPossible2=このため、ここで説明するアップグレードプロセスは、特権ユーザのみが実行できる手動プロセス。
+InstallModuleFromWebHasBeenDisabledByFile=アプリケーションからの外部モジュールのインストールが管理者によって無効にされている。この機能を許可するには、ファイル<strong> %s</strong>を削除するように彼に依頼する必要がある。
+ConfFileMustContainCustom=アプリケーションから外部モジュールをインストールまたはビルドするには、モジュールファイルをディレクトリ<strong> %s</strong>に保存する必要がある。このディレクトリをDolibarrで処理するには、<strong> conf / conf.php </strong>を設定して、2つのディレクティブ行を追加する必要がある。<br><strong>$ dolibarr_main_url_root_alt = '/ custom'; </strong> <br> <strong> $ dolibarr_main_document_root_alt = '%s / custom'; </strong>
+HighlightLinesOnMouseHover=マウスの動きが通過したときにテーブルの行を強調表示する
+HighlightLinesColor=マウスが通過したときの線のハイライト色 ( ハイライトなしの場合は「ffffff」を使用 ) 
+HighlightLinesChecked=チェックされたときの線のハイライト色 ( ハイライトなしの場合は「ffffff」を使用 ) 
+TextTitleColor=ページタイトルのテキストの色
+LinkColor=リンクの色
+PressF5AfterChangingThis=キーボードのCTRL + F5を押すか、この値を変更して有効にするためにブラウザのキャッシュをクリアする
+NotSupportedByAllThemes=コアテーマで動作するが、外部テーマではサポートされていない可能性がある
+BackgroundColor=背景色
+TopMenuBackgroundColor=トップメニューの背景色
+TopMenuDisableImages=トップメニューで画像を非表示
+LeftMenuBackgroundColor=左メニューの背景色
+BackgroundTableTitleColor=表のタイトル行の背景色
+BackgroundTableTitleTextColor=表のタイトル行のテキストの色
+BackgroundTableTitleTextlinkColor=表のタイトルのリンク行のテキストの色
+BackgroundTableLineOddColor=奇数のテーブルラインの背景色
+BackgroundTableLineEvenColor=偶数のテーブルラインの背景色
+MinimumNoticePeriod=最小通知期間 ( 休暇申請はこの遅延の前に行う必要がある ) 
+NbAddedAutomatically=ユーザのカウンターに毎月 ( 自動的に ) 追加される日数
+EnterAnyCode=このフィールドには、行を識別するための参照が含まれている。特殊文字を使用せずに、任意の値を入力する。
+Enter0or1=0または1を入力すること
+UnicodeCurrency=中括弧、通貨記号を表すバイト番号のリストの間にここに入力する。例：$の場合は【36】と入力する-ブラジルレアルの場合はR $ 【82,36】-€の場合は【8364】と入力する
+ColorFormat=RGBカラーはHEX形式  例: FF0000
+PictoHelp=dolibarr形式のアイコン名 ( 現在のテーマディレクトリにある場合は「image.png」、モジュールのディレクトリ/ img /にある場合は「image.png@nom_du_module」 ) 
+PositionIntoComboList=コンボリストへの行の位置
+SellTaxRate=消費税率
+RecuperableOnly=フランスの一部の州専用のVAT「認識されていないが回復可能」についてははい。それ以外の場合は、値を「いいえ」のままにすること。
+UrlTrackingDesc=プロバイダーまたは輸送サービスが出荷のステータスを確認するためのページまたはWebサイトを提供している場合は、ここに入力できる。 URLパラメータでキー{TRACKID}を使用すると、システムはそれをユーザが出荷カードに入力した追跡番号に置き換える。
+OpportunityPercent=引合を作成するときは、プロジェクト/引合の推定量を定義する。引合のステータスに応じて、この金額にこのレートを掛けて、すべての引合が生成する可能性のある合計金額を評価することができる。値はパーセンテージ  ( 0から100の間 ) 。
+TemplateForElement=このテンプレートレコードは、どの要素専用 
+TypeOfTemplate=テンプレートの種類
+TemplateIsVisibleByOwnerOnly=テンプレートは所有者にのみ表示される
+VisibleEverywhere=どこにでも見える
+VisibleNowhere=どこにも見えない
+FixTZ=TimeZoneの修正
+FillFixTZOnlyIfRequired=例：+2 ( 問題が発生した場合にのみ入力 ) 
+ExpectedChecksum=予想されるチェックサム
+CurrentChecksum=現在のチェックサム
+ExpectedSize=予想サイズ
+CurrentSize=現在のサイズ
+ForcedConstants=必要な定数値
+MailToSendProposal=顧客の提案
+MailToSendOrder=受注
+MailToSendInvoice=顧客の請求書
 MailToSendShipment=出荷
-MailToSendIntervention=介入
-MailToSendSupplierRequestForQuotation=Quotation request
-MailToSendSupplierOrder=Purchase orders
-MailToSendSupplierInvoice=Vendor invoices
+MailToSendIntervention=出張
+MailToSendSupplierRequestForQuotation=見積依頼
+MailToSendSupplierOrder=注文書
+MailToSendSupplierInvoice=仕入先の請求書
 MailToSendContract=契約
-MailToSendReception=Receptions
-MailToThirdparty=サードパーティ
+MailToSendReception=レセプション
+MailToThirdparty=取引先
 MailToMember=メンバー
-MailToUser=ユーザー
-MailToProject=Projects page
-MailToTicket=Tickets
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
-ModelModulesProduct=Templates for product documents
-WarehouseModelModules=Templates for documents of warehouses
-ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-SeeChangeLog=See ChangeLog file (english only)
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDataTables=Add object tables
-AddDictionaries=Add dictionaries tables
-AddData=Add objects or dictionaries data
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved in database user table and must be provided on each API call)
-ListOfAvailableAPIs=List of available APIs
-activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
-CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
-LandingPage=Landing page
-SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", the price will also be the same for all companies if products are shared between environments
-ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
-UserHasNoPermissions=This user has no permissions defined
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "%s")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "%s" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month after delta (delta is field "%s", N is stored into field "%s")
-BaseCurrency=Reference currency of the company (go into setup of company to change this)
-WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016).
-WarningNoteModulePOSForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
-WarningInstallationMayBecomeNotCompliantWithLaw=You are trying to install module %s that is an external module. Activating an external module means you trust the publisher of that module and that you are sure that this module does not adversely impact the behavior of your application, and is compliant with laws of your country (%s). If the module introduces an illegal feature, you become responsible for the use of illegal software.
-MAIN_PDF_MARGIN_LEFT=Left margin on PDF
-MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
-MAIN_PDF_MARGIN_TOP=Top margin on PDF
-MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
-MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
-NothingToSetup=There is no specific setup required for this module.
-SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
-SeveralLangugeVariatFound=Several language variants found
-RemoveSpecialChars=Remove special characters
-COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
-COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
-COMPANY_DIGITARIA_UNIQUE_CODE=Duplicate not allowed
-GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
-GDPRContactDesc=If you store data about European companies/citizens, you can name the contact who is responsible for the General Data Protection Regulation here
-HelpOnTooltip=Help text to show on tooltip
-HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
-YouCanDeleteFileOnServerWith=You can delete this file on the server with Command Line:<br>%s
-ChartLoaded=Chart of account loaded
-SocialNetworkSetup=Setup of module Social Networks
-EnableFeatureFor=Enable features for <strong>%s</strong>
-VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
-EmailCollector=Email collector
-EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
-NewEmailCollector=New Email Collector
-EMailHost=Host of email IMAP server
-MailboxSourceDirectory=Mailbox source directory
-MailboxTargetDirectory=Mailbox target directory
-EmailcollectorOperations=Operations to do by collector
-MaxEmailCollectPerCollect=Max number of emails collected per collect
-CollectNow=Collect now
-ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
-LastResult=Latest result
-EmailCollectorConfirmCollectTitle=Email collect confirmation
-EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
-NoNewEmailToProcess=No new email (matching filters) to process
-NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
-CodeLastResult=Latest result code
-NbOfEmailsInInbox=Number of emails in source directory
-LoadThirdPartyFromName=Load third party searching on %s (load only)
-LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
-WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
-CreateCandidature=Create candidature
+MailToUser=ユーザ
+MailToProject=プロジェクト
+MailToTicket=切符売場
+ByDefaultInList=リストビューにデフォルトで表示
+YouUseLastStableVersion=最新の安定バージョンを使用する
+TitleExampleForMajorRelease=このメジャーリリースを発表するために使用できるメッセージの例 ( Webサイトで自由に使用すること ) 
+TitleExampleForMaintenanceRelease=このメンテナンスリリースを発表するために使用できるメッセージの例 ( Webサイトで自由に使用すること ) 
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP＆CRM%sが利用可能。バージョン%sは、ユーザと開発者の両方に多くの新機能を備えたメジャーリリース。 https://www.dolibarr.orgポータル ( サブディレクトリStableバージョン ) のダウンロードエリアからダウンロードできる。変更の完全なリストについては、<a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog</a>を読むことができる。
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP＆CRM%sが利用可能。バージョン%sはメンテナンスバージョンであるため、バグ修正のみが含まれている。すべてのユーザがこのバージョンにアップグレードすることをお勧めする。メンテナンスリリースでは、データベースに新規機能や変更は導入されない。 https://www.dolibarr.orgポータル ( サブディレクトリStableバージョン ) のダウンロードエリアからダウンロードできる。変更の完全なリストについては、<a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog</a>を読むことができる。
+MultiPriceRuleDesc=オプション「製品/サービスごとの価格のいくつかのレベル」が有効になっている場合、製品ごとに異なる価格 ( 価格レベルごとに1つ ) を定義できる。時間を節約するために、ここで、最初のレベルの価格に基づいて各レベルの価格を自動計算するルールを入力できる。したがって、各製品の最初のレベルの価格を入力するだけで済む。このページは時間を節約するように設計されているが、各レベルの価格が最初のレベルに関連している場合にのみ役立つ。ほとんどの場合、このページは無視してかまいない。
+ModelModulesProduct=製品ドキュメントのテンプレート
+WarehouseModelModules=倉庫のドキュメントのテンプレート
+ToGenerateCodeDefineAutomaticRuleFirst=コードを自動的に生成できるようにするには、最初にバーコード番号を自動定義するマネージャーを定義する必要がある。
+SeeSubstitutionVars=可能な置換変数のリストについては、*注を参照すること
+SeeChangeLog=ChangeLogファイルを参照すること ( 英語のみ ) 
+AllPublishers=すべての出版社
+UnknownPublishers=不明な発行元
+AddRemoveTabs=タブを追加または削除する
+AddDataTables=オブジェクトテーブルを追加する
+AddDictionaries=辞書テーブルを追加する
+AddData=オブジェクトまたは辞書データを追加する
+AddBoxes=ウィジェットを追加する
+AddSheduledJobs=スケジュールされたジョブを追加する
+AddHooks=フックを追加する
+AddTriggers=トリガーを追加する
+AddMenus=メニューを追加する
+AddPermissions=権限を追加する
+AddExportProfiles=エクスポートプロファイルを追加する
+AddImportProfiles=インポートプロファイルを追加する
+AddOtherPagesOrServices=他のページやサービスを追加する
+AddModels=ドキュメントまたは番号付けテンプレートを追加する
+AddSubstitutions=キー置換を追加
+DetectionNotPossible=検出できない
+UrlToGetKeyToUseAPIs=APIを使用するためのトークンを取得するためのURL ( トークンが受信されると、データベースのユーザテーブルに保存され、各API呼び出しで提供する必要がある ) 
+ListOfAvailableAPIs=利用可能なAPIのリスト
+activateModuleDependNotSatisfied=モジュール「%s」はモジュール「%s」に依存しているため、モジュール「%1$s」が正しく機能しない場合がある。予期せぬ事態から安全を確保したい場合は、モジュール「%2$s」をインストールするか、モジュール「%1$s」を無効にすること。
+CommandIsNotInsideAllowedCommands=実行しようとしているコマンドは、<strong> conf.php</strong>ファイルのパラメーター<strong> $ dolibarr_main_restrict_os_commands</strong>で定義されている許可されたコマンドのリストにない。
+LandingPage=ランディングページ
+SamePriceAlsoForSharedCompanies=複数の法人のモジュールを使用し、「単一価格」を選択した場合、製品が環境間で共有されていれば、価格もすべての法人で同じになる
+ModuleEnabledAdminMustCheckRights=モジュールがアクティブ化されました。アクティブ化されたモジュールのアクセス許可は、管理者ユーザにのみ付与されました。必要に応じて、他のユーザまたはグループに手動でアクセス許可を付与する必要がある場合がある。
+UserHasNoPermissions=このユーザには権限が定義されていない
+TypeCdr=支払い期間の日付が請求書の日付に日数のデルタを加えたものである場合は「なし」を使用する ( デルタはフィールド「%s」 ) <br>デルタの後、日付を増やして終了する必要がある場合は、「月末」を使用する月の ( +オプションの「%s」 ( 日数 )  ) <br>「現在/次」を使用して、支払い期間の日付をデルタの後の月の最初のN番目にする ( デルタはフィールド「%s」、Nはフィールド「%s」に格納される ) 
+BaseCurrency=法人の参照通貨 ( これを変更するには、法人の設定に入ります ) 
+WarningNoteModuleInvoiceForFrenchLaw=このモジュール%sは、フランスの法律 ( Loi Finance 2016 ) に準拠している。
+WarningNoteModulePOSForFrenchLaw=このモジュール%sは、モジュールNon Reversible Logsが自動的にアクティブ化されるため、フランスの法律 ( Loi Finance 2016 ) に準拠している。
+WarningInstallationMayBecomeNotCompliantWithLaw=外部モジュールであるモジュール%sをインストールしようとしている。外部モジュールをアクティブ化すると、そのモジュールの発行元を信頼し、このモジュールがアプリケーションの動作に悪影響を与えず、国の法律 ( %s ) に準拠していることを確認できる。モジュールが違法な機能を導入した場合、違法なソフトウェアの使用について責任を負うことになる。
+MAIN_PDF_MARGIN_LEFT=PDFの左マージン
+MAIN_PDF_MARGIN_RIGHT=PDFの右マージン
+MAIN_PDF_MARGIN_TOP=PDFの上部マージン
+MAIN_PDF_MARGIN_BOTTOM=PDFの下マージン
+MAIN_DOCUMENTS_LOGO_HEIGHT=PDFのロゴの高さ
+NothingToSetup=このモジュールに必要な特定の設定はない。
+SetToYesIfGroupIsComputationOfOtherGroups=このグループが他のグループの計算である場合は、これをyesに設定する
+EnterCalculationRuleIfPreviousFieldIsYes=前のフィールドが「はい」に設定されている場合は、計算ルールを入力する ( たとえば、「CODEGRP1 + CODEGRP2」 ) 
+SeveralLangugeVariatFound=いくつかの言語バリアントが見つかりました
+RemoveSpecialChars=特殊文字を削除する
+COMPANY_AQUARIUM_CLEAN_REGEX=値をクリーンアップするための正規表現フィルター ( COMPANY_AQUARIUM_CLEAN_REGEX ) 
+COMPANY_DIGITARIA_CLEAN_REGEX=値をクリーンアップするための正規表現フィルター ( COMPANY_DIGITARIA_CLEAN_REGEX ) 
+COMPANY_DIGITARIA_UNIQUE_CODE=複製は許可されていない
+GDPRContact=データ保護責任者 ( DPO、データプライバシーまたはGDPRの連絡先 ) 
+GDPRContactDesc=ヨーロッパの企業/市民に関するデータを保存する場合は、ここで一般データ保護規則の責任者を指定できる
+HelpOnTooltip=ツールチップに表示するヘルプテキスト
+HelpOnTooltipDesc=このフィールドがフォームに表示されたときにツールチップに表示されるテキストのテキストまたは翻訳キーをここに入力する
+YouCanDeleteFileOnServerWith=次のコマンドラインを使用して、サーバー上のこのファイルを削除できる：<br> %s
+ChartLoaded=ロードされた勘定科目表
+SocialNetworkSetup=モジュールソーシャルネットワークの設定
+EnableFeatureFor=<strong> %s</strong>の機能を有効にする
+VATIsUsedIsOff=注：消費税またはVATを使用するオプションは、メニュー%s-%sで<strong> Off </strong>に設定されているため、消費税または使用される付加価値税は常に0になる。
+SwapSenderAndRecipientOnPDF=PDFドキュメントの送信者と受信者のアドレス位置を入れ替えます
+FeatureSupportedOnTextFieldsOnly=警告、機能はテキストフィールドでのみサポートされている。また、この機能をトリガーするには、URLパラメータ action=create または action=edit を設定するか、ページ名が 'new.php' で終わる必要がある。
+EmailCollector=メールコレクター
+EmailCollectorDescription=スケジュールされたジョブと設定ページを追加して、 ( IMAPプロトコルを使用して ) 定期的に電子メールボックスをスキャンし、アプリケーションに受信した電子メールを適切な場所で記録したり、いくつかの記録を自動的に作成したりする ( 引合など ) 。
+NewEmailCollector=新規Eメールコレクター
+EMailHost=電子メールIMAPサーバーのホスト
+MailboxSourceDirectory=メールボックスのソースディレクトリ
+MailboxTargetDirectory=メールボックスのターゲットディレクトリ
+EmailcollectorOperations=コレクターによる操作
+MaxEmailCollectPerCollect=収集ごとに収集される電子メールの最大数
+CollectNow=今すぐ収集
+ConfirmCloneEmailCollector=メールコレクター%sのクローンを作成してもよいか？
+DateLastCollectResult=最新の収集が試行された日付
+DateLastcollectResultOk=最新の収集が成功した日付
+LastResult=最新の結果
+EmailCollectorConfirmCollectTitle=メール収集確認
+EmailCollectorConfirmCollect=このコレクターのコレクションを今すぐ実行するか？
+NoNewEmailToProcess=処理する新規電子メール ( 一致するフィルター ) はない
+NothingProcessed=何もしていない
+XEmailsDoneYActionsDone=%s電子メールが修飾され、%s電子メールが正常に処理されました ( %sレコード/アクションが実行された場合 ) 
+RecordEvent=メールイベントを記録する
+CreateLeadAndThirdParty=引合 ( および必要に応じて取引先 ) を作成する
+CreateTicketAndThirdParty=チケットを作成する ( 以前の操作でロードされた場合は取引先にリンクする ) 
+CodeLastResult=最新の結果コード
+NbOfEmailsInInbox=ソースディレクトリ内の電子メールの数
+LoadThirdPartyFromName=%sで検索している取引先をロードする ( ロードのみ ) 
+LoadThirdPartyFromNameOrCreate=%sで検索している取引先をロードする ( 見つからない場合は作成する ) 
+WithDolTrackingID=Dolibarrから送信された最初の電子メールによって開始された会話からのメッセージ
+WithoutDolTrackingID=Dolibarrから送信されていない最初の電子メールによって開始された会話からのメッセージ
+WithDolTrackingIDInMsgId=Dolibarrから送信されたメッセージ
+WithoutDolTrackingIDInMsgId=Dolibarrからメッセージが送信されていない
+CreateCandidature=候補を作成する
 FormatZip=ZIP
-MainMenuCode=Menu entry code (mainmenu)
-ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-OpeningHours=Opening hours
-OpeningHoursDesc=Enter here the regular opening hours of your company.
-ResourceSetup=Configuration of Resource module
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disable feature to link a resource to users
-DisabledResourceLinkContact=Disable feature to link a resource to contacts
-EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
-ConfirmUnactivation=Confirm module reset
-OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
-MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
-MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
-MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
-MAIN_OPTIMIZEFORCOLORBLINDDesc=Enable this option if you are a color blind person, in some case interface will change color setup to increase contrast.
-Protanopia=Protanopia
-Deuteranopes=Deuteranopes
-Tritanopes=Tritanopes
-ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
-DefaultCustomerType=Default thirdparty type for "New customer" creation form
-ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
-RootCategoryForProductsToSell=Root category of products to sell
-RootCategoryForProductsToSellDesc=If defined, only products inside this category or childs of this category will be available in the Point Of Sale
-DebugBar=Debug Bar
-DebugBarDesc=Toolbar that comes with a plenty of tools to simplify debugging
-DebugBarSetup=DebugBar Setup
-GeneralOptions=General Options
-LogsLinesNumber=Number of lines to show on logs tab
-UseDebugBar=Use the debug bar
-DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
-WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-ModuleActivated=Module %s is activated and slows the interface
-EXPORTS_SHARE_MODELS=Export models are share with everybody
-ExportSetup=Setup of module Export
-ImportSetup=Setup of module Import
-InstanceUniqueID=Unique ID of the instance
-SmallerThan=Smaller than
-LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
-WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
-EndPointFor=End point for %s : %s
-DeleteEmailCollector=Delete email collector
-ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
-RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
-AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
-RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
-IPListExample=127.0.0.1 192.168.0.2 [::1]
-BaseOnSabeDavVersion=Based on the library SabreDAV version
-NotAPublicIp=Not a public IP
-MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
-EmailTemplate=Template for email
-EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
-PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
-FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
-RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
-JumpToBoxes=Jump to Setup -> Widgets
-MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
-MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
-TemplateAdded=Template added
-TemplateUpdated=Template updated
-TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MainMenuCode=メニュー入力コード ( メインメニュー ) 
+ECMAutoTree=自動ECMツリーを表示する
+OperationParamDesc=アクションのオブジェクトに使用する値、または値を抽出する方法を定義する。例:<br>objproperty1=SET:設定する値<br>objproperty2=SET:__ objproperty1__を置き換えた値<br>objproperty3=SETIFEMPTY:objproperty3がまだ定義されていない場合に使用される値<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:私の法人名は\\s([^\\s]*)<br><br>プロパティを抽出または設定するための区切り文字としての 文字 ; を使う。
+OpeningHours=営業時間
+OpeningHoursDesc=あなたの法人の通常の営業時間をここに入力すること。
+ResourceSetup=リソースモジュールの構成
+UseSearchToSelectResource= ( ドロップダウンリストではなく ) 検索フォームを使用してリソースを選択する。
+DisabledResourceLinkUser=リソースをユーザにリンクする機能を無効にする
+DisabledResourceLinkContact=リソースを連絡先にリンクする機能を無効にする
+EnableResourceUsedInEventCheck=リソースがイベントで使用されているかどうかを確認する機能を有効にする
+ConfirmUnactivation=モジュールのリセットを確認する
+OnMobileOnly=小画面 ( スマートフォン ) のみ
+DisableProspectCustomerType=「見込み客+顧客」の取引先種別を無効にする ( したがって、取引先は「見込み客」または「顧客」である必要があるが、両方にすることはできない ) 
+MAIN_OPTIMIZEFORTEXTBROWSER=目の不自由な人のためのインターフェースを簡素化する
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=目の不自由な方、またはLynxやLinksなどのテキストブラウザからアプリケーションを使用する場合は、このオプションを有効にすること。
+MAIN_OPTIMIZEFORCOLORBLIND=色覚異常の人のインターフェースの色を変更する
+MAIN_OPTIMIZEFORCOLORBLINDDesc=色覚異常の人の場合は、このオプションを有効にする。場合によっては、インターフェイスによって色の設定が変更され、コントラストが向上する。
+Protanopia=1型2色覚赤色盲
+Deuteranopes=2型2色覚緑色盲
+Tritanopes=3型2色覚青色盲
+ThisValueCanOverwrittenOnUserLevel=この値は、各ユーザがそのユーザページから上書きできる-タブ '%s'
+DefaultCustomerType=「新規顧客」作成フォームのデフォルト取引先種別
+ABankAccountMustBeDefinedOnPaymentModeSetup=注：この機能を機能させるには、各支払いモード ( Paypal、Stripeなど ) のモジュールで銀行口座を定義する必要がある。
+RootCategoryForProductsToSell=販売する製品のルートカテゴリ
+RootCategoryForProductsToSellDesc=定義されている場合、このカテゴリ内の製品またはこのカテゴリの子のみがPOSで利用可能になる
+DebugBar=デバッグバー
+DebugBarDesc=デバッグを簡素化するためのツールがたくさん付属しているツールバー
+DebugBarSetup=DebugBarの設定
+GeneralOptions=一般オプション
+LogsLinesNumber=【ログ】タブに表示する行数
+UseDebugBar=デバッグバーを使用する
+DEBUGBAR_LOGS_LINES_NUMBER=コンソールに保持する最後のログ行の数
+WarningValueHigherSlowsDramaticalyOutput=警告、値を大きくすると出力が劇的に遅くなる
+ModuleActivated=モジュール%sがアクティブ化され、インターフェイスの速度が低下する
+IfYouAreOnAProductionSetThis=実稼働環境を使用している場合は、このプロパティを%sに設定する必要がある。
+AntivirusEnabledOnUpload=アップロードされたファイルでウイルス対策が有効になっている
+EXPORTS_SHARE_MODELS=エクスポートモデルは誰とでも共有
+ExportSetup=モジュールエクスポートの設定
+ImportSetup=モジュールインポートの設定
+InstanceUniqueID=インスタンスの一意のID
+SmallerThan=より小さい
+LargerThan=より大きい
+IfTrackingIDFoundEventWillBeLinked=オブジェクトの追跡IDが電子メールで見つかった場合、または電子メールがすでに収集されてオブジェクトにリンクされている電子メールの回答である場合、作成されたイベントは既知の関連オブジェクトに自動的にリンクされる。
+WithGMailYouCanCreateADedicatedPassword=Gmailアカウントで、2段階検証を有効にした場合は、https://myaccount.google.com/ での自分のGoogleパスワードを使わないで、アプリケーション専用の2番目のパスワードを作成することを勧める。
+EmailCollectorTargetDir=正常に処理されたときに電子メールを別のタグ/ディレクトリに移動することが望ましい動作である可能性がある。この機能を使用するには、ここでディレクトリの名前を設定するだけ  ( 名前に特殊文字を使用しないこと ) 。読み取り/書き込みログインアカウントも使用する必要があることに注意すること。
+EmailCollectorLoadThirdPartyHelp=このアクションを使用すれば、メール内容を利用したデータベース内の既存の取引先の検索とロードができる。見つかった ( または作成された ) 取引先は、それを必要とする次のアクションに使用される。パラメータフィールドni\n、たとえば、'EXTRACT:BODY:Name:\\s(【^\\s】*)' と入れることで、本文の文字列 'Name: name to find'  から取引先の名前を抽出するできる。
+EndPointFor=%sのエンドポイント：%s
+DeleteEmailCollector=メールコレクターを削除する
+ConfirmDeleteEmailCollector=このメールコレクターを削除してもよいか？
+RecipientEmailsWillBeReplacedWithThisValue=受信者の電子メールは常にこの値に置き換えられる
+AtLeastOneDefaultBankAccountMandatory=少なくとも1つのデフォルトの銀行口座を定義する必要がある
+RESTRICT_ON_IP=一部のホストIPへのアクセスのみを許可する ( ワイルドカードは許可されない。値の間にスペースを使用すること ) 。空とは、すべてのホストがアクセスできることを意味する。
+IPListExample=127.0.0.1 192.168.0.2 【:: 1】
+BaseOnSabeDavVersion=ライブラリSabreDAVバージョンに基づく
+NotAPublicIp=パブリックIPではない
+MakeAnonymousPing=Dolibarr Foundationサーバーに匿名のPing「+1」を作成し ( インストール後に1回のみ実行 ) 、FoundationがDolibarrのインストール数をカウントできるようにする。
+FeatureNotAvailableWithReceptionModule=モジュールの受信が有効になっている場合、この機能は使用できない
+EmailTemplate=メールのテンプレート
+EMailsWillHaveMessageID=電子メールには、この構文に一致するタグ「参照」がある
+PDF_USE_ALSO_LANGUAGE_CODE=PDF内の一部のテキストを同じ生成PDFで2つの異なる言語で複製する場合は、ここでこの2番目の言語を設定して、生成されたPDFに同じページに2つの異なる言語が含まれるようにする必要がある。1つはPDFの生成時に選択され、もう1つは ( これをサポートしているPDFテンプレートはごくわずか  ) 。 PDFごとに1つの言語を空のままにする。
+FafaIconSocialNetworksDesc=FontAwesomeアイコンのコードをここに入力する。 FontAwesomeとは何かわからない場合は、一般的な値fa-address-bookを使用できる。
+FeatureNotAvailableWithReceptionModule=モジュールの受信が有効になっている場合、この機能は使用できない
+RssNote=注：各RSSフィード定義は、ダッシュボードで使用できるようにするために有効にする必要があるウィジェットを提供する
+JumpToBoxes=【設定】-> 【ウィジェット】にジャンプする
+MeasuringUnitTypeDesc=ここでは、「サイズ」、「表面」、「体積」、「重量」、「時間」などの値を使用する
+MeasuringScaleDesc=スケールは、デフォルトの参照単位に一致するように小数部を移動する必要がある場所の数。 「時間」単位種別の場合、秒数。 80〜99の値は予約値。
+TemplateAdded=テンプレートを追加
+TemplateUpdated=テンプレートを更新
+TemplateDeleted=テンプレートが削除されました
+MailToSendEventPush=イベントリマインダーメール
+SwitchThisForABetterSecurity=セキュリティを強化するために、この値を%sに切り替えることをお勧めする
+DictionaryProductNature= 製品の性質
+CountryIfSpecificToOneCountry=国 ( 特定の国に固有の場合 ) 
+YouMayFindSecurityAdviceHere=ここにセキュリティアドバイザリがある
+ModuleActivatedMayExposeInformation=このモジュールは機密データを公開する可能性がある。不要な場合は無効にすること。
+ModuleActivatedDoNotUseInProduction=開発用に設計されたモジュールが有効になった。実稼働環境では有効にしないこと。
diff --git a/htdocs/langs/ja_JP/banks.lang b/htdocs/langs/ja_JP/banks.lang
index 713d1efc3e8..c04eea05179 100644
--- a/htdocs/langs/ja_JP/banks.lang
+++ b/htdocs/langs/ja_JP/banks.lang
@@ -1,178 +1,182 @@
 # Dolibarr language file - Source file is en_US - banks
-Bank=バンク
-MenuBankCash=Banks | Cash
-MenuVariousPayment=Miscellaneous payments
-MenuNewVariousPayment=New Miscellaneous payment
+Bank=銀行
+MenuBankCash=銀行|現金
+MenuVariousPayment=その他の支払
+MenuNewVariousPayment=新規雑費
 BankName=銀行名
-FinancialAccount=アカウント
-BankAccount=預金
+FinancialAccount=口座
+BankAccount=銀行口座
 BankAccounts=銀行口座
-BankAccountsAndGateways=Bank accounts | Gateways
-ShowAccount=Show Account
-AccountRef=金融口座のref
+BankAccountsAndGateways=銀行口座|ゲートウェイ
+ShowAccount=口座を表示
+AccountRef=金融口座の参照符号
 AccountLabel=金融口座のラベル
 CashAccount=現金勘定
 CashAccounts=現金勘定
-CurrentAccounts=現在のアカウント
+CurrentAccounts=現在の口座
 SavingAccounts=貯蓄口座
-ErrorBankLabelAlreadyExists=金融口座のラベルにはすでに存在します
-BankBalance=バランス
-BankBalanceBefore=Balance before
-BankBalanceAfter=Balance after
-BalanceMinimalAllowed=最小許容バランス
-BalanceMinimalDesired=必要最小限のバランス
+ErrorBankLabelAlreadyExists=金融勘定のラベルはすでに存在する
+BankBalance=残高
+BankBalanceBefore=前の残高
+BankBalanceAfter=後の残高
+BalanceMinimalAllowed=最小許容残高
+BalanceMinimalDesired=必要最小限の残高
 InitialBankBalance=期首残高
 EndBankBalance=期末残高
 CurrentBalance=経常収支
-FutureBalance=将来のバランス
-ShowAllTimeBalance=最初からバランスを示す
-AllTime=From start
-Reconciliation=和解
-RIB=銀行の口座番号
+FutureBalance=将来の残高
+ShowAllTimeBalance=最初から残高を示す
+AllTime=最初から
+Reconciliation=照合
+RIB=銀行口座番号
 IBAN=IBAN番号
-BIC=BIC/SWIFT code
-SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
-IbanValid=BAN valid
-IbanNotValid=BAN not valid
-StandingOrders=Direct debit orders
-StandingOrder=Direct debit order
-PaymentByDirectDebit=Payment by direct debit
-PaymentByBankTransfers=Payments by credit transfer
-PaymentByBankTransfer=Payment by credit transfer
-AccountStatement=アカウントステートメント
-AccountStatementShort=ステートメント
-AccountStatements=アカウント文
-LastAccountStatements=前回のアカウントステートメント
+BIC=BIC / SWIFTコード
+SwiftValid=BIC / SWIFTは有効
+SwiftVNotalid=BIC / SWIFTが無効
+IbanValid=有効な禁止
+IbanNotValid=禁止は無効
+StandingOrders=口座振替の注文
+StandingOrder=口座振替の注文
+PaymentByDirectDebit=口座振替による支払
+PaymentByBankTransfers=クレジット転送による支払
+PaymentByBankTransfer=クレジット振込による支払
+AccountStatement=口座明細書
+AccountStatementShort=明細書
+AccountStatements=口座明細書s
+LastAccountStatements=前回の口座明細書
 IOMonthlyReporting=月次報告
-BankAccountDomiciliation=Bank address
-BankAccountCountry=アカウントの国
-BankAccountOwner=アカウントの所有者名
-BankAccountOwnerAddress=アカウントの所有者のアドレス
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
-CreateAccount=アカウントを作成する
-NewBankAccount=新しいアカウント
-NewFinancialAccount=新しい金融口座
-MenuNewFinancialAccount=新しい金融口座
-EditFinancialAccount=アカウントを編集する
+BankAccountDomiciliation=銀行の住所
+BankAccountCountry=口座国
+BankAccountOwner=口座所有者名
+BankAccountOwnerAddress=口座所有者のアドレス
+RIBControlError=値の整合性チェックに失敗した。これは、この口座番号の情報が完全でないか、正しくないことを意味する（国、番号、およびIBANを確認）。
+CreateAccount=口座を作成
+NewBankAccount=新規口座
+NewFinancialAccount=新規金融口座
+MenuNewFinancialAccount=新規金融口座
+EditFinancialAccount=口座を編集する
 LabelBankCashAccount=銀行や現金ラベル
-AccountType=アカウントの種類
+AccountType=口座の種類
 BankType0=普通預金口座
 BankType1=現在またはクレジットカード口座
 BankType2=現金勘定
-AccountsArea=アカウントエリア
-AccountCard=アカウントのカード
-DeleteAccount=アカウントを削除する
-ConfirmDeleteAccount=Are you sure you want to delete this account?
-Account=アカウント
-BankTransactionByCategories=Bank entries by categories
-BankTransactionForCategory=Bank entries for category <b>%s</b>
+AccountsArea=口座エリア
+AccountCard=口座カード
+DeleteAccount=口座を削除
+ConfirmDeleteAccount=この口座を削除してもよいか？
+Account=口座
+BankTransactionByCategories=カテゴリ別の銀行入力
+BankTransactionForCategory=カテゴリ<b>%s</b>の銀行入力
 RemoveFromRubrique=カテゴリとリンクを削除します。
-RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
-ListBankTransactions=List of bank entries
+RemoveFromRubriqueConfirm=入力とカテゴリの間のリンクを削除してもよいか？
+ListBankTransactions=銀行入力のリスト
 IdTransaction=トランザクションID
-BankTransactions=Bank entries
-BankTransaction=Bank entry
-ListTransactions=List entries
-ListTransactionsByCategory=List entries/category
-TransactionsToConciliate=Entries to reconcile
-TransactionsToConciliateShort=To reconcile
-Conciliable=共存し得る
-Conciliate=調整する
-Conciliation=和解
-SaveStatementOnly=Save statement only
-ReconciliationLate=Reconciliation late
-IncludeClosedAccount=閉じたアカウントを含める
-OnlyOpenedAccount=Only open accounts
-AccountToCredit=クレジットのアカウント
-AccountToDebit=振替にアカウント
-DisableConciliation=このアカウントのための調整機能を無効にする
-ConciliationDisabled=和解の機能が無効になって
-LinkedToAConciliatedTransaction=Linked to a conciliated entry
+BankTransactions=銀行入力
+BankTransaction=銀行入力
+ListTransactions=入力を一覧表示
+ListTransactionsByCategory=入力/カテゴリのリスト
+TransactionsToConciliate=照合する入力
+TransactionsToConciliateShort=照合する
+Conciliable=照合可能
+Conciliate=照合する
+Conciliation=照合
+SaveStatementOnly=明細書のみを保存
+ReconciliationLate=照合が遅れる
+IncludeClosedAccount=閉鎖口座を含める
+OnlyOpenedAccount=開設口座のみ
+AccountToCredit=クレジットの口座
+AccountToDebit=引落口座
+DisableConciliation=この口座のための照合機能を無効にする
+ConciliationDisabled=照合の機能が無効になって
+LinkedToAConciliatedTransaction=調整された入力にリンクされている
 StatusAccountOpened=開く
 StatusAccountClosed=閉じ
 AccountIdShort=数
 LineRecord=トランザクション
-AddBankRecord=Add entry
-AddBankRecordLong=Add entry manually
-Conciliated=Reconciled
-ConciliatedBy=による和解
-DateConciliating=日付を調整する
-BankLineConciliated=Entry reconciled with bank receipt
-Reconciled=Reconciled
-NotReconciled=Not reconciled
+AddBankRecord=入力を追加
+AddBankRecordLong=手動で入力を追加
+Conciliated=照合
+ConciliatedBy=による照合
+DateConciliating=日付を照合
+BankLineConciliated=銀行の領収書と照合した入力
+Reconciled=照合
+NotReconciled=照合されていない
 CustomerInvoicePayment=顧客の支払い
-SupplierInvoicePayment=Vendor payment
+SupplierInvoicePayment=仕入先の支払
 SubscriptionPayment=サブスクリプション費用の支払い
-WithdrawalPayment=Debit payment order
-SocialContributionPayment=Social/fiscal tax payment
-BankTransfer=Credit transfer
-BankTransfers=Credit transfers
-MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
-TransferFrom=からの
-TransferTo=への
+WithdrawalPayment=デビット支払注文
+SocialContributionPayment=社会/財政税の支払
+BankTransfer=銀行口座振替
+BankTransfers=クレジット転送
+MenuBankInternalTransfer=内部転送
+TransferDesc=ある口座から別の口座に転送すると、Dolibarrは2つのレコード（ソース口座の借方とターゲット口座の貸方）を書込む。同じ金額（記号を除く）、ラベル、日付がこの取引に使用される）
+TransferFrom=期初
+TransferTo=期末
 TransferFromToDone=<b>%s %s</b> %sからの<b>%s</b>への転送が記録されています。
-CheckTransmitter=トランスミッタ
-ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure you want to validate this check receipt, no change will be possible once this is done?
-DeleteCheckReceipt=Delete this check receipt?
-ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
+CheckTransmitter=振込
+ValidateCheckReceipt=この小切手領収書を検証するか？
+ConfirmValidateCheckReceipt=この小切手領収書を検証してもよいか？一度検証すると変更できなくなる。
+DeleteCheckReceipt=この小切手領収書を削除か？
+ConfirmDeleteCheckReceipt=この小切手領収書を削除してもよいか？
 BankChecks=銀行小切手
-BankChecksToReceipt=Checks awaiting deposit
-BankChecksToReceiptShort=Checks awaiting deposit
-ShowCheckReceipt=預金証書を確認表示する
-NumberOfCheques=No. of check
-DeleteTransaction=Delete entry
-ConfirmDeleteTransaction=Are you sure you want to delete this entry?
-ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
+BankChecksToReceipt=入金待ちの小切手
+BankChecksToReceiptShort=入金待ちの小切手
+ShowCheckReceipt=預金証書を確認表示
+NumberOfCheques=小切手の数
+DeleteTransaction=入力を削除
+ConfirmDeleteTransaction=この入力を削除してもよいか？
+ThisWillAlsoDeleteBankRecord=これにより、生成された銀行入力も削除される
 BankMovements=動作
-PlannedTransactions=Planned entries
+PlannedTransactions=予定入力
 Graph=グラフィックス
-ExportDataset_banque_1=Bank entries and account statement
-ExportDataset_banque_2=Deposit slip
-TransactionOnTheOtherAccount=他のアカウントでのトランザクション
-PaymentNumberUpdateSucceeded=Payment number updated successfully
+ExportDataset_banque_1=銀行入力と口座明細書
+ExportDataset_banque_2=預金伝票
+TransactionOnTheOtherAccount=他の口座でのトランザクション
+PaymentNumberUpdateSucceeded=支払番号が正常に更新されました
 PaymentNumberUpdateFailed=支払番号を更新できませんでした
-PaymentDateUpdateSucceeded=Payment date updated successfully
+PaymentDateUpdateSucceeded=支払日が正常に更新されました
 PaymentDateUpdateFailed=支払日は更新できませんでした
-Transactions=Transactions
-BankTransactionLine=Bank entry
-AllAccounts=All bank and cash accounts
-BackToAccount=戻るアカウントへ
-ShowAllAccounts=すべてのアカウントに表示
-FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
-EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To reconcile?
-ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
-DefaultRIB=Default BAN
-AllRIB=All BAN
-LabelRIB=BAN Label
-NoBANRecord=No BAN record
-DeleteARib=Delete BAN record
-ConfirmDeleteRib=Are you sure you want to delete this BAN record?
-RejectCheck=Check returned
-ConfirmRejectCheck=Are you sure you want to mark this check as rejected?
-RejectCheckDate=Date the check was returned
-CheckRejected=Check returned
-CheckRejectedAndInvoicesReopened=Check returned and invoices re-open
-BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
-DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payment
-VariousPayment=Miscellaneous payment
-VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payment
-AddVariousPayment=Add miscellaneous payment
-SEPAMandate=SEPA mandate
-YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
-BankColorizeMovement=Colorize movements
-BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
-BankColorizeMovementName1=Background color for debit movement
-BankColorizeMovementName2=Background color for credit movement
+Transactions=トランザクション
+BankTransactionLine=銀行入力
+AllAccounts=すべての銀行口座と現金口座
+BackToAccount=口座へ戻る
+ShowAllAccounts=すべての口座に表示
+FutureTransaction=先物取引。照合できません。
+SelectChequeTransactionAndGenerate=小切手預金の領収書に含める小切手を選択/フィルタリングし、"作成"をクリックする。
+InputReceiptNumber=調停に関連する銀行取引明細書を選択する。ソート可能な数値を使用する：YYYYMMまたはYYYYMMDD
+EventualyAddCategory=最終的に、レコードを分類するカテゴリを指定する
+ToConciliate=照合するには？
+ThenCheckLinesAndConciliate=次に、銀行の明細書に記載されている行を確認して、
+DefaultRIB=デフォルトのBAN
+AllRIB=すべての禁止
+LabelRIB=BANラベル
+NoBANRecord=BANレコードなし
+DeleteARib=BANレコードを削除
+ConfirmDeleteRib=このBANレコードを削除してもよいか？
+RejectCheck=小切手が返送されました
+ConfirmRejectCheck=このチェックを拒否済みとしてマークしてもよいか？
+RejectCheckDate=小切手が返却された日付
+CheckRejected=小切手が返送されました
+CheckRejectedAndInvoicesReopened=返送された小切手と請求書が再開される
+BankAccountModelModule=銀行口座のドキュメントテンプレート
+DocumentModelSepaMandate=SEPA指令のテンプレート。 EECのヨーロッパ諸国でのみ役立ちます。
+DocumentModelBan=BAN情報を含むページを印刷するためのテンプレート。
+NewVariousPayment=新規雑費
+VariousPayment=その他の支払
+VariousPayments=その他の支払
+ShowVariousPayment=雑費を表示
+AddVariousPayment=その他の支払を追加
+VariousPaymentId=その他の支払ID
+VariousPaymentLabel=その他の支払ラベル
+ConfirmCloneVariousPayment=雑費のクローンを確認
+SEPAMandate=SEPA指令
+YourSEPAMandate=あなたのSEPA指令
+FindYourSEPAMandate=これは、当法人が銀行に口座振替を注文することを承認するSEPA指令です。署名済（署名済ドキュメントをスキャン）で返送するか、メールで送付すること
+AutoReportLastAccountStatement=照合を行うときに、フィールド「銀行取引明細書の番号」に最後の取引明細書番号を自動的に入力する
+CashControl=POSキャッシュフェンス
+NewCashFence=新規キャッシュフェンス
+BankColorizeMovement=移動に色を付ける
+BankColorizeMovementDesc=この機能が有効になっている場合は、借方または貸方の移動に特定の背景色を選択できます
+BankColorizeMovementName1=借方移動の背景色
+BankColorizeMovementName2=クレジット移動の背景色
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index 6b1a2f77723..281ae230ffd 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -1,38 +1,38 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=請求書
 Bills=請求書
-BillsCustomers=Customer invoices
+BillsCustomers=顧客請求書
 BillsCustomer=得意先請求書
-BillsSuppliers=Vendor invoices
-BillsCustomersUnpaid=Unpaid customer invoices
-BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
-BillsSuppliersUnpaid=Unpaid vendor invoices
-BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
-BillsLate=支払い遅延
-BillsStatistics=Customers invoices statistics
-BillsStatisticsSuppliers=Vendors invoices statistics
-DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
-DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
-DisabledBecauseNotErasable=Disabled because cannot be erased
-InvoiceStandard=標準の請求書
-InvoiceStandardAsk=標準の請求書
-InvoiceStandardDesc=請求書のこの種の一般的な請求書です。
-InvoiceDeposit=Down payment invoice
-InvoiceDepositAsk=Down payment invoice
-InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
-InvoiceProForma=見積送り状
-InvoiceProFormaAsk=見積送り状
-InvoiceProFormaDesc=<b>プロフォーマインボイスは、</b>真<b>の</b>請求書のイメージですが、どんな会計の値を持っていません。
+BillsSuppliers=仕入先請求書
+BillsCustomersUnpaid=未払顧客請求書
+BillsCustomersUnpaidForCompany=%sの未払顧客請求書
+BillsSuppliersUnpaid=未払仕入先請求書
+BillsSuppliersUnpaidForCompany=%sの未払い仕入先請求書
+BillsLate=支払遅延
+BillsStatistics=顧客請求書の統計
+BillsStatisticsSuppliers=仕入先請求書の統計
+DisabledBecauseDispatchedInBookkeeping=請求書が簿記に発送されたため無効
+DisabledBecauseNotLastInvoice=請求書が消去できないため無効。この後にいくつか請求書が記録されたら、消去によりカウンターに穴を作成することになる。
+DisabledBecauseNotErasable=消去できないため無効
+InvoiceStandard=標準請求書
+InvoiceStandardAsk=標準請求書
+InvoiceStandardDesc=この種の請求書は一般的な請求書。
+InvoiceDeposit=頭金請求書
+InvoiceDepositAsk=頭金請求書
+InvoiceDepositDesc=この種の請求書は、頭金を受け取った時に請求される。
+InvoiceProForma=見積請求書
+InvoiceProFormaAsk=見積請求書
+InvoiceProFormaDesc= <b>見積請求書</b>は真正の請求書の様相だが、会計的には値がない。
 InvoiceReplacement=交換用の請求書
 InvoiceReplacementAsk=請求書の交換請求書
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
-InvoiceAvoir=クレジットメモ
-InvoiceAvoirAsk=請求書を訂正するためにクレジットノート
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice shows an amount that differs from the amount actually paid (eg the customer paid too much by mistake, or will not pay the complete amount since some products were returned).
-invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
-invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
-ReplaceInvoice=請求書%sを交換してください
+InvoiceReplacementDesc= <b>交換用請求書</b>は、支払をまだ受け取っていない請求書を完全に交換するために使用される。 <br> <br>注：交換できるのは、支払のない請求書のみ。交換する請求書がまだ閉じられていない場合は、自動的に閉じられ「放棄」になる。
+InvoiceAvoir=貸方表
+InvoiceAvoirAsk=請求書を訂正するために貸方表
+InvoiceAvoirDesc=<b>貸方表</b>は、請求書に実際に支払われた金額とは異なる金額が表示されているという事実を修正するために使用される負の請求書です（たとえば、顧客が誤って支払った金額が多すぎる、または一部の製品が返品されたために全額を支払わない）。 。
+invoiceAvoirWithLines=元の請求書の行を使用して貸方表を作成する
+invoiceAvoirWithPaymentRestAmount=未払原産地請求書が残っている貸方表を作成する
+invoiceAvoirLineWithPaymentRestAmount=残りの未払い金額の貸方表
+ReplaceInvoice=請求書%sを交換して
 ReplacementInvoice=交換用の請求書
 ReplacedByInvoice=請求書%sによって置き換えられ
 ReplacementByInvoice=請求書に置き換えられ
@@ -41,9 +41,9 @@ CorrectionInvoice=訂正請求書
 UsedByInvoice=請求書%sを支払うために使用さ
 ConsumedBy=によって消費される
 NotConsumed=消費されない
-NoReplacableInvoice=No replaceable invoices
+NoReplacableInvoice=交換可能な請求書はない
 NoInvoiceToCorrect=訂正する請求書なし
-InvoiceHasAvoir=Was source of one or several credit notes
+InvoiceHasAvoir=1つまたは複数の貸方表のソースでした
 CardBill=請求書カード
 PredefinedInvoices=事前に定義された請求書
 Invoice=請求書
@@ -52,405 +52,405 @@ Invoices=請求書
 InvoiceLine=請求書の行
 InvoiceCustomer=得意先請求書
 CustomerInvoice=得意先請求書
-CustomersInvoices=顧客の請求書
-SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
-SupplierBill=Vendor invoice
-SupplierBills=仕入先の請求書
-Payment=支払い
-PaymentBack=Refund
-CustomerInvoicePaymentBack=Refund
-Payments=支払い
-PaymentsBack=Refunds
-paymentInInvoiceCurrency=in invoices currency
-PaidBack=Paid back
-DeletePayment=支払いを削除します。
-ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
-ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
-ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
-SupplierPayments=Vendor payments
-ReceivedPayments=受け取った支払い
+CustomersInvoices=顧客請求書
+SupplierInvoice=仕入先請求書
+SuppliersInvoices=仕入先請求書
+SupplierBill=仕入先請求書
+SupplierBills=仕入先請求書
+Payment=支払
+PaymentBack=払戻
+CustomerInvoicePaymentBack=払戻
+Payments=支払
+PaymentsBack=払戻
+paymentInInvoiceCurrency=請求書通貨で
+PaidBack=返済
+DeletePayment=支払を削除
+ConfirmDeletePayment=この支払を削除してもよいか？
+ConfirmConvertToReduc=この%sを利用可能なクレジットに変換するか？
+ConfirmConvertToReduc2=金額はすべての割引の中で保存され、この顧客現在または将来の請求書の割引として使用できる。
+ConfirmConvertToReducSupplier=この%sを利用可能なクレジットに変換するか？
+ConfirmConvertToReducSupplier2=金額はすべての割引の中で保存され、この仕入先現在または将来の請求書の割引として使用できる。
+SupplierPayments=仕入先支払
+ReceivedPayments=受け取った支払
 ReceivedCustomersPayments=顧客から受け取った支払
-PayedSuppliersPayments=Payments paid to vendors
-ReceivedCustomersPaymentsToValid=検証するために受信されたお客様のお支払い
-PaymentsReportsForYear=%sの支払い報告書
+PayedSuppliersPayments=仕入先に支払われる支払
+ReceivedCustomersPaymentsToValid=検証するために受信されたお客様の支払
+PaymentsReportsForYear=%sの支払報告書
 PaymentsReports=決済レポート
-PaymentsAlreadyDone=支払いがすでに行わ
-PaymentsBackAlreadyDone=Refunds already done
-PaymentRule=支払いルール
-PaymentMode=Payment Type
-PaymentTypeDC=Debit/Credit Card
+PaymentsAlreadyDone=支払は実行済
+PaymentsBackAlreadyDone=払戻は実行済
+PaymentRule=支払ルール
+PaymentMode=支払種別
+PaymentTypeDC=デビット/クレジットカード
 PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
-PaymentTerm=Payment Term
-PaymentConditions=Payment Terms
-PaymentConditionsShort=Payment Terms
+IdPaymentMode=支払種別（id）
+CodePaymentMode=支払種別（コード）
+LabelPaymentMode=支払種別（ラベル）
+PaymentModeShort=支払種別
+PaymentTerm=支払条件
+PaymentConditions=支払条件
+PaymentConditionsShort=支払条件
 PaymentAmount=支払金額
-PaymentHigherThanReminderToPay=支払うために思い出させるよりも高い支払い
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
-ClassifyPaid=分類 '有料'
-ClassifyUnPaid=Classify 'Unpaid'
-ClassifyPaidPartially='は部分的に有料 &quot;に分類
-ClassifyCanceled=&quot;放棄&quot;を分類する
+PaymentHigherThanReminderToPay=督促状よりも高い支払
+HelpPaymentHigherThanReminderToPay=注意、1つ以上の請求書の支払額は、未払金額よりも高くなっている。 <br>エントリを編集。それ以外の場合は、過払いの請求書ごとに受け取った超過分の貸方表を作成することを確認して検討。
+HelpPaymentHigherThanReminderToPaySupplier=注意、1つ以上の請求書の支払額は、未払金額よりも高くなっている。 <br>エントリを編集。それ以外の場合は、過払いの請求書ごとに支払われた超過分の貸方表を作成することを確認して検討。
+ClassifyPaid=分類 '支払済'
+ClassifyUnPaid=分類 '未払'
+ClassifyPaidPartially=分類 '一部支払済'
+ClassifyCanceled=分類 '放棄'
 ClassifyClosed=&quot;クローズ&quot;を分類する
-ClassifyUnBilled=Classify 'Unbilled'
-CreateBill=請求書を作成します。
-CreateCreditNote=クレジットメモを作成する
-AddBill=Create invoice or credit note
-AddToDraftInvoices=Add to draft invoice
-DeleteBill=請求書を削除します。
-SearchACustomerInvoice=顧客の請求書の検索
-SearchASupplierInvoice=Search for a vendor invoice
+ClassifyUnBilled=分類 '未請求'
+CreateBill=請求書を作成。
+CreateCreditNote=貸方表を作成する
+AddBill=請求書または貸方表を作成する
+AddToDraftInvoices=下書き請求書に追加
+DeleteBill=請求書を削除
+SearchACustomerInvoice=顧客請求書の検索
+SearchASupplierInvoice=仕入先請求書を検索する
 CancelBill=請求書を取り消す
 SendRemindByMail=電子メールでリマインダを送信
-DoPayment=Enter payment
-DoPaymentBack=Enter refund
-ConvertToReduc=Mark as credit available
-ConvertExcessReceivedToReduc=Convert excess received into available credit
-ConvertExcessPaidToReduc=Convert excess paid into available discount
-EnterPaymentReceivedFromCustomer=顧客から受け取った支払を入力します。
-EnterPaymentDueToCustomer=顧客のために支払いをする
-DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
+DoPayment=支払を入力して
+DoPaymentBack=払戻を入力して
+ConvertToReduc=利用可能なクレジットとしてマーク
+ConvertExcessReceivedToReduc=受け取った超過分を利用可能なクレジットに変換する
+ConvertExcessPaidToReduc=支払った超過分を利用可能な割引に変換する
+EnterPaymentReceivedFromCustomer=顧客から受け取った支払を入力。
+EnterPaymentDueToCustomer=顧客ために支払をする
+DisabledBecauseRemainderToPayIsZero=未払残りがゼロであるため無効
 PriceBase=価格ベース
 BillStatus=請求書の状況
-StatusOfGeneratedInvoices=Status of generated invoices
-BillStatusDraft=ドラフト（検証する必要があります）
+StatusOfGeneratedInvoices=生成された請求書のステータス
+BillStatusDraft=下書き（検証する必要がある）
 BillStatusPaid=有料
-BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
-BillStatusConverted=Paid (ready for consumption in final invoice)
+BillStatusPaidBackOrConverted=貸方表の払戻または利用可能なクレジットとしてマーク
+BillStatusConverted=支払済（最終請求書で消費できる状態）
 BillStatusCanceled=放棄された
-BillStatusValidated=（お支払いする必要があります）を検証
+BillStatusValidated=（支払する必要がある）を検証
 BillStatusStarted=開始
-BillStatusNotPaid=支払われない
-BillStatusNotRefunded=Not refunded
+BillStatusNotPaid=未支払
+BillStatusNotRefunded=未返金
 BillStatusClosedUnpaid=クローズ（無給）
 BillStatusClosedPaidPartially=有料（一部）
-BillShortStatusDraft=ドラフト
-BillShortStatusPaid=有料
-BillShortStatusPaidBackOrConverted=Refunded or converted
-Refunded=Refunded
-BillShortStatusConverted=有料
-BillShortStatusCanceled=放棄された
-BillShortStatusValidated=検証
-BillShortStatusStarted=開始
-BillShortStatusNotPaid=支払われない
-BillShortStatusNotRefunded=Not refunded
+BillShortStatusDraft=下書き
+BillShortStatusPaid=支払済
+BillShortStatusPaidBackOrConverted=返金済または変換済
+Refunded=返金済
+BillShortStatusConverted=支払済
+BillShortStatusCanceled=放棄済
+BillShortStatusValidated=検証済
+BillShortStatusStarted=開始済
+BillShortStatusNotPaid=未支払
+BillShortStatusNotRefunded=未返金
 BillShortStatusClosedUnpaid=閉じた
-BillShortStatusClosedPaidPartially=有料（一部）
+BillShortStatusClosedPaidPartially=支払済（一部）
 PaymentStatusToValidShort=検証するには
-ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
-ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.
-ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment types
-ErrorBillNotFound=請求書%sは存在しません。
-ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorVATIntraNotConfigured=コミュニティ内のVAT番号はまだ定義されていない
+ErrorNoPaiementModeConfigured=デフォルトの支払種別は定義されていない。これを修正するには、請求書モジュールのセットアップに移動。
+ErrorCreateBankAccount=銀行口座を作成し、請求書モジュールの設定パネルに移動して支払種別を定義する
+ErrorBillNotFound=請求書%sは存在しない。
+ErrorInvoiceAlreadyReplaced=エラー、請求書%sを置き換えるために請求書を検証しようとしました。しかし、これはすでに請求書%sに置き換えられている。
 ErrorDiscountAlreadyUsed=既に使用されるエラー、割引
-ErrorInvoiceAvoirMustBeNegative=エラーは、正しい請求書は、負の金額を持っている必要があります
-ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
-ErrorCantCancelIfReplacementInvoiceNotValidated=エラーは、ドラフトの状態のままで別の請求書に置き換えられている請求書を取り消すことはできません
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
-BillFrom=から
-BillTo=請求する
+ErrorInvoiceAvoirMustBeNegative=エラーは、正しい請求書は、負の金額を持っている必要がある
+ErrorInvoiceOfThisTypeMustBePositive=エラー、この種別の請求書には、正の税額（またはnull）を除いた金額が必要です
+ErrorCantCancelIfReplacementInvoiceNotValidated=エラーは、下書きの状態のままで別の請求書に置き換えられている請求書を取り消すことはできない
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=この部分または別の部分はすでに使用されているため、割引シリーズを削除することはできない。
+BillFrom=期初
+BillTo=期末
 ActionsOnBill=請求書上のアクション
-RecurringInvoiceTemplate=Template / Recurring invoice
-NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
-NotARecurringInvoiceTemplate=Not a recurring template invoice
-NewBill=新しい請求書
-LastBills=Latest %s invoices
-LatestTemplateInvoices=Latest %s template invoices
-LatestCustomerTemplateInvoices=Latest %s customer template invoices
-LatestSupplierTemplateInvoices=Latest %s vendor template invoices
-LastCustomersBills=Latest %s customer invoices
-LastSuppliersBills=Latest %s vendor invoices
+RecurringInvoiceTemplate=テンプレート/定期的な請求書
+NoQualifiedRecurringInvoiceTemplateFound=生成に適格な定期的なテンプレート請求書はない。
+FoundXQualifiedRecurringInvoiceTemplate=生成に適格な%s定期的なテンプレート請求書(s)が見つかった。
+NotARecurringInvoiceTemplate=定期的なテンプレートの請求書ではない
+NewBill=新規請求書
+LastBills=最新の%s請求書
+LatestTemplateInvoices=最新の%sテンプレート請求書
+LatestCustomerTemplateInvoices=最新の%s顧客テンプレートの請求書
+LatestSupplierTemplateInvoices=最新の%s仕入先テンプレートの請求書
+LastCustomersBills=最新の%s顧客請求書
+LastSuppliersBills=最新の%s仕入先請求書
 AllBills=すべての請求書
-AllCustomerTemplateInvoices=All template invoices
+AllCustomerTemplateInvoices=すべてのテンプレート請求書
 OtherBills=他の請求書
-DraftBills=ドラフトの請求書
-CustomersDraftInvoices=Customer draft invoices
-SuppliersDraftInvoices=Vendor draft invoices
-Unpaid=未払いの
-ErrorNoPaymentDefined=Error No payment defined
-ConfirmDeleteBill=Are you sure you want to delete this invoice?
-ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b>?
-ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status?
-ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
-ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
-ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason for closing this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+DraftBills=下書きの請求書
+CustomersDraftInvoices=顧客下書き請求書
+SuppliersDraftInvoices=仕入先下書き請求書
+Unpaid=未払
+ErrorNoPaymentDefined=エラー支払が定義されていない
+ConfirmDeleteBill=この請求書を削除してもよいか？
+ConfirmValidateBill=この請求書を参照<b>%s </b>で検証してもよいか？
+ConfirmUnvalidateBill=請求書<b>%s </b>を下書きステータスに変更してもよいか？
+ConfirmClassifyPaidBill=請求書<b>%s </b>を支払済のステータスに変更してもよいか？
+ConfirmCancelBill=請求書をキャンセルしてもよいか<b>%s </b>？
+ConfirmCancelBillQuestion=なぜこの請求書を「放棄」と分類したいのか？
+ConfirmClassifyPaidPartially=請求書<b>%s </b>を支払済のステータスに変更してもよいか？
+ConfirmClassifyPaidPartiallyQuestion=この請求書は完全には支払われていない。この請求書を閉じる理由は何ですか？
+ConfirmClassifyPaidPartiallyReasonAvoir=残りの未払い<b>（%s %s）</b>は、期間前に支払が行われたために付与された割引。私はVATを貸方表で正規化。
+ConfirmClassifyPaidPartiallyReasonDiscount=残りの未払い<b>（%s %s）</b>は、期間前に支払が行われたために付与された割引。
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=残りの未払い<b>（%s %s）</b>は、期間前に支払が行われたために付与された割引。この割引でVATを失うことに同意。
+ConfirmClassifyPaidPartiallyReasonDiscountVat=残りの未払い<b>（%s %s）</b>は、期間前に支払が行われたために付与された割引。この割引のVATは、貸方表なしで回収。
 ConfirmClassifyPaidPartiallyReasonBadCustomer=悪い顧客
 ConfirmClassifyPaidPartiallyReasonProductReturned=製品は、部分的に返される
 ConfirmClassifyPaidPartiallyReasonOther=その他の理由で放棄された金額
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=この選択は、請求書に適切なコメントが提供されている場合に可能。 （例«実際に支払われた価格に対応する税金のみが控除の権利を与える»）
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=一部の国では、請求書に正しいメモが含まれている場合にのみ、この選択が可能になる場合がある。
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=他のすべてに適合しない場合は、この選択肢を使用して、
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
-ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=製品の一部が返されたため支払いが完了していない場合は、この選択は使用されます
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>悪い顧客</b>とは、負債の支払を拒否する顧客。
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=製品の一部が返されたため支払が完了していない場合は、この選択は使用される
+ConfirmClassifyPaidPartiallyReasonOtherDesc=他のすべてが適切でない場合、たとえば次の状況でこの選択を使用。<br>-一部の製品が返送されたため支払が未完了<br>-割引を忘れたため請求額が多すぎる<br>いずれにせよ、貸方表を作成することにより、会計システムで過払い金を修正。
 ConfirmClassifyAbandonReasonOther=その他
-ConfirmClassifyAbandonReasonOtherDesc=この選択は、他のすべての例で使用されます。交換する請求書を作成することを計画するなどの理由で。
-ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
-ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
-ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
+ConfirmClassifyAbandonReasonOtherDesc=この選択は、他のすべての例で使用される。交換する請求書を作成することを計画するなどの理由で。
+ConfirmCustomerPayment=<b> %s </b> %sのこの支払入力を確認するか？
+ConfirmSupplierPayment=<b> %s </b> %sのこの支払入力を確認するか？
+ConfirmValidatePayment=この支払を確認してもよいか？支払が確認されると、変更を加えることはできない。
 ValidateBill=請求書を検証する
-UnvalidateBill=請求書をUnvalidate
-NumberOfBills=No. of invoices
-NumberOfBillsByMonth=No. of invoices per month
+UnvalidateBill=請求書を未検証に戻す
+NumberOfBills=請求書の数
+NumberOfBillsByMonth=1か月あたりの請求書の数
 AmountOfBills=請求書の金額
-AmountOfBillsHT=Amount of invoices (net of tax)
+AmountOfBillsHT=請求書の金額（税抜き）
 AmountOfBillsByMonthHT=月別請求書の金額（税引後）
-UseSituationInvoices=Allow situation invoice
-UseSituationInvoicesCreditNote=Allow situation invoice credit note
-Retainedwarranty=Retained warranty
-AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
-RetainedwarrantyDefaultPercent=Retained warranty default percent
-RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
-RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
-ToPayOn=To pay on %s
-toPayOn=to pay on %s
-RetainedWarranty=Retained Warranty
-PaymentConditionsShortRetainedWarranty=Retained warranty payment terms
-DefaultPaymentConditionsRetainedWarranty=Default retained warranty payment terms
-setPaymentConditionsShortRetainedWarranty=Set retained warranty payment terms
-setretainedwarranty=Set retained warranty
-setretainedwarrantyDateLimit=Set retained warranty date limit
-RetainedWarrantyDateLimit=Retained warranty date limit
-RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-AlreadyPaid=既に支払わ
-AlreadyPaidBack=Already paid back
-AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
-Abandoned=放棄された
-RemainderToPay=Remaining unpaid
-RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to refund
-Rest=Pending
-AmountExpected=量が主張
-ExcessReceived=過剰は、受信した
-ExcessPaid=Excess paid
-EscompteOffered=提供される割引（用語の前にお支払い）
+UseSituationInvoices=状況請求書を許可する
+UseSituationInvoicesCreditNote=状況請求書貸方表を許可する
+Retainedwarranty=保持保証
+AllowedInvoiceForRetainedWarranty=次の種類の請求書で使用可能な保持保証
+RetainedwarrantyDefaultPercent=保持保証のデフォルトパーセント
+RetainedwarrantyOnlyForSituation=「保持保証」を状況請求書でのみ使用できるようにする
+RetainedwarrantyOnlyForSituationFinal=シチュエーションインボイスでは、グローバルな「保持保証」控除は最終シチュエーションにのみ適用される
+ToPayOn=%sで支払うには
+toPayOn=%sで支払う
+RetainedWarranty=保持保証
+PaymentConditionsShortRetainedWarranty=保持された保証支払条件
+DefaultPaymentConditionsRetainedWarranty=デフォルトの保持保証支払条件
+setPaymentConditionsShortRetainedWarranty=保持保証の支払条件を設定する
+setretainedwarranty=保持保証を設定する
+setretainedwarrantyDateLimit=保証期間の制限を設定する
+RetainedWarrantyDateLimit=保証期間の制限
+RetainedWarrantyNeed100Percent=PDFに表示するには、状況請求書が100%%の進行状況である必要がある
+AlreadyPaid=既に支払済
+AlreadyPaidBack=すでに払戻済
+AlreadyPaidNoCreditNotesNoDeposits=すでに支払済（貸方表と頭金 以外）
+Abandoned=放棄済
+RemainderToPay=未払まま
+RemainderToTake=残りの金額
+RemainderToPayBack=返金する残りの金額
+Rest=保留中
+AmountExpected=請求額
+ExcessReceived=超過受領額
+ExcessPaid=超過支払額
+EscompteOffered=提供される割引（前払）
 EscompteOfferedShort=割引
-SendBillRef=Submission of invoice %s
-SendReminderBillRef=Submission of invoice %s (reminder)
-NoDraftBills=いいえドラフトの請求なし
-NoOtherDraftBills=他のドラフトの請求なし
-NoDraftInvoices=いいえドラフトの請求なし
+SendBillRef=請求書の提出%s
+SendReminderBillRef=請求書の提出%s（リマインダー）
+NoDraftBills=下書きの請求なし
+NoOtherDraftBills=他の下書きの請求なし
+NoDraftInvoices=下書きの請求なし
 RefBill=請求書参照
 ToBill=請求する
 RemainderToBill=法案に残り
 SendBillByMail=電子メールで請求書を送付
 SendReminderBillByMail=電子メールでリマインダを送信
 RelatedCommercialProposals=関連する商業的な提案
-RelatedRecurringCustomerInvoices=Related recurring customer invoices
+RelatedRecurringCustomerInvoices=関連する定期的な顧客請求書
 MenuToValid=有効に
-DateMaxPayment=Payment due on
+DateMaxPayment=支払期日
 DateInvoice=請求書の日付
-DatePointOfTax=Point of tax
-NoInvoice=送り状なし
+DatePointOfTax=税のポイント
+NoInvoice=請求書なし
 ClassifyBill=請求書の分類
-SupplierBillsToPay=Unpaid vendor invoices
-CustomerBillsUnpaid=Unpaid customer invoices
+SupplierBillsToPay=未払仕入先請求書
+CustomerBillsUnpaid=未払顧客請求書
 NonPercuRecuperable=回復不可能
-SetConditions=Set Payment Terms
-SetMode=Set Payment Type
-SetRevenuStamp=Set revenue stamp
+SetConditions=支払条件の設定
+SetMode=支払種別の設定
+SetRevenuStamp=収入印紙を設定する
 Billed=請求
-RecurringInvoices=Recurring invoices
-RepeatableInvoice=Template invoice
-RepeatableInvoices=Template invoices
-Repeatable=Template
-Repeatables=Templates
-ChangeIntoRepeatableInvoice=Convert into template invoice
-CreateRepeatableInvoice=Create template invoice
-CreateFromRepeatableInvoice=Create from template invoice
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
-CustomersInvoicesAndPayments=顧客の請求書と支払い
-ExportDataset_invoice_1=Customer invoices and invoice details
-ExportDataset_invoice_2=顧客の請求書と支払い
+RecurringInvoices=定期的な請求書
+RepeatableInvoice=テンプレート請求書
+RepeatableInvoices=テンプレートの請求書
+Repeatable=テンプレート
+Repeatables=テンプレート
+ChangeIntoRepeatableInvoice=テンプレートの請求書に変換する
+CreateRepeatableInvoice=テンプレート請求書を作成する
+CreateFromRepeatableInvoice=テンプレート請求書から作成
+CustomersInvoicesAndInvoiceLines=顧客請求書と請求書の詳細
+CustomersInvoicesAndPayments=顧客請求書と支払
+ExportDataset_invoice_1=顧客請求書と請求書の詳細
+ExportDataset_invoice_2=顧客請求書と支払
 ProformaBill=プロフォーマビル：
 Reduction=削減
-ReductionShort=Disc.
+ReductionShort=ディスク。
 Reductions=削減
-ReductionsShort=Disc.
+ReductionsShort=ディスク。
 Discounts=割引
-AddDiscount=割引を作成します。
-AddRelativeDiscount=相対的なディスカウントを作成します。
-EditRelativeDiscount=Edit relative discount
-AddGlobalDiscount=絶対的なディスカウントを作成します。
+AddDiscount=割引を作成。
+AddRelativeDiscount=相対的なディスカウントを作成。
+EditRelativeDiscount=相対割引を編集する
+AddGlobalDiscount=絶対的なディスカウントを作成。
 EditGlobalDiscounts=絶対的な割引を編集
-AddCreditNote=クレジットメモを作成する
+AddCreditNote=貸方表を作成する
 ShowDiscount=割引を表示
-ShowReduc=Show the discount
-ShowSourceInvoice=Show the source invoice
+ShowReduc=割引を表示する
+ShowSourceInvoice=ソースの請求書を表示する
 RelativeDiscount=相対的な割引
 GlobalDiscount=グローバル割引
-CreditNote=クレジットメモ
-CreditNotes=クレジットメモ
-CreditNotesOrExcessReceived=Credit notes or excess received
-Deposit=Down payment
-Deposits=Down payments
-DiscountFromCreditNote=クレジットノート%sから割引
-DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments in excess of invoice %s
-DiscountFromExcessPaid=Payments in excess of invoice %s
-AbsoluteDiscountUse=クレジットこの種のは、その検証の前に請求書に使用することができます
-CreditNoteDepositUse=Invoice must be validated to use this kind of credits
-NewGlobalDiscount=新しい絶対割引
-NewRelativeDiscount=新しい相対的な割引
-DiscountType=Discount type
+CreditNote=貸方表
+CreditNotes=貸方表
+CreditNotesOrExcessReceived=貸方表または超過分を受け取った
+Deposit=頭金
+Deposits=頭金
+DiscountFromCreditNote=貸方表%sから割引
+DiscountFromDeposit=請求書からの頭金%s
+DiscountFromExcessReceived=請求書を超える支払%s
+DiscountFromExcessPaid=請求書を超える支払%s
+AbsoluteDiscountUse=クレジットこの種のは、その検証の前に請求書に使用することができる
+CreditNoteDepositUse=この種のクレジットを使用するには、請求書を検証する必要がある
+NewGlobalDiscount=新規絶対割引
+NewRelativeDiscount=新規相対的な割引
+DiscountType=割引種別
 NoteReason=（注）/理由
 ReasonDiscount=理由
 DiscountOfferedBy=によって付与された
-DiscountStillRemaining=Discounts or credits available
-DiscountAlreadyCounted=Discounts or credits already consumed
-CustomerDiscounts=Customer discounts
-SupplierDiscounts=Vendors discounts
-BillAddress=ビル·アドレス
-HelpEscompte=This discount is a discount granted to customer because payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
-IdSocialContribution=Social/fiscal tax payment id
-PaymentId=お支払い番号
-PaymentRef=Payment ref.
+DiscountStillRemaining=利用可能な割引またはクレジット
+DiscountAlreadyCounted=すでに消費された割引またはクレジット
+CustomerDiscounts=顧客割引
+SupplierDiscounts=仕入先割引
+BillAddress=ビル·住所
+HelpEscompte=この割引は、支払が期間前に行われたために顧客に付与される割引。
+HelpAbandonBadCustomer=この金額は放棄されており（顧客は悪い顧客であると言われている）、例外的な損失と見なされる。
+HelpAbandonOther=この金額はエラーであったため放棄された（たとえば、間違った顧客または請求書が別のものに置き換えられました）
+IdSocialContribution=社会/財政納税ID
+PaymentId=支払番号
+PaymentRef=支払参照
 InvoiceId=請求書のID
 InvoiceRef=請求書参照。
 InvoiceDateCreation=請求書作成日
 InvoiceStatus=請求書の状況
 InvoiceNote=請求書に注意
 InvoicePaid=支払われた請求
-InvoicePaidCompletely=Paid completely
-InvoicePaidCompletelyHelp=Invoice that are paid completely. This excludes invoices that are paid partially. To get list of all 'Closed' or non 'Closed' invoices, prefer to use a filter on the invoice status.
-OrderBilled=Order billed
-DonationPaid=Donation paid
-PaymentNumber=お支払い番号
-RemoveDiscount=割引を削除します。
-WatermarkOnDraftBill=ドラフトの請求書上にウォーターマーク（空の場合はNothing）
-InvoiceNotChecked=ない請求書が選択されていません
-ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
+InvoicePaidCompletely=完全に支払われた
+InvoicePaidCompletelyHelp=完全に支払われる請求書。これには、部分的に支払われる請求書は含まれない。すべての「クローズ」または「クローズ」以外の請求書のリストを取得するには、請求書のステータスにフィルターを使用することを勧める。
+OrderBilled=請求済の注文
+DonationPaid=寄付金を支払ました
+PaymentNumber=支払番号
+RemoveDiscount=割引を削除
+WatermarkOnDraftBill=下書きの請求書上にウォーターマーク（空の場合はNothing）
+InvoiceNotChecked=ない請求書が選択されていない
+ConfirmCloneInvoice=この請求書のクローンを作成してもよいか<b>%s </b>？
 DisabledBecauseReplacedInvoice=請求書が交換されたため、アクションを無効に
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payments during the fixed year are included here.
-NbOfPayments=No. of payments
+DescTaxAndDividendsArea=この領域には、特別経費に対して行われたすべての支払の概要が表示される。固定年の支払のあるレコードのみがここに含まれる。
+NbOfPayments=支払回数
 SplitDiscount=二つに割引を分割
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts:
-TotalOfTwoDiscountMustEqualsOriginal=The total of the two new discounts must be equal to the original discount amount.
-ConfirmRemoveDiscount=Are you sure you want to remove this discount?
+ConfirmSplitDiscount=この<b>%s </b> %sの割引を2つの小さな割引に分割してもよいか？
+TypeAmountOfEachNewDiscount=2つの部分のそれぞれの入力量：
+TotalOfTwoDiscountMustEqualsOriginal=2つの新規割引の合計は、元の割引額と等しくなければならない。
+ConfirmRemoveDiscount=この割引を削除してもよいか？
 RelatedBill=関連する請求書
 RelatedBills=関連する請求書
-RelatedCustomerInvoices=Related customer invoices
-RelatedSupplierInvoices=Related vendor invoices
-LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoices already exist
-MergingPDFTool=Merging PDF tool
-AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
-PaymentNote=Payment note
-ListOfPreviousSituationInvoices=List of previous situation invoices
-ListOfNextSituationInvoices=List of next situation invoices
-ListOfSituationInvoices=List of situation invoices
-CurrentSituationTotal=Total current situation
-DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
-RemoveSituationFromCycle=Remove this invoice from cycle
-ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
-ConfirmOuting=Confirm outing
-FrequencyPer_d=Every %s days
-FrequencyPer_m=Every %s months
-FrequencyPer_y=Every %s years
-FrequencyUnit=Frequency unit
-toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
-NextDateToExecution=Date for next invoice generation
-NextDateToExecutionShort=Date next gen.
-DateLastGeneration=Date of latest generation
-DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max. number of invoice generation
-NbOfGenerationDone=Number of invoice generation already done
-NbOfGenerationDoneShort=Number of generation done
-MaxGenerationReached=Maximum number of generations reached
-InvoiceAutoValidate=Validate invoices automatically
-GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
-DateIsNotEnough=Date not reached yet
-InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
-GeneratedFromTemplate=Generated from template invoice %s
-WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
-WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
-ViewAvailableGlobalDiscounts=View available discounts
-GroupPaymentsByModOnReports=Group payments by mode on reports
+RelatedCustomerInvoices=関連する顧客請求書
+RelatedSupplierInvoices=関連する仕入先請求書
+LatestRelatedBill=最新の関連請求書
+WarningBillExist=警告、1つ以上の請求書がすでに存在する
+MergingPDFTool=PDFツールのマージ
+AmountPaymentDistributedOnInvoice=請求書に記載されている支払金額
+PaymentOnDifferentThirdBills=異なる取引先の請求書での支払を許可するが、親法人は同じです
+PaymentNote=支払手形
+ListOfPreviousSituationInvoices=以前の状況の請求書のリスト
+ListOfNextSituationInvoices=次の状況の請求書のリスト
+ListOfSituationInvoices=状況請求書のリスト
+CurrentSituationTotal=総現状
+DisabledBecauseNotEnouthCreditNote=シチュエーション請求書をサイクルから削除するには、この請求書の貸方表の合計がこの請求書の合計をカバーしている必要がある
+RemoveSituationFromCycle=この請求書をサイクルから削除する
+ConfirmRemoveSituationFromCycle=この請求書%sをサイクルから削除するか？
+ConfirmOuting=外出を確認する
+FrequencyPer_d=%s日ごと
+FrequencyPer_m=%sか月ごと
+FrequencyPer_y=%s年ごと
+FrequencyUnit=周波数単位
+toolTipFrequency=例：<br> <b>セット7、日</b>：7日ごとに新規請求書を発行<br> <b>セット3、月</b>：3か月ごとに新規請求書を発行
+NextDateToExecution=次の請求書生成の日付
+NextDateToExecutionShort=次世代の日付。
+DateLastGeneration=最新世代の日付
+DateLastGenerationShort=最新世代の日付
+MaxPeriodNumber=最大請求書の生成回数
+NbOfGenerationDone=すでに行われた請求書の生成数
+NbOfGenerationDoneShort=行われた世代の数
+MaxGenerationReached=最大世代数に達しました
+InvoiceAutoValidate=請求書を自動的に検証する
+GeneratedFromRecurringInvoice=テンプレートの定期的な請求書から生成%s
+DateIsNotEnough=まだ日付に達していない
+InvoiceGeneratedFromTemplate=定期的なテンプレート請求書%sから生成された請求書%s
+GeneratedFromTemplate=テンプレート請求書から生成%s
+WarningInvoiceDateInFuture=警告、請求日が現在の日付よりも高くなっている
+WarningInvoiceDateTooFarInFuture=警告、請求日が現在の日付から遠すぎる
+ViewAvailableGlobalDiscounts=利用可能な割引を表示する
+GroupPaymentsByModOnReports=レポートのモードごとのグループ支払
 # PaymentConditions
 Statut=ステータス
-PaymentConditionShortRECEP=Due Upon Receipt
-PaymentConditionRECEP=Due Upon Receipt
+PaymentConditionShortRECEP=受領時
+PaymentConditionRECEP=受領時
 PaymentConditionShort30D=30日
 PaymentCondition30D=30日
-PaymentConditionShort30DENDMONTH=30 days of month-end
-PaymentCondition30DENDMONTH=Within 30 days following the end of the month
+PaymentConditionShort30DENDMONTH=月末の30日
+PaymentCondition30DENDMONTH=月末から30日以内
 PaymentConditionShort60D=60日
 PaymentCondition60D=60日
-PaymentConditionShort60DENDMONTH=60 days of month-end
-PaymentCondition60DENDMONTH=Within 60 days following the end of the month
+PaymentConditionShort60DENDMONTH=月末の60日
+PaymentCondition60DENDMONTH=月末から60日以内
 PaymentConditionShortPT_DELIVERY=配達
 PaymentConditionPT_DELIVERY=着払い
-PaymentConditionShortPT_ORDER=オーダー
-PaymentConditionPT_ORDER=On order
+PaymentConditionShortPT_ORDER=注文
+PaymentConditionPT_ORDER=注文時に
 PaymentConditionShortPT_5050=50-50
-PaymentConditionPT_5050=50%% in advance, 50%% on delivery
-PaymentConditionShort10D=10 days
-PaymentCondition10D=10 days
-PaymentConditionShort10DENDMONTH=10 days of month-end
-PaymentCondition10DENDMONTH=Within 10 days following the end of the month
-PaymentConditionShort14D=14 days
-PaymentCondition14D=14 days
-PaymentConditionShort14DENDMONTH=14 days of month-end
-PaymentCondition14DENDMONTH=Within 14 days following the end of the month
-FixAmount=Fixed amount - 1 line with label '%s'
-VarAmount=Variable amount (%% tot.)
-VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+PaymentConditionPT_5050=事前に50%%、配達時に50%%
+PaymentConditionShort10D=10日間
+PaymentCondition10D=10日間
+PaymentConditionShort10DENDMONTH=月末の10日間
+PaymentCondition10DENDMONTH=月末から10日以内
+PaymentConditionShort14D=14日間
+PaymentCondition14D=14日間
+PaymentConditionShort14DENDMONTH=月末の14日
+PaymentCondition14DENDMONTH=月末から14日以内
+FixAmount=固定金額-ラベル「%s」の1行
+VarAmount=可変量（%% tot。）
+VarAmountOneLine=可変量（%% tot。）-ラベル「%s」の1行
+VarAmountAllLines=可変量（%% tot。）-すべて同じ行
 # PaymentType
 PaymentTypeVIR=銀行の転送
 PaymentTypeShortVIR=銀行の転送
-PaymentTypePRE=Direct debit payment order
-PaymentTypeShortPRE=Debit payment order
+PaymentTypePRE=口座振替の支払注文
+PaymentTypeShortPRE=デビット支払注文
 PaymentTypeLIQ=現金
 PaymentTypeShortLIQ=現金
 PaymentTypeCB=クレジットカード
 PaymentTypeShortCB=クレジットカード
-PaymentTypeCHQ=チェック
-PaymentTypeShortCHQ=チェック
-PaymentTypeTIP=TIP (Documents against Payment)
-PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=Online payment
-PaymentTypeShortVAD=Online payment
-PaymentTypeTRA=Bank draft
-PaymentTypeShortTRA=ドラフト
-PaymentTypeFAC=Factor
-PaymentTypeShortFAC=Factor
+PaymentTypeCHQ=小切手
+PaymentTypeShortCHQ=小切手
+PaymentTypeTIP=ヒント（支払に対する文書）
+PaymentTypeShortTIP=ヒント支払
+PaymentTypeVAD=オンライン支払
+PaymentTypeShortVAD=オンライン支払
+PaymentTypeTRA=銀行為替手形
+PaymentTypeShortTRA=下書き
+PaymentTypeFAC=因子
+PaymentTypeShortFAC=因子
 BankDetails=銀行の詳細
 BankCode=銀行コード
-DeskCode=Branch code
+DeskCode=支店コード
 BankAccountNumber=口座番号
-BankAccountNumberKey=Checksum
-Residence=アドレス
-IBANNumber=IBAN account number
+BankAccountNumberKey=チェックサム
+Residence=住所
+IBANNumber=IBAN口座番号
 IBAN=IBAN
-CustomerIBAN=IBAN of customer
-SupplierIBAN=IBAN of vendor
+CustomerIBAN=お客様のIBAN
+SupplierIBAN=仕入先IBAN
 BIC=BIC / SWIFT
-BICNumber=BIC/SWIFT code
+BICNumber=BIC / SWIFTコード
 ExtraInfos=余分に関する情報
 RegulatedOn=に規制
-ChequeNumber=Nを確認してください°
+ChequeNumber=Nを確認して°
 ChequeOrTransferNumber=転送チェック/ N°
-ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeBordereau=スケジュールを確認する
+ChequeMaker=送信機の確認/転送
 ChequeBank=チェックの銀行
 CheckBank=チェック
 NetToBePaid=支払われるネット
@@ -458,120 +458,125 @@ PhoneNumber=電話番号
 FullPhoneNumber=電話
 TeleFax=ファックス
 PrettyLittleSentence=財政主管庁により承認された会計協会のメンバーとして私の名前で発行された小切手による支払の量を受け入れる。
-IntracommunityVATNumber=Intra-Community VAT ID
-PaymentByChequeOrderedTo=Check payments (including tax) are payable to %s, send to
-PaymentByChequeOrderedToShort=Check payments (incl. tax) are payable to
-SendTo=に送られ
-PaymentByTransferOnThisBankAccount=Payment by transfer to the following bank account
+IntracommunityVATNumber=コミュニティ内VATID
+PaymentByChequeOrderedTo=小切手による支払（税込）は%sに支払う必要があり、
+PaymentByChequeOrderedToShort=小切手による支払（税込）は、
+SendTo=送り先
+PaymentByTransferOnThisBankAccount=以下の銀行口座への振込による支払
 VATIsNotUsedForInvoice=CGIの*非適用される付加価値税がart-293B
 LawApplicationPart1=12/05/80の法則80.335のアプリケーションによって
-LawApplicationPart2=財の所有のまま
-LawApplicationPart3=the seller until full payment of
+LawApplicationPart2=製品は次の所有が持続する
+LawApplicationPart3=次の全額が支払われるまで売り手
 LawApplicationPart4=その価格。
 LimitedLiabilityCompanyCapital=資本金SARL
-UseLine=Apply
-UseDiscount=割引を使用して、
-UseCredit=クレジットを使用する
+UseLine=適用
+UseDiscount=割引を使用
+UseCredit=クレジットを使用
 UseCreditNoteInInvoicePayment=このクレジットで支払う金額を減らす
-MenuChequeDeposits=Check Deposits
+MenuChequeDeposits=預金を確認して
 MenuCheques=かどうかをチェック
-MenuChequesReceipts=Check receipts
-NewChequeDeposit=新しい預金
-ChequesReceipts=Check receipts
-ChequesArea=Check deposits area
-ChequeDeposits=Check deposits
-Cheques=かどうかをチェック
-DepositId=Id deposit
-NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third-party address as recipient for invoices
-ShowUnpaidAll=すべての未払いの請求書を表示する
-ShowUnpaidLateOnly=後半未払いの請求書のみを表示
-PaymentInvoiceRef=支払いの請求書%s
+MenuChequesReceipts=領収書を確認する
+NewChequeDeposit=新規預金
+ChequesReceipts=領収書を確認する
+ChequesArea=預金エリアを確認して
+ChequeDeposits=預金を確認する
+Cheques=小切手s
+DepositId=IDデポジット
+NbCheque=チェックの数
+CreditNoteConvertedIntoDiscount=この%sは%sに変換された
+UsBillingContactAsIncoiveRecipientIfExist=請求書の受信者として、取引先の住所の代わりに「請求先連絡先」種別の連絡先/住所を使用する
+ShowUnpaidAll=すべての未払請求書を表示する
+ShowUnpaidLateOnly=後半未払請求書のみを表示
+PaymentInvoiceRef=支払の請求書%s
 ValidateInvoice=請求書を検証する
-ValidateInvoices=Validate invoices
+ValidateInvoices=請求書を検証する
 Cash=現金
 Reported=遅延
-DisabledBecausePayments=いくつかの支払いがあるのでできませ​​ん
-CantRemovePaymentWithOneInvoicePaid=支払った分類少なくとも一つの請求書があるので支払いを削除することはできません
-ExpectedToPay=予想される支払い
-CantRemoveConciliatedPayment=Can't remove reconciled payment
+DisabledBecausePayments=いくつかの支払があるので不可
+CantRemovePaymentWithOneInvoicePaid=支払済に分類される請求書が少なくとも一つあるので支払を削除できない
+ExpectedToPay=予想される支払
+CantRemoveConciliatedPayment=調整済の支払を削除できない
 PayedByThisPayment=この支払によって支払った
-ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
-ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
-ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
-AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
-ToMakePayment=Pay
-ToMakePaymentBack=Pay back
-ListOfYourUnpaidInvoices=List of unpaid invoices
-NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Tax stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
-YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
-PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-TerreNumRefModelError=$ syymm始まる法案はすでに存在し、シーケンスのこのモデルと互換性がありません。それを削除するか、このモジュールを有効にするために名前を変更します。
-CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-EarlyClosingReason=Early closing reason
-EarlyClosingComment=Early closing note
+ClosePaidInvoicesAutomatically=支払が完全に行われると、すべての標準、頭金、または交換の請求書が「支払済」として自動的に分類される。
+ClosePaidCreditNotesAutomatically=払戻が完全に行われると、すべての貸方表が「支払済」として自動的に分類される。
+ClosePaidContributionsAutomatically=支払が完全に行われると、すべての社会的または財政的貢献を「支払済」として自動的に分類。
+AllCompletelyPayedInvoiceWillBeClosed=残りの支払がないすべての請求書は、ステータス「支払済」で自動的に閉じられる。
+ToMakePayment=支払う
+ToMakePaymentBack=返済
+ListOfYourUnpaidInvoices=未払請求書のリスト
+NoteListOfYourUnpaidInvoices=注：このリストには、営業担当者としてリンクされている取引先の請求書のみが含まれている。
+RevenueStamp=税印紙
+YouMustCreateInvoiceFromThird=このオプションは、取引先の"顧客"タブから請求書を作成する場合にのみ使用できる。
+YouMustCreateInvoiceFromSupplierThird=このオプションは、取引先の"仕入先"タブから請求書を作成する場合にのみ使用できる。
+YouMustCreateStandardInvoiceFirstDesc=最初に標準請求書を作成し、それを「テンプレート」に変換して、新規テンプレートの請求書を作成する必要がある
+PDFCrabeDescription=請求書PDFテンプレートクレイブ。完全な請求書テンプレート（Spongeテンプレートの古い実装）
+PDFSpongeDescription=請求書PDFテンプレートスポンジ。完全な請求書テンプレート
+PDFCrevetteDescription=請求書PDFテンプレートクレベット。シチュエーション請求書の完全な請求書テンプレート
+TerreNumRefModelDesc1=戻る数値の書式は、標準請求書の場合は%syymm-nnnn、貸方表の場合は%syymm-nnnn、ここで yy は年、mm は月、nnnn は欠番なく連続した0に戻らない数値
+MarsNumRefModelDesc1=戻る数値の書式は、標準請求書の場合は%syymm-nnnn、交換請求書の場合は%syymm-nnnn、頭金請求書の場合は%syymm-nnnn、貸方表の場合は%syymm-nnnn、ここで yy は年、mm は月、nnnn は欠番なく連続した0に戻らない数値
+TerreNumRefModelError=$ syymm始まる法案はすでに存在し、シーケンスのこのモデルと互換性がない。それを削除するか、このモジュールを有効にするために名前を変更。
+CactusNumRefModelDesc1=戻る数値の書式は、標準の請求書の場合は%syymm-nnnn、貸方表の場合は%syymm-nnnn、頭金の請求書の場合は%syymm-nnnn、ここで yy は年、mm は月、nnnn は欠番なく連続した0に戻らない数値
+EarlyClosingReason=早期閉鎖理由
+EarlyClosingComment=早期クロージングノート
 ##### Types de contacts #####
-TypeContact_facture_internal_SALESREPFOLL=代表的なフォローアップ顧客の請求書
-TypeContact_facture_external_BILLING=顧客の請求書の連絡先
-TypeContact_facture_external_SHIPPING=顧客の出荷お問い合わせ
+TypeContact_facture_internal_SALESREPFOLL=代表的なフォローアップ顧客請求書
+TypeContact_facture_external_BILLING=顧客請求書の連絡先
+TypeContact_facture_external_SHIPPING=顧客出荷お問い合わせ
 TypeContact_facture_external_SERVICE=カスタマーサービスの連絡先
-TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up vendor invoice
-TypeContact_invoice_supplier_external_BILLING=Vendor invoice contact
-TypeContact_invoice_supplier_external_SHIPPING=Vendor shipping contact
-TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
+TypeContact_invoice_supplier_internal_SALESREPFOLL=代表的なフォローアップ仕入先請求書
+TypeContact_invoice_supplier_external_BILLING=仕入先請求書の連絡先
+TypeContact_invoice_supplier_external_SHIPPING=仕入先配送担当者
+TypeContact_invoice_supplier_external_SERVICE=仕入先サービスの連絡先
 # Situation invoices
-InvoiceFirstSituationAsk=First situation invoice
-InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
-InvoiceSituation=Situation invoice
-InvoiceSituationAsk=Invoice following the situation
-InvoiceSituationDesc=Create a new situation following an already existing one
-SituationAmount=Situation invoice amount(net)
-SituationDeduction=Situation subtraction
-ModifyAllLines=Modify all lines
-CreateNextSituationInvoice=Create next situation
-ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
-ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
-ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
-NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
-DisabledBecauseNotLastInCycle=The next situation already exists.
-DisabledBecauseFinal=This situation is final.
-situationInvoiceShortcode_AS=AS
+InvoiceFirstSituationAsk=最初の状況の請求書
+InvoiceFirstSituationDesc=<b>シチュエーション請求書</b>は、建設の進行など、進行に関連するシチュエーションに関連付けられている。それぞれの状況は請求書に関連付けられている。
+InvoiceSituation=状況請求書
+PDFInvoiceSituation=状況請求書
+InvoiceSituationAsk=状況に応じた請求書
+InvoiceSituationDesc=既存の状況に続いて新規状況を作成する
+SituationAmount=状況請求額（純額）
+SituationDeduction=状況減算
+ModifyAllLines=すべての行を変更する
+CreateNextSituationInvoice=次の状況を作成する
+ErrorFindNextSituationInvoice=次のシチュエーションサイクル参照が見つからないというエラー
+ErrorOutingSituationInvoiceOnUpdate=この状況の請求書を出すことができない。
+ErrorOutingSituationInvoiceCreditNote=リンクされた貸方表は外部化できない。
+NotLastInCycle=この請求書は最新のサイクルではないため、変更しない。
+DisabledBecauseNotLastInCycle=次の状況はすでに存在。
+DisabledBecauseFinal=この状況は最終的なもの。
+situationInvoiceShortcode_AS=なので
 situationInvoiceShortcode_S=S
-CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No open situations
-InvoiceSituationLast=Final and general invoice
-PDFCrevetteSituationNumber=Situation N°%s
-PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
-PDFCrevetteSituationInvoiceTitle=Situation invoice
-PDFCrevetteSituationInvoiceLine=Situation N°%s: Inv. N°%s on %s
-TotalSituationInvoice=Total situation
-invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
-updatePriceNextInvoiceErrorUpdateline=Error: update price on invoice line: %s
-ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
-ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both methods (manual and automatic) can be used together with no risk of duplication.
-DeleteRepeatableInvoice=Delete template invoice
-ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
-CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
-StatusOfGeneratedDocuments=Status of document generation
-DoNotGenerateDoc=Do not generate document file
-AutogenerateDoc=Auto generate document file
-AutoFillDateFrom=Set start date for service line with invoice date
-AutoFillDateFromShort=Set start date
-AutoFillDateTo=Set end date for service line with next invoice date
-AutoFillDateToShort=Set end date
-MaxNumberOfGenerationReached=Max number of gen. reached
-BILL_DELETEInDolibarr=Invoice deleted
-BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
-UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
-CustomersInvoicesArea=Customer billing area
-SupplierInvoicesArea=Supplier billing area
+CantBeLessThanMinPercent=進捗状況は、前の状況での値より小さくすることはできない。
+NoSituations=オープンな状況はない
+InvoiceSituationLast=最終および一般的な請求書
+PDFCrevetteSituationNumber=状況番号%s
+PDFCrevetteSituationInvoiceLineDecompte=状況請求書-COUNT
+PDFCrevetteSituationInvoiceTitle=状況請求書
+PDFCrevetteSituationInvoiceLine=状況番号%s：Inv。 %sのN°%s
+TotalSituationInvoice=全体的な状況
+invoiceLineProgressError=請求書ラインの進行状況は、次の請求書ライン以上にすることはできない
+updatePriceNextInvoiceErrorUpdateline=エラー：請求書行の価格を更新：%s
+ToCreateARecurringInvoice=この契約の定期的な請求書を作成するには、最初にこの下書き請求書を作成し、次にそれを請求書テンプレートに変換して、将来の請求書を生成する頻度を定義。
+ToCreateARecurringInvoiceGene=将来の請求書を定期的かつ手動で生成するには、メニュー<strong> %s --%s --%s</strong>に移動。
+ToCreateARecurringInvoiceGeneAuto=このような請求書を自動的に生成する必要がある場合は、管理者にモジュール<strong> %s</strong>を有効にしてセットアップするように依頼して。両方の方法（手動と自動）を一緒に使用すると、重複のリスクがないことに注意して。
+DeleteRepeatableInvoice=テンプレートの請求書を削除する
+ConfirmDeleteRepeatableInvoice=テンプレートの請求書を削除してもよいか？
+CreateOneBillByThird=取引先ごとに1つの請求書を作成する（それ以外の場合は、注文ごとに1つの請求書を作成する）
+BillCreated=%s請求書(s)が作成された
+StatusOfGeneratedDocuments=ドキュメント生成のステータス
+DoNotGenerateDoc=ドキュメントファイルを生成しない
+AutogenerateDoc=ドキュメントファイルの自動生成
+AutoFillDateFrom=請求書の日付でサービスラインの開始日を設定する
+AutoFillDateFromShort=開始日を設定する
+AutoFillDateTo=次の請求日でサービスラインの終了日を設定する
+AutoFillDateToShort=終了日を設定する
+MaxNumberOfGenerationReached=世代の最大数。到達した
+BILL_DELETEInDolibarr=請求書は削除済
+BILL_SUPPLIER_DELETEInDolibarr=サプライヤーの請求書が削除された
+UnitPriceXQtyLessDiscount=単価x数量-割引
+CustomersInvoicesArea=顧客請求エリア
+SupplierInvoicesArea=サプライヤーの請求エリア
+FacParentLine=請求書明細の親
+SituationTotalRayToRest=税抜き支払残
+PDFSituationTitle=状況番号%d
+SituationTotalProgress=総進捗状況%d%%
diff --git a/htdocs/langs/ja_JP/blockedlog.lang b/htdocs/langs/ja_JP/blockedlog.lang
index 8410e1d5419..239cc0674ba 100644
--- a/htdocs/langs/ja_JP/blockedlog.lang
+++ b/htdocs/langs/ja_JP/blockedlog.lang
@@ -1,54 +1,54 @@
-BlockedLog=Unalterable Logs
+BlockedLog=変更不可能なログ
 Field=フィールド
-BlockedLogDesc=This module tracks some events into an unalterable log (that you can't modify once recorded) into a block chain, in real time. This module provides compatibility with requirements of laws of some countries (like France with the law Finance 2016 - Norme NF525).
-Fingerprints=Archived events and fingerprints
-FingerprintsDesc=This is the tool to browse or extract the unalterable logs. Unalterable logs are generated and archived locally into a dedicated table, in real time when you record a business event. You can use this tool to export this archive and save it into an external support (some countries, like France, ask that you do it every year). Note that, there is no feature to purge this log and every change tried to be done directly into this log (by a hacker for example) will be reported with a non-valid fingerprint. If you really need to purge this table because you used your application for a demo/test purpose and want to clean your data to start your production, you can ask your reseller or integrator to reset your database (all your data will be removed).
-CompanyInitialKey=Company initial key (hash of genesis block)
-BrowseBlockedLog=Unalterable logs
-ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
-ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
-DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
-OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
-OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
-AddedByAuthority=Stored into remote authority
-NotAddedByAuthorityYet=Not yet stored into remote authority
-ShowDetails=Show stored details
-logPAYMENT_VARIOUS_CREATE=Payment (not assigned to an invoice) created
-logPAYMENT_VARIOUS_MODIFY=Payment (not assigned to an invoice) modified
-logPAYMENT_VARIOUS_DELETE=Payment (not assigned to an invoice) logical deletion
-logPAYMENT_ADD_TO_BANK=Payment added to bank
-logPAYMENT_CUSTOMER_CREATE=Customer payment created
-logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion
-logDONATION_PAYMENT_CREATE=Donation payment created
-logDONATION_PAYMENT_DELETE=Donation payment logical deletion
-logBILL_PAYED=Customer invoice paid
-logBILL_UNPAYED=Customer invoice set unpaid
-logBILL_VALIDATE=顧客への請求書が検証さ
-logBILL_SENTBYMAIL=Customer invoice send by mail
-logBILL_DELETE=Customer invoice logically deleted
-logMODULE_RESET=Module BlockedLog was disabled
-logMODULE_SET=Module BlockedLog was enabled
-logDON_VALIDATE=Donation validated
-logDON_MODIFY=Donation modified
-logDON_DELETE=Donation logical deletion
-logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
-logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
-logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
-BlockedLogBillDownload=Customer invoice download
-BlockedLogBillPreview=Customer invoice preview
-BlockedlogInfoDialog=Log Details
-ListOfTrackedEvents=List of tracked events
-Fingerprint=Fingerprint
-DownloadLogCSV=Export archived logs (CSV)
-logDOC_PREVIEW=Preview of a validated document in order to print or download
-logDOC_DOWNLOAD=Download of a validated document in order to print or send
-DataOfArchivedEvent=Full datas of archived event
-ImpossibleToReloadObject=Original object (type %s, id %s) not linked (see 'Full datas' column to get unalterable saved data)
-BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit.
-BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they cannot be validated by a tax audit.
-BlockedLogDisableNotAllowedForCountry=List of countries where usage of this module is mandatory (just to prevent to disable the module by error, if your country is in this list, disable of module is not possible without editing this list first. Note also that enabling/disabling this module will keep a track into the unalterable log).
-OnlyNonValid=Non-valid
-TooManyRecordToScanRestrictFilters=Too many records to scan/analyze. Please restrict list with more restrictive filters.
-RestrictYearToExport=Restrict month / year to export
+BlockedLogDesc=このモジュールは、いくつかのイベントを、ブロックチェーンへの変更不可能なログ(一度記録すると変更できない)にリアルタイムで追跡する。このモジュールは、一部の国の法律の要件との互換性を提供する(フランスの法律Finance 2016-Norme NF525など)。
+Fingerprints=アーカイブ済イベントとフィンガープリント
+FingerprintsDesc=これは、変更できないログを参照または抽出するためのツールです。変更不可能なログは、ビジネスイベントを記録するときにリアルタイムで生成され、専用のテーブルにローカルにアーカイブされる。このツールを使用して、このアーカイブをエクスポートし、外部サポートに保存できる(フランスなど、毎年行うように依頼する国もあります)。このログを削除する機能はなく、このログに直接(ハッカーなどによって)実行されようとしたすべての変更は、無効なフィンガープリントで報告されることに注意して。アプリケーションをデモ/テスト目的で使用し、データをクリーンアップして本番環境を開始したいためにこのテーブルを本当にパージする必要がある場合は、リセラーまたはインテグレーターにデータベースのリセットを依頼できる(すべてのデータが削除される)。
+CompanyInitialKey=法人の初期キー(ジェネシスブロックのハッシュ)
+BrowseBlockedLog=変更できないログ
+ShowAllFingerPrintsMightBeTooLong=アーカイブ済すべてのログを表示する(長い場合あり)
+ShowAllFingerPrintsErrorsMightBeTooLong=無効なアーカイブログをすべて表示する(長くなる可能性あり)
+DownloadBlockChain=指紋をダウンロードする
+KoCheckFingerprintValidity=アーカイブ済ログエントリは無効です。これは、誰か(ハッカー？)が記録後にこのレコードの一部のデータを変更したか、前のアーカイブレコードを消去したことを意味する(前の＃の行が存在することを確認)。
+OkCheckFingerprintValidity=アーカイブ済ログレコードは有効です。この行のデータは変更されておらず、エントリは前のエントリに従う。
+OkCheckFingerprintValidityButChainIsKo=アーカイブ済ログは以前のものと比較して有効のようだが、チェーンは以前に破損している。
+AddedByAuthority=リモート認証機関に保存
+NotAddedByAuthorityYet=まだリモート認証機関に保存されていない
+ShowDetails=保存済詳細を表示する
+logPAYMENT_VARIOUS_CREATE=支払(請求書に割り当てられていない)は作成済
+logPAYMENT_VARIOUS_MODIFY=支払(請求書に割り当てられていない)は変更済
+logPAYMENT_VARIOUS_DELETE=支払(請求書に割り当てられていない)論理削除済
+logPAYMENT_ADD_TO_BANK=支払は銀行に追加済
+logPAYMENT_CUSTOMER_CREATE=顧客支払は作成済
+logPAYMENT_CUSTOMER_DELETE=顧客支払は論理削除済
+logDONATION_PAYMENT_CREATE=寄付金は作成済
+logDONATION_PAYMENT_DELETE=寄付金は論理削除済
+logBILL_PAYED=顧客請求書は支払済
+logBILL_UNPAYED=顧客請求書は未払にした
+logBILL_VALIDATE=顧客への請求書が検証済
+logBILL_SENTBYMAIL=顧客請求書を郵送
+logBILL_DELETE=顧客請求書は論理削除済
+logMODULE_RESET=モジュールBlockedLogは無効化済
+logMODULE_SET=モジュールBlockedLogは有効化済
+logDON_VALIDATE=寄付は検証済
+logDON_MODIFY=寄付は変更済
+logDON_DELETE=寄付は論理削除済
+logMEMBER_SUBSCRIPTION_CREATE=メンバーサブスクリプションは作成済
+logMEMBER_SUBSCRIPTION_MODIFY=メンバーサブスクリプションは変更済
+logMEMBER_SUBSCRIPTION_DELETE=メンバーサブスクリプションは論理削除済
+logCASHCONTROL_VALIDATE=キャッシュフェンスの記録
+BlockedLogBillDownload=顧客請求書のダウンロード
+BlockedLogBillPreview=顧客請求書のプレビュー
+BlockedlogInfoDialog=ログの詳細
+ListOfTrackedEvents=追跡済イベントのリスト
+Fingerprint=指紋
+DownloadLogCSV=アーカイブログのエクスポート(CSV)
+logDOC_PREVIEW=印刷またはダウンロードするための検証済みドキュメントのプレビュー
+logDOC_DOWNLOAD=印刷または送信するための検証済みドキュメントのダウンロード
+DataOfArchivedEvent=アーカイブ済イベントの完全なデータ
+ImpossibleToReloadObject=元のオブジェクト(タイプ%s、id %s)がリンクされていない(変更できない保存データを取得するには、「完全なデータ」列を参照して)
+BlockedLogAreRequiredByYourCountryLegislation=変更不可能なログモジュールは、お住まいの国の法律によって要求される場合あり。このモジュールを無効にすると、税務監査で検証できないため、法律および法律ソフトウェアの使用に関して将来の取引が無効になる可能性あり。
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=あなたの国の法律により、変更不可能なログモジュールがアクティブ化済。このモジュールを無効にすると、税務監査で検証できないため、法律および法律ソフトウェアの使用に関して将来の取引が無効になる可能性あり。
+BlockedLogDisableNotAllowedForCountry=このモジュールの使用が必須である国のリスト(誤ってモジュールを無効にするのを防ぐために、あなたの国がこのリストにある場合、最初にこのリストを編集しないとモジュールを無効にできない。このモジュールの有効/無効は、変更不可能なログに追跡されることに注意)。
+OnlyNonValid=無効
+TooManyRecordToScanRestrictFilters=スキャン/分析するにはレコードが多すぎ。より制限の厳しいフィルターでリストを制限すること。
+RestrictYearToExport=エクスポートする月/年を制限する
diff --git a/htdocs/langs/ja_JP/bookmarks.lang b/htdocs/langs/ja_JP/bookmarks.lang
index 6eeaf88107c..5cc7c85d517 100644
--- a/htdocs/langs/ja_JP/bookmarks.lang
+++ b/htdocs/langs/ja_JP/bookmarks.lang
@@ -1,20 +1,21 @@
 # Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=Add current page to bookmarks
+AddThisPageToBookmarks=現在のページをブックマークに追加 
 Bookmark=ブックマーク
 Bookmarks=ブックマーク
 ListOfBookmarks=ブックマークのリスト
-EditBookmarks=List/edit bookmarks
-NewBookmark=新しいブックマーク
+EditBookmarks=ブックマークの一覧表示/編集
+NewBookmark=新規ブックマーク
 ShowBookmark=ブックマークを表示
-OpenANewWindow=新しいウィンドウを開きます
-ReplaceWindow=現在のウィンドウを置き換える
-BookmarkTargetNewWindowShort=新しいウィンドウ
-BookmarkTargetReplaceWindowShort=現在のウィンドウ
-BookmarkTitle=ブックマークのタイトル
+OpenANewWindow=新規タブを開く
+ReplaceWindow=現在のタブを置き換える
+BookmarkTargetNewWindowShort=新規タブ
+BookmarkTargetReplaceWindowShort=現在のタブ
+BookmarkTitle=ブックマーク名
 UrlOrLink=URL
-BehaviourOnClick=Behaviour when a bookmark URL is selected
-CreateBookmark=ブックマークを作成します。
-SetHereATitleForLink=ブックマークのタイトルを設定する
-UseAnExternalHttpLinkOrRelativeDolibarrLink=外部のhttp URLまたは相対DolibarrのURLを使用して、
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=リンクで開いたページを、新しいウィンドウまたは現在のものに表示するかどうかを選択します
+BehaviourOnClick=ブックマークURLを選択した場合の動作
+CreateBookmark=ブックマークを作成。
+SetHereATitleForLink=ブックマークの名前を設定 
+UseAnExternalHttpLinkOrRelativeDolibarrLink=外部/絶対リンク (https://URL) または内部/相対リンク（/DOLIBARR_ROOT/htdocs/...）を使用 
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=リンクされたページを現在のタブで開くか、新規タブで開くかを選択 
 BookmarksManagement=ブックマークの管理
+BookmarksMenuShortCut=Ctrl +シフト+ m
diff --git a/htdocs/langs/ja_JP/boxes.lang b/htdocs/langs/ja_JP/boxes.lang
index 66e5cfb5bf2..2b6ffad8f97 100644
--- a/htdocs/langs/ja_JP/boxes.lang
+++ b/htdocs/langs/ja_JP/boxes.lang
@@ -1,106 +1,107 @@
 # Dolibarr language file - Source file is en_US - boxes
-BoxLoginInformation=Login Information
-BoxLastRssInfos=RSS Information
-BoxLastProducts=Latest %s Products/Services
-BoxProductsAlertStock=Stock alerts for products
-BoxLastProductsInContract=Latest %s contracted products/services
-BoxLastSupplierBills=Latest Vendor invoices
-BoxLastCustomerBills=Latest Customer invoices
-BoxOldestUnpaidCustomerBills=Oldest unpaid customer invoices
-BoxOldestUnpaidSupplierBills=Oldest unpaid vendor invoices
-BoxLastProposals=Latest commercial proposals
-BoxLastProspects=Latest modified prospects
-BoxLastCustomers=Latest modified customers
-BoxLastSuppliers=Latest modified suppliers
-BoxLastCustomerOrders=Latest sales orders
-BoxLastActions=Latest actions
-BoxLastContracts=Latest contracts
-BoxLastContacts=Latest contacts/addresses
-BoxLastMembers=Latest members
-BoxFicheInter=Latest interventions
-BoxCurrentAccounts=Open accounts balance
-BoxTitleMemberNextBirthdays=Birthdays of this month (members)
-BoxTitleLastRssInfos=Latest %s news from %s
-BoxTitleLastProducts=Products/Services: last %s modified
-BoxTitleProductsAlertStock=Products: stock alert
-BoxTitleLastSuppliers=Latest %s recorded suppliers
-BoxTitleLastModifiedSuppliers=Vendors: last %s modified
-BoxTitleLastModifiedCustomers=Customers: last %s modified
-BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s modified Customer invoices
-BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
-BoxTitleLastModifiedProspects=Prospects: last %s modified
-BoxTitleLastModifiedMembers=Latest %s members
-BoxTitleLastFicheInter=Latest %s modified interventions
-BoxTitleOldestUnpaidCustomerBills=Customer Invoices: oldest %s unpaid
-BoxTitleOldestUnpaidSupplierBills=Vendor Invoices: oldest %s unpaid
-BoxTitleCurrentAccounts=Open Accounts: balances
-BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
-BoxTitleLastModifiedContacts=Contacts/Addresses: last %s modified
-BoxMyLastBookmarks=Bookmarks: latest %s
+BoxLoginInformation=ログイン情報
+BoxLastRssInfos=RSS情報
+BoxLastProducts=最新の%s製品/サービス
+BoxProductsAlertStock=製品の在庫アラート
+BoxLastProductsInContract=最新の%s契約製品/サービス
+BoxLastSupplierBills=最新の仕入先の請求書
+BoxLastCustomerBills=最新の顧客の請求書
+BoxOldestUnpaidCustomerBills=最も古い未払いの顧客の請求書
+BoxOldestUnpaidSupplierBills=最も古い未払いの仕入先の請求書
+BoxLastProposals=最新の商業提案
+BoxLastProspects=最新の変更された見通し
+BoxLastCustomers=最新の変更された顧客
+BoxLastSuppliers=最新の変更されたサプライヤー
+BoxLastCustomerOrders=最新の販売注文
+BoxLastActions=最新のアクション
+BoxLastContracts=最新の契約
+BoxLastContacts=最新の連絡先/住所
+BoxLastMembers=最新のメンバー
+BoxFicheInter=最新の介入
+BoxCurrentAccounts=口座残高
+BoxTitleMemberNextBirthdays=今月の誕生日（会員）
+BoxTitleLastRssInfos=%sからの最新の%sニュース
+BoxTitleLastProducts=製品/サービス：最後に変更された%s
+BoxTitleProductsAlertStock=製品：在庫アラート
+BoxTitleLastSuppliers=最新の%s記録されたサプライヤー
+BoxTitleLastModifiedSuppliers=仕入先：最後に変更された%s
+BoxTitleLastModifiedCustomers=お客様：最後に変更された%s
+BoxTitleLastCustomersOrProspects=最新の%sの顧客または見込み客
+BoxTitleLastCustomerBills=最新の%s変更された顧客の請求書
+BoxTitleLastSupplierBills=最新の%s変更された仕入先の請求書
+BoxTitleLastModifiedProspects=見通し：最後に変更された%s
+BoxTitleLastModifiedMembers=最新の%sメンバー
+BoxTitleLastFicheInter=最新の%s修正された介入
+BoxTitleOldestUnpaidCustomerBills=顧客の請求書：最も古い%s未払い
+BoxTitleOldestUnpaidSupplierBills=仕入先の請求書：最も古い%s未払い
+BoxTitleCurrentAccounts=開設中口座：残高
+BoxTitleSupplierOrdersAwaitingReception=受付待ちのサプライヤー注文
+BoxTitleLastModifiedContacts=連絡先/アドレス：最後に変更された%s
+BoxMyLastBookmarks=ブックマーク：最新の%s
 BoxOldestExpiredServices=最も古いアクティブな期限切れのサービス
-BoxLastExpiredServices=Latest %s oldest contacts with active expired services
-BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
-BoxGlobalActivity=Global activity (invoices, proposals, orders)
-BoxGoodCustomers=Good customers
-BoxTitleGoodCustomers=%s Good customers
-FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
-LastRefreshDate=Latest refresh date
-NoRecordedBookmarks=ブックマークが定義されていません。
+BoxLastExpiredServices=アクティブな期限切れのサービスを持つ最新の%s最も古い連絡先
+BoxTitleLastActionsToDo=実行する最新の%sアクション
+BoxTitleLastContracts=最新の%s変更された契約
+BoxTitleLastModifiedDonations=最新の%s変更された寄付
+BoxTitleLastModifiedExpenses=最新の%s変更された経費報告書
+BoxTitleLatestModifiedBoms=最新の%s変更されたBOM
+BoxTitleLatestModifiedMos=最新の%s変更された製造オーダー
+BoxGlobalActivity=グローバルアクティビティ（請求書、提案、注文）
+BoxGoodCustomers=良い顧客
+BoxTitleGoodCustomers=%s良い顧客
+FailedToRefreshDataInfoNotUpToDate=RSSフラックスの更新に失敗しました。最新の正常な更新日：%s
+LastRefreshDate=最新の更新日
+NoRecordedBookmarks=ブックマークが定義されていない。
 ClickToAdd=追加するにはここをクリックしてください。
-NoRecordedCustomers=記録された顧客がありません
+NoRecordedCustomers=記録された顧客がない
 NoRecordedContacts=全く記録されたコンタクトません
-NoActionsToDo=そうするアクションはありません
-NoRecordedOrders=No recorded sales orders
-NoRecordedProposals=全く記録された提案はありません
-NoRecordedInvoices=No recorded customer invoices
-NoUnpaidCustomerBills=No unpaid customer invoices
-NoUnpaidSupplierBills=No unpaid vendor invoices
-NoModifiedSupplierBills=No recorded vendor invoices
-NoRecordedProducts=記録された商品はありません/サービスなし
+NoActionsToDo=そうするアクションはない
+NoRecordedOrders=記録された販売注文はない
+NoRecordedProposals=全く記録された提案はない
+NoRecordedInvoices=顧客の請求書は記録されていない
+NoUnpaidCustomerBills=未払いの顧客請求書はない
+NoUnpaidSupplierBills=未払いの仕入先の請求書はない
+NoModifiedSupplierBills=仕入先の請求書は記録されていない
+NoRecordedProducts=記録された商品はない/サービスなし
 NoRecordedProspects=全く記録された見通しなし
 NoContractedProducts=ない製品/サービスは、契約しない
 NoRecordedContracts=全く記録された契約をしない
-NoRecordedInterventions=No recorded interventions
-BoxLatestSupplierOrders=Latest purchase orders
-BoxLatestSupplierOrdersAwaitingReception=Latest Purchase Orders (with a pending reception)
-NoSupplierOrder=No recorded purchase order
-BoxCustomersInvoicesPerMonth=Customer Invoices per month
-BoxSuppliersInvoicesPerMonth=Vendor Invoices per month
-BoxCustomersOrdersPerMonth=Sales Orders per month
-BoxSuppliersOrdersPerMonth=Vendor Orders per month
-BoxProposalsPerMonth=Proposals per month
-NoTooLowStockProducts=No products are under the low stock limit
-BoxProductDistribution=Products/Services Distribution
-ForObject=On %s
-BoxTitleLastModifiedSupplierBills=Vendor Invoices: last %s modified
-BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
-BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
-BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
-BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+NoRecordedInterventions=記録された介入はない
+BoxLatestSupplierOrders=最新の注文書
+BoxLatestSupplierOrdersAwaitingReception=最新の注文書（受付待ち）
+NoSupplierOrder=注文書は記録されていない
+BoxCustomersInvoicesPerMonth=1か月あたりの顧客の請求書
+BoxSuppliersInvoicesPerMonth=1か月あたりの仕入先の請求書
+BoxCustomersOrdersPerMonth=1か月あたりの販売注文
+BoxSuppliersOrdersPerMonth=1か月あたりの仕入先注文
+BoxProposalsPerMonth=1か月あたりの提案
+NoTooLowStockProducts=在庫の下限を下回っている製品はない
+BoxProductDistribution=製品/サービスの配布
+ForObject=%sで
+BoxTitleLastModifiedSupplierBills=仕入先の請求書：最後に変更された%s
+BoxTitleLatestModifiedSupplierOrders=仕入先の注文：最後に変更された%s
+BoxTitleLastModifiedCustomerBills=顧客の請求書：最後に変更された%s
+BoxTitleLastModifiedCustomerOrders=受注：最後の%s変更
+BoxTitleLastModifiedPropals=最新の%s変更された提案
+BoxTitleLatestModifiedJobPositions=最新の%s変更されたジョブ
+BoxTitleLatestModifiedCandidatures=最新の%s修正候補
 ForCustomersInvoices=顧客の請求書
-ForCustomersOrders=Customers orders
+ForCustomersOrders=顧客の注文
 ForProposals=提案
-LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard
-BoxAdded=Widget was added in your dashboard
-BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
-BoxLastManualEntries=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
-NoRecordedManualEntries=No manual entries record in accountancy
-BoxSuspenseAccount=Count accountancy operation with suspense account
-BoxTitleSuspenseAccount=Number of unallocated lines
-NumberOfLinesInSuspenseAccount=Number of line in suspense account
-SuspenseAccountNotDefined=Suspense account isn't defined
-BoxLastCustomerShipments=Last customer shipments
-BoxTitleLastCustomerShipments=Latest %s customer shipments
-NoRecordedShipments=No recorded customer shipment
+LastXMonthRolling=最新の %s 月ローリング
+ChooseBoxToAdd=ダッシュボードにウィジェットを追加する
+BoxAdded=ダッシュボードにウィジェットが追加された
+BoxTitleUserBirthdaysOfMonth=今月の誕生日（ユーザー）
+BoxLastManualEntries=会計の最後の手動入力
+BoxTitleLastManualEntries=%s最新のマニュアルエントリ
+NoRecordedManualEntries=会計に手動入力の記録はない
+BoxSuspenseAccount=サスペンスアカウントで会計操作をカウントする
+BoxTitleSuspenseAccount=未割り当て回線の数
+NumberOfLinesInSuspenseAccount=仮勘定の行数
+SuspenseAccountNotDefined=一時停止アカウントが定義されていない
+BoxLastCustomerShipments=最後の顧客の出荷
+BoxTitleLastCustomerShipments=最新の%s顧客出荷
+NoRecordedShipments=顧客の出荷は記録されていない
 # Pages
-AccountancyHome=会計学
+AccountancyHome=会計
+ValidatedProjects=検証済みプロジェクト
diff --git a/htdocs/langs/ja_JP/cashdesk.lang b/htdocs/langs/ja_JP/cashdesk.lang
index aea5aeda5e3..15f5a1bd3b0 100644
--- a/htdocs/langs/ja_JP/cashdesk.lang
+++ b/htdocs/langs/ja_JP/cashdesk.lang
@@ -1,6 +1,6 @@
 # Language file - Source file is en_US - cashdesk
-CashDeskMenu=販売場所
-CashDesk=販売場所
+CashDeskMenu=販売時点
+CashDesk=販売時点
 CashDeskBankCash=銀行口座（現金）
 CashDeskBankCB=銀行口座（カード）
 CashDeskBankCheque=銀行口座（チェック）
@@ -11,114 +11,115 @@ CashDeskStock=株式
 CashDeskOn=上の
 CashDeskThirdParty=第三者
 ShoppingCart=ショッピングカート
-NewSell=新しい販売
-AddThisArticle=この記事を追加します。
+NewSell=新規販売
+AddThisArticle=この記事を追加。
 RestartSelling=販売に戻る
 SellFinished=販売完了
 PrintTicket=印刷チケット
-SendTicket=Send ticket
-NoProductFound=記事見つかりません
-ProductFound=製品が見つかりました
-NoArticle=いいえ記事ません
+SendTicket=チケットを送る
+NoProductFound=記事見つからない
+ProductFound=製品が見つかった
+NoArticle=記事なし
 Identification=識別
 Article=記事
 Difference=違い
 TotalTicket=合計チケット
 NoVAT=この売却のための付加価値税なし
-Change=過剰は、受信した
-BankToPay=支払の口座
-ShowCompany=会社を表示
+Change=受領した余剰
+BankToPay=支払口座
+ShowCompany=法人を表示
 ShowStock=倉庫を表示
 DeleteArticle=この記事を削除するときにクリックします
 FilterRefOrLabelOrBC=検索 (参照/ラベル)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
+UserNeedPermissionToEditStockToUsePos=請求書の作成時に在庫を減らすように依頼するため、POSを使用するユーザーには在庫を編集する権限が必要です。
 DolibarrReceiptPrinter=Dolibarr領収書プリンター
-PointOfSale=Point of Sale
+PointOfSale=販売時点
 PointOfSaleShort=POS
-CloseBill=Close Bill
-Floors=Floors
-Floor=Floor
-AddTable=Add table
-Place=Place
-TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
-SearchProduct=Search product
+CloseBill=ビルを閉じる
+Floors=床
+Floor=床
+AddTable=テーブルを追加
+Place=場所
+TakeposConnectorNecesary=「TakePOSコネクタ」が必要
+OrderPrinters=プリンターを注文する
+SearchProduct=製品を検索する
 Receipt=領収書
-Header=Header
-Footer=Footer
-AmountAtEndOfPeriod=Amount at end of period (day, month or year)
-TheoricalAmount=Theorical amount
-RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+Header=ヘッダ
+Footer=フッター
+AmountAtEndOfPeriod=期末の金額（日、月、または年）
+TheoricalAmount=理論量
+RealAmount=実数
+CashFence=キャッシュフェンス
+CashFenceDone=期間中に行われたキャッシュフェンス
 NbOfInvoices=請求書のNb
-Paymentnumpad=Type of Pad to enter payment
-Numberspad=Numbers Pad
-BillsCoinsPad=Coins and banknotes Pad
-DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
-CashDeskBankAccountFor=Default account to use for payments in
-NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
-TicketVatGrouped=Group VAT by rate in tickets|receipts
-AutoPrintTickets=Automatically print tickets|receipts
-PrintCustomerOnReceipts=Print customer on tickets|receipts
-EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
-ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
-ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
+Paymentnumpad=支払いを入力するパッドのタイプ
+Numberspad=ナンバーズパッド
+BillsCoinsPad=硬貨と紙幣パッド
+DolistorePosCategory=Dolibarr用のTakePOSモジュールおよびその他のPOSソリューション
+TakeposNeedsCategories=TakePOSが機能するには製品カテゴリが必要です
+OrderNotes=注文メモ
+CashDeskBankAccountFor=での支払いに使用するデフォルトのアカウント
+NoPaimementModesDefined=TakePOS構成で定義された支払いモードはあらない
+TicketVatGrouped=チケットのレートでVATをグループ化|領収書
+AutoPrintTickets=チケットを自動的に印刷|領収書
+PrintCustomerOnReceipts=チケットに顧客を印刷する|領収書
+EnableBarOrRestaurantFeatures=バーまたはレストランの機能を有効にする
+ConfirmDeletionOfThisPOSSale=この現在の販売の削除を確認するか？
+ConfirmDiscardOfThisPOSSale=この現在の販売を破棄するか？
 History=歴史
-ValidateAndClose=Validate and close
-Terminal=Terminal
-NumberOfTerminals=Number of Terminals
-TerminalSelect=Select terminal you want to use:
-POSTicket=POS Ticket
-POSTerminal=POS Terminal
-POSModule=POS Module
-BasicPhoneLayout=Use basic layout for phones
-SetupOfTerminalNotComplete=Setup of terminal %s is not complete
-DirectPayment=Direct payment
-DirectPaymentButton=Add a "Direct cash payment" button
-InvoiceIsAlreadyValidated=Invoice is already validated
-NoLinesToBill=No lines to bill
-CustomReceipt=Custom Receipt
-ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
-SupplementCategory=Supplement category
-ColorTheme=Color theme
-Colorful=Colorful
-HeadBar=Head Bar
-SortProductField=Field for sorting products
-Browser=Browser
-BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
-TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
-PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
-ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
-CashDeskRefNumberingModules=Numbering module for POS sales
-CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
-TakeposGroupSameProduct=Group same products lines
-StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
-CashReport=Cash report
-MainPrinterToUse=Main printer to use
-OrderPrinterToUse=Order printer to use
-MainTemplateToUse=Main template to use
-OrderTemplateToUse=Order template to use
-BarRestaurant=Bar Restaurant
-AutoOrder=Order by the customer himself
-RestaurantMenu=Menu
-CustomerMenu=Customer menu
-ScanToMenu=Scan QR code to see the menu
-ScanToOrder=Scan QR code to order
-Appearance=Appearance
-HideCategoryImages=Hide Category Images
-HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines of images to show
-DefineTablePlan=Define tables plan
-GiftReceiptButton=Add a "Gift receipt" button
-GiftReceipt=Gift receipt
-ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
-AllowDelayedPayment=Allow delayed payment
-PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+ValidateAndClose=検証して閉じる
+Terminal=ターミナル
+NumberOfTerminals=ターミナル数
+TerminalSelect=使用する端末を選択。
+POSTicket=POSチケット
+POSTerminal=POS端末
+POSModule=POSモジュール
+BasicPhoneLayout=電話の基本的なレイアウトを使用する
+SetupOfTerminalNotComplete=ターミナル%sのセットアップが完了していない
+DirectPayment=直接支払い
+DirectPaymentButton=「直接現金支払い」ボタンを追加する
+InvoiceIsAlreadyValidated=請求書はすでに検証されている
+NoLinesToBill=請求する行がない
+CustomReceipt=カスタム領収書
+ReceiptName=領収書名
+ProductSupplements=製品サプリメント
+SupplementCategory=サプリメントカテゴリー
+ColorTheme=カラーテーマ
+Colorful=カラフル
+HeadBar=ヘッドバー
+SortProductField=製品を分類するためのフィールド
+Browser=ブラウザ
+BrowserMethodDescription=シンプルで簡単なレシート印刷。レシートを構成するためのいくつかのパラメーターのみ。ブラウザ経由で印刷。
+TakeposConnectorMethodDescription=追加機能を備えた外部モジュール。クラウドから印刷する可能性。
+PrintMethod=印刷方法
+ReceiptPrinterMethodDescription=たくさんのパラメータを持つ強力な方法。テンプレートで完全にカスタマイズ可能。クラウドから印刷できない。
+ByTerminal=ターミナルで
+TakeposNumpadUsePaymentIcon=テンキーの支払いボタンのテキストの代わりにアイコンを使用する
+CashDeskRefNumberingModules=POS販売用の番号付けモジュール
+CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b>タグは端末番号を追加するために使用される
+TakeposGroupSameProduct=同じ製品ラインをグループ化する
+StartAParallelSale=新規並行販売を開始する
+ControlCashOpening=POSを開くときにキャッシュボックスを制御する
+CloseCashFence=キャッシュフェンスを閉じる
+CashReport=現金レポート
+MainPrinterToUse=使用するメインプリンター
+OrderPrinterToUse=使用するプリンタを注文する
+MainTemplateToUse=使用するメインテンプレート
+OrderTemplateToUse=使用する注文テンプレート
+BarRestaurant=バーレストラン
+AutoOrder=お客様ご自身でご注文ください
+RestaurantMenu=メニュー
+CustomerMenu=カスタマーメニュー
+ScanToMenu=QRコードをスキャンしてメニューを表示します
+ScanToOrder=QRコードをスキャンして注文する
+Appearance=外観
+HideCategoryImages=カテゴリ画像を非表示
+HideProductImages=製品画像を非表示
+NumberOfLinesToShow=表示する画像の行数
+DefineTablePlan=テーブルプランを定義する
+GiftReceiptButton=「領収書」ボタンを追加
+GiftReceipt=ギフトレシート
+ModuleReceiptPrinterMustBeEnabled=モジュールレシートプリンターを最初に有効にしておく必要がある
+AllowDelayedPayment=支払いの遅延を許可する
+PrintPaymentMethodOnReceipts=チケットに支払い方法を印刷する|領収書
+WeighingScale=体重計
diff --git a/htdocs/langs/ja_JP/categories.lang b/htdocs/langs/ja_JP/categories.lang
index 41e4f247bfc..f3d63b0723d 100644
--- a/htdocs/langs/ja_JP/categories.lang
+++ b/htdocs/langs/ja_JP/categories.lang
@@ -1,90 +1,92 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=Tag/Category
-Rubriques=Tags/Categories
-RubriquesTransactions=Tags/Categories of transactions
-categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+Rubrique=タグ/カテゴリ
+Rubriques=タグ/カテゴリ
+RubriquesTransactions=タグ/トランザクションのカテゴリ
+categories=タグ/カテゴリ
+NoCategoryYet=このタイプのタグ/カテゴリは作成されていない
 In=で
 AddIn=加える
 modify=修正する
 Classify=分類する
-CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
-SubCats=Sub-categories
-CatList=List of tags/categories
-NewCategory=New tag/category
-ModifCat=Modify tag/category
-CatCreated=Tag/category created
-CreateCat=Create tag/category
-CreateThisCat=Create this tag/category
-NoSubCat=いいえサブカテゴリはありません。
+CategoriesArea=タグ/カテゴリエリア
+ProductsCategoriesArea=製品/サービスタグ/カテゴリ領域
+SuppliersCategoriesArea=ベンダーのタグ/カテゴリ領域
+CustomersCategoriesArea=顧客タグ/カテゴリ領域
+MembersCategoriesArea=メンバータグ/カテゴリエリア
+ContactsCategoriesArea=連絡先タグ/カテゴリ領域
+AccountsCategoriesArea=アカウントタグ/カテゴリ領域
+ProjectsCategoriesArea=プロジェクトタグ/カテゴリ領域
+UsersCategoriesArea=ユーザータグ/カテゴリ領域
+SubCats=サブカテゴリ
+CatList=タグ/カテゴリのリスト
+NewCategory=新しいタグ/カテゴリ
+ModifCat=タグ/カテゴリを変更する
+CatCreated=作成されたタグ/カテゴリ
+CreateCat=タグ/カテゴリを作成する
+CreateThisCat=このタグ/カテゴリを作成する
+NoSubCat=いいえサブカテゴリはない。
 SubCatOf=サブカテゴリ
-FoundCats=Found tags/categories
-ImpossibleAddCat=Impossible to add the tag/category %s
+FoundCats=見つかったタグ/カテゴリ
+ImpossibleAddCat=タグ/カテゴリを追加できない%s
 WasAddedSuccessfully=<b>%sが</b>正常<b>に</b>追加されました。
-ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-ProductIsInCategories=Product/service is linked to following tags/categories
-CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party is linked to following vendors tags/categories
-MemberIsInCategories=This member is linked to following members tags/categories
-ContactIsInCategories=This contact is linked to following contacts tags/categories
-ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This third party is not in any tags/categories
-MemberHasNoCategory=This member is not in any tags/categories
-ContactHasNoCategory=This contact is not in any tags/categories
-ProjectHasNoCategory=This project is not in any tags/categories
-ClassifyInCategory=Add to tag/category
-NotCategorized=Without tag/category
+ObjectAlreadyLinkedToCategory=要素はすでにこのタグ/カテゴリにリンクされている。
+ProductIsInCategories=製品/サービスは以下のタグ/カテゴリにリンクされている
+CompanyIsInCustomersCategories=このサードパーティは、次の顧客/見込み客のタグ/カテゴリにリンクされている
+CompanyIsInSuppliersCategories=このサードパーティは、次のベンダーのタグ/カテゴリにリンクされている
+MemberIsInCategories=このメンバーは、次のメンバーのタグ/カテゴリにリンクされている
+ContactIsInCategories=この連絡先は、次の連絡先タグ/カテゴリにリンクされている
+ProductHasNoCategory=この製品/サービスはどのタグ/カテゴリにも含まれていない
+CompanyHasNoCategory=このサードパーティはタグ/カテゴリに含まれていない
+MemberHasNoCategory=このメンバーはどのタグ/カテゴリにも含まれていない
+ContactHasNoCategory=この連絡先はどのタグ/カテゴリにもない
+ProjectHasNoCategory=このプロジェクトはどのタグ/カテゴリにも含まれていない
+ClassifyInCategory=タグ/カテゴリに追加
+NotCategorized=タグ/カテゴリなし
 CategoryExistsAtSameLevel=このカテゴリには、このrefで既に存在している
 ContentsVisibleByAllShort=すべてから見える内容
 ContentsNotVisibleByAllShort=すべてでは表示されない内容
-DeleteCategory=Delete tag/category
-ConfirmDeleteCategory=Are you sure you want to delete this tag/category?
-NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Vendors tag/category
-CustomersCategoryShort=Customers tag/category
-ProductsCategoryShort=Products tag/category
-MembersCategoryShort=Members tag/category
-SuppliersCategoriesShort=Vendors tags/categories
-CustomersCategoriesShort=Customers tags/categories
-ProspectsCategoriesShort=Prospects tags/categories
-CustomersProspectsCategoriesShort=Cust./Prosp. tags/categories
-ProductsCategoriesShort=Products tags/categories
-MembersCategoriesShort=Members tags/categories
-ContactCategoriesShort=Contacts tags/categories
-AccountsCategoriesShort=Accounts tags/categories
-ProjectsCategoriesShort=Projects tags/categories
-UsersCategoriesShort=Users tags/categories
-StockCategoriesShort=Warehouse tags/categories
-ThisCategoryHasNoItems=This category does not contain any items.
-CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
-CatProdList=List of products tags/categories
-CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
-CatCusLinks=Links between customers/prospects and tags/categories
-CatContactsLinks=Links between contacts/addresses and tags/categories
-CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
-DeleteFromCat=Remove from tags/category
+DeleteCategory=タグ/カテゴリを削除する
+ConfirmDeleteCategory=このタグ/カテゴリを削除してもよいか？
+NoCategoriesDefined=タグ/カテゴリが定義されていない
+SuppliersCategoryShort=ベンダーのタグ/カテゴリ
+CustomersCategoryShort=顧客のタグ/カテゴリ
+ProductsCategoryShort=製品タグ/カテゴリ
+MembersCategoryShort=メンバーのタグ/カテゴリ
+SuppliersCategoriesShort=ベンダーのタグ/カテゴリ
+CustomersCategoriesShort=顧客のタグ/カテゴリ
+ProspectsCategoriesShort=見込み客のタグ/カテゴリ
+CustomersProspectsCategoriesShort=Cust./Prosp。タグ/カテゴリ
+ProductsCategoriesShort=製品タグ/カテゴリ
+MembersCategoriesShort=メンバーのタグ/カテゴリ
+ContactCategoriesShort=連絡先タグ/カテゴリ
+AccountsCategoriesShort=アカウントのタグ/カテゴリ
+ProjectsCategoriesShort=プロジェクトのタグ/カテゴリ
+UsersCategoriesShort=ユーザーのタグ/カテゴリ
+StockCategoriesShort=倉庫のタグ/カテゴリ
+ThisCategoryHasNoItems=このカテゴリにはアイテムは含まれていない。
+CategId=タグ/カテゴリID
+CatSupList=ベンダータグ/カテゴリのリスト
+CatCusList=顧客/見込み客のタグ/カテゴリのリスト
+CatProdList=製品タグ/カテゴリのリスト
+CatMemberList=メンバーのタグ/カテゴリのリスト
+CatContactList=連絡先タグ/カテゴリのリスト
+CatSupLinks=サプライヤーとタグ/カテゴリー間のリンク
+CatCusLinks=顧客/見込み客とタグ/カテゴリ間のリンク
+CatContactsLinks=連絡先/アドレスとタグ/カテゴリ間のリンク
+CatProdLinks=製品/サービスとタグ/カテゴリ間のリンク
+CatProJectLinks=プロジェクトとタグ/カテゴリ間のリンク
+DeleteFromCat=タグ/カテゴリから削除する
 ExtraFieldsCategories=補完的な属性
-CategoriesSetup=Tags/categories setup
-CategorieRecursiv=Link with parent tag/category automatically
-CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
-AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show tag/category
-ByDefaultInList=By default in list
-ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
-UseOrOperatorForCategories=Use or operator for categories
+CategoriesSetup=タグ/カテゴリの設定
+CategorieRecursiv=親タグ/カテゴリと自動的にリンクする
+CategorieRecursivHelp=オプションがオンの場合、製品をサブカテゴリに追加すると、製品も親カテゴリに追加される。
+AddProductServiceIntoCategory=次の製品/サービスを追加する
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
+ShowCategory=タグ/カテゴリを表示
+ByDefaultInList=デフォルトでリストに
+ChooseCategory=カテゴリを選択
+StocksCategoriesArea=倉庫カテゴリ
+ActionCommCategoriesArea=イベントカテゴリ
+WebsitePagesCategoriesArea=ページ-コンテナカテゴリ
+UseOrOperatorForCategories=カテゴリの使用または演算子
diff --git a/htdocs/langs/ja_JP/companies.lang b/htdocs/langs/ja_JP/companies.lang
index 2342ee3ce68..4296d39f2dd 100644
--- a/htdocs/langs/ja_JP/companies.lang
+++ b/htdocs/langs/ja_JP/companies.lang
@@ -1,142 +1,142 @@
 # Dolibarr language file - Source file is en_US - companies
-ErrorCompanyNameAlreadyExists=会社名%sはすでに存在しています。別のいずれかを選択します。
+ErrorCompanyNameAlreadyExists=法人名 %s は既存です。別のを選択してください。
 ErrorSetACountryFirst=始めに国を設定する
-SelectThirdParty=サードパーティを選択します。
-ConfirmDeleteCompany=この会社と継承されたすべての情報を削除してもよろしいですか？
-DeleteContact=連絡先を削除
+SelectThirdParty=取引先を選択します
+ConfirmDeleteCompany=この法人と継承されたすべての情報を削除してもよろしいですか？
+DeleteContact=連絡先/住所を削除
 ConfirmDeleteContact=この連絡先と継承されたすべての情報を削除してもよろしいですか？
-MenuNewThirdParty=New Third Party
-MenuNewCustomer=New Customer
-MenuNewProspect=New Prospect
-MenuNewSupplier=New Vendor
-MenuNewPrivateIndividual=新しい民間の個々の
-NewCompany=New company (prospect, customer, vendor)
-NewThirdParty=New Third Party (prospect, customer, vendor)
-CreateDolibarrThirdPartySupplier=Create a third party (vendor)
-CreateThirdPartyOnly=Create third party
-CreateThirdPartyAndContact=Create a third party + a child contact
-ProspectionArea=Prospectionエリア
-IdThirdParty=IDサードパーティ
-IdCompany=企業ID
-IdContact=IDをお問い合わせください
-ThirdPartyContacts=Third-party contacts
-ThirdPartyContact=Third-party contact/address
-Company=会社
-CompanyName=会社名
-AliasNames=Alias name (commercial, trademark, ...)
-AliasNameShort=Alias Name
-Companies=企業
-CountryIsInEEC=Country is inside the European Economic Community
-PriceFormatInCurrentLanguage=Price display format in the current language and currency
-ThirdPartyName=Third-party name
-ThirdPartyEmail=Third-party email
-ThirdParty=Third-party
-ThirdParties=Third-parties
-ThirdPartyProspects=見込み
-ThirdPartyProspectsStats=見込み
-ThirdPartyCustomers=お客さま
-ThirdPartyCustomersStats=お客さま
-ThirdPartyCustomersWithIdProf12=%s %sまたはお持ちのお客様
-ThirdPartySuppliers=Vendors
-ThirdPartyType=Third-party type
-Individual=私人
-ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
+MenuNewThirdParty=新規取引先
+MenuNewCustomer=新規顧客
+MenuNewProspect=新規見込客
+MenuNewSupplier=新規仕入先
+MenuNewPrivateIndividual=新規個人
+NewCompany=新規法人 (見込客、顧客、仕入先)
+NewThirdParty=新規取引先 (見込客、顧客、仕入先)
+CreateDolibarrThirdPartySupplier=取引先を作成 (仕入先)
+CreateThirdPartyOnly=取引先を作成
+CreateThirdPartyAndContact=取引先と連絡先を作成
+ProspectionArea=見込客エリア
+IdThirdParty=ID取引先
+IdCompany=法人ID
+IdContact=連絡先ID
+ThirdPartyContacts=取引先の連絡先s
+ThirdPartyContact=取引先の連絡先/住所
+Company=法人
+CompanyName=法人名
+AliasNames=別名 (屋号、証憑、...)
+AliasNameShort=別名
+Companies=法人
+CountryIsInEEC=当該国は欧州経済共同体内に存する
+PriceFormatInCurrentLanguage=現在の言語と通貨での価格表示形式
+ThirdPartyName=取引先名
+ThirdPartyEmail=取引先メール
+ThirdParty=取引先
+ThirdParties=取引先s
+ThirdPartyProspects=見込客s
+ThirdPartyProspectsStats=見込客s
+ThirdPartyCustomers=顧客s
+ThirdPartyCustomersStats=顧客s
+ThirdPartyCustomersWithIdProf12=%sまたは %sを使う顧客s
+ThirdPartySuppliers=仕入先s
+ThirdPartyType=取引先種別
+Individual=個人
+ToCreateContactWithSameName=取引先の下にある取引先と同じ情報で連絡先/住所を自動作成。ほとんどの場合、取引先が実在の人物であっても、取引先を作成するだけで十分。
 ParentCompany=親会社
 Subsidiaries=子会社
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=率による報告
-CivilityCode=礼儀正しさコード
+ReportByMonth=月別報告書
+ReportByCustomers=顧客別報告書
+ReportByQuarter=料金別報告書
+CivilityCode=敬称コード
 RegisteredOffice=登録事務所
 Lastname=姓
-Firstname=ファーストネーム
+Firstname=姓名の名
 PostOrFunction=職位
-UserTitle=タイトル
-NatureOfThirdParty=Nature of Third party
-NatureOfContact=Nature of Contact
-Address=アドレス
+UserTitle=役職名
+NatureOfThirdParty=取引先の性質
+NatureOfContact=連絡の性質
+Address=住所
 State=州/地方
-StateCode=State/Province code
-StateShort=State
+StateCode=州/地方コード
+StateShort=州
 Region=地域
-Region-State=Region - State
+Region-State=地域 - 州
 Country=国
 CountryCode=国コード
 CountryId=国番号
 Phone=電話
 PhoneShort=電話
 Skype=Skype
-Call=Call
-Chat=Chat
-PhonePro=教授の携帯電話
-PhonePerso=PERS。電話
+Call=電話
+Chat=チャット
+PhonePro=職場電話
+PhonePerso=個人電話
 PhoneMobile=携帯電話
-No_Email=Refuse bulk emailings
+No_Email=大量メールを拒否
 Fax=ファックス
 Zip=郵便番号
-Town=シティ
+Town=区市町村
 Web=ウェブ
 Poste= 位置
-DefaultLang=Language default
-VATIsUsed=Sales tax used
-VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
-VATIsNotUsed=Sales tax is not used
-CopyAddressFromSoc=Copy address from third-party details
-ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available referring objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor vendor, discounts are not available
-PaymentBankAccount=Payment bank account
+DefaultLang=言語デフォルト
+VATIsUsed=消費税項目使用中
+VATIsUsedWhenSelling=この定義は、取引先が顧客に請求を作る時の消費 税込/税抜 を指定するもの
+VATIsNotUsed=消費税項目不使用
+CopyAddressFromSoc=取引先詳細から住所をコピー
+ThirdpartyNotCustomerNotSupplierSoNoRef=顧客 または 仕入先 以外の取引先、参照するもの無し
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=顧客 または 仕入先 以外の取引先、値引は不可
+PaymentBankAccount=支払銀行口座
 OverAllProposals=提案
 OverAllOrders=受注
 OverAllInvoices=請求書
-OverAllSupplierProposals=Price requests
+OverAllSupplierProposals=価格の要望
 ##### Local Taxes #####
-LocalTax1IsUsed=Use second tax
-LocalTax1IsUsedES= REが使用されます
-LocalTax1IsNotUsedES= REが使用されていない
-LocalTax2IsUsed=Use third tax
-LocalTax2IsUsedES= IRPFが使用されます
-LocalTax2IsNotUsedES= IRPFは使用されていません
-WrongCustomerCode=無効な顧客コード
-WrongSupplierCode=Vendor code invalid
+LocalTax1IsUsed=2番目の税項目を使用
+LocalTax1IsUsedES= RE 使用中
+LocalTax1IsNotUsedES= RE 不使用
+LocalTax2IsUsed=3番目の税項目を使用
+LocalTax2IsUsedES= IRPF 使用中
+LocalTax2IsNotUsedES= IRPF 不使用
+WrongCustomerCode=顧客コード無効
+WrongSupplierCode=取引先コード無効
 CustomerCodeModel=顧客コードモデル
-SupplierCodeModel=Vendor code model
+SupplierCodeModel=取引先コードモデル
 Gencod=バーコード
 ##### Professional ID #####
-ProfId1Short=教授はidが1
-ProfId2Short=教授はID 2
-ProfId3Short=教授はID 3
-ProfId4Short=教授はID 4
-ProfId5Short=教授はID 5
-ProfId6Short=Prof. id 6
+ProfId1Short=職id 1
+ProfId2Short=職id 2
+ProfId3Short=職id 3
+ProfId4Short=職id 4
+ProfId5Short=職id 5
+ProfId6Short=職id 6
 ProfId1=プロのID 1
 ProfId2=プロのID 2
 ProfId3=プロのID 3
 ProfId4=プロのID 4
 ProfId5=プロのID 5
 ProfId6=プロのID 6
-ProfId1AR=教授はID 1（CUIT / CUIL）
-ProfId2AR=教授はID 2（Revenu獣）
+ProfId1AR=職 Id 1 (CUIT/CUIL)
+ProfId2AR=職 Id 2 (Revenu brutes)
 ProfId3AR=-
 ProfId4AR=-
 ProfId5AR=-
 ProfId6AR=-
-ProfId1AT=教授はID 1（USt.-IdNr）
-ProfId2AT=教授はID 2（USt.-NR）
-ProfId3AT=教授はID 3（Handelsregister-Nr.）
+ProfId1AT=職 Id 1 (USt.-IdNr)
+ProfId2AT=職 Id 2 (USt.-Nr)
+ProfId3AT=職 Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI番号
 ProfId6AT=-
-ProfId1AU=教授はID 1（ABN）
+ProfId1AU=職 Id 1 (ABN)
 ProfId2AU=-
 ProfId3AU=-
 ProfId4AU=-
 ProfId5AU=-
 ProfId6AU=-
-ProfId1BE=教授はID 1（プロフェッショナル番号）
+ProfId1BE=職 Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI番号
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (国家登録)
@@ -144,41 +144,41 @@ ProfId3BR=IM (市営登録)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-番号
 ProfId2CH=-
-ProfId3CH=教授はID 1（連邦ナンバー）
-ProfId4CH=教授はID 2（商業レコード番号）
-ProfId5CH=-
+ProfId3CH=職 Id 1 (Federal number)
+ProfId4CH=職 Id 2 (Commercial Record number)
+ProfId5CH=EORI番号
 ProfId6CH=-
-ProfId1CL=教授はID 1（RUT）
+ProfId1CL=職 Id 1 (R.U.T.)
 ProfId2CL=-
 ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
-ProfId1CO=教授はID 1（RUT）
+ProfId1CO=職 Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
 ProfId4CO=-
 ProfId5CO=-
 ProfId6CO=-
-ProfId1DE=教授はID 1（USt.-IdNr）
-ProfId2DE=教授はID 2（USt.-NR）
-ProfId3DE=教授はID 3（Handelsregister-Nr.）
+ProfId1DE=職 Id 1 (USt.-IdNr)
+ProfId2DE=職 Id 2 (USt.-Nr)
+ProfId3DE=職 Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI番号
 ProfId6DE=-
-ProfId1ES=教授はID 1（CIF / NIF）
-ProfId2ES=教授はID 2（社会保障番号）
-ProfId3ES=教授はID 3（CNAE）
-ProfId4ES=教授はID 4（参事数）
-ProfId5ES=-
+ProfId1ES=職 Id 1 (CIF/NIF)
+ProfId2ES=職 Id 2 (Social security number)
+ProfId3ES=職 Id 3 (CNAE)
+ProfId4ES=職 Id 4 (Collegiate number)
+ProfId5ES=EORI number
 ProfId6ES=-
-ProfId1FR=教授はID 1（SIREN）
-ProfId2FR=教授はID 2（シレト）
-ProfId3FR=教授はID 3（NAF、古いAPE）
-ProfId4FR=教授はID 4（RCS / RM）
-ProfId5FR=教授はID 5
+ProfId1FR=職 Id 1 (SIREN)
+ProfId2FR=職 Id 2 (SIRET)
+ProfId3FR=職 Id 3 (NAF, old APE)
+ProfId4FR=職 Id 4 (RCS/RM)
+ProfId5FR=EORI番号
 ProfId6FR=-
 ProfId1GB=登録番号
 ProfId2GB=-
@@ -186,47 +186,52 @@ ProfId3GB=SIC
 ProfId4GB=-
 ProfId5GB=-
 ProfId6GB=-
-ProfId1HN=ID教授。 1（RTN）
+ProfId1HN=Id. 職 1 (RTN)
 ProfId2HN=-
 ProfId3HN=-
 ProfId4HN=-
 ProfId5HN=-
 ProfId6HN=-
-ProfId1IN=教授はID 1（TIN）
-ProfId2IN=教授はID 2（PAN）
-ProfId3IN=教授はID 3（SRVC税込）
-ProfId4IN=教授はID 4
-ProfId5IN=教授はID 5
+ProfId1IN=職 Id 1 (TIN)
+ProfId2IN=職 Id 2 (PAN)
+ProfId3IN=職 Id 3 (SRVC TAX)
+ProfId4IN=職 Id 4
+ProfId5IN=職 Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
-ProfId2LU=Id. prof. 2 (Business permit)
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI番号
+ProfId1LU=Id. 職 1  (R.C.S. Luxembourg)
+ProfId2LU=Id. 職 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI番号
 ProfId6LU=-
-ProfId1MA=ID教授。 1（RC）
-ProfId2MA=ID教授。 2（Patente）
-ProfId3MA=ID教授。 3（IF）
-ProfId4MA=ID教授。 4（CNSS）
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId1MA=Id. 職 1 (R.C.)
+ProfId2MA=Id. 職 2 (Patente)
+ProfId3MA=Id. 職 3 (I.F.)
+ProfId4MA=Id. 職 4 (C.N.S.S.)
+ProfId5MA=Id 職 5 (I.C.E.)
 ProfId6MA=-
-ProfId1MX=教授はID 1（RFC）。
-ProfId2MX=教授はID 2（R.。P. IMSS）
-ProfId3MX=教授はID 3（実務者憲章）
+ProfId1MX=職 Id 1 (R.F.C).
+ProfId2MX=職 Id 2 (R..P. IMSS)
+ProfId3MX=職 Id 3 (Profesional Charter)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
 ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
-ProfId4NL=-
-ProfId5NL=-
+ProfId4NL=Burgerservicenummer (BSN)
+ProfId5NL=EORI番号
 ProfId6NL=-
-ProfId1PT=教授はID 1（NIPC）
-ProfId2PT=教授はID 2（社会保障番号）
-ProfId3PT=教授はID 3（商業レコード番号）
-ProfId4PT=教授はID 4（院）
-ProfId5PT=-
+ProfId1PT=職 Id 1 (NIPC)
+ProfId2PT=職 Id 2 (Social security number)
+ProfId3PT=職 Id 3 (Commercial Record number)
+ProfId4PT=職 Id 4 (Conservatory)
+ProfId5PT=EORI番号
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -234,28 +239,28 @@ ProfId3SN=-
 ProfId4SN=-
 ProfId5SN=-
 ProfId6SN=-
-ProfId1TN=教授はID 1（RC）
-ProfId2TN=教授はID 2（平成matricule）
-ProfId3TN=教授はID 3（Douaneコード）
-ProfId4TN=教授はID 4（BAN）
+ProfId1TN=職 Id 1 (RC)
+ProfId2TN=職 Id 2 (Fiscal matricule)
+ProfId3TN=職 Id 3 (Douane code)
+ProfId4TN=職 Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id (FEIN)
+ProfId1US=職 Id  (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
 ProfId5US=-
 ProfId6US=-
-ProfId1RO=Prof Id 1 (CUI)
-ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
-ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId1RO=職 Id 1 (CUI)
+ProfId2RO=職 Id 2 (Nr. Înmatriculare)
+ProfId3RO=職 Id 3 (CAEN)
+ProfId4RO=職 Id 5 (EUID)
+ProfId5RO=EORI番号
 ProfId6RO=-
-ProfId1RU=教授はID 1（OGRN）
-ProfId2RU=教授はID 2（INN）
-ProfId3RU=教授はID 3（KPP）
-ProfId4RU=教授はID 4（玉浦）
+ProfId1RU=職 Id 1 (OGRN)
+ProfId2RU=職 Id 2 (INN)
+ProfId3RU=職 Id 3 (KPP)
+ProfId4RU=職 Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
 ProfId1DZ=RC
@@ -264,96 +269,97 @@ ProfId3DZ=NIF
 ProfId4DZ=NIS
 VATIntra=VAT ID
 VATIntraShort=VAT ID
-VATIntraSyntaxIsValid=構文は有効です。
+VATIntraSyntaxIsValid=構文は有効
 VATReturn=VAT return
 ProspectCustomer=プロスペクト/顧客
 Prospect=見通し
 CustomerCard=顧客カード
 Customer=顧客
-CustomerRelativeDiscount=相対的な顧客割引
-SupplierRelativeDiscount=Relative vendor discount
-CustomerRelativeDiscountShort=相対的な割引
-CustomerAbsoluteDiscountShort=絶対的な割引
-CompanyHasRelativeDiscount=この顧客は<b>%sの%%</b>デフォルトの割引を持っている
-CompanyHasNoRelativeDiscount=この顧客は、デフォルトではなく相対的な割引がありません
-HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this vendor
-HasNoRelativeDiscountFromSupplier=You have no default relative discount from this vendor
-CompanyHasAbsoluteDiscount=This customer has discounts available (credits notes or down payments) for <b>%s</b> %s
-CompanyHasDownPaymentOrCommercialDiscount=This customer has discounts available (commercial, down payments) for <b>%s</b> %s
+CustomerRelativeDiscount=相対的顧客割引
+SupplierRelativeDiscount=相対的仕入先割引
+CustomerRelativeDiscountShort=相対的割引
+CustomerAbsoluteDiscountShort=絶対的割引
+CompanyHasRelativeDiscount=この顧客のデフォルトでの割引は<b>%sの%%</b>
+CompanyHasNoRelativeDiscount=この顧客は、デフォルトでの相対割引は無し
+HasRelativeDiscountFromSupplier=この仕入先からのデフォルトでの割引は <b>%s%%</b>
+HasNoRelativeDiscountFromSupplier=この仕入先からのデフォルトでの相対割引は無し
+CompanyHasAbsoluteDiscount=この顧客への割引可能額(返金確認 または 頭金充当)は <b>%s</b> %s
+CompanyHasDownPaymentOrCommercialDiscount=この顧客への割引可能額(値引取引 または 頭金充当)は <b>%s</b> %s
 CompanyHasCreditNote=この顧客はまだ<b>%s %s</b>のためにクレジットノートを持っている
-HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this vendor
-HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this vendor
-HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this vendor
-HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this vendor
+HasNoAbsoluteDiscountFromSupplier=この仕入先から利用できる割引割戻は無し
+HasAbsoluteDiscountFromSupplier=この仕入先から、<b>%s</b> %s 相当の割引が可能 (返金確約または頭金充当)
+HasDownPaymentOrCommercialDiscountFromSupplier=この仕入先から、 <b>%s</b> %s 相当の割引が可能 (現金値引、頭金充当)
+HasCreditNoteFromSupplier=この仕入先から、<b>%s </b>%s相当の返金確約があり
 CompanyHasNoAbsoluteDiscount=この顧客は、使用可能な割引クレジットを持っていません
-CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
-CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
-SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
+CustomerAbsoluteDiscountAllUsers=絶対顧客割引（すべてのユーザーで付与）
+CustomerAbsoluteDiscountMy=絶対顧客割引（自身で付与）
+SupplierAbsoluteDiscountAllUsers=絶対仕入先割引（すべてのユーザーで入力）
+SupplierAbsoluteDiscountMy=絶対仕入先割引（自分で入力）
 DiscountNone=なし
-Vendor=Vendor
-Supplier=Vendor
-AddContact=Create contact
-AddContactAddress=Create contact/address
-EditContact=コンタクト/アドレスを編集
-EditContactAddress=Edit contact/address
-Contact=Contact/Address
-Contacts=コンタクト
-ContactId=Contact id
-ContactsAddresses=コンタクト/アドレス
-FromContactName=Name:
-NoContactDefinedForThirdParty=No contact defined for this third party
-NoContactDefined=この第三者のために定義された接触禁止
-DefaultContact=デフォルトの連絡先
-ContactByDefaultFor=Default contact/address for
-AddThirdParty=Create third party
+Vendor=仕入先
+Supplier=仕入先
+AddContact=連絡先を作成
+AddContactAddress=連絡先/住所を作成
+EditContact=連絡先を編集
+EditContactAddress=連絡先/住所を編集
+Contact=連絡先/住所
+Contacts=連絡先s/住所s
+ContactId=連絡先 id
+ContactsAddresses=連絡先s/住所s
+FromContactName=名前:
+NoContactDefinedForThirdParty=この取引先に対して連絡先が未定義
+NoContactDefined=連絡先が未定義
+DefaultContact=デフォルト連絡先/住所
+ContactByDefaultFor=デフォルト連絡先/住所、用途は
+AddThirdParty=取引先を作成
 DeleteACompany=会社を削除します。
 PersonalInformations=個人データ
-AccountancyCode=Accounting account
-CustomerCode=Customer Code
-SupplierCode=Vendor Code
-CustomerCodeShort=Customer Code
-SupplierCodeShort=Vendor Code
-CustomerCodeDesc=Customer Code, unique for all customers
-SupplierCodeDesc=Vendor Code, unique for all vendors
-RequiredIfCustomer=第三者が顧客または見込み客である場合は必須
-RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
-ThisIsModuleRules=Rules for this module
-ProspectToContact=連絡する見通し
-CompanyDeleted=データベースから削除された会社 &quot;%s&quot;。
-ListOfContacts=連絡先/アドレスのリスト
-ListOfContactsAddresses=連絡先/アドレスのリスト
-ListOfThirdParties=List of Third Parties
-ShowCompany=Third Party
-ShowContact=Contact-Address
+AccountancyCode=勘定科目
+CustomerCode=顧客 コード
+SupplierCode=仕入先 コード
+CustomerCodeShort=顧客 コード
+SupplierCodeShort=仕入先 コード
+CustomerCodeDesc=顧客コード、全顧客でユニーク
+SupplierCodeDesc=仕入先コード、全仕入先でユニーク
+RequiredIfCustomer=取引先が顧客または見込客である場合は必須
+RequiredIfSupplier=取引先が仕入先である場合は必須
+ValidityControledByModule=検証はモジュールで制御
+ThisIsModuleRules=このモジュールのルールs
+ProspectToContact=連絡する見込客
+CompanyDeleted=法人 "%s" はデータベースから削除。
+ListOfContacts=連絡先s/住所sの一覧
+ListOfContactsAddresses=連絡先s/住所sの一覧
+ListOfThirdParties=取引先s一覧
+ShowCompany=取引先
+ShowContact=連絡先-住所
 ContactsAllShort=すべて（フィルタなし）
-ContactType=コンタクトタイプ
-ContactForOrders=注文のお問い合わせ
-ContactForOrdersOrShipments=Order's or shipment's contact
-ContactForProposals=提案者の連絡先
-ContactForContracts=契約者の連絡先
-ContactForInvoices=請求書の連絡先
-NoContactForAnyOrder=この連絡先は任意の順序のための接触はありません
-NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
-NoContactForAnyProposal=この連絡先は、任意の商業的な提案のための接触はありません
-NoContactForAnyContract=この接触は、いかなる契約の連絡はありません
-NoContactForAnyInvoice=この連絡先は、任意の請求書の連絡はありません
-NewContact=新しい連絡先/アドレス
-NewContactAddress=New Contact/Address
+ContactType=連絡先種別
+ContactForOrders=注文の連絡先
+ContactForOrdersOrShipments=注文または配送の連絡先
+ContactForProposals=提案の連絡先
+ContactForContracts=契約の連絡先
+ContactForInvoices=請求の連絡先
+NoContactForAnyOrder=この連絡先はどの注文にも非対応
+NoContactForAnyOrderOrShipments=このん連絡先はどの注文、どの配送にも非対応
+NoContactForAnyProposal=この連絡先は、どの商業提案のにも非対応
+NoContactForAnyContract=この連絡先は、どの契約とも非対応
+NoContactForAnyInvoice=この連絡先は、どの請求とも非対応
+NewContact=新規 連絡先
+NewContactAddress=新規 連絡先/住所
 MyContacts=私の連絡先
 Capital=資本
 CapitalOf=%sの首都
 EditCompany=会社を編集します。
-ThisUserIsNot=This user is not a prospect, customer or vendor
+ThisUserIsNot=このユーザは見込客でも、顧客でも、仕入先でもない
 VATIntraCheck=チェック
-VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
+VATIntraCheckDesc=VAT IDには、国のプレフィックスを含めることが必要。リンク<b>%s </b>は、欧州VATチェッカーサービス（VIES）を使用し、そのためにはDolibarrサーバーからのインターネットアクセスが必要。
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
-VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraCheckableOnEUSite=欧州委員会のウェブサイトでコミュニティ間のVAT IDを確認
+VATIntraManualCheck=欧州委員会のウェブサイト<a href="%s" target="_blank">%s</a>で手動で確認可能
 ErrorVATCheckMS_UNAVAILABLE=ことはできませんを確認してください。サービスは加盟国（%s）によって提供されていません確認してください。
-NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+NorProspectNorCustomer=見込客でない、顧客でない
+JuridicalStatus=法的組織種別
+Workforce=労働力
 Staff=従業員
 ProspectLevelShort=潜在的な
 ProspectLevel=見通しの可能性
@@ -361,7 +367,7 @@ ContactPrivate=プライベート
 ContactPublic=共有
 ContactVisibility=可視性
 ContactOthers=その他
-OthersNotLinkedToThirdParty=第三者にリンクされていないその他、
+OthersNotLinkedToThirdParty=その他、取引先へのリンク無し
 ProspectStatus=見通しの状態
 PL_NONE=なし
 PL_UNKNOWN=未知の
@@ -370,89 +376,94 @@ PL_MEDIUM=培地
 PL_HIGH=高い
 TE_UNKNOWN=-
 TE_STARTUP=スタートアップ
-TE_GROUP=大企業
-TE_MEDIUM=中小企業
-TE_ADMIN=政府の
-TE_SMALL=小さな会社
-TE_RETAIL=小売店
-TE_WHOLE=Wholesaler
-TE_PRIVATE=私人
+TE_GROUP=大規模法人
+TE_MEDIUM=中規模法人
+TE_ADMIN=政府系
+TE_SMALL=小規模法人
+TE_RETAIL=小売業
+TE_WHOLE=卸売業
+TE_PRIVATE=個人
 TE_OTHER=その他
-StatusProspect-1=連絡しないでください
-StatusProspect0=連絡しないでください
-StatusProspect1=To be contacted
-StatusProspect2=プロセスの連絡先
-StatusProspect3=行わ連絡
-ChangeDoNotContact=&quot;連絡しないでください&quot;にステータスを変更する
-ChangeNeverContacted=&quot;連絡しない&quot;にステータスを変更する
-ChangeToContact=Change status to 'To be contacted'
-ChangeContactInProcess='プロセスにコンタクト &quot;のステータスを変更する
-ChangeContactDone=&quot;行ってコンタクト&quot;のステータスを変更
+StatusProspect-1=連絡不要
+StatusProspect0=連絡未済
+StatusProspect1=要連絡
+StatusProspect2=連絡中
+StatusProspect3=連絡済
+ChangeDoNotContact=状態を '連絡不要' に変更
+ChangeNeverContacted=状態を '連絡未済' に変更
+ChangeToContact=状態を '要連絡' に変更
+ChangeContactInProcess=状態を '連絡中' に変更
+ChangeContactDone=状態を '連絡済' に変更
 ProspectsByStatus=ステータス別の見通し
 NoParentCompany=なし
 ExportCardToFormat=形式にカードをエクスポートする
-ContactNotLinkedToCompany=第三者にリンクされて接触しない
+ContactNotLinkedToCompany=どの取引先にも該当しない連絡先
 DolibarrLogin=Dolibarrログイン
 NoDolibarrAccess=いいえDolibarrアクセス​​できない
-ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties
-ExportDataset_company_2=Contacts and their properties
-ImportDataset_company_1=Third-parties and their properties
-ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
-ImportDataset_company_3=Third-parties Bank accounts
-ImportDataset_company_4=Third-parties Sales representatives (assign sales representatives/users to companies)
-PriceLevel=Price Level
-PriceLevelLabels=Price Level Labels
+ExportDataset_company_1=取引先s (法人s/財団s/個人s) とそのプロパティs
+ExportDataset_company_2=連絡先sとその緒設定
+ImportDataset_company_1=取引先sとそのプロパティs
+ImportDataset_company_2=取引先sの追加的な連絡先s/住所sと諸属性
+ImportDataset_company_3=取引先銀行口座
+ImportDataset_company_4=取引先の営業担当者s (営業担当者s/ユーザsを法人に割当)
+PriceLevel=価格レベル
+PriceLevelLabels=価格レベルラベル
 DeliveryAddress=配信アドレス
 AddAddress=アドレスを追加します。
-SupplierCategory=Vendor category
-JuridicalStatus200=Independent
-DeleteFile=ファイルを削除します。
-ConfirmDeleteFile=あなたがこのファイルを削除してもよろしいですか？
-AllocateCommercial=Assigned to sales representative
+SupplierCategory=仕入先範疇
+JuridicalStatus200=独立系
+DeleteFile=ファイルを削除
+ConfirmDeleteFile=このファイルを削除してもよろしいですか？
+AllocateCommercial=販売担当者に任命
 Organization=組織
-FiscalYearInformation=Fiscal Year
+FiscalYearInformation=会計年度
 FiscalMonthStart=会計年度の開始月
-SocialNetworksInformation=Social networks
+SocialNetworksInformation=ソーシャルネットワーク
 SocialNetworksFacebookURL=Facebook URL
 SocialNetworksTwitterURL=Twitter URL
 SocialNetworksLinkedinURL=Linkedin URL
 SocialNetworksInstagramURL=Instagram URL
 SocialNetworksYoutubeURL=Youtube URL
 SocialNetworksGithubURL=Github URL
-YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification.
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=List of Vendors
-ListProspectsShort=List of Prospects
-ListCustomersShort=List of Customers
-ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+YouMustAssignUserMailFirst=メール通知を追加する前に、このユーザに対するメール定義を作成すること。
+YouMustCreateContactFirst=メール通知を有効化するには、最初に、有効なメールsが入った連絡先sを取引先に対して定義すること。
+ListSuppliersShort=仕入先の一覧
+ListProspectsShort=見込客の一覧
+ListCustomersShort=顧客の一覧
+ThirdPartiesArea=取引先s/連絡先s
+LastModifiedThirdParties=最新%s 以内に更新された仕入先
+UniqueThirdParties=仕入先sの合計
 InActivity=開く
-ActivityCeased=閉じた
-ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services into %s
-CurrentOutstandingBill=Current outstanding bill
-OutstandingBill=Max. for outstanding bill
-OutstandingBillReached=Max. for outstanding bill reached
-OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+ActivityCeased=閉じる
+ThirdPartyIsClosed=閉鎖した取引先
+ProductsIntoElements=%s に対する製品/サービスの一覧
+CurrentOutstandingBill=現在の未払い勘定
+OutstandingBill=未払い勘定での最大値
+OutstandingBillReached=受領済み未払い勘定での最大値
+OrderMinAmount=注文の最小数量
+MonkeyNumRefModelDesc=顧客コードの場合は%syymm-nnnn、ベンダーコードの場合は%syymm-nnnnの形式の数値を返すよ。ここで、yyは年、mmは月、nnnnは途切れずに連続する数で0に戻らないもの。
 LeopardNumRefModelDesc=顧客/サプライヤーコードは無料です。このコードは、いつでも変更することができます。
-ManagingDirectors=Manager(s) name (CEO, director, president...)
-MergeOriginThirdparty=Duplicate third party (third party you want to delete)
-MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
-ThirdpartiesMergeSuccess=Third parties have been merged
-SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=First name of sales representative
-SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=Customer or Vendor code already used, a new code is suggested
-KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
+ManagingDirectors=管理職(s)名称 (CEO, 部長, 社長...)
+MergeOriginThirdparty=重複する取引先 (削除したい取引先)
+MergeThirdparties=仕入先sを集約
+ConfirmMergeThirdparties=この取引先を現在の取引先に融合したいのね、いいよね？リンクされたすべてのオブジェクト（請求書、注文など...）は現在の取引先に移動され、この取引先には削除されるよ。
+ThirdpartiesMergeSuccess=仕入先sは集約済み
+SaleRepresentativeLogin=販売担当者のログイン
+SaleRepresentativeFirstname=販売担当者の姓名の名
+SaleRepresentativeLastname=販売担当者の姓
+ErrorThirdpartiesMerge=取引先を削除するときにエラーが発生。ログを確認。変更は元に戻したよ。
+NewCustomerSupplierCodeProposed=顧客または仕入先のコードは使用済。新規コードにしてね
+KeepEmptyIfGenericAddress=もし代表住所でよければ、ここは空欄にしておく
 #Imports
-PaymentTypeCustomer=Payment Type - Customer
-PaymentTermsCustomer=Payment Terms - Customer
-PaymentTypeSupplier=Payment Type - Vendor
-PaymentTermsSupplier=Payment Term - Vendor
-PaymentTypeBoth=Payment Type - Customer and Vendor
-MulticurrencyUsed=Use Multicurrency
+PaymentTypeCustomer=支払い方式 - 顧客
+PaymentTermsCustomer=支払い期限 - 顧客
+PaymentTypeSupplier=支払い方式 - 仕入先
+PaymentTermsSupplier=支払い期限 - 仕入先
+PaymentTypeBoth=支払い方式 - 顧客と仕入先
+MulticurrencyUsed=多通貨利用をする
 MulticurrencyCurrency=通貨
+InEEC=欧州 (EEC)
+RestOfEurope=その他欧州 (EEC)
+OutOfEurope=欧州域外 (EEC)
+CurrentOutstandingBillLate=現在の遅延中未払い勘定
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=製品の価格設定によっては、POSに製品を追加する前に取引先を変更する必要があることに注意。
diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang
index 26766947802..2714ed31df3 100644
--- a/htdocs/langs/ja_JP/compta.lang
+++ b/htdocs/langs/ja_JP/compta.lang
@@ -1,267 +1,270 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Billing | Payment
-TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
-TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
-OptionMode=会計士のためのオプション
-OptionModeTrue=オプションの入出力
-OptionModeVirtual=オプションクレジット、借方
-OptionModeTrueDesc=この文脈では、売上高は、支払（支払日）に渡って計算される。数字の\\ nこの妥当性は、簿記の請求書を経由してアカウントの入力/出力によって精査されている場合にのみ保証されます。
-OptionModeVirtualDesc=この文脈では、売上高は、請求書（検証の日）にわたって計算されます。ときにこれらの請求は、それらが支​​払われているか、それらはターンオーバーの出力にリストされているかどうか、によるものである。
-FeatureIsSupportedInInOutModeOnly=（会計モジュールの設定を参照してください）​​クレジット、債務の会計モードでのみ使用可能な機能
-VATReportBuildWithOptionDefinedInModule=ここに示されている金額は税モジュールの設定によって定義されたルールを使用して計算されます。
-LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
-Param=セットアップ
-RemainingAmountPayment=Amount payment remaining:
-Account=アカウント
-Accountparent=Parent account
-Accountsparent=Parent accounts
+MenuFinancial=請求|支払
+TaxModuleSetupToModifyRules=<a href="%s"> Taxesモジュール設定</a>に移動して、計算のルールを変更する
+TaxModuleSetupToModifyRulesLT=<a href="%s">法人設定</a>に移動して、計算のルールを変更する
+OptionMode=会計のためのオプション
+OptionModeTrue=オプション 収益・費用
+OptionModeVirtual=オプション 債権・債務
+OptionModeTrueDesc=この文脈では、売上高は、支払（支払日）に渡って計算される。この数値の妥当性は、簿記の記帳が請求書を経由して勘定科目に 入/出 していると精査されている場合にのみ保証される。
+OptionModeVirtualDesc=この文脈では、売上高は、請求書（検証日）に渡って計算される。これらの請求書が期日になると、支払いが済んでいるかどうかに関わらず、売上高の出力に記載される。
+FeatureIsSupportedInInOutModeOnly=​​債権・債務の会計モードでのみ使用可能な機能（会計モジュール設定を参照すること）
+VATReportBuildWithOptionDefinedInModule=ここに示されている金額は税モジュール設定によって定義されたルールを使用して計算される。
+LTReportBuildWithOptionDefinedInModule=ここに表示されている金額は、法人の設定で定義されたルールを使用して計算されている。
+Param=設定
+RemainingAmountPayment=残り支払額：
+Account=科目
+Accountparent=親科目
+Accountsparent=親科目
 Income=収入
 Outcome=費用
 MenuReportInOut=収益/費用
-ReportInOut=Balance of income and expenses
-ReportTurnover=Turnover invoiced
-ReportTurnoverCollected=Turnover collected
+ReportInOut=収支差額
+ReportTurnover=請求済売上高
+ReportTurnoverCollected=回収済売上高
 PaymentsNotLinkedToInvoice=任意の請求書にリンクされていない支払は、その第三者にリンクされていない
-PaymentsNotLinkedToUser=すべてのユーザーにリンクされていない支払い
+PaymentsNotLinkedToUser=すべてのユーザーにリンクされていない支払
 Profit=利益
-AccountingResult=Accounting result
-BalanceBefore=Balance (before)
-Balance=バランス
+AccountingResult=会計結果
+BalanceBefore=残高（前）
+Balance=残高
 Debit=借方
-Credit=クレジット
-Piece=Accounting Doc.
-AmountHTVATRealReceived=ネットが収集した
-AmountHTVATRealPaid=ネットが支払われ
-VATToPay=Tax sales
-VATReceived=Tax received
-VATToCollect=Tax purchases
-VATSummary=Tax monthly
-VATBalance=Tax Balance
-VATPaid=Tax paid
-LT1Summary=Tax 2 summary
-LT2Summary=Tax 3 summary
-LT1SummaryES=RE Balance
-LT2SummaryES=IRPFバランス
-LT1SummaryIN=CGST Balance
-LT2SummaryIN=SGST Balance
-LT1Paid=Tax 2 paid
-LT2Paid=Tax 3 paid
-LT1PaidES=RE Paid
+Credit=貸方
+Piece=会計ドキュメント
+AmountHTVATRealReceived=純回収額
+AmountHTVATRealPaid=純支払額
+VATToPay=税の売上高
+VATReceived=受け取った税金
+VATToCollect=税金の購入
+VATSummary=毎月の税金
+VATBalance=税収支
+VATPaid=納税
+LT1Summary=税2の概要
+LT2Summary=税3の概要
+LT1SummaryES=RE残高
+LT2SummaryES=IRPF残高
+LT1SummaryIN=CGST残高
+LT2SummaryIN=SGST残高
+LT1Paid=納税2
+LT2Paid=納税3
+LT1PaidES=RE有料
 LT2PaidES=IRPF有料
-LT1PaidIN=CGST Paid
-LT2PaidIN=SGST Paid
-LT1Customer=Tax 2 sales
-LT1Supplier=Tax 2 purchases
-LT1CustomerES=RE sales
-LT1SupplierES=RE purchases
-LT1CustomerIN=CGST sales
-LT1SupplierIN=CGST purchases
-LT2Customer=Tax 3 sales
-LT2Supplier=Tax 3 purchases
+LT1PaidIN=CGST有料
+LT2PaidIN=SGST有料
+LT1Customer=税2売上高
+LT1Supplier=税金2の購入
+LT1CustomerES=RE販売
+LT1SupplierES=RE購入
+LT1CustomerIN=CGST販売
+LT1SupplierIN=CGST購入
+LT2Customer=税3売上高
+LT2Supplier=税金3の購入
 LT2CustomerES=IRPF販売
 LT2SupplierES=IRPF購入
-LT2CustomerIN=SGST sales
-LT2SupplierIN=SGST purchases
+LT2CustomerIN=SGST販売
+LT2SupplierIN=SGSTの購入
 VATCollected=付加価値税回収した
-StatusToPay=支払いに
-SpecialExpensesArea=Area for all special payments
-SocialContribution=Social or fiscal tax
-SocialContributions=Social or fiscal taxes
-SocialContributionsDeductibles=Deductible social or fiscal taxes
-SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
-DateOfSocialContribution=Date of social or fiscal tax
-LabelContrib=Label contribution
-TypeContrib=Type contribution
-MenuSpecialExpenses=Special expenses
+StatusToPay=支払に
+SpecialExpensesArea=すべての特別支払のエリア
+SocialContribution=社会税または財政税
+SocialContributions=社会税または財政税
+SocialContributionsDeductibles=控除可能な社会税または財政税
+SocialContributionsNondeductibles=控除対象外の社会税または財政税
+DateOfSocialContribution=社会税または財政税の日付
+LabelContrib=ラベルの貢献
+TypeContrib=種別の貢献
+MenuSpecialExpenses=特別経費
 MenuTaxAndDividends=税金と配当金
-MenuSocialContributions=Social/fiscal taxes
-MenuNewSocialContribution=New social/fiscal tax
-NewSocialContribution=New social/fiscal tax
-AddSocialContribution=Add social/fiscal tax
-ContributionsToPay=Social/fiscal taxes to pay
-AccountancyTreasuryArea=Billing and payment area
-NewPayment=新しいお支払い
-PaymentCustomerInvoice=顧客の請求書の支払い
-PaymentSupplierInvoice=vendor invoice payment
-PaymentSocialContribution=Social/fiscal tax payment
-PaymentVat=付加価値税の支払い
-ListPayment=支払いのリスト
-ListOfCustomerPayments=顧客の支払のリスト
-ListOfSupplierPayments=List of vendor payments
-DateStartPeriod=Date start period
-DateEndPeriod=Date end period
-newLT1Payment=New tax 2 payment
-newLT2Payment=New tax 3 payment
-LT1Payment=Tax 2 payment
-LT1Payments=Tax 2 payments
-LT2Payment=Tax 3 payment
-LT2Payments=Tax 3 payments
-newLT1PaymentES=New RE payment
-newLT2PaymentES=新しいIRPF支払い
-LT1PaymentES=RE Payment
-LT1PaymentsES=RE Payments
-LT2PaymentES=IRPF支払い
-LT2PaymentsES=IRPF支払い
-VATPayment=Sales tax payment
-VATPayments=Sales tax payments
-VATRefund=Sales tax refund
-NewVATPayment=New sales tax payment
-NewLocalTaxPayment=New tax %s payment
-Refund=Refund
-SocialContributionsPayments=Social/fiscal taxes payments
-ShowVatPayment=付加価値税の支払いを表示する
-TotalToPay=支払いに合計
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
-CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Vendor accounting code
-CustomerAccountancyCodeShort=Cust. account. code
-SupplierAccountancyCodeShort=Sup. account. code
+MenuSocialContributions=社会/財政税
+MenuNewSocialContribution=新規社会/財政税
+NewSocialContribution=新規社会/財政税
+AddSocialContribution=社会税/財政税を追加する
+ContributionsToPay=支払うべき社会/財政税
+AccountancyTreasuryArea=請求および支払エリア
+NewPayment=新規お支払
+PaymentCustomerInvoice=顧客の請求書支払
+PaymentSupplierInvoice=ベンダーの請求書支払
+PaymentSocialContribution=社会/財政税支払
+PaymentVat=付加価値税支払
+ListPayment=支払のリスト
+ListOfCustomerPayments=顧客支払のリスト
+ListOfSupplierPayments=ベンダー支払のリスト
+DateStartPeriod=開始日
+DateEndPeriod=終了日
+newLT1Payment=新規税金2支払
+newLT2Payment=新規税金3支払
+LT1Payment=税金2支払
+LT1Payments=税金2支払
+LT2Payment=税金3支払
+LT2Payments=税金3回支払
+newLT1PaymentES=新規RE支払
+newLT2PaymentES=新規IRPF支払
+LT1PaymentES=RE支払
+LT1PaymentsES=RE支払
+LT2PaymentES=IRPF支払
+LT2PaymentsES=IRPF支払
+VATPayment=消費税支払
+VATPayments=消費税支払
+VATRefund=消費税還付
+NewVATPayment=新規消費税支払
+NewLocalTaxPayment=新規税金%s支払
+Refund=払戻
+SocialContributionsPayments=社会/財政税支払
+ShowVatPayment=付加価値税支払を表示する
+TotalToPay=支払に合計
+BalanceVisibilityDependsOnSortAndFilters=このリストに残高が表示されるのは、テーブルが%sで昇順で並べ替えられ、1つの銀行口座でフィルタリングされている場合のみ。
+CustomerAccountancyCode=顧客会計コード
+SupplierAccountancyCode=ベンダー会計コード
+CustomerAccountancyCodeShort=カスト。アカウント。コード
+SupplierAccountancyCodeShort=Sup。アカウント。コード
 AccountNumber=口座番号
-NewAccountingAccount=新しいアカウント
-Turnover=Turnover invoiced
-TurnoverCollected=Turnover collected
-SalesTurnoverMinimum=Minimum turnover
-ByExpenseIncome=By expenses & incomes
+NewAccountingAccount=新規科目
+Turnover=請求済売上高
+TurnoverCollected=回収済売上高
+SalesTurnoverMinimum=最小売上高
+ByExpenseIncome=費用と収入別
 ByThirdParties=富栄第三者
 ByUserAuthorOfInvoice=請求書著者
-CheckReceipt=入金を確認してください
-CheckReceiptShort=入金を確認してください
-LastCheckReceiptShort=Latest %s check receipts
-NewCheckReceipt=新しい割引
-NewCheckDeposit=新しいチェック預金
-NewCheckDepositOn=%s：アカウント上で預金の領収書を作成する
-NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=受付の日付を確認してください
-NbOfCheques=No. of checks
-PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
-DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
-ExportDataset_tax_1=Social and fiscal taxes and payments
-CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
-CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
-CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
-CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
-CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
-CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
-CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
-CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
-CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
-CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
-AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
-AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
-AnnualByCompanies=Balance of income and expenses, by predefined groups of account
-AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
-AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
-RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
-RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
-RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
-RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
-RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
-RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
-RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
-SeePageForSetup=See menu <a href="%s">%s</a> for setup
-DepositsAreNotIncluded=- Down payment invoices are not included
-DepositsAreIncluded=- Down payment invoices are included
-LT1ReportByCustomers=Report tax 2 by third party
-LT2ReportByCustomers=Report tax 3 by third party
-LT1ReportByCustomersES=Report by third party RE
+CheckReceipt=入金を確認すること
+CheckReceiptShort=入金を確認すること
+LastCheckReceiptShort=最新の%s小切手領収書
+NewCheckReceipt=新規割引
+NewCheckDeposit=新規チェック預金
+NewCheckDepositOn=%s：科目上で預金の領収書を作成する
+NoWaitingChecks=入金待ちの小切手はない。
+DateChequeReceived=受付の日付を確認すること
+NbOfCheques=小切手の数
+PaySocialContribution=社会税/財政税を支払う
+ConfirmPaySocialContribution=この社会税または財政税を支払済みとして分類してもよいか？
+DeleteSocialContribution=社会税または財政税支払を削除する
+ConfirmDeleteSocialContribution=この社会的/財政的納税を削除してもよいか？
+ExportDataset_tax_1=社会的および財政的な税金と支払
+CalcModeVATDebt=コミットメントアカウンティングのモード<b>%sVAT%s</b>。
+CalcModeVATEngagement=収入のモード<b>%sVAT-expenses%s</b>。
+CalcModeDebt=元帳にまだ計上されていない場合でも、既知の記録された請求書の分析。
+CalcModeEngagement=元帳にまだ計上されていない場合でも、既知の記録された支払の分析。
+CalcModeBookkeeping=簿記元帳テーブルにジャーナル化されたデータの分析。
+CalcModeLT1= 顧客の請求書のモード<b>%sRE-サプライヤーの請求書s%s</b>
+CalcModeLT1Debt=顧客の請求書のモード<b>%sREs%s </b>
+CalcModeLT1Rec= サプライヤ請求書のモード<b>%sREs%s </b>
+CalcModeLT2= 顧客の請求書のモード<b>%sIRPF-サプライヤーの請求書s%s</b>
+CalcModeLT2Debt=顧客の請求書のモード<b>%sIRPFs%s </b>
+CalcModeLT2Rec= サプライヤのモード<b>%sIRPF請求書s%s</b>
+AnnualSummaryDueDebtMode=収支差額、年次要約
+AnnualSummaryInputOutputMode=収支差額、年次要約
+AnnualByCompanies=事前定義されたアカウントグループによる収支差額
+AnnualByCompaniesDueDebtMode=収支差額、事前定義されたグループによる詳細、モード<b> %sClaims-Debts%s</b>は<b>コミットメント会計</b>と言える。
+AnnualByCompaniesInputOutputMode=収支差額、事前定義されたグループによる詳細、モード<b>%sIncomes-Expenses%s</b>は<b>現金会計</b>と言える。
+SeeReportInInputOutputMode=元帳にまだ計上されていない場合でも、実際に行われた支払の計算については、%s支払の分析%sを参照すること。
+SeeReportInDueDebtMode=既知の記録された請求書に基づく計算については、元帳にまだ計上されていない場合でも、請求書の%sanalysiss%sを参照すること。
+SeeReportInBookkeepingMode=<b>簿記元帳テーブル</b>の計算については、<b> %sBookeeping report%s</b>を参照すること。
+RulesAmountWithTaxIncluded=-表示されている金額はすべての税金が含まれている
+RulesResultDue=-未払いの請求書、経費、VAT、支払の有無にかかわらず寄付が含まれる。給与も含まれている。 <br>-請求書の請求日と、経費または税金支払期日に基づいている。給与モジュールで定義された給与の場合、支払の起算日が使用される。
+RulesResultInOut=-これには、請求書、経費、VAT、および給与に対して行われた実際支払が含まれる。 <br>-請求書、経費、VAT、給与支払日に基づいている。寄付の寄付日。
+RulesCADue=-支払の有無にかかわらず、顧客の期日請求書が含まれる。 <br>-これらの請求書の請求日に基づいている。 <br>
+RulesCAIn=-これには、顧客から受け取った請求書のすべての有効な支払が含まれる。 <br>-これらの請求書支払日に基づいている<br>
+RulesCATotalSaleJournal=これには、販売仕訳帳のすべての貸方行が含まれる。
+RulesAmountOnInOutBookkeepingRecord=これには、グループ「EXPENSE」または「INCOME」を持つ会計勘定を持つ元帳のレコードが含まれる
+RulesResultBookkeepingPredefined=これには、グループ「EXPENSE」または「INCOME」を持つ会計勘定を持つ元帳のレコードが含まれる
+RulesResultBookkeepingPersonalized=パーソナライズされたグループ</b>によってグループ化された会計アカウント<b>を使用して元帳にレコードが表示される
+SeePageForSetup=セットアップについては、メニュー<a href="%s"> %s</a>を参照すること。
+DepositsAreNotIncluded=-頭金の請求書は含まれていない
+DepositsAreIncluded=-頭金の請求書が含まれている
+LT1ReportByMonth=月ごとの税2レポート
+LT2ReportByMonth=月ごとの税3レポート
+LT1ReportByCustomers=第三者による税2の報告
+LT2ReportByCustomers=第三者による税3の報告
+LT1ReportByCustomersES=サードパーティREによるレポート
 LT2ReportByCustomersES=第三者IRPFによる報告
-VATReport=Sale tax report
-VATReportByPeriods=Sale tax report by period
-VATReportByRates=Sale tax report by rates
-VATReportByThirdParties=Sale tax report by third parties
-VATReportByCustomers=Sale tax report by customer
-VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
-VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
-LT1ReportByQuarters=Report tax 2 by rate
-LT2ReportByQuarters=Report tax 3 by rate
-LT1ReportByQuartersES=Report by RE rate
-LT2ReportByQuartersES=Report by IRPF rate
-SeeVATReportInInputOutputMode=標準的な計算のためのレポート<b>%sVATのencasement%sを</b>参照<b>して</b>ください。
-SeeVATReportInDueDebtMode=フローのオプションを使用して計算に<b>flow%sの</b>レポート<b>%sVATを</b>参照<b>して</b>ください。
-RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
-RulesVATDueServices=- サービスについては、報告書は、請求書の日付に基づいているため、有料かどうか付加価値税の請求書が含まれています。
-RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
-OptionVatInfoModuleComptabilite=注：材料の資産については、それがより公正に配信した日付を使用する必要があります。
-ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
+VATReport=消費税レポート
+VATReportByPeriods=期間別の消費税レポート
+VATReportByMonth=月別の消費税レポート
+VATReportByRates=料金別の消費税レポート
+VATReportByThirdParties=第三者による消費税レポート
+VATReportByCustomers=顧客による消費税レポート
+VATReportByCustomersInInputOutputMode=収集され支払われた顧客によるVATの報告
+VATReportByQuartersInInputOutputMode=徴収され支払われた税金の販売税率による報告
+LT1ReportByQuarters=税率2を報告する
+LT2ReportByQuarters=税率3を報告する
+LT1ReportByQuartersES=RE率によるレポート
+LT2ReportByQuartersES=IRPF率によるレポート
+SeeVATReportInInputOutputMode=標準的な計算については、レポート<b> %sVAT encasement%s</b>を参照すること。
+SeeVATReportInDueDebtMode=フローのオプションを使用した計算については、レポート <b>%sVAT on flow%s</b> を参照すること。
+RulesVATInServices=-サービスの場合、レポートには、支払日に基づいて実際に受領または発行されたVAT規制が含まれる。
+RulesVATInProducts=-重要な資産の場合、レポートには、支払日に基づいて受領または発行されたVATが含まれる。
+RulesVATDueServices=- サービスについては、報告書は、請求書の日付に基づいているため、有料かどうか付加価値税の請求書が含まれている。
+RulesVATDueProducts=-重要な資産の場合、レポートには、請求日に基づいたVAT請求書が含まれる。
+OptionVatInfoModuleComptabilite=注：材料の資産については、それがより公正に配信した日付を使用する必要がある。
+ThisIsAnEstimatedValue=これは、最終元帳テーブルではなくビジネスイベントに基づくプレビューであるため、最終結果はこのプレビュー値とは異なる場合がある。
 PercentOfInvoice=%%/請求書
-NotUsedForGoods=財では使用しません
+NotUsedForGoods=財では使用しない
 ProposalStats=提案に関する統計
 OrderStats=注文に関する統計
 InvoiceStats=手形に関する統計
 Dispatch=ディスパッチ
-Dispatched=に送出されます
+Dispatched=に送出される
 ToDispatch=ディスパッチへ
-ThirdPartyMustBeEditAsCustomer=第三者が顧客として定義する必要があります。
-SellsJournal=セールスジャーナル
-PurchasesJournal=購入ジャーナル
-DescSellsJournal=セールスジャーナル
-DescPurchasesJournal=購入ジャーナル
+ThirdPartyMustBeEditAsCustomer=第三者が顧客として定義する必要がある。
+SellsJournal=セールス仕訳帳
+PurchasesJournal=購入仕訳帳
+DescSellsJournal=セールス仕訳帳
+DescPurchasesJournal=購入仕訳帳
 CodeNotDef=定義されていない
-WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
-DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
-Pcg_version=Chart of accounts models
-Pcg_type=Pcg type
-Pcg_subtype=Pcg subtype
-InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=By product and service
-RefExt=External ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
-LinkedOrder=Link to order
-Mode1=Method 1
-Mode2=Method 2
-CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
-CalculationRuleDescSupplier=According to vendor, choose appropriate method to apply same calculation rule and get same result expected by your vendor.
-TurnoverPerProductInCommitmentAccountingNotRelevant=The report of Turnover collected per product is not available. This report is only available for turnover invoiced.
-TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The report of Turnover collected per sale tax rate is not available. This report is only available for turnover invoiced.
-CalculationMode=Calculation mode
-AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
-ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accounting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
-ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
-ConfirmCloneTax=Confirm the clone of a social/fiscal tax
-CloneTaxForNextMonth=Clone it for next month
-SimpleReport=Simple report
-AddExtraReport=Extra reports (add foreign and national customer report)
-OtherCountriesCustomersReport=Foreign customers report
-BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
-SameCountryCustomersWithVAT=National customers report
-BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
-LinkedFichinter=Link to an intervention
-ImportDataset_tax_contrib=Social/fiscal taxes
-ImportDataset_tax_vat=Vat payments
-ErrorBankAccountNotFound=Error: Bank account not found
-FiscalPeriod=Accounting period
-ListSocialContributionAssociatedProject=List of social contributions associated with the project
-DeleteFromCat=Remove from accounting group
-AccountingAffectation=Accounting assignment
-LastDayTaxIsRelatedTo=Last day of period the tax is related to
-VATDue=Sale tax claimed
-ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
-ByVatRate=By sale tax rate
-TurnoverbyVatrate=Turnover invoiced by sale tax rate
-TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
-PurchasebyVatrate=Purchase by sale tax rate
-LabelToShow=Short label
-PurchaseTurnover=Purchase turnover
-PurchaseTurnoverCollected=Purchase turnover collected
-RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
-RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
-RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
-ReportPurchaseTurnover=Purchase turnover invoiced
-ReportPurchaseTurnoverCollected=Purchase turnover collected
-IncludeVarpaysInResults = Include various payments in reports
-IncludeLoansInResults = Include loans in reports
+WarningDepositsNotIncluded=頭金請求書は、この会計モジュールのこのバージョンには含まれていない。
+DatePaymentTermCantBeLowerThanObjectDate=支払期間の日付は、対象の日付より低くすることはできない。
+Pcg_version=勘定科目表モデル
+Pcg_type=Pcg種別
+Pcg_subtype=Pcgサブ種別
+InvoiceLinesToDispatch=発送する請求書明細
+ByProductsAndServices=製品およびサービス別
+RefExt=外部参照
+ToCreateAPredefinedInvoice=テンプ率請求書を作成するには、標準の請求書を作成し、それを検証せずに、ボタン「%s」をクリックする。
+LinkedOrder=注文へのリンク
+Mode1=方法1
+Mode2=方法2
+CalculationRuleDesc=合計VATを計算するには、次の2つの方法がある。<br>方法1は、各行のバットを丸めてから合計。 <br>方法2は、各行のすべてのバットを合計してから、結果を丸める。 <br>最終結果は数円異なる場合がある。デフォルトのモードは <b> %s</b> モード。
+CalculationRuleDescSupplier=ベンダーによると、適切な方法を選択して同じ計算ルールを適用し、ベンダーが期待する同じ結果を取得する。
+TurnoverPerProductInCommitmentAccountingNotRelevant=製品ごとに回収済売上高のレポートは利用できない。このレポートは、請求済売上高に対してのみ使用できる。
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=売却税率ごとに回収済売上高のレポートは利用できない。このレポートは、請求済売上高に対してのみ使用できる。
+CalculationMode=計算モード
+AccountancyJournal=会計コードジャーナル
+ACCOUNTING_VAT_SOLD_ACCOUNT=販売時のVATのデフォルトの会計アカウント（VATディクショナリの設定で定義されていない場合に使用）
+ACCOUNTING_VAT_BUY_ACCOUNT=購入時のVATのデフォルトの会計アカウント（VATディクショナリ設定で定義されていない場合に使用）
+ACCOUNTING_VAT_PAY_ACCOUNT=VATを支払うためのデフォルトの会計アカウント
+ACCOUNTING_ACCOUNT_CUSTOMER=顧客の第三者に使用される会計アカウント
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=サードパーティカードで定義された専用の会計アカウントは、補助元帳の会計にのみ使用される。これは総勘定元帳に使用され、サードパーティの専用顧客会計勘定が定義されていない場合は補助元帳会計のデフォルト値として使用される。
+ACCOUNTING_ACCOUNT_SUPPLIER=ベンダーのサードパーティに使用される会計アカウント
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=サードパーティカードで定義された専用の会計アカウントは、補助元帳の会計にのみ使用される。これは総勘定元帳に使用され、サードパーティの専用仕入先会計勘定が定義されていない場合は補助元帳会計のデフォルト値として使用される。
+ConfirmCloneTax=社会税/財政税のクローンを確認する
+CloneTaxForNextMonth=来月のためにそれをクローンする
+SimpleReport=簡単なレポート
+AddExtraReport=追加レポート（海外および国内の顧客レポートを追加）
+OtherCountriesCustomersReport=外国の顧客の報告
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=自法人の国コードとは異なるVAT番号の最初の2文字に基づく
+SameCountryCustomersWithVAT=全国の顧客レポート
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=VAT番号の最初の2文字が、自法人の国コードと同じであることに基づく
+LinkedFichinter=介入へのリンク
+ImportDataset_tax_contrib=社会/財政税
+ImportDataset_tax_vat=付加価値税支払
+ErrorBankAccountNotFound=エラー：銀行口座が見つからない
+FiscalPeriod=会計期間
+ListSocialContributionAssociatedProject=プロジェクトに関連する社会貢献のリスト
+DeleteFromCat=アカウンティンググループから削除する
+AccountingAffectation=会計の割り当て
+LastDayTaxIsRelatedTo=期間の最終日税は関連している
+VATDue=消費税が請求されました
+ClaimedForThisPeriod=期間中請求
+PaidDuringThisPeriod=この期間中に支払われた
+ByVatRate=売却税率
+TurnoverbyVatrate=売上税率での請求済売上高
+TurnoverCollectedbyVatrate=売上税率での回収済売上高
+PurchasebyVatrate=売却税率による購入
+LabelToShow=短縮ラベル
+PurchaseTurnover=購入売上高
+PurchaseTurnoverCollected=回収済購入取引高
+RulesPurchaseTurnoverDue=-支払の有無にかかわらず、サプライヤーの期日請求書が含まれる。 <br>-これらの請求書の請求日に基づいている。 <br>
+RulesPurchaseTurnoverIn=-これには、サプライヤーに対して行われた請求書のすべての有効な支払が含まれる。 <br>-これらの請求書支払日に基づいている<br>
+RulesPurchaseTurnoverTotalPurchaseJournal=これには、購入仕訳帳からのすべての借方明細が含まれる。
+ReportPurchaseTurnover=請求済購入取引高
+ReportPurchaseTurnoverCollected=回収済購入取引高
+IncludeVarpaysInResults = レポートにさまざまな支払を含める
+IncludeLoansInResults = レポートにローンを含める
diff --git a/htdocs/langs/ja_JP/contracts.lang b/htdocs/langs/ja_JP/contracts.lang
index faa4060b427..c20e279a29d 100644
--- a/htdocs/langs/ja_JP/contracts.lang
+++ b/htdocs/langs/ja_JP/contracts.lang
@@ -1,104 +1,104 @@
 # Dolibarr language file - Source file is en_US - contracts
-ContractsArea=契約面積
-ListOfContracts=契約のリスト
+ContractsArea=契約エリア
+ListOfContracts=契約リスト
 AllContracts=すべての契約
-ContractCard=契約のカード
-ContractStatusNotRunning=実行しない
-ContractStatusDraft=ドラフト
+ContractCard=契約カード
+ContractStatusNotRunning=非実行中
+ContractStatusDraft=下書き
 ContractStatusValidated=検証
 ContractStatusClosed=閉じた
-ServiceStatusInitial=実行していない
-ServiceStatusRunning=ランニング
-ServiceStatusNotLate=実行すると、有効期限が切れていない
-ServiceStatusNotLateShort=有効期限が切れていない
-ServiceStatusLate=実行すると、期限切れの
-ServiceStatusLateShort=期限切れの
+ServiceStatusInitial=非実行中
+ServiceStatusRunning=実行中
+ServiceStatusNotLate=実行中、未失効
+ServiceStatusNotLateShort=未失効
+ServiceStatusLate=実行中、失効済
+ServiceStatusLateShort=失効済の
 ServiceStatusClosed=閉じ
-ShowContractOfService=Show contract of service
+ShowContractOfService=サービス契約を表示する
 Contracts=契約
-ContractsSubscriptions=Contracts/Subscriptions
-ContractsAndLine=Contracts and line of contracts
+ContractsSubscriptions=契約/サブスクリプション
+ContractsAndLine=契約と契約行
 Contract=契約
-ContractLine=Contract line
-Closing=Closing
-NoContracts=いいえ契約なし
+ContractLine=契約行
+Closing=閉鎖
+NoContracts=無契約
 MenuServices=サービス
-MenuInactiveServices=アクティブでないサービス
-MenuRunningServices=実行中のサービス
-MenuExpiredServices=期限切れのサービス
+MenuInactiveServices=非アクティブサービス
+MenuRunningServices=実行中サービス
+MenuExpiredServices=失効済サービス
 MenuClosedServices=閉じたサービス
 NewContract=新規契約
-NewContractSubscription=New contract or subscription
-AddContract=Create contract
+NewContractSubscription=新規契約またはサブスクリプション
+AddContract=契約を作成する
 DeleteAContract=契約を削除する
-ActivateAllOnContract=Activate all services
-CloseAContract=契約を閉じます
-ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services?
-ConfirmValidateContract=Are you sure you want to validate this contract under name <b>%s</b>?
-ConfirmActivateAllOnContract=This will open all services (not yet active). Are you sure you want to open all services?
-ConfirmCloseContract=This will close all services (active or not). Are you sure you want to close this contract?
-ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b>?
+ActivateAllOnContract=すべてのサービスをアクティブ化する
+CloseAContract=契約を閉じる
+ConfirmDeleteAContract=こ契約とそのすべてのサービスを削除してもよいか？
+ConfirmValidateContract=こ契約を<b>%s </b>という名前で検証してもよいか？
+ConfirmActivateAllOnContract=これにより、すべてのサービスが開く（まだアクティブではない）。すべてのサービスを開始してもよいか？
+ConfirmCloseContract=これにより、すべてのサービスが閉じられる（アクティブでもなくても）。こ契約を終了してもよいか？
+ConfirmCloseService=日付<b>%s </b>でこのサービスを終了してもよいか？
 ValidateAContract=契約を検証
-ActivateService=サービスをアクティブに
-ConfirmActivateService=Are you sure you want to activate this service with date <b>%s</b>?
-RefContract=Contract reference
+ActivateService=サービスをアクティブ化
+ConfirmActivateService=日付<b>%s </b>でこのサービスをアクティブ化してもよいか？
+RefContract=契約リファレンス
 DateContract=契約日
 DateServiceActivate=サービスのアクティブ化の日付
-ListOfServices=サービスのリスト
-ListOfInactiveServices=アクティブでないサービスのリスト
-ListOfExpiredServices=期限切れのアクティブなサービスのリスト
-ListOfClosedServices=クローズドサービスのリスト
-ListOfRunningServices=実行中のサービスのリスト
-NotActivatedServices=非アクティブなサービス（検証済みの契約の中で）
-BoardNotActivatedServices=検証済みの契約の中でアクティブにするサービス
-BoardNotActivatedServicesShort=Services to activate
-LastContracts=Latest %s contracts
-LastModifiedServices=Latest %s modified services
+ListOfServices=サービスリスト
+ListOfInactiveServices=非アクティブサービスリスト
+ListOfExpiredServices=失効済アクティブサービスリスト
+ListOfClosedServices=クローズドサービスリスト
+ListOfRunningServices=実行中サービスリスト
+NotActivatedServices=非アクティブなサービス（検証済み契約の中で）
+BoardNotActivatedServices=検証済み契約の中でアクティブにするサービス
+BoardNotActivatedServicesShort=アクティベートするサービス
+LastContracts=最新の%s契約
+LastModifiedServices=最新の%s変更されたサービス
 ContractStartDate=開始日
 ContractEndDate=終了日
 DateStartPlanned=計画開始日
 DateStartPlannedShort=計画開始日
 DateEndPlanned=計画終了日
-DateEndPlannedShort=計画された終了日
+DateEndPlannedShort=計画終了日
 DateStartReal=実際の開始日
 DateStartRealShort=実際の開始日
 DateEndReal=実際の終了日
 DateEndRealShort=実際の終了日
-CloseService=サービスを閉じます
-BoardRunningServices=Services running
-BoardRunningServicesShort=Services running
-BoardExpiredServices=Services expired
-BoardExpiredServicesShort=Services expired
+CloseService=サービスを閉じる
+BoardRunningServices=実行中サービス
+BoardRunningServicesShort=実行中サービス
+BoardExpiredServices=失効済サービス
+BoardExpiredServicesShort=失効済サービス
 ServiceStatus=サービスのステータス
-DraftContracts=ドラフト契約
-CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
-ActivateAllContracts=Activate all contract lines
-CloseAllContracts=すべての契約回線を閉じる
-DeleteContractLine=契約の行を削除します
-ConfirmDeleteContractLine=Are you sure you want to delete this contract line?
-MoveToAnotherContract=別の契約にサービスを移動します。
-ConfirmMoveToAnotherContract=私は、新しいターゲットの契約を選びましたし、私はこの契約には、このサービスを移動することを確認します。
-ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to?
+DraftContracts=下書き契約
+CloseRefusedBecauseOneServiceActive=少なくとも1つのオープンサービスがあるため、契約を閉じることはできない
+ActivateAllContracts=すべて契約行をアクティブ化する
+CloseAllContracts=すべて契約回線を閉じる
+DeleteContractLine=契約の行を削除する
+ConfirmDeleteContractLine=こ契約行を削除してもよいか？
+MoveToAnotherContract=別契約にサービスを移動する。
+ConfirmMoveToAnotherContract=私は、新規ターゲット契約を選びましたし、私はこ契約には、このサービスを移動することを確認する。
+ConfirmMoveToAnotherContractQuestion=このサービスを移動する（同じサードパーティの）既存契約を選択するか？
 PaymentRenewContractId=契約回線（番号の%s）を​​更新
 ExpiredSince=有効期限の日付
-NoExpiredServices=アクティブなサービスの期限が切れない
-ListOfServicesToExpireWithDuration=List of Services to expire in %s days
-ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days
-ListOfServicesToExpire=List of Services to expire
-NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
-StandardContractsTemplate=Standard contracts template
-ContactNameAndSignature=For %s, name and signature:
-OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
-ConfirmCloneContract=Are you sure you want to clone the contract <b>%s</b>?
-LowerDateEndPlannedShort=Lower planned end date of active services
-SendContractRef=Contract information __REF__
-OtherContracts=Other contracts
+NoExpiredServices=失効済アクティブサービス無し
+ListOfServicesToExpireWithDuration=%s日で失効済になるサービスリスト
+ListOfServicesToExpireWithDurationNeg=失効済で %s日よりも超過したサービスリスト
+ListOfServicesToExpire=失効するサービスリスト
+NoteListOfYourExpiredServices=こリストには、販売担当者としてリンクされているサードパーティ契約サービスのみが含まれています。
+StandardContractsTemplate=標準契約テンプレート
+ContactNameAndSignature=%sの場合、名前と署名：
+OnlyLinesWithTypeServiceAreUsed=タイプが「サービス」の行のみが複製される。
+ConfirmCloneContract=コントラクト<b>%s </b>のクローンを作成してもよいか？
+LowerDateEndPlannedShort=アクティブなサービスの計画終了日を短縮
+SendContractRef=契約情報__REF__
+OtherContracts=その他契約
 ##### Types de contacts #####
-TypeContact_contrat_internal_SALESREPSIGN=営業担当者の署名の契約
+TypeContact_contrat_internal_SALESREPSIGN=営業担当者の署名契約
 TypeContact_contrat_internal_SALESREPFOLL=営業担当者には、次のアップ契約
 TypeContact_contrat_external_BILLING=課金顧客の連絡先
 TypeContact_contrat_external_CUSTOMER=フォローアップ顧客との接触
 TypeContact_contrat_external_SALESREPSIGN=署名契約の顧客の連絡先
-HideClosedServiceByDefault=Hide closed services by default
-ShowClosedServices=Show Closed Services
-HideClosedServices=Hide Closed Services
+HideClosedServiceByDefault=デフォルトで閉じたサービスを非表示
+ShowClosedServices=クローズドサービスを表示
+HideClosedServices=クローズドサービスを非表示
diff --git a/htdocs/langs/ja_JP/cron.lang b/htdocs/langs/ja_JP/cron.lang
index 86ba20bd260..431b36d9c0d 100644
--- a/htdocs/langs/ja_JP/cron.lang
+++ b/htdocs/langs/ja_JP/cron.lang
@@ -1,83 +1,86 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 # Right
-Permission23101 = Read Scheduled job
-Permission23102 = Create/update Scheduled job
-Permission23103 = Delete Scheduled job
-Permission23104 = Execute Scheduled job
+Permission23101 = スケジュールされたジョブを読む
+Permission23102 = スケジュールされたジョブの作成/更新
+Permission23103 = スケジュールされたジョブを削除する
+Permission23104 = スケジュールされたジョブを実行する
 # Admin
-CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
-KeyForCronAccess=Security key for URL to launch cron jobs
-FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
-CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
-CronMethodDoesNotExists=Class %s does not contains any method %s
-CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
-CronJobProfiles=List of predefined cron job profiles
+CronSetup=スケジュールされたジョブ管理のセットアップ
+URLToLaunchCronJobs=修飾されたcronジョブを確認して起動するためのURL
+OrToLaunchASpecificJob=または、特定のジョブを確認して起動する
+KeyForCronAccess=cronジョブを起動するためのURLのセキュリティキー
+FileToLaunchCronJobs=修飾されたcronジョブをチェックして起動するコマンドライン
+CronExplainHowToRunUnix=Unix環境では、次のcrontabエントリを使用して、5分ごとにコマンドラインを実行する必要がある。
+CronExplainHowToRunWin=Microsoft（tm）Windows環境では、スケジュールされたタスクツールを使用して、5分ごとにコマンドラインを実行できる。
+CronMethodDoesNotExists=クラス%sには、メソッド%sが含まれていない。
+CronMethodNotAllowed=クラス%sのメソッド%sは、禁止されているメソッドのブラックリストに含まれています
+CronJobDefDesc=cronジョブプロファイルは、モジュール記述子ファイルに定義されています。モジュールがアクティブ化されると、それらがロードされて使用可能になるため、管理ツールメニュー%sからジョブを管理できる。
+CronJobProfiles=事前定義されたcronジョブプロファイルのリスト
 # Menu
-EnabledAndDisabled=Enabled and disabled
+EnabledAndDisabled=有効および無効
 # Page list
-CronLastOutput=Latest run output
-CronLastResult=Latest result code
-CronCommand=Command
-CronList=Scheduled jobs
-CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
-CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
-CronTask=Job
+CronLastOutput=最新の実行出力
+CronLastResult=最新の結果コード
+CronCommand=コマンド
+CronList=スケジュールされたジョブ
+CronDelete=スケジュールされたジョブを削除する
+CronConfirmDelete=これらのスケジュールされたジョブを削除してもよいか？
+CronExecute=スケジュールされたジョブを起動する
+CronConfirmExecute=これらのスケジュールされたジョブを今すぐ実行してもよいか？
+CronInfo=スケジュールされたジョブモジュールを使用すると、ジョブをスケジュールして自動的に実行できる。ジョブは手動で開始することもできる。
+CronTask=ジョブ
 CronNone=なし
-CronDtStart=Not before
-CronDtEnd=Not after
-CronDtNextLaunch=Next execution
-CronDtLastLaunch=Start date of latest execution
-CronDtLastResult=End date of latest execution
-CronFrequency=周波数
-CronClass=Class
+CronDtStart=以前ではない
+CronDtEnd=以後ではない
+CronDtNextLaunch=次の実行
+CronDtLastLaunch=最新の実行の開始日
+CronDtLastResult=最新の実行の終了日
+CronFrequency=頻度
+CronClass=クラス
 CronMethod=方法
 CronModule=モジュール
-CronNoJobs=No jobs registered
+CronNoJobs=求人は登録されていない
 CronPriority=優先順位
 CronLabel=ラベル
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
-CronEach=Every
-JobFinished=Job launched and finished
+CronNbRun=起動数
+CronMaxRun=起動の最大数
+CronEach=すべて
+JobFinished=ジョブが起動され、終了した
+Scheduled=予定
 #Page card
-CronAdd= Add jobs
-CronEvery=Execute job each
-CronObject=Instance/Object to create
+CronAdd= ジョブを追加する
+CronEvery=それぞれジョブを実行する
+CronObject=作成するインスタンス/オブジェクト
 CronArgs=パラメータ
-CronSaveSucess=Save successfully
+CronSaveSucess=保存成功
 CronNote=コメント
-CronFieldMandatory=Fields %s is mandatory
-CronErrEndDateStartDt=End date cannot be before start date
-StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronFieldMandatory=フィールド%sは必須 
+CronErrEndDateStartDt=終了日を開始日より前にすることはできない
+StatusAtInstall=モジュールインストール時のステータス
+CronStatusActiveBtn=スケジュール
 CronStatusInactiveBtn=無効にする
-CronTaskInactive=This job is disabled
+CronTaskInactive=このジョブは無効になっている
 CronId=Id
-CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
-CronCommandHelp=The system command line to execute.
-CronCreateJob=Create new Scheduled Job
+CronClassFile=クラスのあるファイル名
+CronModuleHelp=Dolibarrモジュールディレクトリの名前(外部Dolibarrモジュールでも機能する). <BR> たとえば、Dolibarr製品オブジェクト /htdocs/<u>product</u>/class/product.class.php のfetchメソッドを呼び出す場合、 モジュールの値は<br><i>product</i>
+CronClassFileHelp=ロードする相対パスとファイル名 (パスはWebサーバーのルートディレクトリからの相対パス). <BR> たとえば、Dolibarr製品オブジェクト  htdocs/product/class/<u>product.class.php</u> のfetchメソッドを呼び出す場合、クラスファイル名の値は<br><i>product/class/product.class.php</i>
+CronObjectHelp=ロードするオブジェクト名. <BR>たとえば、Dolibarr製品オブジェクト/htdocs/product/class/product.class.phpのfetchメソッドを呼び出す場合、クラスファイル名の値は<br><i>Product</i>
+CronMethodHelp=起動するオブジェクトメソッド. <BR>たとえば、Dolibarr 製品オブジェクト/htdocs/product/class/product.class.phpのfetchメソッドを呼び出す場合、methodの値は<br> <i> fetch</i> 
+CronArgsHelp=メソッドの引数. <BR> たとえば、Dolibarr製品オブジェクト/htdocs/product/class/product.class.phpのfetchメソッドを呼び出す場合、パラメーターの値は<br><i>0, ProductRef</i>を取りうる
+CronCommandHelp=実行するシステムコマンドライン。
+CronCreateJob=新規でスケジュールされたジョブを作成
 CronFrom=から
 # Info
 # Common
-CronType=Job type
-CronType_method=Call method of a PHP Class
-CronType_command=Shell command
-CronCannotLoadClass=Cannot load class file %s (to use class %s)
-CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
-JobDisabled=Job disabled
-MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+CronType=職種
+CronType_method=PHPクラスの呼び出しメソッド
+CronType_command=シェルコマンド
+CronCannotLoadClass=クラスファイル%sをロードできない（クラス%sを使用するため）
+CronCannotLoadObject=クラスファイル%sがロードされたが、オブジェクト%sが見つからなかった
+UseMenuModuleToolsToAddCronJobs=メニュー ”<a href="%s">ホーム - 管理ツール - スケジュールされたジョブ</a>" に移動して、スケジュールされたジョブを表示および編集する。
+JobDisabled=ジョブが無効 
+MakeLocalDatabaseDumpShort=ローカルデータベースのバックアップ
+MakeLocalDatabaseDump=ローカルデータベースダンプを作成する。パラメータは次のもの: 圧縮 ('gz' or 'bz' or 'none')、バックアップ種別 ('mysql', 'pgsql', 'auto')、1、 'auto' またはビルドするファイル名、保持するバックアップファイルの数
+WarningCronDelayed=注意、パフォーマンスの目的で、有効なジョブの次の実行日が何であれ、ジョブは実行される前に最大%s時間まで遅延する可能性がある。
+DATAPOLICYJob=データクリーナとアノニマイザ
diff --git a/htdocs/langs/ja_JP/deliveries.lang b/htdocs/langs/ja_JP/deliveries.lang
index cedeb093554..fd9cbcae01d 100644
--- a/htdocs/langs/ja_JP/deliveries.lang
+++ b/htdocs/langs/ja_JP/deliveries.lang
@@ -1,31 +1,31 @@
 # Dolibarr language file - Source file is en_US - deliveries
-Delivery=配達
-DeliveryRef=Ref Delivery
-DeliveryCard=Receipt card
-DeliveryOrder=Delivery receipt
-DeliveryDate=配達日
-CreateDeliveryOrder=Generate delivery receipt
-DeliveryStateSaved=Delivery state saved
+Delivery=配送
+DeliveryRef=参照配送
+DeliveryCard=受領書カード
+DeliveryOrder=配送領収書
+DeliveryDate=配送日
+CreateDeliveryOrder=配送領収書を生成する
+DeliveryStateSaved=保存された配送状態
 SetDeliveryDate=出荷の日付を設定する
-ValidateDeliveryReceipt=配信の領収書を検証する
-ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt?
-DeleteDeliveryReceipt=配信済みメッセージを削除する
-DeleteDeliveryReceiptConfirm=Are you sure you want to delete delivery receipt <b>%s</b>?
+ValidateDeliveryReceipt=配送の領収書を検証する
+ValidateDeliveryReceiptConfirm=この配送領収書を検証してもよいか？
+DeleteDeliveryReceipt=配送済みメッセージを削除する
+DeleteDeliveryReceiptConfirm=領収書<b>%s </b>を削除してもよいか？
 DeliveryMethod=配送方法
 TrackingNumber=追跡番号
-DeliveryNotValidated=配信検証されません
+DeliveryNotValidated=配送検証されない
 StatusDeliveryCanceled=キャンセル
 StatusDeliveryDraft=ドラフト
-StatusDeliveryValidated=受信された
+StatusDeliveryValidated=受領された
 # merou PDF model
-NameAndSignature=Name and Signature:
-ToAndDate=To___________________________________ ____ / _____ / __________で
-GoodStatusDeclaration=、良好な状態で上記の品物を受け取っている
-Deliverer=Deliverer:
+NameAndSignature=名前と署名：
+ToAndDate=To___________________________________ on ____/_____/__________
+GoodStatusDeclaration=良好な状態で上記の品物を受け取っている。
+Deliverer=配送者：
 Sender=差出人
-Recipient=受信者
-ErrorStockIsNotEnough=There's not enough stock
-Shippable=Shippable
-NonShippable=Not Shippable
-ShowReceiving=Show delivery receipt
-NonExistentOrder=Nonexistent order
+Recipient=受領者
+ErrorStockIsNotEnough=在庫が不足
+Shippable=発送可能
+NonShippable=発送不可
+ShowReceiving=配送領収書を表示する
+NonExistentOrder=存在しない注文
diff --git a/htdocs/langs/ja_JP/donations.lang b/htdocs/langs/ja_JP/donations.lang
index 68a136bd285..6a498695940 100644
--- a/htdocs/langs/ja_JP/donations.lang
+++ b/htdocs/langs/ja_JP/donations.lang
@@ -1,34 +1,34 @@
 # Dolibarr language file - Source file is en_US - donations
 Donation=寄付
 Donations=寄付
-DonationRef=Donation ref.
+DonationRef=寄付参照
 Donor=ドナー
-AddDonation=Create a donation
+AddDonation=寄付を作成する
 NewDonation=新しい寄付
-DeleteADonation=Delete a donation
-ConfirmDeleteADonation=Are you sure you want to delete this donation?
+DeleteADonation=寄付を削除する
+ConfirmDeleteADonation=この寄付を削除してもよいか？
 PublicDonation=義援金
 DonationsArea=寄付のエリア
-DonationStatusPromiseNotValidated=ドラフトの約束
+DonationStatusPromiseNotValidated=下書きの約束
 DonationStatusPromiseValidated=検証約束
 DonationStatusPaid=寄付は、受信した
-DonationStatusPromiseNotValidatedShort=ドラフト
+DonationStatusPromiseNotValidatedShort=下書き
 DonationStatusPromiseValidatedShort=検証
 DonationStatusPaidShort=受信された
-DonationTitle=Donation receipt
-DonationDate=Donation date
+DonationTitle=寄付の領収書
+DonationDate=寄付日
 DonationDatePayment=支払期日
 ValidPromess=約束を検証する
-DonationReceipt=Donation receipt
+DonationReceipt=寄付の領収書
 DonationsModels=寄付金の領収書のドキュメントモデル
-LastModifiedDonations=Latest %s modified donations
-DonationRecipient=Donation recipient
-IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
-MinimumAmount=Minimum amount is  %s
-FreeTextOnDonations=Free text to show in footer
-FrenchOptions=Options for France
-DONATION_ART200=Show article 200 from CGI if you are concerned
-DONATION_ART238=Show article 238 from CGI if you are concerned
-DONATION_ART885=Show article 885 from CGI if you are concerned
-DonationPayment=Donation payment
-DonationValidated=Donation %s validated
+LastModifiedDonations=最新の%s変更された寄付
+DonationRecipient=寄付先
+IConfirmDonationReception=受取人は、寄付として以下の金額の受領を宣言する
+MinimumAmount=最小額は%sです
+FreeTextOnDonations=フッターに表示するフリーテキスト
+FrenchOptions=フランスのオプション
+DONATION_ART200=懸念がある場合は、CGIの記事200を表示すること
+DONATION_ART238=懸念がある場合は、CGIの記事238を表示すること
+DONATION_ART885=懸念がある場合は、CGIの記事885を表示すること
+DonationPayment=寄付金の支払
+DonationValidated=寄付%sが検証された
diff --git a/htdocs/langs/ja_JP/ecm.lang b/htdocs/langs/ja_JP/ecm.lang
index 57b25903459..db8e84a3e50 100644
--- a/htdocs/langs/ja_JP/ecm.lang
+++ b/htdocs/langs/ja_JP/ecm.lang
@@ -1,52 +1,43 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=No. of documents in directory
+ECMNbOfDocs=ディレクトリ内のドキュメントの数
 ECMSection=ディレクトリ
 ECMSectionManual=手動のディレクトリ
 ECMSectionAuto=自動ディレクトリ
 ECMSectionsManual=手動ツリー
 ECMSectionsAuto=自動ツリー
 ECMSections=ディレクトリ
-ECMRoot=ECM Root
-ECMNewSection=新しいディレクトリ
-ECMAddSection=ディレクトリを追加します。
+ECMRoot=ECMルート
+ECMNewSection=新規ディレクトリ
+ECMAddSection=ディレクトリを追加 
 ECMCreationDate=作成日
 ECMNbOfFilesInDir=ディレクトリ内のファイル数
 ECMNbOfSubDir=サブディレクトリの数
-ECMNbOfFilesInSubDir=Number of files in sub-directories
+ECMNbOfFilesInSubDir=サブディレクトリ内のファイルの数
 ECMCreationUser=クリエイター
-ECMArea=DMS/ECM area
-ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
-ECMAreaDesc2=要素のカードからドキュメントを追加するときに*自動ディレクトリは自動的に入力されます。 <br> *マニュアルのディレクトリは、特定の要素にリンクされていないドキュメントを保存するために使用することができます。
-ECMSectionWasRemoved=ディレクトリの<b>%sが</b>削除されています。
-ECMSectionWasCreated=Directory <b>%s</b> has been created.
+ECMArea=DMS / ECMエリア
+ECMAreaDesc=DMS / ECM（ドキュメント管理システム/電子コンテンツ管理）エリアでは、Dolibarr内のあらゆる種類のドキュメントをすばやく保存、共有、検索できる。
+ECMAreaDesc2=要素のカードからドキュメントを追加するときに*自動ディレクトリは自動的に入力される。 <br> *マニュアルのディレクトリは、特定の要素にリンクされていないドキュメントを保存するために使用することができる。
+ECMSectionWasRemoved=ディレクトリの<b>%sが</b>削除されている。
+ECMSectionWasCreated=ディレクトリ<b>%s</b>が作成された。
 ECMSearchByKeywords=キーワードで検索
 ECMSearchByEntity=オブジェクトで検索
 ECMSectionOfDocuments=ドキュメントのディレクトリ
 ECMTypeAuto=自動
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=第三者にリンクされたドキュメント
-ECMDocsByProposals=提案にリンクされたドキュメント
-ECMDocsByOrders=顧客の注文にリンクされたドキュメント
-ECMDocsByContracts=契約にリンクされたドキュメント
-ECMDocsByInvoices=お客様の請求書にリンクされたドキュメント
-ECMDocsByProducts=製品にリンクされたドキュメント
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=%sにリンクされているドキュメント
 ECMNoDirectoryYet=作成されたディレクトリなし
 ShowECMSection=ディレクトリを表示する
-DeleteSection=ディレクトリを削除します。
-ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
+DeleteSection=ディレクトリを削除 
+ConfirmDeleteSection=ディレクトリ<b>%s </b>を削除することを確認できるか？
 ECMDirectoryForFiles=ファイルの相対ディレクトリ
-CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
-CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=一部のファイルまたはサブディレクトリが含まれているため、削除できない
+CannotRemoveDirectoryContainsFiles=一部のファイルが含まれているため、削除できない
 ECMFileManager=ファイルマネージャ
-ECMSelectASection=Select a directory in the tree...
-DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
-ReSyncListOfDir=Resync list of directories
-HashOfFileContent=Hash of file content
-NoDirectoriesFound=No directories found
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ECMSelectASection=ツリーでディレクトリを選択する...
+DirNotSynchronizedSyncFirst=このディレクトリは、ECMモジュールの外部で作成または変更されているようだ。このディレクトリのコンテンツを取得するには、最初に ”再同期” ボタンをクリックしてディスクとデータベースを同期する必要がある。
+ReSyncListOfDir=ディレクトリのリストを再同期する
+HashOfFileContent=ファイルコンテンツのハッシュ
+NoDirectoriesFound=ディレクトリが見つからない
+FileNotYetIndexedInDatabase=ファイルはまだデータベースにインデックス付けされていない（再アップロードしてみること）
+ExtraFieldsEcmFiles=ExtrafieldsEcmファイル
+ExtraFieldsEcmDirectories=ExtrafieldsEcmディレクトリ
+ECMSetup=ECMセットアップ
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index dbe55ff2079..60df8eba840 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -1,272 +1,278 @@
 # Dolibarr language file - Source file is en_US - errors
 
 # No errors
-NoErrorCommitIsDone=No error, we commit
+NoErrorCommitIsDone=エラーなし、コミットする
 # Errors
-ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
+ErrorButCommitIsDone=エラーが見つかったが、これにもかかわらず検証する
+ErrorBadEMail=メール%sが間違っている
+ErrorBadMXDomain=メール%sが間違っているようだ（ドメインに有効なMXレコードがない）
 ErrorBadUrl=URLの%sが間違っている
-ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
-ErrorLoginAlreadyExists=ログイン%sはすでに存在しています。
-ErrorGroupAlreadyExists=グループ%sはすでに存在しています。
-ErrorRecordNotFound=レコードが見つかりませんでした。
-ErrorFailToCopyFile=<b>&quot;%s&quot;</b>にファイル<b>&quot;%s&quot;を</b>コピーに失敗しました。
-ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToRenameFile=<b>&quot;%s&quot;</b>にファイル<b>&quot;%s&quot;を</b>リネームに失敗しました。
-ErrorFailToDeleteFile=ファイル<b>'%s'を</b>削除できませんでした。
-ErrorFailToCreateFile=ファイル<b>'%s'を</b>作成できませんでした。
-ErrorFailToRenameDir=<b>&quot;%s&quot;</b>にディレクトリ<b>&quot;%s&quot;を</b>リネームに失敗しました。
-ErrorFailToCreateDir=ディレクトリ<b>'%s'を</b>作成できませんでした。
-ErrorFailToDeleteDir=ディレクトリ<b>'%s'を</b>削除できませんでした。
-ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
-ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
-ErrorThisContactIsAlreadyDefinedAsThisType=この連絡先は既にこのタイプの連絡先として定義されています。
-ErrorCashAccountAcceptsOnlyCashMoney=この銀行口座は現金勘定であるため、それが唯一のタイプの現金の支払を受け入れます。
-ErrorFromToAccountsMustDiffers=ソースとターゲットの銀行口座は異なっている必要があります。
-ErrorBadThirdPartyName=Bad value for third-party name
-ErrorProdIdIsMandatory=The %s is mandatory
+ErrorBadValueForParamNotAString=パラメータ の値が正しくない。通常、翻訳が欠落している場合に追加される。
+ErrorLoginAlreadyExists=ログイン%sはすでに存在している。
+ErrorGroupAlreadyExists=グループ%sはすでに存在している。
+ErrorRecordNotFound=レコードが見つからなかった。
+ErrorFailToCopyFile=<b>&quot;%s&quot;</b>にファイル<b>&quot;%s&quot;を</b>コピーに失敗した。
+ErrorFailToCopyDir=ディレクトリ '<b> %s</b>'を '<b> %s</b>'にコピーできなかった。
+ErrorFailToRenameFile=<b>&quot;%s&quot;</b>にファイル<b>&quot;%s&quot;を</b>リネームに失敗した。
+ErrorFailToDeleteFile=ファイル<b>'%s'を</b>削除できなかった。
+ErrorFailToCreateFile=ファイル<b>'%s'を</b>作成できなかった。
+ErrorFailToRenameDir=<b>&quot;%s&quot;</b>にディレクトリ<b>&quot;%s&quot;を</b>リネームに失敗した。
+ErrorFailToCreateDir=ディレクトリ<b>'%s'を</b>作成できなかった。
+ErrorFailToDeleteDir=ディレクトリ<b>'%s'を</b>削除できなかった。
+ErrorFailToMakeReplacementInto=ファイル '<b> %s</b>'への置換に失敗した。
+ErrorFailToGenerateFile=ファイル '<b> %s</b>'の生成に失敗した。
+ErrorThisContactIsAlreadyDefinedAsThisType=この連絡先は既にこのタイプの連絡先として定義されている。
+ErrorCashAccountAcceptsOnlyCashMoney=この銀行口座は現金勘定であるため、それが唯一のタイプの現金の支払を受け入れる。
+ErrorFromToAccountsMustDiffers=ソースとターゲットの銀行口座は異なっている必要がある。
+ErrorBadThirdPartyName=サードパーティ名の値が正しくない
+ErrorProdIdIsMandatory=%sは必須だ
 ErrorBadCustomerCodeSyntax=顧客コードの不正な構文
-ErrorBadBarCodeSyntax=Bad syntax for barcode. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
-ErrorCustomerCodeRequired=顧客コードが必要です
-ErrorBarCodeRequired=Barcode required
+ErrorBadBarCodeSyntax=バーコードの構文が正しくない。不正なバーコードタイプを設定したか、スキャンした値と一致しない番号付け用のバーコードマスクを定義した可能性がある。
+ErrorCustomerCodeRequired=顧客コードが必要だ
+ErrorBarCodeRequired=バーコードが必要だ
 ErrorCustomerCodeAlreadyUsed=顧客コードは既に使用され
-ErrorBarCodeAlreadyUsed=Barcode already used
+ErrorBarCodeAlreadyUsed=すでに使用されているバーコード
 ErrorPrefixRequired=接頭辞が必要
-ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
-ErrorSupplierCodeRequired=Vendor code required
-ErrorSupplierCodeAlreadyUsed=Vendor code already used
-ErrorBadParameters=パラメータが不正で
-ErrorWrongParameters=Wrong or missing parameters
-ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
-ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
-ErrorBadDateFormat=値 '%s'に間違った日付の形式になっています
-ErrorWrongDate=Date is not correct!
-ErrorFailedToWriteInDir=ディレクトリ%sの書き込みに失敗しました
+ErrorBadSupplierCodeSyntax=ベンダーコードの構文が正しくない
+ErrorSupplierCodeRequired=ベンダーコードが必要だ
+ErrorSupplierCodeAlreadyUsed=すでに使用されているベンダーコード
+ErrorBadParameters=パラメータ が不正で
+ErrorWrongParameters=パラメータ が間違っているか欠落している
+ErrorBadValueForParameter=パラメータ  "%s" の値 "%s" が間違っている
+ErrorBadImageFormat=画像ファイルはサポートされている形式ではない（PHPはこの形式の画像を変換する関数をサポートしていない）
+ErrorBadDateFormat=値 '%s'に間違った日付の形式になっている
+ErrorWrongDate=日付が正しくない！
+ErrorFailedToWriteInDir=ディレクトリ%sの書き込みに失敗した
 ErrorFoundBadEmailInFile=ファイル内の%s線の発見誤った電子メールのシンタックス（電子メール= %sを使用したサンプルライン%s）
-ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=いくつかの必須フィールドが満たされていませんでした。
-ErrorSubjectIsRequired=The email topic is required
-ErrorFailedToCreateDir=ディレクトリの作成に失敗しました。そのWebサーバのユーザがDolibarrのドキュメントディレクトリに書き込む権限を持って確認してください。パラメータの<b>safe_modeが</b>このPHPが有効になっている場合、Dolibarr PHPファイルは、Webサーバーのユーザー（またはグループ）に所有していることを確認してください。
-ErrorNoMailDefinedForThisUser=このユーザーに定義されたメールはありません
-ErrorFeatureNeedJavascript=この機能が動作するようにアクティブにするjavascriptをする必要があります。セットアップでこれを変更 - 表示されます。
-ErrorTopMenuMustHaveAParentWithId0=タイプは 'top'のメニューが親メニューを持つことはできません。親メニューに0を置くか、または型 &quot;左&quot;のメニューを選択します。
-ErrorLeftMenuMustHaveAParentId=タイプ &quot;左&quot;のメニューは、親IDを持つ必要があります。
-ErrorFileNotFound=ファイルが見つかりませんでし<b>%s（PHP</b> openbasedirまたはセーフモードパラメータによって拒否された不正なパスが、間違ったパーミッションやアクセス）
-ErrorDirNotFound=ディレクトリが見つかりません<b>%s（PHP</b> openbasedirまたはセーフモードパラメータによって拒否された不正なパスが、間違ったパーミッションやアクセス）
-ErrorFunctionNotAvailableInPHP=関数<b>%sは、</b>この機能を使用するために必要となるが、このバージョンの/ PHPのセットアップでは使用できません。
-ErrorDirAlreadyExists=この名前のディレクトリがすでに存在しています。
-ErrorFileAlreadyExists=この名前を持つファイルがすでに存在しています。
-ErrorPartialFile=ファイルはサーバーで完全に受け取っていません。
+ErrorUserCannotBeDelete=ユーザーを削除することはできない。多分それはDolibarrエンティティに関連付けられている。
+ErrorFieldsRequired=いくつかの必須フィールドが満たされていなかった。
+ErrorSubjectIsRequired=メールトピックが必要だ
+ErrorFailedToCreateDir=ディレクトリの作成に失敗した。そのWebサーバのユーザがDolibarrのドキュメントディレクトリに書き込む権限を持って確認すること。パラメータ の<b>safe_modeが</b>このPHPが有効になっている場合、Dolibarr PHPファイルは、Webサーバーのユーザー（またはグループ）に所有していることを確認すること。
+ErrorNoMailDefinedForThisUser=このユーザーに定義されたメールはない
+ErrorFeatureNeedJavascript=この機能が動作するようにアクティブにするjavascriptをする必要がある。セットアップでこれを変更 - 表示される。
+ErrorTopMenuMustHaveAParentWithId0=タイプは 'top'のメニューが親メニューを持つことはできない。親メニューに0を置くか、または型 &quot;左&quot;のメニューを選択する。
+ErrorLeftMenuMustHaveAParentId=タイプ &quot;左&quot;のメニューは、親IDを持つ必要がある。
+ErrorFileNotFound=ファイルが見つかりませんでし<b>%s（PHP</b> openbasedirまたはセーフモードパラメータ によって拒否された不正なパスが、間違ったパーミッションやアクセス）
+ErrorDirNotFound=ディレクトリが見つかりません<b>%s（PHP</b> openbasedirまたはセーフモードパラメータ によって拒否された不正なパスが、間違ったパーミッションやアクセス）
+ErrorFunctionNotAvailableInPHP=関数<b>%sは、</b>この機能を使用するために必要となるが、このバージョンの/ PHPのセットアップでは使用できない。
+ErrorDirAlreadyExists=この名前のディレクトリがすでに存在している。
+ErrorFileAlreadyExists=この名前を持つファイルがすでに存在している。
+ErrorPartialFile=ファイルはサーバーで完全に受け取っていない。
 ErrorNoTmpDir=一時的なdirectyの%sが存在しません。
-ErrorUploadBlockedByAddon=PHP / Apacheプラグインによってブロックされてアップロードします。
-ErrorFileSizeTooLarge=ファイルサイズが大きすぎます。
-ErrorFieldTooLong=Field %s is too long.
+ErrorUploadBlockedByAddon=PHP / Apacheプラグインによってブロックされてアップロードする。
+ErrorFileSizeTooLarge=ファイルサイズが大きすぎる。
+ErrorFieldTooLong=フィールド%sが長すぎる。
 ErrorSizeTooLongForIntType=（%s桁の最大値）int型に対して長すぎるサイズ
 ErrorSizeTooLongForVarcharType=文字列型（%s文字最大）長すぎるサイズ
-ErrorNoValueForSelectType=Please fill value for select list
-ErrorNoValueForCheckBoxType=Please fill value for checkbox list
-ErrorNoValueForRadioType=Please fill value for radio list
-ErrorBadFormatValueList=The list value cannot have more than one comma: <u>%s</u>, but need at least one: key,value
-ErrorFieldCanNotContainSpecialCharacters=The field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=The field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
-ErrorFieldMustHaveXChar=The field <b>%s</b> must have at least %s characters.
+ErrorNoValueForSelectType=選択リストの値を入力すること
+ErrorNoValueForCheckBoxType=チェックボックスリストの値を入力すること
+ErrorNoValueForRadioType=ラジオリストの値を入力すること
+ErrorBadFormatValueList=リスト値に複数のコンマを含めることはできない: <u> %s </u> 、ただし少なくとも1つ必要: key,value
+ErrorFieldCanNotContainSpecialCharacters=フィールド<b>%s</b>に特殊文字を含めることはできない。
+ErrorFieldCanNotContainSpecialNorUpperCharacters=フィールド<b>%s </b>には、特殊文字や大文字を含めることはできず、数字のみを含めることはできない。
+ErrorFieldMustHaveXChar=フィールド<b>%s </b>には、少なくとも%s文字が必要だ。
 ErrorNoAccountancyModuleLoaded=全く会計モジュールが活性化しない
-ErrorExportDuplicateProfil=This profile name already exists for this export set.
-ErrorLDAPSetupNotComplete=Dolibarr-LDAPのマッチングは完全ではありません。
-ErrorLDAPMakeManualTest=。ldifファイルは、ディレクトリ%sで生成されました。エラーの詳細情報を持つようにコマンドラインから手動でそれをロードしようとする。
-ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=作成に使用refは、すでに存在しています。
-ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
-ErrorRecordHasChildren=Failed to delete record since it has some child records.
-ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
-ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object.
-ErrorModuleRequireJavascript=Javascriptがこの機能が動作しているために無効にすることはできません。 Javascriptを有効/無効にするには、メニューHome  - &gt;セットアップ - &gt;ディスプレイに移動します。
-ErrorPasswordsMustMatch=両方入力したパスワードは、互いに一致している必要があります
-ErrorContactEMail=A technical error occured. Please, contact administrator to following email <b>%s</b> and provide the error code <b>%s</b> in your message, or add a screen copy of this page.
-ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
-ErrorFieldValueNotIn=Field <b>%s</b>: '<b>%s</b>' is not a value found in field <b>%s</b> of <b>%s</b>
-ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
-ErrorsOnXLines=%s errors found
-ErrorFileIsInfectedWithAVirus=ウイルス対策プログラムがファイルを検証することができませんでした（ファイルがウイルスに感染されるかもしれません）
-ErrorSpecialCharNotAllowedForField=特殊文字は、フィールド &quot;%s&quot;に許可されていません
-ErrorNumRefModel=参照は、データベース（%s）に存在し、この番号規則と互換性がありません。レコードを削除するか、このモジュールを有効にするために参照を変更しました。
-ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
-ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorExportDuplicateProfil=このプロファイル名は、このエクスポートセットにすでに存在する。
+ErrorLDAPSetupNotComplete=Dolibarr-LDAPのマッチングは完全ではない。
+ErrorLDAPMakeManualTest=.ldifファイルは、ディレクトリ%sで生成された。エラーの詳細情報を持つようにコマンドラインから手動でそれをロードしようとする。
+ErrorCantSaveADoneUserWithZeroPercentage= "doneby" フィールドも入力されている場合、 "statusnotstarted" のアクションを保存できない。
+ErrorRefAlreadyExists=作成に使用refは、すでに存在している。
+ErrorPleaseTypeBankTransactionReportName=エントリを報告する必要のある銀行取引明細書名を入力すること（フォーマットYYYYMMまたはYYYYMMDD）
+ErrorRecordHasChildren=子レコードがいくつかあるため、レコードの削除に失敗した。
+ErrorRecordHasAtLeastOneChildOfType=オブジェクトには、タイプ%sの子が少なくとも1つある
+ErrorRecordIsUsedCantDelete=レコードを削除できない。すでに使用されているか、別のオブジェクトに含まれている。
+ErrorModuleRequireJavascript=Javascriptがこの機能が動作しているために無効にすることはできない。 Javascriptを有効/無効にするには、メニューHome  - &gt;セットアップ - &gt;ディスプレイに移動する。
+ErrorPasswordsMustMatch=両方入力したパスワードは、互いに一致している必要がある
+ErrorContactEMail=技術的なエラーが発生した。次の電子メール<b>%s </b>に管理者に連絡し、メッセージにエラーコード<b> %s </b>を入力するか、このページの画面コピーを追加すること。
+ErrorWrongValueForField=フィールド<b>%s </b>： '<b> %s </b>' は、正規表現ルール<b>%s</b> に不適合
+ErrorFieldValueNotIn=フィールド<b> %s </b>： '<b> %s </b>' が値が<b> %s </b> <b> %s </b>の分野では見られません
+ErrorFieldRefNotIn=フィールド<b>%s </b>： '<b> %s</b>' は存在する <b>%s</b> 参照ではない
+ErrorsOnXLines=%sエラーが見つかった
+ErrorFileIsInfectedWithAVirus=ウイルス対策プログラムがファイルを検証することができなかった（ファイルがウイルスに感染されるかもしれない）
+ErrorSpecialCharNotAllowedForField=特殊文字は、フィールド &quot;%s&quot;に許可されていない
+ErrorNumRefModel=参照は、データベース（%s）に存在し、この番号規則と互換性がない。レコードを削除するか、このモジュールを有効にするために参照を変更した。
+ErrorQtyTooLowForThisSupplier=このベンダーの数量が少なすぎるか、このベンダーのこの製品に価格が定義されていない
+ErrorOrdersNotCreatedQtyTooLow=数量が少なすぎるため、一部の注文が作成されていない
+ErrorModuleSetupNotComplete=モジュール%sのセットアップが完了していないようだ。ホーム-セットアップ-モジュールに移動して完了する。
 ErrorBadMask=マスク上でのエラー
 ErrorBadMaskFailedToLocatePosOfSequence=シーケンス番号のないエラー、マスク
 ErrorBadMaskBadRazMonth=エラー、不正なリセット値
-ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
-ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
-ErrorSelectAtLeastOne=Error, select at least one entry.
-ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
-ErrorProdIdAlreadyExist=%sは別の第三者に割り当てられています
-ErrorFailedToSendPassword=パスワードの送信に失敗しました
+ErrorMaxNumberReachForThisMask=このマスクの最大数に達した
+ErrorCounterMustHaveMoreThan3Digits=カウンターは3桁以上である必要がある
+ErrorSelectAtLeastOne=エラー、少なくとも1つのエントリを選択すること。
+ErrorDeleteNotPossibleLineIsConsolidated=レコードが調整された銀行取引にリンクされているため、削除できない
+ErrorProdIdAlreadyExist=%sは別の第三者に割り当てられている
+ErrorFailedToSendPassword=パスワードの送信に失敗した
 ErrorFailedToLoadRSSFile=RSSフィードの取得に失敗した。エラーメッセージが十分な情報を提供していない場合は定数MAIN_SIMPLEXMLLOAD_DEBUGを追加しようとする。
-ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
-ErrorForbidden2=このログインの許可は、メニュー%s  - &gt; %sからDolibarr管理者によって定義することができます。
-ErrorForbidden3=そのDolibarrが認証セッションを介して使用されていないようです。認証を（htaccessファイルは、mod_authまたは他の...）を管理する方法を知ってDolibarrセットアップドキュメントを見てみましょう。
-ErrorNoImagickReadimage=クラスImagickが、このPHPで発見さ​​れていません。なしプレビューは利用できません。管理者は、メニューのSetupから、このタブを無効にすることができます - 表示します。
+ErrorForbidden=アクセスが拒否された。 <br>無効にされたモジュールのページ、領域、または機能にアクセスしようとしたか、認証されたセッションに参加していないか、ユーザーに許可されていない。
+ErrorForbidden2=このログインの許可は、メニュー%s  - &gt; %sからDolibarr管理者によって定義することができる。
+ErrorForbidden3=そのDolibarrが認証セッションを介して使用されていないようだ。認証を（htaccessファイルは、mod_authまたは他の...）を管理する方法を知ってDolibarrセットアップドキュメントを見てみよう。
+ErrorNoImagickReadimage=クラスImagickが、このPHPで発見さ​​れていない。なしプレビューは利用できない。管理者は、メニューのSetupから、このタブを無効にすることができる - 表示する。
 ErrorRecordAlreadyExists=レコードがすでに存在している
-ErrorLabelAlreadyExists=This label already exists
-ErrorCantReadFile=ファイル&quot;%s&quot;を読み取ることができませんでした
-ErrorCantReadDir=ディレクトリ&quot;%s&quot;を読み取ることができませんでした
-ErrorBadLoginPassword=ログインまたはパスワードの値が正しくありません
-ErrorLoginDisabled=あなたのアカウントは無効にされています
-ErrorFailedToRunExternalCommand=外部コマンドの実行に失敗しました。それはあなたのPHPサーバで利用可能と実行可能になったのを確認してください。 PHP <b>セーフモードが</b>有効<b>になっ</b>ている場合、コマンドは、パラメータの<b>safe_mode_exec_dirの</b>によって定義されたディレクトリ内にあることを確認してください。
-ErrorFailedToChangePassword=パスワードの変更に失敗しました
-ErrorLoginDoesNotExists=ログイン<b>%s</b>を持つユーザーを見つけることができませんでした。
-ErrorLoginHasNoEmail=このユーザーは電子メールアドレスを持っていません。プロセスが中止されました。
-ErrorBadValueForCode=セキュリティコードの値が正しくありません。新しい値で再試行してください...
-ErrorBothFieldCantBeNegative=フィールド%s %sとは負の両方にすることはできません
-ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice.
-ErrorLinesCantBeNegativeForOneVATRate=Total of lines (net of tax) can't be negative for a given not null VAT rate (Found a negative total for VAT rate <b>%s</b>%%).
-ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
-ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
+ErrorLabelAlreadyExists=このラベルはすでに存在する
+ErrorCantReadFile=ファイル&quot;%s&quot;を読み取ることができなかった
+ErrorCantReadDir=ディレクトリ&quot;%s&quot;を読み取ることができなかった
+ErrorBadLoginPassword=ログインまたはパスワードの値が正しくない
+ErrorLoginDisabled=あなたのアカウントは無効にされている
+ErrorFailedToRunExternalCommand=外部コマンドの実行に失敗した。それはあなたのPHPサーバで利用可能と実行可能になったのを確認すること。 PHP <b>セーフモードが</b>有効<b>になっ</b>ている場合、コマンドは、パラメータ の<b>safe_mode_exec_dirの</b>によって定義されたディレクトリ内にあることを確認すること。
+ErrorFailedToChangePassword=パスワードの変更に失敗した
+ErrorLoginDoesNotExists=ログイン<b>%s</b>を持つユーザーを見つけることができなかった。
+ErrorLoginHasNoEmail=このユーザーは電子メールアドレスを持っていない。プロセスが中止された。
+ErrorBadValueForCode=セキュリティコードの値が正しくない。新しい値で再試行すること...
+ErrorBothFieldCantBeNegative=フィールド%s %sとは負の両方にすることはできない
+ErrorFieldCantBeNegativeOnInvoice=このタイプの請求書では、フィールド<strong> %s</strong>を負にすることはできない。割引ラインを追加する必要がある場合は、最初に割引を作成し（サードパーティカードのフィールド '%s'から）、それを請求書に適用する。
+ErrorLinesCantBeNegativeForOneVATRate=行の合計（税控除後）は、特定のnull以外のVAT率に対して負になることはできない（VAT率<b> %s </b> %%の負の合計が見つかった）。
+ErrorLinesCantBeNegativeOnDeposits=預金でラインがマイナスになることはない。あなたがそうするならば、あなたが最終的な請求書で預金を消費する必要があるとき、あなたは問題に直面するだろう。
+ErrorQtyForCustomerInvoiceCantBeNegative=顧客の請求書への明細の数量をマイナスにすることはできない
 ErrorWebServerUserHasNotPermission=Webサーバを実行するユーザーアカウントを使用<b>%s</b>そのための権限を持っていない
 ErrorNoActivatedBarcode=活性化バーコード·タイプません
-ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
-ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorModuleFileRequired=You must select a Dolibarr module package file
-ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
-ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
-ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
-ErrorNewValueCantMatchOldValue=New value can't be equal to old one
-ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
-ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
-ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date must be lower than today
-ErrorDateMustBeInFuture=The date must be greater than today
-ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
-ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
-ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
-ErrorWarehouseMustDiffers=Source and target warehouses must differs
-ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
-ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
-ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank entry that was reconciled
-ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Paid
-ErrorPriceExpression1=Cannot assign to constant '%s'
-ErrorPriceExpression2=Cannot redefine built-in function '%s'
-ErrorPriceExpression3=Undefined variable '%s' in function definition
-ErrorPriceExpression4=Illegal character '%s'
-ErrorPriceExpression5=Unexpected '%s'
-ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
-ErrorPriceExpression8=Unexpected operator '%s'
-ErrorPriceExpression9=An unexpected error occured
-ErrorPriceExpression10=Operator '%s' lacks operand
-ErrorPriceExpression11=Expecting '%s'
-ErrorPriceExpression14=Division by zero
-ErrorPriceExpression17=Undefined variable '%s'
-ErrorPriceExpression19=Expression not found
-ErrorPriceExpression20=Empty expression
-ErrorPriceExpression21=Empty result '%s'
-ErrorPriceExpression22=Negative result '%s'
-ErrorPriceExpression23=Unknown or non set variable '%s' in %s
-ErrorPriceExpression24=Variable '%s' exists but has no value
-ErrorPriceExpressionInternal=Internal error '%s'
-ErrorPriceExpressionUnknown=Unknown error '%s'
-ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
-ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
-ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
-ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
-ErrorGlobalVariableUpdater2=Missing parameter '%s'
-ErrorGlobalVariableUpdater3=The requested data was not found in result
-ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
-ErrorGlobalVariableUpdater5=No global variable selected
-ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
-ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter it's status.
-ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
-ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
-ErrorSavingChanges=An error has occurred when saving the changes
-ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
-ErrorFileMustHaveFormat=File must have format %s
-ErrorFilenameCantStartWithDot=Filename can't start with a '.'
-ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
-ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
-ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
-ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
-ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
-ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
-ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
-ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
-ErrorTaskAlreadyAssigned=Task already assigned to user
-ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
-ErrorModuleFileSeemsToHaveAWrongFormat2=At least one mandatory directory must exists into zip of module: <strong>%s</strong> or <strong>%s</strong>
-ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
-ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
-ErrorNoWarehouseDefined=Error, no warehouses defined.
-ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
-ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
-ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
-ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated.
-ErrorObjectMustHaveLinesToBeValidated=Object %s must have lines to be validated.
-ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action.
-ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not
-ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
-ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
-ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
-ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
-ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
-ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
-ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
-ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
-ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
-ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
-ErrorSearchCriteriaTooSmall=Search criteria too small.
-ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to be disabled
-ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
-ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
-ErrorFieldRequiredForProduct=Field '%s' is required for product %s
-ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
-ErrorAddAtLeastOneLineFirst=Add at least one line first
-ErrorRecordAlreadyInAccountingDeletionNotPossible=Error, record is already transferred in accounting, deletion is not possible.
-ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Error, language is mandatory if you set the page as a translation of another one.
-ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated page is same than this one.
-ErrorBatchNoFoundForProductInWarehouse=No lot/serial found for product "%s" in warehouse "%s".
-ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this lot/serial for product "%s" in warehouse "%s".
-ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
-ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
-ErrorReplaceStringEmpty=Error, the string to replace into is empty
-ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
-ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
-ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrUnzipFails=ZipArchiveで%sを解凍できなかった
+ErrNoZipEngine=このPHPで%sファイルをzip / unzipするエンジンはない
+ErrorFileMustBeADolibarrPackage=ファイル%sはDolibarrzipパッケージである必要がある
+ErrorModuleFileRequired=Dolibarrモジュールパッケージファイルを選択する必要がある
+ErrorPhpCurlNotInstalled=PHPCURLがインストールされていない。これはPaypalと話すために不可欠だ。
+ErrorFailedToAddToMailmanList=レコード%sをMailmanリスト%sまたはSPIPベースに追加できなかった
+ErrorFailedToRemoveToMailmanList=レコード%sをMailmanリスト%sまたはSPIPベースに削除できなかった
+ErrorNewValueCantMatchOldValue=新しい値を古い値と等しくすることはできない
+ErrorFailedToValidatePasswordReset=パスワードの再初期化に失敗した。 reinitがすでに実行されている可能性がある（このリンクは1回しか使用できない）。そうでない場合は、再初期化プロセスを再開してみること。
+ErrorToConnectToMysqlCheckInstance=データベースへの接続に失敗。データベースサーバーが実行されていることを確認する（たとえば、mysql/mariadb なら、コマンドラインから "sudo service mysql start" を使用して起動できる）。
+ErrorFailedToAddContact=連絡先の追加に失敗した
+ErrorDateMustBeBeforeToday=日付は今日よりも低くする必要がある
+ErrorDateMustBeInFuture=日付は今日より大きくなければならない
+ErrorPaymentModeDefinedToWithoutSetup=支払いモードはタイプ%sに設定されたが、この支払いモードで表示する情報を定義するためのモジュール請求書のセットアップが完了していなかった。
+ErrorPHPNeedModule=エラー、この機能を使用するには、PHPにモジュール<b> %s</b>がインストールされている必要がある。
+ErrorOpenIDSetupNotComplete=OpenID認証を許可するようにDolibarr構成ファイルを設定したが、OpenIDサービスのURLが定数%sに定義されていない
+ErrorWarehouseMustDiffers=ソースウェアハウスとターゲットウェアハウスは異なる必要がある
+ErrorBadFormat=悪いフォーマット！
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=エラー、このメンバーはまだサードパーティにリンクされていない。請求書付きのサブスクリプションを作成する前に、メンバーを既存のサードパーティにリンクするか、新しいサードパーティを作成すること。
+ErrorThereIsSomeDeliveries=エラー、この出荷に関連するいくつかの配送がある。削除は拒否された。
+ErrorCantDeletePaymentReconciliated=調整された銀行エントリを生成した支払いを削除できない
+ErrorCantDeletePaymentSharedWithPayedInvoice=ステータスがPaidの少なくとも1つの請求書で共有されている支払いを削除できない
+ErrorPriceExpression1=定数 "%s" に割り当てることはできない
+ErrorPriceExpression2=組み込み関数 '%s'を再定義できない
+ErrorPriceExpression3=関数定義の未定義変数 '%s'
+ErrorPriceExpression4=不正な文字 '%s'
+ErrorPriceExpression5=予期しない '%s'
+ErrorPriceExpression6=引数の数が間違っている（%sが指定され、%sが予期されている）
+ErrorPriceExpression8=予期しない演算子 '%s'
+ErrorPriceExpression9=予期しないエラーが発生した
+ErrorPriceExpression10=演算子 '%s'にオペランドがない
+ErrorPriceExpression11='%s'を期待している
+ErrorPriceExpression14=ゼロ除算
+ErrorPriceExpression17=未定義の変数 '%s'
+ErrorPriceExpression19=式が見つかりません
+ErrorPriceExpression20=空の表情
+ErrorPriceExpression21=空の結果 '%s'
+ErrorPriceExpression22=否定的な結果 '%s'
+ErrorPriceExpression23=%sの不明または未設定の変数 '%s'
+ErrorPriceExpression24=変数 '%s'は存在するが、値がない
+ErrorPriceExpressionInternal=内部エラー '%s'
+ErrorPriceExpressionUnknown=不明なエラー '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=ソースウェアハウスとターゲットウェアハウスは異なる必要がある
+ErrorTryToMakeMoveOnProductRequiringBatchData=ロット/シリアル情報を必要とする製品 '%s'で、ロット/シリアル情報なしで在庫移動を行おうとするとエラーが発生した
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=記録されたすべての受信は、このアクションを実行する前に、まず確認（承認または拒否）する必要がある
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=このアクションを実行する前に、記録されたすべての受信を最初に確認（承認）する必要がある
+ErrorGlobalVariableUpdater0=HTTPリクエストがエラー "%s" で失敗した
+ErrorGlobalVariableUpdater1=無効なJSON形式 '%s'
+ErrorGlobalVariableUpdater2=パラメータ  '%s'がない
+ErrorGlobalVariableUpdater3=要求されたデータが結果に見つからなかった
+ErrorGlobalVariableUpdater4=SOAPクライアントがエラー "%s" で失敗した
+ErrorGlobalVariableUpdater5=グローバル変数が選択されていない
+ErrorFieldMustBeANumeric=フィールド<b>%s</b>は数値である必要がある
+ErrorMandatoryParametersNotProvided=必須パラメータ (s)が提供されていない
+ErrorOppStatusRequiredIfAmount=このリードの見積もり金額を設定する。したがって、そのステータスも入力する必要がある。
+ErrorFailedToLoadModuleDescriptorForXXX=%sのモジュール記述子クラスのロードに失敗した
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=モジュール記述子のメニュー配列の定義が正しくない（キーfk_menuの値が正しくない）
+ErrorSavingChanges=変更を保存するときにエラーが発生した
+ErrorWarehouseRequiredIntoShipmentLine=出荷するラインには倉庫が必要だ
+ErrorFileMustHaveFormat=ファイルの形式は%sである必要がある
+ErrorFilenameCantStartWithDot=ファイル名を "。" で始めることはできない。
+ErrorSupplierCountryIsNotDefined=このベンダーの国は定義されていない。最初にこれを修正すること。
+ErrorsThirdpartyMerge=2つのレコードのマージに失敗した。リクエストはキャンセルされた。
+ErrorStockIsNotEnoughToAddProductOnOrder=製品%sが新しい注文に追加するには、在庫が十分ではない。
+ErrorStockIsNotEnoughToAddProductOnInvoice=製品%sが新しい請求書に追加するには、在庫が十分ではない。
+ErrorStockIsNotEnoughToAddProductOnShipment=製品%sが新しい出荷に追加するには、在庫が十分ではない。
+ErrorStockIsNotEnoughToAddProductOnProposal=製品%sが新しい提案に追加するには、在庫が十分ではない。
+ErrorFailedToLoadLoginFileForMode=モード "%s" のログインキーの取得に失敗した。
+ErrorModuleNotFound=モジュールのファイルが見つからなかった。
+ErrorFieldAccountNotDefinedForBankLine=ソース行ID%s（%s）に対してアカウンティングアカウントの値が定義されていない
+ErrorFieldAccountNotDefinedForInvoiceLine=請求書ID%s（%s）に定義されていない会計勘定の値
+ErrorFieldAccountNotDefinedForLine=行に定義されていない会計勘定の値（%s）
+ErrorBankStatementNameMustFollowRegex=エラー、銀行取引明細書名は次の構文規則に従う必要がある%s
+ErrorPhpMailDelivery=使用する受信者の数が多すぎないこと、および電子メールの内容がスパムに類似していないことを確認すること。詳細については、ファイアウォールとサーバーのログファイルを確認するように管理者に依頼すること。
+ErrorUserNotAssignedToTask=消費時間を入力できるようにするには、ユーザーをタスクに割り当てる必要がある。
+ErrorTaskAlreadyAssigned=すでにユーザーに割り当てられているタスク
+ErrorModuleFileSeemsToHaveAWrongFormat=モジュールパッケージの形式が間違っているようだ。
+ErrorModuleFileSeemsToHaveAWrongFormat2=モジュールのzipには、少なくとも1つの必須ディレクトリが存在する必要がある：<strong> %s</strong>または<strong>%s </strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=モジュールパッケージの名前（<strong> %s </strong>）が予期される名前の構文と一致しません：<strong> %s </strong>
+ErrorDuplicateTrigger=エラー、トリガー名%sが重複している。すでに%sからロードされている。
+ErrorNoWarehouseDefined=エラー、倉庫が定義されていない。
+ErrorBadLinkSourceSetButBadValueForRef=使用しているリンクは無効だ。支払いの "ソース" が定義されているが、 "ref" の値が無効だ。
+ErrorTooManyErrorsProcessStopped=エラーが多すぎる。プロセスが停止した。
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=このアクションで在庫を増減するオプションが設定されている場合、一括検証はできない（増加/減少する倉庫を定義できるように、1つずつ検証する必要がある）
+ErrorObjectMustHaveStatusDraftToBeValidated=オブジェクト%sを検証するには、ステータスが "ドラフト" である必要がある。
+ErrorObjectMustHaveLinesToBeValidated=オブジェクト%sには、検証する行が必要だ。
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction= "電子メールで送信" 一括アクションを使用して送信できるのは、検証済みの請求書のみだ。
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=記事が事前定義された製品であるかどうかを選択する必要がある
+ErrorDiscountLargerThanRemainToPaySplitItBefore=あなたが適用しようとする割引は、支払うべき残りよりも大きいだ。前に割引を2つの小さな割引に分割する。
+ErrorFileNotFoundWithSharedLink=ファイルが見つからなかった。共有キーが変更されたか、ファイルが最近削除された可能性がある。
+ErrorProductBarCodeAlreadyExists=製品バーコード%sは、別の製品リファレンスにすでに存在する。
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=少なくとも1つのサブ製品（またはサブ製品のサブ製品）にシリアル番号/ロット番号が必要な場合、キットを使用してサブ製品を自動的に増減させることはできないことにも注意すること。
+ErrorDescRequiredForFreeProductLines=無料の製品を含むラインには説明が必須だ
+ErrorAPageWithThisNameOrAliasAlreadyExists=ページ/コンテナ<strong>%s </strong>は、使用しようとしているものと同じ名前または代替エイリアスを持っている
+ErrorDuringChartLoad=勘定科目表の読み込み中にエラーが発生した。ロードされていないアカウントが少ない場合でも、手動で入力できる。
+ErrorBadSyntaxForParamKeyForContent=paramkeyforcontentの構文が正しくない。 %sまたは%sで始まる値が必要だ
+ErrorVariableKeyForContentMustBeSet=エラー、名前%s（表示するテキストコンテンツ付き）または%s（表示する外部URL付き）の定数を設定する必要がある。
+ErrorURLMustStartWithHttp=URL %sは http:// または https:// で始まる必要がある
+ErrorNewRefIsAlreadyUsed=エラー、新しい参照はすでに使用されている
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=エラー、クローズされた請求書にリンクされた支払いを削除することはできない。
+ErrorSearchCriteriaTooSmall=検索条件が小さすぎる。
+ErrorObjectMustHaveStatusActiveToBeDisabled=無効にするには、オブジェクトのステータスが "アクティブ" である必要がある
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=オブジェクトを有効にするには、ステータスが "ドラフト" または "無効" である必要がある
+ErrorNoFieldWithAttributeShowoncombobox=オブジェクト '%s'の定義にプロパティ 'showoncombobox'を持つフィールドはない。コンボリストを表示する方法はない。
+ErrorFieldRequiredForProduct=製品%sには、フィールド '%s'が必要だ。
+ProblemIsInSetupOfTerminal=ターミナル%sのセットアップに問題がある。
+ErrorAddAtLeastOneLineFirst=最初に少なくとも1行追加する
+ErrorRecordAlreadyInAccountingDeletionNotPossible=エラー、レコードはすでにアカウンティングで転送されており、削除できない。
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=エラー、ページを別のページの翻訳として設定する場合は、言語が必須だ。
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=エラー、翻訳されたページの言語はこれと同じだ。
+ErrorBatchNoFoundForProductInWarehouse=倉庫 "%s" に製品 "%s" のロット/シリアルが見つかりません。
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=倉庫 "%s" の製品 "%s" のこのロット/シリアルに十分な数量がない。
+ErrorOnlyOneFieldForGroupByIsPossible='Group by'のフィールドは1つだけ可能だ（他のフィールドは破棄される）
+ErrorTooManyDifferentValueForSelectedGroupBy=フィールド '<b> %s </b>'に異なる値（<b> %s </b>以上）が多すぎるため、 それを図形に対する ' Group by ' として使用することはできない。フィールド "Group By" は削除された。 X軸として使用したかったのか？
+ErrorReplaceStringEmpty=エラー、置き換える文字列が空だ
+ErrorProductNeedBatchNumber=エラー、製品 '<b> %s</b>'にはロット/シリアル番号が必要だ
+ErrorProductDoesNotNeedBatchNumber=エラー、製品 '<b> %s</b>'はロット/シリアル番号を受け入れません
+ErrorFailedToReadObject=エラー、タイプ<b> %s</b>のオブジェクトの読み取りに失敗した
+ErrorParameterMustBeEnabledToAllwoThisFeature=エラー、パラメータ <b> %s </b>を<b>conf / conf.php <b>で有効にして、内部ジョブスケジューラでコマンドラインインターフェイスを使用できるようにする必要がある
+ErrorLoginDateValidity=エラー、このログインは有効期間外だ
 # Warnings
-WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
-WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
-WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
-WarningEnableYourModulesApplications=Click here to enable your modules and applications
-WarningSafeModeOnCheckExecDir=警告、PHPのオプション<b>セーフモードは、PHP</b>のパラメータ<b>safe_mode_exec_dirの</b>宣言されたディレクトリ内に格納する必要がありますので、コマンドにあります。
-WarningBookmarkAlreadyExists=この職種またはこのターゲットを使用して、ブックマーク（URL）がすでに存在しています。
-WarningPassIsEmpty=警告は、データベースのパスワードは空です。これはセキュリティホールです。あなたのデータベースにパスワードを追加し、これを反映するようにconf.phpファイルを変更する必要があります。
-WarningConfFileMustBeReadOnly=警告は、設定ファイルは<b>（htdocsに/ confに/ conf.php）</b>のWebサーバーによって上書きすることができます。これは重大なセキュリティホールです。 Webサーバーで使用されるオペレーティング·システム·ユーザーのために読み取り専用モードになるようにファイルのパーミッションを変更します。あなたのディスクにWindowsとFATフォーマットを使用すると、このファイルシステムはファイルのパーミッションを追加することはできません知っている必要があり、ので、完全に安全ではないcan。
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHPパラメータ upload_max_filesize（%s）は、PHPパラメータ post_max_size（%s）よりも大きくなっている。これは一貫した設定ではない。
+WarningPasswordSetWithNoAccount=このメンバーにパスワードが設定された。ただし、ユーザーアカウントは作成されなかった。したがって、このパスワードは保存されるが、Dolibarrへのログインには使用できない。外部モジュール/インターフェースで使用できるが、メンバーのログインやパスワードを定義する必要がない場合は、メンバーモジュールの設定から "各メンバーのログインを管理する" オプションを無効にすることができる。ログインを管理する必要があるがパスワードは必要ない場合は、このフィールドを空のままにして、この警告を回避できる。注：メンバーがユーザーにリンクされている場合は、電子メールをログインとして使用することもできる。
+WarningMandatorySetupNotComplete=必須パラメータ を設定するには、ここをクリックすること
+WarningEnableYourModulesApplications=モジュールとアプリケーションを有効にするには、ここをクリックすること
+WarningSafeModeOnCheckExecDir=警告、PHPのオプション<b>セーフモードは、PHP</b>のパラメータ <b>safe_mode_exec_dirの</b>宣言されたディレクトリ内に格納する必要があるので、コマンドにある。
+WarningBookmarkAlreadyExists=この職種またはこのターゲットを使用して、ブックマーク（URL）がすでに存在している。
+WarningPassIsEmpty=警告は、データベースのパスワードは空だ。これはセキュリティホールだ。あなたのデータベースにパスワードを追加し、これを反映するようにconf.phpファイルを変更する必要がある。
+WarningConfFileMustBeReadOnly=警告、設定ファイル (<b>htdocs/conf/conf.php</b>) はWebサーバーによって上書きされうる。これは重大なセキュリティホールだ。 Webサーバーで使用されるオペレーティング·システム·ユーザーのために読み取り専用モードになるようにファイルのパーミッションを変更すること。あなたのディスクにWindowsとFATフォーマットを使用すると、このファイルシステムはファイルのパーミッションを追加することはできず、完全な安全を得られないことを知っている必要がある。
 WarningsOnXLines=<b>%s</b>ソース行に関する警告
-WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be chosen by default until you check your module setup.
-WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable the installation/migration tools by adding a file <b>install.lock</b> into directory <b>%s</b>. Omitting the creation of this file is a grave security risk.
-WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other Setup).
-WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
-WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
-WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
-WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
-WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
-WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
-WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
-WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
-WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
-WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
-WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
-WarningProjectClosed=Project is closed. You must re-open it first.
-WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningNoDocumentModelActivated=ドキュメント生成用のモデルはアクティブ化されていない。モジュールの設定を確認するまで、デフォルトでモデルが選択される。
+WarningLockFileDoesNotExists=警告、セットアップが完了したら、ファイル<b> install.lock</b>をディレクトリ<b>%s </b>に追加して、インストール/移行ツールを無効にする必要がある。このファイルの作成を省略すると、重大なセキュリティリスクが発生する。
+WarningUntilDirRemoved=すべてのセキュリティ警告（管理者ユーザーのみに表示）は、脆弱性が存在する限り（または、 設定 -> その他の設定 で定数 MAIN_REMOVE_INSTALL_WARNING が追加されている限り）アクティブなままだ。
+WarningCloseAlways=警告、ソース要素とターゲット要素の間で量が異なっていても、クローズは行われる。この機能は注意して有効にすること。
+WarningUsingThisBoxSlowDown=警告、このボックスを使用すると、ボックスを表示しているすべてのページの速度が大幅に低下する。
+WarningClickToDialUserSetupNotComplete=ユーザーのClickToDial情報の設定が完了していない（ユーザーカードのClickToDialタブを参照）。
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=表示設定が視覚障害者またはテキストブラウザ用に最適化されている場合、機能は無効になる。
+WarningPaymentDateLowerThanInvoiceDate=請求書%sの支払い日（%s）が請求日（%s）よりも前だ。
+WarningTooManyDataPleaseUseMoreFilters=データが多すぎる（%s行を超えている）。より多くのフィルターを使用するか、定数%sをより高い制限に設定すること。
+WarningSomeLinesWithNullHourlyRate=時間料金が定義されていないときに、一部のユーザーによって記録された時間もある。 1時間あたり0%sの値が使用されたが、これにより、費やされた時間の誤った評価が発生する可能性がある。
+WarningYourLoginWasModifiedPleaseLogin=ログインが変更された。セキュリティ上の理由から、次のアクションの前に新しいログインでログインする必要がある。
+WarningAnEntryAlreadyExistForTransKey=この言語の翻訳キーのエントリはすでに存在する
+WarningNumberOfRecipientIsRestrictedInMassAction=警告、リストで一括アクションを使用する場合、異なる受信者の数は<b> %s</b>に制限される
+WarningDateOfLineMustBeInExpenseReportRange=警告、行の日付が経費報告書の範囲内にない
+WarningProjectDraft=プロジェクトはまだドラフトモードだ。タスクを使用する場合は、検証することを忘れないでください。
+WarningProjectClosed=プロジェクトは終了した。最初に再度開く必要がある。
+WarningSomeBankTransactionByChequeWereRemovedAfter=一部の銀行取引は、それらを含む領収書が生成された後に削除された。そのため、小切手の数と領収書の合計は、リストの数と合計とは異なる場合がある。
+WarningFailedToAddFileIntoDatabaseIndex=警告、ECMデータベースインデックステーブルにファイルエントリを追加できなかった
+WarningTheHiddenOptionIsOn=警告、非表示のオプション<b> %s</b>がオンになっている。
+WarningCreateSubAccounts=警告、サブアカウントを直接作成することはできない。このリストでそれらを見つけるには、サードパーティまたはユーザーを作成し、それらにアカウンティングコードを割り当てる必要がある
diff --git a/htdocs/langs/ja_JP/exports.lang b/htdocs/langs/ja_JP/exports.lang
index 2661ac9d6a4..1aefed12ba1 100644
--- a/htdocs/langs/ja_JP/exports.lang
+++ b/htdocs/langs/ja_JP/exports.lang
@@ -1,133 +1,135 @@
 # Dolibarr language file - Source file is en_US - exports
-ExportsArea=Exports
-ImportArea=Import
-NewExport=New Export
-NewImport=New Import
+ExportsArea=エクスポート
+ImportArea=インポート
+NewExport=新規エクスポート
+NewImport=新規インポート
 ExportableDatas=エクスポート可能なデータセット
 ImportableDatas=インポート可能なデータセット
 SelectExportDataSet=エクスポートするデータセットを選択...
 SelectImportDataSet=インポートしたいデータを選択...
-SelectExportFields=Choose the fields you want to export, or select a predefined export profile
-SelectImportFields=Choose the source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
-NotImportedFields=ソースファイルのフィールドがインポートされません
-SaveExportModel=Save your selections as an export profile/template (for reuse).
-SaveImportModel=Save this import profile (for reuse) ...
+SelectExportFields=エクスポートするフィールドを選択するか、事前定義されたエクスポートプロファイルを選択する
+SelectImportFields=アンカー%sを使用して上下に移動することにより、インポートするソースファイルフィールドとデータベース内のそれらのターゲットフィールドを選択するか、事前定義されたインポートプロファイルを選択する。
+NotImportedFields=ソースファイルのフィールドがインポートされない
+SaveExportModel=選択内容をエクスポートプロファイル/テンプレートとして保存する（再利用用）。
+SaveImportModel=このインポートプロファイルを（再利用のために）保存する...
 ExportModelName=プロファイル名をエクスポートする
-ExportModelSaved=Export profile saved as <b>%s</b>.
+ExportModelSaved=<b> %s</b>として保存されたエクスポートプロファイル。
 ExportableFields=エクスポート可能なフィールド
 ExportedFields=エクスポートするフィールド
 ImportModelName=インポート·プロファイル名
-ImportModelSaved=Import profile saved as <b>%s</b>.
+ImportModelSaved=<b> %s</b>として保存されたインポートプロファイル。
 DatasetToExport=エクスポートするデータセット
 DatasetToImport=データセットをインポートするファイル
 ChooseFieldsOrdersAndTitle=フィールドの順序を選択...
 FieldsTitle=フィールドのタイトル
 FieldTitle=フィールドのタイトル
-NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
-AvailableFormats=Available Formats
+NowClickToGenerateToBuildExportFile=次に、コンボボックスでファイル形式を選択し、"生成" をクリックしてエクスポートファイルを作成する...
+AvailableFormats=利用可能なフォーマット
 LibraryShort=図書館
+ExportCsvSeparator=Csv文字セパレータ
+ImportCsvSeparator=Csv文字セパレータ
 Step=手順
-FormatedImport=Import Assistant
-FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
-FormatedImportDesc2=First step is to choose the kind of data you want to import, then the format of the source file, then the fields you want to import.
-FormatedExport=Export Assistant
-FormatedExportDesc1=These tools allow the export of personalized data using an assistant, to help you in the process without requiring technical knowledge.
-FormatedExportDesc2=First step is to choose a predefined dataset, then which fields you want to export, and in which order.
-FormatedExportDesc3=When data to export are selected, you can choose the format of the output file.
+FormatedImport=インポートアシスタント
+FormatedImportDesc1=このモジュールを使用すると、アシスタントを使用して、技術的な知識がなくても、ファイルから既存のデータを更新したり、データベースに新規オブジェクトを追加したりできる。
+FormatedImportDesc2=最初のステップは、インポートするデータの種類を選択し、次にソースファイルの形式を選択し、次にインポートするフィールドを選択すること 。
+FormatedExport=エクスポートアシスタント
+FormatedExportDesc1=これらのツールを使用すると、アシスタントを使用してパーソナライズされたデータをエクスポートできるため、技術的な知識がなくてもプロセスを支援できる。
+FormatedExportDesc2=最初のステップは、事前定義されたデータセットを選択し、次にエクスポートするフィールドとその順序を選択すること 。
+FormatedExportDesc3=エクスポートするデータを選択すると、出力ファイルの形式を選択できる。
 Sheet=シート
-NoImportableData=いいえインポート可能なデータがありません（データのインポートを可能にするための定義としないモジュール）
-FileSuccessfullyBuilt=File generated
-SQLUsedForExport=SQL Request used to extract data
+NoImportableData=いいえインポート可能なデータがない（データのインポートを可能にするための定義としないモジュール）
+FileSuccessfullyBuilt=生成されたファイル
+SQLUsedForExport=データの抽出に使用されるSQLリクエスト
 LineId=行のid
-LineLabel=Label of line
+LineLabel=行のラベル
 LineDescription=ラインの説明
 LineUnitPrice=ラインの単価
 LineVATRate=ラインの付加価値税率
 LineQty=線の量
-LineTotalHT=Amount excl. tax for line
+LineTotalHT=除く金額ラインの税金
 LineTotalTTC=ラインのための税の額
 LineTotalVAT=ラインの付加価値税の額
 TypeOfLineServiceOrProduct=回線の種類（0 =製品、1 =サービス）
 FileWithDataToImport=インポートするデータを持つファイル
 FileToImport=インポートするソースファイル
-FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
-ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
-ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+FileMustHaveOneOfFollowingFormat=インポートするファイルは、次のいずれかの形式である必要がある
+DownloadEmptyExample=フィールドコンテンツ情報を含むテンプレートファイルをダウンロードする（*は必須フィールド ）
+ChooseFormatOfFileToImport=%sアイコンをクリックして選択し、インポートファイル形式として使用するファイル形式を選択する...
+ChooseFileToImport=ファイルをアップロードし、%sアイコンをクリックして、ソースインポートファイルとしてファイルを選択する。
 SourceFileFormat=ソースファイルの形式
 FieldsInSourceFile=ソースファイル内のフィールド
-FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
+FieldsInTargetDatabase=Dolibarrデータベースのターゲットフィールド（太字=必須）
 Field=フィールド
 NoFields=Noフィールド
 MoveField=フィールドの列番号%sを移動
 ExampleOfImportFile=Example_of_import_file
 SaveImportProfile=このインポート·プロファイルを保存する
-ErrorImportDuplicateProfil=この名前で、このインポート·プロファイルの保存に失敗しました。既存のプロファイルはこの名前で既に存在しています。
+ErrorImportDuplicateProfil=この名前で、このインポート·プロファイルの保存に失敗した。既存のプロファイルはこの名前で既に存在している。
 TablesTarget=対象の表
 FieldsTarget=対象となるフィールド
 FieldTarget=ターゲットとフィールド
 FieldSource=ソースフィールド
 NbOfSourceLines=ソースファイルの行数
-NowClickToTestTheImport=Check that the file format (field and string delimiters) of your file matches the options shown and that you have omitted the header line, or these will be flagged as errors in the following simulation.<br>Click on the "<b>%s</b>" button to run a check of the file structure/contents and simulate the import process.<br><b>No data will be changed in your database</b>.
-RunSimulateImportFile=Run Import Simulation
-FieldNeedSource=This field requires data from the source file
-SomeMandatoryFieldHaveNoSource=いくつかの必須フィールドは、データファイルからのソースがありません
+NowClickToTestTheImport=ファイルのファイル形式（フィールドと文字列の区切り文字）が表示されているオプションと一致していること、およびヘッダー行を省略していることを確認すること。一致していない場合、次のシミュレーションでエラーとしてフラグが付けられる。 <br>「<b>%s</b>」ボタンをクリックして、ファイル構造/コンテンツのチェックを実行し、インポートプロセスをシミュレートする。 <br><b>データベース</b>のデータは変更されない。
+RunSimulateImportFile=インポートシミュレーションを実行する
+FieldNeedSource=このフィールドには、ソースファイルのデータが必要 
+SomeMandatoryFieldHaveNoSource=いくつかの必須フィールドは、データファイルからのソースがない
 InformationOnSourceFile=ソースファイルに関する情報
 InformationOnTargetTables=ターゲットフィールドに関する情報
 SelectAtLeastOneField=エクスポートするフィールドの列に少なくとも1つのソースフィールドを切り替える
-SelectFormat=このインポートファイル形式を選択します。
-RunImportFile=Import Data
-NowClickToRunTheImport=Check the results of the import simulation. Correct any errors and re-test.<br>When the simulation reports no errors you may proceed to import the data into the database.
-DataLoadedWithId=The imported data will have an additional field in each database table with this import id: <b>%s</b>, to allow it to be searchable in the case of investigating a problem related to this import.
-ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
-TooMuchErrors=There are still <b>%s</b> other source lines with errors but output has been limited.
-TooMuchWarnings=There are still <b>%s</b> other source lines with warnings but output has been limited.
-EmptyLine=空行（破棄されます）
-CorrectErrorBeforeRunningImport=You <b>must</b> correct all errors <b>before</b> running the definitive import.
+SelectFormat=このインポートファイル形式を選択する。
+RunImportFile=データのインポート
+NowClickToRunTheImport=インポートシミュレーションの結果を確認すること。エラーを修正して再テストする。 <br>シミュレーションでエラーが報告されない場合は、データベースへのデータのインポートに進むことができる。
+DataLoadedWithId=インポートされたデータには、各データベーステーブルに次のインポートIDの追加フィールドがある：<b> %s </b>このインポートに関連する問題を調査する場合に、データを検索できるようにする。
+ErrorMissingMandatoryValue=フィールド<b>%s</b>のソースファイルの必須データが空 。
+TooMuchErrors=エラーのある<b>%s </b>の他のソース行がまだあるが、出力は制限されている。
+TooMuchWarnings=警告のある他のソース行はまだ<b>%s </b> が、出力は制限されている。
+EmptyLine=空行（破棄される）
+CorrectErrorBeforeRunningImport=<b>は、</b>が最終的なインポートを実行する前に、</b>がすべてのエラー<b>を修正する必要がある。
 FileWasImported=ファイルが数<b>%s</b>でインポートされた。
-YouCanUseImportIdToFindRecord=You can find all the imported records in your database by filtering on field <b>import_key='%s'</b>.
-NbOfLinesOK=エラーや警告なしなしで行数<b>：%s。</b>
-NbOfLinesImported=正常にインポート行数<b>：%s。</b>
-DataComeFromNoWhere=挿入する値は、ソース·ファイル内のどこから来ている。
-DataComeFromFileFieldNb=挿入する値は、ソースファイル内のフィールド番号<b>%s</b>から来ています。
-DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the object <b>%s</b> that has the ref. from source file must exist in the database).
-DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the code from source file must exist in the dictionary <b>%s</b>). Note that if you know the id, you can also use it in the source file instead of the code. Import should work in both cases.
-DataIsInsertedInto=ソースファイルからのデータは、次のフィールドに挿入されます。
-DataIDSourceIsInsertedInto=The id of parent object was found using the data in the source file, will be inserted into the following field:
-DataCodeIDSourceIsInsertedInto=コー​​ドから見つかった親行のIDは、次のフィールドに挿入されます。
-SourceRequired=データ値は必須です。
+YouCanUseImportIdToFindRecord=フィールド<b>import_key = '%s' </b>でフィルタリングすると、データベースにインポートされたすべてのレコードを見つけることができる。
+NbOfLinesOK=エラーなしで警告なしの行数<b>：%s。</b>
+NbOfLinesImported=正常インポートの行数<b>：%s。</b>
+DataComeFromNoWhere=挿入する値は、ソース·ファイル内のどこからも来ていない。
+DataComeFromFileFieldNb=挿入する値は、ソースファイル内のフィールド番号<b>%s</b>から来ている。
+DataComeFromIdFoundFromRef=ソースファイルのフィールド番号<b>%s </b>からの値は、使用する親オブジェクトのIDを見つけるために使用される（したがって、オブジェクト<b> %s </b>がデータベースに存在し、ソースファイルからの参照符号を持つ必要がある）。
+DataComeFromIdFoundFromCodeId=ソースファイルのフィールド番号<b>%s </b>からのコードは、使用する親オブジェクトのIDを見つけるために使用される（したがって、ソースファイルのコードはディクショナリ<b> %s </b> に存在する必要がある）。 IDがわかっている場合、コードの代わりにソースファイルでそれを使用することもできる。インポートはどちらの場合でも機能するはず 。
+DataIsInsertedInto=ソースファイルからのデータは、次のフィールドに挿入される。
+DataIDSourceIsInsertedInto=ソースファイルのデータを使用して親オブジェクトのIDが見つかり、次のフィールドに挿入される。
+DataCodeIDSourceIsInsertedInto=コー​​ドから見つかった親行のIDは、次のフィールドに挿入される。
+SourceRequired=データ値は必須 。
 SourceExample=可能なデータ値の例
-ExampleAnyRefFoundIntoElement=任意のref要素の<b>%s</b>見つかりました
-ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary <b>%s</b>
-CSVFormatDesc=<b>Comma Separated Value</b> file format (.csv).<br>This is a text file format where fields are separated by a separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ].
-Excel95FormatDesc=<b>Excel</b> file format (.xls)<br>This is the native Excel 95 format (BIFF5).
-Excel2007FormatDesc=<b>Excel</b> file format (.xlsx)<br>This is the native Excel 2007 format (SpreadsheetML).
-TsvFormatDesc=<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by a tabulator [tab].
-ExportFieldAutomaticallyAdded=Field <b>%s</b> was automatically added. It will avoid you to have similar lines to be treated as duplicate record (with this field added, all lines will own their own id and will differ).
-CsvOptions=CSV format options
-Separator=Field Separator
-Enclosure=String Delimiter
-SpecialCode=Special code
-ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD: filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD: filters on all previous years/months/days
-ExportNumericFilter=NNNNN filters by one value<br>NNNNN+NNNNN filters over a range of values<br>< NNNNN filters by lower values<br>> NNNNN filters by higher values
-ImportFromLine=Import starting from line number
-EndAtLineNb=End at line number
-ImportFromToLine=Limit range (From - To). Eg. to omit header line(s).
-SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines.<br>If the header lines are NOT omitted, this will result in multiple errors in the Import Simulation.
-KeepEmptyToGoToEndOfFile=Keep this field empty to process all lines to the end of the file.
-SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for an UPDATE import
-UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
-NoUpdateAttempt=No update attempt was performed, only insert
-ImportDataset_user_1=Users (employees or not) and properties
-ComputedField=Computed field
+ExampleAnyRefFoundIntoElement=要素<b>%s</b>で見つかった何らかの参照符号
+ExampleAnyCodeOrIdFoundIntoDictionary=辞書<b>%s </b>で見つかった何らかのコード (またはID)
+CSVFormatDesc= <b>カンマ区切り値</b>ファイル形式（.csv）。 <br>これは、フィールドが区切り文字[%s]で区切られているテキストファイル形式 。フィールドコンテンツ内に区切り文字が見つかった場合、フィールドは丸め文字[%s]で丸められる。丸め文字をエスケープするエスケープ文字は[%s] 。
+Excel95FormatDesc= <b> Excel </b>ファイル形式（.xls）<br>これはネイティブのExcel 95形式（BIFF5） 。
+Excel2007FormatDesc= <b> Excel </b>ファイル形式（.xlsx）<br>これはネイティブのExcel 2007形式（SpreadsheetML） 。
+TsvFormatDesc= <b>タブ区切り値</b>ファイル形式（.tsv）<br>これは、フィールドがタブ文字 [tab] で区切られているテキストファイル形式 。
+ExportFieldAutomaticallyAdded=フィールド<b>%s</b>が自動的に追加された。類似の行を重複レコードとして扱うのを防止するように（このフィールドを付加すると、すべての行が独自のIDを所有し、異なるものとなる）。
+CsvOptions=CSV形式のオプション
+Separator=フィールドセパレータ
+Enclosure=文字列区切り文字
+SpecialCode=特別なコード
+ExportStringFilter=%%では、テキスト内の1つ以上の文字を置き換えることができる
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: 年/月/日でフィルタ<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: 年s/月s/日sの範囲でフィルタ<br> > YYYY, > YYYYMM, > YYYYMMDD: filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD: すべて以前の年s/月s/日sでフィルタ
+ExportNumericFilter=NNNNN は1つの値でフィルタ<br>NNNNN+NNNNN は値sの範囲でフィルタ<br>< NNNNN は、より低い値でフィルタ<br>> NNNNN は、より高い値でフィルタ
+ImportFromLine=行番号からインポート
+EndAtLineNb=行番号で終了
+ImportFromToLine=制限範囲（From-To）。例えば、ヘッダー行(s)を省略する。
+SetThisValueTo2ToExcludeFirstLine=たとえば、この値を3に設定して、最初の2行を除外する。 <br>ヘッダー行が省略されていない場合、インポートシミュレーションで複数のエラーが発生する。
+KeepEmptyToGoToEndOfFile=ファイルの終わりまでのすべての行を処理するには、このフィールドを空のままにする。
+SelectPrimaryColumnsForUpdateAttempt=UPDATEインポートの主キーとして使用する列(s)を選択する
+UpdateNotYetSupportedForThisImport=このタイプのインポートでは更新はサポートされていない（挿入のみ）
+NoUpdateAttempt=更新は実行されず、挿入のみが実行された
+ImportDataset_user_1=ユーザ (従業員であってもなくても) とプロパティ
+ComputedField=計算フィールド
 ## filters
-SelectFilterFields=If you want to filter on some values, just input values here.
-FilteredFields=Filtered fields
-FilteredFieldsValues=Value for filter
-FormatControlRule=Format control rule
+SelectFilterFields=一部の値でフィルタリングする場合は、ここに値を入力するだけ 。
+FilteredFields=フィルタリングされたフィールド
+FilteredFieldsValues=フィルタの値
+FormatControlRule=フォーマット制御ルール
 ## imports updates
-KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
-NbInsert=Number of inserted lines: %s
-NbUpdate=Number of updated lines: %s
-MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+KeysToUseForUpdates=<b>が</b>の既存データを更新するために使用するキー（列）
+NbInsert=挿入された行数：%s
+NbUpdate=更新された行数：%s
+MultipleRecordFoundWithTheseFilters=これらのフィルターで複数のレコードが見つかった：%s
diff --git a/htdocs/langs/ja_JP/ftp.lang b/htdocs/langs/ja_JP/ftp.lang
index 33acf25565a..a95eeb0aa40 100644
--- a/htdocs/langs/ja_JP/ftp.lang
+++ b/htdocs/langs/ja_JP/ftp.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTPクライアントモジュールの設定
-NewFTPClient=新しいFTP接続のセットアップ
-FTPArea=FTPエリア
-FTPAreaDesc=この画面には、FTPサーバビューのコンテンツを表示する
-SetupOfFTPClientModuleNotComplete=FTPクライアントモジュールのセットアップが完了していないと思われる
-FTPFeatureNotSupportedByYourPHP=あなたのPHPは、FTP機能をサポートしていません。
-FailedToConnectToFTPServer=サーバー（サーバー%s、ポート%s）のFTPに接続に失敗しました。
-FailedToConnectToFTPServerWithCredentials=定義されたログイン/パスワードでFTPサーバーにログインに失敗しました
-FTPFailedToRemoveFile=ファイルの<b>%sを</b>削除できませんでした。
-FTPFailedToRemoveDir=（アクセス権を確認し、そのディレクトリが空の）ディレクトリの<b>%sを</b>削除できませんでした。
+FTPClientSetup=FTPまたはSFTPクライアントモジュールの設定
+NewFTPClient=新しいFTP / FTPS接続の設定
+FTPArea=FTP / FTPSエリア
+FTPAreaDesc=この画面には、FTPおよびSFTPサーバのビューが表示される。
+SetupOfFTPClientModuleNotComplete=FTPまたはSFTPクライアントモジュールの設定が不完全なようです
+FTPFeatureNotSupportedByYourPHP=お使いのPHPはFTPまたはSFTP機能をサポートしていない
+FailedToConnectToFTPServer=サーバ（サーバ%s、ポート%s）への接続に失敗した
+FailedToConnectToFTPServerWithCredentials=定義されたログイン/パスワードでサーバにログインできなかった
+FTPFailedToRemoveFile=ファイルの<b>%s</b>を削除できなかった。
+FTPFailedToRemoveDir=ディレクトリ<b>%s </b>の削除に失敗した：権限を確認し、ディレクトリが空であることを確認すること。
 FTPPassiveMode=パッシブモード
-ChooseAFTPEntryIntoMenu=メニューのFTPエントリを選択...
-FailedToGetFile=ファイル%sの取得に失敗しました
+ChooseAFTPEntryIntoMenu=メニューからFTP / SFTPサイトを選択する...
+FailedToGetFile=ファイル%sの取得に失敗した
diff --git a/htdocs/langs/ja_JP/holiday.lang b/htdocs/langs/ja_JP/holiday.lang
index 7a74676c78b..72861294057 100644
--- a/htdocs/langs/ja_JP/holiday.lang
+++ b/htdocs/langs/ja_JP/holiday.lang
@@ -1,134 +1,134 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leave
-CPTitreMenu=Leave
-MenuReportMonth=Monthly statement
-MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leave to view this page.
-AddCP=Make a leave request
+Holidays=有給休暇
+CPTitreMenu=有給休暇
+MenuReportMonth=月次報告
+MenuAddCP=新規休暇申請
+NotActiveModCP=このページを表示するには、モジュールLeaveを有効にする必要がある。
+AddCP=休暇申請をする
 DateDebCP=開始日
 DateFinCP=終了日
 DraftCP=ドラフト
-ToReviewCP=Awaiting approval
-ApprovedCP=承認された
+ToReviewCP=承認待ち
+ApprovedCP=承認済
 CancelCP=キャンセル
 RefuseCP=拒否
-ValidatorCP=Approbator
-ListeCP=List of leave
-Leave=Leave request
-LeaveId=Leave ID
-ReviewedByCP=Will be approved by
-UserID=User ID
-UserForApprovalID=User for approval ID
-UserForApprovalFirstname=First name of approval user
-UserForApprovalLastname=Last name of approval user
-UserForApprovalLogin=Login of approval user
+ValidatorCP=承認者
+ListeCP=休暇のリスト
+Leave=休暇願
+LeaveId=IDを残す
+ReviewedByCP=によって承認される
+UserID=ユーザID
+UserForApprovalID=承認IDのユーザ
+UserForApprovalFirstname=承認ユーザの名
+UserForApprovalLastname=承認ユーザの姓
+UserForApprovalLogin=承認ユーザのログイン
 DescCP=説明
-SendRequestCP=Create leave request
-DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leave
-SoldeCPUser=Leave balance is <b>%s</b> days.
-ErrorEndDateCP=You must select an end date greater than the start date.
-ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the leave request does not exist.
-ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this leave request.
-InfosWorkflowCP=Information Workflow
-RequestByCP=Requested by
-TitreRequestCP=Leave request
-TypeOfLeaveId=Type of leave ID
-TypeOfLeaveCode=Type of leave code
-TypeOfLeaveLabel=Type of leave label
-NbUseDaysCP=Number of days of vacation consumed
-NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
-NbUseDaysCPShort=Days consumed
-NbUseDaysCPShortInMonth=Days consumed in month
-DayIsANonWorkingDay=%s is a non working day
-DateStartInMonth=Start date in month
-DateEndInMonth=End date in month
+SendRequestCP=休暇申請を作成する
+DelayToRequestCP=休暇申請は、少なくとも<b>%s日(s)前に</b>で行う必要がある。
+MenuConfCP=休暇のバランス
+SoldeCPUser=休暇の残は<b>%s</b>日。
+ErrorEndDateCP=開始日よりも大きい終了日を選択する必要がある。
+ErrorSQLCreateCP=作成中にSQLエラーが発生した：
+ErrorIDFicheCP=エラーが発生した。脱退リクエストは存在しない。
+ReturnCP=前のページに戻る
+ErrorUserViewCP=この休暇申請を読むことは許可されていない。
+InfosWorkflowCP=情報ワークフロー
+RequestByCP=に要求された
+TitreRequestCP=休暇願
+TypeOfLeaveId=休暇IDの種類
+TypeOfLeaveCode=休暇コードの種類
+TypeOfLeaveLabel=休暇ラベルの種類
+NbUseDaysCP=消費された休暇の日数
+NbUseDaysCPHelp=計算では、辞書で定義されている営業日と休日が考慮される。
+NbUseDaysCPShort=消費日数
+NbUseDaysCPShortInMonth=月に消費された日数
+DayIsANonWorkingDay=%sは非営業日です
+DateStartInMonth=月の開始日
+DateEndInMonth=月の終了日
 EditCP=編集
-DeleteCP=削除する
-ActionRefuseCP=Refuse
+DeleteCP=削除
+ActionRefuseCP=却下
 ActionCancelCP=キャンセル
 StatutCP=ステータス
-TitleDeleteCP=Delete the leave request
-ConfirmDeleteCP=Confirm the deletion of this leave request?
-ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
-CantCreateCP=You don't have the right to make leave requests.
-InvalidValidatorCP=You must choose an approbator to your leave request.
-NoDateDebut=You must select a start date.
-NoDateFin=You must select an end date.
-ErrorDureeCP=Your leave request does not contain working day.
-TitleValidCP=Approve the leave request
-ConfirmValidCP=Are you sure you want to approve the leave request?
-DateValidCP=Date approved
-TitleToValidCP=Send leave request
-ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the leave request
-ConfirmRefuseCP=Are you sure you want to refuse the leave request?
-NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the leave request
-ConfirmCancelCP=Are you sure you want to cancel the leave request?
-DetailRefusCP=Reason for refusal
-DateRefusCP=Date of refusal
-DateCancelCP=Date of cancellation
-DefineEventUserCP=Assign an exceptional leave for a user
-addEventToUserCP=Assign leave
-NotTheAssignedApprover=You are not the assigned approver
+TitleDeleteCP=休暇申請を削除する
+ConfirmDeleteCP=この休暇申請の削除を確認するか？
+ErrorCantDeleteCP=エラー この休暇申請を削除する権利がない。
+CantCreateCP=休暇申請をする権利がない。
+InvalidValidatorCP=休暇申請の承認者を選択する必要がある。
+NoDateDebut=開始日を選択する必要がある。
+NoDateFin=終了日を選択する必要がある。
+ErrorDureeCP=休暇申請には就業日が含まれていない。
+TitleValidCP=休暇申請を承認する
+ConfirmValidCP=休暇申請を承認してもよいか？
+DateValidCP=承認日
+TitleToValidCP=休暇申請を送信する
+ConfirmToValidCP=休暇申請を送信してもよいか？
+TitleRefuseCP=休暇申請を拒否する
+ConfirmRefuseCP=休暇申請を拒否してもよいか？
+NoMotifRefuseCP=リクエストを拒否する理由を選択する必要がある。
+TitleCancelCP=休暇申請をキャンセルする
+ConfirmCancelCP=休暇申請をキャンセルしてもよいか？
+DetailRefusCP=拒否の理由
+DateRefusCP=拒否日
+DateCancelCP=キャンセル日
+DefineEventUserCP=ユーザに例外的な休暇を割り当てる
+addEventToUserCP=休暇を割り当てる
+NotTheAssignedApprover=あなたは割り当てられた承認者ではない
 MotifCP=理由
-UserCP=ユーザー
-ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
-AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View change logs
-LogCP=Log of updates of available vacation days
-ActionByCP=Performed by
-UserUpdateCP=For the user
-PrevSoldeCP=Previous Balance
-NewSoldeCP=New Balance
-alreadyCPexist=A leave request has already been done on this period.
-FirstDayOfHoliday=First day of vacation
-LastDayOfHoliday=Last day of vacation
-BoxTitleLastLeaveRequests=Latest %s modified leave requests
-HolidaysMonthlyUpdate=Monthly update
-ManualUpdate=Manual update
-HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee last name
-EmployeeFirstname=Employee first name
-TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
-LastHolidays=Latest %s leave requests
-AllHolidays=All leave requests
-HalfDay=Half day
-NotTheAssignedApprover=You are not the assigned approver
-LEAVE_PAID=Paid vacation
-LEAVE_SICK=Sick leave
-LEAVE_OTHER=Other leave
-LEAVE_PAID_FR=Paid vacation
+UserCP=ユーザ
+ErrorAddEventToUserCP=例外休暇の追加中にエラーが発生した。
+AddEventToUserOkCP=特別休暇の追加が完了した。
+MenuLogCP=変更ログを表示する
+LogCP=利用可能な休暇日の更新のログ
+ActionByCP=によって演奏された
+UserUpdateCP=ユーザ向け
+PrevSoldeCP=以前のバランス
+NewSoldeCP=ニューバランス
+alreadyCPexist=この期間はすでに休暇申請が行われている。
+FirstDayOfHoliday=休暇の初日
+LastDayOfHoliday=休暇の最終日
+BoxTitleLastLeaveRequests=最新の%s変更された休暇申請
+HolidaysMonthlyUpdate=毎月の更新
+ManualUpdate=手動更新
+HolidaysCancelation=リクエストのキャンセルを残す
+EmployeeLastname=従業員の姓
+EmployeeFirstname=従業員の名
+TypeWasDisabledOrRemoved=休暇タイプ（id %s）が無効化または削除された
+LastHolidays=最新の%s休暇申請
+AllHolidays=すべての休暇申請
+HalfDay=半日
+NotTheAssignedApprover=あなたは割り当てられた承認者ではない
+LEAVE_PAID=有給休暇
+LEAVE_SICK=病気休暇
+LEAVE_OTHER=その他の休暇
+LEAVE_PAID_FR=有給休暇
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leave allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
-UpdateConfCPOK=Updated successfully.
-Module27130Name= Management of leave requests
-Module27130Desc= Management of leave requests
-ErrorMailNotSend=An error occurred while sending email:
-NoticePeriod=Notice period
+LastUpdateCP=休暇割り当ての最新の自動更新
+MonthOfLastMonthlyUpdate=休暇割り当ての最新の自動更新の月
+UpdateConfCPOK=更新成功。
+Module27130Name= 休暇申請の管理
+Module27130Desc= 休暇申請の管理
+ErrorMailNotSend=メールの送信中にエラーが発生した：
+NoticePeriod=通知期間
 #Messages
-HolidaysToValidate=Validate leave requests
-HolidaysToValidateBody=Below is a leave request to validate
-HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
-HolidaysValidated=Validated leave requests
-HolidaysValidatedBody=Your leave request for %s to %s has been validated.
-HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
-HolidaysCanceled=Canceled leaved request
-HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
-NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
-HolidaySetup=Setup of module Holiday
-HolidaysNumberingModules=Leave requests numbering models
-TemplatePDFHolidays=Template for leave requests PDF
-FreeLegalTextOnHolidays=Free text on PDF
-WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
-HolidaysToApprove=Holidays to approve
-NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
+HolidaysToValidate=休暇申請を検証する
+HolidaysToValidateBody=以下は検証するための休暇申請です
+HolidaysToValidateDelay=この休暇申請は、%s日未満の期間内に行われる。
+HolidaysToValidateAlertSolde=この休暇申請を行ったユーザには、十分な利用可能日がない。
+HolidaysValidated=検証済みの休暇申請
+HolidaysValidatedBody=%sから%sへの休暇申請が検証された。
+HolidaysRefused=要求は拒否された
+HolidaysRefusedBody=%sから%sへの休暇申請は、次の理由で拒否された。
+HolidaysCanceled=取り消されたリクエスト
+HolidaysCanceledBody=%sから%sへの休暇申請はキャンセルされた。
+FollowedByACounter=1：このタイプの休暇にはカウンタの追随が必要。カウンタは手動または自動でインクリメントされ、休暇要求が検証されると、カウンタはデクリメントされる。 <br> 0：カウンタに追随していない。
+NoLeaveWithCounterDefined=カウンタが続く必要がある定義された休暇タイプはない
+GoIntoDictionaryHolidayTypes=<strong>ホーム-設定-辞書-休暇の種類</strong>に移動して、さまざまな種類の葉を設定する。
+HolidaySetup=モジュールHolidayのセットアップ
+HolidaysNumberingModules=モデルに番号を付けるリクエストを残す
+TemplatePDFHolidays=休暇申請用テンプレートPDF
+FreeLegalTextOnHolidays=PDFのフリーテキスト
+WatermarkOnDraftHolidayCards=ドラフト休暇リクエストの透かし
+HolidaysToApprove=承認する休日
+NobodyHasPermissionToValidateHolidays=休日の検証権限を持つ者がいない
diff --git a/htdocs/langs/ja_JP/hrm.lang b/htdocs/langs/ja_JP/hrm.lang
index e7cd1a4f1b8..4b9b1edd9d3 100644
--- a/htdocs/langs/ja_JP/hrm.lang
+++ b/htdocs/langs/ja_JP/hrm.lang
@@ -3,16 +3,17 @@
 HRM_EMAIL_EXTERNAL_SERVICE=HRM外部サービスを防止するためのメール
 Establishments=事業所
 Establishment=事業所
-NewEstablishment=新しい事業所
+NewEstablishment=新規事業所
 DeleteEstablishment=事業所を削除
-ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
+ConfirmDeleteEstablishment=この事業所を削除したいのね、いいよね？
 OpenEtablishment=事業所を開く
 CloseEtablishment=事業所を閉じる
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
-DictionaryDepartment=HRM - 部門リスト
-DictionaryFunction=HRM - Job positions
+DictionaryPublicHolidays=HRM - 祝祭日
+DictionaryDepartment=HRM - 部門一覧
+DictionaryFunction=HRM - 職位
 # Module
-Employees=従業員
+Employees=従業員s
 Employee=従業員
-NewEmployee=新しい従業員
+NewEmployee=新規従業員
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/ja_JP/install.lang b/htdocs/langs/ja_JP/install.lang
index be5c44a6066..72525b888a8 100644
--- a/htdocs/langs/ja_JP/install.lang
+++ b/htdocs/langs/ja_JP/install.lang
@@ -1,46 +1,40 @@
 # Dolibarr language file - Source file is en_US - install
-InstallEasy=ちょうどステップごとの手順のステップに従ってください。
+InstallEasy=ちょうどステップごとの手順のステップに従うこと。
 MiscellaneousChecks=前提条件チェック
-ConfFileExists=コンフィギュレーションファイル<b>%sが</b>存在し<b>ています</b> 。
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
-ConfFileCouldBeCreated=設定ファイルの<b>%sを</b>作成することができます。
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
-ConfFileIsWritable=コンフィギュレーションファイルの<b>%sは</b>書き込み可能です。
-ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=このPHPは、セッションをサポートしています。
-PHPSupportPOSTGETOk=このPHPは、変数はPOSTとGETをサポートしています。
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
-PHPSupport=This PHP supports %s functions.
-PHPMemoryOK=あなたのPHPの最大のセッションメモリは<b>%s</b>に設定されています。これは十分なはずです。
-PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
-Recheck=Click here for a more detailed test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
-ErrorPHPDoesNotSupportCurl=お使いのPHPインストールはCurlをサポートしていません。
-ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
-ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
-ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
-ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
+ConfFileExists=コンフィギュレーションファイル<b>%sが</b>存在し<b>ている</b> 。
+ConfFileDoesNotExistsAndCouldNotBeCreated=構成ファイル<b>%s </b>が存在せず、作成できなかった。
+ConfFileCouldBeCreated=設定ファイルの<b>%sを</b>作成できる。
+ConfFileIsNotWritable=構成ファイル<b>%s</b>は書き込み可能ではありません。権限を確認すること。最初のインストールでは、Webサーバーが構成プロセス中にこのファイルに書き込める必要がある（たとえば、OSのようなUnixでは「chmod666」）。
+ConfFileIsWritable=コンフィギュレーションファイルの<b>%sは</b>書き込み可能。
+ConfFileMustBeAFileNotADir=構成ファイル<b>%s </b>は、ディレクトリーではなくファイルでなければならない。
+ConfFileReload=構成ファイルからパラメーターを再ロードする。
+PHPSupportPOSTGETOk=このPHPは、変数POSTとGETをサポートする。
+PHPSupportPOSTGETKo=PHP設定が変数POSTやGETをサポートしない可能性がある。 php.iniのパラメーター<b>variables_order</b>を確認すること。
+PHPSupportSessions=このPHPは、セッションをサポートする。
+PHPSupport=このPHPは%s関数をサポートする。
+PHPMemoryOK=あなたのPHPの最大のセッションメモリは<b>%s</b>に設定されている。これは十分なはずだ。
+PHPMemoryTooLow=PHPの最大セッションメモリは<b>%s</b>バイトに設定されている。これは低すぎる。 <b> php.ini </b>を変更して、<b> memory_limit</b>パラメーターを少なくとも<b>%s</b>バイトに設定する。
+Recheck=より詳細なテストについては、ここをクリックすること
+ErrorPHPDoesNotSupportSessions=PHPインストールはセッションをサポートしない。この機能は、Dolibarrを機能させるために必要。 PHPの設定とセッションディレクトリの権限を確認すること。
+ErrorPHPDoesNotSupportGD=PHPインストールは、GDグラフィカル関数をサポートしない。グラフは利用できない。
+ErrorPHPDoesNotSupportCurl=お使いのPHPインストールはCurlをサポートしない。
+ErrorPHPDoesNotSupportCalendar=PHPインストールは、phpカレンダー拡張機能をサポートしない。
+ErrorPHPDoesNotSupportUTF8=PHPインストールはUTF8関数をサポートしない。 Dolibarrは正しく機能しない。 Dolibarrをインストールする前にこれを解決すること。
+ErrorPHPDoesNotSupportIntl=PHPインストールはIntl関数をサポートしない。
+ErrorPHPDoesNotSupportxDebug=PHPインストールは、拡張デバッグ機能をサポートしない。
+ErrorPHPDoesNotSupport=PHPインストールは、%s関数をサポートしない。
 ErrorDirDoesNotExists=ディレクトリの%sが存在しません。
-ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
-ErrorWrongValueForParameter=あなたは、パラメータ  %s 間違った値を入力した可能性があります。
-ErrorFailedToCreateDatabase=データベース %s を作成できませんでした。
-ErrorFailedToConnectToDatabase=データベース %s への接続に失敗しました。
-ErrorDatabaseVersionTooLow=データベースのバージョン (%s) が古すぎます。 バージョン %s 以降が必要です。
-ErrorPHPVersionTooLow=あまりにも古いPHPバージョン。バージョン%sが必要です。
-ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
-ErrorDatabaseAlreadyExists=データベース %s は既に存在します。
-IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
-IfDatabaseExistsGoBackAndCheckCreate=データベースが既に存在する場合は、戻ってチェックを外してオプションの &quot;データベースの作成&quot;を参照してください。
-WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
+ErrorGoBackAndCorrectParameters=戻ってパラメータを確認/修正すること。
+ErrorWrongValueForParameter=あなたは、パラメータ '%s' に間違った値を入力した可能性がある。
+ErrorFailedToCreateDatabase=データベース %s を作成できなかった。
+ErrorFailedToConnectToDatabase=データベース %s への接続に失敗した。
+ErrorDatabaseVersionTooLow=データベースのバージョン (%s) が古すぎる。 バージョン %s 以降が必要。
+ErrorPHPVersionTooLow=あまりにも古いPHPバージョン。バージョン%sが必要。
+ErrorConnectedButDatabaseNotFound=サーバーへの接続は成功したが、データベース '%s'が見つかりません。
+ErrorDatabaseAlreadyExists=データベース %s は既に存在する。
+IfDatabaseNotExistsGoBackAndUncheckCreate=データベースが存在しない場合は、戻って "データベースの作成" オプションをオンにする。
+IfDatabaseExistsGoBackAndCheckCreate=データベースが既に存在する場合は、戻ってチェックを外してオプションの "データベースの作成" を参照すること。
+WarningBrowserTooOld=ブラウザのバージョンが古すぎる。ブラウザをFirefox、Chrome、またはOperaの最新バージョンにアップグレードすることを強くお勧めする。
 PHPVersion=PHPのバージョン
 License=ライセンスを使用して
 ConfigurationFile=設定ファイル
@@ -48,28 +42,28 @@ WebPagesDirectory=ウェブページが保存されているディレクトリ
 DocumentsDirectory=アップロードし、生成されたドキュメントを格納するディレクトリ
 URLRoot=URLのルート
 ForceHttps=力安全な接続（HTTPS）
-CheckToForceHttps=セキュアな接続（https）を強制的にこのオプションをチェックしてください。 <br>これは、WebサーバがSSL証明書を使用して構成されている必要があります。
+CheckToForceHttps=セキュアな接続（https）を強制的にこのオプションをチェックすること。 <br>これは、WebサーバがSSL証明書を使用して構成されている必要がある。
 DolibarrDatabase=Dolibarrデータベース
-DatabaseType=データベースの種類
-DriverType=ドライバのタイプ
-Server=サーバーの
-ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
-ServerPortDescription=データベース·サーバーのポート。不明の場合は、空の保管してください。
+DatabaseType=データベース種別
+DriverType=ドライバ種別
+Server=サーバー
+ServerAddressDescription=データベースサーバーの名前またはIP住所。データベースサーバーがWebサーバーと同じサーバーでホストされている場合、通常は「localhost」。
+ServerPortDescription=データベース·サーバーのポート。不明の場合は、空の保管すること。
 DatabaseServer=データベース·サーバー
 DatabaseName=データベース名
-DatabasePrefix=Database table prefix
-DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
-AdminLogin=User account for the Dolibarr database owner.
-PasswordAgain=Retype password confirmation
+DatabasePrefix=データベーステーブルプレフィックス
+DatabasePrefixDescription=データベーステーブルプレフィックス。空の場合、デフォルトはllx_。
+AdminLogin=Dolibarrデータベース所有者のユーザアカウント。
+PasswordAgain=パスワード確認の再入力
 AdminPassword=Dolibarrデータベースの所有者のパスワード。
-CreateDatabase=データベースを作成します。
-CreateUser=Create user account or grant user account permission on the Dolibarr database
-DatabaseSuperUserAccess=データベースサーバ - スーパーユーザーのアクセス
-CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
-CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
-DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
-KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
-SaveConfigurationFile=Saving parameters to
+CreateDatabase=データベースを作成する。
+CreateUser=Dolibarrデータベースでユーザアカウントを作成するか、ユーザアカウントのアクセス許可を付与する
+DatabaseSuperUserAccess=データベースサーバ - スーパーユーザのアクセス
+CheckToCreateDatabase=データベースがまだ存在しないため、作成する必要がある場合は、チェックボックスをオンにする。 <br>この場合、このページの下部にスーパーユーザアカウントのユーザ名とパスワードも入力する必要がある。
+CheckToCreateUser=次の場合にチェックボックスをオンにする。<br>データベースユーザアカウントがまだ存在しないため作成する必要がある場合、またはユーザアカウントは存在するがデータベースが存在せず、アクセス許可を付与する必要がある場合は<br>。 <br>この場合、このページの下部にユーザアカウントとパスワードを入力する必要があり、<b>も</b>スーパーユーザアカウント名とパスワードを入力する必要がある。このボックスがオフの場合、データベースの所有者とパスワードがすでに存在する必要がある。
+DatabaseRootLoginDescription=スーパーユーザアカウント名（新しいデータベースまたは新しいユーザを作成するため）。データベースまたはその所有者がまだ存在しない場合は必須。
+KeepEmptyIfNoPassword=スーパーユーザにパスワードがない場合は空のままにする（非推奨）
+SaveConfigurationFile=パラメータをに保存する
 ServerConnection=サーバーへの接続
 DatabaseCreation=データベースの作成
 CreateDatabaseObjects=データベースオブジェクトの作成
@@ -80,114 +74,114 @@ CreateOtherKeysForTable=テーブルの%sの外部キーとインデックスを
 OtherKeysCreation=外部キーとインデックスの作成
 FunctionsCreation=関数の作成
 AdminAccountCreation=管理者ログインの作成
-PleaseTypePassword=Please type a password, empty passwords are not allowed!
-PleaseTypeALogin=Please type a login!
-PasswordsMismatch=Passwords differs, please try again!
-SetupEnd=セットアップの終了
-SystemIsInstalled=このインストールは完了です。
-SystemIsUpgraded=Dolibarrが正常にアップグレードされています。
-YouNeedToPersonalizeSetup=あなたのニーズに合わせてDolibarrを設定する必要があります（外観、機能、...).これを行うには、下記のリンクをクリックしてください。
-AdminLoginCreatedSuccessfuly=Dolibarr 管理者ログイン '<b>%s</b>' の作成が成功しました。
+PleaseTypePassword=パスワードを入力すること。空のパスワードは使用できない。
+PleaseTypeALogin=ログインを入力すること！
+PasswordsMismatch=パスワードが異なる。もう一度お試しください。
+SetupEnd=設定の終了
+SystemIsInstalled=このインストールは満了。
+SystemIsUpgraded=Dolibarrが正常にアップグレードされている。
+YouNeedToPersonalizeSetup=あなたのニーズに合わせてDolibarrを設定する必要がある（外観、機能、...).これを行うには、下記のリンクをクリックすること。
+AdminLoginCreatedSuccessfuly=Dolibarr 管理者ログイン '<b>%s</b>' の作成が成功した。
 GoToDolibarr=Dolibarrに行く
-GoToSetupArea=Dolibarr（セットアップの領域）に移動します
-MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
-GoToUpgradePage=ページを再度アップグレードする行く
-WithNoSlashAtTheEnd=末尾のスラッシュ&quot;/&quot;なし
-DirectoryRecommendation=<span class="warning">IMPORTANT</span>: You must use a directory that is outside of the web pages (so do not use a subdirectory of previous parameter).
-LoginAlreadyExists=すでに存在しています
+GoToSetupArea=Dolibarr（設定の領域）に移動する
+MigrationNotFinished=データベースのバージョンが完全に最新ではありません。アップグレードプロセスを再実行すること。
+GoToUpgradePage=アップグレードページへ再度行く
+WithNoSlashAtTheEnd=末尾のスラッシュ"/"なし
+DirectoryRecommendation= <span class="warning">重要</span>：Webページの外部にあるディレクトリを使用する必要がある（したがって、前のパラメータのサブディレクトリは使用しないこと）。
+LoginAlreadyExists=すでに存在する
 DolibarrAdminLogin=Dolibarr adminログイン
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
-FailedToCreateAdminLogin=Dolibarr管理者アカウントの作成に失敗しました。
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
-FunctionNotAvailableInThisPHP=Not available in this PHP
-ChoosedMigrateScript=移行スクリプトを選択します。
-DataMigration=Database migration (data)
-DatabaseMigration=Database migration (structure + some data)
+AdminLoginAlreadyExists=Dolibarr管理者アカウント '<b> %s</b>'は既に存在する。別のものを作成したい場合は戻ってください。
+FailedToCreateAdminLogin=Dolibarr管理者アカウントの作成に失敗した。
+WarningRemoveInstallDir=警告、セキュリティ上の理由から、インストールまたはアップグレードが完了したら、インストールツールの偶発的/悪用を防ぐために、<b> install.lock</b>というファイルをDolibarrドキュメントディレクトリに追加する必要がある。
+FunctionNotAvailableInThisPHP=このPHPでは使用できない
+ChoosedMigrateScript=移行スクリプトを選択する。
+DataMigration=データベースの移行（データ）
+DatabaseMigration=データベースの移行（構造+一部のデータ）
 ProcessMigrateScript=スクリプト処理
-ChooseYourSetupMode=セットアップモードを選択し、&quot;スタート&quot;をクリック...
+ChooseYourSetupMode=設定モードを選択し、"スタート"をクリック...
 FreshInstall=新規インストール
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
+FreshInstallDesc=これが初めてのインストールである場合は、このモードを使用すること。そうでない場合、このモードは不完全な以前のインストールを修復できる。バージョンをアップグレードする場合は、「アップグレード」モードを選択すること。
 Upgrade=アップグレード
-UpgradeDesc=あなたが新しいバージョンのファイルが古いDolibarrファイルを交換した場合、このモードを使用します。これにより、データベースとデータをアップグレードします。
+UpgradeDesc=あなたが新しいバージョンのファイルが古いDolibarrファイルを交換した場合、このモードを使用する。これにより、データベースとデータをアップグレードする。
 Start=開始
-InstallNotAllowed=セットアップでは<b>、conf.php</b>の権限で許可されていない
-YouMustCreateWithPermission=あなたは、ファイル%sを作成し、インストールプロセス中にWebサーバのためにそれへの書き込み権限を設定する必要があります。
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
-AlreadyDone=既に移行
+InstallNotAllowed=設定では<b>、conf.php</b>の権限で許可されていない
+YouMustCreateWithPermission=あなたは、ファイル%sを作成し、インストールプロセス中にWebサーバのためにそれへの書き込み権限を設定する必要がある。
+CorrectProblemAndReloadPage=問題を修正し、F5キーを押してページをリロードすること。
+AlreadyDone=既に移行済
 DatabaseVersion=データベースのバージョン
 ServerVersion=データベースサーバのバージョン
-YouMustCreateItAndAllowServerToWrite=このディレクトリを作成し、そこに書き込むようにWebサーバを許可する必要があります。
+YouMustCreateItAndAllowServerToWrite=このディレクトリを作成し、そこに書き込むようにWebサーバを許可する必要がある。
 DBSortingCollation=文字のソート順
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=データベース <b>%s</b>の作成を選択したが、このために、Dolibarrはサーバー <b>%s</b>  にスーパーユーザー<b>%s</b> 権限で接続する必要がある。
+YouAskLoginCreationSoDolibarrNeedToConnect=データベースユーザ  <b>%s</b> の作成を選択したが、このために、Dolibarrはサーバー <b>%s</b> にスーパーユーザー  <b>%s</b> 権限で接続する必要がある。
+BecauseConnectionFailedParametersMayBeWrong=データベース接続に失敗した。ホストまたはスーパーユーザのパラメーターが間違っている必要がある。
 OrphelinsPaymentsDetectedByMethod=メソッド%sによって検出された孤児の支払い
-RemoveItManuallyAndPressF5ToContinue=手動で削除して続行するF5キーを押します。
-FieldRenamed=フィールドの名前変更
-IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
+RemoveItManuallyAndPressF5ToContinue=手動で削除してF5を押して続行。
+FieldRenamed=フィールド名称変更済
+IfLoginDoesNotExistsCheckCreateUser=ユーザがまだ存在しない場合は、 "ユーザの作成" オプションをオンにする必要がある
+ErrorConnection=サーバ "<b>%s</b>"、データベース名 "<b>%s</b>"、ログイン "<b>%s</b>"、またはデータベースパスワードが違う、またはPHPクライアントバージョンがデータベースバージョンのに対して古すぎる。
 InstallChoiceRecommanded=あなたの現在のバージョンの<b>%s</b>からバージョン<b>%sを</b>インストールすることをお勧め選択肢
-InstallChoiceSuggested=<b>インストーラによって提案された選択肢をインストールします</b> 。
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
-CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
-IfAlreadyExistsCheckOption=この名前が正しいこと、およびそのデータベースがまだ存在しない場合は、オプションの&quot;データベースの作成&quot;をチェックする必要があります。
+InstallChoiceSuggested=<b>インストーラによって提案されたインストール選択肢</b> 。
+MigrateIsDoneStepByStep=ターゲットバージョン（%s）には、いくつかのバージョンのギャップがある。これが完了すると、インストールウィザードが戻ってきて、さらに移行することを提案する。
+CheckThatDatabasenameIsCorrect=データベース名「<b>%s</b>」が正しいことを確認すること。
+IfAlreadyExistsCheckOption=この名前が正しいこと、およびそのデータベースがまだ存在しない場合は、オプションの"データベースの作成"をチェックする必要がある。
 OpenBaseDir=PHP openbasedirパラメータ
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
-NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
-MigrationCustomerOrderShipping=Migrate shipping for sales orders storage
-MigrationShippingDelivery=輸送の容量をアップグレード
-MigrationShippingDelivery2=海運2の容量をアップグレード
-MigrationFinished=マイグレーションが終了しました
-LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
+YouAskToCreateDatabaseSoRootRequired=「データベースの作成」ボックスをチェックした。このためには、スーパーユーザのログイン/パスワードを入力する必要がある（フォームの下部）。
+YouAskToCreateDatabaseUserSoRootRequired= "データベース所有者を作成する" チェックボックスをオンにした。このためには、スーパーユーザのログイン/パスワードを入力する必要がある（フォームの下部）。
+NextStepMightLastALongTime=現在のステップには数分かかる場合がある。次の画面が完全に表示されるまで待ってから続行すること。
+MigrationCustomerOrderShipping=販売受注保管庫のための出荷を移行
+MigrationShippingDelivery=出荷の保管庫をアップグレード
+MigrationShippingDelivery2=出荷 2 の保管庫をアップグレード
+MigrationFinished=マイグレーションが終了した
+LastStepDesc= <strong>最後のステップ</strong>：Dolibarrへの接続に使用するログインとパスワードをここで定義する。 <b>他のすべての/追加のユーザアカウントを管理するためのマスターアカウントであるため、これをなくさないでください。 </b>
 ActivateModule=モジュール%sをアクティブにする
-ShowEditTechnicalParameters=高度なパラメータを表示/編集するには、ここをクリックしてください (エキスパートモード)
-WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
-KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
-KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
-UpgradeExternalModule=Run dedicated upgrade process of external module
-SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
-NothingToDelete=Nothing to clean/delete
-NothingToDo=Nothing to do
+ShowEditTechnicalParameters=高度なパラメータを表示/編集するには、ここをクリックすること (エキスパートモード)
+WarningUpgrade=警告：\n最初にデータベースバックアップを実行したか？\nこれを強くお勧めする。このプロセス中にデータが失われる可能性があるため（たとえば、mysqlバージョン5.5.40 / 41/42/43のバグが原因）、移行を開始する前にデータベースの完全なダンプを取得することが不可欠。\n\n "OK" をクリックして移行プロセスを開始する...
+ErrorDatabaseVersionForbiddenForMigration=データベースのバージョンは%s。重大なバグがあり、移行プロセスで必要になるなど、データベースに構造的な変更を加えるとデータが失われる可能性がある。彼の理由により、データベースをレイヤー（パッチ）バージョンにアップグレードするまで移行は許可されません（既知のバグのあるバージョンのリスト：%s）
+KeepDefaultValuesWamp=DoliWampのDolibarr設定ウィザードを使用したため、ここで提案されている値はすでに最適化されている。自分が何をするのかがわかっている場合にのみ、それらを変更すること。
+KeepDefaultValuesDeb=Linuxパッケージ（Ubuntu、Debian、Fedora ...）のDolibarr設定ウィザードを使用したため、ここで提案する値はすでに最適化されている。作成するデータベース所有者のパスワードのみを入力する必要がある。自分が何をするかがわかっている場合にのみ、他のパラメータを変更すること。
+KeepDefaultValuesMamp=DoliMampのDolibarr設定ウィザードを使用したため、ここで提案されている値はすでに最適化されている。自分が何をするのかがわかっている場合にのみ、それらを変更すること。
+KeepDefaultValuesProxmox=Proxmox仮想アプライアンスからDolibarr設定ウィザードを使用したため、ここで提案されている値はすでに最適化されている。自分が何をするのかがわかっている場合にのみ、それらを変更すること。
+UpgradeExternalModule=外部モジュールの専用アップグレードプロセスを実行する
+SetAtLeastOneOptionAsUrlParameter=URLのパラメータとして少なくとも1つのオプションを設定する。例： '... repair.php？standard = Confirmed'
+NothingToDelete=クリーン/削除するものはありません
+NothingToDo=何もしません
 #########
 # upgrade
 MigrationFixData=非正規化データを修正
 MigrationOrder=顧客の注文のためのデータ移行
-MigrationSupplierOrder=Data migration for vendor's orders
+MigrationSupplierOrder=ベンダーの注文のためのデータ移行
 MigrationProposal=商用の提案のためのデータ移行
 MigrationInvoice=顧客の請求書のデータ移行
 MigrationContract=契約のためのデータ移行
 MigrationSuccessfullUpdate=成功したアップグレード
 MigrationUpdateFailed=失敗したアップグレード·プロセス
-MigrationRelationshipTables=関係テーブルのデータ移行（%s）
+MigrationRelationshipTables=関係テーブル (%s) のデータ移行
 MigrationPaymentsUpdate=支払データ補正
 MigrationPaymentsNumberToUpdate=更新する%s支払い（秒）
 MigrationProcessPaymentUpdate=更新の支払い（秒）%s
-MigrationPaymentsNothingToUpdate=行うにこれ以上のもの
+MigrationPaymentsNothingToUpdate=これ以上実行すべきことはない
 MigrationPaymentsNothingUpdatable=訂正することができるこれ以上の支払いなし
 MigrationContractsUpdate=契約データの補正
 MigrationContractsNumberToUpdate=更新する%s契約（複数可）
-MigrationContractsLineCreation=契約のref %sの契約回線を作成します。
-MigrationContractsNothingToUpdate=行うにこれ以上のもの
-MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
+MigrationContractsLineCreation=契約のref %sの契約回線を作成する。
+MigrationContractsNothingToUpdate=これ以上実行すべきことsはない
+MigrationContractsFieldDontExist=フィールドfk_factureはもう存在しません。何もすることはありません。
 MigrationContractsEmptyDatesUpdate=契約空の日付の訂正
-MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=契約の空の日付の修正が正常に実行された
 MigrationContractsEmptyDatesNothingToUpdate=修正する契約空の日ない
-MigrationContractsEmptyCreationDatesNothingToUpdate=修正するためには契約の作成日付ません
+MigrationContractsEmptyCreationDatesNothingToUpdate=修正する契約作成日はない
 MigrationContractsInvalidDatesUpdate=不正な値の日付の契約補正
 MigrationContractsInvalidDateFix=正しい契約%s（契約日= %sの開始、サービス日分= %s）
 MigrationContractsInvalidDatesNumber=%s契約が変更された
 MigrationContractsInvalidDatesNothingToUpdate=修正するために不正な値を持つ日付なし
 MigrationContractsIncoherentCreationDateUpdate=不正な値契約の作成日付補正
-MigrationContractsIncoherentCreationDateUpdateSuccess=正しくない契約作成日の修正が正常に完了しました
-MigrationContractsIncoherentCreationDateNothingToUpdate=修正するには、契約の作成日には悪い値が設定されていません
+MigrationContractsIncoherentCreationDateUpdateSuccess=正しくない契約作成日の修正が正常に完了した
+MigrationContractsIncoherentCreationDateNothingToUpdate=修正するには、契約の作成日には悪い値が設定されていない
 MigrationReopeningContracts=エラーで閉じて開いている契約
-MigrationReopenThisContract=契約%sを再度開きます
+MigrationReopenThisContract=契約%sを再度開く
 MigrationReopenedContractsNumber=%s契約の変更
-MigrationReopeningContractsNothingToUpdate=開くにはない、クローズ契約なし
+MigrationReopeningContractsNothingToUpdate=開ける終結契約はない
 MigrationBankTransfertsUpdate=銀行取引と銀行振込との間のリンクを更新
 MigrationBankTransfertsNothingToUpdate=すべてのリンクが最新のものである
 MigrationShipmentOrderMatching=Sendings領収書の更新
@@ -195,29 +189,29 @@ MigrationDeliveryOrderMatching=配信確認メッセージの更新
 MigrationDeliveryDetail=配信のアップデート
 MigrationStockDetail=製品の在庫の値を更新
 MigrationMenusDetail=動的メニューのテーブルを更新
-MigrationDeliveryAddress=出荷の配信アドレスを更新
-MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
+MigrationDeliveryAddress=出荷の配送先住所を更新
+MigrationProjectTaskActors=テーブルllx_projet_task_actorsのデータ移行
 MigrationProjectUserResp=llx_projetのデータマイグレーション分野fk_user_resp llx_element_contactへ
 MigrationProjectTaskTime=更新時間は秒単位で過ごした
 MigrationActioncommElement=アクション上でデータを更新する
-MigrationPaymentMode=Data migration for payment type
+MigrationPaymentMode=支払い種別のデータ移行
 MigrationCategorieAssociation=カテゴリの移行
-MigrationEvents=Migration of events to add event owner into assignment table
-MigrationEventsContact=Migration of events to add event contact into assignment table
+MigrationEvents=イベントの所有者を割り当てテーブルに追加するためのイベントの移行
+MigrationEventsContact=イベントの連絡先を割り当てテーブルに追加するためのイベントの移行
 MigrationRemiseEntity=llx_societe_remise のエンティティフィールド値を更新
 MigrationRemiseExceptEntity=llx_societe_remise_except のエンティティフィールド値を更新
-MigrationUserRightsEntity=Update entity field value of llx_user_rights
-MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
-MigrationUserPhotoPath=Migration of photo paths for users
-MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
+MigrationUserRightsEntity=llx_user_rightsのエンティティフィールド値を更新する
+MigrationUserGroupRightsEntity=llx_usergroup_rightsのエンティティフィールド値を更新する
+MigrationUserPhotoPath=ユーザの写真パスの移行
+MigrationFieldsSocialNetworks=ユーザフィールドソーシャルネットワークの移行（%s）
 MigrationReloadModule=モジュール %s を再読み込み
-MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Show unavailable options
-HideNotAvailableOptions=Hide unavailable options
-ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
-YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
-ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=If an upgrade is in progress, please wait. If not, click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
-Loaded=Loaded
-FunctionTest=Function test
+MigrationResetBlockedLog=v7アルゴリズムのモジュールBlockedLogをリセット
+ShowNotAvailableOptions=利用できないオプションを表示する
+HideNotAvailableOptions=利用できないオプションを非表示にする
+ErrorFoundDuringMigration=移行プロセス中にエラーが報告されたため、次のステップは利用できない。エラーを無視するには、<a href="%s">ここをクリック</a>できるが、エラーが解決されるまで、アプリケーションまたは一部の機能が正しく動作しない場合がある。
+YouTryInstallDisabledByDirLock=アプリケーションは自己アップグレードを試みたが、インストール/アップグレードページはセキュリティのために無効になっている（ディレクトリの名前が.lockサフィックスに変更された）。 <br>
+YouTryInstallDisabledByFileLock=アプリケーションは自己アップグレードを試みたが、インストール/アップグレードページはセキュリティのために無効になっている（dolibarrドキュメントディレクトリにロックファイル<strong> install.lock </strong>が存在するため）。 <br>
+ClickHereToGoToApp=アプリケーションに移動するには、ここをクリックすること
+ClickOnLinkOrRemoveManualy=アップグレードが進行中の場合は、しばらく待つこと。そうでない場合は、次のリンクをクリックすること。この同じページが常に表示される場合は、documentsディレクトリのinstall.lockファイルを削除/名前変更する必要がある。
+Loaded=ロード済み
+FunctionTest=機能テスト
diff --git a/htdocs/langs/ja_JP/interventions.lang b/htdocs/langs/ja_JP/interventions.lang
index f6278c8556d..745bd3844d9 100644
--- a/htdocs/langs/ja_JP/interventions.lang
+++ b/htdocs/langs/ja_JP/interventions.lang
@@ -1,66 +1,68 @@
 # Dolibarr language file - Source file is en_US - interventions
-Intervention=介入
-Interventions=介入
-InterventionCard=介入のカード
-NewIntervention=新しい介入
-AddIntervention=Create intervention
-ChangeIntoRepeatableIntervention=Change to repeatable intervention
-ListOfInterventions=介入のリスト
-ActionsOnFicheInter=介入のアクション
-LastInterventions=Latest %s interventions
-AllInterventions=すべての介入
-CreateDraftIntervention=ドラフトを作成します。
-InterventionContact=介入の接点
-DeleteIntervention=介入を削除します。
-ValidateIntervention=介入を検証
-ModifyIntervention=介入を変更します。
-DeleteInterventionLine=介入の行を削除
-ConfirmDeleteIntervention=Are you sure you want to delete this intervention?
-ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b>?
-ConfirmModifyIntervention=Are you sure you want to modify this intervention?
-ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line?
-ConfirmCloneIntervention=Are you sure you want to clone this intervention?
-NameAndSignatureOfInternalContact=Name and signature of intervening:
-NameAndSignatureOfExternalContact=Name and signature of customer:
-DocumentModelStandard=介入のための標準のドキュメントモデル
-InterventionCardsAndInterventionLines=Interventions and lines of interventions
-InterventionClassifyBilled=&quot;銘打たれた&quot;分類
-InterventionClassifyUnBilled=Classify "Unbilled"
-InterventionClassifyDone=Classify "Done"
+Intervention=出張
+Interventions=出張
+InterventionCard=出張のカード
+NewIntervention=新規出張
+AddIntervention=出張を作成 
+ChangeIntoRepeatableIntervention=反復可能な出張への変更
+ListOfInterventions=出張のリスト
+ActionsOnFicheInter=出張のアクション
+LastInterventions=最新の%s出張
+AllInterventions=すべての出張
+CreateDraftIntervention=ドラフトを作成
+InterventionContact=出張の接点
+DeleteIntervention=出張を削除
+ValidateIntervention=出張を検証
+ModifyIntervention=出張を変更
+DeleteInterventionLine=出張の行を削除
+ConfirmDeleteIntervention=この出張を削除してもよいか？
+ConfirmValidateIntervention=この出張を<b>%s </b>という名前で検証してもよいか？
+ConfirmModifyIntervention=この出張を変更してもよいか？
+ConfirmDeleteInterventionLine=この出張行を削除してもよいか？
+ConfirmCloneIntervention=この出張のクローンを作成してもよいか？
+NameAndSignatureOfInternalContact=出張の名前と署名：
+NameAndSignatureOfExternalContact=顧客の名前と署名：
+DocumentModelStandard=出張のための標準のドキュメントモデル
+InterventionCardsAndInterventionLines=出張と一連の出張
+InterventionClassifyBilled=”請求済” 分類
+InterventionClassifyUnBilled="未請求" 分類 
+InterventionClassifyDone="完了" 分類 
 StatusInterInvoiced=請求
-SendInterventionRef=Submission of intervention %s
-SendInterventionByMail=Send intervention by email
-InterventionCreatedInDolibarr=Intervention %s created
-InterventionValidatedInDolibarr=介入%sは、検証
-InterventionModifiedInDolibarr=Intervention %s modified
-InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
-InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
-InterventionSentByEMail=Intervention %s sent by email
-InterventionDeletedInDolibarr=Intervention %s deleted
-InterventionsArea=Interventions area
-DraftFichinter=Draft interventions
-LastModifiedInterventions=Latest %s modified interventions
-FichinterToProcess=Interventions to process
+SendInterventionRef=出張の提出%s
+SendInterventionByMail=電子メールで出張を送信 
+InterventionCreatedInDolibarr=出張%sが作成された
+InterventionValidatedInDolibarr=出張%sは、検証
+InterventionModifiedInDolibarr=出張%sが変更された
+InterventionClassifiedBilledInDolibarr=請求済みとして設定された出張%s
+InterventionClassifiedUnbilledInDolibarr=出張%sが未請求として設定
+InterventionSentByEMail=電子メールで送信された出張%s
+InterventionDeletedInDolibarr=出張%sが削除された
+InterventionsArea=出張エリア
+DraftFichinter=ドラフト出張
+LastModifiedInterventions=最新の%s修正された出張
+FichinterToProcess=処理 ための出張
 TypeContact_fichinter_external_CUSTOMER=フォローアップ顧客との接触
-PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
-PrintProductsOnFichinterDetails=interventions generated from orders
-UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
-UseDurationOnFichinter=Hides the duration field for intervention records
-UseDateWithoutHourOnFichinter=Hides hours and minutes off the date field for intervention records
-InterventionStatistics=Statistics of interventions
-NbOfinterventions=No. of intervention cards
-NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
-AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-InterId=Intervention id
-InterRef=Intervention ref.
-InterDateCreation=Date creation intervention
-InterDuration=Duration intervention
-InterStatus=Status intervention
-InterNote=Note intervention
-InterLine=Line of intervention
-InterLineId=Line id intervention
-InterLineDate=Line date intervention
-InterLineDuration=Line duration intervention
-InterLineDesc=Line description intervention
-RepeatableIntervention=Template of intervention
-ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+PrintProductsOnFichinter=タイプ「製品」（サービスだけでなく）の行も出張カードに印刷 
+PrintProductsOnFichinterDetails=注文から生成された出張
+UseServicesDurationOnFichinter=注文から生成された出張にサービス期間を使用 
+UseDurationOnFichinter=出張レコードの期間フィールドを非表示に 
+UseDateWithoutHourOnFichinter=出張レコードの日付フィールドから時間と分を非表示に 
+InterventionStatistics=出張の統計
+NbOfinterventions=出張カードの数
+NumberOfInterventionsByMonth=月ごとの出張カードの数（検証日）
+AmountOfInteventionNotIncludedByDefault=出張の量はデフォルトでは利益に含まれていない（ほとんどの場合、タイムシートは費やされた時間カウント のために使用される）。それらを含めるには、ホーム - 設定 - その他 にて、オプションPROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFITを1で追加。
+InterId=出張ID
+InterRef=出張参照。
+InterDateCreation=日付作成出張
+InterDuration=期間出張
+InterStatus=ステータス出張
+InterNote=出張に注意
+InterLine=出張ライン
+InterLineId=ラインID出張
+InterLineDate=ライン日付出張
+InterLineDuration=ライン持続時間出張
+InterLineDesc=行記述の出張
+RepeatableIntervention=出張のテンプレート
+ToCreateAPredefinedIntervention=事前定義された出張または定期的な出張を作成 には、共通の出張を作成し、それを出張テンプレートに変換 
+Reopen=再開 
+ConfirmReopenIntervention=出張 <b>%s </b> を開いてよいか？
diff --git a/htdocs/langs/ja_JP/intracommreport.lang b/htdocs/langs/ja_JP/intracommreport.lang
new file mode 100644
index 00000000000..43a43167347
--- /dev/null
+++ b/htdocs/langs/ja_JP/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm レポート
+Module68000Desc = Intracomm レポート管理（フランス語のDEB / DES形式のサポート）
+IntracommReportSetup = Intracommreportモジュールのセットアップ
+IntracommReportAbout = Intracomm レポートについて
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numérod'agrément（délivréparleCISD de rattachement）
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôlejouéparl'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation surlesの紹介
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligationsurlesexpéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégoriedeservicesdetype「Fraisdeport」
+
+INTRACOMMREPORT_NUM_DECLARATION=Numérodedéclarant
+
+# Menu
+MenuIntracommReport=Intracomm レポート
+MenuIntracommReportNew=新規宣言
+MenuIntracommReportList=リスト
+
+# View
+NewDeclaration=新規宣言
+Declaration=宣言
+AnalysisPeriod=分析期間
+TypeOfDeclaration=宣言の種類
+DEB=商品交換申告（DEB）
+DES=サービス交換宣言（DES）
+
+# Export page
+IntracommReportTitle=ProDouane形式のXMLファイルの準備
+
+# List
+IntracommReportList=生成された宣言のリスト
+IntracommReportNumber=宣言の数
+IntracommReportPeriod=分析期間
+IntracommReportTypeDeclaration=宣言の種類
+IntracommReportDownload=XMLファイルをダウンロードする
+
+# Invoice
+IntracommReportTransportMode=輸送モード
diff --git a/htdocs/langs/ja_JP/languages.lang b/htdocs/langs/ja_JP/languages.lang
index f62137f167c..99d0e3d3fbb 100644
--- a/htdocs/langs/ja_JP/languages.lang
+++ b/htdocs/langs/ja_JP/languages.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - languages
-Language_am_ET=Ethiopian
+Language_am_ET=エチオピア語
 Language_ar_AR=アラビア語
-Language_ar_EG=Arabic (Egypt)
+Language_ar_EG=アラビア語（エジプト）
 Language_ar_SA=アラビア語
-Language_az_AZ=Azerbaijani
+Language_az_AZ=アゼルバイジャン語
 Language_bn_BD=ベンガル語
-Language_bn_IN=Bengali (India)
+Language_bn_IN=ベンガル語（インド）
 Language_bg_BG=ブルガリア語
-Language_bs_BA=ボスニア
+Language_bs_BA=ボスニア語
 Language_ca_ES=カタルにゃ語
 Language_cs_CZ=チェコ語
 Language_da_DA=デンマーク語
@@ -23,7 +23,7 @@ Language_en_GB=英語 (イギリス)
 Language_en_IN=英語 (インド)
 Language_en_NZ=英語（ニュージーランド）
 Language_en_SA=英語（サウジアラビア）
-Language_en_SG=English (Singapore)
+Language_en_SG=英語（シンガポール）
 Language_en_US=英語 (アメリカ)
 Language_en_ZA=英語（南アフリカ）
 Language_es_ES=スペイン語
@@ -33,39 +33,40 @@ Language_es_CL=スペイン語 (チリ)
 Language_es_CO=スペイン語 (コロンビア)
 Language_es_DO=スペイン語 (ドミニカ共和国)
 Language_es_EC=スペイン語 (エクアドル)
-Language_es_GT=Spanish (Guatemala)
+Language_es_GT=スペイン語（グアテマラ）
 Language_es_HN=スペイン語（ホンジュラス）
 Language_es_MX=スペイン語（メキシコ）
 Language_es_PA=スペイン語 (パナマ)
 Language_es_PY=スペイン語（パラグアイ）
 Language_es_PE=スペイン語（ペルー）
 Language_es_PR=スペイン語（プエルトリコ）
-Language_es_UY=Spanish (Uruguay)
-Language_es_GT=Spanish (Guatemala)
+Language_es_US=Spanish (USA)
+Language_es_UY=スペイン語（ウルグアイ）
+Language_es_GT=スペイン語（グアテマラ）
 Language_es_VE=スペイン語 (ベネズエラ)
 Language_et_EE=エストニア語
-Language_eu_ES=バスク
+Language_eu_ES=バスク語
 Language_fa_IR=ペルシア語
 Language_fi_FI=フィンランド語
 Language_fr_BE=フランス語 (ベルギー)
 Language_fr_CA=フランス語 (カナダ)
 Language_fr_CH=フランス語 (スイス)
-Language_fr_CI=French (Cost Ivory)
-Language_fr_CM=French (Cameroun)
+Language_fr_CI=フランス語（コートジボワール）
+Language_fr_CM=フランス語（カメルーン）
 Language_fr_FR=フランス語
-Language_fr_GA=French (Gabon)
+Language_fr_GA=フランス語（ガボン）
 Language_fr_NC=フランス（ニューカレドニア）
-Language_fr_SN=French (Senegal)
+Language_fr_SN=フランス語（セネガル）
 Language_fy_NL=フリジア語
-Language_gl_ES=Galician
+Language_gl_ES=ガリシア語
 Language_he_IL=ヘブライ語の
-Language_hi_IN=Hindi (India)
+Language_hi_IN=ヒンディー語（インド）
 Language_hr_HR=クロアチア語
 Language_hu_HU=ハンガリー語
 Language_id_ID=インドネシア語
 Language_is_IS=アイスランド語
 Language_it_IT=イタリア語
-Language_it_CH=Italian (Switzerland)
+Language_it_CH=イタリア語（スイス）
 Language_ja_JP=日本語
 Language_ka_GE=ジョージア語
 Language_km_KH=クメール語
@@ -73,32 +74,32 @@ Language_kn_IN=カンナダ語
 Language_ko_KR=韓国語
 Language_lo_LA=ラオ語
 Language_lt_LT=リトアニア語
-Language_lv_LV=ラトビアの
+Language_lv_LV=ラトビア語
 Language_mk_MK=マケドニア語
 Language_mn_MN=モンゴル語
 Language_nb_NO=ノルウエー語 (ブーケモール)
-Language_ne_NP=Nepali
+Language_ne_NP=ネパール語
 Language_nl_BE=オランダ語 (ベルギー)
-Language_nl_NL=Dutch
+Language_nl_NL=オランダ語
 Language_pl_PL=ポーランド語
 Language_pt_BR=ポルトガル語 (ブラジル)
 Language_pt_PT=ポルトガル語
 Language_ro_RO=ルーマニア語
 Language_ru_RU=ロシア語
-Language_ru_UA=ロシア（ウクライナ）
+Language_ru_UA=ロシア語（ウクライナ）
 Language_tr_TR=トルコ語
 Language_sl_SI=スロベニア語
 Language_sv_SV=スウエーデん語
 Language_sv_SE=スウェーデン語
 Language_sq_AL=アルバニア語
-Language_sk_SK=スロバキア
+Language_sk_SK=スロバキア語
 Language_sr_RS=セルビア語
 Language_sw_SW=スワヒリ語
-Language_th_TH=タイの
+Language_th_TH=タイ語
 Language_uk_UA=ウクライナ語
 Language_uz_UZ=ウズベク語
-Language_vi_VN=ベトナムの
+Language_vi_VN=ベトナム語
 Language_zh_CN=中国語
-Language_zh_TW=（繁体字）中国語
-Language_zh_HK=Chinese (Hong Kong)
-Language_bh_MY=Malay
+Language_zh_TW=中国語（繁体字）
+Language_zh_HK=中国語（香港）
+Language_bh_MY=マレー語
diff --git a/htdocs/langs/ja_JP/ldap.lang b/htdocs/langs/ja_JP/ldap.lang
index c5bde09b6e6..2b39d2066a2 100644
--- a/htdocs/langs/ja_JP/ldap.lang
+++ b/htdocs/langs/ja_JP/ldap.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - ldap
-YouMustChangePassNextLogon=ドメイン<b>%s</b>のユーザー<b>%s</b>のパスワードを変更する必要があります。
-UserMustChangePassNextLogon=ユーザーは、ドメイン%sにパスワードを変更する必要があります。
+YouMustChangePassNextLogon=ドメイン<b>%s</b>のユーザ<b>%s</b>のパスワードを変更する必要がある。
+UserMustChangePassNextLogon=ユーザは、ドメイン%sにパスワードを変更する必要がある。
 LDAPInformationsForThisContact=この連絡先のLDAPデータベース内の情報
-LDAPInformationsForThisUser=このユーザーのLDAPデータベース内の情報
+LDAPInformationsForThisUser=このユーザのLDAPデータベース内の情報
 LDAPInformationsForThisGroup=このグループのLDAPデータベース内の情報
 LDAPInformationsForThisMember=このメンバーのLDAPデータベース内の情報
-LDAPInformationsForThisMemberType=Information in LDAP database for this member type
+LDAPInformationsForThisMemberType=このメンバータイプのLDAPデータベース内の情報
 LDAPAttributes=LDAP属性
 LDAPCard=LDAPカード
-LDAPRecordNotFound=レコードは、LDAPデータベースに見つかりませんでした
-LDAPUsers=LDAPデータベース内のユーザー
+LDAPRecordNotFound=レコードは、LDAPデータベースに見つからなかった
+LDAPUsers=LDAPデータベース内のユーザ
 LDAPFieldStatus=ステータス
 LDAPFieldFirstSubscriptionDate=最初のサブスクリプションの日付
 LDAPFieldFirstSubscriptionAmount=最初のサブスクリプションの金額
 LDAPFieldLastSubscriptionDate=最後のサブスクリプションの日付
 LDAPFieldLastSubscriptionAmount=最後のサブスクリプションの金額
 LDAPFieldSkype=Skype ID
-LDAPFieldSkypeExample=例：Skype名
-UserSynchronized=ユーザーを同期しました
-GroupSynchronized=グループを同期しました
-MemberSynchronized=メンバーを同期しました
-MemberTypeSynchronized=Member type synchronized
-ContactSynchronized=連絡先を同期しました
+LDAPFieldSkypeExample=例: skypeName
+UserSynchronized=ユーザを同期した
+GroupSynchronized=グループを同期した
+MemberSynchronized=メンバーを同期した
+MemberTypeSynchronized=同期されたメンバータイプ
+ContactSynchronized=連絡先を同期した
 ForceSynchronize=強制的に同期 Dolibarr -> LDAP
-ErrorFailedToReadLDAP=LDAPデータベースの読み込みに失敗しました。 LDAPモジュールの設定とデータベースのアクセシビリティをチェックします。
-PasswordOfUserInLDAP=Password of user in LDAP
+ErrorFailedToReadLDAP=LDAPデータベースの読み込みに失敗した。 LDAPモジュールの設定とデータベースのアクセシビリティをチェックする。
+PasswordOfUserInLDAP=LDAPのユーザのパスワード
diff --git a/htdocs/langs/ja_JP/link.lang b/htdocs/langs/ja_JP/link.lang
index ede779683da..88ed6ca6488 100644
--- a/htdocs/langs/ja_JP/link.lang
+++ b/htdocs/langs/ja_JP/link.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
-LinkANewFile=新しいファイル/ドキュメントをリンクする
-LinkedFiles=ファイルとドキュメントをリンクしました
+LinkANewFile=新規ファイル/ドキュメントをリンクする
+LinkedFiles=ファイルとドキュメントをリンクした
 NoLinkFound=リンクは登録されていません
-LinkComplete=ファイルを正常にリンクしました
-ErrorFileNotLinked=ファイルをリンクできませんでした
-LinkRemoved=リンク %s が削除されました
-ErrorFailedToDeleteLink= リンク '<b>%s</b>' を削除できませんでした
-ErrorFailedToUpdateLink= リンク '<b>%s</b>' を更新できませんでした
+LinkComplete=ファイルを正常にリンクした
+ErrorFileNotLinked=ファイルをリンクできなかった
+LinkRemoved=リンク %s が削除された
+ErrorFailedToDeleteLink= リンク '<b>%s</b>' を削除できなかった
+ErrorFailedToUpdateLink= リンク '<b>%s</b>' を更新できなかった
 URLToLink=リンクの URL
-OverwriteIfExists=Overwrite file if exists
+OverwriteIfExists=存在する場合はファイルを上書きする
diff --git a/htdocs/langs/ja_JP/loan.lang b/htdocs/langs/ja_JP/loan.lang
index 987ff82d4a2..a0a77be01d9 100644
--- a/htdocs/langs/ja_JP/loan.lang
+++ b/htdocs/langs/ja_JP/loan.lang
@@ -1,34 +1,34 @@
 # Dolibarr language file - Source file is en_US - loan
-Loan=Loan
-Loans=Loans
-NewLoan=New Loan
-ShowLoan=Show Loan
-PaymentLoan=Loan payment
-LoanPayment=Loan payment
-ShowLoanPayment=Show Loan Payment
+Loan=ローン
+Loans=ローン
+NewLoan=新しいローン
+ShowLoan=ローンを表示
+PaymentLoan=ローンの支払
+LoanPayment=ローンの支払
+ShowLoanPayment=ローンの支払いを表示する
 LoanCapital=資本
-Insurance=Insurance
-Interest=Interest
-Nbterms=Number of terms
-Term=Term
-LoanAccountancyCapitalCode=Accounting account capital
-LoanAccountancyInsuranceCode=Accounting account insurance
-LoanAccountancyInterestCode=Accounting account interest
-ConfirmDeleteLoan=Confirm deleting this loan
-LoanDeleted=Loan Deleted Successfully
-ConfirmPayLoan=Confirm classify paid this loan
-LoanPaid=Loan Paid
-ListLoanAssociatedProject=List of loan associated with the project
-AddLoan=Create loan
-FinancialCommitment=Financial commitment
-InterestAmount=Interest
-CapitalRemain=Capital remain
-TermPaidAllreadyPaid = This term is allready paid
-CantUseScheduleWithLoanStartedToPaid = Can't use scheduler for a loan with payment started
-CantModifyInterestIfScheduleIsUsed = You can't modify interest if you use schedule
+Insurance=保険
+Interest=興味
+Nbterms=用語の数
+Term=期間
+LoanAccountancyCapitalCode=会計科目資本
+LoanAccountancyInsuranceCode=会計科目保険
+LoanAccountancyInterestCode=会計科目利息
+ConfirmDeleteLoan=このローンの削除を確認する
+LoanDeleted=ローンが正常に削除された
+ConfirmPayLoan=分類がこのローンを支払ったことを確認する
+LoanPaid=ローン支払い
+ListLoanAssociatedProject=プロジェクトに関連するローンのリスト
+AddLoan=ローンを作成する
+FinancialCommitment=財政的コミットメント
+InterestAmount=興味
+CapitalRemain=資本は残る
+TermPaidAllreadyPaid = この期間はすでに支払われている
+CantUseScheduleWithLoanStartedToPaid = 支払いが開始されたローンにスケジューラを使用できない
+CantModifyInterestIfScheduleIsUsed = スケジュールを使用する場合、利息を変更することはできない
 # Admin
-ConfigLoan=Configuration of the module loan
-LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
-LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
-LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Edit financial commitment
+ConfigLoan=モジュールローンの構成
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=デフォルトの会計科目資本
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=デフォルトの会計科目利息
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=デフォルトの会計科目保険
+CreateCalcSchedule=財政的コミットメントを編集する
diff --git a/htdocs/langs/ja_JP/mailmanspip.lang b/htdocs/langs/ja_JP/mailmanspip.lang
index bab4b3576b4..de0737ba233 100644
--- a/htdocs/langs/ja_JP/mailmanspip.lang
+++ b/htdocs/langs/ja_JP/mailmanspip.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - mailmanspip
-MailmanSpipSetup=Mailman and SPIP module Setup
-MailmanTitle=Mailman mailing list system
-TestSubscribe=To test subscription to Mailman lists
-TestUnSubscribe=To test unsubscribe from Mailman lists
-MailmanCreationSuccess=Subscription test was executed successfully
-MailmanDeletionSuccess=Unsubscription test was executed successfully
-SynchroMailManEnabled=A Mailman update will be performed
-SynchroSpipEnabled=A Spip update will be performed
-DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
-DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
-DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
-DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
-SPIPTitle=SPIP Content Management System
-DescADHERENT_SPIP_SERVEUR=SPIP Server
-DescADHERENT_SPIP_DB=SPIP database name
-DescADHERENT_SPIP_USER=SPIP database login
-DescADHERENT_SPIP_PASS=SPIP database password
-AddIntoSpip=Add into SPIP
-AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
-AddIntoSpipError=Failed to add the user in SPIP
-DeleteIntoSpip=Remove from SPIP
-DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
-DeleteIntoSpipError=Failed to suppress the user from SPIP
-SPIPConnectionFailed=Failed to connect to SPIP
-SuccessToAddToMailmanList=%s successfully added to mailman list %s or SPIP database
-SuccessToRemoveToMailmanList=%s successfully removed from mailman list %s or SPIP database
+MailmanSpipSetup=MailmanとSPIPモジュールのセットアップ
+MailmanTitle=Mailmanメーリングリストシステム
+TestSubscribe=Mailmanリストへのサブスクリプションをテストするには
+TestUnSubscribe=Mailmanリストからの退会をテストするには
+MailmanCreationSuccess=サブスクリプションテストが正常に実行された
+MailmanDeletionSuccess=サブスクリプション解除テストが正常に実行された
+SynchroMailManEnabled=Mailmanの更新が実行される
+SynchroSpipEnabled=Spipの更新が実行される
+DescADHERENT_MAILMAN_ADMINPW=Mailman管理者パスワード
+DescADHERENT_MAILMAN_URL=MailmanサブスクリプションのURL
+DescADHERENT_MAILMAN_UNSUB_URL=Mailmanのサブスクリプション解除のURL
+DescADHERENT_MAILMAN_LISTS=新規メンバーの自動登録用のリスト(s)（コンマで区切る）
+SPIPTitle=SPIPコンテンツ管理システム
+DescADHERENT_SPIP_SERVEUR=SPIPサーバー
+DescADHERENT_SPIP_DB=SPIPデータベース名
+DescADHERENT_SPIP_USER=SPIPデータベースログイン
+DescADHERENT_SPIP_PASS=SPIPデータベースのパスワード
+AddIntoSpip=SPIPに追加
+AddIntoSpipConfirmation=このメンバーをSPIPに追加してもよいか？
+AddIntoSpipError=SPIPにユーザーを追加できませんでした
+DeleteIntoSpip=SPIPから削除
+DeleteIntoSpipConfirmation=このメンバーをSPIPから削除してもよいか？
+DeleteIntoSpipError=SPIPからのユーザーの抑制に失敗した
+SPIPConnectionFailed=SPIPへの接続に失敗した
+SuccessToAddToMailmanList=%sがメールマンリスト%sまたはSPIPデータベースに正常に追加された
+SuccessToRemoveToMailmanList=%sがメールマンリスト%sまたはSPIPデータベースから正常に削除された
diff --git a/htdocs/langs/ja_JP/mails.lang b/htdocs/langs/ja_JP/mails.lang
index c58b186935e..0a8693bb1be 100644
--- a/htdocs/langs/ja_JP/mails.lang
+++ b/htdocs/langs/ja_JP/mails.lang
@@ -11,23 +11,23 @@ MailFrom=送信者
 MailErrorsTo=エラーへ
 MailReply=に返信
 MailTo=受信者（単数または複数）
-MailToUsers=To user(s)
+MailToUsers=ユーザ(s)へ
 MailCC=にコピー
-MailToCCUsers=Copy to users(s)
+MailToCCUsers=ユーザs(s)にコピーする
 MailCCC=にキャッシュされたコピー
-MailTopic=Email topic
+MailTopic=メールトピック
 MailText=メッセージ
 MailFile=添付ファイル
 MailMessage=電子メールの本文
-SubjectNotIn=Not in Subject
-BodyNotIn=Not in Body
+SubjectNotIn=件名にない
+BodyNotIn=体にない
 ShowEMailing=電子メールで表示
 ListOfEMailings=emailingsのリスト
 NewMailing=新しいメール送信
 EditMailing=電子メールで編集
 ResetMailing=電子メールで送信する再送
 DeleteMailing=電子メールで送信する削除
-DeleteAMailing=メール送信を削除します。
+DeleteAMailing=メール送信を削除する。
 PreviewMailing=電子メールで送信プレビュー
 CreateMailing=メール送信作成
 TestMailing=テスト用の電子メール
@@ -38,137 +38,139 @@ MailingStatusSent=送信
 MailingStatusSentPartialy=部分的に送信
 MailingStatusSentCompletely=完全に送信
 MailingStatusError=エラーが発生
-MailingStatusNotSent=送信されません
-MailSuccessfulySent=Email (from %s to %s) successfully accepted for delivery
-MailingSuccessfullyValidated=EMailing successfully validated
-MailUnsubcribe=Unsubscribe
-MailingStatusNotContact=Don't contact anymore
-MailingStatusReadAndUnsubscribe=Read and unsubscribe
-ErrorMailRecipientIsEmpty=電子メールの受信者は空です
+MailingStatusNotSent=送信されない
+MailSuccessfulySent=電子メール（%sから%sへ）の配信が正常に受け入れられた
+MailingSuccessfullyValidated=Eメールは正常に検証された
+MailUnsubcribe=登録を解除する
+MailingStatusNotContact=もう連絡しないこと
+MailingStatusReadAndUnsubscribe=読んで購読を解除する
+ErrorMailRecipientIsEmpty=電子メールの受信者は空 
 WarningNoEMailsAdded=受信者のリストに追加するない新しい電子メール。
-ConfirmValidMailing=Are you sure you want to validate this emailing?
-ConfirmResetMailing=Warning, by re-initializing emailing <b>%s</b>, you will allow the re-sending this email in a bulk mailing. Are you sure you want to do this?
-ConfirmDeleteMailing=Are you sure you want to delete this emailing?
-NbOfUniqueEMails=No. of unique emails
-NbOfEMails=No. of EMails
+ConfirmValidMailing=このメールを検証してもよいか？
+ConfirmResetMailing=警告、電子メール<b> %s </b>を再初期化することにより、この電子メールを一括メールで再送信できるようになる。これを実行してもよいか？
+ConfirmDeleteMailing=このメールを削除してもよいか？
+NbOfUniqueEMails=固有のメールの数
+NbOfEMails=メールの数
 TotalNbOfDistinctRecipients=異なる受信者の数
-NoTargetYet=受信者が（タブ '受信'に行く）はまだ定義されていません
-NoRecipientEmail=No recipient email for %s
+NoTargetYet=受信者が（タブ '受信'に行く）はまだ定義されていない
+NoRecipientEmail=%sの受信者メールがない
 RemoveRecipient=受信者を削除する
-YouCanAddYourOwnPredefindedListHere=メールセレクタモジュールを作成するには、htdocsには、/ /モジュール/郵送/ READMEを含む参照してください。
-EMailTestSubstitutionReplacedByGenericValues=テストモードを使用する場合は、置換変数は、一般的な値に置き換えられます
+YouCanAddYourOwnPredefindedListHere=メールセレクタモジュールを作成するには、htdocsには、/ /モジュール/郵送/ READMEを含む参照すること。
+EMailTestSubstitutionReplacedByGenericValues=テストモードを使用する場合は、置換変数は、一般的な値に置き換えられる
 MailingAddFile=このファイルを添付
-NoAttachedFiles=いいえ、添付ファイルがありません
-BadEMail=Bad value for Email
-ConfirmCloneEMailing=Are you sure you want to clone this emailing?
+NoAttachedFiles=いいえ、添付ファイルがない
+BadEMail=メールの値が悪い
+ConfirmCloneEMailing=このメールのクローンを作成してもよいか？
 CloneContent=クローンメッセージ
 CloneReceivers=Clonerの受信者
-DateLastSend=Date of latest sending
+DateLastSend=最新の送信日
 DateSending=送信日
 SentTo=<b>%s</b>に送信
 MailingStatusRead=読む
-YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubscribe from mailing list
-ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubscribe" feature
-EMailSentToNRecipients=Email sent to %s recipients.
-EMailSentForNElements=Email sent for %s elements.
-XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachments in mass sending in this version).
-AllRecipientSelected=The recipients of the %s record selected (if their email is known).
-GroupEmails=Group emails
-OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
-WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
-ResultOfMailSending=Result of mass Email sending
-NbSelected=Number selected
-NbIgnored=Number ignored
-NbSent=Number sent
-SentXXXmessages=%s message(s) sent.
-ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
-MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
-MailingModuleDescContactsByCompanyCategory=Contacts by third-party category
-MailingModuleDescContactsByCategory=Contacts by categories
-MailingModuleDescContactsByFunction=Contacts by position
-MailingModuleDescEmailsFromFile=Emails from file
-MailingModuleDescEmailsFromUser=Emails input by user
-MailingModuleDescDolibarrUsers=Users with Emails
-MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
-SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+YourMailUnsubcribeOK=メール<b>%s</b>はメーリングリストから正しく登録解除されている
+ActivateCheckReadKey=「開封確認」および「退会」機能に使用されるURLの暗号化に使用されるキー
+EMailSentToNRecipients=%s受信者に送信される電子メール。
+EMailSentForNElements=%s要素に対して送信された電子メール。
+XTargetsAdded= <b> %s</b>受信者がターゲットリストに追加された
+OnlyPDFattachmentSupported=送信するオブジェクトのPDFドキュメントがすでに生成されている場合は、電子メールに添付される。そうでない場合、電子メールは送信されない（また、このバージョンでは、大量送信の添付ファイルとしてPDFドキュメントのみがサポートされていることに注意すること）。
+AllRecipientSelected=選択された%sレコードの受信者（電子メールがわかっている場合）。
+GroupEmails=グループメール
+OneEmailPerRecipient=受信者ごとに1つの電子メール（デフォルトでは、選択されたレコードごとに1つの電子メール）
+WarningIfYouCheckOneRecipientPerEmail=警告、このチェックボックスをオンにすると、選択した複数の異なるレコードに対して1つのメールのみが送信されるため、メッセージにレコードのデータを参照する置換変数が含まれている場合、それらを置き換えることはできなくなる。
+ResultOfMailSending=大量のメール送信の結果
+NbSelected=選択した番号
+NbIgnored=無視された数
+NbSent=送信番号
+SentXXXmessages=%sメッセージ(s)が送信された。
+ConfirmUnvalidateEmailing=メール<b>%s </b>をドラフトステータスに変更してもよいか？
+MailingModuleDescContactsWithThirdpartyFilter=顧客フィルターとの接触
+MailingModuleDescContactsByCompanyCategory=サードパーティカテゴリ別の連絡先
+MailingModuleDescContactsByCategory=カテゴリ別の連絡先
+MailingModuleDescContactsByFunction=位置別の連絡先
+MailingModuleDescEmailsFromFile=ファイルからのメール
+MailingModuleDescEmailsFromUser=ユーザが入力したメール
+MailingModuleDescDolibarrUsers=メールを持っているユーザ
+MailingModuleDescThirdPartiesByCategories=サードパーティ（カテゴリ別）
+SendingFromWebInterfaceIsNotAllowed=Webインターフェイスからの送信は許可されていない。
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=ファイル内の行%s
 RecipientSelectionModules=受信者の選択のために定義された要求
 MailSelectedRecipients=選択した受信者
 MailingArea=EMailingsエリア
-LastMailings=Latest %s emailings
+LastMailings=最新の%sメール
 TargetsStatistics=ターゲットの統計情報
 NbOfCompaniesContacts=企業のユニークなコンタクト
-MailNoChangePossible=検証メール送信の受信者を変更することはできません
+MailNoChangePossible=検証メール送信の受信者を変更することはできない
 SearchAMailing=Searchメーリング
 SendMailing=メール送信送信
 SentBy=によって送信され、
-MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
-MailingNeedCommand2=ただし、セッションで送信するメールの最大数の値を持つパラメータのMAILING_LIMIT_SENDBYWEBを追加することによってそれらをオンラインで送信することができます。このため、ホームに行く - セットアップ - その他を。
-ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+MailingNeedCommand=メールの送信はコマンドラインから実行できる。サーバー管理者に次のコマンドを起動して、すべての受信者に電子メールを送信するように依頼すること。
+MailingNeedCommand2=ただし、セッションで送信するメールの最大数の値を持つパラメータのMAILING_LIMIT_SENDBYWEBを追加することによってそれらをオンラインで送信することができる。このため、ホーム - 設定 - その他 に行くこと。
+ConfirmSendingEmailing=この画面から直接メールを送信したい場合は、ブラウザから今すぐメールを送信することを確認すること。
+LimitSendingEmailing=注：Webインターフェースからの電子メールの送信は、セキュリティとタイムアウトの理由から数回行われる。各送信セッションで一度に<b> %s</b>受信者が実行される。
 TargetsReset=一覧をクリアする
 ToClearAllRecipientsClickHere=このメール送信の受信者リストをクリアするにはここをクリック
 ToAddRecipientsChooseHere=リストから選択して受信者を追加する
 NbOfEMailingsReceived=マスemailingsは、受信した
-NbOfEMailingsSend=Mass emailings sent
+NbOfEMailingsSend=大量のメールが送信された
 IdRecord=IDレコード
-DeliveryReceipt=Delivery Ack.
-YouCanUseCommaSeparatorForSeveralRecipients=あなたは、いくつかの受信者を指定するには、 <b>カンマ区切り</b>を使用することができます。
-TagCheckMail=Track mail opening
-TagUnsubscribe=Unsubscribe link
-TagSignature=Signature of sending user
-EMailRecipient=Recipient Email
-TagMailtoEmail=Recipient Email (including html "mailto:" link)
-NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
+DeliveryReceipt=配達確認。
+YouCanUseCommaSeparatorForSeveralRecipients=あなたは、いくつかの受信者を指定するには、 <b>カンマ区切り</b>を使用することができる。
+TagCheckMail=メールの開封を追跡する
+TagUnsubscribe=退会リンク
+TagSignature=送信ユーザの署名
+EMailRecipient=受信者のEメール
+TagMailtoEmail=受信者の電子メール（html「mailto：」リンクを含む）
+NoEmailSentBadSenderOrRecipientEmail=メールは送信されない。送信者または受信者の電子メールが正しくない。ユーザプロファイルを確認する。
 # Module Notifications
 Notifications=通知
-NoNotificationsWillBeSent=いいえ電子メール通知は、このイベントや会社のために計画されていません
-ANotificationsWillBeSent=1通知は電子メールで送信されます。
-SomeNotificationsWillBeSent=%s通知は電子メールで送信されます。
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=送信されたすべての電子メール通知を一覧表示します。
-MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
-MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
-MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
-YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
-NbOfTargetedContacts=Current number of targeted contact emails
-UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
-UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
-MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
-AdvTgtSearchIntHelp=Use interval to select int or float value
-AdvTgtMinVal=Minimum value
-AdvTgtMaxVal=Maximum value
-AdvTgtSearchDtHelp=Use interval to select date value
-AdvTgtStartDt=Start dt.
-AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third-party email or just contact email
-AdvTgtTypeOfIncude=Type of targeted email
-AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
-AddAll=Add all
-RemoveAll=Remove all
-ItemsCount=Item(s)
-AdvTgtNameTemplate=Filter name
-AdvTgtAddContact=Add emails according to criteria
-AdvTgtLoadFilter=Load filter
-AdvTgtDeleteFilter=Delete filter
-AdvTgtSaveFilter=Save filter
-AdvTgtCreateFilter=Create filter
-AdvTgtOrCreateNewFilter=Name of new filter
-NoContactWithCategoryFound=No contact/address with a category found
-NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
-Information=Information
-ContactsWithThirdpartyFilter=Contacts with third-party filter
-Unanswered=Unanswered
-Answered=Answered
-IsNotAnAnswer=Is not answer (initial email)
-IsAnAnswer=Is an answer of an initial email
+NotificationsAuto=通知自動。
+NoNotificationsWillBeSent=このイベントタイプと法人では、自動電子メール通知は計画されていない
+ANotificationsWillBeSent=1つの自動通知が電子メールで送信される
+SomeNotificationsWillBeSent=%s自動通知は電子メールで送信される
+AddNewNotification=新しい自動電子メール通知ターゲット/イベントをアクティブ化する
+ListOfActiveNotifications=自動電子メール通知のすべてのアクティブなターゲット/イベントを一覧表示する
+ListOfNotificationsDone=送信されたすべての自動電子メール通知を一覧表示する
+MailSendSetupIs=電子メール送信の構成は「%s」に設定されている。このモードは、大量の電子メールを送信するために使用することはできない。
+MailSendSetupIs2=モード'%s'を使うには、まず、管理者アカウントを使用して、メニュー%sホーム - 設定 - メール %sに移動し、パラメーター<strong>'%s '</strong>を変更する。このモードでは、インターネットサービスプロバイダーが提供するSMTPサーバーの設定に入り、大量電子メールの機能を使用できる。
+MailSendSetupIs3=SMTPサーバーの設定方法について質問がある場合は、%sに問い合わせることができる。
+YouCanAlsoUseSupervisorKeyword=キーワード<strong>__SUPERVISOREMAIL__ </strong>を追加して、ユーザのスーパーバイザーに電子メールを送信することもできる（このスーパーバイザーに電子メールが定義されている場合にのみ機能する）。
+NbOfTargetedContacts=対象となる連絡先メールの現在の数
+UseFormatFileEmailToTarget=インポートされたファイルの形式は<strong>email; name; firstname; other</strong>である必要がある
+UseFormatInputEmailToTarget=<strong> email; name; firstname; other</strong>の形式で文字列を入力する
+MailAdvTargetRecipients=受信者（高度な選択）
+AdvTgtTitle=入力フィールドに入力して、ターゲットとするサードパーティまたは連絡先/アドレスを事前に選択する
+AdvTgtSearchTextHelp=ワイルドカードとして%%を使用する。たとえば、<b> jean、joe、jim </b>などのすべてのアイテムを検索するには、<b> j%% </b>と入力し、;を使用することもできる。値の区切り文字として使用し、！を使用する。この値を除いて。たとえば、<b> jean; joe; jim%%;！jimo;！jima%%</b>は、すべてのjean、joe、jimで始まりますが、jimoではなく、jimaで始まるすべてのものではない。
+AdvTgtSearchIntHelp=間隔を使用してintまたはfloat値を選択する
+AdvTgtMinVal=最小値
+AdvTgtMaxVal=最大値
+AdvTgtSearchDtHelp=間隔を使用して日付値を選択する
+AdvTgtStartDt=dtを開始する。
+AdvTgtEndDt=dtを終了する。
+AdvTgtTypeOfIncudeHelp=サードパーティのターゲット電子メールとサードパーティの連絡先の電子メール、または単にサードパーティの電子メールまたは単に連絡先の電子メール
+AdvTgtTypeOfIncude=対象となるメールの種類
+AdvTgtContactHelp=連絡先を「対象となるメールの種類」にターゲティングする場合にのみ使用すること
+AddAll=全て追加する
+RemoveAll=すべて削除する
+ItemsCount=アイテム(s)
+AdvTgtNameTemplate=フィルタ名
+AdvTgtAddContact=基準に従ってメールを追加する
+AdvTgtLoadFilter=ロードフィルター
+AdvTgtDeleteFilter=フィルタを削除する
+AdvTgtSaveFilter=フィルタを保存
+AdvTgtCreateFilter=フィルタを作成する
+AdvTgtOrCreateNewFilter=新しいフィルターの名前
+NoContactWithCategoryFound=カテゴリの連絡先/住所が見つからない
+NoContactLinkedToThirdpartieWithCategoryFound=カテゴリの連絡先/住所が見つからない
+OutGoingEmailSetup=送信メール
+InGoingEmailSetup=受信メール
+OutGoingEmailSetupForEmailing=送信メール（モジュール%sの場合）
+DefaultOutgoingEmailSetup=グローバルな送信メール設定と同じ構成
+Information=情報
+ContactsWithThirdpartyFilter=サードパーティのフィルターを使用した連絡先
+Unanswered=未回答
+Answered=答えた
+IsNotAnAnswer=回答でない（最初のメール）
+IsAnAnswer=最初のメールの回答 
+RecordCreatedByEmailCollector=電子メールコレクター%sによって電子メール%sから作成されたレコード
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index 07684b7faab..3612332cbff 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -5,7 +5,7 @@ DIRECTION=ltr
 # stsongstdlight or cid0cs are for simplified Chinese
 # To read Chinese pdf with Linux: sudo apt-get install poppler-data
 FONTFORPDF=cid0jp
-FONTSIZEFORPDF=9
+FONTSIZEFORPDF=10
 SeparatorDecimal=.
 SeparatorThousand=,
 FormatDateShort=%m/%d/%Y
@@ -24,199 +24,201 @@ FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=データベース接続
-NoTemplateDefined=No template available for this email type
-AvailableVariables=Available substitution variables
-NoTranslation=No translation
+NoTemplateDefined=このメールタイプには適用可能なテンプレートが無い
+AvailableVariables=適用可能な代替変数s
+NoTranslation=翻訳無し
 Translation=翻訳
-EmptySearchString=Enter non empty search criterias
-NoRecordFound=No record found
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
+EmptySearchString=空文字以外の検索候補を入力
+NoRecordFound=発見レコードは無し
+NoRecordDeleted=削除レコードは無し
+NotEnoughDataYet=データが不十分
 NoError=エラーなし
 Error=エラー
 Errors=エラー
-ErrorFieldRequired=フィールド &quot;%s&quot;が必要です。
-ErrorFieldFormat=フィールド '%s'は不正な値を持つ
-ErrorFileDoesNotExists=ファイル%sは存在しません
-ErrorFailedToOpenFile=ファイル%sを開くのに失敗しました
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=パラメータが定義されていない%s
-ErrorUnknown=Unknown error
+ErrorFieldRequired=フィールド '%s'が必要
+ErrorFieldFormat=フィールド '%s'は値が不正
+ErrorFileDoesNotExists=ファイル%sは存在せず
+ErrorFailedToOpenFile=ファイル%sを開けず
+ErrorCanNotCreateDir=ディレクトリ %s は作成できず
+ErrorCanNotReadDir=ディレクトリ %s は読めず　
+ErrorConstantNotDefined=パラメータ%s が未定義
+ErrorUnknown=不明なエラー
 ErrorSQL=SQLエラー
-ErrorLogoFileNotFound=ロゴファイル '%s'が見つかりませんでした
-ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
-ErrorGoToModuleSetup=これを修正するモジュールのセットアップに行く
-ErrorFailedToSendMail=（送信者= %s、受信機= %s）メールの送信に失敗しました
+ErrorLogoFileNotFound=ロゴファイル '%s' が見つからず
+ErrorGoToGlobalSetup=修正するには、'法人/組織' 設定へ
+ErrorGoToModuleSetup=修正するには、モジュールの設定へ
+ErrorFailedToSendMail=メール送信に失敗 (送信者= %s、受信機= %s)
 ErrorFileNotUploaded=ファイルがアップロードされていませんでした。最大許容超えないようにサイズを確認し、その空き領域がディスク上で使用可能であり、すでにこのディレクトリ内の同じ名前のファイルが存在しないことに注意してください。
-ErrorInternalErrorDetected=エラーが検出され
-ErrorWrongHostParameter=間違ったホストのパラメータ
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post the form again.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child record.
-ErrorWrongValue=間違った値
-ErrorWrongValueForParameterX=パラメータ%sのために間違った値
-ErrorNoRequestInError=エラーには要求しない
-ErrorServiceUnavailableTryLater=Service not available at the moment. Try again later.
-ErrorDuplicateField=ユニークなフィールドの値が重複しています
-ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. Changes have been rolled back.
-ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in the Dolibarr config file <b>conf.php</b>.
+ErrorInternalErrorDetected=エラーを検出
+ErrorWrongHostParameter=ホストパラメータに誤り
+ErrorYourCountryIsNotDefined=あなたの国は定義されていません。ホーム-セットアップ-編集に移動し、フォームを再度投稿します。
+ErrorRecordIsUsedByChild=このレコードの削除に失敗しました。このレコードは、少なくとも1つの子レコードによって使用されます。
+ErrorWrongValue=値に誤り
+ErrorWrongValueForParameterX=パラメータ%s に対する値に誤り
+ErrorNoRequestInError=リクエストはエラーせず
+ErrorServiceUnavailableTryLater=サービスは少しの間、使用できず。後でもう一度お試しを。
+ErrorDuplicateField=ユニークフィールドの値が重複
+ErrorSomeErrorWereFoundRollbackIsDone=いくつかのエラーが見つかりました。変更はロールバックされました。
+ErrorConfigParameterNotDefined=パラメータ<b>%s </b>は、Dolibarr構成ファイル<b> conf.php</b>で定義されていません。
 ErrorCantLoadUserFromDolibarrDatabase=Dolibarrデータベース内のユーザーの<b>%sを</b>見つけることができませんでした。
 ErrorNoVATRateDefinedForSellerCountry=エラー、国%s 'に対して定義されていないのVAT率。
-ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
-ErrorFailedToSaveFile=エラーは、ファイルを保存に失敗しました。
-ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of a existing warehouse
-MaxNbOfRecordPerPage=Max. number of records per page
-NotAuthorized=You are not authorized to do that.
+ErrorNoSocialContributionForSellerCountry=エラー、国 '%s'に定義された社会/財政税タイプがありません。
+ErrorFailedToSaveFile=エラー、ファイルを保存に失敗しました。
+ErrorCannotAddThisParentWarehouse=すでに既存の倉庫の子である親倉庫を追加しようとしています
+MaxNbOfRecordPerPage=パージ当たりの最大レコード数
+NotAuthorized=その実行には権限が不足
 SetDate=日付を設定する
-SelectDate=Select a date
-SeeAlso=See also %s
-SeeHere=See here
+SelectDate=日付を選択
+SeeAlso=%s も見る
+SeeHere=ここを見る
 ClickHere=ここをクリック
-Here=Here
-Apply=Apply
+Here=ここ
+Apply=適用
 BackgroundColorByDefault=デフォルトの背景色
-FileRenamed=The file was successfully renamed
-FileGenerated=The file was successfully generated
-FileSaved=The file was successfully saved
+FileRenamed=ファイルの名前が正常に変更されました
+FileGenerated=ファイルは正常に生成されました
+FileSaved=ファイルは正常に保存されました
 FileUploaded=ファイルが正常にアップロードされました
-FileTransferComplete=File(s) uploaded successfully
-FilesDeleted=File(s) successfully deleted
+FileTransferComplete=ファイルが正常にアップロードされました
+FilesDeleted=ファイルが正常に削除されました
 FileWasNotUploaded=ファイルが添付ファイルが選択されているが、まだアップロードされませんでした。このために &quot;添付ファイル&quot;をクリックしてください。
-NbOfEntries=No. of entries
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=助けを読む
-RecordSaved=レコードが保存された
-RecordDeleted=Record deleted
-RecordGenerated=Record generated
+NbOfEntries=エントリー番号
+GoToWikiHelpPage=オンラインヘルプを読む（インターネットアクセスが必要）
+GoToHelpPage=ヘルプを見る
+RecordSaved=レコード保存
+RecordDeleted=レコード削除
+RecordGenerated=レコード生成
 LevelOfFeature=機能のレベル
-NotDefined=定義されていない
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
+NotDefined=未定義
+DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr認証モードは、構成ファイル<b> conf.php</b>で<b>%s</b>に設定されています。 <br>これは、パスワードデータベースがDolibarrの外部にあるため、このフィールドを変更しても効果がない可能性があることを意味します。
 Administrator=管理者
 Undefined=未定義
-PasswordForgotten=Password forgotten?
-NoAccount=No account?
+PasswordForgotten=パスワード忘れたの？
+NoAccount=科目なし？
 SeeAbove=上記参照
 HomeArea=ホーム
-LastConnexion=Last login
-PreviousConnexion=Previous login
-PreviousValue=Previous value
+LastConnexion=最新ログイン
+PreviousConnexion=前回ログイン
+PreviousValue=以前の値
 ConnectedOnMultiCompany=環境に接続
-ConnectedSince=ので、接続
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
+ConnectedSince=接続開始は
+AuthenticationMode=認証モード
+RequestedUrl=リクエストURL
 DatabaseTypeManager=データベース·タイプ·マネージャ
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarrは、技術的なエラーを検出しました
-YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information.
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to remove such notices)
-MoreInformation=詳細については、
-TechnicalInformation=Technical information
-TechnicalID=Technical ID
-LineID=Line ID
+RequestLastAccessInError=最新のデータベースアクセス要求エラー
+ReturnCodeLastAccessInError=最新のデータベースアクセス要求エラーの戻りコード
+InformationLastAccessInError=最新のデータベースアクセス要求エラーに関する情報
+DolibarrHasDetectedError=Dolibarrで技術的なエラーを検出
+YouCanSetOptionDolibarrMainProdToZero=詳細については、ログファイルを読み取るか、構成ファイルでオプション$ dolibarr_main_prodを「0」に設定してください。
+InformationToHelpDiagnose=この情報は診断目的に役立ちます（オプション$ dolibarr_main_prodを「1」に設定してそのような通知を削除できます）
+MoreInformation=もっと知りたい
+TechnicalInformation=技術的情報
+TechnicalID=技術ID
+LineID=行ID
 NotePublic=注（パブリック）
 NotePrivate=（注）（プライベート）
-PrecisionUnitIsLimitedToXDecimals=Dolibarrは<b>%s</b>進数に単価の精度を制限するためにセットアップした。
+PrecisionUnitIsLimitedToXDecimals=Dolibarrの設定により、単価の精度は小数点以下<b>%s</b>桁。
 DoTest=テスト
 ToFilter=フィルタ
-NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance time.
+NoFilter=フィルタ解除
+WarningYouHaveAtLeastOneTaskLate=警告、許容時間を超えた要素が少なくとも1つあります。
 yes=はい
 Yes=はい
 no=なし
 No=なし
 All=すべて
 Home=ホーム
-Help=助け
+Help=ヘルプ
 OnlineHelp=オンラインヘルプ
 PageWiki=Wikiページ
-MediaBrowser=Media browser
+MediaBrowser=メディアブラウザ
 Always=常に
 Never=決して
 Under=下
 Period=期間
 PeriodEndDate=期間の終了日
-SelectedPeriod=Selected period
-PreviousPeriod=Previous period
-Activate=アクティブにする
-Activated=活性化
+SelectedPeriod=選択した期間
+PreviousPeriod=前回の期間
+Activate=活性化
+Activated=活性化済み
 Closed=閉じた
 Closed2=閉じた
-NotClosed=Not closed
-Enabled=使用可能
-Enable=Enable
-Deprecated=Deprecated
-Disable=無効にする
-Disabled=無効にする
+NotClosed=未閉鎖
+Enabled=有効化済み
+Enable=有効化
+Deprecated=廃止済み
+Disable=無効化
+Disabled=無効化済み
 Add=加える
 AddLink=リンクを追加
-RemoveLink=Remove link
-AddToDraft=Add to draft
+RemoveLink=リンクを削除
+AddToDraft=下書きに追加
 Update=更新
 Close=閉じる
-CloseBox=Remove widget from your dashboard
+CloseAs=ステータスをに設定します
+CloseBox=ダッシュボードからウィジェットを削除します
 Confirm=確認する
-ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
+ConfirmSendCardByMail=このカードの内容を本当にメールで<b>%s </b>に送信しますか？
 Delete=削除する
 Remove=削除する
-Resiliate=Terminate
+Resiliate=終了する
 Cancel=キャンセル
 Modify=修正する
 Edit=編集
 Validate=検証
-ValidateAndApprove=Validate and Approve
+ValidateAndApprove=検証および承認
 ToValidate=検証するには
-NotValidated=Not validated
+NotValidated=検証されていません
 Save=保存
 SaveAs=名前を付けて保存
-SaveAndStay=Save and stay
-SaveAndNew=Save and new
+SaveAndStay=保存して滞在
+SaveAndNew=保存して新規
 TestConnection=試験用接続
 ToClone=クローン
-ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmCloneAsk=オブジェクト<b>%s </b>のクローンを作成してもよろしいですか？
+ConfirmClone=クローンを作成するデータを選択します。
 NoCloneOptionsSpecified=定義されているクローンを作成するデータがありません。
 Of=の
-Go=Go
-Run=Run
+Go=行く
+Run=実行
 CopyOf=のコピー
 Show=表示する
-Hide=Hide
+Hide=隠す
 ShowCardHere=カードを表示
 Search=検索
 SearchOf=検索
-SearchMenuShortCut=Ctrl + shift + f
-QuickAdd=Quick add
-QuickAddMenuShortCut=Ctrl + shift + l
+SearchMenuShortCut=Ctrl +シフト+ f
+QuickAdd=クイック追加
+QuickAddMenuShortCut=Ctrl +シフト+ l
 Valid=有効な
 Approve=承認する
-Disapprove=Disapprove
+Disapprove=不承認
 ReOpen=再オープン
-Upload=Upload
+Upload=アップロード
 ToLink=リンク
 Select=選択する
+SelectAll=すべて選択
 Choose=選択する
 Resize=サイズを変更する
-ResizeOrCrop=Resize or Crop
+ResizeOrCrop=サイズ変更またはトリミング
 Recenter=recenterは
 Author=作成者
 User=ユーザー
 Users=ユーザー
 Group=グループ
 Groups=グループ
-NoUserGroupDefined=No user group defined
+NoUserGroupDefined=ユーザーグループが定義されていません
 Password=パスワード
 PasswordRetype=パスワードを再入力
 NoteSomeFeaturesAreDisabled=機能/モジュールの多くは、このデモで無効になっていることに注意してください。
 Name=名
-NameSlashCompany=Name / Company
+NameSlashCompany=名前/法人
 Person=人
 Parameter=パラメーター
 Parameters=パラメータ
 Value=値
 PersonalValue=個人的価値
-NewObject=New %s
+NewObject=新しい%s
 NewValue=新しい値
 CurrentValue=電流値
 Code=コー​​ド
@@ -226,16 +228,16 @@ MultiLanguage=多言語
 Note=注意
 Title=タイトル
 Label=ラベル
-RefOrLabel=REF。またはラベルの
+RefOrLabel=参照符号またはラベル
 Info=ログ
 Family=ファミリー
 Description=説明
 Designation=説明
 DescriptionOfLine=ラインの説明
-DateOfLine=Date of line
-DurationOfLine=Duration of line
-Model=Doc template
-DefaultModel=Default doc template
+DateOfLine=行の日付
+DurationOfLine=ラインの長さ
+Model=ドキュメントテンプレート
+DefaultModel=デフォルトのドキュメントテンプレート
 Action=イベント
 About=約
 Number=数
@@ -245,7 +247,7 @@ Numero=数
 Limit=制限
 Limits=制限
 Logout=ログアウト
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
+NoLogoutProcessWithAuthMode=認証モード<b>%s</b>の適用可能な切断機能はありません
 Connection=ログイン
 Setup=セットアップ
 Alert=警告
@@ -255,18 +257,21 @@ Next=次の
 Cards=カード
 Card=カード
 Now=現在
-HourStart=Start hour
+HourStart=開始時間
+Deadline=Deadline
 Date=日付
-DateAndHour=Date and hour
-DateToday=Today's date
-DateReference=Reference date
+DateAndHour=日付と時間
+DateToday=今日の日付
+DateReference=参照日付
 DateStart=開始日
 DateEnd=終了日
 DateCreation=作成日
-DateCreationShort=Creat. date
+DateCreationShort=クリート。日付
+IPCreation=Creation IP
 DateModification=変更日
 DateModificationShort=MODIF。日付
-DateLastModification=Latest modification date
+IPModification=Modification IP
+DateLastModification=最新の変更日
 DateValidation=検証日
 DateClosing=日付を閉じる
 DateDue=期日
@@ -279,15 +284,15 @@ DateRequest=リクエストの日付
 DateProcess=処理日
 DateBuild=日付をビルドレポート
 DatePayment=支払日
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
-RegistrationDate=Registration date
-UserCreation=Creation user
-UserModification=Modification user
-UserValidation=Validation user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-UserValidationShort=Valid. user
+DateApprove=承認日
+DateApprove2=承認日（2回目の承認）
+RegistrationDate=登録日
+UserCreation=作成ユーザー
+UserModification=変更ユーザー
+UserValidation=検証ユーザー
+UserCreationShort=クリート。ユーザー
+UserModificationShort=Modif。ユーザー
+UserValidationShort=有効です。ユーザー
 DurationYear=年
 DurationMonth=月
 DurationWeek=週
@@ -311,26 +316,27 @@ days=日
 Hours=時間
 Minutes=分
 Seconds=秒
-Weeks=Weeks
+Weeks=週
 Today=今日は
 Yesterday=昨日
 Tomorrow=明日
-Morning=Morning
-Afternoon=Afternoon
+Morning=朝
+Afternoon=午後
 Quadri=までに4
 MonthOfDay=その日の月
+DaysOfWeek=曜日
 HourShort=H
 MinuteShort=mn
 Rate=率
-CurrencyRate=Currency conversion rate
-UseLocalTax=Include tax
+CurrencyRate=為替レート
+UseLocalTax=税込み
 Bytes=バイト
 KiloBytes=キロバイト
 MegaBytes=メガバイト
 GigaBytes=ギガバイト
 TeraBytes=テラバイト
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=作成のユーザー
+UserModif=最終更新のユーザー
 b=B。
 Kb=KB
 Mb=MB
@@ -341,210 +347,213 @@ Copy=コピー
 Paste=貼り付ける
 Default=デフォルト
 DefaultValue=デフォルト値
-DefaultValues=Default values/filters/sorting
+DefaultValues=デフォルト値/フィルター/ソート
 Price=価格
-PriceCurrency=Price (currency)
+PriceCurrency=価格（通貨）
 UnitPrice=単価
-UnitPriceHT=Unit price (excl.)
-UnitPriceHTCurrency=Unit price (excl.) (currency)
+UnitPriceHT=単価（除く）
+UnitPriceHTCurrency=単価（除く）（通貨）
 UnitPriceTTC=単価
 PriceU=UP
 PriceUHT=UP（純額）
-PriceUHTCurrency=U.P (currency)
-PriceUTTC=U.P. (inc. tax)
+PriceUHTCurrency=U.P（通貨）
+PriceUTTC=アップ。 （税込）
 Amount=量
 AmountInvoice=請求額
-AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (excl. tax)
-AmountInvoicedTTC=Amount invoiced (inc. tax)
+AmountInvoiced=請求額
+AmountInvoicedHT=請求額（税抜）
+AmountInvoicedTTC=請求額（税込）
 AmountPayment=支払金額
-AmountHTShort=Amount (excl.)
+AmountHTShort=金額（除く）
 AmountTTCShort=金額（税込）
-AmountHT=Amount (excl. tax)
+AmountHT=金額（税込）
 AmountTTC=金額（税込）
 AmountVAT=金額税
-MulticurrencyAlreadyPaid=Already paid, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (excl. tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
-AmountLT1=Amount tax 2
-AmountLT2=Amount tax 3
+MulticurrencyAlreadyPaid=すでに支払われた元の通貨
+MulticurrencyRemainderToPay=元の通貨で支払いを続ける
+MulticurrencyPaymentAmount=お支払い金額、元の通貨
+MulticurrencyAmountHT=金額（税抜き）、元の通貨
+MulticurrencyAmountTTC=金額（税込み）、元の通貨
+MulticurrencyAmountVAT=金額税、元の通貨
+MulticurrencySubPrice=サブプライス多通貨の金額
+AmountLT1=税額2
+AmountLT2=税額3
 AmountLT1ES=量RE
 AmountLT2ES=量IRPF
 AmountTotal=合計金額
 AmountAverage=平均額
-PriceQtyMinHT=Price quantity min. (excl. tax)
-PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PriceQtyMinHT=価格数量最小（税抜）
+PriceQtyMinHTCurrency=価格数量最小（税抜き）（通貨）
 Percentage=割合
 Total=合計
 SubTotal=小計
-TotalHTShort=Total (excl.)
-TotalHT100Short=Total 100%% (excl.)
-TotalHTShortCurrency=Total (excl. in currency)
+TotalHTShort=合計（除く）
+TotalHT100Short=合計100%%（除く）
+TotalHTShortCurrency=合計（通貨を除く）
 TotalTTCShort=合計（税込）
-TotalHT=Total (excl. tax)
-TotalHTforthispage=Total (excl. tax) for this page
-Totalforthispage=Total for this page
+TotalHT=合計（税込）
+TotalHTforthispage=このページの合計（税抜き）
+Totalforthispage=このページの合計
 TotalTTC=合計（税込）
 TotalTTCToYourCredit=あなたのクレジットの合計（税込）
 TotalVAT=合計税
-TotalVATIN=Total IGST
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
+TotalVATIN=合計IGST
+TotalLT1=総税2
+TotalLT2=総税3
 TotalLT1ES=合計RE
 TotalLT2ES=合計IRPF
-TotalLT1IN=Total CGST
-TotalLT2IN=Total SGST
-HT=Excl. tax
+TotalLT1IN=合計CGST
+TotalLT2IN=合計SGST
+HT=除く税金
 TTC=税込
 INCVATONLY=Inc. VAT
-INCT=Inc. all taxes
+INCT=Inc.すべての税金
 VAT=売上税
 VATIN=IGST
-VATs=Sales taxes
-VATINs=IGST taxes
-LT1=Sales tax 2
-LT1Type=Sales tax 2 type
-LT2=Sales tax 3
-LT2Type=Sales tax 3 type
+VATs=売上税
+VATINs=IGST税
+LT1=消費税2
+LT1Type=消費税2タイプ
+LT2=消費税3
+LT2Type=消費税3タイプ
 LT1ES=RE
 LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
-LT1GC=Additionnal cents
+LT1GC=追加のセント
 VATRate=税率
-VATCode=Tax Rate code
-VATNPR=Tax Rate NPR
-DefaultTaxRate=Default tax rate
+VATCode=税率コード
+VATNPR=税率NPR
+DefaultTaxRate=デフォルトの税率
 Average=平均
 Sum=合計
 Delta=デルタ
 StatusToPay=支払いに
-RemainToPay=Remain to pay
-Module=Module/Application
-Modules=Modules/Applications
+RemainToPay=支払いを続ける
+Module=モジュール/アプリケーション
+Modules=モジュール/アプリケーション
 Option=オプション
 List=リスト
 FullList=全リスト
-FullConversation=Full conversation
+FullConversation=完全な会話
 Statistics=統計
 OtherStatistics=他の統計
 Status=ステータス
-Favorite=Favorite
-ShortInfo=Info.
-Ref=REF。
-ExternalRef=Ref. extern
-RefSupplier=Ref. vendor
-RefPayment=REF。支払い
+Favorite=お気に入り
+ShortInfo=情報
+Ref=参照符号
+ExternalRef=外部参照符号
+RefSupplier=仕入先参照符号
+RefPayment=支払参照符号
 CommercialProposalsShort=商用の提案
 Comment=コメント
 Comments=コメント
 ActionsToDo=行うためのイベント
-ActionsToDoShort=実行する
-ActionsDoneShort=行われ
+ActionsToDoShort=すること
+ActionsDoneShort=済
 ActionNotApplicable=適用されない
 ActionRunningNotStarted=開始するには
-ActionRunningShort=In progress
-ActionDoneShort=完成した
-ActionUncomplete=Incomplete
-LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organization
-Accountant=Accountant
-ContactsForCompany=このサードパーティの連絡先/ adresses
-ContactsAddressesForCompany=Contacts/addresses for this third party
-AddressesForCompany=Addresses for this third party
-ActionsOnCompany=Events for this third party
-ActionsOnContact=Events for this contact/address
-ActionsOnContract=Events for this contract
-ActionsOnMember=このメンバーに関するイベント
-ActionsOnProduct=Events about this product
-NActionsLate=%s後半
-ToDo=実行する
-Completed=Completed
-Running=In progress
-RequestAlreadyDone=Request already recorded
+ActionRunningShort=進行中
+ActionDoneShort=終了
+ActionUncomplete=不完全
+LatestLinkedEvents=最新の%sリンクイベント
+CompanyFoundation=法人/組織
+Accountant=会計士
+ContactsForCompany=この取引先の連絡先s
+ContactsAddressesForCompany=取引先の連絡先s/住所s
+AddressesForCompany=取引先の住所s
+ActionsOnCompany=この取引先に関する出来事s
+ActionsOnContact=この 連絡先/住所 に関する出来事
+ActionsOnContract=この契約に関する出来事
+ActionsOnMember=このメンバーに関する出来事
+ActionsOnProduct=この製品に関する出来事
+NActionsLate=%s遅延
+ToDo=すること
+Completed=完了済
+Running=進行中
+RequestAlreadyDone=要求は記録済
 Filter=フィルタ
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
+FilterOnInto=検索候補 '<strong>%s</strong>' を %s フィールドに入れる
 RemoveFilter=フィルタを削除
-ChartGenerated=チャート生成された
-ChartNotGenerated=チャート生成されません
+ChartGenerated=チャート生成済
+ChartNotGenerated=チャート未生成
 GeneratedOn=%s上に構築
-Generate=生成する
-Duration=持続
-TotalDuration=全持続時間
+Generate=生成
+Duration=期間
+TotalDuration=全期間
 Summary=要約
-DolibarrStateBoard=Database Statistics
-DolibarrWorkBoard=Open Items
-NoOpenedElementToProcess=No open element to process
+DolibarrStateBoard=データベース統計
+DolibarrWorkBoard=開いている項目s
+NoOpenedElementToProcess=処理すべき項目が開いていない
 Available=利用できる
-NotYetAvailable=まだ利用できません
-NotAvailable=利用できない
-Categories=Tags/categories
-Category=Tag/category
+NotYetAvailable=まだ利用できず
+NotAvailable=利用できず
+Categories=タグs/カテゴリs
+Category=タグ/カテゴリ
 By=によって
 From=から
 FromDate=から
 FromLocation=から
+at=で
 to=へ
 To=へ
 and=と
 or=または
 Other=その他
 Others=他人
-OtherInformations=Other information
+OtherInformations=他の情報
 Quantity=量
 Qty=個数
 ChangedBy=によって変更され
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
+ApprovedBy=によって承認された
+ApprovedBy2=承認者（2回目の承認）
 Approved=承認された
 Refused=拒否
-ReCalculate=Recalculate
+ReCalculate=再計算
 ResultKo=失敗
 Reporting=報告
 Reportings=報告
-Draft=ドラフト
-Drafts=ドラフト
-StatusInterInvoiced=Invoiced
-Validated=検証
+Draft=下書き
+Drafts=下書きs
+StatusInterInvoiced=請求済
+Validated=検証済
+ValidatedToProduce=検証済 (生成)
 Opened=開く
-OpenAll=Open (All)
-ClosedAll=Closed (All)
-New=新しい
+OpenAll=開く (すべて)
+ClosedAll=閉じる (すべて)
+New=新規
 Discount=割引
-Unknown=未知の
-General=一般的な
+Unknown=未知
+General=一般的
 Size=サイズ
-OriginalSize=Original size
-Received=受信された
+OriginalSize=当初のサイズ
+Received=受信済
 Paid=有料
-Topic=Subject
-ByCompanies=第三者による
-ByUsers=By user
+Topic=科目
+ByCompanies=取引先による
+ByUsers=ユーザによる
 Links=リンク
 Link=リンク
-Rejects=拒否する
+Rejects=拒否s
 Preview=プレビュー
 NextStep=次のステップ
 Datas=データ
 None=なし
 NoneF=なし
-NoneOrSeveral=None or several
-Late=遅い
-LateDesc=An item is defined as Delayed as per the system configuration in menu Home - Setup - Alerts.
-NoItemLate=No late item
+NoneOrSeveral=無しまたは少量
+Late=遅延
+LateDesc=アイテムは、メニューの[ホーム]-[セットアップ]-[アラート]のシステム構成に従って、遅延として定義されます。
+NoItemLate=遅延項目無し
 Photo=画像
-Photos=写真
-AddPhoto=画像を追加
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
+Photos=画像s
+AddPhoto=画像追加
+DeletePicture=画像削除
+ConfirmDeletePicture=画像削除、いいよね？
 Login=ログイン
-LoginEmail=Login (email)
-LoginOrEmail=Login or Email
+LoginEmail=ログイン (メール)
+LoginOrEmail=ログインまたはメール
 CurrentLogin=現在のログイン
-EnterLoginDetail=Enter login details
+EnterLoginDetail=ログイン詳細を入力
 January=1月
 February=2月
 March=3月
@@ -561,7 +570,7 @@ Month01=1月
 Month02=2月
 Month03=3月
 Month04=4月
-Month05=可能性
+Month05=5月
 Month06=6月
 Month07=7月
 Month08=8月
@@ -571,9 +580,9 @@ Month11=11月
 Month12=12月
 MonthShort01=1月
 MonthShort02=2月
-MonthShort03=マー
+MonthShort03=3月
 MonthShort04=4月
-MonthShort05=可能性
+MonthShort05=5月
 MonthShort06=6月
 MonthShort07=7月
 MonthShort08=8月
@@ -581,20 +590,20 @@ MonthShort09=9月
 MonthShort10=10月
 MonthShort11=11月
 MonthShort12=12月
-MonthVeryShort01=J
-MonthVeryShort02=F
-MonthVeryShort03=M
-MonthVeryShort04=A
-MonthVeryShort05=M
-MonthVeryShort06=J
-MonthVeryShort07=J
-MonthVeryShort08=A
-MonthVeryShort09=S
-MonthVeryShort10=O
-MonthVeryShort11=N
-MonthVeryShort12=D
+MonthVeryShort01=一
+MonthVeryShort02=二
+MonthVeryShort03=三
+MonthVeryShort04=四
+MonthVeryShort05=五
+MonthVeryShort06=六
+MonthVeryShort07=七
+MonthVeryShort08=八
+MonthVeryShort09=九
+MonthVeryShort10=十
+MonthVeryShort11=十一
+MonthVeryShort12=十二
 AttachedFiles=添付ファイルとドキュメント
-JoinMainDoc=Join main document
+JoinMainDoc=主ドキュメントを結合
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH：SS
@@ -602,159 +611,160 @@ ReportName=レポート名
 ReportPeriod=レポート期間
 ReportDescription=説明
 Report=レポート
-Keyword=Keyword
-Origin=Origin
-Legend=レジェンド
-Fill=Fill
-Reset=Reset
+Keyword=キーワード
+Origin=原点
+Legend=凡例
+Fill=字詰め
+Reset=リセット
 File=ファイル
-Files=ファイル
-NotAllowed=許可されません
-ReadPermissionNotAllowed=許可されません読み取りアクセス許可を
+Files=ファイルs
+NotAllowed=不許可
+ReadPermissionNotAllowed=読取権限は不許可
 AmountInCurrency=%s通貨での金額
 Example=例
 Examples=例
-NoExample=なし例なし
-FindBug=バグを報告する
-NbOfThirdParties=サードパーティの数
+NoExample=例なし
+FindBug=バグを報告
+NbOfThirdParties=取引先の数
 NbOfLines=行数
 NbOfObjects=オブジェクトの数
-NbOfObjectReferers=Number of related items
-Referers=Related items
+NbOfObjectReferers=関連項目の数
+Referers=関連項目s
 TotalQuantity=総量
-DateFromTo=%sから%sへ
+DateFromTo=%sから%sまで
 DateFrom=%sから
 DateUntil=%sまで
 Check=チェック
-Uncheck=Uncheck
+Uncheck=未チェック
 Internal=内部
 External=外部
 Internals=内部
 Externals=外部
 Warning=警告
 Warnings=警告
-BuildDoc=Docを構築する
+BuildDoc=Docを構築
 Entity=環境
 Entities=エンティティ
 CustomerPreview=顧客のプレビュー
-SupplierPreview=Vendor preview
+SupplierPreview=ベンダープレビュー
 ShowCustomerPreview=顧客のプレビューを表示する
-ShowSupplierPreview=Show vendor preview
-RefCustomer=REF。顧客
+ShowSupplierPreview=ベンダープレビューを表示
+RefCustomer=顧客参照符号
 Currency=通貨
 InfoAdmin=管理者向け情報
 Undo=元に戻す
 Redo=やり直す
 ExpandAll=すべてを展開
 UndoExpandAll=拡大を元に戻す
-SeeAll=See all
+SeeAll=すべてを見る
 Reason=理由
 FeatureNotYetSupported=機能はまだサポートされていません
 CloseWindow=ウィンドウを閉じる
 Response=応答
 Priority=優先順位
-SendByMail=Send by email
+SendByMail=メールで送る
 MailSentBy=によって送信される電子メール
+NotSent=送信されません
 TextUsedInTheMessageBody=電子メールの本文
-SendAcknowledgementByMail=Send confirmation email
+SendAcknowledgementByMail=確認メールを送信する
 SendMail=メールを送る
-Email=Email
+Email=Eメール
 NoEMail=まだメールしない
-AlreadyRead=Already read
-NotRead=Not read
-NoMobilePhone=No mobile phone
+AlreadyRead=すでに読んだ
+NotRead=読んでいません
+NoMobilePhone=携帯電話はありません
 Owner=所有者
 FollowingConstantsWillBeSubstituted=以下の定数は、対応する値を持つ代替となります。
 Refresh=リフレッシュ
 BackToList=一覧に戻る
-BackToTree=Back to tree
+BackToTree=ツリーに戻る
 GoBack=戻る
 CanBeModifiedIfOk=有効であれば変更することができます
 CanBeModifiedIfKo=有効でない場合は変更することができます
 ValueIsValid=値が有効です。
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
+ValueIsNotValid=値が無効です
+RecordCreatedSuccessfully=レコードが正常に作成されました
 RecordModifiedSuccessfully=レコードが正常に変更
-RecordsModified=%s record(s) modified
-RecordsDeleted=%s record(s) deleted
-RecordsGenerated=%s record(s) generated
+RecordsModified=%sレコードが変更されました
+RecordsDeleted=%sレコードが削除されました
+RecordsGenerated=生成された%sレコード
 AutomaticCode=自動コード
 FeatureDisabled=機能が無効に
-MoveBox=Move widget
+MoveBox=ウィジェットの移動
 Offered=提供
 NotEnoughPermissions=このアクションの権限を持っていません
 SessionName=セッション名
 Method=方法
 Receive=受け取る
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-ExpectedQty=Expected Qty
+CompleteOrNoMoreReceptionExpected=完了またはこれ以上の予測なし
+ExpectedValue=予測値
+ExpectedQty=予測数
 PartialWoman=部分的な
 TotalWoman=合計
 NeverReceived=受信しませんでした
 Canceled=キャンセル
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
-YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record in module setup
+YouCanChangeValuesForThisListFromDictionarySetup=このリストの値は、メニューの[設定]-[辞書]から変更できます。
+YouCanChangeValuesForThisListFrom=このリストの値は、メニュー%sから変更できます。
+YouCanSetDefaultValueInModuleSetup=モジュール設定で新しいレコードを作成するときに使用されるデフォルト値を設定できます
 Color=カラー
 Documents=リンクされたファイル
 Documents2=ドキュメント
 UploadDisabled=アップロードを無効に
-MenuAccountancy=Accounting
+MenuAccountancy=会計
 MenuECM=ドキュメント
 MenuAWStats=AWStatsは
 MenuMembers=メンバー
 MenuAgendaGoogle=Googleの議題
-MenuTaxesAndSpecialExpenses=Taxes | Special expenses
+MenuTaxesAndSpecialExpenses=税金|特別経費
 ThisLimitIsDefinedInSetup=Dolibarr制限（メニューホームセットアップ·セキュリティ）：%s KB、PHP制限：%s KB
 NoFileFound=このディレクトリに保存されない文書ません
 CurrentUserLanguage=現在の言語
 CurrentTheme=現在のテーマ
-CurrentMenuManager=Current menu manager
-Browser=Browser
-Layout=Layout
-Screen=Screen
+CurrentMenuManager=現在のメニューマネージャー
+Browser=ブラウザ
+Layout=レイアウト
+Screen=画面
 DisabledModules=ディセーブルになっているモジュール
 For=のために
 ForCustomer=顧客のために
 Signature=署名
-DateOfSignature=Date of signature
+DateOfSignature=署名日
 HidePassword=隠されたパスワードを使用してコマンドを表示する
 UnHidePassword=明確なパスワードを使用して実際のコマンドを表示する
 Root=ルート
-RootOfMedias=Root of public medias (/medias)
-Informations=Information
+RootOfMedias=パブリックメディアのルート（/ medias）
+Informations=情報
 Page=ページ
 Notes=注釈
 AddNewLine=新しい行を追加します。
 AddFile=ファイルを追加します。
-FreeZone=Free-text product
-FreeLineOfType=Free-text item, type:
+FreeZone=フリーテキスト製品
+FreeLineOfType=フリーテキストアイテム、タイプ：
 CloneMainAttributes=その主な属性を持つオブジェクトのクローンを作成する
-ReGeneratePDF=Re-generate PDF
+ReGeneratePDF=PDFを再生成
 PDFMerge=PDFのマージ
 Merge=マージ
-DocumentModelStandardPDF=Standard PDF template
+DocumentModelStandardPDF=標準のPDFテンプレート
 PrintContentArea=メインのコンテンツ領域を印刷するページを表示
-MenuManager=Menu manager
-WarningYouAreInMaintenanceMode=Warning, you are in maintenance mode: only login <b>%s</b> is allowed to use the application in this mode.
+MenuManager=メニューマネージャー
+WarningYouAreInMaintenanceMode=警告、メンテナンスモードです。ログイン<b> %s </b>のみが、このモードでアプリケーションを使用できます。
 CoreErrorTitle=システムエラー
-CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
+CoreErrorMessage=申し訳ありませんが、エラーが発生しました。システム管理者に連絡してログを確認するか、$ dolibarr_main_prod = 1を無効にして詳細情報を入手してください。
 CreditCard=クレジットカード
-ValidatePayment=Validate payment
-CreditOrDebitCard=Credit or debit card
+ValidatePayment=支払いを検証する
+CreditOrDebitCard=クレジットカードまたはデビットカード
 FieldsWithAreMandatory=<b>%s</b>のフィールドは必須です
-FieldsWithIsForPublic=Fields with <b>%s</b> are shown in public list of members. If you don't want this, uncheck the "public" box.
-AccordingToGeoIPDatabase=(according to GeoIP conversion)
+FieldsWithIsForPublic=<b> %s </b>のフィールドは、メンバーの公開リストに表示されます。これを望まない場合は、「公開」ボックスのチェックを外してください。
+AccordingToGeoIPDatabase=（GeoIP変換による）
 Line=ライン
 NotSupported=サポートされていません
 RequiredField=必須フィールド
 Result=結果
 ToTest=テスト
-ValidateBefore=Item must be validated before using this feature
+ValidateBefore=この機能を使用する前に、アイテムを検証する必要があります
 Visibility=可視性
-Totalizable=Totalizable
-TotalizableDesc=This field is totalizable in list
+Totalizable=合計可能
+TotalizableDesc=このフィールドはリストで合計可能です
 Private=プライベート
 Hidden=隠された
 Resources=資源
@@ -769,24 +779,24 @@ NewAttribute=新しい属性
 AttributeCode=属性コード
 URLPhoto=写真/ロゴのURL
 SetLinkToAnotherThirdParty=別の第三者へのリンク
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=Link to order
-LinkToInvoice=Link to invoice
-LinkToTemplateInvoice=Link to template invoice
-LinkToSupplierOrder=Link to purchase order
-LinkToSupplierProposal=Link to vendor proposal
-LinkToSupplierInvoice=Link to vendor invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
-LinkToTicket=Link to ticket
-CreateDraft=ドラフトを作成します。
-SetToDraft=Back to draft
+LinkTo=リンク先
+LinkToProposal=提案へのリンク
+LinkToOrder=注文へのリンク
+LinkToInvoice=請求書へのリンク
+LinkToTemplateInvoice=テンプレート請求書へのリンク
+LinkToSupplierOrder=注文書へのリンク
+LinkToSupplierProposal=ベンダー提案へのリンク
+LinkToSupplierInvoice=ベンダーの請求書へのリンク
+LinkToContract=契約へのリンク
+LinkToIntervention=介入へのリンク
+LinkToTicket=チケットへのリンク
+CreateDraft=下書き作成
+SetToDraft=下書きに戻る
 ClickToEdit=クリックして編集
-ClickToRefresh=Click to refresh
-EditWithEditor=Edit with CKEditor
-EditWithTextEditor=Edit with Text editor
-EditHTMLSource=Edit HTML Source
+ClickToRefresh=クリックで一新
+EditWithEditor=CKEditorで編集
+EditWithTextEditor=テキストエディタで編集する
+EditHTMLSource=HTMLソースを編集する
 ObjectDeleted=オブジェクト%sは、削除された
 ByCountry=国別
 ByTown=町によって
@@ -796,127 +806,130 @@ ByYear=年度別
 ByMonth=月別
 ByDay=日ごとに
 BySalesRepresentative=営業担当者によって
-LinkedToSpecificUsers=Linked to a particular user contact
-NoResults=No results
-AdminTools=Admin Tools
+LinkedToSpecificUsers=特定のユーザー連絡先にリンク
+NoResults=結果がありません
+AdminTools=管理ツール
 SystemTools=システムツール
-ModulesSystemTools=Modules tools
+ModulesSystemTools=モジュールツール
 Test=テスト
-Element=Element
-NoPhotoYet=No pictures available yet
-Dashboard=Dashboard
-MyDashboard=My Dashboard
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
-SelectAction=Select action
-SelectTargetUser=Select target user/employee
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
-SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-ShowMoreLines=Show more/less lines
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClick=Select an element and click %s
-PrintFile=Print File %s
-ShowTransaction=Show entry on bank account
+Element=素子
+NoPhotoYet=写真はまだありません
+Dashboard=ダッシュボード
+MyDashboard=マイダッシュボード
+Deductible=控除可能
+from=から
+toward=に向かって
+Access=アクセス
+SelectAction=アクションを選択
+SelectTargetUser=ターゲットユーザー/従業員を選択します
+HelpCopyToClipboard=Ctrl + Cを使用してクリップボードにコピーします
+SaveUploadedFileWithMask=「<strong>%s</strong>」（それ以外の場合は「%s」）という名前でファイルをサーバーに保存します
+OriginFileName=元のファイル名
+SetDemandReason=ソースを設定
+SetBankAccount=銀行口座を定義する
+AccountCurrency=口座通貨
+ViewPrivateNote=メモを見る
+XMoreLines=%s行が非表示
+ShowMoreLines=より多くの/より少ない行を表示する
+PublicUrl=パブリックURL
+AddBox=ボックスを追加
+SelectElementAndClick=要素を選択し、%sをクリックします
+PrintFile=印刷ファイル%s
+ShowTransaction=銀行口座にエントリを表示する
 ShowIntervention=介入を示す
 ShowContract=契約を表示する
-GoIntoSetupToChangeLogo=Go to Home - Setup - Company to change logo or go to Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
-ListOf=List of %s
-ListOfTemplates=List of templates
-Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+GoIntoSetupToChangeLogo=ホーム-セットアップ-法人に移動してロゴを変更するか、ホーム-セットアップ-表示に移動して非表示にします。
+Deny=拒否
+Denied=拒否されました
+ListOf=%sのリスト
+ListOfTemplates=テンプレートのリスト
+Gender=性別
+Genderman=男
+Genderwoman=女
+Genderother=その他
 ViewList=リストビュー
-ViewGantt=Gantt view
-ViewKanban=Kanban view
-Mandatory=Mandatory
-Hello=Hello
-GoodBye=GoodBye
-Sincerely=Sincerely
-ConfirmDeleteObject=Are you sure you want to delete this object?
-DeleteLine=行を削除します
-ConfirmDeleteLine=Are you sure you want to delete this line?
-ErrorPDFTkOutputFileNotFound=Error: the file was not generated. Please check that the 'pdftk' command is installed in a directory included in the $PATH environment variable (linux/unix only) or contact your system administrator.
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
-TooManyRecordForMassAction=Too many records selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-ConfirmMassDeletion=Bulk Delete confirmation
-ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record(s)?
-RelatedObjects=Related Objects
+ViewGantt=ガントビュー
+ViewKanban=看板ビュー
+Mandatory=必須
+Hello=やあやあ
+GoodBye=さようなら
+Sincerely=心から
+ConfirmDeleteObject=このオブジェクトを削除してもよろしいですか？
+DeleteLine=行を削除
+ConfirmDeleteLine=この行を削除してもよろしいですか？
+ErrorPDFTkOutputFileNotFound=エラー：ファイルは生成されませんでした。 'pdftk'コマンドが$ PATH環境変数（linux / unixのみ）に含まれるディレクトリーにインストールされていることを確認するか、システム管理者に連絡してください。
+NoPDFAvailableForDocGenAmongChecked=チェックされたレコードの中でドキュメント生成に使用できるPDFがありませんでした
+TooManyRecordForMassAction=マスアクション用に選択されたレコードが多すぎます。アクションは、%sレコードのリストに制限されています。
+NoRecordSelected=レコードが選択されていません
+MassFilesArea=大量アクションによって作成されたファイルの領域
+ShowTempMassFilesArea=大量アクションによって作成されたファイルの領域を表示する
+ConfirmMassDeletion=一括削除確認
+ConfirmMassDeletionQuestion=選択した%sレコードを削除してもよろしいですか？
+RelatedObjects=関連オブジェクト
 ClassifyBilled=請求分類
-ClassifyUnbilled=Classify unbilled
+ClassifyUnbilled=未請求を分類する
 Progress=進捗
-ProgressShort=Progr.
-FrontOffice=Front office
+ProgressShort=プログラム
+FrontOffice=フロントオフィス
 BackOffice=バックオフィス
-Submit=Submit
-View=View
+Submit=参加する
+View=見る
 Export=Export
 Exports=Exports
-ExportFilteredList=Export filtered list
-ExportList=Export list
+ExportFilteredList=フィルタリングされたリストをエクスポートする
+ExportList=エクスポートリスト
 ExportOptions=エクスポートオプション
-IncludeDocsAlreadyExported=Include docs already exported
-ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
-ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
-AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
-NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
+IncludeDocsAlreadyExported=すでにエクスポートされたドキュメントを含める
+ExportOfPiecesAlreadyExportedIsEnable=すでにエクスポートされたピースのエクスポートが有効になります
+ExportOfPiecesAlreadyExportedIsDisable=すでにエクスポートされたピースのエクスポートは無効になっています
+AllExportedMovementsWereRecordedAsExported=エクスポートされたすべての動きは、エクスポートされたものとして記録されました
+NotAllExportedMovementsCouldBeRecordedAsExported=エクスポートされたすべての動きをエクスポート済みとして記録できるわけではありません
 Miscellaneous=その他
 Calendar=カレンダー
-GroupBy=Group by...
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
-Download=Download
-DownloadDocument=Download document
-ActualizeCurrency=Update currency rate
-Fiscalyear=Fiscal year
-ModuleBuilder=Module and Application Builder
-SetMultiCurrencyCode=Set currency
-BulkActions=Bulk actions
-ClickToShowHelp=Click to show tooltip help
-WebSite=Website
-WebSites=Websites
-WebSiteAccounts=Website accounts
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
-HR=HR
-HRAndBank=HR and Bank
-AutomaticallyCalculated=Automatically calculated
-TitleSetToDraft=Go back to draft
-ConfirmSetToDraft=Are you sure you want to go back to Draft status?
-ImportId=Import id
+GroupBy=グループ化...
+ViewFlatList=フラットリストを表示
+ViewAccountList=元帳を表示
+ViewSubAccountList=補助科目元帳を表示
+RemoveString=文字列 '%s'を削除します
+SomeTranslationAreUncomplete=提供された言語の一部において、翻訳がほんの部分的だったり誤っていたりなの。自分の言語の訂正を助けたい人は、<a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> に登録して、改善案を追加してね。
+DirectDownloadLink=直接ダウンロードリンク（公開/外部）
+DirectDownloadInternalLink=直接ダウンロードリンク（ログに記録する必要があり、権限が必要です）
+Download=ダウンロード
+DownloadDocument=ドキュメントをダウンロード
+ActualizeCurrency=為替レートを更新する
+Fiscalyear=会計年度
+ModuleBuilder=モジュールとアプリケーションビルダー
+SetMultiCurrencyCode=通貨を設定する
+BulkActions=一括動作s
+ClickToShowHelp=クリックしてツールチップのヘルプを表示
+WebSite=ウェブサイト
+WebSites=ウェブサイト
+WebSiteAccounts=ウェブサイトアカウント
+ExpenseReport=経費報告書
+ExpenseReports=経費報告書
+HR=人事
+HRAndBank=人事と銀行
+AutomaticallyCalculated=自動計算
+TitleSetToDraft=下書きに戻る
+ConfirmSetToDraft=下書き状態にもどしたいのね、いいね？
+ImportId=インポートID
 Events=イベント
-EMailTemplates=Email templates
-FileNotShared=File not shared to external public
+EMailTemplates=メールテンプレート
+FileNotShared=ファイルは外部に共有されていません
 Project=プロジェクト
 Projects=プロジェクト
-LeadOrProject=Lead | Project
-LeadsOrProjects=Leads | Projects
-Lead=Lead
-Leads=Leads
-ListOpenLeads=List open leads
-ListOpenProjects=List open projects
-NewLeadOrProject=New lead or project
+LeadOrProject=リード|事業
+LeadsOrProjects=リード|プロジェクト
+Lead=鉛
+Leads=リード
+ListOpenLeads=オープンリードのリスト
+ListOpenProjects=開いているプロジェクトを一覧表示する
+NewLeadOrProject=新しいリードまたはプロジェクト
 Rights=パーミッション
-LineNb=Line no.
+LineNb=行番号
 IncotermLabel=インコタームズ
-TabLetteringCustomer=Customer lettering
-TabLetteringSupplier=Vendor lettering
+TabLetteringCustomer=顧客のレタリング
+TabLetteringSupplier=ベンダーのレタリング
 Monday=月曜日
 Tuesday=火曜日
 Wednesday=水曜日
@@ -945,141 +958,152 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
-one=one
-two=two
-three=three
-four=four
-five=five
-six=six
-seven=seven
-eight=eight
-nine=nine
-ten=ten
-eleven=eleven
-twelve=twelve
-thirteen=thirdteen
-fourteen=fourteen
-fifteen=fifteen
-sixteen=sixteen
-seventeen=seventeen
-eighteen=eighteen
-nineteen=nineteen
-twenty=twenty
-thirty=thirty
-forty=forty
-fifty=fifty
-sixty=sixty
-seventy=seventy
-eighty=eighty
-ninety=ninety
-hundred=hundred
-thousand=thousand
-million=million
-billion=billion
-trillion=trillion
-quadrillion=quadrillion
-SelectMailModel=Select an email template
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
+one=1
+two=二
+three=三
+four=四
+five=五
+six=6
+seven=セブン
+eight=8
+nine=ナイン
+ten=十
+eleven=十一
+twelve=12
+thirteen=サードティーン
+fourteen=14
+fifteen=15
+sixteen=16
+seventeen=17
+eighteen=18
+nineteen=19
+twenty=20
+thirty=30
+forty=40
+fifty=50
+sixty=60
+seventy=70
+eighty=80人
+ninety=90
+hundred=百
+thousand=千
+million=百万
+billion=十億
+trillion=兆
+quadrillion=四兆
+SelectMailModel=メールテンプレートを選択する
+SetRef=参照を設定
+Select2ResultFoundUseArrows=いくつかの結果が見つかりました。矢印を使用して選択します。
+Select2NotFound=結果が見つかりません
+Select2Enter=入る
+Select2MoreCharacter=以上のキャラクター
+Select2MoreCharacters=以上の文字
+Select2MoreCharactersMore= <strong>検索構文：</strong> <br> <kbd> <strong> | </strong> </kbd> <kbd> OR </kbd>（| B）</kbd>と<br> <kbd> <strong> * </strong> </kbd> <kbd>任意の文字</kbd>（* b）の<br> <kbd> <strong> ^ </strong> </kbd> <kbd>スタート</kbd>と（^ AB）<br> <kbd> <strong> $ </strong> </kbd> <kbd>エンド（ ab $）<br>
+Select2LoadingMoreResults=より多くの結果を読み込んでいます...
+Select2SearchInProgress=進行中の検索...
 SearchIntoThirdparties=サードパーティ
 SearchIntoContacts=コンタクト
 SearchIntoMembers=メンバー
 SearchIntoUsers=ユーザー
-SearchIntoProductsOrServices=Products or services
+SearchIntoProductsOrServices=製品またはサービス
 SearchIntoProjects=プロジェクト
-SearchIntoMO=Manufacturing Orders
+SearchIntoMO=製造オーダー
 SearchIntoTasks=タスク
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Vendor invoices
-SearchIntoCustomerOrders=Sales orders
-SearchIntoSupplierOrders=Purchase orders
+SearchIntoCustomerInvoices=顧客の請求書
+SearchIntoSupplierInvoices=仕入先の請求書
+SearchIntoCustomerOrders=受注
+SearchIntoSupplierOrders=注文書
 SearchIntoCustomerProposals=商用の提案
-SearchIntoSupplierProposals=Vendor proposals
+SearchIntoSupplierProposals=ベンダーの提案
 SearchIntoInterventions=介入
 SearchIntoContracts=契約
-SearchIntoCustomerShipments=Customer shipments
-SearchIntoExpenseReports=Expense reports
-SearchIntoLeaves=Leave
-SearchIntoTickets=Tickets
+SearchIntoCustomerShipments=顧客の出荷
+SearchIntoExpenseReports=経費報告書
+SearchIntoLeaves=離れる
+SearchIntoTickets=切符売場
+SearchIntoCustomerPayments=顧客の支払い
+SearchIntoVendorPayments=仕入先の支払い
+SearchIntoMiscPayments=その他の支払い
 CommentLink=コメント
-NbComments=Number of comments
-CommentPage=Comments space
-CommentAdded=Comment added
-CommentDeleted=Comment deleted
+NbComments=コメント数
+CommentPage=コメントスペース
+CommentAdded=コメントを追加
+CommentDeleted=コメントを削除
 Everybody=皆
-PayedBy=Paid by
-PayedTo=Paid to
+PayedBy=によって支払われました
+PayedTo=に支払われる
 Monthly=毎月
-Quarterly=Quarterly
-Annual=Annual
-Local=Local
-Remote=Remote
-LocalAndRemote=Local and Remote
-KeyboardShortcut=Keyboard shortcut
+Quarterly=四半期ごと
+Annual=毎年恒例
+Local=地元
+Remote=リモート
+LocalAndRemote=ローカルおよびリモート
+KeyboardShortcut=キーボードショートカット
 AssignedTo=影響を受ける
-Deletedraft=Delete draft
-ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
-SelectAThirdPartyFirst=Select a third party first...
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
-Inventory=Inventory
-AnalyticCode=Analytic code
+Deletedraft=下書き削除
+ConfirmMassDraftDeletion=下書き大量削除確
+FileSharedViaALink=リンクを介して共有されるファイル
+SelectAThirdPartyFirst=最初にサードパーティを選択してください...
+YouAreCurrentlyInSandboxMode=現在、%s「サンドボックス」モードになっています
+Inventory=在庫
+AnalyticCode=分析コード
 TMenuMRP=MRP
-ShowMoreInfos=Show More Infos
-NoFilesUploadedYet=Please upload a document first
-SeePrivateNote=See private note
-PaymentInformation=Payment information
-ValidFrom=Valid from
-ValidUntil=Valid until
-NoRecordedUsers=No users
-ToClose=To close
+ShowMoreInfos=詳細情報を表示
+NoFilesUploadedYet=最初にドキュメントをアップロードしてください
+SeePrivateNote=プライベートノートを見る
+PaymentInformation=支払情報
+ValidFrom=から有効
+ValidUntil=まで有効
+NoRecordedUsers=ユーザーなし
+ToClose=閉じるには
 ToProcess=処理するには
-ToApprove=To approve
-GlobalOpenedElemView=Global view
-NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
-NoArticlesFoundForTheCategory=No article found for the category
-ToAcceptRefuse=To accept | refuse
+ToApprove=承認するために
+GlobalOpenedElemView=グローバルビュー
+NoArticlesFoundForTheKeyword=キーワード「<strong>%s</strong>」の記事が見つかりません
+NoArticlesFoundForTheCategory=カテゴリの記事が見つかりません
+ToAcceptRefuse=受領 | 拒否
 ContactDefault_agenda=イベント
 ContactDefault_commande=オーダー
 ContactDefault_contrat=契約
 ContactDefault_facture=請求書
 ContactDefault_fichinter=介入
-ContactDefault_invoice_supplier=Supplier Invoice
-ContactDefault_order_supplier=Purchase Order
+ContactDefault_invoice_supplier=サプライヤーの請求書
+ContactDefault_order_supplier=注文書
 ContactDefault_project=プロジェクト
 ContactDefault_project_task=タスク
 ContactDefault_propal=提案
-ContactDefault_supplier_proposal=Supplier Proposal
-ContactDefault_ticket=Ticket
-ContactAddedAutomatically=Contact added from contact thirdparty roles
-More=More
-ShowDetails=Show details
-CustomReports=Custom reports
-StatisticsOn=Statistics on
-SelectYourGraphOptionsFirst=Select your graph options to build a graph
-Measures=Measures
-XAxis=X-Axis
-YAxis=Y-Axis
-StatusOfRefMustBe=Status of %s must be %s
-DeleteFileHeader=Confirm file delete
-DeleteFileText=Do you really want delete this file?
-ShowOtherLanguages=Show other languages
-SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for this language
-NotUsedForThisCustomer=Not used for this customer
-AmountMustBePositive=Amount must be positive
-ByStatus=By status
-InformationMessage=Information
-Used=Used
-ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
-MODIFYInDolibarr=Record %s modified
-DELETEInDolibarr=Record %s deleted
-VALIDATEInDolibarr=Record %s validated
-APPROVEDInDolibarr=Record %s approved
+ContactDefault_supplier_proposal=サプライヤー提案
+ContactDefault_ticket=チケット
+ContactAddedAutomatically=連絡先のサードパーティの役割から追加された連絡先
+More=もっと
+ShowDetails=詳細を表示
+CustomReports=カスタムレポート
+StatisticsOn=の統計
+SelectYourGraphOptionsFirst=グラフオプションを選択してグラフを作成します
+Measures=対策
+XAxis=X軸
+YAxis=Y軸
+StatusOfRefMustBe=%sのステータスは%sである必要があります
+DeleteFileHeader=ファイル削除の確認
+DeleteFileText=本当にこのファイルを削除しますか？
+ShowOtherLanguages=他の言語を表示する
+SwitchInEditModeToAddTranslation=この言語の翻訳を追加するには、編集モードに切り替えます
+NotUsedForThisCustomer=この顧客には使用されていません
+AmountMustBePositive=金額は正でなければなりません
+ByStatus=ステータス別
+InformationMessage=情報
+Used=中古
+ASAP=できるだけ速やかに
+CREATEInDolibarr=作成されたレコード%s
+MODIFYInDolibarr=レコード%sが変更されました
+DELETEInDolibarr=レコード%sが削除されました
+VALIDATEInDolibarr=検証済みのレコード%s
+APPROVEDInDolibarr=承認された記録%s
+DefaultMailModel=デフォルトのメールモデル
+PublicVendorName=ベンダーの公開名
+DateOfBirth=誕生日
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=セキュリティトークンの有効期限が切れたため、アクションはキャンセルされました。もう一度やり直してください。
+UpToDate=最新の
+OutOfDate=時代遅れ
+EventReminder=イベントリマインダー
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/ja_JP/margins.lang b/htdocs/langs/ja_JP/margins.lang
index f379cdf4d87..e2cda1b797d 100644
--- a/htdocs/langs/ja_JP/margins.lang
+++ b/htdocs/langs/ja_JP/margins.lang
@@ -1,44 +1,45 @@
 # Dolibarr language file - Source file is en_US - marges
 
-Margin=Margin
-Margins=Margins
-TotalMargin=Total Margin
-MarginOnProducts=Margin / Products
-MarginOnServices=Margin / Services
-MarginRate=Margin rate
-MarkRate=Mark rate
-DisplayMarginRates=Display margin rates
-DisplayMarkRates=Display mark rates
-InputPrice=Input price
-margin=Profit margins management
-margesSetup=Profit margins management setup
-MarginDetails=Margin details
-ProductMargins=Product margins
-CustomerMargins=Customer margins
-SalesRepresentativeMargins=Sales representative margins
-UserMargins=User margins
+Margin=利益
+Margins=利益
+TotalMargin=総利益
+MarginOnProducts=利益/製品
+MarginOnServices=利益/サービス
+MarginRate=利益率
+MarkRate=マーク率
+DisplayMarginRates=利益率を表示する
+DisplayMarkRates=マーク率を表示する
+InputPrice=入力価格
+margin=利益率管理
+margesSetup=利益率管理の設定
+MarginDetails=利益の詳細
+ProductMargins=製品利益
+CustomerMargins=顧客利益
+SalesRepresentativeMargins=営業担当者の利益
+ContactOfInvoice=請求書の連絡先
+UserMargins=ユーザー利益
 ProductService=製品やサービス
-AllProducts=All products and services
-ChooseProduct/Service=Choose product or service
-ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
-MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
-UseDiscountAsProduct=As a product
-UseDiscountAsService=As a service
-UseDiscountOnTotal=On subtotal
-MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best vendor price
-MargeType2=Margin on Weighted Average Price (WAP)
-MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
-CostPrice=Cost price
-UnitCharges=Unit charges
-Charges=Charges
-AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
-rateMustBeNumeric=Rate must be a numeric value
-markRateShouldBeLesserThan100=Mark rate should be lower than 100
-ShowMarginInfos=Show margin infos
-CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+AllProducts=すべての製品とサービス
+ChooseProduct/Service=製品またはサービスを選択すること
+ForceBuyingPriceIfNull=定義されていない場合、購入/原価を販売価格に強制する
+ForceBuyingPriceIfNullDetails=購入/原価が定義されておらず、このオプションが「オン」の場合、利益はオンラインでゼロになる（購入/原価=販売価格）。それ以外の場合（「オフ」）、利益は提案されたデフォルトと等しくなる。
+MARGIN_METHODE_FOR_DISCOUNT=グローバル割引の利益方式
+UseDiscountAsProduct=製品として
+UseDiscountAsService=サービスとして
+UseDiscountOnTotal=小計について
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=グローバル割引を製品、サービスとして扱うか、利益計算の小計としてのみ扱うかを定義する。
+MARGIN_TYPE=利益計算のためにデフォルトで提案された購入/原価
+MargeType1=最高のベンダー価格の利益
+MargeType2=加重平均価格（WAP）の利益
+MargeType3=原価利益
+MarginTypeDesc=*ベストバイイング価格の利益=販売価格-製品カードで定義されたベストベンダー価格<br> *加重平均価格（WAP）の利益=販売価格-製品加重平均価格（WAP）またはWAPがまだ定義されていない場合のベストベンダー価格<br> *利益onコスト価格=販売価格-コスト価格が定義されていない場合は製品カードまたはWAPで定義されたコスト価格、またはWAPがまだ定義されていない場合は最良のベンダー価格
+CostPrice=原価
+UnitCharges=ユニット料金
+Charges=料金
+AgentContactType=商業代理店の連絡先タイプ
+AgentContactTypeDetails=連絡先/住所ごとの利益レポートに使用される連絡先タイプ（請求書にリンクされている）を定義する。ほとんどの場合、連絡先が請求書で明示的に定義されていない可能性があるため、連絡先の統計の読み取りは信頼できないことに注意すること。
+rateMustBeNumeric=レートは数値でなければなりません
+markRateShouldBeLesserThan100=マーク率は100未満である必要がある
+ShowMarginInfos=利益情報を表示する
+CheckMargins=利益の詳細
+MarginPerSaleRepresentativeWarning=ユーザーあたりの利益のレポートは、サードパーティと営業担当者の間のリンクを使用して、各営業担当者の利益を計算する。一部のサードパーティには専任の営業担当者がいない場合や、一部のサードパーティが複数にリンクされている場合があるため、一部の金額はこのレポートに含まれない場合があり（営業担当者がいない場合）、一部は異なる行に表示される場合がある（営業担当者ごとに） 。
diff --git a/htdocs/langs/ja_JP/members.lang b/htdocs/langs/ja_JP/members.lang
index d2fca5cf7d3..d449616166c 100644
--- a/htdocs/langs/ja_JP/members.lang
+++ b/htdocs/langs/ja_JP/members.lang
@@ -1,204 +1,206 @@
 # Dolibarr language file - Source file is en_US - members
-MembersArea=メンバーエリア
-MemberCard=メンバーカード
+MembersArea=メンバエリア
+MemberCard=メンバカード
 SubscriptionCard=サブスクリプション·カード
-Member=メンバー
-Members=メンバー
-ShowMember=メンバーカードを提示
-UserNotLinkedToMember=ユーザーがメンバーにリンクされていません
-ThirdpartyNotLinkedToMember=Third party not linked to a member
-MembersTickets=メンバーチケット
-FundationMembers=Foundationのメンバー
+Member=メンバ
+Members=メンバ
+ShowMember=メンバカードを提示
+UserNotLinkedToMember=ユーザーがメンバにリンクされていない
+ThirdpartyNotLinkedToMember=メンバにリンクされていない取引先
+MembersTickets=メンバチケット
+FundationMembers=Foundationのメンバ
 ListOfValidatedPublicMembers=検証済みのパブリックメンバのリスト
-ErrorThisMemberIsNotPublic=このメンバは、パブリックではありません
-ErrorMemberIsAlreadyLinkedToThisThirdParty=別のメンバー（名前<b>：%s、</b>ログイン<b>：%s）</b>は既にサードパーティ製の<b>%s</b>にリンクされています。第三者が唯一のメンバー（およびその逆）にリンクすることはできませんので、最初にこのリンクを削除します。
-ErrorUserPermissionAllowsToLinksToItselfOnly=セキュリティ上の理由から、あなたはすべてのユーザーが自分のものでないユーザーにメンバをリンクすることができるように編集する権限を付与する必要があります。
+ErrorThisMemberIsNotPublic=このメンバは、パブリックではない
+ErrorMemberIsAlreadyLinkedToThisThirdParty=別のメンバ（名前<b>：%s、</b>ログイン<b>：%s）</b>は既に取引先製の<b>%s</b>にリンクされている。第三者が唯一のメンバ（およびその逆）にリンクすることはできないので、最初にこのリンクを削除する。
+ErrorUserPermissionAllowsToLinksToItselfOnly=セキュリティ上の理由から、あなたはすべてのユーザーが自分のものでないユーザーにメンバをリンクすることができるように編集する権限を付与する必要がある。
 SetLinkToUser=Dolibarrユーザーへのリンク
 SetLinkToThirdParty=Dolibarr第三者へのリンク
-MembersCards=メンバーの名刺
-MembersList=メンバーのリスト
-MembersListToValid=ドラフトのメンバーのリスト（検証する）
-MembersListValid=有効なメンバーのリスト
-MembersListUpToDate=サブスクリプションを最新の状態にある有効なメンバーのリスト
-MembersListNotUpToDate=日付のうち、サブスクリプションの有効なメンバーのリスト
-MembersListResiliated=List of terminated members
-MembersListQualified=修飾されたメンバーのリスト
-MenuMembersToValidate=ドラフトのメンバー
-MenuMembersValidated=検証メンバー
-MenuMembersUpToDate=最新のメンバーに
-MenuMembersNotUpToDate=日付メンバーのうち、
-MenuMembersResiliated=Terminated members
-MembersWithSubscriptionToReceive=受け取るために、サブスクリプションを持つメンバー
-MembersWithSubscriptionToReceiveShort=Subscription to receive
+MembersCards=メンバの名刺
+MembersList=メンバのリスト
+MembersListToValid=ドラフトのメンバのリスト（検証する）
+MembersListValid=有効なメンバのリスト
+MembersListUpToDate=最新のサブスクリプションを持つ有効なメンバのリスト
+MembersListNotUpToDate=サブスクリプションが古くなっている有効なメンバのリスト
+MembersListResiliated=終了したメンバのリスト
+MembersListQualified=修飾されたメンバのリスト
+MenuMembersToValidate=ドラフトのメンバ
+MenuMembersValidated=検証メンバ
+MenuMembersResiliated=終了したメンバ
+MembersWithSubscriptionToReceive=受け取るために、サブスクリプションを持つメンバ
+MembersWithSubscriptionToReceiveShort=受け取るサブスクリプション
 DateSubscription=サブスクリプションの日付
 DateEndSubscription=サブスクリプションの終了日
 EndSubscription=エンドサブスクリプション
 SubscriptionId=サブスクリプションID
-MemberId=メンバーID
-NewMember=新メンバー
-MemberType=メンバー型
-MemberTypeId=メンバーのタイプID
-MemberTypeLabel=メンバーのタイプラベル
-MembersTypes=メンバーの種類
-MemberStatusDraft=ドラフト（検証する必要があります）
+WithoutSubscription=サブスクリプションなし
+MemberId=メンバID
+NewMember=新メンバ
+MemberType=メンバ型
+MemberTypeId=メンバの種別ID
+MemberTypeLabel=メンバの種別ラベル
+MembersTypes=メンバの種類
+MemberStatusDraft=ドラフト（検証する必要がある）
 MemberStatusDraftShort=ドラフト
 MemberStatusActive=検証（サブスクリプションを待っている）
 MemberStatusActiveShort=検証
-MemberStatusActiveLate=Subscription expired
+MemberStatusActiveLate=サブスクリプションの有効期限が切れた
 MemberStatusActiveLateShort=期限切れの
 MemberStatusPaid=最新のサブスクリプション
 MemberStatusPaidShort=最新の
-MemberStatusResiliated=Terminated member
-MemberStatusResiliatedShort=Terminated
-MembersStatusToValid=ドラフトのメンバー
-MembersStatusResiliated=Terminated members
-MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusResiliated=終了メンバ
+MemberStatusResiliatedShort=終了しました
+MembersStatusToValid=ドラフトのメンバ
+MembersStatusResiliated=終了したメンバ
+MemberStatusNoSubscription=検証済み（サブスクリプションは不要）
 MemberStatusNoSubscriptionShort=検証
-SubscriptionNotNeeded=No subscription needed
-NewCotisation=新しい貢献
-PaymentSubscription=新しい貢献の支払い
+SubscriptionNotNeeded=サブスクリプションは必要ない
+NewCotisation=新規貢献
+PaymentSubscription=新規貢献の支払い
 SubscriptionEndDate=サブスクリプションの終了日
-MembersTypeSetup=メンバー·タイプの設定
-MemberTypeModified=Member type modified
-DeleteAMemberType=Delete a member type
-ConfirmDeleteMemberType=Are you sure you want to delete this member type?
-MemberTypeDeleted=Member type deleted
-MemberTypeCanNotBeDeleted=Member type can not be deleted
-NewSubscription=新しいサブスクリプション
-NewSubscriptionDesc=このフォームは、基礎の新しいメンバーとして、サブスクリプションを記録することができます。あなたが（メンバーが既に存在する場合）、サブスクリプションを更新したい場合は、電子メール%sではなく基礎ボードをご連絡ください。
+MembersTypeSetup=メンバ·種別の設定
+MemberTypeModified=メンバ種別が変更された
+DeleteAMemberType=メンバ種別を削除する
+ConfirmDeleteMemberType=このメンバ種別を削除してもよいか？
+MemberTypeDeleted=メンバ種別が削除された
+MemberTypeCanNotBeDeleted=メンバ種別は削除できない
+NewSubscription=新規サブスクリプション
+NewSubscriptionDesc=このフォームで、財団の新規メンバとして、サブスクリプションを記録することができる。あなたが（既にメンバであり）、サブスクリプションを更新したい場合は、電子メール%sではなく財団理事会に連絡すること。
 Subscription=サブスクリプション
 Subscriptions=サブスクリプション
 SubscriptionLate=遅い
-SubscriptionNotReceived=サブスクリプションは、受信したことはありません
+SubscriptionNotReceived=サブスクリプションは、受信したことはない
 ListOfSubscriptions=サブスクリプションのリスト
-SendCardByMail=Send card by email
-AddMember=Create member
-NoTypeDefinedGoToSetup=いいえメンバーのタイプが定義されていません。セットアップに行く - メンバーの種類
-NewMemberType=新しいメンバの型
-WelcomeEMail=Welcome email
+SendCardByMail=カードをメールで送信
+AddMember=メンバを作成する
+NoTypeDefinedGoToSetup=メンバの種別が定義されていない。メニュー "メンバ種別" に行く
+NewMemberType=新規メンバの種別
+WelcomeEMail=ウェルカムメール
 SubscriptionRequired=サブスクリプションが必要
 DeleteType=削除する
 VoteAllowed=許可される投票
 Physical=物理的な
 Moral=道徳
-MorPhy=自然
+MorAndPhy=道徳的および物理的
 Reenable=再度有効にする
-ResiliateMember=Terminate a member
-ConfirmResiliateMember=Are you sure you want to terminate this member?
-DeleteMember=メンバーを削除する
-ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions)?
+ResiliateMember=メンバを終了する
+ConfirmResiliateMember=このメンバを終了してもよいか？
+DeleteMember=メンバを削除する
+ConfirmDeleteMember=このメンバを削除してもよいか（メンバを削除すると、すべてのサブスクリプションが削除される）。
 DeleteSubscription=サブスクリプションを削除する
-ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
+ConfirmDeleteSubscription=このサブスクリプションを削除してもよいか？
 Filehtpasswd=htpasswdファイル
-ValidateMember=メンバーを検証する
-ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
-PublicMemberList=公共のメンバーリスト
-BlankSubscriptionForm=Public self-subscription form
-BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
-EnablePublicSubscriptionForm=Enable the public website with self-subscription form
-ForceMemberType=Force the member type
-ExportDataset_member_1=メンバーとサブスクリプション
-ImportDataset_member_1=メンバー
-LastMembersModified=Latest %s modified members
-LastSubscriptionsModified=Latest %s modified subscriptions
+ValidateMember=メンバを検証する
+ConfirmValidateMember=このメンバを検証してもよいか？
+FollowingLinksArePublic=次のリンクは、Dolibarrの許可によって保護されていない開いているページです。これらはフォーマットされたページではなく、メンバデータベースを一覧表示する方法を示す例として提供されている。
+PublicMemberList=公共のメンバリスト
+BlankSubscriptionForm=パブリックセルフサブスクリプションフォーム
+BlankSubscriptionFormDesc=Dolibarrは、外部の訪問者が財団への登録を依頼できるように、公開URL /ウェブサイトを提供できる。オンライン支払いモジュールが有効になっている場合、支払いフォームも自動的に提供される場合がある。
+EnablePublicSubscriptionForm=セルフサブスクリプションフォームで公開ウェブサイトを有効にする
+ForceMemberType=メンバ種別を強制する
+ExportDataset_member_1=メンバとサブスクリプション
+ImportDataset_member_1=メンバ
+LastMembersModified=最新%sの変更メンバ
+LastSubscriptionsModified=最新%sの変更されたサブスクリプション
 String=文字列
 Text=テキスト
 Int=int型
 DateAndTime=日時
-PublicMemberCard=メンバーパブリックカード
-SubscriptionNotRecorded=Subscription not recorded
-AddSubscription=Create subscription
+PublicMemberCard=メンバパブリックカード
+SubscriptionNotRecorded=サブスクリプションは記録されていない
+AddSubscription=サブスクリプションを作成する
 ShowSubscription=サブスクリプションを表示する
 # Label of email templates
-SendingAnEMailToMember=Sending information email to member
-SendingEmailOnAutoSubscription=Sending email on auto registration
-SendingEmailOnMemberValidation=Sending email on new member validation
-SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
-SendingEmailOnCancelation=Sending email on cancelation
+SendingAnEMailToMember=メンバに情報メールを送信する
+SendingEmailOnAutoSubscription=自動登録に関するメールの送信
+SendingEmailOnMemberValidation=新規メンバの検証に関するメールの送信
+SendingEmailOnNewSubscription=新規サブスクリプションでメールを送信する
+SendingReminderForExpiredSubscription=期限切れのサブスクリプションのリマインダーを送信する
+SendingEmailOnCancelation=キャンセル時にメールを送信する
+SendingReminderActionComm=議題イベントのリマインダーを送信する
 # Topic of email templates
-YourMembershipRequestWasReceived=Your membership was received.
-YourMembershipWasValidated=Your membership was validated
-YourSubscriptionWasRecorded=Your new subscription was recorded
-SubscriptionReminderEmail=Subscription reminder
-YourMembershipWasCanceled=Your membership was canceled
+YourMembershipRequestWasReceived=メンバシップを受け取りました。
+YourMembershipWasValidated=メンバシップが検証された
+YourSubscriptionWasRecorded=新規サブスクリプションが記録された
+SubscriptionReminderEmail=サブスクリプションリマインダー
+YourMembershipWasCanceled=メンバシップがキャンセルされた
 CardContent=あなたの会員カードの内容
 # Text of email templates
-ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
-ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
-ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
-ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Sender Email for automatic emails
+ThisIsContentOfYourMembershipRequestWasReceived=メンバシップリクエストを受信したことをお知らせする。 <br> <br>
+ThisIsContentOfYourMembershipWasValidated=メンバシップが次の情報で検証されたことをお知らせする：<br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=新規サブスクリプションが記録されたことをお知らせする。 <br> <br>
+ThisIsContentOfSubscriptionReminderEmail=サブスクリプションの有効期限が近づいているか、すでに有効期限が切れていることをお知らせする（__MEMBER_LAST_SUBSCRIPTION_DATE_END__）。更新していただければ幸いです。 <br> <br>
+ThisIsContentOfYourCard=これは私たちがあなたについて持っている情報の要約です。何かが不正確であれば連絡すること。 <br> <br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=ゲストの自動登録の場合に受信する通知メールの件名
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=ゲストの自動登録の場合に受信する通知メールの内容
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=メンバの自動サブスクリプションでメンバに電子メールを送信するために使用する電子メールテンプレート
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=メンバの検証時にメンバに電子メールを送信するために使用する電子メールテンプレート
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=新規サブスクリプションの記録でメンバに電子メールを送信するために使用する電子メールテンプレート
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=サブスクリプションの有効期限が近づいたときにメールリマインダーを送信するために使用するメールテンプレート
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=メンバのキャンセル時にメンバに電子メールを送信するために使用する電子メールテンプレート
+DescADHERENT_MAIL_FROM=自動メールの送信者メール
 DescADHERENT_ETIQUETTE_TYPE=ラベルページのフォーマット
-DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_ETIQUETTE_TEXT=メンバのアドレスシートに印刷されたテキスト
 DescADHERENT_CARD_TYPE=カードのページのフォーマット
-DescADHERENT_CARD_HEADER_TEXT=メンバーカードの上に印刷されたテキスト
-DescADHERENT_CARD_TEXT=テキストは、（左揃え）メンバーカードに印刷
-DescADHERENT_CARD_TEXT_RIGHT=テキストは（右揃え）のメンバーカードに印刷
-DescADHERENT_CARD_FOOTER_TEXT=メンバーカードの下部に印刷されたテキスト
-ShowTypeCard=タイプ &quot;%s&quot;を表示
+DescADHERENT_CARD_HEADER_TEXT=メンバカードの上に印刷されたテキスト
+DescADHERENT_CARD_TEXT=テキストは、（左揃え）メンバカードに印刷
+DescADHERENT_CARD_TEXT_RIGHT=テキストは（右揃え）のメンバカードに印刷
+DescADHERENT_CARD_FOOTER_TEXT=メンバカードの下部に印刷されたテキスト
+ShowTypeCard=種別 &quot;%s&quot;を表示
 HTPasswordExport=htpasswordファイルの生成
-NoThirdPartyAssociatedToMember=このメンバに関連付けられているサードパーティません
-MembersAndSubscriptions= メンバーとSubscriptions
+NoThirdPartyAssociatedToMember=このメンバに関連付けられている取引先ません
+MembersAndSubscriptions= メンバとSubscriptions
 MoreActions=記録上の相補的なアクション
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
-MoreActionBankDirect=Create a direct entry on bank account
-MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
-MoreActionInvoiceOnly=なし支払いで請求書を作成します。
+MoreActionsOnSubscription=サブスクリプションを記録するときにデフォルトで提案される補完的なアクション
+MoreActionBankDirect=銀行口座に直接エントリを作成する
+MoreActionBankViaInvoice=請求書と銀行口座での支払いを作成する
+MoreActionInvoiceOnly=なし支払いで請求書を作成する。
 LinkToGeneratedPages=訪問カードを生成
-LinkToGeneratedPagesDesc=この画面では、すべてのメンバーまたは特定のメンバーのためのビジネスカードを持つPDFファイルを生成することができます。
-DocForAllMembersCards=すべてのメンバー<b>（：%s</b>フォーマット出力の実際のセットアップ）のためのビジネスカードを生成
-DocForOneMemberCards=特定のメンバーの名刺を<b>（：%s</b>出力実際にセットアップするためのフォーマット）を生成
-DocForLabels=アドレスシート<b>（：%s</b>出力の形式は実際のセットアップ）を生成
+LinkToGeneratedPagesDesc=この画面では、すべてのメンバまたは特定のメンバのためのビジネスカードを持つPDFファイルを生成することができる。
+DocForAllMembersCards=すべてのメンバ<b>（：%s</b>フォーマット出力の実際の設定）のためのビジネスカードを生成
+DocForOneMemberCards=特定のメンバの名刺を<b>（：%s</b>出力実際に設定するためのフォーマット）を生成
+DocForLabels=アドレスシート<b>（：%s</b>出力の形式は実際の設定）を生成
 SubscriptionPayment=サブスクリプション費用の支払い
-LastSubscriptionDate=Date of latest subscription payment
-LastSubscriptionAmount=Amount of latest subscription
-MembersStatisticsByCountries=国別メンバー統計
-MembersStatisticsByState=都道府県/州によってメンバーの統計
-MembersStatisticsByTown=町によってメンバーの統計
-MembersStatisticsByRegion=Members statistics by region
+LastSubscriptionDate=最新のサブスクリプション支払いの日付
+LastSubscriptionAmount=最新のサブスクリプションの量
+MembersStatisticsByCountries=国別メンバ統計
+MembersStatisticsByState=都道府県/州によってメンバの統計
+MembersStatisticsByTown=町によってメンバの統計
+MembersStatisticsByRegion=地域別の会員統計
 NbOfMembers=会員数
-NoValidatedMemberYet=いいえ検証メンバーが見つかりませんでした
-MembersByCountryDesc=この画面には、国によるメンバーの統計情報を表示します。グラフィックは、Googleのオンライングラフサービスに依存しますが、インターネット接続が機能している場合にのみ使用できます。
-MembersByStateDesc=この画面では、州/地方/州によってメンバーにあなたの統計を示しています。
-MembersByTownDesc=この画面には、町でメンバーの統計情報を表示します。
+NbOfActiveMembers=現在アクティブなメンバの数
+NoValidatedMemberYet=いいえ検証メンバが見つからなかった
+MembersByCountryDesc=この画面には、国によるメンバの統計情報を表示する。グラフィックは、Googleのオンライングラフサービスに依存するが、インターネット接続が機能している場合にのみ使用できる。
+MembersByStateDesc=この画面では、州/地方/州によってメンバにあなたの統計を示している。
+MembersByTownDesc=この画面には、町でメンバの統計情報を表示する。
 MembersStatisticsDesc=読みたい統計を選択...
 MenuMembersStats=統計
-LastMemberDate=Latest member date
+LastMemberDate=最新の会員日
 LatestSubscriptionDate=最後のサブスクリプションの日付
-MemberNature=Nature of member
+MemberNature=メンバの性質
+MembersNature=メンバの性質
 Public=情報が公開されている
-NewMemberbyWeb=新しいメンバーが追加されました。承認を待っている
-NewMemberForm=新しいメンバーフォーム
+NewMemberbyWeb=新規メンバが追加された。承認を待っている
+NewMemberForm=新規メンバフォーム
 SubscriptionsStatistics=サブスクリプションの統計
 NbOfSubscriptions=サブスクリプションの数
 AmountOfSubscriptions=サブスクリプションの量
-TurnoverOrBudget=売上高（会社の場合）または予算（基礎用）
+TurnoverOrBudget=売上高（法人の場合）または予算（基礎用）
 DefaultAmount=サブスクリプションのデフォルトの量
-CanEditAmount=訪問者は、そのサブスクリプションの量を選択/編集することができます
+CanEditAmount=訪問者は、そのサブスクリプションの量を選択/編集することができる
 MEMBER_NEWFORM_PAYONLINE=統合されたオンライン決済のページにジャンプ
-ByProperties=By nature
-MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
-VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No VAT for subscriptions
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
-NameOrCompany=Name or company
-SubscriptionRecorded=Subscription recorded
-NoEmailSentToMember=No email sent to member
-EmailSentToMember=Email sent to member at %s
-SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
-MembershipPaid=Membership paid for current period (until %s)
-YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
-XMembersClosed=%s member(s) closed
+ByProperties=本質的に
+MembersStatisticsByProperties=本質的にメンバの統計
+MembersByNature=この画面には、メンバの性質に関する統計が表示される。
+MembersByRegion=この画面には、地域ごとのメンバの統計が表示される。
+VATToUseForSubscriptions=サブスクリプションに使用するVAT率
+NoVatOnSubscription=サブスクリプションのVATなし
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=請求書へのサブスクリプションラインに使用される製品：%s
+NameOrCompany=名前または法人
+SubscriptionRecorded=サブスクリプションが記録された
+NoEmailSentToMember=メンバにメールが送信されません
+EmailSentToMember=%sでメンバに送信された電子メール
+SendReminderForExpiredSubscriptionTitle=期限切れのサブスクリプションについてメールでリマインダーを送信する
+SendReminderForExpiredSubscription=サブスクリプションの有効期限が近づいたときに、メンバにメールでリマインダーを送信する（パラメーターは、リマインダーを送信するサブスクリプションの終了までの日数。セミコロンで区切った日数のリストにすることができる。 例：'10; 5; 0; -5'）
+MembershipPaid=現在の期間に支払われたメンバシップ（%sまで）
+YouMayFindYourInvoiceInThisEmail=このメールに請求書が添付されている場合がある
+XMembersClosed=%sメンバ(s)がクローズした
diff --git a/htdocs/langs/ja_JP/modulebuilder.lang b/htdocs/langs/ja_JP/modulebuilder.lang
index 460aef8103b..00c0d9c6851 100644
--- a/htdocs/langs/ja_JP/modulebuilder.lang
+++ b/htdocs/langs/ja_JP/modulebuilder.lang
@@ -1,142 +1,142 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
-EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
-EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
-ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
-ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
-ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
-NewModule=New module
-NewObjectInModulebuilder=New object
-ModuleKey=Module key
-ObjectKey=Object key
-ModuleInitialized=Module initialized
-FilesForObjectInitialized=Files for new object '%s' initialized
-FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
-ModuleBuilderDescdescription=Enter here all general information that describe your module.
-ModuleBuilderDescspecifications=You can enter here a detailed description of the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommended to use Asciidoc format (comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
-ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A CRUD DAO class, SQL files, page to list record of objects, to create/edit/view a record and an API will be generated.
-ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
-ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
-ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file.
-ModuleBuilderDeschooks=This tab is dedicated to hooks.
-ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
-ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
-DangerZone=Danger zone
-BuildPackage=Build package
-BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
-BuildDocumentation=Build documentation
-ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here
-ModuleIsLive=This module has been activated. Any change may break a current live feature.
-DescriptionLong=Long description
-EditorName=Name of editor
-EditorUrl=URL of editor
-DescriptorFile=Descriptor file of module
-ClassFile=File for PHP DAO CRUD class
-ApiClassFile=File for PHP API class
-PageForList=PHP page for list of record
-PageForCreateEditView=PHP page to create/edit/view a record
-PageForAgendaTab=PHP page for event tab
-PageForDocumentTab=PHP page for document tab
-PageForNoteTab=PHP page for note tab
-PathToModulePackage=Path to zip of module/application package
-PathToModuleDocumentation=Path to file of module/application documentation (%s)
-SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
-FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Force update of .class and .sql files
-RegenerateMissingFiles=Generate missing files
-SpecificationFile=File of documentation
-LanguageFile=File for language
-ObjectProperties=Object Properties
-ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
-NotNull=Not NULL
-NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
-SearchAll=Used for 'search all'
-DatabaseIndex=Database index
-FileAlreadyExists=File %s already exists
-TriggersFile=File for triggers code
-HooksFile=File for hooks code
-ArrayOfKeyValues=Array of key-val
-ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
-WidgetFile=Widget file
-CSSFile=CSS file
-JSFile=Javascript file
-ReadmeFile=Readme file
-ChangeLog=ChangeLog file
-TestClassFile=File for PHP Unit Test class
-SqlFile=Sql file
-PageForLib=File for the common PHP library
-PageForObjLib=File for the PHP library dedicated to object
-SqlFileExtraFields=Sql file for complementary attributes
-SqlFileKey=Sql file for keys
-SqlFileKeyExtraFields=Sql file for keys of complementary attributes
-AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
-UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
-IsAMeasure=Is a measure
-DirScanned=Directory scanned
-NoTrigger=No trigger
-NoWidget=No widget
-GoToApiExplorer=Go to API explorer
-ListOfMenusEntries=List of menu entries
-ListOfDictionariesEntries=List of dictionaries entries
-ListOfPermissionsDefined=List of defined permissions
-SeeExamples=See examples here
-EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
-DisplayOnPdf=Display on PDF
-IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
-SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
-SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
-LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module
-DictionariesDefDesc=Define here the dictionaries provided by your module
-PermissionsDefDesc=Define here the new permissions provided by your module
-MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
-DictionariesDefDescTooltip=The dictionaries provided by your module/application are defined into the array <strong>$this->dictionaries</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), dictionaries are also visible into the setup area to administrator users on %s.
-PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
-HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
-TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
-SeeIDsInUse=See IDs in use in your installation
-SeeReservedIDsRangeHere=See range of reserved IDs
-ToolkitForDevelopers=Toolkit for Dolibarr developers
-TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the native module builder wizard.<br>Enable the module <strong>%s</strong> and use the wizard by clicking the <span class="fa fa-bug"></span> on the top right menu.<br>Warning: This is an advanced developer feature, do <b>not</b> experiment on your production site!
-SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
-AddLanguageFile=Add language file
-YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
-TableDoesNotExists=The table %s does not exists
-TableDropped=Table %s deleted
-InitStructureFromExistingTable=Build the structure array string of an existing table
-UseAboutPage=Disable the about page
-UseDocFolder=Disable the documentation folder
-UseSpecificReadme=Use a specific ReadMe
-ContentOfREADMECustomized=Note: The content of the README.md file has been replaced with the specific value defined into setup of ModuleBuilder.
-RealPathOfModule=Real path of module
-ContentCantBeEmpty=Content of file can't be empty
-WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
-CSSDesc=You can generate and edit here a file with personalized CSS embedded with your module.
-JSDesc=You can generate and edit here a file with personalized Javascript embedded with your module.
-CLIDesc=You can generate here some command line scripts you want to provide with your module.
-CLIFile=CLI File
-NoCLIFile=No CLI files
-UseSpecificEditorName = Use a specific editor name
-UseSpecificEditorURL = Use a specific editor URL
-UseSpecificFamily = Use a specific family
-UseSpecificAuthor = Use a specific author
-UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
-IncludeRefGeneration=The reference of object must be generated automatically
-IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
-IncludeDocGeneration=I want to generate some documents from the object
-IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
-ShowOnCombobox=Show value into combobox
-KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
-NotEditable=Not editable
-ForeignKey=Foreign key
-TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
-AsciiToHtmlConverter=Ascii to HTML converter
-AsciiToPdfConverter=Ascii to PDF converter
-TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderDesc=このツールは、経験豊富なユーザーまたは開発者のみが使用する必要がある。独自のモジュールを構築または編集するためのユーティリティを提供する。代替の<a href="%s" target="_blank">手動開発のドキュメントは、</a>にある。
+EnterNameOfModuleDesc=作成するモジュール/アプリケーションの名前をスペースなしで入力する。大文字を使用して単語を区切る（例：MyModule、EcommerceForShop、SyncWithMySystem ...）
+EnterNameOfObjectDesc=作成するオブジェクトの名前をスペースなしで入力する。大文字を使用して単語を区切る（例：MyObject、Student、Teacher ...）。 CRUDクラスファイルだけでなく、APIファイル、オブジェクトを一覧表示/追加/編集/削除するページ、およびSQLファイルが生成される。
+ModuleBuilderDesc2=モジュールが生成/編集されるパス（%sに定義された外部モジュールの最初のディレクトリ）：<strong> %s </strong>
+ModuleBuilderDesc3=生成された/編集可能なモジュールが見つかった：<strong> %s </strong>
+ModuleBuilderDesc4=ファイル<strong>%s </strong>がモジュールディレクトリのルートに存在する場合、モジュールは「編集可能」として検出される。
+NewModule=新規モジュール
+NewObjectInModulebuilder=新規オブジェクト
+ModuleKey=モジュールキー
+ObjectKey=オブジェクトキー
+ModuleInitialized=モジュールが初期化された
+FilesForObjectInitialized=初期化された新規オブジェクト '%s'のファイル
+FilesForObjectUpdated=オブジェクト「%s」のファイルが更新された（.sqlファイルおよび.class.phpファイル）
+ModuleBuilderDescdescription=モジュールを説明するすべての一般情報をここに入力する。
+ModuleBuilderDescspecifications=まだ他のタブに構造化されていないモジュール仕様の詳細説明をここに入力できる。したがって、開発するすべてのルールに簡単にアクセスできる。また、このテキストコンテンツは、生成されたドキュメントに含まれる（最後のタブを参照）。 Markdown形式を使用できるが、Asciidoc形式を使用することをお勧めする（.mdと.asciidocの比較： http://asciidoctor.org/docs/user-manual/#compared-to-markdown ）。
+ModuleBuilderDescobjects=ここで、モジュールで管理するオブジェクトを定義する。 CRUD DAOクラス、SQLファイル、オブジェクトのレコードを一覧表示するページ、レコードを作成/編集/表示するためのページ、およびAPIが生成される。
+ModuleBuilderDescmenus=このタブは、モジュールによって提供されるメニューエントリを定義するためのもの。
+ModuleBuilderDescpermissions=このタブは、モジュールに提供する新規権限を定義するためのもの。
+ModuleBuilderDesctriggers=これは、モジュールによって提供されるトリガーのビュー。トリガーされたビジネスイベントの起動時に実行されるコードを含めるには、このファイルを編集するだけ。
+ModuleBuilderDeschooks=このタブはフック専用。
+ModuleBuilderDescwidgets=このタブは、ウィジェットの管理/構築専用。
+ModuleBuilderDescbuildpackage=ここで、モジュールの「配布準備完了」パッケージファイル（正規化された.zipファイル）と「配布準備完了」ドキュメントファイルを生成できる。ボタンをクリックするだけで、パッケージまたはドキュメントファイルを作成できる。
+EnterNameOfModuleToDeleteDesc=モジュールを削除できる。警告：モジュールのすべてのコーディングファイル（手動で生成または作成されたもの）および構造化されたデータとドキュメントは削除される！
+EnterNameOfObjectToDeleteDesc=オブジェクトを削除できる。警告：オブジェクトに関連するすべてのコーディングファイル（手動で生成または作成されたもの）は削除される！
+DangerZone=危険区域
+BuildPackage=パッケージをビルドする
+BuildPackageDesc=アプリケーションのzipパッケージを生成して、Dolibarrで配布する準備を整えることができる。また、<a href="https://www.dolistore.com"> DoliStore.com</a>のようなマーケットプレイスで配布または販売することもできる。
+BuildDocumentation=ドキュメントを作成する
+ModuleIsNotActive=このモジュールはまだアクティブ化されていない。 %sにアクセスしてライブにするか、ここをクリックすること
+ModuleIsLive=このモジュールはアクティブ化されている。変更を加えると、現在のライブ機能が破損する可能性がある。
+DescriptionLong=長い説明
+EditorName=編集者の名前
+EditorUrl=編集者のURL
+DescriptorFile=モジュールの記述子ファイル
+ClassFile=PHP DAOCRUDクラスのファイル
+ApiClassFile=PHPAPIクラスのファイル
+PageForList=レコードのリストのPHPページ
+PageForCreateEditView=レコードを作成/編集/表示するためのPHPページ
+PageForAgendaTab=イベントタブのPHPページ
+PageForDocumentTab=ドキュメントタブのPHPページ
+PageForNoteTab=メモタブのPHPページ
+PathToModulePackage=モジュール/アプリケーションパッケージのzipへのパス
+PathToModuleDocumentation=モジュール/アプリケーションドキュメントのファイルへのパス（%s）
+SpaceOrSpecialCharAreNotAllowed=スペースや特殊文字は使用できない。
+FileNotYetGenerated=ファイルはまだ生成されていない
+RegenerateClassAndSql=.classファイルと.sqlファイルの強制更新
+RegenerateMissingFiles=不足しているファイルを生成する
+SpecificationFile=ドキュメントのファイル
+LanguageFile=言語のファイル
+ObjectProperties=オブジェクトのプロパティ
+ConfirmDeleteProperty=プロパティ<strong>%s </strong>を削除してもよいか？これにより、PHPクラスのコードが変更されるが、オブジェクトのテーブル定義から列も削除される。
+NotNull=NULLではない
+NotNullDesc=1 =データベースをNOTNULLに設定する。 -1 = null値を許可し、空（ ''または0）の場合は値をNULLに強制する。
+SearchAll=「すべて検索」に使用
+DatabaseIndex=データベースインデックス
+FileAlreadyExists=ファイル%sはすでに存在する
+TriggersFile=トリガーコードのファイル
+HooksFile=フックコードのファイル
+ArrayOfKeyValues=key-valの配列
+ArrayOfKeyValuesDesc=フィールドが固定値のコンボリストの場合のキーと値の配列
+WidgetFile=ウィジェットファイル
+CSSFile=CSSファイル
+JSFile=Javascriptファイル
+ReadmeFile=Readmeファイル
+ChangeLog=ChangeLogファイル
+TestClassFile=PHPユニットテストクラスのファイル
+SqlFile=SQLファイル
+PageForLib=一般的なPHPライブラリのファイル
+PageForObjLib=オブジェクト専用のPHPライブラリのファイル
+SqlFileExtraFields=補完属性のSQLファイル
+SqlFileKey=キーのSQLファイル
+SqlFileKeyExtraFields=補完的な属性のキーのSQLファイル
+AnObjectAlreadyExistWithThisNameAndDiffCase=この名前と別の大文字小文字のオブジェクトはすでに存在する
+UseAsciiDocFormat=Markdown形式を使用できるが、Asciidoc形式を使用することをお勧めする（.mdと.asciidocの比較： http://asciidoctor.org/docs/user-manual/#compared-to-markdown ）
+IsAMeasure=尺度は
+DirScanned=スキャンされたディレクトリ
+NoTrigger=トリガーなし
+NoWidget=ウィジェットなし
+GoToApiExplorer=APIエクスプローラー
+ListOfMenusEntries=メニューエントリのリスト
+ListOfDictionariesEntries=辞書エントリのリスト
+ListOfPermissionsDefined=定義された権限のリスト
+SeeExamples=こちらの例をご覧ください
+EnabledDesc=このフィールドをアクティブにする条件（例：1または$ conf-> global-> MYMODULE_MYOPTION）
+VisibleDesc=フィールドは表示されているか？ （例：0 =表示されない、1 =リストおよび作成/更新/表示フォームで表示、2 =リストでのみ表示、3 =作成/更新/表示フォームでのみ表示（リストではない）、4 =リストおよび更新/表示フォームでのみ表示（作成しない）、5 =リストおよび表示フォームでのみ表示（作成しない、更新しない）<br> <br>負の値を使用すると、フィールドはデフォルトでリストに表示されないが、表示用に選択できる）。 <br> <br>これは、次のような式にできる。例: <br> preg_match('/public/', $_SERVER['PHP_SELF'])?0:<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=互換性のあるPDFドキュメントでこのフィールドを表示する。「位置」フィールドで位置を管理できる。<br/>現在、既知の互換性のあるPDFモデルは次のとおり  : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>ドキュメントに対して :</strong><br/>0 = 非表示 <br/>1 = 表示<br/>2 = 空でない場合のみ表示<br/><br/><strong>ドキュメント行に対して :</strong><br/>0 = 非表示 <br/>1 = カラム内で表示<br/>3 = 説明欄の後の行説明カラムの中で表示<br/>4 = 空でない場合のみ、説明欄の後の行説明カラムの中で表示
+DisplayOnPdf=PDFで表示
+IsAMeasureDesc=フィールドの値を累積して、合計をリストに入れることはできるか？ （例：1または0）
+SearchAllDesc=クイック検索ツールから検索するためにフィールドが使用されているか？ （例：1または0）
+SpecDefDesc=他のタブでまだ定義されていない、モジュールで提供するすべてのドキュメントをここに入力する。豊富な.asciidoc構文である.md以上を使用できる。
+LanguageDefDesc=このファイルに、各言語ファイルのすべてのキーと翻訳を入力する。
+MenusDefDesc=モジュールが提供するメニューをここで定義する
+DictionariesDefDesc=モジュールが提供する辞書をここで定義する
+PermissionsDefDesc=モジュールによって提供される新規権限をここで定義する
+MenusDefDescTooltip=モジュール/アプリケーションによって提供されるメニューは、モジュール記述子ファイルの配列<strong> $ this-> menus</strong>に定義されている。このファイルを手動で編集するか、埋め込みエディターを使用できる。 <br> <br>注：定義されると（およびモジュールが再アクティブ化されると）、メニューは%sの管理者ユーザーが使用できるメニューエディターにも表示される。
+DictionariesDefDescTooltip=モジュール/アプリケーションによって提供されるディクショナリは、モジュール記述子ファイルの配列<strong> $ this-> dictionaries</strong>に定義されている。このファイルを手動で編集するか、埋め込みエディターを使用できる。 <br> <br>注：定義（およびモジュールの再アクティブ化）が完了すると、%sの管理者ユーザーには辞書もセットアップ領域に表示される。
+PermissionsDefDescTooltip=モジュール/アプリケーションによって提供されるアクセス許可は、配列<strong> $ this-> rights</strong>にモジュール記述子ファイルに定義される。このファイルを手動で編集するか、埋め込みエディターを使用できる。 <br> <br>注：定義されると（およびモジュールが再アクティブ化されると）、アクセス許可はデフォルトのアクセス許可セットアップ%sに表示される。
+HooksDefDesc=定義する：管理したいフックのコンテキストを <b>module_parts['hooks']</b> プロパティのモジュール記述子の中に。 (コンテキストのリストは、コアコードで '<b>initHooks(</b>' を検索すると見つかる).<br>編集する：フックされた関数のコードを追加するためのフックファイルを。 (フック可能な関数は、コアコードで '<b>executeHooks</b>' を検索すると見つかる).
+TriggerDefDesc=実行されるビジネスイベントごとに実行するコードをトリガーファイルで定義する。
+SeeIDsInUse=インストールで使用されているIDを確認する
+SeeReservedIDsRangeHere=予約済みIDの範囲を参照すること
+ToolkitForDevelopers=Dolibarr開発者向けのツールキット
+TryToUseTheModuleBuilder=SQLとPHPの知識がある場合は、ネイティブモジュールビルダーウィザードを使用できる。 <br>モジュール<strong>%s </strong>を有効にし、右上のメニューで<span class="fa fa-bug"></span>をクリックしてウィザードを使用する。 <br>警告：これは高度な開発者機能。本番サイトで</b>実験ではなく<b>を実行すること。
+SeeTopRightMenu=右上のメニューの<span class="fa fa-bug"></span>を参照すること
+AddLanguageFile=言語ファイルを追加する
+YouCanUseTranslationKey=ここでは、言語ファイルにある翻訳キーであるキーを使用できる（「言語」タブを参照）。
+DropTableIfEmpty=（空の場合はテーブルを削除する）
+TableDoesNotExists=テーブル%sは存在しない
+TableDropped=テーブル%sが削除された
+InitStructureFromExistingTable=既存のテーブルの構造体配列文字列を作成する
+UseAboutPage=アバウトページを無効にする
+UseDocFolder=ドキュメントフォルダを無効にする
+UseSpecificReadme=特定のReadMeを使用する
+ContentOfREADMECustomized=注：README.mdファイルの内容は、ModuleBuilderのセットアップで定義された特定の値に置き換えられている。
+RealPathOfModule=モジュールの実際のパス
+ContentCantBeEmpty=ファイルの内容を空にすることはできない
+WidgetDesc=ここで、モジュールに埋め込まれるウィジェットを生成および編集できる。
+CSSDesc=ここで、モジュールにパーソナライズされたCSSが埋め込まれたファイルを生成および編集できる。
+JSDesc=ここで、モジュールにパーソナライズされたJavascriptが埋め込まれたファイルを生成および編集できる。
+CLIDesc=ここで、モジュールで提供するコマンドラインスクリプトをいくつか生成できる。
+CLIFile=CLIファイル
+NoCLIFile=CLIファイルがない
+UseSpecificEditorName = 特定のエディター名を使用する
+UseSpecificEditorURL = 特定のエディターURLを使用する
+UseSpecificFamily = 特定の家族を使用する
+UseSpecificAuthor = 特定の作成者を使用する
+UseSpecificVersion = 特定の初期バージョンを使用する
+ModuleMustBeEnabled=モジュール/アプリケーションを最初に有効にする必要がある
+IncludeRefGeneration=オブジェクトの参照は自動的に生成される必要がある
+IncludeRefGenerationHelp=参照の生成を自動的に管理するコードを含める場合は、これをチェックすること
+IncludeDocGeneration=オブジェクトからいくつかのドキュメントを生成したい
+IncludeDocGenerationHelp=これをチェックすると、レコードに「ドキュメントの生成」ボックスを追加するためのコードが生成される。
+ShowOnCombobox=コンボボックスに値を表示する
+KeyForTooltip=ツールチップのキー
+CSSClass=CSSクラス
+NotEditable=編集不可
+ForeignKey=外部キー
+TypeOfFieldsHelp=フィールドの種別:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' は、コンボの後に+ボタンを追加してレコードを作成することを意味する、 'filter' は例えば、 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' )
+AsciiToHtmlConverter=アスキーからHTMLへのコンバーター
+AsciiToPdfConverter=アスキーからPDFへのコンバーター
+TableNotEmptyDropCanceled=テーブルが空ではない。ドロップはキャンセルされた。
diff --git a/htdocs/langs/ja_JP/mrp.lang b/htdocs/langs/ja_JP/mrp.lang
index dd830a8e434..d783dd432ac 100644
--- a/htdocs/langs/ja_JP/mrp.lang
+++ b/htdocs/langs/ja_JP/mrp.lang
@@ -1,78 +1,80 @@
-Mrp=Manufacturing Orders
-MO=Manufacturing Order
-MOs=Manufacturing orders
-MRPDescription=Module to manage production and Manufacturing Orders (MO).
-MRPArea=MRP Area
-MrpSetupPage=Setup of module MRP
-MenuBOM=Bills of material
-LatestBOMModified=Latest %s Bills of materials modified
-LatestMOModified=Latest %s Manufacturing Orders modified
-Bom=Bills of Material
-BillOfMaterials=Bill of Material
-BOMsSetup=Setup of module BOM
-ListOfBOMs=List of bills of material - BOM
-ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
-BOMsNumberingModules=BOM numbering templates
-BOMsModelModule=BOM document templates
-MOsNumberingModules=MO numbering templates
-MOsModelModule=MO document templates
-FreeLegalTextOnBOMs=Free text on document of BOM
-WatermarkOnDraftBOMs=Watermark on draft BOM
-FreeLegalTextOnMOs=Free text on document of MO
-WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
-ManufacturingEfficiency=Manufacturing efficiency
-ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
-ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
-DeleteBillOfMaterials=Delete Bill Of Materials
-DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
-MenuMRP=Manufacturing Orders
-NewMO=New Manufacturing Order
-QtyToProduce=Qty to produce
-DateStartPlannedMo=Date start planned
-DateEndPlannedMo=Date end planned
-KeepEmptyForAsap=Empty means 'As Soon As Possible'
-EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
-ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
-ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
-ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
-StatusMOProduced=Produced
-QtyFrozen=Frozen Qty
-QuantityFrozen=Frozen Quantity
-QuantityConsumedInvariable=When this flag is set, the quantity consumed is always the value defined and is not relative to the quantity produced.
-DisableStockChange=Stock change disabled
-DisableStockChangeHelp=When this flag is set, there is no stock change on this product, whatever is the quantity consumed
-BomAndBomLines=Bills Of Material and lines
-BOMLine=Line of BOM
-WarehouseForProduction=Warehouse for production
-CreateMO=Create MO
-ToConsume=To consume
-ToProduce=To produce
-QtyAlreadyConsumed=Qty already consumed
-QtyAlreadyProduced=Qty already produced
-QtyRequiredIfNoLoss=Qty required if there is no loss (Manufacturing efficiency is 100%%)
-ConsumeOrProduce=Consume or Produce
-ConsumeAndProduceAll=Consume and Produce All
-Manufactured=Manufactured
-TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
-ForAQuantityOf=For a quantity to produce of %s
-ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
-ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
-ProductionForRef=Production of %s
-AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
-NoStockChangeOnServices=No stock change on services
-ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
-AddNewConsumeLines=Add new line to consume
-ProductsToConsume=Products to consume
-ProductsToProduce=Products to produce
-UnitCost=Unit cost
-TotalCost=Total cost
-BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+Mrp=製造指図
+MOs=製造指図
+ManufacturingOrder=製造指図
+MRPDescription=製造および製造指図（MO）を管理するモジュール。
+MRPArea=MRPエリア
+MrpSetupPage=モジュールMRPのセットアップ
+MenuBOM=部品表
+LatestBOMModified=最新の%s部品表が変更された
+LatestMOModified=最新の%s製造指図が変更された
+Bom=部品表
+BillOfMaterials=部品表
+BOMsSetup=モジュールBOMのセットアップ
+ListOfBOMs=部品表のリスト - BOM
+ListOfManufacturingOrders=製造注文のリスト
+NewBOM=新規部品表
+ProductBOMHelp=このBOMで作成する製品。 <br>注：プロパティ「製品の性質」=「原材料」を持つ製品はこのリストに非表示。
+BOMsNumberingModules=BOM番号付けテンプレート
+BOMsModelModule=BOMドキュメントテンプレート
+MOsNumberingModules=MOナンバリングテンプレート
+MOsModelModule=MOドキュメントテンプレート
+FreeLegalTextOnBOMs=BOMのドキュメントのフリーテキスト
+WatermarkOnDraftBOMs=下書きBOMの透かし
+FreeLegalTextOnMOs=MOのドキュメントでのフリーテキスト
+WatermarkOnDraftMOs=下書きMOの透かし
+ConfirmCloneBillOfMaterials=部品表%sのクローンを作成してよいか？
+ConfirmCloneMo=製造指図%sのクローンを作成してよいか？
+ManufacturingEfficiency=製造効率
+ConsumptionEfficiency=消費効率
+ValueOfMeansLoss=0.95の値は、生産中の平均5%%の損失を意味する。
+ValueOfMeansLossForProductProduced=0.95の値は、生産された製品の損失の平均5%%を意味する
+DeleteBillOfMaterials=部品表を削除
+DeleteMo=製造指図を削除
+ConfirmDeleteBillOfMaterials=この部品表を削除してよいか？
+ConfirmDeleteMo=この部品表を削除してよいか？
+MenuMRP=製造指図
+NewMO=新規製造注文
+QtyToProduce=生産する数量
+DateStartPlannedMo=開始予定日
+DateEndPlannedMo=終了予定日
+KeepEmptyForAsap=空は「できるだけ早く」を意味する
+EstimatedDuration=推定所要時間
+EstimatedDurationDesc=このBOMを使用してこの製品を製造するための推定期間
+ConfirmValidateBom=参照<strong>%s </strong>を使用してBOMを検証してよいか（これを使用して新規製造指図を作成できる）
+ConfirmCloseBom=このBOMをキャンセルしてよいか（これを使用して新規製造指図を作成することはできなくなる）。
+ConfirmReopenBom=このBOMを再度開いてもよいか（これを使用して新規製造指図を作成できる）
+StatusMOProduced=生産
+QtyFrozen=凍結量
+QuantityFrozen=凍結数量
+QuantityConsumedInvariable=このフラグが設定されている場合、消費された数量は常に定義された値であり、生産された数量に相対的ではない。
+DisableStockChange=在庫変更が無効
+DisableStockChangeHelp=このフラグが設定されている場合、消費量に関係なく、この製品の在庫は変更されません。
+BomAndBomLines=部品表とライン
+BOMLine=BOMのライン
+WarehouseForProduction=生産のための倉庫
+CreateMO=MOを作成
+ToConsume=消費するには
+ToProduce=生産するには
+QtyAlreadyConsumed=すでに消費された数量
+QtyAlreadyProduced=すでに生産された数量
+QtyRequiredIfNoLoss=損失がない場合は必要な数量（製造効率は100%%）
+ConsumeOrProduce=消費または生産
+ConsumeAndProduceAll=すべてを消費して生産する
+Manufactured=製造完了
+TheProductXIsAlreadyTheProductToProduce=追加する製品は、すでに生産する製品。
+ForAQuantityOf=%sの生産数量について
+ConfirmValidateMo=この製造指図を検証してよいか？
+ConfirmProductionDesc='%s'をクリックすると、設定された数量の消費および/または生産を検証する。これにより、在庫が更新され、在庫の動きが記録される。
+ProductionForRef=%sの生産
+AutoCloseMO=消費および生産する数量に達した場合、製造指図を自動的に閉じます
+NoStockChangeOnServices=サービスの在庫変更はない
+ProductQtyToConsumeByMO=オープンMOで今後も消費する製品数量
+ProductQtyToProduceByMO=オープンMOで今後も生産する製品数量
+AddNewConsumeLines=消費する新規行を追加
+ProductsToConsume=消費する製品
+ProductsToProduce=生産する製品
+UnitCost=単価
+TotalCost=総費用
+BOMTotalCost=消費する各数量と製品のコストに基づいてこのBOMを生成するためのコスト（定義されている場合は原価、定義されている場合は平均加重価格、それ以外の場合は最良の購入価格を使用）
+GoOnTabProductionToProduceFirst=製造指図を閉じるには、最初に製造を開始しておく必要がある（タブ '%s'を参照）。ただし、キャンセルすることはできる。
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/ja_JP/multicurrency.lang b/htdocs/langs/ja_JP/multicurrency.lang
index bfcbd11fb7c..b344a12d658 100644
--- a/htdocs/langs/ja_JP/multicurrency.lang
+++ b/htdocs/langs/ja_JP/multicurrency.lang
@@ -1,22 +1,38 @@
 # Dolibarr language file - Source file is en_US - multicurrency
-MultiCurrency=Multi currency
-ErrorAddRateFail=Error in added rate
-ErrorAddCurrencyFail=Error in added currency
-ErrorDeleteCurrencyFail=Error delete fail
-multicurrency_syncronize_error=Synchronization error: %s
-MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
-multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+MultiCurrency=多通貨
+ErrorAddRateFail=追加済レートのエラー
+ErrorAddCurrencyFail=追加済通貨のエラー
+ErrorDeleteCurrencyFail=エラー削除失敗
+multicurrency_syncronize_error=同期エラー：%s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=最新の既知のレートを使用する代わりに、ドキュメントの日付を使用して通貨レートを見つける
+multicurrency_useOriginTx=オブジェクトが別のオブジェクトから作成される場合、ソースオブジェクトの元のレートを保持する（それ以外の場合は、最新の既知のレートを使用する）
 CurrencyLayerAccount=CurrencyLayer API
-CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
-multicurrency_appId=API key
-multicurrency_appCurrencySource=Source currency
-multicurrency_alternateCurrencySource=Alternate source currency
-CurrenciesUsed=Currencies used
-CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
-rate=rate
-MulticurrencyReceived=Received, original currency
-MulticurrencyRemainderToTake=Remaining amount, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-AmountToOthercurrency=Amount To (in currency of receiving account)
-CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
-MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
+CurrencyLayerAccount_help_to_synchronize=この機能を使用するには、Webサイト%sでアカウントを作成する必要がある。 <br> <b>APIキー</b>を取得する。 <br>無料のアカウントを使用している場合、<b>ソース通貨</b>（デフォルトではUSD）を変更することはできない。 <br>主通貨がUSDでない場合、アプリケーションは自動的にそれを再計算する。 <br><br> 月に1000回の同期に制限される。
+multicurrency_appId=APIキー
+multicurrency_appCurrencySource=ソース通貨
+multicurrency_alternateCurrencySource=代替ソース通貨
+CurrenciesUsed=使用通貨
+CurrenciesUsed_help_to_add=<b>プロポーザル</b>、<b>注文</b>などで使用する必要のあるさまざまな通貨とレートを追加する。
+rate=レート
+MulticurrencyReceived=受取り、元の通貨
+MulticurrencyRemainderToTake=残額、元の通貨
+MulticurrencyPaymentAmount=支払額、元の通貨
+AmountToOthercurrency=金額（受取口座の通貨）
+CurrencyRateSyncSucceed=為替レートの同期が正常に実行された
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=オンライン支払いにはドキュメントの通貨を使用する
+TabTitleMulticurrencyRate=料金表
+ListCurrencyRate=通貨の為替レートのリスト
+CreateRate=レートを作成する
+FormCreateRate=レート作成
+FormUpdateRate=レート変更
+successRateCreate=通貨%sのレートがデータベースに追加された
+ConfirmDeleteLineRate=%sの日付に通貨%sの%sレートを削除してもよいか？
+DeleteLineRate=クリアレート
+successRateDelete=削除済レート
+errorRateDelete=レート削除時のエラー
+successUpdateRate=変更が加えられた
+ErrorUpdateRate=レート変更時のエラー
+Codemulticurrency=通貨コード
+UpdateRate=レートを変更する
+CancelUpdate=キャンセル
+NoEmptyRate=レートフィールドは空であってはなりません
diff --git a/htdocs/langs/ja_JP/oauth.lang b/htdocs/langs/ja_JP/oauth.lang
index 081c657f0bf..8a5b4de5f52 100644
--- a/htdocs/langs/ja_JP/oauth.lang
+++ b/htdocs/langs/ja_JP/oauth.lang
@@ -1,18 +1,18 @@
 # Dolibarr language file - Source file is en_US - oauth
-ConfigOAuth=OAuth Configuration
-OAuthServices=OAuth Services
+ConfigOAuth=OAuth構成
+OAuthServices=OAuthサービス
 ManualTokenGeneration=手動トークン生成
-TokenManager=Token Manager
-IsTokenGenerated=トークンは生成されましたか？
-NoAccessToken=アクセストークンはローカルデータベースに保存されていません
-HasAccessToken=トークンを生成し、ローカルデータベースに保存されました
-NewTokenStored=トークンを受け取り、保存しました
-ToCheckDeleteTokenOnProvider=ここをクリックすると %s OAuth プロバイダによって保存された承認を確認/削除します
-TokenDeleted=トークンを削除しました
-RequestAccess=ここをクリックすると、アクセスをリクエスト/更新し、新しいトークンを受け取って保存します
-DeleteAccess=ここをクリックするとトークンを削除します
-UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credentials with your OAuth provider:
-ListOfSupportedOauthProviders=Enter the credentials provided by your OAuth2 provider. Only supported OAuth2 providers are listedd here. These services may be used by other modules that need OAuth2 authentication.
+TokenManager=トークンマネージャ
+IsTokenGenerated=トークンは生成されたか？
+NoAccessToken=アクセストークンはローカルデータベースに保存されていない
+HasAccessToken=トークンを生成し、ローカルデータベースに保存された
+NewTokenStored=トークンを受け取り、保存した
+ToCheckDeleteTokenOnProvider=ここをクリックすると %s OAuth プロバイダによって保存された承認を確認/削除する
+TokenDeleted=トークンを削除した
+RequestAccess=ここをクリックすると、アクセスをリクエスト/更新し、新規トークンを受け取って保存する
+DeleteAccess=ここをクリックするとトークンを削除する
+UseTheFollowingUrlAsRedirectURI=OAuthプロバイダーで認証情報を作成するときは、リダイレクトURIとして次のURLを使用する。
+ListOfSupportedOauthProviders=OAuth2プロバイダーから提供された資格情報を入力する。サポートされているOAuth2プロバイダーのみがここにリストされている。これらのサービスは、OAuth2認証を必要とする他のモジュールによって使用される場合がある。
 OAuthSetupForLogin=OAuth トークンを生成するページ
 SeePreviousTab=前のタブを表示
 OAuthIDSecret=OAuth ID とシークレット
@@ -20,13 +20,13 @@ TOKEN_REFRESH=現在のトークンを更新
 TOKEN_EXPIRED=トークンの有効期限切れ
 TOKEN_EXPIRE_AT=トークンの有効期限
 TOKEN_DELETE=保存されたトークンを削除
-OAUTH_GOOGLE_NAME=OAuth Google service
+OAUTH_GOOGLE_NAME=OAuthGoogleサービス
 OAUTH_GOOGLE_ID=OAuth Google Id
-OAUTH_GOOGLE_SECRET=OAuth Google Secret
-OAUTH_GOOGLE_DESC=Go to <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create OAuth credentials
-OAUTH_GITHUB_NAME=OAuth GitHub service
+OAUTH_GOOGLE_SECRET=OAuthGoogleシークレット
+OAUTH_GOOGLE_DESC=<a class="notasortlink" href="https://console.developers.google.com/" target="_blank">このページ</a>に移動し、次に「資格情報」に移動してOAuth資格情報を作成する
+OAUTH_GITHUB_NAME=OAuthGitHubサービス
 OAUTH_GITHUB_ID=OAuth GitHub Id
-OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_GITHUB_DESC=Go to <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create OAuth credentials
-OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
+OAUTH_GITHUB_SECRET=OAuthGitHubシークレット
+OAUTH_GITHUB_DESC=<a class="notasortlink" href="https://github.com/settings/developers" target="_blank">このページ</a>に移動し、"新規アプリケーションを登録" してOAuth認証情報を作成する
+OAUTH_STRIPE_TEST_NAME=OAuthストライプテスト
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/ja_JP/opensurvey.lang b/htdocs/langs/ja_JP/opensurvey.lang
index ee828e3f343..acc17b1f3df 100644
--- a/htdocs/langs/ja_JP/opensurvey.lang
+++ b/htdocs/langs/ja_JP/opensurvey.lang
@@ -1,61 +1,61 @@
 # Dolibarr language file - Source file is en_US - opensurvey
-Survey=Poll
-Surveys=Polls
-OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select the type of poll...
-NewSurvey=New poll
-OpenSurveyArea=Polls area
-AddACommentForPoll=You can add a comment into poll...
-AddComment=Add comment
-CreatePoll=Create poll
-PollTitle=Poll title
-ToReceiveEMailForEachVote=Receive an email for each vote
-TypeDate=Type date
-TypeClassic=Type standard
-OpenSurveyStep2=Select your dates among the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
-RemoveAllDays=Remove all days
-CopyHoursOfFirstDay=Copy hours of first day
-RemoveAllHours=Remove all hours
-SelectedDays=Selected days
-TheBestChoice=The best choice currently is
-TheBestChoices=The best choices currently are
-with=with
-OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
-CommentsOfVoters=Comments of voters
-ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
-RemovePoll=Remove poll
-UrlForSurvey=URL to communicate to get a direct access to poll
-PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
-CreateSurveyDate=Create a date poll
-CreateSurveyStandard=Create a standard poll
-CheckBox=Simple checkbox
-YesNoList=List (empty/yes/no)
-PourContreList=List (empty/for/against)
-AddNewColumn=Add new column
-TitleChoice=Choice label
-ExportSpreadsheet=Export result spreadsheet
+Survey=投票
+Surveys=世論調査
+OrganizeYourMeetingEasily=会議や投票を簡単に整理できます。まず、投票の種類を選択します...
+NewSurvey=新しい世論調査
+OpenSurveyArea=投票エリア
+AddACommentForPoll=投票にコメントを追加できます...
+AddComment=コメントを追加する
+CreatePoll=投票を作成する
+PollTitle=投票タイトル
+ToReceiveEMailForEachVote=投票ごとにメールを受け取る
+TypeDate=日付を入力
+TypeClassic=タイプスタンダード
+OpenSurveyStep2=休日（灰色）の中から日付を選択します。選択した日は緑色です。以前に選択した日をもう一度クリックすると、選択を解除できます
+RemoveAllDays=すべての日を削除します
+CopyHoursOfFirstDay=初日のコピー時間
+RemoveAllHours=すべての時間を削除します
+SelectedDays=選択した日
+TheBestChoice=現在の最良の選択は
+TheBestChoices=現在の最良の選択は
+with=と
+OpenSurveyHowTo=この投票に投票することに同意する場合は、名前を付け、自分に最適な値を選択し、行末のプラスボタンで検証する必要があります。
+CommentsOfVoters=有権者のコメント
+ConfirmRemovalOfPoll=この投票（およびすべての投票）を削除してもよろしいですか？
+RemovePoll=投票を削除する
+UrlForSurvey=投票に直接アクセスするために通信するURL
+PollOnChoice=投票の複数の選択肢を作成するための投票を作成しています。まず、投票で可能なすべての選択肢を入力します。
+CreateSurveyDate=日付投票を作成する
+CreateSurveyStandard=標準の投票を作成する
+CheckBox=シンプルなチェックボックス
+YesNoList=リスト（空/はい/いいえ）
+PourContreList=リスト（空/賛成/反対）
+AddNewColumn=新しい列を追加する
+TitleChoice=選択ラベル
+ExportSpreadsheet=結果スプレッドシートのエクスポート
 ExpireDate=日付を制限する
-NbOfSurveys=Number of polls
-NbOfVoters=No. of voters
-SurveyResults=Results
-PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
-5MoreChoices=5 more choices
-Against=Against
-YouAreInivitedToVote=You are invited to vote for this poll
-VoteNameAlreadyExists=This name was already used for this poll
-AddADate=Add a date
-AddStartHour=Add start hour
-AddEndHour=Add end hour
-votes=vote(s)
-NoCommentYet=No comments have been posted for this poll yet
-CanComment=Voters can comment in the poll
-CanSeeOthersVote=Voters can see other people's vote
-SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format:<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
-BackToCurrentMonth=Back to current month
-ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
-ErrorOpenSurveyOneChoice=Enter at least one choice
-ErrorInsertingComment=There was an error while inserting your comment
-MoreChoices=Enter more choices for the voters
-SurveyExpiredInfo=The poll has been closed or voting delay has expired.
-EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
-ShowSurvey=Show survey
-UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
+NbOfSurveys=投票数
+NbOfVoters=投票者数
+SurveyResults=結果
+PollAdminDesc=「編集」ボタンを使用して、この投票のすべての投票行を変更できます。 %sを使用して列または行を削除することもできます。 %sを使用して新しい列を追加することもできます。
+5MoreChoices=さらに5つの選択肢
+Against=に対して
+YouAreInivitedToVote=この投票に投票してください
+VoteNameAlreadyExists=この名前はすでにこの投票に使用されていました
+AddADate=日付を追加する
+AddStartHour=開始時間を追加
+AddEndHour=終了時間を追加する
+votes=投票
+NoCommentYet=この投票へのコメントはまだ投稿されていません
+CanComment=投票者は投票でコメントできます
+CanSeeOthersVote=有権者は他の人の投票を見ることができます
+SelectDayDesc=選択した各日に、次の形式で会議時間を選択するかどうかを選択できます：<br>-空、<br>-「8h」、「8H」、または「8:00」で、会議の開始時間を指定します。 11」、「8h-11h」、「8H-11H」、または「8：00-11：00」は、会議の開始時間と終了時間を示します。 15-11：15 "同じことですが、分単位です。
+BackToCurrentMonth=今月に戻る
+ErrorOpenSurveyFillFirstSection=投票作成の最初のセクションに記入していません
+ErrorOpenSurveyOneChoice=少なくとも1つの選択肢を入力してください
+ErrorInsertingComment=コメントの挿入中にエラーが発生しました
+MoreChoices=有権者のためのより多くの選択肢を入力してください
+SurveyExpiredInfo=投票が終了したか、投票の遅延が期限切れになりました。
+EmailSomeoneVoted=%sが行を埋めました。\nあなたはリンクであなたの投票を見つけることができます：\n%s
+ShowSurvey=アンケートを表示
+UserMustBeSameThanUserUsedToVote=コメントを投稿するには、投票して、投票に使用したのと同じユーザー名を使用する必要があります
diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang
index 87098706f4d..d294c7bb2a7 100644
--- a/htdocs/langs/ja_JP/other.lang
+++ b/htdocs/langs/ja_JP/other.lang
@@ -5,8 +5,6 @@ Tools=ツール
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=誕生日
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=誕生日アラートアクティブ
 BirthdayAlertOff=非アクティブな誕生日アラート
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -52,7 +52,7 @@ Notify_COMPANY_CREATE=第三者が作成した
 Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_BILL_VALIDATE=顧客への請求書が検証さ
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
-Notify_BILL_PAYED=Customer invoice paid
+Notify_BILL_PAYED=顧客の請求書は支払済
 Notify_BILL_CANCEL=顧客への請求書が取り消さ
 Notify_BILL_SENTBYMAIL=メールで送信された顧客への請求書
 Notify_BILL_SUPPLIER_VALIDATE=Vendor invoice validated
@@ -78,7 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
-SeeModuleSetup=See setup of module %s
+SeeModuleSetup=モジュール%sのセットアップを参照すること
 NbOfAttachedFiles=添付ファイル/文書の数
 TotalSizeOfAttachedFiles=添付ファイル/文書の合計サイズ
 MaxSize=最大サイズ
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index 1ed881cc6f4..eb217d12ba6 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - products
-ProductRef=製品のref。
+ProductRef=製品の参照符号
 ProductLabel=製品のラベル
-ProductLabelTranslated=Translated product label
-ProductDescription=Product description
-ProductDescriptionTranslated=Translated product description
-ProductNoteTranslated=Translated product note
+ProductLabelTranslated=翻訳された製品ラベル
+ProductDescription=製品説明
+ProductDescriptionTranslated=翻訳された製品の説明
+ProductNoteTranslated=翻訳された製品ノート
 ProductServiceCard=製品/サービスカード
 TMenuProducts=製品
 TMenuServices=サービス
@@ -17,213 +17,213 @@ Create=作る
 Reference=リファレンス
 NewProduct=新製品
 NewService=新サービス
-ProductVatMassChange=Global VAT Update
-ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
-MassBarcodeInit=Mass barcode init
-MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Accounting code (purchase)
-ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
-ProductAccountancyBuyExportCode=Accounting code (purchase import)
-ProductAccountancySellCode=Accounting code (sale)
-ProductAccountancySellIntraCode=Accounting code (sale intra-Community)
-ProductAccountancySellExportCode=Accounting code (sale export)
+ProductVatMassChange=グローバルVATアップデート
+ProductVatMassChangeDesc=このツールは、<b> <u> ALL </u></b>製品およびサービスで定義されているVAT率を更新。
+MassBarcodeInit=大量バーコード初期化
+MassBarcodeInitDesc=このページは、バーコードが定義されていないオブジェクトのバーコードを初期化ために使用できる。モジュールバーコードの設定が完了する前に確認すること。
+ProductAccountancyBuyCode=会計コード(購入)
+ProductAccountancyBuyIntraCode=会計コード(コミュニティ内での購入)
+ProductAccountancyBuyExportCode=会計コード(購入インポート)
+ProductAccountancySellCode=会計コード(販売)
+ProductAccountancySellIntraCode=会計コード(コミュニティ内販売)
+ProductAccountancySellExportCode=会計コード(販売輸出)
 ProductOrService=製品やサービス
 ProductsAndServices=製品とサービス
 ProductsOrServices=製品またはサービス
-ProductsPipeServices=Products | Services
-ProductsOnSale=Products for sale
-ProductsOnPurchase=Products for purchase
-ProductsOnSaleOnly=Products for sale only
-ProductsOnPurchaseOnly=Products for purchase only
-ProductsNotOnSell=Products not for sale and not for purchase
-ProductsOnSellAndOnBuy=Products for sale and for purchase
-ServicesOnSale=Services for sale
-ServicesOnPurchase=Services for purchase
-ServicesOnSaleOnly=Services for sale only
-ServicesOnPurchaseOnly=Services for purchase only
-ServicesNotOnSell=Services not for sale and not for purchase
-ServicesOnSellAndOnBuy=Services for sale and for purchase
-LastModifiedProductsAndServices=Latest %s modified products/services
-LastRecordedProducts=Latest %s recorded products
-LastRecordedServices=Latest %s recorded services
+ProductsPipeServices=製品|サービス
+ProductsOnSale=販売中の製品
+ProductsOnPurchase=購入する製品
+ProductsOnSaleOnly=販売のみの製品
+ProductsOnPurchaseOnly=購入のみの製品
+ProductsNotOnSell=非売品および非購入品の製品
+ProductsOnSellAndOnBuy=販売および購入のための製品
+ServicesOnSale=販売のためのサービス
+ServicesOnPurchase=購入用サービス
+ServicesOnSaleOnly=販売のみのサービス
+ServicesOnPurchaseOnly=購入のみのサービス
+ServicesNotOnSell=非売品および非購入のサービス
+ServicesOnSellAndOnBuy=販売および購入のためのサービス
+LastModifiedProductsAndServices=最新の%s変更された製品/サービス
+LastRecordedProducts=最新の%s記録された製品
+LastRecordedServices=最新の%s記録されたサービス
 CardProduct0=製品
 CardProduct1=サービス
 Stock=株式
-MenuStocks=ストック
-Stocks=Stocks and location (warehouse) of products
+MenuStocks=在庫
+Stocks=製品の在庫と場所(倉庫)
 Movements=動作
 Sell=販売
-Buy=Purchase
+Buy=購入
 OnSell=販売用
-OnBuy=購入
+OnBuy=購入用
 NotOnSell=非売品
 ProductStatusOnSell=販売用
 ProductStatusNotOnSell=非売品
 ProductStatusOnSellShort=販売用
 ProductStatusNotOnSellShort=非売品
-ProductStatusOnBuy=購入
-ProductStatusNotOnBuy=ない購入のための
-ProductStatusOnBuyShort=購入
-ProductStatusNotOnBuyShort=ない購入のための
-UpdateVAT=Update vat
-UpdateDefaultPrice=Update default price
-UpdateLevelPrices=Update prices for each level
-AppliedPricesFrom=Applied from
+ProductStatusOnBuy=購入用
+ProductStatusNotOnBuy=非購入品
+ProductStatusOnBuyShort=購入用
+ProductStatusNotOnBuyShort=非購入品
+UpdateVAT=バットを更新する
+UpdateDefaultPrice=デフォルト価格を更新する
+UpdateLevelPrices=各レベルの価格を更新する
+AppliedPricesFrom=から適用
 SellingPrice=販売価格
-SellingPriceHT=Selling price (excl. tax)
-SellingPriceTTC=販売価格（税込）
-SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=This value could be used for margin calculation.
-SoldAmount=Sold amount
-PurchasedAmount=Purchased amount
+SellingPriceHT=販売価格(税込)
+SellingPriceTTC=販売価格(税込)
+SellingMinPriceTTC=最低販売価格(税込)
+CostPriceDescription=この価格フィールド(税抜き)を使用して、この製品の法人への平均コストを保存できる。たとえば、平均購入価格に平均生産および流通コストを加えたものから、自分で計算した任意の価格にすることができる。
+CostPriceUsage=この値は、マージンの計算に使用できる。
+SoldAmount=販売額
+PurchasedAmount=購入金額
 NewPrice=新価格
-MinPrice=Min. sell price
-EditSellingPriceLabel=Edit selling price label
-CantBeLessThanMinPrice=販売価格は、本製品（税抜き%s）に許可される最小値より小さくなることはありません。あなたはあまりにも重要な割引を入力した場合にも、このメッセージが表示されますことができます。
+MinPrice=最小販売価格
+EditSellingPriceLabel=販売価格ラベルを編集する
+CantBeLessThanMinPrice=販売価格は、本製品(税抜き%s)に許可される最小値より小さくなることはない。あなたはあまりにも重要な割引を入力した場合にも、このメッセージが表示される。
 ContractStatusClosed=閉じた
-ErrorProductAlreadyExists=参照%sした製品はすでに存在しています。
+ErrorProductAlreadyExists=参照%sした製品はすでに存在している。
 ErrorProductBadRefOrLabel=参照またはラベルの間違った値。
-ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
-Suppliers=Vendors
-SupplierRef=Vendor SKU
+ErrorProductClone=製品またはサービスの複製を作成しようとしたときに問題が発生した。
+ErrorPriceCantBeLowerThanMinPrice=エラー、価格は最低価格より低くすることはできない。
+Suppliers=仕入先s
+SupplierRef=仕入先SKU
 ShowProduct=製品を表示
-ShowService=サービスを表示する
+ShowService=サービスを表示
 ProductsAndServicesArea=製品とサービスエリア
 ProductsArea=製品分野
 ServicesArea=サービスエリア
 ListOfStockMovements=在庫変動のリスト
 BuyingPrice=買価
-PriceForEachProduct=Products with specific prices
-SupplierCard=Vendor card
-PriceRemoved=価格は、削除
+PriceForEachProduct=特定の価格の製品
+SupplierCard=仕入先カード
+PriceRemoved=価格は削除済
 BarCode=バーコード
-BarcodeType=バーコードの種類
-SetDefaultBarcodeType=バーコードの種類を設定します。
+BarcodeType=バーコードの種別
+SetDefaultBarcodeType=バーコードの種別を設定。
 BarcodeValue=バーコードの値
-NoteNotVisibleOnBill=注意してください（請求書、提案...上に表示されません）
+NoteNotVisibleOnBill=注意すること(請求書、提案...上に表示されない)
 ServiceLimitedDuration=製品は、限られた期間を持つサービスの場合：
-FillWithLastServiceDates=Fill with last service line dates
-MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
+FillWithLastServiceDates=最後のサービスラインの日付を入力
+MultiPricesAbility=製品/サービスごとに複数の価格セグメント(各顧客は1つの価格セグメントに含まれる)
 MultiPricesNumPrices=価格数
-DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=この製品を構成する製品の数
-ParentProductsNumber=Number of parent packaging product
-ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+DefaultPriceType=新しい販売価格を追加するときのデフォルトあたりの価格のベース(税込みと税抜き)
+AssociatedProductsAbility=キット(仮想製品)をアクティブ化
+AssociatedProducts=キット
+AssociatedProductsNumber=このキットを構成する製品の数
+ParentProductsNumber=親包装製品の数
+ParentProducts=親製品
+IfZeroItIsNotAVirtualProduct=0の場合、この製品はキットではない
+IfZeroItIsNotUsedByVirtualProduct=0の場合、この製品はどのキットでも使用されていない
 KeywordFilter=キーワードフィルタ
 CategoryFilter=カテゴリフィルタ
 ProductToAddSearch=追加するには、製品検索
 NoMatchFound=マッチするものが見つからない
-ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=コンポーネントとしては、この製品と製品/サービスのリスト
+ListOfProductsServices=製品/サービスのリスト
+ProductAssociationList=このキットのコンポーネント(s)である製品/サービスのリスト
+ProductParentList=この製品をコンポーネントとして含むキットのリスト
 ErrorAssociationIsFatherOfThis=選択した製品の一つは、現在の製品を持つ親です。
-DeleteProduct=製品/サービスを削除します。
-ConfirmDeleteProduct=この製品/サービスを削除してもよろしいですか？
-ProductDeleted=データベースから削除された製品/サービス &quot;%s&quot;。
+DeleteProduct=製品/サービスを削除。
+ConfirmDeleteProduct=この製品/サービスを削除してもよいか？
+ProductDeleted=データベースから削除された製品/サービス  " %s " 。
 ExportDataset_produit_1=製品
 ExportDataset_service_1=サービス
 ImportDataset_produit_1=製品
 ImportDataset_service_1=サービス
-DeleteProductLine=製品ラインを削除します。
-ConfirmDeleteProductLine=この製品ラインを削除してもよろしいですか？
+DeleteProductLine=製品ラインを削除。
+ConfirmDeleteProductLine=この製品ラインを削除してもよいか？
 ProductSpecial=特別な
-QtyMin=Min. purchase quantity
-PriceQtyMin=Price quantity min.
-PriceQtyMinCurrency=Price (currency) for this qty. (no discount)
-VATRateForSupplierProduct=VAT Rate (for this vendor/product)
-DiscountQtyMin=Discount for this qty.
-NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
-NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
-PredefinedProductsToSell=Predefined Product
-PredefinedServicesToSell=Predefined Service
-PredefinedProductsAndServicesToSell=Predefined products/services to sell
-PredefinedProductsToPurchase=Predefined product to purchase
-PredefinedServicesToPurchase=Predefined services to purchase
-PredefinedProductsAndServicesToPurchase=Predefined products/services to purchase
-NotPredefinedProducts=Not predefined products/services
-GenerateThumb=親指を生成します。
+QtyMin=最小購入数量
+PriceQtyMin=価格数量最小
+PriceQtyMinCurrency=この数量の価格(通貨)。 (値下げなし)
+VATRateForSupplierProduct=VAT率(この仕入先/製品の場合)
+DiscountQtyMin=この数量の割引。
+NoPriceDefinedForThisSupplier=この仕入先/製品の価格/数量は定義されていない
+NoSupplierPriceDefinedForThisProduct=この製品の仕入先価格/数量は定義されていない
+PredefinedProductsToSell=事前定義された製品
+PredefinedServicesToSell=事前定義されたサービス
+PredefinedProductsAndServicesToSell=販売する事前定義された製品/サービス
+PredefinedProductsToPurchase=購入する事前定義された製品
+PredefinedServicesToPurchase=購入する事前定義されたサービス
+PredefinedProductsAndServicesToPurchase=購入する事前定義された製品/サービス
+NotPredefinedProducts=事前定義されていない製品/サービス
+GenerateThumb=親指を生成。
 ServiceNb=サービス＃%s
 ListProductServiceByPopularity=人気による製品/サービスのリスト
 ListProductByPopularity=人気順製品のリスト
 ListServiceByPopularity=人気によるサービスのリスト
 Finished=工業製品
 RowMaterial=最初の材料
-ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
-ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
-ProductIsUsed=本製品が使用されます
+ConfirmCloneProduct=製品またはサービスの複製を作成してもよいか<b>%s </b>？
+CloneContentProduct=製品/サービスのすべての主要な情報を複製する
+ClonePricesProduct=価格の複製
+CloneCategoriesProduct=リンクされたタグ/カテゴリの複製
+CloneCompositionProduct=仮想製品/サービスの複製
+CloneCombinationsProduct=製品バリアントの複製
+ProductIsUsed=本製品が使用される
 NewRefForClone=REF。新製品/サービスの
-SellingPrices=Selling prices
-BuyingPrices=Buying prices
-CustomerPrices=Customer prices
-SuppliersPrices=Vendor prices
-SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+SellingPrices=販売価格
+BuyingPrices=購入価格
+CustomerPrices=顧客価格
+SuppliersPrices=仕入先価格
+SuppliersPricesOfProductsOrServices=(製品またはサービスの)仕入先価格
+CustomCode=税関/製品/ HSコード
 CountryOrigin=原産国
-Nature=Nature of product (material/finished)
-NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
-ShortLabel=Short label
-Unit=ユニット
+Nature=製品の性質(素材/完成品)
+NatureOfProductShort=製品の性質
+NatureOfProductDesc=原材料または完成品
+ShortLabel=短縮ラベル
+Unit=単位
 p=u.
-set=set
-se=set
-second=second
+set=セット
+se=セット
+second=秒
 s=s
-hour=hour
+hour=時間
 h=h
 day=日
 d=d
-kilogram=kilogram
+kilogram=キログラム
 kg=Kg
-gram=gram
-g=グラム
-meter=meter
-m=メートル
+gram=グラム
+g=g
+meter=メートル
+m=m
 lm=lm
 m2=m²
 m3=m³
-liter=liter
+liter=リットル
 l=L
-unitP=Piece
-unitSET=Set
-unitS=2番目の
+unitP=個
+unitSET=セット
+unitS=秒
 unitH=時間
 unitD=日
-unitG=Gram
-unitM=Meter
-unitLM=Linear meter
-unitM2=Square meter
-unitM3=Cubic meter
-unitL=Liter
-unitT=ton
-unitKG=キロ
-unitG=Gram
-unitMG=ミリグラム
+unitG=グラム
+unitM=メートル
+unitLM=直線メートル
+unitM2=平方メートル
+unitM3=立方メートル
+unitL=リットル
+unitT=トン
+unitKG=kg
+unitG=グラム
+unitMG=mg
 unitLB=ポンド
 unitOZ=オンス
-unitM=Meter
-unitDM=DM
-unitCM=センチメートル
-unitMM=ミリメートル
+unitM=メートル
+unitDM=dm
+unitCM=cm
+unitMM=mm
 unitFT=ft
 unitIN=in
-unitM2=Square meter
+unitM2=平方メートル
 unitDM2=dm²
 unitCM2=cm²
 unitMM2=mm²
 unitFT2=ft²
 unitIN2=in²
-unitM3=Cubic meter
+unitM3=立方メートル
 unitDM3=dm³
 unitCM3=cm³
 unitMM3=mm³
@@ -231,162 +231,164 @@ unitFT3=ft³
 unitIN3=in³
 unitOZ3=オンス
 unitgallon=ガロン
-ProductCodeModel=Product ref template
-ServiceCodeModel=Service ref template
+ProductCodeModel=製品参照テンプレート
+ServiceCodeModel=サービス参照テンプレート
 CurrentProductPrice=現行価格
-AlwaysUseNewPrice=Always use current price of product/service
-AlwaysUseFixedPrice=Use the fixed price
-PriceByQuantity=Different prices by quantity
-DisablePriceByQty=Disable prices by quantity
-PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
-UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
-PercentVariationOver=%% variation over %s
-PercentDiscountOver=%% discount over %s
-KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products
-VariantRefExample=Examples: COL, SIZE
-VariantLabelExample=Examples: Color, Size
+AlwaysUseNewPrice=製品/サービスの現在の価格を常に使用すること
+AlwaysUseFixedPrice=固定価格を使用する
+PriceByQuantity=数量による異なる価格
+DisablePriceByQty=数量で価格を無効にする
+PriceByQuantityRange=数量範囲
+MultipriceRules=価格セグメントルール
+UseMultipriceRules=価格セグメントルール(製品モジュールのセットアップで定義)を使用して、最初のセグメントに従って他のすべてのセグメントの価格を自動計算する
+PercentVariationOver=%sに対する%%の変動
+PercentDiscountOver=%sに対する%%割引
+KeepEmptyForAutoCalculation=製品の重量または体積からこれを自動的に計算するには、空のままにする
+VariantRefExample=例：COL、SIZE
+VariantLabelExample=例：色、サイズ
 ### composition fabrication
-Build=Produce
-ProductsMultiPrice=Products and prices for each price segment
-ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
-ProductSellByQuarterHT=Products turnover quarterly before tax
-ServiceSellByQuarterHT=Services turnover quarterly before tax
-Quarter1=1st. Quarter
-Quarter2=2nd. Quarter
-Quarter3=3rd. Quarter
-Quarter4=4th. Quarter
-BarCodePrintsheet=Print barcode
-PageToGenerateBarCodeSheets=With this tool, you can print sheets of barcode stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
-NumberOfStickers=Number of stickers to print on page
-PrintsheetForOneBarCode=Print several stickers for one barcode
-BuildPageToPrint=Generate page to print
-FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
-FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
-DefinitionOfBarCodeForProductNotComplete=Definition of type or value of barcode not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of barcode non complete for third party %s.
-BarCodeDataForProduct=Barcode information of product %s:
-BarCodeDataForThirdparty=Barcode information of third party %s:
-ResetBarcodeForAllRecords=Define barcode value for all record (this will also reset barcode value already defined with new values)
-PriceByCustomer=Different prices for each customer
-PriceCatalogue=A single sell price per product/service
-PricingRule=Rules for selling prices
-AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Log of previous customer prices
-MinimumPriceLimit=Minimum price can't be lower then %s
-MinimumRecommendedPrice=Minimum recommended price is: %s
-PriceExpressionEditor=Price expression editor
-PriceExpressionSelected=Selected price expression
-PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
-PriceExpressionEditorHelp3=In both product/service and vendor prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
-PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In vendor prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
-PriceExpressionEditorHelp5=Available global values:
-PriceMode=Price mode
+Build=製造
+ProductsMultiPrice=各価格セグメントの製品と価格
+ProductsOrServiceMultiPrice=顧客価格(製品またはサービスの、複数の価格)
+ProductSellByQuarterHT=税引前の四半期ごとの製品売上高
+ServiceSellByQuarterHT=税引前の四半期ごとのサービス売上高
+Quarter1=第 1 四半期
+Quarter2=第 2 四半期
+Quarter3=第 3 四半期
+Quarter4=第 4 四半期
+BarCodePrintsheet=バーコードを印刷
+PageToGenerateBarCodeSheets=このツールを使用すると、バーコードステッカーのシートを印刷できる。ステッカーページの形式、バーコードの種別、バーコードの値を選択し、ボタン<b> %s</b>をクリック。
+NumberOfStickers=ページに印刷するステッカーの数
+PrintsheetForOneBarCode=1つのバーコードに複数のステッカーを印刷
+BuildPageToPrint=印刷ページを生成
+FillBarCodeTypeAndValueManually=バーコードのタイプと値を手動で入力。
+FillBarCodeTypeAndValueFromProduct=製品のバーコードからバーコードの種別と値を入力。
+FillBarCodeTypeAndValueFromThirdParty=サードパーティのバーコードからバーコードのタイプと値を入力。
+DefinitionOfBarCodeForProductNotComplete=製品%sのバーコードのタイプまたは値の定義が完了していない。
+DefinitionOfBarCodeForThirdpartyNotComplete=サードパーティ%sのバーコードのタイプまたは値の定義が不完全です。
+BarCodeDataForProduct=製品%sのバーコード情報：
+BarCodeDataForThirdparty=サードパーティのバーコード情報%s：
+ResetBarcodeForAllRecords=すべてのレコードのバーコード値を定義する(これにより、新しい値ですでに定義されているバーコード値もリセットされる)
+PriceByCustomer=顧客ごとに異なる価格
+PriceCatalogue=製品/サービスごとの単一の販売価格
+PricingRule=販売価格のルール
+AddCustomerPrice=顧客ごとに価格を追加
+ForceUpdateChildPriceSoc=顧客子会社に同じ価格を設定する
+PriceByCustomerLog=以前の顧客価格のログ
+MinimumPriceLimit=最低価格は%sより低くすることはできない
+MinimumRecommendedPrice=最小推奨価格は次のとおり：%s
+PriceExpressionEditor=価格表現エディター
+PriceExpressionSelected=選択された価格表現
+PriceExpressionEditorHelp1=価格設定は「price = 2 +2」または「2 + 2」。使用する ;式を区切る
+PriceExpressionEditorHelp2=ExtraFieldsには、<b>＃extrafield_myextrafieldkey＃</b>のような変数でアクセスでき、グローバル変数は<b>＃global_mycode＃</b>でアクセスできる。
+PriceExpressionEditorHelp3=製品/サービスと仕入先の両方の価格で、利用可能な変数はこれら:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
+PriceExpressionEditorHelp4=製品/サービス価格でのみ: <b>#supplier_min_price#</b><br>仕入先価格でのみ: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp5=使用可能なグローバル値：
+PriceMode=価格モード
 PriceNumeric=数
-DefaultPrice=Default price
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Child products
+DefaultPrice=デフォルト価格
+DefaultPriceLog=以前のデフォルト価格のログ
+ComposedProductIncDecStock=親の変更時に在庫を増減する
+ComposedProduct=子供向け製品
 MinSupplierPrice=最小購入価格
-MinCustomerPrice=Minimum selling price
-DynamicPriceConfiguration=Dynamic price configuration
-DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
-AddVariable=Add Variable
-AddUpdater=Add Updater
-GlobalVariables=Global variables
-VariableToUpdate=Variable to update
-GlobalVariableUpdaters=External updaters for variables
-GlobalVariableUpdaterType0=JSON data
-GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
-GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
-GlobalVariableUpdaterType1=WebService data
-GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
-GlobalVariableUpdaterHelpFormat1=Format for request is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}}
-UpdateInterval=Update interval (minutes)
-LastUpdated=Latest update
-CorrectlyUpdated=Correctly updated
-PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
-PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
-DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
-WarningSelectOneDocument=Please select at least one document
-DefaultUnitToShow=ユニット
-NbOfQtyInProposals=Qty in proposals
-ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
-ProductsOrServicesTranslations=Products/Services translations
-TranslatedLabel=Translated label
-TranslatedDescription=Translated description
-TranslatedNote=Translated notes
-ProductWeight=Weight for 1 product
-ProductVolume=Volume for 1 product
-WeightUnits=Weight unit
-VolumeUnits=Volume unit
-WidthUnits=Width unit
-LengthUnits=Length unit
-HeightUnits=Height unit
-SurfaceUnits=Surface unit
-SizeUnits=Size unit
-DeleteProductBuyPrice=Delete buying price
-ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
-SubProduct=Sub product
-ProductSheet=Product sheet
-ServiceSheet=Service sheet
-PossibleValues=Possible values
-GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
-ProductSupplierDescription=Vendor description for the product
-UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
-PackagingForThisProduct=Packaging
-QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+MinCustomerPrice=最低販売価格
+DynamicPriceConfiguration=動的な価格構成
+DynamicPriceDesc=数式を定義して、顧客または仕入先の価格を計算できる。このような数式では、すべての数学演算子、一部の定数および変数を使用できる。ここで、使用する変数を定義できる。変数に自動更新が必要な場合は、外部URLを定義して、Dolibarrが値を自動的に更新できるようにすることができる。
+AddVariable=変数を追加
+AddUpdater=アップデータを追加
+GlobalVariables=グローバル変数
+VariableToUpdate=更新する変数
+GlobalVariableUpdaters=変数の外部アップデーター
+GlobalVariableUpdaterType0=JSONデータ
+GlobalVariableUpdaterHelp0=指定されたURLからJSONデータを解析し、VALUEは関連する値の場所を指定。
+GlobalVariableUpdaterHelpFormat0=リクエストの形式 {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=Webサービスデータ
+GlobalVariableUpdaterHelp1=指定されたURLからWebServiceデータを解析し、NSは名前空間を指定し、VALUEは関連する値の場所を指定し、DATAは送信するデータを含む必要があり、METHODは呼び出し元のWSメソッドです。
+GlobalVariableUpdaterHelpFormat1=リクエストの形式は {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}}
+UpdateInterval=更新間隔(分)
+LastUpdated=最新のアップデート
+CorrectlyUpdated=正しく更新された
+PropalMergePdfProductActualFile=PDF Azur に追加するために使用するファイルは
+PropalMergePdfProductChooseFile=PDFファイルを選択
+IncludingProductWithTag=タグ付きの製品/サービスを含む
+DefaultPriceRealPriceMayDependOnCustomer=デフォルト価格、実際の価格は顧客によって異なる場合がある
+WarningSelectOneDocument=少なくとも1つのドキュメントを選択すること
+DefaultUnitToShow=単位
+NbOfQtyInProposals=提案の数量
+ClinkOnALinkOfColumn=詳細ビューを表示には、列%sのリンクをクリックすること...
+ProductsOrServicesTranslations=製品/サービスの翻訳
+TranslatedLabel=翻訳されたラベル
+TranslatedDescription=翻訳された説明
+TranslatedNote=翻訳されたメモ
+ProductWeight=1製品の重量
+ProductVolume=1製品の容量
+WeightUnits=重量単位
+VolumeUnits=容量単位
+WidthUnits=幅の単位
+LengthUnits=長さの単位
+HeightUnits=高さの単位
+SurfaceUnits=表面単位
+SizeUnits=サイズ単位
+DeleteProductBuyPrice=購入価格を削除
+ConfirmDeleteProductBuyPrice=この購入価格を削除してもよいか？
+SubProduct=サブ製品
+ProductSheet=製品シート
+ServiceSheet=サービスシート
+PossibleValues=可能な値
+GoOnMenuToCreateVairants=メニュー%s-%sに移動して、属性バリアント(色、サイズなど)を準備。
+UseProductFournDesc=顧客向けの説明に加えて、仕入先によって定義された製品の説明を定義する機能を追加する
+ProductSupplierDescription=製品の仕入先の説明
+UseProductSupplierPackaging=サプライヤ価格のパッケージを使用する(サプライヤドキュメントの行を追加/更新するときに、サプライヤ価格に設定されたパッケージに従って数量を再計算する)
+PackagingForThisProduct=包装
+PackagingForThisProductDesc=サプライヤの注文時に、この数量(またはこの数量の倍数)を自動的に注文。最小購入数量より少なくすることはできない
+QtyRecalculatedWithPackaging=ラインの数量は、サプライヤーのパッケージに従って再計算された
 
 #Attributes
-VariantAttributes=Variant attributes
-ProductAttributes=Variant attributes for products
-ProductAttributeName=Variant attribute %s
-ProductAttribute=Variant attribute
-ProductAttributeDeleteDialog=Are you sure you want to delete this attribute? All values will be deleted
-ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
-ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
-ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
-ProductCombinations=Variants
-PropagateVariant=Propagate variants
-HideProductCombinations=Hide products variant in the products selector
-ProductCombination=Variant
-NewProductCombination=New variant
-EditProductCombination=Editing variant
-NewProductCombinations=New variants
-EditProductCombinations=Editing variants
-SelectCombination=Select combination
-ProductCombinationGenerator=Variants generator
-Features=Features
-PriceImpact=Price impact
-ImpactOnPriceLevel=Impact on price level %s
-ApplyToAllPriceImpactLevel= Apply to all levels
-ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
-WeightImpact=Weight impact
+VariantAttributes=バリアント属性
+ProductAttributes=製品のバリアント属性
+ProductAttributeName=バリアント属性%s
+ProductAttribute=バリアント属性
+ProductAttributeDeleteDialog=この属性を削除してもよいか？すべての値が削除される
+ProductAttributeValueDeleteDialog=この属性の「%s」を参照して値「%s」を削除してもよいか？
+ProductCombinationDeleteDialog=製品「<strong>%s</strong>」のバリアントを削除してもよいか？
+ProductCombinationAlreadyUsed=バリアントの削除中にエラーが発生した。どのオブジェクトにも使用されていないことを確認すること
+ProductCombinations=バリアント
+PropagateVariant=バリアントの伝播
+HideProductCombinations=製品セレクタで製品バリアントを非表示にする
+ProductCombination=バリアント
+NewProductCombination=新しいバリアント
+EditProductCombination=バリアントの編集
+NewProductCombinations=新しい亜種
+EditProductCombinations=バリアントの編集
+SelectCombination=組み合わせを選択
+ProductCombinationGenerator=バリアントジェネレータ
+Features=特徴
+PriceImpact=価格への影響
+ImpactOnPriceLevel=価格水準への影響%s
+ApplyToAllPriceImpactLevel= すべてのレベルに適用
+ApplyToAllPriceImpactLevelHelp=ここをクリックすると、すべてのレベルで同じ価格の影響を設定できる
+WeightImpact=重量への影響
 NewProductAttribute=新しい属性
-NewProductAttributeValue=New attribute value
-ErrorCreatingProductAttributeValue=There was an error while creating the attribute value. It could be because there is already an existing value with that reference
-ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
-TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
-DoNotRemovePreviousCombinations=Do not remove previous variants
-UsePercentageVariations=Use percentage variations
-PercentageVariation=Percentage variation
-ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product variants
-NbOfDifferentValues=No. of different values
-NbProducts=Number of products
-ParentProduct=Parent product
-HideChildProducts=Hide variant products
-ShowChildProducts=Show variant products
-NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
-ConfirmCloneProductCombinations=Would you like to copy all the product variants to the other parent product with the given reference?
-CloneDestinationReference=Destination product reference
-ErrorCopyProductCombinations=There was an error while copying the product variants
-ErrorDestinationProductNotFound=Destination product not found
-ErrorProductCombinationNotFound=Product variant not found
-ActionAvailableOnVariantProductOnly=Action only available on the variant of product
-ProductsPricePerCustomer=Product prices per customers
-ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
-DeleteLinkedProduct=Delete the child product linked to the combination
+NewProductAttributeValue=新しい属性値
+ErrorCreatingProductAttributeValue=属性値の作成中にエラーが発生した。その参照を持つ既存の値がすでに存在するためである可能性がある
+ProductCombinationGeneratorWarning=続行すると、新しいバリアントを生成前に、以前のバリアントはすべて削除される。既存のものは新しい値で更新される
+TooMuchCombinationsWarning=多数のバリアントを生成と、CPU、メモリ使用量が高くなり、Dolibarrがそれらを作成できなくなる可能性がある。オプション「%s」を有効にすると、メモリ使用量を減らすのに役立つ場合がある。
+DoNotRemovePreviousCombinations=以前のバリアントを削除しないこと
+UsePercentageVariations=パーセンテージバリエーションを使用
+PercentageVariation=変動率
+ErrorDeletingGeneratedProducts=既存の製品バリアントを削除しようとしたときにエラーが発生した
+NbOfDifferentValues=異なる値の数
+NbProducts=製品数
+ParentProduct=親製品
+HideChildProducts=バリアント製品を非表示にする
+ShowChildProducts=バリエーション製品を表示
+NoEditVariants=親製品カードに移動し、バリエーション タブでバリエーションの価格への影響を編集する
+ConfirmCloneProductCombinations=指定された参照を使用して、すべての製品バリアントを他の親製品にコピーするか？
+CloneDestinationReference=宛先製品リファレンス
+ErrorCopyProductCombinations=製品バリアントのコピー中にエラーが発生した
+ErrorDestinationProductNotFound=宛先製品が見つからない
+ErrorProductCombinationNotFound=製品バリアントが見つからない
+ActionAvailableOnVariantProductOnly=製品のバリアントでのみ使用可能なアクション
+ProductsPricePerCustomer=顧客あたりの製品価格
+ProductSupplierExtraFields=追加属性(サプライヤー価格)
+DeleteLinkedProduct=組み合わせにリンクされている子製品を削除
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index eb84ec5c3c0..62bd0dc7d19 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -1,172 +1,172 @@
 # Dolibarr language file - Source file is en_US - projects
-RefProject=Ref. project
-ProjectRef=Project ref.
-ProjectId=Project Id
-ProjectLabel=Project label
-ProjectsArea=Projects Area
-ProjectStatus=Project status
+RefProject=参照プロジェクト
+ProjectRef=プロジェクト参照符号
+ProjectId=プロジェクトID
+ProjectLabel=プロジェクトラベル
+ProjectsArea=プロジェクトエリア
+ProjectStatus=プロジェクトの状況
 SharedProject=皆
 PrivateProject=プロジェクトの連絡先
-ProjectsImContactFor=Projects for which I am explicitly a contact
-AllAllowedProjects=All project I can read (mine + public)
+ProjectsImContactFor=私が明示的に連絡を取っているプロジェクト
+AllAllowedProjects=私が読むことができるすべてのプロジェクト（私の+公開）
 AllProjects=すべてのプロジェクト
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=このビューは、連絡先のプロジェクトに限定される
 ProjectsPublicDesc=このビューには、読み取りを許可されているすべてのプロジェクトを紹介します。
-TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
+TasksOnProjectsPublicDesc=このビューには、読み取りが許可されているプロジェクトのすべてのタスクが表示される。
 ProjectsPublicTaskDesc=このビューには、読み取りを許可されているすべてのプロジェクトやタスクを示します。
 ProjectsDesc=このビューはすべてのプロジェクトを（あなたのユーザー権限はあなたに全てを表示する権限を付与）を提示します。
-TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
-OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
-ClosedProjectsAreHidden=Closed projects are not visible.
+TasksOnProjectsDesc=このビューには、すべてのプロジェクトのすべてのタスクが表示される（ユーザー権限により、すべてを表示する権限が付与される）。
+MyTasksDesc=このビューは、連絡先のプロジェクトまたはタスクに限定される
+OnlyOpenedProject=開いているプロジェクトのみが表示される（ドラフトまたはクローズステータスのプロジェクトは表示されない）。
+ClosedProjectsAreHidden=閉じたプロジェクトは表示されない。
 TasksPublicDesc=このビューには、読み取りを許可されているすべてのプロジェクトやタスクを示します。
 TasksDesc=このビューは、すべてのプロジェクトとタスク（あなたのユーザー権限はあなたに全てを表示する権限を付与）を提示します。
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
-ImportDatasetTasks=Tasks of projects
-ProjectCategories=Project tags/categories
+AllTaskVisibleButEditIfYouAreAssigned=資格のあるプロジェクトのすべてのタスクが表示されるが、選択したユーザーに割り当てられたタスクの時間のみを入力できる。時間を入力する必要がある場合は、タスクを割り当てる。
+OnlyYourTaskAreVisible=自分に割り当てられたタスクのみが表示される。タスクが表示されておらず、時間を入力する必要がある場合は、自分にタスクを割り当てる。
+ImportDatasetTasks=プロジェクトのタスク
+ProjectCategories=プロジェクトタグ/カテゴリ
 NewProject=新しいプロジェクト
-AddProject=Create project
+AddProject=プロジェクトを作成する
 DeleteAProject=プロジェクトを削除します。
 DeleteATask=タスクを削除する
-ConfirmDeleteAProject=Are you sure you want to delete this project?
-ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Leads amount of open projects by status
-OpportunitiesStatusForProjects=Leads amount of projects by status
+ConfirmDeleteAProject=このプロジェクトを削除してもよいか？
+ConfirmDeleteATask=このタスクを削除してもよいか？
+OpenedProjects=開いているプロジェクト
+OpenedTasks=開いているタスク
+OpportunitiesStatusForOpenedProjects=ステータス別に開いているプロジェクトの量をリード
+OpportunitiesStatusForProjects=ステータス別のプロジェクト数をリード
 ShowProject=プロジェクトを表示する
 ShowTask=タスクを表示する
 SetProject=プロジェクトを設定します。
 NoProject=はプロジェクトが定義されていませんまたは所有している
-NbOfProjects=Number of projects
-NbOfTasks=Number of tasks
+NbOfProjects=プロジェクト数
+NbOfTasks=タスクの数
 TimeSpent=に費や​​された時間は
-TimeSpentByYou=Time spent by you
-TimeSpentByUser=Time spent by user
+TimeSpentByYou=あなたが費やした時間
+TimeSpentByUser=ユーザーが費やした時間
 TimesSpent=に費や​​された時間は
-TaskId=Task ID
-RefTask=Task ref.
-LabelTask=Task label
-TaskTimeSpent=Time spent on tasks
+TaskId=タスクID
+RefTask=タスク参照符号
+LabelTask=タスクラベル
+TaskTimeSpent=タスクに費やした時間
 TaskTimeUser=ユーザー
 TaskTimeNote=注意
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on open projects
-WorkloadNotDefined=Workload not defined
+TasksOnOpenedProject=開いているプロジェクトのタスク
+WorkloadNotDefined=ワークロードが定義されていない
 NewTimeSpent=に費や​​された時間は
 MyTimeSpent=私の時間を費やし
-BillTime=Bill the time spent
-BillTimeShort=Bill time
-TimeToBill=Time not billed
-TimeBilled=Time billed
+BillTime=費やした時間を請求する
+BillTimeShort=ビルタイム
+TimeToBill=時間は請求されない
+TimeBilled=請求時間
 Tasks=タスク
 Task=タスク
-TaskDateStart=Task start date
-TaskDateEnd=Task end date
-TaskDescription=Task description
+TaskDateStart=タスク開始日
+TaskDateEnd=タスクの終了日
+TaskDescription=タスクの説明
 NewTask=新しいタスク
-AddTask=Create task
-AddTimeSpent=Create time spent
-AddHereTimeSpentForDay=Add here time spent for this day/task
-AddHereTimeSpentForWeek=Add here time spent for this week/task
+AddTask=タスクを作成する
+AddTimeSpent=費やした時間を作成する
+AddHereTimeSpentForDay=この日/タスクに費やした時間をここに追加する
+AddHereTimeSpentForWeek=今週/タスクに費やした時間をここに追加する
 Activity=アクティビティ
 Activities=タスク/活動
 MyActivities=私の仕事/活動
 MyProjects=私のプロジェクト
-MyProjectsArea=My projects Area
+MyProjectsArea=私のプロジェクトエリア
 DurationEffective=実効デュレーション
-ProgressDeclared=Declared progress
-TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Calculated progress
-WhichIamLinkedTo=which I'm linked to
-WhichIamLinkedToProject=which I'm linked to project
+ProgressDeclared=宣言された実際の進歩
+TaskProgressSummary=タスクの進行状況
+CurentlyOpenedTasks=現在開いているタスク
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=宣言された実際の進捗状況は、消費の進捗状況よりも%s未満です。
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=宣言された実際の進捗状況は、消費の進捗状況よりも%sです。
+ProgressCalculated=消費の進捗状況
+WhichIamLinkedTo=私がリンクしている
+WhichIamLinkedToProject=私はプロジェクトにリンクしています
 Time=時間
-ListOfTasks=List of tasks
-GoToListOfTimeConsumed=Go to list of time consumed
-GanttView=Gantt View
-ListProposalsAssociatedProject=List of the commercial proposals related to the project
-ListOrdersAssociatedProject=List of sales orders related to the project
-ListInvoicesAssociatedProject=List of customer invoices related to the project
-ListPredefinedInvoicesAssociatedProject=List of customer template invoices related to the project
-ListSupplierOrdersAssociatedProject=List of purchase orders related to the project
-ListSupplierInvoicesAssociatedProject=List of vendor invoices related to the project
-ListContractAssociatedProject=List of contracts related to the project
-ListShippingAssociatedProject=List of shippings related to the project
-ListFichinterAssociatedProject=List of interventions related to the project
-ListExpenseReportsAssociatedProject=List of expense reports related to the project
-ListDonationsAssociatedProject=List of donations related to the project
-ListVariousPaymentsAssociatedProject=List of miscellaneous payments related to the project
-ListSalariesAssociatedProject=List of payments of salaries related to the project
-ListActionsAssociatedProject=List of events related to the project
-ListMOAssociatedProject=List of manufacturing orders related to the project
-ListTaskTimeUserProject=List of time consumed on tasks of project
-ListTaskTimeForTask=List of time consumed on task
-ActivityOnProjectToday=Activity on project today
-ActivityOnProjectYesterday=Activity on project yesterday
+ListOfTasks=タスクのリスト
+GoToListOfTimeConsumed=消費時間のリストに移動
+GanttView=ガントビュー
+ListProposalsAssociatedProject=プロジェクトに関連する商業提案のリスト
+ListOrdersAssociatedProject=プロジェクトに関連する販売注文のリスト
+ListInvoicesAssociatedProject=プロジェクトに関連する顧客の請求書のリスト
+ListPredefinedInvoicesAssociatedProject=プロジェクトに関連する顧客テンプレートの請求書のリスト
+ListSupplierOrdersAssociatedProject=プロジェクトに関連する発注書のリスト
+ListSupplierInvoicesAssociatedProject=プロジェクトに関連するベンダーの請求書のリスト
+ListContractAssociatedProject=プロジェクトに関連する契約のリスト
+ListShippingAssociatedProject=プロジェクトに関連する出荷のリスト
+ListFichinterAssociatedProject=プロジェクトに関連する介入のリスト
+ListExpenseReportsAssociatedProject=プロジェクトに関連する経費報告書のリスト
+ListDonationsAssociatedProject=プロジェクトに関連する寄付のリスト
+ListVariousPaymentsAssociatedProject=プロジェクトに関連する雑費のリスト
+ListSalariesAssociatedProject=プロジェクトに関連する給与の支払いのリスト
+ListActionsAssociatedProject=プロジェクトに関連するイベントのリスト
+ListMOAssociatedProject=プロジェクトに関連する製造オーダーのリスト
+ListTaskTimeUserProject=プロジェクトのタスクに費やされた時間のリスト
+ListTaskTimeForTask=タスクに費やされた時間のリスト
+ActivityOnProjectToday=今日のプロジェクトでの活動
+ActivityOnProjectYesterday=昨日のプロジェクトでの活動
 ActivityOnProjectThisWeek=プロジェクト今週のアクティビティ
 ActivityOnProjectThisMonth=プロジェクトの活動今月
 ActivityOnProjectThisYear=プロジェクトの活動は今年
 ChildOfProjectTask=プロジェクト/タスクの子
-ChildOfTask=Child of task
-TaskHasChild=Task has child
+ChildOfTask=タスクの子
+TaskHasChild=タスクには子がある
 NotOwnerOfProject=この民間プロジェクトの所有者でない
 AffectedTo=に割り当てられた
-CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See tab '%s'.
+CantRemoveProject=このプロジェクトは、他のオブジェクト（請求書、注文など）によって参照されているため、削除できません。タブ「%s」を参照すること。
 ValidateProject=挙を検証する
-ConfirmValidateProject=Are you sure you want to validate this project?
+ConfirmValidateProject=このプロジェクトを検証してもよいか？
 CloseAProject=プロジェクトを閉じる
-ConfirmCloseAProject=Are you sure you want to close this project?
-AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
+ConfirmCloseAProject=このプロジェクトを終了してもよいか？
+AlsoCloseAProject=また、プロジェクトを閉じます（それでも本番タスクを実行する必要がある場合は、開いたままにする）
 ReOpenAProject=開いているプロジェクト
-ConfirmReOpenAProject=Are you sure you want to re-open this project?
+ConfirmReOpenAProject=このプロジェクトを再開してもよいか？
 ProjectContact=プロジェクトの連絡先
-TaskContact=Task contacts
+TaskContact=タスクの連絡先
 ActionsOnProject=プロジェクトのイベント
 YouAreNotContactOfProject=この民間プロジェクトの接触ではありません
-UserIsNotContactOfProject=User is not a contact of this private project
+UserIsNotContactOfProject=ユーザーはこのプライベートプロジェクトの連絡先ではない
 DeleteATimeSpent=費やした時間を削除します。
-ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
-DoNotShowMyTasksOnly=See also tasks not assigned to me
-ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Contacts of task
+ConfirmDeleteATimeSpent=この時間を削除してもよいか？
+DoNotShowMyTasksOnly=私に割り当てられていないタスクも参照すること
+ShowMyTasksOnly=自分に割り当てられたタスクのみを表示
+TaskRessourceLinks=タスクの連絡先
 ProjectsDedicatedToThisThirdParty=この第三者に専用のプロジェクト
 NoTasks=このプロジェクトのための作業をしない
 LinkedToAnotherCompany=他の第三者へのリンク
-TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
+TaskIsNotAssignedToUser=タスクがユーザーに割り当てられていない。ボタン '<strong> %s </strong>'を使用して、今すぐタスクを割り当てる。
 ErrorTimeSpentIsEmpty=費やした時間は空です
 ThisWillAlsoRemoveTasks=このアクションは、プロジェクトのすべてのタスク（現時点では<b>%s</b>タスク）と過ごした時間のすべての入力を削除します。
-IfNeedToUseOtherObjectKeepEmpty=いくつかのオブジェクト（請求書、注文、...）、別の第三者に属するが、作成するプロジェクトにリンクする必要がある場合は、複数のサードパーティ中のプロジェクトを持っているこの空を保持します。
-CloneTasks=Clone tasks
-CloneContacts=Clone contacts
-CloneNotes=Clone notes
-CloneProjectFiles=Clone project joined files
-CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
-CloneMoveDate=Update project/tasks dates from now?
-ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task dates according to new project start date
-ErrorShiftTaskDate=Impossible to shift task date according to new project start date
-ProjectsAndTasksLines=Projects and tasks
-ProjectCreatedInDolibarr=Project %s created
-ProjectValidatedInDolibarr=Project %s validated
-ProjectModifiedInDolibarr=Project %s modified
-TaskCreatedInDolibarr=Task %s created
-TaskModifiedInDolibarr=Task %s modified
-TaskDeletedInDolibarr=Task %s deleted
-OpportunityStatus=Lead status
-OpportunityStatusShort=Lead status
-OpportunityProbability=Lead probability
-OpportunityProbabilityShort=Lead probab.
-OpportunityAmount=Lead amount
-OpportunityAmountShort=Lead amount
-OpportunityWeightedAmount=Opportunity weighted amount
-OpportunityWeightedAmountShort=Opp. weighted amount
-OpportunityAmountAverageShort=Average lead amount
-OpportunityAmountWeigthedShort=Weighted lead amount
-WonLostExcluded=Won/Lost excluded
+IfNeedToUseOtherObjectKeepEmpty=いくつかのオブジェクト（請求書、注文、...）、別の第三者に属するが、作成するプロジェクトにリンクする必要がある場合は、複数の取引先中のプロジェクトを持っているこの空を保持します。
+CloneTasks=クローンタスク
+CloneContacts=連絡先のクローン
+CloneNotes=クローンノート
+CloneProjectFiles=プロジェクトに参加したファイルのクローンを作成する
+CloneTaskFiles=ファイルを結合したタスク(s)をクローンする（タスク(s)がクローンされた場合）
+CloneMoveDate=今からプロジェクト/タスクの日付を更新するか？
+ConfirmCloneProject=このプロジェクトのクローンを作成してもよいか？
+ProjectReportDate=新規プロジェクトの開始日に応じてタスクの日付を変更する
+ErrorShiftTaskDate=新規プロジェクトの開始日に応じてタスクの日付をシフトすることはできません
+ProjectsAndTasksLines=プロジェクトとタスク
+ProjectCreatedInDolibarr=プロジェクト%sは作成済
+ProjectValidatedInDolibarr=プロジェクト%sが検証された
+ProjectModifiedInDolibarr=プロジェクト%sは変更済
+TaskCreatedInDolibarr=タスク%sが作成された
+TaskModifiedInDolibarr=タスク%sが変更された
+TaskDeletedInDolibarr=タスク%sが削除された
+OpportunityStatus=リードステータス
+OpportunityStatusShort=リードステータス
+OpportunityProbability=リード確率
+OpportunityProbabilityShort=鉛の確率。
+OpportunityAmount=鉛量
+OpportunityAmountShort=鉛量
+OpportunityWeightedAmount=機会加重量
+OpportunityWeightedAmountShort=おっと。加重量
+OpportunityAmountAverageShort=平均鉛量
+OpportunityAmountWeigthedShort=加重鉛量
+WonLostExcluded=勝ち/負け除外
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=プロジェクトリーダー
 TypeContact_project_external_PROJECTLEADER=プロジェクトリーダー
@@ -176,94 +176,94 @@ TypeContact_project_task_internal_TASKEXECUTIVE=タスクの幹部
 TypeContact_project_task_external_TASKEXECUTIVE=タスクの幹部
 TypeContact_project_task_internal_TASKCONTRIBUTOR=貢献者
 TypeContact_project_task_external_TASKCONTRIBUTOR=貢献者
-SelectElement=Select element
-AddElement=Link to element
-LinkToElementShort=Link to
+SelectElement=要素を選択
+AddElement=要素へのリンク
+LinkToElementShort=へのリンク
 # Documents models
-DocumentModelBeluga=Project document template for linked objects overview
-DocumentModelBaleine=Project document template for tasks
-DocumentModelTimeSpent=Project report template for time spent
-PlannedWorkload=Planned workload
-PlannedWorkloadShort=Workload
-ProjectReferers=Related items
-ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
-InputPerDay=Input per day
-InputPerWeek=Input per week
-InputPerMonth=Input per month
-InputDetail=Input detail
-TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
-ProjectsWithThisUserAsContact=Projects with this user as contact
-TasksWithThisUserAsContact=Tasks assigned to this user
-ResourceNotAssignedToProject=Not assigned to project
-ResourceNotAssignedToTheTask=Not assigned to the task
-NoUserAssignedToTheProject=No users assigned to this project
-TimeSpentBy=Time spent by
-TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
-AssignTaskToUser=Assign task to %s
-SelectTaskToAssign=Select task to assign...
-AssignTask=Assign
-ProjectOverview=Overview
-ManageTasks=Use projects to follow tasks and/or report time spent (timesheets)
-ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
-ProjectNbProjectByMonth=No. of created projects by month
-ProjectNbTaskByMonth=No. of created tasks by month
-ProjectOppAmountOfProjectsByMonth=Amount of leads by month
-ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project|lead by lead status
-ProjectsStatistics=Statistics on projects or leads
-TasksStatistics=Statistics on tasks of projects or leads
-TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
-IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
-OpenedProjectsByThirdparties=Open projects by third parties
-OnlyOpportunitiesShort=Only leads
-OpenedOpportunitiesShort=Open leads
-NotOpenedOpportunitiesShort=Not an open lead
-NotAnOpportunityShort=Not a lead
-OpportunityTotalAmount=Total amount of leads
-OpportunityPonderatedAmount=Weighted amount of leads
-OpportunityPonderatedAmountDesc=Leads amount weighted with probability
-OppStatusPROSP=Prospection
-OppStatusQUAL=Qualification
+DocumentModelBeluga=リンクされたオブジェクトの概要のプロジェクトドキュメントテンプレート
+DocumentModelBaleine=タスクのプロジェクトドキュメントテンプレート
+DocumentModelTimeSpent=費やした時間のプロジェクトレポートテンプレート
+PlannedWorkload=計画されたワークロード
+PlannedWorkloadShort=ワークロード
+ProjectReferers=関連項目s
+ProjectMustBeValidatedFirst=プロジェクトを最初に検証する必要がある
+FirstAddRessourceToAllocateTime=プロジェクトの連絡先としてユーザーリソースを割り当て、時間を割り当てる
+InputPerDay=1日あたりの入力
+InputPerWeek=週あたりの入力
+InputPerMonth=1か月あたりの入力
+InputDetail=詳細を入力
+TimeAlreadyRecorded=これは、このタスク/日およびユーザー%sについてすでに記録されている時間です。
+ProjectsWithThisUserAsContact=このユーザーを連絡先とするプロジェクト
+TasksWithThisUserAsContact=このユーザーに割り当てられたタスク
+ResourceNotAssignedToProject=プロジェクトに割り当てられていない
+ResourceNotAssignedToTheTask=タスクに割り当てられていない
+NoUserAssignedToTheProject=このプロジェクトに割り当てられているユーザーはない
+TimeSpentBy=によって費やされた時間
+TasksAssignedTo=に割り当てられたタスク
+AssignTaskToMe=私にタスクを割り当てる
+AssignTaskToUser=タスクを%sに割り当てる
+SelectTaskToAssign=割り当てるタスクを選択すること...
+AssignTask=割当
+ProjectOverview=概要概要
+ManageTasks=プロジェクトを使用して、タスクを追跡したり、費やした時間を報告したりする（タイムシート）
+ManageOpportunitiesStatus=プロジェクトを使用してリード/機会をフォローする
+ProjectNbProjectByMonth=月ごとに作成されたプロジェクトの数
+ProjectNbTaskByMonth=月ごとに作成されたタスクの数
+ProjectOppAmountOfProjectsByMonth=月ごとのリードの量
+ProjectWeightedOppAmountOfProjectsByMonth=月ごとのリードの加重量
+ProjectOpenedProjectByOppStatus=プロジェクトを開く|リードステータスでリード
+ProjectsStatistics=プロジェクトまたはリードに関する統計
+TasksStatistics=プロジェクトまたはリードのタスクに関する統計
+TaskAssignedToEnterTime=割り当てられたタスク。このタスクに時間を入力できるはずです。
+IdTaskTime=IDタスク時間
+YouCanCompleteRef=参照に接尾辞を付けて完成させたい場合は、-文字を追加して区切ることをお勧めする。これにより、自動番号付けは次のプロジェクトでも正しく機能する。例：%s-MYSUFFIX
+OpenedProjectsByThirdparties=取引先による開いているプロジェクト
+OnlyOpportunitiesShort=リードのみ
+OpenedOpportunitiesShort=開いているリード
+NotOpenedOpportunitiesShort=開いているリードではない
+NotAnOpportunityShort=リードではない
+OpportunityTotalAmount=リードの合計量
+OpportunityPonderatedAmount=リードの加重量
+OpportunityPonderatedAmountDesc=確率で重み付けされたリード量
+OppStatusPROSP=見通し
+OppStatusQUAL=資格
 OppStatusPROPO=提案
-OppStatusNEGO=Negociation
-OppStatusPENDING=Pending
-OppStatusWON=Won
-OppStatusLOST=Lost
-Budget=Budget
-AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values:</u><br>- Keep empty: Can link any project of the company (default)<br>- "all": Can link any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link all projects of these third partys (Example: 123,4795,53)<br>
-LatestProjects=Latest %s projects
-LatestModifiedProjects=Latest %s modified projects
-OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
-ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
-ChooseANotYetAssignedTask=Choose a task not yet assigned to you
+OppStatusNEGO=交渉
+OppStatusPENDING=保留中
+OppStatusWON=勝った
+OppStatusLOST=失われた
+Budget=予算
+AllowToLinkFromOtherCompany=他の会社のプロジェクトのリンクを許可する <br><br><u>サポートされる値:</u><br>- 空のままにする: 会社の任意のプロジェクトをリンクできる（デフォルト）<br>- "すべて": 任意のプロジェクトをリンクできる、たとえ他の法人のプロジェクトであっても <br>- カンマ区切りの取引先ID: これらの取引先のすべてのプロジェクトをリンクできる（例：123,4795,53）<br>
+LatestProjects=最新の%sプロジェクト
+LatestModifiedProjects=最新の%s変更プロジェクト
+OtherFilteredTasks=その他のフィルタリングされたタスク
+NoAssignedTasks=割り当てられたタスクが見つかりません（上部の選択ボックスから現在のユーザーにプロジェクト/タスクを割り当てて、時間を入力する）
+ThirdPartyRequiredToGenerateInvoice=プロジェクトに請求できるようにするには、プロジェクトで取引先を定義する必要がある。
+ChooseANotYetAssignedTask=まだ割り当てられていないタスクを選択すること
 # Comments trans
-AllowCommentOnTask=Allow user comments on tasks
-AllowCommentOnProject=Allow user comments on projects
-DontHavePermissionForCloseProject=You do not have permissions to close the project %s
-DontHaveTheValidateStatus=The project %s must be open to be closed
-RecordsClosed=%s project(s) closed
-SendProjectRef=Information project %s
-ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to define employee hourly rate to have time spent valorized
-NewTaskRefSuggested=Task ref already used, a new task ref is required
-TimeSpentInvoiced=Time spent billed
+AllowCommentOnTask=タスクへのユーザーコメントを許可する
+AllowCommentOnProject=プロジェクトへのユーザーコメントを許可する
+DontHavePermissionForCloseProject=プロジェクトを閉じる権限がない%s
+DontHaveTheValidateStatus=プロジェクト%sを閉じるには、開いている必要がある
+RecordsClosed=%sプロジェクト(s)が終了しました
+SendProjectRef=情報プロジェクト%s
+ModuleSalaryToDefineHourlyRateMustBeEnabled=モジュール「給与」を有効にして、時間を評価するために従業員の時給を定義する必要がある
+NewTaskRefSuggested=タスク参照はすでに使用される。新規タスク参照が必要です
+TimeSpentInvoiced=請求に費やされた時間
 TimeSpentForInvoice=に費や​​された時間は
-OneLinePerUser=One line per user
-ServiceToUseOnLines=Service to use on lines
-InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
-ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks or time spent
-Usage=Usage
-UsageOpportunity=Usage: Opportunity
-UsageTasks=Usage: Tasks
-UsageBillTimeShort=Usage: Bill time
-InvoiceToUse=Draft invoice to use
+OneLinePerUser=ユーザーごとに1行
+ServiceToUseOnLines=回線で利用するサービス
+InvoiceGeneratedFromTimeSpent=請求書%sは、プロジェクトに費やされた時間から生成された
+ProjectBillTimeDescription=プロジェクトのタスクにタイムシートを入力し、タイムシートから請求書(s)を生成してプロジェクトの顧客に請求する予定があるかどうかを確認する（入力したタイムシートに基づかない請求書を作成する予定があるかどうかは確認しないこと）。注：請求書を生成するには、プロジェクトの"費やした時間"タブに移動し、含める行を選択する。
+ProjectFollowOpportunity=機会を追う
+ProjectFollowTasks=タスクまたは費やした時間をフォローする
+Usage=使用法
+UsageOpportunity=使用法：機会
+UsageTasks=使用法：タスク
+UsageBillTimeShort=使用法：請求時間
+InvoiceToUse=使用する請求書のドラフト
 NewInvoice=新しい請求書
-OneLinePerTask=One line per task
-OneLinePerPeriod=One line per period
-RefTaskParent=Ref. Parent Task
-ProfitIsCalculatedWith=Profit is calculated using
+OneLinePerTask=タスクごとに1行
+OneLinePerPeriod=期間ごとに1行
+RefTaskParent=参照符号親タスク
+ProfitIsCalculatedWith=利益は以下を使用して計算される
diff --git a/htdocs/langs/ja_JP/receiptprinter.lang b/htdocs/langs/ja_JP/receiptprinter.lang
index f39d6a289de..05f67f731e7 100644
--- a/htdocs/langs/ja_JP/receiptprinter.lang
+++ b/htdocs/langs/ja_JP/receiptprinter.lang
@@ -38,7 +38,7 @@ DOL_ALIGN_RIGHT=Right align text
 DOL_USE_FONT_A=Use font A of printer
 DOL_USE_FONT_B=Use font B of printer
 DOL_USE_FONT_C=Use font C of printer
-DOL_PRINT_BARCODE=Print barcode
+DOL_PRINT_BARCODE=バーコードを印刷
 DOL_PRINT_BARCODE_CUSTOMER_ID=Print barcode customer id
 DOL_CUT_PAPER_FULL=Cut ticket completely
 DOL_CUT_PAPER_PARTIAL=Cut ticket partially
@@ -54,7 +54,7 @@ DOL_DOUBLE_WIDTH=Double width size
 DOL_DEFAULT_HEIGHT_WIDTH=Default height and width size
 DOL_UNDERLINE=Enable underline
 DOL_UNDERLINE_DISABLED=Disable underline
-DOL_BEEP=Beed sound
+DOL_BEEP=Beep sound
 DOL_PRINT_TEXT=Print text
 DateInvoiceWithTime=Invoice date and time
 YearInvoice=Invoice year
diff --git a/htdocs/langs/ja_JP/receptions.lang b/htdocs/langs/ja_JP/receptions.lang
index f4476304d19..2464d8c30f4 100644
--- a/htdocs/langs/ja_JP/receptions.lang
+++ b/htdocs/langs/ja_JP/receptions.lang
@@ -1,26 +1,26 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
-RefReception=Ref. reception
+ReceptionsSetup=製品受付の設定
+RefReception=参照受付
 Reception=レセプション
-Receptions=Receptions
-AllReceptions=All Receptions
+Receptions=受付
+AllReceptions=すべての受付
 Reception=レセプション
-Receptions=Receptions
-ShowReception=Show Receptions
-ReceptionsArea=Receptions area
-ListOfReceptions=List of receptions
-ReceptionMethod=Reception method
-LastReceptions=Latest %s receptions
-StatisticsOfReceptions=Statistics for receptions
-NbOfReceptions=Number of receptions
-NumberOfReceptionsByMonth=Number of receptions by month
-ReceptionCard=Reception card
-NewReception=New reception
-CreateReception=Create reception
-QtyInOtherReceptions=Qty in other receptions
-OtherReceptionsForSameOrder=Other receptions for this order
-ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
-ReceptionsToValidate=Receptions to validate
+Receptions=受付
+ShowReception=受付を表示
+ReceptionsArea=受付エリア
+ListOfReceptions=受付のリスト
+ReceptionMethod=受付方法
+LastReceptions=最新の%s受付
+StatisticsOfReceptions=受付の統計
+NbOfReceptions=受付数
+NumberOfReceptionsByMonth=月別の受付数
+ReceptionCard=受付カード
+NewReception=新しい受付
+CreateReception=受付を作成する
+QtyInOtherReceptions=他の受付の数量
+OtherReceptionsForSameOrder=この注文の他の受付
+ReceptionsAndReceivingForSameOrder=この注文の領収書と領収書
+ReceptionsToValidate=検証する受付
 StatusReceptionCanceled=キャンセル
 StatusReceptionDraft=ドラフト
 StatusReceptionValidated=検証（製品が出荷する、またはすでに出荷されます）
@@ -28,20 +28,20 @@ StatusReceptionProcessed=処理
 StatusReceptionDraftShort=ドラフト
 StatusReceptionValidatedShort=検証
 StatusReceptionProcessedShort=処理
-ReceptionSheet=Reception sheet
-ConfirmDeleteReception=Are you sure you want to delete this reception?
-ConfirmValidateReception=Are you sure you want to validate this reception with reference <b>%s</b>?
-ConfirmCancelReception=Are you sure you want to cancel this reception?
-StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated. Date used is date of validation of reception (planed delivery date is not always known).
-SendReceptionByEMail=Send reception by email
-SendReceptionRef=Submission of reception %s
-ActionsOnReception=Events on reception
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the order card.
-ReceptionLine=Reception line
-ProductQtyInReceptionAlreadySent=Product quantity from open sales order already sent
-ProductQtyInSuppliersReceptionAlreadyRecevied=Product quantity from open supplier order already received
-ValidateOrderFirstBeforeReception=You must first validate the order before being able to make receptions.
-ReceptionsNumberingModules=Numbering module for receptions
-ReceptionsReceiptModel=Document templates for receptions
-NoMorePredefinedProductToDispatch=No more predefined products to dispatch
+ReceptionSheet=受付シート
+ConfirmDeleteReception=この受付を削除してもよいか？
+ConfirmValidateReception=参照<b>%s </b>を使用して、この受付を検証してもよいか？
+ConfirmCancelReception=この受付をキャンセルしてもよいか？
+StatsOnReceptionsOnlyValidated=受付で実施された統計は検証されただけ。使用される日付は、受付の検証日です（飛行機の配達日は常にわかっているわけではない）。
+SendReceptionByEMail=メールで受付を送信する
+SendReceptionRef=受付の提出%s
+ActionsOnReception=受付のイベント
+ReceptionCreationIsDoneFromOrder=今のところ、新しい受付の作成はオーダーカードから行われる。
+ReceptionLine=受付ライン
+ProductQtyInReceptionAlreadySent=未処理の受注からの製品数量はすでに送信された
+ProductQtyInSuppliersReceptionAlreadyRecevied=すでに受け取ったオープンサプライヤー注文からの製品数量
+ValidateOrderFirstBeforeReception=受付を行う前に、まず注文を確認する必要がある。
+ReceptionsNumberingModules=受付のナンバリングモジュール
+ReceptionsReceiptModel=受付のドキュメントテンプレート
+NoMorePredefinedProductToDispatch=ディスパッチする事前定義された製品はもうない
 
diff --git a/htdocs/langs/ja_JP/recruitment.lang b/htdocs/langs/ja_JP/recruitment.lang
index 63690e8b83f..9c7def0a589 100644
--- a/htdocs/langs/ja_JP/recruitment.lang
+++ b/htdocs/langs/ja_JP/recruitment.lang
@@ -18,53 +18,58 @@
 #
 
 # Module label 'ModuleRecruitmentName'
-ModuleRecruitmentName = Recruitment
+ModuleRecruitmentName = 採用
 # Module description 'ModuleRecruitmentDesc'
-ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+ModuleRecruitmentDesc = 新規職種の採用キャンペーンを管理およびフォローする
 
 #
 # Admin page
 #
-RecruitmentSetup = Recruitment setup
-Settings = Settings
-RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
-RecruitmentArea=Recruitement area
-PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
-EnablePublicRecruitmentPages=Enable public pages of open jobs
+RecruitmentSetup = 採用設定
+Settings = 設定
+RecruitmentSetupPage = 採用モジュールの主なオプションの設定をここに入力する
+RecruitmentArea=採用エリア
+PublicInterfaceRecruitmentDesc=求人の公開ページは、開いている求人を表示して回答するための公開URLである。開いているジョブごとに1つの異なるリンクがあり、各ジョブレコードごとにある。
+EnablePublicRecruitmentPages=開いている求人の公開ページを有効にする
 
 #
 # About page
 #
 About = 約
-RecruitmentAbout = About Recruitment
-RecruitmentAboutPage = Recruitment about page
-NbOfEmployeesExpected=Expected nb of employees
-JobLabel=Label of job position
-WorkPlace=Work place
-DateExpected=Expected date
-FutureManager=Future manager
-ResponsibleOfRecruitement=Responsible of recruitment
-IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+RecruitmentAbout = 採用について
+RecruitmentAboutPage = 採用に関してページ
+NbOfEmployeesExpected=予想される従業員数
+JobLabel=職位のラベル
+WorkPlace=職場
+DateExpected=予定日
+FutureManager=将来のマネージャー
+ResponsibleOfRecruitement=採用の担当
+IfJobIsLocatedAtAPartner=仕事がパートナーの場所にある場合
+PositionToBeFilled=職位
+PositionsToBeFilled=職位
+ListOfPositionsToBeFilled=職位一覧
+NewPositionToBeFilled=新規職種
 
-JobOfferToBeFilled=Job offer to be filled
-ThisIsInformationOnJobPosition=Information of the job position to be filled
-ContactForRecruitment=Contact for recruitment
-EmailRecruiter=Email recruiter
-ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
-RequestedRemuneration=Requested remuneration
-ProposedRemuneration=Proposed remuneration
-ContractProposed=Contract proposed
-ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
-JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
-InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+JobOfferToBeFilled=埋められる職位
+ThisIsInformationOnJobPosition=記入する職種の情報
+ContactForRecruitment=採用担当者
+EmailRecruiter=メール勧誘担当
+ToUseAGenericEmail=一般的な電子メールを使用するには。定義されていない場合は、採用担当者のメールが使用される
+NewCandidature=新規アプリ
+ListOfCandidatures=アプリケーションのリスト
+RequestedRemuneration=要求された報酬
+ProposedRemuneration=提案された報酬
+ContractProposed=提案された契約
+ContractSigned=契約締結
+ContractRefused=契約は拒否された
+RecruitmentCandidature=応用
+JobPositions=職位
+RecruitmentCandidatures=アプリケーション
+InterviewToDo=する面接
+AnswerCandidature=アプリケーションの回答
+YourCandidature=あなたの申請
+YourCandidatureAnswerMessage=お申し込みいただきありがとうございます。 <br>..。
+JobClosedTextCandidateFound=求人はクローズされている。ポジションが埋まった。
+JobClosedTextCanceled=求人はクローズされている。
+ExtrafieldsJobPosition=補完的な属性（職位）
+ExtrafieldsCandidatures=補完的な属性（求人応募）
diff --git a/htdocs/langs/ja_JP/salaries.lang b/htdocs/langs/ja_JP/salaries.lang
index 7c3c08a65bd..0ae2ac35e9f 100644
--- a/htdocs/langs/ja_JP/salaries.lang
+++ b/htdocs/langs/ja_JP/salaries.lang
@@ -1,21 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
-Salary=Salary
-Salaries=Salaries
-NewSalaryPayment=New salary payment
-AddSalaryPayment=Add salary payment
-SalaryPayment=Salary payment
-SalariesPayments=Salaries payments
-ShowSalaryPayment=Show salary payment
-THM=Average hourly rate
-TJM=Average daily rate
-CurrentSalary=Current salary
-THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
-SalariesStatistics=Salary statistics
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=ユーザの取引先に使用される会計科目
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=ユーザカードで定義された専用の会計科目は、補助元帳の会計にのみ使用される。これは総勘定元帳に使用され、ユーザの専用ユーザ会計勘定が定義されていない場合は補助元帳会計のデフォルト値として使用される。
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=賃金支払いのデフォルトの会計科目
+Salary=給料
+Salaries=給与
+NewSalaryPayment=新規給与の支払い
+AddSalaryPayment=給与支払いを追加する
+SalaryPayment=給与の支払い
+SalariesPayments=給与の支払い
+ShowSalaryPayment=給与の支払いを表示する
+THM=平均時給
+TJM=1日あたりの平均料金
+CurrentSalary=現在の給与
+THMDescription=この値は、プロジェクトモジュールが使用されている場合に、ユーザが入力したプロジェクトで消費された時間のコストを計算するために使用できる。
+TJMDescription=この値は現在情報提供のみを目的としており、計算には使用されない。
+LastSalaries=最新の%s給与支払い
+AllSalaries=すべての給与支払い
+SalariesStatistics=給与統計
 # Export
-SalariesAndPayments=Salaries and payments
+SalariesAndPayments=給与と支払い
diff --git a/htdocs/langs/ja_JP/sendings.lang b/htdocs/langs/ja_JP/sendings.lang
index bb0e344b720..a8ecd193c38 100644
--- a/htdocs/langs/ja_JP/sendings.lang
+++ b/htdocs/langs/ja_JP/sendings.lang
@@ -56,7 +56,7 @@ ShipmentCreationIsDoneFromOrder=現時点では、新たな出荷の作成は、
 ShipmentLine=Shipment line
 ProductQtyInCustomersOrdersRunning=Product quantity from open sales orders
 ProductQtyInSuppliersOrdersRunning=Product quantity from open purchase orders
-ProductQtyInShipmentAlreadySent=Product quantity from open sales order already sent
+ProductQtyInShipmentAlreadySent=未処理の受注からの製品数量はすでに送信された
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase orders already received
 NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
 WeightVolShort=Weight/Vol.
@@ -65,6 +65,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=配信確認のために、より完全なドキュメントモデル（logo. ..）
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=定数EXPEDITION_ADDON_NUMBERが定義されていません
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/ja_JP/stocks.lang b/htdocs/langs/ja_JP/stocks.lang
index a16ebdd7c63..e6ac2a3ec17 100644
--- a/htdocs/langs/ja_JP/stocks.lang
+++ b/htdocs/langs/ja_JP/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=場所
 LocationSummary=短い名前の場所
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=カテゴリフィルタ
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/ja_JP/suppliers.lang b/htdocs/langs/ja_JP/suppliers.lang
index 70a684ddeba..ce2aea9527f 100644
--- a/htdocs/langs/ja_JP/suppliers.lang
+++ b/htdocs/langs/ja_JP/suppliers.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - vendors
-Suppliers=Vendors
-SuppliersInvoice=Vendor invoice
+Suppliers=仕入先s
+SuppliersInvoice=ベンダー請求書
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=歴史
@@ -14,12 +14,12 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Vendor prices
+SupplierPrices=仕入先価格
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
 NoRecordedSuppliers=No vendor recorded
-SupplierPayment=Vendor payment
+SupplierPayment=ベンダーの支払
 SuppliersArea=Vendor area
-RefSupplierShort=Ref. vendor
+RefSupplierShort=仕入先参照符号
 Availability=可用性
 ExportDataset_fournisseur_1=Vendor invoices and invoice details
 ExportDataset_fournisseur_2=Vendor invoices and payments
@@ -38,10 +38,11 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All references of vendor
-BuyingPriceNumShort=Vendor prices
+BuyingPriceNumShort=仕入先価格
diff --git a/htdocs/langs/ja_JP/ticket.lang b/htdocs/langs/ja_JP/ticket.lang
index 2e75a39a4f8..8fdb14dc6e0 100644
--- a/htdocs/langs/ja_JP/ticket.lang
+++ b/htdocs/langs/ja_JP/ticket.lang
@@ -18,290 +18,288 @@
 # Generic
 #
 
-Module56000Name=Tickets
-Module56000Desc=Ticket system for issue or request management
+Module56000Name=切符売場
+Module56000Desc=発行または要求管理のためのチケットシステム
 
-Permission56001=See tickets
-Permission56002=Modify tickets
-Permission56003=Delete tickets
-Permission56004=Manage tickets
-Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
+Permission56001=チケットを見る
+Permission56002=チケットを変更する
+Permission56003=チケットを削除する
+Permission56004=チケットを管理する
+Permission56005=すべてのサードパーティのチケットを参照すること（外部ユーザーには有効ではなく、常に依存しているサードパーティに限定される）
 
-TicketDictType=Ticket - Types
-TicketDictCategory=Ticket - Groupes
-TicketDictSeverity=Ticket - Severities
-TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
+TicketDictType=チケット-タイプ
+TicketDictCategory=チケット-グループ
+TicketDictSeverity=チケット-重大度
+TicketDictResolution=チケット-解決策
 
-TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
-TicketTypeShortREQUEST=Change or enhancement request
+TicketTypeShortCOM=商業的な質問
+TicketTypeShortHELP=機能的なヘルプのリクエスト
+TicketTypeShortISSUE=問題、バグまたは問題
+TicketTypeShortREQUEST=変更または拡張リクエスト
 TicketTypeShortPROJET=プロジェクト
 TicketTypeShortOTHER=その他
 
 TicketSeverityShortLOW=低い
-TicketSeverityShortNORMAL=Normal
+TicketSeverityShortNORMAL=正常
 TicketSeverityShortHIGH=高い
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=クリティカル、ブロッキング
 
-ErrorBadEmailAddress=Field '%s' incorrect
-MenuTicketMyAssign=My tickets
-MenuTicketMyAssignNonClosed=My open tickets
-MenuListNonClosed=Open tickets
+ErrorBadEmailAddress=フィールド '%s'が正しくない
+MenuTicketMyAssign=私のチケット
+MenuTicketMyAssignNonClosed=私のオープンチケット
+MenuListNonClosed=オープンチケット
 
 TypeContact_ticket_internal_CONTRIBUTOR=貢献者
-TypeContact_ticket_internal_SUPPORTTEC=Assigned user
-TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
-TypeContact_ticket_external_CONTRIBUTOR=External contributor
+TypeContact_ticket_internal_SUPPORTTEC=割り当てられたユーザー
+TypeContact_ticket_external_SUPPORTCLI=顧客連絡/インシデント追跡
+TypeContact_ticket_external_CONTRIBUTOR=外部寄稿者
 
-OriginEmail=Email source
-Notify_TICKET_SENTBYMAIL=Send ticket message by email
+OriginEmail=メールソース
+Notify_TICKET_SENTBYMAIL=メールでチケットメッセージを送信する
 
 # Status
-NotRead=Not read
+NotRead=読んでいない
 Read=読む
-Assigned=Assigned
-InProgress=In progress
-NeedMoreInformation=Waiting for information
-Answered=Answered
+Assigned=割り当て済み
+InProgress=進行中
+NeedMoreInformation=情報を待っている
+Answered=答えた
 Waiting=待っている
 Closed=閉じた
-Deleted=Deleted
+Deleted=削除
 
 # Dict
 Type=タイプ
-Severity=Severity
+Severity=重大度
 
 # Email templates
-MailToSendTicketMessage=To send email from ticket message
+MailToSendTicketMessage=チケットメッセージからメールを送信するには
 
 #
 # Admin page
 #
-TicketSetup=Ticket module setup
-TicketSettings=Settings
+TicketSetup=チケットモジュールのセットアップ
+TicketSettings=設定
 TicketSetupPage=
-TicketPublicAccess=A public interface requiring no identification is available at the following url
-TicketSetupDictionaries=The type of ticket, severity and analytic codes are configurable from dictionaries
-TicketParamModule=Module variable setup
-TicketParamMail=Email setup
-TicketEmailNotificationFrom=Notification email from
-TicketEmailNotificationFromHelp=Used into ticket message answer by example
-TicketEmailNotificationTo=Notifications email to
-TicketEmailNotificationToHelp=Send email notifications to this address.
-TicketNewEmailBodyLabel=Text message sent after creating a ticket
-TicketNewEmailBodyHelp=The text specified here will be inserted into the email confirming the creation of a new ticket from the public interface. Information on the consultation of the ticket are automatically added.
-TicketParamPublicInterface=Public interface setup
-TicketsEmailMustExist=Require an existing email address to create a ticket
-TicketsEmailMustExistHelp=In the public interface, the email address should already be filled in the database to create a new ticket.
-PublicInterface=Public interface
-TicketUrlPublicInterfaceLabelAdmin=Alternative URL for public interface
-TicketUrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server and thus make available the public interface with another URL (the server must act as a proxy on this new URL)
-TicketPublicInterfaceTextHomeLabelAdmin=Welcome text of the public interface
-TicketPublicInterfaceTextHome=You can create a support ticket or view existing from its identifier tracking ticket.
-TicketPublicInterfaceTextHomeHelpAdmin=The text defined here will appear on the home page of the public interface.
-TicketPublicInterfaceTopicLabelAdmin=Interface title
-TicketPublicInterfaceTopicHelp=This text will appear as the title of the public interface.
-TicketPublicInterfaceTextHelpMessageLabelAdmin=Help text to the message entry
-TicketPublicInterfaceTextHelpMessageHelpAdmin=This text will appear above the message input area of the user.
-ExtraFieldsTicket=Extra attributes
-TicketCkEditorEmailNotActivated=HTML editor is not activated. Please put FCKEDITOR_ENABLE_MAIL content to 1 to get it.
-TicketsDisableEmail=Do not send emails for ticket creation or message recording
-TicketsDisableEmailHelp=By default, emails are sent when new tickets or messages created. Enable this option to disable *all* email notifications
-TicketsLogEnableEmail=Enable log by email
-TicketsLogEnableEmailHelp=At each change, an email will be sent **to each contact** associated with the ticket.
-TicketParams=Params
-TicketsShowModuleLogo=Display the logo of the module in the public interface
-TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
-TicketsShowCompanyLogo=Display the logo of the company in the public interface
-TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
-TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
-TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
-TicketsActivatePublicInterface=Activate public interface
-TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create tickets.
-TicketsAutoAssignTicket=Automatically assign the user who created the ticket
-TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
-TicketNumberingModules=Tickets numbering module
-TicketNotifyTiersAtCreation=Notify third party at creation
-TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
-TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
-TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicAccess=IDを必要としないパブリックインターフェイスは、次のURLで入手できる。
+TicketSetupDictionaries=チケットのタイプ、重大度、および分析コードは辞書から構成できる
+TicketParamModule=モジュール変数の設定
+TicketParamMail=メールの設定
+TicketEmailNotificationFrom=からの通知メール
+TicketEmailNotificationFromHelp=例によるチケットメッセージの回答に使用
+TicketEmailNotificationTo=通知メール
+TicketEmailNotificationToHelp=このアドレスに電子メール通知を送信する。
+TicketNewEmailBodyLabel=チケット作成後に送信されるテキストメッセージ
+TicketNewEmailBodyHelp=ここで指定されたテキストは、パブリックインターフェイスからの新規チケットの作成を確認する電子メールに挿入される。チケットの相談に関する情報は自動的に追加される。
+TicketParamPublicInterface=パブリックインターフェイスのセットアップ
+TicketsEmailMustExist=チケットを作成するには、既存のメールアドレスが必要です
+TicketsEmailMustExistHelp=パブリックインターフェイスでは、新規チケットを作成するために、電子メールアドレスがデータベースにすでに入力されている必要がある。
+PublicInterface=パブリックインターフェイス
+TicketUrlPublicInterfaceLabelAdmin=パブリックインターフェイスの代替URL
+TicketUrlPublicInterfaceHelpAdmin=Webサーバーのエイリアスを定義して、別のURLでパブリックインターフェイスを利用できるようにすることができる（サーバーはこの新規URLのプロキシとして機能する必要がある）
+TicketPublicInterfaceTextHomeLabelAdmin=パブリックインターフェイスのウェルカムテキスト
+TicketPublicInterfaceTextHome=サポートチケットを作成するか、その識別子追跡チケットから既存のものを表示できる。
+TicketPublicInterfaceTextHomeHelpAdmin=ここで定義されたテキストは、パブリックインターフェイスのホームページに表示される。
+TicketPublicInterfaceTopicLabelAdmin=インターフェイスタイトル
+TicketPublicInterfaceTopicHelp=このテキストは、パブリックインターフェイスのタイトルとして表示される。
+TicketPublicInterfaceTextHelpMessageLabelAdmin=メッセージエントリへのヘルプテキスト
+TicketPublicInterfaceTextHelpMessageHelpAdmin=このテキストは、ユーザーのメッセージ入力領域の上に表示される。
+ExtraFieldsTicket=追加の属性
+TicketCkEditorEmailNotActivated=HTMLエディタがアクティブ化されていない。 FCKEDITOR_ENABLE_MAILのコンテンツを1に設定して取得すること。
+TicketsDisableEmail=チケットの作成やメッセージの記録のためにメールを送信しないこと
+TicketsDisableEmailHelp=デフォルトでは、新規チケットまたはメッセージが作成されたときに電子メールが送信される。このオプションを有効にすると、*すべての*電子メール通知が無効になる
+TicketsLogEnableEmail=メールでログを有効にする
+TicketsLogEnableEmailHelp=変更のたびに、チケットに関連付けられた**各連絡先**にメールが送信される。
+TicketParams=パラメータ
+TicketsShowModuleLogo=パブリックインターフェイスにモジュールのロゴを表示する
+TicketsShowModuleLogoHelp=このオプションを有効にすると、パブリックインターフェイスのページでロゴモジュールが非表示になる
+TicketsShowCompanyLogo=パブリックインターフェイスに法人のロゴを表示する
+TicketsShowCompanyLogoHelp=このオプションを有効にすると、パブリックインターフェイスのページで主要法人のロゴが非表示になる。
+TicketsEmailAlsoSendToMainAddress=メインのメールアドレスにも通知を送信する
+TicketsEmailAlsoSendToMainAddressHelp=このオプションを有効にすると、「通知メールの送信元」アドレスにメールが送信される（以下の設定を参照）。
+TicketsLimitViewAssignedOnly=現在のユーザーに割り当てられたチケットに表示を制限する（外部ユーザーには無効で、常に依存しているサードパーティに制限される）
+TicketsLimitViewAssignedOnlyHelp=現在のユーザーに割り当てられているチケットのみが表示される。チケット管理権を持つユーザーには適用されない。
+TicketsActivatePublicInterface=パブリックインターフェイスをアクティブ化する
+TicketsActivatePublicInterfaceHelp=パブリックインターフェイスにより、すべての訪問者がチケットを作成できる。
+TicketsAutoAssignTicket=チケットを作成したユーザーを自動的に割り当てる
+TicketsAutoAssignTicketHelp=チケットを作成するときに、ユーザーを自動的にチケットに割り当てることができる。
+TicketNumberingModules=チケット番号付けモジュール
+TicketNotifyTiersAtCreation=作成時にサードパーティに通知する
+TicketsDisableCustomerEmail=パブリックインターフェイスからチケットを作成するときは、常にメールを無効にすること
+TicketsPublicNotificationNewMessage=新規メッセージが追加されたときにメール(s)を送信する
+TicketsPublicNotificationNewMessageHelp=新規メッセージがパブリックインターフェイスから追加されたときに電子メール(s)を送信する（割り当てられたユーザーまたは通知電子メールを（更新）および/または通知電子メールに）
+TicketPublicNotificationNewMessageDefaultEmail=通知メール（更新）
+TicketPublicNotificationNewMessageDefaultEmailHelp=チケットにユーザーが割り当てられていない場合、またはユーザーに電子メールがない場合は、このアドレスに新規メッセージ通知を電子メールで送信する。
 #
 # Index & list page
 #
-TicketsIndex=Tickets area
-TicketList=List of tickets
-TicketAssignedToMeInfos=This page display ticket list created by or assigned to current user
-NoTicketsFound=No ticket found
-NoUnreadTicketsFound=No unread ticket found
-TicketViewAllTickets=View all tickets
-TicketViewNonClosedOnly=View only open tickets
-TicketStatByStatus=Tickets by status
-OrderByDateAsc=Sort by ascending date
-OrderByDateDesc=Sort by descending date
-ShowAsConversation=Show as conversation list
-MessageListViewType=Show as table list
+TicketsIndex=チケットエリア
+TicketList=チケット一覧
+TicketAssignedToMeInfos=このページには、現在のユーザーによって作成または割り当てられたチケットリストが表示される
+NoTicketsFound=チケットが見つからない
+NoUnreadTicketsFound=未読のチケットは見つからないでした
+TicketViewAllTickets=すべてのチケットを見る
+TicketViewNonClosedOnly=開いているチケットのみを表示する
+TicketStatByStatus=ステータス別のチケット
+OrderByDateAsc=昇順で並べ替え
+OrderByDateDesc=日付の降順で並べ替え
+ShowAsConversation=会話リストとして表示
+MessageListViewType=テーブルリストとして表示
 
 #
 # Ticket card
 #
-Ticket=Ticket
-TicketCard=Ticket card
-CreateTicket=Create ticket
-EditTicket=Edit ticket
-TicketsManagement=Tickets Management
-CreatedBy=Created by
-NewTicket=New Ticket
-SubjectAnswerToTicket=Ticket answer
-TicketTypeRequest=Request type
+Ticket=チケット
+TicketCard=チケットカード
+CreateTicket=チケットを作成する
+EditTicket=チケットの編集
+TicketsManagement=チケット管理
+CreatedBy=によって作成された
+NewTicket=新規チケット
+SubjectAnswerToTicket=チケットの回答
+TicketTypeRequest=リクエストの種類
 TicketCategory=グループ
-SeeTicket=See ticket
-TicketMarkedAsRead=Ticket has been marked as read
-TicketReadOn=Read on
+SeeTicket=チケットを見る
+TicketMarkedAsRead=チケットは既読としてマークされている
+TicketReadOn=読む
 TicketCloseOn=日付を閉じる
-MarkAsRead=Mark ticket as read
-TicketHistory=Ticket history
-AssignUser=Assign to user
-TicketAssigned=Ticket is now assigned
-TicketChangeType=Change type
-TicketChangeCategory=Change analytic code
-TicketChangeSeverity=Change severity
-TicketAddMessage=Add a message
-AddMessage=Add a message
-MessageSuccessfullyAdded=Ticket added
-TicketMessageSuccessfullyAdded=Message successfully added
-TicketMessagesList=Message list
-NoMsgForThisTicket=No message for this ticket
-Properties=Classification
-LatestNewTickets=Latest %s newest tickets (not read)
-TicketSeverity=Severity
-ShowTicket=See ticket
-RelatedTickets=Related tickets
-TicketAddIntervention=Create intervention
-CloseTicket=Close ticket
-CloseATicket=Close a ticket
-ConfirmCloseAticket=Confirm ticket closing
-ConfirmDeleteTicket=Please confirm ticket deleting
-TicketDeletedSuccess=Ticket deleted with success
-TicketMarkedAsClosed=Ticket marked as closed
-TicketDurationAuto=Calculated duration
-TicketDurationAutoInfos=Duration calculated automatically from intervention related
-TicketUpdated=Ticket updated
-SendMessageByEmail=Send message by email
-TicketNewMessage=New message
-ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send
-TicketGoIntoContactTab=Please go into "Contacts" tab to select them
-TicketMessageMailIntro=Introduction
-TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.
-TicketMessageMailIntroLabelAdmin=Introduction to the message when sending email
-TicketMessageMailIntroText=Hello,<br>A new response was sent on a ticket that you contact. Here is the message:<br>
-TicketMessageMailIntroHelpAdmin=This text will be inserted before the text of the response to a ticket.
+MarkAsRead=チケットに既読のマークを付ける
+TicketHistory=チケット履歴
+AssignUser=ユーザーに割り当てる
+TicketAssigned=チケットが割り当てられました
+TicketChangeType=タイプを変更する
+TicketChangeCategory=分析コードを変更する
+TicketChangeSeverity=重大度の変更
+TicketAddMessage=メッセージを追加
+AddMessage=メッセージを追加
+MessageSuccessfullyAdded=チケット追加
+TicketMessageSuccessfullyAdded=メッセージが正常に追加された
+TicketMessagesList=メッセージリスト
+NoMsgForThisTicket=このチケットのメッセージはない
+Properties=分類
+LatestNewTickets=最新の%s最新のチケット（未読）
+TicketSeverity=重大度
+ShowTicket=チケットを見る
+RelatedTickets=関連チケット
+TicketAddIntervention=介入を作成する
+CloseTicket=チケットを閉じる
+CloseATicket=チケットを閉じる
+ConfirmCloseAticket=チケットの終了を確認する
+ConfirmDeleteTicket=チケットの削除を確認すること
+TicketDeletedSuccess=チケットは正常に削除された
+TicketMarkedAsClosed=チケットはクローズとしてマークされている
+TicketDurationAuto=計算された期間
+TicketDurationAutoInfos=関連する介入から自動的に計算された期間
+TicketUpdated=チケット更新
+SendMessageByEmail=メールでメッセージを送る
+TicketNewMessage=新規メッセージ
+ErrorMailRecipientIsEmptyForSendTicketMessage=受信者は空。メール送信なし
+TicketGoIntoContactTab=「連絡先」タブに移動して選択すること
+TicketMessageMailIntro=前書き
+TicketMessageMailIntroHelp=このテキストはメールの冒頭にのみ追加され、保存されない。
+TicketMessageMailIntroLabelAdmin=メール送信時のメッセージの紹介
+TicketMessageMailIntroText=こんにちは、<br>連絡したチケットに新規応答が送信された。メッセージは次のとおり：<br>
+TicketMessageMailIntroHelpAdmin=このテキストは、チケットへの応答のテキストの前に挿入される。
 TicketMessageMailSignature=署名
-TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
-TicketMessageMailSignatureText=<p>Sincerely,</p><p>--</p>
-TicketMessageMailSignatureLabelAdmin=Signature of response email
-TicketMessageMailSignatureHelpAdmin=This text will be inserted after the response message.
-TicketMessageHelp=Only this text will be saved in the message list on ticket card.
-TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
-TimeElapsedSince=Time elapsed since
-TicketTimeToRead=Time elapsed before read
-TicketContacts=Contacts ticket
-TicketDocumentsLinked=Documents linked to ticket
-ConfirmReOpenTicket=Confirm reopen this ticket ?
-TicketMessageMailIntroAutoNewPublicMessage=A new message was posted on the ticket with the subject %s:
-TicketAssignedToYou=Ticket assigned
-TicketAssignedEmailBody=You have been assigned the ticket #%s by %s
-MarkMessageAsPrivate=Mark message as private
-TicketMessagePrivateHelp=This message will not display to external users
-TicketEmailOriginIssuer=Issuer at origin of the tickets
-InitialMessage=Initial Message
-LinkToAContract=Link to a contract
-TicketPleaseSelectAContract=Select a contract
-UnableToCreateInterIfNoSocid=Can not create an intervention when no third party is defined
-TicketMailExchanges=Mail exchanges
-TicketInitialMessageModified=Initial message modified
-TicketMessageSuccesfullyUpdated=Message successfully updated
-TicketChangeStatus=Change status
-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
-ErrorTicketRefRequired=Ticket reference name is required
+TicketMessageMailSignatureHelp=このテキストはメールの最後にのみ追加され、保存されない。
+TicketMessageMailSignatureText= <p>敬具。</p><p>--</p>
+TicketMessageMailSignatureLabelAdmin=返信メールの署名
+TicketMessageMailSignatureHelpAdmin=このテキストは、応答メッセージの後に挿入される。
+TicketMessageHelp=このテキストのみがチケットカードのメッセージリストに保存される。
+TicketMessageSubstitutionReplacedByGenericValues=置換変数は一般的な値に置き換えられます。
+TimeElapsedSince=からの経過時間
+TicketTimeToRead=読み取るまでの経過時間
+TicketContacts=連絡先チケット
+TicketDocumentsLinked=チケットにリンクされているドキュメント
+ConfirmReOpenTicket=このチケットを再度開くことを確認するか？
+TicketMessageMailIntroAutoNewPublicMessage=件名が%sの新規メッセージがチケットに投稿された。
+TicketAssignedToYou=割り当てられたチケット
+TicketAssignedEmailBody=%sによってチケット＃%sが割り当てられました
+MarkMessageAsPrivate=メッセージをプライベートとしてマークする
+TicketMessagePrivateHelp=このメッセージは外部ユーザーには表示されない
+TicketEmailOriginIssuer=チケットの発行元の発行者
+InitialMessage=最初のメッセージ
+LinkToAContract=契約へのリンク
+TicketPleaseSelectAContract=契約を選択する
+UnableToCreateInterIfNoSocid=サードパーティが定義されていない場合、介入を作成できない
+TicketMailExchanges=メール交換
+TicketInitialMessageModified=最初のメッセージが変更された
+TicketMessageSuccesfullyUpdated=メッセージが正常に更新された
+TicketChangeStatus=ステータスを変更する
+TicketConfirmChangeStatus=ステータスの変更を確認する：%s？
+TicketLogStatusChanged=ステータスが変更された：%sから%s
+TicketNotNotifyTiersAtCreate=作成時に法人に通知しない
+Unread=未読
+TicketNotCreatedFromPublicInterface=利用不可。チケットはパブリックインターフェイスから作成されなかった。
+PublicInterfaceNotEnabled=パブリックインターフェイスが有効になっていない
+ErrorTicketRefRequired=チケット参照名が必要
 
 #
 # Logs
 #
-TicketLogMesgReadBy=Ticket %s read by %s
-NoLogForThisTicket=No log for this ticket yet
-TicketLogAssignedTo=Ticket %s assigned to %s
-TicketLogPropertyChanged=Ticket %s modified: classification from %s to %s
-TicketLogClosedBy=Ticket %s closed by %s
-TicketLogReopen=Ticket %s re-open
+TicketLogMesgReadBy=%sによって読み取られたチケット%s
+NoLogForThisTicket=このチケットのログはまだない
+TicketLogAssignedTo=%sに割り当てられたチケット%s
+TicketLogPropertyChanged=チケット%sが変更された：%sから%sへの分類
+TicketLogClosedBy=チケット%sは%sによってクローズされた
+TicketLogReopen=チケット%s再開
 
 #
 # Public pages
 #
-TicketSystem=Ticket system
-ShowListTicketWithTrackId=Display ticket list from track ID
-ShowTicketWithTrackId=Display ticket from track ID
-TicketPublicDesc=You can create a support ticket or check from an existing ID.
-YourTicketSuccessfullySaved=Ticket has been successfully saved!
-MesgInfosPublicTicketCreatedWithTrackId=A new ticket has been created with ID %s and Ref %s.
-PleaseRememberThisId=Please keep the tracking number that we might ask you later.
-TicketNewEmailSubject=Ticket creation confirmation - Ref %s (public ticket ID %s)
-TicketNewEmailSubjectCustomer=New support ticket
-TicketNewEmailBody=This is an automatic email to confirm you have registered a new ticket.
-TicketNewEmailBodyCustomer=This is an automatic email to confirm a new ticket has just been created into your account.
-TicketNewEmailBodyInfosTicket=Information for monitoring the ticket
-TicketNewEmailBodyInfosTrackId=Ticket tracking number: %s
-TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the link above.
-TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
-TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
-TicketPublicInfoCreateTicket=This form allows you to record a support ticket in our management system.
-TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.
-TicketPublicMsgViewLogIn=Please enter ticket tracking ID
-TicketTrackId=Public Tracking ID
-OneOfTicketTrackId=One of your tracking ID
-ErrorTicketNotFound=Ticket with tracking ID %s not found!
-Subject=Subject
-ViewTicket=View ticket
-ViewMyTicketList=View my ticket list
-ErrorEmailMustExistToCreateTicket=Error: email address not found in our database
-TicketNewEmailSubjectAdmin=New ticket created - Ref %s (public ticket ID %s)
-TicketNewEmailBodyAdmin=<p>Ticket has just been created with ID #%s, see information:</p>
-SeeThisTicketIntomanagementInterface=See ticket in management interface
-TicketPublicInterfaceForbidden=The public interface for the tickets was not enabled
-ErrorEmailOrTrackingInvalid=Bad value for tracking ID or email
-OldUser=Old user
-NewUser=新しいユーザ
-NumberOfTicketsByMonth=Number of tickets per month
-NbOfTickets=Number of tickets
+TicketSystem=チケットシステム
+ShowListTicketWithTrackId=トラックIDからチケットリストを表示する
+ShowTicketWithTrackId=トラックIDからチケットを表示
+TicketPublicDesc=サポートチケットを作成したり、既存のIDから確認したりできる。
+YourTicketSuccessfullySaved=チケットが正常に保存された！
+MesgInfosPublicTicketCreatedWithTrackId=ID%sおよびRef%sで新規チケットが作成された。
+PleaseRememberThisId=後で尋ねる可能性のある追跡番号を保管すること。
+TicketNewEmailSubject=チケット作成の確認-Ref%s（パブリックチケットID %s）
+TicketNewEmailSubjectCustomer=新規サポートチケット
+TicketNewEmailBody=これは、新規チケットを登録したことを確認するための自動メール。
+TicketNewEmailBodyCustomer=これは、新規チケットがアカウントに作成されたことを確認するための自動メール。
+TicketNewEmailBodyInfosTicket=チケットを監視するための情報
+TicketNewEmailBodyInfosTrackId=チケット追跡番号：%s
+TicketNewEmailBodyInfosTrackUrl=上のリンクをクリックすると、チケットの進行状況を確認できる。
+TicketNewEmailBodyInfosTrackUrlCustomer=次のリンクをクリックすると、特定のインターフェイスでチケットの進行状況を確認できる。
+TicketEmailPleaseDoNotReplyToThisEmail=このメールに直接返信しないこと。リンクを使用して、インターフェースに返信する。
+TicketPublicInfoCreateTicket=このフォームを使用すると、管理システムにサポートチケットを記録できる。
+TicketPublicPleaseBeAccuratelyDescribe=問題を正確に説明すること。お客様のリクエストを正しく特定できるように、可能な限り多くの情報を提供すること。
+TicketPublicMsgViewLogIn=チケット追跡IDを入力すること
+TicketTrackId=パブリックトラッキングID
+OneOfTicketTrackId=トラッキングIDの1つ
+ErrorTicketNotFound=追跡ID%sのチケットが見つからない！
+Subject=科目
+ViewTicket=チケットを見る
+ViewMyTicketList=チケットリストを見る
+ErrorEmailMustExistToCreateTicket=エラー：データベースにメールアドレスが見つからない
+TicketNewEmailSubjectAdmin=新規チケットが作成された-Ref%s（パブリックチケットID %s）
+TicketNewEmailBodyAdmin= <p>チケットはID＃%sで作成された。情報を参照すること：</p>
+SeeThisTicketIntomanagementInterface=管理インターフェースでチケットを見る
+TicketPublicInterfaceForbidden=チケットのパブリックインターフェイスが有効になっていない
+ErrorEmailOrTrackingInvalid=IDまたは電子メールを追跡するための不正な値
+OldUser=古いユーザー
+NewUser=新規ユーザ
+NumberOfTicketsByMonth=1か月あたりのチケット数
+NbOfTickets=チケット数
 # notifications
-TicketNotificationEmailSubject=Ticket %s updated
-TicketNotificationEmailBody=This is an automatic message to notify you that ticket %s has just been updated
-TicketNotificationRecipient=Notification recipient
-TicketNotificationLogMessage=Log message
-TicketNotificationEmailBodyInfosTrackUrlinternal=View ticket into interface
-TicketNotificationNumberEmailSent=Notification email sent: %s
+TicketNotificationEmailSubject=チケット%sが更新された
+TicketNotificationEmailBody=これは、チケット%sが更新されたことを通知する自動メッセージ。
+TicketNotificationRecipient=通知の受信者
+TicketNotificationLogMessage=ログメッセージ
+TicketNotificationEmailBodyInfosTrackUrlinternal=チケットをインターフェースに表示
+TicketNotificationNumberEmailSent=送信された通知メール：%s
 
-ActionsOnTicket=Events on ticket
+ActionsOnTicket=チケットのイベント
 
 #
 # Boxes
 #
-BoxLastTicket=Latest created tickets
-BoxLastTicketDescription=Latest %s created tickets
+BoxLastTicket=最新に作成されたチケット
+BoxLastTicketDescription=最新の%sが作成したチケット
 BoxLastTicketContent=
-BoxLastTicketNoRecordedTickets=No recent unread tickets
-BoxLastModifiedTicket=Latest modified tickets
-BoxLastModifiedTicketDescription=Latest %s modified tickets
+BoxLastTicketNoRecordedTickets=最近の未読チケットはない
+BoxLastModifiedTicket=最新の変更されたチケット
+BoxLastModifiedTicketDescription=最新の%s変更チケット
 BoxLastModifiedTicketContent=
-BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxLastModifiedTicketNoRecordedTickets=最近変更されたチケットはない
diff --git a/htdocs/langs/ja_JP/trips.lang b/htdocs/langs/ja_JP/trips.lang
index 851305500a3..9ec51fa3ea2 100644
--- a/htdocs/langs/ja_JP/trips.lang
+++ b/htdocs/langs/ja_JP/trips.lang
@@ -44,7 +44,7 @@ TF_LUNCH=ランチ
 TF_METRO=Metro
 TF_TRAIN=Train
 TF_BUS=Bus
-TF_CAR=Car
+TF_CAR=自動車
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
 TF_HOTEL=Hotel
@@ -90,7 +90,7 @@ DATE_REFUS=Deny date
 DATE_SAVE=検証日
 DATE_CANCEL=Cancelation date
 DATE_PAIEMENT=支払期日
-BROUILLONNER=Reopen
+BROUILLONNER=再開 
 ExpenseReportRef=Ref. expense report
 ValidateAndSubmit=Validate and submit for approval
 ValidatedWaitingApproval=Validated (waiting for approval)
@@ -110,7 +110,7 @@ ExpenseReportPayment=Expense report payment
 ExpenseReportsToApprove=Expense reports to approve
 ExpenseReportsToPay=Expense reports to pay
 ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
-ExpenseReportsIk=Expense report milles index
+ExpenseReportsIk=Configuration of mileage charges
 ExpenseReportsRules=Expense report rules
 ExpenseReportIkDesc=You can modify the calculation of kilometers expense by category and range who they are previously defined. <b>d</b> is the distance in kilometers
 ExpenseReportRulesDesc=You can create or update any rules of calculation. This part will be used when user will create a new expense report
@@ -145,7 +145,7 @@ nolimitbyEX_DAY=by day (no limitation)
 nolimitbyEX_MON=by month (no limitation)
 nolimitbyEX_YEA=by year (no limitation)
 nolimitbyEX_EXP=by line (no limitation)
-CarCategory=Category of car
+CarCategory=Vehicle category
 ExpenseRangeOffset=Offset amount: %s
 RangeIk=Mileage range
-AttachTheNewLineToTheDocument=Attach the new line to an existing document
+AttachTheNewLineToTheDocument=Attach the line to an uploaded document
diff --git a/htdocs/langs/ja_JP/users.lang b/htdocs/langs/ja_JP/users.lang
index f6e45f55480..93d45a5a4d9 100644
--- a/htdocs/langs/ja_JP/users.lang
+++ b/htdocs/langs/ja_JP/users.lang
@@ -1,120 +1,125 @@
 # Dolibarr language file - Source file is en_US - users
-HRMArea=HRM area
-UserCard=ユーザーカード
+HRMArea=HRMエリア
+UserCard=ユーザカード
 GroupCard=グループカード
 Permission=アクセス権
 Permissions=パーミッション
-EditPassword=パスワードを編集します。
+EditPassword=パスワードを編集する。
 SendNewPassword=パスワードを再生成して送信する
-SendNewPasswordLink=Send link to reset password
+SendNewPasswordLink=パスワードをリセットするためのリンクを送信する
 ReinitPassword=パスワードを再生成する
 PasswordChangedTo=%s：パスワードに変更
-SubjectNewPassword=Your new password for %s
+SubjectNewPassword=%sの新規パスワード
 GroupRights=グループのパーミッション
-UserRights=ユーザー権限
-UserGUISetup=User Display Setup
+UserRights=ユーザ権限
+UserGUISetup=ユーザディスプレイの設定
 DisableUser=無効にする
-DisableAUser=ユーザーを無効にする
+DisableAUser=ユーザを無効にする
 DeleteUser=削除
-DeleteAUser=ユーザーを削除する
-EnableAUser=ユーザーを有効にします。
+DeleteAUser=ユーザを削除する
+EnableAUser=ユーザを有効にする。
 DeleteGroup=削除する
 DeleteAGroup=グループを削除する
-ConfirmDisableUser=Are you sure you want to disable user <b>%s</b>?
-ConfirmDeleteUser=Are you sure you want to delete user <b>%s</b>?
-ConfirmDeleteGroup=Are you sure you want to delete group <b>%s</b>?
-ConfirmEnableUser=Are you sure you want to enable user <b>%s</b>?
-ConfirmReinitPassword=Are you sure you want to generate a new password for user <b>%s</b>?
-ConfirmSendNewPassword=Are you sure you want to generate and send new password for user <b>%s</b>?
-NewUser=新しいユーザ
+ConfirmDisableUser=ユーザ<b>%s </b>を無効にしてもよいか？
+ConfirmDeleteUser=ユーザ<b>%s </b>を削除してもよいか？
+ConfirmDeleteGroup=グループ<b>%s </b>を削除してもよいか？
+ConfirmEnableUser=ユーザ<b>%s </b>を有効にするか？
+ConfirmReinitPassword=ユーザ<b>%s </b>の新規パスワードを生成してもよいか？
+ConfirmSendNewPassword=ユーザ<b>%s </b>の新規パスワードを生成して送信してもよいか？
+NewUser=新規ユーザ
 CreateUser=ユーザを作成する
-LoginNotDefined=ログインが定義されていません。
-NameNotDefined=名前が定義されていません。
-ListOfUsers=ユーザーのリスト
+LoginNotDefined=ログインが定義されていない。
+NameNotDefined=名前が定義されていない。
+ListOfUsers=ユーザのリスト
 SuperAdministrator=スーパー管理者
 SuperAdministratorDesc=グローバル管理者
 AdministratorDesc=管理者
-DefaultRights=Default Permissions
-DefaultRightsDesc=Define here the <u>default</u> permissions that are automatically granted to a <u>new</u> user (to modify permissions for existing users, go to the user card).
-DolibarrUsers=Dolibarrユーザー
+DefaultRights=デフォルト権限
+DefaultRightsDesc=ここで、<u>デフォルト</u>権限を定義する。これは、<u>新規</u>ユーザに自動的に付与される（既存のユーザの権限を変更するには、ユーザカードに移動する）。
+DolibarrUsers=Dolibarrユーザ
 LastName=姓
 FirstName=最初の名前
 ListOfGroups=グループのリスト
 NewGroup=新グループ
-CreateGroup=グループを作成します。
+CreateGroup=グループを作成する。
 RemoveFromGroup=グループから削除
-PasswordChangedAndSentTo=パスワードが変更され<b>、%s</b>に送信されます。
-PasswordChangeRequest=Request to change password for <b>%s</b>
-PasswordChangeRequestSent=<b>%s %s</b>に送信するためのパスワードを変更するには、要求します。
-ConfirmPasswordReset=Confirm password reset
-MenuUsersAndGroups=ユーザーとグループ
-LastGroupsCreated=Latest %s groups created
-LastUsersCreated=Latest %s users created
+PasswordChangedAndSentTo=パスワードが変更され<b>%s</b>に送信された。
+PasswordChangeRequest=<b> %s</b>のパスワード変更を要求
+PasswordChangeRequestSent=<b>%s</b> のパスワード変更を要求するには <b>%s</b> に送信する。
+IfLoginExistPasswordRequestSent=このログインが有効なアカウントである場合、パスワードをリセットするための電子メールが送信されている。
+IfEmailExistPasswordRequestSent=このメールが有効なアカウントである場合、パスワードをリセットするためのメールが送信されている。
+ConfirmPasswordReset=パスワードのリセットを確認する
+MenuUsersAndGroups=ユーザとグループ
+LastGroupsCreated=作成された最新の%sグループ
+LastUsersCreated=作成された最新の%sユーザ
 ShowGroup=グループを表示
-ShowUser=ユーザーを表示する
-NonAffectedUsers=非影響を受けるユーザー
-UserModified=ユーザーが正常に変更
+ShowUser=ユーザを表示する
+NonAffectedUsers=非影響を受けるユーザ
+UserModified=ユーザが正常に変更
 PhotoFile=写真ファイル
 ListOfUsersInGroup=このグループのユーザのリスト
 ListOfGroupsForUser=このユーザのグループのリスト
-LinkToCompanyContact=サードパーティ/お問い合わせへのリンク
+LinkToCompanyContact=取引先/お問い合わせへのリンク
 LinkedToDolibarrMember=メンバーへのリンク
-LinkedToDolibarrUser=Dolibarrユーザーへのリンク
+LinkedToDolibarrUser=Dolibarrユーザへのリンク
 LinkedToDolibarrThirdParty=Dolibarr第三者へのリンク
-CreateDolibarrLogin=ユーザーを作成します
-CreateDolibarrThirdParty=サードパーティを作成します。
-LoginAccountDisableInDolibarr=Dolibarrでアカウントを無効にします。
+CreateDolibarrLogin=ユーザを作成する
+CreateDolibarrThirdParty=取引先を作成する。
+LoginAccountDisableInDolibarr=Dolibarrでアカウントを無効にする。
 UsePersonalValue=個人的な値を使用
 InternalUser=内部ユーザ
-ExportDataset_user_1=Users and their properties
-DomainUser=ドメインユーザー%s
+ExportDataset_user_1=ユーザとそのプロパティ
+DomainUser=ドメインユーザ%s
 Reactivate=再アクティブ化
-CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
-PermissionInheritedFromAGroup=ユーザーのグループのいずれかから継承されたので、許可が付与されます。
+CreateInternalUserDesc=このフォームを使用すると、法人/組織に内部ユーザを作成できる。外部ユーザ（顧客、仕入先など）を作成するには、その取引先の連絡先カードから Dolibarrユーザの作成 ボタンを使用する。
+InternalExternalDesc=<b>内部</b>ユーザは、法人/組織の一部であるユーザ。 <br> <b>外部</b>ユーザは、顧客、仕入先、またはその他（取引先の外部ユーザの作成は、取引先の連絡先レコードから実行できる）。 <br> <br>どちらの場合も、権限はDolibarrの権限を定義し、外部ユーザも内部ユーザとは異なるメニューマネージャーを持つことができる（ ホーム - 設定 - 表示 を参照）
+PermissionInheritedFromAGroup=ユーザのグループのいずれかから継承されたので、許可が付与される。
 Inherited=継承された
-UserWillBeInternalUser=（特定の第三者にリンクされていないため）作成したユーザーは、内部ユーザーになります
-UserWillBeExternalUser=作成したユーザ（特にサードパーティにリンクされているため）、外部のユーザーになります
+UserWillBe=作成されたユーザは
+UserWillBeInternalUser=（特定の第三者にリンクされていないため）作成したユーザは、内部ユーザになる
+UserWillBeExternalUser=作成したユーザ（特に取引先にリンクされているため）、外部のユーザになる
 IdPhoneCaller=イドの電話発信
-NewUserCreated=ユーザーの%s作成
+NewUserCreated=ユーザの%s作成
 NewUserPassword=%s用パスワードの変更
-NewPasswordValidated=Your new password have been validated and must be used now to login.
-EventUserModified=ユーザーの%sは変更
-UserDisabled=ユーザーの%sが無効になって
-UserEnabled=ユーザー%sは、アクティブ
-UserDeleted=ユーザー%sは削除され
+NewPasswordValidated=新規パスワードは検証済みであり、ログインするには今すぐ使用する必要がある。
+EventUserModified=ユーザの%sは変更
+UserDisabled=ユーザの%sが無効になって
+UserEnabled=ユーザ%sは、アクティブ
+UserDeleted=ユーザ%sは削除され
 NewGroupCreated=グループ%sが作成
-GroupModified=Group %s modified
+GroupModified=グループ%sが変更されました
 GroupDeleted=グループ%sは削除され
-ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact?
-ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member?
-ConfirmCreateThirdParty=Are you sure you want to create a third party for this member?
-LoginToCreate=作成するには、ログインしてください
-NameToCreate=作成するには、サードパーティの名前
+ConfirmCreateContact=この連絡先のDolibarrアカウントを作成してもよいか？
+ConfirmCreateLogin=このメンバーのDolibarrアカウントを作成してもよいか？
+ConfirmCreateThirdParty=このメンバーの取引先を作成してもよいか？
+LoginToCreate=作成するには、ログインすること
+NameToCreate=作成するには、取引先の名前
 YourRole=あなたの役割
-YourQuotaOfUsersIsReached=アクティブなユーザーのあなたのクォータに達している！
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
-DontDowngradeSuperAdmin=唯一superadminはダウングレードは、superAdminできます
-HierarchicalResponsible=Supervisor
-HierarchicView=Hierarchical view
-UseTypeFieldToChange=Use field Type to change
+YourQuotaOfUsersIsReached=アクティブなユーザのあなたのクォータに達している！
+NbOfUsers=ユーザ数
+NbOfPermissions=権限の数
+DontDowngradeSuperAdmin=唯一superadminはダウングレードは、superAdminできる
+HierarchicalResponsible=スーパーバイザー
+HierarchicView=階層ビュー
+UseTypeFieldToChange=フィールドタイプを使用して変更
 OpenIDURL=OpenID URL
-LoginUsingOpenID=Use OpenID to login
-WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
-ColorUser=Color of the user
-DisabledInMonoUserMode=Disabled in maintenance mode
-UserAccountancyCode=User accounting code
-UserLogoff=User logout
-UserLogged=User logged
-DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
-DateEmploymentEnd=Employment End Date
-CantDisableYourself=You can't disable your own user record
-ForceUserExpenseValidator=Force expense report validator
-ForceUserHolidayValidator=Force leave request validator
-ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
-UserPersonalEmail=Personal email
-UserPersonalMobile=Personal mobile phone
-WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
+LoginUsingOpenID=OpenIDを使用してログインする
+WeeklyHours=労働時間（週あたり）
+ExpectedWorkedHours=週あたりの予想労働時間
+ColorUser=ユーザの色
+DisabledInMonoUserMode=メンテナンスモードでは無効
+UserAccountancyCode=ユーザアカウンティングコード
+UserLogoff=ユーザのログアウト
+UserLogged=ユーザがログに記録
+DateOfEmployment=雇用日
+DateEmployment=雇用
+DateEmploymentstart=雇用開始日
+DateEmploymentEnd=雇用終了日
+RangeOfLoginValidity=ログイン有効期間
+CantDisableYourself=自分のユーザレコードを無効にすることはできません
+ForceUserExpenseValidator=経費報告書検証ツールを強制する
+ForceUserHolidayValidator=強制休暇リクエストバリデーター
+ValidatorIsSupervisorByDefault=デフォルトでは、バリデーターはユーザのスーパーバイザー。この動作を維持するには、空のままにする。
+UserPersonalEmail=個人的なメール
+UserPersonalMobile=個人の携帯電話
+WarningNotLangOfInterface=警告、これはユーザが話す主要な言語であり、ユーザが表示することを選択したインターフェースの言語ではない。このユーザに表示されるインターフェース言語を変更するには、タブ%sに移動する。
diff --git a/htdocs/langs/ja_JP/website.lang b/htdocs/langs/ja_JP/website.lang
index 0d68e3cf38a..2553493c60a 100644
--- a/htdocs/langs/ja_JP/website.lang
+++ b/htdocs/langs/ja_JP/website.lang
@@ -1,137 +1,139 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=コー​​ド
-WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
+WebsiteSetupDesc=使用したいウェブサイトをここに作成する。次に、メニューのWebサイトに移動して編集する。
 DeleteWebsite=ウェブサイトを削除
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
-WEBSITE_TYPE_CONTAINER=Type of page/container
-WEBSITE_PAGE_EXAMPLE=Web page to use as example
-WEBSITE_PAGENAME=Page name/alias
-WEBSITE_ALIASALT=Alternative page names/aliases
-WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
-WEBSITE_CSS_URL=URL of external CSS file
-WEBSITE_CSS_INLINE=CSS file content (common to all pages)
-WEBSITE_JS_INLINE=Javascript file content (common to all pages)
-WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
-WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Website .htaccess file
-WEBSITE_MANIFEST_JSON=Website manifest.json file
-WEBSITE_README=README.md file
-WEBSITE_KEYWORDSDesc=Use a comma to separate values
-EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
-HtmlHeaderPage=HTML header (specific to this page only)
-PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
-EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
-MediaFiles=Media library
-EditCss=Edit website properties
-EditMenu=Edit menu
-EditMedias=Edit medias
-EditPageMeta=Edit page/container properties
-EditInLine=Edit inline
-AddWebsite=Add website
-Webpage=Web page/container
-AddPage=Add page/container
-HomePage=Home Page
-PageContainer=Page/container
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
-RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
-SiteDeleted=Web site '%s' deleted
-PageContent=Page/Contenair
-PageDeleted=Page/Contenair '%s' of website %s deleted
-PageAdded=Page/Contenair '%s' added
-ViewSiteInNewTab=View site in new tab
-ViewPageInNewTab=View page in new tab
+ConfirmDeleteWebsite=このWebサイトを削除してもよいか？そのすべてのページとコンテンツも削除される。アップロードされたファイル（メディアディレクトリ、ECMモジュールなど）は残る。
+WEBSITE_TYPE_CONTAINER=ページ/コンテナのタイプ
+WEBSITE_PAGE_EXAMPLE=例として使用するWebページ
+WEBSITE_PAGENAME=ページ名/エイリアス
+WEBSITE_ALIASALT=代替ページ名/エイリアス
+WEBSITE_ALIASALTDesc=他の名前/エイリアスのリストをここで使用して、この他の名前/エイリアスを使用してページにアクセスできるようにする（たとえば、古いリンク/名前のバックリンクを機能させるためにエイリアスの名前を変更した後の古い名前）。構文は次のとおり。<br>alternativename1、alternativename2、..。
+WEBSITE_CSS_URL=外部CSSファイルのURL
+WEBSITE_CSS_INLINE=CSSファイルの内容（すべてのページに共通）
+WEBSITE_JS_INLINE=Javascriptファイルの内容（すべてのページに共通）
+WEBSITE_HTML_HEADER=HTMLヘッダーの下部に追加（すべてのページに共通）
+WEBSITE_ROBOT=ロボットファイル（robots.txt）
+WEBSITE_HTACCESS=ウェブサイトの.htaccessファイル
+WEBSITE_MANIFEST_JSON=ウェブサイトmanifest.jsonファイル
+WEBSITE_README=README.mdファイル
+WEBSITE_KEYWORDSDesc=値を区切るにはコンマを使用する
+EnterHereLicenseInformation=ここにメタデータまたはライセンス情報を入力して、README.mdファイルに入力する。ウェブサイトをテンプレートとして配布する場合、ファイルは誘惑パッケージに含まれる。
+HtmlHeaderPage=HTMLヘッダー（このページにのみ固有）
+PageNameAliasHelp=ページの名前またはエイリアス。 <br>このエイリアスは、WebサイトがWebサーバーの仮想ホスト（Apacke、Nginxなど）から実行されるときにSEOURLを偽造するためにも使用される。このエイリアスを編集するには、ボタン「<strong>%s</strong>」を使用する。
+EditTheWebSiteForACommonHeader=注：すべてのページにパーソナライズされたヘッダーを定義する場合は、ページ/コンテナーではなくサイトレベルでヘッダーを編集する。
+MediaFiles=メディアライブラリ
+EditCss=Webサイトのプロパティを編集する
+EditMenu=編集メニュー
+EditMedias=メディアを編集する
+EditPageMeta=ページ/コンテナのプロパティを編集する
+EditInLine=インライン編集
+AddWebsite=ウェブサイトを追加
+Webpage=Webページ/コンテナ
+AddPage=ページ/コンテナを追加
+HomePage=ホームページ
+PageContainer=ページ
+PreviewOfSiteNotYetAvailable=あなたのウェブサイトのプレビュー<strong>%s</strong>はまだ利用できません。最初に「<strong>完全なWebサイトテンプレート</strong>」をインポートするか、「<strong>ページ/コンテナ</strong>」を追加する必要がある。
+RequestedPageHasNoContentYet=ID %sの要求されたページにまだコンテンツがないか、キャッシュファイル.tpl.phpが削除された。これを解決するには、ページのコンテンツを編集すること。
+SiteDeleted=Webサイト '%s'が削除された
+PageContent=ページ/コンテネア
+PageDeleted=ウェブサイト%sのページ/ Contenair'%s 'が削除された
+PageAdded=ページ/ Contenair'%s 'が追加された
+ViewSiteInNewTab=新しいタブでサイトを表示
+ViewPageInNewTab=新しいタブでページを表示
 SetAsHomePage=ホームページに設定する
-RealURL=Real URL
-ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
-ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
-YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
-YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+RealURL=実際のURL
+ViewWebsiteInProduction=ホームURLを使用してWebサイトを表示する
+SetHereVirtualHost=<u>Apache/NGinx/...で使用 </u><br>専用の仮想ホストをWEBサーバ (Apache, Nginx, ...) 上に作成し、PHP 使用可で、ルートディレクトリを以下に指定する<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Apache仮想ホストのセットアップで使用する例：
+YouCanAlsoTestWithPHPS=<u>PHP組み込みサーバーでの使用</u><br>開発環境では、 PHP組み込みWebサーバ (PHP 5.5 が必要) でサイトをテストするのが都合がいいなら、次のコマンドを動かす<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP= <u>別のDolibarrホスティングプロバイダーでWebサイトを実行する</u><br>インターネット上でApacheやNGinxなどのWebサーバーを利用できない場合は、完全なDolibarrホスティングプロバイダーが提供する別のDolibarrインスタンスにWebサイトをエクスポートおよびインポートできる。ウェブサイトモジュールとの統合。いくつかのDolibarrホスティングプロバイダーのリストは、<a href="https://saas.dolibarr.org" target="_blank"> https：//saas.dolibarr.org</a>にある。
+CheckVirtualHostPerms=また、仮想ホストが<br> <strong> %s</strong>へのファイルに対する権限<strong>%s</strong>を持っていることを確認すること。
 ReadPerm=読む
-WritePerm=Write
-TestDeployOnWeb=Test/deploy on web
-PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
-VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
-NoPageYet=No pages yet
-YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
-SyntaxHelp=Help on specific syntax tips
-YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+WritePerm=書く
+TestDeployOnWeb=Webでのテスト/デプロイ
+PreviewSiteServedByWebServer=<u>新しいタブで %s をプレビュー。</u><br><br>  %s は、外部Webサーバ (Apache, Nginx, IIS など) から提供される。 以下のディレクトリを指定するには、当該サーバをインストールして設定する必要あり:<br><strong>%s</strong><br>URL は外部サーバ:<br><strong>%s</strong> による
+PreviewSiteServedByDolibarr= <u>新しいタブで%sをプレビューする。 </u> <br> <br> %sはDolibarrサーバーによって提供されるため、追加のWebサーバー（Apache、Nginx、IISなど）をインストールする必要はない。 <br>不便なのは、ページのURLがユーザーフレンドリーではなく、Dolibarrのパスで始まること。 URL <br> Dolibarrによって提供：<br> <strong> %s </strong> <br> <br>ディレクトリ<br> <strong> %s </strong> <br>上のポイントは、この仮想サーバーの名前を入力するWebサーバー上の仮想ホストを作成し、このウェブサイトを提供するために、独自の外部Webサーバーを使用するには他のプレビューボタンをクリックする。
+VirtualHostUrlNotDefined=外部Webサーバーによって提供される仮想ホストのURLが定義されていない
+NoPageYet=まだページはない
+YouCanCreatePageOrImportTemplate=新しいページを作成するか、完全なWebサイトテンプレートをインポートできる
+SyntaxHelp=特定の構文のヒントに関するヘルプ
+YouCanEditHtmlSourceckeditor=エディタの "ソース" ボタンを使用して、HTMLソースコードを編集できる。
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> タグ <strong>&lt;?php ?&gt;</strong> を使用して、当該ソースにPHPコードを含めることができる。次のグローバル変数が使用できる: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> 以下の構文を使用して、別のページ/コンテナーのコンテンツを含めることもできる:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> 以下の構文で別のページ/コンテナへのリダイレクトを行うことができる（注：リダイレクト前には、いかなるコンテンツも出力しないこと） :<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> 別のページへのリンクを追加するには、以下の構文:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> 含めるのが <strong>ダウンロードリンク</strong> で、ファイル保管場所が <strong>documents</strong> ディレクトリなら、使うのは <strong>document.php</strong> ラッパー:<br>例、ファイルを documents/ecm (ログ記録が必須) に置くなら、構文は:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>ファイルを documents/medias (パブリックアクセス用のオープンディレクトリ) に置くなら、構文は:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>ファイルを共有リンク (ファイルの共有ハッシュキーを使用したオープンアクセス) で共有するなら、構文は:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> 含めるのが <strong>画像</strong> で、保管先が <strong>documents</strong> ディレクトリなら、使うのは <strong>viewimage.php</strong> ラッパー:<br>例、画像を documents/medias (パブリックアクセス用のオープンディレクトリ) に置くなら、構文は:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
-ClonePage=Clone page/container
-CloneSite=Clone site
-SiteAdded=Website added
-ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
-PageIsANewTranslation=The new page is a translation of the current page ?
-LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
-ParentPageId=Parent page ID
-WebsiteId=Website ID
-CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create page from scratch or from a page template...
-FetchAndCreate=Fetch and Create
-ExportSite=Export website
-ImportSite=Import website template
-IDOfPage=Id of page
-Banner=Banner
-BlogPost=Blog post
-WebsiteAccount=Website account
-WebsiteAccounts=Website accounts
-AddWebsiteAccount=Create web site account
-BackToListForThirdParty=Back to list for the third-party
-DisableSiteFirst=Disable website first
-MyContainerTitle=My web site title
-AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
-SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
-YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
-OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
-GrabImagesInto=Grab also images found into css and page.
-ImagesShouldBeSavedInto=Images should be saved into directory
-WebsiteRootOfImages=Root directory for website images
-SubdirOfPage=Sub-directory dedicated to page
-AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
-CorporateHomePage=Corporate Home page
-EmptyPage=Empty page
-ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
-ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
-InternalURLOfPage=Internal URL of page
-ThisPageIsTranslationOf=This page/container is a translation of
-ThisPageHasTranslationPages=This page/container has translation
-NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
-GoTo=Go to
-DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
-NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
-ReplaceWebsiteContent=Search or Replace website content
-DeleteAlsoJs=Delete also all javascript files specific to this website?
-DeleteAlsoMedias=Delete also all medias files specific to this website?
-MyWebsitePages=My website pages
-SearchReplaceInto=Search | Replace into
-ReplaceString=New string
-CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
-LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
-Dynamiccontent=Sample of a page with dynamic content
-ImportSite=Import website template
-EditInLineOnOff=Mode 'Edit inline' is %s
-ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s
-GlobalCSSorJS=Global CSS/JS/Header file of web site
-BackToHomePage=Back to home page...
-TranslationLinks=Translation links
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
-UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters
-MainLanguage=Main language
-OtherLanguages=Other languages
-UseManifest=Provide a manifest.json file
-PublicAuthorAlias=Public author alias
-AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
-ReplacementDoneInXPages=Replacement done in %s pages or containers
+YouCanEditHtmlSource2=画像を共有リンク (ファイルの共有ハッシュキーを使用したオープンアクセス) で共有するなら、構文は:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSourceMore=<br>HTMLまたは動的コードのその他の例は、 <a href="%s" target="_blank">the wiki documentation</a><br> で利用可能。
+ClonePage=クローンページ/コンテナ
+CloneSite=クローンサイト
+SiteAdded=ウェブサイトを追加
+ConfirmClonePage=新しいページのコード/エイリアスを入力し、それが複製されたページの翻訳であるかどうかを入力すること。
+PageIsANewTranslation=新しいページは現在のページの翻訳ですか？
+LanguageMustNotBeSameThanClonedPage=ページを翻訳として複製する。新しいページの言語は、ソースページの言語とは異なっている必要がある。
+ParentPageId=親ページID
+WebsiteId=ウェブサイトID
+CreateByFetchingExternalPage=外部URLからページをフェッチしてページ/コンテナを作成する...
+OrEnterPageInfoManually=または、最初から、またはページテンプレートからページを作成する...
+FetchAndCreate=フェッチして作成
+ExportSite=ウェブサイトをエクスポート
+ImportSite=ウェブサイトテンプレートをインポートする
+IDOfPage=ページのID
+Banner=バナー
+BlogPost=ブログ投稿
+WebsiteAccount=ウェブサイトアカウント
+WebsiteAccounts=ウェブサイトアカウント
+AddWebsiteAccount=Webサイトアカウントを作成する
+BackToListForThirdParty=サードパーティのリストに戻る
+DisableSiteFirst=最初にウェブサイトを無効にする
+MyContainerTitle=私のウェブサイトのタイトル
+AnotherContainer=これは、別のページ/コンテナのコンテンツを含める方法です（埋め込まれたサブコンテナが存在しない可能性があるため、動的コードを有効にすると、ここでエラーが発生する可能性がある）
+SorryWebsiteIsCurrentlyOffLine=申し訳ないが、このウェブサイトは現在オフライン。後で戻ってきてください...
+WEBSITE_USE_WEBSITE_ACCOUNTS=Webサイトのアカウントテーブルを有効にする
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=テーブルを有効にして、各Webサイト/サードパーティのWebサイトアカウント（ログイン/パス）を保存する
+YouMustDefineTheHomePage=最初にデフォルトのホームページを定義する必要がある
+OnlyEditionOfSourceForGrabbedContentFuture=警告：外部WebページをインポートしてWebページを作成することは、経験豊富なユーザーのために予約されています。ソースページの複雑さによっては、インポートの結果が元のページと異なる場合がある。また、ソースページが一般的なCSSスタイルまたは競合するJavaScriptを使用している場合、このページで作業するときにWebサイトエディターの外観や機能が損なわれる可能性がある。この方法はページを作成するためのより迅速な方法ですが、最初から、または提案されたページテンプレートから新しいページを作成することをお勧めする。 <br>取得した外部ページで使用すると、インラインエディタが正しく機能しない場合があることにも注意すること。
+OnlyEditionOfSourceForGrabbedContent=コンテンツが外部サイトから取得された場合は、HTMLソースのエディションのみが可能。
+GrabImagesInto=cssとページにある画像も取得する。
+ImagesShouldBeSavedInto=画像はディレクトリに保存する必要がある
+WebsiteRootOfImages=ウェブサイト画像のルートディレクトリ
+SubdirOfPage=ページ専用のサブディレクトリ
+AliasPageAlreadyExists=エイリアスページ<strong>%s</strong>はすでに存在する
+CorporateHomePage=企業ホームページ
+EmptyPage=空のページ
+ExternalURLMustStartWithHttp=外部URLは http:// または https:// で始まる必要がある
+ZipOfWebsitePackageToImport=ウェブサイトテンプレートパッケージのZipファイルをアップロードする
+ZipOfWebsitePackageToLoad=または利用可能な埋め込みWebサイトテンプレートパッケージを選択する
+ShowSubcontainers=動的コンテンツを含める
+InternalURLOfPage=ページの内部URL
+ThisPageIsTranslationOf=このページ/コンテナはの翻訳です
+ThisPageHasTranslationPages=このページ/コンテナには翻訳がある
+NoWebSiteCreateOneFirst=ウェブサイトはまだ作成されていない。最初に作成する。
+GoTo=に移動
+DynamicPHPCodeContainsAForbiddenInstruction=動的コンテンツとしてデフォルトで禁止されているPHP命令 '<strong> %s </strong>'を含む動的PHPコードを追加する（許可されるコマンドのリストを増やすには、非表示のオプションWEBSITE_PHP_ALLOW_xxxを参照すること）。
+NotAllowedToAddDynamicContent=WebサイトでPHP動的コンテンツを追加または編集する権限がない。許可を求めるか、コードを変更せずにphpタグに入れること。
+ReplaceWebsiteContent=Webサイトのコンテンツを検索または置換する
+DeleteAlsoJs=このウェブサイトに固有のすべてのJavaScriptファイルも削除するか？
+DeleteAlsoMedias=このウェブサイトに固有のすべてのメディアファイルも削除するか？
+MyWebsitePages=私のウェブサイトのページ
+SearchReplaceInto=検索|に置き換える
+ReplaceString=新しい文字列
+CSSContentTooltipHelp=ここにCSSコンテンツを入力する。アプリケーションのCSSとの競合を避けるために、すべての定義に .bodywebsite クラスを前置することが必須。例:<br><br>#mycssselector, input.myclass:hover { ... }<br>は、以下のようにする。<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>注記: もし大きなファイルでこの前置が無いものがあれば、 'lessc' を使用して .bodywebsite の前置をすべての場所に追加する変換ができる。
+LinkAndScriptsHereAreNotLoadedInEditor=警告：このコンテンツは、サーバーからサイトにアクセスした場合にのみ出力される。編集モードでは使用されないため、編集モードでもJavaScriptファイルをロードする必要がある場合は、タグ「scriptsrc = ...」をページに追加するだけ。
+Dynamiccontent=動的コンテンツを含むページのサンプル
+ImportSite=ウェブサイトテンプレートをインポートする
+EditInLineOnOff=モード「インライン編集」は%sです
+ShowSubContainersOnOff=「動的コンテンツ」を実行するモードは%s。
+GlobalCSSorJS=WebサイトのグローバルCSS / JS /ヘッダーファイル
+BackToHomePage=ホームページに戻る...
+TranslationLinks=翻訳リンク
+YouTryToAccessToAFileThatIsNotAWebsitePage=利用できないページにアクセスしようとしました。 <br>（ref = %s、type = %s、status = %s）
+UseTextBetween5And70Chars=SEOを適切に実践するには、5〜70文字のテキストを使用する
+MainLanguage=主な言語
+OtherLanguages=他の言語
+UseManifest=マニフェスト.jsonファイルを提供する
+PublicAuthorAlias=公開著者エイリアス
+AvailableLanguagesAreDefinedIntoWebsiteProperties=利用可能な言語はウェブサイトのプロパティに定義されています
+ReplacementDoneInXPages=%sページまたはコンテナで行われた交換
 RSSFeed=RSSフィード
-RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
-PagesRegenerated=%s page(s)/container(s) regenerated
+RSSFeedDesc=このURLを使用して、タイプ「blogpost」の最新記事のRSSフィードを取得できる。
+PagesRegenerated=%sページ(s)/コンテナ(s)が再生成された
+RegenerateWebsiteContent=Webサイトのキャッシュファイルを再生成する
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/ka_GE/accountancy.lang b/htdocs/langs/ka_GE/accountancy.lang
index 7b59e33b296..3211a0b62df 100644
--- a/htdocs/langs/ka_GE/accountancy.lang
+++ b/htdocs/langs/ka_GE/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting expert
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=Journals
+Journals=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Chart of accounts
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bank accounts
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=By year
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index d7c4eb282cd..f1c41a3b62b 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
 CurrentTimeZone=TimeZone PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Interventions
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
+Permission13=Invalidate customer invoices
 Permission14=Validate customer invoices
 Permission15=Send customer invoices by email
 Permission16=Create payments for customer invoices
@@ -688,6 +694,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Read members
 Permission72=Create/modify members
 Permission74=Delete members
@@ -718,6 +728,7 @@ Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
@@ -825,10 +836,11 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Edition of field %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1282,7 +1322,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Global parameters
@@ -1523,7 +1564,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Level
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
@@ -1629,7 +1672,7 @@ AdvancedEditor=Advanced editor
 ActivateFCKeditor=Activate advanced editor for:
 FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
 FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
-MailToProject=Projects page
+MailToProject=Projects
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/ka_GE/banks.lang b/htdocs/langs/ka_GE/banks.lang
index 75f9549dca5..9500a5b8b2e 100644
--- a/htdocs/langs/ka_GE/banks.lang
+++ b/htdocs/langs/ka_GE/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/ka_GE/categories.lang b/htdocs/langs/ka_GE/categories.lang
index 9bb71984ecf..ba37a43b4ec 100644
--- a/htdocs/langs/ka_GE/categories.lang
+++ b/htdocs/langs/ka_GE/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/ka_GE/companies.lang b/htdocs/langs/ka_GE/companies.lang
index 92674363ced..dadff6a7894 100644
--- a/htdocs/langs/ka_GE/companies.lang
+++ b/htdocs/langs/ka_GE/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
 ProspectLevel=Prospect potential
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Currency
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/ka_GE/ecm.lang b/htdocs/langs/ka_GE/ecm.lang
index 43ddd3bf36f..71df60734fb 100644
--- a/htdocs/langs/ka_GE/ecm.lang
+++ b/htdocs/langs/ka_GE/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Search by keywords
 ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/ka_GE/hrm.lang b/htdocs/langs/ka_GE/hrm.lang
index 6cc7f6bef24..3b8f137e103 100644
--- a/htdocs/langs/ka_GE/hrm.lang
+++ b/htdocs/langs/ka_GE/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Employees
 Employee=Employee
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/ka_GE/install.lang b/htdocs/langs/ka_GE/install.lang
index 2d708c04147..63947dad154 100644
--- a/htdocs/langs/ka_GE/install.lang
+++ b/htdocs/langs/ka_GE/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=This PHP supports sessions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/ka_GE/intracommreport.lang b/htdocs/langs/ka_GE/intracommreport.lang
new file mode 100644
index 00000000000..3060300b974
--- /dev/null
+++ b/htdocs/langs/ka_GE/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=List
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/ka_GE/languages.lang b/htdocs/langs/ka_GE/languages.lang
index cc80b9f1719..ba187326705 100644
--- a/htdocs/langs/ka_GE/languages.lang
+++ b/htdocs/langs/ka_GE/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
index 0af5c66f0e0..96c68cdcfa3 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Remove link
 AddToDraft=Add to draft
 Update=Update
 Close=Close
+CloseAs=Set status to
 CloseBox=Remove widget from your dashboard
 Confirm=Confirm
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Re-Open
 Upload=Upload
 ToLink=Link
 Select=Select
+SelectAll=Select all
 Choose=Choose
 Resize=Resize
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=Cards
 Card=Card
 Now=Now
 HourStart=Start hour
+Deadline=Deadline
 Date=Date
 DateAndHour=Date and hour
 DateToday=Today's date
@@ -264,8 +267,10 @@ DateStart=Start date
 DateEnd=End date
 DateCreation=Creation date
 DateCreationShort=Creat. date
+IPCreation=Creation IP
 DateModification=Modification date
 DateModificationShort=Modif. date
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
@@ -319,6 +324,7 @@ Morning=Morning
 Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Month of the day
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Rate
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Amount tax 2
 AmountLT2=Amount tax 3
 AmountLT1ES=Amount RE
@@ -487,6 +494,7 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
+at=at
 to=to
 To=to
 and=and
@@ -509,6 +517,7 @@ Draft=Draft
 Drafts=Drafts
 StatusInterInvoiced=Invoiced
 Validated=Validated
+ValidatedToProduce=Validated (To produce)
 Opened=Open
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Response
 Priority=Priority
 SendByMail=Send by email
 MailSentBy=Email sent by
+NotSent=Not sent
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
@@ -836,6 +846,7 @@ ListOfTemplates=List of templates
 Gender=Gender
 Genderman=Man
 Genderwoman=Woman
+Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Comments
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Information
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Date of birth
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/ka_GE/members.lang b/htdocs/langs/ka_GE/members.lang
index 5ef946ddf67..5812248b129 100644
--- a/htdocs/langs/ka_GE/members.lang
+++ b/htdocs/langs/ka_GE/members.lang
@@ -19,14 +19,12 @@ MembersCards=Members business cards
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
 SubscriptionId=Subscription id
+WithoutSubscription=Without subscription
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@@ -81,7 +80,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/ka_GE/mrp.lang b/htdocs/langs/ka_GE/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/ka_GE/mrp.lang
+++ b/htdocs/langs/ka_GE/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang
index b59aa2f7080..97db059594f 100644
--- a/htdocs/langs/ka_GE/products.lang
+++ b/htdocs/langs/ka_GE/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/ka_GE/recruitment.lang b/htdocs/langs/ka_GE/recruitment.lang
index 73e9a7fa07f..b775e78552e 100644
--- a/htdocs/langs/ka_GE/recruitment.lang
+++ b/htdocs/langs/ka_GE/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/ka_GE/stocks.lang b/htdocs/langs/ka_GE/stocks.lang
index 81163e8d4b0..660443bcded 100644
--- a/htdocs/langs/ka_GE/stocks.lang
+++ b/htdocs/langs/ka_GE/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/ka_GE/suppliers.lang b/htdocs/langs/ka_GE/suppliers.lang
index 51562b8bb7a..03b03c75269 100644
--- a/htdocs/langs/ka_GE/suppliers.lang
+++ b/htdocs/langs/ka_GE/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/ka_GE/website.lang b/htdocs/langs/ka_GE/website.lang
index 4b5294d5e43..03e042e4be6 100644
--- a/htdocs/langs/ka_GE/website.lang
+++ b/htdocs/langs/ka_GE/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/km_KH/accountancy.lang b/htdocs/langs/km_KH/accountancy.lang
index 7b59e33b296..3211a0b62df 100644
--- a/htdocs/langs/km_KH/accountancy.lang
+++ b/htdocs/langs/km_KH/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting expert
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=Journals
+Journals=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Chart of accounts
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bank accounts
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=By year
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/km_KH/admin.lang b/htdocs/langs/km_KH/admin.lang
index d7c4eb282cd..f1c41a3b62b 100644
--- a/htdocs/langs/km_KH/admin.lang
+++ b/htdocs/langs/km_KH/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
 CurrentTimeZone=TimeZone PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Interventions
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
+Permission13=Invalidate customer invoices
 Permission14=Validate customer invoices
 Permission15=Send customer invoices by email
 Permission16=Create payments for customer invoices
@@ -688,6 +694,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Read members
 Permission72=Create/modify members
 Permission74=Delete members
@@ -718,6 +728,7 @@ Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
@@ -825,10 +836,11 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Edition of field %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1282,7 +1322,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Global parameters
@@ -1523,7 +1564,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Level
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
@@ -1629,7 +1672,7 @@ AdvancedEditor=Advanced editor
 ActivateFCKeditor=Activate advanced editor for:
 FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
 FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
-MailToProject=Projects page
+MailToProject=Projects
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/km_KH/banks.lang b/htdocs/langs/km_KH/banks.lang
index 75f9549dca5..9500a5b8b2e 100644
--- a/htdocs/langs/km_KH/banks.lang
+++ b/htdocs/langs/km_KH/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/km_KH/categories.lang b/htdocs/langs/km_KH/categories.lang
index 9bb71984ecf..ba37a43b4ec 100644
--- a/htdocs/langs/km_KH/categories.lang
+++ b/htdocs/langs/km_KH/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/km_KH/companies.lang b/htdocs/langs/km_KH/companies.lang
index 92674363ced..dadff6a7894 100644
--- a/htdocs/langs/km_KH/companies.lang
+++ b/htdocs/langs/km_KH/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
 ProspectLevel=Prospect potential
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Currency
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/km_KH/ecm.lang b/htdocs/langs/km_KH/ecm.lang
index 369ac6dfdfa..71df60734fb 100644
--- a/htdocs/langs/km_KH/ecm.lang
+++ b/htdocs/langs/km_KH/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Search by keywords
 ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to vendor proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/km_KH/hrm.lang b/htdocs/langs/km_KH/hrm.lang
index 6cc7f6bef24..3b8f137e103 100644
--- a/htdocs/langs/km_KH/hrm.lang
+++ b/htdocs/langs/km_KH/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Employees
 Employee=Employee
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/km_KH/install.lang b/htdocs/langs/km_KH/install.lang
index 2d708c04147..63947dad154 100644
--- a/htdocs/langs/km_KH/install.lang
+++ b/htdocs/langs/km_KH/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=This PHP supports sessions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/km_KH/intracommreport.lang b/htdocs/langs/km_KH/intracommreport.lang
new file mode 100644
index 00000000000..3060300b974
--- /dev/null
+++ b/htdocs/langs/km_KH/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=List
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/km_KH/languages.lang b/htdocs/langs/km_KH/languages.lang
index cc80b9f1719..ba187326705 100644
--- a/htdocs/langs/km_KH/languages.lang
+++ b/htdocs/langs/km_KH/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/km_KH/main.lang b/htdocs/langs/km_KH/main.lang
index 7f2168fdea2..68378c28883 100644
--- a/htdocs/langs/km_KH/main.lang
+++ b/htdocs/langs/km_KH/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Remove link
 AddToDraft=Add to draft
 Update=Update
 Close=Close
+CloseAs=Set status to
 CloseBox=Remove widget from your dashboard
 Confirm=Confirm
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Re-Open
 Upload=Upload
 ToLink=Link
 Select=Select
+SelectAll=Select all
 Choose=Choose
 Resize=Resize
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=Cards
 Card=Card
 Now=Now
 HourStart=Start hour
+Deadline=Deadline
 Date=Date
 DateAndHour=Date and hour
 DateToday=Today's date
@@ -264,8 +267,10 @@ DateStart=Start date
 DateEnd=End date
 DateCreation=Creation date
 DateCreationShort=Creat. date
+IPCreation=Creation IP
 DateModification=Modification date
 DateModificationShort=Modif. date
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
@@ -319,6 +324,7 @@ Morning=Morning
 Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Month of the day
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Rate
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Amount tax 2
 AmountLT2=Amount tax 3
 AmountLT1ES=Amount RE
@@ -487,6 +494,7 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
+at=at
 to=to
 To=to
 and=and
@@ -509,6 +517,7 @@ Draft=Draft
 Drafts=Drafts
 StatusInterInvoiced=Invoiced
 Validated=Validated
+ValidatedToProduce=Validated (To produce)
 Opened=Open
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Response
 Priority=Priority
 SendByMail=Send by email
 MailSentBy=Email sent by
+NotSent=Not sent
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
@@ -836,6 +846,7 @@ ListOfTemplates=List of templates
 Gender=Gender
 Genderman=Man
 Genderwoman=Woman
+Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Comments
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Information
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Date of birth
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/km_KH/members.lang b/htdocs/langs/km_KH/members.lang
index 5ef946ddf67..5812248b129 100644
--- a/htdocs/langs/km_KH/members.lang
+++ b/htdocs/langs/km_KH/members.lang
@@ -19,14 +19,12 @@ MembersCards=Members business cards
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
 SubscriptionId=Subscription id
+WithoutSubscription=Without subscription
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@@ -81,7 +80,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/km_KH/mrp.lang b/htdocs/langs/km_KH/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/km_KH/mrp.lang
+++ b/htdocs/langs/km_KH/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/km_KH/products.lang b/htdocs/langs/km_KH/products.lang
index b59aa2f7080..97db059594f 100644
--- a/htdocs/langs/km_KH/products.lang
+++ b/htdocs/langs/km_KH/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/km_KH/recruitment.lang b/htdocs/langs/km_KH/recruitment.lang
index 73e9a7fa07f..b775e78552e 100644
--- a/htdocs/langs/km_KH/recruitment.lang
+++ b/htdocs/langs/km_KH/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/km_KH/stocks.lang b/htdocs/langs/km_KH/stocks.lang
index 81163e8d4b0..660443bcded 100644
--- a/htdocs/langs/km_KH/stocks.lang
+++ b/htdocs/langs/km_KH/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/km_KH/suppliers.lang b/htdocs/langs/km_KH/suppliers.lang
index 51562b8bb7a..03b03c75269 100644
--- a/htdocs/langs/km_KH/suppliers.lang
+++ b/htdocs/langs/km_KH/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/km_KH/website.lang b/htdocs/langs/km_KH/website.lang
index 4b5294d5e43..03e042e4be6 100644
--- a/htdocs/langs/km_KH/website.lang
+++ b/htdocs/langs/km_KH/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/kn_IN/accountancy.lang b/htdocs/langs/kn_IN/accountancy.lang
index 7b59e33b296..3211a0b62df 100644
--- a/htdocs/langs/kn_IN/accountancy.lang
+++ b/htdocs/langs/kn_IN/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting expert
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=Journals
+Journals=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Chart of accounts
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bank accounts
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=By year
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index 1a4b882ff57..77951271212 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
 CurrentTimeZone=TimeZone PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Interventions
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
+Permission13=Invalidate customer invoices
 Permission14=Validate customer invoices
 Permission15=Send customer invoices by email
 Permission16=Create payments for customer invoices
@@ -688,6 +694,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Read members
 Permission72=Create/modify members
 Permission74=Delete members
@@ -718,6 +728,7 @@ Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
@@ -825,10 +836,11 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Edition of field %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1282,7 +1322,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Global parameters
@@ -1523,7 +1564,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Level
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
@@ -1629,7 +1672,7 @@ AdvancedEditor=Advanced editor
 ActivateFCKeditor=Activate advanced editor for:
 FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
 FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=ಮೂರನೇ ಪಕ್ಷಗಳು
 MailToMember=Members
 MailToUser=Users
-MailToProject=Projects page
+MailToProject=Projects
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/kn_IN/banks.lang b/htdocs/langs/kn_IN/banks.lang
index 1b84f9236c9..b1816234c5a 100644
--- a/htdocs/langs/kn_IN/banks.lang
+++ b/htdocs/langs/kn_IN/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/kn_IN/categories.lang b/htdocs/langs/kn_IN/categories.lang
index 9bb71984ecf..ba37a43b4ec 100644
--- a/htdocs/langs/kn_IN/categories.lang
+++ b/htdocs/langs/kn_IN/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/kn_IN/companies.lang b/htdocs/langs/kn_IN/companies.lang
index 0c231bd09df..5a13d292ec1 100644
--- a/htdocs/langs/kn_IN/companies.lang
+++ b/htdocs/langs/kn_IN/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=ನೋಂದಣಿ ಸಂಖ್ಯೆ
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=ವೃತ್ತಿಪರ ಗುರುತಿನ ಸಂಖ್ಯೆ 3 (S
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=ಸಂಭವನೀಯ
 ProspectLevel=ಸಂಭಾವ್ಯ ನಿರೀಕ್ಷಿತರು
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Currency
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/kn_IN/ecm.lang b/htdocs/langs/kn_IN/ecm.lang
index 43ddd3bf36f..71df60734fb 100644
--- a/htdocs/langs/kn_IN/ecm.lang
+++ b/htdocs/langs/kn_IN/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Search by keywords
 ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/kn_IN/hrm.lang b/htdocs/langs/kn_IN/hrm.lang
index 6cc7f6bef24..3b8f137e103 100644
--- a/htdocs/langs/kn_IN/hrm.lang
+++ b/htdocs/langs/kn_IN/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Employees
 Employee=Employee
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/kn_IN/install.lang b/htdocs/langs/kn_IN/install.lang
index 2d708c04147..63947dad154 100644
--- a/htdocs/langs/kn_IN/install.lang
+++ b/htdocs/langs/kn_IN/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=This PHP supports sessions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/kn_IN/intracommreport.lang b/htdocs/langs/kn_IN/intracommreport.lang
new file mode 100644
index 00000000000..3060300b974
--- /dev/null
+++ b/htdocs/langs/kn_IN/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=List
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/kn_IN/languages.lang b/htdocs/langs/kn_IN/languages.lang
index cc80b9f1719..ba187326705 100644
--- a/htdocs/langs/kn_IN/languages.lang
+++ b/htdocs/langs/kn_IN/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
index aaf4819a944..9635417e322 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Remove link
 AddToDraft=Add to draft
 Update=Update
 Close=Close
+CloseAs=Set status to
 CloseBox=Remove widget from your dashboard
 Confirm=Confirm
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Re-Open
 Upload=Upload
 ToLink=Link
 Select=Select
+SelectAll=Select all
 Choose=Choose
 Resize=Resize
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=Cards
 Card=Card
 Now=Now
 HourStart=Start hour
+Deadline=Deadline
 Date=Date
 DateAndHour=Date and hour
 DateToday=Today's date
@@ -264,8 +267,10 @@ DateStart=Start date
 DateEnd=End date
 DateCreation=Creation date
 DateCreationShort=Creat. date
+IPCreation=Creation IP
 DateModification=Modification date
 DateModificationShort=Modif. date
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
@@ -319,6 +324,7 @@ Morning=Morning
 Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Month of the day
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Rate
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Amount tax 2
 AmountLT2=Amount tax 3
 AmountLT1ES=Amount RE
@@ -487,6 +494,7 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
+at=at
 to=to
 To=to
 and=and
@@ -509,6 +517,7 @@ Draft=Draft
 Drafts=Drafts
 StatusInterInvoiced=Invoiced
 Validated=Validated
+ValidatedToProduce=Validated (To produce)
 Opened=ತೆರೆಯಲಾಗಿದೆ
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Response
 Priority=Priority
 SendByMail=Send by email
 MailSentBy=Email sent by
+NotSent=Not sent
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
@@ -836,6 +846,7 @@ ListOfTemplates=List of templates
 Gender=Gender
 Genderman=Man
 Genderwoman=Woman
+Genderother=ಇತರ
 ViewList=List view
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Comments
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Information
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Date of birth
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/kn_IN/members.lang b/htdocs/langs/kn_IN/members.lang
index 5ef946ddf67..5812248b129 100644
--- a/htdocs/langs/kn_IN/members.lang
+++ b/htdocs/langs/kn_IN/members.lang
@@ -19,14 +19,12 @@ MembersCards=Members business cards
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
 SubscriptionId=Subscription id
+WithoutSubscription=Without subscription
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@@ -81,7 +80,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/kn_IN/mrp.lang b/htdocs/langs/kn_IN/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/kn_IN/mrp.lang
+++ b/htdocs/langs/kn_IN/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/kn_IN/products.lang b/htdocs/langs/kn_IN/products.lang
index 8900044765c..a4e8e169446 100644
--- a/htdocs/langs/kn_IN/products.lang
+++ b/htdocs/langs/kn_IN/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/kn_IN/recruitment.lang b/htdocs/langs/kn_IN/recruitment.lang
index 73e9a7fa07f..b775e78552e 100644
--- a/htdocs/langs/kn_IN/recruitment.lang
+++ b/htdocs/langs/kn_IN/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/kn_IN/stocks.lang b/htdocs/langs/kn_IN/stocks.lang
index 81163e8d4b0..660443bcded 100644
--- a/htdocs/langs/kn_IN/stocks.lang
+++ b/htdocs/langs/kn_IN/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/kn_IN/suppliers.lang b/htdocs/langs/kn_IN/suppliers.lang
index 51562b8bb7a..03b03c75269 100644
--- a/htdocs/langs/kn_IN/suppliers.lang
+++ b/htdocs/langs/kn_IN/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/kn_IN/website.lang b/htdocs/langs/kn_IN/website.lang
index 4b5294d5e43..03e042e4be6 100644
--- a/htdocs/langs/kn_IN/website.lang
+++ b/htdocs/langs/kn_IN/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang
index 5f53ebb4389..2202ceafd92 100644
--- a/htdocs/langs/ko_KR/accountancy.lang
+++ b/htdocs/langs/ko_KR/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting expert
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=분개장
+Journals=분개장
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Chart of accounts
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bank accounts
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=원장
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=매출분개장
 ACCOUNTING_PURCHASE_JOURNAL=구매분개장
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=By year
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index 9a09326a0c5..41c75987caf 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
 CurrentTimeZone=TimeZone PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=중재
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=자원
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
+Permission13=Invalidate customer invoices
 Permission14=Validate customer invoices
 Permission15=Send customer invoices by email
 Permission16=Create payments for customer invoices
@@ -688,6 +694,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Read members
 Permission72=Create/modify members
 Permission74=Delete members
@@ -718,6 +728,7 @@ Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
@@ -825,10 +836,11 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Edition of field %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1282,7 +1322,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Global parameters
@@ -1523,7 +1564,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Level
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
@@ -1629,7 +1672,7 @@ AdvancedEditor=Advanced editor
 ActivateFCKeditor=Activate advanced editor for:
 FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
 FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=협력업체
 MailToMember=구성원
 MailToUser=사용자
-MailToProject=Projects page
+MailToProject=프로젝트
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/ko_KR/banks.lang b/htdocs/langs/ko_KR/banks.lang
index 6f3802751aa..cbe0734591b 100644
--- a/htdocs/langs/ko_KR/banks.lang
+++ b/htdocs/langs/ko_KR/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/ko_KR/categories.lang b/htdocs/langs/ko_KR/categories.lang
index 0487220e12c..79bfe18f625 100644
--- a/htdocs/langs/ko_KR/categories.lang
+++ b/htdocs/langs/ko_KR/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/ko_KR/companies.lang b/htdocs/langs/ko_KR/companies.lang
index b700c94d963..4e623422f6e 100644
--- a/htdocs/langs/ko_KR/companies.lang
+++ b/htdocs/langs/ko_KR/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=프로필 Id 1 (USt.-IdNr)
 ProfId2AT=프로필 Id 2 (USt-Nr)
 ProfId3AT=프로필 Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=프로필 Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=프로필 Id 1 (자격증 번호)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=프로필 ID 1 (연방 번호)
 ProfId4CH=프로필 Id 2 (상업 기록 번호)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=프로필 Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=프로필 Id 1 (USt.-IdNr)
 ProfId2DE=프로필 Id 2 (USt-Nr)
 ProfId3DE=프로필 Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=프로필 Id 1 (CIF / NIF)
 ProfId2ES=프로필 ID2 (사회보장번호)
 ProfId3ES=프로필 Id 3 (CNAE)
 ProfId4ES=프로필 Id 4 (대학생 번호)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=프로필 ID 1 (SIREN)
 ProfId2FR=프로필 Id 2 (SIRET)
 ProfId3FR=프로필 Id 3 (NAF, 구 APE)
 ProfId4FR=프로필 Id 4 (RCS / RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=등록 번호
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=프로필 Id 3 (SRVC TAX)
 ProfId4IN=프로필 Id 4
 ProfId5IN=프로필 Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=프로필 Id 1 (룩셈부르크)
 ProfId2LU=프로필 Id 2 (사업 허가)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=프로필 Id 1 (R.C.)
 ProfId2MA=프로필 Id 2 (특허)
 ProfId3MA=프로필 Id 3 (I.F.)
 ProfId4MA=프로필 Id 4 (C.N.S.S.)
-ProfId5MA=프로필 Id 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=프로필 Id 1 (R.F.C).
 ProfId2MX=프로필 Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK 번호
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=프로필 Id 1 (NIPC)
 ProfId2PT=프로필 Id 2 (사회 보장 번호)
 ProfId3PT=프로필 Id 3 (상업 기록 번호)
 ProfId4PT=프로필 Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=프로필 Id 1 (OGRN)
 ProfId2RU=프로필 Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=확인할 수 없습니다. 수표 서비스는 회원 국가에서 제공하지 않습니다 (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=가능성
 ProspectLevel=미래 잠재고객
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Currency
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/ko_KR/ecm.lang b/htdocs/langs/ko_KR/ecm.lang
index e08408c17f9..b2d850ab449 100644
--- a/htdocs/langs/ko_KR/ecm.lang
+++ b/htdocs/langs/ko_KR/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Search by keywords
 ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/ko_KR/hrm.lang b/htdocs/langs/ko_KR/hrm.lang
index 6cc7f6bef24..3b8f137e103 100644
--- a/htdocs/langs/ko_KR/hrm.lang
+++ b/htdocs/langs/ko_KR/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Employees
 Employee=Employee
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/ko_KR/install.lang b/htdocs/langs/ko_KR/install.lang
index 057b374322f..b528753cdc6 100644
--- a/htdocs/langs/ko_KR/install.lang
+++ b/htdocs/langs/ko_KR/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=설정 파일 <b>%s</b>을/를 사용할 수 있습니다.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=이 PHP는 세션을 지원합니다.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=이 PHP는 세션을 지원합니다.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/ko_KR/intracommreport.lang b/htdocs/langs/ko_KR/intracommreport.lang
new file mode 100644
index 00000000000..9e4e04e035e
--- /dev/null
+++ b/htdocs/langs/ko_KR/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=목록
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/ko_KR/languages.lang b/htdocs/langs/ko_KR/languages.lang
index 5359947a598..f81f3e8d03d 100644
--- a/htdocs/langs/ko_KR/languages.lang
+++ b/htdocs/langs/ko_KR/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=스페인어 (파나마)
 Language_es_PY=스페인어 (파라과이)
 Language_es_PE=스페인어 (페루)
 Language_es_PR=스페인어 (푸에르토 리코)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=스페인어 (베네수엘라)
diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index 5392faabe13..cd328ee454a 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -155,6 +155,7 @@ RemoveLink=링크 제거
 AddToDraft=초안에 추가
 Update=갱신
 Close=닫기
+CloseAs=Set status to
 CloseBox=대시 보드에서 위젯 제거
 Confirm=확인
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=다시 열기
 Upload=Upload
 ToLink=링크
 Select=선택
+SelectAll=Select all
 Choose=선택
 Resize=크기 조정
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=카드
 Card=카드
 Now=현재
 HourStart=시작 시각
+Deadline=Deadline
 Date=날짜
 DateAndHour=날짜 및 시간
 DateToday=오늘 날짜
@@ -264,8 +267,10 @@ DateStart=시작날짜
 DateEnd=종료날짜
 DateCreation=생성날짜
 DateCreationShort=생성 날짜
+IPCreation=Creation IP
 DateModification=수정날짜
 DateModificationShort=수정날짜
+IPModification=Modification IP
 DateLastModification=최종 수정일
 DateValidation=검사날짜
 DateClosing=마감날짜
@@ -319,6 +324,7 @@ Morning=아침
 Afternoon=대낮
 Quadri=쿼드리
 MonthOfDay=현재 월
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=율
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=지불 금액, 원래 통화
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=금액 (세금 포함), 원화
 MulticurrencyAmountVAT=금액 세금, 원화
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=세액 2
 AmountLT2=세액 3
 AmountLT1ES=RE 금액
@@ -487,6 +494,7 @@ By=별
 From=부터
 FromDate=부터
 FromLocation=부터
+at=at
 to=까지
 To=까지
 and=그리고
@@ -509,6 +517,7 @@ Draft=작성
 Drafts=작성자
 StatusInterInvoiced=Invoiced
 Validated=확인 함
+ValidatedToProduce=Validated (To produce)
 Opened=열기
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=응답
 Priority=우선순위
 SendByMail=Send by email
 MailSentBy=보낸 이메일
+NotSent=Not sent
 TextUsedInTheMessageBody=이메일 본문
 SendAcknowledgementByMail=확인 이메일 보내기
 SendMail=Send email
@@ -836,6 +846,7 @@ ListOfTemplates=템플릿 목록
 Gender=성별
 Genderman=남자
 Genderwoman=여자
+Genderother=기타
 ViewList=목록 보기
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=기타등등
 Calendar=달력
 GroupBy=그룹화 ...
 ViewFlatList=평면 목록보기
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString='%s'문자열을 제거하십시오.
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=고객 출하
 SearchIntoExpenseReports=경비 보고서
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=주석
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Information
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Date of birth
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/ko_KR/members.lang b/htdocs/langs/ko_KR/members.lang
index 32c684190be..8aad13d15da 100644
--- a/htdocs/langs/ko_KR/members.lang
+++ b/htdocs/langs/ko_KR/members.lang
@@ -19,14 +19,12 @@ MembersCards=Members business cards
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
 SubscriptionId=Subscription id
+WithoutSubscription=Without subscription
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@@ -81,7 +80,7 @@ DeleteType=지우다
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=통계
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/ko_KR/mrp.lang b/htdocs/langs/ko_KR/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/ko_KR/mrp.lang
+++ b/htdocs/langs/ko_KR/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
index acd9124600e..09ec43625fa 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=번호
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/ko_KR/recruitment.lang b/htdocs/langs/ko_KR/recruitment.lang
index d9a6cc70b6d..8fa737f47ff 100644
--- a/htdocs/langs/ko_KR/recruitment.lang
+++ b/htdocs/langs/ko_KR/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=직위
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/ko_KR/stocks.lang b/htdocs/langs/ko_KR/stocks.lang
index 0345634f4bf..7fbad957f4d 100644
--- a/htdocs/langs/ko_KR/stocks.lang
+++ b/htdocs/langs/ko_KR/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=위치
 LocationSummary=Short name location
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/ko_KR/suppliers.lang b/htdocs/langs/ko_KR/suppliers.lang
index 2a5cfe1d008..7b04cc321ad 100644
--- a/htdocs/langs/ko_KR/suppliers.lang
+++ b/htdocs/langs/ko_KR/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=주문불가
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=평가
diff --git a/htdocs/langs/ko_KR/website.lang b/htdocs/langs/ko_KR/website.lang
index 9112a8719ca..a3167ada553 100644
--- a/htdocs/langs/ko_KR/website.lang
+++ b/htdocs/langs/ko_KR/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index f7f3aa2fec7..a0451ff066b 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting expert
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=Journals
+Journals=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Chart of accounts
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bank accounts
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=By year
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index 511378bb6e3..a651fd86d34 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
 CurrentTimeZone=TimeZone PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Interventions
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
+Permission13=Invalidate customer invoices
 Permission14=Validate customer invoices
 Permission15=Send customer invoices by email
 Permission16=Create payments for customer invoices
@@ -688,6 +694,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Read members
 Permission72=Create/modify members
 Permission74=Delete members
@@ -718,6 +728,7 @@ Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
@@ -825,10 +836,11 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Edition of field %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1282,7 +1322,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=​ໂຕ​ຕັ້ງ​ຄ່າ​ທັງ​ໝົດ
@@ -1523,7 +1564,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Level
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
@@ -1629,7 +1672,7 @@ AdvancedEditor=Advanced editor
 ActivateFCKeditor=Activate advanced editor for:
 FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
 FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
-MailToProject=Projects page
+MailToProject=Projects
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/lo_LA/banks.lang b/htdocs/langs/lo_LA/banks.lang
index 11a5c52982e..116b97d3f81 100644
--- a/htdocs/langs/lo_LA/banks.lang
+++ b/htdocs/langs/lo_LA/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/lo_LA/categories.lang b/htdocs/langs/lo_LA/categories.lang
index 9bb71984ecf..ba37a43b4ec 100644
--- a/htdocs/langs/lo_LA/categories.lang
+++ b/htdocs/langs/lo_LA/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/lo_LA/companies.lang b/htdocs/langs/lo_LA/companies.lang
index 22059f348ec..4e8b86a7c57 100644
--- a/htdocs/langs/lo_LA/companies.lang
+++ b/htdocs/langs/lo_LA/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
 ProspectLevel=Prospect potential
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Currency
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/lo_LA/ecm.lang b/htdocs/langs/lo_LA/ecm.lang
index 43ddd3bf36f..71df60734fb 100644
--- a/htdocs/langs/lo_LA/ecm.lang
+++ b/htdocs/langs/lo_LA/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Search by keywords
 ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/lo_LA/hrm.lang b/htdocs/langs/lo_LA/hrm.lang
index 6cc7f6bef24..3b8f137e103 100644
--- a/htdocs/langs/lo_LA/hrm.lang
+++ b/htdocs/langs/lo_LA/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Employees
 Employee=Employee
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/lo_LA/install.lang b/htdocs/langs/lo_LA/install.lang
index 2d708c04147..63947dad154 100644
--- a/htdocs/langs/lo_LA/install.lang
+++ b/htdocs/langs/lo_LA/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=This PHP supports sessions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/lo_LA/intracommreport.lang b/htdocs/langs/lo_LA/intracommreport.lang
new file mode 100644
index 00000000000..a9af33e8440
--- /dev/null
+++ b/htdocs/langs/lo_LA/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=ລາຍການ
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/lo_LA/languages.lang b/htdocs/langs/lo_LA/languages.lang
index cc80b9f1719..ba187326705 100644
--- a/htdocs/langs/lo_LA/languages.lang
+++ b/htdocs/langs/lo_LA/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index 96d7ae3cb09..026cbbb5ad7 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Remove link
 AddToDraft=Add to draft
 Update=ປັບປຸງ
 Close=Close
+CloseAs=Set status to
 CloseBox=Remove widget from your dashboard
 Confirm=Confirm
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Re-Open
 Upload=Upload
 ToLink=Link
 Select=Select
+SelectAll=Select all
 Choose=Choose
 Resize=Resize
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=Cards
 Card=Card
 Now=Now
 HourStart=Start hour
+Deadline=Deadline
 Date=ວັນທີ
 DateAndHour=Date and hour
 DateToday=Today's date
@@ -264,8 +267,10 @@ DateStart=Start date
 DateEnd=End date
 DateCreation=Creation date
 DateCreationShort=Creat. date
+IPCreation=Creation IP
 DateModification=Modification date
 DateModificationShort=Modif. date
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
@@ -319,6 +324,7 @@ Morning=Morning
 Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Month of the day
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Rate
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Amount tax 2
 AmountLT2=Amount tax 3
 AmountLT1ES=Amount RE
@@ -487,6 +494,7 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
+at=at
 to=to
 To=to
 and=and
@@ -509,6 +517,7 @@ Draft=Draft
 Drafts=Drafts
 StatusInterInvoiced=Invoiced
 Validated=Validated
+ValidatedToProduce=Validated (To produce)
 Opened=Open
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Response
 Priority=Priority
 SendByMail=Send by email
 MailSentBy=Email sent by
+NotSent=Not sent
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
@@ -836,6 +846,7 @@ ListOfTemplates=List of templates
 Gender=Gender
 Genderman=Man
 Genderwoman=Woman
+Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Comments
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Information
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Date of birth
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/lo_LA/members.lang b/htdocs/langs/lo_LA/members.lang
index d516088ccf3..9bcf361cd42 100644
--- a/htdocs/langs/lo_LA/members.lang
+++ b/htdocs/langs/lo_LA/members.lang
@@ -19,14 +19,12 @@ MembersCards=Members business cards
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
 SubscriptionId=Subscription id
+WithoutSubscription=Without subscription
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@@ -81,7 +80,7 @@ DeleteType=ລຶບ
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/lo_LA/mrp.lang b/htdocs/langs/lo_LA/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/lo_LA/mrp.lang
+++ b/htdocs/langs/lo_LA/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang
index 10a26e629e5..fb58c2e259c 100644
--- a/htdocs/langs/lo_LA/products.lang
+++ b/htdocs/langs/lo_LA/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/lo_LA/recruitment.lang b/htdocs/langs/lo_LA/recruitment.lang
index 73e9a7fa07f..b775e78552e 100644
--- a/htdocs/langs/lo_LA/recruitment.lang
+++ b/htdocs/langs/lo_LA/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/lo_LA/stocks.lang b/htdocs/langs/lo_LA/stocks.lang
index f00ee3d2f05..74d3d0a7efe 100644
--- a/htdocs/langs/lo_LA/stocks.lang
+++ b/htdocs/langs/lo_LA/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/lo_LA/suppliers.lang b/htdocs/langs/lo_LA/suppliers.lang
index 51562b8bb7a..03b03c75269 100644
--- a/htdocs/langs/lo_LA/suppliers.lang
+++ b/htdocs/langs/lo_LA/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/lo_LA/website.lang b/htdocs/langs/lo_LA/website.lang
index 4b5294d5e43..03e042e4be6 100644
--- a/htdocs/langs/lo_LA/website.lang
+++ b/htdocs/langs/lo_LA/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
index ba180500a96..006e60db613 100644
--- a/htdocs/langs/lt_LT/accountancy.lang
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Numatyta paslauga
 DefaultForProduct=Numatyta prekė
 CantSuggest=Pasiūlyti negalima
 AccountancySetupDoneFromAccountancyMenu=Dauguma apskaitos nustatymo atliekama iš meniu %s
-ConfigAccountingExpert=Apskaitos eksperto modulio konfigūracija
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Įvestis
-Journaux=Žurnalai
+Journals=Žurnalai
 JournalFinancial=Finansiniai žurnalai
 BackToChartofaccounts=Grįžti į sąskaitų planą
 Chartofaccounts=Sąskaitų planas
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Dabartinė paskyra
 AssignDedicatedAccountingAccount=Nauja paskyra priskirimui
 InvoiceLabel=Sąskaitos žymė
@@ -33,8 +35,8 @@ OtherInfo=Kita informacija
 DeleteCptCategory=Pašalinti apskaitos sąskaitą iš grupės
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Įvesties būklė
-AlreadyInGeneralLedger=Jau įvesta didžiojoje knygoje
-NotYetInGeneralLedger=Dar nėra įvesta didžiojoje knygoje
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Grupė yra tuščia, patikrinkite individualizuotos apskaitos grupės nustatymus
 DetailByAccount=Rodyti išsamią informaciją pagal apskaitos sąskaitą
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Pagrindinė apskaitos sąskaita klientams, kurie nenustatyti sąrankos metu
 MainAccountForSuppliersNotDefined=Pagrindinė apskaitos sąskaita tiekėjams, kurie nenustatyti sąrankos metu
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=ŽINGSNIS %s: pridėkite arba redaguokite esamus įve
 
 AccountancyAreaDescClosePeriod=ŽINGSNIS %s: uždarytas laikotarpis, todėl ateityje negalėsime keisti.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=Privalomas žingsnis nebuvo baigtas (apskaitos kodo žurnalas nenustatytas visoms banko sąskaitoms).
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Pasirinkite aktyvia sąskaitų planą
 ChangeAndLoad=Pakeiskite ir įkelkite
 Addanaccount=Pridėti apskaitos sąskaitą
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Rodyti apskaitos sąskaitą
 ShowAccountingJournal=Rodyti apskaitos žurnalą
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Siūloma apskaitos sąskaita
 MenuDefaultAccounts=Numatytosios sąskaitos
 MenuBankAccounts=Banko sąskaitos
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Išlaidų ataskaita apvadas
 CreateMvts=Sukurkite naują sandorį
 UpdateMvts=Sandorio keitimas
 ValidTransaction=Patikrinti sandorį
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Didžioji knyga
+BookkeepingSubAccount=Subledger
 AccountBalance=Sąskaitos balansas
 ObjectsRef=Šaltinio objekto nuoroda
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Išjungti tiesioginį sandorio įrašymą banko sąska
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Įgalinti eksporto projektą žurnale
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Pardavimų žurnalas
 ACCOUNTING_PURCHASE_JOURNAL=Pirkimų žurnalas
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=Pagal metus
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Žurnalas, kurį norite ištrinti
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Išlaidų ataskaitų žurnalas
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Šis žurnalas jau naudojamas
 AccountingAccountForSalesTaxAreDefinedInto=Pastaba: Apskaitos sąskaita pardavimų mokestis yra apibrėžta meniu <b> %s </ b> - <b> %s </ b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Eksportuoti žurnalo projektą
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index 4770b9982b6..ea55fbcdc54 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Pašalinti prisijungimų užraktą
 YourSession=Jūsų sesija
 Sessions=Users Sessions
 WebUserGroup=Tinklo serverio naudotojas/grupė
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Duomenų bazės simbolių rinkinys duomenų talpinimui
 DBSortingCharset=Duomenų bazės simbolių rinkinys duomenų rūšiavimui
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript išjungtas
 UsePreviewTabs=Nautdoti apžiūros korteles
 ShowPreview=Rodyti apžiūrą
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Apžiūra negalima
 ThemeCurrentlyActive=Tema yra veikli
 CurrentTimeZone=Laiko juostos PHP (serveris)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial sistemos integracija (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Pridėti funkciją sąskaitos Bookmark4u generavimui iš Dolibarr sąskaitos
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Intervencijos
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Ištekliai
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Skaityti klientų sąskaitas
 Permission12=Sukurti/keisti klientų sąskaitas
-Permission13=Nepatvirtinti klientų sąskaitos
+Permission13=Invalidate customer invoices
 Permission14=Patvirtinti klientų sąskaitas
 Permission15=Siųsti klientų sąskaitas el. paštu
 Permission16=Sukurti mokėjimus pagal klientų sąskaitas
@@ -688,6 +694,7 @@ Permission32=Sukurti/pakeisti produktus
 Permission34=Ištrinti produktus
 Permission36=Žiūrėti/tvarkyti paslėptus produktus
 Permission38=Eksportuoti produktus
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Skaityti intervencijas
 Permission62=Sukurti/keisti intervencijas
 Permission64=Ištrinti intervencijas
 Permission67=Eksportuoti intervencijas
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Skaityti narius
 Permission72=Sukurti/keisti narius
 Permission74=Ištrinti narius
@@ -718,6 +728,7 @@ Permission95=Skaityti ataskaitas
 Permission101=Skaityti siuntinius
 Permission102=Sukurti/keisti siuntinius
 Permission104=Patvirtinti siuntinius
+Permission105=Send sendings by email
 Permission106=Eksportuoti siuntinius
 Permission109=Ištrinti siuntinius
 Permission111=Skaityti finansines ataskaitas
@@ -825,10 +836,11 @@ Permission402=Sukurti/keisti nuolaidas
 Permission403=Patvirtinti nuolaidas
 Permission404=Ištrinti nuolaidas
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Eksportuoti atlyginimus
+Permission517=Read payments of salaries of everybody
+Permission519=Eksportuoti atlyginimus
 Permission520=Skaityti Paskolas
 Permission522=Sukurti / redaguoti paskolas
 Permission524=Ištrinti paskolas
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Gauti eksporto rezultatą
 Permission1202=Sukurti/keisti eksportą
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Pradėti masinį išorinių duomenų importą į duomenų bazę (
 Permission1321=Eksportuoti klientų sąskaitas-faktūras, atributus ir mokėjimus
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Skaityti planinį darbą
 Permission23002=sukurti / atnaujinti planinį darbą
 Permission23003=Panaikinti planinį darbą
 Permission23004=Vykdyti planinį darbą
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Skaityti sandorius/transakcijas
 Permission50202=Importuoti sandorius/transakcijas
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Nustatymai išsaugoti
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Etiketė naudojamas pagal nutylėjimą, jei kodui nerandamas
 LabelOnDocuments=Dokumentų etiketė
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=Mėnesio pabaigoje
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Naršyklės pavadinimas
 BrowserOS=Naršyklės OS
 ListOfSecurityEvents=Dolibarr saugumo įvykių sąrašas
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL duomenų importas
-ForcedToByAModule= Ši taisyklė yra priverstinė <b>%s</b> pagal aktyvuotą modulį
+ForcedToByAModule=Ši taisyklė yra priverstinė <b>%s</b> pagal aktyvuotą modulį
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Lauko %s redagavimas
 FillThisOnlyIfRequired=Pavyzdys: +2 (pildyti tik tuomet, jei laiko juostos nuokrypio problemos yra žymios)
@@ -1282,7 +1322,7 @@ GetBarCode=Gauti brūkšninį kodą
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Grąžinti pagal vidinį Dolibarr algoritmą sugeneruotą slaptažodį: 8 simbolių, kuriuose yra bendri skaičiai ir mažosios raidės.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Patvirtinimas paukščiuku žymimame langelyje pašto siuntimui nariams (patvirtinimas arba nauja įmoka) yra pagal nutylėjimą
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP nuostatos
 LDAPGlobalParameters=Bendrieji parametrai
@@ -1523,7 +1564,9 @@ LDAPDescValues=Pavyzdinės reikšmės yra skirtos <b>OpenLDAP</b> su šiomis įk
 ForANonAnonymousAccess=Prieigai su patvirtinimu (pvz.: su įrašymo galimybe)
 PerfDolibarr=Charakteristikos nustatymo/optimizavimo ataskaita
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Taikomoji sparčioji tarpinė atmintis
 MemcachedNotAvailable=Taikomosios sparčiosios tarpinės atminties nerasta. Jūs galite padidinti efektyvumą įdiegdami atminties serverį Memcached ir įgalindami modulį naudoti šį atminties serverį.<br>Daugiau informacijos rasite čia <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Atkreipkite dėmesį, kad daugumas interneto talpinimo paslaugų teikėjų neteikia šitokių atminties serverių.
 MemcachedModuleAvailableButNotSetup=Modulis memcached taikomąjai atmintinei (cache) rastas, bet modulio nustatymai nėra baigti.
@@ -1571,9 +1614,9 @@ SyslogLevel=Lygis
 SyslogFilename=Failo pavadinimas ir kelias
 YouCanUseDOL_DATA_ROOT=Galite naudoti DOL_DATA_ROOT/dolibarr.log prisijungimo failui Dolibarr "dokuments" kataloge. Galite nustatyti kitokį kelią šio failo saugojimui.
 ErrorUnknownSyslogConstant=Konstanta %s yra nežinoma Syslog konstanta
-OnlyWindowsLOG_USER=Windows palaiko tik LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Aukų modulio nuostatos
@@ -1629,7 +1672,7 @@ AdvancedEditor=Išplėstinis redaktorius
 ActivateFCKeditor=Įjungti išplėstinį redaktorių:
 FCKeditorForCompany=Elementų aprašymo ir pastabų WYSIWIG kūrimas/redagavimas (išskyrus produktus/paslaugas)
 FCKeditorForProduct=Produktų/paslaugų aprašymų ir pastabų WYSIWIG kūrimas/redagavimas
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG kūrimas/redagavimas masiniams e-laiškams (Tools-> eMailing)
 FCKeditorForUserSignature=Vartotojo parašo WYSIWIG kūrimas/redagavimas
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Meniu ištrintas
+Menu=Menu
 Menus=Meniu
 TreeMenuPersonalized=Personalizuoti meniu
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Naujas meniu
-Menu=Meniu pasirinkimas
 MenuHandler=Meniu prižiūrėtojas
 MenuModule=Pirminis modulis
 HideUnauthorizedMenu= Paslėpti neleidžiamus meniu (pilki)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial modulio nuostatos
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Įtraukti kelią (kaip apibrėžta kintamojo %s)
 ExpenseReportsSetup=Išlaidų ataskaitų modulio nustatymai
 TemplatePDFExpenseReports=Šablonai Išlaidų ataskaitų generavimui
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Trečiosios šalys
 MailToMember=Nariai
 MailToUser=Vartotojai
-MailToProject=Projects page
+MailToProject=Projektai
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Pašto kodas
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/lt_LT/banks.lang b/htdocs/langs/lt_LT/banks.lang
index 4f31a0cdfe2..48e08a11c34 100644
--- a/htdocs/langs/lt_LT/banks.lang
+++ b/htdocs/langs/lt_LT/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/lt_LT/categories.lang b/htdocs/langs/lt_LT/categories.lang
index a4a4d42facc..eab51c93f5a 100644
--- a/htdocs/langs/lt_LT/categories.lang
+++ b/htdocs/langs/lt_LT/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Pridėti sekantį produktą / servisą
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/lt_LT/companies.lang b/htdocs/langs/lt_LT/companies.lang
index 94cad3cf3aa..e121fe74fd6 100644
--- a/htdocs/langs/lt_LT/companies.lang
+++ b/htdocs/langs/lt_LT/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof ID 1 (USt.-IdNr)
 ProfId2AT=Prof ID 2 (USt.-Nr)
 ProfId3AT=Prof ID 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof ID 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof ID 1 (Profesinis skaičius)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=VR (valstybinė registracija)
@@ -144,11 +144,11 @@ ProfId3BR=SR (savivaldybės registracija)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof ID 1 (Federalinis numeris)
 ProfId4CH=Prof ID 2 (Komercinio Įrašo numeris)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof ID 1 (RUT)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof ID 1 (USt.-IdNr)
 ProfId2DE=Prof ID 2 (USt.-Nr)
 ProfId3DE=Prof ID 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof ID 1 (CIF/NIF)
 ProfId2ES=Prof ID 2 (Socialinio draudimo numeris)
 ProfId3ES=Prof ID 3 (CNAE)
 ProfId4ES=Prof ID 4 (Collegiate skaičius)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof ID 1 (SIRENOS)
 ProfId2FR=Prof ID 2 (SIRET)
 ProfId3FR=Prof ID 3 (NBS, senas APE)
 ProfId4FR=Prof ID 4 (RBS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registracijos numeris
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof ID 3 (SRVC TAX)
 ProfId4IN=Prof ID 4
 ProfId5IN=Prof ID 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=ID Prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=ID Prof. 2 (Verslo leidimas)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Prof ID 1 (RC)
 ProfId2MA=Prof ID 2 (patente)
 ProfId3MA=Prof ID 3 (IF)
 ProfId4MA=Prof ID 4 (CNSS)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof ID 1 (RFC).
 ProfId2MX=Prof ID 2 (R.. P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK Numeris
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=SDN (Socialinio draudimo numeris)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof ID 1 (NIPC)
 ProfId2PT=Prof ID 2 (Socialinio draudimo numeris)
 ProfId3PT=Prof ID 3 (Komercinio Registro numeris)
 ProfId4PT=Prof ID 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof ID 1 (OGRN)
 ProfId2RU=Prof ID 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Tikrinimas negalimas. Tikrinimo paslauga nėra teikiama valstybės narės (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potencialas
 ProspectLevel=Numatomų klientų potencialas
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Valiuta
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/lt_LT/ecm.lang b/htdocs/langs/lt_LT/ecm.lang
index 2e429df760d..9a3de9c22f6 100644
--- a/htdocs/langs/lt_LT/ecm.lang
+++ b/htdocs/langs/lt_LT/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Ieškoti pagal raktinius žodžius
 ECMSearchByEntity=Ieškoti pagal objektą
 ECMSectionOfDocuments=Dokumentų katalogai
 ECMTypeAuto=Automatinis
-ECMDocsBySocialContributions=Dokumentai, susiję su socialiniais ar fiskaliniais mokesčiais
-ECMDocsByThirdParties=Dokumentai, susiję su trečiosiomis šalimis
-ECMDocsByProposals=Dokumentai, susiję su pasiūlymais
-ECMDocsByOrders=Dokumentai, susiję su klientų užsakymais
-ECMDocsByContracts=Dokumentai, susiję su sutartimis
-ECMDocsByInvoices=Dokumentai, susiję su klientų sąskaitomis-faktūromis
-ECMDocsByProducts=Dokumentai, susiję su produktais
-ECMDocsByProjects=Dokumentai, susiję su projektais
-ECMDocsByUsers=Dokumentai susiję su vartotojais
-ECMDocsByInterventions=Dokumentai, susiję su intervencijomis
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=Nėra sukurta katalogo
 ShowECMSection=Rodyti katalogą
 DeleteSection=Pašalinti katalogą
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/lt_LT/hrm.lang b/htdocs/langs/lt_LT/hrm.lang
index d5b3bbfa340..76db8a5dc5a 100644
--- a/htdocs/langs/lt_LT/hrm.lang
+++ b/htdocs/langs/lt_LT/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Employees
 Employee=Darbuotojas
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/lt_LT/install.lang b/htdocs/langs/lt_LT/install.lang
index af14dc609af..fd22666afd2 100644
--- a/htdocs/langs/lt_LT/install.lang
+++ b/htdocs/langs/lt_LT/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Konfigūracijos failas <b>%s</b> įrašomas.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=Šis PHP palaiko sesijas.
 PHPSupportPOSTGETOk=Šis PHP palaiko kintamuosius POST ir GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=Šis PHP palaiko sesijas.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Jūsų PHP maksimali sesijos atmintis yra nustatyta į <b>%s</b>. To turėtų būti pakankamai.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/lt_LT/intracommreport.lang b/htdocs/langs/lt_LT/intracommreport.lang
new file mode 100644
index 00000000000..0d63b174f71
--- /dev/null
+++ b/htdocs/langs/lt_LT/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=Sąrašas
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/lt_LT/languages.lang b/htdocs/langs/lt_LT/languages.lang
index 77a7c15b777..571c2ed6e1b 100644
--- a/htdocs/langs/lt_LT/languages.lang
+++ b/htdocs/langs/lt_LT/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Ispanų (Paragvajus)
 Language_es_PE=Ispanų (Peru)
 Language_es_PR=Ispanų (Puerto Rikas)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index 52ee700de75..5b05397b5d2 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Remove link
 AddToDraft=Add to draft
 Update=Atnaujinimas
 Close=Uždaryti
+CloseAs=Set status to
 CloseBox=Remove widget from your dashboard
 Confirm=Patvirtinti
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Atidaryti iš naujo
 Upload=Upload
 ToLink=Nuoroda
 Select=Pasirinkti
+SelectAll=Select all
 Choose=Pasirinkti
 Resize=Pakeisti dydį
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=Kortelės
 Card=Kortelė
 Now=Dabar
 HourStart=Pradėti valandą
+Deadline=Deadline
 Date=Data
 DateAndHour=Data ir valanda
 DateToday=Today's date
@@ -264,8 +267,10 @@ DateStart=Pradžios data
 DateEnd=Pabaigos data
 DateCreation=Sukūrimo data
 DateCreationShort=Creat. date
+IPCreation=Creation IP
 DateModification=Pakeitimo data
 DateModificationShort=Pakeitimo data
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Patvirtinimo data
 DateClosing=Uždarymo data
@@ -319,6 +324,7 @@ Morning=Rytas
 Afternoon=Popietė
 Quadri=Ketur-
 MonthOfDay=Dienos mėnuo
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=MN
 Rate=Norma
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Mokesčių suma 2
 AmountLT2=Mokesčių suma 3
 AmountLT1ES=RE suma
@@ -487,6 +494,7 @@ By=Pagal
 From=Nuo
 FromDate=Pardavėjas
 FromLocation=Pardavėjas
+at=at
 to=į
 To=į
 and=ir
@@ -509,6 +517,7 @@ Draft=Projektas
 Drafts=Projektai
 StatusInterInvoiced=Invoiced
 Validated=Pripažinti galiojančiais
+ValidatedToProduce=Validated (To produce)
 Opened=Atidaryta
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Atsakymas
 Priority=Prioritetas
 SendByMail=Send by email
 MailSentBy=E-Laišką atsiuntė
+NotSent=Neišsiųsta
 TextUsedInTheMessageBody=E-laiško pagrindinė dalis
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Siųsti e-laišką
@@ -836,6 +846,7 @@ ListOfTemplates=Šablonų sąrašas
 Gender=Gender
 Genderman=Vyras
 Genderwoman=Moteris
+Genderother=Kiti
 ViewList=Sąrašo vaizdas
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Įvairus
 Calendar=Kalendorius
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Išlaidų ataskaitos
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Komentarai
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Informacija
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Gimimo data
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/lt_LT/members.lang b/htdocs/langs/lt_LT/members.lang
index ebe886d722e..b63bb1dc36d 100644
--- a/htdocs/langs/lt_LT/members.lang
+++ b/htdocs/langs/lt_LT/members.lang
@@ -19,14 +19,12 @@ MembersCards=Narių vizitinės kortelės
 MembersList=Narių sąrašas
 MembersListToValid=Numatomų narių sąrašas (tvirtinimui)
 MembersListValid=Patvirtintų galiojančių narių sąrašas
-MembersListUpToDate=Patvirtintų galiojančių narių su atnaujintu pasirašymu sąrašas
-MembersListNotUpToDate=Patvirtintų galiojančių narių su pasenusiu pasirašymu sąrašas
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=Slaptų narių sąrašas (qualified)
 MenuMembersToValidate=Projektiniai nariai
 MenuMembersValidated=Patvirtinti nariai
-MenuMembersUpToDate=Atnaujinti nariai
-MenuMembersNotUpToDate=Pasenę nariai
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Nariai, kurių pasirašymą reikia gauti
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Pasirašymo data
 DateEndSubscription=Pasirašymo pabaigos data
 EndSubscription=Pasirašymo pabaiga
 SubscriptionId=Pasirašymo ID
+WithoutSubscription=Without subscription
 MemberId=Nario ID
 NewMember=Naujas narys
 MemberType=Nario tipas
@@ -81,7 +80,7 @@ DeleteType=Ištrinti
 VoteAllowed=Balsuoti leidžiama
 Physical=Fizinis
 Moral=Moralinis
-MorPhy=Prigimtis
+MorAndPhy=Moral and Physical
 Reenable=Įjungti vėl
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Narių statistiniai duomenys pagal valstybę/regioną
 MembersStatisticsByTown=Narių statistiniai duomenys pagal miestus
 MembersStatisticsByRegion=Narių statistika pagal regionus
 NbOfMembers=Narių skaičius
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=Patvirtintų narių nerasta
 MembersByCountryDesc=Šis ekranas rodo narių statistiką pagal šalis. Grafika priklauso nuo Google interneto grafikos ir yra prieinamas tik tada, kai interneto ryšys veikia.
 MembersByStateDesc=Šis ekranas rodo narių statistiką pagal valstybes/regionus
@@ -176,6 +177,7 @@ MenuMembersStats=Statistika
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Informacija yra vieša
 NewMemberbyWeb=Naujas narys pridėtas. Laukiama patvirtinimo
 NewMemberForm=Naujo nario forma
diff --git a/htdocs/langs/lt_LT/mrp.lang b/htdocs/langs/lt_LT/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/lt_LT/mrp.lang
+++ b/htdocs/langs/lt_LT/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index 3bd7e2542f7..31a8d69bc7d 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Kainų skaičius
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Produktų, sudarančių šį virtualų produktą, skaičius
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=Jei 0, šis produktas nėra virtualus produktas
-IfZeroItIsNotUsedByVirtualProduct=Jei 0, šis produktas nėra naudojamas nei vieno virtualaus produkto
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Raktažodižio filtras
 CategoryFilter=Kategorijų filtras
 ProductToAddSearch=Ieškoti produkto pridėjimui
 NoMatchFound=Atitikimų nerasta
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=Virtualių prekių/paslaugų su šiuo produktu, kaip komponentu, sąrašas
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=Vienas iš pasirinkto produkto yra patronuojantis einamam produktui
 DeleteProduct=Ištrinti produktą/paslaugą
 ConfirmDeleteProduct=Ar tikrai norite ištrinti šį produktą/paslaugą ?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Numeris
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimali pirkimo kaina
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/lt_LT/recruitment.lang b/htdocs/langs/lt_LT/recruitment.lang
index 758281511ed..90e03cf6b72 100644
--- a/htdocs/langs/lt_LT/recruitment.lang
+++ b/htdocs/langs/lt_LT/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/lt_LT/stocks.lang b/htdocs/langs/lt_LT/stocks.lang
index 00b0a4e804d..6956b3b8acd 100644
--- a/htdocs/langs/lt_LT/stocks.lang
+++ b/htdocs/langs/lt_LT/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Sandėlių plotas
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Vieta
 LocationSummary=Trumpas vietos pavadinimas
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=Užsakyti
 Replenishment=Papildymas
 ReplenishmentOrders=Papildymo užsakymai
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Papildymo funkcijas naudokite virtualias atsargas pagal nutylėjimą, o ne fizines turimas atsargas
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Naudokite virtualias atsargas
 UsePhysicalStock=Naudoti fizines atsargas
 CurentSelectionMode=Dabartinis pasirinkimo režimas
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Kategorijų filtras
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/lt_LT/suppliers.lang b/htdocs/langs/lt_LT/suppliers.lang
index caa879a115a..ec0170cc1f1 100644
--- a/htdocs/langs/lt_LT/suppliers.lang
+++ b/htdocs/langs/lt_LT/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/lt_LT/website.lang b/htdocs/langs/lt_LT/website.lang
index e8a8c3b92ea..df77c21ae55 100644
--- a/htdocs/langs/lt_LT/website.lang
+++ b/htdocs/langs/lt_LT/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Puslapis
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS mechanizmas
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index 11ee0f767a8..9d43d7bcd9a 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Noklusējums pakalpojumam
 DefaultForProduct=Noklusējums produktam
 CantSuggest=Nevar ieteikt
 AccountancySetupDoneFromAccountancyMenu=Lielākā daļa grāmatvedības iestatīšanas tiek veikta no izvēlnes %s
-ConfigAccountingExpert=Moduļa grāmatvedības eksperta konfigurācija
+ConfigAccountingExpert=Moduļa uzskaites konfigurācija (dubultā ieraksts)
 Journalization=Grāmatvedības ieraksts
-Journaux=Žurnāli
+Journals=Žurnāli
 JournalFinancial=Finanšu žurnāli
 BackToChartofaccounts=Atgriezties kontu diagrammā
 Chartofaccounts=Kontu plāns
+ChartOfSubaccounts=Individuālo kontu diagramma
+ChartOfIndividualAccountsOfSubsidiaryLedger=Meitas uzņēmuma virsgrāmatas individuālo kontu diagramma
 CurrentDedicatedAccountingAccount=Pašreizējais konts
 AssignDedicatedAccountingAccount=Jauns konts, kuru piešķirt
 InvoiceLabel=Rēķina nosaukums
@@ -33,8 +35,8 @@ OtherInfo=Cita informācija
 DeleteCptCategory=No grāmatvedības konta noņemt grupu
 ConfirmDeleteCptCategory=Vai tiešām vēlaties noņemt šo grāmatvedības kontu no grāmatvedības konta grupas?
 JournalizationInLedgerStatus=Žurnālistikas statuss
-AlreadyInGeneralLedger=Jau žurnalizēts žurnālos
-NotYetInGeneralLedger=Vēl nav publicēts žurnālos
+AlreadyInGeneralLedger=Jau pārskaitīts grāmatvedības žurnālos un virsgrāmatā
+NotYetInGeneralLedger=Vēl nav pārsūtīts uz žurnāliem un grāmatām
 GroupIsEmptyCheckSetup=Grupa ir tukša, pārbaudiet personalizētās grāmatvedības grupas iestatījumus
 DetailByAccount=Parādīt detalizētu informāciju par kontu
 AccountWithNonZeroValues=Konti, kuriem nav nulles vērtības
@@ -43,7 +45,9 @@ CountriesInEEC=Valstis EEK
 CountriesNotInEEC=Valstis, kas nav EEK valstīs
 CountriesInEECExceptMe=Valstis EEK, izņemot %s
 CountriesExceptMe=Visas valstis, izņemot %s
-AccountantFiles=Eksporta grāmatvedības dokumenti
+AccountantFiles=Eksportēt pirmdokumentus
+ExportAccountingSourceDocHelp=Izmantojot šo rīku, varat eksportēt avota notikumus (sarakstu un PDF failus), kas tika izmantoti grāmatvedības ģenerēšanai. Lai eksportētu žurnālus, izmantojiet izvēlnes ierakstu %s - %s.
+VueByAccountAccounting=Skatīt pēc grāmatvedības konta
 
 MainAccountForCustomersNotDefined=Galvenais grāmatvedības konts klientiem, kas nav definēti iestatījumos
 MainAccountForSuppliersNotDefined=Galvenais grāmatvedības konts piegādātājiem, kas nav definēti iestatījumos
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=Solis %s: pievienojiet vai rediģējiet esošos darī
 
 AccountancyAreaDescClosePeriod=Solis %s: beidzies periods, tāpēc mēs nevaram veikt izmaiņas nākotnē.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=Obligāts iestatīšanas posms nebija pabeigts (grāmatvedības kodu žurnāls nav definēts visiem bankas kontiem)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Obligāta iestatīšanas darbība nav pabeigta (grāmatvedības kodu žurnāls nav definēts visiem bankas kontiem)
 Selectchartofaccounts=Atlasiet aktīvo kontu diagrammu
 ChangeAndLoad=Mainīt un ielādēt
 Addanaccount=Pievienot grāmatvedības kontu
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger konts
 SubledgerAccountLabel=Subledger konta etiķete
 ShowAccountingAccount=Rādīt grāmatvedības kontu
 ShowAccountingJournal=Rādīt grāmatvedības žurnālu
+ShowAccountingAccountInLedger=Rādīt grāmatvedības kontu virsgrāmatā
+ShowAccountingAccountInJournals=Parādīt grāmatvedības kontu žurnālos
 AccountAccountingSuggest=Ieteicamais grāmatvedības konts
 MenuDefaultAccounts=Noklusētie konti
 MenuBankAccounts=Bankas konti
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Izdevumu pārskats ir saistošs
 CreateMvts=Izveidot jaunu darījumu
 UpdateMvts=Darījuma grozīšana
 ValidTransaction=Apstipriniet darījumu
-WriteBookKeeping=Reģistrēt darījumus Ledger
+WriteBookKeeping=Reģistrējiet darījumus grāmatvedībā
 Bookkeeping=Grāmatvedis
+BookkeepingSubAccount=Zemesgrāmata
 AccountBalance=Konta bilance
 ObjectsRef=Avota objekta ref
 CAHTF=Kopējais pirkuma pārdevējs pirms nodokļu nomaksas
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Atspējot tiešu darījumu reģistrāciju bankas kont
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Iespējot eksporta projektu žurnālā
 ACCOUNTANCY_COMBO_FOR_AUX=Iespējot kombinēto sarakstu papildu kontam (var būt lēni, ja jums ir daudz trešo personu)
 ACCOUNTING_DATE_START_BINDING=Definējiet datumu, lai sāktu iesiešanu un pārskaitīšanu grāmatvedībā. Zem šī datuma darījumi netiks pārnesti uz grāmatvedību.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Pārsūtot grāmatvedību, pēc noklusējuma atlasiet periodu
 
 ACCOUNTING_SELL_JOURNAL=Pārdošanas žurnāls
 ACCOUNTING_PURCHASE_JOURNAL=Pirkuma žurnāls
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Gaidīšanas grāmatvedības konts
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Grāmatvedības konts, lai reģistrētu abonementus
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Grāmatvedības konts pēc noklusējuma reģistrē klientu depozītu
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Nopirkto produktu grāmatvedības konts pēc noklusējuma (tiek izmantots, ja tas nav definēts produktu lapā)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Grāmatvedības konts pēc noklusējuma nopirktajiem produktiem EEK (lietots, ja nav definēts produktu lapā)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Grāmatvedības konts pēc noklusējuma nopirktajiem produktiem un importētajiem no EEK (izmantots, ja tas nav noteikts produkta lapā)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Iepriekš definētās grupas
 ByPersonalizedAccountGroups=Personalizētās grupas
 ByYear=Pēc gada
 NotMatch=Nav iestatīts
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Izdzēsiet dažas operāciju rindas no grāmatvedības
 DelMonth=Mēnesis kas jādzēš
 DelYear=Gads kurš jādzēš
 DelJournal=Žurnāls kurš jādzēš
-ConfirmDeleteMvt=Tas izdzēsīs visas virsgrāmatas rindas par gadu / mēnesi un / vai no konkrēta žurnāla (Nepieciešams vismaz viens kritērijs). Jums būs atkārtoti jāizmanto funkcija “Reģistrācija grāmatvedībā”, lai izdzēstais ieraksts atkal būtu virsgrāmatā.
-ConfirmDeleteMvtPartial=Tiks dzēsts darījums no Ledger (visas līnijas, kas attiecas uz to pašu darījumu, tiks dzēsti).
+ConfirmDeleteMvt=Tas izdzēsīs visas grāmatvedības operāciju rindas par gadu / mēnesi un / vai konkrētu žurnālu (nepieciešams vismaz viens kritērijs). Jums būs atkārtoti jāizmanto līdzeklis '%s', lai dzēstais ieraksts atgrieztos virsgrāmatā.
+ConfirmDeleteMvtPartial=Tādējādi darījums tiks dzēsts no grāmatvedības (visas operācijas rindas, kas saistītas ar to pašu darījumu, tiks dzēstas)
 FinanceJournal=Finanšu žurnāls
 ExpenseReportsJournal=Izdevumu pārskatu žurnāls
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=Tas ir ieraksts, kas saistīts ar grāmatvedības kontu, un to var ierakstīt grāmatvedībā.
+DescJournalOnlyBindedVisible=Šis ir ieraksta skats, kas ir saistīts ar grāmatvedības kontu un kuru var ierakstīt žurnālos un virsgrāmatā.
 VATAccountNotDefined=PVN konts nav definēts
 ThirdpartyAccountNotDefined=Konts trešajai pusei nav definēts
 ProductAccountNotDefined=Konts produktam nav definēts
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Šis žurnāls jau ir izmantots
 AccountingAccountForSalesTaxAreDefinedInto=Piezīme. Pārdošanas nodokļa grāmatvedības konts ir norādīts izvēlnē <b> %s </b>- <b> %s </b>.
 NumberOfAccountancyEntries=Ierakstu skaits
 NumberOfAccountancyMovements=Pārvietošanas skaits
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Atspējot saistīšanu un pārskaitīšanu pārdošanas grāmatvedībā (klienta rēķini netiks ņemti vērā grāmatvedībā)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Atspējot saistīšanu un pārsūtīšanu pirkumu grāmatvedībā (pārdevēja rēķini netiks ņemti vērā grāmatvedībā)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Atspējojiet grāmatvedībā iesiešanu un pārskaitīšanu izdevumu pārskatos (grāmatvedībā netiks ņemti vērā izdevumu pārskati)
 
 ## Export
 ExportDraftJournal=Eksporta žurnāla projekts
@@ -326,6 +339,8 @@ Modelcsv_configurable=Eksportēt CSV konfigurējamu
 Modelcsv_FEC=Eksporta FEC
 Modelcsv_Sage50_Swiss=Eksports uz Sage 50 Šveici
 Modelcsv_winfic=Eksportēt Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Kontu konts. Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index 9eb0b87e3e2..d4c3cc29788 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Noņemt savienojuma bloķēšanu
 YourSession=Jūsu sesija
 Sessions=Lietotāju sesijas
 WebUserGroup=Web servera lietotājs/grupa
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Šķiet, ka jūsu PHP konfigurācija neļauj iekļaut aktīvās sesijas. Direktorija, kuru izmanto sesiju saglabāšanai (<b>%s</b>), var būt aizsargāta (piemēram, ar OS atļaujām vai PHP direktīvu open_basedir).
 DBStoringCharset=Datu bāzes kodējuma datu uzglabāšanai
 DBSortingCharset=Datu bāzes rakstzīmju kopa, lai kārtotu datus
@@ -71,7 +73,7 @@ DisableJavascriptNote=Piezīme. Pārbaudes vai atkļūdošanas nolūkos. Lai opt
 UseSearchToSelectCompanyTooltip=Arī tad, ja jums ir liels skaits trešo personu (> 100 000), varat palielināt ātrumu, iestatot konstanti COMPANY_DONOTSEARCH_ANYWHERE uz 1 iestatījumos-> Citi. Pēc tam meklēšana tiks ierobežota līdz virknes sākumam.
 UseSearchToSelectContactTooltip=Arī tad, ja jums ir liels skaits trešo personu (> 100 000), varat palielināt ātrumu, iestatot konstantu CONTACT_DONOTSEARCH_ANYWHERE uz 1 iestatījumos-> Citi. Pēc tam meklēšana tiks ierobežota līdz virknes sākumam.
 DelaiedFullListToSelectCompany=Pagaidiet, kamēr tiek nospiests taustiņš, pirms ievietojat trešo pušu saraksta saturu. <br> Tas var palielināt veiktspēju, ja jums ir liels skaits trešo personu, taču tas ir mazāk ērti.
-DelaiedFullListToSelectContact=Gaida, līdz tiek nospiests taustiņš, pirms ievietojat kontaktpersonu saraksta saturu. <br> Tas var palielināt veiktspēju, ja jums ir liels kontaktpersonu skaits, bet tas ir mazāk ērti).
+DelaiedFullListToSelectContact=Uzgaidiet, līdz tiek nospiests taustiņš, pirms ielādējat kombinēto kontaktu saraksta saturu. <br> Tas var uzlabot veiktspēju, ja jums ir daudz kontaktu, taču tas nav tik ērti.
 NumberOfKeyToSearch=Rakstzīmju skaits, kas aktivizē meklēšanu: %s
 NumberOfBytes=Bitu skaits
 SearchString=Meklēšanas virkne
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=Trešās puses dokumentā var izvēlēties
 JavascriptDisabled=JavaScript bloķēts
 UsePreviewTabs=Izmantot priekšskatījuma cilnes
 ShowPreview=Rādīt priekšskatījumu
+ShowHideDetails=Rādīt - slēpt informāciju
 PreviewNotAvailable=Priekšskatījums nav pieejams
 ThemeCurrentlyActive=aktīvā tēma
 CurrentTimeZone=Laika josla PHP (servera)
@@ -271,7 +274,7 @@ NoticePeriod=Paziņojuma periods
 NewByMonth=Jauns pa mēnešiem
 Emails=E-pasti
 EMailsSetup=E-pastu iestatīšana
-EMailsDesc=Šī lapa ļauj jums ignorēt jūsu noklusējuma PHP parametrus e-pasta sūtīšanai. Vairumā gadījumu uz Unix / Linux OS, PHP iestatīšana ir pareiza, un šie parametri nav vajadzīgi.
+EMailsDesc=Šī lapa ļauj iestatīt e-pastu sūtīšanas parametrus vai opcijas.
 EmailSenderProfiles=E-pasta sūtītāju profili
 EMailsSenderProfileDesc=Jūs varat atstāt šo sadaļu tukšu. Ja šeit ievadīsit dažus e-pastus, tie tiks pievienoti iespējamo sūtītāju sarakstam kombinētajā lodziņā, kad rakstīsit jaunu e-pastu.
 MAIN_MAIL_SMTP_PORT=SMTP / SMTPS ports (noklusējuma vērtība php.ini: <b> %s </b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (ja servera nosūtīšanai nepieciešama autentifikā
 MAIN_MAIL_SMTPS_PW=SMTP parole (ja servera sūtīšanai nepieciešama autentificēšanās)
 MAIN_MAIL_EMAIL_TLS=Izmantot TLS (SSL) šifrēšanu
 MAIN_MAIL_EMAIL_STARTTLS=Izmantojiet TLS (STARTTLS) šifrēšanu
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autorizēt lestificats automātiskās parakstīšanas
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Izmantojiet DKIM, lai ģenerētu e-pasta parakstu
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=E-pasta domēns lietošanai ar DKIM
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=DKIM selektora nosaukums
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Atstājot šo lauku tukšu, tas nozīmē, ka šī v
 ExtrafieldParamHelpselect=Vērtību sarakstam jābūt rindām ar formāta atslēgu, vērtība (kur atslēga nevar būt '0') <br> <br>, piemēram,: 1, vērtība1 <br> 2, vērtība2 <br> kods3, vērtība3 < br> ... <br> <br> Lai saraksts būtu atkarīgs no cita papildinošā atribūtu saraksta: <br> 1, vērtība1 | opcijas_ <i> vecāku_līmeņa kods </i>: vecāku_skava <br> 2, vērtība2 | opcijas_ <i> vecāku saraksts_code </i>: parent_key <br> <br> Lai saraksts būtu atkarīgs no cita saraksta: <br> 1, vērtība1 | <i> vecāku saraksts_code </i>: vecāku_skava <br> 2, vērtība2 | <i> vecāku saraksts_code </i>: vecāku_poga
 ExtrafieldParamHelpcheckbox=Vērtību sarakstam jābūt rindām ar formāta atslēgu, vērtība (kur atslēga nevar būt '0') <br> <br>, piemēram,: 1, vērtība1 <br> 2, vērtība2 <br> 3, vērtība3 < br> ...
 ExtrafieldParamHelpradio=Vērtību sarakstam jābūt rindām ar formāta atslēgu, vērtība (kur atslēga nevar būt '0') <br> <br>, piemēram,: 1, vērtība1 <br> 2, vērtība2 <br> 3, vērtība3 < br> ...
-ExtrafieldParamHelpsellist=Vērtību saraksts nāk no tabulas <br> Sintakse: table_name: label_field: id_field :: filtrs <br> piemērs: c_typent: libelle: id :: filtrs <br> <br> - idfilter ir obligāti primārs int key | - filtrs var būt vienkāršs tests (piemēram, aktīvs = 1), lai parādītu tikai aktīvo vērtību <br> filtru raganā var izmantot arī $ ID $, kas ir pašreizējā objekta pašreizējais ID. $ <br>, ja vēlaties filtrēt uz ekrāna, izmantojiet sintaksi extra.fieldcode = ... (ja lauka kods ir extrafield kods) <br> <br> Lai saraksts būtu atkarīgs no cita papildu atribūtu saraksta: < br> c_typent: libelle: id: options_ <i> vecāku_list_code </i> | vecāku_krāsa: filtrs <br> <br> Lai iegūtu sarakstu atkarībā no cita saraksta: <br> c_typent: libelle: id: <i> parent_list_code </i> | vecāku_ sleja: filtrs
+ExtrafieldParamHelpsellist=Vērtību saraksts tiek iegūts no tabulas <br> Sintakse: table_name: label_field: id_field :: filter <br> Piemērs: c_typent: libelle: id :: filter <br> - id_field ir a2f a2 = 1) lai parādītu tikai aktīvo vērtību <br>. Filtrā var izmantot arī $ ID $, kas ir pašreizējā objekta <br> ID. Lai filtrā izmantotu SELECT, izmantojiet atslēgvārdu $ SEL $, lai apietu pretinjicēšanas aizsardzību. <br>, ja vēlaties filtrēt ekstrefieldos, izmantojiet sintaksi extra.fieldcode = ... (kur lauka kods ir extrafield kods) <br> <br> Lai saraksts būtu atkarīgs no cita papildu atribūtu saraksta: <br>: <br> <i> parent_list_code </i> | parent_column: filter <br> <br> Lai saraksts būtu atkarīgs no cita saraksta: <br> c_typent: libelle: ID: a04927
 ExtrafieldParamHelpchkbxlst=Vērtību saraksts nāk no tabulas <br> Sintakse: table_name: label_field: id_field :: filtrs <br> piemērs: c_typent: libelle: id :: filtrs <br> <br> filtrs var būt vienkāršs tests (piemēram, aktīvs = 1 ), lai parādītu tikai aktīvo vērtību <br> Jūs varat arī izmantot $ ID $ filtru raganā, kas ir pašreizējā objekta pašreizējais ID <br> Lai SELECT veiktu filtru, izmantojiet $ SEL $ <br>, ja vēlaties filtrēt uz ekrāna. syntax extra.fieldcode = ... (ja lauka kods ir extrafield kods) <br> <br> Lai iegūtu sarakstu atkarībā no cita papildu atribūtu saraksta: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | vecāku_krāsa: filtrs <br> <br> Lai iegūtu sarakstu atkarībā no cita saraksta: <br> c_typent: libelle: id: <i> vecāku saraksts_code </i> | vecāku_ sleja: filtrs
-ExtrafieldParamHelplink=Parametriem jābūt ObjectName: Classpath <br> Syntax: ObjectName: Classpath <br> Piemēri: <br> Societe: societe / class / societe.class.php <br> Kontakti: contact / class / contact.class.php
+ExtrafieldParamHelplink=Parametriem jābūt ObjectName: Classpath <br> Sintakse: ObjectName: Classpath
 ExtrafieldParamHelpSeparator=Vienkārša atdalītāja atstāšana tukša <br> Iestatiet to uz 1 sabrūkošajam atdalītājam (pēc noklusējuma atveriet jaunu sesiju, pēc tam katras lietotāja sesijai tiek saglabāts statuss) <br> Iestatiet to uz 2 sabrukušajam atdalītājam (jaunajai sesijai pēc noklusējuma sabrūk, pēc tam katras lietotāja sesijas laikā tiek saglabāts statuss)
 LibraryToBuildPDF=Bibliotēka, ko izmanto PDF veidošanai
 LocalTaxDesc=Dažas valstis var piemērot divus vai trīs nodokļus katrā rēķina rindā. Šādā gadījumā izvēlieties otrā un trešā nodokļa veidu un likmi. Iespējamie veidi ir: <br> 1: vietējais nodoklis attiecas uz produktiem un pakalpojumiem bez tvertnes (localtax tiek aprēķināts bez nodokļa) <br> 2: vietējie nodokļi attiecas uz produktiem un pakalpojumiem, ieskaitot vat (localtax tiek aprēķināta pēc summas + galvenais nodoklis) ) <br> 3: vietējie nodokļi attiecas uz produktiem bez cisternām (localtax tiek aprēķināta bez nodokļa) <br> 4: vietējie nodokļi attiecas uz produktiem, ieskaitot tvertni (localtax tiek aprēķināta pēc summas + galvenā tvertne) <br> 5: vietējais nodoklis, ko piemēro par pakalpojumiem bez vat (vietējais maksājums tiek aprēķināts bez nodokļa) <br> 6: vietējiem nodokļiem, kas attiecas uz pakalpojumiem, ieskaitot mucu (vietējais maksājums tiek aprēķināts pēc summas + nodokļa)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s, kam seko saīsināts klienta nosaukums ar
 ModuleCompanyCodeSupplierDigitaria=%s, kam seko saīsināts piegādātāja nosaukums ar rakstzīmju skaitu: %s piegādātāja grāmatvedības kodam.
 Use3StepsApproval=Pēc noklusējuma ir jābūt veidotam un apstiprinātam Pirkšanas pasūtījumam no 2 dažādiem lietotājiem (viens solis / lietotājs, lai izveidotu un viens solis / lietotājs apstiprinātu. Ņemiet vērā, ka, ja lietotājam ir gan atļauja izveidot un apstiprināt, viens solis / lietotājs būs pietiekams) . Ar šo opciju varat prasīt trešās pakāpes / lietotāja apstiprinājumu, ja summa ir lielāka par īpašo vērtību (tādēļ būs nepieciešami 3 soļi: 1 = validācija, 2 = pirmais apstiprinājums un 3 = otrais apstiprinājums, ja summa ir pietiekama). <br> Iestatiet, ka tas ir tukšs, ja pietiek vienam apstiprinājumam (2 pakāpieniem), ja tam vienmēr ir nepieciešams otrais apstiprinājums (3 pakāpieni).
 UseDoubleApproval=Izmantojiet 3 pakāpju apstiprinājumu, ja summa (bez nodokļiem) ir lielāka par ...
-WarningPHPMail=BRĪDINĀJUMS: bieži vien ir labāk iestatīt izejošos e-pastus, lai izmantotu sava pakalpojumu sniedzēja e-pasta serveri, nevis noklusējuma iestatījumus. Daži e-pasta pakalpojumu sniedzēji (piemēram, Yahoo) neļauj jums sūtīt e-pastu no cita servera nekā viņu pašu serveris. Pašreizējā iestatīšana izmanto lietojumprogrammas serveri, lai nosūtītu e-pastu, nevis e-pasta pakalpojumu sniedzēja serveri, tāpēc daži saņēmēji (viens, kas ir saderīgs ar ierobežojošo DMARC protokolu), jautās jūsu e-pasta pakalpojumu sniedzējam, ja viņi varēs pieņemt jūsu e-pasta adresi un dažus e-pasta pakalpojumu sniedzējus (piemēram, Yahoo) var atbildēt uz „nē”, jo serveris nav viņu, tāpēc daži no jūsu nosūtītajiem e-pasta ziņojumiem var nebūt pieņemami (uzmanieties arī no e-pasta pakalpojumu sniedzēja sūtīšanas kvotas). <br> Ja jūsu e-pasta pakalpojumu sniedzējam (piemēram, Yahoo) ir šis ierobežojums ir jāmaina e-pasta iestatīšana, lai izvēlētos citu metodi "SMTP serveris" un ievadiet SMTP serveri un e-pasta pakalpojumu sniedzēja piešķirtos akreditācijas datus.
+WarningPHPMail=BRĪDINĀJUMS. E-pasta ziņojumu sūtīšanai no lietojumprogrammas tiek izmantota noklusējuma vispārīgā iestatīšana. Izejošos e-pastus bieži ir labāk iestatīt, lai noklusējuma iestatījumu vietā izmantotu sava e-pasta pakalpojumu sniedzēja e-pasta serveri vairāku iemeslu dēļ:
+WarningPHPMailA=- E-pasta pakalpojumu sniedzēja servera izmantošana palielina jūsu e-pasta uzticamību, tāpēc tas palielina piegādājamību, nepazīmējot to kā SPAM
+WarningPHPMailB=- Daži e-pasta pakalpojumu sniedzēji (piemēram, Yahoo) neļauj sūtīt e-pastu no cita servera, izņemot viņu pašu serveri. Pašreizējā iestatījumā e-pasta ziņojumu sūtīšanai tiek izmantots lietojumprogrammas serveris, nevis jūsu e-pasta pakalpojumu sniedzēja serveris, tāpēc daži adresāti (kas ir saderīgi ar ierobežojošo DMARC protokolu) jautās jūsu e-pasta pakalpojumu sniedzējam, vai viņi var pieņemt jūsu e-pastu, un dažiem e-pasta pakalpojumu sniedzējiem (piemēram, Yahoo) var atbildēt "nē", jo serveris nav viņu, tāpēc daži no jūsu nosūtītajiem e-pasta ziņojumiem var netikt pieņemti piegādei (esiet piesardzīgs arī attiecībā uz sava e-pasta pakalpojumu sniedzēja sūtīšanas kvotu).
+WarningPHPMailC=- Arī sava e-pasta pakalpojumu sniedzēja SMTP servera izmantošana e-pasta ziņojumu sūtīšanai ir interesanta, tāpēc visi no lietojumprogrammas nosūtītie e-pasta ziņojumi tiks saglabāti arī jūsu pastkastes direktorijā Nosūtītie.
+WarningPHPMailD=Ja metode “PHP Mail” patiešām ir tā metode, kuru vēlaties izmantot, varat noņemt šo brīdinājumu, pievienojot nemainīgu MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP uz 1 sadaļā Home - Setup - Other.
 WarningPHPMail2=Ja jūsu e-pasta SMTP pakalpojumu sniedzējs ierobežo e-pasta klientus uz dažām IP adresēm (ļoti reti), tad jūsu ERP CRM lietojumprogrammas e-pasta lietotāja aģenta (MUA) IP adrese ir: <strong>%s</strong>.
-WarningPHPMailSPF=Ja domēna vārdu jūsu sūtītāja e-pasta adresē aizsargā SPF (jautājiet jums e-pasta pakalpojumu sniedzējam), sava domēna DNS SPF ierakstā jāiekļauj šādi IP: <strong> %s </strong>.
+WarningPHPMailSPF=Ja sūtītāja e-pasta adresē esošo domēna vārdu aizsargā SPF ieraksts (jautājiet domēna vārdu reģistram), sava domēna DNS SPF ierakstā jāpievieno šādi IP: <strong> %s </strong>.
 ClickToShowDescription=Noklikšķiniet, lai parādītu aprakstu
 DependsOn=Šim modulim nepieciešams modulis(-i)
 RequiredBy=Šis modulis nepieciešams modulim (-ļiem)
@@ -551,8 +559,6 @@ Module57Name=Maksājumi ar tiešo debetu
 Module57Desc=Tiešā debeta rīkojumu vadība. Tas ietver SEPA faila ģenerēšanu Eiropas valstīm.
 Module58Name=NospiedLaiSavienotos
 Module58Desc=Integrācija ar ClickToDial sistēmas (zvaigznīte, ...)
-Module59Name=Bookmark4u
-Module59Desc=Pievienot funkciju, lai radītu Bookmark4u kontu no Dolibarr konta
 Module60Name=Uzlīmes
 Module60Desc=Uzlīmju pārvaldība
 Module70Name=Iejaukšanās
@@ -656,7 +662,7 @@ Module50200Desc=Piedāvājiet klientiem PayPal tiešsaistes maksājumu lapu (Pay
 Module50300Name=Stripe
 Module50300Desc=Piedāvājiet klientiem Stripe tiešsaistes maksājumu lapu (kredītkartes / debetkartes). To var izmantot, lai ļautu saviem klientiem veikt ad hoc maksājumus vai maksājumus, kas saistīti ar konkrētu Dolibarr objektu (rēķins, pasūtījums utt.)
 Module50400Name=Grāmatvedība (divkāršs ieraksts)
-Module50400Desc=Grāmatvedības vadība (divkāršie ieraksti, atbalsta vispārējās un papildu grāmatiņas). Eksportēt virsgrāmatu vairākos citos grāmatvedības programmatūras formātos.
+Module50400Desc=Grāmatvedības vadība (divkārši ieraksti, atbalsts Vispārējām un meitas grāmatām). Eksportējiet virsgrāmatu vairākos citos grāmatvedības programmatūras formātos.
 Module54000Name=PrintIPP
 Module54000Desc=Tiešā druka (neatverot dokumentus), izmantojot Cups IPP saskarni (printerim jābūt redzamam no servera, un CUPS ir jābūt instalētam serverī).
 Module55000Name=Aptauja vai balsojums
@@ -671,7 +677,7 @@ Module63000Name=Resursi
 Module63000Desc=Pārvaldiet resursus (printerus, automašīnas, telpas, ...), lai piešķirtu notikumiem
 Permission11=Lasīt klientu rēķinus
 Permission12=Izveidot / mainīt klientu rēķinus
-Permission13=Neapstiprināti klientu rēķini
+Permission13=Nederīgi klientu rēķini
 Permission14=Pārbaudīt klientu rēķinus
 Permission15=Nosūtīt klientu rēķinus pa e-pastu
 Permission16=Izveidot maksājumus klientu rēķiniem
@@ -688,6 +694,7 @@ Permission32=Izveidot / mainīt produktus
 Permission34=Dzēst produktus
 Permission36=Skatīt/vadīt slēptos produktus
 Permission38=Eksportēt produktus
+Permission39=Ignorēt minimālo cenu
 Permission41=Lasīt projektus un uzdevumus (kopīgs projekts un projekti, par kuriem es kontaktēju). Var arī ievadīt patērēto laiku man vai manai hierarhijai par piešķirtajiem uzdevumiem (laika kontrolsaraksts)
 Permission42=Izveidojiet / modificējiet projektus (kopīgu projektu un projektus, par kuriem esmu kontaktējies). Var arī izveidot uzdevumus un piešķirt lietotājus projektam un uzdevumiem
 Permission44=Dzēsiet projektus (kopīgots projekts un projekti, par kuriem es kontaktēju)
@@ -696,6 +703,9 @@ Permission61=Lasīt intervences
 Permission62=Izveidot / mainīt intervences
 Permission64=Dzēst intervences
 Permission67=Eksporta iejaukšanās
+Permission68=Sūtiet intervences pa e-pastu
+Permission69=Apstiprināt iejaukšanās
+Permission70=Anulēt iejaukšanās
 Permission71=Lasīt dalībniekus
 Permission72=Izveidot/mainīt dalībniekus
 Permission74=Dzēst dalībniekus
@@ -718,6 +728,7 @@ Permission95=Lasīt atskaites
 Permission101=Lasīt sūtījumus
 Permission102=Izveidot/mainīt sūtījumus
 Permission104=Apstiprināt sūtījumus
+Permission105=Sūtiet sūtījumus pa e-pastu
 Permission106=Eksportēt sūtījumus
 Permission109=Dzēst sūtījumus
 Permission111=Lasīt finanšu kontus
@@ -825,10 +836,11 @@ Permission402=Izveidot/mainīt atlaides
 Permission403=Apstiprināt atlaides
 Permission404=Dzēst atlaides
 Permission430=Izmantot Debug Bar
-Permission511=Lasīt algu maksājumus
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Izveidojiet / modificējiet algu maksājumus
 Permission514=Dzēst algu maksājumus
-Permission517=Eksportēt algas
+Permission517=Read payments of salaries of everybody
+Permission519=Eksportēt algas
 Permission520=Lasīt aizdevumus
 Permission522=Izveidot / labot aizdevumus
 Permission524=Dzēst aizdevumus
@@ -839,16 +851,19 @@ Permission532=Izveidot/mainīt pakalpojumus
 Permission534=Dzēst pakalpojumus
 Permission536=Skatīt/vadīt slēptos pakalpojumus
 Permission538=Eksportēt pakalpojumus
-Permission561=Read payment orders by credit transfer
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
-Permission564=Record Debits/Rejections of credit transfer
+Permission561=Izlasiet maksājuma uzdevumus ar pārskaitījumu
+Permission562=Izveidojiet / mainiet maksājuma uzdevumu ar pārskaitījumu
+Permission563=Nosūtiet / pārsūtiet maksājuma rīkojumu ar pārskaitījumu
+Permission564=Kredīta pārveduma iegrāmatošana / noraidīšana
+Permission601=Lasiet uzlīmes
+Permission602=Izveidojiet / modificējiet uzlīmes
+Permission609=Dzēst uzlīmes
 Permission650=Lasīt materiālu rēķinus
 Permission651=Izveidot / atjaunināt materiālu rēķinus
 Permission652=Dzēst materiālu rēķinus
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
+Permission660=Lasīt ražošanas pasūtījumu (MO)
+Permission661=Izveidot / atjaunināt ražošanas pasūtījumu (MO)
+Permission662=Dzēst ražošanas pasūtījumu (MO)
 Permission701=Lasīt ziedojumus
 Permission702=Izveidot/mainīt ziedojumus
 Permission703=Dzēst ziedojumus
@@ -858,8 +873,8 @@ Permission773=Dzēst izdevumu pārskatus
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Apstiprināt izdevumu pārskatus
 Permission776=Apmaksāt izdevumu pārskatus
-Permission777=Read expense reports of everybody
-Permission778=Create/modify expense reports of everybody
+Permission777=Lasiet visu izdevumu pārskatus
+Permission778=Izveidojiet / mainiet visu izdevumu pārskatus
 Permission779=Eksportēt izdevumu atskaites
 Permission1001=Lasīt krājumus
 Permission1002=Izveidot/labot noliktavas
@@ -884,7 +899,9 @@ Permission1185=Apstipriniet pirkuma pasūtījumus
 Permission1186=Pasūtījuma pirkuma pasūtījumi
 Permission1187=Apstipriniet pirkuma pasūtījumu saņemšanu
 Permission1188=Dzēst pasūtījumus
+Permission1189=Atzīmējiet / noņemiet atzīmi no pirkuma pasūtījuma saņemšanas
 Permission1190=Apstiprināt (otro apstiprinājumu) pirkuma pasūtījumus
+Permission1191=Eksporta piegādātāju pasūtījumi un to atribūti
 Permission1201=Saņemt eksportēšanas rezultātu
 Permission1202=Izveidot/Modificēt eksportu
 Permission1231=Lasīt pārdevēja rēķinus
@@ -898,6 +915,8 @@ Permission1251=Palaist masveida importu ārējiem datiem datu bāzē (datu ielā
 Permission1321=Eksporta klientu rēķinus, atribūti un maksājumus
 Permission1322=Atkārtoti atvērt samaksāto rēķinu
 Permission1421=Eksporta pārdošanas pasūtījumi un atribūti
+Permission1521=Lasīt dokumentus
+Permission1522=Dzēst dokumentus
 Permission2401=Lasīt darbības (notikumus vai uzdevumus), kas saistītas ar viņa lietotāja kontu (ja notikuma īpašnieks vai tikai piešķirts)
 Permission2402=Izveidot / modificēt darbības (notikumus vai uzdevumus), kas saistītas ar viņa lietotāja kontu (ja notikuma īpašnieks)
 Permission2403=Dzēst darbības (notikumus vai uzdevumus), kas saistītas ar viņa lietotāja kontu (ja notikuma īpašnieks)
@@ -912,7 +931,7 @@ Permission2515=Iestatīt dokumentu direktorijas
 Permission2801=Lietot FTP klientu lasīšanas režīmā (pārlūko un lejupielādē)
 Permission2802=Lietot FTP klientu rakstīšanas režīmā (dzēst vai augšupielādēt failus)
 Permission3200=Lasīt arhivētos notikumus un pirkstu nospiedumus
-Permission3301=Generate new modules
+Permission3301=Ģenerējiet jaunus moduļus
 Permission4001=Skatīt darbiniekus
 Permission4002=Izveidot darbiniekus
 Permission4003=Dzēst darbiniekus
@@ -932,9 +951,13 @@ Permission23001=Apskatīt ieplānoto darbu
 Permission23002=Izveidot/atjaunot ieplānoto uzdevumu
 Permission23003=Dzēst ieplānoto uzdevumu
 Permission23004=Izpildīt ieplānoto uzdevumu
-Permission50101=Izmantot pārdošanas vietu
+Permission50101=Izmantot tirdzniecības vietu (SimplePOS)
+Permission50151=Izmantot tirdzniecības vietu (TakePOS)
 Permission50201=Lasīt darījumus
 Permission50202=Importēt darījumus
+Permission50330=Lasīt Zapier objektus
+Permission50331=Izveidot / atjaunināt Zapier objektus
+Permission50332=Dzēst Zapier objektus
 Permission50401=Iesiet produktus un rēķinus ar grāmatvedības kontiem
 Permission50411=Lasiet operācijas virsgrāmatā
 Permission50412=Rakstīt / rediģēt operācijas virsgrāmatā
@@ -958,6 +981,17 @@ Permission63001=Lasīt resursus
 Permission63002=Izveidot/labot resursus
 Permission63003=Dzēst resursus
 Permission63004=Saistīt resursus ar darba kārtības pasākumiem
+Permission64001=Atļaut tiešu drukāšanu
+Permission67000=Atļaut kvīšu drukāšanu
+Permission68001=Lasiet intracomm ziņojumu
+Permission68002=Izveidot / modificēt intracomm pārskatu
+Permission68004=Dzēst intracomm ziņojumu
+Permission941601=Lasīt kvītis
+Permission941602=Izveidojiet un modificējiet kvītis
+Permission941603=Apstiprināt kvītis
+Permission941604=Nosūtiet kvītis pa e-pastu
+Permission941605=Eksporta kvītis
+Permission941606=Dzēst kvītis
 DictionaryCompanyType=Trešās puses veidi
 DictionaryCompanyJuridicalType=Trešo pušu juridiskās personas
 DictionaryProspectLevel=Perspektējiet potenciālo līmeni uzņēmumiem
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Atvaļinājumu veidi
 DictionaryOpportunityStatus=Vadošais statuss projektu / vadībai
 DictionaryExpenseTaxCat=Izdevumu pārskats - transporta kategorijas
 DictionaryExpenseTaxRange=Izdevumu pārskats - diapazons pēc transporta kategorijas
+DictionaryTransportMode=Intracomm pārskats - transporta veids
+TypeOfUnit=Vienības veids
 SetupSaved=Iestatījumi saglabāti
 SetupNotSaved=Iestatīšana nav saglabāta
 BackToModuleList=Atpakaļ uz moduļu sarakstu
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label izmantots pēc noklusējuma, ja nav tulkojuma var atras
 LabelOnDocuments=Dokumentu marķējums
 LabelOrTranslationKey=Uzlīme vai tulkošanas taustiņš
 ValueOfConstantKey=Konfigurācijas konstantes vērtība
+ConstantIsOn=Iespējota opcija %s
 NbOfDays=Dienu skaits
 AtEndOfMonth=mēneša beigās
 CurrentNext=Pašreizējais / nākamais
@@ -1145,6 +1182,7 @@ InfoWebServer=Par tīmekļa serveri
 InfoDatabase=Par datubāzi
 InfoPHP=Par PHP
 InfoPerf=Par izpildījumiem
+InfoSecurity=About Security
 BrowserName=Pārlūkprogrammas nosaukums
 BrowserOS=Pārlūkprogrammas OS
 ListOfSecurityEvents=Saraksts ar Dolibarr drošības pasākumiem
@@ -1194,7 +1232,8 @@ RestoreDesc=Lai atjaunotu Dolibarr dublējumu, ir nepieciešamas divas darbības
 RestoreDesc2=Atjaunojiet kataloga "dokumenti" rezerves failu (piemēram, zip fails) jaunajā Dolibarr instalācijā vai šajā pašā dokumentu direktorijā (<b>%s</b>).
 RestoreDesc3=Atjaunojiet datu bāzes struktūru un datus no dublējuma faila jaunās Dolibarr instalācijas datu bāzē vai šīs pašreizējās instalācijas datubāzē (<b> %s </b>). Brīdinājums, kad atjaunošana ir pabeigta, jums ir jāizmanto pieteikumvārds / parole, kas pastāvēja no dublēšanas laika / instalācijas, lai vēlreiz izveidotu savienojumu. <br> Lai atjaunotu dublējuma datubāzi šajā pašreizējā instalācijā, varat sekot šim palīgam.
 RestoreMySQL=MySQL imports
-ForcedToByAModule= Šis noteikums ir spiests <b>%s</b> ar aktivēto modulis
+ForcedToByAModule=Šis noteikums ir spiests <b>%s</b> ar aktivēto modulis
+ValueIsForcedBySystem=Šo vērtību piespiež sistēma. Jūs to nevarat mainīt.
 PreviousDumpFiles=Esošie rezerves kopiju faili
 PreviousArchiveFiles=Esošie arhīva faili
 WeekStartOnDay=Nedēļas pirmā diena
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=Tiek ielādēts PHP komponents %s
 PreloadOPCode=Tiek izmantots iepriekš ielādēts OPCode
 AddRefInList=Rādīt klientu / pārdevēju ref. info saraksts (atlasiet sarakstu vai kombinēto) un lielākā daļa hipersaites. <br> Trešās puses parādīsies ar nosaukumu "CC12345 - SC45678 - Lielais uzņēmums". "Lielā uzņēmuma korpuss" vietā.
 AddAdressInList=Rādīt klienta / pārdevēja adrešu sarakstu (izvēlieties sarakstu vai kombināciju) <br> Trešās puses parādīsies ar nosaukumu "Lielās kompānijas korpuss - 21 lēkt iela 123456", nevis "Lielā uzņēmuma korpuss".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Pieprasiet vēlamo piegādes metodi trešajām pusēm.
 FieldEdition=Izdevums lauka %s
 FillThisOnlyIfRequired=Piemērs: +2 (aizpildiet tikai, ja sastopaties ar problēmām)
@@ -1282,7 +1322,7 @@ GetBarCode=Iegūt svītrukodu
 NumberingModules=Numerācijas modeļi
 DocumentModules=Dokumentu modeļi
 ##### Module password generation
-PasswordGenerationStandard=Atgriešanās paroli radīts saskaņā ar iekšējo Dolibarr algoritmu: 8 rakstzīmēm, kas satur kopīgos ciparus un rakstzīmes mazie burti.
+PasswordGenerationStandard=Atgrieziet paroli, kas ģenerēta saskaņā ar iekšējo Dolibarr algoritmu: %s rakstzīmes, kas satur kopīgus numurus un rakstzīmes mazajiem burtiem.
 PasswordGenerationNone=Neiesakām ģenerētu paroli. Parole jāieraksta manuāli.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=Saskaņā ar jūsu konfigurāciju
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Lai izveidotu jaunu dalībnieku, nepieciešams e-pasts
 MemberSendInformationByMailByDefault=Rūtiņu, lai nosūtītu pasta apstiprinājums locekļiem (validāciju vai jauns abonements) ir ieslēgts pēc noklusējuma
 VisitorCanChooseItsPaymentMode=Apmeklētājs var izvēlēties no pieejamiem maksājumu veidiem
 MEMBER_REMINDER_EMAIL=Iespējot automātisku atgādinājumu <b> pa e-pastu </b> par beidzies abonementi. Piezīme. Modulim <strong> %s </strong> jābūt iespējotai un pareizi iestatītai, lai nosūtītu atgādinājumus.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP iestatījumi
 LDAPGlobalParameters=Globālie parametri
@@ -1523,7 +1564,9 @@ LDAPDescValues=Piemērs vērtības ir paredzētas <b>OpenLDAP</b> ar šādām ie
 ForANonAnonymousAccess=Par apstiprinātu piekļuvi (par rakstīšanas piekļuvi piemēram)
 PerfDolibarr=Performance uzstādīšana / optimizēt ziņojums
 YouMayFindPerfAdviceHere=Šajā lapā ir sniegtas dažas pārbaudes vai ieteikumi saistībā ar veiktspēju.
-NotInstalled=Nav uzstādīts, tāpēc jūsu serveris netiek palēnināts ar to.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative kešatmiņa
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Līmenis
 SyslogFilename=Faila nosaukums un ceļš
 YouCanUseDOL_DATA_ROOT=Jūs varat izmantot DOL_DATA_ROOT / dolibarr.log uz log failu Dolibarr "dokumenti" direktorijā. Jūs varat iestatīt citu ceļu, lai saglabātu šo failu.
 ErrorUnknownSyslogConstant=Konstante %s nav zināma Syslog konstante
-OnlyWindowsLOG_USER=Windows atbalsta tikai LOG_USER
+OnlyWindowsLOG_USER=Operētājsistēmā Windows tiks atbalstīta tikai iespēja LOG_USER
 CompressSyslogs=Atkļūdošanas žurnāla failu saspiešana un dublēšana (ko ģenerē modulis Log par atkļūdošanu)
-SyslogFileNumberOfSaves=Žurnālfailu rezerves kopijas
+SyslogFileNumberOfSaves=Saglabājamo rezerves žurnālu skaits
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Konfigurējiet regulāro darbu tīrīšanu, lai iestatītu žurnāla dublēšanas biežumu
 ##### Donations #####
 DonationsSetup=Ziedojumu moduļa uzstādīšana
@@ -1629,7 +1672,7 @@ AdvancedEditor=Uzlabotais redaktors
 ActivateFCKeditor=Aktivizēt uzlabotos redaktoru:
 FCKeditorForCompany=WYSIWYG izveidi / izdevums no elementiem apraksta un piezīmi (izņemot produktu / pakalpojumu)
 FCKeditorForProduct=WYSIWYG radīšana / izdevums produktu / pakalpojumu apraksts un atzīmēt
-FCKeditorForProductDetails=WYSIWIG produktu izveides / izlaiduma detalizētu informāciju par visām vienībām (priekšlikumi, pasūtījumi, rēķini utt.). <font class="warning"> Brīdinājums: šīs opcijas izmantošana šajā gadījumā nav nopietni ieteicama, jo, veidojot PDF failus, tas var radīt problēmas ar īpašām rakstzīmēm un lapu formatējumu. </font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWYG izveide/ izdevums masveida emailings (Tools-> e-pastu)
 FCKeditorForUserSignature=WYSIWYG izveide/labošana lietotāja paraksta
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Krājumu moduļa iestatīšana
 IfYouUsePointOfSaleCheckModule=Ja jūs izmantojat Punkta pārdošanas moduli (POS), ko nodrošina pēc noklusējuma vai ārējais modulis, šo POS uzstādīšanu var ignorēt jūsu POS modulis. Lielākā daļa POS moduļu ir izveidoti pēc noklusējuma, lai nekavējoties izveidotu rēķinu un samazinātu krājumu neatkarīgi no iespējām šeit. Tātad, ja jums ir vai nav krājumu samazināšanās, reģistrējoties pārdošanai no jūsu POS, pārbaudiet arī POS moduļa iestatījumus.
 ##### Menu #####
 MenuDeleted=Izvēlne dzēsta
+Menu=Izvēlne
 Menus=Izvēlnes
 TreeMenuPersonalized=Personalizētas izvēlnes
 NotTopTreeMenuPersonalized=Personalizētas izvēlnes, kas nav saistītas ar augstāko izvēlnes ierakstu
 NewMenu=Jauna izvēlne
-Menu=Izvēlnes izvēlēšanās
 MenuHandler=Izvēlnes apstrādātājs
 MenuModule=Avota modulis
 HideUnauthorizedMenu= Slēpt neatļautās izvēlnes (pelēkas)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Veidojot notikuma veidlapu, automātiski iestatiet
 AGENDA_DEFAULT_FILTER_TYPE=Šādu pasākumu automātiski iestatīt darba kārtības skatā meklēšanas filtūrā
 AGENDA_DEFAULT_FILTER_STATUS=Automātiski iestatīt šo statusu notikumu skatīšanai darba filtru meklēšanas filtūrā
 AGENDA_DEFAULT_VIEW=Kuru skatu vēlaties atvērt pēc noklusējuma, izvēloties izvēlni Agenda
-AGENDA_REMINDER_EMAIL=Iespējot notikumu atgādinājumu <b> pa e-pastu </b> (atgādinājums par iespēju / kavēšanos var definēt katrā notikumā). Piezīme: modulis <strong> %s </strong> ir jāaktivizē un pareizi jāiestata, lai atgādinājums tiktu nosūtīts pareizā laikā.
-AGENDA_REMINDER_BROWSER=Iespējot notikuma atgādinājumu <b>lietotāja pārlūkā</b> (kad ir sasniegts notikuma datums, katrs lietotājs to var noraidīt no pārlūka apstiprinājuma jautājuma)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Iespējot skaņas paziņojumu
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Parādīt saistīto objektu darba kārtībā
 ##### Clicktodial #####
 ClickToDialSetup=Klikšķiniet lai  Dial moduļa uzstādīšanas
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0: Klienta maksājuma veids, 1: Pārdevēja maksājuma veids, 2:
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Moduļa izdevumu pārskatu iestatīšana
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Moduļa Expense Reports iestatīšana - Milles indekss
 ExpenseReportsRulesSetup=Moduļa Expense Reports iestatīšana - noteikumi
 ExpenseReportNumberingModules=Izdevumu pārskatu numerācijas modulis
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Pieņemšanas
 MailToThirdparty=Trešās puses
 MailToMember=Dalībnieki
 MailToUser=Lietotāji
-MailToProject=Projektu lapa
+MailToProject=Projekti
 MailToTicket=Pieteikumi
 ByDefaultInList=Rādīt pēc noklusējuma saraksta skatā
 YouUseLastStableVersion=Jūs izmantojat pēdējo stabilo versiju
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Ielādējiet trešo personu meklēšanu pakalpojumā %s (
 LoadThirdPartyFromNameOrCreate=Ielādējiet trešo personu meklēšanu pakalpojumā %s (izveidojiet, ja nav atrasts)
 WithDolTrackingID=Ziņojums no sarunas, kuru aizsāka pirmais e-pasts, kas nosūtīts no Dolibarr
 WithoutDolTrackingID=Ziņojums no sarunas, kuru aizsāka pirmais e-pasts, kuru NAV nosūtīts no Dolibarr
+WithDolTrackingIDInMsgId=Ziņojums nosūtīts no Dolibarr
+WithoutDolTrackingIDInMsgId=Ziņojums NAV nosūtīts no Dolibarr
 CreateCandidature=Izveidojiet kandidatūru
 FormatZip=Pasta indekss
 MainMenuCode=Izvēlnes ievades kods (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Atspējot funkciju, lai resursu saistītu ar kontakt
 EnableResourceUsedInEventCheck=Iespējot funkciju, lai pārbaudītu, vai notikumā tiek izmantots resurss
 ConfirmUnactivation=Apstipriniet moduļa atiestatīšanu
 OnMobileOnly=Tikai mazam ekrānam (viedtālrunim)
-DisableProspectCustomerType=Atspējojiet "Prospect + Customer" trešās puses veidu (tādēļ trešai personai jābūt Prospect vai Klientam, bet nevar būt abas)
+DisableProspectCustomerType=Atspējojiet trešās puses veidu “Persona + klients” (tātad trešajai pusei ir jābūt “Persona” vai “Klients”, taču tā nevar būt abas)
 MAIN_OPTIMIZEFORTEXTBROWSER=Vienkāršot saskarni neredzīgajiem
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Iespējojiet šo opciju, ja esat akls cilvēks, vai lietojat programmu no teksta pārlūkprogrammas, piemēram, Lynx vai Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Mainīt interfeisa krāsu vājredzīgam cilvēkam
@@ -1996,13 +2041,15 @@ UseDebugBar=Izmantojiet atkļūdošanas joslu
 DEBUGBAR_LOGS_LINES_NUMBER=Pēdējo žurnālu rindu skaits, kas jāsaglabā konsolē
 WarningValueHigherSlowsDramaticalyOutput=Brīdinājums, augstākas vērtības palēnina dramatisko izeju
 ModuleActivated=Modulis %s ir aktivizēts un palēnina saskarni
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Eksporta modeļi ir kopīgi ar visiem
 ExportSetup=Moduļa Eksportēšana iestatīšana
 ImportSetup=Moduļa importēšanas iestatīšana
 InstanceUniqueID=Unikāls gadījuma ID
 SmallerThan=Mazāks nekā
 LargerThan=Lielāks nekā
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Ņemiet vērā: ja objekta izsekošanas ID tiek atrasts e-pastā vai ja e-pasts ir atbilde uz e-pastu, kas ir savākts un saistīts ar objektu, izveidotais notikums tiks automātiski saistīts ar zināmo saistīto objektu.
 WithGMailYouCanCreateADedicatedPassword=Izmantojot GMail kontu, ja esat iespējojis 2 soļu validāciju, ieteicams izveidot īpašu lietojumprogrammas otro paroli, nevis izmantot sava konta caurlaides paroli no https://myaccount.google.com/.
 EmailCollectorTargetDir=Vēlama rīcība var būt e-pasta pārvietošana citā tagā / direktorijā, kad tas tika veiksmīgi apstrādāts. Vienkārši šeit iestatiet direktorijas nosaukumu, lai izmantotu šo funkciju (nelietojiet nosaukumā īpašās rakstzīmes). Ņemiet vērā, ka jāizmanto arī lasīšanas / rakstīšanas pieteikšanās konts.
 EmailCollectorLoadThirdPartyHelp=Varat izmantot šo darbību, lai izmantotu e-pasta saturu, lai atrastu un ielādētu esošu trešo personu savā datu bāzē. Atrasta (vai izveidota) trešā puse tiks izmantota sekojošām darbībām, kurām tā nepieciešama. Parametru laukā varat izmantot, piemēram, 'EXTRACT: BODY: Name: \\ s ([^ \\ s] *)', ja vēlaties iegūt trešās puses vārdu no atrastās virknes 'Name: name to find'. ķermenis.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=Skala ir to vietu skaits, kuras jums jāpārvieto aiz komata,
 TemplateAdded=Pievienota veidne
 TemplateUpdated=Veidne ir atjaunināta
 TemplateDeleted=Veidne ir izdzēsta
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Notikuma atgādinājuma e-pasts
+SwitchThisForABetterSecurity=Lai nodrošinātu lielāku drošību, ieteicams šo vērtību pārslēgt uz %s
+DictionaryProductNature= Produkta veids
+CountryIfSpecificToOneCountry=Valsts (ja tā ir konkrēta valsts)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/lv_LV/banks.lang b/htdocs/langs/lv_LV/banks.lang
index 4f61035b651..cf070821b46 100644
--- a/htdocs/langs/lv_LV/banks.lang
+++ b/htdocs/langs/lv_LV/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Dažādi maksājumi
 VariousPayments=Dažādi maksājumi
 ShowVariousPayment=Rādīt dažādus maksājumus
 AddVariousPayment=Pievienot dažādus maksājumu
+VariousPaymentId=Dažādu maksājumu ID
+VariousPaymentLabel=Dažādu maksājumu etiķete
+ConfirmCloneVariousPayment=Apstipriniet dažādu maksājumu klonu
 SEPAMandate=SEPA mandāts
 YourSEPAMandate=Jūsu SEPA mandāts
 FindYourSEPAMandate=Tas ir jūsu SEPA mandāts, lai pilnvarotu mūsu uzņēmumu veikt tiešā debeta pasūtījumu savai bankai. Atgriezt to parakstu (skenēt parakstīto dokumentu) vai nosūtīt pa pastu uz
@@ -176,3 +179,4 @@ BankColorizeMovement=Krāsojiet kustības
 BankColorizeMovementDesc=Ja šī funkcija ir iespējota, jūs varat izvēlēties īpašu fona krāsu debeta vai kredīta pārvietošanai
 BankColorizeMovementName1=Debeta kustības fona krāsa
 BankColorizeMovementName2=Kredīta aprites fona krāsa
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index 8b7fb54ed1a..8e6763b543f 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -531,6 +531,7 @@ TypeContact_invoice_supplier_external_SERVICE=Pārdevēja pakalpojuma kontakts
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Rēķins pēc situācijas
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -575,3 +576,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Piegādātāja rēķins ir izdzēsts
 UnitPriceXQtyLessDiscount=Vienības cena x Daudzums - Atlaide
 CustomersInvoicesArea=Klientu norēķinu zona
 SupplierInvoicesArea=Piegādātāja norēķinu zona
+FacParentLine=Rēķinu rindas vecāks
+SituationTotalRayToRest=Atlikušais maksājums bez nodokļa
+PDFSituationTitle=Situācija Nr. %d
+SituationTotalProgress=Kopējais progress %d %%
diff --git a/htdocs/langs/lv_LV/categories.lang b/htdocs/langs/lv_LV/categories.lang
index e971dcad433..db3681c7335 100644
--- a/htdocs/langs/lv_LV/categories.lang
+++ b/htdocs/langs/lv_LV/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tagu / kategoriju iestatīšana
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Ja opcija ir ieslēgta, pievienojot produktu apakškategorijai, produkts tiks pievienots arī vecākajai kategorijai.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Izvēlies sadaļu
-StocksCategoriesArea=Noliktavu kategoriju zona
-ActionCommCategoriesArea=Notikumu sadaļu zona
-WebsitePagesCategoriesArea=Lapa-konteineru kategoriju zona
+StocksCategoriesArea=Noliktavu kategorijas
+ActionCommCategoriesArea=Pasākumu kategorijas
+WebsitePagesCategoriesArea=Lapu konteineru kategorijas
 UseOrOperatorForCategories=Izmantojiet vai operatoru kategorijām
diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang
index 58d83a7fb6a..21c55893303 100644
--- a/htdocs/langs/lv_LV/companies.lang
+++ b/htdocs/langs/lv_LV/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof ID 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof ID 1 (Professional skaits)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof ID 1 (Federālā skaits)
 ProfId4CH=Prof Id 2 (Tirdzniecības Ieraksta numurs)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof ID 1 (RUT)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof ID 1 (USt.-IDNR)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof ID 1 (CIF / NIF)
 ProfId2ES=Prof Id 2 (Sociālās apdrošināšanas numurs)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate numurs)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof ID 1 (Sirēnas)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NBS, vecais APE)
 ProfId4FR=Prof Id 4 (RCS / RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Reģistrācijas numurs
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (RC)
 ProfId2MA=Id prof. 2 (PATENTE)
 ProfId3MA=Id prof. 3 (IF)
 ProfId4MA=Id prof. 4 (CNSS)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof ID 1 (RFC).
 ProfId2MX=Prof Id 2 (R.. P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummurs
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof ID 1 (NIPC)
 ProfId2PT=Prof Id 2 (Sociālās apdrošināšanas numurs)
 ProfId3PT=Prof Id 3 (Tirdzniecības Ieraksta numurs)
 ProfId4PT=Prof Id 4 (konservatorija)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=1. prof. ID (CUI)
 ProfId2RO=Prof Id 2 (Nr. Manmatriculare)
 ProfId3RO=3. profils (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof ID 1 (BIN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=Jūs varat manuāli pārbaudīt arī Eiropas Komisijas vietn
 ErrorVATCheckMS_UNAVAILABLE=Pārbaude nav iespējams. Pārbaudes pakalpojums netiek nodrošināts no dalībvalsts (%s).
 NorProspectNorCustomer=Nav izredzes, ne klients
 JuridicalStatus=Juridiskās personas veids
+Workforce=Darbaspēks
 Staff=Darbinieki
 ProspectLevelShort=Potenciāls
 ProspectLevel=Prospect potenciālu
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Maksājumu termiņš - pārdevējs
 PaymentTypeBoth=Maksājuma veids - klients un pārdevējs
 MulticurrencyUsed=Izmantojiet multivalūtu
 MulticurrencyCurrency=Valūta
+InEEC=Eiropa (EEK)
+RestOfEurope=Pārējā Eiropa (EEK)
+OutOfEurope=Ārpus Eiropas (EEK)
+CurrentOutstandingBillLate=Pašreizējais nesamaksātais rēķins ir nokavēts
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Esiet piesardzīgs, atkarībā no produkta cenas iestatījumiem, pirms produkta pievienošanas POS, jums jāmaina trešā puse.
diff --git a/htdocs/langs/lv_LV/cron.lang b/htdocs/langs/lv_LV/cron.lang
index 7909986972d..4cca272f272 100644
--- a/htdocs/langs/lv_LV/cron.lang
+++ b/htdocs/langs/lv_LV/cron.lang
@@ -14,6 +14,7 @@ FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
 CronExplainHowToRunWin=Microsoft (tm) Windows vidē jūs varat izmantot Scheduled Task rīkus, lai palaistu komandrindu ik pēc 5 minūtēm
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=%s klases %s metode ir aizliegto metožu melnajā sarakstā
 CronJobDefDesc=Cron darba profili ir definēti moduļa deskriptora failā. Kad modulis ir aktivizēts, tie ir ielādēti un pieejami, lai jūs varētu administrēt darbus no admin instrumentu izvēlnes %s.
 CronJobProfiles=Iepriekš noteiktu cron darba profilu saraksts
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Palaizšanas skaits
 CronMaxRun=Maksimālais startu skaits
 CronEach=Katru
 JobFinished=Darbs uzsākts un pabeigts
+Scheduled=Plānots
 #Page card
 CronAdd= Pievienot darbu
 CronEvery=Izpildīt katru darbu
@@ -56,12 +58,12 @@ CronNote=Komentārs
 CronFieldMandatory=Lauki %s ir obligāti
 CronErrEndDateStartDt=Beigu datums nevar būt pirms sākuma datuma
 StatusAtInstall=Statuss moduļa instalācijā
-CronStatusActiveBtn=Ieslēgt
+CronStatusActiveBtn=Grafiks
 CronStatusInactiveBtn=Izslēgt
 CronTaskInactive=Šis darbs ir izslēgts
 CronId=Id
-CronClassFile=Filename with class
-CronModuleHelp=Dolibarr moduļu direktorijas nosaukums (arī darbojas ar ārēju Dolibarr moduli). <BR> Piemēram, lai izsauktu Dolibarr produkta objekta /htdocs/<uproduct</u>/class/product.class.php iegūšanas metodi, moduļa vērtība ir <br> <i> produkts </i>
+CronClassFile=Faila nosaukums ar klasi
+CronModuleHelp=Dolibarr moduļu direktorijas nosaukums (arī darbojas ar ārēju Dolibarr moduli). <BR> Piemēram, lai izsauktu Dolibarr produkta objektu /htdocs/<u>product</u>/class/product.class.php iegūšanas metodi, moduļa vērtība ir <br> <i>produkts</i>
 CronClassFileHelp=Relatīvais ceļš un faila nosaukums ielādei (ceļš ir salīdzinājumā ar tīmekļa servera saknes direktoriju). <BR> Piemēram, lai izsauktu Dolibarr produkta objekta htdocs / product / class / <u> product.class.php </ u> iegūšanas metodi, klases faila nosaukuma vērtība ir <br> <i> produkts / klase / product.class.php </ i>
 CronObjectHelp=Objekta nosaukums ielādei. <BR> Piemēram, lai izsauktu Dolibarr Produkta objekta /htdocs/product/class/product.class.php ielādes metodi, klases faila nosaukuma vērtība ir <br> <i> Produkts </ i>
 CronMethodHelp=Objekta metode, lai palaistu. <BR> Piemēram, lai izsauktu Dolibarr Produkta objekta /htdocs/product/class/product.class.php iegūšanas metodi, metodes vērtība ir <br> <i> atnest </ i>
@@ -72,12 +74,13 @@ CronFrom=No
 # Info
 # Common
 CronType=Darba veids
-CronType_method=PHP klases zvana metode
+CronType_method=PHP klases izsaukšanas metode
 CronType_command=Shell komanda
 CronCannotLoadClass=Nevar ielādēt klases failu %s (izmantot klasi %s)
 CronCannotLoadObject=Klases fails %s tika ielādēts, bet objekts %s tajā netika atrasts
-UseMenuModuleToolsToAddCronJobs=Lai skatītu un rediģētu ieplānotās darbavietas, dodieties uz izvēlni "Sākums - Administratora rīki - Plānotās darbavietas".
+UseMenuModuleToolsToAddCronJobs=Lai redzētu un rediģētu ieplānotos darbus, dodieties uz izvēlni <a href="%s">Sākums - Administratora rīki - Plānotie darbi</a>.
 JobDisabled=Darbs ir atspējots
 MakeLocalDatabaseDumpShort=Lokālās datu bāzes dublēšana
 MakeLocalDatabaseDump=Izveidojiet vietējo datubāzes dump. Parametri ir: kompresija ("gz" vai "bz" vai "neviens"), dublēšanas veids ("mysql", "pgsql", "auto"), 1, "auto" vai faila nosaukums,
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Datu tīrītājs un anonimizators
diff --git a/htdocs/langs/lv_LV/ecm.lang b/htdocs/langs/lv_LV/ecm.lang
index 73d2f5e457d..15b962b9de2 100644
--- a/htdocs/langs/lv_LV/ecm.lang
+++ b/htdocs/langs/lv_LV/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Meklēt pēc atslēgvārdiem
 ECMSearchByEntity=Meklēt pēc objekta
 ECMSectionOfDocuments=Dokumentu sadaļas
 ECMTypeAuto=Automātiski
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Dokumenti, kas saistīti ar trešajām personām
-ECMDocsByProposals=Dokumenti, kas saistīti ar priekšlikumiem
-ECMDocsByOrders=Dokumenti, kas saistīti ar klientu pasūtījumiem
-ECMDocsByContracts=Dokumenti, kas saistīti ar līgumiem
-ECMDocsByInvoices=Dokumenti, kas saistīti ar klientu rēķiniem
-ECMDocsByProducts=Dokumenti, kas saistīti ar produktiem
-ECMDocsByProjects=Dokumenti, kas saistīti ar projektiem
-ECMDocsByUsers=Ar lietotājiem saistītie dokumenti
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Ar izdevumu ziņojumiem saistītie dokumenti
-ECMDocsByHolidays=Ar brīvdienām saistītie dokumenti
-ECMDocsBySupplierProposals=Dokumenti, kas saistīti ar pārdevēja priekšlikumiem
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=Nav izveidots katalogs
 ShowECMSection=Rādīt katalogu
 DeleteSection=Dzēst direktoriju
@@ -50,3 +38,6 @@ ReSyncListOfDir=Pārsinhronizēt sadaļu sarakstu
 HashOfFileContent=Faila kontrolsumma
 NoDirectoriesFound=Nav atrastas direktorijas
 FileNotYetIndexedInDatabase=Fails vēl nav indeksēts datu bāzē (mēģiniet to atkārtoti augšupielādēt).
+ExtraFieldsEcmFiles=Extrafields Ecm failus
+ExtraFieldsEcmDirectories=Extrafields Ecm direktoriji
+ECMSetup=ECM iestatīšana
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index 43bb39dad54..033f9ff15e9 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -5,6 +5,7 @@ NoErrorCommitIsDone=Nav kļūda, mēs apstiprinam
 # Errors
 ErrorButCommitIsDone=Kļūdas atrasta, bet mēs apstiprinājām neskatoties uz to
 ErrorBadEMail=E-pasts %s ir nepareizs
+ErrorBadMXDomain=E-pasts %s nepareizs (domēnam nav derīga MX ieraksta)
 ErrorBadUrl=Url %s ir nepareizs
 ErrorBadValueForParamNotAString=Jūsu parametra nepareiza vērtība. Tas parasti parādās, ja trūkst tulkojuma.
 ErrorLoginAlreadyExists=Lietotājs %s jau pastāv.
@@ -216,7 +217,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Jums ir jāizvēlas, vai raksts i
 ErrorDiscountLargerThanRemainToPaySplitItBefore=Atlaide, kuru mēģināt piemērot, ir lielāka par atlikušo samaksu. Sadaliet atlaidi 2 mazākās atlaidēs pirms tam.
 ErrorFileNotFoundWithSharedLink=Fails netika atrasts. Var mainīt koplietošanas atslēgu vai nesen izņemt failu.
 ErrorProductBarCodeAlreadyExists=Produkta svītrkoda %s jau pastāv citā produkta atsaucei.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Ņemiet vērā arī, ka virtuālā produkta izmantošana, lai automātiski palielinātu vai samazinātu subproduktus, nav iespējama, ja vismaz vienam produktam (vai blakusproduktam) ir nepieciešams sērijas / partijas numurs.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Ņemiet vērā arī to, ka komplektu izmantošana apakšproduktu automātiskai palielināšanai / samazināšanai nav iespējama, ja vismaz vienam apakšproduktam (vai apakšproduktu apakšproduktam) ir nepieciešams sērijas / partijas numurs.
 ErrorDescRequiredForFreeProductLines=Apraksts ir obligāts līnijām ar bezmaksas produktu
 ErrorAPageWithThisNameOrAliasAlreadyExists=Lapā / konteinerā <strong> %s </strong>ir tāds pats nosaukums vai alternatīvs aizstājvārds, kuru izmantojat
 ErrorDuringChartLoad=Kļūda, ielādējot kontu diagrammu. Ja daži konti netika ielādēti, tos joprojām varat ievadīt manuāli.
@@ -243,6 +244,8 @@ ErrorReplaceStringEmpty=Kļūda: aizvietojamā virkne ir tukša
 ErrorProductNeedBatchNumber=Kļūda, produktam “<b> %s </b>” ir nepieciešama partija / sērijas numurs
 ErrorProductDoesNotNeedBatchNumber=Kļūda, produkts '<b> %s </b>' nepieņem partiju / sērijas numuru
 ErrorFailedToReadObject=Kļūda, neizdevās nolasīt <b> tipa objektu. %s
+ErrorParameterMustBeEnabledToAllwoThisFeature=Kļūda, parametram <b> %s </b> jābūt iespējotam <b> conf / conf.php <b>, lai iekšējais darba plānotājs varētu izmantot komandrindas saskarni
+ErrorLoginDateValidity=Kļūda, šī pieteikšanās ir ārpus derīguma datumu diapazona
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Jūsu PHP parametrs upload_max_filesize (%s) ir augstāks nekā PHP parametrs post_max_size (%s). Šī nav konsekventa iestatīšana.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +270,9 @@ WarningYourLoginWasModifiedPleaseLogin=Jūsu pieteikšanās tika mainīta. Droš
 WarningAnEntryAlreadyExistForTransKey=Šīs valodas tulkošanas taustiņam jau ir ieraksts
 WarningNumberOfRecipientIsRestrictedInMassAction=Brīdinājums, ja izmantojat masveida darbību sarakstos, saņēmēju skaits ir ierobežots <b>%s</b>
 WarningDateOfLineMustBeInExpenseReportRange=Brīdinājums, rindas datums nav izdevumu pārskata diapazonā
+WarningProjectDraft=Projekts joprojām ir melnraksta režīmā. Neaizmirstiet to apstiprināt, ja plānojat izmantot uzdevumus.
 WarningProjectClosed=Projekts ir slēgts. Vispirms vispirms atveriet to.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Daži bankas darījumi tika noņemti pēc tam, kad tika ģenerēta kvīts ar tiem. Tātad pārbaužu skaits un kopējais saņemto dokumentu skaits var atšķirties no sarakstā norādīto skaita un kopskaita.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, neizdevās pievienot faila ierakstu ECM datu bāzes indeksu tabulā
+WarningFailedToAddFileIntoDatabaseIndex=Brīdinājums, neizdevās pievienot faila ierakstu ECM datu bāzes rādītāju tabulā
+WarningTheHiddenOptionIsOn=Brīdinājums: slēpta opcija <b> %s </b> ir ieslēgta.
+WarningCreateSubAccounts=Brīdinājums: jūs nevarat izveidot tieši apakškontu, jums ir jāizveido trešā puse vai lietotājs un jāpiešķir viņiem grāmatvedības kods, lai tos atrastu šajā sarakstā
diff --git a/htdocs/langs/lv_LV/hrm.lang b/htdocs/langs/lv_LV/hrm.lang
index b3cf76f135c..20a92e2c4c7 100644
--- a/htdocs/langs/lv_LV/hrm.lang
+++ b/htdocs/langs/lv_LV/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - darba vietas
 Employees=Darbinieki
 Employee=Darbinieks
 NewEmployee=Jauns darbinieks
+ListOfEmployees=Darbinieku saraksts
diff --git a/htdocs/langs/lv_LV/install.lang b/htdocs/langs/lv_LV/install.lang
index e7d0c6667ef..67c9a428d18 100644
--- a/htdocs/langs/lv_LV/install.lang
+++ b/htdocs/langs/lv_LV/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Konfigurācijas failā <b>%s</b>  nevar ierakstīt. Pārba
 ConfFileIsWritable=Konfigurācijas failā <b>%s</b> var ierakstīt.
 ConfFileMustBeAFileNotADir=Konfigurācijas failam <b> %s </b> jābūt failam, nevis direktorijai.
 ConfFileReload=Pārsūtot parametrus no konfigurācijas faila.
-PHPSupportSessions=PHP atbalsta sesijas.
 PHPSupportPOSTGETOk=PHP atbalsta mainīgos POST un GET.
 PHPSupportPOSTGETKo=Iespējams, ka jūsu PHP iestatīšana neatbalsta mainīgos POST un/vai GET. Pārbaudiet parametru <b>variables_order</b> php.ini.
-PHPSupportGD=Šis PHP atbalsta GD grafiskās funkcijas.
-PHPSupportCurl=Šis PHP atbalsta Curl.
-PHPSupportCalendar=Šis PHP atbalsta kalendāru paplašinājumus.
-PHPSupportUTF8=Šis PHP atbalsta UTF8 funkcijas.
-PHPSupportIntl=Šī PHP atbalsta Intl funkcijas.
-PHPSupportxDebug=Šis PHP atbalsta paplašinātas atkļūdošanas funkcijas.
+PHPSupportSessions=PHP atbalsta sesijas.
 PHPSupport=Šis PHP atbalsta %s funkcijas.
 PHPMemoryOK=Jūsu PHP maksimālā sesijas atmiņa ir iestatīts uz <b>%s.</b> Tas ir pietiekami.
 PHPMemoryTooLow=Jūsu PHP max sesijas atmiņa ir iestatīta uz <b>%s</b> baitiem. Tas ir pārāk zems. Mainiet <b>php.ini</b>, lai iestatītu <b>memory_limit</b> parametru vismaz <b> %s </b> baitiem.
diff --git a/htdocs/langs/lv_LV/intracommreport.lang b/htdocs/langs/lv_LV/intracommreport.lang
new file mode 100644
index 00000000000..391304dc1d7
--- /dev/null
+++ b/htdocs/langs/lv_LV/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm ziņojums
+Module68000Desc = Intracomm ziņojumu pārvaldība (atbalsts franču DEB / DES formātam)
+IntracommReportSetup = Iekšējās atskaites moduļa iestatīšana
+IntracommReportAbout = Par iekšziņojumu
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Tips d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les ievads
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm ziņojums
+MenuIntracommReportNew=Jauna deklarācija
+MenuIntracommReportList=Saraksts
+
+# View
+NewDeclaration=Jauna deklarācija
+Declaration=Deklarācija
+AnalysisPeriod=Analīzes periods
+TypeOfDeclaration=Deklarācijas veids
+DEB=Preču apmaiņas deklarācija (DEB)
+DES=Pakalpojumu apmaiņas deklarācija (DES)
+
+# Export page
+IntracommReportTitle=XML faila sagatavošana ProDouane formātā
+
+# List
+IntracommReportList=Ģenerēto deklarāciju saraksts
+IntracommReportNumber=Deklarācijas numurs
+IntracommReportPeriod=Nalīzes periods
+IntracommReportTypeDeclaration=Deklarācijas veids
+IntracommReportDownload=lejupielādēt XML failu
+
+# Invoice
+IntracommReportTransportMode=Transporta veids
diff --git a/htdocs/langs/lv_LV/languages.lang b/htdocs/langs/lv_LV/languages.lang
index 513c7c95a56..849292e69c4 100644
--- a/htdocs/langs/lv_LV/languages.lang
+++ b/htdocs/langs/lv_LV/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spāņu (Panama)
 Language_es_PY=Spāņu (Paragvaja)
 Language_es_PE=Spāņu (Peru)
 Language_es_PR=Spāņu (Puertoriko)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spāņu (Urugvaja)
 Language_es_GT=Spāņu (Gvatemala)
 Language_es_VE=Spāņu (Venecuēla)
diff --git a/htdocs/langs/lv_LV/mails.lang b/htdocs/langs/lv_LV/mails.lang
index f8975257031..24e05670a05 100644
--- a/htdocs/langs/lv_LV/mails.lang
+++ b/htdocs/langs/lv_LV/mails.lang
@@ -125,12 +125,13 @@ TagMailtoEmail=Saņēmēja e-pasta adrese (ieskaitot html "mailto:" saiti)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Paziņojumi
-NoNotificationsWillBeSent=Nav e-pasta paziņojumi ir plānota šī notikuma, un uzņēmums
-ANotificationsWillBeSent=1 paziņojums tiks nosūtīts pa e-pastu
-SomeNotificationsWillBeSent=%s paziņojumi tiks nosūtīti pa e-pastu
-AddNewNotification=Aktivizējiet jaunu e-pasta paziņojuma mērķi/notikumu
-ListOfActiveNotifications=Uzskaitiet visus aktīvos mērķus/notikumus e-pasta paziņojumam
-ListOfNotificationsDone=Uzskaitīt visus e-pasta nosūtītos paziņojumus
+NotificationsAuto=Paziņojumi Automātiski.
+NoNotificationsWillBeSent=Šim notikuma veidam un uzņēmumam nav plānoti automātiski e-pasta paziņojumi
+ANotificationsWillBeSent=1 automātisks paziņojums tiks nosūtīts pa e-pastu
+SomeNotificationsWillBeSent=%s automātiskie paziņojumi tiks nosūtīti pa e-pastu
+AddNewNotification=Aktivizējiet jaunu automātisko e-pasta paziņojumu mērķi / notikumu
+ListOfActiveNotifications=Uzskaitiet visus aktīvos mērķus / notikumus automātiskai e-pasta paziņošanai
+ListOfNotificationsDone=Uzskaitiet visus nosūtītos automātiskos e-pasta paziņojumus
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -162,13 +163,14 @@ AdvTgtCreateFilter=Izveidot filtru
 AdvTgtOrCreateNewFilter=Jauna filtra nosaukums
 NoContactWithCategoryFound=Nav kontaktpersonas / adreses ar atrastu kategoriju
 NoContactLinkedToThirdpartieWithCategoryFound=Nav kontaktpersonas / adreses ar atrastu kategoriju
-OutGoingEmailSetup=Izejošā e-pasta iestatīšana
-InGoingEmailSetup=Ienākošā e-pasta iestatīšana
-OutGoingEmailSetupForEmailing=Izejošā e-pasta iestatīšana (modulim %s)
-DefaultOutgoingEmailSetup=Noklusējuma izejošā e-pasta iestatīšana
+OutGoingEmailSetup=Izejošie e-pasti
+InGoingEmailSetup=Ienākošie e-pasti
+OutGoingEmailSetupForEmailing=Izejošie e-pasti (modulim %s)
+DefaultOutgoingEmailSetup=Tāda pati konfigurācija kā globālā izejošā e-pasta iestatīšana
 Information=Informācija
 ContactsWithThirdpartyFilter=Kontakti ar trešās puses filtru
 Unanswered=Neatbildēts
 Answered=Atbildēts
 IsNotAnAnswer=Nav atbildes (sākotnējais e-pasts)
 IsAnAnswer=Vai ir atbilde uz sākotnējo e-pastu
+RecordCreatedByEmailCollector=Ierakstu izveidojis e-pasta savācējs %s no e-pasta %s
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index 93b12e1a730..3f1950cb761 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Noņemt saiti
 AddToDraft=Pievienot melnrakstiem
 Update=Atjaunot
 Close=Aizvērt
+CloseAs=Iestatīt statusu uz
 CloseBox=Noņemiet logrīku no sava informācijas paneļa
 Confirm=Apstiprināt
 ConfirmSendCardByMail=Vai tiešām vēlaties nosūtīt šīs kartes saturu pa pastu uz <b> %s </b>?
@@ -196,6 +197,7 @@ ReOpen=Atvērt pa jaunu
 Upload=Augšupielādēt
 ToLink=Saite
 Select=Atlasīt
+SelectAll=Select all
 Choose=Izvēlēties
 Resize=Samazināt
 ResizeOrCrop=Mainīt izmērus vai apgriezt
@@ -256,6 +258,7 @@ Cards=Kartes
 Card=Karte
 Now=Tagad
 HourStart=Sākuma stunda
+Deadline=Deadline
 Date=Datums
 DateAndHour=Datums un laiks
 DateToday=Šodienas datums
@@ -264,8 +267,10 @@ DateStart=Sākuma datums
 DateEnd=Beigu datums
 DateCreation=Izveidošanas datums
 DateCreationShort=Izv. datums
+IPCreation=Creation IP
 DateModification=Labošanas datums
 DateModificationShort=Modif. datums
+IPModification=Modification IP
 DateLastModification=Jaunākais labošanas datums
 DateValidation=Apstiprināšanas datums
 DateClosing=Beigu datums
@@ -319,6 +324,7 @@ Morning=Rīts
 Afternoon=Vakars
 Quadri=Kvadrāt-
 MonthOfDay=Mēneša laikā no dienas
+DaysOfWeek=Nedēļas dienas
 HourShort=H
 MinuteShort=mn
 Rate=Likme
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Maksājuma summa, oriģinālajā valūtā
 MulticurrencyAmountHT=Summa (bez nodokļa), sākotnējā valūta
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Daudzuma apakšcenas daudzvalūta
 AmountLT1=Nodokļa summa 2
 AmountLT2=Nodokļa summa 3
 AmountLT1ES=Summa RE
@@ -487,6 +494,7 @@ By=Līdz
 From=No
 FromDate=No
 FromLocation=No
+at=plkst
 to=līdz
 To=līdz
 and=un
@@ -509,6 +517,7 @@ Draft=Melnraksts
 Drafts=Melnraksti
 StatusInterInvoiced=Rēķins
 Validated=Apstiprināts
+ValidatedToProduce=Apstiprināts (ražot)
 Opened=Atvērt
 OpenAll=Atvērti (visi)
 ClosedAll=Slēgti (visi)
@@ -655,6 +664,7 @@ Response=Atbilde
 Priority=Prioritāte
 SendByMail=Sūtīt ar e-pastu
 MailSentBy=Nosūtīts e-pasts ar
+NotSent=Nav nosūtīts
 TextUsedInTheMessageBody=E-pasta ķermenis
 SendAcknowledgementByMail=Sūtīt apstiprinājuma e-pastu
 SendMail=Sūtīt e-pastu
@@ -836,6 +846,7 @@ ListOfTemplates=Saraksts ar veidnēm
 Gender=Dzimums
 Genderman=Vīrietis
 Genderwoman=Sieviete
+Genderother=Cits
 ViewList=Saraksta skats
 ViewGantt=Ganta skats
 ViewKanban=Kanban skats
@@ -877,6 +888,8 @@ Miscellaneous=Dažādi
 Calendar=Kalendārs
 GroupBy=Kārtot pēc...
 ViewFlatList=Skatīt plakanu sarakstu
+ViewAccountList=Skatīt virsgrāmatu
+ViewSubAccountList=Skatīt apakškonta virsgrāmatu
 RemoveString=Noņemt virkni '%s'
 SomeTranslationAreUncomplete=Dažas piedāvātās valodas var būt tikai daļēji tulkotas vai var saturēt kļūdas. Lūdzu, palīdziet labot savu valodu, reģistrējoties <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a>, lai pievienotu savus uzlabojumus.
 DirectDownloadLink=Tiešā lejupielādes saite (publiska / ārēja)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Klientu sūtījumi
 SearchIntoExpenseReports=Izdevumu atskaites
 SearchIntoLeaves=Atvaļinājumi
 SearchIntoTickets=Pieteikumi
+SearchIntoCustomerPayments=Klientu maksājumi
+SearchIntoVendorPayments=Pārdevēja maksājumi
+SearchIntoMiscPayments=Dažādi maksājumi
 CommentLink=Komentāri
 NbComments=Komentāru skaits
 CommentPage=Komentāru telpa
@@ -1076,10 +1092,18 @@ NotUsedForThisCustomer=Nav izmantots šim klientam
 AmountMustBePositive=Summai jābūt pozitīvai
 ByStatus=Pēc statusa
 InformationMessage=Informācija
-Used=Used
+Used=Lietots
 ASAP=Tik drīz cik vien iespējams
-CREATEInDolibarr=Record %s create
-MODIFYInDolibarr=Record %s modified
-DELETEInDolibarr=Record %s deleted
-VALIDATEInDolibarr=Record %s validated
-APPROVEDInDolibarr=Record %s approved
+CREATEInDolibarr=Izveidots ieraksts %s
+MODIFYInDolibarr=Ieraksts modificēts %s
+DELETEInDolibarr=Ieraksts %s izdzēsts
+VALIDATEInDolibarr=Ieraksts %s validēts
+APPROVEDInDolibarr=Ieraksts %s apstiprināts
+DefaultMailModel=Noklusējuma pasta modelis
+PublicVendorName=Pārdevēja publiskais nosaukums
+DateOfBirth=Dzimšanas datums
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Drošības pilnvaras derīguma termiņš ir beidzies, tāpēc darbība ir atcelta. Lūdzu mēģiniet vēlreiz.
+UpToDate=Aktuāls
+OutOfDate=Novecojis
+EventReminder=Atgādinājums par notikumu
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/lv_LV/members.lang b/htdocs/langs/lv_LV/members.lang
index 44bee5feaef..fdb1ac592bf 100644
--- a/htdocs/langs/lv_LV/members.lang
+++ b/htdocs/langs/lv_LV/members.lang
@@ -19,14 +19,12 @@ MembersCards=Dalībnieku vizītkartes
 MembersList=Dalībnieku saraksts
 MembersListToValid=Saraksts projektu dalībnieki (tiks apstiprināts)
 MembersListValid=Derīgo dalībnieku saraksts
-MembersListUpToDate=Saraksts derīgiem locekļiem ar līdz šim abonementu
-MembersListNotUpToDate=Saraksts derīgiem locekļiem ar abonementu novecojis
+MembersListUpToDate=Derīgu dalībnieku saraksts ar atjauninātu abonementu
+MembersListNotUpToDate=Derīgo dalībnieku saraksts ar novecojušu abonementu
 MembersListResiliated=Dzēsto dalībnieku saraksts
 MembersListQualified=Saraksts kvalificētiem locekļiem
 MenuMembersToValidate=Projektu dalībnieki
 MenuMembersValidated=Apstiprināti biedri
-MenuMembersUpToDate=Aktuālie dalībnieki
-MenuMembersNotUpToDate=Novecojušie dalībnieki
 MenuMembersResiliated=Izslēgtie dalībnieki
 MembersWithSubscriptionToReceive=Dalībniekiem ar abonementu, lai saņemtu
 MembersWithSubscriptionToReceiveShort=Abonēšana saņemt
@@ -34,6 +32,7 @@ DateSubscription=Abonēšanas datums
 DateEndSubscription=Abonēšanas beigu datums
 EndSubscription=Beigt abonementu
 SubscriptionId=Abonēšana id
+WithoutSubscription=Bez abonēšanas
 MemberId=Dalībnieka id
 NewMember=Jauns dalībnieks
 MemberType=Dalībnieka veids
@@ -81,7 +80,7 @@ DeleteType=Dzēst
 VoteAllowed=Balsot atļauts
 Physical=Fizisks
 Moral=Morāls
-MorPhy=Daba
+MorAndPhy=Moral and Physical
 Reenable=Atkārtoti ieslēdzams
 ResiliateMember=Izslēgt dalībnieku
 ConfirmResiliateMember=Vai tiešām vēlaties pārtraukt šo dalībnieku?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=E-pasta sūtīšana jauno dalībnieku apstiprinā
 SendingEmailOnNewSubscription=E-pasta sūtīšana uz jaunu abonementu
 SendingReminderForExpiredSubscription=Atgādinājuma nosūtīšana par abonementu beigu datumu
 SendingEmailOnCancelation=E-pasta sūtīšana par atcelšanu
+SendingReminderActionComm=Tiek nosūtīts atgādinājums par dienas kārtības pasākumu
 # Topic of email templates
 YourMembershipRequestWasReceived=Jūsu dalība tika saņemta.
 YourMembershipWasValidated=Jūsu dalība tika apstiprināta
@@ -167,6 +167,7 @@ MembersStatisticsByState=Dalībnieku statistika pēc štatiem/provincēm
 MembersStatisticsByTown=Dalībnieku statistika pa pilsētām
 MembersStatisticsByRegion=Dalībnieku statistika pa reģioniem
 NbOfMembers=Biedru skaits
+NbOfActiveMembers=Pašreizējo aktīvo dalībnieku skaits
 NoValidatedMemberYet=Nav apstiprinātas locekļi atrasti
 MembersByCountryDesc=Šis ekrāns parādīs statistiku par biedriem pa valstīm. Grafiskais tomēr ir atkarīga Google tiešsaistes grafiku pakalpojums un ir pieejama tikai tad, ja interneta pieslēgums darbojas.
 MembersByStateDesc=Šis ekrāns parādīs statistiku par dalībniekiem, valsts / provinces / Canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistika
 LastMemberDate=Pēdējā biedra datums
 LatestSubscriptionDate=Jaunākais piereģistrēšanās datums
 MemberNature=Dalībnieka raksturs
+MembersNature=Nature of members
 Public=Informācija ir publiska
 NewMemberbyWeb=Jauns dalībnieks pievienots. Gaida apstiprinājumu
 NewMemberForm=Jauna dalībnieka forma
diff --git a/htdocs/langs/lv_LV/mrp.lang b/htdocs/langs/lv_LV/mrp.lang
index d55d005dbd0..bf03d346a2e 100644
--- a/htdocs/langs/lv_LV/mrp.lang
+++ b/htdocs/langs/lv_LV/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Ražošanas pasūtījumi
-MO=Ražošanas pasūtījums
-MOs=Manufacturing orders
+MOs=Ražošanas pasūtījumi
+ManufacturingOrder=Ražošanas pasūtījums
 MRPDescription=Ražošanas un ražošanas pasūtījumu (MO) pārvaldības modulis.
 MRPArea=MRP apgabals
 MrpSetupPage=MRP moduļa iestatīšana
@@ -76,3 +76,5 @@ ProductsToProduce=Izgatavojamie produkti
 UnitCost=Vienības cena
 TotalCost=Kopējās izmaksas
 BOMTotalCost=Šīs BOM izgatavošanas izmaksas, pamatojoties uz katra patērētā daudzuma un produkta izmaksām (izmantojiet pašizmaksu, ja tā ir noteikta, cita - vidējā svērtā cena, ja ir noteikta, citur - labākā pirkuma cena).
+GoOnTabProductionToProduceFirst=Vispirms jums ir jāsāk ražošana, lai aizvērtu ražošanas pasūtījumu (sk. Cilni '%s'). Bet jūs varat to atcelt.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/lv_LV/multicurrency.lang b/htdocs/langs/lv_LV/multicurrency.lang
index cb7103d1f51..8343a83afde 100644
--- a/htdocs/langs/lv_LV/multicurrency.lang
+++ b/htdocs/langs/lv_LV/multicurrency.lang
@@ -20,3 +20,19 @@ MulticurrencyPaymentAmount=Maksājuma summa, oriģinālajā valūtā
 AmountToOthercurrency=Summa līdz (konta saņemšanas valūtā)
 CurrencyRateSyncSucceed=Valūtas kursa sinhronizācija ir veiksmīga
 MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Maksājumiem tiešsaistē izmantojiet dokumenta valūtu
+TabTitleMulticurrencyRate=Likmju saraksts
+ListCurrencyRate=Valūtas maiņas kursu saraksts
+CreateRate=Izveidojiet likmi
+FormCreateRate=Likmju veidošana
+FormUpdateRate=Likmes modifikācija
+successRateCreate=Valūtas kurss %s ir pievienots datu bāzei
+ConfirmDeleteLineRate=Vai tiešām vēlaties noņemt valūtas %s kursu %s datumā %s?
+DeleteLineRate=Skaidrs ātrums
+successRateDelete=Likme ir izdzēsta
+errorRateDelete=Dzēšot likmi, radās kļūda
+successUpdateRate=Veikta modifikācija
+ErrorUpdateRate=Kļūda, mainot likmi
+Codemulticurrency=valūtas kods
+UpdateRate=mainīt likmi
+CancelUpdate=atcelt
+NoEmptyRate=Likmes lauks nedrīkst būt tukšs
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index 9292cb3f9c2..80aa1c66905 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Aizpildiet pēdējos pakalpojumu līnijas datumus
 MultiPricesAbility=Vairāki cenu segmenti katram produktam / pakalpojumam (katrs klients atrodas vienā cenu segmentā)
 MultiPricesNumPrices=Cenu skaits
 DefaultPriceType=Cenu bāze par saistību neizpildi (ar nodokli bez nodokļa), pievienojot jaunas pārdošanas cenas
-AssociatedProductsAbility=Aktivizēt virtuālos produktus (komplektus)
-AssociatedProducts=Virtuālie produkti
-AssociatedProductsNumber=Produktu skaits kas veido šo virtuālo produktu
+AssociatedProductsAbility=Komplektu aktivizēšana (virtuālie produkti)
+AssociatedProducts=Komplekti
+AssociatedProductsNumber=Produktu skaits, kas veido šo komplektu
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Mātes produkti
-IfZeroItIsNotAVirtualProduct=Ja 0, šis produkts nav virtuāls produkts
-IfZeroItIsNotUsedByVirtualProduct=Ja 0, šis produkts netiek izmantots ar jebkuru virtuālo produkta
+IfZeroItIsNotAVirtualProduct=Ja 0, šis produkts nav komplekts
+IfZeroItIsNotUsedByVirtualProduct=Ja 0, šis produkts netiek izmantots nevienā komplektā
 KeywordFilter=Atslēgvārda filtru
 CategoryFilter=Sadaļu filtrs
 ProductToAddSearch=Meklēt produktu, lai pievienotu
 NoMatchFound=Nekas netika atrasts
 ListOfProductsServices=Produktu / pakalpojumu saraksts
-ProductAssociationList=To produktu / pakalpojumu saraksts, kas ir šī virtuālā produkta / komplekta sastāvdaļa
-ProductParentList=Saraksts virtuālo produktu / pakalpojumu ar šo produktu kā sastāvdaļu
+ProductAssociationList=Produktu / pakalpojumu saraksts, kas ir šī komplekta sastāvdaļas
+ProductParentList=Komplektu saraksts ar šo produktu kā sastāvdaļu
 ErrorAssociationIsFatherOfThis=Viens no izvēlētā produkta mātes ar pašreizējo produktu
 DeleteProduct=Dzēst produktu / pakalpojumu
 ConfirmDeleteProduct=Vai tiešām vēlaties dzēst šo produktu / pakalpojumu?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Cenas veids
 PriceNumeric=Numurs
 DefaultPrice=Noklusējuma cena
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Apakš produkti
 MinSupplierPrice=Minimālā iepirkuma cena
@@ -339,6 +340,7 @@ UseProductFournDesc=Pievienojiet funkciju, lai definētu pārdevēju definētos
 ProductSupplierDescription=Produkta pārdevēja apraksts
 UseProductSupplierPackaging=Izmantojiet iepakojumu uz piegādātāju cenām (pārrēķiniet daudzumus atbilstoši iepakojumam, kas noteikts pēc piegādātāja cenas, pievienojot / atjauninot rindiņu piegādātāja dokumentos)
 PackagingForThisProduct=Iepakojums
+PackagingForThisProductDesc=Pēc piegādātāja pasūtījuma jūs automātiski pasūtīsit šo daudzumu (vai šī daudzkārtni). Nevar būt mazāks par minimālo pirkšanas daudzumu
 QtyRecalculatedWithPackaging=Līnijas daudzums tika pārrēķināts atbilstoši piegādātāja iesaiņojumam
 
 #Attributes
diff --git a/htdocs/langs/lv_LV/recruitment.lang b/htdocs/langs/lv_LV/recruitment.lang
index 5529a282136..a06859e2516 100644
--- a/htdocs/langs/lv_LV/recruitment.lang
+++ b/htdocs/langs/lv_LV/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Paredzamais datums
 FutureManager=Topošais vadītājs
 ResponsibleOfRecruitement=Atbildīgais par darbā pieņemšanu
 IfJobIsLocatedAtAPartner=Ja darbs atrodas partnera vietā
-PositionToBeFilled=Aizpildāms darba piedāvājums
-PositionsToBeFilled=Darba piedāvājumi jāaizpilda
-ListOfPositionsToBeFilled=Aizpildāmo darba piedāvājumu saraksts
-NewPositionToBeFilled=Jāaizpilda jauni darba piedāvājumi
+PositionToBeFilled=Ieņemamais amats
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Aizpildāms darba piedāvājums
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Informācija par aizpildāmo darba vietu
 ContactForRecruitment=Kontaktpersona personāla atlasei
 EmailRecruiter=E-pasta vervētājs
 ToUseAGenericEmail=Lai izmantotu vispārīgu e-pastu. Ja tas nav noteikts, tiks izmantots e-pasts, kas atbildīgs par personāla atlasi
-NewCandidature=Jauna kandidatūra
-ListOfCandidatures=Kandidātu saraksts
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Pieprasītā atlīdzība
 ProposedRemuneration=Piedāvātā atlīdzība
 ContractProposed=Piedāvātais līgums
 ContractSigned=Parakstīts līgums
-RecruitmentCandidature=Kandidāts
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Darba pozīcijas
-RecruitmentCandidatures=Kandidāti
+RecruitmentCandidatures=Applications
 InterviewToDo=Intervija, kas jādara
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
index ed7cf7b7f30..6c2b008b488 100644
--- a/htdocs/langs/lv_LV/stocks.lang
+++ b/htdocs/langs/lv_LV/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Pārvietošanas ID %d
 ListMouvementStockProject=Ar projektu saistīto krājumu kustību saraksts
 StocksArea=Noliktavas platība
 AllWarehouses=Visas noliktavas
-IncludeEmptyDesiredStock=Iekļaujiet arī nenosakāmus vēlamos krājumus
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Iekļaujiet arī pasūtījumu projektus
 Location=Vieta
 LocationSummary=Īsais atrašanās vietas nosaukums
@@ -122,8 +122,9 @@ DesiredStockDesc=Šī krājuma summa būs vērtība, ko izmanto krājumu papildi
 StockToBuy=Lai pasūtītu
 Replenishment=Papildinājums
 ReplenishmentOrders=Papildināšanas pasūtījumus
-VirtualDiffersFromPhysical=Atbilstoši krājumu palielināšanai/samazināšanai fiziskie un virtuālie krājumi (fiziskie + kārtējie pasūtījumi) var atšķirties
-UseVirtualStockByDefault=Papildināšanas funkcijai pēc noklusējuma izmantojiet virtuālo krājumu, nevis fizisko krājumu
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Izmantot virtuālu noliktavu
 UsePhysicalStock=Izmantot reālu noliktavu
 CurentSelectionMode=Pašreizējais izvēles režīms
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=Šis produkts jau ir iekļauts sarakstā
 SelectCategory=Sadaļu filtrs
 SelectFournisseur=Pārdevēja filtrs
 inventoryOnDate=Inventārs
-INVENTORY_DISABLE_VIRTUAL=Virtuālais produkts (komplekts): nesamazina bērna produkta krājumus
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Izmantojiet pirkuma cenu, ja nevarat atrast pēdējo pirkuma cenu
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Krājumu kustībai būs inventarizācijas datums (nevis krājuma validācijas datums)
 inventoryChangePMPPermission=Ļauj mainīt produkta PMP vērtību
 ColumnNewPMP=Jauna vienība PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=Šeit varat apskatīt krājumus (reālos krājumus) noteikt
 StockAtDateFutureDesc=Šeit varat apskatīt krājumus (virtuālos krājumus) noteiktā datumā nākotnē
 CurrentStock=Pašreizējais krājums
 InventoryRealQtyHelp=Iestatiet vērtību 0, lai atiestatītu daudzumu <br>. Saglabājiet lauku tukšu vai noņemiet līniju, lai paliktu nemainīgs
-UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaning=Atjauniniet, skenējot
+UpdateByScaningProductBarcode=Atjaunināšana, skenējot (produkta svītrkods)
+UpdateByScaningLot=Atjaunināt, skenējot (partija | sērijas svītrkods)
diff --git a/htdocs/langs/lv_LV/suppliers.lang b/htdocs/langs/lv_LV/suppliers.lang
index 50c331400e1..622db59bf5d 100644
--- a/htdocs/langs/lv_LV/suppliers.lang
+++ b/htdocs/langs/lv_LV/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Pirkuma pasūtījumi rēķinam
 NbDaysToDelivery=Piegādes termiņš (dienas)
 DescNbDaysToDelivery=Šī pasūtījuma produktu ilgākais piegādes termiņš
 SupplierReputation=Pārdevēja reputācija
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Nepasūtīt
 NotTheGoodQualitySupplier=Zemas kvalitātes
 ReputationForThisProduct=Reputācija
diff --git a/htdocs/langs/lv_LV/users.lang b/htdocs/langs/lv_LV/users.lang
index 29e4d5d55ec..ad46b5bbf5a 100644
--- a/htdocs/langs/lv_LV/users.lang
+++ b/htdocs/langs/lv_LV/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Dzēst no grupas
 PasswordChangedAndSentTo=Parole nomainīta un nosūtīta <b>%s.</b>
 PasswordChangeRequest=Pieprasījums nomainīt paroli <b> %s </b>
 PasswordChangeRequestSent=Pieprasīt, lai nomaina paroli, <b>%s</b> nosūtīt <b>%s.</b>
+IfLoginExistPasswordRequestSent=Ja šī pieteikšanās ir derīgs konts, ir nosūtīts e-pasts paroles atiestatīšanai.
+IfEmailExistPasswordRequestSent=Ja šis e-pasts ir derīgs konts, ir nosūtīts e-pasts paroles atiestatīšanai.
 ConfirmPasswordReset=Paroles atiestatīšanas apstiprināšana
 MenuUsersAndGroups=Lietotāji un grupas
 LastGroupsCreated=Jaunākās %s grupas izveidotas
@@ -73,6 +75,7 @@ CreateInternalUserDesc=Šī veidlapa ļauj izveidot iekšējo lietotāju savā u
 InternalExternalDesc=<b> iekšējais </b> lietotājs ir lietotājs, kas ietilpst jūsu uzņēmumā / organizācijā. <br> <b> ārējais </b> lietotājs ir klients, pārdevējs vai cits (Ārēja lietotāja izveidošanu trešai personai var veikt no trešās puses kontaktu ieraksta). <br> <br> Abos gadījumos atļaujas nosaka tiesības uz Dolibarr, arī ārējam lietotājam var būt atšķirīgs izvēlnes pārvaldnieks nekā iekšējam lietotājam (sk. Sākums - Iestatīšana - Displejs).
 PermissionInheritedFromAGroup=Atļauja piešķirta, jo mantojis no viena lietotāja grupai.
 Inherited=Iedzimta
+UserWillBe=Izveidotais lietotājs būs
 UserWillBeInternalUser=Izveidots lietotājs būs iekšējā lietotāja (jo nav saistīta ar konkrētu trešajai personai)
 UserWillBeExternalUser=Izveidots lietotājs būs ārējais lietotājs (jo saistīts ar konkrētu trešo personu)
 IdPhoneCaller=Id zvanītāja tālrunis
@@ -109,8 +112,10 @@ UserAccountancyCode=Lietotāja grāmatvedības kods
 UserLogoff=Lietotājs atslēdzies
 UserLogged=Lietotājs pieteicies
 DateOfEmployment=Nodarbināšanas datums
-DateEmployment=Nodarbinātības sākuma datums
+DateEmployment=Nodarbinātība
+DateEmploymentstart=Nodarbinātības sākuma datums
 DateEmploymentEnd=Nodarbinātības beigu datums
+RangeOfLoginValidity=Pieteikšanās derīguma datumu diapazons
 CantDisableYourself=Jūs nevarat atspējot savu lietotāja ierakstu
 ForceUserExpenseValidator=Spēka izdevumu pārskata apstiprinātājs
 ForceUserHolidayValidator=Piespiedu atvaļinājuma pieprasījuma validētājs
diff --git a/htdocs/langs/lv_LV/website.lang b/htdocs/langs/lv_LV/website.lang
index 839d6a901d8..45c5b91487f 100644
--- a/htdocs/langs/lv_LV/website.lang
+++ b/htdocs/langs/lv_LV/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Pievienot vietni
 Webpage=Web lapa / konteiners
 AddPage=Pievienot lapu / konteineru
 HomePage=Mājas lapa
-PageContainer=Lapa / konteiners
+PageContainer=Lappuse
 PreviewOfSiteNotYetAvailable=Jūsu vietnes <strong> %s </strong>priekšskatījums vēl nav pieejams. Vispirms jums ir <strong> Jāimportē pilnu vietnes veidni</strong> vai vienkārši <strong>Pievienot lapu/konteineru</strong>".
 RequestedPageHasNoContentYet=Pieprasītā lapa ar id %s vēl nav ievietota, vai kešatmiņas fails .tpl.php tika noņemts. Rediģējiet lapas saturu, lai to atrisinātu.
 SiteDeleted=Tīmekļa vietne '%s' dzēsta
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Aizvietošana veikta %s lappusēs vai konteineros
 RSSFeed=RSS barotne
 RSSFeedDesc=Izmantojot šo URL, varat iegūt RSS plūsmu no jaunākajiem rakstiem ar veidu “blogpost”
 PagesRegenerated=reģenerēta %s lapa (s) / konteiners (-i)
+RegenerateWebsiteContent=Atjaunojiet tīmekļa vietnes kešatmiņas failus
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang
index 2d3a4148592..01016a2fb76 100644
--- a/htdocs/langs/mk_MK/accountancy.lang
+++ b/htdocs/langs/mk_MK/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Стандардно за услугата
 DefaultForProduct=Стандардно за производот
 CantSuggest=Без предлози
 AccountancySetupDoneFromAccountancyMenu=Повеќето поставување на сметководството е направено од менито %s
-ConfigAccountingExpert=Конфигурација на модулот сметководствен експерт 
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=Journals
+Journals=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Врати табела на сметки
 Chartofaccounts=Табела на сметки
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Тековна наменска сметка
 AssignDedicatedAccountingAccount=Нова сметка за доделување
 InvoiceLabel=Етикета за фактура
@@ -33,8 +35,8 @@ OtherInfo=Други информации
 DeleteCptCategory=Отстранете ја сметководствената сметка од групата
 ConfirmDeleteCptCategory=Дали сте сигурни дека сакате да ја отстраните оваа сметководствена сметка од групата за сметководствени сметки?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Групата е празна, проверете го поставувањето на персоналната сметководствена група
 DetailByAccount=Покажете детали по сметка
 AccountWithNonZeroValues=Сметки со вредности кои не се нула
@@ -43,7 +45,9 @@ CountriesInEEC=Земји во Европска економска заедни
 CountriesNotInEEC=Земји што не се во Европска економска заедница
 CountriesInEECExceptMe=Земји во Европската економска заедница освен %s
 CountriesExceptMe=Сите земји освен %s
-AccountantFiles=Експортирај документи за сметководство
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Главна сметководствена сметка за клиенти што не се дефинирани во сетапот
 MainAccountForSuppliersNotDefined=Главна сметководствена сметка за трговците кои не се дефинирани во сетапот
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bank accounts
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=By year
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index 5f849265afa..04f993c0811 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
 CurrentTimeZone=TimeZone PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Interventions
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
+Permission13=Invalidate customer invoices
 Permission14=Validate customer invoices
 Permission15=Send customer invoices by email
 Permission16=Create payments for customer invoices
@@ -688,6 +694,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Read members
 Permission72=Create/modify members
 Permission74=Delete members
@@ -718,6 +728,7 @@ Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
@@ -825,10 +836,11 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Edition of field %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1282,7 +1322,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Global parameters
@@ -1523,7 +1564,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Level
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
@@ -1629,7 +1672,7 @@ AdvancedEditor=Advanced editor
 ActivateFCKeditor=Activate advanced editor for:
 FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
 FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Корисници
 MailToUser=Users
-MailToProject=Projects page
+MailToProject=Projects
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/mk_MK/banks.lang b/htdocs/langs/mk_MK/banks.lang
index 0ba036badcd..7ed471f3c64 100644
--- a/htdocs/langs/mk_MK/banks.lang
+++ b/htdocs/langs/mk_MK/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/mk_MK/categories.lang b/htdocs/langs/mk_MK/categories.lang
index 9349ecc5135..84e5796763e 100644
--- a/htdocs/langs/mk_MK/categories.lang
+++ b/htdocs/langs/mk_MK/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/mk_MK/companies.lang b/htdocs/langs/mk_MK/companies.lang
index 47c079b7378..ca5cbff55f1 100644
--- a/htdocs/langs/mk_MK/companies.lang
+++ b/htdocs/langs/mk_MK/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Вработените
 ProspectLevelShort=Potential
 ProspectLevel=Prospect potential
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Currency
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/mk_MK/ecm.lang b/htdocs/langs/mk_MK/ecm.lang
index 43ddd3bf36f..71df60734fb 100644
--- a/htdocs/langs/mk_MK/ecm.lang
+++ b/htdocs/langs/mk_MK/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Search by keywords
 ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/mk_MK/hrm.lang b/htdocs/langs/mk_MK/hrm.lang
index a5d5c43a4e6..9f7475466fa 100644
--- a/htdocs/langs/mk_MK/hrm.lang
+++ b/htdocs/langs/mk_MK/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Вработени
 Employee=Вработен
 NewEmployee=Нов вработен
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/mk_MK/install.lang b/htdocs/langs/mk_MK/install.lang
index 6b02ac0adb2..3cd58c00c22 100644
--- a/htdocs/langs/mk_MK/install.lang
+++ b/htdocs/langs/mk_MK/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=This PHP supports sessions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/mk_MK/intracommreport.lang b/htdocs/langs/mk_MK/intracommreport.lang
new file mode 100644
index 00000000000..3060300b974
--- /dev/null
+++ b/htdocs/langs/mk_MK/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=List
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/mk_MK/languages.lang b/htdocs/langs/mk_MK/languages.lang
index 3e571f0e756..a25efb26d67 100644
--- a/htdocs/langs/mk_MK/languages.lang
+++ b/htdocs/langs/mk_MK/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Шпански (Парагвај)
 Language_es_PE=Шпански (Перу)
 Language_es_PR=Шпански (Порто Рико)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index 5d4bfbd830e..12eb210b51c 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Remove link
 AddToDraft=Add to draft
 Update=Update
 Close=Close
+CloseAs=Set status to
 CloseBox=Remove widget from your dashboard
 Confirm=Confirm
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Re-Open
 Upload=Upload
 ToLink=Link
 Select=Select
+SelectAll=Select all
 Choose=Choose
 Resize=Resize
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=Cards
 Card=Card
 Now=Now
 HourStart=Start hour
+Deadline=Deadline
 Date=Date
 DateAndHour=Date and hour
 DateToday=Today's date
@@ -264,8 +267,10 @@ DateStart=Start date
 DateEnd=End date
 DateCreation=Creation date
 DateCreationShort=Creat. date
+IPCreation=Creation IP
 DateModification=Modification date
 DateModificationShort=Modif. date
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
@@ -319,6 +324,7 @@ Morning=Morning
 Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Month of the day
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Rate
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Amount tax 2
 AmountLT2=Amount tax 3
 AmountLT1ES=Amount RE
@@ -487,6 +494,7 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
+at=at
 to=to
 To=to
 and=and
@@ -509,6 +517,7 @@ Draft=Draft
 Drafts=Drafts
 StatusInterInvoiced=Invoiced
 Validated=Валидирано
+ValidatedToProduce=Validated (To produce)
 Opened=Open
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Response
 Priority=Priority
 SendByMail=Send by email
 MailSentBy=Email sent by
+NotSent=Not sent
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
@@ -836,6 +846,7 @@ ListOfTemplates=List of templates
 Gender=Gender
 Genderman=Man
 Genderwoman=Woman
+Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Comments
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Information
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Date of birth
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/mk_MK/members.lang b/htdocs/langs/mk_MK/members.lang
index 467272c0dca..3f292176083 100644
--- a/htdocs/langs/mk_MK/members.lang
+++ b/htdocs/langs/mk_MK/members.lang
@@ -19,14 +19,12 @@ MembersCards=Бизнис картички на членови
 MembersList=Листа на членови
 MembersListToValid=Список на предлог-членови (што треба да се верификуваат)
 MembersListValid=Листа на валидни членови
-MembersListUpToDate=Список на валидни членови со ажурирана претплата
-MembersListNotUpToDate=Листа на валидни членови со истечена претплата
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=Листа на исклучени членови
 MembersListQualified=Листа на квалификувани членови
 MenuMembersToValidate=Предлог членови
 MenuMembersValidated=Валидни членови
-MenuMembersUpToDate=Најнови членови
-MenuMembersNotUpToDate=Застарени членови
 MenuMembersResiliated=Исклучени членови
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Датум на претплата
 DateEndSubscription=Датум на завршување на претплатата
 EndSubscription=Крај на претплата
 SubscriptionId=ИД за претплата
+WithoutSubscription=Without subscription
 MemberId=ИД на член
 NewMember=Нов член
 MemberType=Тип на член
@@ -81,7 +80,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/mk_MK/mrp.lang b/htdocs/langs/mk_MK/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/mk_MK/mrp.lang
+++ b/htdocs/langs/mk_MK/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
index 9dd0aa9f659..bf555405861 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/mk_MK/recruitment.lang b/htdocs/langs/mk_MK/recruitment.lang
index 79e3e8dfbaf..85e1d55300b 100644
--- a/htdocs/langs/mk_MK/recruitment.lang
+++ b/htdocs/langs/mk_MK/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/mk_MK/stocks.lang b/htdocs/langs/mk_MK/stocks.lang
index 8c01a131abc..1de1066fb67 100644
--- a/htdocs/langs/mk_MK/stocks.lang
+++ b/htdocs/langs/mk_MK/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/mk_MK/suppliers.lang b/htdocs/langs/mk_MK/suppliers.lang
index 3f3c872195a..2e78526a9ed 100644
--- a/htdocs/langs/mk_MK/suppliers.lang
+++ b/htdocs/langs/mk_MK/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/mk_MK/website.lang b/htdocs/langs/mk_MK/website.lang
index 4b5294d5e43..03e042e4be6 100644
--- a/htdocs/langs/mk_MK/website.lang
+++ b/htdocs/langs/mk_MK/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/mn_MN/accountancy.lang b/htdocs/langs/mn_MN/accountancy.lang
index 7b59e33b296..3211a0b62df 100644
--- a/htdocs/langs/mn_MN/accountancy.lang
+++ b/htdocs/langs/mn_MN/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting expert
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=Journals
+Journals=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Chart of accounts
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bank accounts
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=By year
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/mn_MN/admin.lang b/htdocs/langs/mn_MN/admin.lang
index d7c4eb282cd..f1c41a3b62b 100644
--- a/htdocs/langs/mn_MN/admin.lang
+++ b/htdocs/langs/mn_MN/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
 CurrentTimeZone=TimeZone PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Interventions
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
+Permission13=Invalidate customer invoices
 Permission14=Validate customer invoices
 Permission15=Send customer invoices by email
 Permission16=Create payments for customer invoices
@@ -688,6 +694,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Read members
 Permission72=Create/modify members
 Permission74=Delete members
@@ -718,6 +728,7 @@ Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
@@ -825,10 +836,11 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Edition of field %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1282,7 +1322,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Global parameters
@@ -1523,7 +1564,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Level
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
@@ -1629,7 +1672,7 @@ AdvancedEditor=Advanced editor
 ActivateFCKeditor=Activate advanced editor for:
 FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
 FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
-MailToProject=Projects page
+MailToProject=Projects
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/mn_MN/banks.lang b/htdocs/langs/mn_MN/banks.lang
index 75f9549dca5..9500a5b8b2e 100644
--- a/htdocs/langs/mn_MN/banks.lang
+++ b/htdocs/langs/mn_MN/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/mn_MN/categories.lang b/htdocs/langs/mn_MN/categories.lang
index 9bb71984ecf..ba37a43b4ec 100644
--- a/htdocs/langs/mn_MN/categories.lang
+++ b/htdocs/langs/mn_MN/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/mn_MN/companies.lang b/htdocs/langs/mn_MN/companies.lang
index 92674363ced..dadff6a7894 100644
--- a/htdocs/langs/mn_MN/companies.lang
+++ b/htdocs/langs/mn_MN/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
 ProspectLevel=Prospect potential
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Currency
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/mn_MN/ecm.lang b/htdocs/langs/mn_MN/ecm.lang
index 43ddd3bf36f..71df60734fb 100644
--- a/htdocs/langs/mn_MN/ecm.lang
+++ b/htdocs/langs/mn_MN/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Search by keywords
 ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/mn_MN/hrm.lang b/htdocs/langs/mn_MN/hrm.lang
index 6cc7f6bef24..3b8f137e103 100644
--- a/htdocs/langs/mn_MN/hrm.lang
+++ b/htdocs/langs/mn_MN/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Employees
 Employee=Employee
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/mn_MN/install.lang b/htdocs/langs/mn_MN/install.lang
index 2d708c04147..63947dad154 100644
--- a/htdocs/langs/mn_MN/install.lang
+++ b/htdocs/langs/mn_MN/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=This PHP supports sessions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/mn_MN/intracommreport.lang b/htdocs/langs/mn_MN/intracommreport.lang
new file mode 100644
index 00000000000..3060300b974
--- /dev/null
+++ b/htdocs/langs/mn_MN/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=List
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/mn_MN/languages.lang b/htdocs/langs/mn_MN/languages.lang
index cc80b9f1719..ba187326705 100644
--- a/htdocs/langs/mn_MN/languages.lang
+++ b/htdocs/langs/mn_MN/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/mn_MN/main.lang b/htdocs/langs/mn_MN/main.lang
index 1332148ae67..e22785650ad 100644
--- a/htdocs/langs/mn_MN/main.lang
+++ b/htdocs/langs/mn_MN/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Remove link
 AddToDraft=Add to draft
 Update=Update
 Close=Close
+CloseAs=Set status to
 CloseBox=Remove widget from your dashboard
 Confirm=Confirm
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Re-Open
 Upload=Upload
 ToLink=Link
 Select=Select
+SelectAll=Select all
 Choose=Choose
 Resize=Resize
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=Cards
 Card=Card
 Now=Now
 HourStart=Start hour
+Deadline=Deadline
 Date=Date
 DateAndHour=Date and hour
 DateToday=Today's date
@@ -264,8 +267,10 @@ DateStart=Start date
 DateEnd=End date
 DateCreation=Creation date
 DateCreationShort=Creat. date
+IPCreation=Creation IP
 DateModification=Modification date
 DateModificationShort=Modif. date
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
@@ -319,6 +324,7 @@ Morning=Morning
 Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Month of the day
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Rate
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Amount tax 2
 AmountLT2=Amount tax 3
 AmountLT1ES=Amount RE
@@ -487,6 +494,7 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
+at=at
 to=to
 To=to
 and=and
@@ -509,6 +517,7 @@ Draft=Draft
 Drafts=Drafts
 StatusInterInvoiced=Invoiced
 Validated=Validated
+ValidatedToProduce=Validated (To produce)
 Opened=Open
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Response
 Priority=Priority
 SendByMail=Send by email
 MailSentBy=Email sent by
+NotSent=Not sent
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
@@ -836,6 +846,7 @@ ListOfTemplates=List of templates
 Gender=Gender
 Genderman=Man
 Genderwoman=Woman
+Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Comments
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Information
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Date of birth
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/mn_MN/members.lang b/htdocs/langs/mn_MN/members.lang
index 5ef946ddf67..5812248b129 100644
--- a/htdocs/langs/mn_MN/members.lang
+++ b/htdocs/langs/mn_MN/members.lang
@@ -19,14 +19,12 @@ MembersCards=Members business cards
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
 SubscriptionId=Subscription id
+WithoutSubscription=Without subscription
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@@ -81,7 +80,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/mn_MN/mrp.lang b/htdocs/langs/mn_MN/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/mn_MN/mrp.lang
+++ b/htdocs/langs/mn_MN/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/mn_MN/products.lang b/htdocs/langs/mn_MN/products.lang
index b59aa2f7080..97db059594f 100644
--- a/htdocs/langs/mn_MN/products.lang
+++ b/htdocs/langs/mn_MN/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/mn_MN/recruitment.lang b/htdocs/langs/mn_MN/recruitment.lang
index 73e9a7fa07f..b775e78552e 100644
--- a/htdocs/langs/mn_MN/recruitment.lang
+++ b/htdocs/langs/mn_MN/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/mn_MN/stocks.lang b/htdocs/langs/mn_MN/stocks.lang
index 81163e8d4b0..660443bcded 100644
--- a/htdocs/langs/mn_MN/stocks.lang
+++ b/htdocs/langs/mn_MN/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/mn_MN/suppliers.lang b/htdocs/langs/mn_MN/suppliers.lang
index 51562b8bb7a..03b03c75269 100644
--- a/htdocs/langs/mn_MN/suppliers.lang
+++ b/htdocs/langs/mn_MN/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/mn_MN/website.lang b/htdocs/langs/mn_MN/website.lang
index 4b5294d5e43..03e042e4be6 100644
--- a/htdocs/langs/mn_MN/website.lang
+++ b/htdocs/langs/mn_MN/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index 5bc3643e0f4..cdf26c85c07 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Standard for tjeneste
 DefaultForProduct=Standard for vare
 CantSuggest=Kan ikke foreslå
 AccountancySetupDoneFromAccountancyMenu=Mesteparten av regnskapet settes opp fra menyen %s
-ConfigAccountingExpert=Konfigurasjon av modulen regnskapsekspert
+ConfigAccountingExpert=Konfigurasjon av modulen regnskap (dobbel oppføring)
 Journalization=Journalføring
-Journaux=Journaler
+Journals=Journaler
 JournalFinancial=Finasielle journaler
 BackToChartofaccounts=Returner kontotabell
 Chartofaccounts=Diagram over kontoer
+ChartOfSubaccounts=Oversikt over individuelle kontoer
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Nåværende dedikert konto
 AssignDedicatedAccountingAccount=Ny konto å tildele
 InvoiceLabel=Fakturaetikett
@@ -33,8 +35,8 @@ OtherInfo=Annen informasjon
 DeleteCptCategory=Fjern regnskapskonto fra gruppe
 ConfirmDeleteCptCategory=Er du sikker på at du vil fjerne denne regnskapskontoen fra gruppen?
 JournalizationInLedgerStatus=Status for journalisering
-AlreadyInGeneralLedger=Allerede journalført i hovedbøker
-NotYetInGeneralLedger=Ikke ennå journalisert i ledgers
+AlreadyInGeneralLedger=Allerede overført i regnskapsjournaler og hovedbok
+NotYetInGeneralLedger=Foreløpig ikke overført i regnskapsjournaler og hovedbok
 GroupIsEmptyCheckSetup=Gruppen er tom, sjekk oppsettet for den personlige regnskapsgruppen
 DetailByAccount=Vis detaljer etter konto
 AccountWithNonZeroValues=Kontoer med ikke-nullverdier
@@ -43,7 +45,9 @@ CountriesInEEC=Land i EEC
 CountriesNotInEEC=Land ikke i EEC
 CountriesInEECExceptMe=Land i EEC unntatt %s
 CountriesExceptMe=Alle land unntatt %s
-AccountantFiles=Eksporter regnskapsdokumenter
+AccountantFiles=Eksporter kildedokumenter
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Hoved regnskapskonto for kunder som ikke er definert i oppsettet
 MainAccountForSuppliersNotDefined=Hovedregnskapskonto for leverandører som ikke er definert i oppsettet
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=TRINN %s: Legg til eller endre eksisterende transaksj
 
 AccountancyAreaDescClosePeriod=TRINN %s: Lukk perioden slik at ingen endringer kan bli gjort.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=Et obligatorisk trinn i oppsettet ble ikke fullført (regnskapskodejournal ikke definert for alle bankkontoer)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Et obligatorisk trinn i oppsettet er ikke fullført (regnskapskodejournal er ikke definert for alle bankkontoer)
 Selectchartofaccounts=Velg kontomodell
 ChangeAndLoad=Endre og last inn
 Addanaccount=Legg til regnskapskonto
@@ -89,6 +93,8 @@ SubledgerAccount=Konto i sub-hovedbok
 SubledgerAccountLabel=Kontoetikett i sub-hovedbok
 ShowAccountingAccount=Vis regnskapskonto
 ShowAccountingJournal=Vis regnskapsjournal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Foreslått regnskapskonto
 MenuDefaultAccounts=Standard kontoer
 MenuBankAccounts=Bankkonti
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Utgiftsrapport-binding
 CreateMvts=Opprett ny transaksjon
 UpdateMvts=Endre en transaksjon
 ValidTransaction=Valider transaksjonen
-WriteBookKeeping=Registrer transaksjoner i Hovedboken
+WriteBookKeeping=Registrer transaksjoner i regnskap
 Bookkeeping=Hovedbok
+BookkeepingSubAccount=Subledger
 AccountBalance=Kontobalanse
 ObjectsRef=Kildeobjekt ref
 CAHTF=Samlet leverandørkjøp før skatt
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Deaktiver direkteregistrering av transaksjoner på ban
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Aktiver eksportutkast i journal
 ACCOUNTANCY_COMBO_FOR_AUX=Aktiver kombinasjonsliste for datterkonto (kan være treg hvis du har mange tredjeparter)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Salgsjournal
 ACCOUNTING_PURCHASE_JOURNAL=Innkjøpsjournal
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Regnskapskonto for vent
 DONATION_ACCOUNTINGACCOUNT=Regnskapskonto for registrering av donasjoner
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Regnskapskonto for å registrere abonnementer
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Regnskapskonto som standard for de kjøpte varene (brukt hvis ikke definert i produktarket)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Regnskapskonto som standard for kjøpte produkter i EU (brukt hvis ikke definert i produktarket)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Regnskapskonto som standard for kjøpte produkter og importert ut av EU (brukt hvis ikke definert i produktarket)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Etter forhåndsdefinerte grupper
 ByPersonalizedAccountGroups=Etter personlige grupper
 ByYear=Etter år
 NotMatch=Ikke valgt
-DeleteMvt=Slett linjer fra hovedboken
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Måned å slette
 DelYear=År som skal slettes
 DelJournal=Journal som skal slettes
-ConfirmDeleteMvt=Dette vil slette alle linjene i hovedboken for året/måneden og/eller fra en bestemt journal (Det kreves minst ett kriterium). Du må gjenbruke funksjonen 'Registrering i regnskap' for å få den slettede posten tilbake i hovedboken.
-ConfirmDeleteMvtPartial=Dette vil slette transaksjonen fra hovedboken(alle linjer knyttet til samme transaksjon vil bli slettet)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finansjournal
 ExpenseReportsJournal=Journal for utgiftsrapporter
 DescFinanceJournal=Finansjournal med alle typer betalinger etter bankkonto
-DescJournalOnlyBindedVisible=Dette er en oversikt over poster som er bundet til en regnskapskonto og kan registreres i hovedboken.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=MVA-konto er ikke definert
 ThirdpartyAccountNotDefined=Konto for tredjepart er ikke definert
 ProductAccountNotDefined=Konto for vare er ikke definert
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Denne journalen er allerede i bruk
 AccountingAccountForSalesTaxAreDefinedInto=Merk: Regnskapskonto for MVA er definert i menyen <b>%s</b> - <b>%s </b>
 NumberOfAccountancyEntries=Antall oppføringer
 NumberOfAccountancyMovements=Antall bevegelser
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Eksporter utkastjournal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Eksport CSV Konfigurerbar
 Modelcsv_FEC=Eksporter FEC
 Modelcsv_Sage50_Swiss=Eksport for Sage 50 Switzerland
 Modelcsv_winfic=Eksporter Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Kontoplan ID
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index 57f0782b96f..9f6a787ed34 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -37,10 +37,12 @@ UnlockNewSessions=Fjern forbindelseslås
 YourSession=Din økt
 Sessions=Brukers økter
 WebUserGroup=Webserver bruker/gruppe
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Din PHP-konfigurasjon ser ut til å ikke tillate oppføring av aktive økter. Mappen som brukes til å lagre økter (<b> %s </b>) kan være beskyttet (for eksempel av operativsystemer eller ved hjelp av PHP-direktivet open_basedir).
 DBStoringCharset=Databasetegnsett for lagring av data
 DBSortingCharset=Databasetegnsett for sortering av data
-HostCharset=Host charset
+HostCharset=Vert karaktersett
 ClientCharset=Klien karaktersett
 ClientSortingCharset=Klientsammenstilling
 WarningModuleNotActive=Modulen <b>%s</b> må være slått på
@@ -71,7 +73,7 @@ DisableJavascriptNote=Merk: For test eller feilsøking. For optimalisering for b
 UseSearchToSelectCompanyTooltip=Hvis du har et stort antall tredjeparter (> 100 000), kan du øke hastigheten ved å sette konstant COMPANY_DONOTSEARCH_ANYWHERE til 1 i Oppsett-> Annet. Søket vil da være begrenset til starten av strengen.
 UseSearchToSelectContactTooltip=Hvis du har et stort antall tredjeparter (> 100 000), kan du øke hastigheten ved å sette konstant CONTACT_DONOTSEARCH_ANYWHERE til 1 i Oppsett-> Annet. Søket vil da være begrenset til starten av strengen.
 DelaiedFullListToSelectCompany=Vent med å trykke på en tast før innholdet av tredjepart-kombinasjonslisten er lastet.<br>Dette kan øke ytelsen hvis du har mange tredjeparter
-DelaiedFullListToSelectContact=Vent med å trykke på en tast før innholdet av kontakt-kombinasjonslisten er lastet.<br>Dette kan øke ytelsen hvis du har mange kontakter
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Antall tegn for å starte søk: %s
 NumberOfBytes=Antall bytes
 SearchString=Søkestreng
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=På elementer av en tredjepart, kan du velg
 JavascriptDisabled=JavaScript er deaktivert
 UsePreviewTabs=Bruk faner for forhåndsvisning
 ShowPreview=Forhåndsvisning
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Forhåndsvisning ikke tilgjengelig
 ThemeCurrentlyActive=Gjeldende tema
 CurrentTimeZone=Tidssone for PHP (server)
@@ -95,7 +98,7 @@ NextValueForInvoices=Neste verdi (fakturaer)
 NextValueForCreditNotes=Neste verdi (kreditnotaer)
 NextValueForDeposit=Neste verdi (nedbetaling)
 NextValueForReplacements=Neste verdi (erstatninger)
-MustBeLowerThanPHPLimit=Note: your PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+MustBeLowerThanPHPLimit=Merk: PHP-konfigurasjonen din begrenser for øyeblikket maksimalt filstørrelse for opplasting til <b> %s </b> %s, uavhengig av verdien til denne parameteren
 NoMaxSizeByPHPLimit=Merk: Det er ikke satt noen begrensninger i din PHP-konfigurasjon på denne serveren
 MaxSizeForUploadedFiles=Maksimal filstørrelse for opplasting av filer (0 for å ikke tillate opplasting)
 UseCaptchaCode=Bruk Capthca på innloggingsside
@@ -271,7 +274,7 @@ NoticePeriod=Oppsigelsestid
 NewByMonth=Ny etter måned
 Emails=Epost
 EMailsSetup=Oppsett av e-post
-EMailsDesc=Denne siden lar deg overstyre standard PHP-parametere for sending av e-post. I de fleste tilfeller på Unix/Linux OS er PHP-oppsettet riktig og disse parametrene er unødvendige.
+EMailsDesc=Denne siden lar deg angi parametere eller alternativer for sending av e-post.
 EmailSenderProfiles=E-postsender-profiler
 EMailsSenderProfileDesc=Du kan holde denne delen tom. Hvis du legger inn noen e-postmeldinger her, vil de bli lagt til listen over mulige avsendere i kombinasjonsboksen når du skriver en ny e-post.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS-port (standardverdi i php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP-ID (hvis sending av server krever godkjenning)
 MAIN_MAIL_SMTPS_PW=SMTP-passord (hvis sending av server krever godkjenning)
 MAIN_MAIL_EMAIL_TLS=Bruk TLS (SSL) kryptering
 MAIN_MAIL_EMAIL_STARTTLS=Bruk TLS (STARTTL) kryptering
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Bruk DKIM til å generere epostsignatur
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for bruk med DKIM
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Navn på DKIM-velger
@@ -387,12 +391,12 @@ ModuleMustBeEnabledFirst=Modulen <b>%s</b> må aktiveres før du kan bruke denne
 SecurityToken=Nøkkel til sikre nettadresser
 NoSmsEngine=Ingen SMS avsender tilgjengelig. SMS-håndterer er ikke installert med standardinstallasjon (fordi de er avhengig av en ekstern leverandør), men du kan finne noen på %s
 PDF=PDF
-PDFDesc=Global options for PDF generation
-PDFAddressForging=Rules for address section
+PDFDesc=Globale alternativer for generering av PDF
+PDFAddressForging=Regler for adresseseksjonen
 HideAnyVATInformationOnPDF=Skjul all informasjon relatert til skatt/MVA på generert PDF
 PDFRulesForSalesTax=Regler for salgsskatt/mva
 PDFLocaltax=Regler for %s
-HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
+HideLocalTaxOnPDF=Skjul %s-sats i kolonne Salgsavgift/mva
 HideDescOnPDF=Skjul varebeskrivelse
 HideRefOnPDF=Skjul varereferanse
 HideDetailsOnPDF=Skjul linjer med varedetaljer
@@ -409,9 +413,9 @@ PriceBaseTypeToChange=Endre på prisene med base referanseverdi definert på
 MassConvert=Start massekonvertering
 PriceFormatInCurrentLanguage=Prisformat på nåværende språk
 String=Streng
-String1Line=String (1 line)
+String1Line=Streng (1 linje)
 TextLong=Lang tekst
-TextLongNLines=Long text (n lines)
+TextLongNLines=Lang tekst (n linjer)
 HtmlText=HTML-tekst
 Int=Integer
 Float=Float
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Hvis dette feltet er tomt, vil denne verdien bli lag
 ExtrafieldParamHelpselect=Liste over verdier må være linjer med formatet nøkkel,verdi (hvor nøkkelen ikke kan være '0')<br><br>for eksempel:<br>1,verdi1<br>2,verdi2<br>kode3,verdi3<br>...<br><br>For å få listen avhengig av en annen komplementær attributtliste:<br>1,verdi1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>: parent_key<br><br>For å få listen avhengig av en annen liste:<br>1,verdi1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code </i>: parent_key
 ExtrafieldParamHelpcheckbox=Liste over verdier må være linjer med formatet nøkkel,verdi (hvor nøkkelen ikke kan være '0')<br><br>for eksempel:<br>1,verdi1 <br>2,verdi2<br>3,verdi3<br> ...
 ExtrafieldParamHelpradio=Liste over verdier må være linjer med formatet nøkkel,verdi (hvor nøkkelen ikke kan være '0')<br><br>for eksempel:<br>1,verdi1 <br>2,verdi2<br>3,verdi3<br> ...
-ExtrafieldParamHelpsellist=Liste over verdier kommer fra en tabell<br>Syntaks: tabellnavn: label_field: id_field::filter<br> Eksempel: c_typent: libelle:id::filter<br><br>- idfilter er nødvendigvis en primær int nøkkel<br>- filteret kan være en enkel test (f.eks. aktiv = 1) for å vise bare aktiv verdi <br> Du kan også bruke $ID$ i filtre, som er gjeldende ID for nåværende objekt <br> For å utføre en SELECT i filtre, bruk $SEL$<br> Hvis du vil filtrere på ekstrafelt, bruk syntaks extra.fieldcode=... (der feltkoden er koden til ekstrafelt)<br><br>For å få listen avhengig av en annen komplementær attributtliste: <br>c_typent:libelle:id:options_<i>parent_list_code</i> | parent_column:filter <br><br>For å få listen avhengig av en annen liste:<br>c_typent:libelle:id:<i>parent_list_code </i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Liste over verdier kommer fra en tabell <br> Syntaks: table_name:label_field:id_field::filter <br> Eksempel: c_typent:libelle:id::filter<br><br> filter kan være en enkel test (f.eks. Aktiv=1 ) for å vise bare aktiv verdi<br>Du kan også bruke $ID$ i filter, som er gjeldende ID for nåværende objekt<br>For å utføre en SELECT i filter, bruk $SEL$<br>Hvis du vil filtrere på ekstrafeltbruk bruk syntaks extra.fieldcode=... (der feltkoden er koden til ekstrafelt)<br><br>For å få listen avhengig av en annen komplementær attributtliste:<br>c_typent:libelle:id:options_<i>parent_list_code </i> |parent_column:filter<br><br>For å få listen avhengig av en annen liste:<br>c_typent:libelle:id:<i>parent_list_code</i> |parent_column:filter
-ExtrafieldParamHelplink=Parametere må være ObjectName: Classpath <br> Syntax: ObjectName: Classpath <br> Eksempler: <br> Societe: societe / class / societe.class.php <br> Kontakt: kontakt / class / contact.class.php
+ExtrafieldParamHelplink=Parametere må være ObjectName:Classpath <br> Syntaks: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Hold tomt for en enkel separator <br> Sett dette til 1 for en kollaps-separator (åpnes som standard for ny økt, da beholdes status for hver brukerøkt) <br> Sett dette til 2 for en kollaps-separator (kollapset som standard for ny økt, da holdes status foran hver brukerøkt)
 LibraryToBuildPDF=Bibliotek brukt for PDF-generering
 LocalTaxDesc=For noen land gjelder to eller tre skatter på hver fakturalinje. Dersom dette er tilfelle, velg type for andre og tredje skatt, samt sats. Mulig type: <br> 1: lokalavgift gjelder på varer og tjenester uten mva (lokal avgift er beregnet beløp uten mva) <br> 2: lokalavgift gjelder på varer og tjenester, inkludert merverdiavgift (lokalavgift beregnes på beløpet + hovedavgift) <br> 3: lokalavgift gjelder på varer uten mva (lokalavgift er beregnet beløp uten mva) <br> 4: lokalagift gjelder på varer inkludert mva (lokalavgift beregnes på beløpet + hovedavgift) <br> 5: lokal skatt gjelder tjenester uten mva (lokalavgift er beregnet beløp uten mva) <br> 6: lokalavgift gjelder på tjenester inkludert mva (lokalavgift beregnes på beløpet + mva)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s etterfulgt av det avkortede kundenavnet me
 ModuleCompanyCodeSupplierDigitaria=%s etterfulgt av det avkortede leverandørnavnet med antall tegn: %s for leverandørens regnskapskode.
 Use3StepsApproval=Som standard må innkjøpsordrer opprettes og godkjennes av 2 forskjellige brukere (ett trinn/bruker for å opprette og ett trinn/bruker for å godkjenne. Merk at hvis brukeren har både tillatelse til å opprette og godkjenne, vil ett trinn/ bruker vil være nok). Du kan bruke dette alternativet for å innføre et tredje trinn/bruker godkjenning, hvis beløpet er høyere enn en spesifisert verdi (så vil 3 trinn være nødvendig: 1=validering, 2=første godkjenning og 3=andre godkjenning dersom beløpet er høyt nok). <br> Sett denne tom en godkjenning (2 trinn) er nok, sett den til en svært lav verdi (0,1) hvis det alltid kreves en andre godkjenning (3 trinn).
 UseDoubleApproval=Bruk 3-trinns godkjennelse når beløpet (eks. MVA) er høyere enn...
-WarningPHPMail=ADVARSEL: Det er ofte bedre å sette utgående eposter til å bruke epostserveren til leverandøren din i stedet for standardoppsettet. Noen epostleverandører (som Yahoo) tillater ikke at du sender en epost fra en annen server enn deres egen server. Ditt nåværende oppsett bruker serveren i programmet til å sende epost og ikke serveren til epostleverandøren din, så noen mottakere (den som er kompatibel med den restriktive DMARC-protokollen), vil spørre epostleverandøren din om de kan godta eposten din og noen epostleverandører (som Yahoo) kan svare "nei" fordi serveren ikke er en deres servere, så få av dine sendte e-poster kan ikke aksepteres (vær også oppmerksom på epostleverandørens sendekvote). <br> Hvis din epostleverandør (som Yahoo) har denne begrensningen, må du endre epostoppsett til å velge den andre metoden "SMTP-server" og angi SMTP-serveren og legitimasjonene som tilbys av epostleverandøren din .
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=Hvis din epost-SMTP-leverandør må begrense epostklienten til noen IP-adresser (svært sjelden), er dette IP-adressen til epost-brukeragenten (MUA) for ERP CRM-programmet: <strong> %s </strong>.
-WarningPHPMailSPF=Hvis domenenavnet i avsenderens e-postadresse er beskyttet av SPF (spør e-postleverandøren), må du inkludere følgende IP-er i SPF-posten til DNS for domenet ditt: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Klikk for å vise beskrivelse
 DependsOn=Denne modulen trenger modulen(ene)
 RequiredBy=Denne modulen er påkrevd av modul(ene)
@@ -547,12 +555,10 @@ Module55Name=Strekkoder
 Module55Desc=Behandling av strekkoder
 Module56Name=Betaling med kredittoverføring
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Payments by Direct Debit
+Module57Name=Betalinger med dirketedebet
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial integrasjon
-Module59Name=Bookmark4u
-Module59Desc=Legg til funksjon for å lage en Bookmark4u konto fra en Dolibarr konto
 Module60Name=Klistremerker
 Module60Desc=Håndtering av klistremerker
 Module70Name=Intervensjoner
@@ -656,7 +662,7 @@ Module50200Desc=Gi kunderne en PayPal-betalingssideside (PayPal-konto eller kred
 Module50300Name=Stripe
 Module50300Desc=Tilbyr kunder en Stripe online betalingsside (kreditt/debetkort). Dette kan brukes til å la kundene dine foreta ad-hoc-betalinger eller betalinger knyttet til et bestemt Dolibarr-objekt (faktura, bestilling osv.)
 Module50400Name=Regnskap (dobbeltoppføring)
-Module50400Desc=Regnskapsadministrasjon (dobbeltoppføringer, generell støtte og ekstra regnskapsbøker). Eksporter hovedboken til flere formater.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direkteutskrift (uten å åpne dokumentet)ved hjelp av CUPS IPP inteface (Skriveren må være synlig for serveren, og CUPS må være installert på serveren)
 Module55000Name=Meningsmåling, undersøkelse eller avstemming
@@ -671,7 +677,7 @@ Module63000Name=Ressurser
 Module63000Desc=Administrer ressurser (skrivere, biler, rom, ...) for tildeling til arrangementer
 Permission11=Vis kundefakturaer
 Permission12=Opprett/endre kundefakturaer
-Permission13=Fjern validering på kundefakturaer
+Permission13=Ugyldiggjør kundefakturaer
 Permission14=Valider kundefakturaer
 Permission15=Send fakturaer pr e-post
 Permission16=Opprett betalinger for fakturaer
@@ -688,6 +694,7 @@ Permission32=Opprett/endre varer
 Permission34=Slett varer
 Permission36=Se/administrer skjulte varer
 Permission38=Eksporter varer
+Permission39=Ignorer minstepris
 Permission41=Les prosjekter og oppgaver (delt prosjekt og prosjekter jeg er kontakt for). Kan også skrive inn tidsforbruk for meg eller mitt hierarki, på tildelte oppgaver (Tidsskjema)
 Permission42=Opprett/endre prosjekter (delte prosjekter og de jeg er kontakt for). Kan også opprette oppgaver og tildele prosjekter og oppgaver til brukere.
 Permission44=Slett prosjekter (delte og mine egne)
@@ -696,6 +703,9 @@ Permission61=Vis intervensjoner
 Permission62=Opprett/endre intervensjoner
 Permission64=Slett intervensjoner
 Permission67=Eksporter intervensjoner
+Permission68=Send interventions by email
+Permission69=Valider intervensjoner
+Permission70=Invalidate interventions
 Permission71=Vis medlemmer
 Permission72=Opprett/endre medlemmer
 Permission74=Slett medlemmer
@@ -718,6 +728,7 @@ Permission95=Les rapporter
 Permission101=Vis forsendelser
 Permission102=Opprett/endre forsendelser
 Permission104=Valider forsendelser
+Permission105=Send sendings by email
 Permission106=Eksporter forsendelser
 Permission109=Slett forsendelser
 Permission111=Vis kontoutdrag
@@ -825,10 +836,11 @@ Permission402=Opprett/endre rabatter
 Permission403=Valider rabatter
 Permission404=Slett rabatter
 Permission430=Bruk Debug Bar
-Permission511=Les lønnsutbetalinger
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Opprett/endre betaling av lønn
 Permission514=Slett utbetalinger av lønn
-Permission517=Eksporter lønn
+Permission517=Read payments of salaries of everybody
+Permission519=Eksporter lønn
 Permission520=Les lån
 Permission522=Opprett/endre lån
 Permission524=Slett lån
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Les BOM (Bills of Materials)
 Permission651=Opprett/oppdater BOM
 Permission652=Slett BOM
@@ -884,7 +899,9 @@ Permission1185=Godkjen innkjøpsordre
 Permission1186=Utfør innkjøpsordre
 Permission1187=Bekreft mottak av innkjøpsordre
 Permission1188=Slett innkjøpsordre
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Godkjenn (andre godkjenning) innkjøpsordre
+Permission1191=Export supplier orders and their attributes
 Permission1201=Resultat av en eksport
 Permission1202=Opprett/endre eksport
 Permission1231=Les leverandørfakturaer
@@ -898,6 +915,8 @@ Permission1251=Kjør masseimport av eksterne data til database (datalast)
 Permission1321=Eksportere kundefakturaer, attributter og betalinger
 Permission1322=Gjenåpne en betalt regning
 Permission1421=Eksporter salgsordre og attributter
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Les handlinger (hendelser eller oppgaver) knyttet til brukerkonto (hvis eier av en hendelse eller bare er tilordnet)
 Permission2402=Opprette/endre handlinger (hendelser eller oppgaver) knyttet til brukerkontoen (hvis eier av hendelsen)
 Permission2403=Slett handlinger (hendelser eller oppgaver) knyttet til brukerkontoen (hvis eier av hendelsen)
@@ -932,9 +951,13 @@ Permission23001=Les planlagt oppgave
 Permission23002=Opprett/endre planlagt oppgave
 Permission23003=Slett planlagt oppgave
 Permission23004=Utfør planlagt oppgave
-Permission50101=Bruk utsalgssted
+Permission50101=Bruk salgssted (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Les transaksjoner
 Permission50202=Importer transaksjoner
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Tilknytt varer og fakturaer til regnskapskontoer
 Permission50411=Les operasjoner i hovedbok
 Permission50412=Skriv/rediger operasjoner i hovedbok
@@ -958,6 +981,17 @@ Permission63001=Les ressurser
 Permission63002=Opprett/endre ressurser
 Permission63003=Slett ressurser
 Permission63004=Koble ressurser til agendahendelser
+Permission64001=Tillat direkte utskrift
+Permission67000=Tillat utskrift av kvitteringer
+Permission68001=Les intracomm-rapport
+Permission68002=Opprett/endre intracomm-rapport
+Permission68004=Slett intracomm-rapport
+Permission941601=Les kvitteringer
+Permission941602=Opprett og endre kvitteringer
+Permission941603=Valider kvitteringer
+Permission941604=Send kvitteringer på e-post
+Permission941605=Eksporter kvitteringer
+Permission941606=Delete receipts
 DictionaryCompanyType=Tredjepartstyper
 DictionaryCompanyJuridicalType=Tredjeparts juridiske enheter
 DictionaryProspectLevel=Prospect potential level for companies
@@ -991,12 +1025,14 @@ DictionaryEMailTemplates=E-postmaler
 DictionaryUnits=Enheter
 DictionaryMeasuringUnits=Måleenheter
 DictionarySocialNetworks=Sosiale nettverk
-DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectStatus=Prospektstatus for selskaper
 DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Typer permisjon
 DictionaryOpportunityStatus=Lead status for prosjekt/lead
 DictionaryExpenseTaxCat=Utgiftsrapport - Transportkategorier
 DictionaryExpenseTaxRange=Utgiftsrapport - Rangert etter transportkategori
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type enhet
 SetupSaved=Innstillinger lagret
 SetupNotSaved=Oppsettet er ikke lagret
 BackToModuleList=Tilbake til modullisten
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Etiketten som brukes som standard hvis ingen oversettelse kan
 LabelOnDocuments=Etiketten på dokumenter
 LabelOrTranslationKey=Etikett eller oversettelsessnøkkel
 ValueOfConstantKey=Verdien av en konfigurasjonskonstant
+ConstantIsOn=Option %s is on
 NbOfDays=Antall dager
 AtEndOfMonth=Ved månedsslutt
 CurrentNext=Nåværende/Neste
@@ -1091,7 +1128,7 @@ LoginPage=Innloggingsside
 BackgroundImageLogin=Bakgrunnsbilde
 PermanentLeftSearchForm=Permanent søkeskjema i venstre meny
 DefaultLanguage=Standardspråk
-EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
+EnableMultilangInterface=Aktiver støtte for flere språk for kunde- eller leverandørrelasjoner
 EnableShowLogo=Vis firmalogoen i menyen
 CompanyInfo=Firma/organisasjon
 CompanyIds=Firma-/organisasjonsidentiteter
@@ -1145,6 +1182,7 @@ InfoWebServer=Om Webserver
 InfoDatabase=Om Database
 InfoPHP=Om PHP
 InfoPerf=Om ytelse
+InfoSecurity=About Security
 BrowserName=Navn på nettleser
 BrowserOS=Nettleserens operativsystem
 ListOfSecurityEvents=Oversikt over sikkerhetshendelser i Dolibarr
@@ -1194,7 +1232,8 @@ RestoreDesc=For å gjenopprette en Dolibarr-sikkerhetskopiering, er det nødvend
 RestoreDesc2=Gjenopprett sikkerhetskopifilen (f.eks. Zip-fil) i mappen "dokumenter" til en ny Dolibarr-installasjon eller til gjeldende dokumentmappe (<b> %s </b>).
 RestoreDesc3=Gjenopprett databasestrukturen og dataene fra en sikkerhetskopierings-dumpfil i databasen til den nye Dolibarr-installasjonen eller i databasen til nåværende installasjonen (<b> %s </b>). Advarsel, når gjenopprettingen er fullført, må du bruke et login/passord, som eksisterte fra backup tid/installasjon for å koble til igjen. <br> For å gjenopprette en sikkerhetskopiert database til gjeldende installasjon, kan du følge denne assistenten.
 RestoreMySQL=MySQL import
-ForcedToByAModule= Denne regelen er tvunget til å <b>%s</b> av en aktivert modul
+ForcedToByAModule=Denne regelen er tvunget til å <b>%s</b> av en aktivert modul
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Eksisterende sikkerhetskopier
 PreviousArchiveFiles=Eksisterende arkivfiler
 WeekStartOnDay=Første dag i uken
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP-komponent %s lastet
 PreloadOPCode=Forhåndslastet OPCode brukes
 AddRefInList=Vis kunde/leverandør-ref i liste (velg liste eller kombinasjonsboks), og det meste av hyperkobling. Tredjepart vil vises med navnet "CC12345 - SC45678 - Stort selskap", i stedet for "Stort selskap".
 AddAdressInList=Vis liste over kunde-/leverandøradresseinfo (velg liste eller kombinasjonsboks) <br> Tredjeparter vil vises med et navnformat av "The Big Company Corp." - 21 Jump Street 123456 Big Town - USA "i stedet for" The Big Company Corp ".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Spør etter foretrukket sendingsmetode for tredjeparter
 FieldEdition=Endre felt %s
 FillThisOnlyIfRequired=Eksempel: +2 (brukes kun hvis du opplever problemer med tidssone offset)
@@ -1282,7 +1322,7 @@ GetBarCode=Hent strekkode
 NumberingModules=Nummereringsmodeller
 DocumentModules=Dokumentmodeller
 ##### Module password generation
-PasswordGenerationStandard=Gir et automatisk laget passord med 8 tegn (bokstaver og tall) i små bokstaver.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Ikke foreslå å generere passord. Passord må legges inn manuelt.
 PasswordGenerationPerso=Returner et passord i følge din personlige konfigurasjon
 SetupPerso=I følge din konfigurasjon
@@ -1381,6 +1421,7 @@ AdherentMailRequired=E-post kreves for å lage et nytt medlem
 MemberSendInformationByMailByDefault=Valg for å sende e-postbekreftelse til medlemmer (validering eller nytt abonnement) er krysset av som standard
 VisitorCanChooseItsPaymentMode=Besøkende kan velge blant tilgjengelige betalingsmåter
 MEMBER_REMINDER_EMAIL=Aktiver automatisk påminnelse <b> via e-post </b> av utløpte abonnementer. Merk: Modul <strong> %s </strong> må være aktivert og riktig oppsatt for å sende påminnelser.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Globale parametre
@@ -1523,7 +1564,9 @@ LDAPDescValues=Eksempelverdier er designet for <b>OpenLDAP</b> med følgende las
 ForANonAnonymousAccess=For autentisert tilgang (f.eks skrivetilgang)
 PerfDolibarr=Ytelse oppsett/optimaliseringsrapport
 YouMayFindPerfAdviceHere=Denne siden gir noen kontroller eller råd relatert til ytelse.
-NotInstalled=Ikke installert, så serveren taper ikke ytelse pga. denne.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applikasjons-cache
 MemcachedNotAvailable=Ingen applikativ cache funnet. Du kan forbedre ytelsen ved å installere en cache-server Memcached og en modul som kan bruke denne cache-serveren. <br> Mer informasjon her <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Merk: Mange webhosting-leverandører har ikke en slik cache-server.
 MemcachedModuleAvailableButNotSetup=Modulen memcache er funnet, men oppsett er ikke komplett
@@ -1571,9 +1614,9 @@ SyslogLevel=Nivå
 SyslogFilename=Filnavn og bane
 YouCanUseDOL_DATA_ROOT=Du kan bruke DOL_DATA_ROOT / dolibarr.log som loggfil i Dolibarr "dokumenter"-mappen. Du kan angi en annen bane for å lagre denne filen.
 ErrorUnknownSyslogConstant=Konstant %s er ikke en kjent syslog-konstant
-OnlyWindowsLOG_USER=Windows støtter bare LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Komprimering og sikkerhetskopiering av feilsøkingsloggfiler (generert av modulen Log for debug)
-SyslogFileNumberOfSaves=Logg sikkerhetskopier
+SyslogFileNumberOfSaves=Antall sikkerhetskopilogger som skal beholdes
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Konfigurer planlagt jobb for å angi logg backupfrekvens
 ##### Donations #####
 DonationsSetup=Oppsett av Donasjonsmodulen
@@ -1629,7 +1672,7 @@ AdvancedEditor=Avansert editor
 ActivateFCKeditor=Aktiver avansert editor for:
 FCKeditorForCompany=WYSIWIG opprettelse/endring av elementbeskrivelse og notater (untatt varer og tjenester)
 FCKeditorForProduct=WYSIWIG opprettelse/endring av vare-/tjenestebeskrivelse og notater
-FCKeditorForProductDetails=WYSIWIG opprettelse/endring av varedetaljer for alle enheter (tilbud, ordre, fakturaer, osv ...). <font class="warning"> Advarsel! Bruk av dette alternativet er i dette tilfellet ikke anbefalt, da det kan skape problemer med spesialkarakterer og sideformatering ved opprettelse av PDF-filer.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG opprettelse/endring av masse-e-postutsendelser (Verktøy->E-post)
 FCKeditorForUserSignature=WYSIWIG-opprettelse av signatur
 FCKeditorForMail=WYSIWIG opprettelse/redigering for all post (unntatt Verktøy ->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Oppsett av lagermodul
 IfYouUsePointOfSaleCheckModule=Hvis du bruker Point-of-Sale (POS) som tilbys som standard eller en ekstern modul, kan dette oppsettet ignoreres av din POS-modul. De fleste POS-moduler er som standard designet for å opprette en faktura umiddelbart og redusere lager uavhengig av alternativene her. Så hvis du trenger eller ikke skal ha et lagerreduksjon når du registrerer et salg fra ditt POS, kan du også sjekke innstillingen av POS-modulen.
 ##### Menu #####
 MenuDeleted=Menyen er slettet
+Menu=Meny
 Menus=Menyer
 TreeMenuPersonalized=Egendefinerte menyer
 NotTopTreeMenuPersonalized=Personlige menyer som ikke er lenket til en toppmeny
 NewMenu=Ny meny
-Menu=Menyutvalg
 MenuHandler=Menybehandler
 MenuModule=Kildemodul
 HideUnauthorizedMenu= Skjul uautoriserte menyer (grå)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Angi denne standardverdien automatisk for type hen
 AGENDA_DEFAULT_FILTER_TYPE=Still inn denne typen hendelse automatisk i søkefilter i agendavisning
 AGENDA_DEFAULT_FILTER_STATUS=Angi denne status automatisk for hendelser i søkefilter i agendavisning
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Aktiver hendelsespåminnelse <b> via e-post </b> (påminnelsesalternativ/forsinkelse kan defineres for hver hendelse). Merk: Modul <strong> %s</strong> må være aktivert og riktig satt opp for å få påminnelse sendt med riktig frekvens.
-AGENDA_REMINDER_BROWSER=Aktiver hendelsespåminnelse <b> i brukerens nettleser </b> (når hendelsesdatoen er nådd, kan hver bruker nekte dette fra spørsmålet om nettleserbekreftelse)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Aktiver lydvarsler
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Vis koblet objekt i agendavisning
 ##### Clicktodial #####
 ClickToDialSetup='Click To Dial' modul
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0: Kunde betalingstype, 1: Leverandør betalingstype, 2: Både k
 IncludePath=Inkluder bane (definert i variael %s)
 ExpenseReportsSetup=Oppsett av utgiftsrapport-modulen
 TemplatePDFExpenseReports=Dokumentmaler for å generere utgiftsrapporter
-ExpenseReportsIkSetup=Oppsett av modul Utgiftsrapporter - Kilometerindeks
 ExpenseReportsRulesSetup=Oppsett av modul Utgiftsrapporter - Regler
 ExpenseReportNumberingModules=Utgiftsrapport nummereringsmodul
 NoModueToManageStockIncrease=Ingen modul i stand til å håndtere automatisk lagerøkning er blitt aktivert. Lagerøkning kan bare gjøres manuelt.
@@ -1864,7 +1907,7 @@ MailToSendReception=Mottak
 MailToThirdparty=Tredjeparter
 MailToMember=Medlemmer
 MailToUser=Brukere
-MailToProject=Prosjektside
+MailToProject=Prosjekter
 MailToTicket=Supportsedler
 ByDefaultInList=Vis som standard for liste
 YouUseLastStableVersion=Du bruker siste stabile versjon
@@ -1913,7 +1956,7 @@ MAIN_PDF_MARGIN_LEFT=Venstremarg på PDF
 MAIN_PDF_MARGIN_RIGHT=Høyremarg på PDF
 MAIN_PDF_MARGIN_TOP=Toppmarg på PDF
 MAIN_PDF_MARGIN_BOTTOM=Bunnmarg på PDF
-MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Høyde for logo på PDF
 NothingToSetup=Det er ikke noe spesifikt oppsett som kreves for denne modulen.
 SetToYesIfGroupIsComputationOfOtherGroups=Sett til ja hvis denne gruppen er en beregning av andre grupper
 EnterCalculationRuleIfPreviousFieldIsYes=Angi kalkuleringsregel hvis tidligere felt ble satt til Ja (for eksempel 'CODEGRP1+CODEGRP2')
@@ -1958,9 +2001,11 @@ CodeLastResult=Siste resultatkode
 NbOfEmailsInInbox=Antall e-poster i kildemappen
 LoadThirdPartyFromName=Legg inn tredjepartsøk på %s (bare innlasting)
 LoadThirdPartyFromNameOrCreate=Legg inn tredjepartsøk på %s (opprett hvis ikke funnet)
-WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
-WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
-CreateCandidature=Create candidature
+WithDolTrackingID=Melding fra en samtale initiert av en første e-post sendt fra Dolibarr
+WithoutDolTrackingID=Melding fra en samtale initiert av en første e-post IKKE sendt fra Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
+CreateCandidature=Opprett kandidatur
 FormatZip=Postnummer
 MainMenuCode=Meny-oppføringskode (hovedmeny)
 ECMAutoTree=Vis ECM-tre automatisk 
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Deaktiver funksjonen for å koble en ressurs til kon
 EnableResourceUsedInEventCheck=Aktiver funksjon for å sjekke om en ressurs er i bruk i en hendelse
 ConfirmUnactivation=Bekreft nullstilling av modul
 OnMobileOnly=Kun på små skjermer (smarttelefon)
-DisableProspectCustomerType=Deaktiver "Prospect + Customer" tredjeparts type (tredjepart må være prospekt eller kunde, men kan ikke være begge)
+DisableProspectCustomerType=Deaktiver tredjepartstypen "Prospekt + Kunde" (tredjepart må være "Prospekt" eller "Kunde", men kan ikke være begge)
 MAIN_OPTIMIZEFORTEXTBROWSER=Forenkle grensesnitt for blinde personer
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Aktiver dette alternativet hvis du er blind, eller hvis du bruker programmet fra en tekstbrowser som Lynx eller Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Endre grensesnittets farge for fargeblind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Bruk feilsøkingsfeltet
 DEBUGBAR_LOGS_LINES_NUMBER=Nummer på siste logglinjer å beholde i konsollen
 WarningValueHigherSlowsDramaticalyOutput=Advarsel, høyere verdier reduserer resultatet dramatisk
 ModuleActivated=Modul %s er aktivert og bremser grensesnittet
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Eksportmodellene er delt med alle
 ExportSetup=Oppsett av modul Eksport
 ImportSetup=Oppsett av importmodul
 InstanceUniqueID=Unik ID for forekomsten
 SmallerThan=Mindre enn
 LargerThan=Større enn
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=Med en Gmail-konto, hvis du aktiverte 2-trinns validering, anbefales det å opprette et dedikert annet passord for applikasjonen, i stedet for å bruke ditt eget kontopassord fra https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=Du kan bruke denne handlingen til å bruke e-postinnholdet til å finne og laste inn en eksisterende tredjepart i databasen din. Den funnet (eller opprettede) tredjeparten vil bli brukt til å følge handlinger som trenger det. I parameterfeltet kan du bruke for eksempel 'EXTRACT:BODY:Name:\\s([^\\s]*)' hvis du vil trekke ut navnet på tredjeparten fra en streng 'Name: name to find' funnet i teksten.
@@ -2026,7 +2073,13 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Gå til Setup -> Widgets
 MeasuringUnitTypeDesc=Bruk en verdi som "størrelse", "overflate", "volum", "vekt", "tid"
 MeasuringScaleDesc=Skalaen er antall steder du må flytte kommaet for å samsvare med standard referansenhet. For enhetstypen "tid" er det antall sekunder. Verdier mellom 80 og 99 er reserverte verdier.
-TemplateAdded=Template added
-TemplateUpdated=Template updated
-TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+TemplateAdded=Mal lagt til
+TemplateUpdated=Mal oppdatert
+TemplateDeleted=Mal slettet
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Varens art
+CountryIfSpecificToOneCountry=Land (hvis spesifikt for et gitt land)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/nb_NO/banks.lang b/htdocs/langs/nb_NO/banks.lang
index dfe2685ab83..4717bd50c69 100644
--- a/htdocs/langs/nb_NO/banks.lang
+++ b/htdocs/langs/nb_NO/banks.lang
@@ -37,8 +37,8 @@ IbanValid=BAN gyldig
 IbanNotValid=BAN ikke gyldig
 StandingOrders=Direktedebetsordre
 StandingOrder=Direktedebet-ordre
-PaymentByDirectDebit=Payment by direct debit
-PaymentByBankTransfers=Payments by credit transfer
+PaymentByDirectDebit=Betaling med direktedebet
+PaymentByBankTransfers=Betalinger med kreditoverføring
 PaymentByBankTransfer=Betaling med kredittoverføring
 AccountStatement=Kontoutskrift
 AccountStatementShort=Utskrift
@@ -106,8 +106,8 @@ SupplierInvoicePayment=Leverandørbetaling
 SubscriptionPayment=Abonnementsbetaling
 WithdrawalPayment=Debiter betalingsordre
 SocialContributionPayment=Betaling av skatter og avgifter
-BankTransfer=Credit transfer
-BankTransfers=Credit transfers
+BankTransfer=Kredittoverføring
+BankTransfers=Kredittoverføringer
 MenuBankInternalTransfer=Intern overførsel
 TransferDesc=Overføring fra en konto til en annen, vil Dolibarr skrive to poster (en debet i kildekonto og en kreditt i målkontoen). Det samme beløpet (unntatt tegn), etikett og dato vil bli brukt til denne transaksjonen)
 TransferFrom=Fra
@@ -166,6 +166,9 @@ VariousPayment=Diverse betaling
 VariousPayments=Diverse utbetalinger
 ShowVariousPayment=Vis diverse betaling
 AddVariousPayment=Legg til diverse betaling
+VariousPaymentId=Diverse betalings-ID
+VariousPaymentLabel=Diverse betaling etiketter
+ConfirmCloneVariousPayment=Bekreft kloning av en diversebetaling
 SEPAMandate=SEPA mandat
 YourSEPAMandate=Ditt SEPA-mandat
 FindYourSEPAMandate=Dette er ditt SEPA-mandat for å autorisere vårt firma til å utføre direktedebitering til din bank. Send det i retur signert (skanning av det signerte dokumentet) eller send det via post til
@@ -176,3 +179,4 @@ BankColorizeMovement=Fargelegg bevegelser
 BankColorizeMovementDesc=Hvis denne funksjonen er aktivert, kan du velge spesifikk bakgrunnsfarge for debet- eller kredittbevegelser
 BankColorizeMovementName1=Bakgrunnsfarge for debetbevegelse
 BankColorizeMovementName2=Bakgrunnsfarge for kredittbevegelse
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index 0ce361d058e..140ab547c4d 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -505,7 +505,7 @@ ToMakePayment=Betal
 ToMakePaymentBack=Tilbakebetal
 ListOfYourUnpaidInvoices=Liste over ubetalte fakturaer
 NoteListOfYourUnpaidInvoices=Denne listen inneholder kun fakturaer for tredjeparter du er koblet til som salgsrepresentant.
-RevenueStamp=Tax stamp
+RevenueStamp=Avgiftstempel
 YouMustCreateInvoiceFromThird=Dette alternativet er bare tilgjengelig når du oppretter faktura fra kategorien "kunde" under tredjepart
 YouMustCreateInvoiceFromSupplierThird=Dette alternativet er bare tilgjengelig når du oppretter faktura fra kategorien "leverandør" under tredjepart
 YouMustCreateStandardInvoiceFirstDesc=Du må først lage en standardfaktura og så konvertere den til "mal" for å lage en ny fakturamal
@@ -531,6 +531,7 @@ TypeContact_invoice_supplier_external_SERVICE=Leverandørens servicekontakt
 InvoiceFirstSituationAsk=Første delfaktura
 InvoiceFirstSituationDesc=<b>Delfakturaer</b> er bundet til en situasjon og følger dennes progresjon, for eksempel byggingen av en konstruksjo. Hver delfaktura er bundet til en faktura.
 InvoiceSituation=Delfaktura
+PDFInvoiceSituation=Delfaktura
 InvoiceSituationAsk=Faktura som følger situasjonen
 InvoiceSituationDesc=Oppret ny situasjon som følger en eksisterende
 SituationAmount=Delfaktura-beløp (eks. MVA)
@@ -575,3 +576,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Leverandørfaktura slettet
 UnitPriceXQtyLessDiscount=Enhetspris x Antall - Rabatt
 CustomersInvoicesArea=Kunde-faktureringsområde
 SupplierInvoicesArea=Leverandør faktureringsområde
+FacParentLine=Faktura forelderlinje
+SituationTotalRayToRest=Rest å betale eks. mva
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progresjon%d %%
diff --git a/htdocs/langs/nb_NO/categories.lang b/htdocs/langs/nb_NO/categories.lang
index 5f237544729..b5d42ea3eba 100644
--- a/htdocs/langs/nb_NO/categories.lang
+++ b/htdocs/langs/nb_NO/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Oppsett av merker/kategorier
 CategorieRecursiv=Automatisk lenke til overordnet merke/kategori
 CategorieRecursivHelp=Hvis alternativet er på, når du legger til et produkt i en underkategori, vil produktet også bli lagt til i overordnet kategori.
 AddProductServiceIntoCategory=Legg til følgende vare/tjeneste
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Vis merke/kategori
 ByDefaultInList=Som standard i liste
 ChooseCategory=Velg kategori
-StocksCategoriesArea=Område for lagerkategorier
-ActionCommCategoriesArea=Område for hendelseskategorier 
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Lager Kategorier
+ActionCommCategoriesArea=Hendelseskategorier
+WebsitePagesCategoriesArea=Side-Container Kategorier
 UseOrOperatorForCategories=Bruker eller operatør for kategorier
diff --git a/htdocs/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang
index e3d4243f59b..8a54b565605 100644
--- a/htdocs/langs/nb_NO/companies.lang
+++ b/htdocs/langs/nb_NO/companies.lang
@@ -124,8 +124,8 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-IdNr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
-ProfId6AT=--
+ProfId5AT=EORI number
+ProfId6AT=-
 ProfId1AU=Prof ID 1 (ABN)
 ProfId2AU=-
 ProfId3AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof ID 1 (Profesjonelt nummer)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof ID 1 (Føderalt nummer)
 ProfId4CH=Prof ID 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof ID 1 (RUT)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof ID 1 (USt.-IdNr)
 ProfId2DE=Prof ID 2 (USt.-Nr)
 ProfId3DE=Prof ID 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof ID 1 (CIF / NIF)
 ProfId2ES=Prof ID 2 (personnummer)
 ProfId3ES=Prof ID 3 (CNAE)
 ProfId4ES=Prof ID 4 (Collegiate nummer)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof ID 1 (SIREN)
 ProfId2FR=Prof ID 2 (SIRET)
 ProfId3FR=Prof ID 3 (NAF, gammel APE)
 ProfId4FR=Prof ID 4 (RCS/RM)
-ProfId5FR=Prof Id 5
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Prof Id 1 (Registreringsnummer)
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof ID 3 (SRVC TAX)
 ProfId4IN=Prof ID 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Prof. ID 1 (R.C.S Luxembourg)
 ProfId2LU=Prof. ID (Forretningslisens)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Prof ID 1 (RC)
 ProfId2MA=Prof ID 2 (patent)
 ProfId3MA=Prof ID 3 (IF)
 ProfId4MA=Prof ID 4 (CNSS)
-ProfId5MA=Prof ID 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof ID 1 (RFC).
 ProfId2MX=Prof ID 2 (R.. P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof ID 1 (NIPC)
 ProfId2PT=Prof ID 2 (Personnummer)
 ProfId3PT=Prof ID 3 (Commercial Record number)
 ProfId4PT=Prof ID 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof ID 1 (OGRN)
 ProfId2RU=Prof ID 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=Du kan også sjekke manuelt på den Europeiske kommisjonens
 ErrorVATCheckMS_UNAVAILABLE=Sjekk er ikke tilgjengelig. Tjenesten er ikke tilgjengelig for landet (%s).
 NorProspectNorCustomer=Ikke prospekt, eller kunde
 JuridicalStatus=Juridisk enhetstype
+Workforce=Arbeidsstyrke
 Staff=Ansatte
 ProspectLevelShort=Potensiell
 ProspectLevel=Prospektpotensiale
@@ -425,7 +431,7 @@ ListSuppliersShort=Liste over leverandører
 ListProspectsShort=Liste over prospekter
 ListCustomersShort=Liste over kunder
 ThirdPartiesArea=Tredjeparter / Kontakter
-LastModifiedThirdParties=Latest %s modified Third Parties
+LastModifiedThirdParties=Siste %s endrede tredjeparter
 UniqueThirdParties=Totalt antall tredjeparter
 InActivity=Åpent
 ActivityCeased=Stengt
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Betalingsbetingelser - Leverandør
 PaymentTypeBoth=Betalingstype - kunde og leverandør
 MulticurrencyUsed=Bruk flere valutaer
 MulticurrencyCurrency=Valuta
+InEEC=Europa (EU)
+RestOfEurope=Resten av Europa (EU)
+OutOfEurope=Ut av Europa (EU)
+CurrentOutstandingBillLate=Nåværende utestående regning sen
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Vær forsiktig, avhengig av varepris-innstillingene dine, bør du endre tredjepart før du legger produktet til POS.
diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang
index 3cdb939010a..41a36d6b33f 100644
--- a/htdocs/langs/nb_NO/compta.lang
+++ b/htdocs/langs/nb_NO/compta.lang
@@ -69,7 +69,7 @@ SocialContribution=Skatt eller avgift
 SocialContributions=Skatter eller avgifter
 SocialContributionsDeductibles=Fradragsberettigede avgifter
 SocialContributionsNondeductibles=Ikke fradragsberettigede avgifter
-DateOfSocialContribution=Date of social or fiscal tax
+DateOfSocialContribution=Dato for sosial avgifter eller skatter
 LabelContrib=Etikett bidrag
 TypeContrib=Type bidrag
 MenuSpecialExpenses=Spesielle utgifter
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Viser poster i hovedboken med regnskapskontoe
 SeePageForSetup=Se meny <a href="%s">%s</a> for oppsett
 DepositsAreNotIncluded=- Nedbetalingsfakturaer er ikke inkludert
 DepositsAreIncluded=- Nedbetalingsfakturaer er inkludert
+LT1ReportByMonth=Skatt 2-rapport etter måned
+LT2ReportByMonth=Skatt 3-rapport etter måned
 LT1ReportByCustomers=Rapporter MVA-2 etter tredjepart
 LT2ReportByCustomers=Rapporter MVA-3 etter tredjepart
 LT1ReportByCustomersES=Rapport etter tredjepart RE
 LT2ReportByCustomersES=Rapport over tredjepart IRPF
 VATReport=MVA-rapport
 VATReportByPeriods=MVA-rapport etter periode
+VATReportByMonth=MVA-rapport etter måned
 VATReportByRates=MVA-rapport etter sats
 VATReportByThirdParties=MVA-rapport etter tredjepart
 VATReportByCustomers=MVA-rapport etter kunde
diff --git a/htdocs/langs/nb_NO/ecm.lang b/htdocs/langs/nb_NO/ecm.lang
index 688e58621fa..90e2fb21512 100644
--- a/htdocs/langs/nb_NO/ecm.lang
+++ b/htdocs/langs/nb_NO/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Søk på nøkkelord
 ECMSearchByEntity=Søk på objekt
 ECMSectionOfDocuments=Mapper med dokumenter
 ECMTypeAuto=Automatisk
-ECMDocsBySocialContributions=Dokumenter lenket til skatter og avgifter
-ECMDocsByThirdParties=Dokumenter knyttet til tredjeparter
-ECMDocsByProposals=Dokumenter knyttet til tilbud
-ECMDocsByOrders=Dokumenter knyttet til kundeordre
-ECMDocsByContracts=Dokumenter knyttet til kontrakter
-ECMDocsByInvoices=Dokumenter knyttet til kundefakturaer
-ECMDocsByProducts=Dokumenter knyttet til varer
-ECMDocsByProjects=Dokumenter relatert til prosjekter
-ECMDocsByUsers=Dokumenter relatert til brukere
-ECMDocsByInterventions=Dokumenter relatert til intervensjoner
-ECMDocsByExpenseReports=Dokumenter lenket til utgiftsrapporter
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=Ingen mapper opprettet
 ShowECMSection=Vis mappe
 DeleteSection=Fjern mappe
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync liste over kataloger
 HashOfFileContent=Hash av filinnhold
 NoDirectoriesFound=Ingen mapper funnet
 FileNotYetIndexedInDatabase=Filen er ikke indeksert i databasen (prøv å laste den opp igjen)
+ExtraFieldsEcmFiles=Ekstrafelt Ecm Filer
+ExtraFieldsEcmDirectories=Ekstrafelt Ecm-mapper
+ECMSetup=ECM-oppsett
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index 7a37155c119..38fa5f550a7 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -5,6 +5,7 @@ NoErrorCommitIsDone=Ingen feil
 # Errors
 ErrorButCommitIsDone=Valider selv om feil ble funnet
 ErrorBadEMail=E-post %s er feil
+ErrorBadMXDomain=E-post %s virker feil (domenet har ingen gyldig MX-post)
 ErrorBadUrl=Url %s er feil
 ErrorBadValueForParamNotAString=Feil parameterverdi. Dette skjer vanligvis når en oversettelse mangler.
 ErrorLoginAlreadyExists=brukernavnet %s eksisterer allerede.
@@ -120,7 +121,7 @@ ErrorLoginHasNoEmail=Denne brukeren har ingen e-postadresse. Prosess avbrutt.
 ErrorBadValueForCode=Feil verdi for sikkerhetskode. Prøv igjen med ny verdi ...
 ErrorBothFieldCantBeNegative=Feltene %s og %s kan ikke begge være negative
 ErrorFieldCantBeNegativeOnInvoice=Felt <strong> %s </strong> kan ikke være negativt på denne typen faktura. Hvis du trenger å legge til en rabattlinje, oppretter du bare rabatten først (fra feltet '%s' i tredjepartskort) og bruker den på fakturaen.
-ErrorLinesCantBeNegativeForOneVATRate=Total of lines (net of tax) can't be negative for a given not null VAT rate (Found a negative total for VAT rate <b>%s</b>%%).
+ErrorLinesCantBeNegativeForOneVATRate=Totalt antall linjer (netto skatt) kan ikke være negativt for en gitt ikke null mva-sats (Fant en negativ sum for mva-sats <b> %s </b> %%).
 ErrorLinesCantBeNegativeOnDeposits=Linjer kan ikke være negative i et innskudd. Du vil få problemer når du trenger å bruke innskuddet på sluttfaktura hvis du gjør det.
 ErrorQtyForCustomerInvoiceCantBeNegative=Kvantum på linjer i kundefakturaer kan ikke være negativ
 ErrorWebServerUserHasNotPermission=Brukerkonto <b>%s</b> som brukes til å kjøre web-server har ikke tillatelse til det
@@ -216,7 +217,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Du må velge om artikkelen er et
 ErrorDiscountLargerThanRemainToPaySplitItBefore=Rabatten du prøver å legge til er større enn restbeløp. Del rabatten i 2 mindre rabatter.
 ErrorFileNotFoundWithSharedLink=Filen ble ikke funnet. Kanskje delingsnøkkelen ble endret eller filen ble fjernet nylig.
 ErrorProductBarCodeAlreadyExists=Vare-strekkoden %s finnes allerede i en annen produktreferanse.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Vær også oppmerksom på at bruk av virtuelle varer som har automatisk økning/reduksjon av undervarer, ikke er mulig når minst en undervare (eller undervare av undervarer) trenger et serienummer/lotnummer.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Vær også oppmerksom på at bruk av sett for automatisk økning/reduksjon av underprodukter ikke er mulig når minst ett underprodukt (eller underprodukt av underprodukter) trenger et serienummer.
 ErrorDescRequiredForFreeProductLines=Beskrivelse er obligatorisk for linjer med gratis vare
 ErrorAPageWithThisNameOrAliasAlreadyExists=Siden/containeren <strong> %s </strong> har samme navn eller alternativt alias som den du prøver å bruke
 ErrorDuringChartLoad=Feil ved lasting av kart over kontoer. Hvis noen kontoer ikke ble lastet, kan du fremdeles angi dem manuelt.
@@ -240,9 +241,11 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Ikke nok mengde for dette p
 ErrorOnlyOneFieldForGroupByIsPossible=Bare ett felt for 'Grupper etter' er mulig (andre blir forkastet)
 ErrorTooManyDifferentValueForSelectedGroupBy=Fant for mange forskjellige verdier (mer enn <b> %s </b>) for feltet '<b> %s </b>', så vi kan ikke bruke det 'Gruppering' for grafikk. Feltet 'Grupper etter' er fjernet. Kan det være du ønsket å bruke den som en X-akse?
 ErrorReplaceStringEmpty=Feil, strengen du vil erstatte til er tom
-ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
-ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
-ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorProductNeedBatchNumber=Feil, vare'<b> %s </b>' trenger lot/serienummer
+ErrorProductDoesNotNeedBatchNumber=Feil, vare'<b> %s </b>' godtar ikke lot/serienummer
+ErrorFailedToReadObject=Feil, kunne ikke lese objektet av typen <b> %s </b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Feil, parameter <b> %s </b> må være aktivert i <b> conf/conf.php <b> for å tillate bruk av kommandolinjegrensesnitt av den interne jobbplanleggeren
+ErrorLoginDateValidity=Feil, denne påloggingen er utenfor gyldig datoområde
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP-parameteren upload_max_filesize (%s) er høyere enn PHP-parameteren post_max_size (%s). Dette er ikke et konsistent oppsett.
 WarningPasswordSetWithNoAccount=Et passord ble satt for dette medlemmet, men ingen brukerkonto ble opprettet. Det fører til at passordet ikke kan benyttes for å logge inn på Dolibarr. Det kan brukes av en ekstern modul/grensesnitt, men hvis du ikke trenger å definere noen innlogging eller passord for et medlem, kan du deaktivere alternativet "opprett en pålogging for hvert medlem" fra medlemsmodul-oppsettet. Hvis du trenger å administrere en pålogging, men ikke trenger noe passord, kan du holde dette feltet tomt for å unngå denne advarselen. Merk: E-post kan også brukes som en pålogging dersom medlemmet er knyttet til en bruker.
@@ -267,6 +270,9 @@ WarningYourLoginWasModifiedPleaseLogin=Din innlogging er blitt endret. Av sikker
 WarningAnEntryAlreadyExistForTransKey=En oppføring eksisterer allerede for oversettelsesnøkkel for dette språket
 WarningNumberOfRecipientIsRestrictedInMassAction=Advarsel, antall forskjellige mottakere er begrenset til <b> %s </b> ved bruk av massehandlinger på lister
 WarningDateOfLineMustBeInExpenseReportRange=Advarsel, datoen for linjen ligger utenfor tiden til utgiftsrapporten
+WarningProjectDraft=Prosjektet er fortsatt i utkastmodus. Ikke glem å validere det hvis du planlegger å bruke oppgaver.
 WarningProjectClosed=Prosjektet er stengt. Du må gjenåpne det først.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Noen banktransaksjoner ble fjernet etter at kvitteringen deres ble generert. Antall sjekker og total mottak kan avvike fra antall og total på listen.
-WarningFailedToAddFileIntoDatabaseIndex=Advarsel, kunne ikke legge filoppføring i ECM-databasens indekstabell
+WarningFailedToAddFileIntoDatabaseIndex=Advarsel, kunne ikke legge til filoppføring i ECM-databasens indekstabell
+WarningTheHiddenOptionIsOn=Advarsel, det skjulte alternativet <b> %s </b> er på.
+WarningCreateSubAccounts=Advarsel, du kan ikke opprette en underkonto direkte, du må opprette en tredjepart eller en bruker og tildele dem en regnskapskode for å finne dem i denne listen
diff --git a/htdocs/langs/nb_NO/hrm.lang b/htdocs/langs/nb_NO/hrm.lang
index 0dbd0e83398..bc2d3906005 100644
--- a/htdocs/langs/nb_NO/hrm.lang
+++ b/htdocs/langs/nb_NO/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Jobbstillinger
 Employees=Ansatte
 Employee=Ansatt
 NewEmployee=Ny ansatt
+ListOfEmployees=Liste over ansatte
diff --git a/htdocs/langs/nb_NO/install.lang b/htdocs/langs/nb_NO/install.lang
index e5d62a59c1e..d47d9658a94 100644
--- a/htdocs/langs/nb_NO/install.lang
+++ b/htdocs/langs/nb_NO/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Konfigurasjonsfil <b>%s</b> er ikke skrivbar. Sjekk tillat
 ConfFileIsWritable=Konfigurasjonsfil <b>%s</b> er skrivbar.
 ConfFileMustBeAFileNotADir=Konfigurasjonsfil <b> %s </b> må være en fil, ikke en katalog.
 ConfFileReload=Laster parametere fra konfigurasjonsfilen på nytt.
-PHPSupportSessions=Denne PHP støtter sesjoner.
 PHPSupportPOSTGETOk=Dette PHP støtter variablene POST og GET.
 PHPSupportPOSTGETKo=Det er mulig at ditt PHP-oppsett ikke støtter variablene POST og/eller GET. Sjekk parametrene <b>variables_order</b> i php.ini.
-PHPSupportGD=Denne PHP støtter GD grafiske funksjoner.
-PHPSupportCurl=Denne PHP støtter Curl.
-PHPSupportCalendar=Denne PHP støtter kalenderutvidelser.
-PHPSupportUTF8=Denne PHP støtter UTF8 funksjoner.
-PHPSupportIntl=Dette PHP støtter Intl funksjoner.
-PHPSupportxDebug=Denne PHP støtter utvidede feilsøkingsfunksjoner.
+PHPSupportSessions=Denne PHP støtter sesjoner.
 PHPSupport=Denne PHP støtter %s-funksjoner.
 PHPMemoryOK=Din PHP økt-minne er satt til maks.<b>%s</b> bytes. Dette bør være nok.
 PHPMemoryTooLow=Din PHP max økter-minnet er satt til <b>%s</b> bytes. Dette er for lavt. Endre <b>php.ini</b> å sette <b>memory_limit</b> parameter til minst <b>%s</b> byte.
@@ -218,6 +212,6 @@ ErrorFoundDuringMigration=Feil ble rapportert under migreringsprosessen, slik at
 YouTryInstallDisabledByDirLock=Programmet prøvde å oppgradere selv, men installerings- / oppgraderingssidene er deaktivert for sikkerhet (katalog omdøpt med .lock-suffiks). <br>
 YouTryInstallDisabledByFileLock=Programmet prøvde å oppgradere selv, men installerings- / oppgraderingssidene er deaktivert for sikkerhet (ved eksistensen av en låsfil <strong> install.lock </strong> i dolibarr-dokumenter katalogen). <br>
 ClickHereToGoToApp=Klikk her for å gå til din applikasjon
-ClickOnLinkOrRemoveManualy=If an upgrade is in progress, please wait. If not, click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+ClickOnLinkOrRemoveManualy=Vennligst vent hvis en oppgradering pågår. Hvis ikke, klikk på følgende lenke. Hvis du alltid ser den samme siden, må du fjerne/gi nytt navn til filen install.lock i dokumentkatalogen.
 Loaded=Lastet
 FunctionTest=Funksjonstest
diff --git a/htdocs/langs/nb_NO/intracommreport.lang b/htdocs/langs/nb_NO/intracommreport.lang
new file mode 100644
index 00000000000..09e18b987c2
--- /dev/null
+++ b/htdocs/langs/nb_NO/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm rapport
+Module68000Desc = Intracomm rapportadministrasjon (støtte for fransk DEB / DES-format)
+IntracommReportSetup = Oppsett av iIntracommrapport
+IntracommReportAbout = Om intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Aktørtype
+INTRACOMMREPORT_ROLE_ACTEUR=Aktørrolle
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Deklarantnummer
+
+# Menu
+MenuIntracommReport=Intracomm rapport
+MenuIntracommReportNew=Ny deklarasjon
+MenuIntracommReportList=Liste
+
+# View
+NewDeclaration=Ny deklarasjon
+Declaration=Deklarasjon
+AnalysisPeriod=Analyseperiode
+TypeOfDeclaration=Type deklarasjon
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Klargjøring av en XML-fil i ProDouane-format
+
+# List
+IntracommReportList=Liste over genererte deklarasjoner
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Analyseperiode
+IntracommReportTypeDeclaration=Type deklarasjon
+IntracommReportDownload=last ned XML-fil
+
+# Invoice
+IntracommReportTransportMode=Transportmodus
diff --git a/htdocs/langs/nb_NO/languages.lang b/htdocs/langs/nb_NO/languages.lang
index 5a1c4ec625f..96839b3311b 100644
--- a/htdocs/langs/nb_NO/languages.lang
+++ b/htdocs/langs/nb_NO/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spansk (Panama)
 Language_es_PY=Spansk (Paraguay)
 Language_es_PE=Spansk (Peru)
 Language_es_PR=Spansk (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spansk (Uruguay)
 Language_es_GT=Spansk (Guatemala)
 Language_es_VE=Spansk (Venezuela)
@@ -55,7 +56,7 @@ Language_fr_CM=Fransk (Kamerun)
 Language_fr_FR=Fransk
 Language_fr_GA=Fransk (Gabon)
 Language_fr_NC=Fransk (Ny Caledonia)
-Language_fr_SN=French (Senegal)
+Language_fr_SN=Fransk (Senegal)
 Language_fy_NL=Frisisk
 Language_gl_ES=Gælisk
 Language_he_IL=Hebraisk
diff --git a/htdocs/langs/nb_NO/mails.lang b/htdocs/langs/nb_NO/mails.lang
index 42c280be51f..5d1b285f2bb 100644
--- a/htdocs/langs/nb_NO/mails.lang
+++ b/htdocs/langs/nb_NO/mails.lang
@@ -125,12 +125,13 @@ TagMailtoEmail=Mottakerepost (inkludert html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=Ingen e-post sendt. Feil på avsender eller mottaker. Verifiser brukerprofil
 # Module Notifications
 Notifications=Varsler
-NoNotificationsWillBeSent=Ingen e-postvarsler er planlagt for denne hendelsen/firmaet
-ANotificationsWillBeSent=1 e-postvarsel vil bli sendt med e-post
-SomeNotificationsWillBeSent=%s e-postvarsler vil bli sendt med e-post
-AddNewNotification=Aktiver en ny e-postvarsling mål/hendelse
-ListOfActiveNotifications=List alle aktive mål/hendelser for e-postvarsling
-ListOfNotificationsDone=List alle e-postmeldinger sendt
+NotificationsAuto=Påminnelser Auto.
+NoNotificationsWillBeSent=Ingen automatiske e-postvarsler er planlagt for denne hendelsestypen og selskap
+ANotificationsWillBeSent=Én automatisk varsling vil bli sendt via e-post
+SomeNotificationsWillBeSent=%s automatiske varsler vil bli sendt via e-post
+AddNewNotification=Aktiver et nytt automatisk mål/hendelse for e-postvarsling
+ListOfActiveNotifications=Liste over alle aktive mål/hendelser for automatisk e-postvarsling
+ListOfNotificationsDone=Liste over alle automatiske e-postvarsler som er sendt
 MailSendSetupIs=E-postutsendelser er  blitt satt opp til '%s'. Denne modusen kan ikke brukes ved masseutsendelser
 MailSendSetupIs2=Logg på som administrator, gå til menyen %sHjem - Oppsett - E-post%s for å endre parameter <strong>'%s'</strong> for å bruke '%s' modus. I denne modusen for du tilgang til oppsett av SMTP-server og muligheten til å bruke masseutsendelser.
 MailSendSetupIs3=Ved spørsmål om hvordan du skal sette opp SMTP-serveren din, kontakt %s
@@ -162,13 +163,14 @@ AdvTgtCreateFilter=Opprett filter
 AdvTgtOrCreateNewFilter=Navn på nytt filter
 NoContactWithCategoryFound=Ingen kontakter/adresser med kategori funnet
 NoContactLinkedToThirdpartieWithCategoryFound=Ingen kontakter/adresser med kategori funnet
-OutGoingEmailSetup=Oppsett for utgående epost
-InGoingEmailSetup=Oppsett for innkommende epost
-OutGoingEmailSetupForEmailing=Oppsett for utgående e-post (for modul %s)
-DefaultOutgoingEmailSetup=Standard utgående e-postoppsett
+OutGoingEmailSetup=Utgående e-post
+InGoingEmailSetup=Innkommende e-post
+OutGoingEmailSetupForEmailing=Utgående e-post (for modul %s)
+DefaultOutgoingEmailSetup=Samme konfigurasjon som det globale utgående e-postoppsettet
 Information=Informasjon
 ContactsWithThirdpartyFilter=Kontakter med tredjepartsfilter
-Unanswered=Unanswered
+Unanswered=Ubesvart
 Answered=Besvarte
-IsNotAnAnswer=Is not answer (initial email)
-IsAnAnswer=Is an answer of an initial email
+IsNotAnAnswer=Er ikke svar (første e-post)
+IsAnAnswer=Er et svar på en første e-post
+RecordCreatedByEmailCollector=Post opprettet av Email Collector %s fra e-post %s
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index b8fcb183568..8def7e71e28 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Fjern lenke
 AddToDraft=Legg til i kladd
 Update=Oppdater
 Close=Lukk
+CloseAs=Sett status til
 CloseBox=Fjern widget fra kontrollpanelet
 Confirm=Bekreft
 ConfirmSendCardByMail=Vil du virkelig sende innholdet av dette kortet med epost til <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Gjenåpne
 Upload=Last opp
 ToLink=Lenke
 Select=Velg
+SelectAll=Select all
 Choose=Velg
 Resize=Endre størrelse
 ResizeOrCrop=Endre størrelse eller beskjær
@@ -256,6 +258,7 @@ Cards=Kort
 Card=Kort
 Now=Nå
 HourStart=Start time
+Deadline=Deadline
 Date=Dato
 DateAndHour=Dato og tid
 DateToday=Dagens dato
@@ -264,8 +267,10 @@ DateStart=Startdato
 DateEnd=Sluttdato
 DateCreation=Opprettet den
 DateCreationShort=Oppr. dato
+IPCreation=Creation IP
 DateModification=Endret den
 DateModificationShort=Mod. dato
+IPModification=Modification IP
 DateLastModification=Siste endringsdato
 DateValidation=Validert den
 DateClosing=Lukket den
@@ -319,6 +324,7 @@ Morning=Morgen
 Afternoon=Ettermiddag
 Quadri=Kvartal
 MonthOfDay=Dag i måneden
+DaysOfWeek=Dager i uken
 HourShort=T
 MinuteShort=mn
 Rate=Sats
@@ -356,7 +362,7 @@ Amount=Beløp
 AmountInvoice=Fakturabeløp
 AmountInvoiced=Beløp fakturert
 AmountInvoicedHT=Fakturert beløp (ekskl. MVA)
-AmountInvoicedTTC=Amount invoiced (inc. tax)
+AmountInvoicedTTC=Fakturert beløp (inkl. MVA)
 AmountPayment=Betalingsbeløp
 AmountHTShort=Beløp (ekskl.)
 AmountTTCShort=Beløp (inkl. MVA)
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Beløp, original valuta
 MulticurrencyAmountHT=Beløp (ekskl. MVA), opprinnelig valuta
 MulticurrencyAmountTTC=Beløp (ink. MVA), original valuta
 MulticurrencyAmountVAT=MVA-beløp, original valuta
+MulticurrencySubPrice=Beløp subpris multivaluta
 AmountLT1=Beløp MVA 2
 AmountLT2=Beløp MVA 3
 AmountLT1ES=Beløp RE
@@ -487,6 +494,7 @@ By=Av
 From=Fra
 FromDate=Fra
 FromLocation=Fra
+at=på
 to=til
 To=til
 and=og
@@ -509,6 +517,7 @@ Draft=Kladd
 Drafts=Kladder
 StatusInterInvoiced=Fakturert
 Validated=Validert
+ValidatedToProduce=Validerte (å produsere)
 Opened=Åpent
 OpenAll=Åpne (Alle)
 ClosedAll=Lukket (Alle)
@@ -655,6 +664,7 @@ Response=Svar
 Priority=Prioritet
 SendByMail=Send via epost
 MailSentBy=E-post sendt av
+NotSent=Ikke sendt
 TextUsedInTheMessageBody=E-mail meldingstekst
 SendAcknowledgementByMail=Send bekrftelse på epost
 SendMail=Send e-post
@@ -688,7 +698,7 @@ Method=Metode
 Receive=Motta
 CompleteOrNoMoreReceptionExpected=Komplett eller ingenting mer forventet
 ExpectedValue=Forventet verdi
-ExpectedQty=Expected Qty
+ExpectedQty=Forventet antall
 PartialWoman=Delvis
 TotalWoman=Total
 NeverReceived=Aldri mottatt
@@ -705,7 +715,7 @@ MenuECM=Dokumenter
 MenuAWStats=AWStats
 MenuMembers=Medlemmer
 MenuAgendaGoogle=Google agenda
-MenuTaxesAndSpecialExpenses=Taxes | Special expenses
+MenuTaxesAndSpecialExpenses=Avgifter | Spesielle utgifter
 ThisLimitIsDefinedInSetup=Dolibarr grense (Menu home-setup-security): %s Kb, PHP grense: %s Kb
 NoFileFound=Ingen dokumenter er lagret i denne mappen
 CurrentUserLanguage=Gjeldende språk
@@ -728,7 +738,7 @@ Page=Side
 Notes=Merknader
 AddNewLine=Legg til ny linje
 AddFile=Legg til fil
-FreeZone=Free-text product
+FreeZone=Fritekstvare
 FreeLineOfType=Fritekst element, type:
 CloneMainAttributes=Klon objektet med de viktigste attributtene
 ReGeneratePDF=Regenerere PDF
@@ -836,6 +846,7 @@ ListOfTemplates=Liste over maler
 Gender=Kjønn
 Genderman=Mann
 Genderwoman=Kvinne
+Genderother=Annet
 ViewList=Listevisning
 ViewGantt=Gantt-visning
 ViewKanban=Kanban-visning
@@ -877,6 +888,8 @@ Miscellaneous=Diverse
 Calendar=Kalender
 GroupBy=Grupper etter...
 ViewFlatList=Vis liste
+ViewAccountList=Vis hovedbok
+ViewSubAccountList=Vis underkonto hovedbok
 RemoveString=Fjern strengen '%s'
 SomeTranslationAreUncomplete=Noen av språkene som tilbys kan bare oversettes delvis eller kan inneholde feil. Vennligst hjelp å korrigere språket ditt ved å registrere deg på <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> for å legge til forbedringene dine.
 DirectDownloadLink=Direkte nedlastingslink (offentlig/ekstern)
@@ -945,39 +958,39 @@ ShortThursday=To
 ShortFriday=F
 ShortSaturday=L
 ShortSunday=S
-one=one
-two=two
-three=three
-four=four
-five=five
-six=six
-seven=seven
-eight=eight
-nine=nine
-ten=ten
-eleven=eleven
-twelve=twelve
-thirteen=thirdteen
-fourteen=fourteen
-fifteen=fifteen
-sixteen=sixteen
-seventeen=seventeen
-eighteen=eighteen
-nineteen=nineteen
-twenty=twenty
-thirty=thirty
-forty=forty
-fifty=fifty
-sixty=sixty
-seventy=seventy
-eighty=eighty
-ninety=ninety
-hundred=hundred
-thousand=thousand
+one=en
+two=to
+three=tre
+four=fire
+five=fem
+six=seks
+seven=syv
+eight=åtte
+nine=ni
+ten=ti
+eleven=elleve
+twelve=tolv
+thirteen=tretten
+fourteen=fjorten
+fifteen=femten
+sixteen=seksten
+seventeen=sytten
+eighteen=atten
+nineteen=nitten
+twenty=tyve
+thirty=tretti
+forty=førti
+fifty=femti
+sixty=seksti
+seventy=sytti
+eighty=åtti
+ninety=nitti
+hundred=hundre
+thousand=tusen
 million=million
-billion=billion
-trillion=trillion
-quadrillion=quadrillion
+billion=milliarder
+trillion=billioner
+quadrillion=kvadrillion
 SelectMailModel=Velg en e-postmal
 SetRef=Sett ref
 Select2ResultFoundUseArrows=Noen resultater funnet. Bruk pilene for å velge
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Kundeforsendelser
 SearchIntoExpenseReports=Utgiftsrapporter
 SearchIntoLeaves=Permisjon
 SearchIntoTickets=Supportsedler
+SearchIntoCustomerPayments=Kundebetalinger
+SearchIntoVendorPayments=Leverandørbetalinger
+SearchIntoMiscPayments=Diverse utbetalinger
 CommentLink=Kommentarer
 NbComments=Antall kommentarer
 CommentPage=Kommentarfelt
@@ -1076,10 +1092,18 @@ NotUsedForThisCustomer=Ikke brukt for denne kunden
 AmountMustBePositive=Beløpet må være positivt
 ByStatus=Etter status
 InformationMessage=Informasjon
-Used=Used
-ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
-MODIFYInDolibarr=Record %s modified
-DELETEInDolibarr=Record %s deleted
-VALIDATEInDolibarr=Record %s validated
-APPROVEDInDolibarr=Record %s approved
+Used=Brukt
+ASAP=Så snart som mulig
+CREATEInDolibarr=Post %s opprettet
+MODIFYInDolibarr=Post %s endret
+DELETEInDolibarr=Post %s slettet
+VALIDATEInDolibarr=Post %s validert
+APPROVEDInDolibarr=Post %s godkjent
+DefaultMailModel=Standard e-postmodell
+PublicVendorName=Offentlig leverandørnavn
+DateOfBirth=Fødselsdag
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Sikkerhetstoken har utløpt, så handlingen er avbrutt. Vennligst prøv igjen.
+UpToDate=Oppdatert
+OutOfDate=Utdatert
+EventReminder=Påminnelse om hendelse
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/nb_NO/members.lang b/htdocs/langs/nb_NO/members.lang
index 699fcd4aa2c..8cebd358f8a 100644
--- a/htdocs/langs/nb_NO/members.lang
+++ b/htdocs/langs/nb_NO/members.lang
@@ -20,13 +20,11 @@ MembersList=Liste over medlemmer
 MembersListToValid=Liste over medlems-utkast (må valideres)
 MembersListValid=Liste over gyldige medlemmer
 MembersListUpToDate=Liste over gyldige medlemmer med oppdatert abonnement
-MembersListNotUpToDate=Liste over gyldige medlemmer med abonnement utdatert
+MembersListNotUpToDate=Liste over gyldige medlemmer med utdatert abonnement
 MembersListResiliated=Liste over terminerte medlemmer
 MembersListQualified=Liste over kvalifiserte medlemmer
 MenuMembersToValidate=Utkast medlemmer
 MenuMembersValidated=Validerte medlemmer
-MenuMembersUpToDate=Oppdaterte medlemmer
-MenuMembersNotUpToDate=Utdaterte medlemmer
 MenuMembersResiliated=Terminerte medlemmer
 MembersWithSubscriptionToReceive=Medlemmer som venter på abonnement
 MembersWithSubscriptionToReceiveShort=Abonnement på å motta
@@ -34,6 +32,7 @@ DateSubscription=Abonnement dato
 DateEndSubscription=Abonnement sluttdato
 EndSubscription=Avslutt abonnement
 SubscriptionId=Abonnement-ID
+WithoutSubscription=Uten abonnement
 MemberId=Medlems-ID
 NewMember=Nytt medlem
 MemberType=Medlemstype
@@ -81,7 +80,7 @@ DeleteType=Slett
 VoteAllowed=Stemming tillatt
 Physical=Fysisk
 Moral=Moralsk
-MorPhy=Natur
+MorAndPhy=Moral and Physical
 Reenable=Reaktiverer
 ResiliateMember=Terminer et medlem
 ConfirmResiliateMember=Er du sikker på at du vil terminere dette medlemmet?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sende epost ved validering av nytt medlem
 SendingEmailOnNewSubscription=Sende epost ved nytt abonnement
 SendingReminderForExpiredSubscription=Sende påminnelse om utløpte abonnementer
 SendingEmailOnCancelation=Sende epost ved avbestilling
+SendingReminderActionComm=Sender påminnelse for agenda-hendelse
 # Topic of email templates
 YourMembershipRequestWasReceived=Ditt medlemskap ble mottatt.
 YourMembershipWasValidated=Ditt medlemskap ble godkjent
@@ -167,6 +167,7 @@ MembersStatisticsByState=Medlemsstatistikk etter delstat/provins
 MembersStatisticsByTown=Medlemsstatistikk etter by
 MembersStatisticsByRegion=Medlem statistikk etter region
 NbOfMembers=Antall medlemmer
+NbOfActiveMembers=Antall nåværende aktive medlemmer
 NoValidatedMemberYet=Ingen validerte medlemmer funnet
 MembersByCountryDesc=Denne skjermen viser deg statistikk over medlemmer etter land. Grafikk avhenger av Googles elektroniske graf-service og er bare tilgjengelig med internett-tilkobling.
 MembersByStateDesc=Denne skjermen viser deg statistikk over medlemmer etter områder/fylker.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistikk
 LastMemberDate=Siste medlemsdato
 LatestSubscriptionDate=Siste abonnementsdato
 MemberNature=Medlemskapets art
+MembersNature=Nature of members
 Public=Informasjon er offentlig
 NewMemberbyWeb=Nytt medlem lagt til. Venter på godkjenning
 NewMemberForm=Skjema for nytt medlem 
diff --git a/htdocs/langs/nb_NO/modulebuilder.lang b/htdocs/langs/nb_NO/modulebuilder.lang
index 7d1aa17dc38..d68c5733f57 100644
--- a/htdocs/langs/nb_NO/modulebuilder.lang
+++ b/htdocs/langs/nb_NO/modulebuilder.lang
@@ -77,13 +77,13 @@ IsAMeasure=Er en måling
 DirScanned=Mappe skannet
 NoTrigger=Ingen utløser
 NoWidget=Ingen widget
-GoToApiExplorer=Gå til API-utforsker
+GoToApiExplorer=API-utforsker
 ListOfMenusEntries=Liste over menyoppføringer
 ListOfDictionariesEntries=Liste over ordbokinnføringer
 ListOfPermissionsDefined=Liste over definerte tillatelser
 SeeExamples=Se eksempler her
 EnabledDesc=Betingelse for å ha dette feltet aktivt (Eksempler: 1 eller $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+VisibleDesc=Er feltet synlig? (Eksempler: 0=Aldri synlig, 1=Synlig på liste og opprett/oppdater/vis skjemaer, 2=Synlig bare på liste, 3=Synlig bare på opprett/oppdater/vis skjema (ikke liste), 4=Synlig bare på liste og oppdaterings-/visningsskjema  (ikke opprett), 5=Synlig på listens sluttformular (ikke opprett, ikke oppdatering). <br><br>Bruk av negativ verdi betyr at feltet ikke vises som standard på listen, men kan velges for visning). <br><br>Det kan være et uttrykk, for eksempel:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
 DisplayOnPdfDesc=Vis dette feltet på kompatible PDF-dokumenter, du kan administrere posisjon med "Posisjon" -feltet.<br/>Kjente kompatible PDF-modeller er: Eratosthenes (Ordre), espadon (Forsendelse), sponge (Fakturaer), cyan (Tilbud), cornas (Leverandørordre)<br/><br/><strong>For dokument:</strong><br/>0 = Vises ikke <br/> 1 = Vises<br/> 2 = Vises bare hvis ikke tom<br/><br/><strong>For dokumentlinjer:</strong><br/>0 = Vises ikke <br/> 1 = Vises i en kolonne <br/> 3 = vises i linje etter beskrivelsen <br/> 4 = vises etter beskrivelse hvis ikke tom
 DisplayOnPdf=Vis på PDF
 IsAMeasureDesc=Kan verdien av feltet bli kumulert for å få en total i listen? (Eksempler: 1 eller 0)
diff --git a/htdocs/langs/nb_NO/mrp.lang b/htdocs/langs/nb_NO/mrp.lang
index e6ea08e39d7..b3a5a2c1cd2 100644
--- a/htdocs/langs/nb_NO/mrp.lang
+++ b/htdocs/langs/nb_NO/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Produksjonsordrer
-MO=Produksjonsordre
-MOs=Manufacturing orders
+MOs=Produksjonsordrer
+ManufacturingOrder=Produksjonsordre
 MRPDescription=Modul for å administrere produksjons- og produksjonsordrer (PO).
 MRPArea=MRP-område
 MrpSetupPage=Oppsett av MRP-modul 
@@ -75,4 +75,6 @@ ProductsToConsume=Vare å konsumere
 ProductsToProduce=Varer å produsere
 UnitCost=Enhetskostnad
 TotalCost=Totalkostnad
-BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+BOMTotalCost=Kostnaden for å produsere denne stykklisten basert på kostnadene for hver mengde og vare som skal konsumeres (bruk kostpris hvis definert, ellers gjennomsnittlig vektet pris hvis definert, ellers den beste kjøpesummen)
+GoOnTabProductionToProduceFirst=Du må først ha startet produksjonen for å lukke en produksjonsordre (se fanen '%s'). Men du kan kansellere den.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/nb_NO/multicurrency.lang b/htdocs/langs/nb_NO/multicurrency.lang
index 37e020c3028..c66245f8ec2 100644
--- a/htdocs/langs/nb_NO/multicurrency.lang
+++ b/htdocs/langs/nb_NO/multicurrency.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - multicurrency
 MultiCurrency=Multivaluta
-ErrorAddRateFail=Feil i ny rate
+ErrorAddRateFail=Feil i ny kurs
 ErrorAddCurrencyFail=Feil i ny valuta
 ErrorDeleteCurrencyFail=Feil, sletting mislykkes
 multicurrency_syncronize_error=Synkroniseringsfeil: %s
 MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Bruk datoen for dokumentet til å finne valutakursen, i stedet for å bruke den siste kjente satsen
-multicurrency_useOriginTx=Når et objekt opprettes fra et annet, behold originalsatsen fra kildeobjektet (ellers bruk den sist kjente satsen)
+multicurrency_useOriginTx=Når et objekt opprettes fra et annet, behold originalkursen fra kildeobjektet (ellers bruk den sist kjente satsen)
 CurrencyLayerAccount=CurrencyLayer API
 CurrencyLayerAccount_help_to_synchronize=Du må opprette en konto på nettstedet %s for å bruke denne funksjonaliteten. <br> Få <b>API-nøkkelen din</b> . <br> Hvis du bruker en gratis konto, kan du ikke endre <b>kildevalutaen</b> (USD som standard). <br> Hvis hovedvalutaen din ikke er USD, omberegner applikasjonen automatisk. <br><br> Du er begrenset til 1000 synkroniseringer per måned.
 multicurrency_appId=API-nøkkel
@@ -13,10 +13,26 @@ multicurrency_appCurrencySource=Kildevaluta
 multicurrency_alternateCurrencySource=Alterner valutakilde
 CurrenciesUsed=Valutaer brukt
 CurrenciesUsed_help_to_add=Legg til de forskjellige valutaene og prisene du vil bruke på <b> tilbud</b>, <b> ordre</b> etc.
-rate=rate
+rate=kurs
 MulticurrencyReceived=Mottatt, originalvaluta
 MulticurrencyRemainderToTake=Resterende beløp, opprinnelig valuta
 MulticurrencyPaymentAmount=Beløp, original valuta
 AmountToOthercurrency=Beløp til (i valuta for mottakskonto)
 CurrencyRateSyncSucceed=Valutakurssynkronisering vellykket
 MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Bruk dokumentets valuta for online betalinger
+TabTitleMulticurrencyRate=Kursliste
+ListCurrencyRate=Liste over valutakurser for valutaen
+CreateRate=Opprett en kurs
+FormCreateRate=Sett en kurs
+FormUpdateRate=Kursendring
+successRateCreate=Kurs for valuta %s er lagt til databasen
+ConfirmDeleteLineRate=Er du sikker på at du vil fjerne %s-kursen for valuta %s på %s-dato?
+DeleteLineRate=Slett kurs
+successRateDelete=Kurs slettet
+errorRateDelete=Feil ved sletting av kurs
+successUpdateRate=Endring gjort
+ErrorUpdateRate=Feil ved endring av kursen
+Codemulticurrency=valutakode
+UpdateRate=endre kursen
+CancelUpdate=avbryt
+NoEmptyRate=Kursfeltet må ikke være tomt
diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang
index e39eb70042d..975342e63b0 100644
--- a/htdocs/langs/nb_NO/other.lang
+++ b/htdocs/langs/nb_NO/other.lang
@@ -5,8 +5,6 @@ Tools=Verktøy
 TMenuTools=Verktøy
 ToolsDesc=Alle verktøy som ikke er inkludert i andre menyoppføringer, er gruppert her. <br> Alle verktøyene kan nås via menyen til venstre.
 Birthday=Fødselsdag
-BirthdayDate=Fødselsdag
-DateToBirth=Fødselsdag
 BirthdayAlertOn=fødselsdagsvarsling aktiv
 BirthdayAlertOff=fødselsdagsvarsling inaktiv
 TransKey=Oversettelse av nøkkelen TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Forrige måned (nummer 1-12) på fakturadato
 TextPreviousMonthOfInvoice=Forrige måned (tekst) av fakturadato
 NextMonthOfInvoice=Følgende måned (nummer 1-12) på fakturadato
 TextNextMonthOfInvoice=Følgende måned (tekst) på fakturadato
+PreviousMonth=Forrige måned
+CurrentMonth=Denne måneden
 ZipFileGeneratedInto=Zip-fil generert til <b> %s</b>.
 DocFileGeneratedInto=Doc-fil generert til <b> %s</b>.
 JumpToLogin=Frakoblet. Gå til påloggingssiden ...
@@ -85,8 +85,8 @@ MaxSize=Maksimal størrelse
 AttachANewFile=Legg ved ny fil/dokument
 LinkedObject=Lenkede objekter
 NbOfActiveNotifications=Antall notifikasjoner (antall e-postmottakere)
-PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe lines are separated by a carriage return.\n\n__USER_SIGNATURE__
-PredefinedMailTestHtml=__(Hello)__<br>This is a <b>test</b> mail sent to __EMAIL__ (the word test must be in bold).<br>The lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailTest=__(Hei)__\nDette er en test-epost sendt til __EMAIL__.\nLinjene er atskilt med vognretur.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__ (Hei) __ <br> Dette er en <b> test </b> e-post sendt til __EMAIL__ (ordet test må være i fet skrift). <br> Linjene er atskilt med vognretur. <br> <br> __USER_SIGNATURE__
 PredefinedMailContentContract=__(Hei)__\n\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hei)__\n\nVedlagt faktura __REF__ \n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hei)__\n\nVi vil gjerne minne om at fakturaen __REF__ ikke har blitt betalt. En kopi av fakturaen er vedlagt som en påminnelse.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hei)__\n\nFraktbrev __REF__ vedlagt\n\n\n__
 PredefinedMailContentSendFichInter=__(Hei)__\n\nIntervensjon __REF__ vedlagt\n\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Du kan klikke på linken under for å utføre betalingen din, hvis det ikke allerede er gjort.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hei)__\n\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Hendelsespåminnelse "__EVENT_LABEL__" den __EVENT_DATE__ kl. __EVENT_TIME__ <br> <br> Dette er en automatisk melding. Ikke svar.
 DemoDesc=Dolibarr er en kompakt ERP/CRM med støtte for flere forretningsmoduler. En demo som viser alle moduler gir ingen mening da dette scenariet aldri skjer (flere hundre tilgjengelig). Derforer flere demoprofiler er tilgjengelig.
 ChooseYourDemoProfil=Velg en demoprofil som passer best til dine krav
 ChooseYourDemoProfilMore=... eller bygg din egen profil<br>(manuell utvelgelse av moduler)
@@ -278,9 +279,9 @@ LinesToImport=Linjer å importere
 
 MemoryUsage=Minnebruk
 RequestDuration=Varighet av forespørsel
-ProductsPerPopularity=Products/Services by popularity
+ProductsPerPopularity=Varer/tjenester etter popularitet
 PopuProp=Varer/tjenester etter popularitet i tilbud
 PopuCom=Varer/tjenester etter popularitet i ordre
 ProductStatistics=Varer/Tjenestestatistikk
 NbOfQtyInOrders=Antall i ordre
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Velg typen objekt som skal analyseres ...
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index 72204d17cac..f4a0610c847 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Tjenester kun til salgs
 ServicesOnPurchaseOnly=Tjenester kun for kjøp
 ServicesNotOnSell=Tjenester ikke til salgs og ikke for kjøp
 ServicesOnSellAndOnBuy=Tjenester for kjøp og salg
-LastModifiedProductsAndServices=Latest %s modified products/services
+LastModifiedProductsAndServices=Siste %s modifiserte varer/tjenester
 LastRecordedProducts=Siste %s registrerte varer
 LastRecordedServices=Siste %s registrerte tjenester
 CardProduct0=Vare
@@ -107,21 +107,21 @@ ServiceLimitedDuration=Hvis varen er en tjeneste med begrenset varighet:
 FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Flere prissegmenter for hver vare/tjeneste (hver kunde er i et segment)
 MultiPricesNumPrices=Pris antall
-DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Aktiver virtuelle varer (sett)
-AssociatedProducts=Virtuelle varer
-AssociatedProductsNumber=Antall tilknyttede varer
+DefaultPriceType=Basis av priser per standard (med versus uten avgift) når nye salgspriser legges til
+AssociatedProductsAbility=Aktiver sett (virtuelle varer)
+AssociatedProducts=Sett
+AssociatedProductsNumber=Antall produkter som består av dette settet
 ParentProductsNumber=Antall foreldre-komponentvarer
 ParentProducts=Foreldreprodukter
-IfZeroItIsNotAVirtualProduct=Hvis 0, er dette ikke en virtuell vare
-IfZeroItIsNotUsedByVirtualProduct=Hvis 0, er denne varen ikke brukt av noen virtuell vare
+IfZeroItIsNotAVirtualProduct=Hvis 0, er denne varen ikke et sett
+IfZeroItIsNotUsedByVirtualProduct=Hvis 0, brukes ikke denne varen av noe sett
 KeywordFilter=Nøkkelordfilter
 CategoryFilter=Kategorifilter
 ProductToAddSearch=Finn vare å legge til
 NoMatchFound=Ingen treff
 ListOfProductsServices=Liste over varer/tjenester
-ProductAssociationList=Liste over varer/tjenester som er komponent(er) av dette virtuelle varen/settet
-ProductParentList=Liste over produkter / tjenester med dette produktet som en komponent
+ProductAssociationList=Liste over varer/tjenester som er komponenter i dette settet
+ProductParentList=Liste over sett med denne varen som en komponent
 ErrorAssociationIsFatherOfThis=En av de valgte varene er foreldre til gjeldende vare
 DeleteProduct=Slett vare/tjeneste
 ConfirmDeleteProduct=Er du sikker på at du vil slette valgte vare/tjeneste?
@@ -170,8 +170,8 @@ SuppliersPricesOfProductsOrServices=Leverandørpriser (av varer eller tjenester)
 CustomCode=Toll / vare / HS-kode
 CountryOrigin=Opprinnelsesland
 Nature=Produktets art (materiale/ferdig)
-NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductShort=Varens art
+NatureOfProductDesc=Råvare eller ferdig vare
 ShortLabel=Kort etikett
 Unit=Enhet
 p= stk
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Tilgjengelige globale verdier:
 PriceMode=Prismodus
 PriceNumeric=Nummer
 DefaultPrice=Standardpris
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Øk/minsk beholdning ved overordnet endring
 ComposedProduct=Sub-varer
 MinSupplierPrice=Laveste innkjøpspris
@@ -339,6 +340,7 @@ UseProductFournDesc=Legg til en funksjon for å definere beskrivelser av varer s
 ProductSupplierDescription=Leverandørs beskrivelse av produktet
 UseProductSupplierPackaging=Bruk emballasje på leverandørpriser (beregne mengder på nytt i henhold til emballasje som er angitt på leverandørpris når du legger til/oppdaterer linje i leverandørdokumenter)
 PackagingForThisProduct=Emballasje
+PackagingForThisProductDesc=På leverandørbestilling vil du automatisk bestille denne mengden (eller et multiplum av denne mengden). Kan ikke være mindre enn minimum kjøpsmengde
 QtyRecalculatedWithPackaging=Mengden på linjen ble beregnet på nytt i henhold til leverandøremballasje
 
 #Attributes
@@ -362,9 +364,9 @@ SelectCombination=Velg kombinasjon
 ProductCombinationGenerator=Variantgenerator
 Features=Egenskaper
 PriceImpact=Prisinnvirkning
-ImpactOnPriceLevel=Impact on price level %s
-ApplyToAllPriceImpactLevel= Apply to all levels
-ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
+ImpactOnPriceLevel=Effekt på prisnivå %s
+ApplyToAllPriceImpactLevel= Bruk på alle nivåer
+ApplyToAllPriceImpactLevelHelp=Ved å klikke her angir du samme prispåvirkning på alle nivåer
 WeightImpact=Vektinnvirkning
 NewProductAttribute=Ny attributt
 NewProductAttributeValue=Ny attributtverdi
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index 5ab97f6c58a..962ec3ea1b5 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -76,12 +76,12 @@ MyActivities=Mine oppgaver/aktiviteter
 MyProjects=Mine prosjekter
 MyProjectsArea=Område for mine prosjekt
 DurationEffective=Effektiv varighet
-ProgressDeclared=Erklært progresjon
+ProgressDeclared=Oppgitt reell fremgang
 TaskProgressSummary=Oppgavens fremdrift
 CurentlyOpenedTasks=Åpne oppgaver
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=Den viste fremdriften er mindre %s enn den beregnede progresjonen
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Den viste fremdriften er mer %s enn den beregnede progresjonen
-ProgressCalculated=Kalkulert progresjon
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=Den oppgitte reelle fremgangen er mindre %s enn fremgangen på forbruk
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Den oppgitte reelle fremgangen er mer %s enn fremdriften på forbruket
+ProgressCalculated=Progresjon på forbruk
 WhichIamLinkedTo=som jeg er knyttet til
 WhichIamLinkedToProject=som jeg er knyttet til prosjektet
 Time=Tid
@@ -115,7 +115,7 @@ ChildOfTask=Sub-oppgave
 TaskHasChild=Oppgave har underoppgaver
 NotOwnerOfProject=Ikke eier av dette private prosjektet
 AffectedTo=Tildelt
-CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See tab '%s'.
+CantRemoveProject=Dette prosjektet kan ikke fjernes ettersom det refereres til av andre objekter (faktura, bestillinger eller annet). Se fanen '%s'.
 ValidateProject=Valider prosjekt
 ConfirmValidateProject=Er du sikker på at du vil validere dette prosjektet?
 CloseAProject=Lukk prosjektet
@@ -211,8 +211,8 @@ ProjectNbProjectByMonth=Antall opprettede prosjekter etter måned
 ProjectNbTaskByMonth=Antall opprettede oppgaver etter måned
 ProjectOppAmountOfProjectsByMonth=Beløp i leads pr. måned
 ProjectWeightedOppAmountOfProjectsByMonth=Vektet beløp i leads pr. måned
-ProjectOpenedProjectByOppStatus=Open project|lead by lead status
-ProjectsStatistics=Statistics on projects or leads
+ProjectOpenedProjectByOppStatus=Åpne prosjekt|potensielle kunder etter status
+ProjectsStatistics=Statistikk over prosjekter eller potensielle kunder
 TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Oppgave tildelt. Tidsbruk kan legges til
 IdTaskTime=Oppgave-tid ID
diff --git a/htdocs/langs/nb_NO/propal.lang b/htdocs/langs/nb_NO/propal.lang
index 548c9260382..d4353a29a1d 100644
--- a/htdocs/langs/nb_NO/propal.lang
+++ b/htdocs/langs/nb_NO/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Send tilbud med e-post
 DatePropal=Tilbudsdato
 DateEndPropal=Gyldig til
 ValidityDuration=Gyldighetstid
-CloseAs=Sett status til
 SetAcceptedRefused=Sett akseptert/avvist
 ErrorPropalNotFound=Tilbudet %s ble ikke funnet
 AddToDraftProposals=Legg til tilbudsutkast
@@ -85,3 +84,8 @@ ProposalCustomerSignature=Skriftlig aksept, firmastempel, dato og signatur
 ProposalsStatisticsSuppliers=Leverandørs tilbudsstatistikk
 CaseFollowedBy=Sak fulgt av
 SignedOnly=Kun signert
+IdProposal=Tilbud-ID
+IdProduct=Vare-ID
+PrParentLine=Tilbud foreldrelinje
+LineBuyPriceHT=Innkjøpspris beløp eksklusive avgift for linje
+
diff --git a/htdocs/langs/nb_NO/recruitment.lang b/htdocs/langs/nb_NO/recruitment.lang
index e131268a03f..4171ab7a120 100644
--- a/htdocs/langs/nb_NO/recruitment.lang
+++ b/htdocs/langs/nb_NO/recruitment.lang
@@ -18,53 +18,58 @@
 #
 
 # Module label 'ModuleRecruitmentName'
-ModuleRecruitmentName = Recruitment
+ModuleRecruitmentName = Rekruttering
 # Module description 'ModuleRecruitmentDesc'
-ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+ModuleRecruitmentDesc = Administrer og følg rekrutteringskampanjer for nye stillinger
 
 #
 # Admin page
 #
-RecruitmentSetup = Recruitment setup
+RecruitmentSetup = Rekrutteringsoppsett
 Settings = innstillinger
-RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
-RecruitmentArea=Recruitement area
-PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
-EnablePublicRecruitmentPages=Enable public pages of open jobs
+RecruitmentSetupPage = Fyll inn oppsettet av hovedalternativene for rekrutteringsmodulen her
+RecruitmentArea=Rekrutteringsområde
+PublicInterfaceRecruitmentDesc=Offentlige sider med jobber er offentlige nettadresser for å vise og svare på åpne jobber. Det finnes en lenke for hver åpen jobb, funnet på hver jobbpost.
+EnablePublicRecruitmentPages=Aktiver offentlige sider med åpne jobber
 
 #
 # About page
 #
 About = Om
-RecruitmentAbout = About Recruitment
-RecruitmentAboutPage = Recruitment about page
-NbOfEmployeesExpected=Expected nb of employees
-JobLabel=Label of job position
-WorkPlace=Work place
-DateExpected=Expected date
-FutureManager=Future manager
-ResponsibleOfRecruitement=Responsible of recruitment
-IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+RecruitmentAbout = Om rekruttering
+RecruitmentAboutPage = Om rekrutteringssiden
+NbOfEmployeesExpected=Forventet antall ansatte
+JobLabel=Etikett for stillingen
+WorkPlace=Arbeidssted
+DateExpected=Forventet dato
+FutureManager=Fremtidig leder
+ResponsibleOfRecruitement=Ansvarlig for rekruttering
+IfJobIsLocatedAtAPartner=Hvis jobben ligger på et partnersted
+PositionToBeFilled=Stilling
+PositionsToBeFilled=Stillinger
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
-ThisIsInformationOnJobPosition=Information of the job position to be filled
-ContactForRecruitment=Contact for recruitment
-EmailRecruiter=Email recruiter
-ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
-RequestedRemuneration=Requested remuneration
-ProposedRemuneration=Proposed remuneration
-ContractProposed=Contract proposed
-ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
-JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
-InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+JobOfferToBeFilled=Job position to be filled
+ThisIsInformationOnJobPosition=Informasjon om stillingen som skal besettes
+ContactForRecruitment=Kontakt for rekruttering
+EmailRecruiter=E-postrekruttering
+ToUseAGenericEmail=For å bruke en generisk e-post. Hvis ikke definert, vil e-posten til rekrutteringsansvarlig bli brukt
+NewCandidature=New application
+ListOfCandidatures=List of applications
+RequestedRemuneration=Ønsket godtgjørelse
+ProposedRemuneration=Tilbudt godtgjørelse
+ContractProposed=Kontraktforslag
+ContractSigned=Kontrakt signert
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
+JobPositions=Stillinger
+RecruitmentCandidatures=Applications
+InterviewToDo=Intervju som skal gjennomføres
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/nb_NO/stocks.lang b/htdocs/langs/nb_NO/stocks.lang
index 9db136a8d9a..58d833ada6c 100644
--- a/htdocs/langs/nb_NO/stocks.lang
+++ b/htdocs/langs/nb_NO/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Bevegelse ID %d
 ListMouvementStockProject=Liste over varebevegelser tilknyttet prosjekt
 StocksArea=Område for lager
 AllWarehouses=Alle lager
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Inkluder også ordrekladd
 Location=Lokasjon
 LocationSummary=Kort navn på lokasjon
@@ -122,8 +122,9 @@ DesiredStockDesc=Denne lagerbeholdningen vil være den verdien som brukes til å
 StockToBuy=For bestilling
 Replenishment=Påfylling av varer
 ReplenishmentOrders=Påfyllingsordre
-VirtualDiffersFromPhysical=Ifølge lagerøkning-/reduksjon-opsjoner, kan fysisk lager og virtuelt lager (fysiske + gjeldende ordre) variere
-UseVirtualStockByDefault=Bruk virtuelt lager som standard i stedet for fysisk, for lagerfyllingsegenskapen
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Bruk teoretisk lagerbeholdning
 UsePhysicalStock=Bruk fysisk varebeholdning
 CurentSelectionMode=Gjeldende valgmodus
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=Denne varen er allerede på listen
 SelectCategory=Kategorifilter
 SelectFournisseur=Leverandørfilter
 inventoryOnDate=Varetelling
-INVENTORY_DISABLE_VIRTUAL=Virtuell vare (sett): Ikke reduser lager av en sub-vare
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Bruk innkjøpspris hvis ingen siste innkjøpspris finnes
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Lagerbevegelser vil ha datoen for lagertelling (i stedet for datoen for lagertellingsvalidering)
 inventoryChangePMPPermission=Tillat å endre PMP-verdi for en vare
 ColumnNewPMP=Ny enhet PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/nb_NO/suppliers.lang b/htdocs/langs/nb_NO/suppliers.lang
index 02803b3f7e7..6dc0db586bf 100644
--- a/htdocs/langs/nb_NO/suppliers.lang
+++ b/htdocs/langs/nb_NO/suppliers.lang
@@ -38,10 +38,11 @@ MenuOrdersSupplierToBill=Innkjøpsordre til faktura
 NbDaysToDelivery=Leveringsforsinkelse (dager)
 DescNbDaysToDelivery=Den lengste leveringsforsinkelsen til produktene i denne ordre
 SupplierReputation=Leverandørens rykte
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Ikke bestill
 NotTheGoodQualitySupplier=Lav kvalitet
 ReputationForThisProduct=Rykte
 BuyerName=Kjøpernavn
 AllProductServicePrices=Alle vare-/tjenestepriser
-AllProductReferencesOfSupplier=All references of vendor
+AllProductReferencesOfSupplier=Alle referanser fra leverandøren
 BuyingPriceNumShort=Leverandørpriser
diff --git a/htdocs/langs/nb_NO/ticket.lang b/htdocs/langs/nb_NO/ticket.lang
index db72750d860..ed590491d7c 100644
--- a/htdocs/langs/nb_NO/ticket.lang
+++ b/htdocs/langs/nb_NO/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Billett - Typer
 TicketDictCategory=Billett - Grupper
 TicketDictSeverity=Billett - Alvorlighetsgrader
 TicketDictResolution=Billett - Løsning
-TicketTypeShortBUGSOFT=Programvarefeil
-TicketTypeShortBUGHARD=Hardwarefeil
-TicketTypeShortCOM=Prisforespørsel
 
+TicketTypeShortCOM=Prisforespørsel
 TicketTypeShortHELP=Be om funksjonell hjelp
 TicketTypeShortISSUE=Problem eller feil
 TicketTypeShortREQUEST=Endring- eller forbedringsforespørsel
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Annet
 TicketSeverityShortLOW=Lav
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Høy
-TicketSeverityShortBLOCKING=Kritisk / Blokkering
+TicketSeverityShortBLOCKING=Kritisk, blokkerende
 
 ErrorBadEmailAddress=Felt '%s' er feil
 MenuTicketMyAssign=Mine supportsedler
diff --git a/htdocs/langs/nb_NO/users.lang b/htdocs/langs/nb_NO/users.lang
index d3559aaf104..f7c58956678 100644
--- a/htdocs/langs/nb_NO/users.lang
+++ b/htdocs/langs/nb_NO/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Fjern fra gruppe
 PasswordChangedAndSentTo=Passordet er endret og sendt til <b>%s</b>.
 PasswordChangeRequest=Be om å endre passord for <b> %s </b>
 PasswordChangeRequestSent=Anmodning om å endre passordet for <b>%s</b> er sendt til <b>%s</b>.
+IfLoginExistPasswordRequestSent=Hvis denne påloggingen er en gyldig konto, er det sendt en e-post for å tilbakestille passordet.
+IfEmailExistPasswordRequestSent=Hvis denne e-postadressen er en gyldig konto, er det sendt en e-post for å tilbakestille passordet.
 ConfirmPasswordReset=Bekreft tilbakestilling av passord
 MenuUsersAndGroups=Brukere og grupper
 LastGroupsCreated=Siste %s grupper opprettet
@@ -73,6 +75,7 @@ CreateInternalUserDesc=Dette skjemaet gir deg mulighet til å opprette en intern
 InternalExternalDesc=En <b>intern</b> bruker er en bruker som er en del av din bedrift/organisasjon. <br>En<b>ekstern</b> bruker er en kunde, leverandør eller annet (Å opprette en ekstern bruker for en tredjepart kan gjøres fra kontaktkortet til tredjepart).<br><br> I begge tilfeller defineres rettigheter i Dolibarr, også ekstern bruker kan ha en annen menystyrer enn intern bruker (se Hjem - Oppsett - Display)
 PermissionInheritedFromAGroup=Rettigheter innvilget fordi de er arvet av en brukegruppe.
 Inherited=Arvet
+UserWillBe=Opprettet bruker vil være
 UserWillBeInternalUser=Opprettet bruker vil være en intern bruker (fordi ikke knyttet til en bestemt tredjepart)
 UserWillBeExternalUser=Opprettet bruker vil være en ekstern bruker (fordi knyttes til et bestemt tredjepart)
 IdPhoneCaller=Telefon ID
@@ -109,12 +112,14 @@ UserAccountancyCode=Bruker regnskapskode
 UserLogoff=Brukerutlogging
 UserLogged=Bruker innlogget
 DateOfEmployment=Ansettelsesdato
-DateEmployment=Ansettelse startdato
+DateEmployment=Arbeid
+DateEmploymentstart=Ansettelse startdato
 DateEmploymentEnd=Ansettelse sluttdato
+RangeOfLoginValidity=Datoperiode for innloggingsgyldighet
 CantDisableYourself=Du kan ikke deaktivere din egen brukeroppføring
 ForceUserExpenseValidator=Tvunget utgiftsrapport-validator
 ForceUserHolidayValidator=Tvunget friforespørsel-validator
 ValidatorIsSupervisorByDefault=Som standard er validatoren veileder for brukeren. Hold tom for å beholde denne oppførselen.
 UserPersonalEmail=Privat e-post
 UserPersonalMobile=Privat mobil
-WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
+WarningNotLangOfInterface=Advarsel, dette er hovedspråket brukeren snakker, ikke språket i grensesnittet han valgte å se. For å endre grensesnittets språk som er synlig for denne brukeren, gå til fanen %s
diff --git a/htdocs/langs/nb_NO/website.lang b/htdocs/langs/nb_NO/website.lang
index bb30c3c4339..a80a383be93 100644
--- a/htdocs/langs/nb_NO/website.lang
+++ b/htdocs/langs/nb_NO/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Legg til nettside
 Webpage=Nettsted/container
 AddPage=Legg til side/container
 HomePage=Hjemmeside
-PageContainer=Side/container
+PageContainer=Side
 PreviewOfSiteNotYetAvailable=Forhåndsvisning av nettstedet ditt <strong> %s </strong> ennå ikke tilgjengelig. Du må først '<strong> Importer en full nettsidemal </strong>' eller bare '<strong> Legg til en side/container </strong>'.
 RequestedPageHasNoContentYet=Forespurt side med id %s har ikke noe innhold enda, eller cachefilen .tpl.php ble fjernet. Rediger innhold på siden for å løse dette.
 SiteDeleted=Nettstedet '%s' slettet
@@ -60,8 +60,8 @@ SyntaxHelp=Hjelp med spesifikke syntakstips
 YouCanEditHtmlSourceckeditor=Du kan redigere HTML kildekode ved hjelp av "Kilde" -knappen i redigeringsprogrammet.
 YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource2=For et bilde som deles med en delekobling (åpen tilgang ved hjelp av delings-hash-nøkkelen til filen), er syntaksen: <br> <strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSourceMore= <br> Flere eksempler på HTML eller dynamisk kode tilgjengelig på <a href="%s" target="_blank"> wiki-dokumentasjonen </a> <br>.
 ClonePage=Klon side/container
 CloneSite=Klon side
 SiteAdded=Nettsted lagt til
@@ -124,7 +124,7 @@ ShowSubContainersOnOff=Mode for å utføre 'dynamisk innhold' er %s
 GlobalCSSorJS=Global CSS/JS/Header-fil på nettstedet
 BackToHomePage=Tilbake til hjemmesiden...
 TranslationLinks=Oversettelseslenker
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
+YouTryToAccessToAFileThatIsNotAWebsitePage=Du prøver å få tilgang til en side som ikke er tilgjengelig. <br> (ref= %s, type= %s, status= %s)
 UseTextBetween5And70Chars=For god SEO-praksis, bruk en tekst mellom 5 og 70 tegn
 MainLanguage=Hovedspråk
 OtherLanguages=Andre språk
@@ -133,5 +133,7 @@ PublicAuthorAlias=Offentlig forfatter alias
 AvailableLanguagesAreDefinedIntoWebsiteProperties=Tilgjengelige språk er definert i nettstedegenskaper
 ReplacementDoneInXPages=Utskifting utført på %s sider eller containere
 RSSFeed=RSS nyhetsstrøm
-RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
-PagesRegenerated=%s page(s)/container(s) regenerated
+RSSFeedDesc=Du kan få en RSS-feed med de nyeste artiklene med typen 'blogpost' ved hjelp av denne URL-en
+PagesRegenerated=%s side(r)/container(e) regenerert
+RegenerateWebsiteContent=Regenerer cache-filer på nettstedet
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/ne_NP/accountancy.lang b/htdocs/langs/ne_NP/accountancy.lang
index 7b59e33b296..3211a0b62df 100644
--- a/htdocs/langs/ne_NP/accountancy.lang
+++ b/htdocs/langs/ne_NP/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting expert
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=Journals
+Journals=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Chart of accounts
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bank accounts
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=By year
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/ne_NP/admin.lang b/htdocs/langs/ne_NP/admin.lang
index d7c4eb282cd..f1c41a3b62b 100644
--- a/htdocs/langs/ne_NP/admin.lang
+++ b/htdocs/langs/ne_NP/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
 CurrentTimeZone=TimeZone PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Interventions
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
+Permission13=Invalidate customer invoices
 Permission14=Validate customer invoices
 Permission15=Send customer invoices by email
 Permission16=Create payments for customer invoices
@@ -688,6 +694,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Read members
 Permission72=Create/modify members
 Permission74=Delete members
@@ -718,6 +728,7 @@ Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
@@ -825,10 +836,11 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Edition of field %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1282,7 +1322,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Global parameters
@@ -1523,7 +1564,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Level
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
@@ -1629,7 +1672,7 @@ AdvancedEditor=Advanced editor
 ActivateFCKeditor=Activate advanced editor for:
 FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
 FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
-MailToProject=Projects page
+MailToProject=Projects
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/ne_NP/banks.lang b/htdocs/langs/ne_NP/banks.lang
index 75f9549dca5..9500a5b8b2e 100644
--- a/htdocs/langs/ne_NP/banks.lang
+++ b/htdocs/langs/ne_NP/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/ne_NP/categories.lang b/htdocs/langs/ne_NP/categories.lang
index 9bb71984ecf..ba37a43b4ec 100644
--- a/htdocs/langs/ne_NP/categories.lang
+++ b/htdocs/langs/ne_NP/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/ne_NP/companies.lang b/htdocs/langs/ne_NP/companies.lang
index 92674363ced..dadff6a7894 100644
--- a/htdocs/langs/ne_NP/companies.lang
+++ b/htdocs/langs/ne_NP/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
 ProspectLevel=Prospect potential
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Currency
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/ne_NP/ecm.lang b/htdocs/langs/ne_NP/ecm.lang
index 369ac6dfdfa..71df60734fb 100644
--- a/htdocs/langs/ne_NP/ecm.lang
+++ b/htdocs/langs/ne_NP/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Search by keywords
 ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to vendor proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/ne_NP/hrm.lang b/htdocs/langs/ne_NP/hrm.lang
index 6cc7f6bef24..3b8f137e103 100644
--- a/htdocs/langs/ne_NP/hrm.lang
+++ b/htdocs/langs/ne_NP/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Employees
 Employee=Employee
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/ne_NP/install.lang b/htdocs/langs/ne_NP/install.lang
index 2d708c04147..63947dad154 100644
--- a/htdocs/langs/ne_NP/install.lang
+++ b/htdocs/langs/ne_NP/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=This PHP supports sessions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/ne_NP/intracommreport.lang b/htdocs/langs/ne_NP/intracommreport.lang
new file mode 100644
index 00000000000..3060300b974
--- /dev/null
+++ b/htdocs/langs/ne_NP/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=List
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/ne_NP/languages.lang b/htdocs/langs/ne_NP/languages.lang
index cc80b9f1719..ba187326705 100644
--- a/htdocs/langs/ne_NP/languages.lang
+++ b/htdocs/langs/ne_NP/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/ne_NP/main.lang b/htdocs/langs/ne_NP/main.lang
index 0af5c66f0e0..96c68cdcfa3 100644
--- a/htdocs/langs/ne_NP/main.lang
+++ b/htdocs/langs/ne_NP/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Remove link
 AddToDraft=Add to draft
 Update=Update
 Close=Close
+CloseAs=Set status to
 CloseBox=Remove widget from your dashboard
 Confirm=Confirm
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Re-Open
 Upload=Upload
 ToLink=Link
 Select=Select
+SelectAll=Select all
 Choose=Choose
 Resize=Resize
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=Cards
 Card=Card
 Now=Now
 HourStart=Start hour
+Deadline=Deadline
 Date=Date
 DateAndHour=Date and hour
 DateToday=Today's date
@@ -264,8 +267,10 @@ DateStart=Start date
 DateEnd=End date
 DateCreation=Creation date
 DateCreationShort=Creat. date
+IPCreation=Creation IP
 DateModification=Modification date
 DateModificationShort=Modif. date
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
@@ -319,6 +324,7 @@ Morning=Morning
 Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Month of the day
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Rate
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Amount tax 2
 AmountLT2=Amount tax 3
 AmountLT1ES=Amount RE
@@ -487,6 +494,7 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
+at=at
 to=to
 To=to
 and=and
@@ -509,6 +517,7 @@ Draft=Draft
 Drafts=Drafts
 StatusInterInvoiced=Invoiced
 Validated=Validated
+ValidatedToProduce=Validated (To produce)
 Opened=Open
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Response
 Priority=Priority
 SendByMail=Send by email
 MailSentBy=Email sent by
+NotSent=Not sent
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
@@ -836,6 +846,7 @@ ListOfTemplates=List of templates
 Gender=Gender
 Genderman=Man
 Genderwoman=Woman
+Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Comments
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Information
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Date of birth
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/ne_NP/members.lang b/htdocs/langs/ne_NP/members.lang
index 5ef946ddf67..5812248b129 100644
--- a/htdocs/langs/ne_NP/members.lang
+++ b/htdocs/langs/ne_NP/members.lang
@@ -19,14 +19,12 @@ MembersCards=Members business cards
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
 SubscriptionId=Subscription id
+WithoutSubscription=Without subscription
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@@ -81,7 +80,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/ne_NP/mrp.lang b/htdocs/langs/ne_NP/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/ne_NP/mrp.lang
+++ b/htdocs/langs/ne_NP/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/ne_NP/products.lang b/htdocs/langs/ne_NP/products.lang
index b59aa2f7080..97db059594f 100644
--- a/htdocs/langs/ne_NP/products.lang
+++ b/htdocs/langs/ne_NP/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/ne_NP/recruitment.lang b/htdocs/langs/ne_NP/recruitment.lang
index 73e9a7fa07f..b775e78552e 100644
--- a/htdocs/langs/ne_NP/recruitment.lang
+++ b/htdocs/langs/ne_NP/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/ne_NP/stocks.lang b/htdocs/langs/ne_NP/stocks.lang
index 81163e8d4b0..660443bcded 100644
--- a/htdocs/langs/ne_NP/stocks.lang
+++ b/htdocs/langs/ne_NP/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/ne_NP/suppliers.lang b/htdocs/langs/ne_NP/suppliers.lang
index 51562b8bb7a..03b03c75269 100644
--- a/htdocs/langs/ne_NP/suppliers.lang
+++ b/htdocs/langs/ne_NP/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/ne_NP/website.lang b/htdocs/langs/ne_NP/website.lang
index 4b5294d5e43..03e042e4be6 100644
--- a/htdocs/langs/ne_NP/website.lang
+++ b/htdocs/langs/ne_NP/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/nl_BE/accountancy.lang b/htdocs/langs/nl_BE/accountancy.lang
index ead8a057ebb..080da3b8334 100644
--- a/htdocs/langs/nl_BE/accountancy.lang
+++ b/htdocs/langs/nl_BE/accountancy.lang
@@ -7,8 +7,7 @@ ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Exporteren met globaal account
 Selectformat=Selecteer het formaat voor het bestand
 ACCOUNTING_EXPORT_FORMAT=Selecteer het formaat voor het bestand
 ACCOUNTING_EXPORT_PREFIX_SPEC=Geef de prefix voor het bestand
-ConfigAccountingExpert=Configuratie van de module boekhouding expert
-Journaux=Dagboeken
+Journals=Dagboeken
 JournalFinancial=Financiële dagboeken
 BackToChartofaccounts=Geef kaart van accounts terug
 Selectchartofaccounts=Selecteer actieve grafieken van accounts
diff --git a/htdocs/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang
index b9fa95882a3..f1308c0cdfe 100644
--- a/htdocs/langs/nl_BE/admin.lang
+++ b/htdocs/langs/nl_BE/admin.lang
@@ -31,7 +31,6 @@ DictionarySetup=Woordenboek setup
 Dictionary=Woordenboeken
 DisableJavascript=Schakel JavaScript en Ajax-functies uit.
 DelaiedFullListToSelectCompany=Wacht tot een toets wordt ingedrukt voordat u de inhoud van de combinatielijst van derden laadt. <br> Dit kan de prestaties verbeteren als u een groot aantal derden hebt, maar het is minder handig.
-DelaiedFullListToSelectContact=Wacht tot een toets wordt ingedrukt voordat u de inhoud van de contact combinatie-lijst laadt. <br> Dit kan de prestaties verbeteren als u een groot aantal contacten hebt, maar het is minder handig)
 SearchString=Zoekopdracht
 AllowToSelectProjectFromOtherCompany=Op een document van een derde partij, kunt u een project kiezen dat is gekoppeld aan een andere derde partij
 UsePreviewTabs=Gebruik voorbeelweergavetabbladen
@@ -100,7 +99,6 @@ SpaceX=X-as
 SpaceY=Y-as
 FontSize=Lettertypegrootte
 EMailsSetup=Email instellingen
-EMailsDesc=Op deze pagina kunt u uw standaard PHP-parameters voor e-mailverzending overschrijven. In de meeste gevallen op Unix / Linux OS is de PHP-instelling correct en zijn deze parameters niet nodig.
 EmailSenderProfiles=E-mail afzenderprofielen
 MAIN_MAIL_SMTP_PORT=SMTP / SMTPS-poort (standaardwaarde in php.ini: <b>%s</b> )
 MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS-host (standaardwaarde in php.ini: <b>%s</b> )
diff --git a/htdocs/langs/nl_BE/banks.lang b/htdocs/langs/nl_BE/banks.lang
index 9030ea033bc..69a470c6db3 100644
--- a/htdocs/langs/nl_BE/banks.lang
+++ b/htdocs/langs/nl_BE/banks.lang
@@ -2,5 +2,4 @@
 TransferTo=Aan
 BankChecksToReceipt=Te innen cheques
 BankChecksToReceiptShort=Te innen cheques
-BankMovements=Mutaties
 RejectCheckDate=Datum de cheque was teruggekeerd
diff --git a/htdocs/langs/nl_BE/companies.lang b/htdocs/langs/nl_BE/companies.lang
index 4740a852cae..b62eb40a97c 100644
--- a/htdocs/langs/nl_BE/companies.lang
+++ b/htdocs/langs/nl_BE/companies.lang
@@ -39,7 +39,6 @@ ProfId2ES=Prof Id 2 (INSZ-nummer)
 ProfId1LU=Prof. Id. 1 (R.S.C. Luxemburg)
 ProfId2LU=Prof. Id. 2 (zakelijke vergunning)
 ProfId2MA=Id prof. 2 (Patent)
-ProfId5MA=Id prof. 5 (C.I.C.E.)
 ProfId3MX=Prof Id 3 (Professioneel Charter)
 ProfId2PT=Prof. id 2 (INSZ-nummer)
 ProfId3PT=Prof. Id 3 (Commerciële fiche aantal)
@@ -102,5 +101,6 @@ SaleRepresentativeFirstname=Voornaam van de verkoopsverantwoordelijke
 SaleRepresentativeLastname=Familienaam van de verkoopsverantwoordelijke
 ErrorThirdpartiesMerge=Er is een fout opgetreden bij het verwijderen van de derde partijen. Controleer het logboek. Wijzigingen zijn teruggedraaid.
 NewCustomerSupplierCodeProposed=Klant- of leverancierscode die al is gebruikt, wordt een nieuwe code voorgesteld
+PaymentTypeCustomer=Betalingswijze - Klant
 PaymentTermsSupplier=Betalingstermijn - Verkoper
 PaymentTypeBoth=Betalingswijze - Klant en verkoper
diff --git a/htdocs/langs/nl_BE/hrm.lang b/htdocs/langs/nl_BE/hrm.lang
index da228383133..a8577d55908 100644
--- a/htdocs/langs/nl_BE/hrm.lang
+++ b/htdocs/langs/nl_BE/hrm.lang
@@ -8,3 +8,4 @@ ConfirmDeleteEstablishment=Weet U zeker dat U deze inrichting wilt verwijderen ?
 OpenEtablishment=Open inrichting
 CloseEtablishment=Sluit inrichting
 DictionaryDepartment=HRM - afdelingen lijst
+ListOfEmployees=Lijst van werknemers
diff --git a/htdocs/langs/nl_BE/intracommreport.lang b/htdocs/langs/nl_BE/intracommreport.lang
new file mode 100644
index 00000000000..1bc5060846e
--- /dev/null
+++ b/htdocs/langs/nl_BE/intracommreport.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+MenuIntracommReportList=Lijst
diff --git a/htdocs/langs/nl_BE/languages.lang b/htdocs/langs/nl_BE/languages.lang
index a27973f1fde..0da3656316c 100644
--- a/htdocs/langs/nl_BE/languages.lang
+++ b/htdocs/langs/nl_BE/languages.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_bg_BG=Bulgaarse
 Language_fi_FI=Fins
diff --git a/htdocs/langs/nl_BE/mails.lang b/htdocs/langs/nl_BE/mails.lang
index 27d91ff6ceb..c4133e0bebe 100644
--- a/htdocs/langs/nl_BE/mails.lang
+++ b/htdocs/langs/nl_BE/mails.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - mails
 MailCard=EMailings kaart
-MailingStatusSentPartialy=Gedeeltelijk verzonden
 SearchAMailing=Zoek een E-mailing
 SendMailing=Verzend E-mailing
diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang
index d99036d1bdf..e91ff7bd44a 100644
--- a/htdocs/langs/nl_BE/main.lang
+++ b/htdocs/langs/nl_BE/main.lang
@@ -42,6 +42,7 @@ AuthenticationMode=Verificatiemodus
 RequestedUrl=Gevraagde URL
 RequestLastAccessInError=Laatste database toegangsaanvraag fout
 LineID=Regel ID
+CloseAs=Zet de status op
 Resiliate=Beëindigen
 Hide=Verbergen
 NewObject=Nieuwe %s
@@ -61,7 +62,6 @@ UserValidationShort=Geldig. gebruiker
 CurrencyRate=Wisselkoers van valuta
 UserModif=Gebruiker van laatste update
 PriceUHTCurrency=UP (valuta)
-AmountHT=Bedrag (excl. BTW)
 MulticurrencyRemainderToPay=Blijf betalen, oorspronkelijke valuta
 MulticurrencyAmountHT=Bedrag (excl. Btw), oorspronkelijke valuta
 MulticurrencyAmountTTC=Bedrag (incl. Btw), oorspronkelijke valuta
@@ -78,8 +78,8 @@ ApprovedBy2=Goedgekeurd door (tweede goedkeuring)
 Offered=Beschikbaar
 SetLinkToAnotherThirdParty=Link naar een derde partij
 SelectAction=Selecteer actie
-Deny=Weigeren
 Denied=Geweigerd
+Genderother=Ander
 Sincerely=Met vriendelijke groeten
 DeleteLine=Verwijder lijn
 ClassifyBilled=Wijzig Status naar "gefactureerd"
diff --git a/htdocs/langs/nl_BE/products.lang b/htdocs/langs/nl_BE/products.lang
index e7993aa1b39..788278f0576 100644
--- a/htdocs/langs/nl_BE/products.lang
+++ b/htdocs/langs/nl_BE/products.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - products
 Reference=Artikelcode
-Movements=Mutaties
 OnSell=Te koop
 OnBuy=Te koop
 NotOnSell=Niet meer beschikbaar
 ProductStatusNotOnSell=Niet meer verkrijgbaar
 ProductStatusOnSellShort=Te koop
 ListOfStockMovements=Voorradenlijst
+CustomCode=Customs / Commodity / HS code
 ProductSellByQuarterHT=Bruto omzetcijfer per trimester
 ServiceSellByQuarterHT=Bruto omzetcijfer per trimester
diff --git a/htdocs/langs/nl_BE/propal.lang b/htdocs/langs/nl_BE/propal.lang
index 972cbd72625..993ba762d6f 100644
--- a/htdocs/langs/nl_BE/propal.lang
+++ b/htdocs/langs/nl_BE/propal.lang
@@ -3,7 +3,6 @@ ProposalsOpened=Openstaande offertes
 ConfirmValidateProp=Weet u zeker dat u deze offerte met naam <b>%s</b> wilt valideren?
 LastModifiedProposals=Laatste %s gewijzigde offertes
 NoProposal=Geen offerte
-CloseAs=Zet de status op
 SetAcceptedRefused=Zet op goedgekeurd/geweigerd
 CreateEmptyPropal=Creëer een lege commerciële offerte uit de lijst van producten / diensten
 ConfirmClonePropal=Weet u zeker dat u deze offerte <b>%s</b> wilt klonen?
diff --git a/htdocs/langs/nl_BE/stocks.lang b/htdocs/langs/nl_BE/stocks.lang
index 2606eb29f32..b109d7397ce 100644
--- a/htdocs/langs/nl_BE/stocks.lang
+++ b/htdocs/langs/nl_BE/stocks.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - stocks
+QtyToDispatchShort=Aantal te verzenden
 inventoryDraft=Actief
 inventoryConfirmCreate=Aanmaken
 inventoryDeleteLine=Verwijder lijn
diff --git a/htdocs/langs/nl_BE/suppliers.lang b/htdocs/langs/nl_BE/suppliers.lang
index edf3c39315a..d6142cfa230 100644
--- a/htdocs/langs/nl_BE/suppliers.lang
+++ b/htdocs/langs/nl_BE/suppliers.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=Verkoper
 ApproveThisOrder=Opdracht goedkeuren
+DenyingThisOrder=Wijger deze bestelling
diff --git a/htdocs/langs/nl_BE/ticket.lang b/htdocs/langs/nl_BE/ticket.lang
index 52a0a417fb8..5fdcb01d6ba 100644
--- a/htdocs/langs/nl_BE/ticket.lang
+++ b/htdocs/langs/nl_BE/ticket.lang
@@ -5,8 +5,6 @@ Permission56003=Tickets verwijderen
 Permission56005=Bekijk tickets van alle externe partijen (niet effectief voor externe gebruikers, altijd beperkt tot de derde partij waarvan ze afhankelijk zijn)
 TicketDictCategory=Ticket - Groepen
 TicketDictSeverity=Ticket - Gradaties
-TicketTypeShortBUGSOFT=Software storing
-TicketTypeShortBUGHARD=Hardware storing
 TicketTypeShortISSUE=Probleem, bug of probleem
 TicketTypeShortREQUEST=Verander- of verbeteringsverzoek
 TicketTypeShortOTHER=Ander
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index 9d842f37068..c6449f8ac34 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Standaard bij dienst
 DefaultForProduct=Standaard bij product
 CantSuggest=Geen voorstel
 AccountancySetupDoneFromAccountancyMenu=Meeste instellingen boekhouding worden gedaan vanuit menu %s
-ConfigAccountingExpert=Configuratie uitgebreide boekhoudmodule
+ConfigAccountingExpert=Configuratie van boekhoud-module (dubbel boekhouden)
 Journalization=Journaal
-Journaux=Verkoopdagboek
+Journals=Verkoopdagboek
 JournalFinancial=Financiëel dagboek
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Rekeningschema
+ChartOfSubaccounts=Grafiek van individuele rekeningen
+ChartOfIndividualAccountsOfSubsidiaryLedger=Grafiek van individuele rekeningen van het subgrootboek
 CurrentDedicatedAccountingAccount=Huidige toegewezen grootboekrekening
 AssignDedicatedAccountingAccount=Nieuwe grootboekrekening toewijzen
 InvoiceLabel=Factuur label
@@ -33,17 +35,19 @@ OtherInfo=Overige informatie
 DeleteCptCategory=Verwijder grootboekrekening uit groep
 ConfirmDeleteCptCategory=Weet u zeker dat u deze grootboekrekening wilt verwijderen uit de grootboekrekening-groep?
 JournalizationInLedgerStatus=Journaal-status
-AlreadyInGeneralLedger=Reeds doorgeboekt
-NotYetInGeneralLedger=Nog niet doorgeboekt
+AlreadyInGeneralLedger=Reeds verwerkt in journaals en grootboek
+NotYetInGeneralLedger=Nog niet doorgeboekt in journaals en grootboek
 GroupIsEmptyCheckSetup=Groep is leeg. Controleer instellingen bij gepersonaliseerde rekeninggroep
 DetailByAccount=Details grootboekrekening
 AccountWithNonZeroValues=Grootboekrekeningen met niet-nulwaarden
 ListOfAccounts=Overzicht grootboekrekeningen
-CountriesInEEC=Landen in de EEG
-CountriesNotInEEC=Landen niet in EEG
-CountriesInEECExceptMe=Landen in de EEG behalve %s
+CountriesInEEC=Landen binnen de EU
+CountriesNotInEEC=Landen buiten de EU
+CountriesInEECExceptMe=EU landen behalve %s
 CountriesExceptMe=Alle landen behalve %s
-AccountantFiles=Exporteer boekhoudingsdocumenten
+AccountantFiles=Bron-documenten exporteren
+ExportAccountingSourceDocHelp=Met deze tool kunt u de lijsten en pdf bestanden exporteren die werden gebruikt om uw boekhouding te genereren. Gebruik het menu-item %s - %s om uw dagboeken te exporteren.
+VueByAccountAccounting=Overzicht per grootboekrekening
 
 MainAccountForCustomersNotDefined=De standaard grootboekrekening voor klanten is niet vastgelegd bij de instellingen
 MainAccountForSuppliersNotDefined=Hoofdrekening voor leveranciers die niet zijn gedefinieerd in de configuratie
@@ -79,16 +83,18 @@ AccountancyAreaDescAnalyze=STAP %s: Maak boekingen aan of wijzigingen toe en maa
 
 AccountancyAreaDescClosePeriod=STAP %s: Sluit periode af zodat er geen wijzigingen meer kunnen worden aangebracht.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=Een verplichte stap is niet volledig afgewerkt (dagboek niet toegekend voor alle bankrekeningen). 
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Een verplichte stap in de installatie is niet voltooid (journaal met boekhoudcode niet gedefinieerd voor alle bankrekeningen)
 Selectchartofaccounts=Selecteer actief rekeningschema
 ChangeAndLoad=Wijzigen en inlezen
-Addanaccount=Add an accounting account
-AccountAccounting=Accounting account
+Addanaccount=Nieuwe grootboekrekening
+AccountAccounting=Grootboekrekening
 AccountAccountingShort=Account
 SubledgerAccount=Subgrootboekrekening
 SubledgerAccountLabel=Subgrootboekrekening label
 ShowAccountingAccount=Toon grootboekrekening
 ShowAccountingJournal=Toon dagboek
+ShowAccountingAccountInLedger=Grootboekrekening in grootboek
+ShowAccountingAccountInJournals=Laat grootboekrekening zien in journaals
 AccountAccountingSuggest=Voorgestelde rekening
 MenuDefaultAccounts=Standaard GB-rekeningen
 MenuBankAccounts=Bankrekeningen
@@ -104,17 +110,18 @@ ProductsBinding=Grootboekrekeningen producten
 TransferInAccounting=Boeken in de boekhouding
 RegistrationInAccounting=Vastleggen in boekhouding
 Binding=Koppelen aan grootboekrekening
-CustomersVentilation=Koppeling verkoopfacturen klant
-SuppliersVentilation=Koppeling factuur leverancier
+CustomersVentilation=Koppelen verkoopfacturen
+SuppliersVentilation=Koppelen inkoopfacturen
 ExpenseReportsVentilation=Declaraties koppelen aan rekening
 CreateMvts=Nieuwe boeking
 UpdateMvts=Aanpassing boeking
 ValidTransaction=Transacties valideren
-WriteBookKeeping=Transacties doorboeken in Grootboek
+WriteBookKeeping=Verwerk transacties in de boekhouding
 Bookkeeping=Grootboek
-AccountBalance=Saldo
+BookkeepingSubAccount=Sub-grootboek
+AccountBalance=Balans
 ObjectsRef=Ref. bron-object 
-CAHTF=Totaal inkoop leverancier excl. belasting
+CAHTF=Totaal inkoop leverancier excl. BTW
 TotalExpenseReport=Totaal resultaatrekening kosten
 InvoiceLines=Te koppelen factuurregels
 InvoiceLinesDone=Gekoppelde factuurregels
@@ -149,7 +156,8 @@ ACCOUNTING_MANAGE_ZERO=Sta toe om een verschillend aantal nullen aan het einde v
 BANK_DISABLE_DIRECT_INPUT=Rechtstreeks boeken van transactie in bankboek uitzetten
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Schakel concept export van het journaal in
 ACCOUNTANCY_COMBO_FOR_AUX=Combo-lijst inschakelen voor dochteronderneming-account (kan traag zijn als u veel externe partijen hebt)
-ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DATE_START_BINDING=Definieer een startdatum voor het koppelen en doorboeken naar de boekhouding. Transacties voor deze datum worden niet doorgeboekt naar de boekhouding.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Selecteer bij boekhoudkundige overdracht standaard periodeweergave
 
 ACCOUNTING_SELL_JOURNAL=Verkoopboek
 ACCOUNTING_PURCHASE_JOURNAL=Inkoopboek
@@ -162,26 +170,28 @@ ACCOUNTING_RESULT_PROFIT=Resultaat grootboekrekening (winst)
 ACCOUNTING_RESULT_LOSS=Resultaat grootboekrekening (Verlies)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Afsluiten journaal
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Grootboekrekening van bankoverschrijving
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Kruispostrekening voor bank naar bank transactie
 TransitionalAccount=Overgangsrekening
 
 ACCOUNTING_ACCOUNT_SUSPENSE=Grootboekrekening kruisposten (dagboeken)
 DONATION_ACCOUNTINGACCOUNT=Grootboeknummer voor donaties
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Grootboekrekening om abonnementen te registreren
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Standaard grootboekrekening voor storting door klant
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standaard grootboekrekening voor de gekochte producten (gebruikt indien niet gedefinieerd in de productfiche)
-ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Grootboekrekening standaard voor de gekochte producten in de EEG (gebruikt indien niet gedefinieerd in het productblad)
-ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Grootboekrekening standaard voor de gekochte producten en geïmporteerd uit de EEG (gebruikt indien niet gedefinieerd in het productblad)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Grootboekrekening standaard voor de gekochte producten binnen de EU (gebruikt indien niet gedefinieerd in het productblad)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Grootboekrekening standaard voor de gekochte producten en geïmporteerd buiten de EU (gebruikt indien niet gedefinieerd in het productblad)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standaard grootboekrekening omzet producten (indien niet opgegeven bij productgegevens)
-ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Standaard grootboekrekening voor de in EEG verkochte producten (gebruikt indien niet gedefinieerd bij de productgegevens)
-ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Standaard boekhoudrekening voor de producten die worden verkocht en uitgevoerd uit de EEG (gebruikt indien niet gedefinieerd bij de productgegevens)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Standaard grootboekrekening voor binnen de EU verkochte producten (gebruikt indien niet gedefinieerd bij de productgegevens)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Standaard boekhoudrekening voor de producten die worden verkocht en uitgevoerd naar buiten de EU (gebruikt indien niet gedefinieerd bij de productgegevens)
 
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Standaard grootboekrekening inkoop diensten (indien niet opgegeven bij dienstgegevens)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Grootboekrekening standaard voor de gekochte services in EEC (gebruikt indien niet gedefinieerd in het serviceblad)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Standaard grootboekrekening voor de gekochte services en geïmporteerd uit EEC (gebruikt indien niet gedefinieerd in het serviceblad)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Grootboekrekening standaard voor de gekochte services binnen de EU (gebruikt indien niet gedefinieerd in het serviceblad)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Standaard grootboekrekening voor de gekochte services en geïmporteerd van buiten de EU (gebruikt indien niet gedefinieerd in het serviceblad)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standaard grootboekrekening omzet diensten (indien niet opgegeven bij dienstgegevens)
-ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Standaard grootboekrekening voor de in EEG verkochte diensten (gebruikt indien niet gedefinieerd bij de servicegegevens)
-ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Standaard grootboekrekening voor de diensten die worden verkocht en geëxporteerd uit EEG (gebruikt indien niet gedefinieerd in het serviceblad)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Standaard grootboekrekening voor binnen de EU verkochte diensten (gebruikt indien niet gedefinieerd bij de servicegegevens)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Standaard grootboekrekening voor de diensten die worden verkocht en geëxporteerd naar buiten de EU (gebruikt indien niet gedefinieerd in het serviceblad)
 
 Doctype=Type of document
 Docdate=Date
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Op voorgedefinieerde groepen
 ByPersonalizedAccountGroups=Op gepersonaliseerde groepen
 ByYear=Per jaar
 NotMatch=Niet ingesteld
-DeleteMvt=Verwijder boekingsregels
+DeleteMvt=Verwijder enkele boekregels uit de boekhouding
 DelMonth=Maand om te verwijderen
 DelYear=Te verwijderen jaar
 DelJournal=Te verwijderen journaal
-ConfirmDeleteMvt=Hiermee worden alle regels van het grootboek voor het jaar / de maand en / of uit een specifiek dagboek verwijderd (minimaal één criterium is vereist). U moet de functie 'Registratie in boekhouding' opnieuw gebruiken om het verwijderde record terug te zetten in het grootboek.
-ConfirmDeleteMvtPartial=Dit zal de boeking verwijderen uit de boekhouding (tevens ook alle regels die met deze boeking verbonden zijn)
+ConfirmDeleteMvt=Hiermee worden alle boekingen van de boekhouding voor het jaar / maand en / of voor een specifiek dagboek verwijderd (er is ten minste één criterium vereist). U moet de functie '%s' opnieuw gebruiken om de verwijderde boeking terug te krijgen.
+ConfirmDeleteMvtPartial=Hiermee wordt de boeking uit de boekhouding verwijderd (alle regels die betrekking hebben op dezelfde boeking worden verwijderd)
 FinanceJournal=Kas/Bank journaal
 ExpenseReportsJournal=Overzicht resultaatrekening
 DescFinanceJournal=Financieel journaal inclusief alle soorten betalingen per kas/bankrekening
-DescJournalOnlyBindedVisible=Dit is een recordweergave die is gekoppeld aan een grootboekrekening en die kan worden vastgelegd in het grootboek.
+DescJournalOnlyBindedVisible=Deze boeking is gebonden aan een boekhoudkundige rekening en kan worden opgenomen in de dagboeken en het grootboek.
 VATAccountNotDefined=BTW rekeningen niet gedefinieerd
 ThirdpartyAccountNotDefined=Grootboekrekening van relatie niet gedefinieerd
 ProductAccountNotDefined=Grootboekrekening producten niet gedefinieerd
@@ -227,7 +237,7 @@ ErrorDebitCredit=Debet en Credit mogen niet gelijktijdig worden opgegeven.
 AddCompteFromBK=Grootboekrekeningen aan groep toevoegen
 ReportThirdParty=Geef account van derden weer
 DescThirdPartyReport=Raadpleeg hier de lijst met externe klanten en leveranciers met tevens hun boekhoudaccounts
-ListAccounts=List of the accounting accounts
+ListAccounts=Grootboekrekeningen
 UnknownAccountForThirdparty=Onbekende relatie-rekening. Gebruikt wordt 1%s
 UnknownAccountForThirdpartyBlocking=Blokkeringsfout. Onbekende relatierekening. 
 ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Derdenaccount niet gedefinieerd of derde partij onbekend. We zullen %s gebruiken
@@ -235,9 +245,9 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Onbekende relatie
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Tegenrekening relatie niet gedefinieerd of relatie onbekend. Blokkeringsfout.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Onbekend account van derden en wachtaccount niet gedefinieerd. Blokkeerfout
 PaymentsNotLinkedToProduct=Betaling niet gekoppeld aan een product / dienst
-OpeningBalance=Begin balans
-ShowOpeningBalance=Toon beginsaldo
-HideOpeningBalance=Verberg beginsaldo
+OpeningBalance=Beginbalans
+ShowOpeningBalance=Toon beginbalans
+HideOpeningBalance=Verberg beginbalans
 ShowSubtotalByGroup=Totaal per groep
 
 Pcgtype=Rekening hoofdgroep
@@ -270,7 +280,7 @@ SelectMonthAndValidate=Selecteer een maand en valideer bewerkingen
 ValidateHistory=Automatisch boeken
 AutomaticBindingDone=Automatisch koppelen voltooid
 
-ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+ErrorAccountancyCodeIsAlreadyUse=Fout. U kunt geen grootboekrekening verwijderen welke in gebruik is.
 MvtNotCorrectlyBalanced=Boeking is niet in balans. Debet = %s | Credit = %s
 Balancing=Balansen
 FicheVentilation=Koppelen card
@@ -285,7 +295,7 @@ ShowTutorial=Handleiding weergeven
 NotReconciled=Niet afgestemd
 
 ## Admin
-BindingOptions=Binding options
+BindingOptions=Koppelmogelijkheden
 ApplyMassCategories=Categorieën  a-mass toepassen
 AddAccountFromBookKeepingWithNoCategories=Beschikbare rekening nog niet in de gepersonaliseerde groep
 CategoryDeleted=Categorie van deze grootboekrekening is verwijderd
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Dit dagboek is al in gebruik
 AccountingAccountForSalesTaxAreDefinedInto=Opmerking: Grootboekrekeningen voor BTW worden vastgelegd in menukeuze <b>%s</b>-<b>%s</b>
 NumberOfAccountancyEntries=Aantal boekingen
 NumberOfAccountancyMovements=Aantal veranderingen
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Schakel het koppelen en doorboeken naar de boekhouding van verkopen uit (facturen van klanten worden niet in aanmerking genomen in de boekhouding)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Schakel het koppelen en doorboeken naar de  boekhouding op inkopen uit (facturen van leveranciers worden niet meegerekend in de boekhouding)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Schakel het koppelen en doorboeken naar de boekhouding van onkostendeclaraties uit (met onkostendeclaraties wordt geen rekening gehouden in de boekhouding)
 
 ## Export
 ExportDraftJournal=Journaal exporteren
@@ -326,6 +339,8 @@ Modelcsv_configurable=Configureerbare CSV export
 Modelcsv_FEC=FEC exporteren
 Modelcsv_Sage50_Swiss=Export voor Sage 50 Zwitserland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Rekeningschema Id
 
 ## Tools - Init accounting account on product / service
@@ -335,16 +350,16 @@ DefaultBindingDesc=Hier kunt u een standaard grootboekrekening koppelen aan sala
 DefaultClosureDesc=Deze pagina kan worden gebruikt voor instellingen die worden gebruikt voor boekhoudkundige sluitingen.
 Options=Opties
 OptionModeProductSell=Instellingen verkopen
-OptionModeProductSellIntra=Mode verkoop uitgevoerd in EEG
+OptionModeProductSellIntra=Mode verkoop uitgevoerd binnen de EU
 OptionModeProductSellExport=Mode-verkopen geëxporteerd naar andere landen
 OptionModeProductBuy=Instellingen inkopen
-OptionModeProductBuyIntra=Modus voor aankopen geïmporteerd in EEC
+OptionModeProductBuyIntra=Modus voor aankopen geïmporteerd binnen de EU
 OptionModeProductBuyExport=Modus voor gekocht geïmporteerd uit andere landen
 OptionModeProductSellDesc=Omzet grootboekrekening bij producten
-OptionModeProductSellIntraDesc=Toon alle producten met boekhoudaccount voor verkoop in de EEG.
+OptionModeProductSellIntraDesc=Toon alle producten met boekhoudaccount voor verkoop binnen de EU.
 OptionModeProductSellExportDesc=Toon alle producten met een rekening voor overige buitenlandse verkopen.
 OptionModeProductBuyDesc=Inkoop grootboekrekening bij producten
-OptionModeProductBuyIntraDesc=Toon alle producten met grootboekrekening voor aankopen in de EEG.
+OptionModeProductBuyIntraDesc=Toon alle producten met grootboekrekening voor aankopen binnen de EU
 OptionModeProductBuyExportDesc=Toon alle producten met grootboekrekening voor andere buitenlandse aankopen.
 CleanFixHistory=Verwijder tegenrekening van regels welke niet voorkomen in het rekeningschema
 CleanHistory=Verwijder alle koppelingen van gekozen boekjaar,
@@ -355,9 +370,9 @@ ValueNotIntoChartOfAccount=Deze grootboekrekening is niet aanwezig in het rekeni
 AccountRemovedFromGroup=Rekening uit groep verwijderd.
 SaleLocal=Lokale verkoop
 SaleExport=Verkoop buitenland
-SaleEEC=Verkoop binnen EEG
-SaleEECWithVAT=Verkoop in de EEG met een btw die niet nul is, dus we veronderstellen dat dit GEEN intracommunautaire verkoop is en de voorgestelde grootboekrekening het standaardproductaccount is.
-SaleEECWithoutVATNumber=Verkoop in de EEG zonder btw, maar het btw-nummer van een derde partij is niet gedefinieerd. Voor standaardverkoop vallen we terug op het product-grootboekrekening. U kunt indien nodig het btw-nummer van een derde partij of het productaccount aanpassen.
+SaleEEC=Verkoop binnen de EU
+SaleEECWithVAT=Verkoop binnen de EU met een btw die niet nul is, dus we veronderstellen dat dit GEEN intracommunautaire verkoop is en de voorgestelde grootboekrekening het standaardproductaccount is.
+SaleEECWithoutVATNumber=Verkoop binnen de EU zonder btw, maar het btw-nummer van een derde partij is niet gedefinieerd. Voor standaardverkoop vallen we terug op het product-grootboekrekening. U kunt indien nodig het btw-nummer van een derde partij of het productaccount aanpassen.
 
 ## Dictionary
 Range=Grootboeknummer van/tot
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index ed10bfd1ad4..99c50f85f22 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Verwijder sessieblokkering
 YourSession=Uw sessie
 Sessions=Gebruikersessies
 WebUserGroup=Webserver gebruiker / groep
+PermissionsOnFilesInWebRoot=Machtigingen voor bestanden in de hoofdmap van het web
+PermissionsOnFile=Rechten op bestand %s
 NoSessionFound=Uw PHP-configuratie lijkt geen lijst van actieve sessies toe te staan. De map die wordt gebruikt om sessies op te slaan ( <b>%s</b> ) kan worden beschermd (bijvoorbeeld door OS-machtigingen of door PHP-richtlijn open_basedir).
 DBStoringCharset=Database karakterset voor het opslaan van gegevens
 DBSortingCharset=Database karakterset voor het sorteren van gegevens
@@ -71,7 +73,7 @@ DisableJavascriptNote=Opmerking: voor test- of foutopsporingsdoeleinden. Voor op
 UseSearchToSelectCompanyTooltip=Ook als u een groot aantal relaties (> 100 000) heeft, kunt u de snelheid verhogen door in de Setup-> Overig constant COMPANY_DONOTSEARCH_ANYWHERE op 1 te zetten. Zoeken wordt dan beperkt tot het begin van de reeks.
 UseSearchToSelectContactTooltip=Ook als u een groot aantal relaties (> 100 000) heeft, kunt u de snelheid verhogen door constante CONTACT_DONOTSEARCH_ANYWHERE in Setup -> Overig op 1 te zetten. Zoeken wordt dan beperkt tot het begin van de reeks.
 DelaiedFullListToSelectCompany=Wacht tot een toets wordt ingedrukt voordat inhoud van de keuzelijst met relaties wordt geladen.<br>Dit kan de prestaties verbeteren als u een groot aantal relaties hebt, maar dit is minder handig.
-DelaiedFullListToSelectContact=Wacht tot een toets wordt ingedrukt voordat inhoud van Contact combo-lijst wordt geladen. <br> Dit kan de prestaties verbeteren als je een groot aantal contacten hebt, maar het is minder handig)
+DelaiedFullListToSelectContact=Wacht tot een toets wordt ingedrukt voordat de inhoud van de combo-lijst met contactpersonen wordt geladen. <br> Dit kan de prestaties verbeteren als u een groot aantal contacten heeft, maar het is minder handig.
 NumberOfKeyToSearch=Aantal tekens om de zoekopdracht te activeren: %s
 NumberOfBytes=Aantal bytes
 SearchString=Zoekstring
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=Bij een document van een relatiej, kan een
 JavascriptDisabled=JavaScript uitgeschakeld
 UsePreviewTabs=Gebruik voorbeeld tabbladen
 ShowPreview=Toon voorbeeldweergave
+ShowHideDetails=Toon of verberg details
 PreviewNotAvailable=Voorbeeldweergave niet beschikbaar
 ThemeCurrentlyActive=Huidige thema
 CurrentTimeZone=Huidige tijdzone (server)
@@ -271,7 +274,7 @@ NoticePeriod=Opzegtermijn
 NewByMonth=Nieuw per maand
 Emails=E-mails
 EMailsSetup=E-mail instellingen
-EMailsDesc=Op deze pagina kunt u uw standaard PHP-parameters voor e-mailverzending negeren. In de meeste gevallen op Unix / Linux OS is de PHP-instelling correct en zijn deze parameters niet nodig.
+EMailsDesc=Op deze pagina kunt u parameters of opties instellen voor het verzenden van e-mail.
 EmailSenderProfiles=Verzender e-mails profielen
 EMailsSenderProfileDesc=U kunt deze sectie leeg houden. Als u hier enkele e-mails invoert, worden deze toegevoegd aan de lijst met mogelijke afzenders in de combobox wanneer u een nieuwe e-mail schrijft.
 MAIN_MAIL_SMTP_PORT=SMTP / SMTPS-poort (standaardwaarde in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (als het verzenden vanaf de server authenticatie vere
 MAIN_MAIL_SMTPS_PW=SMTP-wachtwoord (als het verzenden vanaf de server authenticatie vereist)
 MAIN_MAIL_EMAIL_TLS=Gebruik TLS (SSL) encryptie
 MAIN_MAIL_EMAIL_STARTTLS=Gebruik TLS (STARTTLS) -codering
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Gebruik DKIM om een e-mailhandtekening te genereren
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=E-maildomein voor gebruik met dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Naam van dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Dit veld leeg laten betekent dat deze waarde zonder
 ExtrafieldParamHelpselect=Waardenlijst moet regels zijn met opmaaksleutel, waarde (waar sleutel niet '0' kan zijn) <br><br> bijvoorbeeld: <br> 1, waarde1 <br> 2, value2 <br> code3, waarde3 <br> ... <br><br> Om de lijst afhankelijk van een andere aanvullende attributenlijst te krijgen: <br> 1, waarde1 | options_ <i>parent_list_code</i> : parent_key <br> 2, <i>value2</i> | options_ <i>parent_list_code</i> : parent_key <br><br> Om de lijst afhankelijk van een andere lijst te krijgen: <br> 1, waarde1 | <i>parent_list_code</i> : parent_key <br> 2, waarde2 | <i>parent_list_code</i> : parent_key
 ExtrafieldParamHelpcheckbox=Waardenlijst moet regels zijn met opmaaksleutel, waarde (waar sleutel niet '0' kan zijn) <br><br> bijvoorbeeld: <br> 1, waarde1 <br> 2, value2 <br> 3, waarde3 <br> ...
 ExtrafieldParamHelpradio=Waardenlijst moet regels zijn met opmaaksleutel, waarde (waar sleutel niet '0' kan zijn) <br><br> bijvoorbeeld: <br> 1, waarde1 <br> 2, value2 <br> 3, waarde3 <br> ...
-ExtrafieldParamHelpsellist=Lijst met waarden komt uit een tabel <br> Syntaxis: tabelnaam: labelveld: id_veld :: filter <br> Voorbeeld: c_typent: libelle: id :: filter <br><br> - idfilter is noodzakelijkerwijs een primaire int-sleutel <br> - filter kan een eenvoudige test zijn (bijv. actief = 1) om alleen de actieve waarde weer te geven <br> U kunt ook $ID$ gebruiken in filter waarvan de huidige id van het huidige object is <br> Gebruik $SEL$ om een SELECT in filter te doen <br> als u op extra velden wilt filteren, gebruikt u de syntaxis extra.fieldcode = ... (waarbij veldcode de code van extraveld is) <br><br> Om de lijst afhankelijk van een andere aanvullende attributenlijst te krijgen: <br> c_typent: libelle: id: options_ <i>parent_list_code</i> | parent_column: filter <br><br> Om de lijst afhankelijk van een andere lijst te krijgen: <br> c_typent: libelle: id: <i>parent_list_code</i> | parent_column: filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Lijst met waarden komt uit een tabel <br> Syntaxis: tabelnaam: labelveld: id_veld :: filter <br> Voorbeeld: c_typent: libelle: id :: filter <br><br> filter kan een eenvoudige test zijn (bijv. actief = 1) om alleen de actieve waarde weer te geven <br> U kunt ook $ ID $ gebruiken in filter waarvan de huidige id van het huidige object is <br> Gebruik $ SEL $ om een SELECT in filter te doen <br> Als u op extra velden wilt filteren, gebruikt u syntaxis extra.fieldcode = ... (waarbij veldcode de code van extraveld is) <br><br> Om de lijst afhankelijk van een andere aanvullende attributenlijst te krijgen: <br> c_typent: libelle: id: options_ <i>parent_list_code</i> | parent_column: filter <br><br> Om de lijst afhankelijk van een andere lijst te krijgen: <br> c_typent: libelle: id: <i>parent_list_code</i> | parent_column: filter
-ExtrafieldParamHelplink=Parameters moeten ObjectName: Classpath zijn <br> Syntaxis: ObjectName: Classpath <br> Voorbeelden: <br> Societe: societe / klasse / societe.class.php <br> Contact: contact / klasse / contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Blijf leeg voor een eenvoudig scheidingsteken <br> Stel dit in op 1 voor een samenvouwend scheidingsteken (standaard geopend voor nieuwe sessie, dan wordt de status behouden voor elke gebruikerssessie) <br> Stel dit in op 2 voor een samenvouwend scheidingsteken (standaard samengevouwen voor nieuwe sessie, dan wordt de status behouden voor elke gebruikerssessie)
 LibraryToBuildPDF=Gebruikte library voor generen PDF
 LocalTaxDesc=Sommige landen kunnen twee of drie belastingen toepassen op elke factuurregel. Als dit het geval is, kiest u het type voor de tweede en derde belasting en het tarief. Mogelijk type zijn: <br> 1: lokale belasting van toepassing op producten en diensten zonder btw (lokale belasting wordt berekend op bedrag zonder btw) <br> 2: lokale belasting van toepassing op producten en diensten inclusief btw (lokale belasting wordt berekend op bedrag + hoofdbelasting) <br> 3: lokale belasting van toepassing op producten zonder btw (lokale belasting wordt berekend op bedrag zonder btw) <br> 4: lokale belasting van toepassing op producten inclusief btw (lokale belasting wordt berekend op bedrag + hoofd btw) <br> 5: lokale belasting van toepassing op diensten zonder btw (lokale belasting wordt berekend op bedrag zonder btw) <br> 6: lokale belasting van toepassing op diensten inclusief btw (lokale belasting wordt berekend op bedrag + belasting)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s gevolgd door de ingekorte klantnaam door h
 ModuleCompanyCodeSupplierDigitaria=%s gevolgd door de ingekorte leveranciersnaam met het aantal tekens: %s voor de boekhoudcode van de leverancier.
 Use3StepsApproval=Bestellingen moeten standaard worden gemaakt en goedgekeurd door 2 verschillende gebruikers (één stap / gebruiker om te maken en één stap / gebruiker goed te keuren. Merk op dat als gebruiker zowel toestemming heeft om te maken en goed te keuren, één stap / gebruiker volstaat) . U kunt met deze optie vragen om een ​​derde stap / gebruikersgoedkeuring in te voeren, als het bedrag hoger is dan een speciale waarde (dus 3 stappen zijn nodig: 1 = validatie, 2 = eerste keer goedkeuren en 3 = tweede keer goedkeuren als het bedrag voldoende is). <br> Stel deze optie in op leeg als één goedkeuring (2 stappen) voldoende is, stel deze in op een zeer lage waarde (0,1) als een tweede goedkeuring (3 stappen) altijd vereist is.
 UseDoubleApproval=Gebruik een goedkeuring in 3 stappen als het bedrag (zonder belasting) hoger is dan ...
-WarningPHPMail=WAARSCHUWING: het is vaak beter om bij uitgaande e-mails de e-mailserver van uw provider te gebruiken in plaats van de standaardinstelling. Sommige e-mailproviders (zoals Yahoo) staan u niet toe een e-mail te verzenden vanaf een andere server dan hun eigen server. Uw huidige installatie gebruikt de server van de toepassing om e-mail te verzenden en niet de server van uw e-mailprovider, dus sommige ontvangers (die compatibel zijn met het beperkende DMARC-protocol), zullen uw e-mailprovider vragen of zij uw e-mail kunnen accepteren en sommige e-mailproviders (zoals Yahoo) kan "nee" antwoorden omdat de server niet van hen is, dus weinigen van uw verzonden e-mails worden mogelijk niet geaccepteerd (let ook op het verzendquotum van uw e-mailprovider). <br> Als uw e-mailprovider (zoals Yahoo) deze beperking heeft, moet u de e-mailinstellingen wijzigen om de andere methode "SMTP-server" te kiezen en de SMTP-server en inloggegevens van uw e-mailprovider in te voeren.
+WarningPHPMail=WAARSCHUWING: De instelling om e-mails te verzenden vanuit de applicatie maakt gebruik van de standaard generieke instellingen. Om verschillende redenen is het vaak beter om uitgaande e-mails in te stellen om de e-mailserver van uw e-mailserviceprovider te gebruiken in plaats van de standaardinstellingen:
+WarningPHPMailA=- Het gebruik van de server van de e-mailserviceprovider verhoogt de betrouwbaarheid van uw e-mail. Dus het verhoogt de kans te worden afgeleverd zonder te worden gemarkeerd als SPAM
+WarningPHPMailB=- Sommige e-mailproviders (zoals Yahoo) staan niet toe dat u een e-mail verzendt vanaf een andere server dan hun eigen server. Uw huidige installatie gebruikt de server van de applicatie om e-mail te verzenden en niet de server van uw e-mailprovider, dus sommige ontvangers (degene die compatibel zijn met het beperkende DMARC-protocol) zullen uw e-mailprovider vragen of zij uw e-mail kunnen accepteren en sommige e-mailproviders (zoals Yahoo) reageert mogelijk "nee" omdat de server niet van hen is, dus enkele van uw verzonden e-mails worden mogelijk niet geaccepteerd voor bezorging (let ook op de verzendquota van uw e-mailprovider).
+WarningPHPMailC=- Het gebruik van de SMTP-server van uw eigen e-mailserviceprovider om e-mails te verzenden is ook interessant, dus alle e-mails die vanuit de toepassing worden verzonden, worden ook opgeslagen in uw "Verzonden" -map van uw mailbox.
+WarningPHPMailD=Als de methode 'PHP Mail' echt de methode is die u zou willen gebruiken, kunt u deze waarschuwing verwijderen door de constante MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP toe te voegen aan 1 in Home - Setup - Other.
 WarningPHPMail2=Als uw e-mail SMTP-provider de e-mailclient moet beperken tot bepaalde IP-adressen (zeer zeldzaam), is dit het IP-adres van de mail user agent (MUA) voor uw ERP CRM-toepassing: <strong>%s</strong>.
-WarningPHPMailSPF=Als de domeinnaam in uw e-mailadres van de afzender wordt beschermd door SPF (vraag uw e-mailprovider), moet u de volgende IP's opnemen in het SPF-record van de DNS van uw domein: <strong>%s</strong>.
+WarningPHPMailSPF=Als de domeinnaam in je afzender-e-mailadres is beschermd door een SPF-record (vraag je domeinnaamregistratie), moet je de volgende IP's toevoegen in het SPF-record van de DNS van je domein: <strong>%s</strong>.
 ClickToShowDescription=Klik voor omschrijving
 DependsOn=Deze module heeft de module(s) nodig
 RequiredBy=Deze module is vereist bij module(s)
@@ -551,8 +559,6 @@ Module57Name=Betalingen via automatische incasso
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integratie van een 'ClickToDial' systeem (Asterisk, etc)
-Module59Name=Bookmark4u
-Module59Desc=Voeg functionaliteit toe om een 'Bookmark4u'-account te maken vanuit een Dolibarr-account
 Module60Name=stickers
 Module60Desc=Beheer van stickers
 Module70Name=Interventies
@@ -656,7 +662,7 @@ Module50200Desc=Bied klanten een PayPal-online betaalpagina (PayPal-account of c
 Module50300Name=Stripe
 Module50300Desc=Bied klanten een Stripe online betaalpagina (credit / debit cards). Dit kan worden gebruikt om uw klanten toe te staan ad-hocbetalingen te doen of betalingen gerelateerd aan een specifiek Dolibarr-object (factuur, bestelling, enz ...)
 Module50400Name=Boekhouding (dubbele invoer)
-Module50400Desc=Boekhoudbeheer (dubbele invoer, ondersteuning grootboek en grootboekadministratie). Exporteer het grootboek naar verschillende andere boekhoudsoftware-indelingen.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct afdrukken (zonder de documenten te openen) met behulp van Cups IPP-interface (printer moet zichtbaar zijn vanaf de server en CUPS moet op de server zijn geïnstalleerd).
 Module55000Name=Poll, Onderzoek of Stemmen
@@ -671,7 +677,7 @@ Module63000Name=Bronnen
 Module63000Desc=Beheer middelen (printers, auto&#39;s, kamers, ...) voor toewijzing aan evenementen
 Permission11=Bekijk afnemersfacturen
 Permission12=Creëer / wijzigen afnemersfacturen
-Permission13=Invalideer afnemersfacturen
+Permission13=Klantfacturen laten vervallen
 Permission14=Valideer afnemersfacturen
 Permission15=Afnemersfacturen verzenden via e-mail
 Permission16=Creëer betalingen voor afnemersfacturen
@@ -688,6 +694,7 @@ Permission32=Maak / wijzig producten en diensten
 Permission34=Verwijderen producten / diensten
 Permission36=Exporteer producten / diensten
 Permission38=Export producten
+Permission39=Negeer minimum prijs
 Permission41=Lees projecten en taken (gedeeld project en projecten waarvoor ik contact heb). Kan ook tijd in beslag nemen, voor mij of mijn hiërarchie, op toegewezen taken (Urenstaat)
 Permission42=Projecten maken / wijzigen (gedeeld project en projecten waarvoor ik contact heb). Kan ook taken maken en gebruikers toewijzen aan projecten en taken
 Permission44=Projecten verwijderen (gedeeld project en projecten waar ik contact mee heb)
@@ -696,6 +703,9 @@ Permission61=Bekijk interventies
 Permission62=Creëer / wijzig interventies
 Permission64=Verwijder interventies
 Permission67=Exporteer interventies
+Permission68=Stuur interventies per e-mail
+Permission69=Valideer interventies
+Permission70=Interventies ongeldig maken
 Permission71=Bekijk leden
 Permission72=Creëer / wijzigen leden
 Permission74=Verwijder leden
@@ -718,6 +728,7 @@ Permission95=Bekijk de rapporten
 Permission101=Bekijk verzendingen
 Permission102=Creëer / wijzig verzendingen
 Permission104=Valideer verzendingen
+Permission105=Verzend verzendingen per e-mail
 Permission106=Export zendingen
 Permission109=Verwijder verzendingen
 Permission111=Bekijk de financiële rekeningen
@@ -825,10 +836,11 @@ Permission402=Creëren / wijzigen kortingen
 Permission403=Kortingen valideren
 Permission404=Kortingen verwijderen
 Permission430=Gebruik foutopsporingsbalk
-Permission511=Lees betalingen van salarissen
+Permission511=Inlezen betalingen van salarissen (van jou en ondergeschikten)
 Permission512=Creëer / wijzig betalingen van salarissen
 Permission514=Betalingen van salarissen verwijderen
-Permission517=Export salarissen
+Permission517=Inlezen betalingen van salarissen van iedereen
+Permission519=Export salarissen
 Permission520=Lees Leningen
 Permission522=Creëer/wijzigen leningen
 Permission524=Verwijderen leningen
@@ -839,10 +851,13 @@ Permission532=Creëren / wijzigen van diensten
 Permission534=Diensten verwijderen
 Permission536=Inzien / beheren van verborgen diensten
 Permission538=Diensten exporteren
-Permission561=Read payment orders by credit transfer
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
+Permission561=Inlezen betalingsopdrachten via overschrijving
+Permission562=Betaalopdracht aanmaken/wijzigen via overschrijving
+Permission563=Betaalopdracht verzenden
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Lees stickers
+Permission602=Stickers maken/wijzigen
+Permission609=Verwijder etiketten
 Permission650=Lees stuklijsten
 Permission651=Materiaalrekeningen maken / bijwerken
 Permission652=Materiaalrekeningen verwijderen
@@ -884,7 +899,9 @@ Permission1185=Aankooporders goedkeuren
 Permission1186=Verwerk inkooporders
 Permission1187=Bevestig de ontvangst van inkooporders
 Permission1188=Bestellingen verwijderen
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Goedkeuren (tweede goedkeuring) inkooporders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Geef het resultaat van een uitvoervergunning
 Permission1202=Creëren/wijzigen een uitvoervergunning
 Permission1231=Lees leveranciersfacturen
@@ -898,6 +915,8 @@ Permission1251=Voer massale invoer van externe gegevens in de database uit (data
 Permission1321=Exporteer afnemersfacturen, attributen en betalingen
 Permission1322=Open een betaalde factuur
 Permission1421=Verkooporders en attributen exporteren
+Permission1521=Lees documenten
+Permission1522=Verwijder documenten
 Permission2401=Bekijk acties (evenementen of taken) die zijn gekoppeld aan zijn gebruikersaccount (indien eigenaar van evenement of zojuist toegewezen aan)
 Permission2402=Acties (evenementen of taken) maken / wijzigen die zijn gekoppeld aan zijn gebruikersaccount (als eigenaar van een evenement)
 Permission2403=Acties (evenementen of taken) verwijderen die zijn gekoppeld aan zijn gebruikersaccount (indien eigenaar van evenement)
@@ -912,7 +931,7 @@ Permission2515=Stel document mappen in
 Permission2801=Gebruik FTP-client in lees modus (enkel verkennen en downloaden)
 Permission2802=Gebruik FTP-client in schrijf modus (verwijderen of bestanden uploaden)
 Permission3200=Lees gearchiveerde evenementen en vingerafdrukken
-Permission3301=Generate new modules
+Permission3301=Maak nieuwe modules
 Permission4001=Bekijk medewerkers
 Permission4002=Creëer medewerkers
 Permission4003=Verwijder werknemers
@@ -932,9 +951,13 @@ Permission23001=Lees geplande taak
 Permission23002=Maak/wijzig geplande taak
 Permission23003=Verwijder geplande taak
 Permission23004=Voer geplande taak uit
-Permission50101=Gebruik Point Of Sale
+Permission50101=Gebruik kassaonderdeel (SimplePOS)
+Permission50151=Gebruik verkooppunt (TakePOS)
 Permission50201=Lees transacties
 Permission50202=Importeer transacties
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Verwijder objecten van Zapier
 Permission50401=Bind producten en facturen met boekhoudrekeningen
 Permission50411=Bewerkingen lezen in grootboek
 Permission50412=Bewerkingen schrijven / bewerken in het grootboek
@@ -958,6 +981,17 @@ Permission63001=Bronnen lezen
 Permission63002=Bronnen maken / wijzigen
 Permission63003=Verwijder resources
 Permission63004=Koppel middelen aan agenda-evenementen
+Permission64001=Sta direct printen toe
+Permission67000=Printen kassabon toestaan
+Permission68001=Lees intracomm rapport
+Permission68002=Intracomm-rapport maken/wijzigen
+Permission68004=Intracomm-rapport verwijderen
+Permission941601=Read receipts
+Permission941602=Bonnen aanmaken en wijzigen
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Relatietype
 DictionaryCompanyJuridicalType=Externe rechtspersonen
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Soorten verlof
 DictionaryOpportunityStatus=Leadstatus voor project / lead
 DictionaryExpenseTaxCat=Onkostenoverzicht - Vervoerscategorieën
 DictionaryExpenseTaxRange=Onkostenoverzicht - bereik per transportcategorie
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Instellingen opgeslagen
 SetupNotSaved=Installatie niet opgeslagen
 BackToModuleList=Terug naar modulelijst
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Standaard te gebruiken label indien er geen vertaling kan wor
 LabelOnDocuments=Etiket op documenten
 LabelOrTranslationKey=Label- of vertaalsleutel
 ValueOfConstantKey=Waarde van een configuratieconstante
+ConstantIsOn=Option %s is on
 NbOfDays=Aantal dagen
 AtEndOfMonth=Aan het einde van de maand
 CurrentNext=Huidige/volgende
@@ -1145,6 +1182,7 @@ InfoWebServer=Over Web Server
 InfoDatabase=Over Database
 InfoPHP=Over PHP
 InfoPerf=Over Prestaties
+InfoSecurity=About Security
 BrowserName=Browser naam
 BrowserOS=Browser OS
 ListOfSecurityEvents=Lijst van Dolibarr veiligheidgebeurtenisen
@@ -1194,7 +1232,8 @@ RestoreDesc=Om een Dolibarr-back-up te herstellen, zijn twee stappen vereist.
 RestoreDesc2=Herstel het back-upbestand (zip-bestand bijvoorbeeld) van de map &quot;Documenten&quot; naar een nieuwe Dolibarr-installatie of in deze huidige documentenmap ( <b>%s</b> ).
 RestoreDesc3=Herstel de databasestructuur en gegevens van een back-up dumpbestand in de database van de nieuwe Dolibarr-installatie of in de database van deze huidige installatie ( <b>%s</b> ). Waarschuwing, zodra het herstel is voltooid, moet u een login / wachtwoord gebruiken dat bestond uit de back-uptijd / installatie om opnieuw verbinding te maken. <br> Om een back-updatabase te herstellen in deze huidige installatie, kunt u deze assistent volgen.
 RestoreMySQL=MySQL import
-ForcedToByAModule= Geforceerd tot <b>%s</b> door een geactiveerde module
+ForcedToByAModule=Geforceerd tot <b>%s</b> door een geactiveerde module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Bestaande back-upbestanden
 PreviousArchiveFiles=Bestaande archiefbestanden
 WeekStartOnDay=Eerste dag van de week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is geladen
 PreloadOPCode=Voorgeladen OPCode wordt gebruikt
 AddRefInList=Weergave klant/leverancier ref. infolijst (selecteer lijst of combobox) en de meeste hyperlinks. <br> Derden zullen verschijnen met een naamnotatie van "CC12345 - SC45678 - The Big Company corp." in plaats van "The Big Company corp".
 AddAdressInList=Toon klant / leverancier adres infolijst (selecteer lijst of combobox) <br> Derden zullen verschijnen met een naamnotatie van &quot;The Big Company corp. - 21 jump street 123456 Big town - USA&quot; in plaats van &quot;The Big Company corp&quot;.
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Vraag de gewenste verzendmethode voor derden.
 FieldEdition=Wijziging van het veld %s
 FillThisOnlyIfRequired=Voorbeeld: +2 (alleen invullen als tijdzone offset problemen worden ervaren)
@@ -1282,7 +1322,7 @@ GetBarCode=Haal barcode
 NumberingModules=Nummeringsmodellen
 DocumentModules=Documentmodellen
 ##### Module password generation
-PasswordGenerationStandard=Geeft een wachtwoord terug dat gegenereerd is volgens het interne Dolibarr algoritme: 8 karakters met gedeelde nummers en tekens in kleine letters.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Stel geen gegenereerd wachtwoord voor. Wachtwoord moet handmatig worden ingevoerd.
 PasswordGenerationPerso=Retourneer een wachtwoord volgens uw persoonlijk gedefinieerde configuratie.
 SetupPerso=Volgens uw configuratie
@@ -1381,6 +1421,7 @@ AdherentMailRequired=E-mail vereist om een nieuw lid te maken
 MemberSendInformationByMailByDefault=Vinkvakje om een bevestigingse-mail te sturen naar leden (validatie van nieuwe abonnementen). Staat standaard aan.
 VisitorCanChooseItsPaymentMode=Bezoeker kan kiezen uit beschikbare betalingsmodi
 MEMBER_REMINDER_EMAIL=Automatische herinnering <b>per e-mail</b> inschakelen voor verlopen abonnementen. Opmerking: Module <strong>%s</strong> moet zijn ingeschakeld en correct zijn ingesteld om herinneringen te verzenden.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP-instellingen
 LDAPGlobalParameters=Algemene instellingen
@@ -1523,7 +1564,9 @@ LDAPDescValues=Voorbeeldwaarden zijn ingesteld voor <b>OpenLDAP</b> geladen met
 ForANonAnonymousAccess=Voor een geautoriseerde verbinding (bijvoorbeeld om over schrijfrechten te beschikken)
 PerfDolibarr=Prestaties setup / optimaliseren rapport
 YouMayFindPerfAdviceHere=Deze pagina biedt enkele controles of advies met betrekking tot prestaties.
-NotInstalled=Niet geïnstalleerd, dus uw server wordt hierdoor niet vertraagd.
+NotInstalled=Niet geïnstalleerd.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicatieve cache
 MemcachedNotAvailable=Geen applicatieve cache gevonden. U kunt de prestaties verbeteren door een cacheserver Memcached te installeren en een module die deze cacheserver kan gebruiken. <br> Meer informatie hier <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a> . <br> Merk op dat veel webhostingproviders dergelijke cacheserver niet bieden.
 MemcachedModuleAvailableButNotSetup=Module in memcache voor applicatieve cache gevonden, maar installatie van module is niet voltooid.
@@ -1571,9 +1614,9 @@ SyslogLevel=Level
 SyslogFilename=Bestandsnaam en -pad
 YouCanUseDOL_DATA_ROOT=U kunt DOL_DATA_ROOT/dolibarr.log gebruiken voor een logbestand in de Dolibarr "documenten"-map. U kunt ook een ander pad gebruiken om dit bestand op te slaan.
 ErrorUnknownSyslogConstant=Constante %s is geen bekende 'syslog' constante
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compressie en back-up van foutopsporingslogbestanden (gegenereerd door module Log voor foutopsporing)
-SyslogFileNumberOfSaves=Log back-ups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configureer de geplande taak opschonen om de frequentie van de logboekback-up in te stellen
 ##### Donations #####
 DonationsSetup=Donatiemoduleinstellingen
@@ -1629,7 +1672,7 @@ AdvancedEditor=Geavanceerde editor
 ActivateFCKeditor=Activeer FCKeditor voor:
 FCKeditorForCompany=WYSIWIG creatie / bewerking van bedrijfsomschrijving en notities
 FCKeditorForProduct=WYSIWIG creatie / bewerking van product- / dienstomschrijving en notities
-FCKeditorForProductDetails=WYSIWIG creatie / editie van productdetailsregels voor alle entiteiten (voorstellen, bestellingen, facturen, enz ...). <font class="warning">Waarschuwing: het gebruik van deze optie voor dit geval wordt ernstig afgeraden, omdat dit problemen kan veroorzaken met speciale tekens en pagina-opmaak bij het bouwen van PDF-bestanden.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG creatie / bewerking van mailings
 FCKeditorForUserSignature=WYSIWIG creatie /aanpassing van ondertekening
 FCKeditorForMail=WYSIWIG creatie / bewerking voor alle e-mail (behalve Gereedschap-> E-mailing)
@@ -1639,11 +1682,11 @@ StockSetup=Voorraad-module instellen
 IfYouUsePointOfSaleCheckModule=Als u de POS-module (POS) die standaard wordt aangeboden of een externe module gebruikt, kan deze configuratie door uw POS-module worden genegeerd. De meeste POS-modules zijn standaard ontworpen om direct een factuur te maken en de voorraad te verminderen, ongeacht de opties hier. Dus als u al dan niet een voorraadvermindering moet hebben bij het registreren van een verkoop vanuit uw POS, controleer dan ook de instellingen van uw POS-module.
 ##### Menu #####
 MenuDeleted=Menu verwijderd
+Menu=Menu
 Menus=Menu's
 TreeMenuPersonalized=Persoonlijke menu's
 NotTopTreeMenuPersonalized=Gepersonaliseerde menu&#39;s niet gekoppeld aan een hoofdmenu-item
 NewMenu=Nieuw menu
-Menu=Selectie van menu
 MenuHandler=Menuverwerker
 MenuModule=Bronmodule
 HideUnauthorizedMenu= Verberg ongeautoriseerde menu's (grijs)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Stel deze standaardwaarde automatisch in voor het
 AGENDA_DEFAULT_FILTER_TYPE=Stel dit type evenement automatisch in het zoekfilter van de agendaweergave in
 AGENDA_DEFAULT_FILTER_STATUS=Stel deze status automatisch in voor evenementen in het zoekfilter van de agendaweergave
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Herinnering gebeurtenis inschakelen <b>via e-mail</b> (herinneringsoptie / vertraging kan worden gedefinieerd voor elke gebeurtenis). Opmerking: Module <strong>%s</strong> moet zijn ingeschakeld en correct zijn ingesteld om herinneringen op de juiste frequentie te laten verzenden.
-AGENDA_REMINDER_BROWSER=Herinnering gebeurtenis inschakelen <b>in de browser van de gebruiker</b> (wanneer de datum van de gebeurtenis wordt bereikt, kan elke gebruiker dit weigeren via de bevestigingsvraag van de browser)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Schakel geluidsmelding in
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Gekoppeld object weergeven in agendaweergave
 ##### Clicktodial #####
 ClickToDialSetup='Click-To-Dial' moduleinstellingen
@@ -1790,11 +1834,10 @@ NoAmbiCaracAutoGeneration=Voor het automatisch genereren, gebruik geen dubbelzin
 SalariesSetup=Setup salaris module
 SortOrder=Sorteervolgorde
 Format=Formaat
-TypePaymentDesc=0: Betalingswijze klant, 1: Betalingswijze leverancier, 2: Betalingswijze zowel klanten als leveranciers
+TypePaymentDesc=0: Betaalwijze klant, 1: Betaalwijze leverancier, 2: Betaalwijze zowel klanten als leveranciers
 IncludePath=Include path (gedefinieerd in de variabele %s)
 ExpenseReportsSetup=Setup van module onkostennota's
 TemplatePDFExpenseReports=Document sjablonen om onkostennota's document te genereren
-ExpenseReportsIkSetup=Setup van module onkostendeclaraties - Milles index
 ExpenseReportsRulesSetup=Opzetten van module onkostendeclaraties - regels
 ExpenseReportNumberingModules=Onkostenrapportage nummeringsmodule
 NoModueToManageStockIncrease=Geen module in staat om automatische voorraad toename beheren is geactiveerd. Stock verhoging zal worden gedaan via handmatige invoer.
@@ -1864,7 +1907,7 @@ MailToSendReception=Ontvangsten
 MailToThirdparty=Derde partijen
 MailToMember=Leden
 MailToUser=Gebruikers
-MailToProject=Projecten pagina
+MailToProject=Projecten
 MailToTicket=Tickets
 ByDefaultInList=Standaard weergeven in de lijstweergave
 YouUseLastStableVersion=U gebruikt de nieuwste stabiele versie
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Zoeken van derden laden op %s (alleen laden)
 LoadThirdPartyFromNameOrCreate=Zoeken van derden laden op %s (maken indien niet gevonden)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu toegangscode (hoofdmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Schakel functie uit om een ​​bron te koppelen aa
 EnableResourceUsedInEventCheck=Schakel de functie in om te controleren of een bron in een gebeurtenis wordt gebruikt
 ConfirmUnactivation=Bevestig de module-reset
 OnMobileOnly=Alleen op klein scherm (smartphone)
-DisableProspectCustomerType=Schakel het type &quot;Prospect + Klant&quot; van derden uit (dus derde partij moet Prospect of Klant zijn, maar kan niet beide zijn)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Vereenvoudig de interface voor blinden
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Schakel deze optie in als u een blinde persoon bent of als u de toepassing gebruikt vanuit een tekstbrowser zoals Lynx of Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Wijzig de kleur van de interface voor kleurenblinde persoon
@@ -1996,13 +2041,15 @@ UseDebugBar=Gebruik de foutopsporingsbalk
 DEBUGBAR_LOGS_LINES_NUMBER=Aantal laatste logboekregels dat in de console moet worden bewaard
 WarningValueHigherSlowsDramaticalyOutput=Waarschuwing, hogere waarden vertragen de uitvoer dramatisch
 ModuleActivated=Module %s is geactiveerd en vertraagt de interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Exportmodellen zijn met iedereen te delen
 ExportSetup=Installatie van exportmodule
 ImportSetup=Instellen van module Import
 InstanceUniqueID=Uniek ID van de instantie
 SmallerThan=Kleiner dan
 LargerThan=Groter dan
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=Als u bij een GMail-account de validatie in 2 stappen hebt ingeschakeld, wordt aanbevolen om een speciaal tweede wachtwoord voor de toepassing te maken in plaats van uw eigen wachtwoord van https://myaccount.google.com/.
 EmailCollectorTargetDir=Het kan een gewenst gedrag zijn om de e-mail naar een andere tag / directory te verplaatsen wanneer deze met succes is verwerkt. Stel hier gewoon de naam van de map in om deze functie te gebruiken (gebruik GEEN speciale tekens in de naam). Houd er rekening mee dat u ook een inlogaccount voor lezen / schrijven moet gebruiken.
 EmailCollectorLoadThirdPartyHelp=U kunt deze actie gebruiken om de e-mailinhoud te gebruiken om een bestaande relatie in uw database te zoeken en te laden. De gevonden (of gecreëerde) relatie zal worden gebruikt voor het volgen van acties die het nodig hebben. In het parameterveld kunt u bijvoorbeeld 'EXTRACT: BODY: Name: \\ s ([^ \\ s] *)' gebruiken als u de naam van de relatie wilt extraheren uit een string 'Name: name to find' gevonden in de bron.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=De schaal is het aantal plaatsen dat u nodig heeft om het dec
 TemplateAdded=Sjabloon toegevoegd
 TemplateUpdated=Sjabloon bijgewerkt
 TemplateDeleted=Sjabloon verwijderd
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang
index da458aef622..2bdc1c80373 100644
--- a/htdocs/langs/nl_NL/banks.lang
+++ b/htdocs/langs/nl_NL/banks.lang
@@ -37,7 +37,7 @@ IbanValid=IBAN geldig
 IbanNotValid=IBAN is niet geldig
 StandingOrders=Incasso-opdrachten
 StandingOrder=Incasso-opdracht
-PaymentByDirectDebit=Betaling via automatische incasso
+PaymentByDirectDebit=Automatische incasso
 PaymentByBankTransfers=Betalingen via overschrijving
 PaymentByBankTransfer=Betaling via overschrijving
 AccountStatement=Rekeningafschrift
@@ -73,8 +73,8 @@ ListBankTransactions=Lijst bankmutaties
 IdTransaction=Transactie ID
 BankTransactions=Bankmutaties
 BankTransaction=Bankmutatie
-ListTransactions=Lijst items
-ListTransactionsByCategory=Lijst items/categorie
+ListTransactions=Mutatieoverzicht
+ListTransactionsByCategory=Mutaties per categorie
 TransactionsToConciliate=Items af te stemmen
 TransactionsToConciliateShort=Af te stemmen
 Conciliable=Kunnen worden afgestemd
@@ -126,7 +126,7 @@ NumberOfCheques=Checknr.
 DeleteTransaction=Ingave verwijderen
 ConfirmDeleteTransaction=Weet u zeker dat u deze boeking wilt verwijderen?
 ThisWillAlsoDeleteBankRecord=Hiermee wordt ook de boeking in de bank verwijderd
-BankMovements=Verplaatsingen
+BankMovements=Mutaties
 PlannedTransactions=Nog te verwerken
 Graph=Grafiek
 ExportDataset_banque_1=Bankboekingen en rekeningafschriften
@@ -166,6 +166,9 @@ VariousPayment=Overige betaling
 VariousPayments=Diverse betalingen
 ShowVariousPayment=Laat overige betaling zien
 AddVariousPayment=Overige betaling toevoegen
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA-mandaat
 YourSEPAMandate=Uw SEPA-mandaat
 FindYourSEPAMandate=Met deze SEPA-machtiging geeft u ons bedrijf toestemming een opdracht ter incasso te sturen naar uw bank. Retourneer het ondertekend (scan van het ondertekende document) of stuur het per e-mail naar
@@ -176,3 +179,4 @@ BankColorizeMovement=Inkleuren mutaties
 BankColorizeMovementDesc=Als deze functie is ingeschakeld, kunt u een specifieke achtergrondkleur kiezen voor debet- of creditmutaties
 BankColorizeMovementName1=Achtergrondkleur voor debetmutatie
 BankColorizeMovementName2=Achtergrondkleur voor creditmutatie
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index 5848dcd79cd..20d977e1cf6 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -146,7 +146,7 @@ BillShortStatusClosedPaidPartially=Betaald (gedeeltelijk)
 PaymentStatusToValidShort=Te valideren
 ErrorVATIntraNotConfigured=Intracommunautair BTW-nummer nog niet gedefinieerd
 ErrorNoPaiementModeConfigured=Geen standaard betalingstype gedefinieerd. Ga naar Factuurmodule instellingen om dit op te lossen.
-ErrorCreateBankAccount=Maak een bankrekening aan en ga vervolgens naar de instellingen van de factuur-module om de betalingswijzen te definiëren
+ErrorCreateBankAccount=Maak een bankrekening aan en ga vervolgens naar de instellingen van de factuur-module om de betaalwijzen te definiëren
 ErrorBillNotFound=Factuur %s bestaat niet
 ErrorInvoiceAlreadyReplaced=Fout, u probeerde een factuur te valideren om factuur %s te vervangen. Maar deze is al vervangen door factuur %s.
 ErrorDiscountAlreadyUsed=Fout, korting al gebruikt
@@ -155,7 +155,7 @@ ErrorInvoiceOfThisTypeMustBePositive=Fout, dit type factuur moet een bedrag hebb
 ErrorCantCancelIfReplacementInvoiceNotValidated=Fout, kan een factuur niet annuleren die is vervangen door een ander factuur als deze nog in conceptstatus is
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Dit onderdeel of een ander onderdeel is al in gebruik, dus kortingsreeksen kunnen niet worden verwijderd.
 BillFrom=Van
-BillTo=Geadresseerd aan
+BillTo=Voor
 ActionsOnBill=Acties op factuur
 RecurringInvoiceTemplate=Template / Herhaal factuur
 NoQualifiedRecurringInvoiceTemplateFound=Geen geschikte sjablonen gevonden voor terugkerende facturen
@@ -531,6 +531,7 @@ TypeContact_invoice_supplier_external_SERVICE=Contact verkoper
 InvoiceFirstSituationAsk=Eerste situatie factuur
 InvoiceFirstSituationDesc=De <b>situatie facturen</b> worden gebonden aan situaties met betrekking tot voortgang, bijvoorbeeld de voortgang van een bouwproject. Elke situatie is verbonden met een factuur.
 InvoiceSituation=Situatie factuur
+PDFInvoiceSituation=Situatie factuur
 InvoiceSituationAsk=Factuur die de situatie volgt
 InvoiceSituationDesc=Maak een nieuwe situatie van een reeds bestaande
 SituationAmount=Situatie factuurbedrag (netto)
@@ -575,3 +576,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Leverancierfactuur verwijderd
 UnitPriceXQtyLessDiscount=Eenheidsprijs x Aantal - Korting
 CustomersInvoicesArea=Factureringsgebied voor klanten
 SupplierInvoicesArea=Factureringsgebied leverancier
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/nl_NL/cashdesk.lang b/htdocs/langs/nl_NL/cashdesk.lang
index 78734e4b981..18a7e03de51 100644
--- a/htdocs/langs/nl_NL/cashdesk.lang
+++ b/htdocs/langs/nl_NL/cashdesk.lang
@@ -43,7 +43,7 @@ Place=Plaats
 TakeposConnectorNecesary='TakePOS Connector' vereist
 OrderPrinters=Bestel printers
 SearchProduct=Zoek product
-Receipt=Ontvangst
+Receipt=Bon
 Header=Hoofd
 Footer=Voetnoot
 AmountAtEndOfPeriod=Bedrag aan het einde van de periode (dag, maand of jaar)
@@ -77,7 +77,7 @@ POSModule=POS-module
 BasicPhoneLayout=Gebruik basislay-out voor telefoons
 SetupOfTerminalNotComplete=Het instellen van terminal %s is niet voltooid
 DirectPayment=Directe betaling
-DirectPaymentButton=Add a "Direct cash payment" button
+DirectPaymentButton=Voeg een "betaal direct" knop toe
 InvoiceIsAlreadyValidated=Factuur is al gevalideerd
 NoLinesToBill=Geen regels om te factureren
 CustomReceipt=Aangepaste kwitantie
@@ -110,10 +110,10 @@ BarRestaurant=Bar Restaurant
 AutoOrder=Eigen bestelling door klant
 RestaurantMenu=Menu
 CustomerMenu=Klantmenu
-ScanToMenu=Scan QR code to see the menu
-ScanToOrder=Scan QR code to order
+ScanToMenu=Scan de QR code om het menu te zien
+ScanToOrder=Scan de QR code om te bestellen
 Appearance=Weergave
-HideCategoryImages=Hide Category Images
+HideCategoryImages=Verberg categorie afbeeldingen
 HideProductImages=Verberg productafbeeldingen
 NumberOfLinesToShow=Number of lines of images to show
 DefineTablePlan=Define tables plan
@@ -122,3 +122,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weegschaal
diff --git a/htdocs/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang
index e207eea9d84..c4008fe1ce5 100644
--- a/htdocs/langs/nl_NL/categories.lang
+++ b/htdocs/langs/nl_NL/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Labels/categorieën instelling
 CategorieRecursiv= Automatische koppeling met bovenliggende label/categorie
 CategorieRecursivHelp=Als de optie is ingeschakeld, wordt het product ook toegevoegd aan de bovenliggende categorie wanneer u een product toevoegt aan een subcategorie.
 AddProductServiceIntoCategory=Voeg het volgende product/dienst toe
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Toon label/categorie
 ByDefaultInList=Standaard in de lijst
 ChooseCategory=Kies categorie
-StocksCategoriesArea=Magazijnen Categorieën
-ActionCommCategoriesArea=Gebeurtenissen categorieën omgeving
-WebsitePagesCategoriesArea=Pagina-container categorieën
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Gebruik of operator voor categorieën
diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang
index d831e6ce497..2b4e7b136b4 100644
--- a/htdocs/langs/nl_NL/companies.lang
+++ b/htdocs/langs/nl_NL/companies.lang
@@ -26,7 +26,7 @@ CompanyName=Bedrijfsnaam
 AliasNames=Alias naam (commercieel, handelsmerk, ...)
 AliasNameShort=Alias naam
 Companies=Bedrijven
-CountryIsInEEC=Land is lid van de EEC
+CountryIsInEEC=Land is EU lid
 PriceFormatInCurrentLanguage=Prijsweergaveformaat in de huidige taal en valuta
 ThirdPartyName=Naam relatie
 ThirdPartyEmail=E-mail relatie
@@ -124,19 +124,19 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof. id 1 (ABN)
-ProfId2AU=--
-ProfId3AU=--
-ProfId4AU=--
+ProfId2AU=-
+ProfId3AU=-
+ProfId4AU=-
 ProfId5AU=-
 ProfId6AU=-
 ProfId1BE=Prof. id 1 (Professioneel nummer)
-ProfId2BE=--
-ProfId3BE=--
-ProfId4BE=--
-ProfId5BE=-
+ProfId2BE=-
+ProfId3BE=-
+ProfId4BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Belastingsnummer staat)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Belastingsnummer stad)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=--
-ProfId2CH=--
+ProfId1CH=UID-Nummer
+ProfId2CH=-
 ProfId3CH=Prof id 1 (Federale nummer)
 ProfId4CH=Handelsregisternummer
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (RUT)
 ProfId2CL=-
@@ -165,25 +165,25 @@ ProfId6CO=-
 ProfId1DE=Prof. id 1 (USt.-IdNr)
 ProfId2DE=Prof. id 2 (USt.-Nr)
 ProfId3DE=Prof. Id 3 (Handelsregisternummer)
-ProfId4DE=--
-ProfId5DE=-
+ProfId4DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof. id 1 (SIREN)
 ProfId2FR=Prof. id 2 (SIRET)
 ProfId3FR=Prof. Id 3 (NAF, oude APE)
 ProfId4FR=Prof. id 4 (RCS / RM)
-ProfId5FR=Prof-id 5
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Prof. id 1 (Registratienummer)
-ProfId2GB=--
+ProfId2GB=-
 ProfId3GB=Prof. Id 3 (SIC)
-ProfId4GB=--
+ProfId4GB=-
 ProfId5GB=-
 ProfId6GB=-
 ProfId1HN=Id Prof. 1 (RTN)
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof-id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxemburg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=ID. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (RFC).
 ProfId2MX=Prof Id 2 (R.. P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL==
 ProfId3NL==
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof. id 1 (NIPC)
 ProfId2PT=Prof. id 2 (Social security number)
 ProfId3PT=Prof. Id 3 (Commercial Record aantal)
 ProfId4PT=Prof. id 4 (Conservatorium)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=U kunt het ook handmatig controleren op de website van de Eu
 ErrorVATCheckMS_UNAVAILABLE=Controle niet mogelijk. Controleerdienst wordt niet verleend door lidstaat (%s).
 NorProspectNorCustomer=Geen prospect, noch klant
 JuridicalStatus=Type juridische entiteit
+Workforce=Workforce
 Staff=Werknemers
 ProspectLevelShort=Potentieel
 ProspectLevel=Prospectpotentieel
@@ -449,10 +455,15 @@ ErrorThirdpartiesMerge=Er is een fout opgetreden bij het verwijderen van de rela
 NewCustomerSupplierCodeProposed=Klant- of leverancierscode die al wordt gebruikt, wordt een nieuwe code voorgesteld
 KeepEmptyIfGenericAddress=Houd dit veld leeg als dit adres het standaard adres is
 #Imports
-PaymentTypeCustomer=Betalingswijze - Klant
+PaymentTypeCustomer=Betaalwijze - Klant
 PaymentTermsCustomer=Betalingsvoorwaarden - Klant
 PaymentTypeSupplier=Type betaling - Leverancier
 PaymentTermsSupplier=Betalingstermijn - Leverancier
-PaymentTypeBoth=Betalingswijze - Klant en leverancier
+PaymentTypeBoth=Betaalwijze - Klant en leverancier
 MulticurrencyUsed=Gebruik meerdere valuta
 MulticurrencyCurrency=Valuta
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/nl_NL/ecm.lang b/htdocs/langs/nl_NL/ecm.lang
index c77a2fdc721..0fe01fa5726 100644
--- a/htdocs/langs/nl_NL/ecm.lang
+++ b/htdocs/langs/nl_NL/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Zoeken op trefwoorden
 ECMSearchByEntity=Zoek op object
 ECMSectionOfDocuments=Mappen van documenten
 ECMTypeAuto=Automatisch
-ECMDocsBySocialContributions=Documenten gekoppeld aan sociale of fiscale heffingen/belastingen
-ECMDocsByThirdParties=Documenten gekoppeld aan derden
-ECMDocsByProposals=Documenten gekoppeld aan offertes / voorstellen
-ECMDocsByOrders=Documenten gekoppeld aan afnemersorders
-ECMDocsByContracts=Documenten gekoppeld aan contracten
-ECMDocsByInvoices=Documenten gekoppeld aan afnemersfacturen
-ECMDocsByProducts=Documenten gekoppeld aan producten
-ECMDocsByProjects=Documenten gekoppeld aan projecten
-ECMDocsByUsers=Documenten gerelateerd met gebruikers
-ECMDocsByInterventions=Documenten gerelateerd aan interventies
-ECMDocsByExpenseReports=Documenten gekoppeld aan onkostendeclaraties
-ECMDocsByHolidays=Documenten gekoppeld aan vakanties
-ECMDocsBySupplierProposals=Documenten gekoppeld aan leveranciersvoorstellen
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=Geen map aangemaakt
 ShowECMSection=Toon map
 DeleteSection=Verwijder map
@@ -50,3 +38,6 @@ ReSyncListOfDir=Hersynchroniseer de lijst met mappen
 HashOfFileContent=Hash van bestandsinhoud
 NoDirectoriesFound=Geen mappen gevonden
 FileNotYetIndexedInDatabase=Bestand nog niet geïndexeerd in database (probeer deze opnieuw te uploaden)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/nl_NL/hrm.lang b/htdocs/langs/nl_NL/hrm.lang
index dc2d68d3a9e..00b91ece0f6 100644
--- a/htdocs/langs/nl_NL/hrm.lang
+++ b/htdocs/langs/nl_NL/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Functies
 Employees=Werknemers
 Employee=Werknemer
 NewEmployee=Nieuwe werknemer
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/nl_NL/install.lang b/htdocs/langs/nl_NL/install.lang
index dcd16e523da..a14f8833530 100644
--- a/htdocs/langs/nl_NL/install.lang
+++ b/htdocs/langs/nl_NL/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuratiebestand <b>%s</b> kan niet worden beschreven.
 ConfFileIsWritable=Configuratiebestand <b>%s</b> kan voor schrijven geopend worden.
 ConfFileMustBeAFileNotADir=Configuratiebestand <b>%s</b> moet een bestand zijn en geen map.
 ConfFileReload=Parameters opnieuw laden uit configuratiebestand.
-PHPSupportSessions=Deze PHP installatie ondersteund sessies.
 PHPSupportPOSTGETOk=Deze PHP installatie ondersteunt POST en GET.
 PHPSupportPOSTGETKo=Het is mogelijk dat uw PHP-setup geen ondersteuning biedt voor variabelen POST en / of GET. Controleer de parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=Deze PHP ondersteunt grafische GD-functies.
-PHPSupportCurl=Deze PHP ondersteunt Curl.
-PHPSupportCalendar=Deze PHP ondersteunt kalendersextensies.
-PHPSupportUTF8=Deze PHP ondersteunt UTF8-functies.
-PHPSupportIntl=Deze PHP ondersteunt Intl-functies.
-PHPSupportxDebug=Deze PHP ondersteunt uitgebreide debug-functies.
+PHPSupportSessions=Deze PHP installatie ondersteund sessies.
 PHPSupport=Deze PHP ondersteunt %s-functies.
 PHPMemoryOK=Het maximale sessiegeheugen van deze PHP installatie is ingesteld op <b>%s</b>. Dit zou genoeg moeten zijn.
 PHPMemoryTooLow=Uw PHP max sessie-geheugen is ingesteld op <b>%s</b> bytes. Dit is te laag. Wijzig uw <b>php.ini</b> om de parameter <b>memory_limit in</b> te stellen op ten minste <b>%s</b> bytes.
@@ -120,7 +114,7 @@ YouMustCreateItAndAllowServerToWrite=U dient deze map te creëren en de juiste r
 DBSortingCollation=Karakter sorteervolgorde
 YouAskDatabaseCreationSoDolibarrNeedToConnect=U hebt gekozen voor het maken van de database <b>%s</b> , maar hiervoor moet Dolibarr verbinding maken met de server <b>%s</b> met supergebruiker <b>%s</b> machtigingen.
 YouAskLoginCreationSoDolibarrNeedToConnect=U heeft database-gebruiker <b>%s</b> geselecteerd, maar hiervoor moet Dolibarr verbinding maken met server <b>%s</b> met supergebruiker <b>%s</b> machtigingen.
-BecauseConnectionFailedParametersMayBeWrong=De databaseverbinding is mislukt: de host- of supergebruikerparameters moeten onjuist zijn.
+BecauseConnectionFailedParametersMayBeWrong=De databaseverbinding is mislukt: de host- of super-gebruikerparameters zijn onjuist.
 OrphelinsPaymentsDetectedByMethod=Wezenbetaling gedetecteerd door de methode %s
 RemoveItManuallyAndPressF5ToContinue=Verwijder het met de hand en druk op F5 om door te gaan
 FieldRenamed=Veld hernoemd
diff --git a/htdocs/langs/nl_NL/intracommreport.lang b/htdocs/langs/nl_NL/intracommreport.lang
new file mode 100644
index 00000000000..e30b5fe8ff2
--- /dev/null
+++ b/htdocs/langs/nl_NL/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = intracommunautaire rapportage
+Module68000Desc = Intracomm rapportbeheer (ondersteuning voor Franse DEB / DES-indeling)
+IntracommReportSetup = Instelling module voor intracommunautair rapport
+IntracommReportAbout = Over intracommunautair rapport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Goedkeuringsnummer (afgegeven door de CISD van bijlage)
+INTRACOMMREPORT_TYPE_ACTEUR=Type acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rol gespeeld door acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Verplichtingsniveau bij introducties
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau van verplichting op zendingen
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Servicecategorie verzendkosten
+
+INTRACOMMREPORT_NUM_DECLARATION=Aangiftenummer
+
+# Menu
+MenuIntracommReport=intracommunautaire rapportage
+MenuIntracommReportNew=Nieuwe aangifte
+MenuIntracommReportList=Lijstoverzicht
+
+# View
+NewDeclaration=Nieuwe aangifte
+Declaration=Aangifte
+AnalysisPeriod=Analyseperiode
+TypeOfDeclaration=Type aangifte
+DEB=Aangifte goederenuitwisseling (DEB)
+DES=Uitwisseling van diensten (DES)
+
+# Export page
+IntracommReportTitle=Voorbereiding van een XML-bestand in ProDouane formaat
+
+# List
+IntracommReportList=Lijst met gegenereerde aangiften
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type aangifte
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport methode
diff --git a/htdocs/langs/nl_NL/languages.lang b/htdocs/langs/nl_NL/languages.lang
index 186ee537182..e6b9fa70658 100644
--- a/htdocs/langs/nl_NL/languages.lang
+++ b/htdocs/langs/nl_NL/languages.lang
@@ -6,7 +6,7 @@ Language_ar_SA=Arabisch
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengaals
 Language_bn_IN=Bengali (India)
-Language_bg_BG=Bulgaarse
+Language_bg_BG=Bulgaars
 Language_bs_BA=Bosnisch
 Language_ca_ES=Catalaans
 Language_cs_CZ=Tsjechisch
@@ -23,7 +23,7 @@ Language_en_GB=Engels (Groot Brittannië)
 Language_en_IN=Engels (India)
 Language_en_NZ=Engels (Nieuw Zeeland)
 Language_en_SA=Engels (Saoedi-Arabië)
-Language_en_SG=English (Singapore)
+Language_en_SG=Engels (Singapore)
 Language_en_US=Engels (Verenigde Staten)
 Language_en_ZA=Engels (Zuid-Afrika)
 Language_es_ES=Spaans
@@ -33,15 +33,16 @@ Language_es_CL=Spaans (Chili)
 Language_es_CO=Spaans (Colombia)
 Language_es_DO=Spaans (Dominicaanse Republiek)
 Language_es_EC=Spaans (Ecuador)
-Language_es_GT=Spanish (Guatemala)
+Language_es_GT=Spaans (Guatemala)
 Language_es_HN=Spaans (Honduras)
 Language_es_MX=Spaans (Mexico)
 Language_es_PA=Spaans (Panama)
 Language_es_PY=Spaans (Paraguay)
 Language_es_PE=Spaans (Peru)
 Language_es_PR=Spaans (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spaans (Uruguay)
-Language_es_GT=Spanish (Guatemala)
+Language_es_GT=Spaans (Guatemala)
 Language_es_VE=Spaans (Venezuela)
 Language_et_EE=Estlands
 Language_eu_ES=Bask
@@ -50,12 +51,12 @@ Language_fi_FI=Voltooi
 Language_fr_BE=Frans (België)
 Language_fr_CA=Frans (Canada)
 Language_fr_CH=Frans (Zwitserland)
-Language_fr_CI=French (Cost Ivory)
-Language_fr_CM=French (Cameroun)
+Language_fr_CI=Frans (Ivoorkust)
+Language_fr_CM=Frans (Kameroen)
 Language_fr_FR=Frans (Frankrijk)
 Language_fr_GA=French (Gabon)
 Language_fr_NC=Frans (Nieuw-Caledonië)
-Language_fr_SN=French (Senegal)
+Language_fr_SN=Frans (Senegal)
 Language_fy_NL=Frisian
 Language_gl_ES=Galician
 Language_he_IL=Hebreeuws
@@ -65,7 +66,7 @@ Language_hu_HU=Hongaars
 Language_id_ID=Indonesisch
 Language_is_IS=IJslands
 Language_it_IT=Italiaans
-Language_it_CH=Italian (Switzerland)
+Language_it_CH=Italiaans (Zwitserland)
 Language_ja_JP=Japans
 Language_ka_GE=Georgisch
 Language_km_KH=Khmer
@@ -100,5 +101,5 @@ Language_uz_UZ=Oezbeeks
 Language_vi_VN=Vietnamees
 Language_zh_CN=Chinees
 Language_zh_TW=Chinees (traditioneel)
-Language_zh_HK=Chinese (Hong Kong)
+Language_zh_HK=Chinees (Hong Kong)
 Language_bh_MY=Maleis-
diff --git a/htdocs/langs/nl_NL/mails.lang b/htdocs/langs/nl_NL/mails.lang
index f5438b0a507..0d1eca7a0ff 100644
--- a/htdocs/langs/nl_NL/mails.lang
+++ b/htdocs/langs/nl_NL/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
-Mailing=EMailing
-EMailing=EMailing
-EMailings=EMailings
-AllEMailings=Alle EMailings
-MailCard=EMailingskaart
+Mailing=E-Mailing
+EMailing=E-Mailing
+EMailings=E-Mailings
+AllEMailings=Alle E-Mailings
+MailCard=E-Mailings kaart
 MailRecipients=Ontvangers
 MailRecipient=Ontvanger
 MailTitle=Titel
@@ -12,78 +12,78 @@ MailErrorsTo=Fouten naar
 MailReply=Antwoorden naar
 MailTo=Ontvanger(s)
 MailToUsers=Aan gebruiker(s)
-MailCC=Kopiëren naar
+MailCC=Kopieën aan (cc)
 MailToCCUsers=Kopiëren naar gebruiker(s)
-MailCCC=Gecachde kopie aan
-MailTopic=Email onderwerp
+MailCCC=Blinde kopie aan (bcc)
+MailTopic=E-mail onderwerp
 MailText=Bericht
 MailFile=Bijgevoegde bestanden
-MailMessage=E-mailinhoud
+MailMessage=E-mail inhoud
 SubjectNotIn=Niet in onderwerp
 BodyNotIn=Niet in berichtvenster
-ShowEMailing=Toon EMailing
-ListOfEMailings=EMailingenlijst
-NewMailing=Nieuwe EMailing
-EditMailing=Bewerk EMailing
-ResetMailing=EMailing opnieuw verzenden
-DeleteMailing=Verwijder EMailing
-DeleteAMailing=Verwijder een EMailing
-PreviewMailing=Voorbeeldweergave EMailing
-CreateMailing=Creëer EMailing
+ShowEMailing=Toon E-Mailing
+ListOfEMailings=E-Mailingenlijst
+NewMailing=Nieuwe E-Mailing
+EditMailing=Bewerk E-Mailing
+ResetMailing=E-Mailing opnieuw verzenden
+DeleteMailing=Verwijder E-Mailing
+DeleteAMailing=Verwijder een E-Mailing
+PreviewMailing=Voorbeeldweergave E-Mailing
+CreateMailing=Creëer E-Mailing
 TestMailing=Test e-mail
-ValidMailing=Geldige EMailing
+ValidMailing=Geldige E-Mailing
 MailingStatusDraft=Concept
 MailingStatusValidated=Gevalideerd
 MailingStatusSent=Verzonden
-MailingStatusSentPartialy=Verzonden gedeeltelijk
+MailingStatusSentPartialy=Gedeeltelijk verzonden 
 MailingStatusSentCompletely=Volledig verzonden
 MailingStatusError=Fout
 MailingStatusNotSent=Niet verzonden
 MailSuccessfulySent=E-mail berichten (%s tot %s) zijn geaccepteerd voor verzending
-MailingSuccessfullyValidated=Emailing succesvol gevalideerd
+MailingSuccessfullyValidated=E-mailing succesvol gevalideerd
 MailUnsubcribe=Uitschrijven
-MailingStatusNotContact=Niet meer contacten
+MailingStatusNotContact=Niet meer contacteren
 MailingStatusReadAndUnsubscribe=Lezen en afmelden
 ErrorMailRecipientIsEmpty=E-mailadres ontvanger is leeg
-WarningNoEMailsAdded=Geen nieuw E-mailadres aan de lijst van ontvangers toe te voegen.
+WarningNoEMailsAdded=Geen nieuw e-mailadres om aan de lijst van ontvangers toe te voegen.
 ConfirmValidMailing=Weet u zeker dat u deze e-mail wilt valideren?
-ConfirmResetMailing=Waarschuwing, door e-mail opnieuw te initialiseren <b>%s</b> , staat u toe dat deze e-mail opnieuw wordt verzonden in een bulkmail. Weet je zeker dat je dit wilt doen?
+ConfirmResetMailing=Waarschuwing, door e-mail opnieuw te initialiseren <b>%s</b> , staat u toe dat deze e-mail opnieuw wordt verzonden in een bulk e-mail. Weet je zeker dat je dit wilt doen?
 ConfirmDeleteMailing=Weet je zeker dat je deze e-mail wilt verwijderen?
 NbOfUniqueEMails=Aantal unieke e-mails
-NbOfEMails=Aantal emails
+NbOfEMails=Aantal e-mails
 TotalNbOfDistinctRecipients=Aantal afzonderlijke ontvangers
 NoTargetYet=Nog geen ontvangers gedefinieerd (Ga naar het tabblad "Ontvangers")
 NoRecipientEmail=Geen e-mailadres van de ontvanger voor %s
 RemoveRecipient=Ontvangers verwijderen
-YouCanAddYourOwnPredefindedListHere=Om uw e-mailselectormodule te creëren, zie htdocs/core/modules/mailings/README.
+YouCanAddYourOwnPredefindedListHere=Om uw e-mail selectie module te creëren, zie htdocs/core/modules/mailings/README.
 EMailTestSubstitutionReplacedByGenericValues=Bij het gebruik van de testmodus, worden de vervangingsvariabelen door algemene waarden vervangen
 MailingAddFile=Voeg dit bestand bij
 NoAttachedFiles=Geen bijgevoegde bestanden
 BadEMail=Onjuiste waarde voor e-mail
-ConfirmCloneEMailing=Weet u zeker dat u deze mailing wilt klonen?
+ConfirmCloneEMailing=Weet u zeker dat u deze e-mailing wilt klonen?
 CloneContent=Kloon bericht
 CloneReceivers=Kloon ontvangers
-DateLastSend=Laatste verzendatum
+DateLastSend=Laatste verzenddatum
 DateSending=Datum verzonden
 SentTo=Verzonden aan <b>%s</b>
 MailingStatusRead=Lezen
-YourMailUnsubcribeOK=De e-mail <b>%s</b> is correct afgemeld voor de mailinglijst
+YourMailUnsubcribeOK=De e-mail <b>%s</b> is correct afgemeld van de mailinglijst
 ActivateCheckReadKey=Sleutel die wordt gebruikt om de URL te coderen die wordt gebruikt voor de functie "Leesbevestiging" en "Abonnement opzeggen"
 EMailSentToNRecipients=E-mail verzonden naar ontvangers van %s.
 EMailSentForNElements=E-mail verzonden voor %s-elementen.
-XTargetsAdded=<b>%s</b> ontvangers toegevoegd in bestemming-lijst
+XTargetsAdded=<b>%s</b> ontvangers toegevoegd in lijst van bestemming
 OnlyPDFattachmentSupported=Als de PDF-documenten al zijn gegenereerd voor de te verzenden objecten, worden deze aan e-mail toegevoegd. Als dit niet het geval is, wordt er geen e-mail verzonden (houd er ook rekening mee dat alleen pdf-documenten worden ondersteund als bijlagen bij massa-verzending in deze versie).
 AllRecipientSelected=Alls %s ontvangers zijn geselecteerd (indien hun e-mailadres bekend is).
 GroupEmails=Groepeer e-mails
 OneEmailPerRecipient=Één e-mail per ontvanger (standaard: één e-mail per geselecteerde record)
-WarningIfYouCheckOneRecipientPerEmail=Pas op, indien u deze optie selecteerd, zal er maar één e-mail verstuurd worden voor verschillende geselecteerde records, dus, indien u bericht variablelen bevat welke betrekking hebben op data, is het niet mogelijk deze te vervangen.
+WarningIfYouCheckOneRecipientPerEmail=Pas op, indien u deze optie selecteert, zal er maar één e-mail verstuurd worden voor verschillende geselecteerde records, dus, indien u bericht variabelen bevat welke betrekking hebben op data, is het niet mogelijk deze te vervangen.
 ResultOfMailSending=Resultaat van massa E-mailverzending
 NbSelected=Nummer geselecteerd
 NbIgnored=Nummer genegeerd
 NbSent=Nummer verzonden
 SentXXXmessages=%s bericht (en) verzonden.
 ConfirmUnvalidateEmailing=Weet u zeker dat u de status van deze e-mail <b>%s</b> wilt wijzigen naar klad?
-MailingModuleDescContactsWithThirdpartyFilter=Contact met filters
+MailingModuleDescContactsWithThirdpartyFilter=Contact met klant filters
 MailingModuleDescContactsByCompanyCategory=Contacten per categorie van derden
 MailingModuleDescContactsByCategory=Contacten per categorie
 MailingModuleDescContactsByFunction=Contacten per positie
@@ -91,48 +91,49 @@ MailingModuleDescEmailsFromFile=E-mails uit bestand
 MailingModuleDescEmailsFromUser=E-mails door gebruiker opgemaakt
 MailingModuleDescDolibarrUsers=Gebruikers met e-mails
 MailingModuleDescThirdPartiesByCategories=Derden (op categorieën)
-SendingFromWebInterfaceIsNotAllowed=Verzenden vanuit de webinterface is niet toegestaan.
+SendingFromWebInterfaceIsNotAllowed=Verzenden vanuit de web interface is niet toegestaan.
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Regel %s in bestand
 RecipientSelectionModules=Gedefinieerde verzoeken om ontvangers te selecteren
 MailSelectedRecipients=Geselecteerde ontvangers
-MailingArea=EMailingsoverzicht
+MailingArea=E-Mailings overzicht
 LastMailings=Laatste %s e-mails
-TargetsStatistics=Geaddresseerdenstatistieken
+TargetsStatistics=Geaddresseerden statistieken
 NbOfCompaniesContacts=Unieke contacten van bedrijven
-MailNoChangePossible=Ontvangers voor gevalideerde EMailings kunnen niet worden gewijzigd
-SearchAMailing=Zoek een EMailing
-SendMailing=Verzend EMailing
+MailNoChangePossible=Ontvangers voor gevalideerde E-Mailings kunnen niet worden gewijzigd
+SearchAMailing=Zoek een E-Mailing
+SendMailing=Verzend E-Mailing
 SentBy=Verzonden door
-MailingNeedCommand=Het versturen van een mailing kan ook per command line. Vraag uw systeembeheerder het volgende commando te geven om de mailing te verzenden aan alle ontvangers:
+MailingNeedCommand=Het versturen van een mailing kan ook vanaf de command line. Vraag uw systeembeheerder het volgende commando te geven om de mailing te verzenden aan alle ontvangers:
 MailingNeedCommand2=U kunt ze echter online verzenden door toevoeging van de parameter MAILING_LIMIT_SENDBYWEB met een waarde van het maximaal aantal e-mails dat u wilt verzenden per sessie.
 ConfirmSendingEmailing=Als u rechtstreeks vanuit dit scherm e-mail wilt verzenden, bevestigt u dat u zeker weet dat u nu e-mail wilt verzenden vanuit uw browser?
-LimitSendingEmailing=Opmerking: het verzenden van e- <b>mailings</b> vanuit de webinterface gebeurt meerdere keren om veiligheids- en time- <b>outredenen</b> , <b>%s</b> ontvangers per keer voor elke <b>verzendsessie</b> .
-TargetsReset=Lijst legen
-ToClearAllRecipientsClickHere=Klik hier om de lijst met ontvangers van deze EMailing te legen
+LimitSendingEmailing=Opmerking: het verzenden van e- <b>mailings</b> vanuit de web interface gebeurt meerdere keren om veiligheids- en time- <b>outredenen</b> , <b>%s</b> ontvangers per keer voor elke <b>verzendsessie</b> .
+TargetsReset=Lijst leegmaken
+ToClearAllRecipientsClickHere=Klik hier om de lijst met ontvangers van deze E-Mailing te legen
 ToAddRecipientsChooseHere=Voeg geadresseerden toe door deze uit de lijst te kiezen
-NbOfEMailingsReceived=Bulk Emailings ontvangen
-NbOfEMailingsSend=Mailings verstuurd
+NbOfEMailingsReceived=Bulk E-mailings ontvangen
+NbOfEMailingsSend=Massa E-mailings verstuurd
 IdRecord=ID-tabelregel
 DeliveryReceipt=Ontvangstbevestiging
 YouCanUseCommaSeparatorForSeveralRecipients=U kunt het <b>komma</b> scheidingsteken gebruiken om meerdere ontvangers te specificeren.
 TagCheckMail=Volg geopende mail
 TagUnsubscribe=Uitschrijf link
-TagSignature=Ondertekening verzendende gebruiker
+TagSignature=Ondertekening versturende gebruiker
 EMailRecipient=Ontvanger e-mail
-TagMailtoEmail=E-mailadres ontvanger (inclusief html &quot;mailto:&quot; link)
+TagMailtoEmail=E-mailadres ontvanger (inclusief html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=Geen e-mail verzonden. Ongeldige afzender of ontvanger e-mail. Controleer gebruikersprofiel.
 # Module Notifications
 Notifications=Kennisgevingen
-NoNotificationsWillBeSent=Er staan geen e-mailkennisgevingen gepland voor dit evenement en bedrijf
-ANotificationsWillBeSent=1 kennisgeving zal per e-mail worden verzonden
-SomeNotificationsWillBeSent=%s kennisgevingen zullen  per e-mail worden verzonden
+NotificationsAuto=Automatisch meldingen
+NoNotificationsWillBeSent=Er staan geen e-mail kennisgevingen gepland voor dit type evenement en bedrijf
+ANotificationsWillBeSent=1 automatische notificatie zal worden verstuurd per e-mail
+SomeNotificationsWillBeSent=%s automatische notificatie zal per e-mail worden verstuurd
 AddNewNotification=Activeer een nieuw doel / evenement voor e-mailmeldingen
-ListOfActiveNotifications=Lijst met alle actieve doelen / evenementen voor e-mailmelding
-ListOfNotificationsDone=Toon een lijst van alle verzonden kennisgevingen
-MailSendSetupIs=Configuratie van e-mailverzending is ingesteld op '%s'. Deze modus kan niet worden gebruikt om massale e-mail te verzenden.
-MailSendSetupIs2=Ga eerst met een beheerdersaccount naar menu %s Home - Setup - EMails%s om de parameter <strong>'%s'</strong> te wijzigen om de modus '%s' te gebruiken. Met deze modus kunt u de installatie van de SMTP-server van uw internetprovider openen en de functie Massa-e-mailen gebruiken.
+ListOfActiveNotifications=Lijst met alle actieve doelen / evenementen voor e-mail melding
+ListOfNotificationsDone=Lijst met alle automatisch verstuurde e-mail kennisgevingen
+MailSendSetupIs=Configuratie van e-mailverzending is ingesteld op '%s'. Deze modus kan niet worden gebruikt om bulk e-mails te verzenden.
+MailSendSetupIs2=Ga eerst met een beheerdersaccount naar menu %s Home - Set-up - E-mails%s om de parameter <strong>'%s'</strong> te wijzigen om de modus '%s' te gebruiken. Met deze modus kunt u de installatie van de SMTP-server van uw internetprovider openen en de functie Bulk e-mails gebruiken.
 MailSendSetupIs3=Indien u vragen heeft inzake de SMTP server, went u zich dan tot %s.
 YouCanAlsoUseSupervisorKeyword=U kunt ook het trefwoord <strong>__SUPERVISOREMAIL__ toevoegen</strong> om e-mail te verzenden naar de supervisor van de gebruiker (werkt alleen als er een e-mail is gedefinieerd voor deze supervisor)
 NbOfTargetedContacts=Aantal geselecteerde contact e-mailadressen
@@ -158,17 +159,18 @@ AdvTgtAddContact=Voeg e-mails toe volgens criteria
 AdvTgtLoadFilter=Inlezen filter
 AdvTgtDeleteFilter=Verwijder filter
 AdvTgtSaveFilter=Bewaar filter
-AdvTgtCreateFilter=Filter
+AdvTgtCreateFilter=Creëer filter
 AdvTgtOrCreateNewFilter=Naam nieuwe filter
 NoContactWithCategoryFound=Geen contact / adres met een categorie gevonden
 NoContactLinkedToThirdpartieWithCategoryFound=Geen contact / adres met een categorie gevonden
-OutGoingEmailSetup=Instellingen uitgaande e-mail
-InGoingEmailSetup=Instellingen inkomende e-mail
+OutGoingEmailSetup=Uitgaande e-mail
+InGoingEmailSetup=Inkomende e-mail
 OutGoingEmailSetupForEmailing=Uitgaande e-mailinstellingen (voor module %s)
-DefaultOutgoingEmailSetup=Standaard uitgaande e-mail instellen
+DefaultOutgoingEmailSetup=Standaard uitgaande e-mail instellingen
 Information=Informatie
 ContactsWithThirdpartyFilter=Contacten met filter van derden
-Unanswered=Unanswered
+Unanswered=Onbeantwoord
 Answered=Beantwoord
-IsNotAnAnswer=Is not answer (initial email)
-IsAnAnswer=Is an answer of an initial email
+IsNotAnAnswer=Is geen antwoord (initiële e-mail)
+IsAnAnswer=Is een antwoord van een initiële e-mail
+RecordCreatedByEmailCollector=Record aangemaakt door de E-mail Collector %s van e-mail %s
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index 3356b74ed78..34b50571fb7 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Verwijder link
 AddToDraft=Toevoegen aan concept
 Update=Update
 Close=Sluiten
+CloseAs=Wijzig status in
 CloseBox=Verwijder widget van uw dashboard
 Confirm=Bevestig
 ConfirmSendCardByMail=Wil je de inhoud van deze kaart echt per e-mail naar <b>%s sturen</b> ?
@@ -196,6 +197,7 @@ ReOpen=Heropenen
 Upload=Uploaden
 ToLink=Link
 Select=Selecteer
+SelectAll=Select all
 Choose=Kies
 Resize=Schalen
 ResizeOrCrop=Formaat wijzigen of bijsnijden
@@ -256,6 +258,7 @@ Cards=Kaarten
 Card=Kaart
 Now=Nu
 HourStart=Start uur
+Deadline=Deadline
 Date=Datum
 DateAndHour=Datum en uur
 DateToday=Huidige datum
@@ -264,8 +267,10 @@ DateStart=Begindatum
 DateEnd=Einddatum
 DateCreation=Aanmaakdatum
 DateCreationShort=Aanmaakdatum
+IPCreation=Creation IP
 DateModification=Wijzigingsdatum
 DateModificationShort=Wijzigingsdatum
+IPModification=Modification IP
 DateLastModification=Laatste wijzigingsdatum
 DateValidation=Validatiedatum
 DateClosing=Sluitingsdatum
@@ -319,6 +324,7 @@ Morning=Ochtend
 Afternoon=Namiddag
 Quadri=Trimester
 MonthOfDay=Maand van de dag
+DaysOfWeek=Days of week
 HourShort=U
 MinuteShort=mn
 Rate=Tarief
@@ -360,15 +366,16 @@ AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Betalingsbedrag
 AmountHTShort=Bedrag (excl.)
 AmountTTCShort=Bedrag met BTW
-AmountHT=Bedrag (excl. Belasting)
+AmountHT=Bedrag (excl. BTW)
 AmountTTC=Bedrag (incl. BTW)
 AmountVAT=Bedrag BTW
 MulticurrencyAlreadyPaid=Reeds betaald, originele valuta
 MulticurrencyRemainderToPay=Rest openstaand, originele valuta
 MulticurrencyPaymentAmount=Betalingsbedrag, originele valuta
-MulticurrencyAmountHT=Bedrag (excl. Belasting), oorspronkelijke valuta
+MulticurrencyAmountHT=Bedrag (excl. BTW), oorspronkelijke valuta
 MulticurrencyAmountTTC=Bedrag (incl. BTW), oorspronkelijke valuta
 MulticurrencyAmountVAT=BTW bedrag, oorspronkelijke valuta
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Bedrag tax 2
 AmountLT2=Bedrag tax 3
 AmountLT1ES=Bedrag RE
@@ -487,6 +494,7 @@ By=Door
 From=Van
 FromDate=Van
 FromLocation=Van
+at=at
 to=t/m
 To=t/m
 and=en
@@ -509,6 +517,7 @@ Draft=Concept
 Drafts=Concepten
 StatusInterInvoiced=gefactureerd
 Validated=Gevalideerd
+ValidatedToProduce=Validated (To produce)
 Opened=Open
 OpenAll=Open (alles)
 ClosedAll=Gesloten (alles)
@@ -619,7 +628,7 @@ FindBug=Rapporteer een bug
 NbOfThirdParties=Aantal derden
 NbOfLines=Aantal regels
 NbOfObjects=Aantal objecten
-NbOfObjectReferers=Aantal gerelateerde items
+NbOfObjectReferers=Aantal gerelateerde orders
 Referers=Gerelateerde items
 TotalQuantity=Totale hoeveelheid
 DateFromTo=Van %s naar %s
@@ -655,6 +664,7 @@ Response=Antwoord
 Priority=Prioriteit
 SendByMail=Verzenden per e-mail
 MailSentBy=E-mail verzonden door
+NotSent=Niet verzonden
 TextUsedInTheMessageBody=E-mailinhoud
 SendAcknowledgementByMail=Stuur e-mail ter bevestiging
 SendMail=Verzend e-mail
@@ -829,13 +839,14 @@ ShowTransaction=Toon bankmutatie
 ShowIntervention=Tonen tussenkomst
 ShowContract=Toon contract
 GoIntoSetupToChangeLogo=Ga naar Home - Setup - Bedrijf om het logo te wijzigen of ga naar Home - Setup - Weergeven om te verbergen.
-Deny=Wijgeren
+Deny=Weigeren
 Denied=Gewijgerd
 ListOf=Lijst van %s
 ListOfTemplates=Lijst van templates
 Gender=Geslacht
 Genderman=Man
 Genderwoman=Vrouw
+Genderother=Overig
 ViewList=Bekijk lijst
 ViewGantt=Gantt-weergave
 ViewKanban=Kanban-weergave
@@ -877,6 +888,8 @@ Miscellaneous=Diversen
 Calendar=Kalender
 GroupBy=Groeperen op ...
 ViewFlatList=Weergeven als lijst
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString='%s' string verwijderen
 SomeTranslationAreUncomplete=Sommige aangeboden talen zijn mogelijk slechts gedeeltelijk vertaald of kunnen fouten bevatten. Help ons om uw taal te corrigeren door u te registreren op <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> om uw verbeteringen toe te voegen.
 DirectDownloadLink=Directe download link (openbaar/extern)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Klantzendingen
 SearchIntoExpenseReports=Onkostennota's 
 SearchIntoLeaves=Vertrekken
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Leveranciersbetalingen
+SearchIntoMiscPayments=Diverse betalingen
 CommentLink=Opmerkingen
 NbComments=Aantal reacties
 CommentPage=Reacties ruimte
@@ -1078,8 +1094,16 @@ ByStatus=Op status
 InformationMessage=Informatie
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Geboortedatum
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/nl_NL/members.lang b/htdocs/langs/nl_NL/members.lang
index c0a91e8b1ca..405b9331dba 100644
--- a/htdocs/langs/nl_NL/members.lang
+++ b/htdocs/langs/nl_NL/members.lang
@@ -19,14 +19,12 @@ MembersCards=Visitekaarten van leden
 MembersList=Ledenlijst
 MembersListToValid=Lijst van conceptleden (te valideren)
 MembersListValid=Lijst van geldige leden
-MembersListUpToDate=Lijst van geldige leden met een geldig lidmaatschap
-MembersListNotUpToDate=Lijst van geldige leden met een verlopen lidmaatschap
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=Lijst verwijderde leden
 MembersListQualified=Lijst van gekwalificeerde leden
 MenuMembersToValidate=Conceptleden
 MenuMembersValidated=Gevalideerde leden
-MenuMembersUpToDate=Bijgewerkte leden
-MenuMembersNotUpToDate=Niet bijgewerkte leden
 MenuMembersResiliated=Verwijderde leden
 MembersWithSubscriptionToReceive=Leden die abonnement moeten ontvangen
 MembersWithSubscriptionToReceiveShort=Abonnement ontvangen
@@ -34,6 +32,7 @@ DateSubscription=Inschrijvingsdatum
 DateEndSubscription=Einddatum abonnement
 EndSubscription=Einde abonnement
 SubscriptionId=Inschrijvings-ID
+WithoutSubscription=Without subscription
 MemberId=Lid ID
 NewMember=Nieuw lid
 MemberType=Type lid
@@ -81,7 +80,7 @@ DeleteType=Verwijderen
 VoteAllowed=Stemming toegestaan
 Physical=Fysiek
 Moral=Moreel
-MorPhy=Natuur
+MorAndPhy=Moral and Physical
 Reenable=Opnieuw inschakelen
 ResiliateMember=Verwijder een lid
 ConfirmResiliateMember=Weet je zeker dat je dit lidmaatschap wilt beëindigen?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=E-mail verzenden bij validatie van nieuwe leden
 SendingEmailOnNewSubscription=E-mail verzenden bij nieuw abonnement
 SendingReminderForExpiredSubscription=Herinnering verzenden voor verlopen abonnementen
 SendingEmailOnCancelation=Verzenden van e-mail bij annulering
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Je lidmaatschap is ontvangen.
 YourMembershipWasValidated=Uw lidmaatschap is gevalideerd
@@ -167,6 +167,7 @@ MembersStatisticsByState=Leden statistieken per staat / provincie
 MembersStatisticsByTown=Leden van de statistieken per gemeente
 MembersStatisticsByRegion=Leden statistieken per regio
 NbOfMembers=Aantal leden
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=Geen gevalideerde leden gevonden
 MembersByCountryDesc=Dit scherm tonen statistieken over de leden door de landen. Grafisch is echter afhankelijk van Google online grafiek service en is alleen beschikbaar als een internet verbinding is werkt.
 MembersByStateDesc=Dit scherm tonen statistieken over de leden door de staat / provincies / kanton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistiek
 LastMemberDate=Laatste liddatum
 LatestSubscriptionDate=Laatste abonnementsdatum
 MemberNature=Aard van het lid
+MembersNature=Nature of members
 Public=Informatie zijn openbaar (no = prive)
 NewMemberbyWeb=Nieuw lid toegevoegd. In afwachting van goedkeuring
 NewMemberForm=Nieuw lid formulier
diff --git a/htdocs/langs/nl_NL/mrp.lang b/htdocs/langs/nl_NL/mrp.lang
index eaaa9d827a5..d6ad354427d 100644
--- a/htdocs/langs/nl_NL/mrp.lang
+++ b/htdocs/langs/nl_NL/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Productieorders
-MO=Productieorder
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module om productie- en productieorders (PO) te beheren.
 MRPArea=MRP-gebied
 MrpSetupPage=Installatie van module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Te produceren producten
 UnitCost=De kosten per eenheid
 TotalCost=Totale prijs
 BOMTotalCost=De kosten voor het produceren van deze stuklijst op basis van de kosten van elke hoeveelheid en elk te consumeren product (gebruik kostprijs indien gedefinieerd, anders gemiddelde gewogen prijs indien gedefinieerd, anders de beste aankoopprijs)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index 9b29ea2e06a..27d14439fea 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -51,7 +51,7 @@ CardProduct1=Dienst
 Stock=Voorraad
 MenuStocks=Voorraden
 Stocks=Plaats en locatie (magazijn) van producten
-Movements=Verplaatsingen
+Movements=Mutaties
 Sell=Verkopen
 Buy=Inkoop
 OnSell=Voor verkoop
@@ -93,7 +93,7 @@ ShowService=Toon dienst
 ProductsAndServicesArea=Producten- en dienstenoverzicht
 ProductsArea=Productoverzicht
 ServicesArea=Dienstenoverzicht
-ListOfStockMovements=Lijst voorraad-verplaatsingen
+ListOfStockMovements=Mutatielijst voorraad
 BuyingPrice=Inkoopprijs
 PriceForEachProduct=Producten met specifieke prijzen
 SupplierCard=Leverancierskaart
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Meerdere prijssegmenten per product / dienst (elke klant bevindt zich in één prijssegment)
 MultiPricesNumPrices=Aantal prijzen
 DefaultPriceType=Basisprijzen per standaard (met versus zonder belasting) bij het toevoegen van nieuwe verkoopprijzen
-AssociatedProductsAbility=Activeer virtuele producten (combinaties)
-AssociatedProducts=Virtuele producten
-AssociatedProductsNumber=Aantal producten waaruit dit product bestaat
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Aantal ouder pakket producten
 ParentProducts=Gerelateerde producten
-IfZeroItIsNotAVirtualProduct=Bij 0 is dit geen virtueel product
-IfZeroItIsNotUsedByVirtualProduct=Bij 0 is dit product niet in gebruik voor een virtueel product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Trefwoord filter
 CategoryFilter=Categorie filter
 ProductToAddSearch=Zoek product om toe te voegen
 NoMatchFound=Geen resultaten gevonden
 ListOfProductsServices=Producten/diensten lijst
-ProductAssociationList=Lijst met producten / diensten die component (en) van dit virtuele product / deze kit zijn
-ProductParentList=Lijst van producten / diensten met dit product als een onderdeel
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=Een van de geselecteerde product is de ouder van het huidige product
 DeleteProduct=Verwijderen een product / dienst
 ConfirmDeleteProduct=Weet u zeker dat u dit product / deze dienst wilt verwijderen?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Beschikbare globale waarden:
 PriceMode=Prijs-modus
 PriceNumeric=Nummer
 DefaultPrice=Standaard prijs
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Verhogen/verlagen voorraad bij de ouder verandering
 ComposedProduct=Producten voor kinderen
 MinSupplierPrice=Minimum aankoopprijs
@@ -339,6 +340,7 @@ UseProductFournDesc=Voeg een functie toe om de beschrijvingen van producten te d
 ProductSupplierDescription=Leveranciersbeschrijving voor het product
 UseProductSupplierPackaging=Gebruik verpakkingen op leveranciersprijzen (herbereken hoeveelheden volgens verpakking ingesteld op leveranciersprijs bij toevoegen / bijwerken van regel in leveranciersdocumenten)
 PackagingForThisProduct=Verpakking
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=De hoeveelheid van de lijn werd herberekend volgens de verpakking van de leverancier
 
 #Attributes
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index 42a2ddefac7..d7c0b9b1ba6 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -76,12 +76,12 @@ MyActivities=Mijn taken / activiteiten
 MyProjects=Mijn projecten
 MyProjectsArea=Mijn projecten omgeving
 DurationEffective=Effectieve duur
-ProgressDeclared=Ingegeven voorgang
+ProgressDeclared=Aangekondigd echte vooruitgang
 TaskProgressSummary=Taakvoortgang
 CurentlyOpenedTasks=Momenteel openstaande taken
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=De aangegeven voortgang is minder %s dan de berekende voortgang
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=De aangegeven voortgang is meer %s dan de berekende voortgang
-ProgressCalculated=Berekende voorgang
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=waaraan ik gekoppeld ben
 WhichIamLinkedToProject=die ik ben gekoppeld aan het project
 Time=Tijd
@@ -111,7 +111,7 @@ ActivityOnProjectThisWeek=Projectactiviteit in deze week
 ActivityOnProjectThisMonth=Projectactiviteit in deze maand
 ActivityOnProjectThisYear=Projectactiviteit in dit jaar
 ChildOfProjectTask=Sub- van het project / taak
-ChildOfTask=Kind van taak
+ChildOfTask=Soort taak
 TaskHasChild=Taak heeft kind
 NotOwnerOfProject=Geen eigenaar van dit privé-project
 AffectedTo=Toegewezen aan
diff --git a/htdocs/langs/nl_NL/propal.lang b/htdocs/langs/nl_NL/propal.lang
index 0cbd0a0724a..c2efc292ccf 100644
--- a/htdocs/langs/nl_NL/propal.lang
+++ b/htdocs/langs/nl_NL/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Stuur offerte per e-mail
 DatePropal=Offertedatum
 DateEndPropal=Vervaldatum
 ValidityDuration=Geldigheidsduur
-CloseAs=Wijzig status in
 SetAcceptedRefused=Markeer geaccepteerd/geweigerd
 ErrorPropalNotFound=Offerte %s niet gevonden
 AddToDraftProposals=Toevoegen aan ontwerp offerte
@@ -57,7 +56,7 @@ CreateEmptyPropal=Maak een leeg commercieel voorstel of uit een lijst met produc
 DefaultProposalDurationValidity=Standaardgeldigheid offerte (in dagen)
 UseCustomerContactAsPropalRecipientIfExist=Gebruik contact / adres met het type 'Contact follow-up voorstel' indien gedefinieerd in plaats van het adres van een derde als adres ontvanger van het voorstel
 ConfirmClonePropal=Weet u zeker dat u offerte <b>%s</b>  wilt kopiëren?
-ConfirmReOpenProp=Weet u zeker dat u offerte <b>%s</b> wilt her-openen?
+ConfirmReOpenProp=Weet u zeker dat u offerte <b>%s</b> opnieuw wilt openen?
 ProposalsAndProposalsLines=Offertes en offerteregels
 ProposalLine=Offerteregel
 AvailabilityPeriod=Leveringstermijn
@@ -85,3 +84,8 @@ ProposalCustomerSignature=Schriftelijke aanvaarding , stempel , datum en handtek
 ProposalsStatisticsSuppliers=Leveranciersoffertes statistieken 
 CaseFollowedBy=Geval gevolgd door
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/nl_NL/recruitment.lang b/htdocs/langs/nl_NL/recruitment.lang
index f1678cf9f58..dbf7e374eba 100644
--- a/htdocs/langs/nl_NL/recruitment.lang
+++ b/htdocs/langs/nl_NL/recruitment.lang
@@ -27,7 +27,7 @@ ModuleRecruitmentDesc = Beheer en volg wervingscampagnes voor nieuwe vacatures
 #
 RecruitmentSetup = Werving instellingen
 Settings = Instellingen
-RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentSetupPage = Stel hier de hoofdopties voor de recruitment module in
 RecruitmentArea=Werving gebied
 PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
 EnablePublicRecruitmentPages=Enable public pages of open jobs
@@ -45,26 +45,31 @@ DateExpected=Verwachte datum
 FutureManager=Toekomstige manager
 ResponsibleOfRecruitement=Verantwoordelijk voor werving
 IfJobIsLocatedAtAPartner=Als baan zich op een partnerlocatie bevindt
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Functie
+PositionsToBeFilled=Vacature
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
-ContractProposed=Contract proposed
-ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
-JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+ContractProposed=Contractvoorstel gedaan
+ContractSigned=Contract getekend
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
+JobPositions=Vacature
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang
index ebb500d6f7b..1a21ab2c3b2 100644
--- a/htdocs/langs/nl_NL/stocks.lang
+++ b/htdocs/langs/nl_NL/stocks.lang
@@ -24,24 +24,24 @@ StockAtDateInFuture=Toekomstige datum
 StocksByLotSerial=Voorraad volgorde op lot/serienummer
 LotSerial=Partij/Serienummer
 LotSerialList=Overzicht van partij/serienummers
-Movements=Verplaatsingen
+Movements=Mutaties
 ErrorWarehouseRefRequired=Magazijnreferentienaam is verplicht
 ListOfWarehouses=Magazijnenlijst
-ListOfStockMovements=Lijst voorraad-verplaatsingen
+ListOfStockMovements=Mutatielijst voorraad
 ListOfInventories=Voorraadlijst
 MovementId=Verplaatsing ID
 StockMovementForId=Verplaatsing ID %d
 ListMouvementStockProject=Lijst met voorraad verplaatsingen die aan het project zijn gekoppeld
 StocksArea=Magazijnen
 AllWarehouses=Alle magazijnen
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Neem ook conceptorders op
 Location=Locatie
 LocationSummary=Korte naam locatie
 NumberOfDifferentProducts=Aantal verschillende producten
 NumberOfProducts=Totaal aantal producten
 LastMovement=Laatste verplaatsing
-LastMovements=Laatste verplaatsingen
+LastMovements=Laatste mutaties
 Units=Eenheden
 Unit=Eenheid
 StockCorrection=Voorraad vorrectie
@@ -49,8 +49,8 @@ CorrectStock=Voorraadcorrectie
 StockTransfer=Voorraadbeweging
 TransferStock=Voorraad verplaatsen
 MassStockTransferShort=Bulk verplaatsen van voorraad
-StockMovement=Voorraad verplaatsen
-StockMovements=Voorraad-verplaatsingen
+StockMovement=Voorraad muteren
+StockMovements=Voorraadmutaties
 NumberOfUnit=Aantal eenheden
 UnitPurchaseValue=Eenheidsprijs
 StockTooLow=Voorraad te laag
@@ -70,7 +70,7 @@ MainDefaultWarehouseUserDesc=By activating this option, during creation of a pro
 IndependantSubProductStock=Product voorraad en subproduct voorraad zijn onafhankelijk
 QtyDispatched=Hoeveelheid verzonden
 QtyDispatchedShort=Aantal verzonden
-QtyToDispatchShort=Aantal te verzenden
+QtyToDispatchShort=Verzenden
 OrderDispatch=Bestellingen
 RuleForStockManagementDecrease=Kies methode voor automatische voorraadafname (handmatige afname is altijd mogelijk, zelfs als een automatische afname-regel is geactiveerd)
 RuleForStockManagementIncrease=Kies methode voor automatische voorraadverhoging (handmatige verhoging is altijd mogelijk, zelfs als een automatische verhogingregel is geactiveerd)
@@ -122,8 +122,9 @@ DesiredStockDesc=Dit voorraadbedrag is de waarde die wordt gebruikt om de voorra
 StockToBuy=Te bestellen
 Replenishment=Bevoorrading
 ReplenishmentOrders=Bevoorradingsorder
-VirtualDiffersFromPhysical=Volgens de voorraad bij- en afinstellingen kunnen fysieke voorraad en virtuele aandelen (fysieke + huidige bestellingen) verschillen
-UseVirtualStockByDefault=Gebruik virtuele voorraad standaard, in plaats van de fysieke voorraad, voor de aanvul functie
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Gebruik virtuele voorraad
 UsePhysicalStock=Gebruik fysieke voorraad
 CurentSelectionMode=Huidige selectiemodus
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=Dit product is reeds aanwezig in de lijst
 SelectCategory=Categorie filter
 SelectFournisseur=Filter leverancier
 inventoryOnDate=Voorraad
-INVENTORY_DISABLE_VIRTUAL=Virtueel product (kit): verklein de voorraad van een sub-product niet
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Gebruik de inkoopprijs als er geen laatste inkoopprijs kan worden gevonden
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Voorraadbewegingen hebben de datum van inventarisatie (in plaats van de datum van inventarisvalidatie)
 inventoryChangePMPPermission=Sta toe om de PMP-waarde voor een product te wijzigen
 ColumnNewPMP=Nieuwe eenheid PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Huidige voorraad
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/nl_NL/suppliers.lang b/htdocs/langs/nl_NL/suppliers.lang
index 041aa6ba0ec..bff19a2422c 100644
--- a/htdocs/langs/nl_NL/suppliers.lang
+++ b/htdocs/langs/nl_NL/suppliers.lang
@@ -26,7 +26,7 @@ ExportDataset_fournisseur_2=Facturen en betalingen van leveranciers
 ExportDataset_fournisseur_3=Aankooporders en bestelgegevens
 ApproveThisOrder=Order goedkeuren
 ConfirmApproveThisOrder=Weet u zeker dat u deze order wilt accepteren <b>%s</b>?
-DenyingThisOrder=Wijger deze bestelling
+DenyingThisOrder=Weiger deze bestelling
 ConfirmDenyingThisOrder=Weet u zeker dat u deze order wilt negeren <b>%s</b>?
 ConfirmCancelThisOrder=Weet u zeker dat u deze order wilt annuleren <b>%s</b>?
 AddSupplierOrder=Maak inkooporder aan
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Te factureren inkooporders
 NbDaysToDelivery=Levertijd (dagen)
 DescNbDaysToDelivery=De langste leveringstermijn van de producten van deze bestelling
 SupplierReputation=Reputatie van de leverancier
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Niet bestellen
 NotTheGoodQualitySupplier=Lage kwaliteit
 ReputationForThisProduct=Reputatie
diff --git a/htdocs/langs/nl_NL/website.lang b/htdocs/langs/nl_NL/website.lang
index 165a5b0ab3f..855e09828b2 100644
--- a/htdocs/langs/nl_NL/website.lang
+++ b/htdocs/langs/nl_NL/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Website toevoegen
 Webpage=Webpagina/container
 AddPage=Voeg pagina/container toe
 HomePage=Startpagina
-PageContainer=Pagina/container
+PageContainer=Pagina
 PreviewOfSiteNotYetAvailable=Voorbeeld van uw website <strong>%s</strong> is nog niet beschikbaar. U moet eerst '<strong>Een volledige websitesjabloon importeren</strong>' of alleen '<strong>Een pagina / container toevoegen</strong>'.
 RequestedPageHasNoContentYet=Gevraagde pagina met id %s heeft nog geen inhoud of cachebestand .tpl.php is verwijderd. Bewerk de inhoud van de pagina om dit op te lossen.
 SiteDeleted=Website '%s' verwijderd
@@ -74,7 +74,7 @@ CreateByFetchingExternalPage=Pagina / container maken door pagina op te halen va
 OrEnterPageInfoManually=Of maak een nieuwe pagina of een paginasjabloon ...
 FetchAndCreate=Ophalen en maken
 ExportSite=Website exporteren
-ImportSite=Websitemalplaatje importeren
+ImportSite=Website template importeren
 IDOfPage=Id van pagina
 Banner=banier
 BlogPost=Blogpost
@@ -118,7 +118,7 @@ ReplaceString=Nieuwe string
 CSSContentTooltipHelp=Voer hier CSS-inhoud in. Om elk conflict met de CSS van de toepassing te voorkomen, moet u alle aangiften met de .bodywebsite-klasse overslaan. Bijvoorbeeld: <br><br> #mycssselector, input.myclass: hover {...} <br> moet zijn <br> .bodywebsite #mycssselector, .bodywebsite input.myclass: hover {...} <br><br> Opmerking: als u een groot bestand zonder dit voorvoegsel hebt, kunt u &#39;lessc&#39; gebruiken om het te converteren om het .bodywebsite-voorvoegsel overal toe te voegen.
 LinkAndScriptsHereAreNotLoadedInEditor=Waarschuwing: deze inhoud wordt alleen uitgevoerd wanneer de site wordt geopend vanaf een server. Het wordt niet gebruikt in de bewerkingsmodus, dus als u JavaScript-bestanden ook in de bewerkingsmodus wilt laden, voegt u gewoon uw tag 'script src = ...' toe aan de pagina.
 Dynamiccontent=Voorbeeld van een pagina met dynamische inhoud
-ImportSite=Websitemalplaatje importeren
+ImportSite=Website template importeren
 EditInLineOnOff=Modus &#39;Inline bewerken&#39; is %s
 ShowSubContainersOnOff=De modus om &#39;dynamische inhoud&#39; uit te voeren is %s
 GlobalCSSorJS=Globaal CSS / JS / Header-bestand van website
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Vervanging gedaan in %s pagina's of containers
 RSSFeed=RSS-feeds
 RSSFeedDesc=U kunt via deze URL een RSS-feed krijgen van de nieuwste artikelen met het type 'blogpost'
 PagesRegenerated=%s pagina ('s) / container (s) her-aangemaakt
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index 2bb1cd7da36..f7abea4f251 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Domyślny dla usługi
 DefaultForProduct=Domyślny dla produktu
 CantSuggest=Nie mogę zasugerować
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Konfiguracja modułu eksperta księgowego
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Dokumentowanie
-Journaux=Dzienniki
+Journals=Dzienniki
 JournalFinancial=Dzienniki finansowe
 BackToChartofaccounts=Zwróć plan kont
 Chartofaccounts=Plan kont
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Aktualne dedykowane konto
 AssignDedicatedAccountingAccount=Nowe konto do przypisania
 InvoiceLabel=Etykieta faktury
@@ -33,8 +35,8 @@ OtherInfo=Inne informacje
 DeleteCptCategory=Usuń konto księgowe z grupy
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status dokumentowania
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Pokaż szczegóły konta
 AccountWithNonZeroValues=Konta z wartościami niezerowymi
@@ -43,7 +45,9 @@ CountriesInEEC=Kraje UE
 CountriesNotInEEC=Kraje spoza UE
 CountriesInEECExceptMe=Kraje UE oprócz %s
 CountriesExceptMe=Wszystkie kraje oprócz %s
-AccountantFiles=Eksportuj dokumenty księgowe
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Główne konto księgowe dla klientów nie zdefiniowane w ustawieniach
 MainAccountForSuppliersNotDefined=Główne konto rozliczeniowe dla dostawców niezdefiniowane w konfiguracji
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Wybierz aktywny wykres kont
 ChangeAndLoad=Zmień i załaduj
 Addanaccount=Dodaj konto księgowe
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Wyświetl konta księgowe
 ShowAccountingJournal=Wyświetl dziennik konta księgowego
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Zalecane konto rachunkowe
 MenuDefaultAccounts=Domyślne konta
 MenuBankAccounts=Konta bankowe
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Wiążący raport z wydatków
 CreateMvts=Utwórz nową transakcję
 UpdateMvts=Modyfikacja transakcji
 ValidTransaction=Potwierdź transakcję
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Księga główna
+BookkeepingSubAccount=Subledger
 AccountBalance=Bilans konta
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Wyłącz bezpośrednią rejestrację transakcji na kon
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Dziennik sprzedaży
 ACCOUNTING_PURCHASE_JOURNAL=Dziennik zakupów
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Konto księgowe dla oczekujących
 DONATION_ACCOUNTINGACCOUNT=Konto księgowe dla zarejestrowanych dotatcji
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=Według roku
 NotMatch=Nie ustawione
-DeleteMvt=Usuń linie z księgi głównej
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Rok do usunęcia
 DelJournal=Dziennik do usunięcia
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Dziennik finansów
 ExpenseReportsJournal=Dziennik raportów kosztów
 DescFinanceJournal=Dziennik finansów zawiera wszystkie typy płatności wykonane przez konto bankowe
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Konto dla niezdefiniowanego VATu
 ThirdpartyAccountNotDefined=Konto dla niezdefiniowanego kontrahenta
 ProductAccountNotDefined=Konto dla produktu nie zdefiniowane
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Ten dziennik jest już w użytku
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export dziennika projektu
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index 2b31e9f5042..cfd5007cf51 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Usuwanie blokady połączeń
 YourSession=Twoja sesja
 Sessions=Sesje użytkowników
 WebUserGroup=Serwer sieci Web użytkownik / grupa
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Twoja konfiguracja PHP wydaje się nie pozwalać na wyświetlanie aktywnych sesji. Katalog używany do zapisywania sesji (<b>%s</b>) może być chroniony (na przykład przez uprawnienia systemu operacyjnego lub dyrektywę PHP open_basedir).
 DBStoringCharset=Kodowanie bazy danych do przechowywania danych
 DBSortingCharset=Kodowanie bazy danych by sortować dane
@@ -71,7 +73,7 @@ DisableJavascriptNote=Uwaga: Do celów testowych lub debugowania. W celu optymal
 UseSearchToSelectCompanyTooltip=Jeśli masz dużą liczbę kontrahentów (> 100 000), można zwiększyć prędkość przez ustawienie stałej COMPANY_DONOTSEARCH_ANYWHERE na 1 w Ustawienia -> Inne. Wyszukiwanie będzie wtedy ograniczone do rozpoczęcia ciągu znaków.
 UseSearchToSelectContactTooltip=Jeśli masz dużą liczbę kontrahentów (> 100 000), można zwiększyć prędkość przez ustawienie stałej COMPANY_DONOTSEARCH_ANYWHERE na 1 w Ustawienia -> Inne. Wyszukiwanie będzie wtedy ograniczone do rozpoczęcia ciągu znaków.
 DelaiedFullListToSelectCompany=Poczekaj na naciśnięcie klawisza przed załadowaniem zawartości kombinowanej listy Strony Trzecie.<br>Może to zwiększyć wydajność, jeśli masz dużą liczbę stron trzecich, ale jest to mniej wygodne.
-DelaiedFullListToSelectContact=Poczekaj na naciśnięcie klawisza przed załadowaniem zawartości kombinowanej listy Kontakt.<br>Może to zwiększyć wydajność, jeśli masz dużą liczbę kontaktów, ale jest to mniej wygodne)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Liczba znaków do uruchomienia wyszukiwania: %s
 NumberOfBytes=Liczba Bajtów
 SearchString=Szukana fraza
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=Na dokumencie kontrahenta można wybrać pr
 JavascriptDisabled=JavaScript wyłączony
 UsePreviewTabs=Użyj podgląd karty
 ShowPreview=Pokaż podgląd
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Podgląd niedostępny
 ThemeCurrentlyActive=Temat obecnie aktywny
 CurrentTimeZone=Strefa czasowa PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Okres wypowiedzenia
 NewByMonth=Nowe według miesiąca
 Emails=Wiadomości email
 EMailsSetup=Ustawienia wiadomości email
-EMailsDesc=Ta strona pozwala zastąpić domyślne parametry PHP do wysyłania wiadomości e-mail. W większości przypadków w systemie operacyjnym Unix/Linux konfiguracja PHP jest poprawna i te parametry są niepotrzebne.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Profile nadawców wiadomości e-mail
 EMailsSenderProfileDesc=Możesz pozostawić tę sekcję pustą. Jeśli wpiszesz tutaj adresy e-mail, zostaną one dodane do listy możliwych nadawców dostępnej podczas pisania nowej wiadomości e-mail.
 MAIN_MAIL_SMTP_PORT=Port SMTP/SMTPS (wartość domyślna w php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=Identyfikator/login SMTP  (jeśli serwer wysyłający wymaga
 MAIN_MAIL_SMTPS_PW=Hasło SMTP (jeśli serwer wysyłający wymaga uwierzytelnienia)
 MAIN_MAIL_EMAIL_TLS=Użyj szyfrowania TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Użyj szyfrowania TLS (STARTTLS)
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Użyj metody uwierzytelniania DKIM do generowania podpisu e-mail
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Domena DNS utrzymująca informacje DKIM
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Selektor DKIM wskazujący rekord DNS
@@ -300,7 +304,7 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Domyślny adres konta e-mail (użytkownika lub firmow
 UserEmail=Adres email użytkownika
 CompanyEmail=Adres firmowego konta e-mail
 FeatureNotAvailableOnLinux=Cechy te nie są dostępne w systemach Unix, takich jak. Przetestuj swój program sendmail lokalnie.
-FixOnTransifex=Fix the translation on the online translation platform of project
+FixOnTransifex=Napraw tłumaczenie na platformie do tłumaczenia projektu
 SubmitTranslation=Jeśli tłumaczenie dla tego języka nie jest kompletne lub znajdziesz błędy, możesz to poprawić, edytując pliki w katalogu <b>langs/%s</b>. Prześlij potem swoją zmianę na www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Moduł konfiguracji
@@ -412,7 +416,7 @@ String=Ciąg znaków
 String1Line=String (1 line)
 TextLong=Długi tekst
 TextLongNLines=Long text (n lines)
-HtmlText=Html text
+HtmlText=Tekst HTML
 Int=Liczba całkowita
 Float=Liczba zmiennoprzecinkowa
 DateAndTime=Data i godzina
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Biblioteka używana do generowania plików PDF
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Kliknij aby zobaczyć opis
 DependsOn=This module needs the module(s)
 RequiredBy=Ten moduł wymagany jest przez moduł(y)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integracja systemu ClickToDial (Asterisk,...)
-Module59Name=Bookmark4u
-Module59Desc=Dodawanie funkcji do generowania konta Bookmark4u z konta Dolibarr
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Interwencje
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Zasoby
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Czytaj faktur klientów
 Permission12=Tworzenie/modyfikacja faktur klientów
-Permission13=Unieważnianie faktur klienta
+Permission13=Invalidate customer invoices
 Permission14=Walidacja faktur klienta
 Permission15=Wyślij fakturę klienta poprzez e-mail.
 Permission16=Tworzenie płatności za faktury klienta
@@ -688,6 +694,7 @@ Permission32=Tworzenie / modyfikacja produktów
 Permission34=Usuwanie produktów
 Permission36=Podejrzyj / zarządzaj ukrytymi produktami
 Permission38=Eksport produktów
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Czytaj interwencje
 Permission62=Tworzenie / modyfikacja interwencji
 Permission64=Usuwanie interwencji
 Permission67=Eksport interwencji
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Czytaj użytkowników
 Permission72=Tworzenie / modyfikacja użytkowników
 Permission74=Usuwanie użytkowników
@@ -718,6 +728,7 @@ Permission95=Przeczytaj raporty
 Permission101=Czytaj ustawienia
 Permission102=Utwórz / modyfikuj ustawienia
 Permission104=Walidacja ustawień
+Permission105=Send sendings by email
 Permission106=Eksportuj wysyłki
 Permission109=Usuń wysyłki
 Permission111=Czytaj raporty finansowe
@@ -825,10 +836,11 @@ Permission402=Tworzenie / modyfikacja zniżek
 Permission403=Walidacja zniżek
 Permission404=Usuwanie zniżek
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Wynagrodzenia eksport
+Permission517=Read payments of salaries of everybody
+Permission519=Wynagrodzenia eksport
 Permission520=Czytaj Kredyty
 Permission522=Tworzenie / modyfikacja kredytów
 Permission524=Usuń kredyty
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Wygeneruj wyniki eksportu
 Permission1202=Utwórz / modyfikuj eksport
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Uruchom masowy import danych zewnętrznych do bazy danych (wgrywa
 Permission1321=Eksport faktur klienta, atrybutów oraz płatności
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Czytaj Zaplanowane zadania
 Permission23002=Tworzenie / aktualizacja Zaplanowanych zadań
 Permission23003=Usuwanie Zaplanowanego zadania
 Permission23004=Wykonanie Zaplanowanego zadania
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Czytaj transakcje
 Permission50202=Import transakcji
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Czytaj zasoby
 Permission63002=Utwórz/modyfikuj zasoby
 Permission63003=Usuń zasoby
 Permission63004=Dołącz zasoby do zdarzeń w agendzie
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Konfiguracja zapisana
 SetupNotSaved=Ustawienia nie zapisane
 BackToModuleList=Powrót do listy modułów
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Wytwórnia używany domyślnie, jeśli nie można znaleźć t
 LabelOnDocuments=Etykieta na dokumenty
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=Na koniec miesiąca
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=O serwerze WWW
 InfoDatabase=O bazie danych
 InfoPHP=O PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Nazwa przeglądarki
 BrowserOS=Przeglądarka OS
 ListOfSecurityEvents=Lista zdarzeń bezpieczeństwa Dolibarr
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=Import MySQL
-ForcedToByAModule= Ta zasada jest zmuszona <b>do %s</b> przez aktywowany modułu
+ForcedToByAModule=Ta zasada jest zmuszona <b>do %s</b> przez aktywowany modułu
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Edycja pola% s
 FillThisOnlyIfRequired=Przykład: +2 (wypełnić tylko w przypadku strefy czasowej w stosunku problemy są doświadczeni)
@@ -1282,7 +1322,7 @@ GetBarCode=Pobierz kod kreskowy
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Wróć hasło generowane zgodnie z wewnętrznym Dolibarr algorytmu: 8 znaków zawierających cyfry i znaki udostępniony w małe.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Powrót hasło zależności osobiście określonej konfiguracji.
 SetupPerso=Zgodnie z twoją konfiguracją
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox wysłać mail z potwierdzeniem do członków jest domyślnie
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=Konfiguracja LDAP
 LDAPGlobalParameters=Parametry globalne
@@ -1523,7 +1564,9 @@ LDAPDescValues=Przykład wartości są dla <b>OpenLDAP</b> ładowane z następuj
 ForANonAnonymousAccess=Dla uwierzytelniane dostęp (do zapisu na przykład)
 PerfDolibarr=Konfiguracja Wyniki / optymalizacja raport
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Aplikacyjnych cache
 MemcachedNotAvailable=Nie znaleziono cache aplikacyjnych. Możesz zwiększyć wydajność poprzez zainstalowanie serwera cache i Memcached moduł w stanie korzystać z tego serwera cache. <br> Więcej informacji tutaj <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a> . <br> Należy pamiętać, że wiele hosting provider nie zapewnia takiego serwera cache.
 MemcachedModuleAvailableButNotSetup=Moduł memcached dla aplikacyjnej cache znaleźć, ale konfiguracja modułu nie jest kompletna.
@@ -1571,9 +1614,9 @@ SyslogLevel=Poziom
 SyslogFilename=Nazwa pliku i ścieżka
 YouCanUseDOL_DATA_ROOT=Możesz użyć DOL_DATA_ROOT / dolibarr.log do pliku w Dolibarr "dokumenty" katalogu. Można ustawić inną ścieżkę do przechowywania tego pliku.
 ErrorUnknownSyslogConstant=Stała %s nie jest znany syslog stałej
-OnlyWindowsLOG_USER=System Windows obsługuje tylko LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Darowizna konfiguracji modułu
@@ -1629,7 +1672,7 @@ AdvancedEditor=Zaawansowany edytor
 ActivateFCKeditor=Uaktywnij FCKeditor za:
 FCKeditorForCompany=WYSIWIG tworzenie / edycja spółek opis i notatki
 FCKeditorForProduct=WYSIWIG tworzenie / edycja produktów / usług "opis i notatki
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG tworzenie / edycja wiadomości
 FCKeditorForUserSignature=WYSIWIG tworzenie / edycja podpisu użytkownika
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu skreślony
+Menu=Menu
 Menus=Menu
 TreeMenuPersonalized=Spersonalizowane menu
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Nowe menu
-Menu=Wybór menu
 MenuHandler=Menu obsługi
 MenuModule=Źródło modułu
 HideUnauthorizedMenu= Ukryj nieautoryzowane menu (wyszarz)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Kliknij, aby Dial konfiguracji modułu
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0: typ płatności odbiorcy, 1: typ płatności dostawcy, 2: typ
 IncludePath=Dołącz ścieżkę (zdefiniowane w zmiennej% s)
 ExpenseReportsSetup=Konfiguracja modułu Raporty Kosztów
 TemplatePDFExpenseReports=Szablony dokumentów w celu wygenerowania raportu wydatków dokument
-ExpenseReportsIkSetup=Konfiguracja modułu "Raporty wydatków" - indeks Millesa
 ExpenseReportsRulesSetup=Konfiguracja modułu "Raporty wydatków" - Reguły
 ExpenseReportNumberingModules=Moduł "Numerowanie raportów wydatków"
 NoModueToManageStockIncrease=Nie Moduł stanie zarządzać automatyczny wzrost akcji zostało aktywowane. Wzrost Zdjęcie zostanie zrobione tylko na ręczne wprowadzanie.
@@ -1864,8 +1907,8 @@ MailToSendReception=Receptions
 MailToThirdparty=Kontrahenci
 MailToMember=Członkowie
 MailToUser=Użytkownicy
-MailToProject=Strona projektów
-MailToTicket=Tickets
+MailToProject=Projekty
+MailToTicket=Bilety
 ByDefaultInList=Pokaż domyślnie w widoku listy
 YouUseLastStableVersion=Używasz ostatniej stabilnej wersji
 TitleExampleForMajorRelease=Przykład wiadomości można użyć, aby ogłosić to główne wydanie (prosimy używać go na swoich stronach internetowych)
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Kod pocztowy
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/pl_PL/banks.lang b/htdocs/langs/pl_PL/banks.lang
index 97fac86efb6..58fe92e5f58 100644
--- a/htdocs/langs/pl_PL/banks.lang
+++ b/htdocs/langs/pl_PL/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Różne płatności
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/pl_PL/categories.lang b/htdocs/langs/pl_PL/categories.lang
index 8f7a1a2bb8c..a6dfccaf849 100644
--- a/htdocs/langs/pl_PL/categories.lang
+++ b/htdocs/langs/pl_PL/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tagi / kategorie Konfiguracja
 CategorieRecursiv=Związek z dominującą tag / kategorii automatycznie
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Dodaj następujący produkt / usługę
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Pokaż tag / kategoria
 ByDefaultInList=Domyśłnie na liście
 ChooseCategory=Wybrane kategorie
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang
index 4eee2f0ecb7..0c7c3c2eb09 100644
--- a/htdocs/langs/pl_PL/companies.lang
+++ b/htdocs/langs/pl_PL/companies.lang
@@ -56,7 +56,7 @@ NatureOfThirdParty=Rodzaj kontrahenta
 NatureOfContact=Nature of Contact
 Address=Adres
 State=Województwo
-StateCode=State/Province code
+StateCode=Kod Stanu/Prowincji
 StateShort=Województwo
 Region=Region
 Region-State=Region - Województwo
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof ID 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof ID 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE
@@ -144,11 +144,11 @@ ProfId3BR=IM
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal numer)
 ProfId4CH=Prof ID 2 (Commercial rekordowa liczba)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (RUT)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof ID 2 (USt. Nr)
 ProfId3DE=Prof ID 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF / NIF)
 ProfId2ES=Id Prof 2 (numer ubezpieczenia społeczne)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Id Prof 4 (liczba Collegiate)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof ID 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, stare APE)
 ProfId4FR=Prof Id 4 (RCS / RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Numer rejestracyjny
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof ID 3
 ProfId4IN=Prof ID 4
 ProfId5IN=Prof ID 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Pozwolenie na działalność gospodarczą)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (RC)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (IF)
 ProfId4MA=Id prof. 4 (CNSS)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (RFC).
 ProfId2MX=Prof Id 2 (R.. P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=nummer KVK
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof ID 2 (numer ubezpieczenia społecznego)
 ProfId3PT=Prof Id 3 (Commercial rekordowa liczba)
 ProfId4PT=Prof Id 4 (Konserwatorium)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=Ninea
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -297,7 +302,7 @@ AddContact=Stwórz konktakt
 AddContactAddress=Stwórz kontakt/adres
 EditContact=Edytuj kontakt
 EditContactAddress=Edytuj kontakt / adres
-Contact=Contact/Address
+Contact=Kontakt/Adres
 Contacts=Kontakty/adresy
 ContactId=Identyfikator kontaktu
 ContactsAddresses=Kontakty / Adresy
@@ -326,7 +331,7 @@ ListOfContacts=Lista kontaktów/adresów
 ListOfContactsAddresses=Lista kontaktów/adresów
 ListOfThirdParties=Lista kontrahentów
 ShowCompany=Third Party
-ShowContact=Contact-Address
+ShowContact=Kontakt-Adres
 ContactsAllShort=Wszystkie (bez filtra)
 ContactType=Typ kontaktu
 ContactForOrders=Kontakt dla zamówienia
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Brak możliwości sprawdzenia. Usługa nie jest dostarczana dla wybranego regionu (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Pracownicy
 ProspectLevelShort=Potencjał
 ProspectLevel=Potencjał potencjalnego klienta
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Warunki płatności - Sprzedawca
 PaymentTypeBoth=Typ płatności - Klient i Sprzedawca
 MulticurrencyUsed=Użyj wielowalutowości
 MulticurrencyCurrency=Waluta
+InEEC=Europa (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/pl_PL/ecm.lang b/htdocs/langs/pl_PL/ecm.lang
index c4171fd621d..465958245dd 100644
--- a/htdocs/langs/pl_PL/ecm.lang
+++ b/htdocs/langs/pl_PL/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Wyszukiwanie wg słów kluczowych
 ECMSearchByEntity=Szukaj wg obiektu
 ECMSectionOfDocuments=Katalogi dokumentów
 ECMTypeAuto=Automatyczne
-ECMDocsBySocialContributions=Dokumenty powiązane z opłatami ZUS lub podatkami
-ECMDocsByThirdParties=Dokumenty powiązane z kontrahentami
-ECMDocsByProposals=Dokumenty powiązane z ofertami
-ECMDocsByOrders=Dokumenty powiązanie z zamówieniami klientów
-ECMDocsByContracts=Dokumenty powiązane z umowami
-ECMDocsByInvoices=Dokumenty powiązane z fakturami klientów
-ECMDocsByProducts=Dokumenty powiązane z produktami
-ECMDocsByProjects=Dokumenty powiązane z projektami
-ECMDocsByUsers=Dokumenty powiązane z użytkownikami
-ECMDocsByInterventions=Dokumenty powiązane z interwencjami
-ECMDocsByExpenseReports=Dokumenty dołączone do raportów kosztowych
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=Brak utworzonego katalogu
 ShowECMSection=Pokaż katalog
 DeleteSection=Usuń katalog
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/pl_PL/hrm.lang b/htdocs/langs/pl_PL/hrm.lang
index a98f73bcb23..d6f087e0817 100644
--- a/htdocs/langs/pl_PL/hrm.lang
+++ b/htdocs/langs/pl_PL/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Zatrudnionych
 Employee=Pracownik
 NewEmployee=Nowy pracownik
+ListOfEmployees=Lista pracowników
diff --git a/htdocs/langs/pl_PL/install.lang b/htdocs/langs/pl_PL/install.lang
index 5d9ffec4e50..985c7543b7e 100644
--- a/htdocs/langs/pl_PL/install.lang
+++ b/htdocs/langs/pl_PL/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Plik konfiguracyjny <b>%s</b> ma uprawnienia do zapisu.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=PHP obsługuje sesje.
 PHPSupportPOSTGETOk=PHP obsługuje zmienne POST i GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=PHP obsługuje sesje.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Maksymalna ilość pamięci sesji PHP ustawiona jest na <b>%s</b>. Powinno wystarczyć.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/pl_PL/intracommreport.lang b/htdocs/langs/pl_PL/intracommreport.lang
new file mode 100644
index 00000000000..8b6713062c8
--- /dev/null
+++ b/htdocs/langs/pl_PL/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=Lista
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/pl_PL/languages.lang b/htdocs/langs/pl_PL/languages.lang
index 8448976c9dd..946fc017a49 100644
--- a/htdocs/langs/pl_PL/languages.lang
+++ b/htdocs/langs/pl_PL/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Hiszpański (Panama)
 Language_es_PY=Hiszpański (Paragwaj)
 Language_es_PE=Hiszpański (Peru)
 Language_es_PR=Hiszpański (Portoryko)
+Language_es_US=Spanish (USA)
 Language_es_UY=Hiszpański (Urugwaj)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Hiszpański (Wenezuela)
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index 3a69a3bf91d..401ac7b9b3c 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Usuń link
 AddToDraft=Dodaj do szkicu
 Update=Uaktualnić
 Close=Zamknij
+CloseAs=Ustaw status do
 CloseBox=Usuń widget ze swojej tablicy
 Confirm=Potwierdź
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -170,12 +171,12 @@ ToValidate=Aby potwierdzić
 NotValidated=Nie potwierdzone
 Save=Zapisać
 SaveAs=Zapisz jako
-SaveAndStay=Save and stay
+SaveAndStay=Zapisz i zostań
 SaveAndNew=Save and new
 TestConnection=Test połączenia
 ToClone=Duplikuj
-ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmCloneAsk=Czy jesteś pewny, chcesz sklonować objekt<b>%s</b>?
+ConfirmClone=Wybierz datę którą chcesz sklonować:
 NoCloneOptionsSpecified=Brak zdefiniowanych danych do zduplikowania.
 Of=z
 Go=Idź
@@ -187,15 +188,16 @@ ShowCardHere=Pokaż kartę
 Search=Wyszukaj
 SearchOf=Szukaj
 SearchMenuShortCut=Ctrl + shift + f
-QuickAdd=Quick add
+QuickAdd=Szybkie dodanie
 QuickAddMenuShortCut=Ctrl + shift + l
 Valid=Aktualny
 Approve=Zatwierdź
 Disapprove=Potępiać
 ReOpen=Otwórz ponownie
-Upload=Upload
+Upload=Wczytaj
 ToLink=Łącze
 Select=Wybierz
+SelectAll=Select all
 Choose=Wybrać
 Resize=Zmiana rozmiaru
 ResizeOrCrop=Zmień rozmiar lub przytnij
@@ -210,7 +212,7 @@ Password=Hasło
 PasswordRetype=Powtórz hasło
 NoteSomeFeaturesAreDisabled=Należy pamiętać, że wiele funkcji/modułów jest wyłączonych w tej demonstracji.
 Name=Nazwa
-NameSlashCompany=Name / Company
+NameSlashCompany=Nazwa / Firma
 Person=Osoba
 Parameter=Parametr
 Parameters=Parametry
@@ -256,6 +258,7 @@ Cards=Kartki
 Card=Karta
 Now=Teraz
 HourStart=Godzina startu
+Deadline=Deadline
 Date=Data
 DateAndHour=Data i godzina
 DateToday=Dzisiejsza data
@@ -264,8 +267,10 @@ DateStart=Data rozpoczęcia
 DateEnd=Data zakończenia
 DateCreation=Data utworzenia
 DateCreationShort=Data utworzenia
+IPCreation=Creation IP
 DateModification=Zmiana daty
 DateModificationShort=Data modyfikacji
+IPModification=Modification IP
 DateLastModification=Data ostatniej zmiany
 DateValidation=Zatwierdzenie daty
 DateClosing=Ostateczny termin
@@ -287,7 +292,7 @@ UserModification=Modyfikacja użytkownika
 UserValidation=Validation user
 UserCreationShort=Utwórz użytkownika
 UserModificationShort=Zmień użytkownika
-UserValidationShort=Valid. user
+UserValidationShort=Zły. Użytkownik
 DurationYear=rok
 DurationMonth=miesiąc
 DurationWeek=tydzień
@@ -319,6 +324,7 @@ Morning=Rano
 Afternoon=Popołudniu
 Quadri=Kwadrans
 MonthOfDay=Dzień miesiąca
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Stawka
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Kwota płatności, oryginalna waluta
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Kwota (zVAT), oryginalna waluta
 MulticurrencyAmountVAT=Kwota VAT, oryginalna waluta
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Wartość podatku 2
 AmountLT2=Wartość podatku 3
 AmountLT1ES=Kwota RE
@@ -390,13 +397,13 @@ Totalforthispage=Suma dla tej strony
 TotalTTC=Ogółem (z VAT)
 TotalTTCToYourCredit=Ogółem (z VAT) na twoje konto
 TotalVAT=Razem VAT
-TotalVATIN=Total IGST
+TotalVATIN=Wszystkie IGST
 TotalLT1=Podatek całkowity 2
 TotalLT2=Podatek całkowity 3
 TotalLT1ES=Razem RE
 TotalLT2ES=Razem IRPF
-TotalLT1IN=Total CGST
-TotalLT2IN=Total SGST
+TotalLT1IN=Wszystkie CGST
+TotalLT2IN=Wszystkie SGST
 HT=Bez VAT
 TTC= z VAT
 INCVATONLY=Zawiera VAT
@@ -487,6 +494,7 @@ By=Przez
 From=Od
 FromDate=Z
 FromLocation=Z
+at=at
 to=do
 To=do
 and=i
@@ -509,6 +517,7 @@ Draft=Szkic
 Drafts=Robocze
 StatusInterInvoiced=Invoiced
 Validated=Zatwierdzona
+ValidatedToProduce=Validated (To produce)
 Opened=Otwarte
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -653,15 +662,16 @@ FeatureNotYetSupported=Funkcja nie jest jeszcze obsługiwana
 CloseWindow=Zamknij okno
 Response=Odpowiedź
 Priority=Priorytet
-SendByMail=Send by email
+SendByMail=Wyślij przez email
 MailSentBy=E-mail został wysłany przez
+NotSent=Nie wysłał
 TextUsedInTheMessageBody=Zawartość emaila 
 SendAcknowledgementByMail=Wyślij email potwierdzający
 SendMail=Wyślij wiadomość email
 Email=Adres e-mail
 NoEMail=Brak e-mail
-AlreadyRead=Already read
-NotRead=Not read
+AlreadyRead=Obecnie przeczytane
+NotRead=Nie przeczytane
 NoMobilePhone=Brak telefonu komórkowego
 Owner=Właściciel
 FollowingConstantsWillBeSubstituted=Kolejna zawartość będzie zastąpiona wartością z korespondencji.
@@ -779,7 +789,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link do umowy
 LinkToIntervention=Link do interwencji
-LinkToTicket=Link to ticket
+LinkToTicket=Link do biletu
 CreateDraft=Utwórz Szic
 SetToDraft=Wróć do szkicu
 ClickToEdit=Kliknij by edytować
@@ -836,6 +846,7 @@ ListOfTemplates=Lista szablonów
 Gender=Płeć
 Genderman=Mężczyzna
 Genderwoman=Kobieta
+Genderother=Inne
 ViewList=Widok listy
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Różne
 Calendar=Kalendarz
 GroupBy=Grupuj według
 ViewFlatList=Zobacz płaską listę
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Usuń ciąg '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Bezpośredni link do pobierania (publiczny / zewnętrzny)
@@ -1007,7 +1020,10 @@ SearchIntoContracts=Kontrakty
 SearchIntoCustomerShipments=Wysyłki klienta
 SearchIntoExpenseReports=Zestawienia wydatków
 SearchIntoLeaves=Leave
-SearchIntoTickets=Tickets
+SearchIntoTickets=Bilety
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Różne płatności
 CommentLink=Komentarze
 NbComments=Ilość komentarzy
 CommentPage=Miejsce na komentarze
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Informacja
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Data urodzenia
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/pl_PL/members.lang b/htdocs/langs/pl_PL/members.lang
index 3c5e9fca126..059bc2dddf4 100644
--- a/htdocs/langs/pl_PL/members.lang
+++ b/htdocs/langs/pl_PL/members.lang
@@ -19,14 +19,12 @@ MembersCards=Członkowie wydruku karty
 MembersList=Lista członków
 MembersListToValid=Lista szkiców członków (do zatwierdzenia)
 MembersListValid=Wykaz ważnych członków
-MembersListUpToDate=Lista zatwierdzonych członków z ważną datą subskrypcji
-MembersListNotUpToDate=Lista zatwierdzonych członków z nieważną datą subskrypcji
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=Lista członków wykwalifikowanych
 MenuMembersToValidate=Projekt członków
 MenuMembersValidated=Zatwierdzeni członkowie
-MenuMembersUpToDate=Aktualni członkowie
-MenuMembersNotUpToDate=Nieaktualni człokowie
 MenuMembersResiliated=członkowie zakończone
 MembersWithSubscriptionToReceive=Użytkownicy z subskrypcji otrzymują
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Data subskrypcji
 DateEndSubscription=Data końca subskrypcji
 EndSubscription=Koniec subskrypcji
 SubscriptionId=ID subskrypcji
+WithoutSubscription=Without subscription
 MemberId=ID członka
 NewMember=Nowy członek
 MemberType=Typ członka
@@ -81,7 +80,7 @@ DeleteType=Usuń
 VoteAllowed=Głosowanie dozwolone
 Physical=Fizyczne
 Moral=Moralny
-MorPhy=Natura
+MorAndPhy=Moral and Physical
 Reenable=Ponownym włączeniu
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Użytkownicy statystyki na State / Province
 MembersStatisticsByTown=Użytkownicy statystyki na miasto
 MembersStatisticsByRegion=Użytkownicy statystyki regionu
 NbOfMembers=Liczba członków
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=Żadna potwierdzona znaleziono użytkowników
 MembersByCountryDesc=Ten ekran pokaże statystyki członków przez poszczególne kraje. Graficzny zależy jednak na Google usługi online grafów i jest dostępna tylko wtedy, gdy połączenie internetowe działa.
 MembersByStateDesc=Ten ekran pokazać Wam statystyki członkom przez stan / prowincje / Kanton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statystyka
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Data ostatniej subskrypcji
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Informacje są publiczne
 NewMemberbyWeb=Nowy członek dodaje. Oczekuje na zatwierdzenie
 NewMemberForm=Nowa forma członkiem
diff --git a/htdocs/langs/pl_PL/mrp.lang b/htdocs/langs/pl_PL/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/pl_PL/mrp.lang
+++ b/htdocs/langs/pl_PL/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index 34f265a9867..bac16142cef 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Ilość cen
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Liczba produktów tworzących ten produkt wirtualny
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Liczba dominującej opakowaniu produktu
 ParentProducts=Produkt macieżysty
-IfZeroItIsNotAVirtualProduct=Jeśli 0, produkt nie jest produktem wirtualnym
-IfZeroItIsNotUsedByVirtualProduct=Jeśli 0, to ten produkt nie jest używany przez żaden produkt wirtualny
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Filtr słów kluczowych
 CategoryFilter=Filtr kategorii
 ProductToAddSearch=Szukaj produktu do dodania
 NoMatchFound=Nie znaleziono odpowiednika
 ListOfProductsServices=Lista produktów/usług
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=Lista wirtualnych produktów/usług z tym produktem jako komponentem
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=Jeden z wybranych produktów jest nadrzędny dla produktu bieżącego
 DeleteProduct=Usuń produkt/usługę
 ConfirmDeleteProduct=Czy na pewno chcesz usunąć ten produkt/usługę?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Dostępne wartości globalne:
 PriceMode=Tryb Cena
 PriceNumeric=Liczba
 DefaultPrice=Domyśla cena
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Wzrost / spadek akcji na zmiany dominującej
 ComposedProduct=Child products
 MinSupplierPrice=Minimalna cena zakupu
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/pl_PL/recruitment.lang b/htdocs/langs/pl_PL/recruitment.lang
index f55547daa9d..8faa1e9912f 100644
--- a/htdocs/langs/pl_PL/recruitment.lang
+++ b/htdocs/langs/pl_PL/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Stanowisko
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang
index bb473086ac7..b7b0ba0716a 100644
--- a/htdocs/langs/pl_PL/stocks.lang
+++ b/htdocs/langs/pl_PL/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=ID przesunięcia %d
 ListMouvementStockProject=Lista przesunięć zapasu skojarzona z projektem
 StocksArea=Powierzchnia magazynów
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Lokacja
 LocationSummary=Nazwa skrócona lokalizacji
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=Na zamówienie
 Replenishment=Uzupełnienie
 ReplenishmentOrders=Zamówień towarów
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Użyj wirtualnej akcji domyślnie, zamiast fizycznego magazynie, do uzupełniania funkcji
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Użyj wirtualnego zapasu
 UsePhysicalStock=Użyj fizycznego zapasu
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=Te produkt jest już na liście
 SelectCategory=Filtr kategorii
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inwentaryzacja
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/pl_PL/suppliers.lang b/htdocs/langs/pl_PL/suppliers.lang
index f9cfa1e9546..e317602a687 100644
--- a/htdocs/langs/pl_PL/suppliers.lang
+++ b/htdocs/langs/pl_PL/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Zamówienia do zafakturowania
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Reputacja dostawcy
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Nie zamawiaj
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputacja
diff --git a/htdocs/langs/pl_PL/website.lang b/htdocs/langs/pl_PL/website.lang
index 27fba000e5c..2d9b4e9aa97 100644
--- a/htdocs/langs/pl_PL/website.lang
+++ b/htdocs/langs/pl_PL/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Dodaj witrynę
 Webpage=Strona/pojemnik
 AddPage=Dodaj stronę
 HomePage=Strona główna
-PageContainer=Strona/pojemnik
+PageContainer=Strona
 PreviewOfSiteNotYetAvailable=Podgląd Twej witryny <strong>%s</strong> nie jest jeszcze dostępny. Użyj wpierw '<strong>Załaduj szablon witryny</strong>' lub '<strong>Dodaj stronę/pojemnik</strong>'.
 RequestedPageHasNoContentYet=Żądana strona o identyfikatorze %s nie ma jeszcze treści lub plik pamięci podręcznej .tpl.php został usunięty. Edytuj zawartość strony, aby to rozwiązać.
 SiteDeleted=Witryna '%s' usunięta
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang
index b515e57a41a..d453360b552 100644
--- a/htdocs/langs/pt_BR/accountancy.lang
+++ b/htdocs/langs/pt_BR/accountancy.lang
@@ -13,7 +13,6 @@ ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique o prefixo do nome do arquivo
 DefaultForService=Padrão para serviço
 CantSuggest=Não posso sugerir
 AccountancySetupDoneFromAccountancyMenu=A maioria das configurações da Contabilidade é feita a partir do menu %s
-ConfigAccountingExpert=Configuração do módulo específico de contabilidade
 Journalization=Lançamento no Livro
 Chartofaccounts=Plano de contas
 InvoiceLabel=Rótulo da fatura
@@ -22,10 +21,7 @@ OverviewOfAmountOfLinesBound=Visão geral do montante das linhas já vinculadas
 DeleteCptCategory=Remover conta contábil do grupo
 ConfirmDeleteCptCategory=Tem certeza de que deseja remover essa conta contábil do grupo de contas contábeis?
 JournalizationInLedgerStatus=Situação do registro do diário
-AlreadyInGeneralLedger=Já foram Livros de registro em livros contabilísticos
-NotYetInGeneralLedger=Ainda não publicado em livros contábeis
 GroupIsEmptyCheckSetup=O grupo está vazio, verifique a configuração do grupo de contabilidade personalizado
-AccountantFiles=Exportar documentos contábeis
 MainAccountForCustomersNotDefined=Conta contábil principal para clientes não definidos na configuração
 MainAccountForUsersNotDefined=Conta contábil principal para usuários não definidos na configuração
 MainAccountForVatPaymentNotDefined=Conta contábil principal para o pagamento do IVA não definido na configuração
@@ -50,7 +46,6 @@ AccountancyAreaDescBind=PASSO %s: verifique a ligação entre as linhas %s exist
 AccountancyAreaDescWriteRecords=PASSO %s: efetue as transações no Livro de Registro. Para isso, vá para o menu <strong> %s </strong> e clique no botão <strong> %s </strong>.
 AccountancyAreaDescAnalyze=ETAPA %s: Adicionar ou editar as transações existentes, gerar os relatórios e exportar.
 AccountancyAreaDescClosePeriod=ETAPA %s: Fechar o período de forma que não possamos fazer modificações no futuro.
-TheJournalCodeIsNotDefinedOnSomeBankAccount=Uma etapa obrigatória na configuração não foi concluída (o diário de código contábil não está definido para todas as contas bancárias)
 Selectchartofaccounts=Selecione gráfico ativo de contas
 ChangeAndLoad=Alterar e carregar
 Addanaccount=Adicionar uma conta contábil
@@ -73,7 +68,6 @@ RegistrationInAccounting=Registro em contabilidade
 Binding=Vinculando para as contas
 CustomersVentilation=Vinculando as faturas do cliente
 ExpenseReportsVentilation=Relatório de despesas obrigatórias
-WriteBookKeeping=Registrar transações no livro-razão
 Bookkeeping=Razão
 ObjectsRef=Referência da fonte do objeto
 CAHTF=Total de fornecedores antes de impostos
@@ -134,13 +128,9 @@ TransactionNumShort=Nº da transação
 GroupByAccountAccounting=Agrupar pela conta da Contabilidade
 AccountingAccountGroupsDesc=Você pode definir aqui alguns grupos de contabilidade. Eles serão usados ​​para relatórios contábeis personalizados.
 NotMatch=Não Definido
-DeleteMvt=Excluir linha do razão
 DelMonth=Mês a excluir
 DelYear=Ano a ser deletado
 DelJournal=Resumo a ser deletado
-ConfirmDeleteMvt=Isso excluirá todas as linhas do livro razão do ano / mês e / ou de um diário específico (pelo menos um critério é necessário). Você precisará reutilizar o recurso 'Registro na contabilidade' para que o registro excluído volte ao livro razão.
-ConfirmDeleteMvtPartial=Isso eliminará a transação do Livro de Registro (todas as linhas relacionadas à mesma transação serão excluídas)
-DescJournalOnlyBindedVisible=Esta é uma visão de registro que é vinculada a uma conta contábil e pode ser gravada no Livro de Registro.
 VATAccountNotDefined=Conta para ICMS não definida
 ThirdpartyAccountNotDefined=Conta para terceiro não definida
 ProductAccountNotDefined=Conta para produto não definida
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index cda7582a8f9..a6c2222a0d7 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -28,6 +28,7 @@ SessionSavePath=Local para salvar sessão
 PurgeSessions=Purgar Sessão
 ConfirmPurgeSessions=Você tem certeza que quer remover toas as sessões? Isto ira desconectar todos os usuários (exceto você)
 LockNewSessions=Bloquear Novas Sessões
+ConfirmLockNewSessions=Tem certeza de que deseja restringir qualquer nova conexão Dolibarr a si mesmo? Apenas o usuário <b> %s </ b> poderá se conectar depois disso.
 UnlockNewSessions=Remover Bloqueio de Conexão
 YourSession=Sua Sessão
 Sessions=Sessões de Usuários
@@ -62,7 +63,6 @@ DisableJavascript=Desativar as funções Javascript e AJax
 DisableJavascriptNote=Obs.: Para propósitos de teste ou depuração. Para otimização de cegos ou navegadores de texto, é preferível usar a configuração do perfil do usuário
 UseSearchToSelectCompanyTooltip=Além disso, se você tem um grande número de terceiros (> 100 000), você pode aumentar a velocidade, definindo COMPANY_DONOTSEARCH_ANYWHERE constante a 1 em Setup-> Outro. Busca, então, ser limitada até o início da string.
 UseSearchToSelectContactTooltip=Além disso, se você tem um grande número de terceiros (> 100 000), você pode aumentar a velocidade, definindo CONTACT_DONOTSEARCH_ANYWHERE constante a 1 em Setup-> Outro. Busca, então, ser limitada até o início da string.
-NumberOfKeyToSearch=Número de caracteres para acionar a pesquisa: %s
 NumberOfBytes=Número de Bytes
 SearchString=Seqüência de pesquisa
 NotAvailableWhenAjaxDisabled=Indisponível quando o Ajax esta desativado
@@ -121,7 +121,6 @@ SystemToolsAreaDesc=Essa área dispõem de funções administrativas. Use esse m
 Purge=Purgar (apagar tudo)
 PurgeAreaDesc=Esta página permite deletar todos os arquivos gerados ou armazenados pelo Dolibarr (arquivos temporários ou todos os arquivos no diretório <b>%s</b>). Este recurso é fornecido como uma solução alternativa aos usuários cujo a instalação esteja hospedado num servidor que impeça o acesso as pastas onde os arquivos gerados pelo Dolibarr são armazenados, para excluí-los.
 PurgeDeleteLogFile=Excluir os arquivos de registro, incluindo o <b>%s</b> definido pelo módulo Syslog (não há risco de perda de dados)
-PurgeDeleteTemporaryFiles=Exclua todos os arquivos temporários (sem risco de perder dados). Nota: A exclusão é feita apenas se o diretório temporário foi criado 24 horas atrás.
 PurgeDeleteTemporaryFilesShort=Excluir arquivos temporários
 PurgeDeleteAllFilesInDocumentsDir=Eliminar todos os arquivos do diretório <b>%s</b>. Isto irá excluir todos documentos (Terceiros, faturas, ...), arquivos carregados no módulo ECM, Backups e arquivos temporários
 PurgeRunNow=Purgar(Apagar) Agora
@@ -143,7 +142,6 @@ ImportMySqlDesc=Para importar um arquivo de backup do MySQL, você pode usar o p
 ImportPostgreSqlDesc=Para importar um arquivo de backup, você deve usar pg_restore na linha de comando:
 ImportMySqlCommand=%s %s < meubackup.sql
 ImportPostgreSqlCommand=%s %s meubackup.sql
-FileNameToGenerate=Nome de arquivo para backup:
 Compression=Compactar
 CommandsToDisableForeignKeysForImport=Comando para desativar as chaves estrangeiras(foreign keys) na importação
 CommandsToDisableForeignKeysForImportWarning=Mandatório se você quiser ser capaz de restaurar seu 'sql dump' depois
@@ -186,16 +184,13 @@ AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponível somente se Javascript n
 UsedOnlyWithTypeOption=Usado por alguns opção agenda única
 Passwords=Senhas
 DoNotStoreClearPassword=Criptografar senhas armazenadas no banco de dados (NÃO como texto simples). É altamente recomendável ativar esta opção.
-MainDbPasswordFileConfEncrypted=Criptografe a senha do banco de dados armazenada em conf.php. É altamente recomendável ativar esta opção.
 InstrucToEncodePass=Para ter a senha codificada no arquivo <b>conf.php</b>, substitua a linha <br><b>$dolibarr_main_db_pass="..."</b><br>por<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
 InstrucToClearPass=Para ter a senha não codificada(limpa) no arquivo <b>conf.php</b>, substitua a linha <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>por<br><b>$dolibarr_main_db_pass="%s"</b>
-ProtectAndEncryptPdfFiles=Proteja arquivos PDF gerados. Isso NÃO é recomendado, pois interrompe a geração de PDF em massa.
 ProtectAndEncryptPdfFilesDesc=Proteção de um documento PDF mantém ele disponível para ler e imprimir com qualquer navegador PDF. No entanto, edição e cópia não é possível. Observe que a utilização deste recurso faz com que a construção de um PDF global mesclado não funcione.
 Feature=Destaque
 Developpers=Desenvolvedores/Contribuidores
 OfficialWebSite=Site oficial do Dolibarr
 OfficialWebSiteLocal=Web site local (%s)
-OfficialWiki=Documentação Dolibarr / Wiki
 OfficialDemo=Demo online do Dolibarr
 OfficialMarketPlace=Loja oficial para módulos externos/addons
 OfficialWebHostingService=Serviços de hospedagem web referenciados (hospedagem na Nuvem)
@@ -242,15 +237,12 @@ ModuleFamilyPortal=Websites e outras aplicações front-end
 MenuHandlers=Gestor de Menus
 MenuAdmin=Editor menus
 DoNotUseInProduction=Não utilizar em produção
-ThisIsProcessToFollow=Procedimento de atualização:
 FindPackageFromWebSite=Encontre um pacote que forneça os recursos que você precisa (por exemplo, no site oficial %s).
 DownloadPackageFromWebSite=Download do pacote (por exemplo, do site oficial %s).
 UnpackPackageInDolibarrRoot=Desempacote/descompacte os arquivos empacotados no diretório do servidor Dolibarr: <b>%s</b>
 NotExistsDirect=O diretório root alternativo não está definido para um diretório existente.<br>
 InfDirAlt=Desde a versão 3, é possível definir um diretório-root alternativo. Isso permite que você armazene, em um diretório dedicado, plug-ins e modelos personalizados. <br> Basta criar um diretório na raiz de Dolibarr (por exemplo:custom).<br>
 InfDirExample=<br>Então declare no arquivo <strong>conf.php</strong><br>$dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br> Se estas linhas estão comentadas com "#", para serem habilitadas, apenas remova o caractere "#".
-YouCanSubmitFile=Você pode fazer upload do arquivo .zip do pacote do módulo aqui:
-CallUpdatePage=Navegue até a página que atualiza a estrutura e os dados do banco de dados: %s.
 LastActivationAuthor=Último autor da ativação
 LastActivationIP=Último IP de ativação
 UpdateServerOffline=Atualização de servidor off-line
@@ -283,7 +275,6 @@ ListOfDirectoriesForModelGenODT=A lista de diretórios contém modelos de arquiv
 ExampleOfDirectoriesForModelGen=Exemplo de sintaxe:<br>c:\\meudir<br>/home/meudir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Para saber como criar seus temas de documento em ODT, antes de armazená-los nesses diretórios, leia a documentação wiki:
 FirstnameNamePosition=Posição do Nome/Sobrenome
-DescWeather=As imagens a seguir serão mostradas no painel quando o número de ações atrasadas atingir os seguintes valores:
 KeyForWebServicesAccess=Chave para usar o Serviços Web (parâmetro "dolibarrkey" no serviço web)
 TestSubmitForm=Teste de entrada de formulário
 ThisForceAlsoTheme=Usando este gerenciador de menu também usará seu próprio tema, seja qual for a escolha do usuário. Além disso, este gerenciador de menus especializado para smartphones não funciona em todos os smartphones. Use outro gerenciador de menu se tiver problemas com o seu.
@@ -293,14 +284,11 @@ SmsTestMessage=Mensagem Teste de __PHONEFROM__ para __PHONETO__
 ModuleMustBeEnabledFirst=O módulo <b>%s</b> deve estar primeiramente habilitado se você precisa desta funcionalidade.
 SecurityToken=Chave para proteção das URLs
 NoSmsEngine=Nenhum gerenciador de remetente de SMS disponível. Um gerenciador de remetentes SMS não é instalado com a distribuição padrão porque eles dependem de um fornecedor externo, mas você pode encontrar alguns em %s
-PDFDesc=Opções globais para geração de PDF
-PDFAddressForging=Regras para seção de endereço
 HideAnyVATInformationOnPDF=Ocultar todas as informações relacionadas a imposto sobre vendas/IVA
 PDFRulesForSalesTax=Regras para ICMS
 HideLocalTaxOnPDF=Ocultar %s taxa na coluna Imposto sobre vendas / IVA
 HideDescOnPDF=Ocultar descrição dos produtos
 HideRefOnPDF=Ocultar ref. dos produtos.
-HideDetailsOnPDF=Ocultar detalhes das linhas de produtos
 PlaceCustomerAddressToIsoLocation=Use a posição padrão francesa (La Poste) para a posição do endereço do cliente
 UrlGenerationParameters=Parâmetros para URLs de segurança
 SecurityTokenIsUnique=Usar um único parâmetro na chave de segurança para cada URL
@@ -330,9 +318,7 @@ ComputedpersistentDesc=Campos extra computados serão armazenados no banco de da
 ExtrafieldParamHelpselect=Lista de valores deve ser linhas com chave de formato, valor (onde a chave não pode ser '0') <br><br> por exemplo: <br> 1, value1 <br> 2, value2 <br> código3, valor3 <br>...<br><br> Para que a lista dependa de outra lista de atributos complementares: <br> 1, valor1 | <i>opções_ pai_list_code</i> : parent_key <br> 2, valor2 | <i>opções_ pai_list_code</i> : parent_key <br><br> Para ter a lista dependendo de outra lista: <br> 1, valor1 | <i>parent_list_code</i> : parent_key <br> 2, value2 | <i>parent_list_code</i> : parent_key
 ExtrafieldParamHelpcheckbox=Lista de valores deve ser linhas com chave de formato, valor (onde a chave não pode ser '0') <br><br> por exemplo: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
 ExtrafieldParamHelpradio=Lista de valores deve ser linhas com chave de formato, valor (onde a chave não pode ser '0') <br><br> por exemplo: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
-ExtrafieldParamHelpsellist=Lista de valores vem de uma tabela <br> Sintaxe: table_name: label_field: id_field :: filter <br> Exemplo: c_typent: libelle: id :: filter <br><br> - idfilter é necessariamente uma chave primária int <br> - filtro pode ser um teste simples (por exemplo, ativo = 1) para exibir apenas o valor ativo <br> Você também pode usar $ID$ no filtro que é o ID atual do objeto atual <br> Para fazer um SELECT no filtro use $SEL$ <br> se você quiser filtrar em extrafields use a sintaxe extra.fieldcode = ... (onde o código de campo é o código do campo extra) <br><br> Para que a lista dependa de outra lista de atributos complementares: <br> c_typent: libelle: id: options_ <i>parent_list_code</i> | parent_column: filter <br><br> Para ter a lista dependendo de outra lista: <br> c_typent: libelle: id: <i>parent_list_code</i> | parent_column: filter
 ExtrafieldParamHelpchkbxlst=Lista de valores vem de uma tabela <br> Sintaxe: table_name: label_field: id_field :: filter <br> Exemplo: c_typent: libelle: id :: filter <br><br> filtro pode ser um teste simples (por exemplo, ativo = 1) para exibir apenas o valor ativo <br> Você também pode usar $ID$ no filtro que é o ID atual do objeto atual <br> Para fazer um SELECT no filtro use $SEL$ <br> se você quiser filtrar em extrafields use a sintaxe extra.fieldcode = ... (onde o código de campo é o código do campo extra) <br><br> Para que a lista dependa de outra lista de atributos complementares: <br> c_typent: libelle: id: options_ <i>parent_list_code</i> | parent_column: filter <br><br> Para ter a lista dependendo de outra lista: <br> c_typent: libelle: id: <i>parent_list_code</i> | parent_column: filter
-ExtrafieldParamHelplink=Parâmetros devem ser ObjectName: Classpath <br> Sintaxe: ObjectName: Classpath <br> Exemplos: <br> Societe: societe/class/societe.class.php <br> Contato: contact/class/contact.class.php
 ExtrafieldParamHelpSeparator=Mantenha em branco para um separador simples<br>Defina como 1 para um separador de recolhimento (aberto por padrão para nova sessão e, em seguida, o status é mantido para cada sessão do usuário)<br> Defina como 2 para um separador de recolhimento (recolhido por padrão para nova sessão e, em seguida, o status é mantido antes de cada sessão do usuário)
 LibraryToBuildPDF=Biblioteca usada para a geração de PDF
 LocalTaxDesc=Alguns países podem aplicar dois ou três impostos em cada linha da fatura. Se este for o caso, escolha o tipo para o segundo e terceiro imposto e sua taxa. Tipo possível são: <br> 1: imposto local aplicável a produtos e serviços sem IVA (a taxa local é calculada sobre o valor sem impostos) <br> 2: imposto local aplicável a produtos e serviços, incluindo IVA (a taxa local  é calculada no montante + imposto principal) <br> 3: imposto local aplicável a produtos sem IVA (a taxa local é calculada sobre o valor sem impostos) <br> 4: imposto local aplicável a produtos, incluindo IVA (a taxa local é calculada sobre o valor + IVA principal) <br> 5: imposto local aplicável a serviços sem IVA (a taxa local é calculado sobre o valor sem impostos) <br> 6: imposto local aplicável a serviços, incluindo IVA (a taxa local  é calculada sobre o valor + imposto)
@@ -367,9 +353,7 @@ ModuleCompanyCodeCustomerDigitaria=%s seguido pelo nome do cliente truncado pelo
 ModuleCompanyCodeSupplierDigitaria=%s seguido pelo nome do fornecedor truncado pelo número de caracteres: %s para o código contábil do fornecedor.
 Use3StepsApproval=Por padrão, os Pedidos de Compra necessitam ser criados e aprovados por 2 usuários diferentes (uma etapa para a criação e a outra etapa para a aprovação. Note que se o usuário possui ambas permissões para criar e aprovar, uma única etapa por usuário será suficiente). Você pode pedir, com esta opção, para introduzir uma terceira etapa para aprovação por outro usuário, se o montante for superior a um determinado valor (assim 3 etapas serão necessárias : 1=validação, 2=primeira aprovação e 3=segunda aprovação se o montante for suficiente). <br>Defina como vazio se uma aprovação (2 etapas) é suficiente, defina com um valor muito baixo (0.1) se uma segunda aprovação (3 etapas) é sempre exigida.
 UseDoubleApproval=Usar uma aprovação de 3 etapas quando o valor (sem taxa) é maior do que ...
-WarningPHPMail=AVISO: Muitas vezes, é melhor configurar e-mails enviados para usar o servidor de e-mail do seu provedor, em vez da configuração padrão. Alguns provedores de e-mail (como o Yahoo) não permitem que você envie um e-mail de outro servidor além do seu próprio servidor. Sua configuração atual usa o servidor do aplicativo para enviar e-mail e não o servidor do seu provedor de e-mail, então alguns destinatários (aquele compatível com o protocolo restritivo do DMARC) perguntarão ao seu provedor de e-mail se eles podem aceitar seu e-mail e alguns provedores de e-mail (como o Yahoo) pode responder "não" porque o servidor não é deles, portanto poucos dos seus e-mails enviados podem não ser aceitos (tome cuidado também com a cota de envio do seu provedor de e-mail). <br> Se o seu provedor de e-mail (como o Yahoo) tiver essa restrição, você deve alterar a configuração de e-mail para escolher o outro método "servidor SMTP" e inserir o servidor SMTP e as credenciais fornecidas pelo seu provedor de e-mail.
 WarningPHPMail2=Se o seu provedor SMTP de e-mail precisar restringir o cliente de e-mail a alguns endereços IP (muito raro), esse é o endereço IP do agente de usuário de e-mail (MUA) para seu aplicativo ERP CRM: <strong>%s</strong>.
-WarningPHPMailSPF=Se o nome de domínio no endereço de email do remetente estiver protegido pelo SPF (pergunte ao seu provedor de email), você deverá incluir os seguintes IPs no registro SPF do DNS do seu domínio: <strong> %s </strong>.
 ClickToShowDescription=Clique para exibir a descrição
 RequiredBy=Este módulo é exigido por módulo(s)
 PageUrlForDefaultValues=Você deve inserir o caminho relativo do URL da página. Se você incluir parâmetros na URL, os valores padrão serão efetivos se todos os parâmetros estiverem definidos com o mesmo valor.
@@ -398,29 +382,22 @@ Module20Desc=Gestor de Orçamentos
 Module22Name=E-mails em massa
 Module22Desc=Gerenciar o envio em massa de e-mails
 Module23Desc=Monitoramento de Consumo de Energia
-Module25Name=Ordens de venda
 Module25Desc=Gerenciamento de pedidos de vendas
 Module40Name=Vendedores
 Module40Desc=Fornecedores e gerenciamento de compras (pedidos e cobrança de faturas de fornecedores)
 Module42Name=Notas de depuração
 Module42Desc=Recursos de registro (arquivo, syslog, ...). Tais registros são para propósitos técnicos/debug.
 Module49Desc=Gestor de Editores
-Module50Desc=Gestão de Produtos
 Module51Name=Cartas Massivos
 Module51Desc=Gestão de correspondência do massa
 Module52Name=Estoques
 Module52Desc=Gestão de estoque
-Module53Desc=Gestão de Serviços
 Module54Name=Contratos/Assinaturas
 Module55Name=Códigos de Barra
 Module55Desc=Gestor de Códigos de Barra
-Module56Name=Pagamento por transferência de crédito
 Module56Desc=Gestão do pagamento de fornecedores por ordens de Transferência a Crédito. Inclui a geração de arquivo SEPA para países europeus.
-Module57Name=Pagamentos por Débito Direto
-Module57Desc=Gerenciamento de pedidos de Débito Direto. Inclui a geração de arquivo SEPA para países europeus.
 Module58Name=CliqueParaDiscarl
 Module58Desc=Integração do Sistema CliqueParaDiscar (Asterisk, etc.)
-Module59Desc=Adicione uma função para gerar uma conta Bookmark4u de uma conta Dolibarr
 Module60Name=Adesivos
 Module60Desc=Gestão de adesivos
 Module70Desc=Gestor de Intervenções
@@ -435,13 +412,10 @@ Module105Name=Carteiro e SPIP
 Module105Desc=Carteiro ou Interface SPIP para Módulo MembroMailman or SPIP interface for member module
 Module200Desc=Sincronização de diretório LDAP
 Module240Name=Exportações de Dados
-Module240Desc=Ferramenta para exportar dados Dolibarr (com assistência)
 Module250Name=Importação de Dados
-Module250Desc=Ferramenta para importar dados para Dolibarr (com assistência)
 Module310Desc=Gestor de Associação de Membros
 Module320Desc=Adicionar um feed RSS às páginas do Dolibarr
 Module330Name=Marcadores e atalhos
-Module330Desc=Crie atalhos, sempre acessíveis, para as páginas internas ou externas às quais você acessa com frequência
 Module410Desc=Integração do Webcalendar
 Module500Name=Impostos e Despesas Especiais
 Module520Desc=Gestão dos empréstimos
@@ -498,7 +472,6 @@ Module60000Desc=Módulo para gerenciar comissão
 Module63000Desc=Gerenciar recursos (impressoras, carros, salas, ...) para alocar eventos
 Permission11=Ler Faturas de Clientes
 Permission12=Criar/Modificar Faturas de Clientes
-Permission13=Faturas de Clientes Não-Validadas
 Permission14=Faturas de Clientes Validadas
 Permission15=Enviar Faturas de Clientes por E-Mail
 Permission16=Criar Pagamentos para Faturas de Clientes
@@ -576,9 +549,6 @@ Permission182=Criar/modificar pedidos
 Permission183=Validar pedidos
 Permission184=Aprovar pedidos
 Permission185=Encomendar ou cancelar pedidos
-Permission186=Receber ordens de compra
-Permission187=Fechar ordens de compra
-Permission188=Cancelar pedidos de compra
 Permission192=Criar Linhas
 Permission193=Cancelar Linhas
 Permission194=Leia as linhas de largura de banda
@@ -621,10 +591,8 @@ Permission283=Deletar Contatos
 Permission286=Exportar Contatos
 Permission291=Ler Tarifas
 Permission292=Definir Permissões das Tarifas
-Permission293=Modificar as tarifas do cliente
 Permission300=Ler códigos de barras
 Permission301=Criar/modificar códigos de barras
-Permission302=Excluir códigos de barras
 Permission311=Ler Serviços
 Permission312=Atribuir Serviço no Contrato
 Permission331=Ler Marcadores de Página
@@ -644,7 +612,7 @@ Permission402=Criar/Modificar Descontos
 Permission403=Validar Descontos
 Permission404=Excluir Descontos
 Permission430=Use a barra de depuração
-Permission517=Salários de exportação
+Permission519=Salários de exportação
 Permission520=Leia Empréstimos
 Permission522=Criar / modificar empréstimos
 Permission524=Excluir empréstimos
@@ -675,8 +643,6 @@ Permission1004=Ler Movimentação de Estoque
 Permission1005=Criar/Modificar Movimentação de Estoque
 Permission1101=Ler recibos de entrega
 Permission1102=Criar / alterar recibos de entrega
-Permission1104=Validar recibos de entrega
-Permission1109=Excluir recibos de entrega
 Permission1121=Leia propostas de fornecedores
 Permission1122=Criar / modificar propostas de fornecedores
 Permission1123=Validar propostas de fornecedores
@@ -696,15 +662,12 @@ Permission1201=Conseguir Resultado de uma Exportação
 Permission1202=Criar/Modificar uma Exportação
 Permission1231=Ler faturas de fornecedores
 Permission1232=Criar/modificar faturas de fornecedores
-Permission1233=Validar faturas de fornecedores
 Permission1234=Excluir faturas de fornecedores
 Permission1235=Enviar faturas de fornecedores por e-mail
 Permission1236=Exportar faturas, atributos e pagamentos do fornecedor
-Permission1237=Exportar ordens de compra e seus detalhes
 Permission1251=Rodar(run) Importações Massivas de Dados Externos para o Banco de Dados (carregamento de dados)
 Permission1321=Exportar Faturas de Clientes, Atributos e Pagamentos
 Permission1322=Reabrir uma nota paga
-Permission1421=Exportar ordens de venda e atributos
 Permission2401=Ler ações (eventos ou tarefas) vinculadas à sua conta de usuário (se o proprietário do evento ou apenas tiver sido atribuído a)
 Permission2402=Criar / modificar ações (eventos ou tarefas) vinculadas à sua conta de usuário (se for proprietário do evento)
 Permission2403=Excluir ações (eventos ou tarefas) vinculadas à sua conta de usuário (se for proprietário do evento)
@@ -738,7 +701,6 @@ Permission23001=Ler Tarefas Agendadas
 Permission23002=Criar/Atualizar Tarefas Agendadas
 Permission23003=Excluir Tarefas Agendadas
 Permission23004=Executar Tarefas Agendadas
-Permission50101=Use o Ponto de Venda
 Permission50201=Ler Transações
 Permission50202=Importar Transações
 Permission50401=Vincular produtos e faturas com contas contábeis
@@ -796,9 +758,7 @@ SetupSaved=Configurações Salvas
 SetupNotSaved=Configuração não salva
 BackToModuleList=Voltar à lista do módulo
 BackToDictionaryList=Voltar à lista de dicionários
-VATManagement=Gestão de impostos sobre vendas
 VATIsUsedDesc=Por padrão, ao criar prospectos, faturas, pedidos etc., a taxa do imposto sobre vendas segue a regra padrão ativa: <br> Se o vendedor não estiver sujeito ao imposto sobre vendas, o imposto sobre vendas será padronizado como 0. Fim da regra. <br> Se o (país do vendedor = país do comprador), o imposto sobre vendas, por padrão, é igual ao imposto sobre vendas do produto no país do vendedor. Fim de regra. <br> Se o vendedor e o comprador estiverem na Comunidade Europeia e os bens forem produtos relacionados a transporte (transporte, transporte aéreo, companhia aérea), o IVA padrão é 0. Essa regra depende do país do vendedor - consulte seu contador. O IVA deve ser pago pelo comprador à estância aduaneira do seu país e não ao vendedor. Fim de regra. <br> Se o vendedor e o comprador estiverem ambos na Comunidade Europeia e o comprador não for uma empresa (com um número de IVA intracomunitário registrado), o IVA será padronizado para a taxa de IVA do país do vendedor. Fim de regra. <br> Se o vendedor e o comprador estiverem ambos na Comunidade Europeia e o comprador for uma empresa (com um número de IVA intracomunitário registrado), o IVA será 0 por padrão. Fim de regra. <br> Em qualquer outro caso, o padrão proposto é imposto sobre vendas = 0. Fim de regra.
-VATIsNotUsedDesc=Por padrão, o imposto sobre vendas proposto é 0, que pode ser usado para casos como associações, indivíduos ou pequenas empresas.
 VATIsUsedExampleFR=Na França, significa empresas ou organizações que possuem um sistema fiscal real (real simplificado, real ou normal). Um sistema no qual o IVA é declarado.
 VATIsNotUsedExampleFR=Na França, isso significa associações que não são declaradas em impostos sobre vendas ou empresas, organizações ou profissões liberais que escolheram o sistema fiscal de microempresas (imposto sobre vendas em franquia) e pagaram uma taxa de vendas de franquia sem qualquer declaração de imposto sobre vendas. Essa opção exibirá a referência "Imposto sobre vendas não aplicável - art-293B do CGI" nas faturas.
 TypeOfSaleTaxes=Tipo de imposto sobre vendas
@@ -854,7 +814,6 @@ MessageOfDay=Mensagem do dia
 MessageLogin=Mensagem da página de login
 LoginPage=Página de login
 PermanentLeftSearchForm=Formulário permanente de pesquisa no menu esquerdo
-DefaultLanguage=Idioma padrão
 EnableShowLogo=Mostrar o logotipo da empresa no menu
 CompanyInfo=Empresa / Organização
 CompanyIds=Identidades da empresa / organização
@@ -870,19 +829,10 @@ BankModuleNotActive=O módulo de contas bancárias não está habilitado
 ShowBugTrackLink=Mostrar link "<strong>%s</strong>"
 DelaysOfToleranceBeforeWarning=Atraso antes de exibir um alerta de aviso para:
 DelaysOfToleranceDesc=Defina o atraso antes de um ícone de alerta %s ser mostrado na tela para o elemento final.
-Delays_MAIN_DELAY_ACTIONS_TODO=Eventos planejados (eventos da agenda) não concluídos
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Projeto não fechado a tempo
 Delays_MAIN_DELAY_TASKS_TODO=Tarefa planejada (tarefas do projeto) não concluídas
 Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Encomenda não processada
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Pedido de compra não processado
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Proposta não fechada
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposta não faturada
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Serviço para ativar
-Delays_MAIN_DELAY_RUNNING_SERVICES=Serviço expirado
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Fatura de fornecedor não paga
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Fatura de cliente não paga
 Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Conciliação bancária pendente
-Delays_MAIN_DELAY_MEMBERS=Taxa de adesão atrasada
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Cheque depósito não feito
 Delays_MAIN_DELAY_EXPENSEREPORTS=Relatório de despesas para aprovar
 Delays_MAIN_DELAY_HOLIDAYS=Solicitações de Licenças para aprovar
@@ -900,7 +850,6 @@ LogEventDesc=Ative o registro para eventos de segurança específicos. Administr
 AreaForAdminOnly=Os parâmetros de configuração só podem ser definidos pelos <b>usuários administradores</b>.
 SystemInfoDesc=Informações do sistema está faltando informações, técnicas você consegue em modo de leitura e é visivel somente para administradores.
 SystemAreaForAdminOnly=Esta área está disponível apenas para usuários administradores. As permissões de usuário do Dolibarr não podem alterar essa restrição.
-CompanyFundationDesc=Edite as informações da sua empresa / organização. Clique no botão "%s" na parte inferior da página quando terminar.
 AccountantDesc=Se você tiver um contador / contador externo, poderá editar aqui suas informações.
 AccountantFileNumber=Código do contador
 DisplayDesc=Parâmetros afetando a aparência e o comportamento do Dolibarr podem ser modificados aqui.
@@ -912,7 +861,6 @@ TriggerDisabledByName=Triggers neste arquivo estão desativados pelo sufixo <b>-
 TriggerDisabledAsModuleDisabled=Triggers neste arquivo está desabilitado assim como o módulo <b>%s</b> está desabilitado.
 TriggerAlwaysActive=Triggers neste arquivo está sempre ativo, não importando os módulos ativos no Dolibarr.
 TriggerActiveAsModuleActive=Triggers neste arquivo são ativos quando módulo <b>%s</b> está ativado.
-GeneratedPasswordDesc=Escolha o método a ser usado para senhas geradas automaticamente.
 DictionaryDesc=Inserir todos os dados de referência. Você pode adicionar seus valores ao padrão.
 ConstDesc=Esta página permite editar (substituir) parâmetros não disponíveis em outras páginas. Estes são parâmetros reservados principalmente para desenvolvedores / solução de problemas avançados.
 MiscellaneousDesc=Todos os outros parâmetros relacionados com a segurança são definidos aqui.
@@ -929,16 +877,13 @@ SeeLocalSendMailSetup=Ver sua configuração local de envio de correspondência
 BackupDesc=Um backup <b>completo</b> de uma instalação do Dolibarr requer duas etapas.
 BackupDesc2=Faça backup do conteúdo do diretório "documentos" (<b>%s</b>) que contém todos os arquivos carregados e gerados. Isso também incluirá todos os arquivos de despejo gerados na Etapa 1. Essa operação pode durar vários minutos.
 BackupDesc3=Faça backup da estrutura e do conteúdo do banco de dados ( <b>%s</b> ) em um arquivo de despejo. Para isso, você pode usar o assistente a seguir.
-BackupDescX=O diretório arquivado deve ser armazenado em um local seguro.
 BackupDescY=O arquivo de despeja gerado deverá ser armazenado em um local seguro.
 RestoreDesc=Para restaurar um backup Dolibarr, duas etapas são necessárias.
 RestoreDesc2=Restaure o arquivo de backup (arquivo zip, por exemplo) do diretório "documents" para uma nova instalação do Dolibarr ou para o diretório atual de documentos ( <b>%s</b> ).
 RestoreDesc3=Restaure a estrutura do banco de dados e os dados de um arquivo de despejo de backup no banco de dados da nova instalação do Dolibarr ou no banco de dados desta instalação atual ( <b>%s</b> ). Atenção, assim que a restauração for concluída, você deverá usar um login / senha, que existiu a partir do momento / instalação do backup para se conectar novamente. <br> Para restaurar um banco de dados de backup nesta instalação atual, você pode seguir este assistente.
 RestoreMySQL=Importar MySQL
 ForcedToByAModule=Essa Regra é forçada para <b>%s</b> by um módulo ativado
-PreviousDumpFiles=Arquivos de backup existentes
 PreviousArchiveFiles=Arquivos existentes
-WeekStartOnDay=Primeiro dia da semana
 RunningUpdateProcessMayBeRequired=A execução do processo de atualização parece ser necessária (a versão do programa %s é diferente da versão do banco de dados %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Você deve rodar esse comando na linha de comando (CLI) depois de logar no shell com o usuário <b>%s</b> ou você deve adicionar a opção -W no final da linha de comando para fornecer a senha <b>%s</b>.
 YourPHPDoesNotHaveSSLSupport=Função SSL functions não está disponível no seu PHP
@@ -954,9 +899,7 @@ ProxyDesc=Algumas características do Dolibarr requerem acesso à Internet. Defi
 ExternalAccess=Acesso Externo/Internet
 MAIN_PROXY_USE=Use um servidor proxy (caso contrário, o acesso é direto à internet)
 MAIN_PROXY_HOST=Servidor proxy: nome/endereço
-MAIN_PROXY_PORT=Servidor proxy: porta
 MAIN_PROXY_USER=Servidor Proxy: Login/Usuário
-MAIN_PROXY_PASS=Servidor proxy: senha
 DefineHereComplementaryAttributes=Defina aqui quaisquer atributos adicionais/personalizados que você deseja incluir: %s
 ExtraFieldsLinesRec=Atributos complementares (linhas dos temas das faturas)
 ExtraFieldsSupplierOrdersLines=Atributos complementares (linhas de encomenda)
@@ -996,11 +939,8 @@ AddAdressInList=Exibir lista de informações de endereço do cliente / forneced
 FillThisOnlyIfRequired=Exemplo: +2 (Preencha somente se compensar o problema do timezone é experiente)
 NumberingModules=Modelos de numeração
 DocumentModules=Modelos de documentos
-PasswordGenerationStandard=Retorna uma senha gerara de acordo com o algorítimo interno do Dolibarr: 8 caracteres contendo números e letras em letras minusculas.
 PasswordGenerationPerso=Retornar uma senha de acordo com a configuração definida para a sua personalidade.
 PasswordPatternDesc=Descrição do padrão de senha
-RuleForGeneratedPasswords=Regras para gerar e validar senhas
-DisableForgetPasswordLinkOnLogonPage=Não mostrar o link "Senha esquecida" na página de login
 UsersSetup=Configurações de módulo de usuários
 UserMailRequired=O e-mail é necessário para criar um novo usuário
 UserHideInactive=Ocultar usuários inativos de todas as listas combinadas de usuários (não recomendado: isso pode significar que você não poderá filtrar ou pesquisar usuários antigos em algumas páginas)
@@ -1008,7 +948,6 @@ UsersDocModules=Modelos de documentos para documentos gerados a partir do regist
 GroupsDocModules=Modelos de documentos para documentos gerados a partir de um registro de grupo
 HRMSetup=Configuração do módulo RH
 CompanySetup=Configurações de módulo das empresas
-CompanyCodeChecker=Opções para geração automática de códigos de cliente / fornecedor
 AccountCodeManager=Opções para geração automática de códigos contábeis de clientes / fornecedores
 NotificationsDesc=As notificações por e-mail podem ser enviadas automaticamente para alguns eventos do Dolibarr. <br> Destinatários de notificações podem ser definidos:
 NotificationsDescUser=* por usuário, um usuário por vez.
@@ -1028,7 +967,6 @@ BillsNumberingModule=Faturas e notas de crédito no modelo de numeração
 BillsPDFModules=Modelos de documentos da fatura
 PaymentsPDFModules=Modelos dos documentos de pagamento
 ForceInvoiceDate=Forçar data de fatura para data de validação
-SuggestedPaymentModesIfNotDefinedInInvoice=Modo de pagamento sugerido na fatura por padrão, se não estiver definido na fatura
 SuggestPaymentByRIBOnAccount=Sugerir pagamento por retirada na conta
 SuggestPaymentByChequeToAddress=Sugerir pagamento por cheque para
 FreeLegalTextOnInvoices=Texto livre nas fatura
@@ -1052,7 +990,6 @@ BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Informar conta bancária de desti
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Solicitar Fonte de Armazenagem para o pedido
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Pedir destino da conta bancária da ordem de compra
 SuggestedPaymentModesIfNotDefinedInOrder=Modo de pagamentos sugeridos no pedido de venda por padrão, se não definido no pedido
-OrdersSetup=Configuração de gerenciamento de pedidos de vendas
 OrdersNumberingModules=modelos de numeração de pedidos
 OrdersModelModule=Modelos de documentos de pedidos
 FreeLegalTextOnOrders=Texto livre em pedidos
@@ -1086,7 +1023,6 @@ LDAPSynchronizeMembers=Organização dos membros da fundação em LDAP
 LDAPSynchronizeMembersTypes=Organização dos tipos de membro da fundação no LDAP
 LDAPPrimaryServer=Servidor primário
 LDAPSecondaryServer=Servidor secundário
-LDAPServerPortExample=Porta padrão: 389
 LDAPServerUseTLS=Usuário TLS
 LDAPServerUseTLSExample=Seu servidor LDAP usa TLS
 LDAPAdminDn=Administrador DN
@@ -1128,14 +1064,7 @@ LDAPTCPConnectOK=Conexão TCP para o servidor LDAP foi um sucesso (Servidor=%s,
 LDAPTCPConnectKO=Conexão TCP para o servidor LDAP falhou (Servidor=%s, Porta=%s)
 LDAPSetupForVersion3=Servidor LDAP configurado para versão 3
 LDAPSetupForVersion2=Servidor LDAP configurado para versão 2
-LDAPFieldLoginExample=Exemplo: uid
 LDAPFilterConnectionExample=Exemplo: &(objectClass = inetOrgPerson)
-LDAPFieldLoginSambaExample=Exemplo: samaccountname
-LDAPFieldFullnameExample=Exemplo: cn
-LDAPFieldPasswordExample=Exemplo: userPassword
-LDAPFieldCommonNameExample=Exemplo: cn
-LDAPFieldNameExample=Exemplo: sn
-LDAPFieldFirstNameExample=Exemplo: givenName
 LDAPFieldMail=E-Mail
 LDAPFieldMailExample=Exemplo: mail
 LDAPFieldPhone=Telefone profissional
@@ -1145,19 +1074,14 @@ LDAPFieldHomePhoneExample=Exemplo: homephone
 LDAPFieldMobile=Celular
 LDAPFieldMobileExample=Exemplo: mobile
 LDAPFieldFax=Fax
-LDAPFieldFaxExample=Exemplo: facsimiletelephonenumber
 LDAPFieldAddress=Endereço
 LDAPFieldAddressExample=Exemplo: street
 LDAPFieldZip=CEP
 LDAPFieldZipExample=Exemplo: postalcode
 LDAPFieldTown=Município
-LDAPFieldTownExample=Exemplo: l
 LDAPFieldDescriptionExample=Exemplo: description
 LDAPFieldNotePublicExample=Exemplo: publicnote
 LDAPFieldGroupMembers=Membros de grupo
-LDAPFieldGroupMembersExample=Exemplo: uniqueMember
-LDAPFieldCompanyExample=Exemplo: o
-LDAPFieldSidExample=Exemplo: objectsid
 LDAPFieldEndLastSubscription=Data do término de inscrição
 LDAPFieldTitleExample=Exemplo: Título
 LDAPFieldGroupid=ID do grupo
@@ -1209,8 +1133,6 @@ SyslogOutput=Saídas de logs
 SyslogFilename=Nome do arquivo e caminho
 YouCanUseDOL_DATA_ROOT=Você pode usar DOL_DATA_ROOT/dolibarr.log para um arquivo de log no diretório dos "documentos" do Dolibarr.
 ErrorUnknownSyslogConstant=A Constante %s não é conhecida pelas constantes do Syslog
-OnlyWindowsLOG_USER=Somente Windows suporta LOG_USER
-SyslogFileNumberOfSaves=Backups de log
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configurar o trabalho agendado de limpeza para definir a frequência de backup de log
 DonationsSetup=Configurações do módulo de doações
 DonationsReceiptModel=Templates de recibos de doação
@@ -1241,7 +1163,6 @@ MailingDelay=Segundos de espera antes do envio da mensagem seguinte
 NotificationSetup=Configuração do módulo de notificação por e-mail
 NotificationEMailFrom=E-mail do remetente (De) para e-mails enviados pelo módulo de Notificações
 FixedEmailTarget=Destinatário
-SendingsSetup=Configuração do módulo de envio
 SendingsReceiptModel=Modelo de recibo do envio
 SendingsNumberingModules=Módulos de númeração de envios
 SendingsAbility=Suporte para folhas de envios, para entregas de cliente
@@ -1253,7 +1174,6 @@ FreeLegalTextOnDeliveryReceipts=Texto livre em recibos de entregas
 ActivateFCKeditor=Editor avançado ativo por:
 FCKeditorForCompany=Criação/edição do WYSIWIG nas descrições de elementos e nota (exceto produtos/serviços)
 FCKeditorForProduct=Criação/edição do WYSIWIG nas descrições de  produtos/serviços e nota
-FCKeditorForProductDetails=WYSIWIG criação / edição de produtos detalha linhas para todas as entidades (propostas, pedidos, faturas, etc ...). <font class="warning">Aviso: O uso desta opção para este caso não é recomendado, pois pode criar problemas com caracteres especiais e formatação de página ao criar arquivos PDF.</font>
 FCKeditorForMailing=Criação/edição do WYSIWIG nos E-Mails massivos (ferramentas->emailing)
 FCKeditorForUserSignature=criação/edição do WYSIWIG nas assinaturas de usuários
 FCKeditorForMail=Criação/Edição WYSIWIG para todos os e-mails (exceto Ferramentas->eMailing)
@@ -1262,7 +1182,6 @@ StockSetup=Configuração do módulo de estoque
 MenuDeleted=Menu Deletado
 NotTopTreeMenuPersonalized=Menus personalizados não conectados à uma entrada do menu superior
 NewMenu=Novo Menu
-Menu=Seleção de menus
 MenuModule=Fonte do módulo
 HideUnauthorizedMenu=Esconder menus não autorizados (cinza)
 DetailId=Menu ID
@@ -1295,14 +1214,11 @@ AccountancyCodeBuy=Código de contas de compras
 AgendaSetup=Configurações do módulo de eventos e agenda
 PasswordTogetVCalExport=Chave para autorizar exportação do link
 PastDelayVCalExport=Não exportar eventos antigos de
-AGENDA_REMINDER_EMAIL=Ativar lembrete de evento <b> por e-mails </b> (A opção de lembrar / atraso pode ser definida em cada evento). Nota: Módulo <strong> 1 %s </strong> deve ser habilitado e configurado corretamente para que o lembrete seja enviado na freqüência correta.
-AGENDA_REMINDER_BROWSER=Ativar lembrete de evento <b>no navegador do usuário</b> (quando a data do evento é atingida, cada usuário pode recusar isso da pergunta de confirmação do navegador)
 AGENDA_REMINDER_BROWSER_SOUND=Habilitar a notificação sonora
 AGENDA_SHOW_LINKED_OBJECT=Exibir objeto conectado na visualização da agenda
 ClickToDialSetup=Configurações do módulo clique para discar
 ClickToDialUrlDesc=URL chamada quando clica-se no ícone do telefone.  Na URL, você pode usar as tags<br><b>__PHONETO__</b> que será substituída pelo número do telefone da pessoa a chamar<br><b>__PHONEFROM__</b> que será substituída pelo telefone da pessoa que está chamando (o seu)<br><b>__LOGIN__</b> que será substituída pelo login clicktodial (definido no cartão do usuário)<br><b>__PASS__</b> que será substituída pela senha clicktodial (definida no cartão do usuário).
 ClickToDialUseTelLink=Use apenas o link "tel." para os números de telefone
-CashDeskSetup=Configuração do módulo de ponto de vendas
 CashDeskBankAccountForSell=Conta default para usar nos pagamentos em dinheiro
 CashDeskBankAccountForCheque=Conta padrão a ser usada para receber pagamentos por cheque
 CashDeskBankAccountForCB=Conta default para usar nos pagamentos em cartão de crédito
@@ -1337,7 +1253,6 @@ SuppliersSetup=Configuração do módulo de fornecedor
 SuppliersCommandModel=Modelo completo do pedido
 SuppliersCommandModelMuscadet=Modelo completo do pedido (antiga implementação do modelo Cornas)
 SuppliersInvoiceModel=Modelo completo da fatura do fornecedor
-SuppliersInvoiceNumberingModel=Modelos de numeração de faturas de fornecedores
 IfSetToYesDontForgetPermission=Se definido como um valor não nulo, não se esqueça de fornecer permissões a grupos ou usuários com permissão para a segunda aprovação
 GeoIPMaxmindSetup=Configurações do módulo GeoIP Maxmind
 NoteOnPathLocation=Nota que seu ip para o arquivo de dados do país deve estar dentro do diretório do seu PHP que possa ser lido (Verifique a configuração do seu PHP open_basedir e o sistema de permissões).
@@ -1366,7 +1281,6 @@ TypePaymentDesc=0: tipo de pagamento do cliente, 1: tipo de pagamento do fornece
 IncludePath=Incluir caminho (definido na variável %s)
 ExpenseReportsSetup=Configuração do módulo de Relatórios de Despesas
 TemplatePDFExpenseReports=Modelos de documentos para gerar despesa documento de relatório
-ExpenseReportsIkSetup=Configuração do módulo Relatórios de Despesas - Índice de quilometragem
 ExpenseReportsRulesSetup=Configuração do módulo Relatórios de Despesas - Regras
 ExpenseReportNumberingModules=Módulo de numeração dos relatórios de despesas
 NoModueToManageStockIncrease=Nenhum módulo disponível foi ativado para gerenciar o aumento automático do estoque. O aumento do estoque será feito apenas de forma manual.
@@ -1535,3 +1449,4 @@ RssNote=Nota: Cada definição de feed RSS fornece um widget que você deve ativ
 JumpToBoxes=Vá para Configuração -> Widgets
 MeasuringUnitTypeDesc=Use aqui um valor como "tamanho", "superfície", "volume", "peso", "tempo"
 MeasuringScaleDesc=A escala é o número de casas que você precisa mover a parte decimal para corresponder à unidade de referência padrão. Para o tipo de unidade "time", é o número de segundos. Valores entre 80 e 99 são valores reservados.
+DictionaryProductNature=Natureza do produto
diff --git a/htdocs/langs/pt_BR/banks.lang b/htdocs/langs/pt_BR/banks.lang
index 75ffdce9a29..8b5063b041d 100644
--- a/htdocs/langs/pt_BR/banks.lang
+++ b/htdocs/langs/pt_BR/banks.lang
@@ -27,6 +27,9 @@ IbanValid=Numero de conta bancária valida
 IbanNotValid=Numero de conta bancária inválida
 StandingOrders=Pedidos com Débito direto
 StandingOrder=Ordem de débito direto
+PaymentByDirectDebit=Pagamento por débito direto
+PaymentByBankTransfers=Pagamentos por transferência de crédito
+PaymentByBankTransfer=Pagamento por transferência de crédito
 AccountStatement=Extrato da conta
 AccountStatementShort=Extrato
 AccountStatements=Extratos da conta
diff --git a/htdocs/langs/pt_BR/categories.lang b/htdocs/langs/pt_BR/categories.lang
index 65fd3a7feca..fd9c6ce0047 100644
--- a/htdocs/langs/pt_BR/categories.lang
+++ b/htdocs/langs/pt_BR/categories.lang
@@ -27,7 +27,6 @@ WasAddedSuccessfully=Foi adicionado com êxito.
 ObjectAlreadyLinkedToCategory=Elemento já está ligada a esta tag / categoria.
 ProductIsInCategories=Produto / serviço está ligada à seguintes tags / categorias
 CompanyIsInCustomersCategories=Este Terceiro está vinculado às seguintes tags/categorias de Clientes/Prospects
-CompanyIsInSuppliersCategories=Este terceiro está vinculado às seguintes tags / categorias de fornecedores
 MemberIsInCategories=Esse membro está vinculado a seguintes membros tags / categorias
 ContactIsInCategories=Este contato é ligado à sequência de contatos tags / categorias
 ProductHasNoCategory=Este produto / serviço não está em nenhuma tags / categorias
@@ -43,14 +42,11 @@ ContentsNotVisibleByAllShort=Conteúdo não visivel por todos
 DeleteCategory=Excluir tag / categoria
 ConfirmDeleteCategory=Tem certeza que quer deleitar esta tag/categoria?
 NoCategoriesDefined=Nenhuma tag / categoria definida
-SuppliersCategoryShort=Tag / categoria de fornecedores
 CustomersCategoryShort=Clientes tag / categoria
 ProductsCategoryShort=Produtos tag / categoria
 MembersCategoryShort=Membros tag / categoria
-SuppliersCategoriesShort=Tags / categorias de fornecedores
 CustomersCategoriesShort=Clientes tags / categorias
 ProspectsCategoriesShort=Tag/categoria Prospecção
-CustomersProspectsCategoriesShort=Cust./Prosp. tags / categorias
 ProductsCategoriesShort=Produtos tags / categorias
 MembersCategoriesShort=Tag / categorias de Membros
 ContactCategoriesShort=Contatos tags / categorias
@@ -60,7 +56,6 @@ UsersCategoriesShort=Tags / categorias de usuários
 StockCategoriesShort=Tags / categorias de armazém
 ThisCategoryHasNoItems=Esta categoria não contém nenhum item.
 CategId=ID Tag / categoria
-CatSupList=Lista de tags / categorias de fornecedores
 CatCusList=Lista de cliente / perspectivas de tags / categorias
 CatProdList=Lista de produtos tags / categorias
 CatMemberList=Lista de membros tags / categorias
@@ -77,7 +72,4 @@ CategorieRecursivHelp=Se a opção estiver ativada, quando você adicionar um pr
 AddProductServiceIntoCategory=Adicione o seguinte produto / serviço
 ShowCategory=Mostrar tag / categoria
 ChooseCategory=Escolher categoria
-StocksCategoriesArea=Área categorias de armazéns
-ActionCommCategoriesArea=Área Categorias de Eventos
-WebsitePagesCategoriesArea=Área Categorias de Contêiner da Página
 UseOrOperatorForCategories=Use operador para categorias
diff --git a/htdocs/langs/pt_BR/companies.lang b/htdocs/langs/pt_BR/companies.lang
index 06c5fb31a72..8987f615bd7 100644
--- a/htdocs/langs/pt_BR/companies.lang
+++ b/htdocs/langs/pt_BR/companies.lang
@@ -15,7 +15,6 @@ ProspectionArea=Área de prospecção
 IdThirdParty=ID do terceiro
 IdCompany=ID da empresa
 IdContact=ID do contato
-ThirdPartyContacts=Contatos de terceiros
 ThirdPartyContact=Contato / endereço de terceiro
 AliasNames=Nome de fantasia (nome comercial, marca registrada etc.)
 AliasNameShort=Nome alternativo
@@ -23,12 +22,9 @@ CountryIsInEEC=País está dentro da Comunidade Econômica Européia
 PriceFormatInCurrentLanguage=Formato de apresentação do preço na linguagem atual e tipo de moeda
 ThirdPartyName=Nome do terceiro
 ThirdPartyEmail=E-mail do terceiro
-ThirdParty=Terceiro
-ThirdParties=Terceiros
 ThirdPartyProspects=Prospectos de cliente
 ThirdPartyProspectsStats=Prospectos de cliente
 ThirdPartyCustomersWithIdProf12=Clientes com %s ou %s
-ThirdPartyType=Tipo de terceiro
 Individual=Pessoa física
 ToCreateContactWithSameName=Irá automaticamente criar um contato/endereço com a mesma informação do terceiro. Na maioria dos casos, mesmo que o terceiro seja uma pessoa física, a criação de um único terceiro é suficiente.
 ParentCompany=Matriz
@@ -182,7 +178,6 @@ CapitalOf=Capital de %s
 EditCompany=Editar empresa
 ThisUserIsNot=Este usuário não é um cliente em potencial, cliente ou fornecedor
 VATIntraCheckDesc=O ID do IVA deve incluir o prefixo do país. O link <b>%s</b> usa o serviço europeu de verificação de IVA (VIES), que requer acesso à Internet do servidor Dolibarr.
-VATIntraCheckableOnEUSite=Verifique o ID do IVA intracomunitário no site da Comissão Europeia
 ErrorVATCheckMS_UNAVAILABLE=Verificação não é possível. Verifique o serviço não é necessário por um membro de estado (%s).
 NorProspectNorCustomer=Nem possivel cliente, nem cliente
 ProspectLevelShort=Pos. Cli.
@@ -212,11 +207,8 @@ ProspectsByStatus=Prospectos por status
 ContactNotLinkedToCompany=Contato não esta vinculado a nenhum terceiro
 NoDolibarrAccess=Sem acesso ao Dolibarr
 ExportDataset_company_1=Terceiros(Companhias/fundações/pessoas físicas) e suas propriedades
-ImportDataset_company_1=Terceiros e suas propriedades
 ImportDataset_company_2=Contatos/Enderecos adicionais e atributos de terceiros
-ImportDataset_company_3=Contas bancárias de terceiros
 ImportDataset_company_4=Vendedores de terceiros (assinalar vendedores/usuários para empresas)
-PriceLevel=Nível de preço
 PriceLevelLabels=Etiquetas de nível de preço
 DeliveryAddress=Endereço de entrega
 AddAddress=Adicionar endereço
@@ -235,6 +227,7 @@ SocialNetworksGithubURL=URL GitHub
 YouMustAssignUserMailFirst=Você deve criar um e-mail para este usuário antes de poder adicionar uma notificação por e-mail.
 YouMustCreateContactFirst=Para estar apto a adicionar notificações por e-mail, você deve primeiramente definir contatos com e-mails válidos para o terceiro
 ListSuppliersShort=Lista de fornecedores
+LastModifiedThirdParties=Últimos %s alterados por terceiros recentemente
 ActivityCeased=Inativo
 ThirdPartyIsClosed=O terceiro está fechado
 ProductsIntoElements=Lista de produtos/serviços em %s
diff --git a/htdocs/langs/pt_BR/ecm.lang b/htdocs/langs/pt_BR/ecm.lang
index 178f8b993fa..2e17c5b2760 100644
--- a/htdocs/langs/pt_BR/ecm.lang
+++ b/htdocs/langs/pt_BR/ecm.lang
@@ -16,16 +16,6 @@ ECMAreaDesc2=* As pastas automáticas são geradas automaticamente quando algum
 ECMSectionWasRemoved=A pasta <b>%s</b> foi eliminada
 ECMSearchByKeywords=Busca usando palavras chave
 ECMSearchByEntity=Busca por objeto
-ECMDocsBySocialContributions=Documentos ligados a impostos sociais ou fiscais
-ECMDocsByThirdParties=Documentos associados a fornecedores
-ECMDocsByProposals=Documentos associados a orçamentos
-ECMDocsByInvoices=Documentos associados a faturas do cliente
-ECMDocsByProjects=Documentos associados a projetos
-ECMDocsByUsers=Documentos relacionados a usuários
-ECMDocsByInterventions=Documentos ligados a intervenções
-ECMDocsByExpenseReports=Documentos vinculados a relatórios de despesas
-ECMDocsByHolidays=Documentos ligados a feriados
-ECMDocsBySupplierProposals=Documentos vinculados a propostas de fornecedores
 ShowECMSection=Exibir pasta
 DeleteSection=Apagar pasta
 ConfirmDeleteSection=Por favor confirmar a remocao do diretorio <b>%s</b>?
diff --git a/htdocs/langs/pt_BR/hrm.lang b/htdocs/langs/pt_BR/hrm.lang
index 45a48efed5e..e86f7afe095 100644
--- a/htdocs/langs/pt_BR/hrm.lang
+++ b/htdocs/langs/pt_BR/hrm.lang
@@ -5,3 +5,4 @@ DeleteEstablishment=Excluir estabelecimento
 ConfirmDeleteEstablishment=Tem certeza de que deseja excluir este estabelecimento?
 DictionaryPublicHolidays=RH - Licenças
 DictionaryDepartment=RH - Lista de departamentos
+DictionaryFunction=RH - Cargos
diff --git a/htdocs/langs/pt_BR/install.lang b/htdocs/langs/pt_BR/install.lang
index e013aa1b910..a36661873ec 100644
--- a/htdocs/langs/pt_BR/install.lang
+++ b/htdocs/langs/pt_BR/install.lang
@@ -5,9 +5,6 @@ ConfFileExists=O arquivo de configuração <b>conf.php</b> existe.
 ConfFileCouldBeCreated=O arquivo de configuração <b>conf.php</b> pôde ser criado.
 ConfFileIsWritable=O arquivo de configuração <b>conf.php</b> tem as permissões corretas.
 ConfFileMustBeAFileNotADir=O arquivo de configuração <b> %s </ b> deve ser um arquivo, não um diretório.
-PHPSupportCalendar=Este PHP suporta extensões de calendários.
-PHPSupportIntl=Este PHP suporta funções Intl.
-PHPSupportxDebug=Este PHP suporta funções de depuração estendidas.
 PHPSupport=Este PHP suporta funções %s.
 PHPMemoryOK=Seu parametro PHP max session memory está definido <b>para %s.</b> Isto deve ser suficiente.
 ErrorPHPDoesNotSupportCurl=Sua instalacao do PHP nao suporta Curl.
@@ -124,5 +121,6 @@ MigrationUserGroupRightsEntity=Atualizar o valor do campo da entidade de llx_use
 MigrationUserPhotoPath=Migração de caminhos de foto para usuários
 MigrationFieldsSocialNetworks=Migração de redes sociais dos campos de usuários (%s)
 MigrationResetBlockedLog=Redefinir o módulo BlockedLog para o algoritmo v7
+ClickOnLinkOrRemoveManualy=Se uma atualização estiver em andamento, aguarde. Caso contrário, clique no link a seguir. Se você sempre vir esta mesma página, deverá remover / renomear o arquivo install.lock no diretório de documentos.
 Loaded=Carregado
 FunctionTest=Teste de funcionamento
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index 16df49a3432..c0d7d0ed2ac 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -73,8 +73,6 @@ PasswordForgotten=Esqueceu a senha?
 NoAccount=Sem conta?
 SeeAbove=Mencionar anteriormente
 HomeArea=Inicio
-LastConnexion=Último login
-PreviousConnexion=Login anterior
 ConnectedOnMultiCompany=Conectado no ambiente
 AuthenticationMode=Modo de Autenticação
 RequestedUrl=URL solicitada
@@ -123,7 +121,6 @@ Hide=ocultar
 ShowCardHere=Mostrar cartão
 SearchMenuShortCut=Ctrl + Shift + F
 QuickAdd=Adição rápida
-Upload=Carregar
 Resize=Modificar tamanho
 ResizeOrCrop=Redimensionar ou cortar
 Recenter=Recolocar no centro
@@ -138,8 +135,6 @@ CurrentValue=Valor atual
 MultiLanguage=Multi Idioma
 RefOrLabel=Ref. da etiqueta
 DescriptionOfLine=Descrição da Linha
-DateOfLine=Data da linha
-DurationOfLine=Duração da linha
 Model=Template doc
 DefaultModel=Modelo de documento padrão
 Action=Ação
@@ -236,7 +231,6 @@ VATs=Impostos sobre vendas
 VATINs=Impostos IGST
 LT1Type=Tipo de imposto sobre vendas 2
 LT2Type=Tipo de imposto sobre vendas 3
-LT1GC=Centavos adicionais
 VATRate=Taxa ICMS
 VATCode=Codigo do ICMS
 VATNPR=Valor taxa NPR
@@ -244,7 +238,6 @@ DefaultTaxRate=Taxa de imposto padrão
 RemainToPay=Permanecer para pagar
 Module=Modulo/Aplicacao
 Modules=Módulos / Aplicações
-FullConversation=Conversa completa
 OtherStatistics=Outras estatisticas
 Favorite=Favorito
 RefSupplier=Ref. fornecedor
@@ -286,7 +279,6 @@ ApprovedBy2=Aprovado pelo (segunda aprovação)
 ClosedAll=Fechados(Todos)
 ByUsers=Pelo usuário
 LateDesc=Um item é definido como atrasado de acordo com a configuração do sistema no menu Início - Configuração - Alertas.
-NoItemLate=Nenhum item atrasado
 DeletePicture=Apagar foto
 ConfirmDeletePicture=Confirmar eliminação de fotografias
 LoginEmail=Usuario (e-mail)
@@ -320,7 +312,6 @@ SeeAll=Ver tudo
 SendByMail=Envio por e-mail
 MailSentBy=Mail enviado por
 Email=E-mail
-AlreadyRead=Já lido
 NoMobilePhone=Sem celular
 Refresh=Atualizar
 BackToList=Mostar Lista
@@ -366,11 +357,9 @@ CreditCard=Cartão de credito
 CreditOrDebitCard=Cartao de credito ou debito
 FieldsWithAreMandatory=Campos com <b>%s</b> são obrigatorios
 FieldsWithIsForPublic=Os campos com <b> %s </ b> são exibidos na lista pública de membros. Se você não quiser isso, desmarque a caixa "pública".
-AccordingToGeoIPDatabase=(de acordo com a conversão GeoIP)
 NotSupported=Não suportado
 RequiredField=Campo obrigatorio
 ValidateBefore=O item deve ser validado antes de usar este recurso
-Totalizable=Totalizável
 TotalizableDesc=Este campo é totalizável na lista
 Hidden=Escondido
 Resources=Resorsas
@@ -386,11 +375,9 @@ LinkToOrder=Linque para o pedido
 LinkToInvoice=Link para a fatura
 LinkToTemplateInvoice=Link para fatura modelo
 LinkToSupplierOrder=Link para Ordem de compra
-LinkToSupplierProposal=Link para a proposta do fornecedor
 LinkToSupplierInvoice=Link para a fatura do fornecedor
 LinkToContract=Link para o Contrato
 LinkToIntervention=Link para a Intervensão
-LinkToTicket=Link para o ticket
 SetToDraft=Voltar para modo rascunho
 ClickToRefresh=Clique para atualizar
 EditWithEditor=Editar com o CKEditor
@@ -429,6 +416,7 @@ ShowIntervention=Mostrar intervençao
 GoIntoSetupToChangeLogo=Vá para Home - Setup - Company para alterar o logotipo ou vá para Home - Setup - Display para ocultar.
 Denied=Negado
 Gender=Gênero
+Genderother=Outros
 ViewList=Exibição de lista
 ViewGantt=Visualização Gantt
 ViewKanban=Visualização Kanban
@@ -450,7 +438,6 @@ ClassifyBilled=Classificar Faturado
 ClassifyUnbilled=Classificar nao faturado
 FrontOffice=Frente do escritório
 BackOffice=Fundo do escritório
-Submit=Enviar
 View=Visão
 Exports=Exportações
 IncludeDocsAlreadyExported=Incluir documentos já exportados
@@ -475,7 +462,6 @@ ClickToShowHelp=Clique para mostrar ajuda de ajuda
 WebSiteAccounts=Conta do website
 TitleSetToDraft=Volte para o rascunho
 ConfirmSetToDraft=Tem certeza de que deseja voltar ao status de rascunho?
-EMailTemplates=Modelos de e-mail
 FileNotShared=Arquivo não compartilhado para público externo
 LeadOrProject=Chumbo | Projeto
 LeadsOrProjects=Leads | Projetos
@@ -502,6 +488,7 @@ SearchIntoCustomerOrders=Pedido de Venda
 SearchIntoSupplierProposals=Propostas de fornecedores
 SearchIntoContracts=Contratos
 SearchIntoCustomerShipments=Remessas do cliente
+SearchIntoVendorPayments=Pagamentos do fornecedor
 CommentLink=Comentarios
 CommentPage=Espaço para comentarios
 CommentDeleted=Comentário deletado
@@ -521,7 +508,6 @@ NoFilesUploadedYet=Por favor, carregue um doc. primeiro
 SeePrivateNote=Veja avisos privados
 PaymentInformation=Informações de Pagamento
 ValidFrom=Válido de
-ValidUntil=Válido até
 NoRecordedUsers=Sem Usuários
 ToClose=Para Fechar
 ToProcess=A processar
@@ -536,18 +522,13 @@ ContactDefault_order_supplier=Ordem de Compra
 ContactDefault_propal=Proposta
 ContactDefault_supplier_proposal=Proposta do Fornecedor
 ContactAddedAutomatically=Contato adicionado a partir de informações de terceiros
-More=Mais
-CustomReports=Relatórios personalizados
 StatisticsOn=Estatísticas sobre
 SelectYourGraphOptionsFirst=Selecione suas opções para criar um gráfico
-Measures=Medidas
-XAxis=Eixo X
-YAxis=Eixo Y
 StatusOfRefMustBe=O status de %s deve ser %s
 DeleteFileHeader=Confirmar exclusão de arquivo
 DeleteFileText=Deseja realmente excluir este arquivo?
-ShowOtherLanguages=Mostrar outros idiomas
 SwitchInEditModeToAddTranslation=Alterne modo de edição para adicionar traduções para este idioma
 NotUsedForThisCustomer=Não usado para este cliente
 AmountMustBePositive=O valor deve ser positivo
 ByStatus=Por status
+DateOfBirth=Data de nascimento
diff --git a/htdocs/langs/pt_BR/members.lang b/htdocs/langs/pt_BR/members.lang
index f78ff76914b..a85d5fdddf2 100644
--- a/htdocs/langs/pt_BR/members.lang
+++ b/htdocs/langs/pt_BR/members.lang
@@ -12,11 +12,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Outro membro  já está vinculado a u
 ErrorUserPermissionAllowsToLinksToItselfOnly=Por razões de segurança, você deve ter permissões para editar todos os usuários sejam capazes de ligar um membro a um usuário que não é seu.
 SetLinkToThirdParty=Link para um fornecedor Dolibarr
 MembersCards=Cartões de Membros
-MembersListUpToDate=Lista dos Membros válidos ao día de adesão
-MembersListNotUpToDate=Lista dos Membros válidos não ao día de adesão
 MembersListResiliated=Lista de membros encerrados
-MenuMembersUpToDate=Membros ao día
-MenuMembersNotUpToDate=Membros não ao día
 MenuMembersResiliated=Membros encerrados
 MembersWithSubscriptionToReceiveShort=Assinatura a receber
 DateSubscription=data filiação
@@ -46,7 +42,6 @@ SendCardByMail=Enviar cartão por e-mail
 NoTypeDefinedGoToSetup=nenhum tipo de membro definido. ir a configuração -> Tipos de Membros
 WelcomeEMail=Bem-vindo e-mail
 Physical=Físico
-MorPhy=Tipo de produto
 Reenable=Reativar
 ResiliateMember=Encerrar um membro
 ConfirmResiliateMember=Você tem certeza que deseja encerrar este membro?
diff --git a/htdocs/langs/pt_BR/mrp.lang b/htdocs/langs/pt_BR/mrp.lang
index ee398122b08..b35d3cbd228 100644
--- a/htdocs/langs/pt_BR/mrp.lang
+++ b/htdocs/langs/pt_BR/mrp.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - mrp
 Mrp=Ordens de fabricação
-MO=Ordem de fabricação
+ManufacturingOrder=Ordem de fabricação
 MRPDescription=Módulo para gerenciar ordens de produção e manufatura (MO).
 MRPArea=Area MRP
 MenuBOM=Lista de materiais
diff --git a/htdocs/langs/pt_BR/other.lang b/htdocs/langs/pt_BR/other.lang
index 365d053b4c9..2c7d8cbc922 100644
--- a/htdocs/langs/pt_BR/other.lang
+++ b/htdocs/langs/pt_BR/other.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - other
 Tools=Ferramentas
 Birthday=Aniversário
-DateToBirth=Data de nascimento
 BirthdayAlertOn=Alerta de aniversário ativo
 BirthdayAlertOff=Alerta de aniversário desativado
 PreviousMonthOfInvoice=Mês anterior (número 1-12) da data da fatura
diff --git a/htdocs/langs/pt_BR/paybox.lang b/htdocs/langs/pt_BR/paybox.lang
index 17e00f4c578..6ca0e914a67 100644
--- a/htdocs/langs/pt_BR/paybox.lang
+++ b/htdocs/langs/pt_BR/paybox.lang
@@ -15,7 +15,6 @@ AccountParameter=Parametros da conta
 UsageParameter=Parametros de uso
 InformationToFindParameters=Ajuda a buscar suas %s informaçoes da conta
 PAYBOX_CGI_URL_V2=URL do Paybox CGI modulo para pagamento
-VendorName=Nome do vendedor
 CSSUrlForPaymentForm=CSS style sheet URL para modelo de pagamento
 NewPayboxPaymentReceived=Novo pagamento recebido Paybox
 NewPayboxPaymentFailed=Novo pagamento Paybox tentou, mas não conseguiu
diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang
index c529c093c03..6f9b9ca7a94 100644
--- a/htdocs/langs/pt_BR/products.lang
+++ b/htdocs/langs/pt_BR/products.lang
@@ -63,16 +63,11 @@ NoteNotVisibleOnBill=Nota (não visivel em faturas, orçamentos etc.)
 MultiPricesAbility=Vários segmentos de preço por produto/serviço (cada cliente está em um segmento de preço)
 MultiPricesNumPrices=Número de preços
 DefaultPriceType=Base de preços por padrão (com ou sem impostos) ao adicionar novos preços de venda
-AssociatedProductsNumber=N� de produtos associados
 ParentProductsNumber=Numero de pacotes pais do produto
 ParentProducts=Produtos pai
-IfZeroItIsNotAVirtualProduct=Se 0, este produto não e produto virtual
-IfZeroItIsNotUsedByVirtualProduct=Se 0, este produto nao e usado por nenhum produto virtual
 KeywordFilter=Filtro por palavra-chave
 CategoryFilter=Filtro por categoria
 ListOfProductsServices=Lista de produtos/serviços
-ProductAssociationList=Lista dos produtos / serviços que são componente(s) deste produto / pacote virtual
-ProductParentList=Lista de produtos/servicos virtuais com este produto como componente
 ErrorAssociationIsFatherOfThis=Um dos produtos selecionados é pai do produto em curso
 ConfirmDeleteProduct=? Tem certeza que quer eliminar este produto/serviço?
 ConfirmDeleteProductLine=Tem certeza que quer eliminar esta linha de produto?
diff --git a/htdocs/langs/pt_BR/propal.lang b/htdocs/langs/pt_BR/propal.lang
index fbef3802933..637bc0f1179 100644
--- a/htdocs/langs/pt_BR/propal.lang
+++ b/htdocs/langs/pt_BR/propal.lang
@@ -34,7 +34,6 @@ RefProposal=Ref. Orçamento
 SendPropalByMail=Enviar Orçamento por E-mail
 DatePropal=Data da Proposta
 ValidityDuration=Validade da proposta
-CloseAs=Configurar status para
 SetAcceptedRefused=Configurar aceito/recusado
 AddToDraftProposals=Adicionar a projeto de proposta
 NoDraftProposals=Não há projetos de propostas
diff --git a/htdocs/langs/pt_BR/recruitment.lang b/htdocs/langs/pt_BR/recruitment.lang
index 15059d4cc8d..d6de9159ffa 100644
--- a/htdocs/langs/pt_BR/recruitment.lang
+++ b/htdocs/langs/pt_BR/recruitment.lang
@@ -5,3 +5,4 @@ RecruitmentAbout =Sobre o recrutamento
 RecruitmentAboutPage =Recrutamento sobre a página
 NbOfEmployeesExpected=Número esperado de funcionários
 JobLabel=Etiqueta do cargo
+PositionToBeFilled=Cargo
diff --git a/htdocs/langs/pt_BR/stocks.lang b/htdocs/langs/pt_BR/stocks.lang
index b99798f63a0..dd94641fec9 100644
--- a/htdocs/langs/pt_BR/stocks.lang
+++ b/htdocs/langs/pt_BR/stocks.lang
@@ -21,7 +21,6 @@ MovementId=ID de movimento
 StockMovementForId=ID de movimento %d
 StocksArea=Setor de armazenagem
 AllWarehouses=Todos os armazéns
-IncludeEmptyDesiredStock=Incluir também o estoque indefinido desejado
 IncludeAlsoDraftOrders=Incluir também projetos de pedidos
 NumberOfProducts=Número total de produtos
 LastMovement=Último movimento
@@ -78,8 +77,6 @@ DesiredStockDesc=Esta quantidade será usada para determinar o estoque a ser rep
 StockToBuy=Para encomendar
 Replenishment=Reposição
 ReplenishmentOrders=Pedidos de reposição
-VirtualDiffersFromPhysical=De acordo com as opções de estoque ele poderá aumentar/diminuir. Estoque físico e estoque virtual (+ físicas pedidos atuais) podem diferir
-UseVirtualStockByDefault=Usar o estoque virtual por padrão, ao invés do estoque físico, como política de estoque
 UseVirtualStock=Usar estoque virtual
 UsePhysicalStock=Usar estoque físico
 CurentlyUsingVirtualStock=Estoque virtual
@@ -119,7 +116,6 @@ inventoryOfWarehouse=Inventário para depósito: %s
 inventoryErrorQtyAdd=Erro: a quantidade é menor que zero
 SelectCategory=Filtro por categoria
 SelectFournisseur=Filtro de fornecedores
-INVENTORY_DISABLE_VIRTUAL=Produto virtual (kit): não diminua o estoque de um produto filho
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Os movimentos de estoque terão a data do estoque (em vez da data da validação do estoque)
 RecordedQty=Quant. gravada
 inventoryDeleteLine=Apagar linha
diff --git a/htdocs/langs/pt_BR/ticket.lang b/htdocs/langs/pt_BR/ticket.lang
index 24ce002657a..14a27fd797e 100644
--- a/htdocs/langs/pt_BR/ticket.lang
+++ b/htdocs/langs/pt_BR/ticket.lang
@@ -7,7 +7,6 @@ TicketDictType=Tickets - Tipos
 TicketDictCategory=Tickets - Grupos
 TicketDictSeverity=Tickets - Gravidades
 TicketDictResolution=Ticket - Resolução
-TicketTypeShortBUGHARD=Mau funcionamento do hardware
 TicketTypeShortHELP=Pedido de ajuda funcional
 TicketTypeShortISSUE=Questão, bug ou problema
 TicketTypeShortREQUEST=Solicitação de alteração ou aprimoramento
diff --git a/htdocs/langs/pt_BR/website.lang b/htdocs/langs/pt_BR/website.lang
index f6831fbc85d..44be6ab3faf 100644
--- a/htdocs/langs/pt_BR/website.lang
+++ b/htdocs/langs/pt_BR/website.lang
@@ -18,8 +18,6 @@ MediaFiles=Biblioteca de mídias
 AddWebsite=Adicionar site
 Webpage=Página WEB / container
 AddPage=Adicionar página / recipiente
-HomePage=Pagina inicial
-PageContainer=Página / recipiente
 PreviewOfSiteNotYetAvailable=Pré-visualização do seu site <strong>%s</strong> ainda não estão disponíveis. Você deve primeiro <strong>Importar um modelo de site completo</strong> ou apenas <strong>Adicionar uma página / contêiner</strong>
 RequestedPageHasNoContentYet=A página solicitada com id %s ainda não possui conteúdo ou o arquivo de cache .tpl.php foi removido. Edite o conteúdo da página para resolver isso.
 PageContent=Página / Contenair
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index 8037ba7cc8c..c94ba9653ef 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Padrão para o serviço
 DefaultForProduct=Padrão para o produto
 CantSuggest=Não pode sugerir
 AccountancySetupDoneFromAccountancyMenu=A maioria da configuração da contabilidade é efetuada a partir do menu %s
-ConfigAccountingExpert=Configuração do módulo "Contabilidade (avançada)"
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Registo em diário contabilístico
-Journaux=Diários
+Journals=Diários
 JournalFinancial=Diários financeiros
 BackToChartofaccounts=Voltar ao plano de contas
 Chartofaccounts=Gráfico de contas
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Conta dedicada atual
 AssignDedicatedAccountingAccount=Nova conta para atribuir
 InvoiceLabel=Etiqueta da fatura
@@ -33,8 +35,8 @@ OtherInfo=Outra informação
 DeleteCptCategory=Remover conta contabilistica do grupo
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status da jornalização
-AlreadyInGeneralLedger=Já foi registado nos diários contabilísticos
-NotYetInGeneralLedger=Ainda não é publicado em livros
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Grupo está vazio, verifique a configuração do grupo de contabilidade personalizado
 DetailByAccount=Mostrar detalhes por conta
 AccountWithNonZeroValues=Contas com valores diferentes de zero
@@ -43,7 +45,9 @@ CountriesInEEC=Países da CEE
 CountriesNotInEEC=Países não na CEE
 CountriesInEECExceptMe=Países na CEE, exceto %s
 CountriesExceptMe=Todos os países, exceto %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Principal conta contábil para clientes não definidos na configuração
 MainAccountForSuppliersNotDefined=Conta contábil principal para fornecedores não definidos na configuração
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=PASSO %s: Adicionar ou editar transações e gerar re
 
 AccountancyAreaDescClosePeriod=PASSO %s: Fechar período para que não seja possível modificar no futuro.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=Uma etapa obrigatória na configuração não foi concluída (o diário do código contábil não foi definido para todas as contas bancárias)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Selecione gráfico de contas ativo 
 ChangeAndLoad=Mudar e carregar
 Addanaccount=Adicione uma conta contabilística
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Mostrar conta contabilística
 ShowAccountingJournal=Mostrar diário contabilistico
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Conta contabilística sugerida
 MenuDefaultAccounts=Contas padrão
 MenuBankAccounts=Contas Bancárias
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Vinculação do relatório de despesas
 CreateMvts=Criar nova transação
 UpdateMvts=Modificação de uma transação
 ValidTransaction=Validar transação
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Livro Razão
+BookkeepingSubAccount=Subledger
 AccountBalance=Saldo da conta
 ObjectsRef=Ref de objeto de origem
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Desactivar a gravação direta de transação na conta
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Ativar exportação de rascunho em diário
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Diário de vendas
 ACCOUNTING_PURCHASE_JOURNAL=Diário de compras
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Conta contabilística de espera
 DONATION_ACCOUNTINGACCOUNT=Conta contabilística para registar donativos
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Por grupos predefinidos
 ByPersonalizedAccountGroups=Por grupos personalizados
 ByYear=por ano
 NotMatch=Não configurado
-DeleteMvt=Eliminar as linhas do Livro Razão
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Ano a apagar
 DelJournal=Diário a apagar
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=Isso excluirá a transação do razão (todas as linhas relacionadas à mesma transação serão excluídas)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Diário financeiro
 ExpenseReportsJournal=Diário de relatórios de despesas
 DescFinanceJournal=Diário financeiro incluindo todos os tipos de pagamentos por conta bancária
-DescJournalOnlyBindedVisible=Esta é uma visão do registro que está vinculada a uma conta contábil e pode ser registrada no Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Conta para efeitos de IVA não definido
 ThirdpartyAccountNotDefined=Conta para terceiros não definido
 ProductAccountNotDefined=Conta para o produto não definido
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Este diário já está a ser utilizado
 AccountingAccountForSalesTaxAreDefinedInto=Nota: A conta de contabilidade para imposto sobre vendas é definida no menu <b> %s </ b> - <b> %s </ b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Exportar o diário rascunho
@@ -326,6 +339,8 @@ Modelcsv_configurable=Exportar CSV configurável
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=ID de plano de contas
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index 185304a51ae..b2961d731ca 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -27,17 +27,19 @@ AvailableOnlyOnPackagedVersions=The local file for integrity checking is only av
 XmlNotFound=Ficheiro XML de integridade da aplicação não encontrado
 SessionId=Id. da Sessão
 SessionSaveHandler=Utilizador para guardar as sessões
-SessionSavePath=Session save location
+SessionSavePath=Local de salvamento da sessão
 PurgeSessions=Limpeza das sessões
 ConfirmPurgeSessions=Deseja mesmo limpar todas as sessões? Isto irá desassociar todos os utilizadores (exceto você).
 NoSessionListWithThisHandler=Salvar manipulador de sessão configurado no seu PHP não permite listar todas as sessões em execução.
 LockNewSessions=Bloquear novas ligações
-ConfirmLockNewSessions=Tem certeza de que deseja restringir qualquer nova conexão Dolibarr a si mesmo? Apenas o usuário <b> %s </ b> poderá se conectar depois disso.
+ConfirmLockNewSessions=Tem certeza de que deseja restringir qualquer nova ligação a Dolibarr a si mesmo? Apenas o utilizador<b> %s </b> poderá se conectar depois disso.
 UnlockNewSessions=Remover bloqueio de ligação
 YourSession=A sua sessão
-Sessions=Users Sessions
+Sessions=Sessões de usuários
 WebUserGroup=Utilizador/grupo do servidor da Web
-NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
+NoSessionFound=Sua configuração de PHP parece não permitir a listagem de sessões ativas. O diretório usado para salvar as sessões (<b> %s </b>) pode ser protegido (por exemplo, pelas permissões do sistema operacional ou pela diretiva open_basedir do PHP).
 DBStoringCharset=Conjunto de carateres  da base de dados para guardar os dados
 DBSortingCharset=Conjunto de carateres da base de dados para ordenar os dados
 HostCharset=Host charset
@@ -55,8 +57,8 @@ SetupArea=Configuração
 UploadNewTemplate=Carregar novo(s) modelo(s)
 FormToTestFileUploadForm=Formulário para testar o envio de ficheiro (de acordo com a configuração)
 IfModuleEnabled=Nota: sim, só é eficaz se o <b>módulo %s</b> estiver ativado
-RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
-RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
+RemoveLock=Remova / renomeie o arquivo <b> %s </b> se existir, para permitir o uso da ferramenta Atualizar / Instalar.
+RestoreLock=Restaure o arquivo <b> %s </b>, apenas com permissão de leitura, para desativar qualquer uso posterior da ferramenta Atualizar / Instalar.
 SecuritySetup=Configuração de segurança
 SecurityFilesDesc=Defina aqui opções relacionadas com a segurança de ficheiros carregados.
 ErrorModuleRequirePHPVersion=Erro, este módulo requer a versão %s ou superior do PHP
@@ -71,8 +73,8 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Se tiver um grande número de terceiros (> 100 000), pode aumentar a velocidade, configurando a constante COMPANY_DONOTSEARCH_ANYWHERE para 1 em Configuração->Outros. A procura depois será limitada para o início da sequência de carateres.
 UseSearchToSelectContactTooltip=Se você tiver grande número de contactos (> 100 000), você pode aumentar a velocidade, definindo a constante CONTACT_DONOTSEARCH_ANYWHERE para 1 em Configuração -> Outros. A pesquisa será então limitada ao início da sequência de caracteres.
 DelaiedFullListToSelectCompany=Aguarde até que uma tecla seja pressionada antes de carregar o conteúdo da lista de combinação de terceiros. <br> Isso pode aumentar o desempenho se você tiver um grande número de terceiros, mas é menos conveniente.
-DelaiedFullListToSelectContact=Aguarde até que uma tecla seja pressionada antes de carregar o conteúdo da lista de combinação de contatos. <br> Isso pode aumentar o desempenho se você tiver um grande número de contatos, mas for menos conveniente)
-NumberOfKeyToSearch=Number of characters to trigger search: %s
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
+NumberOfKeyToSearch=Número de caracteres para acionar a pesquisa: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
 NotAvailableWhenAjaxDisabled=Não está disponível quando o Ajax está desativado
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=No documento de um terceiro, pode escolher
 JavascriptDisabled=JavaScript desativado
 UsePreviewTabs=Utilizar separadores de pré-visualização
 ShowPreview=Mostrar pré-visualização
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Pré-visualização não disponível
 ThemeCurrentlyActive=Tema atualmente ativo
 CurrentTimeZone=Zona Horária PHP (servidor)
@@ -95,14 +98,14 @@ NextValueForInvoices=Valor seguinte (faturas)
 NextValueForCreditNotes=Valor seguinte (notas de crédito)
 NextValueForDeposit=Valor seguinte (entrada inicial)
 NextValueForReplacements=Valor seguinte (restituições)
-MustBeLowerThanPHPLimit=Note: your PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+MustBeLowerThanPHPLimit=Nota: sua configuração de PHP atualmente limita o tamanho máximo do arquivo para upload para <b> %s </b> %s, independentemente do valor deste parâmetro
 NoMaxSizeByPHPLimit=Nota: não está definido nenhum limite na sua configuração do PHP
 MaxSizeForUploadedFiles=Tamanho máximo para os ficheiros enviados (0 para rejeitar qualquer envio)
 UseCaptchaCode=Utilizar código gráfico (CAPTCHA) na página de iniciar a sessão
 AntiVirusCommand=Caminho completo para o comando de antivírus
-AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusCommandExample=Exemplo para ClamAv Daemon (requer clamav-daemon): / usr / bin / clamdscan <br> Exemplo para ClamWin (muito, muito lento): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
 AntiVirusParam= Mais parâmetros na linha de comando
-AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Exemplo para ClamAv Daemon: --fdpass <br> Exemplo para ClamWin: --database = "C: \\ Arquivos de Programas (x86) \\ ClamWin \\ lib"
 ComptaSetup=Configuração do módulo de "Contabilidade"
 UserSetup=Configuração e gestão dos utilizadores
 MultiCurrencySetup=Configuração da utilização de várias moedas
@@ -134,7 +137,7 @@ YouCanEditPHPTZ=Para definir um fuso horário PHP diferente (não obrigatório),
 HoursOnThisPageAreOnServerTZ=Atenção, ao contrário de outros ecrãs, as horas nesta página não estão no fuso horário local, mas sim no fuso horário do servidor.
 Box=Widget
 Boxes=Widgets
-MaxNbOfLinesForBoxes=Max. number of lines for widgets
+MaxNbOfLinesForBoxes=Máx. número de linhas para widgets
 AllWidgetsWereEnabled=Todos os widgets disponíveis estão habilitados
 PositionByDefault=Ordem predefinida
 Position=Posição
@@ -146,13 +149,13 @@ Language_en_US_es_MX_etc=Language (en_US, es_MX, ...)
 System=Sistema
 SystemInfo=Informação do Sistema
 SystemToolsArea=Área de ferramentas do sistema
-SystemToolsAreaDesc=This area provides administration functions. Use the menu to choose the required feature.
+SystemToolsAreaDesc=Esta área fornece funções de administração. Use o menu para escolher o recurso necessário.
 Purge=Limpar
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
+PurgeAreaDesc=Esta página permite excluir todos os arquivos gerados ou armazenados pelo Dolibarr (arquivos temporários ou todos os arquivos no diretório <b> %s </b>). Usar esse recurso normalmente não é necessário. Ele é fornecido como uma solução alternativa para usuários cujo Dolibarr é hospedado por um provedor que não oferece permissões para excluir arquivos gerados pelo servidor da web.
 PurgeDeleteLogFile=Eliminar os ficheiros de registo, incluindo <b>%s</b> definido para o módulo Syslog (não existe risco de perda de dados)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
+PurgeDeleteTemporaryFiles=Exclua todos os arquivos temporários (sem risco de perder dados). Nota: A exclusão é feita apenas se o diretório temporário foi criado 24 horas atrás.
 PurgeDeleteTemporaryFilesShort=Eliminar ficheiros temporários
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
+PurgeDeleteAllFilesInDocumentsDir=Exclua todos os arquivos do diretório: <b> %s </b>. <br> Isso excluirá todos os documentos gerados relacionados aos elementos (terceiros, faturas etc ...), arquivos carregados no módulo ECM, despejos de backup de banco de dados e arquivos temporários.
 PurgeRunNow=Limpar agora
 PurgeNothingToDelete=Nenhuma diretoria ou ficheiros para eliminar.
 PurgeNDirectoriesDeleted=<b>%s</b> ficheiros ou diretorias eliminadas.
@@ -165,16 +168,16 @@ Restore=Restaurar
 RunCommandSummary=A cópia de segurança foi iniciada com o seguinte comando
 BackupResult=Resultado da cópia de segurança
 BackupFileSuccessfullyCreated=Ficheiro de cópia de segurança gerado correctamente
-YouCanDownloadBackupFile=The generated file can now be downloaded
+YouCanDownloadBackupFile=O arquivo gerado agora pode ser baixado
 NoBackupFileAvailable=Sem ficheiros de cópias de segurança disponíveis
 ExportMethod=Método de exportação
 ImportMethod=Método de importação
 ToBuildBackupFileClickHere=Para criar um ficheiro de cópia de segurança, clique <a href="%s">aqui</a>.
-ImportMySqlDesc=To import a MySQL backup file, you may use phpMyAdmin via your hosting or use the mysql command from the Command line.<br>For example:
+ImportMySqlDesc=Para importar um arquivo de backup do MySQL, você pode usar phpMyAdmin através de sua hospedagem ou usar o comando mysql da linha de comando. <br> Por exemplo:
 ImportPostgreSqlDesc=Para importar um ficheiro de cópia de segurança, deve utilizar o comando pg_restore a partir da linha de comandos:
 ImportMySqlCommand=%s %s < ficheiro_copia_seguranca.sql
 ImportPostgreSqlCommand=%s %s ficheiro_copia_seguranca.sql
-FileNameToGenerate=Filename for backup:
+FileNameToGenerate=Nome de arquivo para backup:
 Compression=Compressão
 CommandsToDisableForeignKeysForImport=Comando para desactivar a chave exclusiva para a importação
 CommandsToDisableForeignKeysForImportWarning=Obrigatório, se pretender restaurar mais tarde o ficheiro dump de SQL
@@ -200,7 +203,7 @@ FeatureDisabledInDemo=Opção desativada em demo
 FeatureAvailableOnlyOnStable=Funcionalidade apenas disponível em versões estáveis ​​oficiais
 BoxesDesc=Widgets são componentes que mostram algumas informações que você pode adicionar para personalizar algumas páginas. Você pode escolher entre mostrar o widget ou não selecionando a página de destino e clicando em "Ativar" ou clicando na lixeira para desativá-la.
 OnlyActiveElementsAreShown=Só são mostrados os elementos de <a href="%s">módulos ativos</a>.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
+ModulesDesc=Os módulos / aplicativos determinam quais recursos estão disponíveis no software. Alguns módulos exigem que as permissões sejam concedidas aos usuários após a ativação do módulo. Clique no botão liga / desliga <span class="small valignmiddle"> %s </span> de cada módulo para habilitar ou desabilitar um módulo / aplicativo.
 ModulesMarketPlaceDesc=Pode encontrar mais módulos para descarregar noutros sites da internet...
 ModulesDeployDesc=Se as permissões em seu sistema de arquivos permitirem, você poderá usar essa ferramenta para implantar um módulo externo. O módulo ficará visível na aba <strong> %s </ strong>.
 ModulesMarketPlaces=Procurar aplicações/módulos externos
@@ -234,18 +237,18 @@ Required=Requerido
 UsedOnlyWithTypeOption=Utilizado apenas por algumas opções da agenda
 Security=Segurança
 Passwords=Palavras-passe
-DoNotStoreClearPassword=Encrypt passwords stored in database (NOT as plain-text). It is strongly recommended to activate this option.
-MainDbPasswordFileConfEncrypted=Encrypt database password stored in conf.php. It is strongly recommended to activate this option.
+DoNotStoreClearPassword=Criptografe as senhas armazenadas no banco de dados (NÃO como texto simples). É altamente recomendável ativar esta opção.
+MainDbPasswordFileConfEncrypted=Criptografe a senha do banco de dados armazenada em conf.php. É altamente recomendável ativar esta opção.
 InstrucToEncodePass=Para que a palavra passe seja codificada no ficheiro <b>conf.php</b>, substitua a linha <br><b>$dolibarr_main_db_pass="...";</b><br>por<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Para que a palavra passe seja descodificada no ficheiro <b>conf.php</b>, substitua a linha <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>por<br><b>$dolibarr_main_db_pass="%s";</b>
-ProtectAndEncryptPdfFiles=Protect generated PDF files. This is NOT recommended as it breaks bulk PDF generation.
+ProtectAndEncryptPdfFiles=Proteja arquivos PDF gerados. Isso NÃO é recomendado, pois interrompe a geração de PDF em massa.
 ProtectAndEncryptPdfFilesDesc=A proteção de um documento PDF faz com que este esteja disponível para ler e imprimir a partir de qualquer navegador. No entanto, a edição e cópia do documento deixam de ser possíveis. Nota: ao usar esta funcionalidade deixa de ser possível juntar documentos PDFs singulares num único documento PDF global.
 Feature=Funcionalidade
 DolibarrLicense=Licença
 Developpers=Programadores/colaboradores
-OfficialWebSite=Dolibarr official web site
+OfficialWebSite=Site oficial da Dolibarr
 OfficialWebSiteLocal=Website local (%s)
-OfficialWiki=Dolibarr documentation / Wiki
+OfficialWiki=Documentação Dolibarr / Wiki
 OfficialDemo=Demo online Dolibarr
 OfficialMarketPlace=Mercado externo oficial para os módulos/addons
 OfficialWebHostingService=Serviços de hospedagem na Web referenciados (hospedagem na Nuvem)
@@ -271,7 +274,7 @@ NoticePeriod=Período de aviso
 NewByMonth=Novo por mês
 Emails=Emails
 EMailsSetup=Configuração de emails
-EMailsDesc=Esta página permite que você sobrescreva seus parâmetros PHP padrão para o envio de e-mail. Na maioria dos casos no sistema operacional Unix / Linux, a configuração do PHP está correta e esses parâmetros são desnecessários.
+EMailsDesc=Esta página permite definir parâmetros ou opções para envio de e-mail.
 EmailSenderProfiles=Perfis do remetente de e-mails
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=Porta de SMTP/SMTPS (Por predefinição no php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=ID de SMTP (se o servidor de envio exigir autenticação)
 MAIN_MAIL_SMTPS_PW=Senha SMTP (se o servidor de envio exigir autenticação)
 MAIN_MAIL_EMAIL_TLS=Use criptografia TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Use a criptografia TLS (STARTTLS)
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use o DKIM para gerar assinatura de email
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Domínio de email para uso com o dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Nome do seletor do dkim
@@ -301,14 +305,14 @@ UserEmail=Email do utilizador
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Funcionalidade não disponivel em sistemas  Unix. Teste parâmetros sendmail localmente.
 FixOnTransifex=Fix the translation on the online translation platform of project
-SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslation=Se a tradução para este idioma não estiver completa ou você encontrar erros, pode corrigir isso editando os arquivos no diretório <b> langs / %s </b> e enviar sua alteração para www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Configuração do módulo
 ModulesSetup=Módulos/Aplicação - Configuração
 ModuleFamilyBase=Sistema
-ModuleFamilyCrm=Customer Relationship Management (CRM)
+ModuleFamilyCrm=Gerenciamento de relacionamento com o cliente (CRM)
 ModuleFamilySrm=Vendor Relationship Management (VRM)
-ModuleFamilyProducts=Product Management (PM)
+ModuleFamilyProducts=Gestão de Produto (PM)
 ModuleFamilyHr=Gestão de Recursos Humanos (HR)
 ModuleFamilyProjects=Projetos/Trabalho cooperativo
 ModuleFamilyOther=Outro
@@ -321,20 +325,20 @@ ModuleFamilyInterface=Interfaces com sistemas externos
 MenuHandlers=Gestores de menu
 MenuAdmin=Editor de menu
 DoNotUseInProduction=Não utilizar em ambiente de produção
-ThisIsProcessToFollow=Upgrade procedure:
+ThisIsProcessToFollow=Procedimento de atualização:
 ThisIsAlternativeProcessToFollow=Esta é uma configuração alternativa para processar manualmente:
 StepNb=Passo %s
-FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
-DownloadPackageFromWebSite=Download package (for example from the official web site %s).
-UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
+FindPackageFromWebSite=Encontre um pacote que forneça os recursos de que você precisa (por exemplo, no site oficial %s).
+DownloadPackageFromWebSite=Baixe o pacote (por exemplo, do site oficial %s).
+UnpackPackageInDolibarrRoot=Descompacte / descompacte os arquivos compactados no diretório do servidor Dolibarr: <b> %s </b>
 UnpackPackageInModulesRoot=Para implantar / instalar um módulo externo, descompacte / descompacte os arquivos empacotados no diretório do servidor dedicado aos módulos externos: <br> <b> %s </ b>
 SetupIsReadyForUse=A implantação do módulo está concluída. No entanto, você deve ativar e configurar o módulo em seu aplicativo acessando os módulos de configuração de página: <a href="%s"> %s </a>.
 NotExistsDirect=O diretório raiz alternativo não está definido para um diretório existente.<br>
 InfDirAlt=Desde a versão 3 do Dolibarr que é possível definir um diretório raiz alternativo. Isto permite que você consiga armazenar plug-ins e templates, num diretório dedicado.<br>Para tal basta criar um dirétorio na raiz do Dolibarr (ex: dedicado). <br>
 InfDirExample=<br>Depois declare-o no ficheiro <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>Se estas linhas estiverem comentadas com um "#", descomente-as removendo o caracter "#".
-YouCanSubmitFile=You can upload the .zip file of module package from here:
+YouCanSubmitFile=Você pode fazer upload do arquivo .zip do pacote do módulo aqui:
 CurrentVersion=Versão atual do Dolibarr
-CallUpdatePage=Browse to the page that updates the database structure and data: %s.
+CallUpdatePage=Navegue até a página que atualiza a estrutura e os dados do banco de dados: %s.
 LastStableVersion=Última versão estável
 LastActivationDate=Última data de ativação
 LastActivationAuthor=Autor mais recente de ativação
@@ -358,7 +362,7 @@ ErrorCantUseRazIfNoYearInMask=Erro, não pode usar a opção @ para repor o cont
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Erro, não pode usar a opção @ se a sequência {yy}{mm} ou {yyyy}{mm} não se encontra na máscara definida.
 UMask=Parâmetro UMask de novos ficheiros em sistemas Unix/Linux/BSD/macOS.
 UMaskExplanation=Este parâmetro permite definir permissões usadas por omissão em ficheiros criados pelo Dolibarr no servidor (durante o carregamento, por exemplo).<br>Este deve ter o valor octal (por exemplo, 0666 significa permissão de leitura/escrita para todos).<br>Este parâmetro não tem nenhum efeito sobre um servidor Windows.
-SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
+SeeWikiForAllTeam=Dê uma olhada na página Wiki para obter uma lista de contribuidores e suas organizações
 UseACacheDelay= Atraso, em segundos, para o caching de exportação (0 ou em branco para não criar cache)
 DisableLinkToHelpCenter=Ocultar hiperligação <b>"Precisa de ajuda ou apoio"</b> na página de inicio de sessão
 DisableLinkToHelp=Ocultar a hiperligação para a ajuda on-line "<b>%s</b>"
@@ -375,27 +379,27 @@ ExampleOfDirectoriesForModelGen=Exemplos de sintaxe: <br>c:\\mydir<br>/home/mydi
 FollowingSubstitutionKeysCanBeUsed=<br>Para saber como criar os seus modelos de documentos ODT, antes de armazená-los nestes diretórios, leia a documentação no wiki:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Posição do primeiro nome/último nome
-DescWeather=The following images will be shown on the dashboard when the number of late actions reach the following values:
+DescWeather=As imagens a seguir serão mostradas no painel quando o número de ações atrasadas atingir os seguintes valores:
 KeyForWebServicesAccess=Chave para usar Web Services (parâmetro "dolibarrkey" nos webservices)
 TestSubmitForm=Formulário de teste de introdução
-ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever the user choice. Also this menu manager specialized for smartphones does not work on all smartphone. Use another menu manager if you experience problems with yours.
+ThisForceAlsoTheme=Usar este gerenciador de menu também usará seu próprio tema, independentemente da escolha do usuário. Além disso, este gerenciador de menu especializado para smartphones não funciona em todos os smartphones. Use outro gerenciador de menu se tiver problemas com o seu.
 ThemeDir=Diretório de temas
 ConnectionTimeout=Tempo limite de conexão
 ResponseTimeout=Tempo limite de resposta
 SmsTestMessage=Mensagem teste de __PHONEFROM__ para __PHONETO__
 ModuleMustBeEnabledFirst=Se precisa desta função, o módulo <b>%s</b> deve ser ativado antes.
 SecurityToken=A chave para URLs seguras
-NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
+NoSmsEngine=Nenhum gerenciador de remetente de SMS disponível. Um gerenciador de remetente de SMS não é instalado com a distribuição padrão porque eles dependem de um fornecedor externo, mas você pode encontrar alguns em %s
 PDF=PDF
-PDFDesc=Global options for PDF generation
-PDFAddressForging=Rules for address section
-HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
+PDFDesc=Opções globais para geração de PDF
+PDFAddressForging=Regras para seção de endereço
+HideAnyVATInformationOnPDF=Oculte todas as informações relacionadas ao imposto sobre vendas / IVA
 PDFRulesForSalesTax=Regras para Imposto sobre Vendas / IVA
 PDFLocaltax=Regras para %s
 HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
-HideDescOnPDF=Hide products description
-HideRefOnPDF=Hide products ref.
-HideDetailsOnPDF=Hide product lines details
+HideDescOnPDF=Ocultar descrição de produtos
+HideRefOnPDF=Ocultar produtos ref.
+HideDetailsOnPDF=Ocultar detalhes das linhas de produtos
 PlaceCustomerAddressToIsoLocation=Usar a posição padrão francesa (La Poste) para a posição de endereço do cliente
 Library=Biblioteca
 UrlGenerationParameters=Parâmetros para tornar URLs seguros
@@ -406,7 +410,7 @@ ButtonHideUnauthorized=Ocultar botões para usuários não administradores para
 OldVATRates=Taxa de IVA antiga
 NewVATRates=Nova taxa de IVA
 PriceBaseTypeToChange=Modificar nos preços com valor de referência base definido em
-MassConvert=Launch bulk conversion
+MassConvert=Lançar conversão em massa
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=Sequencia de caracteres
 String1Line=String (1 line)
@@ -435,15 +439,15 @@ ComputedFormulaDesc=You can enter here a formula using other properties of objec
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Deixar esse campo em branco significa que esse valor será armazenado sem criptografia (o campo deve ser oculto apenas com estrela na tela). <br> Defina 'auto' para usar a regra de criptografia padrão para salvar a senha no banco de dados (o valor lido será o hash apenas, nenhuma maneira de recuperar o valor original)
-ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpselect=Lista de valores devem ser linhas com chave de formato, o valor (onde chave pode não ser '0') <br> <br> por exemplo: <br> 1, value1 <br> 2, value2 <br> code3, value3 <br> ... <br> <br> A fim de ter o lista dependendo de outra lista de atributos complementares: <br> 1, value1 | options_ <i> parent_list_code </i>: Parent_Key <br> 2, value2 | options_ <i> parent_list_code </i>: Parent_Key <br> <br> para ter a lista de acordo com uma outra lista: <br> 1, value1 | <i> parent_list_code </i>: parent_key <br> 2, valor2 | <i> parent_list_code </i>: parent_key
+ExtrafieldParamHelpcheckbox=A lista de valores deve ser composta por linhas com chave de formato, valor (onde a chave não pode ser '0') <br> <br> por exemplo: <br> 1, valor1 <br> 2, valor2 <br>19bz3, valor3
+ExtrafieldParamHelpradio=A lista de valores deve ser composta por linhas com chave de formato, valor (onde a chave não pode ser '0') <br> <br> por exemplo: <br> 1, valor1 <br> 2, valor2 <br>19bz3, valor3
+ExtrafieldParamHelpsellist=A lista de valores vem de uma tabela <br> Sintaxe: table_name: label_field: id_field :: filter <br> Exemplo: c_typent: libelle: id :: filter <br> <br> - id_fieldcampo int = 1) para exibir apenas o valor ativo <br> Você também pode usar $ ID $ no filtro que é o id atual do objeto atual <br> Para usar um SELECT no filtro, use a palavra-chave $ SEL $ para ignorar a proteção anti-injeção. <br> se você quiser filtrar por campos extras, use a sintaxe extra.fieldcode = ... (onde o código do campo é o código do campo extra) <br> <br> Para ter a lista dependendo de outra lista de opções de atributos complementares: <br>: libelle: idpent_ c_typent: <i> parent_list_code </i> | parent_column: filtro <br> <br> para ter a lista de acordo com uma outra lista: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: Filtro
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Biblioteca utilizada para gerar PDF
-LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Alguns países podem aplicar dois ou três impostos em cada linha da fatura. Se for esse o caso, escolha o tipo de segundo e terceiro imposto e sua alíquota. Os tipos possíveis são: <br> 1: imposto local aplicado sobre produtos e serviços sem IVA (imposto local é calculado sobre o valor sem imposto) <br> 2: imposto local aplicado sobre produtos e serviços incluindo IVA (imposto local é calculado sobre o valor + imposto principal) <br> 3: imposto local aplicável sobre produtos sem IVA (imposto local é calculado sobre o valor sem imposto) <br> 4: imposto local aplicável sobre produtos incluindo IVA (imposto local é calculado sobre o valor + IVA principal) <br> 5: imposto local aplicável sobre serviços sem IVA (imposto local é calculado no valor sem imposto) <br> 6: imposto local aplicável sobre serviços, incluindo IVA (o imposto local é calculado sobre o valor + imposto)
 SMS=SMS
 LinkToTestClickToDial=Introduzida o número de telefone a ligar, de forma mostra um link para testar o ClickToDial para o utilizador <strong>%s</strong>
 RefreshPhoneLink=Atualizar hiperligação
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=Por padrão, as ordens de compra precisam ser criadas e aprovadas por 2 utilisadores diferentes (um passo / utilisador para criar e um passo / utilisador para aprovar. Note que, se o utilisador tiver permissão para criar e aprovar, um passo / utilisador será suficiente) . Você pode solicitar esta opção para introduzir uma terceira etapa / aprovação do utilisador, se o valor for superior a um valor dedicado (então serão necessárias 3 etapas: 1 = validação, 2 = primeira aprovação e 3 = segunda aprovação se a quantidade for suficiente). 1 <br>Defina isto como vazio se uma aprovação (2 etapas) for suficiente, ajuste-o para um valor muito baixo (0,1) se uma segunda aprovação (3 etapas) for sempre necessária.
 UseDoubleApproval=Utilizar uma aprovação de 3 etapas quando o valor (sem impostos) for superior a...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=Se o seu serviço de e-mail SMTP restringir o cliente de e-mail a alguns endereços IP (muito raro), utilize o seguinte endereço IP da sua instalação ERP CRM Dolibarr: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Clique para mostrar a descrição
 DependsOn=Este módulo precisa do (s) módulo (s)
 RequiredBy=Este módulo é necessário para o(s) módulo(s)
@@ -512,47 +520,45 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Utilizadores e Grupos
 Module0Desc=Gestão de Utilizadores / Funcionários e Grupos
 Module1Name=Terceiros
-Module1Desc=Companies and contacts management (customers, prospects...)
+Module1Desc=Gestão de empresas e contatos (clientes, prospects ...)
 Module2Name=Comercial
 Module2Desc=Gestão comercial
-Module10Name=Accounting (simplified)
+Module10Name=Contabilidade (simplificado)
 Module10Desc=Relatórios contábeis simples (periódicos, faturamento) com base no conteúdo do banco de dados. Não usa nenhuma tabela de razão.
 Module20Name=Orçamentos
 Module20Desc=Gestão de orçamentos
-Module22Name=Mass Emailings
-Module22Desc=Manage bulk emailing
+Module22Name=Emailings em massa
+Module22Desc=Gerenciar e-mails em massa
 Module23Name=Energia
 Module23Desc=Monitorização do consumo de energia
-Module25Name=Sales Orders
-Module25Desc=Sales order management
+Module25Name=Ordens de venda
+Module25Desc=Gestão de pedidos de vendas
 Module30Name=Faturas
 Module30Desc=Gerenciamento de notas fiscais e notas de crédito para clientes. Gerenciamento de notas fiscais e notas de crédito para fornecedores
 Module40Name=Fornecedores
-Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
+Module40Desc=Fornecedores e gestão de compras (ordens de compra e faturamento de faturas de fornecedores)
 Module42Name=Registos Debug
 Module42Desc=Funções de registo de eventos (ficheiro, registo do sistema, ...). Tais registos, são para fins técnicos/depuração.
 Module49Name=Editores
 Module49Desc=Gestão de editores
 Module50Name=Produtos
-Module50Desc=Management of Products
+Module50Desc=Gestão de Produtos
 Module51Name=Envio de emails em massa
 Module51Desc=Gestão de envio de correio em massa
 Module52Name=Stocks
-Module52Desc=Stock management
+Module52Desc=Gestão de stocks
 Module53Name=Serviços
-Module53Desc=Management of Services
+Module53Desc=Gestão de Serviços
 Module54Name=Contractos/Subscrições
 Module54Desc=Gestão de contratos (serviços ou assinaturas recorrentes)
 Module55Name=Códigos de barras
 Module55Desc=Gestão dos códigos de barras
-Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Payments by Direct Debit
-Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
+Module56Name=Pagamento por transferência de crédito
+Module56Desc=Gestão de pagamentos de fornecedores por ordens de Transferência a Crédito. Inclui a geração de arquivo SEPA para países europeus.
+Module57Name=Pagamentos por Débito Direto
+Module57Desc=Gerenciamento de pedidos de Débito Direto. Inclui a geração de arquivo SEPA para países europeus.
 Module58Name=ClickToDial
 Module58Desc=Integração com um sistema ClickToDial (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Adicione uma função para gerar uma conta Bookmark4u a partir de uma conta do Dolibarr
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Intervenções
@@ -560,11 +566,11 @@ Module70Desc=Gestão de intervenções
 Module75Name=Notas de despesas e deslocações
 Module75Desc=Gestão das notas de despesas e deslocações
 Module80Name=Expedições
-Module80Desc=Shipments and delivery note management
-Module85Name=Banks & Cash
+Module80Desc=Remessas e gerenciamento de notas de entrega
+Module85Name=Bancos e dinheiro
 Module85Desc=Gestão das contas financeiras ou contas bancárias (prazo ou efetivo)
 Module100Name=Site Externo
-Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu.
+Module100Desc=Adicione um link para um site externo como ícone do menu principal. O site é mostrado em um quadro no menu superior.
 Module105Name=Mailman e SPIP
 Module105Desc=Interface Mailman ou SPIP para módulo membro
 Module200Name=LDAP
@@ -572,27 +578,27 @@ Module200Desc=Sincronização da diretoria LDAP
 Module210Name=PostNuke
 Module210Desc=Integração com PostNuke
 Module240Name=Exportações de dados
-Module240Desc=Tool to export Dolibarr data (with assistance)
+Module240Desc=Ferramenta para exportar dados Dolibarr (com assistência)
 Module250Name=Importação de dados
-Module250Desc=Tool to import data into Dolibarr (with assistance)
+Module250Desc=Ferramenta para importar dados para Dolibarr (com assistência)
 Module310Name=Membros
 Module310Desc=Gestão de membros de uma fundação
 Module320Name=Feed RSS
-Module320Desc=Add a RSS feed to Dolibarr pages
-Module330Name=Bookmarks & Shortcuts
-Module330Desc=Create shortcuts, always accessible, to the internal or external pages to which you frequently access
+Module320Desc=Adicione um feed RSS às páginas Dolibarr
+Module330Name=Favoritos e atalhos
+Module330Desc=Crie atalhos, sempre acessíveis, para as páginas internas ou externas às quais você acessa com frequência
 Module400Name=Projetos ou Leads
 Module400Desc=Gestão de projetos, leads / oportunidades e / ou tarefas. Você também pode atribuir qualquer elemento (fatura, pedido, proposta, intervenção, ...) a um projeto e obter uma visão transversal da visão do projeto.
 Module410Name=Webcalendar
 Module410Desc=Integração com Webcalendar
-Module500Name=Taxes & Special Expenses
+Module500Name=Impostos e despesas especiais
 Module500Desc=Gestão de outras despesas (impostos de venda, impostos sociais ou fiscais, dividendos, ...)
 Module510Name=Salários
 Module510Desc=Registrar e acompanhar pagamentos de funcionários
 Module520Name=Empréstimos
 Module520Desc=Gestão de empréstimos
-Module600Name=Notifications on business event
-Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
+Module600Name=Notificações em eventos de negócios
+Module600Desc=Enviar notificações por e-mail acionadas por um evento de negócios: por usuário (configuração definida em cada usuário), por contatos de terceiros (configuração definida em cada terceiro) ou por e-mails específicos
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Variantes de produtos
 Module610Desc=Criação de variantes de produtos (cor, tamanho etc.)
@@ -609,13 +615,13 @@ Module1520Desc=Mass email document generation
 Module1780Name=Etiquetas/Categorias
 Module1780Desc=Criar etiquetas/categoria (produtos, clientes, fornecedores, contactos ou membros)
 Module2000Name=Editor WYSIWYG
-Module2000Desc=Allow text fields to be edited/formatted using CKEditor (html)
+Module2000Desc=Permitir que campos de texto sejam editados / formatados usando CKEditor (html)
 Module2200Name=Preços dinâmicos
 Module2200Desc=Use maths expressions for auto-generation of prices
 Module2300Name=Tarefas agendadas
 Module2300Desc=Gestão de trabalhos agendados (alias cron ou tabela chrono)
 Module2400Name=Eventos/Agenda
-Module2400Desc=Track events. Log automatic events for tracking purposes or record manual events or meetings. This is the principal module for good Customer or Vendor Relationship Management.
+Module2400Desc=Provas de pista. Registre eventos automáticos para fins de rastreamento ou registre eventos ou reuniões manuais. Este é o módulo principal para um bom gerenciamento de relacionamento com o cliente ou fornecedor.
 Module2500Name=SGD / GEC
 Module2500Desc=Sistema de Gestão de Documentos / Gestão de Conteúdo Eletrónico. Organização automática dos seus documentos gerados ou armazenados. Compartilhe-os quando precisar.
 Module2600Name=Serviços API/Web (servidor SOAP)
@@ -639,24 +645,24 @@ Module6000Name=Fluxo de trabalho
 Module6000Desc=Gerenciamento de fluxo de trabalho (criação automática de objeto e / ou mudança automática de status)
 Module10000Name=Sites da Web
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
-Module20000Name=Leave Request Management
-Module20000Desc=Define and track employee leave requests
+Module20000Name=Gerenciamento de solicitação de licença
+Module20000Desc=Definir e rastrear pedidos de licença de funcionários
 Module39000Name=Product Lots
 Module39000Desc=Lots, serial numbers, eat-by/sell-by date management for products
 Module40000Name=Multi Moeda
 Module40000Desc=Use moedas alternativas em preços e documentos
 Module50000Name=PayBox
-Module50000Desc=Offer customers a PayBox online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50000Desc=Ofereça aos clientes uma página de pagamento online PayBox (cartões de crédito / débito). Isso pode ser usado para permitir que seus clientes façam pagamentos ad-hoc ou pagamentos relacionados a um objeto Dolibarr específico (fatura, pedido etc ...)
 Module50100Name=POS SimplePOS
-Module50100Desc=Point of Sale module SimplePOS (simple POS).
+Module50100Desc=Módulo de Ponto de Venda SimplePOS (POS simples).
 Module50150Name=POS TakePOS
 Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
 Module50200Name=Paypal
-Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50200Desc=Ofereça aos clientes uma página de pagamento online do PayPal (conta do PayPal ou cartões de crédito / débito). Isso pode ser usado para permitir que seus clientes façam pagamentos ad-hoc ou pagamentos relacionados a um objeto Dolibarr específico (fatura, pedido etc ...)
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Gestão contábil (dupla entrada, suporte geral e auxiliar). Exporte o ledger em vários outros formatos de software contábil.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Impressão direta (sem abrir os documentos) usando a interface Cups IPP (a impressora deve estar visível no servidor e o CUPS deve estar instalado no servidor).
 Module55000Name=Votação ou Questionário
@@ -671,7 +677,7 @@ Module63000Name=Recursos
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Consultar faturas a clientes
 Permission12=Criar/modificar faturas a clientes
-Permission13=Invalidar faturas a clientes
+Permission13=Invalidar faturas de clientes
 Permission14=Validar faturas a clientes
 Permission15=Enviar faturas a clientes por email
 Permission16=Emitir pagamentos para faturas a clientes
@@ -688,6 +694,7 @@ Permission32=Criar/Modificar produtos
 Permission34=Eliminar produtos
 Permission36=Ver/Gerir produtos ocultos
 Permission38=Exportar produtos
+Permission39=Ignore minimum price
 Permission41=Leia projetos e tarefas (projeto compartilhado e projetos para os quais eu sou contato). Também pode inserir o tempo consumido, para mim ou minha hierarquia, em tarefas atribuídas (Quadro de Horários)
 Permission42=Criar / modificar projetos (projeto compartilhado e projetos para os quais sou contato). Também pode criar tarefas e atribuir usuários a projetos e tarefas
 Permission44=Excluir projetos (projeto compartilhado e projetos para os quais sou contato)
@@ -696,6 +703,9 @@ Permission61=Consultar intervenções
 Permission62=Criar/Modificar intervenções
 Permission64=Eliminar intervenções
 Permission67=Exportar intervenções
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Consultar membros
 Permission72=Criar/Modificar membros
 Permission74=Eliminar membros
@@ -718,6 +728,7 @@ Permission95=Consultar relatórios
 Permission101=Consultar envios
 Permission102=Criar/modificar envios
 Permission104=Confirmar envios
+Permission105=Send sendings by email
 Permission106=Exportar envios
 Permission109=Eliminar envios
 Permission111=Consultar contas financeiras (contas bancárias, caixas)
@@ -726,13 +737,13 @@ Permission113=Configurar as contas ficnanceiras (criar, gerir categorias)
 Permission114=Reconciliar transações
 Permission115=Exportar transacções e extractos
 Permission116=Transferências entre contas
-Permission117=Manage checks dispatching
+Permission117=Gerenciar o envio de cheques
 Permission121=Consultar terceiros associados ao utilizador
 Permission122=Criar/modificar terceiros associados ao utilizador
 Permission125=Eliminar terceiros associados ao utilizador
 Permission126=Exportar terceiros
-Permission141=Read all projects and tasks (also private projects for which I am not a contact)
-Permission142=Create/modify all projects and tasks (also private projects for which I am not a contact)
+Permission141=Leia todos os projetos e tarefas (também projetos privados dos quais não sou um contato)
+Permission142=Criar / modificar todos os projetos e tarefas (também projetos privados dos quais não sou um contato)
 Permission144=Eliminar todos os projetos e tarefas (também os projetos privados para os quais não sou contactado)
 Permission146=Consultar fornecedores de rede
 Permission147=Consultar estados
@@ -752,14 +763,14 @@ Permission173=Apagar viagens e despesas
 Permission174=Consultar todas as viagens e despesas
 Permission178=Exportar viagens e despesas
 Permission180=Consultar fornecedores
-Permission181=Read purchase orders
-Permission182=Create/modify purchase orders
-Permission183=Validate purchase orders
-Permission184=Approve purchase orders
-Permission185=Order or cancel purchase orders
-Permission186=Receive purchase orders
-Permission187=Close purchase orders
-Permission188=Cancel purchase orders
+Permission181=Leia ordens de compra
+Permission182=Criar / modificar ordens de compra
+Permission183=Validar pedidos de compra
+Permission184=Aprovar pedidos de compra
+Permission185=Solicite ou cancele pedidos de compra
+Permission186=Receber ordens de compra
+Permission187=Fechar ordens de compra
+Permission188=Cancelar pedidos de compra
 Permission192=Criar linhas de rede
 Permission193=Cancelar linhas de rede
 Permission194=Ler as linhas de largura de banda
@@ -792,7 +803,7 @@ PermissionAdvanced253=Criar/modificar utilizadores internos/externos e permissõ
 Permission254=Criar/modificar apenas utilizadores externos
 Permission255=Modificar a palavra-passe de outros utilizadores
 Permission256=Eliminar ou desativar outros utilizadores
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Estenda o acesso a todos os terceiros (não apenas terceiros para os quais o usuário é um representante de vendas). <br> Não é eficaz para usuários externos (sempre limitados a eles próprios para propostas, pedidos, faturas, contratos, etc.). <br> Não efetivo para projetos (apenas regras sobre permissões de projeto, visibilidade e questões de atribuição).
 Permission271=Consultar CA
 Permission272=Consultar faturas
 Permission273=Emitir fatura
@@ -802,10 +813,10 @@ Permission283=Eliminar contactos
 Permission286=Exportar contactos
 Permission291=Consultar tarifas
 Permission292=Definir permissões das tarifas
-Permission293=Modify customer's tariffs
-Permission300=Read barcodes
-Permission301=Create/modify barcodes
-Permission302=Delete barcodes
+Permission293=Modificar as tarifas do cliente
+Permission300=Leia códigos de barras
+Permission301=Criar / modificar códigos de barras
+Permission302=Excluir códigos de barras
 Permission311=Consultar serviços
 Permission312=Atribuir serviço/subscrição ao contrato
 Permission331=Consultar marcadores
@@ -825,10 +836,11 @@ Permission402=Criar/modificar descontos
 Permission403=Validar descontos
 Permission404=Eliminar descontos
 Permission430=Use Debug Bar
-Permission511=Leia pagamentos de salários
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Criar / modificar pagamentos de salários
 Permission514=Excluir pagamentos de salários
-Permission517=Exportar salários
+Permission517=Read payments of salaries of everybody
+Permission519=Exportar salários
 Permission520=Consultar empréstimos
 Permission522=Criar/modificar empréstimos
 Permission524=Eliminar empréstimos
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -866,10 +881,10 @@ Permission1002=Criar/modificar armazéns
 Permission1003=Eliminar armazéns
 Permission1004=Consultar movimentos de stock
 Permission1005=Criar/modificar movimentos de stock
-Permission1101=Read delivery receipts
-Permission1102=Create/modify delivery receipts
-Permission1104=Validate delivery receipts
-Permission1109=Delete delivery receipts
+Permission1101=Leia recibos de entrega
+Permission1102=Criar / modificar recibos de entrega
+Permission1104=Validar recibos de entrega
+Permission1109=Excluir recibos de entrega
 Permission1121=Read supplier proposals
 Permission1122=Create/modify supplier proposals
 Permission1123=Validate supplier proposals
@@ -877,30 +892,34 @@ Permission1124=Send supplier proposals
 Permission1125=Delete supplier proposals
 Permission1126=Close supplier price requests
 Permission1181=Consultar fornecedores
-Permission1182=Read purchase orders
-Permission1183=Create/modify purchase orders
-Permission1184=Validate purchase orders
-Permission1185=Approve purchase orders
-Permission1186=Order purchase orders
-Permission1187=Acknowledge receipt of purchase orders
-Permission1188=Delete purchase orders
+Permission1182=Leia ordens de compra
+Permission1183=Criar / modificar ordens de compra
+Permission1184=Validar pedidos de compra
+Permission1185=Aprovar pedidos de compra
+Permission1186=Pedidos de compra
+Permission1187=Confirmar recebimento de pedidos de compra
+Permission1188=Excluir ordens de compra
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Obter resultado de uma exportação
 Permission1202=Criar/Modificar uma exportação
-Permission1231=Read vendor invoices
-Permission1232=Create/modify vendor invoices
-Permission1233=Validate vendor invoices
-Permission1234=Delete vendor invoices
-Permission1235=Send vendor invoices by email
-Permission1236=Export vendor invoices, attributes and payments
-Permission1237=Export purchase orders and their details
+Permission1231=Leia as faturas do fornecedor
+Permission1232=Criar / modificar faturas de fornecedores
+Permission1233=Validar faturas de fornecedores
+Permission1234=Excluir faturas de fornecedor
+Permission1235=Envie faturas de fornecedor por e-mail
+Permission1236=Exportar faturas, atributos e pagamentos de fornecedores
+Permission1237=Exportar ordens de compra e seus detalhes
 Permission1251=Executar importações em massa de dados externos para a bases de dados (data load)
 Permission1321=Exportar faturas, atributos e cobranças de clientes
 Permission1322=Reabrir uma fatura paga
-Permission1421=Export sales orders and attributes
-Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
-Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
-Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
+Permission1421=Exportar ordens de venda e atributos
+Permission1521=Read documents
+Permission1522=Delete documents
+Permission2401=Ler ações (eventos ou tarefas) vinculadas à sua conta de usuário (se o proprietário do evento ou apenas atribuído a)
+Permission2402=Criar / modificar ações (eventos ou tarefas) vinculadas à sua conta de usuário (se dono do evento)
+Permission2403=Excluir ações (eventos ou tarefas) vinculadas à sua conta de usuário (se o proprietário do evento)
 Permission2411=Consultar ações (eventos ou tarefas) de outros
 Permission2412=Criar/modificar ações (eventos ou tarefas) de outros
 Permission2413=Eliminar ações (eventos ou tarefas) de outros
@@ -932,9 +951,13 @@ Permission23001=Consultar trabalho agendado
 Permission23002=Criar/atualizar trabalho agendado
 Permission23003=Eliminar trabalho agendado
 Permission23004=Executar trabalho agendado
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Consultar transações
 Permission50202=Importar transações
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Consultar recursos
 Permission63002=Criar/modificar recursos
 Permission63003=Eliminar recursos
 Permission63004=Associar recursos a eventos da agenda
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,16 +1031,18 @@ DictionaryHolidayTypes=Tipos de licença
 DictionaryOpportunityStatus=Status de lead para projeto / lead
 DictionaryExpenseTaxCat=Relatório de despesas - categorias de transporte
 DictionaryExpenseTaxRange=Relatório de despesas - Escala por categoria de transporte
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Configuração guardada
 SetupNotSaved=A configuração não foi guardada
-BackToModuleList=Back to Module list
+BackToModuleList=Voltar à lista de módulos
 BackToDictionaryList=Back to Dictionaries list
 TypeOfRevenueStamp=Tipo de selo fiscal
-VATManagement=Sales Tax Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependant on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
-VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies.
-VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
+VATManagement=Gestão de impostos sobre vendas
+VATIsUsedDesc=Por padrão, ao criar clientes em potencial, faturas, pedidos, etc., a taxa de imposto sobre vendas segue a regra padrão ativa: <br> Se o vendedor não estiver sujeito a imposto sobre vendas, o padrão para imposto sobre vendas é 0. Fim da regra. <br> Se o (país do vendedor = país do comprador), então o imposto sobre vendas por padrão é igual ao imposto sobre vendas do produto no país do vendedor. Fim da regra. <br> Se o vendedor e o comprador estiverem na Comunidade Europeia e as mercadorias forem produtos relacionados ao transporte (transporte, envio, companhia aérea), o IVA padrão é 0. Esta regra depende do país do vendedor - consulte seu contador. O IVA deve ser pago pelo comprador à estância aduaneira do seu país e não ao vendedor. Fim da regra. <br> Se o vendedor e o comprador estiverem ambos na Comunidade Européia e o comprador não for uma empresa (com um número de IVA intracomunitário registrado), o IVA é padronizado para a taxa de IVA do país do vendedor. Fim da regra. <br> Se o vendedor e o comprador estiverem ambos na Comunidade Europeia e o comprador for uma empresa (com um número de IVA intracomunitário registrado), então o IVA é 0 por padrão. Fim da regra. <br> Em qualquer outro caso, o padrão proposto é Imposto sobre vendas = 0. Fim da regra.
+VATIsNotUsedDesc=Por padrão, o imposto sobre vendas proposto é 0, que pode ser usado para casos como associações, indivíduos ou pequenas empresas.
+VATIsUsedExampleFR=Na França, significa empresas ou organizações com um sistema fiscal real (real simplificado ou real normal). Um sistema em que o IVA é declarado.
+VATIsNotUsedExampleFR=Na França, significa associações que não são declaradas como imposto sobre vendas ou empresas, organizações ou profissões liberais que escolheram o sistema fiscal de microempresa (imposto sobre vendas em franquia) e pagaram um imposto sobre vendas de franquia sem qualquer declaração de imposto sobre vendas. Essa escolha exibirá a referência "Imposto sobre vendas não aplicável - art-293B do CGI" nas faturas.
 ##### Local Taxes #####
 TypeOfSaleTaxes=Type of sales tax
 LTRate=Taxa
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Etiqueta que será utilizada por defeito se não for encontra
 LabelOnDocuments=Etiqueta sobre documentos
 LabelOrTranslationKey=Etiqueta ou chave de tradução
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=N.º de dias
 AtEndOfMonth=No fim de mês
 CurrentNext=Atual/Seguinte
@@ -1090,9 +1127,9 @@ MessageLogin=Mensagem da página de inicio de sessão
 LoginPage=Página de inicio de sessão
 BackgroundImageLogin=Imagem de fundo
 PermanentLeftSearchForm=Zona de pesquisa permanente no menu esquerdo
-DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
-EnableShowLogo=Show the company logo in the menu
+DefaultLanguage=Idioma padrão
+EnableMultilangInterface=Habilite o suporte multilíngue para relacionamentos com clientes ou fornecedores
+EnableShowLogo=Mostra o logotipo da empresa no menu
 CompanyInfo=Empresa/Organização
 CompanyIds=Identidades da Empresa/Organização
 CompanyName=Nome/Razão social
@@ -1113,29 +1150,29 @@ OwnerOfBankAccount=Titular da conta bancária %s
 BankModuleNotActive=O módulo de contas bancarias não se encontra ativado
 ShowBugTrackLink=Mostrar hiperligação "<strong>%s</strong>"
 Alerts=Alertas
-DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
-DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Planned events (agenda events) not completed
+DelaysOfToleranceBeforeWarning=Atrase antes de exibir um alerta de aviso para:
+DelaysOfToleranceDesc=Defina o atraso antes que um ícone de alerta %s seja mostrado na tela para o elemento atrasado.
+Delays_MAIN_DELAY_ACTIONS_TODO=Eventos planejados (eventos da agenda) não concluídos
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Project not closed in time
 Delays_MAIN_DELAY_TASKS_TODO=Planned task (project tasks) not completed
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Order not processed
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Purchase order not processed
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Proposal not closed
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposal not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Service to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Expired service
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Unpaid vendor invoice
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Unpaid customer invoice
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Check deposit not done
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Pedido não processado
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Pedido de compra não processado
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Proposta não fechada
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposta não faturada
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Serviço para ativar
+Delays_MAIN_DELAY_RUNNING_SERVICES=Serviço expirado
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Fatura de fornecedor não paga
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Fatura de cliente não paga
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Pendente de reconciliação bancária
+Delays_MAIN_DELAY_MEMBERS=Taxa de adesão atrasada
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Depósito de cheque não feito
 Delays_MAIN_DELAY_EXPENSEREPORTS=Expense report to approve
 Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
 SetupDescription1=Antes de começar a usar o Dolibarr, alguns parâmetros iniciais devem ser definidos e módulos ativados / configurados.
-SetupDescription2=The following two sections are mandatory (the two first entries in the Setup menu):
-SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
-SetupDescription5=Other Setup menu entries manage optional parameters.
+SetupDescription2=As duas seções a seguir são obrigatórias (as duas primeiras entradas no menu Configuração):
+SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Parâmetros básicos usados para personalizar o comportamento padrão de seu aplicativo (por exemplo, para recursos relacionados ao país).
+SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Este software é um conjunto de vários módulos / aplicativos. Os módulos relacionados às suas necessidades devem ser habilitados e configurados. As entradas do menu aparecerão com a ativação desses módulos.
+SetupDescription5=Outras entradas do menu Setup gerenciam parâmetros opcionais.
 LogEvents=Eventos de auditoria da segurança
 Audit=Auditoria
 InfoDolibarr=Sobre o Dolibarr
@@ -1145,18 +1182,19 @@ InfoWebServer=Sobre o servidor web
 InfoDatabase=Sobre a base de dados
 InfoPHP=Sobre o PHP
 InfoPerf=Sobre o desempenho
+InfoSecurity=About Security
 BrowserName=Nome do navegador
 BrowserOS=Sistema operativo do navegador
 ListOfSecurityEvents=Listagem de eventos de segurança do Dolibarr
 SecurityEventsPurged=Os eventos de segurança purgados
-LogEventDesc=Enable logging for specific security events. Administrators the log via menu <b>%s - %s</b>. Warning, this feature can generate a large amount of data in the database.
+LogEventDesc=Ative o registro para eventos de segurança específicos. Administradores o log via menu <b> %s - %s </b>. Atenção, este recurso pode gerar uma grande quantidade de dados no banco de dados.
 AreaForAdminOnly=Os parâmetros de configuração só podem ser definidos pelos <b>utilizadores administradores</b>.
 SystemInfoDesc=Esta informação do sistema é uma informação técnica acessível só para leitura dos administradores.
-SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
-CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
+SystemAreaForAdminOnly=Esta área está disponível apenas para usuários administradores. As permissões do usuário Dolibarr não podem alterar esta restrição.
+CompanyFundationDesc=Edite as informações da sua empresa / organização. Clique no botão "%s" na parte inferior da página quando terminar.
 AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
-DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
+DisplayDesc=Os parâmetros que afetam a aparência e o comportamento do Dolibarr podem ser modificados aqui.
 AvailableModules=Aplicações/módulos disponíveis
 ToActivateModule=Para ativar os módulos, vá para a Área (Início->Configuração->Módulos).
 SessionTimeOut=Tempo limite para a sessão
@@ -1168,43 +1206,44 @@ TriggerDisabledByName=Os acionadores neste ficheiro estão desativados pelo sufi
 TriggerDisabledAsModuleDisabled=Os acionadores neste ficheiro estão desativados porque o módulo <b>%s</b> está desativado.
 TriggerAlwaysActive=Os acionadores neste ficheiro estão sempre ativos, independentemente de quais são os módulos ativados.
 TriggerActiveAsModuleActive=Os acionadores deste ficheiro estão ativos, isto porque o módulo <b>%s</b> está ativado.
-GeneratedPasswordDesc=Choose the method to be used for auto-generated passwords.
+GeneratedPasswordDesc=Escolha o método a ser usado para senhas geradas automaticamente.
 DictionaryDesc=Insira todos os dados de referência. Você pode adicionar os seus valores aos valores predefinidos.
-ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting only.
+ConstDesc=Esta página permite que você edite (substitua) parâmetros não disponíveis em outras páginas. Em sua maioria, esses parâmetros são reservados apenas para desenvolvedores / solução de problemas avançada.
 MiscellaneousDesc=Aqui são definidos todos os outros parâmetros relacionados com segurança.
 LimitsSetup=Configuração de limites/precisão
 LimitsDesc=Você pode definir limites, precisões e otimizações usadas pelo Dolibarr aqui
-MAIN_MAX_DECIMALS_UNIT=Max. decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max. decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max. decimals for prices <b>shown on screen</b>. Add an ellipsis <b>...</b> after this parameter (e.g. "2...") if you want to see "<b>...</b>" suffixed to the truncated price.
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something other than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
+MAIN_MAX_DECIMALS_UNIT=Máx. decimais para preços unitários
+MAIN_MAX_DECIMALS_TOT=Máx. decimais para preços totais
+MAIN_MAX_DECIMALS_SHOWN=Máx. decimais para os preços <b> mostrados na tela </b>. Adicione reticências <b> ... </b> após este parâmetro (por exemplo, "2 ...") se quiser ver "<b> ... </b>" sufixo ao preço truncado.
+MAIN_ROUNDING_RULE_TOT=Etapa do intervalo de arredondamento (para países onde o arredondamento é feito em algo diferente da base 10. Por exemplo, coloque 0,05 se o arredondamento for feito em 0,05 etapas)
 UnitPriceOfProduct=Preço unitário líquido de um produto
-TotalPriceAfterRounding=Total price (excl/vat/incl tax) after rounding
+TotalPriceAfterRounding=Preço total (excl / IVA / imposto incl.) Após o arredondamento
 ParameterActiveForNextInputOnly=Parâmetro efetivo somente para as próximas sessões
-NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit has not been enabled in the "Setup - Security - Events" page.
+NoEventOrNoAuditSetup=Nenhum evento de segurança foi registrado. Isso é normal se a Auditoria não tiver sido habilitada na página "Configuração - Segurança - Eventos".
 NoEventFoundWithCriteria=Nenhum evento de segurança foi encontrado para este critério de pesquisa.
 SeeLocalSendMailSetup=Verifique a configuração local de sendmail
-BackupDesc=A <b>complete</b> backup of a Dolibarr installation requires two steps.
-BackupDesc2=Backup the contents of the "documents" directory (<b>%s</b>) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
-BackupDesc3=Backup the structure and contents of your database (<b>%s</b>) into a dump file. For this, you can use the following assistant.
-BackupDescX=The archived directory should be stored in a secure place.
+BackupDesc=Um backup <b> completo </b> de uma instalação Dolibarr requer duas etapas.
+BackupDesc2=Faça backup do conteúdo do diretório "documentos" (<b> %s </b>) contendo todos os arquivos carregados e gerados. Isso também incluirá todos os arquivos de despejo gerados na Etapa 1. Esta operação pode durar vários minutos.
+BackupDesc3=Faça backup da estrutura e do conteúdo de seu banco de dados (<b> %s </b>) em um arquivo de despejo. Para isso, você pode usar o seguinte assistente.
+BackupDescX=O diretório arquivado deve ser armazenado em um local seguro.
 BackupDescY=A cópia de segurança gerada deve ser armazenada num local seguro.
 BackupPHPWarning=Backup não pode ser garantido com este método. Um anterior recomendado.
-RestoreDesc=To restore a Dolibarr backup, two steps are required.
-RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
-RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
+RestoreDesc=Para restaurar um backup Dolibarr, são necessárias duas etapas.
+RestoreDesc2=Restaure o arquivo de backup (arquivo zip, por exemplo) do diretório "documentos" em uma nova instalação do Dolibarr ou neste diretório de documentos atual (<b> %s </b>).
+RestoreDesc3=Restaure a estrutura e os dados do banco de dados de um arquivo de despejo de backup no banco de dados da nova instalação Dolibarr ou no banco de dados desta instalação atual (<b> %s </b>). Atenção, assim que a restauração for concluída, você deve usar um login / senha, que existia desde o momento do backup / instalação para se conectar novamente. <br> Para restaurar um banco de dados de backup para a instalação atual, você pode seguir este assistente.
 RestoreMySQL=Importação MySQL
-ForcedToByAModule= Esta regra é forçada a <b>a %s</b>, por um módulo ativo
-PreviousDumpFiles=Existing backup files
+ForcedToByAModule=Esta regra é forçada a <b>a %s</b>, por um módulo ativo
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
+PreviousDumpFiles=Arquivos de backup existentes
 PreviousArchiveFiles=Existing archive files
-WeekStartOnDay=First day of the week
-RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
+WeekStartOnDay=Primeiro dia da semana
+RunningUpdateProcessMayBeRequired=A execução do processo de atualização parece ser necessária (a versão do programa %s difere da versão do banco de dados %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Deve executar este comando a partir de uma linha de comandos depois de iniciar a sessão, na linha de comandos, com o utilizador <b>%s</b> ou deve adicionar a opção -W no fim da linha de comando para indicar a palavra-passe <b>%s</b>.
 YourPHPDoesNotHaveSSLSupport=Funções SSL não estão disponíveis no seu PHP
 DownloadMoreSkins=Mais temas para descarregar
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+SimpleNumRefModelDesc=Retorna o número de referência com o formato %syymm-nnnn onde yy é o ano, mm é o mês e nnnn é sequencial sem redefinir
+ShowProfIdInAddress=Mostrar id profissional com endereços
+ShowVATIntaInAddress=Ocultar número de IVA intracomunitário com endereços
 TranslationUncomplete=Tradução parcial
 MAIN_DISABLE_METEO=Desativar vista meteorológica
 MeteoStdMod=Modo padrão
@@ -1213,20 +1252,20 @@ MeteoPercentageMod=Modo percentagem
 MeteoPercentageModEnabled=Modo percentagem ativado
 MeteoUseMod=Clique para usar %s
 TestLoginToAPI=Teste o login à API
-ProxyDesc=Some features of Dolibarr require internet access. Define here the internet connection parameters such as access through a proxy server if necessary.
-ExternalAccess=External/Internet Access
-MAIN_PROXY_USE=Use a proxy server (otherwise access is direct to the internet)
-MAIN_PROXY_HOST=Proxy server: Name/Address
-MAIN_PROXY_PORT=Proxy server: Port
-MAIN_PROXY_USER=Proxy server: Login/User
-MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+ProxyDesc=Alguns recursos do Dolibarr requerem acesso à Internet. Defina aqui os parâmetros de conexão à Internet, como acesso por meio de um servidor proxy, se necessário.
+ExternalAccess=Acesso externo / Internet
+MAIN_PROXY_USE=Use um servidor proxy (caso contrário, o acesso é direto para a Internet)
+MAIN_PROXY_HOST=Servidor proxy: Nome / Endereço
+MAIN_PROXY_PORT=Servidor proxy: porta
+MAIN_PROXY_USER=Servidor proxy: Login / usuário
+MAIN_PROXY_PASS=Servidor proxy: senha
+DefineHereComplementaryAttributes=Defina aqui quaisquer atributos adicionais / personalizados que deseja incluir: %s
 ExtraFields=Atributos complementares
 ExtraFieldsLines=Atributos complementares (linhas)
 ExtraFieldsLinesRec=Atributos complementares (linhas de faturas de modelos)
 ExtraFieldsSupplierOrdersLines=Atributos complementares (linhas da encomenda)
 ExtraFieldsSupplierInvoicesLines=Atributos complementares (linhas da fatura)
-ExtraFieldsThirdParties=Complementary attributes (third party)
+ExtraFieldsThirdParties=Atributos complementares (terceiros)
 ExtraFieldsContacts=Atributos complementares (contatos / endereço)
 ExtraFieldsMember=Atributos complementares (membro)
 ExtraFieldsMemberType=Atributos complementares (tipo de membro)
@@ -1246,7 +1285,7 @@ SendmailOptionMayHurtBuggedMTA=O recurso para enviar e-mails usando o método "P
 TranslationSetup=Configuração da tradução
 TranslationKeySearch=Procurar uma chave ou texto de tradução
 TranslationOverwriteKey=Modificar o texto de uma tradução
-TranslationDesc=How to set the display language:<br>* Default/Systemwide: menu <strong>Home -> Setup -> Display</strong><br>* Per user: Click on the username at the top of the screen and modify the <strong>User Display Setup</strong> tab on the user card.
+TranslationDesc=Como definir o idioma de exibição: <br> * Padrão / Em todo o sistema: menu <strong> Página inicial -> Configuração -> Exibir </strong> <br> * Por usuário: Clique no nome de usuário na parte superior da tela e modifique a guia Configuração do usuário a0e78439d647d0 usuário0e78439d647d0fc0fc971 do usuário0fc647d7 cartão.
 TranslationOverwriteDesc=Pode substituir as entradas na seguinte tabela. Escolha o seu idioma no menu suspenso "%s", insira a chave da tradução em "%s" e a sua nova tradução em "%s"
 TranslationOverwriteDesc2=Você pode usar a outra guia para ajudá-lo a saber qual chave de tradução deve ser usada
 TranslationString=Texto de tradução
@@ -1256,11 +1295,11 @@ NewTranslationStringToShow=Novo texto de tradução a exibir
 OriginalValueWas=A tradução original foi alterada. O valor original era: <br><br>%s
 TransKeyWithoutOriginalValue=Você forçou uma nova tradução para a chave de tradução '<strong> %s </ strong>' que não existe em nenhum arquivo de idioma
 TitleNumberOfActivatedModules=Activated modules
-TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
+TotalNumberOfActivatedModules=Módulos ativados: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Deve ativar, pelo menos, 1 módulo
 ClassNotFoundIntoPathWarning=Classe %s não encontrada no caminho do PHP
 YesInSummer=Sim no verão
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only the following modules are available to external users (irrespective of the permissions of such users) and only if permissions are granted:<br>
+OnlyFollowingModulesAreOpenedToExternalUsers=Observe que apenas os seguintes módulos estão disponíveis para usuários externos (independentemente das permissões de tais usuários) e somente se as permissões forem concedidas: <br>
 SuhosinSessionEncrypt=Sessão de armazenamento encriptada por Suhosin
 ConditionIsCurrently=A condição está atualmente %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Peça o método de envio preferido para terceiros.
 FieldEdition=Edição do campo %s
 FillThisOnlyIfRequired=Exemplo: +2 (para preencher apenas se existir problemas de desvios de fuso horário)
@@ -1282,16 +1322,16 @@ GetBarCode=Obter código de barras
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Devolve uma palavra-passe gerada pelo algoritmo interno Dolibarr: 8 caracteres no mínimo, contendo números e letras minúsculas.
+PasswordGenerationStandard=Retorne uma senha gerada de acordo com o algoritmo Dolibarr interno: %s caracteres contendo números compartilhados e caracteres em minúsculas.
 PasswordGenerationNone=Não sugira uma senha gerada. A senha deve ser digitada manualmente.
 PasswordGenerationPerso=Retornar uma palavra-passe que esteja de acordo com sua configuração definida.
 SetupPerso=De acordo com a sua configuração
 PasswordPatternDesc=Descrição do padrão da palavra-passe
 ##### Users setup #####
-RuleForGeneratedPasswords=Rules to generate and validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
+RuleForGeneratedPasswords=Regras para gerar e validar senhas
+DisableForgetPasswordLinkOnLogonPage=Não mostrar o link "Senha esquecida" na página de login
 UsersSetup=Configuração do módulo "Utilizadores"
-UserMailRequired=Email required to create a new user
+UserMailRequired=Email necessário para criar um novo usuário
 UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
 UsersDocModules=Document templates for documents generated from user record
 GroupsDocModules=Document templates for documents generated from a group record
@@ -1299,9 +1339,9 @@ GroupsDocModules=Document templates for documents generated from a group record
 HRMSetup=Configuração do módulo "GRH"
 ##### Company setup #####
 CompanySetup=Configuração do módulo "Empresas"
-CompanyCodeChecker=Options for automatic generation of customer/vendor codes
-AccountCodeManager=Options for automatic generation of customer/vendor accounting codes
-NotificationsDesc=Email notifications can be sent automatically for some Dolibarr events.<br>Recipients of notifications can be defined:
+CompanyCodeChecker=Opções para geração automática de códigos de cliente / fornecedor
+AccountCodeManager=Opções para geração automática de códigos de contabilidade de cliente / fornecedor
+NotificationsDesc=Notificações de e-mail podem ser enviadas automaticamente para alguns eventos Dolibarr. <br> Os destinatários das notificações podem ser definidos:
 NotificationsDescUser=* per user, one user at a time.
 NotificationsDescContact=* per third-party contacts (customers or vendors), one contact at a time.
 NotificationsDescGlobal=* or by setting global email addresses in this setup page.
@@ -1311,7 +1351,7 @@ WatermarkOnDraft=Marca d'água no documento rascunho
 JSOnPaimentBill=Ative a funcionalidade para preencher automaticamente as linhas de pagamento no formulário de pagamento
 CompanyIdProfChecker=Regras para as Id. Profissionais
 MustBeUnique=Deve ser único?
-MustBeMandatory=Mandatory to create third parties (if VAT number or type of company defined) ?
+MustBeMandatory=Obrigatória a criação de terceiros (se definido o número de contribuinte ou tipo de empresa)?
 MustBeInvoiceMandatory=Obrigatório para validar faturas?
 TechnicalServicesProvided=Serviços técnicos fornecidos
 #####DAV #####
@@ -1326,13 +1366,13 @@ BillsPDFModules=Modelo de documentos de faturas
 BillsPDFModulesAccordindToInvoiceType=Modelos de documentos de faturas de acordo com o tipo de fatura
 PaymentsPDFModules=Modelos de documentos de pagamento
 ForceInvoiceDate=Forçar a data de fatura para a data de validação
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
-SuggestPaymentByChequeToAddress=Suggest payment by check to
+SuggestedPaymentModesIfNotDefinedInInvoice=Modo de pagamento sugerido na fatura por padrão, se não estiver definido na fatura
+SuggestPaymentByRIBOnAccount=Sugerir pagamento por saque na conta
+SuggestPaymentByChequeToAddress=Sugira pagamento em cheque para
 FreeLegalTextOnInvoices=Texto livre em faturas
 WatermarkOnDraftInvoices=Marca d'água nas faturas rascunho (nenhuma se em branco)
 PaymentsNumberingModule=Modelo de numeração de pagamentos
-SuppliersPayment=Vendor payments
+SuppliersPayment=Pagamentos a fornecedores
 SupplierPaymentSetup=Vendor payments setup
 ##### Proposals #####
 PropalSetup=Configuração do módulo de orçamentos
@@ -1354,7 +1394,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Pedir qual o armazém origem para a encomen
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Pedir conta bancária destinatária para encomendas a fornecedores
 ##### Orders #####
 SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
-OrdersSetup=Sales Orders management setup
+OrdersSetup=Configuração de gerenciamento de pedidos de vendas
 OrdersNumberingModules=Modelos de numeração de encomendas
 OrdersModelModule=Modelos de documentos de encomendas
 FreeLegalTextOnOrders=Texto livre em encomendas
@@ -1377,10 +1417,11 @@ WatermarkOnDraftContractCards=Marca d'água nos contratos rascunho (nenhuma se e
 MembersSetup=Configuração do módulo "Membros"
 MemberMainOptions=Opções principais
 AdherentLoginRequired= Gerir um login para cada membro
-AdherentMailRequired=Email required to create a new member
+AdherentMailRequired=Email necessário para criar um novo membro
 MemberSendInformationByMailByDefault=Selecione para enviar email de confirmação aos membros (validação ou nova subscrição), está ativada por defeito
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=Configuração do módulo "LDAP"
 LDAPGlobalParameters=Parâmetros globais
@@ -1402,7 +1443,7 @@ LDAPSynchronizeMembersTypes=Organização dos tipos de membros da fundação no
 LDAPPrimaryServer=Servidor primario
 LDAPSecondaryServer=Servidor secundario
 LDAPServerPort=Porta do servidor
-LDAPServerPortExample=Default port: 389
+LDAPServerPortExample=Porta padrão: 389
 LDAPServerProtocolVersion=Versão de protocolo
 LDAPServerUseTLS=Utilizar TLS
 LDAPServerUseTLSExample=O seu servidor LDAP utiliza TLS
@@ -1459,49 +1500,49 @@ LDAPSetupForVersion2=Servidor LDAP configurado para a versão 2
 LDAPDolibarrMapping=Mapeamento Dolibarr
 LDAPLdapMapping=Mapeamento LDAP
 LDAPFieldLoginUnix=Nome de utilizador (Unix)
-LDAPFieldLoginExample=Example: uid
+LDAPFieldLoginExample=Exemplo: uid
 LDAPFilterConnection=Filtro de pesquisa
-LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPFilterConnectionExample=Exemplo: & (objectClass = inetOrgPerson)
 LDAPFieldLoginSamba=Nome de utilizador (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example: samaccountname
+LDAPFieldLoginSambaExample=Exemplo: samaccountname
 LDAPFieldFullname=Nome completo
-LDAPFieldFullnameExample=Example: cn
+LDAPFieldFullnameExample=Exemplo: cn
 LDAPFieldPasswordNotCrypted=Senha não criptografada
 LDAPFieldPasswordCrypted=Senha criptografada
-LDAPFieldPasswordExample=Example: userPassword
-LDAPFieldCommonNameExample=Example: cn
+LDAPFieldPasswordExample=Exemplo: userPassword
+LDAPFieldCommonNameExample=Exemplo: cn
 LDAPFieldName=Nome
-LDAPFieldNameExample=Example: sn
+LDAPFieldNameExample=Exemplo: sn
 LDAPFieldFirstName=Primeiro nome
-LDAPFieldFirstNameExample=Example: givenName
+LDAPFieldFirstNameExample=Exemplo: givenName
 LDAPFieldMail=Endereço de email
-LDAPFieldMailExample=Example: mail
+LDAPFieldMailExample=Exemplo: correio
 LDAPFieldPhone=Número de telefone profissional
-LDAPFieldPhoneExample=Example: telephonenumber
+LDAPFieldPhoneExample=Exemplo: número de telefone
 LDAPFieldHomePhone=Número de telefone pessoal
-LDAPFieldHomePhoneExample=Example: homephone
+LDAPFieldHomePhoneExample=Exemplo: telefone residencial
 LDAPFieldMobile=Número de telemóvel
-LDAPFieldMobileExample=Example: mobile
+LDAPFieldMobileExample=Exemplo: celular
 LDAPFieldFax=Número de fax
-LDAPFieldFaxExample=Example: facsimiletelephonenumber
+LDAPFieldFaxExample=Exemplo: facsimiletelephonenumber
 LDAPFieldAddress=Rua
-LDAPFieldAddressExample=Example: street
+LDAPFieldAddressExample=Exemplo: rua
 LDAPFieldZip=Código postal
-LDAPFieldZipExample=Example: postalcode
+LDAPFieldZipExample=Exemplo: código postal
 LDAPFieldTown=Localidade
-LDAPFieldTownExample=Example: l
+LDAPFieldTownExample=Exemplo: l
 LDAPFieldCountry=País
 LDAPFieldDescription=Descrição
-LDAPFieldDescriptionExample=Example: description
+LDAPFieldDescriptionExample=Exemplo: descrição
 LDAPFieldNotePublic=Nota Pública
 LDAPFieldNotePublicExample=Example: publicnote
 LDAPFieldGroupMembers= Membros do grupo
-LDAPFieldGroupMembersExample= Example: uniqueMember
+LDAPFieldGroupMembersExample= Exemplo: uniqueMember
 LDAPFieldBirthdate=Data de nascimento
 LDAPFieldCompany=Empresa
-LDAPFieldCompanyExample=Example: o
+LDAPFieldCompanyExample=Exemplo: o
 LDAPFieldSid=SID
-LDAPFieldSidExample=Example: objectsid
+LDAPFieldSidExample=Exemplo: objectsid
 LDAPFieldEndLastSubscription=Data de fim da subscrição
 LDAPFieldTitle=Cargo
 LDAPFieldTitleExample=Exemplo: title
@@ -1523,7 +1564,9 @@ LDAPDescValues=Os valores de exemplo foram construídos para o <b>OpenLDAP</b> c
 ForANonAnonymousAccess=Para um acesso autentificado
 PerfDolibarr=Relatório de configuração/otimização de desempenho
 YouMayFindPerfAdviceHere=Esta página fornece algumas verificações ou conselhos relacionados ao desempenho.
-NotInstalled=Não instalado, portanto, seu servidor não é retardado por isso.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Cache de aplicativo
 MemcachedNotAvailable=Não foi encontrada nenhuma cache da aplicação. Pode melhorar o desempenho, instalando um servidor de cache "Memcached" e um módulo que possa utilizar este servidor de cache.<br>Mais informação em  <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note que muitos provedores de hospedagem da Web não fornecem tais servidores de cache.
 MemcachedModuleAvailableButNotSetup=Encontrado módulo memcached para cache de aplicativo, mas a configuração deste não está completa.
@@ -1551,8 +1594,8 @@ DefaultMandatory=Campos Obrigatórios
 ProductSetup=Configuração do módulo "Produtos"
 ServiceSetup=Configuração do módulo "Serviços"
 ProductServiceSetup=Configuração do módulo "Produtos e Serviços"
-NumberOfProductShowInSelect=Maximum number of products to show in combo select lists (0=no limit)
-ViewProductDescInFormAbility=Display product descriptions in forms (otherwise shown in a tooltip popup)
+NumberOfProductShowInSelect=Número máximo de produtos a serem exibidos nas listas de seleção de combinação (0 = sem limite)
+ViewProductDescInFormAbility=Exibir descrições de produtos em formulários (caso contrário, mostrado em um pop-up de dica)
 MergePropalProductCard=Ative no separador "Ficheiros Anexados" do produto/serviço uma opção para unir o documento em PDF ao orçamento em PDF, se o produto/serviço estiver no orçamento
 ViewProductDescInThirdpartyLanguageAbility=Exibir descrições de produtos no idioma do terceiro
 UseSearchToSelectProductTooltip=Além disso, se você tiver um grande número de produtos (> 100 000), poderá aumentar a velocidade definindo PRODUCT_DONOTSEARCH_ANYWHERE como 1 em Setup-> Other. A pesquisa será limitada ao início da string.
@@ -1571,9 +1614,9 @@ SyslogLevel=Nível
 SyslogFilename=Nome e caminho do ficheiro
 YouCanUseDOL_DATA_ROOT=Pode utilizar DOL_DATA_ROOT/dolibarr.log para um ficheiro log no diretório de "documentos" do Dolibarr.
 ErrorUnknownSyslogConstant=A constante %s não é uma constante Syslog conhecida
-OnlyWindowsLOG_USER=O Windows apenas suporta LOG_USER
+OnlyWindowsLOG_USER=No Windows, apenas o recurso LOG_USER será suportado
 CompressSyslogs=Compactação e backup de arquivos de log de depuração (gerados pelo módulo Log para depuração)
-SyslogFileNumberOfSaves=Backups de registos
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure o trabalho agendado de limpeza para definir a frequência do registo da cópia de segurança
 ##### Donations #####
 DonationsSetup=Configuração do módulo "Donativos"
@@ -1597,7 +1640,7 @@ GenbarcodeLocation=Ferramenta da linha de comandos para a produção de códigos
 BarcodeInternalEngine=Motor interno
 BarCodeNumberManager=Gestor para definir automaticamente números de código de barras
 ##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct Debit payments
+WithdrawalsSetup=Configuração do módulo de pagamentos de débito direto
 ##### ExternalRSS #####
 ExternalRSSSetup=Configuração das importações de feeds RSS externos
 NewRSS=Novo feed RSS
@@ -1605,15 +1648,15 @@ RSSUrl=Endereço do feed RSS
 RSSUrlExample=Um feed RSS interessante
 ##### Mailing #####
 MailingSetup=Configuração do módulo "Emailing"
-MailingEMailFrom=Sender email (From) for emails sent by emailing module
-MailingEMailError=Return Email (Errors-to) for emails with errors
+MailingEMailFrom=E-mail do remetente (De) para e-mails enviados pelo módulo de e-mail
+MailingEMailError=Retornar e-mail (erros para) para e-mails com erros
 MailingDelay=Segundos a esperar antes de enviar a próxima mensagem
 ##### Notification #####
-NotificationSetup=Email Notification module setup
-NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
+NotificationSetup=Configuração do módulo de notificação por email
+NotificationEMailFrom=Email do remetente (De) para emails enviados pelo módulo Notificações
 FixedEmailTarget=Destinatario
 ##### Sendings #####
-SendingsSetup=Shipping module setup
+SendingsSetup=Configuração do módulo de envio
 SendingsReceiptModel=Modelo do recibo de expedição
 SendingsNumberingModules=Envios módulos numerados
 SendingsAbility=Suporte para guias de transporte para entregas a clientes
@@ -1629,7 +1672,7 @@ AdvancedEditor=Editor avançado
 ActivateFCKeditor=Ativar editor avançado para:
 FCKeditorForCompany=Criação/Edição WYSIWIG da descrição e notas de elementos (exceto produtos/services)
 FCKeditorForProduct=Criação/Edição WYSIWIG da descrição e notas dos produtos/serviços
-FCKeditorForProductDetails=WYSIWIG criação / edição de produtos detalha linhas para todas as entidades (propostas, pedidos, faturas, etc ...). <font class = "warning"> Aviso: O uso dessa opção para este caso não é recomendado, pois pode criar problemas com caracteres especiais e formatação de página ao criar arquivos PDF. </ font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= Criação/Edição WYSIWIG para emails em massa (Ferramentas->eMailing)
 FCKeditorForUserSignature=Criação/Edição WYSIWIG da assinatura do utilizador
 FCKeditorForMail=Criação/Edição WYSIWIG para todo o correio (exceto Ferramentas->eMailling)
@@ -1639,11 +1682,11 @@ StockSetup=Configuração do módulo Stock
 IfYouUsePointOfSaleCheckModule=Se você usar o módulo Point of Sale (POS) fornecido por padrão ou um módulo externo, essa configuração pode ser ignorada pelo seu módulo POS. A maioria dos módulos PDV é projetada por padrão para criar uma fatura imediatamente e diminuir o estoque, independentemente das opções aqui. Portanto, se você precisar ou não de uma redução de estoque ao registrar uma venda no seu PDV, verifique também a configuração do seu módulo PDV.
 ##### Menu #####
 MenuDeleted=Menu eliminado
+Menu=Cardápio
 Menus=Menus
 TreeMenuPersonalized=Menus personalizados
 NotTopTreeMenuPersonalized=Menus personalizados não ligados a uma entrada do menu no topo
 NewMenu=Novo menu
-Menu=Seleção do menu
 MenuHandler=Gestor de menus
 MenuModule=Módulo origem
 HideUnauthorizedMenu= Ocultar menus não autorizados (cinza)
@@ -1669,8 +1712,8 @@ TaxSetup=Configuração do módulo "Impostos, impostos sociais ou fiscais e divi
 OptionVatMode=Aplicação do IVA
 OptionVATDefault=Base padrão
 OptionVATDebitOption=Regime de competência
-OptionVatDefaultDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on invoice (debit) for services
+OptionVatDefaultDesc=IVA devido: <br> - na entrega de bens (com base na data da fatura) <br> - nos pagamentos de serviços
+OptionVatDebitOptionDesc=IVA devido: <br> - na entrega de mercadorias (com base na data da fatura) <br> - na fatura (débito) de serviços
 OptionPaymentForProductAndServices=Base de caixa para produtos e serviços
 OptionPaymentForProductAndServicesDesc=IVA é devido: <br> - em pagamento de mercadorias <br>- em pagamentos de serviços
 SummaryOfVatExigibilityUsedByDefault=Horário de elegibilidade do IVA por padrão de acordo com a opção escolhida:
@@ -1695,22 +1738,23 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Definir automaticamente este valor padrão para o
 AGENDA_DEFAULT_FILTER_TYPE=Definir automaticamente esse tipo de evento no filtro de pesquisa da visualização da agenda
 AGENDA_DEFAULT_FILTER_STATUS=Definir automaticamente este status para eventos no filtro de pesquisa da visualização da agenda
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Ativar lembrete de eventos <b>por e-mails</b> (lembrar opção / atraso pode ser definido em cada evento). Nota: O módulo <strong>%s</strong>deve estar habilitado e configurado corretamente para que o lembrete seja enviado na freqüência correta.
-AGENDA_REMINDER_BROWSER=Ativar lembrete de evento <b> no navegador do usuário </ b> (quando a data do evento é atingida, cada usuário pode recusar isso da pergunta de confirmação do navegador)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Ativar notificação sonora
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Mostrar o objeto associado na vista de agenda
 ##### Clicktodial #####
 ClickToDialSetup=Configuração do módulo "Click To Dial"
 ClickToDialUrlDesc=Uma chamada é efetuada quando o icon é clicado. No URL pode usar as tags:<br><b>__PHONETO__</b> que será substituída pelo número do destinatário<br><b>__PHONEFROM__</b> que será substituída pelo número do remetente<br><b>__LOGIN__</b> que será substituída pelo nome de utilizador da sua conta ClickToDial (definido no seu cartão de utilizador)<br><b>__PASS__</b>  que será substituída pela palavra-passe da sua conta ClickToDial (definida no seu cartão de utilizador).
-ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
+ClickToDialDesc=Este módulo altera os números de telefone, ao usar um computador desktop, em links clicáveis. Um clique ligará para o número. Isso pode ser usado para iniciar a chamada telefônica ao usar um softphone em sua área de trabalho ou ao usar um sistema CTI baseado no protocolo SIP, por exemplo. Nota: Ao usar um smartphone, os números de telefone são sempre clicáveis.
 ClickToDialUseTelLink=Usar apenas um link "tel:" em números de telefone
 ClickToDialUseTelLinkDesc=Use esse método se os usuários tiverem um softphone ou uma interface de software instalada no mesmo computador que o navegador e chamados quando você clicar em um link em seu navegador que comece com "tel:". Se você precisar de uma solução de servidor completa (sem necessidade de instalação de software local), deverá definir isso como "Não" e preencher o próximo campo.
 ##### Point Of Sale (CashDesk) #####
-CashDesk=Point of Sale
-CashDeskSetup=Point of Sales module setup
+CashDesk=Ponto de venda
+CashDeskSetup=Configuração do módulo de ponto de vendas
 CashDeskThirdPartyForSell=Terceiro genérico padrão a ser usado para vendas
 CashDeskBankAccountForSell=Conta a ser usada para receber pagamentos em dinheiro
-CashDeskBankAccountForCheque=Default account to use to receive payments by check
+CashDeskBankAccountForCheque=Conta padrão a ser usada para receber pagamentos em cheque
 CashDeskBankAccountForCB=Conta a ser usada para receber pagamentos por cartões de crédito
 CashDeskBankAccountForSumup=Default bank account to use to receive payments by SumUp
 CashDeskDoNotDecreaseStock=Desativar a redução de estoque quando uma venda é feita a partir do ponto de venda (se "não", a redução de estoque é feita para cada venda feita a partir do PDV, independentemente da opção definida no módulo Estoque).
@@ -1740,7 +1784,7 @@ ApiKey=Chave para a API
 WarningAPIExplorerDisabled=O explorador da API foi desativado. O explorador da API não é necessário para fornecer serviços de API. É uma ferramenta para o desenvolvedor encontrar / testar APIs REST. Se você precisar desta ferramenta, entre na configuração do módulo API REST para ativá-la.
 ##### Bank #####
 BankSetupModule=Configuração do módulo "Bancário"
-FreeLegalTextOnChequeReceipts=Free text on check receipts
+FreeLegalTextOnChequeReceipts=Texto livre em recibos de cheque
 BankOrderShow=Ordem de exibiçãode contas bancárias para países que utilizam "IBAN"
 BankOrderGlobal=Geral
 BankOrderGlobalDesc=Ordem de exibição geral
@@ -1750,15 +1794,15 @@ ChequeReceiptsNumberingModule=Check Receipts Numbering Module
 ##### Multicompany #####
 MultiCompanySetup=Configuração do módulo "Multi-empresa"
 ##### Suppliers #####
-SuppliersSetup=Vendor module setup
-SuppliersCommandModel=Complete template of Purchase Order
+SuppliersSetup=Configuração do módulo do fornecedor
+SuppliersCommandModel=Modelo completo de pedido de compra
 SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
-SuppliersInvoiceModel=Complete template of Vendor Invoice
-SuppliersInvoiceNumberingModel=Vendor invoices numbering models
+SuppliersInvoiceModel=Modelo completo de fatura do fornecedor
+SuppliersInvoiceNumberingModel=Modelos de numeração de faturas de fornecedores
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Configuração do módulo "GeoIP Maxmind"
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
+PathToGeoIPMaxmindCountryDataFile=Caminho para o arquivo que contém a tradução do Maxmind ip para o país. <br> Exemplos: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat <br> /usr/shareCountry.Geomm/Geomm2
 NoteOnPathLocation=Note que o endereço IP de dados do país/arquivo deve estar dentro de um diretório do seu PHP (Verifique a configuração do PHP open_basedir e permissões de ficheiros de sistema).
 YouCanDownloadFreeDatFileTo=Você pode descarregar uma <b>versão demo gratuita</b> do ficheiro país Maxmind GeoIP em %s.
 YouCanDownloadAdvancedDatFileTo=Você também pode baixar uma <b>versão</b> mais <b>completa, com atualizações</b> do país arquivo GeoIP MaxMind em %s.
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Caminho para o dirétorio "include" (definido na variável %s)
 ExpenseReportsSetup=Configuração do módulo "Relatórios de Despesas"
 TemplatePDFExpenseReports=Modelos de documentos para a produção de relatórios de despesa 
-ExpenseReportsIkSetup=Configuração do módulo Relatórios de despesas - Índice Milhas
 ExpenseReportsRulesSetup=Configuração do módulo Relatórios de despesas - Regras
 ExpenseReportNumberingModules=Módulo de numeração de relatórios de despesas
 NoModueToManageStockIncrease=Não foi ativado nenhum módulo capaz de efetuar a gestão automática do acréscimo de stock. O acrescimo de stock será efetuado manualmente.
@@ -1852,7 +1895,7 @@ ExpectedSize=Expected size
 CurrentSize=Current size
 ForcedConstants=Valores de constantes necessários
 MailToSendProposal=Orçamentos
-MailToSendOrder=Sales orders
+MailToSendOrder=Encomendas de venda
 MailToSendInvoice=Faturas a clientes
 MailToSendShipment=Envios
 MailToSendIntervention=Intervenções
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Terceiros
 MailToMember=Membros
 MailToUser=Utilizadores
-MailToProject=Página de projetos
+MailToProject=Projetos
 MailToTicket=Tickets
 ByDefaultInList=Mostrar por padrão na vista de lista
 YouUseLastStableVersion=Você possui a última versão estável
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Código postal
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Desativar funcionalidade que permite vincular um rec
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirmar restauração do módulo
 OnMobileOnly=Apenas na tela pequena (smartphone)
-DisableProspectCustomerType=Desativar o tipo de terceiro "cliente + cliente" (assim, o terceiro deve ser cliente ou cliente, mas não pode ser ambos)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/pt_PT/banks.lang b/htdocs/langs/pt_PT/banks.lang
index 79c83ab9483..2401d4caf2a 100644
--- a/htdocs/langs/pt_PT/banks.lang
+++ b/htdocs/langs/pt_PT/banks.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Banco
-MenuBankCash=Banks | Cash
+MenuBankCash=Bancos Dinheiro
 MenuVariousPayment=Pagamentos diversos
 MenuNewVariousPayment=Novo pagamento diverso
 BankName=Nome do banco
@@ -30,7 +30,7 @@ AllTime=Do início
 Reconciliation=Conciliação
 RIB=Conta bancária
 IBAN=Número IBAN
-BIC=BIC/SWIFT code
+BIC=Código BIC / SWIFT
 SwiftValid=BIC / SWIFT válido
 SwiftVNotalid=BIC/SWIFT inválido
 IbanValid=BAN válido
@@ -45,11 +45,11 @@ AccountStatementShort=Extracto
 AccountStatements=Extractos
 LastAccountStatements=Últimos extractos bancários
 IOMonthlyReporting=Relatório mensal E/S
-BankAccountDomiciliation=Bank address
+BankAccountDomiciliation=endereço do banco
 BankAccountCountry=Conta do país
 BankAccountOwner=Nome do proprietário da Conta
 BankAccountOwnerAddress=Direcção do proprietário da Conta
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
+RIBControlError=Falha na verificação de integridade dos valores. Isso significa que as informações para este número de conta não estão completas ou estão incorretas (verifique o país, números e IBAN).
 CreateAccount=Criar Conta
 NewBankAccount=Nova conta
 NewFinancialAccount=Nova conta financeira
@@ -98,7 +98,7 @@ AddBankRecordLong=Adicionar entrada manualmente
 Conciliated=Reconciliado
 ConciliatedBy=Conciliado por
 DateConciliating=Data Conciliação
-BankLineConciliated=Entry reconciled with bank receipt
+BankLineConciliated=Entrada reconciliada com recibo do banco
 Reconciled=Reconciliado
 NotReconciled=Não reconciliado
 CustomerInvoicePayment=Pagamento de cliente
@@ -106,10 +106,10 @@ SupplierInvoicePayment=Pagamento de fornecedor
 SubscriptionPayment=Pagamento Assinatura
 WithdrawalPayment=Débito direto
 SocialContributionPayment=Pagamento da taxa social/fiscal
-BankTransfer=Credit transfer
-BankTransfers=Credit transfers
+BankTransfer=Transferência de crédito
+BankTransfers=Transferências de crédito
 MenuBankInternalTransfer=Transferência interna
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transferência de uma conta para outra, Dolibarr escreverá dois registros (um débito na conta de origem e um crédito na conta de destino). O mesmo valor (exceto sinal), rótulo e data serão usados para esta transação)
 TransferFrom=De
 TransferTo=Para
 TransferFromToDone=A transferência de <b>%s</b> para <b>%s</b> de <b>%s</b> %s foi criado.
@@ -141,7 +141,7 @@ BankTransactionLine=Entrada bancária
 AllAccounts=Todas as contas bancárias e de caixa
 BackToAccount=Voltar à Conta
 ShowAllAccounts=Mostrar para todas as Contas
-FutureTransaction=Future transaction. Unable to reconcile.
+FutureTransaction=Transação futura. Incapaz de reconciliar.
 SelectChequeTransactionAndGenerate=Selecione / filtrar cheques para incluir no recibo do cheque e clique em "Criar".
 InputReceiptNumber=Escolha o extrato bancário relacionado com a conciliação. Use um valor numérico classificável: YYYYMM ou YYYYMMDD
 EventualyAddCategory=Eventualmente, especifique uma categoria que deseja classificar os movimentos
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Pagamentos diversos
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=Mandato SEPA
 YourSEPAMandate=Seu mandato SEPA
 FindYourSEPAMandate=Este é o seu mandato da SEPA para autorizar a nossa empresa a efetuar um pedido de débito direto ao seu banco. Devolva-o assinado (digitalização do documento assinado) ou envie-o por correio para
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/pt_PT/categories.lang b/htdocs/langs/pt_PT/categories.lang
index 83d5b2c3f6d..bd0e39a4308 100644
--- a/htdocs/langs/pt_PT/categories.lang
+++ b/htdocs/langs/pt_PT/categories.lang
@@ -10,7 +10,7 @@ modify=Modificar
 Classify=Classificar
 CategoriesArea=Área de etiquetas/categorias
 ProductsCategoriesArea=Área de etiquetas/categorias de produtos/serviços
-SuppliersCategoriesArea=Vendors tags/categories area
+SuppliersCategoriesArea=Área de tags / categorias de fornecedores
 CustomersCategoriesArea=Área de etiquetas/categorias de clientes
 MembersCategoriesArea=Área de etiquetas/categorias de membros
 ContactsCategoriesArea=Área de etiquetas/categorias de contactos
@@ -32,7 +32,7 @@ WasAddedSuccessfully=<b>%s</b> foi adicionado com sucesso.
 ObjectAlreadyLinkedToCategory=O elemento já se encontra associado a esta etiqueta/categoria.
 ProductIsInCategories=O produto/serviço está associado às seguintes etiquetas/categorias
 CompanyIsInCustomersCategories=O terceiro está associado às seguintes etiquetas/categorias de clientes/prospecções
-CompanyIsInSuppliersCategories=This third party is linked to following vendors tags/categories
+CompanyIsInSuppliersCategories=Este terceiro está vinculado às seguintes tags / categorias de fornecedores
 MemberIsInCategories=O terceiro está associado às seguintes etiquetas/categorias de membros
 ContactIsInCategories=Este contacto está associado às seguintes etiquetas/categorias de contactos
 ProductHasNoCategory=Este produto/serviço não se encontra associado a quaisquer etiquetas/categorias
@@ -48,14 +48,14 @@ ContentsNotVisibleByAllShort=Conteúdo não visível por todos
 DeleteCategory=Eliminar etiqueta/categoria
 ConfirmDeleteCategory=Tem a certeza que quer eliminar esta etiqueta/categoria?
 NoCategoriesDefined=Sem etiqueta/categoria definida
-SuppliersCategoryShort=Vendors tag/category
+SuppliersCategoryShort=Tag / categoria de fornecedores
 CustomersCategoryShort=Etiquetas/categorias de clientes
 ProductsCategoryShort=Etiquetas/categorias de produtos
 MembersCategoryShort=Etiquetas/categorias de membros
-SuppliersCategoriesShort=Vendors tags/categories
+SuppliersCategoriesShort=Tags / categorias de fornecedores
 CustomersCategoriesShort=Etiquetas/catego. de clientes
 ProspectsCategoriesShort=Etiquetas/categorias de prospecções
-CustomersProspectsCategoriesShort=Cust./Prosp. tags/categories
+CustomersProspectsCategoriesShort=Cust./Prosp. tags / categorias
 ProductsCategoriesShort=Etiquetas/categorias de produtos
 MembersCategoriesShort=Etiquetas/categorias de membros
 ContactCategoriesShort=Etiquetas/Catego. de Contactos
@@ -65,7 +65,7 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=ID de etiqueta/categoria
-CatSupList=List of vendor tags/categories
+CatSupList=Lista de tags / categorias de fornecedores
 CatCusList=Lista de etiquetas/categorias de clientes/prospecções
 CatProdList=Lista de etiquetas/categorias de produtos
 CatMemberList=Lista de etiquetas/categorias de membros
@@ -81,10 +81,12 @@ CategoriesSetup=Configuração de etiquetas/categorias
 CategorieRecursiv=Ligar com a etiqueta/categoria pai automaticamente
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Adicioanr o produto/serviço seguinte
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Mostrar etiqueta/categoria
 ByDefaultInList=Por predefinição na lista
 ChooseCategory=Escolha a categoria
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
index 473bd62d9a2..0c75b753e4c 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -19,8 +19,8 @@ ProspectionArea=Área de prospeção
 IdThirdParty=ID Terceiro
 IdCompany=Id Empresa
 IdContact=Id Contacto
-ThirdPartyContacts=Third-party contacts
-ThirdPartyContact=Third-party contact/address
+ThirdPartyContacts=Contatos de terceiros
+ThirdPartyContact=Contato / endereço de terceiros
 Company=Empresa
 CompanyName=Razão social
 AliasNames=Pseudónimo (comercial, marca registada, ...)
@@ -28,19 +28,19 @@ AliasNameShort=Nome do alias
 Companies=Empresas
 CountryIsInEEC=País faz parte da Comunidade Económica Europeia
 PriceFormatInCurrentLanguage=Price display format in the current language and currency
-ThirdPartyName=Third-party name
+ThirdPartyName=Nome de terceiro
 ThirdPartyEmail=Third-party email
-ThirdParty=Third-party
-ThirdParties=Third-parties
+ThirdParty=Terceiro
+ThirdParties=Terceiros
 ThirdPartyProspects=Clientes Potenciais
 ThirdPartyProspectsStats=Clientes Potenciais
 ThirdPartyCustomers=Clientes
 ThirdPartyCustomersStats=Clientes
 ThirdPartyCustomersWithIdProf12=Clientes com %s ó %s
 ThirdPartySuppliers=Fornecedores
-ThirdPartyType=Third-party type
+ThirdPartyType=Tipo de terceiro
 Individual=Particular
-ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
+ToCreateContactWithSameName=Criará automaticamente um contato / endereço com as mesmas informações do terceiro sob o terceiro. Na maioria dos casos, mesmo que seu terceiro seja uma pessoa física, criar um terceiro sozinho é suficiente.
 ParentCompany=Empresa-mãe
 Subsidiaries=Subsidiárias
 ReportByMonth=Relatório por mês
@@ -71,7 +71,7 @@ Chat=Chat
 PhonePro=Telef. Profissional
 PhonePerso=Telef. particular
 PhoneMobile=Telemovel
-No_Email=Refuse bulk emailings
+No_Email=Recusar emails em massa
 Fax=Fax
 Zip=Código postal
 Town=Localidade
@@ -81,7 +81,7 @@ DefaultLang=Idioma predefinido
 VATIsUsed=Imposto sobre vendas usado
 VATIsUsedWhenSelling=Isso define se esse terceiro inclui um imposto de venda ou não quando faz uma fatura para seus próprios clientes
 VATIsNotUsed=Não sujeito a IVA
-CopyAddressFromSoc=Copy address from third-party details
+CopyAddressFromSoc=Copie o endereço dos detalhes de terceiros
 ThirdpartyNotCustomerNotSupplierSoNoRef=Terceiros nem cliente nem fornecedor, nenhum objeto de referência disponível
 ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor vendor, discounts are not available
 PaymentBankAccount=Conta bancária de pagamentos
@@ -124,7 +124,7 @@ ProfId1AT=ID Prof. 1 (USt.-IdNr)
 ProfId2AT=ID Prof. 2 (USt.-Nr)
 ProfId3AT=ID Prof. 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=ID Prof. 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=ID Prof. 1 (N° da Ordem)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=Número EORI
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscrição Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscrição Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=ID Prof. 1 (Número federal)
 ProfId4CH=ID Prof. 2 (Núm. Registo de Comércio)
-ProfId5CH=-
+ProfId5CH=Número EORI
 ProfId6CH=-
 ProfId1CL=ID Prof. 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=ID Prof. 1 (USt.-IdNr)
 ProfId2DE=ID Prof. 2 (USt.-NR)
 ProfId3DE=ID Prof. 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=Número EORI
 ProfId6DE=-
 ProfId1ES=ID Prof. 1 (CIF/NIF)
 ProfId2ES=ID Prof. 2 (Número de segurança social)
 ProfId3ES=ID Prof. 3 (CNAE)
 ProfId4ES=ID Prof. 4 (Número colegiado)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=ID Prof. 1 (SIREN)
 ProfId2FR=ID Prof. 2 (SIRET)
 ProfId3FR=ID Prof. 3 (NAF, antigo APE)
 ProfId4FR=ID Prof. 4 (RCS/RM)
-ProfId5FR=Prof Id 5
+ProfId5FR=Número EORI
 ProfId6FR=-
 ProfId1GB=Número Registo
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=ID Prof. 3 (Imposto SRVC)
 ProfId4IN=ID Prof. 4
 ProfId5IN=ID Prof. 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=ID Prof. 1 (R.C. Luxemburgo)
 ProfId2LU=ID Prof. 2 (Permissão comercial)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=ID Prof. 1 (R.C.)
 ProfId2MA=ID Prof. 2 (Patente)
 ProfId3MA=ID Prof. 3 (I.F.)
 ProfId4MA=ID Prof. 4 (C.N.S.S.)
-ProfId5MA=ID Prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=ID Prof. 1 (R.F.C).
 ProfId2MX=ID Prof. 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=nummer KVK
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL=-
+ProfId5NL=Número EORI
 ProfId6NL=-
 ProfId1PT=ID Prof. 1 (NIF)
 ProfId2PT=ID Prof. 2 (Núm. Segurança Social)
 ProfId3PT=ID Prof. 3 (Núm. Reg. Comercial)
 ProfId4PT=ID Prof. 4 (Conservatória)
-ProfId5PT=-
+ProfId5PT=Número EORI
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=ID Prof. 1 (OGRN)
 ProfId2RU=ID Prof. 2 (INN)
@@ -262,8 +267,8 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=VAT ID
-VATIntraShort=VAT ID
+VATIntra=ID IVA
+VATIntraShort=ID IVA
 VATIntraSyntaxIsValid=Sintaxe Válida
 VATReturn=Retorno do IVA
 ProspectCustomer=Cliente Potencial/Cliente
@@ -297,7 +302,7 @@ AddContact=Criar contacto
 AddContactAddress=Novo contacto/morada
 EditContact=Editar contato / endereço
 EditContactAddress=Editar contactos/endereços
-Contact=Contact/Address
+Contact=Endereço de contacto
 Contacts=Contactos
 ContactId=ID de contacto
 ContactsAddresses=Contato / Endereços
@@ -326,7 +331,7 @@ ListOfContacts=Lista de Contactos
 ListOfContactsAddresses=Lista de Contactos
 ListOfThirdParties=Lista de Terceiros
 ShowCompany=Third Party
-ShowContact=Contact-Address
+ShowContact=Endereço de contacto
 ContactsAllShort=Todos (sem filtro)
 ContactType=Tipo de Contacto
 ContactForOrders=Contacto para Pedidos
@@ -345,15 +350,16 @@ MyContacts=Os Meus Contactos
 Capital=Capital
 CapitalOf=Capital Social de %s
 EditCompany=Modificar Empresa
-ThisUserIsNot=This user is not a prospect, customer or vendor
+ThisUserIsNot=Este usuário não é um cliente potencial, ou fornecedor
 VATIntraCheck=Verificar
-VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
+VATIntraCheckDesc=O ID do IVA deve incluir o prefixo do país. O link <b> %s </b> usa o serviço de verificador de IVA europeu (VIES) que requer acesso à Internet do servidor Dolibarr.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
-VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
+VATIntraCheckableOnEUSite=Verifique o ID do IVA intracomunitário no site da Comissão Europeia
 VATIntraManualCheck=Você também pode verificar manualmente no site da Comissão Europeia <a href="%s" target="_blank"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Verificação Impossivel. O serviço de verificação não é prestado pelo país membro (%s).
-NorProspectNorCustomer=Not prospect, nor customer
+NorProspectNorCustomer=Não é cliente potencial, nem cliente
 JuridicalStatus=Tipo de Entidade Legal
+Workforce=Workforce
 Staff=Funcionários
 ProspectLevelShort=Cli. Potenc.
 ProspectLevel=Cliente Potencial
@@ -375,7 +381,7 @@ TE_MEDIUM=Media
 TE_ADMIN=Administração Pública
 TE_SMALL=Pequena
 TE_RETAIL=Retalhista
-TE_WHOLE=Wholesaler
+TE_WHOLE=Grossista
 TE_PRIVATE=Indivíduo particular
 TE_OTHER=Outro
 StatusProspect-1=Não contactar
@@ -394,13 +400,13 @@ ExportCardToFormat=Exportar ficha para o formato
 ContactNotLinkedToCompany=Contacto não vinculado a um Terceiro
 DolibarrLogin=Dolibarr - Iniciar Sessão
 NoDolibarrAccess=Sem Acesso
-ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties
+ExportDataset_company_1=Terceiros (empresas / fundações / pessoas físicas) e suas propriedades
 ExportDataset_company_2=Contatos e suas propriedades
-ImportDataset_company_1=Third-parties and their properties
-ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
-ImportDataset_company_3=Third-parties Bank accounts
+ImportDataset_company_1=Terceiros e suas propriedades
+ImportDataset_company_2=Contactos / endereços e atributos adicionais de terceiros
+ImportDataset_company_3=Contas bancárias de terceiros
 ImportDataset_company_4=Third-parties Sales representatives (assign sales representatives/users to companies)
-PriceLevel=Price Level
+PriceLevel=Nível de preço
 PriceLevelLabels=Price Level Labels
 DeliveryAddress=Direcção de Envío
 AddAddress=Adicionar Direcção
@@ -425,7 +431,7 @@ ListSuppliersShort=Lista de Fornecedores
 ListProspectsShort=Lista de Perspectivas
 ListCustomersShort=Lista de Clientes
 ThirdPartiesArea=Terceiros / Contatos
-LastModifiedThirdParties=Latest %s modified Third Parties
+LastModifiedThirdParties=Últimos %s terceiros modificados
 UniqueThirdParties=Total de Terceiros
 InActivity=Aberto
 ActivityCeased=Fechado
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Moeda
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/pt_PT/ecm.lang b/htdocs/langs/pt_PT/ecm.lang
index 892c93c2acd..7dd458dd801 100644
--- a/htdocs/langs/pt_PT/ecm.lang
+++ b/htdocs/langs/pt_PT/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Procurar por palavras-chave
 ECMSearchByEntity=Procurar por objecto
 ECMSectionOfDocuments=Pastas de documentos
 ECMTypeAuto=Automático
-ECMDocsBySocialContributions=Documentos associados com os impostos fiscais ou sociais
-ECMDocsByThirdParties=Documentos associados a terceiros
-ECMDocsByProposals=Documentos associados aos orçamentos
-ECMDocsByOrders=Documentos associados a pedidos
-ECMDocsByContracts=Documentos associados a contratos
-ECMDocsByInvoices=Documentos associados a faturas
-ECMDocsByProducts=Documentos associados a produtos
-ECMDocsByProjects=Documentos associados a projectos
-ECMDocsByUsers=Documentos associados a utilizadores
-ECMDocsByInterventions=Documentos associados a intervenções
-ECMDocsByExpenseReports=Documentos associados a relatórios de despesas
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=Nenhuma pasta criada
 ShowECMSection=Mostrar Pasta
 DeleteSection=Remover diretório
@@ -50,3 +38,6 @@ ReSyncListOfDir=Voltar a sincronizar a lista de diretórios
 HashOfFileContent=Hash do conteúdo do ficheiro
 NoDirectoriesFound=Nenhum diretório encontrado
 FileNotYetIndexedInDatabase=Ficheiro ainda não indexado na base de dados (tente voltar a carregá-lo)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/pt_PT/hrm.lang b/htdocs/langs/pt_PT/hrm.lang
index e53c8992cc4..dd249f092a0 100644
--- a/htdocs/langs/pt_PT/hrm.lang
+++ b/htdocs/langs/pt_PT/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Funcionários
 Employee=Funcionário
 NewEmployee=Novo funcionário
+ListOfEmployees=Lista de funcionários
diff --git a/htdocs/langs/pt_PT/install.lang b/htdocs/langs/pt_PT/install.lang
index 3d733cb8bfe..af06712e5be 100644
--- a/htdocs/langs/pt_PT/install.lang
+++ b/htdocs/langs/pt_PT/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=O arquivo de configuração <b> %s </ b> não é gravável
 ConfFileIsWritable=O ficheiro de configuração <b>%s</b> é gravável.
 ConfFileMustBeAFileNotADir=O ficheiro de configuração <b> %s </b> deve ser um ficheiro, não um diretório.
 ConfFileReload=Recarregando parâmetros do arquivo de configuração.
-PHPSupportSessions=Este PHP suporta sessões.
 PHPSupportPOSTGETOk=Este PHP suporta variáveis GET e POST.
 PHPSupportPOSTGETKo=É possível que sua configuração do PHP não suporte variáveis ​​POST e / ou GET. Verifique o parâmetro <b> variables_order </ b> no php.ini.
-PHPSupportGD=Este PHP suporta funções gráficas do GD.
-PHPSupportCurl=Este PHP suporta o Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=Este PHP suporta funções UTF8.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=Este PHP suporta sessões.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=A sua memória máxima da sessão PHP está definida para <b>%s.</b> Isto deverá ser suficiente.
 PHPMemoryTooLow=Sua memória de sessão do PHP max está configurada para <b> %s </ b> bytes. Isso é muito baixo. Altere seu <b> php.ini </ b> para definir o parâmetro <b> memory_limit </ b> para pelo menos <b> %s </ b> bytes.
diff --git a/htdocs/langs/pt_PT/intracommreport.lang b/htdocs/langs/pt_PT/intracommreport.lang
new file mode 100644
index 00000000000..8b6713062c8
--- /dev/null
+++ b/htdocs/langs/pt_PT/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=Lista
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/pt_PT/languages.lang b/htdocs/langs/pt_PT/languages.lang
index 31689948085..b84561e4f84 100644
--- a/htdocs/langs/pt_PT/languages.lang
+++ b/htdocs/langs/pt_PT/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Espanhol (Panamá)
 Language_es_PY=Espanhol (Paraguai)
 Language_es_PE=Espanhol (Peru)
 Language_es_PR=Espanhol (Porto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Espanhol (Uruguai)
 Language_es_GT=Espanhol (Guatemala)
 Language_es_VE=Espanhol (Venezuela)
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 6ec47dcf6fc..d49765da4c1 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -28,7 +28,7 @@ NoTemplateDefined=Nenhum modelo disponível para este tipo de e-mail
 AvailableVariables=Variáveis de substituição disponíveis
 NoTranslation=Sem tradução
 Translation=Tradução
-EmptySearchString=Enter non empty search criterias
+EmptySearchString=Introduza alguns critérios de pesquisa
 NoRecordFound=Nenhum foi encontrado nenhum registo
 NoRecordDeleted=Nenhum registo eliminado
 NotEnoughDataYet=Não existe dados suficientes
@@ -51,21 +51,21 @@ ErrorFailedToSendMail=Erro ao envio do e-mail (emissor=%s, destinatário=%s)
 ErrorFileNotUploaded=Não foi possivel transferir o ficheiro
 ErrorInternalErrorDetected=Erro detectado
 ErrorWrongHostParameter=Parâmetro do hospedeiro inválido
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post the form again.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child record.
+ErrorYourCountryIsNotDefined=Seu país não está definido. Vá para Início-Configuração-Editar e guarde o formulário novamente.
+ErrorRecordIsUsedByChild=A eliminação deste registo falhou. Este registo está a ser utilizado pelo menos num registo filho.
 ErrorWrongValue=Valor incorrecto
 ErrorWrongValueForParameterX=Valor incorrecto do parâmetro %s
 ErrorNoRequestInError=Nenhuma petição em erro
-ErrorServiceUnavailableTryLater=Service not available at the moment. Try again later.
+ErrorServiceUnavailableTryLater=O serviço não está disponível de momento. Tente mais tarde.
 ErrorDuplicateField=Duplicado num campo único
-ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. Changes have been rolled back.
-ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in the Dolibarr config file <b>conf.php</b>.
+ErrorSomeErrorWereFoundRollbackIsDone=Foram encontrados alguns erros. As alterações não foram guardadas.
+ErrorConfigParameterNotDefined=O parâmetro <b>%s</b>não está defenido no ficheiro de configuração <b>conf.php</b> do Dolibarr.
 ErrorCantLoadUserFromDolibarrDatabase=Impossivel encontrar o utilizador <b>%s</b> na base de dados do Dolibarr.
 ErrorNoVATRateDefinedForSellerCountry=Erro, nenhum tipo de IVA definido para o país '%s'.
 ErrorNoSocialContributionForSellerCountry=Erro, nenhum tipo de contribuição social definida para o país %s.
 ErrorFailedToSaveFile=Erro, o registo do ficheiro falhou.
-ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of a existing warehouse
-MaxNbOfRecordPerPage=Max. number of records per page
+ErrorCannotAddThisParentWarehouse=Você está a tentar adicionar um armazém "pai" que já é um armazém "filho" de um armazém já existente.
+MaxNbOfRecordPerPage=Número máximo de registos por página
 NotAuthorized=Não tem permissão para efetuar essa operação
 SetDate=Definir data
 SelectDate=Seleccionar uma data
@@ -79,15 +79,15 @@ FileRenamed=O ficheiro foi renomeado com sucesso
 FileGenerated=O ficheiro foi gerado com sucesso
 FileSaved=O ficheiro foi guardado com sucesso
 FileUploaded=O ficheiro foi enviado com sucesso
-FileTransferComplete=File(s) uploaded successfully
+FileTransferComplete=Ficheiro(s) carregado(s) com sucesso
 FilesDeleted=Ficheiros eliminados com sucesso
 FileWasNotUploaded=Um ficheiro foi seleccionada para ser anexado, mas ainda não foi carregado. Clique em 'Adicionar este Ficheiro' para anexar.
-NbOfEntries=No. of entries
+NbOfEntries=N.º de entradas
 GoToWikiHelpPage=Consultar ajuda online (necessita de acesso à Internet)
 GoToHelpPage=Ir para páginas de ajuda
 RecordSaved=Registo Guardado
 RecordDeleted=Registo eliminado
-RecordGenerated=Record generated
+RecordGenerated=Registo gerado
 LevelOfFeature=Nivel de funções
 NotDefined=Não Definida
 DolibarrInHttpAuthenticationSoPasswordUseless=O modo de autenticação do Dolibarr está definido a <b>%s</b> no ficheiro de configuração <b>conf.php</b>.<br>Isto significa que a base-de-dados de palavras-passe é externa ao Dolibarr, por isso alterar o valor deste campo poderá não surtir qualquer efeito.
@@ -97,8 +97,8 @@ PasswordForgotten=Esqueceu-se da sua palavra-passe?
 NoAccount=Não possui conta?
 SeeAbove=Ver acima
 HomeArea=Início
-LastConnexion=Last login
-PreviousConnexion=Previous login
+LastConnexion=Último login
+PreviousConnexion=Login anterior
 PreviousValue=Valor anterior
 ConnectedOnMultiCompany=Conectado sobre entidade
 ConnectedSince=Conectado desde
@@ -114,14 +114,14 @@ InformationToHelpDiagnose=Esta informação pode ser útil para diagnosticar pro
 MoreInformation=Mais Informação
 TechnicalInformation=Informação técnica
 TechnicalID=ID Técnico
-LineID=Line ID
+LineID=ID da Linha
 NotePublic=Nota (pública)
 NotePrivate=Nota (privada)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr está configurado para limitar a precisão dos preços unitarios a <b>%s</b> Decimais.
 DoTest=Teste
 ToFilter=Filtrar
 NoFilter=Sem filtro
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance time.
+WarningYouHaveAtLeastOneTaskLate=Atenção, tem pelo menos um elemento que excedeu o tempo de tolerância.
 yes=sim
 Yes=Sim
 no=Não
@@ -155,9 +155,10 @@ RemoveLink=Remover hiperligação
 AddToDraft=Adicionar ao rascunho
 Update=Atualizar
 Close=Fechar
+CloseAs=Definir estado como
 CloseBox=Remover widget do painel
 Confirm=Confirmar
-ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
+ConfirmSendCardByMail=De certeza que quer enviar o conteúdo deste cartão via mail para <b>%s</b>?
 Delete=Eliminar
 Remove=Remover
 Resiliate=Cancelar
@@ -170,12 +171,12 @@ ToValidate=Por validar
 NotValidated=Não validado
 Save=Guardar
 SaveAs=Guardar Como
-SaveAndStay=Save and stay
-SaveAndNew=Save and new
+SaveAndStay=Salvar
+SaveAndNew=Salvar e criar novo
 TestConnection=Testar conexão
 ToClone=Clonar
-ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmCloneAsk=De certeza que quer clonar o objecto <b>%s</b>?
+ConfirmClone=Escolha a data que quer clonar:
 NoCloneOptionsSpecified=Não existem dados definidos para clonar.
 Of=de
 Go=Avançar
@@ -186,16 +187,17 @@ Hide=Ocultar
 ShowCardHere=Mostrar ficha
 Search=Procurar
 SearchOf=Procurar
-SearchMenuShortCut=Ctrl + shift + f
-QuickAdd=Quick add
-QuickAddMenuShortCut=Ctrl + shift + l
+SearchMenuShortCut=CTRL + Shift + F
+QuickAdd=Adicionar rápido
+QuickAddMenuShortCut=CTRL + Shift + I
 Valid=Confirmar
 Approve=Aprovar
 Disapprove=Desaprovar
 ReOpen=Reabrir
-Upload=Upload
+Upload=Carregar
 ToLink=Link
 Select=Selecionar
+SelectAll=Seleccionar tudo
 Choose=Escolher
 Resize=Redimensionar
 ResizeOrCrop=Redimensionar ou Cortar
@@ -210,7 +212,7 @@ Password=Senha
 PasswordRetype=Contrassenha
 NoteSomeFeaturesAreDisabled=Note que estão desativados muitos módulos/funções nesta demonstração.
 Name=Nome
-NameSlashCompany=Name / Company
+NameSlashCompany=Nome / Empresa
 Person=Pessoa
 Parameter=Parâmetro
 Parameters=Parâmetros
@@ -232,8 +234,8 @@ Family=Familia
 Description=Descrição
 Designation=Designação
 DescriptionOfLine=Descrição da linha
-DateOfLine=Date of line
-DurationOfLine=Duration of line
+DateOfLine=Data da linha
+DurationOfLine=Duração da linha
 Model=Modelo de documento
 DefaultModel=Modelo de documento predefinido
 Action=Evento
@@ -256,6 +258,7 @@ Cards=Fichas
 Card=Ficha
 Now=Agora
 HourStart=Hora de inicio
+Deadline=Deadline
 Date=Data
 DateAndHour=Data e Hora
 DateToday=Data de hoje
@@ -264,8 +267,10 @@ DateStart=Data de início
 DateEnd=Data de fim
 DateCreation=Data de Criação
 DateCreationShort=Data de criação
+IPCreation=Creation IP
 DateModification=Data de Modificação
 DateModificationShort=Data de Modif.
+IPModification=Modification IP
 DateLastModification=A última data de alteração
 DateValidation=Data de Validação
 DateClosing=Data de Encerramento
@@ -319,6 +324,7 @@ Morning=Manhã
 Afternoon=Tarde
 Quadri=Trimestre
 MonthOfDay=Dia do mês
+DaysOfWeek=Dias da semana
 HourShort=H
 MinuteShort=mn
 Rate=Tipo
@@ -341,12 +347,12 @@ Copy=Copiar
 Paste=Colar
 Default=Predefinição
 DefaultValue=Valor Predefinido
-DefaultValues=Default values/filters/sorting
+DefaultValues=Valores por defeito/Fltros/Ordenar
 Price=Preço
 PriceCurrency=Preço (moeda)
 UnitPrice=Preço Unitário
-UnitPriceHT=Unit price (excl.)
-UnitPriceHTCurrency=Unit price (excl.) (currency)
+UnitPriceHT=Preço por Unid (excl. IVA)
+UnitPriceHTCurrency=Preço por unidade (Excl. IVA) (moeda)
 UnitPriceTTC=Preço Unitário
 PriceU=P.U.
 PriceUHT=P.U. (líquido)
@@ -355,37 +361,38 @@ PriceUTTC=P.U. (inc. impostos)
 Amount=Montante
 AmountInvoice=Montante da Fatura
 AmountInvoiced=Montante faturado
-AmountInvoicedHT=Amount invoiced (excl. tax)
-AmountInvoicedTTC=Amount invoiced (inc. tax)
+AmountInvoicedHT=Valor facturado (Excl. IVA)
+AmountInvoicedTTC=Valor facturado (Inc. IVA)
 AmountPayment=Montatne do pagamento
-AmountHTShort=Amount (excl.)
+AmountHTShort=Valor (Excl. IVA)
 AmountTTCShort=Montante (IVA inc.)
-AmountHT=Amount (excl. tax)
+AmountHT=Valor (Excl. IVA)
 AmountTTC=Montante (IVA inc.)
 AmountVAT=Montante do IVA
-MulticurrencyAlreadyPaid=Already paid, original currency
+MulticurrencyAlreadyPaid=Pago, moeda original
 MulticurrencyRemainderToPay=Montante por pagar, moeda original
 MulticurrencyPaymentAmount=Montante do pagamento, moeda original
-MulticurrencyAmountHT=Amount (excl. tax), original currency
+MulticurrencyAmountHT=Valor (Excl. Iva), moeda original
 MulticurrencyAmountTTC=Montante (incl. impostos), moeda original
 MulticurrencyAmountVAT=Montante de imposto, moeda original
+MulticurrencySubPrice=Valor sub-preço várias moedas
 AmountLT1=Valor do IVA 2
 AmountLT2=Valor do IVA 3
 AmountLT1ES=Montante RE
 AmountLT2ES=Montante IRPF
 AmountTotal=Montante Total
 AmountAverage=Montante médio
-PriceQtyMinHT=Price quantity min. (excl. tax)
-PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PriceQtyMinHT=Preço para quandidade min. (excl. IVA)
+PriceQtyMinHTCurrency=Preço da quantidade min. (excl. IVA) (moeda)
 Percentage=Percentagem
 Total=Total
 SubTotal=Subtotal
-TotalHTShort=Total (excl.)
-TotalHT100Short=Total 100%% (excl.)
-TotalHTShortCurrency=Total (excl. in currency)
+TotalHTShort=Total (excl. IVA)
+TotalHT100Short=Total 100%% (excl. IVA)
+TotalHTShortCurrency=Total (excl. IVA na moeda)
 TotalTTCShort=Total (IVA inc.)
-TotalHT=Total (excl. tax)
-TotalHTforthispage=Total (excl. tax) for this page
+TotalHT=Total (excl. IVA)
+TotalHTforthispage=Total desta página (excl. IVA)
 Totalforthispage=Total para esta página
 TotalTTC=Total (IVA inc.)
 TotalTTCToYourCredit=Total (IVA inc.) a crédito
@@ -397,7 +404,7 @@ TotalLT1ES=Total de RE
 TotalLT2ES=Total IRPF
 TotalLT1IN=Total ICBS
 TotalLT2IN=Total IBSE
-HT=Excl. tax
+HT=Excl. IVA
 TTC=IVA incluido
 INCVATONLY=IVA inc.
 INCT=Todos os impostos incluídos
@@ -413,7 +420,7 @@ LT1ES=RE
 LT2ES=IRPF
 LT1IN=ICBS
 LT2IN=IBSE
-LT1GC=Additionnal cents
+LT1GC=Centavos adicionais
 VATRate=Taxa IVA
 VATCode=Código da taxa de imposto
 VATNPR=Taxa de imposto NPR
@@ -428,7 +435,7 @@ Modules=Módulos/Aplicações
 Option=Opção
 List=Lista
 FullList=Lista Completa
-FullConversation=Full conversation
+FullConversation=Conversa completa
 Statistics=Estatísticas
 OtherStatistics=Outras estatísticas
 Status=Estado
@@ -448,16 +455,16 @@ ActionNotApplicable=Não aplicável
 ActionRunningNotStarted=Não Iniciado
 ActionRunningShort=Em progresso
 ActionDoneShort=Terminado
-ActionUncomplete=Incomplete
+ActionUncomplete=Incompleta
 LatestLinkedEvents=Os últimos %s eventos relacionados
 CompanyFoundation=Empresa/Organização
 Accountant=Contabilista
 ContactsForCompany=Contactos para este terceiro
 ContactsAddressesForCompany=Contactos/moradas para este terceiro
 AddressesForCompany=Moradas para este terceiro
-ActionsOnCompany=Events for this third party
-ActionsOnContact=Events for this contact/address
-ActionsOnContract=Events for this contract
+ActionsOnCompany=Eventos para este terceiro
+ActionsOnContact=Eventos para este contacto/endereço
+ActionsOnContract=Eventos para este contracto
 ActionsOnMember=Eventos sobre este membro
 ActionsOnProduct=Eventos sobre este produto
 NActionsLate=%s em atraso
@@ -475,9 +482,9 @@ Generate=Gerar
 Duration=Duração
 TotalDuration=Duração total
 Summary=Resumo
-DolibarrStateBoard=Database Statistics
-DolibarrWorkBoard=Open Items
-NoOpenedElementToProcess=No open element to process
+DolibarrStateBoard=Estatísticas da Base de Dados
+DolibarrWorkBoard=Items Abertos
+NoOpenedElementToProcess=Nenhum elemento para processar
 Available=Disponível
 NotYetAvailable=Ainda não disponivel
 NotAvailable=Não disponivel
@@ -487,13 +494,14 @@ By=Por
 From=De
 FromDate=De
 FromLocation=De
+at=em
 to=Para
 To=Para
 and=e
 or=ou
 Other=Outro
 Others=Outros
-OtherInformations=Other information
+OtherInformations=Outras informações
 Quantity=quantidade
 Qty=Quant.
 ChangedBy=Modificado por
@@ -507,11 +515,12 @@ Reporting=Relatório
 Reportings=Relatórios
 Draft=Rascunho
 Drafts=Rascunhos
-StatusInterInvoiced=Invoiced
+StatusInterInvoiced=Facturado
 Validated=Validado
+ValidatedToProduce=Validado (para produção)
 Opened=Aberto
-OpenAll=Open (All)
-ClosedAll=Closed (All)
+OpenAll=Abertos (Todos)
+ClosedAll=Fechados (Todos)
 New=Novo
 Discount=Desconto
 Unknown=Desconhecido
@@ -533,8 +542,8 @@ None=Nenhum
 NoneF=Nenhuma
 NoneOrSeveral=Nenhum ou vários
 Late=Atraso
-LateDesc=An item is defined as Delayed as per the system configuration in menu Home - Setup - Alerts.
-NoItemLate=No late item
+LateDesc=Um item é defenido como Atrasado devido às configurações do sistema no menu Início - Configuração - Alertas.
+NoItemLate=Nenhum item atrasado
 Photo=Foto
 Photos=Fotos
 AddPhoto=Adicionar foto
@@ -653,21 +662,22 @@ FeatureNotYetSupported=Funcionalidade ainda não suportada
 CloseWindow=Fechar Janela
 Response=Resposta
 Priority=Prioridade
-SendByMail=Send by email
+SendByMail=Enviar via e-mail
 MailSentBy=Email enviado por
+NotSent=Não enviado
 TextUsedInTheMessageBody=Texto utilizado no corpo da mensagem
 SendAcknowledgementByMail=Enviar email de confirmação
 SendMail=Enviar e-mail
 Email=Email
 NoEMail=Sem e-mail
-AlreadyRead=Already read
+AlreadyRead=Já lido
 NotRead=Não lido
 NoMobilePhone=Sem telefone móvel
 Owner=Proprietário
 FollowingConstantsWillBeSubstituted=As seguintes constantes serão substituidas pelo seu valor correspondente.
 Refresh=Actualizar
 BackToList=Voltar para a lista
-BackToTree=Back to tree
+BackToTree=Voltar para a árvore
 GoBack=Voltar
 CanBeModifiedIfOk=Pode ser modificado se for válido
 CanBeModifiedIfKo=Pode ser modificado senão for válido
@@ -675,9 +685,9 @@ ValueIsValid=Valor Válido
 ValueIsNotValid=O valor não é válido
 RecordCreatedSuccessfully=Registo criado com sucesso
 RecordModifiedSuccessfully=Registo modificado com êxito
-RecordsModified=%s record(s) modified
-RecordsDeleted=%s record(s) deleted
-RecordsGenerated=%s record(s) generated
+RecordsModified=%s registo(s) modificado(s)
+RecordsDeleted=%s registo(s) apagado(s)
+RecordsGenerated=%s registo(s) gerado(s)
 AutomaticCode=Criação automática de código
 FeatureDisabled=Função Desactivada
 MoveBox=Mover widget
@@ -688,14 +698,14 @@ Method=Método
 Receive=Receção
 CompleteOrNoMoreReceptionExpected=Complete ou nada mais é esperado
 ExpectedValue=Valor esperado
-ExpectedQty=Expected Qty
+ExpectedQty=Qtd. Esperada
 PartialWoman=Parcial
 TotalWoman=Total
 NeverReceived=Nunca Recebido
 Canceled=Cancelado
 YouCanChangeValuesForThisListFromDictionarySetup=Pode alterar estes valores para esta lista a partir do menu Configuração -> Dicionários
 YouCanChangeValuesForThisListFrom=Pode alterar os valores desta lista a partir do menu %s
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record in module setup
+YouCanSetDefaultValueInModuleSetup=Você pode defenir o valor por defeito utilizado aquando da criação de um novo registo na configuração do módulo
 Color=Cor
 Documents=Documentos
 Documents2=Documentos
@@ -705,7 +715,7 @@ MenuECM=Documentos
 MenuAWStats=Estatisticas
 MenuMembers=Membros
 MenuAgendaGoogle=Agenda Google
-MenuTaxesAndSpecialExpenses=Taxes | Special expenses
+MenuTaxesAndSpecialExpenses=Taxas | Despesas Especiais
 ThisLimitIsDefinedInSetup=Límite Dolibarr (Menu inicio->configuração->segurança): %s Kb, PHP limit: %s Kb
 NoFileFound=Não existem documentos guardados nesta pasta
 CurrentUserLanguage=Idioma atual
@@ -722,39 +732,39 @@ DateOfSignature=Data da assinatura
 HidePassword=Esconder password
 UnHidePassword=Mostrar caracteres da password
 Root=Raíz
-RootOfMedias=Root of public medias (/medias)
+RootOfMedias=Raiz de Múltimedia Públicos (/medias)
 Informations=Informação
 Page=Página
 Notes=Notas
 AddNewLine=Adicionar nova linha
 AddFile=Adicionar ficheiro
-FreeZone=Free-text product
-FreeLineOfType=Free-text item, type:
+FreeZone=Produto de Texto Livre
+FreeLineOfType=Item de Texto Livre, tipo:
 CloneMainAttributes=Copiar objeto com os seus atributos principais
-ReGeneratePDF=Re-generate PDF
+ReGeneratePDF=Regenerar PDF
 PDFMerge=PDF Merge
 Merge=Junção
 DocumentModelStandardPDF=Modelo PDF padrão
 PrintContentArea=Visualizar página para impressão área de conteúdo principal
 MenuManager=Gestão do menu
-WarningYouAreInMaintenanceMode=Warning, you are in maintenance mode: only login <b>%s</b> is allowed to use the application in this mode.
+WarningYouAreInMaintenanceMode=Atenção, você  está em modo de manutenção: Só o login <b>%s</b> está autorizado a usar a aplicação neste modo. 
 CoreErrorTitle=Erro de sistema
 CoreErrorMessage=Ocorreu um erro. Contacte o seu administrador do sistema de forma a que este proceda à análise do relatórios ou desative a opção $dolibarr_main_prod=1 para obter mais informação.
 CreditCard=Cartão de crédito
 ValidatePayment=Validar pagamento
 CreditOrDebitCard=Cartão de crédito ou débito
 FieldsWithAreMandatory=Os campos com <b>%s</b> são obrigatórios
-FieldsWithIsForPublic=Fields with <b>%s</b> are shown in public list of members. If you don't want this, uncheck the "public" box.
-AccordingToGeoIPDatabase=(according to GeoIP conversion)
+FieldsWithIsForPublic=Campos com <b>%s</b> são mostrados na lista de membros pública. Se não desejar isto, desmarque a caixa "público".
+AccordingToGeoIPDatabase=(de acordo com a conversão GeoIP)
 Line=Linha
 NotSupported=Não é suportado
 RequiredField=Campo obrigatório
 Result=Resultado
 ToTest=Teste
-ValidateBefore=Item must be validated before using this feature
+ValidateBefore=O item tem de ser validado antes de usar esta funcionalidade.
 Visibility=Visibilidade
-Totalizable=Totalizable
-TotalizableDesc=This field is totalizable in list
+Totalizable=Totalizável
+TotalizableDesc=Este campo é totalizável nesta lista
 Private=Privado
 Hidden=Oculto
 Resources=Recursos
@@ -773,17 +783,17 @@ LinkTo=Associar a
 LinkToProposal=Associar ao orçamento
 LinkToOrder=Hiperligação para encomendar
 LinkToInvoice=Associar a fatura
-LinkToTemplateInvoice=Link to template invoice
-LinkToSupplierOrder=Link to purchase order
-LinkToSupplierProposal=Link to vendor proposal
-LinkToSupplierInvoice=Link to vendor invoice
+LinkToTemplateInvoice=Link para a factura modelo
+LinkToSupplierOrder=Link para a ordem de compra
+LinkToSupplierProposal=Link para a proposta do fornecedor
+LinkToSupplierInvoice=Link para a factura do fornecedor
 LinkToContract=Associar a contrato
 LinkToIntervention=Associar a intervenção
-LinkToTicket=Link to ticket
+LinkToTicket=Link para o ticket
 CreateDraft=Criar Rascunho
 SetToDraft=Voltar para o rascunho
 ClickToEdit=Clique para editar
-ClickToRefresh=Click to refresh
+ClickToRefresh=Clique para actualizar
 EditWithEditor=Editar com CKEditor
 EditWithTextEditor=Editar com editor de texto
 EditHTMLSource=Editar código-fonte HTML
@@ -798,14 +808,14 @@ ByDay=Por dia
 BySalesRepresentative=Por representante de vendas
 LinkedToSpecificUsers=Associado ao contacto de um utilizador
 NoResults=Sem resultados
-AdminTools=Admin Tools
+AdminTools=Ferramentas de Administrador
 SystemTools=Ferramentas do sistema
 ModulesSystemTools=Módulos de ferramentas
 Test=Teste
 Element=Elemento
 NoPhotoYet=Sem imagem disponível ainda
 Dashboard=Painel
-MyDashboard=My Dashboard
+MyDashboard=O meu painel de controlo
 Deductible=Dedutível
 from=Emissor
 toward=relativamente a
@@ -828,7 +838,7 @@ PrintFile=Imprimir Ficheiro %s
 ShowTransaction=Mostrar transação
 ShowIntervention=Mostrar intervenção
 ShowContract=Mostrar contrato
-GoIntoSetupToChangeLogo=Go to Home - Setup - Company to change logo or go to Home - Setup - Display to hide.
+GoIntoSetupToChangeLogo=Vá a Início - Configuração - Empresa para mudar o logo ou vá a Ínicio - Configuração - Aparência para escondê-lo.
 Deny=Negar
 Denied=Negada
 ListOf=Lista de %s
@@ -836,60 +846,63 @@ ListOfTemplates=Lista de modelos
 Gender=Género
 Genderman=Homem
 Genderwoman=Mulher
+Genderother=Outro
 ViewList=Ver Lista
-ViewGantt=Gantt view
-ViewKanban=Kanban view
+ViewGantt=Vista de Gantt
+ViewKanban=Vista de Kanban
 Mandatory=Obrigatório
 Hello=Olá
 GoodBye=Adeus
 Sincerely=Atenciosamente
-ConfirmDeleteObject=Are you sure you want to delete this object?
+ConfirmDeleteObject=Tem a certeza que quer eliminar este objecto?
 DeleteLine=Apagar a linha
 ConfirmDeleteLine=Tem a certeza que deseja eliminar esta linha?
-ErrorPDFTkOutputFileNotFound=Error: the file was not generated. Please check that the 'pdftk' command is installed in a directory included in the $PATH environment variable (linux/unix only) or contact your system administrator.
+ErrorPDFTkOutputFileNotFound=Erro: o ficheiro não foi gerado. Por favor verifique que o comando 'pdftk' está instalado numa directoria incluída na variável de ambiente $PATH (apenas linux/Unix) ou contacte o seu administrador de sistema.
 NoPDFAvailableForDocGenAmongChecked=Não existia documento PDF disponível para a geração de documentos entre os registos assinalados
-TooManyRecordForMassAction=Too many records selected for mass action. The action is restricted to a list of %s records.
+TooManyRecordForMassAction=Foram seleccionados muitos registos para esta acção múltipla. A acção está restrita a uma lista de %s registos.
 NoRecordSelected=Nenhum registo selecionado
 MassFilesArea=Área para os ficheiros criados através de ações em massa
 ShowTempMassFilesArea=Mostrar área para os ficheiros criados através de ações em massa
-ConfirmMassDeletion=Bulk Delete confirmation
-ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record(s)?
+ConfirmMassDeletion=Confirmação de Múltiplas Eliminações
+ConfirmMassDeletionQuestion=Tem a certeza de que quer apagar os %s registo(s) seleccionado(s)?
 RelatedObjects=Objetos relacionados
 ClassifyBilled=Classificar como faturado
 ClassifyUnbilled=Classificar como não faturado
 Progress=Progresso
-ProgressShort=Progr.
+ProgressShort=Prog.
 FrontOffice=Front office
 BackOffice=Back office
-Submit=Submit
+Submit=Enviar
 View=Vista
 Export=Exportar
 Exports=Exportados
 ExportFilteredList=Exportar lista filtrada
 ExportList=Exportar lista
 ExportOptions=Opções de exportação
-IncludeDocsAlreadyExported=Include docs already exported
-ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
-ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
-AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
-NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
+IncludeDocsAlreadyExported=Os documentos incluídos já foram exportados
+ExportOfPiecesAlreadyExportedIsEnable=A exportação de pedaços já exportados está activada
+ExportOfPiecesAlreadyExportedIsDisable=A exportação de pedaços já exportados está desactivada.
+AllExportedMovementsWereRecordedAsExported=Todos os movimentos exportados foram marcados como exportados
+NotAllExportedMovementsCouldBeRecordedAsExported=Nem todos os movimentos exportados foram marcados como exportados
 Miscellaneous=Diversos
 Calendar=Calendario
 GroupBy=Agrupar por...
 ViewFlatList=Vista de lista
+ViewAccountList=Ver livro-mestre
+ViewSubAccountList=Ver livro-mestre da subconta
 RemoveString=Remover texto '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+SomeTranslationAreUncomplete=Alguns dos idiomas oferecidos podem estar apenas parcialmente traduzidos ou conter erros. Por favor ajude a corrigir o seu idioma registando-se em <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> para adicionar as suas melhorias.
 DirectDownloadLink=Link de download direto (público/externo)
 DirectDownloadInternalLink=Link de download direto (precisa de ter sessão iniciada e precisa de permissões)
 Download=Download
 DownloadDocument=Download do documento
 ActualizeCurrency=Atualizar taxa de conversão da moeda
 Fiscalyear=Ano Fiscal
-ModuleBuilder=Module and Application Builder
+ModuleBuilder=Construtor de Módulos e Aplicações
 SetMultiCurrencyCode=Definir moeda
 BulkActions=Ações em massa
 ClickToShowHelp=Clique para mostrar o balão de ajuda
-WebSite=Website
+WebSite=Site da Web
 WebSites=Sites da Web
 WebSiteAccounts=Contas do site
 ExpenseReport=Relatório de despesas
@@ -898,25 +911,25 @@ HR=RH
 HRAndBank=RH e Banco
 AutomaticallyCalculated=Calculado automaticamente
 TitleSetToDraft=Repôr para rascunho
-ConfirmSetToDraft=Are you sure you want to go back to Draft status?
+ConfirmSetToDraft=Tem a certeza que quer voltar ao estado de Rascunho?
 ImportId=ID de importação
 Events=Eventos
-EMailTemplates=Email templates
-FileNotShared=File not shared to external public
+EMailTemplates=Modelos de e-mail
+FileNotShared=Ficheiro não partilhado para o público exterior.
 Project=Projeto
 Projects=Projetos
-LeadOrProject=Lead | Project
-LeadsOrProjects=Leads | Projects
-Lead=Lead
-Leads=Leads
-ListOpenLeads=List open leads
-ListOpenProjects=List open projects
-NewLeadOrProject=New lead or project
+LeadOrProject=Pista | Projecto
+LeadsOrProjects=Pistas | Projectos
+Lead=Pista
+Leads=Pistas
+ListOpenLeads=Listar pistas em aberto
+ListOpenProjects=Listar projectos em aberto
+NewLeadOrProject=Nova pista ou projecto
 Rights=Permissões
 LineNb=Linha número
 IncotermLabel=Incoterms
-TabLetteringCustomer=Customer lettering
-TabLetteringSupplier=Vendor lettering
+TabLetteringCustomer=Inscrição de Cliente
+TabLetteringSupplier=Inscrição de fornecedor
 Monday=Segunda-feira
 Tuesday=Terça-feira
 Wednesday=Quarta-feira
@@ -945,39 +958,39 @@ ShortThursday=Qui
 ShortFriday=Sex
 ShortSaturday=Sab
 ShortSunday=Dom
-one=one
-two=two
-three=three
-four=four
-five=five
-six=six
-seven=seven
-eight=eight
-nine=nine
-ten=ten
-eleven=eleven
-twelve=twelve
-thirteen=thirdteen
-fourteen=fourteen
-fifteen=fifteen
-sixteen=sixteen
-seventeen=seventeen
-eighteen=eighteen
-nineteen=nineteen
-twenty=twenty
-thirty=thirty
-forty=forty
-fifty=fifty
-sixty=sixty
-seventy=seventy
-eighty=eighty
-ninety=ninety
-hundred=hundred
-thousand=thousand
-million=million
-billion=billion
-trillion=trillion
-quadrillion=quadrillion
+one=um
+two=dois
+three=três
+four=quatro
+five=cinco
+six=seis
+seven=Sete
+eight=oito
+nine=nove
+ten=dez
+eleven=onze
+twelve=doze
+thirteen=terceiro
+fourteen=quatorze
+fifteen=quinze
+sixteen=dezesseis
+seventeen=dezessete
+eighteen=dezoito
+nineteen=dezenove
+twenty=vinte
+thirty=trinta
+forty=quarenta
+fifty=cinquenta
+sixty=sessenta
+seventy=setenta
+eighty=oitenta
+ninety=noventa
+hundred=cem
+thousand=mil
+million=milhão
+billion=bilhão
+trillion=trilhão
+quadrillion=quatrilhão
 SelectMailModel=Selecione um modelo de e-mail
 SetRef=Definir referência
 Select2ResultFoundUseArrows=Foram encontrados alguns resultados. Utilize as setas para selecionar o desejado.
@@ -998,7 +1011,7 @@ SearchIntoMO=Ordens de Fabrico
 SearchIntoTasks=Tarefas
 SearchIntoCustomerInvoices=Faturas a clientes
 SearchIntoSupplierInvoices=Faturas do fornecedor
-SearchIntoCustomerOrders=Sales orders
+SearchIntoCustomerOrders=Encomendas de venda
 SearchIntoSupplierOrders=Ordens de compra
 SearchIntoCustomerProposals=Orçamentos
 SearchIntoSupplierProposals=Orçamentos de fornecedor
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Expedições do cliente
 SearchIntoExpenseReports=Relatórios de despesas
 SearchIntoLeaves=Sair
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Pagamentos de clientes
+SearchIntoVendorPayments=Pagamentos a fornecedores
+SearchIntoMiscPayments=Pagamentos diversos
 CommentLink=Comentários
 NbComments=Número de comentários
 CommentPage=Espaço de comentários
@@ -1015,7 +1031,7 @@ CommentAdded=Comentário adicionado
 CommentDeleted=Comentário eliminado
 Everybody=Todos
 PayedBy=Paga por
-PayedTo=Paid to
+PayedTo=Pago a
 Monthly=Mensal
 Quarterly=Trimestral
 Annual=Anual
@@ -1025,61 +1041,69 @@ LocalAndRemote=Local e Remoto
 KeyboardShortcut=Atalho de teclado
 AssignedTo=Atribuído a
 Deletedraft=Eliminar rascunho
-ConfirmMassDraftDeletion=Draft mass delete confirmation
+ConfirmMassDraftDeletion=Confirmação de eliminação múltipla de rascunhos
 FileSharedViaALink=Ficheiro partilhado via link
-SelectAThirdPartyFirst=Select a third party first...
+SelectAThirdPartyFirst=Seleccione um terceiro em primeiro...
 YouAreCurrentlyInSandboxMode=Você está atualmente no modo %s "sandbox"
 Inventory=Inventário
-AnalyticCode=Analytic code
+AnalyticCode=Código analítico
 TMenuMRP=MRP
-ShowMoreInfos=Show More Infos
-NoFilesUploadedYet=Please upload a document first
-SeePrivateNote=See private note
-PaymentInformation=Payment information
-ValidFrom=Valid from
-ValidUntil=Valid until
-NoRecordedUsers=No users
-ToClose=To close
+ShowMoreInfos=Mostrar Mais Informações
+NoFilesUploadedYet=Por favor envie um documento em primeiro
+SeePrivateNote=Ver nota privada
+PaymentInformation=Informação de pagamento
+ValidFrom=Válido desde
+ValidUntil=Válido até
+NoRecordedUsers=Sem utilizadores
+ToClose=Para fechar
 ToProcess=Por processar
-ToApprove=To approve
-GlobalOpenedElemView=Global view
-NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
-NoArticlesFoundForTheCategory=No article found for the category
-ToAcceptRefuse=To accept | refuse
+ToApprove=Para aprovar
+GlobalOpenedElemView=Vista global
+NoArticlesFoundForTheKeyword=Nenhum artigo encontrado para a palavra-chave '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=Nenhum artigo encontrado para a categoria
+ToAcceptRefuse=Para aceitar | recusar
 ContactDefault_agenda=Evento
 ContactDefault_commande=Encomenda
 ContactDefault_contrat=Contrato
 ContactDefault_facture=Fatura
 ContactDefault_fichinter=Intervenção
-ContactDefault_invoice_supplier=Supplier Invoice
-ContactDefault_order_supplier=Purchase Order
+ContactDefault_invoice_supplier=Factura de Fornecedor
+ContactDefault_order_supplier=Ordem de Encomenda
 ContactDefault_project=Projeto
 ContactDefault_project_task=Tarefa
 ContactDefault_propal=Orçamento
-ContactDefault_supplier_proposal=Supplier Proposal
+ContactDefault_supplier_proposal=Proposta de Fornecedor
 ContactDefault_ticket=Ticket
-ContactAddedAutomatically=Contact added from contact thirdparty roles
-More=More
-ShowDetails=Show details
-CustomReports=Custom reports
-StatisticsOn=Statistics on
-SelectYourGraphOptionsFirst=Select your graph options to build a graph
-Measures=Measures
-XAxis=X-Axis
-YAxis=Y-Axis
-StatusOfRefMustBe=Status of %s must be %s
-DeleteFileHeader=Confirm file delete
-DeleteFileText=Do you really want delete this file?
-ShowOtherLanguages=Show other languages
-SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for this language
-NotUsedForThisCustomer=Not used for this customer
-AmountMustBePositive=Amount must be positive
-ByStatus=By status
+ContactAddedAutomatically=Contacto adicionado a partir dos roles de contacto terceiro
+More=Mais
+ShowDetails=Mostrar detalhes
+CustomReports=Relatórios personalizados
+StatisticsOn=Estatísticas em
+SelectYourGraphOptionsFirst=Seleccione as opções para criar um gráfico
+Measures=Medidas
+XAxis=Eixo X
+YAxis=Eixo Y
+StatusOfRefMustBe=Estado de %s tem que ser %s
+DeleteFileHeader=Confirme a eliminação do ficheiro
+DeleteFileText=Tem a certeza de que quer eliminar este ficheiro?
+ShowOtherLanguages=Mostrar outros idiomas
+SwitchInEditModeToAddTranslation=Mude para o modo de edição para adicionar traduções para este idioma
+NotUsedForThisCustomer=Não utilizado para este cliente
+AmountMustBePositive=Total deve ser positivo
+ByStatus=Por estado
 InformationMessage=Informação
-Used=Used
-ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
-MODIFYInDolibarr=Record %s modified
-DELETEInDolibarr=Record %s deleted
-VALIDATEInDolibarr=Record %s validated
-APPROVEDInDolibarr=Record %s approved
+Used=Utilizado
+ASAP=Tão Breve Quanto Possível (ASAP)
+CREATEInDolibarr=Registo %s criado
+MODIFYInDolibarr=Registo %s modificado
+DELETEInDolibarr=Registo %s eliminado
+VALIDATEInDolibarr=Registo %s validado
+APPROVEDInDolibarr=Registo %s aprovado
+DefaultMailModel=Modelo de correio por defeito
+PublicVendorName=Nome público do fornecedor
+DateOfBirth=Data de Nascimento
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=O token de segurança expirou pelo que esta acção foi cancelada. Por favor tente novamente.
+UpToDate=Actualizado
+OutOfDate=Desactualizado
+EventReminder=Lembrete de evento
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/pt_PT/members.lang b/htdocs/langs/pt_PT/members.lang
index 882250687bc..861d7820707 100644
--- a/htdocs/langs/pt_PT/members.lang
+++ b/htdocs/langs/pt_PT/members.lang
@@ -19,14 +19,12 @@ MembersCards=Cartões de negócio dos membros
 MembersList=Lista de Membros
 MembersListToValid=Lista de Membros rascunho (a Confirmar)
 MembersListValid=Lista de Membros validados
-MembersListUpToDate=Lista dos Membros válidos ao dia de adesão
-MembersListNotUpToDate=Lista dos Membros válidos não ao dia de adesão
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=Lista de membros inativos
 MembersListQualified=Lista dos Membros qualificados
 MenuMembersToValidate=Membros rascunho
 MenuMembersValidated=Membros validados
-MenuMembersUpToDate=Membros actualizados
-MenuMembersNotUpToDate=Membros não actualizados
 MenuMembersResiliated=Membros inativos
 MembersWithSubscriptionToReceive=Membros com assinatura para receber
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Data filiação
 DateEndSubscription=Data fim filiação
 EndSubscription=Fim filiação
 SubscriptionId=Assinaturas id
+WithoutSubscription=Without subscription
 MemberId=Estados-id
 NewMember=Novo membro
 MemberType=Tipo de Membro
@@ -81,7 +80,7 @@ DeleteType=Apagar
 VoteAllowed=Voto autorizado
 Physical=Pessoa Singular
 Moral=Pessoa Coletiva
-MorPhy=Natureza
+MorAndPhy=Moral and Physical
 Reenable=Reactivar
 ResiliateMember=Terminar um membro
 ConfirmResiliateMember=Tem certeza de que deseja encerrar este membro?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Enviando email na validação de novo membro
 SendingEmailOnNewSubscription=Enviando email na nova assinatura
 SendingReminderForExpiredSubscription=Enviando lembrete para inscrições expiradas
 SendingEmailOnCancelation=Envio de email no cancelamento
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Sua associação foi recebida.
 YourMembershipWasValidated=Sua associação foi validada
@@ -167,6 +167,7 @@ MembersStatisticsByState=Membros estatísticas por estado / província
 MembersStatisticsByTown=Membros estatísticas por localidade
 MembersStatisticsByRegion=Estatísticas do membros por região
 NbOfMembers=Número de membros
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=Nenhum membro validado encontrado
 MembersByCountryDesc=Esta tela mostrará estatísticas sobre membros dos países. Gráfico depende, contudo, no serviço gráfico online da Google e apenas está disponível se existir uma conexão à Internet a funcionar.
 MembersByStateDesc=Esta tela mostrar-lhe as estatísticas sobre os membros por estado / província .
@@ -176,6 +177,7 @@ MenuMembersStats=Estatística
 LastMemberDate=Última data do membro
 LatestSubscriptionDate=Data da última subscrição
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=As informações são públicas
 NewMemberbyWeb=Novo membro acrescentou. Aguardando aprovação
 NewMemberForm=Forma novo membro
diff --git a/htdocs/langs/pt_PT/mrp.lang b/htdocs/langs/pt_PT/mrp.lang
index 5128c7a5d91..60409d454a7 100644
--- a/htdocs/langs/pt_PT/mrp.lang
+++ b/htdocs/langs/pt_PT/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Encomendas de Manufatura
-MO=Encomenda de Manufatura
 MOs=Manufacturing orders
+ManufacturingOrder=Encomenda de Manufatura
 MRPDescription=Módulo para gerir a produção e as «Encomendas de Manufatura» (EM).
 MRPArea=Área de MRP
 MrpSetupPage=Configuração do módulo MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Produtos para produzir
 UnitCost=Custo unitário
 TotalCost=Custo total
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index 95a866d3006..c3b0fc3d5eb 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Nº de preços
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Ativar produtos virtuais (kits)
-AssociatedProducts=Produtos virtuais
-AssociatedProductsNumber=Nº de produtos associados
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Número de produtos de embalagem fonte
 ParentProducts=Produtos para pais
-IfZeroItIsNotAVirtualProduct=Se 0, este produto não é um produto virtual
-IfZeroItIsNotUsedByVirtualProduct=Se 0, este produto não é usado por nenhum produto virtual
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Filtro por Chave
 CategoryFilter=Filtro por categoría
 ProductToAddSearch=Procurar produtos a Adicionar
 NoMatchFound=Não foram encontrados resultados
 ListOfProductsServices=Lista de produtos / serviços
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=Lista de produtos e serviços com este produto como um componente
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=Um dos produtos seleccionados é pai do produto em curso
 DeleteProduct=Eliminar um produto/serviço
 ConfirmDeleteProduct=Tem a certeza que quer eliminar este produto/serviço?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Valores globais disponíveis:
 PriceMode=Modo de preço
 PriceNumeric=Número
 DefaultPrice=Preço Predefinido
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Aumentar / Diminuir o estoque na mudança pai
 ComposedProduct=Child products
 MinSupplierPrice=Preço de compra mínimo
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/pt_PT/recruitment.lang b/htdocs/langs/pt_PT/recruitment.lang
index dc0d79996e3..b11245de51e 100644
--- a/htdocs/langs/pt_PT/recruitment.lang
+++ b/htdocs/langs/pt_PT/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Data esperada
 FutureManager=Futuro gerente
 ResponsibleOfRecruitement=Responsável pelo recrutamento
 IfJobIsLocatedAtAPartner=Se o trabalho estiver localizado num local de parceiro
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Posição da tarefa
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/pt_PT/stocks.lang b/htdocs/langs/pt_PT/stocks.lang
index 0ed339d10ed..2ad95e6aadc 100644
--- a/htdocs/langs/pt_PT/stocks.lang
+++ b/htdocs/langs/pt_PT/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Id. do Movimento %d
 ListMouvementStockProject=Lista de movimentos de estoque associados ao projeto
 StocksArea=Área de armazéns
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Localização
 LocationSummary=Nome abreviado da localização
@@ -122,8 +122,9 @@ DesiredStockDesc=Esse valor do estoque será o valor usado para preencher o esto
 StockToBuy=Pedir
 Replenishment=Reabastecimento
 ReplenishmentOrders=Ordens de reabastecimento
-VirtualDiffersFromPhysical=De acordo com as opções de aumento / redução de estoque, o estoque físico e o estoque virtual (pedidos físicos + atuais) podem diferir
-UseVirtualStockByDefault=Usar estoque virtual por padrão, em vez de estoque físico, para o recurso de reabastecimento
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Use estoque virtual
 UsePhysicalStock=Use estoque físico
 CurentSelectionMode=Modo de seleção atual
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=Este produto já está na lista
 SelectCategory=Filtro por categoría
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventário
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use o preço de compra se não for possível encontrar o último preço de compra
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Permitir alterar o valor do PMP para um produto
 ColumnNewPMP=Nova unidade PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/pt_PT/suppliers.lang b/htdocs/langs/pt_PT/suppliers.lang
index 8dcadcefa7e..3449b28052b 100644
--- a/htdocs/langs/pt_PT/suppliers.lang
+++ b/htdocs/langs/pt_PT/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Encomendas a fornecedor por faturar
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Reputação do fornecedor
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Não encomendar
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputação
diff --git a/htdocs/langs/pt_PT/website.lang b/htdocs/langs/pt_PT/website.lang
index f28fef66c3c..c18079450fb 100644
--- a/htdocs/langs/pt_PT/website.lang
+++ b/htdocs/langs/pt_PT/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Adicionar site da Web
 Webpage=Página/recipiente da Web
 AddPage=Adicionar página/recipiente
 HomePage=Página Inicial
-PageContainer=Página/recipiente
+PageContainer=Página
 PreviewOfSiteNotYetAvailable=Pré-visualização do seu site <strong> %s </ strong> ainda não disponível. Você deve primeiro '<strong> Importar um modelo de site completo </ strong>' ou apenas '<strong> Adicionar uma página / contêiner </ strong>'.
 RequestedPageHasNoContentYet=Página solicitada com o ID %s ainda não tem conteúdo, ou o arquivo de cache .tpl.php foi removido. Edite o conteúdo da página para resolver isso.
 SiteDeleted=Web site '%s' excluído
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=Feed RSS
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index 9d39b675134..db1f0e59b3f 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Implicit pentru serviciu
 DefaultForProduct=Implicit pentru produs
 CantSuggest=Nu pot sugera
 AccountancySetupDoneFromAccountancyMenu=Cele mai multe configurări ale contabilității se fac din meniul %s
-ConfigAccountingExpert=Configurare modul expert contabil
+ConfigAccountingExpert=Configurare modul Contabilitate (partidă dublă)
 Journalization=Inregistrari contabile
-Journaux=Jurnale
+Journals=Jurnale
 JournalFinancial=Jurnale financiare
 BackToChartofaccounts=Înapoi la planul de conturi
 Chartofaccounts=Plan de conturi
+ChartOfSubaccounts=Diagrama conturilor contabile individuale
+ChartOfIndividualAccountsOfSubsidiaryLedger=Diagrama conturilor contabile individuale ale registrului filialei
 CurrentDedicatedAccountingAccount=Cont curent dedicat
 AssignDedicatedAccountingAccount=Cont nou pentru alocare
 InvoiceLabel=Etichetă de factură
@@ -33,8 +35,8 @@ OtherInfo=Alte informații
 DeleteCptCategory=Eliminați contul contabil din grup
 ConfirmDeleteCptCategory=Sigur doriți să eliminați acest cont contabil din grupul de conturi contabil?
 JournalizationInLedgerStatus=Starea înregistrărilor 
-AlreadyInGeneralLedger=Deja înregistrată în registre
-NotYetInGeneralLedger=Încă neînregistrată în registre
+AlreadyInGeneralLedger=Transferat deja în jurnale și registrele contabile
+NotYetInGeneralLedger=Netransferat încă în jurnale și registrele contabile
 GroupIsEmptyCheckSetup=Grupul este gol, verificați configurarea grupului de contabilitate personalizat
 DetailByAccount=Afișați detalii pe cont
 AccountWithNonZeroValues=Conturi cu valori nenule
@@ -43,7 +45,9 @@ CountriesInEEC=Țările din CEE
 CountriesNotInEEC=Țări care nu se află în CEE
 CountriesInEECExceptMe=Țările din CEE, cu excepția celor de la %s
 CountriesExceptMe=Toate țările, cu excepția %s
-AccountantFiles=Export de documente contabile
+AccountantFiles=Export documente sursă
+ExportAccountingSourceDocHelp=Cu acest instrument, puteți exporta evenimentele sursă (listă și PDF-uri) care au fost utilizate pentru a vă genera înregistrările contabile. Pentru a vă exporta jurnalele, utilizați intrarea din meniu %s-%s.
+VueByAccountAccounting=Vizualizare după contul contabil
 
 MainAccountForCustomersNotDefined=Contul contabil principal pentru clienții care nu sunt definiți în configurare
 MainAccountForSuppliersNotDefined=Contul contabil principal pentru furnizorii care nu sunt definiți în configurare
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=PAS %s: Adăugați sau modificați tranzacțiile exis
 
 AccountancyAreaDescClosePeriod=PASUL %s: Inchideți perioada, astfel încât să nu putem modifica în viitor.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=Un pas obligatoriu în configurare nu a fost complet (jurnalul codului de contabilitate nu este definit pentru toate conturile bancare)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Un pas obligatoriu în configurare nu a fost finalizat (contul contabil jurnal nu este definit pentru toate conturile bancare)
 Selectchartofaccounts=Selectați schema activă de conturi
 ChangeAndLoad=Schimbați și încărcați
 Addanaccount=Adauga un cont contabil
@@ -89,6 +93,8 @@ SubledgerAccount=Cont de subregistru
 SubledgerAccountLabel=Eticheta contului registrului contabil
 ShowAccountingAccount=Afișați contul contabil
 ShowAccountingJournal=Arătați jurnalul contabil
+ShowAccountingAccountInLedger=Afişare cont contabil în registru
+ShowAccountingAccountInJournals=Afişează conturile contabile în jurnale
 AccountAccountingSuggest=Conturi contabile sugerate
 MenuDefaultAccounts=Conturi implicite
 MenuBankAccounts=Conturi bancare
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Raportul de cheltuieli obligatoriu
 CreateMvts=Creați o nouă tranzacție
 UpdateMvts=Modificarea unei tranzacții
 ValidTransaction=Tranzacție validată
-WriteBookKeeping=Înregistrare tranzacţii în Cartea mare
+WriteBookKeeping=Înregistrare tranzacţii în contabilitate
 Bookkeeping=Cartea mare
+BookkeepingSubAccount=Registru analitic
 AccountBalance=Sold cont
 ObjectsRef=Referinţă sursă obiect
 CAHTF=Cumpărare totală de la furnizor înainte de impozitare
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Dezactivați înregistrarea directă a tranzacției î
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Activați schița de export în jurnal
 ACCOUNTANCY_COMBO_FOR_AUX=Activați lista combo pentru cont auxiliar (poate fi lentă dacă aveți o mulțime de terți)
 ACCOUNTING_DATE_START_BINDING=Definiți o dată pentru a începe legarea și transferul în contabilitate. Înainte de această dată, tranzacțiile nu vor fi transferate în contabilitate.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=La transferul contabil, selectați perioada în mod implicit 
 
 ACCOUNTING_SELL_JOURNAL=Jurnal vânzări
 ACCOUNTING_PURCHASE_JOURNAL=Jurnal cumpărări
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Contul contabil de așteptare
 DONATION_ACCOUNTINGACCOUNT=Contul contabil pentru a înregistra donații
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Contul Contabilitate pentru a înregistra abonamente
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT= Cont contabil implicit pentru înregistra depunerilor clientului
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Contul contabil implicit pentru produsele cumpărate (se foloseşte dacă nu este definit în fișa de produs)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT= Contul contabil implicit pentru produsele cumpărate din CEE (utilizat dacă nu este definit în fișa de produs)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT= Contul contabil implicit pentru produsele cumpărate și importate din CEE (utilizate dacă nu sunt definite în fișa de produs)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Prin grupuri predefinite
 ByPersonalizedAccountGroups=Prin grupuri personalizate
 ByYear=Pe ani
 NotMatch=Nu este setat
-DeleteMvt=Ștergeți liniile din Cartea Mare
+DeleteMvt=Ștergeți câteva linii operate din contabilitate
 DelMonth=Luna care se şterge
 DelYear=Anul pentru ștergere
 DelJournal=Jurnalul de șters
-ConfirmDeleteMvt= Aceasta va șterge toate liniile din Jurnal pentru anul/luna și/sau dintr-un jurnal specific (este necesar cel puțin un criteriu). Va trebui să reutilizați funcția „Înregistrare în contabilitate” pentru a înregistra din nou tranzacţiile şterse.
-ConfirmDeleteMvtPartial=Aceasta va șterge toate liniile Cărţii Mari  (toate liniile legate de aceeași tranzacție vor fi șterse)
+ConfirmDeleteMvt=Aceasta va șterge toate liniile operate în contabilitate pentru anul/luna și/sau pentru un jurnal specific (este necesar cel puțin un criteriu). Va trebui să refolosiți caracteristica '%s' pentru a înregistra înregistrarea ștearsă în registru. 
+ConfirmDeleteMvtPartial=Aceasta va șterge tranzacția din contabilitate (toate liniile de operațiuni legate de aceeași tranzacție vor fi șterse)
 FinanceJournal=Jurnal Bancă
 ExpenseReportsJournal=Jurnalul rapoartelor de cheltuieli
 DescFinanceJournal=Jurnal de finanțe, care include toate tipurile de plăți prin cont bancar
-DescJournalOnlyBindedVisible=Aceasta este o vizualizare a înregistrării care este legată de un cont de contabilitate și poate fi înregistrată în fișierul Cărţii Mari.
+DescJournalOnlyBindedVisible=Aceasta este o vedere a înregistrării care este legată de un cont contabil și poate fi înregistrată în Jurnale și contabilitate.
 VATAccountNotDefined=Contul de TVA nu a fost definit
 ThirdpartyAccountNotDefined=Contul pentru o terță parte nu este definit
 ProductAccountNotDefined=Contul pentru produs nu este definit
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Acest jurnal este deja folosit
 AccountingAccountForSalesTaxAreDefinedInto=Note: contul contabil pentru taxe de vânzări tax este definit în menu <b> %s </b> - <b> %s </b>
 NumberOfAccountancyEntries=Number de intrări
 NumberOfAccountancyMovements=Număr de mișcări
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Dezactivați legarea și transferul în contabilitate pentru vânzări (facturile clienților nu vor fi luate în considerare în contabilitate) 
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Dezactivați legarea și transferul în contabilitate pentru achiziții (facturile furnizor nu vor fi luate în considerare în contabilitate) 
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Dezactivați legarea și transferul în contabilitate pentru rapoartele de cheltuieli (rapoartele de cheltuieli nu vor fi luate în considerare în contabilitate)
 
 ## Export
 ExportDraftJournal=Exportați proiectul de jurnal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Exportați CSV configurabil
 Modelcsv_FEC=Exportă fişier FEC
 Modelcsv_Sage50_Swiss=Export pentru Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export pentru Gestinum (v3)
+Modelcsv_Gestinumv5Export pentru Gestinum (v5)
 ChartofaccountsId=Id-ul listei de conturi
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index fa9ced9b194..604e4a99a94 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Înlăturaţi blocarea conexiunilor
 YourSession=Sesiunea dvs
 Sessions=Sesiuni utilizatori
 WebUserGroup=Utilizator/grup Web Server
+PermissionsOnFilesInWebRoot=Permisiunile fişierelor din directorul web rădăcină
+PermissionsOnFile=Permisiuni pe fişierul %s
 NoSessionFound=Configurația dvs. PHP pare să nu permită listarea sesiunilor active. Directorul utilizat pentru salvarea sesiunilor (<b> %s </b>) ar putea fi protejat (de exemplu prin permisiuni ale sistemului de operare sau prin directiva PHP open_basedir).
 DBStoringCharset=Set caractere  al bazei de date pentru  stocarea datelor
 DBSortingCharset=Set caractereal bazei de date pentru sortarea datelor
@@ -71,7 +73,7 @@ DisableJavascriptNote= \nNotă: În scop de testare sau de depanare. Pentru opt
 UseSearchToSelectCompanyTooltip= De asemenea, dacă aveți un număr mare de terţi (> 100 000), puteți crește viteza prin setarea constantei COMPANY_DONOTSEARCH_ANYWHERE la 1 la Setup->Other. Căutarea va fi limitată la începutul șirului.
 UseSearchToSelectContactTooltip=De asemenea, dacă aveți un număr mare de terţi (> 100 000), puteți crește viteza prin setarea constantei COMPANY_DONOTSEARCH_ANYWHERE la 1 la Setup->Other. Căutarea va fi limitată la începutul șirului.
 DelaiedFullListToSelectCompany=Așteptați până când o tastă este apăsată înainte de a încărca conținutul listei combo-urilor terțe. <br> Acest lucru ar putea crește performanța dacă aveți un număr mare de terțe părți, dar este mai puțin convenabil.
-DelaiedFullListToSelectContact=Așteptați până când este apăsată o tastă înainte de a încărca conținutul listei de contacte combo. <br> Aceasta ar putea crește performanța dacă aveți un număr mare de contacte, dar este mai puțin convenabil)
+DelaiedFullListToSelectContact=Așteptați până când este apăsată o tastă înainte de a încărca conținutul listei combinate Contact.<br> Acest lucru poate crește performanța dacă aveți un număr mare de contacte, dar este mai puțin convenabil.
 NumberOfKeyToSearch=Număr de caractere care să declanșeze căutarea: %s
 NumberOfBytes=Număr de octeți
 SearchString=Șir de căutare
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=Pe documentul unui terț, puteți alege un
 JavascriptDisabled=JavaScript dezactivat
 UsePreviewTabs=Utilizaţi taburile previzualizare
 ShowPreview=Arată previzualizare
+ShowHideDetails=Afişare-Ascundere detalii
 PreviewNotAvailable=Preview nu este disponibil
 ThemeCurrentlyActive=Tema activă în prezent
 CurrentTimeZone=TimeZone PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Perioadă notita
 NewByMonth=Nou pe lună
 Emails=E-mailuri
 EMailsSetup=Setarea e-mailurilor
-EMailsDesc=Această pagină vă permite să înlocuiți parametrii impliciți PHP pentru trimiterea e-mailurilor. În majoritatea cazurilor pe sistemul de operare Unix / Linux, configurarea PHP este corectă și acești parametri nu sunt necesari.
+EMailsDesc=Această pagină vă permite să setați parametri sau opțiuni pentru trimiterea e-mailurilor.
 EmailSenderProfiles=Profilurile expeditorului mailurilor
 EMailsSenderProfileDesc=Puteți lăsa această secțiune goală. Dacă introduceți câteva e-mailuri aici, acestea vor fi adăugate la lista posibililor expeditori în combobox atunci când scrieți un nou e-mail.
 MAIN_MAIL_SMTP_PORT=Portul SMTP / SMTPS (valoarea implicită în php.ini: <b> %s </b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=ID SMTP (dacă serverul de expediere necesită autentificare)
 MAIN_MAIL_SMTPS_PW=Parola SMTP (dacă serverul de trimitere necesită autentificare)
 MAIN_MAIL_EMAIL_TLS=Utilizați criptarea TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Utilizați criptarea TLS (STARTTLS)
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autorizați certificatele auto-semnate
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Utilizați DKIM pentru a genera semnătura de e-mail
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Domeniul de e-mail pentru utilizare cu dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Numele selectorului dkim
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Lăsând acest câmp necompletat înseamnă că acea
 ExtrafieldParamHelpselect=Lista de valori trebuie să fie linii cu format cheie,valoare (unde cheia nu poate fi "0") <br> <br> de exemplu: <br> 1,valoare1 <br> 2,valoare2 <br> code3,valoare3 <br> ... <br> <br> Pentru a avea lista în funcție de o altă listă de atribute complementare: <br> 1, valoare1| opţiuni_<i> parent_list_code </i>: parent_key <br> 2,valoare2|opţiuni_ <i> parent_list_code </i>: parent_key <br><br> Pentru a avea lista în funcție de altă listă: <br> 1, valoare1| <i> parent_list_code </i>: parent_key <br> 2, valoare2| <i> parent_list_code </i>: parent_key
 ExtrafieldParamHelpcheckbox=Lista de valori trebuie să fie linii cu format cheie,valoare ( cheia nu poate fi "0") <br> <br> de exemplu: <br> 1,valoare1 <br> 2,valoare2 <br> 3,valoare3 <br> ...
 ExtrafieldParamHelpradio=Lista de valori trebuie să fie linii cu format cheie,valoare ( cheia nu poate fi "0") <br> <br> de exemplu: <br> 1,valoare1 <br> 2,valoare2 <br> 3,valoare3 <br> ...
-ExtrafieldParamHelpsellist=Lista de valori provine dintr-un tabel <br> Sintaxă: table_name: label_field: id_field :: filter <br> Exemplu: c_typent: libelle: id :: filter <br> <br> - idfilter este obligatoriu o cheie primară <br> - filtrul poate fi un test simplu (de exemplu, activ = 1) pentru a afișa numai valoarea activă <br> Puteți utiliza, de asemenea, $ID$ în filtrul care este ID-ul curent al obiectului curent <br> Pentru a face SELECT în filtru utilizați $SEL$ <br> dacă vrei să filtrezi în extracâmpuri foloseste sintaxa extra.fieldcode = ... (unde codul de câmp este codul extra-câmpului) <br> <br> Pentru a avea lista în funcție de o altă listă de atribute complementare: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> |parent_column: filter <br> <br> Pentru a avea lista în funcție de altă listă: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filtru
+ExtrafieldParamHelpsellist=Lista valorilor provine dintr-un tabel <br>Sintaxă: table_name:label_field: id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field este în mod necesar o cheie integer primară<br>- filtrul poate fi un test simplu (de exemplu, activ = 1) pentru a afișa numai valorile active<br> De asemenea, puteți utiliza $ID$ în filtru, care este id-ul obiectului curent <br>Pentru a utiliza un SELECT în filtru, utilizați cuvântul cheie $SEL$ pentru a ocoli protecția anti-injecție. <br>Dacă doriți să filtrați pe câmpuri suplimentare, utilizați sintaxa extra.fieldcode =... (unde codul de câmp este codul extracâmpului)<br><br> Pentru a avea lista în funcție de o altă listă de atribute complementare:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br> Pentru a avea lista în funcție de o altă listă:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Lista de valori vine dintr-un tabel<br>Sintaxă: table_name:label_field:id_field::filter<br>Examplu: c_typent:libelle:id::filter<br><br>filtrul poate fi un simplu test (ex active=1) pentru a afişa doar valoarea activă<br>De asemenea se poate utiliza $ID$ în filtrul care este ID-ul curent al obiectului curent<br>Pentru a face o SELECTARE în filtru folosiţi $SEL$<br>dacă doriţi să filtraţi în extracâmpuri folosiţi sintaxa extra.fieldcode=... (unde codul câmpului este codul extracâmpului)<br><br>Pentru a avea lista în funcție de o altă listă de atribute complementare:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>Pentru a avea lista în funcție de o altă listă :<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parametrii trebuie să fie ObjectName: Classpath <br> Sintaxă: ObjectName: Classpath <br> Exemple: <br> Societe:societe/class/societe.class.php <br> Contact: contact/class/contact.class.php
+ExtrafieldParamHelplink=Parametrii trebuie să fie ObjectName:Classpath<br>Sintaxă: ObjectName: Classpath 
 ExtrafieldParamHelpSeparator=Păstrați liber pentru un separator simplu <br> Setați acest lucru la 1 pentru un separator care se prăbușește (deschis în mod implicit pentru o nouă sesiune, apoi starea este păstrată pentru fiecare sesiune de utilizator) <br> Setați acest lucru la 2 pentru un separator care se prăbușește (se prăbușește implicit pentru o nouă sesiune, apoi starea este păstrată pentru fiecare sesiune a utilizatorului)
 LibraryToBuildPDF=Bibliotecă utilizată pentru generarea PDF-urilor
 LocalTaxDesc=Unele țări pot aplica două sau trei taxe pe fiecare linie de facturare. Dacă este cazul, alegeți tipul pentru a doua și a treia taxă și rata acestora. Tipuri posibile sunt: <br> 1: taxa locală se aplică produselor și serviciilor fără TVA (localtax se calculează pe valoare fără taxă)<br> 2: taxa locală se aplică produselor și serviciilor, inclusiv TVA (localtax se calculează în funcție de valoare+ taxa principală ) <br>3: taxa locală se aplică produselor fără TVA (localtax se calculează pe valoare fără taxă) <br>4: taxa locală se aplică produselor şi includ tva (localtax  se calculeaza pe valoare + TVA principală) <br> 5: taxa locală se aplică serviciilor fără TVA (localtax se calculează pe valoarea fără TVA) <br> 6: taxa locală se aplică serviciilor, inclusiv TVA (localtax se calculează pe sumă + taxă)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s urmat de numele clientului trunchiat de nu
 ModuleCompanyCodeSupplierDigitaria=%s urmată de numele furnizorului trunchiat de numărul de caractere: %s pentru codul contabil al furnizorului.
 Use3StepsApproval=În mod implicit, comenzile de cumpărare trebuie să fie create și aprobate de 2 utilizatori diferiți (un pas/utilizator de creat și un pas/utilizator de aprobat. Rețineți că, dacă utilizatorul are atât permisiunea de a crea și de a aproba, va fi suficient un pas/un utilizator). Puteți solicita această opțiune pentru a introduce un al treilea pas/aprobare pentru utilizatori, dacă suma este mai mare decât o valoare dedicată (astfel încât vor fi necesari 3 pași:  1 = validare, 2 = prima aprobare și 3 = o a doua aprobare dacă suma este suficientă). <br> Setați acest lucru la gol, dacă este suficientă o aprobare (2 pași), setați-o la o valoare foarte mică (0,1) dacă este întotdeauna necesară o a doua aprobare (3 pași).
 UseDoubleApproval=Utilizați o aprobare de 3 pași atunci când suma (fără taxă) este mai mare decât ...
-WarningPHPMail=AVERTISMENT: Este adesea mai bine să configurați e-mailurile de trimis pentru a utiliza serverul de e-mail al furnizorului dvs. în loc de setarea implicită. Unii furnizori de e-mail (cum ar fi Yahoo) nu vă permit să trimiteți un e-mail de la un alt server decât propriul lor server. Setarea dvs. curentă utilizează serverul aplicației pentru a trimite e-mailuri și nu serverul furnizorului de servicii de e-mail, astfel încât unii destinatari (cel compatibil cu protocolul DMARC restrictiv) vor întreba furnizorul dvs. de e-mail dacă pot accepta e-mailul dvs. și anumiți furnizori de e-mail (cum ar fi Yahoo) pot răspunde "nu" deoarece serverul nu este al lor, astfel încât puține dintre e-mailurile trimise nu pot fi acceptate (aveți grijă și de cota de trimitere a furnizorului de servicii de e-mail). această restricție trebuie să schimbați configurarea e-mailului pentru a alege cealaltă metodă "server SMTP" și introduceți serverul SMTP și acreditările furnizate de furnizorul dvs. de e-mail.
+WarningPHPMail=ATENŢIE: Configurarea pentru trimitea de email-uri din aplicație utilizează configurarea generică implicită. De multe ori este mai bine să configurați email-urile de ieșire pentru a utiliza serverul de email al furnizorului dvs. de servicii email în loc de configurarea implicită din mai multe motive:
+WarningPHPMailA=- Utilizarea serverului furnizorului de servicii de e-mail crește fiabilitatea e-mailului dvs., astfel încât crește livrabilitatea fără a fi semnalată ca SPAM
+WarningPHPMailB=- Unii furnizori de servicii de email (cum ar fi Yahoo) nu vă permit să trimiteți un email de pe alt server decât propriul server. Configurarea dvs. actuală utilizează serverul aplicației pentru a trimite email-uri și nu serverul furnizorului dvs. de email, deci unii destinatari (cei compatibili cu protocolul restrictiv DMARC), vă vor întreba furnizorul de email dacă vă pot accepta emailul și unii furnizori de email (cum ar fi Yahoo) poate răspunde "nu" deoarece serverul nu este al lor, așa că puține emailuri trimise pot să nu fie acceptate pentru livrare (aveți grijă și la cota de trimitere a furnizorului dvs. de email). 
+WarningPHPMailC=- Utilizând serverul SMTP al furnizorului de servicii email pentru a trimite email-uri este, de asemenea, interesantă, astfel încât toate email-urile trimise din aplicație vor fi, de asemenea, salvate în directorul "Trimise" al cutiei poștale.
+WarningPHPMailD=Dacă metoda „PHP Mail” este cu adevărat metoda pe care ați dori să o utilizați, puteți elimina acest avertisment adăugând constanta MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP la 1 în Acasă - Configurare - Altele.
 WarningPHPMail2=Dacă furnizorul dvs. de e-mail SMTP trebuie să restricționeze clientul de e-mail la unele adrese IP (foarte rar), aceasta este adresa IP a agentului utilizator de e-mail (MUA) pentru aplicația ERP CRM: <strong> %s </strong>.
-WarningPHPMailSPF=Dacă numele de domeniu din adresa de e-mail a expeditorului este protejat de SPF (solicitat de furnizorul de e-mail), trebuie să includeți următoarele IP-uri în înregistrarea SPF DNS a domeniului dvs.:<strong>%s</strong>.
+WarningPHPMailSPF= Dacă numele de domeniu din adresa dvs. de e-mail a expeditorului este protejat de o înregistrare SPF (vă rugăm să vă înregistrați numele domeniului), trebuie să adăugați următoarele adrese IP în înregistrarea SPF a DNS-ului domeniului dvs.:<strong>%s</strong>.
 ClickToShowDescription=Faceți clic pentru a afișa descrierea
 DependsOn=Acest modul are nevoie de modulul (modulele)
 RequiredBy=Acest modul este solicitat de modulul (modulele)
@@ -551,8 +559,6 @@ Module57Name=Plăţi prin direct debit
 Module57Desc=Gestionarea ordinelor de direct debit. Acesta include generarea de fișiere SEPA pentru țările europene. 
 Module58Name=ClickToDial
 Module58Desc=ClickToDial integrare
-Module59Name=Bookmark4u
-Module59Desc=Adauga funcţia de a genera Bookmark4u de cont de la un cont Dolibarr
 Module60Name=Stickere
 Module60Desc=Management stickere
 Module70Name=Intervenţii
@@ -656,7 +662,7 @@ Module50200Desc=Oferiți clienților o pagină de plată online PayPal (cont Pay
 Module50300Name=Dunga
 Module50300Desc=Oferiți clienţilor o pagină Stripe de plată online (carduri de credit/debit). Aceasta poate fi utilizată pentru a permite clienţilor să facă plăţi ad-hoc sau plăţi legate de un anumit obiect Dolibarr (factură, comandă etc ...)
 Module50400Name=Contabilitate (intrare dublă)
-Module50400Desc=Gestionarea contabilă (intrări duble, suport general şi registre auxiliare). Exportați registrul în mai multe alte formate contabile .
+Module50400Desc=Managementul contabilității (partidă dublă, suport jurnale contabile principale şi subsidiare- de filială). Exportați registrele în mai multe alte formate utilizate de software-uri de contabilitate. 
 Module54000Name=Print lP IPrinter
 Module54000Desc=Imprimare directă (fără a deschide documentele) utilizând interfața Cups IPP (Imprimanta trebuie să fie vizibilă pe server, and CUPS trebuie să fie instalat pe server).
 Module55000Name=Sondaj, supraveghere sau vot
@@ -671,7 +677,7 @@ Module63000Name=Resurse
 Module63000Desc=Gestionați resursele (imprimante, mașini, camere, ...) pentru a le aloca evenimentelor
 Permission11=Citeşte facturi
 Permission12=Creaţi/Modificare facturi
-Permission13=Facturi client nevalidate
+Permission13=Invalidează facturi client
 Permission14=Facturi client validate
 Permission15=Trimite facturi prin e-mail
 Permission16=Crearea de plăţi pentru facturile
@@ -688,6 +694,7 @@ Permission32=Creare / Modificare produse / servicii
 Permission34=Ştergere produse / servicii
 Permission36=Exportul de produse / servicii
 Permission38=Exportul de produse
+Permission39=Ignoră preţul minim de vânzare
 Permission41=Citiți proiectele și sarcinile (proiecte și proiecte comune pentru care sunt persoană de contact). Se poate, de asemenea, să introduceți timpul consumat, pentru mine sau pentru ierarhia mea, asupra sarcinilor atribuite (Timesheet)
 Permission42=Creați/modificați proiecte (proiecte și proiecte comune pentru care sunt persoană de contact). De asemenea, se pot crea sarcini și se pot atribui utilizatorilor proiecte și sarcini
 Permission44=Ștergeți proiectele (proiectul comun și proiectele pentru care sunt persoană de contact)
@@ -696,6 +703,9 @@ Permission61=Citeşte intervenţii
 Permission62=Creare / Modificare intervenţii
 Permission64=Ştergere intervenţii
 Permission67=Export intervenţii
+Permission68=Trimitere intervenţii pe email
+Permission69=Validează intervenţii
+Permission70=Invalidează intervenţii
 Permission71=Citeşte membrii
 Permission72=Creare / Modificare membri
 Permission74=Ştergere membri
@@ -718,6 +728,7 @@ Permission95=Citeşte rapoarte
 Permission101=Citeşte sendings
 Permission102=Creare / Modificare Livrare
 Permission104=Validează livrari
+Permission105=Trimitere expediţii pe email
 Permission106=Export livrări
 Permission109=Ştergere sendings
 Permission111=Citeşte conturile financiare
@@ -825,10 +836,11 @@ Permission402=Creare / Modificare reduceri
 Permission403=Validate reduceri
 Permission404=Ştergere reduceri
 Permission430=Utilizați bara de depanare
-Permission511=Citire salarii
+Permission511=Vizualizare plăți salarii (ale dvs. și ale subordonaților)
 Permission512=Creare / Modificare plata salariilor 
 Permission514=Şterge plata salariilor 
-Permission517=Export salarii
+Permission517=Vizualizare plăţilor salariilor tuturor 
+Permission519=Export salarii
 Permission520=Citeşte credite
 Permission522=Creare/modificare credite
 Permission524=Şterge credite
@@ -839,16 +851,19 @@ Permission532=Creare / Modificare servicii
 Permission534=Ştergere servicii
 Permission536=A se vedea / administra serviciile ascunse
 Permission538=Exportul de servicii
-Permission561=Read payment orders by credit transfer
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
-Permission564=Record Debits/Rejections of credit transfer
+Permission561=Citire ordine de plată prin transfer de credit
+Permission562=Creare/modificare comandă de plată prin transfer de credit
+Permission563=Trimitere/Transmitere comanda de plată prin transfer de credit 
+Permission564=Înregistrare debite/respingeri de transfer de credit
+Permission601=Citeşte stickere
+Permission602=Creare/modificare stickere
+Permission609=Şterge stickere
 Permission650=Citiți facturile de materiale
 Permission651=Creați / actualizați facturile de materiale
 Permission652=Ștergeți facturile de materiale
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
+Permission660=Citire Comandă de producţie (MO)
+Permission661=Creare/Actualizare Comandă de producţie (MO)
+Permission662=Ştergere Comandă de producţie (MO)
 Permission701=Citiţi donaţii
 Permission702=Creare / Modificare donaţii
 Permission703=Ştergere donaţii
@@ -858,8 +873,8 @@ Permission773=Șterge rapoarte de cheltuieli
 Permission774=Citiți toate rapoartele de cheltuieli (chiar și pentru utilizatorii care nu sunt subordonații dvs.)
 Permission775=Aproba rapoarte de cheltuieli
 Permission776=Plăste  rapoarte de cheltuieli
-Permission777=Read expense reports of everybody
-Permission778=Create/modify expense reports of everybody
+Permission777=Citire rapoarte de cheltuieli ale tuturor
+Permission778=Creare/modificare rapoarte de cheltuieli pentru toţi
 Permission779=Export Rapoarte Cheltuieli
 Permission1001=Citeşte stocuri
 Permission1002=Creare / modificare depozite
@@ -884,7 +899,9 @@ Permission1185=Aprobați comenzile de achiziţie
 Permission1186=Comanda comenzi de cumpărare
 Permission1187=Recunoașteți bonul comenzii de cumpărare
 Permission1188=Șterge comenzile de cumpărare
+Permission1189=Bifați/Debifați recepția comenzii de achiziţie
 Permission1190=Aprobă comenzile de achiziție (a doua aprobare)
+Permission1191=Export comenzi de achiziţie cu atribute
 Permission1201=Obţineţi rezultatul unui export
 Permission1202=Creare / Modificare de export
 Permission1231=Citiți facturile furnizorilor
@@ -898,6 +915,8 @@ Permission1251=Run masa importurile de date externe în baza de date (date de sa
 Permission1321=Export client facturi, atribute şi plăţile
 Permission1322=Redeschide o factură plătită
 Permission1421=Exportaţi comenzi de vânzări și atribute
+Permission1521=Citeşte documente
+Permission1522=Ştergere documente
 Permission2401=Citeşte acțiuni (evenimente sau sarcini) legate de contul său de utilizator (dacă este proprietar al unui eveniment sau doar i s-a atribuit)
 Permission2402= \n \nCreare/modificare acțiuni (evenimente sau sarcini) legate de contul său de utilizator (dacă este proprietar al evenimentului)
 Permission2403=Șterge acțiuni (evenimente sau sarcini) legate de contul său de utilizator (dacă este proprietar al evenimentului) 
@@ -912,7 +931,7 @@ Permission2515=Setup documente directoare
 Permission2801=Folosiți client FTP în modul de citire (numai navigare și descărcare )
 Permission2802=Folosiți client FTP în modul de scriere (ştergere şi încărcare fişiere )
 Permission3200=Citiți evenimente arhivate și amprente digitale
-Permission3301=Generate new modules
+Permission3301=Generare module noi
 Permission4001=Vezi angajații
 Permission4002=Creați angajați
 Permission4003=Ștergeți angajații
@@ -932,9 +951,13 @@ Permission23001=Citeste Joburi programate
 Permission23002=Creare/Modificare job programat
 Permission23003=Şterge Joburi programate
 Permission23004=Execută Joburi programate
-Permission50101=Utilizați punctul de vânzări
+Permission50101=Utilizează Punct de vânzare POS (SimplePOS)
+Permission50151=Utilizează Punct de vânzare POS (TakePOS)
 Permission50201=Citeşte tranzacţii
 Permission50202=Tranzacţiilor de import
+Permission50330=Citeşte obiecte Zapier
+Permission50331=Creare/Actualizare obiecte Zapier
+Permission50332=Şterge obiecte Zapier
 Permission50401=Uniți produsele și facturile cu conturile contabile
 Permission50411=Citiți operațiunile din cartea mare
 Permission50412=Scrieți/editați operațiunile în cartea mare
@@ -958,6 +981,17 @@ Permission63001=Citiți resursele
 Permission63002=Creaţi/modificaţi resursele 
 Permission63003=Ștergeți resursele
 Permission63004=Asociaţi resursele la agenda de evenimentele
+Permission64001=Permite tipărirea directă
+Permission67000=Permite tipărirea de bonuri chitanţe fiscale
+Permission68001=Citeşte raportare intracomunitară
+Permission68002=Creare/modificare raportare intracomunitară
+Permission68004=Ştergere raportare intracomunitară
+Permission941601=Citire bonuri chitanţe
+Permission941602=Creare şi modificare bonuri chitanţe
+Permission941603=Validare bonuri chitanţe
+Permission941604=Trimitere bonuri chitanţe pe email
+Permission941605=Export bonuri chitanţe
+Permission941606=Ştergere bonuri chitanţe
 DictionaryCompanyType=Tipuri de terţi
 DictionaryCompanyJuridicalType=Entități juridice terțe
 DictionaryProspectLevel=Nivel potenţial prospect pentru companii
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Tipuri de concediu
 DictionaryOpportunityStatus=Stare de conducere pentru proiect/conducere
 DictionaryExpenseTaxCat=Raport de cheltuieli - Categorii de transport
 DictionaryExpenseTaxRange=Raport de cheltuieli - Gama de categorii de transport
+DictionaryTransportMode=Raportare intracomunitară - Mod transport
+TypeOfUnit=Tip de unitate
 SetupSaved=Setup salvate
 SetupNotSaved=Seturea nu a fost salvată
 BackToModuleList=Înapoi la lista Module
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Eticheta utilizat în mod implicit în cazul în care nu poat
 LabelOnDocuments=Eticheta de pe documente
 LabelOrTranslationKey=Etichetă sau cheie de traducere
 ValueOfConstantKey=Valoarea unei constante de configurare
+ConstantIsOn=Opţiunea %s este activă
 NbOfDays=Nr. de zile
 AtEndOfMonth=La sfârşitul lunii
 CurrentNext=Curent / Urmatoarea
@@ -1145,6 +1182,7 @@ InfoWebServer=Despre Server Web
 InfoDatabase=Despre Baza de date
 InfoPHP=Despre PHP
 InfoPerf=Despre  Performanţe
+InfoSecurity=Despre securitate
 BrowserName=Nume Browser
 BrowserOS=Browser OS
 ListOfSecurityEvents=Lista de evenimente Dolibarr de securitate
@@ -1194,7 +1232,8 @@ RestoreDesc=Pentru a restabili o copie de rezervă Dolibarr, sunt necesari doi p
 RestoreDesc2=Restabiliți fișierul de rezervă (de exemplu, fișierul zip) al directorului "documente" la o nouă instalație Dolibarr sau în acest director de documente actualey (<b> %s </b>).
 RestoreDesc3=Restaurați structura bazei de date și datele dintr-un fișier de memorie de rezervă în baza de date a noii instalări Dolibarr sau în baza de date a instalării curente (<b> %s </b>). Avertisment, odată ce restaurarea este completă, trebuie să utilizați o autentificare care a existat din timpul instalarea copiei de rezervă pentru a vă conecta din nou. <br> Pentru a restabili baza de date a copiei de rezervă în această instalare curentă, puteți urma acest asistent.
 RestoreMySQL=MySQL import
-ForcedToByAModule= Această regulă este obligat <b>la %s</b> către un activat modulul
+ForcedToByAModule=Această regulă este obligat <b>la %s</b> către un activat modulul
+ValueIsForcedBySystem=Această valoare este impusă forțat de sistem. Nu o poți schimba.
 PreviousDumpFiles=Fișiere de rezervă existente
 PreviousArchiveFiles=Fişiere arhivă existente
 WeekStartOnDay=Prima zi a săptămânii
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=Componenta PHP %seste încărcată
 PreloadOPCode=Componenta OPCode preîncărcată este utilizată
 AddRefInList=Afișați Lista de  informatii a clientului/Furnizorului  (selectați lista sau combobox)  și cea mai mare parte a hiperlinkului.<br> Terții vor apărea cu un format de nume "CC12345 - SC45678 - The Big Company corp". în loc de "The Big Company corp".
 AddAdressInList=Afișați Lista de informatii a clientului/Furnizorului (selectați lista sau combobox).<br> Terții i vor apărea cu numele format din "Big Company corp - 21 jump street 123456 Big city - USA" în loc de "Big Company corp".
+AddEmailPhoneTownInContactList=Afișați adresa de email de contact (sau telefoanele dacă nu este definită) și lista cu orașe (lista combo sau caseta combinată)<br> Contactele vor apărea cu formatul de nume "Dupond Durand - dupond.durand@email.com - Paris" sau "Dupond Durand - 06 07 59 65 66 - Paris" în loc de "Dupond Durand".
 AskForPreferredShippingMethod=Solicitați o metodă de transport preferată pentru terți.
 FieldEdition=Editarea  campului %s
 FillThisOnlyIfRequired=Exemplu: +2 (completați numai dacă problemele decalajjului fusului orar sunt cunoscute)
@@ -1282,7 +1322,7 @@ GetBarCode=Dă codbare
 NumberingModules=Modele de numerotare
 DocumentModules=Şabloane documente
 ##### Module password generation
-PasswordGenerationStandard=Întoarceţi-vă o parolă generate în funcţie de interne Dolibarr algoritmul: 8 caractere care conţin numere în comun şi în caractere minuscule.
+PasswordGenerationStandard=Returnați o parolă generată conform algoritmului intern Dolibarr: %scaractere numere și litere mici.
 PasswordGenerationNone=Nu sugerați o parolă generată. Parola trebuie introdusă manual.
 PasswordGenerationPerso=Returnați o parolă în funcție de configurația dvs. personal definită.
 SetupPerso=În funcție de configurația dvs.
@@ -1381,6 +1421,7 @@ AdherentMailRequired=E-mail necesar pentru a crea un nou membru
 MemberSendInformationByMailByDefault=Validare pentru a trimite mail de confirmare a membrilor este în mod implicit
 VisitorCanChooseItsPaymentMode=Vizitatorul poate alege din modurile disponibile de plată
 MEMBER_REMINDER_EMAIL=Activați memento automat <b> prin email </b> de abonamente expirate. Notă: Modul <strong> %s </strong> trebuie să fie activat and setat corect pentru a trimite mementouri.
+MembersDocModules=Șabloane documente pentru documentele generate din înregistrarea membrilor
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Global parametrii
@@ -1523,7 +1564,9 @@ LDAPDescValues=Exemplu de valori sunt proiectate pentru <b>OpenLDAP</b> încărc
 ForANonAnonymousAccess=Pentru un acces autentificat (pentru o scriere de exemplu)
 PerfDolibarr=Raport performanţă setări/optimizări
 YouMayFindPerfAdviceHere=Această pagină oferă unele verificări sau sfaturi legate de performanță.
-NotInstalled=Nu este instalat, deci serverul dvs. nu este încetinit de acest lucru.
+NotInstalled=Neinstalat
+NotSlowedDownByThis=Nu este încetinit de aceasta
+NotRiskOfLeakWithThis=Nu există riscul de divulgare cu aceasta.
 ApplicativeCache=Cache aplicativ
 MemcachedNotAvailable=Niciun cache aplicatie găsit. Puteți îmbunătăți performanța prin instalarea unui server de cache memcached și un modul capabil de a utiliza acest server cache. <br>Mai multe informatii aici <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.\n<br>Rețineți că o mulțime de furnizor de web hosting nu oferă astfel de server de cache.
 MemcachedModuleAvailableButNotSetup=Modulul memcahed pentru aplicarea cache este găsit dar nu este configurat complet
@@ -1571,9 +1614,9 @@ SyslogLevel=Nivel
 SyslogFilename=Nume fişier şi calea
 YouCanUseDOL_DATA_ROOT=Puteţi folosi DOL_DATA_ROOT / dolibarr.log pentru un fişier de log în Dolibarr "Documente" director. Aveţi posibilitatea să setaţi o altă cale de a păstra acest fişier.
 ErrorUnknownSyslogConstant=Constant %s nu este un cunoscut syslog constant
-OnlyWindowsLOG_USER=Windows suportă numai LOG_USER
+OnlyWindowsLOG_USER=Pe Windows, numai facilitatea LOG_USER va fi acceptată
 CompressSyslogs=Comprimarea și copierea de rezervă a fișierelor jurnal de depanare (generate de modulul Log pentru depanare)
-SyslogFileNumberOfSaves=Copii de rezervă ale autentificărilor
+SyslogFileNumberOfSaves=Număr log-uri de backup de păstrat
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configurați curățarea lucrării programate pentru a configura frecvența copiei de rezervă a autentificărilor
 ##### Donations #####
 DonationsSetup=Donatii modul de configurare
@@ -1629,7 +1672,7 @@ AdvancedEditor=Editor avansat
 ActivateFCKeditor=Activaţi FCKeditor pentru:
 FCKeditorForCompany=WYSIWIG crearea / editie a companiilor şi de note descriere
 FCKeditorForProduct=WYSIWIG crearea / editie a produselor / serviciilor "descrierea şi nota
-FCKeditorForProductDetails=WYSIWIG creare / editare de linii cu detalii ale produselor pentru toate entitățile (propuneri, comenzi, facturi, etc ...). <font class="warning"> Avertisment: utilizarea acestei opțiuni pentru acest caz nu este foarte recomandată, deoarece poate create probleme cu caracterele speciale and formatarea paginii la construirea fişierelor PDF. </font>
+FCKeditorForProductDetails=Crearea/editarea WYSIWIG a liniilor de detalii ale produselor pentru toate entitățile (propuneri, comenzi, facturi, etc.).<span class="warning"> Atenţie: Utilizarea acestei opțiuni pentru acest caz nu este serios recomandată, deoarece poate crea probleme cu caracterele speciale și formatarea paginilor atunci când creați fișiere PDF.</span>
 FCKeditorForMailing= WYSIWIG crearea / ediţie de mailing
 FCKeditorForUserSignature=Creare/editare WYSIWIG  a semnăturii utilizatorilor
 FCKeditorForMail=Crearea / editarea WYSIWIG pentru toate e-mailurile (cu excepția Tools-> eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Gestionarea modulelor de stoc
 IfYouUsePointOfSaleCheckModule=Dacă utilizați modulul Punct de vânzare (POS) furnizat în mod implicit sau un modul extern, această configurare poate fi ignorată de modulul POS. Cele mai multe module POS sunt proiectate în mod implicit pentru a crea o factură imediat și pentru a scădea din stoc, indiferent de opțiunile de aici. Deci, dacă aveți nevoie sau nu să aveți o scădere din stoc la înregistrarea unei vânzări de pe POS, verificați și configurarea modulului POS.
 ##### Menu #####
 MenuDeleted=Meniu eliminat
+Menu=Meniu
 Menus=Meniuri
 TreeMenuPersonalized=Meniuri personalizate
 NotTopTreeMenuPersonalized=Meniuri personalizate care nu sunt legate de o intrare de meniu de sus
 NewMenu=New meniul
-Menu=Selecţie de meniu
 MenuHandler=Meniu manipulant
 MenuModule=Sursa de modul
 HideUnauthorizedMenu= Ascunde meniuri neautorizate (gri)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Puneți automat această valoare implicită pentru
 AGENDA_DEFAULT_FILTER_TYPE=Puneți automat acest tip de eveniment în filtrul de căutare al vizualizării agendei
 AGENDA_DEFAULT_FILTER_STATUS=Puneți automat această stare pentru evenimentele din filtrul de căutare din vizualizarea agendei
 AGENDA_DEFAULT_VIEW=Ce vizualizare doriți să deschideți implicit atunci când selectați meniul Agenda
-AGENDA_REMINDER_EMAIL=Activați memento-ul evenimentului <b> de emailuri </b> (opțiunea de reamintire / întârziere poate fi definită pe fiecare event). Nota: Modulul <strong> %s </strong> trebuie să fie activat and gestionat corect pentru a avea memento trimis la frecvența corectă.
-AGENDA_REMINDER_BROWSER=Activați memento-ul evenimentului <b> pe browser-ul utlizatorului </b> (când se ajunge la data evenimentului, fiecare utilizator poate să refuze întrebarea de confirmare a browserului)
+AGENDA_REMINDER_BROWSER=Activați memento-uri evenimente în <b>browserul utilizatorului</b> (Când este atinsă data de reamintire, browserul afișează un popup. Fiecare utilizator poate dezactiva astfel de notificări din configurarea sa de notificări browser).
 AGENDA_REMINDER_BROWSER_SOUND=Activați notificarea sonoră
+AGENDA_REMINDER_EMAIL=Activați memento evenimente <b>prin email</b> (opțiunea de reamintire/întârziere poate fi definită pentru fiecare eveniment).
+AGENDA_REMINDER_EMAIL_NOTE= Notă: Frecvența sarcinii %s trebuie să fie suficientă pentru a vă asigura că reamintirea este trimisă la momentul corect.
 AGENDA_SHOW_LINKED_OBJECT=Afișați un obiect asociat în vizualizarea agendei
 ##### Clicktodial #####
 ClickToDialSetup=Click pentru a Dial modul setup
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0: tipul de plată al clientului, 1: tipul de plată al furnizor
 IncludePath=Include calea (definita in variabila %s)
 ExpenseReportsSetup=Configurarea modului rapoartelor de cheltuieli
 TemplatePDFExpenseReports=Șabloane de documente pentru a genera un document de raportare a cheltuielilor
-ExpenseReportsIkSetup=Configurare din module Rapoarte de cheltuieli - indicele Milles
 ExpenseReportsRulesSetup=Configurare din module Rapoarte de cheltuieli - Reguli
 ExpenseReportNumberingModules=Modul de numerotare a rapoartelor de cheltuieli
 NoModueToManageStockIncrease=Nu a fost activat niciun modul capabil să gestioneze creșterea stocului automat. Creșterea stocurilor se va face doar prin introducere manuală.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptii
 MailToThirdparty=Terţi
 MailToMember=Membri
 MailToUser=Utilizatori
-MailToProject=Pagina de proiecte
+MailToProject=Proiecte
 MailToTicket=Tichete
 ByDefaultInList=Afișați în mod implicit în vizualizarea listei
 YouUseLastStableVersion=Utilizați ultima versiune stabilă
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Încărcați un terţ căutând în %s (doar încărcare)
 LoadThirdPartyFromNameOrCreate=Încărcați un terţ căutând în %s (creare dacă nu este găsit)
 WithDolTrackingID=Mesaj dintr-o conversație inițiată de un prim e-mail trimis de la Dolibarr
 WithoutDolTrackingID=Mesaj dintr-o conversație inițiată de un prim e-mail NU trimis de la Dolibarr
+WithDolTrackingIDInMsgId=Mesaj transmis de la Dolibarr
+WithoutDolTrackingIDInMsgId= Mesajul NU a fost trimis de la Dolibarr
 CreateCandidature=Creare candidatură
 FormatZip=Zip
 MainMenuCode=Codul de introducere a meniului (meniu principal)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Dezactivați caracteristica care conectează o resur
 EnableResourceUsedInEventCheck=Activează funcţionalitatea de verificare a resurselor în uz pe un eveniment
 ConfirmUnactivation=Confirmați resetarea modulului
 OnMobileOnly=Numai pe ecranul mic (smartphone)
-DisableProspectCustomerType=Dezactivați tipul de terţ "Prospect + Client" (deci terţul trebuie să fie Prospect sau Client, dar nu poate fi ambele)
+DisableProspectCustomerType=Dezactivați tipul terțului „Prospect + Client” (deci terțul trebuie să fie „Prospect” sau „Client”, dar nu poate fi ambele)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplificați interfața pentru o persoană nevăzătoare
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Activați această opțiune dacă sunteți o persoană nevăzătoare sau dacă utilizați aplicația dintr-un browser de text precum Lynx sau Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Schimbă culorile interfeţei pentru persoanele cu disabilităţi vizuale
@@ -1996,13 +2041,15 @@ UseDebugBar=Utilizează bara de debug
 DEBUGBAR_LOGS_LINES_NUMBER=Numărul celor mai recente linii din jurnal care se vor păstra în consolă
 WarningValueHigherSlowsDramaticalyOutput=Avertizare, valorile foarte mari încetinesc dramatic viteza de afişare
 ModuleActivated=Modulul %s este activat şi încetineşte interfaţa
+IfYouAreOnAProductionSetThis=Dacă eşti într-un mediu de producţie, ar trebui să setezi această proprietate la %s.
+AntivirusEnabledOnUpload=Antivirusul este activat pentru fişierele încărcate
 EXPORTS_SHARE_MODELS=Modele de export date sunt partajate cu toată lumea
 ExportSetup=Configurare modul Export
 ImportSetup=Configurare modul Import
 InstanceUniqueID=ID unic al instanţei
 SmallerThan=Mai mic decât
 LargerThan=Mai mare decât
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Rețineți că, dacă un identificator de urmărire al unui obiect este găsit în e-mail sau dacă e-mailul este un răspuns al unui e-mail colectat și legat de un obiect, evenimentul creat va fi legat automat de obiectul cunoscut.
 WithGMailYouCanCreateADedicatedPassword=Cu un cont GMail, dacă ați activat validarea cu 2 factori, este recomandat să creați o a doua parolă dedicată pentru aplicație, în loc să utilizați propria parolă de la https://myaccount.google.com/.
 EmailCollectorTargetDir=Poate fi de dorit să mutați email-ul într-o altă etichetă/director atunci când a fost procesat cu succes. Trebuie doar să setați numele directorului aici pentru a utiliza această caracteristică (NU folosiți caractere speciale în nume). Rețineți că, de asemenea, trebuie să utilizați un cont de autentificare pentru citire/scriere.
 EmailCollectorLoadThirdPartyHelp=Puteți utiliza această acțiune pentru a folosi conținutul de e-mail la căutarea  și încărcarea unui terț existent în baza de date. Terţul găsit (sau creat) va fi folosit pentru acțiunile în care este necesar. În câmpul parametru puteți folosi, de exemplu, 'EXTRACT: BODY: Name:\\s([^\\s]*)' dacă doriți să extrageți numele terțului dintr-un șir 'Nume: nume căutat' găsit în corpul email-ului.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=Scala este numărul de zecimale pe care trebuie să le mutaț
 TemplateAdded=Şablon adăugat
 TemplateUpdated=Şablon actualizat
 TemplateDeleted=Şablon şters
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Email reminder eveniment
+SwitchThisForABetterSecurity=Schimbarea acestei valori la %s este recomandată pentru mai multă securitate
+DictionaryProductNature= Natură produs
+CountryIfSpecificToOneCountry=Țară (dacă este specifică unei anumite țări)
+YouMayFindSecurityAdviceHere=Aici puteți găsi recomandări de securitate
+ModuleActivatedMayExposeInformation=Acest modul poate expune date sensibile. Dacă nu aveți nevoie de el, dezactivați-l.
+ModuleActivatedDoNotUseInProduction=Un modul conceput pentru dezvoltare a fost activat. Nu-l activați într-un mediu de producție.
diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang
index fc8de4eca78..5e85e7eb2bc 100644
--- a/htdocs/langs/ro_RO/banks.lang
+++ b/htdocs/langs/ro_RO/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Plată diversă
 VariousPayments=Diverse plăţi
 ShowVariousPayment=Afişare plăţi diverse
 AddVariousPayment=Adaugă plată diversă
+VariousPaymentId=ID plată diversă
+VariousPaymentLabel=Etichetă plată diversă
+ConfirmCloneVariousPayment=Confirmă clona unei plăţi diverse
 SEPAMandate=Mandat SEPA 
 YourSEPAMandate=Mandatul dvs. SEPA  
 FindYourSEPAMandate=Acesta este mandatul dvs. SEPA pentru a autoriza compania noastră să efectueze un ordin de debitare directă către banca dvs. Reveniți semnat (scanarea documentului semnat) sau trimiteți-l prin poștă la
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorează tranzacţiile
 BankColorizeMovementDesc=Dacă această funcţie este activată, poţi alege o culoare de fundal personalizată pentru tranzacţiile de debit sau de credit
 BankColorizeMovementName1=Culoarea de fundal pentru tranzacţiile de debit
 BankColorizeMovementName2=Culoarea de fundal pentru tranzacţiile de credit
+IfYouDontReconcileDisableProperty= Dacă nu faceți reconcilieri bancare pe unele conturi bancare, dezactivați proprietatea "%s" de pe ele pentru a elimina acest avertisment. 
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index 8229964e9d0..074863b0148 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -531,6 +531,7 @@ TypeContact_invoice_supplier_external_SERVICE=Contactul furnizorului de servicii
 InvoiceFirstSituationAsk=Prima factură de situaţie pentru lucrări de construcţii
 InvoiceFirstSituationDesc=<b>Factura de situație</b> este legată de progresia unei lucrări, de exemplu progresia unei construcții. Fiecare situație este legată de o factură.
 InvoiceSituation=Factură de situaţie
+PDFInvoiceSituation=Factura de situaţie
 InvoiceSituationAsk=Factură urmarind situaţia
 InvoiceSituationDesc=Creaza o situatie noua urmarind una existenta deja
 SituationAmount=Valoare (neta) factură de situaţie
@@ -575,3 +576,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Factură furnizor ştearsă
 UnitPriceXQtyLessDiscount=Preţ unitar  x Cantitate - Discount
 CustomersInvoicesArea=Facturare clienţi
 SupplierInvoicesArea=Facturare furnizori
+FacParentLine=Linie de facturare părinte
+SituationTotalRayToRest=Restul de plătit fără taxe
+PDFSituationTitle=Situaţia nr. %d
+SituationTotalProgress=Progres total %d %%
diff --git a/htdocs/langs/ro_RO/categories.lang b/htdocs/langs/ro_RO/categories.lang
index 9f3fd179ccf..921c1fbbdb8 100644
--- a/htdocs/langs/ro_RO/categories.lang
+++ b/htdocs/langs/ro_RO/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Configurare tag-uri/categorii
 CategorieRecursiv=Asociere automată către tag/categorie părinte
 CategorieRecursivHelp=Dacă opțiunea este activă, când adăugați un produs într-o subcategorie, produsul va fi adăugat și în categoria părinte
 AddProductServiceIntoCategory=Adaugă următoarele produse/servicii
+AddCustomerIntoCategory=Atribuire categorie clientului
+AddSupplierIntoCategory=Atribuire categorie furnizorului
 ShowCategory=Arată tag/categorie
 ByDefaultInList=Implicit în listă
 ChooseCategory=Alegeți categoria
 StocksCategoriesArea=Categorii depozite
 ActionCommCategoriesArea=Categorii evenimente
-WebsitePagesCategoriesArea=Categorii pagină-container
+WebsitePagesCategoriesArea=Categorii Pagină-Container
 UseOrOperatorForCategories=Utilizează operatorul SAU pentru categorii
diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang
index ff66f92a9e1..08129c19f16 100644
--- a/htdocs/langs/ro_RO/companies.lang
+++ b/htdocs/langs/ro_RO/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id-ul 1 (USt.-IdNr)
 ProfId2AT=Prof Id-ul 2 (USt.-NR)
 ProfId3AT=Prof Id-ul 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=Nr EORI
 ProfId6AT=-
 ProfId1AU=Prof Id-ul 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id-ul 1 (Professionnel Număr)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=Nr EORI
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inregistrare Statala)
@@ -144,11 +144,11 @@ ProfId3BR=IE (Inregistrare Municipala)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=Nr UID
 ProfId2CH=-
 ProfId3CH=Prof Id-ul 1 (Federal număr)
 ProfId4CH=Prof. ID 2 (Număr de înregistrare comercială)
-ProfId5CH=-
+ProfId5CH=Nr EORI
 ProfId6CH=-
 ProfId1CL=Prof. Id-ul 1 (RUT)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id-ul 1 (USt.-IdNr)
 ProfId2DE=Prof Id-ul 2 (USt.-NR)
 ProfId3DE=Prof Id-ul 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=Nr EORI
 ProfId6DE=-
 ProfId1ES=Id-ul prof. 1 (CIF/CNP)
 ProfId2ES=Prof. ID 2 (SSN)
 ProfId3ES=Id-ul prof. 3 (CNAE)
 ProfId4ES=Id-ul prof. 4 (Collegiate număr)
-ProfId5ES=-
+ProfId5ES=Nr EORI
 ProfId6ES=-
 ProfId1FR=Prof Id-ul 1 (SIREN)
 ProfId2FR=Prof Id-ul 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, vechi APE)
 ProfId4FR=Prof Id 4 (RCS / RM)
-ProfId5FR=Prof ID 5
+ProfId5FR=Nr EORI
 ProfId6FR=-
 ProfId1GB=Prof Id-ul 1 (numărul de înregistrare)
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id-ul 3
 ProfId4IN=Id-ul prof. univ 4
 ProfId5IN=Prof ID 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=Nr EORI
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=Nr EORI
 ProfId6LU=-
 ProfId1MA=Id prof. univ. 1 (RC)
 ProfId2MA=Id prof. univ. 2 (Patente)
 ProfId3MA=Id prof. univ. 3 (IF)
 ProfId4MA=Id prof. univ. 4 (CNSS)
-ProfId5MA=Id-ul. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof. Id-ul 1 (RFC).
 ProfId2MX=Prof. Id-ul 2 (R.. P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL=-
+ProfId5NL=Nr EORI
 ProfId6NL=-
 ProfId1PT=Prof Id-ul 1 (NIPC)
 ProfId2PT=Prof Id-ul 2 (Social Security Number)
 ProfId3PT=Prof Id 3 (Comerciale număr record)
 ProfId4PT=Prof Id 4 (Conservatorul)
-ProfId5PT=-
+ProfId5PT=Nr EORI
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Reg Com)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=Nr EORI
 ProfId6RO=-
 ProfId1RU=Prof. Id-ul 1 (OGRN)
 ProfId2RU=Prof. Id-ul 2 (DCI)
@@ -354,6 +359,7 @@ VATIntraManualCheck=De asemenea, puteți verifica manual pe site-ul web al UE <a
 ErrorVATCheckMS_UNAVAILABLE=Verificare imposibilă. Verificaţi dacă serviciul este furnizat de către statul membru ( %s).
 NorProspectNorCustomer=Nici prospect, nici client
 JuridicalStatus=Tip entitate juridică
+Workforce=Forţa de muncă
 Staff=Angajati
 ProspectLevelShort=Potenţial
 ProspectLevel=Potenţial prospect
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Termen de plată - Furnizor
 PaymentTypeBoth=Tip plată - Client şi Furnizor
 MulticurrencyUsed=Utilizați mai multe monede
 MulticurrencyCurrency=Moneda
+InEEC=Europa (CEE)
+RestOfEurope=Restul Europei (CEE)
+OutOfEurope=În afara Europei (CEE)
+CurrentOutstandingBillLate=Factura curentă restantă este întârziată
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Aveți grijă, în funcție de setările de preț ale produsului, ar trebui să schimbați terții înainte de a adăuga produsul la POS.
diff --git a/htdocs/langs/ro_RO/ecm.lang b/htdocs/langs/ro_RO/ecm.lang
index ffe6fc9e092..f8c93629ab9 100644
--- a/htdocs/langs/ro_RO/ecm.lang
+++ b/htdocs/langs/ro_RO/ecm.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=No. of documents in directory
+ECMNbOfDocs=Număr de documente în director
 ECMSection=Director
 ECMSectionManual=Director Manual
 ECMSectionAuto=Director Automat
 ECMSectionsManual=Arbore manual
 ECMSectionsAuto=Arbore automat
 ECMSections=Directoare
-ECMRoot=ECM Root
+ECMRoot=Rădăcină ECM Electronic Content Management
 ECMNewSection=Director  Nou
 ECMAddSection=Adaugă  Director
 ECMCreationDate=Data creării
@@ -14,39 +14,30 @@ ECMNbOfFilesInDir=Număr fişiere în director
 ECMNbOfSubDir=Număr sub-directoare
 ECMNbOfFilesInSubDir=Număr fișiere în sub-directoare
 ECMCreationUser=Creator
-ECMArea=DMS/ECM area
-ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMArea=Domeniul DMS Document Management System / ECM Electronic Content Management
+ECMAreaDesc=Domeniul DMS / ECM (Document Management System / Electronic Content Management) vă permite să salvați, să partajați și să căutați rapid toate tipurile de documente din Dolibarr.
 ECMAreaDesc2=* Directoarele automate sunt completate în mod automat atunci când se adaugă documentele din fişa acelui element. <br> * Directoarele manuale poate fi folosite pentru a salva documente ce nu sunt legate de un anumit element.
 ECMSectionWasRemoved=Directorul <b>%s</b> a fost ştears.
-ECMSectionWasCreated=Directory <b>%s</b> has been created.
+ECMSectionWasCreated=Directorul <b> %s </b> a fost creat.
 ECMSearchByKeywords=Caută dupa cuvinte cheie
 ECMSearchByEntity=Caută după obiect
 ECMSectionOfDocuments=Directoare  documente
 ECMTypeAuto=Automat
-ECMDocsBySocialContributions=Documente legate de taxe sociale sau fiscale
-ECMDocsByThirdParties=Documente legate de terţi
-ECMDocsByProposals=Documente legate de oferte
-ECMDocsByOrders=Documente legate de comenzi  clienţi
-ECMDocsByContracts=Documente legate de contractele d
-ECMDocsByInvoices=Documente legate de   facturi clienţi
-ECMDocsByProducts=Documente legate de produse
-ECMDocsByProjects=Documente legate de proiecte
-ECMDocsByUsers=Documente legate de utilizatori
-ECMDocsByInterventions=Documente legate de interventii
-ECMDocsByExpenseReports=Documente legate de rapoartele de cheltuieli
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documente asociate la %s
 ECMNoDirectoryYet=Niciun directorul creat
 ShowECMSection=Arată director
 DeleteSection=Elimină director
 ConfirmDeleteSection=Puteți confirma că doriți să ștergeți directorul <b> %s</b>?
 ECMDirectoryForFiles=Director relativ  pentru fişierele
-CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
-CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=Eliminarea nu este posibilă deoarece conține anumite fișiere sau subdirectoare
+CannotRemoveDirectoryContainsFiles=Eliminarea nu este posibilă deoarece conține unele fișiere
 ECMFileManager=Manager Fişiere
-ECMSelectASection=Select a directory in the tree...
-DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
-ReSyncListOfDir=Resync list of directories
-HashOfFileContent=Hash of file content
-NoDirectoriesFound=No directories found
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ECMSelectASection=Selectați un director din arbore ...
+DirNotSynchronizedSyncFirst=Acest director pare să fie creat sau modificat în afara modulului ECM Electronic Content Management. Trebuie să faceți clic mai întâi pe butonul "Resync" pentru a sincroniza discul și baza de date pentru a obține conținutul acestui director.
+ReSyncListOfDir=Resincronizați lista directoarelor
+HashOfFileContent=Hash-ul conținutului fișierului
+NoDirectoriesFound=Nu s-au găsit directoare
+FileNotYetIndexedInDatabase=Fișierul nu este încă indexat în baza de date (încercați să îl reîncărcați)
+ExtraFieldsEcmFiles=Extracâmpuri Fişiere ECM
+ExtraFieldsEcmDirectories=Extracâmpuri Directoare ECM
+ECMSetup=Configurare ECM
diff --git a/htdocs/langs/ro_RO/hrm.lang b/htdocs/langs/ro_RO/hrm.lang
index 985e1d3c558..3a232f187ab 100644
--- a/htdocs/langs/ro_RO/hrm.lang
+++ b/htdocs/langs/ro_RO/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Joburi disponibile
 Employees=Angajati
 Employee=Angajat
 NewEmployee=Angajat nou
+ListOfEmployees=Lista angajati
diff --git a/htdocs/langs/ro_RO/install.lang b/htdocs/langs/ro_RO/install.lang
index 1cda37b563f..9393f0ff547 100644
--- a/htdocs/langs/ro_RO/install.lang
+++ b/htdocs/langs/ro_RO/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Fișierul de configurare <b> %s </b> nu poate fi scris. Ve
 ConfFileIsWritable=<b>%s</b> fişier de configurare este de scriere.
 ConfFileMustBeAFileNotADir=Fișierul de configurare <b> %s </b> trebuie să fie un fișier, nu un director.
 ConfFileReload=Reîncărcarea parametrilor din fișierul de configurare.
-PHPSupportSessions=Acest PHP susţine sesiuni.
 PHPSupportPOSTGETOk=Acest PHP suportă variabile POST si GET.
 PHPSupportPOSTGETKo=Este posibil ca configurarea dvs. PHP să nu accepte variabilele POST și/sau GET. Verificați parametrul <b> variables_order </b> în php.ini.
-PHPSupportGD=Acest PHP suportă funcții grafice GD.
-PHPSupportCurl=Acest PHP suportă Curl.
-PHPSupportCalendar=Acest PHP suportă extensii calendar.
-PHPSupportUTF8=Acest PHP suportă functiile UTF8.
-PHPSupportIntl=Aceasta versiune de PHP suportă funcţii Intl.
-PHPSupportxDebug=Această versiune de PHP suportă funcţii de depanare extinse.
+PHPSupportSessions=Acest PHP susţine sesiuni.
 PHPSupport=Această versiune de PHP suportă funcţii %s.
 PHPMemoryOK=PHP max memorie sesiune este setată la <b>%s.</b> Acest lucru ar trebui să fie suficient.
 PHPMemoryTooLow=Memoria sesiunii PHP max este setată la <b> %s </b> octeți. Această valoare este prea mică. Schimbați-vă <b> php.ini </b> pentru a seta parametrul <b> memory_limit </b> la cel puțin <b> %s </b> octeți.
diff --git a/htdocs/langs/ro_RO/intracommreport.lang b/htdocs/langs/ro_RO/intracommreport.lang
new file mode 100644
index 00000000000..fc08e63855f
--- /dev/null
+++ b/htdocs/langs/ro_RO/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Raportare intracomunitară
+Module68000Desc = Gestionarea raportării intracomunitare (Suport pentru formatul francez DEB/DES) 
+IntracommReportSetup = Configurare modul Raportare intracomunitară
+IntracommReportAbout = Despre Raportare intracomunitară
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numărul de aprobare (emis de CISD de atașament) 
+INTRACOMMREPORT_TYPE_ACTEUR=Tipul de actor
+INTRACOMMREPORT_ROLE_ACTEUR=Rol interpretat de actor
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Nivelul obligației privind intrările
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Nivelul obligației privind livrările
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Categoria de servicii de tipul „Taxe de expediere”
+
+INTRACOMMREPORT_NUM_DECLARATION=Numărul de declarant
+
+# Menu
+MenuIntracommReport=Raportare intracomunitară
+MenuIntracommReportNew=Declaraţie nouă
+MenuIntracommReportList=Listă
+
+# View
+NewDeclaration=Declaraţie nouă
+Declaration=Declaraţie
+AnalysisPeriod=Perioada de analiză
+TypeOfDeclaration=Tip de declaraţie
+DEB=Declarație de schimb de mărfuri (DEB)
+DES=Declarație de schimb de servicii (DES)
+
+# Export page
+IntracommReportTitle=Pregătirea unui fișier XML în format ProDouane
+
+# List
+IntracommReportList=Lista declaraţiilor generate
+IntracommReportNumber=Numărul declaraţiei
+IntracommReportPeriod=Perioada de analiză
+IntracommReportTypeDeclaration=Tip de declaraţie
+IntracommReportDownload=descarcă fişier XML
+
+# Invoice
+IntracommReportTransportMode=Mod transport
diff --git a/htdocs/langs/ro_RO/languages.lang b/htdocs/langs/ro_RO/languages.lang
index e2f800a3c76..d591539297b 100644
--- a/htdocs/langs/ro_RO/languages.lang
+++ b/htdocs/langs/ro_RO/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spaniolă (Panama)
 Language_es_PY=Spaniolă (Paraguay)
 Language_es_PE=Spaniolă (Peru)
 Language_es_PR=Spaniolă (Puerto Rico)
+Language_es_US=Spaniolă (SUA)
 Language_es_UY=Spaniolă (Uruguay)
 Language_es_GT=Spaniolă (Guatemala)
 Language_es_VE=Spaniolă (Venezuela)
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index d8db4149020..58dea3a79cb 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Eliminaţi link
 AddToDraft=Adaugă la schiţă
 Update=Modifică
 Close=Închide
+CloseAs=Setați starea la
 CloseBox=Elimină widget-ul din tabloul de bord
 Confirm=Confirmă
 ConfirmSendCardByMail=Chiar doriți să trimiteți conținutul acestui card prin poștă la <b> %s </b>?
@@ -196,6 +197,7 @@ ReOpen=Redeaschide
 Upload=Încărcați
 ToLink=Link
 Select=Selectaţi
+SelectAll=Selectează toate
 Choose=Alege
 Resize=Redimensionează
 ResizeOrCrop=Redimensionați sau decupați
@@ -256,6 +258,7 @@ Cards=Fişe
 Card=Fişă
 Now=Acum
 HourStart=Oră start
+Deadline=Termen limită
 Date=Dată
 DateAndHour=Dată şi oră
 DateToday=Astazi
@@ -264,8 +267,10 @@ DateStart=Dată începere
 DateEnd=Dată sfîrşit
 DateCreation=Dată creare
 DateCreationShort=Dată creare
+IPCreation=IP creare
 DateModification=Dată modificare
 DateModificationShort=Dată modif.
+IPModification=IP modificare
 DateLastModification=Data ultimei modificări
 DateValidation=Dată validare
 DateClosing=Dată închidere
@@ -319,6 +324,7 @@ Morning=Dimineață
 Afternoon=După amiază
 Quadri=Trimestru
 MonthOfDay=Luna curentă
+DaysOfWeek=Zilele săptămânii
 HourShort=H
 MinuteShort=mn
 Rate=Rată
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Suma de plată, în moneda inițială
 MulticurrencyAmountHT=Sumă (fără taxe), în moneda inițială
 MulticurrencyAmountTTC=Valoare (cu taxe), în moneda originală
 MulticurrencyAmountVAT=Valoare taxe, în moneda originală
+MulticurrencySubPrice=Valoare preț net în multivalută
 AmountLT1=Valoare taxă 2
 AmountLT2=Valoare taxă 3
 AmountLT1ES=Valoare RE
@@ -487,6 +494,7 @@ By=Pe
 From=De la
 FromDate=De la
 FromLocation=De la
+at=la
 to=la
 To=la
 and=şi
@@ -509,6 +517,7 @@ Draft=Schiţă
 Drafts=Schiţe
 StatusInterInvoiced=Facturată
 Validated=Validat
+ValidatedToProduce=Validate (De fabricat) 
 Opened=Deschis
 OpenAll=Deschise (Toate)
 ClosedAll=Închise (Toate)
@@ -655,6 +664,7 @@ Response=Răspuns
 Priority=Prioritate
 SendByMail=Trimis prin email
 MailSentBy=E-mail trimis de
+NotSent=Nu a fost trimis
 TextUsedInTheMessageBody=Continut Email
 SendAcknowledgementByMail=Trimite confirmare email
 SendMail=Trimite un email
@@ -836,6 +846,7 @@ ListOfTemplates=Listă template-uri
 Gender=Gen
 Genderman=Barbat
 Genderwoman=Femeie
+Genderother=Altele
 ViewList=Vedere listă
 ViewGantt=Vedere Gantt
 ViewKanban=Vedere Kanban
@@ -877,6 +888,8 @@ Miscellaneous=Diverse
 Calendar=Calendar
 GroupBy=A se grupa cu...
 ViewFlatList=Vizualizați lista plată
+ViewAccountList=Afişare registru
+ViewSubAccountList=Afişare registru analitice
 RemoveString=Eliminați șirul "%s"
 SomeTranslationAreUncomplete=Unele dintre limbile oferite pot fi traduse numai parțial sau pot conține erori. Vă rugăm să vă ajutați să vă corectați limba prin înscrierea la <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> pentru a vă adăuga îmbunătățirile.
 DirectDownloadLink=Link direct de descărcare (public / extern)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Livrări Client
 SearchIntoExpenseReports=Rapoarte Cheltuieli
 SearchIntoLeaves=Concediu
 SearchIntoTickets=Tichete
+SearchIntoCustomerPayments=Plăţi ale clienţilor
+SearchIntoVendorPayments=Plățile furnizorului
+SearchIntoMiscPayments=Diverse plăţi
 CommentLink=Comentarii
 NbComments=Număr de comentarii
 CommentPage=Spațiu de comentarii
@@ -1076,10 +1092,18 @@ NotUsedForThisCustomer=Neutilizat pentru acest client
 AmountMustBePositive=Suma trebuie să fie pozitivă
 ByStatus=După status
 InformationMessage=Informaţie
-Used=Used
+Used=Utilizat
 ASAP=Cât Mai Repede Posibil
-CREATEInDolibarr=Record %s create
-MODIFYInDolibarr=Record %s modified
-DELETEInDolibarr=Record %s deleted
-VALIDATEInDolibarr=Record %s validated
-APPROVEDInDolibarr=Record %s approved
+CREATEInDolibarr=Înregistrarea %s creată
+MODIFYInDolibarr=Înregistrarea %s modificată
+DELETEInDolibarr=Înregistrarea %s ştearsă
+VALIDATEInDolibarr=Înregistrarea %s validată
+APPROVEDInDolibarr=Înregistrarea %s aprobată
+DefaultMailModel=Şablon implicit email
+PublicVendorName=Numele public al furnizorului
+DateOfBirth=Data naşterii
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Token-ul de securitate a expirat, deci acțiunea a fost anulată. Vă rugăm să încercați din nou.
+UpToDate=Actualizat la zi
+OutOfDate=Expirat
+EventReminder=Memento eveniment
+UpdateForAllLines=Actualizare pentru toate liniile
diff --git a/htdocs/langs/ro_RO/members.lang b/htdocs/langs/ro_RO/members.lang
index 973f720f105..e5001621e0d 100644
--- a/htdocs/langs/ro_RO/members.lang
+++ b/htdocs/langs/ro_RO/members.lang
@@ -19,14 +19,12 @@ MembersCards=Carţi de vizită  membri
 MembersList=Lista de membri
 MembersListToValid=Lista  membri schiţă (de validat)
 MembersListValid=Lista de membri validaţi
-MembersListUpToDate=Lista de membri validaţi cu cotizaţia la zi
-MembersListNotUpToDate=Lista de membri validaţi fără cotizaţia la zi
+MembersListUpToDate=Lista membrilor valizi cu abonament actualizat
+MembersListNotUpToDate=Lista membrilor valizi cu abonament expirat
 MembersListResiliated=Lista membrilor desființați
 MembersListQualified=Lista de membri calificaţi
 MenuMembersToValidate=Membri schiţă
 MenuMembersValidated=Membri validaţi
-MenuMembersUpToDate=Membri cu cotizaţia la zi
-MenuMembersNotUpToDate=Membri fără  cotizaţia la zi
 MenuMembersResiliated=Membrii desființați
 MembersWithSubscriptionToReceive=Membri cu cotizaţia de încasat
 MembersWithSubscriptionToReceiveShort=Cotizaţie de încasat
@@ -34,6 +32,7 @@ DateSubscription=Data Adeziune
 DateEndSubscription=Dată Sfârşit Adeziune
 EndSubscription=Sfârşit Adeziune
 SubscriptionId=ID Adeziune
+WithoutSubscription=Fără abonament
 MemberId=ID Membru
 NewMember=Membru nou
 MemberType=Tip Membru
@@ -81,7 +80,7 @@ DeleteType=Şterge
 VoteAllowed=Drept de vot
 Physical=Fizică
 Moral=Morală
-MorPhy=Personalitate juridică
+MorAndPhy=Persoană fizică şi Juridică
 Reenable=Reactivaţi
 ResiliateMember=Desfiinţaţi un membru
 ConfirmResiliateMember=Sigur doriți să desfiinţaţi acest membru?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Trimiterea emailului la validarea noului membru
 SendingEmailOnNewSubscription=Trimiterea unui email la noul abonament
 SendingReminderForExpiredSubscription=Trimiterea unui memento pentru abonamentele expirate
 SendingEmailOnCancelation=Trimiterea emailului la anulare
+SendingReminderActionComm=Se trimite memento pentru evenimentul din agendă
 # Topic of email templates
 YourMembershipRequestWasReceived=Statutul tău de membru a fost primit
 YourMembershipWasValidated=Statutul tău de membru a fost validat
@@ -167,6 +167,7 @@ MembersStatisticsByState=Statistici Membri  după regiune / judeţ
 MembersStatisticsByTown=Statistici Membri după oraşe
 MembersStatisticsByRegion=Statistici Membri  după regiune
 NbOfMembers=Număr  membri
+NbOfActiveMembers=Numărul curent de membri activi
 NoValidatedMemberYet=Niciun membru validat găsit
 MembersByCountryDesc=Acest ecran vă arată statisticile cu privire la membrii după ţări. Graficul depinde  serviciul on-line Google grafic şi este disponibil numai în cazul în care conexiunea la internet este activă.
 MembersByStateDesc=Acest ecran vă arată statisticile cu privire la membrii  după regiuni / judeţe.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistici
 LastMemberDate=Ultima dată de membru
 LatestSubscriptionDate=Ultima dată de abonament
 MemberNature=Natură membru
+MembersNature=Natura membrilor
 Public=Profil public
 NewMemberbyWeb=Membru nou adăugat. În aşteptarea validării
 NewMemberForm=Formular Membru nou
diff --git a/htdocs/langs/ro_RO/mrp.lang b/htdocs/langs/ro_RO/mrp.lang
index 7e50b46154f..ca6af90cf80 100644
--- a/htdocs/langs/ro_RO/mrp.lang
+++ b/htdocs/langs/ro_RO/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Comenzi de producţie
-MO=Comandă de producţie 
-MOs=Manufacturing orders
+MOs=Comenzi de producţie
+ManufacturingOrder=Comandă de producţie 
 MRPDescription=Modulul de gestionare a comenzilor de producție și fabricare (MO).
 MRPArea=Producţie
 MrpSetupPage=Configurare modul MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Produse de fabricat
 UnitCost=Cost unitar
 TotalCost=Cost total
 BOMTotalCost=Costul pentru fabricaţia acestui Bon de consum în funcție de costul fiecărei cantități și produs de consumat (utilizați Prețul de cost, dacă este definit, altfel Prețul mediu ponderat, dacă este definit, altfel cel mai bun preț de achiziție)
+GoOnTabProductionToProduceFirst=Mai întâi trebuie să fi început producția pentru a închide o Comandă de fabricație (Vezi fila '%s'). Puteți anula. 
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Un kit nu poate fi folosit într-un BOM sau MO
diff --git a/htdocs/langs/ro_RO/multicurrency.lang b/htdocs/langs/ro_RO/multicurrency.lang
index cc0dc65ad0d..9faf0c1f731 100644
--- a/htdocs/langs/ro_RO/multicurrency.lang
+++ b/htdocs/langs/ro_RO/multicurrency.lang
@@ -20,3 +20,19 @@ MulticurrencyPaymentAmount=Suma plății, moneda inițială
 AmountToOthercurrency=Suma pentru (în moneda contului de primire)
 CurrencyRateSyncSucceed=Sincronizarea cursului valutar a fost efectuată cu succes
 MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Utilizează moneda documentului pentru plățile online
+TabTitleMulticurrencyRate=Listă cursuri
+ListCurrencyRate=Listă rate de schimb pentru monedă
+CreateRate=Creare rată de schimb
+FormCreateRate=Creare rată de schimb
+FormUpdateRate=Modificare rată de schimb
+successRateCreate=Rata de schimb pentru moneda %s a fost adăugată în baza de date
+ConfirmDeleteLineRate=Eşti sigur că vrei să ştergi rata de schimb %s pentru moneda %s pentru data de %s?
+DeleteLineRate=Ştergere rată de schimb
+successRateDelete=Rată de schimb ştearsă
+errorRateDelete=Eroare la ştergerea ratei
+successUpdateRate=Modificare efectuată
+ErrorUpdateRate=Eroare la schimbarea ratei
+Codemulticurrency=cod monedă
+UpdateRate=schimbă rata
+CancelUpdate=anulare
+NoEmptyRate=Câmpul rata nu trebuie să fie gol
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index 76b5f94a930..b65779946bc 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - products
-ProductRef=Ref. Produs
+ProductRef=Ref. produs
 ProductLabel=Etichetă produs
 ProductLabelTranslated=Etichetă de produs tradusă
 ProductDescription=Descriere produs
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Completează cu data ultimelor linii de servicii
 MultiPricesAbility=Segmente multiple de preț pentru fiecare produs / serviciu (fiecare client se află într-un singur segment de preț)
 MultiPricesNumPrices=Numărul de preţ
 DefaultPriceType=Baza prețurilor în mod implicit (cu sau fără taxe) la adăugarea noilor prețuri de vânzare
-AssociatedProductsAbility=Activați produsele virtuale (kituri)
-AssociatedProducts=Produse virtuale
-AssociatedProductsNumber=Număr produse  ce compun produsul virtual
+AssociatedProductsAbility=Activeaz kit-uri (produse virtuale)
+AssociatedProducts=Kit-uri
+AssociatedProductsNumber=Numărul de produse care compun acest kit
 ParentProductsNumber=Numărul  pachetelor produselor  părinte
 ParentProducts=Produse-mamă
-IfZeroItIsNotAVirtualProduct=Dacă 0, acest produs nu este un produs virtual
-IfZeroItIsNotUsedByVirtualProduct=Dacă 0, acest produs nu este folosit de niciun produs virtual
+IfZeroItIsNotAVirtualProduct=Dacă este 0, acest produs nu este un kit.
+IfZeroItIsNotUsedByVirtualProduct=Dacă este 0, acest produs nu este utilizat de niciun kit
 KeywordFilter=Filtru de cuvinte cheie
 CategoryFilter=Categorie filtru
 ProductToAddSearch=Cauta produse de adăugat
 NoMatchFound=Niciun rezultat găsit
 ListOfProductsServices=Lista de produse/servicii
-ProductAssociationList=Lista produselor/serviciilor care sunt component(e) ale acestui produs/kit virtual
-ProductParentList=Lista de produse / servicii cu acest produs, ca o componentă
+ProductAssociationList=Lista produselor/serviciilor care sunt componentă(e) ale acestui kit
+ProductParentList=Lista kit-urilor cu acest produs ca şi componentă
 ErrorAssociationIsFatherOfThis=Un produs este selectat de părinte cu curent produs
 DeleteProduct=A şterge un produs / serviciu
 ConfirmDeleteProduct=Sunteţi sigur că doriţi să ştergeţi acest produs / serviciu?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Valori globale disponibile:
 PriceMode=Mod  preț
 PriceNumeric=Număr
 DefaultPrice=Preț Implicit
+DefaultPriceLog=Jurnalul preţurilor implicite anterioare
 ComposedProductIncDecStock=Mărește/micșorează stoc pe schimbări sintetice
 ComposedProduct=Produse pentru copii
 MinSupplierPrice=Preţul minim de achiziţie
@@ -339,6 +340,7 @@ UseProductFournDesc=Adăugați o caracteristică pentru a defini descrierile pro
 ProductSupplierDescription=Descrierea furnizorului pentru produs
 UseProductSupplierPackaging=Utilizați unităţile de ambalare la prețurile furnizorului (recalculați cantitățile în funcție de unităţile de ambalare stabilite la prețul furnizorului atunci când adăugați/actualizați linia în documentele furnizorului)
 PackagingForThisProduct=Ambalare
+PackagingForThisProductDesc=Pe comanda de achiziţie, veți comanda automat această cantitate (sau un multiplu al acestei cantități). Nu poate fi mai mică decât cantitatea minimă de cumpărare
 QtyRecalculatedWithPackaging=Cantitatea liniei a fost recalculată conform unităţii de ambalare a furnizorului
 
 #Attributes
diff --git a/htdocs/langs/ro_RO/recruitment.lang b/htdocs/langs/ro_RO/recruitment.lang
index cc01cf12885..d2fb1c6d642 100644
--- a/htdocs/langs/ro_RO/recruitment.lang
+++ b/htdocs/langs/ro_RO/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Data aşteptată
 FutureManager=Manager alocat
 ResponsibleOfRecruitement=Responsabil cu recrutarea
 IfJobIsLocatedAtAPartner=Dacă jobul este în locaţia unui partener
-PositionToBeFilled=Ofertă job
-PositionsToBeFilled=Oferte joburi
-ListOfPositionsToBeFilled=Liste oferte joburi
-NewPositionToBeFilled=Oferte job
+PositionToBeFilled=Funcţie
+PositionsToBeFilled=Joburi disponibile
+ListOfPositionsToBeFilled=Lista posturilor disponibile
+NewPositionToBeFilled=Posturi disponibile noi
 
-JobOfferToBeFilled=Ofertă job
+JobOfferToBeFilled=Posturi rămase neocupate
 ThisIsInformationOnJobPosition=Informaţii despre oferta job
 ContactForRecruitment=Contact pentru recrutare
 EmailRecruiter=Email recrutor
 ToUseAGenericEmail=Utilizare email generic. Dacă nu este definit, se va utiliza emailul responsabilului de recrutare
-NewCandidature=Candidatură nouă
-ListOfCandidatures=Listă candidaturi
+NewCandidature=Aplicare nouă
+ListOfCandidatures=Lista aplicărilor la job
 RequestedRemuneration=Remunerație solicitată
 ProposedRemuneration=Remuneraţie propusă
 ContractProposed=Contract propus
 ContractSigned=Contract semnat
-RecruitmentCandidature=Candidatură
+ContractRefused=Contract refuzat
+RecruitmentCandidature=Aplicare la job
 JobPositions=Joburi disponibile
-RecruitmentCandidatures=Candidaturi
+RecruitmentCandidatures=Aplicări la job
 InterviewToDo=Interviu de făcut
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Răspuns aplicare
+YourCandidature=Aplicarea ta
+YourCandidatureAnswerMessage=Îţi mulţumim pentru aplicarea ta la job.<br>...
+JobClosedTextCandidateFound=Oferta de job este închisă. Postul a fost ocupat.
+JobClosedTextCanceled=Oferta de job este închisă.
+ExtrafieldsJobPosition=Atribute complementare (oferte job)
+ExtrafieldsCandidatures=Atribute complementare (aplicări job)
diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang
index 04b32acb280..ae3b0d063aa 100644
--- a/htdocs/langs/ro_RO/stocks.lang
+++ b/htdocs/langs/ro_RO/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=ID-ul de mișcare %d
 ListMouvementStockProject=Lista miscărilor de stoc asociate proiectului
 StocksArea=Depozite
 AllWarehouses=Toate depozitele
-IncludeEmptyDesiredStock= Includeți și stocul dorit nedefinit
+IncludeEmptyDesiredStock= Include și stocul negativ cu stoc dorit nedefinit
 IncludeAlsoDraftOrders=Includeți, de asemenea, schiţele de proiecte
 Location=Locație
 LocationSummary=Nume scurt locaţie
@@ -122,8 +122,9 @@ DesiredStockDesc=Această cantitate stoc va fi valoarea utilizată pentru a umpl
 StockToBuy=De  comandat
 Replenishment=Reaprovizionare
 ReplenishmentOrders=Comenzi reaprovizionare
-VirtualDiffersFromPhysical=Potrivit opțiunilor de creștere / micșorare a stocului, stocul fizic și stocul virtual (comenzi fizice + curente) pot fi diferite
-UseVirtualStockByDefault=Utilizați stoc virtual implicit, în loc de stoc fizic, pentru facilitatea de reaprovizionare
+VirtualDiffersFromPhysical=În funcție de opţiunile de creștere/reducere de stoc, stocul fizic și stocul virtual(stoc fizic + comenzi deschise) pot diferi
+UseRealStockByDefault=Utilizează stocul real, în loc de stocul virtual, pentru caracteristica de reaprovizionare
+ReplenishmentCalculation=Cantitatea comandată va fi (cantitatea dorită - stocul real) în loc de (cantitatea dorită - stocul virtual) 
 UseVirtualStock=Utilizeaza Stoc Virtual 
 UsePhysicalStock=Utilizeaza Stoc Fizic
 CurentSelectionMode=Mod selectie curent
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=Acest produs este deja în listă
 SelectCategory=Categorie filtru
 SelectFournisseur=Filtru furnizor
 inventoryOnDate=Inventar
-INVENTORY_DISABLE_VIRTUAL=Produs virtual (kit): nu reduceți stocul de subprodus
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Utilizați prețul de cumpărare dacă nu puteți găsi ultimul preț de cumpărare
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT= Mișcările de stoc vor avea data inventarului (în loc de data validării inventarului)
 inventoryChangePMPPermission=Permiteți modificarea valorii PMP pentru un produs
 ColumnNewPMP=Nouă unitate PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=Poți vedea aici stocul (stoc real) la o dată prestabilită
 StockAtDateFutureDesc=Puteți vizualiza aici stocul (stoc virtual) la o dată dată în viitor
 CurrentStock=Stoc curent
 InventoryRealQtyHelp=Setați valoarea la 0 pentru a reseta câmpul cantitate<br> Lăsaţi necompletat, sau eliminaţi linia, pentru a păstra neschimbat 
-UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaning=Actualizare prin scanare
+UpdateByScaningProductBarcode=Actualizare prin scanare (cod de bare produs)
+UpdateByScaningLot=Actualizare prin scanare (cod de bare lot|serie)
diff --git a/htdocs/langs/ro_RO/suppliers.lang b/htdocs/langs/ro_RO/suppliers.lang
index c6828bbbeed..e4051441e49 100644
--- a/htdocs/langs/ro_RO/suppliers.lang
+++ b/htdocs/langs/ro_RO/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Comenzi de achiziție pentru facturare
 NbDaysToDelivery=întârziere de livrare (zile)
 DescNbDaysToDelivery=Cea mai lungă întârziere de livrare a produselor din această comandă
 SupplierReputation=Reputația furnizorului
+ReferenceReputation=Reputație de referință
 DoNotOrderThisProductToThisSupplier=Nu comanda
 NotTheGoodQualitySupplier=Calitate scăzută
 ReputationForThisProduct=Reputatie
diff --git a/htdocs/langs/ro_RO/website.lang b/htdocs/langs/ro_RO/website.lang
index e1bf4f55213..5e2dab5d97a 100644
--- a/htdocs/langs/ro_RO/website.lang
+++ b/htdocs/langs/ro_RO/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Adaugă pagina web
 Webpage=Pagina web / container
 AddPage=Adăugați o pagină / un container
 HomePage=Acasă
-PageContainer=Pagina / container
+PageContainer=Pagina
 PreviewOfSiteNotYetAvailable=Previzualizarea site-ului dvs. web <strong> %s </strong> nu este încă disponibil. Mai întâi trebuie să '<strong> Importați un șablon complet de site-uri web </strong>' sau doar '<strong> Adăugați o pagină / container </strong>'.
 RequestedPageHasNoContentYet=Pagina solicitată cu id %s nu are încă conținut, sau fișierul cache cache.php a fost eliminat. Editați conținutul paginii pentru a rezolva această problemă.
 SiteDeleted=Site-ul Web "%s" a fost șters
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Înlocuirea s-a făcut în %s pagini sau containere
 RSSFeed=Feed RSS
 RSSFeedDesc=Puteți obține un flux RSS al celor mai recente articole cu tipul 'blogpost' folosind această adresă URL
 PagesRegenerated=%s pagină(i) /container(e) regenerate
+RegenerateWebsiteContent=Regenerați fișierele cache ale site-ului web
+AllowedInFrames=Permis în Frame-uri
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index 571f0a4e238..bc73a4d82a0 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=По умолчанию для услуги
 DefaultForProduct=По умолчанию для товара
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Больше настроек бухгалтерии выполняется из меню %s
-ConfigAccountingExpert=Конфигурация бухгалтерского модуля
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Журналирование
-Journaux=Журналы
+Journals=Журналы
 JournalFinancial=Финансовые журналы
 BackToChartofaccounts=Получаемый график счетов
 Chartofaccounts=Схема учётных записей
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Дополнительная информация
 DeleteCptCategory=Удалить учётный счёт из группы
 ConfirmDeleteCptCategory=Вы действительно хотите удалить этот учетный счет из группы бухгалтерских счетов?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Показать детали счета
 AccountWithNonZeroValues=Счета с ненулевыми значениями
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Экспорт бухгалтерских документов
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Выберите активный график счетов
 ChangeAndLoad=Change and load
 Addanaccount=Добавить бухгалтерский счёт
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Учетный счет
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Банковские счета
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Создать новую транзакцию
 UpdateMvts=Изменить транзакцию
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Журнал продаж
 ACCOUNTING_PURCHASE_JOURNAL=Журнал платежей
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=По годам
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index a5bf50e855a..8894f182715 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -37,10 +37,12 @@ UnlockNewSessions=Удалить блокировку подключений
 YourSession=Ваша сессия
 Sessions=Пользовательские сессии
 WebUserGroup=Пользователь / группа Web-сервера
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Кажется, ваша конфигурация PHP не позволяет отображать активные сеансы. Каталог, используемый для сохранения сеансов ( <b>%s</b> ), может быть защищен (например, разрешениями ОС или директивой PHP open_basedir).
 DBStoringCharset=Кодировка базы данных для хранения данных
 DBSortingCharset=Кодировка базы данных для сортировки данных
-HostCharset=Host charset
+HostCharset=Кодировка хоста
 ClientCharset=Клиентская кодировка
 ClientSortingCharset=Сопоставление клиентов
 WarningModuleNotActive=Модуль <b>%s</b> должен быть включен
@@ -71,7 +73,7 @@ DisableJavascriptNote=Примечание. Для тестирования ил
 UseSearchToSelectCompanyTooltip=Кроме того, если у вас есть большое количество контрагентов (> 100 000), вы можете увеличить скорость, установив постоянную COMPANY_DONOTSEARCH_ANYWHERE на 1 в Настройка-Доп.настройки. Затем поиск будет ограничен началом строки.
 UseSearchToSelectContactTooltip=Кроме того, если у вас есть большое количество контрагентов (> 100 000), вы можете увеличить скорость, установив постоянную COMPANY_DONOTSEARCH_ANYWHERE на 1 в Настройка-Доп.настройки. Затем поиск будет ограничен началом строки.
 DelaiedFullListToSelectCompany=Ожидание нажатия клавиши, прежде чем загружать содержимое списка Контрагентов. <br> Это может повысить производительность, если у вас много контрагентов, но это менее удобно.
-DelaiedFullListToSelectContact=Ожидание нажатия клавиши, прежде чем загружать содержимое списка Контактов. <br> Это может увеличить производительность, если у вас большое количество контактов, но это менее удобно
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Количество символов для запуска поиска: %s
 NumberOfBytes=Количество байт
 SearchString=Строка поиска
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=В документе контрагент
 JavascriptDisabled=JavaScript отключен
 UsePreviewTabs=Использовать вкладки предпросмотра
 ShowPreview=Предварительный просмотр
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Предварительный просмотр не доступен
 ThemeCurrentlyActive=Текущая тема
 CurrentTimeZone=Текущий часовой пояс в настройках PHP
@@ -271,7 +274,7 @@ NoticePeriod=Период уведомления
 NewByMonth=Новые по месяцам
 Emails=Электронная почта
 EMailsSetup=Настройка электронной почты
-EMailsDesc=Эта страница позволяет вам переопределить параметры PHP по умолчанию для отправки электронной почты. В большинстве случаев в ОС Unix / Linux настройка PHP правильная, и эти параметры не нужны.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Профили отправителей электронной почты
 EMailsSenderProfileDesc=Вы можете оставить этот раздел пустым. Если вы введете здесь несколько писем, они будут добавлены в список возможных отправителей в поле со списком, когда вы напишите новое письмо.
 MAIN_MAIL_SMTP_PORT=Порт SMTP/SMTPS (значение по умолчанию в php.ini: <b>%s</b> )
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (если отправляющий сервер тр
 MAIN_MAIL_SMTPS_PW=Пароль SMTP (если отправляющий сервер требует аутентификации)
 MAIN_MAIL_EMAIL_TLS=Использовать шифрование TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Использовать шифрование TLS (STARTTLS)
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Используйте DKIM для создания подписи электронной почты
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Домен электронной почты для использования с DKIM
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Имя селектора DKIM
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Оставьте это поле пустым, чт
 ExtrafieldParamHelpselect=Список значений должен быть строками формата: ключ, значение (где ключ не может быть равен 0) <br><br> например: <br> 1, значение1 <br> 2, значение2 <br> code3, значение3 <br> ... <br><br> Чтобы иметь список в зависимости от другого списка дополнительных атрибутов: <br> 1, значение1|options_ <i>parent_list_code</i> : parent_key <br> 2, значение2|options_ <i>parent_list_code</i> : parent_key <br><br> Чтобы иметь список в зависимости от другого списка: <br> 1, значение1 | <i>parent_list_code</i> : parent_key <br> 2, значение2 | <i>parent_list_code</i> : parent_key
 ExtrafieldParamHelpcheckbox=Список значений должен быть строками с форматом: ключ, значение (где ключ не может быть равен 0) <br><br> например: <br> 1, значение1 <br> 2, значение2 <br> 3, значение3 <br> ...
 ExtrafieldParamHelpradio=Список значений должен быть строками с форматом: ключ, значение (где ключ не может быть равен 0) <br><br> например: <br> 1, значение1 <br> 2, значение2 <br> 3, значение3 <br> ...
-ExtrafieldParamHelpsellist=Список значений поступает из таблицы <br> Синтаксис: table_name:label_field:id_field::filter <br> Пример: c_typent:libelle:id:: filter<br><br> -idfilter - обязательно первичный ключ int <br> - фильтр может быть простым тестом (например, active = 1) для отображения только активного значения <br> Вы также можете использовать $ID$ в фильтре с текущим идентификатором текущего объекта. <br> Чтобы сделать SELECT в фильтре, используйте $SEL$ <br> если вы хотите фильтровать extrafields, используйте синтаксис extra.fieldcode = ... (где code field - это код extrafields) <br><br> Чтобы иметь список в зависимости от другого списка дополнительных атрибутов: <br> c_typent:libelle:id:options_ <i>parent_list_code</i>|parent_column:filter <br><br> Чтобы иметь список в зависимости от другого списка: <br> c_typent:libelle:id: <i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Список значений поступает из таблицы <br> Синтаксис: table_name:label_field:id_field::filter <br> Пример: c_typent: libelle:id::filter <br><br> Фильтр может быть простым тестом (например, active = 1) для отображения только активного значения <br> Вы также можете использовать $ID$ в фильтре с текущим идентификатором текущего объекта. <br> Чтобы сделать SELECT в фильтре, используйте $SEL$ <br> если вы хотите фильтровать extrafield, используйте синтаксис extra.fieldcode = ... (где code field - это код extrafield) <br><br> Чтобы иметь список в зависимости от другого списка дополнительных атрибутов: <br> c_typent:libelle:id: options_ <i>parent_list_code</i>|parent_column: filter <br><br> Чтобы иметь список в зависимости от другого списка: <br> c_typent: ibelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Параметры должны быть ObjectName:Classpath <br> Синтаксис: ObjectName:Classpath <br> Примеры: <br> Societe:societe/class/societe.class.php <br> Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Библиотека используемая для создания PDF-файлов
 LocalTaxDesc=Некоторые страны могут применять два или три налога на каждую позицию счета. Если это так, выберите тип второго и третьего налога и его ставку. Возможные типы: <br> 1: местный налог применяется к продуктам и услугам без НДС (местный налог рассчитывается на сумму без налога) <br> 2: местный налог применяется к продуктам и услугам, включая НДС (местный налог рассчитывается на сумму + основной налог) <br> 3: местный налог применяется к продуктам без НДС (местный налог рассчитывается на сумму без налога) <br> 4: местный налог применяется к продуктам, включая НДС (местный налог рассчитывается на сумму + основной НДС) <br> 5: местный налог применяется к услугам без НДС (местный налог рассчитывается на сумму без налога) <br> 6: местный налог применяется к услугам, включая НДС (местный налог рассчитывается на сумму + налог)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=По умолчанию заказы на поставку должны быть созданы и одобрены двумя разными пользователями (один шаг/пользователь для создания и один шаг/пользователь для одобрения. Обратите внимание, что если у пользователя есть как разрешение на создание и утверждение, достаточно одного шага/пользователя) , Вы можете задать эту опцию, чтобы ввести утверждение третьего шага/пользователя, если сумма превышает выделенное значение (так что потребуется 3 шага: 1 = валидация, 2 = первое утверждение и 3 = второе одобрение, если суммы достаточно). <br>Установите это для пустого, если достаточно одного утверждения (2 шага), установите его на очень низкое значение (0,1), если требуется второе утверждение (3 шага).
 UseDoubleApproval=Используйте одобрение на 3 шага, когда сумма (без налога) выше ...
-WarningPHPMail=ПРЕДУПРЕЖДЕНИЕ. Часто лучше настроить исходящую электронную почту, чтобы использовать почтовый сервер вашего провайдера вместо настроек по умолчанию. Некоторые провайдеры электронной почты (например, Yahoo) не позволяют отправлять электронную почту с другого сервера, не их собственного сервера. Ваша текущая настройка использует сервер приложения для отправки электронной почты, а не сервер вашего провайдера электронной почты, поэтому некоторые получатели (совместимые с ограничительным протоколом DMARC) спросят вашего провайдера электронной почты, могут ли они принять вашу электронную почту, а некоторые провайдеры электронной почты (например, Yahoo) может ответить «нет», потому что сервер не принадлежит им, поэтому некоторые из отправленных вами писем могут быть не приняты (будьте осторожны и с квотой отправки вашего провайдера электронной почты). <br> Если у вашего провайдера электронной почты (например, Yahoo) есть это ограничение, вы должны изменить настройки электронной почты, чтобы выбрать другой метод «SMTP-сервер» и ввести SMTP-сервер и учетные данные, предоставленные вашим провайдером электронной почты.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=Если вашему SMTP-провайдеру электронной почты необходимо ограничить почтовый клиент некоторыми IP-адресами (это очень редко), это IP-адрес почтового пользователя (MUA) для вашего приложения ERP CRM: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Нажмите, чтобы посмотреть описание
 DependsOn=Этот модуль нуждается в модуле (модулях)
 RequiredBy=Этот модуль требуется для модуля (модулей)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Интеграция с системами НажатьДляЗвонка (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Добавить функцию для создания учетных записей Bookmark4u из учетной записи Dolibarr
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Проектные работы
@@ -656,7 +662,7 @@ Module50200Desc=Предложите клиентам страницу онла
 Module50300Name=Stripe
 Module50300Desc=Предложите клиентам страницу онлайн-оплаты Stripe (кредитные / дебетовые карты). Это может быть использовано, чтобы позволить вашим клиентам осуществлять специальные платежи или платежи, связанные с конкретным объектом Dolibarr (счет, заказ и т. д.)
 Module50400Name=Бухгалтерский учет (двойная запись)
-Module50400Desc=Управление бухгалтерским учетом (двойные записи, поддержка гроссбуха и вспомогательных книг). Экспорт книги в несколько других форматов бухгалтерского программного обеспечения.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=Модуль PrintIPP
 Module54000Desc=Прямая печать (без открытия документов) с использованием интерфейса Cups IPP (принтер должен быть виден с сервера, а CUPS должен быть установлен на сервере).
 Module55000Name=Голосование, обзор или голосование
@@ -671,7 +677,7 @@ Module63000Name=Ресурсы
 Module63000Desc=Управление ресурсами (принтеры, машины, комнаты, ...) для распределения на события
 Permission11=Просмотр счетов-фактур клиентов
 Permission12=Создание/Изменение счета-фактуры
-Permission13=Аннулирование счетов-фактур
+Permission13=Invalidate customer invoices
 Permission14=Проверка счета-фактуры
 Permission15=Отправить по почте счета-фактуры
 Permission16=Создать платежи счетов-фактур
@@ -688,6 +694,7 @@ Permission32=Создание / изменение продукции / услу
 Permission34=Удаленные продукция / услуги
 Permission36=Просмотр / управление скрытой продукцией / услугами
 Permission38=Экспорт продукции
+Permission39=Ignore minimum price
 Permission41=Просмотрите проекты и задачи (общий проект и мои проекты). Можно также ввести время, затраченное на вас или ваших подчиненных, на назначенные задачи (расписание)
 Permission42=Создание/изменение проектов (общий и мои проекты). Может также создавать задачи и назначать пользователей для проекта и задач
 Permission44=Удалить проекты (общие и мои проекты)
@@ -696,6 +703,9 @@ Permission61=Смотреть мероприятия
 Permission62=Создание / измение мероприятий
 Permission64=Удаление мероприятий
 Permission67=Экспорт мероприятий
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Смотреть участников
 Permission72=Создать / изменить участников
 Permission74=Удалить участников
@@ -718,6 +728,7 @@ Permission95=Смотреть отчеты
 Permission101=Смотреть отправки
 Permission102=Создать / изменить отправки
 Permission104=Проверка отправок
+Permission105=Send sendings by email
 Permission106=Экспортировать отправки
 Permission109=Удалить отправки
 Permission111=Читать финансовую отчетность
@@ -825,10 +836,11 @@ Permission402=Создать / изменить скидки
 Permission403=Проверить скидки
 Permission404=Удалить скидки
 Permission430=Использовать панель отладки
-Permission511=Просмотр выплаты зарплат
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Создание/изменение выплат зарплат
 Permission514=Удалить выплаты зарплаты
-Permission517=Экспорт зарплат
+Permission517=Read payments of salaries of everybody
+Permission519=Экспорт зарплат
 Permission520=Открыть ссуды
 Permission522=Создать/изменить ссуды
 Permission524=Удалить ссуды
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Просмотр ведомости материалов
 Permission651=Создание/обновление ведомостей материалов
 Permission652=Удалить списки материалов
@@ -884,7 +899,9 @@ Permission1185=Утвердить заказы на покупку
 Permission1186=Заказать заказы на покупку
 Permission1187=Подтвердить получение заказов на покупку
 Permission1188=Удалить заказы на покупку
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Утвердить (второе утверждение) заказы на покупку
+Permission1191=Export supplier orders and their attributes
 Permission1201=Получите результат экспорта
 Permission1202=Создание / Изменение экспорта
 Permission1231=Просмотреть счета поставщиков
@@ -898,6 +915,8 @@ Permission1251=Запуск массового импорта внешних д
 Permission1321=Экспорт клиентом счета-фактуры, качества и платежей
 Permission1322=Повторно открыть оплаченный счет
 Permission1421=Экспорт заказов на продажу и атрибутов
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Просмотр Запланированных задач
 Permission23002=Создать/обновить Запланированную задачу
 Permission23003=Удалить Запланированную задачу
 Permission23004=Выполнить запланированную задачу
-Permission50101=Использовать точку продажи
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Просмотр транзакций
 Permission50202=Импорт транзакций
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Связать продукты и счета с учетными записями
 Permission50411=Просмотр операций в бухгалтерской книге
 Permission50412=Операции записи/редактирования в бухгалтерской книге
@@ -958,6 +981,17 @@ Permission63001=Чтение ресурсов
 Permission63002=Создание/изменение ресурсов
 Permission63003=Удалить ресурсы
 Permission63004=Свяжите ресурсы с повесткой дня
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Типы контрагента
 DictionaryCompanyJuridicalType=Правовая форма контрагента
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Типы отпуска
 DictionaryOpportunityStatus=Правовой статус  проекта/сделки
 DictionaryExpenseTaxCat=Отчет о расходах - Категории транспорта
 DictionaryExpenseTaxRange=Отчет о расходах - Диапазон по транспортной категории
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Настройки сохранены
 SetupNotSaved=Установки не сохранены
 BackToModuleList=Вернуться к списку модулей
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Метки, используемые по умолчанию,
 LabelOnDocuments=Этикетка на документах
 LabelOrTranslationKey=Метка или ключ перевода
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=Кол-во дней
 AtEndOfMonth=На конец месяца
 CurrentNext=Текущая/Следующая
@@ -1145,6 +1182,7 @@ InfoWebServer=О веб-сервере
 InfoDatabase=О базе данных
 InfoPHP=О PHP
 InfoPerf=О производительности
+InfoSecurity=About Security
 BrowserName=Имя браузера
 BrowserOS=Операционная система браузера
 ListOfSecurityEvents=Список Dolibarr безопасность события
@@ -1194,7 +1232,8 @@ RestoreDesc=Чтобы восстановить резервную копию Do
 RestoreDesc2=Восстановить файл резервной копии (например, zip-файл) каталога «документы» в новую установку Dolibarr или в этот текущий каталог документов ( <b>%s</b> ).
 RestoreDesc3=Восстановить структуру базы данных и данные из файла резервной копии в базу данных новой установки Dolibarr или в базу данных текущей установки ( <b>%s</b> ). Предупреждение: после завершения восстановления вы должны использовать логин / пароль, который существовал во время резервного копирования / установки, чтобы снова подключиться. <br> Чтобы восстановить резервную копию базы данных в этой текущей установке, вы можете следовать этому помощнику.
 RestoreMySQL=Иvпорт MySQL
-ForcedToByAModule= Это правило принудительно активируется модулем <b>%s.</b>
+ForcedToByAModule=Это правило принудительно активируется модулем <b>%s.</b>
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Существующие файлы резервных копий
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=Первый день недели
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Запросить предпочтительный способ доставки для контрагентов.
 FieldEdition=Редакция поля %s
 FillThisOnlyIfRequired=Например, +2 (заполняйте это поле только тогда, когда ваш часовой пояс отличается от того, который используется на сервере)
@@ -1282,7 +1322,7 @@ GetBarCode=Получить штрих-код
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Возврат пароля, полученных в соответствии с внутренними Dolibarr алгоритма: 8 символов, содержащих общие цифры и символы в нижнем регистре.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Не предлагать сгенерированный пароль. Пароль должен быть введен вручную.
 PasswordGenerationPerso=Верните пароль в соответствии с вашей личной конфигурацией.
 SetupPerso=Согласно вашей конфигурации
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Требуется электронная почта для
 MemberSendInformationByMailByDefault=Чекбокс отправить по почте подтверждение членов по умолчанию
 VisitorCanChooseItsPaymentMode=Посетитель может выбрать один из доступных способов оплаты
 MEMBER_REMINDER_EMAIL=Включить автоматическое напоминание <b>по электронной почте</b> о просроченных подписках. Примечание. Модуль <strong>%s</strong> должен быть включен и правильно настроен для отправки напоминаний.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=Установка LDAP
 LDAPGlobalParameters=Глобальные параметры
@@ -1507,10 +1548,10 @@ LDAPFieldTitle=Должность
 LDAPFieldTitleExample=Например, заголовок
 LDAPFieldGroupid=Group id
 LDAPFieldGroupidExample=Exemple : gidnumber
-LDAPFieldUserid=User id
-LDAPFieldUseridExample=Exemple : uidnumber
-LDAPFieldHomedirectory=Home directory
-LDAPFieldHomedirectoryExample=Exemple : homedirectory
+LDAPFieldUserid=ID пользователя
+LDAPFieldUseridExample=Например: uidномер
+LDAPFieldHomedirectory=Домашняя директория
+LDAPFieldHomedirectoryExample=Например: домашняядериктория
 LDAPFieldHomedirectoryprefix=Home directory prefix
 LDAPSetupNotComplete=Установка не завершена (переход на другие вкладки)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Нет администратора или пароль предусмотрено. LDAP доступ будет анонимным и в режиме только для чтения.
@@ -1523,7 +1564,9 @@ LDAPDescValues=Пример значения для <b>OpenLDAP</b> с загр
 ForANonAnonymousAccess=Для аутентифицированных доступа (для записи, например)
 PerfDolibarr=Настройки производительности/отчёты о оптимизации
 YouMayFindPerfAdviceHere=Эта страница содержит некоторые проверки или советы, связанные с производительностью.
-NotInstalled=Не установлен, поэтому ваш сервер от этого не замедлится.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Прикладной кеш
 MemcachedNotAvailable=Аппликативный кеш не найден. Вы можете повысить производительность, установив кеш-сервер Memcached и модуль, способный использовать этот кеш-сервер. <br> Более подробная информация здесь <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a> . <br> Обратите внимание, что многие веб-хостинг-провайдеры не предоставляют такой кеш-сервер.
 MemcachedModuleAvailableButNotSetup=Модуль memcached для прикладного кэша найден, но настройка модуля не завершена.
@@ -1571,9 +1614,9 @@ SyslogLevel=Уровень
 SyslogFilename=Имя файла и путь
 YouCanUseDOL_DATA_ROOT=Вы можете использовать DOL_DATA_ROOT / dolibarr.log в лог-файл в Dolibarr "документы" каталог. Вы можете установить различные пути для хранения этого файла.
 ErrorUnknownSyslogConstant=Постоянная %s не известны журнала постоянная
-OnlyWindowsLOG_USER=Windows&copy; поддерживает только LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Сжатие и резервное копирование файлов журнала отладки (сгенерированных модулем Log для отладки)
-SyslogFileNumberOfSaves=Журнал резервных копий
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Настроить очистку запланированного задания для установки частоты резервного копирования журнала
 ##### Donations #####
 DonationsSetup=Настройка модуля Пожертвования
@@ -1629,7 +1672,7 @@ AdvancedEditor=Расширенный редактор
 ActivateFCKeditor=Включить FCKeditor для:
 FCKeditorForCompany=WYSIWIG создание / издание компаний описание и сведения
 FCKeditorForProduct=WYSIWIG создания / выпуска продукции / услуг описание и сведения
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG создание / издание рассылок
 FCKeditorForUserSignature=Редактор WYSIWIG  для создания/изменения подписи пользователя
 FCKeditorForMail=WYSIWIG создание/издание для всей почты (кроме Tools-> eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Настройка модуля запаса
 IfYouUsePointOfSaleCheckModule=Если вы используете модуль торговой точки (POS), предоставленный по умолчанию, или внешний модуль, эта установка может быть проигнорирована вашим модулем POS. Большинство POS-модулей по умолчанию предназначены для немедленного создания счета-фактуры и уменьшения складских запасов независимо от имеющихся здесь опций. Поэтому, если вам нужно или не нужно уменьшать запас при регистрации продажи в вашем POS, проверьте также настройку вашего POS-модуля.
 ##### Menu #####
 MenuDeleted=Удаленное Меню 
+Menu=Menu
 Menus=Меню
 TreeMenuPersonalized=Персонализированная меню
 NotTopTreeMenuPersonalized=Персонализированные меню, не связанные с пунктом верхнего меню
 NewMenu=Новое меню
-Menu=Выбор меню
 MenuHandler=Меню обработчик
 MenuModule=Исходный модуль
 HideUnauthorizedMenu= Скрыть несанкционированного меню (серый)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Включить напоминание о событиях <b>по электронной почте</b> (напоминание опции/задержки можно определить для каждого события). Примечание. Модуль <strong>%s</strong> должен быть включен и правильно настроен для отправки напоминания с правильной частотой.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Включить звуковое оповещение
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Показывать связанный объект в представлении повестки дня
 ##### Clicktodial #####
 ClickToDialSetup=Настройка модуля Click To Dial
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Путь к заголовочным файлам (задан в переменной %s)
 ExpenseReportsSetup=Настройка модуля Отчёты о затратах
 TemplatePDFExpenseReports=Шаблон документа для создания отчёта о затратах
-ExpenseReportsIkSetup=Настройка модуля Отчеты о расходах - индекс Milles
 ExpenseReportsRulesSetup=Настройка модуля Отчеты о расходах - Правила
 ExpenseReportNumberingModules=Модуль нумерации отчетов о расходах
 NoModueToManageStockIncrease=Был активирован модуль, способный управлять автоматическим увеличением запасов. Увеличение запасов будет производиться только вручную.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Контрагенты
 MailToMember=Участники
 MailToUser=Пользователи
-MailToProject=Страница проектов
+MailToProject=Проекты
 MailToTicket=Заявки
 ByDefaultInList=Показывать по умолчанию в виде списка
 YouUseLastStableVersion=Вы используете последнюю стабильную версию
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Индекс
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Отключить функцию привязки 
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Подтвердите сброс модуля
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/ru_RU/banks.lang b/htdocs/langs/ru_RU/banks.lang
index cc156c7a16d..8c02e198885 100644
--- a/htdocs/langs/ru_RU/banks.lang
+++ b/htdocs/langs/ru_RU/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Смешанные платежи
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=Мандат SEPA
 YourSEPAMandate=Ваш мандат SEPA
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/ru_RU/categories.lang b/htdocs/langs/ru_RU/categories.lang
index 42f038aae94..c1fd9fc39d7 100644
--- a/htdocs/langs/ru_RU/categories.lang
+++ b/htdocs/langs/ru_RU/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Настройка тегов/категорий
 CategorieRecursiv=Автоматическая ссылка на родительский тег/категорию
 CategorieRecursivHelp=Если опция включена, то при добавлении товара в подкатегорию товар также будет добавлен в родительскую категорию.
 AddProductServiceIntoCategory=Добавить следующий товар/услугу
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Показать тег/категорию
 ByDefaultInList=By default in list
 ChooseCategory=Выберите категорию
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang
index c4389c9917f..53e53122d77 100644
--- a/htdocs/langs/ru_RU/companies.lang
+++ b/htdocs/langs/ru_RU/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Проф ID 1 (USt.-IdNr)
 ProfId2AT=Проф Id 2 (USt.-NR)
 ProfId3AT=Проф ID 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Проф Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Проф Id 1 (Проф номер)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=Номер IE (Для Бразилии, государственной регистрации юридических лиц) 
@@ -144,11 +144,11 @@ ProfId3BR=Номер IM (для Бразилии)
 ProfId4BR=Номер CPF (Для Бразилии)
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Проф ID 1 (федеральный номер)
 ProfId4CH=Проф Id 2 (коммерческий Запись номер)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Проф Id 1 (БУТ)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Проф ID 1 (USt.-IdNr)
 ProfId2DE=Проф Id 2 (USt.-NR)
 ProfId3DE=Проф ID 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Проф Id 1 (CIF / NIF)
 ProfId2ES=Проф Id 2 (номер социального страхования)
 ProfId3ES=Проф Id 3 (CNAE)
 ProfId4ES=Проф Id 4 (Энциклопедический номер)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Проф Id 1 (SIREN)
 ProfId2FR=Проф Id 2 (SIRET)
 ProfId3FR=Проф Id 3 (NAF, старые APE)
 ProfId4FR=Проф Id 4 (RCS / РМ)
-ProfId5FR=Проф Id 5
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Проф ID 1 (регистрационный номер)
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Проф Id 3
 ProfId4IN=Проф Id 4
 ProfId5IN=Проф Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Я бы. проф. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Разрешенный бизнес)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id проф. 1 (RC)
 ProfId2MA=Id проф. 2 (Patente)
 ProfId3MA=Id проф. 3 (IF)
 ProfId4MA=Id проф. 4 (НКСО)
-ProfId5MA=Id проф. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Проф Id 1 (RFC).
 ProfId2MX=Проф Id 2 (R.. P. ИМСС)
@@ -220,13 +225,13 @@ ProfId1NL=KVK Nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Проф ID 1 (NIPC)
 ProfId2PT=Проф Id 2 (номера социального страхования)
 ProfId3PT=Проф Id 3 (коммерческий Запись номер)
 ProfId4PT=Проф Id 4 (Консерватория)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (ОГРН)
 ProfId2RU=Prof Id 2 (ИНН)
@@ -354,6 +359,7 @@ VATIntraManualCheck=Вы также можете проверить его вр
 ErrorVATCheckMS_UNAVAILABLE=Проверка невозможна. Сервис проверки не предоставляется государством-членом ЕС (%s).
 NorProspectNorCustomer=Не потенциальный клиент, не клиент
 JuridicalStatus=Тип юридического лица
+Workforce=Workforce
 Staff=Сотрудники
 ProspectLevelShort=Потенциальный
 ProspectLevel=Потенциальный клиент
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Условия оплаты - Поставщик
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Использовать Мультивалютность
 MulticurrencyCurrency=Валюта
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/ru_RU/contracts.lang b/htdocs/langs/ru_RU/contracts.lang
index 91829bc7048..5fb8689c44f 100644
--- a/htdocs/langs/ru_RU/contracts.lang
+++ b/htdocs/langs/ru_RU/contracts.lang
@@ -14,13 +14,13 @@ ServiceStatusNotLateShort=Не истек
 ServiceStatusLate=Запуск, истек
 ServiceStatusLateShort=Истек
 ServiceStatusClosed=Закрытые
-ShowContractOfService=Show contract of service
+ShowContractOfService=Показать договор услуги
 Contracts=Договоры
 ContractsSubscriptions=Контакты/Подписки
 ContractsAndLine=Контракты и строка с контрактами
 Contract=Договор
-ContractLine=Contract line
-Closing=Closing
+ContractLine=Строка контракта
+Closing=Закрытие
 NoContracts=Нет договоров
 MenuServices=Услуги
 MenuInactiveServices=Услуга не активна
@@ -28,19 +28,19 @@ MenuRunningServices=Запуск служб
 MenuExpiredServices=Истекшим сроком службы
 MenuClosedServices=Закрытые услуги
 NewContract=Новый договор
-NewContractSubscription=New contract or subscription
+NewContractSubscription=Новый контракт или подписка 
 AddContract=Создать контракт
 DeleteAContract=Удалить договор
-ActivateAllOnContract=Activate all services
+ActivateAllOnContract=Активировать все услуги
 CloseAContract=Закрыть договор
-ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services?
-ConfirmValidateContract=Are you sure you want to validate this contract under name <b>%s</b>?
-ConfirmActivateAllOnContract=This will open all services (not yet active). Are you sure you want to open all services?
-ConfirmCloseContract=This will close all services (active or not). Are you sure you want to close this contract?
-ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b>?
+ConfirmDeleteAContract=Вы уверены, что хотите удалить этот контракт и все его услуги?
+ConfirmValidateContract=Вы уверены, что хотите подтвердить этот контракт под именем <b>%s</b>?
+ConfirmActivateAllOnContract=Это откроет все услуги (ещё не активные). Вы уверены, что хотите открыть все услуги?
+ConfirmCloseContract=Это закроет все услуги (активные или нет). Вы уверены, что хотите закрыть этот контракт?
+ConfirmCloseService=Вы уверены, что хотите закрыть эту услугу с датой <b>%s</b>
 ValidateAContract=Проверить договор
 ActivateService=Активировать услугу
-ConfirmActivateService=Are you sure you want to activate this service with date <b>%s</b>?
+ConfirmActivateService=Вы уверены, что хотите активировать эту услугу с датой <b>%s</b>?
 RefContract=Справка о договоре
 DateContract=Дата договора
 DateServiceActivate=Дата активации услуги
@@ -51,9 +51,9 @@ ListOfClosedServices=Список закрытых услуги
 ListOfRunningServices=Список запущенных служб
 NotActivatedServices=Не активируется услуг (в том числе утверждены контракты)
 BoardNotActivatedServices=Услуги для активации среди подтвержденных договоров
-BoardNotActivatedServicesShort=Services to activate
-LastContracts=Latest %s contracts
-LastModifiedServices=Latest %s modified services
+BoardNotActivatedServicesShort=Услуги для активации
+LastContracts=Последние %s контракты
+LastModifiedServices=Последние %s изменённые услуги
 ContractStartDate=Начальная дата
 ContractEndDate=Конечная дата
 DateStartPlanned=Планируемая дата начала
@@ -65,20 +65,20 @@ DateStartRealShort=Реальная дата начала
 DateEndReal=Реальная дата окончания
 DateEndRealShort=Реальная дата окончания
 CloseService=Закрыть услугу
-BoardRunningServices=Services running
-BoardRunningServicesShort=Services running
+BoardRunningServices=Работающие услуги 
+BoardRunningServicesShort=Работающие услуги 
 BoardExpiredServices=Просроченные услуги
 BoardExpiredServicesShort=Просроченные услуги
 ServiceStatus=Статус услуги
 DraftContracts=Проекты договоров
-CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
-ActivateAllContracts=Activate all contract lines
+CloseRefusedBecauseOneServiceActive=Контракт не может быть закрыт, так как по нему есть хотя бы одна открытая услуга
+ActivateAllContracts=Активировать все строки контракта
 CloseAllContracts=Закрыть все строки договора
 DeleteContractLine=Удалить строку договора
-ConfirmDeleteContractLine=Are you sure you want to delete this contract line?
+ConfirmDeleteContractLine=Вы уверены, что хотите удалить эту строку контракта?
 MoveToAnotherContract=Переместите службу в другой договор.
 ConfirmMoveToAnotherContract=Я выбранного новая цель договора и подтвердить, я хочу перейти эту услугу в этом договоре.
-ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to?
+ConfirmMoveToAnotherContractQuestion=Выберите, в какой из существующих договоров (той же третьей стороны) вы хотите перенести эту услугу?
 PaymentRenewContractId=Продлить контракт линия (номер %s)
 ExpiredSince=Срок действия
 NoExpiredServices=Не истек активных услуг
@@ -89,9 +89,9 @@ NoteListOfYourExpiredServices=Этот список содержит тольк
 StandardContractsTemplate=Стандартный шаблон контракта
 ContactNameAndSignature=Для %s,  имя и подпись
 OnlyLinesWithTypeServiceAreUsed=Только строки с типом "Услуга" могут быть клонированы.
-ConfirmCloneContract=Are you sure you want to clone the contract <b>%s</b>?
+ConfirmCloneContract=Вы уверены, что хотите клонировать контракт <b>%s</b>?
 LowerDateEndPlannedShort=Нижняя запланированная дата завершения активных услуг
-SendContractRef=Contract information __REF__
+SendContractRef=Информация о контракте __REF__
 OtherContracts=Другие контракты
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Торговый представитель подписания контракта
@@ -99,6 +99,6 @@ TypeContact_contrat_internal_SALESREPFOLL=Торговый представит
 TypeContact_contrat_external_BILLING=Платежная заказчика контакт
 TypeContact_contrat_external_CUSTOMER=После деятельность заказчика контакт
 TypeContact_contrat_external_SALESREPSIGN=Подписание контракта заказчик контакт
-HideClosedServiceByDefault=Hide closed services by default
-ShowClosedServices=Show Closed Services
-HideClosedServices=Hide Closed Services
+HideClosedServiceByDefault=Скрыть закрытые услуги по умолчанию
+ShowClosedServices=Показать закрытые услуги
+HideClosedServices=Скрыть закрытые услуги
diff --git a/htdocs/langs/ru_RU/ecm.lang b/htdocs/langs/ru_RU/ecm.lang
index 2f3e3377b45..b943f9d58e0 100644
--- a/htdocs/langs/ru_RU/ecm.lang
+++ b/htdocs/langs/ru_RU/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Поиск по ключевым словам
 ECMSearchByEntity=Поиск по объекту
 ECMSectionOfDocuments=Директории документов
 ECMTypeAuto=Автоматический
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Документы, связанные с третьими сторонами
-ECMDocsByProposals=Документы, связанные с предложениями
-ECMDocsByOrders=Документы, связанные с заказчиками заказов
-ECMDocsByContracts=Документы, связанные с контрактами
-ECMDocsByInvoices=Документы, связанные с заказчиками счетами
-ECMDocsByProducts=Документы, связанные с продуктами
-ECMDocsByProjects=Документы, связанные с проектрами
-ECMDocsByUsers=Документы, связанные с пользователями
-ECMDocsByInterventions=Документы, связанные с меропрятиями
-ECMDocsByExpenseReports=Документы, связанные с отчетами о расходах
-ECMDocsByHolidays=Документы, связанные с отпусками
-ECMDocsBySupplierProposals=Documents linked to vendor proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=Директория не создана
 ShowECMSection=Показать директорию
 DeleteSection=Удаление директории
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/ru_RU/hrm.lang b/htdocs/langs/ru_RU/hrm.lang
index 8977520494d..6cc287f2927 100644
--- a/htdocs/langs/ru_RU/hrm.lang
+++ b/htdocs/langs/ru_RU/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Сотрудники
 Employee=Сотрудник
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/ru_RU/install.lang b/htdocs/langs/ru_RU/install.lang
index 6c5afb00775..8ae87ba99ef 100644
--- a/htdocs/langs/ru_RU/install.lang
+++ b/htdocs/langs/ru_RU/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Файл <b>конфигурации %s</b> доступен для записи.
 ConfFileMustBeAFileNotADir=Файл конфигурации <b>%s</b> должен быть файлом, а не каталогом.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=Эта версия PHP поддерживает сессии.
 PHPSupportPOSTGETOk=Эта версия PHP поддерживает переменные POST и GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=Эта версия PHP поддерживает сессии.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK= Максимально допустимый размер памяти для сессии установлен <b>в %s.</b> Это должно быть достаточно.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/ru_RU/intracommreport.lang b/htdocs/langs/ru_RU/intracommreport.lang
new file mode 100644
index 00000000000..ba6256116e2
--- /dev/null
+++ b/htdocs/langs/ru_RU/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=Список
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/ru_RU/languages.lang b/htdocs/langs/ru_RU/languages.lang
index 6a544983929..124dfd0d308 100644
--- a/htdocs/langs/ru_RU/languages.lang
+++ b/htdocs/langs/ru_RU/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Испанский (Парагвай)
 Language_es_PE=Испанский (Перу)
 Language_es_PR=Испанский (Пуэрто-Рико)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index a5a59a9782a..bcd5f1ea608 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Удалить ссылку
 AddToDraft=Добавить к черновику
 Update=Обновить
 Close=Закрыть
+CloseAs=Set status to
 CloseBox=Удалить виджет с Информ-панели
 Confirm=Подтвердить
 ConfirmSendCardByMail=Отправить содержимое этой карты по почте на <b>%s</b> ?
@@ -196,6 +197,7 @@ ReOpen=Переоткрыть
 Upload=Загрузить
 ToLink=Ссылка
 Select=Выбор
+SelectAll=Select all
 Choose=Выберите
 Resize=Изменение размера
 ResizeOrCrop=Изменение размера или обрезка
@@ -256,6 +258,7 @@ Cards=Карточки
 Card=Карточка
 Now=Сейчас
 HourStart=Час начала
+Deadline=Deadline
 Date=Дата
 DateAndHour=Дата и час
 DateToday=Сегодняшняя дата
@@ -264,8 +267,10 @@ DateStart=Дата начала
 DateEnd=Дата окончания
 DateCreation=Дата создания
 DateCreationShort=Дата создания
+IPCreation=Creation IP
 DateModification=Дата изменения
 DateModificationShort=Дата изм.
+IPModification=Modification IP
 DateLastModification=Дата последнего изменения
 DateValidation=Дата проверки
 DateClosing=Дата закрытия
@@ -319,6 +324,7 @@ Morning=Утро
 Afternoon=После полудня
 Quadri=Квартал
 MonthOfDay=Месяц дня
+DaysOfWeek=Days of week
 HourShort=ч
 MinuteShort=мин.
 Rate=Курс
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Сумма платежа, в оригинально
 MulticurrencyAmountHT=Сумма (без налога), исходная валюта
 MulticurrencyAmountTTC=Сумма (с налогом), в исходной валюте
 MulticurrencyAmountVAT=Сумма налога, в исходной валюте
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Сумма налога 2
 AmountLT2=Сумма налога 3
 AmountLT1ES=Сумма RE
@@ -487,6 +494,7 @@ By=Автор
 From=От
 FromDate=От
 FromLocation=От
+at=at
 to=к
 To=к
 and=и
@@ -509,6 +517,7 @@ Draft=Черновик
 Drafts=Черновики
 StatusInterInvoiced=Выставлен счет
 Validated=Подтверждено
+ValidatedToProduce=Validated (To produce)
 Opened=Открытые
 OpenAll=Открыто (Все)
 ClosedAll=Закрыто (все)
@@ -655,6 +664,7 @@ Response=Ответ
 Priority=Приоритет
 SendByMail=Послать по электронной почте
 MailSentBy=Email отправлен
+NotSent=Не отправлено
 TextUsedInTheMessageBody=Текст Email
 SendAcknowledgementByMail=Отправить подтверждение на электронную почту
 SendMail=Отправить письмо
@@ -836,6 +846,7 @@ ListOfTemplates=Список шаблонов
 Gender=Пол
 Genderman=Мужчина
 Genderwoman=Женщина
+Genderother=Другое
 ViewList=Посмотреть список
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Разное
 Calendar=Календарь
 GroupBy=Группировка по...
 ViewFlatList=Вид плоским списком
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Удалить строку '%s'
 SomeTranslationAreUncomplete=Некоторые из предлагаемых языков пакетов могут быть переведены только частично или могут содержать ошибки. Пожалуйста, помогите исправить ваш язык, зарегистрировавшись по адресу <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/,</a> чтобы добавить свои улучшения.
 DirectDownloadLink=Прямая ссылка для скачивания (общедоступная/внешняя)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Отгрузки клиентам
 SearchIntoExpenseReports=Отчёты о затратах
 SearchIntoLeaves=Отпуск
 SearchIntoTickets=Заявки
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Платежи поставщику
+SearchIntoMiscPayments=Смешанные платежи
 CommentLink=Комментарии
 NbComments=Количество комментариев
 CommentPage=Комментарии
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Информация
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Дата рождения
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/ru_RU/members.lang b/htdocs/langs/ru_RU/members.lang
index 7d3ed2063c4..c2587c40060 100644
--- a/htdocs/langs/ru_RU/members.lang
+++ b/htdocs/langs/ru_RU/members.lang
@@ -19,14 +19,12 @@ MembersCards=Члены печати карт
 MembersList=Список участников
 MembersListToValid=Список кандидатов в участники (на утверждении)
 MembersListValid=Список действительных участников
-MembersListUpToDate=Список действительных членов до даты подписки
-MembersListNotUpToDate=Список действительных членов подписки устарели
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=Список квалифицированных участников
 MenuMembersToValidate=Проект участники
 MenuMembersValidated=Подтвержденные участники
-MenuMembersUpToDate=На сегодняшний день членами
-MenuMembersNotUpToDate=За сегодняшний день члены
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Члены с подпиской на получение
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Дата подписки
 DateEndSubscription=Дата окончания подписки
 EndSubscription=Конец подписке
 SubscriptionId=ID подписки
+WithoutSubscription=Without subscription
 MemberId=ID участника
 NewMember=Новый участник
 MemberType=Тип участника
@@ -81,7 +80,7 @@ DeleteType=Удалить
 VoteAllowed=Голосовать разрешается
 Physical=Физическая
 Moral=Моральные
-MorPhy=Природа
+MorAndPhy=Moral and Physical
 Reenable=Снова
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Члены статистики штата / прови
 MembersStatisticsByTown=Члены статистики города
 MembersStatisticsByRegion=Статистика участников по регионам
 NbOfMembers=Количество членов
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=Нет проверки члены найдены
 MembersByCountryDesc=Этот экран покажет вам статистику членов странами. Графический зависит однако от Google сервис график онлайн и доступна, только если подключение к Интернету работает.
 MembersByStateDesc=Этот экран покажет вам статистику пользователей, штата / провинции / кантона.
@@ -176,6 +177,7 @@ MenuMembersStats=Статистика
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Информационные общественности (нет = частных)
 NewMemberbyWeb=Новый участник добавил. В ожидании утверждения
 NewMemberForm=Новая форма члена
diff --git a/htdocs/langs/ru_RU/mrp.lang b/htdocs/langs/ru_RU/mrp.lang
index 14f9b820743..5c5ff627f11 100644
--- a/htdocs/langs/ru_RU/mrp.lang
+++ b/htdocs/langs/ru_RU/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index e664a576813..dd1b39584f5 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Кол-во цен
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Количество продукции
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Количество родительских упаковочных продуктов
 ParentProducts=Родительские продукты
-IfZeroItIsNotAVirtualProduct=Если 0, это произведение не является виртуальным продуктом
-IfZeroItIsNotUsedByVirtualProduct=Если 0, этот продукт не используется никаким виртуальным продуктом
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Фильтр ключевых слов
 CategoryFilter=Категория фильтр
 ProductToAddSearch=Поиск продукта для добавления
 NoMatchFound=Не найдено соответствия
 ListOfProductsServices=Список продуктов/услуг
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=Список продуктов / услуг с этим продуктом в качестве компонента
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=Один из выбранного продукта родителей с действующим продукта
 DeleteProduct=Удалить товар / услугу
 ConfirmDeleteProduct=Вы уверены, что хотите удалить этот продукт / услугу?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Доступные глобальные значен
 PriceMode=Режим ценообразования
 PriceNumeric=Номер
 DefaultPrice=Цена по умолчанию
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Увеличение / уменьшение запаса на складе при изменении источника
 ComposedProduct=Child products
 MinSupplierPrice=Минимальная закупочная цена
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/ru_RU/recruitment.lang b/htdocs/langs/ru_RU/recruitment.lang
index fe67a4ea03e..f113cfbe396 100644
--- a/htdocs/langs/ru_RU/recruitment.lang
+++ b/htdocs/langs/ru_RU/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Должность
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang
index 84c38e3ba22..e06e1cebd17 100644
--- a/htdocs/langs/ru_RU/stocks.lang
+++ b/htdocs/langs/ru_RU/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Раздел "Склад"
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Вместо
 LocationSummary=Сокращенное наименование расположение
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=На заказ
 Replenishment=Пополнение
 ReplenishmentOrders=Заказ на пополнение
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Использовать виртуальный запас на складе вместо имеющего место быть, для функции наполнения
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Использовать виртуальный склад
 UsePhysicalStock=Использовать физические запасы
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Категория фильтр
 SelectFournisseur=Vendor filter
 inventoryOnDate=Инвентарная ведомость
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/ru_RU/suppliers.lang b/htdocs/langs/ru_RU/suppliers.lang
index 7ed1db76921..80f0528ac10 100644
--- a/htdocs/langs/ru_RU/suppliers.lang
+++ b/htdocs/langs/ru_RU/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/ru_RU/website.lang b/htdocs/langs/ru_RU/website.lang
index 959d8a49727..4b46043e5a1 100644
--- a/htdocs/langs/ru_RU/website.lang
+++ b/htdocs/langs/ru_RU/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Страница
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS-канал
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/ru_UA/products.lang b/htdocs/langs/ru_UA/products.lang
new file mode 100644
index 00000000000..6e900475275
--- /dev/null
+++ b/htdocs/langs/ru_UA/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang
index bac28ccc142..5b1f85a55c1 100644
--- a/htdocs/langs/sk_SK/accountancy.lang
+++ b/htdocs/langs/sk_SK/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Väčšina nastavení účtovníctva sa vykonáva z menu %s
-ConfigAccountingExpert=Konfigurácia experta na účtovanie modulov
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=časopisy
+Journals=časopisy
 JournalFinancial=Finančné časopisy
 BackToChartofaccounts=Vráťte účtovnú schému
 Chartofaccounts=Účtovná schéma
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Aktuálny vyhradený účet
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=KROK %s: Pridanie alebo úprava existujúcich transak
 
 AccountancyAreaDescClosePeriod=KROK %s: Zavrieť obdobie, takže nemôžeme robiť zmeny v budúcnosti.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Vyberte aktívnu účtovnú schému
 ChangeAndLoad=Zmeniť a načítať
 Addanaccount=Pridajte účtovníctvo
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Účtovný účet bol navrhnutý
 MenuDefaultAccounts=Predvolené účty
 MenuBankAccounts=Bankové účty
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Vytvorte novú transakciu
 UpdateMvts=Úprava transakcie
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Hlavná kniha
+BookkeepingSubAccount=Subledger
 AccountBalance=Stav účtu
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Zakázať priame zaznamenávanie transakcie na bankov
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Predaj denníka
 ACCOUNTING_PURCHASE_JOURNAL=Zakúpte denník
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Účtovný účet čakania
 DONATION_ACCOUNTINGACCOUNT=Účtovný účet na registráciu darov
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=Do roku
 NotMatch=Nenastavené
-DeleteMvt=Odstrániť riadky knihy
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Rok na zmazanie
 DelJournal=Žurnále na zmazanie
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finančný časopis
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finančný denník vrátane všetkých druhov platieb prostredníctvom bankového účtu
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Účet DPH nie je definovaný
 ThirdpartyAccountNotDefined=Účet tretej strany nie je definovaný
 ProductAccountNotDefined=Účet pre produkt nie je definovaný
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 2509e6a075d..22c255b5c06 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Povoliť nové pripojenia
 YourSession=Vaša relácia
 Sessions=Users Sessions
 WebUserGroup=Webový server užívateľ / skupina
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Znaková sada dát uložených v databáze
 DBSortingCharset=Znaková sada databázy pre radenie dát
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript so zdravotným postihnutím
 UsePreviewTabs=Použitie ukážky karty
 ShowPreview=Zobraziť náhľad
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Náhľad nie je k dispozícii
 ThemeCurrentlyActive=Téma aktívnej
 CurrentTimeZone=Časové pásmo PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Knižnica používaná pre generovanie PDF
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Použiť 3 krokové povolenie ked cena ( bez DPH ) je väčšia ako...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integrácia ClickToDial systému (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Pridať funkcie pre generovanie Bookmark4u účet z účtu Dolibarr
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Intervencie
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Anketa, Dotazník, Hlasovanie
@@ -671,7 +677,7 @@ Module63000Name=Zdroje
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Prečítajte si zákazníkov faktúry
 Permission12=Vytvoriť / upraviť zákazníkov faktúr
-Permission13=Unvalidate zákazníkov faktúry
+Permission13=Invalidate customer invoices
 Permission14=Overiť zákazníkov faktúry
 Permission15=Poslať zákazníkov faktúr e-mailom
 Permission16=Vytvorte platby za faktúry zákazníka
@@ -688,6 +694,7 @@ Permission32=Vytvoriť / upraviť produktov
 Permission34=Odstrániť produkty
 Permission36=Pozri / správa skryté produkty
 Permission38=Export produktov
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Prečítajte intervencie
 Permission62=Vytvoriť / upraviť zásahy
 Permission64=Odstrániť intervencie
 Permission67=Vývozné intervencie
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Prečítajte členov
 Permission72=Vytvoriť / upraviť členov
 Permission74=Zmazať členov
@@ -718,6 +728,7 @@ Permission95=Prečítajte si správy
 Permission101=Prečítajte si sendings
 Permission102=Vytvoriť / upraviť sendings
 Permission104=Overiť sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Odstrániť sendings
 Permission111=Prečítajte finančných účtov
@@ -825,10 +836,11 @@ Permission402=Vytvoriť / upraviť zľavy
 Permission403=Overiť zľavy
 Permission404=Odstrániť zľavy
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Exportovať platy
+Permission517=Read payments of salaries of everybody
+Permission519=Exportovať platy
 Permission520=Čítať pôžičky
 Permission522=Vytvoriť/Upraviť pôžičky
 Permission524=Zmazať pôžičky
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Získajte výsledok exportu
 Permission1202=Vytvoriť / Upraviť vývoz
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Spustiť Hmotné dovozy externých dát do databázy (načítanie
 Permission1321=Export zákazníkov faktúry, atribúty a platby
 Permission1322=Znova otvoriť zaplatený účet
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Ukázať naplánovanú úlohu
 Permission23002=Vytvoriť / upraviť naplánovanú úlohu
 Permission23003=Odstrániť naplánovanú úlohu
 Permission23004=Spustiť naplánovanú úlohu
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Prečítajte transakcie
 Permission50202=Importné operácie
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Čítať zdroje
 Permission63002=Vytvoriť/Upraviť zdroje
 Permission63003=Zmazať zdroje
 Permission63004=Pripnúť zdroje k udalosti agendy
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Nastavenie uložené
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label používa v predvolenom nastavení, pokiaľ nie je prek
 LabelOnDocuments=Štítok na dokumenty
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=Na konci mesiaca
 CurrentNext=Aktuálny/Nasledujúci
@@ -1145,6 +1182,7 @@ InfoWebServer=O Web Servri
 InfoDatabase=O Databaze
 InfoPHP=O PHP
 InfoPerf=Info o výkone
+InfoSecurity=About Security
 BrowserName=Meno prehliadača
 BrowserOS=OS prehliadača
 ListOfSecurityEvents=Zoznam Dolibarr udalostí zabezpečenia
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= Toto pravidlo je nútený <b>%s</b> aktivovaným modulom
+ForcedToByAModule=Toto pravidlo je nútený <b>%s</b> aktivovaným modulom
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Vydanie poľných %s
 FillThisOnlyIfRequired=Príklad: +2 ( vyplňte iba ak sú predpokladané problémy s časovým posunom )
@@ -1282,7 +1322,7 @@ GetBarCode=Získať čiarový kód
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Späť heslo generované podľa interného algoritmu Dolibarr: 8 znakov obsahujúci zdieľanej čísla a znaky malými písmenami.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Zaškrtávacie políčko poslať mailom potvrdenie členom (validácia alebo nové predplatné) je v predvolenom nastavení
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=Nastavenie LDAP
 LDAPGlobalParameters=Globálne parametre
@@ -1523,7 +1564,9 @@ LDAPDescValues=Ukážkové hodnoty sú určené pre <b>OpenLDAP</b> s nasledujú
 ForANonAnonymousAccess=Pre overený prístup (pre prístup pre zápis napríklad)
 PerfDolibarr=Výkon Nastavenie / optimalizácia správa
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Aplikačných medzipamäte
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Úroveň
 SyslogFilename=Názov súboru a cesta
 YouCanUseDOL_DATA_ROOT=Môžete použiť DOL_DATA_ROOT / dolibarr.log pre súbor denníka Dolibarr &quot;Dokumenty&quot; adresára. Môžete nastaviť inú cestu na uloženie tohto súboru.
 ErrorUnknownSyslogConstant=Konštantná %s nie je známe, Syslog konštantný
-OnlyWindowsLOG_USER=Windows podporuje iba LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Darovanie modul nastavenia
@@ -1629,7 +1672,7 @@ AdvancedEditor=Rozšírené editor
 ActivateFCKeditor=Aktivácia pokročilé editor pre:
 FCKeditorForCompany=WYSIWIG vytvorenie / edícii prvkami opisu a poznámku (s výnimkou výrobkov / služieb)
 FCKeditorForProduct=WYSIWIG vytvorenie / edícia produktov / služieb popis a poznámky
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG vytvorenie / edícia pre hromadné eMailings (Nástroje-&gt; e-mailom)
 FCKeditorForUserSignature=WYSIWIG vytvorenie / edícia užívateľského podpisu
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu zmazaný
+Menu=Menu
 Menus=Ponuky
 TreeMenuPersonalized=Personalizované menu
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Nová ponuka
-Menu=Výber z jedálneho lístka
 MenuHandler=Menu handler
 MenuModule=Modul zdroja
 HideUnauthorizedMenu= Skryť neoprávneným menu (sivá)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Kliknite pre Dial Nastavenie modulu
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Zahrnúť cestu ( definovať do premennej %s )
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Tretie strany
 MailToMember=Členovia
 MailToUser=Užívatelia
-MailToProject=Projects page
+MailToProject=Projekty
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zips
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/sk_SK/banks.lang b/htdocs/langs/sk_SK/banks.lang
index 340f65a45f2..471e6830858 100644
--- a/htdocs/langs/sk_SK/banks.lang
+++ b/htdocs/langs/sk_SK/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/sk_SK/categories.lang b/htdocs/langs/sk_SK/categories.lang
index f5ebbca4b2e..1f28159b136 100644
--- a/htdocs/langs/sk_SK/categories.lang
+++ b/htdocs/langs/sk_SK/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/sk_SK/companies.lang b/htdocs/langs/sk_SK/companies.lang
index bb39a5cb9f6..1aae4a6f624 100644
--- a/htdocs/langs/sk_SK/companies.lang
+++ b/htdocs/langs/sk_SK/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (ust-IdNr)
 ProfId2AT=Prof Id 2 (ust-Nr)
 ProfId3AT=Prof ID 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional číslo)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao obecnej)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federálne číslo)
 ProfId4CH=Prof Id 2 (obchodné Záznam číslo)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (RUT)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (ust-IdNr)
 ProfId2DE=Prof Id 2 (ust-Nr)
 ProfId3DE=Prof ID 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF / NIF)
 ProfId2ES=Prof Id 2 (Číslo sociálneho poistenia)
 ProfId3ES=Prof ID 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate číslo)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (siréna)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof ID 3 (NAF, starý APE)
 ProfId4FR=Prof Id 4 (RCS / RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registračné číslo
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof ID 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (RC)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (IF)
 ProfId4MA=Id prof. 4 (CNSS)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (RFC).
 ProfId2MX=Prof Id 2 (R.. P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK Nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (Nipča)
 ProfId2PT=Prof Id 2 (Číslo sociálneho poistenia)
 ProfId3PT=Prof ID 3 (obchodný Záznam číslo)
 ProfId4PT=Prof Id 4 (konzervatórium)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=Ninea
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Skontrolujte, nie je možné. Skontrolujte, služba nie je poskytovaná členským štátom (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potenciál
 ProspectLevel=Prospect potenciál
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Mena
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/sk_SK/ecm.lang b/htdocs/langs/sk_SK/ecm.lang
index 33f3dcc9f12..dc31605d394 100644
--- a/htdocs/langs/sk_SK/ecm.lang
+++ b/htdocs/langs/sk_SK/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Vyhľadávanie podľa kľúčových slov
 ECMSearchByEntity=Hľadať podľa objektu
 ECMSectionOfDocuments=Adresára dokumentov
 ECMTypeAuto=Automatický
-ECMDocsBySocialContributions=Dokumenty súviasiace so sociálnou alebo fiškálnou daňou
-ECMDocsByThirdParties=Dokumenty súvisiace s tretími stranami
-ECMDocsByProposals=Dokumenty súvisiace s návrhmi
-ECMDocsByOrders=Dokumenty súvisiace s zákazníkmi objednávky
-ECMDocsByContracts=Dokumenty súvisiace so zmluvami
-ECMDocsByInvoices=Dokumenty súvisiace s faktúrami zákazníkmi
-ECMDocsByProducts=Dokumenty súvisiace s produktmi
-ECMDocsByProjects=Dokumenty súvisiace s projektmi
-ECMDocsByUsers=Dokumenty súvisiace s používateľmi
-ECMDocsByInterventions=Dokumenty súvisiace so zákrokom.
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=No vytvoril adresár
 ShowECMSection=Zobraziť adresár
 DeleteSection=Odstráňte adresár
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/sk_SK/hrm.lang b/htdocs/langs/sk_SK/hrm.lang
index 95c2e978d72..0ffa8afa438 100644
--- a/htdocs/langs/sk_SK/hrm.lang
+++ b/htdocs/langs/sk_SK/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Employees
 Employee=Zamestnanec
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/sk_SK/install.lang b/htdocs/langs/sk_SK/install.lang
index a7f7ef0b7da..92b82af0604 100644
--- a/htdocs/langs/sk_SK/install.lang
+++ b/htdocs/langs/sk_SK/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Konfiguračný súbor <b>%s</b> je zapisovatelný.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=Vaše PHP podporuje relácie.
 PHPSupportPOSTGETOk=Vaše PHP podporuje premenné POST a GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=Vaše PHP podporuje relácie.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Maximálna pamäť pre relácie v PHP je nastavená na <b>%s</b>. To by malo stačiť.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/sk_SK/intracommreport.lang b/htdocs/langs/sk_SK/intracommreport.lang
new file mode 100644
index 00000000000..ca8a5970417
--- /dev/null
+++ b/htdocs/langs/sk_SK/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=Zoznam
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/sk_SK/languages.lang b/htdocs/langs/sk_SK/languages.lang
index bc7dec6ceb7..dd48ea71d86 100644
--- a/htdocs/langs/sk_SK/languages.lang
+++ b/htdocs/langs/sk_SK/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Španielčina (Paraguaj)
 Language_es_PE=Španielčina (Peru)
 Language_es_PR=Španielčina (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Španielčina (Venezuela)
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index eaa10c84a42..efb38289b90 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Remove link
 AddToDraft=Add to draft
 Update=Aktualizovať
 Close=Zavrieť
+CloseAs=Nastaviť status na
 CloseBox=Remove widget from your dashboard
 Confirm=Potvrdiť
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Znovu otvoriť
 Upload=Upload
 ToLink=Odkaz
 Select=Vybrať
+SelectAll=Select all
 Choose=Vybrať
 Resize=Zmena veľkosti
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=Karty
 Card=Karta
 Now=Teraz
 HourStart=Start hour
+Deadline=Deadline
 Date=Dátum
 DateAndHour=Dátum a hodina
 DateToday=Today's date
@@ -264,8 +267,10 @@ DateStart=Dátum začatia
 DateEnd=Dátum ukončenia
 DateCreation=Dátum vytvorenia
 DateCreationShort=Creat. date
+IPCreation=Creation IP
 DateModification=Dátum zmeny
 DateModificationShort=Modify. dátum
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Dátum overenia
 DateClosing=Uzávierka
@@ -319,6 +324,7 @@ Morning=Ráno
 Afternoon=Popoludní
 Quadri=Quadri
 MonthOfDay=Mesiaca odo dňa
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Sadzba
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Čiastka dane z 2
 AmountLT2=Čiastka dane 3
 AmountLT1ES=Množstvo RE
@@ -487,6 +494,7 @@ By=Podľa
 From=Z
 FromDate=Z
 FromLocation=Z
+at=at
 to=na
 To=na
 and=a
@@ -509,6 +517,7 @@ Draft=Návrh
 Drafts=Dáma
 StatusInterInvoiced=Invoiced
 Validated=Overené
+ValidatedToProduce=Validated (To produce)
 Opened=Otvorení
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Odpoveď
 Priority=Priorita
 SendByMail=Send by email
 MailSentBy=E-mail zaslaná
+NotSent=Neposlal
 TextUsedInTheMessageBody=E-mail telo
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Odoslať e-mail
@@ -836,6 +846,7 @@ ListOfTemplates=List of templates
 Gender=Gender
 Genderman=Man
 Genderwoman=Woman
+Genderother=Ostatné
 ViewList=Zobrazenie zoznamu
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Zmiešaný
 Calendar=Kalendár
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Komentáre
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Informácie
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Dátum narodenia
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/sk_SK/members.lang b/htdocs/langs/sk_SK/members.lang
index 3a419e0d32c..56754d13691 100644
--- a/htdocs/langs/sk_SK/members.lang
+++ b/htdocs/langs/sk_SK/members.lang
@@ -19,14 +19,12 @@ MembersCards=Členovia vizitky
 MembersList=Zoznam členov
 MembersListToValid=Zoznam návrhov členov (má byť overený)
 MembersListValid=Zoznam platných členov
-MembersListUpToDate=Zoznam platných členov s aktuálne predplatné
-MembersListNotUpToDate=Zoznam platných členov s predplatným zastarané
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=Zoznam kvalifikovaných členov
 MenuMembersToValidate=Návrhy členov
 MenuMembersValidated=Overené členov
-MenuMembersUpToDate=Aktuálne členmi
-MenuMembersNotUpToDate=Neaktuálne členov
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Členovia s predplatným dostávať
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Vstupné dáta
 DateEndSubscription=Zasielanie noviniek dátum ukončenia
 EndSubscription=Koniec predplatné
 SubscriptionId=ID predplatného
+WithoutSubscription=Without subscription
 MemberId=ID člena
 NewMember=Nový člen
 MemberType=Členské typ
@@ -81,7 +80,7 @@ DeleteType=Odstrániť
 VoteAllowed=Hlasovať povolená
 Physical=Fyzikálne
 Moral=Morálna
-MorPhy=Príroda
+MorAndPhy=Moral and Physical
 Reenable=Znovu povoliť
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Členovia štatistika štát / provincia
 MembersStatisticsByTown=Členovia štatistika podľa mesta
 MembersStatisticsByRegion=Štatistiky užívateľov podľa regiónu
 NbOfMembers=Počet členov
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=Žiadne overené členmi nájdených
 MembersByCountryDesc=Táto obrazovka vám ukáže štatistiku členov jednotlivých krajinách. Grafika však závisí od Google on-line služby grafu a je k dispozícii iba v prípade, je pripojenie k internetu funguje.
 MembersByStateDesc=Táto obrazovka vám ukáže štatistiku členov podľa štátu / provincie / Canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Štatistika
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Informácie sú verejné
 NewMemberbyWeb=Nový užívateľ pridaný. Čaká na schválenie
 NewMemberForm=Nový člen forma
diff --git a/htdocs/langs/sk_SK/mrp.lang b/htdocs/langs/sk_SK/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/sk_SK/mrp.lang
+++ b/htdocs/langs/sk_SK/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index 90f384e7f2e..ef7e10c7f3f 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Počet cien
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Počet výrobkov tvoriacich tento virtuálny produkt
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Počet rodičovských balíčkov produktu
 ParentProducts=Rodičovský produkt
-IfZeroItIsNotAVirtualProduct=Ak je 0, tento produkt nie virtuálneho produktu
-IfZeroItIsNotUsedByVirtualProduct=Je-li 0, je tento výrobok nie je používaný žiadnym virtuálneho produktu
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Kľúčové slovo filter
 CategoryFilter=Kategórie filtra
 ProductToAddSearch=Hľadanie informácií o produktoch pre pridanie
 NoMatchFound=Nie nájdená zhoda
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=Zoznam virtuálnych produktov / služieb s týmto produktom ako súčasť
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=Jedným z vybraného produktu je rodič s aktuálnou produkt
 DeleteProduct=Odstránenie produktu / služby
 ConfirmDeleteProduct=Ste si istí, že chcete zmazať tento výrobok / službu?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Dostupné globálne hodnoty
 PriceMode=Cenový mód
 PriceNumeric=Počet
 DefaultPrice=Základná cena
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Pridať/Odobrať pri zmene rodičovského
 ComposedProduct=Child products
 MinSupplierPrice=Minimálna nákupná cena
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/sk_SK/recruitment.lang b/htdocs/langs/sk_SK/recruitment.lang
index 759257ea80c..f010df9c509 100644
--- a/htdocs/langs/sk_SK/recruitment.lang
+++ b/htdocs/langs/sk_SK/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Poradie úlohy
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/sk_SK/stocks.lang b/htdocs/langs/sk_SK/stocks.lang
index b15427261ce..29fb6b84fcf 100644
--- a/htdocs/langs/sk_SK/stocks.lang
+++ b/htdocs/langs/sk_SK/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Oblasť skladov
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Umiestnenie
 LocationSummary=Krátky názov umiestnenia
@@ -122,8 +122,9 @@ DesiredStockDesc=Táto hodnota zásob bude použidá pre doplnenie zásob pre  m
 StockToBuy=Ak chcete objednať
 Replenishment=Naplnenie
 ReplenishmentOrders=Doplňovanie objednávky
-VirtualDiffersFromPhysical=Na základe zvyšovanie/znižovania zásob, fyzické zásoby a virtuálne zásoby ( fizycké + aktuálne objednávky ) sa môži líšiť.
-UseVirtualStockByDefault=Použiť virtuálne zásoby namiesto fizyckých zásob pre doplňovanie zásob
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Používať virtuálne zásoby
 UsePhysicalStock=Používať fyzické zásoby
 CurentSelectionMode=Aktuálny vybraný mód
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Kategórie filtra
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/sk_SK/suppliers.lang b/htdocs/langs/sk_SK/suppliers.lang
index 1d932bc8462..b9949c65301 100644
--- a/htdocs/langs/sk_SK/suppliers.lang
+++ b/htdocs/langs/sk_SK/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Neobjednávať
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputácia
diff --git a/htdocs/langs/sk_SK/website.lang b/htdocs/langs/sk_SK/website.lang
index 481b505a445..b2c84ed0d5b 100644
--- a/htdocs/langs/sk_SK/website.lang
+++ b/htdocs/langs/sk_SK/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Strana
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index ed2ba10774e..93e33834eff 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Konfiguracija modula računovodskega strokovnjaka
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=Revije
+Journals=Revije
 JournalFinancial=Finančne revije
 BackToChartofaccounts=Prikaz kontnega plana
 Chartofaccounts=Kontni plan
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Dodaj računovodskega račun
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bančni računi
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Prodam revija
 ACCOUNTING_PURCHASE_JOURNAL=Nakup revij
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=Po letih
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index d6419d53bef..38d716f78eb 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Odstrani blokado povezovanja
 YourSession=Vaša seja
 Sessions=Users Sessions
 WebUserGroup=Spletni strežnik uporabnik / skupina
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Nabor znakov v bazi podatkov za shranjevanje podatkov
 DBSortingCharset=Nabor znakov v bazi podatkov za sortiranje podatkov
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Če je partnerjev zelo veliko (> 100 000), lahko hitrost povišate z nastavitvijo konstante SOCIETE_DONOTSEARCH_ANYWHERE na 1 v Nastavitve->Ostale nastavitve. Iskanje bo s tem omejeno na začetek niza.
 UseSearchToSelectContactTooltip=Če je partnerjev zelo veliko (> 100 000), lahko hitrost povišate z nastavitvijo konstante SOCIETE_DONOTSEARCH_ANYWHERE na 1 v Nastavitve->Ostale nastavitve. Iskanje bo s tem omejeno na začetek niza.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript onemogočen
 UsePreviewTabs=Uporabi zavihke za predogled
 ShowPreview=Prikaži predogled
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Predogled ni na voljo
 ThemeCurrentlyActive=Trenutno aktivna tema
 CurrentTimeZone=Časovni pas PHP strežnika
@@ -271,7 +274,7 @@ NoticePeriod=Čas za odobritev
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=Klic s klikom
 Module58Desc=Integracija klica s klikom
-Module59Name=Vaš zaznamek
-Module59Desc=Dodajanje funkcije za generiranje konta vašega zaznamka s konta Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Intervencije
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=Tiskanje IPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Izberi, oceni ali glasuj
@@ -671,7 +677,7 @@ Module63000Name=Viri
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Branje računov
 Permission12=Kreiranje/Spreminjanje računov
-Permission13=Preklic potrditve računov
+Permission13=Invalidate customer invoices
 Permission14=Potrjevanje računov
 Permission15=Pošiljanje računov po emailu
 Permission16=Plačevanje računov
@@ -688,6 +694,7 @@ Permission32=Kreiranje/spreminjanje proizvodov
 Permission34=Brisanje proizvodov
 Permission36=Pregled/upravljanje skritih proizvodov
 Permission38=Izvoz proizvodov
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Branje intervencij
 Permission62=Kreiranje/spreminjanje intervencij
 Permission64=Delete intervencij
 Permission67=Izvoz intervencij
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Branje članov
 Permission72=Kreiranje/spreminjanje članov
 Permission74=Brisanje članov
@@ -718,6 +728,7 @@ Permission95=Branje poročil
 Permission101=Branje pošiljk
 Permission102=Kreiranje/spreminjanje pošiljk
 Permission104=Potrjevanje pošiljk
+Permission105=Send sendings by email
 Permission106=Izvoz pošiljk
 Permission109=Brisanje pošiljk
 Permission111=Branje finančnih postavk
@@ -825,10 +836,11 @@ Permission402=Kreiranje/spreminjanje popustov
 Permission403=Potrjevanje popustov
 Permission404=Brisanje popustov
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Izvoz plač
+Permission517=Read payments of salaries of everybody
+Permission519=Izvoz plač
 Permission520=Branje posojil
 Permission522=Kreiranje/spreminjanje posojil
 Permission524=Delete posojil
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=pregled rezultatov izvoza
 Permission1202=Kreiranje/spreminjanje izvoza
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Izvajanje masovnega izvoza zunanjih podatkov v bazo podatkov (nal
 Permission1321=Izvoz računov za kupce, atributov in plačil
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Preberi načrtovano delo
 Permission23002=Ustvari/posodobi načrtovano delo
 Permission23003=Izbriši načrtovano delo
 Permission23004=Izvedi načrtovano delo
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Branje prenosov
 Permission50202=Uvoz prenosov
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Nastavitve shranjene
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Privzet naziv, če za kodo ne obstaja prevod
 LabelOnDocuments=Naslov na dokumentu
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=Na koncu meseca
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Ime brskalnika
 BrowserOS=OS brskalnika
 ListOfSecurityEvents=Seznam varnostnih dogodkov Dolibarr
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=Uvoz MySQL
-ForcedToByAModule= To pravilo je postavljeno v <b>%s</b> z aktivnim modulom
+ForcedToByAModule=To pravilo je postavljeno v <b>%s</b> z aktivnim modulom
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=%s premenjenih polj
 FillThisOnlyIfRequired=Primer: +2 (uporabite samo, če se pojavijo težave s časovno cono)
@@ -1282,7 +1322,7 @@ GetBarCode=Pridobi črtno kodo
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Predlaga geslo, generirano glede na interni Dolibarr algoritem: 8 mest, ki vsebujejo različne številke in male črke.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Kontrolno polje za pošiljanje potrdil članom po pošti (potrditev ali nova naročnina) je privzeto označeno
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=Nastavitve LDAP
 LDAPGlobalParameters=Globalni parametri
@@ -1523,7 +1564,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated acces (for a write access for example)
 PerfDolibarr=Nastavitev zmogljivosti/optimizacija poročila
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Aplikativni predpomnilnik
 MemcachedNotAvailable=Ni najden aplikativni predpomnilnik. Zmogljivost lahko izboljšate z namestitvijo predpomnilniškega strežnika Memcached in modula, ki zna uporabljati ta predpomnilniški strežnik.<br>Več informacij najdete tukaj <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Vedite, da veliko gostiteljev spletnih strani ne zagotavlja takega predpomnilniškega strežnika..
 MemcachedModuleAvailableButNotSetup=Najden je predpomnilniški modul za aplikativni predpomnilnik, vendar nastavitev modula ni zaključena.
@@ -1571,9 +1614,9 @@ SyslogLevel=Nivo
 SyslogFilename=Ime datoteke in pot
 YouCanUseDOL_DATA_ROOT=Za log datoteko v Dolibarr dokumentni mapi lahko uporabite DOL_DATA_ROOT/dolibarr.log. Za shranjevanje te datoteke lahko nastavite tudi drugačno pot.
 ErrorUnknownSyslogConstant=Konstanta %s ni znana syslog konstanta
-OnlyWindowsLOG_USER=Windowsi podpirajo samo LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Nastanitev modula za donacije
@@ -1629,7 +1672,7 @@ AdvancedEditor=Napredni urejevalnik
 ActivateFCKeditor=Aktiviranje FCKeditor za:
 FCKeditorForCompany=WYSIWIG kreiranje/urejanje opisa podjetij in opomb
 FCKeditorForProduct=WYSIWIG kreiranje/urejanje opisa proizvodov/storitev in opomb
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG kreiranje/urejanje pošte
 FCKeditorForUserSignature=WYSIWIG kreiranje/urejanje podpisa uporabnika
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Izbrisan meni
+Menu=Menu
 Menus=Meniji
 TreeMenuPersonalized=Prilagojeni meniji
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Nov meni
-Menu=Izbira menija
 MenuHandler=Menijski vmesnik
 MenuModule=Modul izvorov
 HideUnauthorizedMenu= Zasenči neavtoriziran meni (sivo)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Nastavitve modula za klicanje s klikom
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Vključi pot (definirana v spremenljivki %s)
 ExpenseReportsSetup=Nastavitev modula za stroškovna poročila
 TemplatePDFExpenseReports=Predloga dokumenta za generiranje stroškovnega poročila
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=Noben modul za upravljanje avtomatskega povečevanja zalog ni aktiviran. Zaloge se bodo povečale samo na osnovi ročnega vnosa.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Partnerji
 MailToMember=Člani
 MailToUser=Uporabniki
-MailToProject=Projects page
+MailToProject=Projekti
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/sl_SI/banks.lang b/htdocs/langs/sl_SI/banks.lang
index 43fa36818f8..a73db019812 100644
--- a/htdocs/langs/sl_SI/banks.lang
+++ b/htdocs/langs/sl_SI/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/sl_SI/categories.lang b/htdocs/langs/sl_SI/categories.lang
index 02a3493bd0c..70060a70318 100644
--- a/htdocs/langs/sl_SI/categories.lang
+++ b/htdocs/langs/sl_SI/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Nastavitev značk/kategorij
 CategorieRecursiv=Avtomatsko poveži z nadrejeno značko/kategorijo
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Dodaj sledeči produkt/storitev
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Pokaži značko/kategorijo
 ByDefaultInList=Privzeto na seznamu
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/sl_SI/companies.lang b/htdocs/langs/sl_SI/companies.lang
index f58b2dca981..c83ab2f3231 100644
--- a/htdocs/langs/sl_SI/companies.lang
+++ b/htdocs/langs/sl_SI/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE==
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE()
@@ -144,11 +144,11 @@ ProfId3BR=IM()
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH==
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL==
 ProfId2CL==
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE==
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=(CNAE)
 ProfId2ES=(Social security number)
 ProfId3ES=(IAE)
 ProfId4ES=(Collegiate number)
-ProfId5ES==
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR==
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Prof Id 1 (Registration Number)
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN==
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxemburg)
 ProfId2LU=Id. prof. 2 (Dovoljenje za poslovanje)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA==
 ProfId2MA==
 ProfId3MA==
 ProfId4MA==
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX==
 ProfId2MX==
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL==
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT==
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN==
 ProfId2SN==
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof ID 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Kontrola ni možna. Država članica ne zagotavlja storitve poizvedbe (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potencial
 ProspectLevel=Potencial možne stranke
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Valuta
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/sl_SI/ecm.lang b/htdocs/langs/sl_SI/ecm.lang
index 2ee8b31c951..b90e1d73431 100644
--- a/htdocs/langs/sl_SI/ecm.lang
+++ b/htdocs/langs/sl_SI/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Iskanje po ključnih besedah
 ECMSearchByEntity=Iskanje po objektu
 ECMSectionOfDocuments=Mape dokumentov
 ECMTypeAuto=Avtomatsko
-ECMDocsBySocialContributions=Dokumenti, povezani s socialnim ali fiskalnim davkom
-ECMDocsByThirdParties=Dokumenti, povezani s partnerjem
-ECMDocsByProposals=Dokumenti, povezani s ponudbami
-ECMDocsByOrders=Dokumenti, povezani z naročili kupcev
-ECMDocsByContracts=Dokumenti, povezani s pogodbami
-ECMDocsByInvoices=Dokumenti, povezani z računi za kupce
-ECMDocsByProducts=Dokumenti, povezani s proizvodi
-ECMDocsByProjects=Dokumenti, povezani s projekti
-ECMDocsByUsers=Dokumenti, povezani z uporabniki
-ECMDocsByInterventions=Dokumenti, povezani z intervencijami
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=Ni kreiranih map
 ShowECMSection=Prikaži mapo
 DeleteSection=Odstrani mapo
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/sl_SI/hrm.lang b/htdocs/langs/sl_SI/hrm.lang
index f6345d6389e..c5af09f3811 100644
--- a/htdocs/langs/sl_SI/hrm.lang
+++ b/htdocs/langs/sl_SI/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Employees
 Employee=Zaposleni
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/sl_SI/install.lang b/htdocs/langs/sl_SI/install.lang
index 1a61c198fef..92bb6ebc95a 100644
--- a/htdocs/langs/sl_SI/install.lang
+++ b/htdocs/langs/sl_SI/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=V konfiguracijsko datoteka <b>%s</b> je možno zapisovanje.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=Ta PHP podpira seje.
 PHPSupportPOSTGETOk=Ta PHP podpira spremenljivke POST in GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=Ta PHP podpira seje.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Maksimalni spomin za sejo vašega PHP je nastavljen na <b>%s</b>. To bi moralo zadoščati.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/sl_SI/intracommreport.lang b/htdocs/langs/sl_SI/intracommreport.lang
new file mode 100644
index 00000000000..1c207976418
--- /dev/null
+++ b/htdocs/langs/sl_SI/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=Seznam
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/sl_SI/languages.lang b/htdocs/langs/sl_SI/languages.lang
index f449281f141..f625688f706 100644
--- a/htdocs/langs/sl_SI/languages.lang
+++ b/htdocs/langs/sl_SI/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Španski (Paragvaj)
 Language_es_PE=Španski (Peru)
 Language_es_PR=Španščina (Portoriko)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index 71d8cbb4ee9..f7d1c8a39d7 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Odstrani povezavo
 AddToDraft=Add to draft
 Update=Posodobi
 Close=Zapri
+CloseAs=Set status to
 CloseBox=Remove widget from your dashboard
 Confirm=Potrdi
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Ponovno odpri
 Upload=Upload
 ToLink=Povezava
 Select=Dodaj kot lastnika
+SelectAll=Select all
 Choose=Izbira
 Resize=Spremeni velikost
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=Kartice
 Card=Kartica
 Now=Zdaj
 HourStart=Ura začetka
+Deadline=Deadline
 Date=Datum
 DateAndHour=Datum in ura
 DateToday=Današnji datum
@@ -264,8 +267,10 @@ DateStart=Začetni datum
 DateEnd=Končni datum
 DateCreation=Datum kreiranja
 DateCreationShort=Datum ustvarjanja
+IPCreation=Creation IP
 DateModification=Datum spremembe
 DateModificationShort=Dat.spr.
+IPModification=Modification IP
 DateLastModification=Datum zadnje spremembe
 DateValidation=Datum potrditve
 DateClosing=Datum zaključka
@@ -319,6 +324,7 @@ Morning=Jutro
 Afternoon=Popoldan
 Quadri=Četrtletje
 MonthOfDay=Dan v mesecu
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=Mn
 Rate=Stopnja
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Znesek davka 2
 AmountLT2=Znesek davka 3
 AmountLT1ES=Znesek RE
@@ -487,6 +494,7 @@ By=Z
 From=Od
 FromDate=Izdajatelj
 FromLocation=Izdajatelj
+at=at
 to=do
 To=do
 and=in
@@ -509,6 +517,7 @@ Draft=Osnutek
 Drafts=Osnutki
 StatusInterInvoiced=Invoiced
 Validated=Potrjen
+ValidatedToProduce=Validated (To produce)
 Opened=Odprt
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Odgovor
 Priority=Prioriteta
 SendByMail=Send by email
 MailSentBy=Email poslal
+NotSent=Ni poslan
 TextUsedInTheMessageBody=Vsebina Email-a
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Pošlji e-pošto
@@ -836,6 +846,7 @@ ListOfTemplates=Seznam predlog
 Gender=Spol
 Genderman=Moški
 Genderwoman=Ženska
+Genderother=Ostalo
 ViewList=Glej seznam
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Razno
 Calendar=Koledar
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Stroškovna poročila
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Plačila dobaviteljem
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Komentarji
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Informacija
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Datum rojstva
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/sl_SI/members.lang b/htdocs/langs/sl_SI/members.lang
index 1dbada441d8..43b207cd33f 100644
--- a/htdocs/langs/sl_SI/members.lang
+++ b/htdocs/langs/sl_SI/members.lang
@@ -19,14 +19,12 @@ MembersCards=Tiskane kartice članov
 MembersList=Seznam članov
 MembersListToValid=Seznam predlaganih članov (potrebna potrditev)
 MembersListValid=Seznam potrjenih članov
-MembersListUpToDate=Seznam potrjenih članov s posodobljeno članarino
-MembersListNotUpToDate=Seznam potrjenih članov s pretečeno članarino
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=Seznam kvalificiranih članov
 MenuMembersToValidate=Predlagani člani
 MenuMembersValidated=Potrjeni člani
-MenuMembersUpToDate=Posodobljeno članstvo
-MenuMembersNotUpToDate=Pretečeno članstvo
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Člani, ki morajo plačati članarino
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Datum vpisa
 DateEndSubscription=Datum zadnje članarine
 EndSubscription=Veljavnost članarine
 SubscriptionId=ID članarine
+WithoutSubscription=Without subscription
 MemberId=ID člana
 NewMember=Nov član
 MemberType=Tip člana
@@ -81,7 +80,7 @@ DeleteType=Izbriši
 VoteAllowed=Dovoljeno glasovanje
 Physical=Fizično
 Moral=Moralno
-MorPhy=Narava
+MorAndPhy=Moral and Physical
 Reenable=Ponovno omogoči
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Statistika članov po deželah
 MembersStatisticsByTown=Statistika članov po mestih
 MembersStatisticsByRegion=Statistika članov po regijah
 NbOfMembers=Število članov
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=Najdeni so nepotrjeni člani
 MembersByCountryDesc=Na tem zaslonu je prikazana statistika članov po državah. Grafika je odvisna od Google storitve in je na voljo samo pri delujoči internetni povezavi.
 MembersByStateDesc=Na tem zaslonu je prikazana statistika članov po državah/deželah/kantonih.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistika
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Informacija je javna (ne=zasebno)
 NewMemberbyWeb=Dodan je nov član. Čaka potrditev.
 NewMemberForm=Obrazec za nove člane
diff --git a/htdocs/langs/sl_SI/mrp.lang b/htdocs/langs/sl_SI/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/sl_SI/mrp.lang
+++ b/htdocs/langs/sl_SI/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index dd6d7012188..21ec9a1ac38 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Število cen
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Število povezanih proizvodov
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Število nadrejenih sestavljenih izdelkov
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=Če je 0, ta proizvod ni virtualni proizvod
-IfZeroItIsNotUsedByVirtualProduct=Če je 0, ta proizvod ni uporabljen v nobenem virtualnem proizvodu
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Filter ključnih besed
 CategoryFilter=Filter kategorij
 ProductToAddSearch=Iskanje proizvoda za dodajanje
 NoMatchFound=Ni ujemanja
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=Seznam izdelkov / storitev, pri tem izdelku, kot sestavnega dela
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=Eden od izbranih proizvodov je nadrejen trenutnemu proizvodu
 DeleteProduct=Izbriši proizvod/storitev
 ConfirmDeleteProduct=Ali zares želite izbrisati ta proizvod/storitev?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Globalne vrednosti, ki so na voljo:
 PriceMode=Način cene
 PriceNumeric=Številka
 DefaultPrice=Privzeta cena
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Povečanje/znmanjšanje zaloge pri spremembi nadrejenega
 ComposedProduct=Child products
 MinSupplierPrice=Najnižjo odkupno ceno
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/sl_SI/recruitment.lang b/htdocs/langs/sl_SI/recruitment.lang
index babb96232f7..30292aa07dc 100644
--- a/htdocs/langs/sl_SI/recruitment.lang
+++ b/htdocs/langs/sl_SI/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang
index b4c3a42fa2a..a9cb3761255 100644
--- a/htdocs/langs/sl_SI/stocks.lang
+++ b/htdocs/langs/sl_SI/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Področje skladišč
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Lokacija
 LocationSummary=Kratko ime lokacije
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=Za naročiti
 Replenishment=Obnavljanje
 ReplenishmentOrders=Naročila za obnavljanje
-VirtualDiffersFromPhysical=Glede na možnosti povečanja/zmanjšanja, se lahko fizična in virtualna zaloga (fizična + trenutna naročila) razlikujeta
-UseVirtualStockByDefault=Privzeto uporabljaj virtualno zalogo namesto fizične za funkcijo obnovitve zaloge
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Uporabi virtualno zalogo
 UsePhysicalStock=Uporabi fizično zalogo
 CurentSelectionMode=Trenuten način izbire
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Filter kategorij
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/sl_SI/suppliers.lang b/htdocs/langs/sl_SI/suppliers.lang
index 0ae910ef9b8..4d36a165272 100644
--- a/htdocs/langs/sl_SI/suppliers.lang
+++ b/htdocs/langs/sl_SI/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/sl_SI/website.lang b/htdocs/langs/sl_SI/website.lang
index 3971608e8ce..92889944fa4 100644
--- a/htdocs/langs/sl_SI/website.lang
+++ b/htdocs/langs/sl_SI/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Stran
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=Vir RSS
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang
index cd2bc3b934d..4e7da1a8564 100644
--- a/htdocs/langs/sq_AL/accountancy.lang
+++ b/htdocs/langs/sq_AL/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting expert
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=Journals
+Journals=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Chart of accounts
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bank accounts
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Balanca e llogarisё
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=By year
 NotMatch=Jo i vendosur
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Viti qё do tё fshihet
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index 64235347ad4..6ca94565b87 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Remove connection lock
 YourSession=Sesioni juaj
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScrip i caktivizuar
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
 CurrentTimeZone=TimeZone PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Konfigurimi i email
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Interventions
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
+Permission13=Invalidate customer invoices
 Permission14=Validate customer invoices
 Permission15=Send customer invoices by email
 Permission16=Create payments for customer invoices
@@ -688,6 +694,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Read members
 Permission72=Create/modify members
 Permission74=Delete members
@@ -718,6 +728,7 @@ Permission95=Lexo raportet
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
@@ -825,10 +836,11 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Edition of field %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1282,7 +1322,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Global parameters
@@ -1523,7 +1564,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Level
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
@@ -1629,7 +1672,7 @@ AdvancedEditor=Advanced editor
 ActivateFCKeditor=Activate advanced editor for:
 FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
 FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
-MailToProject=Projects page
+MailToProject=Projects
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/sq_AL/banks.lang b/htdocs/langs/sq_AL/banks.lang
index ba32fb7ee18..e131a6bbd10 100644
--- a/htdocs/langs/sq_AL/banks.lang
+++ b/htdocs/langs/sq_AL/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/sq_AL/categories.lang b/htdocs/langs/sq_AL/categories.lang
index 9703aa35747..8acad1ef594 100644
--- a/htdocs/langs/sq_AL/categories.lang
+++ b/htdocs/langs/sq_AL/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/sq_AL/companies.lang b/htdocs/langs/sq_AL/companies.lang
index f74d48ced9d..f0fb358a3b8 100644
--- a/htdocs/langs/sq_AL/companies.lang
+++ b/htdocs/langs/sq_AL/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Punonjësit
 ProspectLevelShort=Potential
 ProspectLevel=Prospect potential
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Currency
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/sq_AL/ecm.lang b/htdocs/langs/sq_AL/ecm.lang
index f5bb7b620a3..9fd3b1f30cd 100644
--- a/htdocs/langs/sq_AL/ecm.lang
+++ b/htdocs/langs/sq_AL/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Search by keywords
 ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeAuto=Automatike
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/sq_AL/hrm.lang b/htdocs/langs/sq_AL/hrm.lang
index b01b0e2aa4c..4ef88ad657a 100644
--- a/htdocs/langs/sq_AL/hrm.lang
+++ b/htdocs/langs/sq_AL/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Punonjësit
 Employee=Punonjës
 NewEmployee=Punonjës i ri
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/sq_AL/install.lang b/htdocs/langs/sq_AL/install.lang
index 81f019f0843..dbb8be357e7 100644
--- a/htdocs/langs/sq_AL/install.lang
+++ b/htdocs/langs/sq_AL/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=This PHP supports sessions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/sq_AL/intracommreport.lang b/htdocs/langs/sq_AL/intracommreport.lang
new file mode 100644
index 00000000000..3060300b974
--- /dev/null
+++ b/htdocs/langs/sq_AL/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=List
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/sq_AL/languages.lang b/htdocs/langs/sq_AL/languages.lang
index 84a95d47582..98d74a37c1a 100644
--- a/htdocs/langs/sq_AL/languages.lang
+++ b/htdocs/langs/sq_AL/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index f11e7e94095..b52a374d7d5 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Remove link
 AddToDraft=Add to draft
 Update=Update
 Close=Mbyll
+CloseAs=Set status to
 CloseBox=Remove widget from your dashboard
 Confirm=Confirm
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Re-Open
 Upload=Upload
 ToLink=Link
 Select=Select
+SelectAll=Select all
 Choose=Choose
 Resize=Resize
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=Cards
 Card=Card
 Now=Now
 HourStart=Start hour
+Deadline=Deadline
 Date=Date
 DateAndHour=Date and hour
 DateToday=Data e sotme
@@ -264,8 +267,10 @@ DateStart=Start date
 DateEnd=End date
 DateCreation=Creation date
 DateCreationShort=Creat. date
+IPCreation=Creation IP
 DateModification=Modification date
 DateModificationShort=Modif. date
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
@@ -319,6 +324,7 @@ Morning=Morning
 Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Month of the day
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Rate
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Amount tax 2
 AmountLT2=Amount tax 3
 AmountLT1ES=Amount RE
@@ -487,6 +494,7 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
+at=at
 to=to
 To=to
 and=and
@@ -509,6 +517,7 @@ Draft=Draft
 Drafts=Drafts
 StatusInterInvoiced=Invoiced
 Validated=Validated
+ValidatedToProduce=Validated (To produce)
 Opened=Hapur
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Response
 Priority=Prioriteti
 SendByMail=Send by email
 MailSentBy=Email sent by
+NotSent=Not sent
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
@@ -836,6 +846,7 @@ ListOfTemplates=List of templates
 Gender=Gjinia
 Genderman=Man
 Genderwoman=Woman
+Genderother=Tjetër
 ViewList=List view
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Comments
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Information
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Date of birth
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/sq_AL/members.lang b/htdocs/langs/sq_AL/members.lang
index 5fa51ea43a3..3625ff0de68 100644
--- a/htdocs/langs/sq_AL/members.lang
+++ b/htdocs/langs/sq_AL/members.lang
@@ -19,14 +19,12 @@ MembersCards=Members business cards
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
 SubscriptionId=Subscription id
+WithoutSubscription=Without subscription
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@@ -81,7 +80,7 @@ DeleteType=Fshi
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/sq_AL/mrp.lang b/htdocs/langs/sq_AL/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/sq_AL/mrp.lang
+++ b/htdocs/langs/sq_AL/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index 4e6540adadc..497ce01c6dc 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/sq_AL/recruitment.lang b/htdocs/langs/sq_AL/recruitment.lang
index 73e9a7fa07f..b775e78552e 100644
--- a/htdocs/langs/sq_AL/recruitment.lang
+++ b/htdocs/langs/sq_AL/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/sq_AL/stocks.lang b/htdocs/langs/sq_AL/stocks.lang
index 6d0ac04ee34..11577ff1d3e 100644
--- a/htdocs/langs/sq_AL/stocks.lang
+++ b/htdocs/langs/sq_AL/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Vendndodhja
 LocationSummary=Short name location
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/sq_AL/suppliers.lang b/htdocs/langs/sq_AL/suppliers.lang
index 236e7c36352..b50aa118719 100644
--- a/htdocs/langs/sq_AL/suppliers.lang
+++ b/htdocs/langs/sq_AL/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/sq_AL/website.lang b/htdocs/langs/sq_AL/website.lang
index 4b5294d5e43..03e042e4be6 100644
--- a/htdocs/langs/sq_AL/website.lang
+++ b/htdocs/langs/sq_AL/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/sr_RS/accountancy.lang b/htdocs/langs/sr_RS/accountancy.lang
index 04b94b6345d..66b404cdec9 100644
--- a/htdocs/langs/sr_RS/accountancy.lang
+++ b/htdocs/langs/sr_RS/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Konfigurisanje mogula računovodstveni ekspert
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=Izveštaji
+Journals=Izveštaji
 JournalFinancial=Finansijski izveštaji
 BackToChartofaccounts=Vrati tabelu računa
 Chartofaccounts=Tabela računa
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Dodaj računovodstveni nalog
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Računi u banci
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Stanje računa
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Izveštaj prodaje
 ACCOUNTING_PURCHASE_JOURNAL=Izveštaj nabavke
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=Po godini
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finansijski izveštaji
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finansijski izveštaji uključujući sve vrste uplata preko bankovnog računa
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index 405b1a234f9..842fbea4662 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Ukloni
 YourSession=Vaša sesija
 Sessions=Users Sessions
 WebUserGroup=Web server korisnik/grupa
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
 CurrentTimeZone=TimeZone PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Rok za obaveštenje
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Interventions
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Anketa ili Glasanje
@@ -671,7 +677,7 @@ Module63000Name=Resursi
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
+Permission13=Invalidate customer invoices
 Permission14=Validate customer invoices
 Permission15=Send customer invoices by email
 Permission16=Create payments for customer invoices
@@ -688,6 +694,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Read members
 Permission72=Create/modify members
 Permission74=Delete members
@@ -718,6 +728,7 @@ Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
@@ -825,10 +836,11 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Edition of field %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1282,7 +1322,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Povrati lozinku po konfiguraciji koju ste definisali.
 SetupPerso=Prema Vašoj konfiguraciji
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Global parameters
@@ -1523,7 +1564,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Level
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
@@ -1629,7 +1672,7 @@ AdvancedEditor=Advanced editor
 ActivateFCKeditor=Activate advanced editor for:
 FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
 FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Subjekti
 MailToMember=Članovi
 MailToUser=Korisnici
-MailToProject=Projects page
+MailToProject=Projekti
 MailToTicket=Tickets
 ByDefaultInList=Prikaži po defaultu na prikazu liste
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/sr_RS/banks.lang b/htdocs/langs/sr_RS/banks.lang
index a2ab0dfea17..2939146c14e 100644
--- a/htdocs/langs/sr_RS/banks.lang
+++ b/htdocs/langs/sr_RS/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/sr_RS/categories.lang b/htdocs/langs/sr_RS/categories.lang
index 4f1062f1d78..3467c78c1e5 100644
--- a/htdocs/langs/sr_RS/categories.lang
+++ b/htdocs/langs/sr_RS/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=TPodešavanje naziva/kategorija
 CategorieRecursiv=Poveži sa nadređenim nazivom/kategorijom automatski
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Dodaj sledeći proizvod/uslugu
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Prikaži naziv/kategoriju
 ByDefaultInList=Podrazumevano u listi
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/sr_RS/companies.lang b/htdocs/langs/sr_RS/companies.lang
index e2232cac206..31db7cdc260 100644
--- a/htdocs/langs/sr_RS/companies.lang
+++ b/htdocs/langs/sr_RS/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Profesionalni broj)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luksemburg)
 ProfId2LU=Id. prof. 2 (Radna dozvola)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Provera nije moguća. Servis nije dostupan za datu državu (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Zaposleni
 ProspectLevelShort=Potencijal
 ProspectLevel=Potencijal kandidata
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Valuta
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/sr_RS/ecm.lang b/htdocs/langs/sr_RS/ecm.lang
index 35750af87f0..6db486d990a 100644
--- a/htdocs/langs/sr_RS/ecm.lang
+++ b/htdocs/langs/sr_RS/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Potraži po ključnoj reči
 ECMSearchByEntity=Potraži po objektu
 ECMSectionOfDocuments=Folderi dokumenata
 ECMTypeAuto=Automatski
-ECMDocsBySocialContributions=Dokumenti vezani za poreze i doprinose.
-ECMDocsByThirdParties=Dokumenti vezani za subjekte
-ECMDocsByProposals=Dokumenti vezani za ponude
-ECMDocsByOrders=Dokumenti vezani za narudžbine klijenata
-ECMDocsByContracts=Dokumenti vezani za ugovore
-ECMDocsByInvoices=Dokumenti vezani za račune klijenata
-ECMDocsByProducts=Dokumenti vezani za proizvode
-ECMDocsByProjects=Dokumenti vezani za projekte
-ECMDocsByUsers=Dokumenti vezani za korisnike
-ECMDocsByInterventions=Dokumenti vezani za intervencije
-ECMDocsByExpenseReports=Dokumenta povezana za izveštajem o troškovima
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=Folder nije kreiran
 ShowECMSection=Pokaži folder
 DeleteSection=Obriši folder
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/sr_RS/hrm.lang b/htdocs/langs/sr_RS/hrm.lang
index ff6bf64c951..a16626d66d1 100644
--- a/htdocs/langs/sr_RS/hrm.lang
+++ b/htdocs/langs/sr_RS/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Zaposleni
 Employee=Zaposleni
 NewEmployee=Novi zaposleni
+ListOfEmployees=Lista zaposlenih
diff --git a/htdocs/langs/sr_RS/install.lang b/htdocs/langs/sr_RS/install.lang
index d65645fa6e4..3a09cc9669d 100644
--- a/htdocs/langs/sr_RS/install.lang
+++ b/htdocs/langs/sr_RS/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Konfiguracioni fajl <b>%s</b> može biti izmenjen.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=PHP podržava sesije.
 PHPSupportPOSTGETOk=PHP podržava POST i GET promenljive
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=PHP podržava sesije.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Maksimalna memorija za sesije je <b>%s</b>. To bi trebalo biti dovoljno.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/sr_RS/intracommreport.lang b/htdocs/langs/sr_RS/intracommreport.lang
new file mode 100644
index 00000000000..8b6713062c8
--- /dev/null
+++ b/htdocs/langs/sr_RS/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=Lista
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/sr_RS/languages.lang b/htdocs/langs/sr_RS/languages.lang
index 09da9c8b90a..8f0e9d14af7 100644
--- a/htdocs/langs/sr_RS/languages.lang
+++ b/htdocs/langs/sr_RS/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Španski  (Panama)
 Language_es_PY=Španski (Paragvaj)
 Language_es_PE=Španski (Peru)
 Language_es_PR=Španski (Porto Riko)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Španski (Venecuela)
diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
index b5d9814035c..d6425161390 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Ukloni link
 AddToDraft=Add to draft
 Update=Ažuriraj
 Close=Zatvori
+CloseAs=Postavi status na
 CloseBox=Remove widget from your dashboard
 Confirm=Potvrdi
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Ponovo otvori
 Upload=Upload
 ToLink=ink
 Select=Izaberi
+SelectAll=Select all
 Choose=Izaberi
 Resize=Promeni veličinu
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=Kartice
 Card=Kartica
 Now=Sada
 HourStart=Vreme početka
+Deadline=Deadline
 Date=Datum
 DateAndHour=Datum i vreme
 DateToday=Današnji datum
@@ -264,8 +267,10 @@ DateStart=Datum početka
 DateEnd=Datum završetka
 DateCreation=Datum kreacije
 DateCreationShort=Datum kreiranja
+IPCreation=Creation IP
 DateModification=Datum izmene
 DateModificationShort=Dat. izmene
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Datum odobrenja
 DateClosing=Datum zatvaranja
@@ -319,6 +324,7 @@ Morning=Pre podne
 Afternoon=Posle podne
 Quadri=Quadri
 MonthOfDay=Mesec dana
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Kurs
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Iznos (sa PDV-om), originalna valuta
 MulticurrencyAmountVAT=Ukupno PDV, originalna valuta
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Iznos poreza 2
 AmountLT2=Iznos poreza 3
 AmountLT1ES=Iznos RE
@@ -487,6 +494,7 @@ By=Do
 From=Od
 FromDate=Od
 FromLocation=Od
+at=at
 to=do
 To=do
 and=i
@@ -509,6 +517,7 @@ Draft=Draft
 Drafts=Draft
 StatusInterInvoiced=Invoiced
 Validated=Validirano
+ValidatedToProduce=Validated (To produce)
 Opened=Otvoreno
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Odgovor
 Priority=Prioritet
 SendByMail=Send by email
 MailSentBy=Mail poslao
+NotSent=Nije poslat
 TextUsedInTheMessageBody=Sadržaj maila
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Pošalji email
@@ -836,6 +846,7 @@ ListOfTemplates=Lista templejtova
 Gender=Pol
 Genderman=Muško
 Genderwoman=Žensko
+Genderother=Drugo
 ViewList=Prikaz liste
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Ostalo
 Calendar=Kalendar
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Troškovi
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Komentari
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Informacija
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Datum rođenja
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/sr_RS/members.lang b/htdocs/langs/sr_RS/members.lang
index c00934a4e5e..6501fc03581 100644
--- a/htdocs/langs/sr_RS/members.lang
+++ b/htdocs/langs/sr_RS/members.lang
@@ -19,14 +19,12 @@ MembersCards=Članske poslovne kartice
 MembersList=Lista članova
 MembersListToValid=Lista draft članova (za potvrdu)
 MembersListValid=Lista potvrđenih članova
-MembersListUpToDate=Lista potvrđenih članova sa ažurnom pretplatom
-MembersListNotUpToDate=Lista potvrđenih članova sa neažrnom pretplatom
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=Lista kvalifikovanih članova
 MenuMembersToValidate=Draft članovi
 MenuMembersValidated=Potvrđeni članovi
-MenuMembersUpToDate=Ažurni članovi
-MenuMembersNotUpToDate=Istekli članovi
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Članovi koji treba da prime pretplatu
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Datum pretplate
 DateEndSubscription=Kraj pretplate
 EndSubscription=Kraj pretplate
 SubscriptionId=ID pretplate
+WithoutSubscription=Without subscription
 MemberId=ID člana
 NewMember=Novi član
 MemberType=Tip člana
@@ -81,7 +80,7 @@ DeleteType=Obriši
 VoteAllowed=Glasanje dozvoljeno
 Physical=Fizičko
 Moral=Pravno
-MorPhy=Priroda
+MorAndPhy=Moral and Physical
 Reenable=Ponovo aktiviraj
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Statistike članova po regionu
 MembersStatisticsByTown=Statistike članova po gradu
 MembersStatisticsByRegion=Statistike članova po regionu
 NbOfMembers=Broj članova
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=Nema potvrđenih članova
 MembersByCountryDesc=Ovaj ekran pokazuje statistike članove po zemljama. Koristi se Google online graph service koji je dostupan samo ukoliko imate aktivnu internet konekciju.
 MembersByStateDesc=Ovaj ekran pokazuje statistike članova po regionu.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistike
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Datum najnovije pretplate
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Javne informacije
 NewMemberbyWeb=Novi član je dodat. Čeka se odobrenje.
 NewMemberForm=Forma za nove članove
diff --git a/htdocs/langs/sr_RS/mrp.lang b/htdocs/langs/sr_RS/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/sr_RS/mrp.lang
+++ b/htdocs/langs/sr_RS/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/sr_RS/products.lang b/htdocs/langs/sr_RS/products.lang
index 037863591fd..d553a48ca39 100644
--- a/htdocs/langs/sr_RS/products.lang
+++ b/htdocs/langs/sr_RS/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Broj cena
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Broj paketa proizvoda
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Filter po ključnoj reči
 CategoryFilter=Filter po kategoriji
 ProductToAddSearch=Potraži proizvod za dodavanje
 NoMatchFound=Nema rezultata
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=Jedan od izabranih proizvoda je matični za trenutni proizvod
 DeleteProduct=Obriši proizvod/uslugu
 ConfirmDeleteProduct=Da li ste sigurni da želite da obrišete ovaj proizvod/uslugu?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Dostupne globalne vrednosti:
 PriceMode=Mod cene
 PriceNumeric=Broj
 DefaultPrice=Default cena
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Povećaj/Smanji zalihu na matičnoj promeni
 ComposedProduct=Child products
 MinSupplierPrice=Minimalna kupovna cena
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/sr_RS/recruitment.lang b/htdocs/langs/sr_RS/recruitment.lang
index 759257ea80c..2d9b75ed0b9 100644
--- a/htdocs/langs/sr_RS/recruitment.lang
+++ b/htdocs/langs/sr_RS/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/sr_RS/stocks.lang b/htdocs/langs/sr_RS/stocks.lang
index 0296f1775ce..2df84e2de08 100644
--- a/htdocs/langs/sr_RS/stocks.lang
+++ b/htdocs/langs/sr_RS/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Oblast magacina
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Lokacija
 LocationSummary=Kratak naziv lokacije
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=Za narudžbinu
 Replenishment=Dopunjavanje
 ReplenishmentOrders=Narudžbine dopunjavanja
-VirtualDiffersFromPhysical=Prema opcijama za povećanje/umanjenje zaliha, fizička zaliha i virutelna zaliha (fizička + trenutne narudžbine) se mogu razlikovati
-UseVirtualStockByDefault=Po defaultu koristi virtuelnu zalihu, umesto fizičke, za funkciju dopunjavanja
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Koristi fiktivnu zalihu
 UsePhysicalStock=Koristi fizičku zalihu
 CurentSelectionMode=Trenutan način selekcije
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Filter po kategoriji
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/sr_RS/suppliers.lang b/htdocs/langs/sr_RS/suppliers.lang
index 675f9b32f30..1bcdd369ceb 100644
--- a/htdocs/langs/sr_RS/suppliers.lang
+++ b/htdocs/langs/sr_RS/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/sr_RS/website.lang b/htdocs/langs/sr_RS/website.lang
index 0ce58ab3043..0ff0213ef31 100644
--- a/htdocs/langs/sr_RS/website.lang
+++ b/htdocs/langs/sr_RS/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Strana
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index 080f361671d..30f4f0325a6 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Standard för service
 DefaultForProduct=Standard för produkter
 CantSuggest=Kan inte föreslå
 AccountancySetupDoneFromAccountancyMenu=De flesta inställningarna för bokföringen görs från menyn %s
-ConfigAccountingExpert=Konfiguration av modulen redovisningsexpert
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Bokföring
-Journaux=Loggböcker
+Journals=Loggböcker
 JournalFinancial=Finansiella loggböcker
 BackToChartofaccounts=Avkastning kontoplan
 Chartofaccounts=Kontoplan
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Nuvarande dedikerat konto
 AssignDedicatedAccountingAccount=Nytt konto att tilldela
 InvoiceLabel=Faktura etikett
@@ -33,8 +35,8 @@ OtherInfo=Övrig information
 DeleteCptCategory=Ta bort redovisningskontot från gruppen
 ConfirmDeleteCptCategory=Är du säker på att du vill ta bort det här kontot konto från kontokoncernen?
 JournalizationInLedgerStatus=Status för bokföring
-AlreadyInGeneralLedger=Redan bokförd i huvudboken
-NotYetInGeneralLedger=Ännu inte infört i huvudboken
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Gruppen är tom, kontrollera inställningen av den personliga redovisningsgruppen
 DetailByAccount=Visa detaljer efter konto
 AccountWithNonZeroValues=Konton med icke-nollvärden
@@ -43,7 +45,9 @@ CountriesInEEC=Länder i EEG
 CountriesNotInEEC=Länder inte i EEG
 CountriesInEECExceptMe=Länder i EEG förutom %s
 CountriesExceptMe=Alla länder utom %s
-AccountantFiles=Exportera redovisningsdokument
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Huvudsakliga bokföringskonto för kunder som inte definierats i installationen
 MainAccountForSuppliersNotDefined=Huvudkonton för leverantörer som inte definierats i installationen
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEG %s: Lägg till eller redigera befintliga transak
 
 AccountancyAreaDescClosePeriod=STEG %s: Stäng period så vi kan inte göra ändringar i framtiden.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=Ett obligatoriskt steg i installationen var inte fullständigt (bokföringskodsloggbok inte definierad för alla bankkonton)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Välj aktivt diagram över konton
 ChangeAndLoad=Ändra och ladda
 Addanaccount=Lägg till ett redovisningskonto
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Visa bokföringskonto
 ShowAccountingJournal=Visa loggböcker
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Redovisningskonto föreslås
 MenuDefaultAccounts=Standardkonton
 MenuBankAccounts=Bankkonton
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Utläggsrapport förbindande
 CreateMvts=Skapa ny transaktion
 UpdateMvts=Ändring av en transaktion
 ValidTransaction=Bekräfta transaktionen
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Huvudbok
+BookkeepingSubAccount=Subledger
 AccountBalance=Kontobalans
 ObjectsRef=Källobjekt ref
 CAHTF=Totalt köpleverantör före skatt
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Inaktivera direktinspelning av transaktion i bankkonto
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Aktivera utkastexport på loggbok
 ACCOUNTANCY_COMBO_FOR_AUX=Aktivera kombinationslista för dotterkonto (kan vara långsamt om du har många tredje parter)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Försäljningsloggbok
 ACCOUNTING_PURCHASE_JOURNAL=Inköpsloggbok
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Redovisningskonto för väntan
 DONATION_ACCOUNTINGACCOUNT=Redovisningskonto för att registrera donationer
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Redovisningskonto för att registrera prenumerationer
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Av fördefinierade grupper
 ByPersonalizedAccountGroups=Av personliga grupper
 ByYear=Per år
 NotMatch=Inte inställd
-DeleteMvt=Ta bort linjer
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=År att radera
 DelJournal=Loggbok att radera
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=Detta kommer att radera transaktionen från huvudboken (alla rader relaterade till samma transaktion kommer att raderas)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finansloggbok
 ExpenseReportsJournal=Utläggsrapporter loggbok
 DescFinanceJournal=Finansbokföring inklusive alla typer av betalningar via bankkonto
-DescJournalOnlyBindedVisible=Detta är en syn på posten som är bunden till ett bokföringskonto och kan spelas in i huvudboken.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Konto för moms inte definierad
 ThirdpartyAccountNotDefined=Konto för tredje part har inte definierats
 ProductAccountNotDefined=Konto för produkt som inte definierats
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Denna loggboken används redan
 AccountingAccountForSalesTaxAreDefinedInto=Obs! Bokföringskonto för försäljningsskatt definieras i menyn <b> %s </b> - <b> %s </b>
 NumberOfAccountancyEntries=Antal poster
 NumberOfAccountancyMovements=Antal rörelser
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Exportera utkast till loggbok
@@ -326,6 +339,8 @@ Modelcsv_configurable=Exportera CSV konfigurerbar
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Diagram över konton Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 63e36bd2c59..067f3a478a2 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Ta bort lås för anslutning
 YourSession=Din session
 Sessions=Användarsessioner
 WebUserGroup=Webbserver användare / grupp
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Din PHP-konfiguration verkar inte tillåta att du registrerar aktiva sessioner. Den katalog som används för att spara sessioner (<b> %s </b>) kan skyddas (till exempel av operatörsbehörigheter eller genom PHP-direktivet open_basedir).
 DBStoringCharset=Databas charset för att lagra data
 DBSortingCharset=Databas charset att sortera data
@@ -71,7 +73,7 @@ DisableJavascriptNote=Obs! För test eller debug-syfte. För optimering för bli
 UseSearchToSelectCompanyTooltip=Även om du har ett stort antal tredje parter (> 100 000), kan du öka hastigheten genom att sätta konstant COMPANY_DONOTSEARCH_ANYWHERE till 1 i Setup-> Övrigt. Sökningen kommer då att begränsas till start av strängen.
 UseSearchToSelectContactTooltip=Även om du har ett stort antal tredje parter (> 100 000), kan du öka hastigheten genom att sätta konstant CONTACT_DONOTSEARCH_ANYWHERE till 1 i Setup-> Övrigt. Sökningen kommer då att begränsas till start av strängen.
 DelaiedFullListToSelectCompany=Vänta tills en tangent trycks innan du laddar innehållet i kombinationslistan från tredje part. <br> Detta kan öka prestanda om du har ett stort antal tredje parter, men det är mindre bekvämt.
-DelaiedFullListToSelectContact=Vänta tills en tangent trycks innan du laddar innehållet i kontakt kombinationslistan. <br> Detta kan öka prestanda om du har ett stort antal kontakter, men det är mindre bekvämt)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=På tredje parts dokument kan du välja ett
 JavascriptDisabled=JavaScript funktionshindrade
 UsePreviewTabs=Använd förhandsgranska flikar
 ShowPreview=Visa förhandsgranskning
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Förhandsgranska inte tillgänglig
 ThemeCurrentlyActive=Tema för tillfället
 CurrentTimeZone=PHP server tidszon
@@ -271,7 +274,7 @@ NoticePeriod=Uppsägningstid
 NewByMonth=Ny i månaden
 Emails=E-post
 EMailsSetup=E-postinställningar
-EMailsDesc=På den här sidan kan du åsidosätta dina standard PHP-parametrar för att skicka e-post. I de flesta fall på Unix / Linux OS är PHP-inställningen korrekt och dessa parametrar är onödiga.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=E-postmeddelanden skickar profiler
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP / SMTPS-porten (standardvärde i php.ini: <b> %s </b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP-ID (om sändning av server kräver autentisering)
 MAIN_MAIL_SMTPS_PW=SMTP-lösenord (om sändning av server kräver autentisering)
 MAIN_MAIL_EMAIL_TLS=Använd kryptering av TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Använd TLS (STARTTLS) kryptering
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Använd DKIM för att skapa e-signatur
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=E-post domän för användning med dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Namn på dkim-väljaren
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Om du lämnar fältet tomt betyder det att detta vä
 ExtrafieldParamHelpselect=Förteckning över värden måste vara linjer med formatnyckel, värde (där nyckel inte kan vara '0') <br> <br> till exempel: <br> 1, värde1 <br> 2, värde2 <br> code3, värde3 <br> ... <br> <br> För att få lista beroende på en annan komplementär attributlista: <br> 1, värde1 | options_ <i> parent_list_code </i>: parent_key <br> 2, value2 | options_ <i> parent_list_code </i>: parent_key <br> <br> För att få listan beroende på en annan lista: <br> 1, värde1 | <i> parent_list_code </i>: parent_key <br> 2, värde2 | <i> parent_list_code </i>: parent_key
 ExtrafieldParamHelpcheckbox=Lista över värden måste vara rader med formatnyckel, värde (där nyckel inte kan vara '0') <br> <br> till exempel: <br> 1, värde1 <br> 2, värde2 <br> 3, värde3 <br> ...
 ExtrafieldParamHelpradio=Lista över värden måste vara rader med formatnyckel, värde (där nyckel inte kan vara '0') <br> <br> till exempel: <br> 1, värde1 <br> 2, värde2 <br> 3, värde3 <br> ...
-ExtrafieldParamHelpsellist=Lista över värden kommer från en tabell <br> Syntax: tabellnamn: label_field: id_field :: filter <br> Exempel: c_typent: libelle: id :: filter <br> <br> - idfilter är nödvändigtvis en primär int nyckel <br> - filtret kan vara ett enkelt test = 1) för att visa endast aktivt värde <br> Du kan också använda $ ID $ i filterhäxa är det aktuella idet av nuvarande objekt <br> För att göra ett SELECT i filter använder du $ SEL $ <br> om du vill filtrera på extrafält använder du syntax extra.fieldcode = ... (där fältkoden är koden för extrafältet) <br> <br> För att få listan beroende på en annan komplementär attributlista: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> För att ha listan beror på en annan lista: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Lista över värden kommer från en tabell <br> Syntax: tabellnamn: label_field: id_field :: filter <br> Exempel: c_typent: libelle: id :: filter <br> <br> filtret kan vara ett enkelt test (t.ex. aktiv = 1) för att visa endast aktivt värde <br> Du kan också använda $ ID $ i filterhäxa är nuvarande ID för nuvarande objekt <br> För att göra ett SELECT i filter använd $ SEL $ <br> om du vill filtrera på extrafält använder syntax extra.fieldcode = ... (där fältkoden är kod för extrafält) <br> <br> För att få listan beroende på en annan komplementär attributlista: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> För att få listan beroende på en annan lista: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
-ExtrafieldParamHelplink=Parametrar måste vara ObjectName: Classpath <br> Syntax: ObjectName: Classpath <br> Exempel: <br> Societe: societe / class / societe.class.php <br> Kontakt: kontakt / class / contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Bibliotek som används för PDF-generering
 LocalTaxDesc=Vissa länder kan ansöka om två eller tre skatter på varje faktura. Om så är fallet, välj typ för andra och tredje skatt och dess skattesats. Möjlig typ är: <br> 1: Lokal skatt gäller för produkter och tjänster utan moms (localtax beräknas på belopp utan skatt) <br> 2: Lokal skatt gäller för produkter och tjänster inklusive moms (lokal skatt beräknas på belopp + huvudskatt) <br> 3: lokal skatt tillämpas på varor utan moms (lokal skatt beräknas på belopp utan skatt) <br> 4: Lokal skatt gäller för produkter inklusive moms (lokal skatt beräknas på belopp + huvudskatt) <br> 5: Lokal skatt gäller för tjänster utan moms (lokal skatt beräknas på belopp utan skatt) <br> 6: Lokal skatt gäller för tjänster inklusive moms (lokal skatt beräknas på belopp + skatt)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=Som standard måste inköpsorder skapas och godkännas av 2 olika användare (ett steg / användare att skapa och ett steg / användare att godkänna. Observera att om användaren har båda tillstånd att skapa och godkänna, är ett steg / användaren tillräckligt) . Du kan fråga med det här alternativet att införa ett tredje steg / användargodkännande, om beloppet är högre än ett dedikerat värde (så 3 steg kommer att behövas: 1 = godkännande, 2 = första godkännande och 3 = andra godkännande om beloppet är tillräckligt). <br> Ställ in det här för att tömma om ett godkännande (2 steg) räcker, ställ det till ett mycket lågt värde (0.1) om ett andra godkännande (3 steg) alltid krävs.
 UseDoubleApproval=Använd ett 3 steg godkännande när beloppet (utan skatt) är högre än ...
-WarningPHPMail=VARNING: Det är ofta bättre att konfigurera utgående e-postmeddelanden för att använda din leverantörs e-postserver istället för standardinställningen. Vissa e-postleverantörer (som Yahoo) tillåter dig inte att skicka ett mail från en annan server än sin egen server. Din nuvarande inställning använder servern i programmet för att skicka e-post och inte din e-postleverantörs server, så vissa mottagare (den som är kompatibel med det restriktiva DMARC-protokollet) kommer att fråga din e-postleverantör om de kan acceptera din e-post och vissa e-postleverantörer (som Yahoo) kan svara "nej" eftersom servern inte är deras, så få av dina skickade e-postmeddelanden får inte accepteras (var försiktig med din e-postleverantörs sändningskvot). <br> Om din e-postleverantör (som Yahoo) har denna begränsning måste du ändra inställningar för e-post för att välja den andra metoden "SMTP-server" och ange SMTP-servern och referenser från din e-postleverantör.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=Om din e-post SMTP-leverantör behöver begränsa e-postklienten till vissa IP-adresser (mycket sällsynt), är detta e-postadressen för e-postanvändaragenten (MUA) för din ERP CRM-ansökan: <strong> %s </strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Klicka för att visa beskrivning
 DependsOn=Denna modul behöver modulen / modulerna
 RequiredBy=Denna modul krävs enligt modul (er)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integrering av ett ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Lägg till funktion att generera Bookmark4u konto från en Dolibarr konto
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Insatser
@@ -656,7 +662,7 @@ Module50200Desc=Erbjud kunderna en PayPal-betalningssida för PayPal (PayPal-kon
 Module50300Name=Rand
 Module50300Desc=Erbjud kunderna en Stripe online betalningssida (kredit- / betalkort). Detta kan användas för att dina kunder ska kunna göra ad hoc-betalningar eller betalningar relaterade till ett specifikt Dolibarr-objekt (faktura, order etc ...)
 Module50400Name=Redovisning (dubbel inmatning)
-Module50400Desc=Redovisningshantering (dubbla poster, stöd för generella och extraordinära poster). Exportera storleken i flera andra bokföringsformat.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direktutskrift (utan att öppna dokumenten) med koppar IPP-gränssnitt (skrivaren måste vara synlig från servern och CUPS måste installeras på servern).
 Module55000Name=Omröstning, undersökning eller omröstning
@@ -671,7 +677,7 @@ Module63000Name=Resurser
 Module63000Desc=Hantera resurser (skrivare, bilar, rum, ...) för att tilldela händelser
 Permission11=Läs fakturor
 Permission12=Skapa / ändra fakturor
-Permission13=Märka fakturor från bekräftat->utkast 
+Permission13=Invalidate customer invoices
 Permission14=Bekräfta fakturor
 Permission15=Skicka fakturor via e-post
 Permission16=Skapa betalningar för fakturor
@@ -688,6 +694,7 @@ Permission32=Skapa / modifiera produkter
 Permission34=Ta bort produkter
 Permission36=Se / hantera dold produkter
 Permission38=EXPORTVARA
+Permission39=Ignore minimum price
 Permission41=Läs projekt och uppgifter (delat projekt och projekt jag är kontakt för). Kan också ange tidskrävad, för mig eller min hierarki, på tilldelade uppgifter (tidtabell)
 Permission42=Skapa / ändra projekt (delat projekt och projekt jag är kontakt för). Kan också skapa uppgifter och tilldela användare projekt och uppgifter
 Permission44=Ta bort projekt (delat projekt och projekt jag är kontakt för)
@@ -696,6 +703,9 @@ Permission61=Läs insatser
 Permission62=Skapa / ändra inlägg
 Permission64=Ta bort inlägg
 Permission67=Export insatser
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Läs medlemmar
 Permission72=Skapa / modifiera medlemmar
 Permission74=Ta bort medlemmar
@@ -718,6 +728,7 @@ Permission95=Läs rapporter
 Permission101=Läs sendings
 Permission102=Skapa / ändra sendings
 Permission104=Bekräfta leveranser
+Permission105=Send sendings by email
 Permission106=Exportsend
 Permission109=Ta bort sendings
 Permission111=Läs finansiella räkenskaper
@@ -825,10 +836,11 @@ Permission402=Skapa / ändra rabatter
 Permission403=Bekräfta rabatter
 Permission404=Ta bort rabatter
 Permission430=Use Debug Bar
-Permission511=Läs lönesättning
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Skapa / ändra lönesättning
 Permission514=Radera löner
-Permission517=Export löner
+Permission517=Read payments of salaries of everybody
+Permission519=Export löner
 Permission520=Läs Lån
 Permission522=Skapa / ändra lån
 Permission524=Radera lån
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Godkänn köporder
 Permission1186=Beställ beställningsorder
 Permission1187=Bekräfta mottagande av inköpsorder
 Permission1188=Ta bort inköpsorder
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Godkänn (andra godkännande) inköpsorder
+Permission1191=Export supplier orders and their attributes
 Permission1201=Få resultat av en export
 Permission1202=Skapa / ändra en export
 Permission1231=Läs leverantörsfakturor
@@ -898,6 +915,8 @@ Permission1251=Kör massiv import av externa data till databasen (data last)
 Permission1321=Export kundfakturor, attribut och betalningar
 Permission1322=Öppna en betald faktura igen
 Permission1421=Exportera försäljningsorder och attribut
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Läs Planerad jobb
 Permission23002=Skapa / uppdatera Schemalagt jobb
 Permission23003=Radera schemalagt jobb
 Permission23004=Utför schemalagt jobb
-Permission50101=Använd försäljningsstället
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Läs transaktioner
 Permission50202=Importera transaktioner
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Läs resurser
 Permission63002=Skapa / modifiera resurser
 Permission63003=Ta bort resurser
 Permission63004=Länka resurser till agendahändelser
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Tredjepartstyper
 DictionaryCompanyJuridicalType=Tredjeparts juridiska personer
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Typer av ledighet
 DictionaryOpportunityStatus=Ledningsstatus för projekt / ledning
 DictionaryExpenseTaxCat=Kostnadsrapport - Transportkategorier
 DictionaryExpenseTaxRange=Kostnadsrapport - Räckvidd per transportkategori
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Inställningarna sparas
 SetupNotSaved=Inställningen är inte sparad
 BackToModuleList=Tillbaka till modullista
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Etikett som används som standard om ingen översättning kan
 LabelOnDocuments=Etikett på dokument
 LabelOrTranslationKey=Etikett eller översättningstangent
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=Antal dagar
 AtEndOfMonth=I slutet av månaden
 CurrentNext=Current / Next
@@ -1145,6 +1182,7 @@ InfoWebServer=Om webbserver
 InfoDatabase=Om databasen
 InfoPHP=Om PHP
 InfoPerf=Om föreställningar
+InfoSecurity=About Security
 BrowserName=Browser namn
 BrowserOS=Browser OS
 ListOfSecurityEvents=Förteckning över Dolibarr säkerhetshändelser
@@ -1194,7 +1232,8 @@ RestoreDesc=För att återställa en Dolibarr-säkerhetskopiering krävs två st
 RestoreDesc2=Återställ säkerhetskopieringsfilen (t.ex. zip-filen) i katalogen "Dokument" till en ny Dolibarr-installation eller till den här aktuella dokumentkatalogen (<b> %s </b>).
 RestoreDesc3=Återställ databasstrukturen och data från en säkerhetskopieringsdumpfil till databasen för den nya Dolibarr-installationen eller i databasen för den aktuella installationen (<b> %s </b>). Varning, när återställningen är klar måste du använda ett inloggnings / lösenord som existerade från backuptid / installation för att ansluta igen. <br> För att återställa en backup-databas till den här nuvarande installationen kan du följa den här assistenten.
 RestoreMySQL=MySQL import
-ForcedToByAModule= Denna regel tvingas <b>%s</b> av en aktiverad modul
+ForcedToByAModule=Denna regel tvingas <b>%s</b> av en aktiverad modul
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Befintliga säkerhetskopieringsfiler
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=Första dagen i veckan
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Visa kund / leverantör ref. info lista (välj lista eller combobox) och de flesta av hyperlänken. <br> Tredje part kommer att visas med ett namnformat av "CC12345 - SC45678 - The Big Company corp." istället för "The Big Company Corp".
 AddAdressInList=Visa adresslista för kund / leverantörs adress (välj lista eller combobox) <br> Tredje parten kommer att visas med ett namnformat för "The Big Company Corp." - 21 Jump Street 123456 Big Town - USA "istället för" The Big Company Corp ".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Be om föredragen leveransmetod för tredje parter.
 FieldEdition=Edition av fält %s
 FillThisOnlyIfRequired=Exempel: +2 (fyll endast om tidszon offset problem är erfarna)
@@ -1282,7 +1322,7 @@ GetBarCode=Få streckkod
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Återgå ett lösenord som genererats enligt interna Dolibarr algoritm: 8 tecken som innehåller delade siffror och tecken med gemener.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Föreslå inte ett genererat lösenord. Lösenordet måste skrivas in manuellt.
 PasswordGenerationPerso=Returnera ett lösenord enligt din personligt definierade konfiguration.
 SetupPerso=Enligt din konfiguration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=E-post krävs för att skapa en ny medlem
 MemberSendInformationByMailByDefault=Kryssruta för att skicka e-post bekräftelse till medlemmar (bekräftande eller nya abonnemang) är aktiverat som standard
 VisitorCanChooseItsPaymentMode=Besökare kan välja mellan tillgängliga betalningssätt
 MEMBER_REMINDER_EMAIL=Aktivera automatisk påminnelse <b> via e-post </b> av utgått prenumerationer. Obs! Modul <strong> %s </strong> måste vara aktiverad och korrekt inställd för att skicka påminnelser.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP-inställningar
 LDAPGlobalParameters=Globala parametrar
@@ -1523,7 +1564,9 @@ LDAPDescValues=Exempel på värden är avsedda för <b>OpenLDAP</b> med följand
 ForANonAnonymousAccess=För en bestyrkt tillbehör (för en skrivåtkomst till exempel)
 PerfDolibarr=Prestanda inställningar / optimering rapport
 YouMayFindPerfAdviceHere=Denna sida ger några kontroller eller råd relaterade till prestanda.
-NotInstalled=Inte installerad, så din server inte sakta ner med detta.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applikativ cache
 MemcachedNotAvailable=Ingen applikativ cache hittades. Du kan förbättra prestanda genom att installera en cache-server Memcached och en modul kunna använda denna cache-server. <br> Mer information här <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a> . <br> Observera att en hel del webbhotell leverantör inte lämnar sådana cache-server.
 MemcachedModuleAvailableButNotSetup=Modul memcached för applikativ cache hittades men installationen av modulen är inte fullständig.
@@ -1571,9 +1614,9 @@ SyslogLevel=Nivå
 SyslogFilename=Filnamn och sökväg
 YouCanUseDOL_DATA_ROOT=Du kan använda DOL_DATA_ROOT / dolibarr.log för en loggfil i Dolibarr &quot;dokument&quot; katalogen. Du kan ställa in en annan väg för att lagra den här filen.
 ErrorUnknownSyslogConstant=Konstant %s är inte en känd syslog konstant
-OnlyWindowsLOG_USER=Endast Windows stöder LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Komprimering och säkerhetskopiering av felsökningsloggfiler (genererad av modulen Logga för felsökning)
-SyslogFileNumberOfSaves=Logga säkerhetskopior
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Konfigurera rengöring schemalagt jobb för att ställa in log backupfrekvens
 ##### Donations #####
 DonationsSetup=Donation modul inställning
@@ -1629,7 +1672,7 @@ AdvancedEditor=Avancerad redaktör
 ActivateFCKeditor=Aktivera FCKeditor för:
 FCKeditorForCompany=WYSIWYG skapande / upplaga av Companie beskrivning och notera
 FCKeditorForProduct=WYSIWYG skapande / upplaga av produkter / tjänster: s beskrivning och anteckning
-FCKeditorForProductDetails=WYSIWIG skapande / utgåva av produkter detaljeringslinjer för alla enheter (förslag, order, fakturor, etc ...). <font class="warning"> Varning! Användning av det här alternativet för det här fallet rekommenderas inte på allvar eftersom det kan skapa problem med specialtecken och sidformatering när du bygger PDF-filer. </font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWYG skapande / utgåva av försändelser
 FCKeditorForUserSignature=WYSIWYG skapande / upplaga av signatur
 FCKeditorForMail=WYSIWIG skapande / utgåva för all mail (utom Verktygs-> eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Inställning av lagermodul
 IfYouUsePointOfSaleCheckModule=Om du använder modulen Point of Sale (POS) som standard eller en extern modul, kan denna inställning ignoreras av din POS-modul. De flesta POS-moduler är utformade som standard för att skapa en faktura omedelbart och minska lageret oberoende av alternativen här. Så om du behöver eller inte har en lagerminskning när du registrerar en försäljning från din POS, kolla även din POS-moduluppsättning.
 ##### Menu #####
 MenuDeleted=Meny utgår
+Menu=Menu
 Menus=Menyer
 TreeMenuPersonalized=Personliga menyer
 NotTopTreeMenuPersonalized=Personliga menyer som inte är kopplade till en toppmenyinmatning
 NewMenu=Ny meny
-Menu=Val av meny
 MenuHandler=Meny handler
 MenuModule=Källa modul
 HideUnauthorizedMenu= Göm obehöriga menyer (grå)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Ställ in det här standardvärdet för typ av hä
 AGENDA_DEFAULT_FILTER_TYPE=Ställ in denna typ av händelse automatiskt i sökfiltret i kalendervy
 AGENDA_DEFAULT_FILTER_STATUS=Ställ in denna status automatiskt för händelser i sökfilter i dagordning
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Aktivera händelsepåminnelse <b> via e-postmeddelanden </b> (påminnelse alternativ / fördröjning kan definieras på varje händelse). Obs! Modul <strong> %s </strong> måste vara aktiverad och korrekt inställd för att få påminnelse skickad med rätt frekvens.
-AGENDA_REMINDER_BROWSER=Aktivera händelsepåminnelse <b> på användarens webbläsare </b> (när händelsedatum har uppnåtts kan varje användare neka det från webbläsarbekräftelsespåfrågan)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Aktivera ljudanmälan
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Visa länkat objekt i agendan
 ##### Clicktodial #####
 ClickToDialSetup=Klicka för att Dial modul inställning
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0: Betalningstyp för kund, 1: Leverantörsbetalningstyp, 2: Bå
 IncludePath=Inkludera sökväg (definerad i variabel %s)
 ExpenseReportsSetup=Inställning av modulräkningar
 TemplatePDFExpenseReports=Dokumentmallar för att skapa reseräkning dokument
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Inställning av modul Utläggsrapportsregler
 ExpenseReportNumberingModules=Modul för utläggsrapporteringsnummer
 NoModueToManageStockIncrease=Ingen modul kunna hantera automatiska lagerökningen har aktiverats. Stock ökning kommer att ske på bara manuell inmatning.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Tredje part
 MailToMember=Medlemmar
 MailToUser=Användare
-MailToProject=Projekt sida
+MailToProject=Projekt
 MailToTicket=Tickets
 ByDefaultInList=Visa som standard i listvy
 YouUseLastStableVersion=Du använder den senaste stabila versionen
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Ladda tredjepartsökning på %s (endast belastning)
 LoadThirdPartyFromNameOrCreate=Ladda tredjepartsökning på %s (skapa om ej hittad)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menyinmatningskod (huvudmeny)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Inaktivera funktionen för att länka en resurs till
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Bekräfta modulåterställning
 OnMobileOnly=På en liten skärm (smartphone) bara
-DisableProspectCustomerType=Inaktivera "Prospect + Customer" tredjepartstyp (så tredje part måste vara Prospect eller Kund men kan inte vara båda)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Förenkla gränssnittet för blinda personer
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Aktivera det här alternativet om du är blind person, eller om du använder programmet från en textbläsare som Lynx eller Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Använd felsökningsfältet
 DEBUGBAR_LOGS_LINES_NUMBER=Antal sista logglinjer för att hålla i konsolen
 WarningValueHigherSlowsDramaticalyOutput=Varning, högre värden sänker dramaticaly-utgången
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Exportmodeller delas med alla
 ExportSetup=Inställning av modul Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unikt ID för förekomsten
 SmallerThan=Mindre än
 LargerThan=Större än
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=Med ett GMail-konto, om du aktiverade valet av 2 steg, rekommenderas att du skapar ett dedikerat andra lösenord för programmet istället för att använda ditt eget lösenordsord från https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/sv_SE/banks.lang b/htdocs/langs/sv_SE/banks.lang
index a0fcc10c5ea..dc82d075631 100644
--- a/htdocs/langs/sv_SE/banks.lang
+++ b/htdocs/langs/sv_SE/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Diverse betalningar
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA-mandatet
 YourSEPAMandate=Ditt SEPA-mandat
 FindYourSEPAMandate=Detta är ditt SEPA-mandat för att bemyndiga vårt företag att göra direkt debitering till din bank. Returnera det undertecknat (skanna av det signerade dokumentet) eller skicka det via post till
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/sv_SE/categories.lang b/htdocs/langs/sv_SE/categories.lang
index 1c81710fbfc..f3c56936403 100644
--- a/htdocs/langs/sv_SE/categories.lang
+++ b/htdocs/langs/sv_SE/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Taggar / kategorier inställning
 CategorieRecursiv=Länk med moderkort / kategori automatiskt
 CategorieRecursivHelp=Om alternativet är på, när du lägger till en produkt i en underkategori kommer produkten också att läggas till i kategorin förälder.
 AddProductServiceIntoCategory=Lägg till följande produkt / tjänst
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Visa tagg / kategori
 ByDefaultInList=Som standard i listan
 ChooseCategory=Välj kategori
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/sv_SE/companies.lang b/htdocs/langs/sv_SE/companies.lang
index d0a123e72dd..57b74758a58 100644
--- a/htdocs/langs/sv_SE/companies.lang
+++ b/htdocs/langs/sv_SE/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional antal)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal antal)
 ProfId4CH=Prof Id 2 (Commercial Rekordmånga)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (RUT)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF / NIF)
 ProfId2ES=Prof Id 2 (Social Security Number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate nummer)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (Siret)
 ProfId3FR=Prof Id 3 (NAF, gamla APE)
 ProfId4FR=Prof Id 4 (RCS / RM)
-ProfId5FR=Prof ID 5
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registreringsnummer
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof ID 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxemburg)
 ProfId2LU=Id. prof. 2 (affärstillstånd)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (RC)
 ProfId2MA=Id prof. 2 (Patent)
 ProfId3MA=Id prof. 3 (IF)
 ProfId4MA=Id prof. 4 (CNSS)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (RFC).
 ProfId2MX=Prof Id 2 (R.. P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KvK Nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (personnummer)
 ProfId3PT=Prof Id 3 (organisationsnummer)
 ProfId4PT=Prof Id 4 (konservatoriet)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=Ninea
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=Du kan också kontrollera manuellt på Europeiska kommission
 ErrorVATCheckMS_UNAVAILABLE=Kontroll inte möjlig. Kontrollera om tjänsten tillhandahålls av medlemsstaten (%s).
 NorProspectNorCustomer=Inte utsikter, eller kund
 JuridicalStatus=Juridisk enhetstyp
+Workforce=Workforce
 Staff=anställda
 ProspectLevelShort=Potentiella
 ProspectLevel=Prospect potential
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Betalningstid - Leverantör
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Använd multicurrency
 MulticurrencyCurrency=Valuta
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/sv_SE/ecm.lang b/htdocs/langs/sv_SE/ecm.lang
index ddd5c94b361..0c633258618 100644
--- a/htdocs/langs/sv_SE/ecm.lang
+++ b/htdocs/langs/sv_SE/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Sök på nyckelord
 ECMSearchByEntity=Sök på objektet
 ECMSectionOfDocuments=Register över handlingar
 ECMTypeAuto=Automatisk
-ECMDocsBySocialContributions=Dokument kopplade till sociala eller skattemässiga skatter
-ECMDocsByThirdParties=Dokument med koppling till tredje part
-ECMDocsByProposals=Dokument med koppling till förslagen
-ECMDocsByOrders=Dokument med koppling till kunderna order
-ECMDocsByContracts=Handlingar som är kopplade till kontrakt
-ECMDocsByInvoices=Dokument med koppling till kunderna fakturor
-ECMDocsByProducts=Dokument med koppling till produkter
-ECMDocsByProjects=Handlingar som är kopplade till projekt
-ECMDocsByUsers=Dokument länkade till användare
-ECMDocsByInterventions=Dokument länkade till ärenden
-ECMDocsByExpenseReports=Dokument länkade till utgiftsrapporter
-ECMDocsByHolidays=Dokument kopplade till helgdagar
-ECMDocsBySupplierProposals=Dokument kopplade till leverantörsförslag
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=Ingen katalog skapas
 ShowECMSection=Visa katalog
 DeleteSection=Ta bort katalog
@@ -50,3 +38,6 @@ ReSyncListOfDir=Uppdatera lista med mappar
 HashOfFileContent=Hash av filinnehåll
 NoDirectoriesFound=Inga mappar funna
 FileNotYetIndexedInDatabase=Filen är inte indexerad i databasen (försök ladda upp igen)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/sv_SE/hrm.lang b/htdocs/langs/sv_SE/hrm.lang
index 4ee74d97f4c..8cf4dd076d8 100644
--- a/htdocs/langs/sv_SE/hrm.lang
+++ b/htdocs/langs/sv_SE/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=anställda
 Employee=Anställd
 NewEmployee=Ny anställd
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/sv_SE/install.lang b/htdocs/langs/sv_SE/install.lang
index b598ef87af3..c24385de975 100644
--- a/htdocs/langs/sv_SE/install.lang
+++ b/htdocs/langs/sv_SE/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Konfigurationsfil <b> %s </b> är inte skrivbar. Kontrolle
 ConfFileIsWritable=Konfigurationsfilen <b>%s</b> är skrivbar.
 ConfFileMustBeAFileNotADir=Konfigurationsfil <b> %s </b> måste vara en fil, inte en katalog.
 ConfFileReload=Uppdatera parametrar från konfigurationsfilen.
-PHPSupportSessions=Detta stöder PHP sessioner.
 PHPSupportPOSTGETOk=Detta stöder PHP variabler POST och GET.
 PHPSupportPOSTGETKo=Det är möjligt att din PHP-inställning inte stöder variabler POST och / eller GET. Kontrollera parametern <b> variables_order </b> i php.ini.
-PHPSupportGD=Detta PHP stöder GD grafiska funktioner.
-PHPSupportCurl=Detta PHP stöder Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=Detta PHP stöder UTF8 funktioner.
-PHPSupportIntl=Detta PHP stöder Intl-funktioner.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=Detta stöder PHP sessioner.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Din PHP max session minne är inställt på <b>%s.</b> Detta bör vara nog.
 PHPMemoryTooLow=Ditt PHP max-sessionminne är inställt på <b> %s </b> bytes. Detta är för lågt. Ändra din <b> php.ini </b> för att ställa in <b> memory_limit </b> parameter till minst <b> %s </b> bytes.
diff --git a/htdocs/langs/sv_SE/intracommreport.lang b/htdocs/langs/sv_SE/intracommreport.lang
new file mode 100644
index 00000000000..8b6713062c8
--- /dev/null
+++ b/htdocs/langs/sv_SE/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=Lista
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/sv_SE/languages.lang b/htdocs/langs/sv_SE/languages.lang
index 8948b5489e8..3e1b532ef97 100644
--- a/htdocs/langs/sv_SE/languages.lang
+++ b/htdocs/langs/sv_SE/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanska (panama)
 Language_es_PY=Spanska (Paraguay)
 Language_es_PE=Spanska (Peru)
 Language_es_PR=Spanska (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanska (uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanska (Venezuela)
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index a87178c34c9..4820abfdd05 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Ta bort länk
 AddToDraft=Lägg till i utkast
 Update=Uppdatera
 Close=Stäng
+CloseAs=Set status to
 CloseBox=Ta bort widget från din instrumentpanel
 Confirm=Bekräfta
 ConfirmSendCardByMail=Vill du verkligen skicka innehållet på detta kort via mail till <b> %s </b>?
@@ -196,6 +197,7 @@ ReOpen=Öppnar igen
 Upload=Ladda upp
 ToLink=Länk
 Select=Välj
+SelectAll=Select all
 Choose=Välj
 Resize=Ändra storlek
 ResizeOrCrop=Ändra storlek eller beskära
@@ -256,6 +258,7 @@ Cards=Kort
 Card=Kort
 Now=Nu
 HourStart=Start timme
+Deadline=Deadline
 Date=Datum
 DateAndHour=Datum och timme
 DateToday=Dagens datum
@@ -264,8 +267,10 @@ DateStart=Startdatum
 DateEnd=Slutdatum
 DateCreation=Datum för skapande
 DateCreationShort=Creat. datum
+IPCreation=Creation IP
 DateModification=Ändringsdatum
 DateModificationShort=Ändr. datum
+IPModification=Modification IP
 DateLastModification=Senaste ändringsdatum
 DateValidation=Bekräftelsesdatum
 DateClosing=Sista dag
@@ -319,6 +324,7 @@ Morning=Morgon
 Afternoon=Eftermiddag
 Quadri=Quadri
 MonthOfDay=Dagens månad
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Sats
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Betalningsbelopp, ursprunglig valuta
 MulticurrencyAmountHT=Belopp (exkl. Skatt), ursprunglig valuta
 MulticurrencyAmountTTC=Belopp (inkl. Skatt), ursprunglig valuta
 MulticurrencyAmountVAT=Belopp skatt, ursprunglig valuta
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Belopp skatt 2
 AmountLT2=Belopp skatt 3
 AmountLT1ES=Belopp RE
@@ -487,6 +494,7 @@ By=Genom att
 From=Från
 FromDate=Från
 FromLocation=Från
+at=at
 to=till
 To=till
 and=och
@@ -509,6 +517,7 @@ Draft=Utkast
 Drafts=Utkast
 StatusInterInvoiced=faktureras
 Validated=Bekräftat
+ValidatedToProduce=Validated (To produce)
 Opened=Öppen
 OpenAll=Öppna alla)
 ClosedAll=Stängt (Alla)
@@ -655,6 +664,7 @@ Response=Svar
 Priority=Prioritet
 SendByMail=Skicka via e-post
 MailSentBy=E-post skickas med
+NotSent=Skickades inte
 TextUsedInTheMessageBody=E-organ
 SendAcknowledgementByMail=Skicka bekräftelsemail
 SendMail=Skicka e-post
@@ -836,6 +846,7 @@ ListOfTemplates=Lista över mallar
 Gender=Kön
 Genderman=Man
 Genderwoman=Kvinna
+Genderother=Andra
 ViewList=Visa lista
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Diverse
 Calendar=Kalender
 GroupBy=Grupp av...
 ViewFlatList=Visa plattlista
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Ta bort strängen '%s'
 SomeTranslationAreUncomplete=Några av de språk som erbjuds kan bara översättas delvis eller kan innehålla fel. Snälla hjälp att korrigera ditt språk genom att registrera dig på <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> för att lägga till dina förbättringar.
 DirectDownloadLink=Direkt nedladdningslänk (offentlig / extern)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Kundförsändelser
 SearchIntoExpenseReports=Räkningar
 SearchIntoLeaves=Lämna
 SearchIntoTickets=biljetter
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Leverantörsbetalningar
+SearchIntoMiscPayments=Diverse betalningar
 CommentLink=Kommentarer
 NbComments=Antal kommentarer
 CommentPage=Kommentarer utrymme
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Information
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Födelsedatum
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/sv_SE/members.lang b/htdocs/langs/sv_SE/members.lang
index e9173cd227d..bde1806a162 100644
--- a/htdocs/langs/sv_SE/members.lang
+++ b/htdocs/langs/sv_SE/members.lang
@@ -19,14 +19,12 @@ MembersCards=Medlemmars visitkort
 MembersList=Förteckning över medlemmar
 MembersListToValid=Förteckning över förslag till medlemmar (att bekräftas)
 MembersListValid=Förteckning över giltiga medlemmar
-MembersListUpToDate=Förteckning över giltiga medlemmar med aktuell prenumeration
-MembersListNotUpToDate=Förteckning över giltiga ledamöter med abonnemang föråldrad
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=Förteckning över avslutade medlemmar
 MembersListQualified=Förteckning över kvalificerade ledamöter
 MenuMembersToValidate=Förslag medlemmar
 MenuMembersValidated=Bekräftat medlemmar
-MenuMembersUpToDate=Hittills medlemmar
-MenuMembersNotUpToDate=Föråldrad medlemmar
 MenuMembersResiliated=Avslutade medlemmar
 MembersWithSubscriptionToReceive=Medlemmar med abonnemang för att ta emot
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Teckningsdag
 DateEndSubscription=Prenumeration slutdatum
 EndSubscription=Avsluta prenumeration
 SubscriptionId=Prenumeration id
+WithoutSubscription=Without subscription
 MemberId=Medlem id
 NewMember=Ny medlem
 MemberType=Medlem typ
@@ -81,7 +80,7 @@ DeleteType=Ta bort
 VoteAllowed=Röstning tillåten
 Physical=Fysisk
 Moral=Moral
-MorPhy=Naturen
+MorAndPhy=Moral and Physical
 Reenable=Återaktivera
 ResiliateMember=Avsluta en medlem
 ConfirmResiliateMember=Är du säker på att du vill säga upp den här medlemmen?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Skickar e-post vid bekräftande av nya medlemmar
 SendingEmailOnNewSubscription=Skickar e-post på ny prenumeration
 SendingReminderForExpiredSubscription=Skickar påminnelse för utgående abonnemang
 SendingEmailOnCancelation=Skickar e-post vid avbokning
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Ditt medlemskap har tagits emot.
 YourMembershipWasValidated=Ditt medlemskap bekräftades
@@ -167,6 +167,7 @@ MembersStatisticsByState=Medlemmar statistik från stat / provins
 MembersStatisticsByTown=Medlemmar statistik per kommun
 MembersStatisticsByRegion=Medlemsstatistik på region
 NbOfMembers=Antal medlemmar
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=Inga bekräftada medlemmar hittades
 MembersByCountryDesc=Denna skärm visar statistik om medlemmar med länder. Grafisk beror dock på Google online grafen service och är tillgänglig endast om en Internet-anslutning fungerar.
 MembersByStateDesc=Denna skärm visar dig statistik över ledamöter av stat / län / Canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistik
 LastMemberDate=Senaste medlemsdatum
 LatestSubscriptionDate=Senaste prenumerationsdatum
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information är offentliga
 NewMemberbyWeb=Ny ledamot till. Väntar på godkännande
 NewMemberForm=Ny medlem formen
diff --git a/htdocs/langs/sv_SE/mrp.lang b/htdocs/langs/sv_SE/mrp.lang
index c17d2ea60a6..fb36e45f2f3 100644
--- a/htdocs/langs/sv_SE/mrp.lang
+++ b/htdocs/langs/sv_SE/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP-område
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index 3ba8d873a03..35ad5dd24d9 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Flera prissegment per produkt / tjänst (varje kund är i ett prissegment)
 MultiPricesNumPrices=Antal pris
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Aktivera virtuella produkter (kit)
-AssociatedProducts=Virtuella produkter
-AssociatedProductsNumber=Antal produkter komponera denna produkt
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Antal förälder förpackningsartikel
 ParentProducts=Föräldraprodukter
-IfZeroItIsNotAVirtualProduct=Om 0 är denna produkt inte en virtuell produkt
-IfZeroItIsNotUsedByVirtualProduct=Om 0 är denna produkt inte använd i någon virtuell produkt
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Nyckelord filter
 CategoryFilter=Kategori filter
 ProductToAddSearch=Sök produkt att lägga till
 NoMatchFound=Ingen matchning hittades
 ListOfProductsServices=Lista över produkter / tjänster
-ProductAssociationList=Lista över produkter / tjänster som är komponent (er) av denna virtuella produkt / kit
-ProductParentList=Förteckning över produkter och tjänster med denna produkt som en komponent
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=Ett av valda produkten är förälder med nuvarande produkt
 DeleteProduct=Ta bort en produkt / tjänst
 ConfirmDeleteProduct=Är du säker på att du vill ta bort denna produkt / tjänst?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Tillgängliga globala värden:
 PriceMode=Prisläge
 PriceNumeric=Nummer
 DefaultPrice=Standardpris
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Öka / minska lagerposten vid föräldraändring
 ComposedProduct=Barnprodukter
 MinSupplierPrice=Lägsta köpkurs
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Leverantörsbeskrivning för produkten
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/sv_SE/recruitment.lang b/htdocs/langs/sv_SE/recruitment.lang
index 7e226c674aa..a88bbbbcb31 100644
--- a/htdocs/langs/sv_SE/recruitment.lang
+++ b/htdocs/langs/sv_SE/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Befattning
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang
index 5a3db05040a..f840a0301be 100644
--- a/htdocs/langs/sv_SE/stocks.lang
+++ b/htdocs/langs/sv_SE/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Rörelse ID %d
 ListMouvementStockProject=Förteckning över lagerpoströrelser förknippade med projektet
 StocksArea=Lager område
 AllWarehouses=Alla lager
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Inkludera även utkast till order
 Location=Plats
 LocationSummary=Kortnamn plats
@@ -122,8 +122,9 @@ DesiredStockDesc=Detta lagerbelopp kommer att vara det värde som används för
 StockToBuy=Att beställa
 Replenishment=Påfyllning
 ReplenishmentOrders=Påfyllningsbeställningar
-VirtualDiffersFromPhysical=Enligt ökning / minskning av optioner kan fysisk lager och virtuellt lager (fysiska + nuvarande order) skilja sig
-UseVirtualStockByDefault=Använd virtuellt lager som standard, i stället för fysiska lager, för påfyllning funktion
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Använd virtuellt lager
 UsePhysicalStock=Använd fysiskt lager
 CurentSelectionMode=Aktuellt urvalsläge
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=Denna produkt finns redan i listan
 SelectCategory=Kategori filter
 SelectFournisseur=Leverantörsfilter
 inventoryOnDate=Lager
-INVENTORY_DISABLE_VIRTUAL=Virtuell produkt (kit): Förminska inte lager av en barnprodukt
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Använd köpeskillingen om inget sista köppris kan hittas
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Tillåt att ändra PMP-värde för en produkt
 ColumnNewPMP=Ny enhet PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/sv_SE/suppliers.lang b/htdocs/langs/sv_SE/suppliers.lang
index 48307b7ac94..451dba89d0d 100644
--- a/htdocs/langs/sv_SE/suppliers.lang
+++ b/htdocs/langs/sv_SE/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Inköpsorder att fakturera
 NbDaysToDelivery=Leveransfördröjning (dagar)
 DescNbDaysToDelivery=Den längsta leveransförseningen för produkterna från denna order
 SupplierReputation=Leverantörs rykte
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Beställ inte
 NotTheGoodQualitySupplier=Låg kvalitet
 ReputationForThisProduct=Rykte
diff --git a/htdocs/langs/sv_SE/website.lang b/htdocs/langs/sv_SE/website.lang
index b9aaf7978d0..7770506abfb 100644
--- a/htdocs/langs/sv_SE/website.lang
+++ b/htdocs/langs/sv_SE/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Lägg till webbplats
 Webpage=Webbsida / container
 AddPage=Lägg till sida / behållare
 HomePage=Webbsida
-PageContainer=Sida / behållare
+PageContainer=Sida
 PreviewOfSiteNotYetAvailable=Förhandsgranskning av din webbplats <strong> %s </strong> ej tillgänglig än. Du måste först '<strong> Importera en fullständig webbplatsmall </strong>' eller bara '<strong> Lägg till en sida / behållare </strong>'.
 RequestedPageHasNoContentYet=Den begärda sidan med id %s har inget innehåll ännu, eller cachefilen .tpl.php har tagits bort. Redigera innehållet på sidan för att lösa detta.
 SiteDeleted=Webbplatsen '%s' raderas
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS-flöde
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/sw_SW/accountancy.lang b/htdocs/langs/sw_SW/accountancy.lang
index 7b59e33b296..3211a0b62df 100644
--- a/htdocs/langs/sw_SW/accountancy.lang
+++ b/htdocs/langs/sw_SW/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting expert
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=Journals
+Journals=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Chart of accounts
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bank accounts
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=By year
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index d7c4eb282cd..f1c41a3b62b 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
 CurrentTimeZone=TimeZone PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Interventions
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
+Permission13=Invalidate customer invoices
 Permission14=Validate customer invoices
 Permission15=Send customer invoices by email
 Permission16=Create payments for customer invoices
@@ -688,6 +694,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Read members
 Permission72=Create/modify members
 Permission74=Delete members
@@ -718,6 +728,7 @@ Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
@@ -825,10 +836,11 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Edition of field %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1282,7 +1322,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Global parameters
@@ -1523,7 +1564,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Level
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
@@ -1629,7 +1672,7 @@ AdvancedEditor=Advanced editor
 ActivateFCKeditor=Activate advanced editor for:
 FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
 FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
-MailToProject=Projects page
+MailToProject=Projects
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/sw_SW/banks.lang b/htdocs/langs/sw_SW/banks.lang
index 75f9549dca5..9500a5b8b2e 100644
--- a/htdocs/langs/sw_SW/banks.lang
+++ b/htdocs/langs/sw_SW/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/sw_SW/categories.lang b/htdocs/langs/sw_SW/categories.lang
index 9bb71984ecf..ba37a43b4ec 100644
--- a/htdocs/langs/sw_SW/categories.lang
+++ b/htdocs/langs/sw_SW/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/sw_SW/companies.lang b/htdocs/langs/sw_SW/companies.lang
index 92674363ced..dadff6a7894 100644
--- a/htdocs/langs/sw_SW/companies.lang
+++ b/htdocs/langs/sw_SW/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
 ProspectLevel=Prospect potential
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Currency
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/sw_SW/ecm.lang b/htdocs/langs/sw_SW/ecm.lang
index 43ddd3bf36f..71df60734fb 100644
--- a/htdocs/langs/sw_SW/ecm.lang
+++ b/htdocs/langs/sw_SW/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Search by keywords
 ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/sw_SW/hrm.lang b/htdocs/langs/sw_SW/hrm.lang
index 6cc7f6bef24..3b8f137e103 100644
--- a/htdocs/langs/sw_SW/hrm.lang
+++ b/htdocs/langs/sw_SW/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Employees
 Employee=Employee
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/sw_SW/install.lang b/htdocs/langs/sw_SW/install.lang
index 2d708c04147..63947dad154 100644
--- a/htdocs/langs/sw_SW/install.lang
+++ b/htdocs/langs/sw_SW/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=This PHP supports sessions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/sw_SW/intracommreport.lang b/htdocs/langs/sw_SW/intracommreport.lang
new file mode 100644
index 00000000000..3060300b974
--- /dev/null
+++ b/htdocs/langs/sw_SW/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=List
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/sw_SW/languages.lang b/htdocs/langs/sw_SW/languages.lang
index ee8df25c9ec..dbecd23ad26 100644
--- a/htdocs/langs/sw_SW/languages.lang
+++ b/htdocs/langs/sw_SW/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Kihispania (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Kihispania (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index 0af5c66f0e0..96c68cdcfa3 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Remove link
 AddToDraft=Add to draft
 Update=Update
 Close=Close
+CloseAs=Set status to
 CloseBox=Remove widget from your dashboard
 Confirm=Confirm
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Re-Open
 Upload=Upload
 ToLink=Link
 Select=Select
+SelectAll=Select all
 Choose=Choose
 Resize=Resize
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=Cards
 Card=Card
 Now=Now
 HourStart=Start hour
+Deadline=Deadline
 Date=Date
 DateAndHour=Date and hour
 DateToday=Today's date
@@ -264,8 +267,10 @@ DateStart=Start date
 DateEnd=End date
 DateCreation=Creation date
 DateCreationShort=Creat. date
+IPCreation=Creation IP
 DateModification=Modification date
 DateModificationShort=Modif. date
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
@@ -319,6 +324,7 @@ Morning=Morning
 Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Month of the day
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Rate
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Amount tax 2
 AmountLT2=Amount tax 3
 AmountLT1ES=Amount RE
@@ -487,6 +494,7 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
+at=at
 to=to
 To=to
 and=and
@@ -509,6 +517,7 @@ Draft=Draft
 Drafts=Drafts
 StatusInterInvoiced=Invoiced
 Validated=Validated
+ValidatedToProduce=Validated (To produce)
 Opened=Open
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Response
 Priority=Priority
 SendByMail=Send by email
 MailSentBy=Email sent by
+NotSent=Not sent
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
@@ -836,6 +846,7 @@ ListOfTemplates=List of templates
 Gender=Gender
 Genderman=Man
 Genderwoman=Woman
+Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Comments
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Information
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Date of birth
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/sw_SW/members.lang b/htdocs/langs/sw_SW/members.lang
index 5ef946ddf67..5812248b129 100644
--- a/htdocs/langs/sw_SW/members.lang
+++ b/htdocs/langs/sw_SW/members.lang
@@ -19,14 +19,12 @@ MembersCards=Members business cards
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
 SubscriptionId=Subscription id
+WithoutSubscription=Without subscription
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@@ -81,7 +80,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/sw_SW/mrp.lang b/htdocs/langs/sw_SW/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/sw_SW/mrp.lang
+++ b/htdocs/langs/sw_SW/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang
index b59aa2f7080..97db059594f 100644
--- a/htdocs/langs/sw_SW/products.lang
+++ b/htdocs/langs/sw_SW/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/sw_SW/recruitment.lang b/htdocs/langs/sw_SW/recruitment.lang
index 73e9a7fa07f..b775e78552e 100644
--- a/htdocs/langs/sw_SW/recruitment.lang
+++ b/htdocs/langs/sw_SW/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/sw_SW/stocks.lang b/htdocs/langs/sw_SW/stocks.lang
index 81163e8d4b0..660443bcded 100644
--- a/htdocs/langs/sw_SW/stocks.lang
+++ b/htdocs/langs/sw_SW/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/sw_SW/suppliers.lang b/htdocs/langs/sw_SW/suppliers.lang
index 51562b8bb7a..03b03c75269 100644
--- a/htdocs/langs/sw_SW/suppliers.lang
+++ b/htdocs/langs/sw_SW/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/sw_SW/website.lang b/htdocs/langs/sw_SW/website.lang
index 4b5294d5e43..03e042e4be6 100644
--- a/htdocs/langs/sw_SW/website.lang
+++ b/htdocs/langs/sw_SW/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang
index bef58b499b2..4c4d303f11c 100644
--- a/htdocs/langs/th_TH/accountancy.lang
+++ b/htdocs/langs/th_TH/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=การกำหนดค่าของบัญชีโมดูลผู้เชี่ยวชาญ
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=วารสาร
+Journals=วารสาร
 JournalFinancial=วารสารการเงิน
 BackToChartofaccounts=กลับผังบัญชี
 Chartofaccounts=ผังบัญชี
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=เพิ่มบัญชีบัญชี
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=บัญชีเงินฝากธนาคาร
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=ขายวารสาร
 ACCOUNTING_PURCHASE_JOURNAL=วารสารการสั่งซื้อ
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=โดยปี
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index 9aa5baa9218..c50cf3e78cf 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=ถอดตัวล็อคเชื่อมต่อ
 YourSession=เซสชั่นของคุณ
 Sessions=Users Sessions
 WebUserGroup=ผู้ใช้เว็บเซิร์ฟเวอร์ / กลุ่ม
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=ฐานข้อมูล charset ในการเก็บข้อมูล
 DBSortingCharset=ฐานข้อมูล charset ในการจัดเรียงข้อมูล
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=นอกจากนี้ถ้าคุณมีจำนวนมากของบุคคลที่สาม (> 100 000) คุณสามารถเพิ่มความเร็วโดยการตั้งค่า COMPANY_DONOTSEARCH_ANYWHERE คงเป็น 1 ใน Setup-> อื่น ๆ ค้นหาแล้วจะถูก จำกัด ในการเริ่มต้นของสตริง
 UseSearchToSelectContactTooltip=นอกจากนี้ถ้าคุณมีจำนวนมากของบุคคลที่สาม (> 100 000) คุณสามารถเพิ่มความเร็วโดยการตั้งค่า CONTACT_DONOTSEARCH_ANYWHERE คงเป็น 1 ใน Setup-> อื่น ๆ ค้นหาแล้วจะถูก จำกัด ในการเริ่มต้นของสตริง
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=ปิดใช้งาน JavaScript
 UsePreviewTabs=ใช้แท็บตัวอย่าง
 ShowPreview=แสดงตัวอย่าง
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=ตัวอย่างที่ไม่สามารถใช้ได้
 ThemeCurrentlyActive=รูปแบบที่ใช้งานอยู่ในปัจจุบัน
 CurrentTimeZone=เขต PHP (เซิร์ฟเวอร์)
@@ -271,7 +274,7 @@ NoticePeriod=ระยะเวลาการแจ้งให้ทราบ
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=บูรณาการของระบบ ClickToDial (ดอกจัน, ... )
-Module59Name=Bookmark4u
-Module59Desc=เพิ่มฟังก์ชั่นในการสร้างบัญชี Bookmark4u จากบัญชี Dolibarr
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=การแทรกแซง
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=ทรัพยากร
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=อ่านใบแจ้งหนี้ของลูกค้า
 Permission12=สร้าง / แก้ไขใบแจ้งหนี้ของลูกค้า
-Permission13=ใบแจ้งหนี้ของลูกค้า Unvalidate
+Permission13=Invalidate customer invoices
 Permission14=ตรวจสอบใบแจ้งหนี้ของลูกค้า
 Permission15=ส่งใบแจ้งหนี้ของลูกค้าโดยการส่งอีเมล์
 Permission16=สร้างใบแจ้งหนี้การชำระเงินสำหรับลูกค้า
@@ -688,6 +694,7 @@ Permission32=สร้าง / แก้ไขผลิตภัณฑ์
 Permission34=ลบผลิตภัณฑ์
 Permission36=ดู / จัดการผลิตภัณฑ์ที่ซ่อน
 Permission38=สินค้าส่งออก
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=อ่านการแทรกแซง
 Permission62=สร้าง / แก้ไขการแทรกแซง
 Permission64=ลบแทรกแซง
 Permission67=การแทรกแซงการส่งออก
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=อ่านสมาชิก
 Permission72=สร้าง / แก้ไขสมาชิก
 Permission74=ลบสมาชิก
@@ -718,6 +728,7 @@ Permission95=อ่านรายงาน
 Permission101=อ่านตอบรับ
 Permission102=สร้าง / แก้ไขตอบรับ
 Permission104=ตรวจสอบตอบรับ
+Permission105=Send sendings by email
 Permission106=ตอบรับการส่งออก
 Permission109=ลบตอบรับ
 Permission111=อ่านบัญชีการเงิน
@@ -825,10 +836,11 @@ Permission402=สร้าง / แก้ไขส่วนลด
 Permission403=ตรวจสอบส่วนลด
 Permission404=ลบส่วนลด
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=เงินเดือนส่งออก
+Permission517=Read payments of salaries of everybody
+Permission519=เงินเดือนส่งออก
 Permission520=อ่านสินเชื่อ
 Permission522=สร้าง / แก้ไขการให้กู้ยืมเงิน
 Permission524=ลบเงินให้สินเชื่อ
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=ได้รับผลจากการส่งออก
 Permission1202=สร้าง / แก้ไขการส่งออก
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=เรียกมวลของการนำเข้าข
 Permission1321=ส่งออกใบแจ้งหนี้ของลูกค้าคุณลักษณะและการชำระเงิน
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=อ่านงานที่กำหนดเวลาไว
 Permission23002=สร้าง / การปรับปรุงกำหนดเวลางาน
 Permission23003=ลบงานที่กำหนด
 Permission23004=การดำเนินงานที่กำหนด
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=อ่านการทำธุรกรรม
 Permission50202=การทำธุรกรรมนำเข้า
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=การตั้งค่าที่บันทึกไว้
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=ฉลากใช้โดยเริ่มต้นถ้
 LabelOnDocuments=ป้ายเกี่ยวกับเอกสาร
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=ในตอนท้ายของเดือน
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=ชื่อเบราว์เซอร์
 BrowserOS=ระบบปฏิบัติการเบราว์เซอร์
 ListOfSecurityEvents=รายการ Dolibarr เหตุการณ์การรักษาความปลอดภัย
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=นำเข้า MySQL
-ForcedToByAModule= <b>กฎนี้ถูกบังคับให้% โดยการเปิดใช้งานโมดูล</b>
+ForcedToByAModule=<b>กฎนี้ถูกบังคับให้% โดยการเปิดใช้งานโมดูล</b>
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=ฉบับของสนาม% s
 FillThisOnlyIfRequired=ตัวอย่าง: 2 (กรอกข้อมูลเฉพาะในกรณีที่เขตเวลาชดเชยปัญหาที่มีประสบการณ์)
@@ -1282,7 +1322,7 @@ GetBarCode=รับบาร์โค้ด
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=กลับสร้างรหัสผ่านตามขั้นตอนวิธี Dolibarr ภายใน: 8 ตัวอักษรที่ใช้ร่วมกันที่มีตัวเลขและตัวอักษรตัวพิมพ์เล็ก
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=ช่องทำเครื่องหมายยืนยันที่จะส่งอีเมลไปยังสมาชิก (การตรวจสอบหรือการสมัครสมาชิกใหม่) เป็นตามค่าเริ่มต้น
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=ติดตั้ง LDAP
 LDAPGlobalParameters=พารามิเตอร์ทั่วโลก
@@ -1523,7 +1564,9 @@ LDAPDescValues=ค่าตัวอย่างได้รับการอ
 ForANonAnonymousAccess=สำหรับการเข้าถึงรับรองความถูกต้อง (สำหรับการเข้าถึงการเขียนตัวอย่าง)
 PerfDolibarr=ผลการดำเนินงานการติดตั้ง / รายงานการเพิ่มประสิทธิภาพ
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=แคชปรับใช้
 MemcachedNotAvailable=ไม่มีแคช applicative พบ คุณสามารถเพิ่มประสิทธิภาพการทำงานโดยการติดตั้งเซิร์ฟเวอร์แคช Memcached โมดูลและสามารถที่จะใช้เซิร์ฟเวอร์แคชนี้ <br> ข้อมูลเพิ่มเติมที่นี่ <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a> <br> โปรดทราบว่าจำนวนมากของผู้ให้บริการเว็บโฮสติ้งไม่ได้ให้เซิร์ฟเวอร์แคชดังกล่าว
 MemcachedModuleAvailableButNotSetup=โมดูล memcached สำหรับแคช applicative พบ แต่การตั้งค่าของโมดูลยังไม่สมบูรณ์
@@ -1571,9 +1614,9 @@ SyslogLevel=ชั้น
 SyslogFilename=ชื่อแฟ้มและเส้นทาง
 YouCanUseDOL_DATA_ROOT=คุณสามารถใช้ DOL_DATA_ROOT / dolibarr.log สำหรับล็อกไฟล์ใน Dolibarr "เอกสาร" ไดเรกทอรี คุณสามารถตั้งค่าเส้นทางที่แตกต่างกันในการจัดเก็บไฟล์นี้
 ErrorUnknownSyslogConstant=% s คงไม่ได้เป็นที่รู้จักกันอย่างต่อเนื่อง Syslog
-OnlyWindowsLOG_USER=Windows เท่านั้นสนับสนุน LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=บริจาคการติดตั้งโมดูล
@@ -1629,7 +1672,7 @@ AdvancedEditor=ตกแต่ง
 ActivateFCKeditor=เปิดใช้งานขั้นสูงสำหรับบรรณาธิการ:
 FCKeditorForCompany=WYSIWIG สร้าง / ฉบับคำอธิบายองค์ประกอบและทราบ (ยกเว้นผลิตภัณฑ์ / บริการ)
 FCKeditorForProduct=สร้าง WYSIWIG / รุ่นของผลิตภัณฑ์ / คำอธิบายการบริการและการบันทึก
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= สร้าง WYSIWIG / รุ่นสำหรับ eMailings มวล (Tools-> ส่งอีเมล)
 FCKeditorForUserSignature=สร้าง WYSIWIG / ฉบับลายเซ็นของผู้ใช้
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=เมนูลบ
+Menu=Menu
 Menus=เมนู
 TreeMenuPersonalized=เมนูส่วนบุคคล
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=เมนูใหม่
-Menu=เลือกเมนู
 MenuHandler=จัดการเมนู
 MenuModule=โมดูลที่มา
 HideUnauthorizedMenu= ซ่อนเมนูไม่ได้รับอนุญาต (สีเทา)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=คลิกเพื่อกดติดตั้งโมดูล
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=รวมถึงเส้นทาง (ตามที่กำหนดลงในตัวแปร s%)
 ExpenseReportsSetup=การติดตั้งโมดูลรายงานค่าใช้จ่าย
 TemplatePDFExpenseReports=เอกสารแม่แบบในการสร้างเอกสารรายงานค่าใช้จ่าย
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=ไม่มีโมดูลสามารถจัดการกับการเพิ่มขึ้นของสต็อกอัตโนมัติถูกเปิดใช้งาน การเพิ่มขึ้นของสต็อกจะทำได้ในการป้อนข้อมูลด้วยตนเอง
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=บุคคลที่สาม
 MailToMember=สมาชิก
 MailToUser=ผู้ใช้
-MailToProject=Projects page
+MailToProject=โครงการ
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=ไปรษณีย์
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/th_TH/banks.lang b/htdocs/langs/th_TH/banks.lang
index 2f7f880ef42..fd3ab8f2696 100644
--- a/htdocs/langs/th_TH/banks.lang
+++ b/htdocs/langs/th_TH/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/th_TH/categories.lang b/htdocs/langs/th_TH/categories.lang
index 6c0b56b024b..1e978741186 100644
--- a/htdocs/langs/th_TH/categories.lang
+++ b/htdocs/langs/th_TH/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=แท็ก / ประเภทการติดตั้ง
 CategorieRecursiv=การเชื่อมโยงที่มีแท็กแม่ / หมวดหมู่โดยอัตโนมัติ
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=เพิ่มสินค้า / บริการดังต่อไปนี้
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=แสดงแท็ก / หมวดหมู่
 ByDefaultInList=โดยค่าเริ่มต้นในรายการ
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/th_TH/companies.lang b/htdocs/langs/th_TH/companies.lang
index acdb1123b2d..698f595ebaf 100644
--- a/htdocs/langs/th_TH/companies.lang
+++ b/htdocs/langs/th_TH/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=ศหมายเลข 1 (USt. -IdNr)
 ProfId2AT=ศหมายเลข 2 (USt. -Nr)
 ProfId3AT=ศหมายเลข 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=ศหมายเลข 1 (เอบี)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=ศหมายเลข 1 (หมายเลขมืออาชี
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao เทศบาล)
 ProfId4BR=ซีพีเอฟ
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=ศหมายเลข 1 (หมายเลขของรัฐบาลกลาง)
 ProfId4CH=ศหมายเลข 2 (Record พาณิชย์จำนวน)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=ศหมายเลข 1 (RUT)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=ศหมายเลข 1 (USt. -IdNr)
 ProfId2DE=ศหมายเลข 2 (USt. -Nr)
 ProfId3DE=ศหมายเลข 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=ศหมายเลข 1 (CIF / NIF)
 ProfId2ES=ศหมายเลข 2 (หมายเลขประกันสังคม)
 ProfId3ES=ศหมายเลข 3 (CNAE)
 ProfId4ES=ศหมายเลข 4 (วิทยาลัยจำนวน)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=ศหมายเลข 1 (ไซเรน)
 ProfId2FR=ศหมายเลข 2 (SIRET)
 ProfId3FR=ศหมายเลข 3 (NAF, APE เก่า)
 ProfId4FR=ศหมายเลข 4 (RCS / RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=ทะเบียนเลขที่
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=ศหมายเลข 3 (SRVC ภาษี)
 ProfId4IN=ศหมายเลข 4
 ProfId5IN=Id ศ 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=ศ Id 1 (RC)
 ProfId2MA=ศ Id 2 (Patente)
 ProfId3MA=ศ Id 3 (IF)
 ProfId4MA=ศ Id 4 (CNSS)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Id ศที่ 1 (RFC)
 ProfId2MX=ศหมายเลข 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK Nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=ศหมายเลข 1 (NIPC)
 ProfId2PT=ศหมายเลข 2 (หมายเลขประกันสังคม)
 ProfId3PT=ศหมายเลข 3 (Record พาณิชย์จำนวน)
 ProfId4PT=ศหมายเลข 4 (เรือน)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=ศหมายเลข 1 (OGRN)
 ProfId2RU=ศหมายเลข 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=ตรวจสอบไม่ได้ บริการตรวจสอบไม่ได้ให้โดยรัฐสมาชิก (% s)
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=ที่อาจเกิดขึ้น
 ProspectLevel=Prospect ที่มีศักยภาพ
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=เงินตรา
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/th_TH/ecm.lang b/htdocs/langs/th_TH/ecm.lang
index 49c71627980..d93d9646e22 100644
--- a/htdocs/langs/th_TH/ecm.lang
+++ b/htdocs/langs/th_TH/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=ค้นหาตามคำหลัก
 ECMSearchByEntity=ค้นหาตามวัตถุ
 ECMSectionOfDocuments=ไดเรกทอรีของเอกสาร
 ECMTypeAuto=อัตโนมัติ
-ECMDocsBySocialContributions=เอกสารที่เชื่อมโยงกับภาษีทางสังคมหรือทางการคลัง
-ECMDocsByThirdParties=เอกสารที่เชื่อมโยงกับบุคคลที่สาม
-ECMDocsByProposals=เอกสารที่เชื่อมโยงกับข้อเสนอ
-ECMDocsByOrders=เอกสารที่เชื่อมโยงกับคำสั่งซื้อของลูกค้า
-ECMDocsByContracts=เอกสารที่เชื่อมโยงกับสัญญา
-ECMDocsByInvoices=เอกสารที่เชื่อมโยงกับใบแจ้งหนี้ลูกค้า
-ECMDocsByProducts=เอกสารที่เชื่อมโยงกับผลิตภัณฑ์
-ECMDocsByProjects=เอกสารที่เชื่อมโยงกับโครงการ
-ECMDocsByUsers=เอกสารที่เชื่อมโยงกับผู้ใช้งาน
-ECMDocsByInterventions=เอกสารที่เชื่อมโยงกับการแทรกแซง
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=ไดเรกทอรีไม่มีที่สร้างขึ้น
 ShowECMSection=ไดเรกทอรีแสดง
 DeleteSection=ลบไดเรกทอรี
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/th_TH/hrm.lang b/htdocs/langs/th_TH/hrm.lang
index 1139da27b97..d449dc659a7 100644
--- a/htdocs/langs/th_TH/hrm.lang
+++ b/htdocs/langs/th_TH/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Employees
 Employee=ลูกจ้าง
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/th_TH/install.lang b/htdocs/langs/th_TH/install.lang
index 92b74f7033f..1f0b347ade6 100644
--- a/htdocs/langs/th_TH/install.lang
+++ b/htdocs/langs/th_TH/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=<b>การกำหนดค่าไฟล์% s</b> เขียนได้
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=PHP นี้สนับสนุนการประชุม
 PHPSupportPOSTGETOk=PHP นี้สนับสนุนตัวแปร POST และ GET
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=PHP นี้สนับสนุนการประชุม
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=หน่วยความจำสูงสุด PHP <b>เซสชั่นของคุณตั้ง%</b> s นี้ควรจะเพียงพอ
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/th_TH/intracommreport.lang b/htdocs/langs/th_TH/intracommreport.lang
new file mode 100644
index 00000000000..165701553fc
--- /dev/null
+++ b/htdocs/langs/th_TH/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=รายการ
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/th_TH/languages.lang b/htdocs/langs/th_TH/languages.lang
index 85ebcd69f94..da1747a0a47 100644
--- a/htdocs/langs/th_TH/languages.lang
+++ b/htdocs/langs/th_TH/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=สเปน (ปารากวัย)
 Language_es_PE=เสปน (เปรู)
 Language_es_PR=สเปน (เปอร์โตริโก)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index 0ed430072db..71d84671325 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Remove link
 AddToDraft=Add to draft
 Update=ปรับปรุง
 Close=ใกล้
+CloseAs=Set status to
 CloseBox=Remove widget from your dashboard
 Confirm=ยืนยัน
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Re: เปิด
 Upload=Upload
 ToLink=ลิงค์
 Select=เลือก
+SelectAll=Select all
 Choose=เลือก
 Resize=การปรับขนาด
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=การ์ด
 Card=บัตร
 Now=ตอนนี้
 HourStart=เริ่มต้นชั่วโมง
+Deadline=Deadline
 Date=วันที่
 DateAndHour=วันที่และชั่วโมง
 DateToday=Today's date
@@ -264,8 +267,10 @@ DateStart=วันที่เริ่มต้น
 DateEnd=วันที่สิ้นสุด
 DateCreation=วันที่สร้าง
 DateCreationShort=Creat. date
+IPCreation=Creation IP
 DateModification=วันที่แก้ไข
 DateModificationShort=Modif วันที่
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=วันที่ตรวจสอบ
 DateClosing=วันปิดสมุดทะเบียน
@@ -319,6 +324,7 @@ Morning=ตอนเช้า
 Afternoon=บ่าย
 Quadri=Quadri
 MonthOfDay=เดือนของวัน
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=ล้าน
 Rate=ประเมิน
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=จำนวนเงินภาษี 2
 AmountLT2=จำนวนเงินภาษี 3
 AmountLT1ES=จำนวน RE
@@ -487,6 +494,7 @@ By=โดย
 From=จาก
 FromDate=จาก
 FromLocation=จาก
+at=at
 to=ไปยัง
 To=ไปยัง
 and=และ
@@ -509,6 +517,7 @@ Draft=ร่าง
 Drafts=ร่าง
 StatusInterInvoiced=Invoiced
 Validated=ผ่านการตรวจสอบ
+ValidatedToProduce=Validated (To produce)
 Opened=เปิด
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=คำตอบ
 Priority=ลำดับความสำคัญ
 SendByMail=Send by email
 MailSentBy=อีเมล์ที่ส่งมาจาก
+NotSent=ส่งไม่ได้
 TextUsedInTheMessageBody=ร่างกายอีเมล์
 SendAcknowledgementByMail=Send confirmation email
 SendMail=ส่งอีเมล
@@ -836,6 +846,7 @@ ListOfTemplates=รายชื่อของแม่แบบ
 Gender=Gender
 Genderman=คน
 Genderwoman=หญิง
+Genderother=อื่น ๆ
 ViewList=มุมมองรายการ
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=เบ็ดเตล็ด
 Calendar=ปฏิทิน
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=รายงานค่าใช้จ่าย
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=ความคิดเห็น
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=ข้อมูล
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=วันเกิด
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/th_TH/members.lang b/htdocs/langs/th_TH/members.lang
index c736722b2f6..90071b79ff1 100644
--- a/htdocs/langs/th_TH/members.lang
+++ b/htdocs/langs/th_TH/members.lang
@@ -19,14 +19,12 @@ MembersCards=สมาชิกบัตรธุรกิจ
 MembersList=รายชื่อสมาชิก
 MembersListToValid=รายชื่อสมาชิกร่าง (ที่จะถูกตรวจสอบ)
 MembersListValid=รายชื่อสมาชิกที่ถูกต้อง
-MembersListUpToDate=รายชื่อสมาชิกที่ถูกต้องที่มีถึงวันที่สมัครสมาชิก
-MembersListNotUpToDate=รายชื่อสมาชิกที่ถูกต้องด้วยการสมัครสมาชิกออกจากวันที่
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=รายชื่อสมาชิกที่สิ้นสุดสมาชิกภาพ
 MembersListQualified=รายชื่อสมาชิกที่ผ่านการรับรอง
 MenuMembersToValidate=สมาชิกร่าง
 MenuMembersValidated=สมาชิกผ่านการตรวจสอบ
-MenuMembersUpToDate=ขึ้นอยู่กับสมาชิกในวันที่
-MenuMembersNotUpToDate=ออกจากสมาชิกวัน
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=สมาชิกที่มีการสมัครสมาชิกจะได้รับ
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=วันที่สมัครสมาชิก
 DateEndSubscription=วันที่สิ้นสุดการสมัครสมาชิก
 EndSubscription=สมัครสมาชิก End
 SubscriptionId=รหัสการจองซื้อ
+WithoutSubscription=Without subscription
 MemberId=รหัสสมาชิก
 NewMember=สมาชิกใหม่
 MemberType=ประเภทสมาชิก
@@ -81,7 +80,7 @@ DeleteType=ลบ
 VoteAllowed=โหวตที่ได้รับอนุญาต
 Physical=กายภาพ
 Moral=ศีลธรรม
-MorPhy=ธรรมชาติ
+MorAndPhy=Moral and Physical
 Reenable=reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=สถิติสมาชิกโดยรัฐ / 
 MembersStatisticsByTown=สถิติสมาชิกโดยเมือง
 MembersStatisticsByRegion=สถิติสมาชิกตามภูมิภาค
 NbOfMembers=จำนวนสมาชิก
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=ไม่มีสมาชิกตรวจสอบพบว่า
 MembersByCountryDesc=แสดงหน้าจอนี้คุณสถิติเกี่ยวกับประเทศสมาชิก กราฟฟิค แต่ขึ้นอยู่กับบริการของ Google กราฟออนไลน์และสามารถใช้ได้เฉพาะในกรณีที่การเชื่อมต่ออินเทอร์เน็ตจะเป็นคนที่ทำงาน
 MembersByStateDesc=แสดงหน้าจอนี้คุณสถิติเกี่ยวกับสมาชิกโดยรัฐ / จังหวัด / ตำบล
@@ -176,6 +177,7 @@ MenuMembersStats=สถิติ
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=ข้อมูลเป็นสาธารณะ
 NewMemberbyWeb=สมาชิกใหม่ที่เพิ่ม รอการอนุมัติ
 NewMemberForm=แบบฟอร์มการสมัครสมาชิกใหม่
diff --git a/htdocs/langs/th_TH/mrp.lang b/htdocs/langs/th_TH/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/th_TH/mrp.lang
+++ b/htdocs/langs/th_TH/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index 23bafa71159..08f045c48a9 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=จำนวนของราคา
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=จำนวนผู้ปกครองผลิตภัณฑ์บรรจุภัณฑ์
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=กรองคำ
 CategoryFilter=ตัวกรองหมวดหมู่
 ProductToAddSearch=ค้นหาสินค้าที่จะเพิ่ม
 NoMatchFound=ไม่พบการแข่งขัน
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=หนึ่งในผลิตภัณฑ์ที่เลือกเป็นผู้ปกครองกับผลิตภัณฑ์ในปัจจุบัน
 DeleteProduct=ลบสินค้า / บริการ
 ConfirmDeleteProduct=คุณแน่ใจหรือว่าต้องการลบสินค้า / บริการนี​​้
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=ค่าระดับโลกที่มีจ
 PriceMode=โหมดราคา
 PriceNumeric=จำนวน
 DefaultPrice=ราคาเริ่มต้น
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=เพิ่มขึ้น / ลดลงหุ้นเกี่ยวกับการเปลี่ยนแปลงผู้ปกครอง
 ComposedProduct=Child products
 MinSupplierPrice=ราคารับซื้อขั้นต่ำ
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/th_TH/recruitment.lang b/htdocs/langs/th_TH/recruitment.lang
index e6b0c0ff890..45af9e2bfbb 100644
--- a/htdocs/langs/th_TH/recruitment.lang
+++ b/htdocs/langs/th_TH/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/th_TH/stocks.lang b/htdocs/langs/th_TH/stocks.lang
index 95ce6f5a07f..25e162a70a3 100644
--- a/htdocs/langs/th_TH/stocks.lang
+++ b/htdocs/langs/th_TH/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=พื้นที่โกดัง
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=สถานที่
 LocationSummary=ที่ตั้งชื่อสั้น
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=ต้องการสั่งซื้อ
 Replenishment=การเสริมกำลัง
 ReplenishmentOrders=คำสั่งการเติมเต็ม
-VirtualDiffersFromPhysical=ตามการเพิ่ม / ลดตัวเลือกหุ้นหุ้นหุ้นทางกายภาพและเสมือน (คำสั่งซื้อในปัจจุบันทางกายภาพ +) อาจแตกต่างกัน
-UseVirtualStockByDefault=ใช้หุ้นเสมือนโดยค่าเริ่มต้นแทนหุ้นทางกายภาพสำหรับคุณลักษณะการเติมเต็ม
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=ใช้หุ้นเสมือนจริง
 UsePhysicalStock=ใช้หุ้นทางกายภาพ
 CurentSelectionMode=โหมดการเลือกปัจจุบัน
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=ตัวกรองหมวดหมู่
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/th_TH/suppliers.lang b/htdocs/langs/th_TH/suppliers.lang
index a272100e086..4c536fea3e8 100644
--- a/htdocs/langs/th_TH/suppliers.lang
+++ b/htdocs/langs/th_TH/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/th_TH/website.lang b/htdocs/langs/th_TH/website.lang
index 551758dc204..d905e966535 100644
--- a/htdocs/langs/th_TH/website.lang
+++ b/htdocs/langs/th_TH/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=หน้า
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index 73ebe7cb877..9abb47b577e 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Hizmet için varsayılan
 DefaultForProduct=Ürün için varsayılan
 CantSuggest=Öneri yok
 AccountancySetupDoneFromAccountancyMenu=Muhasebenin çoğu kurulumu %s menüsünden yapılır.
-ConfigAccountingExpert=Hesap uzmanı modülü yapılandırması
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Günlükleme
-Journaux=Günlükler
+Journals=Günlükler
 JournalFinancial=Mali günlükler
 BackToChartofaccounts=Hesap planı cirosu
 Chartofaccounts=Hesap planı
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Mevcut özel hesap
 AssignDedicatedAccountingAccount=Atanacak yeni hesap
 InvoiceLabel=Fatura etiketi
@@ -33,8 +35,8 @@ OtherInfo=Diğer Bilgiler
 DeleteCptCategory=Muhasebe hesabını gruptan kaldırın
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Günlükleme durumu
-AlreadyInGeneralLedger=Zaten defterlerde tutulmuş
-NotYetInGeneralLedger=Henüz büyük defterde muhasebeleştirilmedi
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Hesaba göre detayları göster
 AccountWithNonZeroValues=Sıfır olmayan değerlere sahip hesaplar
@@ -43,7 +45,9 @@ CountriesInEEC=Avrupa Ekonomi Topluluğu'ndaki Ülkeler
 CountriesNotInEEC=Avrupa Ekonomi Topluluğu'nda Olmayan Ülkeler
 CountriesInEECExceptMe=%s hariç Avrupa Ekonomi Topluluğu ülkeleri
 CountriesExceptMe=%s hariç tüm ülkeler
-AccountantFiles=Muhasebe belgelerini dışa aktarma
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Müşteriler için ana muhasebe hesabı kurulumda tanımlı değil
 MainAccountForSuppliersNotDefined=Tedarikçiler için ana muhasebe hesabı kurulumda tanımlı değil
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=ADIM %s: İşlemler ekleyin ya da mevcut işlemleri d
 
 AccountancyAreaDescClosePeriod=ADIM %s: Dönemi kapatın, böylece ileride bir değişiklik yapamayız.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=Kurulumda zorunlu bir adım tamamlanmadı (muhasebe kodu günlüğü tüm banka hesapları için tanımlı değil)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Etkin hesap planı seç
 ChangeAndLoad=Değiştir ve yükle
 Addanaccount=Muhasebe hesabı ekle
@@ -89,6 +93,8 @@ SubledgerAccount=Yardımcı defter hesabı
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Muhasebe hesabını göster
 ShowAccountingJournal=Muhasebe günlüğünü göster
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Önerilen muhasebe hesabı
 MenuDefaultAccounts=Varsayılan hesaplar
 MenuBankAccounts=Banka hesapları
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Gider raporu bağlama
 CreateMvts=Yeni işlem oluştur
 UpdateMvts=İşlemi değiştir
 ValidTransaction=İşlemi doğrula
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Büyük Defter
+BookkeepingSubAccount=Subledger
 AccountBalance=Hesap bakiyesi
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Satış günlüğü
 ACCOUNTING_PURCHASE_JOURNAL=Alış günlüğü
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Muhasebe hesabının bekletilmesi
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Önceden tanımlanmış gruplar tarafından
 ByPersonalizedAccountGroups=Kişiselleştirilmiş gruplar tarafından
 ByYear=Yıla göre
 NotMatch=Ayarlanmamış
-DeleteMvt=Büyük defter satırlarını sil
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Silinecek yıl
 DelJournal=Silinecek günlük
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Gider raporları günlüğü
 DescFinanceJournal=Banka hesabından yapılan tüm ödeme türlerini içeren finans günlüğü
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=KDV için hesap tanımlı değil
 ThirdpartyAccountNotDefined=Üçüncü parti için hesap tanımlı değil
 ProductAccountNotDefined=Ürün için hesap tanımlı değil
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Girişlerin sayısı
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Hesap planı Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index b838d2f46ff..fc4430e87ca 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Bağlantı kilidini kaldır
 YourSession=Oturumunuz
 Sessions=Kullanıcı Oturumları
 WebUserGroup=Web sunucusu kullanıcısı/grubu
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=PHP yapılandırmanız aktif oturumların listelenmesine izin vermiyor gibi görünüyor. Oturumları kaydetmek için kullanılan dizin (<b>%s</b>) korunuyor olabilir (örneğin, İşletim Sistemi izinleri veya open_basedir PHP direkti tarafından).
 DBStoringCharset=Veri depolamak için veri tabanı karakter seti
 DBSortingCharset=Veri sıralamak için veri tabanı karakter seti
@@ -71,7 +73,7 @@ DisableJavascriptNote=Not: Test veya hata ayıklama amaçlıdır. Görme engelli
 UseSearchToSelectCompanyTooltip=Ayrıca çok fazla sayıda üçüncü partiye sahipseniz (>100.000), Ayarlar->Diğer Ayarlar menüsünden COMPANY_DONOTSEARCH_ANYWHERE sabitini 1 olarak ayarlayarak hızı arttırabilirsiniz. Bu durumda, arama dizenin başlangıcıyla sınırlı olacaktır.
 UseSearchToSelectContactTooltip=Ayrıca çok fazla sayıda üçüncü partiye sahipseniz (>100.000), Ayarlar->Diğer Ayarlar menüsünden CONTACT_DONOTSEARCH_ANYWHERE sabitini 1 olarak ayarlayarak hızı arttırabilirsiniz. Bu durumda, arama dizenin başlangıcıyla sınırlı olacaktır.
 DelaiedFullListToSelectCompany=Aşağı açılır listeden Üçüncü Parti içeriği listelemeden önce bir tuşa basarak arama yapmanızı bekler.<br>Çok sayıda üçüncü parti mevcutsa bu performansı artırabilir, fakat daha az kullanışlıdır
-DelaiedFullListToSelectContact=Aşağı açılır listeden Kişi içeriği listelemeden önce bir tuşa basarak arama yapmanızı bekler.<br>Çok sayıda kişi mevcutsa bu performansı artırabilir, fakat daha az kullanışlıdır
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Aramayı tetikleyecek karakter sayısı: %s
 NumberOfBytes=Bayt Sayısı
 SearchString=Arama dizisi
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=Bir üçüncü parti belgesinde, başka bir
 JavascriptDisabled=JavaScript devre dışı
 UsePreviewTabs=Önizleme sekmelerini kullan
 ShowPreview=Önizleme göster
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Önizleme yok
 ThemeCurrentlyActive=Geçerli etkin tema
 CurrentTimeZone=PHP Saat Dilimi (sunucu)
@@ -271,7 +274,7 @@ NoticePeriod=Bildirim dönemi
 NewByMonth=Aya göre yeni
 Emails=E-postalar
 EMailsSetup=E-posta kurulumları
-EMailsDesc=Bu sayfa, e-posta gönderimi için varsayılan PHP parametrelerinizin üzerine yazma imkanı verir. Unix/Linux OS sistemindeki çoğu durumda PHP kurulumu doğrudur ve bu parametreler gereksizdir.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=E-posta gönderici profilleri
 EMailsSenderProfileDesc=Bu bölümü boş bırakabilirsiniz. Buraya gireceğiniz e-posta adresleri, yeni bir e-posta adresi yazdığınızda comboboxtaki olası gönderenler listesine eklenecekler.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Portu (php.ini içinde varsayılan değer: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (gönderme sunucusu kimlik doğrulama gerektiriyorsa)
 MAIN_MAIL_SMTPS_PW=SMTP Şifresi (gönderme sunucusu kimlik doğrulama gerektiriyorsa)
 MAIN_MAIL_EMAIL_TLS=TLS (SSL) şifreleme kullan
 MAIN_MAIL_EMAIL_STARTTLS=TLS (STARTTLS) şifreleme kullan
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=E-posta imzası oluşturmak için DKIM kullan
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Dkim ile kullanım için Eposta Alan adı
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Dkim seçicinin adı
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=PDF oluşturmada kullanılan kütüphane
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=Varsayılan olarak, Tedarikçi Siparişlerinin 2 farklı kullanıcı tarafından oluşturulması ve onaylanması gerekir (bir adım/kullanıcı oluşturacak ve bir adım/kullanıcı onaylayacak. Kullanıcının hem oluşturma hem de onaylama izni varsa, bir adım/kullanıcı yeterli olacaktır). Miktar belirli bir değerin üzerindeyse bu seçenekle üçüncü bir adım/kullanıcı onayı vermeyi isteyebilirsiniz (böylece 3 adım zorunlu olacaktır: 1=doğrulama, 2=ilk onay ve 3=miktar yeterli ise ikinci onay).<br>Tek onay (2 adım) yeterli ise bunu boş olarak ayarlayın, ikinci bir onay (3 adım) her zaman gerekiyorsa çok düşük bir değere ayarlayın (0.1).
 UseDoubleApproval=Tutar (vergi öncesi) bu tutardan yüksekse 3 aşamalı bir onaylama kullanın...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Açıklamayı görmek için tıkla
 DependsOn=Bu modülün gerektirdiği modül (ler)
 RequiredBy=Bu modül, modül (ler) için zorunludur
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=TıklaAra
 Module58Desc=TıklaAra entegrasyonu
-Module59Name=Bookmark4u
-Module59Desc=Bookmark4u oluşturmak için Dolibarr hesabından işlev ekleyin
 Module60Name=Çıkartmalar
 Module60Desc=Çıkartmaların yönetimi
 Module70Name=Müdahaleler
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Muhasebe (çift giriş)
-Module50400Desc=Muhasebe yönetimi (çift girişler, genel ve yardımcı defterleri destekleme). Defteri, diğer birçok muhasebe yazılımı formatında dışa aktarın.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=IPP Yazdır
 Module54000Desc=Cups IPP arabirimini kullanarak belgeleri açmadan doğrudan yazdırma (Yazıcının sunucudan görünür olması ve CUPS'un sunucuda yüklü olması gerekir).
 Module55000Name=Anket, Araştırma ya da Oylama
@@ -671,7 +677,7 @@ Module63000Name=Kaynaklar
 Module63000Desc=Etkinliklere tahsis etmek için kaynakları (yazıcılar, arabalar, odalar, ...) yönetin
 Permission11=Müşteri faturalarını oku
 Permission12=Müşteri faturaları oluştur/düzenle
-Permission13=Müşteri faturalarının doğrulamasını kaldır
+Permission13=Invalidate customer invoices
 Permission14=Müşteri faturalarını doğrula
 Permission15=Müşteri faturalarını e-posta ile gönder
 Permission16=Müşteri fatura ödemeleri oluşturun
@@ -688,6 +694,7 @@ Permission32=Ürün oluştur/düzenle
 Permission34=Ürün sil
 Permission36=Gizli ürünleri gör/yönet
 Permission38=Ürünleri dışa aktar
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Proje sil (paylaşılan proje ve iletişim kurduğum projeler)
@@ -696,6 +703,9 @@ Permission61=Müdahale oku
 Permission62=Müdahale oluştur/düzenle
 Permission64=Müdahale sil
 Permission67=Müdahaleleri dışa aktar
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Üye oku
 Permission72=Üye oluştur/düzenle
 Permission74=Üye sil
@@ -718,6 +728,7 @@ Permission95=Rapor oku
 Permission101=Gönderilenleri oku
 Permission102=Gönderilenleri oluştur/düzenle
 Permission104=Gönderilenleri doğrula
+Permission105=Send sendings by email
 Permission106=Gönderilenleri dışa aktar
 Permission109=Gönderilenleri sil
 Permission111=Finansal tabloları oku
@@ -825,10 +836,11 @@ Permission402=İndirim oluştur/değiştir
 Permission403=İndirim doğrula
 Permission404=İndirim sil
 Permission430=Use Debug Bar
-Permission511=Maaş ödemelerini okuyun
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Maaş ödemeleri oluşturun/değiştirin
 Permission514=Maaş ödemelerini silin
-Permission517=Ücretleri çıkart
+Permission517=Read payments of salaries of everybody
+Permission519=Ücretleri çıkart
 Permission520=Borçları oku
 Permission522=Borç oluştur/değiştir
 Permission524=Borç sil
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Gereç Cetvelleri Oku
 Permission651=Gereç Cetvelleri Oluştur/Güncelle
 Permission652=Gereç Cetvelleri Sil
@@ -884,7 +899,9 @@ Permission1185=Tedarikçi siparişlerini onayla
 Permission1186=Tedarikçi siparişlerini sipariş et
 Permission1187=Tedarikçi siparişlerinin onay makbuzu
 Permission1188=Tedarikçi siparişlerini sil
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Tedarikçi siparişlerini onayla (ikinci onay)
+Permission1191=Export supplier orders and their attributes
 Permission1201=Bir dışa aktarma sonucu al
 Permission1202=Dışa aktarma Oluştur/Değiştir
 Permission1231=Tedarikçi faturalarını oku
@@ -898,6 +915,8 @@ Permission1251=Dış verilerin veritabanına toplu olarak alınmasını çalış
 Permission1321=Müşteri faturalarını, özniteliklerini ve ödemelerini dışa aktar
 Permission1322=Ödenmiş bir faturayı yeniden aç
 Permission1421=Müşteri siparişleri ve niteliklerini dışa aktar
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Kullanıcı hesabıyla bağlantılı eylemleri (olaylar veya görevler) oku (etkinliğin sahibi veya yeni atanmışsa)
 Permission2402=Kullanıcı hesabına (etkinliğin sahibi ise) bağlı eylemleri (etkinlikler veya görevler) oluştur/değiştir
 Permission2403=Kullanıcı hesabına (etkinliğin sahibi ise) bağlı işlemleri (etkinlikleri veya görevleri) sil
@@ -932,9 +951,13 @@ Permission23001=Planlı iş oku
 Permission23002=Planlı iş oluştur/güncelle
 Permission23003=Planlı iş sil
 Permission23004=Planlı iş yürüt
-Permission50101=Satış Noktası Kullan
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Işlemleri oku
 Permission50202=İçe aktarma işlemleri
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Kaynak oku
 Permission63002=Kaynak oluştur/düzenle
 Permission63003=Kaynak sil
 Permission63004=Gündem etkinliklerine kaynak bağlantıla
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Üçüncü parti türleri
 DictionaryCompanyJuridicalType=Üçüncü partilerin yasal formları
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=İzin türleri
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Gider raporu - Ulaşım kategorileri
 DictionaryExpenseTaxRange=Gider raporu - Ulaşım kategorisine göre menzil
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Kurulum kaydedildi
 SetupNotSaved=Kurulum kaydedilmedi
 BackToModuleList=Modül listesine dön
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Hiçbir çeviri kodu bulunmuyorsa varsayılan olarak kullanı
 LabelOnDocuments=Belgeler üzerindeki etiket
 LabelOrTranslationKey=Etiket veya çeviri anahtarı
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=Gün sayısı
 AtEndOfMonth=Ay sonunda
 CurrentNext=Güncel/Sonraki
@@ -1145,6 +1182,7 @@ InfoWebServer=Web Sunucusu Bilgileri
 InfoDatabase=Veritabanı Bilgileri
 InfoPHP=PHP Bilgileri
 InfoPerf=Performans Bilgileri
+InfoSecurity=About Security
 BrowserName=Tarayıcı adı
 BrowserOS=Tarayıcı OS
 ListOfSecurityEvents=Dolibarr güvenlik etkinlikleri listesi
@@ -1194,7 +1232,8 @@ RestoreDesc=Bir Dolibarr yedeğini geri yüklemek için iki adım gereklidir.
 RestoreDesc2="documents" dizininin yedekleme dosyasını (örneğin zip dosyası) yeni bir Dolibarr kurulumuna veya mevcut olan bu belge dizinine (<b>%s</b>) geri yükleyin.
 RestoreDesc3=Yedeklenmiş bir döküm dosyasındaki veritabanı yapısını ve verileri, yeni Dolibarr kurulumunun veri tabanına veya mevcut olan bu kurulumun veri tabanına (<b>%s</b>) geri yükleyin. Uyarı: Geri yükleme tamamlandıktan sonra tekrar giriş yapabilmek için yedeklenmiş kurulumdaki mevcut olan bir kullanıcı adı/parola kullanmalısınız.<br>Yedeklenmiş veri tabanını mevcut olan bu kuruluma geri yüklemek için bu asistanı takip edebilirsiniz.
 RestoreMySQL=MySQL içeaktar
-ForcedToByAModule= Bu kural bir aktif modül tarafından <b>s</b> ye zorlanır
+ForcedToByAModule=Bu kural bir aktif modül tarafından <b>s</b> ye zorlanır
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Mevcut yedekleme dosyaları
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=Haftanın ilk günü
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Üçüncü Partiler için tercih edilen gönderme yöntemini isteyin.
 FieldEdition=%s Alanının düzenlenmesi
 FillThisOnlyIfRequired=Örnek: +2 (saat dilimi farkını yalnız zaman farkı sorunları yaşıyorsanız kullanın)
@@ -1282,7 +1322,7 @@ GetBarCode=Barkovizyon al
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Dolibarr iç algoritmasına göre bir şifre girin: 8 karakterli sayı ve küçük harf içeren.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Oluşturulan bir parola önerme. Parola manuel olarak yazılmalıdır.
 PasswordGenerationPerso=Kişisel tanımlanmış yapılandırmanıza göre bir parola girin.
 SetupPerso=Yapılandırmanıza göre
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Yeni bir üye oluşturmak için e-posta gereklidir
 MemberSendInformationByMailByDefault=Üyelere onay epostası (doğrulama ya da yeni abonelik) göndermek için onay kutusu varsayılan olarak açıktır
 VisitorCanChooseItsPaymentMode=Ziyaretçi kişi mevcut ödeme türlerinden birini seçebilir
 MEMBER_REMINDER_EMAIL=Süresi dolmuş abonelikler için <b>mail yoluyla</b> otomatik hatırlatıcıyı etkinleştir. Not: Hatırlatıcıyı gönderebilmek için <strong>%s</strong> modülü etkinleştirilmiş ve doğru bir şekilde yapılandırılmış olmalıdır.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP Kurulumu
 LDAPGlobalParameters=Genel parametreler
@@ -1523,7 +1564,9 @@ LDAPDescValues=Örnek değerler aşağıdaki yüklü şemalarla <b> OpenLDAP </
 ForANonAnonymousAccess=Bir kimlik doğrulamalı giriş için (örneğin bir yazma girişi)
 PerfDolibarr=Performans ayar/optimizasyon raporu
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Yüklü değil, bu nedenle sunucunuzun yavaşlamasına neden olmaz.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=\t\nUygulamalı önbellek
 MemcachedNotAvailable=Uygulanabilir önbellek bulunamadı. Performansı Memcached önbellek sunucusu ve bu önbellek sunucusunu kullanabilecek bir modül kurarak arttırabilirsiniz.<br>Daha fazla bilgiyi buradan <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>bulabilirsiniz. Bu tür önbellek sunucusunu çok fazla web barındırıcısının sağlamadığını unutmayın.
 MemcachedModuleAvailableButNotSetup=Uygulamalı önbellek için memcached modülü bulundu ama modülün kurulumu tamamlanmamış.
@@ -1571,9 +1614,9 @@ SyslogLevel=Düzey
 SyslogFilename=Dosya adı ve yolu
 YouCanUseDOL_DATA_ROOT=Dolibarr’daki “belgeler” dizinindeki bir log (günlük) dosyası için DOL_DATA_ROOT/dolibarr.log u kullanabilirsiniz. Bu dosyayı saklamak için farklı bir yol (path) kullanabilirsiniz.
 ErrorUnknownSyslogConstant=%s Değişmezi bilinen bir Syslog değişmezi değildir
-OnlyWindowsLOG_USER=Windows yalnızca LOG_USER'ı destekler
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Günlük yedekleri
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Bağış modülü kurulumu
@@ -1629,7 +1672,7 @@ AdvancedEditor=Gelişmiş editör
 ActivateFCKeditor=Gelişmiş düzenleyiciyi şunun için etkinleştir:
 FCKeditorForCompany=Öğe açıklamaları ve notları için WYSIWIG oluşturma/düzenleme (ürünler/hizmetler hariç)
 FCKeditorForProduct=Ürünlerin/hizmetlerin açıklamaları ve notlar için WYSIWIG oluşturma/düzenleme
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= Toplu e-postalar için WYSIWIG oluşturma/düzenleme (Araçlar->E-postalamalar)
 FCKeditorForUserSignature=Kullanıcı imzasının WYSIWIG olarak oluşturulması/düzenlenmesi
 FCKeditorForMail=Tüm mailler için WYSIWIG oluşturma/düzenleme (Araçlar->E-postalamalar hariç)
@@ -1639,11 +1682,11 @@ StockSetup=Stok modülü kurulumu
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menü silindi
+Menu=Menu
 Menus=Menüler
 TreeMenuPersonalized=Kişiselleştirilmiş menüler
 NotTopTreeMenuPersonalized=Özelleştirilmiş menüler bir üst menüye bağlantılı değildir
 NewMenu=Yeni menü
-Menu=Menü seçimi
 MenuHandler=Menü işleyicisi
 MenuModule=Kaynak modül
 HideUnauthorizedMenu= Yetkisiz menüleri gizle (gri)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Sesli bildirimi etkinleştir
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Bağlantılı nesneyi gündem görünümünde göster
 ##### Clicktodial #####
 ClickToDialSetup=TıklaAra modülü kurulumu
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Yolu içerir (%s değişlende tanımlanır)
 ExpenseReportsSetup=Gider Raporları modülü kurulumu
 TemplatePDFExpenseReports=Gider raporu belgesi oluşturmak için belge şablonları
-ExpenseReportsIkSetup=Gider Raporları modülü kurulumu - Milles index
 ExpenseReportsRulesSetup=Gider Raporları modülü kurulumu - Kurallar
 ExpenseReportNumberingModules=Gider raporları numaralandırma modülü
 NoModueToManageStockIncrease=Otomatik stok arttırılması yapabilecek hiçbir modül etkinleştirilmemiş. Stok arttırılması yalnızca elle girişle yapılacaktır.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Üçüncü partiler
 MailToMember=Üyeler
 MailToUser=Kullanıcılar
-MailToProject=Projeler sayfası
+MailToProject=Projeler
 MailToTicket=Destek Bildirimleri
 ByDefaultInList=Liste görünümünde varsayılana göre göster
 YouUseLastStableVersion=En son kararlı sürümü kullanıyorsunuz
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Posta Kodu
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Bir kaynağı kişilere bağlama özelliğini devre
 EnableResourceUsedInEventCheck=Bir etkinlikte kaynağın kullanılıp kullanılmadığını kontrol etme özelliğini etkinleştir
 ConfirmUnactivation=Modül sıfırlamayı onayla
 OnMobileOnly=Sadece küçük ekranda (akıllı telefon)
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Görme engelli insanlar için arayüzü basitleştir
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Hata ayıklama çubuğunu kullan
 DEBUGBAR_LOGS_LINES_NUMBER=Konsolda saklanacak son günlük satırı sayısı
 WarningValueHigherSlowsDramaticalyOutput=Uyarı, yüksek değerler çıktıyı önemli ölçüde yavaşlatır
 ModuleActivated=Modül 1 %s etkinleştirilmiştir ve arayüzü yavaşlatıyor.
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Dışa aktarma modelleri herkesle paylaşılır
 ExportSetup=Dışa aktarma modülünün kurulumu
 ImportSetup=İçe aktarım modülünün kurulumu
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Şundan daha küçük
 LargerThan=Şundan daha büyük
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/tr_TR/banks.lang b/htdocs/langs/tr_TR/banks.lang
index e056ab77f35..00371009950 100644
--- a/htdocs/langs/tr_TR/banks.lang
+++ b/htdocs/langs/tr_TR/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Çeşitli ödeme
 VariousPayments=Çeşitli ödemeler
 ShowVariousPayment=Çeşitli ödemeyi göster
 AddVariousPayment=Çeşitli ödeme ekle
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA yetkisi
 YourSEPAMandate=SEPA yetkiniz
 FindYourSEPAMandate=Bu, firmamızın bankanıza otomatik ödeme talimatı verebilme yetkisi için SEPA yetkinizdir. İmzalayarak iade edin (imzalı belgeyi tarayarak) veya e-mail ile gönderin
@@ -176,3 +179,4 @@ BankColorizeMovement=Hareketleri renklendir
 BankColorizeMovementDesc=Bu işlev etkinleştirilirse, borçlandırma veya kredi hareketleri için belirli bir arka plan rengi seçebilirsiniz
 BankColorizeMovementName1=Borç hareketi için arka plan rengi
 BankColorizeMovementName2=Kredi hareketi için arka plan rengi
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/tr_TR/categories.lang b/htdocs/langs/tr_TR/categories.lang
index 7e182978296..94a510df93f 100644
--- a/htdocs/langs/tr_TR/categories.lang
+++ b/htdocs/langs/tr_TR/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Etiket/kategori ayarları
 CategorieRecursiv=Otomatik ana etiketli/kategorili bağlantı
 CategorieRecursivHelp=Bu seçenek aktifse, alt bir kategoriye ürün eklediğinizde bu ürün aynı zamanda üst kategoriye de eklenecektir.
 AddProductServiceIntoCategory=Aşağıdaki ürünü/hizmeti ekle
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Etiketi/kategoriyi göster
 ByDefaultInList=B listede varsayılana göre
 ChooseCategory=Kategori seç
-StocksCategoriesArea=Depo Kategorileri Alanı
-ActionCommCategoriesArea=Etkinlik Kategorileri Alanı
-WebsitePagesCategoriesArea=Sayfa-Konteyner Kategorileri Alanı
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Kategoriler için veya operatör kullanın
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index 70f4892b494..1a0b08308e6 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -124,19 +124,19 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof No 1 (ABN)
-ProfId2AU=--
-ProfId3AU=--
-ProfId4AU=--
+ProfId2AU=-
+ProfId3AU=-
+ProfId4AU=-
 ProfId5AU=-
 ProfId6AU=-
 ProfId1BE=Prof No 1 (Profesyonel no)
-ProfId2BE=--
-ProfId3BE=--
-ProfId4BE=--
-ProfId5BE=-
+ProfId2BE=-
+ProfId3BE=-
+ProfId4BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=CNPJ
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=--
-ProfId2CH=--
+ProfId1CH=UID-Nummer
+ProfId2CH=-
 ProfId3CH=Prof No 1 (Federal no)
 ProfId4CH=Prof No 2 (Ticaret Kayıt numarası)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (RUT)
 ProfId2CL=-
@@ -165,20 +165,20 @@ ProfId6CO=-
 ProfId1DE=Prof No 1 (Ust.-IdNr)
 ProfId2DE=Prof No 2 (Ust.-Nr)
 ProfId3DE=Prof No 3 (Handelsregister-Nr.)
-ProfId4DE=--
-ProfId5DE=-
+ProfId4DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Sosyal güvenlik numarası)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Üst noı)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof No 1 (SIREN)
 ProfId2FR=Prof No 2 (SIRET)
 ProfId3FR=Prof No 3 (NAF, eski APE)
 ProfId4FR=Prof No 4 (RCS/RM)
-ProfId5FR=Prof Id 5
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Kayıt numarası
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Lüksemburg)
 ProfId2LU=Id. prof. 2 (İş izini)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (RC)
 ProfId2MA=Id prof. 2 (patente)
 ProfId3MA=Id prof. 3 (IF)
 ProfId4MA=Id prof. 4 (CNSS)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof. Id 1 (RFC).
 ProfId2MX=Prof Id 2 (R.. P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof No 1 (NIPC)
 ProfId2PT=Prof No 2 (Sosyal güvenlik numarası)
 ProfId3PT=Prof No 3 (Ticaret Kayıt numarası)
 ProfId4PT=Prof No 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=Avrupa Komisyonu'nun <a href="%s" target="_blank">%s</a> web
 ErrorVATCheckMS_UNAVAILABLE=Denetlemiyor. Denetim hizmeti üye ülke (%s) tarafından sağlanmıyor.
 NorProspectNorCustomer=Ne aday ne de müşteri
 JuridicalStatus=Tüzel Kişilik Türü
+Workforce=Workforce
 Staff=Çalışan sayısı
 ProspectLevelShort=Potansiyel
 ProspectLevel=Aday potansiyeli
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Ödeme Koşulları - Tedarikçi
 PaymentTypeBoth=Ödeme Şekli - Müşteri ve Satıcı
 MulticurrencyUsed=Çoklu Para Birimi Kullan
 MulticurrencyCurrency=Para birimi
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/tr_TR/ecm.lang b/htdocs/langs/tr_TR/ecm.lang
index 84becb607ac..8302879b82c 100644
--- a/htdocs/langs/tr_TR/ecm.lang
+++ b/htdocs/langs/tr_TR/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Anahtar kelimelere göre ara
 ECMSearchByEntity=Nesneye göre ara
 ECMSectionOfDocuments=Belgelerin dizinleri
 ECMTypeAuto=Otomatik
-ECMDocsBySocialContributions=Sosyal ya da mali vergilere bağlantılı belgeler
-ECMDocsByThirdParties=Üçüncü partiler ile bağlantılı belgeler
-ECMDocsByProposals=Teklifler ile bağlantılı belgeler
-ECMDocsByOrders=Müşteri siparişleri ile bağlantılı belgeler
-ECMDocsByContracts=Sözleşmeler ile bağlantılı belgeler
-ECMDocsByInvoices=Müşteri faturaları ile bağlantılı belgeler
-ECMDocsByProducts=Ürünlere bağlantılı belgeler
-ECMDocsByProjects=Projelere bağlı belgeler
-ECMDocsByUsers=Kullanıcılara bağlantılı belgeler
-ECMDocsByInterventions=Müdahalelere bağlantılı belgeler
-ECMDocsByExpenseReports=Gider raporlarına bağlı dokümanlar
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to vendor proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=Hiçbir dizin oluşturulmadı
 ShowECMSection=Dizini göster
 DeleteSection=Dizini kaldır
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Dosya içeriği için Hash
 NoDirectoriesFound=Dizin bulunamadı
 FileNotYetIndexedInDatabase=Dosya henüz veritabanında dizine eklenmedi (tekrar yüklemeyi deneyin)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/tr_TR/hrm.lang b/htdocs/langs/tr_TR/hrm.lang
index d7878459e1f..93d2a7e56da 100644
--- a/htdocs/langs/tr_TR/hrm.lang
+++ b/htdocs/langs/tr_TR/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Çalışanlar
 Employee=Çalışan
 NewEmployee=Yeni çalışan
+ListOfEmployees=Çalışanlar listesi
diff --git a/htdocs/langs/tr_TR/install.lang b/htdocs/langs/tr_TR/install.lang
index 515824895a8..b7b2c338f16 100644
--- a/htdocs/langs/tr_TR/install.lang
+++ b/htdocs/langs/tr_TR/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=<b>%s</b> yapılandırma dosyası yazılabilir değil. İz
 ConfFileIsWritable=<b>%s</b> yapılandırma dosyası yazılabilir.
 ConfFileMustBeAFileNotADir=<b>%s</b> yapılandırma dosyası bir dizin değil, dosya olmalıdır.
 ConfFileReload=Yapılandırma dosyasındaki parametreleri yeniden yükleme.
-PHPSupportSessions=Bu PHP oturumları destekliyor.
 PHPSupportPOSTGETOk=Bu PHP GÖNDER ve AL değişkenlerini destekliyor.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=Bu PHP, GD grafiksel işlevleri destekliyor.
-PHPSupportCurl=Bu PHP, Curl'u destekliyor.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=Bu PHP, UTF8 işlevlerini destekliyor.
-PHPSupportIntl=Bu PHP, Intl fonksiyonlarını destekliyor.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=Bu PHP oturumları destekliyor.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=PHP nizin ençok oturum belleği <b>%s</b> olarak ayarlanmış. Bu yeterli olacaktır.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/tr_TR/intracommreport.lang b/htdocs/langs/tr_TR/intracommreport.lang
new file mode 100644
index 00000000000..69850cd0bf0
--- /dev/null
+++ b/htdocs/langs/tr_TR/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=Liste
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/tr_TR/languages.lang b/htdocs/langs/tr_TR/languages.lang
index 9946ec0de27..3d30573a595 100644
--- a/htdocs/langs/tr_TR/languages.lang
+++ b/htdocs/langs/tr_TR/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=İspanyolca (Panama)
 Language_es_PY=İspanyolca (Paraguay)
 Language_es_PE=İspanyolca (Peru)
 Language_es_PR=İspanyolca (Porto Riko)
+Language_es_US=Spanish (USA)
 Language_es_UY=İspanyolca (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=İspanyolca (Venezuela)
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index c2b51ead847..ecc538bf1dc 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Bağlantıyı kaldır
 AddToDraft=Taslağa ekle
 Update=Güncelle
 Close=Kapat
+CloseAs=Durumu buna ayarlayın
 CloseBox=Gösterge panelinizden ekran etiketini kaldırın
 Confirm=Onayla
 ConfirmSendCardByMail=Bu kartın içeriğini e-posta ile <b>%s</b> adresine gerçekten göndermek istiyor musunuz?
@@ -196,6 +197,7 @@ ReOpen=Yeniden aç
 Upload=Yükle
 ToLink=Bağlantıla
 Select=Seç
+SelectAll=Select all
 Choose=Seç
 Resize=Yeniden boyutlandır
 ResizeOrCrop=Yeniden Boyutlandır veya Kırp
@@ -256,6 +258,7 @@ Cards=Kartlar
 Card=Kart
 Now=Şimdi
 HourStart=Başlama saati
+Deadline=Deadline
 Date=Tarih
 DateAndHour=Tarih ve saat
 DateToday=Bugünün tarihi
@@ -264,8 +267,10 @@ DateStart=Başlangıç tarihi
 DateEnd=Bitiş tarihi
 DateCreation=Oluşturma tarihi
 DateCreationShort=Oluşt. tarihi
+IPCreation=Creation IP
 DateModification=Değiştirme tarihi
 DateModificationShort=Değiş. tarihi
+IPModification=Modification IP
 DateLastModification=Son değiştirilme tarihi
 DateValidation=Doğrulama tarihi
 DateClosing=Kapanış tarihi
@@ -319,6 +324,7 @@ Morning=Sabah
 Afternoon=Öğleden sonra
 Quadri=Çeyrek
 MonthOfDay=Ayın günü
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=ay
 Rate=Oran
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Ödeme tutarı, orijinal para birimi
 MulticurrencyAmountHT=Tutar (KDV hariç), ilk para birimi
 MulticurrencyAmountTTC=Tutar (vergi dahil), ilk para birimi
 MulticurrencyAmountVAT=Toplam vergi, ilk para birimi
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Vergi 2 tutarı
 AmountLT2=Vergi 3 tutarı
 AmountLT1ES=RE Tutarı
@@ -487,6 +494,7 @@ By=Tarafından
 From=Başlama
 FromDate=Gönderen
 FromLocation=Gönderen
+at=at
 to=Bitiş
 To=Bitiş
 and=ve
@@ -509,6 +517,7 @@ Draft=Taslak
 Drafts=Taslaklar
 StatusInterInvoiced=Faturalanmış
 Validated=Doğrulanmış
+ValidatedToProduce=Validated (To produce)
 Opened=Açık
 OpenAll=Açık (Tümü)
 ClosedAll=Kapalı (Tümü)
@@ -655,6 +664,7 @@ Response=Yanıt
 Priority=Öncelik
 SendByMail=E-posta ile gönder
 MailSentBy=E-postayı gönderen
+NotSent=Gönderilmedi
 TextUsedInTheMessageBody=E-posta gövdesi
 SendAcknowledgementByMail=Onay e-postası gönder
 SendMail=E-posta gönder
@@ -836,6 +846,7 @@ ListOfTemplates=Şablon listesi
 Gender=Cinsiyet
 Genderman=Adam
 Genderwoman=Kadın
+Genderother=Diğer
 ViewList=Liste görünümü
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Çeşitli
 Calendar=Takvim
 GroupBy=Gruplandır...
 ViewFlatList=Düz listeyi incele
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString='%s' dizisini kaldır
 SomeTranslationAreUncomplete=Sunulan dillerden bazıları sadece kısmen çevrilmiş olabilir veya çeviri hatalarına sahip olabilir. Lütfen <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> adresi üzerinden kayıt yaparak dilinizdeki çeviri hatalarını düzeltmeye yardımcı olun ve yazılımın gelişimine katkıda bulunun.
 DirectDownloadLink=Direkt indirme linki (herkese açık/harici)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Müşteri sevkiyatları
 SearchIntoExpenseReports=Gider raporları
 SearchIntoLeaves=İzin
 SearchIntoTickets=Destek Bildirimleri
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Tedarikçi ödemeleri
+SearchIntoMiscPayments=Çeşitli ödemeler
 CommentLink=Açıklamalar
 NbComments=Yorum sayısı
 CommentPage=Yorumlar alanı
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Bilgi
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Doğum Tarihi
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/tr_TR/members.lang b/htdocs/langs/tr_TR/members.lang
index 0b14e8cc388..ea575b74239 100644
--- a/htdocs/langs/tr_TR/members.lang
+++ b/htdocs/langs/tr_TR/members.lang
@@ -19,14 +19,12 @@ MembersCards=Üye kartvizitleri
 MembersList=Üyelerin listesi
 MembersListToValid=Taslak üye listesi (doğrulanacak)
 MembersListValid=Geçerli üye listesi
-MembersListUpToDate=Güncel abonelikleri ile geçerli üye listesi
-MembersListNotUpToDate=Abonelik tarihleri geçmiş geçerli üye listesi
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=Sona ermiş üyelerin listesi
 MembersListQualified=Nitelikli üye listesi
 MenuMembersToValidate=Taslak üyeler
 MenuMembersValidated=Doğrulanmış üye
-MenuMembersUpToDate=Güncel üyeler
-MenuMembersNotUpToDate=Tarihi geçmiş üyeler
 MenuMembersResiliated=Sona ermiş üyeler
 MembersWithSubscriptionToReceive=Abonelik alacal üyeler
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Abonelik tarihi
 DateEndSubscription=Abonelik bitiş tarihi
 EndSubscription=Abonelik bitir
 SubscriptionId=Abonelik kimliği
+WithoutSubscription=Without subscription
 MemberId=Üye kimliği
 NewMember=Yeni üye
 MemberType=Üyelik türü
@@ -81,7 +80,7 @@ DeleteType=Sil
 VoteAllowed=Oylamaya izin verildi
 Physical=Fiziksel
 Moral=Ahlaki
-MorPhy=Niteliği
+MorAndPhy=Moral and Physical
 Reenable=Yeniden etkinleştirilebilir
 ResiliateMember=Bir üyeyi sonlandır
 ConfirmResiliateMember=Bu üyeyi feshetmek istediğinizden emin misiniz?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Yeni üye doğrulama aşamasında e-posta gönder
 SendingEmailOnNewSubscription=Yeni abonelik aşamasında e-posta gönderimi
 SendingReminderForExpiredSubscription=Süresi dolmuş abonelikler için hatırlatıcı e-posta gönderimi
 SendingEmailOnCancelation=Abonelik iptali aşamasında e-posta gönderimi
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Üyeliğiniz alındı.
 YourMembershipWasValidated=Üyeliğiniz doğrulandı
@@ -167,6 +167,7 @@ MembersStatisticsByState=Eyalete/ile göre üyelik istatistikleri
 MembersStatisticsByTown=İlçelere göre üyelik istatistikleri
 MembersStatisticsByRegion=Bölgeye göre üye istatistikleri
 NbOfMembers=Üye sayısı
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=Doğrulanmamış üye bulunmadı
 MembersByCountryDesc=Bu ekran ülkelere göre üyelik istatisklerini görüntüler. Grafik eğer internet hizmeti çalışıyor ise sadece  google çevrimiçi grafik hizmetince sağlanır.
 MembersByStateDesc=Bu ekran eyaletlere/illere/bölgelere göre üyelik istatiskleri görüntüler.
@@ -176,6 +177,7 @@ MenuMembersStats=İstatistikler
 LastMemberDate=Son üye tarihi
 LatestSubscriptionDate=Son abonelik tarihi
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Bilgiler geneldir
 NewMemberbyWeb=Yeni üye eklendi. Onay bekliyor
 NewMemberForm=Yeni üyelik formu
diff --git a/htdocs/langs/tr_TR/mrp.lang b/htdocs/langs/tr_TR/mrp.lang
index e5a11e3ca43..b68f85e39d9 100644
--- a/htdocs/langs/tr_TR/mrp.lang
+++ b/htdocs/langs/tr_TR/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Üretim Emirleri
-MO=Üretim Emri
 MOs=Manufacturing orders
+ManufacturingOrder=Üretim Emri
 MRPDescription=Üretim ve Üretim Siparişlerini (MO) yönetmek için modül.
 MRPArea=MRP Alanı
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index 37c185abd1b..a5c62b2b2d2 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Ürün/hizmet başına çoklu fiyat segmenti (her müşteri bir fiyat segmentinde)
 MultiPricesNumPrices=Fiyat sayısı
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Sanal ürünleri (kitleri) etkinleştir 
-AssociatedProducts=Sanal ürünler
-AssociatedProductsNumber=Bu ürünü oluşturan ürün sayısı
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Ana paket ürünü sayısı
 ParentProducts=Ana ürünler
-IfZeroItIsNotAVirtualProduct=0 ise, bu ürün bir sanal ürün değildir
-IfZeroItIsNotUsedByVirtualProduct=0 ise, bu ürün hiçbir sanal ürün tarafından kullanılmıyor
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Anahtar kelime süzgeçi
 CategoryFilter=Kategori süzgeçi
 ProductToAddSearch=Eklemek için ürün ara
 NoMatchFound=Eşleşme bulunamadı
 ListOfProductsServices=Ürünler/hizmetler listesi
-ProductAssociationList=Bu sanal ürünün/kitin bileşen(ler)i olan ürün/hizmet listesi
-ProductParentList=Bu ürünün bir bileşen olan ürünle/hizmetle ilgili liste
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=Seçilen üründen biri güncel ürünün üstü konumundadır
 DeleteProduct=Bir ürün/hizmet sil
 ConfirmDeleteProduct=Bu ürünü/hizmeti silmek istediğinizden emin misiniz?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Uygun genel değerler:
 PriceMode=Fiyat biçimi
 PriceNumeric=Sayı
 DefaultPrice=Varsayılan fiyat
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Ana değişimde stok Arttır/Eksilt
 ComposedProduct=Alt ürün
 MinSupplierPrice=Minimum alış fiyatı
@@ -339,6 +340,7 @@ UseProductFournDesc=Müşterilere yönelik açıklamalara ek olarak, tedarikçil
 ProductSupplierDescription=Ürün için tedarikçi açıklaması
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Paketleme
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/tr_TR/recruitment.lang b/htdocs/langs/tr_TR/recruitment.lang
index 9d6eec6b4cd..7d2ea6182f2 100644
--- a/htdocs/langs/tr_TR/recruitment.lang
+++ b/htdocs/langs/tr_TR/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=İş pozisyonu
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang
index 822cf97e5c4..be4eb25d528 100644
--- a/htdocs/langs/tr_TR/stocks.lang
+++ b/htdocs/langs/tr_TR/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Eylem kimlik numarası %d
 ListMouvementStockProject=Projeyle ilişkili stok hareketlerinin listesi
 StocksArea=Depo alanı
 AllWarehouses=Tüm depolar
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Taslak siparişleri de dahil et
 Location=Konum
 LocationSummary=Kısa konum adı
@@ -122,8 +122,9 @@ DesiredStockDesc=Buradaki değer, stok ikmali özelliği tarafından stoğu tama
 StockToBuy=Sipariş edilecek
 Replenishment=İkmal
 ReplenishmentOrders=İkmal siparişleri
-VirtualDiffersFromPhysical=Stok arttırma/eksiltme seçeneklerine göre, fiziksel stok ve sanal stok (fiziksel + geçerli siparişler) farklı olmalı
-UseVirtualStockByDefault=Tamamlama özelliği için fiziksel stok yerine varsayıla olarak sanal stok kullanın
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Sanal stok kullan
 UsePhysicalStock=Fiziksel stok kullan
 CurentSelectionMode=Geçerli seçim modu
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=Bu ürün listede zaten var
 SelectCategory=Kategori süzgeçi
 SelectFournisseur=Tedarikçi filtresi
 inventoryOnDate=Envanter
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Hiçbir son alış fiyatı mevcut değilse alış fiyatını kullan
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/tr_TR/suppliers.lang b/htdocs/langs/tr_TR/suppliers.lang
index e160e652c96..9b51c8028e4 100644
--- a/htdocs/langs/tr_TR/suppliers.lang
+++ b/htdocs/langs/tr_TR/suppliers.lang
@@ -38,10 +38,11 @@ MenuOrdersSupplierToBill=Faturalanacak tedarikçi siparişleri
 NbDaysToDelivery=Teslimat gecikmesi (gün)
 DescNbDaysToDelivery=Bu siparişteki ürünlerin en uzun teslimat gecikmesi
 SupplierReputation=Tedarikçi itibarı
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Sipariş verme
 NotTheGoodQualitySupplier=Düşük kalite
 ReputationForThisProduct=İtibar
 BuyerName=Alıcı adı
 AllProductServicePrices=Tüm ürün/hizmet fiyatları
-AllProductReferencesOfSupplier=All references of vendor
+AllProductReferencesOfSupplier=Satıcının tüm referansları
 BuyingPriceNumShort=Tedarikçi fiyatları
diff --git a/htdocs/langs/tr_TR/website.lang b/htdocs/langs/tr_TR/website.lang
index fedbdb7da88..65378d92d62 100644
--- a/htdocs/langs/tr_TR/website.lang
+++ b/htdocs/langs/tr_TR/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Web sitesi ekle
 Webpage=Web sayfası/kapsayıcı
 AddPage=Sayfa/kapsayıcı ekle
 HomePage=Ana Sayfa
-PageContainer=Sayfa/kapsayıcı
+PageContainer=Sayfa
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=İstenen %s kimlik numaralı sayfa henüz bir içeriğe sahip değil, önbellek dosyası .tpl.php kaldırıldı. Bu sorunu çözmek için sayfa içeriğini düzenleyin.
 SiteDeleted='%s' web sitesi silindi
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Besleme
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
index af0f2f5295b..f99b2780e48 100644
--- a/htdocs/langs/uk_UA/accountancy.lang
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Більшість налаштувань обліку здійснюється у меню %s
-ConfigAccountingExpert=Configuration of the module accounting expert
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Журналізація
-Journaux=Журнали
+Journals=Журнали
 JournalFinancial=Фінансові журнали
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Chart of accounts
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Інша інформація
 DeleteCptCategory=Видалити обліковий рахунок з групи
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Статус журналізації
-AlreadyInGeneralLedger=Уже журнальовані в головній книзі
-NotYetInGeneralLedger=Ще не журнальовані в головній книзі
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Група порожня, перевірте налаштування персоніфікованої облікової групи
 DetailByAccount=Показати відомості по рахунку
 AccountWithNonZeroValues=Рахунки з ненульовими значеннями
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bank accounts
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=By year
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index dbf81e98723..d04882db68a 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Зняти блокування з'єднання
 YourSession=Ваш сеанс
 Sessions=Сеанси користувачів
 WebUserGroup=Користувач / група веб-сервера
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Здається, що ваша конфігурація PHP не дозволяє перелічити активні сеанси. Каталог, який використовується для збереження сеансів (<b> %s </b>), може бути захищений (наприклад, дозволами ОС або директивою PHP open_basedir).
 DBStoringCharset=Кодування бази даних для зберігання інформації
 DBSortingCharset=Кодування бази даних для сортування даних
@@ -71,7 +73,7 @@ DisableJavascriptNote=Примітка. Для тестування або на
 UseSearchToSelectCompanyTooltip=Крім того, якщо у вас є велика кількість контрагентів (> 100 000), ви можете збільшити швидкість, встановивши константі COMPANY_DONOTSEARCH_ANYWHERE значення 1 у Налаштування> Інше. Тоді пошук буде обмежений початком рядка.
 UseSearchToSelectContactTooltip=Крім того, якщо у вас є велика кількість контрагентів (> 100 000), ви можете збільшити швидкість, встановивши константі CONTACT_DONOTSEARCH_ANYWHERE значення 1 у Налаштування> Інше. Тоді пошук буде обмежений початком рядка.
 DelaiedFullListToSelectCompany=Чекати натискання клавіші перед завантаженням вмісту списку контрагентів <br> Це може підвищити продуктивність, якщо у вас є велика кількість контрагентів, але це менш зручно.
-DelaiedFullListToSelectContact=Чекати, поки не буде натиснута клавіша перед завантаженням вмісту списку контактів. <br> (Це може підвищити продуктивність, якщо у вас є велика кількість контактів, але це менш зручно)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Кількість символів для запуску пошуку: %s
 NumberOfBytes=Кількість байт
 SearchString=Рядок пошуку
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=В документі контрагент
 JavascriptDisabled=JavaScript відключений
 UsePreviewTabs=Використовуйте вкладки попереднього перегляду
 ShowPreview=Показати попередній перегляд
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Попередній перегляд недоступний
 ThemeCurrentlyActive=Тема наразі активна
 CurrentTimeZone=PHP TimeZone (сервер)
@@ -271,7 +274,7 @@ NoticePeriod=Період повідомлення
 NewByMonth=Новий за місяць
 Emails=Emails
 EMailsSetup=Налаштування Email
-EMailsDesc=Тут Ви можете перевизначити параметри надсилання електронної пошти замість параметрів PHP. У більшості Unix/Linux OS налаштування PHP правильні і тут нічого міняти не потрібно.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Профілі надсилання ел. пошти
 EMailsSenderProfileDesc=Ви можете залишати цей розділ порожнім. Якщо ви введете тут деякі повідомлення електронної пошти, вони будуть додані до списку можливих відправників під час написання нового електронного листа.
 MAIN_MAIL_SMTP_PORT=Порт SMTP/SMTPS (значення за замовчуванням у php.ini: <b> %s </b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP-ідентифікатор (якщо для надсил
 MAIN_MAIL_SMTPS_PW=Пароль SMTP (якщо для надсилання сервер вимагає автентифікації)
 MAIN_MAIL_EMAIL_TLS=Використовувати шифрування TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Використовувати шифрування TLS (STARTTLS)
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Використовувати DKIM для створення підпису електронної пошти
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Домен електронної пошти для використання з dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Ім'я селектора dkim
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Залишивши це поле порожнім, 
 ExtrafieldParamHelpselect=Список значень складається з рядків вигляду ключ,значення (де ключ не повинен бути '0') <br><br>Наприклад: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br> У випадку, коли потрібно щоб список залежав від значень іншого  додаткового списку:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>У випадку, якщо потрібно мати список залежний від іншого: <br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Список значень повинен складатися з рядків з форматом ключ,значення (де ключ не може бути "0") <br> <br>, наприклад: <br> 1,значення1 <br> 2,значення2 <br> 3,значення3 <br> ...
 ExtrafieldParamHelpradio=Список значень повинен складатися з рядків з форматом ключ,значення (де ключ не може бути "0") <br> <br>, наприклад: <br> 1,значення1 <br> 2,значення2 <br> 3,значення3 <br> ...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Interventions
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
+Permission13=Invalidate customer invoices
 Permission14=Validate customer invoices
 Permission15=Send customer invoices by email
 Permission16=Create payments for customer invoices
@@ -688,6 +694,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Read members
 Permission72=Create/modify members
 Permission74=Delete members
@@ -718,6 +728,7 @@ Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
@@ -825,10 +836,11 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Edition of field %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1282,7 +1322,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Global parameters
@@ -1523,7 +1564,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Level
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
@@ -1629,7 +1672,7 @@ AdvancedEditor=Advanced editor
 ActivateFCKeditor=Activate advanced editor for:
 FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
 FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
-MailToProject=Projects page
+MailToProject=Projects
 MailToTicket=Заявки
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/uk_UA/banks.lang b/htdocs/langs/uk_UA/banks.lang
index 1049496a2d7..676fdcd7500 100644
--- a/htdocs/langs/uk_UA/banks.lang
+++ b/htdocs/langs/uk_UA/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/uk_UA/categories.lang b/htdocs/langs/uk_UA/categories.lang
index 9bb71984ecf..ba37a43b4ec 100644
--- a/htdocs/langs/uk_UA/categories.lang
+++ b/htdocs/langs/uk_UA/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/uk_UA/companies.lang b/htdocs/langs/uk_UA/companies.lang
index cba4ef7dbda..7bb65732df0 100644
--- a/htdocs/langs/uk_UA/companies.lang
+++ b/htdocs/langs/uk_UA/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
 ProspectLevel=Prospect potential
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Currency
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/uk_UA/ecm.lang b/htdocs/langs/uk_UA/ecm.lang
index 43ddd3bf36f..71df60734fb 100644
--- a/htdocs/langs/uk_UA/ecm.lang
+++ b/htdocs/langs/uk_UA/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Search by keywords
 ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/uk_UA/hrm.lang b/htdocs/langs/uk_UA/hrm.lang
index 6cc7f6bef24..3b8f137e103 100644
--- a/htdocs/langs/uk_UA/hrm.lang
+++ b/htdocs/langs/uk_UA/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Employees
 Employee=Employee
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/uk_UA/install.lang b/htdocs/langs/uk_UA/install.lang
index 2d708c04147..63947dad154 100644
--- a/htdocs/langs/uk_UA/install.lang
+++ b/htdocs/langs/uk_UA/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=This PHP supports sessions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/uk_UA/intracommreport.lang b/htdocs/langs/uk_UA/intracommreport.lang
new file mode 100644
index 00000000000..3060300b974
--- /dev/null
+++ b/htdocs/langs/uk_UA/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=List
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/uk_UA/languages.lang b/htdocs/langs/uk_UA/languages.lang
index 79195062114..40a7330e156 100644
--- a/htdocs/langs/uk_UA/languages.lang
+++ b/htdocs/langs/uk_UA/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Іспанська (Панама)
 Language_es_PY=Іспанська (Парагвай)
 Language_es_PE=Іспанська (Перу)
 Language_es_PR=Іспанська (Пуерто-Ріко)
+Language_es_US=Spanish (USA)
 Language_es_UY=Іспанська (Уругвай)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Іспанська (Венесуела)
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index 62ebc2ddfd0..2f257767cd7 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Remove link
 AddToDraft=Add to draft
 Update=Update
 Close=Close
+CloseAs=Set status to
 CloseBox=Remove widget from your dashboard
 Confirm=Confirm
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Re-Open
 Upload=Upload
 ToLink=Link
 Select=Select
+SelectAll=Select all
 Choose=Choose
 Resize=Resize
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=Cards
 Card=Card
 Now=Now
 HourStart=Start hour
+Deadline=Deadline
 Date=Date
 DateAndHour=Дата та час
 DateToday=Today's date
@@ -264,8 +267,10 @@ DateStart=Start date
 DateEnd=End date
 DateCreation=Creation date
 DateCreationShort=Creat. date
+IPCreation=Creation IP
 DateModification=Modification date
 DateModificationShort=Modif. date
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
@@ -319,6 +324,7 @@ Morning=Morning
 Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Month of the day
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Rate
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Amount tax 2
 AmountLT2=Amount tax 3
 AmountLT1ES=Amount RE
@@ -487,6 +494,7 @@ By=By
 From=Продавець
 FromDate=Продавець
 FromLocation=Продавець
+at=at
 to=to
 To=to
 and=and
@@ -509,6 +517,7 @@ Draft=Проект
 Drafts=Drafts
 StatusInterInvoiced=Invoiced
 Validated=Підтверджений
+ValidatedToProduce=Validated (To produce)
 Opened=Open
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Response
 Priority=Priority
 SendByMail=Send by email
 MailSentBy=Email sent by
+NotSent=Not sent
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
@@ -836,6 +846,7 @@ ListOfTemplates=List of templates
 Gender=Gender
 Genderman=Man
 Genderwoman=Woman
+Genderother=Інший
 ViewList=List view
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous
 Calendar=Календар
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leave
 SearchIntoTickets=Заявки
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Comments
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Information
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Date of birth
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/uk_UA/members.lang b/htdocs/langs/uk_UA/members.lang
index fc805a4c210..6d44b9fdbea 100644
--- a/htdocs/langs/uk_UA/members.lang
+++ b/htdocs/langs/uk_UA/members.lang
@@ -19,14 +19,12 @@ MembersCards=Members business cards
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
 SubscriptionId=Subscription id
+WithoutSubscription=Without subscription
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@@ -81,7 +80,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/uk_UA/mrp.lang b/htdocs/langs/uk_UA/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/uk_UA/mrp.lang
+++ b/htdocs/langs/uk_UA/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index f032491bdac..de32e4bd5dc 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/uk_UA/recruitment.lang b/htdocs/langs/uk_UA/recruitment.lang
index 0fe9eb85116..a160e956958 100644
--- a/htdocs/langs/uk_UA/recruitment.lang
+++ b/htdocs/langs/uk_UA/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Місце роботи
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/uk_UA/stocks.lang b/htdocs/langs/uk_UA/stocks.lang
index 81cd6394e96..fddb3382b60 100644
--- a/htdocs/langs/uk_UA/stocks.lang
+++ b/htdocs/langs/uk_UA/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Розташування
 LocationSummary=Short name location
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/uk_UA/suppliers.lang b/htdocs/langs/uk_UA/suppliers.lang
index 9b3668c788b..e3b0758e6c3 100644
--- a/htdocs/langs/uk_UA/suppliers.lang
+++ b/htdocs/langs/uk_UA/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/uk_UA/website.lang b/htdocs/langs/uk_UA/website.lang
index ae15864ce90..ebd59dac2fa 100644
--- a/htdocs/langs/uk_UA/website.lang
+++ b/htdocs/langs/uk_UA/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
index 7b59e33b296..3211a0b62df 100644
--- a/htdocs/langs/uz_UZ/accountancy.lang
+++ b/htdocs/langs/uz_UZ/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting expert
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=Journals
+Journals=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Chart of accounts
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bank accounts
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=By year
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index d7c4eb282cd..f1c41a3b62b 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
 CurrentTimeZone=TimeZone PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Interventions
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
+Permission13=Invalidate customer invoices
 Permission14=Validate customer invoices
 Permission15=Send customer invoices by email
 Permission16=Create payments for customer invoices
@@ -688,6 +694,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Read members
 Permission72=Create/modify members
 Permission74=Delete members
@@ -718,6 +728,7 @@ Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
@@ -825,10 +836,11 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Edition of field %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1282,7 +1322,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Global parameters
@@ -1523,7 +1564,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Level
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
@@ -1629,7 +1672,7 @@ AdvancedEditor=Advanced editor
 ActivateFCKeditor=Activate advanced editor for:
 FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
 FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
-MailToProject=Projects page
+MailToProject=Projects
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/uz_UZ/banks.lang b/htdocs/langs/uz_UZ/banks.lang
index 75f9549dca5..9500a5b8b2e 100644
--- a/htdocs/langs/uz_UZ/banks.lang
+++ b/htdocs/langs/uz_UZ/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/uz_UZ/categories.lang b/htdocs/langs/uz_UZ/categories.lang
index 9bb71984ecf..ba37a43b4ec 100644
--- a/htdocs/langs/uz_UZ/categories.lang
+++ b/htdocs/langs/uz_UZ/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/uz_UZ/companies.lang b/htdocs/langs/uz_UZ/companies.lang
index 92674363ced..dadff6a7894 100644
--- a/htdocs/langs/uz_UZ/companies.lang
+++ b/htdocs/langs/uz_UZ/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
 ProspectLevel=Prospect potential
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Currency
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/uz_UZ/ecm.lang b/htdocs/langs/uz_UZ/ecm.lang
index 43ddd3bf36f..71df60734fb 100644
--- a/htdocs/langs/uz_UZ/ecm.lang
+++ b/htdocs/langs/uz_UZ/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Search by keywords
 ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/uz_UZ/hrm.lang b/htdocs/langs/uz_UZ/hrm.lang
index 6cc7f6bef24..3b8f137e103 100644
--- a/htdocs/langs/uz_UZ/hrm.lang
+++ b/htdocs/langs/uz_UZ/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Employees
 Employee=Employee
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/uz_UZ/install.lang b/htdocs/langs/uz_UZ/install.lang
index 2d708c04147..63947dad154 100644
--- a/htdocs/langs/uz_UZ/install.lang
+++ b/htdocs/langs/uz_UZ/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=This PHP supports sessions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/uz_UZ/intracommreport.lang b/htdocs/langs/uz_UZ/intracommreport.lang
new file mode 100644
index 00000000000..3060300b974
--- /dev/null
+++ b/htdocs/langs/uz_UZ/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=List
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/uz_UZ/languages.lang b/htdocs/langs/uz_UZ/languages.lang
index cc80b9f1719..ba187326705 100644
--- a/htdocs/langs/uz_UZ/languages.lang
+++ b/htdocs/langs/uz_UZ/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index 127dffb310d..cc76ba88d89 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Remove link
 AddToDraft=Add to draft
 Update=Update
 Close=Close
+CloseAs=Set status to
 CloseBox=Remove widget from your dashboard
 Confirm=Confirm
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Re-Open
 Upload=Upload
 ToLink=Link
 Select=Select
+SelectAll=Select all
 Choose=Choose
 Resize=Resize
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=Cards
 Card=Card
 Now=Now
 HourStart=Start hour
+Deadline=Deadline
 Date=Date
 DateAndHour=Date and hour
 DateToday=Today's date
@@ -264,8 +267,10 @@ DateStart=Start date
 DateEnd=End date
 DateCreation=Creation date
 DateCreationShort=Creat. date
+IPCreation=Creation IP
 DateModification=Modification date
 DateModificationShort=Modif. date
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
@@ -319,6 +324,7 @@ Morning=Morning
 Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Month of the day
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Rate
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Amount tax 2
 AmountLT2=Amount tax 3
 AmountLT1ES=Amount RE
@@ -487,6 +494,7 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
+at=at
 to=to
 To=to
 and=and
@@ -509,6 +517,7 @@ Draft=Draft
 Drafts=Drafts
 StatusInterInvoiced=Invoiced
 Validated=Validated
+ValidatedToProduce=Validated (To produce)
 Opened=Open
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Response
 Priority=Priority
 SendByMail=Send by email
 MailSentBy=Email sent by
+NotSent=Not sent
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
@@ -836,6 +846,7 @@ ListOfTemplates=List of templates
 Gender=Gender
 Genderman=Man
 Genderwoman=Woman
+Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Comments
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Information
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Date of birth
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/uz_UZ/members.lang b/htdocs/langs/uz_UZ/members.lang
index 5ef946ddf67..5812248b129 100644
--- a/htdocs/langs/uz_UZ/members.lang
+++ b/htdocs/langs/uz_UZ/members.lang
@@ -19,14 +19,12 @@ MembersCards=Members business cards
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
 SubscriptionId=Subscription id
+WithoutSubscription=Without subscription
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@@ -81,7 +80,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/uz_UZ/mrp.lang b/htdocs/langs/uz_UZ/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/uz_UZ/mrp.lang
+++ b/htdocs/langs/uz_UZ/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index b59aa2f7080..97db059594f 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/uz_UZ/recruitment.lang b/htdocs/langs/uz_UZ/recruitment.lang
index 73e9a7fa07f..b775e78552e 100644
--- a/htdocs/langs/uz_UZ/recruitment.lang
+++ b/htdocs/langs/uz_UZ/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang
index 81163e8d4b0..660443bcded 100644
--- a/htdocs/langs/uz_UZ/stocks.lang
+++ b/htdocs/langs/uz_UZ/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/uz_UZ/suppliers.lang b/htdocs/langs/uz_UZ/suppliers.lang
index 51562b8bb7a..03b03c75269 100644
--- a/htdocs/langs/uz_UZ/suppliers.lang
+++ b/htdocs/langs/uz_UZ/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/uz_UZ/website.lang b/htdocs/langs/uz_UZ/website.lang
index 4b5294d5e43..03e042e4be6 100644
--- a/htdocs/langs/uz_UZ/website.lang
+++ b/htdocs/langs/uz_UZ/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index 0c59133574f..0426ce8fd0b 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Mặc định cho dịch vụ
 DefaultForProduct=Mặc định cho sản phẩm
 CantSuggest=Không thể gợi ý
 AccountancySetupDoneFromAccountancyMenu=Hầu hết các thiết lập của kế toán được thực hiện từ menu %s
-ConfigAccountingExpert=Cấu hình của các chuyên gia kế toán mô-đun
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Ghi sổ nhật ký
-Journaux=Sổ nhật ký kế toán
+Journals=Sổ nhật ký kế toán
 JournalFinancial=Nhật ký tài chính
 BackToChartofaccounts=Quay trở lại hệ thống tài khoản
 Chartofaccounts=Hệ thống tài khoản
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Tài khoản vãng lai chuyên dụng
 AssignDedicatedAccountingAccount=Tài khoản mới để chỉ định
 InvoiceLabel=Nhãn hóa đơn
@@ -33,8 +35,8 @@ OtherInfo=Thông tin khác
 DeleteCptCategory=Xóa tài khoản kế toán khỏi nhóm
 ConfirmDeleteCptCategory=Bạn có chắc chắn muốn xóa tài khoản kế toán này khỏi nhóm tài khoản kế toán không?
 JournalizationInLedgerStatus=Tình trạng của sổ nhật ký
-AlreadyInGeneralLedger=Đã được ghi nhật ký trong sổ cái
-NotYetInGeneralLedger=Chưa được ghi nhật ký trong sổ cải
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Nhóm trống rỗng, kiểm tra thiết lập nhóm kế toán đã được cá nhân hóa
 DetailByAccount=Hiển thị chi tiết theo tài khoản
 AccountWithNonZeroValues=Tài khoản có giá trị khác không
@@ -43,7 +45,9 @@ CountriesInEEC=Các nước trong EEC
 CountriesNotInEEC=Các nước không thuộc EEC
 CountriesInEECExceptMe=Các quốc gia trong EEC ngoại trừ %s
 CountriesExceptMe=Tất cả các quốc gia trừ %s
-AccountantFiles=Xuât dữ các chứng từ kế toán
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Tài khoản kế toán chính cho khách hàng không được định nghĩa trong thiết lập
 MainAccountForSuppliersNotDefined=Tài khoản kế toán chính cho các nhà cung cấp không được định nghĩa trong thiết lập
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=BƯỚC %s: Thêm hoặc chỉnh sửa các giao dị
 
 AccountancyAreaDescClosePeriod=BƯỚC %s: Đóng khoảng thời gian để chúng ta không thể sửa đổi trong tương lai.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=Một bắt buộc trong thiết lập chưa hoàn tất (mã nhật ký kế toán không được xác định cho tất cả các tài khoản ngân hàng)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Chọn biểu đồ tài khoản đang hoạt động
 ChangeAndLoad=Thay đổi và tải
 Addanaccount=Thêm một tài khoản kế toán
@@ -89,6 +93,8 @@ SubledgerAccount=Tài khoản sổ phụ
 SubledgerAccountLabel=Nhãn tài khoản sổ phụ
 ShowAccountingAccount=Hiển thị tài khoản kế toán
 ShowAccountingJournal=Hiển thị nhật ký kế toán
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Đề xuất tài khoản kế toán
 MenuDefaultAccounts=Tài khoản mặc định
 MenuBankAccounts=Tài khoản ngân hàng
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Ràng buộc báo cáo chi phí
 CreateMvts=Tạo giao dịch mới
 UpdateMvts=Sửa đổi giao dịch
 ValidTransaction=Xác nhận giao dịch
-WriteBookKeeping=Đăng ký giao dịch trong Sổ Cái
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Sổ cái
+BookkeepingSubAccount=Subledger
 AccountBalance=Số dư tài khoản
 ObjectsRef=Tham chiếu đối tượng nguồn
 CAHTF=Tổng số mua từ nhà cung cấp trước thuế
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Vô hiệu hóa ghi trực tiếp giao dịch trong t
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Cho phép xuất dữ liệu bản nháp trong nhật ký
 ACCOUNTANCY_COMBO_FOR_AUX=Bật danh sách kết hợp cho tài khoản công ty con (có thể chậm nếu bạn có nhiều bên thứ ba)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Nhật ký bán hàng
 ACCOUNTING_PURCHASE_JOURNAL=Nhật ký mua hàng
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Tài khoản kế toán chờ
 DONATION_ACCOUNTINGACCOUNT=Tài khoản kế toán cho đăng ký quyên góp.
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Tài khoản kế toán để đăng ký tham gia
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Tài khoản kế toán theo mặc định cho các sản phẩm đã mua (được sử dụng nếu không được xác định trong bảng sản phẩm)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Tài khoản kế toán theo mặc định cho các sản phẩm đã mua trong EEC (được sử dụng nếu không được xác định trong bảng sản phẩm)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Tài khoản kế toán theo mặc định cho các sản phẩm đã mua và được nhập ra khỏi EEC (được sử dụng nếu không được xác định trong bảng sản phẩm)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Theo nhóm được xác định trước
 ByPersonalizedAccountGroups=Theo nhóm đã cá nhân hóa
 ByYear=Theo năm
 NotMatch=Không được thiết lập
-DeleteMvt=Xóa các dòng Sổ cái
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Tháng cần xóa
 DelYear=Năm cần xóa
 DelJournal=Nhật ký cần xóa
-ConfirmDeleteMvt=Điều này sẽ xóa tất cả các dòng của Sổ cái cho năm / tháng và / hoặc từ một nhật ký cụ thể (Ít nhất một tiêu chí là bắt buộc). Bạn sẽ phải sử dụng lại tính năng 'Đăng ký trong kế toán' để có bản ghi bị xóa trong sổ cái.
-ConfirmDeleteMvtPartial=Điều này sẽ xóa giao dịch khỏi Sổ Cái (tất cả các dòng liên quan đến cùng một giao dịch sẽ bị xóa)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Nhật ký tài chính
 ExpenseReportsJournal=Nhật ký báo cáo chi phí
 DescFinanceJournal=Nhật ký tài chính bao gồm tất cả các loại thanh toán bằng tài khoản ngân hàng
-DescJournalOnlyBindedVisible=Đây là chế độ xem bản ghi được ràng buộc với tài khoản kế toán và có thể được ghi vào Sổ Cái.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Tài khoản cho thuế VAT chưa được xác định
 ThirdpartyAccountNotDefined=Tài khoản cho bên thứ ba chưa được xác định
 ProductAccountNotDefined=Tài khoản cho sản phẩm chưa được xác định
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Nhật ký này đã được sử dụng
 AccountingAccountForSalesTaxAreDefinedInto=Lưu ý: Tài khoản kế toán thuế VAT được xác định trong menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Số lượng mục
 NumberOfAccountancyMovements=Số lượng kết chuyển
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Xuất dữ liệu bản nháp nhật ký
@@ -326,6 +339,8 @@ Modelcsv_configurable=Xuất dữ liệu cấu hình CSV
 Modelcsv_FEC=Xuất dữ liệu FEC
 Modelcsv_Sage50_Swiss=Xuất dữ liệu cho Sage 50 Thụy Sĩ
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=ID Hệ thống tài khoản
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index 15e6b1140c3..ef784047979 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Bỏ việc khóa kết nôi
 YourSession=Phiên làm việc của bạn
 Sessions=Phiên người dùng
 WebUserGroup=Người dùng/nhóm trên máy chủ
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Cấu hình PHP của bạn dường như không cho phép liệt kê các phiên hoạt động. Thư mục được sử dụng để lưu phiên ( <b>%s</b> ) có thể được bảo vệ (ví dụ: bằng quyền của hệ điều hành hoặc bằng lệnh open_basingir của PHP).
 DBStoringCharset=Cơ sở dữ liệu bộ ký tự để lưu trữ dữ liệu
 DBSortingCharset=Cơ sở dữ liệu bộ ký tự để sắp xếp dữ liệu
@@ -71,7 +73,7 @@ DisableJavascriptNote=Lưu ý: Đối với mục đích thử nghiệm hoặc g
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Đợi cho đến khi một phím được nhấn trước khi tải nội dung của danh sách kết hợp của bên thứ ba. <br> Điều này có thể tăng hiệu suất nếu bạn có số lượng lớn bên thứ ba, nhưng nó không thuận tiện.
-DelaiedFullListToSelectContact=Đợi cho đến khi một phím được nhấn trước khi tải nội dung của danh sách liên hệ. <br> Điều này có thể tăng hiệu suất nếu bạn có số lượng lớn các liên lạc, nhưng nó không thuận tiện)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Số lượng ký tự để kích hoạt tìm kiếm: %s
 NumberOfBytes=Số byte
 SearchString=Chuỗi tìm kiếm
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=Trên tài liệu của bên thứ ba, có
 JavascriptDisabled=Vô hiệu JavaScript
 UsePreviewTabs=Sử dụng chế độ xem sơ lược tab
 ShowPreview=Hiển thị xem trước
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Xem trước không sẵn có
 ThemeCurrentlyActive=Giao diện hiện đã kích hoạt
 CurrentTimeZone=Mã vùng thời gian PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Kỳ thông báo
 NewByMonth=Mới theo tháng
 Emails=Emails
 EMailsSetup=cài đặt Emails
-EMailsDesc=Trang này cho phép bạn ghi đè các tham số PHP mặc định của mình để gửi email. Trong hầu hết các trường hợp trên hệ điều hành Unix / Linux, thiết lập PHP là chính xác và các tham số này là không cần thiết.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Email hồ sơ người gửi
 EMailsSenderProfileDesc=Bạn có thể giữ trống phần này. Nếu bạn nhập một số email ở đây, chúng sẽ được thêm vào danh sách những người gửi có thể vào combobox khi bạn viết một email mới.
 MAIN_MAIL_SMTP_PORT=Cổng SMTP / SMTPS (giá trị mặc định trong php.ini: <b>%s</b> )
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=ID SMTP (nếu gửi máy chủ yêu cầu xác thực)
 MAIN_MAIL_SMTPS_PW=Mật khẩu SMTP (nếu gửi máy chủ yêu cầu xác thực)
 MAIN_MAIL_EMAIL_TLS=Sử dụng mã hóa TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Sử dụng mã hóa TLS (STARTTLS)
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Sử dụng DKIM để tạo chữ ký email
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Tên miền email để sử dụng với dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Tên của bộ chọn dkim
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Để trống trường này có nghĩa là giá tr
 ExtrafieldParamHelpselect=Danh sách các giá trị phải là các dòng có khóa định dạng, giá trị (trong đó khóa không thể là '0') <br><br> ví dụ: <br> 1, giá trị1 <br> 2, giá trị2 <br> mã3, giá trị3 <br> ... <br><br> Để có danh sách tùy thuộc vào danh sách thuộc tính bổ sung khác: <br> 1, value1 | <i>tùy chọn_ Parent_list_code</i> : Parent_key <br> 2, value2 | <i>tùy chọn_ Parent_list_code</i> : Parent_key <br><br> Để có danh sách tùy thuộc vào danh sách khác: <br> 1, giá trị1 | <i>Parent_list_code</i> : Parent_key <br> 2, giá trị2 | <i>Parent_list_code</i> : Parent_key
 ExtrafieldParamHelpcheckbox=Danh sách các giá trị phải là các dòng có khóa định dạng, giá trị (trong đó khóa không thể là '0') <br><br> ví dụ: <br> 1, giá trị1 <br> 2, giá trị2 <br> 3, giá trị3 <br> ...
 ExtrafieldParamHelpradio=Danh sách các giá trị phải là các dòng có khóa định dạng, giá trị (trong đó khóa không thể là '0') <br><br> ví dụ: <br> 1, giá trị1 <br> 2, giá trị2 <br> 3, giá trị3 <br> ...
-ExtrafieldParamHelpsellist=Danh sách các giá trị đến từ một bảng <br> Cú pháp: tên_bảng: nhãn_field: id_field :: bộ lọc <br> Ví dụ: c_typent: libelle: id :: filter <br><br> - idfilter nhất thiết phải là khóa int chính <br> - bộ lọc có thể là một thử nghiệm đơn giản (ví dụ: active = 1) để chỉ hiển thị giá trị hoạt động <br> Bạn cũng có thể sử dụng $ID$ trong bộ lọc phù thủy là id hiện tại của đối tượng hiện tại <br> Để thực hiện SELECT trong bộ lọc, hãy sử dụng $SEL$ <br> nếu bạn muốn lọc trên các trường ngoài, hãy sử dụng cú pháp Extra.fieldcode = ... (trong đó mã trường là mã của trường ngoài) <br><br> Để có danh sách tùy thuộc vào danh sách thuộc tính bổ sung khác: <br> c_typent: libelle: id: <i>Options_ Parent_list_code</i> | Parent_column: bộ lọc <br><br> Để có danh sách tùy thuộc vào danh sách khác: <br> c_typent: libelle: id: <i>Parent_list_code</i> | Parent_column: bộ lọc
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Danh sách các giá trị đến từ một bảng <br> Cú pháp: tên_bảng: nhãn_field: id_field :: bộ lọc <br> Ví dụ: c_typent: libelle: id :: filter <br><br> bộ lọc có thể là một thử nghiệm đơn giản (ví dụ: active = 1) để chỉ hiển thị giá trị hoạt động <br> Bạn cũng có thể sử dụng $ID$ trong bộ lọc phù thủy là id hiện tại của đối tượng hiện tại <br> Để thực hiện SELECT trong bộ lọc, hãy sử dụng $SEL$ <br> nếu bạn muốn lọc trên các trường ngoài, hãy sử dụng cú pháp Extra.fieldcode = ... (trong đó mã trường là mã của trường ngoài) <br><br> Để có danh sách tùy thuộc vào danh sách thuộc tính bổ sung khác: <br> c_typent: libelle: id: <i>Options_ Parent_list_code</i> | Parent_column: bộ lọc <br><br> Để có danh sách tùy thuộc vào danh sách khác: <br> c_typent: libelle: id: <i>Parent_list_code</i> | Parent_column: bộ lọc
-ExtrafieldParamHelplink=Các tham số phải là ObjectName: Classpath <br> Cú pháp: ObjectName: Classpath <br> Ví dụ: <br> Hiệp hội: societe/class/societe. Class.php <br> Liên hệ: contact/class/contact. Class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Giữ trống cho một dấu phân cách đơn giản <br> Đặt giá trị này thành 1 cho dấu phân cách thu gọn (mặc định mở cho phiên mới, sau đó trạng thái được giữ cho mỗi phiên người dùng) <br> Đặt giá trị này thành 2 cho dấu phân cách thu gọn (mặc định được thu gọn cho phiên mới, sau đó trạng thái được giữ trước mỗi phiên người dùng)
 LibraryToBuildPDF=Thư viện được sử dụng để tạo PDF
 LocalTaxDesc=Một số quốc gia có thể áp dụng hai hoặc ba loại thuế cho mỗi dòng hóa đơn. Nếu đây là trường hợp, chọn loại thuế thứ hai và thứ ba và thuế suất của nó. Loại có thể là: <br> 1: thuế địa phương áp dụng cho các sản phẩm và dịch vụ không có thùng (localtax được tính trên số tiền chưa có thuế) <br> 2: thuế địa phương áp dụng cho các sản phẩm và dịch vụ bao gồm cả thùng (localtax được tính trên số tiền + thuế chính) <br> 3: thuế địa phương áp dụng cho các sản phẩm không có thùng (localtax được tính trên số tiền chưa có thuế) <br> 4: thuế địa phương áp dụng cho các sản phẩm bao gồm vat (localtax được tính trên số tiền + thùng chính) <br> 5: thuế địa phương áp dụng cho các dịch vụ không có thùng (localtax được tính trên số tiền không có thuế) <br> 6: thuế địa phương áp dụng cho các dịch vụ bao gồm vat (localtax được tính trên số tiền + thuế)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s theo sau tên khách hàng bị cắt bớ
 ModuleCompanyCodeSupplierDigitaria=%s theo sau tên nhà cung cấp bị cắt bớt theo bở số lượng ký tự: %s cho mã kế toán nhà cung cấp.
 Use3StepsApproval=Theo mặc định, Đơn đặt hàng cần được tạo và phê duyệt bởi 2 người dùng khác nhau (một bước / người dùng để tạo và một bước / người dùng để phê duyệt. Lưu ý rằng nếu người dùng có cả quyền để tạo và phê duyệt, một bước / người dùng sẽ đủ) . Bạn có thể yêu cầu tùy chọn này để giới thiệu bước thứ ba / phê duyệt của người dùng, nếu số tiền cao hơn giá trị chuyên dụng (vì vậy sẽ cần 3 bước: 1 = xác thực, 2 = phê duyệt đầu tiên và 3 = phê duyệt thứ hai nếu số tiền là đủ). <br> Đặt điều này thành trống nếu một phê duyệt (2 bước) là đủ, đặt nó thành giá trị rất thấp (0,1) nếu luôn luôn cần phê duyệt thứ hai (3 bước).
 UseDoubleApproval=Sử dụng phê duyệt 3 bước khi số tiền (chưa có thuế) cao hơn ...
-WarningPHPMail=CẢNH BÁO: Thông thường tốt hơn là thiết lập các email gửi đi để sử dụng máy chủ email của nhà cung cấp của bạn thay vì thiết lập mặc định. Một số nhà cung cấp email (như Yahoo) không cho phép bạn gửi email từ máy chủ khác ngoài máy chủ của họ. Thiết lập hiện tại của bạn sử dụng máy chủ của ứng dụng để gửi email chứ không phải máy chủ của nhà cung cấp email của bạn, vì vậy một số người nhận (tương thích với giao thức DMARC hạn chế), sẽ hỏi nhà cung cấp email của bạn nếu họ có thể chấp nhận email của bạn và một số nhà cung cấp email (như Yahoo) có thể trả lời &quot;không&quot; vì máy chủ không phải là của họ, vì vậy rất ít Email đã gửi của bạn có thể không được chấp nhận (hãy cẩn thận với hạn ngạch gửi của nhà cung cấp email của bạn). <br> Nếu nhà cung cấp Email của bạn (như Yahoo) có hạn chế này, bạn phải thay đổi thiết lập Email để chọn phương thức khác &quot;Máy chủ SMTP&quot; và nhập máy chủ SMTP và thông tin đăng nhập do nhà cung cấp Email của bạn cung cấp.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=Nếu nhà cung cấp dịch vụ email email của bạn cần hạn chế ứng dụng email khách đến một số địa chỉ IP (rất hiếm), thì đây là địa chỉ IP của tác nhân người dùng thư (MUA) cho ứng dụng ERP CRM của bạn: <strong>%s</strong> .
-WarningPHPMailSPF=Nếu tên miền trong địa chỉ email người gửi của bạn được bảo vệ bởi SPF (yêu cầu nhà cung cấp email của bạn), bạn phải bao gồm các IP sau trong bản ghi SPF của DNS của tên miền của bạn:<strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Nhấn vào đây để hiển thị mô tả
 DependsOn=Mô-đun này cần (các) mô-đun
 RequiredBy=Mô-đun này được yêu cầu bởi (các) mô-đun
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Thêm chức năng để tạo ra tài khoản Bookmark4u từ một tài khoản Dolibarr
 Module60Name=Hình vui nhộn
 Module60Desc=Quản lý hình vui nhộn
 Module70Name=Interventions
@@ -656,7 +662,7 @@ Module50200Desc=Đề nghị cho khách hàng một trang thanh toán trực tuy
 Module50300Name=Cổng thanh toán Stripe
 Module50300Desc=Đề nghị cho khách hàng một trang thanh toán trực tuyến Stripe (thẻ tín dụng / thẻ ghi nợ). Điều này có thể được sử dụng để cho phép khách hàng của bạn thực hiện thanh toán đột xuất hoặc thanh toán liên quan đến một đối tượng Dolibarr cụ thể (hóa đơn, đơn đặt hàng, v.v.)
 Module50400Name=Kế toán (hai sổ)
-Module50400Desc=Quản lý kế toán (hai sổ, hỗ trợ sổ cái chung và phụ trợ). Xuất sổ cái theo một số định dạng phần mềm kế toán khác.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=In trực tiếp (không mở tài liệu) bằng giao diện Cups IPP (Máy in phải hiển thị từ máy chủ và phải cài đặt CUPS trên máy chủ).
 Module55000Name=Thăm dò ý kiến, khảo sát hoặc bình chọn
@@ -671,7 +677,7 @@ Module63000Name=Tài nguyên
 Module63000Desc=Quản lý tài nguyên (máy in, ô tô, phòng, ...) để phân bổ cho các sự kiện
 Permission11=Xem hóa đơn khách hàng
 Permission12=Tạo/chỉnh sửa hóa đơn khách hàng
-Permission13=Hóa đơn khách hàng chưa xác nhận
+Permission13=Invalidate customer invoices
 Permission14=Xác nhận hoá đơn khách hàng
 Permission15=Gửi hóa đơn khách hàng qua email
 Permission16=Tạo thanh toán cho hoá đơn khách hàng
@@ -688,6 +694,7 @@ Permission32=Tạo/chỉnh sửa sản phẩm
 Permission34=Xóa sản phẩm
 Permission36=Xem/quản lý sản phẩm ẩn
 Permission38=Xuất dữ liệu sản phẩm
+Permission39=Ignore minimum price
 Permission41=Xem các dự án và nhiệm vụ (dự án chia sẻ và các dự án tôi  liên lạc). Cũng có thể nhập thời gian tiêu thụ, đối với tôi hoặc hệ thống phân cấp của tôi, trên các nhiệm vụ được giao (Bảng chấm công)
 Permission42=Tạo / sửa đổi dự án (dự án chia sẻ và dự án tôi liên hệ). Cũng có thể tạo các tác vụ và gán người dùng cho dự án và tác vụ
 Permission44=Xóa các dự án (dự án được chia sẻ và các dự án tôi liên hệ)
@@ -696,6 +703,9 @@ Permission61=Xem intervention
 Permission62=Tạo/chỉnh sửa intervention
 Permission64=Xóa intervention
 Permission67=Xuất dữ liệu intervention
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Xem thành viên
 Permission72=Tạo/chỉnh sửa thành viên
 Permission74=Xóa thành viên
@@ -718,6 +728,7 @@ Permission95=Xem báo cáo
 Permission101=Xem sendings
 Permission102=Tạo/chỉnh sửa sendings
 Permission104=Xác nhận sendings
+Permission105=Send sendings by email
 Permission106=Xuất dữ liệu Sendings
 Permission109=Xóa sendings
 Permission111=Xem tài khoản tài chính
@@ -825,10 +836,11 @@ Permission402=Tạo/chỉnh sửa giảm giá
 Permission403=Xác nhận giảm giá
 Permission404=Xóa giảm giá
 Permission430=Sử dụng thanh gỡ lỗi
-Permission511=Xem thanh toán tiền lương
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Tạo / sửa đổi các khoản thanh toán tiền lương
 Permission514=Xóa các khoản thanh toán tiền lương
-Permission517=Xuất dữ liệu lương
+Permission517=Read payments of salaries of everybody
+Permission519=Xuất dữ liệu lương
 Permission520=Xem cho vay
 Permission522=Tạo/Chỉnh sửa cho vay
 Permission524=Xóa cho vay
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Xem hóa đơn vật liệu
 Permission651=Tạo / Sửa đổi nhật hóa đơn vật liệu
 Permission652=Xóa hóa đơn vật liệu
@@ -884,7 +899,9 @@ Permission1185=Phê duyệt đơn đặt hàng mua
 Permission1186=Yêu cầu đơn đặt hàng mua
 Permission1187=Xác nhận đã nhận đơn đặt hàng mua
 Permission1188=Xóa đơn đặt hàng mua
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Phê duyệt (phê duyệt thứ hai) đơn đặt hàng mua
+Permission1191=Export supplier orders and their attributes
 Permission1201=Nhận kết quả của xuất dữ liệu
 Permission1202=Tạo/chỉnh sửa đổi xuất dữ liệu
 Permission1231=Xem hóa đơn nhà cung cấp
@@ -898,6 +915,8 @@ Permission1251=Chạy nhập dữ liệu khối cho dữ liệu bên ngoài vào
 Permission1321=Xuất dữ liệu Hóa đơn khách hàng, các thuộc tính và thanh toán
 Permission1322=Mở lại một hóa đơn thanh toán
 Permission1421=Xuất dữ liệu đơn đặt hàng và các thuộc tính
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Đọc các hành động (sự kiện hoặc tác vụ) được liên kết với tài khoản người dùng của anh ấy (nếu là chủ sở hữu của sự kiện hoặc chỉ được giao cho)
 Permission2402=Tạo / sửa đổi các hành động (sự kiện hoặc tác vụ) được liên kết với tài khoản người dùng của họ (nếu là chủ sở hữu của sự kiện)
 Permission2403=Xóa các hành động (sự kiện hoặc tác vụ) được liên kết với tài khoản người dùng của họ (nếu là chủ sở hữu của sự kiện)
@@ -932,9 +951,13 @@ Permission23001=Xem công việc theo lịch trình
 Permission23002=Tạo/cập nhật công việc theo lịch trình
 Permission23003=Xóa công việc theo lịch trình
 Permission23004=Thực thi công việc theo lịch trình
-Permission50101=Sử dụng Điểm bán hàng
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Xem giao dịch
 Permission50202=Giao dịch nhập dữ liệu
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Ràng buộc sản phẩm và hóa đơn với tài khoản kế toán
 Permission50411=Xem các hoạt động trong Sổ cái
 Permission50412=Viết / Chỉnh sửa các hoạt động trong Sổ cái
@@ -958,6 +981,17 @@ Permission63001=Xem tài nguyên
 Permission63002=Tạo / sửa đổi tài nguyên
 Permission63003=Xóa tài nguyên
 Permission63004=Liên kết tài nguyên với các sự kiện chương trình nghị sự
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Các loại bên thứ ba
 DictionaryCompanyJuridicalType=Pháp nhân bên thứ ba
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Các loại nghỉ phép
 DictionaryOpportunityStatus=Trạng thái khách hàng tiềm năng cho dự án/ khách hàng tiềm năng
 DictionaryExpenseTaxCat=Báo cáo chi phí - Danh mục vận tải
 DictionaryExpenseTaxRange=Báo cáo chi phí - Phạm vi theo danh mục vận chuyển
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Cài đặt đã lưu
 SetupNotSaved=Thiết lập không được lưu
 BackToModuleList=Quay lại danh sách Mô-đun
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Nhãn được sử dụng bởi mặc định nếu không c
 LabelOnDocuments=Nhãn trên các tài liệu
 LabelOrTranslationKey=Nhãn hoặc từ khóa dịch
 ValueOfConstantKey=Giá trị của hằng số
+ConstantIsOn=Option %s is on
 NbOfDays=Số ngày
 AtEndOfMonth=Vào cuối tháng
 CurrentNext=Hiện tại / Tiếp theo
@@ -1145,6 +1182,7 @@ InfoWebServer=Thông tin về máy chủ web
 InfoDatabase=Thông tin về cơ sở dữ liệu
 InfoPHP=Thông tin về PHP
 InfoPerf=Thông tin về hiệu suất thực hiện
+InfoSecurity=About Security
 BrowserName=Tên trình duyệt
 BrowserOS=Trình duyệt hệ điều hành
 ListOfSecurityEvents=Danh sách các sự kiện bảo mật Dolibarr
@@ -1194,7 +1232,8 @@ RestoreDesc=Để khôi phục bản sao lưu Dolibarr, cần có hai bước.
 RestoreDesc2=Khôi phục tệp sao lưu (ví dụ tệp zip) của thư mục "documents" về bản cài đặt Dolibarr mới hoặc vào thư mục tài liệu hiện tại này ( <b>%s</b> ).
 RestoreDesc3=Khôi phục cấu trúc cơ sở dữ liệu và dữ liệu từ tệp kết xuất dự phòng - dump file vào cơ sở dữ liệu của bản cài đặt Dolibarr mới hoặc vào cơ sở dữ liệu của bản cài đặt hiện tại này ( <b>%s</b> ). Cảnh báo, khi quá trình khôi phục hoàn tất, bạn phải sử dụng thông tin đăng nhập / mật khẩu tồn tại từ thời gian sao lưu / cài đặt để kết nối lại. <br> Để khôi phục cơ sở dữ liệu sao lưu vào bản cài đặt hiện tại này, bạn có thể làm theo trợ lý này.
 RestoreMySQL=MySQL nhập dữ liệu
-ForcedToByAModule= Quy luật này buộc <b>%s</b> bởi một mô-đun được kích hoạt
+ForcedToByAModule=Quy luật này buộc <b>%s</b> bởi một mô-đun được kích hoạt
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Các tập tin sao lưu hiện có
 PreviousArchiveFiles=Các tập tin sao lưu hiện có
 WeekStartOnDay=Ngày đầu tiên trong tuần
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=Thành phần PHP %s được tải
 PreloadOPCode=Tải sẵn OPCode được sử dụng
 AddRefInList=Hiển thị danh sách thông tin tham chiếu khách hàng/nhà cung cấp (chọn danh sách hoặc combobox) và hầu hết các siêu liên kết. <br> Các bên thứ ba sẽ xuất hiện với định dạng tên là "CC12345 - SC45678 - Công ty lớn." thay vì "Công ty lớn".
 AddAdressInList=Hiển thị danh sách thông tin địa chỉ khách hàng/nhà cung cấp (chọn danh sách hoặc hộp tổ hợp) <br> Các bên thứ ba sẽ xuất hiện với định dạng tên là "The Big Company corp. - 21 jump street 123456 Big town - USA" thay vì "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Yêu cầu phương thức vận chuyển ưa thích cho bên thứ ba.
 FieldEdition=Biên soạn của trường %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1282,7 +1322,7 @@ GetBarCode=Nhận mã vạch
 NumberingModules=Kiểu thiết lập số
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Quay trở lại một mật khẩu được tạo ra theo thuật toán Dolibarr nội bộ: 8 ký tự có chứa số chia sẻ và ký tự trong chữ thường.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Không có gợi ý tạo mật khẩu. Mật khẩu phải được nhập bằng tay.
 PasswordGenerationPerso=Trả lại mật khẩu theo định nghĩa cấu hình cá nhân của bạn.
 SetupPerso=Theo cấu hình của bạn
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Yêu cầu email để tạo thành viên mới
 MemberSendInformationByMailByDefault=Hộp kiểm để gửi thư xác nhận cho các thành viên (xác nhận hoặc đăng ký mới) là theo mặc định
 VisitorCanChooseItsPaymentMode=Khách truy cập có thể chọn từ các chế độ thanh toán có sẵn
 MEMBER_REMINDER_EMAIL=Cho phép nhắc nhở tự động <b>qua email</b> của các thuê bao đã hết hạn. Lưu ý: Mô-đun <strong>%s</strong> phải được bật và thiết lập chính xác để gửi lời nhắc.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=Thiết lập LDAP
 LDAPGlobalParameters=Các thông số toàn cầu
@@ -1523,7 +1564,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Báo cáo cài đặt trình diễn/ tối ưu hóa
 YouMayFindPerfAdviceHere=Trang này cung cấp một số kiểm tra hoặc lời khuyên liên quan đến hiệu suất.
-NotInstalled=Chưa được cài đặt, vì vậy máy chủ của bạn không bị chậm bởi điều này.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Mức
 SyslogFilename=Tên tập tin và đường dẫn
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Nén và sao lưu các tệp nhật ký gỡ lỗi (được tạo bởi mô-đun Nhật ký để gỡ lỗi)
-SyslogFileNumberOfSaves=Sao lưu nhật ký đăng nhập
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Cấu hình công việc làm sạch theo lịch trình để đặt tần suất sao lưu nhật ký
 ##### Donations #####
 DonationsSetup=Cài đặt module Tài trợ
@@ -1629,7 +1672,7 @@ AdvancedEditor=Trình soạn thảo nâng cao
 ActivateFCKeditor=Kích hoạt trình soạn thảo nâng cao cho:
 FCKeditorForCompany=WYSIWIG tạo / sửa của các yếu tố mô tả và ghi chú (trừ các sản phẩm / dịch vụ)
 FCKeditorForProduct=WYSIWIG tạo / sửa của sản phẩm / dịch vụ mô tả và ghi chú
-FCKeditorForProductDetails=WYSIWIG tạo/soạn sản phẩm cho tất cả các thực thể (đề xuất, đơn đặt hàng, hóa đơn, v.v ...). <font class="warning">Cảnh báo: Không nên sử dụng tùy chọn này cho trường hợp này vì nó có thể gây ra sự cố với các ký tự đặc biệt và định dạng trang khi xây dựng tệp PDF.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Công cụ->eMailing)
 FCKeditorForUserSignature=WYSIWIG tạo / sửa chữ ký người sử dụng
 FCKeditorForMail=WYSIWIG tạo/soạn thảo cho tất cả thư (ngoại trừ Công cụ-> Gửi thư điện tử)
@@ -1639,11 +1682,11 @@ StockSetup=Thiết lập mô-đun tồn kho
 IfYouUsePointOfSaleCheckModule=Nếu bạn sử dụng mô-đun Điểm bán hàng (POS) được cung cấp theo mặc định hoặc mô-đun bên ngoài, thiết lập này có thể bị bỏ qua bởi mô-đun POS của bạn. Hầu hết các mô-đun POS được thiết kế theo mặc định để tạo hóa đơn ngay lập tức và giảm tồn kho bất kể các tùy chọn ở đây. Vì vậy, nếu bạn cần hoặc không giảm tồn kho khi đăng ký bán hàng từ POS của mình, hãy kiểm tra thiết lập mô-đun POS của bạn.
 ##### Menu #####
 MenuDeleted=Menu bị xóa
+Menu=Menu
 Menus=Menu
 TreeMenuPersonalized=Menu cá nhân hóa
 NotTopTreeMenuPersonalized=Các menu được cá nhân hóa không được liên kết với một mục menu trên cùng
 NewMenu=Menu mới
-Menu=Lựa chọn menu
 MenuHandler=Xử lý menu
 MenuModule=Module nguồn
 HideUnauthorizedMenu= Ẩn menu không được phép (màu xám)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Tự động đặt giá trị mặc định này
 AGENDA_DEFAULT_FILTER_TYPE=Tự động đặt loại sự kiện này trong bộ lọc tìm kiếm của chế độ xem chương trình nghị sự
 AGENDA_DEFAULT_FILTER_STATUS=Tự động đặt trạng thái này cho các sự kiện trong bộ lọc tìm kiếm của chế độ xem chương trình nghị sự
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Bật nhắc nhở sự kiện <b>bằng email</b> (tùy chọn nhắc nhở / trì hoãn có thể được xác định trên mỗi sự kiện). Lưu ý: Mô-đun <strong>%s</strong> phải được bật và thiết lập chính xác để có lời nhắc được gửi ở tần số chính xác.
-AGENDA_REMINDER_BROWSER=Bật nhắc nhở sự kiện <b>trên trình duyệt của người dùng</b> (khi đạt đến ngày sự kiện, mỗi người dùng có thể từ chối câu hỏi này từ câu hỏi xác nhận trình duyệt)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Bật thông báo âm thanh
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Hiển thị đối tượng được liên kết vào chế độ xem chương trình nghị sự
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0: Loại thanh toán của khách hàng, 1: Loại thanh toán
 IncludePath=Bao gồm các đường dẫn (được xác định vào biến %s)
 ExpenseReportsSetup=Cài đặt module báo cáo chi phí
 TemplatePDFExpenseReports=Mẫu chứng từ để xuất chứng từ báo cáo chi phí
-ExpenseReportsIkSetup=Thiết lập mô đun Báo cáo chi phí - Chỉ số Milles
 ExpenseReportsRulesSetup=Thiết lập mô đun Báo cáo chi phí - Quy tắc
 ExpenseReportNumberingModules=Mô đun đánh số báo cáo chi phí
 NoModueToManageStockIncrease=Không có module có thể quản lý tăng tồn kho được kích hoạt. Tăng tồn kho sẽ chỉ được thực hiện thủ công.
@@ -1864,7 +1907,7 @@ MailToSendReception=Tiếp nhận
 MailToThirdparty=Bên thứ ba
 MailToMember=Thành viên
 MailToUser=Người dùng
-MailToProject=Trang dự án
+MailToProject=Các dự án
 MailToTicket=Vé
 ByDefaultInList=Hiển thị theo mặc định trên chế độ xem danh sách
 YouUseLastStableVersion=Bạn sử dụng phiên bản ổn định mới nhất
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Tải tìm kiếm bên thứ ba trên %s (chỉ tải)
 LoadThirdPartyFromNameOrCreate=Tải tìm kiếm bên thứ ba trên %s (tạo nếu không tìm thấy)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Mã mục nhập menu (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Vô hiệu hóa tính năng để liên kết tài n
 EnableResourceUsedInEventCheck=Bật tính năng để kiểm tra xem tài nguyên có được sử dụng trong một sự kiện không
 ConfirmUnactivation=Xác nhận reset mô đun
 OnMobileOnly=Chỉ trên màn hình nhỏ (điện thoại thông minh)
-DisableProspectCustomerType=Vô hiệu hóa loại bên thứ ba "Triển vọng + Khách hàng" (vì vậy bên thứ ba phải là Triển vọng hoặc Khách hàng nhưng không thể là cả hai)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Giao diện đơn giản cho người mù
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Bật tùy chọn này nếu bạn là người mù hoặc nếu bạn sử dụng ứng dụng từ trình duyệt văn bản như Lynx hoặc Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Thay đổi màu của giao diện cho người mù màu
@@ -1996,13 +2041,15 @@ UseDebugBar=Sử dụng thanh gỡ lỗi
 DEBUGBAR_LOGS_LINES_NUMBER=Số dòng nhật ký cuối cùng cần giữ trong bảng điều khiển
 WarningValueHigherSlowsDramaticalyOutput=Cảnh báo, giá trị cao hơn làm chậm đáng kể ở đầu ra
 ModuleActivated=Mô-đun %s được kích hoạt và làm chậm giao diện
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Mô hình xuất dữ liệu được chia sẻ với mọi người
 ExportSetup=Thiết lập mô-đun Xuất dữ liệu
 ImportSetup=Thiết lập module nhập liệu
 InstanceUniqueID=ID duy nhất của đối tượng
 SmallerThan=Nhỏ hơn
 LargerThan=Lớn hơn
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=Với tài khoản GMail, nếu bạn đã bật xác thực 2 bước, bạn nên tạo mật khẩu thứ hai dành riêng cho ứng dụng thay vì sử dụng mật khẩu tài khoản của riêng bạn từ https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=Bạn có thể sử dụng hành động này để sử dụng nội dung email để tìm và tải một bên thứ ba hiện có trong cơ sở dữ liệu của bạn. Phần thứ ba được tìm thấy (hoặc được tạo) sẽ được sử dụng cho các hành động sau đây cần nó. Trong trường tham số, bạn có thể sử dụng ví dụ 'EXTRACT: BODY: Name: \\ s ([^ \\ s] *)' nếu bạn muốn trích xuất tên của bên thứ ba từ một chuỗi 'Name: name to find' được tìm thấy trong phần nội dung
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=Thang đo là số vị trí bạn phải di chuyển phần
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/vi_VN/banks.lang b/htdocs/langs/vi_VN/banks.lang
index 4e5a49b93db..162d7062272 100644
--- a/htdocs/langs/vi_VN/banks.lang
+++ b/htdocs/langs/vi_VN/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Thanh toán khác
 VariousPayments=Các thanh toán khác
 ShowVariousPayment=Hiển thị thanh toán khác
 AddVariousPayment=Thêm thanh toán khác
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=Ủy quyền SEPA
 YourSEPAMandate=Ủy quyền SEPA của bạn
 FindYourSEPAMandate=Đây là ủy quyền SEPA của bạn để ủy quyền cho công ty chúng tôi thực hiện lệnh ghi nợ trực tiếp vào ngân hàng của bạn. Trả lại nó đã ký (quét tài liệu đã ký) hoặc gửi thư đến
@@ -176,3 +179,4 @@ BankColorizeMovement=Tô màu cho các kết chuyển
 BankColorizeMovementDesc=Nếu chức năng này được bật, bạn có thể chọn màu nền cụ thể cho các kết chuyển ghi nợ hoặc tín dụng
 BankColorizeMovementName1=Màu nền cho kết chuyển ghi nợ
 BankColorizeMovementName2=Màu nền cho kết chuyển ghi có
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/vi_VN/categories.lang b/htdocs/langs/vi_VN/categories.lang
index 903711aa4ce..bb15ed66bb6 100644
--- a/htdocs/langs/vi_VN/categories.lang
+++ b/htdocs/langs/vi_VN/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Thiết lập thẻ/ danh mục
 CategorieRecursiv=Tự động liên kết với thẻ/ danh mục cha
 CategorieRecursivHelp=Nếu tùy chọn được bật, khi bạn thêm sản phẩm vào danh mục con, sản phẩm cũng sẽ được thêm vào danh mục cha.
 AddProductServiceIntoCategory=Thêm sản phẩm / dịch vụ sau đây
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Hiển thị thẻ/ danh mục
 ByDefaultInList=Theo mặc định trong danh sách
 ChooseCategory=Chọn danh mục
-StocksCategoriesArea=Khu vực Danh mục Kho
-ActionCommCategoriesArea=Khu vực danh mục sự kiện
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Sử dụng hoặc điều hành các danh mục
diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang
index b826fca3864..e559f40ecb5 100644
--- a/htdocs/langs/vi_VN/companies.lang
+++ b/htdocs/langs/vi_VN/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Giấy phép kinh doanh)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (NaN)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=Bạn cũng có thể kiểm tra thủ công trên trang web
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Không phải triển vọng, cũng không phải khách hàng
 JuridicalStatus=Loại pháp nhân
+Workforce=Workforce
 Staff=Nhân viên
 ProspectLevelShort=Tiềm năng
 ProspectLevel=KH tiềm năng
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Điều khoản thanh toán - Nhà cung cấp
 PaymentTypeBoth=Loại thanh toán - Khách hàng và nhà cung cấp
 MulticurrencyUsed=Sử dụng đa tiền tệ
 MulticurrencyCurrency=Tiền tệ
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/vi_VN/ecm.lang b/htdocs/langs/vi_VN/ecm.lang
index 8e9bb729f6f..631914c3b06 100644
--- a/htdocs/langs/vi_VN/ecm.lang
+++ b/htdocs/langs/vi_VN/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Tìm kiếm theo từ khóa
 ECMSearchByEntity=Tìm kiếm theo đối tượng
 ECMSectionOfDocuments=Thư mục tài liệu
 ECMTypeAuto=Tự động
-ECMDocsBySocialContributions=Tài liệu liên quan đến thuế xã hội hoặc tài chính
-ECMDocsByThirdParties=Các tài liệu liên quan đến các bên thứ ba
-ECMDocsByProposals=Các tài liệu liên quan đến đề xuất
-ECMDocsByOrders=Các tài liệu liên quan đến khách hàng các đơn đặt hàng
-ECMDocsByContracts=Các tài liệu liên quan đến hợp đồng
-ECMDocsByInvoices=Các tài liệu liên quan đến hoá đơn cho khách hàng
-ECMDocsByProducts=Các tài liệu liên quan đến sản phẩm
-ECMDocsByProjects=Các tài liệu liên quan đến dự án
-ECMDocsByUsers=Tài liệu liên kết với người dùng
-ECMDocsByInterventions=Tài liệu liên quan đến can thiệp
-ECMDocsByExpenseReports=Tài liệu liên quan đến báo cáo chi phí
-ECMDocsByHolidays=Tài liệu liên quan đến ngày lễ
-ECMDocsBySupplierProposals=Tài liệu liên quan đến đề xuất của nhà cung cấp
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=Không có thư mục được tạo ra
 ShowECMSection=Hiện thư mục
 DeleteSection=Hủy bỏ thư mục
@@ -50,3 +38,6 @@ ReSyncListOfDir=Đồng bộ hóa lại danh sách các thư mục
 HashOfFileContent=Hàm băm nội dung tập tin
 NoDirectoriesFound=Không tìm thấy thư mục
 FileNotYetIndexedInDatabase=Tệp chưa được lập chỉ mục vào cơ sở dữ liệu (cố gắng tải lên lại)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/vi_VN/hrm.lang b/htdocs/langs/vi_VN/hrm.lang
index 7977420fa15..cbac0b87e6e 100644
--- a/htdocs/langs/vi_VN/hrm.lang
+++ b/htdocs/langs/vi_VN/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Nhân viên
 Employee=Nhân viên
 NewEmployee=Tạo nhân viên
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/vi_VN/install.lang b/htdocs/langs/vi_VN/install.lang
index 0df59a9f2df..d11a96b5d67 100644
--- a/htdocs/langs/vi_VN/install.lang
+++ b/htdocs/langs/vi_VN/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Tệp cấu hình <b>%s</b> không thể ghi. Kiểm tra q
 ConfFileIsWritable=Tập tin cấu hình <b>%s</b> có thể ghi.
 ConfFileMustBeAFileNotADir=Tệp cấu hình <b>%s</b> phải là một tệp, không phải là một thư mục.
 ConfFileReload=Tải lại các tham số từ tập tin cấu hình.
-PHPSupportSessions=PHP này hỗ trợ phiên.
 PHPSupportPOSTGETOk=PHP này hỗ trợ các biến POST và GET.
 PHPSupportPOSTGETKo=Có thể thiết lập PHP của bạn không hỗ trợ các biến POST và / hoặc GET. Kiểm tra tham số <b>variables_order</b>  trong php.ini.
-PHPSupportGD=PHP này hỗ trợ các chức năng đồ họa GD.
-PHPSupportCurl=PHP này hỗ trợ Curl.
-PHPSupportCalendar=PHP này hỗ trợ các lịch phần mở rộng.
-PHPSupportUTF8=PHP này hỗ trợ các chức năng UTF8.
-PHPSupportIntl=PHP này hỗ trợ các chức năng Intl.
-PHPSupportxDebug=PHP này hỗ trợ mở rộng chức năng debug 
+PHPSupportSessions=PHP này hỗ trợ phiên.
 PHPSupport=PHP này hỗ trợ %s hàm
 PHPMemoryOK=PHP bộ nhớ phiên tối đa của bạn được thiết lập <b>%s</b>. Điều này là đủ.
 PHPMemoryTooLow=Bộ nhớ phiên tối đa PHP của bạn được đặt thành <b>%s</b> byte. Điều này là quá thấp. Thay đổi <b>php.ini</b> của bạn để đặt tham số <b>memory_limit</b> thành ít nhất <b>%s</b> byte.
diff --git a/htdocs/langs/vi_VN/intracommreport.lang b/htdocs/langs/vi_VN/intracommreport.lang
new file mode 100644
index 00000000000..8a0a7e02cf3
--- /dev/null
+++ b/htdocs/langs/vi_VN/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=Danh sách
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/vi_VN/languages.lang b/htdocs/langs/vi_VN/languages.lang
index 78ad1328ac4..c9dd762ef9f 100644
--- a/htdocs/langs/vi_VN/languages.lang
+++ b/htdocs/langs/vi_VN/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Tây Ban Nha (Panama)
 Language_es_PY=Tây Ban Nha (Paraguay)
 Language_es_PE=Tây Ban Nha (Peru)
 Language_es_PR=Tây Ban Nha (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Tây Ban Nha (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Tây Ban Nha (Venezuela)
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index 00071856294..4a0fe321d58 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Xóa liên kết
 AddToDraft=Thêm vào nháp
 Update=Cập nhật
 Close=Đóng
+CloseAs=Đặt trạng thái thành
 CloseBox=Xóa widget khỏi bảng điều khiển của bạn
 Confirm=Xác nhận
 ConfirmSendCardByMail=Bạn có thực sự muốn gửi nội dung của thẻ này bằng thư đến <b>%s</b> không?
@@ -196,6 +197,7 @@ ReOpen=Mở lại
 Upload=Tải lên
 ToLink=Liên kết
 Select=Chọn
+SelectAll=Select all
 Choose=Lựa
 Resize=Đổi kích thước
 ResizeOrCrop=Thay đổi kích thước hoặc cắt
@@ -256,6 +258,7 @@ Cards=Thẻ
 Card=Thẻ
 Now=Bây giờ
 HourStart=Giờ bắt đầu
+Deadline=Deadline
 Date=Ngày
 DateAndHour=Ngày và giờ
 DateToday=Ngày hôm nay
@@ -264,8 +267,10 @@ DateStart=Ngày bắt đầu
 DateEnd=Ngày kết thúc
 DateCreation=Ngày tạo
 DateCreationShort=Ngày tạo
+IPCreation=Creation IP
 DateModification=Ngày điều chỉnh
 DateModificationShort=Ngày điều chỉnh
+IPModification=Modification IP
 DateLastModification=Ngày sửa đổi mới nhất
 DateValidation=Ngày xác nhận
 DateClosing=Ngày kết thúc
@@ -319,6 +324,7 @@ Morning=Sáng
 Afternoon=Chiều
 Quadri=Quý
 MonthOfDay=Tháng của ngày
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Tỷ lệ
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Số tiền thanh toán, nguyên tệ
 MulticurrencyAmountHT=Số tiền (chưa thuế), nguyên tệ
 MulticurrencyAmountTTC=Số tiền (gồm thuế), nguyên tệ
 MulticurrencyAmountVAT=Số tiền thuế, nguyên tệ
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Số tiền thuế 2
 AmountLT2=Số tiền thuế 3
 AmountLT1ES=Amount RE
@@ -487,6 +494,7 @@ By=Theo
 From=Từ
 FromDate=Từ
 FromLocation=Từ
+at=at
 to=đến
 To=đến
 and=và
@@ -509,6 +517,7 @@ Draft=Dự thảo
 Drafts=Dự thảo
 StatusInterInvoiced=Đã xuất hóa đơn
 Validated=Đã xác nhận
+ValidatedToProduce=Validated (To produce)
 Opened=Mở
 OpenAll=Mở (Tất cả)
 ClosedAll=Đã đóng (Tất cả)
@@ -655,6 +664,7 @@ Response=Đáp trả
 Priority=Ưu tiên
 SendByMail=Gửi bằng email
 MailSentBy=Email gửi bởi
+NotSent=Chưa được gửi
 TextUsedInTheMessageBody=Thân email
 SendAcknowledgementByMail=Gửi email xác nhận
 SendMail=Gửi email
@@ -836,6 +846,7 @@ ListOfTemplates=Danh sách các mẫu
 Gender=Giới tính
 Genderman=Nam
 Genderwoman=Nữ
+Genderother=Khác
 ViewList=Danh sách xem
 ViewGantt=Xem dạng Gantt
 ViewKanban=Xem dạng Kanban
@@ -877,6 +888,8 @@ Miscellaneous=Linh tinh
 Calendar=Lịch
 GroupBy=Nhóm bởi ...
 ViewFlatList=Xem danh sách phẳng
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Xóa chuỗi '%s'
 SomeTranslationAreUncomplete=Một số ngôn ngữ được cung cấp có thể chỉ được dịch một phần hoặc có thể có lỗi. Vui lòng giúp sửa ngôn ngữ của bạn bằng cách đăng ký tại <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> để thêm các cải tiến của bạn.
 DirectDownloadLink=Liên kết tải xuống trực tiếp (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Lô hàng của khách hàng
 SearchIntoExpenseReports=Báo cáo chi tiêu
 SearchIntoLeaves=Nghỉ
 SearchIntoTickets=Vé
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Thanh toán của nhà cung cấp
+SearchIntoMiscPayments=Thanh toán khác
 CommentLink=Chú thích
 NbComments=Số lượng nhận xét
 CommentPage=Không gian nhận xét
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Thông tin
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Ngày tháng năm sinh
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/vi_VN/members.lang b/htdocs/langs/vi_VN/members.lang
index 6d197a30427..790bb7b013c 100644
--- a/htdocs/langs/vi_VN/members.lang
+++ b/htdocs/langs/vi_VN/members.lang
@@ -19,14 +19,12 @@ MembersCards=Danh thiếp thành viên
 MembersList=Danh sách thành viên
 MembersListToValid=Danh sách thành viên dự thảo (sẽ được xác nhận)
 MembersListValid=Danh sách thành viên hợp lệ
-MembersListUpToDate=Danh sách thành viên hợp lệ với đăng ký cập nhật
-MembersListNotUpToDate=Danh sách thành viên hợp lệ với đăng ký đã hết hạn
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=Danh sách thành viên bị chấm dứt
 MembersListQualified=Danh sách thành viên đủ điều kiện
 MenuMembersToValidate=Thành viên dự thảo
 MenuMembersValidated=Thành viên hợp lệ
-MenuMembersUpToDate=Thành viên cập nhật
-MenuMembersNotUpToDate=Thành viên đã hết hạn
 MenuMembersResiliated=Thành viên bị chấm dứt
 MembersWithSubscriptionToReceive=Thành viên có đăng ký để nhận
 MembersWithSubscriptionToReceiveShort=Đăng ký để nhận
@@ -34,6 +32,7 @@ DateSubscription=Ngày đăng ký
 DateEndSubscription=Ngày kết thúc đăng ký
 EndSubscription=Kết thúc đăng ký
 SubscriptionId=Id đăng ký
+WithoutSubscription=Without subscription
 MemberId=ID Thành viên
 NewMember=Thành viên mới
 MemberType=Loại thành viên
@@ -81,7 +80,7 @@ DeleteType=Xóa
 VoteAllowed=Bình chọn cho phép
 Physical=Vật lý
 Moral=Đạo đức
-MorPhy=Tự nhiên
+MorAndPhy=Moral and Physical
 Reenable=Bật lại
 ResiliateMember=Chấm dứt thành viên
 ConfirmResiliateMember=Bạn có chắc chắn muốn chấm dứt thành viên này?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Gửi email để xác nhận thành viên mới
 SendingEmailOnNewSubscription=Gửi email để đăng ký mới
 SendingReminderForExpiredSubscription=Gửi lời nhắc cho đăng ký đã hết hạn
 SendingEmailOnCancelation=Gửi email khi hủy
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Tư cách thành viên của bạn đã được nhận.
 YourMembershipWasValidated=Tư cách thành viên của bạn đã được xác nhận
@@ -167,6 +167,7 @@ MembersStatisticsByState=Thống kê thành viên theo tiểu bang / tỉnh
 MembersStatisticsByTown=Thống kê thành viên theo thị trấn
 MembersStatisticsByRegion=Thống kê thành viên theo khu vực
 NbOfMembers=Số lượng thành viên
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=Không có thành viên đã xác nhận tìm thấy
 MembersByCountryDesc=Màn hình này hiển thị cho bạn số liệu thống kê về các thành viên của các quốc gia. Tuy nhiên, đồ họa phụ thuộc vào dịch vụ đồ thị trực tuyến của Google và chỉ khả dụng nếu kết nối internet đang hoạt động.
 MembersByStateDesc=Màn hình này hiển thị cho bạn số liệu thống kê về các thành viên theo tiểu bang / tỉnh / bang.
@@ -176,6 +177,7 @@ MenuMembersStats=Thống kê
 LastMemberDate=Ngày thành viên mới nhất
 LatestSubscriptionDate=Ngày đăng ký mới nhất
 MemberNature=Bản chất của thành viên
+MembersNature=Nature of members
 Public=Thông tin là công khai
 NewMemberbyWeb=Thành viên mới được thêm vào. Chờ phê duyệt
 NewMemberForm=Hình thức thành viên mới
diff --git a/htdocs/langs/vi_VN/mrp.lang b/htdocs/langs/vi_VN/mrp.lang
index 5e79c6e8c6e..5ca0bd1ddbf 100644
--- a/htdocs/langs/vi_VN/mrp.lang
+++ b/htdocs/langs/vi_VN/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Đơn đặt hàng sản xuất
-MO=Đơn hàng sản xuất
 MOs=Manufacturing orders
+ManufacturingOrder=Đơn hàng sản xuất
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=Khu vực MRP
 MrpSetupPage=Thiết lập mô-đun MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index 452477dd2a9..d2ec4ce1cdc 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Nhiều phân khúc giá cho mỗi sản phẩm/ dịch vụ (mỗi khách hàng một phân khúc giá)
 MultiPricesNumPrices=Số lượng Giá
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Kích hoạt gói sản phẩm ảo
-AssociatedProducts=Sản phẩm ảo
-AssociatedProductsNumber=Số lượng sản phẩm sáng tác sản phẩm ảo này
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Số lượng của gói sản phẩm gốc
 ParentProducts=Sản phẩm cha
-IfZeroItIsNotAVirtualProduct=Nếu 0, sản phẩm này không phải là một sản phẩm ảo
-IfZeroItIsNotUsedByVirtualProduct=Nếu 0, sản phẩm này không được sử dụng bởi bất kỳ sản phẩm ảo
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Bộ lọc từ khóa
 CategoryFilter=Bộ lọc phân nhóm
 ProductToAddSearch=Tìm kiếm sản phẩm để thêm
 NoMatchFound=Không tìm thấy
 ListOfProductsServices=Danh sách sản phẩm/dịch vụ
-ProductAssociationList=Danh sách các sản phẩm/ dịch vụ là các thành phần của sản phẩm ảo này
-ProductParentList=Danh sách sản phẩm ảo / dịch vụ với sản phẩm này như một thành phần
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=Một trong những sản phẩm được chọn là gốc của sản phẩm hiện tại
 DeleteProduct=Xóa một sản phẩm/dịch vụ
 ConfirmDeleteProduct=Bạn có chắc muốn xóa sản phẩm/dịch vụ này ?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Giá trị toàn cầu sẵn có:
 PriceMode=Chế độ giá
 PriceNumeric=Số
 DefaultPrice=giá mặc định
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Tăng/Giảm tồn kho trên thay đổi gốc
 ComposedProduct=Các sản phẩm con
 MinSupplierPrice=Giá mua tối thiểu
@@ -339,6 +340,7 @@ UseProductFournDesc=Thêm một tính năng để xác định các mô tả s
 ProductSupplierDescription=Mô tả sản phẩm của nhà cung cấp
 UseProductSupplierPackaging=Sử dụng đóng gói theo giá của nhà cung cấp (tính toán lại số lượng theo bao bì được đặt theo giá của nhà cung cấp khi thêm / cập nhật dòng trong tài liệu của nhà cung cấp)
 PackagingForThisProduct=Đóng gói
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=Số lượng của dòng được tính toán lại theo đóng gói của nhà cung cấp
 
 #Attributes
diff --git a/htdocs/langs/vi_VN/recruitment.lang b/htdocs/langs/vi_VN/recruitment.lang
index 463f8e555cb..c0feca4d244 100644
--- a/htdocs/langs/vi_VN/recruitment.lang
+++ b/htdocs/langs/vi_VN/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Vị trí công việc
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang
index 4b5a2a57249..b2c7c324651 100644
--- a/htdocs/langs/vi_VN/stocks.lang
+++ b/htdocs/langs/vi_VN/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=ID dịch chuyển %d
 ListMouvementStockProject=Danh sách các dịch chuyển tồn kho liên quan đến dự án
 StocksArea=Khu vực kho
 AllWarehouses=Tất cả kho
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Bao gồm cả dự thảo đơn đặt hàng
 Location=Đến từ
 LocationSummary=Tên ngắn của địa điểm
@@ -122,8 +122,9 @@ DesiredStockDesc=Số lượng tồn kho này sẽ là giá trị được sử
 StockToBuy=Để đặt hàng
 Replenishment=Bổ sung
 ReplenishmentOrders=Đơn đặt hàng bổ sung
-VirtualDiffersFromPhysical=Theo tùy chọn tồn kho tăng/giảm, tồn kho thực và tồn kho ảo (vật lý + đơn hàng hiện tại) có thể khác nhau
-UseVirtualStockByDefault=Sử dụng kho ảo theo mặc định, thay vì cổ vật lý, cho các tính năng bổ sung
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Sử dụng kho ảo
 UsePhysicalStock=Sử dụng vật lý tồn kho
 CurentSelectionMode=Chế độ lựa chọn hiện tại
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=Sản phẩm này đã có trong danh sách
 SelectCategory=Bộ lọc phân nhóm
 SelectFournisseur=Bộ lọc nhà cung cấp
 inventoryOnDate=Hàng tồn kho
-INVENTORY_DISABLE_VIRTUAL=Sản phẩm ảo (bộ): không giảm tồn kho của sản phẩm con
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Sử dụng giá mua nếu không tìm thấy giá mua cuối cùng
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Các biến động tồn kho sẽ có ngày kiểm kho (thay vì ngày xác nhận kiểm kho)
 inventoryChangePMPPermission=Cho phép thay đổi giá trị PMP cho sản phẩm
 ColumnNewPMP=PMP đơn vị mới
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/vi_VN/suppliers.lang b/htdocs/langs/vi_VN/suppliers.lang
index d9b48630c61..eab38bec619 100644
--- a/htdocs/langs/vi_VN/suppliers.lang
+++ b/htdocs/langs/vi_VN/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Đơn đặt hàng mua để xuất hóa đơn
 NbDaysToDelivery=Giao hàng chậm (ngày)
 DescNbDaysToDelivery=Giao hàng trễ nhất của các sản phẩm từ đơn đặt hàng này
 SupplierReputation=Uy tín nhà cung cấp
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Không đặt hàng
 NotTheGoodQualitySupplier=Chất lượng thấp
 ReputationForThisProduct=Uy tín
diff --git a/htdocs/langs/vi_VN/website.lang b/htdocs/langs/vi_VN/website.lang
index ac3e22bfd90..5d047fe8420 100644
--- a/htdocs/langs/vi_VN/website.lang
+++ b/htdocs/langs/vi_VN/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Thêm trang web
 Webpage=Trang web / vùng chứa
 AddPage=Thêm trang / vùng chứa
 HomePage=Trang chủ
-PageContainer=Trang / vùng chứa
+PageContainer=Trang
 PreviewOfSiteNotYetAvailable=Xem trước trang web của bạn <strong>%s</strong> chưa có sẵn. Trước tiên, bạn phải ' <strong>Nhập mẫu trang web đầy đủ</strong> ' hoặc chỉ ' <strong>Thêm trang / vùng chứa</strong> '.
 RequestedPageHasNoContentYet=Trang được yêu cầu có id %s chưa có nội dung hoặc tệp bộ đệm .tpl.php đã bị xóa. Chỉnh sửa nội dung của trang để giải quyết điều này.
 SiteDeleted=Trang web '%s' đã bị xóa
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
index 1a235bd6572..9a49f373c52 100644
--- a/htdocs/langs/zh_CN/accountancy.lang
+++ b/htdocs/langs/zh_CN/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=默认服务
 DefaultForProduct=默认产品
 CantSuggest=无法建议
 AccountancySetupDoneFromAccountancyMenu=大多数会计设置都是从​​菜单%s完成的
-ConfigAccountingExpert=会计专家模块的配置
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=记帐
-Journaux=日记帐
+Journals=日记帐
 JournalFinancial=财务总监日记帐
 BackToChartofaccounts=返回会计科目表
 Chartofaccounts=会计科目表
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=当前专用帐户
 AssignDedicatedAccountingAccount=要分配的新帐户
 InvoiceLabel=发票标签
@@ -33,8 +35,8 @@ OtherInfo=其他信息
 DeleteCptCategory=从组中删除会计帐户
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=记帐状态
-AlreadyInGeneralLedger=已经在分类账中记录
-NotYetInGeneralLedger=尚未在分类账中记录
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=组为空，检查个性化会计组的设置
 DetailByAccount=按帐户显示详细信息
 AccountWithNonZeroValues=具有非零值的帐户
@@ -43,7 +45,9 @@ CountriesInEEC=欧共体国家
 CountriesNotInEEC=非欧共体国家
 CountriesInEECExceptMe=欧共体国家除了%s
 CountriesExceptMe=除%s以外的所有国家/地区
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=未在设置中定义的顾客的主要会计科目
 MainAccountForSuppliersNotDefined=未在设置中定义的供应商的主要会计科目
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=步骤%s：添加或编辑现有交易并生成报告
 
 AccountancyAreaDescClosePeriod=STEP %s：关闭期间，以便禁止修改。
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=设置中的必要步骤未完成（未为所有银行帐户定义会计代码日记帐）
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=选择活动的会计科目表
 ChangeAndLoad=改变和加载
 Addanaccount=添加一个会计科目
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=显示会计科目
 ShowAccountingJournal=显示会计日常报表
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=建议会计科目
 MenuDefaultAccounts=默认帐户
 MenuBankAccounts=银行帐户
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=费用报告绑定
 CreateMvts=创建新交易
 UpdateMvts=修改交易
 ValidTransaction=验证交易
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=分类帐
+BookkeepingSubAccount=Subledger
 AccountBalance=账目平衡
 ObjectsRef=源对象引用
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=禁止在银行帐户中直接记录交易
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=在日记帐上启用草稿导出
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=销售日记帐
 ACCOUNTING_PURCHASE_JOURNAL=采购日记帐
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=会计科目-等待
 DONATION_ACCOUNTINGACCOUNT=会计科目-登记捐款
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=按预定义的组
 ByPersonalizedAccountGroups=通过个性化团体
 ByYear=在今年
 NotMatch=未设定
-DeleteMvt=删除分类帐行
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=删除整年
 DelJournal=日记帐删除
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=这将从分类帐中删除该交易（将删除与同一交易相关的所有行）
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=财务账
 ExpenseReportsJournal=费用报告日常报表
 DescFinanceJournal=财务账包括全部银行账户付款类型
-DescJournalOnlyBindedVisible=这是记录的视图，它绑定到会计帐户并可以记录到分类帐中。
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=未定义增值税的帐户
 ThirdpartyAccountNotDefined=未定义的第三方帐户
 ProductAccountNotDefined=未定义产品的帐户
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=该日常报表已经使用
 AccountingAccountForSalesTaxAreDefinedInto=注意：销售税的会计科目已定义到菜单<b> %s </b>  -  <b> %s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=导出日常报表草稿
@@ -326,6 +339,8 @@ Modelcsv_configurable=导出CSV可配置
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=会计科目表ID
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index be82a61b831..c84a23958aa 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=取消连接锁定
 YourSession=你的会话
 Sessions=Users Sessions
 WebUserGroup=Web 服务器用户/组
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=数据库保存数据的字符编码
 DBSortingCharset=数据库排序数据的字符编码
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=此外，如果您有大量第三方（> 100 000），您可以通过在"设置"-> "其他"中将常量COMPANY_DONOTSEARCH_ANYWHERE设置为1来提高速度。然后搜索将限制为以字符串的开头。
 UseSearchToSelectContactTooltip=此外，如果您有大量第三方（> 100 000），您可以通过在"设置"-> "其他"中将常量CONTACT_DONOTSEARCH_ANYWHERE设置为1来提高速度。然后搜索将限制为以字符串开头。
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=在合作方的文档上，可以选择链
 JavascriptDisabled=禁用 JavaScript
 UsePreviewTabs=使用预览标签
 ShowPreview=显示预览
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=无预览
 ThemeCurrentlyActive=当前使用的主题
 CurrentTimeZone=PHP 服务器的时区
@@ -271,7 +274,7 @@ NoticePeriod=通知期
 NewByMonth=按月新增
 Emails=电子邮件
 EMailsSetup=电子邮件设置
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=电子邮件发件人资料
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS 端口 ( php.ini 文件中的默认值：<b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=已使用资料库以支持生成PDF文件
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=默认情况下，需要由2个不同的用户创建和批准采购订单（一步/用户创建和一步/用户批准。请注意，如果用户同时拥有创建和批准权限，则一步/用户就足够了） 。如果金额高于专用值，您可以要求使用此选项引入第三步/用户批准（因此需要3个步骤：1 =验证，2 =首次批准，3 =如果金额足够则为第二批准）。 <br>如果一个批准（2个步骤）足够，则将其设置为空，如果始终需要第二个批准（3个步骤），则将其设置为非常低的值（0.1）。
 UseDoubleApproval=当金额（不含税）高于......时，使用3步批准
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=如果您的电子邮件SMTP提供商需要将电子邮件客户端限制为某些IP地址（非常罕见），则这是您的ERP CRM应用程序的邮件用户代理（MUA）的IP地址：<strong> %s</strong>。
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=单击以显示说明
 DependsOn=This module needs the module(s)
 RequiredBy=本模块被以下模块需要
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=网络电话
 Module58Desc=网络电话系统集成(Asterisk ...)
-Module59Name=Bookmark4u
-Module59Desc=添加函数从一个Dolibarr帐户生成一个Bookmark4u帐户
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=干预
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=IPP打印
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=问卷, 调查或投票
@@ -671,7 +677,7 @@ Module63000Name=资源
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=读取销售账单
 Permission12=创建/变更发票
-Permission13=取消确认客户发票
+Permission13=Invalidate customer invoices
 Permission14=确认客户发票
 Permission15=通过电邮发送发票
 Permission16=添加客户发票付款记录
@@ -688,6 +694,7 @@ Permission32=创建/变更产品信息
 Permission34=删除产品信息
 Permission36=查看/管理隐藏产品
 Permission38=导出产品信息
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=读取干预
 Permission62=创建/变更干预
 Permission64=删除干预
 Permission67=导出干预措施
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=读取会员
 Permission72=创建/变更会员
 Permission74=删除会员
@@ -718,6 +728,7 @@ Permission95=读取报表
 Permission101=读取发货单信息
 Permission102=创建/变更发货单
 Permission104=确认发送
+Permission105=Send sendings by email
 Permission106=导出发货单
 Permission109=删除发货单
 Permission111=读取财务帐目
@@ -825,10 +836,11 @@ Permission402=创建/变更折扣
 Permission403=确认折扣
 Permission404=删除折扣
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=导出工资
+Permission517=Read payments of salaries of everybody
+Permission519=导出工资
 Permission520=读取贷款
 Permission522=创建/变更贷款
 Permission524=删除贷款
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=获得导出结果
 Permission1202=创建/变更导出信息
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=导入大量外部数据到数据库(载入资料)
 Permission1321=导出客户发票、属性及其付款资料
 Permission1322=重新开立付费账单
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=读取排定任务
 Permission23002=创建/更新排定任务
 Permission23003=删除排定任务
 Permission23004=执行排定任务
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=读取交易
 Permission50202=导入交易
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=读取资源
 Permission63002=创建/变更资源
 Permission63003=删除资源
 Permission63004=将资源链接到议程事件
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=费用报告 - 运输类别
 DictionaryExpenseTaxRange=费用报告 - 按运输类别排列
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=设置已经成功保存
 SetupNotSaved=安装程序未保存
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=如果代码没有翻译则默认使用以下标签
 LabelOnDocuments=文档中的标签
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=月末
 CurrentNext=当前/下一项
@@ -1145,6 +1182,7 @@ InfoWebServer=关于WEB服务器
 InfoDatabase=关于数据库
 InfoPHP=关于PHP
 InfoPerf=关于性能
+InfoSecurity=About Security
 BrowserName=浏览器名称
 BrowserOS=浏览器操作系统
 ListOfSecurityEvents=安全事件清单
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL 导入
-ForcedToByAModule= 此规则被一个启用中的模块强制应用于 <b>%s</b>
+ForcedToByAModule=此规则被一个启用中的模块强制应用于 <b>%s</b>
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=%s 字段的编辑
 FillThisOnlyIfRequired=例如：+2 (请只在时区错误问题出现时填写)
@@ -1282,7 +1322,7 @@ GetBarCode=获取条码
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=返回一个根据 Dolibarr 内部算法生成的密码：8个字符，包含小写数字和字母。
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=返回一个字符串用于设置你的个人密码。
 SetupPerso=根据你的配置
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=设置向会员发送邮件确认(会员确认或添加订阅)复选框默认为启用
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP 设置
 LDAPGlobalParameters=全局参数
@@ -1523,7 +1564,9 @@ LDAPDescValues=例值以载入如下模式的 <b>OpenLDAP</b>为例:<b>core.sche
 ForANonAnonymousAccess=存取访问要求验证， (例如读写访问)
 PerfDolibarr=性能设置/优化报告
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=应用型缓存
 MemcachedNotAvailable=找不到应用缓存。您可以通过安装缓存服务器Memcached和能够使用此缓存服务器的模块来增强性能。<br>更多信息，请访问<a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN"> http： //wiki.dolibarr.org/index.php/Module_MemCached_EN </a>。请注意，很多网络托管服务提供商都没有提供此类缓存服务器。
 MemcachedModuleAvailableButNotSetup=找到应用程序缓存的memcached模块，但模块设置不完整。
@@ -1571,9 +1614,9 @@ SyslogLevel=级别
 SyslogFilename=文件名称和路径
 YouCanUseDOL_DATA_ROOT=您可以使用 DOL_DATA_ROOT/dolibarr.log 来表示“documents”目录下的日志文件。您可以设置不同的路径来保存此文件。
 ErrorUnknownSyslogConstant=常量 %s 不是已知的 Syslog 常数
-OnlyWindowsLOG_USER=Windows 仅支持 LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=压缩和备份调试日志文件（由模块Log生成以进行调试）
-SyslogFileNumberOfSaves=日志备份
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=配置清理预定作业以设置日志备份频率
 ##### Donations #####
 DonationsSetup=捐赠模块设置
@@ -1629,7 +1672,7 @@ AdvancedEditor=高级编辑
 ActivateFCKeditor=为以下为功能启用高级编辑器功能:
 FCKeditorForCompany=描述及注解采用所见即所得的方式建立或编辑(不含产品及服务)
 FCKeditorForProduct=产品/服务的描述及注解采用所见即所得的方式建立或编辑
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= 以所见即所得方式创建/编辑群发邮件(工具->电邮寄送)
 FCKeditorForUserSignature=以所见即所得方式创建/编辑用户签名
 FCKeditorForMail=所有邮件的WYSIWIG创建/版本（工具 - > eMailing除外）
@@ -1639,11 +1682,11 @@ StockSetup=库存模块设置
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=菜单(项)已删除
+Menu=Menu
 Menus=菜单
 TreeMenuPersonalized=个性化选单
 NotTopTreeMenuPersonalized=个性化菜单未链接到顶部菜单条目
 NewMenu=新建菜单
-Menu=菜单的选择
 MenuHandler=菜单处理程序
 MenuModule=源模块
 HideUnauthorizedMenu= 是否隐藏未经授权的菜单 (灰色为不可用)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=<b>通过电子邮件</b>启用事件提醒（可以在每个事件上定义提醒选项/延迟）。注意：必须启用模块<strong> %s </strong>并正确设置才能以正确的频率发送提醒。
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=启用声音通知
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=将链接对象显示在议程视图中
 ##### Clicktodial #####
 ClickToDialSetup=点击拨号模块设置
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=包含路径 (定义变量 %s)
 ExpenseReportsSetup=费用报表模块设置
 TemplatePDFExpenseReports=用于生成费用报表文件的文件模板
-ExpenseReportsIkSetup=模块费用报告的设置 -  Milles索引
 ExpenseReportsRulesSetup=模块费用报告的设置 - 规则
 ExpenseReportNumberingModules=费用报告编号模块
 NoModueToManageStockIncrease=没有能够管理自动库存增加的模块已被激活。库存增加仅在手动输入时完成。
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=合作方
 MailToMember=会员
 MailToUser=用户
-MailToProject=项目页面
+MailToProject=项目
 MailToTicket=票据
 ByDefaultInList=默认显示列表视图
 YouUseLastStableVersion=您使用最新的稳定版本
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=邮编
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=禁用将资源链接到联系人的功能
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=确认模块重置
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/zh_CN/banks.lang b/htdocs/langs/zh_CN/banks.lang
index 6573e296ee9..6f2afe060cc 100644
--- a/htdocs/langs/zh_CN/banks.lang
+++ b/htdocs/langs/zh_CN/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=杂项付款
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA授权
 YourSEPAMandate=您的SEPA授权
 FindYourSEPAMandate=这是您的SEPA授权，授权我们公司向您的银行直接扣款。返回签名（扫描签名文档）或通过邮件发送给
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/zh_CN/categories.lang b/htdocs/langs/zh_CN/categories.lang
index 5015ed42455..dbd3530d85b 100644
--- a/htdocs/langs/zh_CN/categories.lang
+++ b/htdocs/langs/zh_CN/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=标签/分类设置
 CategorieRecursiv=自动链接到父标签/分类
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=添加下面的产品/服务
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=显示标签/分类
 ByDefaultInList=按默认列表
 ChooseCategory=选择类别
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/zh_CN/companies.lang b/htdocs/langs/zh_CN/companies.lang
index 4dc4159c7a0..d2a0362c3fa 100644
--- a/htdocs/langs/zh_CN/companies.lang
+++ b/htdocs/langs/zh_CN/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (专业号码)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE(国家注册)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (社保号)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=教授标识5
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=教授标识5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (社保号)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=钢筋混凝土
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=检查不可能的。检查服务是没有提供的会员国（%s）中。
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=雇员
 ProspectLevelShort=潜力
 ProspectLevel=潜在的准客户
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=货币
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/zh_CN/ecm.lang b/htdocs/langs/zh_CN/ecm.lang
index 6789b37456d..d97e7b37f7c 100644
--- a/htdocs/langs/zh_CN/ecm.lang
+++ b/htdocs/langs/zh_CN/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=搜寻关键字
 ECMSearchByEntity=搜索对象
 ECMSectionOfDocuments=目录中的文件
 ECMTypeAuto=自动
-ECMDocsBySocialContributions=社会或财政税相关文档
-ECMDocsByThirdParties=合作方相关文档
-ECMDocsByProposals=报价相关文档
-ECMDocsByOrders=客户订单相关文档
-ECMDocsByContracts=文件与合约
-ECMDocsByInvoices=客户发票相关文档
-ECMDocsByProducts=产品相关文档
-ECMDocsByProjects=项目相关文件
-ECMDocsByUsers=用户相关文档
-ECMDocsByInterventions=干预相关文档
-ECMDocsByExpenseReports=与费用报告相关的文件
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=没有目录中创建
 ShowECMSection=显示目录
 DeleteSection=删除目录
@@ -50,3 +38,6 @@ ReSyncListOfDir=重新同步目录列表
 HashOfFileContent=散列文件内容
 NoDirectoriesFound=找不到目录
 FileNotYetIndexedInDatabase=文件尚未编入数据库（尝试重新上传）
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/zh_CN/hrm.lang b/htdocs/langs/zh_CN/hrm.lang
index feb3ddf3eb8..bb00a894f4c 100644
--- a/htdocs/langs/zh_CN/hrm.lang
+++ b/htdocs/langs/zh_CN/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=雇员
 Employee=雇员
 NewEmployee=新建雇员
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/zh_CN/install.lang b/htdocs/langs/zh_CN/install.lang
index 4ed9d1f9e42..f1b8ca9dec4 100644
--- a/htdocs/langs/zh_CN/install.lang
+++ b/htdocs/langs/zh_CN/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=配置文件 <b>%s</b> 为可写权限。
 ConfFileMustBeAFileNotADir=配置文件<b> %s </b>必须是文件，而不是目录。
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=PHP多线程支持。
 PHPSupportPOSTGETOk=PHP的POST和GET支持。
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=PHP多线程支持。
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=您的PHP最大session会话内存设置为<b>%s</b>。这应该够了的。
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/zh_CN/intracommreport.lang b/htdocs/langs/zh_CN/intracommreport.lang
new file mode 100644
index 00000000000..c3d706989ae
--- /dev/null
+++ b/htdocs/langs/zh_CN/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=名单
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/zh_CN/languages.lang b/htdocs/langs/zh_CN/languages.lang
index b70928b0819..40a45ccfaec 100644
--- a/htdocs/langs/zh_CN/languages.lang
+++ b/htdocs/langs/zh_CN/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish（巴拿马）
 Language_es_PY=西班牙语（巴拉圭）
 Language_es_PE=西班牙语（秘鲁）
 Language_es_PR=西班牙语（波多黎各）
+Language_es_US=Spanish (USA)
 Language_es_UY=西班牙语（乌拉圭）
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index cfa3a26ae4b..ba5ab7c1706 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -155,6 +155,7 @@ RemoveLink=移除链接
 AddToDraft=添加到草稿
 Update=更新
 Close=关闭
+CloseAs=设置状态
 CloseBox=将插件从你的看板中移除
 Confirm=确认
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=重新开放
 Upload=Upload
 ToLink=链接
 Select=选取
+SelectAll=Select all
 Choose=选择
 Resize=调整大小
 ResizeOrCrop=调整大小或裁剪
@@ -256,6 +258,7 @@ Cards=信息卡
 Card=信息卡
 Now=现在
 HourStart=开始时间
+Deadline=Deadline
 Date=日期
 DateAndHour=日期与小时
 DateToday=今天的日期
@@ -264,8 +267,10 @@ DateStart=开始日期
 DateEnd=结束日期
 DateCreation=创建日期
 DateCreationShort=创建日期
+IPCreation=Creation IP
 DateModification=变更日期
 DateModificationShort=变更日期
+IPModification=Modification IP
 DateLastModification=最后修改日期
 DateValidation=验证日期
 DateClosing=截止日期
@@ -319,6 +324,7 @@ Morning=早上
 Afternoon=中午
 Quadri=四
 MonthOfDay=本月的一天
+DaysOfWeek=Days of week
 HourShort=时
 MinuteShort=分
 Rate=税率
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=付款金额，原始货币
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=金额（包括税），原始货币
 MulticurrencyAmountVAT=金额税，原始货币
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=税额2
 AmountLT2=税额3
 AmountLT1ES=RE 额
@@ -487,6 +494,7 @@ By=由
 From=从
 FromDate=从
 FromLocation=从
+at=at
 to=至
 To=至
 and=和
@@ -509,6 +517,7 @@ Draft=草稿
 Drafts=草稿
 StatusInterInvoiced=Invoiced
 Validated=批准
+ValidatedToProduce=Validated (To produce)
 Opened=打开
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=反应
 Priority=优先级
 SendByMail=Send by email
 MailSentBy=电子邮件发送者：
+NotSent=不发送
 TextUsedInTheMessageBody=电子邮件正文
 SendAcknowledgementByMail=发送确认邮件
 SendMail=发送电子邮件
@@ -836,6 +846,7 @@ ListOfTemplates=模板列表
 Gender=性别
 Genderman=男人
 Genderwoman=女人
+Genderother=其他
 ViewList=列表视图
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=各项设定
 Calendar=日历
 GroupBy=分组：
 ViewFlatList=查看全部列表
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=删除字符串'%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=直接下载链接（公共/外部）
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=客户运输
 SearchIntoExpenseReports=费用报表
 SearchIntoLeaves=Leave
 SearchIntoTickets=票据
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=杂项付款
 CommentLink=说明
 NbComments=评论数量
 CommentPage=评论空间
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=信息
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=生日
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/zh_CN/members.lang b/htdocs/langs/zh_CN/members.lang
index 6c9362fb204..464a3eff1ce 100644
--- a/htdocs/langs/zh_CN/members.lang
+++ b/htdocs/langs/zh_CN/members.lang
@@ -19,14 +19,12 @@ MembersCards=会员名片
 MembersList=会员列表
 MembersListToValid=准会员 (待验证)列表
 MembersListValid=有效人员名录
-MembersListUpToDate=最新订阅有效会员列表
-MembersListNotUpToDate=即日起订阅的有效会员列表
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=解雇会员列表
 MembersListQualified=合格会员列表
 MenuMembersToValidate=待定会员
 MenuMembersValidated=认证会员
-MenuMembersUpToDate=新进人员
-MenuMembersNotUpToDate=过期会员
 MenuMembersResiliated=解雇会员
 MembersWithSubscriptionToReceive=接受订阅会员
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=认购日期
 DateEndSubscription=认购结束日期
 EndSubscription=最终订阅
 SubscriptionId=认购编号
+WithoutSubscription=Without subscription
 MemberId=会员ID
 NewMember=新会员
 MemberType=会员类型
@@ -81,7 +80,7 @@ DeleteType=删除
 VoteAllowed=是否允许投票
 Physical=普通会员
 Moral=荣誉会员
-MorPhy=属性
+MorAndPhy=Moral and Physical
 Reenable=重新启用
 ResiliateMember=终止会员
 ConfirmResiliateMember=您确定要终止此会员吗？
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=发送有关新成员验证的电子邮件
 SendingEmailOnNewSubscription=在新订阅上发送电子邮件
 SendingReminderForExpiredSubscription=发送过期订阅的提醒
 SendingEmailOnCancelation=取消发送电子邮件
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=您的会员资格已收到。
 YourMembershipWasValidated=您的会员资格已经过验证
@@ -167,6 +167,7 @@ MembersStatisticsByState=成员由州/省的统计信息
 MembersStatisticsByTown=按村镇统计人员
 MembersStatisticsByRegion=各地区会员统计
 NbOfMembers=人员数量
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=空空如也——未发现已经验证的成员
 MembersByCountryDesc=这个界面显示按国别统计人员的数据。图形依赖于谷歌在线图形服务，因此当然需要连网才能正常工作。
 MembersByStateDesc=此界面显示按省/市/村镇统计人员的数据。
@@ -176,6 +177,7 @@ MenuMembersStats=统计
 LastMemberDate=最新成员日期
 LatestSubscriptionDate=最新订阅日期
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=信息是否公开
 NewMemberbyWeb=增加了新成员。等待批准中
 NewMemberForm=新成员申请表
diff --git a/htdocs/langs/zh_CN/mrp.lang b/htdocs/langs/zh_CN/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/zh_CN/mrp.lang
+++ b/htdocs/langs/zh_CN/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index 010f84186a7..e9ad7c64214 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=价格个数
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=组成此虚拟产品的产品数量
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=父级包装产品的数量
 ParentProducts=父产品
-IfZeroItIsNotAVirtualProduct=0 表示非虚拟产品
-IfZeroItIsNotUsedByVirtualProduct=0 表示此产品未被任何虚拟产品引用。
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=关键词筛选
 CategoryFilter=分类筛选
 ProductToAddSearch=搜索要添加的产品
 NoMatchFound=未发现匹配项目
 ListOfProductsServices=产品/服务清单
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=由此产品组成的虚拟产品或服务
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=所选产品中有当前产品的父级产品
 DeleteProduct=删除产品/服务
 ConfirmDeleteProduct=您确定要删除此产品/服务吗？
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=全局变量值:
 PriceMode=价格模式
 PriceNumeric=数字
 DefaultPrice=默认价格
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=增加/减少父库存变化
 ComposedProduct=Child products
 MinSupplierPrice=最低购买价格
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/zh_CN/recruitment.lang b/htdocs/langs/zh_CN/recruitment.lang
index 4ec45432005..1fd9b48e629 100644
--- a/htdocs/langs/zh_CN/recruitment.lang
+++ b/htdocs/langs/zh_CN/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=工作岗位
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/zh_CN/stocks.lang b/htdocs/langs/zh_CN/stocks.lang
index 3979fe7c0d4..2a32f22f414 100644
--- a/htdocs/langs/zh_CN/stocks.lang
+++ b/htdocs/langs/zh_CN/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=移库ID%d
 ListMouvementStockProject=与项目相关的库存变动清单
 StocksArea=仓库区
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=位置
 LocationSummary=位置简称
@@ -122,8 +122,9 @@ DesiredStockDesc=此库存金额将是用于通过补货功能填充库存的值
 StockToBuy=要订购
 Replenishment=补货
 ReplenishmentOrders=补货订单
-VirtualDiffersFromPhysical=根据增加/减少股票期权，实物股票和虚拟股票（实物+当前订单）可能会有所不同
-UseVirtualStockByDefault=默认情况下使用虚拟库存，而不是物理库存，用于补货功能
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=使用虚拟库位
 UsePhysicalStock=使用物理库位
 CurentSelectionMode=当前所选模式
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=此产品已列入清单
 SelectCategory=分类筛选
 SelectFournisseur=Vendor filter
 inventoryOnDate=库存
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=如果找不到最后买入价，请使用买入价
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=允许更改产品的PMP值
 ColumnNewPMP=新单位PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/zh_CN/suppliers.lang b/htdocs/langs/zh_CN/suppliers.lang
index 104c84a126f..0c96e366e26 100644
--- a/htdocs/langs/zh_CN/suppliers.lang
+++ b/htdocs/langs/zh_CN/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=采购订单发票
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=供应商声誉
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=不订购
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=信誉
diff --git a/htdocs/langs/zh_CN/website.lang b/htdocs/langs/zh_CN/website.lang
index 7cf9bdab8ef..847c0ea30c2 100644
--- a/htdocs/langs/zh_CN/website.lang
+++ b/htdocs/langs/zh_CN/website.lang
@@ -31,7 +31,7 @@ AddWebsite=添加网站
 Webpage=网页/容器
 AddPage=添加页面/容器
 HomePage=主页
-PageContainer=页/容器
+PageContainer=页面
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=ID为%s的请求页面尚无内容，或者删除了缓存文件.tpl.php。编辑页面内容以解决此问题。
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS 源
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/zh_HK/accountancy.lang b/htdocs/langs/zh_HK/accountancy.lang
index 7b59e33b296..3211a0b62df 100644
--- a/htdocs/langs/zh_HK/accountancy.lang
+++ b/htdocs/langs/zh_HK/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting expert
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=Journals
+Journals=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Chart of accounts
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bank accounts
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=By year
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
@@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/zh_HK/admin.lang b/htdocs/langs/zh_HK/admin.lang
index d7c4eb282cd..f1c41a3b62b 100644
--- a/htdocs/langs/zh_HK/admin.lang
+++ b/htdocs/langs/zh_HK/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
 CurrentTimeZone=TimeZone PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Interventions
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
+Permission13=Invalidate customer invoices
 Permission14=Validate customer invoices
 Permission15=Send customer invoices by email
 Permission16=Create payments for customer invoices
@@ -688,6 +694,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Read members
 Permission72=Create/modify members
 Permission74=Delete members
@@ -718,6 +728,7 @@ Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
@@ -825,10 +836,11 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Edition of field %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1282,7 +1322,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1381,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Global parameters
@@ -1523,7 +1564,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1614,9 @@ SyslogLevel=Level
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
@@ -1629,7 +1672,7 @@ AdvancedEditor=Advanced editor
 ActivateFCKeditor=Activate advanced editor for:
 FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
 FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1639,11 +1682,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1907,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
-MailToProject=Projects page
+MailToProject=Projects
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -1996,13 +2041,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/zh_HK/banks.lang b/htdocs/langs/zh_HK/banks.lang
index 75f9549dca5..9500a5b8b2e 100644
--- a/htdocs/langs/zh_HK/banks.lang
+++ b/htdocs/langs/zh_HK/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
@@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/zh_HK/categories.lang b/htdocs/langs/zh_HK/categories.lang
index 9bb71984ecf..ba37a43b4ec 100644
--- a/htdocs/langs/zh_HK/categories.lang
+++ b/htdocs/langs/zh_HK/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/zh_HK/companies.lang b/htdocs/langs/zh_HK/companies.lang
index 92674363ced..dadff6a7894 100644
--- a/htdocs/langs/zh_HK/companies.lang
+++ b/htdocs/langs/zh_HK/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
 ProspectLevel=Prospect potential
@@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Currency
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/zh_HK/ecm.lang b/htdocs/langs/zh_HK/ecm.lang
index 369ac6dfdfa..71df60734fb 100644
--- a/htdocs/langs/zh_HK/ecm.lang
+++ b/htdocs/langs/zh_HK/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=Search by keywords
 ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to vendor proposals
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/zh_HK/hrm.lang b/htdocs/langs/zh_HK/hrm.lang
index 6cc7f6bef24..3b8f137e103 100644
--- a/htdocs/langs/zh_HK/hrm.lang
+++ b/htdocs/langs/zh_HK/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions
 Employees=Employees
 Employee=Employee
 NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/zh_HK/install.lang b/htdocs/langs/zh_HK/install.lang
index 2d708c04147..63947dad154 100644
--- a/htdocs/langs/zh_HK/install.lang
+++ b/htdocs/langs/zh_HK/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportSessions=This PHP supports sessions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
diff --git a/htdocs/langs/zh_HK/intracommreport.lang b/htdocs/langs/zh_HK/intracommreport.lang
new file mode 100644
index 00000000000..3060300b974
--- /dev/null
+++ b/htdocs/langs/zh_HK/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=List
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/zh_HK/languages.lang b/htdocs/langs/zh_HK/languages.lang
index cc80b9f1719..ba187326705 100644
--- a/htdocs/langs/zh_HK/languages.lang
+++ b/htdocs/langs/zh_HK/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
+Language_es_US=Spanish (USA)
 Language_es_UY=Spanish (Uruguay)
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
diff --git a/htdocs/langs/zh_HK/main.lang b/htdocs/langs/zh_HK/main.lang
index 0af5c66f0e0..96c68cdcfa3 100644
--- a/htdocs/langs/zh_HK/main.lang
+++ b/htdocs/langs/zh_HK/main.lang
@@ -155,6 +155,7 @@ RemoveLink=Remove link
 AddToDraft=Add to draft
 Update=Update
 Close=Close
+CloseAs=Set status to
 CloseBox=Remove widget from your dashboard
 Confirm=Confirm
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -196,6 +197,7 @@ ReOpen=Re-Open
 Upload=Upload
 ToLink=Link
 Select=Select
+SelectAll=Select all
 Choose=Choose
 Resize=Resize
 ResizeOrCrop=Resize or Crop
@@ -256,6 +258,7 @@ Cards=Cards
 Card=Card
 Now=Now
 HourStart=Start hour
+Deadline=Deadline
 Date=Date
 DateAndHour=Date and hour
 DateToday=Today's date
@@ -264,8 +267,10 @@ DateStart=Start date
 DateEnd=End date
 DateCreation=Creation date
 DateCreationShort=Creat. date
+IPCreation=Creation IP
 DateModification=Modification date
 DateModificationShort=Modif. date
+IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
@@ -319,6 +324,7 @@ Morning=Morning
 Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Month of the day
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Rate
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Amount tax 2
 AmountLT2=Amount tax 3
 AmountLT1ES=Amount RE
@@ -487,6 +494,7 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
+at=at
 to=to
 To=to
 and=and
@@ -509,6 +517,7 @@ Draft=Draft
 Drafts=Drafts
 StatusInterInvoiced=Invoiced
 Validated=Validated
+ValidatedToProduce=Validated (To produce)
 Opened=Open
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -655,6 +664,7 @@ Response=Response
 Priority=Priority
 SendByMail=Send by email
 MailSentBy=Email sent by
+NotSent=Not sent
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
@@ -836,6 +846,7 @@ ListOfTemplates=List of templates
 Gender=Gender
 Genderman=Man
 Genderwoman=Woman
+Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Comments
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1078,8 +1094,16 @@ ByStatus=By status
 InformationMessage=Information
 Used=Used
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
+CREATEInDolibarr=Record %s created
 MODIFYInDolibarr=Record %s modified
 DELETEInDolibarr=Record %s deleted
 VALIDATEInDolibarr=Record %s validated
 APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Date of birth
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/zh_HK/members.lang b/htdocs/langs/zh_HK/members.lang
index 5ef946ddf67..5812248b129 100644
--- a/htdocs/langs/zh_HK/members.lang
+++ b/htdocs/langs/zh_HK/members.lang
@@ -19,14 +19,12 @@ MembersCards=Members business cards
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
 SubscriptionId=Subscription id
+WithoutSubscription=Without subscription
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@@ -81,7 +80,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/zh_HK/mrp.lang b/htdocs/langs/zh_HK/mrp.lang
index dd830a8e434..f018be890cc 100644
--- a/htdocs/langs/zh_HK/mrp.lang
+++ b/htdocs/langs/zh_HK/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Manufacturing Orders
-MO=Manufacturing Order
 MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -76,3 +76,5 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/zh_HK/products.lang b/htdocs/langs/zh_HK/products.lang
index b59aa2f7080..97db059594f 100644
--- a/htdocs/langs/zh_HK/products.lang
+++ b/htdocs/langs/zh_HK/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/zh_HK/recruitment.lang b/htdocs/langs/zh_HK/recruitment.lang
index 73e9a7fa07f..b775e78552e 100644
--- a/htdocs/langs/zh_HK/recruitment.lang
+++ b/htdocs/langs/zh_HK/recruitment.lang
@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/zh_HK/stocks.lang b/htdocs/langs/zh_HK/stocks.lang
index 81163e8d4b0..660443bcded 100644
--- a/htdocs/langs/zh_HK/stocks.lang
+++ b/htdocs/langs/zh_HK/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/zh_HK/suppliers.lang b/htdocs/langs/zh_HK/suppliers.lang
index 51562b8bb7a..03b03c75269 100644
--- a/htdocs/langs/zh_HK/suppliers.lang
+++ b/htdocs/langs/zh_HK/suppliers.lang
@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay (days)
 DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/zh_HK/website.lang b/htdocs/langs/zh_HK/website.lang
index 4b5294d5e43..03e042e4be6 100644
--- a/htdocs/langs/zh_HK/website.lang
+++ b/htdocs/langs/zh_HK/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
 PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
index c169b603290..bf49bbd2fba 100644
--- a/htdocs/langs/zh_TW/accountancy.lang
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -18,23 +18,25 @@ DefaultForService=服務的預設
 DefaultForProduct=產品的預設
 CantSuggest=無法建議
 AccountancySetupDoneFromAccountancyMenu=從%s選單的大部分會計設定已完成
-ConfigAccountingExpert=會計專家模組的組態
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=註冊到日記帳
-Journaux=日記帳
+Journals=日記帳
 JournalFinancial=財務日記帳
 BackToChartofaccounts=回到會計科目表
 Chartofaccounts=會計科目表
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=目前的專用帳戶
 AssignDedicatedAccountingAccount=新帳戶指派給
 InvoiceLabel=發票標籤
-OverviewOfAmountOfLinesNotBound=行數金額的概述未綁定到會計帳戶
-OverviewOfAmountOfLinesBound=行數金額的概述已綁定到會計帳戶
+OverviewOfAmountOfLinesNotBound=行金額的總攬未綁定到會計帳戶
+OverviewOfAmountOfLinesBound=行金額的總攬已綁定到會計帳戶
 OtherInfo=其他資訊
 DeleteCptCategory=從群組移除會計帳戶
 ConfirmDeleteCptCategory=您確定要從會計帳戶組中刪除此會計帳戶嗎？
 JournalizationInLedgerStatus=日誌狀態
-AlreadyInGeneralLedger=已經記錄在分類帳了
-NotYetInGeneralLedger=尚未記錄至分類帳
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=群組是空的，檢查個人化會計群組的設定
 DetailByAccount=依帳戶顯示細節
 AccountWithNonZeroValues=非零值的帳戶
@@ -43,7 +45,9 @@ CountriesInEEC=歐盟國家
 CountriesNotInEEC=非歐盟國家
 CountriesInEECExceptMe=除了%s以外的歐盟國家
 CountriesExceptMe=除了%s以外的所有國家
-AccountantFiles=輸出會計文件
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=在設定中客戶的主要會計帳戶尚未定義
 MainAccountForSuppliersNotDefined=在設定中供應商的主要會計帳戶尚未定義
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=步驟%s：新增或編輯現有交易並生成報告
 
 AccountancyAreaDescClosePeriod=步驟%s：關帳期，因此我們之後無法進行修改。
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=設定中的強制性步驟尚未完成（未為所有銀行帳戶定義會計代碼日記帳）
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=選擇有效的會計科目表
 ChangeAndLoad=修改並載入
 Addanaccount=新增會計科目
@@ -89,6 +93,8 @@ SubledgerAccount=子帳帳戶
 SubledgerAccountLabel=子帳帳戶標籤
 ShowAccountingAccount=顯示會計項目
 ShowAccountingJournal=顯示會計日記帳
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=建議的會計項目
 MenuDefaultAccounts=預設會計項目
 MenuBankAccounts=銀行帳戶
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=費用報表的關聯
 CreateMvts=建立新的交易
 UpdateMvts=交易的修改
 ValidTransaction=驗證交易
-WriteBookKeeping=在總帳中記錄交易
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=總帳
+BookkeepingSubAccount=Subledger
 AccountBalance=帳戶餘額
 ObjectsRef=參考的來源物件
 CAHTF=稅前總採購供應商
@@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=停用銀行帳戶中直接記錄交易
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=在日記帳上啟用草稿匯出
 ACCOUNTANCY_COMBO_FOR_AUX=為子公司帳戶啟用組合列表（如果您有很多合作方，可能會很慢）
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=銷售日記帳
 ACCOUNTING_PURCHASE_JOURNAL=採購日記帳
@@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=等待的會計科目
 DONATION_ACCOUNTINGACCOUNT=註冊捐款的會計科目
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=用於註冊訂閱的會計科目
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=所購買產品的預設會計科目（如果在產品表中未定義則使用）
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=預設情況下，在EEC中所購買產品的會計帳戶（如果未在產品單中定義則使用）
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=預設情況下，用於在EEC以外購買產品並且輸入產品的會計帳戶（如果在產品表中未定義，則使用）
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=依大類
 ByPersonalizedAccountGroups=依個人化大類
 ByYear=依年度
 NotMatch=未設定
-DeleteMvt=刪除總帳行
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=刪除月份
 DelYear=刪除年度
 DelJournal=刪除日記帳
-ConfirmDeleteMvt=這將刪特定日記帳中所有分類帳行的年/月（至少需要一個條件）。您將必須重新使用“註冊未會計”功能，才能將已刪除的記錄重新存入分類帳。
-ConfirmDeleteMvtPartial=這將從總帳中刪除交易（與同一交易相關的所有行都將被刪除）
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=財務日記帳
 ExpenseReportsJournal=費用報表日記帳
 DescFinanceJournal=財務日記帳包含由銀行帳戶支出的全部付款資料。
-DescJournalOnlyBindedVisible=檢視此記錄的已關聯的會計項目及總帳的記錄
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=營業稅帳戶未定義
 ThirdpartyAccountNotDefined=未定義的合作方科目
 ProductAccountNotDefined=產品會計科目未定義
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=此日記帳已使用
 AccountingAccountForSalesTaxAreDefinedInto=注意：銷項稅額的會計項目定義到選單 <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=條目數
 NumberOfAccountancyMovements=移動次數
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=匯出日記帳草稿
@@ -326,6 +339,8 @@ Modelcsv_configurable=匯出為可設置CSV
 Modelcsv_FEC=匯出為FEC
 Modelcsv_Sage50_Swiss=匯出為Sage 50 Switzerland
 Modelcsv_winfic=匯出Winfic-eWinfic-WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=會計項目表ID
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index e3457221e99..833e0197a6b 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=移除連線鎖定
 YourSession=您的程序
 Sessions=用戶程序
 WebUserGroup=網頁伺服器用戶/組別
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=您的PHP設定似乎不允許列出活動程序。用於保存程序的資料夾（ <b>%s</b> ）可能受到保護（例如，通過OS權限或PHP指令open_basedir）。
 DBStoringCharset=儲存資料的資料庫字集
 DBSortingCharset=資料排序以資料庫字集
@@ -71,7 +73,7 @@ DisableJavascriptNote=注意：用於測試或調整目的。為了優化盲人
 UseSearchToSelectCompanyTooltip=另外您若有大量合作方 (> 100,000), 您可在 "設定 -> 其他" 設定常數 COMPANY_DONOTSEARCH_ANYWHERE 為 1 增加速度。搜尋則會只限制在字串的開頭。
 UseSearchToSelectContactTooltip=另外您若有大量合作方 (> 100,000), 您可在 " 設定 -> 其他" 中設定常數 CONTACT_DONOTSEARCH_ANYWHERE 為 1 以增加速度。搜尋則會只限制在字串的開頭。
 DelaiedFullListToSelectCompany=等待直到按下任一鍵，然後再加載合作方組合清單的內容。 <br>如果您有大量的合作方，這可能會提高性能，但是不太方便。
-DelaiedFullListToSelectContact=等待直到按下任一鍵，然後再載入“聯絡人”組合清單的內容。 <br>如果您有大量的聯絡人，這可能會提高性能，但不太方便）
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=觸發搜尋的字元號：%s
 NumberOfBytes=位元數
 SearchString=尋找字串
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=在合作方的文件上，可選擇已連
 JavascriptDisabled=JavaScript 不啓動
 UsePreviewTabs=使用預覽分頁
 ShowPreview=顯示預覽
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=無法預覽
 ThemeCurrentlyActive=目前可用主題
 CurrentTimeZone=PHP (伺服器)時區
@@ -271,7 +274,7 @@ NoticePeriod=通知期
 NewByMonth=依月份的新通知
 Emails=電子郵件
 EMailsSetup=電子郵件設定
-EMailsDesc=該頁面允許您覆蓋預設的發送電子郵件PHP參數。在Unix / Linux操作系統上在大多數情況下，PHP設定皆正確，並且不需要這些參數。
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=電子郵件寄件者資訊
 EMailsSenderProfileDesc=您可以將此部分保留空白。如果您在此處輸入一些電子郵件，當您編寫新電子郵件時，它們將被增加到組合框中的可能寄件人清單中。
 MAIN_MAIL_SMTP_PORT=SMTP / SMTPS連接埠（php.ini中的預設值： <b>%s</b> ）
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP 帳號（如果發送服務器需要身份驗證）
 MAIN_MAIL_SMTPS_PW=SMTP密碼（如果發送伺服器需要身份驗證）
 MAIN_MAIL_EMAIL_TLS=使用TLS（SSL）加密
 MAIN_MAIL_EMAIL_STARTTLS=使用TLS（STARTTLS）加密
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=使用數位簽章產生電子郵件簽名
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=使用數位簽章的電子郵件網域
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=數位簽章選擇器名稱
@@ -300,9 +304,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=手動寄送的預設寄件人電子郵件（用戶
 UserEmail=用戶電子郵件
 CompanyEmail=公司電子郵件
 FeatureNotAvailableOnLinux=在Unix系列系統中不能使用功能。在本地測試您的寄送郵件程式。
-FixOnTransifex=Fix the translation on the online translation platform of project
+FixOnTransifex=在此專案的網路翻譯平台修正翻譯
 SubmitTranslation=如果此語言的翻譯不完整或發現錯誤，則可以通過編輯<b>langs / %s</b>資料夾中的文件來更正此錯誤，然後將更改提交到www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
+SubmitTranslationENUS=如果此語系的翻譯還未完成或是您發現錯誤，您可以在目錄 <b>langs/%s</b> 編輯檔案並更正然後在 dolibarr.org/forum 提交修改的檔案或是，如果您是開發者，用 PR 在 github.com/Dolibarr/dolibarr
 ModuleSetup=模組設定
 ModulesSetup=模組/程式設定
 ModuleFamilyBase=系統
@@ -387,12 +391,12 @@ ModuleMustBeEnabledFirst=若您需要此功能，您首先要啟用模組<b>%s</
 SecurityToken=安全的網址的金鑰
 NoSmsEngine=沒有可用的簡訊發送管理器.由於依賴於外部供應商,所以預設發布版本未安裝簡訊發送管理器，但是您可以在%s上找到它們。
 PDF=PDF格式
-PDFDesc=Global options for PDF generation
-PDFAddressForging=Rules for address section
+PDFDesc=生成PDF 的全域選項
+PDFAddressForging=規則給地址的部分
 HideAnyVATInformationOnPDF=隱藏與銷售稅/營業稅相關的所有訊息
 PDFRulesForSalesTax=銷售稅 / 營業稅規則
 PDFLocaltax=%s的規則
-HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
+HideLocalTaxOnPDF=隱藏 %s 利率 在銷售 稅/增值稅 欄位
 HideDescOnPDF=隱藏產品說明
 HideRefOnPDF=隱藏產品參考號碼
 HideDetailsOnPDF=隱藏產品行詳細資訊
@@ -409,9 +413,9 @@ PriceBaseTypeToChange=根據已定義的基礎參考價參修改價格
 MassConvert=啟動批次轉換
 PriceFormatInCurrentLanguage=目前語言的價格格式
 String=字串
-String1Line=String (1 line)
+String1Line=字串 (1行)
 TextLong=長字串
-TextLongNLines=Long text (n lines)
+TextLongNLines=長文字 (n 行)
 HtmlText=Html 文字
 Int=整數
 Float=浮點數
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=將欄位保留為空白表示該值將不加密地
 ExtrafieldParamHelpselect=數值清單必須為含有關鍵字的行,數值 (關鍵字不能為 '0')<br><br>例如： <br> 1，值1 <br> 2，值2 <br> code3，value3 <br> ... <br><br>為了使此清單取決於另一個互補屬性清單： <br> 1，value1 | options_ <i>parent_list_code</i> ：parent_key <br> 2，value2 | options_ <i>parent_list_code</i> ：parent_key <br><br>為了使清單取決於另一個清單： <br> 1，值1 | <i>parent_list_code</i> ：parent_key <br> 2，值2 | <i>parent_list_code</i> ：parent_key
 ExtrafieldParamHelpcheckbox=數值清單必須為含有關鍵字的行,數值 (關鍵字不能為 '0')<br><br>範例:<br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=數值清單必須為含有關鍵字的行,數值 (關鍵字不能為 '0')<br><br>範例:<br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=數值清單來自表格<br>語法：table_name：label_field：id_field :: filter <br>範例：c_typent：libelle：id :: filter <br><br> -idfilter一定是初始關鍵字<br> -過濾器可以是一個簡單測試（例如，active = 1），僅顯示有效值<br>您還可以在過濾器中使用$ ID $作為目前項目的目前ID <br>要在過濾器中執行SELECT，請使用$ SEL $ <br>如果要過濾Extrafield，請使用語法extra.fieldcode = ...（其中欄位代碼是Extrafield的代碼） <br><br>為了使此清單依賴於另一個互補屬性清單： <br> c_typent：libelle：id：options_ <i>parent_list_code</i> | parent_column：filter <br><br>為了使清單依賴於另一個清單： <br> c_typent：libelle：id： <i>parent_list_code</i> | parent_column：filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=表單中的數值清單<br>語法： table_name:label_field:id_field::filter<br>例如：: c_typent:libelle:id::filter<br><br>篩選可以是一個簡單的測試 (例如 啟動 =1 ) 只顯示啟動的數值<br>您也可以在篩選中使用 $ID$作為目前物件的ID<br>在篩選器中執行 SELECT 則使用 $SEL$<br>若您要在額外欄位篩選使用語法 extra.fieldcode=... (extra.fileldcode為欄位的代碼)<br><br>為使清單明細依賴於另一個補充屬性的清單：<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter<br><br>為使清單依賴於另一個補充屬性清單：<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=參數必須是 ObjectName:Classpath<br>語法：ObjectName:Classpath<br>範例：<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=保持空白以使用簡單的分隔符號<br>對於折疊分隔符號，將此值設定為1（預設情況下，對於新程序打開，然後為每個用戶程序保留狀態） <br>將其設定為2可折疊分隔符號（預設情況下，新程序已折疊，然後在每個用戶程序中保持狀態）
 LibraryToBuildPDF=PDF產生器程式庫
 LocalTaxDesc=某些國家/地區可能會對每個發票行使用兩到三種稅收。在這種情況下，請選擇第二種和第三種稅率的類型及其稅率。可能的類型是： <br> 1：不含營業稅的產品和服務應繳納地方稅（地方稅是根據不含稅的金額計算的） <br> 2：適用於包括營業稅在內的產品和服務的地方稅（地方稅按金額+主稅計算） <br> 3：不含營業稅的產品應繳納地方稅（地方稅是按不含稅的金額計算的） <br> 4：包括營業稅在內的產品均需繳納地方稅（地方稅是按金額+主營業稅計算的） <br> 5：不加營業稅的服務應繳納地方稅（地方稅是按不含稅的金額計算的） <br> 6：包括營業稅在內的服務需要繳納地方稅（地方稅是按金額+稅額計算的）
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s依照被截斷並帶有字元數的客戶
 ModuleCompanyCodeSupplierDigitaria=%s依照被截斷並帶有字元數的供應商名稱追蹤：%s用於供應商會計代碼。
 Use3StepsApproval=預設情況下，採購訂單需要由2個不同的用戶建立和批准（一個步驟/一個用戶建立，一個步驟/一個用戶批准。請注意，如果用戶同時具有建立和批准的權限，則一個步驟/用戶就足夠了） 。如果金額高於專用值，則可以使用此選項進行三步/用戶批准（如果需要，則需要3個步驟：1 =驗證，2 =第一次批准和3 =第二次批准）。 <br>如果一個批准（2個步驟）就足夠，則將其設定為空白；如果永遠需要第二個批准（3個步驟），則將其設定為非常低的值（0.1）。
 UseDoubleApproval=當金額(未稅)大於以下金額時使用3步驟核准
-WarningPHPMail=警告：通常最好將傳出電子郵件設定為使用供應商的電子郵件伺服器，而不是預設設定。某些電子郵件供應商（例如Yahoo）不允許您從其他伺服器（而不是其自己的伺服器）寄送電子郵件。您目前設定使用應用程式的伺服器寄送電子郵件，而不使用電子郵件供應商的伺服器，因此某些收件人（與限制性DMARC協議相容的收件人）會詢問您的電子郵件供應商是否可以接受您的電子郵件，而某些電子郵件供應商（例如Yahoo）可能會回應「否」，因為伺服器不是他們的伺服器，因此您的已傳送電子郵件中可能很少會被接受（請注意您的電子郵件供應商的傳送配額）。 <br>如果您的電子郵件供應商（例如Yahoo）具有此限制，則必須更改電子郵件設定以選擇其他規定的“ SMTP伺服器”，然後輸入電子郵件伺服器和由電子郵件供應商提供的憑證。
+WarningPHPMail=警告: 從此應用程式寄出電子郵件的設定使用的是預設的原始設定。相較於使用預設設定用您電子郵件服務提供的電子信箱伺服器來設定寄出郵件是比較好的，理由如下:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=如果您的電子郵件SMTP程式需要將電子郵件客戶端限制為某些IP地址（非常罕見），則這是ERP CRM應用程式的郵件用戶代理（MUA）的IP地址： <strong>%s</strong> 。
-WarningPHPMailSPF=如果寄件人電子郵件地址中的網域名稱受到SPF保護（請詢問電子郵件提供商），則必須在網域名稱DNS的SPF記錄中包括以下IP：<strong> %s </strong>。
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=點選顯示描述
 DependsOn=此模組需要此模組
 RequiredBy=模組需要此模組
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=點選撥打
 Module58Desc=點選撥打系統(Asterisk, ...)的整合
-Module59Name=Bookmark4u
-Module59Desc=新增從 Dolibarr 帳號產生 Bookmark4u 帳號的功能
 Module60Name=貼紙
 Module60Desc=貼紙管理
 Module70Name=干預
@@ -656,7 +662,7 @@ Module50200Desc=向客戶提供一個PayPal線上支付頁面（PayPal帳戶或
 Module50300Name=Stripe
 Module50300Desc=為客戶提供Stripe線上支付頁面（信用卡/金融信用卡）。這可用於允許您的客戶進行臨時付款或與特定Dolibarr項目有關的付款（發票，訂單等）。
 Module50400Name=會計（複式）
-Module50400Desc=會計管理（重複輸入，支援總分類帳和輔助分類帳）。以其他幾種會計軟體格式匯出分類帳。
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=直接列印(不用打開文件)使用 Cups IPP 介面(印表機可在伺服器上看到，且 CUPS 必須已安裝在伺服器上)。
 Module55000Name=問卷、調查或投票
@@ -671,7 +677,7 @@ Module63000Name=資源
 Module63000Desc=管理用於分配給事件的資源（印表機，汽車，房間等）
 Permission11=讀取客戶發票
 Permission12=建立/修改客戶發票
-Permission13=使客戶發票無效
+Permission13=Invalidate customer invoices
 Permission14=驗證客戶發票
 Permission15=以電子郵件寄送客戶發票
 Permission16=為客戶發票建立付款
@@ -688,6 +694,7 @@ Permission32=建立/修改產品資訊
 Permission34=刪除產品
 Permission36=查看/管理隱藏的產品
 Permission38=匯出產品資訊
+Permission39=Ignore minimum price
 Permission41=讀取專案及任務（已分享專案及以我擔任連絡人的專案）。也可在被指派的任務對自已或等級中輸入耗用的時間（時間表）
 Permission42=建立/修改專案（已分享專案及以我擔任連絡人的專案）。也可以建立任務及指派用戶到專案及任務
 Permission44=刪除專案（已分享專案及以我擔任連絡人的專案）
@@ -696,6 +703,9 @@ Permission61=讀取干預
 Permission62=建立/修改干預
 Permission64=刪除干預
 Permission67=匯出干預
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=讀取會員
 Permission72=建立/修改會員
 Permission74=刪除會員
@@ -718,6 +728,7 @@ Permission95=讀取報告
 Permission101=讀取出貨資訊
 Permission102=建立/修改出貨單
 Permission104=驗證出貨單
+Permission105=Send sendings by email
 Permission106=匯出出貨單
 Permission109=刪除出貨單
 Permission111=讀取財務帳戶
@@ -825,10 +836,11 @@ Permission402=建立/修改折扣
 Permission403=驗證折扣
 Permission404=刪除折扣
 Permission430=使用除錯欄
-Permission511=讀取薪水支付
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=建立/修改薪水支付
 Permission514=刪除薪水支付
-Permission517=匯出薪水
+Permission517=Read payments of salaries of everybody
+Permission519=匯出薪水
 Permission520=讀取借款
 Permission522=建立/修改借款
 Permission524=刪除借款
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=讀取物料清單
 Permission651=新增/更新物料清單
 Permission652=刪除物料清單
@@ -884,7 +899,9 @@ Permission1185=批准採購訂單
 Permission1186=訂購採購訂單
 Permission1187=確認收到採購訂單
 Permission1188=刪除採購訂單
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=批准（第二次批准）採購訂單
+Permission1191=Export supplier orders and their attributes
 Permission1201=取得匯出結果
 Permission1202=建立/修改匯出
 Permission1231=讀取供應商發票
@@ -898,6 +915,8 @@ Permission1251=執行從外部資料批次匯入到資料庫的功能 (載入資
 Permission1321=匯出客戶發票、屬性及付款資訊
 Permission1322=重啟已付帳單
 Permission1421=匯出銷售訂單和屬性
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=連結到他的用戶帳戶的讀取操作（事件或任務）（如果是事件的所有者或僅被分配）
 Permission2402=建立/修改連結到自己的用戶帳戶（如果是事件所有者）的活動（事件或任務）
 Permission2403=刪除連結到自己用戶帳戶的行動（事件或任務）（如果是事件所有者）
@@ -932,9 +951,13 @@ Permission23001=讀取預定工作
 Permission23002=建立/更新預定工作
 Permission23003=刪除預定工作
 Permission23004=執行預定工作
-Permission50101=使用銷售點
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=讀取交易
 Permission50202=匯入交易
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=將產品和發票與會計科目綁定
 Permission50411=讀取分類帳中的操作
 Permission50412=分類帳中的寫入/編輯操作
@@ -958,6 +981,17 @@ Permission63001=讀取資源
 Permission63002=建立/修改資源
 Permission63003=刪除資源
 Permission63004=連結資源到行程事件
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=合作方類型
 DictionaryCompanyJuridicalType=法人合作方
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=休假類型
 DictionaryOpportunityStatus=專案/潛在的潛在狀態
 DictionaryExpenseTaxCat=費用報表 -交通類別
 DictionaryExpenseTaxRange=費用報表 - 依交通類別劃分範圍
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=設定已儲存
 SetupNotSaved=設定未儲存
 BackToModuleList=返回模組清單
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=若代號沒有找翻譯字句，則使用預設標籤
 LabelOnDocuments=文件標籤
 LabelOrTranslationKey=標籤或翻譯秘鑰
 ValueOfConstantKey=常數設置的值
+ConstantIsOn=Option %s is on
 NbOfDays=天數
 AtEndOfMonth=月底
 CurrentNext=現在/下一個
@@ -1145,6 +1182,7 @@ InfoWebServer=關於網頁伺服器
 InfoDatabase=關於資料庫
 InfoPHP=關於 PHP
 InfoPerf=關於效能
+InfoSecurity=About Security
 BrowserName=瀏覽器名稱
 BrowserOS=瀏覽器系統
 ListOfSecurityEvents=Dolibarr 安全事件清單
@@ -1194,7 +1232,8 @@ RestoreDesc=要還原Dolibarr備份，需要執行兩個步驟。
 RestoreDesc2=將“ 文件”資料夾的備份文件（例如zip文件）還原到新的Dolibarr安裝或目前文件資料夾（ <b>%s</b> ）中。
 RestoreDesc3=將資料庫結構和數據從備份檔案還原到新Dolibarr安裝的資料庫或目前安裝的資料庫 (<b>%s</b>)中。警告，還原完成後，您必須使用備份時間/安裝中存在的登入名稱/密碼才能再次連接。 <br>要將備份數據庫還原到目前安裝中，可以依照此助手進行操作。
 RestoreMySQL=MySQL匯入
-ForcedToByAModule= 有一啟動模組強制<b>%s</b>適用此規則
+ForcedToByAModule=有一啟動模組強制<b>%s</b>適用此規則
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=現有備份檔案
 PreviousArchiveFiles=現有壓縮檔案
 WeekStartOnDay=一周的第一天
@@ -1275,6 +1314,7 @@ PHPModuleLoaded=PHP組件%s已載入
 PreloadOPCode=已使用預載入OPCode
 AddRefInList=顯示客戶/供應商參考訊息清單（選擇清單或組合框）和大多數超連結。 <br>合作方將以“ CC12345-SC45678-The Big Company corp。”的名稱格式出現。而不是“The Big Company corp”。
 AddAdressInList=顯示客戶/供應商地址訊息清單（選擇清單或組合框） <br>合作方將以“ The Big Company corp。-21 jump street 123456 Big town-USA”的名稱格式出現，而不是“ The Big Company corp”。
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=要求合作方使用首選的運輸方式。
 FieldEdition=欗位 %s編輯
 FillThisOnlyIfRequired=例如： +2 (若遇到時區偏移問題時才填寫)
@@ -1282,7 +1322,7 @@ GetBarCode=取得條碼
 NumberingModules=編號模型
 DocumentModules=文件模型
 ##### Module password generation
-PasswordGenerationStandard=返回根據Dolibarr內部算法產生的密碼：8個字元，包含數字和小寫字元。
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=不要產生建議密碼。密碼必須手動輸入。
 PasswordGenerationPerso=根據您個人定義的偏好設定返回密碼。
 SetupPerso=根據您的偏好設定
@@ -1381,6 +1421,7 @@ AdherentMailRequired=建立新會員需要電子郵件
 MemberSendInformationByMailByDefault=已勾選預設傳送電子郵件驗證成員（驗證或新訂閲）
 VisitorCanChooseItsPaymentMode=訪客可以選擇可用的付款方式
 MEMBER_REMINDER_EMAIL=以<b>電子郵件</b>啟動自動提醒過期的訂閱。注意：必須啟用模組<strong>%s</strong>並正確設定才能發送提醒。
+MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
 LDAPSetup=LDAP 設定
 LDAPGlobalParameters=全域參數
@@ -1523,7 +1564,9 @@ LDAPDescValues=範例值是為具有以下載入模式的<b>OpenLDAP</b>設計
 ForANonAnonymousAccess=已驗證存取(例如寫入存取)
 PerfDolibarr=效能設定/最佳化報告
 YouMayFindPerfAdviceHere=此頁面提供了一些與性能有關的檢查或建議。
-NotInstalled=未安裝，所以您的伺服器不會因此而減慢速度。
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=應用程式快取
 MemcachedNotAvailable=沒有找到應用程式快取。你可安裝快取伺服器 Memcached 並啟動模組以增加效能。<br>更多的資訊在<a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>。<br>注意多數的伺服器供應商不提供類似的快取伺服器。
 MemcachedModuleAvailableButNotSetup=找到應用程式快取的快取模組，但模組設定沒有完成。
@@ -1571,9 +1614,9 @@ SyslogLevel=層級
 SyslogFilename=檔案名稱和路徑
 YouCanUseDOL_DATA_ROOT=您可使用在 Dolibarr "文件"資料夾的日誌檔案 DOL_DATA_ROOT/dolibarr.log來紀錄 。您可以設定不同的路徑來存儲該檔案。
 ErrorUnknownSyslogConstant=常數 %s 不是一個已知的 Syslog 常數
-OnlyWindowsLOG_USER=Windows 只支援 LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=除錯記錄檔案的縮壓及備份(由記錄除錯模組產生的)
-SyslogFileNumberOfSaves=日誌備份
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=清除偏好設定的排程工作以設定週期備份日誌
 ##### Donations #####
 DonationsSetup=捐贈模組設定
@@ -1629,7 +1672,7 @@ AdvancedEditor=進階編輯器
 ActivateFCKeditor=啟用進階編輯器：
 FCKeditorForCompany=所見即所得建立/編輯元件的描述和註釋（產品/服務除外）
 FCKeditorForProduct=所見即所得產品/服務建立/編輯的描述和說明
-FCKeditorForProductDetails=所見即所得為所有項目（提案，訂單，發票等）建立/編輯產品明細行。 <font class="warning">警告：在這種情況下，強烈建議不要使用此選項，因為在產生PDF文件時，它會產生特殊字元和頁面格式的問題。</font>
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= 以所見即所得建立/編輯電子郵件 ( 工具 --> 電子郵件 )
 FCKeditorForUserSignature=以所見即所得建立/編輯用戶簽名檔
 FCKeditorForMail=以所見即所得建立/編輯全部電子郵件( 除了工具 --> 電子郵件)
@@ -1639,11 +1682,11 @@ StockSetup=庫存模組設定
 IfYouUsePointOfSaleCheckModule=如果使用預設提供的銷售點模組（POS）或外部模組，則POS模組可能會忽略此設定。預設情況下，大多數POS模組均設計為可立即建立發票並減少庫存，而與此處的選項無關。因此，如果您在從POS進行銷售註冊時是否需要減少庫存，還請檢查POS模組設定。
 ##### Menu #####
 MenuDeleted=選單已刪除
+Menu=選單
 Menus=選單
 TreeMenuPersonalized=個性化選單
 NotTopTreeMenuPersonalized=個人化選單沒有連結到頂端選單項目
 NewMenu=新選單
-Menu=選單選項
 MenuHandler=選單處理程式
 MenuModule=原始碼模組
 HideUnauthorizedMenu= 隱藏未經授權的選單（灰色）
@@ -1695,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=在事件建立表單中自動為事件類型設
 AGENDA_DEFAULT_FILTER_TYPE=在應辦事項視圖的搜索過濾器中自動設定此類事件
 AGENDA_DEFAULT_FILTER_STATUS=在應辦事項視圖的搜索過濾器中自動為事件設定此狀態
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=<b>通過電子郵件</b>啟用事件提醒（可以在每個事件上定義提醒選項/延遲）。注意：必須啟用模組<strong>%s</strong>並正確設定，以正確的頻率發送提醒。
-AGENDA_REMINDER_BROWSER=<b>在用戶的瀏覽器上</b>啟用事件提醒（到達事件日期時，每個用戶都可以從瀏覽器確認問題中拒絕此事件）
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=啟用音效警告
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=顯示已連結項目到行程的檢視中
 ##### Clicktodial #####
 ClickToDialSetup=點擊撥號模組設定
@@ -1794,7 +1838,6 @@ TypePaymentDesc=0：客戶付款類型； 1：供應商付款類型； 2：客
 IncludePath=包含路徑(已定義在變數 %s)
 ExpenseReportsSetup=費用報告模組設定
 TemplatePDFExpenseReports=用文件範本產生費用報告文件
-ExpenseReportsIkSetup=費用報告模組的設定 - 里程索引
 ExpenseReportsRulesSetup=費用報告模組設定-規則
 ExpenseReportNumberingModules=費用報告編號模組
 NoModueToManageStockIncrease=沒有啟用能夠管理自動庫存增加的模組。庫存增加將僅能手動輸入。
@@ -1864,7 +1907,7 @@ MailToSendReception=收貨(s)
 MailToThirdparty=合作方
 MailToMember= 會員
 MailToUser=用戶
-MailToProject=專案頁面
+MailToProject=專案
 MailToTicket=服務單
 ByDefaultInList=在清單視圖上使用預設顯示
 YouUseLastStableVersion=您使用最新的穩定版本
@@ -1960,6 +2003,8 @@ LoadThirdPartyFromName=在%s載入合作方搜尋 (僅載入)
 LoadThirdPartyFromNameOrCreate= 在%s載入合作方搜尋 (如果找不到就建立)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=選單輸入代碼（主選單）
@@ -1974,7 +2019,7 @@ DisabledResourceLinkContact=停用資源連結到通訊錄的功能
 EnableResourceUsedInEventCheck=啟用功能以檢查事件中是否正在使用資源
 ConfirmUnactivation=確認重設模組
 OnMobileOnly=只在小螢幕(智慧型手機)
-DisableProspectCustomerType=禁用“潛在+客戶”合作方類型（因此合作方必須是“潛在”或“客戶”，但不能兩者都使用）
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=盲人簡化界面
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=如果您是盲人，或者通過Lynx或Links等文字瀏覽器使用此應用程式，請啟用此選項。
 MAIN_OPTIMIZEFORCOLORBLIND=為色盲更改界面顏色
@@ -1996,13 +2041,15 @@ UseDebugBar=使用debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=控制台中可保留的日誌行數
 WarningValueHigherSlowsDramaticalyOutput=警告，較高的值會嚴重降低輸出速度
 ModuleActivated=模組%s已啟動並顯示於界面上
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=匯出模組功能可分享此模組給所有人
 ExportSetup=模組匯出設定
 ImportSetup=模組匯入設定
 InstanceUniqueID=實例的唯一ID
 SmallerThan=小於
 LargerThan=大於
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=對於GMail帳戶，如果啟用了兩步驗證，建議您為應用程序建立專用的第二個密碼，而不要使用來自https://myaccount.google.com/的帳戶密碼。
 EmailCollectorTargetDir=當成功地寄出電子郵件後，您可能想將電子郵件移動到另一個標籤/資料夾。只需在此處設定一個值即可使用此功能。請注意，您還必須使用可讀/寫的登入帳戶。
 EmailCollectorLoadThirdPartyHelp=您可以使用此操作來使用電子郵件內容在資料庫中尋找並載入現有的合作方。找到（或建立）的合作方將用於需要他的後續操作。在參數欄位中您可以使用例如如果您想要從合作方字串'Name: name to find'中將提取的姓名傳送進到內容中您可以使用欄位參數'EXTRACT:BODY:Name:\\s([^\\s]*)'
@@ -2029,4 +2076,10 @@ MeasuringScaleDesc=比例尺是您必須移動小數部分以匹配默認參考
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= 產品性質
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
diff --git a/htdocs/langs/zh_TW/banks.lang b/htdocs/langs/zh_TW/banks.lang
index ffb9fd89d96..9efdccb1287 100644
--- a/htdocs/langs/zh_TW/banks.lang
+++ b/htdocs/langs/zh_TW/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=雜項付款
 VariousPayments=雜項付款
 ShowVariousPayment=顯示雜項付款
 AddVariousPayment=新增雜項付款
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=歐洲統一支付區要求
 YourSEPAMandate=您的歐洲統一支付區要求
 FindYourSEPAMandate=這是您SEPA的授權，授權我們公司向您的銀行直接付款。退還已簽名（掃描已簽名文檔）或通過郵件發送至
@@ -176,3 +179,4 @@ BankColorizeMovement=動作顏色
 BankColorizeMovementDesc=如果啟用此功能，則可以為借款方或貸款方動作選擇特定的背景顏色
 BankColorizeMovementName1=借款方動作的背景顏色
 BankColorizeMovementName2=貸款方動作的背景顏色
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
diff --git a/htdocs/langs/zh_TW/categories.lang b/htdocs/langs/zh_TW/categories.lang
index 1d165cde697..6935e5275bb 100644
--- a/htdocs/langs/zh_TW/categories.lang
+++ b/htdocs/langs/zh_TW/categories.lang
@@ -81,10 +81,12 @@ CategoriesSetup=標籤/類別設定
 CategorieRecursiv=自動連結到母標籤/母類別
 CategorieRecursivHelp=如果啟用此選項，當將產品增加到子類別時，產品也會增加到母類別中。
 AddProductServiceIntoCategory=新增以下產品/服務
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=顯示標籤/類別
 ByDefaultInList=預設在清單中
 ChooseCategory=選擇類別
-StocksCategoriesArea=倉庫類別區域
-ActionCommCategoriesArea=事件類別區
-WebsitePagesCategoriesArea=頁面容器類別區域
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=類別的使用或運算
diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang
index 9d1d0ab5a22..1d83ed486ae 100644
--- a/htdocs/langs/zh_TW/companies.lang
+++ b/htdocs/langs/zh_TW/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (商業登記號碼)
 ProfId4AT=-
-ProfId5AT=-
+ProfId5AT=EORI number
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (專業號碼)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=-
+ProfId5BE=EORI number
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (國家註冊)
@@ -144,11 +144,11 @@ ProfId3BR=IM (市政登記)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=-
+ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1（聯邦碼）
 ProfId4CH=Prof Id 2（商業記錄碼）
-ProfId5CH=-
+ProfId5CH=EORI number
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (商業登記號碼)
 ProfId4DE=-
-ProfId5DE=-
+ProfId5DE=EORI number
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 （社會安全號碼）
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (學院編號)
-ProfId5ES=-
+ProfId5ES=EORI number
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=-
+ProfId5FR=EORI number
 ProfId6FR=-
 ProfId1GB=註冊號
 ProfId2GB=-
@@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
 ProfId1LU=Id. prof. 1 (R.C.S.盧森堡)
 ProfId2LU=Id. prof. 2 (營業執照)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=-
+ProfId5LU=EORI number
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -220,13 +225,13 @@ ProfId1NL=KVK數字
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL=-
+ProfId5NL=EORI number
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2（社會安全號碼）
 ProfId3PT=Prof Id 3（商業記錄碼）
 ProfId4PT=Prof Id 4 (音樂學院)
-ProfId5PT=-
+ProfId5PT=EORI number
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -249,8 +254,8 @@ ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=EORI number
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -354,6 +359,7 @@ VATIntraManualCheck=您也可在歐盟網站以人工方式確認<a href="%s" ta
 ErrorVATCheckMS_UNAVAILABLE=無法檢查。無法使用會員國家（%s）進行檢查服務。
 NorProspectNorCustomer=非潛在方或客戶
 JuridicalStatus=法人類型
+Workforce=Workforce
 Staff=僱員
 ProspectLevelShort=潛在等級
 ProspectLevel=潛在方的可能性
@@ -456,3 +462,8 @@ PaymentTermsSupplier=付款條件-供應商
 PaymentTypeBoth=付款方式-客戶和供應商
 MulticurrencyUsed=使用多幣種
 MulticurrencyCurrency=貨幣
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/zh_TW/ecm.lang b/htdocs/langs/zh_TW/ecm.lang
index a83a8617d60..c39a9af9b35 100644
--- a/htdocs/langs/zh_TW/ecm.lang
+++ b/htdocs/langs/zh_TW/ecm.lang
@@ -23,19 +23,7 @@ ECMSearchByKeywords=搜尋關鍵字
 ECMSearchByEntity=搜尋對象
 ECMSectionOfDocuments=目錄中的文件
 ECMTypeAuto=自動
-ECMDocsBySocialContributions=與社會稅或財政稅相關的文件
-ECMDocsByThirdParties=文件鏈接到第三方
-ECMDocsByProposals=提案/建議書的文件
-ECMDocsByOrders=文件鏈接到客戶的訂單
-ECMDocsByContracts=文件與合約
-ECMDocsByInvoices=文件與客戶發票
-ECMDocsByProducts=文件與產品
-ECMDocsByProjects=與專案相關的文件
-ECMDocsByUsers=與用戶相關的文件
-ECMDocsByInterventions=與干預措施相關的文件
-ECMDocsByExpenseReports=與費用報告相關的文件
-ECMDocsByHolidays=與假期相關的文件
-ECMDocsBySupplierProposals=與供應商提案/建議書相關的文件
+ECMDocsBy=Documents linked to %s
 ECMNoDirectoryYet=未建立資料夾
 ShowECMSection=顯示資料夾
 DeleteSection=刪除資料夾
@@ -50,3 +38,6 @@ ReSyncListOfDir=重新同步目錄清單
 HashOfFileContent=檔案內容的雜湊值
 NoDirectoriesFound=找不到目錄
 FileNotYetIndexedInDatabase=檔案尚未編入資料庫（嘗試重新上傳）
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/zh_TW/hrm.lang b/htdocs/langs/zh_TW/hrm.lang
index 107762056aa..3e8d938470d 100644
--- a/htdocs/langs/zh_TW/hrm.lang
+++ b/htdocs/langs/zh_TW/hrm.lang
@@ -16,3 +16,4 @@ DictionaryFunction=人力資源管理-職位
 Employees=員工
 Employee=員工
 NewEmployee=新員工
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/zh_TW/install.lang b/htdocs/langs/zh_TW/install.lang
index f1f69145c7f..c785b848207 100644
--- a/htdocs/langs/zh_TW/install.lang
+++ b/htdocs/langs/zh_TW/install.lang
@@ -8,15 +8,9 @@ ConfFileIsNotWritable=配置文件<b>%s</b>不可寫入。檢查權限。對於
 ConfFileIsWritable=配置文件<b>%s</b>可寫入。
 ConfFileMustBeAFileNotADir=配置文件<b>%s</b>必須是一個檔案，而不是資料夾。
 ConfFileReload=從配置文件中重新載入參數。
-PHPSupportSessions=這個PHP支援session。
 PHPSupportPOSTGETOk=此PHP支援變數POST和GET。
 PHPSupportPOSTGETKo=您的PHP設定可能不支援變數POST和/或GET。檢查php.ini中的參數<b>variables_order</b> 。
-PHPSupportGD=此PHP支援GD圖形功能。
-PHPSupportCurl=此PHP支援Curl。
-PHPSupportCalendar=此PHP支援日曆外掛。
-PHPSupportUTF8=此PHP支援UTF8函數。
-PHPSupportIntl=此PHP支援Intl函數。
-PHPSupportxDebug=此PHP支援擴展的除錯功能。
+PHPSupportSessions=這個PHP支援session。
 PHPSupport=此PHP支援%s函數。
 PHPMemoryOK=您的PHP最大session記憶體設定為<b>%s</b> 。這應該足夠了。
 PHPMemoryTooLow=您的PHP最大session記憶體為<b>%s</b>bytes。這太低了。更改您的<b>php.ini，</b>以將<b>記憶體限制/b>參數設定為至少<b>%s</b>bytes。
diff --git a/htdocs/langs/zh_TW/intracommreport.lang b/htdocs/langs/zh_TW/intracommreport.lang
new file mode 100644
index 00000000000..f6373cf6009
--- /dev/null
+++ b/htdocs/langs/zh_TW/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=清單
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/zh_TW/languages.lang b/htdocs/langs/zh_TW/languages.lang
index 4019d6bc785..8c2475ca6ca 100644
--- a/htdocs/langs/zh_TW/languages.lang
+++ b/htdocs/langs/zh_TW/languages.lang
@@ -40,6 +40,7 @@ Language_es_PA=西班牙語（巴拿馬）
 Language_es_PY=西班牙語（巴拉圭）
 Language_es_PE=西班牙語（秘魯）
 Language_es_PR=西班牙語（波多黎各）
+Language_es_US=Spanish (USA)
 Language_es_UY=西班牙語（烏拉圭）
 Language_es_GT=Spanish (Guatemala)
 Language_es_VE=西班牙語（委內瑞拉）
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index d07ee319cac..abc5ed6e22c 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -155,6 +155,7 @@ RemoveLink=移除連結
 AddToDraft=新增到草稿
 Update=更新
 Close=關閉
+CloseAs=將狀態設定為
 CloseBox=從儀表板中移除小工具
 Confirm=確認
 ConfirmSendCardByMail=你真的要寄送此卡片的內容給 <b>%s</b>？
@@ -196,6 +197,7 @@ ReOpen=重新公開
 Upload=上傳
 ToLink=連線
 Select=選擇
+SelectAll=Select all
 Choose=選擇
 Resize=調整大小
 ResizeOrCrop=調整大小或裁剪
@@ -256,6 +258,7 @@ Cards=資訊卡
 Card=資訊卡
 Now=現在
 HourStart=開始(時)
+Deadline=Deadline
 Date=日期
 DateAndHour=日期及小時
 DateToday=今日日期
@@ -264,8 +267,10 @@ DateStart=開始日期
 DateEnd=結束日期
 DateCreation=建立日期
 DateCreationShort=建立日
+IPCreation=Creation IP
 DateModification=修改日期
 DateModificationShort=修改日
+IPModification=Modification IP
 DateLastModification=最新修改日期
 DateValidation=驗證日期
 DateClosing=關閉日期
@@ -319,6 +324,7 @@ Morning=上午
 Afternoon=下午
 Quadri=季
 MonthOfDay=當天的月份
+DaysOfWeek=星期幾
 HourShort=時
 MinuteShort=分
 Rate=稅率
@@ -356,7 +362,7 @@ Amount=金額
 AmountInvoice=發票金額
 AmountInvoiced=已開發票金額
 AmountInvoicedHT=開票金額（不含稅）
-AmountInvoicedTTC=Amount invoiced (inc. tax)
+AmountInvoicedTTC=開票金額（含稅）
 AmountPayment=付款金額
 AmountHTShort=金額（不含）
 AmountTTCShort=金額(含稅)
@@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=付款金額, 原來幣別
 MulticurrencyAmountHT=金額（不含稅），原來幣別
 MulticurrencyAmountTTC=金額(含稅), 原來幣別
 MulticurrencyAmountVAT=稅金, 原來幣別
+MulticurrencySubPrice=金額子價格多種貨幣
 AmountLT1=稅金 2
 AmountLT2=稅金 3
 AmountLT1ES=RE 金額
@@ -487,6 +494,7 @@ By=由
 From=從
 FromDate=從
 FromLocation=從
+at=at
 to=至
 To=至
 and=和
@@ -509,6 +517,7 @@ Draft=草案
 Drafts=草案
 StatusInterInvoiced=已開票
 Validated=已驗證
+ValidatedToProduce=已驗證（生產）
 Opened=開放
 OpenAll=開放（全部）
 ClosedAll=已關閉（全部）
@@ -655,6 +664,7 @@ Response=反應
 Priority=優先權
 SendByMail=以電子郵件寄送
 MailSentBy=寄件人
+NotSent=不發送
 TextUsedInTheMessageBody=電子郵件正文
 SendAcknowledgementByMail=傳送確認電子郵件
 SendMail=傳送電子郵件
@@ -688,7 +698,7 @@ Method=方法
 Receive=收到
 CompleteOrNoMoreReceptionExpected=完成或沒有更多的預期
 ExpectedValue=期望值
-ExpectedQty=Expected Qty
+ExpectedQty=預期數量
 PartialWoman=部分
 TotalWoman=全部
 NeverReceived=從未收到
@@ -705,7 +715,7 @@ MenuECM=文件
 MenuAWStats=AWStats 軟體
 MenuMembers=會員
 MenuAgendaGoogle=Google 行事曆
-MenuTaxesAndSpecialExpenses=Taxes | Special expenses
+MenuTaxesAndSpecialExpenses=稅金|特別費用
 ThisLimitIsDefinedInSetup=Dolibarr 的限制（選單 首頁 - 設定 - 安全）： %s Kb, PHP的限制：%s Kb
 NoFileFound=此資料夾沒有任何檔案
 CurrentUserLanguage=目前語言
@@ -728,7 +738,7 @@ Page=頁面
 Notes=備註
 AddNewLine=新增一行
 AddFile=新增檔案
-FreeZone=Free-text product
+FreeZone=自由文字產品
 FreeLineOfType=自由輸入項目，輸入：
 CloneMainAttributes=複製物件時複製主要屬性
 ReGeneratePDF=重新產生PDF
@@ -806,7 +816,7 @@ Element=元件
 NoPhotoYet=還沒有圖片
 Dashboard=資訊板
 MyDashboard=我的資訊板
-Deductible=免賠額
+Deductible=可減免
 from=從
 toward=往
 Access=存取
@@ -836,6 +846,7 @@ ListOfTemplates=範本清單
 Gender=性別
 Genderman=男
 Genderwoman=女
+Genderother=其他
 ViewList=檢視清單
 ViewGantt=甘特圖
 ViewKanban=看板圖
@@ -877,6 +888,8 @@ Miscellaneous=雜項
 Calendar=行事曆
 GroupBy=群組依...
 ViewFlatList=檢視平面清單
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=移除字串‘%s’
 SomeTranslationAreUncomplete=提供的某些語言可能僅被部分翻譯，或者可能包含錯誤。請通過註冊<a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>來進行改進，以幫助修正您的語言。
 DirectDownloadLink=直接下載連結(公共/外部)
@@ -945,38 +958,38 @@ ShortThursday=Th
 ShortFriday=Fr
 ShortSaturday=Sa
 ShortSunday=Su
-one=one
-two=two
-three=three
-four=four
-five=five
-six=six
-seven=seven
-eight=eight
-nine=nine
-ten=ten
-eleven=eleven
-twelve=twelve
-thirteen=thirdteen
-fourteen=fourteen
-fifteen=fifteen
-sixteen=sixteen
-seventeen=seventeen
-eighteen=eighteen
-nineteen=nineteen
-twenty=twenty
-thirty=thirty
-forty=forty
-fifty=fifty
-sixty=sixty
-seventy=seventy
-eighty=eighty
-ninety=ninety
-hundred=hundred
-thousand=thousand
-million=million
-billion=billion
-trillion=trillion
+one=一
+two=二
+three=三
+four=四
+five=五
+six=六
+seven=七
+eight=八
+nine=九
+ten=十
+eleven=十一
+twelve=十二
+thirteen=十三
+fourteen=十四
+fifteen=十五
+sixteen=十六
+seventeen=十七
+eighteen=十八
+nineteen=十九
+twenty=二十
+thirty=三十
+forty=四十
+fifty=五十
+sixty=六十
+seventy=七十
+eighty=八十
+ninety=九十
+hundred=百
+thousand=千
+million=百萬
+billion=十億
+trillion=兆
 quadrillion=quadrillion
 SelectMailModel=選擇一個電子郵件範本
 SetRef=設定參考
@@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=客戶出貨
 SearchIntoExpenseReports=費用報告
 SearchIntoLeaves=休假
 SearchIntoTickets=服務單
+SearchIntoCustomerPayments=客戶付款
+SearchIntoVendorPayments=供應商付款
+SearchIntoMiscPayments=雜項付款
 CommentLink=註解
 NbComments=註解數
 CommentPage=註解空間
@@ -1043,8 +1059,8 @@ ToClose=關閉
 ToProcess=處理
 ToApprove=核准
 GlobalOpenedElemView=全域顯示
-NoArticlesFoundForTheKeyword=沒有關於 '<strong>%s</strong>'的文章
-NoArticlesFoundForTheCategory=找不到該類別的文章
+NoArticlesFoundForTheKeyword=沒有關於 '<strong>%s</strong>'的物品
+NoArticlesFoundForTheCategory=找不到該類別的物品
 ToAcceptRefuse=同意 | 拒絕
 ContactDefault_agenda=事件
 ContactDefault_commande=訂單
@@ -1076,10 +1092,18 @@ NotUsedForThisCustomer=未用於此客戶
 AmountMustBePositive=金額必須為正
 ByStatus=依狀態
 InformationMessage=資訊
-Used=Used
+Used=已使用
 ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s create
-MODIFYInDolibarr=Record %s modified
-DELETEInDolibarr=Record %s deleted
-VALIDATEInDolibarr=Record %s validated
-APPROVEDInDolibarr=Record %s approved
+CREATEInDolibarr=記錄%s已建立
+MODIFYInDolibarr=記錄%s已修改
+DELETEInDolibarr=記錄%s已刪除
+VALIDATEInDolibarr=記錄%s已驗證
+APPROVEDInDolibarr=記錄%s已批准
+DefaultMailModel=預設信件模型
+PublicVendorName=供應商的公開名稱
+DateOfBirth=出生日期
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=安全許可證已過期，因此操作已被取消。請再試一次。
+UpToDate=最新
+OutOfDate=過期
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
diff --git a/htdocs/langs/zh_TW/members.lang b/htdocs/langs/zh_TW/members.lang
index 35cda77bdee..81f115bf880 100644
--- a/htdocs/langs/zh_TW/members.lang
+++ b/htdocs/langs/zh_TW/members.lang
@@ -19,14 +19,12 @@ MembersCards=會員名片
 MembersList=會員清單
 MembersListToValid=草案會員清單（待確認）
 MembersListValid=有效會員清單
-MembersListUpToDate=已更新訂閱的有效會員清單
-MembersListNotUpToDate=訂閱過期的有效會員清單
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=已被終止會員清單
 MembersListQualified=合格會員清單
 MenuMembersToValidate=草案會員
 MenuMembersValidated=已驗證會員
-MenuMembersUpToDate=最新會員
-MenuMembersNotUpToDate=過期會員
 MenuMembersResiliated=已終止會員
 MembersWithSubscriptionToReceive=可接收訂閱會員
 MembersWithSubscriptionToReceiveShort=接收訂閱
@@ -34,6 +32,7 @@ DateSubscription=訂閱日期
 DateEndSubscription=訂閱結束日期
 EndSubscription=結束訂閱
 SubscriptionId=訂閱編號
+WithoutSubscription=Without subscription
 MemberId=會員編號
 NewMember=新會員
 MemberType=會員類型
@@ -81,7 +80,7 @@ DeleteType=刪除
 VoteAllowed=允許投票
 Physical=自然人
 Moral=法人
-MorPhy=性質
+MorAndPhy=Moral and Physical
 Reenable=重新啟用
 ResiliateMember=終止會員
 ConfirmResiliateMember=您確定要終止此會員嗎？
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=發送新會員驗證電子郵件
 SendingEmailOnNewSubscription=發送新訂閱電子郵件
 SendingReminderForExpiredSubscription=發送過期訂閱提醒
 SendingEmailOnCancelation=發送取消郵件
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=您的會員資格已收到。
 YourMembershipWasValidated=您的會員資格已通過驗證
@@ -161,12 +161,13 @@ DocForOneMemberCards=為特定會員產生名片
 DocForLabels=產生地址表
 SubscriptionPayment=訂閱付款
 LastSubscriptionDate=最新訂閱付款的日期
-LastSubscriptionAmount=最新訂閱量
+LastSubscriptionAmount=最新訂閱金額
 MembersStatisticsByCountries=會員統計(國家/城市)
 MembersStatisticsByState=會員統計(州/省)
 MembersStatisticsByTown=會員統計(城鎮)
 MembersStatisticsByRegion=會員統計(地區)
 NbOfMembers=會員數
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=無已驗證的會員
 MembersByCountryDesc=此畫面顯示依國家/地區劃分的會員統計訊息。圖形取決於Google線上圖形服務，並且僅在網路連接正常時可用。
 MembersByStateDesc=此畫面依州/省顯示有關會員的統計訊息。
@@ -176,6 +177,7 @@ MenuMembersStats=統計
 LastMemberDate=最新會員日期
 LatestSubscriptionDate=最新訂閱日期
 MemberNature=會員性質
+MembersNature=Nature of members
 Public=資訊是公開的
 NewMemberbyWeb=增加了新會員。等待核准
 NewMemberForm=新會員表格
@@ -183,7 +185,7 @@ SubscriptionsStatistics=訂閱統計
 NbOfSubscriptions=訂閱數
 AmountOfSubscriptions=訂閱金額
 TurnoverOrBudget=營業額（對於公司）或預算（對於財團）
-DefaultAmount=默認訂閱量
+DefaultAmount=預設訂閱金額
 CanEditAmount=訪客可以選擇/編輯其訂閱金額
 MEMBER_NEWFORM_PAYONLINE=跳至綜合線上支付頁面
 ByProperties=依照性質
diff --git a/htdocs/langs/zh_TW/mrp.lang b/htdocs/langs/zh_TW/mrp.lang
index 160aa9091e2..f52b8abeb1b 100644
--- a/htdocs/langs/zh_TW/mrp.lang
+++ b/htdocs/langs/zh_TW/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=製造訂單
-MO=製造訂單
-MOs=Manufacturing orders
+MOs=製造訂單
+ManufacturingOrder=製造訂單
 MRPDescription=管理生產和製造訂單（MO）的模組。
 MRPArea=MRP區域
 MrpSetupPage=MRP模組設定
@@ -76,3 +76,5 @@ ProductsToProduce=生產的產品
 UnitCost=單位成本
 TotalCost=總計花費
 BOMTotalCost=根據每個要消耗的數量和產品的成本產生此BOM的成本（如果定義則使用“成本價”，如果定義則使用“平均加權價格”，否則使用“最佳採購價”）
+GoOnTabProductionToProduceFirst=您必須先開始生產才能關閉生產訂單（請參見分頁“ %s”）。但是您可以取消它。
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index e9bf2515b0e..bcff540d70c 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -108,20 +108,20 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=每個產品/服務有多個價格區段（每個客戶屬於一個價格區段）
 MultiPricesNumPrices=價格數量
 DefaultPriceType=增加新銷售價格時的每個預設價格（含稅和不含稅）基準
-AssociatedProductsAbility=啟動虛擬產品（套件）
-AssociatedProducts=虛擬產品
-AssociatedProductsNumber=組成此虛擬產品的產品數
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=母套裝產品數
 ParentProducts=母產品
-IfZeroItIsNotAVirtualProduct=如果為0，則該產品不是虛擬產品
-IfZeroItIsNotUsedByVirtualProduct=如果為0，此產品不被使用於任何虛擬產品
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=關鍵字過濾
 CategoryFilter=分類篩選器
 ProductToAddSearch=用搜索新增產品
 NoMatchFound=未找到符合的項目
 ListOfProductsServices=產品/服務清單
-ProductAssociationList=屬於此虛擬產品/套件的產品/服務列表
-ProductParentList=將此產品作為組件的虛擬產品/服務列表
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=所選產品之一是當前產品的母產品
 DeleteProduct=刪除一個產品/服務
 ConfirmDeleteProduct=你確定要刪除這個產品/服務？
@@ -170,7 +170,7 @@ SuppliersPricesOfProductsOrServices=供應商價格（產品或服務）
 CustomCode=海關/商品/ HS編碼
 CountryOrigin=原產地
 Nature=產品性質（材料/成品）
-NatureOfProductShort=Nature of product
+NatureOfProductShort=產品性質
 NatureOfProductDesc=Raw material or finished product
 ShortLabel=短標籤
 Unit=單位
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=可用的全域值：
 PriceMode=價格模式
 PriceNumeric=號碼
 DefaultPrice=預設價格
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=母產品變更時增加/減少庫存
 ComposedProduct=子產品
 MinSupplierPrice=最低採購價格
@@ -339,6 +340,7 @@ UseProductFournDesc=增加供應商已定義產品描述的功能，以針對客
 ProductSupplierDescription=產品的供應商說明
 UseProductSupplierPackaging=按照供應商價格使用包裝（在供應商文件中增加/更新行時，根據供應商價格上設定的包裝重新計算數量）
 PackagingForThisProduct=包裝
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=根據供應商的包裝重新計算了生產線的數量
 
 #Attributes
diff --git a/htdocs/langs/zh_TW/recruitment.lang b/htdocs/langs/zh_TW/recruitment.lang
index 4c77d970239..5302409b57c 100644
--- a/htdocs/langs/zh_TW/recruitment.lang
+++ b/htdocs/langs/zh_TW/recruitment.lang
@@ -18,53 +18,58 @@
 #
 
 # Module label 'ModuleRecruitmentName'
-ModuleRecruitmentName = Recruitment
+ModuleRecruitmentName = 招募
 # Module description 'ModuleRecruitmentDesc'
-ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+ModuleRecruitmentDesc = 管理和追蹤招募活動中的新職位
 
 #
 # Admin page
 #
-RecruitmentSetup = Recruitment setup
+RecruitmentSetup = 招募設定
 Settings = 設定
-RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
-RecruitmentArea=Recruitement area
-PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
-EnablePublicRecruitmentPages=Enable public pages of open jobs
+RecruitmentSetupPage = 在此處輸入招募模組主要選項的設定
+RecruitmentArea=招募區域
+PublicInterfaceRecruitmentDesc=職缺的公共頁面是顯示和回答開放職缺的公開URL。每個職缺記錄上都有一個針對每個開放職缺的不同連結。
+EnablePublicRecruitmentPages=啟用開放工作的公共頁面
 
 #
 # About page
 #
 About = 關於
-RecruitmentAbout = About Recruitment
-RecruitmentAboutPage = Recruitment about page
-NbOfEmployeesExpected=Expected nb of employees
-JobLabel=Label of job position
-WorkPlace=Work place
-DateExpected=Expected date
-FutureManager=Future manager
-ResponsibleOfRecruitement=Responsible of recruitment
-IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+RecruitmentAbout = 關於招募
+RecruitmentAboutPage = 關於頁面的招募
+NbOfEmployeesExpected=預期員工人數
+JobLabel=工作職位標籤
+WorkPlace=工作地點
+DateExpected=預計的日期
+FutureManager=展望管理員
+ResponsibleOfRecruitement=負責招聘
+IfJobIsLocatedAtAPartner=如果職缺位於合作夥伴地點
+PositionToBeFilled=工作職稱
+PositionsToBeFilled=工作職位
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
-ThisIsInformationOnJobPosition=Information of the job position to be filled
-ContactForRecruitment=Contact for recruitment
-EmailRecruiter=Email recruiter
-ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
-RequestedRemuneration=Requested remuneration
-ProposedRemuneration=Proposed remuneration
-ContractProposed=Contract proposed
-ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
-JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
-InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+JobOfferToBeFilled=Job position to be filled
+ThisIsInformationOnJobPosition=工作職位空缺訊息
+ContactForRecruitment=招聘連絡人
+EmailRecruiter=電子郵件招聘者
+ToUseAGenericEmail=使用普通電子郵件。如果未定義，將使用招聘負責人的電子郵件
+NewCandidature=New application
+ListOfCandidatures=List of applications
+RequestedRemuneration=要求的薪資
+ProposedRemuneration=擬議薪資
+ContractProposed=擬議合約
+ContractSigned=合約已簽訂
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
+JobPositions=工作職位
+RecruitmentCandidatures=Applications
+InterviewToDo=面試事項
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
diff --git a/htdocs/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang
index 025321db910..d2936453e9f 100644
--- a/htdocs/langs/zh_TW/stocks.lang
+++ b/htdocs/langs/zh_TW/stocks.lang
@@ -17,10 +17,10 @@ CancelSending=取消傳送
 DeleteSending=刪除傳送
 Stock=庫存
 Stocks=庫存
-MissingStocks=Missing stocks
-StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+MissingStocks=缺少庫存
+StockAtDate=當時的庫存
+StockAtDateInPast=過去的日期
+StockAtDateInFuture=將來的日期
 StocksByLotSerial=依批次/序號的庫存
 LotSerial=批次/序號
 LotSerialList=批次/序號清單
@@ -34,7 +34,7 @@ StockMovementForId=轉讓編號 %d
 ListMouvementStockProject=與項目相關的庫存變動清單
 StocksArea=庫存區域
 AllWarehouses=所有倉庫
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=包括草稿訂單
 Location=位置
 LocationSummary=簡稱位置
@@ -95,7 +95,7 @@ RealStock=實際庫存
 RealStockDesc=實體/實際庫存是當前倉庫中的庫存。
 RealStockWillAutomaticallyWhen=實際庫存將根據以下規則（在“庫存”模組中定義）進行修改：
 VirtualStock=虛擬庫存
-VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDate=截至日期的虛擬庫存
 VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=編號倉庫
@@ -122,8 +122,9 @@ DesiredStockDesc=該庫存量將是用於補貨功能中補充庫存的值。
 StockToBuy=訂購
 Replenishment=補貨
 ReplenishmentOrders=補貨單
-VirtualDiffersFromPhysical=根據增加/減少的庫存選項，實體庫存和虛擬庫存（實體+當前訂單）可能會有所不同
-UseVirtualStockByDefault=預設情況下，使用虛擬庫存而不是實體庫存作為補貨功能
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=使用虛擬庫存
 UsePhysicalStock=使用實體庫存
 CurentSelectionMode=目前選擇模式
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=此產品已列入清單
 SelectCategory=分類篩選器
 SelectFournisseur=供應商篩選器
 inventoryOnDate=庫存
-INVENTORY_DISABLE_VIRTUAL=虛擬產品（套件）：不減少子產品的庫存
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=如果找不到最新的購買價，請使用購買價
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=庫存移動將具有庫存日期（而不是庫存確認日期）
 inventoryChangePMPPermission=允許更改產品的PMP值
 ColumnNewPMP=新PMP單位
@@ -234,9 +233,10 @@ InventoryForASpecificProduct=特定產品的庫存
 StockIsRequiredToChooseWhichLotToUse=庫存需要選擇要使用的批次
 ForceTo=強制到
 AlwaysShowFullArbo=在倉庫連結的彈出窗口上顯示完整的倉庫樹狀圖（警告：這可能會大大降低性能）
-StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
-CurrentStock=Current stock
-InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|Serial barcode)
+StockAtDatePastDesc=您可以在此處檢視給定之過去日期的庫存（實際庫存）
+StockAtDateFutureDesc=您可以在此處檢視給定之未來日期的庫存（虛擬庫存）
+CurrentStock=目前庫存
+InventoryRealQtyHelp=將值設定為0以重置數量<br>保持欄位為空或刪除行以保持不變
+UpdateByScaning=以掃描更新
+UpdateByScaningProductBarcode=掃描更新（產品條碼）
+UpdateByScaningLot=掃描更新（批次|序列條碼）
diff --git a/htdocs/langs/zh_TW/suppliers.lang b/htdocs/langs/zh_TW/suppliers.lang
index 377ad5d1067..54f6e586026 100644
--- a/htdocs/langs/zh_TW/suppliers.lang
+++ b/htdocs/langs/zh_TW/suppliers.lang
@@ -38,10 +38,11 @@ MenuOrdersSupplierToBill=採購訂單發票
 NbDaysToDelivery=交貨延遲時間（天）
 DescNbDaysToDelivery=此訂單中產品的最長交貨延遲時間
 SupplierReputation=供應商信譽
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=不訂購
 NotTheGoodQualitySupplier=低品質
 ReputationForThisProduct=信譽
 BuyerName=買家名稱
 AllProductServicePrices=所有產品/服務價格
-AllProductReferencesOfSupplier=All references of vendor
+AllProductReferencesOfSupplier=供應商的所有參考
 BuyingPriceNumShort=供應商價格
diff --git a/htdocs/langs/zh_TW/website.lang b/htdocs/langs/zh_TW/website.lang
index d791d1976c7..6a62024abd5 100644
--- a/htdocs/langs/zh_TW/website.lang
+++ b/htdocs/langs/zh_TW/website.lang
@@ -31,7 +31,7 @@ AddWebsite=新增網站
 Webpage=網頁/容器
 AddPage=新增 頁面/容器
 HomePage=首頁
-PageContainer=頁面/容器
+PageContainer=頁面
 PreviewOfSiteNotYetAvailable=您的網站<strong>%s</strong>預覽尚不可用。您必須先“ <strong>導入完整的網站模板</strong> ”或僅“ <strong>新增頁面/容器</strong> ”。
 RequestedPageHasNoContentYet=要求ID為%s的頁面尚無內容，或暫存檔案.tpl.php被刪除。編輯頁面內容以解決此問題。
 SiteDeleted=網站'%s'已刪除
@@ -135,3 +135,5 @@ ReplacementDoneInXPages=在%s頁面或容器中已完成替換
 RSSFeed=RSS 訂閱
 RSSFeedDesc=您可以使用此網址獲得類型為“ blogpost”的最新文章RSS feed。
 PagesRegenerated=已重新產生%s頁面/容器
+RegenerateWebsiteContent=重新產生網站快取檔案
+AllowedInFrames=Allowed in Frames
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 1c4116b34c2..17454356c76 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -52,6 +52,8 @@ $object = new Loan($db);
 
 $hookmanager->initHooks(array('loancard', 'globalcard'));
 
+$error = 0;
+
 
 /*
  * Actions
@@ -62,7 +64,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 if (empty($reshook))
 {
 	// Classify paid
-	if ($action == 'confirm_paid' && $confirm == 'yes')
+	if ($action == 'confirm_paid' && $confirm == 'yes' && $user->rights->loan->write)
 	{
 		$object->fetch($id);
 		$result = $object->set_paid($user);
@@ -75,7 +77,7 @@ if (empty($reshook))
 	}
 
 	// Delete loan
-	if ($action == 'confirm_delete' && $confirm == 'yes')
+	if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->loan->write)
 	{
 		$object->fetch($id);
 		$result = $object->delete($user);
@@ -146,12 +148,12 @@ if (empty($reshook))
 				if ($id <= 0)
 				{
 					$error++;
-					setEventMessages($object->db->lastqueryerror, $object->errors, 'errors');
+					setEventMessages($object->error, $object->errors, 'errors');
 					$action = 'create';
 				}
 			}
 		} else {
-			header("Location: index.php");
+			header("Location: list.php");
 			exit();
 		}
 	}
@@ -177,7 +179,7 @@ if (empty($reshook))
 				$object->capital	        = $capital;
 				$object->nbterm		        = GETPOST("nbterm", 'int');
 				$object->rate = price2num(GETPOST("rate", 'alpha'));
-                $object->insurance_amount = price2num(GETPOST('insurance_amount', 'int'));
+				$object->insurance_amount = price2num(GETPOST('insurance_amount', 'int'));
 
 				$accountancy_account_capital = GETPOST('accountancy_account_capital');
 				$accountancy_account_insurance = GETPOST('accountancy_account_insurance');
@@ -250,7 +252,7 @@ if ($action == 'create')
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">';
 
@@ -365,12 +367,12 @@ if ($action == 'create')
 	}
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+	print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 	print '</div>';
 
 	print '</form>';
@@ -409,7 +411,7 @@ if ($id > 0)
 			print '<input type="hidden" name="id" value="'.$id.'">';
 		}
 
-		dol_fiche_head($head, 'card', $langs->trans("Loan"), -1, 'bill');
+		print dol_get_fiche_head($head, 'card', $langs->trans("Loan"), -1, 'bill');
 
 		// Loan card
 
@@ -476,11 +478,11 @@ if ($id > 0)
 		// Insurance
 		if ($action == 'edit')
 		{
-		    print '<tr><td class="titlefield">'.$langs->trans("Insurance").'</td><td>';
-		    print '<input name="insurance_amount" size="10" value="'.$object->insurance_amount.'"></td></tr>';
-		    print '</td></tr>';
+			print '<tr><td class="titlefield">'.$langs->trans("Insurance").'</td><td>';
+			print '<input name="insurance_amount" size="10" value="'.$object->insurance_amount.'"></td></tr>';
+			print '</td></tr>';
 		} else {
-		    print '<tr><td class="titlefield">'.$langs->trans("Insurance").'</td><td>'.price($object->insurance_amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
+			print '<tr><td class="titlefield">'.$langs->trans("Insurance").'</td><td>'.price($object->insurance_amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
 		}
 
 		// Date start
@@ -714,14 +716,14 @@ if ($id > 0)
 
 		print '<div class="clearboth"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		if ($action == 'edit')
 		{
 			print '<div class="center">';
-			print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+			print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-			print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+			print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 			print '</div>';
 
 			print '</form>';
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index 33f3d789806..ae683c829a5 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -54,10 +54,10 @@ class Loan extends CommonObject
 	public $datestart;
 	public $dateend;
 
-    /**
-     * @var string Loan label
-     */
-    public $label;
+	/**
+	 * @var string Loan label
+	 */
+	public $label;
 
 	public $capital;
 	public $nbterm;
@@ -68,8 +68,8 @@ class Loan extends CommonObject
 	public $account_interest;
 
 	/**
-     * @var integer|string date_creation
-     */
+	 * @var integer|string date_creation
+	 */
 	public $date_creation;
 
 	/**
@@ -85,29 +85,29 @@ class Loan extends CommonObject
 	public $insurance_amount;
 
 	/**
-     * @var int Bank ID
-     */
+	 * @var int Bank ID
+	 */
 	public $fk_bank;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_creat;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_project;
 
 
 	const STATUS_UNPAID = 0;
 	const STATUS_PAID = 1;
-    const STATUS_STARTED = 2;
+	const STATUS_STARTED = 2;
 
 
 	/**
@@ -375,7 +375,7 @@ class Loan extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Tag loan as payed completely
 	 *
@@ -384,7 +384,7 @@ class Loan extends CommonObject
 	 */
 	public function set_paid($user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."loan SET";
 		$sql .= " paid = ".$this::STATUS_PAID;
 		$sql .= " WHERE rowid = ".$this->id;
@@ -397,7 +397,7 @@ class Loan extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Tag loan as payement started
 	 *
@@ -406,7 +406,7 @@ class Loan extends CommonObject
 	 */
 	public function set_started($user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."loan SET";
 		$sql .= " paid = ".$this::STATUS_STARTED;
 		$sql .= " WHERE rowid = ".$this->id;
@@ -419,7 +419,7 @@ class Loan extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Tag loan as payement as unpaid
 	 *
@@ -428,7 +428,7 @@ class Loan extends CommonObject
 	 */
 	public function set_unpaid($user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."loan SET";
 		$sql .= " paid = ".$this::STATUS_UNPAID;
 		$sql .= " WHERE rowid = ".$this->id;
@@ -453,7 +453,7 @@ class Loan extends CommonObject
 		return $this->LibStatut($this->paid, $mode, $alreadypaid);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return label for given status
 	 *
@@ -476,11 +476,11 @@ class Loan extends CommonObject
 			global $langs;
 			$this->labelStatus[self::STATUS_UNPAID] = $langs->trans('Unpaid');
 			$this->labelStatus[self::STATUS_PAID] = $langs->trans('Paid');
-            $this->labelStatus[self::STATUS_STARTED] = $langs->trans("BillStatusStarted");
+			$this->labelStatus[self::STATUS_STARTED] = $langs->trans("BillStatusStarted");
 			if ($status == 0 && $alreadypaid > 0) $this->labelStatus[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
 			$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans('Unpaid');
 			$this->labelStatusShort[self::STATUS_PAID] = $langs->trans('Enabled');
-            $this->labelStatusShort[self::STATUS_STARTED] = $langs->trans("BillStatusStarted");
+			$this->labelStatusShort[self::STATUS_STARTED] = $langs->trans("BillStatusStarted");
 			if ($status == 0 && $alreadypaid > 0) $this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
 		}
 
@@ -497,10 +497,10 @@ class Loan extends CommonObject
 	 *
 	 *  @param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
 	 *  @param	int		$maxlen						Label max length
-     *  @param  string  $option        				On what the link point to ('nolink', ...)
-     *  @param  int     $notooltip                  1=Disable tooltip
-     *  @param  string  $morecss                    Add more css on link
-     *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param  string  $option        				On what the link point to ('nolink', ...)
+	 *  @param  int     $notooltip                  1=Disable tooltip
+	 *  @param  string  $morecss                    Add more css on link
+	 *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *  @return	string								Chaine with URL
 	 */
 	public function getNomUrl($withpicto = 0, $maxlen = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
@@ -560,25 +560,25 @@ class Loan extends CommonObject
 	 */
 	public function initAsSpecimen()
 	{
-	    global $user, $langs, $conf;
+		global $user, $langs, $conf;
 
-	    $now = dol_now();
+		$now = dol_now();
 
-	    // Initialise parameters
-	    $this->id = 0;
-	    $this->fk_bank = 1;
-	    $this->label = 'SPECIMEN';
-	    $this->specimen = 1;
-	    $this->socid = 1;
-	    $this->account_capital = 16;
-	    $this->account_insurance = 616;
-	    $this->account_interest = 518;
-	    $this->datestart = $now;
-	    $this->dateend = $now + (3600 * 24 * 365);
-	    $this->note_public = 'SPECIMEN';
-	    $this->capital = 20000;
-	    $this->nbterm = 48;
-	    $this->rate = 4.3;
+		// Initialise parameters
+		$this->id = 0;
+		$this->fk_bank = 1;
+		$this->label = 'SPECIMEN';
+		$this->specimen = 1;
+		$this->socid = 1;
+		$this->account_capital = 16;
+		$this->account_insurance = 616;
+		$this->account_interest = 518;
+		$this->datestart = $now;
+		$this->dateend = $now + (3600 * 24 * 365);
+		$this->note_public = 'SPECIMEN';
+		$this->capital = 20000;
+		$this->nbterm = 48;
+		$this->rate = 4.3;
 	}
 
 	/**
@@ -659,5 +659,5 @@ class Loan extends CommonObject
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
-    }
+	}
 }
diff --git a/htdocs/loan/class/loanschedule.class.php b/htdocs/loan/class/loanschedule.class.php
index 4fd4b526d25..50339359a9d 100644
--- a/htdocs/loan/class/loanschedule.class.php
+++ b/htdocs/loan/class/loanschedule.class.php
@@ -40,56 +40,56 @@ class LoanSchedule extends CommonObject
 	 */
 	public $table_element = 'loan_schedule';
 
-    /**
-     * @var int Loan ID
-     */
-    public $fk_loan;
+	/**
+	 * @var int Loan ID
+	 */
+	public $fk_loan;
 
-    /**
-     * @var string Create date
-     */
-    public $datec;
+	/**
+	 * @var string Create date
+	 */
+	public $datec;
 	public $tms;
 
-    /**
-     * @var string Payment date
-     */
-    public $datep;
+	/**
+	 * @var string Payment date
+	 */
+	public $datep;
 
-    public $amounts = array(); // Array of amounts
-    public $amount_capital; // Total amount of payment
+	public $amounts = array(); // Array of amounts
+	public $amount_capital; // Total amount of payment
 	public $amount_insurance;
 	public $amount_interest;
 
-    /**
-     * @var int Payment Type ID
-     */
-    public $fk_typepayment;
+	/**
+	 * @var int Payment Type ID
+	 */
+	public $fk_typepayment;
 
-    /**
-     * @var int Payment ID
-     */
-    public $num_payment;
+	/**
+	 * @var int Payment ID
+	 */
+	public $num_payment;
 
-    /**
-     * @var int Bank ID
-     */
-    public $fk_bank;
+	/**
+	 * @var int Bank ID
+	 */
+	public $fk_bank;
 
-    /**
-     * @var int Loan Payment ID
-     */
-    public $fk_payment_loan;
+	/**
+	 * @var int Loan Payment ID
+	 */
+	public $fk_payment_loan;
 
-    /**
-     * @var int Bank ID
-     */
-    public $fk_user_creat;
+	/**
+	 * @var int Bank ID
+	 */
+	public $fk_user_creat;
 
-    /**
-     * @var int User ID
-     */
-    public $fk_user_modif;
+	/**
+	 * @var int User ID
+	 */
+	public $fk_user_modif;
 
 	public $lines = array();
 
@@ -115,8 +115,8 @@ class LoanSchedule extends CommonObject
 
 	/**
 	 *  Create payment of loan into database.
-     *  Use this->amounts to have list of lines for the payment
-     *
+	 *  Use this->amounts to have list of lines for the payment
+	 *
 	 *  @param      User		$user   User making payment
 	 *  @return     int     			<0 if KO, id of payment if OK
 	 */
@@ -126,9 +126,9 @@ class LoanSchedule extends CommonObject
 
 		$error = 0;
 
-        $now = dol_now();
+		$now = dol_now();
 
-        // Validate parameters
+		// Validate parameters
 		if (!$this->datep)
 		{
 			$this->error = 'ErrorBadValueForParameter';
@@ -145,14 +145,14 @@ class LoanSchedule extends CommonObject
 		if (isset($this->fk_user_creat)) $this->fk_user_creat = (int) $this->fk_user_creat;
 		if (isset($this->fk_user_modif)) $this->fk_user_modif = (int) $this->fk_user_modif;
 
-        $totalamount = $this->amount_capital + $this->amount_insurance + $this->amount_interest;
-        $totalamount = price2num($totalamount);
+		$totalamount = $this->amount_capital + $this->amount_insurance + $this->amount_interest;
+		$totalamount = price2num($totalamount);
 
-        // Check parameters
-        if ($totalamount == 0) {
-        	$this->errors[] = 'step1';
-        	return -1; // Negative amounts are accepted for reject prelevement but not null
-        }
+		// Check parameters
+		if ($totalamount == 0) {
+			$this->errors[] = 'step1';
+			return -1; // Negative amounts are accepted for reject prelevement but not null
+		}
 
 
 		$this->db->begin();
@@ -176,15 +176,15 @@ class LoanSchedule extends CommonObject
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_loan");
 			} else {
-                $this->error = $this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				$error++;
 			}
 		}
 
 		if ($totalamount != 0 && !$error)
 		{
-		    $this->amount_capital = $totalamount;
-		    $this->db->commit();
+			$this->amount_capital = $totalamount;
+			$this->db->commit();
 			return $this->id;
 		} else {
 			$this->errors[] = $this->db->lasterror();
@@ -203,61 +203,61 @@ class LoanSchedule extends CommonObject
 	{
 		global $langs;
 		$sql = "SELECT";
-		$sql.= " t.rowid,";
-		$sql.= " t.fk_loan,";
-		$sql.= " t.datec,";
-		$sql.= " t.tms,";
-		$sql.= " t.datep,";
-		$sql.= " t.amount_capital,";
-		$sql.= " t.amount_insurance,";
-		$sql.= " t.amount_interest,";
-		$sql.= " t.fk_typepayment,";
-		$sql.= " t.num_payment,";
-        $sql.= " t.note_private,";
-        $sql.= " t.note_public,";
-		$sql.= " t.fk_bank,";
-		$sql.= " t.fk_payment_loan,";
-		$sql.= " t.fk_user_creat,";
-		$sql.= " t.fk_user_modif,";
-		$sql.= " pt.code as type_code, pt.libelle as type_label,";
-		$sql.= ' b.fk_account';
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pt ON t.fk_typepayment = pt.id";
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON t.fk_bank = b.rowid';
-		$sql.= " WHERE t.rowid = ".$id;
+		$sql .= " t.rowid,";
+		$sql .= " t.fk_loan,";
+		$sql .= " t.datec,";
+		$sql .= " t.tms,";
+		$sql .= " t.datep,";
+		$sql .= " t.amount_capital,";
+		$sql .= " t.amount_insurance,";
+		$sql .= " t.amount_interest,";
+		$sql .= " t.fk_typepayment,";
+		$sql .= " t.num_payment,";
+		$sql .= " t.note_private,";
+		$sql .= " t.note_public,";
+		$sql .= " t.fk_bank,";
+		$sql .= " t.fk_payment_loan,";
+		$sql .= " t.fk_user_creat,";
+		$sql .= " t.fk_user_modif,";
+		$sql .= " pt.code as type_code, pt.libelle as type_label,";
+		$sql .= ' b.fk_account';
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pt ON t.fk_typepayment = pt.id";
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON t.fk_bank = b.rowid';
+		$sql .= " WHERE t.rowid = ".$id;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
-            if ($this->db->num_rows($resql)) {
-                $obj = $this->db->fetch_object($resql);
+			if ($this->db->num_rows($resql)) {
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->rowid;
-                $this->ref = $obj->rowid;
+				$this->id = $obj->rowid;
+				$this->ref = $obj->rowid;
 
-                $this->fk_loan = $obj->fk_loan;
-                $this->datec = $this->db->jdate($obj->datec);
-                $this->tms = $this->db->jdate($obj->tms);
-                $this->datep = $this->db->jdate($obj->datep);
-                $this->amount_capital = $obj->amount_capital;
-                $this->amount_insurance = $obj->amount_insurance;
-                $this->amount_interest = $obj->amount_interest;
-                $this->fk_typepayment = $obj->fk_typepayment;
-                $this->num_payment = $obj->num_payment;
-                $this->note_private = $obj->note_private;
-                $this->note_public = $obj->note_public;
-                $this->fk_bank = $obj->fk_bank;
+				$this->fk_loan = $obj->fk_loan;
+				$this->datec = $this->db->jdate($obj->datec);
+				$this->tms = $this->db->jdate($obj->tms);
+				$this->datep = $this->db->jdate($obj->datep);
+				$this->amount_capital = $obj->amount_capital;
+				$this->amount_insurance = $obj->amount_insurance;
+				$this->amount_interest = $obj->amount_interest;
+				$this->fk_typepayment = $obj->fk_typepayment;
+				$this->num_payment = $obj->num_payment;
+				$this->note_private = $obj->note_private;
+				$this->note_public = $obj->note_public;
+				$this->fk_bank = $obj->fk_bank;
 				$this->fk_payment_loan = $obj->fk_payment_loan;
-                $this->fk_user_creat = $obj->fk_user_creat;
-                $this->fk_user_modif = $obj->fk_user_modif;
+				$this->fk_user_creat = $obj->fk_user_creat;
+				$this->fk_user_modif = $obj->fk_user_modif;
 
-                $this->type_code = $obj->type_code;
-                $this->type_label = $obj->type_label;
+				$this->type_code = $obj->type_code;
+				$this->type_label = $obj->type_label;
 
-                $this->bank_account = $obj->fk_account;
-                $this->bank_line = $obj->fk_bank;
-            }
-            $this->db->free($resql);
+				$this->bank_account = $obj->fk_account;
+				$this->bank_line = $obj->fk_bank;
+			}
+			$this->db->free($resql);
 
 			return 1;
 		} else {
@@ -280,13 +280,13 @@ class LoanSchedule extends CommonObject
 		$error = 0;
 
 		// Clean parameters
-		if (isset($this->amount_capital)) $this->amount_capital=trim($this->amount_capital);
-		if (isset($this->amount_insurance)) $this->amount_insurance=trim($this->amount_insurance);
-		if (isset($this->amount_interest)) $this->amount_interest=trim($this->amount_interest);
-		if (isset($this->num_payment)) $this->num_payment=trim($this->num_payment);
-		if (isset($this->note_private)) $this->note_private=trim($this->note_private);
-		if (isset($this->note_public)) $this->note_public=trim($this->note_public);
-		if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank);
+		if (isset($this->amount_capital)) $this->amount_capital = trim($this->amount_capital);
+		if (isset($this->amount_insurance)) $this->amount_insurance = trim($this->amount_insurance);
+		if (isset($this->amount_interest)) $this->amount_interest = trim($this->amount_interest);
+		if (isset($this->num_payment)) $this->num_payment = trim($this->num_payment);
+		if (isset($this->note_private)) $this->note_private = trim($this->note_private);
+		if (isset($this->note_public)) $this->note_public = trim($this->note_public);
+		if (isset($this->fk_bank)) $this->fk_bank = trim($this->fk_bank);
 		if (isset($this->fk_payment_loan)) $this->fk_payment_loan = (int) $this->fk_payment_loan;
 
 		// Check parameters
@@ -338,21 +338,21 @@ class LoanSchedule extends CommonObject
 	 *  @param  int		$notrigger		0=launch triggers after, 1=disable triggers
 	 *  @return int						<0 if KO, >0 if OK
 	 */
-    public function delete($user, $notrigger = 0)
+	public function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
 		$error = 0;
 
 		$this->db->begin();
 
-        if (!$error) {
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
 			$sql .= " WHERE rowid=".$this->id;
 
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-        }
+		}
 
 		// Commit or rollback
 		if ($error)
@@ -368,7 +368,7 @@ class LoanSchedule extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-    }
+	}
 
 	/**
 	 * Calculate Monthly Payments
diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index 9c5c1b559ad..dc6d72094b2 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -417,6 +417,31 @@ class PaymentLoan extends CommonObject
 		}
 	}
 
+	/**
+	 * Retourne le libelle du statut d'une facture (brouillon, validee, abandonnee, payee)
+	 *
+	 * @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 * @return  string				Libelle
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut($this->statut, $mode);
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Renvoi le libelle d'un statut donne
+	 *
+	 * @param   int		$status     Statut
+	 * @param   int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 * @return	string  		    Libelle du statut
+	 */
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		return '';
+	}
+
 	/**
 	 *      Add record into bank for payment with links between this bank record and invoices of payment.
 	 *      All payment properties must have been set first like after a call to create().
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index 442f8768390..91bfaf1f921 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -49,7 +49,7 @@ $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
-    $page = 0;
+	$page = 0;
 }
 $offset = $limit * $page;
 $pageprev = $page - 1;
@@ -85,9 +85,9 @@ if ($object->id)
 {
 	$totalpaid = $object->getSumPayment();
 
-    $head = loan_prepare_head($object);
+	$head = loan_prepare_head($object);
 
-    dol_fiche_head($head, 'documents', $langs->trans("Loan"), -1, 'bill');
+	print dol_get_fiche_head($head, 'documents', $langs->trans("Loan"), -1, 'bill');
 
 	$morehtmlref = '<div class="refidno">';
 	// Ref loan
@@ -135,31 +135,31 @@ if ($object->id)
 	print '<div class="underbanner clearboth"></div>';
 
 
-    // Build file list
-    $filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
-    $totalsize = 0;
-    foreach ($filearray as $key => $file)
-    {
-        $totalsize += $file['size'];
-    }
+	// Build file list
+	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$totalsize = 0;
+	foreach ($filearray as $key => $file)
+	{
+		$totalsize += $file['size'];
+	}
 
 
-    print '<table class="border tableforfield centpercent">';
-    print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td>'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-    print "</table>\n";
+	print '<table class="border tableforfield centpercent">';
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td>'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+	print "</table>\n";
 
-    print "</div>\n";
+	print "</div>\n";
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    $modulepart = 'loan';
-    $permission = $user->rights->loan->write;
-    $permtoedit = $user->rights->loan->write;
-    $param = '&id='.$object->id;
-    include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	$modulepart = 'loan';
+	$permission = $user->rights->loan->write;
+	$permtoedit = $user->rights->loan->write;
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
-    print $langs->trans("ErrorUnknown");
+	print $langs->trans("ErrorUnknown");
 }
 
 // End of page
diff --git a/htdocs/loan/info.php b/htdocs/loan/info.php
index 21661d787f5..0d9306aa71f 100644
--- a/htdocs/loan/info.php
+++ b/htdocs/loan/info.php
@@ -58,7 +58,7 @@ $object->info($id);
 
 $head = loan_prepare_head($object);
 
-dol_fiche_head($head, 'info', $langs->trans("Loan"), -1, 'bill');
+print dol_get_fiche_head($head, 'info', $langs->trans("Loan"), -1, 'bill');
 
 $morehtmlref = '<div class="refidno">';
 // Ref loan
diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php
index 5ff943f31e4..91f32679699 100644
--- a/htdocs/loan/note.php
+++ b/htdocs/loan/note.php
@@ -68,14 +68,14 @@ llxHeader("", $title, $help_url);
 
 if ($id > 0)
 {
-    /*
+	/*
      * Affichage onglets
      */
 	$totalpaid = $object->getSumPayment();
 
-    $head = loan_prepare_head($object);
+	$head = loan_prepare_head($object);
 
-    dol_fiche_head($head, 'note', $langs->trans("Loan"), -1, 'bill');
+	print dol_get_fiche_head($head, 'note', $langs->trans("Loan"), -1, 'bill');
 
 	$morehtmlref = '<div class="refidno">';
 	// Ref loan
@@ -122,11 +122,11 @@ if ($id > 0)
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
-    $cssclass = 'titlefield';
-    $permission = $user->rights->loan->write; // Used by the include of notes.tpl.php
-    include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+	$cssclass = 'titlefield';
+	$permission = $user->rights->loan->write; // Used by the include of notes.tpl.php
+	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index 51aa3f85a92..6aebd9fb33d 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -57,7 +57,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->loan->del
 	$sql = "UPDATE ".MAIN_DB_PREFIX."loan_schedule SET fk_bank = 0 WHERE fk_bank = ".$payment->fk_bank;
 	$db->query($sql);
 
-    $fk_loan = $payment->fk_loan;
+	$fk_loan = $payment->fk_loan;
 
 	$result = $payment->delete($user);
 	if ($result > 0)
@@ -71,42 +71,6 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->loan->del
 	}
 }
 
-// Create payment
-if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->loan->write)
-{
-	$db->begin();
-
-	$result = $payment->valide();
-
-	if ($result > 0)
-	{
-		$db->commit();
-
-		$factures = array(); // TODO Get all id of invoices linked to this payment
-		foreach ($factures as $id)
-		{
-			$fac = new Facture($db);
-			$fac->fetch($id);
-
-			$outputlangs = $langs;
-			if (!empty($_REQUEST['lang_id']))
-			{
-				$outputlangs = new Translate("", $conf);
-				$outputlangs->setDefaultLang($_REQUEST['lang_id']);
-			}
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-				$fac->generateDocument($fac->model_pdf, $outputlangs);
-			}
-		}
-
-		header('Location: card.php?id='.$payment->id);
-		exit;
-	} else {
-		setEventMessages($payment->error, $payment->errors, 'errors');
-		$db->rollback();
-	}
-}
-
 
 /*
  * View
@@ -124,7 +88,7 @@ $head[$h][1] = $langs->trans("PaymentLoan");
 $hselected = $h;
 $h++;
 
-dol_fiche_head($head, $hselected, $langs->trans("PaymentLoan"), 0, 'payment');
+print dol_get_fiche_head($head, $hselected, $langs->trans("PaymentLoan"), -1, 'payment');
 
 /*
  * Confirm deletion of the payment
@@ -134,24 +98,17 @@ if ($action == 'delete')
 	print $form->formconfirm('card.php?id='.$payment->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete', '', 0, 2);
 }
 
-/*
- * Confirm validation of the payment
- */
-if ($action == 'valide')
-{
-	$facid = $_GET['facid'];
-	print $form->formconfirm('card.php?id='.$payment->id.'&amp;facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide', '', 0, 2);
-}
+$linkback = '';
+$morehtmlref = '';
+$morehtmlright = '';
 
+dol_banner_tab($payment, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
+
+print '<div class="fichecenter">';
+print '<div class="underbanner clearboth"></div>';
 
 print '<table class="border centpercent">';
 
-// Ref
-print '<tr><td class="titlefield">'.$langs->trans('Ref').'</td>';
-print '<td>';
-print $form->showrefnav($payment, 'id', '', 1, 'rowid', 'id');
-print '</td></tr>';
-
 // Date
 print '<tr><td>'.$langs->trans('Date').'</td><td>'.dol_print_date($payment->datep, 'day').'</td></tr>';
 
@@ -188,6 +145,8 @@ if (!empty($conf->banque->enabled))
 
 print '</table>';
 
+print '</div>';
+
 
 /*
  * List of loans payed
@@ -262,20 +221,8 @@ print '</div>';
 /*
  * Actions buttons
  */
-print '<div class="tabsAction">';
 
-/*
-if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
-{
-	if ($user->socid == 0 && $payment->statut == 0 && $_GET['action'] == '')
-	{
-		if ($user->rights->facture->paiement)
-		{
-			print '<a class="butAction" href="card.php?id='.$_GET['id'].'&amp;facid='.$objp->facid.'&amp;action=valide">'.$langs->trans('Valid').'</a>';
-		}
-	}
-}
-*/
+print '<div class="tabsAction">';
 
 if (empty($action) && !empty($user->rights->loan->delete))
 {
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index 9aaa75b9845..1793854631e 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -32,9 +32,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
 
 $langs->loadLangs(array("bills", "loan"));
 
-$chid=GETPOST('id', 'int');
-$action=GETPOST('action', 'aZ09');
-$cancel=GETPOST('cancel', 'alpha');
+$chid = GETPOST('id', 'int');
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'alpha');
 $datepaid = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 
 // Security check
@@ -53,34 +53,34 @@ $ls = new LoanSchedule($db);
 $res = $ls->fetchAll($chid);
 if ($res > 0)
 {
-    foreach ($ls->lines as $l)
-    {
-        $echance++; // Count term pos
-        // last unpaid term
-        if (empty($l->fk_bank))
-        {
-            $line_id = $l->id;
-            break;
-        }
-        // If line_id provided, only count temp pos
-        elseif ($line_id == $l->id)
-        {
-            break;
-        }
-    }
+	foreach ($ls->lines as $l)
+	{
+		$echance++; // Count term pos
+		// last unpaid term
+		if (empty($l->fk_bank))
+		{
+			$line_id = $l->id;
+			break;
+		}
+		// If line_id provided, only count temp pos
+		elseif ($line_id == $l->id)
+		{
+			break;
+		}
+	}
 }
 
 // Set current line with last unpaid line (only if shedule is used)
 if (!empty($line_id))
 {
-    $line = new LoanSchedule($db);
-    $res = $line->fetch($line_id);
-    if ($res > 0) {
-        $amount_capital = price($line->amount_capital);
-        $amount_insurance = price($line->amount_insurance);
-        $amount_interest = price($line->amount_interest);
-        if (empty($datepaid)) $ts_temppaid = $line->datep;
-    }
+	$line = new LoanSchedule($db);
+	$res = $line->fetch($line_id);
+	if ($res > 0) {
+		$amount_capital = price($line->amount_capital);
+		$amount_insurance = price($line->amount_insurance);
+		$amount_interest = price($line->amount_interest);
+		if (empty($datepaid)) $ts_temppaid = $line->datep;
+	}
 }
 
 
@@ -99,7 +99,7 @@ if ($action == 'add_payment')
 		exit;
 	}
 
-	if (! GETPOST('paymenttype', 'int') > 0)
+	if (!GETPOST('paymenttype', 'int') > 0)
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode")), null, 'errors');
 		$error++;
@@ -119,26 +119,26 @@ if ($action == 'add_payment')
 	{
 		$paymentid = 0;
 
-        $pay_amount_capital = price2num(GETPOST('amount_capital'));
-        $pay_amount_insurance = price2num(GETPOST('amount_insurance'));
-        // User can't set interest him self if schedule is set (else value in schedule can be incoherent)
-        if (!empty($line)) $pay_amount_interest = $line->amount_interest;
-        else $pay_amount_interest = price2num(GETPOST('amount_interest'));
-        $remaindertopay = price2num(GETPOST('remaindertopay'));
-		$amount =  $pay_amount_capital + $pay_amount_insurance + $pay_amount_interest;
+		$pay_amount_capital = price2num(GETPOST('amount_capital'));
+		$pay_amount_insurance = price2num(GETPOST('amount_insurance'));
+		// User can't set interest him self if schedule is set (else value in schedule can be incoherent)
+		if (!empty($line)) $pay_amount_interest = $line->amount_interest;
+		else $pay_amount_interest = price2num(GETPOST('amount_interest'));
+		$remaindertopay = price2num(GETPOST('remaindertopay'));
+		$amount = $pay_amount_capital + $pay_amount_insurance + $pay_amount_interest;
 
-        // This term is allready paid
-        if (!empty($line) && !empty($line->fk_bank))
-        {
-            setEventMessages($langs->trans('TermPaidAllreadyPaid'), null, 'errors');
-            $error++;
-        }
+		// This term is allready paid
+		if (!empty($line) && !empty($line->fk_bank))
+		{
+			setEventMessages($langs->trans('TermPaidAllreadyPaid'), null, 'errors');
+			$error++;
+		}
 
-        if (empty($remaindertopay))
-        {
+		if (empty($remaindertopay))
+		{
 			setEventMessages('Empty sumpaid', null, 'errors');
 			$error++;
-        }
+		}
 
 		if ($amount == 0)
 		{
@@ -152,14 +152,14 @@ if ($action == 'add_payment')
 
 			// Create a line of payments
 			$payment = new PaymentLoan($db);
-			$payment->chid				= $chid;
+			$payment->chid = $chid;
 			$payment->datep             = $datepaid;
 			$payment->label             = $loan->label;
-			$payment->amount_capital	= $pay_amount_capital;
-			$payment->amount_insurance	= $pay_amount_interest;
-			$payment->amount_interest	= $pay_amount_insurance;
+			$payment->amount_capital = $pay_amount_capital;
+			$payment->amount_insurance = $pay_amount_interest;
+			$payment->amount_interest = $pay_amount_insurance;
 			$payment->paymenttype       = GETPOST('paymenttype', 'int');
-			$payment->num_payment		= GETPOST('num_payment');
+			$payment->num_payment = GETPOST('num_payment');
 			$payment->note_private      = GETPOST('note_private', 'restricthtml');
 			$payment->note_public       = GETPOST('note_public', 'restricthtml');
 
@@ -183,48 +183,48 @@ if ($action == 'add_payment')
 				}
 			}
 
-            // Update loan schedule with payment value
-            if (! $error && !empty($line))
-            {
-                // If payment values are modified, recalculate schedule
-                if (($line->amount_capital <> $pay_amount_capital) || ($line->amount_insurance <> $pay_amount_insurance) || ($line->amount_interest <> $pay_amount_interest))
-                {
-                    $arr_term = loanCalcMonthlyPayment(($pay_amount_capital + $pay_amount_interest), $remaindertopay, ($loan->rate / 100), $echance, $loan->nbterm);
-                    foreach ($arr_term as $k=>$v)
-                    {
-                        // Update fk_bank for current line
-                        if ($k == $echance)
-                        {
-                            $ls->lines[$k-1]->fk_bank = $payment->fk_bank;
-                            $ls->lines[$k-1]->fk_payment_loan = $payment->id;
-                        }
-                        $ls->lines[$k-1]->amount_capital = $v['mens'] - $v['interet'];
-                        $ls->lines[$k-1]->amount_interest = $v['interet'];
-                        $ls->lines[$k-1]->tms = dol_now();
-                        $ls->lines[$k-1]->fk_user_modif = $user->id;
-                        $result = $ls->lines[$k-1]->update($user, 0);
-                        if ($result < 1)
-                        {
-                            setEventMessages(null, $ls->errors, 'errors');
-                            $error++;
-                            break;
-                        }
-                    }
-                }
-                else // Only add fk_bank bank to schedule line (mark as paid)
-                {
-                    $line->fk_bank = $payment->fk_bank;
-                    $line->fk_payment_loan = $payment->id;
-                    $result = $line->update($user, 0);
-                    if ($result < 1)
-                    {
-                        setEventMessages(null, $line->errors, 'errors');
-                        $error++;
-                    }
-                }
-            }
+			// Update loan schedule with payment value
+			if (!$error && !empty($line))
+			{
+				// If payment values are modified, recalculate schedule
+				if (($line->amount_capital <> $pay_amount_capital) || ($line->amount_insurance <> $pay_amount_insurance) || ($line->amount_interest <> $pay_amount_interest))
+				{
+					$arr_term = loanCalcMonthlyPayment(($pay_amount_capital + $pay_amount_interest), $remaindertopay, ($loan->rate / 100), $echance, $loan->nbterm);
+					foreach ($arr_term as $k=>$v)
+					{
+						// Update fk_bank for current line
+						if ($k == $echance)
+						{
+							$ls->lines[$k - 1]->fk_bank = $payment->fk_bank;
+							$ls->lines[$k - 1]->fk_payment_loan = $payment->id;
+						}
+						$ls->lines[$k - 1]->amount_capital = $v['mens'] - $v['interet'];
+						$ls->lines[$k - 1]->amount_interest = $v['interet'];
+						$ls->lines[$k - 1]->tms = dol_now();
+						$ls->lines[$k - 1]->fk_user_modif = $user->id;
+						$result = $ls->lines[$k - 1]->update($user, 0);
+						if ($result < 1)
+						{
+							setEventMessages(null, $ls->errors, 'errors');
+							$error++;
+							break;
+						}
+					}
+				}
+				else // Only add fk_bank bank to schedule line (mark as paid)
+				{
+					$line->fk_bank = $payment->fk_bank;
+					$line->fk_payment_loan = $payment->id;
+					$result = $line->update($user, 0);
+					if ($result < 1)
+					{
+						setEventMessages(null, $line->errors, 'errors');
+						$error++;
+					}
+				}
+			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$db->commit();
 				$loc = DOL_URL_ROOT.'/loan/card.php?id='.$chid;
@@ -257,12 +257,12 @@ if ($action == 'create')
 	print load_fiche_titre($langs->trans("DoPayment"));
 
 	$sql = "SELECT SUM(amount_capital) as total";
-	$sql.= " FROM ".MAIN_DB_PREFIX."payment_loan";
-	$sql.= " WHERE fk_loan = ".$chid;
+	$sql .= " FROM ".MAIN_DB_PREFIX."payment_loan";
+	$sql .= " WHERE fk_loan = ".$chid;
 	$resql = $db->query($sql);
 	if ($resql)
 	{
-		$obj=$db->fetch_object($resql);
+		$obj = $db->fetch_object($resql);
 		$sumpaid = $obj->total;
 		$db->free();
 	}
@@ -272,14 +272,13 @@ if ($action == 'create')
 	print '<input type="hidden" name="id" value="'.$chid.'">';
 	print '<input type="hidden" name="chid" value="'.$chid.'">';
 	print '<input type="hidden" name="line_id" value="'.$line_id.'">';
-	print '<input type="hidden" name="remaindertopay" value="'.($total-$sumpaid).'">';
+	print '<input type="hidden" name="remaindertopay" value="'.($total - $sumpaid).'">';
 	print '<input type="hidden" name="action" value="add_payment">';
 
-    dol_fiche_head();
+	print dol_get_fiche_head();
 
-	print '<table cellspacing="0" class="border" width="100%" cellpadding="2">';
-
-	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Loan").'</td>';
+	/*
+	 print '<table class="border centpercent">';
 
 	print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td colspan="2"><a href="'.DOL_URL_ROOT.'/loan/card.php?id='.$chid.'">'.$chid.'</a></td></tr>';
     if ($echance > 0)
@@ -295,22 +294,17 @@ if ($action == 'create')
 	print '</tr>';
 
 	print '</table>';
+	*/
 
-	print '<br>';
-
-	print '<table cellspacing="0" class="border" width="100%" cellpadding="2">';
-	print '<tr class="liste_titre">';
-	print '<td colspan="3">'.$langs->trans("Payment").'</td>';
-	print '</tr>';
+	print '<table class="border centpercent">';
 
 	print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Date").'</td><td colspan="2">';
-    if (empty($datepaid))
-        if (empty($ts_temppaid)) $datepayment = empty($conf->global->MAIN_AUTOFILL_DATE)?-1:dol_now();
+	if (empty($datepaid))
+		if (empty($ts_temppaid)) $datepayment = empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : dol_now();
 	else $datepayment = $ts_temppaid;
-    else $datepayment = $datepaid;
+	else $datepayment = $datepaid;
 	print $form->selectDate($datepayment, '', '', '', '', "add_payment", 1, 1);
 	print "</td>";
-
 	print '</tr>';
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td colspan="2">';
@@ -321,14 +315,15 @@ if ($action == 'create')
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
 	print '<td colspan="2">';
-	$form->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$loan->accountid, "accountid", 0, 'courant = '.Account::TYPE_CURRENT, 1);  // Show opend bank account list
+	$form->select_comptes(GETPOSTISSET("accountid") ? GETPOST("accountid", 'int') : $loan->accountid, "accountid", 0, 'courant = '.Account::TYPE_CURRENT, 1); // Show opend bank account list
 	print '</td></tr>';
 
 	// Number
 	print '<tr><td>'.$langs->trans('Numero');
 	print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
 	print '</td>';
-	print '<td colspan="2"><input name="num_payment" type="text" value="'.GETPOST('num_payment', 'alphanohtml').'"></td></tr>'."\n";
+	print '<td colspan="2"><input name="num_payment" type="text" value="'.GETPOST('num_payment', 'alphanohtml').'"></td>'."\n";
+	print "</tr>";
 
 	print '<tr>';
 	print '<td class="tdtop">'.$langs->trans("NotePrivate").'</td>';
@@ -342,7 +337,8 @@ if ($action == 'create')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
+
 
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
@@ -371,7 +367,7 @@ if ($action == 'create')
 	print '<td class="right">';
 	if ($sumpaid < $loan->capital)
 	{
-        print $langs->trans("LoanCapital") .': <input type="text" size="8" name="amount_capital" value="'.(GETPOSTISSET('amount_capital')?GETPOST('amount_capital'):$amount_capital).'">';
+		print $langs->trans("LoanCapital").': <input type="text" size="8" name="amount_capital" value="'.(GETPOSTISSET('amount_capital') ?GETPOST('amount_capital') : $amount_capital).'">';
 	}
 	else {
 		print '-';
@@ -379,7 +375,7 @@ if ($action == 'create')
 	print '<br>';
 	if ($sumpaid < $loan->capital)
 	{
-		print $langs->trans("Insurance") .': <input type="text" size="8" name="amount_insurance" value="'.(GETPOSTISSET('amount_insurance')?GETPOST('amount_insurance'):$amount_insurance).'">';
+		print $langs->trans("Insurance").': <input type="text" size="8" name="amount_insurance" value="'.(GETPOSTISSET('amount_insurance') ?GETPOST('amount_insurance') : $amount_insurance).'">';
 	}
 	else {
 		print '-';
@@ -387,7 +383,7 @@ if ($action == 'create')
 	print '<br>';
 	if ($sumpaid < $loan->capital)
 	{
-		print $langs->trans("Interest") .': <input type="text" size="8" name="amount_interest" value="'.(GETPOSTISSET('amount_interest')?GETPOST('amount_interest'):$amount_interest).'" '.(!empty($line)?'disabled title="'.$langs->trans('CantModifyInterestIfScheduleIsUsed').'"':'').'>';
+		print $langs->trans("Interest").': <input type="text" size="8" name="amount_interest" value="'.(GETPOSTISSET('amount_interest') ?GETPOST('amount_interest') : $amount_interest).'" '.(!empty($line) ? 'disabled title="'.$langs->trans('CantModifyInterestIfScheduleIsUsed').'"' : '').'>';
 	}
 	else {
 		print '-';
@@ -399,9 +395,9 @@ if ($action == 'create')
 	print '</table>';
 
 	print '<br><div class="center">';
-	print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+	print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
 	print '&nbsp; &nbsp;';
-	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print "</form>\n";
diff --git a/htdocs/loan/schedule.php b/htdocs/loan/schedule.php
index 55f715fb050..5e27a48fa02 100644
--- a/htdocs/loan/schedule.php
+++ b/htdocs/loan/schedule.php
@@ -36,7 +36,7 @@ $action = GETPOST('action', 'aZ09');
 // Security check
 $socid = 0;
 if (GETPOSTISSET('socid')) $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
 if (empty($user->rights->loan->calc)) accessforbidden();
 
 // Load translation files required by the page
@@ -55,69 +55,69 @@ if ($object->paid > 0 && count($echeances->lines) == 0) $pay_without_schedule =
  */
 
 if ($action == 'createecheancier' && empty($pay_without_schedule)) {
-    $db->begin();
-    $i = 1;
-    while ($i < $object->nbterm + 1) {
-        $date = GETPOST('hi_date'.$i, 'int');
-        $mens = price2num(GETPOST('mens'.$i));
-        $int = price2num(GETPOST('hi_interets'.$i));
-        $insurance = price2num(GETPOST('hi_insurance'.$i));
+	$db->begin();
+	$i = 1;
+	while ($i < $object->nbterm + 1) {
+		$date = GETPOST('hi_date'.$i, 'int');
+		$mens = price2num(GETPOST('mens'.$i));
+		$int = price2num(GETPOST('hi_interets'.$i));
+		$insurance = price2num(GETPOST('hi_insurance'.$i));
 
-        $new_echeance = new LoanSchedule($db);
+		$new_echeance = new LoanSchedule($db);
 
-        $new_echeance->fk_loan = $object->id;
-        $new_echeance->datec = dol_now();
-        $new_echeance->tms = dol_now();
-        $new_echeance->datep = $date;
-        $new_echeance->amount_capital = $mens - $int;
-        $new_echeance->amount_insurance = $insurance;
-        $new_echeance->amount_interest = $int;
-        $new_echeance->fk_typepayment = 3;
-        $new_echeance->fk_bank = 0;
-        $new_echeance->fk_user_creat = $user->id;
-        $new_echeance->fk_user_modif = $user->id;
-        $result = $new_echeance->create($user);
-        if ($result < 0) {
-            setEventMessages($new_echeance->error, $echeance->errors, 'errors');
-            $db->rollback();
-            unset($echeances->lines);
-            break;
-        }
-        $echeances->lines[] = $new_echeance;
-        $i++;
-    }
-    var_dump($result);
-    if ($result > 0) $db->commit();
+		$new_echeance->fk_loan = $object->id;
+		$new_echeance->datec = dol_now();
+		$new_echeance->tms = dol_now();
+		$new_echeance->datep = $date;
+		$new_echeance->amount_capital = $mens - $int;
+		$new_echeance->amount_insurance = $insurance;
+		$new_echeance->amount_interest = $int;
+		$new_echeance->fk_typepayment = 3;
+		$new_echeance->fk_bank = 0;
+		$new_echeance->fk_user_creat = $user->id;
+		$new_echeance->fk_user_modif = $user->id;
+		$result = $new_echeance->create($user);
+		if ($result < 0) {
+			setEventMessages($new_echeance->error, $echeance->errors, 'errors');
+			$db->rollback();
+			unset($echeances->lines);
+			break;
+		}
+		$echeances->lines[] = $new_echeance;
+		$i++;
+	}
+	var_dump($result);
+	if ($result > 0) $db->commit();
 }
 
 if ($action == 'updateecheancier' && empty($pay_without_schedule)) {
-    $db->begin();
-    $i = 1;
-    while ($i < $object->nbterm + 1) {
-        $mens = price2num(GETPOST('mens'.$i));
-        $int = price2num(GETPOST('hi_interets'.$i));
-        $id = GETPOST('hi_rowid'.$i);
-        $insurance = price2num(GETPOST('hi_insurance'.$i));
+	$db->begin();
+	$i = 1;
+	while ($i < $object->nbterm + 1) {
+		$mens = price2num(GETPOST('mens'.$i));
+		$int = price2num(GETPOST('hi_interets'.$i));
+		$id = GETPOST('hi_rowid'.$i);
+		$insurance = price2num(GETPOST('hi_insurance'.$i));
 
-        $new_echeance = new LoanSchedule($db);
-        $new_echeance->fetch($id);
-        $new_echeance->tms = dol_now();
-        $new_echeance->amount_capital = $mens - $int;
-        $new_echeance->amount_insurance = $insurance;
-        $new_echeance->amount_interest = $int;
-        $new_echeance->fk_user_modif = $user->id;
-        $result = $new_echeance->update($user, 0);
-        if ($result < 0) {
-            setEventMessages(null, $new_echeance->errors, 'errors');
-            $db->rollback();
-            $echeances->fetchAll($object->id);
-            break;
-        }
+		$new_echeance = new LoanSchedule($db);
+		$new_echeance->fetch($id);
+		$new_echeance->tms = dol_now();
+		$new_echeance->amount_capital = $mens - $int;
+		$new_echeance->amount_insurance = $insurance;
+		$new_echeance->amount_interest = $int;
+		$new_echeance->fk_user_modif = $user->id;
+		$result = $new_echeance->update($user, 0);
+		if ($result < 0) {
+			setEventMessages(null, $new_echeance->errors, 'errors');
+			$db->rollback();
+			$echeances->fetchAll($object->id);
+			break;
+		}
 
-        $echeances->lines[$i-1] = $new_echeance;
-        $i++;
-    }
-    if ($result > 0) $db->commit();
+		$echeances->lines[$i - 1] = $new_echeance;
+		$i++;
+	}
+	if ($result > 0) $db->commit();
 }
 
 /*
@@ -129,7 +129,7 @@ $help_url = 'EN:Module_Loan|FR:Module_Emprunt';
 llxHeader("", $title, $help_url);
 
 $head = loan_prepare_head($object);
-dol_fiche_head($head, 'FinancialCommitment', $langs->trans("Loan"), -1, 'bill');
+print dol_get_fiche_head($head, 'FinancialCommitment', $langs->trans("Loan"), -1, 'bill');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/loan/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -210,7 +210,7 @@ $(document).ready(function() {
 <?php
 
 if ($pay_without_schedule == 1)
-    print '<div class="warning">'.$langs->trans('CantUseScheduleWithLoanStartedToPaid').'</div>'."\n";
+	print '<div class="warning">'.$langs->trans('CantUseScheduleWithLoanStartedToPaid').'</div>'."\n";
 
 print '<form name="createecheancier" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -298,15 +298,15 @@ if ($object->nbterm > 0 && count($echeances->lines) == 0)
 		print '<td class="center" id="capital'.$i.'">'.price($cap_rest, 0, '', 1, -1, -1, $conf->currency).'</td><input type="hidden" name="hi_capital'.$i.'" id ="hi_capital'.$i.'" value="'.$cap_rest.'">';
 		print '<td class="center">';
 		if (!empty($line->fk_bank))
-        {
-            print $langs->trans('Paid');
-            if (!empty($line->fk_payment_loan))
-                print '&nbsp;<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$line->fk_payment_loan.'">('.img_object($langs->trans("Payment"), "payment").' '.$line->fk_payment_loan.')</a>';
-        }
+		{
+			print $langs->trans('Paid');
+			if (!empty($line->fk_payment_loan))
+				print '&nbsp;<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$line->fk_payment_loan.'">('.img_object($langs->trans("Payment"), "payment").' '.$line->fk_payment_loan.')</a>';
+		}
 		elseif (!$printed)
 		{
-		    print '<a class="butAction" href="'.DOL_URL_ROOT.'/loan/payment/payment.php?id='.$object->id.'&amp;action=create">'.$langs->trans('DoPayment').'</a>';
-		    $printed = true;
+			print '<a class="butAction" href="'.DOL_URL_ROOT.'/loan/payment/payment.php?id='.$object->id.'&amp;action=create">'.$langs->trans('DoPayment').'</a>';
+			$printed = true;
 		}
 		print '</td>';
 		print '</tr>'."\n";
@@ -322,7 +322,7 @@ print '</br>';
 
 if (count($echeances->lines) == 0) $label = $langs->trans("Create");
 else $label = $langs->trans("Save");
-print '<div class="center"><input class="button" type="submit" value="'.$label.'" '.(($pay_without_schedule == 1)?'disabled title="'.$langs->trans('CantUseScheduleWithLoanStartedToPaid').'"':'').'title=""></div>';
+print '<div class="center"><input class="button" type="submit" value="'.$label.'" '.(($pay_without_schedule == 1) ? 'disabled title="'.$langs->trans('CantUseScheduleWithLoanStartedToPaid').'"' : '').'title=""></div>';
 print '</form>';
 
 // End of page
diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php
index 46e8d017eca..a0a636dd136 100644
--- a/htdocs/mailmanspip/class/mailmanspip.class.php
+++ b/htdocs/mailmanspip/class/mailmanspip.class.php
@@ -39,403 +39,403 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
  */
 class MailmanSpip
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
-    /**
-     * @var string[]	Array of error strings
-     */
-    public $errors = array();
+	/**
+	 * @var string[]	Array of error strings
+	 */
+	public $errors = array();
 
-    public $mladded_ok;
-    public $mladded_ko;
-    public $mlremoved_ok;
-    public $mlremoved_ko;
+	public $mladded_ok;
+	public $mladded_ko;
+	public $mlremoved_ok;
+	public $mlremoved_ko;
 
 
-    /**
+	/**
 	 *	Constructor
 	 *
 	 *	@param 		DoliDB		$db		Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
-    /**
-     * Function used to check if SPIP is enabled on the system
-     *
-     * @return boolean
-     */
-    public function isSpipEnabled()
-    {
-        if (defined("ADHERENT_USE_SPIP") && (ADHERENT_USE_SPIP == 1))
-        {
-            return true;
-        }
+	/**
+	 * Function used to check if SPIP is enabled on the system
+	 *
+	 * @return boolean
+	 */
+	public function isSpipEnabled()
+	{
+		if (defined("ADHERENT_USE_SPIP") && (ADHERENT_USE_SPIP == 1))
+		{
+			return true;
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Function used to check if the SPIP config is correct
-     *
-     * @return boolean
-     */
-    public function checkSpipConfig()
-    {
-        if (defined('ADHERENT_SPIP_SERVEUR') && defined('ADHERENT_SPIP_USER') && defined('ADHERENT_SPIP_PASS') && defined('ADHERENT_SPIP_DB'))
-        {
-            if (ADHERENT_SPIP_SERVEUR != '' && ADHERENT_SPIP_USER != '' && ADHERENT_SPIP_PASS != '' && ADHERENT_SPIP_DB != '')
-            {
-                return true;
-            }
-        }
+	/**
+	 * Function used to check if the SPIP config is correct
+	 *
+	 * @return boolean
+	 */
+	public function checkSpipConfig()
+	{
+		if (defined('ADHERENT_SPIP_SERVEUR') && defined('ADHERENT_SPIP_USER') && defined('ADHERENT_SPIP_PASS') && defined('ADHERENT_SPIP_DB'))
+		{
+			if (ADHERENT_SPIP_SERVEUR != '' && ADHERENT_SPIP_USER != '' && ADHERENT_SPIP_PASS != '' && ADHERENT_SPIP_DB != '')
+			{
+				return true;
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Function used to connect to SPIP
-     *
-     * @return boolean|DoliDB		Boolean of DoliDB
-     */
-    public function connectSpip()
-    {
-        $resource = getDoliDBInstance('mysql', ADHERENT_SPIP_SERVEUR, ADHERENT_SPIP_USER, ADHERENT_SPIP_PASS, ADHERENT_SPIP_DB, ADHERENT_SPIP_PORT);
+	/**
+	 * Function used to connect to SPIP
+	 *
+	 * @return boolean|DoliDB		Boolean of DoliDB
+	 */
+	public function connectSpip()
+	{
+		$resource = getDoliDBInstance('mysql', ADHERENT_SPIP_SERVEUR, ADHERENT_SPIP_USER, ADHERENT_SPIP_PASS, ADHERENT_SPIP_DB, ADHERENT_SPIP_PORT);
 
-        if ($resource->ok)
-        {
-            return $resource;
-        }
+		if ($resource->ok)
+		{
+			return $resource;
+		}
 
-        dol_syslog('Error when connecting to SPIP '.ADHERENT_SPIP_SERVEUR.' '.ADHERENT_SPIP_USER.' '.ADHERENT_SPIP_PASS.' '.ADHERENT_SPIP_DB, LOG_ERR);
+		dol_syslog('Error when connecting to SPIP '.ADHERENT_SPIP_SERVEUR.' '.ADHERENT_SPIP_USER.' '.ADHERENT_SPIP_PASS.' '.ADHERENT_SPIP_DB, LOG_ERR);
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Function used to connect to Mailman
-     *
-     * @param	Adherent 	$object 	Object with the data
-     * @param	string 	$url    	Mailman URL to be called with patterns
-     * @param	string	$list		Name of mailing-list
-     * @return 	mixed				Boolean or string
-     */
-    private function callMailman($object, $url, $list)
-    {
-        global $conf;
+	/**
+	 * Function used to connect to Mailman
+	 *
+	 * @param	Adherent 	$object 	Object with the data
+	 * @param	string 	$url    	Mailman URL to be called with patterns
+	 * @param	string	$list		Name of mailing-list
+	 * @return 	mixed				Boolean or string
+	 */
+	private function callMailman($object, $url, $list)
+	{
+		global $conf;
 
-        //Patterns that are going to be replaced with their original value
-        $patterns = array(
-            '%LISTE%',
-            '%EMAIL%',
-            '%PASSWORD%',
-            '%MAILMAN_ADMINPW%'
-        );
-        $replace = array(
-            $list,
-            $object->email,
-            $object->pass,
-            $conf->global->ADHERENT_MAILMAN_ADMINPW
-        );
+		//Patterns that are going to be replaced with their original value
+		$patterns = array(
+			'%LISTE%',
+			'%EMAIL%',
+			'%PASSWORD%',
+			'%MAILMAN_ADMINPW%'
+		);
+		$replace = array(
+			$list,
+			$object->email,
+			$object->pass,
+			$conf->global->ADHERENT_MAILMAN_ADMINPW
+		);
 
-        $curl_url = str_replace($patterns, $replace, $url);
-        dol_syslog('Calling Mailman: '.$curl_url);
+		$curl_url = str_replace($patterns, $replace, $url);
+		dol_syslog('Calling Mailman: '.$curl_url);
 
-        $ch = curl_init($curl_url);
+		$ch = curl_init($curl_url);
 
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_FAILONERROR, true);
-        @curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT);
-        curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($ch, CURLOPT_FAILONERROR, true);
+		@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
+		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT);
+		curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
 
-        $result = curl_exec($ch);
-        dol_syslog('result curl_exec='.$result);
+		$result = curl_exec($ch);
+		dol_syslog('result curl_exec='.$result);
 
-        //An error was found, we store it in $this->error for later
-        if ($result === false || curl_errno($ch) > 0)
-        {
-            $this->error = curl_errno($ch).' '.curl_error($ch);
-            dol_syslog('Error using curl '.$this->error, LOG_ERR);
-        }
+		//An error was found, we store it in $this->error for later
+		if ($result === false || curl_errno($ch) > 0)
+		{
+			$this->error = curl_errno($ch).' '.curl_error($ch);
+			dol_syslog('Error using curl '.$this->error, LOG_ERR);
+		}
 
-        curl_close($ch);
+		curl_close($ch);
 
-        return $result;
-    }
+		return $result;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Fonction qui donne les droits redacteurs dans spip
-     *
-     *	@param	Adherent	$object		Object with data (->firstname, ->lastname, ->email and ->login)
-     *  @return	int					=0 if KO, >0 if OK
-     */
-    public function add_to_spip($object)
-    {
-        // phpcs:enable
-        dol_syslog(get_class($this)."::add_to_spip");
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Fonction qui donne les droits redacteurs dans spip
+	 *
+	 *	@param	Adherent	$object		Object with data (->firstname, ->lastname, ->email and ->login)
+	 *  @return	int					=0 if KO, >0 if OK
+	 */
+	public function add_to_spip($object)
+	{
+		// phpcs:enable
+		dol_syslog(get_class($this)."::add_to_spip");
 
-        if ($this->isSpipEnabled())
-        {
-            if ($this->checkSpipConfig())
-            {
-                $mydb = $this->connectSpip();
+		if ($this->isSpipEnabled())
+		{
+			if ($this->checkSpipConfig())
+			{
+				$mydb = $this->connectSpip();
 
-                if ($mydb)
-                {
-                    require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-                    $mdpass = dol_hash($object->pass);
-                    $htpass = crypt($object->pass, makesalt());
-                    $query = "INSERT INTO spip_auteurs (nom, email, login, pass, htpass, alea_futur, statut) VALUES(\"".dolGetFirstLastname($object->firstname, $object->lastname)."\",\"".$object->email."\",\"".$object->login."\",\"$mdpass\",\"$htpass\",FLOOR(32000*RAND()),\"1comite\")";
+				if ($mydb)
+				{
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+					$mdpass = dol_hash($object->pass);
+					$htpass = crypt($object->pass, makesalt());
+					$query = "INSERT INTO spip_auteurs (nom, email, login, pass, htpass, alea_futur, statut) VALUES(\"".dolGetFirstLastname($object->firstname, $object->lastname)."\",\"".$object->email."\",\"".$object->login."\",\"$mdpass\",\"$htpass\",FLOOR(32000*RAND()),\"1comite\")";
 
-                    $result = $mydb->query($query);
+					$result = $mydb->query($query);
 
-                    $mydb->close();
+					$mydb->close();
 
-                    if ($result)
-                    {
-                        return 1;
-                    } else $this->error = $mydb->lasterror();
-                } else $this->error = 'Failed to connect to SPIP';
-            } else $this->error = 'BadSPIPConfiguration';
-        } else $this->error = 'SPIPNotEnabled';
+					if ($result)
+					{
+						return 1;
+					} else $this->error = $mydb->lasterror();
+				} else $this->error = 'Failed to connect to SPIP';
+			} else $this->error = 'BadSPIPConfiguration';
+		} else $this->error = 'SPIPNotEnabled';
 
-        return 0;
-    }
+		return 0;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Fonction qui enleve les droits redacteurs dans spip
-     *
-     *	@param	Adherent	$object		Object with data (->login)
-     *  @return	int					=0 if KO, >0 if OK
-     */
-    public function del_to_spip($object)
-    {
-        // phpcs:enable
-        dol_syslog(get_class($this)."::del_to_spip");
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Fonction qui enleve les droits redacteurs dans spip
+	 *
+	 *	@param	Adherent	$object		Object with data (->login)
+	 *  @return	int					=0 if KO, >0 if OK
+	 */
+	public function del_to_spip($object)
+	{
+		// phpcs:enable
+		dol_syslog(get_class($this)."::del_to_spip");
 
-        if ($this->isSpipEnabled())
-        {
-            if ($this->checkSpipConfig())
-            {
-                $mydb = $this->connectSpip();
+		if ($this->isSpipEnabled())
+		{
+			if ($this->checkSpipConfig())
+			{
+				$mydb = $this->connectSpip();
 
-                if ($mydb)
-                {
-                    $query = "DELETE FROM spip_auteurs WHERE login='".$object->login."'";
+				if ($mydb)
+				{
+					$query = "DELETE FROM spip_auteurs WHERE login='".$object->login."'";
 
-                    $result = $mydb->query($query);
+					$result = $mydb->query($query);
 
-                    $mydb->close();
+					$mydb->close();
 
-                    if ($result)
-                    {
-                        return 1;
-                    } else $this->error = $mydb->lasterror();
-                } else $this->error = 'Failed to connect to SPIP';
-            } else $this->error = 'BadSPIPConfiguration';
-        } else $this->error = 'SPIPNotEnabled';
+					if ($result)
+					{
+						return 1;
+					} else $this->error = $mydb->lasterror();
+				} else $this->error = 'Failed to connect to SPIP';
+			} else $this->error = 'BadSPIPConfiguration';
+		} else $this->error = 'SPIPNotEnabled';
 
-        return 0;
-    }
+		return 0;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Fonction qui dit si cet utilisateur est un redacteur existant dans spip
-     *
-     *	@param	object	$object		Object with data (->login)
-     *  @return int     			1=exists, 0=does not exists, -1=error
-     */
-    public function is_in_spip($object)
-    {
-        // phpcs:enable
-        if ($this->isSpipEnabled())
-        {
-            if ($this->checkSpipConfig())
-            {
-                $mydb = $this->connectSpip();
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Fonction qui dit si cet utilisateur est un redacteur existant dans spip
+	 *
+	 *	@param	object	$object		Object with data (->login)
+	 *  @return int     			1=exists, 0=does not exists, -1=error
+	 */
+	public function is_in_spip($object)
+	{
+		// phpcs:enable
+		if ($this->isSpipEnabled())
+		{
+			if ($this->checkSpipConfig())
+			{
+				$mydb = $this->connectSpip();
 
-                if ($mydb)
-                {
-                    $query = "SELECT login FROM spip_auteurs WHERE login='".$object->login."'";
+				if ($mydb)
+				{
+					$query = "SELECT login FROM spip_auteurs WHERE login='".$object->login."'";
 
-                    $result = $mydb->query($query);
+					$result = $mydb->query($query);
 
-                    if ($result)
-                    {
-                        if ($mydb->num_rows($result))
-                        {
-                            // nous avons au moins une reponse
-                            $mydb->close($result);
-                            return 1;
-                        } else {
-                            // nous n'avons pas de reponse => n'existe pas
-                            $mydb->close($result);
-                            return 0;
-                        }
-                    } else {
-                        $this->error = $mydb->lasterror();
-                        $mydb->close();
-                    }
-                } else $this->error = 'Failed to connect to SPIP';
-            } else $this->error = 'BadSPIPConfiguration';
-        } else $this->error = 'SPIPNotEnabled';
+					if ($result)
+					{
+						if ($mydb->num_rows($result))
+						{
+							// nous avons au moins une reponse
+							$mydb->close($result);
+							return 1;
+						} else {
+							// nous n'avons pas de reponse => n'existe pas
+							$mydb->close($result);
+							return 0;
+						}
+					} else {
+						$this->error = $mydb->lasterror();
+						$mydb->close();
+					}
+				} else $this->error = 'Failed to connect to SPIP';
+			} else $this->error = 'BadSPIPConfiguration';
+		} else $this->error = 'SPIPNotEnabled';
 
-        return -1;
-    }
+		return -1;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Subscribe an email to all mailing-lists
-     *
-     *	@param	Adherent	$object		Object with data (->email, ->pass, ->element, ->type)
-     *  @param	array	$listes    	To force mailing-list (string separated with ,)
-     *  @return	int		  			<0 if KO, >=0 if OK
-     */
-    public function add_to_mailman($object, $listes = '')
-    {
-        // phpcs:enable
-        global $conf, $langs, $user;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Subscribe an email to all mailing-lists
+	 *
+	 *	@param	Adherent	$object		Object with data (->email, ->pass, ->element, ->type)
+	 *  @param	array	$listes    	To force mailing-list (string separated with ,)
+	 *  @return	int		  			<0 if KO, >=0 if OK
+	 */
+	public function add_to_mailman($object, $listes = '')
+	{
+		// phpcs:enable
+		global $conf, $langs, $user;
 
-        dol_syslog(get_class($this)."::add_to_mailman");
+		dol_syslog(get_class($this)."::add_to_mailman");
 
-        $this->mladded_ok = array();
-        $this->mladded_ko = array();
+		$this->mladded_ok = array();
+		$this->mladded_ko = array();
 
-        if (!function_exists("curl_init"))
-        {
-            $langs->load("errors");
-            $this->error = $langs->trans("ErrorFunctionNotAvailableInPHP", "curl_init");
-            return -1;
-        }
+		if (!function_exists("curl_init"))
+		{
+			$langs->load("errors");
+			$this->error = $langs->trans("ErrorFunctionNotAvailableInPHP", "curl_init");
+			return -1;
+		}
 
-        if ($conf->adherent->enabled)	// Synchro for members
-        {
-	        if (!empty($conf->global->ADHERENT_MAILMAN_URL))
-	        {
-	            if ($listes == '' && !empty($conf->global->ADHERENT_MAILMAN_LISTS)) $lists = explode(',', $conf->global->ADHERENT_MAILMAN_LISTS);
-	            else $lists = explode(',', $listes);
+		if ($conf->adherent->enabled)	// Synchro for members
+		{
+			if (!empty($conf->global->ADHERENT_MAILMAN_URL))
+			{
+				if ($listes == '' && !empty($conf->global->ADHERENT_MAILMAN_LISTS)) $lists = explode(',', $conf->global->ADHERENT_MAILMAN_LISTS);
+				else $lists = explode(',', $listes);
 
-	            $categstatic = new Categorie($this->db);
+				$categstatic = new Categorie($this->db);
 
-	            foreach ($lists as $list)
-	            {
-	                // Filter on type something (ADHERENT_MAILMAN_LISTS = "mailinglist0,TYPE:typevalue:mailinglist1,CATEG:categvalue:mailinglist2")
-	                $tmp = explode(':', $list);
-	                if (!empty($tmp[2]))
-	                {
-	                    $list = $tmp[2];
-	                    if ($object->element == 'member' && $tmp[0] == 'TYPE' && $object->type != $tmp[1])    // Filter on member type label
-	                    {
-	                        dol_syslog("We ignore list ".$list." because object member type ".$object->type." does not match ".$tmp[1], LOG_DEBUG);
-	                        continue;
-	                    }
-	                    if ($object->element == 'member' && $tmp[0] == 'CATEG' && !in_array($tmp[1], $categstatic->containing($object->id, 'member', 'label')))    // Filter on member category
-	                    {
-	                        dol_syslog("We ignore list ".$list." because object member is not into category ".$tmp[1], LOG_DEBUG);
-	                        continue;
-	                    }
-	                }
+				foreach ($lists as $list)
+				{
+					// Filter on type something (ADHERENT_MAILMAN_LISTS = "mailinglist0,TYPE:typevalue:mailinglist1,CATEG:categvalue:mailinglist2")
+					$tmp = explode(':', $list);
+					if (!empty($tmp[2]))
+					{
+						$list = $tmp[2];
+						if ($object->element == 'member' && $tmp[0] == 'TYPE' && $object->type != $tmp[1])    // Filter on member type label
+						{
+							dol_syslog("We ignore list ".$list." because object member type ".$object->type." does not match ".$tmp[1], LOG_DEBUG);
+							continue;
+						}
+						if ($object->element == 'member' && $tmp[0] == 'CATEG' && !in_array($tmp[1], $categstatic->containing($object->id, 'member', 'label')))    // Filter on member category
+						{
+							dol_syslog("We ignore list ".$list." because object member is not into category ".$tmp[1], LOG_DEBUG);
+							continue;
+						}
+					}
 
-	                //We call Mailman to subscribe the user
-	                $result = $this->callMailman($object, $conf->global->ADHERENT_MAILMAN_URL, $list);
+					//We call Mailman to subscribe the user
+					$result = $this->callMailman($object, $conf->global->ADHERENT_MAILMAN_URL, $list);
 
 					if ($result === false)
 					{
 						$this->mladded_ko[$list] = $object->email;
-					    return -2;
+						return -2;
 					} else $this->mladded_ok[$list] = $object->email;
-	            }
-	            return count($lists);
-	        } else {
-	            $this->error = "ADHERENT_MAILMAN_URL not defined";
-	            return -1;
-	        }
-        }
-    }
+				}
+				return count($lists);
+			} else {
+				$this->error = "ADHERENT_MAILMAN_URL not defined";
+				return -1;
+			}
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Unsubscribe an email from all mailing-lists
-     *  Used when a user is resiliated
-     *
-     *	@param	Adherent	$object		Object with data (->email, ->pass, ->element, ->type)
-     *  @param	array	$listes     To force mailing-list (string separated with ,)
-     *  @return int         		<0 if KO, >=0 if OK
-     */
-    public function del_to_mailman($object, $listes = '')
-    {
-        // phpcs:enable
-        global $conf, $langs, $user;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Unsubscribe an email from all mailing-lists
+	 *  Used when a user is resiliated
+	 *
+	 *	@param	Adherent	$object		Object with data (->email, ->pass, ->element, ->type)
+	 *  @param	array	$listes     To force mailing-list (string separated with ,)
+	 *  @return int         		<0 if KO, >=0 if OK
+	 */
+	public function del_to_mailman($object, $listes = '')
+	{
+		// phpcs:enable
+		global $conf, $langs, $user;
 
-        dol_syslog(get_class($this)."::del_to_mailman");
+		dol_syslog(get_class($this)."::del_to_mailman");
 
-        $this->mlremoved_ok = array();
-        $this->mlremoved_ko = array();
+		$this->mlremoved_ok = array();
+		$this->mlremoved_ko = array();
 
-        if (!function_exists("curl_init"))
-        {
-            $langs->load("errors");
-            $this->error = $langs->trans("ErrorFunctionNotAvailableInPHP", "curl_init");
-            return -1;
-        }
+		if (!function_exists("curl_init"))
+		{
+			$langs->load("errors");
+			$this->error = $langs->trans("ErrorFunctionNotAvailableInPHP", "curl_init");
+			return -1;
+		}
 
-        if ($conf->adherent->enabled)	// Synchro for members
-        {
-	        if (!empty($conf->global->ADHERENT_MAILMAN_UNSUB_URL))
-	        {
-	            if ($listes == '' && !empty($conf->global->ADHERENT_MAILMAN_LISTS)) $lists = explode(',', $conf->global->ADHERENT_MAILMAN_LISTS);
-	            else $lists = explode(',', $listes);
+		if ($conf->adherent->enabled)	// Synchro for members
+		{
+			if (!empty($conf->global->ADHERENT_MAILMAN_UNSUB_URL))
+			{
+				if ($listes == '' && !empty($conf->global->ADHERENT_MAILMAN_LISTS)) $lists = explode(',', $conf->global->ADHERENT_MAILMAN_LISTS);
+				else $lists = explode(',', $listes);
 
-	            $categstatic = new Categorie($this->db);
+				$categstatic = new Categorie($this->db);
 
-	            foreach ($lists as $list)
-	            {
-	            	// Filter on type something (ADHERENT_MAILMAN_LISTS = "mailinglist0,TYPE:typevalue:mailinglist1,CATEG:categvalue:mailinglist2")
-	            	$tmp = explode(':', $list);
-	            	if (!empty($tmp[2]))
-	            	{
-	            		$list = $tmp[2];
-	            		if ($object->element == 'member' && $tmp[0] == 'TYPE' && $object->type != $tmp[1])    // Filter on member type label
-	            		{
-	            			dol_syslog("We ignore list ".$list." because object member type ".$object->type." does not match ".$tmp[1], LOG_DEBUG);
-	            			continue;
-	            		}
-	            		if ($object->element == 'member' && $tmp[0] == 'CATEG' && !in_array($tmp[1], $categstatic->containing($object->id, 'member', 'label')))    // Filter on member category
-	            		{
-	            			dol_syslog("We ignore list ".$list." because object member is not into category ".$tmp[1], LOG_DEBUG);
-	            			continue;
-	            		}
-	            	}
+				foreach ($lists as $list)
+				{
+					// Filter on type something (ADHERENT_MAILMAN_LISTS = "mailinglist0,TYPE:typevalue:mailinglist1,CATEG:categvalue:mailinglist2")
+					$tmp = explode(':', $list);
+					if (!empty($tmp[2]))
+					{
+						$list = $tmp[2];
+						if ($object->element == 'member' && $tmp[0] == 'TYPE' && $object->type != $tmp[1])    // Filter on member type label
+						{
+							dol_syslog("We ignore list ".$list." because object member type ".$object->type." does not match ".$tmp[1], LOG_DEBUG);
+							continue;
+						}
+						if ($object->element == 'member' && $tmp[0] == 'CATEG' && !in_array($tmp[1], $categstatic->containing($object->id, 'member', 'label')))    // Filter on member category
+						{
+							dol_syslog("We ignore list ".$list." because object member is not into category ".$tmp[1], LOG_DEBUG);
+							continue;
+						}
+					}
 
-	                //We call Mailman to unsubscribe the user
-	                $result = $this->callMailman($object, $conf->global->ADHERENT_MAILMAN_UNSUB_URL, $list);
+					//We call Mailman to unsubscribe the user
+					$result = $this->callMailman($object, $conf->global->ADHERENT_MAILMAN_UNSUB_URL, $list);
 
 					if ($result === false)
 					{
 						$this->mlremoved_ko[$list] = $object->email;
-					    return -2;
+						return -2;
 					} else $this->mlremoved_ok[$list] = $object->email;
-	            }
-	            return count($lists);
-	        } else {
-	            $this->error = "ADHERENT_MAILMAN_UNSUB_URL not defined";
-	            return -1;
-	        }
-        }
-    }
+				}
+				return count($lists);
+			} else {
+				$this->error = "ADHERENT_MAILMAN_UNSUB_URL not defined";
+				return -1;
+			}
+		}
+	}
 }
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 1344287044e..82be9955e0f 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -12,6 +12,7 @@
  * Copyright (C) 2014-2015  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2020       Demarest Maxime         <maxime@indelog.fr>
+ * Copyright (C) 2020       Charlene Benke         <charlie@patas-monkey.com>
  *
  * 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
@@ -57,12 +58,18 @@ if (!empty($_SERVER['MAIN_SHOW_TUNING_INFO']))
  */
 function testSqlAndScriptInject($val, $type)
 {
-	$val = html_entity_decode($val, ENT_QUOTES);	// So <svg o&#110;load='console.log(&quot;123&quot;)' become <svg onload='console.log(&quot;123&quot;)'
+	// Decode string first
+	// So <svg o&#110;load='console.log(&quot;123&quot;)' become <svg onload='console.log(&quot;123&quot;)'
+	// So "&colon;&apos;" become ":'" (due to ENT_HTML5)
+	$val = html_entity_decode($val, ENT_QUOTES | ENT_HTML5);
+
 	// TODO loop to decode until no more thing to decode ?
 
 	// We clean string because some hacks try to obfuscate evil strings by inserting non printable chars. Example: 'java(ascci09)scr(ascii00)ipt' is processed like 'javascript' (whatever is place of evil ascii char)
-	$val = preg_replace('/[\x00-\x1F\x7F]/u', '', $val);	// We should use dol_string_nounprintableascii but function is not yet loaded/available
-	//var_dump($val);
+	// We should use dol_string_nounprintableascii but function is not yet loaded/available
+	$val = preg_replace('/[\x00-\x1F\x7F]/u', '', $val); // /u operator makes UTF8 valid characters being ignored so are not included into the replace
+	// We clean html comments because some hacks try to obfuscate evil strings by inserting HTML comments. Example: on<!-- -->error=alert(1)
+	$val = preg_replace('/<!--[^>]*-->/', '', $val);
 
 	$inj = 0;
 	// For SQL Injection (only GET are used to be included into bad escaped SQL requests)
@@ -75,7 +82,7 @@ function testSqlAndScriptInject($val, $type)
 		$inj += preg_match('/into\s+(outfile|dumpfile)/i', $val);
 		$inj += preg_match('/user\s*\(/i', $val); // avoid to use function user() that return current database login
 		$inj += preg_match('/information_schema/i', $val); // avoid to use request that read information_schema database
-		$inj += preg_match('/<svg/i', $val);	// <svg can be allowed in POST
+		$inj += preg_match('/<svg/i', $val); // <svg can be allowed in POST
 	}
 	if ($type == 3)
 	{
@@ -119,7 +126,7 @@ function testSqlAndScriptInject($val, $type)
 	$inj += preg_match('/vbscript\s*:/i', $val);
 	// For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)
 	if ($type == 1) {
-		$val = str_replace('enclosure="', 'enclosure=X', $val);		// We accept enclosure="
+		$val = str_replace('enclosure="', 'enclosure=X', $val); // We accept enclosure="
 		$inj += preg_match('/"/i', $val); // We refused " in GET parameters value.
 	}
 	if ($type == 2) $inj += preg_match('/[;"]/', $val); // PHP_SELF is a file system path. It can contains spaces.
@@ -221,38 +228,73 @@ if (!empty($_POST["DOL_AUTOSET_COOKIE"]))
 }
 
 
-// Init session. Name of session is specific to Dolibarr instance.
-// Note: the function dol_getprefix may have been redefined to return a different key to manage another area to protect.
-$prefix = dol_getprefix('');
+// Set the handler of session
+if (ini_get('session.save_handler') == 'user') {
+	require_once 'core/lib/phpsessionindb.lib.php';
+}
 
+// Init session. Name of session is specific to Dolibarr instance.
+// Must be done after the include of filefunc.inc.php so global variables of conf file are defined (like $dolibarr_main_instance_unique_id or $dolibarr_main_force_https).
+// Note: the function dol_getprefix is defined into functions.lib.php but may have been defined to return a different key to manage another area to protect.
+$prefix = dol_getprefix('');
 $sessionname = 'DOLSESSID_'.$prefix;
 $sessiontimeout = 'DOLSESSTIMEOUT_'.$prefix;
 if (!empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime', $_COOKIE[$sessiontimeout]);
-session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
-session_name($sessionname);
-// This create lock, released when session_write_close() or end of page.
+// This create lock, released by session_write_close() or end of page.
 // We need this lock as long as we read/write $_SESSION ['vars']. We can remove lock when finished.
 if (!defined('NOSESSION'))
 {
+	session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
+	session_name($sessionname);
 	session_start();
 }
 
+
 // Init the 5 global objects, this include will make the 'new Xxx()' and set properties for: $conf, $db, $langs, $user, $mysoc
 require_once 'master.inc.php';
 
+
+// If software has been locked. Only login $conf->global->MAIN_ONLY_LOGIN_ALLOWED is allowed.
+if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
+{
+	$ok = 0;
+	if ((!session_id() || !isset($_SESSION["dol_login"])) && !isset($_POST["username"]) && !empty($_SERVER["GATEWAY_INTERFACE"])) $ok = 1; // We let working pages if not logged and inside a web browser (login form, to allow login by admin)
+	elseif (isset($_POST["username"]) && $_POST["username"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok = 1; // We let working pages that is a login submission (login submit, to allow login by admin)
+	elseif (defined('NOREQUIREDB'))   $ok = 1; // We let working pages that don't need database access (xxx.css.php)
+	elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) $ok = 1; // We let working pages that ask to work even if only login enabled (logout.php)
+	elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok = 1; // We let working if user is allowed admin
+	if (!$ok)
+	{
+		if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != $conf->global->MAIN_ONLY_LOGIN_ALLOWED)
+		{
+			print 'Sorry, your application is offline.'."\n";
+			print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
+			$nexturl = DOL_URL_ROOT.'/user/logout.php';
+			print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";
+		} else {
+			print 'Sorry, your application is offline. Only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
+			$nexturl = DOL_URL_ROOT.'/';
+			print 'Please try later or <a href="'.$nexturl.'">click here to change login user</a>...'."\n";
+		}
+		exit;
+	}
+}
+
+
 // Activate end of page function
 register_shutdown_function('dol_shutdown');
 
 // Load debugbar
 if (!empty($conf->debugbar->enabled) && !GETPOST('dol_use_jmobile') && empty($_SESSION['dol_use_jmobile']))
 {
-    global $debugbar;
-    include_once DOL_DOCUMENT_ROOT.'/debugbar/class/DebugBar.php';
-    $debugbar = new DolibarrDebugBar();
-    $renderer = $debugbar->getRenderer();
-    $conf->global->MAIN_HTML_HEADER .= $renderer->renderHead();
+	global $debugbar;
+	include_once DOL_DOCUMENT_ROOT.'/debugbar/class/DebugBar.php';
+	$debugbar = new DolibarrDebugBar();
+	$renderer = $debugbar->getRenderer();
+	if (empty($conf->global->MAIN_HTML_HEADER)) $conf->global->MAIN_HTML_HEADER = '';
+	$conf->global->MAIN_HTML_HEADER .= $renderer->renderHead();
 
-    $debugbar['time']->startMeasure('pageaftermaster', 'Page generation (after environment init)');
+	$debugbar['time']->startMeasure('pageaftermaster', 'Page generation (after environment init)');
 }
 
 // Detection browser
@@ -375,13 +417,21 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->gl
 	// Check all cases that need a token (all POST actions, all actions and mass actions on pages with CSRFCHECK_WITH_TOKEN set, all sensitive GET actions)
 	if ($_SERVER['REQUEST_METHOD'] == 'POST' ||
 		((GETPOSTISSET('action') || GETPOSTISSET('massaction')) && defined('CSRFCHECK_WITH_TOKEN')) ||
-		in_array(GETPOST('action', 'aZ09'), array('add', 'addtimespent', 'update', 'install', 'delete', 'deleteprof', 'deletepayment')))
+		in_array(GETPOST('action', 'aZ09'), array('add', 'addtimespent', 'update', 'install', 'delete', 'deleteprof', 'deletepayment', 'confirm_create_user', 'confirm_create_thirdparty', 'confirm_reject_check')))
 	{
 		if (!GETPOSTISSET('token')) {
-			dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." refused by CSRFCHECK_WITH_TOKEN protection. Token not provided.");
-			print "Access to this page this way (POST method or page with CSRFCHECK_WITH_TOKEN on or having a sensible value for action parameter) is refused by CSRF protection in main.inc.php. Token not provided.\n";
-			print "If you access your server behind a proxy using url rewriting, you might check that all HTTP header is propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file or MAIN_SECURITY_CSRF_WITH_TOKEN to 0 into setup).\n";
-			die;
+			if (GETPOST('uploadform', 'int')) {
+				dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." refused. File size too large.");
+				$langs->loadLangs(array("errors", "install"));
+				print $langs->trans("ErrorFileSizeTooLarge").' ';
+				print $langs->trans("ErrorGoBackAndCorrectParameters");
+				die;
+			} else {
+				dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." refused by CSRFCHECK_WITH_TOKEN protection. Token not provided.");
+				print "Access to this page this way (POST method or page with CSRFCHECK_WITH_TOKEN on or having a sensible value for action parameter) is refused by CSRF protection in main.inc.php. Token not provided.\n";
+				print "If you access your server behind a proxy using url rewriting, you might check that all HTTP header is propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file or MAIN_SECURITY_CSRF_WITH_TOKEN to 0 into setup).\n";
+				die;
+			}
 		}
 	}
 
@@ -407,7 +457,7 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->gl
 if (GETPOSTISSET('disablemodules'))  $_SESSION["disablemodules"] = GETPOST('disablemodules', 'alpha');
 if (!empty($_SESSION["disablemodules"]))
 {
-    $modulepartkeys = array('css', 'js', 'tabs', 'triggers', 'login', 'substitutions', 'menus', 'theme', 'sms', 'tpl', 'barcode', 'models', 'societe', 'hooks', 'dir', 'syslog', 'tpllinkable', 'contactelement', 'moduleforexternal');
+	$modulepartkeys = array('css', 'js', 'tabs', 'triggers', 'login', 'substitutions', 'menus', 'theme', 'sms', 'tpl', 'barcode', 'models', 'societe', 'hooks', 'dir', 'syslog', 'tpllinkable', 'contactelement', 'moduleforexternal');
 
 	$disabled_modules = explode(',', $_SESSION["disablemodules"]);
 	foreach ($disabled_modules as $module)
@@ -418,7 +468,7 @@ if (!empty($_SESSION["disablemodules"]))
 			$conf->$module->enabled = false;
 			foreach ($modulepartkeys as $modulepartkey)
 			{
-			    unset($conf->modules_parts[$modulepartkey][$module]);
+				unset($conf->modules_parts[$modulepartkey][$module]);
 			}
 			if ($module == 'fournisseur')		// Special case
 			{
@@ -438,7 +488,7 @@ if (is_array($modulepart) && count($modulepart) > 0)
 		if (in_array($module, $modulepart))
 		{
 			$conf->modulepart = $module;
-            break;
+			break;
 		}
 	}
 }
@@ -512,8 +562,18 @@ if (!defined('NOLOGIN'))
 			}
 		}
 
+		// Hooks for security access
+		$action = '';
+		$hookmanager->initHooks(array('login'));
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('beforeLoginAuthentication', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
+		if ($reshook < 0) {
+		    $test = false;
+		    $error++;
+		}
+
 		// Verification security graphic code
-		if (GETPOST("username", "alpha", 2) && !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA) && !isset($_SESSION['dol_bypass_antispam']))
+		if ($test && GETPOST("username", "alpha", 2) && !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA) && !isset($_SESSION['dol_bypass_antispam']))
 		{
 			$sessionkey = 'dol_antispam_value';
 			$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
@@ -636,14 +696,14 @@ if (!defined('NOLOGIN'))
 			if (defined('NOREDIRECTBYMAINTOLOGIN')) return 'ERROR_NOT_LOGGED';
 			else {
 				if ($_SERVER["HTTP_USER_AGENT"] == 'securitytest') {
-					http_response_code(401);		// It makes easier to understand if session was broken during security tests
+					http_response_code(401); // It makes easier to understand if session was broken during security tests
 				}
 				dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : ''));
 			}
 			exit;
 		}
 
-		$resultFetchUser = $user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1));	// login was retreived previously when checking password.
+		$resultFetchUser = $user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1)); // login was retrieved previously when checking password.
 		if ($resultFetchUser <= 0)
 		{
 			dol_syslog('User not found, connexion refused');
@@ -744,48 +804,48 @@ if (!defined('NOLOGIN'))
 			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));
 			exit;
 		} else {
-		    // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-		    $hookmanager->initHooks(array('main'));
+			// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+			$hookmanager->initHooks(array('main'));
 
-		    // Code for search criteria persistence.
-		    if (!empty($_GET['save_lastsearch_values']))    // We must use $_GET here
-		    {
-			    $relativepathstring = preg_replace('/\?.*$/', '', $_SERVER["HTTP_REFERER"]);
-			    $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/', '', $relativepathstring); // Get full path except host server
-			    // Clean $relativepathstring
-   			    if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);
-			    $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
-			    $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
-			    //var_dump($relativepathstring);
+			// Code for search criteria persistence.
+			if (!empty($_GET['save_lastsearch_values']))    // We must use $_GET here
+			{
+				$relativepathstring = preg_replace('/\?.*$/', '', $_SERVER["HTTP_REFERER"]);
+				$relativepathstring = preg_replace('/^https?:\/\/[^\/]*/', '', $relativepathstring); // Get full path except host server
+				// Clean $relativepathstring
+   				if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);
+				$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
+				$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
+				//var_dump($relativepathstring);
 
-			    // We click on a link that leave a page we have to save search criteria, contextpage, limit and page. We save them from tmp to no tmp
-			    if (!empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring]))
-			    {
-			    	$_SESSION['lastsearch_values_'.$relativepathstring] = $_SESSION['lastsearch_values_tmp_'.$relativepathstring];
-				    unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);
-			    }
-			    if (!empty($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]))
-			    {
-			    	$_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] > 0)
-			    {
-			    	$_SESSION['lastsearch_page_'.$relativepathstring] = $_SESSION['lastsearch_page_tmp_'.$relativepathstring];
-			    	unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
-			    }
-			    if (!empty($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] != $conf->liste_limit)
-			    {
-			    	$_SESSION['lastsearch_limit_'.$relativepathstring] = $_SESSION['lastsearch_limit_tmp_'.$relativepathstring];
-			    	unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
-			    }
-		    }
+				// We click on a link that leave a page we have to save search criteria, contextpage, limit and page. We save them from tmp to no tmp
+				if (!empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring]))
+				{
+					$_SESSION['lastsearch_values_'.$relativepathstring] = $_SESSION['lastsearch_values_tmp_'.$relativepathstring];
+					unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);
+				}
+				if (!empty($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]))
+				{
+					$_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] > 0)
+				{
+					$_SESSION['lastsearch_page_'.$relativepathstring] = $_SESSION['lastsearch_page_tmp_'.$relativepathstring];
+					unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
+				}
+				if (!empty($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] != $conf->liste_limit)
+				{
+					$_SESSION['lastsearch_limit_'.$relativepathstring] = $_SESSION['lastsearch_limit_tmp_'.$relativepathstring];
+					unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
+				}
+			}
 
-		    $action = '';
-		    $reshook = $hookmanager->executeHooks('updateSession', array(), $user, $action);
-		    if ($reshook < 0) {
-			    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-		    }
+			$action = '';
+			$reshook = $hookmanager->executeHooks('updateSession', array(), $user, $action);
+			if ($reshook < 0) {
+				setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+			}
 		}
 	}
 
@@ -912,7 +972,7 @@ if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && !empty($user->conf->MAI
 }
 
 // set MAIN_OPTIMIZEFORCOLORBLIND for user
-$conf->global->MAIN_OPTIMIZEFORCOLORBLIND = $user->conf->MAIN_OPTIMIZEFORCOLORBLIND;
+$conf->global->MAIN_OPTIMIZEFORCOLORBLIND = empty($user->conf->MAIN_OPTIMIZEFORCOLORBLIND) ? '' : $user->conf->MAIN_OPTIMIZEFORCOLORBLIND;
 
 // Set terminal output option according to conf->browser.
 if (GETPOST('dol_hide_leftmenu', 'int') || !empty($_SESSION['dol_hide_leftmenu']))               $conf->dol_hide_leftmenu = 1;
@@ -974,7 +1034,7 @@ if (!defined('NOLOGIN'))
 	$user->getrights();
 }
 
-dol_syslog("--- Access to ".$_SERVER["REQUEST_METHOD"].' '.$_SERVER["PHP_SELF"].' - action='.GETPOST('action', 'aZ09').', massaction='.GETPOST('massaction', 'aZ09'));
+dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"])?'':$_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"].' - action='.GETPOST('action', 'aZ09').', massaction='.GETPOST('massaction', 'aZ09').' NOTOKENRENEWAL='.(defined('NOTOKENRENEWAL') ?constant('NOTOKENRENEWAL') : ''));
 //Another call for easy debugg
 //dol_syslog("Access to ".$_SERVER["PHP_SELF"].' GET='.join(',',array_keys($_GET)).'->'.join(',',$_GET).' POST:'.join(',',array_keys($_POST)).'->'.join(',',$_POST));
 
@@ -1078,21 +1138,22 @@ if (!function_exists("llxHeader"))
 	 * @param	string	$morequerystring	Query string to add to the link "print" to get same parameters (use only if autodetect fails)
 	 * @param   string  $morecssonbody      More CSS on body tag.
 	 * @param	string	$replacemainareaby	Replace call to main_area() by a print of this string
+	 * @param	int		$disablenofollow	Disable the "nofollow" on page
 	 * @return	void
 	 */
-	function llxHeader($head = '', $title = '', $help_url = '', $target = '', $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $morequerystring = '', $morecssonbody = '', $replacemainareaby = '')
+	function llxHeader($head = '', $title = '', $help_url = '', $target = '', $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $morequerystring = '', $morecssonbody = '', $replacemainareaby = '', $disablenofollow = 0)
 	{
 		global $conf;
 
 		// html header
-		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
+		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss, 0, $disablenofollow);
 
 		$tmpcsstouse = 'sidebar-collapse'.($morecssonbody ? ' '.$morecssonbody : '');
 		// If theme MD and classic layer, we open the menulayer by default.
 		if ($conf->theme == 'md' && !in_array($conf->browser->layout, array('phone', 'tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 		{
-		    global $mainmenu;
-		    if ($mainmenu != 'website') $tmpcsstouse = $morecssonbody; // We do not use sidebar-collpase by default to have menuhider open by default.
+			global $mainmenu;
+			if ($mainmenu != 'website') $tmpcsstouse = $morecssonbody; // We do not use sidebar-collpase by default to have menuhider open by default.
 		}
 
 		if (!empty($conf->global->MAIN_OPTIMIZEFORCOLORBLIND)) {
@@ -1109,7 +1170,7 @@ if (!function_exists("llxHeader"))
 
 		if (empty($conf->dol_hide_leftmenu))
 		{
-			left_menu('', $help_url, '', '', 1, $title, 1); // $menumanager is retreived with a global $menumanager inside this function
+			left_menu('', $help_url, '', '', 1, $title, 1); // $menumanager is retrieved with a global $menumanager inside this function
 		}
 
 		// main area
@@ -1149,8 +1210,8 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
 		//	// A default security policy that keep usage of js external component like ckeditor, stripe, google, working
 		//	$contentsecuritypolicy = "font-src *; img-src *; style-src * 'unsafe-inline' 'unsafe-eval'; default-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; script-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; frame-src 'self' *.stripe.com; connect-src 'self';";
 		//}
-		//else $contentsecuritypolicy = $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;
-		$contentsecuritypolicy = $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;
+		//else
+		$contentsecuritypolicy = empty($conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY) ? '' : $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;
 
 		if (!is_object($hookmanager)) $hookmanager = new HookManager($db);
 		$hookmanager->initHooks(array("main"));
@@ -1211,10 +1272,10 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 	//print '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">'."\n";
 	if (empty($disablehead))
 	{
-	    if (!is_object($hookmanager)) $hookmanager = new HookManager($db);
-	    $hookmanager->initHooks(array("main"));
+		if (!is_object($hookmanager)) $hookmanager = new HookManager($db);
+		$hookmanager->initHooks(array("main"));
 
-	    $ext = 'layout='.$conf->browser->layout.'&amp;version='.urlencode(DOL_VERSION);
+		$ext = 'layout='.$conf->browser->layout.'&amp;version='.urlencode(DOL_VERSION);
 
 		print "<head>\n";
 
@@ -1236,16 +1297,16 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="copyright" title="GNU General Public License" href="https://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
 		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
 
-        // Mobile appli like icon
-        $manifest = DOL_URL_ROOT.'/theme/'.$conf->theme.'/manifest.json.php';
-        if (!empty($manifest)) {
-            print '<link rel="manifest" href="'.$manifest.'" />'."\n";
-        }
+		// Mobile appli like icon
+		$manifest = DOL_URL_ROOT.'/theme/'.$conf->theme.'/manifest.json.php';
+		if (!empty($manifest)) {
+			print '<link rel="manifest" href="'.$manifest.'" />'."\n";
+		}
 
-        if (!empty($conf->global->THEME_ELDY_TOPMENU_BACK1)) {
-            // TODO: use auto theme color switch
-            print '<meta name="theme-color" content="rgb('.$conf->global->THEME_ELDY_TOPMENU_BACK1.')">'."\n";
-        }
+		if (!empty($conf->global->THEME_ELDY_TOPMENU_BACK1)) {
+			// TODO: use auto theme color switch
+			print '<meta name="theme-color" content="rgb('.$conf->global->THEME_ELDY_TOPMENU_BACK1.')">'."\n";
+		}
 
 		// Auto refresh page
 		if (GETPOST('autorefresh', 'int') > 0) print '<meta http-equiv="refresh" content="'.GETPOST('autorefresh', 'int').'">';
@@ -1283,6 +1344,11 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 		if (GETPOSTISSET('THEME_DARKMODEENABLED')) { $themeparam .= '&amp;THEME_DARKMODEENABLED='.GETPOST('THEME_DARKMODEENABLED', 'int'); }
 		if (GETPOSTISSET('THEME_SATURATE_RATIO')) { $themeparam .= '&amp;THEME_SATURATE_RATIO='.GETPOST('THEME_SATURATE_RATIO', 'int'); }
 
+		if (!empty($conf->global->MAIN_ENABLE_FONT_ROBOTO)) {
+			print '<link rel="preconnect" href="https://fonts.gstatic.com">'."\n";
+			print '<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@200;300;400;500;600&display=swap" rel="stylesheet">'."\n";
+		}
+
 		if (!defined('DISABLE_JQUERY') && !$disablejs && $conf->use_javascript_ajax)
 		{
 			print '<!-- Includes CSS for JQuery (Ajax library) -->'."\n";
@@ -1301,8 +1367,8 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 		if (!defined('DISABLE_FONT_AWSOME'))
 		{
 			print '<!-- Includes CSS for font awesome -->'."\n";
-            print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome-5/css/all.min.css'.($ext ? '?'.$ext : '').'">'."\n";
-            print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome-5/css/v4-shims.min.css'.($ext ? '?'.$ext : '').'">'."\n";
+			print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome-5/css/all.min.css'.($ext ? '?'.$ext : '').'">'."\n";
+			print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome-5/css/v4-shims.min.css'.($ext ? '?'.$ext : '').'">'."\n";
 		}
 
 		print '<!-- Includes CSS for Dolibarr theme -->'."\n";
@@ -1349,12 +1415,12 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 		{
 			foreach ($arrayofcss as $cssfile)
 			{
-			    if (preg_match('/^(http|\/\/)/i', $cssfile))
-			    {
-			        $urltofile = $cssfile;
-			    } else {
-			        $urltofile = dol_buildpath($cssfile, 1);
-			    }
+				if (preg_match('/^(http|\/\/)/i', $cssfile))
+				{
+					$urltofile = $cssfile;
+				} else {
+					$urltofile = dol_buildpath($cssfile, 1);
+				}
 				print '<!-- Includes CSS added by page -->'."\n".'<link rel="stylesheet" type="text/css" title="default" href="'.$urltofile;
 				// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters and browser cache is not used.
 				if (!preg_match('/\.css$/i', $cssfile)) print $themeparam;
@@ -1397,7 +1463,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 				print 'var urlLoadInPlace = \''.DOL_URL_ROOT.'/core/ajax/loadinplace.php\';'."\n";
 				print 'var tooltipInPlace = \''.$langs->transnoentities('ClickToEdit').'\';'."\n"; // Added in title attribute of span
 				print 'var placeholderInPlace = \'&nbsp;\';'."\n"; // If we put another string than $langs->trans("ClickToEdit") here, nothing is shown. If we put empty string, there is error, Why ?
-				print 'var cancelInPlace = \''.$langs->trans('Cancel').'\';'."\n";
+				print 'var cancelInPlace = \''.$langs->trans("Cancel").'\';'."\n";
 				print 'var submitInPlace = \''.$langs->trans('Ok').'\';'."\n";
 				print 'var indicatorInPlace = \'<img src="'.DOL_URL_ROOT."/theme/".$conf->theme."/img/working.gif".'">\';'."\n";
 				print 'var withInPlace = 300;'; // width in pixel for default string edit
@@ -1405,108 +1471,108 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 				print '<script src="'.DOL_URL_ROOT.'/core/js/editinplace.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
-            // jQuery Timepicker
-            if (!empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER')) {
-            	print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
-            	print '<script src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext ? '&amp;'.$ext : '').'"></script>'."\n";
-            }
-            if (!defined('DISABLE_SELECT2') && (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))) {
-                // jQuery plugin "mutiselect", "multiple-select", "select2", ...
-            	$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
-            	print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n"; // We include full because we need the support of containerCssClass
-            }
-            if (! defined('DISABLE_MULTISELECT'))     // jQuery plugin "mutiselect" to select with checkboxes. Can be removed once we have an enhanced search tool
-            {
-            	print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/multiselect/jquery.multi-select.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            }
+			// jQuery Timepicker
+			if (!empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER')) {
+				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+				print '<script src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext ? '&amp;'.$ext : '').'"></script>'."\n";
+			}
+			if (!defined('DISABLE_SELECT2') && (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))) {
+				// jQuery plugin "mutiselect", "multiple-select", "select2", ...
+				$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
+				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n"; // We include full because we need the support of containerCssClass
+			}
+			if (!defined('DISABLE_MULTISELECT'))     // jQuery plugin "mutiselect" to select with checkboxes. Can be removed once we have an enhanced search tool
+			{
+				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/multiselect/jquery.multi-select.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+			}
 		}
 
-        if (!$disablejs && !empty($conf->use_javascript_ajax)) {
-            // CKEditor
-        	if ((!empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && !defined('DISABLE_CKEDITOR')) || defined('FORCE_CKEDITOR'))
-            {
-                print '<!-- Includes JS for CKEditor -->'."\n";
-                $pathckeditor = DOL_URL_ROOT.'/includes/ckeditor/ckeditor/';
-                $jsckeditor = 'ckeditor.js';
-                if (constant('JS_CKEDITOR')) {
-                    // To use external ckeditor 4 js lib
-                	$pathckeditor = constant('JS_CKEDITOR');
-                }
-                print '<script><!-- enable ckeditor by main.inc.php -->';
-                print 'var CKEDITOR_BASEPATH = \''.$pathckeditor.'\';'."\n";
-                print 'var ckeditorConfig = \''.dol_buildpath($themesubdir.'/theme/'.$conf->theme.'/ckeditor/config.js'.($ext ? '?'.$ext : ''), 1).'\';'."\n"; // $themesubdir='' in standard usage
-                print 'var ckeditorFilebrowserBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
-                print 'var ckeditorFilebrowserImageBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Type=Image&Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
-                print '</script>'."\n";
-                print '<script src="'.$pathckeditor.$jsckeditor.($ext ? '?'.$ext : '').'"></script>'."\n";
-                print '<script>';
-                if (GETPOST('mode', 'aZ09') == 'Full_inline')
-                {
-                	print 'CKEDITOR.disableAutoInline = false;'."\n";
-                } else {
-                	print 'CKEDITOR.disableAutoInline = true;'."\n";
-                }
-                print '</script>'."\n";
-            }
+		if (!$disablejs && !empty($conf->use_javascript_ajax)) {
+			// CKEditor
+			if ((!empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && !defined('DISABLE_CKEDITOR')) || defined('FORCE_CKEDITOR'))
+			{
+				print '<!-- Includes JS for CKEditor -->'."\n";
+				$pathckeditor = DOL_URL_ROOT.'/includes/ckeditor/ckeditor/';
+				$jsckeditor = 'ckeditor.js';
+				if (constant('JS_CKEDITOR')) {
+					// To use external ckeditor 4 js lib
+					$pathckeditor = constant('JS_CKEDITOR');
+				}
+				print '<script><!-- enable ckeditor by main.inc.php -->';
+				print 'var CKEDITOR_BASEPATH = \''.$pathckeditor.'\';'."\n";
+				print 'var ckeditorConfig = \''.dol_buildpath($themesubdir.'/theme/'.$conf->theme.'/ckeditor/config.js'.($ext ? '?'.$ext : ''), 1).'\';'."\n"; // $themesubdir='' in standard usage
+				print 'var ckeditorFilebrowserBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
+				print 'var ckeditorFilebrowserImageBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Type=Image&Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
+				print '</script>'."\n";
+				print '<script src="'.$pathckeditor.$jsckeditor.($ext ? '?'.$ext : '').'"></script>'."\n";
+				print '<script>';
+				if (GETPOST('mode', 'aZ09') == 'Full_inline')
+				{
+					print 'CKEDITOR.disableAutoInline = false;'."\n";
+				} else {
+					print 'CKEDITOR.disableAutoInline = true;'."\n";
+				}
+				print '</script>'."\n";
+			}
 
-            // Browser notifications
-            if (!defined('DISABLE_BROWSER_NOTIF'))
-            {
-                $enablebrowsernotif = false;
-                if (!empty($conf->agenda->enabled) && !empty($conf->global->AGENDA_REMINDER_BROWSER)) $enablebrowsernotif = true;
-                if ($conf->browser->layout == 'phone') $enablebrowsernotif = false;
-                if ($enablebrowsernotif)
-                {
-                    print '<!-- Includes JS of Dolibarr (browser layout = '.$conf->browser->layout.')-->'."\n";
-                    print '<script src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php'.($ext ? '?'.$ext : '').'"></script>'."\n";
-                }
-            }
+			// Browser notifications (if NOREQUIREMENU is on, it is mostly a page for popup, so we do not enable notif too. We hide also for public pages).
+			if (!defined('NOBROWSERNOTIF') && !defined('NOREQUIREMENU') && !defined('NOLOGIN'))
+			{
+				$enablebrowsernotif = false;
+				if (!empty($conf->agenda->enabled) && !empty($conf->global->AGENDA_REMINDER_BROWSER)) $enablebrowsernotif = true;
+				if ($conf->browser->layout == 'phone') $enablebrowsernotif = false;
+				if ($enablebrowsernotif)
+				{
+					print '<!-- Includes JS of Dolibarr (browser layout = '.$conf->browser->layout.')-->'."\n";
+					print '<script src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php'.($ext ? '?'.$ext : '').'"></script>'."\n";
+				}
+			}
 
-            // Global js function
-            print '<!-- Includes JS of Dolibarr -->'."\n";
-            print '<script src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";
+			// Global js function
+			print '<!-- Includes JS of Dolibarr -->'."\n";
+			print '<script src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";
 
-            // JS forced by modules (relative url starting with /)
-            if (!empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
-        	{
-        		$arrayjs = (array) $conf->modules_parts['js'];
-	            foreach ($arrayjs as $modjs => $filesjs)
-	            {
-        			$filesjs = (array) $filesjs; // To be sure filejs is an array
-		            foreach ($filesjs as $jsfile)
-		            {
-	    	    		// jsfile is a relative path
-	        	    	print '<!-- Include JS added by module '.$modjs.'-->'."\n".'<script src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";
-		            }
-	            }
-        	}
-            // JS forced by page in top_htmlhead (relative url starting with /)
-            if (is_array($arrayofjs))
-            {
-                print '<!-- Includes JS added by page -->'."\n";
-                foreach ($arrayofjs as $jsfile)
-                {
-                    if (preg_match('/^(http|\/\/)/i', $jsfile))
-                    {
-                        print '<script src="'.$jsfile.'"></script>'."\n";
-                    } else {
-                        print '<script src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";
-                    }
-                }
-            }
-        }
+			// JS forced by modules (relative url starting with /)
+			if (!empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
+			{
+				$arrayjs = (array) $conf->modules_parts['js'];
+				foreach ($arrayjs as $modjs => $filesjs)
+				{
+					$filesjs = (array) $filesjs; // To be sure filejs is an array
+					foreach ($filesjs as $jsfile)
+					{
+						// jsfile is a relative path
+						print '<!-- Include JS added by module '.$modjs.'-->'."\n".'<script src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";
+					}
+				}
+			}
+			// JS forced by page in top_htmlhead (relative url starting with /)
+			if (is_array($arrayofjs))
+			{
+				print '<!-- Includes JS added by page -->'."\n";
+				foreach ($arrayofjs as $jsfile)
+				{
+					if (preg_match('/^(http|\/\/)/i', $jsfile))
+					{
+						print '<script src="'.$jsfile.'"></script>'."\n";
+					} else {
+						print '<script src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";
+					}
+				}
+			}
+		}
 
-        if (!empty($head)) print $head."\n";
-        if (!empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER."\n";
+		if (!empty($head)) print $head."\n";
+		if (!empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER."\n";
 
-        $parameters = array();
-        $result = $hookmanager->executeHooks('addHtmlHeader', $parameters); // Note that $action and $object may have been modified by some hooks
-        print $hookmanager->resPrint; // Replace Title to show
+		$parameters = array();
+		$result = $hookmanager->executeHooks('addHtmlHeader', $parameters); // Note that $action and $object may have been modified by some hooks
+		print $hookmanager->resPrint; // Replace Title to show
 
-        print "</head>\n\n";
-    }
+		print "</head>\n\n";
+	}
 
-    $conf->headerdone = 1; // To tell header was output
+	$conf->headerdone = 1; // To tell header was output
 }
 
 
@@ -1535,7 +1601,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 	$searchform = '';
 	$bookmarks = '';
 
-	// Instantiate hooks of thirdparty module
+	// Instantiate hooks for external modules
 	$hookmanager->initHooks(array('toprightmenu'));
 
 	$toprightmenu = '';
@@ -1543,7 +1609,8 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 	// For backward compatibility with old modules
 	if (empty($conf->headerdone))
 	{
-		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
+		$disablenofollow = 0;
+		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss, 0, $disablenofollow);
 		print '<body id="mainbody">';
 	}
 
@@ -1552,6 +1619,11 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
      */
 	if ((empty($conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu', 'int')) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU')))
 	{
+		if (!isset($form) || !is_object($form)) {
+			include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+			$form = new Form($db);
+		}
+
 		print "\n".'<!-- Start top horizontal -->'."\n";
 
 		print '<div class="side-nav-vert'.(GETPOST('dol_invisible_topmenu', 'int') ? ' hidden' : '').'"><div id="id-top">'; // dol_invisible_topmenu differs from dol_hide_topmenu: dol_invisible_topmenu means we output menu but we make it invisible.
@@ -1576,6 +1648,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 		if (!empty($conf->global->MAIN_FEATURES_LEVEL)) $appli .= "<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
 
 		$logouttext = '';
+		$logouthtmltext = '';
 		if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 		{
 			//$logouthtmltext=$appli.'<br>';
@@ -1617,7 +1690,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 			//$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
 			$text .= '<span class="fa fa-bug atoplogin valignmiddle"></span>';
 			$text .= '</a>';
-			$toprightmenu .= @Form::textwithtooltip('', $langs->trans("ModuleBuilder"), 2, 1, $text, 'login_block_elem', 2);
+			$toprightmenu .= $form->textwithtooltip('', $langs->trans("ModuleBuilder"), 2, 1, $text, 'login_block_elem', 2);
 		}
 
 		// Link to print main content area
@@ -1636,7 +1709,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 			//$text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"');
 			$text .= '<span class="fa fa-print atoplogin valignmiddle"></span>';
 			$text .= '</a>';
-			$toprightmenu .= @Form::textwithtooltip('', $langs->trans("PrintContentArea"), 2, 1, $text, 'login_block_elem', 2);
+			$toprightmenu .= $form->textwithtooltip('', $langs->trans("PrintContentArea"), 2, 1, $text, 'login_block_elem', 2);
 		}
 
 		// Link to Dolibarr wiki pages
@@ -1647,8 +1720,13 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 			$helpbaseurl = '';
 			$helppage = '';
 			$mode = '';
+			$helppresent = '';
 
-			if (empty($helppagename)) $helppagename = 'EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
+			if (empty($helppagename)) {
+				$helppagename = 'EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
+			} else {
+				$helppresent = 'helppresent';
+			}
 
 			// Get helpbaseurl, helppage and mode from helppagename and langs
 			$arrayres = getHelpParamFor($helppagename, $langs);
@@ -1660,15 +1738,20 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 			if ($helpbaseurl && $helppage)
 			{
 				$text = '';
-				$title = $langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage' : 'GoToHelpPage');
-				if ($mode == 'wiki') $title .= ' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage, '_', ' ')).'&quot;'."";
+				$title = $langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage' : 'GoToHelpPage').'...';
+				if ($mode == 'wiki') {
+					$title .= '<br>'.$langs->trans("PageWiki").' '.dol_escape_htmltag('"'.strtr($helppage, '_', ' ').'"');
+					if ($helppresent) $title .= ' <span class="opacitymedium">('.$langs->trans("DedicatedPageAvailable").')</span>';
+					else $title .= ' <span class="opacitymedium">('.$langs->trans("HomePage").')</span>';
+				}
 				$text .= '<a class="help" target="_blank" rel="noopener" href="';
 				if ($mode == 'wiki') $text .= sprintf($helpbaseurl, urlencode(html_entity_decode($helppage)));
 				else $text .= sprintf($helpbaseurl, $helppage);
 				$text .= '">';
-				$text .= '<span class="fa fa-question-circle atoplogin valignmiddle"></span>';
+				$text .= '<span class="fa fa-question-circle atoplogin valignmiddle'.($helppresent ? ' '.$helppresent : '').'"></span>';
+				if ($helppresent) $text .= '<span class="fa fa-circle helppresentcircle"></span>';
 				$text .= '</a>';
-				$toprightmenu .= @Form::textwithtooltip('', $title, 2, 1, $text, 'login_block_elem', 2);
+				$toprightmenu .= $form->textwithtooltip('', $title, 2, 1, $text, 'login_block_elem', 2);
 			}
 
 			// Version
@@ -1679,12 +1762,12 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 		}
 
 		if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
-			$text = '<span href="#" class="aversion"><span class="hideonsmartphone small">'.DOL_VERSION.'</span></span>';
-			$toprightmenu .= @Form::textwithtooltip('', $appli, 2, 1, $text, 'login_block_elem', 2);
+			$text = '<span class="aversion"><span class="hideonsmartphone small">'.DOL_VERSION.'</span></span>';
+			$toprightmenu .= $form->textwithtooltip('', $appli, 2, 1, $text, 'login_block_elem', 2);
 		}
 
 		// Logout link
-		$toprightmenu .= @Form::textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem logout-btn', 2);
+		$toprightmenu .= $form->textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem logout-btn', 2);
 
 		$toprightmenu .= '</div>'; // end div class="login_block_other"
 
@@ -1727,7 +1810,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 		print "<!-- End top horizontal menu -->\n\n";
 	}
 
-	if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '<!-- Begin div id-container --><div id="id-container" class="id-container'.($morecss ? ' '.$morecss : '').'">';
+	if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '<!-- Begin div id-container --><div id="id-container" class="id-container">';
 }
 
 
@@ -1740,99 +1823,99 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
  */
 function top_menu_user($hideloginname = 0, $urllogout = '')
 {
-    global $langs, $conf, $db, $hookmanager, $user;
-    global $dolibarr_main_authentication, $dolibarr_main_demo;
-    global $menumanager;
+	global $langs, $conf, $db, $hookmanager, $user;
+	global $dolibarr_main_authentication, $dolibarr_main_demo;
+	global $menumanager;
 
-    $userImage = $userDropDownImage = '';
-    if (!empty($user->photo))
-    {
-        $userImage          = Form::showphoto('userphoto', $user, 0, 0, 0, 'photouserphoto userphoto', 'small', 0, 1);
-        $userDropDownImage  = Form::showphoto('userphoto', $user, 0, 0, 0, 'dropdown-user-image', 'small', 0, 1);
-    } else {
-        $nophoto = '/public/theme/common/user_anonymous.png';
-        if ($user->gender == 'man') $nophoto = '/public/theme/common/user_man.png';
-        if ($user->gender == 'woman') $nophoto = '/public/theme/common/user_woman.png';
+	$userImage = $userDropDownImage = '';
+	if (!empty($user->photo))
+	{
+		$userImage          = Form::showphoto('userphoto', $user, 0, 0, 0, 'photouserphoto userphoto', 'small', 0, 1);
+		$userDropDownImage  = Form::showphoto('userphoto', $user, 0, 0, 0, 'dropdown-user-image', 'small', 0, 1);
+	} else {
+		$nophoto = '/public/theme/common/user_anonymous.png';
+		if ($user->gender == 'man') $nophoto = '/public/theme/common/user_man.png';
+		if ($user->gender == 'woman') $nophoto = '/public/theme/common/user_woman.png';
 
-        $userImage = '<img class="photo photouserphoto userphoto" alt="No photo" src="'.DOL_URL_ROOT.$nophoto.'">';
-        $userDropDownImage = '<img class="photo dropdown-user-image" alt="No photo" src="'.DOL_URL_ROOT.$nophoto.'">';
-    }
+		$userImage = '<img class="photo photouserphoto userphoto" alt="No photo" src="'.DOL_URL_ROOT.$nophoto.'">';
+		$userDropDownImage = '<img class="photo dropdown-user-image" alt="No photo" src="'.DOL_URL_ROOT.$nophoto.'">';
+	}
 
-    $dropdownBody = '';
-    $dropdownBody .= '<span id="topmenuloginmoreinfo-btn"><i class="fa fa-caret-right"></i> '.$langs->trans("ShowMoreInfos").'</span>';
-    $dropdownBody .= '<div id="topmenuloginmoreinfo" >';
+	$dropdownBody = '';
+	$dropdownBody .= '<span id="topmenuloginmoreinfo-btn"><i class="fa fa-caret-right"></i> '.$langs->trans("ShowMoreInfos").'</span>';
+	$dropdownBody .= '<div id="topmenuloginmoreinfo" >';
 
-    // login infos
-    if (!empty($user->admin)) {
-        $dropdownBody .= '<br><b>'.$langs->trans("Administrator").'</b>: '.yn($user->admin);
-    }
-    if (!empty($user->socid))	// Add thirdparty for external users
-    {
-        $thirdpartystatic = new Societe($db);
-        $thirdpartystatic->fetch($user->socid);
-        $companylink = ' '.$thirdpartystatic->getNomUrl(2); // picto only of company
-        $company = ' ('.$langs->trans("Company").': '.$thirdpartystatic->name.')';
-    }
-    $type = ($user->socid ? $langs->trans("External").$company : $langs->trans("Internal"));
-    $dropdownBody .= '<br><b>'.$langs->trans("Type").':</b> '.$type;
-    $dropdownBody .= '<br><b>'.$langs->trans("Status").'</b>: '.$user->getLibStatut(0);
-    $dropdownBody .= '<br>';
+	// login infos
+	if (!empty($user->admin)) {
+		$dropdownBody .= '<br><b>'.$langs->trans("Administrator").'</b>: '.yn($user->admin);
+	}
+	if (!empty($user->socid))	// Add thirdparty for external users
+	{
+		$thirdpartystatic = new Societe($db);
+		$thirdpartystatic->fetch($user->socid);
+		$companylink = ' '.$thirdpartystatic->getNomUrl(2); // picto only of company
+		$company = ' ('.$langs->trans("Company").': '.$thirdpartystatic->name.')';
+	}
+	$type = ($user->socid ? $langs->trans("External").$company : $langs->trans("Internal"));
+	$dropdownBody .= '<br><b>'.$langs->trans("Type").':</b> '.$type;
+	$dropdownBody .= '<br><b>'.$langs->trans("Status").'</b>: '.$user->getLibStatut(0);
+	$dropdownBody .= '<br>';
 
-    $dropdownBody .= '<br><u>'.$langs->trans("Session").'</u>';
-    $dropdownBody .= '<br><b>'.$langs->trans("IPAddress").'</b>: '.dol_escape_htmltag($_SERVER["REMOTE_ADDR"]);
-    if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $dropdownBody .= '<br><b>'.$langs->trans("ConnectedOnMultiCompany").':</b> '.$conf->entity.' (user entity '.$user->entity.')';
-    $dropdownBody .= '<br><b>'.$langs->trans("AuthenticationMode").':</b> '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo) ? '' : ' (demo)');
-    $dropdownBody .= '<br><b>'.$langs->trans("ConnectedSince").':</b> '.dol_print_date($user->datelastlogin, "dayhour", 'tzuser');
-    $dropdownBody .= '<br><b>'.$langs->trans("PreviousConnexion").':</b> '.dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser');
-    $dropdownBody .= '<br><b>'.$langs->trans("CurrentTheme").':</b> '.$conf->theme;
-    $dropdownBody .= '<br><b>'.$langs->trans("CurrentMenuManager").':</b> '.$menumanager->name;
-    $langFlag = picto_from_langcode($langs->getDefaultLang());
-    $dropdownBody .= '<br><b>'.$langs->trans("CurrentUserLanguage").':</b> '.($langFlag ? $langFlag.' ' : '').$langs->getDefaultLang();
-    $dropdownBody .= '<br><b>'.$langs->trans("Browser").':</b> '.$conf->browser->name.($conf->browser->version ? ' '.$conf->browser->version : '').' ('.dol_escape_htmltag($_SERVER['HTTP_USER_AGENT']).')';
-    $dropdownBody .= '<br><b>'.$langs->trans("Layout").':</b> '.$conf->browser->layout;
-    $dropdownBody .= '<br><b>'.$langs->trans("Screen").':</b> '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
-    if ($conf->browser->layout == 'phone') $dropdownBody .= '<br><b>'.$langs->trans("Phone").':</b> '.$langs->trans("Yes");
-    if (!empty($_SESSION["disablemodules"])) $dropdownBody .= '<br><b>'.$langs->trans("DisabledModules").':</b> <br>'.join(', ', explode(',', $_SESSION["disablemodules"]));
-    $dropdownBody .= '</div>';
+	$dropdownBody .= '<br><u>'.$langs->trans("Session").'</u>';
+	$dropdownBody .= '<br><b>'.$langs->trans("IPAddress").'</b>: '.dol_escape_htmltag($_SERVER["REMOTE_ADDR"]);
+	if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $dropdownBody .= '<br><b>'.$langs->trans("ConnectedOnMultiCompany").':</b> '.$conf->entity.' (user entity '.$user->entity.')';
+	$dropdownBody .= '<br><b>'.$langs->trans("AuthenticationMode").':</b> '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo) ? '' : ' (demo)');
+	$dropdownBody .= '<br><b>'.$langs->trans("ConnectedSince").':</b> '.dol_print_date($user->datelastlogin, "dayhour", 'tzuser');
+	$dropdownBody .= '<br><b>'.$langs->trans("PreviousConnexion").':</b> '.dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser');
+	$dropdownBody .= '<br><b>'.$langs->trans("CurrentTheme").':</b> '.$conf->theme;
+	$dropdownBody .= '<br><b>'.$langs->trans("CurrentMenuManager").':</b> '.$menumanager->name;
+	$langFlag = picto_from_langcode($langs->getDefaultLang());
+	$dropdownBody .= '<br><b>'.$langs->trans("CurrentUserLanguage").':</b> '.($langFlag ? $langFlag.' ' : '').$langs->getDefaultLang();
+	$dropdownBody .= '<br><b>'.$langs->trans("Browser").':</b> '.$conf->browser->name.($conf->browser->version ? ' '.$conf->browser->version : '').' ('.dol_escape_htmltag($_SERVER['HTTP_USER_AGENT']).')';
+	$dropdownBody .= '<br><b>'.$langs->trans("Layout").':</b> '.$conf->browser->layout;
+	$dropdownBody .= '<br><b>'.$langs->trans("Screen").':</b> '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
+	if ($conf->browser->layout == 'phone') $dropdownBody .= '<br><b>'.$langs->trans("Phone").':</b> '.$langs->trans("Yes");
+	if (!empty($_SESSION["disablemodules"])) $dropdownBody .= '<br><b>'.$langs->trans("DisabledModules").':</b> <br>'.join(', ', explode(',', $_SESSION["disablemodules"]));
+	$dropdownBody .= '</div>';
 
-    // Execute hook
-    $parameters = array('user'=>$user, 'langs' => $langs);
-    $result = $hookmanager->executeHooks('printTopRightMenuLoginDropdownBody', $parameters); // Note that $action and $object may have been modified by some hooks
-    if (is_numeric($result))
-    {
-        if ($result == 0) {
-            $dropdownBody .= $hookmanager->resPrint; // add
-        } else {
-            $dropdownBody = $hookmanager->resPrint; // replace
-        }
-    }
+	// Execute hook
+	$parameters = array('user'=>$user, 'langs' => $langs);
+	$result = $hookmanager->executeHooks('printTopRightMenuLoginDropdownBody', $parameters); // Note that $action and $object may have been modified by some hooks
+	if (is_numeric($result))
+	{
+		if ($result == 0) {
+			$dropdownBody .= $hookmanager->resPrint; // add
+		} else {
+			$dropdownBody = $hookmanager->resPrint; // replace
+		}
+	}
 
-    if (empty($urllogout)) {
-    	$urllogout = DOL_URL_ROOT.'/user/logout.php';
-    }
-    $logoutLink = '<a accesskey="l" href="'.$urllogout.'" class="button-top-menu-dropdown" ><i class="fa fa-sign-out-alt"></i> '.$langs->trans("Logout").'</a>';
-    $profilLink = '<a accesskey="l" href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="button-top-menu-dropdown" ><i class="fa fa-user"></i>  '.$langs->trans("Card").'</a>';
+	if (empty($urllogout)) {
+		$urllogout = DOL_URL_ROOT.'/user/logout.php';
+	}
+	$logoutLink = '<a accesskey="l" href="'.$urllogout.'" class="button-top-menu-dropdown" ><i class="fa fa-sign-out-alt"></i> '.$langs->trans("Logout").'</a>';
+	$profilLink = '<a accesskey="l" href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="button-top-menu-dropdown" ><i class="fa fa-user"></i>  '.$langs->trans("Card").'</a>';
 
 
-    $profilName = $user->getFullName($langs).' ('.$user->login.')';
+	$profilName = $user->getFullName($langs).' ('.$user->login.')';
 
-    if (!empty($user->admin)) {
-        $profilName = '<i class="far fa-star classfortooltip" title="'.$langs->trans("Administrator").'" ></i> '.$profilName;
-    }
+	if (!empty($user->admin)) {
+		$profilName = '<i class="far fa-star classfortooltip" title="'.$langs->trans("Administrator").'" ></i> '.$profilName;
+	}
 
-    // Define version to show
-    $appli = constant('DOL_APPLICATION_TITLE');
-    if (!empty($conf->global->MAIN_APPLICATION_TITLE))
-    {
-    	$appli = $conf->global->MAIN_APPLICATION_TITLE;
-    	if (preg_match('/\d\.\d/', $appli))
-    	{
-    		if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
-    	} else $appli .= " ".DOL_VERSION;
-    } else $appli .= " ".DOL_VERSION;
+	// Define version to show
+	$appli = constant('DOL_APPLICATION_TITLE');
+	if (!empty($conf->global->MAIN_APPLICATION_TITLE))
+	{
+		$appli = $conf->global->MAIN_APPLICATION_TITLE;
+		if (preg_match('/\d\.\d/', $appli))
+		{
+			if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
+		} else $appli .= " ".DOL_VERSION;
+	} else $appli .= " ".DOL_VERSION;
 
-    if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
-	    $btnUser = '<!-- div for user link -->
+	if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+		$btnUser = '<!-- div for user link -->
 	    <div id="topmenu-login-dropdown" class="userimg atoplogin dropdown user user-menu inline-block">
 	        <a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="dropdown-toggle login-dropdown-a" data-toggle="dropdown">
 	            '.$userImage.'
@@ -1868,19 +1951,19 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 
 	        </div>
 	    </div>';
-    } else {
-    	$btnUser = '<!-- div for user link -->
+	} else {
+		$btnUser = '<!-- div for user link -->
 	    <div id="topmenu-login-dropdown" class="userimg atoplogin dropdown user user-menu  inline-block">
 	    	<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'">
 	    	'.$userImage.'
 	    		<span class="hidden-xs maxwidth200 atoploginusername hideonsmartphone">'.dol_trunc($user->firstname ? $user->firstname : $user->login, 10).'</span>
 	    		</a>
 		</div>';
-    }
+	}
 
-    if (!defined('JS_JQUERY_DISABLE_DROPDOWN') && !empty($conf->use_javascript_ajax))    // This may be set by some pages that use different jquery version to avoid errors
-    {
-        $btnUser .= '
+	if (!defined('JS_JQUERY_DISABLE_DROPDOWN') && !empty($conf->use_javascript_ajax))    // This may be set by some pages that use different jquery version to avoid errors
+	{
+		$btnUser .= '
         <!-- Code to show/hide the user drop-down -->
         <script>
         $( document ).ready(function() {
@@ -1893,8 +1976,8 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
             });
 			';
 
-        if ($conf->theme != 'md') {
-	        $btnUser .= '
+		if ($conf->theme != 'md') {
+			$btnUser .= '
 	            $("#topmenu-login-dropdown .dropdown-toggle").on("click", function(event) {
 					console.log("toggle login dropdown");
 					event.preventDefault();
@@ -1904,15 +1987,15 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 	            $("#topmenuloginmoreinfo-btn").on("click", function() {
 	                $("#topmenuloginmoreinfo").slideToggle();
 	            });';
-        }
+		}
 
-        $btnUser .= '
+		$btnUser .= '
         });
         </script>
         ';
-    }
+	}
 
-    return $btnUser;
+	return $btnUser;
 }
 
 /**
@@ -2141,24 +2224,24 @@ function top_menu_quickadd()
  */
 function top_menu_bookmark()
 {
-    global $langs, $conf, $db, $user;
+	global $langs, $conf, $db, $user;
 
 	$html = '';
 
-    // Define $bookmarks
+	// Define $bookmarks
 	if (empty($conf->bookmark->enabled) || empty($user->rights->bookmark->lire)) return $html;
 
 	if (!defined('JS_JQUERY_DISABLE_DROPDOWN') && !empty($conf->use_javascript_ajax))	    // This may be set by some pages that use different jquery version to avoid errors
-    {
-        include_once DOL_DOCUMENT_ROOT.'/bookmarks/bookmarks.lib.php';
-        $langs->load("bookmarks");
+	{
+		include_once DOL_DOCUMENT_ROOT.'/bookmarks/bookmarks.lib.php';
+		$langs->load("bookmarks");
 
-        if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
-        	$html .= '<div id="topmenu-bookmark-dropdown" class="dropdown inline-block">';
-        	$html .= printDropdownBookmarksList();
-        	$html .= '</div>';
-        } else {
-	        $html .= '<!-- div for bookmark link -->
+		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			$html .= '<div id="topmenu-bookmark-dropdown" class="dropdown inline-block">';
+			$html .= printDropdownBookmarksList();
+			$html .= '</div>';
+		} else {
+			$html .= '<!-- div for bookmark link -->
 	        <div id="topmenu-bookmark-dropdown" class="dropdown inline-block">
 	            <a class="dropdown-toggle login-dropdown-a" data-toggle="dropdown" href="#" title="'.$langs->trans('Bookmarks').' ('.$langs->trans('BookmarksMenuShortCut').')">
 	                <i class="fa fa-star" ></i>
@@ -2168,7 +2251,7 @@ function top_menu_bookmark()
 	            </div>
 	        </div>';
 
-	        $html .= '
+			$html .= '
 	        <!-- Code to show/hide the bookmark drop-down -->
 	        <script>
 	        $( document ).ready(function() {
@@ -2203,9 +2286,9 @@ function top_menu_bookmark()
 	        });
 	        </script>
 	        ';
-        }
-    }
-    return $html;
+		}
+	}
+	return $html;
 }
 
 /**
@@ -2215,51 +2298,51 @@ function top_menu_bookmark()
  */
 function top_menu_search()
 {
-    global $langs, $conf, $db, $user, $hookmanager;
+	global $langs, $conf, $db, $user, $hookmanager;
 
 	$html = '';
 
-    $usedbyinclude = 1;
-    $arrayresult = null;
-    include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php'; // This set $arrayresult
+	$usedbyinclude = 1;
+	$arrayresult = null;
+	include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php'; // This set $arrayresult
 
-    $defaultAction = '';
-    $buttonList = '<div class="dropdown-global-search-button-list" >';
-    // Menu with all searchable items
-    foreach ($arrayresult as $keyItem => $item)
-    {
-        if (empty($defaultAction)) {
-            $defaultAction = $item['url'];
-        }
-        $buttonList .= '<button class="dropdown-item global-search-item" data-target="'.dol_escape_htmltag($item['url']).'" >';
-        $buttonList .= $item['text'];
-        $buttonList .= '</button>';
-    }
-    $buttonList .= '</div>';
+	$defaultAction = '';
+	$buttonList = '<div class="dropdown-global-search-button-list" >';
+	// Menu with all searchable items
+	foreach ($arrayresult as $keyItem => $item)
+	{
+		if (empty($defaultAction)) {
+			$defaultAction = $item['url'];
+		}
+		$buttonList .= '<button class="dropdown-item global-search-item" data-target="'.dol_escape_htmltag($item['url']).'" >';
+		$buttonList .= $item['text'];
+		$buttonList .= '</button>';
+	}
+	$buttonList .= '</div>';
 
 
-    $searchInput = '<input name="sall" id="top-global-search-input" class="dropdown-search-input" placeholder="'.$langs->trans('Search').'" autocomplete="off" >';
+	$searchInput = '<input name="sall" id="top-global-search-input" class="dropdown-search-input" placeholder="'.$langs->trans('Search').'" autocomplete="off" >';
 
-    $dropDownHtml = '<form id="top-menu-action-search" name="actionsearch" method="GET" action="'.$defaultAction.'" >';
+	$dropDownHtml = '<form id="top-menu-action-search" name="actionsearch" method="GET" action="'.$defaultAction.'" >';
 
-    $dropDownHtml .= '
+	$dropDownHtml .= '
         <!-- search input -->
         <div class="dropdown-header search-dropdown-header">
             ' . $searchInput.'
         </div>
     ';
 
-    $dropDownHtml .= '
+	$dropDownHtml .= '
         <!-- Menu Body -->
         <div class="dropdown-body search-dropdown-body">
         '.$buttonList.'
         </div>
         ';
 
-    $dropDownHtml .= '</form>';
+	$dropDownHtml .= '</form>';
 
 
-    $html .= '<!-- div for Global Search -->
+	$html .= '<!-- div for Global Search -->
     <div id="topmenu-global-search-dropdown" class="atoplogin dropdown inline-block">
         <a class="dropdown-toggle login-dropdown-a" data-toggle="dropdown" href="#" title="'.$langs->trans('Search').' ('.$langs->trans('SearchMenuShortCut').')">
             <i class="fa fa-search" ></i>
@@ -2269,7 +2352,7 @@ function top_menu_search()
         </div>
     </div>';
 
-    $html .= '
+	$html .= '
     <!-- Code to show/hide the user drop-down -->
     <script>
     $( document ).ready(function() {
@@ -2327,7 +2410,7 @@ function top_menu_search()
     </script>
     ';
 
-    return $html;
+	return $html;
 }
 
 /**
@@ -2356,7 +2439,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 
 	if (empty($conf->dol_hide_leftmenu) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU')))
 	{
-		// Instantiate hooks of thirdparty module
+		// Instantiate hooks for external modules
 		$hookmanager->initHooks(array('searchform', 'leftblock'));
 
 		print "\n".'<!-- Begin side-nav id-left -->'."\n".'<div class="side-nav"><div id="id-left">'."\n";
@@ -2367,44 +2450,44 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 
 		if (!is_object($form)) $form = new Form($db);
 		$selected = -1;
-        if (empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)) {
-            $usedbyinclude = 1;
-            $arrayresult = null;
-            include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php'; // This set $arrayresult
+		if (empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)) {
+			$usedbyinclude = 1;
+			$arrayresult = null;
+			include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php'; // This set $arrayresult
 
-            if ($conf->use_javascript_ajax && empty($conf->global->MAIN_USE_OLD_SEARCH_FORM)) {
-                $searchform .= $form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, '', 1, 0, (empty($conf->global->MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY) ? 1 : 0), 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
-            } else {
-                if (is_array($arrayresult)) {
-                    foreach ($arrayresult as $key => $val) {
-                        $searchform .= printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth125', 'sall', $val['shortcut'], 'searchleft'.$key, $val['img']);
-                    }
-                }
-            }
+			if ($conf->use_javascript_ajax && empty($conf->global->MAIN_USE_OLD_SEARCH_FORM)) {
+				$searchform .= $form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, '', 1, 0, (empty($conf->global->MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY) ? 1 : 0), 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
+			} else {
+				if (is_array($arrayresult)) {
+					foreach ($arrayresult as $key => $val) {
+						$searchform .= printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth125', 'sall', $val['shortcut'], 'searchleft'.$key, $val['img']);
+					}
+				}
+			}
 
-            // Execute hook printSearchForm
-            $parameters = array('searchform' => $searchform);
-            $reshook = $hookmanager->executeHooks('printSearchForm', $parameters); // Note that $action and $object may have been modified by some hooks
-            if (empty($reshook)) {
-                $searchform .= $hookmanager->resPrint;
-            } else $searchform = $hookmanager->resPrint;
+			// Execute hook printSearchForm
+			$parameters = array('searchform' => $searchform);
+			$reshook = $hookmanager->executeHooks('printSearchForm', $parameters); // Note that $action and $object may have been modified by some hooks
+			if (empty($reshook)) {
+				$searchform .= $hookmanager->resPrint;
+			} else $searchform = $hookmanager->resPrint;
 
-            // Force special value for $searchform
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty($conf->use_javascript_ajax)) {
-                $urltosearch = DOL_URL_ROOT.'/core/search_page.php?showtitlebefore=1';
-                $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="'.$urltosearch.'" accesskey="s" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div></div>';
-            } elseif ($conf->use_javascript_ajax && !empty($conf->global->MAIN_USE_OLD_SEARCH_FORM)) {
-                $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';
-                $searchform .= '<script>
+			// Force special value for $searchform
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty($conf->use_javascript_ajax)) {
+				$urltosearch = DOL_URL_ROOT.'/core/search_page.php?showtitlebefore=1';
+				$searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="'.$urltosearch.'" accesskey="s" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div></div>';
+			} elseif ($conf->use_javascript_ajax && !empty($conf->global->MAIN_USE_OLD_SEARCH_FORM)) {
+				$searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';
+				$searchform .= '<script>
             	jQuery(document).ready(function () {
             		jQuery("#divsearchforms1").click(function(){
 	                   jQuery("#divsearchforms2").toggle();
 	               });
             	});
                 </script>' . "\n";
-                $searchform .= '</div>';
-            }
-        }
+				$searchform .= '</div>';
+			}
+		}
 
 		// Left column
 		print '<!-- Begin left menu -->'."\n";
@@ -2455,37 +2538,37 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-            $bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new?labels=Bug';
+			$bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new?labels=Bug';
 			$bugbaseurl .= '&title=';
 			$bugbaseurl .= urlencode("Bug: ");
-            $bugbaseurl .= '&body=';
-            $bugbaseurl .= urlencode("# Instructions\n");
-            $bugbaseurl .= urlencode("*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*\n");
-            $bugbaseurl .= urlencode("*Please:*\n");
-            $bugbaseurl .= urlencode("- *replace the bracket enclosed texts with meaningful information*\n");
-            $bugbaseurl .= urlencode("- *remove any unused sub-section*\n");
-            $bugbaseurl .= urlencode("\n");
-            $bugbaseurl .= urlencode("\n");
-            $bugbaseurl .= urlencode("# Bug\n");
-            $bugbaseurl .= urlencode("[*Short description*]\n");
-            $bugbaseurl .= urlencode("\n");
-            $bugbaseurl .= urlencode("## Environment\n");
-            $bugbaseurl .= urlencode("- **Version**: ".DOL_VERSION."\n");
-            $bugbaseurl .= urlencode("- **OS**: ".php_uname('s')."\n");
-            $bugbaseurl .= urlencode("- **Web server**: ".$_SERVER["SERVER_SOFTWARE"]."\n");
-            $bugbaseurl .= urlencode("- **PHP**: ".php_sapi_name().' '.phpversion()."\n");
-            $bugbaseurl .= urlencode("- **Database**: ".$db::LABEL.' '.$db->getVersion()."\n");
-            $bugbaseurl .= urlencode("- **URL(s)**: ".$_SERVER["REQUEST_URI"]."\n");
-            $bugbaseurl .= urlencode("\n");
-            $bugbaseurl .= urlencode("## Expected and actual behavior\n");
-            $bugbaseurl .= urlencode("[*Verbose description*]\n");
-            $bugbaseurl .= urlencode("\n");
-            $bugbaseurl .= urlencode("## Steps to reproduce the behavior\n");
-            $bugbaseurl .= urlencode("[*Verbose description*]\n");
-            $bugbaseurl .= urlencode("\n");
-            $bugbaseurl .= urlencode("## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)\n");
-            $bugbaseurl .= urlencode("[*Files*]\n");
-            $bugbaseurl .= urlencode("\n");
+			$bugbaseurl .= '&body=';
+			$bugbaseurl .= urlencode("# Instructions\n");
+			$bugbaseurl .= urlencode("*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*\n");
+			$bugbaseurl .= urlencode("*Please:*\n");
+			$bugbaseurl .= urlencode("- *replace the bracket enclosed texts with meaningful information*\n");
+			$bugbaseurl .= urlencode("- *remove any unused sub-section*\n");
+			$bugbaseurl .= urlencode("\n");
+			$bugbaseurl .= urlencode("\n");
+			$bugbaseurl .= urlencode("# Bug\n");
+			$bugbaseurl .= urlencode("[*Short description*]\n");
+			$bugbaseurl .= urlencode("\n");
+			$bugbaseurl .= urlencode("## Environment\n");
+			$bugbaseurl .= urlencode("- **Version**: ".DOL_VERSION."\n");
+			$bugbaseurl .= urlencode("- **OS**: ".php_uname('s')."\n");
+			$bugbaseurl .= urlencode("- **Web server**: ".$_SERVER["SERVER_SOFTWARE"]."\n");
+			$bugbaseurl .= urlencode("- **PHP**: ".php_sapi_name().' '.phpversion()."\n");
+			$bugbaseurl .= urlencode("- **Database**: ".$db::LABEL.' '.$db->getVersion()."\n");
+			$bugbaseurl .= urlencode("- **URL(s)**: ".$_SERVER["REQUEST_URI"]."\n");
+			$bugbaseurl .= urlencode("\n");
+			$bugbaseurl .= urlencode("## Expected and actual behavior\n");
+			$bugbaseurl .= urlencode("[*Verbose description*]\n");
+			$bugbaseurl .= urlencode("\n");
+			$bugbaseurl .= urlencode("## Steps to reproduce the behavior\n");
+			$bugbaseurl .= urlencode("[*Verbose description*]\n");
+			$bugbaseurl .= urlencode("\n");
+			$bugbaseurl .= urlencode("## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)\n");
+			$bugbaseurl .= urlencode("[*Files*]\n");
+			$bugbaseurl .= urlencode("\n");
 
 
 			// Execute hook printBugtrackInfo
@@ -2542,37 +2625,37 @@ function main_area($title = '')
 
 	print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
 
-	if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED));
+	if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED), 0, 0, 1, 'warning maintenancemode');
 
-    // Permit to add user company information on each printed document by set SHOW_SOCINFO_ON_PRINT
-    if (!empty($conf->global->SHOW_SOCINFO_ON_PRINT) && GETPOST('optioncss', 'aZ09') == 'print' && empty(GETPOST('disable_show_socinfo_on_print', 'az09')))
-    {
-        global $hookmanager;
-        $hookmanager->initHooks(array('showsocinfoonprint'));
-        $parameters = array();
-        $reshook = $hookmanager->executeHooks('showSocinfoOnPrint', $parameters);
-        if (empty($reshook))
-        {
-            print '<!-- Begin show mysoc info header -->'."\n";
-            print '<div id="mysoc-info-header">'."\n";
-            print '<table class="centpercent div-table-responsive">'."\n";
-            print '<tbody>';
-            print '<tr><td rowspan="0" class="width20p">';
-            if ($conf->global->MAIN_SHOW_LOGO && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && !empty($conf->global->MAIN_INFO_SOCIETE_LOGO)) {
-                print '<img id="mysoc-info-header-logo" style="max-width:100%" alt="" src="'.DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_LOGO)).'">';
-            }
-            print '</td><td  rowspan="0" class="width50p"></td></tr>'."\n";
-            print '<tr><td class="titre bold">'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM).'</td></tr>'."\n";
-            print '<tr><td>'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ADDRESS).'<br>'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ZIP).' '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TOWN).'</td></tr>'."\n";
-            if (!empty($conf->global->MAIN_INFO_SOCIETE_TEL)) print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Phone").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TEL).'</td></tr>';
-            if (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL)) print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Email").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MAIL).'</td></tr>';
-            if (!empty($conf->global->MAIN_INFO_SOCIETE_WEB)) print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Web").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_WEB).'</td></tr>';
-            print '</tbody>';
-            print '</table>'."\n";
-            print '</div>'."\n";
-            print '<!-- End show mysoc info header -->'."\n";
-        }
-    }
+	// Permit to add user company information on each printed document by setting SHOW_SOCINFO_ON_PRINT
+	if (!empty($conf->global->SHOW_SOCINFO_ON_PRINT) && GETPOST('optioncss', 'aZ09') == 'print' && empty(GETPOST('disable_show_socinfo_on_print', 'az09')))
+	{
+		global $hookmanager;
+		$hookmanager->initHooks(array('main'));
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('showSocinfoOnPrint', $parameters);
+		if (empty($reshook))
+		{
+			print '<!-- Begin show mysoc info header -->'."\n";
+			print '<div id="mysoc-info-header">'."\n";
+			print '<table class="centpercent div-table-responsive">'."\n";
+			print '<tbody>';
+			print '<tr><td rowspan="0" class="width20p">';
+			if ($conf->global->MAIN_SHOW_LOGO && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && !empty($conf->global->MAIN_INFO_SOCIETE_LOGO)) {
+				print '<img id="mysoc-info-header-logo" style="max-width:100%" alt="" src="'.DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_LOGO)).'">';
+			}
+			print '</td><td  rowspan="0" class="width50p"></td></tr>'."\n";
+			print '<tr><td class="titre bold">'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM).'</td></tr>'."\n";
+			print '<tr><td>'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ADDRESS).'<br>'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ZIP).' '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TOWN).'</td></tr>'."\n";
+			if (!empty($conf->global->MAIN_INFO_SOCIETE_TEL)) print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Phone").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TEL).'</td></tr>';
+			if (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL)) print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Email").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MAIL).'</td></tr>';
+			if (!empty($conf->global->MAIN_INFO_SOCIETE_WEB)) print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Web").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_WEB).'</td></tr>';
+			print '</tbody>';
+			print '</table>'."\n";
+			print '</div>'."\n";
+			print '<!-- End show mysoc info header -->'."\n";
+		}
+	}
 }
 
 
@@ -2679,6 +2762,7 @@ if (!function_exists("llxFooter"))
 		global $conf, $db, $langs, $user, $mysoc, $object;
 		global $delayedhtmlcontent;
 		global $contextpage, $page, $limit;
+		global $dolibarr_distrib;
 
 		$ext = 'layout='.$conf->browser->layout.'&version='.urlencode(DOL_VERSION);
 
@@ -2839,35 +2923,35 @@ if (!function_exists("llxFooter"))
 			    					  timeout: 500,     // timeout milliseconds
 			    					  cache: false,
 			    					  data: {
-				    					  hash_algo: "md5",
-				    					  hash_unique_id: "<?php echo dol_escape_js($hash_unique_id); ?>",
-				    					  action: "dolibarrping",
-				    					  version: "<?php echo (float) DOL_VERSION; ?>",
-				    					  entity: "<?php echo (int) $conf->entity; ?>",
-				    					  dbtype: "<?php echo dol_escape_js($db->type); ?>",
-				    					  country_code: "<?php echo dol_escape_js($mysoc->country_code); ?>",
-				    					  php_version: "<?php echo phpversion(); ?>",
-				    					  os_version: "<?php echo version_os('smr'); ?>",
-				    					  distrib: "<?php echo $distrib ? $distrib : 'unknown'; ?>"
+				    					  hash_algo: 'md5',
+				    					  hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>',
+				    					  action: 'dolibarrping',
+				    					  version: '<?php echo (float) DOL_VERSION; ?>',
+				    					  entity: '<?php echo (int) $conf->entity; ?>',
+				    					  dbtype: '<?php echo dol_escape_js($db->type); ?>',
+				    					  country_code: '<?php echo $mysoc->country_code ? dol_escape_js($mysoc->country_code) : 'unknown'; ?>',
+				    					  php_version: '<?php echo dol_escape_js(phpversion()); ?>',
+				    					  os_version: '<?php echo dol_escape_js(version_os('smr')); ?>',
+				    					  distrib: '<?php echo $distrib ? dol_escape_js($distrib) : 'unknown'; ?>'
 				    				  },
 			    					  success: function (data, status, xhr) {   // success callback function (data contains body of response)
 			      					    	console.log("Ping ok");
 			        	    				$.ajax({
-			      	    					  method: "GET",
-			      	    					  url: "<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>",
+			      	    					  method: 'GET',
+			      	    					  url: '<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>',
 			      	    					  timeout: 500,     // timeout milliseconds
 			      	    					  cache: false,
-			      	        				  data: { hash_algo: "md5", hash_unique_id: "<?php echo dol_escape_js($hash_unique_id); ?>", action: "firstpingok" },	// to update
+			      	        				  data: { hash_algo: 'md5', hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>', action: 'firstpingok' },	// for update
 			    					  		});
 			    					  },
 			    					  error: function (data,status,xhr) {   // error callback function
 			        					    console.log("Ping ko: " + data);
 			        	    				$.ajax({
-			        	    					  method: "GET",
-			        	    					  url: "<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>",
+			        	    					  method: 'GET',
+			        	    					  url: '<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>',
 			        	    					  timeout: 500,     // timeout milliseconds
 			        	    					  cache: false,
-			        	        				  data: { hash_algo: "md5", hash_unique_id: "<?php echo dol_escape_js($hash_unique_id); ?>", action: "firstpingko" },
+			        	        				  data: { hash_algo: 'md5', hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>', action: 'firstpingko' },
 			      					  		});
 			    					  }
 			    				});
@@ -2887,5 +2971,5 @@ if (!function_exists("llxFooter"))
 
 		print "</body>\n";
 		print "</html>\n";
-    }
+	}
 }
diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php
index cf2cde3e19d..d9c470b7acd 100644
--- a/htdocs/margin/admin/margin.php
+++ b/htdocs/margin/admin/margin.php
@@ -109,7 +109,7 @@ print load_fiche_titre($langs->trans("margesSetup"), $linkback, 'title_setup');
 
 $head = marges_admin_prepare_head();
 
-dol_fiche_head($head, 'parameters', $langs->trans("Margins"), -1, 'margin');
+print dol_get_fiche_head($head, 'parameters', $langs->trans("Margins"), -1, 'margin');
 
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
@@ -249,7 +249,7 @@ print '</form>';
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<br>';
 
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index 7e15b94aede..9c8ff72681b 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -61,15 +61,15 @@ $enddatemonth   = GETPOST('enddatemonth', 'int');
 $enddateyear    = GETPOST('enddateyear', 'int');
 
 if (!empty($startdatemonth))
-    $startdate  = dol_mktime(0, 0, 0, $startdatemonth, $startdateday, $startdateyear);
+	$startdate = dol_mktime(0, 0, 0, $startdatemonth, $startdateday, $startdateyear);
 if (!empty($enddatemonth))
-    $enddate = dol_mktime(23, 59, 59, $enddatemonth, $enddateday, $enddateyear);
+	$enddate = dol_mktime(23, 59, 59, $enddatemonth, $enddateday, $enddateyear);
 
 // Security check
 if ($user->rights->margins->read->all) {
-    $agentid = GETPOST('agentid', 'int');
+	$agentid = GETPOST('agentid', 'int');
 } else {
-    $agentid = $user->id;
+	$agentid = $user->id;
 }
 $result = restrictedArea($user, 'margins');
 
@@ -107,7 +107,7 @@ $picto = 'margin';
 
 print '<form method="post" name="sel" action="'.$_SERVER['PHP_SELF'].'">';
 
-dol_fiche_head($head, 'agentMargins', $titre, 0, $picto);
+print dol_get_fiche_head($head, 'agentMargins', $titre, 0, $picto);
 
 print '<table class="border centpercent">';
 
@@ -130,7 +130,7 @@ print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->t
 print '</td></tr>';
 print "</table>";
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '</form>';
 
@@ -201,9 +201,9 @@ if ($result)
 	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num, $num, '', 0, '', '', 0, 1);
 
 	if ($conf->global->MARGIN_TYPE == "1")
-	    $labelcostprice = 'BuyingPrice';
+		$labelcostprice = 'BuyingPrice';
 	else // value is 'costprice' or 'pmp'
-	    $labelcostprice = 'CostPrice';
+		$labelcostprice = 'CostPrice';
 
 	$moreforfilter = '';
 
@@ -225,82 +225,82 @@ if ($result)
 		print_liste_field_titre("MarkRate", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
 	print "</tr>\n";
 
-    if ($num > 0)
-    {
-        $group_list = array();
-        while ($objp = $db->fetch_object($result)) {
-            if ($agentid > 0) {
-                $group_id = $objp->socid;
-            } else {
-                $group_id = $objp->agent;
-            }
+	if ($num > 0)
+	{
+		$group_list = array();
+		while ($objp = $db->fetch_object($result)) {
+			if ($agentid > 0) {
+				$group_id = $objp->socid;
+			} else {
+				$group_id = $objp->agent;
+			}
 
-            if (!isset($group_list[$group_id])) {
-                if ($agentid > 0) {
-                    $group_name = $objp->name;
-                    $companystatic->id = $objp->socid;
-                    $companystatic->name = $objp->name;
-                    $companystatic->client = $objp->client;
-                    $group_htmlname = $companystatic->getNomUrl(1, 'customer');
-                } else {
-                    $group_name = $objp->lastname;
-                    $userstatic->fetch($objp->agent);
-                    $group_htmlname = $userstatic->getFullName($langs, 0, 0, 0);
-                }
-                $group_list[$group_id] = array('name' => $group_name, 'htmlname' => $group_htmlname, 'selling_price' => 0, 'buying_price' => 0, 'marge' => 0);
-            }
+			if (!isset($group_list[$group_id])) {
+				if ($agentid > 0) {
+					$group_name = $objp->name;
+					$companystatic->id = $objp->socid;
+					$companystatic->name = $objp->name;
+					$companystatic->client = $objp->client;
+					$group_htmlname = $companystatic->getNomUrl(1, 'customer');
+				} else {
+					$group_name = $objp->lastname;
+					$userstatic->fetch($objp->agent);
+					$group_htmlname = $userstatic->getFullName($langs, 0, 0, 0);
+				}
+				$group_list[$group_id] = array('name' => $group_name, 'htmlname' => $group_htmlname, 'selling_price' => 0, 'buying_price' => 0, 'marge' => 0);
+			}
 
-            $seller_nb = 1;
-            if ($objp->socid > 0) {
-                // sql nb sellers
-                $sql_seller  = "SELECT COUNT(sc.rowid) as nb";
-                $sql_seller .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-                $sql_seller .= " WHERE sc.fk_soc = ".$objp->socid;
-                $sql_seller .= " LIMIT 1";
+			$seller_nb = 1;
+			if ($objp->socid > 0) {
+				// sql nb sellers
+				$sql_seller  = "SELECT COUNT(sc.rowid) as nb";
+				$sql_seller .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+				$sql_seller .= " WHERE sc.fk_soc = ".$objp->socid;
+				$sql_seller .= " LIMIT 1";
 
-                $resql_seller = $db->query($sql_seller);
-                if (!$resql_seller) {
-                    dol_print_error($db);
-                } else {
-                    if ($obj_seller = $db->fetch_object($resql_seller)) {
-                        if ($obj_seller->nb > 0) {
-                            $seller_nb = $obj_seller->nb;
-                        }
-                    }
-                }
-            }
+				$resql_seller = $db->query($sql_seller);
+				if (!$resql_seller) {
+					dol_print_error($db);
+				} else {
+					if ($obj_seller = $db->fetch_object($resql_seller)) {
+						if ($obj_seller->nb > 0) {
+							$seller_nb = $obj_seller->nb;
+						}
+					}
+				}
+			}
 
-            $group_list[$group_id]['selling_price'] += $objp->selling_price / $seller_nb;
-            $group_list[$group_id]['buying_price'] += $objp->buying_price / $seller_nb;
-            $group_list[$group_id]['marge'] += $objp->marge / $seller_nb;
-        }
+			$group_list[$group_id]['selling_price'] += $objp->selling_price / $seller_nb;
+			$group_list[$group_id]['buying_price'] += $objp->buying_price / $seller_nb;
+			$group_list[$group_id]['marge'] += $objp->marge / $seller_nb;
+		}
 
-        // sort group array by sortfield
-        if ($sortfield == 'u.lastname' || $sortfield == 's.nom') {
-            $sortfield = 'name';
-        }
-        $group_list = dol_sort_array($group_list, $sortfield, $sortorder);
+		// sort group array by sortfield
+		if ($sortfield == 'u.lastname' || $sortfield == 's.nom') {
+			$sortfield = 'name';
+		}
+		$group_list = dol_sort_array($group_list, $sortfield, $sortorder);
 
-        foreach ($group_list as $group_id => $group_array) {
-            $pa = $group_array['buying_price'];
-            $pv = $group_array['selling_price'];
-            $marge = $group_array['marge'];
+		foreach ($group_list as $group_id => $group_array) {
+			$pa = $group_array['buying_price'];
+			$pv = $group_array['selling_price'];
+			$marge = $group_array['marge'];
 
-            $marginRate = ($pa != 0) ? (100 * $marge / $pa) : '';
-            $markRate = ($pv != 0) ? (100 * $marge / $pv) : '';
+			$marginRate = ($pa != 0) ? (100 * $marge / $pa) : '';
+			$markRate = ($pv != 0) ? (100 * $marge / $pv) : '';
 
-            print '<tr class="oddeven">';
-            print "<td>".$group_array['htmlname']."</td>\n";
-            print "<td class=\"right\">".price(price2num($pv, 'MT'))."</td>\n";
-            print "<td class=\"right\">".price(price2num($pa, 'MT'))."</td>\n";
-            print "<td class=\"right\">".price(price2num($marge, 'MT'))."</td>\n";
-            if (!empty($conf->global->DISPLAY_MARGIN_RATES))
-            	print "<td class=\"right\">".(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")."</td>\n";
-            if (!empty($conf->global->DISPLAY_MARK_RATES))
-            	print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
-            print "</tr>\n";
-        }
-    }
+			print '<tr class="oddeven">';
+			print "<td>".$group_array['htmlname']."</td>\n";
+			print "<td class=\"right\">".price(price2num($pv, 'MT'))."</td>\n";
+			print "<td class=\"right\">".price(price2num($pa, 'MT'))."</td>\n";
+			print "<td class=\"right\">".price(price2num($marge, 'MT'))."</td>\n";
+			if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+				print "<td class=\"right\">".(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")."</td>\n";
+			if (!empty($conf->global->DISPLAY_MARK_RATES))
+				print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
+			print "</tr>\n";
+		}
+	}
 	print "</table>";
 	print '</div>';
 } else {
diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
index 60052294baa..5d019b2693a 100644
--- a/htdocs/margin/checkMargins.php
+++ b/htdocs/margin/checkMargins.php
@@ -63,9 +63,9 @@ $result = restrictedArea($user, 'margins');
 
 // Both test are required to be compatible with all browsers
 if (GETPOST("button_search_x") || GETPOST("button_search")) {
-    $action = 'search';
+	$action = 'search';
 } elseif (GETPOST("button_updatemagins_x") || GETPOST("button_updatemagins")) {
-    $action = 'update';
+	$action = 'update';
 }
 
 
@@ -82,40 +82,40 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    if ($action == 'update') {
-        $datapost = $_POST;
+	if ($action == 'update') {
+		$datapost = $_POST;
 
-        foreach ($datapost as $key => $value) {
-            if (strpos($key, 'buyingprice_') !== false) {
-                $tmp_array = explode('_', $key);
-                if (count($tmp_array) > 0) {
-                    $invoicedet_id = $tmp_array[1];
-                    if (!empty($invoicedet_id)) {
-                        $sql = 'UPDATE '.MAIN_DB_PREFIX.'facturedet';
-                        $sql .= ' SET buy_price_ht=\''.price2num($value).'\'';
-                        $sql .= ' WHERE rowid='.$invoicedet_id;
-                        $result = $db->query($sql);
-                        if (!$result) {
-                            setEventMessages($db->lasterror, null, 'errors');
-                        }
-                    }
-                }
-            }
-        }
-    }
+		foreach ($datapost as $key => $value) {
+			if (strpos($key, 'buyingprice_') !== false) {
+				$tmp_array = explode('_', $key);
+				if (count($tmp_array) > 0) {
+					$invoicedet_id = $tmp_array[1];
+					if (!empty($invoicedet_id)) {
+						$sql = 'UPDATE '.MAIN_DB_PREFIX.'facturedet';
+						$sql .= ' SET buy_price_ht=\''.price2num($value).'\'';
+						$sql .= ' WHERE rowid='.$invoicedet_id;
+						$result = $db->query($sql);
+						if (!$result) {
+							setEventMessages($db->lasterror, null, 'errors');
+						}
+					}
+				}
+			}
+		}
+	}
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $search_ref = '';
-        $search_array_options = array();
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$search_ref = '';
+		$search_array_options = array();
+	}
 
-    // Mass actions
-    /*
+	// Mass actions
+	/*
     $objectclass='Product';
     if ((string) $type == '1') { $objectlabel='Services'; }
     if ((string) $type == '0') { $objectlabel='Products'; }
@@ -158,8 +158,9 @@ $head = marges_prepare_head($user);
 $picto = 'margin';
 
 print '<form method="post" name="sel" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 
-dol_fiche_head($head, $langs->trans('checkMargins'), $title, 0, $picto);
+print dol_get_fiche_head($head, $langs->trans('checkMargins'), $title, 0, $picto);
 
 print '<table class="border centpercent">';
 
@@ -177,7 +178,7 @@ print '</td>';
 print '</tr>';
 print "</table>";
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 $arrayfields = array();
@@ -221,9 +222,9 @@ if ($result) {
 	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
 
 	if ($conf->global->MARGIN_TYPE == "1")
-	    $labelcostprice = 'BuyingPrice';
+		$labelcostprice = 'BuyingPrice';
 	else // value is 'costprice' or 'pmp'
-	    $labelcostprice = 'CostPrice';
+		$labelcostprice = 'CostPrice';
 
 	$moreforfilter = '';
 
@@ -232,8 +233,8 @@ if ($result) {
 	//if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
 	$selectedfields = '';
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre liste_titre_search">';
 	print '<td><input type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
@@ -242,10 +243,10 @@ if ($result) {
 	print '<td></td>';
 	print '<td></td>';
 	print '<td></td>';
-    print '<td class="liste_titre" align="middle">';
-    $searchpitco = $form->showFilterButtons();
-    print $searchpitco;
-    print '</td>';
+	print '<td class="liste_titre" align="middle">';
+	$searchpitco = $form->showFilterButtons();
+	print $searchpitco;
+	print '</td>';
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
@@ -258,10 +259,10 @@ if ($result) {
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 	print "</tr>\n";
 
-    $i = 0;
+	$i = 0;
 	while ($i < min($num, $limit))
 	{
-	    $objp = $db->fetch_object($result);
+		$objp = $db->fetch_object($result);
 
 		print '<tr class="oddeven">';
 		print '<td>';
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index a566c7bd620..0a015f0f73d 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -88,7 +88,7 @@ $picto = 'margin';
 
 print '<form method="post" name="sel" action="'.$_SERVER['PHP_SELF'].'">';
 
-dol_fiche_head($head, 'customerMargins', $titre, 0, $picto);
+print dol_get_fiche_head($head, 'customerMargins', $titre, 0, $picto);
 
 print '<table class="border centpercent">';
 
@@ -125,13 +125,13 @@ if (!$sortfield)
 		$sortfield = "f.datef";
 		$sortorder = "DESC";
 	} else {
-	    $sortfield = "s.nom";
-	    $sortorder = "ASC";
+		$sortfield = "s.nom";
+		$sortorder = "ASC";
 	}
 }
 
 // Products
-$TRes = $form->select_produits_list('', '', '', 20, 0, '', 1, 2, 1, 0, '', 1);
+$TRes = $form->select_produits_list('', '', '', '', 0, '', 1, 2, 1, 0, '', 1);
 
 $TProducts = array();
 foreach ($TRes as $prod) {
@@ -149,7 +149,7 @@ $TCats = $form->select_all_categories(0, array(), '', 64, 0, 1);
 print '<tr>';
 print '<td class="titlefield">'.$langs->trans('ChooseCategory').'</td>';
 print '<td class="maxwidthonsmartphone" colspan="4">';
-print $form->multiselectarray('categories', $TCats, $TSelectedCats, 0, 0, 'minwidth500');
+print img_picto('', 'category').$form->multiselectarray('categories', $TCats, $TSelectedCats, 0, 0, 'quatrevingtpercent widthcentpercentminusx');
 print '</td>';
 print '</tr>';
 
@@ -193,7 +193,7 @@ if (!empty($conf->global->DISPLAY_MARK_RATES)) {
 
 print "</table>";
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '</form>';
 
@@ -251,9 +251,9 @@ if ($result)
 	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num, $num, '', 0, '', '', 0, 1);
 
 	if ($conf->global->MARGIN_TYPE == "1")
-	    $labelcostprice = 'BuyingPrice';
+		$labelcostprice = 'BuyingPrice';
 	else // value is 'costprice' or 'pmp'
-	    $labelcostprice = 'CostPrice';
+		$labelcostprice = 'CostPrice';
 
 	$moreforfilter = '';
 
@@ -299,7 +299,7 @@ if ($result)
 
 			print '<tr class="oddeven">';
 			if ($client) {
-		        print '<td>';
+				print '<td>';
 				$invoicestatic->id = $objp->facid;
 				$invoicestatic->ref = $objp->ref;
 				print $invoicestatic->getNomUrl(1);
@@ -344,7 +344,7 @@ if ($result)
 
 	print '<tr class="liste_total">';
 	if ($client)
-	    print '<td colspan=2>';
+		print '<td colspan=2>';
   	else print '<td>';
   	print $langs->trans('TotalMargin')."</td>";
 	print "<td class=\"right\">".price($cumul_vente, null, null, null, null, $rounding)."</td>\n";
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index e390be68068..46f128b2f36 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -63,8 +63,8 @@ if (!$sortfield)
 		$sortfield = "f.datef";
 		$sortorder = "DESC";
 	} else {
-	    $sortfield = "p.ref";
-	    $sortorder = "ASC";
+		$sortfield = "p.ref";
+		$sortorder = "ASC";
 	}
 }
 
@@ -100,18 +100,18 @@ $picto = 'margin';
 
 print '<form method="post" name="sel" action="'.$_SERVER['PHP_SELF'].'">';
 
-dol_fiche_head($head, 'productMargins', $titre, 0, $picto);
+print dol_get_fiche_head($head, 'productMargins', $titre, 0, $picto);
 
 print '<table class="border centpercent">';
 
 if ($id > 0) {
-    print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
-    print '<td class="maxwidthonsmartpone" colspan="4">';
-    $form->select_produits($id, 'id', '', 20, 0, 1, 2, '', 1, array(), 0, 'All');
-    print '</td></tr>';
+	print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
+	print '<td class="maxwidthonsmartpone" colspan="4">';
+	$form->select_produits($id, 'id', '', 20, 0, 1, 2, '', 1, array(), 0, 'All');
+	print '</td></tr>';
 
-    if (!$sortorder) $sortorder = "DESC";
-    if (!$sortfield) $sortfield = "f.datef";
+	if (!$sortorder) $sortorder = "DESC";
+	if (!$sortfield) $sortfield = "f.datef";
 } else {
 	print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
 	print '<td class="maxwidthonsmartphone" colspan="4">';
@@ -125,7 +125,7 @@ $TCats = $form->select_all_categories(0, array(), '', 64, 0, 1);
 print '<tr>';
 print '<td class="titlefield">'.$langs->trans('ChooseCategory').'</td>';
 print '<td class="maxwidthonsmartphone" colspan="4">';
-print $form->multiselectarray('categories', $TCats, $TSelectedCats, 0, 0, 'minwidth500');
+print img_picto('', 'category').$form->multiselectarray('categories', $TCats, $TSelectedCats, 0, 0, 'quatrevingtpercent widthcentpercentminusx');
 print '</td>';
 print '</tr>';
 
@@ -170,7 +170,7 @@ if (!empty($conf->global->DISPLAY_MARK_RATES)) {
 
 print "</table>";
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '</form>';
 
@@ -224,15 +224,15 @@ if ($result)
 
 	//var_dump($conf->global->MARGIN_TYPE);
 	if ($conf->global->MARGIN_TYPE == "1")
-	    $labelcostprice = 'BuyingPrice';
+		$labelcostprice = 'BuyingPrice';
 	else // value is 'costprice' or 'pmp'
-	    $labelcostprice = 'CostPrice';
+		$labelcostprice = 'CostPrice';
 
 	$moreforfilter = '';
 
 	$i = 0;
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre">';
 	if ($id > 0) {
@@ -287,15 +287,15 @@ if ($result)
 				print '<td>';
 				if ($objp->rowid > 0)
 				{
-    				$product_static->type = $objp->fk_product_type;
-    				$product_static->id = $objp->rowid;
-    				$product_static->ref = $objp->ref;
-    				$product_static->label = $objp->label;
-    				$product_static->entity = $objp->pentity;
-    				$text = $product_static->getNomUrl(1);
-    				print $text .= ' - '.$objp->label;
+					$product_static->type = $objp->fk_product_type;
+					$product_static->id = $objp->rowid;
+					$product_static->ref = $objp->ref;
+					$product_static->label = $objp->label;
+					$product_static->entity = $objp->pentity;
+					$text = $product_static->getNomUrl(1);
+					print $text .= ' - '.$objp->label;
 				} else {
-				    print img_object('', 'product').' '.$langs->trans("NotPredefinedProducts");
+					print img_object('', 'product').' '.$langs->trans("NotPredefinedProducts");
 				}
 				print "</td>\n";
 				//print "<td>".$product_static->getNomUrl(1)."</td>\n";
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index d5069249cbe..5fcec11c93b 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -64,9 +64,9 @@ $form = new Form($db);
 
 if ($id > 0 || !empty($ref))
 {
-    $result = $object->fetch($id, $ref);
+	$result = $object->fetch($id, $ref);
 
-    $title = $langs->trans('ProductServiceCard');
+	$title = $langs->trans('ProductServiceCard');
 	$helpurl = '';
 	$shortlabel = dol_trunc($object->label, 16);
 	if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT))
@@ -90,17 +90,17 @@ if ($id > 0 || !empty($ref))
 		$head = product_prepare_head($object);
 		$titre = $langs->trans("CardProduct".$object->type);
 		$picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
-		dol_fiche_head($head, 'margin', $titre, -1, $picto);
+		print dol_get_fiche_head($head, 'margin', $titre, -1, $picto);
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref');
+		dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref');
 
 
-        print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
 
 		// Total Margin
 		print '<tr><td class="titlefield">'.$langs->trans("TotalMargin").'</td><td colspan="3">';
@@ -123,86 +123,86 @@ if ($id > 0 || !empty($ref))
 
 		print "</table>";
 
-        print '</div>';
-        print '<div style="clear:both"></div>';
+		print '</div>';
+		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
-        if ($user->rights->facture->lire) {
-            $sql = "SELECT s.nom as name, s.rowid as socid, s.code_client,";
-            $sql .= " f.rowid as facid, f.ref, f.total as total_ht,";
-            $sql .= " f.datef, f.paye, f.fk_statut as statut, f.type,";
-            if (!$user->rights->societe->client->voir && !$socid) $sql .= " sc.fk_soc, sc.fk_user,";
-            $sql .= " sum(d.total_ht) as selling_price,"; // may be negative or positive
-            $sql .= " ".$db->ifsql('f.type = 2', -1, 1)." * sum(d.qty) as qty,"; // not always positive in case of Credit note
-            $sql .= " ".$db->ifsql('f.type = 2', -1, 1)." * sum(d.qty * d.buy_price_ht * (d.situation_percent / 100)) as buying_price,"; // not always positive in case of Credit note
-            $sql .= " ".$db->ifsql('f.type = 2', -1, 1)." * sum(abs(d.total_ht) - (d.buy_price_ht * d.qty * (d.situation_percent / 100))) as marge"; // not always positive in case of Credit note
-            $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-            $sql .= ", ".MAIN_DB_PREFIX."facture as f";
-            $sql .= ", ".MAIN_DB_PREFIX."facturedet as d";
-            if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql .= " WHERE f.fk_soc = s.rowid";
-            $sql .= " AND f.fk_statut > 0";
-            $sql .= " AND f.entity IN (".getEntity('invoice').")";
-            $sql .= " AND d.fk_facture = f.rowid";
-            $sql .= " AND d.fk_product =".$object->id;
-            if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-            if (!empty($socid)) $sql .= " AND f.fk_soc = $socid";
-            $sql .= " AND d.buy_price_ht IS NOT NULL";
-            if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) $sql .= " AND d.buy_price_ht <> 0";
-            $sql .= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.ref, f.total, f.datef, f.paye, f.fk_statut, f.type";
-            if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-            $sql .= $db->order($sortfield, $sortorder);
-            // TODO: calculate total to display then restore pagination
-            //$sql.= $db->plimit($conf->liste_limit +1, $offset);
-            dol_syslog('margin:tabs:productMargins.php', LOG_DEBUG);
-            $result = $db->query($sql);
-            if ($result) {
-                $num = $db->num_rows($result);
+		if ($user->rights->facture->lire) {
+			$sql = "SELECT s.nom as name, s.rowid as socid, s.code_client,";
+			$sql .= " f.rowid as facid, f.ref, f.total as total_ht,";
+			$sql .= " f.datef, f.paye, f.fk_statut as statut, f.type,";
+			if (!$user->rights->societe->client->voir && !$socid) $sql .= " sc.fk_soc, sc.fk_user,";
+			$sql .= " sum(d.total_ht) as selling_price,"; // may be negative or positive
+			$sql .= " ".$db->ifsql('f.type = 2', -1, 1)." * sum(d.qty) as qty,"; // not always positive in case of Credit note
+			$sql .= " ".$db->ifsql('f.type = 2', -1, 1)." * sum(d.qty * d.buy_price_ht * (d.situation_percent / 100)) as buying_price,"; // not always positive in case of Credit note
+			$sql .= " ".$db->ifsql('f.type = 2', -1, 1)." * sum(abs(d.total_ht) - (d.buy_price_ht * d.qty * (d.situation_percent / 100))) as marge"; // not always positive in case of Credit note
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			$sql .= ", ".MAIN_DB_PREFIX."facture as f";
+			$sql .= ", ".MAIN_DB_PREFIX."facturedet as d";
+			if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE f.fk_soc = s.rowid";
+			$sql .= " AND f.fk_statut > 0";
+			$sql .= " AND f.entity IN (".getEntity('invoice').")";
+			$sql .= " AND d.fk_facture = f.rowid";
+			$sql .= " AND d.fk_product =".$object->id;
+			if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if (!empty($socid)) $sql .= " AND f.fk_soc = $socid";
+			$sql .= " AND d.buy_price_ht IS NOT NULL";
+			if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) $sql .= " AND d.buy_price_ht <> 0";
+			$sql .= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.ref, f.total, f.datef, f.paye, f.fk_statut, f.type";
+			if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
+			$sql .= $db->order($sortfield, $sortorder);
+			// TODO: calculate total to display then restore pagination
+			//$sql.= $db->plimit($conf->liste_limit +1, $offset);
+			dol_syslog('margin:tabs:productMargins.php', LOG_DEBUG);
+			$result = $db->query($sql);
+			if ($result) {
+				$num = $db->num_rows($result);
 
-                print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "&amp;id=$object->id", $sortfield, $sortorder, '', 0, 0, '');
+				print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "&amp;id=$object->id", $sortfield, $sortorder, '', 0, 0, '');
 
-                $i = 0;
+				$i = 0;
 
-                print '<div class="div-table-responsive">';
-                print '<table class="noborder centpercent">';
+				print '<div class="div-table-responsive">';
+				print '<table class="noborder centpercent">';
 
-                print '<tr class="liste_titre">';
-                print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", "&amp;id=".$object->id, '', $sortfield, $sortorder);
-                print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", "", "&amp;id=".$object->id, '', $sortfield, $sortorder);
-                print_liste_field_titre("CustomerCode", $_SERVER["PHP_SELF"], "s.code_client", "", "&amp;id=".$object->id, '', $sortfield, $sortorder);
-                print_liste_field_titre("DateInvoice", $_SERVER["PHP_SELF"], "f.datef", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'left ');
-                print_liste_field_titre("SellingPrice", $_SERVER["PHP_SELF"], "selling_price", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
-                print_liste_field_titre("BuyingPrice", $_SERVER["PHP_SELF"], "buying_price", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
-                print_liste_field_titre("Qty", $_SERVER["PHP_SELF"], "d.qty", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
-                print_liste_field_titre("Margin", $_SERVER["PHP_SELF"], "marge", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
-                if (!empty($conf->global->DISPLAY_MARGIN_RATES))
-                    print_liste_field_titre("MarginRate", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
-                if (!empty($conf->global->DISPLAY_MARK_RATES))
-                    print_liste_field_titre("MarkRate", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
-                print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "f.paye,f.fk_statut", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
-                print "</tr>\n";
+				print '<tr class="liste_titre">';
+				print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", "&amp;id=".$object->id, '', $sortfield, $sortorder);
+				print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", "", "&amp;id=".$object->id, '', $sortfield, $sortorder);
+				print_liste_field_titre("CustomerCode", $_SERVER["PHP_SELF"], "s.code_client", "", "&amp;id=".$object->id, '', $sortfield, $sortorder);
+				print_liste_field_titre("DateInvoice", $_SERVER["PHP_SELF"], "f.datef", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'left ');
+				print_liste_field_titre("SellingPrice", $_SERVER["PHP_SELF"], "selling_price", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
+				print_liste_field_titre("BuyingPrice", $_SERVER["PHP_SELF"], "buying_price", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
+				print_liste_field_titre("Qty", $_SERVER["PHP_SELF"], "d.qty", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
+				print_liste_field_titre("Margin", $_SERVER["PHP_SELF"], "marge", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
+				if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+					print_liste_field_titre("MarginRate", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
+				if (!empty($conf->global->DISPLAY_MARK_RATES))
+					print_liste_field_titre("MarkRate", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
+				print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "f.paye,f.fk_statut", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
+				print "</tr>\n";
 
-                $cumul_achat = 0;
-                $cumul_vente = 0;
-                $cumul_qty = 0;
+				$cumul_achat = 0;
+				$cumul_vente = 0;
+				$cumul_qty = 0;
 
-                if ($num > 0) {
-                    while ($i < $num /*&& $i < $conf->liste_limit*/) {
-                        $objp = $db->fetch_object($result);
+				if ($num > 0) {
+					while ($i < $num /*&& $i < $conf->liste_limit*/) {
+						$objp = $db->fetch_object($result);
 
 						$marginRate = ($objp->buying_price != 0) ? (100 * $objp->marge / $objp->buying_price) : '';
 						$markRate = ($objp->selling_price != 0) ? (100 * $objp->marge / $objp->selling_price) : '';
 
-                        print '<tr class="oddeven">';
-                        print '<td>';
-                        $invoicestatic->id = $objp->facid;
-                        $invoicestatic->ref = $objp->ref;
-                        print $invoicestatic->getNomUrl(1);
-                        print "</td>\n";
-                        print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"), "company").' '.dol_trunc($objp->name, 44).'</a></td>';
-                        print "<td>".$objp->code_client."</td>\n";
+						print '<tr class="oddeven">';
+						print '<td>';
+						$invoicestatic->id = $objp->facid;
+						$invoicestatic->ref = $objp->ref;
+						print $invoicestatic->getNomUrl(1);
+						print "</td>\n";
+						print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"), "company").' '.dol_trunc($objp->name, 44).'</a></td>';
+						print "<td>".$objp->code_client."</td>\n";
 						print "<td class=\"center\">";
 						print dol_print_date($db->jdate($objp->datef), 'day')."</td>";
 						print "<td class=\"right\">".price(price2num($objp->selling_price, 'MT'))."</td>\n";
@@ -214,47 +214,47 @@ if ($id > 0 || !empty($ref))
 						if (!empty($conf->global->DISPLAY_MARK_RATES))
 							print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
 						print '<td class="right">'.$invoicestatic->LibStatut($objp->paye, $objp->statut, 5).'</td>';
-                        print "</tr>\n";
-                        $i++;
-                        $cumul_achat += $objp->buying_price;
-                        $cumul_vente += $objp->selling_price;
-                        $cumul_qty += $objp->qty;
-                    }
-                }
+						print "</tr>\n";
+						$i++;
+						$cumul_achat += $objp->buying_price;
+						$cumul_vente += $objp->selling_price;
+						$cumul_qty += $objp->qty;
+					}
+				}
 
-                // affichage totaux marges
+				// affichage totaux marges
 
-                $totalMargin = $cumul_vente - $cumul_achat;
-                if ($totalMargin < 0)
-                {
-                    $marginRate = ($cumul_achat != 0) ?-1 * (100 * $totalMargin / $cumul_achat) : '';
-                    $markRate = ($cumul_vente != 0) ?-1 * (100 * $totalMargin / $cumul_vente) : '';
-                } else {
-                    $marginRate = ($cumul_achat != 0) ? (100 * $totalMargin / $cumul_achat) : '';
-                    $markRate = ($cumul_vente != 0) ? (100 * $totalMargin / $cumul_vente) : '';
-                }
-                print '<tr class="liste_total">';
-                print '<td colspan=4>'.$langs->trans('TotalMargin')."</td>";
-                print '<td class="right">'.price(price2num($cumul_vente, 'MT'))."</td>\n";
-                print '<td class="right">'.price(price2num($cumul_achat, 'MT'))."</td>\n";
-                print '<td class="right">'.price(price2num($cumul_qty, 'MT'))."</td>\n";
-                print '<td class="right">'.price(price2num($totalMargin, 'MT'))."</td>\n";
-                if (!empty($conf->global->DISPLAY_MARGIN_RATES))
-                	print '<td class="right">'.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")."</td>\n";
-                if (!empty($conf->global->DISPLAY_MARK_RATES))
-                	print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
-                print '<td class="right">&nbsp;</td>';
-                print "</tr>\n";
-                print "</table>";
-                print '</div>';
-            } else {
-                dol_print_error($db);
-            }
-            $db->free($result);
-        }
-    }
+				$totalMargin = $cumul_vente - $cumul_achat;
+				if ($totalMargin < 0)
+				{
+					$marginRate = ($cumul_achat != 0) ?-1 * (100 * $totalMargin / $cumul_achat) : '';
+					$markRate = ($cumul_vente != 0) ?-1 * (100 * $totalMargin / $cumul_vente) : '';
+				} else {
+					$marginRate = ($cumul_achat != 0) ? (100 * $totalMargin / $cumul_achat) : '';
+					$markRate = ($cumul_vente != 0) ? (100 * $totalMargin / $cumul_vente) : '';
+				}
+				print '<tr class="liste_total">';
+				print '<td colspan=4>'.$langs->trans('TotalMargin')."</td>";
+				print '<td class="right">'.price(price2num($cumul_vente, 'MT'))."</td>\n";
+				print '<td class="right">'.price(price2num($cumul_achat, 'MT'))."</td>\n";
+				print '<td class="right">'.price(price2num($cumul_qty, 'MT'))."</td>\n";
+				print '<td class="right">'.price(price2num($totalMargin, 'MT'))."</td>\n";
+				if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+					print '<td class="right">'.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")."</td>\n";
+				if (!empty($conf->global->DISPLAY_MARK_RATES))
+					print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
+				print '<td class="right">&nbsp;</td>';
+				print "</tr>\n";
+				print "</table>";
+				print '</div>';
+			} else {
+				dol_print_error($db);
+			}
+			$db->free($result);
+		}
+	}
 } else {
-    dol_print_error();
+	dol_print_error();
 }
 
 print '
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index c9711bd99ef..683bc433c29 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -76,190 +76,190 @@ llxHeader('', $title, $help_url);
 
 if ($socid > 0)
 {
-    $object = new Societe($db);
-    $object->fetch($socid);
+	$object = new Societe($db);
+	$object->fetch($socid);
 
-    /*
+	/*
      * Affichage onglets
      */
 
-    $head = societe_prepare_head($object);
+	$head = societe_prepare_head($object);
 
-    dol_fiche_head($head, 'margin', $langs->trans("ThirdParty"), -1, 'company');
+	print dol_get_fiche_head($head, 'margin', $langs->trans("ThirdParty"), -1, 'company');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
+	dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
-    print '<table class="border tableforfield" width="100%">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border tableforfield" width="100%">';
 
-    if ($object->client)
-    {
-        print '<tr><td class="titlefield">';
-        print $langs->trans('CustomerCode').'</td><td colspan="3">';
-        print $object->code_client;
-        if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-        print '</td></tr>';
-    }
+	if ($object->client)
+	{
+		print '<tr><td class="titlefield">';
+		print $langs->trans('CustomerCode').'</td><td colspan="3">';
+		print $object->code_client;
+		if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		print '</td></tr>';
+	}
 
-    if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || ! empty($conf->supplier_order->enabled) || ! empty($conf->supplier_invoice->enabled)) && $object->fournisseur && !empty($user->rights->fournisseur->lire))
-    {
-        print '<tr><td class="titlefield">';
-        print $langs->trans('SupplierCode').'</td><td colspan="3">';
-        print $object->code_fournisseur;
-        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-        print '</td></tr>';
-    }
+	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $object->fournisseur && !empty($user->rights->fournisseur->lire))
+	{
+		print '<tr><td class="titlefield">';
+		print $langs->trans('SupplierCode').'</td><td colspan="3">';
+		print $object->code_fournisseur;
+		if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		print '</td></tr>';
+	}
 
-    // Total Margin
-    print '<tr><td class="titlefield">'.$langs->trans("TotalMargin").'</td><td colspan="3">';
-    print '<span id="totalMargin"></span>'; // set by jquery (see below)
-    print '</td></tr>';
+	// Total Margin
+	print '<tr><td class="titlefield">'.$langs->trans("TotalMargin").'</td><td colspan="3">';
+	print '<span id="totalMargin"></span>'; // set by jquery (see below)
+	print '</td></tr>';
 
-    // Margin Rate
-    if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
-    	print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="3">';
-    	print '<span id="marginRate"></span>'; // set by jquery (see below)
-    	print '</td></tr>';
-    }
+	// Margin Rate
+	if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+		print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="3">';
+		print '<span id="marginRate"></span>'; // set by jquery (see below)
+		print '</td></tr>';
+	}
 
-    // Mark Rate
-    if (!empty($conf->global->DISPLAY_MARK_RATES)) {
-    	print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="3">';
-    	print '<span id="markRate"></span>'; // set by jquery (see below)
-    	print '</td></tr>';
-    }
+	// Mark Rate
+	if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+		print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="3">';
+		print '<span id="markRate"></span>'; // set by jquery (see below)
+		print '</td></tr>';
+	}
 
-    print "</table>";
+	print "</table>";
 
-    print '</div>';
-    print '<div style="clear:both"></div>';
+	print '</div>';
+	print '<div style="clear:both"></div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '<br>';
+	print '<br>';
 
-    $sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client,";
-    $sql .= " f.rowid as facid, f.ref, f.total as total_ht,";
-    $sql .= " f.datef, f.paye, f.fk_statut as statut, f.type,";
-    $sql .= " sum(d.total_ht) as selling_price,"; // may be negative or positive
-    $sql .= " sum(d.qty * d.buy_price_ht * (d.situation_percent / 100)) as buying_price,"; // always positive
-    $sql .= " sum(abs(d.total_ht) - (d.buy_price_ht * d.qty * (d.situation_percent / 100))) as marge"; // always positive
-    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-    $sql .= ", ".MAIN_DB_PREFIX."facture as f";
-    $sql .= ", ".MAIN_DB_PREFIX."facturedet as d";
-    $sql .= " WHERE f.fk_soc = s.rowid";
-    $sql .= " AND f.fk_statut > 0";
-    $sql .= " AND f.entity IN (".getEntity('invoice').")";
-    $sql .= " AND d.fk_facture = f.rowid";
-    $sql .= " AND f.fk_soc = $socid";
-    $sql .= " AND d.buy_price_ht IS NOT NULL";
-    if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) $sql .= " AND d.buy_price_ht <> 0";
-    $sql .= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.ref, f.total, f.datef, f.paye, f.fk_statut, f.type";
-    $sql .= $db->order($sortfield, $sortorder);
-    // TODO: calculate total to display then restore pagination
-    //$sql.= $db->plimit($conf->liste_limit +1, $offset);
+	$sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client,";
+	$sql .= " f.rowid as facid, f.ref, f.total as total_ht,";
+	$sql .= " f.datef, f.paye, f.fk_statut as statut, f.type,";
+	$sql .= " sum(d.total_ht) as selling_price,"; // may be negative or positive
+	$sql .= " sum(d.qty * d.buy_price_ht * (d.situation_percent / 100)) as buying_price,"; // always positive
+	$sql .= " sum(abs(d.total_ht) - (d.buy_price_ht * d.qty * (d.situation_percent / 100))) as marge"; // always positive
+	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+	$sql .= ", ".MAIN_DB_PREFIX."facture as f";
+	$sql .= ", ".MAIN_DB_PREFIX."facturedet as d";
+	$sql .= " WHERE f.fk_soc = s.rowid";
+	$sql .= " AND f.fk_statut > 0";
+	$sql .= " AND f.entity IN (".getEntity('invoice').")";
+	$sql .= " AND d.fk_facture = f.rowid";
+	$sql .= " AND f.fk_soc = $socid";
+	$sql .= " AND d.buy_price_ht IS NOT NULL";
+	if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) $sql .= " AND d.buy_price_ht <> 0";
+	$sql .= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.ref, f.total, f.datef, f.paye, f.fk_statut, f.type";
+	$sql .= $db->order($sortfield, $sortorder);
+	// TODO: calculate total to display then restore pagination
+	//$sql.= $db->plimit($conf->liste_limit +1, $offset);
 
-    dol_syslog('margin:tabs:thirdpartyMargins.php', LOG_DEBUG);
-    $result = $db->query($sql);
-    if ($result)
-    {
-    	$num = $db->num_rows($result);
+	dol_syslog('margin:tabs:thirdpartyMargins.php', LOG_DEBUG);
+	$result = $db->query($sql);
+	if ($result)
+	{
+		$num = $db->num_rows($result);
 
-    	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "&amp;socid=".$object->id, $sortfield, $sortorder, '', $num, $num, '');
+		print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "&amp;socid=".$object->id, $sortfield, $sortorder, '', $num, $num, '');
 
-    	$i = 0;
-    	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-    	print "<table class=\"noborder\" width=\"100%\">";
+		$i = 0;
+		print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+		print "<table class=\"noborder\" width=\"100%\">";
 
-    	print '<tr class="liste_titre">';
-    	print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder);
-    	print_liste_field_titre("DateInvoice", $_SERVER["PHP_SELF"], "f.datef", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'center ');
-    	print_liste_field_titre("SoldAmount", $_SERVER["PHP_SELF"], "selling_price", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
-    	print_liste_field_titre("PurchasedAmount", $_SERVER["PHP_SELF"], "buying_price", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
-    	print_liste_field_titre("Margin", $_SERVER["PHP_SELF"], "marge", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
-    	if (!empty($conf->global->DISPLAY_MARGIN_RATES))
-    		print_liste_field_titre("MarginRate", $_SERVER["PHP_SELF"], "", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
-    	if (!empty($conf->global->DISPLAY_MARK_RATES))
-    		print_liste_field_titre("MarkRate", $_SERVER["PHP_SELF"], "", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
-    	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "f.paye,f.fk_statut", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
-    	print "</tr>\n";
+		print '<tr class="liste_titre">';
+		print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder);
+		print_liste_field_titre("DateInvoice", $_SERVER["PHP_SELF"], "f.datef", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'center ');
+		print_liste_field_titre("SoldAmount", $_SERVER["PHP_SELF"], "selling_price", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
+		print_liste_field_titre("PurchasedAmount", $_SERVER["PHP_SELF"], "buying_price", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
+		print_liste_field_titre("Margin", $_SERVER["PHP_SELF"], "marge", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
+		if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+			print_liste_field_titre("MarginRate", $_SERVER["PHP_SELF"], "", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
+		if (!empty($conf->global->DISPLAY_MARK_RATES))
+			print_liste_field_titre("MarkRate", $_SERVER["PHP_SELF"], "", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
+		print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "f.paye,f.fk_statut", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
+		print "</tr>\n";
 
-    	$cumul_achat = 0;
-    	$cumul_vente = 0;
+		$cumul_achat = 0;
+		$cumul_vente = 0;
 
-    	if ($num > 0)
-    	{
-    		while ($i < $num /*&& $i < $conf->liste_limit*/)
-    		{
-    			$objp = $db->fetch_object($result);
+		if ($num > 0)
+		{
+			while ($i < $num /*&& $i < $conf->liste_limit*/)
+			{
+				$objp = $db->fetch_object($result);
 
-    			$marginRate = ($objp->buying_price != 0) ? (100 * $objp->marge / $objp->buying_price) : '';
-    			$markRate = ($objp->selling_price != 0) ? (100 * $objp->marge / $objp->selling_price) : '';
+				$marginRate = ($objp->buying_price != 0) ? (100 * $objp->marge / $objp->buying_price) : '';
+				$markRate = ($objp->selling_price != 0) ? (100 * $objp->marge / $objp->selling_price) : '';
 
-    			$sign = '';
-    			if ($objp->type == Facture::TYPE_CREDIT_NOTE) {
-    			    $sign = '-';
-    			}
+				$sign = '';
+				if ($objp->type == Facture::TYPE_CREDIT_NOTE) {
+					$sign = '-';
+				}
 
-    			print '<tr class="oddeven">';
-    			print '<td>';
-    			$invoicestatic->id = $objp->facid;
-    			$invoicestatic->ref = $objp->ref;
-    			print $invoicestatic->getNomUrl(1);
-    			print "</td>\n";
-    			print "<td class=\"center\">";
-    			print dol_print_date($db->jdate($objp->datef), 'day')."</td>";
-    			print "<td class=\"right\">".price(price2num($objp->selling_price, 'MT'))."</td>\n";
-    			print "<td class=\"right\">".price(price2num(($objp->type == 2 ? -1 : 1) * $objp->buying_price, 'MT'))."</td>\n";
-    			print "<td class=\"right\">".$sign.price(price2num($objp->marge, 'MT'))."</td>\n";
-    			if (!empty($conf->global->DISPLAY_MARGIN_RATES))
-    				print "<td class=\"right\">".(($marginRate === '') ? 'n/a' : $sign.price(price2num($marginRate, 'MT'))."%")."</td>\n";
-    			if (!empty($conf->global->DISPLAY_MARK_RATES))
-    				print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
-    			print '<td class="right">'.$invoicestatic->LibStatut($objp->paye, $objp->statut, 5).'</td>';
-    			print "</tr>\n";
-    			$i++;
-    			$cumul_vente += $objp->selling_price;
-    			$cumul_achat += ($objp->type == 2 ? -1 : 1) * $objp->buying_price;
-    		}
-    	}
+				print '<tr class="oddeven">';
+				print '<td>';
+				$invoicestatic->id = $objp->facid;
+				$invoicestatic->ref = $objp->ref;
+				print $invoicestatic->getNomUrl(1);
+				print "</td>\n";
+				print "<td class=\"center\">";
+				print dol_print_date($db->jdate($objp->datef), 'day')."</td>";
+				print "<td class=\"right\">".price(price2num($objp->selling_price, 'MT'))."</td>\n";
+				print "<td class=\"right\">".price(price2num(($objp->type == 2 ? -1 : 1) * $objp->buying_price, 'MT'))."</td>\n";
+				print "<td class=\"right\">".$sign.price(price2num($objp->marge, 'MT'))."</td>\n";
+				if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+					print "<td class=\"right\">".(($marginRate === '') ? 'n/a' : $sign.price(price2num($marginRate, 'MT'))."%")."</td>\n";
+				if (!empty($conf->global->DISPLAY_MARK_RATES))
+					print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
+				print '<td class="right">'.$invoicestatic->LibStatut($objp->paye, $objp->statut, 5).'</td>';
+				print "</tr>\n";
+				$i++;
+				$cumul_vente += $objp->selling_price;
+				$cumul_achat += ($objp->type == 2 ? -1 : 1) * $objp->buying_price;
+			}
+		}
 
-    	// affichage totaux marges
+		// affichage totaux marges
 
-    	$totalMargin = $cumul_vente - $cumul_achat;
-    	if ($totalMargin < 0)
-    	{
-    		$marginRate = ($cumul_achat != 0) ?-1 * (100 * $totalMargin / $cumul_achat) : '';
-    		$markRate = ($cumul_vente != 0) ?-1 * (100 * $totalMargin / $cumul_vente) : '';
-    	} else {
-    		$marginRate = ($cumul_achat != 0) ? (100 * $totalMargin / $cumul_achat) : '';
-    		$markRate = ($cumul_vente != 0) ? (100 * $totalMargin / $cumul_vente) : '';
-    	}
+		$totalMargin = $cumul_vente - $cumul_achat;
+		if ($totalMargin < 0)
+		{
+			$marginRate = ($cumul_achat != 0) ?-1 * (100 * $totalMargin / $cumul_achat) : '';
+			$markRate = ($cumul_vente != 0) ?-1 * (100 * $totalMargin / $cumul_vente) : '';
+		} else {
+			$marginRate = ($cumul_achat != 0) ? (100 * $totalMargin / $cumul_achat) : '';
+			$markRate = ($cumul_vente != 0) ? (100 * $totalMargin / $cumul_vente) : '';
+		}
 
-    	// Total
-    	print '<tr class="liste_total">';
-    	print '<td colspan=2>'.$langs->trans('TotalMargin')."</td>";
-    	print "<td class=\"right\">".price(price2num($cumul_vente, 'MT'))."</td>\n";
-    	print "<td class=\"right\">".price(price2num($cumul_achat, 'MT'))."</td>\n";
-    	print "<td class=\"right\">".price(price2num($totalMargin, 'MT'))."</td>\n";
-    	if (!empty($conf->global->DISPLAY_MARGIN_RATES))
-    		print "<td class=\"right\">".(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")."</td>\n";
-    	if (!empty($conf->global->DISPLAY_MARK_RATES))
-    		print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
-    	print '<td class="right">&nbsp;</td>';
-    	print "</tr>\n";
-    } else {
-    	dol_print_error($db);
-    }
-    print "</table>";
-    print '</div>';
+		// Total
+		print '<tr class="liste_total">';
+		print '<td colspan=2>'.$langs->trans('TotalMargin')."</td>";
+		print "<td class=\"right\">".price(price2num($cumul_vente, 'MT'))."</td>\n";
+		print "<td class=\"right\">".price(price2num($cumul_achat, 'MT'))."</td>\n";
+		print "<td class=\"right\">".price(price2num($totalMargin, 'MT'))."</td>\n";
+		if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+			print "<td class=\"right\">".(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")."</td>\n";
+		if (!empty($conf->global->DISPLAY_MARK_RATES))
+			print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
+		print '<td class="right">&nbsp;</td>';
+		print "</tr>\n";
+	} else {
+		dol_print_error($db);
+	}
+	print "</table>";
+	print '</div>';
 
-    print '<br>';
-    $db->free($result);
+	print '<br>';
+	$db->free($result);
 } else {
 	dol_print_error('', 'Parameter socid not defined');
 }
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 4f56652b3da..9efff08306f 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -49,7 +49,7 @@ $conf->db->host							= $dolibarr_main_db_host;
 $conf->db->port							= $dolibarr_main_db_port;
 $conf->db->name							= $dolibarr_main_db_name;
 $conf->db->user							= $dolibarr_main_db_user;
-$conf->db->pass							= empty($dolibarr_main_db_pass)?'':$dolibarr_main_db_pass;
+$conf->db->pass							= empty($dolibarr_main_db_pass) ? '' : $dolibarr_main_db_pass;
 $conf->db->type							= $dolibarr_main_db_type;
 $conf->db->prefix = $dolibarr_main_db_prefix;
 $conf->db->character_set = $dolibarr_main_db_character_set;
@@ -117,7 +117,7 @@ if (!defined('NOREQUIRETRAN'))
  */
 if (!defined('NOREQUIREDB'))
 {
-    $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);
+	$db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);
 
 	if ($db->error)
 	{
@@ -169,9 +169,9 @@ if (session_id() && !empty($_SESSION["dol_entity"])) {
 } elseif (GETPOSTISSET("loginfunction") && GETPOST("entity", 'int')) {
 	// Just after a login page
 	$conf->entity = GETPOST("entity", 'int');
-} elseif (defined('DOLENTITY') && is_numeric(DOLENTITY)) {
+} elseif (defined('DOLENTITY') && is_numeric(constant('DOLENTITY'))) {
 	// For public page with MultiCompany module
-	$conf->entity = DOLENTITY;
+	$conf->entity = constant('DOLENTITY');
 }
 
 // Sanitize entity
@@ -186,47 +186,14 @@ if (!defined('NOREQUIREDB'))
 }
 
 // Overwrite database value
-if (!empty($conf->file->mailing_limit_sendbyweb))
-{
+if (!empty($conf->file->mailing_limit_sendbyweb)) {
 	$conf->global->MAILING_LIMIT_SENDBYWEB = $conf->file->mailing_limit_sendbyweb;
 }
-if (empty($conf->global->MAILING_LIMIT_SENDBYWEB))
-{
-    $conf->global->MAILING_LIMIT_SENDBYWEB = 25;
+if (empty($conf->global->MAILING_LIMIT_SENDBYWEB)) {
+	$conf->global->MAILING_LIMIT_SENDBYWEB = 25;
 }
-if (!empty($conf->file->mailing_limit_sendbycli))
-{
-    $conf->global->MAILING_LIMIT_SENDBYCLI = $conf->file->mailing_limit_sendbycli;
-}
-if (empty($conf->global->MAILING_LIMIT_SENDBYCLI))
-{
-    $conf->global->MAILING_LIMIT_SENDBYCLI = 0;
-}
-
-// If software has been locked. Only login $conf->global->MAIN_ONLY_LOGIN_ALLOWED is allowed.
-if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
-{
-	$ok = 0;
-	if ((!session_id() || !isset($_SESSION["dol_login"])) && !isset($_POST["username"]) && !empty($_SERVER["GATEWAY_INTERFACE"])) $ok = 1; // We let working pages if not logged and inside a web browser (login form, to allow login by admin)
-	elseif (isset($_POST["username"]) && $_POST["username"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok = 1; // We let working pages that is a login submission (login submit, to allow login by admin)
-	elseif (defined('NOREQUIREDB'))   $ok = 1; // We let working pages that don't need database access (xxx.css.php)
-	elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) $ok = 1; // We let working pages that ask to work even if only login enabled (logout.php)
-	elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok = 1; // We let working if user is allowed admin
-	if (!$ok)
-	{
-		if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != $conf->global->MAIN_ONLY_LOGIN_ALLOWED)
-		{
-			print 'Sorry, your application is offline.'."\n";
-			print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
-			$nexturl = DOL_URL_ROOT.'/user/logout.php';
-			print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";
-		} else {
-			print 'Sorry, your application is offline. Only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
-			$nexturl = DOL_URL_ROOT.'/';
-			print 'Please try later or <a href="'.$nexturl.'">click here to change login user</a>...'."\n";
-		}
-		exit;
-	}
+if (!empty($conf->file->mailing_limit_sendbycli)) {
+	$conf->global->MAILING_LIMIT_SENDBYCLI = $conf->file->mailing_limit_sendbycli;
 }
 
 // Create object $mysoc (A thirdparty object that contains properties of companies managed by Dolibarr.
@@ -245,9 +212,9 @@ if (!defined('NOREQUIREDB') && !defined('NOREQUIRESOC'))
 // Set default language (must be after the setValues setting global $conf->global->MAIN_LANG_DEFAULT. Page main.inc.php will overwrite langs->defaultlang with user value later)
 if (!defined('NOREQUIRETRAN'))
 {
-    $langcode = (GETPOST('lang', 'aZ09') ?GETPOST('lang', 'aZ09', 1) : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
-    if (defined('MAIN_LANG_DEFAULT')) $langcode = constant('MAIN_LANG_DEFAULT');
-    $langs->setDefaultLang($langcode);
+	$langcode = (GETPOST('lang', 'aZ09') ? GETPOST('lang', 'aZ09', 1) : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
+	if (defined('MAIN_LANG_DEFAULT')) $langcode = constant('MAIN_LANG_DEFAULT');
+	$langs->setDefaultLang($langcode);
 }
 
 
diff --git a/htdocs/modulebuilder/admin/setup.php b/htdocs/modulebuilder/admin/setup.php
index b7cadf26341..c5b41ac9390 100644
--- a/htdocs/modulebuilder/admin/setup.php
+++ b/htdocs/modulebuilder/admin/setup.php
@@ -97,7 +97,7 @@ print '<input type="hidden" name="action" value="update">';
 print load_fiche_titre($langs->trans("ModuleSetup").' '.$langs->trans('Modulebuilder'), $linkback);
 
 if (GETPOST('withtab', 'alpha')) {
-	dol_fiche_head($head, 'modulebuilder', '', -1);
+	print dol_get_fiche_head($head, 'modulebuilder', '', -1);
 }
 
 print '<span class="opacitymedium">'.$langs->trans("ModuleBuilderDesc")."</span><br>\n";
@@ -191,10 +191,10 @@ print '</tr>';
 
 print '</table>';
 
-print '<center><input type="submit" class="button" value="'.$langs->trans("Save").'" name="Button"></center>';
+print '<center><input type="submit" class="button button-save" value="'.$langs->trans("Save").'" name="Button"></center>';
 
 if (GETPOST('withtab', 'alpha')) {
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 print '<br>';
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 49d097ffc8a..babce9eba15 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -173,7 +173,7 @@ foreach ($dirsrootforscan as $dirread)
 	$textforlistofdirs .= '<strong class="wordbreakimp">'.$dirread.'</strong>';
 	if ($dirread == DOL_DOCUMENT_ROOT) {
 		if ($conf->global->MAIN_FEATURES_LEVEL >= 2) $textforlistofdirs .= $form->textwithpicto('', $langs->trans("ConstantIsOn", "MAIN_FEATURES_LEVEL"));
-		if (! empty($conf->global->MODULEBUILDER_ADD_DOCUMENT_ROOT)) $textforlistofdirs .= $form->textwithpicto('', $langs->trans("ConstantIsOn", "MODULEBUILDER_ADD_DOCUMENT_ROOT"));
+		if (!empty($conf->global->MODULEBUILDER_ADD_DOCUMENT_ROOT)) $textforlistofdirs .= $form->textwithpicto('', $langs->trans("ConstantIsOn", "MODULEBUILDER_ADD_DOCUMENT_ROOT"));
 	}
 	$i++;
 }
@@ -709,7 +709,7 @@ if ($dirins && $action == 'confirm_removefile' && !empty($module))
 		$dirtodelete  = $dirins.'/'.$dirnametodelete;
 
 		$result = dol_delete_file($filetodelete);
-		if (! $result) {
+		if (!$result) {
 			setEventMessages($langs->trans("ErrorFailToDeleteFile", basename($filetodelete)), null, 'errors');
 		} else {
 			if (dol_is_dir_empty($dirtodelete)) dol_delete_dir($dirtodelete);
@@ -783,9 +783,9 @@ if ($dirins && $action == 'initobject' && $module && GETPOST('createtablearray',
 			$fieldname = $obj->Field;
 			// type
 			$type = $obj->Type;
-			if ($type == 'int(11)') $type='integer';
-			if ($type == 'float') $type='real';
-			if (strstr($type, 'tinyint')) $type='integer';
+			if ($type == 'int(11)') $type = 'integer';
+			if ($type == 'float') $type = 'real';
+			if (strstr($type, 'tinyint')) $type = 'integer';
 			if ($obj->Field == 'fk_soc') $type = 'integer:Societe:societe/class/societe.class.php';
 			if (preg_match('/^fk_proj/', $obj->Field)) $type = 'integer:Project:projet/class/project.class.php:1:fk_statut=1';
 			if (preg_match('/^fk_prod/', $obj->Field)) $type = 'integer:Product:product/class/product.class.php:1';
@@ -1200,7 +1200,7 @@ if ($dirins && $action == 'addproperty' && !empty($module) && !empty($tabobj))
 
 			if (!empty($addfieldentry['arrayofkeyval']) && !is_array($addfieldentry['arrayofkeyval']))
 			{
-				$addfieldentry['arrayofkeyval'] = dol_json_decode($addfieldentry['arrayofkeyval'], true);
+				$addfieldentry['arrayofkeyval'] = json_decode($addfieldentry['arrayofkeyval'], true);
 			}
 		}
 	}
@@ -1628,7 +1628,7 @@ if (!empty($module) && $module != 'initmodule' && $module != 'deletemodule')
 
 		$class = 'mod'.$module;
 	} catch (Throwable $e) {		// This is called in PHP 7 only. Never called with PHP 5.6
-		$loadclasserrormessage = $e->getMessage()."<br>\n";;
+		$loadclasserrormessage = $e->getMessage()."<br>\n";
 		$loadclasserrormessage .= 'File: '.$e->getFile()."<br>\n";
 		$loadclasserrormessage .= 'Line: '.$e->getLine()."<br>\n";
 	}
@@ -1637,8 +1637,7 @@ if (!empty($module) && $module != 'initmodule' && $module != 'deletemodule')
 	{
 		try {
 			$moduleobj = new $class($db);
-		} catch (Exception $e)
-		{
+		} catch (Exception $e) {
 			$error++;
 			print $e->getMessage();
 		}
@@ -1745,7 +1744,7 @@ $head[$h][1] = $langs->trans("DangerZone");
 $head[$h][2] = 'deletemodule';
 $h++;
 
-dol_fiche_head($head, $module, '', -1, '', 0, $infomodulesfound, '', 8); // Modules
+print dol_get_fiche_head($head, $module, '', -1, '', 0, $infomodulesfound, '', 8); // Modules
 
 if ($module == 'initmodule')
 {
@@ -1875,7 +1874,7 @@ if ($module == 'initmodule')
 
 			if ($action != 'editfile' || empty($file))
 			{
-				dol_fiche_head($head2, $tab, '', -1, '', 0, '', '', 0, 'formodulesuffix'); // Description - level 2
+				print dol_get_fiche_head($head2, $tab, '', -1, '', 0, '', '', 0, 'formodulesuffix'); // Description - level 2
 
 				print '<span class="opacitymedium">'.$langs->trans("ModuleBuilderDesc".$tab).'</span>';
 				$infoonmodulepath = '';
@@ -1989,7 +1988,7 @@ if ($module == 'initmodule')
 					else print '<span class="opacitymedium">'.$langs->trans("ErrorFileNotFound", $pathtochangelog).'</span>';
 				}
 
-				dol_fiche_end();
+				print dol_get_fiche_end();
 			} else {	// Edit text file
 				$fullpathoffile = dol_buildpath($file, 0, 1); // Description - level 2
 
@@ -2006,23 +2005,23 @@ if ($module == 'initmodule')
 				print '<input type="hidden" name="tab" value="'.$tab.'">';
 				print '<input type="hidden" name="module" value="'.$module.'">';
 
-				dol_fiche_head($head2, $tab, '', -1, '', 0, '', '', 0, 'formodulesuffix');
+				print dol_get_fiche_head($head2, $tab, '', -1, '', 0, '', '', 0, 'formodulesuffix');
 
 				$doleditor = new DolEditor('editfilecontent', $content, '', '300', 'Full', 'In', true, false, 'ace', 0, '99%', '');
 				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
 
-				dol_fiche_end();
+				print dol_get_fiche_end();
 
 				print '<center>';
-				print '<input type="submit" class="button buttonforacesave" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 				print ' &nbsp; ';
-				print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+				print '<input type="submit" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 				print '</center>';
 
 				print '</form>';
 			}
 		} else {
-			dol_fiche_head($head2, $tab, '', -1, '', 0, '', '', 0, 'formodulesuffix'); // Level 2
+			print dol_get_fiche_head($head2, $tab, '', -1, '', 0, '', '', 0, 'formodulesuffix'); // Level 2
 		}
 
 		if ($tab == 'languages')
@@ -2079,9 +2078,9 @@ if ($module == 'initmodule')
 				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'text'));
 				print '<br>';
 				print '<center>';
-				print '<input type="submit" class="button buttonforacesave" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 				print ' &nbsp; ';
-				print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+				print '<input type="submit" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 				print '</center>';
 
 				print '</form>';
@@ -2212,9 +2211,9 @@ if ($module == 'initmodule')
 				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
 				print '<br>';
 				print '<center>';
-				print '<input type="submit" class="button buttonforacesave" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 				print ' &nbsp; ';
-				print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+				print '<input type="submit" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 				print '</center>';
 
 				print '</form>';
@@ -2269,7 +2268,7 @@ if ($module == 'initmodule')
 				else $tabobj = 'newobject';
 			}
 
-			dol_fiche_head($head3, $tabobj, '', -1, ''); // Level 3
+			print dol_get_fiche_head($head3, $tabobj, '', -1, ''); // Level 3
 
 			if ($tabobj == 'newobject')
 			{
@@ -2759,9 +2758,9 @@ if ($module == 'initmodule')
 										print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
 										print '<br>';
 										print '<center>';
-										print '<input type="submit" class="button buttonforacesave" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+										print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 										print ' &nbsp; ';
-										print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+										print '<input type="submit" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 										print '</center>';
 
 										print '</form>';
@@ -2803,16 +2802,16 @@ if ($module == 'initmodule')
 					print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
 					print '<br>';
 					print '<center>';
-					print '<input type="submit" class="button buttonforacesave" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+					print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 					print ' &nbsp; ';
-					print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+					print '<input type="submit" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 					print '</center>';
 
 					print '</form>';
 				}
 			}
 
-			dol_fiche_end(); // Level 3
+			print dol_get_fiche_end(); // Level 3
 		}
 
 		if ($tab == 'menus')
@@ -2942,9 +2941,9 @@ if ($module == 'initmodule')
 				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
 				print '<br>';
 				print '<center>';
-				print '<input type="submit" class="button buttonforacesave" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 				print ' &nbsp; ';
-				print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+				print '<input type="submit" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 				print '</center>';
 
 				print '</form>';
@@ -3038,9 +3037,9 @@ if ($module == 'initmodule')
 				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
 				print '<br>';
 				print '<center>';
-				print '<input type="submit" class="button buttonforacesave" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 				print ' &nbsp; ';
-				print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+				print '<input type="submit" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 				print '</center>';
 
 				print '</form>';
@@ -3095,9 +3094,9 @@ if ($module == 'initmodule')
 				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
 				print '<br>';
 				print '<center>';
-				print '<input type="submit" class="button buttonforacesave" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 				print ' &nbsp; ';
-				print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+				print '<input type="submit" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 				print '</center>';
 
 				print '</form>';
@@ -3163,9 +3162,9 @@ if ($module == 'initmodule')
 				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
 				print '<br>';
 				print '<center>';
-				print '<input type="submit" class="button buttonforacesave" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 				print ' &nbsp; ';
-				print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+				print '<input type="submit" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 				print '</center>';
 
 				print '</form>';
@@ -3211,9 +3210,9 @@ if ($module == 'initmodule')
 				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
 				print '<br>';
 				print '<center>';
-				print '<input type="submit" class="button buttonforacesave" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 				print ' &nbsp; ';
-				print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+				print '<input type="submit" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 				print '</center>';
 
 				print '</form>';
@@ -3259,9 +3258,9 @@ if ($module == 'initmodule')
 				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
 				print '<br>';
 				print '<center>';
-				print '<input type="submit" class="button buttonforacesave" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 				print ' &nbsp; ';
-				print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+				print '<input type="submit" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 				print '</center>';
 
 				print '</form>';
@@ -3314,9 +3313,9 @@ if ($module == 'initmodule')
 				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
 				print '<br>';
 				print '<center>';
-				print '<input type="submit" class="button buttonforacesave" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 				print ' &nbsp; ';
-				print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+				print '<input type="submit" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 				print '</center>';
 
 				print '</form>';
@@ -3396,9 +3395,9 @@ if ($module == 'initmodule')
 				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
 				print '<br>';
 				print '<center>';
-				print '<input type="submit" class="button buttonforacesave" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 				print ' &nbsp; ';
-				print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+				print '<input type="submit" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 				print '</center>';
 
 				print '</form>';
@@ -3513,9 +3512,9 @@ if ($module == 'initmodule')
 				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
 				print '<br>';
 				print '<center>';
-				print '<input type="submit" class="button buttonforacesave" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 				print ' &nbsp; ';
-				print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+				print '<input type="submit" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 				print '</center>';
 
 				print '</form>';
@@ -3573,9 +3572,9 @@ if ($module == 'initmodule')
 				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
 				print '<br>';
 				print '<center>';
-				print '<input type="submit" class="button buttonforacesave" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 				print ' &nbsp; ';
-				print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+				print '<input type="submit" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 				print '</center>';
 
 				print '</form>';
@@ -3696,12 +3695,12 @@ if ($module == 'initmodule')
 
 		if ($tab != 'description')
 		{
-			dol_fiche_end();
+			print dol_get_fiche_end();
 		}
 	}
 }
 
-dol_fiche_end(); // End modules
+print dol_get_fiche_end(); // End modules
 
 // End of page
 llxFooter();
diff --git a/htdocs/modulebuilder/template/admin/about.php b/htdocs/modulebuilder/template/admin/about.php
index ebb392810d1..518920592f4 100644
--- a/htdocs/modulebuilder/template/admin/about.php
+++ b/htdocs/modulebuilder/template/admin/about.php
@@ -75,13 +75,13 @@ print load_fiche_titre($langs->trans($page_name), $linkback, 'object_mymodule@my
 
 // Configuration header
 $head = mymoduleAdminPrepareHead();
-dol_fiche_head($head, 'about', '', 0, 'mymodule@mymodule');
+print dol_get_fiche_head($head, 'about', '', 0, 'mymodule@mymodule');
 
 dol_include_once('/mymodule/core/modules/modMyModule.class.php');
 $tmpmodule = new modMyModule($db);
 print $tmpmodule->getDescLong();
 
 // Page end
-dol_fiche_end();
+print dol_get_fiche_end();
 llxFooter();
 $db->close();
diff --git a/htdocs/modulebuilder/template/admin/myobject_extrafields.php b/htdocs/modulebuilder/template/admin/myobject_extrafields.php
index 31bd430d6a3..c844f80e4cc 100644
--- a/htdocs/modulebuilder/template/admin/myobject_extrafields.php
+++ b/htdocs/modulebuilder/template/admin/myobject_extrafields.php
@@ -21,7 +21,7 @@
  */
 
 /**
- *      \file       htdocs/modulebuilder/tempalte/admin/myobject_extrafields.php
+ *      \file       htdocs/modulebuilder/template/admin/myobject_extrafields.php
  *		\ingroup    mymodule
  *		\brief      Page to setup extra fields of myobject
  */
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/bom.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('mrp@mrp', 'admin'));
+$langs->loadLangs(array('mymodule@mymodule', 'admin'));
 
 $extrafields = new ExtraFields($db);
 $form = new Form($db);
@@ -70,19 +70,19 @@ print load_fiche_titre($langs->trans("MyModuleSetup"), $linkback, 'title_setup')
 
 $head = mymoduleAdminPrepareHead();
 
-dol_fiche_head($head, 'myobject_extrafields', $langs->trans("MyObjectExtraFields"), -1, 'account');
+print dol_get_fiche_head($head, 'myobject_extrafields', $langs->trans("MyObjectExtraFields"), -1, 'account');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -92,9 +92,9 @@ if ($action != 'create' && $action != 'edit')
 if ($action == 'create')
 {
 	print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /*
@@ -102,10 +102,10 @@ if ($action == 'create')
  */
 if ($action == 'edit' && !empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 11116fc33f4..c7cc61171a7 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -54,6 +54,9 @@ $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 $value = GETPOST('value', 'alpha');
+$label = GETPOST('label', 'alpha');
+$scandir = GETPOST('scan_dir', 'alpha');
+$type = 'myobject';
 
 $arrayofparameters = array(
 	'MYMODULE_MYPARAM1'=>array('css'=>'minwidth200', 'enabled'=>1),
@@ -130,47 +133,52 @@ if ($action == 'updateMask')
 	}
 }
 
-// Activate a model
-elseif ($action == 'set')
-{
-	$ret = addDocumentModel($value, $type, $label, $scandir);
-} elseif ($action == 'del')
-{
+elseif ($action == 'setmod') {
+	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
 	$tmpobjectkey = GETPOST('object');
-
-	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
-		$constforval = strtoupper($tmpobjectkey).'_ADDON_PDF';
-		if ($conf->global->$constforval == "$value") dolibarr_del_const($db, $constforval, $conf->entity);
+	if (!empty($tmpobjectkey)) {
+		$constforval = 'MYMODULE_'.strtoupper($tmpobjectkey)."_ADDON";
+		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
 	}
 }
 
-// Set default model
-elseif ($action == 'setdoc')
-{
-	$tmpobjectkey = GETPOST('object');
-	$constforval = strtoupper($tmpobjectkey).'_ADDON_PDF';
-	if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity))
-	{
-		// The constant that was read before the new set
-		// We therefore requires a variable to have a coherent view
-		$conf->global->$constforval = $value;
-	}
-
-	// On active le modele
+// Activate a model
+elseif ($action == 'set') {
+	$ret = addDocumentModel($value, $type, $label, $scandir);
+} elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
-		$ret = addDocumentModel($value, $type, $label, $scandir);
+	if ($ret > 0) {
+		$tmpobjectkey = GETPOST('object');
+		if (!empty($tmpobjectkey)) {
+			$constforval = 'MYMODULE_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
+			if ($conf->global->$constforval == "$value") dolibarr_del_const($db, $constforval, $conf->entity);
+		}
 	}
-} elseif ($action == 'setmod')
-{
-	// TODO Check if numbering module chosen can be activated
-	// by calling method canBeActivated
+}
+
+// Set or unset default model
+elseif ($action == 'setdoc') {
 	$tmpobjectkey = GETPOST('object');
-	$constforval = 'MYMODULE_'.strtoupper($tmpobjectkey)."_ADDON";
-	dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
+	if (!empty($tmpobjectkey)) {
+		$constforval = 'MYMODULE_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
+		if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
+			// The constant that was read before the new set
+			// We therefore requires a variable to have a coherent view
+			$conf->global->$constforval = $value;
+		}
+
+		// We disable/enable the document template (into llx_document_model table)
+		$ret = delDocumentModel($value, $type);
+		if ($ret > 0) {
+			$ret = addDocumentModel($value, $type, $label, $scandir);
+		}
+	}
+} elseif ($action == 'unsetdoc') {
+	$tmpobjectkey = GETPOST('object');
+	if (!empty($tmpobjectkey)) {
+		$constforval = 'MYMODULE_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
+		dolibarr_del_const($db, $constforval, $conf->entity);
+	}
 }
 
 
@@ -193,7 +201,7 @@ print load_fiche_titre($langs->trans($page_name), $linkback, 'object_mymodule@my
 
 // Configuration header
 $head = mymoduleAdminPrepareHead();
-dol_fiche_head($head, 'settings', '', -1, "mymodule@mymodule");
+print dol_get_fiche_head($head, 'settings', '', -1, "mymodule@mymodule");
 
 // Setup page goes here
 echo '<span class="opacitymedium">'.$langs->trans("MyModuleSetupPage").'</span><br><br>';
@@ -218,7 +226,7 @@ if ($action == 'edit')
 	print '</table>';
 
 	print '<br><div class="center">';
-	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
+	print '<input class="button button-save" type="submit" value="'.$langs->trans("Save").'">';
 	print '</div>';
 
 	print '</form>';
@@ -252,7 +260,7 @@ if ($action == 'edit')
 
 $moduledir = 'mymodule';
 $myTmpObjects = array();
-$myTmpObjects['MyObject']=array('includerefgeneration'=>0, 'includedocgeneration'=>0);
+$myTmpObjects['MyObject'] = array('includerefgeneration'=>0, 'includedocgeneration'=>0);
 
 
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
@@ -310,8 +318,10 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 								// Show example of numbering model
 								print '<td class="nowrap">';
 								$tmp = $module->getExample();
-								if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-								elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+								if (preg_match('/^Error/', $tmp)) {
+									$langs->load("errors");
+									print '<div class="error">'.$langs->trans($tmp).'</div>';
+								} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
 								else print $tmp;
 								print '</td>'."\n";
 
@@ -457,18 +467,19 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 											print '</td>';
 										} else {
 											print '<td class="center">'."\n";
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.urlencode($module->scandir).'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 											print "</td>";
 										}
 
 										// Default
 										print '<td class="center">';
 										$constforvar = 'MYMODULE_'.strtoupper($myTmpObjectKey).'_ADDON';
-										if ($conf->global->$constforvar == $name)
-										{
-											print img_picto($langs->trans("Default"), 'on');
+										if ($conf->global->$constforvar == $name) {
+											//print img_picto($langs->trans("Default"), 'on');
+											// Even if choice is the default value, we allow to disable it. Replace this with previous line if you need to disable unset
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&amp;token='.newToken().'&amp;object='.urlencode(strtolower($myTmpObjectKey)).'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type='.urlencode($type).'" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 										} else {
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;object='.urlencode(strtolower($myTmpObjectKey)).'&amp;value='.$name.'&amp;scan_dir='.urlencode($module->scandir).'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 										}
 										print '</td>';
 
@@ -493,7 +504,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										print '<td class="center">';
 										if ($module->type == 'pdf')
 										{
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&object='.$myTmpObjectKey.'">'.img_object($langs->trans("Preview"), 'generic').'</a>';
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&object='.$myTmpObjectKey.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 										} else {
 											print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 										}
@@ -518,7 +529,7 @@ if (empty($setupnotempty)) {
 }
 
 // Page end
-dol_fiche_end();
+print dol_get_fiche_end();
 
 llxFooter();
 $db->close();
diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index 32113b71ef0..05ca7f27d16 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -290,8 +290,8 @@ class MyModuleApi extends DolibarrApi
 	/**
 	 * Clean sensible object datas
 	 *
-	 * @param   object  $object    Object to clean
-	 * @return    array    Array of cleaned object properties
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
 	 */
 	protected function _cleanObjectDatas($object)
 	{
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 18ca9b5ea20..a15f0f67fe9 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -73,6 +73,7 @@ class MyObject extends CommonObject
 	 *  'type' if the field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
 	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
 	 *  'label' the translation key.
+	 *  'picto' is code of a picto to show before value in forms
 	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
 	 *  'position' is the sort order of field.
 	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
@@ -83,8 +84,8 @@ class MyObject extends CommonObject
 	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
-	 *  'css' and 'cssview' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. For example: 'maxwidth200', 'wordbreak'
-	 *  'help' is a string visible as a tooltip on field
+	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
+	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
 	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
@@ -105,16 +106,16 @@ class MyObject extends CommonObject
 		'label'         => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>'Help text', 'showoncombobox'=>1),
 		'amount'        => array('type'=>'price', 'label'=>'Amount', 'enabled'=>1, 'visible'=>1, 'default'=>'null', 'position'=>40, 'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for amount'),
 		'qty'           => array('type'=>'real', 'label'=>'Qty', 'enabled'=>1, 'visible'=>1, 'default'=>'0', 'position'=>45, 'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for quantity', 'css'=>'maxwidth75imp'),
-		'fk_soc' 		=> array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'visible'=> 1, 'enabled'=>1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'help'=>'LinkToThirparty'),
-		'fk_project'    => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>1, 'visible'=>-1, 'position'=>52, 'notnull'=>-1, 'index'=>1),
+		'fk_soc' 		=> array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'picto'=>'company', 'label'=>'ThirdParty', 'visible'=> 1, 'enabled'=>1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'help'=>'LinkToThirparty'),
+		'fk_project'    => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'picto'=>'project', 'enabled'=>1, 'visible'=>-1, 'position'=>52, 'notnull'=>-1, 'index'=>1),
 		'description'   => array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>3, 'position'=>60),
 		'note_public'   => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61),
 		'note_private'  => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>62),
 		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=> 1, 'position'=>500),
 		'tms'           => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=> 0, 'position'=>501),
 		//'date_validation '    =>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'position'=>502),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'notnull'=> 1, 'position'=>510, 'foreignkey'=>'user.rowid'),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511),
+		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'picto'=>'user', 'enabled'=>1, 'visible'=>-2, 'notnull'=> 1, 'position'=>510, 'foreignkey'=>'user.rowid'),
+		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'picto'=>'user', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511),
 		//'fk_user_valid' => array('type'=>'integer:User:user/class/user.class.php',      'label'=>'UserValidation',        'enabled'=>1, 'visible'=>-1, 'position'=>512),
 		'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>1, 'visible'=>0, 'notnull'=>0, 'position'=>600),
 		'import_key'    => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>0, 'position'=>1000),
@@ -186,37 +187,37 @@ class MyObject extends CommonObject
 
 	// If this object has a subtable with lines
 
-	/**
-	 * @var int    Name of subtable line
-	 */
-	//public $table_element_line = 'mymodule_myobjectline';
+	// /**
+	//  * @var string    Name of subtable line
+	//  */
+	// public $table_element_line = 'mymodule_myobjectline';
 
-	/**
-	 * @var int    Field with ID of parent key if this object has a parent
-	 */
-	//public $fk_element = 'fk_myobject';
+	// /**
+	//  * @var string    Field with ID of parent key if this object has a parent
+	//  */
+	// public $fk_element = 'fk_myobject';
 
-	/**
-	 * @var int    Name of subtable class that manage subtable lines
-	 */
-	//public $class_element_line = 'MyObjectline';
+	// /**
+	//  * @var string    Name of subtable class that manage subtable lines
+	//  */
+	// public $class_element_line = 'MyObjectline';
 
-	/**
-	 * @var array	List of child tables. To test if we can delete object.
-	 */
-	//protected $childtables = array();
+	// /**
+	//  * @var array	List of child tables. To test if we can delete object.
+	//  */
+	// protected $childtables = array();
 
-	/**
-	 * @var array    List of child tables. To know object to delete on cascade.
-	 *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
-	 *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
-	 */
-	//protected $childtablesoncascade = array('mymodule_myobjectdet');
+	// /**
+	//  * @var array    List of child tables. To know object to delete on cascade.
+	//  *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
+	//  *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
+	//  */
+	// protected $childtablesoncascade = array('mymodule_myobjectdet');
 
-	/**
-	 * @var MyObjectLine[]     Array of subtable lines
-	 */
-	//public $lines = array();
+	// /**
+	//  * @var MyObjectLine[]     Array of subtable lines
+	//  */
+	// public $lines = array();
 
 
 
@@ -254,7 +255,7 @@ class MyObject extends CommonObject
 		{
 			foreach ($this->fields as $key => $val)
 			{
-				if (is_array($val['arrayofkeyval']))
+				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
 				{
 					foreach ($val['arrayofkeyval'] as $key2 => $val2)
 					{
@@ -308,11 +309,12 @@ class MyObject extends CommonObject
 		unset($object->fk_user_creat);
 		unset($object->import_key);
 
-
 		// Clear fields
-		$object->ref = empty($this->fields['ref']['default']) ? "copy_of_".$object->ref : $this->fields['ref']['default'];
-		$object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
-		$object->status = self::STATUS_DRAFT;
+		if (property_exists($object, 'ref')) $object->ref = empty($this->fields['ref']['default']) ? "Copy_Of_".$object->ref : $this->fields['ref']['default'];
+		if (property_exists($object, 'label')) $object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
+		if (property_exists($object, 'status')) { $object->status = self::STATUS_DRAFT; }
+		if (property_exists($object, 'date_creation')) { $object->date_creation = dol_now(); }
+		if (property_exists($object, 'date_modification')) { $object->date_modification = null; }
 		// ...
 		// Clear extrafields that are unique
 		if (is_array($object->array_options) && count($object->array_options) > 0)
@@ -568,7 +570,7 @@ class MyObject extends CommonObject
 			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
 			$sql .= " SET ref = '".$this->db->escape($num)."',";
 			$sql .= " status = ".self::STATUS_VALIDATED;
-			if (!empty($this->fields['date_validation'])) $sql .= ", date_validation = '".$this->db->idate($now)."',";
+			if (!empty($this->fields['date_validation'])) $sql .= ", date_validation = '".$this->db->idate($now)."'";
 			if (!empty($this->fields['fk_user_valid'])) $sql .= ", fk_user_valid = ".$user->id;
 			$sql .= " WHERE rowid = ".$this->id;
 
@@ -742,11 +744,11 @@ class MyObject extends CommonObject
 		$result = '';
 
 		$label = img_picto('', $this->picto).' <u>'.$langs->trans("MyObject").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
-		if (isset($this->status)) {
-			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
-		}
 
 		$url = dol_buildpath('/mymodule/myobject_card.php', 1).'?id='.$this->id;
 
@@ -1026,7 +1028,7 @@ class MyObject extends CommonObject
 		if (!dol_strlen($modele)) {
 			$modele = 'standard_myobject';
 
-			if ($this->model_pdf) {
+			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
 			} elseif (!empty($conf->global->MYOBJECT_ADDON_PDF)) {
 				$modele = $conf->global->MYOBJECT_ADDON_PDF;
@@ -1035,7 +1037,7 @@ class MyObject extends CommonObject
 
 		$modelpath = "core/modules/mymodule/doc/";
 
-		if ($includedocgeneration) {
+		if ($includedocgeneration && !empty($modele)) {
 			$result = $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 		}
 
diff --git a/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php b/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
index 482455e103d..e356792ed42 100644
--- a/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
+++ b/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
@@ -25,9 +25,9 @@
  * Put detailed description here.
  */
 
-/** Includes */
 include_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
 
+
 /**
  * Class to manage the box
  *
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 46943c6c9ab..4917074dad0 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -90,6 +90,8 @@ class modMyModule extends DolibarrModules
 			'barcode' => 0,
 			// Set this to 1 if module has its own models directory (core/modules/xxx)
 			'models' => 0,
+			// Set this to 1 if module has its own printing directory (core/modules/printing)
+			'printing' => 0,
 			// Set this to 1 if module has its own theme directory (theme)
 			'theme' => 0,
 			// Set this to relative path of css file if module has its own css file
@@ -407,24 +409,24 @@ class modMyModule extends DolibarrModules
 		// Document templates
 		$moduledir = 'mymodule';
 		$myTmpObjects = array();
-		$myTmpObjects['MyObject']=array('includerefgeneration'=>0, 'includedocgeneration'=>0);
+		$myTmpObjects['MyObject'] = array('includerefgeneration'=>0, 'includedocgeneration'=>0);
 
 		foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 			if ($myTmpObjectKey == 'MyObject') continue;
 			if ($myTmpObjectArray['includerefgeneration']) {
-				$src=DOL_DOCUMENT_ROOT.'/install/doctemplates/mymodule/template_myobjects.odt';
-				$dirodt=DOL_DATA_ROOT.'/doctemplates/mymodule';
-				$dest=$dirodt.'/template_myobjects.odt';
+				$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/mymodule/template_myobjects.odt';
+				$dirodt = DOL_DATA_ROOT.'/doctemplates/mymodule';
+				$dest = $dirodt.'/template_myobjects.odt';
 
-				if (file_exists($src) && ! file_exists($dest))
+				if (file_exists($src) && !file_exists($dest))
 				{
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 					dol_mkdir($dirodt);
-					$result=dol_copy($src, $dest, 0, 0);
+					$result = dol_copy($src, $dest, 0, 0);
 					if ($result < 0)
 					{
 						$langs->load("errors");
-						$this->error=$langs->trans('ErrorFailToCopyFile', $src, $dest);
+						$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
 						return 0;
 					}
 				}
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
index d585815e805..d6cb191a405 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
@@ -47,9 +47,9 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
@@ -299,9 +299,9 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				$contactobject = null;
 				if (!empty($usecontact))
 				{
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else {
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+						$socobject = $object->contact;
+					} else {
 						$socobject = $object->thirdparty;
 						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
 						$contactobject = $object->contact;
@@ -316,7 +316,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 					'__FROM_EMAIL__' => $this->emetteur->email,
 					'__TOTAL_TTC__' => $object->total_ttc,
 					'__TOTAL_HT__' => $object->total_ht,
-					'__TOTAL_VAT__' => $object->total_vat
+					'__TOTAL_VAT__' => $object->total_tva
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
index 694263e2ec5..fbab4d53b0f 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
@@ -43,82 +43,82 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
  */
 class pdf_standard_myobject extends ModelePDFMyObject
 {
-    /**
-     * @var DoliDb Database handler
-     */
-    public $db;
+	/**
+	 * @var DoliDb Database handler
+	 */
+	public $db;
 
 	/**
-     * @var string model name
-     */
-    public $name;
+	 * @var string model name
+	 */
+	public $name;
 
 	/**
-     * @var string model description (short text)
-     */
-    public $description;
-
-    /**
-     * @var int     Save the name of generated file as the main doc when generating a doc with this template
-     */
-    public $update_main_doc_field;
+	 * @var string model description (short text)
+	 */
+	public $description;
 
 	/**
-     * @var string document type
-     */
-    public $type;
+	 * @var int     Save the name of generated file as the main doc when generating a doc with this template
+	 */
+	public $update_main_doc_field;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var string document type
+	 */
+	public $type;
+
+	/**
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
-     /**
-     * @var int page_largeur
-     */
-    public $page_largeur;
+	 /**
+	  * @var int page_largeur
+	  */
+	public $page_largeur;
 
 	/**
-     * @var int page_hauteur
-     */
-    public $page_hauteur;
+	 * @var int page_hauteur
+	 */
+	public $page_hauteur;
 
 	/**
-     * @var array format
-     */
-    public $format;
+	 * @var array format
+	 */
+	public $format;
 
 	/**
-     * @var int marge_gauche
-     */
+	 * @var int marge_gauche
+	 */
 	public $marge_gauche;
 
 	/**
-     * @var int marge_droite
-     */
+	 * @var int marge_droite
+	 */
 	public $marge_droite;
 
 	/**
-     * @var int marge_haute
-     */
+	 * @var int marge_haute
+	 */
 	public $marge_haute;
 
 	/**
-     * @var int marge_basse
-     */
+	 * @var int marge_basse
+	 */
 	public $marge_basse;
 
-    /**
-	* Issuer
-	* @var Societe Object that emits
-	*/
+	/**
+	 * Issuer
+	 * @var Societe Object that emits
+	 */
 	public $emetteur;
 
 	/**
@@ -182,50 +182,50 @@ class pdf_standard_myobject extends ModelePDFMyObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Function to build pdf onto disk
-     *
-     *  @param		Object		$object				Object to generate
-     *  @param		Translate	$outputlangs		Lang output object
-     *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
-     *  @param		int			$hidedetails		Do not show line details
-     *  @param		int			$hidedesc			Do not show desc
-     *  @param		int			$hideref			Do not show ref
-     *  @return     int         	    			1=OK, 0=KO
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Function to build pdf onto disk
+	 *
+	 *  @param		Object		$object				Object to generate
+	 *  @param		Translate	$outputlangs		Lang output object
+	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *  @return     int         	    			1=OK, 0=KO
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-	    // phpcs:enable
-	    global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblines;
+		// phpcs:enable
+		global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblines;
 
-	    dol_syslog("write_file outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));
+		dol_syslog("write_file outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));
 
-	    if (!is_object($outputlangs)) $outputlangs = $langs;
-	    // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-	    if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!is_object($outputlangs)) $outputlangs = $langs;
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
 
-	    // Load translation files required by the page
-	    $outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies"));
+		// Load translation files required by the page
+		$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies"));
 
-	    if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
-	    	global $outputlangsbis;
-	    	$outputlangsbis = new Translate('', $conf);
-	    	$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
-	    	$outputlangsbis->loadLangs(array("main", "bills", "products", "dict", "companies"));
-	    }
+		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+			global $outputlangsbis;
+			$outputlangsbis = new Translate('', $conf);
+			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
+			$outputlangsbis->loadLangs(array("main", "bills", "products", "dict", "companies"));
+		}
 
-	    $nblines = (is_array($object->lines) ? count($object->lines) : 0);
+		$nblines = (is_array($object->lines) ? count($object->lines) : 0);
 
-	    $hidetop = 0;
-	    if (!empty($conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE)) {
-	        $hidetop = $conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE;
-	    }
+		$hidetop = 0;
+		if (!empty($conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE)) {
+			$hidetop = $conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE;
+		}
 
-	    // Loop on each lines to detect if there is at least one image to show
-	    $realpatharray = array();
-	    $this->atleastonephoto = false;
-	    /*
+		// Loop on each lines to detect if there is at least one image to show
+		$realpatharray = array();
+		$this->atleastonephoto = false;
+		/*
 	    if (!empty($conf->global->MAIN_GENERATE_MYOBJECT_WITH_PICTURE))
 	    {
 	        $objphoto = new Product($this->db);
@@ -278,528 +278,528 @@ class pdf_standard_myobject extends ModelePDFMyObject
 	    }
 		*/
 
-	    //if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
+		//if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
 
-	    if ($conf->mymodule->dir_output.'/myobject')
-	    {
-	        $object->fetch_thirdparty();
+		if ($conf->mymodule->dir_output.'/myobject')
+		{
+			$object->fetch_thirdparty();
 
-	        // Definition of $dir and $file
-	        if ($object->specimen)
-	        {
-	        	$dir = $conf->mymodule->dir_output.'/myobject';
-	            $file = $dir."/SPECIMEN.pdf";
-	        } else {
-	            $objectref = dol_sanitizeFileName($object->ref);
-	            $dir = $conf->mymodule->dir_output.'/myobject/'.$objectref;
-	            $file = $dir."/".$objectref.".pdf";
-	        }
-	        if (!file_exists($dir))
-	        {
-	            if (dol_mkdir($dir) < 0)
-	            {
-	                $this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
-	                return 0;
-	            }
-	        }
+			// Definition of $dir and $file
+			if ($object->specimen)
+			{
+				$dir = $conf->mymodule->dir_output.'/myobject';
+				$file = $dir."/SPECIMEN.pdf";
+			} else {
+				$objectref = dol_sanitizeFileName($object->ref);
+				$dir = $conf->mymodule->dir_output.'/myobject/'.$objectref;
+				$file = $dir."/".$objectref.".pdf";
+			}
+			if (!file_exists($dir))
+			{
+				if (dol_mkdir($dir) < 0)
+				{
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+					return 0;
+				}
+			}
 
-	        if (file_exists($dir))
-	        {
-	            // Add pdfgeneration hook
-	            if (!is_object($hookmanager))
-	            {
-	                include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-	                $hookmanager = new HookManager($this->db);
-	            }
-	            $hookmanager->initHooks(array('pdfgeneration'));
-	            $parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
-	            global $action;
-	            $reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+			if (file_exists($dir))
+			{
+				// Add pdfgeneration hook
+				if (!is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager = new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-	            // Set nblines with the new facture lines content after hook
-	            $nblines = (is_array($object->lines) ? count($object->lines) : 0);
+				// Set nblines with the new facture lines content after hook
+				$nblines = (is_array($object->lines) ? count($object->lines) : 0);
 
-	            // Create pdf instance
-	            $pdf = pdf_getInstance($this->format);
-	            $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-	            $pdf->SetAutoPageBreak(1, 0);
+				// Create pdf instance
+				$pdf = pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+				$pdf->SetAutoPageBreak(1, 0);
 
-	            $heightforinfotot = 50; // Height reserved to output the info and total part and payment part
-	            $heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
+				$heightforinfotot = 50; // Height reserved to output the info and total part and payment part
+				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+				$heightforfooter = $this->marge_basse + (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
 
-	            if (class_exists('TCPDF'))
-	            {
-	                $pdf->setPrintHeader(false);
-	                $pdf->setPrintFooter(false);
-	            }
-	            $pdf->SetFont(pdf_getPDFFont($outputlangs));
+				if (class_exists('TCPDF'))
+				{
+					$pdf->setPrintHeader(false);
+					$pdf->setPrintFooter(false);
+				}
+				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 
-	            // Set path to the background PDF File
-                if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-	            {
-	            	$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
-	                $tplidx = $pdf->importPage(1);
-	            }
+				// Set path to the background PDF File
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+				{
+					$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+					$tplidx = $pdf->importPage(1);
+				}
 
-	            $pdf->Open();
-	            $pagenb = 0;
-	            $pdf->SetDrawColor(128, 128, 128);
+				$pdf->Open();
+				$pagenb = 0;
+				$pdf->SetDrawColor(128, 128, 128);
 
-	            $pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
-	            $pdf->SetSubject($outputlangs->transnoentities("PdfTitle"));
-	            $pdf->SetCreator("Dolibarr ".DOL_VERSION);
-	            $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-	            $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-	            if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+				$pdf->SetSubject($outputlangs->transnoentities("PdfTitle"));
+				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
+				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
-	            // Set certificate
-	            $cert = empty($user->conf->CERTIFICATE_CRT) ? '' : $user->conf->CERTIFICATE_CRT;
-	            // If user has no certificate, we try to take the company one
-	            if (!$cert) {
-	            	$cert = empty($conf->global->CERTIFICATE_CRT) ? '' : $conf->global->CERTIFICATE_CRT;
-	            }
-	            // If a certificate is found
-	            if ($cert) {
-	            	$info = array(
-	            		'Name' => $this->emetteur->name,
-	            		'Location' => getCountry($this->emetteur->country_code, 0),
-	            		'Reason' => 'MYOBJECT',
-	            		'ContactInfo' => $this->emetteur->email
-	            	);
-	            	$pdf->setSignature($cert, $cert, $this->emetteur->name, '', 2, $info);
-	            }
+				// Set certificate
+				$cert = empty($user->conf->CERTIFICATE_CRT) ? '' : $user->conf->CERTIFICATE_CRT;
+				// If user has no certificate, we try to take the company one
+				if (!$cert) {
+					$cert = empty($conf->global->CERTIFICATE_CRT) ? '' : $conf->global->CERTIFICATE_CRT;
+				}
+				// If a certificate is found
+				if ($cert) {
+					$info = array(
+						'Name' => $this->emetteur->name,
+						'Location' => getCountry($this->emetteur->country_code, 0),
+						'Reason' => 'MYOBJECT',
+						'ContactInfo' => $this->emetteur->email
+					);
+					$pdf->setSignature($cert, $cert, $this->emetteur->name, '', 2, $info);
+				}
 
-	            $pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
+				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
-	            // New page
-	            $pdf->AddPage();
-	            if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-	            $pagenb++;
+				// New page
+				$pdf->AddPage();
+				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				$pagenb++;
 
-	            $top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs, $outputlangsbis);
-	            $pdf->SetFont('', '', $default_font_size - 1);
-	            $pdf->MultiCell(0, 3, ''); // Set interline to 3
-	            $pdf->SetTextColor(0, 0, 0);
+				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs, $outputlangsbis);
+				$pdf->SetFont('', '', $default_font_size - 1);
+				$pdf->MultiCell(0, 3, ''); // Set interline to 3
+				$pdf->SetTextColor(0, 0, 0);
 
-	            $tab_top = 90 + $top_shift;
-	            $tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
-	            $tab_height = 130 - $top_shift;
-	            $tab_height_newpage = 150;
-	            if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $tab_height_newpage -= $top_shift;
+				$tab_top = 90 + $top_shift;
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
+				$tab_height = 130 - $top_shift;
+				$tab_height_newpage = 150;
+				if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $tab_height_newpage -= $top_shift;
 
-                $nexY = $tab_top - 1;
+				$nexY = $tab_top - 1;
 
-	            // Display notes
-	            $notetoshow = empty($object->note_public) ? '' : $object->note_public;
-	            // Extrafields in note
-                $extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
-                if (!empty($extranote))
-                {
-                    $notetoshow = dol_concatdesc($notetoshow, $extranote);
-                }
+				// Display notes
+				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
+				// Extrafields in note
+				$extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
+				if (!empty($extranote))
+				{
+					$notetoshow = dol_concatdesc($notetoshow, $extranote);
+				}
 
-	            $pagenb = $pdf->getPage();
-	            if ($notetoshow)
-	            {
+				$pagenb = $pdf->getPage();
+				if ($notetoshow)
+				{
 					$tab_top -= 2;
 
-	                $tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
-	                $pageposbeforenote = $pagenb;
+					$tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
+					$pageposbeforenote = $pagenb;
 
-	                $substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
-	                complete_substitutions_array($substitutionarray, $outputlangs, $object);
-	                $notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
-	                $notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
+					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
+					complete_substitutions_array($substitutionarray, $outputlangs, $object);
+					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
+					$notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
 
-	                $pdf->startTransaction();
+					$pdf->startTransaction();
 
-	                $pdf->SetFont('', '', $default_font_size - 1);
-	                $pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
-	                // Description
-	                $pageposafternote = $pdf->getPage();
-	                $posyafter = $pdf->GetY();
+					$pdf->SetFont('', '', $default_font_size - 1);
+					$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+					// Description
+					$pageposafternote = $pdf->getPage();
+					$posyafter = $pdf->GetY();
 
-	                if ($pageposafternote > $pageposbeforenote)
-	                {
-	                    $pdf->rollbackTransaction(true);
+					if ($pageposafternote > $pageposbeforenote)
+					{
+						$pdf->rollbackTransaction(true);
 
-	                    // prepare pages to receive notes
-	                    while ($pagenb < $pageposafternote) {
-	                        $pdf->AddPage();
-	                        $pagenb++;
-	                        if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-	                        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-	                        // $this->_pagefoot($pdf,$object,$outputlangs,1);
-	                        $pdf->setTopMargin($tab_top_newpage);
-	                        // The only function to edit the bottom margin of current page to set it.
-	                        $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
-	                    }
+						// prepare pages to receive notes
+						while ($pagenb < $pageposafternote) {
+							$pdf->AddPage();
+							$pagenb++;
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							// $this->_pagefoot($pdf,$object,$outputlangs,1);
+							$pdf->setTopMargin($tab_top_newpage);
+							// The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						}
 
-	                    // back to start
-	                    $pdf->setPage($pageposbeforenote);
-	                    $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
-	                    $pdf->SetFont('', '', $default_font_size - 1);
-	                    $pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
-	                    $pageposafternote = $pdf->getPage();
+						// back to start
+						$pdf->setPage($pageposbeforenote);
+						$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						$pdf->SetFont('', '', $default_font_size - 1);
+						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+						$pageposafternote = $pdf->getPage();
 
-	                    $posyafter = $pdf->GetY();
+						$posyafter = $pdf->GetY();
 
-	                    if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))	// There is no space left for total+free text
-	                    {
-	                        $pdf->AddPage('', '', true);
-	                        $pagenb++;
-	                        $pageposafternote++;
-	                        $pdf->setPage($pageposafternote);
-	                        $pdf->setTopMargin($tab_top_newpage);
-	                        // The only function to edit the bottom margin of current page to set it.
-	                        $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
-	                        //$posyafter = $tab_top_newpage;
-	                    }
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))	// There is no space left for total+free text
+						{
+							$pdf->AddPage('', '', true);
+							$pagenb++;
+							$pageposafternote++;
+							$pdf->setPage($pageposafternote);
+							$pdf->setTopMargin($tab_top_newpage);
+							// The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							//$posyafter = $tab_top_newpage;
+						}
 
 
-	                    // apply note frame to previous pages
-	                    $i = $pageposbeforenote;
-	                    while ($i < $pageposafternote) {
-	                        $pdf->setPage($i);
+						// apply note frame to previous pages
+						$i = $pageposbeforenote;
+						while ($i < $pageposafternote) {
+							$pdf->setPage($i);
 
 
-	                        $pdf->SetDrawColor(128, 128, 128);
-	                        // Draw note frame
-	                        if ($i > $pageposbeforenote) {
-	                            $height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
-	                            $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-	                        } else {
-	                            $height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
-	                            $pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
-	                        }
+							$pdf->SetDrawColor(128, 128, 128);
+							// Draw note frame
+							if ($i > $pageposbeforenote) {
+								$height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
+								$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
+							} else {
+								$height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
+								$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
+							}
 
-	                        // Add footer
-	                        $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-	                        $this->_pagefoot($pdf, $object, $outputlangs, 1);
+							// Add footer
+							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 
-	                        $i++;
-	                    }
+							$i++;
+						}
 
-	                    // apply note frame to last page
-	                    $pdf->setPage($pageposafternote);
-	                    if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-	                    if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-	                    $height_note = $posyafter - $tab_top_newpage;
-	                    $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-	                } else // No pagebreak
-	                {
-	                    $pdf->commitTransaction();
-	                    $posyafter = $pdf->GetY();
-	                    $height_note = $posyafter - $tab_top;
-	                    $pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
+						// apply note frame to last page
+						$pdf->setPage($pageposafternote);
+						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						$height_note = $posyafter - $tab_top_newpage;
+						$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
+					} else // No pagebreak
+					{
+						$pdf->commitTransaction();
+						$posyafter = $pdf->GetY();
+						$height_note = $posyafter - $tab_top;
+						$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
 
 
-	                    if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))
-	                    {
-	                        // not enough space, need to add page
-	                        $pdf->AddPage('', '', true);
-	                        $pagenb++;
-	                        $pageposafternote++;
-	                        $pdf->setPage($pageposafternote);
-	                        if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-	                        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))
+						{
+							// not enough space, need to add page
+							$pdf->AddPage('', '', true);
+							$pagenb++;
+							$pageposafternote++;
+							$pdf->setPage($pageposafternote);
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 
-	                        $posyafter = $tab_top_newpage;
-	                    }
-	                }
+							$posyafter = $tab_top_newpage;
+						}
+					}
 
-	                $tab_height = $tab_height - $height_note;
-	                $tab_top = $posyafter + 6;
-	            } else {
-	                $height_note = 0;
-	            }
+					$tab_height = $tab_height - $height_note;
+					$tab_top = $posyafter + 6;
+				} else {
+					$height_note = 0;
+				}
 
-	            // Use new auto column system
-	            $this->prepareArrayColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				// Use new auto column system
+				$this->prepareArrayColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
-	            // Table simulation to know the height of the title line
-			    $pdf->startTransaction();
-			    $this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
-			    $pdf->rollbackTransaction(true);
+				// Table simulation to know the height of the title line
+				$pdf->startTransaction();
+				$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
+				$pdf->rollbackTransaction(true);
 
-			    $nexY = $tab_top + $this->tabTitleHeight;
+				$nexY = $tab_top + $this->tabTitleHeight;
 
-	            // Loop on each lines
-	            $pageposbeforeprintlines = $pdf->getPage();
-	            $pagenb = $pageposbeforeprintlines;
-	            for ($i = 0; $i < $nblines; $i++)
-	            {
-	                $curY = $nexY;
-	                $pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
-	                $pdf->SetTextColor(0, 0, 0);
+				// Loop on each lines
+				$pageposbeforeprintlines = $pdf->getPage();
+				$pagenb = $pageposbeforeprintlines;
+				for ($i = 0; $i < $nblines; $i++)
+				{
+					$curY = $nexY;
+					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
+					$pdf->SetTextColor(0, 0, 0);
 
-	                // Define size of image if we need it
-	                $imglinesize = array();
-	                if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					// Define size of image if we need it
+					$imglinesize = array();
+					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
 
-	                $pdf->setTopMargin($tab_top_newpage);
-	                $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
-	                $pageposbefore = $pdf->getPage();
+					$pdf->setTopMargin($tab_top_newpage);
+					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pageposbefore = $pdf->getPage();
 
-	                $showpricebeforepagebreak = 1;
-	                $posYAfterImage = 0;
+					$showpricebeforepagebreak = 1;
+					$posYAfterImage = 0;
 
-	                if ($this->getColumnStatus('photo'))
-	                {
-    	                // We start with Photo of product line
-    	                if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// If photo too high, we moved completely on new page
-    	                {
-    	                    $pdf->AddPage('', '', true);
-    	                    if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-    	                    $pdf->setPage($pageposbefore + 1);
+					if ($this->getColumnStatus('photo'))
+					{
+						// We start with Photo of product line
+						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// If photo too high, we moved completely on new page
+						{
+							$pdf->AddPage('', '', true);
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							$pdf->setPage($pageposbefore + 1);
 
-    	                    $curY = $tab_top_newpage;
+							$curY = $tab_top_newpage;
 
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
 							else $showpricebeforepagebreak = 0;
-    	                }
+						}
 
-    	                if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
-    	                {
-    	                    $pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
-    	                    // $pdf->Image does not increase value return by getY, so we save it manually
-    	                    $posYAfterImage = $curY + $imglinesize['height'];
-    	                }
-	                }
+						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
+						{
+							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
+							// $pdf->Image does not increase value return by getY, so we save it manually
+							$posYAfterImage = $curY + $imglinesize['height'];
+						}
+					}
 
-	                // Description of product line
-	                if ($this->getColumnStatus('desc'))
-	                {
-    	                $pdf->startTransaction();
+					// Description of product line
+					if ($this->getColumnStatus('desc'))
+					{
+						$pdf->startTransaction();
 
-                        $this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
-    	                $pageposafter = $pdf->getPage();
+						$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
+						$pageposafter = $pdf->getPage();
 
-    	                if ($pageposafter > $pageposbefore)	// There is a pagebreak
-    	                {
-    	                    $pdf->rollbackTransaction(true);
-    	                    $pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+						if ($pageposafter > $pageposbefore)	// There is a pagebreak
+						{
+							$pdf->rollbackTransaction(true);
+							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
-                            $this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
+							$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
 
-    	                    $pageposafter = $pdf->getPage();
-    	                    $posyafter = $pdf->GetY();
-    	                    //var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-    	                    if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
-    	                    {
-    	                        if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-    	                        {
-    	                            $pdf->AddPage('', '', true);
-    	                            if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-    	                            $pdf->setPage($pageposafter + 1);
-    	                        }
-    	                    } else {
-    	                        // We found a page break
+							$pageposafter = $pdf->getPage();
+							$posyafter = $pdf->GetY();
+							//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
+							{
+								if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
+								{
+									$pdf->AddPage('', '', true);
+									if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+									$pdf->setPage($pageposafter + 1);
+								}
+							} else {
+								// We found a page break
 								// Allows data in the first page if description is long enough to break in multiples pages
 								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 									$showpricebeforepagebreak = 1;
 								else $showpricebeforepagebreak = 0;
-    	                    }
-    	                } else // No pagebreak
-    	                {
-    	                    $pdf->commitTransaction();
-    	                }
-	                }
+							}
+						} else // No pagebreak
+						{
+							$pdf->commitTransaction();
+						}
+					}
 
-                    $nexY = $pdf->GetY();
-	                $pageposafter = $pdf->getPage();
-	                $pdf->setPage($pageposbefore);
-	                $pdf->setTopMargin($this->marge_haute);
-	                $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$nexY = $pdf->GetY();
+					$pageposafter = $pdf->getPage();
+					$pdf->setPage($pageposbefore);
+					$pdf->setTopMargin($this->marge_haute);
+					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 
-	                // We suppose that a too long description or photo were moved completely on next page
-	                if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
-	                    $pdf->setPage($pageposafter); $curY = $tab_top_newpage;
-	                }
+					// We suppose that a too long description or photo were moved completely on next page
+					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
+						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
+					}
 
-	                $pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
 
-	                // Quantity
-	                // Enough for 6 chars
-	                if ($this->getColumnStatus('qty'))
-	                {
-	                    $qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
-	                    $this->printStdColumnContent($pdf, $curY, 'qty', $qty);
-	                    $nexY = max($pdf->GetY(), $nexY);
-	                }
+					// Quantity
+					// Enough for 6 chars
+					if ($this->getColumnStatus('qty'))
+					{
+						$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
+						$this->printStdColumnContent($pdf, $curY, 'qty', $qty);
+						$nexY = max($pdf->GetY(), $nexY);
+					}
 
-                    // Extrafields
-	                if (!empty($object->lines[$i]->array_options)) {
-	                    foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
-                            if ($this->getColumnStatus($extrafieldColKey))
-                            {
-                                $extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey);
-                                $this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
-                                $nexY = max($pdf->GetY(), $nexY);
-                            }
-                        }
-                    }
+					// Extrafields
+					if (!empty($object->lines[$i]->array_options)) {
+						foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
+							if ($this->getColumnStatus($extrafieldColKey))
+							{
+								$extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey);
+								$this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
+								$nexY = max($pdf->GetY(), $nexY);
+							}
+						}
+					}
 
 
-	                $parameters = array(
-	                    'object' => $object,
-	                    'i' => $i,
-	                    'pdf' =>& $pdf,
-	                    'curY' =>& $curY,
-	                    'nexY' =>& $nexY,
-	                    'outputlangs' => $outputlangs,
-	                    'hidedetails' => $hidedetails
-	                );
-	                $reshook = $hookmanager->executeHooks('printPDFline', $parameters, $this); // Note that $object may have been modified by hook
+					$parameters = array(
+						'object' => $object,
+						'i' => $i,
+						'pdf' =>& $pdf,
+						'curY' =>& $curY,
+						'nexY' =>& $nexY,
+						'outputlangs' => $outputlangs,
+						'hidedetails' => $hidedetails
+					);
+					$reshook = $hookmanager->executeHooks('printPDFline', $parameters, $this); // Note that $object may have been modified by hook
 
 
-	                $sign = 1;
-	                // Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-	                $prev_progress = $object->lines[$i]->get_prev_progress($object->id);
-	                if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) // Compute progress from previous situation
-	                {
-	                    if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
-	                    else $tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
-	                } else {
-	                    if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva;
-	                    else $tvaligne = $sign * $object->lines[$i]->total_tva;
-	                }
+					$sign = 1;
+					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
+					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
+					if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) // Compute progress from previous situation
+					{
+						if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
+						else $tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
+					} else {
+						if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva;
+						else $tvaligne = $sign * $object->lines[$i]->total_tva;
+					}
 
-	                $localtax1ligne = $object->lines[$i]->total_localtax1;
-	                $localtax2ligne = $object->lines[$i]->total_localtax2;
-	                $localtax1_rate = $object->lines[$i]->localtax1_tx;
-	                $localtax2_rate = $object->lines[$i]->localtax2_tx;
-	                $localtax1_type = $object->lines[$i]->localtax1_type;
-	                $localtax2_type = $object->lines[$i]->localtax2_type;
+					$localtax1ligne = $object->lines[$i]->total_localtax1;
+					$localtax2ligne = $object->lines[$i]->total_localtax2;
+					$localtax1_rate = $object->lines[$i]->localtax1_tx;
+					$localtax2_rate = $object->lines[$i]->localtax2_tx;
+					$localtax1_type = $object->lines[$i]->localtax1_type;
+					$localtax2_type = $object->lines[$i]->localtax2_type;
 
-	                if ($object->remise_percent) $tvaligne -= ($tvaligne * $object->remise_percent) / 100;
-	                if ($object->remise_percent) $localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
-	                if ($object->remise_percent) $localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
+					if ($object->remise_percent) $tvaligne -= ($tvaligne * $object->remise_percent) / 100;
+					if ($object->remise_percent) $localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
+					if ($object->remise_percent) $localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
 
-	                $vatrate = (string) $object->lines[$i]->tva_tx;
+					$vatrate = (string) $object->lines[$i]->tva_tx;
 
-	                // Retrieve type from database for backward compatibility with old records
-	                if ((!isset($localtax1_type) || $localtax1_type == '' || !isset($localtax2_type) || $localtax2_type == '') // if tax type not defined
-	                    && (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
-	                {
-	                    $localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
-	                    $localtax1_type = $localtaxtmp_array[0];
-	                    $localtax2_type = $localtaxtmp_array[2];
-	                }
+					// Retrieve type from database for backward compatibility with old records
+					if ((!isset($localtax1_type) || $localtax1_type == '' || !isset($localtax2_type) || $localtax2_type == '') // if tax type not defined
+						&& (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
+					{
+						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
+						$localtax1_type = $localtaxtmp_array[0];
+						$localtax2_type = $localtaxtmp_array[2];
+					}
 
-	                // retrieve global local tax
-                    if ($localtax1_type && $localtax1ligne != 0) {
-                        $this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
-                    }
-                    if ($localtax2_type && $localtax2ligne != 0) {
-                        $this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
-                    }
+					// retrieve global local tax
+					if ($localtax1_type && $localtax1ligne != 0) {
+						$this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
+					}
+					if ($localtax2_type && $localtax2ligne != 0) {
+						$this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
+					}
 
-                    if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate .= '*';
-                    if (!isset($this->tva[$vatrate])) 				$this->tva[$vatrate] = 0;
-                    $this->tva[$vatrate] += $tvaligne;
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate .= '*';
+					if (!isset($this->tva[$vatrate])) 				$this->tva[$vatrate] = 0;
+					$this->tva[$vatrate] += $tvaligne;
 
-                    $nexY = max($nexY, $posYAfterImage);
+					$nexY = max($nexY, $posYAfterImage);
 
-                    // Add line
-                    if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
-                        $pdf->setPage($pageposafter);
-                        $pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
-                        //$pdf->SetDrawColor(190,190,200);
-                        $pdf->line($this->marge_gauche, $nexY, $this->page_largeur - $this->marge_droite, $nexY);
-                        $pdf->SetLineStyle(array('dash'=>0));
-                    }
+					// Add line
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+						$pdf->setPage($pageposafter);
+						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						//$pdf->SetDrawColor(190,190,200);
+						$pdf->line($this->marge_gauche, $nexY, $this->page_largeur - $this->marge_droite, $nexY);
+						$pdf->SetLineStyle(array('dash'=>0));
+					}
 
-                    // Detect if some page were added automatically and output _tableau for past pages
-                    while ($pagenb < $pageposafter) {
-                        $pdf->setPage($pagenb);
-                        if ($pagenb == $pageposbeforeprintlines) {
-                            $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
-                        } else {
-                        	$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
-                        }
-                        $this->_pagefoot($pdf, $object, $outputlangs, 1);
-                        $pagenb++;
-                        $pdf->setPage($pagenb);
-                        $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-                        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-                    }
+					// Detect if some page were added automatically and output _tableau for past pages
+					while ($pagenb < $pageposafter) {
+						$pdf->setPage($pagenb);
+						if ($pagenb == $pageposbeforeprintlines) {
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
+						} else {
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
+						}
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
+						$pagenb++;
+						$pdf->setPage($pagenb);
+						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					}
 
-                    if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
-                        if ($pagenb == $pageposafter) {
-                        	$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
-                        } else {
-                        	$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
-                        }
-                        $this->_pagefoot($pdf, $object, $outputlangs, 1);
-                        // New page
-                        $pdf->AddPage();
-                        if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-                        $pagenb++;
-                        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-                    }
-	            }
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == $pageposafter) {
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
+						} else {
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
+						}
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
+						// New page
+						$pdf->AddPage();
+						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						$pagenb++;
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					}
+				}
 
-	            // Show square
-	            if ($pagenb == $pageposbeforeprintlines)
-	            {
-	            	$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code, $outputlangsbis);
-	                $bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-	            } else {
-	            	$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code, $outputlangsbis);
-	                $bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-	            }
+				// Show square
+				if ($pagenb == $pageposbeforeprintlines)
+				{
+					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code, $outputlangsbis);
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				} else {
+					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code, $outputlangsbis);
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				}
 
-	            // Display infos area
-	            //$posy = $this->drawInfoTable($pdf, $object, $bottomlasttab, $outputlangs);
+				// Display infos area
+				//$posy = $this->drawInfoTable($pdf, $object, $bottomlasttab, $outputlangs);
 
-	            // Display total zone
-	            //$posy = $this->drawTotalTable($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
+				// Display total zone
+				//$posy = $this->drawTotalTable($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
 
-	            // Display payment area
-	            /*
+				// Display payment area
+				/*
 	            if (($deja_regle || $amount_credit_notes_included || $amount_deposits_included) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS))
 	            {
 	                $posy = $this->drawPaymentsTable($pdf, $object, $posy, $outputlangs);
 	            }
 	            */
 
-	            // Pagefoot
-	            $this->_pagefoot($pdf, $object, $outputlangs);
-	            if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				// Pagefoot
+				$this->_pagefoot($pdf, $object, $outputlangs);
+				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
 
-	            $pdf->Close();
+				$pdf->Close();
 
-	            $pdf->Output($file, 'F');
+				$pdf->Output($file, 'F');
 
-	            // Add pdfgeneration hook
-	            $hookmanager->initHooks(array('pdfgeneration'));
-	            $parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
-	            global $action;
-	            $reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-	            if ($reshook < 0)
-	            {
-	                $this->error = $hookmanager->error;
-	                $this->errors = $hookmanager->errors;
-	            }
+				// Add pdfgeneration hook
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+				if ($reshook < 0)
+				{
+					$this->error = $hookmanager->error;
+					$this->errors = $hookmanager->errors;
+				}
 
-	            if (!empty($conf->global->MAIN_UMASK))
-	                @chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (!empty($conf->global->MAIN_UMASK))
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
 
-	                $this->result = array('fullpath'=>$file);
+					$this->result = array('fullpath'=>$file);
 
-	                return 1; // No error
-	        } else {
-	            $this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
-	            return 0;
-	        }
-	    } else {
-	        $this->error = $langs->transnoentities("ErrorConstantNotDefined", "FAC_OUTPUTDIR");
-	        return 0;
-	    }
+					return 1; // No error
+			} else {
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+				return 0;
+			}
+		} else {
+			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "FAC_OUTPUTDIR");
+			return 0;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -872,7 +872,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 		$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
 
 		if (empty($hidetop)) {
-		    $pdf->line($this->marge_gauche, $tab_top + $this->tabTitleHeight, $this->page_largeur - $this->marge_droite, $tab_top + $this->tabTitleHeight); // line takes a position y in 2nd parameter and 4th parameter
+			$pdf->line($this->marge_gauche, $tab_top + $this->tabTitleHeight, $this->page_largeur - $this->marge_droite, $tab_top + $this->tabTitleHeight); // line takes a position y in 2nd parameter and 4th parameter
 		}
 	}
 
@@ -900,9 +900,9 @@ class pdf_standard_myobject extends ModelePDFMyObject
 
 		// Show Draft Watermark
 		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK)))
-        {
-		      pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FACTURE_DRAFT_WATERMARK);
-        }
+		{
+			  pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FACTURE_DRAFT_WATERMARK);
+		}
 
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
@@ -910,7 +910,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 		$w = 110;
 
 		$posy = $this->marge_haute;
-        $posx = $this->page_largeur - $this->marge_droite - $w;
+		$posx = $this->page_largeur - $this->marge_droite - $w;
 
 		$pdf->SetXY($this->marge_gauche, $posy);
 
@@ -929,7 +929,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 				}
 				if (is_readable($logo))
 				{
-				    $height = pdf_getHeightForLogo($logo);
+					$height = pdf_getHeightForLogo($logo);
 					$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 				} else {
 					$pdf->SetTextColor(200, 0, 0);
@@ -1022,16 +1022,16 @@ class pdf_standard_myobject extends ModelePDFMyObject
 		// Get contact
 		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
 		{
-		    $arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-		    if (count($arrayidcontact) > 0)
-		    {
-		        $usertmp = new User($this->db);
-		        $usertmp->fetch($arrayidcontact[0]);
-                $posy += 4;
-                $pdf->SetXY($posx, $posy);
-		        $pdf->SetTextColor(0, 0, 60);
-		        $pdf->MultiCell($w, 3, $langs->transnoentities("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
-		    }
+			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
+			if (count($arrayidcontact) > 0)
+			{
+				$usertmp = new User($this->db);
+				$usertmp->fetch($arrayidcontact[0]);
+				$posy += 4;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 3, $langs->transnoentities("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
+			}
 		}
 
 		$posy += 1;
@@ -1091,7 +1091,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 			}
 
 			// Recipient name
-			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -1138,7 +1138,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
-     *
+	 *
 	 *   	@param	TCPDF		$pdf     			PDF
 	 * 		@param	Object		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
@@ -1148,7 +1148,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'INVOICE_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 
@@ -1157,28 +1157,28 @@ class pdf_standard_myobject extends ModelePDFMyObject
 	 *
 	 *  @param	object			$object    		common object
 	 *  @param	Translate		$outputlangs    langs
-     *  @param	int			   $hidedetails		Do not show line details
-     *  @param	int			   $hidedesc		Do not show desc
-     *  @param	int			   $hideref			Do not show ref
-     *  @return	null
-     */
-    public function defineColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
-    {
-	    global $conf, $hookmanager;
+	 *  @param	int			   $hidedetails		Do not show line details
+	 *  @param	int			   $hidedesc		Do not show desc
+	 *  @param	int			   $hideref			Do not show ref
+	 *  @return	null
+	 */
+	public function defineColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		global $conf, $hookmanager;
 
-	    // Default field style for content
-	    $this->defaultContentsFieldsStyle = array(
-	        'align' => 'R', // R,C,L
-	        'padding' => array(1, 0.5, 1, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	    );
+		// Default field style for content
+		$this->defaultContentsFieldsStyle = array(
+			'align' => 'R', // R,C,L
+			'padding' => array(1, 0.5, 1, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+		);
 
-	    // Default field style for content
-	    $this->defaultTitlesFieldsStyle = array(
-	        'align' => 'C', // R,C,L
-	        'padding' => array(0.5, 0, 0.5, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	    );
+		// Default field style for content
+		$this->defaultTitlesFieldsStyle = array(
+			'align' => 'C', // R,C,L
+			'padding' => array(0.5, 0, 0.5, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+		);
 
-	    /*
+		/*
 	     * For exemple
 	    $this->cols['theColKey'] = array(
 	        'rank' => $rank, // int : use for ordering columns
@@ -1196,162 +1196,162 @@ class pdf_standard_myobject extends ModelePDFMyObject
 	    );
 	    */
 
-	    $rank = 0; // do not use negative rank
-	    $this->cols['desc'] = array(
-	        'rank' => $rank,
-	        'width' => false, // only for desc
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'Designation', // use lang key is usefull in somme case with module
-	            'align' => 'L',
-	            // 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
-	            // 'label' => ' ', // the final label
-	            'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	        ),
-	        'content' => array(
-	            'align' => 'L',
-                'padding' => array(1, 0.5, 1, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	        ),
-	    );
+		$rank = 0; // do not use negative rank
+		$this->cols['desc'] = array(
+			'rank' => $rank,
+			'width' => false, // only for desc
+			'status' => true,
+			'title' => array(
+				'textkey' => 'Designation', // use lang key is usefull in somme case with module
+				'align' => 'L',
+				// 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
+				// 'label' => ' ', // the final label
+				'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+			'content' => array(
+				'align' => 'L',
+				'padding' => array(1, 0.5, 1, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+		);
 
-	    // PHOTO
-        $rank = $rank + 10;
-        $this->cols['photo'] = array(
-            'rank' => $rank,
-            'width' => (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
-            'status' => false,
-            'title' => array(
-                'textkey' => 'Photo',
-                'label' => ' '
-            ),
-            'content' => array(
-                'padding' => array(0, 0, 0, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-            ),
-            'border-left' => false, // remove left line separator
-        );
+		// PHOTO
+		$rank = $rank + 10;
+		$this->cols['photo'] = array(
+			'rank' => $rank,
+			'width' => (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'Photo',
+				'label' => ' '
+			),
+			'content' => array(
+				'padding' => array(0, 0, 0, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+			'border-left' => false, // remove left line separator
+		);
 
-	    if (!empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE) && !empty($this->atleastonephoto))
-	    {
-	        $this->cols['photo']['status'] = true;
-	    }
+		if (!empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE) && !empty($this->atleastonephoto))
+		{
+			$this->cols['photo']['status'] = true;
+		}
 
 
-	    $rank = $rank + 10;
-	    $this->cols['vat'] = array(
-	        'rank' => $rank,
-	        'status' => false,
-	        'width' => 16, // in mm
-	        'title' => array(
-	            'textkey' => 'VAT'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 10;
+		$this->cols['vat'] = array(
+			'rank' => $rank,
+			'status' => false,
+			'width' => 16, // in mm
+			'title' => array(
+				'textkey' => 'VAT'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
-	    {
-	        $this->cols['vat']['status'] = true;
-	    }
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
+		{
+			$this->cols['vat']['status'] = true;
+		}
 
-	    $rank = $rank + 10;
-	    $this->cols['subprice'] = array(
-	        'rank' => $rank,
-	        'width' => 19, // in mm
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'PriceUHT'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 10;
+		$this->cols['subprice'] = array(
+			'rank' => $rank,
+			'width' => 19, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'PriceUHT'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    $rank = $rank + 10;
-	    $this->cols['qty'] = array(
-	        'rank' => $rank,
-	        'width' => 16, // in mm
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'Qty'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 10;
+		$this->cols['qty'] = array(
+			'rank' => $rank,
+			'width' => 16, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'Qty'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    $rank = $rank + 10;
-	    $this->cols['progress'] = array(
-	        'rank' => $rank,
-	        'width' => 19, // in mm
-	        'status' => false,
-	        'title' => array(
-	            'textkey' => 'Progress'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 10;
+		$this->cols['progress'] = array(
+			'rank' => $rank,
+			'width' => 19, // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'Progress'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    if ($this->situationinvoice)
-	    {
-	        $this->cols['progress']['status'] = true;
-	    }
+		if ($this->situationinvoice)
+		{
+			$this->cols['progress']['status'] = true;
+		}
 
-	    $rank = $rank + 10;
-	    $this->cols['unit'] = array(
-	        'rank' => $rank,
-	        'width' => 11, // in mm
-	        'status' => false,
-	        'title' => array(
-	            'textkey' => 'Unit'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
-	    if ($conf->global->PRODUCT_USE_UNITS) {
-	        $this->cols['unit']['status'] = true;
-	    }
+		$rank = $rank + 10;
+		$this->cols['unit'] = array(
+			'rank' => $rank,
+			'width' => 11, // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'Unit'
+			),
+			'border-left' => true, // add left line separator
+		);
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+			$this->cols['unit']['status'] = true;
+		}
 
-	    $rank = $rank + 10;
-	    $this->cols['discount'] = array(
-	        'rank' => $rank,
-	        'width' => 13, // in mm
-	        'status' => false,
-	        'title' => array(
-	            'textkey' => 'ReductionShort'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
-	    if ($this->atleastonediscount) {
-	        $this->cols['discount']['status'] = true;
-	    }
+		$rank = $rank + 10;
+		$this->cols['discount'] = array(
+			'rank' => $rank,
+			'width' => 13, // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'ReductionShort'
+			),
+			'border-left' => true, // add left line separator
+		);
+		if ($this->atleastonediscount) {
+			$this->cols['discount']['status'] = true;
+		}
 
-	    $rank = $rank + 1000; // add a big offset to be sure is the last col because default extrafield rank is 100
-	    $this->cols['totalexcltax'] = array(
-	        'rank' => $rank,
-	        'width' => 26, // in mm
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'TotalHT'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 1000; // add a big offset to be sure is the last col because default extrafield rank is 100
+		$this->cols['totalexcltax'] = array(
+			'rank' => $rank,
+			'width' => 26, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'TotalHT'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    // Add extrafields cols
-        if (!empty($object->lines)) {
-            $line = reset($object->lines);
-            $this->defineColumnExtrafield($line, $outputlangs, $hidedetails);
-        }
+		// Add extrafields cols
+		if (!empty($object->lines)) {
+			$line = reset($object->lines);
+			$this->defineColumnExtrafield($line, $outputlangs, $hidedetails);
+		}
 
-	    $parameters = array(
-	        'object' => $object,
-	        'outputlangs' => $outputlangs,
-	        'hidedetails' => $hidedetails,
-	        'hidedesc' => $hidedesc,
-	        'hideref' => $hideref
-	    );
+		$parameters = array(
+			'object' => $object,
+			'outputlangs' => $outputlangs,
+			'hidedetails' => $hidedetails,
+			'hidedesc' => $hidedesc,
+			'hideref' => $hideref
+		);
 
-	    $reshook = $hookmanager->executeHooks('defineColumnField', $parameters, $this); // Note that $object may have been modified by hook
-	    if ($reshook < 0)
-	    {
-	        setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	    } elseif (empty($reshook))
-	    {
-	        $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
-	    } else {
-	        $this->cols = $hookmanager->resArray;
-	    }
+		$reshook = $hookmanager->executeHooks('defineColumnField', $parameters, $this); // Note that $object may have been modified by hook
+		if ($reshook < 0)
+		{
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		} elseif (empty($reshook))
+		{
+			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
+		} else {
+			$this->cols = $hookmanager->resArray;
+		}
 	}
 }
diff --git a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
index 4c5951dad70..8c0f39927bd 100644
--- a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
+++ b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
@@ -40,11 +40,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
  */
 class InterfaceMyModuleTriggers extends DolibarrTriggers
 {
-	/**
-	 * @var DoliDB Database handler
-	 */
-	protected $db;
-
 	/**
 	 * Constructor
 	 *
@@ -102,6 +97,19 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
 		// Put here code you want to execute when a Dolibarr business events occurs.
 		// Data and type of action are stored into $object and $action
 
+		// You can isolate code for each action in a separate method: this method should be named like the trigger in camelCase.
+		// For example : COMPANY_CREATE => public function companyCreate($action, $object, User $user, Translate $langs, Conf $conf)
+		$methodName = lcfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', strtolower($action)))));
+		$callback = array($this, $methodName);
+		if (is_callable($callback)) {
+			dol_syslog(
+				"Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
+			);
+
+			return call_user_func($callback, $action, $object, $user, $langs, $conf);
+		};
+
+		// Or you can execute some code here
 		switch ($action) {
 			// Users
 			//case 'USER_CREATE':
diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index ce17b93a660..4889146d2c9 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -22,25 +22,26 @@
  *  \brief      Tab of events on MyObject
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER','1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC','1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN','1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION','1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK','1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL','1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK','1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML','1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX','1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN",'1');						// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK','1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT','auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP','none');					// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN','1');		// Force use of CSRF protection with tokens even for GET
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
+//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
 
 // Load Dolibarr environment
 $res = 0;
@@ -157,7 +158,7 @@ if ($object->id > 0)
 	$head = myobjectPrepareHead($object);
 
 
-	dol_fiche_head($head, 'agenda', $langs->trans("MyObject"), -1, 'object_'.$object->picto);
+	print dol_get_fiche_head($head, 'agenda', $langs->trans("MyObject"), -1, 'object_'.$object->picto);
 
 	// Object card
 	// ------------------------------------------------------------
@@ -214,7 +215,7 @@ if ($object->id > 0)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 
@@ -223,14 +224,14 @@ if ($object->id > 0)
 	$objthirdparty = $object;
 	$objcon = new stdClass();
 
-	$out = '&amp;origin='.$object->element.'%40'.$object->module.'&amp;originid='.$object->id;
+	$out = '&origin='.urlencode($object->element.'@'.$object->module).'&originid='.urlencode($object->id);
 	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
-	$out .= '&amp;backtopage='.urlencode($urlbacktopage);
+	$out .= '&backtopage='.urlencode($urlbacktopage);
 	$permok = $user->rights->agenda->myactions->create;
 	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
 	{
-		if (get_class($objthirdparty) == 'Societe') $out .= '&amp;socid='.$objthirdparty->id;
-		$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;percentage=-1';
+		if (get_class($objthirdparty) == 'Societe') $out .= '&socid='.urlencode($objthirdparty->id);
+		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '').'&percentage=-1';
 		//$out.=$langs->trans("AddAnAction").' ';
 		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
 		//$out.="</a>";
@@ -265,7 +266,7 @@ if ($object->id > 0)
 		$filters['search_agenda_label'] = $search_agenda_label;
 
 		// TODO Replace this with same code than into list.php
-		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, 'mymmodule');
+		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, $object->module);
 	}
 }
 
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 1dacbcaac87..cc6630c5a01 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -22,25 +22,26 @@
  *		\brief      Page to create/edit/view myobject
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER','1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC','1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN','1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION','1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK','1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL','1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK','1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML','1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX','1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN",'1');						// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK','1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT','auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP','none');					// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN','1');		// Force use of CSRF protection with tokens even for GET
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
+//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
 
 // Load Dolibarr environment
 $res = 0;
@@ -138,6 +139,7 @@ if (empty($reshook))
 			else $backtopage = dol_buildpath('/mymodule/myobject_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
 		}
 	}
+
 	$triggermodname = 'MYMODULE_MYOBJECT_MODIFY'; // Name of trigger action code to execute when we modify record
 
 	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
@@ -215,7 +217,7 @@ if ($action == 'create')
 	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 
-	dol_fiche_head(array(), '');
+	print dol_get_fiche_head(array(), '');
 
 	// Set some default values
 	//if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue';
@@ -230,12 +232,12 @@ if ($action == 'create')
 
 	print '</table>'."\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
 	print '&nbsp; ';
-	print '<input type="'.($backtopage ? "submit" : "button").'" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
+	print '<input type="'.($backtopage ? "submit" : "button").'" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
 	print '</div>';
 
 	print '</form>';
@@ -255,7 +257,7 @@ if (($id || $ref) && $action == 'edit')
 	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent tableforfieldedit">'."\n";
 
@@ -267,10 +269,10 @@ if (($id || $ref) && $action == 'edit')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
-	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+	print ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
@@ -282,7 +284,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$res = $object->fetch_optionals();
 
 	$head = myobjectPrepareHead($object);
-	dol_fiche_head($head, 'card', $langs->trans("MyObject"), -1, $object->picto);
+	print dol_get_fiche_head($head, 'card', $langs->trans("MyObject"), -1, $object->picto);
 
 	$formconfirm = '';
 
@@ -395,7 +397,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	/*
@@ -545,11 +547,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		// Documents
 		if ($includedocgeneration) {
 			$objref = dol_sanitizeFileName($object->ref);
-			$relativepath = $objref . '/' . $objref . '.pdf';
+			$relativepath = $objref.'/'.$objref.'.pdf';
 			$filedir = $conf->mymodule->dir_output.'/'.$object->element.'/'.$objref;
-			$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
-			$genallowed = $user->rights->mymodule->myobject->read;	// If you can read, you can build the PDF to read content
-			$delallowed = $user->rights->mymodule->myobject->write;	// If you can create/edit, you can remove a file on card
+			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+			$genallowed = $user->rights->mymodule->myobject->read; // If you can read, you can build the PDF to read content
+			$delallowed = $user->rights->mymodule->myobject->write; // If you can create/edit, you can remove a file on card
 			print $formfile->showdocuments('mymodule:MyObject', $object->element.'/'.$objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
 		}
 
diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index 46a8d0c3a10..7399fa6fb09 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -22,25 +22,26 @@
  *  \brief      Tab for documents linked to MyObject
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER','1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC','1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN','1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION','1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK','1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL','1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK','1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML','1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX','1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN",'1');						// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK','1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT','auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP','none');					// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN','1');		// Force use of CSRF protection with tokens even for GET
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
+//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
 
 // Load Dolibarr environment
 $res = 0;
@@ -97,8 +98,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
-//if ($id > 0 || ! empty($ref)) $upload_dir = $conf->mymodule->multidir_output[$object->entity?$object->entity:$conf->entity] . "/myobject/" . dol_sanitizeFileName($object->id);
-if ($id > 0 || !empty($ref)) $upload_dir = $conf->mymodule->multidir_output[$object->entity ? $object->entity : $conf->entity]."/myobject/".dol_sanitizeFileName($object->ref);
+if ($id > 0 || !empty($ref)) $upload_dir = $conf->mymodule->multidir_output[$object->entity ? $object->entity : $conf->entity]."/myobject/".get_exdir(0, 0, 0, 1, $object);
 
 // Security check - Protection if external user
 //if ($user->socid > 0) accessforbidden();
@@ -134,7 +134,7 @@ if ($object->id)
 	 */
 	$head = myobjectPrepareHead($object);
 
-	dol_fiche_head($head, 'document', $langs->trans("MyObject"), -1, $object->picto);
+	print dol_get_fiche_head($head, 'document', $langs->trans("MyObject"), -1, $object->picto);
 
 
 	// Build file list
@@ -206,7 +206,7 @@ if ($object->id)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$modulepart = 'mymodule';
 	//$permission = $user->rights->mymodule->myobject->write;
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index e79128e1657..a4cb238d83e 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -22,25 +22,26 @@
  *		\brief      List page for myobject
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER','1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC','1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN','1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION','1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK','1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL','1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK','1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML','1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX','1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN",'1');						// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK','1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT','auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP','none');					// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN','1');		// Force use of CSRF protection with tokens even for GET
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
+//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
 
 // Load Dolibarr environment
 $res = 0;
@@ -140,22 +141,8 @@ foreach ($object->fields as $key => $val)
 	}
 }
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
-			$arrayfields["ef.".$key] = array(
-				'label'=>$extrafields->attributes[$object->table_element]['label'][$key],
-				'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1),
-				'position'=>$extrafields->attributes[$object->table_element]['pos'][$key],
-				'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]),
-				'langfile'=>$extrafields->attributes[$object->table_element]['langfile'][$key],
-				'help'=>$extrafields->attributes[$object->table_element]['help'][$key]
-			);
-		}
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
@@ -248,6 +235,10 @@ $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
+// Add table from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 if ($object->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (".getEntity($object->element).")";
 else $sql .= " WHERE 1 = 1";
 foreach ($search as $key => $val)
@@ -281,7 +272,7 @@ if (! empty($extrafields->attributes[$object->table_element]['label'])) {
 }
 // Add where from hooks
 $parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListGroupBy',$parameters);    // Note that $action and $object may have been modified by hook
+$reshook=$hookmanager->executeHooks('printFieldListGroupBy',$parameters, $object);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 $sql=preg_replace('/,\s*$/','', $sql);
 */
@@ -290,26 +281,22 @@ $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$resql = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($resql);
-	if (($page * $limit) > $nbtotalofrecords)	// if total of record found is smaller than page * limit, goto and load page 0
-	{
+	if (($page * $limit) > $nbtotalofrecords) {	// if total of record found is smaller than page * limit, goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
 }
 // if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
-if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
-{
+if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) {
 	$num = $nbtotalofrecords;
 } else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
-	if (!$resql)
-	{
+	if (!$resql) {
 		dol_print_error($db);
 		exit;
 	}
@@ -360,6 +347,10 @@ foreach ($search as $key => $val)
 if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+// Add $param from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
+$param .= $hookmanager->resPrint;
 
 // List of mass actions available
 $arrayofmassactions = array(
@@ -436,9 +427,9 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
-			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
+			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
@@ -463,7 +454,7 @@ print '</tr>'."\n";
 print '<tr class="liste_titre">';
 foreach ($object->fields as $key => $val)
 {
-	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
 	elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
 	elseif (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
diff --git a/htdocs/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php
index 1a6fd1a4cc6..f56585497ea 100644
--- a/htdocs/modulebuilder/template/myobject_note.php
+++ b/htdocs/modulebuilder/template/myobject_note.php
@@ -22,25 +22,26 @@
  *  \brief      Tab for notes on MyObject
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER','1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC','1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN','1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION','1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK','1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL','1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK','1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML','1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX','1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN",'1');						// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK','1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT','auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP','none');					// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN','1');		// Force use of CSRF protection with tokens even for GET
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
+//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
 
 // Load Dolibarr environment
 $res = 0;
@@ -115,7 +116,7 @@ if ($id > 0 || !empty($ref))
 
 	$head = myobjectPrepareHead($object);
 
-	dol_fiche_head($head, 'note', $langs->trans("MyObject"), -1, $object->picto);
+	print dol_get_fiche_head($head, 'note', $langs->trans("MyObject"), -1, $object->picto);
 
 	// Object card
 	// ------------------------------------------------------------
@@ -174,7 +175,7 @@ if ($id > 0 || !empty($ref))
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php b/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
index 169bfeb92f6..c37086f2219 100644
--- a/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
+++ b/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
@@ -22,7 +22,7 @@
  * \brief   PHPUnit test for MyObject class.
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -33,7 +33,7 @@ if (empty($user->id)) {
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 $langs->load("main");
 
@@ -60,11 +60,11 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 		parent::__construct();
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
 		//print " - db ".$db->db;
@@ -77,7 +77,7 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 	 */
 	public static function setUpBeforeClass()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		print __METHOD__."\n";
@@ -89,11 +89,11 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 	 */
 	protected function setUp()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		print __METHOD__."\n";
 	}
@@ -113,7 +113,7 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 	 */
 	public static function tearDownAfterClass()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -122,15 +122,16 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 
 	/**
 	 * A sample test
+	 *
 	 * @return bool
 	 */
 	public function testSomething()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		$result = true;
 
@@ -139,4 +140,53 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 
 		return $result;
 	}
+
+	/**
+	 * testMyObjectCreate
+	 *
+	 * @return int
+	 */
+	public function testMyObjectCreate()
+	{
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new MyObject($this->savdb);
+		$localobject->initAsSpecimen();
+		$result = $localobject->create($user);
+
+		print __METHOD__." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+
+		return $result;
+	}
+
+	/**
+	 * testMyObjectDelete
+	 *
+	 * @param	int		$id		Id of object
+	 * @return	int
+	 *
+	 * @depends	testMyObjectCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testMyObjectDelete($id)
+	{
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new MyObject($this->savdb);
+		$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
+
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $result;
+	}
 }
diff --git a/htdocs/mrp/class/api_mos.class.php b/htdocs/mrp/class/api_mos.class.php
index d502e5cc99d..281ec0fb731 100644
--- a/htdocs/mrp/class/api_mos.class.php
+++ b/htdocs/mrp/class/api_mos.class.php
@@ -107,32 +107,43 @@ class Mos extends DolibarrApi
 
 		// If the internal user must only see his customers, force searching by him
 		$search_sale = 0;
-		if ($restrictonsocid && !DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
+		if ($restrictonsocid && !DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) {
+			$search_sale = DolibarrApiAccess::$user->id;
+		}
 
 		$sql = "SELECT t.rowid";
-		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+			$sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX.$tmpobject->table_element." as t";
 
-		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		}
 		$sql .= " WHERE 1 = 1";
 
 		// Example of use $mode
 		//if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
 		//if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
 
-		if ($tmpobject->ismultientitymanaged) $sql .= ' AND t.entity IN ('.getEntity($tmpobject->element).')';
-		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-		if ($restrictonsocid && $socid) $sql .= " AND t.fk_soc = ".$socid;
-		if ($restrictonsocid && $search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		if ($tmpobject->ismultientitymanaged) {
+			$sql .= ' AND t.entity IN ('.getEntity($tmpobject->element).')';
+		}
+		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+			$sql .= " AND t.fk_soc = sc.fk_soc";
+		}
+		if ($restrictonsocid && $socid) {
+			$sql .= " AND t.fk_soc = ".$socid;
+		}
+		if ($restrictonsocid && $search_sale > 0) {
+			$sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		}
 		// Insert sale filter
-		if ($restrictonsocid && $search_sale > 0)
-		{
+		if ($restrictonsocid && $search_sale > 0) {
 			$sql .= " AND sc.fk_user = ".$search_sale;
 		}
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -141,8 +152,7 @@ class Mos extends DolibarrApi
 
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
-			if ($page < 0)
-			{
+			if ($page < 0) {
 				$page = 0;
 			}
 			$offset = $limit * $page;
@@ -151,12 +161,10 @@ class Mos extends DolibarrApi
 		}
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
 				$tmp_object = new Mo($this->db);
 				if ($tmp_object->fetch($obj->rowid)) {
@@ -164,8 +172,7 @@ class Mos extends DolibarrApi
 				}
 				$i++;
 			}
-		}
-		else {
+		} else {
 			throw new RestException(503, 'Error when retrieve MO list');
 		}
 		if (!count($obj_ret)) {
@@ -221,11 +228,13 @@ class Mos extends DolibarrApi
 		}
 
 		foreach ($request_data as $field => $value) {
-			if ($field == 'id') continue;
+			if ($field == 'id') {
+				continue;
+			}
 			$this->mo->$field = $value;
 		}
 
-		if ($this->mo->update($id, DolibarrApiAccess::$user) > 0) {
+		if ($this->mo->update(DolibarrApiAccess::$user) > 0) {
 			return $this->get($id);
 		} else {
 			throw new RestException(500, $this->mo->error);
@@ -252,8 +261,7 @@ class Mos extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		if (!$this->mo->delete(DolibarrApiAccess::$user))
-		{
+		if (!$this->mo->delete(DolibarrApiAccess::$user)) {
 			throw new RestException(500, 'Error when deleting MO : '.$this->mo->error);
 		}
 
@@ -270,8 +278,8 @@ class Mos extends DolibarrApi
 	/**
 	 * Clean sensible object datas
 	 *
-	 * @param   object  $object     Object to clean
-	 * @return  array               Array of cleaned object properties
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
 	 */
 	protected function _cleanObjectDatas($object)
 	{
@@ -317,8 +325,7 @@ class Mos extends DolibarrApi
 		// If object has lines, remove $db property
 		if (isset($object->lines) && is_array($object->lines) && count($object->lines) > 0) {
 			$nboflines = count($object->lines);
-			for ($i = 0; $i < $nboflines; $i++)
-			{
+			for ($i = 0; $i < $nboflines; $i++) {
 				$this->_cleanObjectDatas($object->lines[$i]);
 
 				unset($object->lines[$i]->lines);
@@ -341,9 +348,12 @@ class Mos extends DolibarrApi
 	{
 		$myobject = array();
 		foreach ($this->mo->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]))
+			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");
+			}
 				$myobject[$field] = $data[$field];
 		}
 		return $myobject;
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index c0d6658cab7..274782a14ea 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -97,17 +97,17 @@ class Mo extends CommonObject
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'position'=>5, 'notnull'=>1, 'default'=>'1', 'index'=>1),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>4, 'position'=>10, 'notnull'=>1, 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'showoncombobox'=>'1', 'noteditable'=>1),
 		'fk_bom' => array('type'=>'integer:Bom:bom/class/bom.class.php:0:t.status=1', 'filter'=>'active=1', 'label'=>'BOM', 'enabled'=>1, 'visible'=>1, 'position'=>33, 'notnull'=>-1, 'index'=>1, 'comment'=>"Original BOM", 'css'=>'maxwidth300'),
-		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:0', 'label'=>'Product', 'enabled'=>1, 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'comment'=>"Product to produce", 'css'=>'maxwidth300'),
-		'qty' => array('type'=>'real', 'label'=>'QtyToProduce', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'notnull'=>1, 'comment'=>"Qty to produce", 'css'=>'width75', 'isameasure'=>1),
+		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:0', 'label'=>'Product', 'enabled'=>1, 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'comment'=>"Product to produce", 'css'=>'maxwidth300', 'picto'=>'product'),
+		'qty' => array('type'=>'real', 'label'=>'QtyToProduce', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'notnull'=>1, 'comment'=>"Qty to produce", 'css'=>'width75', 'default'=>1, 'isameasure'=>1),
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>42, 'notnull'=>-1, 'searchall'=>1, 'showoncombobox'=>'1',),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1', 'label'=>'ThirdParty', 'enabled'=>1, 'visible'=>-1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'css'=>'maxwidth300'),
-		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'enabled'=>1, 'visible'=>-1, 'position'=>51, 'notnull'=>-1, 'index'=>1,),
-		'fk_warehouse' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:0', 'label'=>'WarehouseForProduction', 'enabled'=>1, 'visible'=>-1, 'position'=>52, 'css'=>'maxwidth300'),
-	    'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61, 'notnull'=>-1,),
+		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1', 'label'=>'ThirdParty', 'picto'=>'company', 'enabled'=>1, 'visible'=>-1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'css'=>'maxwidth400'),
+		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'picto'=>'project', 'enabled'=>1, 'visible'=>-1, 'position'=>51, 'notnull'=>-1, 'index'=>1, 'css'=>'minwidth200 maxwidth400'),
+		'fk_warehouse' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:0', 'label'=>'WarehouseForProduction', 'picto'=>'stock', 'enabled'=>1, 'visible'=>1, 'position'=>52, 'css'=>'maxwidth400'),
+		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61, 'notnull'=>-1,),
 		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>62, 'notnull'=>-1,),
 		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>500, 'notnull'=>1,),
 		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'position'=>501, 'notnull'=>-1,),
-		'date_valid' => array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>2, 'position'=>502,),
+		'date_valid' => array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-2, 'position'=>502,),
 		'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'position'=>510, 'notnull'=>1, 'foreignkey'=>'user.rowid',),
 		'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'position'=>511, 'notnull'=>-1,),
 		'date_start_planned' => array('type'=>'datetime', 'label'=>'DateStartPlannedMo', 'enabled'=>1, 'visible'=>1, 'position'=>55, 'notnull'=>-1, 'index'=>1, 'help'=>'KeepEmptyForAsap'),
@@ -166,17 +166,17 @@ class Mo extends CommonObject
 	// If this object has a subtable with lines
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	public $table_element_line = 'mo_production';
 
 	/**
-	 * @var int    Field with ID of parent key if this field has a parent
+	 * @var string    Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_mo';
 
 	/**
-	 * @var int    Name of subtable class that manage subtable lines
+	 * @var string    Name of subtable class that manage subtable lines
 	 */
 	public $class_element_line = 'MoLine';
 
@@ -223,7 +223,7 @@ class Mo extends CommonObject
 		// Translate some data of arrayofkeyval
 		foreach ($this->fields as $key => $val)
 		{
-			if (is_array($val['arrayofkeyval']))
+			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
 			{
 				foreach ($val['arrayofkeyval'] as $key2 => $val2)
 				{
@@ -249,6 +249,19 @@ class Mo extends CommonObject
 
 		$this->db->begin();
 
+		if ($this->fk_product > 0) {
+			include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+			$tmpproduct = new Product($this->db);
+			$tmpproduct->fetch($this->fk_product);
+			if ($tmpproduct->hasFatherOrChild(1) > 0) {
+				$this->error = 'ErrorAVirtualProductCantBeUsedIntoABomOrMo';
+				$this->errors[] = $this->error;
+				$this->db->rollback();
+				return -1;
+			}
+		}
+
+		// Check that product is not a kit/virtual product
 		if (!$error) {
 			$idcreated = $this->createCommon($user, $notrigger);
 			if ($idcreated <= 0) {
@@ -282,85 +295,85 @@ class Mo extends CommonObject
 	public function createFromClone(User $user, $fromid)
 	{
 		global $langs, $extrafields;
-	    $error = 0;
+		$error = 0;
 
-	    dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
-	    $object = new self($this->db);
+		$object = new self($this->db);
 
-	    $this->db->begin();
+		$this->db->begin();
 
-	    // Load source object
-	    $result = $object->fetchCommon($fromid);
-	    if ($result > 0 && !empty($object->table_element_line)) $object->fetchLines();
+		// Load source object
+		$result = $object->fetchCommon($fromid);
+		if ($result > 0 && !empty($object->table_element_line)) $object->fetchLines();
 
-	    // get lines so they will be clone
-	    //foreach($this->lines as $line)
-	    //	$line->fetch_optionals();
+		// get lines so they will be clone
+		//foreach($this->lines as $line)
+		//	$line->fetch_optionals();
 
-	    // Reset some properties
-	    unset($object->id);
-	    unset($object->fk_user_creat);
-	    unset($object->import_key);
+		// Reset some properties
+		unset($object->id);
+		unset($object->fk_user_creat);
+		unset($object->import_key);
 
-	    // Clear fields
-	    $object->ref = empty($this->fields['ref']['default']) ? "copy_of_".$object->ref : $this->fields['ref']['default'];
-	    $object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
-	    $object->status = self::STATUS_DRAFT;
-	    // ...
-	    // Clear extrafields that are unique
-	    if (is_array($object->array_options) && count($object->array_options) > 0)
-	    {
-	    	$extrafields->fetch_name_optionals_label($this->table_element);
-	    	foreach ($object->array_options as $key => $option)
-	    	{
-	    		$shortkey = preg_replace('/options_/', '', $key);
-	    		if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
-	    		{
-	    			//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
-	    			unset($object->array_options[$key]);
-	    		}
-	    	}
-	    }
+		// Clear fields
+		$object->ref = empty($this->fields['ref']['default']) ? "copy_of_".$object->ref : $this->fields['ref']['default'];
+		$object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
+		$object->status = self::STATUS_DRAFT;
+		// ...
+		// Clear extrafields that are unique
+		if (is_array($object->array_options) && count($object->array_options) > 0)
+		{
+			$extrafields->fetch_name_optionals_label($this->table_element);
+			foreach ($object->array_options as $key => $option)
+			{
+				$shortkey = preg_replace('/options_/', '', $key);
+				if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
+				{
+					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					unset($object->array_options[$key]);
+				}
+			}
+		}
 
-	    // Create clone
+		// Create clone
 		$object->context['createfromclone'] = 'createfromclone';
-	    $result = $object->createCommon($user);
-	    if ($result < 0) {
-	        $error++;
-	        $this->error = $object->error;
-	        $this->errors = $object->errors;
-	    }
+		$result = $object->createCommon($user);
+		if ($result < 0) {
+			$error++;
+			$this->error = $object->error;
+			$this->errors = $object->errors;
+		}
 
-	    if (!$error)
-	    {
-	    	// copy internal contacts
-	    	if ($this->copy_linked_contact($object, 'internal') < 0)
-	    	{
-	    		$error++;
-	    	}
-	    }
+		if (!$error)
+		{
+			// copy internal contacts
+			if ($this->copy_linked_contact($object, 'internal') < 0)
+			{
+				$error++;
+			}
+		}
 
-	    if (!$error)
-	    {
-	    	// copy external contacts if same company
-	    	if (property_exists($this, 'socid') && $this->socid == $object->socid)
-	    	{
-	    		if ($this->copy_linked_contact($object, 'external') < 0)
-	    			$error++;
-	    	}
-	    }
+		if (!$error)
+		{
+			// copy external contacts if same company
+			if (property_exists($this, 'socid') && $this->socid == $object->socid)
+			{
+				if ($this->copy_linked_contact($object, 'external') < 0)
+					$error++;
+			}
+		}
 
-	    unset($object->context['createfromclone']);
+		unset($object->context['createfromclone']);
 
-	    // End
-	    if (!$error) {
-	        $this->db->commit();
-	        return $object;
-	    } else {
-	        $this->db->rollback();
-	        return -1;
-	    }
+		// End
+		if (!$error) {
+			$this->db->commit();
+			return $object;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
 	}
 
 	/**
@@ -444,10 +457,10 @@ class Mo extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
-            $i = 0;
+			$i = 0;
 			while ($i < min($limit, $num))
 			{
-			    $obj = $this->db->fetch_object($resql);
+				$obj = $this->db->fetch_object($resql);
 
 				$record = new self($this->db);
 				$record->setVarsFromFetchObj($obj);
@@ -969,53 +982,53 @@ class Mo extends CommonObject
 		return $this->setStatusCommon($user, self::STATUS_VALIDATED, $notrigger, 'MRP_MO_REOPEN');
 	}
 
-    /**
-     *  Return a link to the object card (with optionaly the picto)
-     *
-     *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-     *  @param  string  $option                     On what the link point to ('nolink', '', 'production', ...)
-     *  @param  int     $notooltip                  1=Disable tooltip
-     *  @param  string  $morecss                    Add more css on link
-     *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *  @return	string                              String with URL
-     */
-    public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
-    {
-        global $conf, $langs, $hookmanager;
+	/**
+	 *  Return a link to the object card (with optionaly the picto)
+	 *
+	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+	 *  @param  string  $option                     On what the link point to ('nolink', '', 'production', ...)
+	 *  @param  int     $notooltip                  1=Disable tooltip
+	 *  @param  string  $morecss                    Add more css on link
+	 *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @return	string                              String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
+		global $conf, $langs, $hookmanager;
 
-        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-        $result = '';
+		$result = '';
 
-        $label = img_picto('', $this->picto).' <u>'.$langs->trans("MO").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
-        if (isset($this->status)) {
-        	$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
-        }
+		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ManufacturingOrder").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-        $url = dol_buildpath('/mrp/mo_card.php', 1).'?id='.$this->id;
-        if ($option == 'production') $url = dol_buildpath('/mrp/mo_production.php', 1).'?id='.$this->id;
+		$url = dol_buildpath('/mrp/mo_card.php', 1).'?id='.$this->id;
+		if ($option == 'production') $url = dol_buildpath('/mrp/mo_production.php', 1).'?id='.$this->id;
 
-        if ($option != 'nolink')
-        {
-            // Add param to save lastsearch_values or not
-            $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-            if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-            if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option != 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label = $langs->trans("ShowMo");
-                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowMo");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -1035,7 +1048,7 @@ class Mo extends CommonObject
 		else $result .= $hookmanager->resPrint;
 
 		return $result;
-    }
+	}
 
 	/**
 	 *  Return label of the status
@@ -1048,7 +1061,7 @@ class Mo extends CommonObject
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return the status
 	 *
@@ -1063,17 +1076,17 @@ class Mo extends CommonObject
 		{
 			global $langs;
 			//$langs->load("mrp");
-			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
-			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('ValidatedToProduce');
-			$this->labelStatus[self::STATUS_INPROGRESS] = $langs->trans('InProgress');
-			$this->labelStatus[self::STATUS_PRODUCED] = $langs->trans('StatusMOProduced');
-			$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Canceled');
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('ValidatedToProduce');
+			$this->labelStatus[self::STATUS_INPROGRESS] = $langs->transnoentitiesnoconv('InProgress');
+			$this->labelStatus[self::STATUS_PRODUCED] = $langs->transnoentitiesnoconv('StatusMOProduced');
+			$this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Canceled');
 
-			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft');
-			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Validated');
-			$this->labelStatusShort[self::STATUS_INPROGRESS] = $langs->trans('InProgress');
-			$this->labelStatusShort[self::STATUS_PRODUCED] = $langs->trans('StatusMOProduced');
-			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Canceled');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
+			$this->labelStatusShort[self::STATUS_INPROGRESS] = $langs->transnoentitiesnoconv('InProgress');
+			$this->labelStatusShort[self::STATUS_PRODUCED] = $langs->transnoentitiesnoconv('StatusMOProduced');
+			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Canceled');
 		}
 
 		$statusType = 'status'.$status;
@@ -1154,20 +1167,20 @@ class Mo extends CommonObject
 	 */
 	public function getLinesArray()
 	{
-	    $this->lines = array();
+		$this->lines = array();
 
-	    $objectline = new MoLine($this->db);
-	    $result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_mo = '.$this->id));
+		$objectline = new MoLine($this->db);
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_mo = '.$this->id));
 
-	    if (is_numeric($result))
-	    {
-	        $this->error = $this->error;
-	        $this->errors = $this->errors;
-	        return $result;
-	    } else {
-	        $this->lines = $result;
-	        return $this->lines;
-	    }
+		if (is_numeric($result))
+		{
+			$this->error = $this->error;
+			$this->errors = $this->errors;
+			return $result;
+		} else {
+			$this->lines = $result;
+			return $this->lines;
+		}
 	}
 
 	/**
@@ -1328,6 +1341,21 @@ class Mo extends CommonObject
 		$tpl = DOL_DOCUMENT_ROOT.'/mrp/tpl/originproductline.tpl.php';
 		$res = include $tpl;
 	}
+
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB 	$db 			Database handler
+	 * @param int 		$origin_id 		Old thirdparty id
+	 * @param int 		$dest_id 		New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty($db, $origin_id, $dest_id)
+	{
+		$tables = array('mrp_production');
+
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
 }
 
 /**
@@ -1421,7 +1449,7 @@ class MoLine extends CommonObjectLine
 		{
 			foreach ($this->fields as $key => $val)
 			{
-				if (is_array($val['arrayofkeyval']))
+				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
 				{
 					foreach ($val['arrayofkeyval'] as $key2 => $val2)
 					{
diff --git a/htdocs/mrp/index.php b/htdocs/mrp/index.php
index d4359dcae90..b84a77c2288 100644
--- a/htdocs/mrp/index.php
+++ b/htdocs/mrp/index.php
@@ -63,82 +63,82 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 if ($conf->use_javascript_ajax)
 {
-    $sql = "SELECT COUNT(t.rowid) as nb, status";
-    $sql .= " FROM ".MAIN_DB_PREFIX."mrp_mo as t";
+	$sql = "SELECT COUNT(t.rowid) as nb, status";
+	$sql .= " FROM ".MAIN_DB_PREFIX."mrp_mo as t";
 	$sql .= " GROUP BY t.status";
 	$sql .= " ORDER BY t.status ASC";
-    $resql = $db->query($sql);
+	$resql = $db->query($sql);
 
-    if ($resql)
-    {
-    	$num = $db->num_rows($resql);
-    	$i = 0;
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
 
-    	$totalnb = 0;
-    	$dataseries = array();
+		$totalnb = 0;
+		$dataseries = array();
 		$colorseries = array();
 		$vals = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
 
-    	while ($i < $num)
-    	{
-    		$obj = $db->fetch_object($resql);
-    		if ($obj)
-    		{
-    			$vals[$obj->status] = $obj->nb;
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
+			if ($obj)
+			{
+				$vals[$obj->status] = $obj->nb;
 
    				$totalnb += $obj->nb;
-    		}
-    		$i++;
-    	}
-    	$db->free($resql);
+			}
+			$i++;
+		}
+		$db->free($resql);
 
-    	print '<div class="div-table-responsive-no-min">';
-    	print '<table class="noborder nohover centpercent">';
-    	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("MO").'</th></tr>'."\n";
-    	$listofstatus = array(0, 1, 2, 3, 9);
-    	foreach ($listofstatus as $status)
-    	{
-    		$dataseries[] = array($staticmo->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
-    		if ($status == Mo::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
-    		if ($status == Mo::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;
-    		if ($status == Mo::STATUS_INPROGRESS) $colorseries[$status] = $badgeStatus4;
-    		if ($status == Mo::STATUS_PRODUCED) $colorseries[$status] = $badgeStatus6;
-    		if ($status == Mo::STATUS_CANCELED) $colorseries[$status] = $badgeStatus9;
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder nohover centpercent">';
+		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("ManufacturingOrder").'</th></tr>'."\n";
+		$listofstatus = array(0, 1, 2, 3, 9);
+		foreach ($listofstatus as $status)
+		{
+			$dataseries[] = array($staticmo->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
+			if ($status == Mo::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
+			if ($status == Mo::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;
+			if ($status == Mo::STATUS_INPROGRESS) $colorseries[$status] = $badgeStatus4;
+			if ($status == Mo::STATUS_PRODUCED) $colorseries[$status] = $badgeStatus6;
+			if ($status == Mo::STATUS_CANCELED) $colorseries[$status] = $badgeStatus9;
 
-    		if (empty($conf->use_javascript_ajax))
-    		{
-    			print '<tr class="oddeven">';
-    			print '<td>'.$staticmo->LibStatut($status, 0).'</td>';
-    			print '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).'</a></td>';
-    			print "</tr>\n";
-    		}
-    	}
-        if ($conf->use_javascript_ajax)
-    	{
-    		print '<tr><td class="center" colspan="2">';
+			if (empty($conf->use_javascript_ajax))
+			{
+				print '<tr class="oddeven">';
+				print '<td>'.$staticmo->LibStatut($status, 0).'</td>';
+				print '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).'</a></td>';
+				print "</tr>\n";
+			}
+		}
+		if ($conf->use_javascript_ajax)
+		{
+			print '<tr><td class="center" colspan="2">';
 
-    		include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
-    		$dolgraph = new DolGraph();
-    		$dolgraph->SetData($dataseries);
-    		$dolgraph->SetDataColor(array_values($colorseries));
-    		$dolgraph->setShowLegend(2);
-    		$dolgraph->setShowPercent(1);
-    		$dolgraph->SetType(array('pie'));
-    		$dolgraph->SetHeight('200');
-    		$dolgraph->draw('idgraphstatus');
-    		print $dolgraph->show($totalnb ? 0 : 1);
+			include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+			$dolgraph = new DolGraph();
+			$dolgraph->SetData($dataseries);
+			$dolgraph->SetDataColor(array_values($colorseries));
+			$dolgraph->setShowLegend(2);
+			$dolgraph->setShowPercent(1);
+			$dolgraph->SetType(array('pie'));
+			$dolgraph->SetHeight('200');
+			$dolgraph->draw('idgraphstatus');
+			print $dolgraph->show($totalnb ? 0 : 1);
 
-    		print '</td></tr>';
-    	}
-    	print "</table>";
-    	print "</div>";
+			print '</td></tr>';
+		}
+		print "</table>";
+		print "</div>";
 
-    	print "<br>";
-    } else {
-    	dol_print_error($db);
-    }
+		print "<br>";
+	} else {
+		dol_print_error($db);
+	}
 }
 
 print '<br>';
@@ -212,47 +212,47 @@ $sql .= $db->plimit($max, 0);
 $resql = $db->query($sql);
 if ($resql)
 {
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<th colspan="4">'.$langs->trans("LatestMOModified", $max).'</th></tr>';
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<th colspan="4">'.$langs->trans("LatestMOModified", $max).'</th></tr>';
 
-    $num = $db->num_rows($resql);
-    if ($num)
-    {
-        $i = 0;
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($resql);
+	$num = $db->num_rows($resql);
+	if ($num)
+	{
+		$i = 0;
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
 
-            $staticmo->id = $obj->rowid;
-            $staticmo->ref = $obj->ref;
-            $staticmo->date_modification = $obj->datem;
-            $staticmo->status = $obj->status;
+			$staticmo->id = $obj->rowid;
+			$staticmo->ref = $obj->ref;
+			$staticmo->date_modification = $obj->datem;
+			$staticmo->status = $obj->status;
 
-            print '<tr class="oddeven">';
-            print '<td>'.$staticmo->getNomUrl(1, 32).'</td>';
-            print '<td>'.dol_print_date($db->jdate($obj->datem), 'dayhour').'</td>';
-            print '<td class="right">'.$staticmo->getLibStatut(3).'</td>';
-            print '</tr>';
-            $i++;
-        }
-    } else {
-        print '<tr class="oddeven">';
-        print '<td><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
-        print '</tr>';
-    }
-    print "</table></div>";
-    print "<br>";
+			print '<tr class="oddeven">';
+			print '<td>'.$staticmo->getNomUrl(1, 32).'</td>';
+			print '<td>'.dol_print_date($db->jdate($obj->datem), 'dayhour').'</td>';
+			print '<td class="right">'.$staticmo->getLibStatut(3).'</td>';
+			print '</tr>';
+			$i++;
+		}
+	} else {
+		print '<tr class="oddeven">';
+		print '<td><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
+		print '</tr>';
+	}
+	print "</table></div>";
+	print "<br>";
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 print '</div></div></div>';
 
 $parameters = array(
-    //'type' => $type,
-    'user' => $user,
+	//'type' => $type,
+	'user' => $user,
 );
 $reshook = $hookmanager->executeHooks('dashboardMRP', $parameters);
 
diff --git a/htdocs/mrp/lib/mrp_mo.lib.php b/htdocs/mrp/lib/mrp_mo.lib.php
index f203633584e..eb61c42e83d 100644
--- a/htdocs/mrp/lib/mrp_mo.lib.php
+++ b/htdocs/mrp/lib/mrp_mo.lib.php
@@ -37,7 +37,7 @@ function moPrepareHead($object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/mrp/mo_card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("MO");
+	$head[$h][1] = $langs->trans("ManufacturingOrder");
 	$head[$h][2] = 'card';
 	$h++;
 
diff --git a/htdocs/mrp/mo_agenda.php b/htdocs/mrp/mo_agenda.php
index c2107296b2b..0fe9ba63e08 100644
--- a/htdocs/mrp/mo_agenda.php
+++ b/htdocs/mrp/mo_agenda.php
@@ -46,10 +46,10 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 if (GETPOST('actioncode', 'array'))
 {
-    $actioncode = GETPOST('actioncode', 'array', 3);
-    if (!count($actioncode)) $actioncode = '0';
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) $actioncode = '0';
 } else {
-    $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
@@ -94,19 +94,19 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Cancel
-    if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-    {
-        header("Location: ".$backtopage);
-        exit;
-    }
+	// Cancel
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage))
+	{
+		header("Location: ".$backtopage);
+		exit;
+	}
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $actioncode = '';
-        $search_agenda_label = '';
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$actioncode = '';
+		$search_agenda_label = '';
+	}
 }
 
 
@@ -131,7 +131,7 @@ if ($object->id > 0)
 	$head = moPrepareHead($object);
 
 
-	dol_fiche_head($head, 'agenda', $langs->trans("MO"), -1, $object->picto);
+	print dol_get_fiche_head($head, 'agenda', $langs->trans("ManufacturingOrder"), -1, $object->picto);
 
 	// Object card
 	// ------------------------------------------------------------
@@ -177,66 +177,66 @@ if ($object->id > 0)
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
-    $object->info($object->id);
+	$object->info($object->id);
 	dol_print_object_info($object, 1);
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 
 	// Actions buttons
 
-    $objthirdparty = $object;
-    $objcon = new stdClass();
+	$objthirdparty = $object;
+	$objcon = new stdClass();
 
-    $out = '&origin='.$object->element.'&originid='.$object->id;
-    $permok = $user->rights->agenda->myactions->create;
-    if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
-    {
-        //$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
-        if (get_class($objthirdparty) == 'Societe') $out .= '&amp;socid='.$objthirdparty->id;
-        $out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage=1&amp;percentage=-1';
-    	//$out.=$langs->trans("AddAnAction").' ';
-    	//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
-    	//$out.="</a>";
+	$out = '&origin='.$object->element.'&originid='.$object->id;
+	$permok = $user->rights->agenda->myactions->create;
+	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
+	{
+		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
+		if (get_class($objthirdparty) == 'Societe') $out .= '&amp;socid='.$objthirdparty->id;
+		$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage=1&amp;percentage=-1';
+		//$out.=$langs->trans("AddAnAction").' ';
+		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
+		//$out.="</a>";
 	}
 
 
 	print '<div class="tabsAction">';
 
-    if (!empty($conf->agenda->enabled))
-    {
-    	if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
-    	{
-        	print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
-    	} else {
-        	print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
-    	}
-    }
+	if (!empty($conf->agenda->enabled))
+	{
+		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
+		{
+			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
+		} else {
+			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
+		}
+	}
 
-    print '</div>';
+	print '</div>';
 
-    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-    {
-        $param = '&id='.$object->id.'&socid='.$socid;
-        if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-        if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
+	{
+		$param = '&id='.$object->id.'&socid='.$socid;
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 
 
 		//print load_fiche_titre($langs->trans("ActionsOnMo"), '', '');
 
-        // List of all actions
+		// List of all actions
 		$filters = array();
-        $filters['search_agenda_label'] = $search_agenda_label;
+		$filters['search_agenda_label'] = $search_agenda_label;
 
-        // TODO Replace this with same code than into list.php
-        show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
-    }
+		// TODO Replace this with same code than into list.php
+		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
+	}
 }
 
 // End of page
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index add7de31b56..a95d92d67a1 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -37,10 +37,10 @@ $langs->loadLangs(array("mrp", "other"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
-$ref        = GETPOST('ref', 'alpha');
+$ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
-$confirm    = GETPOST('confirm', 'alpha');
-$cancel     = GETPOST('cancel', 'aZ09');
+$confirm = GETPOST('confirm', 'alpha');
+$cancel = GETPOST('cancel', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'mocard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
@@ -107,75 +107,75 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    $error = 0;
+	$error = 0;
 
-    $backurlforlist = dol_buildpath('/mrp/mo_list.php', 1);
+	$backurlforlist = dol_buildpath('/mrp/mo_list.php', 1);
 
-    if (empty($backtopage) || ($cancel && empty($id))) {
-    	if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
-	    	if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) $backtopage = $backurlforlist;
-    		else $backtopage = DOL_URL_ROOT.'/mrp/mo_card.php?id='.($id > 0 ? $id : '__ID__');
-    	}
-    }
-    if ($cancel && !empty($backtopageforcancel)) {
-    	$backtopage = $backtopageforcancel;
-    }
+	if (empty($backtopage) || ($cancel && empty($id))) {
+		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) $backtopage = $backurlforlist;
+			else $backtopage = DOL_URL_ROOT.'/mrp/mo_card.php?id='.($id > 0 ? $id : '__ID__');
+		}
+	}
+	if ($cancel && !empty($backtopageforcancel)) {
+		$backtopage = $backtopageforcancel;
+	}
 
-    $triggermodname = 'MRP_MO_MODIFY'; // Name of trigger action code to execute when we modify record
+	$triggermodname = 'MRP_MO_MODIFY'; // Name of trigger action code to execute when we modify record
 
-    // Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
-    include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
+	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
 
-    // Actions when linking object each other
-    include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
+	// Actions when linking object each other
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
 
-    // Actions when printing a doc from card
-    include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+	// Actions when printing a doc from card
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
-    // Actions to send emails
-    $triggersendname = 'MO_SENTBYMAIL';
-    $autocopy = 'MAIN_MAIL_AUTOCOPY_MO_TO';
-    $trackid = 'mo'.$object->id;
-    include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+	// Actions to send emails
+	$triggersendname = 'MO_SENTBYMAIL';
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_MO_TO';
+	$trackid = 'mo'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
-    // Action to move up and down lines of object
-    //include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';	// Must be include, not include_once
+	// Action to move up and down lines of object
+	//include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';	// Must be include, not include_once
 
-    if ($action == 'set_thirdparty' && $permissiontoadd)
-    {
-    	$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, 'MO_MODIFY');
-    }
-    if ($action == 'classin' && $permissiontoadd)
-    {
-    	$object->setProject(GETPOST('projectid', 'int'));
-    }
+	if ($action == 'set_thirdparty' && $permissiontoadd)
+	{
+		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, 'MO_MODIFY');
+	}
+	if ($action == 'classin' && $permissiontoadd)
+	{
+		$object->setProject(GETPOST('projectid', 'int'));
+	}
 
-    // Action close produced
-    if ($action == 'confirm_produced' && $confirm == 'yes' && $permissiontoadd)
-    {
-    	$result = $object->setStatut($object::STATUS_PRODUCED, 0, '', 'MRP_MO_PRODUCED');
-    	if ($result >= 0)
-    	{
-    		// 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->model_pdf;
-    			$ret = $object->fetch($id); // Reload to get new records
+	// Action close produced
+	if ($action == 'confirm_produced' && $confirm == 'yes' && $permissiontoadd)
+	{
+		$result = $object->setStatut($object::STATUS_PRODUCED, 0, '', 'MRP_MO_PRODUCED');
+		if ($result >= 0)
+		{
+			// 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->model_pdf;
+				$ret = $object->fetch($id); // Reload to get new records
 
-    			$object->generateDocument($model, $outputlangs, 0, 0, 0);
-    		}
-    	} else {
-    		setEventMessages($object->error, $object->errors, 'errors');
-    	}
-    }
+				$object->generateDocument($model, $outputlangs, 0, 0, 0);
+			}
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
 }
 
 
@@ -218,7 +218,7 @@ if ($action == 'create')
 	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 
-	dol_fiche_head(array(), '');
+	print dol_get_fiche_head(array(), '');
 
 	print '<table class="border centpercent tableforfieldcreate">'."\n";
 
@@ -230,7 +230,7 @@ if ($action == 'create')
 
 	print '</table>'."\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	?>
 	<script>
@@ -290,7 +290,7 @@ if ($action == 'create')
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
 	print '&nbsp; ';
-	print '<input type="'.($backtopage ? "submit" : "button").'" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
+	print '<input type="'.($backtopage ? "submit" : "button").'" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
 	print '</div>';
 
 	if (GETPOST('fk_bom', 'int') > 0) {
@@ -314,16 +314,16 @@ if ($action == 'create')
 // Part to edit record
 if (($id || $ref) && $action == 'edit')
 {
-	print load_fiche_titre($langs->trans("MO"), '', 'mrp');
+	print load_fiche_titre($langs->trans("ManufacturingOrder"), '', 'mrp');
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
 	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	$object->fields['fk_bom']['disabled'] = 1;
 
@@ -337,10 +337,10 @@ if (($id || $ref) && $action == 'edit')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
-	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+	print ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
@@ -353,14 +353,15 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$res = $object->fetch_optionals();
 
 	$head = moPrepareHead($object);
-	dol_fiche_head($head, 'card', $langs->trans("MO"), -1, $object->picto);
+
+	print dol_get_fiche_head($head, 'card', $langs->trans("ManufacturingOrder"), -1, $object->picto);
 
 	$formconfirm = '';
 
 	// Confirmation to delete
 	if ($action == 'delete')
 	{
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMo'), $langs->trans('ConfirmDeleteMo'), 'confirm_delete', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMo'), $langs->trans('ConfirmDeleteMo'), 'confirm_delete', '', 0, 1);
 	}
 	// Confirmation to delete line
 	if ($action == 'deleteline')
@@ -439,32 +440,32 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    if ($permissiontoadd)
-	    {
-	        if ($action != 'classify')
-	            $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_soc, $object->fk_project, 'none', 0, 0, 0, 1);
-	        }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= ' : '.$proj->getNomUrl();
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($permissiontoadd)
+		{
+			if ($action != 'classify')
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_soc, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= ' : '.$proj->getNomUrl();
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
@@ -492,7 +493,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	/*
@@ -501,167 +502,167 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	if (!empty($object->table_element_line))
 	{
-    	// Show object lines
+		// Show object lines
 		//$result = $object->getLinesArray();
 		$object->fetchLines();
 
-    	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
     	<input type="hidden" name="token" value="' . newToken().'">
     	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
     	<input type="hidden" name="mode" value="">
     	<input type="hidden" name="id" value="' . $object->id.'">
     	';
 
-    	/*if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
+		/*if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
     	    include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
     	}*/
 
-    	if (!empty($object->lines))
-    	{
-    		print '<div class="div-table-responsive-no-min">';
-    		print '<table id="tablelines" class="noborder noshadow" width="100%">';
+		if (!empty($object->lines))
+		{
+			print '<div class="div-table-responsive-no-min">';
+			print '<table id="tablelines" class="noborder noshadow" width="100%">';
 
-    		print '<tr class="liste_titre">';
-    		print '<td class="liste_titre">'.$langs->trans("Summary").'</td>';
-    		print '<td></td>';
-    		print '</tr>';
+			print '<tr class="liste_titre">';
+			print '<td class="liste_titre">'.$langs->trans("Summary").'</td>';
+			print '<td></td>';
+			print '</tr>';
 
-    		print '<tr class="oddeven">';
-    		print '<td>'.$langs->trans("ProductsToConsume").'</td>';
-    		print '<td>';
-    		if (!empty($object->lines))
-    		{
-    			$i = 0;
-    			foreach ($object->lines as $line) {
-    				if ($line->role == 'toconsume') {
-    					if ($i) print ', ';
-    					$tmpproduct = new Product($db);
-    					$tmpproduct->fetch($line->fk_product);
-    					print $tmpproduct->getNomUrl(1);
-    					$i++;
-    				}
-    			}
-    		}
-    		print '</td>';
-    		print '</tr>';
+			print '<tr class="oddeven">';
+			print '<td>'.$langs->trans("ProductsToConsume").'</td>';
+			print '<td>';
+			if (!empty($object->lines))
+			{
+				$i = 0;
+				foreach ($object->lines as $line) {
+					if ($line->role == 'toconsume') {
+						if ($i) print ', ';
+						$tmpproduct = new Product($db);
+						$tmpproduct->fetch($line->fk_product);
+						print $tmpproduct->getNomUrl(1);
+						$i++;
+					}
+				}
+			}
+			print '</td>';
+			print '</tr>';
 
-    		print '<tr class="oddeven">';
-    		print '<td>'.$langs->trans("ProductsToProduce").'</td>';
-    		print '<td>';
-    		if (!empty($object->lines))
-    		{
-    			$i = 0;
-    			foreach ($object->lines as $line) {
-    				if ($line->role == 'toproduce') {
-    					if ($i) print ', ';
-    					$tmpproduct = new Product($db);
-    					$tmpproduct->fetch($line->fk_product);
-    					print $tmpproduct->getNomUrl(1);
-    					$i++;
-    				}
-    			}
-    		}
-    		print '</td>';
-    		print '</tr>';
+			print '<tr class="oddeven">';
+			print '<td>'.$langs->trans("ProductsToProduce").'</td>';
+			print '<td>';
+			if (!empty($object->lines))
+			{
+				$i = 0;
+				foreach ($object->lines as $line) {
+					if ($line->role == 'toproduce') {
+						if ($i) print ', ';
+						$tmpproduct = new Product($db);
+						$tmpproduct->fetch($line->fk_product);
+						print $tmpproduct->getNomUrl(1);
+						$i++;
+					}
+				}
+			}
+			print '</td>';
+			print '</tr>';
 
-    	    print '</table>';
-    	    print '</div>';
-    	}
+			print '</table>';
+			print '</div>';
+		}
 
-    	print "</form>\n";
+		print "</form>\n";
 	}
 
 
 	// Buttons for actions
 
 	if ($action != 'presend' && $action != 'editline') {
-    	print '<div class="tabsAction">'."\n";
-    	$parameters = array();
-    	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		print '<div class="tabsAction">'."\n";
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-    	if (empty($reshook))
-    	{
-    	    // Send
-    		//if (empty($user->socid)) {
-    		//	print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail') . '</a>'."\n";
-    		//}
+		if (empty($reshook))
+		{
+			// Send
+			//if (empty($user->socid)) {
+			//	print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail') . '</a>'."\n";
+			//}
 
-    		// Back to draft
-    		if ($object->status == $object::STATUS_VALIDATED)
-    		{
-	    		if ($permissiontoadd)
-	    		{
-	    			// TODO Add test that production has not started
-	    			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes">'.$langs->trans("SetToDraft").'</a>';
-	    		}
-    		}
+			// Back to draft
+			if ($object->status == $object::STATUS_VALIDATED)
+			{
+				if ($permissiontoadd)
+				{
+					// TODO Add test that production has not started
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes">'.$langs->trans("SetToDraft").'</a>';
+				}
+			}
 
-            // Modify
-    		if ($object->status == $object::STATUS_DRAFT) {
-	    		if ($permissiontoadd)
-	    		{
-	    			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
-	    		} else {
-	    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
-	    		}
-    		}
+			// Modify
+			if ($object->status == $object::STATUS_DRAFT) {
+				if ($permissiontoadd)
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
+				} else {
+					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
+				}
+			}
 
-    		// Validate
-    		if ($object->status == $object::STATUS_DRAFT)
-    		{
-	    		if ($permissiontoadd)
-	    		{
-	    			if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0))
-	    		    {
-	    		        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a>';
-	    		    } else {
-	    		    	$langs->load("errors");
-	    		        print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
-	    		    }
-	    		}
-    		}
+			// Validate
+			if ($object->status == $object::STATUS_DRAFT)
+			{
+				if ($permissiontoadd)
+				{
+					if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0))
+					{
+						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a>';
+					} else {
+						$langs->load("errors");
+						print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
+					}
+				}
+			}
 
-    		// Clone
-    		if ($permissiontoadd)
-    		{
-    			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->fk_soc.'&action=clone&object=mo">'.$langs->trans("ToClone").'</a>';
-    		}
+			// Clone
+			if ($permissiontoadd)
+			{
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->fk_soc.'&action=clone&object=mo">'.$langs->trans("ToClone").'</a>';
+			}
 
-    		// Cancel - Reopen
-    		if ($permissiontoadd)
-    		{
-    			if ($object->status == $object::STATUS_VALIDATED || $object->status == $object::STATUS_INPROGRESS)
-    			{
-    				$arrayproduced = $object->fetchLinesLinked('produced', 0);
-    				$nbProduced = 0;
-    				foreach ($arrayproduced as $lineproduced) {
-    					$nbProduced += $lineproduced['qty'];
-    				}
-    				if ($nbProduced > 0) {	// If production has started, we can close it
-    					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_produced&confirm=yes">'.$langs->trans("Close").'</a>'."\n";
-    				} else {
-    					print '<a class="butActionRefused" href="#" title="'.$langs->trans("GoOnTabProductionToProduceFirst", $langs->transnoentitiesnoconv("Production")).'">'.$langs->trans("Close").'</a>'."\n";
-    				}
+			// Cancel - Reopen
+			if ($permissiontoadd)
+			{
+				if ($object->status == $object::STATUS_VALIDATED || $object->status == $object::STATUS_INPROGRESS)
+				{
+					$arrayproduced = $object->fetchLinesLinked('produced', 0);
+					$nbProduced = 0;
+					foreach ($arrayproduced as $lineproduced) {
+						$nbProduced += $lineproduced['qty'];
+					}
+					if ($nbProduced > 0) {	// If production has started, we can close it
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_produced&confirm=yes">'.$langs->trans("Close").'</a>'."\n";
+					} else {
+						print '<a class="butActionRefused" href="#" title="'.$langs->trans("GoOnTabProductionToProduceFirst", $langs->transnoentitiesnoconv("Production")).'">'.$langs->trans("Close").'</a>'."\n";
+					}
 
-    				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_close&confirm=yes">'.$langs->trans("Cancel").'</a>'."\n";
-    			}
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_close&confirm=yes">'.$langs->trans("Cancel").'</a>'."\n";
+				}
 
-    			if ($object->status == $object::STATUS_PRODUCED || $object->status == $object::STATUS_CANCELED)
-    			{
-    				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_reopen&confirm=yes">'.$langs->trans("ReOpen").'</a>'."\n";
-    			}
-    		}
+				if ($object->status == $object::STATUS_PRODUCED || $object->status == $object::STATUS_CANCELED)
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_reopen&confirm=yes">'.$langs->trans("ReOpen").'</a>'."\n";
+				}
+			}
 
-    		// Delete (need delete permission, or if draft, just need create/modify permission)
-    		if ($permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd))
-    		{
-    			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
-    		} else {
-    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
-    		}
-    	}
-    	print '</div>'."\n";
+			// Delete (need delete permission, or if draft, just need create/modify permission)
+			if ($permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd))
+			{
+				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
+			} else {
+				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
+			}
+		}
+		print '</div>'."\n";
 	}
 
 
@@ -672,37 +673,37 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	if ($action != 'presend')
 	{
-	    print '<div class="fichecenter"><div class="fichehalfleft">';
-	    print '<a name="builddoc"></a>'; // ancre
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+		print '<a name="builddoc"></a>'; // ancre
 
-	    // Documents
-	    $objref = dol_sanitizeFileName($object->ref);
-	    $relativepath = $objref.'/'.$objref.'.pdf';
-	    $filedir = $conf->mrp->dir_output.'/'.$objref;
-	    $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
-	    $genallowed = $user->rights->mrp->read; // If you can read, you can build the PDF to read content
-	    $delallowed = $user->rights->mrp->create; // If you can create/edit, you can remove a file on card
-	    print $formfile->showdocuments('mrp:mo', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $mysoc->default_lang);
+		// Documents
+		$objref = dol_sanitizeFileName($object->ref);
+		$relativepath = $objref.'/'.$objref.'.pdf';
+		$filedir = $conf->mrp->dir_output.'/'.$objref;
+		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+		$genallowed = $user->rights->mrp->read; // If you can read, you can build the PDF to read content
+		$delallowed = $user->rights->mrp->create; // If you can create/edit, you can remove a file on card
+		print $formfile->showdocuments('mrp:mo', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $mysoc->default_lang);
 
-	    // Show links to link elements
-	    $linktoelem = $form->showLinkToObjectBlock($object, null, array('mo'));
-	    $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+		// Show links to link elements
+		$linktoelem = $form->showLinkToObjectBlock($object, null, array('mo'));
+		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 
-	    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-	    $MAXEVENT = 10;
+		$MAXEVENT = 10;
 
-	    $morehtmlright = '<a href="'.dol_buildpath('/mrp/mo_agenda.php', 1).'?id='.$object->id.'">';
-	    $morehtmlright .= $langs->trans("SeeAll");
-	    $morehtmlright .= '</a>';
+		$morehtmlright = '<a href="'.dol_buildpath('/mrp/mo_agenda.php', 1).'?id='.$object->id.'">';
+		$morehtmlright .= $langs->trans("SeeAll");
+		$morehtmlright .= '</a>';
 
-	    // List of actions on element
-	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-	    $formactions = new FormActions($db);
-	    $somethingshown = $formactions->showactions($object, 'mo', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
+		// List of actions on element
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+		$formactions = new FormActions($db);
+		$somethingshown = $formactions->showactions($object, 'mo', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
 
-	    print '</div></div></div>';
+		print '</div></div></div>';
 	}
 
 	//Select mail models is same action as presend
diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php
index 68e693ca072..01131b9ffa2 100644
--- a/htdocs/mrp/mo_document.php
+++ b/htdocs/mrp/mo_document.php
@@ -67,8 +67,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
-//if ($id > 0 || ! empty($ref)) $upload_dir = $conf->mrp->multidir_output[$object->entity?$object->entity:$conf->entity] . "/mo/" . dol_sanitizeFileName($object->id);
-if ($id > 0 || !empty($ref)) $upload_dir = $conf->mrp->multidir_output[$object->entity ? $object->entity : $conf->entity]."/mo/".dol_sanitizeFileName($object->ref);
+if ($id > 0 || !empty($ref)) $upload_dir = $conf->mrp->multidir_output[$object->entity ? $object->entity : $conf->entity]."/mo/".get_exdir(0, 0, 0, 1, $object);
 
 // Security check - Protection if external user
 //if ($user->socid > 0) accessforbidden();
@@ -103,8 +102,7 @@ if ($object->id)
 	 */
 	$head = moPrepareHead($object);
 
-	dol_fiche_head($head, 'document', $langs->trans("MO"), -1, $object->picto);
-
+	print dol_get_fiche_head($head, 'document', $langs->trans("ManufacturingOrder"), -1, $object->picto);
 
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
@@ -158,9 +156,9 @@ if ($object->id)
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">';
 
 	// Number of files
@@ -173,7 +171,7 @@ if ($object->id)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$modulepart = 'mrp';
 	$permission = $user->rights->mrp->write;
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index b9da34958d4..beeefbd19ff 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -92,7 +92,7 @@ $search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alph
 $search = array();
 foreach ($object->fields as $key => $val)
 {
-	if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
+	if (GETPOST('search_'.$key, 'alpha') !== '') $search[$key] = GETPOST('search_'.$key, 'alpha');
 }
 
 // List of fields to search into when doing a "search in all"
@@ -310,8 +310,8 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&co
 if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 foreach ($search as $key => $val)
 {
-    if (is_array($search[$key]) && count($search[$key])) foreach ($search[$key] as $skey) $param .= '&search_'.$key.'[]='.urlencode($skey);
-    else $param .= '&search_'.$key.'='.urlencode($search[$key]);
+	if (is_array($search[$key]) && count($search[$key])) foreach ($search[$key] as $skey) $param .= '&search_'.$key.'[]='.urlencode($skey);
+	else $param .= '&search_'.$key.'='.urlencode($search[$key]);
 }
 if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
@@ -319,10 +319,10 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 // List of mass actions available
 $arrayofmassactions = array(
-    //'validate'=>$langs->trans("Validate"),
-    //'generate_doc'=>$langs->trans("ReGeneratePDF"),
-    //'builddoc'=>$langs->trans("PDFMerge"),
-    //'presend'=>$langs->trans("SendByMail"),
+	//'validate'=>$langs->trans("Validate"),
+	//'generate_doc'=>$langs->trans("ReGeneratePDF"),
+	//'builddoc'=>$langs->trans("PDFMerge"),
+	//'presend'=>$langs->trans("SendByMail"),
 );
 if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
@@ -345,7 +345,7 @@ print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sort
 $topicmail = "SendMoRef";
 $modelmail = "mo";
 $objecttmp = new Mo($db);
-$trackid = 'xxxx'.$object->id;
+$trackid = 'mo'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($search_all)
@@ -392,9 +392,9 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
-			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
+			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
@@ -468,16 +468,16 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	foreach ($object->fields as $key => $val)
 	{
 		$cssforfield = (empty($val['css']) ? '' : $val['css']);
-	    if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	    elseif ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
+		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
+		elseif ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
 
-	    if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	    elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 
-	    if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') $cssforfield .= ($cssforfield ? ' ' : '').'right';
-	    if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') $cssforfield .= ($cssforfield ? ' ' : '').'right';
+		if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
 
-	    if (!empty($arrayfields['t.'.$key]['checked']))
+		if (!empty($arrayfields['t.'.$key]['checked']))
 		{
 			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
 			if ($key == 'status') print $object->getLibStatut(5);
diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php
index 754a83c4770..b4dbed059bc 100644
--- a/htdocs/mrp/mo_movements.php
+++ b/htdocs/mrp/mo_movements.php
@@ -105,21 +105,21 @@ $objectlist = new MouvementStock($db);
 
 // Definition of fields for list
 $arrayfields = array(
-	'm.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-	'm.datem'=>array('label'=>$langs->trans("Date"), 'checked'=>1),
-	'p.ref'=>array('label'=>$langs->trans("ProductRef"), 'checked'=>1, 'css'=>'maxwidth100'),
-	'p.label'=>array('label'=>$langs->trans("ProductLabel"), 'checked'=>1),
-	'm.batch'=>array('label'=>$langs->trans("BatchNumberShort"), 'checked'=>1, 'enabled'=>(!empty($conf->productbatch->enabled))),
-	'pl.eatby'=>array('label'=>$langs->trans("EatByDate"), 'checked'=>0, 'position'=>10, 'enabled'=>(!empty($conf->productbatch->enabled))),
-	'pl.sellby'=>array('label'=>$langs->trans("SellByDate"), 'checked'=>0, 'position'=>10, 'enabled'=>(!empty($conf->productbatch->enabled))),
-	'e.ref'=>array('label'=>$langs->trans("Warehouse"), 'checked'=>1),
-	'm.fk_user_author'=>array('label'=>$langs->trans("Author"), 'checked'=>0),
-	'm.inventorycode'=>array('label'=>$langs->trans("InventoryCodeShort"), 'checked'=>1),
-	'm.label'=>array('label'=>$langs->trans("MovementLabel"), 'checked'=>1),
-	'm.type_mouvement'=>array('label'=>$langs->trans("TypeMovement"), 'checked'=>1),
-	'origin'=>array('label'=>$langs->trans("Origin"), 'enabled'=>0, 'checked'=>0),
-	'm.value'=>array('label'=>$langs->trans("Qty"), 'checked'=>1),
-	'm.price'=>array('label'=>$langs->trans("UnitPurchaseValue"), 'enabled'=>0, 'checked'=>0),
+	'm.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1, 'position'=>1),
+	'm.datem'=>array('label'=>$langs->trans("Date"), 'checked'=>1, 'position'=>2),
+	'p.ref'=>array('label'=>$langs->trans("ProductRef"), 'checked'=>1, 'css'=>'maxwidth100', 'position'=>10),
+	'p.label'=>array('label'=>$langs->trans("ProductLabel"), 'checked'=>1, 'position'=>15),
+	'm.batch'=>array('label'=>$langs->trans("BatchNumberShort"), 'checked'=>1, 'enabled'=>(!empty($conf->productbatch->enabled)), 'position'=>20),
+	'pl.eatby'=>array('label'=>$langs->trans("EatByDate"), 'checked'=>0, 'position'=>10, 'enabled'=>(!empty($conf->productbatch->enabled)), 'position'=>21),
+	'pl.sellby'=>array('label'=>$langs->trans("SellByDate"), 'checked'=>0, 'position'=>10, 'enabled'=>(!empty($conf->productbatch->enabled)), 'position'=>22),
+	'e.ref'=>array('label'=>$langs->trans("Warehouse"), 'checked'=>1, 'position'=>30),
+	'm.fk_user_author'=>array('label'=>$langs->trans("Author"), 'checked'=>0, 'position'=>40),
+	'm.inventorycode'=>array('label'=>$langs->trans("InventoryCodeShort"), 'checked'=>1, 'position'=>42),
+	'm.label'=>array('label'=>$langs->trans("MovementLabel"), 'checked'=>1, 'position'=>45),
+	'm.type_mouvement'=>array('label'=>$langs->trans("TypeMovement"), 'checked'=>1, 'position'=>48),
+	'origin'=>array('label'=>$langs->trans("Origin"), 'enabled'=>0, 'checked'=>0, 'position'=>50),
+	'm.value'=>array('label'=>$langs->trans("Qty"), 'checked'=>1, 'position'=>60),
+	'm.price'=>array('label'=>$langs->trans("UnitPurchaseValue"), 'enabled'=>0, 'checked'=>0, 'position'=>62),
 	//'m.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
 	//'m.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500)
 );
@@ -176,47 +176,47 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 
 if (empty($reshook))
 {
-    $error = 0;
+	$error = 0;
 
-    $backurlforlist = dol_buildpath('/mrp/mo_list.php', 1);
+	$backurlforlist = dol_buildpath('/mrp/mo_list.php', 1);
 
-    if (empty($backtopage) || ($cancel && empty($id))) {
-    	//var_dump($backurlforlist);exit;
-    	if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) $backtopage = $backurlforlist;
-    	else $backtopage = DOL_URL_ROOT.'/mrp/mo_production.php?id='.($id > 0 ? $id : '__ID__');
-    }
-    $triggermodname = 'MRP_MO_MODIFY'; // Name of trigger action code to execute when we modify record
+	if (empty($backtopage) || ($cancel && empty($id))) {
+		//var_dump($backurlforlist);exit;
+		if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) $backtopage = $backurlforlist;
+		else $backtopage = DOL_URL_ROOT.'/mrp/mo_production.php?id='.($id > 0 ? $id : '__ID__');
+	}
+	$triggermodname = 'MRP_MO_MODIFY'; // Name of trigger action code to execute when we modify record
 
-    // Actions cancel, add, update, delete or clone
-    include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+	// Actions cancel, add, update, delete or clone
+	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
 
-    // Actions when linking object each other
-    include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
+	// Actions when linking object each other
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
 
-    // Actions when printing a doc from card
-    include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+	// Actions when printing a doc from card
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
-    // Actions to send emails
-    $triggersendname = 'MO_SENTBYMAIL';
-    $autocopy = 'MAIN_MAIL_AUTOCOPY_MO_TO';
-    $trackid = 'mo'.$object->id;
-    include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+	// Actions to send emails
+	$triggersendname = 'MO_SENTBYMAIL';
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_MO_TO';
+	$trackid = 'mo'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
-    // Action to move up and down lines of object
-    //include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';	// Must be include, not include_once
+	// Action to move up and down lines of object
+	//include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';	// Must be include, not include_once
 
-    if ($action == 'set_thirdparty' && $permissiontoadd)
-    {
-    	$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, 'MO_MODIFY');
-    }
-    if ($action == 'classin' && $permissiontoadd)
-    {
-    	$object->setProject(GETPOST('projectid', 'int'));
-    }
+	if ($action == 'set_thirdparty' && $permissiontoadd)
+	{
+		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, 'MO_MODIFY');
+	}
+	if ($action == 'classin' && $permissiontoadd)
+	{
+		$object->setProject(GETPOST('projectid', 'int'));
+	}
 
-    if ($action == 'confirm_reopen') {
-    	$result = $object->setStatut($object::STATUS_INPROGRESS, 0, '', 'MRP_REOPEN');
-    }
+	if ($action == 'confirm_reopen') {
+		$result = $object->setStatut($object::STATUS_INPROGRESS, 0, '', 'MRP_REOPEN');
+	}
 }
 
 
@@ -242,14 +242,15 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$res = $object->fetch_optionals();
 
 	$head = moPrepareHead($object);
-	dol_fiche_head($head, 'stockmovement', $langs->trans("MO"), -1, $object->picto);
+
+	print dol_get_fiche_head($head, 'stockmovement', $langs->trans("ManufacturingOrder"), -1, $object->picto);
 
 	$formconfirm = '';
 
 	// Confirmation to delete
 	if ($action == 'delete')
 	{
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMo'), $langs->trans('ConfirmDeleteMo'), 'confirm_delete', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMo'), $langs->trans('ConfirmDeleteMo'), 'confirm_delete', '', 0, 1);
 	}
 	// Confirmation to delete line
 	if ($action == 'deleteline')
@@ -267,7 +268,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	if ($action == 'xxx')
 	{
 		$formquestion = array();
-	    /*
+		/*
 		$forcecombo=0;
 		if ($conf->browser->name == 'ie') $forcecombo = 1;	// There is a bug in IE10 that make combo inside popup crazy
 	    $formquestion = array(
@@ -277,7 +278,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	        // array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
         );
 	    */
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
 	}
 
 	// Call Hook formConfirm
@@ -304,32 +305,32 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    if ($permissiontoadd)
-	    {
-	        if ($action != 'classify')
-	            $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-            if ($action == 'classify') {
-            	//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-            	$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_soc, $object->fk_project, 'none', 0, 0, 0, 1);
-	        }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= $proj->getNomUrl();
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($permissiontoadd)
+		{
+			if ($action != 'classify')
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_soc, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= $proj->getNomUrl();
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
@@ -357,7 +358,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	/*
 		print '<div class="tabsAction">';
@@ -595,7 +596,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<td class="liste_titre center">';
 		//print '<input class="flat" type="text" size="3" name="search_type_mouvement" value="'.dol_escape_htmltag($search_type_mouvement).'">';
 		print '<select id="search_type_mouvement" name="search_type_mouvement" class="maxwidth150">';
-		print '<option value="" '.(($search_type_mouvement == "") ? 'selected="selected"' : '').'></option>';
+		print '<option value="" '.(($search_type_mouvement == "") ? 'selected="selected"' : '').'>&nbsp;</option>';
 		print '<option value="0" '.(($search_type_mouvement == "0") ? 'selected="selected"' : '').'>'.$langs->trans('StockIncreaseAfterCorrectTransfer').'</option>';
 		print '<option value="1" '.(($search_type_mouvement == "1") ? 'selected="selected"' : '').'>'.$langs->trans('StockDecreaseAfterCorrectTransfer').'</option>';
 		print '<option value="2" '.(($search_type_mouvement == "2") ? 'selected="selected"' : '').'>'.$langs->trans('StockDecrease').'</option>';
diff --git a/htdocs/mrp/mo_note.php b/htdocs/mrp/mo_note.php
index f25ebc35d0d..564361c4b90 100644
--- a/htdocs/mrp/mo_note.php
+++ b/htdocs/mrp/mo_note.php
@@ -87,7 +87,7 @@ if ($id > 0 || !empty($ref))
 
 	$head = moPrepareHead($object);
 
-	dol_fiche_head($head, 'note', $langs->trans("MO"), -1, $object->picto);
+	print dol_get_fiche_head($head, 'note', $langs->trans("ManufacturingOrder"), -1, $object->picto);
 
 	// Object card
 	// ------------------------------------------------------------
@@ -143,7 +143,7 @@ if ($id > 0 || !empty($ref))
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index e86fdc8348d..c1b6fa64ec8 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -100,295 +100,295 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    $error = 0;
+	$error = 0;
 
-    $backurlforlist = dol_buildpath('/mrp/mo_list.php', 1);
+	$backurlforlist = dol_buildpath('/mrp/mo_list.php', 1);
 
-    if (empty($backtopage) || ($cancel && empty($id))) {
-    	//var_dump($backurlforlist);exit;
-    	if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) $backtopage = $backurlforlist;
-    	else $backtopage = DOL_URL_ROOT.'/mrp/mo_production.php?id='.($id > 0 ? $id : '__ID__');
-    }
-    $triggermodname = 'MRP_MO_MODIFY'; // Name of trigger action code to execute when we modify record
+	if (empty($backtopage) || ($cancel && empty($id))) {
+		//var_dump($backurlforlist);exit;
+		if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) $backtopage = $backurlforlist;
+		else $backtopage = DOL_URL_ROOT.'/mrp/mo_production.php?id='.($id > 0 ? $id : '__ID__');
+	}
+	$triggermodname = 'MRP_MO_MODIFY'; // Name of trigger action code to execute when we modify record
 
-    // Actions cancel, add, update, delete or clone
-    include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+	// Actions cancel, add, update, delete or clone
+	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
 
-    // Actions when linking object each other
-    include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
+	// Actions when linking object each other
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
 
-    // Actions when printing a doc from card
-    include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+	// Actions when printing a doc from card
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
-    // Actions to send emails
-    $triggersendname = 'MO_SENTBYMAIL';
-    $autocopy = 'MAIN_MAIL_AUTOCOPY_MO_TO';
-    $trackid = 'mo'.$object->id;
-    include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+	// Actions to send emails
+	$triggersendname = 'MO_SENTBYMAIL';
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_MO_TO';
+	$trackid = 'mo'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
-    // Action to move up and down lines of object
-    //include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';	// Must be include, not include_once
+	// Action to move up and down lines of object
+	//include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';	// Must be include, not include_once
 
-    if ($action == 'set_thirdparty' && $permissiontoadd)
-    {
-    	$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, 'MO_MODIFY');
-    }
-    if ($action == 'classin' && $permissiontoadd)
-    {
-    	$object->setProject(GETPOST('projectid', 'int'));
-    }
+	if ($action == 'set_thirdparty' && $permissiontoadd)
+	{
+		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, 'MO_MODIFY');
+	}
+	if ($action == 'classin' && $permissiontoadd)
+	{
+		$object->setProject(GETPOST('projectid', 'int'));
+	}
 
-    if ($action == 'confirm_reopen') {
-    	$result = $object->setStatut($object::STATUS_INPROGRESS, 0, '', 'MRP_REOPEN');
-    }
+	if ($action == 'confirm_reopen') {
+		$result = $object->setStatut($object::STATUS_INPROGRESS, 0, '', 'MRP_REOPEN');
+	}
 
-    if ($action == 'confirm_addconsumeline' && GETPOST('addconsumelinebutton')) {
-    	$moline = new MoLine($db);
+	if ($action == 'confirm_addconsumeline' && GETPOST('addconsumelinebutton')) {
+		$moline = new MoLine($db);
 
-    	// Line to produce
-    	$moline->fk_mo = $object->id;
-    	$moline->qty = GETPOST('qtytoadd', 'int'); ;
-    	$moline->fk_product = GETPOST('productidtoadd', 'int');
-    	$moline->role = 'toconsume';
-    	$moline->position = 0;
+		// Line to produce
+		$moline->fk_mo = $object->id;
+		$moline->qty = GETPOST('qtytoadd', 'int'); ;
+		$moline->fk_product = GETPOST('productidtoadd', 'int');
+		$moline->role = 'toconsume';
+		$moline->position = 0;
 
-    	$resultline = $moline->create($user, false); // Never use triggers here
-    	if ($resultline <= 0) {
-    		$error++;
-    		setEventMessages($moline->error, $molines->errors, 'errors');
-    	}
+		$resultline = $moline->create($user, false); // Never use triggers here
+		if ($resultline <= 0) {
+			$error++;
+			setEventMessages($moline->error, $molines->errors, 'errors');
+		}
 
-    	$action = '';
-    }
+		$action = '';
+	}
 
-    if (in_array($action, array('confirm_consumeorproduce', 'confirm_consumeandproduceall'))) {
-    	$stockmove = new MouvementStock($db);
+	if (in_array($action, array('confirm_consumeorproduce', 'confirm_consumeandproduceall'))) {
+		$stockmove = new MouvementStock($db);
 
-    	$labelmovement = GETPOST('inventorylabel', 'alphanohtml');
-    	$codemovement  = GETPOST('inventorycode', 'alphanohtml');
+		$labelmovement = GETPOST('inventorylabel', 'alphanohtml');
+		$codemovement  = GETPOST('inventorycode', 'alphanohtml');
 
-    	$db->begin();
+		$db->begin();
 
-    	// Process line to consume
-    	foreach ($object->lines as $line) {
-    		if ($line->role == 'toconsume') {
-    			$tmpproduct = new Product($db);
-    			$tmpproduct->fetch($line->fk_product);
+		// Process line to consume
+		foreach ($object->lines as $line) {
+			if ($line->role == 'toconsume') {
+				$tmpproduct = new Product($db);
+				$tmpproduct->fetch($line->fk_product);
 
-    			$i = 1;
-    			while (GETPOSTISSET('qty-'.$line->id.'-'.$i)) {
-    				$qtytoprocess = price2num(GETPOST('qty-'.$line->id.'-'.$i));
+				$i = 1;
+				while (GETPOSTISSET('qty-'.$line->id.'-'.$i)) {
+					$qtytoprocess = price2num(GETPOST('qty-'.$line->id.'-'.$i));
 
-    				if ($qtytoprocess != 0) {
+					if ($qtytoprocess != 0) {
 						// Check warehouse is set if we should have to
-	    				if (GETPOSTISSET('idwarehouse-'.$line->id.'-'.$i)) {	// If there is a warehouse to set
-	    					if (!(GETPOST('idwarehouse-'.$line->id.'-'.$i) > 0)) {	// If there is no warehouse set.
-		    					$langs->load("errors");
-	    						setEventMessages($langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Warehouse"), $tmpproduct->ref), null, 'errors');
-	    						$error++;
-	    					}
-	    					if ($tmpproduct->status_batch && (!GETPOST('batch-'.$line->id.'-'.$i))) {
-	    						$langs->load("errors");
-	    						setEventMessages($langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Batch"), $tmpproduct->ref), null, 'errors');
-	    						$error++;
-	    					}
-	    				}
+						if (GETPOSTISSET('idwarehouse-'.$line->id.'-'.$i)) {	// If there is a warehouse to set
+							if (!(GETPOST('idwarehouse-'.$line->id.'-'.$i) > 0)) {	// If there is no warehouse set.
+								$langs->load("errors");
+								setEventMessages($langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Warehouse"), $tmpproduct->ref), null, 'errors');
+								$error++;
+							}
+							if ($tmpproduct->status_batch && (!GETPOST('batch-'.$line->id.'-'.$i))) {
+								$langs->load("errors");
+								setEventMessages($langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Batch"), $tmpproduct->ref), null, 'errors');
+								$error++;
+							}
+						}
 
-	    				$idstockmove = 0;
-	    				if (!$error && GETPOST('idwarehouse-'.$line->id.'-'.$i) > 0) {
-	    					// Record stock movement
-	    					$id_product_batch = 0;
-	    					$stockmove->origin = $object;
-	    					$idstockmove = $stockmove->livraison($user, $line->fk_product, GETPOST('idwarehouse-'.$line->id.'-'.$i), $qtytoprocess, 0, $labelmovement, dol_now(), '', '', GETPOST('batch-'.$line->id.'-'.$i), $id_product_batch, $codemovement);
-	    					if ($idstockmove < 0) {
-	    						$error++;
-	    						setEventMessages($stockmove->error, $stockmove->errors, 'errors');
-	    					}
-	    				}
+						$idstockmove = 0;
+						if (!$error && GETPOST('idwarehouse-'.$line->id.'-'.$i) > 0) {
+							// Record stock movement
+							$id_product_batch = 0;
+							$stockmove->origin = $object;
+							$idstockmove = $stockmove->livraison($user, $line->fk_product, GETPOST('idwarehouse-'.$line->id.'-'.$i), $qtytoprocess, 0, $labelmovement, dol_now(), '', '', GETPOST('batch-'.$line->id.'-'.$i), $id_product_batch, $codemovement);
+							if ($idstockmove < 0) {
+								$error++;
+								setEventMessages($stockmove->error, $stockmove->errors, 'errors');
+							}
+						}
 
-	    				if (!$error) {
-	    					$pos = 0;
-	    					// Record consumption
-	    					$moline = new MoLine($db);
-	    					$moline->fk_mo = $object->id;
-	    					$moline->position = $pos;
-	    					$moline->fk_product = $line->fk_product;
-	    					$moline->fk_warehouse = GETPOST('idwarehouse-'.$line->id.'-'.$i);
-	    					$moline->qty = $qtytoprocess;
-	    					$moline->batch = GETPOST('batch-'.$line->id.'-'.$i);
-	    					$moline->role = 'consumed';
-	    					$moline->fk_mrp_production = $line->id;
-	    					$moline->fk_stock_movement = $idstockmove;
-	    					$moline->fk_user_creat = $user->id;
+						if (!$error) {
+							$pos = 0;
+							// Record consumption
+							$moline = new MoLine($db);
+							$moline->fk_mo = $object->id;
+							$moline->position = $pos;
+							$moline->fk_product = $line->fk_product;
+							$moline->fk_warehouse = GETPOST('idwarehouse-'.$line->id.'-'.$i);
+							$moline->qty = $qtytoprocess;
+							$moline->batch = GETPOST('batch-'.$line->id.'-'.$i);
+							$moline->role = 'consumed';
+							$moline->fk_mrp_production = $line->id;
+							$moline->fk_stock_movement = $idstockmove;
+							$moline->fk_user_creat = $user->id;
 
-	    					$resultmoline = $moline->create($user);
-	    					if ($resultmoline <= 0) {
-	    						$error++;
-	    						setEventMessages($moline->error, $moline->errors, 'errors');
-	    					}
+							$resultmoline = $moline->create($user);
+							if ($resultmoline <= 0) {
+								$error++;
+								setEventMessages($moline->error, $moline->errors, 'errors');
+							}
 
-	    					$pos++;
-	    				}
-	    			}
+							$pos++;
+						}
+					}
 
-    				$i++;
-    			}
-    		}
-    	}
+					$i++;
+				}
+			}
+		}
 
-    	// Process line to produce
-    	foreach ($object->lines as $line) {
-    		if ($line->role == 'toproduce') {
-    			$tmpproduct = new Product($db);
-    			$tmpproduct->fetch($line->fk_product);
+		// Process line to produce
+		foreach ($object->lines as $line) {
+			if ($line->role == 'toproduce') {
+				$tmpproduct = new Product($db);
+				$tmpproduct->fetch($line->fk_product);
 
-    			$i = 1;
-    			while (GETPOSTISSET('qtytoproduce-'.$line->id.'-'.$i)) {
-    				$qtytoprocess = price2num(GETPOST('qtytoproduce-'.$line->id.'-'.$i));
+				$i = 1;
+				while (GETPOSTISSET('qtytoproduce-'.$line->id.'-'.$i)) {
+					$qtytoprocess = price2num(GETPOST('qtytoproduce-'.$line->id.'-'.$i));
 
-    				if ($qtytoprocess != 0) {
-	    				// Check warehouse is set if we should have to
-	    				if (GETPOSTISSET('idwarehousetoproduce-'.$line->id.'-'.$i)) {	// If there is a warehouse to set
-	    					if (!(GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i) > 0)) {	// If there is no warehouse set.
-	    						$langs->load("errors");
-	    						setEventMessages($langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Warehouse"), $tmpproduct->ref), null, 'errors');
-	    						$error++;
-	    					}
-	    					if (!empty($conf->productbatch->enabled) && $tmpproduct->status_batch && (!GETPOST('batchtoproduce-'.$line->id.'-'.$i))) {
-	    						$langs->load("errors");
-	    						setEventMessages($langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Batch"), $tmpproduct->ref), null, 'errors');
-	    						$error++;
-	    					}
-	    				}
+					if ($qtytoprocess != 0) {
+						// Check warehouse is set if we should have to
+						if (GETPOSTISSET('idwarehousetoproduce-'.$line->id.'-'.$i)) {	// If there is a warehouse to set
+							if (!(GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i) > 0)) {	// If there is no warehouse set.
+								$langs->load("errors");
+								setEventMessages($langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Warehouse"), $tmpproduct->ref), null, 'errors');
+								$error++;
+							}
+							if (!empty($conf->productbatch->enabled) && $tmpproduct->status_batch && (!GETPOST('batchtoproduce-'.$line->id.'-'.$i))) {
+								$langs->load("errors");
+								setEventMessages($langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Batch"), $tmpproduct->ref), null, 'errors');
+								$error++;
+							}
+						}
 
-	    				$idstockmove = 0;
-	    				if (!$error && GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i) > 0) {
-	    					// Record stock movement
-	    					$id_product_batch = 0;
-	    					$stockmove->origin = $object;
-	    					$idstockmove = $stockmove->reception($user, $line->fk_product, GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i), $qtytoprocess, 0, $labelmovement, '', '', GETPOST('batchtoproduce-'.$line->id.'-'.$i), dol_now(), $id_product_batch, $codemovement);
-	    					if ($idstockmove < 0) {
-	    						$error++;
-	    						setEventMessages($stockmove->error, $stockmove->errors, 'errors');
-	    					}
-	    				}
+						$idstockmove = 0;
+						if (!$error && GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i) > 0) {
+							// Record stock movement
+							$id_product_batch = 0;
+							$stockmove->origin = $object;
+							$idstockmove = $stockmove->reception($user, $line->fk_product, GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i), $qtytoprocess, 0, $labelmovement, '', '', GETPOST('batchtoproduce-'.$line->id.'-'.$i), dol_now(), $id_product_batch, $codemovement);
+							if ($idstockmove < 0) {
+								$error++;
+								setEventMessages($stockmove->error, $stockmove->errors, 'errors');
+							}
+						}
 
-	    				if (!$error) {
-	    					$pos = 0;
+						if (!$error) {
+							$pos = 0;
 							// Record production
-	    					$moline = new MoLine($db);
-	    					$moline->fk_mo = $object->id;
-	    					$moline->position = $pos;
-	    					$moline->fk_product = $line->fk_product;
-	    					$moline->fk_warehouse = GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i);
-	    					$moline->qty = $qtytoprocess;
-	    					$moline->batch = GETPOST('batchtoproduce-'.$line->id.'-'.$i);
-	    					$moline->role = 'produced';
-	    					$moline->fk_mrp_production = $line->id;
-	    					$moline->fk_stock_movement = $idstockmove;
-	    					$moline->fk_user_creat = $user->id;
+							$moline = new MoLine($db);
+							$moline->fk_mo = $object->id;
+							$moline->position = $pos;
+							$moline->fk_product = $line->fk_product;
+							$moline->fk_warehouse = GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i);
+							$moline->qty = $qtytoprocess;
+							$moline->batch = GETPOST('batchtoproduce-'.$line->id.'-'.$i);
+							$moline->role = 'produced';
+							$moline->fk_mrp_production = $line->id;
+							$moline->fk_stock_movement = $idstockmove;
+							$moline->fk_user_creat = $user->id;
 
-	    					$resultmoline = $moline->create($user);
-	    					if ($resultmoline <= 0) {
-	    						$error++;
-	    						setEventMessages($moline->error, $moline->errors, 'errors');
-	    					}
+							$resultmoline = $moline->create($user);
+							if ($resultmoline <= 0) {
+								$error++;
+								setEventMessages($moline->error, $moline->errors, 'errors');
+							}
 
-	    					$pos++;
-	    				}
-    				}
+							$pos++;
+						}
+					}
 
-    				$i++;
-    			}
-    		}
-    	}
+					$i++;
+				}
+			}
+		}
 
-    	if (!$error) {
-    		$consumptioncomplete = true;
-    		$productioncomplete = true;
+		if (!$error) {
+			$consumptioncomplete = true;
+			$productioncomplete = true;
 
-    		if (GETPOST('autoclose', 'int')) {
-	    		foreach ($object->lines as $line) {
-	    			if ($line->role == 'toconsume') {
-	    				$arrayoflines = $object->fetchLinesLinked('consumed', $line->id);
-	    				$alreadyconsumed = 0;
-	    				foreach ($arrayoflines as $line2) {
-	    					$alreadyconsumed += $line2['qty'];
-	    				}
+			if (GETPOST('autoclose', 'int')) {
+				foreach ($object->lines as $line) {
+					if ($line->role == 'toconsume') {
+						$arrayoflines = $object->fetchLinesLinked('consumed', $line->id);
+						$alreadyconsumed = 0;
+						foreach ($arrayoflines as $line2) {
+							$alreadyconsumed += $line2['qty'];
+						}
 
-	    				if ($alreadyconsumed < $line->qty) {
-	    					$consumptioncomplete = false;
-	    				}
-	    			}
-	    			if ($line->role == 'toproduce') {
-	    				$arrayoflines = $object->fetchLinesLinked('produced', $line->id);
-	    				$alreadyproduced = 0;
-	    				foreach ($arrayoflines as $line2) {
-	    					$alreadyproduced += $line2['qty'];
-	    				}
+						if ($alreadyconsumed < $line->qty) {
+							$consumptioncomplete = false;
+						}
+					}
+					if ($line->role == 'toproduce') {
+						$arrayoflines = $object->fetchLinesLinked('produced', $line->id);
+						$alreadyproduced = 0;
+						foreach ($arrayoflines as $line2) {
+							$alreadyproduced += $line2['qty'];
+						}
 
-	    				if ($alreadyproduced < $line->qty) {
-	    					$productioncomplete = false;
-	    				}
-	    			}
-	    		}
-    		} else {
-    			$consumptioncomplete = false;
-    			$productioncomplete = false;
-    		}
+						if ($alreadyproduced < $line->qty) {
+							$productioncomplete = false;
+						}
+					}
+				}
+			} else {
+				$consumptioncomplete = false;
+				$productioncomplete = false;
+			}
 
-    		// Update status of MO
-    		dol_syslog("consumptioncomplete = ".$consumptioncomplete." productioncomplete = ".$productioncomplete);
-    		//var_dump("consumptioncomplete = ".$consumptioncomplete." productioncomplete = ".$productioncomplete);
-    		if ($consumptioncomplete && $productioncomplete) {
-    			$result = $object->setStatut($object::STATUS_PRODUCED, 0, '', 'MRP_MO_PRODUCED');
-    		} else {
-    			$result = $object->setStatut($object::STATUS_INPROGRESS, 0, '', 'MRP_MO_PRODUCED');
-    		}
-    		if ($result <= 0) {
-    			$error++;
-    			setEventMessages($object->error, $object->errors, 'errors');
-    		}
-    	}
+			// Update status of MO
+			dol_syslog("consumptioncomplete = ".$consumptioncomplete." productioncomplete = ".$productioncomplete);
+			//var_dump("consumptioncomplete = ".$consumptioncomplete." productioncomplete = ".$productioncomplete);
+			if ($consumptioncomplete && $productioncomplete) {
+				$result = $object->setStatut($object::STATUS_PRODUCED, 0, '', 'MRP_MO_PRODUCED');
+			} else {
+				$result = $object->setStatut($object::STATUS_INPROGRESS, 0, '', 'MRP_MO_PRODUCED');
+			}
+			if ($result <= 0) {
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
 
-    	if ($error) {
-    		$action = str_replace('confirm_', '', $action);
-    		$db->rollback();
-    	} else {
-    		$db->commit();
+		if ($error) {
+			$action = str_replace('confirm_', '', $action);
+			$db->rollback();
+		} else {
+			$db->commit();
 
-    		// Redirect to avoid to action done a second time if we make a back from browser
-    		header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
-    		exit;
-    	}
-    }
+			// Redirect to avoid to action done a second time if we make a back from browser
+			header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
+			exit;
+		}
+	}
 
-    // Action close produced
-    if ($action == 'confirm_produced' && $confirm == 'yes' && $permissiontoadd)
-    {
-    	$result = $object->setStatut($object::STATUS_PRODUCED, 0, '', 'MRP_MO_PRODUCED');
-    	if ($result >= 0)
-    	{
-    		// 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->model_pdf;
-    			$ret = $object->fetch($id); // Reload to get new records
+	// Action close produced
+	if ($action == 'confirm_produced' && $confirm == 'yes' && $permissiontoadd)
+	{
+		$result = $object->setStatut($object::STATUS_PRODUCED, 0, '', 'MRP_MO_PRODUCED');
+		if ($result >= 0)
+		{
+			// 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->model_pdf;
+				$ret = $object->fetch($id); // Reload to get new records
 
-    			$object->generateDocument($model, $outputlangs, 0, 0, 0);
-    		}
-    	} else {
-    		setEventMessages($object->error, $object->errors, 'errors');
-    	}
-    }
+				$object->generateDocument($model, $outputlangs, 0, 0, 0);
+			}
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
 }
 
 
@@ -413,14 +413,15 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$res = $object->fetch_optionals();
 
 	$head = moPrepareHead($object);
-	dol_fiche_head($head, 'production', $langs->trans("MO"), -1, $object->picto);
+
+	print dol_get_fiche_head($head, 'production', $langs->trans("ManufacturingOrder"), -1, $object->picto);
 
 	$formconfirm = '';
 
 	// Confirmation to delete
 	if ($action == 'delete')
 	{
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMo'), $langs->trans('ConfirmDeleteMo'), 'confirm_delete', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMo'), $langs->trans('ConfirmDeleteMo'), 'confirm_delete', '', 0, 1);
 	}
 	// Confirmation to delete line
 	if ($action == 'deleteline')
@@ -497,32 +498,32 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    if ($permissiontoadd)
-	    {
-	        if ($action != 'classify')
-	            $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-            if ($action == 'classify') {
-            	//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-            	$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_soc, $object->fk_project, 'none', 0, 0, 0, 1);
-	        }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= $proj->getNomUrl();
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($permissiontoadd)
+		{
+			if ($action != 'classify')
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_soc, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= $proj->getNomUrl();
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
@@ -550,7 +551,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	if (!in_array($action, array('consumeorproduce', 'consumeandproduceall')))
@@ -657,7 +658,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			print '<input type="checkbox" id="autoclose" name="autoclose" value="1"'.(GETPOSTISSET('inventorylabel') ? (GETPOST('autoclose') ? ' checked="checked"' : '') : ' checked="checked"').'> <label for="autoclose">'.$langs->trans("AutoCloseMO").'</label><br>';
 			print '<input class="button" type="submit" value="'.$langs->trans("Confirm").'" name="confirm">';
 			print ' &nbsp; ';
-			print '<input class="button" type="submit" value="'.$langs->trans("Cancel").'" name="cancel">';
+			print '<input class="button button-cancel" type="submit" value="'.$langs->trans("Cancel").'" name="cancel">';
 			print '<br><br>';
 			print '</div>';
 
@@ -673,336 +674,343 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	if (!empty($object->table_element_line))
 	{
-    	// Show object lines
-    	//$result = $object->getLinesArray();
-    	$object->fetchLines();
+		// Show object lines
+		$object->fetchLines();
 
-    	print '<div class="fichecenter">';
-    	print '<div class="fichehalfleft">';
-    	print '<div class="clearboth"></div>';
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
+		print '<div class="clearboth"></div>';
 
-    	$newlinetext = '';
-    	if ($action != 'consumeorproduce' && $action != 'consumeandproduceall') {
-    		$newlinetext = '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=addconsumeline">'.$langs->trans("AddNewConsumeLines").'</a>';
-    	}
-    	print load_fiche_titre($langs->trans('Consumption'), '', '', 0, '', '', $newlinetext);
+		$newlinetext = '';
+		if ($action != 'consumeorproduce' && $action != 'consumeandproduceall') {
+			$newlinetext = '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=addconsumeline">'.$langs->trans("AddNewConsumeLines").'</a>';
+		}
+		print load_fiche_titre($langs->trans('Consumption'), '', '', 0, '', '', $newlinetext);
 
-    	print '<div class="div-table-responsive-no-min">';
-    	print '<table class="noborder noshadow centpercent nobottom">';
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder noshadow centpercent nobottom">';
 
-    	print '<tr class="liste_titre">';
-    	print '<td>'.$langs->trans("Product").'</td>';
-    	print '<td class="right">'.$langs->trans("Qty").'</td>';
-    	print '<td class="right">'.$langs->trans("QtyAlreadyConsumed").'</td>';
-    	print '<td>';
-    	if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) print $langs->trans("Warehouse");
-    	print '</td>';
-    	if ($conf->productbatch->enabled) {
-    		print '<td>';
-    		if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) print $langs->trans("Batch");
-    		print '</td>';
-    	}
-    	print '</tr>';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("Product").'</td>';
+		print '<td class="right">'.$langs->trans("Qty").'</td>';
+		print '<td class="right">'.$langs->trans("QtyAlreadyConsumed").'</td>';
+		print '<td>';
+		if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) print $langs->trans("Warehouse");
+		print '</td>';
+		if ($conf->productbatch->enabled) {
+			print '<td>';
+			if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) print $langs->trans("Batch");
+			print '</td>';
+		}
+		print '</tr>';
 
-    	if ($action == 'addconsumeline') {
-    		print '<!-- Add line to consume -->'."\n";
-    		print '<tr class="liste_titre">';
-    		print '<td>';
-    		print $form->select_produits('', 'productidtoadd', '', 0, 0, -1, 2, '', 0, array(), 0, '1', 0, 'maxwidth300');
-    		print '</td>';
-    		print '<td class="right"><input type="text" name="qtytoadd" value="1" class="width50 right"></td>';
-    		print '<td class="right"></td>';
-    		print '<td>';
-    		print '<input type="submit" class="button buttongen" name="addconsumelinebutton" value="'.$langs->trans("Add").'">';
-    		print '</td>';
-    		if ($conf->productbatch->enabled) {
-    			print '<td></td>';
-    		}
-    		print '</tr>';
-    	}
+		if ($action == 'addconsumeline') {
+			print '<!-- Add line to consume -->'."\n";
+			print '<tr class="liste_titre">';
+			print '<td>';
+			print $form->select_produits('', 'productidtoadd', '', 0, 0, -1, 2, '', 0, array(), 0, '1', 0, 'maxwidth300');
+			print '</td>';
+			print '<td class="right"><input type="text" name="qtytoadd" value="1" class="width50 right"></td>';
+			print '<td class="right"></td>';
+			print '<td>';
+			print '<input type="submit" class="button buttongen" name="addconsumelinebutton" value="'.$langs->trans("Add").'">';
+			print '</td>';
+			if ($conf->productbatch->enabled) {
+				print '<td></td>';
+			}
+			print '</tr>';
+		}
 
-    	if (!empty($object->lines))
-    	{
-    		$nblinetoconsume = 0;
-    		foreach ($object->lines as $line) {
-    			if ($line->role == 'toconsume') {
-    				$nblinetoconsume++;
-    			}
-    		}
+		// Lines to consume
 
-    		$nblinetoconsumecursor = 0;
-    		foreach ($object->lines as $line) {
-    	    	if ($line->role == 'toconsume') {
-    	    		$nblinetoconsumecursor++;
+		if (!empty($object->lines))
+		{
+			$nblinetoconsume = 0;
+			foreach ($object->lines as $line) {
+				if ($line->role == 'toconsume') {
+					$nblinetoconsume++;
+				}
+			}
 
-    	    		$tmpproduct = new Product($db);
-    	    		$tmpproduct->fetch($line->fk_product);
+			$nblinetoconsumecursor = 0;
+			foreach ($object->lines as $line) {
+				if ($line->role == 'toconsume') {
+					$nblinetoconsumecursor++;
 
-    	    		$arrayoflines = $object->fetchLinesLinked('consumed', $line->id);
-    	    		$alreadyconsumed = 0;
-    	    		foreach ($arrayoflines as $line2) {
-    	    			$alreadyconsumed += $line2['qty'];
-    	    		}
+					$tmpproduct = new Product($db);
+					$tmpproduct->fetch($line->fk_product);
 
-    	    		print '<tr>';
-    	    		print '<td>'.$tmpproduct->getNomUrl(1).'</td>';
-    	    		print '<td class="right nowraponall">';
-    	    		$help = '';
-    	    		if ($line->qty_frozen) $help .= ($help ? '<br>' : '').'<strong>'.$langs->trans("QuantityFrozen").'</strong>: '.yn(1).' ('.$langs->trans("QuantityConsumedInvariable").')';
-    	    		if ($line->disable_stock_change) $help .= ($help ? '<br>' : '').'<strong>'.$langs->trans("DisableStockChange").'</strong>: '.yn(1).' ('.(($tmpproduct->type == Product::TYPE_SERVICE && empty($conf->global->STOCK_SUPPORTS_SERVICES)) ? $langs->trans("NoStockChangeOnServices") : $langs->trans("DisableStockChangeHelp")).')';
-    	    		if ($help) {
-    	    			print $form->textwithpicto($line->qty, $help, -1);
-    	    		} else {
-    	    			print $line->qty;
-    	    		}
-    	    		print '</td>';
-    	    		print '<td class="right">';
-    	    		if ($alreadyconsumed) {
-    	    			print '<script>';
-    	    			print 'jQuery(document).ready(function() {
+					$arrayoflines = $object->fetchLinesLinked('consumed', $line->id);
+					$alreadyconsumed = 0;
+					foreach ($arrayoflines as $line2) {
+						$alreadyconsumed += $line2['qty'];
+					}
+
+					print '<tr>';
+					print '<td>'.$tmpproduct->getNomUrl(1);
+					print '<br><span class="opacitymedium small">'.$tmpproduct->label.'</span>';
+					print '</td>';
+					print '<td class="right nowraponall">';
+					$help = '';
+					if ($line->qty_frozen) $help .= ($help ? '<br>' : '').'<strong>'.$langs->trans("QuantityFrozen").'</strong>: '.yn(1).' ('.$langs->trans("QuantityConsumedInvariable").')';
+					if ($line->disable_stock_change) $help .= ($help ? '<br>' : '').'<strong>'.$langs->trans("DisableStockChange").'</strong>: '.yn(1).' ('.(($tmpproduct->type == Product::TYPE_SERVICE && empty($conf->global->STOCK_SUPPORTS_SERVICES)) ? $langs->trans("NoStockChangeOnServices") : $langs->trans("DisableStockChangeHelp")).')';
+					if ($help) {
+						print $form->textwithpicto($line->qty, $help, -1);
+					} else {
+						print $line->qty;
+					}
+					print '</td>';
+					print '<td class="right">';
+					if ($alreadyconsumed) {
+						print '<script>';
+						print 'jQuery(document).ready(function() {
 								jQuery("#expandtoproduce'.$line->id.'").click(function() {
 									console.log("Expand mrp_production line '.$line->id.'");
 									jQuery(".expanddetail'.$line->id.'").toggle();';
-    	    			if ($nblinetoconsume == $nblinetoconsumecursor) {	// If it is the last line
-    	    				print 'if (jQuery("#tablelines").hasClass("nobottom")) { jQuery("#tablelines").removeClass("nobottom"); } else { jQuery("#tablelines").addClass("nobottom"); }';
-    	    			}
-    	    			print '
+						if ($nblinetoconsume == $nblinetoconsumecursor) {	// If it is the last line
+							print 'if (jQuery("#tablelines").hasClass("nobottom")) { jQuery("#tablelines").removeClass("nobottom"); } else { jQuery("#tablelines").addClass("nobottom"); }';
+						}
+						print '
 								});
 							});';
-    	    			print '</script>';
-    	    			if (empty($conf->use_javascript_ajax)) print '<a href="'.$_SERVER["PHP_SELF"].'?collapse='.$collapse.','.$line->id.'">';
-    	    			print img_picto($langs->trans("ShowDetails"), "chevron-down", 'id="expandtoproduce'.$line->id.'"');
-    	    			if (empty($conf->use_javascript_ajax)) print '</a>';
-    	    		} else {
-    	    			if ($nblinetoconsume == $nblinetoconsumecursor) {	// If it is the last line
-    	    				print '<script>jQuery("#tablelines").removeClass("nobottom");</script>';
-    	    			}
-    	    		}
-    	    		print ' '.$alreadyconsumed;
-    	    		print '</td>';
-    	    		print '<td>'; // Warehouse
-    	    		print '</td>';
-    	    		if ($conf->productbatch->enabled) {
-    	    			print '<td></td>'; // Lot
-    	    		}
-    	    		print '</tr>';
+						print '</script>';
+						if (empty($conf->use_javascript_ajax)) print '<a href="'.$_SERVER["PHP_SELF"].'?collapse='.$collapse.','.$line->id.'">';
+						print img_picto($langs->trans("ShowDetails"), "chevron-down", 'id="expandtoproduce'.$line->id.'"');
+						if (empty($conf->use_javascript_ajax)) print '</a>';
+					} else {
+						if ($nblinetoconsume == $nblinetoconsumecursor) {	// If it is the last line
+							print '<script>jQuery("#tablelines").removeClass("nobottom");</script>';
+						}
+					}
+					print ' '.$alreadyconsumed;
+					print '</td>';
+					print '<td>'; // Warehouse
+					print '</td>';
+					if ($conf->productbatch->enabled) {
+						print '<td></td>'; // Lot
+					}
+					print '</tr>';
 
-    	    		// Show detailed of already consumed with js code to collapse
-    	    		foreach ($arrayoflines as $line2) {
-    	    			print '<tr class="expanddetail'.$line->id.' hideobject opacitylow">';
-    	    			print '<td>';
-    	    			print dol_print_date($line2['date'], 'dayhour');
-    	    			print '</td>';
-    	    			print '<td></td>';
-    	    			print '<td class="right">'.$line2['qty'].'</td>';
-    	    			print '<td class="tdoverflowmax150">';
-    	    			if ($line2['fk_warehouse'] > 0) {
-    	    				$result = $tmpwarehouse->fetch($line2['fk_warehouse']);
-    	    				if ($result > 0) print $tmpwarehouse->getNomUrl(1);
-    	    			}
-    	    			print '</td>';
-    	    			// Lot Batch
-    	    			print '<td>';
-    	    			if ($line2['batch'] != '') {
-    	    				$tmpbatch->fetch(0, $line2['fk_product'], $line2['batch']);
-    	    				print $tmpbatch->getNomUrl(1);
-    	    			}
-    	    			print '</td>';
-    	    			print '</tr>';
-    	    		}
+					// Show detailed of already consumed with js code to collapse
+					foreach ($arrayoflines as $line2) {
+						print '<tr class="expanddetail'.$line->id.' hideobject opacitylow">';
+						print '<td>';
+						print dol_print_date($line2['date'], 'dayhour');
+						print '</td>';
+						print '<td></td>';
+						print '<td class="right">'.$line2['qty'].'</td>';
+						print '<td class="tdoverflowmax150">';
+						if ($line2['fk_warehouse'] > 0) {
+							$result = $tmpwarehouse->fetch($line2['fk_warehouse']);
+							if ($result > 0) print $tmpwarehouse->getNomUrl(1);
+						}
+						print '</td>';
+						// Lot Batch
+						print '<td>';
+						if ($line2['batch'] != '') {
+							$tmpbatch->fetch(0, $line2['fk_product'], $line2['batch']);
+							print $tmpbatch->getNomUrl(1);
+						}
+						print '</td>';
+						print '</tr>';
+					}
 
-    	    		if (in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
-    	    			$i = 1;
-    	    			print '<!-- Enter line to consume -->'."\n";
-    	    			print '<tr>';
-    	    			print '<td><span class="opacitymedium">'.$langs->trans("ToConsume").'</span></td>';
-    	    			$preselected = (GETPOSTISSET('qty-'.$line->id.'-'.$i) ? GETPOST('qty-'.$line->id.'-'.$i) : max(0, $line->qty - $alreadyconsumed));
-    	    			if ($action == 'consumeorproduce' && !GETPOSTISSET('qty-'.$line->id.'-'.$i)) $preselected = 0;
-    	    			print '<td class="right"><input type="text" class="width50 right" name="qty-'.$line->id.'-'.$i.'" value="'.$preselected.'"></td>';
-    	    			print '<td></td>';
-    	    			print '<td>';
-    	    			if ($tmpproduct->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
-    	    				if (empty($line->disable_stock_change)) {
-    	    					$preselected = (GETPOSTISSET('idwarehouse-'.$line->id.'-'.$i) ? GETPOST('idwarehouse-'.$line->id.'-'.$i) : ($tmpproduct->fk_default_warehouse > 0 ? $tmpproduct->fk_default_warehouse : 'ifone'));
-    	    					print $formproduct->selectWarehouses($preselected, 'idwarehouse-'.$line->id.'-'.$i, '', 1, 0, $line->fk_product, '', 1, 0, null, 'maxwidth300');
-    	    				} else {
-    	    					print '<span class="opacitymedium">'.$langs->trans("DisableStockChange").'</span>';
-    	    				}
-    	    			} else {
-    	    				print '<span class="opacitymedium">'.$langs->trans("NoStockChangeOnServices").'</span>';
-    	    			}
-    	    			// Lot / Batch
-    	    			print '</td>';
-    	    			if ($conf->productbatch->enabled) {
-	    	    			print '<td>';
-	    	    			if ($tmpproduct->status_batch) {
-	    	    				$preselected = (GETPOSTISSET('batch-'.$line->id.'-'.$i) ? GETPOST('batch-'.$line->id.'-'.$i) : '');
-	    	    				print '<input type="text" class="width50" name="batch-'.$line->id.'-'.$i.'" value="'.$preselected.'">';
-	    	    			}
-	    	    			print '</td>';
-    	    			}
-    	    			print '</tr>';
-    	    		}
-    	    	}
-    	    }
-    	}
+					if (in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
+						$i = 1;
+						print '<!-- Enter line to consume -->'."\n";
+						print '<tr>';
+						print '<td><span class="opacitymedium">'.$langs->trans("ToConsume").'</span></td>';
+						$preselected = (GETPOSTISSET('qty-'.$line->id.'-'.$i) ? GETPOST('qty-'.$line->id.'-'.$i) : max(0, $line->qty - $alreadyconsumed));
+						if ($action == 'consumeorproduce' && !GETPOSTISSET('qty-'.$line->id.'-'.$i)) $preselected = 0;
+						print '<td class="right"><input type="text" class="width50 right" name="qty-'.$line->id.'-'.$i.'" value="'.$preselected.'"></td>';
+						print '<td></td>';
+						print '<td>';
+						if ($tmpproduct->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+							if (empty($line->disable_stock_change)) {
+								$preselected = (GETPOSTISSET('idwarehouse-'.$line->id.'-'.$i) ? GETPOST('idwarehouse-'.$line->id.'-'.$i) : ($tmpproduct->fk_default_warehouse > 0 ? $tmpproduct->fk_default_warehouse : 'ifone'));
+								print $formproduct->selectWarehouses($preselected, 'idwarehouse-'.$line->id.'-'.$i, '', 1, 0, $line->fk_product, '', 1, 0, null, 'maxwidth300');
+							} else {
+								print '<span class="opacitymedium">'.$langs->trans("DisableStockChange").'</span>';
+							}
+						} else {
+							print '<span class="opacitymedium">'.$langs->trans("NoStockChangeOnServices").'</span>';
+						}
+						// Lot / Batch
+						print '</td>';
+						if ($conf->productbatch->enabled) {
+							print '<td>';
+							if ($tmpproduct->status_batch) {
+								$preselected = (GETPOSTISSET('batch-'.$line->id.'-'.$i) ? GETPOST('batch-'.$line->id.'-'.$i) : '');
+								print '<input type="text" class="width50" name="batch-'.$line->id.'-'.$i.'" value="'.$preselected.'">';
+							}
+							print '</td>';
+						}
+						print '</tr>';
+					}
+				}
+			}
+		}
 
-   	    print '</table>';
-    	print '</div>';
+   		print '</table>';
+		print '</div>';
+
+		// Lines to produce
 
 		print '</div>';
-    	print '<div class="fichehalfright">';
-    	print '<div class="clearboth"></div>';
+		print '<div class="fichehalfright">';
+		print '<div class="clearboth"></div>';
 
-    	print load_fiche_titre($langs->trans('Production'), '', '');
+		print load_fiche_titre($langs->trans('Production'), '', '');
 
-    	print '<div class="div-table-responsive-no-min">';
-    	print '<table id="tablelinestoproduce" class="noborder noshadow nobottom centpercent">';
+		print '<div class="div-table-responsive-no-min">';
+		print '<table id="tablelinestoproduce" class="noborder noshadow nobottom centpercent">';
 
-    	print '<tr class="liste_titre">';
-    	print '<td>'.$langs->trans("Product").'</td>';
-    	print '<td class="right">'.$langs->trans("Qty").'</td>';
-    	print '<td class="right">'.$langs->trans("QtyAlreadyProduced").'</td>';
-    	print '<td>';
-    	if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) print $langs->trans("Warehouse");
-    	print '</td>';
-    	if ($conf->productbatch->enabled) {
-    		print '<td>';
-    		if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) print $langs->trans("Batch");
-    		print '</td>';
-    		print '<td></td>';
-    	}
-    	print '</tr>';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("Product").'</td>';
+		print '<td class="right">'.$langs->trans("Qty").'</td>';
+		print '<td class="right">'.$langs->trans("QtyAlreadyProduced").'</td>';
+		print '<td>';
+		if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) print $langs->trans("Warehouse");
+		print '</td>';
+		if ($conf->productbatch->enabled) {
+			print '<td>';
+			if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) print $langs->trans("Batch");
+			print '</td>';
+			print '<td></td>';
+		}
+		print '</tr>';
 
-    	if (!empty($object->lines))
-    	{
-    		$nblinetoproduce = 0;
-    		foreach ($object->lines as $line) {
-    			if ($line->role == 'toproduce') {
-    				$nblinetoproduce++;
-    			}
-    		}
+		if (!empty($object->lines))
+		{
+			$nblinetoproduce = 0;
+			foreach ($object->lines as $line) {
+				if ($line->role == 'toproduce') {
+					$nblinetoproduce++;
+				}
+			}
 
-    		$nblinetoproducecursor = 0;
-    		foreach ($object->lines as $line) {
-    			if ($line->role == 'toproduce') {
-    				$i = 1;
+			$nblinetoproducecursor = 0;
+			foreach ($object->lines as $line) {
+				if ($line->role == 'toproduce') {
+					$i = 1;
 
-    				$nblinetoproducecursor++;
+					$nblinetoproducecursor++;
 
-    				$tmpproduct = new Product($db);
-    				$tmpproduct->fetch($line->fk_product);
+					$tmpproduct = new Product($db);
+					$tmpproduct->fetch($line->fk_product);
 
-    				$arrayoflines = $object->fetchLinesLinked('produced', $line->id);
-    				$alreadyproduced = 0;
-    				foreach ($arrayoflines as $line2) {
-    					$alreadyproduced += $line2['qty'];
-    				}
+					$arrayoflines = $object->fetchLinesLinked('produced', $line->id);
+					$alreadyproduced = 0;
+					foreach ($arrayoflines as $line2) {
+						$alreadyproduced += $line2['qty'];
+					}
 
-    				$suffix = '_'.$line->id;
-    				print '<!-- Line to dispatch '.$suffix.' -->'."\n";
-    				// hidden fields for js function
-    				print '<input id="qty_ordered'.$suffix.'" type="hidden" value="'.$line->qty.'">';
-    				print '<input id="qty_dispatched'.$suffix.'" type="hidden" value="'.$alreadyproduced.'">';
+					$suffix = '_'.$line->id;
+					print '<!-- Line to dispatch '.$suffix.' -->'."\n";
+					// hidden fields for js function
+					print '<input id="qty_ordered'.$suffix.'" type="hidden" value="'.$line->qty.'">';
+					print '<input id="qty_dispatched'.$suffix.'" type="hidden" value="'.$alreadyproduced.'">';
 
-    				print '<tr>';
-    				print '<td>'.$tmpproduct->getNomUrl(1).'</td>';
-    				print '<td class="right">'.$line->qty.'</td>';
-    				print '<td class="right nowraponall">';
-    				if ($alreadyproduced) {
-    					print '<script>';
-    					print 'jQuery(document).ready(function() {
+					print '<tr>';
+					print '<td>'.$tmpproduct->getNomUrl(1);
+					print '<br><span class="opacitymedium small">'.$tmpproduct->label.'</span>';
+					print '</td>';
+					print '<td class="right">'.$line->qty.'</td>';
+					print '<td class="right nowraponall">';
+					if ($alreadyproduced) {
+						print '<script>';
+						print 'jQuery(document).ready(function() {
 							jQuery("#expandtoproduce'.$line->id.'").click(function() {
 								console.log("Expand mrp_production line '.$line->id.'");
 								jQuery(".expanddetailtoproduce'.$line->id.'").toggle();';
-    					if ($nblinetoproduce == $nblinetoproducecursor) {
-    						print 'if (jQuery("#tablelinestoproduce").hasClass("nobottom")) { jQuery("#tablelinestoproduce").removeClass("nobottom"); } else { jQuery("#tablelinestoproduce").addClass("nobottom"); }';
-    					}
-    					print '
+						if ($nblinetoproduce == $nblinetoproducecursor) {
+							print 'if (jQuery("#tablelinestoproduce").hasClass("nobottom")) { jQuery("#tablelinestoproduce").removeClass("nobottom"); } else { jQuery("#tablelinestoproduce").addClass("nobottom"); }';
+						}
+						print '
 							});
 						});';
-    					print '</script>';
-    					if (empty($conf->use_javascript_ajax)) print '<a href="'.$_SERVER["PHP_SELF"].'?collapse='.$collapse.','.$line->id.'">';
-    					print img_picto($langs->trans("ShowDetails"), "chevron-down", 'id="expandtoproduce'.$line->id.'"');
-    					if (empty($conf->use_javascript_ajax)) print '</a>';
-    				}
-    				print ' '.$alreadyproduced;
-    				print '</td>';
-    				print '<td>'; // Warehouse
-    				print '</td>';
-    				if ($conf->productbatch->enabled) {
-    					print '<td></td>'; // Lot
-    					print '<td></td>';
-    				}
-    				print '</tr>';
+						print '</script>';
+						if (empty($conf->use_javascript_ajax)) print '<a href="'.$_SERVER["PHP_SELF"].'?collapse='.$collapse.','.$line->id.'">';
+						print img_picto($langs->trans("ShowDetails"), "chevron-down", 'id="expandtoproduce'.$line->id.'"');
+						if (empty($conf->use_javascript_ajax)) print '</a>';
+					}
+					print ' '.$alreadyproduced;
+					print '</td>';
+					print '<td>'; // Warehouse
+					print '</td>';
+					if ($conf->productbatch->enabled) {
+						print '<td></td>'; // Lot
+						print '<td></td>';
+					}
+					print '</tr>';
 
-    				// Show detailed of already consumed with js code to collapse
-    				foreach ($arrayoflines as $line2) {
-    					print '<tr class="expanddetailtoproduce'.$line->id.' hideobject opacitylow">';
-    					print '<td>';
-    					print dol_print_date($line2['date'], 'dayhour');
-    					print '</td>';
-    					print '<td></td>';
-    					print '<td class="right">'.$line2['qty'].'</td>';
-    					print '<td class="tdoverflowmax150">';
-    					if ($line2['fk_warehouse'] > 0) {
-    						$result = $tmpwarehouse->fetch($line2['fk_warehouse']);
-    						if ($result > 0) print $tmpwarehouse->getNomUrl(1);
-    					}
-    					print '</td>';
-    					if ($conf->productbatch->enabled) {
-    						print '<td>';
-	    					if ($line2['batch'] != '') {
-	    						$tmpbatch->fetch(0, $line2['fk_product'], $line2['batch']);
-	    						print $tmpbatch->getNomUrl(1);
-	    					}
-	    					print '</td>';
-	    					print '<td></td>';
-    					}
-    					print '</tr>';
-    				}
+					// Show detailed of already consumed with js code to collapse
+					foreach ($arrayoflines as $line2) {
+						print '<tr class="expanddetailtoproduce'.$line->id.' hideobject opacitylow">';
+						print '<td>';
+						print dol_print_date($line2['date'], 'dayhour');
+						print '</td>';
+						print '<td></td>';
+						print '<td class="right">'.$line2['qty'].'</td>';
+						print '<td class="tdoverflowmax150">';
+						if ($line2['fk_warehouse'] > 0) {
+							$result = $tmpwarehouse->fetch($line2['fk_warehouse']);
+							if ($result > 0) print $tmpwarehouse->getNomUrl(1);
+						}
+						print '</td>';
+						if ($conf->productbatch->enabled) {
+							print '<td>';
+							if ($line2['batch'] != '') {
+								$tmpbatch->fetch(0, $line2['fk_product'], $line2['batch']);
+								print $tmpbatch->getNomUrl(1);
+							}
+							print '</td>';
+							print '<td></td>';
+						}
+						print '</tr>';
+					}
 
-    				if (in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
-    					print '<!-- Enter line to produce -->'."\n";
-    					print '<tr name="batch_'.$line->id.'_'.$i.'">';
-    					print '<td><span class="opacitymedium">'.$langs->trans("ToProduce").'</span></td>';
-    					$preselected = (GETPOSTISSET('qtytoproduce-'.$line->id.'-'.$i) ? GETPOST('qtytoproduce-'.$line->id.'-'.$i) : max(0, $line->qty - $alreadyproduced));
-    					if ($action == 'consumeorproduce' && !GETPOSTISSET('qtytoproduce-'.$line->id.'-'.$i)) $preselected = 0;
-    					print '<td class="right"><input type="text" class="width50 right" id="qtytoproduce-'.$line->id.'-'.$i.'" name="qtytoproduce-'.$line->id.'-'.$i.'" value="'.$preselected.'"></td>';
-    					print '<td></td>';
-    					print '<td>';
-    					if ($tmpproduct->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
-    						$preselected = (GETPOSTISSET('idwarehousetoproduce-'.$line->id.'-'.$i) ? GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i) : ($object->fk_warehouse > 0 ? $object->fk_warehouse : 'ifone'));
-    						print $formproduct->selectWarehouses($preselected, 'idwarehousetoproduce-'.$line->id.'-'.$i, '', 1, 0, $line->fk_product, '', 1, 0, null, 'maxwidth300 csswarehouse_'.$line->id.'_'.$i);
-    					} else {
-    						print '<span class="opacitymedium">'.$langs->trans("NoStockChangeOnServices").'</span>';
-    					}
-    					print '</td>';
-    					if ($conf->productbatch->enabled) {
-    						print '<td>';
-    						if ($tmpproduct->status_batch) {
-    							$preselected = (GETPOSTISSET('batchtoproduce-'.$line->id.'-'.$i) ? GETPOST('batchtoproduce-'.$line->id.'-'.$i) : '');
-    							print '<input type="text" class="width50" name="batchtoproduce-'.$line->id.'-'.$i.'" value="'.$preselected.'">';
-    						}
-    						print '</td>';
-    						print '<td>';
-    						if ($tmpproduct->status_batch) {
-    							$type = 'batch';
-    							print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$line->id.', \''.$type.'\', \'qtymissing\')"');
-    						}
-    						print '</td>';
-    					}
-    					print '</tr>';
-    				}
-    			}
-    		}
-    	}
+					if (in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
+						print '<!-- Enter line to produce -->'."\n";
+						print '<tr name="batch_'.$line->id.'_'.$i.'">';
+						print '<td><span class="opacitymedium">'.$langs->trans("ToProduce").'</span></td>';
+						$preselected = (GETPOSTISSET('qtytoproduce-'.$line->id.'-'.$i) ? GETPOST('qtytoproduce-'.$line->id.'-'.$i) : max(0, $line->qty - $alreadyproduced));
+						if ($action == 'consumeorproduce' && !GETPOSTISSET('qtytoproduce-'.$line->id.'-'.$i)) $preselected = 0;
+						print '<td class="right"><input type="text" class="width50 right" id="qtytoproduce-'.$line->id.'-'.$i.'" name="qtytoproduce-'.$line->id.'-'.$i.'" value="'.$preselected.'"></td>';
+						print '<td></td>';
+						print '<td>';
+						if ($tmpproduct->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+							$preselected = (GETPOSTISSET('idwarehousetoproduce-'.$line->id.'-'.$i) ? GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i) : ($object->fk_warehouse > 0 ? $object->fk_warehouse : 'ifone'));
+							print $formproduct->selectWarehouses($preselected, 'idwarehousetoproduce-'.$line->id.'-'.$i, '', 1, 0, $line->fk_product, '', 1, 0, null, 'maxwidth300 csswarehouse_'.$line->id.'_'.$i);
+						} else {
+							print '<span class="opacitymedium">'.$langs->trans("NoStockChangeOnServices").'</span>';
+						}
+						print '</td>';
+						if ($conf->productbatch->enabled) {
+							print '<td>';
+							if ($tmpproduct->status_batch) {
+								$preselected = (GETPOSTISSET('batchtoproduce-'.$line->id.'-'.$i) ? GETPOST('batchtoproduce-'.$line->id.'-'.$i) : '');
+								print '<input type="text" class="width50" name="batchtoproduce-'.$line->id.'-'.$i.'" value="'.$preselected.'">';
+							}
+							print '</td>';
+							print '<td>';
+							if ($tmpproduct->status_batch) {
+								$type = 'batch';
+								print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$line->id.', \''.$type.'\', \'qtymissing\')"');
+							}
+							print '</td>';
+						}
+						print '</tr>';
+					}
+				}
+			}
+		}
 
-    	print '</table>';
-    	print '</div>';
+		print '</table>';
+		print '</div>';
 
-    	print '</div>';
-    	print '</div>';
+		print '</div>';
+		print '</div>';
 	}
 
 	if (in_array($action, array('consumeorproduce', 'consumeandproduceall', 'addconsumeline')))
diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index 2ce3277ae89..bb4df7060e9 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -628,46 +628,48 @@ class MultiCurrency extends CommonObject
 	{
 		global $conf, $db, $langs;
 
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+
 		$urlendpoint = 'http://apilayer.net/api/live?access_key='.$key;
 		//$urlendpoint.='&format=1';
 		$urlendpoint .= (empty($conf->global->MULTICURRENCY_APP_SOURCE) ? '' : '&source='.$conf->global->MULTICURRENCY_APP_SOURCE);
 
 		dol_syslog("Call url endpoint ".$urlendpoint);
 
-		// TODO Use getURLContent() function instead.
-		$ch = curl_init($urlendpoint);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		$response = curl_exec($ch);
-		curl_close($ch);
-		$response = json_decode($response);
+		$resget = getURLContent($urlendpoint, 'GET', '', 1, array(), array('http', 'https'), 1);
 
-		if ($response->success)
-		{
-			$TRate = $response->quotes;
-			$timestamp = $response->timestamp;
+		if ($resget['content']) {
+			$response = $resget['content'];
+			$response = json_decode($response);
 
-			if (self::recalculRates($TRate) >= 0)
+			if ($response->success)
 			{
-				foreach ($TRate as $currency_code => $rate)
+				$TRate = $response->quotes;
+				$timestamp = $response->timestamp;
+
+				if (self::recalculRates($TRate) >= 0)
 				{
-					$code = substr($currency_code, 3, 3);
-					$obj = new MultiCurrency($db);
-					if ($obj->fetch(null, $code) > 0)
+					foreach ($TRate as $currency_code => $rate)
 					{
-						$obj->updateRate($rate);
-					} elseif ($addifnotfound)
-					{
-						self::addRateFromDolibarr($code, $rate);
+						$code = substr($currency_code, 3, 3);
+						$obj = new MultiCurrency($db);
+						if ($obj->fetch(null, $code) > 0)
+						{
+							$obj->updateRate($rate);
+						} elseif ($addifnotfound)
+						{
+							self::addRateFromDolibarr($code, $rate);
+						}
 					}
 				}
+
+				return 1;
+			} else {
+				dol_syslog("Failed to call endpoint ".$response->error->info, LOG_WARNING);
+				setEventMessages($langs->trans('multicurrency_syncronize_error', $response->error->info), null, 'errors');
+
+				return -1;
 			}
-
-			return 1;
-		} else {
-			dol_syslog("Failed to call endpoint ".$response->error->info, LOG_WARNING);
-			setEventMessages($langs->trans('multicurrency_syncronize_error', $response->error->info), null, 'errors');
-
-			return -1;
 		}
 	}
 
@@ -687,6 +689,7 @@ class MultiCurrency extends CommonObject
 	}
 }
 
+
 /**
  * Class CurrencyRate
  */
@@ -727,6 +730,7 @@ class CurrencyRate extends CommonObjectLine
 	 */
 	public $entity;
 
+
 	/**
 	 * Constructor
 	 *
@@ -744,8 +748,7 @@ class CurrencyRate extends CommonObjectLine
 	 *
 	 * @param  int	$fk_multicurrency	Id of currency
 	 * @param  bool	$trigger			true=launch triggers after, false=disable triggers
-	 *
-	 * @return int <0 if KO, Id of created object if OK
+	 * @return int 						<0 if KO, Id of created object if OK
 	 */
 	public function create($fk_multicurrency, $trigger = true)
 	{
@@ -756,7 +759,7 @@ class CurrencyRate extends CommonObjectLine
 		$error = 0;
 		$this->rate = price2num($this->rate);
 		if (empty($this->entity) || $this->entity <= 0) $this->entity = $conf->entity;
-		$now = date('Y-m-d H:i:s');
+		$now = empty($this->date_sync) ? dol_now() : $this->date_sync;
 
 		// Insert request
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.'(';
@@ -766,9 +769,9 @@ class CurrencyRate extends CommonObjectLine
 		$sql .= ' entity';
 		$sql .= ') VALUES (';
 		$sql .= ' '.$this->rate.',';
-		$sql .= ' \''.$now.'\',';
-		$sql .= ' \''.$fk_multicurrency.'\',';
-		$sql .= ' \''.$this->entity.'\'';
+		$sql .= " '".$this->db->idate($now)."',";
+		$sql .= " ".((int) $fk_multicurrency).",";
+		$sql .= " ".((int) $this->entity);
 		$sql .= ')';
 
 		$this->db->begin();
@@ -806,9 +809,8 @@ class CurrencyRate extends CommonObjectLine
 	/**
 	 * Load object in memory from the database
 	 *
-	 * @param int    $id  Id object
-	 *
-	 * @return int <0 if KO, 0 if not found, >0 if OK
+	 * @param 	int    $id  Id object
+	 * @return 	int 		<0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -827,7 +829,7 @@ class CurrencyRate extends CommonObjectLine
 
 				$this->id = $obj->rowid;
 				$this->rate = $obj->rate;
-				$this->date_sync = $obj->date_sync;
+				$this->date_sync = $this->db->jdate($obj->date_sync);
 				$this->fk_multicurrency = $obj->fk_multicurrency;
 				$this->entity = $obj->entity;
 			}
@@ -849,9 +851,8 @@ class CurrencyRate extends CommonObjectLine
 	/**
 	 * Update object into database
 	 *
-	 * @param  bool $trigger true=launch triggers after, false=disable triggers
-	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @param  bool $trigger	true=launch triggers after, false=disable triggers
+	 * @return int 				<0 if KO, >0 if OK
 	 */
 	public function update($trigger = true)
 	{
@@ -866,6 +867,8 @@ class CurrencyRate extends CommonObjectLine
 		// Update request
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET';
 		$sql .= ' rate='.$this->rate;
+		if (!empty($this->date_sync)) $sql .= ", date_sync='".$this->db->idate($this->date_sync)."'";
+		if (!empty($this->fk_multicurrency)) $sql .= ', fk_multicurrency='.$this->fk_multicurrency;
 		$sql .= ' WHERE rowid='.$this->id;
 
 		$this->db->begin();
@@ -898,9 +901,8 @@ class CurrencyRate extends CommonObjectLine
 	/**
 	 * Delete object in database
 	 *
-	 * @param bool $trigger true=launch triggers after, false=disable triggers
-	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @param 	bool $trigger 	true=launch triggers after, false=disable triggers
+	 * @return 	int 			<0 if KO, >0 if OK
 	 */
 	public function delete($trigger = true)
 	{
diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
new file mode 100644
index 00000000000..ffab711e1cd
--- /dev/null
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -0,0 +1,548 @@
+<?php
+/* Copyright (C) 2001-2006  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2018  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
+ * Copyright (C) 2012-2016  Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2013-2019	Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2013-2015  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2013       Jean Heimburger         <jean@tiaris.info>
+ * Copyright (C) 2013       Cédric Salvador         <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2013       Florian Henry           <florian.henry@open-concept.pro>
+ * Copyright (C) 2013       Adolfo segura           <adolfo.segura@gmail.com>
+ * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
+ * Copyright (C) 2016       Ferran Marcet		    <fmarcet@2byte.es>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/multicurrency/multicurrency_rate.php
+ *  \ingroup    multicurrency
+ *  \brief      Page to list multicurrency rate
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/multicurrency.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('multicurrency'));
+
+$action				= GETPOST('action', 'alpha');
+$massaction			= GETPOST('massaction', 'alpha');
+$show_files			= GETPOST('show_files', 'int');
+$confirm			= GETPOST('confirm', 'alpha');
+$toselect = GETPOST('toselect', 'array');
+$id_rate_selected = GETPOST('id_rate', 'int');
+$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$search_date_sync = GETPOST('search_date_sync', 'alpha');
+$search_rate		= GETPOST('search_rate', 'alpha');
+$search_code		= GETPOST('search_code', 'alpha');
+$multicurrency_code = GETPOST('multicurrency_code', 'alpha');
+$dateinput 			= dol_mktime(0, 0, 0, GETPOST('dateinputmonth', 'int'), GETPOST('dateinputday', 'int'), GETPOST('dateinputyear', 'int'));
+$rateinput 			= price2num(GETPOST('rateinput', 'alpha'));
+$optioncss 			= GETPOST('optioncss', 'alpha');
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield 			= GETPOST("sortfield", 'alpha');
+$sortorder 			= GETPOST("sortorder", 'alpha');
+$page = (GETPOST("page", 'int') ?GETPOST("page", 'int') : 0);
+
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortfield) $sortfield = "cr.date_sync";
+if (!$sortorder) $sortorder = "DESC";
+
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks
+$object = new CurrencyRate($db);
+
+$extrafields = new ExtraFields($db);
+$form = new Form($db);
+
+$hookmanager->initHooks(array('EditorRatelist', 'globallist'));
+
+if (empty($action)) $action = 'list';
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array(
+	'cr.date_sync'=>"date_sync",
+	'cr.rate'=>"rate",
+	'm.code'=>"code",
+);
+
+// Definition of fields for lists
+$arrayfields = array(
+	'cr.date_sync'=>array('label'=>'Date', 'checked'=>1),
+	'cr.rate'=>array('label'=>'Rate', 'checked'=>1),
+	'm.code'=>array('label'=>'Code', 'checked'=>1),
+);
+
+
+$object->fields = dol_sort_array($object->fields, 'position');
+$arrayfields = dol_sort_array($arrayfields, 'position');
+
+
+
+/*
+ * Actions
+ */
+if ($action == "create") {
+	if (!empty($rateinput)) {
+		$currencyRate_static = new CurrencyRate($db);
+		$currency_static = new MultiCurrency($db);
+		$fk_currency = $currency_static->getIdFromCode($db, $multicurrency_code);
+
+		$currencyRate_static->fk_multicurrency = $fk_currency;
+		$currencyRate_static->entity = $conf->entity;
+		$currencyRate_static->date_sync = $dateinput;
+		$currencyRate_static->rate = $rateinput;
+
+		$result = $currencyRate_static->create(intval($fk_currency));
+		if ($result > 0) {
+			setEventMessages($langs->trans('successRateCreate', $multicurrency_code), null);
+		} else {
+			dol_syslog("currencyRate:createRate", LOG_WARNING);
+			setEventMessages($currencyRate_static->error, $currencyRate_static->errors, 'errors');
+		}
+	} else {
+		setEventMessages($langs->trans('NoEmptyRate'), null, "errors");
+	}
+}
+
+if ($action == 'update') {
+	$currencyRate = new CurrencyRate($db);
+	$result = $currencyRate->fetch($id_rate_selected);
+	if ($result > 0) {
+		$currency_static = new MultiCurrency($db);
+		$fk_currency = $currency_static->getIdFromCode($db, $multicurrency_code);
+		$currencyRate->date_sync = $dateinput;
+		$currencyRate->fk_multicurrency = $fk_currency;
+		$currencyRate->rate = $rateinput;
+		$res = $currencyRate->update();
+		if ($res) {
+			setEventMessages($langs->trans('successUpdateRate'), null);
+		} else {
+			setEventMessages($currencyRate->error, $currencyRate->errors, "errors");
+		}
+	} else {
+		setEventMessages($langs->trans('Error'), null, "warnings");
+	}
+}
+
+if ($action == "deleteRate") {
+	$current_rate = new CurrencyRate($db);
+	$current_rate->fetch(intval($id_rate_selected));
+
+	if ($current_rate) {
+		$current_currency = new MultiCurrency($db);
+		$current_currency->fetch($current_rate->fk_multicurrency);
+		if ($current_currency) {
+			$delayedhtmlcontent = $form->formconfirm(
+				$_SERVER["PHP_SELF"].'?id_rate='.$id_rate_selected,
+				$langs->trans('DeleteLineRate'),
+				$langs->trans('ConfirmDeleteLineRate', $current_rate->rate, $current_currency->name, $current_rate->date_sync),
+				'confirm_delete',
+				'',
+				0,
+				1
+			);
+		} else {
+			dol_syslog("Multicurrency::fetch", LOG_WARNING);
+		}
+	} else {
+		setEventMessage($langs->trans('NoCurrencyRateSelected'), "warnings");
+	}
+}
+
+if ($action == "confirm_delete") {
+	$current_rate = new CurrencyRate($db);
+	$current_rate->fetch(intval($id_rate_selected));
+	if ($current_rate) {
+		$result = $current_rate->delete();
+		if ($result) {
+			setEventMessages($langs->trans('successRateDelete'), null);
+		} else {
+			setEventMessages($current_rate->error, $current_rate->errors, 'errors');
+		}
+	} else {
+		setEventMessages($langs->trans('NoCurrencyRateSelected'), null, "warnings");
+		dol_syslog($langs->trans('NoCurrencyRateSelected'), LOG_WARNING);
+	}
+}
+
+
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if (empty($reshook))
+{
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$sall = "";
+		$search_date_sync = "";
+		$search_rate = "";
+		$search_code = "";
+		$search_array_options = array();
+	}
+
+	// Mass actions
+	$objectclass = "CurrencyRate";
+	$uploaddir = $conf->multicurrency->multidir_output; // define only because core/actions_massactions.inc.php want it
+	$permtoread = $user->admin;
+	$permtodelete = $user->admin;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+}
+
+/*
+ * View
+ */
+
+$htmlother = new FormOther($db);
+
+$title = $langs->trans("CurrencyRate");
+$page_name = "ListCurrencyRate";
+
+llxHeader('', $title, $helpurl, '');
+// Subheader
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans($page_name), $linkback);
+
+// Configuration header
+$head = multicurrencyAdminPrepareHead();
+print dol_get_fiche_head($head, 'ratelist', $langs->trans("ModuleSetup"), -1, "multicurrency");
+
+// ACTION
+
+if ($action != "updateRate") {
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("FormCreateRate").'</td>'."\n";
+	print '</tr></table>';
+
+	$form = new Form($db);
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
+	print '<table><tr>';
+
+	print ' <td>'.$langs->trans('Date').'</td>';
+	print ' <td>';
+	print $form->selectDate($dateinput, 'dateinput');
+	print '</td>';
+
+	print '<td> '.$langs->trans('Currency').'</td>';
+	print '<td>'.$form->selectMultiCurrency((GETPOSTISSET('multicurrency_code') ? GETPOST('multicurrency_code', 'alpha') : $multicurrency_code), 'multicurrency_code', 0, " code != '".$conf->currency."'", true).'</td>';
+
+	print ' <td>'.$langs->trans('Rate').'</td>';
+	print ' <td><input type="number" min="0" step="any" class="maxwidth75" name="rateinput" value="'.dol_escape_htmltag($rateinput).'"></td>';
+
+	print '<td>';
+	print '<input type="hidden" name="action" value="create">';
+	print '<input type="submit" class="butAction" name="btnCreateCurrencyRate" value="'.$langs->trans('CreateRate').'">';
+	print '</td>';
+
+	print '</tr></table>';
+	print '</form>';
+
+	print '<br>';
+}
+
+if ($action == "updateRate") {
+	$current_rate = new CurrencyRate($db);
+	$current_rate->fetch(intval($id_rate_selected));
+
+	if ($current_rate) {
+		$curr = new MultiCurrency($db);
+		$resultcurrentCurrency = $curr->fetch($current_rate->fk_multicurrency);
+
+		if ($resultcurrentCurrency) {
+			$currency_code = $curr->code;
+		} else {
+			$currency_code = '';
+		}
+
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("FormUpdateRate").'</td>'."\n";
+		print '</tr></table>';
+
+		$form = new Form($db);
+		print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formtoupdaterate">';
+		print '<table><tr>';
+		print ' <td>'.$langs->trans('Date').'</td>';
+		print '<td>';
+		print $form->selectDate($current_rate->date_sync, 'dateinput');
+		print '</td>';
+
+		print '<td> '.$langs->trans('Currency').'</td>';
+		print '<td>'.$form->selectMultiCurrency($currency_code, 'multicurrency_code', 0, " code != '".$conf->currency."'", true).'</td>';
+
+		print '<td>'.$langs->trans('Rate').'</td>';
+		print '<td><input class="minwidth200" name="rateinput" value="'.dol_escape_htmltag($current_rate->rate).'" type="text"></td>';
+
+		print '<td>';
+		print '<input type="hidden" name="action" value="update">';
+		print '<input type="hidden" name="id_rate" value="'.$current_rate->id.'">';
+		print '<input type="submit" class="butAction" name="btnupdateCurrencyRate" value="'.$langs->trans('UpdateRate').'">';
+		print '<a href="'.$_SERVER["PHP_SELF"].'" class="butAction">'.$langs->trans('CancelUpdate').'</a>';
+
+		print '</td>';
+		print '</tr></table>';
+		print '</form>';
+	} else {
+		dol_syslog("currency_rate:list:update", LOG_WARNING);
+	}
+}
+
+
+$sql = 'SELECT cr.rowid, cr.date_sync, cr.rate, cr.entity, m.code, m.name ';
+// Add fields from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql .= ' FROM '.MAIN_DB_PREFIX.'multicurrency_rate as cr ';
+$sql .= " INNER JOIN ".MAIN_DB_PREFIX."multicurrency AS m ON cr.fk_multicurrency = m.rowid";
+if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
+if ($search_date_sync) $sql .= natural_search('cr.date_sync', $search_date_sync);
+if ($search_rate) $sql .= natural_search('cr.rate', $search_rate);
+if ($search_code) $sql .= natural_search('m.code', $search_code);
+$sql .= " WHERE m.code <> '".$db->escape($conf->currency)."'";
+
+// Add where from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql .= " GROUP BY cr.rowid, cr.date_sync, cr.rate, m.code, cr.entity, m.code, m.name";
+
+// Add fields from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldSelect', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+
+$sql .= $db->order($sortfield, $sortorder);
+
+
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+	$result = $db->query($sql);
+
+	if ($result) {
+		$nbtotalofrecords = $db->num_rows($result);
+		if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+		{
+			$page = 0;
+			$offset = 0;
+		}
+	} else {
+		setEventMessage($langs->trans('No_record_on_multicurrency_rate'), 'warnings');
+	}
+}
+
+$sql .= $db->plimit($limit + 1, $offset);
+
+$resql = $db->query($sql);
+if ($resql)
+{
+	$num = $db->num_rows($resql);
+	$arrayofselected = is_array($toselect) ? $toselect : array();
+
+	$param = '';
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+	if ($sall) $param .= "&sall=".urlencode($sall);
+
+	if ($search_date_sync) $param = "&search_date_sync=".urlencode($search_date_sync);
+	if ($search_rate) $param = "&search_rate=".urlencode($search_rate);
+	if ($search_code != '') $param .= "&search_code=".urlencode($search_code);
+
+	// Add $param from extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+
+	if ($user->admin) $arrayofmassactions['predelete'] = $langs->trans("Delete");
+	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="formulaire">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="type" value="'.$type.'">';
+
+	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_currency.png', 0, $newcardbutton, '', $limit);
+
+	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+
+	if ($sall)
+	{
+		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+	}
+
+	// Filter on categories
+	$moreforfilter = '';
+
+
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
+	else $moreforfilter = $hookmanager->resPrint;
+
+	if ($moreforfilter)
+	{
+		print '<div class="liste_titre liste_titre_bydiv centpercent">';
+		print $moreforfilter;
+		print '</div>';
+	}
+
+	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+
+	// Lines with input filters
+	print '<tr class="liste_titre_filter">';
+
+	// date
+	if (!empty($arrayfields['cr.date_sync']['checked']))
+	{
+		print '<td class="liste_titre" align="left">';
+		print '<input class="flat" type="text" name="search_date_sync" size="8" value="'.dol_escape_htmltag($search_date_sync).'">';
+		print '</td>';
+	}
+	// code
+	if (!empty($arrayfields['m.code']['checked']))
+	{
+		print '<td class="liste_titre" align="left">';
+		print '<input class="flat" type="text" name="search_code" size="12" value="'.dol_escape_htmltag($search_code).'">';
+		print '</td>';
+	}
+	// rate
+	if (!empty($arrayfields['cr.rate']['checked']))
+	{
+		print '<td class="liste_titre" align="left">';
+		print '<input class="flat" type="text" name="search_rate" size="8" value="'.dol_escape_htmltag($search_rate).'">';
+		print '</td>';
+	}
+
+	// Fields from hook
+	$parameters = array('arrayfields'=>$arrayfields);
+	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
+	print '<td class="liste_titre" align="middle">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+
+	print '</tr>';
+
+	print '<tr class="liste_titre">';
+	if (!empty($arrayfields['cr.date_sync']['checked']))  print_liste_field_titre($arrayfields['cr.date_sync']['label'], $_SERVER["PHP_SELF"], "cr.date_sync", "", $param, "", $sortfield, $sortorder);
+	if (!empty($arrayfields['m.code']['checked']))  print_liste_field_titre($arrayfields['m.code']['label'], $_SERVER["PHP_SELF"], "m.code", "", $param, "", $sortfield, $sortorder);
+	if (!empty($arrayfields['cr.rate']['checked']))  print_liste_field_titre($arrayfields['cr.rate']['label'], $_SERVER["PHP_SELF"], "cr.rate", "", $param, "", $sortfield, $sortorder);
+
+	// Hook fields
+	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+	print "</tr>\n";
+
+	$i = 0;
+	$totalarray = array();
+	while ($i < min($num, $limit))
+	{
+		$obj = $db->fetch_object($resql);
+
+		print '<tr class="oddeven">';
+
+		// date_sync
+		if (!empty($arrayfields['cr.date_sync']['checked']))
+		{
+			print '<td class="tdoverflowmax200">';
+			print $obj->date_sync;
+			print "</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+		}
+
+		// code
+		if (!empty($arrayfields['m.code']['checked']))
+		{
+			print '<td class="tdoverflowmax200">';
+			print $obj->code." ".$obj->name;
+			print "</td>\n";
+
+			if (!$i) $totalarray['nbfield']++;
+		}
+
+		// rate
+		if (!empty($arrayfields['cr.rate']['checked']))
+		{
+			print '<td class="tdoverflowmax200">';
+			print $obj->rate;
+			print "</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+		}
+
+		// Fields from hook
+		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+
+		// Action
+		print '<td class="nowrap" align="center">';
+		if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+		{
+			$selected = 0;
+			if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+			print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=updateRate&amp;id_rate='.$obj->rowid.'">'.img_picto('edit', 'edit').'</a>';
+			print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=deleteRate&amp;id_rate='.$obj->rowid.'">'.img_picto('delete', 'delete').'</a>';
+			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect marginleftonly" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+
+		print "</tr>\n";
+		$i++;
+	}
+
+	$db->free($resql);
+
+	print "</table>";
+	print "</div>";
+
+	print '</form>';
+}
+else {
+	dol_print_error($db);
+}
+
+
+llxFooter();
+$db->close();
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index f5fa5a5ab78..ef583d08ff5 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2015  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2014       Marcos García           <marcosgdf@gmail.com>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric 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
@@ -41,14 +41,13 @@ $cancel = GETPOST('cancel', 'alpha');
 $numsondage = '';
 
 if (GETPOST('id')) {
-	$numsondage = GETPOST('id', 'alpha');
+	$numsondage = (string) GETPOST('id', 'alpha');
 }
 
 $object = new Opensurveysondage($db);
 
 $result = $object->fetch(0, $numsondage);
-if ($result <= 0)
-{
+if ($result <= 0) {
 	dol_print_error($db, $object->error);
 	exit;
 }
@@ -112,17 +111,16 @@ if (empty($reshook))
 
 		if (!$error)
 		{
-			$object->title = GETPOST('nouveautitre', 'nohtml');
-			$object->description = GETPOST('nouveauxcommentaires', 'restricthtml');
-			$object->mail_admin = GETPOST('nouvelleadresse', 'alpha');
+			$object->title = (string) GETPOST('nouveautitre', 'alphanohtml');
+			$object->description = (string) GETPOST('nouveauxcommentaires', 'restricthtml');
+			$object->mail_admin = (string) GETPOST('nouvelleadresse', 'alpha');
 			$object->date_fin = $expiredate;
-			$object->allow_comments = GETPOST('cancomment', 'alpha') == 'on' ? 1 : 0;
-			$object->allow_spy = GETPOST('canseeothersvote', 'alpha') == 'on' ? 1 : 0;
-			$object->mailsonde = GETPOST('mailsonde', 'alpha') == 'on' ? true : false;
+			$object->allow_comments = GETPOST('cancomment', 'aZ09') == 'on' ? 1 : 0;
+			$object->allow_spy = GETPOST('canseeothersvote', 'aZ09') == 'on' ? 1 : 0;
+			$object->mailsonde = GETPOST('mailsonde', 'aZ09') == 'on' ? 1 : 0;
 
 			$res = $object->update($user);
-			if ($res < 0)
-			{
+			if ($res < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$action = 'edit';
 			}
@@ -134,21 +132,18 @@ if (empty($reshook))
 	{
 		$error = 0;
 
-		if (!GETPOST('comment'))
-		{
+		if (!GETPOST('comment')) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Comment")), null, 'errors');
 		}
-		if (!GETPOST('commentuser'))
-		{
+		if (!GETPOST('commentuser')) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("User")), null, 'errors');
 		}
 
-		if (!$error)
-		{
-			$comment = GETPOST("comment");
-			$comment_user = GETPOST('commentuser');
+		if (!$error) {
+			$comment = (string) GETPOST("comment", "restricthtml");
+			$comment_user = (string) GETPOST('commentuser', "restricthtml");
 
 			$resql = $object->addComment($comment, $comment_user);
 
@@ -213,7 +208,7 @@ print '<input type="hidden" name="action" value="update">';
 $head = opensurvey_prepare_head($object);
 
 
-dol_fiche_head($head, 'general', $langs->trans("Survey"), -1, 'poll');
+print dol_get_fiche_head($head, 'general', $langs->trans("Survey"), -1, 'poll');
 
 $morehtmlref = '';
 
@@ -335,14 +330,14 @@ print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 if ($action == 'edit')
 {
 	print '<div class="center">';
-	print '<input type="submit" class="button" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+	print '<input type="submit" class="button button-save" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 	print ' &nbsp; ';
-	print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 	print '</div>';
 }
 
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index f8f6cb0f885..c635c2430a7 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2013-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2014      Marcos García	    <marcosgdf@gmail.com>
+ * Copyright (C) 2020		Frédéric 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
@@ -49,7 +50,6 @@ class Opensurveysondage extends CommonObject
 	 */
 	public $picto = 'poll';
 
-
 	/**
 	 * @var string	ID survey
 	 */
@@ -60,7 +60,14 @@ class Opensurveysondage extends CommonObject
 	 */
 	public $description;
 
+	/**
+	 * @var string email admin
+	 */
 	public $mail_admin;
+
+	/**
+	 * @var string admin name
+	 */
 	public $nom_admin;
 
 	/**
@@ -75,10 +82,25 @@ class Opensurveysondage extends CommonObject
 	public $title;
 
 	public $date_fin = '';
+
+	/**
+	 * @var int status
+	 */
 	public $status = 1;
+
+	/**
+	 * @var string format of survey
+	 */
 	public $format;
+
+	/**
+	 * @var int mailsonde
+	 */
 	public $mailsonde;
 
+	/**
+	 * @var string subject
+	 */
 	public $sujet;
 
 	/**
@@ -106,7 +128,6 @@ class Opensurveysondage extends CommonObject
 	const STATUS_CLOSED = 2;
 
 
-
 	/**
 	 *  Constructor
 	 *
@@ -127,14 +148,15 @@ class Opensurveysondage extends CommonObject
 	 */
 	public function create(User $user, $notrigger = 0)
 	{
+		global $conf;
+
 		$error = 0;
 
 		// Clean parameters
 		$this->cleanParameters();
 
 		// Check parameters
-		if (!$this->date_fin > 0)
-		{
+		if (!$this->date_fin > 0) {
 			$this->error = 'BadValueForEndDate';
 			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 			return -1;
@@ -152,19 +174,21 @@ class Opensurveysondage extends CommonObject
 		$sql .= "mailsonde,";
 		$sql .= "allow_comments,";
 		$sql .= "allow_spy,";
-		$sql .= "sujet";
+		$sql .= "sujet,";
+ 		$sql .= "entity";
 		$sql .= ") VALUES (";
 		$sql .= "'".$this->db->escape($this->id_sondage)."',";
 		$sql .= " ".(empty($this->description) ? 'NULL' : "'".$this->db->escape($this->description)."'").",";
-		$sql .= " ".$user->id.",";
+		$sql .= " ".(int) $user->id.",";
 		$sql .= " '".$this->db->escape($this->title)."',";
 		$sql .= " '".$this->db->idate($this->date_fin)."',";
-		$sql .= " ".$this->status.",";
+		$sql .= " ".(int) $this->status.",";
 		$sql .= " '".$this->db->escape($this->format)."',";
-		$sql .= " ".$this->db->escape($this->mailsonde).",";
-		$sql .= " ".$this->db->escape($this->allow_comments).",";
-		$sql .= " ".$this->db->escape($this->allow_spy).",";
-		$sql .= " '".$this->db->escape($this->sujet)."'";
+		$sql .= " ".((int) $this->mailsonde).",";
+		$sql .= " ".((int) $this->allow_comments).",";
+		$sql .= " ".((int) $this->allow_spy).",";
+		$sql .= " '".$this->db->escape($this->sujet)."',";
+        $sql .= " ".((int) $conf->entity);
 		$sql .= ")";
 
 		$this->db->begin();
@@ -173,24 +197,18 @@ class Opensurveysondage extends CommonObject
 		$resql = $this->db->query($sql);
 		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (!$error)
-		{
-			if (!$notrigger)
-			{
-				global $langs, $conf;
+		if (!$error && !$notrigger) {
+			global $langs, $conf;
 
-				// Call trigger
-				$result = $this->call_trigger('OPENSURVEY_CREATE', $user);
-				if ($result < 0) $error++;
-				// End call triggers
-			}
+			// Call trigger
+			$result = $this->call_trigger('OPENSURVEY_CREATE', $user);
+			if ($result < 0) $error++;
+			// End call triggers
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -310,10 +328,12 @@ class Opensurveysondage extends CommonObject
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
+		}
 
-		if (!$error && !$notrigger)
-		{
+		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('OPENSURVEY_MODIFY', $user);
 			if ($result < 0) $error++;
@@ -356,15 +376,11 @@ class Opensurveysondage extends CommonObject
 
 		$this->db->begin();
 
-		if (!$error)
-		{
-			if (!$notrigger)
-			{
-				// Call trigger
-				$result = $this->call_trigger('OPENSURVEY_DELETE', $user);
-				if ($result < 0) $error++;
-				// End call triggers
-			}
+		if (!$error && !$notrigger) {
+			// Call trigger
+			$result = $this->call_trigger('OPENSURVEY_DELETE', $user);
+			if ($result < 0) $error++;
+			// End call triggers
 		}
 
 		if (!$error)
@@ -441,7 +457,9 @@ class Opensurveysondage extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -499,15 +517,15 @@ class Opensurveysondage extends CommonObject
 	{
 		$this->id = 0;
 
-		$this->id_sondage = '';
+		$this->id_sondage = 'a12d5g';
 		$this->description = 'Description of the specimen survey';
-		$this->mail_admin = '';
-		$this->nom_admin = '';
+		$this->mail_admin = 'email@email.com';
+		$this->nom_admin = 'surveyadmin';
 		$this->title = 'This is a specimen survey';
 		$this->date_fin = dol_now() + 3600 * 24 * 10;
 		$this->status = 1;
 		$this->format = 'classic';
-		$this->mailsonde = '';
+		$this->mailsonde = 0;
 	}
 
 	/**
@@ -591,7 +609,7 @@ class Opensurveysondage extends CommonObject
 		$this->mail_admin = trim($this->mail_admin);
 		$this->nom_admin = trim($this->nom_admin);
 		$this->title = trim($this->title);
-		$this->status = trim($this->status);
+		$this->status = (int) $this->status;
 		$this->format = trim($this->format);
 		$this->mailsonde = ($this->mailsonde ? 1 : 0);
 		$this->allow_comments = ($this->allow_comments ? 1 : 0);
diff --git a/htdocs/opensurvey/fonctions.php b/htdocs/opensurvey/fonctions.php
index 4a3cb591b97..0ea701ebf0b 100644
--- a/htdocs/opensurvey/fonctions.php
+++ b/htdocs/opensurvey/fonctions.php
@@ -77,11 +77,10 @@ function llxHeaderSurvey($title, $head = "", $disablejs = 0, $disablehead = 0, $
 
 	//$replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
 
-	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
+	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss, 0, 1); // Show html headers
+
 	print '<body id="mainbody" class="publicnewmemberform">';
 
-
-
 	print '<span id="dolpaymentspan"></span>'."\n";
 	print '<div class="center">'."\n";
 	print '<form name="formulaire" action="studs.php?sondage='.urlencode($numsondage).'#bas" method="POST">'."\n";
@@ -116,7 +115,7 @@ function llxHeaderSurvey($title, $head = "", $disablejs = 0, $disablehead = 0, $
 		print '>';
 		print '</div>';
 		if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
-			print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
+			print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref?utm_medium=website&utm_source=poweredby" href="https://www.dolibarr.org" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 		}
 		print '</div>';
 	}
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 77e7feed460..eaee1b696e1 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -77,15 +77,15 @@ if (!$user->rights->opensurvey->read) accessforbidden();
 $arrayfields = array();
 foreach ($arrayfields as $key => $val)
 {
-    // If $val['visible']==0, then we never show the field
-    if (!empty($val['visible'])) $arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
+	// If $val['visible']==0, then we never show the field
+	if (!empty($val['visible'])) $arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
 }
 // Extra fields
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
 {
-    foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-    {
-        if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
+	{
+		if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
 			$arrayfields["ef.".$key] = array(
 				'label'=>$extrafields->attributes[$object->table_element]['label'][$key],
 				'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1),
@@ -93,7 +93,7 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 				'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key])
 			);
 		}
-    }
+	}
 }
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
@@ -116,29 +116,29 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $search_status = '';
-        $search_title = '';
-        $search_ref = '';
-        $toselect = '';
-        $search_array_options = array();
-    }
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
-        || GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
-    {
-        $massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$search_status = '';
+		$search_title = '';
+		$search_ref = '';
+		$toselect = '';
+		$search_array_options = array();
+	}
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
+	{
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+	}
 
-    // Mass actions
-    $objectclass = 'Opensurveysondage';
-    $objectlabel = 'Opensurveysondage';
-    $uploaddir = $conf->opensurvey->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+	// Mass actions
+	$objectclass = 'Opensurveysondage';
+	$objectlabel = 'Opensurveysondage';
+	$uploaddir = $conf->opensurvey->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 
@@ -155,7 +155,7 @@ $help_url = '';
 $title = $langs->trans('OpenSurveyArea');
 
 
-$sql = "SELECT p.id_sondage as rowid, p.fk_user_creat, p.format, p.date_fin, p.status, p.titre as title, p.nom_admin,";
+$sql = "SELECT p.id_sondage as rowid, p.fk_user_creat, p.format, p.date_fin, p.status, p.titre as title, p.nom_admin, p.tms,";
 $sql .= " u.login, u.firstname, u.lastname";
 $sql .= " FROM ".MAIN_DB_PREFIX."opensurvey_sondage as p";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user u ON u.rowid = p.fk_user_creat";
@@ -191,16 +191,16 @@ if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
 } else {
-    $sql .= $db->plimit($limit + 1, $offset);
+	$sql .= $db->plimit($limit + 1, $offset);
 
-    $resql = $db->query($sql);
-    if (!$resql)
-    {
-        dol_print_error($db);
-        exit;
-    }
+	$resql = $db->query($sql);
+	if (!$resql)
+	{
+		dol_print_error($db);
+		exit;
+	}
 
-    $num = $db->num_rows($resql);
+	$num = $db->num_rows($resql);
 }
 
 // Direct jump if only one record found
@@ -231,8 +231,8 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 // List of mass actions available
 $arrayofmassactions = array(
-    //'presend'=>$langs->trans("SendByMail"),
-    //'builddoc'=>$langs->trans("PDFMerge"),
+	//'presend'=>$langs->trans("SendByMail"),
+	//'builddoc'=>$langs->trans("PDFMerge"),
 );
 if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
@@ -263,8 +263,8 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($sall)
 {
-    foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
-    print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 }
 
 $moreforfilter = '';
@@ -301,6 +301,7 @@ print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
 $arraystatus = array('-1'=>'&nbsp;', '0'=>$langs->trans("Draft"), '1'=>$langs->trans("Opened"), '2'=>$langs->trans("Closed"));
 print '<td class="liste_titre" align="center">'.$form->selectarray('search_status', $arraystatus, $search_status).'</td>';
 // Extra fields
@@ -327,6 +328,7 @@ print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "p.format", $param, "", ""
 print_liste_field_titre("Author", $_SERVER["PHP_SELF"], "u.".$fieldtosortuser, $param, "", "", $sortfield, $sortorder);
 print_liste_field_titre("NbOfVoters", $_SERVER["PHP_SELF"], "", $param, "", 'align="right"', $sortfield, $sortorder);
 print_liste_field_titre("ExpireDate", $_SERVER["PHP_SELF"], "p.date_fin", $param, "", 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre("DateLastModification", $_SERVER["PHP_SELF"], "p.tms", $param, "", 'align="center"', $sortfield, $sortorder);
 print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "p.status", $param, "", 'align="center"', $sortfield, $sortorder);
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -349,7 +351,7 @@ while ($i < min($num, $limit))
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) break; // Should not happen
 
-	$sql2 = 'select COUNT(*) as nb from '.MAIN_DB_PREFIX."opensurvey_user_studs where id_sondage='".$db->escape($obj->id_sondage)."'";
+	$sql2 = 'select COUNT(*) as nb from '.MAIN_DB_PREFIX."opensurvey_user_studs where id_sondage='".$db->escape($obj->rowid)."'";
 	$resql2 = $db->query($sql2);
 	if ($resql2)
 	{
@@ -409,6 +411,10 @@ while ($i < min($num, $limit))
 	print '</td>';
 	if (!$i) $totalarray['nbfield']++;
 
+	print '<td class="center">'.dol_print_date($db->jdate($obj->tms), 'dayhour');
+	print '</td>';
+	if (!$i) $totalarray['nbfield']++;
+
 	print '<td class="center">'.$opensurvey_static->getLibStatut(5).'</td>'."\n";
 	if (!$i) $totalarray['nbfield']++;
 
@@ -422,9 +428,9 @@ while ($i < min($num, $limit))
 	print '<td class="nowrap center">';
 	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 	{
-	    $selected = 0;
-	    if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
-	    print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		$selected = 0;
+		if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
 	print '</td>';
 	if (!$i) $totalarray['nbfield']++;
@@ -459,21 +465,21 @@ print '</form>'."\n";
 
 if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords))
 {
-    $hidegeneratedfilelistifempty = 1;
-    if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
+	$hidegeneratedfilelistifempty = 1;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
 
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-    $formfile = new FormFile($db);
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+	$formfile = new FormFile($db);
 
-    // Show list of available documents
-    $urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-    $urlsource .= str_replace('&amp;', '&', $param);
+	// Show list of available documents
+	$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource .= str_replace('&amp;', '&', $param);
 
-    $filedir = $diroutputmassaction;
-    $genallowed = $permissiontoread;
-    $delallowed = $permissiontoadd;
+	$filedir = $diroutputmassaction;
+	$genallowed = $permissiontoread;
+	$delallowed = $permissiontoadd;
 
-    print $formfile->showdocuments('massfilesarea_mymodule', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+	print $formfile->showdocuments('massfilesarea_mymodule', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }
 
 // End of page
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index 3327800527d..ea07900ba67 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -204,7 +204,9 @@ if (isset($_POST["ajoutercolonne"]) && $object->format == "D")
 			}
 		}
 
-		if ($_POST["nouvelleheuredebut"] == "vide" || (isset($_POST["nouvelleheuredebut"]) && isset($_POST["nouvelleheurefin"]) && (($_POST["nouvelleheuredebut"] < $_POST["nouvelleheurefin"]) || (($_POST["nouvelleheuredebut"] == $_POST["nouvelleheurefin"]) && ($_POST["nouvelleminutedebut"] < $_POST["nouvelleminutefin"]))))) {
+		if (GETPOST("nouvelleheuredebut") == "vide" || (GETPOSTISSET("nouvelleheuredebut") && GETPOSTISSET("nouvelleheurefin")
+			&& (GETPOST("nouvelleheuredebut") < GETPOST("nouvelleheurefin") || (GETPOST("nouvelleheuredebut") == GETPOST("nouvelleheurefin")
+				&& (GETPOST("nouvelleminutedebut") < GETPOST("nouvelleminutefin")))))) {
 			$erreur_ajout_date = false;
 		} else {
 			$erreur_ajout_date = "yes";
@@ -417,7 +419,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 
 $head = opensurvey_prepare_head($object);
 
-dol_fiche_head($head, 'preview', $langs->trans("Survey"), -1, 'poll');
+print dol_get_fiche_head($head, 'preview', $langs->trans("Survey"), -1, 'poll');
 
 $morehtmlref = '';
 
@@ -494,7 +496,7 @@ print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '</form>'."\n";
 
@@ -530,7 +532,7 @@ if (GETPOST('ajoutsujet'))
 		print $langs->trans("Type").' '.$form->selectarray("typecolonne", $tmparray, GETPOST('typecolonne')).'<br><br>';
 		print '<input type="submit" class="button" name="ajoutercolonne" value="'.dol_escape_htmltag($langs->trans("Add")).'">';
 		print ' &nbsp; &nbsp; ';
-		print '<input type="submit" class="button" name="retoursondage" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+		print '<input type="submit" class="button button-cancel" name="retoursondage" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 		print '<br><br>'."\n";
 	} else {
 		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
@@ -583,7 +585,7 @@ if (GETPOST('ajoutsujet'))
 		print '<br><br>';
 		print' <input type="submit" class="button" name="ajoutercolonne" value="'.dol_escape_htmltag($langs->trans("Add")).'">'."\n";
 		print '&nbsp; &nbsp;';
-		print '<input type="submit" class="button" name="retoursondage" value="'.$langs->trans("Cancel").'">';
+		print '<input type="submit" class="button button-cancel" name="retoursondage" value="'.$langs->trans("Cancel").'">';
 	}
 
 	print '</form>'."\n";
@@ -907,13 +909,13 @@ while ($compteur < $num)
 	//demande de confirmation pour modification de ligne
 	for ($i = 0; $i < $nblines; $i++)
 	{
-		if (isset($_POST["modifierligne".$i]))
+		if (GETPOSTISSET("modifierligne".$i))
 		{
 			if ($compteur == $i)
 			{
 				print '<td class="casevide">';
 				print '<input type="hidden" name="idtomodify'.$compteur.'" value="'.$obj->id_users.'">';
-				print '<input type="submit" class="button" name="validermodifier'.$compteur.'" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+				print '<input type="submit" class="button button-save" name="validermodifier'.$compteur.'" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 				print '</td>'."\n";
 			}
 		}
@@ -938,7 +940,7 @@ if (empty($testligneamodifier))
 		if (empty($listofanswers[$i]['format']) || !in_array($listofanswers[$i]['format'], array('yesno', 'foragainst')))
 		{
 			print '<input type="checkbox" name="choix'.$i.'" value="1"';
-			if (isset($_POST['choix'.$i]) && $_POST['choix'.$i] == '1')
+			if (GETPOSTISSET('choix'.$i) && GETPOST('choix'.$i) == '1')
 			{
 				print ' checked';
 			}
@@ -1048,7 +1050,7 @@ for ($i = 0; $i < $nbcolonnes; $i++)
 		if ($object->format == "D") {
 			$meilleursujetexport = $toutsujet[$i];
 			//var_dump($toutsujet);
-            if (strpos($toutsujet[$i], '@') !== false) {
+			if (strpos($toutsujet[$i], '@') !== false) {
 				$toutsujetdate = explode("@", $toutsujet[$i]);
 				$meilleursujet .= dol_print_date($toutsujetdate[0], 'daytext').($toutsujetdate[0] ? ' ('.dol_print_date($toutsujetdate[0], '%A').')' : '').' - '.$toutsujetdate[1];
 			} else {
diff --git a/htdocs/opensurvey/wizard/choix_autre.php b/htdocs/opensurvey/wizard/choix_autre.php
index 6b39a70d5e9..42213af2ae2 100644
--- a/htdocs/opensurvey/wizard/choix_autre.php
+++ b/htdocs/opensurvey/wizard/choix_autre.php
@@ -43,10 +43,10 @@ $arrayoftypecolumn = GETPOST('typecolonne', 'array');
 if (isset($_SESSION["nbrecases"])) {
 	for ($i = 0; $i < $_SESSION["nbrecases"]; $i++) {
 		if (isset($arrayofchoices[$i])) {
-			$_SESSION["choix$i"] = $arrayofchoices[$i];
+			$_SESSION["choix".$i] = $arrayofchoices[$i];
 		}
 		if (isset($arrayoftypecolumn[$i])) {
-			$_SESSION["typecolonne$i"] = $arrayoftypecolumn[$i];
+			$_SESSION["typecolonne".$i] = $arrayoftypecolumn[$i];
 		}
 	}
 } else { //nombre de cases par défaut
@@ -97,9 +97,6 @@ if (GETPOSTISSET("confirmecreation"))
 	}
 }
 
-var_dump($_SESSION);exit;
-
-
 /*
  * View
  */
diff --git a/htdocs/opensurvey/wizard/choix_date.php b/htdocs/opensurvey/wizard/choix_date.php
index 9ed44ae55c3..ae64c1e6491 100644
--- a/htdocs/opensurvey/wizard/choix_date.php
+++ b/htdocs/opensurvey/wizard/choix_date.php
@@ -46,6 +46,7 @@ if (GETPOST('confirmation'))
 	if (issetAndNoEmpty('totalchoixjour', $_SESSION) === true && issetAndNoEmpty('nbrecaseshoraires', $_SESSION) === true)
 	{
 		$nbofchoice = count($_SESSION["totalchoixjour"]);
+		$errheure = array();
 
 		for ($i = 0; $i < $nbofchoice; $i++)
 		{
@@ -54,16 +55,18 @@ if (GETPOST('confirmation'))
 			{
 				$_SESSION["horaires$i"][$j] = $_POST["horaires$i"][$j];
 
-				$case = $j + 1;
+				$tmphorairesi = GETPOST('horaires'.$i, 'array');
 
-				if (isset($_POST['horaires'.$i]) === false || isset($_POST['horaires'.$i][$j]) === false) {
+				if (!is_array($tmphorairesi) || empty($tmphorairesi[$j])) {
 					$errheure[$i][$j] = true;
 					$erreur = true;
 					continue;
 				}
 
-				//si c'est un creneau type 8:00-11:00
-				if (preg_match("/(\d{1,2}:\d{2})-(\d{1,2}:\d{2})/", $_POST["horaires$i"][$j], $creneaux)) {
+				// A range like 8:00-11:00
+				$creneaux = array();
+				$heures = array();
+				if (preg_match("/(\d{1,2}:\d{2})-(\d{1,2}:\d{2})/", $tmphorairesi[$j], $creneaux)) {
 					//on recupere les deux parties du preg_match qu'on redécoupe autour des ":"
 					$debutcreneau = explode(":", $creneaux[1]);
 					$fincreneau = explode(":", $creneaux[2]);
@@ -76,7 +79,7 @@ if (GETPOST('confirmation'))
 						$errheure[$i][$j] = true;
 						$erreur = true;
 					}
-				} elseif (preg_match(";^(\d{1,2}h\d{0,2})-(\d{1,2}h\d{0,2})$;i", $_POST["horaires$i"][$j], $creneaux)) { //si c'est un creneau type 8h00-11h00
+				} elseif (preg_match(";^(\d{1,2}h\d{0,2})-(\d{1,2}h\d{0,2})$;i", $tmphorairesi[$j], $creneaux)) { //si c'est un creneau type 8h00-11h00
 					//on recupere les deux parties du preg_match qu'on redécoupe autour des "H"
 					$debutcreneau = preg_split("/h/i", $creneaux[1]);
 					$fincreneau = preg_split("/h/i", $creneaux[2]);
@@ -89,7 +92,7 @@ if (GETPOST('confirmation'))
 						$errheure[$i][$j] = true;
 						$erreur = true;
 					}
-				} elseif (preg_match(";^(\d{1,2}):(\d{2})$;", $_POST["horaires$i"][$j], $heures)) { //si c'est une heure simple type 8:00
+				} elseif (preg_match(";^(\d{1,2}):(\d{2})$;", $tmphorairesi[$j], $heures)) { //si c'est une heure simple type 8:00
 					//si valeures correctes, on entre les données dans la variables de session
 					if ($heures[1] < 24 && $heures[2] < 60) {
 						$_SESSION["horaires$i"][$j] = $heures[0];
@@ -97,7 +100,7 @@ if (GETPOST('confirmation'))
 						$errheure[$i][$j] = true;
 						$erreur = true;
 					}
-				} elseif (preg_match(";^(\d{1,2})h(\d{0,2})$;i", $_POST["horaires$i"][$j], $heures)) { //si c'est une heure encore plus simple type 8h
+				} elseif (preg_match(";^(\d{1,2})h(\d{0,2})$;i", $tmphorairesi[$j], $heures)) { //si c'est une heure encore plus simple type 8h
 					//si valeures correctes, on entre les données dans la variables de session
 					if ($heures[1] < 24 && $heures[2] < 60) {
 						$_SESSION["horaires$i"][$j] = $heures[0];
@@ -105,7 +108,7 @@ if (GETPOST('confirmation'))
 						$errheure[$i][$j] = true;
 						$erreur = true;
 					}
-				} elseif (preg_match(";^(\d{1,2})-(\d{1,2})$;", $_POST["horaires$i"][$j], $heures)) { //si c'est un creneau simple type 8-11
+				} elseif (preg_match(";^(\d{1,2})-(\d{1,2})$;", $tmphorairesi[$j], $heures)) { //si c'est un creneau simple type 8-11
 					//si valeures correctes, on entre les données dans la variables de session
 					if ($heures[1] < $heures[2] && $heures[1] < 24 && $heures[2] < 24) {
 						$_SESSION["horaires$i"][$j] = $heures[0];
@@ -113,7 +116,7 @@ if (GETPOST('confirmation'))
 						$errheure[$i][$j] = true;
 						$erreur = true;
 					}
-				} elseif (preg_match(";^(\d{1,2})h-(\d{1,2})h$;", $_POST["horaires$i"][$j], $heures)) { //si c'est un creneau H type 8h-11h
+				} elseif (preg_match(";^(\d{1,2})h-(\d{1,2})h$;", $tmphorairesi[$j], $heures)) { //si c'est un creneau H type 8h-11h
 					//si valeures correctes, on entre les données dans la variables de session
 					if ($heures[1] < $heures[2] && $heures[1] < 24 && $heures[2] < 24) {
 						$_SESSION["horaires$i"][$j] = $heures[0];
@@ -121,7 +124,7 @@ if (GETPOST('confirmation'))
 						$errheure[$i][$j] = true;
 						$erreur = true;
 					}
-				} elseif ($_POST["horaires$i"][$j] == "") { //Si la case est vide
+				} elseif ($tmphorairesi[$j] == "") { //Si la case est vide
 					unset($_SESSION["horaires$i"][$j]);
 				} else { //pour tout autre format, message d'erreur
 					$errheure[$i][$j] = true;
@@ -160,7 +163,8 @@ if (GETPOST('confirmation'))
 	}
 
 	//If just one day and no other time options, error message
-	if (count($_SESSION["totalchoixjour"]) == "1" && $_POST["horaires0"][0] == "" && $_POST["horaires0"][1] == "" && $_POST["horaires0"][2] == "" && $_POST["horaires0"][3] == "" && $_POST["horaires0"][4] == "") {
+	$tmphoraires0 = GETPOST('horaires0', 'array');
+	if (count($_SESSION["totalchoixjour"]) == "1" && $tmphoraires0[0] == "" && $tmphoraires0[1] == "" && $tmphoraires0[2] == "" && $tmphoraires0[3] == "" && $tmphoraires0[4] == "") {
 		setEventMessages($langs->trans("MoreChoices"), null, 'errors');
 		$erreur = true;
 	}
@@ -482,7 +486,7 @@ for ($i = 0; $i < $nbrejourmois + $premierjourmois; $i++) {
 			if (($numerojour >= $jourAJ && $_SESSION["mois"] == $moisAJ && $_SESSION["annee"] == $anneeAJ) || ($_SESSION["mois"] > $moisAJ && $_SESSION["annee"] == $anneeAJ) || $_SESSION["annee"] > $anneeAJ) {
 				print '<td align="center" class="libre"><input type="submit" class="bouton ON" name="choixjourajout[]" value="'.$numerojour.'"></td>'."\n";
 			} else {
-                // grey button
+				// grey button
 				print '<td align="center" class="avant">'.$numerojour.'</td>'."\n";
 			}
 		}
diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php
index e6b3cb3b97e..cbeb448d2d7 100644
--- a/htdocs/opensurvey/wizard/create_survey.php
+++ b/htdocs/opensurvey/wizard/create_survey.php
@@ -35,15 +35,13 @@ if (!$user->rights->opensurvey->write) accessforbidden();
 
 $langs->load("opensurvey");
 
-// On teste toutes les variables pour supprimer l'ensemble des warnings PHP
-// On transforme en entites html les données afin éviter les failles XSS
-$post_var = array('title', 'description', 'mailsonde', 'creation_sondage_date', 'creation_sondage_autre');
-foreach ($post_var as $var)
-{
-	$$var = GETPOST($var);
-}
+$title = GETPOST('title');
+$description = GETPOST('description', 'restricthtml');
+$mailsonde = GETPOST('mailsonde');
+$creation_sondage_date = GETPOST('creation_sondage_date');
+$creation_sondage_autre = GETPOST('creation_sondage_autre');
 
-// On initialise egalement la session car sinon bonjour les warning :-)
+// We init some session variable to avoir warning
 $session_var = array('title', 'description', 'mailsonde');
 foreach ($session_var as $var)
 {
@@ -55,7 +53,7 @@ $cocheplus = '';
 $cochemail = '';
 
 // Jump to correct page
-if (GETPOST("creation_sondage_date") || GETPOST("creation_sondage_autre"))
+if (!empty($creation_sondage_date) || !empty($creation_sondage_autre))
 {
 	$_SESSION["title"] = $title;
 	$_SESSION["description"] = $description;
@@ -136,7 +134,7 @@ print load_fiche_titre($langs->trans("CreatePoll").' (1 / 2)');
 print '<form name="formulaire" action="" method="POST">'."\n";
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
-dol_fiche_head();
+print dol_get_fiche_head();
 
 // Affichage des différents champs textes a remplir
 print '<table class="border centpercent">'."\n";
@@ -161,11 +159,11 @@ print $form->selectDate($champdatefin ? $champdatefin : -1, 'champdatefin', '',
 print '</tr>'."\n";
 print '</table>'."\n";
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 //focus javascript sur le premier champ
 print '<script type="text/javascript">'."\n";
-print 'document.formulaire.titre.focus();'."\n";
+print 'document.formulaire.title.focus();'."\n";
 print '</script>'."\n";
 
 print '<br>'."\n";
@@ -177,11 +175,11 @@ if ($_SESSION["mailsonde"]) $cochemail = "checked";
 print '<input type="checkbox" name="mailsonde" '.$cochemail.'> '.$langs->trans("ToReceiveEMailForEachVote").'<br>'."\n";
 
 if ($_SESSION['allow_comments']) $allow_comments = 'checked';
-if (isset($_POST['allow_comments'])) $allow_comments = GETPOST('allow_comments') ? 'checked' : '';
+if (GETPOSTISSET('allow_comments')) $allow_comments = GETPOST('allow_comments') ? 'checked' : '';
 print '<input type="checkbox" name="allow_comments" '.$allow_comments.'"> '.$langs->trans('CanComment').'<br>'."\n";
 
 if ($_SESSION['allow_spy']) $allow_spy = 'checked';
-if (isset($_POST['allow_spy'])) $allow_spy = GETPOST('allow_spy') ? 'checked' : '';
+if (GETPOSTISSET('allow_spy')) $allow_spy = GETPOST('allow_spy') ? 'checked' : '';
 print '<input type="checkbox" name="allow_spy" '.$allow_spy.'> '.$langs->trans('CanSeeOthersVote').'<br>'."\n";
 
 if (GETPOST('choix_sondage'))
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index a1ceb3e4810..a342e58b971 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -71,18 +71,18 @@ if ($action == 'setvalue' && $user->admin)
 	if (!$result > 0) $error++;
 	$result = dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN_UNIQUE", GETPOST('PAYMENT_SECURITY_TOKEN_UNIQUE', 'alpha'), 'chaine', 0, '', $conf->entity);
 	if (!$result > 0) $error++;
-        $result = dolibarr_set_const($db, "PAYBOX_HMAC_KEY", dol_encode(GETPOST('PAYBOX_HMAC_KEY', 'alpha')), 'chaine', 0, '', $conf->entity);
+		$result = dolibarr_set_const($db, "PAYBOX_HMAC_KEY", dol_encode(GETPOST('PAYBOX_HMAC_KEY', 'alpha')), 'chaine', 0, '', $conf->entity);
 	if (!$result > 0) $error++;
 
 
-    if (!$error)
+	if (!$error)
   	{
   		$db->commit();
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
   	} else {
   		$db->rollback();
 		dol_print_error($db);
-    }
+	}
 }
 
 
@@ -114,7 +114,7 @@ print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="setvalue">';
 
-dol_fiche_head($head, 'payboxaccount', '', -1);
+print dol_get_fiche_head($head, 'payboxaccount', '', -1);
 
 print $langs->trans("PayBoxDesc")."<br>\n";
 print '<br>';
@@ -248,7 +248,7 @@ print '</td></tr>';
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
 
diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php
index faf4b291338..d1f27bc0b0f 100644
--- a/htdocs/paybox/lib/paybox.lib.php
+++ b/htdocs/paybox/lib/paybox.lib.php
@@ -82,126 +82,126 @@ function print_paybox_redirect($PRICE, $CURRENCY, $EMAIL, $urlok, $urlko, $TAG)
 
 	// Definition des parametres vente produit pour paybox
 	$IBS_CMD = $TAG;
-    $IBS_TOTAL = $PRICE * 100; // En centimes
-    $IBS_MODE = 1; // Mode formulaire
-    $IBS_PORTEUR = $EMAIL;
+	$IBS_TOTAL = $PRICE * 100; // En centimes
+	$IBS_MODE = 1; // Mode formulaire
+	$IBS_PORTEUR = $EMAIL;
 	$IBS_RETOUR = "montant:M;ref:R;auto:A;trans:T"; // Format des parametres du get de validation en reponse (url a definir sous paybox)
-    $IBS_TXT = ' '; // Use a space
-    $IBS_EFFECTUE = $urlok;
-    $IBS_ANNULE = $urlko;
-    $IBS_REFUSE = $urlko;
-    $IBS_BKGD = "#FFFFFF";
-    $IBS_WAIT = "2000";
-    $IBS_LANG = "GBR"; // By default GBR=english (FRA, GBR, ESP, ITA et DEU...)
-    if (preg_match('/^FR/i', $langs->defaultlang)) $IBS_LANG = "FRA";
-    if (preg_match('/^ES/i', $langs->defaultlang)) $IBS_LANG = "ESP";
-    if (preg_match('/^IT/i', $langs->defaultlang)) $IBS_LANG = "ITA";
-    if (preg_match('/^DE/i', $langs->defaultlang)) $IBS_LANG = "DEU";
-    if (preg_match('/^NL/i', $langs->defaultlang)) $IBS_LANG = "NLD";
-    if (preg_match('/^SE/i', $langs->defaultlang)) $IBS_LANG = "SWE";
-    $IBS_OUTPUT = 'E';
-    $PBX_SOURCE = 'HTML';
-    $PBX_TYPEPAIEMENT = 'CARTE';
-    $PBX_HASH = $conf->global->PAYBOX_HASH;
-    $PBX_TIME = dol_print_date(dol_now(), 'dayhourrfc', 'gmt');
+	$IBS_TXT = ' '; // Use a space
+	$IBS_EFFECTUE = $urlok;
+	$IBS_ANNULE = $urlko;
+	$IBS_REFUSE = $urlko;
+	$IBS_BKGD = "#FFFFFF";
+	$IBS_WAIT = "2000";
+	$IBS_LANG = "GBR"; // By default GBR=english (FRA, GBR, ESP, ITA et DEU...)
+	if (preg_match('/^FR/i', $langs->defaultlang)) $IBS_LANG = "FRA";
+	if (preg_match('/^ES/i', $langs->defaultlang)) $IBS_LANG = "ESP";
+	if (preg_match('/^IT/i', $langs->defaultlang)) $IBS_LANG = "ITA";
+	if (preg_match('/^DE/i', $langs->defaultlang)) $IBS_LANG = "DEU";
+	if (preg_match('/^NL/i', $langs->defaultlang)) $IBS_LANG = "NLD";
+	if (preg_match('/^SE/i', $langs->defaultlang)) $IBS_LANG = "SWE";
+	$IBS_OUTPUT = 'E';
+	$PBX_SOURCE = 'HTML';
+	$PBX_TYPEPAIEMENT = 'CARTE';
+	$PBX_HASH = $conf->global->PAYBOX_HASH;
+	$PBX_TIME = dol_print_date(dol_now(), 'dayhourrfc', 'gmt');
 
-    $msg = "PBX_IDENTIFIANT=".$PBX_IDENTIFIANT.
-           "&PBX_MODE=".$IBS_MODE.
-           "&PBX_SITE=".$IBS_SITE.
-           "&PBX_RANG=".$IBS_RANG.
-           "&PBX_TOTAL=".$IBS_TOTAL.
-           "&PBX_DEVISE=".$IBS_DEVISE.
-           "&PBX_CMD=".$IBS_CMD.
-           "&PBX_PORTEUR=".$IBS_PORTEUR.
-           "&PBX_RETOUR=".$IBS_RETOUR.
-           "&PBX_EFFECTUE=".$IBS_EFFECTUE.
-           "&PBX_ANNULE=".$IBS_ANNULE.
-           "&PBX_REFUSE=".$IBS_REFUSE.
-           "&PBX_TXT=".$IBS_TXT.
-           "&PBX_BKGD=".$IBS_BKGD.
-           "&PBX_WAIT=".$IBS_WAIT.
-           "&PBX_LANGUE=".$IBS_LANG.
-           "&PBX_OUTPUT=".$IBS_OUTPUT.
-           "&PBX_SOURCE=".$PBX_SOURCE.
-           "&PBX_TYPEPAIEMENT=".$PBX_TYPEPAIEMENT;
-    	   "&PBX_HASH=".$PBX_HASH;
-    	   "&PBX_TIME=".$PBX_TIME;
+	$msg = "PBX_IDENTIFIANT=".$PBX_IDENTIFIANT.
+		   "&PBX_MODE=".$IBS_MODE.
+		   "&PBX_SITE=".$IBS_SITE.
+		   "&PBX_RANG=".$IBS_RANG.
+		   "&PBX_TOTAL=".$IBS_TOTAL.
+		   "&PBX_DEVISE=".$IBS_DEVISE.
+		   "&PBX_CMD=".$IBS_CMD.
+		   "&PBX_PORTEUR=".$IBS_PORTEUR.
+		   "&PBX_RETOUR=".$IBS_RETOUR.
+		   "&PBX_EFFECTUE=".$IBS_EFFECTUE.
+		   "&PBX_ANNULE=".$IBS_ANNULE.
+		   "&PBX_REFUSE=".$IBS_REFUSE.
+		   "&PBX_TXT=".$IBS_TXT.
+		   "&PBX_BKGD=".$IBS_BKGD.
+		   "&PBX_WAIT=".$IBS_WAIT.
+		   "&PBX_LANGUE=".$IBS_LANG.
+		   "&PBX_OUTPUT=".$IBS_OUTPUT.
+		   "&PBX_SOURCE=".$PBX_SOURCE.
+		   "&PBX_TYPEPAIEMENT=".$PBX_TYPEPAIEMENT;
+		   "&PBX_HASH=".$PBX_HASH;
+		   "&PBX_TIME=".$PBX_TIME;
 
-    $binKey = pack("H*", dol_decode($conf->global->PAYBOX_HMAC_KEY));
+	$binKey = pack("H*", dol_decode($conf->global->PAYBOX_HMAC_KEY));
 
-    $hmac = strtoupper(hash_hmac($PBX_HASH, $msg, $binKey));
+	$hmac = strtoupper(hash_hmac($PBX_HASH, $msg, $binKey));
 
 
-    dol_syslog("Soumission Paybox", LOG_DEBUG);
-    dol_syslog("IBS_MODE: $IBS_MODE", LOG_DEBUG);
-    dol_syslog("IBS_SITE: $IBS_SITE", LOG_DEBUG);
-    dol_syslog("IBS_RANG: $IBS_RANG", LOG_DEBUG);
-    dol_syslog("IBS_TOTAL: $IBS_TOTAL", LOG_DEBUG);
-    dol_syslog("IBS_DEVISE: $IBS_DEVISE", LOG_DEBUG);
-    dol_syslog("IBS_CMD: $IBS_CMD", LOG_DEBUG);
-    dol_syslog("IBS_PORTEUR: $IBS_PORTEUR", LOG_DEBUG);
-    dol_syslog("IBS_RETOUR: $IBS_RETOUR", LOG_DEBUG);
-    dol_syslog("IBS_EFFECTUE: $IBS_EFFECTUE", LOG_DEBUG);
-    dol_syslog("IBS_ANNULE: $IBS_ANNULE", LOG_DEBUG);
-    dol_syslog("IBS_REFUSE: $IBS_REFUSE", LOG_DEBUG);
-    dol_syslog("IBS_BKGD: $IBS_BKGD", LOG_DEBUG);
-    dol_syslog("IBS_WAIT: $IBS_WAIT", LOG_DEBUG);
-    dol_syslog("IBS_LANG: $IBS_LANG", LOG_DEBUG);
-    dol_syslog("IBS_OUTPUT: $IBS_OUTPUT", LOG_DEBUG);
-    dol_syslog("PBX_IDENTIFIANT: $PBX_IDENTIFIANT", LOG_DEBUG);
-    dol_syslog("PBX_SOURCE: $PBX_SOURCE", LOG_DEBUG);
-    dol_syslog("PBX_TYPEPAIEMENT: $PBX_TYPEPAIEMENT", LOG_DEBUG);
-    dol_syslog("PBX_HASH: $PBX_HASH", LOG_DEBUG);
-    dol_syslog("PBX_TIME: $PBX_TIME", LOG_DEBUG);
+	dol_syslog("Soumission Paybox", LOG_DEBUG);
+	dol_syslog("IBS_MODE: $IBS_MODE", LOG_DEBUG);
+	dol_syslog("IBS_SITE: $IBS_SITE", LOG_DEBUG);
+	dol_syslog("IBS_RANG: $IBS_RANG", LOG_DEBUG);
+	dol_syslog("IBS_TOTAL: $IBS_TOTAL", LOG_DEBUG);
+	dol_syslog("IBS_DEVISE: $IBS_DEVISE", LOG_DEBUG);
+	dol_syslog("IBS_CMD: $IBS_CMD", LOG_DEBUG);
+	dol_syslog("IBS_PORTEUR: $IBS_PORTEUR", LOG_DEBUG);
+	dol_syslog("IBS_RETOUR: $IBS_RETOUR", LOG_DEBUG);
+	dol_syslog("IBS_EFFECTUE: $IBS_EFFECTUE", LOG_DEBUG);
+	dol_syslog("IBS_ANNULE: $IBS_ANNULE", LOG_DEBUG);
+	dol_syslog("IBS_REFUSE: $IBS_REFUSE", LOG_DEBUG);
+	dol_syslog("IBS_BKGD: $IBS_BKGD", LOG_DEBUG);
+	dol_syslog("IBS_WAIT: $IBS_WAIT", LOG_DEBUG);
+	dol_syslog("IBS_LANG: $IBS_LANG", LOG_DEBUG);
+	dol_syslog("IBS_OUTPUT: $IBS_OUTPUT", LOG_DEBUG);
+	dol_syslog("PBX_IDENTIFIANT: $PBX_IDENTIFIANT", LOG_DEBUG);
+	dol_syslog("PBX_SOURCE: $PBX_SOURCE", LOG_DEBUG);
+	dol_syslog("PBX_TYPEPAIEMENT: $PBX_TYPEPAIEMENT", LOG_DEBUG);
+	dol_syslog("PBX_HASH: $PBX_HASH", LOG_DEBUG);
+	dol_syslog("PBX_TIME: $PBX_TIME", LOG_DEBUG);
 
-    header("Content-type: text/html; charset=".$conf->file->character_set_client);
-    header("X-Content-Type-Options: nosniff");
+	header("Content-type: text/html; charset=".$conf->file->character_set_client);
+	header("X-Content-Type-Options: nosniff");
 
-    print '<html>'."\n";
-    print '<head>'."\n";
-    print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=".$conf->file->character_set_client."\">\n";
-    print '</head>'."\n";
-    print '<body>'."\n";
-    print "\n";
+	print '<html>'."\n";
+	print '<head>'."\n";
+	print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=".$conf->file->character_set_client."\">\n";
+	print '</head>'."\n";
+	print '<body>'."\n";
+	print "\n";
 
-    // Formulaire pour module Paybox
-    print '<form action="'.$URLPAYBOX.'" NAME="Submit" method="POST">'."\n";
+	// Formulaire pour module Paybox
+	print '<form action="'.$URLPAYBOX.'" NAME="Submit" method="POST">'."\n";
 
-    // For Paybox V2 (PBX_xxx)
-    print '<!-- Param for Paybox v2 -->'."\n";
-    print '<input type="hidden" name="PBX_IDENTIFIANT" value="'.$PBX_IDENTIFIANT.'">'."\n";
-    print '<input type="hidden" name="PBX_MODE" value="'.$IBS_MODE.'">'."\n";
-    print '<input type="hidden" name="PBX_SITE" value="'.$IBS_SITE.'">'."\n";
-    print '<input type="hidden" name="PBX_RANG" value="'.$IBS_RANG.'">'."\n";
-    print '<input type="hidden" name="PBX_TOTAL" value="'.$IBS_TOTAL.'">'."\n";
-    print '<input type="hidden" name="PBX_DEVISE" value="'.$IBS_DEVISE.'">'."\n";
-    print '<input type="hidden" name="PBX_CMD" value="'.$IBS_CMD.'">'."\n";
-    print '<input type="hidden" name="PBX_PORTEUR" value="'.$IBS_PORTEUR.'">'."\n";
-    print '<input type="hidden" name="PBX_RETOUR" value="'.$IBS_RETOUR.'">'."\n";
-    print '<input type="hidden" name="PBX_EFFECTUE" value="'.$IBS_EFFECTUE.'">'."\n";
-    print '<input type="hidden" name="PBX_ANNULE" value="'.$IBS_ANNULE.'">'."\n";
-    print '<input type="hidden" name="PBX_REFUSE" value="'.$IBS_REFUSE.'">'."\n";
-    print '<input type="hidden" name="PBX_TXT" value="'.$IBS_TXT.'">'."\n";
-    print '<input type="hidden" name="PBX_BKGD" value="'.$IBS_BKGD.'">'."\n";
-    print '<input type="hidden" name="PBX_WAIT" value="'.$IBS_WAIT.'">'."\n";
-    print '<input type="hidden" name="PBX_LANGUE" value="'.$IBS_LANG.'">'."\n";
-    print '<input type="hidden" name="PBX_OUTPUT" value="'.$IBS_OUTPUT.'">'."\n";
-    print '<input type="hidden" name="PBX_SOURCE" value="'.$PBX_SOURCE.'">'."\n";
-    print '<input type="hidden" name="PBX_TYPEPAIEMENT" value="'.$PBX_TYPEPAIEMENT.'">'."\n";
-    print '<input type="hidden" name="PBX_HASH" value="'.$PBX_HASH.'">'."\n";
-    print '<input type="hidden" name="PBX_TIME" value="'.$PBX_TIME.'">'."\n";
-    // Footprint of parameters
-    print '<input type="hidden" name="PBX_HMAC" value="'.$hmac.'">'."\n";
-    print '</form>'."\n";
+	// For Paybox V2 (PBX_xxx)
+	print '<!-- Param for Paybox v2 -->'."\n";
+	print '<input type="hidden" name="PBX_IDENTIFIANT" value="'.$PBX_IDENTIFIANT.'">'."\n";
+	print '<input type="hidden" name="PBX_MODE" value="'.$IBS_MODE.'">'."\n";
+	print '<input type="hidden" name="PBX_SITE" value="'.$IBS_SITE.'">'."\n";
+	print '<input type="hidden" name="PBX_RANG" value="'.$IBS_RANG.'">'."\n";
+	print '<input type="hidden" name="PBX_TOTAL" value="'.$IBS_TOTAL.'">'."\n";
+	print '<input type="hidden" name="PBX_DEVISE" value="'.$IBS_DEVISE.'">'."\n";
+	print '<input type="hidden" name="PBX_CMD" value="'.$IBS_CMD.'">'."\n";
+	print '<input type="hidden" name="PBX_PORTEUR" value="'.$IBS_PORTEUR.'">'."\n";
+	print '<input type="hidden" name="PBX_RETOUR" value="'.$IBS_RETOUR.'">'."\n";
+	print '<input type="hidden" name="PBX_EFFECTUE" value="'.$IBS_EFFECTUE.'">'."\n";
+	print '<input type="hidden" name="PBX_ANNULE" value="'.$IBS_ANNULE.'">'."\n";
+	print '<input type="hidden" name="PBX_REFUSE" value="'.$IBS_REFUSE.'">'."\n";
+	print '<input type="hidden" name="PBX_TXT" value="'.$IBS_TXT.'">'."\n";
+	print '<input type="hidden" name="PBX_BKGD" value="'.$IBS_BKGD.'">'."\n";
+	print '<input type="hidden" name="PBX_WAIT" value="'.$IBS_WAIT.'">'."\n";
+	print '<input type="hidden" name="PBX_LANGUE" value="'.$IBS_LANG.'">'."\n";
+	print '<input type="hidden" name="PBX_OUTPUT" value="'.$IBS_OUTPUT.'">'."\n";
+	print '<input type="hidden" name="PBX_SOURCE" value="'.$PBX_SOURCE.'">'."\n";
+	print '<input type="hidden" name="PBX_TYPEPAIEMENT" value="'.$PBX_TYPEPAIEMENT.'">'."\n";
+	print '<input type="hidden" name="PBX_HASH" value="'.$PBX_HASH.'">'."\n";
+	print '<input type="hidden" name="PBX_TIME" value="'.$PBX_TIME.'">'."\n";
+	// Footprint of parameters
+	print '<input type="hidden" name="PBX_HMAC" value="'.$hmac.'">'."\n";
+	print '</form>'."\n";
 
 
-    print "\n";
-    print '<script type="text/javascript" language="javascript">'."\n";
-    print '	document.Submit.submit();'."\n";
-    print '</script>'."\n";
-    print "\n";
-    print '</body></html>'."\n";
-    print "\n";
+	print "\n";
+	print '<script type="text/javascript" language="javascript">'."\n";
+	print '	document.Submit.submit();'."\n";
+	print '</script>'."\n";
+	print "\n";
+	print '</body></html>'."\n";
+	print "\n";
 
 	return;
 }
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 3cf751f7391..5ab913f7ce9 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -43,29 +43,29 @@ if ($action == 'setvalue' && $user->admin)
 {
 	$db->begin();
 
-    $result = dolibarr_set_const($db, "PAYPAL_API_USER", GETPOST('PAYPAL_API_USER', 'alpha'), 'chaine', 0, '', $conf->entity);
-    if (!$result > 0) $error++;
-    $result = dolibarr_set_const($db, "PAYPAL_API_PASSWORD", GETPOST('PAYPAL_API_PASSWORD', 'alpha'), 'chaine', 0, '', $conf->entity);
-    if (!$result > 0) $error++;
-    $result = dolibarr_set_const($db, "PAYPAL_API_SIGNATURE", GETPOST('PAYPAL_API_SIGNATURE', 'alpha'), 'chaine', 0, '', $conf->entity);
-    if (!$result > 0) $error++;
-    $result = dolibarr_set_const($db, "PAYPAL_SSLVERSION", GETPOST('PAYPAL_SSLVERSION', 'alpha'), 'chaine', 0, '', $conf->entity);
-    if (!$result > 0) $error++;
-    $result = dolibarr_set_const($db, "ONLINE_PAYMENT_CREDITOR", GETPOST('ONLINE_PAYMENT_CREDITOR', 'alpha'), 'chaine', 0, '', $conf->entity);
-    if (!$result > 0) $error++;
-    $result = dolibarr_set_const($db, "PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS", GETPOST('PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS', 'int'), 'chaine', 0, '', $conf->entity);
-    if (!$result > 0) $error++;
-    $result = dolibarr_set_const($db, "PAYPAL_API_INTEGRAL_OR_PAYPALONLY", GETPOST('PAYPAL_API_INTEGRAL_OR_PAYPALONLY', 'alpha'), 'chaine', 0, '', $conf->entity);
-    if (!$result > 0) $error++;
-    $result = dolibarr_set_const($db, "ONLINE_PAYMENT_CSS_URL", GETPOST('ONLINE_PAYMENT_CSS_URL', 'alpha'), 'chaine', 0, '', $conf->entity);
-    if (!$result > 0) $error++;
-    $result = dolibarr_set_const($db, "PAYPAL_ADD_PAYMENT_URL", GETPOST('PAYPAL_ADD_PAYMENT_URL', 'alpha'), 'chaine', 0, '', $conf->entity);
-    if (!$result > 0) $error++;
-    $result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_FORM", GETPOST('ONLINE_PAYMENT_MESSAGE_FORM'), 'chaine', 0, '', $conf->entity);
-    if (!$result > 0) $error++;
-    $result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_OK", GETPOST('ONLINE_PAYMENT_MESSAGE_OK'), 'chaine', 0, '', $conf->entity);
-    if (!$result > 0) $error++;
-    $result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_KO", GETPOST('ONLINE_PAYMENT_MESSAGE_KO'), 'chaine', 0, '', $conf->entity);
+	$result = dolibarr_set_const($db, "PAYPAL_API_USER", GETPOST('PAYPAL_API_USER', 'alpha'), 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) $error++;
+	$result = dolibarr_set_const($db, "PAYPAL_API_PASSWORD", GETPOST('PAYPAL_API_PASSWORD', 'alpha'), 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) $error++;
+	$result = dolibarr_set_const($db, "PAYPAL_API_SIGNATURE", GETPOST('PAYPAL_API_SIGNATURE', 'alpha'), 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) $error++;
+	$result = dolibarr_set_const($db, "PAYPAL_SSLVERSION", GETPOST('PAYPAL_SSLVERSION', 'alpha'), 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) $error++;
+	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_CREDITOR", GETPOST('ONLINE_PAYMENT_CREDITOR', 'alpha'), 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) $error++;
+	$result = dolibarr_set_const($db, "PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS", GETPOST('PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS', 'int'), 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) $error++;
+	$result = dolibarr_set_const($db, "PAYPAL_API_INTEGRAL_OR_PAYPALONLY", GETPOST('PAYPAL_API_INTEGRAL_OR_PAYPALONLY', 'alpha'), 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) $error++;
+	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_CSS_URL", GETPOST('ONLINE_PAYMENT_CSS_URL', 'alpha'), 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) $error++;
+	$result = dolibarr_set_const($db, "PAYPAL_ADD_PAYMENT_URL", GETPOST('PAYPAL_ADD_PAYMENT_URL', 'alpha'), 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) $error++;
+	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_FORM", GETPOST('ONLINE_PAYMENT_MESSAGE_FORM'), 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) $error++;
+	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_OK", GETPOST('ONLINE_PAYMENT_MESSAGE_OK'), 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) $error++;
+	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_KO", GETPOST('ONLINE_PAYMENT_MESSAGE_KO'), 'chaine', 0, '', $conf->entity);
 	if (!$result > 0) $error++;
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_SENDEMAIL", GETPOST('ONLINE_PAYMENT_SENDEMAIL'), 'chaine', 0, '', $conf->entity);
 	if (!$result > 0) $error++;
@@ -85,20 +85,20 @@ if ($action == 'setvalue' && $user->admin)
   	} else {
   		$db->rollback();
 		dol_print_error($db);
-    }
+	}
 }
 
 if ($action == "setlive")
 {
-    $liveenable = GETPOST('value', 'int') ? 0 : 1;
-    $res = dolibarr_set_const($db, "PAYPAL_API_SANDBOX", $liveenable, 'yesno', 0, '', $conf->entity);
-    if (!$res > 0) $error++;
-    if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	$liveenable = GETPOST('value', 'int') ? 0 : 1;
+	$res = dolibarr_set_const($db, "PAYPAL_API_SANDBOX", $liveenable, 'yesno', 0, '', $conf->entity);
+	if (!$res > 0) $error++;
+	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 
@@ -121,7 +121,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="setvalue">';
 
 
-dol_fiche_head($head, 'paypalaccount', '', -1);
+print dol_get_fiche_head($head, 'paypalaccount', '', -1);
 
 print '<span class="opacitymedium">'.$langs->trans("PaypalDesc")."</span><br>\n";
 
@@ -135,6 +135,7 @@ if (!function_exists('curl_version'))
 
 print '<br>';
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 
 // Account Parameters
@@ -144,15 +145,15 @@ print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
 print '<tr class="oddeven">';
-print '<td class="titlefield">';
+print '<td>';
 print $langs->trans("PaypalLiveEnabled").'</td><td>';
 if (empty($conf->global->PAYPAL_API_SANDBOX))
 {
-    print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setlive&token='.newToken().'&value=0">';
-    print img_picto($langs->trans("Activated"), 'switch_on');
+	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setlive&token='.newToken().'&value=0">';
+	print img_picto($langs->trans("Activated"), 'switch_on');
 } else {
-    print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setlive&token='.newToken().'&value=1">';
-    print img_picto($langs->trans("Disabled"), 'switch_off');
+	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setlive&token='.newToken().'&value=1">';
+	print img_picto($langs->trans("Disabled"), 'switch_off');
 }
 print '</td></tr>';
 
@@ -181,6 +182,15 @@ print $langs->trans("PAYPAL_SSLVERSION").'</td><td>';
 print $form->selectarray("PAYPAL_SSLVERSION", array('1'=> $langs->trans('TLSv1'), '6'=> $langs->trans('TLSv1.2')), $conf->global->PAYPAL_SSLVERSION);
 print '</td></tr>';
 
+print '</table>';
+print '</div>';
+
+print '<br>';
+
+
+print '<div class="div-table-responsive-no-min">';
+print '<table class="noborder centpercent">';
+
 // Usage Parameters
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("UsageParameter").'</td>';
@@ -211,6 +221,7 @@ if (!empty($conf->banque->enabled))
 {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("BankAccount").'</td><td>';
+	print img_picto('', 'bank_account').' ';
 	$form->select_comptes($conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS, 'PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
 	print '</td></tr>';
 }
@@ -255,6 +266,14 @@ print '<input class="minwidth200" type="text" name="ONLINE_PAYMENT_SENDEMAIL" va
 print ' &nbsp;  <span class="opacitymedium">'.$langs->trans("Example").': myemail@myserver.com, Payment service &lt;myemail2@myserver2.com&gt;</span>';
 print '</td></tr>';
 
+print '</table>';
+print '</div>';
+
+print '<br>';
+
+print '<div class="div-table-responsive-no-min">';
+print '<table class="noborder centpercent">';
+
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("UrlGenerationParameters").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
@@ -267,7 +286,7 @@ print '<input class="minwidth300" type="text" id="PAYMENT_SECURITY_TOKEN" name="
 if (!empty($conf->use_javascript_ajax)) {
 	print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
 }
-if (! empty($conf->global->PAYMENT_SECURITY_ACCEPT_ANY_TOKEN)) {
+if (!empty($conf->global->PAYMENT_SECURITY_ACCEPT_ANY_TOKEN)) {
 	$langs->load("errors");
 	print img_warning($langs->trans("WarningTheHiddenOptionIsOn", 'PAYMENT_SECURITY_ACCEPT_ANY_TOKEN'), '', 'pictowarning marginleftonly');
 }
@@ -284,8 +303,9 @@ if ($conf->use_javascript_ajax) {
 print '</td></tr>';
 
 print '</table>';
+print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
 
@@ -296,7 +316,7 @@ print '<br><br>';
 // Help doc
 print '<u>'.$langs->trans("InformationToFindParameters", "Paypal").'</u>:<br>';
 if (!empty($conf->use_javascript_ajax))
-	print '<a href="#" class="reposition" id="apidoca">'.$langs->trans("ClickHere").'...</a>';
+	print '<a class="reposition" id="apidoca">'.$langs->trans("ClickHere").'...</a>';
 
 $realpaypalurl = 'www.paypal.com';
 $sandboxpaypalurl = 'developer.paypal.com';
@@ -318,11 +338,13 @@ if (!empty($conf->use_javascript_ajax))
 {
 	print "\n".'<script type="text/javascript">';
 	print '$(document).ready(function () {
-            $("#apidoc").hide();
-            $("#apidoca").click(function() {
-                $("#apidoc").show();
-            	$("#apidoca").hide();
-            })
+	            $("#apidoc").hide();
+	            $("#apidoca").click(function() {
+					console.log("We click on apidoca show/hide");
+	                $("#apidoc").show();
+	            	$("#apidoca").hide();
+					return false;
+	            })
 			});';
 	print '</script>';
 }
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 18ebce49479..655d501cac3 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -22,6 +22,8 @@
  *  \brief			Library for common paypal functions
  */
 
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+
 
 /**
  *  Define head array for tabs of paypal tools setup pages
@@ -42,140 +44,15 @@ function paypaladmin_prepare_head()
 
 	$object = new stdClass();
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'paypaladmin');
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'paypaladmin', 'remove');
 
-    return $head;
-}
-
-
-
-/**
- * Return string with full Url
- *
- * @param   string	$type		Type of URL ('free', 'order', 'invoice', 'contractline', 'membersubscription' ...)
- * @param	string	$ref		Ref of object
- * @return	string				Url string
- */
-function showPaypalPaymentUrl($type, $ref)
-{
-	global $conf, $langs;
-
-	$langs->load("paypal");
-    $langs->load("paybox");
-    $servicename = 'PayPal';
-    $out = '<br><br>';
-    $out .= img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'<br>';
-    $url = getPaypalPaymentUrl(0, $type, $ref);
-    $out .= '<input type="text" id="paypalurl" class="quatrevingtpercent" value="'.$url.'">';
-    $out .= ajax_autoselect("paypalurl", 0);
-    return $out;
-}
-
-
-/**
- * Return string with full Url
- *
- * @param   int		$mode		0=True url, 1=Url formated with colors
- * @param   string	$type		Type of URL ('free', 'order', 'invoice', 'contractline', 'membersubscription' ...)
- * @param	string	$ref		Ref of object
- * @param	int		$amount		Amount
- * @param	string	$freetag	Free tag
- * @return	string				Url string
- */
-function getPaypalPaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag = 'your_tag')
-{
-	global $conf;
-
-	$ref = str_replace(' ', '', $ref);
-
-    if ($type == 'free')
-    {
-	    $out = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?amount='.($mode ? '<font color="#666666">' : '').$amount.($mode ? '</font>' : '').'&tag='.($mode ? '<font color="#666666">' : '').$freetag.($mode ? '</font>' : '');
-	    if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
-	    {
-	    	if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-	    	else $out .= '&securekey='.dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-	    }
-    }
-    if ($type == 'order')
-    {
-        $out = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=order&ref='.($mode ? '<font color="#666666">' : '');
-        if ($mode == 1) $out .= 'order_ref';
-        if ($mode == 0) $out .= urlencode($ref);
-	    $out .= ($mode ? '</font>' : '');
-        if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
-        {
-    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else {
-                $out .= '&securekey='.($mode ? '<font color="#666666">' : '');
-                if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + order_ref)";
-                if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
-                $out .= ($mode ? '</font>' : '');
-            }
-        }
-    }
-    if ($type == 'invoice')
-    {
-        $out = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=invoice&ref='.($mode ? '<font color="#666666">' : '');
-        if ($mode == 1) $out .= 'invoice_ref';
-        if ($mode == 0) $out .= urlencode($ref);
-	    $out .= ($mode ? '</font>' : '');
-        if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
-        {
-    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else {
-                $out .= '&securekey='.($mode ? '<font color="#666666">' : '');
-                if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
-                if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
-                $out .= ($mode ? '</font>' : '');
-            }
-        }
-    }
-    if ($type == 'contractline')
-    {
-        $out = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=contractline&ref='.($mode ? '<font color="#666666">' : '');
-        if ($mode == 1) $out .= 'contractline_ref';
-        if ($mode == 0) $out .= urlencode($ref);
-	    $out .= ($mode ? '</font>' : '');
-        if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
-        {
-    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else {
-                $out .= '&securekey='.($mode ? '<font color="#666666">' : '');
-                if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
-                if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
-                $out .= ($mode ? '</font>' : '');
-            }
-        }
-    }
-    if ($type == 'membersubscription')
-    {
-        $out = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=membersubscription&ref='.($mode ? '<font color="#666666">' : '');
-        if ($mode == 1) $out .= 'member_ref';
-        if ($mode == 0) $out .= urlencode($ref);
-	    $out .= ($mode ? '</font>' : '');
-        if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
-        {
-    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else {
-                $out .= '&securekey='.($mode ? '<font color="#666666">' : '');
-                if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + member_ref)";
-                if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
-                $out .= ($mode ? '</font>' : '');
-            }
-        }
-    }
-
-    // For multicompany
-    $out .= "&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
-
-    return $out;
+	return $head;
 }
 
 
@@ -192,93 +69,93 @@ function getPaypalPaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
  */
 function print_paypal_redirect($paymentAmount, $currencyCodeType, $paymentType, $returnURL, $cancelURL, $tag)
 {
-    //declaring of global variables
-    global $conf, $langs;
-    global $API_Endpoint, $API_Url, $API_version, $USE_PROXY, $PROXY_HOST, $PROXY_PORT;
-    global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
+	//declaring of global variables
+	global $conf, $langs;
+	global $API_Endpoint, $API_Url, $API_version, $USE_PROXY, $PROXY_HOST, $PROXY_PORT;
+	global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
 
-    global $shipToName, $shipToStreet, $shipToCity, $shipToState, $shipToCountryCode, $shipToZip, $shipToStreet2, $phoneNum;
-    global $email, $desc;
+	global $shipToName, $shipToStreet, $shipToCity, $shipToState, $shipToCountryCode, $shipToZip, $shipToStreet2, $phoneNum;
+	global $email, $desc;
 
-    //'------------------------------------
-    //' Calls the SetExpressCheckout API call
-    //'
-    //'-------------------------------------------------
+	//'------------------------------------
+	//' Calls the SetExpressCheckout API call
+	//'
+	//'-------------------------------------------------
 
-    if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY = 'integral';
+	if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY = 'integral';
 
-    $solutionType = 'Sole';
-    $landingPage = 'Billing';
-    // For payment with Paypal only
-    if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'paypalonly')
-    {
-        $solutionType = 'Mark';
-        $landingPage = 'Login';
-    }
-    // For payment with Credit card or Paypal
-    if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral')
-    {
-        $solutionType = 'Sole';
-        $landingPage = 'Billing';
-    }
-    // For payment with Credit card
-    if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'cconly')
-    {
-        $solutionType = 'Sole';
-        $landingPage = 'Billing';
-    }
+	$solutionType = 'Sole';
+	$landingPage = 'Billing';
+	// For payment with Paypal only
+	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'paypalonly')
+	{
+		$solutionType = 'Mark';
+		$landingPage = 'Login';
+	}
+	// For payment with Credit card or Paypal
+	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral')
+	{
+		$solutionType = 'Sole';
+		$landingPage = 'Billing';
+	}
+	// For payment with Credit card
+	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'cconly')
+	{
+		$solutionType = 'Sole';
+		$landingPage = 'Billing';
+	}
 
-    dol_syslog("expresscheckout redirect with callSetExpressCheckout $paymentAmount, $currencyCodeType, $paymentType, $returnURL, $cancelURL, $tag, $solutionType, $landingPage, $shipToName, $shipToStreet, $shipToCity, $shipToState, $shipToCountryCode, $shipToZip, $shipToStreet2, $phoneNum");
-    $resArray = callSetExpressCheckout(
-        $paymentAmount,
-        $currencyCodeType,
-        $paymentType,
-        $returnURL,
-        $cancelURL,
-        $tag,
-        $solutionType,
-        $landingPage,
-        $shipToName,
-        $shipToStreet,
-        $shipToCity,
-        $shipToState,
-        $shipToCountryCode,
-        $shipToZip,
-        $shipToStreet2,
-        $phoneNum,
-        $email,
-        $desc
-    );
+	dol_syslog("expresscheckout redirect with callSetExpressCheckout $paymentAmount, $currencyCodeType, $paymentType, $returnURL, $cancelURL, $tag, $solutionType, $landingPage, $shipToName, $shipToStreet, $shipToCity, $shipToState, $shipToCountryCode, $shipToZip, $shipToStreet2, $phoneNum");
+	$resArray = callSetExpressCheckout(
+		$paymentAmount,
+		$currencyCodeType,
+		$paymentType,
+		$returnURL,
+		$cancelURL,
+		$tag,
+		$solutionType,
+		$landingPage,
+		$shipToName,
+		$shipToStreet,
+		$shipToCity,
+		$shipToState,
+		$shipToCountryCode,
+		$shipToZip,
+		$shipToStreet2,
+		$phoneNum,
+		$email,
+		$desc
+	);
 
-    $ack = strtoupper($resArray["ACK"]);
-    if ($ack == "SUCCESS" || $ack == "SUCCESSWITHWARNING")
-    {
-        $token = $resArray["TOKEN"];
+	$ack = strtoupper($resArray["ACK"]);
+	if ($ack == "SUCCESS" || $ack == "SUCCESSWITHWARNING")
+	{
+		$token = $resArray["TOKEN"];
 
-        // Redirect to paypal.com here
-        $payPalURL = $API_Url.$token;
-        header("Location: ".$payPalURL);
-        exit;
-    } else {
-        //Display a user friendly Error on the page using any of the following error information returned by PayPal
-        $ErrorCode = urldecode($resArray["L_ERRORCODE0"]);
-        $ErrorShortMsg = urldecode($resArray["L_SHORTMESSAGE0"]);
-        $ErrorLongMsg = urldecode($resArray["L_LONGMESSAGE0"]);
-        $ErrorSeverityCode = urldecode($resArray["L_SEVERITYCODE0"]);
+		// Redirect to paypal.com here
+		$payPalURL = $API_Url.$token;
+		header("Location: ".$payPalURL);
+		exit;
+	} else {
+		//Display a user friendly Error on the page using any of the following error information returned by PayPal
+		$ErrorCode = urldecode($resArray["L_ERRORCODE0"]);
+		$ErrorShortMsg = urldecode($resArray["L_SHORTMESSAGE0"]);
+		$ErrorLongMsg = urldecode($resArray["L_LONGMESSAGE0"]);
+		$ErrorSeverityCode = urldecode($resArray["L_SEVERITYCODE0"]);
 
-        if ($ErrorCode == 10729)
-        {
-        	$mesg .= "PayPal can't accept payments for this thirdparty. An address is defined but is not complete (missing State).<br>Ask system administrator to fix address or to setup Paypal module to accept payments even on not complete addresses (remove option PAYPAL_REQUIRE_VALID_SHIPPING_ADDRESS).<br>\n";
-        } else {
-        	$mesg = $langs->trans('SetExpressCheckoutAPICallFailed')."<br>\n";
-        	$mesg .= $langs->trans('DetailedErrorMessage').": ".$ErrorLongMsg."<br>\n";
-        	$mesg .= $langs->trans('ShortErrorMessage').": ".$ErrorShortMsg."<br>\n";
-        	$mesg .= $langs->trans('ErrorCode').": ".$ErrorCode."<br>\n";
-        	$mesg .= $langs->trans('ErrorSeverityCode').": ".$ErrorSeverityCode."<br>\n";
-        }
+		if ($ErrorCode == 10729)
+		{
+			$mesg .= "PayPal can't accept payments for this thirdparty. An address is defined but is not complete (missing State).<br>Ask system administrator to fix address or to setup Paypal module to accept payments even on not complete addresses (remove option PAYPAL_REQUIRE_VALID_SHIPPING_ADDRESS).<br>\n";
+		} else {
+			$mesg = $langs->trans('SetExpressCheckoutAPICallFailed')."<br>\n";
+			$mesg .= $langs->trans('DetailedErrorMessage').": ".$ErrorLongMsg."<br>\n";
+			$mesg .= $langs->trans('ShortErrorMessage').": ".$ErrorShortMsg."<br>\n";
+			$mesg .= $langs->trans('ErrorCode').": ".$ErrorCode."<br>\n";
+			$mesg .= $langs->trans('ErrorSeverityCode').": ".$ErrorSeverityCode."<br>\n";
+		}
 
-        return $mesg;
-    }
+		return $mesg;
+	}
 }
 
 /**
@@ -324,103 +201,103 @@ function print_paypal_redirect($paymentAmount, $currencyCodeType, $paymentType,
  */
 function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType, $returnURL, $cancelURL, $tag, $solutionType, $landingPage, $shipToName, $shipToStreet, $shipToCity, $shipToState, $shipToCountryCode, $shipToZip, $shipToStreet2, $phoneNum, $email = '', $desc = '')
 {
-    //------------------------------------------------------------------------------------------------------------------------------------
-    // Construct the parameter string that describes the SetExpressCheckout API call in the shortcut implementation
+	//------------------------------------------------------------------------------------------------------------------------------------
+	// Construct the parameter string that describes the SetExpressCheckout API call in the shortcut implementation
 
-    //declaring of global variables
-    global $conf, $langs, $mysoc;
-    global $API_Endpoint, $API_Url, $API_version, $USE_PROXY, $PROXY_HOST, $PROXY_PORT;
-    global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
+	//declaring of global variables
+	global $conf, $langs, $mysoc;
+	global $API_Endpoint, $API_Url, $API_version, $USE_PROXY, $PROXY_HOST, $PROXY_PORT;
+	global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
 
-    $nvpstr = '';
-    //$nvpstr = $nvpstr . "&VERSION=".$API_version;				// Already added by hash_call
-    $nvpstr = $nvpstr."&RETURNURL=".urlencode($returnURL);
-    $nvpstr = $nvpstr."&CANCELURL=".urlencode($cancelURL);
-    if (!empty($conf->global->PAYPAL_ALLOW_NOTES))
-    {
-    	$nvpstr = $nvpstr."&ALLOWNOTE=0";
-    }
-    if (empty($conf->global->PAYPAL_REQUIRE_VALID_SHIPPING_ADDRESS))
-    {
-    	$nvpstr = $nvpstr."&NOSHIPPING=1"; // An empty or not complete shipping address will be accepted
-    } else {
-    	$nvpstr = $nvpstr."&NOSHIPPING=0"; // A valid shipping address is required (full required fields mandatory)
-    }
-    $nvpstr = $nvpstr."&SOLUTIONTYPE=".urlencode($solutionType);
-    $nvpstr = $nvpstr."&LANDINGPAGE=".urlencode($landingPage);
-    if (!empty($conf->global->PAYPAL_CUSTOMER_SERVICE_NUMBER))
-    {
-    	$nvpstr = $nvpstr."&CUSTOMERSERVICENUMBER=".urlencode($conf->global->PAYPAL_CUSTOMER_SERVICE_NUMBER); // Hotline phone number
-    }
+	$nvpstr = '';
+	//$nvpstr = $nvpstr . "&VERSION=".$API_version;				// Already added by hash_call
+	$nvpstr = $nvpstr."&RETURNURL=".urlencode($returnURL);
+	$nvpstr = $nvpstr."&CANCELURL=".urlencode($cancelURL);
+	if (!empty($conf->global->PAYPAL_ALLOW_NOTES))
+	{
+		$nvpstr = $nvpstr."&ALLOWNOTE=0";
+	}
+	if (empty($conf->global->PAYPAL_REQUIRE_VALID_SHIPPING_ADDRESS))
+	{
+		$nvpstr = $nvpstr."&NOSHIPPING=1"; // An empty or not complete shipping address will be accepted
+	} else {
+		$nvpstr = $nvpstr."&NOSHIPPING=0"; // A valid shipping address is required (full required fields mandatory)
+	}
+	$nvpstr = $nvpstr."&SOLUTIONTYPE=".urlencode($solutionType);
+	$nvpstr = $nvpstr."&LANDINGPAGE=".urlencode($landingPage);
+	if (!empty($conf->global->PAYPAL_CUSTOMER_SERVICE_NUMBER))
+	{
+		$nvpstr = $nvpstr."&CUSTOMERSERVICENUMBER=".urlencode($conf->global->PAYPAL_CUSTOMER_SERVICE_NUMBER); // Hotline phone number
+	}
 
-    $paypalprefix = 'PAYMENTREQUEST_0_';
-    //$paypalprefix = '';
+	$paypalprefix = 'PAYMENTREQUEST_0_';
+	//$paypalprefix = '';
 	if (!empty($paypalprefix) && $paymentType == 'Sole') $paymentType = 'Sale';
 
 	$nvpstr = $nvpstr."&AMT=".urlencode($paymentAmount); // Total for all elements
 
-    $nvpstr = $nvpstr."&".$paypalprefix."INVNUM=".urlencode($tag);
-    $nvpstr = $nvpstr."&".$paypalprefix."AMT=".urlencode($paymentAmount); // AMT deprecated by paypal -> PAYMENTREQUEST_n_AMT
-    $nvpstr = $nvpstr."&".$paypalprefix."ITEMAMT=".urlencode($paymentAmount); // AMT deprecated by paypal -> PAYMENTREQUEST_n_AMT
-    $nvpstr = $nvpstr."&".$paypalprefix."PAYMENTACTION=".urlencode($paymentType); // PAYMENTACTION deprecated by paypal -> PAYMENTREQUEST_n_PAYMENTACTION
-    $nvpstr = $nvpstr."&".$paypalprefix."CURRENCYCODE=".urlencode($currencyCodeType); // CURRENCYCODE deprecated by paypal -> PAYMENTREQUEST_n_CURRENCYCODE
+	$nvpstr = $nvpstr."&".$paypalprefix."INVNUM=".urlencode($tag);
+	$nvpstr = $nvpstr."&".$paypalprefix."AMT=".urlencode($paymentAmount); // AMT deprecated by paypal -> PAYMENTREQUEST_n_AMT
+	$nvpstr = $nvpstr."&".$paypalprefix."ITEMAMT=".urlencode($paymentAmount); // AMT deprecated by paypal -> PAYMENTREQUEST_n_AMT
+	$nvpstr = $nvpstr."&".$paypalprefix."PAYMENTACTION=".urlencode($paymentType); // PAYMENTACTION deprecated by paypal -> PAYMENTREQUEST_n_PAYMENTACTION
+	$nvpstr = $nvpstr."&".$paypalprefix."CURRENCYCODE=".urlencode($currencyCodeType); // CURRENCYCODE deprecated by paypal -> PAYMENTREQUEST_n_CURRENCYCODE
 
-    $nvpstr = $nvpstr."&".$paypalprefix."L_PAYMENTREQUEST_0_QTY0=1";
-    $nvpstr = $nvpstr."&".$paypalprefix."L_PAYMENTREQUEST_0_AMT0=".urlencode($paymentAmount);
-    $nvpstr = $nvpstr."&".$paypalprefix."L_PAYMENTREQUEST_0_NAME0=".urlencode($desc);
-    $nvpstr = $nvpstr."&".$paypalprefix."L_PAYMENTREQUEST_0_NUMBER0=0";
+	$nvpstr = $nvpstr."&".$paypalprefix."L_PAYMENTREQUEST_0_QTY0=1";
+	$nvpstr = $nvpstr."&".$paypalprefix."L_PAYMENTREQUEST_0_AMT0=".urlencode($paymentAmount);
+	$nvpstr = $nvpstr."&".$paypalprefix."L_PAYMENTREQUEST_0_NAME0=".urlencode($desc);
+	$nvpstr = $nvpstr."&".$paypalprefix."L_PAYMENTREQUEST_0_NUMBER0=0";
 
-    $nvpstr = $nvpstr."&".$paypalprefix."SHIPTONAME=".urlencode($shipToName); // SHIPTONAME deprecated by paypal -> PAYMENTREQUEST_n_SHIPTONAME
-    $nvpstr = $nvpstr."&".$paypalprefix."SHIPTOSTREET=".urlencode($shipToStreet); //
-    $nvpstr = $nvpstr."&".$paypalprefix."SHIPTOSTREET2=".urlencode($shipToStreet2);
-    $nvpstr = $nvpstr."&".$paypalprefix."SHIPTOCITY=".urlencode($shipToCity);
-    $nvpstr = $nvpstr."&".$paypalprefix."SHIPTOSTATE=".urlencode($shipToState);
-    $nvpstr = $nvpstr."&".$paypalprefix."SHIPTOCOUNTRYCODE=".urlencode($shipToCountryCode);
-    $nvpstr = $nvpstr."&".$paypalprefix."SHIPTOZIP=".urlencode($shipToZip);
-    $nvpstr = $nvpstr."&".$paypalprefix."PHONENUM=".urlencode($phoneNum);
-    if (!empty($email)) $nvpstr = $nvpstr."&".$paypalprefix."EMAIL=".urlencode($email); // EMAIL deprecated by paypal -> PAYMENTREQUEST_n_EMAIL
-    if (!empty($desc))  $nvpstr = $nvpstr."&".$paypalprefix."DESC=".urlencode($desc); // DESC deprecated by paypal -> PAYMENTREQUEST_n_DESC
+	$nvpstr = $nvpstr."&".$paypalprefix."SHIPTONAME=".urlencode($shipToName); // SHIPTONAME deprecated by paypal -> PAYMENTREQUEST_n_SHIPTONAME
+	$nvpstr = $nvpstr."&".$paypalprefix."SHIPTOSTREET=".urlencode($shipToStreet); //
+	$nvpstr = $nvpstr."&".$paypalprefix."SHIPTOSTREET2=".urlencode($shipToStreet2);
+	$nvpstr = $nvpstr."&".$paypalprefix."SHIPTOCITY=".urlencode($shipToCity);
+	$nvpstr = $nvpstr."&".$paypalprefix."SHIPTOSTATE=".urlencode($shipToState);
+	$nvpstr = $nvpstr."&".$paypalprefix."SHIPTOCOUNTRYCODE=".urlencode($shipToCountryCode);
+	$nvpstr = $nvpstr."&".$paypalprefix."SHIPTOZIP=".urlencode($shipToZip);
+	$nvpstr = $nvpstr."&".$paypalprefix."PHONENUM=".urlencode($phoneNum);
+	if (!empty($email)) $nvpstr = $nvpstr."&".$paypalprefix."EMAIL=".urlencode($email); // EMAIL deprecated by paypal -> PAYMENTREQUEST_n_EMAIL
+	if (!empty($desc))  $nvpstr = $nvpstr."&".$paypalprefix."DESC=".urlencode($desc); // DESC deprecated by paypal -> PAYMENTREQUEST_n_DESC
 
-    if (!empty($conf->global->PAYPAL_LOGOIMG) && $mysoc->logo)
-    {
-    	global $dolibarr_main_url_root;
+	if (!empty($conf->global->PAYPAL_LOGOIMG) && $mysoc->logo)
+	{
+		global $dolibarr_main_url_root;
 
-	    // Define $urlwithroot
-	    $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
-	    $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
-	    //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+		// Define $urlwithroot
+		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+		$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
-	    $urllogo = $urlwithroot."/viewimage.php?modulepart=mycompany&file=".urlencode('logos/'.$mysoc->logo);
-	    $nvpstr = $nvpstr."&LOGOIMG=".urlencode($urllogo);
-    }
-    if (!empty($conf->global->PAYPAL_BRANDNAME))
-    {
-    	$nvpstr = $nvpstr."&BRANDNAME=".urlencode($conf->global->PAYPAL_BRANDNAME); // BRANDNAME
-    }
-    if (!empty($conf->global->PAYPAL_NOTETOBUYER))
-    {
-    	$nvpstr = $nvpstr."&NOTETOBUYER=".urlencode($conf->global->PAYPAL_NOTETOBUYER); // PAYPAL_NOTETOBUYER
-    }
+		$urllogo = $urlwithroot."/viewimage.php?modulepart=mycompany&file=".urlencode('logos/'.$mysoc->logo);
+		$nvpstr = $nvpstr."&LOGOIMG=".urlencode($urllogo);
+	}
+	if (!empty($conf->global->PAYPAL_BRANDNAME))
+	{
+		$nvpstr = $nvpstr."&BRANDNAME=".urlencode($conf->global->PAYPAL_BRANDNAME); // BRANDNAME
+	}
+	if (!empty($conf->global->PAYPAL_NOTETOBUYER))
+	{
+		$nvpstr = $nvpstr."&NOTETOBUYER=".urlencode($conf->global->PAYPAL_NOTETOBUYER); // PAYPAL_NOTETOBUYER
+	}
 
 	$_SESSION["FinalPaymentAmt"] = $paymentAmount;
-    $_SESSION["currencyCodeType"] = $currencyCodeType;
-    $_SESSION["PaymentType"] = $paymentType; // 'Mark', 'Sole'
-    $_SESSION['ipaddress'] = $_SERVER['REMOTE_ADDR']; // Payer ip
+	$_SESSION["currencyCodeType"] = $currencyCodeType;
+	$_SESSION["PaymentType"] = $paymentType; // 'Mark', 'Sole'
+	$_SESSION['ipaddress'] = $_SERVER['REMOTE_ADDR']; // Payer ip
 
-    //'---------------------------------------------------------------------------------------------------------------
-    //' Make the API call to PayPal
-    //' If the API call succeded, then redirect the buyer to PayPal to begin to authorize payment.
-    //' If an error occured, show the resulting errors
-    //'---------------------------------------------------------------------------------------------------------------
-    $resArray = hash_call("SetExpressCheckout", $nvpstr);
-    $ack = strtoupper($resArray["ACK"]);
-    if ($ack == "SUCCESS" || $ack == "SUCCESSWITHWARNING")
-    {
-        $token = urldecode($resArray["TOKEN"]);
-        $_SESSION['TOKEN'] = $token;
-    }
+	//'---------------------------------------------------------------------------------------------------------------
+	//' Make the API call to PayPal
+	//' If the API call succeded, then redirect the buyer to PayPal to begin to authorize payment.
+	//' If an error occured, show the resulting errors
+	//'---------------------------------------------------------------------------------------------------------------
+	$resArray = hash_call("SetExpressCheckout", $nvpstr);
+	$ack = strtoupper($resArray["ACK"]);
+	if ($ack == "SUCCESS" || $ack == "SUCCESSWITHWARNING")
+	{
+		$token = urldecode($resArray["TOKEN"]);
+		$_SESSION['TOKEN'] = $token;
+	}
 
-    return $resArray;
+	return $resArray;
 }
 
 /**
@@ -431,39 +308,39 @@ function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType,
  */
 function getDetails($token)
 {
-    //'--------------------------------------------------------------
-    //' At this point, the buyer has completed authorizing the payment
-    //' at PayPal.  The function will call PayPal to obtain the details
-    //' of the authorization, incuding any shipping information of the
-    //' buyer.  Remember, the authorization is not a completed transaction
-    //' at this state - the buyer still needs an additional step to finalize
-    //' the transaction
-    //'--------------------------------------------------------------
+	//'--------------------------------------------------------------
+	//' At this point, the buyer has completed authorizing the payment
+	//' at PayPal.  The function will call PayPal to obtain the details
+	//' of the authorization, incuding any shipping information of the
+	//' buyer.  Remember, the authorization is not a completed transaction
+	//' at this state - the buyer still needs an additional step to finalize
+	//' the transaction
+	//'--------------------------------------------------------------
 
-    //declaring of global variables
-    global $conf, $langs;
-    global $API_Endpoint, $API_Url, $API_version, $USE_PROXY, $PROXY_HOST, $PROXY_PORT;
-    global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
+	//declaring of global variables
+	global $conf, $langs;
+	global $API_Endpoint, $API_Url, $API_version, $USE_PROXY, $PROXY_HOST, $PROXY_PORT;
+	global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
 
-    //'---------------------------------------------------------------------------
-    //' Build a second API request to PayPal, using the token as the
-    //'  ID to get the details on the payment authorization
-    //'---------------------------------------------------------------------------
-    $nvpstr = "&TOKEN=".$token;
+	//'---------------------------------------------------------------------------
+	//' Build a second API request to PayPal, using the token as the
+	//'  ID to get the details on the payment authorization
+	//'---------------------------------------------------------------------------
+	$nvpstr = "&TOKEN=".$token;
 
-    //'---------------------------------------------------------------------------
-    //' Make the API call and store the results in an array.
-    //' If the call was a success, show the authorization details, and provide
-    //'     an action to complete the payment.
-    //' If failed, show the error
-    //'---------------------------------------------------------------------------
-    $resArray = hash_call("GetExpressCheckoutDetails", $nvpstr);
-    $ack = strtoupper($resArray["ACK"]);
-    if ($ack == "SUCCESS" || $ack == "SUCCESSWITHWARNING")
-    {
-        $_SESSION['payer_id'] = $resArray['PAYERID'];
-    }
-    return $resArray;
+	//'---------------------------------------------------------------------------
+	//' Make the API call and store the results in an array.
+	//' If the call was a success, show the authorization details, and provide
+	//'     an action to complete the payment.
+	//' If failed, show the error
+	//'---------------------------------------------------------------------------
+	$resArray = hash_call("GetExpressCheckoutDetails", $nvpstr);
+	$ack = strtoupper($resArray["ACK"]);
+	if ($ack == "SUCCESS" || $ack == "SUCCESSWITHWARNING")
+	{
+		$_SESSION['payer_id'] = $resArray['PAYERID'];
+	}
+	return $resArray;
 }
 
 
@@ -477,41 +354,41 @@ function getDetails($token)
  *	@param	string	$ipaddress			IP Address
  *	@param	string	$FinalPaymentAmt	Amount
  *	@param	string	$tag				Full tag
- *	@return	void
+ *	@return	array
  */
 function confirmPayment($token, $paymentType, $currencyCodeType, $payerID, $ipaddress, $FinalPaymentAmt, $tag)
 {
-    /* Gather the information to make the final call to
+	/* Gather the information to make the final call to
      finalize the PayPal payment.  The variable nvpstr
      holds the name value pairs
      */
 
-    //declaring of global variables
-    global $conf, $langs;
-    global $API_Endpoint, $API_Url, $API_version, $USE_PROXY, $PROXY_HOST, $PROXY_PORT;
-    global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
+	//declaring of global variables
+	global $conf, $langs;
+	global $API_Endpoint, $API_Url, $API_version, $USE_PROXY, $PROXY_HOST, $PROXY_PORT;
+	global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
 
-    $nvpstr = '';
-    $nvpstr .= '&TOKEN='.urlencode($token);
-    $nvpstr .= '&PAYERID='.urlencode($payerID);
-    $nvpstr .= '&PAYMENTACTION='.urlencode($paymentType);
-    $nvpstr .= '&AMT='.urlencode($FinalPaymentAmt);
-    $nvpstr .= '&CURRENCYCODE='.urlencode($currencyCodeType);
-    $nvpstr .= '&IPADDRESS='.urlencode($ipaddress);
-    $nvpstr .= '&INVNUM='.urlencode($tag);
+	$nvpstr = '';
+	$nvpstr .= '&TOKEN='.urlencode($token);
+	$nvpstr .= '&PAYERID='.urlencode($payerID);
+	$nvpstr .= '&PAYMENTACTION='.urlencode($paymentType);
+	$nvpstr .= '&AMT='.urlencode($FinalPaymentAmt);
+	$nvpstr .= '&CURRENCYCODE='.urlencode($currencyCodeType);
+	$nvpstr .= '&IPADDRESS='.urlencode($ipaddress);
+	$nvpstr .= '&INVNUM='.urlencode($tag);
 
-    /* Make the call to PayPal to finalize payment
+	/* Make the call to PayPal to finalize payment
      If an error occured, show the resulting errors
      */
-    $resArray = hash_call("DoExpressCheckoutPayment", $nvpstr);
+	$resArray = hash_call("DoExpressCheckoutPayment", $nvpstr);
 
-    /* Display the API response back to the browser.
+	/* Display the API response back to the browser.
      If the response from PayPal was a success, display the response parameters'
      If the response was an error, display the errors received using APIError.php.
      */
-    $ack = strtoupper($resArray["ACK"]);
+	$ack = strtoupper($resArray["ACK"]);
 
-    return $resArray;
+	return $resArray;
 }
 
 /**
@@ -575,20 +452,20 @@ function DirectPayment($paymentType, $paymentAmount, $creditCardType, $creditCar
  */
 function hash_call($methodName, $nvpStr)
 {
-    //declaring of global variables
-    global $conf, $langs;
-    global $API_Endpoint, $API_Url, $API_version, $USE_PROXY, $PROXY_HOST, $PROXY_PORT, $PROXY_USER, $PROXY_PASS;
-    global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
+	//declaring of global variables
+	global $conf, $langs;
+	global $API_Endpoint, $API_Url, $API_version, $USE_PROXY, $PROXY_HOST, $PROXY_PORT, $PROXY_USER, $PROXY_PASS;
+	global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
 
-    // TODO problem with triggers
-    $API_version = "98.0";
+	// TODO problem with triggers
+	$API_version = "98.0";
 	if (!empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox', 'alpha'))		// We can force sand box with param 'forcesandbox'
 	{
-	    $API_Endpoint = "https://api-3t.sandbox.paypal.com/nvp";
-	    $API_Url = "https://www.sandbox.paypal.com/webscr?cmd=_express-checkout&token=";
+		$API_Endpoint = "https://api-3t.sandbox.paypal.com/nvp";
+		$API_Url = "https://www.sandbox.paypal.com/webscr?cmd=_express-checkout&token=";
 	} else {
-	    $API_Endpoint = "https://api-3t.paypal.com/nvp";
-	    $API_Url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=";
+		$API_Endpoint = "https://api-3t.paypal.com/nvp";
+		$API_Url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=";
 	}
 
 	// Clean parameters
@@ -602,74 +479,73 @@ function hash_call($methodName, $nvpStr)
 	if (!empty($conf->global->PAYPAL_API_SANDBOX)) $PAYPAL_API_SANDBOX = $conf->global->PAYPAL_API_SANDBOX;
 	// TODO END problem with triggers
 
-    dol_syslog("Paypal API endpoint ".$API_Endpoint);
+	dol_syslog("Paypal API endpoint ".$API_Endpoint);
 
-    //setting the curl parameters.
-    $ch = curl_init();
+	//setting the curl parameters.
+	$ch = curl_init();
 
-    /*print $API_Endpoint."-".$API_version."-".$PAYPAL_API_USER."-".$PAYPAL_API_PASSWORD."-".$PAYPAL_API_SIGNATURE."<br>";
+	/*print $API_Endpoint."-".$API_version."-".$PAYPAL_API_USER."-".$PAYPAL_API_PASSWORD."-".$PAYPAL_API_SIGNATURE."<br>";
      print $USE_PROXY."-".$gv_ApiErrorURL."<br>";
      print $nvpStr;
      exit;*/
-    curl_setopt($ch, CURLOPT_URL, $API_Endpoint);
-    curl_setopt($ch, CURLOPT_VERBOSE, 1);
-    // TLSv1 by default or change to TLSv1.2 in module configuration
-    curl_setopt($ch, CURLOPT_SSLVERSION, (empty($conf->global->PAYPAL_SSLVERSION) ? 1 : $conf->global->PAYPAL_SSLVERSION));
+	curl_setopt($ch, CURLOPT_URL, $API_Endpoint);
+	curl_setopt($ch, CURLOPT_VERBOSE, 1);
+	// TLSv1 by default or change to TLSv1.2 in module configuration
+	curl_setopt($ch, CURLOPT_SSLVERSION, (empty($conf->global->PAYPAL_SSLVERSION) ? 1 : $conf->global->PAYPAL_SSLVERSION));
 
-    //turning off the server and peer verification(TrustManager Concept).
-    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+	//turning off the server and peer verification(TrustManager Concept).
+	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
 
-    curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT);
-    curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
+	curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT);
+	curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
 
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-    curl_setopt($ch, CURLOPT_POST, 1);
+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+	curl_setopt($ch, CURLOPT_POST, 1);
 
-    //if USE_PROXY constant set to true in Constants.php, then only proxy will be enabled.
-    if ($USE_PROXY)
-    {
-        dol_syslog("Paypal API hash_call set proxy to ".$PROXY_HOST.":".$PROXY_PORT." - ".$PROXY_USER.":".$PROXY_PASS);
-        //curl_setopt ($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP); // Curl 7.10
-        curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST.":".$PROXY_PORT);
-        if ($PROXY_USER) curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER.":".$PROXY_PASS);
-    }
+	//if USE_PROXY constant set to true in Constants.php, then only proxy will be enabled.
+	if ($USE_PROXY)
+	{
+		dol_syslog("Paypal API hash_call set proxy to ".$PROXY_HOST.":".$PROXY_PORT." - ".$PROXY_USER.":".$PROXY_PASS);
+		//curl_setopt ($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP); // Curl 7.10
+		curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST.":".$PROXY_PORT);
+		if ($PROXY_USER) curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER.":".$PROXY_PASS);
+	}
 
-    //NVPRequest for submitting to server
-    $nvpreq = "METHOD=".urlencode($methodName)."&VERSION=".urlencode($API_version)."&PWD=".urlencode($PAYPAL_API_PASSWORD)."&USER=".urlencode($PAYPAL_API_USER)."&SIGNATURE=".urlencode($PAYPAL_API_SIGNATURE).$nvpStr;
-    $nvpreq .= "&LOCALECODE=".strtoupper($langs->getDefaultLang(1));
-    //$nvpreq.="&BRANDNAME=".urlencode();       // Override merchant name
-    //$nvpreq.="&NOTIFYURL=".urlencode();       // For Instant Payment Notification url
+	//NVPRequest for submitting to server
+	$nvpreq = "METHOD=".urlencode($methodName)."&VERSION=".urlencode($API_version)."&PWD=".urlencode($PAYPAL_API_PASSWORD)."&USER=".urlencode($PAYPAL_API_USER)."&SIGNATURE=".urlencode($PAYPAL_API_SIGNATURE).$nvpStr;
+	$nvpreq .= "&LOCALECODE=".strtoupper($langs->getDefaultLang(1));
+	//$nvpreq.="&BRANDNAME=".urlencode();       // Override merchant name
+	//$nvpreq.="&NOTIFYURL=".urlencode();       // For Instant Payment Notification url
 
 
-    dol_syslog("Paypal API hash_call nvpreq=".$nvpreq);
+	dol_syslog("Paypal API hash_call nvpreq=".$nvpreq);
 
-    //setting the nvpreq as POST FIELD to curl
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $nvpreq);
+	//setting the nvpreq as POST FIELD to curl
+	curl_setopt($ch, CURLOPT_POSTFIELDS, $nvpreq);
 
-    //getting response from server
-    $response = curl_exec($ch);
+	//getting response from server
+	$response = curl_exec($ch);
 
-    $nvpReqArray = deformatNVP($nvpreq);
-    $_SESSION['nvpReqArray'] = $nvpReqArray;
+	$nvpReqArray = deformatNVP($nvpreq);
+	$_SESSION['nvpReqArray'] = $nvpReqArray;
 
-    //convrting NVPResponse to an Associative Array
-    dol_syslog("Paypal API hash_call Response nvpresp=".$response);
-    $nvpResArray = deformatNVP($response);
+	//convrting NVPResponse to an Associative Array
+	dol_syslog("Paypal API hash_call Response nvpresp=".$response);
+	$nvpResArray = deformatNVP($response);
 
-    if (curl_errno($ch))
-    {
-        // moving to display page to display curl errors
-        $_SESSION['curl_error_no'] = curl_errno($ch);
-        $_SESSION['curl_error_msg'] = curl_error($ch);
+	if (curl_errno($ch)) {
+		// moving to display page to display curl errors
+		$_SESSION['curl_error_no'] = curl_errno($ch);
+		$_SESSION['curl_error_msg'] = curl_error($ch);
 
-        //Execute the Error handling module to display errors.
-    } else {
-        //closing the curl
-        curl_close($ch);
-    }
+		//Execute the Error handling module to display errors.
+	} else {
+		//closing the curl
+		curl_close($ch);
+	}
 
-    return $nvpResArray;
+	return $nvpResArray;
 }
 
 
@@ -682,24 +558,24 @@ function hash_call($methodName, $nvpStr)
  */
 function deformatNVP($nvpstr)
 {
-    $intial = 0;
-    $nvpArray = array();
+	$intial = 0;
+	$nvpArray = array();
 
-    while (strlen($nvpstr))
-    {
-        //postion of Key
-        $keypos = strpos($nvpstr, '=');
-        //position of value
-        $valuepos = strpos($nvpstr, '&') ? strpos($nvpstr, '&') : strlen($nvpstr);
+	while (strlen($nvpstr))
+	{
+		//postion of Key
+		$keypos = strpos($nvpstr, '=');
+		//position of value
+		$valuepos = strpos($nvpstr, '&') ? strpos($nvpstr, '&') : strlen($nvpstr);
 
-        /*getting the Key and Value values and storing in a Associative Array*/
-        $keyval = substr($nvpstr, $intial, $keypos);
-        $valval = substr($nvpstr, $keypos + 1, $valuepos - $keypos - 1);
-        //decoding the respose
-        $nvpArray[urldecode($keyval)] = urldecode($valval);
-        $nvpstr = substr($nvpstr, $valuepos + 1, strlen($nvpstr));
-    }
-    return $nvpArray;
+		/*getting the Key and Value values and storing in a Associative Array*/
+		$keyval = substr($nvpstr, $intial, $keypos);
+		$valval = substr($nvpstr, $keypos + 1, $valuepos - $keypos - 1);
+		//decoding the respose
+		$nvpArray[urldecode($keyval)] = urldecode($valval);
+		$nvpstr = substr($nvpstr, $valuepos + 1, strlen($nvpstr));
+	}
+	return $nvpArray;
 }
 
 /**
diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php
index 2f906c68382..a67ad379ca9 100644
--- a/htdocs/printing/admin/printing.php
+++ b/htdocs/printing/admin/printing.php
@@ -54,48 +54,46 @@ $OAUTH_SERVICENAME_GOOGLE = 'Google';
 
 if (($mode == 'test' || $mode == 'setup') && empty($driver))
 {
-    setEventMessages($langs->trans('PleaseSelectaDriverfromList'), null);
-    header("Location: ".$_SERVER['PHP_SELF'].'?mode=config');
-    exit;
+	setEventMessages($langs->trans('PleaseSelectaDriverfromList'), null);
+	header("Location: ".$_SERVER['PHP_SELF'].'?mode=config');
+	exit;
 }
 
 if ($action == 'setconst' && $user->admin)
 {
-    $error = 0;
-    $db->begin();
-    foreach ($_POST['setupdriver'] as $setupconst) {
-        //print '<pre>'.print_r($setupconst, true).'</pre>';
-        $result = dolibarr_set_const($db, $setupconst['varname'], $setupconst['value'], 'chaine', 0, '', $conf->entity);
-        if (!$result > 0) $error++;
-    }
+	$error = 0;
+	$db->begin();
+	foreach ($_POST['setupdriver'] as $setupconst) {
+		//print '<pre>'.print_r($setupconst, true).'</pre>';
+		$result = dolibarr_set_const($db, $setupconst['varname'], $setupconst['value'], 'chaine', 0, '', $conf->entity);
+		if (!$result > 0) $error++;
+	}
 
-    if (!$error)
-    {
-        $db->commit();
-        setEventMessages($langs->trans("SetupSaved"), null);
-    } else {
-        $db->rollback();
-        dol_print_error($db);
-    }
-    $action = '';
+	if (!$error) {
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null);
+	} else {
+		$db->rollback();
+		dol_print_error($db);
+	}
+	$action = '';
 }
 
 if ($action == 'setvalue' && $user->admin)
 {
-    $db->begin();
+	$db->begin();
 
-    $result = dolibarr_set_const($db, $varname, $value, 'chaine', 0, '', $conf->entity);
-    if (!$result > 0) $error++;
+	$result = dolibarr_set_const($db, $varname, $value, 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) $error++;
 
-    if (!$error)
-    {
-        $db->commit();
-        setEventMessages($langs->trans("SetupSaved"), null);
-    } else {
-        $db->rollback();
-        dol_print_error($db);
-    }
-    $action = '';
+	if (!$error) {
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null);
+	} else {
+		$db->rollback();
+		dol_print_error($db);
+	}
+	$action = '';
 }
 
 
@@ -114,234 +112,253 @@ $head = printingAdminPrepareHead($mode);
 
 if ($mode == 'setup' && $user->admin)
 {
-    print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=setup&amp;driver='.$driver.'" autocomplete="off">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="setconst">';
+	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=setup&amp;driver='.$driver.'" autocomplete="off">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="setconst">';
 
-    dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
+	print dol_get_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
 
-    print $langs->trans("PrintingDriverDesc".$driver)."<br><br>\n";
+	print $langs->trans("PrintingDriverDesc".$driver)."<br><br>\n";
 
-    print '<table class="noborder centpercent">'."\n";
-    print '<tr class="liste_titre">';
-    print '<th>'.$langs->trans("Parameters").'</th>';
-    print '<th>'.$langs->trans("Value").'</th>';
-    print '<th>&nbsp;</th>';
-    print "</tr>\n";
-    $submit_enabled = 0;
+	print '<table class="noborder centpercent">'."\n";
+	print '<tr class="liste_titre">';
+	print '<th>'.$langs->trans("Parameters").'</th>';
+	print '<th>'.$langs->trans("Value").'</th>';
+	print '<th>&nbsp;</th>';
+	print "</tr>\n";
+	$submit_enabled = 0;
 
-    if (!empty($driver)) {
-        require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php';
-        $classname = 'printing_'.$driver;
-        $langs->load($driver);
-        $printer = new $classname($db);
+	if (!empty($driver)) {
+		$dirmodels = array_merge(array('/core/modules/printing/'), (array) $conf->modules_parts['printing']);
+		foreach ($dirmodels as $dir) {
+			if (file_exists(dol_buildpath($dir, 0).$driver.'.modules.php')) {
+				$classfile = dol_buildpath($dir, 0).$driver.'.modules.php';
+				break;
+			}
+		}
+		require_once $classfile;
+		$classname = 'printing_'.$driver;
+		$printer = new $classname($db);
+		$langs->load($printer::LANGFILE);
 
-        $i = 0;
-        $submit_enabled = 0;
-        foreach ($printer->conf as $key)
-        {
-            switch ($key['type']) {
-                case "text":
-                case "password":
-                    print '<tr class="oddeven">';
-                    print '<td'.($key['required'] ? ' class=required' : '').'>'.$langs->trans($key['varname']).'</td>';
-                    print '<td><input size="32" type="'.(empty($key['type']) ? 'text' : $key['type']).'" name="setupdriver['.$i.'][value]" value="'.$conf->global->{$key['varname']}.'"';
-                    print isset($key['moreattributes']) ? ' '.$key['moreattributes'] : '';
-                    print '><input type="hidden" name="setupdriver['.$i.'][varname]" value="'.$key['varname'].'"></td>';
-                    print '<td>&nbsp;'.($key['example'] != '' ? $langs->trans("Example").' : '.$key['example'] : '').'</td>';
-                    print '</tr>'."\n";
-                    break;
-                case "info":    // Google Api setup or Google OAuth Token
-                    print '<tr class="oddeven">';
-                    print '<td'.($key['required'] ? ' class=required' : '').'>';
-                    if ($key['varname'] == 'PRINTGCP_TOKEN_ACCESS')
-                    {
-                        print $langs->trans("IsTokenGenerated");
-                    } else {
-                        print $langs->trans($key['varname']);
-                    }
-                    print '</td>';
-                    print '<td>'.$langs->trans($key['info']).'</td>';
-                    print '<td>';
-                    //var_dump($key);
-                    if ($key['varname'] == 'PRINTGCP_TOKEN_ACCESS')
-                    {
-                        // Delete remote tokens
-                        if (!empty($key['delete'])) print '<a class="button" href="'.$key['delete'].'">'.$langs->trans('DeleteAccess').'</a><br><br>';
-                        // Request remote token
-                        print '<a class="button" href="'.$key['renew'].'">'.$langs->trans('RequestAccess').'</a><br><br>';
-                        // Check remote access
-                        print $langs->trans("ToCheckDeleteTokenOnProvider", $OAUTH_SERVICENAME_GOOGLE).': <a href="https://security.google.com/settings/security/permissions" target="_google">https://security.google.com/settings/security/permissions</a>';
-                    }
-                    print '</td>';
-                    print '</tr>'."\n";
-                    break;
-                case "submit":
-                    if ($key['enabled']) $submit_enabled = 1;
-                    break;
-            }
-            $i++;
+		$i = 0;
+		$submit_enabled = 0;
+		foreach ($printer->conf as $key)
+		{
+			switch ($key['type']) {
+				case "text":
+				case "password":
+					print '<tr class="oddeven">';
+					print '<td'.($key['required'] ? ' class=required' : '').'>'.$langs->trans($key['varname']).'</td>';
+					print '<td><input size="32" type="'.(empty($key['type']) ? 'text' : $key['type']).'" name="setupdriver['.$i.'][value]" value="'.$conf->global->{$key['varname']}.'"';
+					print isset($key['moreattributes']) ? ' '.$key['moreattributes'] : '';
+					print '><input type="hidden" name="setupdriver['.$i.'][varname]" value="'.$key['varname'].'"></td>';
+					print '<td>&nbsp;'.($key['example'] != '' ? $langs->trans("Example").' : '.$key['example'] : '').'</td>';
+					print '</tr>'."\n";
+					break;
+				case "info":    // Google Api setup or Google OAuth Token
+					print '<tr class="oddeven">';
+					print '<td'.($key['required'] ? ' class=required' : '').'>';
+					if ($key['varname'] == 'PRINTGCP_TOKEN_ACCESS')
+					{
+						print $langs->trans("IsTokenGenerated");
+					} else {
+						print $langs->trans($key['varname']);
+					}
+					print '</td>';
+					print '<td>'.$langs->trans($key['info']).'</td>';
+					print '<td>';
+					//var_dump($key);
+					if ($key['varname'] == 'PRINTGCP_TOKEN_ACCESS')
+					{
+						// Delete remote tokens
+						if (!empty($key['delete'])) print '<a class="button" href="'.$key['delete'].'">'.$langs->trans('DeleteAccess').'</a><br><br>';
+						// Request remote token
+						print '<a class="button" href="'.$key['renew'].'">'.$langs->trans('RequestAccess').'</a><br><br>';
+						// Check remote access
+						print $langs->trans("ToCheckDeleteTokenOnProvider", $OAUTH_SERVICENAME_GOOGLE).': <a href="https://security.google.com/settings/security/permissions" target="_google">https://security.google.com/settings/security/permissions</a>';
+					}
+					print '</td>';
+					print '</tr>'."\n";
+					break;
+				case "submit":
+					if ($key['enabled']) $submit_enabled = 1;
+					break;
+			}
+			$i++;
 
-            if ($key['varname'] == 'PRINTGCP_TOKEN_ACCESS')
-            {
-                // Token
-                print '<tr class="oddeven">';
-                print '<td>'.$langs->trans("Token").'</td>';
-                print '<td colspan="2">';
-                $tokenobj = null;
-                // Dolibarr storage
-                $storage = new DoliStorage($db, $conf);
-                try {
-                    $tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME_GOOGLE);
-                } catch (Exception $e)
-                {
-                    // Return an error if token not found
-                }
-                if (is_object($tokenobj))
-                {
-                    //var_dump($tokenobj);
-                    print $tokenobj->getAccessToken().'<br>';
-                    //print 'Refresh: '.$tokenobj->getRefreshToken().'<br>';
-                    //print 'EndOfLife: '.$tokenobj->getEndOfLife().'<br>';
-                    //var_dump($tokenobj->getExtraParams());
-                    /*print '<br>Extra: <br><textarea class="quatrevingtpercent">';
+			if ($key['varname'] == 'PRINTGCP_TOKEN_ACCESS')
+			{
+				// Token
+				print '<tr class="oddeven">';
+				print '<td>'.$langs->trans("Token").'</td>';
+				print '<td colspan="2">';
+				$tokenobj = null;
+				// Dolibarr storage
+				$storage = new DoliStorage($db, $conf);
+				try {
+					$tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME_GOOGLE);
+				} catch (Exception $e)
+				{
+					// Return an error if token not found
+				}
+				if (is_object($tokenobj))
+				{
+					//var_dump($tokenobj);
+					print $tokenobj->getAccessToken().'<br>';
+					//print 'Refresh: '.$tokenobj->getRefreshToken().'<br>';
+					//print 'EndOfLife: '.$tokenobj->getEndOfLife().'<br>';
+					//var_dump($tokenobj->getExtraParams());
+					/*print '<br>Extra: <br><textarea class="quatrevingtpercent">';
                     print ''.join(',',$tokenobj->getExtraParams());
                     print '</textarea>';*/
-                }
-                print '</td>';
-                print '</tr>'."\n";
-            }
-        }
-    } else {
-        print $langs->trans('PleaseSelectaDriverfromList');
-    }
+				}
+				print '</td>';
+				print '</tr>'."\n";
+			}
+		}
+	} else {
+		print $langs->trans('PleaseSelectaDriverfromList');
+	}
 
-    print '</table>';
+	print '</table>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    if (!empty($driver))
-    {
-        if ($submit_enabled) {
-            print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Modify")).'"></div>';
-        }
-    }
+	if (!empty($driver))
+	{
+		if ($submit_enabled) {
+			print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Modify")).'"></div>';
+		}
+	}
 
-    print '</form>';
+	print '</form>';
 }
 if ($mode == 'config' && $user->admin)
 {
-    dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
+	print dol_get_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
 
-    print $langs->trans("PrintingDesc")."<br><br>\n";
+	print $langs->trans("PrintingDesc")."<br><br>\n";
 
-    print '<table class="noborder centpercent">'."\n";
+	print '<table class="noborder centpercent">'."\n";
 
-    print '<tr class="liste_titre">';
-    print '<th>'.$langs->trans("Description").'</th>';
-    print '<th class="center">'.$langs->trans("Active").'</th>';
-    print '<th class="center">'.$langs->trans("Setup").'</th>';
-    print '<th class="center">'.$langs->trans("TargetedPrinter").'</th>';
-    print "</tr>\n";
+	print '<tr class="liste_titre">';
+	print '<th>'.$langs->trans("Description").'</th>';
+	print '<th class="center">'.$langs->trans("Active").'</th>';
+	print '<th class="center">'.$langs->trans("Setup").'</th>';
+	print '<th class="center">'.$langs->trans("TargetedPrinter").'</th>';
+	print "</tr>\n";
 
-    $object = new PrintingDriver($db);
-    $result = $object->listDrivers($db, 10);
-    foreach ($result as $driver) {
-        require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php';
-        $classname = 'printing_'.$driver;
-        $langs->load($driver);
-        $printer = new $classname($db);
-        //print '<pre>'.print_r($printer, true).'</pre>';
+	$object = new PrintingDriver($db);
+	$result = $object->listDrivers($db, 10);
+	$dirmodels = array_merge(array('/core/modules/printing/'), (array) $conf->modules_parts['printing']);
+	foreach ($result as $driver) {
+		foreach ($dirmodels as $dir) {
+			if (file_exists(dol_buildpath($dir, 0).$driver.'.modules.php')) {
+				$classfile = dol_buildpath($dir, 0).$driver.'.modules.php';
+				break;
+			}
+		}
+		require_once $classfile;
+		$classname = 'printing_'.$driver;
+		$printer = new $classname($db);
+		$langs->load($printer::LANGFILE);
+		//print '<pre>'.print_r($printer, true).'</pre>';
 
-        print '<tr class="oddeven">';
-        print '<td>'.img_picto('', $printer->picto).' '.$langs->trans($printer->desc).'</td>';
-        print '<td class="center">';
-        if (!empty($conf->use_javascript_ajax))
-        {
-            print ajax_constantonoff($printer->active);
-        } else {
-            if (empty($conf->global->{$printer->conf}))
-            {
-                print '<a href="'.$_SERVER['PHP_SELF'].'?action=setvalue&amp;token='.newToken().'&amp;varname='.$printer->active.'&amp;value=1">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-            } else {
-                print '<a href="'.$_SERVER['PHP_SELF'].'?action=setvalue&amp;token='.newToken().'&amp;varname='.$printer->active.'&amp;value=0">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
-            }
-        }
-        print '<td class="center"><a href="'.$_SERVER['PHP_SELF'].'?mode=setup&amp;driver='.$printer->name.'">'.img_picto('', 'setup').'</a></td>';
-        print '<td class="center"><a href="'.$_SERVER['PHP_SELF'].'?mode=test&amp;driver='.$printer->name.'">'.img_picto('', 'setup').'</a></td>';
-        print '</tr>'."\n";
-    }
+		print '<tr class="oddeven">';
+		print '<td>'.img_picto('', $printer->picto).' '.$langs->trans($printer->desc).'</td>';
+		print '<td class="center">';
+		if (!empty($conf->use_javascript_ajax)) {
+			print ajax_constantonoff($printer->active);
+		} else {
+			if (empty($conf->global->{$printer->conf})) {
+				print '<a href="'.$_SERVER['PHP_SELF'].'?action=setvalue&amp;token='.newToken().'&amp;varname='.$printer->active.'&amp;value=1">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+			} else {
+				print '<a href="'.$_SERVER['PHP_SELF'].'?action=setvalue&amp;token='.newToken().'&amp;varname='.$printer->active.'&amp;value=0">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+			}
+		}
+		print '<td class="center"><a href="'.$_SERVER['PHP_SELF'].'?mode=setup&amp;driver='.$printer->name.'">'.img_picto('', 'setup').'</a></td>';
+		print '<td class="center"><a href="'.$_SERVER['PHP_SELF'].'?mode=test&amp;driver='.$printer->name.'">'.img_picto('', 'setup').'</a></td>';
+		print '</tr>'."\n";
+	}
 
-    print '</table>';
+	print '</table>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 if ($mode == 'test' && $user->admin)
 {
-    dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
+	print dol_get_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
 
-    print $langs->trans('PrintTestDesc'.$driver)."<br><br>\n";
+	print $langs->trans('PrintTestDesc'.$driver)."<br><br>\n";
 
-    print '<table class="noborder centpercent">';
-    if (!empty($driver))
-    {
-        require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php';
-        $classname = 'printing_'.$driver;
-        $langs->load($driver);
-        $printer = new $classname($db);
-        //print '<pre>'.print_r($printer, true).'</pre>';
-        if (count($printer->getlistAvailablePrinters())) {
-            if ($printer->listAvailablePrinters() == 0) {
-                print $printer->resprint;
-            } else {
-                setEventMessages($printer->error, $printer->errors, 'errors');
-            }
-        } else {
-            print $langs->trans('PleaseConfigureDriverfromList');
-        }
-    } else {
-        print $langs->trans('PleaseSelectaDriverfromList');
-    }
-    print '</table>';
+	print '<table class="noborder centpercent">';
+	if (!empty($driver)) {
+		$dirmodels = array_merge(array('/core/modules/printing/'), (array) $conf->modules_parts['printing']);
+		foreach ($dirmodels as $dir) {
+			if (file_exists(dol_buildpath($dir, 0).$driver.'.modules.php')) {
+				$classfile = dol_buildpath($dir, 0).$driver.'.modules.php';
+				break;
+			}
+		}
+		require_once $classfile;
+		$classname = 'printing_'.$driver;
+		$langs->load($driver);
+		$printer = new $classname($db);
+		$langs->load($printer::LANGFILE);
+		//print '<pre>'.print_r($printer, true).'</pre>';
+		if (count($printer->getlistAvailablePrinters())) {
+			if ($printer->listAvailablePrinters() == 0) {
+				print $printer->resprint;
+			} else {
+				setEventMessages($printer->error, $printer->errors, 'errors');
+			}
+		} else {
+			print $langs->trans('PleaseConfigureDriverfromList');
+		}
+	} else {
+		print $langs->trans('PleaseSelectaDriverfromList');
+	}
+	print '</table>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 if ($mode == 'userconf' && $user->admin)
 {
-    dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
+	print dol_get_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
 
-    print $langs->trans('PrintUserConfDesc'.$driver)."<br><br>\n";
+	print $langs->trans('PrintUserConfDesc'.$driver)."<br><br>\n";
 
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<th>'.$langs->trans("User").'</th>';
-    print '<th>'.$langs->trans("PrintModule").'</th>';
-    print '<th>'.$langs->trans("PrintDriver").'</th>';
-    print '<th>'.$langs->trans("Printer").'</th>';
-    print '<th>'.$langs->trans("PrinterLocation").'</th>';
-    print '<th>'.$langs->trans("PrinterId").'</th>';
-    print '<th>'.$langs->trans("NumberOfCopy").'</th>';
-    print '<th class="center">'.$langs->trans("Delete").'</th>';
-    print "</tr>\n";
-    $sql = 'SELECT p.rowid, p.printer_name, p.printer_location, p.printer_id, p.copy, p.module, p.driver, p.userid, u.login FROM '.MAIN_DB_PREFIX.'printing as p, '.MAIN_DB_PREFIX.'user as u WHERE p.userid=u.rowid';
-    $resql = $db->query($sql);
-    while ($row = $db->fetch_array($resql)) {
-        print '<tr class="oddeven">';
-        print '<td>'.$row['login'].'</td>';
-        print '<td>'.$row['module'].'</td>';
-        print '<td>'.$row['driver'].'</td>';
-        print '<td>'.$row['printer_name'].'</td>';
-        print '<td>'.$row['printer_location'].'</td>';
-        print '<td>'.$row['printer_id'].'</td>';
-        print '<td>'.$row['copy'].'</td>';
-        print '<td class="center">'.img_picto($langs->trans("Delete"), 'delete').'</td>';
-        print "</tr>\n";
-    }
-    print '</table>';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<th>'.$langs->trans("User").'</th>';
+	print '<th>'.$langs->trans("PrintModule").'</th>';
+	print '<th>'.$langs->trans("PrintDriver").'</th>';
+	print '<th>'.$langs->trans("Printer").'</th>';
+	print '<th>'.$langs->trans("PrinterLocation").'</th>';
+	print '<th>'.$langs->trans("PrinterId").'</th>';
+	print '<th>'.$langs->trans("NumberOfCopy").'</th>';
+	print '<th class="center">'.$langs->trans("Delete").'</th>';
+	print "</tr>\n";
+	$sql = 'SELECT p.rowid, p.printer_name, p.printer_location, p.printer_id, p.copy, p.module, p.driver, p.userid, u.login FROM '.MAIN_DB_PREFIX.'printing as p, '.MAIN_DB_PREFIX.'user as u WHERE p.userid=u.rowid';
+	$resql = $db->query($sql);
+	while ($row = $db->fetch_array($resql)) {
+		print '<tr class="oddeven">';
+		print '<td>'.$row['login'].'</td>';
+		print '<td>'.$row['module'].'</td>';
+		print '<td>'.$row['driver'].'</td>';
+		print '<td>'.$row['printer_name'].'</td>';
+		print '<td>'.$row['printer_location'].'</td>';
+		print '<td>'.$row['printer_id'].'</td>';
+		print '<td>'.$row['copy'].'</td>';
+		print '<td class="center">'.img_picto($langs->trans("Delete"), 'delete').'</td>';
+		print "</tr>\n";
+	}
+	print '</table>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php
index aafc36ca256..bae21309022 100644
--- a/htdocs/product/admin/dynamic_prices.php
+++ b/htdocs/product/admin/dynamic_prices.php
@@ -42,17 +42,17 @@ if (!$user->admin) accessforbidden();
 //Objects
 $price_globals = new PriceGlobalVariable($db);
 if ($action == 'edit_variable') {
-    $res = $price_globals->fetch($selection);
-    if ($res < 1) {
-        setEventMessages($price_globals->error, $price_globals->errors, 'errors');
-    }
+	$res = $price_globals->fetch($selection);
+	if ($res < 1) {
+		setEventMessages($price_globals->error, $price_globals->errors, 'errors');
+	}
 }
 $price_updaters = new PriceGlobalVariableUpdater($db);
 if ($action == 'edit_updater') {
-    $res = $price_updaters->fetch($selection);
-    if ($res < 1) {
-        setEventMessages($price_updaters->error, $price_updaters->errors, 'errors');
-    }
+	$res = $price_updaters->fetch($selection);
+	if ($res < 1) {
+		setEventMessages($price_updaters->error, $price_updaters->errors, 'errors');
+	}
 }
 
 
@@ -61,84 +61,84 @@ if ($action == 'edit_updater') {
  */
 
 if (!empty($action) && empty($cancel)) {
-    //Global variable actions
-    if ($action == 'create_variable' || $action == 'edit_variable') {
-        $price_globals->code = GETPOSTISSET('code') ?GETPOST('code', 'alpha') : $price_globals->code;
-        $price_globals->description = GETPOSTISSET('description') ?GETPOST('description', 'restricthtml') : $price_globals->description;
-        $price_globals->value = GETPOSTISSET('value') ?GETPOST('value', 'int') : $price_globals->value;
-        //Check if record already exists only when saving
-        if (!empty($save)) {
-            foreach ($price_globals->listGlobalVariables() as $entry) {
-                if ($price_globals->id != $entry->id && dol_strtolower($price_globals->code) == dol_strtolower($entry->code)) {
-                    setEventMessages($langs->trans("ErrorRecordAlreadyExists"), null, 'errors');
-                    $save = null;
-                }
-            }
-        }
-    }
-    if ($action == 'create_variable' && !empty($save)) {
-        $res = $price_globals->create($user);
-        if ($res > 0) {
-            $action = '';
-        } else {
-            setEventMessages($price_globals->error, $price_globals->errors, 'errors');
-        }
-    } elseif ($action == 'edit_variable' && !empty($save)) {
-        $res = $price_globals->update($user);
-        if ($res > 0) {
-            $action = '';
-        } else {
-            setEventMessages($price_globals->error, $price_globals->errors, 'errors');
-        }
-    } elseif ($action == 'delete_variable') {
-        $res = $price_globals->delete($selection, $user);
-        if ($res > 0) {
-            $action = '';
-        } else {
-            setEventMessages($price_globals->error, $price_globals->errors, 'errors');
-        }
-    }
+	//Global variable actions
+	if ($action == 'create_variable' || $action == 'edit_variable') {
+		$price_globals->code = GETPOSTISSET('code') ?GETPOST('code', 'alpha') : $price_globals->code;
+		$price_globals->description = GETPOSTISSET('description') ?GETPOST('description', 'restricthtml') : $price_globals->description;
+		$price_globals->value = GETPOSTISSET('value') ?GETPOST('value', 'int') : $price_globals->value;
+		//Check if record already exists only when saving
+		if (!empty($save)) {
+			foreach ($price_globals->listGlobalVariables() as $entry) {
+				if ($price_globals->id != $entry->id && dol_strtolower($price_globals->code) == dol_strtolower($entry->code)) {
+					setEventMessages($langs->trans("ErrorRecordAlreadyExists"), null, 'errors');
+					$save = null;
+				}
+			}
+		}
+	}
+	if ($action == 'create_variable' && !empty($save)) {
+		$res = $price_globals->create($user);
+		if ($res > 0) {
+			$action = '';
+		} else {
+			setEventMessages($price_globals->error, $price_globals->errors, 'errors');
+		}
+	} elseif ($action == 'edit_variable' && !empty($save)) {
+		$res = $price_globals->update($user);
+		if ($res > 0) {
+			$action = '';
+		} else {
+			setEventMessages($price_globals->error, $price_globals->errors, 'errors');
+		}
+	} elseif ($action == 'delete_variable') {
+		$res = $price_globals->delete($selection, $user);
+		if ($res > 0) {
+			$action = '';
+		} else {
+			setEventMessages($price_globals->error, $price_globals->errors, 'errors');
+		}
+	}
 
-    //Updaters actions
-    if ($action == 'create_updater' || $action == 'edit_updater') {
-        $price_updaters->type = GETPOSTISSET('type') ? GETPOST('type', 'int') : $price_updaters->type;
-        $price_updaters->description = GETPOSTISSET('description') ? GETPOST('description', 'restricthtml') : $price_updaters->description;
-        $price_updaters->parameters = GETPOSTISSET('parameters') ? GETPOST('parameters', 'alphanohtml') : $price_updaters->parameters;
-        $price_updaters->fk_variable = GETPOSTISSET('fk_variable') ? GETPOST('fk_variable', 'int') : $price_updaters->fk_variable;
-        $price_updaters->update_interval = GETPOSTISSET('update_interval') ? GETPOST('update_interval', 'int') : $price_updaters->update_interval;
-    }
-    if ($action == 'create_updater' && !empty($save)) {
-        //Verify if process() works
-        $res = $price_updaters->process();
-        if ($res > 0) {
-            $res = $price_updaters->create($user);
-        }
-        if ($res > 0) {
-            $action = '';
-        } else {
-            setEventMessages($price_updaters->error, $price_updaters->errors, 'errors');
-        }
-    } elseif ($action == 'edit_updater' && !empty($save)) {
-        //Verify if process() works
-        $res = $price_updaters->process();
-        if ($res > 0) {
-            $res = $price_updaters->update($user);
-        }
-        if ($res > 0) {
-            $action = '';
-        } else {
-            setEventMessages($price_updaters->error, $price_updaters->errors, 'errors');
-        }
-    } elseif ($action == 'delete_updater') {
-        $res = $price_updaters->delete($selection, $user);
-        if ($res > 0) {
-            $action = '';
-        } else {
-            setEventMessages($price_updaters->error, $price_updaters->errors, 'errors');
-        }
-    }
+	//Updaters actions
+	if ($action == 'create_updater' || $action == 'edit_updater') {
+		$price_updaters->type = GETPOSTISSET('type') ? GETPOST('type', 'int') : $price_updaters->type;
+		$price_updaters->description = GETPOSTISSET('description') ? GETPOST('description', 'restricthtml') : $price_updaters->description;
+		$price_updaters->parameters = GETPOSTISSET('parameters') ? GETPOST('parameters', 'alphanohtml') : $price_updaters->parameters;
+		$price_updaters->fk_variable = GETPOSTISSET('fk_variable') ? GETPOST('fk_variable', 'int') : $price_updaters->fk_variable;
+		$price_updaters->update_interval = GETPOSTISSET('update_interval') ? GETPOST('update_interval', 'int') : $price_updaters->update_interval;
+	}
+	if ($action == 'create_updater' && !empty($save)) {
+		//Verify if process() works
+		$res = $price_updaters->process();
+		if ($res > 0) {
+			$res = $price_updaters->create($user);
+		}
+		if ($res > 0) {
+			$action = '';
+		} else {
+			setEventMessages($price_updaters->error, $price_updaters->errors, 'errors');
+		}
+	} elseif ($action == 'edit_updater' && !empty($save)) {
+		//Verify if process() works
+		$res = $price_updaters->process();
+		if ($res > 0) {
+			$res = $price_updaters->update($user);
+		}
+		if ($res > 0) {
+			$action = '';
+		} else {
+			setEventMessages($price_updaters->error, $price_updaters->errors, 'errors');
+		}
+	} elseif ($action == 'delete_updater') {
+		$res = $price_updaters->delete($selection, $user);
+		if ($res > 0) {
+			$action = '';
+		} else {
+			setEventMessages($price_updaters->error, $price_updaters->errors, 'errors');
+		}
+	}
 } elseif (!empty($cancel)) {
-    $action = '';
+	$action = '';
 }
 
 
@@ -159,171 +159,171 @@ print '<br>';
 //Global variables table
 if ($action != 'create_updater' && $action != 'edit_updater')
 {
-    print load_fiche_titre($langs->trans("GlobalVariables"), '', '');
+	print load_fiche_titre($langs->trans("GlobalVariables"), '', '');
 
-    print '<table summary="listofattributes" class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td>'.$langs->trans("Variable").'</td>';
-    print '<td>'.$langs->trans("Description").'</td>';
-    print '<td>'.$langs->trans("Value").'</td>';
-    print '<td width="80">&nbsp;</td>'; //Space for buttons
-    print '</tr>';
+	print '<table summary="listofattributes" class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("Variable").'</td>';
+	print '<td>'.$langs->trans("Description").'</td>';
+	print '<td>'.$langs->trans("Value").'</td>';
+	print '<td width="80">&nbsp;</td>'; //Space for buttons
+	print '</tr>';
 
-    $arrayglobalvars = $price_globals->listGlobalVariables();
-    if (!empty($arrayglobalvars))
-    {
-	    foreach ($arrayglobalvars as $i=>$entry) {
-	        $var = !$var;
-	        print '<tr class="oddeven">';
-	        print '<td>'.$entry->code.'</td>';
-	        print '<td>'.$entry->description.'</td>';
-	        print '<td>'.price($entry->value).'</td>';
-	        print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit_variable&token='.newToken().'&selection='.$entry->id.'">'.img_edit().'</a> &nbsp;';
-	        print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_variable&token='.newToken().'&selection='.$entry->id.'">'.img_delete().'</a></td>';
-	        print '</tr>';
-	    }
-    } else {
-    	print '<tr colspan="7"><td class="opacitymedium">';
-    	print $langs->trans("None");
-    	print '</td></tr>';
-    }
-    print '</table>';
+	$arrayglobalvars = $price_globals->listGlobalVariables();
+	if (!empty($arrayglobalvars))
+	{
+		foreach ($arrayglobalvars as $i=>$entry) {
+			$var = !$var;
+			print '<tr class="oddeven">';
+			print '<td>'.$entry->code.'</td>';
+			print '<td>'.$entry->description.'</td>';
+			print '<td>'.price($entry->value).'</td>';
+			print '<td class="right"><a class="editfielda paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=edit_variable&token='.newToken().'&selection='.$entry->id.'">'.img_edit().'</a> &nbsp;';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_variable&token='.newToken().'&selection='.$entry->id.'">'.img_delete().'</a></td>';
+			print '</tr>';
+		}
+	} else {
+		print '<tr colspan="7"><td class="opacitymedium">';
+		print $langs->trans("None");
+		print '</td></tr>';
+	}
+	print '</table>';
 
-    if (empty($action))
-    {
-        //Action Buttons
-        print '<div class="tabsAction">';
-        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create_variable">'.$langs->trans("AddVariable").'</a>';
-        print '</div>';
-        //Separator is only need for updaters table is showed after buttons
-        print '<br><br>';
-    }
+	if (empty($action))
+	{
+		//Action Buttons
+		print '<div class="tabsAction">';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create_variable">'.$langs->trans("AddVariable").'</a>';
+		print '</div>';
+		//Separator is only need for updaters table is showed after buttons
+		print '<br><br>';
+	}
 }
 
 //Global variable editor
 if ($action == 'create_variable' || $action == 'edit_variable') {
-    //Form
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="'.$action.'">';
-    print '<input type="hidden" name="selection" value="'.$selection.'">';
+	//Form
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="'.$action.'">';
+	print '<input type="hidden" name="selection" value="'.$selection.'">';
 
-    //Table
-    print '<br><table summary="listofattributes" class="border centpercent">';
-    //Code
-    print '<tr>';
-    print '<td class="fieldrequired">'.$langs->trans("Variable").'</td>';
-    print '<td class="valeur"><input type="text" name="code" size="20" value="'.(empty($price_globals->code) ? '' : $price_globals->code).'"></td>';
-    print '</tr>';
-    //Description
-    print '<tr>';
-    print '<td>'.$langs->trans("Description").'</td>';
-    print '<td class="valeur"><input type="text" name="description" size="50" value="'.(empty($price_globals->description) ? '' : $price_globals->description).'"></td>';
-    print '</tr>';
-    //Value
-    print '<tr>';
-    print '<td class="fieldrequired">'.$langs->trans("Value").'</td>';
-    print '<td class="valeur"><input type="text" name="value" size="10" value="'.(empty($price_globals->value) ? '' : $price_globals->value).'"></td>';
-    print '</tr>';
-    print '</table>';
+	//Table
+	print '<br><table summary="listofattributes" class="border centpercent">';
+	//Code
+	print '<tr>';
+	print '<td class="fieldrequired">'.$langs->trans("Variable").'</td>';
+	print '<td class="valeur"><input type="text" name="code" size="20" value="'.(empty($price_globals->code) ? '' : $price_globals->code).'"></td>';
+	print '</tr>';
+	//Description
+	print '<tr>';
+	print '<td>'.$langs->trans("Description").'</td>';
+	print '<td class="valeur"><input type="text" name="description" size="50" value="'.(empty($price_globals->description) ? '' : $price_globals->description).'"></td>';
+	print '</tr>';
+	//Value
+	print '<tr>';
+	print '<td class="fieldrequired">'.$langs->trans("Value").'</td>';
+	print '<td class="valeur"><input type="text" name="value" size="10" value="'.(empty($price_globals->value) ? '' : $price_globals->value).'"></td>';
+	print '</tr>';
+	print '</table>';
 
-    //Form Buttons
-    print '<br><div class="center">';
-    print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"> &nbsp;';
-    print '<input type="submit" class="button" name="cancel" id="cancel" value="'.$langs->trans("Cancel").'">';
-    print '</div>';
-    print '</form>';
+	//Form Buttons
+	print '<br><div class="center">';
+	print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'"> &nbsp;';
+	print '<input type="submit" class="button button-cancel" name="cancel" id="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
+	print '</form>';
 }
 
 // Updaters table
 if ($action != 'create_variable' && $action != 'edit_variable')
 {
-    print load_fiche_titre($langs->trans("GlobalVariableUpdaters"), '', '');
+	print load_fiche_titre($langs->trans("GlobalVariableUpdaters"), '', '');
 
-    print '<table summary="listofattributes" class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td>'.$langs->trans("VariableToUpdate").'</td>';
-    print '<td>'.$langs->trans("Description").'</td>';
-    print '<td>'.$langs->trans("Type").'</td>';
-    print '<td>'.$langs->trans("Parameters").'</td>';
-    print '<td>'.$langs->trans("UpdateInterval").'</td>';
-    print '<td>'.$langs->trans("LastUpdated").'</td>';
-    print '<td width="80">&nbsp;</td>'; //Space for buttons
-    print '</tr>';
+	print '<table summary="listofattributes" class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("VariableToUpdate").'</td>';
+	print '<td>'.$langs->trans("Description").'</td>';
+	print '<td>'.$langs->trans("Type").'</td>';
+	print '<td>'.$langs->trans("Parameters").'</td>';
+	print '<td>'.$langs->trans("UpdateInterval").'</td>';
+	print '<td>'.$langs->trans("LastUpdated").'</td>';
+	print '<td width="80">&nbsp;</td>'; //Space for buttons
+	print '</tr>';
 
-    $arraypriceupdaters = $price_updaters->listUpdaters();
-    if (!empty($arraypriceupdaters))
-    {
-	    foreach ($arraypriceupdaters as $i=>$entry) {
-	        $code = "";
-	        if ($entry->fk_variable > 0) {
-	            $res = $price_globals->fetch($entry->fk_variable);
-	            if ($res > 0) {
-	                $code = $price_globals->code;
-	            }
-	        }
-	        print '<tr>';
-	        print '<td>'.$code.'</td>';
-	        print '<td>'.$entry->description.'</td>';
-	        print '<td>'.$langs->trans("GlobalVariableUpdaterType".$entry->type).'</td>';
-	        print '<td style="max-width: 250px; word-wrap: break-word; white-space: pre-wrap;">'.$entry->parameters.'</td>';
-	        print '<td>'.$entry->update_interval.'</td>';
-	        print '<td>'.$entry->getLastUpdated().'</td>';
-	        print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit_updater&selection='.$entry->id.'">'.img_edit().'</a> &nbsp;';
-	        print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_updater&token='.newToken().'&selection='.$entry->id.'">'.img_delete().'</a></td>';
-	        print '</tr>';
-	    }
-    } else {
-    	print '<tr><td colspan="7" class="opacitymedium">';
-    	print $langs->trans("None");
-    	print '</td></tr>';
-    }
-    print '</table>';
+	$arraypriceupdaters = $price_updaters->listUpdaters();
+	if (!empty($arraypriceupdaters))
+	{
+		foreach ($arraypriceupdaters as $i=>$entry) {
+			$code = "";
+			if ($entry->fk_variable > 0) {
+				$res = $price_globals->fetch($entry->fk_variable);
+				if ($res > 0) {
+					$code = $price_globals->code;
+				}
+			}
+			print '<tr>';
+			print '<td>'.$code.'</td>';
+			print '<td>'.$entry->description.'</td>';
+			print '<td>'.$langs->trans("GlobalVariableUpdaterType".$entry->type).'</td>';
+			print '<td style="max-width: 250px; word-wrap: break-word; white-space: pre-wrap;">'.$entry->parameters.'</td>';
+			print '<td>'.$entry->update_interval.'</td>';
+			print '<td>'.$entry->getLastUpdated().'</td>';
+			print '<td class="right"><a class="editfielda paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=edit_updater&selection='.$entry->id.'">'.img_edit().'</a> &nbsp;';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_updater&token='.newToken().'&selection='.$entry->id.'">'.img_delete().'</a></td>';
+			print '</tr>';
+		}
+	} else {
+		print '<tr><td colspan="7" class="opacitymedium">';
+		print $langs->trans("None");
+		print '</td></tr>';
+	}
+	print '</table>';
 
-    if (empty($action))
-    {
-        //Action Buttons
-        print '<div class="tabsAction">';
-        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create_updater&token='.newToken().'">'.$langs->trans("AddUpdater").'</a>';
-        print '</div>';
-    }
+	if (empty($action))
+	{
+		//Action Buttons
+		print '<div class="tabsAction">';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create_updater&token='.newToken().'">'.$langs->trans("AddUpdater").'</a>';
+		print '</div>';
+	}
 }
 
 //Updater editor
 if ($action == 'create_updater' || $action == 'edit_updater') {
-    //Form
-    print '<form id="updaterform" action="'.$_SERVER["PHP_SELF"].'" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="'.$action.'">';
-    print '<input type="hidden" name="selection" value="'.$selection.'">';
+	//Form
+	print '<form id="updaterform" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="'.$action.'">';
+	print '<input type="hidden" name="selection" value="'.$selection.'">';
 
-    //Table
-    print '<br><table summary="listofattributes" class="border centpercent">';
-    //Code
-    print '<tr>';
-    print '<td class="fieldrequired">'.$langs->trans("VariableToUpdate").'</td><td>';
-    $globals_list = array();
-    foreach ($price_globals->listGlobalVariables() as $entry) {
-        $globals_list[$entry->id] = $entry->code;
-    }
-    print $form->selectarray('fk_variable', $globals_list, (empty($price_updaters->fk_variable) ? 0 : $price_updaters->fk_variable));
-    print '</td></tr>';
-    //Description
-    print '<tr>';
-    print '<td>'.$langs->trans("Description").'</td>';
-    print '<td class="valeur"><input type="text" name="description" size="50" value="'.(empty($price_updaters->description) ? '' : $price_updaters->description).'"></td>';
-    print '</tr>';
-    //Type
-    print '<tr>';
-    print '<td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
-    $type = empty($price_updaters->type) ? 0 : $price_updaters->type;
-    $type_list = array();
-    foreach ($price_updaters->types as $val) {
-        $type_list[$val] = $langs->trans("GlobalVariableUpdaterType".$val);
-    }
-    print $form->selectarray('type', $type_list, $type);
-    // This code submits form when type is changed
-    print '<script type="text/javascript">
+	//Table
+	print '<br><table summary="listofattributes" class="border centpercent">';
+	//Code
+	print '<tr>';
+	print '<td class="fieldrequired">'.$langs->trans("VariableToUpdate").'</td><td>';
+	$globals_list = array();
+	foreach ($price_globals->listGlobalVariables() as $entry) {
+		$globals_list[$entry->id] = $entry->code;
+	}
+	print $form->selectarray('fk_variable', $globals_list, (empty($price_updaters->fk_variable) ? 0 : $price_updaters->fk_variable));
+	print '</td></tr>';
+	//Description
+	print '<tr>';
+	print '<td>'.$langs->trans("Description").'</td>';
+	print '<td class="valeur"><input type="text" name="description" size="50" value="'.(empty($price_updaters->description) ? '' : $price_updaters->description).'"></td>';
+	print '</tr>';
+	//Type
+	print '<tr>';
+	print '<td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
+	$type = empty($price_updaters->type) ? 0 : $price_updaters->type;
+	$type_list = array();
+	foreach ($price_updaters->types as $val) {
+		$type_list[$val] = $langs->trans("GlobalVariableUpdaterType".$val);
+	}
+	print $form->selectarray('type', $type_list, $type);
+	// This code submits form when type is changed
+	print '<script type="text/javascript">
         jQuery(document).ready(run);
         function run() {
             jQuery("#type").change(on_change);
@@ -332,29 +332,29 @@ if ($action == 'create_updater' || $action == 'edit_updater') {
             jQuery("#updaterform").submit();
         }
     </script>';
-    print '</td></tr>';
-    //Parameters
-    print '<tr>';
-    $help = $langs->trans("GlobalVariableUpdaterHelp".$type).'<br><b>'.$langs->trans("GlobalVariableUpdaterHelpFormat".$type).'</b>';
-    print '<td class="fieldrequired">'.$form->textwithpicto($langs->trans("Parameters"), $help, 1).'</td><td>';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor = new DolEditor('parameters', empty($price_updaters->parameters) ? '' : $price_updaters->parameters, '', 300, '', '', false, false, false, ROWS_8, '90%');
-    $doleditor->Create();
-    print '</td></tr>';
-    print '</tr>';
-    //Interval
-    print '<tr>';
-    print '<td class="fieldrequired">'.$langs->trans("UpdateInterval").'</td>';
-    print '<td class="valeur"><input type="text" name="update_interval" size="10" value="'.(empty($price_updaters->update_interval) ? '' : $price_updaters->update_interval).'"></td>';
-    print '</tr>';
-    print '</table>';
+	print '</td></tr>';
+	//Parameters
+	print '<tr>';
+	$help = $langs->trans("GlobalVariableUpdaterHelp".$type).'<br><b>'.$langs->trans("GlobalVariableUpdaterHelpFormat".$type).'</b>';
+	print '<td class="fieldrequired">'.$form->textwithpicto($langs->trans("Parameters"), $help, 1).'</td><td>';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	$doleditor = new DolEditor('parameters', empty($price_updaters->parameters) ? '' : $price_updaters->parameters, '', 300, '', '', false, false, false, ROWS_8, '90%');
+	$doleditor->Create();
+	print '</td></tr>';
+	print '</tr>';
+	//Interval
+	print '<tr>';
+	print '<td class="fieldrequired">'.$langs->trans("UpdateInterval").'</td>';
+	print '<td class="valeur"><input type="text" name="update_interval" size="10" value="'.(empty($price_updaters->update_interval) ? '' : $price_updaters->update_interval).'"></td>';
+	print '</tr>';
+	print '</table>';
 
-    //Form Buttons
-    print '<br><div class="center">';
-    print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"> &nbsp;';
-    print '<input type="submit" class="button" name="cancel" id="cancel" value="'.$langs->trans("Cancel").'">';
-    print '</div>';
-    print '</form>';
+	//Form Buttons
+	print '<br><div class="center">';
+	print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'"> &nbsp;';
+	print '<input type="submit" class="button button-cancel" name="cancel" id="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
+	print '</form>';
 }
 
 // End of page
diff --git a/htdocs/product/admin/price_rules.php b/htdocs/product/admin/price_rules.php
index 64bf5702996..a38245d32c7 100644
--- a/htdocs/product/admin/price_rules.php
+++ b/htdocs/product/admin/price_rules.php
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
- * Page to set how to autocalculate price for each level when option
- * PRODUCT_MULTIPRICE is on.
+ * Page to set how to autocalculate price for each level when option PRODUCT_MULTIPRICE is on.
+ * This page is a tab in the setup of module Product if option PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL is set.
  */
 
 require '../../main.inc.php';
@@ -26,15 +26,20 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'products'));
 
+$action = GETPOST('action', 'aZ09');
+
 // Security check
 if (!$user->admin || (empty($conf->product->enabled) && empty($conf->service->enabled)))
 	accessforbidden();
 
+$error = 0;
+
+
 /**
  * Actions
  */
 
-if ($_POST) {
+if ($action == 'update') {
 	$var_percent = GETPOST('var_percent', 'array');
 	$var_min_percent = GETPOST('var_min_percent', 'array');
 	$fk_level = GETPOST('fk_level', 'array');
@@ -52,6 +57,7 @@ if ($_POST) {
 
 		$i_var_percent = 0;
 
+		// Set $i_var_percent, the percent of price for level compared to an other level
 		if ($i != 1) {
 			$i_var_percent = (float) price2num($var_percent[$i]);
 		}
@@ -64,35 +70,36 @@ if ($_POST) {
 			$check2 = $i_var_min_percent;
 		} else {
 			$check1 = $i_fk_level >= 1 && $i_fk_level <= $conf->global->PRODUIT_MULTIPRICES_LIMIT;
-			$check2 = $i_var_percent && $i_var_min_percent;
+			$check2 = $i_var_percent && ($i_var_min_percent || (string) $i_var_min_percent === '0');
 		}
 
-		if (!$check1 || !$check2) {
+		if (empty($i_var_percent) && empty($i_var_min_percent)) {
 			//If the level is between range but percent fields are empty, then we ensure it does not exist in DB
-			if ($check1) {
-				$db->query("DELETE FROM ".MAIN_DB_PREFIX."product_pricerules WHERE level = ".(int) $i);
-			}
-
+			$db->query("DELETE FROM ".MAIN_DB_PREFIX."product_pricerules WHERE level = ".((int) $i));
 			continue;
 		}
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_pricerules (level, fk_level, var_percent, var_min_percent) VALUES (
-		".(int) $i.", ".$db->escape($i_fk_level).", ".$i_var_percent.", ".$i_var_min_percent.")";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_pricerules (level, fk_level, var_percent, var_min_percent) VALUES (";
+		$sql .= ((int) $i).", ".$db->escape($i_fk_level).", ".$i_var_percent.", ".$i_var_min_percent.")";
 
 		if (!$db->query($sql)) {
 			//If we could not create, then we try updating
-			$sql = "UPDATE ".MAIN_DB_PREFIX."product_pricerules
-			SET fk_level = ".$db->escape($i_fk_level).", var_percent = ".$i_var_percent.", var_min_percent = ".$i_var_min_percent." WHERE level = ".$i;
+			$sql = "UPDATE ".MAIN_DB_PREFIX."product_pricerules";
+			$sql .= " SET fk_level = ".$db->escape($i_fk_level).", var_percent = ".$i_var_percent.", var_min_percent = ".$i_var_min_percent." WHERE level = ".$i;
 
 			if (!$db->query($sql)) {
 				setEventMessages($langs->trans('ErrorSavingChanges'), null, 'errors');
+				$error++;
 			}
 		}
 	}
 
-	setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+	if (!$error) {
+		setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+	}
 }
 
+
 /*
  * View
  */
@@ -124,36 +131,24 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_valu
 print load_fiche_titre($title, $linkback, 'title_setup');
 
 
-
-print '<form method="POST">';
+print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update">';
 
 $head = product_admin_prepare_head();
-dol_fiche_head($head, 'generator', $tab, 0, 'product');
+print dol_get_fiche_head($head, 'generator', $tab, -1, 'product');
 
-print $langs->trans("MultiPriceRuleDesc").'<br><br>';
+print '<span class="opacitymedium">'.$langs->trans("MultiPriceRuleDesc").'</span><br><br>';
 
-print load_fiche_titre($langs->trans('MultipriceRules'), '', '');
-
-//Array that contains the number of prices available
+// Array that contains the number of prices available
 $price_options = array();
 
 for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
 	$price_options[$i] = $langs->trans('SellingPrice').' '.$i;
 }
-
-$genPriceOptions = function ($level) use ($price_options) {
-
-	$return = array();
-
-	for ($i = 1; $i < $level; $i++) {
-		$return[$i] = $price_options[$i];
-	}
-
-	return $return;
-};
 ?>
 
-	<table class="noborder">
+	<table class="noborder centpercent">
 		<tr class="liste_titre">
 			<td style="text-align: center"><?php echo $langs->trans('PriceLevel') ?></td>
 			<td style="text-align: center"><?php echo $langs->trans('Price') ?></td>
@@ -176,7 +171,15 @@ $genPriceOptions = function ($level) use ($price_options) {
 					</td>
 				<td style="text-align: center">
 					<input type="text" style="text-align: right" name="var_percent[<?php echo $i ?>]" size="5" value="<?php echo price(isset($rules[$i]) ? $rules[$i]->var_percent : 0, 2) ?>">
-					<?php echo $langs->trans('PercentVariationOver', Form::selectarray("fk_level[$i]", $genPriceOptions($i), (isset($rules[$i]) ? $rules[$i]->fk_level : null))) ?>
+					<?php
+					$return = array();
+					for ($j = 1; $j < $i; $j++) {
+						$return[$j] = $price_options[$j];
+					}
+					$texttoshow = $langs->trans('PercentVariationOver', '{s1}');
+					$texttoshow = str_replace('{s1}', Form::selectarray("fk_level[$i]", $return, (isset($rules[$i]) ? $rules[$i]->fk_level : null)), $texttoshow);
+					print $texttoshow;
+					?>
 				</td>
 				<td style="text-align: center">
 					<input type="text" style="text-align: right" name="var_min_percent[<?php echo $i ?>]" size="5" value="<?php echo price(isset($rules[$i]) ? $rules[$i]->var_min_percent : 0, 2) ?>">
@@ -188,10 +191,10 @@ $genPriceOptions = function ($level) use ($price_options) {
 
 <?php
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div style="text-align: center">
-		<input type="submit" value="'.$langs->trans('Save').'" class="button">
+		<input type="submit" value="'.$langs->trans("Save").'" class="button button-save">
 	</div>';
 
 print '</form>';
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 09418b5e896..16c3c849ce6 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -146,13 +146,13 @@ if ($action == 'other')
 	$res = dolibarr_set_const($db, "PRODUIT_FOURN_TEXTS", $value, 'chaine', 0, '', $conf->entity);
 
 	if ($value) {
-	    $sql_test = "SELECT count(desc_fourn) as cpt FROM ".MAIN_DB_PREFIX."product_fournisseur_price WHERE 1";
-	    $resql = $db->query($sql_test);
-	    if (!$resql && $db->lasterrno == 'DB_ERROR_NOSUCHFIELD') // if the field does not exist, we create it
-	    {
-	        $sql_new = "ALTER TABLE ".MAIN_DB_PREFIX."product_fournisseur_price ADD COLUMN desc_fourn text";
-	        $resql_new = $db->query($sql_new);
-	    }
+		$sql_test = "SELECT count(desc_fourn) as cpt FROM ".MAIN_DB_PREFIX."product_fournisseur_price WHERE 1";
+		$resql = $db->query($sql_test);
+		if (!$resql && $db->lasterrno == 'DB_ERROR_NOSUCHFIELD') // if the field does not exist, we create it
+		{
+			$sql_new = "ALTER TABLE ".MAIN_DB_PREFIX."product_fournisseur_price ADD COLUMN desc_fourn text";
+			$resql_new = $db->query($sql_new);
+		}
 	}
 
 	$value = GETPOST('activate_useProdSupplierPackaging', 'alpha');
@@ -180,7 +180,7 @@ if ($action == 'specimen') // For products
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir)
 	{
-	    $file = dol_buildpath($reldir."core/modules/product/doc/pdf_".$modele.".modules.php", 0);
+		$file = dol_buildpath($reldir."core/modules/product/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file))
 		{
 			$filefound = 1;
@@ -261,12 +261,12 @@ if ($action == 'set')
 
 if ($action)
 {
-    if (!$error)
-    {
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-	    setEventMessages($langs->trans("SetupNotError"), null, 'errors');
-    }
+	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("SetupNotError"), null, 'errors');
+	}
 }
 
 /*
@@ -293,7 +293,7 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_valu
 print load_fiche_titre($title, $linkback, 'title_setup');
 
 $head = product_admin_prepare_head();
-dol_fiche_head($head, 'general', $tab, -1, 'product');
+print dol_get_fiche_head($head, 'general', $tab, -1, 'product');
 
 $form = new Form($db);
 
@@ -317,60 +317,60 @@ foreach ($dirproduct as $dirroot)
 {
 	$dir = dol_buildpath($dirroot, 0);
 
-    $handle = @opendir($dir);
-    if (is_resource($handle))
-    {
-    	// Loop on each module find in opened directory
-    	while (($file = readdir($handle)) !== false)
-    	{
-    		if (substr($file, 0, 16) == 'mod_codeproduct_' && substr($file, -3) == 'php')
-    		{
-    			$file = substr($file, 0, dol_strlen($file) - 4);
+	$handle = @opendir($dir);
+	if (is_resource($handle))
+	{
+		// Loop on each module find in opened directory
+		while (($file = readdir($handle)) !== false)
+		{
+			if (substr($file, 0, 16) == 'mod_codeproduct_' && substr($file, -3) == 'php')
+			{
+				$file = substr($file, 0, dol_strlen($file) - 4);
 
-    			try {
-        			dol_include_once($dirroot.$file.'.php');
-    			} catch (Exception $e)
-    			{
-    			    dol_syslog($e->getMessage(), LOG_ERR);
-    			}
+				try {
+					dol_include_once($dirroot.$file.'.php');
+				} catch (Exception $e)
+				{
+					dol_syslog($e->getMessage(), LOG_ERR);
+				}
 
-    			$modCodeProduct = new $file;
+				$modCodeProduct = new $file;
 
-    			// Show modules according to features level
-    			if ($modCodeProduct->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-    			if ($modCodeProduct->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+				// Show modules according to features level
+				if ($modCodeProduct->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+				if ($modCodeProduct->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-    			$var = !$var;
-    			print '<tr class="oddeven">'."\n";
-    			print '<td width="140">'.$modCodeProduct->name.'</td>'."\n";
-    			print '<td>'.$modCodeProduct->info($langs).'</td>'."\n";
-    			print '<td class="nowrap">'.$modCodeProduct->getExample($langs).'</td>'."\n";
+				$var = !$var;
+				print '<tr class="oddeven">'."\n";
+				print '<td width="140">'.$modCodeProduct->name.'</td>'."\n";
+				print '<td>'.$modCodeProduct->info($langs).'</td>'."\n";
+				print '<td class="nowrap">'.$modCodeProduct->getExample($langs).'</td>'."\n";
 
-    			if (!empty($conf->global->PRODUCT_CODEPRODUCT_ADDON) && $conf->global->PRODUCT_CODEPRODUCT_ADDON == $file)
-    			{
-    				print '<td class="center">'."\n";
-    				print img_picto($langs->trans("Activated"), 'switch_on');
-    				print "</td>\n";
-    			} else {
-    				$disabled = false;
-    				if (!empty($conf->multicompany->enabled) && (is_object($mc) && !empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true);
-    				print '<td class="center">';
-    				if (!$disabled) print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodeproduct&token='.newToken().'&value='.$file.'">';
-    				print img_picto($langs->trans("Disabled"), 'switch_off');
-    				if (!$disabled) print '</a>';
-    				print '</td>';
-    			}
+				if (!empty($conf->global->PRODUCT_CODEPRODUCT_ADDON) && $conf->global->PRODUCT_CODEPRODUCT_ADDON == $file)
+				{
+					print '<td class="center">'."\n";
+					print img_picto($langs->trans("Activated"), 'switch_on');
+					print "</td>\n";
+				} else {
+					$disabled = false;
+					if (!empty($conf->multicompany->enabled) && (is_object($mc) && !empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true);
+					print '<td class="center">';
+					if (!$disabled) print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodeproduct&token='.newToken().'&value='.$file.'">';
+					print img_picto($langs->trans("Disabled"), 'switch_off');
+					if (!$disabled) print '</a>';
+					print '</td>';
+				}
 
-    			print '<td class="center">';
-    			$s = $modCodeProduct->getToolTip($langs, null, -1);
-    			print $form->textwithpicto('', $s, 1);
-    			print '</td>';
+				print '<td class="center">';
+				$s = $modCodeProduct->getToolTip($langs, null, -1);
+				print $form->textwithpicto('', $s, 1);
+				print '</td>';
 
-    			print '</tr>';
-    		}
-    	}
-    	closedir($handle);
-    }
+				print '</tr>';
+			}
+		}
+		closedir($handle);
+	}
 }
 print '</table>';
 
@@ -413,104 +413,104 @@ clearstatcache();
 
 foreach ($dirmodels as $reldir)
 {
-    foreach (array('', '/doc') as $valdir)
-    {
-    	$dir = dol_buildpath($reldir."core/modules/product".$valdir);
-        if (is_dir($dir))
-        {
-            $handle = opendir($dir);
-            if (is_resource($handle))
-            {
-                while (($file = readdir($handle)) !== false)
-                {
-                    $filelist[] = $file;
-                }
-                closedir($handle);
-                arsort($filelist);
+	foreach (array('', '/doc') as $valdir)
+	{
+		$dir = dol_buildpath($reldir."core/modules/product".$valdir);
+		if (is_dir($dir))
+		{
+			$handle = opendir($dir);
+			if (is_resource($handle))
+			{
+				while (($file = readdir($handle)) !== false)
+				{
+					$filelist[] = $file;
+				}
+				closedir($handle);
+				arsort($filelist);
 
-                foreach ($filelist as $file)
-                {
-                    if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-                    {
-                    	if (file_exists($dir.'/'.$file))
-                    	{
-                    		$name = substr($file, 4, dol_strlen($file) - 16);
-	                        $classname = substr($file, 0, dol_strlen($file) - 12);
+				foreach ($filelist as $file)
+				{
+					if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
+					{
+						if (file_exists($dir.'/'.$file))
+						{
+							$name = substr($file, 4, dol_strlen($file) - 16);
+							$classname = substr($file, 0, dol_strlen($file) - 12);
 
-	                        require_once $dir.'/'.$file;
-	                        $module = new $classname($db);
+							require_once $dir.'/'.$file;
+							$module = new $classname($db);
 
-	                        $modulequalified = 1;
-	                        if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
-	                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+							$modulequalified = 1;
+							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
+							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
 
-	                        if ($modulequalified)
-	                        {
-	                            print '<tr class="oddeven"><td width="100">';
-	                            print (empty($module->name) ? $name : $module->name);
-	                            print "</td><td>\n";
-	                            if (method_exists($module, 'info')) print $module->info($langs);
-	                            else print $module->description;
-	                            print '</td>';
+							if ($modulequalified)
+							{
+								print '<tr class="oddeven"><td width="100">';
+								print (empty($module->name) ? $name : $module->name);
+								print "</td><td>\n";
+								if (method_exists($module, 'info')) print $module->info($langs);
+								else print $module->description;
+								print '</td>';
 
-	                            // Active
-	                            if (in_array($name, $def))
-	                            {
-	                            	print '<td class="center">'."\n";
-	                            	print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'">';
-	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
-	                            	print '</a>';
-	                            	print '</td>';
-	                            } else {
-	                                print '<td class="center">'."\n";
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-	                                print "</td>";
-	                            }
+								// Active
+								if (in_array($name, $def))
+								{
+									print '<td class="center">'."\n";
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'">';
+									print img_picto($langs->trans("Enabled"), 'switch_on');
+									print '</a>';
+									print '</td>';
+								} else {
+									print '<td class="center">'."\n";
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print "</td>";
+								}
 
-	                            // Defaut
-	                            print '<td class="center">';
-	                            if ($conf->global->PRODUCT_ADDON_PDF == $name)
-	                            {
-	                                print img_picto($langs->trans("Default"), 'on');
-	                            } else {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	                            }
-	                            print '</td>';
+								// Defaut
+								print '<td class="center">';
+								if ($conf->global->PRODUCT_ADDON_PDF == $name)
+								{
+									print img_picto($langs->trans("Default"), 'on');
+								} else {
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+								}
+								print '</td>';
 
 								// Info
-		    					$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
-					    		$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-			                    if ($module->type == 'pdf')
-			                    {
-			                        $htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-			                    }
-					    		$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-					    		$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
-					    		$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
+								$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+								$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+								if ($module->type == 'pdf')
+								{
+									$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+								}
+								$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+								$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+								$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
 
 
-	                            print '<td class="center">';
-	                            print $form->textwithpicto('', $htmltooltip, 1, 0);
-	                            print '</td>';
+								print '<td class="center">';
+								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print '</td>';
 
-	                            // Preview
-	                            print '<td class="center">';
-	                            if ($module->type == 'pdf')
-	                            {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
-	                            } else {
-	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
-	                            }
-	                            print '</td>';
+								// Preview
+								print '<td class="center">';
+								if ($module->type == 'pdf')
+								{
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
+								} else {
+									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+								}
+								print '</td>';
 
-	                            print "</tr>\n";
-	                        }
-                    	}
-                    }
-                }
-            }
-        }
-    }
+								print "</tr>\n";
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 }
 
 print '</table>';
@@ -545,7 +545,7 @@ $rowspan = 4;
 if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $rowspan++;
 if (empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) $rowspan++;
 if (!empty($conf->global->MAIN_MULTILANGS)) $rowspan++;
-if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || ! empty($conf->supplier_order->enabled) || ! empty($conf->supplier_invoice->enabled)) $rowspan++;
+if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) $rowspan++;
 
 
 print '<tr class="oddeven">';
@@ -606,8 +606,8 @@ if (empty($conf->use_javascript_ajax))
 	$arrval = array(
 		'0'=>$langs->trans("No"),
 		'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
-	    '2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',
-	    '3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',
+		'2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',
+		'3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',
 	);
 	print $form->selectarray("activate_usesearchtoselectproduct", $arrval, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT);
 	print '</td>';
@@ -663,14 +663,14 @@ if (!empty($conf->global->MAIN_MULTILANGS))
 	print '</tr>';
 }
 
-if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || ! empty($conf->supplier_order->enabled) || ! empty($conf->supplier_invoice->enabled))
+if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
 {
-    print '<tr class="oddeven">';
-    print '<td>'.$langs->trans("UseProductFournDesc").'</td>';
-    print '<td class="right">';
-    print $form->selectyesno("activate_useProdFournDesc", (!empty($conf->global->PRODUIT_FOURN_TEXTS) ? $conf->global->PRODUIT_FOURN_TEXTS : 0), 1);
-    print '</td>';
-    print '</tr>';
+	print '<tr class="oddeven">';
+	print '<td>'.$langs->trans("UseProductFournDesc").'</td>';
+	print '<td class="right">';
+	print $form->selectyesno("activate_useProdFournDesc", (!empty($conf->global->PRODUIT_FOURN_TEXTS) ? $conf->global->PRODUIT_FOURN_TEXTS : 0), 1);
+	print '</td>';
+	print '</tr>';
 
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("UseProductSupplierPackaging").'</td>';
@@ -696,46 +696,46 @@ if (!empty($conf->global->PRODUCT_CANVAS_ABILITY))
 		require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
 		$handle = opendir($dir);
-        if (is_resource($handle))
-        {
-    		while (($file = readdir($handle)) !== false)
-    		{
-    			if (file_exists($dir.$file.'/product.'.$file.'.class.php'))
-    			{
-    				$classfile = $dir.$file.'/product.'.$file.'.class.php';
-    				$classname = 'Product'.ucfirst($file);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (file_exists($dir.$file.'/product.'.$file.'.class.php'))
+				{
+					$classfile = $dir.$file.'/product.'.$file.'.class.php';
+					$classname = 'Product'.ucfirst($file);
 
-    				require_once $classfile;
-    				$object = new $classname();
+					require_once $classfile;
+					$object = new $classname();
 
-    				$module = $object->module;
+					$module = $object->module;
 
-    				if ($conf->$module->enabled)
-    				{
-    					print '<tr class="oddeven"><td>';
+					if ($conf->$module->enabled)
+					{
+						print '<tr class="oddeven"><td>';
 
-    					print $object->description;
+						print $object->description;
 
-    					print '</td><td class="right">';
+						print '</td><td class="right">';
 
-    					$const = "PRODUCT_SPECIAL_".strtoupper($file);
+						$const = "PRODUCT_SPECIAL_".strtoupper($file);
 
-    					if ($conf->global->$const)
-    					{
-    						print img_picto($langs->trans("Active"), 'tick');
-    						print '</td><td class="right">';
-    						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;spe='.urlencode($file).'&amp;value=0">'.$langs->trans("Disable").'</a>';
-    					} else {
-    						print '&nbsp;</td><td class="right">';
-    						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;spe='.urlencode($file).'&amp;value=1">'.$langs->trans("Activate").'</a>';
-    					}
+						if ($conf->global->$const)
+						{
+							print img_picto($langs->trans("Active"), 'tick');
+							print '</td><td class="right">';
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;spe='.urlencode($file).'&amp;value=0">'.$langs->trans("Disable").'</a>';
+						} else {
+							print '&nbsp;</td><td class="right">';
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;spe='.urlencode($file).'&amp;value=1">'.$langs->trans("Activate").'</a>';
+						}
 
-    					print '</td></tr>';
-    				}
-    			}
-    		}
-		    closedir($handle);
-        }
+						print '</td></tr>';
+					}
+				}
+			}
+			closedir($handle);
+		}
 	} else {
 		setEventMessages($dir.' '.$langs->trans("IsNotADir"), null, 'errors');
 	}
diff --git a/htdocs/product/admin/product_extrafields.php b/htdocs/product/admin/product_extrafields.php
index 59d6437578c..d82d175a9a7 100644
--- a/htdocs/product/admin/product_extrafields.php
+++ b/htdocs/product/admin/product_extrafields.php
@@ -82,19 +82,19 @@ print load_fiche_titre($title, $linkback, 'title_setup');
 
 $head = product_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $textobject, -1, 'product');
+print dol_get_fiche_head($head, 'attributes', $textobject, -1, 'product');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -109,7 +109,7 @@ if ($action == 'create')
 	print '<br><div id="newattrib"></div>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -119,10 +119,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && !empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/product/admin/product_lot_extrafields.php b/htdocs/product/admin/product_lot_extrafields.php
index e5e058927a1..e89e5741cce 100644
--- a/htdocs/product/admin/product_lot_extrafields.php
+++ b/htdocs/product/admin/product_lot_extrafields.php
@@ -73,19 +73,19 @@ print load_fiche_titre($title, $linkback, 'title_setup');
 
 $head = product_lot_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $textobject, -1, 'stock');
+print dol_get_fiche_head($head, 'attributes', $textobject, -1, 'stock');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -100,7 +100,7 @@ if ($action == 'create')
 	print '<br><div id="newattrib"></div>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -110,10 +110,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && !empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/product/admin/product_supplier_extrafields.php b/htdocs/product/admin/product_supplier_extrafields.php
index daaf3a9edfd..54d56ad9dd5 100644
--- a/htdocs/product/admin/product_supplier_extrafields.php
+++ b/htdocs/product/admin/product_supplier_extrafields.php
@@ -83,19 +83,19 @@ print load_fiche_titre($title, $linkback, 'title_setup');
 
 $head = product_admin_prepare_head();
 
-dol_fiche_head($head, 'supplierAttributes', $textobject, -1, 'product');
+print dol_get_fiche_head($head, 'supplierAttributes', $textobject, -1, 'product');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -110,7 +110,7 @@ if ($action == 'create')
 	print '<br><div id="newattrib"></div>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -120,10 +120,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && !empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php
index 592dd89baaa..3bf85bdff4f 100644
--- a/htdocs/product/admin/product_tools.php
+++ b/htdocs/product/admin/product_tools.php
@@ -168,7 +168,7 @@ if ($action == 'convert')
 						if ($ret < 0 || $retm < 0) $error++;
 						else $nbrecordsmodified++;
 					}
-                    unset($objectstatic);
+					unset($objectstatic);
 
 					$i++;
 				}
diff --git a/htdocs/product/admin/stock_extrafields.php b/htdocs/product/admin/stock_extrafields.php
index 4c9e1435c15..9b5a0f23f07 100644
--- a/htdocs/product/admin/stock_extrafields.php
+++ b/htdocs/product/admin/stock_extrafields.php
@@ -68,19 +68,19 @@ print load_fiche_titre($langs->trans("StockSetup"), $linkback, 'title_setup');
 
 $head = stock_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("StockSetup"), -1, 'stock');
+print dol_get_fiche_head($head, 'attributes', $langs->trans("StockSetup"), -1, 'stock');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a></div>';
-    print "</div>";
+	print '<div class="tabsAction">';
+	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a></div>';
+	print "</div>";
 }
 
 
@@ -92,10 +92,10 @@ if ($action != 'create' && $action != 'edit')
 
 if ($action == 'create')
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print "<br>";
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -105,10 +105,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && !empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/product/agenda.php b/htdocs/product/agenda.php
index acd698d9f37..8a7ddf385d9 100644
--- a/htdocs/product/agenda.php
+++ b/htdocs/product/agenda.php
@@ -38,10 +38,10 @@ $langs->load("companies");
 
 if (GETPOST('actioncode', 'array'))
 {
-    $actioncode = GETPOST('actioncode', 'array', 3);
-    if (!count($actioncode)) $actioncode = '0';
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) $actioncode = '0';
 } else {
-    $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
@@ -76,19 +76,19 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Cancel
-    if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-    {
-        header("Location: ".$backtopage);
-        exit;
-    }
+	// Cancel
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage))
+	{
+		header("Location: ".$backtopage);
+		exit;
+	}
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $actioncode = '';
-        $search_agenda_label = '';
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$actioncode = '';
+		$search_agenda_label = '';
+	}
 }
 
 
@@ -124,44 +124,44 @@ if ($id > 0 || $ref)
 
 	$titre = $langs->trans("CardProduct".$object->type);
 	$picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
-	dol_fiche_head($head, 'agenda', $titre, -1, $picto);
+	print dol_get_fiche_head($head, 'agenda', $titre, -1, $picto);
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-    $object->next_prev_filter = " fk_product_type = ".$object->type;
+	$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$object->next_prev_filter = " fk_product_type = ".$object->type;
 
-    $shownav = 1;
-    if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+	$shownav = 1;
+	if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
-    dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+	dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 
-    $object->info($object->id);
+	$object->info($object->id);
 	dol_print_object_info($object, 1);
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 
 	// Actions buttons
 
-    $objproduct = $object;
-    $objcon = new stdClass();
+	$objproduct = $object;
+	$objcon = new stdClass();
 
-    $out = '';
-    $permok = $user->rights->agenda->myactions->create;
-    if ((!empty($objproduct->id) || !empty($objcon->id)) && $permok)
-    {
-        //$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
-        if (get_class($objproduct) == 'Product') $out .= '&amp;prodid='.$objproduct->id.'&origin=product&originid='.$id;
-        $out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage=1&amp;percentage=-1';
-    	//$out.=$langs->trans("AddAnAction").' ';
-    	//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
-    	//$out.="</a>";
+	$out = '';
+	$permok = $user->rights->agenda->myactions->create;
+	if ((!empty($objproduct->id) || !empty($objcon->id)) && $permok)
+	{
+		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
+		if (get_class($objproduct) == 'Product') $out .= '&amp;prodid='.$objproduct->id.'&origin=product&originid='.$id;
+		$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage=1&amp;percentage=-1';
+		//$out.=$langs->trans("AddAnAction").' ';
+		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
+		//$out.="</a>";
 	}
 
 
@@ -170,29 +170,29 @@ if ($id > 0 || $ref)
 
 
 	$morehtmlcenter = '';
-    if (!empty($conf->agenda->enabled))
-    {
-        $linktocreatetimeBtnStatus = !empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create);
-        $morehtmlcenter = dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out, '', $linktocreatetimeBtnStatus);
-    }
+	if (!empty($conf->agenda->enabled))
+	{
+		$linktocreatetimeBtnStatus = !empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create);
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out, '', $linktocreatetimeBtnStatus);
+	}
 
-    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-    {
-    	print '<br>';
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
+	{
+		print '<br>';
 
-        $param = '&id='.$id;
-        if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-        if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+		$param = '&id='.$id;
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
 		print_barre_liste($langs->trans("ActionsOnProduct"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlcenter, '', 0, 1, 1);
 
-        // List of all actions
+		// List of all actions
 		$filters = array();
-        $filters['search_agenda_label'] = $search_agenda_label;
+		$filters['search_agenda_label'] = $search_agenda_label;
 
-        // TODO Replace this with same code than into list.php
-        show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
-    }
+		// TODO Replace this with same code than into list.php
+		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
+	}
 }
 
 // End of page
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 7441d88abc0..0013ec90811 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
  * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2007-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2020      Josep Lluís Amador   <joseplluis@lliuretic.cat>
  *
  * 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
@@ -79,14 +80,14 @@ if (!empty($action) && $action == 'fetch' && !empty($id))
 		$found = false;
 
 		$price_level = 1;
-		if ($socid > 0 && !empty($conf->global->PRODUIT_MULTIPRICES)) {
+		if ($socid > 0 && (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))) {
 			$thirdpartytemp = new Societe($db);
 			$thirdpartytemp->fetch($socid);
 			$price_level = $thirdpartytemp->price_level;
 		}
 
 		// Price by qty
-		if (!empty($price_by_qty_rowid) && $price_by_qty_rowid >= 1 && (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))) 		// If we need a particular price related to qty
+		if (!empty($price_by_qty_rowid) && $price_by_qty_rowid >= 1 && (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))) // If we need a particular price related to qty
 		{
 			$sql = "SELECT price, unitprice, quantity, remise_percent";
 			$sql .= " FROM ".MAIN_DB_PREFIX."product_price_by_qty ";
@@ -108,7 +109,7 @@ if (!empty($action) && $action == 'fetch' && !empty($id))
 		}
 
 		// Multiprice
-		if (!$found && isset($price_level) && $price_level >= 1 && (!empty($conf->global->PRODUIT_MULTIPRICES))) // If we need a particular price level (from 1 to 6)
+		if (!$found && isset($price_level) && $price_level >= 1 && (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))) // If we need a particular price level (from 1 to 6)
 		{
 			$sql = "SELECT price, price_ttc, price_base_type, tva_tx";
 			$sql .= " FROM ".MAIN_DB_PREFIX."product_price ";
@@ -172,7 +173,7 @@ if (!empty($action) && $action == 'fetch' && !empty($id))
 	if (empty($htmlname))
 	{
 		print json_encode(array());
-	    return;
+		return;
 	}
 
 	$match = preg_grep('/('.$htmlname.'[0-9]+)/', array_keys($_GET));
@@ -183,7 +184,7 @@ if (!empty($action) && $action == 'fetch' && !empty($id))
 	if (GETPOST($htmlname, 'alpha') == '' && (!$idprod || !GETPOST($idprod, 'alpha')))
 	{
 		print json_encode(array());
-	    return;
+		return;
 	}
 
 	// When used from jQuery, the search term is added as GET param "term".
diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php
index 85cd3464c1f..e7e3c7ea4b3 100644
--- a/htdocs/product/canvas/product/actions_card_product.class.php
+++ b/htdocs/product/canvas/product/actions_card_product.class.php
@@ -28,43 +28,43 @@ include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
  */
 class ActionsCardProduct
 {
-    public $targetmodule;
-    public $canvas;
-    public $card;
+	public $targetmodule;
+	public $canvas;
+	public $card;
 
-    //! Template container
+	//! Template container
 	public $tpl = array();
 
 	// List of fiels for action=list
 	public $field_list = array();
-    public $list_datas = array();
+	public $list_datas = array();
 
 
-    /**
-     *    Constructor
-     *
-     *    @param	DoliDB	$db             Database handler
-     *    @param	string	$dirmodule		Name of directory of module
-     *    @param	string	$targetmodule	Name of directory where canvas is stored
-     *    @param	string	$canvas         Name of canvas
-     *    @param	string	$card           Name of tab (sub-canvas)
-     */
-    public function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
-    {
-        $this->db               = $db;
-        $this->dirmodule = $dirmodule;
-        $this->targetmodule     = $targetmodule;
-        $this->canvas           = $canvas;
-        $this->card             = $card;
+	/**
+	 *    Constructor
+	 *
+	 *    @param	DoliDB	$db             Database handler
+	 *    @param	string	$dirmodule		Name of directory of module
+	 *    @param	string	$targetmodule	Name of directory where canvas is stored
+	 *    @param	string	$canvas         Name of canvas
+	 *    @param	string	$card           Name of tab (sub-canvas)
+	 */
+	public function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
+	{
+		$this->db               = $db;
+		$this->dirmodule = $dirmodule;
+		$this->targetmodule     = $targetmodule;
+		$this->canvas           = $canvas;
+		$this->card             = $card;
 
-        $this->name = "product";
+		$this->name = "product";
 		$this->definition = "Product canvas (défaut)";
 		$this->fieldListName    = "product_default";
 		$this->next_prev_filter = "canvas='product'";
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Assign custom values for canvas (for example into this->tpl to be used by templates)
 	 *
@@ -73,26 +73,26 @@ class ActionsCardProduct
 	 *    @param	string	$ref		Ref of object
 	 *    @return	void
 	 */
-    public function assign_values(&$action, $id = 0, $ref = '')
+	public function assign_values(&$action, $id = 0, $ref = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $limit, $offset, $sortfield, $sortorder;
-        global $conf, $langs, $user, $mysoc, $canvas;
+		global $conf, $langs, $user, $mysoc, $canvas;
 		global $form, $formproduct;
 
    		$tmpobject = new Product($this->db);
    		if (!empty($id) || !empty($ref)) $tmpobject->fetch($id, $ref);
-        $this->object = $tmpobject;
+		$this->object = $tmpobject;
 
 		//parent::assign_values($action);
 
-        foreach ($this->object as $key => $value) {
-            $this->tpl[$key] = $value;
-        }
+		foreach ($this->object as $key => $value) {
+			$this->tpl[$key] = $value;
+		}
 
-        $this->tpl['error'] = get_htmloutput_errors($this->object->error, $this->object->errors);
+		$this->tpl['error'] = get_htmloutput_errors($this->object->error, $this->object->errors);
 
-        // canvas
+		// canvas
 		$this->tpl['canvas'] = $this->canvas;
 
 		// id
@@ -126,16 +126,16 @@ class ActionsCardProduct
 
 		if ($action == 'view')
 		{
-            $head = product_prepare_head($this->object);
+			$head = product_prepare_head($this->object);
 
-            $this->tpl['showrefnav'] = $form->showrefnav($this->object, 'ref', '', 1, 'ref');
+			$this->tpl['showrefnav'] = $form->showrefnav($this->object, 'ref', '', 1, 'ref');
 
-    		$titre = $langs->trans("CardProduct".$this->object->type);
-    		$picto = ($this->object->type == Product::TYPE_SERVICE ? 'service' : 'product');
-    		$this->tpl['showhead'] = dol_get_fiche_head($head, 'card', $titre, 0, $picto);
-            $this->tpl['showend'] = dol_get_fiche_end();
+			$titre = $langs->trans("CardProduct".$this->object->type);
+			$picto = ($this->object->type == Product::TYPE_SERVICE ? 'service' : 'product');
+			$this->tpl['showhead'] = dol_get_fiche_head($head, 'card', $titre, 0, $picto);
+			$this->tpl['showend'] = dol_get_fiche_end();
 
-            // Accountancy buy code
+			// Accountancy buy code
 			$this->tpl['accountancyBuyCodeKey'] = $form->editfieldkey("ProductAccountancyBuyCode", 'productaccountancycodesell', $this->accountancy_code_sell, $this, $user->rights->produit->creer);
 			$this->tpl['accountancyBuyCodeVal'] = $form->editfieldval("ProductAccountancyBuyCode", 'productaccountancycodesell', $this->accountancy_code_sell, $this, $user->rights->produit->creer);
 
@@ -165,17 +165,17 @@ class ActionsCardProduct
 
 		if ($action == 'create' || $action == 'edit')
 		{
-    		// Status
-    		$statutarray = array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
-    		$this->tpl['status'] = $form->selectarray('statut', $statutarray, $this->object->status);
+			// Status
+			$statutarray = array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
+			$this->tpl['status'] = $form->selectarray('statut', $statutarray, $this->object->status);
 
-    		$statutarray = array('1' => $langs->trans("ProductStatusOnBuy"), '0' => $langs->trans("ProductStatusNotOnBuy"));
-    		$this->tpl['status_buy'] = $form->selectarray('statut_buy', $statutarray, $this->object->status_buy);
+			$statutarray = array('1' => $langs->trans("ProductStatusOnBuy"), '0' => $langs->trans("ProductStatusNotOnBuy"));
+			$this->tpl['status_buy'] = $form->selectarray('statut_buy', $statutarray, $this->object->status_buy);
 
-    		$this->tpl['description'] = $this->description;
-    		$this->tpl['note'] = $this->note;
+			$this->tpl['description'] = $this->description;
+			$this->tpl['note'] = $this->note;
 
-		    // Finished
+			// Finished
 			$statutarray = array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
 			$this->tpl['finished'] = $form->selectarray('finished', $statutarray, $this->object->finished);
 
@@ -198,7 +198,7 @@ class ActionsCardProduct
 
 		if ($action == 'view')
 		{
-    		// Photo
+			// Photo
 			$this->tpl['nblines'] = 4;
 			if ($this->object->is_photo_available($conf->product->multidir_output[$this->object->entity]))
 			{
@@ -232,12 +232,12 @@ class ActionsCardProduct
 				$this->tpl['volume'] = $this->object->volume." ".measuringUnitString(0, "volume", $this->object->volume_units);
 			}
 
-    		$this->tpl['fiche_end'] = dol_get_fiche_end();
+			$this->tpl['fiche_end'] = dol_get_fiche_end();
 		}
 
 		if ($action == 'list')
 		{
-	        $this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
+			$this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
 		}
 	}
 
@@ -293,7 +293,7 @@ class ActionsCardProduct
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Fetch datas list and save into ->list_datas
 	 *
@@ -303,17 +303,17 @@ class ActionsCardProduct
 	 *  @param	string	$sortorder	Sort order ('ASC' or 'DESC')
 	 *  @return	void
 	 */
-    public function LoadListDatas($limit, $offset, $sortfield, $sortorder)
+	public function LoadListDatas($limit, $offset, $sortfield, $sortorder)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
-        $this->getFieldList();
+		$this->getFieldList();
 
-        $this->list_datas = array();
+		$this->list_datas = array();
 
 		// Clean parameters
-        $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+		$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 
 		foreach ($this->field_list as $field)
 		{
diff --git a/htdocs/product/canvas/product/tpl/card_create.tpl.php b/htdocs/product/canvas/product/tpl/card_create.tpl.php
index a06fd9fd24f..042734f8fd3 100644
--- a/htdocs/product/canvas/product/tpl/card_create.tpl.php
+++ b/htdocs/product/canvas/product/tpl/card_create.tpl.php
@@ -32,7 +32,7 @@ $statutarray = array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOn
 
 <?php
 print load_fiche_titre($langs->trans("NewProduct"), '', 'product');
-dol_fiche_head('');
+print dol_get_fiche_head('');
 ?>
 
 <?php dol_htmloutput_errors((is_numeric($object->error) ? '' : $object->error), $object->errors); ?>
diff --git a/htdocs/product/canvas/product/tpl/card_edit.tpl.php b/htdocs/product/canvas/product/tpl/card_edit.tpl.php
index 7b0b5f35710..512ab13416b 100644
--- a/htdocs/product/canvas/product/tpl/card_edit.tpl.php
+++ b/htdocs/product/canvas/product/tpl/card_edit.tpl.php
@@ -33,7 +33,7 @@ $statutarray = array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOn
 <?php
 $head = product_prepare_head($object);
 $titre = $langs->trans("CardProduct".$object->type);
-dol_fiche_head($head, 'card', $titre, 0, 'product');
+print dol_get_fiche_head($head, 'card', $titre, 0, 'product');
 
 dol_htmloutput_errors($object->error, $object->errors);
 ?>
@@ -107,8 +107,8 @@ dol_htmloutput_errors($object->error, $object->errors);
 
 <br>
 
-<div align="center"><input type="submit" class="button" value="<?php echo $langs->trans("Save"); ?>"> &nbsp; &nbsp;
-<input type="submit" class="button" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>"></div>
+<div align="center"><input type="submit" class="button button-save" value="<?php echo $langs->trans("Save"); ?>"> &nbsp; &nbsp;
+<input type="submit" class="button button-cancel" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>"></div>
 
 </form>
 
diff --git a/htdocs/product/canvas/product/tpl/card_view.tpl.php b/htdocs/product/canvas/product/tpl/card_view.tpl.php
index bb62ce0e7ca..2158be2b24d 100644
--- a/htdocs/product/canvas/product/tpl/card_view.tpl.php
+++ b/htdocs/product/canvas/product/tpl/card_view.tpl.php
@@ -31,7 +31,7 @@ $object = $GLOBALS['object'];
 $head = product_prepare_head($object);
 $titre = $langs->trans("CardProduct".$object->type);
 
-dol_fiche_head($head, 'card', $titre, -1, 'product');
+print dol_get_fiche_head($head, 'card', $titre, -1, 'product');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1&type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
 $object->next_prev_filter = " fk_product_type = ".$object->type;
diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php
index 0518cfed475..48f924bbb46 100644
--- a/htdocs/product/canvas/service/actions_card_service.class.php
+++ b/htdocs/product/canvas/service/actions_card_service.class.php
@@ -28,32 +28,32 @@ include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
  */
 class ActionsCardService
 {
-    public $targetmodule;
-    public $canvas;
-    public $card;
+	public $targetmodule;
+	public $canvas;
+	public $card;
 
-    //! Template container
+	//! Template container
 	public $tpl = array();
 
 	// List of fiels for action=list
 	public $field_list = array();
-    public $list_datas = array();
+	public $list_datas = array();
 
 
 	/**
 	 *    Constructor
 	 *
-     *    @param   DoliDB	$db             Handler acces base de donnees
-     *    @param   string	$targetmodule   Name of directory of module where canvas is stored
-     *    @param   string	$canvas         Name of canvas
-     *    @param   string	$card           Name of tab (sub-canvas)
+	 *    @param   DoliDB	$db             Handler acces base de donnees
+	 *    @param   string	$targetmodule   Name of directory of module where canvas is stored
+	 *    @param   string	$canvas         Name of canvas
+	 *    @param   string	$card           Name of tab (sub-canvas)
 	 */
 	public function __construct($db, $targetmodule, $canvas, $card)
 	{
 		$this->db = $db;
 		$this->targetmodule = $targetmodule;
-        $this->canvas           = $canvas;
-        $this->card             = $card;
+		$this->canvas           = $canvas;
+		$this->card             = $card;
 
 		$this->module = "service";
 		$this->name = "service";
@@ -63,8 +63,8 @@ class ActionsCardService
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *    Assign custom values for canvas (for example into this->tpl to be used by templates)
 	 *
 	 *    @param	string	$action    Type of action
@@ -74,23 +74,23 @@ class ActionsCardService
 	 */
 	public function assign_values(&$action, $id = 0, $ref = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $limit, $offset, $sortfield, $sortorder;
-        global $conf, $langs, $user, $mysoc, $canvas;
+		global $conf, $langs, $user, $mysoc, $canvas;
 		global $form, $formproduct;
 
    		$tmpobject = new Product($this->db);
    		if (!empty($id) || !empty($ref)) $tmpobject->fetch($id, $ref);
-        $this->object = $tmpobject;
+		$this->object = $tmpobject;
 
 		//parent::assign_values($action);
 
-	    foreach ($this->object as $key => $value)
-        {
-            $this->tpl[$key] = $value;
-        }
+		foreach ($this->object as $key => $value)
+		{
+			$this->tpl[$key] = $value;
+		}
 
-        $this->tpl['error'] = get_htmloutput_errors($this->object->error, $this->object->errors);
+		$this->tpl['error'] = get_htmloutput_errors($this->object->error, $this->object->errors);
 
 		// canvas
 		$this->tpl['canvas'] = $this->canvas;
@@ -126,14 +126,14 @@ class ActionsCardService
 
 		if ($action == 'view')
 		{
-            $head = product_prepare_head($this->object);
+			$head = product_prepare_head($this->object);
 
-            $this->tpl['showrefnav'] = $form->showrefnav($this->object, 'ref', '', 1, 'ref');
+			$this->tpl['showrefnav'] = $form->showrefnav($this->object, 'ref', '', 1, 'ref');
 
-    		$titre = $langs->trans("CardProduct".$this->object->type);
-    		$picto = ($this->object->type == Product::TYPE_SERVICE ? 'service' : 'product');
-    		$this->tpl['showhead'] = dol_get_fiche_head($head, 'card', $titre, 0, $picto);
-            $this->tpl['showend'] = dol_get_fiche_end();
+			$titre = $langs->trans("CardProduct".$this->object->type);
+			$picto = ($this->object->type == Product::TYPE_SERVICE ? 'service' : 'product');
+			$this->tpl['showhead'] = dol_get_fiche_head($head, 'card', $titre, 0, $picto);
+			$this->tpl['showend'] = dol_get_fiche_end();
 
 			// Accountancy buy code
 			$this->tpl['accountancyBuyCodeKey'] = $form->editfieldkey("ProductAccountancyBuyCode", 'productaccountancycodesell', $this->accountancy_code_sell, $this, $user->rights->produit->creer);
@@ -168,17 +168,17 @@ class ActionsCardService
 
 		if ($action == 'create' || $action == 'edit')
 		{
-    		// Status
-    		$statutarray = array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
-    		$this->tpl['status'] = $form->selectarray('statut', $statutarray, $this->object->status);
+			// Status
+			$statutarray = array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
+			$this->tpl['status'] = $form->selectarray('statut', $statutarray, $this->object->status);
 
-    		$statutarray = array('1' => $langs->trans("ProductStatusOnBuy"), '0' => $langs->trans("ProductStatusNotOnBuy"));
-    		$this->tpl['status_buy'] = $form->selectarray('statut_buy', $statutarray, $this->object->status_buy);
+			$statutarray = array('1' => $langs->trans("ProductStatusOnBuy"), '0' => $langs->trans("ProductStatusNotOnBuy"));
+			$this->tpl['status_buy'] = $form->selectarray('statut_buy', $statutarray, $this->object->status_buy);
 
-    		$this->tpl['description'] = $this->description;
-    		$this->tpl['note'] = $this->note;
+			$this->tpl['description'] = $this->description;
+			$this->tpl['note'] = $this->note;
 
-		    // Duration unit
+			// Duration unit
 			// TODO creer fonction
 			$duration_unit = '<input name="duration_unit" type="radio" value="h"'.($this->object->duration_unit == 'h' ? ' checked' : '').'>'.$langs->trans("Hour");
 			$duration_unit .= '&nbsp; ';
@@ -194,7 +194,7 @@ class ActionsCardService
 
 		if ($action == 'view')
 		{
-		    // Photo
+			// Photo
 			$this->tpl['nblines'] = 4;
 			if ($this->object->is_photo_available($conf->service->multidir_output[$this->object->entity]))
 			{
@@ -216,7 +216,7 @@ class ActionsCardService
 
 		if ($action == 'list')
 		{
-	        $this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
+			$this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
 		}
 	}
 
@@ -230,7 +230,7 @@ class ActionsCardService
 	{
 		global $conf, $langs;
 
-        $this->field_list = array();
+		$this->field_list = array();
 
 		$sql = "SELECT rowid, name, alias, title, align, sort, search, visible, enabled, rang";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_field_list";
@@ -271,7 +271,7 @@ class ActionsCardService
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Fetch datas list and save into ->list_datas
 	 *
@@ -283,11 +283,11 @@ class ActionsCardService
 	 */
 	public function LoadListDatas($limit, $offset, $sortfield, $sortorder)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		global $search_categ, $sall, $sref, $search_barcode, $snom, $catid;
 
-        $this->getFieldList();
+		$this->getFieldList();
 
 		$sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,';
 		$sql .= ' p.fk_product_type, p.tms as datem,';
diff --git a/htdocs/product/canvas/service/tpl/card_create.tpl.php b/htdocs/product/canvas/service/tpl/card_create.tpl.php
index a51e2fa72b8..13fceff4e22 100644
--- a/htdocs/product/canvas/service/tpl/card_create.tpl.php
+++ b/htdocs/product/canvas/service/tpl/card_create.tpl.php
@@ -32,7 +32,7 @@ $statutarray = array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOn
 
 <?php
 print load_fiche_titre($langs->trans("NewService"), '', 'service');
-dol_fiche_head('');
+print dol_get_fiche_head('');
 ?>
 
 <?php dol_htmloutput_errors($this->control->tpl['error'], $this->control->tpl['errors']); ?>
diff --git a/htdocs/product/canvas/service/tpl/card_edit.tpl.php b/htdocs/product/canvas/service/tpl/card_edit.tpl.php
index 3b9c89381a4..8e4613f21b0 100644
--- a/htdocs/product/canvas/service/tpl/card_edit.tpl.php
+++ b/htdocs/product/canvas/service/tpl/card_edit.tpl.php
@@ -33,7 +33,7 @@ $statutarray = array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOn
 <?php
 $head = product_prepare_head($object);
 $titre = $langs->trans("CardProduct".$object->type);
-dol_fiche_head($head, 'card', $titre, 0, 'service');
+print dol_get_fiche_head($head, 'card', $titre, 0, 'service');
 
 dol_htmloutput_errors($object->error, $object->errors);
 ?>
@@ -79,8 +79,8 @@ dol_htmloutput_errors($object->error, $object->errors);
 
 <br>
 
-<div align="center"><input type="submit" class="button" value="<?php echo $langs->trans("Save"); ?>"> &nbsp; &nbsp;
-<input type="submit" class="button" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>"></div>
+<div align="center"><input type="submit" class="button button-save" value="<?php echo $langs->trans("Save"); ?>"> &nbsp; &nbsp;
+<input type="submit" class="button button-cancel" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>"></div>
 
 </form>
 
diff --git a/htdocs/product/canvas/service/tpl/card_view.tpl.php b/htdocs/product/canvas/service/tpl/card_view.tpl.php
index f77f5d5d58f..d342d102af0 100644
--- a/htdocs/product/canvas/service/tpl/card_view.tpl.php
+++ b/htdocs/product/canvas/service/tpl/card_view.tpl.php
@@ -31,7 +31,7 @@ $object = $GLOBALS['object'];
 $head = product_prepare_head($object);
 $titre = $langs->trans("CardProduct".$object->type);
 
-dol_fiche_head($head, 'card', $titre, -1, 'service');
+print dol_get_fiche_head($head, 'card', $titre, -1, 'service');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1&type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
 $object->next_prev_filter = " fk_product_type = ".$object->type;
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 62b7d78b031..b351b9ec7e1 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -18,6 +18,7 @@
  * Copyright (C) 2017		Josep Lluís Amador	 <joseplluis@lliuretic.cat>
  * Copyright (C) 2019       Frédéric France      <frederic.france@netlogic.fr>
  * Copyright (C) 2019-2020  Thibault FOUCART     <support@ptibogxiv.net>
+ * Copyright (C) 2020  		Pierre Ardoin     	 <mapiolca@me.com>
  *
  * 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
@@ -87,6 +88,9 @@ $accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
 $accountancy_code_buy_intra = GETPOST('accountancy_code_buy_intra', 'alpha');
 $accountancy_code_buy_export = GETPOST('accountancy_code_buy_export', 'alpha');
 
+// by default 'alphanohtml' (better security); hidden conf MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML allows basic html
+$label_security_check = empty($conf->global->MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML) ? 'alphanohtml' : 'restricthtml';
+
 if (!empty($user->socid)) $socid = $user->socid;
 
 $object = new Product($db);
@@ -200,32 +204,32 @@ if (empty($reshook))
 	{
 		$error = 0;
 
-		if (!GETPOST('label', 'alphanohtml'))
-		{
-			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Label')), null, 'errors');
-			$action = "create";
-			$error++;
-		}
-		if (empty($ref))
-		{
-			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Ref')), null, 'errors');
-			$action = "create";
-			$error++;
-		}
-		if (!empty($duration_value) && empty($duration_unit))
-		{
-			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Unit')), null, 'errors');
-			$action = "create";
-			$error++;
-		}
+        if (!GETPOST('label', $label_security_check))
+        {
+            setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Label')), null, 'errors');
+            $action = "create";
+            $error++;
+        }
+        if (empty($ref))
+        {
+            setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Ref')), null, 'errors');
+            $action = "create";
+            $error++;
+        }
+        if (!empty($duration_value) && empty($duration_unit))
+        {
+            setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Unit')), null, 'errors');
+            $action = "create";
+            $error++;
+        }
 
 		if (!$error)
 		{
 			$units = GETPOST('units', 'int');
 
-			$object->ref                   = $ref;
-			$object->label                 = GETPOST('label', 'alphanohtml');
-			$object->price_base_type       = GETPOST('price_base_type', 'aZ09');
+            $object->ref                   = $ref;
+            $object->label                 = GETPOST('label', $label_security_check);
+            $object->price_base_type       = GETPOST('price_base_type', 'aZ09');
 
 			if ($object->price_base_type == 'TTC')
 				$object->price_ttc = GETPOST('price');
@@ -300,8 +304,8 @@ if (empty($reshook))
 			$object->note_private          	 = dol_htmlcleanlastbr(GETPOST('note_private', 'restricthtml'));
 			$object->note               	 = $object->note_private; // deprecated
 			$object->customcode              = GETPOST('customcode', 'alphanohtml');
-	        $object->country_id = GETPOST('country_id', 'int');
-	        $object->state_id = GETPOST('state_id', 'int');
+			$object->country_id = GETPOST('country_id', 'int');
+			$object->state_id = GETPOST('state_id', 'int');
 			$object->duration_value     	 = $duration_value;
 			$object->duration_unit      	 = $duration_unit;
 			$object->fk_default_warehouse	 = GETPOST('fk_default_warehouse');
@@ -320,8 +324,19 @@ if (empty($reshook))
 			$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'); // This is not the fk_unit but the power of unit
-			$object->finished           	 = GETPOST('finished', 'alpha');
-			$object->fk_unit = GETPOST('units', 'alpha'); // This is the fk_unit of sale
+			$finished = GETPOST('finished', 'int');
+			if ($finished > 0) {
+				$object->finished = $finished;
+			} else {
+				$object->finished = null;
+			}
+
+			$units = GETPOST('units', 'int');
+			if ($units > 0) {
+				$object->fk_unit = $units;
+			} else {
+				$object->fk_unit = null;
+			}
 
 			$accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha');
 			$accountancy_code_sell_intra = GETPOST('accountancy_code_sell_intra', 'alpha');
@@ -397,7 +412,7 @@ if (empty($reshook))
 				$object->oldcopy = clone $object;
 
 				$object->ref                    = $ref;
-				$object->label                  = GETPOST('label', 'alphanohtml');
+				$object->label                  = GETPOST('label', $label_security_check);
 				$object->description            = dol_htmlcleanlastbr(GETPOST('desc', 'restricthtml'));
 				$object->url = GETPOST('url');
 				if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB))
@@ -434,10 +449,15 @@ if (empty($reshook))
 				$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'); // This is not the fk_unit but the power of unit
-				$object->finished               = GETPOST('finished', 'alpha');
+
+				$finished = GETPOST('finished', 'int');
+				if ($finished >= 0) {
+					$object->finished = $finished;
+				} else {
+					$object->finished = null;
+				}
 
 				$units = GETPOST('units', 'int');
-
 				if ($units > 0) {
 					$object->fk_unit = $units;
 				} else {
@@ -964,16 +984,16 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		$linkback = "";
 		print load_fiche_titre($title, $linkback, $picto);
 
-        // We set country_id, country_code and country for the selected country
-        $object->country_id = GETPOSTISSET('country_id') ? GETPOST('country_id', 'int') : null;
-        if ($object->country_id > 0)
-        {
-            $tmparray = getCountry($object->country_id, 'all');
-            $object->country_code = $tmparray['code'];
-            $object->country = $tmparray['label'];
-        }
+		// We set country_id, country_code and country for the selected country
+		$object->country_id = GETPOSTISSET('country_id') ? GETPOST('country_id', 'int') : null;
+		if ($object->country_id > 0)
+		{
+			$tmparray = getCountry($object->country_id, 'all');
+			$object->country_code = $tmparray['code'];
+			$object->country = $tmparray['label'];
+		}
 
-		dol_fiche_head('');
+		print dol_get_fiche_head('');
 
 		print '<table class="border centpercent">';
 
@@ -988,7 +1008,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '</td></tr>';
 
 		// Label
-		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="label" class="minwidth300 maxwidth400onsmartphone" maxlength="255" value="'.dol_escape_htmltag(GETPOST('label', 'alphanohtml')).'"></td></tr>';
+		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="label" class="minwidth300 maxwidth400onsmartphone" maxlength="255" value="'.dol_escape_htmltag(GETPOST('label', $label_security_check)).'"></td></tr>';
 
 		// On sell
 		print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="3">';
@@ -1017,8 +1037,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		if ($showbarcode)
 		{
  			print '<tr><td>'.$langs->trans('BarcodeType').'</td><td>';
- 			if (isset($_POST['fk_barcode_type']))
-			{
+ 			if (GETPOSTISSET('fk_barcode_type')) {
 			 	$fk_barcode_type = GETPOST('fk_barcode_type');
 			} else {
 				if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
@@ -1029,7 +1048,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '</td>';
 			if ($conf->browser->layout == 'phone') print '</tr><tr>';
 			print '<td>'.$langs->trans("BarcodeValue").'</td><td>';
-			$tmpcode = isset($_POST['barcode']) ?GETPOST('barcode') : $object->barcode;
+			$tmpcode = GETPOSTISSET('barcode') ? GETPOST('barcode') : $object->barcode;
 			if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) $tmpcode = $modBarCodeProduct->getNextValue($object, $type);
 			print '<input class="maxwidth100" type="text" name="barcode" value="'.dol_escape_htmltag($tmpcode).'">';
 			print '</td></tr>';
@@ -1134,7 +1153,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		}
 
 		// Units
-		if ($conf->global->PRODUCT_USE_UNITS)
+		if (!empty($conf->global->PRODUCT_USE_UNITS))
 		{
 			print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td>';
 			print '<td colspan="3">';
@@ -1150,26 +1169,27 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			// Origin country
 			print '<td>'.$langs->trans("CountryOrigin").'</td>';
 			print '<td>';
-            print img_picto('', 'globe-americas', 'class="paddingrightonly"');
-            print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth300 widthcentpercentminusx');
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			print img_picto('', 'globe-americas', 'class="paddingrightonly"');
+			print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth300 widthcentpercentminusx');
+			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			print '</td>';
 
-            // State
-            if (empty($conf->global->PRODUCT_DISABLE_STATE))
-            {
-            		if ($conf->browser->layout == 'phone') print '</tr><tr>';
-                if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
-                {
-                    print '<td>'.$form->editfieldkey('Region-StateOrigine', 'state_id', '', $object, 0).'</td><td colspan="3">';
-                } else {
-                    print '<td>'.$form->editfieldkey('StateOrigin', 'state_id', '', $object, 0).'</td><td colspan="3">';
-                }
+			// State
+			if (empty($conf->global->PRODUCT_DISABLE_STATE))
+			{
+				if ($conf->browser->layout == 'phone') print '</tr><tr>';
+				if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
+				{
+					print '<td>'.$form->editfieldkey('RegionStateOrigin', 'state_id', '', $object, 0).'</td><td colspan="3">';
+				} else {
+					print '<td>'.$form->editfieldkey('StateOrigin', 'state_id', '', $object, 0).'</td><td colspan="3">';
+				}
 
 				print $formcompany->select_state($object->state_id, $object->country_code);
-                print '</tr>';
-            }
-                print '</tr>';
+				print '</tr>';
+			}
+
+			print '</tr>';
 		}
 
 		// Other attributes
@@ -1197,7 +1217,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			// Categories
 			print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 1);
-			print $form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, '', 0, '100%');
+			print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 			print "</td></tr>";
 		}
 
@@ -1369,12 +1389,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		}
 		print '</table>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
 		print '<input type="submit" class="button" value="'.$langs->trans("Create").'">';
 		print ' &nbsp; &nbsp; ';
-		print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+		print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 		print '</div>';
 
 		print '</form>';
@@ -1421,7 +1441,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			$head = product_prepare_head($object);
 			$titre = $langs->trans("CardProduct".$object->type);
 			$picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
-			dol_fiche_head($head, 'card', $titre, 0, $picto);
+			print dol_get_fiche_head($head, 'card', $titre, 0, $picto);
 
 
 			print '<table class="border allwidth">';
@@ -1479,8 +1499,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			if ($showbarcode)
 			{
 				print '<tr><td>'.$langs->trans('BarcodeType').'</td><td>';
-				if (isset($_POST['fk_barcode_type']))
-				{
+				if (GETPOSTISSET('fk_barcode_type')) {
 				 	$fk_barcode_type = GETPOST('fk_barcode_type');
 				} else {
 					$fk_barcode_type = $object->barcode_type;
@@ -1490,7 +1509,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				$formbarcode = new FormBarCode($db);
 				print $formbarcode->selectBarcodeType($fk_barcode_type, 'fk_barcode_type', 1);
 				print '</td><td>'.$langs->trans("BarcodeValue").'</td><td>';
-				$tmpcode = isset($_POST['barcode']) ?GETPOST('barcode') : $object->barcode;
+				$tmpcode = GETPOSTISSET('barcode') ? GETPOST('barcode') : $object->barcode;
 				if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) $tmpcode = $modBarCodeProduct->getNextValue($object, $type);
 				print '<input size="40" class="maxwidthonsmartphone" type="text" name="barcode" value="'.dol_escape_htmltag($tmpcode).'">';
 				print '</td></tr>';
@@ -1546,8 +1565,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			} else {
 				// Nature
 				print '<tr><td>'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td colspan="3">';
-				$statutarray = array('-1'=>'&nbsp;', '1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
-				print $form->selectarray('finished', $statutarray, $object->finished);
+				print $formproduct->selectProductNature('finished', $object->finished);
 				print '</td></tr>';
 
 				// Brut Weight
@@ -1593,7 +1611,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				}
 			}
 			// Units
-			if ($conf->global->PRODUCT_USE_UNITS)
+			if (!empty($conf->global->PRODUCT_USE_UNITS))
 			{
 				print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td>';
 				print '<td colspan="3">';
@@ -1615,10 +1633,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				// State
 				if (empty($conf->global->PRODUCT_DISABLE_STATE))
 				{
-            		if ($conf->browser->layout == 'phone') print '</tr><tr>';
+					if ($conf->browser->layout == 'phone') print '</tr><tr>';
 					if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
 					{
-						print '<td>'.$form->editfieldkey('Region-StateOrigine', 'state_id', '', $object, 0).'</td><td colspan="3">';
+						print '<td>'.$form->editfieldkey('RegionStateOrigin', 'state_id', '', $object, 0).'</td><td colspan="3">';
 					} else {
 						print '<td>'.$form->editfieldkey('StateOrigin', 'state_id', '', $object, 0).'</td><td colspan="3">';
 					}
@@ -1651,7 +1669,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 						$arrayselected[] = $cat->id;
 					}
 				}
-				print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
+				print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 				print "</td></tr>";
 			}
 
@@ -1755,12 +1773,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			}
 			print '</table>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
-			print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+			print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-			print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+			print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 			print '</div>';
 
 			print '</form>';
@@ -1773,7 +1791,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			$titre = $langs->trans("CardProduct".$object->type);
 			$picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
 
-			dol_fiche_head($head, 'card', $titre, -1, $picto);
+			print dol_get_fiche_head($head, 'card', $titre, -1, $picto);
 
 			$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1&type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
 			$object->next_prev_filter = " fk_product_type = ".$object->type;
@@ -1836,7 +1854,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				print '</td><td colspan="2">';
 				if ($action == 'editbarcode')
 				{
-					$tmpcode = isset($_POST['barcode']) ?GETPOST('barcode') : $object->barcode;
+					$tmpcode = GETPOSTISSET('barcode') ? GETPOST('barcode') : $object->barcode;
 					if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) $tmpcode = $modBarCodeProduct->getNextValue($object, $type);
 
 					print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
@@ -2153,7 +2171,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '</div></div>';
 			print '<div style="clear:both"></div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 		}
 	} elseif ($action != 'create')
 	{
@@ -2176,7 +2194,7 @@ if ($result > 0)
 $tmpcode = '';
 if (!empty($modCodeProduct->code_auto)) $tmpcode = $modCodeProduct->getNextValue($object, $object->type);
 
-$formconfirm='';
+$formconfirm = '';
 
 // Confirm delete product
 if (($action == 'delete' && (empty($conf->use_javascript_ajax) || !empty($conf->dol_use_jmobile)))	// Output when action = clone if jmobile or no js
@@ -2204,7 +2222,7 @@ if (($action == 'clone' && (empty($conf->use_javascript_ajax) || !empty($conf->d
 		$formquestionclone[] = array('type' => 'checkbox', 'name' => 'clone_composition', 'label' => $langs->trans('CloneCompositionProduct'), 'value' => 1);
 	}
 
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneProduct', $object->ref), 'confirm_clone', $formquestionclone, 'yes', 'action-clone', 350, 600);
+	$formconfirm .= $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneProduct', $object->ref), 'confirm_clone', $formquestionclone, 'yes', 'action-clone', 350, 600);
 }
 
 // Call Hook formConfirm
@@ -2352,7 +2370,7 @@ if (!empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action ==
 
 		print load_fiche_titre($langs->trans("AddToDraft"), '', '');
 
-		dol_fiche_head('');
+		print dol_get_fiche_head('');
 
 		$html .= '<tr><td class="nowrap">'.$langs->trans("Quantity").' ';
 		$html .= '<input type="text" class="flat" name="qty" size="1" value="1"></td>';
@@ -2368,7 +2386,7 @@ if (!empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action ==
 		print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
 		print '</div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '</form>';
 	}
@@ -2387,7 +2405,11 @@ if ($action != 'create' && $action != 'edit' && $action != 'delete')
 	// Documents
 	$objectref = dol_sanitizeFileName($object->ref);
 	$relativepath = $comref.'/'.$objectref.'.pdf';
-	$filedir = $conf->product->dir_output.'/'.$objectref;
+	if (!empty($conf->product->multidir_output[$object->entity])) {
+		$filedir = $conf->product->multidir_output[$object->entity].'/'.$objectref; //Check repertories of current entities
+	} else {
+		$filedir = $conf->product->dir_output.'/'.$objectref;
+	}
 	$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 	$genallowed = $usercanread;
 	$delallowed = $usercancreate;
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 6c75d96fe89..f7406692f8d 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -34,1820 +34,1820 @@ require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination2ValuePair.cla
  */
 class Products extends DolibarrApi
 {
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'ref',
-        'label'
-    );
-
-    /**
-     * @var Product $product {@type Product}
-     */
-    public $product;
-
-    /**
-     * @var ProductFournisseur $productsupplier {@type ProductFournisseur}
-     */
-    public $productsupplier;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-
-        $this->db = $db;
-        $this->product = new Product($this->db);
-        $this->productsupplier = new ProductFournisseur($this->db);
-    }
-
-    /**
-     * Get properties of a product object by id
-     *
-     * Return an array with product information.
-     *
-     * @param  int    $id                  ID of product
-     * @param  int    $includestockdata    Load also information about stock (slower)
-     * @param  bool   $includesubproducts  Load information about subproducts
-	 * @param  bool   $includeparentid     Load also ID of parent product (if product is a variant of a parent product)
-     * @return array|mixed                 Data without useless information
-     *
-     * @throws RestException 401
-     * @throws RestException 403
-     * @throws RestException 404
-     */
-    public function get($id, $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
-    {
-        return $this->_fetch($id, '', '', '', $includestockdata, $includesubproducts, $includeparentid);
-    }
-
-    /**
-     * Get properties of a product object by ref
-     *
-     * Return an array with product information.
-     *
-     * @param  string $ref                Ref of element
-     * @param  int    $includestockdata   Load also information about stock (slower)
-     * @param  bool   $includesubproducts Load information about subproducts
-	 * @param  bool   $includeparentid    Load also ID of parent product (if product is a variant of a parent product)
-     *
-     * @return array|mixed                 Data without useless information
-     *
-     * @url GET ref/{ref}
-     *
-     * @throws RestException 401
-     * @throws RestException 403
-     * @throws RestException 404
-     */
-    public function getByRef($ref, $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
-    {
-        return $this->_fetch('', $ref, '', '', $includestockdata, $includesubproducts, $includeparentid);
-    }
-
-    /**
-     * Get properties of a product object by ref_ext
-     *
-     * Return an array with product information.
-     *
-     * @param  string $ref_ext            Ref_ext of element
-     * @param  int    $includestockdata   Load also information about stock (slower)
-     * @param  bool   $includesubproducts Load information about subproducts
-	 * @param  bool   $includeparentid    Load also ID of parent product (if product is a variant of a parent product)
-     *
-     * @return array|mixed Data without useless information
-     *
-     * @url GET ref_ext/{ref_ext}
-     *
-     * @throws RestException 401
-     * @throws RestException 403
-     * @throws RestException 404
-     */
-    public function getByRefExt($ref_ext, $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
-    {
-        return $this->_fetch('', '', $ref_ext, '', $includestockdata, $includesubproducts, $includeparentid);
-    }
-
-    /**
-     * Get properties of a product object by barcode
-     *
-     * Return an array with product information.
-     *
-     * @param  string $barcode            Barcode of element
-     * @param  int    $includestockdata   Load also information about stock (slower)
-     * @param  bool   $includesubproducts Load information about subproducts
-	 * @param  bool   $includeparentid    Load also ID of parent product (if product is a variant of a parent product)
-     *
-     * @return array|mixed Data without useless information
-     *
-     * @url GET barcode/{barcode}
-     *
-     * @throws RestException 401
-     * @throws RestException 403
-     * @throws RestException 404
-     */
-    public function getByBarcode($barcode, $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
-    {
-        return $this->_fetch('', '', '', $barcode, $includestockdata, $includesubproducts, $includeparentid);
-    }
-
-    /**
-     * List products
-     *
-     * Get a list of products
-     *
-     * @param  string $sortfield  Sort field
-     * @param  string $sortorder  Sort order
-     * @param  int    $limit      Limit for list
-     * @param  int    $page       Page number
-     * @param  int    $mode       Use this param to filter list (0 for all, 1 for only product, 2 for only service)
-     * @param  int    $category   Use this param to filter list by category
-     * @param  string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.tobuy:=:0) and (t.tosell:=:1)"
-     * @return array                Array of product objects
-     */
-    public function index($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $sqlfilters = '')
-    {
-        global $db, $conf;
-
-        $obj_ret = array();
-
-        $socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : '';
-
-        $sql = "SELECT t.rowid, t.ref, t.ref_ext";
-        $sql .= " FROM ".MAIN_DB_PREFIX."product as t";
-        if ($category > 0) {
-            $sql .= ", ".MAIN_DB_PREFIX."categorie_product as c";
-        }
-        $sql .= ' WHERE t.entity IN ('.getEntity('product').')';
-        // Select products of given category
-        if ($category > 0) {
-        	$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
-            $sql .= " AND c.fk_product = t.rowid ";
-        }
-        if ($mode == 1) {
-            // Show only products
-            $sql .= " AND t.fk_product_type = 0";
-        } elseif ($mode == 2) {
-            // Show only services
-            $sql .= " AND t.fk_product_type = 1";
-        }
-        // Add sql filters
-        if ($sqlfilters) {
-            if (!DolibarrApi::_checkFilters($sqlfilters)) {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
-
-        $result = $this->db->query($sql);
-        if ($result) {
-        	$num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            $i = 0;
-            while ($i < $min)
-            {
-            	$obj = $this->db->fetch_object($result);
-            	$product_static = new Product($this->db);
-                if ($product_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($product_static);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve product list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No product found');
-        }
-        return $obj_ret;
-    }
-
-    /**
-     * Create product object
-     *
-     * @param  array $request_data Request data
-     * @return int     ID of product
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->creer) {
-            throw new RestException(401);
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
-
-        foreach ($request_data as $field => $value) {
-            $this->product->$field = $value;
-        }
-        if ($this->product->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, "Error creating product", array_merge(array($this->product->error), $this->product->errors));
-        }
-
-        return $this->product->id;
-    }
-
-    /**
-     * Update product.
-     * Price will be updated by this API only if option is set on "One price per product". See other APIs for other price modes.
-     *
-     * @param  int   $id           Id of product to update
-     * @param  array $request_data Datas
-     * @return int
-     *
-     * @throws RestException 401
-     * @throws RestException 404
-     */
-    public function put($id, $request_data = null)
-    {
-        global $conf;
-
-        if (!DolibarrApiAccess::$user->rights->produit->creer) {
-            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);
-        }
-
-        $oldproduct = dol_clone($this->product, 0);
-
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') { continue;
-            }
-            if ($field == 'stock_reel') {
-                throw new RestException(400, 'Stock reel cannot be updated here. Use the /stockmovements endpoint instead');
-            }
-            $this->product->$field = $value;
-        }
-
-        $updatetype = false;
-        if ($this->product->type != $oldproduct->type && ($this->product->isProduct() || $this->product->isService())) {
-            $updatetype = true;
-        }
-
-        $result = $this->product->update($id, DolibarrApiAccess::$user, 1, 'update', $updatetype);
-
-        // If price mode is 1 price per product
-        if ($result > 0 && !empty($conf->global->PRODUCT_PRICE_UNIQ)) {
-            // We update price only if it was changed
-            $pricemodified = false;
-            if ($this->product->price_base_type != $oldproduct->price_base_type) { $pricemodified = true;
-            } else {
-                if ($this->product->tva_tx != $oldproduct->tva_tx) { $pricemodified = true;
-                }
-                if ($this->product->tva_npr != $oldproduct->tva_npr) { $pricemodified = true;
-                }
-                if ($this->product->default_vat_code != $oldproduct->default_vat_code) { $pricemodified = true;
-                }
-
-                if ($this->product->price_base_type == 'TTC') {
-                    if ($this->product->price_ttc != $oldproduct->price_ttc) { $pricemodified = true;
-                    }
-                    if ($this->product->price_min_ttc != $oldproduct->price_min_ttc) { $pricemodified = true;
-                    }
-                } else {
-                    if ($this->product->price != $oldproduct->price) { $pricemodified = true;
-                    }
-                    if ($this->product->price_min != $oldproduct->price_min) { $pricemodified = true;
-                    }
-                }
-            }
-
-            if ($pricemodified) {
-                $newvat = $this->product->tva_tx;
-                $newnpr = $this->product->tva_npr;
-                $newvatsrccode = $this->product->default_vat_code;
-
-                $newprice = $this->product->price;
-                $newpricemin = $this->product->price_min;
-                if ($this->product->price_base_type == 'TTC') {
-                    $newprice = $this->product->price_ttc;
-                    $newpricemin = $this->product->price_min_ttc;
-                }
-
-                $result = $this->product->updatePrice($newprice, $this->product->price_base_type, DolibarrApiAccess::$user, $newvat, $newpricemin, 0, $newnpr, 0, 0, array(), $newvatsrccode);
-            }
-        }
-
-        if ($result <= 0) {
-            throw new RestException(500, "Error updating product", array_merge(array($this->product->error), $this->product->errors));
-        }
-
-        return $this->get($id);
-    }
-
-    /**
-     * Delete product
-     *
-     * @param  int 		$id 		Product ID
-     * @return array
-     */
-    public function delete($id)
-    {
-        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);
-        }
-
-        // The Product::delete() method uses the global variable $user.
-        global $user;
-        $user = DolibarrApiAccess::$user;
-
-        return $this->product->delete(DolibarrApiAccess::$user);
-    }
-
-    /**
-     * Get the list of subproducts of the product.
-     *
-     * @param  int $id      Id of parent product/service
-     * @return array
-     *
-     * @throws RestException
-     * @throws RestException 401
-     * @throws RestException 404
-     *
-     * @url GET {id}/subproducts
-     */
-    public function getSubproducts($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('product', $id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        $childsArbo = $this->product->getChildsArbo($id, 1);
-
-        $keys = ['rowid', 'qty', 'fk_product_type', 'label', 'incdec'];
-        $childs = [];
-        foreach ($childsArbo as $values) {
-            $childs[] = array_combine($keys, $values);
-        }
-
-        return $childs;
-    }
-
-    /**
-     * Add subproduct.
-     *
-     * Link a product/service to a parent product/service
-     *
-     * @param  int $id            Id of parent product/service
-     * @param  int $subproduct_id Id of child product/service
-     * @param  int $qty           Quantity
-     * @param  int $incdec        1=Increase/decrease stock of child when parent stock increase/decrease
-     * @return int
-     *
-     * @throws RestException
-     * @throws RestException 401
-     * @throws RestException 404
-     *
-     * @url POST {id}/subproducts/add
-     */
-    public function addSubproducts($id, $subproduct_id, $qty, $incdec = 1)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->creer) {
-            throw new RestException(401);
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('product', $id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        $result = $this->product->add_sousproduit($id, $subproduct_id, $qty, $incdec);
-        if ($result <= 0) {
-            throw new RestException(500, "Error adding product child");
-        }
-        return $result;
-    }
-
-    /**
-     * Remove subproduct.
-     * Unlink a product/service from a parent product/service
-     *
-     * @param  int $id             Id of parent product/service
-     * @param  int $subproduct_id  Id of child product/service
-     * @return int
-     *
-     * @throws RestException 401
-     * @throws RestException 404
-     *
-     * @url DELETE {id}/subproducts/remove/{subproduct_id}
-     */
-    public function delSubproducts($id, $subproduct_id)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->creer) {
-            throw new RestException(401);
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('product', $id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        $result = $this->product->del_sousproduit($id, $subproduct_id);
-        if ($result <= 0) {
-            throw new RestException(500, "Error while removing product child");
-        }
-        return $result;
-    }
-
-
-    /**
-     * Get categories for a product
-     *
-     * @param int    $id        ID of product
-     * @param string $sortfield Sort field
-     * @param string $sortorder Sort order
-     * @param int    $limit     Limit for list
-     * @param int    $page      Page number
-     *
-     * @return mixed
-     *
-     * @url GET {id}/categories
-     */
-    public function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
-    {
-        if (!DolibarrApiAccess::$user->rights->categorie->lire) {
-            throw new RestException(401);
-        }
-
-        $categories = new Categorie($this->db);
-
-        $result = $categories->getListForItem($id, 'product', $sortfield, $sortorder, $limit, $page);
-
-        if (empty($result)) {
-            throw new RestException(404, 'No category found');
-        }
-
-        if ($result < 0) {
-            throw new RestException(503, 'Error when retrieve category list : '.array_merge(array($categories->error), $categories->errors));
-        }
-
-        return $result;
-    }
-
-    /**
-     * Get prices per segment for a product
-     *
-     * @param int $id ID of product
-     *
-     * @return mixed
-     *
-     * @url GET {id}/selling_multiprices/per_segment
-     */
-    public function getCustomerPricesPerSegment($id)
-    {
-        global $conf;
-
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
-
-        if (empty($conf->global->PRODUIT_MULTIPRICES)) {
-            throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
-        }
-
-        $result = $this->product->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Product not found');
-        }
-
-        if ($result < 0) {
-            throw new RestException(503, 'Error when retrieve prices list : '.array_merge(array($this->product->error), $this->product->errors));
-        }
-
-        return array(
-            'multiprices'=>$this->product->multiprices,
-            'multiprices_inc_tax'=>$this->product->multiprices_ttc,
-            'multiprices_min'=>$this->product->multiprices_min,
-            'multiprices_min_inc_tax'=>$this->product->multiprices_min_ttc,
-            'multiprices_vat'=>$this->product->multiprices_tva_tx,
-            'multiprices_base_type'=>$this->product->multiprices_base_type,
-            //'multiprices_default_vat_code'=>$this->product->multiprices_default_vat_code
-        );
-    }
-
-    /**
-     * Get prices per customer for a product
-     *
-     * @param int $id ID of product
-     * @param string   	$thirdparty_id	  Thirdparty id to filter orders of (example '1') {@pattern /^[0-9,]*$/i}
-     *
-     * @return mixed
-     *
-     * @url GET {id}/selling_multiprices/per_customer
-     */
-    public function getCustomerPricesPerCustomer($id, $thirdparty_id = '')
-    {
-        global $conf;
-
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
-
-        if (empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
-            throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
-        }
-
-        $result = $this->product->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Product not found');
-        }
-
-        if ($result > 0) {
-            require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
-            $prodcustprice = new Productcustomerprice($this->db);
-            $filter = array();
-            $filter['t.fk_product'] .= $id;
-            if ($thirdparty_id) $filter['t.fk_soc'] .= $thirdparty_id;
-            $result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
-        }
-
-        if (empty($prodcustprice->lines)) {
-            throw new RestException(404, 'Prices not found');
-        }
-
-        return $prodcustprice->lines;
-    }
-
-    /**
-     * Get prices per quantity for a product
-     *
-     * @param int $id ID of product
-     *
-     * @return mixed
-     *
-     * @url GET {id}/selling_multiprices/per_quantity
-     */
-    public function getCustomerPricesPerQuantity($id)
-    {
-        global $conf;
-
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
-
-        if (empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
-            throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
-        }
-
-        $result = $this->product->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Product not found');
-        }
-
-        if ($result < 0) {
-            throw new RestException(503, 'Error when retrieve prices list : '.array_merge(array($this->product->error), $this->product->errors));
-        }
-
-        return array(
-            'prices_by_qty'=>$this->product->prices_by_qty[0], // 1 if price by quantity was activated for the product
-            'prices_by_qty_list'=>$this->product->prices_by_qty_list[0]
-        );
-    }
-
-    /**
-     * Add/Update purchase prices for a product.
-     *
-     * @param   int         $id                             ID of Product
-     * @param  	float		$qty				            Min quantity for which price is valid
-     * @param  	float		$buyprice			            Purchase price for the quantity min
-     * @param  	string		$price_base_type	            HT or TTC
-     * @param  	int		    $fourn_id                       Supplier ID
-     * @param  	int			$availability		            Product availability
-     * @param	string		$ref_fourn			            Supplier ref
-     * @param	float		$tva_tx				            New VAT Rate (For example 8.5. Should not be a string)
-     * @param  	string		$charges			            costs affering to product
-     * @param  	float		$remise_percent		            Discount  regarding qty (percent)
-     * @param  	float		$remise				            Discount  regarding qty (amount)
-     * @param  	int			$newnpr				            Set NPR or not
-     * @param	int			$delivery_time_days	            Delay in days for delivery (max). May be '' if not defined.
-     * @param   string      $supplier_reputation            Reputation with this product to the defined supplier (empty, FAVORITE, DONOTORDER)
-     * @param   array		$localtaxes_array	            Array with localtaxes info array('0'=>type1,'1'=>rate1,'2'=>type2,'3'=>rate2) (loaded by getLocalTaxesFromRate(vatrate, 0, ...) function).
-     * @param   string  	$newdefaultvatcode              Default vat code
-     * @param  	float		$multicurrency_buyprice 	    Purchase price for the quantity min in currency
-     * @param  	string		$multicurrency_price_base_type	HT or TTC in currency
-     * @param  	float		$multicurrency_tx	            Rate currency
-     * @param  	string		$multicurrency_code	            Currency code
-     * @param  	string		$desc_fourn     	            Custom description for product_fourn_price
-     * @param  	string		$barcode     	                Barcode
-     * @param  	int		    $fk_barcode_type     	        Barcode type
-     * @return int
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     *
-     * @url POST {id}/purchase_prices
-     */
-    public function addPurchasePrice($id, $qty, $buyprice, $price_base_type, $fourn_id, $availability, $ref_fourn, $tva_tx, $charges = 0, $remise_percent = 0, $remise = 0, $newnpr = 0, $delivery_time_days = 0, $supplier_reputation = '', $localtaxes_array = array(), $newdefaultvatcode = '', $multicurrency_buyprice = 0, $multicurrency_price_base_type = 'HT', $multicurrency_tx = 1, $multicurrency_code = '', $desc_fourn = '', $barcode = '', $fk_barcode_type = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->creer) {
-            throw new RestException(401);
-        }
-
-        $result = $this->productsupplier->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Product not found');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('product', $this->productsupplier->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        $result = $this->productsupplier->add_fournisseur(DolibarrApiAccess::$user, $fourn_id, $ref_fourn, $qty);
-        if ($result < 0) {
-            throw new RestException(500, "Error adding supplier to product : ".$this->db->lasterror());
-        }
-
-        $fourn = new Fournisseur($this->db);
-        $result = $fourn->fetch($fourn_id);
-        if ($result <= 0) {
-            throw new RestException(404, 'Supplier not found');
-        }
-
-        $result = $this->productsupplier->update_buyprice($qty, $buyprice, DolibarrApiAccess::$user, $price_base_type, $fourn, $availability, $ref_fourn, $tva_tx, $charges, $remise_percent, $remise, $newnpr, $delivery_time_days, $supplier_reputation, $localtaxes_array, $newdefaultvatcode, $multicurrency_buyprice, $multicurrency_price_base_type, $multicurrency_tx, $multicurrency_code, $desc_fourn, $barcode, $fk_barcode_type);
-
-        if ($result <= 0) {
-            throw new RestException(500, "Error updating buy price : ".$this->db->lasterror());
-        }
-        return (int) $this->productsupplier->product_fourn_price_id;
-    }
-
-    /**
-     * Delete purchase price for a product
-     *
-     * @param  int $id Product ID
-     * @param  int $priceid purchase price ID
-     *
-     * @url DELETE {id}/purchase_prices/{priceid}
-     *
-     * @return int
-     *
-     * @throws RestException 401
-     * @throws RestException 404
-     *
-     */
-    public function deletePurchasePrice($id, $priceid)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
-            throw new RestException(401);
-        }
-        $result = $this->productsupplier->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Product not found');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('product', $this->productsupplier->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        $resultsupplier = 0;
-        if ($result > 0) {
-            $resultsupplier = $this->productsupplier->remove_product_fournisseur_price($priceid);
-        }
-
-        return $resultsupplier;
-    }
-
-    /**
-     * Get a list of all purchase prices of products
-     *
-     * @param  string $sortfield  Sort field
-     * @param  string $sortorder  Sort order
-     * @param  int    $limit      Limit for list
-     * @param  int    $page       Page number
-     * @param  int    $mode       Use this param to filter list (0 for all, 1 for only product, 2 for only service)
-     * @param  int    $category   Use this param to filter list by category of product
-     * @param  int    $supplier   Use this param to filter list by supplier
-     * @param  string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.tobuy:=:0) and (t.tosell:=:1)"
-     * @return array              Array of product objects
-     *
-     * @url GET purchase_prices
-     */
-    public function getSupplierProducts($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $supplier = 0, $sqlfilters = '')
-    {
-        global $db, $conf;
-
-        $obj_ret = array();
-
-        $socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : '';
-
-        $sql = "SELECT t.rowid, t.ref, t.ref_ext";
-        $sql .= " FROM ".MAIN_DB_PREFIX."product as t";
-        if ($category > 0) {
-            $sql .= ", ".MAIN_DB_PREFIX."categorie_product as c";
-        }
-        $sql .= ", ".MAIN_DB_PREFIX."product_fournisseur_price as s";
-
-        $sql .= ' WHERE t.entity IN ('.getEntity('product').')';
-
-        if ($supplier > 0) {
-        	$sql .= " AND s.fk_soc = ".$this->db->escape($supplier);
-        }
-        $sql .= " AND s.fk_product = t.rowid";
-        // Select products of given category
-        if ($category > 0) {
-        	$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
-            $sql .= " AND c.fk_product = t.rowid";
-        }
-        if ($mode == 1) {
-            // Show only products
-            $sql .= " AND t.fk_product_type = 0";
-        } elseif ($mode == 2) {
-            // Show only services
-            $sql .= " AND t.fk_product_type = 1";
-        }
-        // Add sql filters
-        if ($sqlfilters) {
-            if (!DolibarrApi::_checkFilters($sqlfilters)) {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
-        $result = $this->db->query($sql);
-        if ($result) {
-        	$num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            $i = 0;
-            while ($i < $min)
-            {
-            	$obj = $this->db->fetch_object($result);
-
-                $product_fourn = new ProductFournisseur($this->db);
-                $product_fourn_list = $product_fourn->list_product_fournisseur_price($obj->rowid, '', '', 0, 0);
-                foreach ($product_fourn_list as $tmpobj) {
-                    $this->_cleanObjectDatas($tmpobj);
-                }
-
-                //var_dump($product_fourn_list->db);exit;
-                $obj_ret[$obj->rowid] = $product_fourn_list;
-
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve product list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No product found');
-        }
-        return $obj_ret;
-    }
-
-    /**
-     * Get purchase prices for a product
-     *
-     * Return an array with product information.
-     * TODO implement getting a product by ref or by $ref_ext
-     *
-     * @param  int    $id               ID of product
-     * @param  string $ref              Ref of element
-     * @param  string $ref_ext          Ref ext of element
-     * @param  string $barcode          Barcode of element
-     * @return array|mixed              Data without useless information
-     *
-     * @url GET {id}/purchase_prices
-     *
-     * @throws RestException 401
-     * @throws RestException 403
-     * @throws RestException 404
-     *
-     */
-    public function getPurchasePrices($id, $ref = '', $ref_ext = '', $barcode = '')
-    {
-        if (empty($id) && empty($ref) && empty($ref_ext) && empty($barcode)) {
-            throw new RestException(400, 'bad value for parameter id, ref, ref_ext or barcode');
-        }
-
-        $id = (empty($id) ? 0 : $id);
-
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(403);
-        }
-
-        $result = $this->product->fetch($id, $ref, $ref_ext, $barcode);
-        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);
-        }
-
-        $product_fourn_list = array();
-
-        if ($result) {
-            $product_fourn = new ProductFournisseur($this->db);
-            $product_fourn_list = $product_fourn->list_product_fournisseur_price($this->product->id, '', '', 0, 0);
-        }
-
-        foreach ($product_fourn_list as $tmpobj) {
-            $this->_cleanObjectDatas($tmpobj);
-        }
-
-        return $this->_cleanObjectDatas($product_fourn_list);
-    }
-
-    /**
-     * Get attributes.
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'ref',
+		'label'
+	);
+
+	/**
+	 * @var Product $product {@type Product}
+	 */
+	public $product;
+
+	/**
+	 * @var ProductFournisseur $productsupplier {@type ProductFournisseur}
+	 */
+	public $productsupplier;
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+
+		$this->db = $db;
+		$this->product = new Product($this->db);
+		$this->productsupplier = new ProductFournisseur($this->db);
+	}
+
+	/**
+	 * Get properties of a product object by id
 	 *
-     * @param  string $sortfield  Sort field
-     * @param  string $sortorder  Sort order
-     * @param  int    $limit      Limit for list
-     * @param  int    $page       Page number
-     * @param  string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:color)"
-     * @return array
-     *
-     * @throws RestException
-     *
-     * @url GET attributes
-     */
-    public function getAttributes($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
+	 * Return an array with product information.
+	 *
+	 * @param  int    $id                  ID of product
+	 * @param  int    $includestockdata    Load also information about stock (slower)
+	 * @param  bool   $includesubproducts  Load information about subproducts
+	 * @param  bool   $includeparentid     Load also ID of parent product (if product is a variant of a parent product)
+	 * @return array|mixed                 Data without useless information
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 403
+	 * @throws RestException 404
+	 */
+	public function get($id, $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
+	{
+		return $this->_fetch($id, '', '', '', $includestockdata, $includesubproducts, $includeparentid);
+	}
 
-        $sql = "SELECT t.rowid, t.ref, t.ref_ext, t.label, t.rang, t.entity";
-        $sql .= " FROM ".MAIN_DB_PREFIX."product_attribute as t";
-        $sql .= ' WHERE t.entity IN ('.getEntity('product').')';
+	/**
+	 * Get properties of a product object by ref
+	 *
+	 * Return an array with product information.
+	 *
+	 * @param  string $ref                Ref of element
+	 * @param  int    $includestockdata   Load also information about stock (slower)
+	 * @param  bool   $includesubproducts Load information about subproducts
+	 * @param  bool   $includeparentid    Load also ID of parent product (if product is a variant of a parent product)
+	 *
+	 * @return array|mixed                 Data without useless information
+	 *
+	 * @url GET ref/{ref}
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 403
+	 * @throws RestException 404
+	 */
+	public function getByRef($ref, $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
+	{
+		return $this->_fetch('', $ref, '', '', $includestockdata, $includesubproducts, $includeparentid);
+	}
 
-        // Add sql filters
-        if ($sqlfilters) {
-            if (!DolibarrApi::_checkFilters($sqlfilters)) {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+	/**
+	 * Get properties of a product object by ref_ext
+	 *
+	 * Return an array with product information.
+	 *
+	 * @param  string $ref_ext            Ref_ext of element
+	 * @param  int    $includestockdata   Load also information about stock (slower)
+	 * @param  bool   $includesubproducts Load information about subproducts
+	 * @param  bool   $includeparentid    Load also ID of parent product (if product is a variant of a parent product)
+	 *
+	 * @return array|mixed Data without useless information
+	 *
+	 * @url GET ref_ext/{ref_ext}
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 403
+	 * @throws RestException 404
+	 */
+	public function getByRefExt($ref_ext, $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
+	{
+		return $this->_fetch('', '', $ref_ext, '', $includestockdata, $includesubproducts, $includeparentid);
+	}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+	/**
+	 * Get properties of a product object by barcode
+	 *
+	 * Return an array with product information.
+	 *
+	 * @param  string $barcode            Barcode of element
+	 * @param  int    $includestockdata   Load also information about stock (slower)
+	 * @param  bool   $includesubproducts Load information about subproducts
+	 * @param  bool   $includeparentid    Load also ID of parent product (if product is a variant of a parent product)
+	 *
+	 * @return array|mixed Data without useless information
+	 *
+	 * @url GET barcode/{barcode}
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 403
+	 * @throws RestException 404
+	 */
+	public function getByBarcode($barcode, $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
+	{
+		return $this->_fetch('', '', '', $barcode, $includestockdata, $includesubproducts, $includeparentid);
+	}
 
-            $sql .= $this->db->plimit($limit, $offset);
-        }
+	/**
+	 * List products
+	 *
+	 * Get a list of products
+	 *
+	 * @param  string $sortfield  Sort field
+	 * @param  string $sortorder  Sort order
+	 * @param  int    $limit      Limit for list
+	 * @param  int    $page       Page number
+	 * @param  int    $mode       Use this param to filter list (0 for all, 1 for only product, 2 for only service)
+	 * @param  int    $category   Use this param to filter list by category
+	 * @param  string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.tobuy:=:0) and (t.tosell:=:1)"
+	 * @return array                Array of product objects
+	 */
+	public function index($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $result = $this->db->query($sql);
+		$obj_ret = array();
 
-        if (!$result) {
-            throw new RestException(503, 'Error when retrieve product attribute list : '.$this->db->lasterror());
-        }
+		$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : '';
 
-        $return = [];
-        while ($result = $this->db->fetch_object($query)) {
-            $tmp = new ProductAttribute($this->db);
-            $tmp->id = $result->rowid;
-            $tmp->ref = $result->ref;
-            $tmp->ref_ext = $result->ref_ext;
-            $tmp->label = $result->label;
-            $tmp->rang = $result->rang;
-            $tmp->entity = $result->entity;
+		$sql = "SELECT t.rowid, t.ref, t.ref_ext";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product as t";
+		if ($category > 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."categorie_product as c";
+		}
+		$sql .= ' WHERE t.entity IN ('.getEntity('product').')';
+		// Select products of given category
+		if ($category > 0) {
+			$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
+			$sql .= " AND c.fk_product = t.rowid ";
+		}
+		if ($mode == 1) {
+			// Show only products
+			$sql .= " AND t.fk_product_type = 0";
+		} elseif ($mode == 2) {
+			// Show only services
+			$sql .= " AND t.fk_product_type = 1";
+		}
+		// Add sql filters
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-            $return[] = $this->_cleanObjectDatas($tmp);
-        }
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-        if (!count($return)) {
-            throw new RestException(404, 'No product attribute found');
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        return $return;
-    }
+		$result = $this->db->query($sql);
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			$i = 0;
+			while ($i < $min)
+			{
+				$obj = $this->db->fetch_object($result);
+				$product_static = new Product($this->db);
+				if ($product_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($product_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve product list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No product found');
+		}
+		return $obj_ret;
+	}
 
-    /**
-     * Get attribute by ID.
-     *
-     * @param  int $id ID of Attribute
-     * @return array
-     *
-     * @throws RestException
-     * @throws RestException 401
-     * @throws RestException 404
-     *
-     * @url GET attributes/{id}
-     */
-    public function getAttributeById($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Create product object
+	 *
+	 * @param  array $request_data Request data
+	 * @return int     ID of product
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->creer) {
+			throw new RestException(401);
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        $prodattr = new ProductAttribute($this->db);
-        $result = $prodattr->fetch((int) $id);
+		foreach ($request_data as $field => $value) {
+			$this->product->$field = $value;
+		}
+		if ($this->product->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, "Error creating product", array_merge(array($this->product->error), $this->product->errors));
+		}
 
-        if ($result < 0) {
-            throw new RestException(404, "Product attribute not found");
-        }
+		return $this->product->id;
+	}
 
-        $fields = ["id", "ref", "ref_ext", "label", "rang", "entity"];
+	/**
+	 * Update product.
+	 * Price will be updated by this API only if option is set on "One price per product". See other APIs for other price modes.
+	 *
+	 * @param  int   $id           Id of product to update
+	 * @param  array $request_data Datas
+	 * @return int
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 */
+	public function put($id, $request_data = null)
+	{
+		global $conf;
 
-        foreach ($prodattr as $field => $value) {
-            if (!in_array($field, $fields)) {
-                unset($prodattr->{$field});
-            }
-        }
+		if (!DolibarrApiAccess::$user->rights->produit->creer) {
+			throw new RestException(401);
+		}
 
-        $sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination2val as pac2v";
-        $sql .= " JOIN ".MAIN_DB_PREFIX."product_attribute_combination as pac ON pac2v.fk_prod_combination = pac.rowid";
-        $sql .= " WHERE pac2v.fk_prod_attr = ".((int) $prodattr->id)." AND pac.entity IN (".getEntity('product').")";
+		$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);
+		}
+
+		$oldproduct = dol_clone($this->product, 0);
+
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') { continue;
+			}
+			if ($field == 'stock_reel') {
+				throw new RestException(400, 'Stock reel cannot be updated here. Use the /stockmovements endpoint instead');
+			}
+			$this->product->$field = $value;
+		}
+
+		$updatetype = false;
+		if ($this->product->type != $oldproduct->type && ($this->product->isProduct() || $this->product->isService())) {
+			$updatetype = true;
+		}
+
+		$result = $this->product->update($id, DolibarrApiAccess::$user, 1, 'update', $updatetype);
+
+		// If price mode is 1 price per product
+		if ($result > 0 && !empty($conf->global->PRODUCT_PRICE_UNIQ)) {
+			// We update price only if it was changed
+			$pricemodified = false;
+			if ($this->product->price_base_type != $oldproduct->price_base_type) { $pricemodified = true;
+			} else {
+				if ($this->product->tva_tx != $oldproduct->tva_tx) { $pricemodified = true;
+				}
+				if ($this->product->tva_npr != $oldproduct->tva_npr) { $pricemodified = true;
+				}
+				if ($this->product->default_vat_code != $oldproduct->default_vat_code) { $pricemodified = true;
+				}
+
+				if ($this->product->price_base_type == 'TTC') {
+					if ($this->product->price_ttc != $oldproduct->price_ttc) { $pricemodified = true;
+					}
+					if ($this->product->price_min_ttc != $oldproduct->price_min_ttc) { $pricemodified = true;
+					}
+				} else {
+					if ($this->product->price != $oldproduct->price) { $pricemodified = true;
+					}
+					if ($this->product->price_min != $oldproduct->price_min) { $pricemodified = true;
+					}
+				}
+			}
+
+			if ($pricemodified) {
+				$newvat = $this->product->tva_tx;
+				$newnpr = $this->product->tva_npr;
+				$newvatsrccode = $this->product->default_vat_code;
+
+				$newprice = $this->product->price;
+				$newpricemin = $this->product->price_min;
+				if ($this->product->price_base_type == 'TTC') {
+					$newprice = $this->product->price_ttc;
+					$newpricemin = $this->product->price_min_ttc;
+				}
+
+				$result = $this->product->updatePrice($newprice, $this->product->price_base_type, DolibarrApiAccess::$user, $newvat, $newpricemin, 0, $newnpr, 0, 0, array(), $newvatsrccode);
+			}
+		}
+
+		if ($result <= 0) {
+			throw new RestException(500, "Error updating product", array_merge(array($this->product->error), $this->product->errors));
+		}
+
+		return $this->get($id);
+	}
+
+	/**
+	 * Delete product
+	 *
+	 * @param  int 		$id 		Product ID
+	 * @return array
+	 */
+	public function delete($id)
+	{
+		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);
+		}
+
+		// The Product::delete() method uses the global variable $user.
+		global $user;
+		$user = DolibarrApiAccess::$user;
+
+		return $this->product->delete(DolibarrApiAccess::$user);
+	}
+
+	/**
+	 * Get the list of subproducts of the product.
+	 *
+	 * @param  int $id      Id of parent product/service
+	 * @return array
+	 *
+	 * @throws RestException
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 *
+	 * @url GET {id}/subproducts
+	 */
+	public function getSubproducts($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('product', $id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$childsArbo = $this->product->getChildsArbo($id, 1);
+
+		$keys = ['rowid', 'qty', 'fk_product_type', 'label', 'incdec'];
+		$childs = [];
+		foreach ($childsArbo as $values) {
+			$childs[] = array_combine($keys, $values);
+		}
+
+		return $childs;
+	}
+
+	/**
+	 * Add subproduct.
+	 *
+	 * Link a product/service to a parent product/service
+	 *
+	 * @param  int $id            Id of parent product/service
+	 * @param  int $subproduct_id Id of child product/service
+	 * @param  int $qty           Quantity
+	 * @param  int $incdec        1=Increase/decrease stock of child when parent stock increase/decrease
+	 * @return int
+	 *
+	 * @throws RestException
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 *
+	 * @url POST {id}/subproducts/add
+	 */
+	public function addSubproducts($id, $subproduct_id, $qty, $incdec = 1)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->creer) {
+			throw new RestException(401);
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('product', $id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$result = $this->product->add_sousproduit($id, $subproduct_id, $qty, $incdec);
+		if ($result <= 0) {
+			throw new RestException(500, "Error adding product child");
+		}
+		return $result;
+	}
+
+	/**
+	 * Remove subproduct.
+	 * Unlink a product/service from a parent product/service
+	 *
+	 * @param  int $id             Id of parent product/service
+	 * @param  int $subproduct_id  Id of child product/service
+	 * @return int
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 *
+	 * @url DELETE {id}/subproducts/remove/{subproduct_id}
+	 */
+	public function delSubproducts($id, $subproduct_id)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->creer) {
+			throw new RestException(401);
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('product', $id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$result = $this->product->del_sousproduit($id, $subproduct_id);
+		if ($result <= 0) {
+			throw new RestException(500, "Error while removing product child");
+		}
+		return $result;
+	}
+
+
+	/**
+	 * Get categories for a product
+	 *
+	 * @param int    $id        ID of product
+	 * @param string $sortfield Sort field
+	 * @param string $sortorder Sort order
+	 * @param int    $limit     Limit for list
+	 * @param int    $page      Page number
+	 *
+	 * @return mixed
+	 *
+	 * @url GET {id}/categories
+	 */
+	public function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
+			throw new RestException(401);
+		}
+
+		$categories = new Categorie($this->db);
+
+		$result = $categories->getListForItem($id, 'product', $sortfield, $sortorder, $limit, $page);
+
+		if (empty($result)) {
+			throw new RestException(404, 'No category found');
+		}
+
+		if ($result < 0) {
+			throw new RestException(503, 'Error when retrieve category list : '.array_merge(array($categories->error), $categories->errors));
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Get prices per segment for a product
+	 *
+	 * @param int $id ID of product
+	 *
+	 * @return mixed
+	 *
+	 * @url GET {id}/selling_multiprices/per_segment
+	 */
+	public function getCustomerPricesPerSegment($id)
+	{
+		global $conf;
+
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
+
+		if (empty($conf->global->PRODUIT_MULTIPRICES)) {
+			throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
+		}
+
+		$result = $this->product->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Product not found');
+		}
+
+		if ($result < 0) {
+			throw new RestException(503, 'Error when retrieve prices list : '.array_merge(array($this->product->error), $this->product->errors));
+		}
+
+		return array(
+			'multiprices'=>$this->product->multiprices,
+			'multiprices_inc_tax'=>$this->product->multiprices_ttc,
+			'multiprices_min'=>$this->product->multiprices_min,
+			'multiprices_min_inc_tax'=>$this->product->multiprices_min_ttc,
+			'multiprices_vat'=>$this->product->multiprices_tva_tx,
+			'multiprices_base_type'=>$this->product->multiprices_base_type,
+			//'multiprices_default_vat_code'=>$this->product->multiprices_default_vat_code
+		);
+	}
+
+	/**
+	 * Get prices per customer for a product
+	 *
+	 * @param int $id ID of product
+	 * @param string   	$thirdparty_id	  Thirdparty id to filter orders of (example '1') {@pattern /^[0-9,]*$/i}
+	 *
+	 * @return mixed
+	 *
+	 * @url GET {id}/selling_multiprices/per_customer
+	 */
+	public function getCustomerPricesPerCustomer($id, $thirdparty_id = '')
+	{
+		global $conf;
+
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
+
+		if (empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+			throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
+		}
+
+		$result = $this->product->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Product not found');
+		}
+
+		if ($result > 0) {
+			require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
+			$prodcustprice = new Productcustomerprice($this->db);
+			$filter = array();
+			$filter['t.fk_product'] .= $id;
+			if ($thirdparty_id) $filter['t.fk_soc'] .= $thirdparty_id;
+			$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
+		}
+
+		if (empty($prodcustprice->lines)) {
+			throw new RestException(404, 'Prices not found');
+		}
+
+		return $prodcustprice->lines;
+	}
+
+	/**
+	 * Get prices per quantity for a product
+	 *
+	 * @param int $id ID of product
+	 *
+	 * @return mixed
+	 *
+	 * @url GET {id}/selling_multiprices/per_quantity
+	 */
+	public function getCustomerPricesPerQuantity($id)
+	{
+		global $conf;
+
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
+
+		if (empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
+			throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
+		}
+
+		$result = $this->product->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Product not found');
+		}
+
+		if ($result < 0) {
+			throw new RestException(503, 'Error when retrieve prices list : '.array_merge(array($this->product->error), $this->product->errors));
+		}
+
+		return array(
+			'prices_by_qty'=>$this->product->prices_by_qty[0], // 1 if price by quantity was activated for the product
+			'prices_by_qty_list'=>$this->product->prices_by_qty_list[0]
+		);
+	}
+
+	/**
+	 * Add/Update purchase prices for a product.
+	 *
+	 * @param   int         $id                             ID of Product
+	 * @param  	float		$qty				            Min quantity for which price is valid
+	 * @param  	float		$buyprice			            Purchase price for the quantity min
+	 * @param  	string		$price_base_type	            HT or TTC
+	 * @param  	int		    $fourn_id                       Supplier ID
+	 * @param  	int			$availability		            Product availability
+	 * @param	string		$ref_fourn			            Supplier ref
+	 * @param	float		$tva_tx				            New VAT Rate (For example 8.5. Should not be a string)
+	 * @param  	string		$charges			            costs affering to product
+	 * @param  	float		$remise_percent		            Discount  regarding qty (percent)
+	 * @param  	float		$remise				            Discount  regarding qty (amount)
+	 * @param  	int			$newnpr				            Set NPR or not
+	 * @param	int			$delivery_time_days	            Delay in days for delivery (max). May be '' if not defined.
+	 * @param   string      $supplier_reputation            Reputation with this product to the defined supplier (empty, FAVORITE, DONOTORDER)
+	 * @param   array		$localtaxes_array	            Array with localtaxes info array('0'=>type1,'1'=>rate1,'2'=>type2,'3'=>rate2) (loaded by getLocalTaxesFromRate(vatrate, 0, ...) function).
+	 * @param   string  	$newdefaultvatcode              Default vat code
+	 * @param  	float		$multicurrency_buyprice 	    Purchase price for the quantity min in currency
+	 * @param  	string		$multicurrency_price_base_type	HT or TTC in currency
+	 * @param  	float		$multicurrency_tx	            Rate currency
+	 * @param  	string		$multicurrency_code	            Currency code
+	 * @param  	string		$desc_fourn     	            Custom description for product_fourn_price
+	 * @param  	string		$barcode     	                Barcode
+	 * @param  	int		    $fk_barcode_type     	        Barcode type
+	 * @return int
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 *
+	 * @url POST {id}/purchase_prices
+	 */
+	public function addPurchasePrice($id, $qty, $buyprice, $price_base_type, $fourn_id, $availability, $ref_fourn, $tva_tx, $charges = 0, $remise_percent = 0, $remise = 0, $newnpr = 0, $delivery_time_days = 0, $supplier_reputation = '', $localtaxes_array = array(), $newdefaultvatcode = '', $multicurrency_buyprice = 0, $multicurrency_price_base_type = 'HT', $multicurrency_tx = 1, $multicurrency_code = '', $desc_fourn = '', $barcode = '', $fk_barcode_type = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->creer) {
+			throw new RestException(401);
+		}
+
+		$result = $this->productsupplier->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Product not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('product', $this->productsupplier->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$result = $this->productsupplier->add_fournisseur(DolibarrApiAccess::$user, $fourn_id, $ref_fourn, $qty);
+		if ($result < 0) {
+			throw new RestException(500, "Error adding supplier to product : ".$this->db->lasterror());
+		}
+
+		$fourn = new Fournisseur($this->db);
+		$result = $fourn->fetch($fourn_id);
+		if ($result <= 0) {
+			throw new RestException(404, 'Supplier not found');
+		}
+
+		$result = $this->productsupplier->update_buyprice($qty, $buyprice, DolibarrApiAccess::$user, $price_base_type, $fourn, $availability, $ref_fourn, $tva_tx, $charges, $remise_percent, $remise, $newnpr, $delivery_time_days, $supplier_reputation, $localtaxes_array, $newdefaultvatcode, $multicurrency_buyprice, $multicurrency_price_base_type, $multicurrency_tx, $multicurrency_code, $desc_fourn, $barcode, $fk_barcode_type);
+
+		if ($result <= 0) {
+			throw new RestException(500, "Error updating buy price : ".$this->db->lasterror());
+		}
+		return (int) $this->productsupplier->product_fourn_price_id;
+	}
+
+	/**
+	 * Delete purchase price for a product
+	 *
+	 * @param  int $id Product ID
+	 * @param  int $priceid purchase price ID
+	 *
+	 * @url DELETE {id}/purchase_prices/{priceid}
+	 *
+	 * @return int
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 *
+	 */
+	public function deletePurchasePrice($id, $priceid)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
+			throw new RestException(401);
+		}
+		$result = $this->productsupplier->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Product not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('product', $this->productsupplier->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$resultsupplier = 0;
+		if ($result > 0) {
+			$resultsupplier = $this->productsupplier->remove_product_fournisseur_price($priceid);
+		}
+
+		return $resultsupplier;
+	}
+
+	/**
+	 * Get a list of all purchase prices of products
+	 *
+	 * @param  string $sortfield  Sort field
+	 * @param  string $sortorder  Sort order
+	 * @param  int    $limit      Limit for list
+	 * @param  int    $page       Page number
+	 * @param  int    $mode       Use this param to filter list (0 for all, 1 for only product, 2 for only service)
+	 * @param  int    $category   Use this param to filter list by category of product
+	 * @param  int    $supplier   Use this param to filter list by supplier
+	 * @param  string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.tobuy:=:0) and (t.tosell:=:1)"
+	 * @return array              Array of product objects
+	 *
+	 * @url GET purchase_prices
+	 */
+	public function getSupplierProducts($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $supplier = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
+
+		$obj_ret = array();
+
+		$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : '';
+
+		$sql = "SELECT t.rowid, t.ref, t.ref_ext";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product as t";
+		if ($category > 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."categorie_product as c";
+		}
+		$sql .= ", ".MAIN_DB_PREFIX."product_fournisseur_price as s";
+
+		$sql .= ' WHERE t.entity IN ('.getEntity('product').')';
+
+		if ($supplier > 0) {
+			$sql .= " AND s.fk_soc = ".$this->db->escape($supplier);
+		}
+		$sql .= " AND s.fk_product = t.rowid";
+		// Select products of given category
+		if ($category > 0) {
+			$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
+			$sql .= " AND c.fk_product = t.rowid";
+		}
+		if ($mode == 1) {
+			// Show only products
+			$sql .= " AND t.fk_product_type = 0";
+		} elseif ($mode == 2) {
+			// Show only services
+			$sql .= " AND t.fk_product_type = 1";
+		}
+		// Add sql filters
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
+		$result = $this->db->query($sql);
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			$i = 0;
+			while ($i < $min)
+			{
+				$obj = $this->db->fetch_object($result);
+
+				$product_fourn = new ProductFournisseur($this->db);
+				$product_fourn_list = $product_fourn->list_product_fournisseur_price($obj->rowid, '', '', 0, 0);
+				foreach ($product_fourn_list as $tmpobj) {
+					$this->_cleanObjectDatas($tmpobj);
+				}
+
+				//var_dump($product_fourn_list->db);exit;
+				$obj_ret[$obj->rowid] = $product_fourn_list;
+
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve product list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No product found');
+		}
+		return $obj_ret;
+	}
+
+	/**
+	 * Get purchase prices for a product
+	 *
+	 * Return an array with product information.
+	 * TODO implement getting a product by ref or by $ref_ext
+	 *
+	 * @param  int    $id               ID of product
+	 * @param  string $ref              Ref of element
+	 * @param  string $ref_ext          Ref ext of element
+	 * @param  string $barcode          Barcode of element
+	 * @return array|mixed              Data without useless information
+	 *
+	 * @url GET {id}/purchase_prices
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 403
+	 * @throws RestException 404
+	 *
+	 */
+	public function getPurchasePrices($id, $ref = '', $ref_ext = '', $barcode = '')
+	{
+		if (empty($id) && empty($ref) && empty($ref_ext) && empty($barcode)) {
+			throw new RestException(400, 'bad value for parameter id, ref, ref_ext or barcode');
+		}
+
+		$id = (empty($id) ? 0 : $id);
+
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(403);
+		}
+
+		$result = $this->product->fetch($id, $ref, $ref_ext, $barcode);
+		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);
+		}
+
+		$product_fourn_list = array();
+
+		if ($result) {
+			$product_fourn = new ProductFournisseur($this->db);
+			$product_fourn_list = $product_fourn->list_product_fournisseur_price($this->product->id, '', '', 0, 0);
+		}
+
+		foreach ($product_fourn_list as $tmpobj) {
+			$this->_cleanObjectDatas($tmpobj);
+		}
+
+		return $this->_cleanObjectDatas($product_fourn_list);
+	}
+
+	/**
+	 * Get attributes.
+	 *
+	 * @param  string $sortfield  Sort field
+	 * @param  string $sortorder  Sort order
+	 * @param  int    $limit      Limit for list
+	 * @param  int    $page       Page number
+	 * @param  string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:color)"
+	 * @return array
+	 *
+	 * @throws RestException
+	 *
+	 * @url GET attributes
+	 */
+	public function getAttributes($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
+
+		$sql = "SELECT t.rowid, t.ref, t.ref_ext, t.label, t.rang, t.entity";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_attribute as t";
+		$sql .= ' WHERE t.entity IN ('.getEntity('product').')';
+
+		// Add sql filters
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if (!$result) {
+			throw new RestException(503, 'Error when retrieve product attribute list : '.$this->db->lasterror());
+		}
+
+		$return = [];
+		while ($result = $this->db->fetch_object($query)) {
+			$tmp = new ProductAttribute($this->db);
+			$tmp->id = $result->rowid;
+			$tmp->ref = $result->ref;
+			$tmp->ref_ext = $result->ref_ext;
+			$tmp->label = $result->label;
+			$tmp->rang = $result->rang;
+			$tmp->entity = $result->entity;
+
+			$return[] = $this->_cleanObjectDatas($tmp);
+		}
+
+		if (!count($return)) {
+			throw new RestException(404, 'No product attribute found');
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Get attribute by ID.
+	 *
+	 * @param  int $id ID of Attribute
+	 * @return array
+	 *
+	 * @throws RestException
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 *
+	 * @url GET attributes/{id}
+	 */
+	public function getAttributeById($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
+
+		$prodattr = new ProductAttribute($this->db);
+		$result = $prodattr->fetch((int) $id);
+
+		if ($result < 0) {
+			throw new RestException(404, "Product attribute not found");
+		}
+
+		$fields = ["id", "ref", "ref_ext", "label", "rang", "entity"];
+
+		foreach ($prodattr as $field => $value) {
+			if (!in_array($field, $fields)) {
+				unset($prodattr->{$field});
+			}
+		}
+
+		$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination2val as pac2v";
+		$sql .= " JOIN ".MAIN_DB_PREFIX."product_attribute_combination as pac ON pac2v.fk_prod_combination = pac.rowid";
+		$sql .= " WHERE pac2v.fk_prod_attr = ".((int) $prodattr->id)." AND pac.entity IN (".getEntity('product').")";
 
 		$resql = $this->db->query($sql);
-        $obj = $this->db->fetch_object($resql);
-        $prodattr->is_used_by_products = (int) $obj->nb;
+		$obj = $this->db->fetch_object($resql);
+		$prodattr->is_used_by_products = (int) $obj->nb;
 
-        return $prodattr;
-    }
+		return $prodattr;
+	}
 
-    /**
-     * Get attributes by ref.
-     *
-     * @param  string $ref Reference of Attribute
-     * @return array
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     *
-     * @url GET attributes/ref/{ref}
-     */
-    public function getAttributesByRef($ref)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get attributes by ref.
+	 *
+	 * @param  string $ref Reference of Attribute
+	 * @return array
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 *
+	 * @url GET attributes/ref/{ref}
+	 */
+	public function getAttributesByRef($ref)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
 
-        $sql = "SELECT rowid, ref, ref_ext, label, rang, entity FROM ".MAIN_DB_PREFIX."product_attribute WHERE ref LIKE '".trim($ref)."' AND entity IN (".getEntity('product').")";
+		$sql = "SELECT rowid, ref, ref_ext, label, rang, entity FROM ".MAIN_DB_PREFIX."product_attribute WHERE ref LIKE '".trim($ref)."' AND entity IN (".getEntity('product').")";
 
-        $query = $this->db->query($sql);
+		$query = $this->db->query($sql);
 
-        if (!$this->db->num_rows($query)) {
-            throw new RestException(404);
-        }
+		if (!$this->db->num_rows($query)) {
+			throw new RestException(404);
+		}
 
-        $result = $this->db->fetch_object($query);
+		$result = $this->db->fetch_object($query);
 
-        $attr = [];
-        $attr['id'] = $result->rowid;
-        $attr['ref'] = $result->ref;
-        $attr['ref_ext'] = $result->ref_ext;
-        $attr['label'] = $result->label;
-        $attr['rang'] = $result->rang;
+		$attr = [];
+		$attr['id'] = $result->rowid;
+		$attr['ref'] = $result->ref;
+		$attr['ref_ext'] = $result->ref_ext;
+		$attr['label'] = $result->label;
+		$attr['rang'] = $result->rang;
 		$attr['entity'] = $result->entity;
 
-        $sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination2val as pac2v";
-        $sql .= " JOIN ".MAIN_DB_PREFIX."product_attribute_combination as pac ON pac2v.fk_prod_combination = pac.rowid";
-        $sql .= " WHERE pac2v.fk_prod_attr = ".((int) $result->rowid)." AND pac.entity IN (".getEntity('product').")";
+		$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination2val as pac2v";
+		$sql .= " JOIN ".MAIN_DB_PREFIX."product_attribute_combination as pac ON pac2v.fk_prod_combination = pac.rowid";
+		$sql .= " WHERE pac2v.fk_prod_attr = ".((int) $result->rowid)." AND pac.entity IN (".getEntity('product').")";
 
 		$resql = $this->db->query($sql);
-        $obj = $this->db->fetch_object($resql);
+		$obj = $this->db->fetch_object($resql);
 
-        $attr["is_used_by_products"] = (int) $obj->nb;
+		$attr["is_used_by_products"] = (int) $obj->nb;
 
-        return $attr;
-    }
+		return $attr;
+	}
 
-    /**
-     * Get attributes by ref_ext.
-     *
-     * @param  string $ref_ext External reference of Attribute
-     * @return array
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     *
-     * @url GET attributes/ref_ext/{ref_ext}
-     */
-    public function getAttributesByRefExt($ref_ext)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get attributes by ref_ext.
+	 *
+	 * @param  string $ref_ext External reference of Attribute
+	 * @return array
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 *
+	 * @url GET attributes/ref_ext/{ref_ext}
+	 */
+	public function getAttributesByRefExt($ref_ext)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
 
-        $sql = "SELECT rowid, ref, ref_ext, label, rang, entity FROM ".MAIN_DB_PREFIX."product_attribute WHERE ref_ext LIKE '".trim($ref_ext)."' AND entity IN (".getEntity('product').")";
+		$sql = "SELECT rowid, ref, ref_ext, label, rang, entity FROM ".MAIN_DB_PREFIX."product_attribute WHERE ref_ext LIKE '".trim($ref_ext)."' AND entity IN (".getEntity('product').")";
 
-        $query = $this->db->query($sql);
+		$query = $this->db->query($sql);
 
-        if (!$this->db->num_rows($query)) {
-            throw new RestException(404);
-        }
+		if (!$this->db->num_rows($query)) {
+			throw new RestException(404);
+		}
 
-        $result = $this->db->fetch_object($query);
+		$result = $this->db->fetch_object($query);
 
-        $attr = [];
-        $attr['id'] = $result->rowid;
-        $attr['ref'] = $result->ref;
-        $attr['ref_ext'] = $result->ref_ext;
-        $attr['label'] = $result->label;
-        $attr['rang'] = $result->rang;
+		$attr = [];
+		$attr['id'] = $result->rowid;
+		$attr['ref'] = $result->ref;
+		$attr['ref_ext'] = $result->ref_ext;
+		$attr['label'] = $result->label;
+		$attr['rang'] = $result->rang;
 		$attr['entity'] = $result->entity;
 
-        $sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination2val as pac2v";
-        $sql .= " JOIN ".MAIN_DB_PREFIX."product_attribute_combination as pac ON pac2v.fk_prod_combination = pac.rowid";
-        $sql .= " WHERE pac2v.fk_prod_attr = ".((int) $result->rowid)." AND pac.entity IN (".getEntity('product').")";
+		$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination2val as pac2v";
+		$sql .= " JOIN ".MAIN_DB_PREFIX."product_attribute_combination as pac ON pac2v.fk_prod_combination = pac.rowid";
+		$sql .= " WHERE pac2v.fk_prod_attr = ".((int) $result->rowid)." AND pac.entity IN (".getEntity('product').")";
 
 		$resql = $this->db->query($sql);
-        $obj = $this->db->fetch_object($resql);
-        $attr["is_used_by_products"] = (int) $obj->nb;
+		$obj = $this->db->fetch_object($resql);
+		$attr["is_used_by_products"] = (int) $obj->nb;
 
-        return $attr;
-    }
+		return $attr;
+	}
 
-    /**
-     * Add attributes.
-     *
-     * @param  string $ref   Reference of Attribute
-     * @param  string $label Label of Attribute
-     * @param  string $ref_ext   Reference of Attribute
-     * @return int
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     *
-     * @url POST attributes
-     */
-    public function addAttributes($ref, $label, $ref_ext = '')
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Add attributes.
+	 *
+	 * @param  string $ref   Reference of Attribute
+	 * @param  string $label Label of Attribute
+	 * @param  string $ref_ext   Reference of Attribute
+	 * @return int
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 *
+	 * @url POST attributes
+	 */
+	public function addAttributes($ref, $label, $ref_ext = '')
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->creer) {
+			throw new RestException(401);
+		}
 
-        $prodattr = new ProductAttribute($this->db);
-        $prodattr->label = $label;
-        $prodattr->ref = $ref;
-        $prodattr->ref_ext = $ref_ext;
+		$prodattr = new ProductAttribute($this->db);
+		$prodattr->label = $label;
+		$prodattr->ref = $ref;
+		$prodattr->ref_ext = $ref_ext;
 
-        $resid = $prodattr->create(DolibarrApiAccess::$user);
-        if ($resid <= 0) {
-            throw new RestException(500, "Error creating new attribute");
-        }
-        return $resid;
-    }
+		$resid = $prodattr->create(DolibarrApiAccess::$user);
+		if ($resid <= 0) {
+			throw new RestException(500, "Error creating new attribute");
+		}
+		return $resid;
+	}
 
-    /**
-     * Update attributes by id.
-     *
-     * @param  int $id    ID of Attribute
-     * @param  array $request_data Datas
-     * @return array
-     *
-     * @throws RestException
-     * @throws RestException 401
-     * @throws RestException 404
-     *
-     * @url PUT attributes/{id}
-     */
-    public function putAttributes($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Update attributes by id.
+	 *
+	 * @param  int $id    ID of Attribute
+	 * @param  array $request_data Datas
+	 * @return array
+	 *
+	 * @throws RestException
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 *
+	 * @url PUT attributes/{id}
+	 */
+	public function putAttributes($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->creer) {
+			throw new RestException(401);
+		}
 
-        $prodattr = new ProductAttribute($this->db);
+		$prodattr = new ProductAttribute($this->db);
 
-        $result = $prodattr->fetch((int) $id);
-        if ($result == 0) {
-            throw new RestException(404, 'Attribute not found');
-        } elseif ($result < 0) {
-            throw new RestException(500, "Error fetching attribute");
-        }
+		$result = $prodattr->fetch((int) $id);
+		if ($result == 0) {
+			throw new RestException(404, 'Attribute not found');
+		} elseif ($result < 0) {
+			throw new RestException(500, "Error fetching attribute");
+		}
 
-        foreach ($request_data as $field => $value) {
-            if ($field == 'rowid') { continue;
-            }
-            $prodattr->$field = $value;
-        }
+		foreach ($request_data as $field => $value) {
+			if ($field == 'rowid') { continue;
+			}
+			$prodattr->$field = $value;
+		}
 
-        if ($prodattr->update(DolibarrApiAccess::$user) > 0) {
-            $result = $prodattr->fetch((int) $id);
-            if ($result == 0) {
-                throw new RestException(404, 'Attribute not found');
-            } elseif ($result < 0) {
-                throw new RestException(500, "Error fetching attribute");
-            } else {
-                return $prodattr;
-            }
-        }
-        throw new RestException(500, "Error updating attribute");
-    }
+		if ($prodattr->update(DolibarrApiAccess::$user) > 0) {
+			$result = $prodattr->fetch((int) $id);
+			if ($result == 0) {
+				throw new RestException(404, 'Attribute not found');
+			} elseif ($result < 0) {
+				throw new RestException(500, "Error fetching attribute");
+			} else {
+				return $prodattr;
+			}
+		}
+		throw new RestException(500, "Error updating attribute");
+	}
 
-    /**
-     * Delete attributes by id.
-     *
-     * @param  int $id 	ID of Attribute
-     * @return int		Result of deletion
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     *
-     * @url DELETE attributes/{id}
-     */
-    public function deleteAttributes($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Delete attributes by id.
+	 *
+	 * @param  int $id 	ID of Attribute
+	 * @return int		Result of deletion
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 *
+	 * @url DELETE attributes/{id}
+	 */
+	public function deleteAttributes($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
+			throw new RestException(401);
+		}
 
-        $prodattr = new ProductAttribute($this->db);
-        $prodattr->id = (int) $id;
-        $result = $prodattr->delete(DolibarrApiAccess::$user);
+		$prodattr = new ProductAttribute($this->db);
+		$prodattr->id = (int) $id;
+		$result = $prodattr->delete(DolibarrApiAccess::$user);
 
-        if ($result <= 0) {
-            throw new RestException(500, "Error deleting attribute");
-        }
+		if ($result <= 0) {
+			throw new RestException(500, "Error deleting attribute");
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Get attribute value by id.
-     *
-     * @param  int $id ID of Attribute value
-     * @return array
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     *
-     * @url GET attributes/values/{id}
-     */
-    public function getAttributeValueById($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get attribute value by id.
+	 *
+	 * @param  int $id ID of Attribute value
+	 * @return array
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 *
+	 * @url GET attributes/values/{id}
+	 */
+	public function getAttributeValueById($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
 
-        $sql = "SELECT rowid, fk_product_attribute, ref, value FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE rowid = ".(int) $id." AND entity IN (".getEntity('product').")";
+		$sql = "SELECT rowid, fk_product_attribute, ref, value FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE rowid = ".(int) $id." AND entity IN (".getEntity('product').")";
 
-        $query = $this->db->query($sql);
+		$query = $this->db->query($sql);
 
-        if (!$query) {
-            throw new RestException(401);
-        }
+		if (!$query) {
+			throw new RestException(401);
+		}
 
-        if (!$this->db->num_rows($query)) {
-            throw new RestException(404, 'Attribute value not found');
-        }
+		if (!$this->db->num_rows($query)) {
+			throw new RestException(404, 'Attribute value not found');
+		}
 
-        $result = $this->db->fetch_object($query);
+		$result = $this->db->fetch_object($query);
 
-        $attrval = [];
-        $attrval['id'] = $result->rowid;
-        $attrval['fk_product_attribute'] = $result->fk_product_attribute;
-        $attrval['ref'] = $result->ref;
-        $attrval['value'] = $result->value;
+		$attrval = [];
+		$attrval['id'] = $result->rowid;
+		$attrval['fk_product_attribute'] = $result->fk_product_attribute;
+		$attrval['ref'] = $result->ref;
+		$attrval['value'] = $result->value;
 
-        return $attrval;
-    }
+		return $attrval;
+	}
 
-    /**
-     * Get attribute value by ref.
-     *
-     * @param  int $id ID of Attribute value
-     * @param  string $ref Ref of Attribute value
-     * @return array
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     *
-     * @url GET attributes/{id}/values/ref/{ref}
-     */
-    public function getAttributeValueByRef($id, $ref)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get attribute value by ref.
+	 *
+	 * @param  int $id ID of Attribute value
+	 * @param  string $ref Ref of Attribute value
+	 * @return array
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 *
+	 * @url GET attributes/{id}/values/ref/{ref}
+	 */
+	public function getAttributeValueByRef($id, $ref)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
 
-        $sql = "SELECT rowid, fk_product_attribute, ref, value FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE ref LIKE '".trim($ref)."' AND fk_product_attribute = ".(int) $id." AND entity IN (".getEntity('product').")";
+		$sql = "SELECT rowid, fk_product_attribute, ref, value FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE ref LIKE '".trim($ref)."' AND fk_product_attribute = ".(int) $id." AND entity IN (".getEntity('product').")";
 
-        $query = $this->db->query($sql);
+		$query = $this->db->query($sql);
 
-        if (!$query) {
-            throw new RestException(401);
-        }
+		if (!$query) {
+			throw new RestException(401);
+		}
 
-        if (!$this->db->num_rows($query)) {
-            throw new RestException(404, 'Attribute value not found');
-        }
+		if (!$this->db->num_rows($query)) {
+			throw new RestException(404, 'Attribute value not found');
+		}
 
-        $result = $this->db->fetch_object($query);
+		$result = $this->db->fetch_object($query);
 
-        $attrval = [];
-        $attrval['id'] = $result->rowid;
-        $attrval['fk_product_attribute'] = $result->fk_product_attribute;
-        $attrval['ref'] = $result->ref;
-        $attrval['value'] = $result->value;
+		$attrval = [];
+		$attrval['id'] = $result->rowid;
+		$attrval['fk_product_attribute'] = $result->fk_product_attribute;
+		$attrval['ref'] = $result->ref;
+		$attrval['value'] = $result->value;
 
-        return $attrval;
-    }
+		return $attrval;
+	}
 
-    /**
-     * Delete attribute value by ref.
-     *
-     * @param  int $id ID of Attribute
-     * @param  string $ref Ref of Attribute value
-     * @return int
-     *
-     * @throws RestException 401
-     *
-     * @url DELETE attributes/{id}/values/ref/{ref}
-     */
-    public function deleteAttributeValueByRef($id, $ref)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Delete attribute value by ref.
+	 *
+	 * @param  int $id ID of Attribute
+	 * @param  string $ref Ref of Attribute value
+	 * @return int
+	 *
+	 * @throws RestException 401
+	 *
+	 * @url DELETE attributes/{id}/values/ref/{ref}
+	 */
+	public function deleteAttributeValueByRef($id, $ref)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
+			throw new RestException(401);
+		}
 
-        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE ref LIKE '".trim($ref)."' AND fk_product_attribute = ".(int) $id." AND entity IN (".getEntity('product').")";
-        $query = $this->db->query($sql);
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE ref LIKE '".trim($ref)."' AND fk_product_attribute = ".(int) $id." AND entity IN (".getEntity('product').")";
+		$query = $this->db->query($sql);
 
-        if (!$query) {
-            throw new RestException(401);
-        }
+		if (!$query) {
+			throw new RestException(401);
+		}
 
-        if (!$this->db->num_rows($query)) {
-            throw new RestException(404, 'Attribute value not found');
-        }
+		if (!$this->db->num_rows($query)) {
+			throw new RestException(404, 'Attribute value not found');
+		}
 
-        $result = $this->db->fetch_object($query);
+		$result = $this->db->fetch_object($query);
 
-        $attrval = new ProductAttributeValue($this->db);
-        $attrval->id = $result->rowid;
-        $result = $attrval->delete(DolibarrApiAccess::$user);
-        if ($result > 0) {
-            return 1;
-        }
+		$attrval = new ProductAttributeValue($this->db);
+		$attrval->id = $result->rowid;
+		$result = $attrval->delete(DolibarrApiAccess::$user);
+		if ($result > 0) {
+			return 1;
+		}
 
-        throw new RestException(500, "Error deleting attribute value");
-    }
+		throw new RestException(500, "Error deleting attribute value");
+	}
 
-    /**
-     * Get all values for an attribute id.
-     *
-     * @param  int $id ID of an Attribute
-     * @return array
-     *
-     * @throws RestException 401
-     * @throws RestException 500
-     *
-     * @url GET attributes/{id}/values
-     */
-    public function getAttributeValues($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get all values for an attribute id.
+	 *
+	 * @param  int $id ID of an Attribute
+	 * @return array
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 500
+	 *
+	 * @url GET attributes/{id}/values
+	 */
+	public function getAttributeValues($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
 
-        $objectval = new ProductAttributeValue($this->db);
+		$objectval = new ProductAttributeValue($this->db);
 
-        $return = $objectval->fetchAllByProductAttribute((int) $id);
+		$return = $objectval->fetchAllByProductAttribute((int) $id);
 
-        if (count($return) == 0) {
-            throw new RestException(404, 'Attribute values not found');
-        }
+		if (count($return) == 0) {
+			throw new RestException(404, 'Attribute values not found');
+		}
 
 		foreach ($return as $key => $val) {
 			$return[$key] = $this->_cleanObjectDatas($return[$key]);
-        }
+		}
 
-        return $return;
-    }
+		return $return;
+	}
 
-    /**
-     * Get all values for an attribute ref.
-     *
-     * @param  string $ref Ref of an Attribute
-     * @return array
-     *
-     * @throws RestException 401
-     *
-     * @url GET attributes/ref/{ref}/values
-     */
-    public function getAttributeValuesByRef($ref)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get all values for an attribute ref.
+	 *
+	 * @param  string $ref Ref of an Attribute
+	 * @return array
+	 *
+	 * @throws RestException 401
+	 *
+	 * @url GET attributes/ref/{ref}/values
+	 */
+	public function getAttributeValuesByRef($ref)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
 
-        $return = array();
+		$return = array();
 
-        $sql = 'SELECT ';
-        $sql .= 'v.fk_product_attribute, v.rowid, v.ref, v.value FROM '.MAIN_DB_PREFIX.'product_attribute_value as v';
-        $sql .= " WHERE v.fk_product_attribute IN (SELECT rowid FROM ".MAIN_DB_PREFIX."product_attribute WHERE ref LIKE '".$this->db->escape(trim($ref))."')";
+		$sql = 'SELECT ';
+		$sql .= 'v.fk_product_attribute, v.rowid, v.ref, v.value FROM '.MAIN_DB_PREFIX.'product_attribute_value as v';
+		$sql .= " WHERE v.fk_product_attribute IN (SELECT rowid FROM ".MAIN_DB_PREFIX."product_attribute WHERE ref LIKE '".$this->db->escape(trim($ref))."')";
 
-        $resql = $this->db->query($sql);
+		$resql = $this->db->query($sql);
 
-        while ($result = $this->db->fetch_object($resql)) {
-            $tmp = new ProductAttributeValue($this->db);
-            $tmp->fk_product_attribute = $result->fk_product_attribute;
-            $tmp->id = $result->rowid;
-            $tmp->ref = $result->ref;
-            $tmp->value = $result->value;
+		while ($result = $this->db->fetch_object($resql)) {
+			$tmp = new ProductAttributeValue($this->db);
+			$tmp->fk_product_attribute = $result->fk_product_attribute;
+			$tmp->id = $result->rowid;
+			$tmp->ref = $result->ref;
+			$tmp->value = $result->value;
 
-            $return[] = $this->_cleanObjectDatas($tmp);
-        }
+			$return[] = $this->_cleanObjectDatas($tmp);
+		}
 
-        return $return;
-    }
+		return $return;
+	}
 
-    /**
-     * Add attribute value.
-     *
-     * @param  int    $id    ID of Attribute
-     * @param  string $ref   Reference of Attribute value
-     * @param  string $value Value of Attribute value
-     * @return int
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     *
-     * @url POST attributes/{id}/values
-     */
-    public function addAttributeValue($id, $ref, $value)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Add attribute value.
+	 *
+	 * @param  int    $id    ID of Attribute
+	 * @param  string $ref   Reference of Attribute value
+	 * @param  string $value Value of Attribute value
+	 * @return int
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 *
+	 * @url POST attributes/{id}/values
+	 */
+	public function addAttributeValue($id, $ref, $value)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->creer) {
+			throw new RestException(401);
+		}
 
-        if (empty($ref) || empty($value)) {
-            throw new RestException(401);
-        }
+		if (empty($ref) || empty($value)) {
+			throw new RestException(401);
+		}
 
-        $objectval = new ProductAttributeValue($this->db);
-        $objectval->fk_product_attribute = $id;
-        $objectval->ref = $ref;
-        $objectval->value = $value;
+		$objectval = new ProductAttributeValue($this->db);
+		$objectval->fk_product_attribute = $id;
+		$objectval->ref = $ref;
+		$objectval->value = $value;
 
-        if ($objectval->create(DolibarrApiAccess::$user) > 0) {
-            return $objectval->id;
-        }
-        throw new RestException(500, "Error creating new attribute value");
-    }
+		if ($objectval->create(DolibarrApiAccess::$user) > 0) {
+			return $objectval->id;
+		}
+		throw new RestException(500, "Error creating new attribute value");
+	}
 
-    /**
-     * Update attribute value.
-     *
-     * @param  int $id ID of Attribute
-     * @param  array $request_data Datas
-     * @return array
-     *
-     * @throws RestException 401
-     * @throws RestException 500
-     *
-     * @url PUT attributes/values/{id}
-     */
-    public function putAttributeValue($id, $request_data)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Update attribute value.
+	 *
+	 * @param  int $id ID of Attribute
+	 * @param  array $request_data Datas
+	 * @return array
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 500
+	 *
+	 * @url PUT attributes/values/{id}
+	 */
+	public function putAttributeValue($id, $request_data)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->creer) {
+			throw new RestException(401);
+		}
 
-        $objectval = new ProductAttributeValue($this->db);
-        $result = $objectval->fetch((int) $id);
+		$objectval = new ProductAttributeValue($this->db);
+		$result = $objectval->fetch((int) $id);
 
-        if ($result == 0) {
-            throw new RestException(404, 'Attribute value not found');
-        } elseif ($result < 0) {
-            throw new RestException(500, "Error fetching attribute value");
-        }
+		if ($result == 0) {
+			throw new RestException(404, 'Attribute value not found');
+		} elseif ($result < 0) {
+			throw new RestException(500, "Error fetching attribute value");
+		}
 
-        foreach ($request_data as $field => $value) {
-            if ($field == 'rowid') { continue;
-            }
-            $objectval->$field = $value;
-        }
+		foreach ($request_data as $field => $value) {
+			if ($field == 'rowid') { continue;
+			}
+			$objectval->$field = $value;
+		}
 
-        if ($objectval->update(DolibarrApiAccess::$user) > 0) {
-            $result = $objectval->fetch((int) $id);
-            if ($result == 0) {
-                throw new RestException(404, 'Attribute not found');
-            } elseif ($result < 0) {
-                throw new RestException(500, "Error fetching attribute");
-            } else {
-                return $objectval;
-            }
-        }
-        throw new RestException(500, "Error updating attribute");
-    }
+		if ($objectval->update(DolibarrApiAccess::$user) > 0) {
+			$result = $objectval->fetch((int) $id);
+			if ($result == 0) {
+				throw new RestException(404, 'Attribute not found');
+			} elseif ($result < 0) {
+				throw new RestException(500, "Error fetching attribute");
+			} else {
+				return $objectval;
+			}
+		}
+		throw new RestException(500, "Error updating attribute");
+	}
 
-    /**
-     * Delete attribute value by id.
-     *
-     * @param  int $id ID of Attribute value
-     * @return int
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     *
-     * @url DELETE attributes/values/{id}
-     */
-    public function deleteAttributeValueById($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Delete attribute value by id.
+	 *
+	 * @param  int $id ID of Attribute value
+	 * @return int
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 *
+	 * @url DELETE attributes/values/{id}
+	 */
+	public function deleteAttributeValueById($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
+			throw new RestException(401);
+		}
 
-        $objectval = new ProductAttributeValue($this->db);
-        $objectval->id = (int) $id;
+		$objectval = new ProductAttributeValue($this->db);
+		$objectval->id = (int) $id;
 
-        if ($objectval->delete(DolibarrApiAccess::$user) > 0) {
-            return 1;
-        }
-        throw new RestException(500, "Error deleting attribute value");
-    }
+		if ($objectval->delete(DolibarrApiAccess::$user) > 0) {
+			return 1;
+		}
+		throw new RestException(500, "Error deleting attribute value");
+	}
 
-    /**
-     * Get product variants.
-     *
-     * @param  int $id ID of Product
-     * @return array
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     *
-     * @url GET {id}/variants
-     */
-    public function getVariants($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get product variants.
+	 *
+	 * @param  int $id ID of Product
+	 * @return array
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 *
+	 * @url GET {id}/variants
+	 */
+	public function getVariants($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
 
-        $prodcomb = new ProductCombination($this->db);
-        $combinations = $prodcomb->fetchAllByFkProductParent((int) $id);
+		$prodcomb = new ProductCombination($this->db);
+		$combinations = $prodcomb->fetchAllByFkProductParent((int) $id);
 
-        foreach ($combinations as $key => $combination) {
-            $prodc2vp = new ProductCombination2ValuePair($this->db);
-            $combinations[$key]->attributes = $prodc2vp->fetchByFkCombination((int) $combination->id);
-        }
+		foreach ($combinations as $key => $combination) {
+			$prodc2vp = new ProductCombination2ValuePair($this->db);
+			$combinations[$key]->attributes = $prodc2vp->fetchByFkCombination((int) $combination->id);
+		}
 
-        return $combinations;
-    }
+		return $combinations;
+	}
 
-    /**
-     * Get product variants by Product ref.
-     *
-     * @param  string $ref Ref of Product
-     * @return array
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     *
-     * @url GET ref/{ref}/variants
-     */
-    public function getVariantsByProdRef($ref)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get product variants by Product ref.
+	 *
+	 * @param  string $ref Ref of Product
+	 * @return array
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 *
+	 * @url GET ref/{ref}/variants
+	 */
+	public function getVariantsByProdRef($ref)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->product->fetch('', $ref);
-        if (!$result) {
-            throw new RestException(404, 'Product not found');
-        }
+		$result = $this->product->fetch('', $ref);
+		if (!$result) {
+			throw new RestException(404, 'Product not found');
+		}
 
-        $prodcomb = new ProductCombination($this->db);
-        $combinations = $prodcomb->fetchAllByFkProductParent((int) $this->product->id);
+		$prodcomb = new ProductCombination($this->db);
+		$combinations = $prodcomb->fetchAllByFkProductParent((int) $this->product->id);
 
-        foreach ($combinations as $key => $combination) {
-            $prodc2vp = new ProductCombination2ValuePair($this->db);
-            $combinations[$key]->attributes = $prodc2vp->fetchByFkCombination((int) $combination->id);
-        }
+		foreach ($combinations as $key => $combination) {
+			$prodc2vp = new ProductCombination2ValuePair($this->db);
+			$combinations[$key]->attributes = $prodc2vp->fetchByFkCombination((int) $combination->id);
+		}
 
-        return $combinations;
-    }
+		return $combinations;
+	}
 
-    /**
-     * Add variant.
-     *
-     * "features" is a list of attributes pairs id_attribute=>id_value. Example: array(id_color=>id_Blue, id_size=>id_small, id_option=>id_val_a, ...)
-     *
-     * @param  int $id ID of Product
-     * @param  float $weight_impact Weight impact of variant
-     * @param  float $price_impact Price impact of variant
-     * @param  bool $price_impact_is_percent Price impact in percent (true or false)
-     * @param  array $features List of attributes pairs id_attribute->id_value. Example: array(id_color=>id_Blue, id_size=>id_small, id_option=>id_val_a, ...)
-     * @param  string $reference Customized reference of variant
-     * @param  string $ref_ext External reference of variant
-     * @return int
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     * @throws RestException 404
-     *
-     * @url POST {id}/variants
-     */
-    public function addVariant($id, $weight_impact, $price_impact, $price_impact_is_percent, $features, $reference = '', $ref_ext = '')
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Add variant.
+	 *
+	 * "features" is a list of attributes pairs id_attribute=>id_value. Example: array(id_color=>id_Blue, id_size=>id_small, id_option=>id_val_a, ...)
+	 *
+	 * @param  int $id ID of Product
+	 * @param  float $weight_impact Weight impact of variant
+	 * @param  float $price_impact Price impact of variant
+	 * @param  bool $price_impact_is_percent Price impact in percent (true or false)
+	 * @param  array $features List of attributes pairs id_attribute->id_value. Example: array(id_color=>id_Blue, id_size=>id_small, id_option=>id_val_a, ...)
+	 * @param  string $reference Customized reference of variant
+	 * @param  string $ref_ext External reference of variant
+	 * @return int
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 *
+	 * @url POST {id}/variants
+	 */
+	public function addVariant($id, $weight_impact, $price_impact, $price_impact_is_percent, $features, $reference = '', $ref_ext = '')
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->creer) {
+			throw new RestException(401);
+		}
 
-        if (empty($id) || empty($features) || !is_array($features)) {
-            throw new RestException(401);
-        }
+		if (empty($id) || empty($features) || !is_array($features)) {
+			throw new RestException(401);
+		}
 
-        $weight_impact = price2num($weight_impact);
-        $price_impact = price2num($price_impact);
+		$weight_impact = price2num($weight_impact);
+		$price_impact = price2num($price_impact);
 
-        $prodattr = new ProductAttribute($this->db);
-        $prodattr_val = new ProductAttributeValue($this->db);
-        foreach ($features as $id_attr => $id_value) {
-            if ($prodattr->fetch((int) $id_attr) < 0) {
-                throw new RestException(401);
-            }
-            if ($prodattr_val->fetch((int) $id_value) < 0) {
-                throw new RestException(401);
-            }
-        }
+		$prodattr = new ProductAttribute($this->db);
+		$prodattr_val = new ProductAttributeValue($this->db);
+		foreach ($features as $id_attr => $id_value) {
+			if ($prodattr->fetch((int) $id_attr) < 0) {
+				throw new RestException(401);
+			}
+			if ($prodattr_val->fetch((int) $id_value) < 0) {
+				throw new RestException(401);
+			}
+		}
 
-        $result = $this->product->fetch((int) $id);
-        if (!$result) {
-            throw new RestException(404, 'Product not found');
-        }
+		$result = $this->product->fetch((int) $id);
+		if (!$result) {
+			throw new RestException(404, 'Product not found');
+		}
 
-        $prodcomb = new ProductCombination($this->db);
+		$prodcomb = new ProductCombination($this->db);
 
-        $result = $prodcomb->createProductCombination(DolibarrApiAccess::$user, $this->product, $features, array(), $price_impact_is_percent, $price_impact, $weight_impact, $reference, $ref_ext);
-        if ($result > 0)
-        {
-            return $result;
-        } else {
-            throw new RestException(500, "Error creating new product variant");
-        }
-    }
+		$result = $prodcomb->createProductCombination(DolibarrApiAccess::$user, $this->product, $features, array(), $price_impact_is_percent, $price_impact, $weight_impact, $reference, $ref_ext);
+		if ($result > 0)
+		{
+			return $result;
+		} else {
+			throw new RestException(500, "Error creating new product variant");
+		}
+	}
 
-    /**
-     * Add variant by product ref.
-     *
-     * "features" is a list of attributes pairs id_attribute=>id_value. Example: array(id_color=>id_Blue, id_size=>id_small, id_option=>id_val_a, ...)
-     *
-     * @param  string $ref                      Ref of Product
-     * @param  float  $weight_impact            Weight impact of variant
-     * @param  float  $price_impact             Price impact of variant
-     * @param  bool   $price_impact_is_percent  Price impact in percent (true or false)
-     * @param  array  $features                 List of attributes pairs id_attribute->id_value. Example: array(id_color=>id_Blue, id_size=>id_small, id_option=>id_val_a, ...)
-     * @return int
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     * @throws RestException 404
-     *
-     * @url POST ref/{ref}/variants
-     */
-    public function addVariantByProductRef($ref, $weight_impact, $price_impact, $price_impact_is_percent, $features)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Add variant by product ref.
+	 *
+	 * "features" is a list of attributes pairs id_attribute=>id_value. Example: array(id_color=>id_Blue, id_size=>id_small, id_option=>id_val_a, ...)
+	 *
+	 * @param  string $ref                      Ref of Product
+	 * @param  float  $weight_impact            Weight impact of variant
+	 * @param  float  $price_impact             Price impact of variant
+	 * @param  bool   $price_impact_is_percent  Price impact in percent (true or false)
+	 * @param  array  $features                 List of attributes pairs id_attribute->id_value. Example: array(id_color=>id_Blue, id_size=>id_small, id_option=>id_val_a, ...)
+	 * @return int
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 *
+	 * @url POST ref/{ref}/variants
+	 */
+	public function addVariantByProductRef($ref, $weight_impact, $price_impact, $price_impact_is_percent, $features)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->creer) {
+			throw new RestException(401);
+		}
 
-        if (empty($ref) || empty($features) || !is_array($features)) {
-            throw new RestException(401);
-        }
+		if (empty($ref) || empty($features) || !is_array($features)) {
+			throw new RestException(401);
+		}
 
-        $weight_impact = price2num($weight_impact);
-        $price_impact = price2num($price_impact);
+		$weight_impact = price2num($weight_impact);
+		$price_impact = price2num($price_impact);
 
-        $prodattr = new ProductAttribute($this->db);
-        $prodattr_val = new ProductAttributeValue($this->db);
-        foreach ($features as $id_attr => $id_value) {
-            if ($prodattr->fetch((int) $id_attr) < 0) {
-                throw new RestException(404);
-            }
-            if ($prodattr_val->fetch((int) $id_value) < 0) {
-                throw new RestException(404);
-            }
-        }
+		$prodattr = new ProductAttribute($this->db);
+		$prodattr_val = new ProductAttributeValue($this->db);
+		foreach ($features as $id_attr => $id_value) {
+			if ($prodattr->fetch((int) $id_attr) < 0) {
+				throw new RestException(404);
+			}
+			if ($prodattr_val->fetch((int) $id_value) < 0) {
+				throw new RestException(404);
+			}
+		}
 
-        $result = $this->product->fetch('', trim($ref));
-        if (!$result) {
-            throw new RestException(404, 'Product not found');
-        }
+		$result = $this->product->fetch('', trim($ref));
+		if (!$result) {
+			throw new RestException(404, 'Product not found');
+		}
 
-        $prodcomb = new ProductCombination($this->db);
-        if (!$prodcomb->fetchByProductCombination2ValuePairs($this->product->id, $features))
-        {
-            $result = $prodcomb->createProductCombination(DolibarrApiAccess::$user, $this->product, $features, array(), $price_impact_is_percent, $price_impact, $weight_impact);
-            if ($result > 0)
-            {
-                return $result;
-            } else {
-                throw new RestException(500, "Error creating new product variant");
-            }
-        } else {
-            return $prodcomb->id;
-        }
-    }
+		$prodcomb = new ProductCombination($this->db);
+		if (!$prodcomb->fetchByProductCombination2ValuePairs($this->product->id, $features))
+		{
+			$result = $prodcomb->createProductCombination(DolibarrApiAccess::$user, $this->product, $features, array(), $price_impact_is_percent, $price_impact, $weight_impact);
+			if ($result > 0)
+			{
+				return $result;
+			} else {
+				throw new RestException(500, "Error creating new product variant");
+			}
+		} else {
+			return $prodcomb->id;
+		}
+	}
 
-    /**
-     * Put product variants.
-     *
-     * @param  int $id ID of Variant
-     * @param  array $request_data Datas
-     * @return int
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     *
-     * @url PUT variants/{id}
-     */
-    public function putVariant($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Put product variants.
+	 *
+	 * @param  int $id ID of Variant
+	 * @param  array $request_data Datas
+	 * @return int
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 *
+	 * @url PUT variants/{id}
+	 */
+	public function putVariant($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->creer) {
+			throw new RestException(401);
+		}
 
-        $prodcomb = new ProductCombination($this->db);
-        $prodcomb->fetch((int) $id);
+		$prodcomb = new ProductCombination($this->db);
+		$prodcomb->fetch((int) $id);
 
-        foreach ($request_data as $field => $value) {
-            if ($field == 'rowid') { continue;
-            }
-            $prodcomb->$field = $value;
-        }
+		foreach ($request_data as $field => $value) {
+			if ($field == 'rowid') { continue;
+			}
+			$prodcomb->$field = $value;
+		}
 
-        $result = $prodcomb->update(DolibarrApiAccess::$user);
-        if ($result > 0)
-        {
-            return 1;
-        }
-        throw new RestException(500, "Error editing variant");
-    }
+		$result = $prodcomb->update(DolibarrApiAccess::$user);
+		if ($result > 0)
+		{
+			return 1;
+		}
+		throw new RestException(500, "Error editing variant");
+	}
 
-    /**
-     * Delete product variants.
-     *
-     * @param  int $id 	ID of Variant
-     * @return int		Result of deletion
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     *
-     * @url DELETE variants/{id}
-     */
-    public function deleteVariant($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Delete product variants.
+	 *
+	 * @param  int $id 	ID of Variant
+	 * @return int		Result of deletion
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 *
+	 * @url DELETE variants/{id}
+	 */
+	public function deleteVariant($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
+			throw new RestException(401);
+		}
 
-        $prodcomb = new ProductCombination($this->db);
-        $prodcomb->id = (int) $id;
-        $result = $prodcomb->delete(DolibarrApiAccess::$user);
-        if ($result <= 0)
-        {
-            throw new RestException(500, "Error deleting variant");
-        }
-        return $result;
-    }
+		$prodcomb = new ProductCombination($this->db);
+		$prodcomb->id = (int) $id;
+		$result = $prodcomb->delete(DolibarrApiAccess::$user);
+		if ($result <= 0)
+		{
+			throw new RestException(500, "Error deleting variant");
+		}
+		return $result;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param  object $object Object to clean
-     * @return array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->regeximgext);
-        unset($object->price_by_qty);
-        unset($object->prices_by_qty_id);
-        unset($object->libelle);
-        unset($object->product_id_already_linked);
-        unset($object->reputations);
+		unset($object->regeximgext);
+		unset($object->price_by_qty);
+		unset($object->prices_by_qty_id);
+		unset($object->libelle);
+		unset($object->product_id_already_linked);
+		unset($object->reputations);
 
-        unset($object->name);
-        unset($object->firstname);
-        unset($object->lastname);
-        unset($object->civility_id);
+		unset($object->name);
+		unset($object->firstname);
+		unset($object->lastname);
+		unset($object->civility_id);
 
-        unset($object->recuperableonly);
+		unset($object->recuperableonly);
 
-        return $object;
-    }
+		return $object;
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param  array $data Datas to validate
-     * @return array
-     * @throws RestException
-     */
-    private function _validate($data)
-    {
-        $product = array();
-        foreach (Products::$FIELDS as $field) {
-            if (!isset($data[$field])) {
-                throw new RestException(400, "$field field missing");
-            }
-            $product[$field] = $data[$field];
-        }
-        return $product;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param  array $data Datas to validate
+	 * @return array
+	 * @throws RestException
+	 */
+	private function _validate($data)
+	{
+		$product = array();
+		foreach (Products::$FIELDS as $field) {
+			if (!isset($data[$field])) {
+				throw new RestException(400, "$field field missing");
+			}
+			$product[$field] = $data[$field];
+		}
+		return $product;
+	}
 
-    /**
-     * Get properties of a product object
-     *
-     * Return an array with product information.
-     *
-     * @param  int    $id                 ID of product
-     * @param  string $ref                Ref of element
-     * @param  string $ref_ext            Ref ext of element
-     * @param  string $barcode            Barcode of element
-     * @param  int    $includestockdata   Load also information about stock (slower)
-     * @param  bool   $includesubproducts Load information about subproducts (if product is a virtual product)
+	/**
+	 * Get properties of a product object
+	 *
+	 * Return an array with product information.
+	 *
+	 * @param  int    $id                 ID of product
+	 * @param  string $ref                Ref of element
+	 * @param  string $ref_ext            Ref ext of element
+	 * @param  string $barcode            Barcode of element
+	 * @param  int    $includestockdata   Load also information about stock (slower)
+	 * @param  bool   $includesubproducts Load information about subproducts (if product is a virtual product)
 	 * @param  bool   $includeparentid    Load also ID of parent product (if product is a variant of a parent product)
-     * @return array|mixed                Data without useless information
-     *
-     * @throws RestException 401
-     * @throws RestException 403
-     * @throws RestException 404
-     */
-    private function _fetch($id, $ref = '', $ref_ext = '', $barcode = '', $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
-    {
-        if (empty($id) && empty($ref) && empty($ref_ext) && empty($barcode)) {
-            throw new RestException(400, 'bad value for parameter id, ref, ref_ext or barcode');
-        }
+	 * @return array|mixed                Data without useless information
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 403
+	 * @throws RestException 404
+	 */
+	private function _fetch($id, $ref = '', $ref_ext = '', $barcode = '', $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
+	{
+		if (empty($id) && empty($ref) && empty($ref_ext) && empty($barcode)) {
+			throw new RestException(400, 'bad value for parameter id, ref, ref_ext or barcode');
+		}
 
-        $id = (empty($id) ? 0 : $id);
+		$id = (empty($id) ? 0 : $id);
 
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(403);
-        }
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(403);
+		}
 
-        $result = $this->product->fetch($id, $ref, $ref_ext, $barcode);
-        if (!$result) {
-            throw new RestException(404, 'Product not found');
-        }
+		$result = $this->product->fetch($id, $ref, $ref_ext, $barcode);
+		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 (!DolibarrApi::_checkAccessToResource('product', $this->product->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if ($includestockdata) {
-            $this->product->load_stock();
+		if ($includestockdata) {
+			$this->product->load_stock();
 
-            if (is_array($this->product->stock_warehouse)) {
-                foreach ($this->product->stock_warehouse as $keytmp => $valtmp) {
-                    if (is_array($this->product->stock_warehouse[$keytmp]->detail_batch)) {
-                        foreach ($this->product->stock_warehouse[$keytmp]->detail_batch as $keytmp2 => $valtmp2) {
-                            unset($this->product->stock_warehouse[$keytmp]->detail_batch[$keytmp2]->db);
-                        }
-                    }
-                }
-            }
-        }
+			if (is_array($this->product->stock_warehouse)) {
+				foreach ($this->product->stock_warehouse as $keytmp => $valtmp) {
+					if (is_array($this->product->stock_warehouse[$keytmp]->detail_batch)) {
+						foreach ($this->product->stock_warehouse[$keytmp]->detail_batch as $keytmp2 => $valtmp2) {
+							unset($this->product->stock_warehouse[$keytmp]->detail_batch[$keytmp2]->db);
+						}
+					}
+				}
+			}
+		}
 
-        if ($includesubproducts) {
-            $childsArbo = $this->product->getChildsArbo($id, 1);
+		if ($includesubproducts) {
+			$childsArbo = $this->product->getChildsArbo($id, 1);
 
-            $keys = ['rowid', 'qty', 'fk_product_type', 'label', 'incdec'];
-            $childs = [];
-            foreach ($childsArbo as $values) {
-                $childs[] = array_combine($keys, $values);
-            }
+			$keys = ['rowid', 'qty', 'fk_product_type', 'label', 'incdec'];
+			$childs = [];
+			foreach ($childsArbo as $values) {
+				$childs[] = array_combine($keys, $values);
+			}
 
-            $this->product->sousprods = $childs;
-        }
+			$this->product->sousprods = $childs;
+		}
 
 		if ($includeparentid) {
 			$prodcomb = new ProductCombination($this->db);
@@ -1857,6 +1857,6 @@ class Products extends DolibarrApi
 			}
 		}
 
-        return $this->_cleanObjectDatas($this->product);
-    }
+		return $this->_cleanObjectDatas($this->product);
+	}
 }
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index a0fd2bdb10c..eed18bbf8bd 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -30,9 +30,9 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 class FormProduct
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -55,23 +55,23 @@ class FormProduct
 	}
 
 
-    /**
-     * Load in cache array list of warehouses
-     * If fk_product is not 0, we do not use cache
-     *
-     * @param	int		    $fk_product			Add quantity of stock in label for product with id fk_product. Nothing if 0.
-     * @param	string	    $batch				Add quantity of batch stock in label for product with batch name batch, batch name precedes batch_id. Nothing if ''.
-     * @param	string	    $status				warehouse status filter, following comma separated filter options can be used
-     *                      				    'warehouseopen' = select products from open warehouses,
-     *                      				    'warehouseclosed' = select products from closed warehouses,
-     *                      				    'warehouseinternal' = select products from warehouses for internal correct/transfer only
-     * @param	boolean	    $sumStock		    sum total stock of a warehouse, default true
-     * @param	string      $exclude            warehouses ids to exclude
-     * @param   bool|int    $stockMin           [=false] Value of minimum stock to filter or false not not filter by minimum stock
-     * @param   string      $orderBy            [='e.ref'] Order by
-     * @return  int                             Nb of loaded lines, 0 if already loaded, <0 if KO
-     * @throws  Exception
-     */
+	/**
+	 * Load in cache array list of warehouses
+	 * If fk_product is not 0, we do not use cache
+	 *
+	 * @param	int		    $fk_product			Add quantity of stock in label for product with id fk_product. Nothing if 0.
+	 * @param	string	    $batch				Add quantity of batch stock in label for product with batch name batch, batch name precedes batch_id. Nothing if ''.
+	 * @param	string	    $status				warehouse status filter, following comma separated filter options can be used
+	 *                      				    'warehouseopen' = select products from open warehouses,
+	 *                      				    'warehouseclosed' = select products from closed warehouses,
+	 *                      				    'warehouseinternal' = select products from warehouses for internal correct/transfer only
+	 * @param	boolean	    $sumStock		    sum total stock of a warehouse, default true
+	 * @param	string      $exclude            warehouses ids to exclude
+	 * @param   bool|int    $stockMin           [=false] Value of minimum stock to filter or false not not filter by minimum stock
+	 * @param   string      $orderBy            [='e.ref'] Order by
+	 * @return  int                             Nb of loaded lines, 0 if already loaded, <0 if KO
+	 * @throws  Exception
+	 */
 	public function loadWarehouses($fk_product = 0, $batch = '', $status = '', $sumStock = true, $exclude = '', $stockMin = false, $orderBy = 'e.ref')
 	{
 		global $conf, $langs;
@@ -129,25 +129,25 @@ class FormProduct
 		if (!empty($exclude)) $sql .= ' AND e.rowid NOT IN('.$this->db->escape(implode(',', $exclude)).')';
 
 		// minimum stock
-        if ($stockMin !== false) {
-            if (!empty($fk_product)) {
-                if (!empty($batch)) {
-                    $sql .= " AND pb.qty > ".$this->db->escape($stockMin);
-                } else {
-                    $sql .= " AND ps.reel > ".$this->db->escape($stockMin);
-                }
-            }
-        }
+		if ($stockMin !== false) {
+			if (!empty($fk_product)) {
+				if (!empty($batch)) {
+					$sql .= " AND pb.qty > ".$this->db->escape($stockMin);
+				} else {
+					$sql .= " AND ps.reel > ".$this->db->escape($stockMin);
+				}
+			}
+		}
 
 		if ($sumStock && empty($fk_product)) {
-		    $sql .= " GROUP BY e.rowid, e.ref, e.description, e.fk_parent";
+			$sql .= " GROUP BY e.rowid, e.ref, e.description, e.fk_parent";
 
-            // minimum stock
-            if ($stockMin !== false) {
-                $sql .= " HAVING sum(ps.reel) > ".$this->db->escape($stockMin);
-            }
+			// minimum stock
+			if ($stockMin !== false) {
+				$sql .= " HAVING sum(ps.reel) > ".$this->db->escape($stockMin);
+			}
 		}
-        $sql .= " ORDER BY ".$orderBy;
+		$sql .= " ORDER BY ".$orderBy;
 
 		dol_syslog(get_class($this).'::loadWarehouses', LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -179,7 +179,7 @@ class FormProduct
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return full path to current warehouse in $tab (recursive function)
 	 *
@@ -206,12 +206,12 @@ class FormProduct
 	/**
 	 *  Return list of warehouses
 	 *
-	 *  @param  string|int  $selected           Id of preselected warehouse ('' for no value, 'ifone'=select value if one value otherwise no value)
+	 *  @param  string|int  $selected           Id of preselected warehouse ('' or '-1' for no value, 'ifone'=select value if one value otherwise no value, '-2' to use the default value from setup)
 	 *  @param  string      $htmlname           Name of html select html
 	 *  @param  string      $filterstatus       warehouse status filter, following comma separated filter options can be used
-     *                                          'warehouseopen' = select products from open warehouses,
-     *                                          'warehouseclosed' = select products from closed warehouses,
-     *                                          'warehouseinternal' = select products from warehouses for internal correct/transfer only
+	 *                                          'warehouseopen' = select products from open warehouses,
+	 *                                          'warehouseclosed' = select products from closed warehouses,
+	 *                                          'warehouseinternal' = select products from warehouses for internal correct/transfer only
 	 *  @param  int		    $empty			    1=Can be empty, 0 if not
 	 * 	@param	int		    $disabled		    1=Select is disabled
 	 * 	@param	int		    $fk_product		    Add quantity of stock in label for product with id fk_product. Nothing if 0.
@@ -222,11 +222,11 @@ class FormProduct
 	 *  @param  string      $morecss                    Add more css classes to HTML select
 	 *  @param	string	    $exclude            Warehouses ids to exclude
 	 *  @param  int         $showfullpath       1=Show full path of name (parent ref into label), 0=Show only ref of current warehouse
-     *  @param  bool|int    $stockMin           [=false] Value of minimum stock to filter or false not not filter by minimum stock
-     *  @param  string      $orderBy            [='e.ref'] Order by
+	 *  @param  bool|int    $stockMin           [=false] Value of minimum stock to filter or false not not filter by minimum stock
+	 *  @param  string      $orderBy            [='e.ref'] Order by
 	 * 	@return string					        HTML select
-     *
-     *  @throws Exception
+	 *
+	 *  @throws Exception
 	 */
 	public function selectWarehouses($selected = '', $htmlname = 'idwarehouse', $filterstatus = '', $empty = 0, $disabled = 0, $fk_product = 0, $empty_label = '', $showstock = 0, $forcecombo = 0, $events = array(), $morecss = 'minwidth200', $exclude = '', $showfullpath = 1, $stockMin = false, $orderBy = 'e.ref')
 	{
@@ -236,7 +236,7 @@ class FormProduct
 
 		$out = '';
 		if (empty($conf->global->ENTREPOT_EXTRA_STATUS)) $filterstatus = '';
-        if (!empty($fk_product))  $this->cache_warehouses = array();
+		if (!empty($fk_product))  $this->cache_warehouses = array();
 
 		$this->loadWarehouses($fk_product, '', $filterstatus, true, $exclude, $stockMin, $orderBy);
 		$nbofwarehouses = count($this->cache_warehouses);
@@ -249,11 +249,11 @@ class FormProduct
 		}
 
 		if (strpos($htmlname, 'search_') !== 0) {
-			if (empty($user->fk_warehouse) || $user->fk_warehouse == -1){
-				if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) $selected = $conf->global->MAIN_DEFAULT_WAREHOUSE;
+			if (empty($user->fk_warehouse) || $user->fk_warehouse == -1) {
+				if (($selected == '-2' || $selected == 'ifone') && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) $selected = $conf->global->MAIN_DEFAULT_WAREHOUSE;
 			}
 			else {
-				if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) $selected = $user->fk_warehouse;
+				if (($selected == '-2' || $selected == 'ifone') && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) $selected = $user->fk_warehouse;
 			}
 		}
 
@@ -283,66 +283,66 @@ class FormProduct
 		$out .= '</select>';
 		if ($disabled) $out .= '<input type="hidden" name="'.$htmlname.'" value="'.(($selected > 0) ? $selected : '').'">';
 
-        $parameters = array(
-            'selected' => $selected,
-            'htmlname' => $htmlname,
-            'filterstatus' => $filterstatus,
-            'empty' => $empty,
-            'disabled ' => $disabled,
-            'fk_product' => $fk_product,
-            'empty_label' => $empty_label,
-            'showstock' => $showstock,
-            'forcecombo' => $forcecombo,
-            'events' => $events,
-            'morecss' => $morecss,
-            'exclude' => $exclude,
-            'showfullpath' => $showfullpath,
-            'stockMin' => $stockMin,
-            'orderBy' => $orderBy
-        );
+		$parameters = array(
+			'selected' => $selected,
+			'htmlname' => $htmlname,
+			'filterstatus' => $filterstatus,
+			'empty' => $empty,
+			'disabled ' => $disabled,
+			'fk_product' => $fk_product,
+			'empty_label' => $empty_label,
+			'showstock' => $showstock,
+			'forcecombo' => $forcecombo,
+			'events' => $events,
+			'morecss' => $morecss,
+			'exclude' => $exclude,
+			'showfullpath' => $showfullpath,
+			'stockMin' => $stockMin,
+			'orderBy' => $orderBy
+		);
 
-        $reshook = $hookmanager->executeHooks('selectWarehouses', $parameters, $this);
-        if ($reshook > 0) $out = $hookmanager->resPrint;
+		$reshook = $hookmanager->executeHooks('selectWarehouses', $parameters, $this);
+		if ($reshook > 0) $out = $hookmanager->resPrint;
 		elseif ($reshook == 0) $out .= $hookmanager->resPrint;
 
 		return $out;
 	}
 
-    /**
-     *    Display form to select warehouse
-     *
-     *    @param    string  $page        Page
-     *    @param    int     $selected    Id of warehouse
-     *    @param    string  $htmlname    Name of select html field
-     *    @param    int     $addempty    1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
-     *    @return   void
-     */
-    public function formSelectWarehouses($page, $selected = '', $htmlname = 'warehouse_id', $addempty = 0)
-    {
-        global $langs;
-        if ($htmlname != "none") {
-            print '<form method="POST" action="'.$page.'">';
-            print '<input type="hidden" name="action" value="setwarehouse">';
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
-            print '<tr><td>';
-            print $this->selectWarehouses($selected, $htmlname, '', $addempty);
-            print '</td>';
-            print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-            print '</tr></table></form>';
-        } else {
-            if ($selected) {
-                require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
-                $warehousestatic = new Entrepot($this->db);
-                $warehousestatic->fetch($selected);
-                print $warehousestatic->getNomUrl();
-            } else {
-                print "&nbsp;";
-            }
-        }
-    }
+	/**
+	 *    Display form to select warehouse
+	 *
+	 *    @param    string  $page        Page
+	 *    @param    int     $selected    Id of warehouse
+	 *    @param    string  $htmlname    Name of select html field
+	 *    @param    int     $addempty    1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
+	 *    @return   void
+	 */
+	public function formSelectWarehouses($page, $selected = '', $htmlname = 'warehouse_id', $addempty = 0)
+	{
+		global $langs;
+		if ($htmlname != "none") {
+			print '<form method="POST" action="'.$page.'">';
+			print '<input type="hidden" name="action" value="setwarehouse">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+			print '<tr><td>';
+			print $this->selectWarehouses($selected, $htmlname, '', $addempty);
+			print '</td>';
+			print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+			print '</tr></table></form>';
+		} else {
+			if ($selected) {
+				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+				$warehousestatic = new Entrepot($this->db);
+				$warehousestatic->fetch($selected);
+				print $warehousestatic->getNomUrl();
+			} else {
+				print "&nbsp;";
+			}
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Output a combo box with list of units
 	 *  pour l'instant on ne definit pas les unites dans la base
@@ -357,8 +357,8 @@ class FormProduct
 	 */
 	public function select_measuring_units($name = 'measuring_units', $measuring_style = '', $default = '0', $adddefault = 0, $mode = 0)
 	{
-        //phpcs:enable
-	    print $this->selectMeasuringUnits($name, $measuring_style, $default, $adddefault, $mode);
+		//phpcs:enable
+		print $this->selectMeasuringUnits($name, $measuring_style, $default, $adddefault, $mode);
 	}
 
 	/**
@@ -387,13 +387,13 @@ class FormProduct
 		$filter['t.active'] = 1;
 		if ($measuring_style) $filter['t.unit_type'] = $measuring_style;
 
-        $result = $measuringUnits->fetchAll(
-            '',
-            '',
-            0,
-            0,
-        	$filter
-        );
+		$result = $measuringUnits->fetchAll(
+			'',
+			'',
+			0,
+			0,
+			$filter
+		);
 		if ($result < 0) {
 			dol_print_error($db);
 			return -1;
@@ -425,6 +425,75 @@ class FormProduct
 		return $return;
 	}
 
+	/**
+	 *  Return a combo box with list of units
+	 *  NAture of product labels are defined in llx_c_product_nature
+	 *
+	 *  @param  string		$name                Name of HTML field
+	 *  @param  string		$selected             Preselected value
+	 *  @param  int         $mode                1=Use label as value, 0=Use code
+	 *  @param  int         $showempty           1=show empty value, 0= no
+	 *  @return string
+	 */
+	public function selectProductNature($name = 'finished', $selected = '', $mode = 0, $showempty = 1)
+	{
+		global $langs, $db;
+
+		$langs->load('products');
+
+		$return = '';
+
+		// TODO Use a cache
+		require_once DOL_DOCUMENT_ROOT.'/core/class/cproductnature.class.php';
+		$productNature = new CProductNature($db);
+
+		$filter = array();
+		$filter['t.active'] = 1;
+
+		$result = $productNature->fetchAll(
+			'',
+			'',
+			0,
+			0,
+			$filter
+		);
+		if ($result < 0) {
+			dol_print_error($db);
+			return -1;
+		} else {
+			$return .= '<select class="flat" name="'.$name.'">';
+			if ($showempty || ($selected == '' || $selected == '-1')) {
+				$return .= '<option value="-1"';
+				if ($selected == '' || $selected == '-1') {
+					$return .= ' selected';
+				}
+				$return .= '></option>';
+			}
+			if (!empty($productNature->records) && is_array($productNature->records)) {
+				foreach ($productNature->records as $lines) {
+					$return .= '<option value="';
+					if ($mode == 1) $return .= $lines->label;
+					else $return .= $lines->code;
+
+					$return .= '"';
+
+					if ($mode == 1 && $lines->label == $selected) {
+						$return .= ' selected';
+					} elseif ($lines->code == $selected) {
+						$return .= ' selected';
+					}
+
+					$return .= '>';
+					$return .= $langs->trans($lines->label);
+					$return .= '</option>';
+				}
+			}
+			$return .= '</select>';
+		}
+
+		return $return;
+	}
+
 	/**
 	 *  Return list of lot numbers (stock from product_batch) with stock location and stock qty
 	 *
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 18565347072..bcf32cdce26 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -14,7 +14,7 @@
  * Copyright (C) 2014		Ion agorria			    <ion@agorria.com>
  * Copyright (C) 2016-2018	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2017		Gustavo Novaro
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2020  Frédéric 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
@@ -35,6 +35,7 @@
  *    \ingroup    produit
  *    \brief      File of class to manage predefined products or services
  */
+require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
@@ -55,14 +56,22 @@ class Product extends CommonObject
 	public $table_element = 'product';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_product';
 
 	/**
 	 * @var array	List of child tables. To test if we can delete object.
 	 */
-	protected $childtables = array('supplier_proposaldet', 'propaldet', 'commandedet', 'facturedet', 'contratdet', 'facture_fourn_det', 'commande_fournisseurdet');
+	protected $childtables = array(
+		'supplier_proposaldet',
+		'propaldet',
+		'commandedet',
+		'facturedet',
+		'contratdet',
+		'facture_fourn_det',
+		'commande_fournisseurdet'
+	);
 
 	/**
 	 * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
@@ -71,7 +80,9 @@ class Product extends CommonObject
 	 */
 	public $ismultientitymanaged = 1;
 
-
+	/**
+	 * @var string picto
+	 */
 	public $picto = 'product';
 
 	/**
@@ -86,6 +97,7 @@ class Product extends CommonObject
     * @see label
     */
 	public $libelle;
+
 	/**
 	 * Product label
 	 *
@@ -388,10 +400,20 @@ class Product extends CommonObject
 	 */
 	public $price_autogen = 0;
 
+	/**
+	 * Array with list of supplier prices of product
+	 *
+	 * @var array
+	 */
+	public $supplierprices;
 
+	/**
+	 * @var array fields of object product
+	 */
 	public $fields = array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
 		'ref'           =>array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
+		'barcode'       =>array('type'=>'varchar(255)', 'label'=>'Barcode', 'enabled'=>'!empty($conf->barcode->enabled)', 'visible'=>-1, 'showoncombobox'=>1),
 		'entity'        =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>20),
 		'label'         =>array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1),
 		'note_public'   =>array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61),
@@ -815,7 +837,8 @@ class Product extends CommonObject
 		$error = 0;
 
 		// Check parameters
-		if (!$this->label) { $this->label = 'MISSING LABEL';
+		if (!$this->label) {
+			$this->label = 'MISSING LABEL';
 		}
 
 		// Clean parameters
@@ -833,6 +856,11 @@ class Product extends CommonObject
 		$this->width_units = trim($this->width_units);
 		$this->height = price2num($this->height);
 		$this->height_units = trim($this->height_units);
+		$this->surface = price2num($this->surface);
+		$this->surface_units = trim($this->surface_units);
+		$this->volume = price2num($this->volume);
+		$this->volume_units = trim($this->volume_units);
+
 		// set unit not defined
 		if (is_numeric($this->length_units)) {
 			$this->width_units = $this->length_units; // Not used yet
@@ -840,20 +868,17 @@ class Product extends CommonObject
 		if (is_numeric($this->length_units)) {
 			$this->height_units = $this->length_units; // Not used yet
 		}
+
 		// Automated compute surface and volume if not filled
 		if (empty($this->surface) && !empty($this->length) && !empty($this->width) && $this->length_units == $this->width_units) {
 			$this->surface = $this->length * $this->width;
 			$this->surface_units = measuring_units_squared($this->length_units);
 		}
-		if (empty($this->volume) && !empty($this->surface_units) && !empty($this->height) && $this->length_units == $this->height_units) {
+		if (empty($this->volume) && !empty($this->surface) && !empty($this->height) && $this->length_units == $this->height_units) {
 			$this->volume = $this->surface * $this->height;
 			$this->volume_units = measuring_units_cubed($this->height_units);
 		}
 
-		$this->surface = price2num($this->surface);
-		$this->surface_units = trim($this->surface_units);
-		$this->volume = price2num($this->volume);
-		$this->volume_units = trim($this->volume_units);
 		if (empty($this->tva_tx)) {
 			$this->tva_tx = 0;
 		}
@@ -898,12 +923,16 @@ class Product extends CommonObject
 		$this->accountancy_code_sell_export = trim($this->accountancy_code_sell_export);
 
 
+
 		$this->db->begin();
 
-		// Check name is required and codes are ok or unique.
-		// If error, this->errors[] is filled
+		$result = 0;
+		// Check name is required and codes are ok or unique. If error, this->errors[] is filled
 		if ($action != 'add') {
 			$result = $this->verify(); // We don't check when update called during a create because verify was already done
+		} else {
+			// we can continue
+			$result = 0;
 		}
 
 		if ($result >= 0) {
@@ -918,6 +947,7 @@ class Product extends CommonObject
 			if ($this->hasbatch() && !$this->oldcopy->hasbatch()) {
 				//$valueforundefinedlot = 'Undefined';  // In previous version, 39 and lower
 				$valueforundefinedlot = '000000';
+				if (!empty($conf->global->STOCK_DEFAULT_BATCH)) $valueforundefinedlot = $conf->global->STOCK_DEFAULT_BATCH;
 
 				dol_syslog("Flag batch of product id=".$this->id." is set to ON, so we will create missing records into product_batch");
 
@@ -983,7 +1013,7 @@ class Product extends CommonObject
 			$sql .= ", tosell = ".(int) $this->status;
 			$sql .= ", tobuy = ".(int) $this->status_buy;
 			$sql .= ", tobatch = ".((empty($this->status_batch) || $this->status_batch < 0) ? '0' : (int) $this->status_batch);
-			$sql .= ", finished = ".((!isset($this->finished) || $this->finished < 0) ? "null" : (int) $this->finished);
+			$sql .= ", finished = ".((!isset($this->finished) || $this->finished < 0 || $this->finished == '') ? "null" : (int) $this->finished);
 			$sql .= ", net_measure = ".($this->net_measure != '' ? "'".$this->db->escape($this->net_measure)."'" : 'null');
 			$sql .= ", net_measure_units = ".($this->net_measure_units != '' ? "'".$this->db->escape($this->net_measure_units)."'" : 'null');
 			$sql .= ", weight = ".($this->weight != '' ? "'".$this->db->escape($this->weight)."'" : 'null');
@@ -1076,7 +1106,7 @@ class Product extends CommonObject
 				}
 
 				if (!$error) {
-					if ($conf->variants->enabled) {
+					if (!empty($conf->variants->enabled)) {
 						include_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 
 						$comb = new ProductCombination($this->db);
@@ -1578,7 +1608,7 @@ class Product extends CommonObject
 	 *
 	 * @param	Societe		$thirdparty_seller		Seller
 	 * @param	Societe		$thirdparty_buyer		Buyer
-	 * @param	int			$pqp					Id of product per price if a selection was done of such a price
+	 * @param	int			$pqp					Id of product price per quantity if a selection was done of such a price
 	 * @return	array								Array of price information array('pu_ht'=> , 'pu_ttc'=> , 'tva_tx'=>'X.Y (code)', ...), 'tva_npr'=>0, ...)
 	 * @see get_buyprice(), find_min_price_product_fournisseur()
 	 */
@@ -1903,7 +1933,7 @@ class Product extends CommonObject
 				$localtax1 = $localtaxes_array['1'];
 				$localtaxtype2 = $localtaxes_array['2'];
 				$localtax2 = $localtaxes_array['3'];
-			} else // old method. deprecated because ot can't retreive type
+			} else // old method. deprecated because ot can't retrieve type
 			{
 				$localtaxtype1 = '0';
 				$localtax1 = get_localtax($newvat, 1);
@@ -2078,7 +2108,7 @@ class Product extends CommonObject
 				$this->customcode                    = $obj->customcode;
 				$this->country_id                    = $obj->fk_country;
 				$this->country_code = getCountry($this->country_id, 2, $this->db);
-				$this->state_id                    = $obj->fk_state;
+				$this->state_id = $obj->fk_state;
 				$this->price                        = $obj->price;
 				$this->price_ttc                    = $obj->price_ttc;
 				$this->price_min                    = $obj->price_min;
@@ -2145,7 +2175,7 @@ class Product extends CommonObject
 
 				$this->db->free($resql);
 
-				// Retreive all extrafield
+				// Retrieve all extrafield
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
 
@@ -2171,14 +2201,14 @@ class Product extends CommonObject
 						if ($resql) {
 							$result = $this->db->fetch_array($resql);
 
-							$this->multiprices[$i] = $result["price"];
-							$this->multiprices_ttc[$i] = $result["price_ttc"];
-							$this->multiprices_min[$i] = $result["price_min"];
-							$this->multiprices_min_ttc[$i] = $result["price_min_ttc"];
-							$this->multiprices_base_type[$i] = $result["price_base_type"];
+							$this->multiprices[$i] = $result ? $result["price"] : null;
+							$this->multiprices_ttc[$i] = $result ? $result["price_ttc"] : null;
+							$this->multiprices_min[$i] =  $result ? $result["price_min"] : null;
+							$this->multiprices_min_ttc[$i] = $result ? $result["price_min_ttc"] : null;
+							$this->multiprices_base_type[$i] = $result ? $result["price_base_type"] : null;
 							// Next two fields are used only if PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL is on
-							$this->multiprices_tva_tx[$i] = $result["tva_tx"]; // TODO Add ' ('.$result['default_vat_code'].')'
-							$this->multiprices_recuperableonly[$i] = $result["recuperableonly"];
+							$this->multiprices_tva_tx[$i] = $result ? $result["tva_tx"].($result ? ' ('.$result['default_vat_code'].')' : '') : null;
+							$this->multiprices_recuperableonly[$i] = $result ? $result["recuperableonly"] : null;
 
 							// Price by quantity
 							/*
@@ -2357,13 +2387,137 @@ class Product extends CommonObject
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Charge tableau des stats OF pour le produit/service
+	 *
+	 * @param  int $socid Id societe
+	 * @return int                     Array of stats in $this->stats_mo, <0 if ko or >0 if ok
+	 */
+	public function load_stats_mo($socid = 0)
+	{
+		// phpcs:enable
+		global $user, $hookmanager;
+
+		$error = 0;
+
+		foreach (array('toconsume', 'consumed', 'toproduce', 'produced') as $role) {
+			$this->stats_mo['customers_'.$role] = 0;
+			$this->stats_mo['nb_'.$role] = 0;
+			$this->stats_mo['qty_'.$role] = 0;
+
+			$sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_customers, COUNT(DISTINCT c.rowid) as nb,";
+			$sql .= " SUM(mp.qty) as qty";
+			$sql .= " FROM ".MAIN_DB_PREFIX."mrp_mo as c";
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."mrp_production as mp ON mp.fk_mo=c.rowid";
+			if (!$user->rights->societe->client->voir && !$socid) {
+				$sql .= "INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc=c.fk_soc AND sc.fk_user = ".$user->id;
+			}
+			$sql .= " WHERE ";
+			$sql .= " c.entity IN (".getEntity('mo').")";
+
+			$sql .= " AND mp.fk_product =".$this->id;
+			$sql .= " AND mp.role ='".$this->db->escape($role)."'";
+			if ($socid > 0) {
+				$sql .= " AND c.fk_soc = ".$socid;
+			}
+
+			$result = $this->db->query($sql);
+			if ($result) {
+				$obj = $this->db->fetch_object($result);
+				$this->stats_mo['customers_'.$role] = $obj->nb_customers ? $obj->nb_customers : 0;
+				$this->stats_mo['nb_'.$role] = $obj->nb ? $obj->nb : 0;
+				$this->stats_mo['qty_'.$role] = $obj->qty ? $obj->qty : 0;
+			} else {
+				$this->error = $this->db->error();
+				$error++;
+			}
+		}
+
+		if (!empty($error)) {
+			return -1;
+		}
+
+		$parameters = array('socid' => $socid);
+		$reshook = $hookmanager->executeHooks('loadStatsCustomerMO', $parameters, $this, $action);
+		if ($reshook > 0) $this->stats_mo = $hookmanager->resArray['stats_mo'];
+
+		return 1;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Charge tableau des stats OF pour le produit/service
+	 *
+	 * @param  int $socid Id societe
+	 * @return int                     Array of stats in $this->stats_bom, <0 if ko or >0 if ok
+	 */
+	public function load_stats_bom($socid = 0)
+	{
+		// phpcs:enable
+		global $user, $hookmanager;
+
+		$error = 0;
+
+		$this->stats_bom['nb_toproduce'] = 0;
+		$this->stats_bom['nb_toconsume'] = 0;
+		$this->stats_bom['qty_toproduce'] = 0;
+		$this->stats_bom['qty_toconsume'] = 0;
+
+		$sql = "SELECT COUNT(DISTINCT b.rowid) as nb_toproduce,";
+		$sql .= " b.qty as qty_toproduce";
+		$sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as b";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."bom_bomline as bl ON bl.fk_bom=b.rowid";
+		$sql .= " WHERE ";
+		$sql .= " b.entity IN (".getEntity('bom').")";
+		$sql .= " AND b.fk_product =".$this->id;
+		$sql .= " GROUP BY b.rowid";
+
+		$result = $this->db->query($sql);
+		if ($result) {
+			$obj = $this->db->fetch_object($result);
+			$this->stats_bom['nb_toproduce'] = $obj->nb_toproduce ? $obj->nb_toproduce : 0;
+			$this->stats_bom['qty_toproduce'] = $obj->qty_toproduce ? price2num($obj->qty_toproduce) : 0;
+		} else {
+			$this->error = $this->db->error();
+			$error++;
+		}
+
+		$sql = "SELECT COUNT(DISTINCT bl.rowid) as nb_toconsume,";
+		$sql .= " SUM(bl.qty) as qty_toconsume";
+		$sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as b";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."bom_bomline as bl ON bl.fk_bom=b.rowid";
+		$sql .= " WHERE ";
+		$sql .= " b.entity IN (".getEntity('bom').")";
+		$sql .= " AND bl.fk_product =".$this->id;
+
+		$result = $this->db->query($sql);
+		if ($result) {
+			$obj = $this->db->fetch_object($result);
+			$this->stats_bom['nb_toconsume'] = $obj->nb_toconsume ? $obj->nb_toconsume : 0;
+			$this->stats_bom['qty_toconsume'] = $obj->qty_toconsume ? price2num($obj->qty_toconsume) : 0;
+		} else {
+			$this->error = $this->db->error();
+			$error++;
+		}
+
+		if (!empty($error)) {
+			return -1;
+		}
+
+		$parameters = array('socid' => $socid);
+		$reshook = $hookmanager->executeHooks('loadStatsCustomerMO', $parameters, $this, $action);
+		if ($reshook > 0) $this->stats_bom = $hookmanager->resArray['stats_bom'];
+
+		return 1;
+	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Charge tableau des stats propale pour le produit/service
 	 *
 	 * @param  int $socid Id societe
-	 * @return integer      Tableau des stats dans $this->stats_propale, <0 if ko >0 if ok
+	 * @return int                     Array of stats in $this->stats_propale, <0 if ko or >0 if ok
 	 */
 	public function load_stats_propale($socid = 0)
 	{
@@ -2436,7 +2590,7 @@ class Product extends CommonObject
 	 *  Charge tableau des stats propale pour le produit/service
 	 *
 	 * @param  int $socid Id thirdparty
-	 * @return array               Tableau des stats
+	 * @return int                     Array of stats in $this->stats_proposal_supplier, <0 if ko or >0 if ok
 	 */
 	public function load_stats_proposal_supplier($socid = 0)
 	{
@@ -2504,7 +2658,7 @@ class Product extends CommonObject
 		}
 		$sql .= " WHERE c.rowid = cd.fk_commande";
 		$sql .= " AND c.fk_soc = s.rowid";
-		$sql .= " AND c.entity IN (".getEntity('commande').")";
+		$sql .= " AND c.entity IN (".getEntity($forVirtualStock && !empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'commande').")";
 		$sql .= " AND cd.fk_product = ".$this->id;
 		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
 			$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
@@ -2587,7 +2741,7 @@ class Product extends CommonObject
 	 * @param  int    $socid           Id societe pour filtrer sur une societe
 	 * @param  string $filtrestatut    Id des statuts pour filtrer sur des statuts
 	 * @param  int    $forVirtualStock Ignore rights filter for virtual stock calculation.
-	 * @return array                     Tableau des stats
+	 * @return int                     Array of stats in $this->stats_commande_fournisseur, <0 if ko or >0 if ok
 	 */
 	public function load_stats_commande_fournisseur($socid = 0, $filtrestatut = '', $forVirtualStock = 0)
 	{
@@ -2604,7 +2758,7 @@ class Product extends CommonObject
 		}
 		$sql .= " WHERE c.rowid = cd.fk_commande";
 		$sql .= " AND c.fk_soc = s.rowid";
-		$sql .= " AND c.entity IN (".getEntity('supplier_order').")";
+		$sql .= " AND c.entity IN (".getEntity($forVirtualStock && !empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'supplier_order').")";
 		$sql .= " AND cd.fk_product = ".$this->id;
 		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
 			$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
@@ -2643,7 +2797,7 @@ class Product extends CommonObject
 	 * @param   string      $filtrestatut           [=''] Ids order status separated by comma
 	 * @param   int         $forVirtualStock        Ignore rights filter for virtual stock calculation.
 	 * @param   string      $filterShipmentStatus   [=''] Ids shipment status separated by comma
-	 * @return  int         <0 if KO, >0 if OK (Tableau des stats)
+	 * @return  int                                 Array of stats in $this->stats_expedition, <0 if ko or >0 if ok
 	 */
 	public function load_stats_sending($socid = 0, $filtrestatut = '', $forVirtualStock = 0, $filterShipmentStatus = '')
 	{
@@ -2663,7 +2817,7 @@ class Product extends CommonObject
 		$sql .= " WHERE e.rowid = ed.fk_expedition";
 		$sql .= " AND c.rowid = cd.fk_commande";
 		$sql .= " AND e.fk_soc = s.rowid";
-		$sql .= " AND e.entity IN (".getEntity('expedition').")";
+		$sql .= " AND e.entity IN (".getEntity($forVirtualStock && !empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'expedition').")";
 		$sql .= " AND ed.fk_origin_line = cd.rowid";
 		$sql .= " AND cd.fk_product = ".$this->id;
 		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
@@ -2724,7 +2878,7 @@ class Product extends CommonObject
 	 * @param  int    $socid           Id societe pour filtrer sur une societe
 	 * @param  string $filtrestatut    Id statut pour filtrer sur un statut
 	 * @param  int    $forVirtualStock Ignore rights filter for virtual stock calculation.
-	 * @return array                   Tableau des stats
+	 * @return int                     Array of stats in $this->stats_reception, <0 if ko or >0 if ok
 	 */
 	public function load_stats_reception($socid = 0, $filtrestatut = '', $forVirtualStock = 0)
 	{
@@ -2740,7 +2894,7 @@ class Product extends CommonObject
 		}
 		$sql .= " WHERE cf.rowid = fd.fk_commande";
 		$sql .= " AND cf.fk_soc = s.rowid";
-		$sql .= " AND cf.entity IN (".getEntity('supplier_order').")";
+		$sql .= " AND cf.entity IN (".getEntity($forVirtualStock && !empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'supplier_order').")";
 		$sql .= " AND fd.fk_product = ".$this->id;
 		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) { $sql .= " AND cf.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
@@ -2770,12 +2924,12 @@ class Product extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Charge tableau des stats commande client pour le produit/service
+	 *  Charge tableau des stats production pour le produit/service
 	 *
 	 * @param  int    $socid           Id societe pour filtrer sur une societe
 	 * @param  string $filtrestatut    Id statut pour filtrer sur un statut
 	 * @param  int    $forVirtualStock Ignore rights filter for virtual stock calculation.
-	 * @return integer                 Array of stats in $this->stats_commande (nb=nb of order, qty=qty ordered), <0 if ko or >0 if ok
+	 * @return integer                 Array of stats in $this->stats_mrptoproduce (nb=nb of order, qty=qty ordered), <0 if ko or >0 if ok
 	 */
 	public function load_stats_inproduction($socid = 0, $filtrestatut = '', $forVirtualStock = 0)
 	{
@@ -2791,7 +2945,7 @@ class Product extends CommonObject
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE m.rowid = mp.fk_mo";
-		$sql .= " AND m.entity IN (".getEntity('mrp').")";
+		$sql .= " AND m.entity IN (".getEntity($forVirtualStock && !empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'mrp').")";
 		$sql .= " AND mp.fk_product = ".$this->id;
 		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
 			$sql .= " AND m.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
@@ -2862,7 +3016,7 @@ class Product extends CommonObject
 	 *  Charge tableau des stats contrat pour le produit/service
 	 *
 	 * @param  int $socid Id societe
-	 * @return array               Tableau des stats
+	 * @return int                     Array of stats in $this->stats_contrat, <0 if ko or >0 if ok
 	 */
 	public function load_stats_contrat($socid = 0)
 	{
@@ -2934,7 +3088,7 @@ class Product extends CommonObject
 	 *  Charge tableau des stats facture pour le produit/service
 	 *
 	 * @param  int $socid Id societe
-	 * @return array                   Tableau des stats
+	 * @return int                     Array of stats in $this->stats_facture, <0 if ko or >0 if ok
 	 */
 	public function load_stats_facture($socid = 0)
 	{
@@ -3006,7 +3160,7 @@ class Product extends CommonObject
 	 *  Charge tableau des stats facture pour le produit/service
 	 *
 	 * @param  int $socid Id societe
-	 * @return array                   Tableau des stats
+	 * @return int                     Array of stats in $this->stats_facture_fournisseur, <0 if ko or >0 if ok
 	 */
 	public function load_stats_facture_fournisseur($socid = 0)
 	{
@@ -3056,14 +3210,16 @@ class Product extends CommonObject
 	/**
 	 *  Return an array formated for showing graphs
 	 *
-	 * @param  string $sql  Request to execute
-	 * @param  string $mode 'byunit'=number of unit, 'bynumber'=nb of entities
-	 * @param  int    $year Year (0=current year)
-	 * @return array               <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 * @param  string $sql  		Request to execute
+	 * @param  string $mode 		'byunit'=number of unit, 'bynumber'=nb of entities
+	 * @param  int    $year 		Year (0=current year, -1=all years)
+	 * @return array|int           	<0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
 	private function _get_stats($sql, $mode, $year = 0)
 	{
 		// phpcs:enable
+		$tab = array();
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -3071,11 +3227,15 @@ class Product extends CommonObject
 			while ($i < $num)
 			{
 				$arr = $this->db->fetch_array($resql);
-				if ($mode == 'byunit') {
-					$tab[$arr[1]] = $arr[0]; // 1st field
+				$keyfortab = (string) $arr[1];
+				if ($year == -1) {
+					$keyfortab = substr($keyfortab, -2);
 				}
-				if ($mode == 'bynumber') {
-					$tab[$arr[1]] = $arr[2]; // 3rd field
+
+				if ($mode == 'byunit') {
+					$tab[$keyfortab] = (empty($tab[$keyfortab]) ? 0 : $tab[$keyfortab]) + $arr[0]; // 1st field
+				} elseif ($mode == 'bynumber') {
+					$tab[$keyfortab] = (empty($tab[$keyfortab]) ? 0 : $tab[$keyfortab]) + $arr[2]; // 3rd field
 				}
 				$i++;
 			}
@@ -3087,16 +3247,21 @@ class Product extends CommonObject
 		if (empty($year)) {
 			$year = strftime('%Y', time());
 			$month = strftime('%m', time());
+		} elseif ($year == -1) {
+			$year = '';
+			$month = 12; // We imagine we are at end of year, so we get last 12 month before, so all correct year.
 		} else {
 			$month = 12; // We imagine we are at end of year, so we get last 12 month before, so all correct year.
 		}
+
 		$result = array();
 
 		for ($j = 0; $j < 12; $j++)
 		{
-			//$idx = ucfirst(dol_trunc(dol_print_date(dol_mktime(12, 0, 0, $month, 1, $year), "%b"), 3, 'right', 'UTF-8', 1));
-			$idx = ucfirst(dol_trunc(dol_print_date(dol_mktime(12, 0, 0, $month, 1, $year), "%b"), 1, 'right', 'UTF-8', 1));
+			// $ids is 'D', 'N', 'O', 'S', ... (First letter of month in user language)
+			$idx = ucfirst(dol_trunc(dol_print_date(dol_mktime(12, 0, 0, $month, 1, 1970), "%b"), 1, 'right', 'UTF-8', 1));
 
+			//print $idx.'-'.$year.'-'.$month.'<br>';
 			$result[$j] = array($idx, isset($tab[$year.$month]) ? $tab[$year.$month] : 0);
 			//            $result[$j] = array($monthnum,isset($tab[$year.$month])?$tab[$year.$month]:0);
 
@@ -3121,9 +3286,9 @@ class Product extends CommonObject
 	 * @param  int    $socid               Limit count on a particular third party id
 	 * @param  string $mode                'byunit'=number of unit, 'bynumber'=nb of entities
 	 * @param  int    $filteronproducttype 0=To filter on product only, 1=To filter on services only
-	 * @param  int    $year                Year (0=last 12 month)
+	 * @param  int    $year                Year (0=last 12 month, -1=all years)
 	 * @param  string $morefilter          More sql filters
-	 * @return array                            <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 * @return array                       <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
 	public function get_nb_vente($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
 	{
@@ -3174,9 +3339,9 @@ class Product extends CommonObject
 	 * @param  int    $socid               Limit count on a particular third party id
 	 * @param  string $mode                'byunit'=number of unit, 'bynumber'=nb of entities
 	 * @param  int    $filteronproducttype 0=To filter on product only, 1=To filter on services only
-	 * @param  int    $year                Year (0=last 12 month)
+	 * @param  int    $year                Year (0=last 12 month, -1=all years)
 	 * @param  string $morefilter          More sql filters
-	 * @return array                            <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 * @return array                       <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
 	public function get_nb_achat($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
 	{
@@ -3221,20 +3386,19 @@ class Product extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Return nb of units in proposals in which product is included
+	 * Return nb of units in proposals in which product is included
 	 *
 	 * @param  int    $socid               Limit count on a particular third party id
 	 * @param  string $mode                'byunit'=number of unit, 'bynumber'=nb of entities
 	 * @param  int    $filteronproducttype 0=To filter on product only, 1=To filter on services only
-	 * @param  int    $year                Year (0=last 12 month)
+	 * @param  int    $year                Year (0=last 12 month, -1=all years)
 	 * @param  string $morefilter          More sql filters
-	 * @return array                            <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 * @return array                       <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
 	public function get_nb_propal($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
 	{
 		// phpcs:enable
-		global $conf;
-		global $user;
+		global $conf, $user;
 
 		$sql = "SELECT sum(d.qty), date_format(p.datep, '%Y%m')";
 		if ($mode == 'bynumber') {
@@ -3278,9 +3442,9 @@ class Product extends CommonObject
 	 * @param  int    $socid               Limit count on a particular third party id
 	 * @param  string $mode                'byunit'=number of unit, 'bynumber'=nb of entities
 	 * @param  int    $filteronproducttype 0=To filter on product only, 1=To filter on services only
-	 * @param  int    $year                Year (0=last 12 month)
+	 * @param  int    $year                Year (0=last 12 month, -1=all years)
 	 * @param  string $morefilter          More sql filters
-	 * @return array                            <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 * @return array                       <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
 	public function get_nb_propalsupplier($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
 	{
@@ -3330,9 +3494,9 @@ class Product extends CommonObject
 	 * @param  int    $socid               Limit count on a particular third party id
 	 * @param  string $mode                'byunit'=number of unit, 'bynumber'=nb of entities
 	 * @param  int    $filteronproducttype 0=To filter on product only, 1=To filter on services only
-	 * @param  int    $year                Year (0=last 12 month)
+	 * @param  int    $year                Year (0=last 12 month, -1=all years)
 	 * @param  string $morefilter          More sql filters
-	 * @return array                            <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 * @return array                       <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
 	public function get_nb_order($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
 	{
@@ -3381,9 +3545,9 @@ class Product extends CommonObject
 	 * @param  int    $socid               Limit count on a particular third party id
 	 * @param  string $mode                'byunit'=number of unit, 'bynumber'=nb of entities
 	 * @param  int    $filteronproducttype 0=To filter on product only, 1=To filter on services only
-	 * @param  int    $year                Year (0=last 12 month)
+	 * @param  int    $year                Year (0=last 12 month, -1=all years)
 	 * @param  string $morefilter          More sql filters
-	 * @return array                            <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 * @return array                       <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
 	public function get_nb_ordersupplier($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
 	{
@@ -3432,9 +3596,9 @@ class Product extends CommonObject
 	 * @param  int    $socid               Limit count on a particular third party id
 	 * @param  string $mode                'byunit'=number of unit, 'bynumber'=nb of entities
 	 * @param  int    $filteronproducttype 0=To filter on product only, 1=To filter on services only
-	 * @param  int    $year                Year (0=last 12 month)
+	 * @param  int    $year                Year (0=last 12 month, -1=all years)
 	 * @param  string $morefilter          More sql filters
-	 * @return array                            <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 * @return array                       <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
 	public function get_nb_contract($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
 	{
@@ -3486,9 +3650,9 @@ class Product extends CommonObject
 	 * @param  int    $socid               Limit count on a particular third party id
 	 * @param  string $mode                'byunit'=number of unit, 'bynumber'=nb of entities
 	 * @param  int    $filteronproducttype 0=To filter on product only, 1=To filter on services only
-	 * @param  int    $year                Year (0=last 12 month)
+	 * @param  int    $year                Year (0=last 12 month, -1=all years)
 	 * @param  string $morefilter          More sql filters
-	 * @return array                            <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 * @return array                       <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
 	public function get_nb_mos($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
 	{
@@ -3661,11 +3825,11 @@ class Product extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Verifie si c'est un sous-produit
+	 *  Check if it is a sub-product into a kit
 	 *
-	 * @param  int $fk_parent Id du produit auquel le produit est lie
-	 * @param  int $fk_child  Id du produit lie
-	 * @return int                    < 0 si erreur, > 0 si ok
+	 * @param  int 	$fk_parent 		Id of parent kit product
+	 * @param  int 	$fk_child  		Id of child product
+	 * @return int                  <0 if KO, >0 if OK
 	 */
 	public function is_sousproduit($fk_parent, $fk_child)
 	{
@@ -3681,6 +3845,7 @@ class Product extends CommonObject
 
 			if ($num > 0) {
 				$obj = $this->db->fetch_object($result);
+
 				$this->is_sousproduit_qty = $obj->qty;
 				$this->is_sousproduit_incdec = $obj->incdec;
 
@@ -4075,22 +4240,30 @@ class Product extends CommonObject
 	}
 
 	/**
-	 *  Return all parent products for current product (first level only)
+	 * Count all parent and children products for current product (first level only)
 	 *
-	 * @return int            Nb of father + child
+	 * @param	int		$mode	0=Both parent and child, -1=Parents only, 1=Children only
+	 * @return 	int            	Nb of father + child
+	 * @see getFather(), get_sousproduits_arbo()
 	 */
-	public function hasFatherOrChild()
+	public function hasFatherOrChild($mode = 0)
 	{
 		$nb = 0;
 
 		$sql = "SELECT COUNT(pa.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."product_association as pa";
-		$sql .= " WHERE pa.fk_product_fils = ".$this->id." OR pa.fk_product_pere = ".$this->id;
+		if ($mode == 0) {
+			$sql .= " WHERE pa.fk_product_fils = ".$this->id." OR pa.fk_product_pere = ".$this->id;
+		} elseif ($mode == -1) {
+			$sql .= " WHERE pa.fk_product_fils = ".$this->id; // We are a child, so we found lines that link to parents (can have several parents)
+		} elseif ($mode == 1) {
+			$sql .= " WHERE pa.fk_product_pere = ".$this->id; // We are a parent, so we found lines that link to children (can have several children)
+		}
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
-			if ($obj) { $nb = $obj->nb;
-			}
+			if ($obj) { $nb = $obj->nb; }
 		} else {
 			return -1;
 		}
@@ -4151,6 +4324,7 @@ class Product extends CommonObject
 	 *  Return all parent products for current product (first level only)
 	 *
 	 * @return array         Array of product
+	 * @see hasFatherOrChild()
 	 */
 	public function getFather()
 	{
@@ -4185,18 +4359,19 @@ class Product extends CommonObject
 	/**
 	 *  Return childs of product $id
 	 *
-	 * @param  int $id             Id of product to search childs of
-	 * @param  int $firstlevelonly Return only direct child
-	 * @param  int $level          Level of recursing call (start to 1)
-	 * @return array                       Return array(prodid=>array(0=prodid, 1=>qty, 2=> ...)
+	 * @param  int $id             		Id of product to search childs of
+	 * @param  int $firstlevelonly 		Return only direct child
+	 * @param  int $level          		Level of recursing call (start to 1)
+	 * @return array                    Return array(prodid=>array(0=prodid, 1=>qty, 2=>product type, 3=>label, 4=>incdec, 5=>product ref)
 	 */
 	public function getChildsArbo($id, $firstlevelonly = 0, $level = 1)
 	{
 		global $alreadyfound;
 
-		$sql = "SELECT p.rowid, p.label as label, pa.qty as qty, pa.fk_product_fils as id, p.fk_product_type, pa.incdec";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
-		$sql .= ", ".MAIN_DB_PREFIX."product_association as pa";
+		$sql = "SELECT p.rowid, p.ref, p.label as label, p.fk_product_type,";
+		$sql .= " pa.qty as qty, pa.fk_product_fils as id, pa.incdec";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product as p,";
+		$sql .= " ".MAIN_DB_PREFIX."product_association as pa";
 		$sql .= " WHERE p.rowid = pa.fk_product_fils";
 		$sql .= " AND pa.fk_product_pere = ".$id;
 		$sql .= " AND pa.fk_product_fils != ".$id; // This should not happens, it is to avoid infinite loop if it happens
@@ -4224,7 +4399,8 @@ class Product extends CommonObject
 				 1=>$rec['qty'],
 				 2=>$rec['fk_product_type'],
 				 3=>$this->db->escape($rec['label']),
-				 4=>$rec['incdec']
+				 4=>$rec['incdec'],
+				 5=>$rec['ref']
 				);
 				//$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty'],2=>$rec['fk_product_type']);
 				//$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty']);
@@ -4246,7 +4422,7 @@ class Product extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *     Return tree of all subproducts for product. Tree contains id, name and quantity.
+	 *     Return tree of all subproducts for product. Tree contains array of array(0=prodid, 1=>qty, 2=>product type, 3=>label, 4=>incdec, 5=>product ref)
 	 *     Set this->sousprods
 	 *
 	 * @return void
@@ -4281,15 +4457,32 @@ class Product extends CommonObject
 		global $conf, $langs, $hookmanager;
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 
-		$result = '';
+		$result = ''; $label = '';
+
 		$newref = $this->ref;
-		if ($maxlength) { $newref = dol_trunc($newref, $maxlength, 'middle');
+		if ($maxlength) {
+			$newref = dol_trunc($newref, $maxlength, 'middle');
 		}
 
-		if ($this->type == Product::TYPE_PRODUCT) { $label = img_picto('', 'product').' <u>'.$langs->trans("Product").'</u>';
+		if (!empty($this->entity)) {
+			$tmpphoto = $this->show_photos('product', $conf->product->multidir_output[$this->entity], 1, 1, 0, 0, 0, 80);
+			if ($this->nbphoto > 0) {
+				$label .= '<div class="photointooltip">';
+				$label .= $tmpphoto;
+				$label .= '</div><div style="clear: both;"></div>';
+			}
 		}
-		if ($this->type == Product::TYPE_SERVICE) { $label = img_picto('', 'service').' <u>'.$langs->trans("Service").'</u>';
+
+		if ($this->type == Product::TYPE_PRODUCT) {
+			$label .= img_picto('', 'product').' <u class="paddingrightonly">'.$langs->trans("Product").'</u>';
+		} elseif ($this->type == Product::TYPE_SERVICE) {
+			$label .= img_picto('', 'service').' <u class="paddingrightonly">'.$langs->trans("Service").'</u>';
 		}
+		if (isset($this->status) && isset($this->status_buy)) {
+			$label .= ' '.$this->getLibStatut(5, 0);
+			$label .= ' '.$this->getLibStatut(5, 1);
+		}
+
 		if (!empty($this->ref)) {
 			$label .= '<br><b>'.$langs->trans('ProductRef').':</b> '.$this->ref;
 		}
@@ -4345,16 +4538,6 @@ class Product extends CommonObject
 			$label .= '<br><b>'.$langs->trans('ProductAccountancyBuyIntraCode').':</b> '.length_accountg($this->accountancy_code_buy_intra);
 			$label .= '<br><b>'.$langs->trans('ProductAccountancyBuyExportCode').':</b> '.length_accountg($this->accountancy_code_buy_export);
 		}
-		if (isset($this->status) && isset($this->status_buy)) {
-			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5, 0);
-			$label .= ' '.$this->getLibStatut(5, 1);
-		}
-
-		if (!empty($this->entity)) {
-			$tmpphoto = $this->show_photos('product', $conf->product->multidir_output[$this->entity], 1, 1, 0, 0, 0, 80);
-			if ($this->nbphoto > 0) { $label .= '<br>'.$tmpphoto;
-			}
-		}
 
 		$linkclose = '';
 		if (empty($notooltip)) {
@@ -4562,10 +4745,21 @@ class Product extends CommonObject
 		global $langs;
 		$langs->load('products');
 
-		if ($this->finished == '0') { return $langs->trans("RowMaterial");
-		}
-		if ($this->finished == '1') { return $langs->trans("Finished");
+		if (isset($this->finished) && $this->finished >= 0) {
+			$sql = 'SELECT label, code FROM '.MAIN_DB_PREFIX.'c_product_nature where code='.((int) $this->finished).' AND active=1';
+			$resql = $this->db->query($sql);
+			if ($resql && $this->db->num_rows($resql) > 0) {
+				$res = $this->db->fetch_array($resql);
+				$label = $langs->trans($res['label']);
+				$this->db->free($resql);
+				return $label;
+			} else {
+				$this->error = $this->db->error().' sql='.$sql;
+				dol_syslog(__METHOD__.' Error '.$this->error, LOG_ERR);
+				return -1;
+			}
 		}
+
 		return '';
 	}
 
@@ -4723,7 +4917,7 @@ class Product extends CommonObject
 			$this->db->free($result);
 
 			if (!preg_match('/novirtual/', $option)) {
-				$this->load_virtual_stock($includedraftpoforvirtual); // This also load stats_commande_fournisseur, ...
+				$this->load_virtual_stock($includedraftpoforvirtual); // This also load all arrays stats_xxx...
 			}
 
 			return 1;
diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php
index db59efcdfb7..f5a91ff2839 100644
--- a/htdocs/product/class/productbatch.class.php
+++ b/htdocs/product/class/productbatch.class.php
@@ -51,32 +51,32 @@ class Productbatch extends CommonObject
 	public $warehouseid;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_product;
 
 
 
-    /**
-     *  Constructor
-     *
-     *  @param	DoliDb		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param	DoliDb		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *  Create object 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
-     */
-    public function create($user, $notrigger = 0)
-    {
+	/**
+	 *  Create object 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
+	 */
+	public function create($user, $notrigger = 0)
+	{
 		global $conf, $langs;
 		$error = 0;
 
@@ -86,7 +86,7 @@ class Productbatch extends CommonObject
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Insert request
+		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_batch (";
 		$sql .= "fk_product_stock,";
 		$sql .= "sellby,";
@@ -107,33 +107,33 @@ class Productbatch extends CommonObject
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 		if (!$error)
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.self::$_table_element);
 		}
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			$this->db->rollback();
 			return -1 * $error;
 		} else {
 			$this->db->commit();
-            return $this->id;
+			return $this->id;
 		}
-    }
+	}
 
 
-    /**
-     *  Load object in memory from the database
-     *
-     *  @param	int		$id		Id object
-     *  @return int          	<0 if KO, >0 if OK
-     */
-    public function fetch($id)
-    {
+	/**
+	 *  Load object in memory from the database
+	 *
+	 *  @param	int		$id		Id object
+	 *  @return int          	<0 if KO, >0 if OK
+	 */
+	public function fetch($id)
+	{
 		global $langs;
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
@@ -150,9 +150,9 @@ class Productbatch extends CommonObject
 		$sql .= " pl.eatby,";
 		$sql .= " pl.sellby";
 
-        $sql .= " FROM ".MAIN_DB_PREFIX."product_batch as t INNER JOIN ".MAIN_DB_PREFIX."product_stock w on t.fk_product_stock = w.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl on pl.fk_product = w.fk_product and pl.batch = t.batch";
-        $sql .= " WHERE t.rowid = ".$id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_batch as t INNER JOIN ".MAIN_DB_PREFIX."product_stock w on t.fk_product_stock = w.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl on pl.fk_product = w.fk_product and pl.batch = t.batch";
+		$sql .= " WHERE t.rowid = ".$id;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -182,16 +182,16 @@ class Productbatch extends CommonObject
 		}
 	}
 
-    /**
-     *  Update object into database
-     *
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    public function update($user = null, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Update object into database
+	 *
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update($user = null, $notrigger = 0)
+	{
+		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -202,7 +202,7 @@ class Productbatch extends CommonObject
 		{
 		}
 
-        // Update request
+		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX.self::$_table_element." SET";
 		$sql .= " fk_product_stock=".(isset($this->fk_product_stock) ? $this->fk_product_stock : "null").",";
 		$sql .= " sellby=".(dol_strlen($this->sellby) != 0 ? "'".$this->db->idate($this->sellby)."'" : 'null').",";
@@ -210,7 +210,7 @@ class Productbatch extends CommonObject
 		$sql .= " batch=".(isset($this->batch) ? "'".$this->db->escape($this->batch)."'" : "null").",";
 		$sql .= " qty=".(isset($this->qty) ? $this->qty : "null").",";
 		$sql .= " import_key=".(isset($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null")."";
-        $sql .= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
@@ -218,7 +218,7 @@ class Productbatch extends CommonObject
 		$resql = $this->db->query($sql);
 		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
@@ -232,17 +232,17 @@ class Productbatch extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-    }
+	}
 
-    /**
-     *  Delete object in database
-     *
-     *  @param  User	$user        User that deletes
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return	int					 <0 if KO, >0 if OK
-     */
-    public function delete($user, $notrigger = 0)
-    {
+	/**
+	 *  Delete object in database
+	 *
+	 *  @param  User	$user        User that deletes
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return	int					 <0 if KO, >0 if OK
+	 */
+	public function delete($user, $notrigger = 0)
+	{
 		global $conf, $langs;
 		$error = 0;
 
@@ -250,21 +250,21 @@ class Productbatch extends CommonObject
 
 		if (!$error)
 		{
-    		$sql = "DELETE FROM ".MAIN_DB_PREFIX.self::$_table_element."";
-    		$sql .= " WHERE rowid=".$this->id;
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.self::$_table_element."";
+			$sql .= " WHERE rowid=".$this->id;
 
-    		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-    		$resql = $this->db->query($sql);
-        	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 		}
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -360,18 +360,18 @@ class Productbatch extends CommonObject
 		if (isset($this->import_key)) $this->import_key = trim($this->import_key);
 	}
 
-    /**
-     *  Find first detail record that match eather eat-by or sell-by or batch within given warehouse
-     *
-     *  @param	int			$fk_product_stock   id product_stock for objet
-     *  @param	integer		$eatby    			eat-by date for object - deprecated: a search must be done on batch number
-     *  @param	integer		$sellby   			sell-by date for object - deprecated: a search must be done on batch number
-     *  @param	string		$batch_number   	batch number for object
-     *  @return int          					<0 if KO, >0 if OK
-     */
-    public function find($fk_product_stock = 0, $eatby = '', $sellby = '', $batch_number = '')
-    {
-    	global $langs;
+	/**
+	 *  Find first detail record that match eather eat-by or sell-by or batch within given warehouse
+	 *
+	 *  @param	int			$fk_product_stock   id product_stock for objet
+	 *  @param	integer		$eatby    			eat-by date for object - deprecated: a search must be done on batch number
+	 *  @param	integer		$sellby   			sell-by date for object - deprecated: a search must be done on batch number
+	 *  @param	string		$batch_number   	batch number for object
+	 *  @return int          					<0 if KO, >0 if OK
+	 */
+	public function find($fk_product_stock = 0, $eatby = '', $sellby = '', $batch_number = '')
+	{
+		global $langs;
 
 		$where = array();
 		$sql = "SELECT";
@@ -393,15 +393,15 @@ class Productbatch extends CommonObject
 
 		if (!empty($where)) $sql .= " AND (".implode(" OR ", $where).")";
 
-    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->rowid;
+				$this->id = $obj->rowid;
 
 				$this->tms = $this->db->jdate($obj->tms);
 				$this->fk_product_stock = $obj->fk_product_stock;
@@ -410,27 +410,27 @@ class Productbatch extends CommonObject
 				$this->batch = $obj->batch;
 				$this->qty = $obj->qty;
 				$this->import_key = $obj->import_key;
-            }
-            $this->db->free($resql);
+			}
+			$this->db->free($resql);
 
-            return 1;
-        } else {
-      	    $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
-    /**
-     * Return all batch detail records for a given product and warehouse
-     *
-     *  @param	DoliDB		$db    				database object
-     *  @param	int			$fk_product_stock	id product_stock for objet
-     *  @param	int			$with_qty    		1 = doesn't return line with 0 quantity
-     *  @param  int         $fk_product         If set to a product id, get eatby and sellby from table llx_product_lot
-     *  @return array         					<0 if KO, array of batch
-     */
-    public static function findAll($db, $fk_product_stock, $with_qty = 0, $fk_product = 0)
-    {
-    	global $langs;
+			return 1;
+		} else {
+	  		$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+	/**
+	 * Return all batch detail records for a given product and warehouse
+	 *
+	 *  @param	DoliDB		$db    				database object
+	 *  @param	int			$fk_product_stock	id product_stock for objet
+	 *  @param	int			$with_qty    		1 = doesn't return line with 0 quantity
+	 *  @param  int         $fk_product         If set to a product id, get eatby and sellby from table llx_product_lot
+	 *  @return array         					<0 if KO, array of batch
+	 */
+	public static function findAll($db, $fk_product_stock, $with_qty = 0, $fk_product = 0)
+	{
+		global $langs;
 		$ret = array();
 
 		$sql = "SELECT";
@@ -444,26 +444,26 @@ class Productbatch extends CommonObject
 		$sql .= " t.import_key";
 		if ($fk_product > 0)
 		{
-		    $sql .= ", pl.rowid as lotid, pl.eatby as eatby, pl.sellby as sellby";
-		    // TODO May add extrafields to ?
+			$sql .= ", pl.rowid as lotid, pl.eatby as eatby, pl.sellby as sellby";
+			// TODO May add extrafields to ?
+		}
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_batch as t";
+		if ($fk_product > 0)
+		{
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl ON pl.fk_product = ".$fk_product." AND pl.batch = t.batch";
+			// TODO May add extrafields to ?
 		}
-        $sql .= " FROM ".MAIN_DB_PREFIX."product_batch as t";
-        if ($fk_product > 0)
-        {
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl ON pl.fk_product = ".$fk_product." AND pl.batch = t.batch";
-            // TODO May add extrafields to ?
-        }
 		$sql .= " WHERE fk_product_stock=".$fk_product_stock;
 		if ($with_qty) $sql .= " AND t.qty <> 0";
 
 		dol_syslog("productbatch::findAll", LOG_DEBUG);
 		$resql = $db->query($sql);
-        if ($resql) {
-            $num = $db->num_rows($resql);
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+		if ($resql) {
+			$num = $db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
 				$tmp = new Productbatch($db);
 				$tmp->id    = $obj->rowid;
@@ -478,15 +478,15 @@ class Productbatch extends CommonObject
 
 				$ret[$tmp->batch] = $tmp; // $ret is for a $fk_product_stock and unique key is on $fk_product_stock+batch
 				$i++;
-            }
-            $db->free($resql);
+			}
+			$db->free($resql);
 
-            return $ret;
-        } else {
-            $error = "Error ".$db->lasterror();
-            return -1;
-        }
-    }
+			return $ret;
+		} else {
+			$error = "Error ".$db->lasterror();
+			return -1;
+		}
+	}
 
 	/**
 	 * Return all batch for a product and a warehouse
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index 2e8cd316bc0..55018f1fc8f 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -47,14 +47,14 @@ class Productcustomerprice extends CommonObject
 	public $tms = '';
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_product;
 
 	/**
 	 * @var int Thirdparty ID
 	 */
-    public $fk_soc;
+	public $fk_soc;
 
 	public $price;
 	public $price_ttc;
@@ -81,10 +81,10 @@ class Productcustomerprice extends CommonObject
 	 *
 	 * @param DoliDb $db handler
 	 */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 	/**
 	 * Create object into database
@@ -94,8 +94,8 @@ class Productcustomerprice extends CommonObject
 	 * @param int $forceupdateaffiliate update price on each soc child
 	 * @return int <0 if KO, Id of created object if OK
 	 */
-    public function create($user, $notrigger = 0, $forceupdateaffiliate = 0)
-    {
+	public function create($user, $notrigger = 0, $forceupdateaffiliate = 0)
+	{
 
 		global $conf, $langs;
 		$error = 0;
@@ -217,6 +217,13 @@ class Productcustomerprice extends CommonObject
 
 		if (!$error) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."product_customer_price");
+
+			if (!$notrigger) {
+				$result = $this->call_trigger('PRODUCT_CUSTOMER_PRICE_CREATE', $user);
+				if ($result < 0) {
+					$error++;
+				}
+			}
 		}
 
 		if (!$error) {
@@ -252,7 +259,6 @@ class Productcustomerprice extends CommonObject
 
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
-
 		$sql .= " t.entity,";
 		$sql .= " t.datec,";
 		$sql .= " t.tms,";
@@ -309,7 +315,7 @@ class Productcustomerprice extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Load all customer prices in memory from database
 	 *
@@ -322,7 +328,7 @@ class Productcustomerprice extends CommonObject
 	 */
 	public function fetch_all($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = array())
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if (empty($sortfield)) $sortfield = "t.rowid";
@@ -330,7 +336,6 @@ class Productcustomerprice extends CommonObject
 
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
-
 		$sql .= " t.entity,";
 		$sql .= " t.datec,";
 		$sql .= " t.tms,";
@@ -363,15 +368,16 @@ class Productcustomerprice extends CommonObject
 		// Manage filter
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
-				if (strpos($key, 'date')) 				// To allow $filter['YEAR(s.dated)']=>$year
-				{
-					$sql .= ' AND '.$key.' = \''.$value.'\'';
+				if (strpos($key, 'date')) {				// To allow $filter['YEAR(s.dated)']=>$year
+					$sql .= ' AND '.$key.' = \''.$this->db->escape($value).'\'';
 				} elseif ($key == 'soc.nom') {
-					$sql .= ' AND '.$key.' LIKE \'%'.$value.'%\'';
-				} elseif ($key == 'prod.ref') {
-					$sql .= ' AND '.$key.' LIKE \'%'.$value.'%\'';
+					$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
+				} elseif ($key == 'prod.ref' || $key == 'prod.label') {
+					$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
+				} elseif ($key == 't.price' || $key == 't.price_ttc') {
+					$sql .= ' AND '.$key.' LIKE \'%'.price2num($value).'%\'';
 				} else {
-					$sql .= ' AND '.$key.' = '.$value;
+					$sql .= ' AND '.$key.' = '.((int) $value);
 				}
 			}
 		}
@@ -422,7 +428,7 @@ class Productcustomerprice extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Load all objects in memory from database
 	 *
@@ -435,7 +441,7 @@ class Productcustomerprice extends CommonObject
 	 */
 	public function fetch_all_log($sortorder, $sortfield, $limit, $offset, $filter = array())
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if (!empty($sortfield)) $sortfield = "t.rowid";
@@ -537,8 +543,8 @@ class Productcustomerprice extends CommonObject
 	 * @param int $forceupdateaffiliate update price on each soc child
 	 * @return int <0 if KO, >0 if OK
 	 */
-    public function update($user = 0, $notrigger = 0, $forceupdateaffiliate = 0)
-    {
+	public function update($user = 0, $notrigger = 0, $forceupdateaffiliate = 0)
+	{
 
 		global $conf, $langs;
 		$error = 0;
@@ -723,7 +729,7 @@ class Productcustomerprice extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-    }
+	}
 
 	/**
 	 * Force update price on child companies so child company has same prices than parent.
@@ -732,8 +738,8 @@ class Productcustomerprice extends CommonObject
 	 * @param int $forceupdateaffiliate update price on each soc child
 	 * @return int <0 if KO, 0 = action disabled, >0 if OK
 	 */
-    public function setPriceOnAffiliateThirdparty($user, $forceupdateaffiliate)
-    {
+	public function setPriceOnAffiliateThirdparty($user, $forceupdateaffiliate)
+	{
 		global $conf;
 
 		if (!empty($conf->global->PRODUCT_DISABLE_PROPAGATE_CUSTOMER_PRICES_ON_CHILD_COMPANIES)) {
@@ -817,7 +823,7 @@ class Productcustomerprice extends CommonObject
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
-    }
+	}
 
 	/**
 	 * Delete object in database
@@ -826,14 +832,21 @@ class Productcustomerprice extends CommonObject
 	 * @param int $notrigger triggers after, 1=disable triggers
 	 * @return int <0 if KO, >0 if OK
 	 */
-    public function delete($user, $notrigger = 0)
-    {
+	public function delete($user, $notrigger = 0)
+	{
 
 		global $conf, $langs;
 		$error = 0;
 
 		$this->db->begin();
 
+		if (!$error && !$notrigger) {
+			$result = $this->call_trigger('PRODUCT_CUSTOMER_PRICE_DELETE', $user);
+			if ($result < 0) {
+				$error++;
+			}
+		}
+
 		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_customer_price";
 			$sql .= " WHERE rowid=".$this->id;
@@ -858,7 +871,7 @@ class Productcustomerprice extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-    }
+	}
 
 	/**
 	 * Load an object from its id and create a new one in database
@@ -867,8 +880,8 @@ class Productcustomerprice extends CommonObject
 	 * @param   int     $fromid     ID of object to clone
 	 * @return  int                 id of clone
 	 */
-    public function createFromClone(User $user, $fromid)
-    {
+	public function createFromClone(User $user, $fromid)
+	{
 		$error = 0;
 
 		$object = new Productcustomerprice($this->db);
@@ -907,7 +920,7 @@ class Productcustomerprice extends CommonObject
 			$this->db->rollback();
 			return -1;
 		}
-    }
+	}
 
 	/**
 	 * Initialise object with example values
@@ -915,8 +928,8 @@ class Productcustomerprice extends CommonObject
 	 *
 	 * @return void
 	 */
-    public function initAsSpecimen()
-    {
+	public function initAsSpecimen()
+	{
 
 		$this->id = 0;
 
@@ -937,7 +950,7 @@ class Productcustomerprice extends CommonObject
 		$this->localtax2_tx = '';
 		$this->fk_user = '';
 		$this->import_key = '';
-    }
+	}
 }
 
 /**
@@ -959,14 +972,14 @@ class PriceByCustomerLine
 	public $tms = '';
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_product;
 
 	/**
 	 * @var int Thirdparty ID
 	 */
-    public $fk_soc;
+	public $fk_soc;
 
 	public $price;
 	public $price_ttc;
@@ -979,12 +992,12 @@ class PriceByCustomerLine
 	public $localtax1_tx;
 	public $localtax2_tx;
 
-    /**
-     * @var int User ID
-     */
-    public $fk_user;
+	/**
+	 * @var int User ID
+	 */
+	public $fk_user;
 
-    public $import_key;
-    public $socname;
-    public $prodref;
+	public $import_key;
+	public $socname;
+	public $prodref;
 }
diff --git a/htdocs/product/class/propalmergepdfproduct.class.php b/htdocs/product/class/propalmergepdfproduct.class.php
index 30ed73d8c77..c917201b645 100644
--- a/htdocs/product/class/propalmergepdfproduct.class.php
+++ b/htdocs/product/class/propalmergepdfproduct.class.php
@@ -54,27 +54,27 @@ class Propalmergepdfproduct extends CommonObject
 
 
 
-    /**
-     *  Constructor
-     *
-     *  @param	DoliDb		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param	DoliDb		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *  Create object 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
-     */
-    public function create($user, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Create object 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
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -91,7 +91,7 @@ class Propalmergepdfproduct extends CommonObject
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Insert request
+		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."propal_merge_pdf_product(";
 
 		$sql .= "fk_product,";
@@ -104,7 +104,7 @@ class Propalmergepdfproduct extends CommonObject
 		$sql .= "datec";
 
 
-        $sql .= ") VALUES (";
+		$sql .= ") VALUES (";
 
 		$sql .= " ".(!isset($this->fk_product) ? 'NULL' : "'".$this->db->escape($this->fk_product)."'").",";
 		$sql .= " ".(!isset($this->file_name) ? 'NULL' : "'".$this->db->escape($this->file_name)."'").",";
@@ -121,42 +121,42 @@ class Propalmergepdfproduct extends CommonObject
 		$this->db->begin();
 
 	   	dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
 		if (!$error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."propal_merge_pdf_product");
-        }
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."propal_merge_pdf_product");
+		}
 
-        // Commit or rollback
-        if ($error)
+		// Commit or rollback
+		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
 		} else {
 			$this->db->commit();
-            return $this->id;
+			return $this->id;
 		}
-    }
+	}
 
 
-    /**
-     *  Load object in memory from the database
-     *
-     *  @param	int		$id    Id object
-     *  @return int          	<0 if KO, >0 if OK
-     */
-    public function fetch($id)
-    {
-    	global $langs, $conf;
+	/**
+	 *  Load object in memory from the database
+	 *
+	 *  @param	int		$id    Id object
+	 *  @return int          	<0 if KO, >0 if OK
+	 */
+	public function fetch($id)
+	{
+		global $langs, $conf;
 
-        $sql = "SELECT";
+		$sql = "SELECT";
 		$sql .= " t.rowid,";
 
 		$sql .= " t.fk_product,";
@@ -169,18 +169,18 @@ class Propalmergepdfproduct extends CommonObject
 		$sql .= " t.import_key";
 
 
-        $sql .= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
-        $sql .= " WHERE t.rowid = ".$id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
+		$sql .= " WHERE t.rowid = ".$id;
 
-    	dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->rowid;
+				$this->id = $obj->rowid;
 
 				$this->fk_product = $obj->fk_product;
 				$this->file_name = $obj->file_name;
@@ -192,100 +192,100 @@ class Propalmergepdfproduct extends CommonObject
 				$this->datec = $this->db->jdate($obj->datec);
 				$this->tms = $this->db->jdate($obj->tms);
 				$this->import_key = $obj->import_key;
-            }
-            $this->db->free($resql);
+			}
+			$this->db->free($resql);
 
-            return 1;
-        } else {
-      	    $this->error = "Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+	  		$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Load object in memory from the database
-     *
-     *  @param	int		$product_id    	Id object
-     *  @param	string	$lang  			Lang string code
-     *  @return int          	<0 if KO, >0 if OK
-     */
-    public function fetch_by_product($product_id, $lang = '')
-    {
-        // phpcs:enable
-    	global $langs, $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Load object in memory from the database
+	 *
+	 *  @param	int		$product_id    	Id object
+	 *  @param	string	$lang  			Lang string code
+	 *  @return int          	<0 if KO, >0 if OK
+	 */
+	public function fetch_by_product($product_id, $lang = '')
+	{
+		// phpcs:enable
+		global $langs, $conf;
 
-    	$sql = "SELECT";
-    	$sql .= " t.rowid,";
+		$sql = "SELECT";
+		$sql .= " t.rowid,";
 
-    	$sql .= " t.fk_product,";
-    	$sql .= " t.file_name,";
-    	$sql .= " t.lang,";
-    	$sql .= " t.fk_user_author,";
-    	$sql .= " t.fk_user_mod,";
-    	$sql .= " t.datec,";
-    	$sql .= " t.tms,";
-    	$sql .= " t.import_key";
+		$sql .= " t.fk_product,";
+		$sql .= " t.file_name,";
+		$sql .= " t.lang,";
+		$sql .= " t.fk_user_author,";
+		$sql .= " t.fk_user_mod,";
+		$sql .= " t.datec,";
+		$sql .= " t.tms,";
+		$sql .= " t.import_key";
 
 
-    	$sql .= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
-    	$sql .= " WHERE t.fk_product = ".$product_id;
-    	if ($conf->global->MAIN_MULTILANGS && !empty($lang)) {
-    		$sql .= " AND t.lang = '".$this->db->escape($lang)."'";
-    	}
+		$sql .= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
+		$sql .= " WHERE t.fk_product = ".$product_id;
+		if ($conf->global->MAIN_MULTILANGS && !empty($lang)) {
+			$sql .= " AND t.lang = '".$this->db->escape($lang)."'";
+		}
 
-    	dol_syslog(__METHOD__, LOG_DEBUG);
-    	$resql = $this->db->query($sql);
-    	if ($resql)
-    	{
-    		if ($this->db->num_rows($resql))
-    		{
-    			while ($obj = $this->db->fetch_object($resql)) {
-    				$line = new PropalmergepdfproductLine();
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				while ($obj = $this->db->fetch_object($resql)) {
+					$line = new PropalmergepdfproductLine();
 
-	    			$line->id = $obj->rowid;
+					$line->id = $obj->rowid;
 
-	    			$line->fk_product = $obj->fk_product;
-	    			$line->file_name = $obj->file_name;
-	    			if ($conf->global->MAIN_MULTILANGS) {
-	    				$line->lang = $obj->lang;
-	    			}
-	    			$line->fk_user_author = $obj->fk_user_author;
-	    			$line->fk_user_mod = $obj->fk_user_mod;
-	    			$line->datec = $this->db->jdate($obj->datec);
-	    			$line->tms = $this->db->jdate($obj->tms);
-	    			$line->import_key = $obj->import_key;
+					$line->fk_product = $obj->fk_product;
+					$line->file_name = $obj->file_name;
+					if ($conf->global->MAIN_MULTILANGS) {
+						$line->lang = $obj->lang;
+					}
+					$line->fk_user_author = $obj->fk_user_author;
+					$line->fk_user_mod = $obj->fk_user_mod;
+					$line->datec = $this->db->jdate($obj->datec);
+					$line->tms = $this->db->jdate($obj->tms);
+					$line->import_key = $obj->import_key;
 
 
-	    			if ($conf->global->MAIN_MULTILANGS) {
-	    				$this->lines[$obj->file_name.'_'.$obj->lang] = $line;
-	    			} else {
-	    				$this->lines[$obj->file_name] = $line;
-	    			}
-    			}
-    		}
-    		$this->db->free($resql);
+					if ($conf->global->MAIN_MULTILANGS) {
+						$this->lines[$obj->file_name.'_'.$obj->lang] = $line;
+					} else {
+						$this->lines[$obj->file_name] = $line;
+					}
+				}
+			}
+			$this->db->free($resql);
 
-    		return 1;
-    	} else {
-    		$this->error = "Error ".$this->db->lasterror();
-    		dol_syslog(get_class($this)."::fetch_by_product ".$this->error, LOG_ERR);
-    		return -1;
-    	}
-    }
+			return 1;
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::fetch_by_product ".$this->error, LOG_ERR);
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Update object into database
-     *
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    public function update($user = 0, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Update object into database
+	 *
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update($user = 0, $notrigger = 0)
+	{
+		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -298,8 +298,8 @@ class Propalmergepdfproduct extends CommonObject
 		// Check parameters
 		// Put here code to add a control on parameters values
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."propal_merge_pdf_product SET";
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."propal_merge_pdf_product SET";
 
 		$sql .= " fk_product=".(isset($this->fk_product) ? $this->fk_product : "null").",";
 		$sql .= " file_name=".(isset($this->file_name) ? "'".$this->db->escape($this->file_name)."'" : "null").",";
@@ -309,62 +309,21 @@ class Propalmergepdfproduct extends CommonObject
 		$sql .= " fk_user_mod=".$user->id;
 
 
-        $sql .= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-			}
-			$this->db->rollback();
-			return -1 * $error;
-		} else {
-			$this->db->commit();
-			return 1;
-		}
-    }
-
-
- 	/**
-	 *  Delete object in database
-	 *
-     *	@param  User	$user        User that deletes
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
-	 */
-	public function delete($user, $notrigger = 0)
-	{
-		global $conf, $langs;
-		$error = 0;
-
-		$this->db->begin();
-
-		if (!$error)
-		{
-    		$sql = "DELETE FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product";
-    		$sql .= " WHERE rowid=".$this->id;
-
-    		dol_syslog(__METHOD__, LOG_DEBUG);
-    		$resql = $this->db->query($sql);
-        	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-		}
-
-        // Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
-	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -374,7 +333,48 @@ class Propalmergepdfproduct extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+
+ 	/**
+ 	 *  Delete object in database
+ 	 *
+ 	 *	@param  User	$user        User that deletes
+ 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+ 	 *  @return	int					 <0 if KO, >0 if OK
+ 	 */
+	public function delete($user, $notrigger = 0)
+	{
+		global $conf, $langs;
+		$error = 0;
+
+		$this->db->begin();
+
+		if (!$error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product";
+			$sql .= " WHERE rowid=".$this->id;
+
+			dol_syslog(__METHOD__, LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Delete object in database
 	 *
@@ -386,7 +386,7 @@ class Propalmergepdfproduct extends CommonObject
 	 */
 	public function delete_by_product($user, $product_id, $lang_id = '', $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 		$error = 0;
 
@@ -422,7 +422,7 @@ class Propalmergepdfproduct extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Delete object in database
 	 *
@@ -431,7 +431,7 @@ class Propalmergepdfproduct extends CommonObject
 	 */
 	public function delete_by_file($user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 		$error = 0;
 
@@ -543,38 +543,38 @@ class Propalmergepdfproduct extends CommonObject
  */
 class PropalmergepdfproductLine
 {
-    /**
-     * @var int ID
-     */
-    public $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
 
-    /**
-     * @var int ID
-     */
-    public $fk_product;
+	/**
+	 * @var int ID
+	 */
+	public $fk_product;
 
 	public $file_name;
 	public $lang;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_author;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_mod;
 
 	public $datec = '';
 	public $tms = '';
 	public $import_key;
 
-    /**
-     *  Constructor
-     */
-    public function __construct()
-    {
-        return 1;
-    }
+	/**
+	 *  Constructor
+	 */
+	public function __construct()
+	{
+		return 1;
+	}
 }
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 843e1e6cb59..13ef4582d20 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -136,8 +136,8 @@ if ($action == 'search')
 {
 	$current_lang = $langs->getDefaultLang();
 
-    $sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.fk_product_type as type, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,';
-    $sql .= ' p.fk_product_type, p.tms as datem';
+	$sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.fk_product_type as type, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,';
+	$sql .= ' p.fk_product_type, p.tms as datem';
 	if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= ', pl.label as labelm, pl.description as descriptionm';
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON p.rowid = cp.fk_product';
@@ -187,7 +187,7 @@ llxHeader('', $title, $helpurl);
 $head = product_prepare_head($object);
 $titre = $langs->trans("CardProduct".$object->type);
 $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
-dol_fiche_head($head, 'subproduct', $titre, -1, $picto);
+print dol_get_fiche_head($head, 'subproduct', $titre, -1, $picto);
 
 
 if ($id > 0 || !empty($ref))
@@ -197,58 +197,58 @@ if ($id > 0 || !empty($ref))
 	 */
 	if ($user->rights->produit->lire || $user->rights->service->lire)
 	{
-        $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        $shownav = 1;
-        if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+		$shownav = 1;
+		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
-        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref', '', '', '', 0, '', '', 0);
+		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref', '', '', '', 0, '', '', 0);
 
-        if ($object->type != Product::TYPE_SERVICE || empty($conf->global->PRODUIT_MULTIPRICES))
-        {
-            print '<div class="fichecenter">';
-    	    print '<div class="underbanner clearboth"></div>';
+		if ($object->type != Product::TYPE_SERVICE || empty($conf->global->PRODUIT_MULTIPRICES))
+		{
+			print '<div class="fichecenter">';
+			print '<div class="underbanner clearboth"></div>';
 
-    	    print '<table class="border centpercent tableforfield">';
+			print '<table class="border centpercent tableforfield">';
 
-    		// Nature
-    		if ($object->type != Product::TYPE_SERVICE)
-    		{
-    			print '<tr><td class="titlefield">'.$langs->trans("Nature").'</td><td>';
-    			print $object->getLibFinished();
-    			print '</td></tr>';
-    		}
+			// Nature
+			if ($object->type != Product::TYPE_SERVICE)
+			{
+				print '<tr><td class="titlefield">'.$langs->trans("Nature").'</td><td>';
+				print $object->getLibFinished();
+				print '</td></tr>';
+			}
 
-    		if (empty($conf->global->PRODUIT_MULTIPRICES))
-    		{
-    		    // Price
-    			print '<tr><td class="titlefield">'.$langs->trans("SellingPrice").'</td><td>';
-    			if ($object->price_base_type == 'TTC')
-    			{
-    				print price($object->price_ttc).' '.$langs->trans($object->price_base_type);
-    			} else {
-    				print price($object->price).' '.$langs->trans($object->price_base_type ? $object->price_base_type : 'HT');
-    			}
-    			print '</td></tr>';
+			if (empty($conf->global->PRODUIT_MULTIPRICES))
+			{
+				// Price
+				print '<tr><td class="titlefield">'.$langs->trans("SellingPrice").'</td><td>';
+				if ($object->price_base_type == 'TTC')
+				{
+					print price($object->price_ttc).' '.$langs->trans($object->price_base_type);
+				} else {
+					print price($object->price).' '.$langs->trans($object->price_base_type ? $object->price_base_type : 'HT');
+				}
+				print '</td></tr>';
 
-    			// Price minimum
-    			print '<tr><td>'.$langs->trans("MinPrice").'</td><td>';
-    			if ($object->price_base_type == 'TTC')
-    			{
-    				print price($object->price_min_ttc).' '.$langs->trans($object->price_base_type);
-    			} else {
-    				print price($object->price_min).' '.$langs->trans($object->price_base_type ? $object->price_base_type : 'HT');
-    			}
-    			print '</td></tr>';
-    		}
+				// Price minimum
+				print '<tr><td>'.$langs->trans("MinPrice").'</td><td>';
+				if ($object->price_base_type == 'TTC')
+				{
+					print price($object->price_min_ttc).' '.$langs->trans($object->price_base_type);
+				} else {
+					print price($object->price_min).' '.$langs->trans($object->price_base_type ? $object->price_base_type : 'HT');
+				}
+				print '</td></tr>';
+			}
 
-            print '</table>';
-            print '</div>';
-        }
+			print '</table>';
+			print '</div>';
+		}
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
-        print '<br>';
+		print '<br>';
 
 		$prodsfather = $object->getFather(); // Parent Products
 		$object->get_sousproduits_arbo(); // Load $object->sousprods
@@ -341,8 +341,8 @@ if ($id > 0 || !empty($ref))
 					if ($product_fourn->find_min_price_product_fournisseur($productstatic->id) > 0)
 					{
 						print $langs->trans("BuyingPriceMinShort").': ';
-				    	if ($product_fourn->product_fourn_price_id > 0) print $product_fourn->display_price_product_fournisseur(0, 0);
-				    	else { print $langs->trans("NotDefined"); $notdefined++; $atleastonenotdefined++; }
+						if ($product_fourn->product_fourn_price_id > 0) print $product_fourn->display_price_product_fournisseur(0, 0);
+						else { print $langs->trans("NotDefined"); $notdefined++; $atleastonenotdefined++; }
 					}
 					print '</td>';
 
@@ -351,11 +351,12 @@ if ($id > 0 || !empty($ref))
 					$fourn_remise_percent = (!empty($product_fourn->fourn_remise_percent) ? $product_fourn->fourn_remise_percent : 0);
 					$fourn_remise = (!empty($product_fourn->fourn_remise) ? $product_fourn->fourn_remise : 0);
 
-					$totalline = price2num($value['nb'] * ($fourn_unitprice * (1 - $fourn_remise_percent / 100) - $fourn_remise), 'MT');
+					$unitline = price2num(($fourn_unitprice * (1 - ($fourn_remise_percent / 100)) - $fourn_remise), 'MU');
+					$totalline = price2num($value['nb'] * ($fourn_unitprice * (1 - ($fourn_remise_percent / 100)) - $fourn_remise), 'MT');
 					$total += $totalline;
 
 					print '<td class="right">';
-					print ($notdefined ? '' : ($value['nb'] > 1 ? $value['nb'].'x' : '').price($fourn_unitprice, '', '', 0, 0, -1, $conf->currency));
+					print ($notdefined ? '' : ($value['nb'] > 1 ? $value['nb'].'x' : '').price($unitline, '', '', 0, 0, -1, $conf->currency));
 					print '</td>';
 
 					// Best selling price
@@ -445,7 +446,7 @@ if ($id > 0 || !empty($ref))
 			print '<td class="right" colspan="2">';
 			if ($user->rights->produit->creer || $user->rights->service->creer)
 			{
-				print '<input type="submit" class="button" value="'.$langs->trans('Save').'">';
+				print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 			}
 			print '</td>';
 			print '</tr>'."\n";
@@ -461,7 +462,7 @@ if ($id > 0 || !empty($ref))
 		print '</table>';
 
 		/*if($user->rights->produit->creer || $user->rights->service->creer) {
-			print '<input type="submit" class="button" value="'.$langs->trans('Save').'">';
+			print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 		}*/
 
 		print '</form>';
@@ -477,7 +478,7 @@ if ($id > 0 || !empty($ref))
 			$rowspan = 1;
 			if (!empty($conf->categorie->enabled)) $rowspan++;
 
-	        print load_fiche_titre($langs->trans("ProductToAddSearch"), '', '');
+			print load_fiche_titre($langs->trans("ProductToAddSearch"), '', '');
 			print '<form action="'.DOL_URL_ROOT.'/product/composition/card.php?id='.$id.'" method="POST">';
 			print '<input type="hidden" name="action" value="search">';
 			print '<input type="hidden" name="id" value="'.$id.'">';
@@ -622,7 +623,7 @@ if ($id > 0 || !empty($ref))
 				print '<br><div class="center">';
 				print '<input type="submit" class="button" name="save" value="'.$langs->trans("Add").'/'.$langs->trans("Update").'">';
 				print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-				print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+				print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 				print '</div>';
 			}
 
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 8d06e211bab..0e3d3c662b0 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -70,15 +70,15 @@ if (!$sortfield) $sortfield = "position_name";
 $object = new Product($db);
 if ($id > 0 || !empty($ref))
 {
-    $result = $object->fetch($id, $ref);
+	$result = $object->fetch($id, $ref);
 
-    if (!empty($conf->product->enabled)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
-    elseif (!empty($conf->service->enabled)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
+	if (!empty($conf->product->enabled)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
+	elseif (!empty($conf->service->enabled)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
 
 	if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
 	{
-	    if (!empty($conf->product->enabled)) $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2), 1, 1).'/'.substr(substr("000".$object->id, -2), 0, 1).'/'.$object->id."/photos";
-	    else $upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2), 1, 1).'/'.substr(substr("000".$object->id, -2), 0, 1).'/'.$object->id."/photos";
+		if (!empty($conf->product->enabled)) $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2), 1, 1).'/'.substr(substr("000".$object->id, -2), 0, 1).'/'.$object->id."/photos";
+		else $upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2), 1, 1).'/'.substr(substr("000".$object->id, -2), 0, 1).'/'.$object->id."/photos";
 	}
 }
 $modulepart = 'produit';
@@ -191,11 +191,11 @@ if ($object->id)
 	$titre = $langs->trans("CardProduct".$object->type);
 	$picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
 
-	dol_fiche_head($head, 'documents', $titre, -1, $picto);
+	print dol_get_fiche_head($head, 'documents', $titre, -1, $picto);
 
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
+	print $hookmanager->resPrint;
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 	// Build file list
@@ -214,127 +214,127 @@ if ($object->id)
 	}
 
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-    $object->next_prev_filter = " fk_product_type = ".$object->type;
+	$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$object->next_prev_filter = " fk_product_type = ".$object->type;
 
-    $shownav = 1;
-    if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+	$shownav = 1;
+	if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
-    dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+	dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
-    print '<table class="border tableforfield centpercent">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border tableforfield centpercent">';
 
-    print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-    print '</table>';
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+	print '</table>';
 
-    print '</div>';
-    print '<div style="clear:both"></div>';
+	print '</div>';
+	print '<div style="clear:both"></div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    $param = '&id='.$object->id;
-    include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 
 
-    // Merge propal PDF document PDF files
-    if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL))
-    {
-    	$filetomerge = new Propalmergepdfproduct($db);
+	// Merge propal PDF document PDF files
+	if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL))
+	{
+		$filetomerge = new Propalmergepdfproduct($db);
 
-    	if ($conf->global->MAIN_MULTILANGS) {
-    		$lang_id = GETPOST('lang_id', 'aZ09');
-    		$result = $filetomerge->fetch_by_product($object->id, $lang_id);
-    	} else {
-    		$result = $filetomerge->fetch_by_product($object->id);
-    	}
+		if ($conf->global->MAIN_MULTILANGS) {
+			$lang_id = GETPOST('lang_id', 'aZ09');
+			$result = $filetomerge->fetch_by_product($object->id, $lang_id);
+		} else {
+			$result = $filetomerge->fetch_by_product($object->id);
+		}
 
-    	$form = new Form($db);
+		$form = new Form($db);
 
 
-    	$filearray = dol_dir_list($upload_dir, "files", 0, '', '\.meta$', 'name', SORT_ASC, 1);
+		$filearray = dol_dir_list($upload_dir, "files", 0, '', '\.meta$', 'name', SORT_ASC, 1);
 
-    	if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
-    	{
-    		$filearray = array_merge($filearray, dol_dir_list($upload_dirold, "files", 0, '', '\.meta$', 'name', SORT_ASC, 1));
-    	}
+		if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
+		{
+			$filearray = array_merge($filearray, dol_dir_list($upload_dirold, "files", 0, '', '\.meta$', 'name', SORT_ASC, 1));
+		}
 
-    	// For each file build select list with PDF extention
-    	if (count($filearray) > 0)
-    	{
-    		print '<br>';
-    		// Actual file to merge is :
-    		if (count($filetomerge->lines) > 0) {
-    			print $langs->trans('PropalMergePdfProductActualFile');
-    		}
+		// For each file build select list with PDF extention
+		if (count($filearray) > 0)
+		{
+			print '<br>';
+			// Actual file to merge is :
+			if (count($filetomerge->lines) > 0) {
+				print $langs->trans('PropalMergePdfProductActualFile');
+			}
 
-    		print '<form name="filemerge" action="'.DOL_URL_ROOT.'/product/document.php?id='.$object->id.'" method="post">';
-    		print '<input type="hidden" name="token" value="'.newToken().'">';
-    		print '<input type="hidden" name="action" value="filemerge">';
-    		if (count($filetomerge->lines) == 0) {
-    			print $langs->trans('PropalMergePdfProductChooseFile');
-    		}
+			print '<form name="filemerge" action="'.DOL_URL_ROOT.'/product/document.php?id='.$object->id.'" method="post">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="action" value="filemerge">';
+			if (count($filetomerge->lines) == 0) {
+				print $langs->trans('PropalMergePdfProductChooseFile');
+			}
 
-    		print  '<table class="noborder">';
+			print  '<table class="noborder">';
 
-    		// Get language
-    		if ($conf->global->MAIN_MULTILANGS) {
-    			$langs->load("languages");
+			// Get language
+			if ($conf->global->MAIN_MULTILANGS) {
+				$langs->load("languages");
 
-    			print  '<tr class="liste_titre"><td>';
+				print  '<tr class="liste_titre"><td>';
 
-    			$default_lang = empty($lang_id) ? $langs->getDefaultLang() : $lang_id;
+				$default_lang = empty($lang_id) ? $langs->getDefaultLang() : $lang_id;
 
-    			$langs_available = $langs->get_available_languages(DOL_DOCUMENT_ROOT, 12);
+				$langs_available = $langs->get_available_languages(DOL_DOCUMENT_ROOT, 12);
 
-			    print Form::selectarray('lang_id', $langs_available, $default_lang, 0, 0, 0, '', 0, 0, 0, 'ASC');
+				print Form::selectarray('lang_id', $langs_available, $default_lang, 0, 0, 0, '', 0, 0, 0, 'ASC');
 
-    			if ($conf->global->MAIN_MULTILANGS) {
-    				print  '<input type="submit" class="button" name="refresh" value="'.$langs->trans('Refresh').'">';
-    			}
+				if ($conf->global->MAIN_MULTILANGS) {
+					print  '<input type="submit" class="button" name="refresh" value="'.$langs->trans('Refresh').'">';
+				}
 
-    			print  '</td></tr>';
-    		}
+				print  '</td></tr>';
+			}
 
-    		foreach ($filearray as $filetoadd)
-    		{
-    			if ($ext = pathinfo($filetoadd['name'], PATHINFO_EXTENSION) == 'pdf')
-    			{
-    				$checked = '';
-    				$filename = $filetoadd['name'];
+			foreach ($filearray as $filetoadd)
+			{
+				if ($ext = pathinfo($filetoadd['name'], PATHINFO_EXTENSION) == 'pdf')
+				{
+					$checked = '';
+					$filename = $filetoadd['name'];
 
-    				if ($conf->global->MAIN_MULTILANGS)
-    				{
-    					if (array_key_exists($filetoadd['name'].'_'.$default_lang, $filetomerge->lines))
-    					{
-    						$filename = $filetoadd['name'].' - '.$langs->trans('Language_'.$default_lang);
-    						$checked = ' checked ';
-    					}
-    				} else {
-    					if (array_key_exists($filetoadd['name'], $filetomerge->lines))
-    					{
-    						$checked = ' checked ';
-    					}
-    				}
+					if ($conf->global->MAIN_MULTILANGS)
+					{
+						if (array_key_exists($filetoadd['name'].'_'.$default_lang, $filetomerge->lines))
+						{
+							$filename = $filetoadd['name'].' - '.$langs->trans('Language_'.$default_lang);
+							$checked = ' checked ';
+						}
+					} else {
+						if (array_key_exists($filetoadd['name'], $filetomerge->lines))
+						{
+							$checked = ' checked ';
+						}
+					}
 
-    				print  '<tr class="oddeven"><td>';
-    				print  '<input type="checkbox" '.$checked.' name="filetoadd[]" id="filetoadd" value="'.$filetoadd['name'].'">'.$filename.'</input>';
-    				print  '</td></tr>';
-    			}
-    		}
+					print  '<tr class="oddeven"><td>';
+					print  '<input type="checkbox" '.$checked.' name="filetoadd[]" id="filetoadd" value="'.$filetoadd['name'].'">'.$filename.'</input>';
+					print  '</td></tr>';
+				}
+			}
 
-    		print  '<tr><td>';
-    		print  '<input type="submit" class="button" name="save" value="'.$langs->trans('Save').'">';
-    		print  '</td></tr>';
+			print  '<tr><td>';
+			print  '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+			print  '</td></tr>';
 
-    		print  '</table>';
+			print  '</table>';
 
-    		print  '</form>';
-    	}
-    }
+			print  '</form>';
+		}
+	}
 } else {
 	print $langs->trans("ErrorUnknown");
 }
diff --git a/htdocs/product/dynamic_price/class/price_expression.class.php b/htdocs/product/dynamic_price/class/price_expression.class.php
index cf498d6f998..218780cce44 100644
--- a/htdocs/product/dynamic_price/class/price_expression.class.php
+++ b/htdocs/product/dynamic_price/class/price_expression.class.php
@@ -29,337 +29,337 @@
  */
 class PriceExpression
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
-    /**
-     * @var string[] Error codes (or messages)
-     */
-    public $errors = array();
+	/**
+	 * @var string[] Error codes (or messages)
+	 */
+	public $errors = array();
 
-    /**
-     * @var int ID
-     */
-    public $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
 
-    public $title;
-    public $expression;
+	public $title;
+	public $expression;
 
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element = "c_price_expression";
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = "c_price_expression";
 
-    /**
-     *  Constructor
-     *
-     *  @param	DoliDb		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param	DoliDb		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *  Create object 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
-     */
-    public function create($user, $notrigger = 0)
-    {
-        $error = 0;
+	/**
+	 *  Create object 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
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		$error = 0;
 
-        // Clean parameters
-        if (isset($this->title)) $this->title = trim($this->title);
-        if (isset($this->expression)) $this->expression = trim($this->expression);
+		// Clean parameters
+		if (isset($this->title)) $this->title = trim($this->title);
+		if (isset($this->expression)) $this->expression = trim($this->expression);
 
-        // Insert request
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
-        $sql .= "title, expression";
-        $sql .= ") VALUES (";
-        $sql .= " ".(isset($this->title) ? "'".$this->db->escape($this->title)."'" : "''").",";
-        $sql .= " ".(isset($this->expression) ? "'".$this->db->escape($this->expression)."'" : "''");
-        $sql .= ")";
+		// Insert request
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
+		$sql .= "title, expression";
+		$sql .= ") VALUES (";
+		$sql .= " ".(isset($this->title) ? "'".$this->db->escape($this->title)."'" : "''").",";
+		$sql .= " ".(isset($this->expression) ? "'".$this->db->escape($this->expression)."'" : "''");
+		$sql .= ")";
 
-        $this->db->begin();
+		$this->db->begin();
 
-        dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        if (!$error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+		if (!$error)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 
-            //if (! $notrigger)
-            //{
-                // Uncomment this and change MYOBJECT to your own tag if you
-                // want this action calls a trigger.
+			//if (! $notrigger)
+			//{
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
 
-                //// Call triggers
-                //$result=$this->call_trigger('MYOBJECT_CREATE',$user);
-                //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-                //// End call triggers
-            //}
-        }
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
+			//}
+		}
 
-        // Commit or rollback
-        if ($error)
-        {
-            foreach ($this->errors as $errmsg)
-            {
-                dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-            }
-            $this->db->rollback();
-            return -1 * $error;
-        } else {
-            $this->db->commit();
-            return $this->id;
-        }
-    }
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return $this->id;
+		}
+	}
 
 
-    /**
-     *  Load object in memory from the database
-     *
-     *  @param		int		$id    	Id object
-     *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 if OK
-     */
-    public function fetch($id)
-    {
-        // Check parameters
-        if (empty($id))
-        {
-            $this->error = 'ErrorWrongParameters';
-            return -1;
-        }
+	/**
+	 *  Load object in memory from the database
+	 *
+	 *  @param		int		$id    	Id object
+	 *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 if OK
+	 */
+	public function fetch($id)
+	{
+		// Check parameters
+		if (empty($id))
+		{
+			$this->error = 'ErrorWrongParameters';
+			return -1;
+		}
 
-        $sql = "SELECT title, expression";
-        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql .= " WHERE rowid = ".$id;
+		$sql = "SELECT title, expression";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE rowid = ".$id;
 
-        dol_syslog(__METHOD__);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            if ($obj)
-            {
-                $this->id = $id;
-                $this->title = $obj->title;
-                $this->expression = $obj->expression;
-                return 1;
-            } else {
-                return 0;
-            }
-        } else {
-              $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
+		dol_syslog(__METHOD__);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($obj)
+			{
+				$this->id = $id;
+				$this->title = $obj->title;
+				$this->expression = $obj->expression;
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			  $this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    List all price expressions
-     *
-     *    @return	array				Array of price expressions
-     */
-    public function list_price_expression()
-    {
-        // phpcs:enable
-        $sql = "SELECT rowid, title, expression";
-        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql .= " ORDER BY title";
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    List all price expressions
+	 *
+	 *    @return	array				Array of price expressions
+	 */
+	public function list_price_expression()
+	{
+		// phpcs:enable
+		$sql = "SELECT rowid, title, expression";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " ORDER BY title";
 
-        dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $retarray = array();
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$retarray = array();
 
-            while ($record = $this->db->fetch_array($resql))
-            {
-                $price_expression_obj = new PriceExpression($this->db);
-                $price_expression_obj->id = $record["rowid"];
-                $price_expression_obj->title = $record["title"];
-                $price_expression_obj->expression = $record["expression"];
-                $retarray[] = $price_expression_obj;
-            }
+			while ($record = $this->db->fetch_array($resql))
+			{
+				$price_expression_obj = new PriceExpression($this->db);
+				$price_expression_obj->id = $record["rowid"];
+				$price_expression_obj->title = $record["title"];
+				$price_expression_obj->expression = $record["expression"];
+				$retarray[] = $price_expression_obj;
+			}
 
-            $this->db->free($resql);
-            return $retarray;
-        } else {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+			$this->db->free($resql);
+			return $retarray;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Returns any existing rowid with specified title
-     *
-     *  @param		String	$title  Title of expression
-     *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 rowid
-     */
-    public function find_title($title)
-    {
-        // phpcs:enable
-        $sql = "SELECT rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql .= " WHERE title = '".$this->db->escape($title)."'";
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Returns any existing rowid with specified title
+	 *
+	 *  @param		String	$title  Title of expression
+	 *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 rowid
+	 */
+	public function find_title($title)
+	{
+		// phpcs:enable
+		$sql = "SELECT rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE title = '".$this->db->escape($title)."'";
 
-        dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            if ($obj)
-            {
-                return (int) $obj->rowid;
-            } else {
-                return 0;
-            }
-        } else {
-              $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($obj)
+			{
+				return (int) $obj->rowid;
+			} else {
+				return 0;
+			}
+		} else {
+			  $this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Update object into database
-     *
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    public function update($user = 0, $notrigger = 0)
-    {
-        $error = 0;
+	/**
+	 *  Update object into database
+	 *
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update($user = 0, $notrigger = 0)
+	{
+		$error = 0;
 
-        // Clean parameters
-        if (isset($this->title)) $this->title = trim($this->title);
-        if (isset($this->expression)) $this->expression = trim($this->expression);
+		// Clean parameters
+		if (isset($this->title)) $this->title = trim($this->title);
+		if (isset($this->expression)) $this->expression = trim($this->expression);
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql .= " title = ".(isset($this->title) ? "'".$this->db->escape($this->title)."'" : "''").",";
-        $sql .= " expression = ".(isset($this->expression) ? "'".$this->db->escape($this->expression)."'" : "''")."";
-        $sql .= " WHERE rowid = ".$this->id;
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql .= " title = ".(isset($this->title) ? "'".$this->db->escape($this->title)."'" : "''").",";
+		$sql .= " expression = ".(isset($this->expression) ? "'".$this->db->escape($this->expression)."'" : "''")."";
+		$sql .= " WHERE rowid = ".$this->id;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        dol_syslog(__METHOD__);
-        $resql = $this->db->query($sql);
-        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		dol_syslog(__METHOD__);
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        // if (! $error)
-        // {
-        //     if (! $notrigger)
-        //     {
-        //         // Uncomment this and change MYOBJECT to your own tag if you
-        //         // want this action calls a trigger.
+		// if (! $error)
+		// {
+		//     if (! $notrigger)
+		//     {
+		//         // Uncomment this and change MYOBJECT to your own tag if you
+		//         // want this action calls a trigger.
 
-        //         //// Call triggers
-        //         //$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
-        //         //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-        //         //// End call triggers
-        //     }
-        // }
+		//         //// Call triggers
+		//         //$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+		//         //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+		//         //// End call triggers
+		//     }
+		// }
 
-        // Commit or rollback
-        if ($error)
-        {
-            foreach ($this->errors as $errmsg)
-            {
-                dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-            }
-            $this->db->rollback();
-            return -1 * $error;
-        } else {
-            $this->db->commit();
-            return 1;
-        }
-    }
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
 
 
-     /**
-     *  Delete object in database
-     *
-     *	@param  User	$user        User that deletes
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return	int					 <0 if KO, >0 if OK
-     */
-    public function delete(User $user, $notrigger = 0)
-    {
-        $error = 0;
+	 /**
+	  *  Delete object in database
+	  *
+	  *	@param  User	$user        User that deletes
+	  *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	  *  @return	int					 <0 if KO, >0 if OK
+	  */
+	public function delete(User $user, $notrigger = 0)
+	{
+		$error = 0;
 
-        $rowid = $this->id;
+		$rowid = $this->id;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        //if (! $error)
-        //{
-        //    if (! $notrigger)
-        //    {
-                // Uncomment this and change MYOBJECT to your own tag if you
-                // want this action calls a trigger.
+		//if (! $error)
+		//{
+		//    if (! $notrigger)
+		//    {
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
 
-                //// Call triggers
-                //$result=$this->call_trigger('MYOBJECT_DELETE',$user);
-                //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-                //// End call triggers
-        //    }
-        //}
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
+		//    }
+		//}
 
-        if (!$error)
-        {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
-            $sql .= " WHERE rowid = ".$rowid;
+		if (!$error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " WHERE rowid = ".$rowid;
 
-            dol_syslog(__METHOD__);
-            $resql = $this->db->query($sql);
-            if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-        }
+			dol_syslog(__METHOD__);
+			$resql = $this->db->query($sql);
+			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		}
 
-        // Commit or rollback
-        if ($error)
-        {
-            foreach ($this->errors as $errmsg)
-            {
-                dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-            }
-            $this->db->rollback();
-            return -1 * $error;
-        } else {
-            $this->db->commit();
-            return 1;
-        }
-    }
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
 
-    /**
-     *  Initialise object with example values
-     *  Id must be 0 if object instance is a specimen
-     *
-     *  @return	void
-     */
-    public function initAsSpecimen()
-    {
-        $this->id = 0;
-        $this->expression = '';
-    }
+	/**
+	 *  Initialise object with example values
+	 *  Id must be 0 if object instance is a specimen
+	 *
+	 *  @return	void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->id = 0;
+		$this->expression = '';
+	}
 }
diff --git a/htdocs/product/dynamic_price/class/price_global_variable.class.php b/htdocs/product/dynamic_price/class/price_global_variable.class.php
index f2ab8006b02..fbe5956db7c 100644
--- a/htdocs/product/dynamic_price/class/price_global_variable.class.php
+++ b/htdocs/product/dynamic_price/class/price_global_variable.class.php
@@ -29,319 +29,319 @@
  */
 class PriceGlobalVariable
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
-    /**
-     * @var string[] Error codes (or messages)
-     */
-    public $errors = array();
+	/**
+	 * @var string[] Error codes (or messages)
+	 */
+	public $errors = array();
 
-    /**
-     * @var int ID
-     */
-    public $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
 
-    public $code;
+	public $code;
 
-    /**
-     * @var string description
-     */
-    public $description;
+	/**
+	 * @var string description
+	 */
+	public $description;
 
-    public $value;
+	public $value;
 
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element = "c_price_global_variable";
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = "c_price_global_variable";
 
-    /**
-     *  Constructor
-     *
-     *  @param	DoliDb		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param	DoliDb		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *  Create object 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
-     */
-    public function create($user, $notrigger = 0)
-    {
-        $error = 0;
+	/**
+	 *  Create object 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
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		$error = 0;
 
-        $this->checkParameters();
+		$this->checkParameters();
 
-        // Insert request
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
-        $sql .= "code, description, value";
-        $sql .= ") VALUES (";
-        $sql .= " ".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "''").",";
-        $sql .= " ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
-        $sql .= " ".$this->value;
-        $sql .= ")";
+		// Insert request
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
+		$sql .= "code, description, value";
+		$sql .= ") VALUES (";
+		$sql .= " ".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "''").",";
+		$sql .= " ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
+		$sql .= " ".$this->value;
+		$sql .= ")";
 
-        $this->db->begin();
+		$this->db->begin();
 
-        dol_syslog(__METHOD__);
-        $resql = $this->db->query($sql);
-        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		dol_syslog(__METHOD__);
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        if (!$error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+		if (!$error)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 
-            if (!$notrigger)
-            {
-                // Uncomment this and change MYOBJECT to your own tag if you
-                // want this action calls a trigger.
+			if (!$notrigger)
+			{
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
 
-                //// Call triggers
-                //$result=$this->call_trigger('MYOBJECT_CREATE',$user);
-                //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-                //// End call triggers
-            }
-        }
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
+			}
+		}
 
-        // Commit or rollback
-        if ($error)
-        {
-            foreach ($this->errors as $errmsg)
-            {
-                dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-            }
-            $this->db->rollback();
-            return -1 * $error;
-        } else {
-            $this->db->commit();
-            return $this->id;
-        }
-    }
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return $this->id;
+		}
+	}
 
 
-    /**
-     *  Load object in memory from the database
-     *
-     *  @param		int		$id    	Id object
-     *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 if OK
-     */
-    public function fetch($id)
-    {
-        $sql = "SELECT code, description, value";
-        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql .= " WHERE rowid = ".$id;
+	/**
+	 *  Load object in memory from the database
+	 *
+	 *  @param		int		$id    	Id object
+	 *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 if OK
+	 */
+	public function fetch($id)
+	{
+		$sql = "SELECT code, description, value";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE rowid = ".$id;
 
-        dol_syslog(__METHOD__);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            if ($obj)
-            {
-                $this->id = $id;
-                $this->code			= $obj->code;
-                $this->description = $obj->description;
-                $this->value		= $obj->value;
-                $this->checkParameters();
-                return 1;
-            } else {
-                return 0;
-            }
-        } else {
-            $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
+		dol_syslog(__METHOD__);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($obj)
+			{
+				$this->id = $id;
+				$this->code			= $obj->code;
+				$this->description = $obj->description;
+				$this->value		= $obj->value;
+				$this->checkParameters();
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
-    /**
-     *  Update object into database
-     *
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    public function update($user = 0, $notrigger = 0)
-    {
-        $error = 0;
+	/**
+	 *  Update object into database
+	 *
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update($user = 0, $notrigger = 0)
+	{
+		$error = 0;
 
-        $this->checkParameters();
+		$this->checkParameters();
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql .= " code = ".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "''").",";
-        $sql .= " description = ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
-        $sql .= " value = ".$this->value;
-        $sql .= " WHERE rowid = ".$this->id;
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql .= " code = ".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "''").",";
+		$sql .= " description = ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
+		$sql .= " value = ".$this->value;
+		$sql .= " WHERE rowid = ".$this->id;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        dol_syslog(__METHOD__);
-        $resql = $this->db->query($sql);
-        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		dol_syslog(__METHOD__);
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        // if (! $error)
-        // {
-        //     if (! $notrigger)
-        //     {
-        //         // Uncomment this and change MYOBJECT to your own tag if you
-        //         // want this action calls a trigger.
+		// if (! $error)
+		// {
+		//     if (! $notrigger)
+		//     {
+		//         // Uncomment this and change MYOBJECT to your own tag if you
+		//         // want this action calls a trigger.
 
-        //         //// Call triggers
-        //         //$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
-        //         //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-        //         //// End call triggers
-        //     }
-        // }
+		//         //// Call triggers
+		//         //$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+		//         //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+		//         //// End call triggers
+		//     }
+		// }
 
-        // Commit or rollback
-        if ($error)
-        {
-            foreach ($this->errors as $errmsg)
-            {
-                dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-            }
-            $this->db->rollback();
-            return -1 * $error;
-        } else {
-            $this->db->commit();
-            return 1;
-        }
-    }
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
 
 
-    /**
-     *  Delete object in database
-     *
-     * 	@param	int		$rowid		 Row id of global variable
-     *	@param  User	$user        User that deletes
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return	int					 <0 if KO, >0 if OK
-     */
-    public function delete($rowid, $user, $notrigger = 0)
-    {
-        $error = 0;
+	/**
+	 *  Delete object in database
+	 *
+	 * 	@param	int		$rowid		 Row id of global variable
+	 *	@param  User	$user        User that deletes
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return	int					 <0 if KO, >0 if OK
+	 */
+	public function delete($rowid, $user, $notrigger = 0)
+	{
+		$error = 0;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        if (!$error)
-        {
-            if (!$notrigger)
-            {
-                // Uncomment this and change MYOBJECT to your own tag if you
-                // want this action calls a trigger.
+		if (!$error)
+		{
+			if (!$notrigger)
+			{
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
 
-                //// Call triggers
-                //$result=$this->call_trigger('MYOBJECT_DELETE',$user);
-                //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-                //// End call triggers
-            }
-        }
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
+			}
+		}
 
-        if (!$error)
-        {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
-            $sql .= " WHERE rowid = ".$rowid;
+		if (!$error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " WHERE rowid = ".$rowid;
 
-            dol_syslog(__METHOD__);
-            $resql = $this->db->query($sql);
-            if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-        }
+			dol_syslog(__METHOD__);
+			$resql = $this->db->query($sql);
+			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		}
 
-        // Commit or rollback
-        if ($error)
-        {
-            foreach ($this->errors as $errmsg)
-            {
-                dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-            }
-            $this->db->rollback();
-            return -1 * $error;
-        } else {
-            $this->db->commit();
-            return 1;
-        }
-    }
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
 
-    /**
-     *	Initialise object with example values
-     *	Id must be 0 if object instance is a specimen
-     *
-     *	@return	void
-     */
-    public function initAsSpecimen()
-    {
-        $this->id = 0;
-        $this->code = '';
-        $this->description = '';
-        $this->value = '';
-    }
+	/**
+	 *	Initialise object with example values
+	 *	Id must be 0 if object instance is a specimen
+	 *
+	 *	@return	void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->id = 0;
+		$this->code = '';
+		$this->description = '';
+		$this->value = '';
+	}
 
-    /**
-     *	Checks if all parameters are in order
-     *
-     *	@return	void
-     */
-    public function checkParameters()
-    {
-        // Clean parameters
-        if (isset($this->code)) $this->code = trim($this->code);
-        if (isset($this->description)) $this->description = trim($this->description);
+	/**
+	 *	Checks if all parameters are in order
+	 *
+	 *	@return	void
+	 */
+	public function checkParameters()
+	{
+		// Clean parameters
+		if (isset($this->code)) $this->code = trim($this->code);
+		if (isset($this->description)) $this->description = trim($this->description);
 
-        // Check parameters
-        if (empty($this->value) || !is_numeric($this->value)) $this->value = 0;
-    }
+		// Check parameters
+		if (empty($this->value) || !is_numeric($this->value)) $this->value = 0;
+	}
 
-    /**
-     *    List all price global variables
-     *
-     *    @return	array				Array of price global variables
-     */
-    public function listGlobalVariables()
-    {
-        $sql = "SELECT rowid, code, description, value";
-        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql .= " ORDER BY code";
+	/**
+	 *    List all price global variables
+	 *
+	 *    @return	array				Array of price global variables
+	 */
+	public function listGlobalVariables()
+	{
+		$sql = "SELECT rowid, code, description, value";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " ORDER BY code";
 
-        dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $retarray = array();
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$retarray = array();
 
-            while ($record = $this->db->fetch_array($resql))
-            {
-                $variable_obj = new PriceGlobalVariable($this->db);
-                $variable_obj->id = $record["rowid"];
-                $variable_obj->code = $record["code"];
-                $variable_obj->description = $record["description"];
-                $variable_obj->value = $record["value"];
-                $variable_obj->checkParameters();
-                $retarray[] = $variable_obj;
-            }
+			while ($record = $this->db->fetch_array($resql))
+			{
+				$variable_obj = new PriceGlobalVariable($this->db);
+				$variable_obj->id = $record["rowid"];
+				$variable_obj->code = $record["code"];
+				$variable_obj->description = $record["description"];
+				$variable_obj->value = $record["value"];
+				$variable_obj->checkParameters();
+				$retarray[] = $variable_obj;
+			}
 
-            $this->db->free($resql);
-            return $retarray;
-        } else {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+			$this->db->free($resql);
+			return $retarray;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 }
diff --git a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
index 6706dded094..256e3525ead 100644
--- a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
+++ b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
@@ -29,608 +29,608 @@
  */
 class PriceGlobalVariableUpdater
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
-
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
-
-    /**
-     * @var string[] Error codes (or messages)
-     */
-    public $errors = array();
-
-    public $types = array(0, 1); //!< Updater types
-    public $update_min = 5; //!< Minimal update rate
-
-    /**
-     * @var int ID
-     */
-    public $id;
-
-    public $type;
-
-    /**
-     * @var string description
-     */
-    public $description;
-
-    public $parameters;
-
-    /**
-     * @var int ID
-     */
-    public $fk_variable;
-
-    public $update_interval; //!< Interval in mins
-    public $next_update; //!< Next update timestamp
-    public $last_status;
-
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element = "c_price_global_variable_updater";
-
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDb      $db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
-
-
-    /**
-     *  Create object 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
-     */
-    public function create($user, $notrigger = 0)
-    {
-        $error = 0;
-
-        $this->checkParameters();
-
-        // Insert request
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
-        $sql .= "type, description, parameters, fk_variable, update_interval, next_update, last_status";
-        $sql .= ") VALUES (";
-        $sql .= " ".$this->type.",";
-        $sql .= " ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
-        $sql .= " ".(isset($this->parameters) ? "'".$this->db->escape($this->parameters)."'" : "''").",";
-        $sql .= " ".$this->fk_variable.",";
-        $sql .= " ".$this->update_interval.",";
-        $sql .= " ".$this->next_update.",";
-        $sql .= " ".(isset($this->last_status) ? "'".$this->db->escape($this->last_status)."'" : "''");
-        $sql .= ")";
-
-        $this->db->begin();
-
-        dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-
-        if (!$error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
-
-            if (!$notrigger)
-            {
-                // Uncomment this and change MYOBJECT to your own tag if you
-                // want this action calls a trigger.
-
-                //// Call triggers
-                //$result=$this->call_trigger('MYOBJECT_CREATE',$user);
-                //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-                //// End call triggers
-            }
-        }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach ($this->errors as $errmsg)
-            {
-                dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-            }
-            $this->db->rollback();
-            return -1 * $error;
-        } else {
-            $this->db->commit();
-            return $this->id;
-        }
-    }
-
-
-    /**
-     *  Load object in memory from the database
-     *
-     *  @param		int		$id    	Id object
-     *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 if OK
-     */
-    public function fetch($id)
-    {
-        $sql = "SELECT type, description, parameters, fk_variable, update_interval, next_update, last_status";
-        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql .= " WHERE rowid = ".$id;
-
-        dol_syslog(__METHOD__);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            if ($obj)
-            {
-                $this->id = $id;
-                $this->type = $obj->type;
-                $this->description		= $obj->description;
-                $this->parameters = $obj->parameters;
-                $this->fk_variable		= $obj->fk_variable;
-                $this->update_interval = $obj->update_interval;
-                $this->next_update		= $obj->next_update;
-                $this->last_status		= $obj->last_status;
-                $this->checkParameters();
-                return 1;
-            } else {
-                return 0;
-            }
-        } else {
-            $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
-
-    /**
-     *  Update object into database
-     *
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    public function update($user = 0, $notrigger = 0)
-    {
-        $error = 0;
-
-        $this->checkParameters();
-
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql .= " type = ".$this->type.",";
-        $sql .= " description = ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
-        $sql .= " parameters = ".(isset($this->parameters) ? "'".$this->db->escape($this->parameters)."'" : "''").",";
-        $sql .= " fk_variable = ".$this->fk_variable.",";
-        $sql .= " update_interval = ".$this->update_interval.",";
-        $sql .= " next_update = ".$this->next_update.",";
-        $sql .= " last_status = ".(isset($this->last_status) ? "'".$this->db->escape($this->last_status)."'" : "''");
-        $sql .= " WHERE rowid = ".$this->id;
-
-        $this->db->begin();
-
-        dol_syslog(__METHOD__);
-        $resql = $this->db->query($sql);
-        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-
-        // if (! $error)
-        // {
-        //     if (! $notrigger)
-        //     {
-        //         // Uncomment this and change MYOBJECT to your own tag if you
-        //         // want this action calls a trigger.
-
-        //         //// Call triggers
-        //         //$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
-        //         //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-        //         //// End call triggers
-        //     }
-        // }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach ($this->errors as $errmsg)
-            {
-                dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-            }
-            $this->db->rollback();
-            return -1 * $error;
-        } else {
-            $this->db->commit();
-            return 1;
-        }
-    }
-
-    /**
-     *  Delete object in database
-     *
-     * 	@param	int		$rowid		 Row id of global variable
-     *	@param  User	$user        User that deletes
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return	int					 <0 if KO, >0 if OK
-     */
-    public function delete($rowid, $user, $notrigger = 0)
-    {
-        $error = 0;
-
-        $this->db->begin();
-
-        //if (! $error)
-        //{
-        //    if (! $notrigger)
-        //    {
-                // Uncomment this and change MYOBJECT to your own tag if you
-                // want this action calls a trigger.
-
-                //// Call triggers
-                //$result=$this->call_trigger('MYOBJECT_DELETE',$user);
-                //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-                //// End call triggers
-        //    }
-        //}
-
-        if (!$error)
-        {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
-            $sql .= " WHERE rowid = ".$rowid;
-
-            dol_syslog(__METHOD__);
-            $resql = $this->db->query($sql);
-            if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-        }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach ($this->errors as $errmsg)
-            {
-                dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-            }
-            $this->db->rollback();
-            return -1 * $error;
-        } else {
-            $this->db->commit();
-            return 1;
-        }
-    }
-
-    /**
-     *	Initialise object with example values
-     *	Id must be 0 if object instance is a specimen
-     *
-     *	@return	void
-     */
-    public function initAsSpecimen()
-    {
-        $this->id = 0;
-        $this->type = 0;
-        $this->description = '';
-        $this->parameters = '';
-        $this->fk_variable = 0;
-        $this->update_interval = 0;
-        $this->next_update = 0;
-        $this->last_status = '';
-    }
-
-    /**
-     *  Returns the last updated time in string html format, returns "never" if its less than 1
-     *
-     *  @return	string
-     */
-    public function getLastUpdated()
-    {
-        global $langs;
-        $last = $this->next_update - ($this->update_interval * 60);
-        if ($last < 1) {
-            return $langs->trans("Never");
-        }
-        $status = empty($this->last_status) ? $langs->trans("CorrectlyUpdated") : $this->last_status;
-        return $status.'<br>'.dol_print_date($last, '%d/%m/%Y %H:%M:%S');
-    }
-
-    /**
-     *	Checks if all parameters are in order
-     *
-     *	@return	void
-     */
-    public function checkParameters()
-    {
-        // Clean parameters
-        if (isset($this->description)) $this->description = trim($this->description);
-        if (isset($this->parameters)) $this->parameters = trim($this->parameters);
-        else $this->parameters = "";
-        if (isset($this->last_status)) $this->last_status = trim($this->last_status);
-
-        // Check parameters
-        if (empty($this->type) || !is_numeric($this->type) || !in_array($this->type, $this->types)) $this->type = 0;
-        if (empty($this->update_interval) || !is_numeric($this->update_interval) || $this->update_interval < 1) $this->update_interval = $this->update_min;
-        if (empty($this->next_update) || !is_numeric($this->next_update) || $this->next_update < 0) $this->next_update = 0;
-    }
-
-    /**
-     *  List all price global variables
-     *
-     *  @return	array				Array of price global variable updaters
-     */
-    public function listUpdaters()
-    {
-        $sql = "SELECT rowid, type, description, parameters, fk_variable, update_interval, next_update, last_status";
-        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-
-        dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $retarray = array();
-
-            while ($record = $this->db->fetch_array($resql))
-            {
-                $updater_obj = new PriceGlobalVariableUpdater($this->db);
-                $updater_obj->id = $record["rowid"];
-                $updater_obj->type = $record["type"];
-                $updater_obj->description		= $record["description"];
-                $updater_obj->parameters = $record["parameters"];
-                $updater_obj->fk_variable		= $record["fk_variable"];
-                $updater_obj->update_interval = $record["update_interval"];
-                $updater_obj->next_update		= $record["next_update"];
-                $updater_obj->last_status		= $record["last_status"];
-                $updater_obj->checkParameters();
-                $retarray[] = $updater_obj;
-            }
-
-            $this->db->free($resql);
-            return $retarray;
-        } else {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
-
-    /**
-     *  List all updaters which need to be processed
-     *
-     *  @return	array				Array of price global variable updaters
-     */
-    public function listPendingUpdaters()
-    {
-        $sql = "SELECT rowid, type, description, parameters, fk_variable, update_interval, next_update, last_status";
-        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql .= " WHERE next_update < ".dol_now();
-
-        dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $retarray = array();
-
-            while ($record = $this->db->fetch_array($resql))
-            {
-                $updater_obj = new PriceGlobalVariableUpdater($this->db);
-                $updater_obj->id = $record["rowid"];
-                $updater_obj->type = $record["type"];
-                $updater_obj->description		= $record["description"];
-                $updater_obj->parameters = $record["parameters"];
-                $updater_obj->fk_variable		= $record["fk_variable"];
-                $updater_obj->update_interval = $record["update_interval"];
-                $updater_obj->next_update		= $record["next_update"];
-                $updater_obj->last_status		= $record["last_status"];
-                $updater_obj->checkParameters();
-                $retarray[] = $updater_obj;
-            }
-
-            $this->db->free($resql);
-            return $retarray;
-        } else {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
-
-    /**
-     *  Handles the processing of this updater
-     *
-     *  @return	int					 <0 if KO, 0 if OK but no global variable found, >0 if OK
-     */
-    public function process()
-    {
-        global $langs, $user;
-        $langs->load("errors");
-        dol_syslog(__METHOD__, LOG_DEBUG);
-
-        $this->error = null;
-        $this->checkParameters();
-
-        //Try to load the target global variable and abort if fails
-        if ($this->fk_variable < 1) {
-            $this->error = $langs->trans("ErrorGlobalVariableUpdater5");
-            return 0;
-        }
-        $price_globals = new PriceGlobalVariable($this->db);
-        $res = $price_globals->fetch($this->fk_variable);
-        if ($res < 1) {
-            $this->error = $langs->trans("ErrorGlobalVariableUpdater5");
-            return 0;
-        }
-
-        //Process depending of type
-        if ($this->type == 0 || $this->type == 1) {
-            //Get and check if required parameters are present
-            $parameters = json_decode($this->parameters, true);
-            if (!isset($parameters)) {
-                $this->error = $langs->trans("ErrorGlobalVariableUpdater1", $this->parameters);
-                return -1;
-            }
-            $url = $parameters['URL'];
-            if (!isset($url)) {
-                $this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'URL');
-                return -1;
-            }
-            $value = $parameters['VALUE'];
-            if (!isset($value)) {
-                $this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'VALUE');
-                return -1;
-            }
-            $result = "";
-            if ($this->type == 0) {
-                // Call JSON request
-                include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-                $tmpresult = getURLContent($url);
-                $code = $tmpresult['http_code'];
-                $result = $tmpresult['content'];
-
-                if (!isset($result)) {
-                    $this->error = $langs->trans("ErrorGlobalVariableUpdater0", "empty response");
-                    return -1;
-                }
-                if ($code !== 200) {
-                    $this->error = $langs->trans("ErrorGlobalVariableUpdater0", $code.' '.$tmpresult['curl_error_msg']);
-                    return -1;
-                }
-
-                //Decode returned response
-                $result = json_decode($result, true);
-            } elseif ($this->type == 1) {
-                $ns = $parameters['NS'];
-                if (!isset($ns)) {
-                    $this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'NS');
-                    return -1;
-                }
-                $method = $parameters['METHOD'];
-                if (!isset($method)) {
-                    $this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'METHOD');
-                    return -1;
-                }
-                $data = $parameters['DATA'];
-                if (!isset($data)) {
-                    $this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'DATA');
-                    return -1;
-                }
-
-                //SOAP client
-                require_once NUSOAP_PATH.'/nusoap.php';
-                $soap_client = new nusoap_client($url);
-                $soap_client->soap_defencoding = 'UTF-8';
-                $soap_client->decodeUTF8(false);
-                $result = $soap_client->call($method, $data, $ns, '');
-
-                //Check if result is a error
-                if ($result === false) {
-                    $this->error = $langs->trans("ErrorGlobalVariableUpdater4", $soap_client->error_str);
-                    return -1;
-                }
-            }
-
-            //Explode value and walk for each key in value array to get the relevant key
-            $value = explode(',', $value);
-            foreach ($value as $key) {
-                $result = $result[$key];
-            }
-            if (!isset($result)) {
-                $this->error = $langs->trans("ErrorGlobalVariableUpdater3");
-                return -1;
-            }
-
-            //Save data to global and update it
-            $price_globals->value = $result;
-            $price_globals->update($user);
-        }
-        return 1;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Update next_update into database
-     *
-     *  @param	string	$next_update Next update to write
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    public function update_next_update($next_update, $user = 0, $notrigger = 0)
-    {
-        // phpcs:enable
-        $error = 0;
-
-        $this->next_update = $next_update;
-        $this->checkParameters();
-
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql .= " next_update = ".$this->next_update;
-        $sql .= " WHERE rowid = ".$this->id;
-
-        $this->db->begin();
-
-        dol_syslog(__METHOD__);
-        $resql = $this->db->query($sql);
-        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach ($this->errors as $errmsg)
-            {
-                dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-            }
-            $this->db->rollback();
-            return -1 * $error;
-        } else {
-            $this->db->commit();
-            return 1;
-        }
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Update last_status into database
-     *
-     *  @param	string	$last_status Status to write
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    public function update_status($last_status, $user = 0, $notrigger = 0)
-    {
-        // phpcs:enable
-        $error = 0;
-
-        $this->last_status = $last_status;
-        $this->checkParameters();
-
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql .= " last_status = ".(isset($this->last_status) ? "'".$this->db->escape($this->last_status)."'" : "''");
-        $sql .= " WHERE rowid = ".$this->id;
-
-        $this->db->begin();
-
-        dol_syslog(__METHOD__);
-        $resql = $this->db->query($sql);
-        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach ($this->errors as $errmsg)
-            {
-                dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-            }
-            $this->db->rollback();
-            return -1 * $error;
-        } else {
-            $this->db->commit();
-            return 1;
-        }
-    }
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
+
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
+
+	/**
+	 * @var string[] Error codes (or messages)
+	 */
+	public $errors = array();
+
+	public $types = array(0, 1); //!< Updater types
+	public $update_min = 5; //!< Minimal update rate
+
+	/**
+	 * @var int ID
+	 */
+	public $id;
+
+	public $type;
+
+	/**
+	 * @var string description
+	 */
+	public $description;
+
+	public $parameters;
+
+	/**
+	 * @var int ID
+	 */
+	public $fk_variable;
+
+	public $update_interval; //!< Interval in mins
+	public $next_update; //!< Next update timestamp
+	public $last_status;
+
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = "c_price_global_variable_updater";
+
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDb      $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
+
+
+	/**
+	 *  Create object 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
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		$error = 0;
+
+		$this->checkParameters();
+
+		// Insert request
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
+		$sql .= "type, description, parameters, fk_variable, update_interval, next_update, last_status";
+		$sql .= ") VALUES (";
+		$sql .= " ".$this->type.",";
+		$sql .= " ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
+		$sql .= " ".(isset($this->parameters) ? "'".$this->db->escape($this->parameters)."'" : "''").",";
+		$sql .= " ".$this->fk_variable.",";
+		$sql .= " ".$this->update_interval.",";
+		$sql .= " ".$this->next_update.",";
+		$sql .= " ".(isset($this->last_status) ? "'".$this->db->escape($this->last_status)."'" : "''");
+		$sql .= ")";
+
+		$this->db->begin();
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+
+		if (!$error)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+
+			if (!$notrigger)
+			{
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
+
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return $this->id;
+		}
+	}
+
+
+	/**
+	 *  Load object in memory from the database
+	 *
+	 *  @param		int		$id    	Id object
+	 *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 if OK
+	 */
+	public function fetch($id)
+	{
+		$sql = "SELECT type, description, parameters, fk_variable, update_interval, next_update, last_status";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE rowid = ".$id;
+
+		dol_syslog(__METHOD__);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($obj)
+			{
+				$this->id = $id;
+				$this->type = $obj->type;
+				$this->description		= $obj->description;
+				$this->parameters = $obj->parameters;
+				$this->fk_variable		= $obj->fk_variable;
+				$this->update_interval = $obj->update_interval;
+				$this->next_update		= $obj->next_update;
+				$this->last_status		= $obj->last_status;
+				$this->checkParameters();
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+	/**
+	 *  Update object into database
+	 *
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update($user = 0, $notrigger = 0)
+	{
+		$error = 0;
+
+		$this->checkParameters();
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql .= " type = ".$this->type.",";
+		$sql .= " description = ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
+		$sql .= " parameters = ".(isset($this->parameters) ? "'".$this->db->escape($this->parameters)."'" : "''").",";
+		$sql .= " fk_variable = ".$this->fk_variable.",";
+		$sql .= " update_interval = ".$this->update_interval.",";
+		$sql .= " next_update = ".$this->next_update.",";
+		$sql .= " last_status = ".(isset($this->last_status) ? "'".$this->db->escape($this->last_status)."'" : "''");
+		$sql .= " WHERE rowid = ".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(__METHOD__);
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+
+		// if (! $error)
+		// {
+		//     if (! $notrigger)
+		//     {
+		//         // Uncomment this and change MYOBJECT to your own tag if you
+		//         // want this action calls a trigger.
+
+		//         //// Call triggers
+		//         //$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+		//         //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+		//         //// End call triggers
+		//     }
+		// }
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+	/**
+	 *  Delete object in database
+	 *
+	 * 	@param	int		$rowid		 Row id of global variable
+	 *	@param  User	$user        User that deletes
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return	int					 <0 if KO, >0 if OK
+	 */
+	public function delete($rowid, $user, $notrigger = 0)
+	{
+		$error = 0;
+
+		$this->db->begin();
+
+		//if (! $error)
+		//{
+		//    if (! $notrigger)
+		//    {
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
+
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
+		//    }
+		//}
+
+		if (!$error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " WHERE rowid = ".$rowid;
+
+			dol_syslog(__METHOD__);
+			$resql = $this->db->query($sql);
+			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+	/**
+	 *	Initialise object with example values
+	 *	Id must be 0 if object instance is a specimen
+	 *
+	 *	@return	void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->id = 0;
+		$this->type = 0;
+		$this->description = '';
+		$this->parameters = '';
+		$this->fk_variable = 0;
+		$this->update_interval = 0;
+		$this->next_update = 0;
+		$this->last_status = '';
+	}
+
+	/**
+	 *  Returns the last updated time in string html format, returns "never" if its less than 1
+	 *
+	 *  @return	string
+	 */
+	public function getLastUpdated()
+	{
+		global $langs;
+		$last = $this->next_update - ($this->update_interval * 60);
+		if ($last < 1) {
+			return $langs->trans("Never");
+		}
+		$status = empty($this->last_status) ? $langs->trans("CorrectlyUpdated") : $this->last_status;
+		return $status.'<br>'.dol_print_date($last, '%d/%m/%Y %H:%M:%S');
+	}
+
+	/**
+	 *	Checks if all parameters are in order
+	 *
+	 *	@return	void
+	 */
+	public function checkParameters()
+	{
+		// Clean parameters
+		if (isset($this->description)) $this->description = trim($this->description);
+		if (isset($this->parameters)) $this->parameters = trim($this->parameters);
+		else $this->parameters = "";
+		if (isset($this->last_status)) $this->last_status = trim($this->last_status);
+
+		// Check parameters
+		if (empty($this->type) || !is_numeric($this->type) || !in_array($this->type, $this->types)) $this->type = 0;
+		if (empty($this->update_interval) || !is_numeric($this->update_interval) || $this->update_interval < 1) $this->update_interval = $this->update_min;
+		if (empty($this->next_update) || !is_numeric($this->next_update) || $this->next_update < 0) $this->next_update = 0;
+	}
+
+	/**
+	 *  List all price global variables
+	 *
+	 *  @return	array				Array of price global variable updaters
+	 */
+	public function listUpdaters()
+	{
+		$sql = "SELECT rowid, type, description, parameters, fk_variable, update_interval, next_update, last_status";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$retarray = array();
+
+			while ($record = $this->db->fetch_array($resql))
+			{
+				$updater_obj = new PriceGlobalVariableUpdater($this->db);
+				$updater_obj->id = $record["rowid"];
+				$updater_obj->type = $record["type"];
+				$updater_obj->description		= $record["description"];
+				$updater_obj->parameters = $record["parameters"];
+				$updater_obj->fk_variable		= $record["fk_variable"];
+				$updater_obj->update_interval = $record["update_interval"];
+				$updater_obj->next_update		= $record["next_update"];
+				$updater_obj->last_status		= $record["last_status"];
+				$updater_obj->checkParameters();
+				$retarray[] = $updater_obj;
+			}
+
+			$this->db->free($resql);
+			return $retarray;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
+
+	/**
+	 *  List all updaters which need to be processed
+	 *
+	 *  @return	array				Array of price global variable updaters
+	 */
+	public function listPendingUpdaters()
+	{
+		$sql = "SELECT rowid, type, description, parameters, fk_variable, update_interval, next_update, last_status";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE next_update < ".dol_now();
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$retarray = array();
+
+			while ($record = $this->db->fetch_array($resql))
+			{
+				$updater_obj = new PriceGlobalVariableUpdater($this->db);
+				$updater_obj->id = $record["rowid"];
+				$updater_obj->type = $record["type"];
+				$updater_obj->description		= $record["description"];
+				$updater_obj->parameters = $record["parameters"];
+				$updater_obj->fk_variable		= $record["fk_variable"];
+				$updater_obj->update_interval = $record["update_interval"];
+				$updater_obj->next_update		= $record["next_update"];
+				$updater_obj->last_status		= $record["last_status"];
+				$updater_obj->checkParameters();
+				$retarray[] = $updater_obj;
+			}
+
+			$this->db->free($resql);
+			return $retarray;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
+
+	/**
+	 *  Handles the processing of this updater
+	 *
+	 *  @return	int					 <0 if KO, 0 if OK but no global variable found, >0 if OK
+	 */
+	public function process()
+	{
+		global $langs, $user;
+		$langs->load("errors");
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$this->error = null;
+		$this->checkParameters();
+
+		//Try to load the target global variable and abort if fails
+		if ($this->fk_variable < 1) {
+			$this->error = $langs->trans("ErrorGlobalVariableUpdater5");
+			return 0;
+		}
+		$price_globals = new PriceGlobalVariable($this->db);
+		$res = $price_globals->fetch($this->fk_variable);
+		if ($res < 1) {
+			$this->error = $langs->trans("ErrorGlobalVariableUpdater5");
+			return 0;
+		}
+
+		//Process depending of type
+		if ($this->type == 0 || $this->type == 1) {
+			//Get and check if required parameters are present
+			$parameters = json_decode($this->parameters, true);
+			if (!isset($parameters)) {
+				$this->error = $langs->trans("ErrorGlobalVariableUpdater1", $this->parameters);
+				return -1;
+			}
+			$url = $parameters['URL'];
+			if (!isset($url)) {
+				$this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'URL');
+				return -1;
+			}
+			$value = $parameters['VALUE'];
+			if (!isset($value)) {
+				$this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'VALUE');
+				return -1;
+			}
+			$result = "";
+			if ($this->type == 0) {
+				// Call JSON request
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+				$tmpresult = getURLContent($url);
+				$code = $tmpresult['http_code'];
+				$result = $tmpresult['content'];
+
+				if (!isset($result)) {
+					$this->error = $langs->trans("ErrorGlobalVariableUpdater0", "empty response");
+					return -1;
+				}
+				if ($code !== 200) {
+					$this->error = $langs->trans("ErrorGlobalVariableUpdater0", $code.' '.$tmpresult['curl_error_msg']);
+					return -1;
+				}
+
+				//Decode returned response
+				$result = json_decode($result, true);
+			} elseif ($this->type == 1) {
+				$ns = $parameters['NS'];
+				if (!isset($ns)) {
+					$this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'NS');
+					return -1;
+				}
+				$method = $parameters['METHOD'];
+				if (!isset($method)) {
+					$this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'METHOD');
+					return -1;
+				}
+				$data = $parameters['DATA'];
+				if (!isset($data)) {
+					$this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'DATA');
+					return -1;
+				}
+
+				//SOAP client
+				require_once NUSOAP_PATH.'/nusoap.php';
+				$soap_client = new nusoap_client($url);
+				$soap_client->soap_defencoding = 'UTF-8';
+				$soap_client->decodeUTF8(false);
+				$result = $soap_client->call($method, $data, $ns, '');
+
+				//Check if result is a error
+				if ($result === false) {
+					$this->error = $langs->trans("ErrorGlobalVariableUpdater4", $soap_client->error_str);
+					return -1;
+				}
+			}
+
+			//Explode value and walk for each key in value array to get the relevant key
+			$value = explode(',', $value);
+			foreach ($value as $key) {
+				$result = $result[$key];
+			}
+			if (!isset($result)) {
+				$this->error = $langs->trans("ErrorGlobalVariableUpdater3");
+				return -1;
+			}
+
+			//Save data to global and update it
+			$price_globals->value = $result;
+			$price_globals->update($user);
+		}
+		return 1;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Update next_update into database
+	 *
+	 *  @param	string	$next_update Next update to write
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update_next_update($next_update, $user = 0, $notrigger = 0)
+	{
+		// phpcs:enable
+		$error = 0;
+
+		$this->next_update = $next_update;
+		$this->checkParameters();
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql .= " next_update = ".$this->next_update;
+		$sql .= " WHERE rowid = ".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(__METHOD__);
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Update last_status into database
+	 *
+	 *  @param	string	$last_status Status to write
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update_status($last_status, $user = 0, $notrigger = 0)
+	{
+		// phpcs:enable
+		$error = 0;
+
+		$this->last_status = $last_status;
+		$this->checkParameters();
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql .= " last_status = ".(isset($this->last_status) ? "'".$this->db->escape($this->last_status)."'" : "''");
+		$sql .= " WHERE rowid = ".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(__METHOD__);
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
 }
diff --git a/htdocs/product/dynamic_price/class/price_parser.class.php b/htdocs/product/dynamic_price/class/price_parser.class.php
index 7a7dd5aac56..47cb58c2a7f 100644
--- a/htdocs/product/dynamic_price/class/price_parser.class.php
+++ b/htdocs/product/dynamic_price/class/price_parser.class.php
@@ -32,38 +32,38 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
  */
 class PriceParser
 {
-    protected $db;
-    // Limit of expressions per price
-    public $limit = 100;
-    // The error that occurred when parsing price
-    public $error_parser;
-    // The expression that caused the error
-    public $error_expr;
-    //The special char
-    public $special_chr = "#";
-    //The separator char
-    public $separator_chr = ";";
+	protected $db;
+	// Limit of expressions per price
+	public $limit = 100;
+	// The error that occurred when parsing price
+	public $error_parser;
+	// The expression that caused the error
+	public $error_expr;
+	//The special char
+	public $special_chr = "#";
+	//The separator char
+	public $separator_chr = ";";
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
-    /**
-     *	Returns translated error
-     *
-     *	@return string      Translated error
-     */
-    public function translatedError()
-    {
-        global $langs;
-        $langs->load("errors");
-        /*
+	/**
+	 *	Returns translated error
+	 *
+	 *	@return string      Translated error
+	 */
+	public function translatedError()
+	{
+		global $langs;
+		$langs->load("errors");
+		/*
         -No arg
          9, an unexpected error occured
         14, division by zero
@@ -96,72 +96,72 @@ class PriceParser
         16, internal error
         18, internal error
         */
-        if (empty($this->error_parser)) {
-            return $langs->trans("ErrorPriceExpressionUnknown", 0); //this is not supposed to happen
-        }
-        list($code, $info) = $this->error_parser;
-        if (in_array($code, array(9, 14, 19, 20))) //Errors which have 0 arg
-        {
-            return $langs->trans("ErrorPriceExpression".$code);
-        } elseif (in_array($code, array(1, 2, 3, 4, 5, 8, 10, 11, 17, 21, 22))) //Errors which have 1 arg
-        {
-            return $langs->trans("ErrorPriceExpression".$code, $info);
-        } elseif (in_array($code, array(6, 23))) //Errors which have 2 args
-        {
-            return $langs->trans("ErrorPriceExpression".$code, $info[0], $info[1]);
-        } elseif (in_array($code, array(7, 12, 13, 15, 16, 18))) //Internal errors
-        {
-            return $langs->trans("ErrorPriceExpressionInternal", $code);
-        } else //Unknown errors
-        {
-            return $langs->trans("ErrorPriceExpressionUnknown", $code);
-        }
-    }
+		if (empty($this->error_parser)) {
+			return $langs->trans("ErrorPriceExpressionUnknown", 0); //this is not supposed to happen
+		}
+		list($code, $info) = $this->error_parser;
+		if (in_array($code, array(9, 14, 19, 20))) //Errors which have 0 arg
+		{
+			return $langs->trans("ErrorPriceExpression".$code);
+		} elseif (in_array($code, array(1, 2, 3, 4, 5, 8, 10, 11, 17, 21, 22))) //Errors which have 1 arg
+		{
+			return $langs->trans("ErrorPriceExpression".$code, $info);
+		} elseif (in_array($code, array(6, 23))) //Errors which have 2 args
+		{
+			return $langs->trans("ErrorPriceExpression".$code, $info[0], $info[1]);
+		} elseif (in_array($code, array(7, 12, 13, 15, 16, 18))) //Internal errors
+		{
+			return $langs->trans("ErrorPriceExpressionInternal", $code);
+		} else //Unknown errors
+		{
+			return $langs->trans("ErrorPriceExpressionUnknown", $code);
+		}
+	}
 
-    /**
-     *	Calculates price based on expression
-     *
-     *	@param	Product	$product    	The Product object to get information
-     *	@param	String 	$expression     The expression to parse
-     *	@param	array  	$values     	Strings to replaces
-     *  @return int 					> 0 if OK, < 1 if KO
-     */
-    public function parseExpression($product, $expression, $values)
-    {
-        global $user;
-        global $hookmanager;
-        $action = 'PARSEEXPRESSION';
-        if ($result = $hookmanager->executeHooks('doDynamiPrice', array(
+	/**
+	 *	Calculates price based on expression
+	 *
+	 *	@param	Product	$product    	The Product object to get information
+	 *	@param	String 	$expression     The expression to parse
+	 *	@param	array  	$values     	Strings to replaces
+	 *  @return int 					> 0 if OK, < 1 if KO
+	 */
+	public function parseExpression($product, $expression, $values)
+	{
+		global $user;
+		global $hookmanager;
+		$action = 'PARSEEXPRESSION';
+		if ($result = $hookmanager->executeHooks('doDynamiPrice', array(
 								'expression' =>$expression,
 								'product' => $product,
 								'values' => $values
-        ), $this, $action)) {
+		), $this, $action)) {
 			return $result;
-        }
-        //Check if empty
-        $expression = trim($expression);
-        if (empty($expression))
-        {
-            $this->error_parser = array(20, null);
-            return -2;
-        }
+		}
+		//Check if empty
+		$expression = trim($expression);
+		if (empty($expression))
+		{
+			$this->error_parser = array(20, null);
+			return -2;
+		}
 
-        //Accessible product values by expressions
-        $values = array_merge($values, array(
-            "tva_tx" => $product->tva_tx,
-            "localtax1_tx" => $product->localtax1_tx,
-            "localtax2_tx" => $product->localtax2_tx,
-            "weight" => $product->weight,
-            "length" => $product->length,
-            "surface" => $product->surface,
-            "price_min" => $product->price_min,
-        ));
+		//Accessible product values by expressions
+		$values = array_merge($values, array(
+			"tva_tx" => $product->tva_tx,
+			"localtax1_tx" => $product->localtax1_tx,
+			"localtax2_tx" => $product->localtax2_tx,
+			"weight" => $product->weight,
+			"length" => $product->length,
+			"surface" => $product->surface,
+			"price_min" => $product->price_min,
+		));
 
-        //Retrieve all extrafield for product and add it to values
-        $extrafields = new ExtraFields($this->db);
-        $extrafields->fetch_name_optionals_label('product', true);
-        $product->fetch_optionals();
-        if (is_array($extrafields->attributes[$product->table_element]['label']))
+		//Retrieve all extrafield for product and add it to values
+		$extrafields = new ExtraFields($this->db);
+		$extrafields->fetch_name_optionals_label('product', true);
+		$product->fetch_optionals();
+		if (is_array($extrafields->attributes[$product->table_element]['label']))
 		{
 			foreach ($extrafields->attributes[$product->table_element]['label'] as $key=>$label)
 			{
@@ -169,102 +169,102 @@ class PriceParser
 			}
 		}
 
-        //Process any pending updaters
-        $price_updaters = new PriceGlobalVariableUpdater($this->db);
-        foreach ($price_updaters->listPendingUpdaters() as $entry) {
-            //Schedule the next update by adding current timestamp (secs) + interval (mins)
-            $entry->update_next_update(dol_now() + ($entry->update_interval * 60), $user);
-            //Do processing
-            $res = $entry->process();
-            //Store any error or clear status if OK
-            $entry->update_status($res < 1 ? $entry->error : '', $user);
-        }
+		//Process any pending updaters
+		$price_updaters = new PriceGlobalVariableUpdater($this->db);
+		foreach ($price_updaters->listPendingUpdaters() as $entry) {
+			//Schedule the next update by adding current timestamp (secs) + interval (mins)
+			$entry->update_next_update(dol_now() + ($entry->update_interval * 60), $user);
+			//Do processing
+			$res = $entry->process();
+			//Store any error or clear status if OK
+			$entry->update_status($res < 1 ? $entry->error : '', $user);
+		}
 
-        //Get all global values
-        $price_globals = new PriceGlobalVariable($this->db);
-        foreach ($price_globals->listGlobalVariables() as $entry)
-        {
-            $values["global_".$entry->code] = $entry->value;
-        }
+		//Get all global values
+		$price_globals = new PriceGlobalVariable($this->db);
+		foreach ($price_globals->listGlobalVariables() as $entry)
+		{
+			$values["global_".$entry->code] = $entry->value;
+		}
 
-        //Remove internal variables
-        unset($values["supplier_id"]);
+		//Remove internal variables
+		unset($values["supplier_id"]);
 
-        //Prepare the lib, parameters and values
-        $em = new EvalMath();
-        $em->suppress_errors = true; //Don't print errors on page
-        $this->error_expr = null;
-        $last_result = null;
+		//Prepare the lib, parameters and values
+		$em = new EvalMath();
+		$em->suppress_errors = true; //Don't print errors on page
+		$this->error_expr = null;
+		$last_result = null;
 
-        //Fill each variable in expression from values
-        $expression = str_replace("\n", $this->separator_chr, $expression);
-        foreach ($values as $key => $value)
-        {
-            if ($value === null && strpos($expression, $key) !== false) {
-                $this->error_parser = array(24, $key);
-                return -7;
-            }
-            $expression = str_replace($this->special_chr.$key.$this->special_chr, strval($value), $expression);
-        }
+		//Fill each variable in expression from values
+		$expression = str_replace("\n", $this->separator_chr, $expression);
+		foreach ($values as $key => $value)
+		{
+			if ($value === null && strpos($expression, $key) !== false) {
+				$this->error_parser = array(24, $key);
+				return -7;
+			}
+			$expression = str_replace($this->special_chr.$key.$this->special_chr, strval($value), $expression);
+		}
 
-        //Check if there is unfilled variable
-        if (strpos($expression, $this->special_chr) !== false)
-        {
-            $data = explode($this->special_chr, $expression);
-            $variable = $this->special_chr.$data[1];
-            if (isset($data[2])) $variable .= $this->special_chr;
-            $this->error_parser = array(23, array($variable, $expression));
-            return -6;
-        }
+		//Check if there is unfilled variable
+		if (strpos($expression, $this->special_chr) !== false)
+		{
+			$data = explode($this->special_chr, $expression);
+			$variable = $this->special_chr.$data[1];
+			if (isset($data[2])) $variable .= $this->special_chr;
+			$this->error_parser = array(23, array($variable, $expression));
+			return -6;
+		}
 
-        //Iterate over each expression splitted by $separator_chr
-        $expressions = explode($this->separator_chr, $expression);
-        $expressions = array_slice($expressions, 0, $this->limit);
-        foreach ($expressions as $expr) {
-            $expr = trim($expr);
-            if (!empty($expr))
-            {
-                $last_result = $em->evaluate($expr);
-                $this->error_parser = $em->last_error_code;
-                if ($this->error_parser !== null) { //$em->last_error_code is null if no error happened, so just check if error_parser is not null
-                    $this->error_expr = $expr;
-                    return -3;
-                }
-            }
-        }
-        $vars = $em->vars();
-        if (empty($vars["price"])) {
-            $vars["price"] = $last_result;
-        }
-        if (!isset($vars["price"]))
-        {
-            $this->error_parser = array(21, $expression);
-            return -4;
-        }
-        if ($vars["price"] < 0)
-        {
-            $this->error_parser = array(22, $expression);
-            return -5;
-        }
-        return $vars["price"];
-    }
+		//Iterate over each expression splitted by $separator_chr
+		$expressions = explode($this->separator_chr, $expression);
+		$expressions = array_slice($expressions, 0, $this->limit);
+		foreach ($expressions as $expr) {
+			$expr = trim($expr);
+			if (!empty($expr))
+			{
+				$last_result = $em->evaluate($expr);
+				$this->error_parser = $em->last_error_code;
+				if ($this->error_parser !== null) { //$em->last_error_code is null if no error happened, so just check if error_parser is not null
+					$this->error_expr = $expr;
+					return -3;
+				}
+			}
+		}
+		$vars = $em->vars();
+		if (empty($vars["price"])) {
+			$vars["price"] = $last_result;
+		}
+		if (!isset($vars["price"]))
+		{
+			$this->error_parser = array(21, $expression);
+			return -4;
+		}
+		if ($vars["price"] < 0)
+		{
+			$this->error_parser = array(22, $expression);
+			return -5;
+		}
+		return $vars["price"];
+	}
 
-    /**
-     *	Calculates product price based on product id and associated expression
-     *
-     *	@param	Product				$product    	The Product object to get information
-     *	@param	array 				$extra_values   Any aditional values for expression
-     *	@return int 						> 0 if OK, < 1 if KO
-     */
-    public function parseProduct($product, $extra_values = array())
-    {
-        //Get the expression from db
-        $price_expression = new PriceExpression($this->db);
-        $res = $price_expression->fetch($product->fk_price_expression);
-        if ($res < 1) {
-            $this->error_parser = array(19, null);
-            return -1;
-        }
+	/**
+	 *	Calculates product price based on product id and associated expression
+	 *
+	 *	@param	Product				$product    	The Product object to get information
+	 *	@param	array 				$extra_values   Any aditional values for expression
+	 *	@return int 						> 0 if OK, < 1 if KO
+	 */
+	public function parseProduct($product, $extra_values = array())
+	{
+		//Get the expression from db
+		$price_expression = new PriceExpression($this->db);
+		$res = $price_expression->fetch($product->fk_price_expression);
+		if ($res < 1) {
+			$this->error_parser = array(19, null);
+			return -1;
+		}
 
 		//Get the supplier min price
 		$productFournisseur = new ProductFournisseur($this->db);
@@ -278,7 +278,7 @@ class PriceParser
 			 $supplier_min_price = $productFournisseur->fourn_unitprice;
 		}
 
-        //Accessible values by expressions
+		//Accessible values by expressions
 		$extra_values = array_merge($extra_values, array(
 			"supplier_min_price" => $supplier_min_price,
 		));
@@ -293,61 +293,61 @@ class PriceParser
 		return $result;
 	}
 
-    /**
-     *	Calculates supplier product price based on product supplier price and associated expression
-     *
-     *	@param	ProductFournisseur	$product_supplier   The Product supplier object to get information
-     *	@param	array 				$extra_values       Any aditional values for expression
-     *  @return int 				> 0 if OK, < 1 if KO
-     */
-    public function parseProductSupplier($product_supplier, $extra_values = array())
-    {
-        //Get the expression from db
-        $price_expression = new PriceExpression($this->db);
-        $res = $price_expression->fetch($product_supplier->fk_supplier_price_expression);
-        if ($res < 1)
-        {
-            $this->error_parser = array(19, null);
-            return -1;
-        }
+	/**
+	 *	Calculates supplier product price based on product supplier price and associated expression
+	 *
+	 *	@param	ProductFournisseur	$product_supplier   The Product supplier object to get information
+	 *	@param	array 				$extra_values       Any aditional values for expression
+	 *  @return int 				> 0 if OK, < 1 if KO
+	 */
+	public function parseProductSupplier($product_supplier, $extra_values = array())
+	{
+		//Get the expression from db
+		$price_expression = new PriceExpression($this->db);
+		$res = $price_expression->fetch($product_supplier->fk_supplier_price_expression);
+		if ($res < 1)
+		{
+			$this->error_parser = array(19, null);
+			return -1;
+		}
 
-        //Get the product data (use ignore_expression to avoid possible recursion)
-        $product_supplier->fetch($product_supplier->id, '', '', '', 1);
+		//Get the product data (use ignore_expression to avoid possible recursion)
+		$product_supplier->fetch($product_supplier->id, '', '', '', 1);
 
-        //Accessible values by expressions
-        $extra_values = array_merge($extra_values, array(
-            "supplier_quantity" => $product_supplier->fourn_qty,
-            "supplier_tva_tx" => $product_supplier->fourn_tva_tx,
-        ));
+		//Accessible values by expressions
+		$extra_values = array_merge($extra_values, array(
+			"supplier_quantity" => $product_supplier->fourn_qty,
+			"supplier_tva_tx" => $product_supplier->fourn_tva_tx,
+		));
 
-        //Parse the expression and return the price
-        return $this->parseExpression($product_supplier, $price_expression->expression, $extra_values);
-    }
+		//Parse the expression and return the price
+		return $this->parseExpression($product_supplier, $price_expression->expression, $extra_values);
+	}
 
-    /**
-     *  Tests string expression for validity
-     *
-     *  @param  int					$product_id    	The Product id to get information
-     *  @param  string 				$expression     The expression to parse
-     *  @param  array 				$extra_values   Any aditional values for expression
-     *  @return int 				> 0 if OK, < 1 if KO
-     */
-    public function testExpression($product_id, $expression, $extra_values = array())
-    {
-        //Get the product data
-        $product = new Product($this->db);
-        $product->fetch($product_id, '', '', 1);
+	/**
+	 *  Tests string expression for validity
+	 *
+	 *  @param  int					$product_id    	The Product id to get information
+	 *  @param  string 				$expression     The expression to parse
+	 *  @param  array 				$extra_values   Any aditional values for expression
+	 *  @return int 				> 0 if OK, < 1 if KO
+	 */
+	public function testExpression($product_id, $expression, $extra_values = array())
+	{
+		//Get the product data
+		$product = new Product($this->db);
+		$product->fetch($product_id, '', '', 1);
 
-        //Values for product expressions
-        $extra_values = array_merge($extra_values, array(
-            "supplier_min_price" => 1,
-        ));
+		//Values for product expressions
+		$extra_values = array_merge($extra_values, array(
+			"supplier_min_price" => 1,
+		));
 
-        //Values for supplier product expressions
-        $extra_values = array_merge($extra_values, array(
-            "supplier_quantity" => 2,
-            "supplier_tva_tx" => 3,
-        ));
-        return $this->parseExpression($product, $expression, $extra_values);
-    }
+		//Values for supplier product expressions
+		$extra_values = array_merge($extra_values, array(
+			"supplier_quantity" => 2,
+			"supplier_tva_tx" => 3,
+		));
+		return $this->parseExpression($product, $expression, $extra_values);
+	}
 }
diff --git a/htdocs/product/dynamic_price/editor.php b/htdocs/product/dynamic_price/editor.php
index b59319ad985..24f4856698f 100644
--- a/htdocs/product/dynamic_price/editor.php
+++ b/htdocs/product/dynamic_price/editor.php
@@ -160,7 +160,7 @@ print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;tab='.$tab.'&amp;ei
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value='.($eid == 0 ? 'add' : 'update').'>';
 
-dol_fiche_head();
+print dol_get_fiche_head();
 
 print '<table class="border centpercent">';
 
@@ -196,11 +196,11 @@ $doleditor->Create();
 print '</td></tr>';
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 //Buttons
 print '<div class="center">';
-print '<input type="submit" class="butAction" value="'.$langs->trans("Save").'">';
+print '<input type="submit" class="butAction button-save" value="'.$langs->trans("Save").'">';
 print '<span id="back" class="butAction">'.$langs->trans("Back").'</span>';
 if ($eid == 0)
 {
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index fb1be576ad5..edd7622d82b 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -91,7 +91,7 @@ $hookmanager->initHooks(array('pricesuppliercard', 'globalcard'));
 $object = new ProductFournisseur($db);
 if ($id > 0 || $ref)
 {
-    $object->fetch($id, $ref);
+	$object->fetch($id, $ref);
 }
 
 $sortfield = GETPOST("sortfield", 'alpha');
@@ -126,7 +126,7 @@ if (empty($reshook))
 			if ($result > 0)
 			{
 				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-		        $action = '';
+				$action = '';
 			} else {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -166,10 +166,10 @@ if (empty($reshook))
 		$price_expression = GETPOST('eid', 'int') ? GETPOST('eid', 'int') : ''; // Discard expression if not in expression mode
 		$delivery_time_days = GETPOST('delivery_time_days', 'int') ? GETPOST('delivery_time_days', 'int') : '';
 		$supplier_reputation = GETPOST('supplier_reputation');
-		$supplier_description = GETPOST('supplier_description', 'alpha');
-        $barcode = GETPOST('barcode', 'alpha');
-        $fk_barcode_type = GETPOST('fk_barcode_type', 'int');
-		$packaging = GETPOST('packaging', 'int');
+		$supplier_description = GETPOST('supplier_description', 'restricthtml');
+		$barcode = GETPOST('barcode', 'alpha');
+		$fk_barcode_type = GETPOST('fk_barcode_type', 'int');
+		$packaging = price2num(GETPOST("packaging", 'alphanohtml'), 'MS');
 
 		if ($tva_tx == '')
 		{
@@ -212,29 +212,23 @@ if (empty($reshook))
 				$_POST["price"] = 0;
 			}
 		}
-        if ($conf->multicurrency->enabled) {
-            if (empty($_POST["multicurrency_code"])) {
-                $error++;
-                $langs->load("errors");
-                setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Currency")), null, 'errors');
-            }
-            if (price2num($_POST["multicurrency_tx"]) <= 0 || $_POST["multicurrency_tx"] == '') {
-                $error++;
-                $langs->load("errors");
-                setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("CurrencyRate")), null, 'errors');
-            }
-            if (price2num($_POST["multicurrency_price"]) < 0 || $_POST["multicurrency_price"] == '') {
-                $error++;
-                $langs->load("errors");
-                setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("PriceCurrency")), null, 'errors');
-            }
-        }
-
-		if (empty($packaging)) $packaging = 1;
-
-		if ($packaging < $quantity) $packaging = $quantity;
-
-		$object->packaging = $packaging;
+		if (!empty($conf->multicurrency->enabled)) {
+			if (empty($_POST["multicurrency_code"])) {
+				$error++;
+				$langs->load("errors");
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Currency")), null, 'errors');
+			}
+			if (price2num($_POST["multicurrency_tx"]) <= 0 || $_POST["multicurrency_tx"] == '') {
+				$error++;
+				$langs->load("errors");
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("CurrencyRate")), null, 'errors');
+			}
+			if (price2num($_POST["multicurrency_price"]) < 0 || $_POST["multicurrency_price"] == '') {
+				$error++;
+				$langs->load("errors");
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("PriceCurrency")), null, 'errors');
+			}
+		}
 
 		if (!$error)
 		{
@@ -269,43 +263,47 @@ if (empty($reshook))
 				$extralabels = $extrafields->fetch_name_optionals_label("product_fournisseur_price");
 				$extrafield_values = $extrafields->getOptionalsFromPost("product_fournisseur_price");
 				if (!empty($extrafield_values)) {
-                    $resql = $db->query("SELECT fk_object FROM ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields WHERE fk_object = ".$object->product_fourn_price_id);
-                    // Insert a new extrafields row, if none exists
-                    if ($db->num_rows($resql) != 1) {
-                        $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields (fk_object, ";
-                        foreach ($extrafield_values as $key => $value) {
-                            $sql .= str_replace('options_', '', $key).', ';
-                        }
-                        $sql = substr($sql, 0, strlen($sql) - 2).") VALUES (".$object->product_fourn_price_id.", ";
-                        foreach ($extrafield_values as $key => $value) {
-                            $sql .= '"'.$value.'", ';
-                        }
-                        $sql = substr($sql, 0, strlen($sql) - 2).')';
-                    } else {
-                        // update the existing one
-                        $sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields SET ";
-                        foreach ($extrafield_values as $key => $value) {
-                            $sql .= str_replace('options_', '', $key).' = "'.$value.'", ';
-                        }
-                        $sql = substr($sql, 0, strlen($sql) - 2).' WHERE fk_object = '.$object->product_fourn_price_id;
-                    }
+					$resql = $db->query("SELECT fk_object FROM ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields WHERE fk_object = ".$object->product_fourn_price_id);
+					// Insert a new extrafields row, if none exists
+					if ($db->num_rows($resql) != 1) {
+						$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields (fk_object, ";
+						foreach ($extrafield_values as $key => $value) {
+							$sql .= str_replace('options_', '', $key).', ';
+						}
+						$sql = substr($sql, 0, strlen($sql) - 2).") VALUES (".$object->product_fourn_price_id.", ";
+						foreach ($extrafield_values as $key => $value) {
+							$sql .= '"'.$value.'", ';
+						}
+						$sql = substr($sql, 0, strlen($sql) - 2).')';
+					} else {
+						// update the existing one
+						$sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields SET ";
+						foreach ($extrafield_values as $key => $value) {
+							$sql .= str_replace('options_', '', $key).' = "'.$value.'", ';
+						}
+						$sql = substr($sql, 0, strlen($sql) - 2).' WHERE fk_object = '.$object->product_fourn_price_id;
+					}
 
-                    // Execute the sql command from above
-                    $db->query($sql);
-                }
+					// Execute the sql command from above
+					$db->query($sql);
+				}
 
 				$newprice = price2num(GETPOST("price", "alpha"));
 
-                if ($conf->multicurrency->enabled)
-                {
-                	$multicurrency_tx = price2num(GETPOST("multicurrency_tx", 'alpha'));
-                	$multicurrency_price = price2num(GETPOST("multicurrency_price", 'alpha'));
-                	$multicurrency_code = GETPOST("multicurrency_code", 'alpha');
+				if (empty($packaging)) $packaging = 1;
+				if ($packaging < $quantity) $packaging = $quantity;
+				$object->packaging = $packaging;
 
-                    $ret = $object->update_buyprice($quantity, $newprice, $user, $_POST["price_base_type"], $supplier, $_POST["oselDispo"], $ref_fourn, $tva_tx, $_POST["charges"], $remise_percent, 0, $npr, $delivery_time_days, $supplier_reputation, array(), '', $multicurrency_price, $_POST["multicurrency_price_base_type"], $multicurrency_tx, $multicurrency_code, $supplier_description, $barcode, $fk_barcode_type);
-                } else {
-                    $ret = $object->update_buyprice($quantity, $newprice, $user, $_POST["price_base_type"], $supplier, $_POST["oselDispo"], $ref_fourn, $tva_tx, $_POST["charges"], $remise_percent, 0, $npr, $delivery_time_days, $supplier_reputation, array(), '', 0, 'HT', 1, '', $supplier_description, $barcode, $fk_barcode_type);
-                }
+				if (!empty($conf->multicurrency->enabled))
+				{
+					$multicurrency_tx = price2num(GETPOST("multicurrency_tx", 'alpha'));
+					$multicurrency_price = price2num(GETPOST("multicurrency_price", 'alpha'));
+					$multicurrency_code = GETPOST("multicurrency_code", 'alpha');
+
+					$ret = $object->update_buyprice($quantity, $newprice, $user, GETPOST("price_base_type"), $supplier, GETPOST("oselDispo"), $ref_fourn, $tva_tx, GETPOST("charges"), $remise_percent, 0, $npr, $delivery_time_days, $supplier_reputation, array(), '', $multicurrency_price, GETPOST("multicurrency_price_base_type"), $multicurrency_tx, $multicurrency_code, $supplier_description, $barcode, $fk_barcode_type);
+				} else {
+					$ret = $object->update_buyprice($quantity, $newprice, $user, GETPOST("price_base_type"), $supplier, GETPOST("oselDispo"), $ref_fourn, $tva_tx, GETPOST("charges"), $remise_percent, 0, $npr, $delivery_time_days, $supplier_reputation, array(), '', 0, 'HT', 1, '', $supplier_description, $barcode, $fk_barcode_type);
+				}
 				if ($ret < 0)
 				{
 					$error++;
@@ -314,9 +312,9 @@ if (empty($reshook))
 					if (!empty($conf->dynamicprices->enabled) && $price_expression !== '')
 					{
 						//Check the expression validity by parsing it
-                        $priceparser = new PriceParser($db);
-                        $object->fk_supplier_price_expression = $price_expression;
-                        $price_result = $priceparser->parseProductSupplier($object);
+						$priceparser = new PriceParser($db);
+						$object->fk_supplier_price_expression = $price_expression;
+						$price_result = $priceparser->parseProductSupplier($object);
 						if ($price_result < 0) { //Expression is not valid
 							$error++;
 							setEventMessages($priceparser->translatedError(), null, 'errors');
@@ -387,55 +385,55 @@ if ($id > 0 || $ref)
 			$titre = $langs->trans("CardProduct".$object->type);
 			$picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
 
-			dol_fiche_head($head, 'suppliers', $titre, -1, $picto);
+			print dol_get_fiche_head($head, 'suppliers', $titre, -1, $picto);
 
 			$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-		    $object->next_prev_filter = " fk_product_type = ".$object->type;
+			$object->next_prev_filter = " fk_product_type = ".$object->type;
 
-            $shownav = 1;
-            if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+			$shownav = 1;
+			if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
 			dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-            print '<div class="fichecenter">';
+			print '<div class="fichecenter">';
 
-            print '<div class="underbanner clearboth"></div>';
-            print '<table class="border tableforfield" width="100%">';
+			print '<div class="underbanner clearboth"></div>';
+			print '<table class="border tableforfield" width="100%">';
 
 			// Cost price. Can be used for margin module for option "calculate margin on explicit cost price
-            print '<tr><td>';
+			print '<tr><td>';
 			$textdesc = $langs->trans("CostPriceDescription");
 			$textdesc .= "<br>".$langs->trans("CostPriceUsage");
 			$text = $form->textwithpicto($langs->trans("CostPrice"), $textdesc, 1, 'help', '');
 			print $form->editfieldkey($text, 'cost_price', $object->cost_price, $object, $usercancreate, 'amount:6');
-            print '</td><td colspan="2">';
-            print $form->editfieldval($text, 'cost_price', $object->cost_price, $object, $usercancreate, 'amount:6');
-            print '</td></tr>';
+			print '</td><td colspan="2">';
+			print $form->editfieldval($text, 'cost_price', $object->cost_price, $object, $usercancreate, 'amount:6');
+			print '</td></tr>';
 
-            // PMP
-            print '<tr><td class="titlefield">'.$form->textwithpicto($langs->trans("AverageUnitPricePMPShort"), $langs->trans("AverageUnitPricePMPDesc")).'</td>';
-            print '<td>';
-            if ($object->pmp > 0) print price($object->pmp).' '.$langs->trans("HT");
-            print '</td>';
-            print '</tr>';
+			// PMP
+			print '<tr><td class="titlefield">'.$form->textwithpicto($langs->trans("AverageUnitPricePMPShort"), $langs->trans("AverageUnitPricePMPDesc")).'</td>';
+			print '<td>';
+			if ($object->pmp > 0) print price($object->pmp).' '.$langs->trans("HT");
+			print '</td>';
+			print '</tr>';
 
-            // Best buying Price
-            print '<tr><td class="titlefield">'.$langs->trans("BuyingPriceMin").'</td>';
-            print '<td colspan="2">';
-            $product_fourn = new ProductFournisseur($db);
-            if ($product_fourn->find_min_price_product_fournisseur($object->id) > 0)
-            {
-            	if ($product_fourn->product_fourn_price_id > 0) print $product_fourn->display_price_product_fournisseur();
-            	else print $langs->trans("NotDefined");
-            }
-            print '</td></tr>';
+			// Best buying Price
+			print '<tr><td class="titlefield">'.$langs->trans("BuyingPriceMin").'</td>';
+			print '<td colspan="2">';
+			$product_fourn = new ProductFournisseur($db);
+			if ($product_fourn->find_min_price_product_fournisseur($object->id) > 0)
+			{
+				if ($product_fourn->product_fourn_price_id > 0) print $product_fourn->display_price_product_fournisseur();
+				else print $langs->trans("NotDefined");
+			}
+			print '</td></tr>';
 
-            print '</table>';
+			print '</table>';
 
-            print '</div>';
-            print '<div style="clear:both"></div>';
+			print '</div>';
+			print '<div style="clear:both"></div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 
 			// Form to add or update a price
@@ -455,7 +453,7 @@ if ($id > 0 || $ref)
 				print '<input type="hidden" name="token" value="'.newToken().'">';
 				print '<input type="hidden" name="action" value="save_price">';
 
-				dol_fiche_head();
+				print dol_get_fiche_head();
 
 				print '<table class="border centpercent">';
 
@@ -476,7 +474,7 @@ if ($id > 0 || $ref)
 					print $form->select_company(GETPOST("id_fourn", 'alpha'), 'id_fourn', 'fournisseur=1', 'SelectThirdParty', 0, 0, $events);
 
 					$parameters = array('filtre'=>"fournisseur=1", 'html_name'=>'id_fourn', 'selected'=>GETPOST("id_fourn"), 'showempty'=>1, 'prod_id'=>$object->id);
-				    $reshook = $hookmanager->executeHooks('formCreateThirdpartyOptions', $parameters, $object, $action);
+					$reshook = $hookmanager->executeHooks('formCreateThirdpartyOptions', $parameters, $object, $action);
 					if (empty($reshook))
 					{
 						if (empty($form->result))
@@ -491,8 +489,8 @@ if ($id > 0 || $ref)
 				print '<tr><td class="fieldrequired">'.$langs->trans("SupplierRef").'</td><td>';
 				if ($rowid)
 				{
-                    print '<input type="hidden" name="ref_fourn_old" value="'.$object->ref_supplier.'">';
-                    print '<input class="flat" name="ref_fourn" size="12" value="'.$object->ref_supplier.'">';
+					print '<input type="hidden" name="ref_fourn_old" value="'.$object->ref_supplier.'">';
+					print '<input class="flat" name="ref_fourn" size="12" value="'.$object->ref_supplier.'">';
 				} else {
 					print '<input class="flat" name="ref_fourn" size="12" value="'.(GETPOST("ref_fourn") ?GETPOST("ref_fourn") : '').'">';
 				}
@@ -520,15 +518,32 @@ if ($id > 0 || $ref)
 				} else {
 					print '<input class="flat" name="qty" size="5" value="'.$quantity.'">';
 				}
-                // Units
-                if ($conf->global->PRODUCT_USE_UNITS) {
-                    $unit = $object->getLabelOfUnit();
-                    if ($unit !== '') {
-                        print '&nbsp;&nbsp;'.$langs->trans($unit);
-                    }
-                }
+				// Units
+				if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+					$unit = $object->getLabelOfUnit();
+					if ($unit !== '') {
+						print '&nbsp;&nbsp;'.$langs->trans($unit);
+					}
+				}
 				print '</td></tr>';
 
+				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
+					// Packaging
+					print '<tr>';
+
+					print '<td class="fieldrequired">'.$form->textwithpicto($langs->trans("PackagingForThisProduct"), $langs->trans("PackagingForThisProductDesc")).'</td>';
+					print '<td>';
+					$packaging = GETPOSTISSET('packaging') ? price2num(GETPOST('packaging', 'nohtml'), 'MS') : ((empty($rowid)) ? "1" : price2num($object->packaging, 'MS'));
+					print '<input class="flat" name="packaging" size="5" value="'.$packaging.'">';
+
+					// Units
+					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+						$unit = $object->getLabelOfUnit();
+						if ($unit !== '') {
+							print '&nbsp;&nbsp;'.$langs->trans($unit);
+						}
+					}
+				}
 				// Vat rate
 				$default_vat = '';
 
@@ -546,15 +561,15 @@ if ($id > 0 || $ref)
 				//print $form->load_tva('tva_tx',$object->tva_tx,$supplier,$mysoc);    // Do not use list here as it may be any vat rates for any country
 				if (!empty($rowid))	// If we have a supplier, it is an update, we must show the vat of current supplier price
 				{
-				    $tmpproductsupplier = new ProductFournisseur($db);
-				    $tmpproductsupplier->fetch_product_fournisseur_price($rowid, 1);
+					$tmpproductsupplier = new ProductFournisseur($db);
+					$tmpproductsupplier->fetch_product_fournisseur_price($rowid, 1);
 					$default_vat = $tmpproductsupplier->fourn_tva_tx;
 					$default_npr = $tmpproductsupplier->fourn_tva_npr;
 				} else {
-                    if (empty($default_vat))
-                    {
-                        $default_vat = $object->tva_tx;
-                    }
+					if (empty($default_vat))
+					{
+						$default_vat = $object->tva_tx;
+					}
 				}
 				$vattosuggest = (GETPOST("tva_tx") ?vatrate(GETPOST("tva_tx")) : ($default_vat != '' ?vatrate($default_vat) : ''));
 				$vattosuggest = preg_replace('/\s*\(.*\)$/', '', $vattosuggest);
@@ -595,52 +610,48 @@ if ($id > 0 || $ref)
 					</script>';
 				}
 
-                if ($conf->multicurrency->enabled) {
-                    // Currency
-                    print '<tr><td class="fieldrequired">'.$langs->trans("Currency").'</td>';
-                    print '<td>';
-                    $currencycodetouse = GETPOST('multicurrency_code') ?GETPOST('multicurrency_code') : (isset($object->fourn_multicurrency_code) ? $object->fourn_multicurrency_code : '');
-                    if (empty($currencycodetouse) && $object->fourn_multicurrency_tx == 1) $currencycodetouse = $conf->currency;
-                    print $form->selectMultiCurrency($currencycodetouse, "multicurrency_code", 1);
-                    print '</td>';
-                    print '</tr>';
+				if (!empty($conf->multicurrency->enabled)) {
+					// Currency
+					print '<tr><td class="fieldrequired">'.$langs->trans("Currency").'</td>';
+					print '<td>';
+					$currencycodetouse = GETPOST('multicurrency_code') ?GETPOST('multicurrency_code') : (isset($object->fourn_multicurrency_code) ? $object->fourn_multicurrency_code : '');
+					if (empty($currencycodetouse) && $object->fourn_multicurrency_tx == 1) $currencycodetouse = $conf->currency;
+					print $form->selectMultiCurrency($currencycodetouse, "multicurrency_code", 1);
+					print ' &nbsp; '.$langs->trans("CurrencyRate").' ';
+					print '<input class="flat" name="multicurrency_tx" size="4" value="'.vatrate(GETPOST('multicurrency_tx') ? GETPOST('multicurrency_tx') : (isset($object->fourn_multicurrency_tx) ? $object->fourn_multicurrency_tx : '')).'">';
+					print '</td>';
+					print '</tr>';
 
-                    // Currency tx
-                    print '<tr><td class="fieldrequired">'.$langs->trans("CurrencyRate").'</td>';
-                    print '<td><input class="flat" name="multicurrency_tx" size="4" value="'.vatrate(GETPOST('multicurrency_tx') ?GETPOST('multicurrency_tx') : (isset($object->fourn_multicurrency_tx) ? $object->fourn_multicurrency_tx : '')).'">';
-                    print '</td>';
-                    print '</tr>';
+					// Currency price qty min
+					print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMinCurrency").'</td>';
+					$pricesupplierincurrencytouse = (GETPOST('multicurrency_price') ?GETPOST('multicurrency_price') : (isset($object->fourn_multicurrency_price) ? $object->fourn_multicurrency_price : ''));
+					print '<td><input class="flat" name="multicurrency_price" size="8" value="'.price($pricesupplierincurrencytouse).'">';
+					print '&nbsp;';
+					print $form->selectPriceBaseType((GETPOST('multicurrency_price_base_type') ?GETPOST('multicurrency_price_base_type') : 'HT'), "multicurrency_price_base_type"); // We keep 'HT' here, multicurrency_price_base_type is not yet supported for supplier prices
+					print '</td></tr>';
 
-                    // Currency price qty min
-                    print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMinCurrency").'</td>';
-                    $pricesupplierincurrencytouse = (GETPOST('multicurrency_price') ?GETPOST('multicurrency_price') : (isset($object->fourn_multicurrency_price) ? $object->fourn_multicurrency_price : ''));
-                    print '<td><input class="flat" name="multicurrency_price" size="8" value="'.price($pricesupplierincurrencytouse).'">';
-                    print '&nbsp;';
-                    print $form->selectPriceBaseType((GETPOST('multicurrency_price_base_type') ?GETPOST('multicurrency_price_base_type') : 'HT'), "multicurrency_price_base_type"); // We keep 'HT' here, multicurrency_price_base_type is not yet supported for supplier prices
-                    print '</td></tr>';
+					// Price qty min
+					print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMin").'</td>';
+					print '<td><input class="flat" name="disabled_price" size="8" value="">';
+					print '<input type="hidden" name="price" value="">';
+					print '<input type="hidden" name="price_base_type" value="">';
+					print '&nbsp;';
+					print $form->selectPriceBaseType('', "disabled_price_base_type");
+					print '</td></tr>';
 
-                    // Price qty min
-                    print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMin").'</td>';
-                    print '<td><input class="flat" name="disabled_price" size="8" value="">';
-                    print '<input type="hidden" name="price" value="">';
-                    print '<input type="hidden" name="price_base_type" value="">';
-                    print '&nbsp;';
-                    print $form->selectPriceBaseType('', "disabled_price_base_type");
-                    print '</td></tr>';
+					$currencies = array();
+					$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'multicurrency WHERE entity = '.$conf->entity;
+					$resql = $db->query($sql);
+					if ($resql) {
+						$currency = new MultiCurrency($db);
+						while ($obj = $db->fetch_object($resql)) {
+							$currency->fetch($obj->rowid);
+							$currencies[$currency->code] = $currency->rate->rate;
+						}
+					}
+					$currencies = json_encode($currencies);
 
-                    $currencies = array();
-                    $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'multicurrency WHERE entity = '.$conf->entity;
-                    $resql = $db->query($sql);
-                    if ($resql) {
-                        $currency = new MultiCurrency($db);
-                        while ($obj = $db->fetch_object($resql)) {
-                            $currency->fetch($obj->rowid);
-                            $currencies[$currency->code] = $currency->rate->rate;
-                        }
-                    }
-                    $currencies = json_encode($currencies);
-
-                    print <<<SCRIPT
+					print <<<END
     <script type="text/javascript">
         function update_price_from_multicurrency() {
             var multicurrency_price = $('input[name="multicurrency_price"]').val();
@@ -680,15 +691,15 @@ if ($id > 0 || $ref)
             });
         });
     </script>
-SCRIPT;
-                } else {
-                    // Price qty min
-                    print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMin").'</td>';
-                    print '<td><input class="flat" name="price" size="8" value="'.(GETPOST('price') ? price(GETPOST('price')) : (isset($object->fourn_price) ? price($object->fourn_price) : '')).'">';
-                    print '&nbsp;';
-                    print $form->selectPriceBaseType((GETPOST('price_base_type') ? GETPOST('price_base_type') : 'HT'), "price_base_type"); // We keep 'HT' here, price_base_type is not yet supported for supplier prices
-                    print '</td></tr>';
-                }
+END;
+				} else {
+					// Price qty min
+					print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMin").'</td>';
+					print '<td><input class="flat" name="price" size="8" value="'.(GETPOST('price') ? price(GETPOST('price')) : (isset($object->fourn_price) ? price($object->fourn_price) : '')).'">';
+					print '&nbsp;';
+					print $form->selectPriceBaseType((GETPOST('price_base_type') ? GETPOST('price_base_type') : 'HT'), "price_base_type"); // We keep 'HT' here, price_base_type is not yet supported for supplier prices
+					print '</td></tr>';
+				}
 
 
 				// Discount qty min
@@ -704,28 +715,28 @@ SCRIPT;
 				print '</tr>';
 
 				// Reputation
-				print '<tr><td>'.$langs->trans("SupplierReputation").'</td><td>';
+				print '<tr><td>'.$langs->trans("ReferenceReputation").'</td><td>';
 				echo $form->selectarray('supplier_reputation', $object->reputations, $supplier_reputation ? $supplier_reputation : $object->supplier_reputation);
 				print '</td></tr>';
 
 				// Barcode
-                if (!empty($conf->barcode->enabled))
-                {
-				    // Option to define a transport cost on supplier price
-                    print '<tr>';
-                    print '<td>'.$langs->trans('BarcodeValue').'</td>';
-                    print '<td><input class="flat" name="barcode"  value="'.($rowid ? $object->fourn_barcode : '').'"></td>';
-                    print '</tr>';
-                    $formbarcode = new FormBarCode($db);
+				if (!empty($conf->barcode->enabled))
+				{
+					// Option to define a transport cost on supplier price
+					print '<tr>';
+					print '<td>'.$langs->trans('BarcodeValue').'</td>';
+					print '<td><input class="flat" name="barcode"  value="'.($rowid ? $object->supplier_barcode : '').'"></td>';
+					print '</tr>';
+					$formbarcode = new FormBarCode($db);
 
-                    // Barcode type
-                    print '<tr>';
-                    print '<td>'.$langs->trans('BarcodeType').'</td>';
-                    print '<td>';
-                    print $formbarcode->selectBarcodeType(($rowid ? $object->fourn_fk_barcode_type : $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE), 'fk_barcode_type', 1);
-                    print '</td>';
-                    print '</tr>';
-                }
+					// Barcode type
+					print '<tr>';
+					print '<td>'.$langs->trans('BarcodeType').'</td>';
+					print '<td>';
+					print $formbarcode->selectBarcodeType(($rowid ? $object->supplier_fk_barcode_type : $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE), 'fk_barcode_type', 1);
+					print '</td>';
+					print '</tr>';
+				}
 
 				// Option to define a transport cost on supplier price
 				if ($conf->global->PRODUCT_CHARGES)
@@ -735,7 +746,7 @@ SCRIPT;
 						print '<tr>';
 						print '<td>'.$langs->trans("Charges").'</td>';
 						print '<td><input class="flat" name="charges" size="8" value="'.(GETPOST('charges') ?price(GETPOST('charges')) : (isset($object->fourn_charges) ?price($object->fourn_charges) : '')).'">';
-		        		print '</td>';
+						print '</td>';
 						print '</tr>';
 					}
 				}
@@ -743,79 +754,79 @@ SCRIPT;
 				// Product description of the supplier
 				if (!empty($conf->global->PRODUIT_FOURN_TEXTS))
 				{
-				    //WYSIWYG Editor
-				    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+					//WYSIWYG Editor
+					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-    				print '<tr>';
-    				print '<td>'.$langs->trans('ProductSupplierDescription').'</td>';
-    				print '<td>';
+					print '<tr>';
+					print '<td>'.$langs->trans('ProductSupplierDescription').'</td>';
+					print '<td>';
 
-    				$doleditor = new DolEditor('supplier_description', $object->desc_supplier, '', 160, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
-    				$doleditor->Create();
+					$doleditor = new DolEditor('supplier_description', $object->desc_supplier, '', 160, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
+					$doleditor->Create();
 
-    				print '</td>';
-    				print '</tr>';
+					print '</td>';
+					print '</tr>';
 				}
 
-                // Extrafields
+				// Extrafields
 				$extrafields->fetch_name_optionals_label("product_fournisseur_price");
 				$extralabels = $extrafields->attributes["product_fournisseur_price"]['label'];
-                $extrafield_values = $extrafields->getOptionalsFromPost("product_fournisseur_price");
+				$extrafield_values = $extrafields->getOptionalsFromPost("product_fournisseur_price");
 				if (!empty($extralabels)) {
-                    if (empty($rowid)) {
-                        foreach ($extralabels as $key => $value) {
-                            if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && ($extrafields->attributes["product_fournisseur_price"]['list'][$key] == 1 || $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 3 || ($action == "update_price" && $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 4))) {
-                                if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) $langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
+					if (empty($rowid)) {
+						foreach ($extralabels as $key => $value) {
+							if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && ($extrafields->attributes["product_fournisseur_price"]['list'][$key] == 1 || $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 3 || ($action == "update_price" && $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 4))) {
+								if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) $langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
 
-                                print '<tr><td'.($extrafields->attributes["product_fournisseur_price"]['required'][$key] ? ' class="fieldrequired"' : '').'>';
-                                if (!empty($extrafields->attributes["product_fournisseur_price"]['help'][$key])) print $form->textwithpicto($langs->trans($value), $langs->trans($extrafields->attributes["product_fournisseur_price"]['help'][$key]));
-                                else print $langs->trans($value);
-                                print '</td><td>'.$extrafields->showInputField($key, GETPOSTISSET('options_'.$key) ? $extrafield_values['options_'.$key] : '', '', '', '', '', 0, 'product_fournisseur_price').'</td></tr>';
-                            }
-                        }
-                    } else {
-                        $sql  = "SELECT";
-                        $sql .= " fk_object";
-                        foreach ($extralabels as $key => $value) {
-                            $sql .= ", ".$key;
-                        }
-                        $sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields";
-                        $sql .= " WHERE fk_object = ".$rowid;
-                        $resql = $db->query($sql);
-                        if ($resql) {
-                            $obj = $db->fetch_object($resql);
-                            foreach ($extralabels as $key => $value) {
-                                if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && ($extrafields->attributes["product_fournisseur_price"]['list'][$key] == 1 || $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 3 || ($action == "update_price" && $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 4))) {
-                                    if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) $langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
+								print '<tr><td'.($extrafields->attributes["product_fournisseur_price"]['required'][$key] ? ' class="fieldrequired"' : '').'>';
+								if (!empty($extrafields->attributes["product_fournisseur_price"]['help'][$key])) print $form->textwithpicto($langs->trans($value), $langs->trans($extrafields->attributes["product_fournisseur_price"]['help'][$key]));
+								else print $langs->trans($value);
+								print '</td><td>'.$extrafields->showInputField($key, GETPOSTISSET('options_'.$key) ? $extrafield_values['options_'.$key] : '', '', '', '', '', 0, 'product_fournisseur_price').'</td></tr>';
+							}
+						}
+					} else {
+						$sql  = "SELECT";
+						$sql .= " fk_object";
+						foreach ($extralabels as $key => $value) {
+							$sql .= ", ".$key;
+						}
+						$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields";
+						$sql .= " WHERE fk_object = ".$rowid;
+						$resql = $db->query($sql);
+						if ($resql) {
+							$obj = $db->fetch_object($resql);
+							foreach ($extralabels as $key => $value) {
+								if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && ($extrafields->attributes["product_fournisseur_price"]['list'][$key] == 1 || $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 3 || ($action == "update_price" && $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 4))) {
+									if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) $langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
 
-                                    print '<tr><td'.($extrafields->attributes["product_fournisseur_price"]['required'][$key] ? ' class="fieldrequired"' : '').'>';
-                                    if (!empty($extrafields->attributes["product_fournisseur_price"]['help'][$key])) print $form->textwithpicto($langs->trans($value), $langs->trans($extrafields->attributes["product_fournisseur_price"]['help'][$key]));
-                                    else print $langs->trans($value);
-                                    print '</td><td>'.$extrafields->showInputField($key, GETPOSTISSET('options_'.$key) ? $extrafield_values['options_'.$key] : $obj->{$key}, '', '', '', '', 0, 'product_fournisseur_price');
+									print '<tr><td'.($extrafields->attributes["product_fournisseur_price"]['required'][$key] ? ' class="fieldrequired"' : '').'>';
+									if (!empty($extrafields->attributes["product_fournisseur_price"]['help'][$key])) print $form->textwithpicto($langs->trans($value), $langs->trans($extrafields->attributes["product_fournisseur_price"]['help'][$key]));
+									else print $langs->trans($value);
+									print '</td><td>'.$extrafields->showInputField($key, GETPOSTISSET('options_'.$key) ? $extrafield_values['options_'.$key] : $obj->{$key}, '', '', '', '', 0, 'product_fournisseur_price');
 
-                                    print '</td></tr>';
-                                }
-                            }
-                            $db->free($resql);
-                        }
-                    }
+									print '</td></tr>';
+								}
+							}
+							$db->free($resql);
+						}
+					}
 				}
 
 				if (is_object($hookmanager))
 				{
 					$parameters = array('id_fourn'=>$id_fourn, 'prod_id'=>$object->id);
-				    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);
-                    print $hookmanager->resPrint;
+					$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);
+					print $hookmanager->resPrint;
 				}
 
 				print '</table>';
 
-				dol_fiche_end();
+				print dol_get_fiche_end();
 
 				print '<div class="center">';
-				print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
+				print '<input class="button button-save" type="submit" value="'.$langs->trans("Save").'">';
 				print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-				print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
+				print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
 				print '</div>';
 
 				print '</form>';
@@ -884,7 +895,7 @@ SCRIPT;
 						// Show field if not hidden
 						if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
 							$extratitle = $langs->trans($value);
-							$arrayfields['ef.'.$key] = array('label'=>$extratitle, 'checked'=>0, 'position'=>(end($arrayfields)['position']+1), 'langfile'=>$extrafields->attributes["product_fournisseur_price"]['langfile'][$key], 'help'=>$extrafields->attributes["product_fournisseur_price"]['help'][$key]);
+							$arrayfields['ef.'.$key] = array('label'=>$extratitle, 'checked'=>0, 'position'=>(end($arrayfields)['position'] + 1), 'langfile'=>$extrafields->attributes["product_fournisseur_price"]['langfile'][$key], 'help'=>$extrafields->attributes["product_fournisseur_price"]['help'][$key]);
 						}
 					}
 				}
@@ -896,7 +907,7 @@ SCRIPT;
 				$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
 				print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post" name="formulaire">';
-				print '<input type="hidden" name="token" value="'. newToken() . '">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
 				print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 				print '<input type="hidden" name="action" value="list">';
 				print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
@@ -916,10 +927,10 @@ SCRIPT;
 				if (!empty($arrayfields['pfp.quantity']['checked']))				print_liste_field_titre("QtyMin", $_SERVER["PHP_SELF"], "pfp.quantity", "", $param, '', $sortfield, $sortorder, 'right ');
 				print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
 				print_liste_field_titre("PriceQtyMinHT", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-                if ($conf->multicurrency->enabled)									print_liste_field_titre("PriceQtyMinHTCurrency", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-                if (!empty($arrayfields['pfp.unitprice']['checked']))				print_liste_field_titre("UnitPriceHT", $_SERVER["PHP_SELF"], "pfp.unitprice", "", $param, '', $sortfield, $sortorder, 'right ');
+				if (!empty($conf->multicurrency->enabled))									print_liste_field_titre("PriceQtyMinHTCurrency", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+				if (!empty($arrayfields['pfp.unitprice']['checked']))				print_liste_field_titre("UnitPriceHT", $_SERVER["PHP_SELF"], "pfp.unitprice", "", $param, '', $sortfield, $sortorder, 'right ');
 				if (!empty($arrayfields['pfp.multicurrency_unitprice']['checked']))	print_liste_field_titre("UnitPriceHTCurrency", $_SERVER["PHP_SELF"], "pfp.multicurrency_unitprice", "", $param, '', $sortfield, $sortorder, 'right ');
-				if ($conf->multicurrency->enabled)									print_liste_field_titre("Currency", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
+				if (!empty($conf->multicurrency->enabled))									print_liste_field_titre("Currency", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
 				print_liste_field_titre("DiscountQtyMin", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
 				if (!empty($arrayfields['pfp.delivery_time_days']['checked']))		print_liste_field_titre("NbDaysToDelivery", $_SERVER["PHP_SELF"], "pfp.delivery_time_days", "", $param, '', $sortfield, $sortorder, 'right ');
 				if (!empty($arrayfields['pfp.supplier_reputation']['checked']))		print_liste_field_titre("ReputationForThisProduct", $_SERVER["PHP_SELF"], "pfp.supplier_reputation", "", $param, '', $sortfield, $sortorder, 'center ');
@@ -936,8 +947,8 @@ SCRIPT;
 					foreach ($extralabels as $key => $value) {
 						// Show field if not hidden
 						if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
-                            if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) $langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
-                            if (!empty($extrafields->attributes["product_fournisseur_price"]['help'][$key])) $extratitle = $form->textwithpicto($langs->trans($value), $langs->trans($extrafields->attributes["product_fournisseur_price"]['help'][$key]));
+							if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) $langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
+							if (!empty($extrafields->attributes["product_fournisseur_price"]['help'][$key])) $extratitle = $form->textwithpicto($langs->trans($value), $langs->trans($extrafields->attributes["product_fournisseur_price"]['help'][$key]));
 							else $extratitle = $langs->trans($value);
 							if (!empty($arrayfields['ef.'.$key]['checked'])) print_liste_field_titre($extratitle, $_SERVER["PHP_SELF"], 'ef.'.$key, '', $param, '', $sortfield, $sortorder, 'right ');
 						}
@@ -946,8 +957,8 @@ SCRIPT;
 
 				if (is_object($hookmanager))
 				{
-				    $parameters = array('id_fourn'=>$id_fourn, 'prod_id'=>$object->id);
-				    $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action);
+					$parameters = array('id_fourn'=>$id_fourn, 'prod_id'=>$object->id);
+					$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action);
 				}
 				print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 				print "</tr>\n";
@@ -969,8 +980,7 @@ SCRIPT;
 						}
 
 						// Supplier ref
-						if ($usercancreate) // change required right here
-						{
+						if ($usercancreate) { // change required right here
 							print '<td class="left">'.$productfourn->getNomUrl().'</td>';
 						} else {
 							print '<td class="left">'.$productfourn->fourn_ref.'</td>';
@@ -980,7 +990,7 @@ SCRIPT;
 						if (!empty($arrayfields['pfp.fk_availability']['checked']))
 						{
 							$form->load_cache_availability();
-                			$availability = $form->cache_availability[$productfourn->fk_availability]['label'];
+							$availability = $form->cache_availability[$productfourn->fk_availability]['label'];
 							print '<td class="left">'.$availability.'</td>';
 						}
 
@@ -989,7 +999,7 @@ SCRIPT;
 							print '<td class="right">';
 							print $productfourn->fourn_qty;
 							// Units
-							if ($conf->global->PRODUCT_USE_UNITS) {
+							if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 								$unit = $object->getLabelOfUnit();
 								if ($unit !== '') {
 									print '&nbsp;&nbsp;'.$langs->trans($unit);
@@ -1008,12 +1018,12 @@ SCRIPT;
 						print $productfourn->fourn_price ?price($productfourn->fourn_price) : "";
 						print '</td>';
 
-                        if ($conf->multicurrency->enabled) {
-                            // Price for the quantity in currency
-                            print '<td class="right">';
-                            print $productfourn->fourn_multicurrency_price ? price($productfourn->fourn_multicurrency_price) : "";
-                            print '</td>';
-                        }
+						if (!empty($conf->multicurrency->enabled)) {
+							// Price for the quantity in currency
+							print '<td class="right">';
+							print $productfourn->fourn_multicurrency_price ? price($productfourn->fourn_multicurrency_price) : "";
+							print '</td>';
+						}
 
 						// Unit price
 						if (!empty($arrayfields['pfp.unitprice']['checked'])) {
@@ -1025,16 +1035,16 @@ SCRIPT;
 
 						// Unit price in currency
 						if (!empty($arrayfields['pfp.multicurrency_unitprice']['checked'])) {
-                            print '<td class="right">';
-                            print price($productfourn->fourn_multicurrency_unitprice);
-                            print '</td>';}
+							print '<td class="right">';
+							print price($productfourn->fourn_multicurrency_unitprice);
+							print '</td>'; }
 
 						// Currency
-                        if ($conf->multicurrency->enabled) {
-                            print '<td class="right">';
-                            print $productfourn->fourn_multicurrency_code ? currency_name($productfourn->fourn_multicurrency_code) : '';
-                            print '</td>';
-                        }
+						if (!empty($conf->multicurrency->enabled)) {
+							print '<td class="right">';
+							print $productfourn->fourn_multicurrency_code ? currency_name($productfourn->fourn_multicurrency_code) : '';
+							print '</td>';
+						}
 
 						// Discount
 						print '<td class="right">';
@@ -1059,18 +1069,18 @@ SCRIPT;
 
 						// Barcode
 						if (!empty($arrayfields['pfp.barcode']['checked'])) {
-                            print '<td align="right">';
-                            print $productfourn->barcode;
+							print '<td align="right">';
+							print $productfourn->supplier_barcode;
 							print '</td>';
 						}
 
 						// Barcode type
 						if (!empty($arrayfields['pfp.fk_barcode_type']['checked'])) {
-                            print '<td class="center">';
-                            $productfourn->barcode_type = !empty($productfourn->fk_barcode_type) ? $productfourn->fk_barcode_type : 0;
-                            $productfourn->fetch_barcode();
-                            print $productfourn->barcode_type_label ? $productfourn->barcode_type_label : ($productfourn->barcode ? '<div class="warning">'.$langs->trans("SetDefaultBarcodeType").'<div>' : '');
-                            print '</td>';
+							print '<td class="center">';
+							$productfourn->barcode_type = !empty($productfourn->supplier_fk_barcode_type) ? $productfourn->supplier_fk_barcode_type : 0;
+							$productfourn->fetch_barcode();
+							print $productfourn->barcode_type_label ? $productfourn->barcode_type_label : ($productfourn->supplier_barcode ? '<div class="warning">'.$langs->trans("SetDefaultBarcodeType").'<div>' : '');
+							print '</td>';
 						}
 
 						// Packaging
@@ -1089,37 +1099,37 @@ SCRIPT;
 
 						// Extrafields
 						if (!empty($extralabels)) {
-                            $sql  = "SELECT";
-                            $sql .= " fk_object";
-                            foreach ($extralabels as $key => $value) {
-                                $sql .= ", ".$key;
-                            }
-                            $sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields";
-                            $sql .= " WHERE fk_object = ".$productfourn->product_fourn_price_id;
-                            $resql = $db->query($sql);
-                            if ($resql) {
-                                if ($db->num_rows($resql) != 1) {
-                                    foreach ($extralabels as $key => $value) {
-                                        if (!empty($arrayfields['ef.'.$key]['checked']) && !empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
-                                            print "<td></td>";
-                                        }
-                                    }
-                                } else {
-                                    $obj = $db->fetch_object($resql);
-                                    foreach ($extralabels as $key => $value) {
-                                        if (!empty($arrayfields['ef.'.$key]['checked']) && !empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
-                                            print '<td align="right">'.$extrafields->showOutputField($key, $obj->{$key})."</td>";
-                                        }
-                                    }
-                                }
-                                $db->free($resql);
-                            }
+							$sql  = "SELECT";
+							$sql .= " fk_object";
+							foreach ($extralabels as $key => $value) {
+								$sql .= ", ".$key;
+							}
+							$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields";
+							$sql .= " WHERE fk_object = ".$productfourn->product_fourn_price_id;
+							$resql = $db->query($sql);
+							if ($resql) {
+								if ($db->num_rows($resql) != 1) {
+									foreach ($extralabels as $key => $value) {
+										if (!empty($arrayfields['ef.'.$key]['checked']) && !empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
+											print "<td></td>";
+										}
+									}
+								} else {
+									$obj = $db->fetch_object($resql);
+									foreach ($extralabels as $key => $value) {
+										if (!empty($arrayfields['ef.'.$key]['checked']) && !empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
+											print '<td align="right">'.$extrafields->showOutputField($key, $obj->{$key})."</td>";
+										}
+									}
+								}
+								$db->free($resql);
+							}
 						}
 
 						if (is_object($hookmanager))
 						{
 							$parameters = array('id_pfp'=>$productfourn->product_fourn_price_id, 'id_fourn'=>$id_fourn, 'prod_id'=>$object->id);
-						    $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action);
+							$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action);
 						}
 
 						// Modify-Remove
@@ -1127,7 +1137,7 @@ SCRIPT;
 
 						if ($usercancreate)
 						{
-							print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$productfourn->fourn_id.'&amp;action=update_price&amp;rowid='.$productfourn->product_fourn_price_id.'">'.img_edit()."</a>";
+							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$productfourn->fourn_id.'&amp;action=update_price&amp;rowid='.$productfourn->product_fourn_price_id.'">'.img_edit()."</a>";
 							print ' &nbsp; ';
 							print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$productfourn->fourn_id.'&amp;action=ask_remove_pf&amp;rowid='.$productfourn->product_fourn_price_id.'">'.img_picto($langs->trans("Remove"), 'delete').'</a>';
 						}
@@ -1137,7 +1147,7 @@ SCRIPT;
 						print '</tr>';
 					}
 				} else {
-				    dol_print_error($db);
+					dol_print_error($db);
 				}
 
 				print '</table>';
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 53136237eca..9c9852b22ef 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -85,33 +85,33 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-    // Search contract
-    if ((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && ($user->rights->produit->lire || $user->rights->service->lire))
-    {
-    	$listofsearchfields['search_product'] = array('text'=>'ProductOrService');
-    }
+	// Search contract
+	if ((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && ($user->rights->produit->lire || $user->rights->service->lire))
+	{
+		$listofsearchfields['search_product'] = array('text'=>'ProductOrService');
+	}
 
-    if (count($listofsearchfields))
-    {
-    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-    	print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<div class="div-table-responsive-no-min">';
-    	print '<table class="noborder nohover centpercent">';
-    	$i = 0;
-    	foreach ($listofsearchfields as $key => $value)
-    	{
-    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    		print '<tr class="oddeven">';
-    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-    		print '</tr>';
-    		$i++;
-    	}
-    	print '</table>';
-        print '</div>';
-    	print '</form>';
-    	print '<br>';
-    }
+	if (count($listofsearchfields))
+	{
+		print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder nohover centpercent">';
+		$i = 0;
+		foreach ($listofsearchfields as $key => $value)
+		{
+			if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+			print '<tr class="oddeven">';
+			print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+			if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+			print '</tr>';
+			$i++;
+		}
+		print '</table>';
+		print '</div>';
+		print '</form>';
+		print '<br>';
+	}
 }
 
 /*
@@ -349,27 +349,27 @@ if ((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && ($us
 				// Sell price
 				if (empty($conf->global->PRODUIT_MULTIPRICES))
 				{
-	                if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_price_expression))
-	                {
-	                	$product = new Product($db);
-	                	$product->fetch($objp->rowid);
-	                    $priceparser = new PriceParser($db);
-	                    $price_result = $priceparser->parseProduct($product);
-	                    if ($price_result >= 0) {
-	                        $objp->price = $price_result;
-	                    }
-	                }
+					if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_price_expression))
+					{
+						$product = new Product($db);
+						$product->fetch($objp->rowid);
+						$priceparser = new PriceParser($db);
+						$price_result = $priceparser->parseProduct($product);
+						if ($price_result >= 0) {
+							$objp->price = $price_result;
+						}
+					}
 					print '<td class="nowrap right">';
-	    			if (isset($objp->price_base_type) && $objp->price_base_type == 'TTC') print price($objp->price_ttc).' '.$langs->trans("TTC");
-	    			else print price($objp->price).' '.$langs->trans("HT");
-	    			print '</td>';
+					if (isset($objp->price_base_type) && $objp->price_base_type == 'TTC') print price($objp->price_ttc).' '.$langs->trans("TTC");
+					else print price($objp->price).' '.$langs->trans("HT");
+					print '</td>';
 				}
 				print '<td class="right nowrap width25"><span class="statusrefsell">';
 				print $product_static->LibStatut($objp->tosell, 3, 0);
 				print "</span></td>";
-	            print '<td class="right nowrap width25"><span class="statusrefbuy">';
-	            print $product_static->LibStatut($objp->tobuy, 3, 1);
-	            print "</span></td>";
+				print '<td class="right nowrap width25"><span class="statusrefbuy">';
+				print $product_static->LibStatut($objp->tobuy, 3, 1);
+				print "</span></td>";
 				print "</tr>\n";
 				$i++;
 			}
@@ -445,7 +445,7 @@ function activitytrim($product_type)
 
 		if ($num > 0)
 		{
-            print '<div class="div-table-responsive-no-min">';
+			print '<div class="div-table-responsive-no-min">';
 			print '<table class="noborder" width="75%">';
 
 			if ($product_type == 0)
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index f7dbc1f6410..425dd3622e3 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -189,7 +189,7 @@ if ($action == 'create')
 	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 
-	dol_fiche_head(array(), '');
+	print dol_get_fiche_head(array(), '');
 
 	// Set some default values
 	//if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue';
@@ -204,12 +204,12 @@ if ($action == 'create')
 
 	print '</table>'."\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
 	print '&nbsp; ';
-	print '<input type="'.($backtopage ? "submit" : "button").'" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
+	print '<input type="'.($backtopage ? "submit" : "button").'" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
 	print '</div>';
 
 	print '</form>';
@@ -229,7 +229,7 @@ if (($id || $ref) && $action == 'edit')
 	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent tableforfieldedit">'."\n";
 
@@ -241,10 +241,10 @@ if (($id || $ref) && $action == 'edit')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
-	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+	print ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
@@ -256,7 +256,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$res = $object->fetch_optionals();
 
 	$head = inventoryPrepareHead($object);
-	dol_fiche_head($head, 'card', $langs->trans("Inventory"), -1, 'stock');
+	print dol_get_fiche_head($head, 'card', $langs->trans("Inventory"), -1, 'stock');
 
 	$formconfirm = '';
 
@@ -370,7 +370,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	// Buttons for actions
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index cb9da997d18..47d9425530f 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -170,6 +170,9 @@ class Inventory extends CommonObject
 	 */
 	public $fk_user_valid;
 
+	/**
+	 * @var string import key
+	 */
 	public $import_key;
 	// END MODULEBUILDER PROPERTIES
 
@@ -178,17 +181,17 @@ class Inventory extends CommonObject
 	// If this object has a subtable with lines
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	public $table_element_line = 'inventorydet';
 
 	/**
-	 * @var int    Field with ID of parent key if this field has a parent
+	 * @var string    Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_inventory';
 
 	/**
-	 * @var int    Name of subtable class that manage subtable lines
+	 * @var string    Name of subtable class that manage subtable lines
 	 */
 	public $class_element_line = 'Inventoryline';
 
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 37f1cb9721a..875f55b6fe4 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -120,7 +120,7 @@ if (empty($reshook))
 	// Actions to send emails
 	/*$triggersendname = 'MYOBJECT_SENTBYMAIL';
 	$autocopy='MAIN_MAIL_AUTOCOPY_MYOBJECT_TO';
-	$trackid='myobject'.$object->id;
+	$trackid='stockinv'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';*/
 
 	if (GETPOST('addline', 'alpha')) {
@@ -202,7 +202,7 @@ if ($object->id > 0)
 	$res = $object->fetch_optionals();
 
 	$head = inventoryPrepareHead($object);
-	dol_fiche_head($head, 'inventory', $langs->trans("Inventory"), -1, 'stock');
+	print dol_get_fiche_head($head, 'inventory', $langs->trans("Inventory"), -1, 'stock');
 
 	$formconfirm = '';
 
@@ -300,7 +300,7 @@ if ($object->id > 0)
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	// Buttons for actions
@@ -313,9 +313,9 @@ if ($object->id > 0)
 
 		print '<div class="center">';
 		print '<span class="opacitymedium">'.$langs->trans("InventoryDesc").'</span><br>';
-		print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+		print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
 		print ' &nbsp; ';
-		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 		print '<br>';
 		print '</form>';
@@ -352,7 +352,7 @@ if ($object->id > 0)
 						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=updatebyscaning" class="butAction">'.$langs->trans("UpdateByScaning").'</a>';
 					}
 				} else {
-					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Save').'</a>'."\n";
+					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Save").'</a>'."\n";
 				}
 			}
 
@@ -440,7 +440,7 @@ if ($object->id > 0)
 		print '<td class="right"></td>';
 		print '<td class="center">';
 		print '<input type="submit" class="button paddingrightonly" name="addline" value="'.$langs->trans("Add").'">';
-		//print '<input type="submit" class="button paddingrightonly" name="canceladdline" value="'.$langs->trans("Cancel").'">';
+		//print '<input type="submit" class="button paddingrightonly button-cancel" name="canceladdline" value="'.$langs->trans("Cancel").'">';
 		print '</td>';
 		// Actions
 		print '<td class="center">';
@@ -528,7 +528,7 @@ if ($object->id > 0)
 	// Save
 	if ($object->status == $object::STATUS_VALIDATED) {
 		print '<div class="center">';
-		print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+		print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
 		print '</div>';
 	}
 
diff --git a/htdocs/product/inventory/lib/inventory.lib.php b/htdocs/product/inventory/lib/inventory.lib.php
index da2b626ab5c..bda792abec4 100644
--- a/htdocs/product/inventory/lib/inventory.lib.php
+++ b/htdocs/product/inventory/lib/inventory.lib.php
@@ -29,30 +29,30 @@
  */
 function inventoryAdminPrepareHead()
 {
-    global $langs, $conf;
+	global $langs, $conf;
 
-    $langs->load("inventory");
+	$langs->load("inventory");
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/inventory.php";
-    $head[$h][1] = $langs->trans("Parameters");
-    $head[$h][2] = 'settings';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/inventory.php";
+	$head[$h][1] = $langs->trans("Parameters");
+	$head[$h][2] = 'settings';
+	$h++;
 
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    //$this->tabs = array(
-    //	'entity:+tabname:Title:@inventory:/inventory/mypage.php?id=__ID__'
-    //); // to add new tab
-    //$this->tabs = array(
-    //	'entity:-tabname:Title:@inventory:/inventory/mypage.php?id=__ID__'
-    //); // to remove a tab
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'inventory');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	//$this->tabs = array(
+	//	'entity:+tabname:Title:@inventory:/inventory/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@inventory:/inventory/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'inventory');
 
-    return $head;
+	return $head;
 }
 
 /**
@@ -73,48 +73,3 @@ function inventoryPrepareHead(&$inventory, $title = 'Inventory', $get = '')
 		array(dol_buildpath('/product/inventory/inventory.php?id='.$inventory->id.$get, 1), $langs->trans('Inventory'), 'inventory')
 	);
 }
-
-
-
-/**
- *  Define head array for tabs of inventory tools setup pages
- *
- *  @param   Inventory  $inventory      Object inventory
- *
- *  @return string                      html of products
- */
-function inventorySelectProducts(&$inventory)
-{
-	global $conf, $db, $langs;
-
-	$except_product_id = array();
-
-	foreach ($inventory->Inventorydet as $Inventorydet)
-	{
-		$except_product_id[] = $Inventorydet->fk_product;
-	}
-
-	ob_start();
-	$form = new Form($db);
-	$form->select_produits(-1, 'fk_product');
-
-	$TChildWarehouses = array($inventory->fk_warehouse);
-	$e = new Entrepot($db);
-	$e->fetch($inventory->fk_warehouse);
-	if (method_exists($e, 'get_children_warehouses')) $e->get_children_warehouses($e->id, $TChildWarehouses);
-
-	$Tab = array();
-	$sql = 'SELECT rowid, label
-			FROM '.MAIN_DB_PREFIX.'entrepot WHERE rowid IN('.implode(', ', $TChildWarehouses).')';
-	if (method_exists($e, 'get_children_warehouses')) $sql .= ' ORDER BY fk_parent';
-	$resql = $db->query($sql);
-	while ($res = $db->fetch_object($resql)) {
-		$Tab[$res->rowid] = $res->label;
-	}
-	print '&nbsp;&nbsp;&nbsp;';
-	print $langs->trans('Warehouse').' : '.$form::selectarray('fk_warehouse', $Tab);
-
-	$select_html = ob_get_clean();
-
-	return $select_html;
-}
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 09947e80ac7..747abda86b8 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -324,7 +324,7 @@ print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sort
 $topicmail = "Information";
 $modelmail = "inventory";
 $objecttmp = new Inventory($db);
-$trackid = 'inve'.$object->id;
+$trackid = 'stockinv'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($search_all)
@@ -371,7 +371,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index a0bfa073afa..86b8b62fc81 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -40,6 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 if (!empty($conf->categorie->enabled))
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
@@ -58,7 +59,6 @@ $search_ref = GETPOST("search_ref", 'alpha');
 $search_barcode = GETPOST("search_barcode", 'alpha');
 $search_label = GETPOST("search_label", 'alpha');
 $search_type = GETPOST("search_type", 'int');
-$search_sale = GETPOST("search_sale", 'int');
 $search_vatrate = GETPOST("search_vatrate", 'alpha');
 $searchCategoryProductOperator = (GETPOST('search_category_product_operator', 'int') ? GETPOST('search_category_product_operator', 'int') : 0);
 $searchCategoryProductList = GETPOST('search_category_product_list', 'array');
@@ -75,6 +75,7 @@ $search_accountancy_code_sell_export = GETPOST("search_accountancy_code_sell_exp
 $search_accountancy_code_buy = GETPOST("search_accountancy_code_buy", 'alpha');
 $search_accountancy_code_buy_intra = GETPOST("search_accountancy_code_buy_intra", 'alpha');
 $search_accountancy_code_buy_export = GETPOST("search_accountancy_code_buy_export", 'alpha');
+$search_finished = GETPOST("search_finished", 'int');
 $optioncss = GETPOST('optioncss', 'alpha');
 $type = GETPOST("type", "int");
 
@@ -109,6 +110,7 @@ $hookmanager->initHooks(array('productservicelist'));
 $extrafields = new ExtraFields($db);
 $form = new Form($db);
 $formcompany = new FormCompany($db);
+$formproduct = new FormProduct($db);
 
 // fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -212,7 +214,7 @@ $arrayfields = array(
 	'p.tobatch'=>array('label'=>$langs->trans("ManageLotSerial"), 'checked'=>0, 'enabled'=>(!empty($conf->productbatch->enabled)), 'position'=>60),
 	'p.fk_country'=>array('label'=>$langs->trans("Country"), 'checked'=>0, 'position'=>100),
 	'p.fk_state'=>array('label'=>$langs->trans("State"), 'checked'=>0, 'position'=>101),
-  'p.accountancy_code_sell'=>array('label'=>$langs->trans("ProductAccountancySellCode"), 'checked'=>0, 'position'=>400),
+	'p.accountancy_code_sell'=>array('label'=>$langs->trans("ProductAccountancySellCode"), 'checked'=>0, 'position'=>400),
 	'p.accountancy_code_sell_intra'=>array('label'=>$langs->trans("ProductAccountancySellIntraCode"), 'checked'=>0, 'enabled'=>$isInEEC, 'position'=>401),
 	'p.accountancy_code_sell_export'=>array('label'=>$langs->trans("ProductAccountancySellExportCode"), 'checked'=>0, 'position'=>402),
 	'p.accountancy_code_buy'=>array('label'=>$langs->trans("ProductAccountancyBuyCode"), 'checked'=>0, 'position'=>403),
@@ -234,21 +236,15 @@ if ($conf->global->PRODUIT_MULTIPRICES) {
 		} else {
 			$labelp = $langs->trans("SellingPrice")." ".$i;
 		}
-		$arrayfields['p.sellprice'.$i] = array('label'=>$labelp, 'checked'=>1, 'enabled'=>$conf->global->PRODUIT_MULTIPRICES, 'position'=>40);
+		$arrayfields['p.sellprice'.$i] = array('label'=>$labelp, 'checked'=>1, 'enabled'=>$conf->global->PRODUIT_MULTIPRICES, 'position'=>floatval('40.'.sprintf('%03s', $i)));
 		$arraypricelevel[$i] = array($i);
 	}
 }
 
 //var_dump($arraypricelevel);
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']))
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
@@ -281,10 +277,11 @@ if (empty($reshook))
 		$searchCategoryProductList = array();
 		$search_tosell = "";
 		$search_tobuy = "";
+		$search_tobatch = '';
 		$search_country = "";
 		$search_state = "";
 		$search_vatrate = "";
-		$search_tobatch = '';
+		$search_finished = '';
 		//$search_type='';						// There is 2 types of list: a list of product and a list of services. No list with both. So when we clear search criteria, we must keep the filter on type.
 
 		$show_childproducts = '';
@@ -375,8 +372,9 @@ if (!empty($conf->variants->enabled) && (!empty($conf->global->PRODUIT_ATTRIBUTE
 if ($search_ref)     $sql .= natural_search('p.ref', $search_ref);
 if ($search_label)   $sql .= natural_search('p.label', $search_label);
 if ($search_barcode) $sql .= natural_search('p.barcode', $search_barcode);
-if (isset($search_tosell) && dol_strlen($search_tosell) > 0 && $search_tosell != -1) $sql .= " AND p.tosell = ".$db->escape($search_tosell);
-if (isset($search_tobuy) && dol_strlen($search_tobuy) > 0 && $search_tobuy != -1)   $sql .= " AND p.tobuy = ".$db->escape($search_tobuy);
+if (isset($search_tosell) && dol_strlen($search_tosell) > 0 && $search_tosell != -1) $sql .= " AND p.tosell = ".((int) $search_tosell);
+if (isset($search_tobuy) && dol_strlen($search_tobuy) > 0 && $search_tobuy != -1)   $sql .= " AND p.tobuy = ".((int) $search_tobuy);
+if (isset($search_tobatch) && dol_strlen($search_tobatch) > 0 && $search_tobatch != -1)   $sql .= " AND p.tobatch = ".((int) $search_tobatch);
 if ($search_vatrate) $sql .= natural_search('p.tva_tx', $search_vatrate);
 if (dol_strlen($canvas) > 0)                    $sql .= " AND p.canvas = '".$db->escape($canvas)."'";
 if ($catid > 0)     $sql .= " AND cp.fk_categorie = ".$catid;
@@ -405,10 +403,10 @@ if ($searchCategoryProductOperator == 1) {
 		$sql .= " AND (".implode(' AND ', $searchCategoryProductSqlList).")";
 	}
 }
-if ($fourn_id > 0)  $sql .= " AND pfp.fk_soc = ".$fourn_id;
-if ($search_tobatch != '' && $search_tobatch >= 0)   $sql .= " AND p.tobatch = ".$db->escape($search_tobatch);
+if ($fourn_id > 0)  $sql .= " AND pfp.fk_soc = ".((int) $fourn_id);
 if ($search_country)     $sql .= " AND p.fk_country = ".$search_country;
 if ($search_state)     $sql .= " AND p.fk_state = ".$search_state;
+if ($search_finished >= 0 && $search_finished !== '') $sql .= " AND p.finished = ".$search_finished;
 if ($search_accountancy_code_sell)        $sql .= natural_search('p.accountancy_code_sell', $search_accountancy_code_sell);
 if ($search_accountancy_code_sell_intra)  $sql .= natural_search('p.accountancy_code_sell_intra', $search_accountancy_code_sell_intra);
 if ($search_accountancy_code_sell_export) $sql .= natural_search('p.accountancy_code_sell_export', $search_accountancy_code_sell_export);
@@ -506,22 +504,23 @@ if ($resql)
 	if ($search_label) $param .= "&search_label=".urlencode($search_label);
 	if ($search_tosell != '') $param .= "&search_tosell=".urlencode($search_tosell);
 	if ($search_tobuy != '') $param .= "&search_tobuy=".urlencode($search_tobuy);
+	if ($search_tobatch) $param = "&search_tobatch=".urlencode($search_tobatch);
 	if ($search_country != '') $param .= "&search_country=".urlencode($search_country);
 	if ($search_state != '') $param .= "&search_state=".urlencode($search_state);
-	if ($search_vatrate) $sql .= natural_search('p.tva_tx', $search_vatrate);
+	if ($search_vatrate) $param = "&search_vatrate=".urlencode($search_vatrate);
 	if ($fourn_id > 0) $param .= ($fourn_id ? "&fourn_id=".$fourn_id : "");
 	//if ($seach_categ) $param.=($search_categ?"&search_categ=".urlencode($search_categ):"");
 	if ($show_childproducts) $param .= ($show_childproducts ? "&search_show_childproducts=".urlencode($show_childproducts) : "");
 	if ($type != '') $param .= '&type='.urlencode($type);
 	if ($search_type != '') $param .= '&search_type='.urlencode($search_type);
 	if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
-	if ($search_tobatch) $param = "&search_ref_supplier=".urlencode($search_ref_supplier);
 	if ($search_accountancy_code_sell) $param = "&search_accountancy_code_sell=".urlencode($search_accountancy_code_sell);
 	if ($search_accountancy_code_sell_intra) $param = "&search_accountancy_code_sell_intra=".urlencode($search_accountancy_code_sell_intra);
 	if ($search_accountancy_code_sell_export) $param = "&search_accountancy_code_sell_export=".urlencode($search_accountancy_code_sell_export);
 	if ($search_accountancy_code_buy) $param = "&search_accountancy_code_buy=".urlencode($search_accountancy_code_buy);
 	if ($search_accountancy_code_buy_intra) $param = "&search_accountancy_code_buy_intra=".urlencode($search_accountancy_code_buy_intra);
 	if ($search_accountancy_code_buy_export) $param = "&search_accountancy_code_buy_export=".urlencode($search_accountancy_code_buy_export);
+	if ($search_finished) $param = "&search_finished=".urlencode($search_finished);
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -593,14 +592,14 @@ if ($resql)
 
 	// Filter on categories
 	$moreforfilter = '';
-	if (!empty($conf->categorie->enabled))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 	{
 		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= $langs->trans('Categories').': ';
 		$categoriesProductArr = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', '', 64, 0, 1);
 		$categoriesProductArr[-2] = '- '.$langs->trans('NotCategorized').' -';
 		$moreforfilter .= Form::multiselectarray('search_category_product_list', $categoriesProductArr, $searchCategoryProductList, 0, 0, 'minwidth300');
-		$moreforfilter .= ' <input type="checkbox" class="valignmiddle" name="search_category_product_operator" value="1"'.($searchCategoryProductOperator == 1 ? ' checked="checked"' : '').'/> <span class="opacitymedium">'.$langs->trans('UseOrOperatorForCategories').'</span>';
+		$moreforfilter .= ' <input type="checkbox" class="valignmiddle" name="search_category_product_operator" value="1"'.($searchCategoryProductOperator == 1 ? ' checked="checked"' : '').'/> <span class="none">'.$langs->trans('UseOrOperatorForCategories').'</span>';
 		$moreforfilter .= '</div>';
 	}
 
@@ -677,6 +676,7 @@ if ($resql)
 	if (!empty($arrayfields['p.finished']['checked']))
 	{
 		print '<td class="liste_titre">';
+		print $formproduct->selectProductNature('search_finished', $search_finished);
 		print '</td>';
 	}
 	// Weight
@@ -825,7 +825,7 @@ if ($resql)
 	// Stock
 	if (!empty($arrayfields['stock_virtual']['checked'])) print '<td class="liste_titre">&nbsp;</td>';
 	// To batch
-	if (!empty($arrayfields['p.tobatch']['checked'])) print '<td class="liste_titre center">'.$form->selectyesno($search_tobatch, '', '', '', 1).'</td>';
+	if (!empty($arrayfields['p.tobatch']['checked'])) print '<td class="liste_titre center">'.$form->selectyesno('search_tobatch', $search_tobatch, 1, false, 1).'</td>';
 	// Country
 	if (!empty($arrayfields['p.fk_country']['checked'])) print '<td class="liste_titre center">'.$form->select_country($search_country, 'search_country', '', 0).'</td>';
 	// State
@@ -1096,7 +1096,7 @@ if ($resql)
 		// Label
 		if (!empty($arrayfields['p.label']['checked']))
 		{
-			print '<td class="tdoverflowmax200">'.dol_trunc($obj->label, 80).'</td>';
+			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->label).'">'.$obj->label.'</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
 
@@ -1282,30 +1282,58 @@ if ($resql)
 
 
 		// Multiprices
-		if ($conf->global->PRODUIT_MULTIPRICES) {
+		if (! empty($conf->global->PRODUIT_MULTIPRICES)) {
+			if (! isset($productpricescache)) {
+				$productpricescache=array();
+			}
+			if (! isset($productpricescache[$obj->rowid])) {
+				$productpricescache[$obj->rowid] = array();
+			}
+
+			if ($obj->tosell)
+			{
+				// Make 1 request for all price levels (without filter on price_level) and saved result into an cache array
+				// then reuse the cache array if we need prices for other price levels
+				$sqlp = "SELECT p.rowid, p.fk_product, p.price, p.price_ttc, p.price_level, p.date_price, p.price_base_type";
+				$sqlp .= " FROM ".MAIN_DB_PREFIX."product_price as p";
+				$sqlp .= " WHERE fk_product = ".$obj->rowid;
+				$sqlp .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
+				$resultp = $db->query($sqlp);
+				if ($resultp)
+				{
+					$nump = $db->num_rows($resultp);
+					$j = 0;
+					while ($j < $nump)
+					{
+						$objp = $db->fetch_object($resultp);
+
+						if (empty($productpricescache[$obj->rowid][$objp->price_level]))
+						{
+							$productpricescache[$obj->rowid][$objp->price_level]['price'] = $objp->price;
+							$productpricescache[$obj->rowid][$objp->price_level]['price_ttc'] = $objp->price_ttc;
+							$productpricescache[$obj->rowid][$objp->price_level]['price_base_type'] = $objp->price_base_type;
+						}
+
+						$j++;
+					}
+
+					$db->free($resultp);
+				} else {
+					dol_print_error($db);
+				}
+			}
+
 			foreach ($arraypricelevel as $key => $value)
 			{
 				if (!empty($arrayfields['p.sellprice'.$key]['checked']))
 				{
 					print '<td class="right nowraponall">';
-					if ($obj->tosell)
+					if (!empty($productpricescache[$obj->rowid]))
 					{
-						// TODO Make 1 request for all price levels (without filter on price_level) and saved result into an cache array
-						// then reuse the cache array if we need prices for other price levels
-						$resultp = "SELECT p.rowid, p.fk_product, p.price, p.price_ttc, p.price_level, p.date_price";
-						$resultp .= " FROM ".MAIN_DB_PREFIX."product_price as p";
-						$resultp .= " WHERE fk_product = ".$obj->rowid;
-						$resultp .= " AND p.price_level = ".$key;
-						$resultp .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
-						$resultp = $db->query($resultp);
-						if ($resultp)
-						{
-							$objp = $db->fetch_object($resultp);
-								if ($obj->price_base_type == 'TTC') print price($objp->price_ttc).' '.$langs->trans("TTC");
-							else print price($objp->price).' '.$langs->trans("HT");
-								$db->free($resultp);
+						if ($productpricescache[$obj->rowid][$key]['price_base_type'] == 'TTC') {
+							print price($productpricescache[$obj->rowid][$key]['price_ttc']).' '.$langs->trans("TTC");
 						} else {
-							dol_print_error($db);
+							print price($productpricescache[$obj->rowid][$key]['price']).' '.$langs->trans("HT");
 						}
 					}
 					print '</td>';
diff --git a/htdocs/product/note.php b/htdocs/product/note.php
index 2d0cb70fcfe..f0a6293383d 100644
--- a/htdocs/product/note.php
+++ b/htdocs/product/note.php
@@ -83,36 +83,36 @@ llxHeader('', $title, $help_url);
 
 if ($id > 0 || !empty($ref))
 {
-    /*
+	/*
      * Affichage onglets
      */
-    if (!empty($conf->notification->enabled)) $langs->load("mails");
+	if (!empty($conf->notification->enabled)) $langs->load("mails");
 
-    $head = product_prepare_head($object);
-    $titre = $langs->trans("CardProduct".$object->type);
-    $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
+	$head = product_prepare_head($object);
+	$titre = $langs->trans("CardProduct".$object->type);
+	$picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
 
-    dol_fiche_head($head, 'note', $titre, -1, $picto);
+	print dol_get_fiche_head($head, 'note', $titre, -1, $picto);
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-    $object->next_prev_filter = " fk_product_type = ".$object->type;
+	$object->next_prev_filter = " fk_product_type = ".$object->type;
 
-    $shownav = 1;
-    if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+	$shownav = 1;
+	if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
 	dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-    $cssclass = 'titlefield';
-    //if ($action == 'editnote_public') $cssclass='titlefieldcreate';
-    //if ($action == 'editnote_private') $cssclass='titlefieldcreate';
+	$cssclass = 'titlefield';
+	//if ($action == 'editnote_public') $cssclass='titlefieldcreate';
+	//if ($action == 'editnote_private') $cssclass='titlefieldcreate';
 
-    //print '<div class="fichecenter">';
+	//print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 
-    include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 7e5015b7813..37019616e96 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -105,7 +105,7 @@ $head[$h][2] = 'popularity';
 $h++;
 
 
-dol_fiche_head($head, 'popularity', $langs->trans("Statistics"), -1);
+print dol_get_fiche_head($head, 'popularity', $langs->trans("Statistics"), -1);
 
 
 // Array of liens to show
@@ -132,7 +132,7 @@ if ($type !== '') {
 }
 $sql .= " GROUP BY p.rowid, p.label, p.ref, p.fk_product_type";
 
-if (! empty($mode) && $mode != '-1') {
+if (!empty($mode) && $mode != '-1') {
 	$result = $db->query($sql);
 	if ($result)
 	{
@@ -236,7 +236,7 @@ print "</table>";
 
 print '</form>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 847292fa367..a4c5de4c47d 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2015		Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2015		Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2016		Ferran Marcet			<fmarcet@2byte.es>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2018		Nicolas ZABOURI			<info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -33,6 +33,7 @@
  * \ingroup product
  * \brief Page to show product prices
  */
+
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
@@ -49,7 +50,9 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 // Load translation files required by the page
 $langs->loadLangs(array('products', 'bills', 'companies', 'other'));
 
-$mesg = ''; $error = 0; $errors = array();
+$mesg = '';
+$error = 0;
+$errors = array();
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
@@ -90,94 +93,95 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $search_soc = '';
-    }
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$search_soc = '';
+	}
 
-    if ($action == 'setlabelsellingprice' && $user->admin)
-    {
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-        $keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.GETPOST('pricelevel');
-        dolibarr_set_const($db, $keyforlabel, GETPOST('labelsellingprice', 'alpha'), 'chaine', 0, '', $conf->entity);
-        $action = '';
-    }
+	if ($action == 'setlabelsellingprice' && $user->admin)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+		$keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.GETPOST('pricelevel');
+		dolibarr_set_const($db, $keyforlabel, GETPOST('labelsellingprice', 'alpha'), 'chaine', 0, '', $conf->entity);
+		$action = '';
+	}
 
 	if (($action == 'update_vat') && !$cancel && ($user->rights->produit->creer || $user->rights->service->creer))
 	{
-	    $tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
+		$tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
 
-	    // We must define tva_tx, npr and local taxes
-	    $tva_tx = $tva_tx_txt;
-	    $vatratecode = '';
-	    if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
-	    {
-	    	$vat_src_code = $reg[1];
-	    	$tva_tx = preg_replace('/\s*\(.*\)/', '', $tva_tx_txt); // Remove code into vatrate.
-	    }
+		// We must define tva_tx, npr and local taxes
+		$tva_tx = $tva_tx_txt;
+		$reg = array();
+		$vatratecode = '';
+		if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
+		{
+			$vat_src_code = $reg[1];
+			$tva_tx = preg_replace('/\s*\(.*\)/', '', $tva_tx_txt); // Remove code into vatrate.
+		}
 
-	    $tva_tx = price2num(preg_replace('/\*/', '', $tva_tx)); // keep remove all after the numbers and dot
-	    $npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
-	    $localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
-	    // If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
-	    if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
-	    {
-	        // We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in create product.
-	        $vatratecode = $reg[1];
-	        // Get record from code
-	        $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
-	        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-	        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
-	        $sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
-	        $sql .= " AND t.code ='".$db->escape($vatratecode)."'";
-	        $resql = $db->query($sql);
-	        if ($resql)
-	        {
-                $obj = $db->fetch_object($resql);
-                $npr = $obj->recuperableonly;
-                $localtax1 = $obj->localtax1;
-                $localtax2 = $obj->localtax2;
-                $localtax1_type = $obj->localtax1_type;
-                $localtax2_type = $obj->localtax2_type;
-	        }
-	    }
+		$tva_tx = price2num(preg_replace('/\*/', '', $tva_tx)); // keep remove all after the numbers and dot
+		$npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
+		$localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
+		// If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
+		if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
+		{
+			// We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in create product.
+			$vatratecode = $reg[1];
+			// Get record from code
+			$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+			$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+			$sql .= " AND t.code ='".$db->escape($vatratecode)."'";
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$obj = $db->fetch_object($resql);
+				$npr = $obj->recuperableonly;
+				$localtax1 = $obj->localtax1;
+				$localtax2 = $obj->localtax2;
+				$localtax1_type = $obj->localtax1_type;
+				$localtax2_type = $obj->localtax2_type;
+			}
+		}
 
-	    $object->default_vat_code = $vatratecode;
-	    $object->tva_tx = $tva_tx;
-	    $object->tva_npr = $npr;
-	    $object->localtax1_tx = $localtax1;
-	    $object->localtax2_tx = $localtax2;
-	    $object->localtax1_type = $localtax1_type;
-	    $object->localtax2_type = $localtax2_type;
+		$object->default_vat_code = $vatratecode;
+		$object->tva_tx = $tva_tx;
+		$object->tva_npr = $npr;
+		$object->localtax1_tx = $localtax1;
+		$object->localtax2_tx = $localtax2;
+		$object->localtax1_type = $localtax1_type;
+		$object->localtax2_type = $localtax2_type;
 
-	    $db->begin();
+		$db->begin();
 
-	    $resql = $object->update($object->id, $user);
-	    if ($resql <= 0)
-	    {
-	        $error++;
-	        setEventMessages($object->error, $object->errors, 'errors');
-	    }
+		$resql = $object->update($object->id, $user);
+		if ($resql <= 0)
+		{
+			$error++;
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 
-	    if ($error)
-	    {
-	        //$localtaxarray=array('0'=>$localtax1_type,'1'=>$localtax1,'2'=>$localtax2_type,'3'=>$localtax2);
-	        $localtaxarray = array(); // We do not store localtaxes into product, we will use instead the "vat code" to retreive them.
-	        $object->updatePrice(0, $object->price_base_type, $user, $tva_tx, '', 0, $npr, 0, 0, $localtaxarray, $vatratecode);
-	    }
+		if ($error)
+		{
+			//$localtaxarray=array('0'=>$localtax1_type,'1'=>$localtax1,'2'=>$localtax2_type,'3'=>$localtax2);
+			$localtaxarray = array(); // We do not store localtaxes into product, we will use instead the "vat code" to retrieve them.
+			$object->updatePrice(0, $object->price_base_type, $user, $tva_tx, '', 0, $npr, 0, 0, $localtaxarray, $vatratecode);
+		}
 
-	    if (!$error)
-	    {
-	        $db->commit();
-	    } else {
-	        $db->rollback();
-	    }
+		if (!$error)
+		{
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
 
-	    $action = '';
+		$action = '';
 	}
 
 	if (($action == 'update_price') && !$cancel && $object->getRights()->creer)
-    {
+	{
 		$error = 0;
 		$pricestoupdate = array();
 
@@ -224,6 +228,7 @@ if (empty($reshook))
 
 				$tva_tx = $tva_tx_txt;
 				$vatratecode = '';
+				$reg = array();
 				if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
 				{
 					$vat_src_code = $reg[1];
@@ -231,41 +236,41 @@ if (empty($reshook))
 				}
 				$tva_tx = price2num(preg_replace('/\*/', '', $tva_tx)); // keep remove all after the numbers and dot
 
-        	    $npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
+				$npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
 				$localtax1 = $newlocaltax1_tx[$i];
 				$localtax1_type = $newlocaltax1_type[$i];
 				$localtax2 = $newlocaltax2_tx[$i];
 				$localtax2_type = $newlocaltax2_type[$i];
-        	    if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
-        	    {
-        	        // We look into database using code
-        	        $vatratecode = $reg[1];
-        	        // Get record from code
-        	        $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
-        	        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-        	        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
-        	        $sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
-        	        $sql .= " AND t.code ='".$db->escape($vatratecode)."'";
-        	        $resql = $db->query($sql);
-        	        if ($resql)
-        	        {
-        	            $obj = $db->fetch_object($resql);
-        	            $npr = $obj->recuperableonly;
-        	            $localtax1 = $obj->localtax1;
-        	            $localtax2 = $obj->localtax2;
-        	            $localtax1_type = $obj->localtax1_type;
-        	            $localtax2_type = $obj->localtax2_type;
-        	        }
-        	    }
+				if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
+				{
+					// We look into database using code
+					$vatratecode = $reg[1];
+					// Get record from code
+					$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+					$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+					$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+					$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+					$sql .= " AND t.code ='".$db->escape($vatratecode)."'";
+					$resql = $db->query($sql);
+					if ($resql)
+					{
+						$obj = $db->fetch_object($resql);
+						$npr = $obj->recuperableonly;
+						$localtax1 = $obj->localtax1;
+						$localtax2 = $obj->localtax2;
+						$localtax1_type = $obj->localtax1_type;
+						$localtax2_type = $obj->localtax2_type;
+					}
+				}
 
 				$pricestoupdate[$i] = array(
-					'price' => $newprice[$i],
-					'price_min' => $newprice_min[$i],
+					'price' => price2num($newprice[$i], '', 2),
+					'price_min' => price2num($newprice_min[$i], '', 2),
 					'price_base_type' => $newpricebase[$i],
-				    'default_vat_code' => $vatratecode,
+					'default_vat_code' => $vatratecode,
 					'vat_tx' => $tva_tx, // default_vat_code should be used in priority in a future
 					'npr' => $npr, // default_vat_code should be used in priority in a future
-				    'localtaxes_array' => array('0'=>$localtax1_type, '1'=>$localtax1, '2'=>$localtax2_type, '3'=>$localtax2)  // default_vat_code should be used in priority in a future
+					'localtaxes_array' => array('0'=>$localtax1_type, '1'=>$localtax1, '2'=>$localtax2_type, '3'=>$localtax2)  // default_vat_code should be used in priority in a future
 				);
 
 				//If autogeneration is enabled, then we only set the first level
@@ -275,10 +280,14 @@ if (empty($reshook))
 			}
 		} elseif (!$error)
 		{
+			$newprice = price2num(GETPOST('price', 'alpha'), '', 2);
+			$newprice_min = price2num(GETPOST('price_min', 'alpha'), '', 2);
+			$newpricebase = GETPOST('price_base_type', 'alpha');
 			$tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
 
 			$tva_tx = $tva_tx_txt;
 			$vatratecode = '';
+			$reg = array();
 			if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
 			{
 				$vat_src_code = $reg[1];
@@ -286,45 +295,45 @@ if (empty($reshook))
 			}
 			$tva_tx = price2num(preg_replace('/\*/', '', $tva_tx)); // keep remove all after the numbers and dot
 
-		    $npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
-		    $localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
-		    // If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
-		    if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
-		    {
-		        // We look into database using code
-		        $vatratecode = $reg[1];
-		        // Get record from code
-		        $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
-		        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-		        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
-		        $sql .= " AND t.taux = ".$tva_tx." AND t.active = 1";
-		        $sql .= " AND t.code ='".$db->escape($vatratecode)."'";
-		        $resql = $db->query($sql);
-		        if ($resql)
-		        {
-		            $obj = $db->fetch_object($resql);
-		            $npr = $obj->recuperableonly;
-		            $localtax1 = $obj->localtax1;
-		            $localtax2 = $obj->localtax2;
-		            $localtax1_type = $obj->localtax1_type;
-		            $localtax2_type = $obj->localtax2_type;
+			$npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
+			$localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
+			// If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
+			if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
+			{
+				// We look into database using code
+				$vatratecode = $reg[1];
+				// Get record from code
+				$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+				$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+				$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+				$sql .= " AND t.taux = ".$tva_tx." AND t.active = 1";
+				$sql .= " AND t.code ='".$db->escape($vatratecode)."'";
+				$resql = $db->query($sql);
+				if ($resql)
+				{
+					$obj = $db->fetch_object($resql);
+					$npr = $obj->recuperableonly;
+					$localtax1 = $obj->localtax1;
+					$localtax2 = $obj->localtax2;
+					$localtax1_type = $obj->localtax1_type;
+					$localtax2_type = $obj->localtax2_type;
 
-		            // If spain, we don't use the localtax found into tax record in database with same code, but using the get_localtax rule
-		            if (in_array($mysoc->country_code, array('ES')))
-		            {
-    		            $localtax1 = get_localtax($tva_tx, 1);
-	   	                $localtax2 = get_localtax($tva_tx, 2);
-		            }
-		        }
-		    }
+					// If spain, we don't use the localtax found into tax record in database with same code, but using the get_localtax rule
+					if (in_array($mysoc->country_code, array('ES')))
+					{
+						$localtax1 = get_localtax($tva_tx, 1);
+	   					$localtax2 = get_localtax($tva_tx, 2);
+					}
+				}
+			}
 			$pricestoupdate[0] = array(
-				'price' => $_POST["price"],
-				'price_min' => $_POST["price_min"],
-				'price_base_type' => $_POST["price_base_type"],
-			    'default_vat_code' => $vatratecode,
+				'price' => $newprice,
+				'price_min' => $newprice_min,
+				'price_base_type' => $newpricebase,
+				'default_vat_code' => $vatratecode,
 				'vat_tx' => $tva_tx, // default_vat_code should be used in priority in a future
 				'npr' => $npr, // default_vat_code should be used in priority in a future
-			    'localtaxes_array' => array('0'=>$localtax1_type, '1'=>$localtax1, '2'=>$localtax2_type, '3'=>$localtax2)   // default_vat_code should be used in priority in a future
+				'localtaxes_array' => array('0'=>$localtax1_type, '1'=>$localtax1, '2'=>$localtax2_type, '3'=>$localtax2)   // default_vat_code should be used in priority in a future
 			);
 		}
 
@@ -348,7 +357,7 @@ if (empty($reshook))
 				}
 
 				if ($object->multiprices[$key] != $newprice || $object->multiprices_min[$key] != $newprice_min || $object->multiprices_base_type[$key] != $val['price_base_type'])
-       				$res = $object->updatePrice($newprice, $val['price_base_type'], $user, $val['vat_tx'], $newprice_min, $key, $val['npr'], $psq, 0, $val['localtaxes_array'], $val['default_vat_code']);
+	   				$res = $object->updatePrice($newprice, $val['price_base_type'], $user, $val['vat_tx'], $newprice_min, $key, $val['npr'], $psq, 0, $val['localtaxes_array'], $val['default_vat_code']);
 				else $res = 0;
 
 
@@ -470,12 +479,11 @@ if (empty($reshook))
 
 			$result = $db->query($sql);
 		} else {
-			setEventMessages(('delete_price_by_qty'.$langs->transnoentities(MissingIds)), null, 'errors');
+			setEventMessages(('delete_price_by_qty'.$langs->transnoentities('MissingIds')), null, 'errors');
 		}
 	}
 
-	if ($action == 'delete_all_price_by_qty')
-	{
+	if ($action == 'delete_all_price_by_qty') {
 		$priceid = GETPOST('priceid', 'int');
 		if (!empty($rowid)) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_price_by_qty";
@@ -483,7 +491,7 @@ if (empty($reshook))
 
 			$result = $db->query($sql);
 		} else {
-			setEventMessages(('delete_price_by_qty'.$langs->transnoentities(MissingIds)), null, 'errors');
+			setEventMessages(('delete_price_by_qty'.$langs->transnoentities('MissingIds')), null, 'errors');
 		}
 	}
 
@@ -520,24 +528,24 @@ if (empty($reshook))
 		// If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
 		if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
 		{
-		    // We look into database using code
-		    $vatratecode = $reg[1];
-		    // Get record from code
-		    $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-		    $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
-		    $sql .= " AND t.taux = ".$tva_tx." AND t.active = 1";
-		    $sql .= " AND t.code ='".$db->escape($vatratecode)."'";
-		    $resql = $db->query($sql);
-		    if ($resql)
-		    {
-		        $obj = $db->fetch_object($resql);
-		        $npr = $obj->recuperableonly;
-		        $localtax1 = $obj->localtax1;
-		        $localtax2 = $obj->localtax2;
-		        $localtax1_type = $obj->localtax1_type;
-		        $localtax2_type = $obj->localtax2_type;
-		    }
+			// We look into database using code
+			$vatratecode = $reg[1];
+			// Get record from code
+			$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+			$sql .= " AND t.taux = ".$tva_tx." AND t.active = 1";
+			$sql .= " AND t.code ='".$db->escape($vatratecode)."'";
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$obj = $db->fetch_object($resql);
+				$npr = $obj->recuperableonly;
+				$localtax1 = $obj->localtax1;
+				$localtax2 = $obj->localtax2;
+				$localtax1_type = $obj->localtax1_type;
+				$localtax2_type = $obj->localtax2_type;
+			}
 		}
 
 		$prodcustprice->default_vat_code = $vatratecode;
@@ -550,14 +558,14 @@ if (empty($reshook))
 
 		if (!($prodcustprice->fk_soc > 0))
 		{
-		    $langs->load("errors");
-		    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty")), null, 'errors');
-		    $error++;
-		    $action = 'add_customer_price';
+			$langs->load("errors");
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty")), null, 'errors');
+			$error++;
+			$action = 'add_customer_price';
 		}
 		if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE) && $prodcustprice->price_min < $maxpricesupplier)
 		{
-		    $langs->load("errors");
+			$langs->load("errors");
 			setEventMessages($langs->trans("MinimumPriceLimit", price($maxpricesupplier, 0, '', 1, -1, -1, 'auto')), null, 'errors');
 			$error++;
 			$action = 'add_customer_price';
@@ -620,24 +628,24 @@ if (empty($reshook))
 		// If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
 		if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
 		{
-		    // We look into database using code
-		    $vatratecode = $reg[1];
-		    // Get record from code
-		    $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-		    $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
-		    $sql .= " AND t.taux = ".$tva_tx." AND t.active = 1";
-		    $sql .= " AND t.code ='".$db->escape($vatratecode)."'";
-		    $resql = $db->query($sql);
-		    if ($resql)
-		    {
-		        $obj = $db->fetch_object($resql);
-		        $npr = $obj->recuperableonly;
-		        $localtax1 = $obj->localtax1;
-		        $localtax2 = $obj->localtax2;
-		        $localtax1_type = $obj->localtax1_type;
-		        $localtax2_type = $obj->localtax2_type;
-		    }
+			// We look into database using code
+			$vatratecode = $reg[1];
+			// Get record from code
+			$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+			$sql .= " AND t.taux = ".$tva_tx." AND t.active = 1";
+			$sql .= " AND t.code ='".$db->escape($vatratecode)."'";
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$obj = $db->fetch_object($resql);
+				$npr = $obj->recuperableonly;
+				$localtax1 = $obj->localtax1;
+				$localtax2 = $obj->localtax2;
+				$localtax1_type = $obj->localtax1_type;
+				$localtax2_type = $obj->localtax2_type;
+			}
 		}
 
 		$prodcustprice->default_vat_code = $vatratecode;
@@ -662,7 +670,7 @@ if (empty($reshook))
 			if ($result < 0) {
 				setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
 			} else {
-				setEventMessages($langs->trans('Save'), null, 'mesgs');
+				setEventMessages($langs->trans("Save"), null, 'mesgs');
 			}
 
 			$action = '';
@@ -703,7 +711,7 @@ $head = product_prepare_head($object);
 $titre = $langs->trans("CardProduct".$object->type);
 $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
 
-dol_fiche_head($head, 'price', $titre, -1, $picto);
+print dol_get_fiche_head($head, 'price', $titre, -1, $picto);
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 $object->next_prev_filter = " fk_product_type = ".$object->type;
@@ -770,22 +778,22 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			//print vatrate($object->multiprices_tva_tx[$soc->price_level], true);
 			print '</td></tr>';
 		} else {
-        	// TVA
-        	print '<tr><td>'.$langs->trans("DefaultTaxRate").'</td><td>';
+			// TVA
+			print '<tr><td>'.$langs->trans("DefaultTaxRate").'</td><td>';
 
-        	$positiverates = '';
-        	if (price2num($object->tva_tx))         $positiverates .= ($positiverates ? '/' : '').price2num($object->tva_tx);
-        	if (price2num($object->localtax1_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax1_tx);
-        	if (price2num($object->localtax2_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax2_tx);
-        	if (empty($positiverates)) $positiverates = '0';
-        	echo vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), '%', $object->tva_npr);
+			$positiverates = '';
+			if (price2num($object->tva_tx))         $positiverates .= ($positiverates ? '/' : '').price2num($object->tva_tx);
+			if (price2num($object->localtax1_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax1_tx);
+			if (price2num($object->localtax2_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax2_tx);
+			if (empty($positiverates)) $positiverates = '0';
+			echo vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), '%', $object->tva_npr);
 			/*
 			if ($object->default_vat_code)
 	        {
 	            print vatrate($object->tva_tx, true) . ' ('.$object->default_vat_code.')';
 	        }
         	else print vatrate($object->tva_tx . ($object->tva_npr ? '*' : ''), true);*/
-        	print '</td></tr>';
+			print '</td></tr>';
 		}
 	} else {
 		if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
@@ -795,28 +803,28 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			print '<td colspan="2">'.vatrate($object->multiprices_tva_tx[1], true).'</td>';
 			print '</tr>';
 		} else {
-            // TVA
-	        print '<tr><td class="titlefield">'.$langs->trans("DefaultTaxRate").'</td><td>';
+			// TVA
+			print '<tr><td class="titlefield">'.$langs->trans("DefaultTaxRate").'</td><td>';
 
-	        $positiverates = '';
-	        if (price2num($object->tva_tx))         $positiverates .= ($positiverates ? '/' : '').price2num($object->tva_tx);
-	        if (price2num($object->localtax1_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax1_tx);
-	        if (price2num($object->localtax2_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax2_tx);
-	        if (empty($positiverates)) $positiverates = '0';
-	        echo vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), '%', $object->tva_npr);
-	        /*
+			$positiverates = '';
+			if (price2num($object->tva_tx))         $positiverates .= ($positiverates ? '/' : '').price2num($object->tva_tx);
+			if (price2num($object->localtax1_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax1_tx);
+			if (price2num($object->localtax2_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax2_tx);
+			if (empty($positiverates)) $positiverates = '0';
+			echo vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), '%', $object->tva_npr);
+			/*
 	        if ($object->default_vat_code)
 	        {
 	            print vatrate($object->tva_tx, true) . ' ('.$object->default_vat_code.')';
 	        }
 	        else print vatrate($object->tva_tx . ($object->tva_npr ? '*' : ''), true);*/
-	        print '</td></tr>';
+			print '</td></tr>';
 		}
-	    print '</table>';
+		print '</table>';
 
-	    print '<br>';
+		print '<br>';
 
-	    print '<table class="noborder tableforfield" width="100%">';
+		print '<table class="noborder tableforfield" width="100%">';
 		print '<tr class="liste_titre"><td>';
 		print $langs->trans("PriceLevel");
 		if ($user->admin) print ' <a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editlabelsellingprice&amp;pricelevel='.$i.'&amp;id='.$object->id.'">'.img_edit($langs->trans('EditSellingPriceLabel'), 0).'</a>';
@@ -834,17 +842,17 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			$keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.$i;
 			if (preg_match('/editlabelsellingprice/', $action))
 			{
-			    print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
-			    print '<input type="hidden" name="token" value="'.newToken().'">';
-			    print '<input type="hidden" name="action" value="setlabelsellingprice">';
-			    print '<input type="hidden" name="pricelevel" value="'.$i.'">';
-			    print $langs->trans("SellingPrice").' '.$i.' - ';
-			    print '<input size="10" class="maxwidthonsmartphone" type="text" name="labelsellingprice" value="'.$conf->global->$keyforlabel.'">';
-			    print '&nbsp;<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-			    print '</form>';
+				print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input type="hidden" name="action" value="setlabelsellingprice">';
+				print '<input type="hidden" name="pricelevel" value="'.$i.'">';
+				print $langs->trans("SellingPrice").' '.$i.' - ';
+				print '<input size="10" class="maxwidthonsmartphone" type="text" name="labelsellingprice" value="'.$conf->global->$keyforlabel.'">';
+				print '&nbsp;<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+				print '</form>';
 			} else {
-			    print $langs->trans("SellingPrice").' '.$i;
-			    if (!empty($conf->global->$keyforlabel)) print ' - '.$langs->trans($conf->global->$keyforlabel);
+				print $langs->trans("SellingPrice").' '.$i;
+				if (!empty($conf->global->$keyforlabel)) print ' - '.$langs->trans($conf->global->$keyforlabel);
 			}
 			print '</td>';
 
@@ -875,7 +883,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))      // TODO Fix the form included into a tr instead of a td
 			{
 				print '<tr><td>'.$langs->trans("PriceByQuantity").' '.$i;
-			    if (!empty($conf->global->$keyforlabel)) print ' - '.$langs->trans($conf->global->$keyforlabel);
+				if (!empty($conf->global->$keyforlabel)) print ' - '.$langs->trans($conf->global->$keyforlabel);
 				print '</td><td colspan="2">';
 
 				if ($object->prices_by_qty[$i] == 1) {
@@ -1087,7 +1095,7 @@ print '</div>';
 print '<div style="clear:both"></div>';
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 
@@ -1102,7 +1110,7 @@ if (!$action || $action == 'delete' || $action == 'showlog_customer_price' || $a
 {
 	print "\n".'<div class="tabsAction">'."\n";
 
-    if ($object->isVariant()) {
+	if ($object->isVariant()) {
 		if ($user->rights->produit->creer || $user->rights->service->creer) {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEditVariants")).'">'.$langs->trans("UpdateDefaultPrice").'</a></div>';
 		}
@@ -1128,7 +1136,7 @@ if (!$action || $action == 'delete' || $action == 'showlog_customer_price' || $a
 				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit_price&amp;id='.$object->id.'">'.$langs->trans("UpdateLevelPrices").'</a></div>';
 			}
 		}
-    }
+	}
 
 	print "\n</div>\n";
 }
@@ -1148,7 +1156,7 @@ if ($action == 'edit_vat' && ($user->rights->produit->creer || $user->rights->se
 	print '<input type="hidden" name="action" value="update_vat">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-	dol_fiche_head('');
+	print dol_get_fiche_head('');
 
 	print '<table class="border centpercent">';
 
@@ -1159,12 +1167,12 @@ if ($action == 'edit_vat' && ($user->rights->produit->creer || $user->rights->se
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+	print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '<br></form><br>';
@@ -1176,13 +1184,13 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 
 	if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
 	{
-	    print '<!-- Edit price -->'."\n";
+		print '<!-- Edit price -->'."\n";
 		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="update_price">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-		dol_fiche_head('');
+		print dol_get_fiche_head('');
 
 		print '<table class="border centpercent">';
 
@@ -1262,7 +1270,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 		}
 		if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
 		{
-		    print ' &nbsp; '.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier, 0, '', 1, -1, -1, 'auto')).' '.img_warning().'</td>';
+			print ' &nbsp; '.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier, 0, '', 1, -1, -1, 'auto')).' '.img_warning().'</td>';
 		}
 		print '</td>';
 		print '</tr>';
@@ -1272,18 +1280,18 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 
 		print '</table>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
-		print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+		print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 
 		print '<br></form>';
 	} else {
-	    print '<!-- Edit price per level -->'."\n";
-	    ?>
+		print '<!-- Edit price per level -->'."\n";
+		?>
 		<script>
 
 			var showHidePriceRules = function () {
@@ -1312,7 +1320,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 		print '<input type="hidden" name="action" value="update_price">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-		//dol_fiche_head('', '', '', -1);
+		//print dol_get_fiche_head('', '', '', -1);
 
 		if ((!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && !empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL)) {
 			print $langs->trans('UseMultipriceRules').' <input type="checkbox" id="usePriceRules" name="usePriceRules" '.($object->price_autogen ? 'checked' : '').'><br><br>';
@@ -1347,14 +1355,14 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 
 			// VAT
 			if (empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {
-			    print '<td>';
-			    print '<input type="hidden" name="tva_tx['.$i.']" value="'.($object->default_vat_code ? $object->tva_tx.' ('.$object->default_vat_code.')' : $object->tva_tx).'">';
-			    print '<input type="hidden" name="tva_npr['.$i.']" value="'.$object->tva_npr.'">';
-			    print '<input type="hidden" name="localtax1_tx['.$i.']" value="'.$object->localtax1_tx.'">';
-			    print '<input type="hidden" name="localtax1_type['.$i.']" value="'.$object->localtax1_type.'">';
-			    print '<input type="hidden" name="localtax2_tx['.$i.']" value="'.$object->localtax2_tx.'">';
-			    print '<input type="hidden" name="localtax2_type['.$i.']" value="'.$object->localtax2_type.'">';
-			    print '</td>';
+				print '<td>';
+				print '<input type="hidden" name="tva_tx['.$i.']" value="'.($object->default_vat_code ? $object->tva_tx.' ('.$object->default_vat_code.')' : $object->tva_tx).'">';
+				print '<input type="hidden" name="tva_npr['.$i.']" value="'.$object->tva_npr.'">';
+				print '<input type="hidden" name="localtax1_tx['.$i.']" value="'.$object->localtax1_tx.'">';
+				print '<input type="hidden" name="localtax1_type['.$i.']" value="'.$object->localtax1_type.'">';
+				print '<input type="hidden" name="localtax2_tx['.$i.']" value="'.$object->localtax2_tx.'">';
+				print '<input type="hidden" name="localtax2_type['.$i.']" value="'.$object->localtax2_type.'">';
+				print '</td>';
 			} else {
 				// This option is kept for backward compatibility but has no sense
 				print '<td style="text-align: center">';
@@ -1392,12 +1400,12 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 
 		print '</table>';
 
-		//dol_fiche_end();
+		//print dol_get_fiche_end();
 
 		print '<div style="text-align: center">';
-		print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+		print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 		print '&nbsp;&nbsp;&nbsp;';
-		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
+		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
 		print '</form>';
 	}
 }
@@ -1407,211 +1415,208 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 
 if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_default_price') && !in_array($action, array('edit_price', 'edit_vat')))
 {
-    $sql = "SELECT p.rowid, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.default_vat_code, p.recuperableonly, p.localtax1_tx, p.localtax1_type, p.localtax2_tx, p.localtax2_type,";
-    $sql .= " p.price_level, p.price_min, p.price_min_ttc,p.price_by_qty,";
-    $sql .= " p.date_price as dp, p.fk_price_expression, u.rowid as user_id, u.login";
-    $sql .= " FROM ".MAIN_DB_PREFIX."product_price as p,";
-    $sql .= " ".MAIN_DB_PREFIX."user as u";
-    $sql .= " WHERE fk_product = ".$object->id;
-    $sql .= " AND p.entity IN (".getEntity('productprice').")";
-    $sql .= " AND p.fk_user_author = u.rowid";
-    if (!empty($socid) && !empty($conf->global->PRODUIT_MULTIPRICES)) $sql .= " AND p.price_level = ".$soc->price_level;
-    $sql .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
-    // $sql .= $db->plimit();
+	$sql = "SELECT p.rowid, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.default_vat_code, p.recuperableonly, p.localtax1_tx, p.localtax1_type, p.localtax2_tx, p.localtax2_type,";
+	$sql .= " p.price_level, p.price_min, p.price_min_ttc,p.price_by_qty,";
+	$sql .= " p.date_price as dp, p.fk_price_expression, u.rowid as user_id, u.login";
+	$sql .= " FROM ".MAIN_DB_PREFIX."product_price as p,";
+	$sql .= " ".MAIN_DB_PREFIX."user as u";
+	$sql .= " WHERE fk_product = ".$object->id;
+	$sql .= " AND p.entity IN (".getEntity('productprice').")";
+	$sql .= " AND p.fk_user_author = u.rowid";
+	if (!empty($socid) && !empty($conf->global->PRODUIT_MULTIPRICES)) $sql .= " AND p.price_level = ".$soc->price_level;
+	$sql .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
+	// $sql .= $db->plimit();
 
-    $result = $db->query($sql);
-    if ($result)
-    {
-        print '<div class="divlogofpreviouscustomerprice">';
+	$result = $db->query($sql);
+	if ($result)
+	{
+		print '<div class="divlogofpreviouscustomerprice">';
 
-        $num = $db->num_rows($result);
+		$num = $db->num_rows($result);
 
-    	if (!$num)
-    	{
-    		$db->free($result);
+		if (!$num)
+		{
+			$db->free($result);
 
-    		// Il doit au moins y avoir la ligne de prix initial.
-    		// On l'ajoute donc pour remettre a niveau (pb vieilles versions)
-    		//$object->updatePrice($object->price, $object->price_base_type, $user, $object->tva_tx, $object->price_min);
-            if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
-            	$object->updatePrice($object->multiprices[1], $object->multiprices_base_type[1], $user, (empty($object->multiprices_tva_tx[1]) ? 0 : $object->multiprices_tva_tx[1]), $object->multiprices_min[1], 1);
-            } else {
-                $object->updatePrice($object->price, $object->price_base_type, $user, $object->tva_tx, $object->price_min);
-            }
+			// Il doit au moins y avoir la ligne de prix initial.
+			// On l'ajoute donc pour remettre a niveau (pb vieilles versions)
+			//$object->updatePrice($object->price, $object->price_base_type, $user, $object->tva_tx, $object->price_min);
+			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+				$object->updatePrice($object->multiprices[1], $object->multiprices_base_type[1], $user, (empty($object->multiprices_tva_tx[1]) ? 0 : $object->multiprices_tva_tx[1]), $object->multiprices_min[1], 1);
+			} else {
+				$object->updatePrice($object->price, $object->price_base_type, $user, $object->tva_tx, $object->price_min);
+			}
 
-    		$result = $db->query($sql);
-    		$num = $db->num_rows($result);
-    	}
+			$result = $db->query($sql);
+			$num = $db->num_rows($result);
+		}
 
-    	if ($num > 0)
-    	{
-    	    // Default prices or
-    	    // Log of previous customer prices
-    	    $backbutton = '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">'.$langs->trans("Back").'</a>';
+		if ($num > 0) {
+			// Default prices or
+			// Log of previous customer prices
+			$backbutton = '<a class="justalink" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">'.$langs->trans("Back").'</a>';
 
-    		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print_barre_liste($langs->trans("DefaultPrice"), 0, $_SERVER["PHP_SELF"], '', '', '', $backbutton, 0, $num, 'title_accountancy.png');
-    		else print_barre_liste($langs->trans("PriceByCustomerLog"), 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, $num, 'title_accountancy.png');
-    	    //if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print_barre_liste($langs->trans("DefaultPrice"),'','','','','',$backbutton, 0, 0, 'title_accountancy.png');
-    		//else print_barre_liste($langs->trans("PriceByCustomerLog"),'','','','','','', 0, 0, 'title_accountancy.png');
+			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print_barre_liste($langs->trans("DefaultPriceLog"), 0, $_SERVER["PHP_SELF"], '', '', '', $backbutton, 0, $num, 'title_accountancy.png');
+			else print_barre_liste($langs->trans("PriceByCustomerLog"), 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, $num, 'title_accountancy.png');
 
-    		print '<div class="div-table-responsive">';
-    		print '<table class="noborder centpercent">';
+			print '<div class="div-table-responsive">';
+			print '<table class="noborder centpercent">';
 
-    		print '<tr class="liste_titre">';
-    		print '<td>'.$langs->trans("AppliedPricesFrom").'</td>';
+			print '<tr class="liste_titre">';
+			print '<td>'.$langs->trans("AppliedPricesFrom").'</td>';
 
-    		if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
-    			print '<td class="center">'.$langs->trans("PriceLevel").'</td>';
-    		}
-    		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
-    			print '<td class="center">'.$langs->trans("Type").'</td>';
-    		}
+			if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+				print '<td class="center">'.$langs->trans("PriceLevel").'</td>';
+			}
+			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+				print '<td class="center">'.$langs->trans("Type").'</td>';
+			}
 
-    		print '<td class="center">'.$langs->trans("PriceBase").'</td>';
-    		print $conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL;
-    		if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) print '<td class="right">'.$langs->trans("DefaultTaxRate").'</td>';
-    		print '<td class="right">'.$langs->trans("HT").'</td>';
-    		print '<td class="right">'.$langs->trans("TTC").'</td>';
-    		if (!empty($conf->dynamicprices->enabled)) {
-    			print '<td class="right">'.$langs->trans("PriceExpressionSelected").'</td>';
-    		}
-    		print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("HT").'</td>';
-    		print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("TTC").'</td>';
-    		print '<td class="right">'.$langs->trans("ChangedBy").'</td>';
-    		if ($user->rights->produit->supprimer)
-    			print '<td class="right">&nbsp;</td>';
-    		print '</tr>';
+			print '<td class="center">'.$langs->trans("PriceBase").'</td>';
+			print $conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL;
+			if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) print '<td class="right">'.$langs->trans("DefaultTaxRate").'</td>';
+			print '<td class="right">'.$langs->trans("HT").'</td>';
+			print '<td class="right">'.$langs->trans("TTC").'</td>';
+			if (!empty($conf->dynamicprices->enabled)) {
+				print '<td class="right">'.$langs->trans("PriceExpressionSelected").'</td>';
+			}
+			print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("HT").'</td>';
+			print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("TTC").'</td>';
+			print '<td class="right">'.$langs->trans("ChangedBy").'</td>';
+			if ($user->rights->produit->supprimer)
+				print '<td class="right">&nbsp;</td>';
+			print '</tr>';
 
-    		$notfirstlineforlevel = array();
+			$notfirstlineforlevel = array();
 
-    		$i = 0;
-    		while ($i < $num)
-    		{
-    			$objp = $db->fetch_object($result);
+			$i = 0;
+			while ($i < $num)
+			{
+				$objp = $db->fetch_object($result);
 
-    			print '<tr class="oddeven">';
-    			// Date
-    			print "<td>".dol_print_date($db->jdate($objp->dp), "dayhour")."</td>";
+				print '<tr class="oddeven">';
+				// Date
+				print "<td>".dol_print_date($db->jdate($objp->dp), "dayhour")."</td>";
 
-    			// Price level
-    			if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
-    				print '<td class="center">'.$objp->price_level."</td>";
-    			}
-    			// Price by quantity
-    			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
-    			{
-    				$type = ($objp->price_by_qty == 1) ? 'PriceByQuantity' : 'Standard';
-    				print '<td class="center">'.$langs->trans($type)."</td>";
-    			}
+				// Price level
+				if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+					print '<td class="center">'.$objp->price_level."</td>";
+				}
+				// Price by quantity
+				if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
+				{
+					$type = ($objp->price_by_qty == 1) ? 'PriceByQuantity' : 'Standard';
+					print '<td class="center">'.$langs->trans($type)."</td>";
+				}
 
-    			print '<td class="center">';
-    			if (empty($objp->price_by_qty)) {
-	    			print $langs->trans($objp->price_base_type);
-    			}
-    			print "</td>";
+				print '<td class="center">';
+				if (empty($objp->price_by_qty)) {
+					print $langs->trans($objp->price_base_type);
+				}
+				print "</td>";
 
-    			if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
-    			{
-    			    print '<td class="right">';
+				if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
+				{
+					print '<td class="right">';
 
-    			    if (empty($objp->price_by_qty)) {
-	    			    $positiverates = '';
-	    			    if (price2num($objp->tva_tx))         $positiverates .= ($positiverates ? '/' : '').price2num($objp->tva_tx);
-	    			    if (price2num($objp->localtax1_type)) $positiverates .= ($positiverates ? '/' : '').price2num($objp->localtax1_tx);
-	    			    if (price2num($objp->localtax2_type)) $positiverates .= ($positiverates ? '/' : '').price2num($objp->localtax2_tx);
-	    			    if (empty($positiverates)) $positiverates = '0';
-	    			    echo vatrate($positiverates.($objp->default_vat_code ? ' ('.$objp->default_vat_code.')' : ''), '%', $objp->tva_npr);
+					if (empty($objp->price_by_qty)) {
+						$positiverates = '';
+						if (price2num($objp->tva_tx))         $positiverates .= ($positiverates ? '/' : '').price2num($objp->tva_tx);
+						if (price2num($objp->localtax1_type)) $positiverates .= ($positiverates ? '/' : '').price2num($objp->localtax1_tx);
+						if (price2num($objp->localtax2_type)) $positiverates .= ($positiverates ? '/' : '').price2num($objp->localtax2_tx);
+						if (empty($positiverates)) $positiverates = '0';
+						echo vatrate($positiverates.($objp->default_vat_code ? ' ('.$objp->default_vat_code.')' : ''), '%', $objp->tva_npr);
 						/*
 	    			    if ($objp->default_vat_code)
 	    			    {
 	    			        print vatrate($objp->tva_tx, true) . ' ('.$objp->default_vat_code.')';
 	    			    }
 	    			    else print vatrate($objp->tva_tx, true, $objp->recuperableonly);*/
-    			    }
+					}
 
-    			    print "</td>";
-    			}
+					print "</td>";
+				}
 
-    			// Price
-    			if (!empty($objp->fk_price_expression) && !empty($conf->dynamicprices->enabled))
-    			{
-    				$price_expression = new PriceExpression($db);
-    				$res = $price_expression->fetch($objp->fk_price_expression);
-    				$title = $price_expression->title;
-    				print '<td class="right"></td>';
-    				print '<td class="right"></td>';
-    				print '<td class="right">'.$title."</td>";
-    			} else {
-    				print '<td class="right">';
-    				if (empty($objp->price_by_qty)) {
-    					print price($objp->price);
-    				}
-    				print "</td>";
-    				print '<td class="right">';
-    				if (empty($objp->price_by_qty)) {
-    					print price($objp->price_ttc);
-    				}
-    				print "</td>";
-    				if (!empty($conf->dynamicprices->enabled)) { //Only if module is enabled
-    					print '<td class="right"></td>';
-    				}
-    			}
+				// Price
+				if (!empty($objp->fk_price_expression) && !empty($conf->dynamicprices->enabled))
+				{
+					$price_expression = new PriceExpression($db);
+					$res = $price_expression->fetch($objp->fk_price_expression);
+					$title = $price_expression->title;
+					print '<td class="right"></td>';
+					print '<td class="right"></td>';
+					print '<td class="right">'.$title."</td>";
+				} else {
+					print '<td class="right">';
+					if (empty($objp->price_by_qty)) {
+						print price($objp->price);
+					}
+					print "</td>";
+					print '<td class="right">';
+					if (empty($objp->price_by_qty)) {
+						print price($objp->price_ttc);
+					}
+					print "</td>";
+					if (!empty($conf->dynamicprices->enabled)) { //Only if module is enabled
+						print '<td class="right"></td>';
+					}
+				}
 
-    			print '<td class="right">';
-    			if (empty($objp->price_by_qty)) {
-    				print price($objp->price_min);
-    			}
-    			print '</td>';
+				print '<td class="right">';
+				if (empty($objp->price_by_qty)) {
+					print price($objp->price_min);
+				}
+				print '</td>';
 
-    			print '<td class="right">';
-    			if (empty($objp->price_by_qty)) {
-    				print price($objp->price_min_ttc);
-    			}
-    			print '</td>';
+				print '<td class="right">';
+				if (empty($objp->price_by_qty)) {
+					print price($objp->price_min_ttc);
+				}
+				print '</td>';
 
-    			// User
-    			print '<td class="right">';
-    			if ($objp->user_id > 0) {
-	    			$userstatic = new User($db);
-	    			$userstatic->fetch($objp->user_id);
-	    			print $userstatic->getNomUrl(1, '', 0, 0, 24, 0, 'login');
-    			}
-    			print '</td>';
+				// User
+				print '<td class="right">';
+				if ($objp->user_id > 0) {
+					$userstatic = new User($db);
+					$userstatic->fetch($objp->user_id);
+					print $userstatic->getNomUrl(1, '', 0, 0, 24, 0, 'login');
+				}
+				print '</td>';
 
-    			// Action
-    			if ($user->rights->produit->supprimer)
-    			{
-    			    $candelete = 0;
-    			    if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
-    			    {
-    			        if (empty($notfirstlineforlevel[$objp->price_level])) $notfirstlineforlevel[$objp->price_level] = 1;
-    			        else $candelete = 1;
-    			    } elseif ($i > 0) $candelete = 1;
+				// Action
+				if ($user->rights->produit->supprimer)
+				{
+					$candelete = 0;
+					if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
+					{
+						if (empty($notfirstlineforlevel[$objp->price_level])) $notfirstlineforlevel[$objp->price_level] = 1;
+						else $candelete = 1;
+					} elseif ($i > 0) $candelete = 1;
 
-    				print '<td class="right">';
-    				if ($candelete)
-    				{
-    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;token='.newToken().'&amp;id='.$object->id.'&amp;lineid='.$objp->rowid.'">';
-    					print img_delete();
-    					print '</a>';
-    				} else print '&nbsp;'; // Can not delete last price (it's current price)
-    				print '</td>';
-    			}
+					print '<td class="right">';
+					if ($candelete)
+					{
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;token='.newToken().'&amp;id='.$object->id.'&amp;lineid='.$objp->rowid.'">';
+						print img_delete();
+						print '</a>';
+					} else print '&nbsp;'; // Can not delete last price (it's current price)
+					print '</td>';
+				}
 
-    			print "</tr>\n";
-    			$i++;
-    		}
+				print "</tr>\n";
+				$i++;
+			}
 
-    		$db->free($result);
-    		print "</table>";
-    		print '</div>';
-    		print "<br>";
-    	}
+			$db->free($result);
+			print "</table>";
+			print '</div>';
+			print "<br>";
+		}
 
-    	print '</div>';
-    } else {
-    	dol_print_error($db);
-    }
+		print '</div>';
+	} else {
+		dol_print_error($db);
+	}
 }
 
 
@@ -1652,7 +1657,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print '<input type="hidden" name="action" value="add_customer_price_confirm">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-		dol_fiche_head();
+		print dol_get_fiche_head();
 
 		print '<table class="border centpercent">';
 		print '<tr>';
@@ -1705,7 +1710,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 		print '</table>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
 
@@ -1715,9 +1720,9 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print $langs->trans('ForceUpdateChildPriceSoc');
 		print '</div>';
 
-		print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+		print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 
 		print '</form>';
@@ -1738,7 +1743,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print '<input type="hidden" name="action" value="update_customer_price_confirm">';
 		print '<input type="hidden" name="lineid" value="'.$prodcustprice->id.'">';
 
-		dol_fiche_head();
+		print dol_get_fiche_head();
 
 		print '<table class="border centpercent">';
 		print '<tr>';
@@ -1800,7 +1805,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 		print '</table>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
 		print '<div class="marginbottomonly">';
@@ -1808,9 +1813,9 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print $langs->trans('ForceUpdateChildPriceSoc');
 		print "</div>";
 
-		print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+		print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 
 		print '<br></form>';
@@ -1819,7 +1824,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		// List of all log of prices by customers
 		print '<!-- list of all log of prices per customer -->'."\n";
 
-	    $filter = array('t.fk_product' => $object->id, 't.fk_soc' => GETPOST('socid', 'int'));
+		$filter = array('t.fk_product' => $object->id, 't.fk_soc' => GETPOST('socid', 'int'));
 
 		// Count total nb of records
 		$nbtotalofrecords = '';
@@ -1873,18 +1878,18 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 			foreach ($prodcustprice->lines as $line)
 			{
-			    // Date
-			    $staticsoc = new Societe($db);
-			    $staticsoc->fetch($line->fk_soc);
+				// Date
+				$staticsoc = new Societe($db);
+				$staticsoc->fetch($line->fk_soc);
 
 				$tva_tx = $line->default_vat_code ? $line->tva_tx.' ('.$line->default_vat_code.')' : $line->tva_tx;
 
 				// Line for default price
 				if ($line->price_base_type == 'HT')
 				{
-				    $pu = $line->price;
+					$pu = $line->price;
 				} else {
-				    $pu = $line->price_ttc;
+					$pu = $line->price_ttc;
 				}
 
 				// Local tax is not saved into table of product. We use value linked to VAT code.
@@ -1902,7 +1907,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 				print "<td>".$staticsoc->getNomUrl(1)."</td>";
 				print "<td>".dol_print_date($line->datec, "dayhour")."</td>";
-    		    print '<td class="center">'.$langs->trans($line->price_base_type)."</td>";
+				print '<td class="center">'.$langs->trans($line->price_base_type)."</td>";
 				print '<td class="right">';
 
 				$positiverates = '';
@@ -1944,7 +1949,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 	} elseif ($action != 'showlog_default_price' && $action != 'edit_price')
 	{
 		// List of all prices by customers
-        print '<!-- list of all prices per customer -->'."\n";
+		print '<!-- list of all prices per customer -->'."\n";
 
 		// Count total nb of records
 		$nbtotalofrecords = '';
@@ -1969,18 +1974,18 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 		if (count($prodcustprice->lines) > 0 || $search_soc)
 		{
-		    $colspan = 8;
-		    //if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") $colspan++;
+			$colspan = 8;
+			//if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") $colspan++;
 
-    		print '<tr class="liste_titre">';
-    		print '<td class="liste_titre"><input type="text" class="flat" name="search_soc" value="'.$search_soc.'" size="20"></td>';
-    		print '<td class="liste_titre" colspan="'.$colspan.'">&nbsp;</td>';
-    		// Print the search button
-            print '<td class="liste_titre maxwidthsearch">';
-            $searchpicto = $form->showFilterAndCheckAddButtons(0);
-            print $searchpicto;
-            print '</td>';
-    		print '</tr>';
+			print '<tr class="liste_titre">';
+			print '<td class="liste_titre"><input type="text" class="flat" name="search_soc" value="'.$search_soc.'" size="20"></td>';
+			print '<td class="liste_titre" colspan="'.$colspan.'">&nbsp;</td>';
+			// Print the search button
+			print '<td class="liste_titre maxwidthsearch">';
+			$searchpicto = $form->showFilterAndCheckAddButtons(0);
+			print $searchpicto;
+			print '</td>';
+			print '</tr>';
 		}
 
 		print '<tr class="liste_titre">';
@@ -2006,9 +2011,9 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		// Line for default price
 		if ($object->price_base_type == 'HT')
 		{
-		    $pu = $object->price;
+			$pu = $object->price;
 		} else {
-		    $pu = $object->price_ttc;
+			$pu = $object->price_ttc;
 		}
 
 		// Local tax is not saved into table of product. We use value linked to VAT code.
@@ -2057,16 +2062,16 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print '</td>';
 		if ($user->rights->produit->supprimer || $user->rights->service->supprimer)
 		{
-		    print '<td class="right">';
-		    print '<a href="'.$_SERVER["PHP_SELF"].'?action=showlog_default_price&amp;id='.$object->id.'">';
-		    print img_info($langs->trans('PriceByCustomerLog'));
-		    print '</a>';
-		    print ' ';
-		    print '<a href="'.$_SERVER["PHP_SELF"].'?action=edit_price&amp;id='.$object->id.'">';
-		    print img_edit('default', 0, 'style="vertical-align: middle;"');
-		    print '</a>';
-		    print ' &nbsp; ';
-		    print '</td>';
+			print '<td class="right">';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=showlog_default_price&amp;id='.$object->id.'">';
+			print img_info($langs->trans('PriceByCustomerLog'));
+			print '</a>';
+			print ' ';
+			print '<a class="marginleftonly editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit_price&amp;id='.$object->id.'">';
+			print img_edit('default', 0, 'style="vertical-align: middle;"');
+			print '</a>';
+			print ' &nbsp; ';
+			print '</td>';
 		}
 		print "</tr>\n";
 
@@ -2083,9 +2088,9 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				// Line for default price
 				if ($line->price_base_type == 'HT')
 				{
-				    $pu = $line->price;
+					$pu = $line->price;
 				} else {
-				    $pu = $line->price_ttc;
+					$pu = $line->price_ttc;
 				}
 
 				// Local tax is not saved into table of product. We use value linked to VAT code.
@@ -2144,11 +2149,11 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 					print img_info($langs->trans('PriceByCustomerLog'));
 					print '</a>';
 					print ' ';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=edit_customer_price&amp;id='.$object->id.'&amp;lineid='.$line->id.'">';
+					print '<a class="marginleftonly editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit_customer_price&amp;id='.$object->id.'&amp;lineid='.$line->id.'">';
 					print img_edit('default', 0, 'style="vertical-align: middle;"');
 					print '</a>';
 					print ' ';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_customer_price&amp;token='.newToken().'&amp;id='.$object->id.'&amp;lineid='.$line->id.'">';
+					print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?action=delete_customer_price&amp;token='.newToken().'&amp;id='.$object->id.'&amp;lineid='.$line->id.'">';
 					print img_delete('default', 'style="vertical-align: middle;"');
 					print '</a>';
 					print '</td>';
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index f881a429d1a..715ad66e977 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -85,7 +85,7 @@ if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)
 	|| !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)
 	|| !empty($conf->mrp->enabled))
 {
-    $virtualdiffersfromphysical = 1; // According to increase/decrease stock options, virtual and physical stock may differs.
+	$virtualdiffersfromphysical = 1; // According to increase/decrease stock options, virtual and physical stock may differs.
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -99,16 +99,16 @@ $hookmanager->initHooks(array('productreassortlist'));
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-    $sref = "";
-    $snom = "";
-    $sall = "";
+	$sref = "";
+	$snom = "";
+	$sall = "";
 	$tosell = "";
 	$tobuy = "";
-    $search_sale = "";
-    $search_categ = "";
-    $type = "";
-    $catid = '';
-    $toolowstock = '';
+	$search_sale = "";
+	$search_categ = "";
+	$type = "";
+	$catid = '';
+	$toolowstock = '';
 	$fourn_id = '';
 	$sbarcode = '';
 }
@@ -131,7 +131,7 @@ $sql .= ' SUM(s.reel) as stock_physique';
 if (!empty($conf->global->PRODUCT_USE_UNITS)) $sql .= ', u.short_label as unit_short';
 // Add fields from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters);    // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s ON p.rowid = s.fk_product';
@@ -145,12 +145,12 @@ if ($sall) $sql .= natural_search(array('p.ref', 'p.label', 'p.description', 'p.
 // if the type is not 1, we show all products (type = 0,2,3)
 if (dol_strlen($type))
 {
-    if ($type == 1)
-    {
-        $sql .= " AND p.fk_product_type = '1'";
-    } else {
-        $sql .= " AND p.fk_product_type <> '1'";
-    }
+	if ($type == 1)
+	{
+		$sql .= " AND p.fk_product_type = '1'";
+	} else {
+		$sql .= " AND p.fk_product_type <> '1'";
+	}
 }
 if ($sref)     $sql .= natural_search('p.ref', $sref);
 if ($search_barcode) $sql .= natural_search('p.barcode', $search_barcode);
@@ -166,7 +166,7 @@ $sql .= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.p
 $sql .= " p.fk_product_type, p.tms, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock";
 // Add fields from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldSelect', $parameters);    // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldSelect', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 if ($toolowstock) $sql .= " HAVING SUM(".$db->ifsql('s.reel IS NULL', '0', 's.reel').") < p.seuil_stock_alerte";
 $sql .= $db->order($sortfield, $sortorder);
@@ -175,13 +175,13 @@ $sql .= $db->order($sortfield, $sortorder);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-    	$page = 0;
-    	$offset = 0;
-    }
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -229,19 +229,19 @@ if ($resql)
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="type" value="'.$type.'">';
 
 	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'product', 0, '', '', $limit);
 
 	if (!empty($catid))
 	{
-	    print "<div id='ways'>";
-	    $c = new Categorie($db);
-	    $c->fetch($catid);
-	    $ways = $c->print_all_ways(' &gt; ', 'product/reassort.php');
-	    print " &gt; ".$ways[0]."<br>\n";
-	    print "</div><br>";
+		print "<div id='ways'>";
+		$c = new Categorie($db);
+		$c->fetch($catid);
+		$ways = $c->print_all_ways(' &gt; ', 'product/reassort.php');
+		print " &gt; ".$ways[0]."<br>\n";
+		print "</div><br>";
 	}
 
 	// Filter on categories
@@ -258,15 +258,15 @@ if ($resql)
 	$moreforfilter .= $langs->trans("StockTooLow").' <input type="checkbox" name="toolowstock" value="1"'.($toolowstock ? ' checked' : '').'>';
 	$moreforfilter .= '</div>';
 
-    if (!empty($moreforfilter))
-    {
-        print '<div class="liste_titre liste_titre_bydiv centpercent">';
-        print $moreforfilter;
-        $parameters = array();
-        $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-        print '</div>';
-    }
+	if (!empty($moreforfilter))
+	{
+		print '<div class="liste_titre liste_titre_bydiv centpercent">';
+		print $moreforfilter;
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		print '</div>';
+	}
 
 	$param = '';
 	if ($tosell)	$param .= "&tosell=".urlencode($tosell);
@@ -285,7 +285,7 @@ if ($resql)
 	$colspan_warehouse = 1;
 	if (!empty($conf->global->STOCK_DETAIL_ON_WAREHOUSE)) { $colspan_warehouse = $nb_warehouse > 1 ? $nb_warehouse + 1 : 1; }
 
-    print '<div class="div-table-responsive">';
+	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">';
 
 	// Fields title search
@@ -312,7 +312,7 @@ if ($resql)
 	print '<td class="liste_titre" colspan="'.$colspan_warehouse.'">&nbsp;</td>';
 	print '<td class="liste_titre"></td>';
 	$parameters = array();
-	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters);    // Note that $action and $object may have been modified by hook
+	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	print '<td class="liste_titre maxwidthsearch">';
    	$searchpicto = $form->showFilterAndCheckAddButtons(0);
@@ -331,23 +331,23 @@ if ($resql)
 	// Details per warehouse
 	if (!empty($conf->global->STOCK_DETAIL_ON_WAREHOUSE))	// TODO This should be moved into the selection of fields on page product/list (page product/stock will be removed and replaced with product/list with its own context)
 	{
-	    if ($nb_warehouse > 1) {
-	        foreach ($warehouses_list as &$wh) {
-	            print_liste_field_titre($wh['label'], '', '', '', '', '', '', '', 'right ');
-	        }
-	    }
+		if ($nb_warehouse > 1) {
+			foreach ($warehouses_list as &$wh) {
+				print_liste_field_titre($wh['label'], '', '', '', '', '', '', '', 'right ');
+			}
+		}
 	}
 	if ($virtualdiffersfromphysical) print_liste_field_titre("VirtualStock", $_SERVER["PHP_SELF"], "", $param, "", '', $sortfield, $sortorder, 'right ', 'VirtualStockDesc');
-    // Units
-    if (!empty($conf->global->PRODUCT_USE_UNITS)) {
-        print_liste_field_titre("Unit", $_SERVER["PHP_SELF"], "unit_short", $param, "", 'align="right"', $sortfield, $sortorder);
-    }
+	// Units
+	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		print_liste_field_titre("Unit", $_SERVER["PHP_SELF"], "unit_short", $param, "", 'align="right"', $sortfield, $sortorder);
+	}
 	print_liste_field_titre('');
 	print_liste_field_titre("ProductStatusOnSell", $_SERVER["PHP_SELF"], "p.tosell", $param, "", '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("ProductStatusOnBuy", $_SERVER["PHP_SELF"], "p.tobuy", $param, "", '', $sortfield, $sortorder, 'right ');
 	// Hook fields
-	$parameters = array('param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
-	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters);    // Note that $action and $object may have been modified by hook
+	$parameters = array('param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	print_liste_field_titre('');
 	print "</tr>\n";
@@ -381,8 +381,8 @@ if ($resql)
 		print '<td class="right">'.$objp->desiredstock.'</td>';
 		// Real stock
 		print '<td class="right">';
-        if ($objp->seuil_stock_alerte != '' && ($objp->stock_physique < $objp->seuil_stock_alerte)) print img_warning($langs->trans("StockTooLow")).' ';
-        print price2num($objp->stock_physique, 'MS');
+		if ($objp->seuil_stock_alerte != '' && ($objp->stock_physique < $objp->seuil_stock_alerte)) print img_warning($langs->trans("StockTooLow")).' ';
+		print price2num($objp->stock_physique, 'MS');
 		print '</td>';
 
 		// Details per warehouse
@@ -405,19 +405,19 @@ if ($resql)
 			print price2num($product->stock_theorique, 'MS');
 			print '</td>';
 		}
-        // Units
-        if (!empty($conf->global->PRODUCT_USE_UNITS)) {
-            print '<td class="left">'.$objp->unit_short.'</td>';
-        }
+		// Units
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+			print '<td class="left">'.$objp->unit_short.'</td>';
+		}
 		print '<td class="right"><a href="'.DOL_URL_ROOT.'/product/stock/movement_list.php?idproduct='.$product->id.'">'.$langs->trans("Movements").'</a></td>';
 		print '<td class="right nowrap">'.$product->LibStatut($objp->statut, 5, 0).'</td>';
-        print '<td class="right nowrap">'.$product->LibStatut($objp->tobuy, 5, 1).'</td>';
+		print '<td class="right nowrap">'.$product->LibStatut($objp->tobuy, 5, 1).'</td>';
 		// Fields from hook
 		$parameters = array('obj'=>$objp);
-		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters);    // Note that $action and $object may have been modified by hook
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		print '<td></td>';
-        print "</tr>\n";
+		print "</tr>\n";
 		$i++;
 	}
 
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index cc37d930280..7949c5441c1 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -88,18 +88,18 @@ if (!empty($canvas))
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-    $sref = "";
-    $snom = "";
-    $sall = "";
+	$sref = "";
+	$snom = "";
+	$sall = "";
 	$tosell = "";
 	$tobuy = "";
-    $search_sale = "";
-    $search_categ = "";
-    $type = "";
-    $catid = '';
-    $toolowstock = '';
-    $search_batch = '';
-    $search_warehouse = '';
+	$search_sale = "";
+	$search_categ = "";
+	$type = "";
+	$catid = '';
+	$toolowstock = '';
+	$search_batch = '';
+	$search_warehouse = '';
 	$fourn_id = '';
 	$sbarcode = '';
 }
@@ -136,12 +136,12 @@ if ($sall) $sql .= natural_search(array('p.ref', 'p.label', 'p.description', 'p.
 // if the type is not 1, we show all products (type = 0,2,3)
 if (dol_strlen($type))
 {
-    if ($type == 1)
-    {
-        $sql .= " AND p.fk_product_type = '1'";
-    } else {
-        $sql .= " AND p.fk_product_type <> '1'";
-    }
+	if ($type == 1)
+	{
+		$sql .= " AND p.fk_product_type = '1'";
+	} else {
+		$sql .= " AND p.fk_product_type <> '1'";
+	}
 }
 if ($sref)     $sql .= natural_search("p.ref", $sref);
 if ($search_barcode) $sql .= natural_search("p.barcode", $search_barcode);
@@ -168,13 +168,13 @@ $sql .= $db->order($sortfield, $sortorder);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-    	$page = 0;
-    	$offset = 0;
-    }
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -252,18 +252,18 @@ if ($resql)
 	}
 	//$moreforfilter.=$langs->trans("StockTooLow").' <input type="checkbox" name="toolowstock" value="1"'.($toolowstock?' checked':'').'>';
 
-    if (!empty($moreforfilter))
-    {
-        print '<div class="liste_titre liste_titre_bydiv centpercent">';
-        print $moreforfilter;
-        $parameters = array();
-        $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-        print '</div>';
-    }
+	if (!empty($moreforfilter))
+	{
+		print '<div class="liste_titre liste_titre_bydiv centpercent">';
+		print $moreforfilter;
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		print '</div>';
+	}
 
 
-    print '<div class="div-table-responsive">';
+	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">';
 
 	// Fields title search
@@ -291,11 +291,11 @@ if ($resql)
 		print '<td class="liste_titre">&nbsp;</td>';
 	}
 	print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre maxwidthsearch">';
-    $searchpicto = $form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
+	print '<td class="liste_titre">&nbsp;</td>';
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
+	print '</td>';
 	print '</tr>';
 
 	//Line for column titles
@@ -349,7 +349,7 @@ if ($resql)
 
 		$product_static->ref = $objp->ref;
 		$product_static->id = $objp->rowid;
-        $product_static->label = $objp->label;
+		$product_static->label = $objp->label;
 		$product_static->type = $objp->fk_product_type;
 		$product_static->entity = $objp->entity;
 		$product_static->status = $objp->tosell;
@@ -396,7 +396,7 @@ if ($resql)
 		print '<td class="nowrap">';
 		if ($objp->fk_entrepot > 0)
 		{
-    		print $warehousetmp->getNomUrl(1);
+			print $warehousetmp->getNomUrl(1);
 		}
 		print '</td>';
 
@@ -415,13 +415,13 @@ if ($resql)
 			print '<td class="center">'.dol_print_date($db->jdate($objp->sellby), 'day').'</td>';
 		}
 		print '<td class="right">';
-        //if ($objp->seuil_stock_alerte && ($objp->stock_physique < $objp->seuil_stock_alerte)) print img_warning($langs->trans("StockTooLow")).' ';
+		//if ($objp->seuil_stock_alerte && ($objp->stock_physique < $objp->seuil_stock_alerte)) print img_warning($langs->trans("StockTooLow")).' ';
 		print $objp->stock_physique;
 		print '</td>';
 		print '<td class="right"><a href="'.DOL_URL_ROOT.'/product/stock/movement_list.php?idproduct='.$product_static->id.'&search_warehouse='.$objp->fk_entrepot.'&search_batch='.($objp->batch != 'Undefined' ? $objp->batch : 'Undefined').'">'.$langs->trans("Movements").'</a></td>';
 		print '<td class="right nowrap">'.$product_static->LibStatut($objp->statut, 5, 0).'</td>';
-        print '<td class="right nowrap">'.$product_static->LibStatut($objp->tobuy, 5, 1).'</td>';
-        print '<td></td>';
+		print '<td class="right nowrap">'.$product_static->LibStatut($objp->tobuy, 5, 1).'</td>';
+		print '<td></td>';
 		print "</tr>\n";
 		$i++;
 	}
diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php
new file mode 100644
index 00000000000..1582646cd8a
--- /dev/null
+++ b/htdocs/product/stats/bom.php
@@ -0,0 +1,277 @@
+<?php
+/* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2020 Floiran Henry <florian.henry@scopen.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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/product/stats/mo.php
+ *       \ingroup    product mo
+ *       \brief      Page of MO referring product
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('mrp', 'products', 'companies'));
+
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+
+// Security check
+$fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
+$fieldtype = (!empty($ref) ? 'ref' : 'rowid');
+if ($user->socid) $socid = $user->socid;
+$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('productstatscontract'));
+
+$mesg = '';
+$option = '';
+
+// Load variable for pagination
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortorder) $sortorder = "DESC";
+if (!$sortfield) $sortfield = "b.date_valid";
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+if ($id > 0 || !empty($ref))
+{
+	$product = new Product($db);
+	$result = $product->fetch($id, $ref);
+
+	$object = $product;
+
+	$parameters = array('id'=>$id);
+	$reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks
+	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+	llxHeader("", "", $langs->trans("CardProduct".$product->type));
+
+	if ($result > 0)
+	{
+		$head = product_prepare_head($product);
+		$titre = $langs->trans("CardProduct".$product->type);
+		$picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product');
+		print dol_get_fiche_head($head, 'referers', $titre, -1, $picto);
+
+		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
+		$shownav = 1;
+		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+
+		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+
+		print '<div class="fichecenter">';
+
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
+
+		$nboflines = show_stats_for_company($product, $socid);
+
+		print "</table>";
+
+		print '</div>';
+		print '<div style="clear:both"></div>';
+
+		print dol_get_fiche_end();
+
+		$now = dol_now();
+
+		//Calcul total qty and amount for global if full scan list
+		$total_qty_toconsume = 0;
+		$total_qty_toproduce = 0;
+		$bom_data_result = array();
+
+
+		//Qauntity  to produce
+		$sql = "SELECT b.rowid as rowid, b.ref, b.status, b.date_valid,";
+		$sql .= " b.qty as qty_toproduce";
+		$sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as b";
+		$sql .= " WHERE ";
+		$sql .= " b.entity IN (".getEntity('bom').")";
+		$sql .= " AND b.fk_product =".$product->id;
+		$sql .= $db->order($sortfield, $sortorder);
+
+		// Count total nb of records
+		$totalofrecords = '';
+		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+		{
+			$result = $db->query($sql);
+			if ($result) {
+				$totalofrecords = $db->num_rows($result);
+				while ($objp = $db->fetch_object($result)) {
+					$total_qty_toproduce += $objp->qty_toproduce;
+				}
+			} else {
+				dol_print_error($db);
+			}
+		}
+		$sql .= $db->plimit($limit + 1, $offset);
+
+		$result = $db->query($sql);
+		if ($result) {
+			$bomtmp = new BOM($db);
+			$num = $db->num_rows($result);
+			$i = 0;
+			if ($num > 0) {
+				while ($i < min($num, $limit)) {
+					$objp = $db->fetch_object($result);
+					$bomtmp->id = $objp->rowid;
+					$bomtmp->ref = $objp->ref;
+					$bom_data_result[$objp->rowid]['link'] = $bomtmp->getNomUrl(1, 'production');
+					$bom_data_result[$objp->rowid]['qty_toproduce'] += ($objp->qty_toproduce > 0 ? $objp->qty_toproduce : 0);
+					$bom_data_result[$objp->rowid]['qty_toconsume'] = 0;
+					$bom_data_result[$objp->rowid]['date_valid'] = dol_print_date($db->jdate($objp->date_valid), 'dayhour');
+					$bom_data_result[$objp->rowid]['status'] = $bomtmp->LibStatut($objp->status, 5);
+					$i++;
+				}
+			}
+		} else {
+			dol_print_error($db);
+		}
+		$db->free($result);
+
+		//Qauntity  to consume
+		$sql = "SELECT b.rowid as rowid, b.ref, b.status, b.date_valid,";
+		$sql .= " SUM(bl.qty) as qty_toconsume";
+		$sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as b";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."bom_bomline as bl ON bl.fk_bom=b.rowid";
+		$sql .= " WHERE ";
+		$sql .= " b.entity IN (".getEntity('bom').")";
+		$sql .= " AND bl.fk_product=".$product->id;
+		$sql .= " GROUP BY b.rowid, b.ref, b.date_valid, b.status";
+		$sql .= $db->order($sortfield, $sortorder);
+
+		// Count total nb of records
+		$totalofrecords = '';
+		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+		{
+			$result = $db->query($sql);
+			if ($result) {
+				$totalofrecords = $db->num_rows($result);
+				while ($objp = $db->fetch_object($result)) {
+					$total_qty_toconsume += $objp->qty_toconsume;
+				}
+			} else {
+				dol_print_error($db);
+			}
+		}
+		$sql .= $db->plimit($limit + 1, $offset);
+
+		$result = $db->query($sql);
+		if ($result) {
+			$bomtmp = new BOM($db);
+			$num = $db->num_rows($result);
+			$i = 0;
+			if ($num > 0) {
+				while ($i < min($num, $limit)) {
+					$objp = $db->fetch_object($result);
+					$bomtmp->id = $objp->rowid;
+					$bomtmp->ref = $objp->ref;
+
+					if (!array_key_exists($objp->rowid, $bom_data_result)) {
+						$bom_data_result[$objp->rowid]['link'] = $bomtmp->getNomUrl(1, 'production');
+						$bom_data_result[$objp->rowid]['qty_toproduce'] = 0;
+						$bom_data_result[$objp->rowid]['qty_toconsume'] += ($objp->qty_toconsume > 0 ? $objp->qty_toconsume : 0);
+						$bom_data_result[$objp->rowid]['date_valid'] = dol_print_date($db->jdate($objp->date_valid), 'dayhour');
+						$bom_data_result[$objp->rowid]['status'] = $bomtmp->LibStatut($objp->status, 5);
+					} else {
+						$bom_data_result[$objp->rowid]['qty_toconsume'] += ($objp->qty_toconsume > 0 ? $objp->qty_toconsume : 0);
+					}
+					$i++;
+				}
+			}
+		} else {
+			dol_print_error($db);
+		}
+		$db->free($result);
+
+
+		if ($limit > 0 && $limit != $conf->liste_limit) $option .= '&limit='.urlencode($limit);
+		if (!empty($id)) $option .= '&id='.$product->id;
+		if (!empty($search_month)) $option .= '&search_month='.urlencode($search_month);
+		if (!empty($search_year)) $option .= '&search_year='.urlencode($search_year);
+
+		print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
+		if (!empty($sortfield))
+			print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
+		if (!empty($sortorder))
+			print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
+
+		print_barre_liste($langs->trans("BOMs"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', count($bom_data_result), count($bom_data_result), '', 0, '', '', $limit, 0, 0, 1);
+
+		if (!empty($page)) $option .= '&page='.urlencode($page);
+
+		print '<div class="div-table-responsive">';
+		print '<table class="tagtable liste listwithfilterbefore" width="100%">';
+
+		print '<tr class="liste_titre">';
+		print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "b.rowid", "", "&amp;id=".$product->id, '', $sortfield, $sortorder);
+		print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "b.date_valid", "", "&amp;id=".$product->id, 'align="center"', $sortfield, $sortorder);
+		print_liste_field_titre("ToConsume", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$product->id, '', $sortfield, $sortorder, 'center ');
+		print_liste_field_titre("QtyToProduce", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$product->id, '', $sortfield, $sortorder, 'center ');
+		print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "b.status", "", "&amp;id=".$product->id, '', $sortfield, $sortorder, 'center ');
+		print "</tr>\n";
+
+		if (!empty($bom_data_result)) {
+			foreach ($bom_data_result as $data)
+			{
+				print '<tr class="oddeven">';
+				print '<td>';
+				print $data['link'];
+				print "</td>\n";
+				print "<td align=\"center\">";
+				print $data['date_valid']."</td>";
+				print '<td class="center">'.$data['qty_toconsume'].'</td>';
+				print '<td class="center">'.$data['qty_toproduce'].'</td>';
+				print '<td class="center">'.$data['status'].'</td>';
+				print "</tr>\n";
+			}
+			print '</table>';
+			print '</div>';
+			print '</form>';
+		}
+	}
+} else {
+	dol_print_error();
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index 1d61018467a..e899cee797f 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -78,46 +78,41 @@ $form = new Form($db);
 $htmlother = new FormOther($db);
 $object = new Product($db);
 
-if (!$id && empty($ref))
-{
-    llxHeader("", $langs->trans("ProductStatistics"));
+if (!$id && empty($ref)) {
+	llxHeader("", $langs->trans("ProductStatistics"));
 
-    $type = GETPOST('type', 'int');
+	$type = GETPOST('type', 'int');
 
    	$helpurl = '';
-    if ($type == '0')
-    {
-        $helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
-        //$title=$langs->trans("StatisticsOfProducts");
-        $title = $langs->trans("Statistics");
-    } elseif ($type == '1')
-    {
-        $helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
-        //$title=$langs->trans("StatisticsOfServices");
-        $title = $langs->trans("Statistics");
-    } else {
-        $helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
-        //$title=$langs->trans("StatisticsOfProductsOrServices");
-        $title = $langs->trans("Statistics");
-    }
+	if ($type == '0') {
+		$helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
+		//$title=$langs->trans("StatisticsOfProducts");
+		$title = $langs->trans("Statistics");
+	} elseif ($type == '1') {
+		$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
+		//$title=$langs->trans("StatisticsOfServices");
+		$title = $langs->trans("Statistics");
+	} else {
+		$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
+		//$title=$langs->trans("StatisticsOfProductsOrServices");
+		$title = $langs->trans("Statistics");
+	}
 
-    $picto = 'product';
-    if ($type == 1) $picto = 'service';
+	$picto = 'product';
+	if ($type == 1) $picto = 'service';
 
-    print load_fiche_titre($title, $mesg, $picto);
+	print load_fiche_titre($title, $mesg, $picto);
 } else {
-    $result = $object->fetch($id, $ref);
+	$result = $object->fetch($id, $ref);
 
 	$title = $langs->trans('ProductServiceCard');
 	$helpurl = '';
 	$shortlabel = dol_trunc($object->label, 16);
-	if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT))
-	{
+	if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT)) {
 		$title = $langs->trans('Product')." ".$shortlabel." - ".$langs->trans('Statistics');
 		$helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
 	}
-	if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE))
-	{
+	if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE)) {
 		$title = $langs->trans('Service')." ".$shortlabel." - ".$langs->trans('Statistics');
 		$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
 	}
@@ -126,86 +121,82 @@ if (!$id && empty($ref))
 }
 
 
-if ($result && (!empty($id) || !empty($ref)))
-{
+if ($result && (!empty($id) || !empty($ref))) {
 	$head = product_prepare_head($object);
 	$titre = $langs->trans("CardProduct".$object->type);
 	$picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
 
-	dol_fiche_head($head, 'stats', $titre, -1, $picto);
+	print dol_get_fiche_head($head, 'stats', $titre, -1, $picto);
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref', '', '', '', 0, '', '', 1);
+	dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref', '', '', '', 0, '', '', 1);
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
-if (empty($id) & empty($ref))
-{
-    $h = 0;
-    $head = array();
+if (empty($id) && empty($ref)) {
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/product/stats/card.php'.($type != '' ? '?type='.$type : '');
-    $head[$h][1] = $langs->trans("Chart");
-    $head[$h][2] = 'chart';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/product/stats/card.php'.($type != '' ? '?type='.$type : '');
+	$head[$h][1] = $langs->trans("Chart");
+	$head[$h][2] = 'chart';
+	$h++;
 
 	$title = $langs->trans("ListProductServiceByPopularity");
-    if ((string) $type == '1') {
-    	$title = $langs->trans("ListServiceByPopularity");
-    }
-    if ((string) $type == '0') {
-    	$title = $langs->trans("ListProductByPopularity");
-    }
+	if ((string) $type == '1') {
+		$title = $langs->trans("ListServiceByPopularity");
+	}
+	if ((string) $type == '0') {
+		$title = $langs->trans("ListProductByPopularity");
+	}
 
-    $head[$h][0] = DOL_URL_ROOT.'/product/popuprop.php'.($type != '' ? '?type='.$type : '');
-    $head[$h][1] = $langs->trans("ProductsPerPopularity");
-    $head[$h][2] = 'popularity';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/product/popuprop.php'.($type != '' ? '?type='.$type : '');
+	$head[$h][1] = $langs->trans("ProductsPerPopularity");
+	$head[$h][2] = 'popularity';
+	$h++;
 
-    dol_fiche_head($head, 'chart', $langs->trans("Statistics"), -1);
+	print dol_get_fiche_head($head, 'chart', $langs->trans("Statistics"), -1);
 }
 
 
-if ($result || empty($id))
-{
-    print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-    print '<input type="hidden" name="id" value="'.$id.'">';
+if ($result || empty($id)) {
+	print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="id" value="'.$id.'">';
 
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 
-	if (empty($id))
-	{
-    	// Type
+	if (empty($id)) {
+		// Type
 		print '<tr><td class="titlefield">'.$langs->trans("ProductsAndServices").'</td><td>';
 		$array = array('-1'=>'&nbsp;', '0'=>$langs->trans('Product'), '1'=>$langs->trans('Service'));
 		print $form->selectarray('type', $array, $type);
 		print '</td></tr>';
 
 		// Tag
-		if ($conf->categorie->enabled)
-		{
-    		print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td><td>';
-    		//$moreforfilter.='<div class="divsearchfield">';
-    		$moreforfilter .= $htmlother->select_categories(Categorie::TYPE_PRODUCT, $search_categ, 'search_categ', 1);
-    		//$moreforfilter.='</div>';
-    		print $moreforfilter;
-    		print '</td></tr>';
+		if ($conf->categorie->enabled) {
+			print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td><td>';
+			//$moreforfilter.='<div class="divsearchfield">';
+			$moreforfilter .= $htmlother->select_categories(Categorie::TYPE_PRODUCT, $search_categ, 'search_categ', 1);
+			//$moreforfilter.='</div>';
+			print $moreforfilter;
+			print '</td></tr>';
 		}
 	}
 
 	// Year
 	print '<tr><td class="titlefield">'.$langs->trans("Year").'</td><td>';
 	$arrayyears = array();
-	for ($year = $currentyear - 10; $year < $currentyear + 10; $year++)
+	for ($year = $currentyear - 25; $year < $currentyear; $year++)
 	{
-	    $arrayyears[$year] = $year;
+		$arrayyears[$year] = $year;
 	}
 	if (!in_array($year, $arrayyears)) $arrayyears[$year] = $year;
-	if (!in_array($nowyear, $arrayyears)) $arrayyears[$nowyear] = $nowyear;
+	if (!in_array($currentyear, $arrayyears)) $arrayyears[$currentyear] = $currentyear;
 	arsort($arrayyears);
-	print $form->selectarray('search_year', $arrayyears, $search_year, 0);
+	print $form->selectarray('search_year', $arrayyears, $search_year, 1);
 	print '</td></tr>';
 	print '</table>';
 	print '<div class="center"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></div>';
@@ -240,12 +231,9 @@ if ($result || empty($id))
 
 	// Generation des graphs
 	$dir = (!empty($conf->product->multidir_temp[$object->entity]) ? $conf->product->multidir_temp[$object->entity] : $conf->service->multidir_temp[$object->entity]);
-	if ($object->id > 0)  // We are on statistics for a dedicated product
-	{
-		if (!file_exists($dir.'/'.$object->id))
-		{
-			if (dol_mkdir($dir.'/'.$object->id) < 0)
-			{
+	if ($object->id > 0) {  // We are on statistics for a dedicated product
+		if (!file_exists($dir.'/'.$object->id)) {
+			if (dol_mkdir($dir.'/'.$object->id) < 0) {
 				$mesg = $langs->trans("ErrorCanNotCreateDir", $dir);
 				$error++;
 			}
@@ -254,81 +242,75 @@ if ($result || empty($id))
 
 	if ($conf->propal->enabled) {
 		$graphfiles['propal'] = array('modulepart'=>'productstats_proposals',
-		'file' => $object->id.'/propal12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year ? '_year'.$search_year : '').'.png',
+		'file' => $object->id.'/propal12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 		'label' => ($mode == 'byunit' ? $langs->transnoentitiesnoconv("NumberOfUnitsProposals") : $langs->transnoentitiesnoconv("NumberOfProposals")));
 	}
 
 	if ($conf->supplier_proposal->enabled) {
 		$graphfiles['proposalssuppliers'] = array('modulepart'=>'productstats_proposalssuppliers',
-		'file' => $object->id.'/proposalssuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year ? '_year'.$search_year : '').'.png',
+		'file' => $object->id.'/proposalssuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 		'label' => ($mode == 'byunit' ? $langs->transnoentitiesnoconv("NumberOfUnitsSupplierProposals") : $langs->transnoentitiesnoconv("NumberOfSupplierProposals")));
 	}
 
 	if ($conf->order->enabled) {
 		$graphfiles['orders'] = array('modulepart'=>'productstats_orders',
-		'file' => $object->id.'/orders12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year ? '_year'.$search_year : '').'.png',
+		'file' => $object->id.'/orders12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 		'label' => ($mode == 'byunit' ? $langs->transnoentitiesnoconv("NumberOfUnitsCustomerOrders") : $langs->transnoentitiesnoconv("NumberOfCustomerOrders")));
 	}
 
 	if ($conf->supplier_order->enabled) {
 		$graphfiles['orderssuppliers'] = array('modulepart'=>'productstats_orderssuppliers',
-		'file' => $object->id.'/orderssuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year ? '_year'.$search_year : '').'.png',
+		'file' => $object->id.'/orderssuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 		'label' => ($mode == 'byunit' ? $langs->transnoentitiesnoconv("NumberOfUnitsSupplierOrders") : $langs->transnoentitiesnoconv("NumberOfSupplierOrders")));
 	}
 
 	if ($conf->facture->enabled) {
 		$graphfiles['invoices'] = array('modulepart'=>'productstats_invoices',
-		'file' => $object->id.'/invoices12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year ? '_year'.$search_year : '').'.png',
+		'file' => $object->id.'/invoices12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 		'label' => ($mode == 'byunit' ? $langs->transnoentitiesnoconv("NumberOfUnitsCustomerInvoices") : $langs->transnoentitiesnoconv("NumberOfCustomerInvoices")));
 	}
 
 	if ($conf->supplier_invoice->enabled) {
 		$graphfiles['invoicessuppliers'] = array('modulepart'=>'productstats_invoicessuppliers',
-		'file' => $object->id.'/invoicessuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year ? '_year'.$search_year : '').'.png',
+		'file' => $object->id.'/invoicessuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 		'label' => ($mode == 'byunit' ? $langs->transnoentitiesnoconv("NumberOfUnitsSupplierInvoices") : $langs->transnoentitiesnoconv("NumberOfSupplierInvoices")));
 	}
 
 	if ($conf->contrat->enabled) {
 		$graphfiles['contracts'] = array('modulepart'=>'productstats_contracts',
-			'file' => $object->id.'/contracts12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year ? '_year'.$search_year : '').'.png',
+			'file' => $object->id.'/contracts12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 			'label' => ($mode == 'byunit' ? $langs->transnoentitiesnoconv("NumberOfUnitsContracts") : $langs->transnoentitiesnoconv("NumberOfContracts")));
 	}
 
 	if ($conf->mrp->enabled) {
 		$graphfiles['mrp'] = array('modulepart'=>'productstats_mrp',
-			'file' => $object->id.'/mos12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year ? '_year'.$search_year : '').'.png',
+			'file' => $object->id.'/mos12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 			'label' => ($mode == 'byunit' ? $langs->transnoentitiesnoconv("NumberOfUnitsMos") : $langs->transnoentitiesnoconv("NumberOfMos")));
 	}
 
 	$px = new DolGraph();
 
-	if (!$error && count($graphfiles) > 0)
-	{
+	if (!$error && count($graphfiles) > 0) {
 		$mesg = $px->isGraphKo();
-		if (!$mesg)
-		{
-			foreach ($graphfiles as $key => $val)
-			{
+		if (!$mesg) {
+			foreach ($graphfiles as $key => $val) {
 				if (!$graphfiles[$key]['file']) continue;
 
 				$graph_data = array();
 
-				if (dol_is_file($dir.'/'.$graphfiles[$key]['file']))
-				{
+				if (dol_is_file($dir.'/'.$graphfiles[$key]['file'])) {
 					// TODO Load cachefile $graphfiles[$key]['file']
 				} else {
-				    $morefilters = '';
-				    if ($search_categ > 0)
-				    {
-				        $categ = new Categorie($db);
-				        $categ->fetch($search_categ);
-				        $listofprodids = $categ->getObjectsInCateg('product', 1);
-				        $morefilters = ' AND d.fk_product IN ('.((is_array($listofprodids) && count($listofprodids)) ? join(',', $listofprodids) : '0').')';
-				    }
-				    if ($search_categ == -2)
-				    {
-				        $morefilters = ' AND d.fk_product NOT IN (SELECT cp.fk_product from '.MAIN_DB_PREFIX.'categorie_product as cp)';
-				    }
+					$morefilters = '';
+					if ($search_categ > 0) {
+						$categ = new Categorie($db);
+						$categ->fetch($search_categ);
+						$listofprodids = $categ->getObjectsInCateg('product', 1);
+						$morefilters = ' AND d.fk_product IN ('.((is_array($listofprodids) && count($listofprodids)) ? join(',', $listofprodids) : '0').')';
+					}
+					if ($search_categ == -2) {
+						$morefilters = ' AND d.fk_product NOT IN (SELECT cp.fk_product from '.MAIN_DB_PREFIX.'categorie_product as cp)';
+					}
 
 					if ($key == 'propal')             $graph_data = $object->get_nb_propal($socid, $mode, ((string) $type != '' ? $type : -1), $search_year, $morefilters);
 					if ($key == 'orders')             $graph_data = $object->get_nb_order($socid, $mode, ((string) $type != '' ? $type : -1), $search_year, $morefilters);
@@ -342,8 +324,7 @@ if ($result || empty($id))
 					// TODO Save cachefile $graphfiles[$key]['file']
 				}
 
-				if (is_array($graph_data))
-				{
+				if (is_array($graph_data)) {
 					$px->SetData($graph_data);
 					$px->SetYLabel($graphfiles[$key]['label']);
 					$px->SetMaxValue($px->GetCeilMaxValue() < 0 ? 0 : $px->GetCeilMaxValue());
@@ -371,10 +352,8 @@ if ($result || empty($id))
 
 	// Show graphs
 	$i = 0;
-	if (count($graphfiles) > 0)
-	{
-		foreach ($graphfiles as $key => $val)
-		{
+	if (count($graphfiles) > 0) {
+		foreach ($graphfiles as $key => $val) {
 			if (!$graphfiles[$key]['file']) continue;
 
 			if ($graphfiles == 'propal' && !$user->rights->propale->lire) continue;
@@ -386,20 +365,18 @@ if ($result || empty($id))
 			if ($graphfiles == 'mrp' && empty($user->rights->mrp->mo->read)) continue;
 
 
-			if ($i % 2 == 0)
-			{
+			if ($i % 2 == 0) {
 				print "\n".'<div class="fichecenter"><div class="fichehalfleft">'."\n";
 			} else {
 				print "\n".'<div class="fichehalfright"><div class="ficheaddleft">'."\n";
 			}
 
 			// Date generation
-			if ($graphfiles[$key]['output'] && !$px->isGraphKo())
-			{
-			    if (file_exists($dir."/".$graphfiles[$key]['file']) && filemtime($dir."/".$graphfiles[$key]['file'])) $dategenerated = $langs->trans("GeneratedOn", dol_print_date(filemtime($dir."/".$graphfiles[$key]['file']), "dayhour"));
-			    else $dategenerated = $langs->trans("GeneratedOn", dol_print_date(dol_now(), "dayhour"));
+			if ($graphfiles[$key]['output'] && !$px->isGraphKo()) {
+				if (file_exists($dir."/".$graphfiles[$key]['file']) && filemtime($dir."/".$graphfiles[$key]['file'])) $dategenerated = $langs->trans("GeneratedOn", dol_print_date(filemtime($dir."/".$graphfiles[$key]['file']), "dayhour"));
+				else $dategenerated = $langs->trans("GeneratedOn", dol_print_date(dol_now(), "dayhour"));
 			} else {
-			    $dategenerated = ($mesg ? '<font class="error">'.$mesg.'</font>' : $langs->trans("ChartNotGenerated"));
+				$dategenerated = ($mesg ? '<font class="error">'.$mesg.'</font>' : $langs->trans("ChartNotGenerated"));
 			}
 			$linktoregenerate = '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id') ?GETPOST('id') : $object->id).((string) $type != '' ? '&type='.$type : '').'&action=recalcul&mode='.$mode.'&search_year='.$search_year.'&search_categ='.$search_categ.'">'.img_picto($langs->trans("ReCalculate").' ('.$dategenerated.')', 'refresh').'</a>';
 
@@ -417,8 +394,7 @@ if ($result || empty($id))
 			print '</td></tr>';
 			print '</table>';
 
-			if ($i % 2 == 0)
-			{
+			if ($i % 2 == 0) {
 				print "\n".'</div>'."\n";
 			} else {
 				print "\n".'</div></div></div>';
@@ -429,17 +405,15 @@ if ($result || empty($id))
 		}
 	}
 	// div not closed
-	if ($i % 2 == 1)
-	{
+	if ($i % 2 == 1) {
 		print "\n".'<div class="fichehalfright"><div class="ficheaddleft">'."\n";
 		print "\n".'</div></div></div>';
 		print '<div class="clear"><div class="fichecenter"><br></div></div>'."\n";
 	}
 }
 
-if (!$id)
-{
-    dol_fiche_end();
+if (!$id) {
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 9898c13f21b..f89305b4d95 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -59,7 +59,7 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "DESC";
 if (!$sortfield) $sortfield = "c.date_commande";
-$search_month = GETPOST('search_month', 'alpha');
+$search_month = GETPOST('search_month', 'int');
 $search_year = GETPOST('search_year', 'int');
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
@@ -95,32 +95,32 @@ if ($id > 0 || !empty($ref))
 		$head = product_prepare_head($product);
 		$titre = $langs->trans("CardProduct".$product->type);
 		$picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product');
-		dol_fiche_head($head, 'referers', $titre, -1, $picto);
+		print dol_get_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
+		print $hookmanager->resPrint;
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        $shownav = 1;
-        if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+		$shownav = 1;
+		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
-        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-        print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
 
-        $nboflines = show_stats_for_company($product, $socid);
+		$nboflines = show_stats_for_company($product, $socid);
 
 		print "</table>";
 
-        print '</div>';
-        print '<div style="clear:both"></div>';
+		print '</div>';
+		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		if ($user->rights->commande->lire)
@@ -137,27 +137,27 @@ if ($id > 0 || !empty($ref))
 			$sql .= " AND c.entity IN (".getEntity('commande').")";
 			$sql .= " AND d.fk_commande = c.rowid";
 			$sql .= " AND d.fk_product =".$product->id;
-	            if (!empty($search_month))
-	            	$sql .= ' AND MONTH(c.date_commande) IN ('.$search_month.')';
-	            if (!empty($search_year))
-	            	$sql .= ' AND YEAR(c.date_commande) IN ('.$search_year.')';
+				if (!empty($search_month))
+					$sql .= ' AND MONTH(c.date_commande) IN ('.$search_month.')';
+				if (!empty($search_year))
+					$sql .= ' AND YEAR(c.date_commande) IN ('.$search_year.')';
 			if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 			if ($socid) $sql .= " AND c.fk_soc = ".$socid;
 			$sql .= $db->order($sortfield, $sortorder);
 
-	        //Calcul total qty and amount for global if full scan list
-	        $total_ht = 0;
-	        $total_qty = 0;
+			//Calcul total qty and amount for global if full scan list
+			$total_ht = 0;
+			$total_qty = 0;
 
-	        // Count total nb of records
-	        $totalofrecords = '';
-	        if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-	        {
-	        	$result = $db->query($sql);
-	        	$totalofrecords = $db->num_rows($result);
-	        }
+			// Count total nb of records
+			$totalofrecords = '';
+			if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+			{
+				$result = $db->query($sql);
+				$totalofrecords = $db->num_rows($result);
+			}
 
-	        $sql .= $db->plimit($limit + 1, $offset);
+			$sql .= $db->plimit($limit + 1, $offset);
 
 			$result = $db->query($sql);
 			if ($result)
@@ -169,30 +169,31 @@ if ($id > 0 || !empty($ref))
 				if (!empty($search_month)) $option .= '&search_month='.urlencode($search_month);
 				if (!empty($search_year)) $option .= '&search_year='.urlencode($search_year);
 
-	            print '<form method="post" action="'.$_SERVER ['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
-	            if (!empty($sortfield))
-	            	print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
-	            if (!empty($sortorder))
-	            	print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
+				print '<form method="post" action="'.$_SERVER ['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				if (!empty($sortfield))
+					print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
+				if (!empty($sortorder))
+					print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
 
-	            print_barre_liste($langs->trans("CustomersOrders"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
+				print_barre_liste($langs->trans("CustomersOrders"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
-	            if (!empty($page)) $option .= '&page='.urlencode($page);
+				if (!empty($page)) $option .= '&page='.urlencode($page);
 
-	            print '<div class="liste_titre liste_titre_bydiv centpercent">';
-                print '<div class="divsearchfield">';
-			    print $langs->trans('Period').' ('.$langs->trans("OrderDate").') - ';
+				print '<div class="liste_titre liste_titre_bydiv centpercent">';
+				print '<div class="divsearchfield">';
+				print $langs->trans('Period').' ('.$langs->trans("OrderDate").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
 				print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
 				print '<div style="vertical-align: middle; display: inline-block">';
 				print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', '', 1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 				print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-			    print '</div>';
+				print '</div>';
 				print '</div>';
 				print '</div>';
 
 				$i = 0;
-                print '<div class="div-table-responsive">';
+				print '<div class="div-table-responsive">';
 				print '<table class="tagtable liste listwithfilterbefore" width="100%">';
 				print '<tr class="liste_titre">';
 				print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "c.rowid", "", $option, '', $sortfield, $sortorder);
@@ -220,30 +221,30 @@ if ($id > 0 || !empty($ref))
 
 						print '<tr class="oddeven">';
 	 					print '<td>';
-	                    print $orderstatic->getNomUrl(1);
-	                    print "</td>\n";
-	                    print '<td>'.$societestatic->getNomUrl(1).'</td>';
-	                    print "<td>".$objp->code_client."</td>\n";
+						print $orderstatic->getNomUrl(1);
+						print "</td>\n";
+						print '<td>'.$societestatic->getNomUrl(1).'</td>';
+						print "<td>".$objp->code_client."</td>\n";
 						print '<td class="center">';
 						print dol_print_date($db->jdate($objp->date_commande), 'dayhour')."</td>";
 						print  '<td class="center">'.$objp->qty."</td>\n";
-	                    print '<td align="right">'.price($objp->total_ht)."</td>\n";
+						print '<td align="right">'.price($objp->total_ht)."</td>\n";
 						print '<td align="right">'.$orderstatic->LibStatut($objp->statut, $objp->facture, 5).'</td>';
 						print "</tr>\n";
 						$i++;
 					}
 				}
-                print '<tr class="liste_total">';
-                if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
-                else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
-                print '<td colspan="3"></td>';
-                print '<td class="center">'.$total_qty.'</td>';
-                print '<td align="right">'.price($total_ht).'</td>';
-                print '<td></td>';
-                print "</table>";
-                print "</div>";
-                print '</form>';
-            } else {
+				print '<tr class="liste_total">';
+				if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
+				else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
+				print '<td colspan="3"></td>';
+				print '<td class="center">'.$total_qty.'</td>';
+				print '<td align="right">'.price($total_ht).'</td>';
+				print '<td></td>';
+				print "</table>";
+				print "</div>";
+				print '</form>';
+			} else {
 				dol_print_error($db);
 			}
 			$db->free($result);
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index 162a108029e..611047f7f13 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -61,7 +61,7 @@ if (!$sortorder)
 	$sortorder = "DESC";
 if (!$sortfield)
 	$sortfield = "c.date_commande";
-$search_month = GETPOST('search_month', 'alpha');
+$search_month = GETPOST('search_month', 'int');
 $search_year = GETPOST('search_year', 'int');
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
@@ -98,32 +98,32 @@ if ($id > 0 || !empty($ref)) {
 		$head = product_prepare_head($product);
 		$titre = $langs->trans("CardProduct".$product->type);
 		$picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product');
-		dol_fiche_head($head, 'referers', $titre, -1, $picto);
+		print dol_get_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
+		print $hookmanager->resPrint;
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        $shownav = 1;
-        if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+		$shownav = 1;
+		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
 		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-        print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
 
-        $nboflines = show_stats_for_company($product, $socid);
+		$nboflines = show_stats_for_company($product, $socid);
 
 		print "</table>";
 
-        print '</div>';
-        print '<div style="clear:both"></div>';
+		print '</div>';
+		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		if ($user->rights->fournisseur->commande->lire)
@@ -186,7 +186,7 @@ if ($id > 0 || !empty($ref)) {
 				if (!empty($page)) $option .= '&page='.urlencode($page);
 
 				print '<div class="liste_titre liste_titre_bydiv centpercent">';
-                print '<div class="divsearchfield">';
+				print '<div class="divsearchfield">';
 				print $langs->trans('Period').' ('.$langs->trans("OrderDate").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
 				print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
@@ -198,7 +198,7 @@ if ($id > 0 || !empty($ref)) {
 				print '</div>';
 
 				$i = 0;
-                print '<div class="div-table-responsive">';
+				print '<div class="div-table-responsive">';
 				print '<table class="tagtable liste listwithfilterbefore" width="100%">';
 				print '<tr class="liste_titre">';
 				print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "c.rowid", "", $option, '', $sortfield, $sortorder);
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 194de1c6ddf..91ca0bd87e2 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -85,32 +85,32 @@ if ($id > 0 || !empty($ref))
 		$head = product_prepare_head($product);
 		$titre = $langs->trans("CardProduct".$product->type);
 		$picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product');
-		dol_fiche_head($head, 'referers', $titre, -1, $picto);
+		print dol_get_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
+		print $hookmanager->resPrint;
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        $shownav = 1;
-        if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+		$shownav = 1;
+		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
-        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-        print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
 
-        $nboflines = show_stats_for_company($product, $socid);
+		$nboflines = show_stats_for_company($product, $socid);
 
 		print "</table>";
 
-        print '</div>';
-        print '<div style="clear:both"></div>';
+		print '</div>';
+		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		$now = dol_now();
@@ -154,24 +154,24 @@ if ($id > 0 || !empty($ref))
 		{
 			$num = $db->num_rows($result);
 
-            if ($limit > 0 && $limit != $conf->liste_limit) $option .= '&limit='.urlencode($limit);
-            if (!empty($id)) $option .= '&id='.$product->id;
-            if (!empty($search_month)) $option .= '&search_month='.urlencode($search_month);
-            if (!empty($search_year)) $option .= '&search_year='.urlencode($search_year);
+			if ($limit > 0 && $limit != $conf->liste_limit) $option .= '&limit='.urlencode($limit);
+			if (!empty($id)) $option .= '&id='.$product->id;
+			if (!empty($search_month)) $option .= '&search_month='.urlencode($search_month);
+			if (!empty($search_year)) $option .= '&search_year='.urlencode($search_year);
 
-            print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
+			print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
 
-            if (!empty($sortfield))
-                print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
-            if (!empty($sortorder))
-                print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
+			if (!empty($sortfield))
+				print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
+			if (!empty($sortorder))
+				print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
 
-            print_barre_liste($langs->trans("Contrats"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
+			print_barre_liste($langs->trans("Contrats"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
-            if (!empty($page)) $option .= '&page='.urlencode($page);
+			if (!empty($page)) $option .= '&page='.urlencode($page);
 
-            $i = 0;
-            print '<div class="div-table-responsive">';
+			$i = 0;
+			print '<div class="div-table-responsive">';
 			print '<table class="tagtable liste listwithfilterbefore" width="100%">';
 
 			print '<tr class="liste_titre">';
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 08b20badbe9..8091de9c320 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -61,7 +61,7 @@ $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "DESC";
 if (!$sortfield) $sortfield = "f.datef";
 
-$search_month = GETPOST('search_month', 'alpha');
+$search_month = GETPOST('search_month', 'int');
 $search_year = GETPOST('search_year', 'int');
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
@@ -113,163 +113,163 @@ if ($id > 0 || !empty($ref))
 		$head = product_prepare_head($product);
 		$titre = $langs->trans("CardProduct".$product->type);
 		$picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product');
-		dol_fiche_head($head, 'referers', $titre, -1, $picto);
+		print dol_get_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
+		print $hookmanager->resPrint;
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        $shownav = 1;
-        if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+		$shownav = 1;
+		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
-        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-        print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
 
 		$nboflines = show_stats_for_company($product, $socid);
 
 		print "</table>";
 
-        print '</div>';
-        print '<div style="clear:both"></div>';
+		print '</div>';
+		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		if ($showmessage && $nboflines > 1)
 		{
 			print '<span class="opacitymedium">'.$langs->trans("ClinkOnALinkOfColumn", $langs->transnoentitiesnoconv("Referers")).'</span>';
 		} elseif ($user->rights->facture->lire)
-        {
-            $sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, s.code_client,";
-            $sql .= " f.ref, f.datef, f.paye, f.type, f.fk_statut as statut, f.rowid as facid,";
-            $sql .= " d.rowid, d.total_ht as total_ht, d.qty"; // We must keep the d.rowid here to not loose record because of the distinct used to ignore duplicate line when link on societe_commerciaux is used
-            if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
-            $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-            $sql .= ", ".MAIN_DB_PREFIX."facture as f";
-            $sql .= ", ".MAIN_DB_PREFIX."facturedet as d";
-            if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql .= " WHERE f.fk_soc = s.rowid";
-            $sql .= " AND f.entity IN (".getEntity('invoice').")";
-            $sql .= " AND d.fk_facture = f.rowid";
-            $sql .= " AND d.fk_product =".$product->id;
-            if (!empty($search_month))
-            	$sql .= ' AND MONTH(f.datef) IN ('.$search_month.')';
-            if (!empty($search_year))
-            	$sql .= ' AND YEAR(f.datef) IN ('.$search_year.')';
-            if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-            if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-            $sql .= $db->order($sortfield, $sortorder);
+		{
+			$sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, s.code_client,";
+			$sql .= " f.ref, f.datef, f.paye, f.type, f.fk_statut as statut, f.rowid as facid,";
+			$sql .= " d.rowid, d.total_ht as total_ht, d.qty"; // We must keep the d.rowid here to not loose record because of the distinct used to ignore duplicate line when link on societe_commerciaux is used
+			if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			$sql .= ", ".MAIN_DB_PREFIX."facture as f";
+			$sql .= ", ".MAIN_DB_PREFIX."facturedet as d";
+			if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE f.fk_soc = s.rowid";
+			$sql .= " AND f.entity IN (".getEntity('invoice').")";
+			$sql .= " AND d.fk_facture = f.rowid";
+			$sql .= " AND d.fk_product =".$product->id;
+			if (!empty($search_month))
+				$sql .= ' AND MONTH(f.datef) IN ('.$search_month.')';
+			if (!empty($search_year))
+				$sql .= ' AND YEAR(f.datef) IN ('.$search_year.')';
+			if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($socid) $sql .= " AND f.fk_soc = ".$socid;
+			$sql .= $db->order($sortfield, $sortorder);
 
-            // Calcul total qty and amount for global if full scan list
-            $total_ht = 0;
-            $total_qty = 0;
+			// Calcul total qty and amount for global if full scan list
+			$total_ht = 0;
+			$total_qty = 0;
 
-            // Count total nb of records
-            $totalofrecords = '';
-            if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-            {
-            	$result = $db->query($sql);
-            	$totalofrecords = $db->num_rows($result);
-            }
-
-            $sql .= $db->plimit($limit + 1, $offset);
-
-            $result = $db->query($sql);
-            if ($result)
+			// Count total nb of records
+			$totalofrecords = '';
+			if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 			{
-                $num = $db->num_rows($result);
+				$result = $db->query($sql);
+				$totalofrecords = $db->num_rows($result);
+			}
 
-                if ($limit > 0 && $limit != $conf->liste_limit) $option .= '&limit='.urlencode($limit);
-                if (!empty($id)) $option .= '&id='.$product->id;
-                if (!empty($search_month)) $option .= '&search_month='.urlencode($search_month);
-                if (!empty($search_year)) $option .= '&search_year='.urlencode($search_year);
+			$sql .= $db->plimit($limit + 1, $offset);
 
-                print '<form method="post" action="'.$_SERVER ['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
-                if (!empty($sortfield))
-                	print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
-                if (!empty($sortorder))
-                	print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
+			$result = $db->query($sql);
+			if ($result)
+			{
+				$num = $db->num_rows($result);
 
-                print_barre_liste($langs->trans("CustomersInvoices"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
+				if ($limit > 0 && $limit != $conf->liste_limit) $option .= '&limit='.urlencode($limit);
+				if (!empty($id)) $option .= '&id='.$product->id;
+				if (!empty($search_month)) $option .= '&search_month='.urlencode($search_month);
+				if (!empty($search_year)) $option .= '&search_year='.urlencode($search_year);
 
-                if (!empty($page)) $option .= '&page='.urlencode($page);
+				print '<form method="post" action="'.$_SERVER ['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
+				if (!empty($sortfield))
+					print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
+				if (!empty($sortorder))
+					print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
 
-                print '<div class="liste_titre liste_titre_bydiv centpercent">';
-                print '<div class="divsearchfield">';
-                print $langs->trans('Period').' ('.$langs->trans("DateInvoice").') - ';
+				print_barre_liste($langs->trans("CustomersInvoices"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
+
+				if (!empty($page)) $option .= '&page='.urlencode($page);
+
+				print '<div class="liste_titre liste_titre_bydiv centpercent">';
+				print '<div class="divsearchfield">';
+				print $langs->trans('Period').' ('.$langs->trans("DateInvoice").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
 				print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
 				print '<div style="vertical-align: middle; display: inline-block">';
 				print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', '', 1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 				print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-                print '</div>';
+				print '</div>';
 				print '</div>';
 				print '</div>';
 
-                $i = 0;
-                print '<div class="div-table-responsive">';
-                print '<table class="tagtable liste listwithfilterbefore" width="100%">';
-                print '<tr class="liste_titre">';
-                print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "s.rowid", "", $option, '', $sortfield, $sortorder);
-                print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", "", $option, '', $sortfield, $sortorder);
-                print_liste_field_titre("CustomerCode", $_SERVER["PHP_SELF"], "s.code_client", "", $option, '', $sortfield, $sortorder);
-                print_liste_field_titre("DateInvoice", $_SERVER["PHP_SELF"], "f.datef", "", $option, 'align="center"', $sortfield, $sortorder);
-                print_liste_field_titre("Qty", $_SERVER["PHP_SELF"], "d.qty", "", $option, 'align="center"', $sortfield, $sortorder);
-                print_liste_field_titre("AmountHT", $_SERVER["PHP_SELF"], "d.total_ht", "", $option, 'align="right"', $sortfield, $sortorder);
-                print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "f.paye,f.fk_statut", "", $option, 'align="right"', $sortfield, $sortorder);
-                print "</tr>\n";
+				$i = 0;
+				print '<div class="div-table-responsive">';
+				print '<table class="tagtable liste listwithfilterbefore" width="100%">';
+				print '<tr class="liste_titre">';
+				print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "s.rowid", "", $option, '', $sortfield, $sortorder);
+				print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", "", $option, '', $sortfield, $sortorder);
+				print_liste_field_titre("CustomerCode", $_SERVER["PHP_SELF"], "s.code_client", "", $option, '', $sortfield, $sortorder);
+				print_liste_field_titre("DateInvoice", $_SERVER["PHP_SELF"], "f.datef", "", $option, 'align="center"', $sortfield, $sortorder);
+				print_liste_field_titre("Qty", $_SERVER["PHP_SELF"], "d.qty", "", $option, 'align="center"', $sortfield, $sortorder);
+				print_liste_field_titre("AmountHT", $_SERVER["PHP_SELF"], "d.total_ht", "", $option, 'align="right"', $sortfield, $sortorder);
+				print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "f.paye,f.fk_statut", "", $option, 'align="right"', $sortfield, $sortorder);
+				print "</tr>\n";
 
-                if ($num > 0)
+				if ($num > 0)
 				{
-                    while ($i < min($num, $limit))
+					while ($i < min($num, $limit))
 					{
-                        $objp = $db->fetch_object($result);
+						$objp = $db->fetch_object($result);
 
 						if ($objp->type == Facture::TYPE_CREDIT_NOTE) $objp->qty = -($objp->qty);
 
 						$total_ht += $objp->total_ht;
-                        $total_qty += $objp->qty;
+						$total_qty += $objp->qty;
 
-                        $invoicestatic->id = $objp->facid;
+						$invoicestatic->id = $objp->facid;
 						$invoicestatic->ref = $objp->ref;
 						$societestatic->fetch($objp->socid);
 						$paiement = $invoicestatic->getSommePaiement();
 
-                        print '<tr class="oddeven">';
-                        print '<td>';
-                        print $invoicestatic->getNomUrl(1);
-                        print "</td>\n";
-                        print '<td>'.$societestatic->getNomUrl(1).'</td>';
-                        print "<td>".$objp->code_client."</td>\n";
-                        print '<td class="center">';
-                        print dol_print_date($db->jdate($objp->datef), 'dayhour')."</td>";
-                        print '<td class="center">'.$objp->qty."</td>\n";
-                        print '<td align="right">'.price($objp->total_ht)."</td>\n";
-                        print '<td align="right">'.$invoicestatic->LibStatut($objp->paye, $objp->statut, 5, $paiement, $objp->type).'</td>';
-                        print "</tr>\n";
-                        $i++;
-                    }
-                }
-                print '<tr class="liste_total">';
-                if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
-                else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
-                print '<td colspan="3"></td>';
-                print '<td class="center">'.$total_qty.'</td>';
-                print '<td align="right">'.price($total_ht).'</td>';
-                print '<td></td>';
-                print "</table>";
-                print '</div>';
-                print '</form>';
-            } else {
-                dol_print_error($db);
-            }
-            $db->free($result);
-        }
+						print '<tr class="oddeven">';
+						print '<td>';
+						print $invoicestatic->getNomUrl(1);
+						print "</td>\n";
+						print '<td>'.$societestatic->getNomUrl(1).'</td>';
+						print "<td>".$objp->code_client."</td>\n";
+						print '<td class="center">';
+						print dol_print_date($db->jdate($objp->datef), 'dayhour')."</td>";
+						print '<td class="center">'.$objp->qty."</td>\n";
+						print '<td align="right">'.price($objp->total_ht)."</td>\n";
+						print '<td align="right">'.$invoicestatic->LibStatut($objp->paye, $objp->statut, 5, $paiement, $objp->type).'</td>';
+						print "</tr>\n";
+						$i++;
+					}
+				}
+				print '<tr class="liste_total">';
+				if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
+				else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
+				print '<td colspan="3"></td>';
+				print '<td class="center">'.$total_qty.'</td>';
+				print '<td align="right">'.price($total_ht).'</td>';
+				print '<td></td>';
+				print "</table>";
+				print '</div>';
+				print '</form>';
+			} else {
+				dol_print_error($db);
+			}
+			$db->free($result);
+		}
 	}
 } else {
 	dol_print_error();
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index f39d4ab73b3..7e0e463e1a5 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -60,7 +60,7 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "DESC";
 if (!$sortfield) $sortfield = "f.datef";
-$search_month = GETPOST('search_month', 'alpha');
+$search_month = GETPOST('search_month', 'int');
 $search_year = GETPOST('search_year', 'int');
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
@@ -96,32 +96,32 @@ if ($id > 0 || !empty($ref))
 		$head = product_prepare_head($product);
 		$titre = $langs->trans("CardProduct".$product->type);
 		$picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product');
-		dol_fiche_head($head, 'referers', $titre, -1, $picto);
+		print dol_get_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
+		print $hookmanager->resPrint;
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        $shownav = 1;
-        if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+		$shownav = 1;
+		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
-        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-        print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
 
-        $nboflines = show_stats_for_company($product, $socid);
+		$nboflines = show_stats_for_company($product, $socid);
 
 		print "</table>";
 
-        print '</div>';
-        print '<div style="clear:both"></div>';
+		print '</div>';
+		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		if ($user->rights->fournisseur->facture->lire)
@@ -181,7 +181,7 @@ if ($id > 0 || !empty($ref))
 				if (!empty($page)) $option .= '&page='.urlencode($page);
 
 				print '<div class="liste_titre liste_titre_bydiv centpercent">';
-                print '<div class="divsearchfield">';
+				print '<div class="divsearchfield">';
 				print $langs->trans('Period').' ('.$langs->trans("DateInvoice").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
 				print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
@@ -193,7 +193,7 @@ if ($id > 0 || !empty($ref))
 				print '</div>';
 
 				$i = 0;
-                print '<div class="div-table-responsive">';
+				print '<div class="div-table-responsive">';
 				print '<table class="tagtable liste listwithfilterbefore" width="100%">';
 				print '<tr class="liste_titre">';
 				print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "s.rowid", "", $option, '', $sortfield, $sortorder);
@@ -231,7 +231,7 @@ if ($id > 0 || !empty($ref))
 						print "</td>\n";
 						print '<td>'.$societestatic->getNomUrl(1).'</td>';
 						print "<td>".$objp->code_client."</td>\n";
-                   		print '<td class="center">';
+				   		print '<td class="center">';
 						print dol_print_date($db->jdate($objp->datef), 'dayhour')."</td>";
 						print '<td class="center">'.$objp->qty."</td>\n";
 						print '<td align="right">'.price($objp->line_total_ht)."</td>\n";
diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php
index d8dfa9053e8..cb159646047 100644
--- a/htdocs/product/stats/mo.php
+++ b/htdocs/product/stats/mo.php
@@ -85,32 +85,32 @@ if ($id > 0 || !empty($ref))
 		$head = product_prepare_head($product);
 		$titre = $langs->trans("CardProduct".$product->type);
 		$picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product');
-		dol_fiche_head($head, 'referers', $titre, -1, $picto);
+		print dol_get_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
+		print $hookmanager->resPrint;
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        $shownav = 1;
-        if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+		$shownav = 1;
+		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
-        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-        print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
 
-        $nboflines = show_stats_for_company($product, $socid);
+		$nboflines = show_stats_for_company($product, $socid);
 
 		print "</table>";
 
-        print '</div>';
-        print '<div style="clear:both"></div>';
+		print '</div>';
+		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		$now = dol_now();
@@ -156,18 +156,18 @@ if ($id > 0 || !empty($ref))
 			if (!empty($search_month)) $option .= '&search_month='.urlencode($search_month);
 			if (!empty($search_year)) $option .= '&search_year='.urlencode($search_year);
 
-            print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
-            if (!empty($sortfield))
-                print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
-            if (!empty($sortorder))
-                print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
+			print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
+			if (!empty($sortfield))
+				print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
+			if (!empty($sortorder))
+				print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
 
-            print_barre_liste($langs->trans("Mos"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
+			print_barre_liste($langs->trans("Mos"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
-            if (!empty($page)) $option .= '&page='.urlencode($page);
+			if (!empty($page)) $option .= '&page='.urlencode($page);
 
-            $i = 0;
-            print '<div class="div-table-responsive">';
+			$i = 0;
+			print '<div class="div-table-responsive">';
 			print '<table class="tagtable liste listwithfilterbefore" width="100%">';
 
 			print '<tr class="liste_titre">';
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 6766864b042..9e9a078d8f0 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -60,7 +60,7 @@ $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "DESC";
 if (!$sortfield) $sortfield = "p.datep";
 
-$search_month = GETPOST('search_month', 'alpha');
+$search_month = GETPOST('search_month', 'int');
 $search_year = GETPOST('search_year', 'int');
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
@@ -83,7 +83,7 @@ if ($id > 0 || !empty($ref))
 	$product = new Product($db);
 	$result = $product->fetch($id, $ref);
 
-    $object = $product;
+	$object = $product;
 
 	$parameters = array('id' => $id);
 	$reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks
@@ -96,32 +96,32 @@ if ($id > 0 || !empty($ref))
 		$head = product_prepare_head($product);
 		$titre = $langs->trans("CardProduct".$product->type);
 		$picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product');
-		dol_fiche_head($head, 'referers', $titre, -1, $picto);
+		print dol_get_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
+		print $hookmanager->resPrint;
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        $shownav = 1;
-        if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+		$shownav = 1;
+		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
-        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-        print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
 
-        $nboflines = show_stats_for_company($product, $socid);
+		$nboflines = show_stats_for_company($product, $socid);
 
 		print "</table>";
 
-        print '</div>';
-        print '<div style="clear:both"></div>';
+		print '</div>';
+		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		if ($user->rights->propale->lire)
@@ -185,7 +185,7 @@ if ($id > 0 || !empty($ref))
 				if (!empty($page)) $option .= '&page='.urlencode($page);
 
 				print '<div class="liste_titre liste_titre_bydiv centpercent">';
-                print '<div class="divsearchfield">';
+				print '<div class="divsearchfield">';
 				print $langs->trans('Period').' ('.$langs->trans("DatePropal").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
 				print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
@@ -197,7 +197,7 @@ if ($id > 0 || !empty($ref))
 				print '</div>';
 
 				$i = 0;
-                print '<div class="div-table-responsive">';
+				print '<div class="div-table-responsive">';
 				print '<table class="tagtable liste listwithfilterbefore" width="100%">';
 				print '<tr class="liste_titre">';
 				print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.rowid", "", $option, '', $sortfield, $sortorder);
@@ -226,7 +226,7 @@ if ($id > 0 || !empty($ref))
 						print '<td>';
 						print $propalstatic->getNomUrl(1);
 						print "</td>\n";
-                        print '<td>'.$societestatic->getNomUrl(1).'</td>';
+						print '<td>'.$societestatic->getNomUrl(1).'</td>';
 						print '<td class="center">';
 						print dol_print_date($db->jdate($objp->datep), 'dayhour')."</td>";
 						print "<td align=\"center\">".$objp->qty."</td>\n";
@@ -237,20 +237,20 @@ if ($id > 0 || !empty($ref))
 					}
 				}
 
-        		print '<tr class="liste_total">';
-        		if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
-        		else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
-        		print '<td colspan="2"></td>';
-        		print '<td class="center">'.$total_qty.'</td>';
-        		print '<td align="right">'.price($total_ht).'</td>';
-        		print '<td></td>';
-        		print "</table>";
-        		print '</div>';
-        		print '</form>';
-    		} else {
-    			dol_print_error($db);
-    		}
-    		$db->free($result);
+				print '<tr class="liste_total">';
+				if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
+				else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
+				print '<td colspan="2"></td>';
+				print '<td class="center">'.$total_qty.'</td>';
+				print '<td align="right">'.price($total_ht).'</td>';
+				print '<td></td>';
+				print "</table>";
+				print '</div>';
+				print '</form>';
+			} else {
+				dol_print_error($db);
+			}
+			$db->free($result);
 		}
 	}
 } else {
diff --git a/htdocs/product/stats/supplier_proposal.php b/htdocs/product/stats/supplier_proposal.php
index f4d2a5d4644..b4816028d98 100644
--- a/htdocs/product/stats/supplier_proposal.php
+++ b/htdocs/product/stats/supplier_proposal.php
@@ -60,7 +60,7 @@ $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "DESC";
 if (!$sortfield) $sortfield = "p.date_valid";
 
-$search_month = GETPOST('search_month', 'alpha');
+$search_month = GETPOST('search_month', 'int');
 $search_year = GETPOST('search_year', 'int');
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
@@ -83,7 +83,7 @@ if ($id > 0 || !empty($ref))
 	$product = new Product($db);
 	$result = $product->fetch($id, $ref);
 
-    $object = $product;
+	$object = $product;
 
 	$parameters = array('id' => $id);
 	$reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks
@@ -96,32 +96,32 @@ if ($id > 0 || !empty($ref))
 		$head = product_prepare_head($product);
 		$titre = $langs->trans("CardProduct".$product->type);
 		$picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product');
-		dol_fiche_head($head, 'referers', $titre, -1, $picto);
+		print dol_get_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
+		print $hookmanager->resPrint;
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        $shownav = 1;
-        if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+		$shownav = 1;
+		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
-        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-        print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
 
-        $nboflines = show_stats_for_company($product, $socid);
+		$nboflines = show_stats_for_company($product, $socid);
 
 		print "</table>";
 
-        print '</div>';
-        print '<div style="clear:both"></div>';
+		print '</div>';
+		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		if ($user->rights->propale->lire)
@@ -185,7 +185,7 @@ if ($id > 0 || !empty($ref))
 				if (!empty($page)) $option .= '&page='.urlencode($page);
 
 				print '<div class="liste_titre liste_titre_bydiv centpercent">';
-                print '<div class="divsearchfield">';
+				print '<div class="divsearchfield">';
 				print $langs->trans('Period').' ('.$langs->trans("DatePropal").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
 				print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
@@ -197,7 +197,7 @@ if ($id > 0 || !empty($ref))
 				print '</div>';
 
 				$i = 0;
-                print '<div class="div-table-responsive">';
+				print '<div class="div-table-responsive">';
 				print '<table class="tagtable liste listwithfilterbefore" width="100%">';
 				print '<tr class="liste_titre">';
 				print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.rowid", "", $option, '', $sortfield, $sortorder);
@@ -225,7 +225,7 @@ if ($id > 0 || !empty($ref))
 						print '<td>';
 						print $propalstatic->getNomUrl(1);
 						print "</td>\n";
-                        print '<td>'.$societestatic->getNomUrl(1).'</td>';
+						print '<td>'.$societestatic->getNomUrl(1).'</td>';
 						print '<td class="center">';
 						print dol_print_date($db->jdate($objp->date_valid), 'dayhour')."</td>";
 						print "<td align=\"center\">".$objp->qty."</td>\n";
@@ -236,20 +236,20 @@ if ($id > 0 || !empty($ref))
 					}
 				}
 
-        		print '<tr class="liste_total">';
-        		if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
-        		else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
-        		print '<td colspan="2"></td>';
-        		print '<td class="center">'.$total_qty.'</td>';
-        		print '<td align="right">'.price($total_ht).'</td>';
-        		print '<td></td>';
-        		print "</table>";
-        		print '</div>';
-        		print '</form>';
-    		} else {
-    			dol_print_error($db);
-    		}
-    		$db->free($result);
+				print '<tr class="liste_total">';
+				if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
+				else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
+				print '<td colspan="2"></td>';
+				print '<td class="center">'.$total_qty.'</td>';
+				print '<td align="right">'.price($total_ht).'</td>';
+				print '<td></td>';
+				print "</table>";
+				print '</div>';
+				print '</form>';
+			} else {
+				dol_print_error($db);
+			}
+			$db->free($result);
 		}
 	}
 } else {
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 81ae26390c9..ffd7add3c20 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -93,18 +93,18 @@ if (empty($reshook))
 	// Ajout entrepot
 	if ($action == 'add' && $user->rights->stock->creer)
 	{
-		$object->ref         = GETPOST("ref");
-		$object->fk_parent   = GETPOST("fk_parent");
-		$object->label = GETPOST("libelle");
-		$object->description = GETPOST("desc");
+		$object->ref = (string) GETPOST("ref", "alpha");
+		$object->fk_parent = (int) GETPOST("fk_parent", "int");
+		$object->label = (string) GETPOST("libelle", "alpha");
+		$object->description = (string) GETPOST("desc", "alpha");
 		$object->statut      = GETPOST("statut");
-		$object->lieu        = GETPOST("lieu");
-		$object->address     = GETPOST("address");
-		$object->zip         = GETPOST("zipcode");
-		$object->town        = GETPOST("town");
-		$object->country_id  = GETPOST("country_id");
-		$object->phone = GETPOST("phone");
-		$object->fax = GETPOST("fax");
+		$object->lieu = (string) GETPOST("lieu", "alpha");
+		$object->address = (string) GETPOST("address", "alpha");
+		$object->zip = (string) GETPOST("zipcode", "alpha");
+		$object->town = (string) GETPOST("town", "alpha");
+		$object->country_id = GETPOST("country_id");
+		$object->phone = (string) GETPOST("phone", "alpha");
+		$object->fax = (string) GETPOST("fax", "alpha");
 
 		if (!empty($object->label)) {
 			// Fill array 'array_options' with data from add form
@@ -247,7 +247,7 @@ if ($action == 'create')
 	print '<input type="hidden" name="action" value="add">';
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">';
 
@@ -258,7 +258,7 @@ if ($action == 'create')
 
 	// Parent entrepot
 	print '<tr><td>'.$langs->trans("AddIn").'</td><td>';
-	print $formproduct->selectWarehouses('ifone', 'fk_parent', '', 1);
+	print img_picto('', 'stock').$formproduct->selectWarehouses((GETPOSTISSET('fk_parent') ? GETPOST('fk_parent', 'int') : 'ifone'), 'fk_parent', '', 1);
 	print '</td></tr>';
 
 	// Description
@@ -319,17 +319,17 @@ if ($action == 'create')
 		// Categories
 		print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_WAREHOUSE, '', 'parent', 64, 0, 1);
-		print $form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, '', 0, '100%');
+		print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 		print "</td></tr>";
 	}
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Create").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+	print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 	print '</div>';
 
 	print '</form>';
@@ -352,7 +352,7 @@ if ($action == 'create')
 		{
 			$head = stock_prepare_head($object);
 
-			dol_fiche_head($head, 'card', $langs->trans("Warehouse"), -1, 'stock');
+			print dol_get_fiche_head($head, 'card', $langs->trans("Warehouse"), -1, 'stock');
 
 			$formconfirm = '';
 
@@ -468,7 +468,7 @@ if ($action == 'create')
 
 			print '<div class="clearboth"></div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 
 			/* ************************************************************************** */
@@ -683,14 +683,14 @@ if ($action == 'create')
 
 			$head = stock_prepare_head($object);
 
-			dol_fiche_head($head, 'card', $langs->trans("Warehouse"), 0, 'stock');
+			print dol_get_fiche_head($head, 'card', $langs->trans("Warehouse"), 0, 'stock');
 
 			print '<table class="border centpercent">';
 
 			// Ref
 			print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td><input name="libelle" size="20" value="'.$object->label.'"></td></tr>';
 
-			print '<tr><td>'.$langs->trans("LocationSummary").'</td><td><input name="lieu" size="40" value="'.$object->lieu.'"></td></tr>';
+			print '<tr><td>'.$langs->trans("LocationSummary").'</td><td><input name="lieu" class="minwidth300" value="'.$object->lieu.'"></td></tr>';
 
 			// Parent entrepot
 			print '<tr><td>'.$langs->trans("AddIn").'</td><td>';
@@ -767,18 +767,18 @@ if ($action == 'create')
 				foreach ($cats as $cat) {
 					$arrayselected[] = $cat->id;
 				}
-				print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
+				print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 				print "</td></tr>";
 			}
 
 			print '</table>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
-			print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+			print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-			print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+			print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 			print '</div>';
 
 			print '</form>';
diff --git a/htdocs/product/stock/class/api_stockmovements.class.php b/htdocs/product/stock/class/api_stockmovements.class.php
index 71f687a1b03..dba209e5b6f 100644
--- a/htdocs/product/stock/class/api_stockmovements.class.php
+++ b/htdocs/product/stock/class/api_stockmovements.class.php
@@ -28,41 +28,41 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
  */
 class StockMovements extends DolibarrApi
 {
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'product_id',
-        'warehouse_id',
-        'qty'
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'product_id',
+		'warehouse_id',
+		'qty'
+	);
 
-    /**
-     * @var MouvementStock $stockmovement {@type MouvementStock}
-     */
-    public $stockmovement;
+	/**
+	 * @var MouvementStock $stockmovement {@type MouvementStock}
+	 */
+	public $stockmovement;
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-        $this->stockmovement = new MouvementStock($this->db);
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->stockmovement = new MouvementStock($this->db);
+	}
 
-    /**
-     * Get properties of a stock movement object
-     *
-     * Return an array with stock movement informations
-     *
-     * @param 	int 	$id ID of movement
-     * @return 	array|mixed data without useless information
-     *
-     * @throws 	RestException
-     */
-    /*
+	/**
+	 * Get properties of a stock movement object
+	 *
+	 * Return an array with stock movement informations
+	 *
+	 * @param 	int 	$id ID of movement
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	/*
     public function get($id)
     {
         if(! DolibarrApiAccess::$user->rights->stock->lire) {
@@ -81,136 +81,136 @@ class StockMovements extends DolibarrApi
         return $this->_cleanObjectDatas($this->stockmovement);
     }*/
 
-    /**
-     * Get a list of stock movement
-     *
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.product_id:=:1) and (t.date_creation:<:'20160101')"
-     * @return array                Array of warehouse objects
-     *
-     * @throws RestException
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
-    {
-        global $db, $conf;
+	/**
+	 * Get a list of stock movement
+	 *
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.product_id:=:1) and (t.date_creation:<:'20160101')"
+	 * @return array                Array of warehouse objects
+	 *
+	 * @throws RestException
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        if (!DolibarrApiAccess::$user->rights->stock->lire) {
-            throw new RestException(401);
-        }
+		if (!DolibarrApiAccess::$user->rights->stock->lire) {
+			throw new RestException(401);
+		}
 
-        $sql = "SELECT t.rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as t";
-        //$sql.= ' WHERE t.entity IN ('.getEntity('stock').')';
-        $sql .= ' WHERE 1 = 1';
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		$sql = "SELECT t.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as t";
+		//$sql.= ' WHERE t.entity IN ('.getEntity('stock').')';
+		$sql .= ' WHERE 1 = 1';
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $i = 0;
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
-            	$obj = $this->db->fetch_object($result);
-            	$stockmovement_static = new MouvementStock($this->db);
-                if ($stockmovement_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($stockmovement_static);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve stock movement list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No stock movement found');
-        }
-        return $obj_ret;
-    }
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$i = 0;
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min)
+			{
+				$obj = $this->db->fetch_object($result);
+				$stockmovement_static = new MouvementStock($this->db);
+				if ($stockmovement_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($stockmovement_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve stock movement list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No stock movement found');
+		}
+		return $obj_ret;
+	}
 
-    /**
-     * Create stock movement object.
-     * You can use the following message to test this RES API:
-     * { "product_id": 1, "warehouse_id": 1, "qty": 1, "lot": "", "movementcode": "INV123", "movementlabel": "Inventory 123", "price": 0 }
-     * $price Can be set to update AWP (Average Weighted Price) when you make a stock increase
-     * $dlc Eat-by date. Will be used if lot does not exists yet and will be created.
-     * $dluo Sell-by date. Will be used if lot does not exists yet and will be created.
-     *
-     * @param int $product_id Id product id {@min 1} {@from body} {@required true}
-     * @param int $warehouse_id Id warehouse {@min 1} {@from body} {@required true}
-     * @param float $qty Qty to add (Use negative value for a stock decrease) {@from body} {@required true}
-     * @param string $lot Lot {@from body}
-     * @param string $movementcode Movement code {@example INV123} {@from body}
-     * @param string $movementlabel Movement label {@example Inventory number 123} {@from body}
-     * @param string $price To update AWP (Average Weighted Price) when you make a stock increase (qty must be higher then 0). {@from body}
-     * @param string $dlc Eat-by date. {@from body} {@type date}
-     * @param string $dluo Sell-by date. {@from body} {@type date}
-     *
-     * @return  int                         ID of stock movement
-     * @throws RestException
-     */
-    public function post($product_id, $warehouse_id, $qty, $lot = '', $movementcode = '', $movementlabel = '', $price = '', $dlc = '', $dluo = '')
-    {
-        if (!DolibarrApiAccess::$user->rights->stock->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Create stock movement object.
+	 * You can use the following message to test this RES API:
+	 * { "product_id": 1, "warehouse_id": 1, "qty": 1, "lot": "", "movementcode": "INV123", "movementlabel": "Inventory 123", "price": 0 }
+	 * $price Can be set to update AWP (Average Weighted Price) when you make a stock increase
+	 * $dlc Eat-by date. Will be used if lot does not exists yet and will be created.
+	 * $dluo Sell-by date. Will be used if lot does not exists yet and will be created.
+	 *
+	 * @param int $product_id Id product id {@min 1} {@from body} {@required true}
+	 * @param int $warehouse_id Id warehouse {@min 1} {@from body} {@required true}
+	 * @param float $qty Qty to add (Use negative value for a stock decrease) {@from body} {@required true}
+	 * @param string $lot Lot {@from body}
+	 * @param string $movementcode Movement code {@example INV123} {@from body}
+	 * @param string $movementlabel Movement label {@example Inventory number 123} {@from body}
+	 * @param string $price To update AWP (Average Weighted Price) when you make a stock increase (qty must be higher then 0). {@from body}
+	 * @param string $dlc Eat-by date. {@from body} {@type date}
+	 * @param string $dluo Sell-by date. {@from body} {@type date}
+	 *
+	 * @return  int                         ID of stock movement
+	 * @throws RestException
+	 */
+	public function post($product_id, $warehouse_id, $qty, $lot = '', $movementcode = '', $movementlabel = '', $price = '', $dlc = '', $dluo = '')
+	{
+		if (!DolibarrApiAccess::$user->rights->stock->creer) {
+			throw new RestException(401);
+		}
 
-        if ($qty == 0) {
-        	throw new RestException(503, "Making a stock movement with a quentity of 0 is not possible");
-        }
+		if ($qty == 0) {
+			throw new RestException(503, "Making a stock movement with a quentity of 0 is not possible");
+		}
 
-        // Type increase or decrease
-        $type = 2;
-        if ($qty >= 0) {
-            $type = 3;
-        }
+		// Type increase or decrease
+		$type = 2;
+		if ($qty >= 0) {
+			$type = 3;
+		}
 
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-        $eatBy = empty($dluo) ? '' : dol_stringtotime($dluo);
-        $sellBy = empty($dlc) ? '' : dol_stringtotime($dlc);
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+		$eatBy = empty($dluo) ? '' : dol_stringtotime($dluo);
+		$sellBy = empty($dlc) ? '' : dol_stringtotime($dlc);
 
-        if ($this->stockmovement->_create(DolibarrApiAccess::$user, $product_id, $warehouse_id, $qty, $type, $price, $movementlabel, $movementcode, '', $eatBy, $sellBy, $lot) <= 0) {
-        	$errormessage = $this->stockmovement->error;
-        	if (empty($errormessage)) $errormessage = join(',', $this->stockmovement->errors);
-        	throw new RestException(503, 'Error when create stock movement : '.$errormessage);
-        }
+		if ($this->stockmovement->_create(DolibarrApiAccess::$user, $product_id, $warehouse_id, $qty, $type, $price, $movementlabel, $movementcode, '', $eatBy, $sellBy, $lot) <= 0) {
+			$errormessage = $this->stockmovement->error;
+			if (empty($errormessage)) $errormessage = join(',', $this->stockmovement->errors);
+			throw new RestException(503, 'Error when create stock movement : '.$errormessage);
+		}
 
-        return $this->stockmovement->id;
-    }
+		return $this->stockmovement->id;
+	}
 
-    /**
-     * Update stock movement
-     *
-     * @param int   $id             Id of warehouse to update
-     * @param array $request_data   Datas
-     * @return int
-     */
-    /*
+	/**
+	 * Update stock movement
+	 *
+	 * @param int   $id             Id of warehouse to update
+	 * @param array $request_data   Datas
+	 * @return int
+	 */
+	/*
     public function put($id, $request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->stock->creer) {
@@ -237,13 +237,13 @@ class StockMovements extends DolibarrApi
         return false;
     }*/
 
-    /**
-     * Delete stock movement
-     *
-     * @param int $id   Stock movement ID
-     * @return array
-     */
-    /*
+	/**
+	 * Delete stock movement
+	 *
+	 * @param int $id   Stock movement ID
+	 * @return array
+	 */
+	/*
     public function delete($id)
     {
         if(! DolibarrApiAccess::$user->rights->stock->supprimer) {
@@ -272,79 +272,79 @@ class StockMovements extends DolibarrApi
 
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   MouvementStock  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   MouvementStock $object     Object to clean
+	 * @return  Object                     Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        // Remove useless data
-        unset($object->civility_id);
-        unset($object->firstname);
-        unset($object->lastname);
-        unset($object->name);
-        unset($object->location_incoterms);
-        unset($object->label_incoterms);
-        unset($object->fk_incoterms);
-        unset($object->lines);
-        unset($object->total_ht);
-        unset($object->total_ttc);
-        unset($object->total_tva);
-        unset($object->total_localtax1);
-        unset($object->total_localtax2);
-        unset($object->note);
-        unset($object->note_private);
-        unset($object->note_public);
-        unset($object->shipping_method_id);
-        unset($object->fk_account);
-        unset($object->model_pdf);
-        unset($object->fk_delivery_address);
-        unset($object->cond_reglement);
-        unset($object->cond_reglement_id);
-        unset($object->mode_reglement_id);
-        unset($object->barcode_type_coder);
-        unset($object->barcode_type_label);
-        unset($object->barcode_type_code);
-        unset($object->barcode_type);
-        unset($object->country_code);
-        unset($object->country_id);
-        unset($object->country);
-        unset($object->thirdparty);
-        unset($object->contact);
-        unset($object->contact_id);
-        unset($object->user);
-        unset($object->fk_project);
-        unset($object->project);
-        unset($object->canvas);
+		// Remove useless data
+		unset($object->civility_id);
+		unset($object->firstname);
+		unset($object->lastname);
+		unset($object->name);
+		unset($object->location_incoterms);
+		unset($object->label_incoterms);
+		unset($object->fk_incoterms);
+		unset($object->lines);
+		unset($object->total_ht);
+		unset($object->total_ttc);
+		unset($object->total_tva);
+		unset($object->total_localtax1);
+		unset($object->total_localtax2);
+		unset($object->note);
+		unset($object->note_private);
+		unset($object->note_public);
+		unset($object->shipping_method_id);
+		unset($object->fk_account);
+		unset($object->model_pdf);
+		unset($object->fk_delivery_address);
+		unset($object->cond_reglement);
+		unset($object->cond_reglement_id);
+		unset($object->mode_reglement_id);
+		unset($object->barcode_type_coder);
+		unset($object->barcode_type_label);
+		unset($object->barcode_type_code);
+		unset($object->barcode_type);
+		unset($object->country_code);
+		unset($object->country_id);
+		unset($object->country);
+		unset($object->thirdparty);
+		unset($object->contact);
+		unset($object->contact_id);
+		unset($object->user);
+		unset($object->fk_project);
+		unset($object->project);
+		unset($object->canvas);
 
-        //unset($object->eatby);        Filled correctly in read mode
-        //unset($object->sellby);       Filled correctly in read mode
+		//unset($object->eatby);        Filled correctly in read mode
+		//unset($object->sellby);       Filled correctly in read mode
 
-        return $object;
-    }
+		return $object;
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param array|null    $data    Data to validate
-     * @return array
-     *
-     * @throws RestException
-     */
-    private function _validate($data)
-    {
-        $stockmovement = array();
-        foreach (self::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $stockmovement[$field] = $data[$field];
-        }
-        return $stockmovement;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param array|null    $data    Data to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	private function _validate($data)
+	{
+		$stockmovement = array();
+		foreach (self::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$stockmovement[$field] = $data[$field];
+		}
+		return $stockmovement;
+	}
 }
diff --git a/htdocs/product/stock/class/api_warehouses.class.php b/htdocs/product/stock/class/api_warehouses.class.php
index 1c31bbbc2af..d6f2333f3ef 100644
--- a/htdocs/product/stock/class/api_warehouses.class.php
+++ b/htdocs/product/stock/class/api_warehouses.class.php
@@ -28,264 +28,264 @@
  */
 class Warehouses extends DolibarrApi
 {
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'label',
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'label',
+	);
 
-    /**
-     * @var Entrepot $warehouse {@type Entrepot}
-     */
-    public $warehouse;
+	/**
+	 * @var Entrepot $warehouse {@type Entrepot}
+	 */
+	public $warehouse;
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-        $this->warehouse = new Entrepot($this->db);
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->warehouse = new Entrepot($this->db);
+	}
 
-    /**
-     * Get properties of a warehouse object
-     *
-     * Return an array with warehouse informations
-     *
-     * @param 	int 	$id ID of warehouse
-     * @return 	array|mixed data without useless information
-     *
-     * @throws 	RestException
-     */
-    public function get($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->stock->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a warehouse object
+	 *
+	 * Return an array with warehouse informations
+	 *
+	 * @param 	int 	$id ID of warehouse
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->stock->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->warehouse->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'warehouse not found');
-        }
+		$result = $this->warehouse->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'warehouse not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('warehouse', $this->warehouse->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('warehouse', $this->warehouse->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        return $this->_cleanObjectDatas($this->warehouse);
-    }
+		return $this->_cleanObjectDatas($this->warehouse);
+	}
 
-    /**
-     * List warehouses
-     *
-     * Get a list of warehouses
-     *
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
+	/**
+	 * List warehouses
+	 *
+	 * Get a list of warehouses
+	 *
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
 	 * @param  int    $category   Use this param to filter list by category
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'WH-%') and (t.date_creation:<:'20160101')"
-     * @return array                Array of warehouse objects
-     *
-     * @throws RestException
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $category = 0, $sqlfilters = '')
-    {
-        global $db, $conf;
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'WH-%') and (t.date_creation:<:'20160101')"
+	 * @return array                Array of warehouse objects
+	 *
+	 * @throws RestException
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $category = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        if (!DolibarrApiAccess::$user->rights->stock->lire) {
-            throw new RestException(401);
-        }
+		if (!DolibarrApiAccess::$user->rights->stock->lire) {
+			throw new RestException(401);
+		}
 
-        $sql = "SELECT t.rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."entrepot as t";
-    	if ($category > 0) {
+		$sql = "SELECT t.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."entrepot as t";
+		if ($category > 0) {
 			$sql .= ", ".MAIN_DB_PREFIX."categorie_societe as c";
-    	}
-        $sql .= ' WHERE t.entity IN ('.getEntity('stock').')';
-    	// Select warehouses of given category
-    	if ($category > 0) {
-    		$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
+		}
+		$sql .= ' WHERE t.entity IN ('.getEntity('stock').')';
+		// Select warehouses of given category
+		if ($category > 0) {
+			$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
 			$sql .= " AND c.fk_warehouse = t.rowid ";
-    	}
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		}
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $i = 0;
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
-            	$obj = $this->db->fetch_object($result);
-            	$warehouse_static = new Entrepot($this->db);
-                if ($warehouse_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($warehouse_static);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve warehouse list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No warehouse found');
-        }
-        return $obj_ret;
-    }
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$i = 0;
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min)
+			{
+				$obj = $this->db->fetch_object($result);
+				$warehouse_static = new Entrepot($this->db);
+				if ($warehouse_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($warehouse_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve warehouse list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No warehouse found');
+		}
+		return $obj_ret;
+	}
 
 
-    /**
-     * Create warehouse object
-     *
-     * @param array $request_data   Request data
-     * @return int  ID of warehouse
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->stock->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Create warehouse object
+	 *
+	 * @param array $request_data   Request data
+	 * @return int  ID of warehouse
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->stock->creer) {
+			throw new RestException(401);
+		}
 
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        foreach ($request_data as $field => $value) {
-            $this->warehouse->$field = $value;
-        }
-        if ($this->warehouse->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, "Error creating warehouse", array_merge(array($this->warehouse->error), $this->warehouse->errors));
-        }
-        return $this->warehouse->id;
-    }
+		foreach ($request_data as $field => $value) {
+			$this->warehouse->$field = $value;
+		}
+		if ($this->warehouse->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, "Error creating warehouse", array_merge(array($this->warehouse->error), $this->warehouse->errors));
+		}
+		return $this->warehouse->id;
+	}
 
-    /**
-     * Update warehouse
-     *
-     * @param int   $id             Id of warehouse to update
-     * @param array $request_data   Datas
-     * @return int
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->stock->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Update warehouse
+	 *
+	 * @param int   $id             Id of warehouse to update
+	 * @param array $request_data   Datas
+	 * @return int
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->stock->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->warehouse->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'warehouse not found');
-        }
+		$result = $this->warehouse->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'warehouse not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('stock', $this->warehouse->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('stock', $this->warehouse->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $this->warehouse->$field = $value;
-        }
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$this->warehouse->$field = $value;
+		}
 
-        if ($this->warehouse->update($id, DolibarrApiAccess::$user))
-            return $this->get($id);
+		if ($this->warehouse->update($id, DolibarrApiAccess::$user))
+			return $this->get($id);
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Delete warehouse
-     *
-     * @param int $id   Warehouse ID
-     * @return array
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->stock->supprimer) {
-            throw new RestException(401);
-        }
-        $result = $this->warehouse->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'warehouse not found');
-        }
+	/**
+	 * Delete warehouse
+	 *
+	 * @param int $id   Warehouse ID
+	 * @return array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->stock->supprimer) {
+			throw new RestException(401);
+		}
+		$result = $this->warehouse->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'warehouse not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('stock', $this->warehouse->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('stock', $this->warehouse->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if (!$this->warehouse->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(401, 'error when delete warehouse');
-        }
+		if (!$this->warehouse->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(401, 'error when delete warehouse');
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Warehouse deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Warehouse deleted'
+			)
+		);
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   Entrepot  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Entrepot  $object   Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        // Remove the subscriptions because they are handled as a subresource.
-        //unset($object->subscriptions);
+		// Remove the subscriptions because they are handled as a subresource.
+		//unset($object->subscriptions);
 
-        return $object;
-    }
+		return $object;
+	}
 
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param array|null    $data    Data to validate
-     * @return array
-     *
-     * @throws RestException
-     */
-    private function _validate($data)
-    {
-        $warehouse = array();
-        foreach (Warehouses::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $warehouse[$field] = $data[$field];
-        }
-        return $warehouse;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param array|null    $data    Data to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	private function _validate($data)
+	{
+		$warehouse = array();
+		foreach (Warehouses::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$warehouse[$field] = $data[$field];
+		}
+		return $warehouse;
+	}
 }
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index a16b1ee189c..14e25bad513 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -488,7 +488,7 @@ class Entrepot extends CommonObject
 				$this->model_pdf      = $obj->model_pdf;
 				$this->import_key     = $obj->import_key;
 
-				// Retreive all extrafield
+				// Retrieve all extrafield
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
 
@@ -707,14 +707,14 @@ class Entrepot extends CommonObject
 
 		$result = '';
 
-		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Warehouse").'</u>';
+		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Warehouse").'</u>';
+		if (isset($this->statut)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
 		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.(empty($this->ref) ? (empty($this->label) ? $this->libelle : $this->label) : $this->ref);
 		if (!empty($this->lieu)) {
 			$label .= '<br><b>'.$langs->trans('LocationSummary').':</b> '.$this->lieu;
 		}
-		if (isset($this->statut)) {
-			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
-		}
 
 		$url = DOL_URL_ROOT.'/product/stock/card.php?id='.$this->id;
 
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 0252e6a17ce..c97c56b2887 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -41,14 +41,14 @@ class MouvementStock extends CommonObject
 	public $table_element = 'stock_mouvement';
 
 
-    /**
-     * @var int ID product
-     */
+	/**
+	 * @var int ID product
+	 */
 	public $product_id;
 
-    /**
-     * @var int ID warehouse
-     */
+	/**
+	 * @var int ID warehouse
+	 */
 	public $warehouse_id;
 	public $qty;
 
@@ -65,18 +65,18 @@ class MouvementStock extends CommonObject
 	public $price;
 
 	/**
-     * @var int ID user author
-     */
+	 * @var int ID user author
+	 */
 	public $fk_user_author;
 
 	/**
-     * @var string stock movements label
-     */
-    public $label;
+	 * @var string stock movements label
+	 */
+	public $label;
 
-    /**
-     * @var int ID
-     */
+	/**
+	 * @var int ID
+	 */
 	public $fk_origin;
 
 	public $origintype;
@@ -113,11 +113,11 @@ class MouvementStock extends CommonObject
 
 
 
-    /**
+	/**
 	 *  Constructor
 	 *
 	 *  @param      DoliDB		$db      Database handler
-     */
+	 */
 	public function __construct($db)
 	{
 		$this->db = $db;
@@ -136,7 +136,7 @@ class MouvementStock extends CommonObject
 	 *										0=input (stock increase by a stock transfer), 1=output (stock decrease by a stock transfer),
 	 *										2=output (stock decrease), 3=input (stock increase)
 	 *                                      Note that qty should be > 0 with 0 or 3, < 0 with 1 or 2.
-	 *	@param		int		$price			Unit price HT of product, used to calculate average weighted price (PMP in french). If 0, average weighted price is not changed.
+	 *	@param		int		$price			Unit price HT of product, used to calculate average weighted price (AWP or PMP in french). If 0, average weighted price is not changed.
 	 *	@param		string	$label			Label of stock movement
 	 *	@param		string	$inventorycode	Inventory code
 	 *	@param		string	$datem			Force date of movement
@@ -147,10 +147,10 @@ class MouvementStock extends CommonObject
 	 * 	@param		int		$id_product_batch	Id product_batch (when skip_batch is false and we already know which record of product_batch to use)
 	 *	@return		int						<0 if KO, 0 if fk_product is null or product id does not exists, >0 if OK
 	 */
-    public function _create($user, $fk_product, $entrepot_id, $qty, $type, $price = 0, $label = '', $inventorycode = '', $datem = '', $eatby = '', $sellby = '', $batch = '', $skip_batch = false, $id_product_batch = 0)
+	public function _create($user, $fk_product, $entrepot_id, $qty, $type, $price = 0, $label = '', $inventorycode = '', $datem = '', $eatby = '', $sellby = '', $batch = '', $skip_batch = false, $id_product_batch = 0)
 	{
-	    // phpcs:disable
-	    global $conf, $langs;
+		// phpcs:disable
+		global $conf, $langs;
 
 		require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 		require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
@@ -159,6 +159,7 @@ class MouvementStock extends CommonObject
 		dol_syslog(get_class($this)."::_create start userid=$user->id, fk_product=$fk_product, warehouse_id=$entrepot_id, qty=$qty, type=$type, price=$price, label=$label, inventorycode=$inventorycode, datem=".$datem.", eatby=".$eatby.", sellby=".$sellby.", batch=".$batch.", skip_batch=".$skip_batch);
 
 		// Clean parameters
+		$price = price2num($price, 'MU'); // Clean value for the casse we receive a float zero value, to have it a real zero value.
 		if (empty($price)) $price = 0;
 		$now = (!empty($datem) ? $datem : dol_now());
 
@@ -181,7 +182,7 @@ class MouvementStock extends CommonObject
 		$this->warehouse_id = $entrepot_id;
 		$this->qty = $qty;
 		$this->type = $type;
-		$this->price = $price;
+		$this->price = price2num($price);
 		$this->label = $label;
 		$this->inventorycode = $inventorycode;
 		$this->datem = $now;
@@ -227,120 +228,114 @@ class MouvementStock extends CommonObject
 			// If not found, we add record
 			$sql = "SELECT pb.rowid, pb.batch, pb.eatby, pb.sellby FROM ".MAIN_DB_PREFIX."product_lot as pb";
 			$sql .= " WHERE pb.fk_product = ".$fk_product." AND pb.batch = '".$this->db->escape($batch)."'";
-            dol_syslog(get_class($this)."::_create scan serial for this product to check if eatby and sellby match", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if ($resql)
-            {
-                $num = $this->db->num_rows($resql);
-            	$i = 0;
-            	if ($num > 0)
-            	{
-                	while ($i < $num)
-                	{
-                		$obj = $this->db->fetch_object($resql);
-                        if ($obj->eatby)
-                        {
-                            if ($eatby)
-                            {
-                                $tmparray = dol_getdate($eatby, true);
-                                $eatbywithouthour = dol_mktime(0, 0, 0, $tmparray['mon'], $tmparray['mday'], $tmparray['year']);
-                        		if ($this->db->jdate($obj->eatby) != $eatby && $this->db->jdate($obj->eatby) != $eatbywithouthour)    // We test date without hours and with hours for backward compatibility
-                                {
-                                    // If found and eatby/sellby defined into table and provided and differs, return error
-                                	$langs->load("stocks");
-                                	$this->errors[] = $langs->transnoentitiesnoconv("ThisSerialAlreadyExistWithDifferentDate", $batch, dol_print_date($this->db->jdate($obj->eatby), 'dayhour'), dol_print_date($eatbywithouthour, 'dayhour'));
-                                    dol_syslog("ThisSerialAlreadyExistWithDifferentDate batch=".$batch.", eatby found into product_lot = ".$obj->eatby." = ".dol_print_date($this->db->jdate($obj->eatby), 'dayhourrfc')." so eatbywithouthour = ".$eatbywithouthour." = ".dol_print_date($eatbywithouthour)." - eatby provided = ".$eatby." = ".dol_print_date($eatby, 'dayhourrfc'), LOG_ERR);
-                                    $this->db->rollback();
-                                    return -3;
-                                }
-                            }
-                            else
-                            {
-                                $eatby = $obj->eatby; // If found and eatby/sellby defined into table and not provided, we take value from table
-                            }
-                        }
-                        else
-                        {
-                            if ($eatby) // If found and eatby/sellby not defined into table and provided, we update table
-                            {
-                                $productlot = new Productlot($this->db);
-                                $result = $productlot->fetch($obj->rowid);
-                                $productlot->eatby = $eatby;
-                                $result = $productlot->update($user);
-                                if ($result <= 0)
-                                {
-                                    $this->error = $productlot->error;
-                                    $this->errors = $productlot->errors;
-                                    $this->db->rollback();
-                                    return -5;
-                                }
-                            }
-                        }
-                        if ($obj->sellby)
-                        {
-                            if ($sellby)
-                            {
-                                $tmparray = dol_getdate($sellby, true);
-                                $sellbywithouthour = dol_mktime(0, 0, 0, $tmparray['mon'], $tmparray['mday'], $tmparray['year']);
-                                if ($this->db->jdate($obj->sellby) != $sellby && $this->db->jdate($obj->sellby) != $sellbywithouthour)    // We test date without hours and with hours for backward compatibility
-                        		{
-                        		    // If found and eatby/sellby defined into table and provided and differs, return error
-                        			$this->errors[] = $langs->transnoentitiesnoconv("ThisSerialAlreadyExistWithDifferentDate", $batch, dol_print_date($this->db->jdate($obj->sellby)), dol_print_date($sellby));
-            						dol_syslog($langs->transnoentities("ThisSerialAlreadyExistWithDifferentDate", $batch, dol_print_date($this->db->jdate($obj->sellby)), dol_print_date($sellby)), LOG_ERR);
-            						$this->db->rollback();
-                        			return -3;
-                        		}
-                            }
-                            else
-                            {
-                                $sellby = $obj->sellby; // If found and eatby/sellby defined into table and not provided, we take value from table
-                            }
-                        }
-                	    else
-                        {
-                            if ($sellby) // If found and eatby/sellby not defined into table and provided, we update table
-                            {
-                                $productlot = new Productlot($this->db);
-                                $result = $productlot->fetch($obj->rowid);
-                                $productlot->sellby = $sellby;
-                                $result = $productlot->update($user);
-                                if ($result <= 0)
-                                {
-                                    $this->error = $productlot->error;
-                                    $this->errors = $productlot->errors;
-                                    $this->db->rollback();
-                                    return -5;
-                                }
-                            }
-                        }
-
-                        $i++;
-                	}
-            	}
-            	else   // If not found, we add record
-            	{
-            	    $productlot = new Productlot($this->db);
-            	    $productlot->entity = $conf->entity;
-            	    $productlot->fk_product = $fk_product;
-            	    $productlot->batch = $batch;
-            	    // If we are here = first time we manage this batch, so we used dates provided by users to create lot
-            	    $productlot->eatby = $eatby;
-            	    $productlot->sellby = $sellby;
-            	    $result = $productlot->create($user);
-            	    if ($result <= 0)
-            	    {
-            	        $this->error = $productlot->error;
-            	        $this->errors = $productlot->errors;
-            	        $this->db->rollback();
-            	        return -4;
-            	    }
-            	}
-            }
-            else
+			dol_syslog(get_class($this)."::_create scan serial for this product to check if eatby and sellby match", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql)
 			{
-            	dol_print_error($this->db);
-            	$this->db->rollback();
-            	return -1;
+				$num = $this->db->num_rows($resql);
+				$i = 0;
+				if ($num > 0)
+				{
+					while ($i < $num)
+					{
+						$obj = $this->db->fetch_object($resql);
+						if ($obj->eatby)
+						{
+							if ($eatby)
+							{
+								$tmparray = dol_getdate($eatby, true);
+								$eatbywithouthour = dol_mktime(0, 0, 0, $tmparray['mon'], $tmparray['mday'], $tmparray['year']);
+								if ($this->db->jdate($obj->eatby) != $eatby && $this->db->jdate($obj->eatby) != $eatbywithouthour)    // We test date without hours and with hours for backward compatibility
+								{
+									// If found and eatby/sellby defined into table and provided and differs, return error
+									$langs->load("stocks");
+									$this->errors[] = $langs->transnoentitiesnoconv("ThisSerialAlreadyExistWithDifferentDate", $batch, dol_print_date($this->db->jdate($obj->eatby), 'dayhour'), dol_print_date($eatbywithouthour, 'dayhour'));
+									dol_syslog("ThisSerialAlreadyExistWithDifferentDate batch=".$batch.", eatby found into product_lot = ".$obj->eatby." = ".dol_print_date($this->db->jdate($obj->eatby), 'dayhourrfc')." so eatbywithouthour = ".$eatbywithouthour." = ".dol_print_date($eatbywithouthour)." - eatby provided = ".$eatby." = ".dol_print_date($eatby, 'dayhourrfc'), LOG_ERR);
+									$this->db->rollback();
+									return -3;
+								}
+							} else {
+								$eatby = $obj->eatby; // If found and eatby/sellby defined into table and not provided, we take value from table
+							}
+						} else {
+							if ($eatby) // If found and eatby/sellby not defined into table and provided, we update table
+							{
+								$productlot = new Productlot($this->db);
+								$result = $productlot->fetch($obj->rowid);
+								$productlot->eatby = $eatby;
+								$result = $productlot->update($user);
+								if ($result <= 0)
+								{
+									$this->error = $productlot->error;
+									$this->errors = $productlot->errors;
+									$this->db->rollback();
+									return -5;
+								}
+							}
+						}
+						if ($obj->sellby)
+						{
+							if ($sellby)
+							{
+								$tmparray = dol_getdate($sellby, true);
+								$sellbywithouthour = dol_mktime(0, 0, 0, $tmparray['mon'], $tmparray['mday'], $tmparray['year']);
+								if ($this->db->jdate($obj->sellby) != $sellby && $this->db->jdate($obj->sellby) != $sellbywithouthour)    // We test date without hours and with hours for backward compatibility
+								{
+									// If found and eatby/sellby defined into table and provided and differs, return error
+									$this->errors[] = $langs->transnoentitiesnoconv("ThisSerialAlreadyExistWithDifferentDate", $batch, dol_print_date($this->db->jdate($obj->sellby)), dol_print_date($sellby));
+									dol_syslog($langs->transnoentities("ThisSerialAlreadyExistWithDifferentDate", $batch, dol_print_date($this->db->jdate($obj->sellby)), dol_print_date($sellby)), LOG_ERR);
+									$this->db->rollback();
+									return -3;
+								}
+							} else {
+								$sellby = $obj->sellby; // If found and eatby/sellby defined into table and not provided, we take value from table
+							}
+						}
+						else
+						{
+							if ($sellby) // If found and eatby/sellby not defined into table and provided, we update table
+							{
+								$productlot = new Productlot($this->db);
+								$result = $productlot->fetch($obj->rowid);
+								$productlot->sellby = $sellby;
+								$result = $productlot->update($user);
+								if ($result <= 0)
+								{
+									$this->error = $productlot->error;
+									$this->errors = $productlot->errors;
+									$this->db->rollback();
+									return -5;
+								}
+							}
+						}
+
+						$i++;
+					}
+				}
+				else   // If not found, we add record
+				{
+					$productlot = new Productlot($this->db);
+					$productlot->entity = $conf->entity;
+					$productlot->fk_product = $fk_product;
+					$productlot->batch = $batch;
+					// If we are here = first time we manage this batch, so we used dates provided by users to create lot
+					$productlot->eatby = $eatby;
+					$productlot->sellby = $sellby;
+					$result = $productlot->create($user);
+					if ($result <= 0)
+					{
+						$this->error = $productlot->error;
+						$this->errors = $productlot->errors;
+						$this->db->rollback();
+						return -4;
+					}
+				}
+			}
+			else
+			{
+				dol_print_error($this->db);
+				$this->db->rollback();
+				return -1;
 			}
 		}
 
@@ -352,41 +347,41 @@ class MouvementStock extends CommonObject
 		// Note that qty should be > 0 with type 0 or 3, < 0 with type 1 or 2.
 		if ($movestock && $qty < 0 && empty($conf->global->STOCK_ALLOW_NEGATIVE_TRANSFER))
 		{
-    		if (!empty($conf->productbatch->enabled) && $product->hasbatch() && !$skip_batch)
-    		{
-    		    $foundforbatch = 0;
-    		    $qtyisnotenough = 0;
-    		    foreach ($product->stock_warehouse[$entrepot_id]->detail_batch as $batchcursor => $prodbatch)
-    		    {
-    		        if ($batch != $batchcursor) continue;
-    		        $foundforbatch = 1;
-    		        if ($prodbatch->qty < abs($qty)) $qtyisnotenough = $prodbatch->qty;
-        		    break;
-    		    }
-    		    if (!$foundforbatch || $qtyisnotenough)
-    		    {
-    		        $langs->load("stocks");
-    		        include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
-    		        $tmpwarehouse = new Entrepot($this->db);
-    		        $tmpwarehouse->fetch($entrepot_id);
+			if (!empty($conf->productbatch->enabled) && $product->hasbatch() && !$skip_batch)
+			{
+				$foundforbatch = 0;
+				$qtyisnotenough = 0;
+				foreach ($product->stock_warehouse[$entrepot_id]->detail_batch as $batchcursor => $prodbatch)
+				{
+					if ($batch != $batchcursor) continue;
+					$foundforbatch = 1;
+					if ($prodbatch->qty < abs($qty)) $qtyisnotenough = $prodbatch->qty;
+					break;
+				}
+				if (!$foundforbatch || $qtyisnotenough)
+				{
+					$langs->load("stocks");
+					include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+					$tmpwarehouse = new Entrepot($this->db);
+					$tmpwarehouse->fetch($entrepot_id);
 
-    		        $this->error = $langs->trans('qtyToTranferLotIsNotEnough', $product->ref, $batch, $qtyisnotenough, $tmpwarehouse->ref);
-    		        $this->errors[] = $langs->trans('qtyToTranferLotIsNotEnough', $product->ref, $batch, $qtyisnotenough, $tmpwarehouse->ref);
-        		    $this->db->rollback();
-        		    return -8;
-    		    }
-    		}
-    		else
-    		{
-    		    if (empty($product->stock_warehouse[$entrepot_id]->real) || $product->stock_warehouse[$entrepot_id]->real < abs($qty))
-    		    {
-    		        $langs->load("stocks");
-    		        $this->error = $langs->trans('qtyToTranferIsNotEnough').' : '.$product->ref;
-    		        $this->errors[] = $langs->trans('qtyToTranferIsNotEnough').' : '.$product->ref;
-    		        $this->db->rollback();
-    		        return -8;
-    		    }
-    		}
+					$this->error = $langs->trans('qtyToTranferLotIsNotEnough', $product->ref, $batch, $qtyisnotenough, $tmpwarehouse->ref);
+					$this->errors[] = $langs->trans('qtyToTranferLotIsNotEnough', $product->ref, $batch, $qtyisnotenough, $tmpwarehouse->ref);
+					$this->db->rollback();
+					return -8;
+				}
+			}
+			else
+			{
+				if (empty($product->stock_warehouse[$entrepot_id]->real) || $product->stock_warehouse[$entrepot_id]->real < abs($qty))
+				{
+					$langs->load("stocks");
+					$this->error = $langs->trans('qtyToTranferIsNotEnough').' : '.$product->ref;
+					$this->errors[] = $langs->trans('qtyToTranferIsNotEnough').' : '.$product->ref;
+					$this->db->rollback();
+					return -8;
+				}
+			}
 		}
 
 		if ($movestock && $entrepot_id > 0)	// Change stock for current product, change for subproduct is done after
@@ -396,9 +391,9 @@ class MouvementStock extends CommonObject
 			if (!empty($this->origin)) {			// This is set by caller for tracking reason
 				$origintype = empty($this->origin->origin_type) ? $this->origin->element : $this->origin->origin_type;
 				$fk_origin = $this->origin->id;
-				if ($origintype == 'project') $fk_project = $fk_origin;
-				else
-				{
+				if ($origintype == 'project') {
+					$fk_project = $fk_origin;
+				} else {
 					$res = $this->origin->fetch($fk_origin);
 					if ($res > 0)
 					{
@@ -471,15 +466,13 @@ class MouvementStock extends CommonObject
 						$fk_product_stock = $obj->rowid;
 					}
 					$this->db->free($resql);
-				}
-				else
-				{
+				} else {
 					$this->errors[] = $this->db->lasterror();
 					$error = -2;
 				}
 			}
 
-			// Calculate new PMP.
+			// Calculate new AWP (PMP)
 			$newpmp = 0;
 			if (!$error)
 			{
@@ -488,12 +481,12 @@ class MouvementStock extends CommonObject
 					// After a stock increase
 					// Note: PMP is calculated on stock input only (type of movement = 0 or 3). If type == 0 or 3, qty should be > 0.
 					// Note: Price should always be >0 or 0. PMP should be always >0 (calculated on input)
-					if ($price > 0 || (! empty($conf->global->STOCK_UPDATE_AWP_EVEN_WHEN_ENTRY_PRICE_IS_NULL) && $price ==0)) {
+					if ($price > 0 || (!empty($conf->global->STOCK_UPDATE_AWP_EVEN_WHEN_ENTRY_PRICE_IS_NULL) && $price == 0)) {
 						$oldqtytouse = ($oldqty >= 0 ? $oldqty : 0);
 						// We make a test on oldpmp>0 to avoid to use normal rule on old data with no pmp field defined
-						if ($oldpmp > 0) $newpmp = price2num((($oldqtytouse * $oldpmp) + ($qty * $price)) / ($oldqtytouse + $qty), 'MU');
-						else
-						{
+						if ($oldpmp > 0) {
+							$newpmp = price2num((($oldqtytouse * $oldpmp) + ($qty * $price)) / ($oldqtytouse + $qty), 'MU');
+						} else {
 							$newpmp = $price; // For this product, PMP was not yet set. We set it to input price.
 						}
 						//print "oldqtytouse=".$oldqtytouse." oldpmp=".$oldpmp." oldqtywarehousetouse=".$oldqtywarehousetouse." ";
@@ -502,14 +495,10 @@ class MouvementStock extends CommonObject
 					} else {
 						$newpmp = $oldpmp;
 					}
-				}
-				elseif ($type == 1 || $type == 2)
-				{
+				} elseif ($type == 1 || $type == 2) {
 					// After a stock decrease, we don't change value of the AWP/PMP of a product.
 					$newpmp = $oldpmp;
-				}
-				else
-				{
+				} else {
 					// Type of movement unknown
 					$newpmp = $oldpmp;
 				}
@@ -521,9 +510,7 @@ class MouvementStock extends CommonObject
 				{
 					$sql = "UPDATE ".MAIN_DB_PREFIX."product_stock SET reel = reel + ".$qty;
 					$sql .= " WHERE fk_entrepot = ".$entrepot_id." AND fk_product = ".$fk_product;
-				}
-				else
-				{
+				} else {
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_stock";
 					$sql .= " (reel, fk_entrepot, fk_product) VALUES ";
 					$sql .= " (".$qty.", ".$entrepot_id.", ".$fk_product.")";
@@ -547,12 +534,10 @@ class MouvementStock extends CommonObject
 			{
 				if ($id_product_batch > 0)
 				{
-				    $result = $this->createBatch($id_product_batch, $qty);
-				}
-				else
-				{
-			        $param_batch = array('fk_product_stock' =>$fk_product_stock, 'batchnumber'=>$batch);
-				    $result = $this->createBatch($param_batch, $qty);
+					$result = $this->createBatch($id_product_batch, $qty);
+				} else {
+					$param_batch = array('fk_product_stock' =>$fk_product_stock, 'batchnumber'=>$batch);
+					$result = $this->createBatch($param_batch, $qty);
 				}
 				if ($result < 0) $error++;
 			}
@@ -564,7 +549,7 @@ class MouvementStock extends CommonObject
 
 				// $sql = "UPDATE ".MAIN_DB_PREFIX."product SET pmp = ".$newpmp.", stock = ".$this->db->ifsql("stock IS NULL", 0, "stock") . " + ".$qty;
 				// $sql.= " WHERE rowid = ".$fk_product;
-    			// Update pmp + denormalized fields because we change content of produt_stock. Warning: Do not use "SET p.stock", does not works with pgsql
+				// Update pmp + denormalized fields because we change content of produt_stock. Warning: Do not use "SET p.stock", does not works with pgsql
 				$sql = "UPDATE ".MAIN_DB_PREFIX."product as p SET pmp = ".$newpmp.",";
 				$sql .= " stock=(SELECT SUM(ps.reel) FROM ".MAIN_DB_PREFIX."product_stock as ps WHERE ps.fk_product = p.rowid)";
 				$sql .= " WHERE rowid = ".$fk_product;
@@ -578,11 +563,11 @@ class MouvementStock extends CommonObject
 				}
 			}
 
-		    // If stock is now 0, we can remove entry into llx_product_stock, but only if there is no child lines into llx_product_batch (detail of batch, because we can imagine
-		    // having a lot1/qty=X and lot2/qty=-X, so 0 but we must not loose repartition of different lot.
-		    $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_stock WHERE reel = 0 AND rowid NOT IN (SELECT fk_product_stock FROM ".MAIN_DB_PREFIX."product_batch as pb)";
-		    $resql = $this->db->query($sql);
-		    // We do not test error, it can fails if there is child in batch details
+			// If stock is now 0, we can remove entry into llx_product_stock, but only if there is no child lines into llx_product_batch (detail of batch, because we can imagine
+			// having a lot1/qty=X and lot2/qty=-X, so 0 but we must not loose repartition of different lot.
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_stock WHERE reel = 0 AND rowid NOT IN (SELECT fk_product_stock FROM ".MAIN_DB_PREFIX."product_batch as pb)";
+			$resql = $this->db->query($sql);
+			// We do not test error, it can fails if there is child in batch details
 		}
 
 		// Add movement for sub products (recursive call)
@@ -593,10 +578,10 @@ class MouvementStock extends CommonObject
 
 		if ($movestock && !$error)
 		{
-            // Call trigger
-            $result = $this->call_trigger('STOCK_MOVEMENT', $user);
-            if ($result < 0) $error++;
-            // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('STOCK_MOVEMENT', $user);
+			if ($result < 0) $error++;
+			// End call triggers
 		}
 
 		if (!$error)
@@ -623,80 +608,80 @@ class MouvementStock extends CommonObject
 	 */
 	public function fetch($id)
 	{
-	    dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
-	    $sql = 'SELECT';
-	    $sql .= ' t.rowid,';
-	    $sql .= " t.tms,";
-	    $sql .= " t.datem,";
-	    $sql .= " t.fk_product,";
-	    $sql .= " t.fk_entrepot,";
-	    $sql .= " t.value,";
-	    $sql .= " t.price,";
-	    $sql .= " t.type_mouvement,";
-	    $sql .= " t.fk_user_author,";
-	    $sql .= " t.label,";
-	    $sql .= " t.fk_origin,";
-	    $sql .= " t.origintype,";
-	    $sql .= " t.inventorycode,";
-	    $sql .= " t.batch,";
-	    $sql .= " t.eatby,";
-	    $sql .= " t.sellby,";
-	    $sql .= " t.fk_projet as fk_project";
-	    $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-	    $sql .= ' WHERE 1 = 1';
-	    //if (null !== $ref) {
-	        //$sql .= ' AND t.ref = ' . '\'' . $ref . '\'';
-	    //} else {
-	        $sql .= ' AND t.rowid = '.$id;
-	    //}
+		$sql = 'SELECT';
+		$sql .= ' t.rowid,';
+		$sql .= " t.tms,";
+		$sql .= " t.datem,";
+		$sql .= " t.fk_product,";
+		$sql .= " t.fk_entrepot,";
+		$sql .= " t.value,";
+		$sql .= " t.price,";
+		$sql .= " t.type_mouvement,";
+		$sql .= " t.fk_user_author,";
+		$sql .= " t.label,";
+		$sql .= " t.fk_origin,";
+		$sql .= " t.origintype,";
+		$sql .= " t.inventorycode,";
+		$sql .= " t.batch,";
+		$sql .= " t.eatby,";
+		$sql .= " t.sellby,";
+		$sql .= " t.fk_projet as fk_project";
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql .= ' WHERE 1 = 1';
+		//if (null !== $ref) {
+			//$sql .= ' AND t.ref = ' . '\'' . $ref . '\'';
+		//} else {
+			$sql .= ' AND t.rowid = '.$id;
+		//}
 
-	    $resql = $this->db->query($sql);
-	    if ($resql) {
-	        $numrows = $this->db->num_rows($resql);
-	        if ($numrows) {
-	            $obj = $this->db->fetch_object($resql);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$numrows = $this->db->num_rows($resql);
+			if ($numrows) {
+				$obj = $this->db->fetch_object($resql);
 
-	            $this->id = $obj->rowid;
+				$this->id = $obj->rowid;
 
-	            $this->product_id = $obj->fk_product;
-	            $this->warehouse_id = $obj->fk_entrepot;
-	            $this->qty = $obj->value;
-	            $this->type = $obj->type_mouvement;
+				$this->product_id = $obj->fk_product;
+				$this->warehouse_id = $obj->fk_entrepot;
+				$this->qty = $obj->value;
+				$this->type = $obj->type_mouvement;
 
-	            $this->tms = $this->db->jdate($obj->tms);
-	            $this->datem = $this->db->jdate($obj->datem);
-	            $this->price = $obj->price;
-	            $this->fk_user_author = $obj->fk_user_author;
-	            $this->label = $obj->label;
-	            $this->fk_origin = $obj->fk_origin;
-	            $this->origintype = $obj->origintype;
-	            $this->inventorycode = $obj->inventorycode;
-	            $this->batch = $obj->batch;
-	            $this->eatby = $this->db->jdate($obj->eatby);
-	            $this->sellby = $this->db->jdate($obj->sellby);
-	            $this->fk_project = $obj->fk_project;
-	        }
+				$this->tms = $this->db->jdate($obj->tms);
+				$this->datem = $this->db->jdate($obj->datem);
+				$this->price = $obj->price;
+				$this->fk_user_author = $obj->fk_user_author;
+				$this->label = $obj->label;
+				$this->fk_origin = $obj->fk_origin;
+				$this->origintype = $obj->origintype;
+				$this->inventorycode = $obj->inventorycode;
+				$this->batch = $obj->batch;
+				$this->eatby = $this->db->jdate($obj->eatby);
+				$this->sellby = $this->db->jdate($obj->sellby);
+				$this->fk_project = $obj->fk_project;
+			}
 
-	        // Retreive all extrafield
-	        // fetch optionals attributes and labels
-	        $this->fetch_optionals();
+			// Retrieve all extrafield
+			// fetch optionals attributes and labels
+			$this->fetch_optionals();
 
-	        // $this->fetch_lines();
+			// $this->fetch_lines();
 
-	        $this->db->free($resql);
+			$this->db->free($resql);
 
-	        if ($numrows) {
-	            return 1;
-	        } else {
-	            return 0;
-	        }
-	    } else {
-	        $this->errors[] = 'Error '.$this->db->lasterror();
-	        dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
+			if ($numrows) {
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 
-	        return -1;
-	    }
+			return -1;
+		}
 	}
 
 
@@ -751,7 +736,7 @@ class MouvementStock extends CommonObject
 		{
 			if (!$error)
 			{
-				$tmpmove = clone $this;
+				$tmpmove = dol_clone($this, 1);
 				$result = $tmpmove->_create($user, $pids[$key], $entrepot_id, ($qty * $pqtys[$key]), $type, 0, $label, $inventorycode); // This will also call _createSubProduct making this recursive
 				if ($result < 0)
 				{
@@ -790,7 +775,7 @@ class MouvementStock extends CommonObject
 	 */
 	public function livraison($user, $fk_product, $entrepot_id, $qty, $price = 0, $label = '', $datem = '', $eatby = '', $sellby = '', $batch = '', $id_product_batch = 0, $inventorycode = '')
 	{
-	    global $conf;
+		global $conf;
 
 		$skip_batch = empty($conf->productbatch->enabled);
 
@@ -816,11 +801,11 @@ class MouvementStock extends CommonObject
 	 */
 	public function reception($user, $fk_product, $entrepot_id, $qty, $price = 0, $label = '', $eatby = '', $sellby = '', $batch = '', $datem = '', $id_product_batch = 0, $inventorycode = '')
 	{
-	    global $conf;
+		global $conf;
 
-	    $skip_batch = empty($conf->productbatch->enabled);
+		$skip_batch = empty($conf->productbatch->enabled);
 
-	    return $this->_create($user, $fk_product, $entrepot_id, $qty, 3, $price, $label, $inventorycode, $datem, $eatby, $sellby, $batch, $skip_batch, $id_product_batch);
+		return $this->_create($user, $fk_product, $entrepot_id, $qty, 3, $price, $label, $inventorycode, $datem, $eatby, $sellby, $batch, $skip_batch, $id_product_batch);
 	}
 
 
@@ -868,9 +853,7 @@ class MouvementStock extends CommonObject
 			$obj = $this->db->fetch_object($resql);
 			if ($obj) $nb = $obj->nb;
 			return (empty($nb) ? 0 : $nb);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -887,7 +870,7 @@ class MouvementStock extends CommonObject
 	 */
 	private function createBatch($dluo, $qty)
 	{
-	    global $user;
+		global $user;
 
 		$pdluo = new Productbatch($this->db);
 
@@ -904,24 +887,18 @@ class MouvementStock extends CommonObject
 				$this->errors[] = $this->error;
 				$result = -2;
 			}
-		}
-		elseif (is_array($dluo))
-		{
+		} elseif (is_array($dluo)) {
 			if (isset($dluo['fk_product_stock']))
 			{
 				$vfk_product_stock = $dluo['fk_product_stock'];
 				$vbatchnumber = $dluo['batchnumber'];
 
 				$result = $pdluo->find($vfk_product_stock, '', '', $vbatchnumber); // Search on batch number only (eatby and sellby are deprecated here)
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this)."::createBatch array param dluo must contain at least key fk_product_stock", LOG_ERR);
 				$result = -1;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::createBatch error invalid param dluo", LOG_ERR);
 			$result = -1;
 		}
@@ -929,19 +906,15 @@ class MouvementStock extends CommonObject
 		if ($result >= 0)
 		{
 			// No error
-			if ($pdluo->id > 0)		// product_batch record found
-			{
+			if ($pdluo->id > 0) {	// product_batch record found
 				//print "Avant ".$pdluo->qty." Apres ".($pdluo->qty + $qty)."<br>";
 				$pdluo->qty += $qty;
-				if ($pdluo->qty == 0)
-				{
+				if ($pdluo->qty == 0) {
 					$result = $pdluo->delete($user, 1);
 				} else {
 					$result = $pdluo->update($user, 1);
 				}
-			}
-			else					// product_batch record not found
-			{
+			} else {					// product_batch record not found
 				$pdluo->fk_product_stock = $vfk_product_stock;
 				$pdluo->qty = $qty;
 				$pdluo->eatby = $veatby;
@@ -960,7 +933,7 @@ class MouvementStock extends CommonObject
 		return $result;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return Url link of origin object
 	 *
@@ -970,8 +943,8 @@ class MouvementStock extends CommonObject
 	 */
 	public function get_origin($fk_origin, $origintype)
 	{
-        // phpcs:enable
-	    $origin = '';
+		// phpcs:enable
+		$origin = '';
 
 		switch ($origintype) {
 			case 'commande':
@@ -1010,10 +983,10 @@ class MouvementStock extends CommonObject
 			default:
 				if ($origintype)
 				{
-                    // Separate originetype with "@" : left part is class name, right part is module name
-                    $origintype_array = explode('@', $origintype);
-                    $classname = ucfirst($origintype_array[0]);
-                    $modulename = empty($origintype_array[1]) ? $classname : $origintype_array[1];
+					// Separate originetype with "@" : left part is class name, right part is module name
+					$origintype_array = explode('@', $origintype);
+					$classname = ucfirst($origintype_array[0]);
+					$modulename = empty($origintype_array[1]) ? $classname : $origintype_array[1];
 					$result = dol_include_once('/'.$modulename.'/class/'.strtolower($classname).'.class.php');
 					if ($result)
 					{
@@ -1062,21 +1035,21 @@ class MouvementStock extends CommonObject
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
-     */
-    public function initAsSpecimen()
-    {
-        global $user, $langs, $conf, $mysoc;
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
+	 */
+	public function initAsSpecimen()
+	{
+		global $user, $langs, $conf, $mysoc;
 
-        // Initialize parameters
-        $this->id = 0;
+		// Initialize parameters
+		$this->id = 0;
 
-        // There is no specific properties. All data into insert are provided as method parameter.
-    }
+		// There is no specific properties. All data into insert are provided as method parameter.
+	}
 
 	/**
 	 *  Return a link (with optionaly the picto)
@@ -1127,7 +1100,7 @@ class MouvementStock extends CommonObject
 		return $this->LibStatut($mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un status donne
 	 *
@@ -1136,23 +1109,18 @@ class MouvementStock extends CommonObject
 	 */
 	public function LibStatut($mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
-		if ($mode == 0 || $mode == 1)
-		{
+		if ($mode == 0 || $mode == 1) {
 			return $langs->trans('StatusNotApplicable');
-		} elseif ($mode == 2)
-		{
+		} elseif ($mode == 2) {
 			return img_picto($langs->trans('StatusNotApplicable'), 'statut9').' '.$langs->trans('StatusNotApplicable');
-		} elseif ($mode == 3)
-		{
+		} elseif ($mode == 3) {
 			return img_picto($langs->trans('StatusNotApplicable'), 'statut9');
-		} elseif ($mode == 4)
-		{
+		} elseif ($mode == 4) {
 			return img_picto($langs->trans('StatusNotApplicable'), 'statut9').' '.$langs->trans('StatusNotApplicable');
-		} elseif ($mode == 5)
-		{
+		} elseif ($mode == 5) {
 			return $langs->trans('StatusNotApplicable').' '.img_picto($langs->trans('StatusNotApplicable'), 'statut9');
 		}
 	}
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index 9ff36db3c5b..3e7c23a6e92 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -54,33 +54,33 @@ class Productlot extends CommonObject
 	 * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 	 * @var int
 	 */
-    public $ismultientitymanaged = 1;
+	public $ismultientitymanaged = 1;
 
 
-    /**
-     *  'type' if the field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
-     *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
-     *  'label' the translation key.
-     *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
-     *  'position' is the sort order of field.
-     *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
-     *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
-     *  'noteditable' says if field is not editable (1 or 0)
-     *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
-     *  'index' if we want an index in database.
-     *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
-     *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
-     *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
-     *  'css' is the CSS style to use on field. For example: 'maxwidth200'
-     *  'help' is a string visible as a tooltip on field
-     *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
-     *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-     *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
-     *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
-     *  'comment' is not used. You can store here any text of your choice. It is not used by application.
-     *
-     *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
-     */
+	/**
+	 *  'type' if the field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
+	 *  'label' the translation key.
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+	 *  'position' is the sort order of field.
+	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'noteditable' says if field is not editable (1 or 0)
+	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
+	 *  'index' if we want an index in database.
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
+	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
+	 *  'help' is a string visible as a tooltip on field
+	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
+	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
+	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
+	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+	 *
+	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
+	 */
 
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
@@ -104,8 +104,8 @@ class Productlot extends CommonObject
 	public $entity;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_product;
 
 	public $batch;
@@ -115,13 +115,13 @@ class Productlot extends CommonObject
 	public $tms = '';
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_creat;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
 	public $import_key;
@@ -300,7 +300,7 @@ class Productlot extends CommonObject
 				$this->fk_user_modif = $obj->fk_user_modif;
 				$this->import_key = $obj->import_key;
 
-				// Retreive all extrafield
+				// Retrieve all extrafield
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
 			}
@@ -526,10 +526,10 @@ class Productlot extends CommonObject
 	 */
 	public function getLibStatut($mode = 0)
 	{
-	    return $this->LibStatut(0, $mode);
+		return $this->LibStatut(0, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return label of a given status
 	 *
@@ -539,12 +539,12 @@ class Productlot extends CommonObject
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
-	    global $langs;
+		// phpcs:enable
+		global $langs;
 
-	    //$langs->load('stocks');
+		//$langs->load('stocks');
 
-	    return '';
+		return '';
 	}
 
 
@@ -554,64 +554,64 @@ class Productlot extends CommonObject
 	 *
 	 *	@param	int		$withpicto				Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option					On what the link point to
-     *  @param	integer	$notooltip				1=Disable tooltip
-     *  @param	int		$maxlen					Max length of visible user name
-     *  @param  string  $morecss            	Add more css on link
-     *  @param  int     $save_lastsearch_value	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param	integer	$notooltip				1=Disable tooltip
+	 *  @param	int		$maxlen					Max length of visible user name
+	 *  @param  string  $morecss            	Add more css on link
+	 *  @param  int     $save_lastsearch_value	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string							String with URL
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $maxlen = 24, $morecss = '', $save_lastsearch_value = -1)
 	{
 		global $langs, $conf, $db;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
+		global $dolibarr_main_authentication, $dolibarr_main_demo;
+		global $menumanager;
 
-        $result = '';
+		$result = '';
 
-        $label = '<u>'.$langs->trans("Batch").'</u>';
-        $label .= '<div width="100%">';
-        $label .= '<b>'.$langs->trans('Batch').':</b> '.$this->batch;
-        if ($this->eatby)
-        {
-            $label .= '<br><b>'.$langs->trans('EatByDate').':</b> '.dol_print_date($this->eatby, 'day');
-        }
-        if ($this->sellby)
-        {
-            $label .= '<br><b>'.$langs->trans('SellByDate').':</b> '.dol_print_date($this->sellby, 'day');
-        }
+		$label = '<u>'.$langs->trans("Batch").'</u>';
+		$label .= '<div width="100%">';
+		$label .= '<b>'.$langs->trans('Batch').':</b> '.$this->batch;
+		if ($this->eatby)
+		{
+			$label .= '<br><b>'.$langs->trans('EatByDate').':</b> '.dol_print_date($this->eatby, 'day');
+		}
+		if ($this->sellby)
+		{
+			$label .= '<br><b>'.$langs->trans('SellByDate').':</b> '.dol_print_date($this->sellby, 'day');
+		}
 
-        $url = DOL_URL_ROOT.'/product/stock/productlot_card.php?id='.$this->id;
+		$url = DOL_URL_ROOT.'/product/stock/productlot_card.php?id='.$this->id;
 
-        if ($option != 'nolink')
-        {
-        	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-        	if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option != 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-        	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-        	{
-        		$label = $langs->trans("ShowMyObject");
-        		$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-        	}
-        	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-        	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowMyObject");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart .= $linkclose.'>';
-        $linkend = '</a>';
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
-        $result .= $linkstart;
-        if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-        if ($withpicto != 2) $result .= $this->batch;
-        $result .= $linkend;
+		$result .= $linkstart;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->batch;
+		$result .= $linkend;
 
-        return $result;
+		return $result;
 	}
 
 
diff --git a/htdocs/product/stock/class/productstockentrepot.class.php b/htdocs/product/stock/class/productstockentrepot.class.php
index 469cec4a9a2..ad36dc43c15 100644
--- a/htdocs/product/stock/class/productstockentrepot.class.php
+++ b/htdocs/product/stock/class/productstockentrepot.class.php
@@ -53,13 +53,13 @@ class ProductStockEntrepot extends CommonObject
 	public $tms = '';
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_product;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_entrepot;
 
 	public $seuil_stock_alerte;
@@ -202,7 +202,7 @@ class ProductStockEntrepot extends CommonObject
 				$this->import_key = $obj->import_key;
 			}
 
-			// Retreive all extrafield
+			// Retrieve all extrafield
 			// fetch optionals attributes and labels
 			$this->fetch_optionals();
 
@@ -471,38 +471,38 @@ class ProductStockEntrepot extends CommonObject
 	 *
 	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option				On what the link point to
-     *  @param	integer	$notooltip			1=Disable tooltip
-     *  @param	int		$maxlen				Max length of visible user name
-     *  @param  string  $morecss            Add more css on link
+	 *  @param	integer	$notooltip			1=Disable tooltip
+	 *  @param	int		$maxlen				Max length of visible user name
+	 *  @param  string  $morecss            Add more css on link
 	 *	@return	string						String with URL
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $maxlen = 24, $morecss = '')
 	{
 		global $langs, $conf, $db;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
+		global $dolibarr_main_authentication, $dolibarr_main_demo;
+		global $menumanager;
 
 
-        $result = '';
-        $companylink = '';
+		$result = '';
+		$companylink = '';
 
-        $label = '<u>'.$langs->trans("MyModule").'</u>';
-        $label .= '<div width="100%">';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label = '<u>'.$langs->trans("MyModule").'</u>';
+		$label .= '<div width="100%">';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-        $link = '<a href="'.DOL_URL_ROOT.'/ProductEntrepot/card.php?id='.$this->id.'"';
-        $link .= ($notooltip ? '' : ' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss ? ' '.$morecss : '').'"');
-        $link .= '>';
+		$link = '<a href="'.DOL_URL_ROOT.'/ProductEntrepot/card.php?id='.$this->id.'"';
+		$link .= ($notooltip ? '' : ' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss ? ' '.$morecss : '').'"');
+		$link .= '>';
 		$linkend = '</a>';
 
-        if ($withpicto)
-        {
-            $result .= ($link.img_object(($notooltip ? '' : $label), 'label', ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).$linkend);
-            if ($withpicto != 2) $result .= ' ';
-        }
-        $result .= $link.$this->ref.$linkend;
-        return $result;
-    }
+		if ($withpicto)
+		{
+			$result .= ($link.img_object(($notooltip ? '' : $label), 'label', ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).$linkend);
+			if ($withpicto != 2) $result .= ' ';
+		}
+		$result .= $link.$this->ref.$linkend;
+		return $result;
+	}
 
 	/**
 	 *  Retourne le libelle du status d'un user (actif, inactif)
@@ -515,7 +515,7 @@ class ProductStockEntrepot extends CommonObject
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un status donne
 	 *
@@ -525,7 +525,7 @@ class ProductStockEntrepot extends CommonObject
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if ($mode == 0)
diff --git a/htdocs/product/stock/fiche-valo.php b/htdocs/product/stock/fiche-valo.php
index 494f6042ff1..55ac057985b 100644
--- a/htdocs/product/stock/fiche-valo.php
+++ b/htdocs/product/stock/fiche-valo.php
@@ -57,7 +57,7 @@ if ($_GET["id"])
 
 	$head = stock_prepare_head($entrepot);
 
-	dol_fiche_head($head, 'value', $langs->trans("Warehouse"), 0, 'stock');
+	print dol_get_fiche_head($head, 'value', $langs->trans("Warehouse"), 0, 'stock');
 
 
 	print '<table class="border centpercent">';
diff --git a/htdocs/product/stock/info.php b/htdocs/product/stock/info.php
index cb27f37afb6..884deaaefff 100644
--- a/htdocs/product/stock/info.php
+++ b/htdocs/product/stock/info.php
@@ -50,7 +50,7 @@ $object->info($object->id);
 
 $head = stock_prepare_head($object);
 
-dol_fiche_head($head, 'info', $langs->trans("Warehouse"), -1, 'stock');
+print dol_get_fiche_head($head, 'info', $langs->trans("Warehouse"), -1, 'stock');
 
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index b0f593f82d9..f2c7133618b 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -86,12 +86,12 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-    't.ref'=>"Ref",
-    't.lieu'=>"LocationSummary",
-    't.description'=>"Description",
-    't.address'=>"Address",
-    't.zip'=>'Zip',
-    't.town'=>'Town',
+	't.ref'=>"Ref",
+	't.lieu'=>"LocationSummary",
+	't.description'=>"Description",
+	't.address'=>"Address",
+	't.zip'=>'Zip',
+	't.town'=>'Town',
 	't.phone'=>'Phone',
 	't.fax'=>'Fax',
 );
@@ -375,7 +375,7 @@ if ($search_all)
 
 $moreforfilter = '';
 
-if (!empty($conf->categorie->enabled))
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 {
 	$formcategory = new FormCategory($db);
 	$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_WAREHOUSE, $search_category_list);
@@ -419,7 +419,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0 || strpos($val['type'], 'sellist:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
@@ -530,7 +530,6 @@ if ($num)
 			$warehouse->{$key} = $obj->{$key};
 		}
 
-
 		// Show here line of result
 		print '<tr class="oddeven">';
 
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index 86458966b34..4e35d3832e5 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -39,7 +39,7 @@ $hookmanager->initHooks(array('massstockmove'));
 
 // Security check
 if ($user->socid) {
-    $socid = $user->socid;
+	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'produit|service');
 
@@ -59,11 +59,11 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("pa
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 
 if (!$sortfield) {
-    $sortfield = 'p.ref';
+	$sortfield = 'p.ref';
 }
 
 if (!$sortorder) {
-    $sortorder = 'ASC';
+	$sortorder = 'ASC';
 }
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
@@ -102,7 +102,7 @@ if ($action == 'addline')
 	if (!$qty)
 	{
 		$error++;
-	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Qty")), null, 'errors');
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Qty")), null, 'errors');
 	}
 
 	// Check a batch number is provided if product need it
@@ -198,12 +198,12 @@ if ($action == 'createmovements')
 				{
 					// Remove stock
 					$result1 = $product->correct_stock(
-		    			$user,
-		    			$id_sw,
-		    			$qty,
-		    			1,
-		    			GETPOST("label"),
-		    			$pricesrc,
+						$user,
+						$id_sw,
+						$qty,
+						1,
+						GETPOST("label"),
+						$pricesrc,
 						GETPOST("codemove")
 					);
 					if ($result1 < 0)
@@ -214,12 +214,12 @@ if ($action == 'createmovements')
 
 					// Add stock
 					$result2 = $product->correct_stock(
-		    			$user,
-		    			$id_tw,
-		    			$qty,
-		    			0,
-		    			GETPOST("label"),
-		    			$pricedest,
+						$user,
+						$id_tw,
+						$qty,
+						0,
+						GETPOST("label"),
+						$pricedest,
 						GETPOST("codemove")
 					);
 					if ($result2 < 0)
@@ -242,12 +242,12 @@ if ($action == 'createmovements')
 
 					// Remove stock
 					$result1 = $product->correct_stock_batch(
-		    			$user,
-		    			$id_sw,
-		    			$qty,
-		    			1,
-		    			GETPOST("label"),
-		    			$pricesrc,
+						$user,
+						$id_sw,
+						$qty,
+						1,
+						GETPOST("label"),
+						$pricesrc,
 						$dlc,
 						$dluo,
 						$batch,
@@ -261,12 +261,12 @@ if ($action == 'createmovements')
 
 					// Add stock
 					$result2 = $product->correct_stock_batch(
-		    			$user,
-		    			$id_tw,
-		    			$qty,
-		    			0,
-		    			GETPOST("label"),
-		    			$pricedest,
+						$user,
+						$id_tw,
+						$qty,
+						0,
+						GETPOST("label"),
+						$pricedest,
 						$dlc,
 						$dluo,
 						$batch,
@@ -428,7 +428,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="createmovements">';
 
 // Button to record mass movement
-$codemove = (isset($_POST["codemove"]) ? GETPOST("codemove", 'alpha') : dol_print_date(dol_now(), '%Y%m%d%H%M%S'));
+$codemove = (GETPOSTISSET("codemove") ? GETPOST("codemove", 'alpha') : dol_print_date(dol_now(), '%Y%m%d%H%M%S'));
 $labelmovement = GETPOST("label") ? GETPOST('label') : $langs->trans("StockTransfer").' '.dol_print_date($now, '%Y-%m-%d %H:%M');
 
 print '<div class="center">';
diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php
index 6d0eb0dc24c..cf3cc67bdc2 100644
--- a/htdocs/product/stock/movement_card.php
+++ b/htdocs/product/stock/movement_card.php
@@ -94,23 +94,23 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 $arrayfields = array(
-    'm.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-    'm.datem'=>array('label'=>$langs->trans("Date"), 'checked'=>1),
-    'p.ref'=>array('label'=>$langs->trans("ProductRef"), 'checked'=>1, 'css'=>'maxwidth100'),
-    'p.label'=>array('label'=>$langs->trans("ProductLabel"), 'checked'=>1),
-    'm.batch'=>array('label'=>$langs->trans("BatchNumberShort"), 'checked'=>1, 'enabled'=>(!empty($conf->productbatch->enabled))),
+	'm.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+	'm.datem'=>array('label'=>$langs->trans("Date"), 'checked'=>1),
+	'p.ref'=>array('label'=>$langs->trans("ProductRef"), 'checked'=>1, 'css'=>'maxwidth100'),
+	'p.label'=>array('label'=>$langs->trans("ProductLabel"), 'checked'=>1),
+	'm.batch'=>array('label'=>$langs->trans("BatchNumberShort"), 'checked'=>1, 'enabled'=>(!empty($conf->productbatch->enabled))),
 	'pl.eatby'=>array('label'=>$langs->trans("EatByDate"), 'checked'=>0, 'position'=>10, 'enabled'=>(!empty($conf->productbatch->enabled))),
-    'pl.sellby'=>array('label'=>$langs->trans("SellByDate"), 'checked'=>0, 'position'=>10, 'enabled'=>(!empty($conf->productbatch->enabled))),
-    'e.ref'=>array('label'=>$langs->trans("Warehouse"), 'checked'=>1, 'enabled'=>(!$id > 0)), // If we are on specific warehouse, we hide it
-    'm.fk_user_author'=>array('label'=>$langs->trans("Author"), 'checked'=>0),
-    'm.inventorycode'=>array('label'=>$langs->trans("InventoryCodeShort"), 'checked'=>1),
-    'm.label'=>array('label'=>$langs->trans("MovementLabel"), 'checked'=>1),
-    'm.type_mouvement'=>array('label'=>$langs->trans("TypeMovement"), 'checked'=>1),
-    'origin'=>array('label'=>$langs->trans("Origin"), 'checked'=>1),
+	'pl.sellby'=>array('label'=>$langs->trans("SellByDate"), 'checked'=>0, 'position'=>10, 'enabled'=>(!empty($conf->productbatch->enabled))),
+	'e.ref'=>array('label'=>$langs->trans("Warehouse"), 'checked'=>1, 'enabled'=>(!$id > 0)), // If we are on specific warehouse, we hide it
+	'm.fk_user_author'=>array('label'=>$langs->trans("Author"), 'checked'=>0),
+	'm.inventorycode'=>array('label'=>$langs->trans("InventoryCodeShort"), 'checked'=>1),
+	'm.label'=>array('label'=>$langs->trans("MovementLabel"), 'checked'=>1),
+	'm.type_mouvement'=>array('label'=>$langs->trans("TypeMovement"), 'checked'=>1),
+	'origin'=>array('label'=>$langs->trans("Origin"), 'checked'=>1),
 	'm.value'=>array('label'=>$langs->trans("Qty"), 'checked'=>1),
 	'm.price'=>array('label'=>$langs->trans("UnitPurchaseValue"), 'checked'=>0),
 	//'m.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-    //'m.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500)
+	//'m.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500)
 );
 
 $usercanread = (($user->rights->stock->mouvement->lire));
@@ -135,21 +135,21 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 // Do we click on purge search criteria ?
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
 {
-    $year = '';
-    $month = '';
-    $search_ref = '';
-    $search_movement = "";
-    $search_type_mouvement = "";
-    $search_inventorycode = "";
-    $search_product_ref = "";
-    $search_product = "";
-    $search_warehouse = "";
-    $search_user = "";
-    $search_batch = "";
-    $search_qty = '';
-    $sall = "";
+	$year = '';
+	$month = '';
+	$search_ref = '';
+	$search_movement = "";
+	$search_type_mouvement = "";
+	$search_inventorycode = "";
+	$search_product_ref = "";
+	$search_product = "";
+	$search_warehouse = "";
+	$search_user = "";
+	$search_batch = "";
+	$search_qty = '';
+	$sall = "";
 	$toselect = '';
-    $search_array_options = array();
+	$search_array_options = array();
 }
 
 // Correct stock
@@ -174,7 +174,7 @@ if ($action == "correct_stock")
 	}
 
 	if (!$error)
-    {
+	{
 		$origin_element = '';
 		$origin_id = null;
 
@@ -184,55 +184,55 @@ if ($action == "correct_stock")
 			$origin_id = GETPOST('projectid', 'int');
 		}
 
-        if ($product->hasbatch())
-        {
-        	$batch = GETPOST('batch_number', 'alpha');
+		if ($product->hasbatch())
+		{
+			$batch = GETPOST('batch_number', 'alpha');
 
-        	//$eatby=GETPOST('eatby');
-        	//$sellby=GETPOST('sellby');
-        	$eatby = dol_mktime(0, 0, 0, GETPOST('eatbymonth', 'int'), GETPOST('eatbyday', 'int'), GETPOST('eatbyyear', 'int'));
-        	$sellby = dol_mktime(0, 0, 0, GETPOST('sellbymonth', 'int'), GETPOST('sellbyday', 'int'), GETPOST('sellbyyear', 'int'));
+			//$eatby=GETPOST('eatby');
+			//$sellby=GETPOST('sellby');
+			$eatby = dol_mktime(0, 0, 0, GETPOST('eatbymonth', 'int'), GETPOST('eatbyday', 'int'), GETPOST('eatbyyear', 'int'));
+			$sellby = dol_mktime(0, 0, 0, GETPOST('sellbymonth', 'int'), GETPOST('sellbyday', 'int'), GETPOST('sellbyyear', 'int'));
 
-	        $result = $product->correct_stock_batch(
-	            $user,
-	            $id,
-	            GETPOST("nbpiece", 'int'),
-	            GETPOST("mouvement", 'int'),
-	            GETPOST("label", 'san_alpha'),
-	            GETPOST('unitprice', 'alpha'),
-	        	$eatby,
-	            $sellby,
-	            $batch,
-	        	GETPOST('inventorycode', 'alpha'),
-	        	$origin_element,
-	        	$origin_id
-	        ); // We do not change value of stock for a correction
-        } else {
-	        $result = $product->correct_stock(
-	            $user,
-	            $id,
-	            GETPOST("nbpiece", 'int'),
-	            GETPOST("mouvement", 'alpha'),
-	            GETPOST("label", 'san_alpha'),
-	            GETPOST('unitprice', 'alpha'),
-	        	GETPOST('inventorycode', 'alpha'),
-	        	$origin_element,
-	        	$origin_id
-	        ); // We do not change value of stock for a correction
-        }
+			$result = $product->correct_stock_batch(
+				$user,
+				$id,
+				GETPOST("nbpiece", 'int'),
+				GETPOST("mouvement", 'int'),
+				GETPOST("label", 'san_alpha'),
+				GETPOST('unitprice', 'alpha'),
+				$eatby,
+				$sellby,
+				$batch,
+				GETPOST('inventorycode', 'alpha'),
+				$origin_element,
+				$origin_id
+			); // We do not change value of stock for a correction
+		} else {
+			$result = $product->correct_stock(
+				$user,
+				$id,
+				GETPOST("nbpiece", 'int'),
+				GETPOST("mouvement", 'alpha'),
+				GETPOST("label", 'san_alpha'),
+				GETPOST('unitprice', 'alpha'),
+				GETPOST('inventorycode', 'alpha'),
+				$origin_element,
+				$origin_id
+			); // We do not change value of stock for a correction
+		}
 
-        if ($result > 0)
-        {
-            header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-            exit;
-        } else {
-            $error++;
-            setEventMessages($product->error, $product->errors, 'errors');
-            $action = 'correction';
-        }
-    }
+		if ($result > 0)
+		{
+			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+			exit;
+		} else {
+			$error++;
+			setEventMessages($product->error, $product->errors, 'errors');
+			$action = 'correction';
+		}
+	}
 
-    if (!$error) $action = '';
+	if (!$error) $action = '';
 }
 
 // Transfer stock from a warehouse to another warehouse
@@ -241,155 +241,155 @@ if ($action == "transfert_stock" && !$cancel)
 	$product = new Product($db);
 	if (!empty($product_id)) $result = $product->fetch($product_id);
 
-    if (!(GETPOST("id_entrepot_destination", 'int') > 0))
-    {
-        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
-        $error++;
-        $action = 'transfert';
-    }
+	if (!(GETPOST("id_entrepot_destination", 'int') > 0))
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
+		$error++;
+		$action = 'transfert';
+	}
 	if (empty($product_id))
 	{
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Product")), null, 'errors');
 		$action = 'transfert';
 	}
-    if (!GETPOST("nbpiece", 'int'))
-    {
-        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NumberOfUnit")), null, 'errors');
-        $error++;
-        $action = 'transfert';
-    }
-    if ($id == GETPOST("id_entrepot_destination", 'int'))
-    {
-        setEventMessages($langs->trans("ErrorSrcAndTargetWarehouseMustDiffers"), null, 'errors');
-        $error++;
-        $action = 'transfert';
-    }
+	if (!GETPOST("nbpiece", 'int'))
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NumberOfUnit")), null, 'errors');
+		$error++;
+		$action = 'transfert';
+	}
+	if ($id == GETPOST("id_entrepot_destination", 'int'))
+	{
+		setEventMessages($langs->trans("ErrorSrcAndTargetWarehouseMustDiffers"), null, 'errors');
+		$error++;
+		$action = 'transfert';
+	}
 
-    if (!empty($conf->productbatch->enabled))
-    {
-        $product = new Product($db);
-        $result = $product->fetch($product_id);
+	if (!empty($conf->productbatch->enabled))
+	{
+		$product = new Product($db);
+		$result = $product->fetch($product_id);
 
-        if ($product->hasbatch() && !GETPOST("batch_number", 'alpha'))
-        {
-            setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("batch_number")), null, 'errors');
-            $error++;
-            $action = 'transfert';
-        }
-    }
+		if ($product->hasbatch() && !GETPOST("batch_number", 'alpha'))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("batch_number")), null, 'errors');
+			$error++;
+			$action = 'transfert';
+		}
+	}
 
-    if (!$error)
-    {
-        if ($id)
-        {
-            $object = new Entrepot($db);
-            $result = $object->fetch($id);
+	if (!$error)
+	{
+		if ($id)
+		{
+			$object = new Entrepot($db);
+			$result = $object->fetch($id);
 
-            $db->begin();
+			$db->begin();
 
-            $product->load_stock('novirtual'); // Load array product->stock_warehouse
+			$product->load_stock('novirtual'); // Load array product->stock_warehouse
 
-            // Define value of products moved
-            $pricesrc = 0;
-            if (isset($product->pmp)) $pricesrc = $product->pmp;
-            $pricedest = $pricesrc;
+			// Define value of products moved
+			$pricesrc = 0;
+			if (isset($product->pmp)) $pricesrc = $product->pmp;
+			$pricedest = $pricesrc;
 
-            if ($product->hasbatch())
-            {
-                $pdluo = new Productbatch($db);
+			if ($product->hasbatch())
+			{
+				$pdluo = new Productbatch($db);
 
-                if ($pdluoid > 0)
-                {
-                    $result = $pdluo->fetch($pdluoid);
-                    if ($result)
-                    {
-                        $srcwarehouseid = $pdluo->warehouseid;
-                        $batch = $pdluo->batch;
-                        $eatby = $pdluo->eatby;
-                        $sellby = $pdluo->sellby;
-                    } else {
-                        setEventMessages($pdluo->error, $pdluo->errors, 'errors');
-                        $error++;
-                    }
-                } else {
-                    $srcwarehouseid = $id;
-                    $batch = GETPOST('batch_number', 'alpha');
-                    $eatby = $d_eatby;
-                    $sellby = $d_sellby;
-                }
+				if ($pdluoid > 0)
+				{
+					$result = $pdluo->fetch($pdluoid);
+					if ($result)
+					{
+						$srcwarehouseid = $pdluo->warehouseid;
+						$batch = $pdluo->batch;
+						$eatby = $pdluo->eatby;
+						$sellby = $pdluo->sellby;
+					} else {
+						setEventMessages($pdluo->error, $pdluo->errors, 'errors');
+						$error++;
+					}
+				} else {
+					$srcwarehouseid = $id;
+					$batch = GETPOST('batch_number', 'alpha');
+					$eatby = $d_eatby;
+					$sellby = $d_sellby;
+				}
 
-                if (!$error)
-                {
-                    // Remove stock
-                    $result1 = $product->correct_stock_batch(
-                        $user,
-                        $srcwarehouseid,
-                        GETPOST("nbpiece", 'int'),
-                        1,
-                        GETPOST("label", 'san_alpha'),
-                        $pricesrc,
-                        $eatby,
-                        $sellby,
-                        $batch,
-                        GETPOST('inventorycode', 'alpha')
-                    );
-                    // Add stock
-                    $result2 = $product->correct_stock_batch(
-                        $user,
-                        GETPOST("id_entrepot_destination", 'int'),
-                        GETPOST("nbpiece", 'int'),
-                        0,
-                        GETPOST("label", 'san_alpha'),
-                        $pricedest,
-                        $eatby,
-                        $sellby,
-                        $batch,
-                        GETPOST('inventorycode', 'alpha')
-                    );
-                }
-            } else {
-                // Remove stock
-                $result1 = $product->correct_stock(
-                    $user,
-                    $id,
-                    GETPOST("nbpiece", 'int'),
-                    1,
-                    GETPOST("label", 'alpha'),
-                    $pricesrc,
-                    GETPOST('inventorycode', 'alpha')
-                );
+				if (!$error)
+				{
+					// Remove stock
+					$result1 = $product->correct_stock_batch(
+						$user,
+						$srcwarehouseid,
+						GETPOST("nbpiece", 'int'),
+						1,
+						GETPOST("label", 'san_alpha'),
+						$pricesrc,
+						$eatby,
+						$sellby,
+						$batch,
+						GETPOST('inventorycode', 'alpha')
+					);
+					// Add stock
+					$result2 = $product->correct_stock_batch(
+						$user,
+						GETPOST("id_entrepot_destination", 'int'),
+						GETPOST("nbpiece", 'int'),
+						0,
+						GETPOST("label", 'san_alpha'),
+						$pricedest,
+						$eatby,
+						$sellby,
+						$batch,
+						GETPOST('inventorycode', 'alpha')
+					);
+				}
+			} else {
+				// Remove stock
+				$result1 = $product->correct_stock(
+					$user,
+					$id,
+					GETPOST("nbpiece", 'int'),
+					1,
+					GETPOST("label", 'alpha'),
+					$pricesrc,
+					GETPOST('inventorycode', 'alpha')
+				);
 
-                // Add stock
-                $result2 = $product->correct_stock(
-                    $user,
-                    GETPOST("id_entrepot_destination"),
-                    GETPOST("nbpiece", 'int'),
-                    0,
-                    GETPOST("label", 'alpha'),
-                    $pricedest,
-                    GETPOST('inventorycode', 'alpha')
-                );
-            }
-            if (!$error && $result1 >= 0 && $result2 >= 0)
-            {
-                $db->commit();
+				// Add stock
+				$result2 = $product->correct_stock(
+					$user,
+					GETPOST("id_entrepot_destination"),
+					GETPOST("nbpiece", 'int'),
+					0,
+					GETPOST("label", 'alpha'),
+					$pricedest,
+					GETPOST('inventorycode', 'alpha')
+				);
+			}
+			if (!$error && $result1 >= 0 && $result2 >= 0)
+			{
+				$db->commit();
 
-                if ($backtopage)
-                {
-                    header("Location: ".$backtopage);
-                    exit;
-                } else {
-                    header("Location: movement_list.php?id=".$object->id);
-                    exit;
-                }
-            } else {
-                setEventMessages($product->error, $product->errors, 'errors');
-                $db->rollback();
-                $action = 'transfert';
-            }
-        }
-    }
+				if ($backtopage)
+				{
+					header("Location: ".$backtopage);
+					exit;
+				} else {
+					header("Location: movement_list.php?id=".$object->id);
+					exit;
+				}
+			} else {
+				setEventMessages($product->error, $product->errors, 'errors');
+				$db->rollback();
+				$action = 'transfert';
+			}
+		}
+	}
 }
 
 
@@ -405,11 +405,11 @@ include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 if (empty($reshook) && $action != 'remove_file')
 {
-    $objectclass = 'MouvementStock';
-    $objectlabel = 'Movements';
-    $permissiontoread = $user->rights->stock->lire;
-    $permissiontodelete = $user->rights->stock->supprimer;
-    $uploaddir = $conf->stock->dir_output."/movement/";
+	$objectclass = 'MouvementStock';
+	$objectlabel = 'Movements';
+	$permissiontoread = $user->rights->stock->lire;
+	$permissiontodelete = $user->rights->stock->supprimer;
+	$uploaddir = $conf->stock->dir_output."/movement/";
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
@@ -479,13 +479,13 @@ $sql .= $db->order($sortfield, $sortorder);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-    	$page = 0;
-    	$offset = 0;
-    }
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 //print $sql;
@@ -498,125 +498,125 @@ if ($resql)
 	$object = new Entrepot($db);
 
 	if ($idproduct > 0)
-    {
-        $product->fetch($idproduct);
-    }
-    if ($id > 0 || $ref)
-    {
-        $result = $object->fetch($id, $ref);
-        if ($result < 0)
-        {
-            dol_print_error($db);
-        }
-    }
+	{
+		$product->fetch($idproduct);
+	}
+	if ($id > 0 || $ref)
+	{
+		$result = $object->fetch($id, $ref);
+		if ($result < 0)
+		{
+			dol_print_error($db);
+		}
+	}
 
-    $num = $db->num_rows($resql);
+	$num = $db->num_rows($resql);
 
-    $arrayofselected = is_array($toselect) ? $toselect : array();
+	$arrayofselected = is_array($toselect) ? $toselect : array();
 
 
-    $i = 0;
-    $help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
-    if ($msid) $texte = $langs->trans('StockMovementForId', $msid);
+	$i = 0;
+	$help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
+	if ($msid) $texte = $langs->trans('StockMovementForId', $msid);
 	else {
 		$texte = $langs->trans("ListOfStockMovements");
 		if ($id) $texte .= ' ('.$langs->trans("ForThisWarehouse").')';
 	}
-    llxHeader("", $texte, $help_url);
+	llxHeader("", $texte, $help_url);
 
-    /*
+	/*
      * Show tab only if we ask a particular warehouse
      */
-    if ($object->id > 0)
-    {
-        $head = stock_prepare_head($object);
+	if ($object->id > 0)
+	{
+		$head = stock_prepare_head($object);
 
-        dol_fiche_head($head, 'movements', $langs->trans("Warehouse"), -1, 'stock');
+		print dol_get_fiche_head($head, 'movements', $langs->trans("Warehouse"), -1, 'stock');
 
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        $morehtmlref = '<div class="refidno">';
-        $morehtmlref .= $langs->trans("LocationSummary").' : '.$object->lieu;
-        $morehtmlref .= '</div>';
+		$morehtmlref = '<div class="refidno">';
+		$morehtmlref .= $langs->trans("LocationSummary").' : '.$object->lieu;
+		$morehtmlref .= '</div>';
 
-        $shownav = 1;
-        if ($user->socid && !in_array('stock', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+		$shownav = 1;
+		if ($user->socid && !in_array('stock', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
-        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref', 'ref', $morehtmlref);
+		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref', 'ref', $morehtmlref);
 
 
-        print '<div class="fichecenter">';
-        print '<div class="fichehalfleft">';
-        print '<div class="underbanner clearboth"></div>';
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
+		print '<div class="underbanner clearboth"></div>';
 
-        print '<table class="border centpercent">';
+		print '<table class="border centpercent">';
 
-        print '<tr>';
+		print '<tr>';
 
-        // Description
-        print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>'.dol_htmlentitiesbr($object->description).'</td></tr>';
+		// Description
+		print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>'.dol_htmlentitiesbr($object->description).'</td></tr>';
 
-        $calcproductsunique = $object->nb_different_products();
-        $calcproducts = $object->nb_products();
+		$calcproductsunique = $object->nb_different_products();
+		$calcproducts = $object->nb_products();
 
-        // Total nb of different products
-        print '<tr><td>'.$langs->trans("NumberOfDifferentProducts").'</td><td>';
-        print empty($calcproductsunique['nb']) ? '0' : $calcproductsunique['nb'];
-        print "</td></tr>";
+		// Total nb of different products
+		print '<tr><td>'.$langs->trans("NumberOfDifferentProducts").'</td><td>';
+		print empty($calcproductsunique['nb']) ? '0' : $calcproductsunique['nb'];
+		print "</td></tr>";
 
-        // Nb of products
-        print '<tr><td>'.$langs->trans("NumberOfProducts").'</td><td>';
-        $valtoshow = price2num($calcproducts['nb'], 'MS');
-        print empty($valtoshow) ? '0' : $valtoshow;
-        print "</td></tr>";
+		// Nb of products
+		print '<tr><td>'.$langs->trans("NumberOfProducts").'</td><td>';
+		$valtoshow = price2num($calcproducts['nb'], 'MS');
+		print empty($valtoshow) ? '0' : $valtoshow;
+		print "</td></tr>";
 
-        print '</table>';
+		print '</table>';
 
-        print '</div>';
-        print '<div class="fichehalfright">';
-        print '<div class="ficheaddleft">';
-        print '<div class="underbanner clearboth"></div>';
+		print '</div>';
+		print '<div class="fichehalfright">';
+		print '<div class="ficheaddleft">';
+		print '<div class="underbanner clearboth"></div>';
 
-        print '<table class="border centpercent">';
+		print '<table class="border centpercent">';
 
-        // Value
-        print '<tr><td class="titlefield">'.$langs->trans("EstimatedStockValueShort").'</td><td>';
-        print price((empty($calcproducts['value']) ? '0' : price2num($calcproducts['value'], 'MT')), 0, $langs, 0, -1, -1, $conf->currency);
-        print "</td></tr>";
+		// Value
+		print '<tr><td class="titlefield">'.$langs->trans("EstimatedStockValueShort").'</td><td>';
+		print price((empty($calcproducts['value']) ? '0' : price2num($calcproducts['value'], 'MT')), 0, $langs, 0, -1, -1, $conf->currency);
+		print "</td></tr>";
 
-        // Last movement
-        $sql = "SELECT MAX(m.datem) as datem";
-        $sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
-        $sql .= " WHERE m.fk_entrepot = ".(int) $object->id;
-        $resqlbis = $db->query($sql);
-        if ($resqlbis)
-        {
-            $obj = $db->fetch_object($resqlbis);
-            $lastmovementdate = $db->jdate($obj->datem);
-        } else {
-            dol_print_error($db);
-        }
+		// Last movement
+		$sql = "SELECT MAX(m.datem) as datem";
+		$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
+		$sql .= " WHERE m.fk_entrepot = ".(int) $object->id;
+		$resqlbis = $db->query($sql);
+		if ($resqlbis)
+		{
+			$obj = $db->fetch_object($resqlbis);
+			$lastmovementdate = $db->jdate($obj->datem);
+		} else {
+			dol_print_error($db);
+		}
 
-        print '<tr><td>'.$langs->trans("LastMovement").'</td><td>';
-        if ($lastmovementdate)
-        {
-            print dol_print_date($lastmovementdate, 'dayhour');
-        } else {
-            print $langs->trans("None");
-        }
-        print "</td></tr>";
+		print '<tr><td>'.$langs->trans("LastMovement").'</td><td>';
+		if ($lastmovementdate)
+		{
+			print dol_print_date($lastmovementdate, 'dayhour');
+		} else {
+			print $langs->trans("None");
+		}
+		print "</td></tr>";
 
-        print "</table>";
+		print "</table>";
 
-        print '</div>';
-        print '</div>';
-        print '</div>';
+		print '</div>';
+		print '</div>';
+		print '</div>';
 
-        print '<div class="clearboth"></div>';
+		print '<div class="clearboth"></div>';
 
-        dol_fiche_end();
-    }
+		print dol_get_fiche_end();
+	}
 
 
 	/*
@@ -638,44 +638,44 @@ if ($resql)
 	}
 
 
-    /* ************************************************************************** */
-    /*                                                                            */
-    /* Barre d'action                                                             */
-    /*                                                                            */
-    /* ************************************************************************** */
+	/* ************************************************************************** */
+	/*                                                                            */
+	/* Barre d'action                                                             */
+	/*                                                                            */
+	/* ************************************************************************** */
 
-    if ((empty($action) || $action == 'list') && $id > 0)
-    {
-        print "<div class=\"tabsAction\">\n";
+	if ((empty($action) || $action == 'list') && $id > 0)
+	{
+		print "<div class=\"tabsAction\">\n";
 
-        if ($user->rights->stock->mouvement->creer)
-        {
-            print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=correction">'.$langs->trans("CorrectStock").'</a>';
-        }
+		if ($user->rights->stock->mouvement->creer)
+		{
+			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=correction">'.$langs->trans("CorrectStock").'</a>';
+		}
 
-        if ($user->rights->stock->mouvement->creer)
-        {
-            print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=transfert">'.$langs->trans("TransferStock").'</a>';
-        }
+		if ($user->rights->stock->mouvement->creer)
+		{
+			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=transfert">'.$langs->trans("TransferStock").'</a>';
+		}
 
-        print '</div><br>';
-    }
+		print '</div><br>';
+	}
 
-    $param = '';
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-    if ($id > 0)                 $param .= '&id='.urlencode($id);
-    if ($search_movement)        $param .= '&search_movement='.urlencode($search_movement);
-    if ($search_inventorycode)   $param .= '&search_inventorycode='.urlencode($search_inventorycode);
-    if ($search_type_mouvement)	 $param .= '&search_type_mouvement='.urlencode($search_type_mouvement);
-    if ($search_product_ref)     $param .= '&search_product_ref='.urlencode($search_product_ref);
-    if ($search_product)         $param .= '&search_product='.urlencode($search_product);
-    if ($search_batch)           $param .= '&search_batch='.urlencode($search_batch);
-    if ($search_warehouse > 0)   $param .= '&search_warehouse='.urlencode($search_warehouse);
-    if ($search_user)            $param .= '&search_user='.urlencode($search_user);
-    if ($idproduct > 0)          $param .= '&idproduct='.urlencode($idproduct);
-    // Add $param from extra fields
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+	$param = '';
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+	if ($id > 0)                 $param .= '&id='.urlencode($id);
+	if ($search_movement)        $param .= '&search_movement='.urlencode($search_movement);
+	if ($search_inventorycode)   $param .= '&search_inventorycode='.urlencode($search_inventorycode);
+	if ($search_type_mouvement)	 $param .= '&search_type_mouvement='.urlencode($search_type_mouvement);
+	if ($search_product_ref)     $param .= '&search_product_ref='.urlencode($search_product_ref);
+	if ($search_product)         $param .= '&search_product='.urlencode($search_product);
+	if ($search_batch)           $param .= '&search_batch='.urlencode($search_batch);
+	if ($search_warehouse > 0)   $param .= '&search_warehouse='.urlencode($search_warehouse);
+	if ($search_user)            $param .= '&search_user='.urlencode($search_user);
+	if ($idproduct > 0)          $param .= '&idproduct='.urlencode($idproduct);
+	// Add $param from extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 	// List of mass actions available
 	$arrayofmassactions = array(
@@ -686,27 +686,27 @@ if ($resql)
 	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    print '<input type="hidden" name="action" value="list">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
-    print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
-    if ($id > 0) print '<input type="hidden" name="id" value="'.$id.'">';
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+	if ($id > 0) print '<input type="hidden" name="id" value="'.$id.'">';
 
-    if ($id > 0) print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, '', '', $limit);
-    else print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, '', '', $limit);
+	if ($id > 0) print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, '', '', $limit);
+	else print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, '', '', $limit);
 
 	if ($sall)
-    {
-        foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
-        print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
-    }
+	{
+		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+	}
 
-    $moreforfilter = '';
+	$moreforfilter = '';
 
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
@@ -715,100 +715,100 @@ if ($resql)
 
 	if (!empty($moreforfilter))
 	{
-        print '<div class="liste_titre liste_titre_bydiv centpercent">';
-	    print $moreforfilter;
-	    print '</div>';
+		print '<div class="liste_titre liste_titre_bydiv centpercent">';
+		print $moreforfilter;
+		print '</div>';
 	}
 
-    $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-    $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
-    // Fields title search
-    print '<tr class="liste_titre_filter">';
-    if (!empty($arrayfields['m.rowid']['checked']))
-    {
-	    // Ref
-	    print '<td class="liste_titre left">';
-	    print '<input class="flat maxwidth25" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
-	    print '</td>';
-    }
-    if (!empty($arrayfields['m.datem']['checked']))
-    {
-    	print '<td class="liste_titre nowraponall">';
-	    print '<input class="flat" type="text" size="2" maxlength="2" placeholder="'.dol_escape_htmltag($langs->trans("Month")).'" name="month" value="'.$month.'">';
-    	if (empty($conf->productbatch->enabled)) print '&nbsp;';
-	    //else print '<br>';
-	    $syear = $year ? $year : -1;
-	    print '<input class="flat maxwidth50" type="text" maxlength="4" placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" name="year" value="'.($syear > 0 ? $syear : '').'">';
-	    //print $formother->selectyear($syear,'year',1, 20, 5);
-	    print '</td>';
-    }
-    if (!empty($arrayfields['p.ref']['checked']))
-    {
-	    // Product Ref
-	    print '<td class="liste_titre left">';
-	    print '<input class="flat maxwidth75" type="text" name="search_product_ref" value="'.dol_escape_htmltag($idproduct ? $product->ref : $search_product_ref).'">';
-	    print '</td>';
-    }
-    if (!empty($arrayfields['p.label']['checked']))
-    {
-	    // Product label
-	    print '<td class="liste_titre left">';
-	    print '<input class="flat maxwidth100" type="text" name="search_product" value="'.dol_escape_htmltag($idproduct ? $product->label : $search_product).'">';
-	    print '</td>';
-    }
-    // Batch
-    if (!empty($arrayfields['m.batch']['checked']))
-    {
-    	print '<td class="liste_titre center"><input class="flat maxwidth75" type="text" name="search_batch" value="'.dol_escape_htmltag($search_batch).'"></td>';
+	// Fields title search
+	print '<tr class="liste_titre_filter">';
+	if (!empty($arrayfields['m.rowid']['checked']))
+	{
+		// Ref
+		print '<td class="liste_titre left">';
+		print '<input class="flat maxwidth25" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['m.datem']['checked']))
+	{
+		print '<td class="liste_titre nowraponall">';
+		print '<input class="flat" type="text" size="2" maxlength="2" placeholder="'.dol_escape_htmltag($langs->trans("Month")).'" name="month" value="'.$month.'">';
+		if (empty($conf->productbatch->enabled)) print '&nbsp;';
+		//else print '<br>';
+		$syear = $year ? $year : -1;
+		print '<input class="flat maxwidth50" type="text" maxlength="4" placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" name="year" value="'.($syear > 0 ? $syear : '').'">';
+		//print $formother->selectyear($syear,'year',1, 20, 5);
+		print '</td>';
+	}
+	if (!empty($arrayfields['p.ref']['checked']))
+	{
+		// Product Ref
+		print '<td class="liste_titre left">';
+		print '<input class="flat maxwidth75" type="text" name="search_product_ref" value="'.dol_escape_htmltag($idproduct ? $product->ref : $search_product_ref).'">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['p.label']['checked']))
+	{
+		// Product label
+		print '<td class="liste_titre left">';
+		print '<input class="flat maxwidth100" type="text" name="search_product" value="'.dol_escape_htmltag($idproduct ? $product->label : $search_product).'">';
+		print '</td>';
+	}
+	// Batch
+	if (!empty($arrayfields['m.batch']['checked']))
+	{
+		print '<td class="liste_titre center"><input class="flat maxwidth75" type="text" name="search_batch" value="'.dol_escape_htmltag($search_batch).'"></td>';
+	}
+	if (!empty($arrayfields['pl.eatby']['checked']))
+	{
+		print '<td class="liste_titre left">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['pl.sellby']['checked']))
+	{
+		print '<td class="liste_titre left">';
+		print '</td>';
+	}
+	// Warehouse
+	if (!empty($arrayfields['e.ref']['checked']))
+	{
+		print '<td class="liste_titre maxwidthonsmartphone left">';
+		//print '<input class="flat" type="text" size="8" name="search_warehouse" value="'.($search_warehouse).'">';
+		print $formproduct->selectWarehouses($search_warehouse, 'search_warehouse', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'maxwidth200');
+		print '</td>';
+	}
+	if (!empty($arrayfields['m.fk_user_author']['checked']))
+	{
+		// Author
+		print '<td class="liste_titre left">';
+		print '<input class="flat" type="text" size="6" name="search_user" value="'.dol_escape_htmltag($search_user).'">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['m.inventorycode']['checked']))
+	{
+		// Inventory code
+		print '<td class="liste_titre left">';
+		print '<input class="flat" type="text" size="4" name="search_inventorycode" value="'.dol_escape_htmltag($search_inventorycode).'">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['m.label']['checked']))
+	{
+		// Label of movement
+		print '<td class="liste_titre left">';
+		print '<input class="flat" type="text" size="8" name="search_movement" value="'.dol_escape_htmltag($search_movement).'">';
+		print '</td>';
 	}
-    if (!empty($arrayfields['pl.eatby']['checked']))
-    {
-	    print '<td class="liste_titre left">';
-	    print '</td>';
-    }
-    if (!empty($arrayfields['pl.sellby']['checked']))
-    {
-	    print '<td class="liste_titre left">';
-	    print '</td>';
-    }
-    // Warehouse
-    if (!empty($arrayfields['e.ref']['checked']))
-    {
-        print '<td class="liste_titre maxwidthonsmartphone left">';
-        //print '<input class="flat" type="text" size="8" name="search_warehouse" value="'.($search_warehouse).'">';
-        print $formproduct->selectWarehouses($search_warehouse, 'search_warehouse', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'maxwidth200');
-        print '</td>';
-    }
-    if (!empty($arrayfields['m.fk_user_author']['checked']))
-    {
-	    // Author
-	    print '<td class="liste_titre left">';
-	    print '<input class="flat" type="text" size="6" name="search_user" value="'.dol_escape_htmltag($search_user).'">';
-	    print '</td>';
-    }
-    if (!empty($arrayfields['m.inventorycode']['checked']))
-    {
-	    // Inventory code
-	    print '<td class="liste_titre left">';
-	    print '<input class="flat" type="text" size="4" name="search_inventorycode" value="'.dol_escape_htmltag($search_inventorycode).'">';
-	    print '</td>';
-    }
-    if (!empty($arrayfields['m.label']['checked']))
-    {
-	    // Label of movement
-	    print '<td class="liste_titre left">';
-	    print '<input class="flat" type="text" size="8" name="search_movement" value="'.dol_escape_htmltag($search_movement).'">';
-	    print '</td>';
-    }
 	if (!empty($arrayfields['m.type_mouvement']['checked']))
-    {
-	    // Type of movement
-	    print '<td class="liste_titre center">';
-	    //print '<input class="flat" type="text" size="3" name="search_type_mouvement" value="'.dol_escape_htmltag($search_type_mouvement).'">';
+	{
+		// Type of movement
+		print '<td class="liste_titre center">';
+		//print '<input class="flat" type="text" size="3" name="search_type_mouvement" value="'.dol_escape_htmltag($search_type_mouvement).'">';
 		print '<select id="search_type_mouvement" name="search_type_mouvement" class="maxwidth150">';
 		print '<option value="" '.(($search_type_mouvement == "") ? 'selected="selected"' : '').'></option>';
 		print '<option value="0" '.(($search_type_mouvement == "0") ? 'selected="selected"' : '').'>'.$langs->trans('StockIncreaseAfterCorrectTransfer').'</option>';
@@ -819,33 +819,33 @@ if ($resql)
 		print ajax_combobox('search_type_mouvement');
 		// TODO: add new function $formentrepot->selectTypeOfMovement(...) like
 		// print $formproduct->selectWarehouses($search_warehouse, 'search_warehouse', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'maxwidth200');
-	    print '</td>';
-    }
-    if (!empty($arrayfields['origin']['checked']))
-    {
-	    // Origin of movement
-	    print '<td class="liste_titre left">';
-	    print '&nbsp; ';
-	    print '</td>';
-    }
-    if (!empty($arrayfields['m.value']['checked']))
-    {
-	    // Qty
-	    print '<td class="liste_titre right">';
-	    print '<input class="flat" type="text" size="4" name="search_qty" value="'.dol_escape_htmltag($search_qty).'">';
-	    print '</td>';
-    }
-    if (!empty($arrayfields['m.price']['checked']))
-    {
-    	// Price
-    	print '<td class="liste_titre left">';
-    	print '&nbsp; ';
-    	print '</td>';
-    }
+		print '</td>';
+	}
+	if (!empty($arrayfields['origin']['checked']))
+	{
+		// Origin of movement
+		print '<td class="liste_titre left">';
+		print '&nbsp; ';
+		print '</td>';
+	}
+	if (!empty($arrayfields['m.value']['checked']))
+	{
+		// Qty
+		print '<td class="liste_titre right">';
+		print '<input class="flat" type="text" size="4" name="search_qty" value="'.dol_escape_htmltag($search_qty).'">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['m.price']['checked']))
+	{
+		// Price
+		print '<td class="liste_titre left">';
+		print '&nbsp; ';
+		print '</td>';
+	}
 
 
-    // Extra fields
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
+	// Extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 	// Fields from hook
 	$parameters = array('arrayfields'=>$arrayfields);
@@ -854,23 +854,23 @@ if ($resql)
 	// Date creation
 	if (!empty($arrayfields['m.datec']['checked']))
 	{
-	    print '<td class="liste_titre">';
-	    print '</td>';
+		print '<td class="liste_titre">';
+		print '</td>';
 	}
 	// Date modification
 	if (!empty($arrayfields['m.tms']['checked']))
 	{
-	    print '<td class="liste_titre">';
-	    print '</td>';
+		print '<td class="liste_titre">';
+		print '</td>';
 	}
-    // Actions
-    print '<td class="liste_titre maxwidthsearch">';
-    $searchpicto = $form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
-    print "</tr>\n";
+	// Actions
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
+	print '</td>';
+	print "</tr>\n";
 
-    print '<tr class="liste_titre">';
+	print '<tr class="liste_titre">';
 	if (!empty($arrayfields['m.rowid']['checked']))
 		print_liste_field_titre($arrayfields['m.rowid']['label'], $_SERVER["PHP_SELF"], 'm.rowid', '', $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['m.datem']['checked']))
@@ -886,9 +886,9 @@ if ($resql)
 	if (!empty($arrayfields['pl.sellby']['checked']))
 		print_liste_field_titre($arrayfields['pl.sellby']['label'], $_SERVER["PHP_SELF"], 'pl.sellby', '', $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($arrayfields['e.ref']['checked'])) {
-        // We are on a specific warehouse card, no filter on other should be possible
-        print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"], "e.ref", "", $param, "", $sortfield, $sortorder);
-    }
+		// We are on a specific warehouse card, no filter on other should be possible
+		print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"], "e.ref", "", $param, "", $sortfield, $sortorder);
+	}
 	if (!empty($arrayfields['m.fk_user_author']['checked']))
 		print_liste_field_titre($arrayfields['m.fk_user_author']['label'], $_SERVER["PHP_SELF"], "m.fk_user_author", "", $param, "", $sortfield, $sortorder);
 	if (!empty($arrayfields['m.inventorycode']['checked']))
@@ -904,221 +904,221 @@ if ($resql)
 	if (!empty($arrayfields['m.price']['checked']))
 		print_liste_field_titre($arrayfields['m.price']['label'], $_SERVER["PHP_SELF"], "m.price", "", $param, '', $sortfield, $sortorder, 'right ');
 
-    // Extra fields
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+	// Extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 
 	// Hook fields
 	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
-    $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
+	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 	if (!empty($arrayfields['m.datec']['checked'])) {
-        print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-    }
+		print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
 	if (!empty($arrayfields['m.tms']['checked'])) {
-        print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-    }
+		print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
-    print "</tr>\n";
+	print "</tr>\n";
 
 
-    $arrayofuniqueproduct = array();
-    while ($i < ($limit ? min($num, $limit) : $num)) {
-        $objp = $db->fetch_object($resql);
+	$arrayofuniqueproduct = array();
+	while ($i < ($limit ? min($num, $limit) : $num)) {
+		$objp = $db->fetch_object($resql);
 
-        $userstatic->id = $objp->fk_user_author;
-        $userstatic->login = $objp->login;
-        $userstatic->lastname = $objp->lastname;
-        $userstatic->firstname = $objp->firstname;
-        $userstatic->photo = $objp->photo;
+		$userstatic->id = $objp->fk_user_author;
+		$userstatic->login = $objp->login;
+		$userstatic->lastname = $objp->lastname;
+		$userstatic->firstname = $objp->firstname;
+		$userstatic->photo = $objp->photo;
 
-        $productstatic->id = $objp->rowid;
-        $productstatic->ref = $objp->product_ref;
-        $productstatic->label = $objp->produit;
-        $productstatic->type = $objp->type;
-        $productstatic->entity = $objp->entity;
-        $productstatic->status_batch = $objp->tobatch;
+		$productstatic->id = $objp->rowid;
+		$productstatic->ref = $objp->product_ref;
+		$productstatic->label = $objp->produit;
+		$productstatic->type = $objp->type;
+		$productstatic->entity = $objp->entity;
+		$productstatic->status_batch = $objp->tobatch;
 
-        $productlot->id = $objp->lotid;
-        $productlot->batch = $objp->batch;
-        $productlot->eatby = $objp->eatby;
-        $productlot->sellby = $objp->sellby;
+		$productlot->id = $objp->lotid;
+		$productlot->batch = $objp->batch;
+		$productlot->eatby = $objp->eatby;
+		$productlot->sellby = $objp->sellby;
 
-        $warehousestatic->id = $objp->entrepot_id;
-        $warehousestatic->label = $objp->warehouse_ref;
-        $warehousestatic->lieu = $objp->lieu;
+		$warehousestatic->id = $objp->entrepot_id;
+		$warehousestatic->label = $objp->warehouse_ref;
+		$warehousestatic->lieu = $objp->lieu;
 
-        $arrayofuniqueproduct[$objp->rowid] = $objp->produit;
+		$arrayofuniqueproduct[$objp->rowid] = $objp->produit;
 		if (!empty($objp->fk_origin)) {
 			$origin = $movement->get_origin($objp->fk_origin, $objp->origintype);
 		} else {
 			$origin = '';
 		}
 
-        print '<tr class="oddeven">';
-        // Id movement
-        if (!empty($arrayfields['m.rowid']['checked']))
-        {
-            // This is primary not movement id
-            print '<td>'.$objp->mid.'</td>';
-        }
-        if (!empty($arrayfields['m.datem']['checked']))
-        {
-	        // Date
-	        print '<td>'.dol_print_date($db->jdate($objp->datem), 'dayhour').'</td>';
-        }
-        if (!empty($arrayfields['p.ref']['checked']))
-        {
-	        // Product ref
-	        print '<td class="nowraponall">';
-	        print $productstatic->getNomUrl(1, 'stock', 16);
-	        print "</td>\n";
-        }
-        if (!empty($arrayfields['p.label']['checked']))
-        {
-	        // Product label
-	        print '<td>';
-	        /*$productstatic->id=$objp->rowid;
+		print '<tr class="oddeven">';
+		// Id movement
+		if (!empty($arrayfields['m.rowid']['checked']))
+		{
+			// This is primary not movement id
+			print '<td>'.$objp->mid.'</td>';
+		}
+		if (!empty($arrayfields['m.datem']['checked']))
+		{
+			// Date
+			print '<td>'.dol_print_date($db->jdate($objp->datem), 'dayhour').'</td>';
+		}
+		if (!empty($arrayfields['p.ref']['checked']))
+		{
+			// Product ref
+			print '<td class="nowraponall">';
+			print $productstatic->getNomUrl(1, 'stock', 16);
+			print "</td>\n";
+		}
+		if (!empty($arrayfields['p.label']['checked']))
+		{
+			// Product label
+			print '<td>';
+			/*$productstatic->id=$objp->rowid;
 	        $productstatic->ref=$objp->produit;
 	        $productstatic->type=$objp->type;
 	        print $productstatic->getNomUrl(1,'',16);*/
-	        print $productstatic->label;
-	        print "</td>\n";
-        }
-        if (!empty($arrayfields['m.batch']['checked']))
-        {
-	    	print '<td class="center nowraponall">';
-	    	if ($productlot->id > 0) print $productlot->getNomUrl(1);
-	    	else print $productlot->batch; // the id may not be defined if movement was entered when lot was not saved or if lot was removed after movement.
-	    	print '</td>';
-        }
-        if (!empty($arrayfields['pl.eatby']['checked']))
-        {
-        	print '<td class="center">'.dol_print_date($objp->eatby, 'day').'</td>';
-        }
-        if (!empty($arrayfields['pl.sellby']['checked']))
-        {
-        	print '<td class="center">'.dol_print_date($objp->sellby, 'day').'</td>';
+			print $productstatic->label;
+			print "</td>\n";
 		}
-        // Warehouse
-        if (!empty($arrayfields['e.ref']['checked']))
+		if (!empty($arrayfields['m.batch']['checked']))
 		{
-            print '<td>';
-            print $warehousestatic->getNomUrl(1);
-            print "</td>\n";
+			print '<td class="center nowraponall">';
+			if ($productlot->id > 0) print $productlot->getNomUrl(1);
+			else print $productlot->batch; // the id may not be defined if movement was entered when lot was not saved or if lot was removed after movement.
+			print '</td>';
 		}
-        // Author
-        if (!empty($arrayfields['m.fk_user_author']['checked']))
-        {
-	        print '<td class="tdoverflowmax100">';
-	        print $userstatic->getNomUrl(-1);
-	        print "</td>\n";
-        }
-        if (!empty($arrayfields['m.inventorycode']['checked']))
-        {
-	        // Inventory code
-	        print '<td><a href="'
+		if (!empty($arrayfields['pl.eatby']['checked']))
+		{
+			print '<td class="center">'.dol_print_date($objp->eatby, 'day').'</td>';
+		}
+		if (!empty($arrayfields['pl.sellby']['checked']))
+		{
+			print '<td class="center">'.dol_print_date($objp->sellby, 'day').'</td>';
+		}
+		// Warehouse
+		if (!empty($arrayfields['e.ref']['checked']))
+		{
+			print '<td>';
+			print $warehousestatic->getNomUrl(1);
+			print "</td>\n";
+		}
+		// Author
+		if (!empty($arrayfields['m.fk_user_author']['checked']))
+		{
+			print '<td class="tdoverflowmax100">';
+			print $userstatic->getNomUrl(-1);
+			print "</td>\n";
+		}
+		if (!empty($arrayfields['m.inventorycode']['checked']))
+		{
+			// Inventory code
+			print '<td><a href="'
 						.DOL_URL_ROOT.'/product/stock/movement_card.php?id='.urlencode($objp->entrepot_id)
 						.'&search_inventorycode='.urlencode($objp->inventorycode)
 						.'&search_type_mouvement='.urlencode($objp->type_mouvement)
 						.'">'
 						.$objp->inventorycode
 						.'</a></td>';
-        }
-        if (!empty($arrayfields['m.label']['checked']))
-        {
-            // Label of movement
-        	print '<td class="tdoverflowmax100aaa">'.$objp->label.'</td>';
-        }
+		}
+		if (!empty($arrayfields['m.label']['checked']))
+		{
+			// Label of movement
+			print '<td class="tdoverflowmax100aaa">'.$objp->label.'</td>';
+		}
 		if (!empty($arrayfields['m.type_mouvement']['checked']))
-        {
-            // Type of movement
-            switch ($objp->type_mouvement) {
-                case "0":
-                    print '<td class="center">'.$langs->trans('StockIncreaseAfterCorrectTransfer').'</td>';
-                    break;
-                case "1":
-                    print '<td class="center">'.$langs->trans('StockDecreaseAfterCorrectTransfer').'</td>';
-                    break;
-                case "2":
-                    print '<td class="center">'.$langs->trans('StockDecrease').'</td>';
-                    break;
-                case "3":
-                    print '<td class="center">'.$langs->trans('StockIncrease').'</td>';
-                    break;
-            }
-        }
-        if (!empty($arrayfields['origin']['checked']))
-        {
-        	// Origin of movement
-        	print '<td class="nowraponall">'.$origin.'</td>';
-        }
-        if (!empty($arrayfields['m.value']['checked']))
-        {
-	        // Qty
-	        print '<td class="right">';
-	        if ($objp->qt > 0) print '+';
-	        print $objp->qty;
-	        print '</td>';
-        }
-        if (!empty($arrayfields['m.price']['checked']))
-        {
-        	// Price
-        	print '<td class="right">';
-        	if ($objp->price != 0) print price($objp->price);
-        	print '</td>';
-        }
-        // Action column
-        print '<td class="nowrap center">';
-        if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-        {
-            $selected = 0;
-    		if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
-    		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
-        }
-        print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+		{
+			// Type of movement
+			switch ($objp->type_mouvement) {
+				case "0":
+					print '<td class="center">'.$langs->trans('StockIncreaseAfterCorrectTransfer').'</td>';
+					break;
+				case "1":
+					print '<td class="center">'.$langs->trans('StockDecreaseAfterCorrectTransfer').'</td>';
+					break;
+				case "2":
+					print '<td class="center">'.$langs->trans('StockDecrease').'</td>';
+					break;
+				case "3":
+					print '<td class="center">'.$langs->trans('StockIncrease').'</td>';
+					break;
+			}
+		}
+		if (!empty($arrayfields['origin']['checked']))
+		{
+			// Origin of movement
+			print '<td class="nowraponall">'.$origin.'</td>';
+		}
+		if (!empty($arrayfields['m.value']['checked']))
+		{
+			// Qty
+			print '<td class="right">';
+			if ($objp->qt > 0) print '+';
+			print $objp->qty;
+			print '</td>';
+		}
+		if (!empty($arrayfields['m.price']['checked']))
+		{
+			// Price
+			print '<td class="right">';
+			if ($objp->price != 0) print price($objp->price);
+			print '</td>';
+		}
+		// Action column
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+		{
+			$selected = 0;
+			if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
 
-        print "</tr>\n";
-        $i++;
-    }
-    $db->free($resql);
+		print "</tr>\n";
+		$i++;
+	}
+	$db->free($resql);
 
-    print "</table>";
-    print '</div>';
-    print "</form>";
+	print "</table>";
+	print '</div>';
+	print "</form>";
 
-    // Add number of product when there is a filter on period
-    if (count($arrayofuniqueproduct) == 1 && is_numeric($year))
-    {
-        print "<br>";
+	// Add number of product when there is a filter on period
+	if (count($arrayofuniqueproduct) == 1 && is_numeric($year))
+	{
+		print "<br>";
 
-        $productidselected = 0;
-    	foreach ($arrayofuniqueproduct as $key => $val) {
-    		$productidselected = $key;
-    		$productlabelselected = $val;
-    	}
+		$productidselected = 0;
+		foreach ($arrayofuniqueproduct as $key => $val) {
+			$productidselected = $key;
+			$productlabelselected = $val;
+		}
 		$datebefore = dol_get_first_day($year ? $year : strftime("%Y", time()), $month ? $month : 1, true);
 		$dateafter = dol_get_last_day($year ? $year : strftime("%Y", time()), $month ? $month : 12, true);
-    	$balancebefore = $movement->calculateBalanceForProductBefore($productidselected, $datebefore);
-    	$balanceafter = $movement->calculateBalanceForProductBefore($productidselected, $dateafter);
+		$balancebefore = $movement->calculateBalanceForProductBefore($productidselected, $datebefore);
+		$balanceafter = $movement->calculateBalanceForProductBefore($productidselected, $dateafter);
 
-    	//print '<tr class="total"><td class="liste_total">';
-    	print $langs->trans("NbOfProductBeforePeriod", $productlabelselected, dol_print_date($datebefore, 'day', 'gmt'));
-    	//print '</td>';
-    	//print '<td class="liste_total right" colspan="6">';
-    	print ': '.$balancebefore;
-    	print "<br>\n";
-    	//print '</td></tr>';
-    	//print '<tr class="total"><td class="liste_total">';
-    	print $langs->trans("NbOfProductAfterPeriod", $productlabelselected, dol_print_date($dateafter, 'day', 'gmt'));
-    	//print '</td>';
-    	//print '<td class="liste_total right" colspan="6">';
-    	print ': '.$balanceafter;
-    	print "<br>\n";
-        //print '</td></tr>';
-    }
+		//print '<tr class="total"><td class="liste_total">';
+		print $langs->trans("NbOfProductBeforePeriod", $productlabelselected, dol_print_date($datebefore, 'day', 'gmt'));
+		//print '</td>';
+		//print '<td class="liste_total right" colspan="6">';
+		print ': '.$balancebefore;
+		print "<br>\n";
+		//print '</td></tr>';
+		//print '<tr class="total"><td class="liste_total">';
+		print $langs->trans("NbOfProductAfterPeriod", $productlabelselected, dol_print_date($dateafter, 'day', 'gmt'));
+		//print '</td>';
+		//print '<td class="liste_total right" colspan="6">';
+		print ': '.$balanceafter;
+		print "<br>\n";
+		//print '</td></tr>';
+	}
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
@@ -1132,41 +1132,41 @@ $modulepart = 'movement';
 if ($action != 'create' && $action != 'edit' && $action != 'delete' && $id > 0)
 {
 	print '<br/>';
-    print '<div class="fichecenter"><div class="fichehalfleft">';
-    print '<a name="builddoc"></a>'; // ancre
+	print '<div class="fichecenter"><div class="fichehalfleft">';
+	print '<a name="builddoc"></a>'; // ancre
 
-    // Documents
-    $objectref = dol_sanitizeFileName($object->ref);
+	// Documents
+	$objectref = dol_sanitizeFileName($object->ref);
 	// Add inventorycode & type_mouvement to filename of the pdf
 	if (!empty($search_inventorycode)) $objectref .= "_".$id."_".$search_inventorycode;
 	if ($search_type_mouvement) $objectref .= "_".$search_type_mouvement;
-    $relativepath = $comref.'/'.$objectref.'.pdf';
-    $filedir = $conf->stock->dir_output.'/movement/'.$objectref;
+	$relativepath = $comref.'/'.$objectref.'.pdf';
+	$filedir = $conf->stock->dir_output.'/movement/'.$objectref;
 
-    $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id."&search_inventorycode=".$search_inventorycode."&search_type_mouvement=$search_type_mouvement";
-    $genallowed = $usercanread;
-    $delallowed = $usercancreate;
+	$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id."&search_inventorycode=".$search_inventorycode."&search_type_mouvement=$search_type_mouvement";
+	$genallowed = $usercanread;
+	$delallowed = $usercancreate;
 
 	$genallowed = $user->rights->stock->lire;
-    $delallowed = $user->rights->stock->creer;
+	$delallowed = $user->rights->stock->creer;
 
-    print $formfile->showdocuments($modulepart, $objectref, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', 0, '', $object->default_lang, '', $object);
-    $somethingshown = $formfile->numoffiles;
+	print $formfile->showdocuments($modulepart, $objectref, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', 0, '', $object->default_lang, '', $object);
+	$somethingshown = $formfile->numoffiles;
 
-    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-    $MAXEVENT = 10;
+	$MAXEVENT = 10;
 
-    $morehtmlright = '<a href="'.DOL_URL_ROOT.'/product/agenda.php?id='.$object->id.'">';
-    $morehtmlright .= $langs->trans("SeeAll");
-    $morehtmlright .= '</a>';
+	$morehtmlright = '<a href="'.DOL_URL_ROOT.'/product/agenda.php?id='.$object->id.'">';
+	$morehtmlright .= $langs->trans("SeeAll");
+	$morehtmlright .= '</a>';
 
-    // List of actions on element
-    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-    $formactions = new FormActions($db);
-    $somethingshown = $formactions->showactions($object, 'mouvement', 0, 1, '', $MAXEVENT, '', $morehtmlright); // Show all action for product
+	// List of actions on element
+	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+	$formactions = new FormActions($db);
+	$somethingshown = $formactions->showactions($object, 'mouvement', 0, 1, '', $MAXEVENT, '', $morehtmlright); // Show all action for product
 
-    print '</div></div></div>';
+	print '</div></div></div>';
 }
 
 
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index b533d4407a6..6ab8a99ac76 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -567,7 +567,7 @@ if ($resql)
 	{
 		$head = stock_prepare_head($object);
 
-		dol_fiche_head($head, 'movements', $langs->trans("Warehouse"), -1, 'stock');
+		print dol_get_fiche_head($head, 'movements', $langs->trans("Warehouse"), -1, 'stock');
 
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
@@ -661,7 +661,7 @@ if ($resql)
 
 		print '<div class="clearboth"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 	}
 
 
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 64c23814ec2..0ea05495e5a 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -450,7 +450,7 @@ if ($action == "transfert_stock" && !$cancel)
 }
 
 // Update batch information
-if ($action == 'updateline' && GETPOST('save') == $langs->trans('Save'))
+if ($action == 'updateline' && GETPOST('save') == $langs->trans("Save"))
 {
 	$pdluo = new Productbatch($db);
 	$result = $pdluo->fetch(GETPOST('pdluoid', 'int'));
@@ -524,7 +524,7 @@ if ($id > 0 || $ref)
 		$titre = $langs->trans("CardProduct".$object->type);
 		$picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
 
-		dol_fiche_head($head, 'stock', $titre, -1, $picto);
+		print dol_get_fiche_head($head, 'stock', $titre, -1, $picto);
 
 		dol_htmloutput_events();
 
@@ -733,7 +733,7 @@ if ($id > 0 || $ref)
 		print '</div>';
 		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 	}
 
 	// Correct stock
@@ -911,8 +911,8 @@ if (!$variants) {
 							print '</td>';
 						}
 						print '<td class="right" colspan="3">'.$pdluo->qty.($pdluo->qty < 0 ? ' '.img_warning() : '').'</td>';
-						print '<td colspan="4"><input type="submit" class="button" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'">';
-						print '<input type="submit" class="button" id="cancellinebutton" name="Cancel" value="'.$langs->trans("Cancel").'"></td></tr>';
+						print '<td colspan="4"><input type="submit" class="button button-save" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'">';
+						print '<input type="submit" class="button button-cancel" id="cancellinebutton" name="Cancel" value="'.$langs->trans("Cancel").'"></td></tr>';
 						print '</table>';
 						print '</form>';
 						print '</td></tr>';
@@ -985,7 +985,7 @@ if (!$variants) {
 			print '<tr class="liste_titre"><td width="40%">'.$formproduct->selectWarehouses('', 'fk_entrepot').'</td>';
 			print '<td class="right"><input name="seuil_stock_alerte" type="text" placeholder="'.$langs->trans("StockLimit").'" /></td>';
 			print '<td class="right"><input name="desiredstock" type="text" placeholder="'.$langs->trans("DesiredStock").'" /></td>';
-			print '<td class="right"><input type="submit" value="'.$langs->trans('Save').'" class="button" /></td>';
+			print '<td class="right"><input type="submit" value="'.$langs->trans("Save").'" class="button button-save" /></td>';
 			print '</tr>';
 		} else {
 			print '<tr class="liste_titre"><td width="40%">'.$langs->trans("Warehouse").'</td>';
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index dbedba85d99..8601ce25ebc 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -55,7 +55,7 @@ if (empty($action) && empty($id) && empty($ref)) $action = 'list';
 // Protection if external user
 if ($user->socid > 0)
 {
-    //accessforbidden();
+	//accessforbidden();
 }
 //$result = restrictedArea($user, 'mymodule', $id);
 
@@ -71,12 +71,12 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 //include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 if ($id || $ref)
 {
-    if ($ref)
-    {
-        $tmp = explode('_', $ref);
-        $productid = $tmp[0];
-        $batch = $tmp[1];
-    }
+	if ($ref)
+	{
+		$tmp = explode('_', $ref);
+		$productid = $tmp[0];
+		$batch = $tmp[1];
+	}
 	$object->fetch($id, $productid, $batch);
 	$object->ref = $object->batch; // For document management ( it use $object->ref)
 }
@@ -105,40 +105,40 @@ if (empty($reshook))
 {
 	if ($action == 'seteatby' && $user->rights->stock->creer)
 	{
-	    $newvalue = dol_mktime(12, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']);
+		$newvalue = dol_mktime(12, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']);
 		$result = $object->setValueFrom('eatby', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
 		if ($result < 0) dol_print_error($db, $object->error);
 	}
 
 	if ($action == 'setsellby' && $user->rights->stock->creer)
 	{
-	    $newvalue = dol_mktime(12, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']);
+		$newvalue = dol_mktime(12, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']);
 		$result = $object->setValueFrom('sellby', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
 		if ($result < 0) dol_print_error($db, $object->error);
 	}
 
 	if ($action == 'update_extras')
-    {
-    	$object->oldcopy = dol_clone($object);
+	{
+		$object->oldcopy = dol_clone($object);
 
-    	// Fill array 'array_options' with data from update form
-        $ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
-        if ($ret < 0) $error++;
+		// Fill array 'array_options' with data from update form
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
+		if ($ret < 0) $error++;
 
-        if (!$error)
-        {
-            // Actions on extra fields
-            $result = $object->insertExtraFields('PRODUCT_LOT_MODIFY');
+		if (!$error)
+		{
+			// Actions on extra fields
+			$result = $object->insertExtraFields('PRODUCT_LOT_MODIFY');
 			if ($result < 0)
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
 			}
-        }
+		}
 
-        if ($error)
-            $action = 'edit_extras';
-    }
+		if ($error)
+			$action = 'edit_extras';
+	}
 
 	// Action to add record
 	if ($action == 'add')
@@ -154,12 +154,12 @@ if (empty($reshook))
 
 		/* object_prop_getpost_prop */
 
-    	$object->entity = GETPOST('entity', 'int');
-    	$object->fk_product = GETPOST('fk_product', 'int');
-    	$object->batch = GETPOST('batch', 'alpha');
-    	$object->fk_user_creat = GETPOST('fk_user_creat', 'int');
-    	$object->fk_user_modif = GETPOST('fk_user_modif', 'int');
-    	$object->import_key = GETPOST('import_key', 'int');
+		$object->entity = GETPOST('entity', 'int');
+		$object->fk_product = GETPOST('fk_product', 'int');
+		$object->batch = GETPOST('batch', 'alpha');
+		$object->fk_user_creat = GETPOST('fk_user_creat', 'int');
+		$object->fk_user_modif = GETPOST('fk_user_modif', 'int');
+		$object->import_key = GETPOST('import_key', 'int');
 
 		if (empty($object->ref))
 		{
@@ -196,12 +196,12 @@ if (empty($reshook))
 	{
 		$error = 0;
 
-    	$object->entity = GETPOST('entity', 'int');
-    	$object->fk_product = GETPOST('fk_product', 'int');
-    	$object->batch = GETPOST('batch', 'alpha');
-    	$object->fk_user_creat = GETPOST('fk_user_creat', 'int');
-    	$object->fk_user_modif = GETPOST('fk_user_modif', 'int');
-    	$object->import_key = GETPOST('import_key', 'int');
+		$object->entity = GETPOST('entity', 'int');
+		$object->fk_product = GETPOST('fk_product', 'int');
+		$object->batch = GETPOST('batch', 'alpha');
+		$object->fk_user_creat = GETPOST('fk_user_creat', 'int');
+		$object->fk_user_modif = GETPOST('fk_user_modif', 'int');
+		$object->import_key = GETPOST('import_key', 'int');
 
 		if (empty($object->ref))
 		{
@@ -243,9 +243,9 @@ if (empty($reshook))
 	}
 
 	// Actions to build doc
-    $upload_dir = $conf->productbatch->multidir_output[$conf->entity];
-    $permissiontoadd = $usercancreate;
-    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+	$upload_dir = $conf->productbatch->multidir_output[$conf->entity];
+	$permissiontoadd = $usercancreate;
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 }
 
 
@@ -269,22 +269,22 @@ if ($action == 'create')
 	print '<input type="hidden" name="action" value="add">';
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">'."\n";
 	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input class="flat" type="text" size="36" name="label" value="'.$label.'"></td></tr>';
 	//
-    print '<tr><td class="fieldrequired">'.$langs->trans("Fieldfk_product").'</td><td><input class="flat" type="text" name="fk_product" value="'.GETPOST('fk_product').'"></td></tr>';
-    print '<tr><td class="fieldrequired">'.$langs->trans("Fieldbatch").'</td><td><input class="flat" type="text" name="batch" value="'.GETPOST('batch').'"></td></tr>';
-    print '<tr><td class="fieldrequired">'.$langs->trans("Fieldfk_user_creat").'</td><td><input class="flat" type="text" name="fk_user_creat" value="'.GETPOST('fk_user_creat').'"></td></tr>';
-    print '<tr><td class="fieldrequired">'.$langs->trans("Fieldfk_user_modif").'</td><td><input class="flat" type="text" name="fk_user_modif" value="'.GETPOST('fk_user_modif').'"></td></tr>';
-    print '<tr><td class="fieldrequired">'.$langs->trans("Fieldimport_key").'</td><td><input class="flat" type="text" name="import_key" value="'.GETPOST('import_key').'"></td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("Fieldfk_product").'</td><td><input class="flat" type="text" name="fk_product" value="'.GETPOST('fk_product').'"></td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("Fieldbatch").'</td><td><input class="flat" type="text" name="batch" value="'.GETPOST('batch').'"></td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("Fieldfk_user_creat").'</td><td><input class="flat" type="text" name="fk_user_creat" value="'.GETPOST('fk_user_creat').'"></td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("Fieldfk_user_modif").'</td><td><input class="flat" type="text" name="fk_user_modif" value="'.GETPOST('fk_user_modif').'"></td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("Fieldimport_key").'</td><td><input class="flat" type="text" name="import_key" value="'.GETPOST('import_key').'"></td></tr>';
 
 	print '</table>'."\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
-	print '<div class="center"><input type="submit" class="button" name="add" value="'.$langs->trans("Create").'"> &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
+	print '<div class="center"><input type="submit" class="button" name="add" value="'.$langs->trans("Create").'"> &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
 
 	print '</form>';
 }
@@ -295,10 +295,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 {
 	$res = $object->fetch_optionals();
 
-    //print load_fiche_titre($langs->trans("Batch"));
+	//print load_fiche_titre($langs->trans("Batch"));
 
-    $head = productlot_prepare_head($object);
-	dol_fiche_head($head, 'card', $langs->trans("Batch"), -1, 'barcode');
+	$head = productlot_prepare_head($object);
+	print dol_get_fiche_head($head, 'card', $langs->trans("Batch"), -1, 'barcode');
 
 
 	if ($action == 'delete') {
@@ -309,24 +309,24 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/productlot_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    $shownav = 1;
-    if ($user->socid && !in_array('batch', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+	$shownav = 1;
+	if ($user->socid && !in_array('batch', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
 	dol_banner_tab($object, 'id', $linkback, $shownav, 'rowid', 'batch');
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border centpercent">'."\n";
+	print '<table class="border centpercent">'."\n";
 
 	// Product
-    print '<tr><td class="titlefield">'.$langs->trans("Product").'</td><td>';
-    $producttmp = new Product($db);
-    $producttmp->fetch($object->fk_product);
-    print $producttmp->getNomUrl(1, 'stock'). " - " . $producttmp->label;
-    print '</td></tr>';
+	print '<tr><td class="titlefield">'.$langs->trans("Product").'</td><td>';
+	$producttmp = new Product($db);
+	$producttmp->fetch($object->fk_product);
+	print $producttmp->getNomUrl(1, 'stock')." - ".$producttmp->label;
+	print '</td></tr>';
 
-    // Eat by
+	// Eat by
 	if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
 		print '<tr><td>';
 		print $form->editfieldkey($langs->trans('EatByDate'), 'eatby', $object->eatby, $object, $user->rights->stock->creer, 'datepicker');
@@ -336,7 +336,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '</tr>';
 	}
 
-    // Sell by
+	// Sell by
 	if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
 		print '<tr><td>';
 		print $form->editfieldkey($langs->trans('SellByDate'), 'sellby', $object->sellby, $object, $user->rights->stock->creer, 'datepicker');
@@ -345,15 +345,15 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '</td>';
 		print '</tr>';
 	}
-    // Other attributes
-    $cols = 2;
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+	// Other attributes
+	$cols = 2;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 	print '</table>';
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	// Buttons
@@ -393,19 +393,19 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 if (empty($action))
 {
-    print '<div class="fichecenter"><div class="fichehalfleft">';
-    print '<a name="builddoc"></a>'; // ancre
+	print '<div class="fichecenter"><div class="fichehalfleft">';
+	print '<a name="builddoc"></a>'; // ancre
 
-    // Documents
+	// Documents
 	$filedir = $conf->productbatch->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product_batch').dol_sanitizeFileName($object->ref);
-    $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
-    $genallowed = $usercanread;
-    $delallowed = $usercancreate;
+	$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+	$genallowed = $usercanread;
+	$delallowed = $usercancreate;
 
-    print $formfile->showdocuments('product_batch', dol_sanitizeFileName($object->ref), $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', 0, '', $object->default_lang, '', $object);
-    $somethingshown = $formfile->numoffiles;
+	print $formfile->showdocuments('product_batch', dol_sanitizeFileName($object->ref), $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', 0, '', $object->default_lang, '', $object);
+	$somethingshown = $formfile->numoffiles;
 
-    print '</div>';
+	print '</div>';
 }
 
 // End of page
diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php
index 59ab61fb86a..535486f8c62 100644
--- a/htdocs/product/stock/productlot_document.php
+++ b/htdocs/product/stock/productlot_document.php
@@ -70,16 +70,16 @@ $modulepart = 'product_batch';
 $object = new Productlot($db);
 if ($id || $ref)
 {
-    if ($ref)
-    {
-        $tmp = explode('_', $ref);
-        $productid = $tmp[0];
-        $batch = $tmp[1];
-    }
-    $object->fetch($id, $productid, $batch);
-    $object->ref = $object->batch; // For document management ( it use $object->ref)
+	if ($ref)
+	{
+		$tmp = explode('_', $ref);
+		$productid = $tmp[0];
+		$batch = $tmp[1];
+	}
+	$object->fetch($id, $productid, $batch);
+	$object->ref = $object->batch; // For document management ( it use $object->ref)
 
-    if (!empty($conf->productbatch->enabled)) $upload_dir = $conf->productbatch->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, $modulepart).dol_sanitizeFileName($object->ref);
+	if (!empty($conf->productbatch->enabled)) $upload_dir = $conf->productbatch->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, $modulepart).dol_sanitizeFileName($object->ref);
 }
 
 
@@ -112,12 +112,12 @@ llxHeader('', $langs->trans('ProductLot'), '');
 if ($object->id)
 {
 	$head = productlot_prepare_head($object);
-	dol_fiche_head($head, 'documents', $langs->trans("Batch"), -1, 'barcode');
+	print dol_get_fiche_head($head, 'documents', $langs->trans("Batch"), -1, 'barcode');
 
 
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
+	print $hookmanager->resPrint;
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 	// Build file list
@@ -130,30 +130,30 @@ if ($object->id)
 	}
 
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/productlot_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/productlot_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    $shownav = 1;
-    if ($user->socid && !in_array('batch', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+	$shownav = 1;
+	if ($user->socid && !in_array('batch', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
 	dol_banner_tab($object, 'id', $linkback, $shownav, 'rowid', 'batch');
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
-    print '<table class="border tableforfield" width="100%">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border tableforfield" width="100%">';
 
-    print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-    print '</table>';
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+	print '</table>';
 
-    print '</div>';
-    print '<div style="clear:both"></div>';
+	print '</div>';
+	print '<div style="clear:both"></div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    $permission = ($user->rights->produit->creer);
-    $param = '&id='.$object->id;
-    include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	$permission = ($user->rights->produit->creer);
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
 	print $langs->trans("ErrorUnknown");
 }
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 8a02f3a2b41..e03de931a58 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -377,7 +377,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 9ad848cf535..ed537f1bd4e 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -39,7 +39,7 @@ $langs->loadLangs(array('products', 'stocks', 'orders'));
 
 // Security check
 if ($user->socid) {
-    $socid = $user->socid;
+	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'produit|service');
 
@@ -73,14 +73,13 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
 
 if (!$sortfield) {
-    $sortfield = 'p.ref';
+	$sortfield = 'p.ref';
 }
 
 if (!$sortorder) {
-    $sortorder = 'ASC';
+	$sortorder = 'ASC';
 }
 
-// Define virtualdiffersfromphysical
 $virtualdiffersfromphysical = 0;
 if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)
 	|| !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)
@@ -89,10 +88,14 @@ if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)
 	|| !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)
 	|| !empty($conf->mrp->enabled))
 {
-    $virtualdiffersfromphysical = 1; // According to increase/decrease stock options, virtual and physical stock may differs.
+	$virtualdiffersfromphysical = 1; // According to increase/decrease stock options, virtual and physical stock may differs.
 }
 
-$usevirtualstock = !empty($conf->global->STOCK_USE_VIRTUAL_STOCK);
+if ($virtualdiffersfromphysical) {
+	$usevirtualstock = empty($conf->global->STOCK_USE_REAL_STOCK_BY_DEFAULT_FOR_REPLENISHMENT) ? 1 : 0;
+} else {
+	$usevirtualstock = 0;
+}
 if ($mode == 'physical') $usevirtualstock = 0;
 if ($mode == 'virtual') $usevirtualstock = 1;
 
@@ -105,57 +108,57 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
  * Actions
  */
 
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha') || isset($_POST['valid'])) // Both test are required to be compatible with all browsers
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha') || GETPOST('valid')) // Both test are required to be compatible with all browsers
 {
-    $search_ref = '';
-    $search_label = '';
-    $sall = '';
-    $salert = '';
-    $includeproductswithoutdesiredqty = '';
+	$search_ref = '';
+	$search_label = '';
+	$sall = '';
+	$salert = '';
+	$includeproductswithoutdesiredqty = '';
 	$draftorder = '';
 }
 if ($draftorder == 'on') $draftchecked = "checked";
 
 // Create orders
-if ($action == 'order' && isset($_POST['valid']))
+if ($action == 'order' && GETPOST('valid'))
 {
-    $linecount = GETPOST('linecount', 'int');
-    $box = 0;
+	$linecount = GETPOST('linecount', 'int');
+	$box = 0;
 	$errorQty = 0;
-    unset($_POST['linecount']);
-    if ($linecount > 0)
-    {
-    	$db->begin();
+	unset($_POST['linecount']);
+	if ($linecount > 0)
+	{
+		$db->begin();
 
-        $suppliers = array();
+		$suppliers = array();
 		require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 		$productsupplier = new ProductFournisseur($db);
-        for ($i = 0; $i < $linecount; $i++)
-        {
-            if (GETPOST('choose'.$i, 'alpha') === 'on' && GETPOST('fourn'.$i, 'int') > 0)
-            {
-            	//one line
-                $box = $i;
-                $supplierpriceid = GETPOST('fourn'.$i, 'int');
-                //get all the parameters needed to create a line
-                $qty = GETPOST('tobuy'.$i, 'int');
+		for ($i = 0; $i < $linecount; $i++)
+		{
+			if (GETPOST('choose'.$i, 'alpha') === 'on' && GETPOST('fourn'.$i, 'int') > 0)
+			{
+				//one line
+				$box = $i;
+				$supplierpriceid = GETPOST('fourn'.$i, 'int');
+				//get all the parameters needed to create a line
+				$qty = GETPOST('tobuy'.$i, 'int');
 				$idprod = $productsupplier->get_buyprice($supplierpriceid, $qty);
 				$res = $productsupplier->fetch($idprod);
-                if ($res && $idprod > 0)
-                {
-                	if ($qty)
-                	{
-	                    //might need some value checks
-	                    $line = new CommandeFournisseurLigne($db);
-	                    $line->qty = $qty;
-	                    $line->fk_product = $idprod;
+				if ($res && $idprod > 0)
+				{
+					if ($qty)
+					{
+						//might need some value checks
+						$line = new CommandeFournisseurLigne($db);
+						$line->qty = $qty;
+						$line->fk_product = $idprod;
 
-	                    //$product = new Product($db);
-	                    //$product->fetch($obj->fk_product);
-	                    if (!empty($conf->global->MAIN_MULTILANGS))
-	                    {
-	                        $productsupplier->getMultiLangs();
-	                    }
+						//$product = new Product($db);
+						//$product->fetch($obj->fk_product);
+						if (!empty($conf->global->MAIN_MULTILANGS))
+						{
+							$productsupplier->getMultiLangs();
+						}
 
 						// if we use supplier description of the products
 						if (!empty($productsupplier->desc_supplier) && !empty($conf->global->PRODUIT_FOURN_TEXTS)) {
@@ -163,124 +166,124 @@ if ($action == 'order' && isset($_POST['valid']))
 						} else {
 							$desc = $productsupplier->description;
 						}
-	                    $line->desc = $desc;
-                        if (!empty($conf->global->MAIN_MULTILANGS))
-                        {
-                            // TODO Get desc in language of thirdparty
-                        }
+						$line->desc = $desc;
+						if (!empty($conf->global->MAIN_MULTILANGS))
+						{
+							// TODO Get desc in language of thirdparty
+						}
 
-	                    $line->tva_tx = $productsupplier->vatrate_supplier;
-	                    $line->subprice = $productsupplier->fourn_pu;
-	                    $line->total_ht = $productsupplier->fourn_pu * $qty;
-	                    $tva = $line->tva_tx / 100;
-	                    $line->total_tva = $line->total_ht * $tva;
-	                    $line->total_ttc = $line->total_ht + $line->total_tva;
+						$line->tva_tx = $productsupplier->vatrate_supplier;
+						$line->subprice = $productsupplier->fourn_pu;
+						$line->total_ht = $productsupplier->fourn_pu * $qty;
+						$tva = $line->tva_tx / 100;
+						$line->total_tva = $line->total_ht * $tva;
+						$line->total_ttc = $line->total_ht + $line->total_tva;
 						$line->remise_percent = $productsupplier->remise_percent;
-	                    $line->ref_fourn = $productsupplier->ref_supplier;
+						$line->ref_fourn = $productsupplier->ref_supplier;
 						$line->type = $productsupplier->type;
 						$line->fk_unit = $productsupplier->fk_unit;
-	                    $suppliers[$productsupplier->fourn_socid]['lines'][] = $line;
-                	}
-                } elseif ($idprod == -1)
+						$suppliers[$productsupplier->fourn_socid]['lines'][] = $line;
+					}
+				} elseif ($idprod == -1)
 				{
 					$errorQty++;
 				} else {
-                    $error = $db->lasterror();
-                    dol_print_error($db);
-                }
+					$error = $db->lasterror();
+					dol_print_error($db);
+				}
 
-                unset($_POST['fourn'.$i]);
-            }
-            unset($_POST[$i]);
-        }
+				unset($_POST['fourn'.$i]);
+			}
+			unset($_POST[$i]);
+		}
 
-        //we now know how many orders we need and what lines they have
-        $i = 0;
-        $fail = 0;
-        $orders = array();
-        $suppliersid = array_keys($suppliers);
-        foreach ($suppliers as $supplier)
-        {
-            $order = new CommandeFournisseur($db);
-            // Check if an order for the supplier exists
-            $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande_fournisseur";
-            $sql .= " WHERE fk_soc = ".$suppliersid[$i];
-            $sql .= " AND source = 42 AND fk_statut = 0";
-            $sql .= " AND entity IN (".getEntity('commande_fournisseur').")";
-            $sql .= " ORDER BY date_creation DESC";
-            $resql = $db->query($sql);
-            if ($resql && $db->num_rows($resql) > 0) {
-                $obj = $db->fetch_object($resql);
-                $order->fetch($obj->rowid);
-                foreach ($supplier['lines'] as $line) {
-                    $result = $order->addline(
-                        $line->desc,
-                        $line->subprice,
-                        $line->qty,
-                        $line->tva_tx,
-                        $line->localtax1_tx,
-                        $line->localtax2_tx,
-                        $line->fk_product,
-                        0,
-                        $line->ref_fourn,
-                        $line->remise_percent,
-                        'HT',
-                        0,
-                        $line->type,
-                        0,
+		//we now know how many orders we need and what lines they have
+		$i = 0;
+		$fail = 0;
+		$orders = array();
+		$suppliersid = array_keys($suppliers);
+		foreach ($suppliers as $supplier)
+		{
+			$order = new CommandeFournisseur($db);
+			// Check if an order for the supplier exists
+			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande_fournisseur";
+			$sql .= " WHERE fk_soc = ".$suppliersid[$i];
+			$sql .= " AND source = 42 AND fk_statut = 0";
+			$sql .= " AND entity IN (".getEntity('commande_fournisseur').")";
+			$sql .= " ORDER BY date_creation DESC";
+			$resql = $db->query($sql);
+			if ($resql && $db->num_rows($resql) > 0) {
+				$obj = $db->fetch_object($resql);
+				$order->fetch($obj->rowid);
+				foreach ($supplier['lines'] as $line) {
+					$result = $order->addline(
+						$line->desc,
+						$line->subprice,
+						$line->qty,
+						$line->tva_tx,
+						$line->localtax1_tx,
+						$line->localtax2_tx,
+						$line->fk_product,
+						0,
+						$line->ref_fourn,
+						$line->remise_percent,
+						'HT',
+						0,
+						$line->type,
+						0,
 						false,
 						null,
 						null,
 						0,
 						$line->fk_unit
-                    );
-                }
-                if ($result < 0) {
-                    $fail++;
-                    $msg = $langs->trans('OrderFail')."&nbsp;:&nbsp;";
-                    $msg .= $order->error;
-                    setEventMessages($msg, null, 'errors');
-                } else {
-                    $id = $result;
-                }
-            } else {
-                $order->socid = $suppliersid[$i];
-                $order->fetch_thirdparty();
-                //trick to know which orders have been generated this way
-                $order->source = 42;
-                foreach ($supplier['lines'] as $line) {
-                    $order->lines[] = $line;
-                }
-                $order->cond_reglement_id = $order->thirdparty->cond_reglement_supplier_id;
-                $order->mode_reglement_id = $order->thirdparty->mode_reglement_supplier_id;
-                $id = $order->create($user);
-                if ($id < 0) {
-                    $fail++;
-                    $msg = $langs->trans('OrderFail')."&nbsp;:&nbsp;";
-                    $msg .= $order->error;
-                    setEventMessages($msg, null, 'errors');
-                }
-                $i++;
-            }
-        }
+					);
+				}
+				if ($result < 0) {
+					$fail++;
+					$msg = $langs->trans('OrderFail')."&nbsp;:&nbsp;";
+					$msg .= $order->error;
+					setEventMessages($msg, null, 'errors');
+				} else {
+					$id = $result;
+				}
+			} else {
+				$order->socid = $suppliersid[$i];
+				$order->fetch_thirdparty();
+				//trick to know which orders have been generated this way
+				$order->source = 42;
+				foreach ($supplier['lines'] as $line) {
+					$order->lines[] = $line;
+				}
+				$order->cond_reglement_id = $order->thirdparty->cond_reglement_supplier_id;
+				$order->mode_reglement_id = $order->thirdparty->mode_reglement_supplier_id;
+				$id = $order->create($user);
+				if ($id < 0) {
+					$fail++;
+					$msg = $langs->trans('OrderFail')."&nbsp;:&nbsp;";
+					$msg .= $order->error;
+					setEventMessages($msg, null, 'errors');
+				}
+				$i++;
+			}
+		}
 
 		if ($errorQty) setEventMessages($langs->trans('ErrorOrdersNotCreatedQtyTooLow'), null, 'warnings');
 
-        if (!$fail && $id)
-        {
-        	$db->commit();
+		if (!$fail && $id)
+		{
+			$db->commit();
 
-            setEventMessages($langs->trans('OrderCreated'), null, 'mesgs');
-            header('Location: replenishorders.php');
-            exit;
-        } else {
-        	$db->rollback();
-        }
-    }
-    if ($box == 0)
-    {
-        setEventMessages($langs->trans('SelectProductWithNotNullQty'), null, 'warnings');
-    }
+			setEventMessages($langs->trans('OrderCreated'), null, 'mesgs');
+			header('Location: replenishorders.php');
+			exit;
+		} else {
+			$db->rollback();
+		}
+	}
+	if ($box == 0)
+	{
+		setEventMessages($langs->trans('SelectProductWithNotNullQty'), null, 'warnings');
+	}
 }
 
 
@@ -340,16 +343,18 @@ $sql .= ' WHERE p.entity IN ('.getEntity('product').')';
 if ($sall) $sql .= natural_search(array('p.ref', 'p.label', 'p.description', 'p.note'), $sall);
 // if the type is not 1, we show all products (type = 0,2,3)
 if (dol_strlen($type)) {
-    if ($type == 1) {
-        $sql .= ' AND p.fk_product_type = 1';
-    } else {
-        $sql .= ' AND p.fk_product_type <> 1';
-    }
+	if ($type == 1) {
+		$sql .= ' AND p.fk_product_type = 1';
+	} else {
+		$sql .= ' AND p.fk_product_type <> 1';
+	}
 }
 if ($search_ref) $sql .= natural_search('p.ref', $search_ref);
 if ($search_label) $sql .= natural_search('p.label', $search_label);
 $sql .= ' AND p.tobuy = 1';
-if (!empty($canvas)) $sql .= ' AND p.canvas = "'.$db->escape($canvas).'"';
+if (empty($conf->global->VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT)) {	// Add test to exclude products that has variants
+	$sql .= ' AND p.rowid NOT IN (SELECT pac.fk_product_parent FROM '.MAIN_DB_PREFIX.'product_attribute_combination as pac WHERE pac.entity IN ('.getEntity('product').'))';
+}
 $sql .= ' GROUP BY p.rowid, p.ref, p.label, p.description, p.price';
 $sql .= ', p.price_ttc, p.price_base_type,p.fk_product_type, p.tms';
 $sql .= ', p.duration, p.tobuy';
@@ -366,7 +371,7 @@ if ($usevirtualstock)
 	if (!empty($conf->commande->enabled)) {
 		$sqlCommandesCli = "(SELECT ".$db->ifsql("SUM(cd1.qty) IS NULL", "0", "SUM(cd1.qty)")." as qty"; // We need the ifsql because if result is 0 for product p.rowid, we must return 0 and not NULL
 		$sqlCommandesCli .= " FROM ".MAIN_DB_PREFIX."commandedet as cd1, ".MAIN_DB_PREFIX."commande as c1";
-		$sqlCommandesCli .= " WHERE c1.rowid = cd1.fk_commande AND c1.entity IN (".getEntity('commande').")";
+		$sqlCommandesCli .= " WHERE c1.rowid = cd1.fk_commande AND c1.entity IN (".getEntity(!empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'commande').")";
 		$sqlCommandesCli .= " AND cd1.fk_product = p.rowid";
 		$sqlCommandesCli .= " AND c1.fk_statut IN (1,2))";
 	} else {
@@ -377,11 +382,11 @@ if ($usevirtualstock)
 		$sqlExpeditionsCli = "(SELECT ".$db->ifsql("SUM(ed2.qty) IS NULL", "0", "SUM(ed2.qty)")." as qty"; // We need the ifsql because if result is 0 for product p.rowid, we must return 0 and not NULL
 		$sqlExpeditionsCli .= " FROM ".MAIN_DB_PREFIX."expedition as e2,";
 		$sqlExpeditionsCli .= " ".MAIN_DB_PREFIX."expeditiondet as ed2,";
-                $sqlExpeditionsCli .= " ".MAIN_DB_PREFIX."commande as c2,";
+				$sqlExpeditionsCli .= " ".MAIN_DB_PREFIX."commande as c2,";
 		$sqlExpeditionsCli .= " ".MAIN_DB_PREFIX."commandedet as cd2";
-		$sqlExpeditionsCli .= " WHERE ed2.fk_expedition = e2.rowid AND cd2.rowid = ed2.fk_origin_line AND e2.entity IN (".getEntity('expedition').")";
-                $sqlExpeditionsCli .= " AND cd2.fk_commande = c2.rowid";
-                $sqlExpeditionsCli .= " AND c2.fk_statut IN (1,2)";
+		$sqlExpeditionsCli .= " WHERE ed2.fk_expedition = e2.rowid AND cd2.rowid = ed2.fk_origin_line AND e2.entity IN (".getEntity(!empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'expedition').")";
+				$sqlExpeditionsCli .= " AND cd2.fk_commande = c2.rowid";
+				$sqlExpeditionsCli .= " AND c2.fk_statut IN (1,2)";
 		$sqlExpeditionsCli .= " AND cd2.fk_product = p.rowid";
 		$sqlExpeditionsCli .= " AND e2.fk_statut IN (1,2))";
 	} else {
@@ -393,14 +398,14 @@ if ($usevirtualstock)
 		$sqlCommandesFourn .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd3,";
 		$sqlCommandesFourn .= " ".MAIN_DB_PREFIX."commande_fournisseur as c3";
 		$sqlCommandesFourn .= " WHERE c3.rowid = cd3.fk_commande";
-		$sqlCommandesFourn .= " AND c3.entity IN (".getEntity('supplier_order').")";
+		$sqlCommandesFourn .= " AND c3.entity IN (".getEntity(!empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'supplier_order').")";
 		$sqlCommandesFourn .= " AND cd3.fk_product = p.rowid";
 		$sqlCommandesFourn .= " AND c3.fk_statut IN (3,4))";
 
 		$sqlReceptionFourn = "(SELECT ".$db->ifsql("SUM(fd4.qty) IS NULL", "0", "SUM(fd4.qty)")." as qty"; // We need the ifsql because if result is 0 for product p.rowid, we must return 0 and not NULL
 		$sqlReceptionFourn .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf4,";
 		$sqlReceptionFourn .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as fd4";
-		$sqlReceptionFourn .= " WHERE fd4.fk_commande = cf4.rowid AND cf4.entity IN (".getEntity('supplier_order').")";
+		$sqlReceptionFourn .= " WHERE fd4.fk_commande = cf4.rowid AND cf4.entity IN (".getEntity(!empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'supplier_order').")";
 		$sqlReceptionFourn .= " AND fd4.fk_product = p.rowid";
 		$sqlReceptionFourn .= " AND cf4.fk_statut IN (3,4))";
 	} else {
@@ -412,7 +417,7 @@ if ($usevirtualstock)
 		$sqlProductionToConsume = "(SELECT GREATEST(0, ".$db->ifsql("SUM(".$db->ifsql("mp5.role = 'toconsume'", 'mp5.qty', '- mp5.qty').") IS NULL", "0", "SUM(".$db->ifsql("mp5.role = 'toconsume'", 'mp5.qty', '- mp5.qty').")").") as qty"; // We need the ifsql because if result is 0 for product p.rowid, we must return 0 and not NULL
 		$sqlProductionToConsume .= " FROM ".MAIN_DB_PREFIX."mrp_mo as mm5,";
 		$sqlProductionToConsume .= " ".MAIN_DB_PREFIX."mrp_production as mp5";
-		$sqlProductionToConsume .= " WHERE mm5.rowid = mp5.fk_mo AND mm5.entity IN (".getEntity('mo').")";
+		$sqlProductionToConsume .= " WHERE mm5.rowid = mp5.fk_mo AND mm5.entity IN (".getEntity(!empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'mo').")";
 		$sqlProductionToConsume .= " AND mp5.fk_product = p.rowid";
 		$sqlProductionToConsume .= " AND mp5.role IN ('toconsume', 'consummed')";
 		$sqlProductionToConsume .= " AND mm5.status IN (1,2))";
@@ -420,7 +425,7 @@ if ($usevirtualstock)
 		$sqlProductionToProduce = "(SELECT GREATEST(0, ".$db->ifsql("SUM(".$db->ifsql("mp5.role = 'toproduce'", 'mp5.qty', '- mp5.qty').") IS NULL", "0", "SUM(".$db->ifsql("mp5.role = 'toconsume'", 'mp5.qty', '- mp5.qty').")").") as qty"; // We need the ifsql because if result is 0 for product p.rowid, we must return 0 and not NULL
 		$sqlProductionToProduce .= " FROM ".MAIN_DB_PREFIX."mrp_mo as mm5,";
 		$sqlProductionToProduce .= " ".MAIN_DB_PREFIX."mrp_production as mp5";
-		$sqlProductionToProduce .= " WHERE mm5.rowid = mp5.fk_mo AND mm5.entity IN (".getEntity('mo').")";
+		$sqlProductionToProduce .= " WHERE mm5.rowid = mp5.fk_mo AND mm5.entity IN (".getEntity(!empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'mo').")";
 		$sqlProductionToProduce .= " AND mp5.fk_product = p.rowid";
 		$sqlProductionToProduce .= " AND mp5.role IN ('toproduce', 'produced')";
 		$sqlProductionToProduce .= " AND mm5.status IN (1,2))";
@@ -432,7 +437,7 @@ if ($usevirtualstock)
 	$sql .= ' HAVING (';
 	$sql .= ' ('.$sqldesiredtock.' >= 0 AND ('.$sqldesiredtock.' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')';
 	$sql .= ' - ('.$sqlCommandesCli.' - '.$sqlExpeditionsCli.') + ('.$sqlCommandesFourn.' - '.$sqlReceptionFourn.') + ('.$sqlProductionToProduce.' - '.$sqlProductionToConsume.')))';
-	$sql .= ' OR ';
+	$sql .= ' OR';
 	if ($includeproductswithoutdesiredqty == 'on') {
 		$sql .= ' (('.$sqlalertstock.' >= 0 OR '.$sqlalertstock.' IS NULL) AND ('.$db->ifsql("$sqlalertstock IS NULL", "0", $sqlalertstock).' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')';
 	} else {
@@ -443,9 +448,9 @@ if ($usevirtualstock)
 
 	if ($salert == 'on')	// Option to see when stock is lower than alert
 	{
-            $sql .= ' AND ((';
+		$sql .= ' AND (';
 		if ($includeproductswithoutdesiredqty == 'on') {
-			$sql .= $sqlalertstock.' >= 0 OR '.$sqlalertstock.' IS NULL) AND ('.$db->ifsql("$sqlalertstock IS NULL", "0", $sqlalertstock).' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')';
+			$sql .= '('.$sqlalertstock.' >= 0 OR '.$sqlalertstock.' IS NULL) AND ('.$db->ifsql("$sqlalertstock IS NULL", "0", $sqlalertstock).' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')';
 		} else {
 			$sql .= $sqlalertstock.' >= 0 AND ('.$sqlalertstock.' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')';
 		}
@@ -454,27 +459,32 @@ if ($usevirtualstock)
 		$alertchecked = 'checked';
 	}
 } else {
-	$sql .= ' HAVING (('.$sqldesiredtock.' >= 0 AND ('.$sqldesiredtock.' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')))';
+	$sql .= ' HAVING (';
+	$sql .= '('.$sqldesiredtock.' >= 0 AND ('.$sqldesiredtock.' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')))';
+	$sql .= ' OR';
 	if ($includeproductswithoutdesiredqty == 'on') {
-		$sql .= ' OR (('.$sqlalertstock.' >= 0 OR '.$sqlalertstock.' IS NULL) AND ('.$db->ifsql("$sqlalertstock IS NULL", "0", $sqlalertstock).' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").'))))';
+		$sql .= ' (('.$sqlalertstock.' >= 0 OR '.$sqlalertstock.' IS NULL) AND ('.$db->ifsql("$sqlalertstock IS NULL", "0", $sqlalertstock).' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')))';
 	} else {
-		$sql .= ' OR ('.$sqlalertstock.' >= 0 AND ('.$sqlalertstock.' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").'))))';
+		$sql .= ' ('.$sqlalertstock.' >= 0 AND ('.$sqlalertstock.' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')))';
 	}
+	$sql .= ')';
 
 	if ($salert == 'on')	// Option to see when stock is lower than alert
 	{
+		$sql .= ' AND (';
 		if ($includeproductswithoutdesiredqty == 'on') {
-			$sql .= ' AND (('.$sqlalertstock.' >= 0 OR '.$sqlalertstock.' IS NULL) AND ('.$db->ifsql("$sqlalertstock IS NULL", "0", $sqlalertstock).' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')))';
+			$sql .= ' ('.$sqlalertstock.' >= 0 OR '.$sqlalertstock.' IS NULL) AND ('.$db->ifsql("$sqlalertstock IS NULL", "0", $sqlalertstock).' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").'))';
 		} else {
-			$sql .= ' AND ('.$sqlalertstock.' >= 0 AND ('.$sqlalertstock.' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')))';
+			$sql .= ' '.$sqlalertstock.' >= 0 AND ('.$sqlalertstock.' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").'))';
 		}
+		$sql .= ')';
 		$alertchecked = 'checked';
 	}
 }
 
 $includeproductswithoutdesiredqtychecked = '';
 if ($includeproductswithoutdesiredqty == 'on') {
-    $includeproductswithoutdesiredqtychecked = 'checked';
+	$includeproductswithoutdesiredqtychecked = 'checked';
 }
 
 // Add where from hooks
@@ -484,12 +494,12 @@ $sql .= $hookmanager->resPrint;
 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords) {
-        $page = 0;
-        $offset = 0;
-    }
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords) {
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql .= $db->order($sortfield, $sortorder);
@@ -499,8 +509,8 @@ $sql .= $db->plimit($limit + 1, $offset);
 $resql = $db->query($sql);
 if (empty($resql))
 {
-    dol_print_error($db);
-    exit;
+	dol_print_error($db);
+	exit;
 }
 
 $num = $db->num_rows($resql);
@@ -524,24 +534,25 @@ $head[1][2] = 'replenishorders';
 
 print load_fiche_titre($langs->trans('Replenishment'), '', 'stock');
 
-dol_fiche_head($head, 'replenish', '', -1, '');
+print dol_get_fiche_head($head, 'replenish', '', -1, '');
 
-print '<span class="opacitymedium">'.$langs->trans("ReplenishmentStatusDesc").'</span><br>'."\n";
+print '<span class="opacitymedium">'.$langs->trans("ReplenishmentStatusDesc").'</span>'."\n";
 if (empty($fk_warhouse) && !empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE)) {
 	print '<span class="opacitymedium">'.$langs->trans("ReplenishmentStatusDescPerWarehouse").'</span>'."<br>\n";
 }
+print '<br>';
 if ($usevirtualstock == 1)
 {
 	print $langs->trans("CurentSelectionMode").': ';
-	print $langs->trans("CurentlyUsingVirtualStock");
-	print ' (<a href="'.$_SERVER["PHP_SELF"].'?mode=physical&fk_supplier='.$fk_supplier.'&fk_entrepot='.$fk_entrepot.'">'.$langs->trans("UsePhysicalStock").'</a>)';
+	print '<span class="a-mesure">'.$langs->trans("UseVirtualStock").'</span>';
+	print ' <a class="a-mesure-disabled" href="'.$_SERVER["PHP_SELF"].'?mode=physical'.($fk_supplier > 0 ? '&fk_supplier='.$fk_supplier : '').($fk_entrepot > 0 ? '&fk_entrepot='.$fk_entrepot : '').'">'.$langs->trans("UsePhysicalStock").'</a>';
 	print '<br>';
 }
 if ($usevirtualstock == 0)
 {
 	print $langs->trans("CurentSelectionMode").': ';
-	print $langs->trans("CurentlyUsingPhysicalStock");
-	print ' (<a href="'.$_SERVER["PHP_SELF"].'?mode=virtual&fk_supplier='.$fk_supplier.'&fk_entrepot='.$fk_entrepot.'">'.$langs->trans("UseVirtualStock").'</a>)';
+	print '<a class="a-mesure-disabled" href="'.$_SERVER["PHP_SELF"].'?mode=virtual'.($fk_supplier > 0 ? '&fk_supplier='.$fk_supplier : '').($fk_entrepot > 0 ? '&fk_entrepot='.$fk_entrepot : '').'">'.$langs->trans("UseVirtualStock").'</a>';
+	print ' <span class="a-mesure">'.$langs->trans("UsePhysicalStock").'</span>';
 	print '<br>';
 }
 print '<br>'."\n";
@@ -556,7 +567,7 @@ print '<input type="hidden" name="includeproductswithoutdesiredqty" value="'.$in
 print '<input type="hidden" name="draftorder" value="'.$draftorder.'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 if ($limit > 0 && $limit != $conf->liste_limit) {
-    print '<input type="hidden" name="limit" value="'.$limit.'">';
+	print '<input type="hidden" name="limit" value="'.$limit.'">';
 }
 if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE))
 {
@@ -591,54 +602,33 @@ print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 
 if ($search_ref || $search_label || $sall || $salert || $draftorder || GETPOST('search', 'alpha')) {
-	$filters = '&search_ref='.$search_ref.'&search_label='.$search_label;
-	$filters .= '&sall='.$sall;
-	$filters .= '&salert='.$salert;
-	$filters .= '&draftorder='.$draftorder;
-	$filters .= '&mode='.$mode;
-	$filters .= '&fk_supplier='.$fk_supplier;
-	$filters .= '&fk_entrepot='.$fk_entrepot;
-	print_barre_liste(
-		$texte,
-		$page,
-		'replenish.php',
-		$filters,
-		$sortfield,
-		$sortorder,
-		'',
-		$num
-	);
+	$filters = '&search_ref='.urlencode($search_ref).'&search_label='.urlencode($search_label);
+	$filters .= '&sall='.urlencode($sall);
+	$filters .= '&salert='.urlencode($salert);
+	$filters .= '&draftorder='.urlencode($draftorder);
+	$filters .= '&mode='.urlencode($mode);
+	if ($fk_supplier > 0) $filters .= '&fk_supplier='.urlencode($fk_supplier);
+	if ($fk_entrepot > 0) $filters .= '&fk_entrepot='.urlencode($fk_entrepot);
 } else {
-	$filters = '&search_ref='.$search_ref.'&search_label='.$search_label;
-	$filters .= '&fourn_id='.$fourn_id;
-	$filters .= (isset($type) ? '&type='.$type : '');
-	$filters .= '&='.$salert;
-	$filters .= '&draftorder='.$draftorder;
-	$filters .= '&mode='.$mode;
-	$filters .= '&fk_supplier='.$fk_supplier;
-	$filters .= '&fk_entrepot='.$fk_entrepot;
-	print_barre_liste(
-		$texte,
-		$page,
-		'replenish.php',
-		$filters,
-		$sortfield,
-		$sortorder,
-		'',
-		$num
-	);
+	$filters = '&search_ref='.urlencode($search_ref).'&search_label='.urlencode($search_label);
+	$filters .= '&fourn_id='.urlencode($fourn_id);
+	$filters .= (isset($type) ? '&type='.urlencode($type) : '');
+	$filters .= '&='.urlencode($salert);
+	$filters .= '&draftorder='.urlencode($draftorder);
+	$filters .= '&mode='.urlencode($mode);
+	if ($fk_supplier > 0) $filters .= '&fk_supplier='.urlencode($fk_supplier);
+	if ($fk_entrepot > 0) $filters .= '&fk_entrepot='.urlencode($fk_entrepot);
 }
-
 if ($limit > 0 && $limit != $conf->liste_limit) {
-    $filters .= '&limit=' . urlencode($limit);
+	$filters .= '&limit='.urlencode($limit);
 }
 
-$param = (isset($type) ? '&type='.$type : '');
-$param .= '&fourn_id='.$fourn_id.'&search_label='.$search_label.'&includeproductswithoutdesiredqty='.$includeproductswithoutdesiredqty.'&salert='.$salert.'&draftorder='.$draftorder;
-$param .= '&search_ref='.$search_ref;
-$param .= '&mode='.$mode;
-$param .= '&fk_supplier='.$fk_supplier;
-$param .= '&fk_entrepot='.$fk_entrepot;
+$param = (isset($type) ? '&type='.urlencode($type) : '');
+$param .= '&fourn_id='.urlencode($fourn_id).'&search_label='.urlencode($search_label).'&includeproductswithoutdesiredqty='.urlencode($includeproductswithoutdesiredqty).'&salert='.urlencode($salert).'&draftorder='.urlencode($draftorder);
+$param .= '&search_ref='.urlencode($search_ref);
+$param .= '&mode='.urlencode($mode);
+$param .= '&fk_supplier='.urlencode($fk_supplier);
+$param .= '&fk_entrepot='.urlencode($fk_entrepot);
 
 $stocklabel = $langs->trans('Stock');
 $stocklabelbis = $langs->trans('Stock');
@@ -651,38 +641,40 @@ if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entre
 }
 $texte = $langs->trans('Replenishment');
 
+print '<br>';
+
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 
 if (!empty($conf->global->REPLENISH_ALLOW_VARIABLESIZELIST)) {
-    print_barre_liste(
-        $texte,
-        $page,
-        'replenish.php',
-        $filters,
-        $sortfield,
-        $sortorder,
-        '',
-        $num,
-        $nbtotalofrecords,
-        'object_stock.png',
-        0,
-        '',
-        '',
-        $limit
-    );
+	print_barre_liste(
+		$texte,
+		$page,
+		'replenish.php',
+		$filters,
+		$sortfield,
+		$sortorder,
+		'',
+		$num,
+		$nbtotalofrecords,
+		'',
+		0,
+		'',
+		'',
+		$limit
+	);
 } else {
-    print_barre_liste(
-        $texte,
-        $page,
-        'replenish.php',
-        $filters,
-        $sortfield,
-        $sortorder,
-        '',
-        $num,
-        $nbtotalofrecords,
-        'object_stock.png'
-    );
+	print_barre_liste(
+		$texte,
+		$page,
+		'replenish.php',
+		$filters,
+		$sortfield,
+		$sortorder,
+		'',
+		$num,
+		$nbtotalofrecords,
+		''
+	);
 }
 
 print '<table class="liste centpercent">';
@@ -701,7 +693,7 @@ if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entre
 	print '<td class="liste_titre">&nbsp;</td>';
 }
 print '<td class="liste_titre right">';
-if (! empty($conf->global->STOCK_REPLENISH_ADD_CHECKBOX_INCLUDE_DRAFT_ORDER)) {
+if (!empty($conf->global->STOCK_REPLENISH_ADD_CHECKBOX_INCLUDE_DRAFT_ORDER)) {
 	print $langs->trans('IncludeAlsoDraftOrders').'&nbsp;<input type="checkbox" id="draftorder" name="draftorder" '.(!empty($draftchecked) ? $draftchecked : '').'>';
 }
 print '</td>';
@@ -768,7 +760,7 @@ while ($i < ($limit ? min($num, $limit) : $num))
 			}
 		}
 
-		$stockwarehouse=0;
+		$stockwarehouse = 0;
 		if ($usevirtualstock)
 		{
 			// If option to increase/decrease is not on an object validation, virtual stock may differs from physical stock.
@@ -830,67 +822,64 @@ while ($i < ($limit ? min($num, $limit) : $num))
 			$picto = img_picto($langs->trans("NoPendingReceptionOnSupplierOrder"), 'help');
 		}
 
-		$variants = $prod->hasVariants();
-		if (!$variants || !empty($conf->global->VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT)) {
-			print '<tr class="oddeven">';
+		print '<tr class="oddeven">';
 
-			// Select field
-			print '<td><input type="checkbox" class="check" name="choose'.$i.'"></td>';
+		// Select field
+		print '<td><input type="checkbox" class="check" name="choose'.$i.'"></td>';
 
-			print '<td class="nowrap">'.$prod->getNomUrl(1, 'stock').'</td>';
+		print '<td class="nowrap">'.$prod->getNomUrl(1, 'stock').'</td>';
 
-			print '<td>'.$objp->label;
-			print '<input type="hidden" name="desc'.$i.'" value="'.dol_escape_htmltag($objp->description).'">'; // TODO Remove this and make a fetch to get description when creating order instead of a GETPOST
-			print '</td>';
+		print '<td>'.$objp->label;
+		print '<input type="hidden" name="desc'.$i.'" value="'.dol_escape_htmltag($objp->description).'">'; // TODO Remove this and make a fetch to get description when creating order instead of a GETPOST
+		print '</td>';
 
-			if (!empty($conf->service->enabled) && $type == 1)
-			{
-				$regs = array();
-				if (preg_match('/([0-9]+)y/i', $objp->duration, $regs)) {
-					$duration = $regs[1].' '.$langs->trans('DurationYear');
-				} elseif (preg_match('/([0-9]+)m/i', $objp->duration, $regs)) {
-					$duration = $regs[1].' '.$langs->trans('DurationMonth');
-				} elseif (preg_match('/([0-9]+)d/i', $objp->duration, $regs)) {
-					$duration = $regs[1].' '.$langs->trans('DurationDay');
-				} else {
-					$duration = $objp->duration;
-				}
-				print '<td class="center">'.$duration.'</td>';
+		if (!empty($conf->service->enabled) && $type == 1)
+		{
+			$regs = array();
+			if (preg_match('/([0-9]+)y/i', $objp->duration, $regs)) {
+				$duration = $regs[1].' '.$langs->trans('DurationYear');
+			} elseif (preg_match('/([0-9]+)m/i', $objp->duration, $regs)) {
+				$duration = $regs[1].' '.$langs->trans('DurationMonth');
+			} elseif (preg_match('/([0-9]+)d/i', $objp->duration, $regs)) {
+				$duration = $regs[1].' '.$langs->trans('DurationDay');
+			} else {
+				$duration = $objp->duration;
 			}
-
-			// Desired stock
-			print '<td class="right">'.($fk_entrepot > 0 ? $desiredstockwarehouse : $desiredstock).'</td>';
-
-			// Limit stock for alert
-			print '<td class="right">'.($fk_entrepot > 0 ? $alertstockwarehouse : $alertstock).'</td>';
-
-			// Current stock (all warehouses)
-			print '<td class="right">'.$warning.$stock.'</td>';
-
-			// Current stock (warehouse selected only)
-			if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0)
-			{
-				print '<td class="right">'.$warningwarehouse.$stockwarehouse.'</td>';
-			}
-
-			// Already ordered
-			print '<td class="right"><a href="replenishorders.php?search_product='.$prod->id.'">'.$ordered.'</a> '.$picto.'</td>';
-
-			// To order
-			print '<td class="right"><input type="text" size="4" name="tobuy'.$i.'" value="'.($fk_entrepot > 0 ? $stocktobuywarehouse : $stocktobuy).'"></td>';
-
-			// Supplier
-			print '<td class="right">';
-	        print $form->select_product_fourn_price($prod->id, 'fourn'.$i, $fk_supplier);
-	        print '</td>';
-
-			// Fields from hook
-			$parameters = array('objp'=>$objp);
-			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
-			print $hookmanager->resPrint;
-
-			print '</tr>';
+			print '<td class="center">'.$duration.'</td>';
 		}
+
+		// Desired stock
+		print '<td class="right">'.($fk_entrepot > 0 ? $desiredstockwarehouse : $desiredstock).'</td>';
+
+		// Limit stock for alert
+		print '<td class="right">'.($fk_entrepot > 0 ? $alertstockwarehouse : $alertstock).'</td>';
+
+		// Current stock (all warehouses)
+		print '<td class="right">'.$warning.$stock.'</td>';
+
+		// Current stock (warehouse selected only)
+		if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0)
+		{
+			print '<td class="right">'.$warningwarehouse.$stockwarehouse.'</td>';
+		}
+
+		// Already ordered
+		print '<td class="right"><a href="replenishorders.php?search_product='.$prod->id.'">'.$ordered.'</a> '.$picto.'</td>';
+
+		// To order
+		print '<td class="right"><input type="text" size="4" name="tobuy'.$i.'" value="'.($fk_entrepot > 0 ? $stocktobuywarehouse : $stocktobuy).'"></td>';
+
+		// Supplier
+		print '<td class="right">';
+		print $form->select_product_fourn_price($prod->id, 'fourn'.$i, $fk_supplier);
+		print '</td>';
+
+		// Fields from hook
+		$parameters = array('objp'=>$objp);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+
+		print '</tr>';
 	}
 	$i++;
 }
@@ -904,7 +893,7 @@ print '</div>';
 
 $db->free($resql);
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 $value = $langs->trans("CreateOrders");
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index ef8639787b7..c73c7b1ca39 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -69,16 +69,16 @@ $offset = $limit * $page;
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
 {
-    $sall = "";
-    $sref = "";
-    $snom = "";
-    $suser = "";
-    $sttc = "";
-    $search_date = '';
-    $search_datemonth = '';
-    $search_dateday = '';
-    $search_dateyear = '';
-    $search_product = 0;
+	$sall = "";
+	$sref = "";
+	$snom = "";
+	$suser = "";
+	$sttc = "";
+	$search_date = '';
+	$search_datemonth = '';
+	$search_dateday = '';
+	$search_dateyear = '';
+	$search_product = 0;
 }
 
 
@@ -106,7 +106,7 @@ $head[1][0] = DOL_URL_ROOT.'/product/stock/replenishorders.php';
 $head[1][1] = $texte;
 $head[1][2] = 'replenishorders';
 
-dol_fiche_head($head, 'replenishorders', '', -1, '');
+print dol_get_fiche_head($head, 'replenishorders', '', -1, '');
 
 $commandestatic = new CommandeFournisseur($db);
 
@@ -116,19 +116,19 @@ $sql .= ' u.login';
 $sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'commande_fournisseur as cf';
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON cf.fk_user_author = u.rowid';
 if (!$user->rights->societe->client->voir && !$socid) {
-    $sql .= ', '.MAIN_DB_PREFIX.'societe_commerciaux as sc';
+	$sql .= ', '.MAIN_DB_PREFIX.'societe_commerciaux as sc';
 }
 $sql .= ' WHERE cf.fk_soc = s.rowid ';
 $sql .= ' AND cf.entity = '.$conf->entity;
 if ($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) {
-    $sql .= ' AND cf.fk_statut < 3';
+	$sql .= ' AND cf.fk_statut < 3';
 } elseif ($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)) {
-    $sql .= ' AND cf.fk_statut < 6'; // We want also status 5, we will keep them visible if dispatching is not yet finished (tested with function dolDispatchToDo).
+	$sql .= ' AND cf.fk_statut < 6'; // We want also status 5, we will keep them visible if dispatching is not yet finished (tested with function dolDispatchToDo).
 } else {
-    $sql .= ' AND cf.fk_statut < 5';
+	$sql .= ' AND cf.fk_statut < 5';
 }
 if (!$user->rights->societe->client->voir && !$socid) {
-    $sql .= ' AND s.rowid = sc.fk_soc AND sc.fk_user = '.$user->id;
+	$sql .= ' AND s.rowid = sc.fk_soc AND sc.fk_user = '.$user->id;
 }
 if ($sref) $sql .= natural_search('cf.ref', $sref);
 if ($snom) $sql .= natural_search('s.nom', $snom);
@@ -138,7 +138,7 @@ $sql .= dolSqlDateFilter('cf.date_creation', $search_dateday, $search_datemonth,
 if ($sall) $sql .= natural_search(array('cf.ref', 'cf.note'), $sall);
 if (!empty($socid)) $sql .= ' AND s.rowid = '.$socid;
 if (GETPOST('statut', 'int')) {
-    $sql .= ' AND fk_statut = '.GETPOST('statut', 'int');
+	$sql .= ' AND fk_statut = '.GETPOST('statut', 'int');
 }
 $sql .= ' GROUP BY cf.rowid, cf.ref, cf.date_creation, cf.fk_statut';
 $sql .= ', cf.total_ttc, cf.fk_user_author, u.login, s.rowid, s.nom';
@@ -150,8 +150,8 @@ if (!$search_product) {
 $resql = $db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
-    $i = 0;
+	$num = $db->num_rows($resql);
+	$i = 0;
 
 	print '<span class="opacitymedium">'.$langs->trans("ReplenishmentOrdersDesc").'</span><br><br>';
 
@@ -159,165 +159,165 @@ if ($resql)
 
 	print_barre_liste('', $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', $num, 0, '');
 
-    $param = '';
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-    if ($sref) $param .= '&search_ref='.urlencode($sref);
-    if ($snom) $param .= '&search_nom='.urlencode($snom);
-    if ($suser) $param .= '&search_user='.urlencode($suser);
-    if ($sttc) $param .= '&search_ttc='.urlencode($sttc);
-    if ($search_dateyear) $param .= '&search_dateyear='.urlencode($search_dateyear);
-    if ($search_datemonth) $param .= '&search_datemonth='.urlencode($search_datemonth);
-    if ($search_dateday) $param .= '&search_dateday='.urlencode($search_dateday);
-    if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
+	$param = '';
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+	if ($sref) $param .= '&search_ref='.urlencode($sref);
+	if ($snom) $param .= '&search_nom='.urlencode($snom);
+	if ($suser) $param .= '&search_user='.urlencode($suser);
+	if ($sttc) $param .= '&search_ttc='.urlencode($sttc);
+	if ($search_dateyear) $param .= '&search_dateyear='.urlencode($search_dateyear);
+	if ($search_datemonth) $param .= '&search_datemonth='.urlencode($search_datemonth);
+	if ($search_dateday) $param .= '&search_dateday='.urlencode($search_dateday);
+	if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
 
-    print '<table class="noborder centpercent">';
+	print '<table class="noborder centpercent">';
 
-    print '<tr class="liste_titre_filter">';
-    print '<td class="liste_titre">';
-    print '<input type="text" class="flat" name="search_ref" value="'.dol_escape_htmltag($sref).'">';
-    print '</td>';
-    print '<td class="liste_titre">';
-    print '<input type="text" class="flat" name="search_nom" value="'.dol_escape_htmltag($snom).'">';
-    print '</td>';
-    print '<td class="liste_titre">';
-    print '<input type="text" class="flat" name="search_user" value="'.dol_escape_htmltag($suser).'">';
-    print '</td>';
-    print '<td class="liste_titre">';
-    print '<input type="text" class="flat" name="search_ttc" value="'.dol_escape_htmltag($sttc).'">';
-    print '</td>';
-    print '<td class="liste_titre">';
-    print $form->selectDate($search_date, 'search_date', 0, 0, 1, '', 1, 0, 0, '');
-    print '</td>';
-    print '<td class="liste_titre right">';
-    $searchpicto = $form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
-    print '</tr>';
+	print '<tr class="liste_titre_filter">';
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="search_ref" value="'.dol_escape_htmltag($sref).'">';
+	print '</td>';
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="search_nom" value="'.dol_escape_htmltag($snom).'">';
+	print '</td>';
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="search_user" value="'.dol_escape_htmltag($suser).'">';
+	print '</td>';
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="search_ttc" value="'.dol_escape_htmltag($sttc).'">';
+	print '</td>';
+	print '<td class="liste_titre">';
+	print $form->selectDate($search_date, 'search_date', 0, 0, 1, '', 1, 0, 0, '');
+	print '</td>';
+	print '<td class="liste_titre right">';
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
+	print '</td>';
+	print '</tr>';
 
-    print '<tr class="liste_titre">';
-    print_liste_field_titre(
-        'Ref',
-        $_SERVER['PHP_SELF'],
-        'cf.ref',
-        '',
-        $param,
-        '',
-        $sortfield,
-        $sortorder
-    );
-    print_liste_field_titre(
-        'Company',
-        $_SERVER['PHP_SELF'],
-        's.nom',
-        '',
-        $param,
-        '',
-        $sortfield,
-        $sortorder
-    );
-    print_liste_field_titre(
-        'Author',
-        $_SERVER['PHP_SELF'],
-        'u.login',
-        '',
-        '',
-        '',
-        $sortfield,
-        $sortorder
-    );
-    print_liste_field_titre(
-        'AmountTTC',
-        $_SERVER['PHP_SELF'],
-        'cf.total_ttc',
-        '',
-        $param,
-        '',
-        $sortfield,
-        $sortorder
-    );
-    print_liste_field_titre(
-        'OrderCreation',
-        $_SERVER['PHP_SELF'],
-        'cf.date_creation',
-        '',
-        $param,
-        '',
-        $sortfield,
-        $sortorder
-    );
-    print_liste_field_titre(
-        'Status',
-        $_SERVER['PHP_SELF'],
-        'cf.fk_statut',
-        '',
-        $param,
-        '',
-        $sortfield,
-        $sortorder,
-        'right '
-    );
-    print '</tr>';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre(
+		'Ref',
+		$_SERVER['PHP_SELF'],
+		'cf.ref',
+		'',
+		$param,
+		'',
+		$sortfield,
+		$sortorder
+	);
+	print_liste_field_titre(
+		'Company',
+		$_SERVER['PHP_SELF'],
+		's.nom',
+		'',
+		$param,
+		'',
+		$sortfield,
+		$sortorder
+	);
+	print_liste_field_titre(
+		'Author',
+		$_SERVER['PHP_SELF'],
+		'u.login',
+		'',
+		'',
+		'',
+		$sortfield,
+		$sortorder
+	);
+	print_liste_field_titre(
+		'AmountTTC',
+		$_SERVER['PHP_SELF'],
+		'cf.total_ttc',
+		'',
+		$param,
+		'',
+		$sortfield,
+		$sortorder
+	);
+	print_liste_field_titre(
+		'OrderCreation',
+		$_SERVER['PHP_SELF'],
+		'cf.date_creation',
+		'',
+		$param,
+		'',
+		$sortfield,
+		$sortorder
+	);
+	print_liste_field_titre(
+		'Status',
+		$_SERVER['PHP_SELF'],
+		'cf.fk_statut',
+		'',
+		$param,
+		'',
+		$sortfield,
+		$sortorder,
+		'right '
+	);
+	print '</tr>';
 
-    $userstatic = new User($db);
+	$userstatic = new User($db);
 
 	while ($i < min($num, $search_product ? $num : $conf->liste_limit))
-    {
-        $obj = $db->fetch_object($resql);
+	{
+		$obj = $db->fetch_object($resql);
 
-        $showline = dolDispatchToDo($obj->rowid) && (!$search_product || in_array($search_product, getProducts($obj->rowid)));
+		$showline = dolDispatchToDo($obj->rowid) && (!$search_product || in_array($search_product, getProducts($obj->rowid)));
 
-        if ($showline)
-        {
-            $href = DOL_URL_ROOT.'/fourn/commande/card.php?id='.$obj->rowid;
+		if ($showline)
+		{
+			$href = DOL_URL_ROOT.'/fourn/commande/card.php?id='.$obj->rowid;
 
-            print '<tr>';
+			print '<tr>';
 
-            // Ref
-            print '<td>';
-            print '<a href="'.$href.'">'.img_object($langs->trans('ShowOrder'), 'order').' '.$obj->ref.'</a>';
-            print '</td>';
+			// Ref
+			print '<td>';
+			print '<a href="'.$href.'">'.img_object($langs->trans('ShowOrder'), 'order').' '.$obj->ref.'</a>';
+			print '</td>';
 
-            // Company
-            $href = DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->socid;
-            print '<td><a href="'.$href.'">'.img_object($langs->trans('ShowCompany'), 'company').' '.$obj->name.'</a></td>';
+			// Company
+			$href = DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->socid;
+			print '<td><a href="'.$href.'">'.img_object($langs->trans('ShowCompany'), 'company').' '.$obj->name.'</a></td>';
 
-            // Author
-            $userstatic->id = $obj->fk_user_author;
-            $userstatic->login = $obj->login;
-            if ($userstatic->id) {
-                $txt = $userstatic->getLoginUrl(1);
-            } else {
-                $txt = '&nbsp;';
-            }
-            print '<td>'.$txt.'</td>';
+			// Author
+			$userstatic->id = $obj->fk_user_author;
+			$userstatic->login = $obj->login;
+			if ($userstatic->id) {
+				$txt = $userstatic->getLoginUrl(1);
+			} else {
+				$txt = '&nbsp;';
+			}
+			print '<td>'.$txt.'</td>';
 
-            // Amount
-            print '<td>'.price($obj->total_ttc).'</td>';
+			// Amount
+			print '<td>'.price($obj->total_ttc).'</td>';
 
-            // Date
-            if ($obj->dc) {
-                $date = dol_print_date($db->jdate($obj->dc), 'dayhour');
-            } else {
-                $date = '-';
-            }
-            print '<td>'.$date.'</td>';
+			// Date
+			if ($obj->dc) {
+				$date = dol_print_date($db->jdate($obj->dc), 'dayhour');
+			} else {
+				$date = '-';
+			}
+			print '<td>'.$date.'</td>';
 
-            // Statut
-            print '<td class="right">'.$commandestatic->LibStatut($obj->fk_statut, 5).'</td>';
+			// Statut
+			print '<td class="right">'.$commandestatic->LibStatut($obj->fk_statut, 5).'</td>';
 
-            print '</tr>';
-        }
-        $i++;
-    }
-    print '</table>';
-    print '</form>';
+			print '</tr>';
+		}
+		$i++;
+	}
+	print '</table>';
+	print '</form>';
 
-    $db->free($resql);
+	$db->free($resql);
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // End of page
diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index f581242c9f2..f48ac986d20 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -40,7 +40,7 @@ $langs->loadLangs(array('products', 'stocks', 'orders'));
 
 // Security check
 if ($user->socid) {
-    $socid = $user->socid;
+	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'produit|service');
 
@@ -52,6 +52,7 @@ $hookmanager->initHooks(array('stockreplenishlist'));
 $action = GETPOST('action', 'aZ09');
 $type = GETPOST('type', 'int');
 $mode = GETPOST('mode', 'alpha');
+
 $date = '';
 $dateendofday = '';
 if (GETPOSTISSET('dateday') && GETPOSTISSET('datemonth') && GETPOSTISSET('dateyear')) {
@@ -59,6 +60,9 @@ if (GETPOSTISSET('dateday') && GETPOSTISSET('datemonth') && GETPOSTISSET('dateye
 	$dateendofday = dol_mktime(23, 59, 59, GETPOST('datemonth', 'int'), GETPOST('dateday', 'int'), GETPOST('dateyear', 'int'));
 }
 
+$search_ref = GETPOST('search_ref', 'alphanohtml');
+$search_nom = GETPOST('search_nom', 'alphanohtml');
+
 $now = dol_now();
 
 $productid = GETPOST('productid', 'int');
@@ -71,26 +75,26 @@ if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined,
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
 if (!$sortfield) {
-    $sortfield = 'p.ref';
+	$sortfield = 'p.ref';
 }
 if (!$sortorder) {
-    $sortorder = 'ASC';
+	$sortorder = 'ASC';
 }
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-$dateIsValid= true;
+$dateIsValid = true;
 if ($mode == 'future') {
 	if ($date && $date < $now) {
 		setEventMessages($langs->trans("ErrorDateMustBeInFuture"), null, 'errors');
-		$dateIsValid= false;
+		$dateIsValid = false;
 	}
 } else {
 	if ($date && $date > $now) {
 		setEventMessages($langs->trans("ErrorDateMustBeBeforeToday"), null, 'errors');
-		$dateIsValid= false;
+		$dateIsValid = false;
 	}
 }
 
@@ -104,6 +108,8 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$date = '';
 	$productid = 0;
 	$fk_warehouse = 0;
+	$search_ref = '';
+	$search_nom = '';
 }
 
 $warehouseStatus = array();
@@ -123,7 +129,7 @@ if ($date && $dateIsValid) {	// Avoid heavy sql if mandatory date is not defined
 	$sql .= ", ".MAIN_DB_PREFIX."entrepot as w";
 	$sql .= " WHERE w.entity IN (".getEntity('stock').")";
 	$sql .= " AND w.rowid = ps.fk_entrepot";
-	if (! empty($conf->global->ENTREPOT_EXTRA_STATUS) && count($warehouseStatus)) {
+	if (!empty($conf->global->ENTREPOT_EXTRA_STATUS) && count($warehouseStatus)) {
 		$sql .= " AND w.statut IN (".$db->sanitize($db->escape(implode(',', $warehouseStatus))).")";
 	}
 	if ($productid > 0) {
@@ -146,7 +152,7 @@ if ($date && $dateIsValid) {	// Avoid heavy sql if mandatory date is not defined
 
 			$tmp_fk_product   = $obj->fk_product;
 			$tmp_fk_warehouse = $obj->fk_warehouse;
-			$stock 			  = $obj->stock;
+			$stock = $obj->stock;
 
 			$stock_prod_warehouse[$tmp_fk_product][$tmp_fk_warehouse] = $stock;
 			$stock_prod[$tmp_fk_product] = (isset($stock_prod[$tmp_fk_product]) ? $stock_prod[$tmp_fk_product] : 0) + $stock;
@@ -174,7 +180,7 @@ if ($date && $dateIsValid) {
 	$sql .= ", ".MAIN_DB_PREFIX."entrepot as w";
 	$sql .= " WHERE w.entity IN (".getEntity('stock').")";
 	$sql .= " AND w.rowid = sm.fk_entrepot";
-	if (! empty($conf->global->ENTREPOT_EXTRA_STATUS) && count($warehouseStatus)) {
+	if (!empty($conf->global->ENTREPOT_EXTRA_STATUS) && count($warehouseStatus)) {
 		$sql .= " AND w.statut IN (".$db->sanitize($db->escape(implode(',', $warehouseStatus))).")";
 	}
 	if ($mode == 'future') {
@@ -198,9 +204,9 @@ if ($date && $dateIsValid) {
 
 		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
-			$fk_product 	= $obj->fk_product;
+			$fk_product = $obj->fk_product;
 			$fk_entrepot 	= $obj->fk_entrepot;
-			$stock 			= $obj->stock;
+			$stock = $obj->stock;
 			$nbofmovement	= $obj->nbofmovement;
 
 			// Pour llx_product_stock.reel
@@ -298,8 +304,8 @@ if ($date && $dateIsValid) {	// We avoid a heavy sql if mandatory parameter date
 	$resql = $db->query($sql);
 	if (empty($resql))
 	{
-	    dol_print_error($db);
-	    exit;
+		dol_print_error($db);
+		exit;
 	}
 
 	$num = $db->num_rows($resql);
@@ -326,7 +332,7 @@ $head[1][2] = 'stockatdatefuture';
 
 print load_fiche_titre($langs->trans('StockAtDate'), '', 'stock');
 
-dol_fiche_head($head, ($mode == 'future' ? 'stockatdatefuture' : 'stockatdatepast'), '', -1, '');
+print dol_get_fiche_head($head, ($mode == 'future' ? 'stockatdatefuture' : 'stockatdatepast'), '', -1, '');
 
 $desc = $langs->trans("StockAtDatePastDesc");
 if ($mode == 'future') $desc = $langs->trans("StockAtDateFutureDesc");
@@ -345,7 +351,7 @@ print ' <span class="clearbothonsmartphone marginleftonly paddingleftonly margin
 $form->select_produits($productid, 'productid', '', 0, 0, -1, 2, '', 0, array(), 0, '1', 0, 'maxwidth300');
 
 print ' <span class="clearbothonsmartphone marginleftonly paddingleftonly marginrightonly paddinrightonly">&nbsp;</span> '.$langs->trans('Warehouse').'</span> ';
-print $formproduct->selectWarehouses($fk_warehouse, 'fk_warehouse', '', 1);
+print $formproduct->selectWarehouses((GETPOSTISSET('fk_warehouse') ? $fk_warehouse : 'ifone'), 'fk_warehouse', '', 1);
 print '</div>';
 
 $parameters = array();
@@ -386,8 +392,8 @@ print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 // Fields title search
 print '<tr class="liste_titre_filter">';
-print '<td class="liste_titre"><input class="flat" type="text" name="search_ref" size="8" value="'.dol_escape_htmltag($sref).'"></td>';
-print '<td class="liste_titre"><input class="flat" type="text" name="search_nom" size="8" value="'.dol_escape_htmltag($snom).'"></td>';
+print '<td class="liste_titre"><input class="flat" type="text" name="search_ref" size="8" value="'.dol_escape_htmltag($search_ref).'"></td>';
+print '<td class="liste_titre"><input class="flat" type="text" name="search_nom" size="8" value="'.dol_escape_htmltag($search_nom).'"></td>';
 print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
@@ -477,7 +483,7 @@ while ($i < ($limit ? min($num, $limit) : $num))
 		}
 
 		if ($mode == 'future') {
-			$prod->load_stock('warehouseopen, warehouseinternal', 0);	// This call also ->load_virtual_stock()
+			$prod->load_stock('warehouseopen, warehouseinternal', 0); // This call also ->load_virtual_stock()
 
 			//$result = $prod->load_stats_reception(0, '4');
 			//print $prod->stats_commande_fournisseur['qty'].'<br>'."\n";
@@ -549,12 +555,18 @@ $parameters = array('sql'=>$sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
+if (empty($date) || ! $dateIsValid) {
+	$colspan = 6;
+	if ($mode == 'future') $colspan++;
+	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("EmptySearchString").'</span></td></tr>';
+}
+
 print '</table>';
 print '</div>';
 
 $db->free($resql);
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '</form>';
 
diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
index 88cced3b99d..0885e9ef777 100644
--- a/htdocs/product/stock/tpl/stockcorrection.tpl.php
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -56,7 +56,7 @@ print load_fiche_titre($langs->trans("StockCorrection"), '', 'generic');
 
 print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="post">'."\n";
 
-dol_fiche_head();
+print dol_get_fiche_head();
 
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="correct_stock">';
@@ -138,17 +138,17 @@ print '<td>'.$langs->trans("MovementLabel").'</td>';
 print '<td>';
 print '<input type="text" name="label" class="minwidth300" value="'.$valformovementlabel.'">';
 print '</td>';
-print '<td>'.$langs->trans("InventoryCode").'</td><td><input class="maxwidth100onsmartphone" name="inventorycode" id="inventorycode" value="'.(isset($_POST["inventorycode"]) ?GETPOST("inventorycode", 'alpha') : dol_print_date(dol_now(), '%y%m%d%H%M%S')).'"></td>';
+print '<td>'.$langs->trans("InventoryCode").'</td><td><input class="maxwidth100onsmartphone" name="inventorycode" id="inventorycode" value="'.(GETPOSTISSET("inventorycode") ? GETPOST("inventorycode", 'alpha') : dol_print_date(dol_now(), '%y%m%d%H%M%S')).'"></td>';
 print '</tr>';
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center">';
-print '<input type="submit" class="button" name="save" value="'.dol_escape_htmltag($langs->trans('Save')).'">';
+print '<input type="submit" class="button button-save" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+print '<input type="submit" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 print '</div>';
 
 print '</form>';
diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php
index 0164e99bd37..7e159a35b32 100644
--- a/htdocs/product/stock/tpl/stocktransfer.tpl.php
+++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php
@@ -55,7 +55,7 @@ print load_fiche_titre($langs->trans("StockTransfer"), '', 'generic');
 
 print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="post">'."\n";
 
-dol_fiche_head();
+print dol_get_fiche_head();
 
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="transfert_stock">';
@@ -127,17 +127,17 @@ print '<td>'.$langs->trans("MovementLabel").'</td>';
 print '<td>';
 print '<input type="text" name="label" class="minwidth300" value="'.dol_escape_htmltag($valformovementlabel).'">';
 print '</td>';
-print '<td>'.$langs->trans("InventoryCode").'</td><td><input class="maxwidth100onsmartphone" name="inventorycode" id="inventorycode" value="'.(isset($_POST["inventorycode"]) ?GETPOST("inventorycode", 'alpha') : dol_print_date(dol_now(), '%y%m%d%H%M%S')).'"></td>';
+print '<td>'.$langs->trans("InventoryCode").'</td><td><input class="maxwidth100onsmartphone" name="inventorycode" id="inventorycode" value="'.(GETPOSTISSET("inventorycode") ? GETPOST("inventorycode", 'alpha') : dol_print_date(dol_now(), '%y%m%d%H%M%S')).'"></td>';
 print '</tr>';
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center">';
-print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans('Save')).'">';
+print '<input type="submit" class="button button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+print '<input type="submit" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 print '</div>';
 
 print '</form>';
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index 182d78e9cd1..35e82abdafc 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -61,11 +61,11 @@ $sql .= " WHERE e.entity IN (".getEntity('stock').")";
 if ($sref) $sql .= natural_search("e.ref", $sref);
 if ($sall)
 {
-    $sql .= " AND (e.ref LIKE '%".$db->escape($sall)."%'";
-    $sql .= " OR e.description LIKE '%".$db->escape($sall)."%'";
-    $sql .= " OR e.lieu LIKE '%".$db->escape($sall)."%'";
-    $sql .= " OR e.address LIKE '%".$db->escape($sall)."%'";
-    $sql .= " OR e.town LIKE '%".$db->escape($sall)."%')";
+	$sql .= " AND (e.ref LIKE '%".$db->escape($sall)."%'";
+	$sql .= " OR e.description LIKE '%".$db->escape($sall)."%'";
+	$sql .= " OR e.lieu LIKE '%".$db->escape($sall)."%'";
+	$sql .= " OR e.address LIKE '%".$db->escape($sall)."%'";
+	$sql .= " OR e.town LIKE '%".$db->escape($sall)."%')";
 }
 $sql .= " GROUP BY e.rowid, e.ref, e.statut, e.lieu, e.address, e.zip, e.town, e.fk_pays";
 $sql .= $db->order($sortfield, $sortorder);
@@ -74,83 +74,83 @@ $sql .= $db->plimit($limit + 1, $offset);
 $result = $db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
+	$num = $db->num_rows($result);
 
-    $i = 0;
+	$i = 0;
 
-    $help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
-    llxHeader("", $langs->trans("EnhancedValueOfWarehouses"), $help_url);
+	$help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
+	llxHeader("", $langs->trans("EnhancedValueOfWarehouses"), $help_url);
 
-    print_barre_liste($langs->trans("EnhancedValueOfWarehouses"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num);
+	print_barre_liste($langs->trans("EnhancedValueOfWarehouses"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num);
 
-    print '<table class="noborder centpercent">';
-    print "<tr class=\"liste_titre\">";
-    print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "e.ref", "", "", "", $sortfield, $sortorder);
-    print_liste_field_titre("LocationSummary", $_SERVER["PHP_SELF"], "e.lieu", "", "", "", $sortfield, $sortorder);
-    print_liste_field_titre("EstimatedStockValue", $_SERVER["PHP_SELF"], "e.valo_pmp", '', '', '', $sortfield, $sortorder, 'right ');
-    print_liste_field_titre("EstimatedStockValueSell", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'right ');
-    print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "e.statut", '', '', '', $sortfield, $sortorder, 'right ');
-    print "</tr>\n";
+	print '<table class="noborder centpercent">';
+	print "<tr class=\"liste_titre\">";
+	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "e.ref", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre("LocationSummary", $_SERVER["PHP_SELF"], "e.lieu", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre("EstimatedStockValue", $_SERVER["PHP_SELF"], "e.valo_pmp", '', '', '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre("EstimatedStockValueSell", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "e.statut", '', '', '', $sortfield, $sortorder, 'right ');
+	print "</tr>\n";
 
-    if ($num)
-    {
-        $entrepot = new Entrepot($db);
-        $total = $totalsell = 0;
-        $var = false;
-        while ($i < min($num, $limit))
-        {
-            $objp = $db->fetch_object($result);
-            print '<tr class="oddeven">';
-            print '<td><a href="card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowWarehouse"), 'stock').' '.$objp->ref.'</a></td>';
-            print '<td>'.$objp->lieu.'</td>';
-            // PMP value
-            print '<td class="right">';
-            if (price2num($objp->estimatedvalue, 'MT')) print price(price2num($objp->estimatedvalue, 'MT'), 1);
-            else print '';
-            print '</td>';
-            // Selling value
-            print '<td class="right">';
-            if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($objp->sellvalue, 'MT'), 1);
-            else print $langs->trans("Variable");
-            print '</td>';
-            // Status
-            print '<td class="right">'.$entrepot->LibStatut($objp->statut, 5).'</td>';
-            print "</tr>\n";
-            $total += price2num($objp->estimatedvalue, 'MU');
-            $totalsell += price2num($objp->sellvalue, 'MU');
+	if ($num)
+	{
+		$entrepot = new Entrepot($db);
+		$total = $totalsell = 0;
+		$var = false;
+		while ($i < min($num, $limit))
+		{
+			$objp = $db->fetch_object($result);
+			print '<tr class="oddeven">';
+			print '<td><a href="card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowWarehouse"), 'stock').' '.$objp->ref.'</a></td>';
+			print '<td>'.$objp->lieu.'</td>';
+			// PMP value
+			print '<td class="right">';
+			if (price2num($objp->estimatedvalue, 'MT')) print price(price2num($objp->estimatedvalue, 'MT'), 1);
+			else print '';
+			print '</td>';
+			// Selling value
+			print '<td class="right">';
+			if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($objp->sellvalue, 'MT'), 1);
+			else print $langs->trans("Variable");
+			print '</td>';
+			// Status
+			print '<td class="right">'.$entrepot->LibStatut($objp->statut, 5).'</td>';
+			print "</tr>\n";
+			$total += price2num($objp->estimatedvalue, 'MU');
+			$totalsell += price2num($objp->sellvalue, 'MU');
 
-            $i++;
-        }
+			$i++;
+		}
 
-        print '<tr class="liste_total">';
-        print '<td colspan="2" class="right">'.$langs->trans("Total").'</td>';
-        print '<td class="right">'.price(price2num($total, 'MT'), 1, $langs, 0, 0, -1, $conf->currency).'</td>';
-        print '<td class="right">'.price(price2num($totalsell, 'MT'), 1, $langs, 0, 0, -1, $conf->currency).'</td>';
-        print '<td class="right">&nbsp;</td>';
-        print "</tr>\n";
-    }
+		print '<tr class="liste_total">';
+		print '<td colspan="2" class="right">'.$langs->trans("Total").'</td>';
+		print '<td class="right">'.price(price2num($total, 'MT'), 1, $langs, 0, 0, -1, $conf->currency).'</td>';
+		print '<td class="right">'.price(price2num($totalsell, 'MT'), 1, $langs, 0, 0, -1, $conf->currency).'</td>';
+		print '<td class="right">&nbsp;</td>';
+		print "</tr>\n";
+	}
 
-    $db->free($result);
+	$db->free($result);
 
-    print "</table>";
+	print "</table>";
 
-    print '<br>';
+	print '<br>';
 
-    $file = 'entrepot-'.$year.'.png';
-    if (file_exists($conf->stock->dir_temp.'/'.$file))
-    {
-        $url = DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file='.$file;
-        print '<img src="'.$url.'">';
-    }
+	$file = 'entrepot-'.$year.'.png';
+	if (file_exists($conf->stock->dir_temp.'/'.$file))
+	{
+		$url = DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file='.$file;
+		print '<img src="'.$url.'">';
+	}
 
-    $file = 'entrepot-'.($year - 1).'.png';
-    if (file_exists($conf->stock->dir_temp.'/'.$file))
-    {
-        $url = DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file='.$file;
-        print '<br><img src="'.$url.'">';
-    }
+	$file = 'entrepot-'.($year - 1).'.png';
+	if (file_exists($conf->stock->dir_temp.'/'.$file))
+	{
+		$url = DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file='.$file;
+		print '<br><img src="'.$url.'">';
+	}
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // End of page
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index c6a5d15a0b0..97eb37a2689 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -180,14 +180,14 @@ $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
 $cnt_trans = 0;
 if (!empty($object->multilangs))
 {
-    foreach ($object->multilangs as $key => $value)
-    {
-        $cnt_trans++;
-    }
+	foreach ($object->multilangs as $key => $value)
+	{
+		$cnt_trans++;
+	}
 }
 
 
-dol_fiche_head($head, 'translation', $titre, 0, $picto);
+print dol_get_fiche_head($head, 'translation', $titre, 0, $picto);
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -196,7 +196,7 @@ if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULE
 
 dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref', '', '', '', 0, '', '', 1);
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 
@@ -210,11 +210,11 @@ print "\n<div class=\"tabsAction\">\n";
 
 if ($action == '')
 {
-    if ($user->rights->produit->creer || $user->rights->service->creer)
-    {
-        print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=add&id='.$object->id.'">'.$langs->trans("Add").'</a>';
-        if ($cnt_trans > 0) print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=edit&id='.$object->id.'">'.$langs->trans("Update").'</a>';
-    }
+	if ($user->rights->produit->creer || $user->rights->service->creer)
+	{
+		print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=add&id='.$object->id.'">'.$langs->trans("Add").'</a>';
+		if ($cnt_trans > 0) print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=edit&id='.$object->id.'">'.$langs->trans("Update").'</a>';
+	}
 }
 
 print "\n</div>\n";
@@ -247,9 +247,9 @@ if ($action == 'edit')
 			print '</td></tr>';
 			if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION))
 			{
-                print '<tr><td class="tdtop">'.$langs->trans('Other').' ('.$langs->trans("NotUsed").')</td><td>';
-                $doleditor = new DolEditor("other-$key", $object->multilangs[$key]["other"], '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%');
-                $doleditor->Create();
+				print '<tr><td class="tdtop">'.$langs->trans('Other').' ('.$langs->trans("NotUsed").')</td><td>';
+				$doleditor = new DolEditor("other-$key", $object->multilangs[$key]["other"], '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%');
+				$doleditor->Create();
 			}
 			print '</td></tr>';
 			print '</table>';
@@ -259,9 +259,9 @@ if ($action == 'edit')
 	print '<br>';
 
 	print '<div class="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+	print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
@@ -281,7 +281,7 @@ if ($action == 'edit')
 			print '<tr><td class="tdtop">'.$langs->trans('Description').'</td><td>'.$object->multilangs[$key]["description"].'</td></tr>';
 			if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION))
 			{
-                print '<tr><td>'.$langs->trans('Other').' ('.$langs->trans("NotUsed").')</td><td>'.$object->multilangs[$key]["other"].'</td></tr>';
+				print '<tr><td>'.$langs->trans('Other').' ('.$langs->trans("NotUsed").')</td><td>'.$object->multilangs[$key]["other"].'</td></tr>';
 			}
 			print '</table>';
 			print '</div>';
@@ -307,33 +307,33 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service
 	print '<input type="hidden" name="action" value="vadd">';
 	print '<input type="hidden" name="id" value="'.GETPOST("id", 'int').'">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">';
 	print '<tr><td class="tdtop titlefieldcreate fieldrequired">'.$langs->trans('Language').'</td><td>';
-    print $formadmin->select_language('', 'forcelangprod', 0, $object->multilangs, 1);
+	print $formadmin->select_language('', 'forcelangprod', 0, $object->multilangs, 1);
 	print '</td></tr>';
 	print '<tr><td class="tdtop fieldrequired">'.$langs->trans('Label').'</td><td><input name="libelle" size="40"></td></tr>';
 	print '<tr><td class="tdtop">'.$langs->trans('Description').'</td><td>';
 	$doleditor = new DolEditor('desc', '', '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%');
 	$doleditor->Create();
 	print '</td></tr>';
-    // Other field (not used)
-    if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION))
-    {
-        print '<tr><td class="tdtop">'.$langs->trans('Other').' ('.$langs->trans("NotUsed").'</td><td>';
-    	$doleditor = new DolEditor('other', '', '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%');
-    	$doleditor->Create();
-    	print '</td></tr>';
-    }
+	// Other field (not used)
+	if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION))
+	{
+		print '<tr><td class="tdtop">'.$langs->trans('Other').' ('.$langs->trans("NotUsed").'</td><td>';
+		$doleditor = new DolEditor('other', '', '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%');
+		$doleditor->Create();
+		print '</td></tr>';
+	}
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+	print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 295f96370f3..2ca149a18ca 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -98,33 +98,33 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-    // Search project
-    if (!empty($conf->projet->enabled) && $user->rights->projet->lire)
-    {
-    	$listofsearchfields['search_task'] = array('text'=>'Task');
-    }
+	// Search project
+	if (!empty($conf->projet->enabled) && $user->rights->projet->lire)
+	{
+		$listofsearchfields['search_task'] = array('text'=>'Task');
+	}
 
-    if (count($listofsearchfields))
-    {
-    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-    	print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<div class="div-table-responsive-no-min">';
-    	print '<table class="noborder nohover centpercent">';
-    	$i = 0;
-    	foreach ($listofsearchfields as $key => $value)
-    	{
-    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    		print '<tr '.$bc[false].'>';
-    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-    		print '</tr>';
-    		$i++;
-    	}
-    	print '</table>';
-        print '</div>';
-    	print '</form>';
-    	print '<br>';
-    }
+	if (count($listofsearchfields))
+	{
+		print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder nohover centpercent">';
+		$i = 0;
+		foreach ($listofsearchfields as $key => $value)
+		{
+			if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+			print '<tr '.$bc[false].'>';
+			print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+			if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+			print '</tr>';
+			$i++;
+		}
+		print '</table>';
+		print '</div>';
+		print '</form>';
+		print '<br>';
+	}
 }
 
 
@@ -299,56 +299,56 @@ if ($db->type != 'pgsql')
 /* Affichage de la liste des projets du mois */
 if (!empty($conf->global->PROJECT_TASK_TIME_MONTH))
 {
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td>'.$langs->trans("ActivityOnProjectThisMonth").': '.dol_print_date($now, "%B %Y").'</td>';
-    print '<td class="right">'.$langs->trans("Time").'</td>';
-    print "</tr>\n";
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("ActivityOnProjectThisMonth").': '.dol_print_date($now, "%B %Y").'</td>';
+	print '<td class="right">'.$langs->trans("Time").'</td>';
+	print "</tr>\n";
 
-    $sql = "SELECT p.rowid, p.ref, p.title, p.public, SUM(tt.task_duration) as nb";
-    $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
-    $sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
-    $sql .= ", ".MAIN_DB_PREFIX."projet_task_time as tt";
-    $sql .= " WHERE t.fk_projet = p.rowid";
-    $sql .= " AND p.entity = ".$conf->entity;
-    $sql .= " AND tt.fk_task = t.rowid";
-    $sql .= " AND tt.fk_user = ".$user->id;
+	$sql = "SELECT p.rowid, p.ref, p.title, p.public, SUM(tt.task_duration) as nb";
+	$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
+	$sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
+	$sql .= ", ".MAIN_DB_PREFIX."projet_task_time as tt";
+	$sql .= " WHERE t.fk_projet = p.rowid";
+	$sql .= " AND p.entity = ".$conf->entity;
+	$sql .= " AND tt.fk_task = t.rowid";
+	$sql .= " AND tt.fk_user = ".$user->id;
 	$sql .= " AND task_date BETWEEN '".$db->idate(dol_get_first_day($year, $month))."' AND '".$db->idate(dol_get_last_day($year, $month))."'";
-    $sql .= " AND p.rowid in (".$db->sanitize($projectsListId).")";
-    $sql .= " GROUP BY p.rowid, p.ref, p.title, p.public";
+	$sql .= " AND p.rowid in (".$db->sanitize($projectsListId).")";
+	$sql .= " GROUP BY p.rowid, p.ref, p.title, p.public";
 
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-    	while ($row = $db->fetch_object($resql))
-    	{
-    		print '<tr class="oddeven">';
-    		print '<td>';
-    		$projectstatic->id = $row->rowid;
-    		$projectstatic->ref = $row->ref;
-    		$projectstatic->title = $row->title;
-    		print $projectstatic->getNomUrl(1, '', 1);
-    		print '</td>';
-    		print '<td class="right">'.convertSecondToTime($row->nb, 'allhourmin').'</td>';
-    		print "</tr>\n";
-    	}
-    	$db->free($resql);
-    } else {
-    	dol_print_error($db);
-    }
-    print '<tr class="liste_total">';
-    print '<td>'.$langs->trans('Total').'</td>';
-    print '<td class="right">'.convertSecondToTime($total, 'allhourmin').'</td>';
-    print "</tr>\n";
-    print "</table>";
-    print '</div>';
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		while ($row = $db->fetch_object($resql))
+		{
+			print '<tr class="oddeven">';
+			print '<td>';
+			$projectstatic->id = $row->rowid;
+			$projectstatic->ref = $row->ref;
+			$projectstatic->title = $row->title;
+			print $projectstatic->getNomUrl(1, '', 1);
+			print '</td>';
+			print '<td class="right">'.convertSecondToTime($row->nb, 'allhourmin').'</td>';
+			print "</tr>\n";
+		}
+		$db->free($resql);
+	} else {
+		dol_print_error($db);
+	}
+	print '<tr class="liste_total">';
+	print '<td>'.$langs->trans('Total').'</td>';
+	print '<td class="right">'.convertSecondToTime($total, 'allhourmin').'</td>';
+	print "</tr>\n";
+	print "</table>";
+	print '</div>';
 }
 
 /* Affichage de la liste des projets de l'annee */
 if (!empty($conf->global->PROJECT_TASK_TIME_YEAR))
 {
-    print '<div class="div-table-responsive-no-min">';
+	print '<div class="div-table-responsive-no-min">';
 	print '<br><table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("ActivityOnProjectThisYear").': '.strftime("%Y", $now).'</td>';
@@ -392,44 +392,44 @@ if (!empty($conf->global->PROJECT_TASK_TIME_YEAR))
 	print '<td class="right">'.convertSecondToTime($total, 'allhourmin').'</td>';
 	print "</tr>\n";
 	print "</table>";
-    print '</div>';
+	print '</div>';
 }
 
 if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SHOW_TASK_LIST_ON_PROJECT_AREA))
 {
-    // Get id of types of contacts for projects (This list never contains a lot of elements)
-    $listofprojectcontacttype = array();
-    $sql = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
-    $sql .= " WHERE ctc.element = '".$db->escape($projectstatic->element)."'";
-    $sql .= " AND ctc.source = 'internal'";
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        while ($obj = $db->fetch_object($resql))
-        {
-            $listofprojectcontacttype[$obj->rowid] = $obj->code;
-        }
-    } else dol_print_error($db);
-    if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0] = '0'; // To avoid sql syntax error if not found
-    // Get id of types of contacts for tasks (This list never contains a lot of elements)
-    $listoftaskcontacttype = array();
-    $sql = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
-    $sql .= " WHERE ctc.element = '".$db->escape($taskstatic->element)."'";
-    $sql .= " AND ctc.source = 'internal'";
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        while ($obj = $db->fetch_object($resql))
-        {
-            $listoftaskcontacttype[$obj->rowid] = $obj->code;
-        }
-    } else dol_print_error($db);
-    if (count($listoftaskcontacttype) == 0) $listoftaskcontacttype[0] = '0'; // To avoid sql syntax error if not found
+	// Get id of types of contacts for projects (This list never contains a lot of elements)
+	$listofprojectcontacttype = array();
+	$sql = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
+	$sql .= " WHERE ctc.element = '".$db->escape($projectstatic->element)."'";
+	$sql .= " AND ctc.source = 'internal'";
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		while ($obj = $db->fetch_object($resql))
+		{
+			$listofprojectcontacttype[$obj->rowid] = $obj->code;
+		}
+	} else dol_print_error($db);
+	if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0] = '0'; // To avoid sql syntax error if not found
+	// Get id of types of contacts for tasks (This list never contains a lot of elements)
+	$listoftaskcontacttype = array();
+	$sql = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
+	$sql .= " WHERE ctc.element = '".$db->escape($taskstatic->element)."'";
+	$sql .= " AND ctc.source = 'internal'";
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		while ($obj = $db->fetch_object($resql))
+		{
+			$listoftaskcontacttype[$obj->rowid] = $obj->code;
+		}
+	} else dol_print_error($db);
+	if (count($listoftaskcontacttype) == 0) $listoftaskcontacttype[0] = '0'; // To avoid sql syntax error if not found
 
 
 	// Tasks for all resources of all opened projects and time spent for each task/resource
 	// This list can be very long, so we don't show it by default on task area. We prefer to use the list page.
-    // Add constant PROJECT_SHOW_TASK_LIST_ON_PROJECT_AREA to show this list
+	// Add constant PROJECT_SHOW_TASK_LIST_ON_PROJECT_AREA to show this list
 
 	$max = (empty($conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA) ? 1000 : $conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA);
 
@@ -442,13 +442,13 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on tasktime.fk_user = u.rowid";
 	if ($mine)
 	{
-	    $sql .= ", ".MAIN_DB_PREFIX."element_contact as ect";
+		$sql .= ", ".MAIN_DB_PREFIX."element_contact as ect";
 	}
 	$sql .= " WHERE p.entity IN (".getEntity('project').")";
 	if ($mine || empty($user->rights->projet->all->lire)) $sql .= " AND p.rowid IN (".$db->sanitize($projectsListId).")"; // project i have permission on
 	if ($mine)     // this may duplicate record if we are contact twice
 	{
-        $sql .= " AND ect.fk_c_type_contact IN (".join(',', array_keys($listoftaskcontacttype)).") AND ect.element_id = t.rowid AND ect.fk_socpeople = ".$user->id;
+		$sql .= " AND ect.fk_c_type_contact IN (".join(',', array_keys($listoftaskcontacttype)).") AND ect.element_id = t.rowid AND ect.fk_socpeople = ".$user->id;
 	}
 	if ($socid)	$sql .= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
 	$sql .= " AND p.fk_statut=1";
@@ -465,7 +465,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 
 		//print load_fiche_titre($langs->trans("TasksOnOpenedProject"),'','').'<br>';
 
-        print '<div class="div-table-responsive-no-min">';
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		//print '<th>'.$langs->trans('TaskRessourceLinks').'</th>';
@@ -515,7 +515,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 			{
 				print '<td>';
 				$code = dol_getIdFromCode($db, $obj->opp_status, 'c_lead_status', 'rowid', 'code');
-        		if ($code) print $langs->trans("OppStatus".$code);
+				if ($code) print $langs->trans("OppStatus".$code);
 				print '</td>';
 			}
 			print '<td>';
@@ -564,7 +564,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 		}
 
 		print "</table>";
-        print '</div>';
+		print '</div>';
 
 
 		$db->free($resql);
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index adf35d8bc3b..9e15a580358 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -48,8 +48,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'per
 $mine = 0;
 if ($mode == 'mine') $mine = 1;
 
-$projectid = '';
-$projectid = isset($_GET["id"]) ? $_GET["id"] : $_POST["projectid"];
+$projectid = isset($_GET["id"]) ? GETPOST("id", "int", 1) : GETPOST("projectid", "int");
 
 $hookmanager->initHooks(array('timesheetperdaycard'));
 
@@ -128,10 +127,10 @@ $arrayfields['t.progress'] = array('label'=>'ProgressDeclared', 'checked'=>1, 'e
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
 {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-    {
-    	if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-    		$arrayfields["efpt.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-    }
+	{
+		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
+			$arrayfields["efpt.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
+	}
 }
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
@@ -159,8 +158,8 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_thirdparty = '';
 	$search_declared_progress = '';
 
-    $search_array_options_project = array();
-    $search_array_options_task = array();
+	$search_array_options_project = array();
+	$search_array_options_task = array();
 
 	// We redefine $usertoprocess
 	$usertoprocess = $user;
@@ -263,7 +262,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 		{
 			if (intval($time) > 0)
 			{
-			    $matches = array();
+				$matches = array();
 				// Hours or minutes of duration
 				if (preg_match("/([0-9]+)duration(hour|min)/", $key, $matches))
 				{
@@ -448,7 +447,7 @@ print '<input type="hidden" name="addtimemonth" value="'.$tmp['mon'].'">';
 print '<input type="hidden" name="addtimeday" value="'.$tmp['mday'].'">';
 
 $head = project_timesheet_prepare_head($mode, $usertoprocess);
-dol_fiche_head($head, 'inputperday', $langs->trans('TimeSpent'), -1, 'task');
+print dol_get_fiche_head($head, 'inputperday', $langs->trans('TimeSpent'), -1, 'projecttask');
 
 // Show description of content
 print '<div class="hideonsmartphone opacitymedium">';
@@ -468,7 +467,7 @@ if ($mine || ($usertoprocess->id == $user->id))
 }
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 print '<div class="floatright right'.($conf->dol_optimize_smallscreen ? ' centpercent' : '').'">'.$nav.'</div>'; // We move this before the assign to components so, the default submit button is not the assign to.
@@ -539,7 +538,7 @@ if (!empty($arrayfields['t.planned_workload']['checked'])) $addcolspan++;
 if (!empty($arrayfields['t.progress']['checked'])) $addcolspan++;
 foreach ($arrayfields as $key => $val)
 {
-    if ($val['checked'] && substr($key, 0, 5) == 'efpt.') $addcolspan++;
+	if ($val['checked'] && substr($key, 0, 5) == 'efpt.') $addcolspan++;
 }
 
 print '<div class="div-table-responsive">';
@@ -557,11 +556,11 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 print '<td class="liste_titre"></td>';
 if (!empty($arrayfields['t.planned_workload']['checked']))
 {
-    print '<td class="liste_titre right"><input type="text" size="4" name="search_declared_progress" value="'.dol_escape_htmltag($search_declared_progress).'"></td>';
+	print '<td class="liste_titre right"><input type="text" size="4" name="search_declared_progress" value="'.dol_escape_htmltag($search_declared_progress).'"></td>';
 }
 if (!empty($arrayfields['t.progress']['checked']))
 {
-    print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"></td>';
 }
 print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
@@ -584,11 +583,11 @@ $extrafieldsobjectprefix = 'efpt.';
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 if (!empty($arrayfields['t.planned_workload']['checked']))
 {
-    print '<th class="right leftborder plannedworkload maxwidth100">'.$langs->trans("PlannedWorkload").'</th>';
+	print '<th class="right leftborder plannedworkload maxwidth100">'.$langs->trans("PlannedWorkload").'</th>';
 }
 if (!empty($arrayfields['t.progress']['checked']))
 {
-    print '<th class="right maxwidth100">'.$langs->trans("ProgressDeclared").'</th>';
+	print '<th class="right maxwidth100">'.$langs->trans("ProgressDeclared").'</th>';
 }
 /*print '<td class="right maxwidth100">'.$langs->trans("TimeSpent").'</td>';
 if ($usertoprocess->id == $user->id) print '<td class="right maxwidth100">'.$langs->trans("TimeSpentByYou").'</td>';
@@ -612,20 +611,24 @@ if (!empty($conf->global->MAIN_DEFAULT_WORKING_DAYS))
 	}
 }
 
-$statusofholidaytocheck = '3';
+$statusofholidaytocheck = Holiday::STATUS_APPROVED;
 $isavailablefordayanduser = $holiday->verifDateHolidayForTimestamp($usertoprocess->id, $daytoparse, $statusofholidaytocheck); // $daytoparse is a date with hours = 0
 $isavailable[$daytoparse] = $isavailablefordayanduser; // in projectLinesPerWeek later, we are using $firstdaytoshow and dol_time_plus_duree to loop on each day
 
-$tmparray = dol_getdate($daytoparse, true); // detail of current day
-$idw = $tmparray['wday'];
+$test = num_public_holiday($daytoparse, $daytoparse + 86400, $mysoc->country_code);
+if ($test) $isavailable[$daytoparse] = array('morning'=>false, 'afternoon'=>false, 'morning_reason'=>'public_holiday', 'afternoon_reason'=>'public_holiday');
 
+$tmparray = dol_getdate($daytoparse, true); // detail of current day
+// For monday, must be 0 for monday if MAIN_START_WEEK = 1, must be 1 for monday if MAIN_START_WEEK = 0
+$idw = ($tmparray['wday'] - (empty($conf->global->MAIN_START_WEEK) ? 0 : 1));
+// numstartworkingday and numendworkingday are default start and end date of working days (1 means sunday if MAIN_START_WEEK is 0, 1 means monday if MAIN_START_WEEK is 1)
 $cssweekend = '';
-if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday)	// This is a day is not inside the setup of working days, so we use a week-end css.
+if ((($idw + 1) < $numstartworkingday) || (($idw + 1) > $numendworkingday))	// This is a day is not inside the setup of working days, so we use a week-end css.
 {
 	$cssweekend = 'weekend';
 }
 
-$tmpday = dol_time_plus_duree($firstdaytoshow, $idw, 'd');
+$tmpday = dol_time_plus_duree($daytoparse, $idw, 'd');
 
 $cssonholiday = '';
 if (!$isavailable[$daytoparse]['morning'] && !$isavailable[$daytoparse]['afternoon'])   $cssonholiday .= 'onholidayallday ';
@@ -651,25 +654,11 @@ if ($conf->use_javascript_ajax)
 	//print '  - '.$langs->trans("ExpectedWorkedHours").': <strong>'.price($usertoprocess->weeklyhours, 1, $langs, 0, 0).'</strong>';
 	print '</td>';
 
-	$tmparray = dol_getdate($daytoparse, true); // detail of current day
-	$idw = $tmparray['wday'];
-
-	$cssweekend = '';
-	if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday)	// This is a day is not inside the setup of working days, so we use a week-end css.
-	{
-		$cssweekend = 'weekend';
-	}
-
-	$cssonholiday = '';
-	if (!$isavailable[$daytoparse]['morning'] && !$isavailable[$daytoparse]['afternoon'])   $cssonholiday .= 'onholidayallday ';
-	elseif (!$isavailable[$daytoparse]['morning'])   $cssonholiday .= 'onholidaymorning ';
-	elseif (!$isavailable[$daytoparse]['afternoon']) $cssonholiday .= 'onholidayafternoon ';
-
 	print '<td class="liste_total center'.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'"><div class="totalDay0">&nbsp;</div></td>';
 
 	print '<td class="liste_total"></td>';
-    print '<td class="liste_total"></td>';
-    print '</tr>';
+	print '<td class="liste_total"></td>';
+	print '</tr>';
 }
 
 
@@ -752,20 +741,6 @@ if (count($tasksarray) > 0)
 		//print '  - '.$langs->trans("ExpectedWorkedHours").': <strong>'.price($usertoprocess->weeklyhours, 1, $langs, 0, 0).'</strong>';
 		print '</td>';
 
-		$tmparray = dol_getdate($daytoparse, true); // detail of current day
-		$idw = $tmparray['wday'];
-
-		$cssweekend = '';
-		if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday)	// This is a day is not inside the setup of working days, so we use a week-end css.
-		{
-			$cssweekend = 'weekend';
-		}
-
-		$cssonholiday = '';
-		if (!$isavailable[$daytoparse]['morning'] && !$isavailable[$daytoparse]['afternoon'])   $cssonholiday .= 'onholidayallday ';
-		elseif (!$isavailable[$daytoparse]['morning'])   $cssonholiday .= 'onholidaymorning ';
-		elseif (!$isavailable[$daytoparse]['afternoon']) $cssonholiday .= 'onholidayafternoon ';
-
 		print '<td class="liste_total center'.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'"><div class="totalDay0">&nbsp;</div></td>';
 
 		print '<td class="liste_total"></td>
@@ -781,7 +756,7 @@ print '</div>';
 print '<input type="hidden" id="numberOfLines" name="numberOfLines" value="'.count($tasksarray).'"/>'."\n";
 
 print '<div class="center">';
-print '<input type="submit" class="button"'.($disabledtask ? ' disabled' : '').' value="'.$langs->trans("Save").'">';
+print '<input type="submit" class="button button-save"'.($disabledtask ? ' disabled' : '').' value="'.$langs->trans("Save").'">';
 print '</div>';
 
 print '</form>';
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index 72128b5e052..4904e2379f0 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -46,8 +46,7 @@ $taskid = GETPOST('taskid', 'int');
 $mine = 0;
 if ($mode == 'mine') $mine = 1;
 
-$projectid = '';
-$projectid = isset($_GET["id"]) ? $_GET["id"] : $_POST["projectid"];
+$projectid = isset($_GET["id"]) ? GETPOST("id", "int", 1) : GETPOST("projectid", "int");
 
 // Security check
 $socid = 0;
@@ -373,7 +372,7 @@ print '<input type="hidden" name="month" value="'.$month.'">';
 print '<input type="hidden" name="year" value="'.$year.'">';
 
 $head = project_timesheet_prepare_head($mode, $usertoprocess);
-dol_fiche_head($head, 'inputpermonth', $langs->trans('TimeSpent'), -1, 'task');
+print dol_get_fiche_head($head, 'inputpermonth', $langs->trans('TimeSpent'), -1, 'projecttask');
 
 // Show description of content
 print '<div class="hideonsmartphone opacitymedium">';
@@ -393,7 +392,7 @@ if ($mine || ($usertoprocess->id == $user->id))
 }
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="floatright right'.($conf->dol_optimize_smallscreen ? ' centpercent' : '').'">'.$nav.'</div>'; // We move this before the assign to components so, the default submit button is not the assign to.
 
@@ -502,7 +501,10 @@ $colspan = 5;
 // By default, we can edit only tasks we are assigned to
 $restrictviewformytask = (empty($conf->global->PROJECT_TIME_SHOW_TASK_NOT_ASSIGNED) ? 1 : 0);
 
+// Get if user is available or not for each day
 $isavailable = array();
+// TODO See code into perweek.php to initialize isavailable array
+
 
 if (count($tasksarray) > 0)
 {
@@ -605,7 +607,7 @@ print '<input type="hidden" id="numberOfLines" name="numberOfLines" value="'.cou
 print '<input type="hidden" id="numberOfFirstLine" name="numberOfFirstLine" value="'.(reset($TWeek)).'"/>'."\n";
 
 print '<div class="center">';
-print '<input type="submit" class="button" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+print '<input type="submit" class="button button-save" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 print '</div>';
 
 print '</form>'."\n\n";
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 437c5934c81..8b49aa2e0c2 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -48,8 +48,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'per
 $mine = 0;
 if ($mode == 'mine') $mine = 1;
 
-$projectid = '';
-$projectid = isset($_GET["id"]) ? $_GET["id"] : $_POST["projectid"];
+$projectid = isset($_GET["id"]) ? GETPOST("id", "int", 1) : GETPOST("projectid", "int");
 
 $hookmanager->initHooks(array('timesheetperweekcard'));
 
@@ -158,6 +157,7 @@ $search_array_options_task = $extrafields->getOptionalsFromPost('projet_task', '
 /*
  * Actions
  */
+
 $parameters = array('id' => $id, 'taskid' => $taskid, 'projectid' => $projectid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -173,8 +173,8 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_thirdparty = '';
 	$search_declared_progress = '';
 
-    $search_array_options_project = array();
-    $search_array_options_task = array();
+	$search_array_options_project = array();
+	$search_array_options_task = array();
 
 	// We redefine $usertoprocess
 	$usertoprocess = $user;
@@ -346,24 +346,23 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 			$param .= ($search_task_ref ? '&search_task_ref='.urlencode($search_task_ref) : '');
 			$param .= ($search_task_label ? '&search_task_label='.urlencode($search_task_label) : '');
 
-            /*$search_array_options=$search_array_options_project;
+			/*$search_array_options=$search_array_options_project;
             $search_options_pattern='search_options_';
             include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
             */
 
-            $search_array_options = $search_array_options_task;
-            $search_options_pattern = 'search_task_options_';
-            include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+			$search_array_options = $search_array_options_task;
+			$search_options_pattern = 'search_task_options_';
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
-	   	    // Redirect to avoid submit twice on back
-	       	header('Location: '.$_SERVER["PHP_SELF"].'?'.$param);
-	       	exit;
+	   		// Redirect to avoid submit twice on back
+		   	header('Location: '.$_SERVER["PHP_SELF"].'?'.$param);
+		   	exit;
 	   	}
 	}
 }
 
 
-
 /*
  * View
  */
@@ -465,7 +464,7 @@ print '<input type="hidden" name="month" value="'.$month.'">';
 print '<input type="hidden" name="year" value="'.$year.'">';
 
 $head = project_timesheet_prepare_head($mode, $usertoprocess);
-dol_fiche_head($head, 'inputperweek', $langs->trans('TimeSpent'), -1, 'task');
+print dol_get_fiche_head($head, 'inputperweek', $langs->trans('TimeSpent'), -1, 'projecttask');
 
 // Show description of content
 print '<div class="hideonsmartphone opacitymedium">';
@@ -485,7 +484,7 @@ if ($mine || ($usertoprocess->id == $user->id))
 }
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="floatright right'.($conf->dol_optimize_smallscreen ? ' centpercent' : '').'">'.$nav.'</div>'; // We move this before the assign to components so, the default submit button is not the assign to.
 
@@ -529,11 +528,16 @@ for ($idw = 0; $idw < 7; $idw++)
 	//print dol_print_date($dayinloopwithouthours, 'dayhour').' ';
 	//print dol_print_date($dayinloopfromfirstdaytoshow, 'dayhour').'<br>';
 
-	$statusofholidaytocheck = '3';
+	$statusofholidaytocheck = Holiday::STATUS_APPROVED;
 
 	$isavailablefordayanduser = $holiday->verifDateHolidayForTimestamp($usertoprocess->id, $dayinloopfromfirstdaytoshow, $statusofholidaytocheck);
 	$isavailable[$dayinloopfromfirstdaytoshow] = $isavailablefordayanduser; // in projectLinesPerWeek later, we are using $firstdaytoshow and dol_time_plus_duree to loop on each day
+
+	$test = num_public_holiday($dayinloopfromfirstdaytoshow, $dayinloopfromfirstdaytoshow + 86400, $mysoc->country_code);
+	if ($test) $isavailable[$dayinloopfromfirstdaytoshow] = array('morning'=>false, 'afternoon'=>false, 'morning_reason'=>'public_holiday', 'afternoon_reason'=>'public_holiday');
 }
+//var_dump($isavailable);
+
 
 
 $moreforfilter = '';
@@ -591,7 +595,7 @@ if (!empty($arrayfields['t.planned_workload']['checked'])) $addcolspan++;
 if (!empty($arrayfields['t.progress']['checked'])) $addcolspan++;
 foreach ($arrayfields as $key => $val)
 {
-    if ($val['checked'] && substr($key, 0, 5) == 'efpt.') $addcolspan++;
+	if ($val['checked'] && substr($key, 0, 5) == 'efpt.') $addcolspan++;
 }
 
 print '<div class="div-table-responsive">';
@@ -609,11 +613,11 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 print '<td class="liste_titre"></td>';
 if (!empty($arrayfields['t.planned_workload']['checked']))
 {
-    print '<td class="liste_titre right"><input type="text" size="4" name="search_declared_progress" value="'.dol_escape_htmltag($search_declared_progress).'"></td>';
+	print '<td class="liste_titre right"><input type="text" size="4" name="search_declared_progress" value="'.dol_escape_htmltag($search_declared_progress).'"></td>';
 }
 if (!empty($arrayfields['t.progress']['checked']))
 {
-    print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"></td>';
 }
 print '<td class="liste_titre"></td>';
 for ($idw = 0; $idw < 7; $idw++)
@@ -637,11 +641,11 @@ $extrafieldsobjectprefix = 'efpt.';
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 if (!empty($arrayfields['t.planned_workload']['checked']))
 {
-    print '<th class="leftborder plannedworkload maxwidth75 right">'.$langs->trans("PlannedWorkload").'</th>';
+	print '<th class="leftborder plannedworkload maxwidth75 right">'.$langs->trans("PlannedWorkload").'</th>';
 }
 if (!empty($arrayfields['t.progress']['checked']))
 {
-    print '<th class="maxwidth75 right">'.$langs->trans("ProgressDeclared").'</th>';
+	print '<th class="maxwidth75 right">'.$langs->trans("ProgressDeclared").'</th>';
 }
 /*print '<td class="maxwidth75 right">'.$langs->trans("TimeSpent").'</td>';
  if ($usertoprocess->id == $user->id) print '<td class="maxwidth75 right">'.$langs->trans("TimeSpentByYou").'</td>';
@@ -655,7 +659,7 @@ for ($idw = 0; $idw < 7; $idw++)
 	$dayinloop = dol_time_plus_duree($startday, $idw, 'd');
 
 	$cssweekend = '';
-	if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday)	// This is a day is not inside the setup of working days, so we use a week-end css.
+	if ((($idw + 1) < $numstartworkingday) || (($idw + 1) > $numendworkingday))	// This is a day is not inside the setup of working days, so we use a week-end css.
 	{
 		$cssweekend = 'weekend';
 	}
@@ -680,7 +684,7 @@ $colspan = 3 + (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)
 if ($conf->use_javascript_ajax)
 {
 	print '<tr class="liste_total">';
-    print '<td class="liste_total" colspan="'.($colspan + $addcolspan).'">';
+	print '<td class="liste_total" colspan="'.($colspan + $addcolspan).'">';
 	print $langs->trans("Total");
 	print '<span class="opacitymediumbycolor">  - '.$langs->trans("ExpectedWorkedHours").': <strong>'.price($usertoprocess->weeklyhours, 1, $langs, 0, 0).'</strong></span>';
 	print '</td>';
@@ -688,7 +692,7 @@ if ($conf->use_javascript_ajax)
 	for ($idw = 0; $idw < 7; $idw++)
 	{
 		$cssweekend = '';
-		if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday)	// This is a day is not inside the setup of working days, so we use a week-end css.
+		if ((($idw + 1) < $numstartworkingday) || (($idw + 1) > $numendworkingday))	// This is a day is not inside the setup of working days, so we use a week-end css.
 		{
 			$cssweekend = 'weekend';
 		}
@@ -699,7 +703,6 @@ if ($conf->use_javascript_ajax)
 		if (!$isavailable[$tmpday]['morning'] && !$isavailable[$tmpday]['afternoon'])   $cssonholiday .= 'onholidayallday ';
 		elseif (!$isavailable[$tmpday]['morning'])   $cssonholiday .= 'onholidaymorning ';
 		elseif (!$isavailable[$tmpday]['afternoon']) $cssonholiday .= 'onholidayafternoon ';
-
 		print '<td class="liste_total hide'.$idw.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'" align="center"><div class="totalDay'.$idw.'">&nbsp;</div></td>';
 	}
 	print '<td class="liste_total center"><div class="totalDayAll">&nbsp;</div></td>';
@@ -768,13 +771,13 @@ if (count($tasksarray) > 0)
 	if ($isdiff)
 	{
 		print '<tr class="oddeven othertaskwithtime">';
-        print '<td colspan="'.($colspan + $addcolspan).'" class="opacitymedium">';
+		print '<td colspan="'.($colspan + $addcolspan).'" class="opacitymedium">';
 		print $langs->trans("OtherFilteredTasks");
 		print '</td>';
 		for ($idw = 0; $idw < 7; $idw++)
 		{
 			$cssweekend = '';
-			if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday)	// This is a day is not inside the setup of working days, so we use a week-end css.
+			if ((($idw + 1) < $numstartworkingday) || (($idw + 1) > $numendworkingday))	// This is a day is not inside the setup of working days, so we use a week-end css.
 			{
 				$cssweekend = 'weekend';
 			}
@@ -790,8 +793,8 @@ if (count($tasksarray) > 0)
 			}
 			print '</td>';
 		}
-        print ' <td class="liste_total"></td>';
-    	print '</tr>';
+		print ' <td class="liste_total"></td>';
+		print '</tr>';
 	}
 
 	if ($conf->use_javascript_ajax)
@@ -802,10 +805,9 @@ if (count($tasksarray) > 0)
 				print '<span class="opacitymediumbycolor">  - '.$langs->trans("ExpectedWorkedHours").': <strong>'.price($usertoprocess->weeklyhours, 1, $langs, 0, 0).'</strong></span>';
 				print '</td>';
 
-		for ($idw = 0; $idw < 7; $idw++)
-				{
+		for ($idw = 0; $idw < 7; $idw++) {
 			$cssweekend = '';
-			if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday)	// This is a day is not inside the setup of working days, so we use a week-end css.
+			if ((($idw + 1) < $numstartworkingday) || (($idw + 1) > $numendworkingday))	// This is a day is not inside the setup of working days, so we use a week-end css.
 			{
 				$cssweekend = 'weekend';
 			}
@@ -819,7 +821,7 @@ if (count($tasksarray) > 0)
 
 			print '<td class="liste_total hide'.$idw.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'" align="center"><div class="totalDay'.$idw.'">&nbsp;</div></td>';
 		}
-                print '<td class="liste_total center"><div class="totalDayAll">&nbsp;</div></td>
+				print '<td class="liste_total center"><div class="totalDayAll">&nbsp;</div></td>
     	</tr>';
 	}
 } else {
@@ -831,7 +833,7 @@ print '</div>';
 print '<input type="hidden" id="numberOfLines" name="numberOfLines" value="'.count($tasksarray).'"/>'."\n";
 
 print '<div class="center">';
-print '<input type="submit" class="button" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+print '<input type="submit" class="button button-save" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 print '</div>';
 
 print '</form>'."\n\n";
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index f66d305f688..a46c64464f8 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -260,7 +260,7 @@ print load_fiche_titre($langs->trans("ProjectsSetup"), $linkback, 'title_setup')
 
 $head = project_admin_prepare_head();
 
-dol_fiche_head($head, 'project', $langs->trans("Projects"), -1, 'project');
+print dol_get_fiche_head($head, 'project', $langs->trans("Projects"), -1, 'project');
 
 
 
@@ -350,8 +350,10 @@ foreach ($dirmodels as $reldir)
 						// Show example of numbering model
 						print '<td class="nowrap">';
 						$tmp = $module->getExample();
-						if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-						elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						if (preg_match('/^Error/', $tmp)) {
+							$langs->load("errors");
+							print '<div class="error">'.$langs->trans($tmp).'</div>';
+						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
 						else print $tmp;
 						print '</td>'."\n";
 
@@ -447,8 +449,10 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 							// Show example of numbering module
 							print '<td class="nowrap">';
 							$tmp = $module->getExample();
-							if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-							elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+							if (preg_match('/^Error/', $tmp)) {
+								$langs->load("errors");
+								print '<div class="error">'.$langs->trans($tmp).'</div>';
+							} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
 							else print $tmp;
 							print '</td>'."\n";
 
diff --git a/htdocs/projet/admin/project_extrafields.php b/htdocs/projet/admin/project_extrafields.php
index da54d0bd5e6..6c92e6d66c9 100644
--- a/htdocs/projet/admin/project_extrafields.php
+++ b/htdocs/projet/admin/project_extrafields.php
@@ -69,11 +69,11 @@ print load_fiche_titre($langs->trans("ProjectsSetup"), $linkback, 'title_setup')
 
 $head = project_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Projects"), -1, 'project');
+print dol_get_fiche_head($head, 'attributes', $langs->trans("Projects"), -1, 'project');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
@@ -96,7 +96,7 @@ if ($action == 'create')
 	print "<br>";
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -109,7 +109,7 @@ if ($action == 'edit' && !empty($attrname))
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/projet/admin/project_task_extrafields.php b/htdocs/projet/admin/project_task_extrafields.php
index b8d1281986b..9f7efbb7096 100644
--- a/htdocs/projet/admin/project_task_extrafields.php
+++ b/htdocs/projet/admin/project_task_extrafields.php
@@ -69,11 +69,11 @@ print load_fiche_titre($langs->trans("ProjectsSetup"), $linkback, 'title_setup')
 
 $head = project_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes_task', $langs->trans("Projects"), -1, 'project');
+print dol_get_fiche_head($head, 'attributes_task', $langs->trans("Projects"), -1, 'project');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
@@ -96,7 +96,7 @@ if ($action == 'create')
 	print "<br>";
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -109,7 +109,7 @@ if ($action == 'edit' && !empty($attrname))
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/projet/ajax/projects.php b/htdocs/projet/ajax/projects.php
index cbc223f8525..0036ae64353 100644
--- a/htdocs/projet/ajax/projects.php
+++ b/htdocs/projet/ajax/projects.php
@@ -1,8 +1,8 @@
 <?php
 /* Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
  * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2007-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2014-2015 Marcos García       <marcosgdf@gmail.com>
+ * Copyright (C) 2007-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2014-2015 Marcos García        <marcosgdf@gmail.com>
  *
  * 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
@@ -19,7 +19,7 @@
  */
 
 /**
- *       \file       htdocs/product/ajax/products.php
+ *       \file       htdocs/projet/ajax/projects.php
  *       \brief      File to return Ajax response on product list request
  */
 
@@ -33,10 +33,8 @@ if (empty($_GET['keysearch']) && !defined('NOREQUIREHTML'))  define('NOREQUIREHT
 
 require '../../main.inc.php';
 
-$htmlname = GETPOST('htmlname', 'alpha');
+$htmlname = GETPOST('htmlname', 'aZ09');
 $socid = GETPOST('socid', 'int');
-$action = GETPOST('action', 'aZ09');
-$id = GETPOST('id', 'int');
 $discard_closed = GETPOST('discardclosed', 'int');
 
 
@@ -44,28 +42,31 @@ $discard_closed = GETPOST('discardclosed', 'int');
  * View
  */
 
-dol_syslog(join(',', $_GET));
+dol_syslog("Call ajax projet/ajax/projects.php");
+//dol_syslog(join(',', $_GET));
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 
-// Load translation files required by the page
-$langs->load("main");
-
 top_httphead();
 
-if (empty($htmlname)) return;
+if (empty($htmlname) && !GETPOST('mode', 'aZ09')) return;
 
-$match = preg_grep('/('.$htmlname.'[0-9]+)/', array_keys($_GET));
-sort($match);
-$idprod = (!empty($match[0]) ? $match[0] : '');
+// Mode to get list of projects
+if (!GETPOST('mode', 'aZ09') || GETPOST('mode', 'aZ09') != 'gettasks') {
+	// When used from jQuery, the search term is added as GET param "term".
+	$searchkey = (GETPOSTISSET($htmlname) ? GETPOST($htmlname, 'aZ09') : '');
 
-if (!GETPOST($htmlname) && !GETPOST($idprod)) return;
+	$formproject = new FormProjets($db);
+	$arrayresult = $formproject->select_projects_list($socid, '', $htmlname, 0, 0, 1, $discard_closed, 0, 0, 1, $searchkey);
+}
 
-// When used from jQuery, the search term is added as GET param "term".
-$searchkey = ((!empty($idprod) && GETPOST($idprod)) ?GETPOST($idprod) : (GETPOST($htmlname) ?GETPOST($htmlname) : ''));
+// Mode to get list of tasks
+if (GETPOST('mode', 'aZ09') == 'gettasks') {
+	$formproject = new FormProjets($db);
+	$formproject->selectTasks((!empty($$socid) ? $socid : -1), 0, 'taskid', 24, 1, '1', 1, 0, 0, 'maxwidth500', GETPOST('projectid', 'int'), '');
+	return;
+}
 
-$form = new FormProjets($db);
-$arrayresult = $form->select_projects_list($socid, '', $htmlname, 0, 0, 1, $discard_closed, 0, 0, 1, $searchkey);
 
 $db->close();
 
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index db38e3c02d7..653083bed04 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -119,14 +119,14 @@ if (empty($reshook))
 	if ($action == 'add' && $user->rights->projet->creer)
 	{
 		$error = 0;
-		if (! GETPOST('ref'))
+		if (!GETPOST('ref'))
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Ref")), null, 'errors');
 			$error++;
 		}
-		if (! GETPOST('title'))
+		if (!GETPOST('title'))
 		{
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("ProjectLabel")), null, 'errors');
 			$error++;
 		}
 
@@ -236,7 +236,7 @@ if (empty($reshook))
 		{
 			$error++;
 			//$_GET["id"]=$_POST["id"]; // We return on the project card
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("ProjectLabel")), null, 'errors');
 		}
 
 		$db->begin();
@@ -465,8 +465,7 @@ llxHeader("", $title, $help_url);
 
 $titleboth = $langs->trans("LeadsOrProjects");
 $titlenew = $langs->trans("NewLeadOrProject"); // Leads and opportunities by default
-if ($conf->global->PROJECT_USE_OPPORTUNITIES == 0)
-{
+if ($conf->global->PROJECT_USE_OPPORTUNITIES == 0) {
 	$titleboth = $langs->trans("Projects");
 	$titlenew = $langs->trans("NewProject");
 }
@@ -491,7 +490,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 	print '<input type="hidden" name="action" value="add">';
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent tableforfieldcreate">';
 
@@ -529,18 +528,17 @@ if ($action == 'create' && $user->rights->projet->creer)
 	print '</td></tr>';
 
 	// Label
-	print '<tr><td><span class="fieldrequired">'.$langs->trans("Label").'</span></td><td><input class="minwidth500" type="text" name="title" value="'.dol_escape_htmltag(GETPOST("title", 'alphanohtml')).'" autofocus></td></tr>';
+	print '<tr><td><span class="fieldrequired">'.$langs->trans("ProjectLabel").'</span></td><td><input class="minwidth500" type="text" name="title" value="'.dol_escape_htmltag(GETPOST("title", 'alphanohtml')).'" autofocus></td></tr>';
 
 	// Usage (opp, task, bill time, ...)
 	print '<tr><td class="tdtop">';
 	print $langs->trans("Usage");
 	print '</td>';
 	print '<td>';
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-	{
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 		print '<input type="checkbox" id="usage_opportunity" name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ' checked="checked"').'"> ';
 		$htmltext = $langs->trans("ProjectFollowOpportunity");
-		print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
+		print '<label for="usage_opportunity">'.$form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext).'</label>';
 		print '<script>';
 		print '$( document ).ready(function() {
 				jQuery("#usage_opportunity").change(function() {
@@ -560,14 +558,14 @@ if ($action == 'create' && $user->rights->projet->creer)
 	{
 		print '<input type="checkbox" id="usage_task" name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ' checked="checked"').'"> ';
 		$htmltext = $langs->trans("ProjectFollowTasks");
-		print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
+		print '<label for="usage_task">'.$form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext).'</label>';
 		print '<br>';
 	}
 	if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT))
 	{
 		print '<input type="checkbox" id="usage_bill_time" name="usage_bill_time"'.(GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '').'"> ';
 		$htmltext = $langs->trans("ProjectBillTimeDescription");
-		print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
+		print '<label for="usage_bill_time">'.$form->textwithpicto($langs->trans("BillTime"), $htmltext).'</label>';
 		print '<br>';
 	}
 	/*
@@ -587,7 +585,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 		print '</td><td class="maxwidthonsmartphone">';
 		$filteronlist = '';
 		if (!empty($conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST)) $filteronlist = $conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST;
-	   	$text = img_picto('', 'company').$form->select_company(GETPOST('socid', 'int'), 'socid', $filteronlist, 'SelectThirdParty', 1, 0, array(), 0, 'minwidth300 widthcentpercentminusx');
+	   	$text = img_picto('', 'company').$form->select_company(GETPOST('socid', 'int'), 'socid', $filteronlist, 'SelectThirdParty', 1, 0, array(), 0, 'minwidth300 widthcentpercentminusxx');
 		if (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) && empty($conf->dol_use_jmobile))
 		{
 			$texthelp = $langs->trans("IfNeedToUseOtherObjectKeepEmpty");
@@ -611,7 +609,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 	$array = array();
 	if (empty($conf->global->PROJECT_DISABLE_PRIVATE_PROJECT)) $array[0] = $langs->trans("PrivateProject");
 	if (empty($conf->global->PROJECT_DISABLE_PUBLIC_PROJECT)) $array[1] = $langs->trans("SharedProject");
-	print $form->selectarray('public', $array, GETPOST('public') ?GETPOST('public') : $object->public);
+	print $form->selectarray('public', $array, GETPOST('public') ?GETPOST('public') : $object->public, 0, 0, 0, '', 0, 0, 0, '', '', 1);
 	print '</td></tr>';
 
 	// Date start
@@ -629,7 +627,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 		// Opportunity status
 		print '<tr class="classuseopportunity"><td>'.$langs->trans("OpportunityStatus").'</td>';
 		print '<td class="maxwidthonsmartphone">';
-		print $formproject->selectOpportunityStatus('opp_status', GETPOST('opp_status') ?GETPOST('opp_status') : $object->opp_status);
+		print $formproject->selectOpportunityStatus('opp_status', GETPOST('opp_status') ?GETPOST('opp_status') : $object->opp_status, 1, 0, 0, 0, '', 0, 1);
 		print '</tr>';
 
 		// Opportunity probability
@@ -672,22 +670,22 @@ if ($action == 'create' && $user->rights->projet->creer)
 	print $hookmanager->resPrint;
 	if (empty($reshook))
 	{
-		print $object->showOptionals($extrafields, 'edit');
+		print $object->showOptionals($extrafields, 'create');
 	}
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("CreateDraft").'">';
 	if (!empty($backtopage))
 	{
 		print ' &nbsp; &nbsp; ';
-		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	} else {
 		print ' &nbsp; &nbsp; ';
-		print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+		print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 	}
 	print '</div>';
 
@@ -792,7 +790,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 
 	if ($action == 'edit' && $userWrite > 0)
 	{
-		dol_fiche_head($head, 'project', $langs->trans("Project"), 0, ($object->public ? 'projectpub' : 'project'));
+		print dol_get_fiche_head($head, 'project', $langs->trans("Project"), 0, ($object->public ? 'projectpub' : 'project'));
 
 		print '<table class="border centpercent">';
 
@@ -804,10 +802,9 @@ if ($action == 'create' && $user->rights->projet->creer)
 		print '</td></tr>';
 
 		// Label
-		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td>';
+		print '<tr><td class="fieldrequired">'.$langs->trans("ProjectLabel").'</td>';
 		print '<td><input class="quatrevingtpercent" name="title" value="'.dol_escape_htmltag($object->title).'"></td></tr>';
 
-
 		// Status
 		print '<tr><td class="fieldrequired">'.$langs->trans("Status").'</td><td>';
 		print '<select class="flat" name="status">';
@@ -883,7 +880,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 		$array = array();
 		if (empty($conf->global->PROJECT_DISABLE_PRIVATE_PROJECT)) $array[0] = $langs->trans("PrivateProject");
 		if (empty($conf->global->PROJECT_DISABLE_PUBLIC_PROJECT)) $array[1] = $langs->trans("SharedProject");
-		print $form->selectarray('public', $array, $object->public);
+		print $form->selectarray('public', $array, $object->public, 0, 0, 0, '', 0, 0, 0, '', '', 1);
 		print '</td></tr>';
 
 		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
@@ -892,7 +889,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 			// Opportunity status
 			print '<tr class="classuseopportunity'.$classfortr.'"><td>'.$langs->trans("OpportunityStatus").'</td>';
 			print '<td>';
-			print $formproject->selectOpportunityStatus('opp_status', $object->opp_status, 1, 0, 0, 0, 'inline-block valignmiddle');
+			print $formproject->selectOpportunityStatus('opp_status', $object->opp_status, 1, 0, 0, 0, 'inline-block valignmiddle', 0, 1);
 			print '<div id="divtocloseproject" class="inline-block valign" style="display: none;"> &nbsp; &nbsp; ';
 			print '<input type="checkbox" id="inputcloseproject" name="closeproject" /> ';
 			print $langs->trans("AlsoCloseAProject");
@@ -900,18 +897,18 @@ if ($action == 'create' && $user->rights->projet->creer)
 			print '</td>';
 			print '</tr>';
 
-		    // Opportunity probability
-		    print '<tr class="classuseopportunity'.$classfortr.'"><td>'.$langs->trans("OpportunityProbability").'</td>';
-		    print '<td><input size="5" type="text" id="opp_percent" name="opp_percent" value="'.(GETPOSTISSET('opp_percent') ? GETPOST('opp_percent') : (strcmp($object->opp_percent, '') ?vatrate($object->opp_percent) : '')).'"> %';
-            print '<span id="oldopppercent"></span>';
-		    print '</td>';
-		    print '</tr>';
+			// Opportunity probability
+			print '<tr class="classuseopportunity'.$classfortr.'"><td>'.$langs->trans("OpportunityProbability").'</td>';
+			print '<td><input size="5" type="text" id="opp_percent" name="opp_percent" value="'.(GETPOSTISSET('opp_percent') ? GETPOST('opp_percent') : (strcmp($object->opp_percent, '') ?vatrate($object->opp_percent) : '')).'"> %';
+			print '<span id="oldopppercent"></span>';
+			print '</td>';
+			print '</tr>';
 
-		    // Opportunity amount
-		    print '<tr class="classuseopportunity'.$classfortr.'"><td>'.$langs->trans("OpportunityAmount").'</td>';
-		    print '<td><input size="5" type="text" name="opp_amount" value="'.(GETPOSTISSET('opp_amount') ? GETPOST('opp_amount') : (strcmp($object->opp_amount, '') ? price2num($object->opp_amount) : '')).'"></td>';
-		    print '</tr>';
-	    }
+			// Opportunity amount
+			print '<tr class="classuseopportunity'.$classfortr.'"><td>'.$langs->trans("OpportunityAmount").'</td>';
+			print '<td><input size="5" type="text" name="opp_amount" value="'.(GETPOSTISSET('opp_amount') ? GETPOST('opp_amount') : (strcmp($object->opp_amount, '') ? price2num($object->opp_amount) : '')).'"></td>';
+			print '</tr>';
+		}
 
 		// Date start
 		print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
@@ -963,7 +960,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 
 		print '</table>';
 	} else {
-		dol_fiche_head($head, 'project', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));
+		print dol_get_fiche_head($head, 'project', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));
 
 		// Project card
 
@@ -1052,10 +1049,10 @@ if ($action == 'create' && $user->rights->projet->creer)
 			if (strcmp($object->opp_amount, '')) print price($object->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);
 			print '</td></tr>';
 
-            // Opportunity Weighted Amount
-            print '<tr><td>'.$langs->trans('OpportunityWeightedAmount').'</td><td>';
-            if (strcmp($object->opp_amount, '') && strcmp($object->opp_percent, '')) print price($object->opp_amount * $object->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency);
-            print '</td></tr>';
+			// Opportunity Weighted Amount
+			print '<tr><td>'.$langs->trans('OpportunityWeightedAmount').'</td><td>';
+			if (strcmp($object->opp_amount, '') && strcmp($object->opp_percent, '')) print price($object->opp_amount * $object->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency);
+			print '</td></tr>';
 		}
 
 		// Date start - end
@@ -1107,13 +1104,13 @@ if ($action == 'create' && $user->rights->projet->creer)
 		print '<div class="clearboth"></div>';
 	}
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	if ($action == 'edit' && $userWrite > 0)
 	{
 		print '<div class="center">';
 		print '<input name="update" class="button" type="submit" value="'.$langs->trans("Modify").'">&nbsp; &nbsp; &nbsp;';
-		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 	}
 
@@ -1183,7 +1180,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 	}
 
 	/*
-     * Boutons actions
+     * Actions Buttons
      */
 	print '<div class="tabsAction">';
 	$parameters = array();
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index 214cbe96154..c8ca952f9ed 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -30,285 +30,284 @@
 class Projects extends DolibarrApi
 {
 
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'ref',
-        'title'
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'ref',
+		'title'
+	);
 
-    /**
-     * @var Project $project {@type Project}
-     */
-    public $project;
+	/**
+	 * @var Project $project {@type Project}
+	 */
+	public $project;
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-        $this->project = new Project($this->db);
-        $this->task = new Task($this->db);
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->project = new Project($this->db);
+		$this->task = new Task($this->db);
+	}
 
-    /**
-     * Get properties of a project object
-     *
-     * Return an array with project informations
-     *
-     * @param       int         $id         ID of project
-     * @return 	array|mixed data without useless information
-     *
-     * @throws 	RestException
-     */
-    public function get($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->projet->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a project object
+	 *
+	 * Return an array with project informations
+	 *
+	 * @param       int         $id         ID of project
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->projet->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->project->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Project not found');
-        }
+		$result = $this->project->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Project not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $this->project->fetchObjectLinked();
-        return $this->_cleanObjectDatas($this->project);
-    }
+		$this->project->fetchObjectLinked();
+		return $this->_cleanObjectDatas($this->project);
+	}
 
 
 
-    /**
-     * List projects
-     *
-     * Get a list of projects
-     *
-     * @param string	       $sortfield	        Sort field
-     * @param string	       $sortorder	        Sort order
-     * @param int		       $limit		        Limit for list
-     * @param int		       $page		        Page number
-     * @param string   	       $thirdparty_ids	    Thirdparty ids to filter projects of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
+	/**
+	 * List projects
+	 *
+	 * Get a list of projects
+	 *
+	 * @param string	       $sortfield	        Sort field
+	 * @param string	       $sortorder	        Sort order
+	 * @param int		       $limit		        Limit for list
+	 * @param int		       $page		        Page number
+	 * @param string   	       $thirdparty_ids	    Thirdparty ids to filter projects of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
 	 * @param  int    $category   Use this param to filter list by category
 	 * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-     * @return  array                               Array of project objects
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $category = 0, $sqlfilters = '')
-    {
-        global $db, $conf;
+	 * @return  array                               Array of project objects
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $category = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        // case of external user, $thirdparty_ids param is ignored and replaced by user's socid
-        $socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
+		// case of external user, $thirdparty_ids param is ignored and replaced by user's socid
+		$socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
 
-        // If the internal user must only see his customers, force searching by him
-        $search_sale = 0;
-        if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+		// If the internal user must only see his customers, force searching by him
+		$search_sale = 0;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
 
-        $sql = "SELECT t.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql .= " FROM ".MAIN_DB_PREFIX."projet as t";
-    	if ($category > 0) {
+		$sql = "SELECT t.rowid";
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		$sql .= " FROM ".MAIN_DB_PREFIX."projet as t";
+		if ($category > 0) {
 			$sql .= ", ".MAIN_DB_PREFIX."categorie_project as c";
-    	}
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		}
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql .= ' WHERE t.entity IN ('.getEntity('project').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-        if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
-        if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
-        // Insert sale filter
-        if ($search_sale > 0)
-        {
-            $sql .= " AND sc.fk_user = ".$search_sale;
-        }
-    	// Select projects of given category
-    	if ($category > 0) {
-    		$sql .= " AND c.fk_categorie = ".$this->db->escape($category)." AND c.fk_project = t.rowid ";
-    	}
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		$sql .= ' WHERE t.entity IN ('.getEntity('project').')';
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
+		if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
+		if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		// Insert sale filter
+		if ($search_sale > 0)
+		{
+			$sql .= " AND sc.fk_user = ".$search_sale;
+		}
+		// Select projects of given category
+		if ($category > 0) {
+			$sql .= " AND c.fk_categorie = ".$this->db->escape($category)." AND c.fk_project = t.rowid ";
+		}
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        dol_syslog("API Rest request");
-        $result = $this->db->query($sql);
+		dol_syslog("API Rest request");
+		$result = $this->db->query($sql);
 
-        if ($result)
-        {
-        	$num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
-            	$obj = $this->db->fetch_object($result);
-            	$project_static = new Project($this->db);
-                if ($project_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($project_static);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve project list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No project found');
-        }
-        return $obj_ret;
-    }
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			$i = 0;
+			while ($i < $min) {
+				$obj = $this->db->fetch_object($result);
+				$project_static = new Project($this->db);
+				if ($project_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($project_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve project list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No project found');
+		}
+		return $obj_ret;
+	}
 
-    /**
-     * Create project object
-     *
-     * @param   array   $request_data   Request data
-     * @return  int     ID of project
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->projet->creer) {
-            throw new RestException(401, "Insuffisant rights");
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+	/**
+	 * Create project object
+	 *
+	 * @param   array   $request_data   Request data
+	 * @return  int     ID of project
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->projet->creer) {
+			throw new RestException(401, "Insuffisant rights");
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        foreach ($request_data as $field => $value) {
-            $this->project->$field = $value;
-        }
-        /*if (isset($request_data["lines"])) {
+		foreach ($request_data as $field => $value) {
+			$this->project->$field = $value;
+		}
+		/*if (isset($request_data["lines"])) {
           $lines = array();
           foreach ($request_data["lines"] as $line) {
             array_push($lines, (object) $line);
           }
           $this->project->lines = $lines;
         }*/
-        if ($this->project->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, "Error creating project", array_merge(array($this->project->error), $this->project->errors));
-        }
+		if ($this->project->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, "Error creating project", array_merge(array($this->project->error), $this->project->errors));
+		}
 
-        return $this->project->id;
-    }
+		return $this->project->id;
+	}
 
-    /**
-     * Get tasks of a project.
-     * See also API /tasks
-     *
-     * @param int   $id                     Id of project
-     * @param int   $includetimespent       0=Return only list of tasks. 1=Include a summary of time spent, 2=Include details of time spent lines (2 is no implemented yet)
-     * @return int
-     *
-     * @url	GET {id}/tasks
-     */
-    public function getLines($id, $includetimespent = 0)
-    {
-        if (!DolibarrApiAccess::$user->rights->projet->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get tasks of a project.
+	 * See also API /tasks
+	 *
+	 * @param int   $id                     Id of project
+	 * @param int   $includetimespent       0=Return only list of tasks. 1=Include a summary of time spent, 2=Include details of time spent lines (2 is no implemented yet)
+	 * @return int
+	 *
+	 * @url	GET {id}/tasks
+	 */
+	public function getLines($id, $includetimespent = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->projet->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->project->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Project not found');
-        }
+		$result = $this->project->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Project not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        $this->project->getLinesArray(DolibarrApiAccess::$user);
-        $result = array();
-        foreach ($this->project->lines as $line)      // $line is a task
-        {
-            if ($includetimespent == 1)
-            {
-                $timespent = $line->getSummaryOfTimeSpent(0);
-            }
-            if ($includetimespent == 1)
-            {
-                // TODO
-                // Add class for timespent records and loop and fill $line->lines with records of timespent
-            }
-            array_push($result, $this->_cleanObjectDatas($line));
-        }
-        return $result;
-    }
+		if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$this->project->getLinesArray(DolibarrApiAccess::$user);
+		$result = array();
+		foreach ($this->project->lines as $line)      // $line is a task
+		{
+			if ($includetimespent == 1)
+			{
+				$timespent = $line->getSummaryOfTimeSpent(0);
+			}
+			if ($includetimespent == 1)
+			{
+				// TODO
+				// Add class for timespent records and loop and fill $line->lines with records of timespent
+			}
+			array_push($result, $this->_cleanObjectDatas($line));
+		}
+		return $result;
+	}
 
 
-    /**
-     * Get roles a user is assigned to a project with
-     *
-     * @param   int   $id             Id of project
-     * @param   int   $userid         Id of user (0 = connected user)
-     *
-     * @url	GET {id}/roles
-     *
-     * @return int
-     */
-    public function getRoles($id, $userid = 0)
-    {
-        global $db;
+	/**
+	 * Get roles a user is assigned to a project with
+	 *
+	 * @param   int   $id             Id of project
+	 * @param   int   $userid         Id of user (0 = connected user)
+	 *
+	 * @url	GET {id}/roles
+	 *
+	 * @return int
+	 */
+	public function getRoles($id, $userid = 0)
+	{
+		global $db;
 
-        if (!DolibarrApiAccess::$user->rights->projet->lire) {
-            throw new RestException(401);
-        }
+		if (!DolibarrApiAccess::$user->rights->projet->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->project->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Project not found');
-        }
+		$result = $this->project->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Project not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
-        $taskstatic = new Task($this->db);
-        $userp = DolibarrApiAccess::$user;
-        if ($userid > 0)
-        {
-            $userp = new User($this->db);
-            $userp->fetch($userid);
-        }
-        $this->project->roles = $taskstatic->getUserRolesForProjectsOrTasks($userp, 0, $id, 0);
-        $result = array();
-        foreach ($this->project->roles as $line) {
-            array_push($result, $this->_cleanObjectDatas($line));
-        }
-        return $result;
-    }
+		require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
+		$taskstatic = new Task($this->db);
+		$userp = DolibarrApiAccess::$user;
+		if ($userid > 0)
+		{
+			$userp = new User($this->db);
+			$userp->fetch($userid);
+		}
+		$this->project->roles = $taskstatic->getUserRolesForProjectsOrTasks($userp, 0, $id, 0);
+		$result = array();
+		foreach ($this->project->roles as $line) {
+			array_push($result, $this->_cleanObjectDatas($line));
+		}
+		return $result;
+	}
 
 
-    /**
-     * Add a task to given project
-     *
-     * @param int   $id             Id of project to update
-     * @param array $request_data   Projectline data
-     *
-     * @url	POST {id}/tasks
-     *
-     * @return int
-     */
-    /*
+	/**
+	 * Add a task to given project
+	 *
+	 * @param int   $id             Id of project to update
+	 * @param array $request_data   Projectline data
+	 *
+	 * @url	POST {id}/tasks
+	 *
+	 * @return int
+	 */
+	/*
     public function postLine($id, $request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->projet->creer) {
@@ -360,18 +359,18 @@ class Projects extends DolibarrApi
     }
     */
 
-    /**
-     * Update a task to given project
-     *
-     * @param int   $id             Id of project to update
-     * @param int   $taskid         Id of task to update
-     * @param array $request_data   Projectline data
-     *
-     * @url	PUT {id}/tasks/{taskid}
-     *
-     * @return object
-     */
-    /*
+	/**
+	 * Update a task to given project
+	 *
+	 * @param int   $id             Id of project to update
+	 * @param int   $taskid         Id of task to update
+	 * @param array $request_data   Projectline data
+	 *
+	 * @url	PUT {id}/tasks/{taskid}
+	 *
+	 * @return object
+	 */
+	/*
     public function putLine($id, $lineid, $request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->projet->creer) {
@@ -421,194 +420,194 @@ class Projects extends DolibarrApi
 
 
 
-    /**
-     * Update project general fields (won't touch lines of project)
-     *
-     * @param int   $id             Id of project to update
-     * @param array $request_data   Datas
-     *
-     * @return int
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->projet->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Update project general fields (won't touch lines of project)
+	 *
+	 * @param int   $id             Id of project to update
+	 * @param array $request_data   Datas
+	 *
+	 * @return int
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->projet->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->project->fetch($id);
-        if ($result <= 0) {
-            throw new RestException(404, 'Project not found');
-        }
+		$result = $this->project->fetch($id);
+		if ($result <= 0) {
+			throw new RestException(404, 'Project not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $this->project->$field = $value;
-        }
+		if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$this->project->$field = $value;
+		}
 
-        if ($this->project->update(DolibarrApiAccess::$user) >= 0)
-        {
-            return $this->get($id);
-        } else {
-            throw new RestException(500, $this->project->error);
-        }
-    }
+		if ($this->project->update(DolibarrApiAccess::$user) >= 0)
+		{
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $this->project->error);
+		}
+	}
 
-    /**
-     * Delete project
-     *
-     * @param   int     $id         Project ID
-     *
-     * @return  array
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->projet->supprimer) {
-            throw new RestException(401);
-        }
-        $result = $this->project->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Project not found');
-        }
+	/**
+	 * Delete project
+	 *
+	 * @param   int     $id         Project ID
+	 *
+	 * @return  array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->projet->supprimer) {
+			throw new RestException(401);
+		}
+		$result = $this->project->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Project not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if (!$this->project->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(500, 'Error when delete project : '.$this->project->error);
-        }
+		if (!$this->project->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(500, 'Error when delete project : '.$this->project->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Project deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Project deleted'
+			)
+		);
+	}
 
-    /**
-     * Validate a project.
-     * You can test this API with the following input message
-     * { "notrigger": 0 }
-     *
-     * @param   int $id             Project ID
-     * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
-     *
-     * @url POST    {id}/validate
-     *
-     * @return  array
-     * FIXME An error 403 is returned if the request has an empty body.
-     * Error message: "Forbidden: Content type `text/plain` is not supported."
-     * Workaround: send this in the body
-     * {
-     *   "notrigger": 0
-     * }
-     */
-    public function validate($id, $notrigger = 0)
-    {
-        if (!DolibarrApiAccess::$user->rights->projet->creer) {
-            throw new RestException(401);
-        }
-        $result = $this->project->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Project not found');
-        }
+	/**
+	 * Validate a project.
+	 * You can test this API with the following input message
+	 * { "notrigger": 0 }
+	 *
+	 * @param   int $id             Project ID
+	 * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
+	 *
+	 * @url POST    {id}/validate
+	 *
+	 * @return  array
+	 * FIXME An error 403 is returned if the request has an empty body.
+	 * Error message: "Forbidden: Content type `text/plain` is not supported."
+	 * Workaround: send this in the body
+	 * {
+	 *   "notrigger": 0
+	 * }
+	 */
+	public function validate($id, $notrigger = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->projet->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->project->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Project not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $result = $this->project->setValid(DolibarrApiAccess::$user, $notrigger);
-        if ($result == 0) {
-            throw new RestException(304, 'Error nothing done. May be object is already validated');
-        }
-        if ($result < 0) {
-            throw new RestException(500, 'Error when validating Project: '.$this->project->error);
-        }
+		$result = $this->project->setValid(DolibarrApiAccess::$user, $notrigger);
+		if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already validated');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when validating Project: '.$this->project->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Project validated'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Project validated'
+			)
+		);
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->datec);
-        unset($object->datem);
-        unset($object->barcode_type);
-        unset($object->barcode_type_code);
-        unset($object->barcode_type_label);
-        unset($object->barcode_type_coder);
-        unset($object->cond_reglement_id);
-        unset($object->cond_reglement);
-        unset($object->fk_delivery_address);
-        unset($object->shipping_method_id);
-        unset($object->fk_account);
-        unset($object->note);
-        unset($object->fk_incoterms);
-        unset($object->label_incoterms);
-        unset($object->location_incoterms);
-        unset($object->name);
-        unset($object->lastname);
-        unset($object->firstname);
-        unset($object->civility_id);
-        unset($object->mode_reglement_id);
-        unset($object->country);
-        unset($object->country_id);
-        unset($object->country_code);
+		unset($object->datec);
+		unset($object->datem);
+		unset($object->barcode_type);
+		unset($object->barcode_type_code);
+		unset($object->barcode_type_label);
+		unset($object->barcode_type_coder);
+		unset($object->cond_reglement_id);
+		unset($object->cond_reglement);
+		unset($object->fk_delivery_address);
+		unset($object->shipping_method_id);
+		unset($object->fk_account);
+		unset($object->note);
+		unset($object->fk_incoterms);
+		unset($object->label_incoterms);
+		unset($object->location_incoterms);
+		unset($object->name);
+		unset($object->lastname);
+		unset($object->firstname);
+		unset($object->civility_id);
+		unset($object->mode_reglement_id);
+		unset($object->country);
+		unset($object->country_id);
+		unset($object->country_code);
 
-        unset($object->weekWorkLoad);
-        unset($object->weekWorkLoad);
+		unset($object->weekWorkLoad);
+		unset($object->weekWorkLoad);
 
-        //unset($object->lines);            // for task we use timespent_lines, but for project we use lines
+		//unset($object->lines);            // for task we use timespent_lines, but for project we use lines
 
-        unset($object->total_ht);
-        unset($object->total_tva);
-        unset($object->total_localtax1);
-        unset($object->total_localtax2);
-        unset($object->total_ttc);
+		unset($object->total_ht);
+		unset($object->total_tva);
+		unset($object->total_localtax1);
+		unset($object->total_localtax2);
+		unset($object->total_ttc);
 
-        unset($object->comments);
+		unset($object->comments);
 
-        return $object;
-    }
+		return $object;
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param   array           $data   Array with data to verify
-     * @return  array
-     * @throws  RestException
-     */
-    private function _validate($data)
-    {
-        $object = array();
-        foreach (self::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $object[$field] = $data[$field];
-        }
-        return $object;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param   array           $data   Array with data to verify
+	 * @return  array
+	 * @throws  RestException
+	 */
+	private function _validate($data)
+	{
+		$object = array();
+		foreach (self::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$object[$field] = $data[$field];
+		}
+		return $object;
+	}
 
 
-    // TODO
-    // getSummaryOfTimeSpent
+	// TODO
+	// getSummaryOfTimeSpent
 }
diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
index 5181beb3707..e7bf2c67ce8 100644
--- a/htdocs/projet/class/api_tasks.class.php
+++ b/htdocs/projet/class/api_tasks.class.php
@@ -550,8 +550,8 @@ class Tasks extends DolibarrApi
 	/**
 	 * Clean sensible object datas
 	 *
-	 * @param   object  $object    Object to clean
-	 * @return    array    Array of cleaned object properties
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
 	 */
 	protected function _cleanObjectDatas($object)
 	{
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index cc7e57a89df..4185d21d653 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -45,17 +45,17 @@ class Project extends CommonObject
 	public $table_element = 'projet';
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	public $table_element_line = 'projet_task';
 
 	/**
-	 * @var int    Name of field date
+	 * @var string    Name of field date
 	 */
 	public $table_element_date;
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_projet';
 
@@ -178,7 +178,7 @@ class Project extends CommonObject
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
+	public $fields = array(
 		'rowid' =>array('type'=>'integer', 'label'=>'ID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
 		'fk_soc' =>array('type'=>'integer', 'label'=>'Fk soc', 'enabled'=>1, 'visible'=>3, 'position'=>15),
 		'datec' =>array('type'=>'datetime', 'label'=>'DateCreationShort', 'enabled'=>1, 'visible'=>1, 'position'=>20),
@@ -187,7 +187,7 @@ class Project extends CommonObject
 		'datee' =>array('type'=>'date', 'label'=>'DateEnd', 'enabled'=>1, 'visible'=>1, 'position'=>35),
 		'ref' =>array('type'=>'varchar(50)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'showoncombobox'=>1, 'position'=>40, 'searchall'=>1),
 		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>3, 'notnull'=>1, 'position'=>45),
-		'title' =>array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>50, 'showoncombobox'=>1, 'searchall'=>1),
+		'title' =>array('type'=>'varchar(255)', 'label'=>'ProjectLabel', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>50, 'showoncombobox'=>1, 'searchall'=>1),
 		'description' =>array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>3, 'position'=>55, 'searchall'=>1),
 		'fk_user_creat' =>array('type'=>'integer', 'label'=>'Fk user creat', 'enabled'=>1, 'visible'=>3, 'notnull'=>1, 'position'=>60),
 		'public' =>array('type'=>'integer', 'label'=>'Visibility', 'enabled'=>1, 'visible'=>1, 'position'=>65),
@@ -577,7 +577,7 @@ class Project extends CommonObject
 				$this->opp_percent = $obj->opp_percent;
 				$this->budget_amount = $obj->budget_amount;
 				$this->model_pdf = $obj->model_pdf;
-				$this->modelpdf = $obj->model_pdf;	// deprecated
+				$this->modelpdf = $obj->model_pdf; // deprecated
 				$this->usage_opportunity = (int) $obj->usage_opportunity;
 				$this->usage_task = (int) $obj->usage_task;
 				$this->usage_bill_time = (int) $obj->usage_bill_time;
@@ -586,7 +586,7 @@ class Project extends CommonObject
 
 				$this->db->free($resql);
 
-				// Retreive all extrafield
+				// Retrieve all extrafield
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
 
@@ -848,6 +848,45 @@ class Project extends CommonObject
 		}
 	}
 
+	/**
+	 * Return the count of a type of linked elements of this project
+	 *
+	 * @param string	$type			The type of the linked elements (e.g. 'propal', 'order', 'invoice', 'order_supplier', 'invoice_supplier')
+	 * @param string	$tablename		The name of table associated of the type
+	 * @param string	$projectkey 	(optional) Equivalent key to fk_projet for actual type
+	 * @return integer					The count of the linked elements (the count is zero on request error too)
+	 */
+	public function getElementCount($type, $tablename, $projectkey = 'fk_projet')
+	{
+		if ($this->id <= 0) return 0;
+
+		if ($type == 'agenda') {
+			$sql = "SELECT COUNT(id) as nb FROM ".MAIN_DB_PREFIX."actioncomm WHERE fk_project = ".$this->id." AND entity IN (".getEntity('agenda').")";
+		} elseif ($type == 'expensereport') {
+			$sql = "SELECT COUNT(ed.rowid) as nb FROM ".MAIN_DB_PREFIX."expensereport as e, ".MAIN_DB_PREFIX."expensereport_det as ed WHERE e.rowid = ed.fk_expensereport AND e.entity IN (".getEntity('expensereport').") AND ed.fk_projet = ".$this->id;
+		} elseif ($type == 'project_task') {
+			$sql = "SELECT DISTINCT COUNT(pt.rowid) as nb FROM ".MAIN_DB_PREFIX."projet_task as pt WHERE pt.fk_projet = ".$this->id;
+		} elseif ($type == 'project_task_time') {	// Case we want to duplicate line foreach user
+			$sql = "SELECT DISTINCT COUNT(pt.rowid) as nb FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet_task_time as ptt WHERE pt.rowid = ptt.fk_task AND pt.fk_projet = ".$this->id;
+		} elseif ($type == 'stock_mouvement') {
+			$sql = 'SELECT COUNT(ms.rowid) as nb FROM '.MAIN_DB_PREFIX."stock_mouvement as ms, ".MAIN_DB_PREFIX."entrepot as e WHERE e.rowid = ms.fk_entrepot AND e.entity IN (".getEntity('stock').") AND ms.origintype = 'project' AND ms.fk_origin = ".$this->id." AND ms.type_mouvement = 1";
+		} elseif ($type == 'loan') {
+			$sql = 'SELECT COUNT(l.rowid) as nb FROM '.MAIN_DB_PREFIX."loan as l WHERE l.entity IN (".getEntity('loan').") AND l.fk_projet = ".$this->id;
+		} else {
+			$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX.$tablename." WHERE ".$projectkey." = ".$this->id." AND entity IN (".getEntity($type).")";
+		}
+
+		$result = $this->db->query($sql);
+
+		if (!$result) return 0;
+
+		$obj = $this->db->fetch_object($result);
+
+		$this->db->free($result);
+
+		return $obj->nb;
+	}
+
 	/**
 	 * 		Delete tasks with no children first, then task with children recursively
 	 *
@@ -1063,7 +1102,10 @@ class Project extends CommonObject
 		}
 
 		$label = '';
-		if ($option != 'nolink') $label = img_picto('', $this->picto).' <u>'.$langs->trans("Project").'</u>';
+		if ($option != 'nolink') $label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Project").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
 		$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('Ref').': </b>'.$this->ref; // The space must be after the : to not being explode when showing the title in img_picto
 		$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('Label').': </b>'.$this->title; // The space must be after the : to not being explode when showing the title in img_picto
 		if (isset($this->public)) {
@@ -1079,9 +1121,6 @@ class Project extends CommonObject
 			$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('DateEnd').': </b>'.dol_print_date($this->datee, 'day'); // The space must be after the : to not being explode when showing the title in img_picto
 		}
 		if ($moreinpopup) $label .= '<br>'.$moreinpopup;
-		if (isset($this->status)) {
-			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
-		}
 
 		$url = '';
 		if ($option != 'nolink')
@@ -1194,7 +1233,7 @@ class Project extends CommonObject
 	 * 	@param  string	$mode		Type of permission we want to know: 'read', 'write'
 	 * 	@return	int					>0 if user has permission, <0 if user has no permission
 	 */
-	public function restrictedProjectArea($user, $mode = 'read')
+	public function restrictedProjectArea(User $user, $mode = 'read')
 	{
 		// To verify role of users
 		$userAccess = 0;
@@ -1204,7 +1243,7 @@ class Project extends CommonObject
 		} elseif ($this->public && (($mode == 'read' && !empty($user->rights->projet->lire)) || ($mode == 'write' && !empty($user->rights->projet->creer)) || ($mode == 'delete' && !empty($user->rights->projet->supprimer))))
 		{
 			$userAccess = 1;
-		} else {
+		} else {	// No access due to permission to read all projects, so we check if we are a contact of project
 			foreach (array('internal', 'external') as $source)
 			{
 				$userRole = $this->liste_contact(4, $source);
@@ -1213,7 +1252,13 @@ class Project extends CommonObject
 				$nblinks = 0;
 				while ($nblinks < $num)
 				{
-					if ($source == 'internal' && preg_match('/^PROJECT/', $userRole[$nblinks]['code']) && $user->id == $userRole[$nblinks]['id'])
+					if ($source == 'internal' && $user->id == $userRole[$nblinks]['id'])	// $userRole[$nblinks]['id'] is id of user (llx_user) for internal contacts
+					{
+						if ($mode == 'read' && $user->rights->projet->lire)      $userAccess++;
+						if ($mode == 'write' && $user->rights->projet->creer)     $userAccess++;
+						if ($mode == 'delete' && $user->rights->projet->supprimer) $userAccess++;
+					}
+					if ($source == 'external' && $user->socid > 0 && $user->socid == $userRole[$nblinks]['socid'])	// $userRole[$nblinks]['id'] is id of contact (llx_socpeople) or external contacts
 					{
 						if ($mode == 'read' && $user->rights->projet->lire)      $userAccess++;
 						if ($mode == 'write' && $user->rights->projet->creer)     $userAccess++;
@@ -1432,7 +1477,7 @@ class Project extends CommonObject
 				$clone_project->note_public = '';
 			} else {
 				$this->db->begin();
-				$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_public, ENT_QUOTES), '_public');
+				$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_public, ENT_QUOTES | ENT_HTML5), '_public');
 				if ($res < 0)
 				{
 					$this->error .= $clone_project->error;
@@ -1443,7 +1488,7 @@ class Project extends CommonObject
 				}
 
 				$this->db->begin();
-				$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_private, ENT_QUOTES), '_private');
+				$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_private, ENT_QUOTES | ENT_HTML5), '_private');
 				if ($res < 0)
 				{
 					$this->error .= $clone_project->error;
diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php
index cb6150b6dc7..e1a19e293f0 100644
--- a/htdocs/projet/class/projectstats.class.php
+++ b/htdocs/projet/class/projectstats.class.php
@@ -24,25 +24,25 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
  */
 class ProjectStats extends Stats
 {
-    private $project;
-    public $userid;
-    public $socid;
-    public $year;
+	private $project;
+	public $userid;
+	public $socid;
+	public $year;
 
-    /**
-     * Constructor
-     *
-     * @param   DoliDB $db     Database handler
-     */
-    public function __construct($db)
-    {
-        global $conf, $user;
+	/**
+	 * Constructor
+	 *
+	 * @param   DoliDB $db     Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf, $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        require_once 'project.class.php';
-        $this->project = new Project($this->db);
-    }
+		require_once 'project.class.php';
+		$this->project = new Project($this->db);
+	}
 
 
 	/**
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 8020477702a..b4733de05ae 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -45,14 +45,14 @@ class Task extends CommonObject
 	public $table_element = 'projet_task';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_task';
 
 	/**
-	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 * @var string String with name of icon for myobject.
 	 */
-	public $picto = 'task';
+	public $picto = 'projecttask';
 
 	/**
 	 * @var array	List of child tables. To test if we can delete object.
@@ -317,7 +317,7 @@ class Task extends CommonObject
 					$this->task_parent_position = $obj->task_parent_position;
 				}
 
-				// Retreive all extrafield
+				// Retrieve all extrafield
 				$this->fetch_optionals();
 			}
 
@@ -648,7 +648,7 @@ class Task extends CommonObject
 		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
 		$result = '';
-		$label = img_picto('', $this->picto).' <u>'.$langs->trans("ShowTask").'</u>';
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Task").'</u>';
 		if (!empty($this->ref))
 			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 		if (!empty($this->label))
@@ -673,7 +673,9 @@ class Task extends CommonObject
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-			$linkclose .= ' class="classfortooltip"';
+			$linkclose .= ' class="classfortooltip nowraponall"';
+		} else {
+			$linkclose .= ' class="nowraponall"';
 		}
 
 		$linkstart = '<a href="'.$url.'"';
@@ -905,7 +907,13 @@ class Task extends CommonObject
 					$tasks[$i]->projectref		= $obj->ref;
 					$tasks[$i]->projectlabel = $obj->plabel;
 					$tasks[$i]->projectstatus = $obj->projectstatus;
+
+					$tasks[$i]->fk_opp_status = $obj->fk_opp_status;
+					$tasks[$i]->opp_amount = $obj->opp_amount;
+					$tasks[$i]->opp_percent = $obj->opp_percent;
+					$tasks[$i]->budget_amount = $obj->budget_amount;
 					$tasks[$i]->usage_bill_time = $obj->usage_bill_time;
+
 					$tasks[$i]->label = $obj->label;
 					$tasks[$i]->description = $obj->description;
 					$tasks[$i]->fk_parent = $obj->fk_task_parent; // deprecated
@@ -913,8 +921,10 @@ class Task extends CommonObject
 					$tasks[$i]->duration		= $obj->duration_effective;
 					$tasks[$i]->planned_workload = $obj->planned_workload;
 
-					$tasks[$i]->tobill  		= $obj->tobill;
-					$tasks[$i]->billed = $obj->billed;
+					if ($includebilltime) {
+						$tasks[$i]->tobill = $obj->tobill;
+						$tasks[$i]->billed = $obj->billed;
+					}
 
 					$tasks[$i]->progress		= $obj->progress;
 					$tasks[$i]->fk_statut = $obj->status;
@@ -928,13 +938,6 @@ class Task extends CommonObject
 					$tasks[$i]->thirdparty_name	= $obj->thirdparty_name;
 					$tasks[$i]->thirdparty_email = $obj->thirdparty_email;
 
-
-					$tasks[$i]->fk_opp_status = $obj->fk_opp_status;
-					$tasks[$i]->opp_amount = $obj->opp_amount;
-					$tasks[$i]->opp_percent = $obj->opp_percent;
-					$tasks[$i]->budget_amount = $obj->budget_amount;
-					$tasks[$i]->usage_bill_time = $obj->usage_bill_time;
-
 					if (!empty($extrafields->attributes['projet']['label']))
 					{
 						foreach ($extrafields->attributes['projet']['label'] as $key => $val)
@@ -1675,7 +1678,7 @@ class Task extends CommonObject
 				$clone_task->note_public = '';
 			} else {
 				$this->db->begin();
-				$res = $clone_task->update_note(dol_html_entity_decode($clone_task->note_public, ENT_QUOTES), '_public');
+				$res = $clone_task->update_note(dol_html_entity_decode($clone_task->note_public, ENT_QUOTES | ENT_HTML5), '_public');
 				if ($res < 0)
 				{
 					$this->error .= $clone_task->error;
@@ -1686,7 +1689,7 @@ class Task extends CommonObject
 				}
 
 				$this->db->begin();
-				$res = $clone_task->update_note(dol_html_entity_decode($clone_task->note_private, ENT_QUOTES), '_private');
+				$res = $clone_task->update_note(dol_html_entity_decode($clone_task->note_private, ENT_QUOTES | ENT_HTML5), '_private');
 				if ($res < 0)
 				{
 					$this->error .= $clone_task->error;
@@ -1702,7 +1705,7 @@ class Task extends CommonObject
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-				//retreive project origin ref to know folder to copy
+				//retrieve project origin ref to know folder to copy
 				$projectstatic = new Project($this->db);
 				$projectstatic->fetch($ori_project_id);
 				$ori_project_ref = $projectstatic->ref;
@@ -1893,14 +1896,16 @@ class Task extends CommonObject
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-		global $conf, $langs;
+		global $conf;
 
-		$langs->load("projects");
+		$outputlangs->load("projects");
 
 		if (!dol_strlen($modele)) {
 			$modele = 'nodefault';
 
-			if ($this->modelpdf) {
+			if (!empty($this->model_pdf)) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($this->modelpdf)) {	// deprecated
 				$modele = $this->modelpdf;
 			} elseif (!empty($conf->global->PROJECT_TASK_ADDON_PDF)) {
 				$modele = $conf->global->PROJECT_TASK_ADDON_PDF;
diff --git a/htdocs/projet/class/taskstats.class.php b/htdocs/projet/class/taskstats.class.php
index 722736fe9b8..296a36c2dcf 100644
--- a/htdocs/projet/class/taskstats.class.php
+++ b/htdocs/projet/class/taskstats.class.php
@@ -29,11 +29,11 @@ class TaskStats extends Stats
 	public $socid;
 	public $year;
 
-    /**
-     * Constructor of the class
-     *
-     * @param   DoliDb  $db     Database handler
-     */
+	/**
+	 * Constructor of the class
+	 *
+	 * @param   DoliDb  $db     Database handler
+	 */
 	public function __construct($db)
 	{
 		$this->db = $db;
@@ -161,7 +161,7 @@ class TaskStats extends Stats
 	 * Return Task number by month for a year
 	 *
 	 * @param 	int 	$year 		Year to scan
-     * @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 * @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 * @return 	array 				Array of values
 	 */
 	public function getNbByMonth($year, $format = 0)
diff --git a/htdocs/projet/comment.php b/htdocs/projet/comment.php
index 905b57e875f..1200e0bc060 100644
--- a/htdocs/projet/comment.php
+++ b/htdocs/projet/comment.php
@@ -89,7 +89,7 @@ $formfile = new FormFile($db);
 // Tabs for project
 $tab = 'project_comment';
 $head = project_prepare_head($object);
-dol_fiche_head($head, $tab, $langs->trans("Project"), - 1, ($object->public ? 'projectpub' : 'project'));
+print dol_get_fiche_head($head, $tab, $langs->trans("Project"), - 1, ($object->public ? 'projectpub' : 'project'));
 
 $param = ($mode == 'mine' ? '&mode=mine' : '');
 
@@ -176,7 +176,7 @@ print '</div>';
 
 print '<div class="clearboth"></div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<br>';
 
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 8bbdbed9e6a..e298adcd40c 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -63,11 +63,12 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 	$result = 0;
 	$result = $object->fetch($id);
 
-    if ($result > 0 && $id > 0)
-    {
+	if ($result > 0 && $id > 0)
+	{
   		$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
-  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
-    }
+  		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+  		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
+	}
 
 	if ($result >= 0)
 	{
@@ -84,18 +85,18 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 	}
 }
 
-// bascule du statut d'un contact
+// Change contact's status
 if ($action == 'swapstatut' && $user->rights->projet->creer)
 {
 	if ($object->fetch($id))
 	{
-	    $result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+		$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
 	} else {
 		dol_print_error($db);
 	}
 }
 
-// Efface un contact
+// Delete a contact
 if (($action == 'deleteline' || $action == 'deletecontact') && $user->rights->projet->creer)
 {
 	$object->fetch($id);
@@ -128,7 +129,7 @@ $userstatic = new User($db);
 
 /* *************************************************************************** */
 /*                                                                             */
-/* Mode vue et edition                                                         */
+/* Edition and view mode                                                       */
 /*                                                                             */
 /* *************************************************************************** */
 
@@ -142,66 +143,66 @@ if ($id > 0 || !empty($ref))
 	//print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
 
 	$head = project_prepare_head($object);
-	dol_fiche_head($head, 'contact', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));
+	print dol_get_fiche_head($head, 'contact', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));
 
 
-    // Project card
+	// Project card
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    $morehtmlref = '<div class="refidno">';
-    // Title
-    $morehtmlref .= $object->title;
-    // Thirdparty
-    if ($object->thirdparty->id > 0)
-    {
-        $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
-    }
-    $morehtmlref .= '</div>';
+	$morehtmlref = '<div class="refidno">';
+	// Title
+	$morehtmlref .= $object->title;
+	// Thirdparty
+	if ($object->thirdparty->id > 0)
+	{
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
+	}
+	$morehtmlref .= '</div>';
 
-    // Define a complementary filter for search of next/prev ref.
-    if (!$user->rights->projet->all->lire)
-    {
-        $objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
-        $object->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
-    }
+	// Define a complementary filter for search of next/prev ref.
+	if (!$user->rights->projet->all->lire)
+	{
+		$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 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, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-    print '<div class="fichecenter">';
-    print '<div class="fichehalfleft">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border tableforfield centpercent">';
+	print '<table class="border tableforfield centpercent">';
 
-    // Usage
-    print '<tr><td class="tdtop">';
-    print $langs->trans("Usage");
-    print '</td>';
-    print '<td>';
-    if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-    {
-    	print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
-    	$htmltext = $langs->trans("ProjectFollowOpportunity");
-    	print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
-    	print '<br>';
-    }
-    if (empty($conf->global->PROJECT_HIDE_TASKS))
-    {
-    	print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'"> ';
-    	$htmltext = $langs->trans("ProjectFollowTasks");
-    	print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
-    	print '<br>';
-    }
-    if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
-    {
-    	print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')).'"> ';
-    	$htmltext = $langs->trans("ProjectBillTimeDescription");
-    	print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
-    	print '<br>';
-    }
-    print '</td></tr>';
+	// Usage
+	print '<tr><td class="tdtop">';
+	print $langs->trans("Usage");
+	print '</td>';
+	print '<td>';
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+	{
+		print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
+		$htmltext = $langs->trans("ProjectFollowOpportunity");
+		print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
+		print '<br>';
+	}
+	if (empty($conf->global->PROJECT_HIDE_TASKS))
+	{
+		print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'"> ';
+		$htmltext = $langs->trans("ProjectFollowTasks");
+		print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
+		print '<br>';
+	}
+	if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
+	{
+		print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')).'"> ';
+		$htmltext = $langs->trans("ProjectBillTimeDescription");
+		print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
+		print '<br>';
+	}
+	print '</td></tr>';
 
 	// Visibility
 	print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
@@ -209,36 +210,36 @@ if ($id > 0 || !empty($ref))
 	else print $langs->trans('PrivateProject');
 	print '</td></tr>';
 
-    if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) && $object->opp_status)
-    {
-    	// Opportunity status
-    	print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
-    	$code = dol_getIdFromCode($db, $object->opp_status, 'c_lead_status', 'rowid', 'code');
-    	if ($code) print $langs->trans("OppStatus".$code);
-    	print '</td></tr>';
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) && $object->opp_status)
+	{
+		// Opportunity status
+		print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
+		$code = dol_getIdFromCode($db, $object->opp_status, 'c_lead_status', 'rowid', 'code');
+		if ($code) print $langs->trans("OppStatus".$code);
+		print '</td></tr>';
 
-        // Opportunity percent
-        print '<tr><td>'.$langs->trans("OpportunityProbability").'</td><td>';
-        if (strcmp($object->opp_percent, '')) print price($object->opp_percent, '', $langs, 1, 0).' %';
-        print '</td></tr>';
+		// Opportunity percent
+		print '<tr><td>'.$langs->trans("OpportunityProbability").'</td><td>';
+		if (strcmp($object->opp_percent, '')) print price($object->opp_percent, '', $langs, 1, 0).' %';
+		print '</td></tr>';
 
-    	// Opportunity Amount
-    	print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
-    	if (strcmp($object->opp_amount, '')) print price($object->opp_amount, '', $langs, 0, 0, 0, $conf->currency);
-    	print '</td></tr>';
-    }
+		// Opportunity Amount
+		print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
+		if (strcmp($object->opp_amount, '')) print price($object->opp_amount, '', $langs, 0, 0, 0, $conf->currency);
+		print '</td></tr>';
+	}
 
-    // Date start - end
-    print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
+	// Date start - end
+	print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
 	$start = dol_print_date($object->date_start, 'day');
 	print ($start ? $start : '?');
 	$end = dol_print_date($object->date_end, 'day');
 	print ' - ';
 	print ($end ? $end : '?');
 	if ($object->hasDelay()) print img_warning("Late");
-    print '</td></tr>';
+	print '</td></tr>';
 
-    // Budget
+	// Budget
 	print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 	if (strcmp($object->budget_amount, '')) print price($object->budget_amount, '', $langs, 0, 0, 0, $conf->currency);
 	print '</td></tr>';
@@ -249,36 +250,36 @@ if ($id > 0 || !empty($ref))
 
 	print "</table>";
 
-    print '</div>';
-    print '<div class="fichehalfright">';
-    print '<div class="ficheaddleft">';
-    print '<div class="underbanner clearboth"></div>';
+	print '</div>';
+	print '<div class="fichehalfright">';
+	print '<div class="ficheaddleft">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border tableforfield" width="100%">';
+	print '<table class="border tableforfield" width="100%">';
 
-    // Description
-    print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-    print nl2br($object->description);
-    print '</td></tr>';
+	// Description
+	print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
+	print nl2br($object->description);
+	print '</td></tr>';
 
-    // Categories
-    if ($conf->categorie->enabled) {
-        print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
-        print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
-        print "</td></tr>";
-    }
+	// Categories
+	if ($conf->categorie->enabled) {
+		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
+		print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
+		print "</td></tr>";
+	}
 
-    print '</table>';
+	print '</table>';
 
-    print '</div>';
-    print '</div>';
-    print '</div>';
+	print '</div>';
+	print '</div>';
+	print '</div>';
 
-    print '<div class="clearboth"></div>';
+	print '<div class="clearboth"></div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '<br>';
+	print '<br>';
 
 	// Contacts lines (modules that overwrite templates must declare this into descriptor)
 	$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index 9015ef0d4d4..bed7f6a43e1 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -102,7 +102,7 @@ if ($object->id > 0)
 	//print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
 
 	$head = project_prepare_head($object);
-	dol_fiche_head($head, 'document', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));
+	print dol_get_fiche_head($head, 'document', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));
 
 	// Files list constructor
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
@@ -151,7 +151,7 @@ if ($object->id > 0)
 	print '</div>';
 
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$modulepart = 'project';
 	$permission = ($userWrite > 0);
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 026aeae32d9..cf6b864cd72 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -79,8 +79,7 @@ $dates = dol_mktime(0, 0, 0, GETPOST('datesmonth'), GETPOST('datesday'), GETPOST
 $datee = dol_mktime(23, 59, 59, GETPOST('dateemonth'), GETPOST('dateeday'), GETPOST('dateeyear'));
 if (empty($dates) && !empty($datesrfc)) $dates = dol_stringtotime($datesrfc);
 if (empty($datee) && !empty($dateerfc)) $datee = dol_stringtotime($dateerfc);
-if (!isset($_POST['datesrfc']) && !isset($_POST['datesday']) && !empty($conf->global->PROJECT_LINKED_ELEMENT_DEFAULT_FILTER_YEAR))
-{
+if (!GETPOSTISSET('datesrfc') && !GETPOSTISSET('datesday') && !empty($conf->global->PROJECT_LINKED_ELEMENT_DEFAULT_FILTER_YEAR)) {
 	$new = dol_now();
 	$tmp = dol_getdate($new);
 	//$datee=$now
@@ -129,7 +128,7 @@ $userstatic = new User($db);
 $userAccess = $object->restrictedProjectArea($user);
 
 $head = project_prepare_head($object);
-dol_fiche_head($head, 'element', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));
+print dol_get_fiche_head($head, 'element', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));
 
 
 // Project card
@@ -142,15 +141,15 @@ $morehtmlref .= $object->title;
 // Thirdparty
 if ($object->thirdparty->id > 0)
 {
-    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
+	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
 }
 $morehtmlref .= '</div>';
 
 // Define a complementary filter for search of next/prev ref.
 if (!$user->rights->projet->all->lire)
 {
-    $objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
-    $object->next_prev_filter = " te.rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+	$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
+	$object->next_prev_filter = " te.rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 }
 
 dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -198,21 +197,21 @@ print '</td></tr>';
 
 if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 {
-    // Opportunity status
-    print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
-    $code = dol_getIdFromCode($db, $object->opp_status, 'c_lead_status', 'rowid', 'code');
-    if ($code) print $langs->trans("OppStatus".$code);
-    print '</td></tr>';
+	// Opportunity status
+	print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
+	$code = dol_getIdFromCode($db, $object->opp_status, 'c_lead_status', 'rowid', 'code');
+	if ($code) print $langs->trans("OppStatus".$code);
+	print '</td></tr>';
 
-    // Opportunity percent
-    print '<tr><td>'.$langs->trans("OpportunityProbability").'</td><td>';
-    if (strcmp($object->opp_percent, '')) print price($object->opp_percent, '', $langs, 1, 0).' %';
-    print '</td></tr>';
+	// Opportunity percent
+	print '<tr><td>'.$langs->trans("OpportunityProbability").'</td><td>';
+	if (strcmp($object->opp_percent, '')) print price($object->opp_percent, '', $langs, 1, 0).' %';
+	print '</td></tr>';
 
-    // Opportunity Amount
-    print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
-    if (strcmp($object->opp_amount, '')) print price($object->opp_amount, '', $langs, 1, 0, 0, $conf->currency);
-    print '</td></tr>';
+	// Opportunity Amount
+	print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
+	if (strcmp($object->opp_amount, '')) print price($object->opp_amount, '', $langs, 1, 0, 0, $conf->currency);
+	print '</td></tr>';
 }
 
 // Date start - end
@@ -250,9 +249,9 @@ print '</td></tr>';
 
 // Categories
 if ($conf->categorie->enabled) {
-    print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
-    print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
-    print "</td></tr>";
+	print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
+	print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
+	print "</td></tr>";
 }
 
 print '</table>';
@@ -263,7 +262,7 @@ print '</div>';
 
 print '<div class="clearboth"></div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<br>';
 
@@ -277,11 +276,11 @@ $listofreferent = array(
 	'title'=>"ListProposalsAssociatedProject",
 	'class'=>'Propal',
 	'table'=>'propal',
-    'datefieldname'=>'datep',
-    'urlnew'=>DOL_URL_ROOT.'/comm/propal/card.php?action=create&origin=project&originid='.$id.'&socid='.$socid,
-    'lang'=>'propal',
-    'buttonnew'=>'AddProp',
-    'testnew'=>$user->rights->propal->creer,
+	'datefieldname'=>'datep',
+	'urlnew'=>DOL_URL_ROOT.'/comm/propal/card.php?action=create&origin=project&originid='.$id.'&socid='.$socid,
+	'lang'=>'propal',
+	'buttonnew'=>'AddProp',
+	'testnew'=>$user->rights->propal->creer,
 	'test'=>$conf->propal->enabled && $user->rights->propale->lire),
 'order'=>array(
 	'name'=>"CustomersOrders",
@@ -289,11 +288,11 @@ $listofreferent = array(
 	'class'=>'Commande',
 	'table'=>'commande',
 	'datefieldname'=>'date_commande',
-    'urlnew'=>DOL_URL_ROOT.'/commande/card.php?action=create&projectid='.$id.'&socid='.$socid,
-    'lang'=>'orders',
-    'buttonnew'=>'CreateOrder',
-    'testnew'=>$user->rights->commande->creer,
-    'test'=>$conf->commande->enabled && $user->rights->commande->lire),
+	'urlnew'=>DOL_URL_ROOT.'/commande/card.php?action=create&projectid='.$id.'&socid='.$socid,
+	'lang'=>'orders',
+	'buttonnew'=>'CreateOrder',
+	'testnew'=>$user->rights->commande->creer,
+	'test'=>$conf->commande->enabled && $user->rights->commande->lire),
 'invoice'=>array(
 	'name'=>"CustomersInvoices",
 	'title'=>"ListInvoicesAssociatedProject",
@@ -301,22 +300,22 @@ $listofreferent = array(
 	'margin'=>'add',
 	'table'=>'facture',
 	'datefieldname'=>'datef',
-    'urlnew'=>DOL_URL_ROOT.'/compta/facture/card.php?action=create&projectid='.$id.'&socid='.$socid,
-    'lang'=>'bills',
-    'buttonnew'=>'CreateBill',
-    'testnew'=>$user->rights->facture->creer,
-    'test'=>$conf->facture->enabled && $user->rights->facture->lire),
+	'urlnew'=>DOL_URL_ROOT.'/compta/facture/card.php?action=create&projectid='.$id.'&socid='.$socid,
+	'lang'=>'bills',
+	'buttonnew'=>'CreateBill',
+	'testnew'=>$user->rights->facture->creer,
+	'test'=>$conf->facture->enabled && $user->rights->facture->lire),
 'invoice_predefined'=>array(
 	'name'=>"PredefinedInvoices",
 	'title'=>"ListPredefinedInvoicesAssociatedProject",
 	'class'=>'FactureRec',
 	'table'=>'facture_rec',
 	'datefieldname'=>'datec',
-    'urlnew'=>DOL_URL_ROOT.'/compta/facture/card.php?action=create&projectid='.$id.'&socid='.$socid,
-    'lang'=>'bills',
-    'buttonnew'=>'CreateBill',
-    'testnew'=>$user->rights->facture->creer,
-    'test'=>$conf->facture->enabled && $user->rights->facture->lire),
+	'urlnew'=>DOL_URL_ROOT.'/compta/facture/card.php?action=create&projectid='.$id.'&socid='.$socid,
+	'lang'=>'bills',
+	'buttonnew'=>'CreateBill',
+	'testnew'=>$user->rights->facture->creer,
+	'test'=>$conf->facture->enabled && $user->rights->facture->lire),
 'proposal_supplier'=>array(
 	'name'=>"SuppliersProposals",
 	'title'=>"ListSupplierProposalsAssociatedProject",
@@ -324,21 +323,21 @@ $listofreferent = array(
 	'table'=>'supplier_proposal',
 	'datefieldname'=>'date_valid',
 	'urlnew'=>DOL_URL_ROOT.'/supplier_proposal/card.php?action=create&projectid='.$id, // No socid parameter here, the socid is often the customer and we create a supplier object
-    'lang'=>'supplier_proposal',
-    'buttonnew'=>'AddSupplierProposal',
-    'testnew'=>$user->rights->supplier_proposal->creer,
-    'test'=>$conf->supplier_proposal->enabled && $user->rights->supplier_proposal->lire),
+	'lang'=>'supplier_proposal',
+	'buttonnew'=>'AddSupplierProposal',
+	'testnew'=>$user->rights->supplier_proposal->creer,
+	'test'=>$conf->supplier_proposal->enabled && $user->rights->supplier_proposal->lire),
 'order_supplier'=>array(
 	'name'=>"SuppliersOrders",
 	'title'=>"ListSupplierOrdersAssociatedProject",
 	'class'=>'CommandeFournisseur',
 	'table'=>'commande_fournisseur',
 	'datefieldname'=>'date_commande',
-    'urlnew'=>DOL_URL_ROOT.'/fourn/commande/card.php?action=create&projectid='.$id, // No socid parameter here, the socid is often the customer and we create a supplier object
-    'lang'=>'suppliers',
-    'buttonnew'=>'AddSupplierOrder',
-    'testnew'=>$user->rights->fournisseur->commande->creer,
-    'test'=>$conf->supplier_order->enabled && $user->rights->fournisseur->commande->lire),
+	'urlnew'=>DOL_URL_ROOT.'/fourn/commande/card.php?action=create&projectid='.$id, // No socid parameter here, the socid is often the customer and we create a supplier object
+	'lang'=>'suppliers',
+	'buttonnew'=>'AddSupplierOrder',
+	'testnew'=>$user->rights->fournisseur->commande->creer,
+	'test'=>$conf->supplier_order->enabled && $user->rights->fournisseur->commande->lire),
 'invoice_supplier'=>array(
 	'name'=>"BillsSuppliers",
 	'title'=>"ListSupplierInvoicesAssociatedProject",
@@ -347,21 +346,21 @@ $listofreferent = array(
 	'table'=>'facture_fourn',
 	'datefieldname'=>'datef',
 	'urlnew'=>DOL_URL_ROOT.'/fourn/facture/card.php?action=create&projectid='.$id, // No socid parameter here, the socid is often the customer and we create a supplier object
-    'lang'=>'suppliers',
-    'buttonnew'=>'AddSupplierInvoice',
-    'testnew'=>$user->rights->fournisseur->facture->creer,
-    'test'=>$conf->supplier_invoice->enabled && $user->rights->fournisseur->facture->lire),
+	'lang'=>'suppliers',
+	'buttonnew'=>'AddSupplierInvoice',
+	'testnew'=>$user->rights->fournisseur->facture->creer,
+	'test'=>$conf->supplier_invoice->enabled && $user->rights->fournisseur->facture->lire),
 'contract'=>array(
 	'name'=>"Contracts",
 	'title'=>"ListContractAssociatedProject",
 	'class'=>'Contrat',
 	'table'=>'contrat',
 	'datefieldname'=>'date_contrat',
-    'urlnew'=>DOL_URL_ROOT.'/contrat/card.php?action=create&projectid='.$id.'&socid='.$socid,
-    'lang'=>'contracts',
-    'buttonnew'=>'AddContract',
-    'testnew'=>$user->rights->contrat->creer,
-    'test'=>$conf->contrat->enabled && $user->rights->contrat->lire),
+	'urlnew'=>DOL_URL_ROOT.'/contrat/card.php?action=create&projectid='.$id.'&socid='.$socid,
+	'lang'=>'contracts',
+	'buttonnew'=>'AddContract',
+	'testnew'=>$user->rights->contrat->creer,
+	'test'=>$conf->contrat->enabled && $user->rights->contrat->lire),
 'intervention'=>array(
 	'name'=>"Interventions",
 	'title'=>"ListFichinterAssociatedProject",
@@ -370,13 +369,13 @@ $listofreferent = array(
 	'datefieldname'=>'date_valid',
 	'disableamount'=>0,
 	'margin'=>'minus',
-    'urlnew'=>DOL_URL_ROOT.'/fichinter/card.php?action=create&origin=project&originid='.$id.'&socid='.$socid,
-    'lang'=>'interventions',
-    'buttonnew'=>'AddIntervention',
-    'testnew'=>$user->rights->ficheinter->creer,
-    'test'=>$conf->ficheinter->enabled && $user->rights->ficheinter->lire),
+	'urlnew'=>DOL_URL_ROOT.'/fichinter/card.php?action=create&origin=project&originid='.$id.'&socid='.$socid,
+	'lang'=>'interventions',
+	'buttonnew'=>'AddIntervention',
+	'testnew'=>$user->rights->ficheinter->creer,
+	'test'=>$conf->ficheinter->enabled && $user->rights->ficheinter->lire),
 'shipping'=>array(
-    'name'=>"Shippings",
+	'name'=>"Shippings",
 	'title'=>"ListShippingAssociatedProject",
 	'class'=>'Expedition',
 	'table'=>'expedition',
@@ -406,11 +405,11 @@ $listofreferent = array(
 	'datefieldname'=>'dated',
 	'margin'=>'minus',
 	'disableamount'=>1,
-    'urlnew'=>DOL_URL_ROOT.'/deplacement/card.php?action=create&projectid='.$id.'&socid='.$socid,
-    'lang'=>'trips',
-    'buttonnew'=>'AddTrip',
-    'testnew'=>$user->rights->deplacement->creer,
-    'test'=>$conf->deplacement->enabled && $user->rights->deplacement->lire),
+	'urlnew'=>DOL_URL_ROOT.'/deplacement/card.php?action=create&projectid='.$id.'&socid='.$socid,
+	'lang'=>'trips',
+	'buttonnew'=>'AddTrip',
+	'testnew'=>$user->rights->deplacement->creer,
+	'test'=>$conf->deplacement->enabled && $user->rights->deplacement->lire),
 'expensereport'=>array(
 	'name'=>"ExpenseReports",
 	'title'=>"ListExpenseReportsAssociatedProject",
@@ -419,11 +418,11 @@ $listofreferent = array(
 	'datefieldname'=>'date',
 	'margin'=>'minus',
 	'disableamount'=>0,
-    'urlnew'=>DOL_URL_ROOT.'/expensereport/card.php?action=create&projectid='.$id.'&socid='.$socid,
-    'lang'=>'trips',
-    'buttonnew'=>'AddTrip',
-    'testnew'=>$user->rights->expensereport->creer,
-    'test'=>$conf->expensereport->enabled && $user->rights->expensereport->lire),
+	'urlnew'=>DOL_URL_ROOT.'/expensereport/card.php?action=create&projectid='.$id.'&socid='.$socid,
+	'lang'=>'trips',
+	'buttonnew'=>'AddTrip',
+	'testnew'=>$user->rights->expensereport->creer,
+	'test'=>$conf->expensereport->enabled && $user->rights->expensereport->lire),
 'donation'=>array(
 	'name'=>"Donation",
 	'title'=>"ListDonationsAssociatedProject",
@@ -432,11 +431,11 @@ $listofreferent = array(
 	'table'=>'don',
 	'datefieldname'=>'datedon',
 	'disableamount'=>0,
-    'urlnew'=>DOL_URL_ROOT.'/don/card.php?action=create&projectid='.$id.'&socid='.$socid,
-    'lang'=>'donations',
-    'buttonnew'=>'AddDonation',
-    'testnew'=>$user->rights->don->creer,
-    'test'=>$conf->don->enabled && $user->rights->don->lire),
+	'urlnew'=>DOL_URL_ROOT.'/don/card.php?action=create&projectid='.$id.'&socid='.$socid,
+	'lang'=>'donations',
+	'buttonnew'=>'AddDonation',
+	'testnew'=>$user->rights->don->creer,
+	'test'=>$conf->don->enabled && $user->rights->don->lire),
 'loan'=>array(
 	'name'=>"Loan",
 	'title'=>"ListLoanAssociatedProject",
@@ -445,24 +444,24 @@ $listofreferent = array(
 	'table'=>'loan',
 	'datefieldname'=>'datestart',
 	'disableamount'=>0,
-    'urlnew'=>DOL_URL_ROOT.'/loan/card.php?action=create&projectid='.$id.'&socid='.$socid,
-    'lang'=>'loan',
-    'buttonnew'=>'AddLoan',
-    'testnew'=>$user->rights->loan->write,
-    'test'=>$conf->loan->enabled && $user->rights->loan->read),
+	'urlnew'=>DOL_URL_ROOT.'/loan/card.php?action=create&projectid='.$id.'&socid='.$socid,
+	'lang'=>'loan',
+	'buttonnew'=>'AddLoan',
+	'testnew'=>$user->rights->loan->write,
+	'test'=>$conf->loan->enabled && $user->rights->loan->read),
 'chargesociales'=>array(
-    'name'=>"SocialContribution",
-    'title'=>"ListSocialContributionAssociatedProject",
-    'class'=>'ChargeSociales',
-    'margin'=>'minus',
-    'table'=>'chargesociales',
-    'datefieldname'=>'date_ech',
-    'disableamount'=>0,
-    'urlnew'=>DOL_URL_ROOT.'/compta/sociales/card.php?action=create&projectid='.$id,
-    'lang'=>'compta',
-    'buttonnew'=>'AddSocialContribution',
-    'testnew'=>$user->rights->tax->charges->lire,
-    'test'=>$conf->tax->enabled && $user->rights->tax->charges->lire),
+	'name'=>"SocialContribution",
+	'title'=>"ListSocialContributionAssociatedProject",
+	'class'=>'ChargeSociales',
+	'margin'=>'minus',
+	'table'=>'chargesociales',
+	'datefieldname'=>'date_ech',
+	'disableamount'=>0,
+	'urlnew'=>DOL_URL_ROOT.'/compta/sociales/card.php?action=create&projectid='.$id,
+	'lang'=>'compta',
+	'buttonnew'=>'AddSocialContribution',
+	'testnew'=>$user->rights->tax->charges->lire,
+	'test'=>$conf->tax->enabled && $user->rights->tax->charges->lire),
 'project_task'=>array(
 	'name'=>"TaskTimeSpent",
 	'title'=>"ListTaskTimeUserProject",
@@ -471,10 +470,10 @@ $listofreferent = array(
 	'table'=>'projet_task',
 	'datefieldname'=>'task_date',
 	'disableamount'=>0,
-    'urlnew'=>DOL_URL_ROOT.'/projet/tasks/time.php?withproject=1&action=createtime&projectid='.$id,
-    'buttonnew'=>'AddTimeSpent',
-    'testnew'=>$user->rights->projet->creer,
-    'test'=>($conf->projet->enabled && $user->rights->projet->lire && empty($conf->global->PROJECT_HIDE_TASKS))),
+	'urlnew'=>DOL_URL_ROOT.'/projet/tasks/time.php?withproject=1&action=createtime&projectid='.$id,
+	'buttonnew'=>'AddTimeSpent',
+	'testnew'=>$user->rights->projet->creer,
+	'test'=>($conf->projet->enabled && $user->rights->projet->lire && empty($conf->global->PROJECT_HIDE_TASKS))),
 'stock_mouvement'=>array(
 	'name'=>"MouvementStockAssociated",
 	'title'=>"ListMouvementStockProject",
@@ -505,11 +504,11 @@ $listofreferent = array(
 	'datefieldname'=>'datev',
 	'margin'=>'minus',
 	'disableamount'=>0,
-    'urlnew'=>DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create&projectid='.$id,
-    'lang'=>'banks',
-    'buttonnew'=>'AddVariousPayment',
-    'testnew'=>$user->rights->banque->modifier,
-    'test'=>$conf->banque->enabled && $user->rights->banque->lire && empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT)),
+	'urlnew'=>DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create&projectid='.$id,
+	'lang'=>'banks',
+	'buttonnew'=>'AddVariousPayment',
+	'testnew'=>$user->rights->banque->modifier,
+	'test'=>$conf->banque->enabled && $user->rights->banque->lire && empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT)),
 /* No need for this, available on dedicated tab "Agenda/Events"
 'agenda'=>array(
 	'name'=>"Agenda",
@@ -527,7 +526,7 @@ $listofreferent = array(
 );
 
 // Change rules for profit/benefit calculation
-if (! empty($conf->global->PROJECT_ELEMENTS_FOR_PLUS_MARGIN)) {
+if (!empty($conf->global->PROJECT_ELEMENTS_FOR_PLUS_MARGIN)) {
 	foreach ($listofreferent as $key => $element) {
 		if ($listofreferent[$key]['margin'] == 'add') {
 			unset($listofreferent[$key]['margin']);
@@ -535,10 +534,10 @@ if (! empty($conf->global->PROJECT_ELEMENTS_FOR_PLUS_MARGIN)) {
 	}
 	$newelementforplusmargin = explode(',', $conf->global->PROJECT_ELEMENTS_FOR_PLUS_MARGIN);
 	foreach ($newelementforplusmargin as $value) {
-		$listofreferent[trim($value)]['margin']='add';
+		$listofreferent[trim($value)]['margin'] = 'add';
 	}
 }
-if (! empty($conf->global->PROJECT_ELEMENTS_FOR_MINUS_MARGIN)) {
+if (!empty($conf->global->PROJECT_ELEMENTS_FOR_MINUS_MARGIN)) {
 	foreach ($listofreferent as $key => $element) {
 		if ($listofreferent[$key]['margin'] == 'minus') {
 			unset($listofreferent[$key]['margin']);
@@ -546,7 +545,7 @@ if (! empty($conf->global->PROJECT_ELEMENTS_FOR_MINUS_MARGIN)) {
 	}
 	$newelementforminusmargin = explode(',', $conf->global->PROJECT_ELEMENTS_FOR_MINUS_MARGIN);
 	foreach ($newelementforminusmargin as $value) {
-		$listofreferent[trim($value)]['margin']='minus';
+		$listofreferent[trim($value)]['margin'] = 'minus';
 	}
 }
 
@@ -571,7 +570,7 @@ if ($action == "addelement")
 } elseif ($action == "unlink")
 {
 	$tablename = GETPOST("tablename", "aZ09");
-    $projectField = GETPOSTISSET('projectfield') ? GETPOST('projectfield', 'aZ09') : 'fk_projet';
+	$projectField = GETPOSTISSET('projectfield') ? GETPOST('projectfield', 'aZ09') : 'fk_projet';
 	$elementselectid = GETPOST("elementselect", "int");
 
 	$result = $object->remove_element($tablename, $elementselectid, $projectField);
@@ -590,21 +589,19 @@ $showdatefilter = 0;
 if (!$showdatefilter)
 {
 	print '<div class="center centpercent">';
-    print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="tablename" value="'.$tablename.'">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="tablename" value="'.$tablename.'">';
 	print '<input type="hidden" name="action" value="view">';
-	print '<table class="center"><tr>';
-	print '<td>'.$langs->trans("From").' ';
-	print $form->selectDate($dates, 'dates', 0, 0, 1, '', 1, 0);
-	print '</td>';
-	print '<td>'.$langs->trans("to").' ';
-	print $form->selectDate($datee, 'datee', 0, 0, 1, '', 1, 0);
-	print '</td>';
-	print '<td>';
+	print '<div class="inline-block">';
+	print $form->selectDate($dates, 'dates', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
+	print '</div>';
+	print '<div class="inline-block">';
+	print $form->selectDate($datee, 'datee', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
+	print '</div>';
+	print '<div class="inline-block">';
 	print '<input type="submit" name="refresh" value="'.$langs->trans("Refresh").'" class="button">';
-	print '</td>';
-	print '</tr></table>';
+	print '</div>';
 	print '</form>';
 	print '</div>';
 
@@ -634,10 +631,10 @@ foreach ($listofreferent as $key => $value)
 	if ($qualified && isset($margin))		// If this element must be included into profit calculation ($margin is 'minus' or 'add')
 	{
 		if ($margin == 'add') {
-			$tooltiponprofitplus.=' &gt; '.$name." (+)<br>\n";
+			$tooltiponprofitplus .= ' &gt; '.$name." (+)<br>\n";
 		}
 		if ($margin == 'minus') {
-			$tooltiponprofitminus.=' &gt; '.$name." (-)<br>\n";
+			$tooltiponprofitminus .= ' &gt; '.$name." (-)<br>\n";
 		}
 	}
 }
@@ -687,8 +684,8 @@ foreach ($listofreferent as $key => $value)
 				$qualifiedfortotal = true;
 				if ($key == 'invoice')
 				{
-				    if (!empty($element->close_code) && $element->close_code == 'replaced') $qualifiedfortotal = false; // Replacement invoice, do not include into total
-				    if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS) && $element->type == Facture::TYPE_DEPOSIT) $qualifiedfortotal = false; // If hidden option to use deposits as payment (deprecated, not recommended to use this), deposits are not included
+					if (!empty($element->close_code) && $element->close_code == 'replaced') $qualifiedfortotal = false; // Replacement invoice, do not include into total
+					if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS) && $element->type == Facture::TYPE_DEPOSIT) $qualifiedfortotal = false; // If hidden option to use deposits as payment (deprecated, not recommended to use this), deposits are not included
 				}
 				if ($key == 'propal')
 				{
@@ -712,29 +709,29 @@ foreach ($listofreferent as $key => $value)
 						$total_ht_by_line = price2num($tmp['amount'], 'MT');
 					}
 				} elseif ($key == 'loan') {
-                    if ((empty($dates) && empty($datee)) || (intval($dates) <= $element->datestart && intval($datee) >= $element->dateend)) {
-                        // Get total loan
-                        $total_ht_by_line = -$element->capital;
-                    } else {
-                        // Get loan schedule according to date filter
-                        $total_ht_by_line = 0;
-                        $loanScheduleStatic = new LoanSchedule($element->db);
-                        $loanScheduleStatic->fetchAll($element->id);
-                        if (!empty($loanScheduleStatic->lines)) {
-                            foreach ($loanScheduleStatic->lines as $loanSchedule) {
-                                /**
-                                 * @var $loanSchedule LoanSchedule
-                                 */
-                                if (($loanSchedule->datep >= $dates && $loanSchedule->datep <= $datee) // dates filter is defined
-                                    || !empty($dates) && empty($datee) && $loanSchedule->datep >= $dates && $loanSchedule->datep <= dol_now()
-                                    || empty($dates) && !empty($datee) && $loanSchedule->datep <= $datee
-                                ) {
-                                    $total_ht_by_line = -$loanSchedule->amount_capital;
-                                }
-                            }
-                        }
-                    }
-                } else $total_ht_by_line = $element->total_ht;
+					if ((empty($dates) && empty($datee)) || (intval($dates) <= $element->datestart && intval($datee) >= $element->dateend)) {
+						// Get total loan
+						$total_ht_by_line = -$element->capital;
+					} else {
+						// Get loan schedule according to date filter
+						$total_ht_by_line = 0;
+						$loanScheduleStatic = new LoanSchedule($element->db);
+						$loanScheduleStatic->fetchAll($element->id);
+						if (!empty($loanScheduleStatic->lines)) {
+							foreach ($loanScheduleStatic->lines as $loanSchedule) {
+								/**
+								 * @var $loanSchedule LoanSchedule
+								 */
+								if (($loanSchedule->datep >= $dates && $loanSchedule->datep <= $datee) // dates filter is defined
+									|| !empty($dates) && empty($datee) && $loanSchedule->datep >= $dates && $loanSchedule->datep <= dol_now()
+									|| empty($dates) && !empty($datee) && $loanSchedule->datep <= $datee
+								) {
+									$total_ht_by_line -= $loanSchedule->amount_capital;
+								}
+							}
+						}
+					}
+				} else $total_ht_by_line = $element->total_ht;
 
 				// Define $total_ttc_by_line
 				if ($tablename == 'don' || $tablename == 'chargesociales' || $tablename == 'payment_various' || $tablename == 'payment_salary') $total_ttc_by_line = $element->amount;
@@ -745,24 +742,24 @@ foreach ($listofreferent as $key => $value)
 					$defaultvat = get_default_tva($mysoc, $mysoc);
 					$total_ttc_by_line = price2num($total_ht_by_line * (1 + ($defaultvat / 100)), 'MT');
 				} elseif ($key == 'loan') {
-                        $total_ttc_by_line = $total_ht_by_line; // For loan there is actually no taxe managed in Dolibarr
-                } else $total_ttc_by_line = $element->total_ttc;
+						$total_ttc_by_line = $total_ht_by_line; // For loan there is actually no taxe managed in Dolibarr
+				} else $total_ttc_by_line = $element->total_ttc;
 
 				// Change sign of $total_ht_by_line and $total_ttc_by_line for some cases
 				if ($tablename == 'payment_various')
 				{
-			        if ($element->sens == 1)
-			        {
-			            $total_ht_by_line = -$total_ht_by_line;
-			            $total_ttc_by_line = -$total_ttc_by_line;
-			        }
+					if ($element->sens == 1)
+					{
+						$total_ht_by_line = -$total_ht_by_line;
+						$total_ttc_by_line = -$total_ttc_by_line;
+					}
 				}
 
 				// Add total if we have to
 				if ($qualifiedfortotal)
 				{
-				    $total_ht = $total_ht + $total_ht_by_line;
-				    $total_ttc = $total_ttc + $total_ttc_by_line;
+					$total_ht = $total_ht + $total_ht_by_line;
+					$total_ttc = $total_ttc + $total_ttc_by_line;
 				}
 			}
 
@@ -779,7 +776,7 @@ foreach ($listofreferent as $key => $value)
 					$total_revenue_ht += $total_ht;
 				}
 
-			    if ($margin != "add")	// Revert sign
+				if ($margin != "add")	// Revert sign
 				{
 					$total_ht = -$total_ht;
 					$total_ttc = -$total_ttc;
@@ -849,7 +846,7 @@ foreach ($listofreferent as $key => $value)
 	$langtoload = $value['lang'];
 	$urlnew = $value['urlnew'];
 	$buttonnew = $value['buttonnew'];
-    $testnew = $value['testnew'];
+	$testnew = $value['testnew'];
 	$project_field = $value['project_field'];
 
 	$exclude_select_element = array('payment_various');
@@ -860,7 +857,7 @@ foreach ($listofreferent as $key => $value)
 		// If we want the project task array to have details of users
 		//if ($key == 'project_task') $key = 'project_task_time';
 
-	    if ($langtoload) $langs->load($langtoload);
+		if ($langtoload) $langs->load($langtoload);
 
 		$element = new $classname($db);
 
@@ -870,12 +867,12 @@ foreach ($listofreferent as $key => $value)
 		$array_of_element_linkable_with_different_thirdparty = array('facture_fourn', 'commande_fournisseur');
 		if (!in_array($tablename, $array_of_element_linkable_with_different_thirdparty))
 		{
-		    $idtofilterthirdparty = $object->thirdparty->id;
-		    if (!empty($conf->global->PROJECT_OTHER_THIRDPARTY_ID_TO_ADD_ELEMENTS)) $idtofilterthirdparty .= ','.$conf->global->PROJECT_OTHER_THIRDPARTY_ID_TO_ADD_ELEMENTS;
+			$idtofilterthirdparty = $object->thirdparty->id;
+			if (!empty($conf->global->PROJECT_OTHER_THIRDPARTY_ID_TO_ADD_ELEMENTS)) $idtofilterthirdparty .= ','.$conf->global->PROJECT_OTHER_THIRDPARTY_ID_TO_ADD_ELEMENTS;
 		}
 
-       	if (empty($conf->global->PROJECT_LINK_ON_OVERWIEW_DISABLED) && $idtofilterthirdparty && !in_array($tablename, $exclude_select_element))
-       	{
+	   	if (empty($conf->global->PROJECT_LINK_ON_OVERWIEW_DISABLED) && $idtofilterthirdparty && !in_array($tablename, $exclude_select_element))
+	   	{
 			$selectList = $formproject->select_element($tablename, $idtofilterthirdparty, 'minwidth300 minwidth75imp', -2, !empty($project_field) ? $project_field : 'fk_projet');
 			if ($selectList < 0)
 			{
@@ -883,10 +880,10 @@ foreach ($listofreferent as $key => $value)
 			} elseif ($selectList)
 			{
 				// Define form with the combo list of elements to link
-			    $addform .= '<div class="inline-block valignmiddle">';
-			    $addform .= '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-			    $addform .= '<input type="hidden" name="token" value="'.newToken().'">';
-			    $addform .= '<input type="hidden" name="tablename" value="'.$tablename.'">';
+				$addform .= '<div class="inline-block valignmiddle">';
+				$addform .= '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+				$addform .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$addform .= '<input type="hidden" name="tablename" value="'.$tablename.'">';
 				$addform .= '<input type="hidden" name="action" value="addelement">';
 				$addform .= '<input type="hidden" name="datesrfc" value="'.dol_print_date($dates, 'dayhourrfc').'">';
 				$addform .= '<input type="hidden" name="dateerfc" value="'.dol_print_date($datee, 'dayhourrfc').'">';
@@ -905,7 +902,7 @@ foreach ($listofreferent as $key => $value)
 			elseif (empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
 				$addform .= '<a class="buttonxxx buttonRefused" disabled="disabled" href="#"><span class="valignmiddle text-plus-circle hideonsmartphone">'.($buttonnew ? $langs->trans($buttonnew) : $langs->trans("Create")).'</span><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
 			}
-            $addform .= '<div>';
+			$addform .= '<div>';
 		}
 
 		print load_fiche_titre($langs->trans($title), $addform, '');
@@ -931,9 +928,9 @@ foreach ($listofreferent as $key => $value)
 		elseif (in_array($tablename, array('expensereport_det', 'don', 'projet_task', 'stock_mouvement', 'payment_salary'))) print $langs->trans("User");
 		else print $langs->trans("ThirdParty");
 		print '</td>';
-        // Duration of intervention
+		// Duration of intervention
 		if ($tablename == 'fichinter')
-                {
+				{
 			print '<td>';
 			print $langs->trans("TotalDuration");
 			$total_duration = 0;
@@ -942,13 +939,13 @@ foreach ($listofreferent as $key => $value)
 		// Amount HT
 		//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td class="right" width="120">'.$langs->trans("AmountHT").'</td>';
 		//elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print '<td class="right" width="120">'.$langs->trans("Amount").'</td>';
-        if ($key == 'loan') print '<td class="right" width="120">'.$langs->trans("LoanCapital").'</td>';
+		if ($key == 'loan') print '<td class="right" width="120">'.$langs->trans("LoanCapital").'</td>';
 		elseif (empty($value['disableamount'])) print '<td class="right" width="120">'.$langs->trans("AmountHT").'</td>';
 		else print '<td width="120"></td>';
 		// Amount TTC
 		//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td class="right" width="120">'.$langs->trans("AmountTTC").'</td>';
-        if ($key == 'loan') print '<td class="right" width="120">'.$langs->trans("RemainderToPay").'</td>';
-        elseif (empty($value['disableamount'])) print '<td class="right" width="120">'.$langs->trans("AmountTTC").'</td>';
+		if ($key == 'loan') print '<td class="right" width="120">'.$langs->trans("RemainderToPay").'</td>';
+		elseif (empty($value['disableamount'])) print '<td class="right" width="120">'.$langs->trans("AmountTTC").'</td>';
 		else print '<td width="120"></td>';
 		// Status
 		if (in_array($tablename, array('projet_task'))) print '<td class="right" width="200">'.$langs->trans("ProgressDeclared").'</td>';
@@ -1039,9 +1036,9 @@ foreach ($listofreferent as $key => $value)
 						print $element->getNomUrl(1, 'withproject', 'time');
 						print ' - '.dol_trunc($element->label, 48);
 					} elseif ($key == 'loan') {
-                        print $element->getNomUrl(1);
-                        print ' - '.dol_trunc($element->label, 48);
-                    } else print $element->getNomUrl(1);
+						print $element->getNomUrl(1);
+						print ' - '.dol_trunc($element->label, 48);
+					} else print $element->getNomUrl(1);
 
 					$element_doc = $element->element;
 					$filename = dol_sanitizeFileName($element->ref);
@@ -1074,65 +1071,65 @@ foreach ($listofreferent as $key => $value)
 				elseif ($tablename == 'chargesociales') $date = $element->date_ech;
 				elseif (!empty($element->status) || !empty($element->statut) || !empty($element->fk_status))
 				{
-				    if ($tablename == 'don') $date = $element->datedon;
-				    if ($tablename == 'commande_fournisseur' || $tablename == 'supplier_order')
-    				{
-    				    $date = ($element->date_commande ? $element->date_commande : $element->date_valid);
-    				} elseif ($tablename == 'supplier_proposal') $date = $element->date_validation; // There is no other date for this
-    				elseif ($tablename == 'fichinter') $date = $element->datev; // There is no other date for this
-    				elseif ($tablename == 'projet_task') $date = ''; // We show no date. Showing date of beginning of task make user think it is date of time consumed
+					if ($tablename == 'don') $date = $element->datedon;
+					if ($tablename == 'commande_fournisseur' || $tablename == 'supplier_order')
+					{
+						$date = ($element->date_commande ? $element->date_commande : $element->date_valid);
+					} elseif ($tablename == 'supplier_proposal') $date = $element->date_validation; // There is no other date for this
+					elseif ($tablename == 'fichinter') $date = $element->datev; // There is no other date for this
+					elseif ($tablename == 'projet_task') $date = ''; // We show no date. Showing date of beginning of task make user think it is date of time consumed
 					else {
-    					$date = $element->date; // invoice, ...
-    					if (empty($date)) $date = $element->date_contrat;
-    					if (empty($date)) $date = $element->datev;
-    					if (empty($date) && !empty($datefieldname)) {
-    						$date = $element->$datefieldname;
-    					}
-    				}
+						$date = $element->date; // invoice, ...
+						if (empty($date)) $date = $element->date_contrat;
+						if (empty($date)) $date = $element->datev;
+						if (empty($date) && !empty($datefieldname)) {
+							$date = $element->$datefieldname;
+						}
+					}
 				} elseif ($key == 'loan') {
-                    $date = $element->datestart;
-                }
+					$date = $element->datestart;
+				}
 
 				print '<td class="center">';
 				if ($tablename == 'actioncomm')
 				{
-				    print dol_print_date($element->datep, 'dayhour');
-				    if ($element->datef && $element->datef > $element->datep) print " - ".dol_print_date($element->datef, 'dayhour');
+					print dol_print_date($element->datep, 'dayhour');
+					if ($element->datef && $element->datef > $element->datep) print " - ".dol_print_date($element->datef, 'dayhour');
 				} elseif (in_array($tablename, array('projet_task')))
 				{
-				    $tmpprojtime = $element->getSumOfAmount($elementuser, $dates, $datee); // $element is a task. $elementuser may be empty
-                    print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$idofelement.'&withproject=1">';
-				    print convertSecondToTime($tmpprojtime['nbseconds'], 'allhourmin');
-                	print '</a>';
-				    $total_time_by_line = $tmpprojtime['nbseconds'];
+					$tmpprojtime = $element->getSumOfAmount($elementuser, $dates, $datee); // $element is a task. $elementuser may be empty
+					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$idofelement.'&withproject=1">';
+					print convertSecondToTime($tmpprojtime['nbseconds'], 'allhourmin');
+					print '</a>';
+					$total_time_by_line = $tmpprojtime['nbseconds'];
 				} else print dol_print_date($date, 'day');
 				print '</td>';
 
 				// Third party or user
-                print '<td class="left">';
-                if (is_object($element->thirdparty)) {
-                    print $element->thirdparty->getNomUrl(1, '', 48);
-                } elseif ($tablename == 'expensereport_det') {
-                	$tmpuser = new User($db);
-                	$tmpuser->fetch($expensereport->fk_user_author);
-                	print $tmpuser->getNomUrl(1, '', 48);
-                } elseif ($tablename == 'payment_salary')
+				print '<td class="left">';
+				if (is_object($element->thirdparty)) {
+					print $element->thirdparty->getNomUrl(1, '', 48);
+				} elseif ($tablename == 'expensereport_det') {
+					$tmpuser = new User($db);
+					$tmpuser->fetch($expensereport->fk_user_author);
+					print $tmpuser->getNomUrl(1, '', 48);
+				} elseif ($tablename == 'payment_salary')
 				{
 					$tmpuser = new User($db);
 					$tmpuser->fetch($element->fk_user);
 					print $tmpuser->getNomUrl(1, '', 48);
 				} elseif ($tablename == 'don' || $tablename == 'stock_mouvement')
-                {
-                	if ($element->fk_user_author > 0)
-                	{
-	                	$tmpuser2 = new User($db);
-	                	$tmpuser2->fetch($element->fk_user_author);
-	                	print $tmpuser2->getNomUrl(1, '', 48);
-                	}
-                } elseif ($tablename == 'projet_task' && $key == 'project_task_time')	// if $key == 'project_task', we don't want details per user
-                {
-                    print $elementuser->getNomUrl(1);
-                }
+				{
+					if ($element->fk_user_author > 0)
+					{
+						$tmpuser2 = new User($db);
+						$tmpuser2->fetch($element->fk_user_author);
+						print $tmpuser2->getNomUrl(1, '', 48);
+					}
+				} elseif ($tablename == 'projet_task' && $key == 'project_task_time')	// if $key == 'project_task', we don't want details per user
+				{
+					print $elementuser->getNomUrl(1);
+				}
 				print '</td>';
 
 				// Add duration and store it in counter for fichinter
@@ -1144,29 +1141,29 @@ foreach ($listofreferent as $key => $value)
 					print '</td>';
 				}
 
-                // Amount without tax
+				// Amount without tax
 				$warning = '';
 				if (empty($value['disableamount']))
 				{
-				    $total_ht_by_line = null;
-				    $othermessage = '';
+					$total_ht_by_line = null;
+					$othermessage = '';
 					if ($tablename == 'don' || $tablename == 'chargesociales' || $tablename == 'payment_various' || $tablename == 'payment_salary') $total_ht_by_line = $element->amount;
 					elseif ($tablename == 'fichinter') $total_ht_by_line = $element->getAmount();
 					elseif ($tablename == 'stock_mouvement') $total_ht_by_line = $element->price * abs($element->qty);
 					elseif (in_array($tablename, array('projet_task')))
 					{
-					    if (!empty($conf->salaries->enabled))
-					    {
-        				    // TODO Permission to read daily rate to show value
-					        $total_ht_by_line = price2num($tmpprojtime['amount'], 'MT');
-    						if ($tmpprojtime['nblinesnull'] > 0)
-    						{
-    							$langs->load("errors");
-    							$warning = $langs->trans("WarningSomeLinesWithNullHourlyRate", $conf->currency);
-    						}
-					    } else {
-					        $othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
-					    }
+						if (!empty($conf->salaries->enabled))
+						{
+							// TODO Permission to read daily rate to show value
+							$total_ht_by_line = price2num($tmpprojtime['amount'], 'MT');
+							if ($tmpprojtime['nblinesnull'] > 0)
+							{
+								$langs->load("errors");
+								$warning = $langs->trans("WarningSomeLinesWithNullHourlyRate", $conf->currency);
+							}
+						} else {
+							$othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
+						}
 					} elseif ($key == 'loan') $total_ht_by_line = $element->capital;
 					else {
 						$total_ht_by_line = $element->total_ht;
@@ -1175,10 +1172,10 @@ foreach ($listofreferent as $key => $value)
 					// Change sign of $total_ht_by_line and $total_ttc_by_line for some cases
 					if ($tablename == 'payment_various')
 					{
-					    if ($element->sens == 0)
-					    {
-					        $total_ht_by_line = -$total_ht_by_line;
-					    }
+						if ($element->sens == 0)
+						{
+							$total_ht_by_line = -$total_ht_by_line;
+						}
 					}
 
 					print '<td class="right">';
@@ -1193,23 +1190,23 @@ foreach ($listofreferent as $key => $value)
 					print '</td>';
 				} else print '<td></td>';
 
-                // Amount inc tax
+				// Amount inc tax
 				if (empty($value['disableamount']))
 				{
-				    $total_ttc_by_line = null;
+					$total_ttc_by_line = null;
 					if ($tablename == 'don' || $tablename == 'chargesociales' || $tablename == 'payment_various' || $tablename == 'payment_salary') $total_ttc_by_line = $element->amount;
 					elseif ($tablename == 'fichinter') $total_ttc_by_line = $element->getAmount();
 					elseif ($tablename == 'stock_mouvement') $total_ttc_by_line = $element->price * abs($element->qty);
 					elseif ($tablename == 'projet_task')
 					{
-					    if (!empty($conf->salaries->enabled))
-					    {
-					        // TODO Permission to read daily rate
-    						$defaultvat = get_default_tva($mysoc, $mysoc);
-    						$total_ttc_by_line = price2num($total_ht_by_line * (1 + ($defaultvat / 100)), 'MT');
-					    } else {
-					        $othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
-					    }
+						if (!empty($conf->salaries->enabled))
+						{
+							// TODO Permission to read daily rate
+							$defaultvat = get_default_tva($mysoc, $mysoc);
+							$total_ttc_by_line = price2num($total_ht_by_line * (1 + ($defaultvat / 100)), 'MT');
+						} else {
+							$othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
+						}
 					} elseif ($key == 'loan') $total_ttc_by_line = $element->capital - $element->getSumPayment();
 					else {
 						$total_ttc_by_line = $element->total_ttc;
@@ -1218,10 +1215,10 @@ foreach ($listofreferent as $key => $value)
 					// Change sign of $total_ht_by_line and $total_ttc_by_line for some cases
 					if ($tablename == 'payment_various')
 					{
-					    if ($element->sens == 0)
-					    {
-					        $total_ttc_by_line = -$total_ttc_by_line;
-					    }
+						if ($element->sens == 0)
+						{
+							$total_ttc_by_line = -$total_ttc_by_line;
+						}
 					}
 
 					print '<td class="right">';
@@ -1300,21 +1297,21 @@ foreach ($listofreferent as $key => $value)
 			print '<tr class="liste_total"><td colspan="'.$colspan.'">'.$langs->trans("Number").': '.$i.'</td>';
 			if (in_array($tablename, array('projet_task')))
 			{
-    			print '<td class="center">';
-    			print convertSecondToTime($total_time, 'allhourmin');
-    			print '</td>';
-    			print '<td>';
-    			print '</td>';
+				print '<td class="center">';
+				print convertSecondToTime($total_time, 'allhourmin');
+				print '</td>';
+				print '<td>';
+				print '</td>';
 			}
 			//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td class="right" width="100">'.$langs->trans("TotalHT").' : '.price($total_ht).'</td>';
 			//elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print '<td class="right" width="100">'.$langs->trans("Total").' : '.price($total_ht).'</td>';
-                        // If fichinter add the total_duration
-                        if ($tablename == 'fichinter') print '<td class="left">'.convertSecondToTime($total_duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).'</td>';
+						// If fichinter add the total_duration
+						if ($tablename == 'fichinter') print '<td class="left">'.convertSecondToTime($total_duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).'</td>';
 			print '<td class="right">';
 			if (empty($value['disableamount']))
 			{
-                if ($key == 'loan') print $langs->trans("Total").' '.$langs->trans("LoanCapital").' : '.price($total_ttc);
-                elseif ($tablename != 'projet_task' || !empty($conf->salaries->enabled)) print ''.$langs->trans("TotalHT").' : '.price($total_ht);
+				if ($key == 'loan') print $langs->trans("Total").' '.$langs->trans("LoanCapital").' : '.price($total_ttc);
+				elseif ($tablename != 'projet_task' || !empty($conf->salaries->enabled)) print ''.$langs->trans("TotalHT").' : '.price($total_ht);
 			}
 			print '</td>';
 			//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td class="right" width="100">'.$langs->trans("TotalTTC").' : '.price($total_ttc).'</td>';
@@ -1322,8 +1319,8 @@ foreach ($listofreferent as $key => $value)
 			print '<td class="right">';
 			if (empty($value['disableamount']))
 			{
-                if ($key == 'loan') print $langs->trans("Total").' '.$langs->trans("RemainderToPay").' : '.price($total_ttc);
-			    elseif ($tablename != 'projet_task' || !empty($conf->salaries->enabled)) print $langs->trans("TotalTTC").' : '.price($total_ttc);
+				if ($key == 'loan') print $langs->trans("Total").' '.$langs->trans("RemainderToPay").' : '.price($total_ttc);
+				elseif ($tablename != 'projet_task' || !empty($conf->salaries->enabled)) print $langs->trans("TotalTTC").' : '.price($total_ttc);
 			}
 			print '</td>';
 			print '<td>&nbsp;</td>';
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index 81b7be12e33..eeb2fcb7659 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -96,130 +96,130 @@ if (($id > 0 && is_numeric($id)) || !empty($ref))
 	//$userDelete = $object->restrictedProjectArea($user,'delete');
 	//print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
 
-    $tab = 'tasks';
+	$tab = 'tasks';
 
-    $head = project_prepare_head($object);
-    dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));
+	$head = project_prepare_head($object);
+	print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));
 
-    $param = ($mode == 'mine' ? '&mode=mine' : '');
+	$param = ($mode == 'mine' ? '&mode=mine' : '');
 
 
 
-    // Project card
+	// Project card
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    $morehtmlref = '<div class="refidno">';
-    // Title
-    $morehtmlref .= $object->title;
-    // Thirdparty
-    if ($object->thirdparty->id > 0)
-    {
-        $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
-    }
-    $morehtmlref .= '</div>';
+	$morehtmlref = '<div class="refidno">';
+	// Title
+	$morehtmlref .= $object->title;
+	// Thirdparty
+	if ($object->thirdparty->id > 0)
+	{
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
+	}
+	$morehtmlref .= '</div>';
 
-    // Define a complementary filter for search of next/prev ref.
-    if (!$user->rights->projet->all->lire)
-    {
-        $objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
-        $object->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
-    }
+	// Define a complementary filter for search of next/prev ref.
+	if (!$user->rights->projet->all->lire)
+	{
+		$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 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, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-    print '<div class="fichecenter">';
-    print '<div class="fichehalfleft">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border tableforfield centpercent">';
+	print '<table class="border tableforfield centpercent">';
 
-    // Usage
-    print '<tr><td class="tdtop">';
-    print $langs->trans("Usage");
-    print '</td>';
-    print '<td>';
-    if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-    {
-    	print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
-    	$htmltext = $langs->trans("ProjectFollowOpportunity");
-    	print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
-    	print '<br>';
-    }
-    if (empty($conf->global->PROJECT_HIDE_TASKS))
-    {
-    	print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'"> ';
-    	$htmltext = $langs->trans("ProjectFollowTasks");
-    	print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
-    	print '<br>';
-    }
-    if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
-    {
-    	print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')).'"> ';
-    	$htmltext = $langs->trans("ProjectBillTimeDescription");
-    	print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
-    	print '<br>';
-    }
-    print '</td></tr>';
+	// Usage
+	print '<tr><td class="tdtop">';
+	print $langs->trans("Usage");
+	print '</td>';
+	print '<td>';
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+	{
+		print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
+		$htmltext = $langs->trans("ProjectFollowOpportunity");
+		print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
+		print '<br>';
+	}
+	if (empty($conf->global->PROJECT_HIDE_TASKS))
+	{
+		print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'"> ';
+		$htmltext = $langs->trans("ProjectFollowTasks");
+		print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
+		print '<br>';
+	}
+	if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
+	{
+		print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')).'"> ';
+		$htmltext = $langs->trans("ProjectBillTimeDescription");
+		print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
+		print '<br>';
+	}
+	print '</td></tr>';
 
-    // Visibility
-    print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-    if ($object->public) print $langs->trans('SharedProject');
-    else print $langs->trans('PrivateProject');
-    print '</td></tr>';
+	// Visibility
+	print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
+	if ($object->public) print $langs->trans('SharedProject');
+	else print $langs->trans('PrivateProject');
+	print '</td></tr>';
 
-    // Date start - end
-    print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
+	// Date start - end
+	print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
 	$start = dol_print_date($object->date_start, 'day');
 	print ($start ? $start : '?');
 	$end = dol_print_date($object->date_end, 'day');
 	print ' - ';
 	print ($end ? $end : '?');
 	if ($object->hasDelay()) print img_warning("Late");
-    print '</td></tr>';
+	print '</td></tr>';
 
-    // Budget
-    print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-    if (strcmp($object->budget_amount, '')) print price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
-    print '</td></tr>';
+	// Budget
+	print '<tr><td>'.$langs->trans("Budget").'</td><td>';
+	if (strcmp($object->budget_amount, '')) print price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+	print '</td></tr>';
 
-    // Other attributes
-    $cols = 2;
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+	// Other attributes
+	$cols = 2;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
-    print '</table>';
+	print '</table>';
 
-    print '</div>';
-    print '<div class="fichehalfright">';
-    print '<div class="ficheaddleft">';
-    print '<div class="underbanner clearboth"></div>';
+	print '</div>';
+	print '<div class="fichehalfright">';
+	print '<div class="ficheaddleft">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border tableforfield centpercent">';
+	print '<table class="border tableforfield centpercent">';
 
-    // Description
-    print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-    print nl2br($object->description);
-    print '</td></tr>';
+	// Description
+	print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
+	print nl2br($object->description);
+	print '</td></tr>';
 
-    // Categories
-    if ($conf->categorie->enabled) {
-        print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
-        print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
-        print "</td></tr>";
-    }
+	// Categories
+	if ($conf->categorie->enabled) {
+		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
+		print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
+		print "</td></tr>";
+	}
 
-    print '</table>';
+	print '</table>';
 
-    print '</div>';
-    print '</div>';
-    print '</div>';
+	print '</div>';
+	print '</div>';
+	print '</div>';
 
-    print '<div class="clearboth"></div>';
+	print '<div class="clearboth"></div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '<br>';
+	print '<br>';
 }
 
 // Link to create task
@@ -227,9 +227,9 @@ $linktocreatetaskParam = array();
 $linktocreatetaskUserRight = false;
 if ($user->rights->projet->all->creer || $user->rights->projet->creer) {
 	if ($object->public || $userWrite > 0) {
-        $linktocreatetaskUserRight = true;
+		$linktocreatetaskUserRight = true;
 	} else {
-        $linktocreatetaskParam['attr']['title'] = $langs->trans("NotOwnerOfProject");
+		$linktocreatetaskParam['attr']['title'] = $langs->trans("NotOwnerOfProject");
 	}
 }
 
@@ -239,7 +239,7 @@ $linktotasks = dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-list-alt
 $linktotasks .= dolGetButtonTitle($langs->trans('ViewGantt'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/projet/ganttview.php?id='.$object->id.'&withproject=1', '', 1, array('morecss'=>'reposition marginleftonly btnTitleSelected'));
 
 //print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'generic', 0, '', '', 0, 1);
-print load_fiche_titre($title, $linktotasks.' &nbsp; '.$linktocreatetask, 'generic');
+print load_fiche_titre($title, $linktotasks.' &nbsp; '.$linktocreatetask, 'projecttask');
 
 
 // Get list of tasks in tasksarray and taskarrayfiltered
@@ -262,32 +262,32 @@ if (count($tasksarray) > 0)
 	$tasks = array();
 	$task_dependencies = array();
 	$taskcursor = 0;
-	foreach ($tasksarray as $key => $val)	// Task array are sorted by "project, position, dateo"
+	foreach ($tasksarray as $key => $val)	// Task array are sorted by "project, position, date"
 	{
 		$task->fetch($val->id, '');
 
 		$idparent = ($val->fk_parent ? $val->fk_parent : '-'.$val->fk_project); // If start with -, id is a project id
 
 		$tasks[$taskcursor]['task_id'] = $val->id;
-		$tasks[$taskcursor]['task_alternate_id'] = ($taskcursor + 1); // An id that has same order than position (requird by ganttchart)
+		$tasks[$taskcursor]['task_alternate_id'] = ($taskcursor + 1); // An id that has same order than position (required by ganttchart)
 		$tasks[$taskcursor]['task_project_id'] = $val->fk_project;
 		$tasks[$taskcursor]['task_parent'] = $idparent;
 
 		$tasks[$taskcursor]['task_is_group'] = 0;
-        $tasks[$taskcursor]['task_css'] = 'gtaskblue';
-        $tasks[$taskcursor]['task_position'] = $val->rang;
-        $tasks[$taskcursor]['task_planned_workload'] = $val->planned_workload;
+		$tasks[$taskcursor]['task_css'] = 'gtaskblue';
+		$tasks[$taskcursor]['task_position'] = $val->rang;
+		$tasks[$taskcursor]['task_planned_workload'] = $val->planned_workload;
 
-        if ($val->fk_parent != 0 && $task->hasChildren() > 0) {
-            $tasks[$taskcursor]['task_is_group'] = 1;
-        	$tasks[$taskcursor]['task_css'] = 'ggroupblack';
-            //$tasks[$taskcursor]['task_css'] = 'gtaskblue';
-        } elseif ($task->hasChildren() > 0) {
-            $tasks[$taskcursor]['task_is_group'] = 1;
-        	//$tasks[$taskcursor]['task_is_group'] = 0;
-            $tasks[$taskcursor]['task_css'] = 'ggroupblack';
-            //$tasks[$taskcursor]['task_css'] = 'gtaskblue';
-        }
+		if ($val->fk_parent != 0 && $task->hasChildren() > 0) {
+			$tasks[$taskcursor]['task_is_group'] = 1;
+			$tasks[$taskcursor]['task_css'] = 'ggroupblack';
+			//$tasks[$taskcursor]['task_css'] = 'gtaskblue';
+		} elseif ($task->hasChildren() > 0) {
+			$tasks[$taskcursor]['task_is_group'] = 1;
+			//$tasks[$taskcursor]['task_is_group'] = 0;
+			$tasks[$taskcursor]['task_css'] = 'ggroupblack';
+			//$tasks[$taskcursor]['task_css'] = 'gtaskblue';
+		}
 		$tasks[$taskcursor]['task_milestone'] = '0';
 		$tasks[$taskcursor]['task_percent_complete'] = $val->progress;
 		//$tasks[$taskcursor]['task_name']=$task->getNomUrl(1);
@@ -337,9 +337,9 @@ if (count($tasksarray) > 0)
 		//if ($s) $tasks[$taskcursor]['task_resources']='<a href="'.DOL_URL_ROOT.'/projet/tasks/contact.php?id='.$val->id.'&withproject=1" title="'.dol_escape_htmltag($s).'">'.$langs->trans("List").'</a>';
 		/* For JSGanttImproved */
 		//if ($s) $tasks[$taskcursor]['task_resources']=implode(',',$idofusers);
-        $tasks[$taskcursor]['task_resources'] = $s;
+		$tasks[$taskcursor]['task_resources'] = $s;
 		//print "xxx".$val->id.$tasks[$taskcursor]['task_resources'];
-        $tasks[$taskcursor]['note'] = $task->note_public;
+		$tasks[$taskcursor]['note'] = $task->note_public;
 		$taskcursor++;
 	}
 
@@ -361,30 +361,30 @@ if (count($tasksarray) > 0)
 
  	if (!empty($conf->use_javascript_ajax))
 	{
-	    //var_dump($_SESSION);
+		//var_dump($_SESSION);
 
 		// How the date for data are formated (format used bu jsgantt)
-	    $dateformatinput = 'yyyy-mm-dd';
-	    // How the date for data are formated (format used by dol_print_date)
-	    $dateformatinput2 = 'standard';
-	    //var_dump($dateformatinput);
+		$dateformatinput = 'yyyy-mm-dd';
+		// How the date for data are formated (format used by dol_print_date)
+		$dateformatinput2 = 'standard';
+		//var_dump($dateformatinput);
   		//var_dump($dateformatinput2);
 
-	    $moreforfilter = '<div class="liste_titre liste_titre_bydiv centpercent">';
+		$moreforfilter = '<div class="liste_titre liste_titre_bydiv centpercent">';
 
-	    $moreforfilter .= '<div class="divsearchfield">';
-	    //$moreforfilter .= $langs->trans("TasksAssignedTo").': ';
-	    //$moreforfilter .= $form->select_dolusers($tmpuser->id > 0 ? $tmpuser->id : '', 'search_user_id', 1);
-	    $moreforfilter .= '&nbsp;';
-	    $moreforfilter .= '</div>';
+		$moreforfilter .= '<div class="divsearchfield">';
+		//$moreforfilter .= $langs->trans("TasksAssignedTo").': ';
+		//$moreforfilter .= $form->select_dolusers($tmpuser->id > 0 ? $tmpuser->id : '', 'search_user_id', 1);
+		$moreforfilter .= '&nbsp;';
+		$moreforfilter .= '</div>';
 
-	    $moreforfilter .= '</div>';
+		$moreforfilter .= '</div>';
 
 		print $moreforfilter;
 
-	    print '<div class="div-table-responsive">';
+		print '<div class="div-table-responsive">';
 
-	    print '<div id="tabs" class="gantt" style="width: 80vw;">'."\n";
+		print '<div id="tabs" class="gantt" style="width: 80vw;">'."\n";
 		include_once DOL_DOCUMENT_ROOT.'/projet/ganttchart.inc.php';
 		print '</div>'."\n";
 
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 847d7b03d47..6c376fc35f3 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -68,7 +68,7 @@ if (empty($reshook)) {
 		$search_project_user = GETPOST('search_project_user', 'int');
 		$tabparam = array("MAIN_SEARCH_PROJECT_USER_PROJECTSINDEX" => $search_project_user);
 
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 		$result = dol_set_user_param($db, $conf, $user, $tabparam);
 	}
 }
@@ -106,7 +106,7 @@ $morehtml .= '<SELECT name="search_project_user">';
 $morehtml .= '<option name="all" value="0"'.($mine ? '' : ' selected').'>'.$titleall.'</option>';
 $morehtml .= '<option name="mine" value="'.$user->id.'"'.(($search_project_user == $user->id) ? ' selected' : '').'>'.$langs->trans("ProjectsImContactFor").'</option>';
 $morehtml .= '</SELECT>';
-$morehtml .= '<input type="submit" class="button" name="refresh" value="'.$langs->trans("Refresh").'">';
+$morehtml .= '<input type="submit" class="button smallpaddingimp" name="refresh" value="'.$langs->trans("Refresh").'">';
 $morehtml .= '</form>';
 
 if ($mine) $tooltiphelp = $langs->trans("MyProjectsDesc");
@@ -170,33 +170,33 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-    // Search project
-    if (!empty($conf->projet->enabled) && $user->rights->projet->lire)
-    {
-    	$listofsearchfields['search_project'] = array('text'=>'Project');
-    }
+	// Search project
+	if (!empty($conf->projet->enabled) && $user->rights->projet->lire)
+	{
+		$listofsearchfields['search_project'] = array('text'=>'Project');
+	}
 
-    if (count($listofsearchfields))
-    {
-    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-    	print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<div class="div-table-responsive-no-min">';
-    	print '<table class="noborder nohover centpercent">';
-    	$i = 0;
-    	foreach ($listofsearchfields as $key => $value)
-    	{
-    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    		print '<tr>';
-    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-    		print '</tr>';
-    		$i++;
-    	}
-    	print '</table>';
-        print '</div>';
-    	print '</form>';
-    	print '<br>';
-    }
+	if (count($listofsearchfields))
+	{
+		print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder nohover centpercent">';
+		$i = 0;
+		foreach ($listofsearchfields as $key => $value)
+		{
+			if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+			print '<tr>';
+			print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+			if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+			print '</tr>';
+			$i++;
+		}
+		print '</table>';
+		print '</div>';
+		print '</form>';
+		print '<br>';
+	}
 }
 
 
@@ -213,8 +213,12 @@ print_projecttasks_array($db, $form, $socid, $projectsListId, 0, 0, $listofoppst
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Latest modified projects
-$sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut as status, p.tms as datem,";
-$sql .= " s.rowid as socid, s.nom as name, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.canvas, s.status as thirdpartystatus";
+$sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut as status, p.tms as datem";
+$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+$sql .= ", s.code_client, s.code_compta, s.client";
+$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+$sql .= ", s.logo, s.email, s.entity";
+$sql .= ", s.canvas, s.status as thirdpartystatus";
 $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
 $sql .= " WHERE p.entity IN (".getEntity('project').")";
@@ -226,16 +230,17 @@ $sql .= $db->plimit($max, 0);
 $resql = $db->query($sql);
 if ($resql)
 {
-    print '<div class="div-table-responsive-no-min">';
+	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
-	print '<th colspan="4">'.$langs->trans("LatestModifiedProjects", $max).'</th></tr>';
+	print '<th colspan="4">'.$langs->trans("LatestModifiedProjects", $max).'</th>';
+	print '</tr>';
 
 	$num = $db->num_rows($resql);
+
 	if ($num)
 	{
 		$i = 0;
-		$var = true;
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($resql);
@@ -253,11 +258,16 @@ if ($resql)
 
 			$companystatic->id = $obj->socid;
 			$companystatic->name = $obj->name;
-			$companystatic->email = $obj->email;
+			//$companystatic->name_alias = $obj->name_alias;
+			//$companystatic->code_client = $obj->code_client;
+			$companystatic->code_compta = $obj->code_compta;
 			$companystatic->client = $obj->client;
+			//$companystatic->code_fournisseur = $obj->code_fournisseur;
+			$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
 			$companystatic->fournisseur = $obj->fournisseur;
-			$companystatic->code_client = $obj->code_client;
-			$companystatic->code_fournisseur = $obj->code_fournisseur;
+			$companystatic->logo = $obj->logo;
+			$companystatic->email = $obj->email;
+			$companystatic->entity = $obj->entity;
 			$companystatic->canvas = $obj->canvas;
 			$companystatic->status = $obj->thirdpartystatus;
 
@@ -290,24 +300,22 @@ if ($resql)
 			print '</tr>';
 			$i++;
 		}
+	} else {
+		print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 	}
-	print "</table></div><br>";
+	print "</table></div>";
 } else dol_print_error($db);
 
 
 $companystatic = new Societe($db); // We need a clean new object for next loop because current one has some properties set.
 
 
-// Open project per thirdparty
-print '<div class="div-table-responsive-no-min">';
-print '<table class="noborder centpercent">';
-print '<tr class="liste_titre">';
-print_liste_field_titre("OpenedProjectsByThirdparties", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder);
-print_liste_field_titre("NbOfProjects", $_SERVER["PHP_SELF"], "nb", "", "", '', $sortfield, $sortorder, 'right ');
-print "</tr>\n";
-
 $sql = "SELECT COUNT(p.rowid) as nb, SUM(p.opp_amount)";
-$sql .= ", s.rowid as socid, s.nom as name, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.canvas, s.status";
+$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+$sql .= ", s.code_client, s.code_compta, s.client";
+$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+$sql .= ", s.logo, s.email, s.entity";
+$sql .= ", s.canvas, s.status";
 $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
 $sql .= " WHERE p.entity IN (".getEntity('project').")";
@@ -325,6 +333,18 @@ if ($resql)
 	$i = 0;
 	$othernb = 0;
 
+	if ($num) {
+		print '<br>';
+
+		// Open project per thirdparty
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print_liste_field_titre("OpenedProjectsByThirdparties", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder);
+		print_liste_field_titre("NbOfProjects", $_SERVER["PHP_SELF"], "nb", "", "", '', $sortfield, $sortorder, 'right ');
+		print "</tr>\n";
+	}
+
 	while ($i < $num)
 	{
 		$obj = $db->fetch_object($resql);
@@ -341,9 +361,17 @@ if ($resql)
 		{
 			$companystatic->id = $obj->socid;
 			$companystatic->name = $obj->name;
-			$companystatic->email = $obj->email;
+			$companystatic->name_alias = $obj->name_alias;
+			$companystatic->code_client = $obj->code_client;
+			$companystatic->code_compta = $obj->code_compta;
 			$companystatic->client = $obj->client;
+			$companystatic->code_fournisseur = $obj->code_fournisseur;
+			$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
 			$companystatic->fournisseur = $obj->fournisseur;
+			$companystatic->logo = $obj->logo;
+			$companystatic->email = $obj->email;
+			$companystatic->entity = $obj->entity;
+			$companystatic->canvas = $obj->canvas;
 			$companystatic->status = $obj->status;
 
 			print $companystatic->getNomUrl(1);
@@ -370,21 +398,24 @@ if ($resql)
 		print "</tr>\n";
 	}
 
+	if ($num) {
+		print "</table>";
+		print '</div>';
+	}
+
 	$db->free($resql);
 } else {
 	dol_print_error($db);
 }
-print "</table>";
-print '</div>';
 
 if (empty($conf->global->PROJECT_HIDE_PROJECT_LIST_ON_PROJECT_AREA))
 {
-    // This list can be very long, so we allow to hide it to prefer to use the list page.
-    // Add constant PROJECT_HIDE_PROJECT_LIST_ON_PROJECT_AREA to hide this list
+	// This list can be very long, so we allow to hide it to prefer to use the list page.
+	// Add constant PROJECT_HIDE_PROJECT_LIST_ON_PROJECT_AREA to hide this list
 
-    print '<br>';
+	print '<br>';
 
-    print_projecttasks_array($db, $form, $socid, $projectsListId, 0, 1, $listofoppstatus, array());
+	print_projecttasks_array($db, $form, $socid, $projectsListId, 0, 1, $listofoppstatus, array());
 }
 
 print '</div></div></div>';
diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index b3cebaad913..5b408717f40 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -37,8 +37,8 @@ $socid  = GETPOST('socid', 'int');
 $action = GETPOST('action', 'aZ09');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", "alpha");
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST("sortfield", "aZ09comma");
+$sortorder = GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $page = is_numeric($page) ? $page : 0;
 $page = $page == -1 ? 0 : $page;
@@ -93,10 +93,10 @@ $object = new Project($db);
 
 if ($id > 0 || !empty($ref))
 {
-    $object->fetch($id, $ref);
-    $object->fetch_thirdparty();
+	$object->fetch($id, $ref);
+	$object->fetch_thirdparty();
 	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
-    $object->info($object->id);
+	$object->info($object->id);
 }
 
 $title = $langs->trans("Project").' - '.$object->ref.' '.$object->name;
@@ -106,7 +106,7 @@ llxHeader("", $title, $help_url);
 
 $head = project_prepare_head($object);
 
-dol_fiche_head($head, 'agenda', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));
+print dol_get_fiche_head($head, 'agenda', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));
 
 
 // Project card
@@ -119,15 +119,15 @@ $morehtmlref .= $object->title;
 // Thirdparty
 if ($object->thirdparty->id > 0)
 {
-    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
+	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
 }
 $morehtmlref .= '</div>';
 
 // Define a complementary filter for search of next/prev ref.
 if (!$user->rights->projet->all->lire)
 {
-    $objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
-    $object->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+	$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
+	$object->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 }
 
 dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -142,7 +142,7 @@ print '</div>';
 
 print '<div class="clearboth"></div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Actions buttons
@@ -151,7 +151,7 @@ $out = '';
 $permok = $user->rights->agenda->myactions->create;
 if ($permok)
 {
-    $out .= '&projectid='.$object->id;
+	$out .= '&projectid='.$object->id;
 }
 
 
@@ -159,8 +159,8 @@ if ($permok)
 $morehtmlcenter = '';
 if (!empty($conf->agenda->enabled))
 {
-    $addActionBtnRight = !empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create);
-    $morehtmlcenter .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', $addActionBtnRight);
+	$addActionBtnRight = !empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create);
+	$morehtmlcenter .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', $addActionBtnRight);
 }
 
 //print '</div>';
@@ -170,15 +170,15 @@ if (!empty($object->id))
 	print '<br>';
 
 	$param = '&id='.$object->id;
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
-    print_barre_liste($langs->trans("ActionsOnProject"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlcenter, '', 0, 1, 1);
+	print_barre_liste($langs->trans("ActionsOnProject"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlcenter, '', 0, 1, 1);
 
-    // List of all actions
-    $filters = array();
-    $filters['search_agenda_label'] = $search_agenda_label;
-    show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
+	// List of all actions
+	$filters = array();
+	$filters['search_agenda_label'] = $search_agenda_label;
+	show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
 }
 
 // End of page
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index a2eb2d1938c..5635fafa7bb 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2015 	   Claudio Aschieri     <c.aschieri@19.coop>
  * Copyright (C) 2018 	   Ferran Marcet	    <fmarcet@2byte.es>
  * Copyright (C) 2019 	   Juanjo Menent	    <jmenent@2byte.es>
- * Copyright (C) 2020		Tobias Sean			<tobias.sekan@startmail.com>
+ * Copyright (C) 2020	   Tobias Sean			<tobias.sekan@startmail.com>
  *
  * 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
@@ -67,8 +67,8 @@ if (!$user->rights->projet->lire) accessforbidden();
 $diroutputmassaction = $conf->projet->dir_output.'/temp/massgeneration/'.$user->id;
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", "alpha");
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST("sortfield", "aZ09comma");
+$sortorder = GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $page = is_numeric($page) ? $page : 0;
 $page = $page == -1 ? 0 : $page;
@@ -109,7 +109,7 @@ if ($search_status == '') $search_status = -1; // -1 or 1
 
 if (!empty($conf->categorie->enabled))
 {
-	$search_category_array = GETPOST("search_category_".Categorie::TYPE_PROJECT."_array", "array");
+	$search_category_array = GETPOST("search_category_".Categorie::TYPE_PROJECT."_list", "array");
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -144,15 +144,7 @@ $fieldstosearchall['s.nom'] = "ThirdPartyName";
 $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
-	if (empty($val['visible'])) {
-		continue;
-	}
-
-	$arrayfields['p.'.$key] = array(
-		'label'=>$val['label'],
-		'checked'=>(($val['visible'] < 0) ? 0 : 1),
-		'enabled'=>($val['enabled'] && ($val['visible'] != 3)),
-		'position'=>$val['position']);
+	if (!empty($val['visible'])) $arrayfields['p.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>($val['enabled'] && ($val['visible'] != 3)), 'position'=>$val['position']);
 }
 
 // Add none object fields to fields for list
@@ -165,8 +157,14 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
 	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
+		if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
+			$arrayfields["ef.".$key] = array(
+				'label'=>$extrafields->attributes[$object->table_element]['label'][$key],
+				'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1),
+				'position'=>$extrafields->attributes[$object->table_element]['pos'][$key],
+				'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key])
+			);
+		}
 	}
 }
 
@@ -228,47 +226,47 @@ if (empty($reshook))
 	$uploaddir = $conf->projet->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
-    // Close records
-    if (!$error && $massaction == 'close' && $user->rights->projet->creer)
-    {
-        $db->begin();
+	// Close records
+	if (!$error && $massaction == 'close' && $user->rights->projet->creer)
+	{
+		$db->begin();
 
-        $objecttmp = new $objectclass($db);
-        $nbok = 0;
-        foreach ($toselect as $toselectid)
-        {
-            $result = $objecttmp->fetch($toselectid);
-            if ($result > 0)
-            {
-                $userWrite  = $object->restrictedProjectArea($user, 'write');
-                if ($userWrite > 0 && $objecttmp->statut == 1) {
-                    $result = $objecttmp->setClose($user);
-                    if ($result <= 0) {
-                        setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-                        $error++;
-                        break;
-                    } else $nbok++;
-                } elseif ($userWrite <= 0) {
-                    setEventMessages($langs->trans("DontHavePermissionForCloseProject", $objecttmp->ref), null, 'warnings');
-                } else {
-                    setEventMessages($langs->trans("DontHaveTheValidateStatus", $objecttmp->ref), null, 'warnings');
-                }
-            } else {
-                setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-                $error++;
-                break;
-            }
-        }
+		$objecttmp = new $objectclass($db);
+		$nbok = 0;
+		foreach ($toselect as $toselectid)
+		{
+			$result = $objecttmp->fetch($toselectid);
+			if ($result > 0)
+			{
+				$userWrite = $object->restrictedProjectArea($user, 'write');
+				if ($userWrite > 0 && $objecttmp->statut == 1) {
+					$result = $objecttmp->setClose($user);
+					if ($result <= 0) {
+						setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+						$error++;
+						break;
+					} else $nbok++;
+				} elseif ($userWrite <= 0) {
+					setEventMessages($langs->trans("DontHavePermissionForCloseProject", $objecttmp->ref), null, 'warnings');
+				} else {
+					setEventMessages($langs->trans("DontHaveTheValidateStatus", $objecttmp->ref), null, 'warnings');
+				}
+			} else {
+				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+				$error++;
+				break;
+			}
+		}
 
-        if (!$error)
-        {
-            if ($nbok > 1) setEventMessages($langs->trans("RecordsClosed", $nbok), null, 'mesgs');
-            else setEventMessages($langs->trans("RecordsClosed", $nbok), null, 'mesgs');
-            $db->commit();
-        } else {
-            $db->rollback();
-        }
-    }
+		if (!$error)
+		{
+			if ($nbok > 1) setEventMessages($langs->trans("RecordsClosed", $nbok), null, 'mesgs');
+			else setEventMessages($langs->trans("RecordsClosed", $nbok), null, 'mesgs');
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
+	}
 }
 
 
@@ -284,7 +282,7 @@ $formproject = new FormProjets($db);
 $title = $langs->trans("Projects");
 
 
-// Get list of project id allowed to user (in a string list separated by coma)
+// Get list of project id allowed to user (in a string list separated by comma)
 $projectsListId = '';
 if (!$user->rights->projet->all->lire) $projectsListId = $object->getProjectsAuthorizedForUser($user, 0, 1, $socid);
 
@@ -386,7 +384,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller than paging size (filtering), goto and load page 0
 	{
 		$page = 0;
 		$offset = 0;
@@ -419,36 +417,37 @@ $help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
 llxHeader("", $title, $help_url);
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
-if ($search_all != '') 			$param .= '&search_all='.$search_all;
-if ($search_sday)              		    $param .= '&search_sday='.$search_sday;
-if ($search_smonth)              		$param .= '&search_smonth='.$search_smonth;
-if ($search_syear)               		$param .= '&search_syear='.$search_syear;
-if ($search_eday)               		$param .= '&search_eday='.$search_eday;
-if ($search_emonth)              		$param .= '&search_emonth='.$search_emonth;
-if ($search_eyear)               		$param .= '&search_eyear='.$search_eyear;
-if ($socid)				        $param .= '&socid='.$socid;
-if ($search_ref != '') 			$param .= '&search_ref='.$search_ref;
-if ($search_label != '') 		$param .= '&search_label='.$search_label;
-if ($search_societe != '') 		$param .= '&search_societe='.$search_societe;
-if ($search_status >= 0) 		$param .= '&search_status='.$search_status;
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+if ($search_all != '') 			$param .= '&search_all='.urlencode($search_all);
+if ($search_sday)              		    $param .= '&search_sday='.urlencode($search_sday);
+if ($search_smonth)              		$param .= '&search_smonth='.urlencode($search_smonth);
+if ($search_syear)               		$param .= '&search_syear='.urlencode($search_syear);
+if ($search_eday)               		$param .= '&search_eday='.urlencode($search_eday);
+if ($search_emonth)              		$param .= '&search_emonth='.urlencode($search_emonth);
+if ($search_eyear)               		$param .= '&search_eyear='.urlencode($search_eyear);
+if ($socid)				        $param .= '&socid='.urlencode($socid);
+if ($search_categ)              $param .= '&search_categ='.urlencode($search_categ);
+if ($search_ref != '') 			$param .= '&search_ref='.urlencode($search_ref);
+if ($search_label != '') 		$param .= '&search_label='.urlencode($search_label);
+if ($search_societe != '') 		$param .= '&search_societe='.urlencode($search_societe);
+if ($search_status >= 0) 		$param .= '&search_status='.urlencode($search_status);
 if ((is_numeric($search_opp_status) && $search_opp_status >= 0) || in_array($search_opp_status, array('all', 'openedopp', 'notopenedopp', 'none'))) 	    $param .= '&search_opp_status='.urlencode($search_opp_status);
 if ($search_opp_percent != '') 	$param .= '&search_opp_percent='.urlencode($search_opp_percent);
-if ($search_public != '') 		$param .= '&search_public='.$search_public;
-if ($search_project_user != '')   $param .= '&search_project_user='.$search_project_user;
-if ($search_sale > 0)    		$param .= '&search_sale='.$search_sale;
-if ($search_opp_amount != '')    $param .= '&search_opp_amount='.$search_opp_amount;
-if ($search_budget_amount != '') $param .= '&search_budget_amount='.$search_budget_amount;
-if ($optioncss != '') $param .= '&optioncss='.$optioncss;
+if ($search_public != '') 		$param .= '&search_public='.urlencode($search_public);
+if ($search_project_user != '')   $param .= '&search_project_user='.urlencode($search_project_user);
+if ($search_sale > 0)    		$param .= '&search_sale='.urlencode($search_sale);
+if ($search_opp_amount != '')    $param .= '&search_opp_amount='.urlencode($search_opp_amount);
+if ($search_budget_amount != '') $param .= '&search_budget_amount='.urlencode($search_budget_amount);
+if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 // List of mass actions available
 $arrayofmassactions = array(
 	'generate_doc'=>$langs->trans("ReGeneratePDF"),
-    //'builddoc'=>$langs->trans("PDFMerge"),
-    //'presend'=>$langs->trans("SendByMail"),
+	//'builddoc'=>$langs->trans("PDFMerge"),
+	//'presend'=>$langs->trans("SendByMail"),
 );
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
 if ($user->rights->projet->creer) $arrayofmassactions['close'] = $langs->trans("Close");
@@ -474,8 +473,8 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 $texthelp = '';
 if ($search_project_user == $user->id) $texthelp .= $langs->trans("MyProjectsDesc");
 else {
-    if ($user->rights->projet->all->lire && !$socid) $texthelp .= $langs->trans("ProjectsDesc");
-    else $texthelp .= $langs->trans("ProjectsPublicDesc");
+	if ($user->rights->projet->all->lire && !$socid) $texthelp .= $langs->trans("ProjectsDesc");
+	else $texthelp .= $langs->trans("ProjectsPublicDesc");
 }
 
 print_barre_liste($form->textwithpicto($title, $texthelp), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'project', 0, $newcardbutton, '', $limit, 0, 0, 1);
@@ -484,7 +483,7 @@ print_barre_liste($form->textwithpicto($title, $texthelp), $page, $_SERVER["PHP_
 $topicmail = "Information";
 $modelmail = "project";
 $objecttmp = new Project($db);
-$trackid = 'prj'.$object->id;
+$trackid = 'proj'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($search_all)
@@ -496,7 +495,7 @@ if ($search_all)
 $moreforfilter = '';
 
 // Filter on categories
-if (!empty($conf->categorie->enabled))
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 {
 	$formcategory = new FormCategory($db);
 	$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PROJECT, $search_category_array);
@@ -505,7 +504,8 @@ if (!empty($conf->categorie->enabled))
 // If the user can view user other than himself
 $moreforfilter .= '<div class="divsearchfield">';
 $moreforfilter .= $langs->trans('ProjectsWithThisUserAsContact').': ';
-$includeonly = 'hierarchyme';
+//$includeonly = 'hierarchyme';
+$includeonly = '';
 if (empty($user->rights->user->user->lire)) $includeonly = array($user->id);
 $moreforfilter .= $form->select_dolusers($search_project_user ? $search_project_user : '', 'search_project_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth200');
 $moreforfilter .= '</div>';
@@ -616,8 +616,8 @@ if (!empty($arrayfields['p.opp_percent']['checked']))
 }
 if (!empty($arrayfields['opp_weighted_amount']['checked']))
 {
-    print '<td class="liste_titre nowrap right">';
-    print '</td>';
+	print '<td class="liste_titre nowrap right">';
+	print '</td>';
 }
 if (!empty($arrayfields['p.budget_amount']['checked']))
 {
@@ -711,8 +711,8 @@ print "</tr>\n";
 
 $i = 0;
 $totalarray = array(
-    'nbfield' => 0,
-    'val' => array(),
+	'nbfield' => 0,
+	'val' => array(),
 );
 while ($i < min($num, $limit))
 {
@@ -732,9 +732,9 @@ while ($i < min($num, $limit))
 	$userAccess = $object->restrictedProjectArea($user); // why this ?
 	if ($userAccess >= 0)
 	{
-	    $socstatic->id = $obj->socid;
-	    $socstatic->name = $obj->name;
-	    $socstatic->email = $obj->email;
+		$socstatic->id = $obj->socid;
+		$socstatic->name = $obj->name;
+		$socstatic->email = $obj->email;
 
 		print '<tr class="oddeven">';
 
@@ -794,8 +794,8 @@ while ($i < min($num, $limit))
 						$userstatic->statut = $val['statut'];
 						$userstatic->entity = $val['entity'];
 						$userstatic->photo = $val['photo'];
-						//print $userstatic->getNomUrl(1, '', 0, 0, 12);
-						print $userstatic->getNomUrl(-2);
+						print $userstatic->getNomUrl(1, '', 0, 0, 12);
+						//print $userstatic->getNomUrl(-2);
 						$j++;
 						if ($j < $nbofsalesrepresentative) print ' ';
 					}
@@ -862,19 +862,19 @@ while ($i < min($num, $limit))
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
-        // Opp weighted amount
-        if (!empty($arrayfields['opp_weighted_amount']['checked']))
-        {
-            if (!isset($totalarray['val']['opp_weighted_amount']))  $totalarray['val']['opp_weighted_amount'] = 0;
-            print '<td align="right">';
-            if ($obj->opp_weighted_amount) {
-                print price($obj->opp_weighted_amount, 1, $langs, 1, -1, -1, '');
-                $totalarray['val']['opp_weighted_amount'] += $obj->opp_weighted_amount;
-            }
-            print '</td>';
-            if (!$i) $totalarray['nbfield']++;
-            if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'opp_weighted_amount';
-        }
+		// Opp weighted amount
+		if (!empty($arrayfields['opp_weighted_amount']['checked']))
+		{
+			if (!isset($totalarray['val']['opp_weighted_amount']))  $totalarray['val']['opp_weighted_amount'] = 0;
+			print '<td align="right">';
+			if ($obj->opp_weighted_amount) {
+				print price($obj->opp_weighted_amount, 1, $langs, 1, -1, -1, '');
+				$totalarray['val']['opp_weighted_amount'] += $obj->opp_weighted_amount;
+			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'opp_weighted_amount';
+		}
 		// Budget
 		if (!empty($arrayfields['p.budget_amount']['checked']))
 		{
diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php
index b643c248938..65172311441 100644
--- a/htdocs/projet/note.php
+++ b/htdocs/projet/note.php
@@ -79,7 +79,7 @@ if ($id > 0 || !empty($ref))
 	//print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
 
 	$head = project_prepare_head($object);
-	dol_fiche_head($head, 'notes', $langs->trans('Project'), -1, ($object->public ? 'projectpub' : 'project'));
+	print dol_get_fiche_head($head, 'notes', $langs->trans('Project'), -1, ($object->public ? 'projectpub' : 'project'));
 
 
 	// Project card
@@ -92,15 +92,15 @@ if ($id > 0 || !empty($ref))
 	// Thirdparty
 	if ($object->thirdparty->id > 0)
 	{
-	    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
 	}
 	$morehtmlref .= '</div>';
 
 	// Define a complementary filter for search of next/prev ref.
 	if (!$user->rights->projet->all->lire)
 	{
-	    $objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
-	    $object->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+		$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
+		$object->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 	}
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -116,7 +116,7 @@ if ($id > 0 || !empty($ref))
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php
index 6d56b2088e9..add142f1f57 100644
--- a/htdocs/projet/stats/index.php
+++ b/htdocs/projet/stats/index.php
@@ -268,7 +268,7 @@ $h++;
 
 complete_head_from_modules($conf, $langs, null, $head, $h, $type);
 
-dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1, '');
+print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1, '');
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 522468257e0..ba1840c4101 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -106,7 +106,7 @@ $arrayfields = array(
 	't.label'=>array('label'=>$langs->trans("LabelTask"), 'checked'=>1, 'position'=>2),
 	't.description'=>array('label'=>$langs->trans("Description"), 'checked'=>0, 'position'=>3),
 	't.dateo'=>array('label'=>$langs->trans("DateStart"), 'checked'=>1, 'position'=>4),
-	't.datee'=>array('label'=>$langs->trans("DateEnd"), 'checked'=>1, 'position'=>5),
+	't.datee'=>array('label'=>$langs->trans("Deadline"), 'checked'=>1, 'position'=>5),
 	't.planned_workload'=>array('label'=>$langs->trans("PlannedWorkload"), 'checked'=>1, 'position'=>6),
 	't.duration_effective'=>array('label'=>$langs->trans("TimeSpent"), 'checked'=>1, 'position'=>7),
 	't.progress_calculated'=>array('label'=>$langs->trans("ProgressCalculated"), 'checked'=>1, 'position'=>8),
@@ -220,8 +220,8 @@ if ($action == 'createtask' && $user->rights->projet->creer)
 	// If we use user timezone, we must change also view/list to use user timezone everywhere
 	//$date_start = dol_mktime($_POST['dateohour'],$_POST['dateomin'],0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear'],'user');
 	//$date_end = dol_mktime($_POST['dateehour'],$_POST['dateemin'],0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear'],'user');
-	$date_start = dol_mktime($_POST['dateohour'], $_POST['dateomin'], 0, $_POST['dateomonth'], $_POST['dateoday'], $_POST['dateoyear']);
-	$date_end = dol_mktime($_POST['dateehour'], $_POST['dateemin'], 0, $_POST['dateemonth'], $_POST['dateeday'], $_POST['dateeyear']);
+	$date_start = dol_mktime(GETPOST('dateohour', 'int'), GETPOST('dateomin', 'int'), 0, GETPOST('dateomonth', 'int'), GETPOST('dateoday', 'int'), GETPOST('dateoyear', 'int'));
+	$date_end = dol_mktime(GETPOST('dateehour', 'int'), GETPOST('dateemin', 'int'), 0, GETPOST('dateemonth', 'int'), GETPOST('dateeday', 'int'), GETPOST('dateeyear', 'int'));
 
 	if (!$cancel)
 	{
@@ -245,7 +245,7 @@ if ($action == 'createtask' && $user->rights->projet->creer)
 
 		if (!$error)
 		{
-			$tmparray = explode('_', $_POST['task_parent']);
+			$tmparray = explode('_', GETPOST('task_parent'));
 			$projectid = $tmparray[0];
 			if (empty($projectid)) $projectid = $id; // If projectid is ''
 			$task_parent = $tmparray[1];
@@ -329,6 +329,7 @@ $userstatic = new User($db);
 $title = $langs->trans("Project").' - '.$langs->trans("Tasks").' - '.$object->ref.' '.$object->name;
 if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->ref.' '.$object->name.' - '.$langs->trans("Tasks");
 $help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
+
 llxHeader("", $title, $help_url);
 
 
@@ -345,10 +346,10 @@ if ($id > 0 || !empty($ref))
 	//print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
 
 
-	$tab = GETPOST('tab') ?GETPOST('tab') : 'tasks';
+	$tab = (GETPOSTISSET('tab') ? GETPOST('tab') : 'tasks');
 
 	$head = project_prepare_head($object);
-	dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));
+	print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));
 
 	$param = '&id='.$object->id;
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
@@ -482,7 +483,7 @@ if ($id > 0 || !empty($ref))
 	print '<div class="clearboth"></div>';
 
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 
@@ -492,114 +493,120 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 
 	print load_fiche_titre($langs->trans("NewTask"), '', 'projecttask');
 
-	if ($object->statut == Project::STATUS_CLOSED)
-	{
+	if ($object->id > 0 && $object->statut == Project::STATUS_CLOSED) {
 		print '<div class="warning">';
 		$langs->load("errors");
 		print $langs->trans("WarningProjectClosed");
 		print '</div>';
-	} else {
-		print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="action" value="createtask">';
-		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-		if (!empty($object->id)) print '<input type="hidden" name="id" value="'.$object->id.'">';
-
-		dol_fiche_head('');
-
-		print '<table class="border centpercent">';
-
-		$defaultref = '';
-		$obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
-		if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php"))
-		{
-			require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
-			$modTask = new $obj;
-			$defaultref = $modTask->getNextValue($object->thirdparty, null);
-		}
-
-		if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
-
-		// Ref
-		print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Ref").'</span></td><td>';
-		if (empty($duplicate_code_error))
-		{
-			print (GETPOSTISSET("ref") ?GETPOST("ref", 'alpha') : $defaultref);
-		} else {
-			print $defaultref;
-		}
-		print '<input type="hidden" name="taskref" value="'.($_POST["ref"] ? $_POST["ref"] : $defaultref).'">';
-		print '</td></tr>';
-
-		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>';
-		print '<input type="text" name="label" autofocus class="minwidth500" value="'.$label.'">';
-		print '</td></tr>';
-
-		// List of projects
-		print '<tr><td class="fieldrequired">'.$langs->trans("ChildOfProjectTask").'</td><td>';
-		print $formother->selectProjectTasks(GETPOST('task_parent'), $projectid ? $projectid : $object->id, 'task_parent', 0, 0, 1, 1, 0, '0,1', 'maxwidth500');
-		print '</td></tr>';
-
-		print '<tr><td>'.$langs->trans("AffectedTo").'</td><td>';
-		$contactsofproject = (!empty($object->id) ? $object->getListContactId('internal') : '');
-		if (is_array($contactsofproject) && count($contactsofproject))
-		{
-			print $form->select_dolusers($user->id, 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, '', 'maxwidth300');
-		} else {
-			print $langs->trans("NoUserAssignedToTheProject");
-		}
-		print '</td></tr>';
-
-		// Date start
-		print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
-		print $form->selectDate(($date_start ? $date_start : ''), 'dateo', 1, 1, 0, '', 1, 1);
-		print '</td></tr>';
-
-		// Date end
-		print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
-		print $form->selectDate(($date_end ? $date_end : -1), 'datee', -1, 1, 0, '', 1, 1);
-		print '</td></tr>';
-
-		// Planned workload
-		print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td>';
-		print $form->select_duration('planned_workload', $planned_workload ? $planned_workload : 0, 0, 'text');
-		print '</td></tr>';
-
-		// Progress
-		print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td colspan="3">';
-		print $formother->select_percent($progress, 'progress', 0, 5, 0, 100, 1);
-		print '</td></tr>';
-
-		// Description
-		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
-		print '<td>';
-		print '<textarea name="description" class="quatrevingtpercent" rows="'.ROWS_4.'">'.$description.'</textarea>';
-		print '</td></tr>';
-
-		// Other options
-		$parameters = array();
-		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $taskstatic, $action); // Note that $action and $object may have been modified by hook
-		print $hookmanager->resPrint;
-
-		if (empty($reshook) && !empty($extrafields->attributes[$taskstatic->table_element]['label']))
-		{
-			print $taskstatic->showOptionals($extrafields, 'edit'); // Do not use $object here that is object of project but use $taskstatic
-		}
-
-		print '</table>';
-
-		dol_fiche_end();
-
-		print '<div class="center">';
-		print '<input type="submit" class="button" name="add" value="'.$langs->trans("Add").'">';
-		print ' &nbsp; &nbsp; ';
-		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-		print '</div>';
-
-		print '</form>';
 	}
-} elseif ($id > 0 || !empty($ref))
-{
+
+	if ($object->id > 0 && $object->statut == Project::STATUS_DRAFT) {
+		print '<div class="warning">';
+		$langs->load("errors");
+		print $langs->trans("WarningProjectDraft");
+		print '</div>';
+	}
+
+	print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="createtask">';
+	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	if (!empty($object->id)) print '<input type="hidden" name="id" value="'.$object->id.'">';
+
+	print dol_get_fiche_head('');
+
+	print '<table class="border centpercent">';
+
+	$defaultref = '';
+	$obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
+	if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php"))
+	{
+		require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
+		$modTask = new $obj;
+		$defaultref = $modTask->getNextValue($object->thirdparty, null);
+	}
+
+	if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
+
+	// Ref
+	print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Ref").'</span></td><td>';
+	if (empty($duplicate_code_error))
+	{
+		print (GETPOSTISSET("ref") ? GETPOST("ref", 'alpha') : $defaultref);
+	} else {
+		print $defaultref;
+	}
+	print '<input type="hidden" name="taskref" value="'.(GETPOSTISSET("ref") ? GETPOST("ref", 'alpha') : $defaultref).'">';
+	print '</td></tr>';
+
+	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>';
+	print '<input type="text" name="label" autofocus class="minwidth500 maxwidthonsmartphone" value="'.$label.'">';
+	print '</td></tr>';
+
+	// List of projects
+	print '<tr><td class="fieldrequired">'.$langs->trans("ChildOfProjectTask").'</td><td>';
+	print img_picto('', 'project');
+	$formother->selectProjectTasks(GETPOST('task_parent'), $projectid ? $projectid : $object->id, 'task_parent', 0, 0, 1, 1, 0, '0,1', 'maxwidth500');
+	print '</td></tr>';
+
+	print '<tr><td>'.$langs->trans("AffectedTo").'</td><td>';
+	$contactsofproject = (!empty($object->id) ? $object->getListContactId('internal') : '');
+	if (is_array($contactsofproject) && count($contactsofproject))
+	{
+		print $form->select_dolusers($user->id, 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, '', 'maxwidth300');
+	} else {
+		print $langs->trans("NoUserAssignedToTheProject");
+	}
+	print '</td></tr>';
+
+	// Date start
+	print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
+	print $form->selectDate(($date_start ? $date_start : ''), 'dateo', 1, 1, 0, '', 1, 1);
+	print '</td></tr>';
+
+	// Date end
+	print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
+	print $form->selectDate(($date_end ? $date_end : -1), 'datee', -1, 1, 0, '', 1, 1);
+	print '</td></tr>';
+
+	// Planned workload
+	print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td>';
+	print $form->select_duration('planned_workload', $planned_workload ? $planned_workload : 0, 0, 'text');
+	print '</td></tr>';
+
+	// Progress
+	print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td colspan="3">';
+	print $formother->select_percent($progress, 'progress', 0, 5, 0, 100, 1);
+	print '</td></tr>';
+
+	// Description
+	print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
+	print '<td>';
+	print '<textarea name="description" class="quatrevingtpercent" rows="'.ROWS_4.'">'.$description.'</textarea>';
+	print '</td></tr>';
+
+	// Other options
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $taskstatic, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
+	if (empty($reshook) && !empty($extrafields->attributes[$taskstatic->table_element]['label']))
+	{
+		print $taskstatic->showOptionals($extrafields, 'edit'); // Do not use $object here that is object of project but use $taskstatic
+	}
+
+	print '</table>';
+
+	print dol_get_fiche_end();
+
+	print '<div class="center">';
+	print '<input type="submit" class="button" name="add" value="'.$langs->trans("Add").'">';
+	print ' &nbsp; &nbsp; ';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
+
+	print '</form>';
+} elseif ($id > 0 || !empty($ref)) {
 	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
 	/*
@@ -632,16 +639,17 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 	$title = $langs->trans("ListOfTasks");
-	$linktotasks = dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-list-alt paddingleft imgforviewmode', DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id, '', 1, array('morecss'=>'reposition btnTitleSelected'));
-	$linktotasks .= dolGetButtonTitle($langs->trans('ViewGantt'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/projet/ganttview.php?id='.$object->id.'&withproject=1', '', 1, array('morecss'=>'reposition marginleftonly'));
+	$linktotasks = dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id, '', 1, array('morecss'=>'reposition btnTitleSelected'));
+	$linktotasks .= dolGetButtonTitle($langs->trans('ViewGantt'), '', 'fa fa-stream imgforviewmode', DOL_URL_ROOT.'/projet/ganttview.php?id='.$object->id.'&withproject=1', '', 1, array('morecss'=>'reposition marginleftonly'));
 
 	//print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'generic', 0, '', '', 0, 1);
-	print load_fiche_titre($title, $linktotasks.' &nbsp; '.$linktocreatetask, 'generic');
+	print load_fiche_titre($title, $linktotasks.' &nbsp; '.$linktocreatetask, 'projecttask');
 
 	// 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, $extrafields, 1, $search_array_options);
+
 	// We load also tasks limited to a particular user
 	$tmpuser = new User($db);
 	if ($search_user_id > 0) $tmpuser->fetch($search_user_id);
@@ -697,16 +705,16 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 
 	if (!empty($arrayfields['t.dateo']['checked'])) {
 		print '<td class="liste_titre center">';
-		print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_dtstartday" value="'.$search_dtstartday.'">';
-		print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_dtstartmonth" value="'.$search_dtstartmonth.'">';
+		print '<span class="nowraponall"><input class="flat valignmiddle width20" type="text" maxlength="2" name="search_dtstartday" value="'.$search_dtstartday.'">';
+		print '<input class="flat valignmiddle width20" type="text" maxlength="2" name="search_dtstartmonth" value="'.$search_dtstartmonth.'"></span>';
 		$formother->select_year($search_dtstartyear ? $search_dtstartyear : -1, 'search_dtstartyear', 1, 20, 5);
 		print '</td>';
 	}
 
 	if (!empty($arrayfields['t.datee']['checked'])) {
 		print '<td class="liste_titre center">';
-		print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_dtendday" value="'.$search_dtendday.'">';
-		print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_dtendmonth" value="'.$search_dtendmonth.'">';
+		print '<span class="nowraponall"><input class="flat valignmiddle width20" type="text" maxlength="2" name="search_dtendday" value="'.$search_dtendday.'">';
+		print '<input class="flat valignmiddle width20" type="text" maxlength="2" name="search_dtendmonth" value="'.$search_dtendmonth.'"></span>';
 		$formother->select_year($search_dtendyear ? $search_dtendyear : -1, 'search_dtendyear', 1, 20, 5);
 		print '</td>';
 	}
diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php
index 0549710ff25..51bf3b6dfa8 100644
--- a/htdocs/projet/tasks/comment.php
+++ b/htdocs/projet/tasks/comment.php
@@ -65,7 +65,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // include comment actions
 include DOL_DOCUMENT_ROOT.'/core/actions_comments.inc.php';
 
-// Retreive First Task ID of Project if withprojet is on to allow project prev next to work
+// Retrieve First Task ID of Project if withprojet is on to allow project prev next to work
 if (!empty($project_ref) && !empty($withproject))
 {
 	if ($projectstatic->fetch('', $project_ref) > 0)
@@ -115,146 +115,146 @@ if ($id > 0 || !empty($ref))
 			// Tabs for project
 			$tab = 'tasks';
 			$head = project_prepare_head($projectstatic);
-			dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'));
+			print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'));
 
 			$param = ($mode == 'mine' ? '&mode=mine' : '');
 
 			// Project card
 
-            $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+			$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-            $morehtmlref = '<div class="refidno">';
-            // Title
-            $morehtmlref .= $projectstatic->title;
-            // Thirdparty
-            if ($projectstatic->thirdparty->id > 0)
-            {
-                $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
-            }
-            $morehtmlref .= '</div>';
+			$morehtmlref = '<div class="refidno">';
+			// Title
+			$morehtmlref .= $projectstatic->title;
+			// Thirdparty
+			if ($projectstatic->thirdparty->id > 0)
+			{
+				$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
+			}
+			$morehtmlref .= '</div>';
 
-            // Define a complementary filter for search of next/prev ref.
-            if (!$user->rights->projet->all->lire)
-            {
-                $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
-                $projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
-            }
+			// Define a complementary filter for search of next/prev ref.
+			if (!$user->rights->projet->all->lire)
+			{
+				$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
+				$projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+			}
 
-            dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+			dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-            print '<div class="fichecenter">';
-            print '<div class="fichehalfleft">';
-            print '<div class="underbanner clearboth"></div>';
+			print '<div class="fichecenter">';
+			print '<div class="fichehalfleft">';
+			print '<div class="underbanner clearboth"></div>';
 
-            print '<table class="border centpercent">';
+			print '<table class="border centpercent">';
 
-            // Usage
-            print '<tr><td class="tdtop">';
-            print $langs->trans("Usage");
-            print '</td>';
-            print '<td>';
-            if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-            {
-            	print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
-            	$htmltext = $langs->trans("ProjectFollowOpportunity");
-            	print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
-            	print '<br>';
-            }
-            if (empty($conf->global->PROJECT_HIDE_TASKS))
-            {
-            	print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
-            	$htmltext = $langs->trans("ProjectFollowTasks");
-            	print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
-            	print '<br>';
-            }
-            if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
-            {
-            	print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
-            	$htmltext = $langs->trans("ProjectBillTimeDescription");
-            	print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
-            	print '<br>';
-            }
-            print '</td></tr>';
+			// Usage
+			print '<tr><td class="tdtop">';
+			print $langs->trans("Usage");
+			print '</td>';
+			print '<td>';
+			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+			{
+				print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
+				$htmltext = $langs->trans("ProjectFollowOpportunity");
+				print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
+				print '<br>';
+			}
+			if (empty($conf->global->PROJECT_HIDE_TASKS))
+			{
+				print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
+				$htmltext = $langs->trans("ProjectFollowTasks");
+				print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
+				print '<br>';
+			}
+			if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
+			{
+				print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
+				$htmltext = $langs->trans("ProjectBillTimeDescription");
+				print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
+				print '<br>';
+			}
+			print '</td></tr>';
 
-            // Visibility
-            print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-            if ($projectstatic->public) print $langs->trans('SharedProject');
-            else print $langs->trans('PrivateProject');
-            print '</td></tr>';
+			// Visibility
+			print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
+			if ($projectstatic->public) print $langs->trans('SharedProject');
+			else print $langs->trans('PrivateProject');
+			print '</td></tr>';
 
-            // Usage
-            if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) && !empty($object->usage_opportunity))
-            {
-            	// Opportunity status
-            	print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
-            	$code = dol_getIdFromCode($db, $projectstatic->opp_status, 'c_lead_status', 'rowid', 'code');
-            	if ($code) print $langs->trans("OppStatus".$code);
-            	print '</td></tr>';
+			// Usage
+			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) && !empty($object->usage_opportunity))
+			{
+				// Opportunity status
+				print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
+				$code = dol_getIdFromCode($db, $projectstatic->opp_status, 'c_lead_status', 'rowid', 'code');
+				if ($code) print $langs->trans("OppStatus".$code);
+				print '</td></tr>';
 
-            	// Opportunity percent
-            	print '<tr><td>'.$langs->trans("OpportunityProbability").'</td><td>';
-            	if (strcmp($object->opp_percent, '')) print price($projectstatic->opp_percent, 0, $langs, 1, 0).' %';
-            	print '</td></tr>';
+				// Opportunity percent
+				print '<tr><td>'.$langs->trans("OpportunityProbability").'</td><td>';
+				if (strcmp($object->opp_percent, '')) print price($projectstatic->opp_percent, 0, $langs, 1, 0).' %';
+				print '</td></tr>';
 
-            	// Opportunity Amount
-            	print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
-            	/*if ($object->opp_status)
+				// Opportunity Amount
+				print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
+				/*if ($object->opp_status)
             	 {
             	 print price($obj->opp_amount, 1, $langs, 1, 0, -1, $conf->currency);
             	 }*/
-            	if (strcmp($projectstatic->opp_amount, '')) print price($projectstatic->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);
-            	print '</td></tr>';
-            }
+				if (strcmp($projectstatic->opp_amount, '')) print price($projectstatic->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);
+				print '</td></tr>';
+			}
 
-            // Date start - end
-            print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
-            $start = dol_print_date($projectstatic->date_start, 'day');
-            print ($start ? $start : '?');
-            $end = dol_print_date($projectstatic->date_end, 'day');
-            print ' - ';
-            print ($end ? $end : '?');
-            if ($projectstatic->hasDelay()) print img_warning("Late");
-            print '</td></tr>';
+			// Date start - end
+			print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
+			$start = dol_print_date($projectstatic->date_start, 'day');
+			print ($start ? $start : '?');
+			$end = dol_print_date($projectstatic->date_end, 'day');
+			print ' - ';
+			print ($end ? $end : '?');
+			if ($projectstatic->hasDelay()) print img_warning("Late");
+			print '</td></tr>';
 
-            // Budget
-            print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-            if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
-            print '</td></tr>';
+			// Budget
+			print '<tr><td>'.$langs->trans("Budget").'</td><td>';
+			if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+			print '</td></tr>';
 
-            // Other attributes
-            $cols = 2;
-            //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+			// Other attributes
+			$cols = 2;
+			//include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
-            print '</table>';
+			print '</table>';
 
-            print '</div>';
-            print '<div class="fichehalfright">';
-            print '<div class="ficheaddleft">';
-            print '<div class="underbanner clearboth"></div>';
+			print '</div>';
+			print '<div class="fichehalfright">';
+			print '<div class="ficheaddleft">';
+			print '<div class="underbanner clearboth"></div>';
 
-            print '<table class="border centpercent">';
+			print '<table class="border centpercent">';
 
-            // Description
-            print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-            print nl2br($projectstatic->description);
-            print '</td></tr>';
+			// Description
+			print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
+			print nl2br($projectstatic->description);
+			print '</td></tr>';
 
-            // Categories
-            if ($conf->categorie->enabled) {
-                print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
-                print $form->showCategories($projectstatic->id, 'project', 1);
-                print "</td></tr>";
-            }
+			// Categories
+			if ($conf->categorie->enabled) {
+				print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
+				print $form->showCategories($projectstatic->id, 'project', 1);
+				print "</td></tr>";
+			}
 
-            print '</table>';
+			print '</table>';
 
-            print '</div>';
-            print '</div>';
-            print '</div>';
+			print '</div>';
+			print '</div>';
+			print '</div>';
 
-            print '<div class="clearboth"></div>';
+			print '<div class="clearboth"></div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<br>';
 		}
@@ -267,7 +267,7 @@ if ($id > 0 || !empty($ref))
 		$param = ($withproject ? '&withproject=1' : '');
 		$linkback = $withproject ? '<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'&restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>' : '';
 
-		dol_fiche_head($head, 'task_comment', $langs->trans("Task"), -1, 'projecttask');
+		print dol_get_fiche_head($head, 'task_comment', $langs->trans("Task"), -1, 'projecttask');
 
 		if ($action == 'delete')
 		{
@@ -276,8 +276,8 @@ if ($id > 0 || !empty($ref))
 
 		if (!GETPOST('withproject') || empty($projectstatic->id))
 		{
-		    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
-		    $object->next_prev_filter = " fk_projet in (".$projectsListId.")";
+			$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
+			$object->next_prev_filter = " fk_projet in (".$projectsListId.")";
 		} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 		$morehtmlref = '';
@@ -285,17 +285,17 @@ if ($id > 0 || !empty($ref))
 		// Project
 		if (empty($withproject))
 		{
-		    $morehtmlref .= '<div class="refidno">';
-		    $morehtmlref .= $langs->trans("Project").': ';
-		    $morehtmlref .= $projectstatic->getNomUrl(1);
-		    $morehtmlref .= '<br>';
+			$morehtmlref .= '<div class="refidno">';
+			$morehtmlref .= $langs->trans("Project").': ';
+			$morehtmlref .= $projectstatic->getNomUrl(1);
+			$morehtmlref .= '<br>';
 
-		    // Third party
-		    $morehtmlref .= $langs->trans("ThirdParty").': ';
-		    if (!empty($projectstatic->thirdparty)) {
-                   $morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
-		    }
-		    $morehtmlref .= '</div>';
+			// Third party
+			$morehtmlref .= $langs->trans("ThirdParty").': ';
+			if (!empty($projectstatic->thirdparty)) {
+				   $morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
+			}
+			$morehtmlref .= '</div>';
 		}
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
@@ -319,7 +319,7 @@ if ($id > 0 || !empty($ref))
 
 		print '</div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		// Include comment tpl view
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 313fec73721..253c2c787e4 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -59,34 +59,34 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 {
 	$result = $object->fetch($id, $ref);
 
-    if ($result > 0 && $id > 0)
-    {
-    	$idfortaskuser = (GETPOST("contactid") != 0) ?GETPOST("contactid") : GETPOST("userid"); // GETPOST('contactid') may val -1 to mean empty or -2 to means "everybody"
-    	if ($idfortaskuser == -2)
-    	{
-    		$result = $projectstatic->fetch($object->fk_project);
-    		if ($result <= 0)
-    		{
-    			dol_print_error($db, $projectstatic->error, $projectstatic->errors);
-    		} else {
-    			$contactsofproject = $projectstatic->getListContactId('internal');
-    			foreach ($contactsofproject as $key => $val)
-    			{
-    				$result = $object->add_contact($val, GETPOST("type"), GETPOST("source"));
-    			}
-    		}
-    	} else {
-  			$result = $object->add_contact($idfortaskuser, GETPOST("type"), GETPOST("source"));
-    	}
-    }
-
-	if ($result >= 0)
+	if ($result > 0 && $id > 0)
 	{
+		$idfortaskuser = (GETPOST("contactid") != 0) ?GETPOST("contactid") : GETPOST("userid"); // GETPOST('contactid') may val -1 to mean empty or -2 to means "everybody"
+		if ($idfortaskuser == -2)
+		{
+			$result = $projectstatic->fetch($object->fk_project);
+			if ($result <= 0)
+			{
+				dol_print_error($db, $projectstatic->error, $projectstatic->errors);
+			} else {
+				$contactsofproject = $projectstatic->getListContactId('internal');
+				foreach ($contactsofproject as $key => $val)
+				{
+					$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+					$result = $object->add_contact($val, $type, GETPOST("source", 'aZ09'));
+				}
+			}
+		} else {
+			$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+			$result = $object->add_contact($idfortaskuser, $typeid, GETPOST("source", 'aZ09'));
+		}
+	}
+
+	if ($result >= 0) {
 		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id.($withproject ? '&withproject=1' : ''));
 		exit;
 	} else {
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
+		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
 		} else {
@@ -98,9 +98,8 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 // bascule du statut d'un contact
 if ($action == 'swapstatut' && $user->rights->projet->creer)
 {
-	if ($object->fetch($id, $ref))
-	{
-	    $result = $object->swapContactStatus(GETPOST('ligne'));
+	if ($object->fetch($id, $ref)) {
+		$result = $object->swapContactStatus(GETPOST('ligne'));
 	} else {
 		dol_print_error($db);
 	}
@@ -121,7 +120,7 @@ if ($action == 'deleteline' && $user->rights->projet->creer)
 	}
 }
 
-// Retreive First Task ID of Project if withprojet is on to allow project prev next to work
+// Retrieve First Task ID of Project if withprojet is on to allow project prev next to work
 if (!empty($project_ref) && !empty($withproject))
 {
 	if ($projectstatic->fetch(0, $project_ref) > 0)
@@ -160,7 +159,7 @@ if ($id > 0 || !empty($ref))
 	if ($object->fetch($id, $ref) > 0)
 	{
 		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
-	    $id = $object->id; // So when doing a search from ref, id is also set correctly.
+		$id = $object->id; // So when doing a search from ref, id is also set correctly.
 
 		$result = $projectstatic->fetch($object->fk_project);
 		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) $projectstatic->fetchComments();
@@ -172,127 +171,127 @@ if ($id > 0 || !empty($ref))
 
 		if ($withproject)
 		{
-    		// Tabs for project
-    		$tab = 'tasks';
-    		$head = project_prepare_head($projectstatic);
-    		dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'));
+			// Tabs for project
+			$tab = 'tasks';
+			$head = project_prepare_head($projectstatic);
+			print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'));
 
-    		$param = ($mode == 'mine' ? '&mode=mine' : '');
+			$param = ($mode == 'mine' ? '&mode=mine' : '');
 
 			// Project card
 
-            $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+			$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-            $morehtmlref = '<div class="refidno">';
-            // Title
-            $morehtmlref .= $projectstatic->title;
-            // Thirdparty
-            if ($projectstatic->thirdparty->id > 0)
-            {
-                $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
-            }
-            $morehtmlref .= '</div>';
+			$morehtmlref = '<div class="refidno">';
+			// Title
+			$morehtmlref .= $projectstatic->title;
+			// Thirdparty
+			if ($projectstatic->thirdparty->id > 0)
+			{
+				$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
+			}
+			$morehtmlref .= '</div>';
 
-            // Define a complementary filter for search of next/prev ref.
-            if (!$user->rights->projet->all->lire)
-            {
-                $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
-                $projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
-            }
+			// Define a complementary filter for search of next/prev ref.
+			if (!$user->rights->projet->all->lire)
+			{
+				$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
+				$projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+			}
 
-            dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+			dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-            print '<div class="fichecenter">';
-            print '<div class="fichehalfleft">';
-            print '<div class="underbanner clearboth"></div>';
+			print '<div class="fichecenter">';
+			print '<div class="fichehalfleft">';
+			print '<div class="underbanner clearboth"></div>';
 
-            print '<table class="border tableforfield centpercent">';
+			print '<table class="border tableforfield centpercent">';
 
-            // Usage
-            print '<tr><td class="tdtop">';
-            print $langs->trans("Usage");
-            print '</td>';
-            print '<td>';
-            if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-            {
-            	print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
-            	$htmltext = $langs->trans("ProjectFollowOpportunity");
-            	print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
-            	print '<br>';
-            }
-            if (empty($conf->global->PROJECT_HIDE_TASKS))
-            {
-            	print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
-            	$htmltext = $langs->trans("ProjectFollowTasks");
-            	print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
-            	print '<br>';
-            }
-            if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
-            {
-            	print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
-            	$htmltext = $langs->trans("ProjectBillTimeDescription");
-            	print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
-            	print '<br>';
-            }
-            print '</td></tr>';
+			// Usage
+			print '<tr><td class="tdtop">';
+			print $langs->trans("Usage");
+			print '</td>';
+			print '<td>';
+			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+			{
+				print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
+				$htmltext = $langs->trans("ProjectFollowOpportunity");
+				print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
+				print '<br>';
+			}
+			if (empty($conf->global->PROJECT_HIDE_TASKS))
+			{
+				print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
+				$htmltext = $langs->trans("ProjectFollowTasks");
+				print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
+				print '<br>';
+			}
+			if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
+			{
+				print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
+				$htmltext = $langs->trans("ProjectBillTimeDescription");
+				print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
+				print '<br>';
+			}
+			print '</td></tr>';
 
-            // Visibility
-            print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-            if ($projectstatic->public) print $langs->trans('SharedProject');
-            else print $langs->trans('PrivateProject');
-            print '</td></tr>';
+			// Visibility
+			print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
+			if ($projectstatic->public) print $langs->trans('SharedProject');
+			else print $langs->trans('PrivateProject');
+			print '</td></tr>';
 
-            // Date start - end
-            print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
-            $start = dol_print_date($projectstatic->date_start, 'day');
-            print ($start ? $start : '?');
-            $end = dol_print_date($projectstatic->date_end, 'day');
-            print ' - ';
-            print ($end ? $end : '?');
-            if ($projectstatic->hasDelay()) print img_warning("Late");
-            print '</td></tr>';
+			// Date start - end
+			print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
+			$start = dol_print_date($projectstatic->date_start, 'day');
+			print ($start ? $start : '?');
+			$end = dol_print_date($projectstatic->date_end, 'day');
+			print ' - ';
+			print ($end ? $end : '?');
+			if ($projectstatic->hasDelay()) print img_warning("Late");
+			print '</td></tr>';
 
-            // Budget
-            print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-            if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
-            print '</td></tr>';
+			// Budget
+			print '<tr><td>'.$langs->trans("Budget").'</td><td>';
+			if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+			print '</td></tr>';
 
-            // Other attributes
-            $cols = 2;
-            //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+			// Other attributes
+			$cols = 2;
+			//include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
-            print '</table>';
+			print '</table>';
 
-            print '</div>';
-            print '<div class="fichehalfright">';
-            print '<div class="ficheaddleft">';
-            print '<div class="underbanner clearboth"></div>';
+			print '</div>';
+			print '<div class="fichehalfright">';
+			print '<div class="ficheaddleft">';
+			print '<div class="underbanner clearboth"></div>';
 
-            print '<table class="border tableforfield" width="100%">';
+			print '<table class="border tableforfield" width="100%">';
 
-            // Description
-            print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-            print nl2br($projectstatic->description);
-            print '</td></tr>';
+			// Description
+			print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
+			print nl2br($projectstatic->description);
+			print '</td></tr>';
 
-            // Categories
-            if ($conf->categorie->enabled) {
-                print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
-                print $form->showCategories($projectstatic->id, 'project', 1);
-                print "</td></tr>";
-            }
+			// Categories
+			if ($conf->categorie->enabled) {
+				print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
+				print $form->showCategories($projectstatic->id, 'project', 1);
+				print "</td></tr>";
+			}
 
-            print '</table>';
+			print '</table>';
 
-            print '</div>';
-            print '</div>';
-            print '</div>';
+			print '</div>';
+			print '</div>';
+			print '</div>';
 
-            print '<div class="clearboth"></div>';
+			print '<div class="clearboth"></div>';
 
-    		dol_fiche_end();
+			print dol_get_fiche_end();
 
-    		print '<br>';
+			print '<br>';
 		}
 
 
@@ -301,7 +300,7 @@ if ($id > 0 || !empty($ref))
 		//$arrayofuseridoftask=$object->getListContactId('internal');
 
 		$head = task_prepare_head($object);
-		dol_fiche_head($head, 'task_contact', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition');
+		print dol_get_fiche_head($head, 'task_contact', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition');
 
 
 		$param = (GETPOST('withproject') ? '&withproject=1' : '');
@@ -309,8 +308,8 @@ if ($id > 0 || !empty($ref))
 
 		if (!GETPOST('withproject') || empty($projectstatic->id))
 		{
-		    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
-		    $object->next_prev_filter = " fk_projet in (".$projectsListId.")";
+			$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
+			$object->next_prev_filter = " fk_projet in (".$projectsListId.")";
 		} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 		$morehtmlref = '';
@@ -318,25 +317,25 @@ if ($id > 0 || !empty($ref))
 		// Project
 		if (empty($withproject))
 		{
-		    $result = $projectstatic->fetch($object->fk_project);
-		    $morehtmlref .= '<div class="refidno">';
-		    $morehtmlref .= $langs->trans("Project").': ';
-		    $morehtmlref .= $projectstatic->getNomUrl(1);
-		    $morehtmlref .= '<br>';
+			$result = $projectstatic->fetch($object->fk_project);
+			$morehtmlref .= '<div class="refidno">';
+			$morehtmlref .= $langs->trans("Project").': ';
+			$morehtmlref .= $projectstatic->getNomUrl(1);
+			$morehtmlref .= '<br>';
 
-		    // Third party
-		    $morehtmlref .= $langs->trans("ThirdParty").': ';
-		    if ($projectstatic->socid > 0) {
-		        $projectstatic->fetch_thirdparty();
-		        $morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
-		    }
+			// Third party
+			$morehtmlref .= $langs->trans("ThirdParty").': ';
+			if ($projectstatic->socid > 0) {
+				$projectstatic->fetch_thirdparty();
+				$morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
+			}
 
-		    $morehtmlref .= '</div>';
+			$morehtmlref .= '</div>';
 		}
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param, 0, '', '', 1);
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		/*
 		 * Lines of contacts
@@ -408,7 +407,6 @@ if ($id > 0 || !empty($ref))
 				print '<input type="hidden" name="id" value="'.$object->id.'">';
 				if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">';
 
-
 				print '<tr class="oddeven">';
 
 				print '<td class="nowrap">';
@@ -423,7 +421,8 @@ if ($id > 0 || !empty($ref))
 
 				print '<td>';
 				$contactofproject = $projectstatic->getListContactId('external');
-				$nbofcontacts = $form->select_contacts($selectedCompany, '', 'contactid', 0, '', $contactofproject);
+				print $form->selectcontacts($selectedCompany, '', 'contactid', 0, '', $contactofproject);
+				$nbofcontacts = $form->num;
 				print '</td>';
 				print '<td>';
 				$formcompany->selectTypeContact($object, '', 'type', 'external', 'rowid');
@@ -437,7 +436,7 @@ if ($id > 0 || !empty($ref))
 			}
 		}
 
-		// Liste des contacts lies
+		// List of contact line
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("Source").'</td>';
 		print '<td>'.$langs->trans("ThirdParty").'</td>';
@@ -452,6 +451,7 @@ if ($id > 0 || !empty($ref))
 		foreach (array('internal', 'external') as $source)
 		{
 			$tab = $object->liste_contact(-1, $source);
+
 			$num = count($tab);
 
 			$i = 0;
@@ -484,22 +484,27 @@ if ($id > 0 || !empty($ref))
 
 				// Contact
 				print '<td>';
-                if ($tab[$i]['source'] == 'internal')
-                {
-                    $userstatic->id = $tab[$i]['id'];
-                    $userstatic->lastname = $tab[$i]['lastname'];
-                    $userstatic->firstname = $tab[$i]['firstname'];
-    				$userstatic->photo = $tab[$i]['photo'];
-    				$userstatic->login = $tab[$i]['login'];
-                    print $userstatic->getNomUrl(-1);
-                }
-                if ($tab[$i]['source'] == 'external')
-                {
-                    $contactstatic->id = $tab[$i]['id'];
-                    $contactstatic->lastname = $tab[$i]['lastname'];
-                    $contactstatic->firstname = $tab[$i]['firstname'];
-                    print $contactstatic->getNomUrl(1);
-                }
+				if ($tab[$i]['source'] == 'internal')
+				{
+					$userstatic->id = $tab[$i]['id'];
+					$userstatic->lastname = $tab[$i]['lastname'];
+					$userstatic->firstname = $tab[$i]['firstname'];
+					$userstatic->photo = $tab[$i]['photo'];
+					$userstatic->login = $tab[$i]['login'];
+					$userstatic->email = $tab[$i]['email'];
+					$userstatic->statut = $tab[$i]['statuscontact'];
+
+					print $userstatic->getNomUrl(-1);
+				}
+				if ($tab[$i]['source'] == 'external')
+				{
+					$contactstatic->id = $tab[$i]['id'];
+					$contactstatic->lastname = $tab[$i]['lastname'];
+					$contactstatic->firstname = $tab[$i]['firstname'];
+					$contactstatic->email = $tab[$i]['email'];
+					$contactstatic->statut = $tab[$i]['statuscontact'];
+					print $contactstatic->getNomUrl(1);
+				}
 				print '</td>';
 
 				// Type de contact
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 2a8e3cdd944..ca273bb36ef 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -69,7 +69,7 @@ $projectstatic = new Project($db);
  * Actions
  */
 
-// Retreive First Task ID of Project if withprojet is on to allow project prev next to work
+// Retrieve First Task ID of Project if withprojet is on to allow project prev next to work
 if (!empty($project_ref) && !empty($withproject))
 {
 	if ($projectstatic->fetch(0, $project_ref) > 0)
@@ -129,128 +129,128 @@ if ($object->id > 0)
 		$tab = 'tasks';
 		$head = project_prepare_head($projectstatic);
 
-		dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'));
+		print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'));
 
 		$param = ($mode == 'mine' ? '&mode=mine' : '');
 
 		// Project card
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        $morehtmlref = '<div class="refidno">';
-        // Title
-        $morehtmlref .= $projectstatic->title;
-        // Thirdparty
-        if ($projectstatic->thirdparty->id > 0)
-        {
-            $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
-        }
-        $morehtmlref .= '</div>';
+		$morehtmlref = '<div class="refidno">';
+		// Title
+		$morehtmlref .= $projectstatic->title;
+		// Thirdparty
+		if ($projectstatic->thirdparty->id > 0)
+		{
+			$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
+		}
+		$morehtmlref .= '</div>';
 
-        // Define a complementary filter for search of next/prev ref.
-        if (!$user->rights->projet->all->lire)
-        {
-            $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
-            $projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
-        }
+		// Define a complementary filter for search of next/prev ref.
+		if (!$user->rights->projet->all->lire)
+		{
+			$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
+			$projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+		}
 
-        dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+		dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-        print '<div class="fichecenter">';
-        print '<div class="fichehalfleft">';
-        print '<div class="underbanner clearboth"></div>';
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
+		print '<div class="underbanner clearboth"></div>';
 
-        print '<table class="border tableforfield centpercent">';
+		print '<table class="border tableforfield centpercent">';
 
-        // Usage
-        print '<tr><td class="tdtop">';
-        print $langs->trans("Usage");
-        print '</td>';
-        print '<td>';
-        if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-        {
-        	print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
-        	$htmltext = $langs->trans("ProjectFollowOpportunity");
-        	print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
-        	print '<br>';
-        }
-        if (empty($conf->global->PROJECT_HIDE_TASKS))
-        {
-        	print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
-        	$htmltext = $langs->trans("ProjectFollowTasks");
-        	print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
-        	print '<br>';
-        }
-        if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
-        {
-        	print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
-        	$htmltext = $langs->trans("ProjectBillTimeDescription");
-        	print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
-        	print '<br>';
-        }
-        print '</td></tr>';
+		// Usage
+		print '<tr><td class="tdtop">';
+		print $langs->trans("Usage");
+		print '</td>';
+		print '<td>';
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+		{
+			print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
+			$htmltext = $langs->trans("ProjectFollowOpportunity");
+			print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
+			print '<br>';
+		}
+		if (empty($conf->global->PROJECT_HIDE_TASKS))
+		{
+			print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
+			$htmltext = $langs->trans("ProjectFollowTasks");
+			print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
+			print '<br>';
+		}
+		if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
+		{
+			print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
+			$htmltext = $langs->trans("ProjectBillTimeDescription");
+			print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
+			print '<br>';
+		}
+		print '</td></tr>';
 
-        // Visibility
-        print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-        if ($projectstatic->public) print $langs->trans('SharedProject');
-        else print $langs->trans('PrivateProject');
-        print '</td></tr>';
+		// Visibility
+		print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
+		if ($projectstatic->public) print $langs->trans('SharedProject');
+		else print $langs->trans('PrivateProject');
+		print '</td></tr>';
 
-        // Date start - end
-        print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
-        $start = dol_print_date($projectstatic->date_start, 'day');
-        print ($start ? $start : '?');
-        $end = dol_print_date($projectstatic->date_end, 'day');
-        print ' - ';
-        print ($end ? $end : '?');
-        if ($projectstatic->hasDelay()) print img_warning("Late");
-        print '</td></tr>';
+		// Date start - end
+		print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
+		$start = dol_print_date($projectstatic->date_start, 'day');
+		print ($start ? $start : '?');
+		$end = dol_print_date($projectstatic->date_end, 'day');
+		print ' - ';
+		print ($end ? $end : '?');
+		if ($projectstatic->hasDelay()) print img_warning("Late");
+		print '</td></tr>';
 
-        // Budget
-        print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-        if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
-        print '</td></tr>';
+		// Budget
+		print '<tr><td>'.$langs->trans("Budget").'</td><td>';
+		if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+		print '</td></tr>';
 
-        // Other attributes
-        $cols = 2;
-        //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+		// Other attributes
+		$cols = 2;
+		//include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
-        print '</table>';
+		print '</table>';
 
-        print '</div>';
-        print '<div class="fichehalfright">';
-        print '<div class="ficheaddleft">';
-        print '<div class="underbanner clearboth"></div>';
+		print '</div>';
+		print '<div class="fichehalfright">';
+		print '<div class="ficheaddleft">';
+		print '<div class="underbanner clearboth"></div>';
 
-        print '<table class="border tableforfield centpercent">';
+		print '<table class="border tableforfield centpercent">';
 
-        // Description
-        print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-        print nl2br($projectstatic->description);
-        print '</td></tr>';
+		// Description
+		print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
+		print nl2br($projectstatic->description);
+		print '</td></tr>';
 
-        // Categories
-        if ($conf->categorie->enabled) {
-            print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
-            print $form->showCategories($projectstatic->id, 'project', 1);
-            print "</td></tr>";
-        }
+		// Categories
+		if ($conf->categorie->enabled) {
+			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
+			print $form->showCategories($projectstatic->id, 'project', 1);
+			print "</td></tr>";
+		}
 
-        print '</table>';
+		print '</table>';
 
-        print '</div>';
-        print '</div>';
-        print '</div>';
+		print '</div>';
+		print '</div>';
+		print '</div>';
 
-        print '<div class="clearboth"></div>';
+		print '<div class="clearboth"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<br>';
 	}
 
 	$head = task_prepare_head($object);
-	dol_fiche_head($head, 'task_document', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition');
+	print dol_get_fiche_head($head, 'task_document', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition');
 
 	// Files list constructor
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
@@ -265,8 +265,8 @@ if ($object->id > 0)
 
 	if (!GETPOST('withproject') || empty($projectstatic->id))
 	{
-	    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
-	    $object->next_prev_filter = " fk_projet in (".$projectsListId.")";
+		$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
+		$object->next_prev_filter = " fk_projet in (".$projectsListId.")";
 	} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 	$morehtmlref = '';
@@ -274,17 +274,17 @@ if ($object->id > 0)
 	// Project
 	if (empty($withproject))
 	{
-	    $morehtmlref .= '<div class="refidno">';
-	    $morehtmlref .= $langs->trans("Project").': ';
-	    $morehtmlref .= $projectstatic->getNomUrl(1);
-	    $morehtmlref .= '<br>';
+		$morehtmlref .= '<div class="refidno">';
+		$morehtmlref .= $langs->trans("Project").': ';
+		$morehtmlref .= $projectstatic->getNomUrl(1);
+		$morehtmlref .= '<br>';
 
-	    // Third party
-	    $morehtmlref .= $langs->trans("ThirdParty").': ';
-	    if (is_object($projectstatic->thirdparty) && $projectstatic->thirdparty->id > 0) {
-	    	$morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
-	    }
-	    $morehtmlref .= '</div>';
+		// Third party
+		$morehtmlref .= $langs->trans("ThirdParty").': ';
+		if (is_object($projectstatic->thirdparty) && $projectstatic->thirdparty->id > 0) {
+			$morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
+		}
+		$morehtmlref .= '</div>';
 	}
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
@@ -302,7 +302,7 @@ if ($object->id > 0)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<br>';
 
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 7d1a8354bb3..b9d1a19c629 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -119,7 +119,7 @@ $arrayfields = array(
 	't.label'=>array('label'=>$langs->trans("LabelTask"), 'checked'=>1, 'position'=>80),
 	't.description'=>array('label'=>$langs->trans("Description"), 'checked'=>0, 'position'=>80),
 	't.dateo'=>array('label'=>$langs->trans("DateStart"), 'checked'=>1, 'position'=>100),
-	't.datee'=>array('label'=>$langs->trans("DateEnd"), 'checked'=>1, 'position'=>101),
+	't.datee'=>array('label'=>$langs->trans("Deadline"), 'checked'=>1, 'position'=>101),
 	'p.ref'=>array('label'=>$langs->trans("ProjectRef"), 'checked'=>1),
 	'p.title'=>array('label'=>$langs->trans("ProjectLabel"), 'checked'=>0),
 	's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>0),
@@ -129,9 +129,9 @@ $arrayfields = array(
 	't.progress_calculated'=>array('label'=>$langs->trans("ProgressCalculated"), 'checked'=>1, 'position'=>104),
 	't.progress'=>array('label'=>$langs->trans("ProgressDeclared"), 'checked'=>1, 'position'=>105),
 	't.progress_summary'=>array('label'=>$langs->trans("TaskProgressSummary"), 'checked'=>1, 'position'=>106),
-    't.tobill'=>array('label'=>$langs->trans("TimeToBill"), 'checked'=>0, 'position'=>110),
-    't.billed'=>array('label'=>$langs->trans("TimeBilled"), 'checked'=>0, 'position'=>111),
-    't.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
+	't.tobill'=>array('label'=>$langs->trans("TimeToBill"), 'checked'=>0, 'position'=>110),
+	't.billed'=>array('label'=>$langs->trans("TimeBilled"), 'checked'=>0, 'position'=>111),
+	't.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
 	't.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
 	//'t.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
 );
@@ -276,7 +276,7 @@ if ($search_categ) $sql .= ", cs.fk_categorie, cs.fk_project";
 // Add sum fields
 if (!empty($arrayfields['t.tobill']['checked']) || !empty($arrayfields['t.billed']['checked']))
 {
-    $sql .= " , SUM(tt.task_duration * ".$db->ifsql("invoice_id IS NULL", "1", "0").") as tobill, SUM(tt.task_duration * ".$db->ifsql("invoice_id IS NULL", "0", "1").") as billed";
+	$sql .= " , SUM(tt.task_duration * ".$db->ifsql("invoice_id IS NULL", "1", "0").") as tobill, SUM(tt.task_duration * ".$db->ifsql("invoice_id IS NULL", "0", "1").") as billed";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -293,7 +293,7 @@ if (!empty($search_categ)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_proje
 $sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
 if (!empty($arrayfields['t.tobill']['checked']) || !empty($arrayfields['t.billed']['checked']))
 {
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_time as tt ON tt.fk_task = t.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_time as tt ON tt.fk_task = t.rowid";
 }
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 if ($search_project_user > 0)  $sql .= ", ".MAIN_DB_PREFIX."element_contact as ecp";
@@ -333,15 +333,15 @@ $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // No
 $sql .= $hookmanager->resPrint;
 if (!empty($arrayfields['t.tobill']['checked']) || !empty($arrayfields['t.billed']['checked']))
 {
-    $sql .= " GROUP BY p.rowid, p.ref, p.title, p.fk_statut, p.datee, p.fk_opp_status, p.public, p.fk_user_creat,";
-    $sql .= " s.nom, s.rowid,";
-    $sql .= " t.datec, t.dateo, t.datee, t.tms,";
-    $sql .= " t.rowid, t.ref, t.label, t.planned_workload, t.duration_effective, t.progress, t.fk_statut";
-    if ($search_categ) $sql .= ", cs.fk_categorie, cs.fk_project";
-    // Add fields from extrafields
-    if (!empty($extrafields->attributes[$object->table_element]['label'])) {
-    	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key : '');
-    }
+	$sql .= " GROUP BY p.rowid, p.ref, p.title, p.fk_statut, p.datee, p.fk_opp_status, p.public, p.fk_user_creat,";
+	$sql .= " s.nom, s.rowid,";
+	$sql .= " t.datec, t.dateo, t.datee, t.tms,";
+	$sql .= " t.rowid, t.ref, t.label, t.planned_workload, t.duration_effective, t.progress, t.fk_statut";
+	if ($search_categ) $sql .= ", cs.fk_categorie, cs.fk_project";
+	// Add fields from extrafields
+	if (!empty($extrafields->attributes[$object->table_element]['label'])) {
+		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key : '');
+	}
 }
 $sql .= $db->order($sortfield, $sortorder);
 
@@ -437,8 +437,8 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 $texthelp = '';
 if ($search_task_user == $user->id) $texthelp .= $langs->trans("MyTasksDesc");
 else {
-    if ($user->rights->projet->all->lire && !$socid) $texthelp .= $langs->trans("TasksOnProjectsDesc");
-    else $texthelp .= $langs->trans("TasksOnProjectsPublicDesc");
+	if ($user->rights->projet->all->lire && !$socid) $texthelp .= $langs->trans("TasksOnProjectsDesc");
+	else $texthelp .= $langs->trans("TasksOnProjectsPublicDesc");
 }
 
 print_barre_liste($form->textwithpicto($title, $texthelp), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'projecttask', 0, $newcardbutton, '', $limit, 0, 0, 1);
@@ -458,7 +458,7 @@ if ($search_all)
 $morehtmlfilter = '';
 
 // Filter on categories
-if (!empty($conf->categorie->enabled))
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
@@ -654,11 +654,11 @@ while ($i < min($num, $limit))
 	$object->description = $obj->description;
 	$object->fk_statut = $obj->fk_statut;
 	$object->progress = $obj->progress;
-	$object->datee = $db->jdate($obj->date_end); // deprecated
+	$object->date_start = $db->jdate($obj->date_start);
 	$object->date_end = $db->jdate($obj->date_end);
-    $object->planned_workload = $obj->planned_workload;
-    $object->duration_effective = $obj->duration_effective;
-    $object->fk_task_parent = $obj->fk_task_parent;
+	$object->planned_workload = $obj->planned_workload;
+	$object->duration_effective = $obj->duration_effective;
+	$object->fk_task_parent = $obj->fk_task_parent;
 
 
 	$projectstatic->id = $obj->projectid;
@@ -843,8 +843,8 @@ while ($i < min($num, $limit))
 		{
 			print '<td class="center">';
 			if ($obj->progress != '' && $obj->duration_effective) {
-                print getTaskProgressView($object, false, false);
-            }
+				print getTaskProgressView($object, false, false);
+			}
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 			if (!$i) $totalarray['totalprogress_summary'] = $totalarray['nbfield'];
@@ -852,36 +852,36 @@ while ($i < min($num, $limit))
 		// Time not billed
 		if (!empty($arrayfields['t.tobill']['checked']))
 		{
-		    print '<td class="center">';
-		    if ($obj->usage_bill_time)
-		    {
-		        print convertSecondToTime($obj->tobill, 'allhourmin');
-		        $totalarray['val']['t.tobill'] += $obj->tobill;
-		        $totalarray['totaltobill'] += $obj->tobill;
-		    } else {
-		        print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
-		    }
-		    print '</td>';
-		    if (!$i) $totalarray['nbfield']++;
-		    if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.tobill';
-		    if (!$i) $totalarray['totaltobillfield'] = $totalarray['nbfield'];
+			print '<td class="center">';
+			if ($obj->usage_bill_time)
+			{
+				print convertSecondToTime($obj->tobill, 'allhourmin');
+				$totalarray['val']['t.tobill'] += $obj->tobill;
+				$totalarray['totaltobill'] += $obj->tobill;
+			} else {
+				print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
+			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.tobill';
+			if (!$i) $totalarray['totaltobillfield'] = $totalarray['nbfield'];
 		}
 		// Time billed
 		if (!empty($arrayfields['t.billed']['checked']))
 		{
-		    print '<td class="center">';
-		    if ($obj->usage_bill_time)
-		    {
-		        print convertSecondToTime($obj->billed, 'allhourmin');
-		        $totalarray['val']['t.billed'] += $obj->billed;
-		        $totalarray['totalbilled'] += $obj->billed;
-		    } else {
-		        print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
-		    }
-		    print '</td>';
-		    if (!$i) $totalarray['nbfield']++;
-		    if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.billed';
-		    if (!$i) $totalarray['totalbilledfield'] = $totalarray['nbfield'];
+			print '<td class="center">';
+			if ($obj->usage_bill_time)
+			{
+				print convertSecondToTime($obj->billed, 'allhourmin');
+				$totalarray['val']['t.billed'] += $obj->billed;
+				$totalarray['totalbilled'] += $obj->billed;
+			} else {
+				print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
+			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.billed';
+			if (!$i) $totalarray['totalbilledfield'] = $totalarray['nbfield'];
 		}
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index c281da3b877..af5709c7322 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -63,7 +63,7 @@ if ($id > 0 || !empty($ref))
 }
 
 
-// Retreive First Task ID of Project if withprojet is on to allow project prev next to work
+// Retrieve First Task ID of Project if withprojet is on to allow project prev next to work
 if (!empty($project_ref) && !empty($withproject))
 {
 	if ($projectstatic->fetch(0, $project_ref) > 0)
@@ -109,7 +109,7 @@ if ($object->id > 0)
 		// Tabs for project
 		$tab = 'tasks';
 		$head = project_prepare_head($projectstatic);
-		dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'));
+		print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'));
 
 		$param = ($mode == 'mine' ? '&mode=mine' : '');
 		// Project card
@@ -122,15 +122,15 @@ if ($object->id > 0)
 		// Thirdparty
 		if ($projectstatic->thirdparty->id > 0)
 		{
-		    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
+			$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
 		}
 		$morehtmlref .= '</div>';
 
 		// Define a complementary filter for search of next/prev ref.
 		if (!$user->rights->projet->all->lire)
 		{
-		    $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
-		    $projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+			$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
+			$projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 		}
 
 		dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -210,9 +210,9 @@ if ($object->id > 0)
 
 		// Categories
 		if ($conf->categorie->enabled) {
-		    print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
-		    print $form->showCategories($projectstatic->id, 'project', 1);
-		    print "</td></tr>";
+			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
+			print $form->showCategories($projectstatic->id, 'project', 1);
+			print "</td></tr>";
 		}
 
 		print '</table>';
@@ -223,13 +223,13 @@ if ($object->id > 0)
 
 		print '<div class="clearboth"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<br>';
 	}
 
 	$head = task_prepare_head($object);
-	dol_fiche_head($head, 'task_notes', $langs->trans('Task'), -1, 'projecttask', 0, '', 'reposition');
+	print dol_get_fiche_head($head, 'task_notes', $langs->trans('Task'), -1, 'projecttask', 0, '', 'reposition');
 
 
 	$param = (GETPOST('withproject') ? '&withproject=1' : '');
@@ -237,8 +237,8 @@ if ($object->id > 0)
 
 	if (!GETPOST('withproject') || empty($projectstatic->id))
 	{
-	    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
-	    $object->next_prev_filter = " fk_projet in (".$projectsListId.")";
+		$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
+		$object->next_prev_filter = " fk_projet in (".$projectsListId.")";
 	} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 	$morehtmlref = '';
@@ -246,30 +246,30 @@ if ($object->id > 0)
 	// Project
 	if (empty($withproject))
 	{
-	    $morehtmlref .= '<div class="refidno">';
-	    $morehtmlref .= $langs->trans("Project").': ';
-	    $morehtmlref .= $projectstatic->getNomUrl(1);
-	    $morehtmlref .= '<br>';
+		$morehtmlref .= '<div class="refidno">';
+		$morehtmlref .= $langs->trans("Project").': ';
+		$morehtmlref .= $projectstatic->getNomUrl(1);
+		$morehtmlref .= '<br>';
 
-	    // Third party
-	    $morehtmlref .= $langs->trans("ThirdParty").': ';
-	    $morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
-	    $morehtmlref .= '</div>';
+		// Third party
+		$morehtmlref .= $langs->trans("ThirdParty").': ';
+		$morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
+		$morehtmlref .= '</div>';
 	}
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
 
 	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 
 	$cssclass = 'titlefield';
-    $moreparam = $param;
+	$moreparam = $param;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php
index 849650d5473..571560518ab 100644
--- a/htdocs/projet/tasks/stats/index.php
+++ b/htdocs/projet/tasks/stats/index.php
@@ -133,7 +133,7 @@ $h++;
 
 complete_head_from_modules($conf, $langs, null, $head, $h, $type);
 
-dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1, '');
+print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1, '');
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 096eb62d0d0..230dd126de8 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -86,20 +86,20 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->projet->creer)
 	if (!$error)
 	{
 		$object->fetch($id, $ref);
-        $object->oldcopy = clone $object;
+		$object->oldcopy = clone $object;
 
 		$tmparray = explode('_', $_POST['task_parent']);
 		$task_parent = $tmparray[1];
 		if (empty($task_parent)) $task_parent = 0; // If task_parent is ''
 
 		$object->ref = $taskref ? $taskref : GETPOST("ref", 'alpha', 2);
-		$object->label = $_POST["label"];
-		$object->description = $_POST['description'];
+		$object->label = GETPOST("label", "alphanohtml");
+		$object->description = GETPOST('description', "alphanohtml");
 		$object->fk_task_parent = $task_parent;
 		$object->planned_workload = $planned_workload;
-		$object->date_start = dol_mktime($_POST['dateohour'], $_POST['dateomin'], 0, $_POST['dateomonth'], $_POST['dateoday'], $_POST['dateoyear']);
-		$object->date_end = dol_mktime($_POST['dateehour'], $_POST['dateemin'], 0, $_POST['dateemonth'], $_POST['dateeday'], $_POST['dateeyear']);
-		$object->progress = $_POST['progress'];
+		$object->date_start = dol_mktime(GETPOST('dateohour', 'int'), GETPOST('dateomin', 'int'), 0, GETPOST('dateomonth', 'int'), GETPOST('dateoday', 'int'), GETPOST('dateoyear', 'int'));
+		$object->date_end = dol_mktime(GETPOST('dateehour', 'int'), GETPOST('dateemin', 'int'), 0, GETPOST('dateemonth', 'int'), GETPOST('dateeday', 'int'), GETPOST('dateeyear', 'int'));
+		$object->progress = price2num(GETPOST('progress', 'alphanohtml'));
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost(null, $object);
@@ -110,7 +110,7 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->projet->creer)
 			$result = $object->update($user);
 			if ($result < 0)
 			{
-			    setEventMessages($object->error, $object->errors, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
 	} else {
@@ -130,13 +130,13 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->s
 			header('Location: '.DOL_URL_ROOT.'/projet/tasks.php?restore_lastsearch_values=1&id='.$projectstatic->id.($withproject ? '&withproject=1' : ''));
 			exit;
 		} else {
-		    setEventMessages($object->error, $object->errors, 'errors');
+			setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
 		}
 	}
 }
 
-// Retreive First Task ID of Project if withprojet is on to allow project prev next to work
+// Retrieve First Task ID of Project if withprojet is on to allow project prev next to work
 if (!empty($project_ref) && !empty($withproject))
 {
 	if ($projectstatic->fetch('', $project_ref) > 0)
@@ -169,7 +169,7 @@ if ($action == 'builddoc' && $user->rights->projet->creer)
 	if ($result <= 0)
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
-        $action = '';
+		$action = '';
 	}
 }
 
@@ -182,7 +182,7 @@ if ($action == 'remove_file' && $user->rights->projet->creer)
 	{
 		$langs->load("other");
 		$upload_dir = $conf->projet->dir_output;
-		$file = $upload_dir.'/'.GETPOST('file');
+		$file = $upload_dir.'/'.dol_sanitizeFileName(GETPOST('file'));
 
 		$ret = dol_delete_file($file);
 		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
@@ -190,11 +190,11 @@ if ($action == 'remove_file' && $user->rights->projet->creer)
 	}
 }
 
+
 /*
  * View
  */
 
-
 llxHeader('', $langs->trans("Task"));
 
 $form = new Form($db);
@@ -214,130 +214,130 @@ if ($id > 0 || !empty($ref))
 
 		$object->project = clone $projectstatic;
 
-		$userWrite = $projectstatic->restrictedProjectArea($user, 'write');
+		//$userWrite = $projectstatic->restrictedProjectArea($user, 'write');
 
 		if (!empty($withproject))
 		{
 			// Tabs for project
 			$tab = 'tasks';
 			$head = project_prepare_head($projectstatic);
-			dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'), 0, '', '');
+			print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'), 0, '', '');
 
 			$param = ($mode == 'mine' ? '&mode=mine' : '');
 
 			// Project card
 
-            $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+			$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-            $morehtmlref = '<div class="refidno">';
-            // Title
-            $morehtmlref .= $projectstatic->title;
-            // Thirdparty
-            if ($projectstatic->thirdparty->id > 0)
-            {
-                $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
-            }
-            $morehtmlref .= '</div>';
+			$morehtmlref = '<div class="refidno">';
+			// Title
+			$morehtmlref .= $projectstatic->title;
+			// Thirdparty
+			if ($projectstatic->thirdparty->id > 0)
+			{
+				$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
+			}
+			$morehtmlref .= '</div>';
 
-            // Define a complementary filter for search of next/prev ref.
-            if (!$user->rights->projet->all->lire)
-            {
-                $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
-                $projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
-            }
+			// Define a complementary filter for search of next/prev ref.
+			if (!$user->rights->projet->all->lire)
+			{
+				$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
+				$projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+			}
 
-            dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+			dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-            print '<div class="fichecenter">';
-            print '<div class="fichehalfleft">';
-            print '<div class="underbanner clearboth"></div>';
+			print '<div class="fichecenter">';
+			print '<div class="fichehalfleft">';
+			print '<div class="underbanner clearboth"></div>';
 
-            print '<table class="border tableforfield centpercent">';
+			print '<table class="border tableforfield centpercent">';
 
-            // Usage
-            print '<tr><td class="tdtop">';
-            print $langs->trans("Usage");
-            print '</td>';
-            print '<td>';
-            if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-            {
-            	print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
-            	$htmltext = $langs->trans("ProjectFollowOpportunity");
-            	print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
-            	print '<br>';
-            }
-            if (empty($conf->global->PROJECT_HIDE_TASKS))
-            {
-            	print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
-            	$htmltext = $langs->trans("ProjectFollowTasks");
-            	print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
-            	print '<br>';
-            }
-            if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
-            {
-            	print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
-            	$htmltext = $langs->trans("ProjectBillTimeDescription");
-            	print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
-            	print '<br>';
-            }
-            print '</td></tr>';
+			// Usage
+			print '<tr><td class="tdtop">';
+			print $langs->trans("Usage");
+			print '</td>';
+			print '<td>';
+			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+			{
+				print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
+				$htmltext = $langs->trans("ProjectFollowOpportunity");
+				print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
+				print '<br>';
+			}
+			if (empty($conf->global->PROJECT_HIDE_TASKS))
+			{
+				print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
+				$htmltext = $langs->trans("ProjectFollowTasks");
+				print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
+				print '<br>';
+			}
+			if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
+			{
+				print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
+				$htmltext = $langs->trans("ProjectBillTimeDescription");
+				print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
+				print '<br>';
+			}
+			print '</td></tr>';
 
-            // Visibility
-            print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-            if ($projectstatic->public) print $langs->trans('SharedProject');
-            else print $langs->trans('PrivateProject');
-            print '</td></tr>';
+			// Visibility
+			print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
+			if ($projectstatic->public) print $langs->trans('SharedProject');
+			else print $langs->trans('PrivateProject');
+			print '</td></tr>';
 
-            // Date start - end
-            print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
-            $start = dol_print_date($projectstatic->date_start, 'day');
-            print ($start ? $start : '?');
-            $end = dol_print_date($projectstatic->date_end, 'day');
-            print ' - ';
-            print ($end ? $end : '?');
-            if ($projectstatic->hasDelay()) print img_warning("Late");
-            print '</td></tr>';
+			// Date start - end
+			print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
+			$start = dol_print_date($projectstatic->date_start, 'day');
+			print ($start ? $start : '?');
+			$end = dol_print_date($projectstatic->date_end, 'day');
+			print ' - ';
+			print ($end ? $end : '?');
+			if ($projectstatic->hasDelay()) print img_warning("Late");
+			print '</td></tr>';
 
-            // Budget
-            print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-            if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
-            print '</td></tr>';
+			// Budget
+			print '<tr><td>'.$langs->trans("Budget").'</td><td>';
+			if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+			print '</td></tr>';
 
-            // Other attributes
-            $cols = 2;
-            //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+			// Other attributes
+			$cols = 2;
+			//include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
-            print '</table>';
+			print '</table>';
 
-            print '</div>';
+			print '</div>';
 
-            print '<div class="fichehalfright">';
-            print '<div class="ficheaddleft">';
-            print '<div class="underbanner clearboth"></div>';
+			print '<div class="fichehalfright">';
+			print '<div class="ficheaddleft">';
+			print '<div class="underbanner clearboth"></div>';
 
-            print '<table class="border centpercent">';
+			print '<table class="border centpercent">';
 
-            // Description
-            print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-            print nl2br($projectstatic->description);
-            print '</td></tr>';
+			// Description
+			print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
+			print nl2br($projectstatic->description);
+			print '</td></tr>';
 
-            // Categories
-            if ($conf->categorie->enabled) {
-                print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
-                print $form->showCategories($projectstatic->id, 'project', 1);
-                print "</td></tr>";
-            }
+			// Categories
+			if ($conf->categorie->enabled) {
+				print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
+				print $form->showCategories($projectstatic->id, 'project', 1);
+				print "</td></tr>";
+			}
 
-            print '</table>';
+			print '</table>';
 
-            print '</div>';
-            print '</div>';
-            print '</div>';
+			print '</div>';
+			print '</div>';
+			print '</div>';
 
-            print '<div class="clearboth"></div>';
+			print '<div class="clearboth"></div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<br>';
 		}
@@ -380,7 +380,7 @@ if ($id > 0 || !empty($ref))
 			print '<input type="hidden" name="withproject" value="'.$withproject.'">';
 			print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-			dol_fiche_head($head, 'task_task', $langs->trans("Task"), 0, 'projecttask', 0, '', '');
+			print dol_get_fiche_head($head, 'task_task', $langs->trans("Task"), 0, 'projecttask', 0, '', '');
 
 			print '<table class="border centpercent">';
 
@@ -417,7 +417,7 @@ if ($id > 0 || !empty($ref))
 			print '</td></tr>';
 
 			// Date end
-			print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
+			print '<tr><td>'.$langs->trans("Deadline").'</td><td>';
 			print $form->selectDate($object->date_end ? $object->date_end : -1, 'datee', 1, 1, 0, '', 1, 0);
 			print '</td></tr>';
 
@@ -440,7 +440,7 @@ if ($id > 0 || !empty($ref))
 			// Other options
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-            print $hookmanager->resPrint;
+			print $hookmanager->resPrint;
 			if (empty($reshook))
 			{
 				print $object->showOptionals($extrafields, 'edit');
@@ -448,11 +448,11 @@ if ($id > 0 || !empty($ref))
 
 			print '</table>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
 			print '<input type="submit" class="button" name="update" value="'.$langs->trans("Modify").'"> &nbsp; ';
-			print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+			print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 			print '</div>';
 
 			print '</form>';
@@ -463,7 +463,7 @@ if ($id > 0 || !empty($ref))
 			$param = ($withproject ? '&withproject=1' : '');
 			$linkback = $withproject ? '<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'&restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>' : '';
 
-			dol_fiche_head($head, 'task_task', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition');
+			print dol_get_fiche_head($head, 'task_task', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition');
 
 			if ($action == 'delete')
 			{
@@ -472,8 +472,8 @@ if ($id > 0 || !empty($ref))
 
 			if (!GETPOST('withproject') || empty($projectstatic->id))
 			{
-			    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
-			    $object->next_prev_filter = " fk_projet in (".$projectsListId.")";
+				$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
+				$object->next_prev_filter = " fk_projet in (".$projectsListId.")";
 			} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 			$morehtmlref = '';
@@ -481,17 +481,17 @@ if ($id > 0 || !empty($ref))
 			// Project
 			if (empty($withproject))
 			{
-			    $morehtmlref .= '<div class="refidno">';
-			    $morehtmlref .= $langs->trans("Project").': ';
-			    $morehtmlref .= $projectstatic->getNomUrl(1);
-			    $morehtmlref .= '<br>';
+				$morehtmlref .= '<div class="refidno">';
+				$morehtmlref .= $langs->trans("Project").': ';
+				$morehtmlref .= $projectstatic->getNomUrl(1);
+				$morehtmlref .= '<br>';
 
-			    // Third party
-			    $morehtmlref .= $langs->trans("ThirdParty").': ';
-			    if (!empty($projectstatic->thirdparty)) {
-                    $morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
-			    }
-			    $morehtmlref .= '</div>';
+				// Third party
+				$morehtmlref .= $langs->trans("ThirdParty").': ';
+				if (!empty($projectstatic->thirdparty)) {
+					$morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
+				}
+				$morehtmlref .= '</div>';
 			}
 
 			dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
@@ -513,13 +513,13 @@ if ($id > 0 || !empty($ref))
 			print '</td></tr>';
 
 			// Date start - Date end
-			print '<tr><td class="titlefield">'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td colspan="3">';
+			print '<tr><td class="titlefield">'.$langs->trans("DateStart").' - '.$langs->trans("Deadline").'</td><td colspan="3">';
 			$start = dol_print_date($object->date_start, 'dayhour');
-    		print ($start ? $start : '?');
+			print ($start ? $start : '?');
 			$end = dol_print_date($object->date_end, 'dayhour');
-    		print ' - ';
-    		print ($end ? $end : '?');
-    		if ($object->hasDelay()) print img_warning("Late");
+			print ' - ';
+			print ($end ? $end : '?');
+			if ($object->hasDelay()) print img_warning("Late");
 			print '</td></tr>';
 
 			// Planned workload
@@ -574,7 +574,7 @@ if ($id > 0 || !empty($ref))
 			print '</div>';
 			print '<div class="clearboth"></div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 		}
 
 
@@ -584,13 +584,13 @@ if ($id > 0 || !empty($ref))
 			 * Actions
  			 */
 
-		    print '<div class="tabsAction">';
+			print '<div class="tabsAction">';
 
-		    $parameters = array();
-		    $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
-		    // modified by hook
-		    if (empty($reshook))
-		    {
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
+			// modified by hook
+			if (empty($reshook))
+			{
 				// Modify
 				if ($user->rights->projet->creer)
 				{
@@ -602,21 +602,21 @@ if ($id > 0 || !empty($ref))
 				// Delete
 				if ($user->rights->projet->supprimer)
 				{
-				    if (!$object->hasChildren() && !$object->hasTimeSpent())
-				    {
+					if (!$object->hasChildren() && !$object->hasTimeSpent())
+					{
 						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'&amp;withproject='.$withproject.'">'.$langs->trans('Delete').'</a>';
-				    } else {
-				        print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("TaskHasChild").'">'.$langs->trans('Delete').'</a>';
-				    }
+					} else {
+						print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("TaskHasChild").'">'.$langs->trans('Delete').'</a>';
+					}
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Delete').'</a>';
 				}
 
 				print '</div>';
-		    }
+			}
 
-    		print '<div class="fichecenter"><div class="fichehalfleft">';
-    		print '<a name="builddoc"></a>'; // ancre
+			print '<div class="fichecenter"><div class="fichehalfleft">';
+			print '<a name="builddoc"></a>'; // ancre
 
 			/*
 			 * Documents generes
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index dfeb73bb3cc..c18ec6e4434 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -293,7 +293,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->l
 	}
 }
 
-// Retreive First Task ID of Project if withprojet is on to allow project prev next to work
+// Retrieve First Task ID of Project if withprojet is on to allow project prev next to work
 if (!empty($project_ref) && !empty($withproject))
 {
 	if ($projectstatic->fetch(0, $project_ref) > 0)
@@ -333,9 +333,7 @@ if ($action == 'confirm_generateinvoice')
 {
 	if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
 
-
-	if (!($projectstatic->thirdparty->id > 0))
-	{
+	if (!($projectstatic->thirdparty->id > 0)) {
 		setEventMessages($langs->trans("ThirdPartyRequiredToGenerateInvoice"), null, 'errors');
 	} else {
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -350,27 +348,28 @@ if ($action == 'confirm_generateinvoice')
 		$db->begin();
 		$idprod = GETPOST('productid', 'int');
 		$generateinvoicemode = GETPOST('generateinvoicemode', 'string');
-        $invoiceToUse = GETPOST('invoiceid', 'int');
+		$invoiceToUse = GETPOST('invoiceid', 'int');
 
-        $prodDurationHours = 1.0;
+		$prodDurationHours = 1.0;
 		if ($idprod > 0)
 		{
 			$tmpproduct->fetch($idprod);
-            if ($tmpproduct->duration_unit == 'i')
-                $prodDurationHours = 1. / 60;
-            if ($tmpproduct->duration_unit == 'h')
-                $prodDurationHours = 1.;
-            if ($tmpproduct->duration_unit == 'd')
-                $prodDurationHours = 24.;
-            if ($tmpproduct->duration_unit == 'w')
-                $prodDurationHours = 24. * 7;
-            if ($tmpproduct->duration_unit == 'm')
-                $prodDurationHours = 24. * 30;
-            if ($tmpproduct->duration_unit == 'y')
-                $prodDurationHours = 24. * 365;
-            $prodDurationHours *= $tmpproduct->duration_value;
+			if ($tmpproduct->duration_unit == 'i')
+				$prodDurationHours = 1. / 60;
+			if ($tmpproduct->duration_unit == 'h')
+				$prodDurationHours = 1.;
+			if ($tmpproduct->duration_unit == 'd')
+				$prodDurationHours = 24.;
+			if ($tmpproduct->duration_unit == 'w')
+				$prodDurationHours = 24. * 7;
+			if ($tmpproduct->duration_unit == 'm')
+				$prodDurationHours = 24. * 30;
+			if ($tmpproduct->duration_unit == 'y')
+				$prodDurationHours = 24. * 365;
+			$prodDurationHours *= $tmpproduct->duration_value;
 
 			$dataforprice = $tmpproduct->getSellPrice($mysoc, $projectstatic->thirdparty, 0);
+
 			$pu_ht = empty($dataforprice['pu_ht']) ? 0 : $dataforprice['pu_ht'];
 			$txtva = $dataforprice['tva_tx'];
 			$localtax1 = $dataforprice['localtax1'];
@@ -386,16 +385,16 @@ if ($action == 'confirm_generateinvoice')
 		$tmpinvoice->date = dol_mktime(GETPOST('rehour', 'int'), GETPOST('remin', 'int'), GETPOST('resec', 'int'), GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 		$tmpinvoice->fk_project = $projectstatic->id;
 
-        if ($invoiceToUse) {
-            $tmpinvoice->fetch($invoiceToUse);
-        } else {
-		    $result = $tmpinvoice->create($user);
-		    if ($result <= 0)
-		    {
-		    	$error++;
-		    	setEventMessages($tmpinvoice->error, $tmpinvoice->errors, 'errors');
-		    }
-        }
+		if ($invoiceToUse) {
+			$tmpinvoice->fetch($invoiceToUse);
+		} else {
+			$result = $tmpinvoice->create($user);
+			if ($result <= 0)
+			{
+				$error++;
+				setEventMessages($tmpinvoice->error, $tmpinvoice->errors, 'errors');
+			}
+		}
 
 		if (!$error)
 		{
@@ -585,7 +584,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			else $tab = 'tasks';
 
 			$head = project_prepare_head($projectstatic);
-			dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'));
+			print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'));
 
 			$param = ($mode == 'mine' ? '&mode=mine' : '');
 
@@ -700,7 +699,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 
 			print '<div class="clearboth"></div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<br>';
 		}
@@ -749,7 +748,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 	if (empty($projectidforalltimes))
 	{
 		$head = task_prepare_head($object);
-		dol_fiche_head($head, 'task_time', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition');
+		print dol_get_fiche_head($head, 'task_time', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition');
 
 		if ($action == 'deleteline')
 		{
@@ -842,7 +841,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		print '</div>';
 		print '<div class="clearboth"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 	}
 
 
@@ -916,69 +915,79 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		print '<input type="hidden" name="withproject" value="'.$withproject.'">';
 		print '<input type="hidden" name="tab" value="'.$tab.'">';
 
+		// Form to convert time spent into invoice
 		if ($massaction == 'generateinvoice')
 		{
-			//var_dump($_REQUEST);
 			print '<input type="hidden" name="massaction" value="confirm_createbills">';
 
-			print '<table class="noborder" width="100%" >';
-			print '<tr>';
-			print '<td class="titlefield">';
-			print $langs->trans('DateInvoice');
-			print '</td>';
-			print '<td>';
-			print $form->selectDate('', '', '', '', '', '', 1, 1);
-			print '</td>';
-			print '</tr>';
-			print '<tr>';
-			print '<td>';
-			print $langs->trans('Mode');
-			print '</td>';
-			print '<td>';
-			$tmparray = array(
-				'onelineperuser'=>'OneLinePerUser',
-				'onelinepertask'=>'OneLinePerTask',
-				'onelineperperiod'=>'OneLinePerPeriod',
-			);
-			print $form->selectarray('generateinvoicemode', $tmparray, 'onelineperuser', 0, 0, 0, '', 1);
-			print '</td>';
-			print '</tr>';
-			if ($conf->service->enabled)
-			{
+			if ($projectstatic->thirdparty->id > 0) {
+				print '<table class="noborder" width="100%" >';
 				print '<tr>';
-				print '<td>';
-				print $langs->trans('ServiceToUseOnLines');
+				print '<td class="titlefield">';
+				print $langs->trans('DateInvoice');
 				print '</td>';
 				print '<td>';
-				$form->select_produits('', 'productid', '1', 0, 0, 1, 2, '', 0, array(), 0, 'None', 0, 'maxwidth500');
+				print $form->selectDate('', '', '', '', '', '', 1, 1);
 				print '</td>';
 				print '</tr>';
-			}
-			print '<tr>';
-			print '<td class="titlefield">';
-			print $langs->trans('InvoiceToUse');
-			print '</td>';
-			print '<td>';
-            $form->selectInvoice('invoice', '', 'invoiceid', 24, 0, $langs->trans('NewInvoice'),
-			1, 0, 0, 'maxwidth500', '', 'all');
-			print '</td>';
-			print '</tr>';
-			/*print '<tr>';
-			print '<td>';
-			print $langs->trans('ValidateInvoices');
-			print '</td>';
-			print '<td>';
-			print $form->selectyesno('validate_invoices', 0, 1);
-			print '</td>';
-			print '</tr>';*/
-			print '</table>';
 
-			print '<br>';
-			print '<div class="center">';
-			print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('GenerateBill').'">  ';
-			print '<input type="submit" class="button" id="cancel" name="cancel" value="'.$langs->trans('Cancel').'">';
-			print '</div>';
-			print '<br>';
+				print '<tr>';
+				print '<td>';
+				print $langs->trans('Mode');
+				print '</td>';
+				print '<td>';
+				$tmparray = array(
+					'onelineperuser'=>'OneLinePerUser',
+					'onelinepertask'=>'OneLinePerTask',
+					'onelineperperiod'=>'OneLinePerPeriod',
+				);
+				print $form->selectarray('generateinvoicemode', $tmparray, 'onelineperuser', 0, 0, 0, '', 1);
+				print '</td>';
+				print '</tr>';
+
+				if ($conf->service->enabled)
+				{
+					print '<tr>';
+					print '<td>';
+					print $langs->trans('ServiceToUseOnLines');
+					print '</td>';
+					print '<td>';
+					$form->select_produits('', 'productid', '1', 0, $projectstatic->thirdparty->price_level, 1, 2, '', 0, array(), $projectstatic->thirdparty->id, 'None', 0, 'maxwidth500');
+					print '</td>';
+					print '</tr>';
+				}
+
+				print '<tr>';
+				print '<td class="titlefield">';
+				print $langs->trans('InvoiceToUse');
+				print '</td>';
+				print '<td>';
+				$form->selectInvoice('invoice', '', 'invoiceid', 24, 0, $langs->trans('NewInvoice'), 1, 0, 0, 'maxwidth500', '', 'all');
+				print '</td>';
+				print '</tr>';
+				/*print '<tr>';
+				print '<td>';
+				print $langs->trans('ValidateInvoices');
+				print '</td>';
+				print '<td>';
+				print $form->selectyesno('validate_invoices', 0, 1);
+				print '</td>';
+				print '</tr>';*/
+				print '</table>';
+
+				print '<br>';
+				print '<div class="center">';
+				print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('GenerateBill').'">  ';
+				print '<input type="submit" class="button button-cancel" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+				print '</div>';
+				print '<br>';
+			} else {
+				print '<div class="warning">'.$langs->trans("ThirdPartyRequiredToGenerateInvoice").'</div>';
+				print '<div class="center">';
+				print '<input type="submit" class="button button-cancel" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+				print '</div>';
+				$massaction = '';
+			}
 		}
 
 		/*
@@ -1065,7 +1074,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		}
 
 		/*
-		 * Form to add time spent
+		 * Form to add a new line of time spent
 		 */
 		if ($action == 'createtime' && $user->rights->projet->lire)
 		{
@@ -1154,7 +1163,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 
 			print '<td class="center">';
 			print '<input type="submit" name="save" class="button buttongen marginleftonly margintoponlyshort marginbottomonlyshort" value="'.$langs->trans("Add").'">';
-			print '<input type="submit" name="cancel" class="button buttongen marginleftonly margintoponlyshort marginbottomonlyshort" value="'.$langs->trans("Cancel").'">';
+			print '<input type="submit" name="cancel" class="button buttongen marginleftonly margintoponlyshort marginbottomonlyshort button-cancel" value="'.$langs->trans("Cancel").'">';
 			print '</td></tr>';
 
 			print '</table>';
@@ -1286,11 +1295,11 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			}
 
 			// Task ref
-            if (!empty($arrayfields['t.task_ref']['checked']))
-            {
-        		if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))   // Not a dedicated task
-    			{
-        			print '<td class="nowrap">';
+			if (!empty($arrayfields['t.task_ref']['checked']))
+			{
+				if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))   // Not a dedicated task
+				{
+					print '<td class="nowrap">';
 					if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
 					{
 						$formproject->selectTasks(-1, GETPOST('taskid', 'int') ?GETPOST('taskid', 'int') : $task_time->fk_task, 'taskid', 0, 0, 1, 1, 0, 0, 'maxwidth300', $projectstatic->id, '');
@@ -1300,12 +1309,12 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 						$tasktmp->label = $task_time->label;
 						print $tasktmp->getNomUrl(1, 'withproject', 'time');
 					}
-        			print '</td>';
-        			if (!$i) $totalarray['nbfield']++;
-    			}
-            } else {
-            	print '<input type="hidden" name="taskid" value="'.$id.'">';
-            }
+					print '</td>';
+					if (!$i) $totalarray['nbfield']++;
+				}
+			} else {
+				print '<input type="hidden" name="taskid" value="'.$id.'">';
+			}
 
 			// Task label
 			if (!empty($arrayfields['t.task_label']['checked']))
@@ -1388,7 +1397,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			if (!empty($arrayfields['value']['checked']))
 			{
 				print '<td class="nowraponall right">';
-				$value = price2num($task_time->thm * $task_time->task_duration / 3600, 'MT');
+				$value = price2num($task_time->thm * $task_time->task_duration / 3600, 'MT', 1);
 				print price($value, 1, $langs, 1, -1, -1, $conf->currency);
 				print '</td>';
 				if (!$i) $totalarray['nbfield']++;
@@ -1422,8 +1431,6 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				}
 				print '</td>';
 				if (!$i) $totalarray['nbfield']++;
-				if (!$i) $totalarray['totalvaluebilledfield'] = $totalarray['nbfield'];
-				$totalarray['totalvaluebilled'] += $valuebilled;
 			}
 
 			/*
@@ -1441,9 +1448,9 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			if (($action == 'editline' || $action == 'splitline') && $_GET['lineid'] == $task_time->rowid)
 			{
 				print '<input type="hidden" name="lineid" value="'.$_GET['lineid'].'">';
-				print '<input type="submit" class="button buttongen margintoponlyshort marginbottomonlyshort" name="save" value="'.$langs->trans("Save").'">';
+				print '<input type="submit" class="button buttongen margintoponlyshort marginbottomonlyshort button-save" name="save" value="'.$langs->trans("Save").'">';
 				print '<br>';
-				print '<input type="submit" class="button buttongen margintoponlyshort marginbottomonlyshort" name="cancel" value="'.$langs->trans('Cancel').'">';
+				print '<input type="submit" class="button buttongen margintoponlyshort marginbottomonlyshort button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 			} elseif ($user->rights->projet->lire || $user->rights->projet->all->creer)	 // Read project and enter time consumed on assigned tasks
 			{
 				if ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids) || $user->rights->projet->all->creer)
@@ -1462,7 +1469,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					print '</a>';
 
 					print '&nbsp;';
-					print '<a class="reposition paddingleft" href="'.$_SERVER["PHP_SELF"].'?id='.$task_time->fk_task.'&amp;action=deletelin&amp;token='.newToken().'&amp;lineid='.$task_time->rowid.$param.((empty($id) || $tab == 'timespent') ? '&tab=timespent' : '').'">';
+					print '<a class="reposition paddingleft" href="'.$_SERVER["PHP_SELF"].'?id='.$task_time->fk_task.'&amp;action=deleteline&amp;token='.newToken().'&amp;lineid='.$task_time->rowid.$param.((empty($id) || $tab == 'timespent') ? '&tab=timespent' : '').'">';
 					print img_delete('default', 'class="pictodelete paddingleft"');
 					print '</a>';
 
@@ -1590,7 +1597,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				if (!empty($arrayfields['value']['checked']))
 				{
 					print '<td class="right">';
-					$value = price2num($task_time->thm * $task_time->task_duration / 3600);
+					$value = price2num($task_time->thm * $task_time->task_duration / 3600, 'MT', 1);
 					print price($value, 1, $langs, 1, -1, -1, $conf->currency);
 					print '</td>';
 				}
@@ -1599,7 +1606,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				if (!empty($arrayfields['valuebilled']['checked']))
 				{
 					print '<td class="right">';
-					$valuebilled = price2num($task_time->total_ht);
+					$valuebilled = price2num($task_time->total_ht, '', 1);
 					if (isset($task_time->total_ht)) print price($valuebilled, 1, $langs, 1, -1, -1, $conf->currency);
 					print '</td>';
 				}
@@ -1737,7 +1744,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				if (!empty($arrayfields['valuebilled']['checked']))
 				{
 					print '<td class="right">';
-					$valuebilled = price2num($task_time->total_ht);
+					$valuebilled = price2num($task_time->total_ht, '', 1);
 					if (isset($task_time->total_ht)) print price($valuebilled, 1, $langs, 1, -1, -1, $conf->currency);
 					print '</td>';
 				}
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index 9530757b283..395bfd8915a 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -34,7 +34,7 @@ if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't nee
 if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
 if (!defined('NOLOGIN'))        define("NOLOGIN", 1); // This means this output page does not require to be logged.
 if (!defined('NOCSRFCHECK'))    define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
-if (!defined('NOIPCHECK'))		 define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
 
 
 // It's a wrapper, so empty header
@@ -58,6 +58,11 @@ function llxFooterVierge()
 	print '</body></html>';
 }
 
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) define("DOLENTITY", $entity);
+
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
diff --git a/htdocs/public/cron/cron_run_jobs.php b/htdocs/public/cron/cron_run_jobs.php
index 9eb0579680a..cd5f1e3be51 100644
--- a/htdocs/public/cron/cron_run_jobs.php
+++ b/htdocs/public/cron/cron_run_jobs.php
@@ -28,6 +28,7 @@ if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
 if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
 if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
 if (!defined('NOLOGIN'))        define('NOLOGIN', '1');
+if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
@@ -37,8 +38,8 @@ if (is_numeric($entity)) define("DOLENTITY", $entity);
 // Error if CLI mode
 if (php_sapi_name() == "cli")
 {
-    echo "Error: This page can't be used as a CLI script. For the CLI version of script, launch cron_run_job.php available into scripts/cron/ directory.\n";
-    exit(-1);
+	echo "Error: This page can't be used as a CLI script. For the CLI version of script, launch cron_run_job.php available into scripts/cron/ directory.\n";
+	exit(-1);
 }
 
 // librarie core
@@ -139,57 +140,57 @@ $nbofjobslaunchedko = 0;
 
 if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0))
 {
-    $savconf = dol_clone($conf);
+	$savconf = dol_clone($conf);
 
-    // Loop over job
+	// Loop over job
 	foreach ($qualifiedjobs as $line)
 	{
-	    dol_syslog("cron_run_jobs.php cronjobid: ".$line->id." priority=".$line->priority." entity=".$line->entity." label=".$line->label, LOG_DEBUG);
-	    echo "cron_run_jobs.php cronjobid: ".$line->id." priority=".$line->priority." entity=".$line->entity." label=".$line->label;
+		dol_syslog("cron_run_jobs.php cronjobid: ".$line->id." priority=".$line->priority." entity=".$line->entity." label=".$line->label, LOG_DEBUG);
+		echo "cron_run_jobs.php cronjobid: ".$line->id." priority=".$line->priority." entity=".$line->entity." label=".$line->label;
 
 		// Force reload of setup for the current entity
 		if ($line->entity != $conf->entity)
 		{
-		    dol_syslog("cron_run_jobs.php we work on another entity so we reload user and conf", LOG_DEBUG);
-		    echo " -> we change entity so we reload user and conf";
+			dol_syslog("cron_run_jobs.php we work on another entity so we reload user and conf", LOG_DEBUG);
+			echo " -> we change entity so we reload user and conf";
 
-		    $conf->entity = (empty($line->entity) ? 1 : $line->entity);
-		    $conf->setValues($db); // This make also the $mc->setValues($conf); that reload $mc->sharings
+			$conf->entity = (empty($line->entity) ? 1 : $line->entity);
+			$conf->setValues($db); // This make also the $mc->setValues($conf); that reload $mc->sharings
 
-		    // Force recheck that user is ok for the entity to process and reload permission for entity
-		    if ($conf->entity != $user->entity && $user->entity != 0)
-		    {
-		        $result = $user->fetch('', $userlogin, '', 0, $conf->entity);
-		        if ($result < 0)
-		        {
-		            echo "\nUser Error: ".$user->error."\n";
-		            dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
-		            exit(-1);
-		        } else {
-		            if ($result == 0)
-		            {
-		                echo "\nUser login: ".$userlogin." does not exists for entity ".$conf->entity."\n";
-		                dol_syslog("User login:".$userlogin." does not exists", LOG_ERR);
-		                exit(-1);
-		            }
-		        }
-		        $user->getrights();
-		    }
+			// Force recheck that user is ok for the entity to process and reload permission for entity
+			if ($conf->entity != $user->entity && $user->entity != 0)
+			{
+				$result = $user->fetch('', $userlogin, '', 0, $conf->entity);
+				if ($result < 0)
+				{
+					echo "\nUser Error: ".$user->error."\n";
+					dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
+					exit(-1);
+				} else {
+					if ($result == 0)
+					{
+						echo "\nUser login: ".$userlogin." does not exists for entity ".$conf->entity."\n";
+						dol_syslog("User login:".$userlogin." does not exists", LOG_ERR);
+						exit(-1);
+					}
+				}
+				$user->getrights();
+			}
 		}
 
 		//If date_next_jobs is less of current date, execute the program, and store the execution time of the next execution in database
 		if (($line->datenextrun < $now) && (empty($line->datestart) || $line->datestart <= $now) && (empty($line->dateend) || $line->dateend >= $now))
 		{
-		    echo " - qualified";
+			echo " - qualified";
 
-		    dol_syslog("cron_run_jobs.php line->datenextrun:".dol_print_date($line->datenextrun, 'dayhourrfc')." line->datestart:".dol_print_date($line->datestart, 'dayhourrfc')." line->dateend:".dol_print_date($line->dateend, 'dayhourrfc')." now:".dol_print_date($now, 'dayhourrfc'));
+			dol_syslog("cron_run_jobs.php line->datenextrun:".dol_print_date($line->datenextrun, 'dayhourrfc')." line->datestart:".dol_print_date($line->datestart, 'dayhourrfc')." line->dateend:".dol_print_date($line->dateend, 'dayhourrfc')." now:".dol_print_date($now, 'dayhourrfc'));
 
 			$cronjob = new Cronjob($db);
 			$result = $cronjob->fetch($line->id);
 			if ($result < 0)
 			{
-			    echo "Error cronjobid: ".$line->id." cronjob->fetch: ".$cronjob->error."\n";
-			    echo "Failed to fetch job ".$line->id."\n";
+				echo "Error cronjobid: ".$line->id." cronjob->fetch: ".$cronjob->error."\n";
+				echo "Failed to fetch job ".$line->id."\n";
 				dol_syslog("cron_run_jobs.php::fetch Error".$cronjob->error, LOG_ERR);
 				exit;
 			}
@@ -197,10 +198,10 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0))
 			$result = $cronjob->run_jobs($userlogin);
 			if ($result < 0)
 			{
-			    echo "Error cronjobid: ".$line->id." cronjob->run_job: ".$cronjob->error."\n";
-			    echo "At least one job failed. Go on menu Home-Setup-Admin tools to see result for each job.\n";
-			    echo "You can also enable module Log if not yet enabled, run again and take a look into dolibarr.log file\n";
-			    dol_syslog("cron_run_jobs.php::run_jobs Error".$cronjob->error, LOG_ERR);
+				echo "Error cronjobid: ".$line->id." cronjob->run_job: ".$cronjob->error."\n";
+				echo "At least one job failed. Go on menu Home-Setup-Admin tools to see result for each job.\n";
+				echo "You can also enable module Log if not yet enabled, run again and take a look into dolibarr.log file\n";
+				dol_syslog("cron_run_jobs.php::run_jobs Error".$cronjob->error, LOG_ERR);
 				$nbofjobslaunchedko++;
 			} else {
 				$nbofjobslaunchedok++;
@@ -212,17 +213,17 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0))
 			$result = $cronjob->reprogram_jobs($userlogin, $now);
 			if ($result < 0)
 			{
-			    echo "Error cronjobid: ".$line->id." cronjob->reprogram_job: ".$cronjob->error."\n";
-			    echo "Enable module Log if not yet enabled, run again and take a look into dolibarr.log file\n";
-			    dol_syslog("cron_run_jobs.php::reprogram_jobs Error".$cronjob->error, LOG_ERR);
+				echo "Error cronjobid: ".$line->id." cronjob->reprogram_job: ".$cronjob->error."\n";
+				echo "Enable module Log if not yet enabled, run again and take a look into dolibarr.log file\n";
+				dol_syslog("cron_run_jobs.php::reprogram_jobs Error".$cronjob->error, LOG_ERR);
 				exit;
 			}
 
 			echo " - reprogrammed\n";
 		} else {
-		    echo " - not qualified\n";
+			echo " - not qualified\n";
 
-		    dol_syslog("cron_run_jobs.php job not qualified line->datenextrun:".dol_print_date($line->datenextrun, 'dayhourrfc')." line->datestart:".dol_print_date($line->datestart, 'dayhourrfc')." line->dateend:".dol_print_date($line->dateend, 'dayhourrfc')." now:".dol_print_date($now, 'dayhourrfc'));
+			dol_syslog("cron_run_jobs.php job not qualified line->datenextrun:".dol_print_date($line->datenextrun, 'dayhourrfc')." line->datestart:".dol_print_date($line->datestart, 'dayhourrfc')." line->dateend:".dol_print_date($line->dateend, 'dayhourrfc')." now:".dol_print_date($now, 'dayhourrfc'));
 		}
 	}
 
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index ebf41e81feb..dbfeeebbf58 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -24,8 +24,10 @@
  *		\brief      Entry page to access demo
  */
 
-define("NOLOGIN", 1); // This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+if (!defined('NOLOGIN'))        define('NOLOGIN', '1');
+if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', 1);
+if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
 
 require '../../main.inc.php';
 require_once '../../core/lib/functions2.lib.php';
@@ -270,7 +272,7 @@ print "\n";
 
 print '<div class="demoban demobackground">';
 print '<div class="right" style="padding-right: 30px; padding-top: 30px;">';
-print '<a alt="Official portal of your ERP CRM application" targe="_blank" href="https://www.dolibarr.org"><img class="demologo" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" alt="Dolibarr logo"></a>';
+print '<a alt="Official portal of your ERP CRM application" targe="_blank" href="https://www.dolibarr.org?utm_medium=website&utm_source=demo"><img class="demologo" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" alt="Dolibarr logo"></a>';
 print '</div>';
 print '</div>';
 
@@ -445,11 +447,9 @@ $db->close();
  */
 function llxHeaderVierge($title, $head = "")
 {
-	global $user, $conf, $langs;
-
 	top_httphead();
 
-	top_htmlhead($head, $title, 0, 0, array(), array('public/demo/demo.css'));
+	top_htmlhead($head, $title, 0, 0, array(), array('public/demo/demo.css'), 0, 1);
 
 	print '<body class="demobody"><div class="demobackgrounddiv">'."\n";
 }
diff --git a/htdocs/public/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php
index 294167bb574..70b55981816 100644
--- a/htdocs/public/donations/donateurs_code.php
+++ b/htdocs/public/donations/donateurs_code.php
@@ -22,8 +22,10 @@
  *		\brief      Page to list donators
  */
 
-define("NOLOGIN", 1); // This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+if (!defined('NOLOGIN'))        define('NOLOGIN', '1');
+if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
+if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
 
 // C'est un wrapper, donc header vierge
 /**
@@ -33,7 +35,7 @@ define("NOCSRFCHECK", 1); // We accept to go on this page from external web site
  */
 function llxHeaderVierge()
 {
-    print '<html><title>Export agenda cal</title><body>';
+	print '<html><title>List of donators</title><body>';
 }
 /**
  * Header function
@@ -42,7 +44,7 @@ function llxHeaderVierge()
  */
 function llxFooterVierge()
 {
-    print '</body></html>';
+	print '</body></html>';
 }
 
 require '../../main.inc.php';
diff --git a/htdocs/public/emailing/mailing-read.php b/htdocs/public/emailing/mailing-read.php
index 7709ab5e28b..ccbf8f5c1d3 100644
--- a/htdocs/public/emailing/mailing-read.php
+++ b/htdocs/public/emailing/mailing-read.php
@@ -25,11 +25,13 @@
  *      \brief      Script use to update mail status if destinaries read it (if images during mail read are display)
  */
 
-if (!defined('NOLOGIN'))        define("NOLOGIN", 1); // This means this output page does not require to be logged.
+if (!defined('NOLOGIN'))        define('NOLOGIN', '1');
+if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
 if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
-if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1'); // Do not check anti CSRF attack test
 if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Do not check anti POST attack test
 if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no need to load and show top and left menu
+if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
 
 /**
  * Header empty
diff --git a/htdocs/public/emailing/mailing-unsubscribe.php b/htdocs/public/emailing/mailing-unsubscribe.php
index d26bae234db..0d62545cf57 100644
--- a/htdocs/public/emailing/mailing-unsubscribe.php
+++ b/htdocs/public/emailing/mailing-unsubscribe.php
@@ -27,9 +27,11 @@
  *                  https://myserver/public/emailing/mailing-unsubscribe.php?unsuscrib=1&securitykey=securitykey&tag=abcdefghijklmn
  */
 
-if (!defined('NOLOGIN'))        define("NOLOGIN", 1); // This means this output page does not require to be logged.
-if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1'); // Do not check anti CSRF attack test
+if (!defined('NOLOGIN'))        define('NOLOGIN', '1');
+if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
 if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no need to load and show top and left menu
+if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
 
 /**
  * Header empty
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index eea293504d2..1946125dbc2 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -40,6 +40,8 @@
 if (!defined('NOLOGIN'))		define("NOLOGIN", 1); // This means this output page does not require to be logged.
 if (!defined('NOCSRFCHECK'))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
 if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
+if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
@@ -67,12 +69,14 @@ $langs->loadLangs(array("main", "members", "companies", "install", "other"));
 // Security check
 if (empty($conf->adherent->enabled)) accessforbidden('', 0, 0, 1);
 
-if (empty($conf->global->MEMBER_ENABLE_PUBLIC))
-{
-    print $langs->trans("Auto subscription form for public visitors has not been enabled");
-    exit;
+if (empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
+	print $langs->trans("Auto subscription form for public visitors has not been enabled");
+	exit;
 }
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('publicnewmembercard', 'globalcard'));
+
 $extrafields = new ExtraFields($db);
 
 $object = new Adherent($db);
@@ -93,43 +97,39 @@ $user->loadDefaultValues();
  */
 function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '')
 {
-    global $user, $conf, $langs, $mysoc;
+	global $user, $conf, $langs, $mysoc;
 
-    top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
+	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
 
-    print '<body id="mainbody" class="publicnewmemberform">';
+	print '<body id="mainbody" class="publicnewmemberform">';
 
-    // Define urllogo
-    $urllogo = DOL_URL_ROOT.'/theme/common/login_logo.png';
+	// Define urllogo
+	$urllogo = DOL_URL_ROOT.'/theme/common/login_logo.png';
 
-    if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
-    {
-        $urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
-    } elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
-    {
-        $urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo);
-    } elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg'))
-    {
-        $urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
-    }
+	if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
+		$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
+	} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
+		$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo);
+	} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg')) {
+		$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
+	}
 
 	print '<div class="center">';
-    // Output html code for logo
-    if ($urllogo)
-    {
-    	print '<div class="backgreypublicpayment">';
-    	print '<div class="logopublicpayment">';
-    	print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
-    	print '>';
-    	print '</div>';
-    	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
-    		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
-    	}
-    	print '</div>';
-    }
-    print '</div>';
+	// Output html code for logo
+	if ($urllogo) {
+		print '<div class="backgreypublicpayment">';
+		print '<div class="logopublicpayment">';
+		print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
+		print '>';
+		print '</div>';
+		if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+			print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
+		}
+		print '</div>';
+	}
+	print '</div>';
 
-    print '<div class="divmainbodylarge">';
+	print '<div class="divmainbodylarge">';
 }
 
 /**
@@ -139,12 +139,12 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
  */
 function llxFooterVierge()
 {
-    print '</div>';
+	print '</div>';
 
-    printCommonFooter('public');
+	printCommonFooter('public');
 
-    print "</body>\n";
-    print "</html>\n";
+	print "</body>\n";
+	print "</html>\n";
 }
 
 
@@ -152,195 +152,178 @@ function llxFooterVierge()
 /*
  * Actions
  */
+$parameters = array();
+// Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 // Action called when page is submitted
-if ($action == 'add')
-{
+if (empty($reshook) && $action == 'add') {
 	$error = 0;
 	$urlback = '';
 
 	$db->begin();
 
-    // test if login already exists
-    if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-    {
-        if (!GETPOST('login'))
-        {
-            $error++;
-            $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login"))."<br>\n";
-        }
-        $sql = "SELECT login FROM ".MAIN_DB_PREFIX."adherent WHERE login='".$db->escape(GETPOST('login'))."'";
-        $result = $db->query($sql);
-        if ($result)
-        {
-            $num = $db->num_rows($result);
-        }
-        if ($num != 0)
-        {
-            $error++;
-            $langs->load("errors");
-            $errmsg .= $langs->trans("ErrorLoginAlreadyExists")."<br>\n";
-        }
-        if (!isset($_POST["pass1"]) || !isset($_POST["pass2"]) || $_POST["pass1"] == '' || $_POST["pass2"] == '' || $_POST["pass1"] != $_POST["pass2"])
-        {
-            $error++;
-            $langs->load("errors");
-            $errmsg .= $langs->trans("ErrorPasswordsMustMatch")."<br>\n";
-        }
-        if (!GETPOST("email"))
-        {
-            $error++;
-            $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("EMail"))."<br>\n";
-        }
-    }
-    if (GETPOST('type') <= 0)
-    {
-        $error++;
-        $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"))."<br>\n";
-    }
-    if (!in_array(GETPOST('morphy'), array('mor', 'phy')))
-    {
-        $error++;
-        $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv('Nature'))."<br>\n";
-    }
-    if (empty($_POST["lastname"]))
-    {
-        $error++;
-        $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Lastname"))."<br>\n";
-    }
-    if (empty($_POST["firstname"]))
-    {
-        $error++;
-        $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Firstname"))."<br>\n";
-    }
-    if (GETPOST("email") && !isValidEmail(GETPOST("email")))
-    {
-        $error++;
-        $langs->load("errors");
-        $errmsg .= $langs->trans("ErrorBadEMail", GETPOST("email"))."<br>\n";
-    }
-    $birthday = dol_mktime($_POST["birthhour"], $_POST["birthmin"], $_POST["birthsec"], $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
-    if ($_POST["birthmonth"] && empty($birthday))
-    {
-        $error++;
-        $langs->load("errors");
-        $errmsg .= $langs->trans("ErrorBadDateFormat")."<br>\n";
-    }
-    if (!empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER))
-    {
-        if (GETPOST("morphy") == 'mor' && GETPOST('budget') <= 0)
-        {
-            $error++;
-            $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("TurnoverOrBudget"))."<br>\n";
-        }
-    }
+	// test if login already exists
+	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
+		if (!GETPOST('login')) {
+			$error++;
+			$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login"))."<br>\n";
+		}
+		$sql = "SELECT login FROM ".MAIN_DB_PREFIX."adherent WHERE login='".$db->escape(GETPOST('login'))."'";
+		$result = $db->query($sql);
+		if ($result) {
+			$num = $db->num_rows($result);
+		}
+		if ($num != 0) {
+			$error++;
+			$langs->load("errors");
+			$errmsg .= $langs->trans("ErrorLoginAlreadyExists")."<br>\n";
+		}
+		if (!GETPOSTISSET("pass1") || !GETPOSTISSET("pass2") || GETPOST("pass1", 'none') == '' || GETPOST("pass2", 'none') == '' || GETPOST("pass1", 'none') != GETPOST("pass2", 'none')) {
+			$error++;
+			$langs->load("errors");
+			$errmsg .= $langs->trans("ErrorPasswordsMustMatch")."<br>\n";
+		}
+		if (!GETPOST("email")) {
+			$error++;
+			$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("EMail"))."<br>\n";
+		}
+	}
+	if (GETPOST('type') <= 0) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"))."<br>\n";
+	}
+	if (!in_array(GETPOST('morphy'), array('mor', 'phy'))) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv('Nature'))."<br>\n";
+	}
+	if (empty($_POST["lastname"])) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Lastname"))."<br>\n";
+	}
+	if (empty($_POST["firstname"])) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Firstname"))."<br>\n";
+	}
+	if (GETPOST("email") && !isValidEmail(GETPOST("email"))) {
+		$error++;
+		$langs->load("errors");
+		$errmsg .= $langs->trans("ErrorBadEMail", GETPOST("email"))."<br>\n";
+	}
+	$birthday = dol_mktime($_POST["birthhour"], $_POST["birthmin"], $_POST["birthsec"], $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
+	if ($_POST["birthmonth"] && empty($birthday)) {
+		$error++;
+		$langs->load("errors");
+		$errmsg .= $langs->trans("ErrorBadDateFormat")."<br>\n";
+	}
+	if (!empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) {
+		if (GETPOST("morphy") == 'mor' && GETPOST('budget') <= 0) {
+			$error++;
+			$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("TurnoverOrBudget"))."<br>\n";
+		}
+	}
 
-    if (isset($public)) $public = 1;
-    else $public = 0;
+	if (isset($public)) $public = 1;
+	else $public = 0;
 
-    if (!$error)
-    {
-        // email a peu pres correct et le login n'existe pas
-        $adh = new Adherent($db);
-        $adh->statut      = -1;
-        $adh->public      = $public;
-        $adh->firstname   = $_POST["firstname"];
-        $adh->lastname    = $_POST["lastname"];
-        $adh->gender      = $_POST["gender"];
-        $adh->civility_id = $_POST["civility_id"];
-        $adh->societe     = $_POST["societe"];
-        $adh->address     = $_POST["address"];
-        $adh->zip         = $_POST["zipcode"];
-        $adh->town        = $_POST["town"];
-        $adh->email       = $_POST["email"];
-        if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-        {
-            $adh->login       = $_POST["login"];
-            $adh->pass        = $_POST["pass1"];
-        }
-        $adh->photo       = $_POST["photo"];
-        $adh->country_id  = $_POST["country_id"];
-        $adh->state_id    = $_POST["state_id"];
-        $adh->typeid      = $_POST["type"];
-        $adh->note_private = $_POST["note_private"];
-        $adh->morphy      = $_POST["morphy"];
-        $adh->birth       = $birthday;
+	if (!$error) {
+		// email a peu pres correct et le login n'existe pas
+		$adh = new Adherent($db);
+		$adh->statut      = -1;
+		$adh->public      = $public;
+		$adh->firstname   = $_POST["firstname"];
+		$adh->lastname    = $_POST["lastname"];
+		$adh->gender      = $_POST["gender"];
+		$adh->civility_id = $_POST["civility_id"];
+		$adh->societe     = $_POST["societe"];
+		$adh->address     = $_POST["address"];
+		$adh->zip         = $_POST["zipcode"];
+		$adh->town        = $_POST["town"];
+		$adh->email       = $_POST["email"];
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
+			$adh->login       = $_POST["login"];
+			$adh->pass        = $_POST["pass1"];
+		}
+		$adh->photo       = $_POST["photo"];
+		$adh->country_id  = $_POST["country_id"];
+		$adh->state_id    = $_POST["state_id"];
+		$adh->typeid      = $_POST["type"];
+		$adh->note_private = $_POST["note_private"];
+		$adh->morphy      = $_POST["morphy"];
+		$adh->birth       = $birthday;
 
 
-        // Fill array 'array_options' with data from add form
-        $extrafields->fetch_name_optionals_label($adh->table_element);
-        $ret = $extrafields->setOptionalsFromPost(null, $adh);
+		// Fill array 'array_options' with data from add form
+		$extrafields->fetch_name_optionals_label($adh->table_element);
+		$ret = $extrafields->setOptionalsFromPost(null, $adh);
 		if ($ret < 0) $error++;
 
-        $result = $adh->create($user);
-        if ($result > 0)
-        {
+		$result = $adh->create($user);
+		if ($result > 0) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-            $object = $adh;
+			$object = $adh;
 
-            $adht = new AdherentType($db);
-            $adht->fetch($object->typeid);
+			$adht = new AdherentType($db);
+			$adht->fetch($object->typeid);
 
-            if ($object->email)
-            {
-            	$subject = '';
-            	$msg = '';
+			if ($object->email) {
+				$subject = '';
+				$msg = '';
 
-            	// Send subscription email
-            	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-            	$formmail = new FormMail($db);
-            	// Set output language
-            	$outputlangs = new Translate('', $conf);
-            	$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
-            	// Load traductions files required by page
-            	$outputlangs->loadLangs(array("main", "members"));
-            	// Get email content from template
-            	$arraydefaultmessage = null;
-            	$labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER;
+				// Send subscription email
+				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+				$formmail = new FormMail($db);
+				// Set output language
+				$outputlangs = new Translate('', $conf);
+				$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
+				// Load traductions files required by page
+				$outputlangs->loadLangs(array("main", "members"));
+				// Get email content from template
+				$arraydefaultmessage = null;
+				$labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER;
 
-            	if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
+				if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-            	if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-            	{
-            		$subject = $arraydefaultmessage->topic;
-            		$msg     = $arraydefaultmessage->content;
-            	}
+				if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+					$subject = $arraydefaultmessage->topic;
+					$msg     = $arraydefaultmessage->content;
+				}
 
-            	$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
-            	complete_substitutions_array($substitutionarray, $outputlangs, $object);
-            	$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
-            	$texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnValid()), $substitutionarray, $outputlangs);
+				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+				complete_substitutions_array($substitutionarray, $outputlangs, $object);
+				$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+				$texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnValid()), $substitutionarray, $outputlangs);
 
-            	if ($subjecttosend && $texttosend)
-            	{
-            		$moreinheader = 'X-Dolibarr-Info: send_an_email by public/members/new.php'."\r\n";
+				if ($subjecttosend && $texttosend) {
+					$moreinheader = 'X-Dolibarr-Info: send_an_email by public/members/new.php'."\r\n";
 
-            		$result = $object->send_an_email($texttosend, $subjecttosend, array(), array(), array(), "", "", 0, -1, '', $moreinheader);
-            	}
-            	/*if ($result < 0)
-            	{
+					$result = $object->send_an_email($texttosend, $subjecttosend, array(), array(), array(), "", "", 0, -1, '', $moreinheader);
+				}
+				/*if ($result < 0) {
             		$error++;
             		setEventMessages($object->error, $object->errors, 'errors');
             	}*/
-            }
+			}
 
-            // Send email to the foundation to say a new member subscribed with autosubscribe form
-            if (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL) && !empty($conf->global->ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT) &&
-                  !empty($conf->global->ADHERENT_AUTOREGISTER_NOTIF_MAIL))
-            {
-            	// Define link to login card
-            	$appli = constant('DOL_APPLICATION_TITLE');
-            	if (!empty($conf->global->MAIN_APPLICATION_TITLE))
-            	{
-            		$appli = $conf->global->MAIN_APPLICATION_TITLE;
-            		if (preg_match('/\d\.\d/', $appli))
-            		{
-            			if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
-            		} else $appli .= " ".DOL_VERSION;
-            	} else $appli .= " ".DOL_VERSION;
+			// Send email to the foundation to say a new member subscribed with autosubscribe form
+			if (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL) && !empty($conf->global->ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT) &&
+				  !empty($conf->global->ADHERENT_AUTOREGISTER_NOTIF_MAIL)) {
+				// Define link to login card
+				$appli = constant('DOL_APPLICATION_TITLE');
+				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+					$appli = $conf->global->MAIN_APPLICATION_TITLE;
+					if (preg_match('/\d\.\d/', $appli)) {
+						if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
+					} else $appli .= " ".DOL_VERSION;
+				} else {
+					$appli .= " ".DOL_VERSION;
+				}
 
-            	$to = $adh->makeSubstitution($conf->global->MAIN_INFO_SOCIETE_MAIL);
-            	$from = $conf->global->ADHERENT_MAIL_FROM;
+				$to = $adh->makeSubstitution($conf->global->MAIN_INFO_SOCIETE_MAIL);
+				$from = $conf->global->ADHERENT_MAIL_FROM;
 				$mailfile = new CMailFile(
 					'['.$appli.'] '.$conf->global->ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT,
 					$to,
@@ -355,117 +338,103 @@ if ($action == 'add')
 					-1
 				);
 
-            	if (!$mailfile->sendfile())
-            	{
-            		dol_syslog($langs->trans("ErrorFailedToSendMail", $from, $to), LOG_ERR);
-            	}
-            }
+				if (!$mailfile->sendfile()) {
+					dol_syslog($langs->trans("ErrorFailedToSendMail", $from, $to), LOG_ERR);
+				}
+			}
 
-            if (!empty($backtopage)) $urlback = $backtopage;
-            elseif (!empty($conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION))
-            {
-                $urlback = $conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION;
-                // TODO Make replacement of __AMOUNT__, etc...
-            } else $urlback = $_SERVER["PHP_SELF"]."?action=added";
+			if (!empty($backtopage)) {
+				$urlback = $backtopage;
+			} elseif (!empty($conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION)) {
+				$urlback = $conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION;
+				// TODO Make replacement of __AMOUNT__, etc...
+			} else {
+				$urlback = $_SERVER["PHP_SELF"]."?action=added";
+			}
 
-            if (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE) && $conf->global->MEMBER_NEWFORM_PAYONLINE != '-1')
-            {
-                if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'all')
-                {
-                    $urlback = DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?from=membernewform&source=membersubscription&ref='.urlencode($adh->ref);
-                    if (price2num(GETPOST('amount', 'alpha'))) $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
-                    if (GETPOST('email')) $urlback .= '&email='.urlencode(GETPOST('email'));
-                    if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
-                    {
-                        if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
-                        {
-                    	    $urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
-                        } else {
-                            $urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
-                        }
-                    }
-                } elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paybox')
-                {
-                    $urlback = DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?from=membernewform&source=membersubscription&ref='.urlencode($adh->ref);
-                    if (price2num(GETPOST('amount', 'alpha'))) $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
-                    if (GETPOST('email')) $urlback .= '&email='.urlencode(GETPOST('email'));
-                    if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
-                    {
-                    	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
-                    	{
-                    		$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
-                    	} else {
-                    		$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
-                    	}
-                    }
-                } elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paypal')
-                {
-                    $urlback = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?from=membernewform&source=membersubscription&ref='.urlencode($adh->ref);
-                    if (price2num(GETPOST('amount', 'alpha'))) $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
-                    if (GETPOST('email')) $urlback .= '&email='.urlencode(GETPOST('email'));
-                    if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
-                    {
-                    	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
-                        {
-                        	$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
-                        } else {
-                        	$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
-                        }
-                    }
-                } elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'stripe')
-                {
-                    $urlback = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref;
-                    if (price2num(GETPOST('amount', 'alpha'))) $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
-                    if (GETPOST('email')) $urlback .= '&email='.urlencode(GETPOST('email'));
-                    if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
-                    {
-                    	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
-                        {
-                        	$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
-                        } else {
-                        	$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
-                        }
-                    }
-                } else {
-                    dol_print_error('', "Autosubscribe form is setup to ask an online payment for a not managed online payment");
-                    exit;
-                }
-            }
+			if (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE) && $conf->global->MEMBER_NEWFORM_PAYONLINE != '-1') {
+				if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'all') {
+					$urlback = DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?from=membernewform&source=membersubscription&ref='.urlencode($adh->ref);
+					if (price2num(GETPOST('amount', 'alpha'))) $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
+					if (GETPOST('email')) $urlback .= '&email='.urlencode(GETPOST('email'));
+					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+							$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
+						} else {
+							$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
+						}
+					}
+				} elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paybox') {
+					$urlback = DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?from=membernewform&source=membersubscription&ref='.urlencode($adh->ref);
+					if (price2num(GETPOST('amount', 'alpha'))) $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
+					if (GETPOST('email')) $urlback .= '&email='.urlencode(GETPOST('email'));
+					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+							$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
+						} else {
+							$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
+						}
+					}
+				} elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paypal') {
+					$urlback = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?from=membernewform&source=membersubscription&ref='.urlencode($adh->ref);
+					if (price2num(GETPOST('amount', 'alpha'))) $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
+					if (GETPOST('email')) $urlback .= '&email='.urlencode(GETPOST('email'));
+					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+							$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
+						} else {
+							$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
+						}
+					}
+				} elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'stripe') {
+					$urlback = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref;
+					if (price2num(GETPOST('amount', 'alpha'))) $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
+					if (GETPOST('email')) $urlback .= '&email='.urlencode(GETPOST('email'));
+					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+							$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
+						} else {
+							$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
+						}
+					}
+				} else {
+					dol_print_error('', "Autosubscribe form is setup to ask an online payment for a not managed online payment");
+					exit;
+				}
+			}
 
-            if (!empty($entity)) $urlback .= '&entity='.$entity;
-            dol_syslog("member ".$adh->ref." was created, we redirect to ".$urlback);
-        } else {
-        	$error++;
-            $errmsg .= join('<br>', $adh->errors);
-        }
-    }
+			if (!empty($entity)) $urlback .= '&entity='.$entity;
+			dol_syslog("member ".$adh->ref." was created, we redirect to ".$urlback);
+		} else {
+			$error++;
+			$errmsg .= join('<br>', $adh->errors);
+		}
+	}
 
-    if (!$error)
-    {
-    	$db->commit();
+	if (!$error) {
+		$db->commit();
 
-    	Header("Location: ".$urlback);
-    	exit;
-    } else {
-    	$db->rollback();
-    }
+		Header("Location: ".$urlback);
+		exit;
+	} else {
+		$db->rollback();
+	}
 }
 
 // Action called after a submitted was send and member created successfully
 // If MEMBER_URL_REDIRECT_SUBSCRIPTION is set to url we never go here because a redirect was done to this url.
 // backtopage parameter with an url was set on member submit page, we never go here because a redirect was done to this url.
-if ($action == 'added')
-{
-    llxHeaderVierge($langs->trans("NewMemberForm"));
+if (empty($reshook) && $action == 'added') {
+	llxHeaderVierge($langs->trans("NewMemberForm"));
 
-    // Si on a pas ete redirige
-    print '<br>';
-    print '<div class="center">';
-    print $langs->trans("NewMemberbyWeb");
-    print '</div>';
+	// Si on a pas ete redirige
+	print '<br>';
+	print '<div class="center">';
+	print $langs->trans("NewMemberbyWeb");
+	print '</div>';
 
-    llxFooterVierge();
-    exit;
+	llxFooterVierge();
+	exit;
 }
 
 
@@ -490,8 +459,11 @@ print '<div align="center">';
 print '<div id="divsubscribe">';
 
 print '<div class="center subscriptionformhelptext justify">';
-if (!empty($conf->global->MEMBER_NEWFORM_TEXT)) print $langs->trans($conf->global->MEMBER_NEWFORM_TEXT)."<br>\n";
-else print $langs->trans("NewSubscriptionDesc", $conf->global->MAIN_INFO_SOCIETE_MAIL)."<br>\n";
+if (!empty($conf->global->MEMBER_NEWFORM_TEXT)) {
+	print $langs->trans($conf->global->MEMBER_NEWFORM_TEXT)."<br>\n";
+} else {
+	print $langs->trans("NewSubscriptionDesc", $conf->global->MAIN_INFO_SOCIETE_MAIL)."<br>\n";
+}
 print '</div>';
 
 dol_htmloutput_errors($errmsg);
@@ -507,7 +479,7 @@ print '<br>';
 print '<br><span class="opacitymedium">'.$langs->trans("FieldsWithAreMandatory", '*').'</span><br>';
 //print $langs->trans("FieldsWithIsForPublic",'**').'<br>';
 
-dol_fiche_head('');
+print dol_get_fiche_head('');
 
 print '<script type="text/javascript">
 jQuery(document).ready(function () {
@@ -537,31 +509,32 @@ jQuery(document).ready(function () {
 print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
 
 // Type
-if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE))
-{
-    $listoftype = $adht->liste_array();
-    $tmp = array_keys($listoftype);
-    $defaulttype = '';
-    $isempty = 1;
-    if (count($listoftype) == 1) { $defaulttype = $tmp[0]; $isempty = 0; }
-    print '<tr><td class="titlefield">'.$langs->trans("Type").' <FONT COLOR="red">*</FONT></td><td>';
-    print $form->selectarray("type", $adht->liste_array(), GETPOST('type') ?GETPOST('type') : $defaulttype, $isempty);
-    print '</td></tr>'."\n";
+if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE)) {
+	$listoftype = $adht->liste_array();
+	$tmp = array_keys($listoftype);
+	$defaulttype = '';
+	$isempty = 1;
+	if (count($listoftype) == 1) {
+		$defaulttype = $tmp[0];
+		$isempty = 0;
+	}
+	print '<tr><td class="titlefield">'.$langs->trans("Type").' <FONT COLOR="red">*</FONT></td><td>';
+	print $form->selectarray("type", $adht->liste_array(), GETPOST('type') ?GETPOST('type') : $defaulttype, $isempty);
+	print '</td></tr>'."\n";
 } else {
-    $adht->fetch($conf->global->MEMBER_NEWFORM_FORCETYPE);
-    print '<input type="hidden" id="type" name="type" value="'.$conf->global->MEMBER_NEWFORM_FORCETYPE.'">';
+	$adht->fetch($conf->global->MEMBER_NEWFORM_FORCETYPE);
+	print '<input type="hidden" id="type" name="type" value="'.$conf->global->MEMBER_NEWFORM_FORCETYPE.'">';
 }
 // Moral/Physic attribute
 $morphys["phy"] = $langs->trans("Physical");
 $morphys["mor"] = $langs->trans("Moral");
-if (empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY))
-{
-    print '<tr class="morphy"><td class="titlefield">'.$langs->trans('MemberNature').' <FONT COLOR="red">*</FONT></td><td>'."\n";
-    print $form->selectarray("morphy", $morphys, GETPOST('morphy'), 1);
-    print '</td></tr>'."\n";
+if (empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY)) {
+	print '<tr class="morphy"><td class="titlefield">'.$langs->trans('MemberNature').' <FONT COLOR="red">*</FONT></td><td>'."\n";
+	print $form->selectarray("morphy", $morphys, GETPOST('morphy'), 1);
+	print '</td></tr>'."\n";
 } else {
-    print $morphys[$conf->global->MEMBER_NEWFORM_FORCEMORPHY];
-    print '<input type="hidden" id="morphy" name="morphy" value="'.$conf->global->MEMBER_NEWFORM_FORCEMORPHY.'">';
+	print $morphys[$conf->global->MEMBER_NEWFORM_FORCEMORPHY];
+	print '<input type="hidden" id="morphy" name="morphy" value="'.$conf->global->MEMBER_NEWFORM_FORCEMORPHY.'">';
 }
 // Civility
 print '<tr><td class="titlefield">'.$langs->trans('UserTitle').'</td><td>';
@@ -590,37 +563,35 @@ print '</td></tr>';
 // Country
 print '<tr><td>'.$langs->trans('Country').'</td><td>';
 $country_id = GETPOST('country_id');
-if (!$country_id && !empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) $country_id = getCountry($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs);
-if (!$country_id && !empty($conf->geoipmaxmind->enabled))
-{
-    $country_code = dol_user_country();
-    //print $country_code;
-    if ($country_code)
-    {
-        $new_country_id = getCountry($country_code, 3, $db, $langs);
-        //print 'xxx'.$country_code.' - '.$new_country_id;
-        if ($new_country_id) $country_id = $new_country_id;
-    }
+if (!$country_id && !empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) {
+	$country_id = getCountry($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs);
+}
+if (!$country_id && !empty($conf->geoipmaxmind->enabled)) {
+	$country_code = dol_user_country();
+	//print $country_code;
+	if ($country_code) {
+		$new_country_id = getCountry($country_code, 3, $db, $langs);
+		//print 'xxx'.$country_code.' - '.$new_country_id;
+		if ($new_country_id) $country_id = $new_country_id;
+	}
 }
 $country_code = getCountry($country_id, 2, $db, $langs);
 print $form->select_country($country_id, 'country_id');
 print '</td></tr>';
 // State
-if (empty($conf->global->SOCIETE_DISABLE_STATE))
-{
-    print '<tr><td>'.$langs->trans('State').'</td><td>';
-    if ($country_code) print $formcompany->select_state(GETPOST("state_id"), $country_code);
-    else print '';
-    print '</td></tr>';
+if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
+	print '<tr><td>'.$langs->trans('State').'</td><td>';
+	if ($country_code) print $formcompany->select_state(GETPOST("state_id"), $country_code);
+	else print '';
+	print '</td></tr>';
 }
 // EMail
 print '<tr><td>'.$langs->trans("Email").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
 // Login
-if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-{
-    print '<tr><td>'.$langs->trans("Login").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="login" maxlength="50" class="minwidth100"value="'.dol_escape_htmltag(GETPOST('login')).'"></td></tr>'."\n";
-    print '<tr><td>'.$langs->trans("Password").' <FONT COLOR="red">*</FONT></td><td><input type="password" maxlength="128" name="pass1" class="minwidth100" value="'.GETPOST("pass1").'"></td></tr>'."\n";
-    print '<tr><td>'.$langs->trans("PasswordAgain").' <FONT COLOR="red">*</FONT></td><td><input type="password" maxlength="128" name="pass2" class="minwidth100" value="'.GETPOST("pass2").'"></td></tr>'."\n";
+if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
+	print '<tr><td>'.$langs->trans("Login").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="login" maxlength="50" class="minwidth100"value="'.dol_escape_htmltag(GETPOST('login')).'"></td></tr>'."\n";
+	print '<tr><td>'.$langs->trans("Password").' <FONT COLOR="red">*</FONT></td><td><input type="password" maxlength="128" name="pass1" class="minwidth100" value="'.GETPOST("pass1").'"></td></tr>'."\n";
+	print '<tr><td>'.$langs->trans("PasswordAgain").' <FONT COLOR="red">*</FONT></td><td><input type="password" maxlength="128" name="pass2" class="minwidth100" value="'.GETPOST("pass2").'"></td></tr>'."\n";
 }
 // Birthday
 print '<tr id="trbirth" class="trbirth"><td>'.$langs->trans("DateToBirth").'</td><td>';
@@ -640,14 +611,13 @@ print '<td class="tdtop"><textarea name="note_private" id="note_private" wrap="s
 print '</tr>'."\n";
 
 // Add specific fields used by Dolibarr foundation for example
-if (!empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER))
-{
-    $arraybudget = array('50'=>'<= 100 000', '100'=>'<= 200 000', '200'=>'<= 500 000', '300'=>'<= 1 500 000', '600'=>'<= 3 000 000', '1000'=>'<= 5 000 000', '2000'=>'5 000 000+');
-    print '<tr id="trbudget" class="trcompany"><td>'.$langs->trans("TurnoverOrBudget").' <FONT COLOR="red">*</FONT></td><td>';
-    print $form->selectarray('budget', $arraybudget, GETPOST('budget'), 1);
-    print ' € or $';
+if (!empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) {
+	$arraybudget = array('50'=>'<= 100 000', '100'=>'<= 200 000', '200'=>'<= 500 000', '300'=>'<= 1 500 000', '600'=>'<= 3 000 000', '1000'=>'<= 5 000 000', '2000'=>'5 000 000+');
+	print '<tr id="trbudget" class="trcompany"><td>'.$langs->trans("TurnoverOrBudget").' <FONT COLOR="red">*</FONT></td><td>';
+	print $form->selectarray('budget', $arraybudget, GETPOST('budget'), 1);
+	print ' € or $';
 
-    print '<script type="text/javascript">
+	print '<script type="text/javascript">
     jQuery(document).ready(function () {
         initturnover();
         jQuery("#morphy").click(function() {
@@ -681,43 +651,38 @@ if (!empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER))
         }
     });
     </script>';
-    print '</td></tr>'."\n";
+	print '</td></tr>'."\n";
 }
-if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)
-|| !empty($conf->global->MEMBER_NEWFORM_PAYONLINE))
-{
-    // $conf->global->MEMBER_NEWFORM_SHOWAMOUNT is an amount
-    $amount = 0;
-    if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
-        $amount = $conf->global->MEMBER_NEWFORM_AMOUNT;
-    }
+if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT) || !empty($conf->global->MEMBER_NEWFORM_PAYONLINE)) {
+	// $conf->global->MEMBER_NEWFORM_SHOWAMOUNT is an amount
+	$amount = 0;
+	if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
+		$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;
+	}
 
-    if (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE))
-    {
-        $amount = GETPOST('amount') ?GETPOST('amount') : $conf->global->MEMBER_NEWFORM_AMOUNT;
-    }
-    // $conf->global->MEMBER_NEWFORM_PAYONLINE is 'paypal', 'paybox' or 'stripe'
-    print '<tr><td>'.$langs->trans("Subscription").'</td><td class="nowrap">';
-    if (!empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT))
-    {
-        print '<input type="text" name="amount" id="amount" class="flat amount" size="6" value="'.$amount.'">';
-    } else {
-        print '<input type="text" name="amount" id="amounthidden" class="flat amount" disabled size="6" value="'.$amount.'">';
-        print '<input type="hidden" name="amount" id="amount" class="flat amount" size="6" value="'.$amount.'">';
-    }
-    print ' '.$langs->trans("Currency".$conf->currency);
-    print '</td></tr>';
+	if (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE)) {
+		$amount = GETPOST('amount') ?GETPOST('amount') : $conf->global->MEMBER_NEWFORM_AMOUNT;
+	}
+	// $conf->global->MEMBER_NEWFORM_PAYONLINE is 'paypal', 'paybox' or 'stripe'
+	print '<tr><td>'.$langs->trans("Subscription").'</td><td class="nowrap">';
+	if (!empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)) {
+		print '<input type="text" name="amount" id="amount" class="flat amount" size="6" value="'.$amount.'">';
+	} else {
+		print '<input type="text" name="amount" id="amounthidden" class="flat amount" disabled size="6" value="'.$amount.'">';
+		print '<input type="hidden" name="amount" id="amount" class="flat amount" size="6" value="'.$amount.'">';
+	}
+	print ' '.$langs->trans("Currency".$conf->currency);
+	print '</td></tr>';
 }
 print "</table>\n";
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // Save
 print '<div class="center">';
 print '<input type="submit" value="'.$langs->trans("Submit").'" id="submitsave" class="button">';
-if (!empty($backtopage))
-{
-    print ' &nbsp; &nbsp; <input type="submit" value="'.$langs->trans("Cancel").'" id="submitcancel" class="button">';
+if (!empty($backtopage)) {
+	print ' &nbsp; &nbsp; <input type="submit" value="'.$langs->trans("Cancel").'" id="submitcancel" class="button button-cancel">';
 }
 print '</div>';
 
diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php
index c1677b2902b..18f918c26e2 100644
--- a/htdocs/public/members/public_card.php
+++ b/htdocs/public/members/public_card.php
@@ -28,10 +28,11 @@
 if (!defined('NOLOGIN'))		define("NOLOGIN", 1); // This means this output page does not require to be logged.
 if (!defined('NOCSRFCHECK'))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
 if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
+// TODO This should be useless. Because entity must be retrieve from object ref and not from url.
 $entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
 if (is_numeric($entity)) define("DOLENTITY", $entity);
 
@@ -92,7 +93,7 @@ if ($id > 0)
 		print '<tr><td>'.$langs->trans("Firstname").'</td><td class="valeur" width="35%">'.$object->firstname.'&nbsp;</td></tr>';
 		print '<tr><td>'.$langs->trans("Lastname").'</td><td class="valeur">'.$object->lastname.'&nbsp;</td></tr>';
 		print '<tr><td>'.$langs->trans("Gender").'</td><td class="valeur">'.$object->gender.'&nbsp;</td></tr>';
-		print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->societe.'&nbsp;</td></tr>';
+		print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->company.'&nbsp;</td></tr>';
 		print '<tr><td>'.$langs->trans("Address").'</td><td class="valeur">'.nl2br($object->address).'&nbsp;</td></tr>';
 		print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td class="valeur">'.$object->zip.' '.$object->town.'&nbsp;</td></tr>';
 		print '<tr><td>'.$langs->trans("Country").'</td><td class="valeur">'.$object->country.'&nbsp;</td></tr>';
diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php
index cb5b9308ed4..d81529d1eaf 100644
--- a/htdocs/public/members/public_list.php
+++ b/htdocs/public/members/public_list.php
@@ -27,10 +27,11 @@
 if (!defined('NOLOGIN'))		define("NOLOGIN", 1); // This means this output page does not require to be logged.
 if (!defined('NOCSRFCHECK'))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
 if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
+// TODO This should be useless. Because entity must be retrieve from object ref and not from url.
 $entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
 if (is_numeric($entity)) define("DOLENTITY", $entity);
 
diff --git a/htdocs/public/notice.php b/htdocs/public/notice.php
index f97b4c03972..59b8e3a70cb 100644
--- a/htdocs/public/notice.php
+++ b/htdocs/public/notice.php
@@ -24,9 +24,11 @@
  *                /public/notice.php?transphrase=url_encoded_sentence_to_show
  */
 
-define('NOCSRFCHECK', 1);
-define('NOLOGIN', 1);
-define('NOSESSION', 1);
+if (!defined('NOLOGIN'))		define("NOLOGIN", 1); // This means this output page does not require to be logged.
+if (!defined('NOCSRFCHECK'))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+if (!defined('NOSESSION'))		define('NOSESSION', '1');
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
 
 require '../main.inc.php';
 
@@ -40,8 +42,8 @@ if (!GETPOST('transkey', 'alphanohtml') && !GETPOST('transphrase', 'alphanohtml'
 	print 'Sorry, it seems your internet connexion is off.<br>';
 	print 'You need to be connected to network to use this software.<br>';
 } else {
-    $langs->loadLangs(array("error", "other"));
+	$langs->loadLangs(array("error", "other"));
 
-    if (GETPOST('transphrase', 'alphanohtml')) print dol_escape_htmltag(GETPOST('transphrase', 'alphanohtml'));
-    elseif (GETPOST('transkey', 'alphanohtml')) print dol_escape_htmltag($langs->trans(GETPOST('transkey', 'alphanohtml')));
+	if (GETPOST('transphrase', 'alphanohtml')) print dol_escape_htmltag(GETPOST('transphrase', 'alphanohtml'));
+	elseif (GETPOST('transkey', 'alphanohtml')) print dol_escape_htmltag($langs->trans(GETPOST('transkey', 'alphanohtml')));
 }
diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index 4408438ceaf..56690f78a42 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -26,10 +26,11 @@
 if (!defined('NOLOGIN'))		define("NOLOGIN", 1); // This means this output page does not require to be logged.
 if (!defined('NOCSRFCHECK'))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
 if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
+// TODO This should be useless. Because entity must be retrieve from object ref and not from url.
 $entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
 if (is_numeric($entity)) define("DOLENTITY", $entity);
 
@@ -63,11 +64,11 @@ if (empty($source)) $source = 'proposal';
 
 if (!$action)
 {
-    if ($source && !$ref)
-    {
-    	print $langs->trans('ErrorBadParameters')." - ref missing";
-    	exit;
-    }
+	if ($source && !$ref)
+	{
+		print $langs->trans('ErrorBadParameters')." - ref missing";
+		exit;
+	}
 }
 
 
@@ -82,18 +83,18 @@ $SECUREKEY = GETPOST("securekey"); // Secure key
 
 if (!empty($source))
 {
-    $urlok .= 'source='.urlencode($source).'&';
-    $urlko .= 'source='.urlencode($source).'&';
+	$urlok .= 'source='.urlencode($source).'&';
+	$urlko .= 'source='.urlencode($source).'&';
 }
 if (!empty($REF))
 {
-    $urlok .= 'ref='.urlencode($REF).'&';
-    $urlko .= 'ref='.urlencode($REF).'&';
+	$urlok .= 'ref='.urlencode($REF).'&';
+	$urlko .= 'ref='.urlencode($REF).'&';
 }
 if (!empty($SECUREKEY))
 {
-    $urlok .= 'securekey='.urlencode($SECUREKEY).'&';
-    $urlko .= 'securekey='.urlencode($SECUREKEY).'&';
+	$urlok .= 'securekey='.urlencode($SECUREKEY).'&';
+	$urlko .= 'securekey='.urlencode($SECUREKEY).'&';
 }
 if (!empty($entity))
 {
@@ -113,7 +114,7 @@ $creditor = $mysoc->name;
 
 if ($action == 'dosign')
 {
-    // TODO
+	// TODO
 }
 
 
@@ -128,17 +129,17 @@ $conf->dol_hide_topmenu = 1;
 $conf->dol_hide_leftmenu = 1;
 
 $replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
-llxHeader($head, $langs->trans("OnlineSignature"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea);
+llxHeader($head, $langs->trans("OnlineSignature"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea, 1);
 
 // Check link validity for param 'source'
 if (!empty($source) && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', '')))
 {
-    $langs->load("errors");
-    dol_print_error_email('BADREFINONLINESIGNFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $source, $ref));
-    // End of page
-    llxFooter();
-    $db->close();
-    exit;
+	$langs->load("errors");
+	dol_print_error_email('BADREFINONLINESIGNFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $source, $ref));
+	// End of page
+	llxFooter();
+	$db->close();
+	exit;
 }
 
 print '<span id="dolpaymentspan"></span>'."\n";
@@ -184,7 +185,7 @@ if ($urllogo)
 	print '>';
 	print '</div>';
 	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
-		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
+		print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 	}
 	print '</div>';
 }
@@ -193,16 +194,16 @@ if ($urllogo)
 $text = '';
 if (!empty($conf->global->ONLINE_SIGN_NEWFORM_TEXT))
 {
-    $langs->load("members");
-    $reg = array();
-    if (preg_match('/^\((.*)\)$/', $conf->global->ONLINE_SIGN_NEWFORM_TEXT, $reg)) $text .= $langs->trans($reg[1])."<br>\n";
-    else $text .= $conf->global->ONLINE_SIGN_NEWFORM_TEXT."<br>\n";
-    $text = '<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
+	$langs->load("members");
+	$reg = array();
+	if (preg_match('/^\((.*)\)$/', $conf->global->ONLINE_SIGN_NEWFORM_TEXT, $reg)) $text .= $langs->trans($reg[1])."<br>\n";
+	else $text .= $conf->global->ONLINE_SIGN_NEWFORM_TEXT."<br>\n";
+	$text = '<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
 }
 if (empty($text))
 {
-    $text .= '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("WelcomeOnOnlineSignaturePage", $mysoc->name).'</strong></td></tr>'."\n";
-    $text .= '<tr><td class="textpublicpayment">'.$langs->trans("ThisScreenAllowsYouToSignDocFrom", $creditor).'<br><br></td></tr>'."\n";
+	$text .= '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("WelcomeOnOnlineSignaturePage", $mysoc->name).'</strong></td></tr>'."\n";
+	$text .= '<tr><td class="textpublicpayment">'.$langs->trans("ThisScreenAllowsYouToSignDocFrom", $creditor).'<br><br></td></tr>'."\n";
 }
 print $text;
 
@@ -236,9 +237,9 @@ if ($source == 'proposal')
 	// Creditor
 
 	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Creditor");
-    print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>'.$creditor.'</b>';
-    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
-    print '</td></tr>'."\n";
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>'.$creditor.'</b>';
+	print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+	print '</td></tr>'."\n";
 
 	// Debitor
 
@@ -257,22 +258,21 @@ if ($source == 'proposal')
 
 
 
-if (!$found && !$mesg) $mesg = $langs->transonentitiesnoconv("ErrorBadParameters");
+if (!$found && !$mesg) $mesg = $langs->transnoentitiesnoconv("ErrorBadParameters");
 
 if ($mesg) print '<tr><td align="center" colspan="2"><br><div class="warning">'.dol_escape_htmltag($mesg).'</div></td></tr>'."\n";
 
 print '</table>'."\n";
 print "\n";
 
-if ($action != 'dosign')
-{
-    if ($found && !$error)	// We are in a management option and no error
-    {
-    } else {
-    	dol_print_error_email('ERRORNEWONLINESIGN');
-    }
+if ($action != 'dosign') {
+	if ($found && !$error) {
+		// We are in a management option and no error
+	} else {
+		dol_print_error_email('ERRORNEWONLINESIGN');
+	}
 } else {
-    // Print
+	// Print
 }
 
 print '</td></tr>'."\n";
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index 8b2e8663dac..3f19fb68b7e 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -22,8 +22,11 @@
  *	\brief      Page to list surveys
  */
 
-define("NOLOGIN", 1); // This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+if (!defined('NOLOGIN'))		define("NOLOGIN", 1); // This means this output page does not require to be logged.
+if (!defined('NOCSRFCHECK'))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
+if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
@@ -105,13 +108,11 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x"))		// bout
 		$nouveauchoix = '';
 		for ($i = 0; $i < $nbcolonnes; $i++)
 		{
-			if (isset($_POST["choix$i"]) && $_POST["choix$i"] == '1')
-			{
+			if (GETPOSTISSET("choix$i") && GETPOST("choix$i") == '1') {
 				$nouveauchoix .= "1";
-			} elseif (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2')
-			{
+			} elseif (GETPOSTISSET("choix$i") && GETPOST("choix$i") == '2') {
 				$nouveauchoix .= "2";
-			} else { // sinon c'est 0
+			} else {
 				$nouveauchoix .= "0";
 			}
 		}
@@ -179,14 +180,14 @@ $testligneamodifier = false;
 $ligneamodifier = -1;
 for ($i = 0; $i < $nblines; $i++)
 {
-	if (isset($_POST['modifierligne'.$i]))
+	if (GETPOSTISSET('modifierligne'.$i))
 	{
 		$ligneamodifier = $i;
 		$testligneamodifier = true;
 	}
 
 	//test to see if a line is to be modified
-	if (isset($_POST['validermodifier'.$i]))
+	if (GETPOSTISSET('validermodifier'.$i))
 	{
 		$modifier = $i;
 		$testmodifier = true;
@@ -200,13 +201,11 @@ if ($testmodifier)
 	for ($i = 0; $i < $nbcolonnes; $i++)
 	{
 		//var_dump($_POST["choix$i"]);
-		if (isset($_POST["choix".$i]) && $_POST["choix".$i] == '1')
-		{
+		if (GETPOSTISSET("choix".$i) && GETPOST("choix".$i) == '1') {
 			$nouveauchoix .= "1";
-		} elseif (isset($_POST["choix".$i]) && $_POST["choix".$i] == '2')
-		{
+		} elseif (GETPOSTISSET("choix".$i) && GETPOST("choix".$i) == '2') {
 			$nouveauchoix .= "2";
-		} else { // sinon c'est 0
+		} else {
 			$nouveauchoix .= "0";
 		}
 	}
@@ -536,19 +535,19 @@ while ($compteur < $num)
 	// Button edit at end of line
 	if ($compteur != $ligneamodifier && $mod_ok)
 	{
-		print '<td class="casevide"><input type="submit" class="button" name="modifierligne'.$compteur.'" value="'.dol_escape_htmltag($langs->trans("Edit")).'"></td>'."\n";
+		print '<td class="casevide"><input type="submit" class="button smallpaddingimp" name="modifierligne'.$compteur.'" value="'.dol_escape_htmltag($langs->trans("Edit")).'"></td>'."\n";
 	}
 
 	//demande de confirmation pour modification de ligne
 	for ($i = 0; $i < $nblines; $i++)
 	{
-		if (isset($_POST["modifierligne".$i]))
+		if (GETPOSTISSET("modifierligne".$i))
 		{
 			if ($compteur == $i)
 			{
 				print '<td class="casevide">';
 				print '<input type="hidden" name="idtomodify'.$compteur.'" value="'.$obj->id_users.'">';
-				print '<input type="submit" class="button" name="validermodifier'.$compteur.'" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+				print '<input type="submit" class="button button-save" name="validermodifier'.$compteur.'" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 				print '</td>'."\n";
 			}
 		}
@@ -578,8 +577,7 @@ if ($ligneamodifier < 0 && (!isset($_SESSION['nom'])))
 		if (empty($listofanswers[$i]['format']) || !in_array($listofanswers[$i]['format'], array('yesno', 'foragainst')))
 		{
 			print '<input type="checkbox" name="choix'.$i.'" value="1"';
-			if (isset($_POST['choix'.$i]) && $_POST['choix'.$i] == '1')
-			{
+			if (GETPOSTISSET('choix'.$i) && GETPOST('choix'.$i) == '1') {
 				print ' checked';
 			}
 			print '>';
@@ -731,7 +729,7 @@ if ($comments)
 
 // Form to add comment
 if ($object->allow_comments) {
-	print '<div class="addcomment"><span class="opacitymedium">'.$langs->trans("AddACommentForPoll")."</span><br>\n";
+	print '<br><div class="addcomment"><span class="opacitymedium">'.$langs->trans("AddACommentForPoll")."</span><br>\n";
 
 	print '<textarea name="comment" rows="'.ROWS_2.'" class="quatrevingtpercent">'.dol_escape_htmltag(GETPOST('comment', 'restricthtml'), 0, 1).'</textarea><br>'."\n";
 	print $langs->trans("Name").': ';
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 3d197296df7..d90f8684673 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -37,6 +37,7 @@
 if (!defined('NOLOGIN'))		define("NOLOGIN", 1); // This means this output page does not require to be logged.
 if (!defined('NOCSRFCHECK'))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
 if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and get of entity must be done before including main.inc.php
@@ -49,6 +50,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
+// Hook to be used by external payment modules (ie Payzen, ...)
+include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+$hookmanager = new HookManager($db);
+$hookmanager->initHooks(array('newpayment'));
 
 // Load translation files
 $langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors", "paybox", "paypal", "stripe")); // File with generic data
@@ -201,6 +206,12 @@ if ((empty($paymentmethod) || $paymentmethod == 'stripe') && !empty($conf->strip
 // Initialize $validpaymentmethod
 $validpaymentmethod = getValidOnlinePaymentMethods($paymentmethod);
 
+// This hook is used to push to $validpaymentmethod by external payment modules (ie Payzen, ...)
+$parameters = [
+	'paymentmethod' => $paymentmethod,
+	'validpaymentmethod' => &$validpaymentmethod
+];
+$reshook = $hookmanager->executeHooks('doValidatePayment', $parameters, $object, $action);
 
 // Check security token
 $valid = true;
@@ -379,7 +390,7 @@ if ($action == 'dopayment')
 
 // Called when choosing Stripe mode.
 // When using the Charge API architecture, this code is called after clicking the 'dopayment' with the Charge API architecture.
-// When using the PaymentIntent API architecture, the Stripe customer is already created when creating PaymentItent when showing payment page and the payment is already ok.
+// When using the PaymentIntent API architecture, the Stripe customer is already created when creating PaymentIntent when showing payment page and the payment is already ok.
 if ($action == 'charge' && !empty($conf->stripe->enabled))
 {
 	$amountstripe = $amount;
@@ -389,6 +400,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
 	$arrayzerounitcurrency = array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
 	if (!in_array($currency, $arrayzerounitcurrency)) $amountstripe = $amountstripe * 100;
 
+	dol_syslog("--- newpayment.php Execute action = ".$action, LOG_DEBUG, 0, '_stripe');
 	dol_syslog("POST keys  : ".join(',', array_keys($_POST)), LOG_DEBUG, 0, '_stripe');
 	dol_syslog("POST values: ".join(',', $_POST), LOG_DEBUG, 0, '_stripe');
 
@@ -406,42 +418,42 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
 	dol_syslog("POST vatnumber = ".$vatnumber, LOG_DEBUG, 0, '_stripe');
 
 	$error = 0;
-    $errormessage = '';
+	$errormessage = '';
 
-    // When using the Charge API architecture
-    if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
-    {
-    	try {
-    		$metadata = array(
-    			'dol_version' => DOL_VERSION,
-    			'dol_entity'  => $conf->entity,
-    			'dol_company' => $mysoc->name, // Usefull when using multicompany
-    			'dol_tax_num' => $vatnumber,
-    		    'ipaddress'=> getUserRemoteIP()
-    		);
+	// When using the old Charge API architecture
+	if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
+	{
+		try {
+			$metadata = array(
+				'dol_version' => DOL_VERSION,
+				'dol_entity'  => $conf->entity,
+				'dol_company' => $mysoc->name, // Usefull when using multicompany
+				'dol_tax_num' => $vatnumber,
+				'ipaddress'=> getUserRemoteIP()
+			);
 
-    		if (!empty($thirdparty_id)) $metadata["dol_thirdparty_id"] = $thirdparty_id;
+			if (!empty($thirdparty_id)) $metadata["dol_thirdparty_id"] = $thirdparty_id;
 
-    		if ($thirdparty_id > 0)
-    		{
-    			dol_syslog("Search existing Stripe customer profile for thirdparty_id=".$thirdparty_id, LOG_DEBUG, 0, '_stripe');
+			if ($thirdparty_id > 0)
+			{
+				dol_syslog("Search existing Stripe customer profile for thirdparty_id=".$thirdparty_id, LOG_DEBUG, 0, '_stripe');
 
-    			$service = 'StripeTest';
-    			$servicestatus = 0;
-    			if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'int'))
-    			{
-    				$service = 'StripeLive';
-    				$servicestatus = 1;
-    			}
+				$service = 'StripeTest';
+				$servicestatus = 0;
+				if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'int'))
+				{
+					$service = 'StripeLive';
+					$servicestatus = 1;
+				}
 
-    			$thirdparty = new Societe($db);
-    			$thirdparty->fetch($thirdparty_id);
+				$thirdparty = new Societe($db);
+				$thirdparty->fetch($thirdparty_id);
 
-    			// Create Stripe customer
-    			include_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
-    			$stripe = new Stripe($db);
-                $stripeacc = $stripe->getStripeAccount($service);
-                $customer = $stripe->customerStripe($thirdparty, $stripeacc, $servicestatus, 1);
+				// Create Stripe customer
+				include_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
+				$stripe = new Stripe($db);
+				$stripeacc = $stripe->getStripeAccount($service);
+				$customer = $stripe->customerStripe($thirdparty, $stripeacc, $servicestatus, 1);
 				if (empty($customer))
 				{
 					$error++;
@@ -450,51 +462,51 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
 					$action = '';
 				}
 
-    			// Create Stripe card from Token
-    			if (!$error)
-    			{
-	    			if ($savesource) {
-	    				$card = $customer->sources->create(array("source" => $stripeToken, "metadata" => $metadata));
-	    			} else {
-	    				$card = $stripeToken;
-	    			}
+				// Create Stripe card from Token
+				if (!$error)
+				{
+					if ($savesource) {
+						$card = $customer->sources->create(array("source" => $stripeToken, "metadata" => $metadata));
+					} else {
+						$card = $stripeToken;
+					}
 
-	    			if (empty($card))
-	    			{
-	    				$error++;
-	    				dol_syslog('Failed to create card record', LOG_WARNING, 0, '_stripe');
-	    				setEventMessages('Failed to create card record', null, 'errors');
-	    				$action = '';
-	    			} else {
-	    				if (!empty($FULLTAG))       $metadata["FULLTAG"] = $FULLTAG;
-	    				if (!empty($dol_id))        $metadata["dol_id"] = $dol_id;
-	    				if (!empty($dol_type))      $metadata["dol_type"] = $dol_type;
+					if (empty($card))
+					{
+						$error++;
+						dol_syslog('Failed to create card record', LOG_WARNING, 0, '_stripe');
+						setEventMessages('Failed to create card record', null, 'errors');
+						$action = '';
+					} else {
+						if (!empty($FULLTAG))       $metadata["FULLTAG"] = $FULLTAG;
+						if (!empty($dol_id))        $metadata["dol_id"] = $dol_id;
+						if (!empty($dol_type))      $metadata["dol_type"] = $dol_type;
 
-	    				dol_syslog("Create charge on card ".$card->id, LOG_DEBUG, 0, '_stripe');
-	    				$charge = \Stripe\Charge::create(array(
-	    					'amount'   => price2num($amountstripe, 'MU'),
-	    					'currency' => $currency,
-	    					'capture'  => true, // Charge immediatly
-	    					'description' => 'Stripe payment: '.$FULLTAG.' ref='.$ref,
-	    					'metadata' => $metadata,
-	    					'customer' => $customer->id,
-	    					'source' => $card,
-	    				  'statement_descriptor_suffix' => dol_trunc($FULLTAG, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
-	    				), array("idempotency_key" => "$FULLTAG", "stripe_account" => "$stripeacc"));
-	    				// Return $charge = array('id'=>'ch_XXXX', 'status'=>'succeeded|pending|failed', 'failure_code'=>, 'failure_message'=>...)
-	    				if (empty($charge))
-	    				{
-	    					$error++;
-	    					dol_syslog('Failed to charge card', LOG_WARNING, 0, '_stripe');
-	    					setEventMessages('Failed to charge card', null, 'errors');
-	    					$action = '';
-	    				}
-	    			}
-    			}
-    		} else {
-    			$vatcleaned = $vatnumber ? $vatnumber : null;
+						dol_syslog("Create charge on card ".$card->id, LOG_DEBUG, 0, '_stripe');
+						$charge = \Stripe\Charge::create(array(
+							'amount'   => price2num($amountstripe, 'MU'),
+							'currency' => $currency,
+							'capture'  => true, // Charge immediatly
+							'description' => 'Stripe payment: '.$FULLTAG.' ref='.$ref,
+							'metadata' => $metadata,
+							'customer' => $customer->id,
+							'source' => $card,
+						  'statement_descriptor_suffix' => dol_trunc($FULLTAG, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
+						), array("idempotency_key" => "$FULLTAG", "stripe_account" => "$stripeacc"));
+						// Return $charge = array('id'=>'ch_XXXX', 'status'=>'succeeded|pending|failed', 'failure_code'=>, 'failure_message'=>...)
+						if (empty($charge))
+						{
+							$error++;
+							dol_syslog('Failed to charge card', LOG_WARNING, 0, '_stripe');
+							setEventMessages('Failed to charge card', null, 'errors');
+							$action = '';
+						}
+					}
+				}
+			} else {
+				$vatcleaned = $vatnumber ? $vatnumber : null;
 
-    			/*$taxinfo = array('type'=>'vat');
+				/*$taxinfo = array('type'=>'vat');
     			if ($vatcleaned)
     			{
     				$taxinfo["tax_id"] = $vatcleaned;
@@ -503,18 +515,18 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
     			if (empty($vatcleaned)) $taxinfo=null;
     			*/
 
-    			dol_syslog("Create anonymous customer card profile", LOG_DEBUG, 0, '_stripe');
+				dol_syslog("Create anonymous customer card profile", LOG_DEBUG, 0, '_stripe');
 
-                $customer = \Stripe\Customer::create(array(
-    				'email' => $email,
-    				'description' => ($email ? 'Anonymous customer for '.$email : 'Anonymous customer'),
-    				'metadata' => $metadata,
-    				'source'  => $stripeToken           // source can be a token OR array('object'=>'card', 'exp_month'=>xx, 'exp_year'=>xxxx, 'number'=>xxxxxxx, 'cvc'=>xxx, 'name'=>'Cardholder's full name', zip ?)
-    			));
-    			// Return $customer = array('id'=>'cus_XXXX', ...)
+				$customer = \Stripe\Customer::create(array(
+					'email' => $email,
+					'description' => ($email ? 'Anonymous customer for '.$email : 'Anonymous customer'),
+					'metadata' => $metadata,
+					'source'  => $stripeToken           // source can be a token OR array('object'=>'card', 'exp_month'=>xx, 'exp_year'=>xxxx, 'number'=>xxxxxxx, 'cvc'=>xxx, 'name'=>'Cardholder's full name', zip ?)
+				));
+				// Return $customer = array('id'=>'cus_XXXX', ...)
 
-                // Create the VAT record in Stripe
-                /* We don't know country of customer, so we can't create tax
+				// Create the VAT record in Stripe
+				/* We don't know country of customer, so we can't create tax
                 if (! empty($conf->global->STRIPE_SAVE_TAX_IDS))	// We setup to save Tax info on Stripe side. Warning: This may result in error when saving customer
                 {
                 	if (! empty($vatcleaned))
@@ -528,145 +540,145 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
                 	}
                 }*/
 
-    			if (!empty($FULLTAG))       $metadata["FULLTAG"] = $FULLTAG;
-    			if (!empty($dol_id))        $metadata["dol_id"] = $dol_id;
-    			if (!empty($dol_type))      $metadata["dol_type"] = $dol_type;
+				if (!empty($FULLTAG))       $metadata["FULLTAG"] = $FULLTAG;
+				if (!empty($dol_id))        $metadata["dol_id"] = $dol_id;
+				if (!empty($dol_type))      $metadata["dol_type"] = $dol_type;
 
-    			// The customer was just created with a source, so we can make a charge
-    			// with no card defined, the source just used for customer creation will be used.
-    			dol_syslog("Create charge", LOG_DEBUG, 0, '_stripe');
-                $charge = \Stripe\Charge::create(array(
-    				'customer' => $customer->id,
-    				'amount'   => price2num($amountstripe, 'MU'),
-    				'currency' => $currency,
-    				'capture'  => true, // Charge immediatly
-    				'description' => 'Stripe payment: '.$FULLTAG.' ref='.$ref,
-    				'metadata' => $metadata,
-                    'statement_descriptor' => dol_trunc($FULLTAG, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
-    			), array("idempotency_key" => "$FULLTAG", "stripe_account" => "$stripeacc"));
-    			// Return $charge = array('id'=>'ch_XXXX', 'status'=>'succeeded|pending|failed', 'failure_code'=>, 'failure_message'=>...)
-    			if (empty($charge))
-    			{
-    				$error++;
-    				dol_syslog('Failed to charge card', LOG_WARNING, 0, '_stripe');
-    				setEventMessages('Failed to charge card', null, 'errors');
-    				$action = '';
-    			}
-    		}
-    	} catch (\Stripe\Error\Card $e) {
-    		// Since it's a decline, \Stripe\Error\Card will be caught
-    		$body = $e->getJsonBody();
-    		$err  = $body['error'];
+				// The customer was just created with a source, so we can make a charge
+				// with no card defined, the source just used for customer creation will be used.
+				dol_syslog("Create charge", LOG_DEBUG, 0, '_stripe');
+				$charge = \Stripe\Charge::create(array(
+					'customer' => $customer->id,
+					'amount'   => price2num($amountstripe, 'MU'),
+					'currency' => $currency,
+					'capture'  => true, // Charge immediatly
+					'description' => 'Stripe payment: '.$FULLTAG.' ref='.$ref,
+					'metadata' => $metadata,
+					'statement_descriptor' => dol_trunc($FULLTAG, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
+				), array("idempotency_key" => "$FULLTAG", "stripe_account" => "$stripeacc"));
+				// Return $charge = array('id'=>'ch_XXXX', 'status'=>'succeeded|pending|failed', 'failure_code'=>, 'failure_message'=>...)
+				if (empty($charge))
+				{
+					$error++;
+					dol_syslog('Failed to charge card', LOG_WARNING, 0, '_stripe');
+					setEventMessages('Failed to charge card', null, 'errors');
+					$action = '';
+				}
+			}
+		} catch (\Stripe\Error\Card $e) {
+			// Since it's a decline, \Stripe\Error\Card will be caught
+			$body = $e->getJsonBody();
+			$err  = $body['error'];
 
-    		print('Status is:'.$e->getHttpStatus()."\n");
-    		print('Type is:'.$err['type']."\n");
-    		print('Code is:'.$err['code']."\n");
-    		// param is '' in this case
-    		print('Param is:'.$err['param']."\n");
-    		print('Message is:'.$err['message']."\n");
+			print('Status is:'.$e->getHttpStatus()."\n");
+			print('Type is:'.$err['type']."\n");
+			print('Code is:'.$err['code']."\n");
+			// param is '' in this case
+			print('Param is:'.$err['param']."\n");
+			print('Message is:'.$err['message']."\n");
 
-    		$error++;
-    		$errormessage = "ErrorCard ".$e->getMessage()." err=".var_export($err, true);
-    		dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
-    		setEventMessages($e->getMessage(), null, 'errors');
-    		$action = '';
-    	} catch (\Stripe\Error\RateLimit $e) {
-    		// Too many requests made to the API too quickly
-    		$error++;
-    		$errormessage = "ErrorRateLimit ".$e->getMessage();
-    		dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
-    		setEventMessages($e->getMessage(), null, 'errors');
-    		$action = '';
-    	} catch (\Stripe\Error\InvalidRequest $e) {
-    		// Invalid parameters were supplied to Stripe's API
-    		$error++;
-    		$errormessage = "ErrorInvalidRequest ".$e->getMessage();
-    		dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
-    		setEventMessages($e->getMessage(), null, 'errors');
-    		$action = '';
-    	} catch (\Stripe\Error\Authentication $e) {
-    		// Authentication with Stripe's API failed
-    		// (maybe you changed API keys recently)
-    		$error++;
-    		$errormessage = "ErrorAuthentication ".$e->getMessage();
-    		dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
-    		setEventMessages($e->getMessage(), null, 'errors');
-    		$action = '';
-    	} catch (\Stripe\Error\ApiConnection $e) {
-    		// Network communication with Stripe failed
-    		$error++;
-    		$errormessage = "ErrorApiConnection ".$e->getMessage();
-    		dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
-    		setEventMessages($e->getMessage(), null, 'errors');
-    		$action = '';
-    	} catch (\Stripe\Error\Base $e) {
-    		// Display a very generic error to the user, and maybe send
-    		// yourself an email
-    		$error++;
-    		$errormessage = "ErrorBase ".$e->getMessage();
-    		dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
-    		setEventMessages($e->getMessage(), null, 'errors');
-    		$action = '';
-    	} catch (Exception $e) {
-    		// Something else happened, completely unrelated to Stripe
-    		$error++;
-    		$errormessage = "ErrorException ".$e->getMessage();
-    		dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
-    		setEventMessages($e->getMessage(), null, 'errors');
-    		$action = '';
-    	}
-    }
+			$error++;
+			$errormessage = "ErrorCard ".$e->getMessage()." err=".var_export($err, true);
+			dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
+			setEventMessages($e->getMessage(), null, 'errors');
+			$action = '';
+		} catch (\Stripe\Error\RateLimit $e) {
+			// Too many requests made to the API too quickly
+			$error++;
+			$errormessage = "ErrorRateLimit ".$e->getMessage();
+			dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
+			setEventMessages($e->getMessage(), null, 'errors');
+			$action = '';
+		} catch (\Stripe\Error\InvalidRequest $e) {
+			// Invalid parameters were supplied to Stripe's API
+			$error++;
+			$errormessage = "ErrorInvalidRequest ".$e->getMessage();
+			dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
+			setEventMessages($e->getMessage(), null, 'errors');
+			$action = '';
+		} catch (\Stripe\Error\Authentication $e) {
+			// Authentication with Stripe's API failed
+			// (maybe you changed API keys recently)
+			$error++;
+			$errormessage = "ErrorAuthentication ".$e->getMessage();
+			dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
+			setEventMessages($e->getMessage(), null, 'errors');
+			$action = '';
+		} catch (\Stripe\Error\ApiConnection $e) {
+			// Network communication with Stripe failed
+			$error++;
+			$errormessage = "ErrorApiConnection ".$e->getMessage();
+			dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
+			setEventMessages($e->getMessage(), null, 'errors');
+			$action = '';
+		} catch (\Stripe\Error\Base $e) {
+			// Display a very generic error to the user, and maybe send
+			// yourself an email
+			$error++;
+			$errormessage = "ErrorBase ".$e->getMessage();
+			dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
+			setEventMessages($e->getMessage(), null, 'errors');
+			$action = '';
+		} catch (Exception $e) {
+			// Something else happened, completely unrelated to Stripe
+			$error++;
+			$errormessage = "ErrorException ".$e->getMessage();
+			dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
+			setEventMessages($e->getMessage(), null, 'errors');
+			$action = '';
+		}
+	}
 
-    // When using the PaymentIntent API architecture
-    if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
-    {
-        $service = 'StripeTest';
-        $servicestatus = 0;
-        if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'int'))
-        {
-            $service = 'StripeLive';
-            $servicestatus = 1;
-        }
-        include_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
-        $stripe = new Stripe($db);
-        $stripeacc = $stripe->getStripeAccount($service);
+	// When using the PaymentIntent API architecture
+	if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
+	{
+		$service = 'StripeTest';
+		$servicestatus = 0;
+		if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'int'))
+		{
+			$service = 'StripeLive';
+			$servicestatus = 1;
+		}
+		include_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
+		$stripe = new Stripe($db);
+		$stripeacc = $stripe->getStripeAccount($service);
 
-        // We go here if $conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION is set.
-        // In such a case, payment is always ok when we call the "charge" action.
-        $paymentintent_id = GETPOST("paymentintent_id", "alpha");
+		// We go here if $conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION is set.
+		// In such a case, payment is always ok when we call the "charge" action.
+		$paymentintent_id = GETPOST("paymentintent_id", "alpha");
 
-        // Force to use the correct API key
-        global $stripearrayofkeysbyenv;
-        \Stripe\Stripe::setApiKey($stripearrayofkeysbyenv[$servicestatus]['secret_key']);
+		// Force to use the correct API key
+		global $stripearrayofkeysbyenv;
+		\Stripe\Stripe::setApiKey($stripearrayofkeysbyenv[$servicestatus]['secret_key']);
 
-        try {
-        	if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
-                $paymentintent = \Stripe\PaymentIntent::retrieve($paymentintent_id);
-            } else {
-                $paymentintent = \Stripe\PaymentIntent::retrieve($paymentintent_id, array("stripe_account" => $stripeacc));
-            }
-        } catch (Exception $e)
-        {
-            $error++;
-            $errormessage = "CantRetreivePaymentIntent ".$e->getMessage();
-            dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
-            setEventMessages($e->getMessage(), null, 'errors');
-            $action = '';
-        }
+		try {
+			if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
+				$paymentintent = \Stripe\PaymentIntent::retrieve($paymentintent_id);
+			} else {
+				$paymentintent = \Stripe\PaymentIntent::retrieve($paymentintent_id, array("stripe_account" => $stripeacc));
+			}
+		} catch (Exception $e)
+		{
+			$error++;
+			$errormessage = "CantRetrievePaymentIntent ".$e->getMessage();
+			dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
+			setEventMessages($e->getMessage(), null, 'errors');
+			$action = '';
+		}
 
-        if ($paymentintent->status != 'succeeded')
-        {
-            $error++;
-            $errormessage = "StatusOfRetreivedIntent is not succeeded: ".$paymentintent->status;
-            dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
-            setEventMessages($paymentintent->status, null, 'errors');
-            $action = '';
-        } else {
-        	// TODO We can alse record the payment mode into llx_societe_rib with stripe $paymentintent->payment_method
-        	// Note that with other old Stripe architecture (using Charge API), the payment mode was not recorded, so it is not mandatory to do it here.
-        	//dol_syslog("Create payment_method for ".$paymentintent->payment_method, LOG_DEBUG, 0, '_stripe');
-        }
-    }
+		if ($paymentintent->status != 'succeeded')
+		{
+			$error++;
+			$errormessage = "StatusOfRetrievedIntent is not succeeded: ".$paymentintent->status;
+			dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
+			setEventMessages($paymentintent->status, null, 'errors');
+			$action = '';
+		} else {
+			// TODO We can alse record the payment mode into llx_societe_rib with stripe $paymentintent->payment_method
+			// Note that with other old Stripe architecture (using Charge API), the payment mode was not recorded, so it is not mandatory to do it here.
+			//dol_syslog("Create payment_method for ".$paymentintent->payment_method, LOG_DEBUG, 0, '_stripe');
+		}
+	}
 
 
 	$remoteip = getUserRemoteIP();
@@ -684,7 +696,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
 	dol_syslog("onlinetoken=".$_SESSION["onlinetoken"]." FinalPaymentAmt=".$_SESSION["FinalPaymentAmt"]." currencyCodeType=".$_SESSION["currencyCodeType"]." payerID=".$_SESSION['payerID']." TRANSACTIONID=".$_SESSION['TRANSACTIONID'], LOG_DEBUG, 0, '_stripe');
 	dol_syslog("FULLTAG=".$FULLTAG, LOG_DEBUG, 0, '_stripe');
 	dol_syslog("error=".$error." errormessage=".$errormessage, LOG_DEBUG, 0, '_stripe');
-	dol_syslog("Now call the redirect to paymentok or paymentko", LOG_DEBUG, 0, '_stripe');
+	dol_syslog("Now call the redirect to paymentok or paymentko, URL = ".($error ? $urlko : $urlok), LOG_DEBUG, 0, '_stripe');
 
 	if ($error)
 	{
@@ -716,8 +728,8 @@ if ($source && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_r
 	$langs->load("errors");
 	dol_print_error_email('BADREFINPAYMENTFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $source, $ref));
 	// End of page
-    llxFooter();
-    $db->close();
+	llxFooter();
+	$db->close();
 	exit;
 }
 
@@ -776,7 +788,7 @@ if ($urllogo)
 	print '>';
 	print '</div>';
 	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
-		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
+		print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 	}
 	print '</div>';
 }
@@ -937,7 +949,7 @@ if ($source == 'order')
 	$directdownloadlink = $order->getLastMainDocLink('commande');
 	if ($directdownloadlink)
 	{
-		print '<br><a href="'.$directdownloadlink.'">';
+		print '<br><a href="'.$directdownloadlink.'" rel="nofollow noopener">';
 		print img_mime($order->last_main_doc, '');
 		print $langs->trans("DownloadDocument").'</a>';
 	}
@@ -1383,9 +1395,9 @@ if ($source == 'membersubscription')
 	print '</td></tr>'."\n";
 
 	if ($object->datefin > 0) {
-	    print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("DateEndSubscription");
-	    print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.dol_print_date($member->datefin, 'day');
-	    print '</td></tr>'."\n";
+		print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("DateEndSubscription");
+		print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.dol_print_date($member->datefin, 'day');
+		print '</td></tr>'."\n";
 	}
 
 	if ($member->last_subscription_date || $member->last_subscription_amount)
@@ -1640,6 +1652,12 @@ if ($action != 'dopayment')
 {
 	if ($found && !$error)	// We are in a management option and no error
 	{
+		// Check status of the object (Invoice) to verify if it is paid by external payment modules (ie Payzen, ...)
+		$parameters = [
+			'source' => $source,
+			'object' => $object
+		];
+		$reshook = $hookmanager->executeHooks('doCheckStatus', $parameters, $object, $action);
 		if ($source == 'order' && $object->billed)
 		{
 			print '<br><br><span class="amountpaymentcomplete">'.$langs->trans("OrderBilled").'</span>';
@@ -1650,16 +1668,21 @@ if ($action != 'dopayment')
 		{
 			print '<br><br><span class="amountpaymentcomplete">'.$langs->trans("DonationPaid").'</span>';
 		} else {
-		    // Membership can be paid and we still allow to make renewal
-		    if ($source == 'membersubscription' && $object->datefin > dol_now())
-		    {
-		        $langs->load("members");
-		        print '<br><span class="amountpaymentcomplete">'.$langs->trans("MembershipPaid", dol_print_date($object->datefin, 'day')).'</span><br>';
-		        print '<div class="opacitymedium margintoponly">'.$langs->trans("PaymentWillBeRecordedForNextPeriod").'</div>';
-		    }
+			// Membership can be paid and we still allow to make renewal
+			if ($source == 'membersubscription' && $object->datefin > dol_now())
+			{
+				$langs->load("members");
+				print '<br><span class="amountpaymentcomplete">'.$langs->trans("MembershipPaid", dol_print_date($object->datefin, 'day')).'</span><br>';
+				print '<div class="opacitymedium margintoponly">'.$langs->trans("PaymentWillBeRecordedForNextPeriod").'</div>';
+			}
 
 			// Buttons for all payments registration methods
 
+			// This hook is used to add Button to newpayment.php for external payment modules (ie Payzen, ...)
+			$parameters = [
+				'paymentmethod' => $paymentmethod
+			];
+			$reshook = $hookmanager->executeHooks('doAddButton', $parameters, $object, $action);
 			if ((empty($paymentmethod) || $paymentmethod == 'paybox') && !empty($conf->paybox->enabled))
 			{
 				print '<div class="button buttonpayment" id="div_dopayment_paybox"><span class="fa fa-credit-card"></span> <input class="" type="submit" id="dopayment_paybox" name="dopayment_paybox" value="'.$langs->trans("PayBoxDoPayment").'">';
@@ -1840,48 +1863,48 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 
 		//if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) || ! empty($paymentintent))
 		//{
-    	print '
+		print '
         <table id="dolpaymenttable" summary="Payment form" class="center">
         <tbody><tr><td class="textpublicpayment">';
 
-    	if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
-    	{
-            print '<div id="payment-request-button"><!-- A Stripe Element will be inserted here. --></div>';
-    	}
+		if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
+		{
+			print '<div id="payment-request-button"><!-- A Stripe Element will be inserted here. --></div>';
+		}
 
-        print '<div class="form-row left">';
-    	print '<label for="card-element">'.$langs->trans("CreditOrDebitCard").'</label>';
+		print '<div class="form-row left">';
+		print '<label for="card-element">'.$langs->trans("CreditOrDebitCard").'</label>';
 
-        if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
-        {
-            print '<br><input id="cardholder-name" class="marginbottomonly" name="cardholder-name" value="" type="text" placeholder="'.$langs->trans("CardOwner").'" autocomplete="off" autofocus required>';
-        }
+		if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
+		{
+			print '<br><input id="cardholder-name" class="marginbottomonly" name="cardholder-name" value="" type="text" placeholder="'.$langs->trans("CardOwner").'" autocomplete="off" autofocus required>';
+		}
 
-        print '<div id="card-element">
+		print '<div id="card-element">
         <!-- a Stripe Element will be inserted here. -->
         </div>';
 
-        print '<!-- Used to display form errors -->
+		print '<!-- Used to display form errors -->
         <div id="card-errors" role="alert"></div>
         </div>';
 
-        print '<br>';
-        print '<button class="button buttonpayment" style="text-align: center; padding-left: 0; padding-right: 0;" id="buttontopay" data-secret="'.(is_object($paymentintent) ? $paymentintent->client_secret : '').'">'.$langs->trans("ValidatePayment").'</button>';
-        print '<img id="hourglasstopay" class="hidden" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/working.gif">';
+		print '<br>';
+		print '<button class="button buttonpayment" style="text-align: center; padding-left: 0; padding-right: 0;" id="buttontopay" data-secret="'.(is_object($paymentintent) ? $paymentintent->client_secret : '').'">'.$langs->trans("ValidatePayment").'</button>';
+		print '<img id="hourglasstopay" class="hidden" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/working.gif">';
 
-        print '</td></tr></tbody>';
-        print '</table>';
+		print '</td></tr></tbody>';
+		print '</table>';
 		//}
 
 		if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
 		{
-		    if (empty($paymentintent))
-		    {
-                print '<center>'.$langs->trans("Error").'</center>';
-		    } else {
-		        print '<input type="hidden" name="paymentintent_id" value="'.$paymentintent->id.'">';
-		        //$_SESSION["paymentintent_id"] = $paymentintent->id;
-		    }
+			if (empty($paymentintent))
+			{
+				print '<center>'.$langs->trans("Error").'</center>';
+			} else {
+				print '<input type="hidden" name="paymentintent_id" value="'.$paymentintent->id.'">';
+				//$_SESSION["paymentintent_id"] = $paymentintent->id;
+			}
 		}
 
 		print '</form>'."\n";
@@ -1894,71 +1917,71 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 			print info_admin($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Stripe")), 0, 0, 'error');
 		} else {
 			print '<!-- JS Code for Stripe components -->';
-    		print '<script src="https://js.stripe.com/v3/"></script>'."\n";
-    		print '<!-- urllogofull = '.$urllogofull.' -->'."\n";
+			print '<script src="https://js.stripe.com/v3/"></script>'."\n";
+			print '<!-- urllogofull = '.$urllogofull.' -->'."\n";
 
-    	    // Code to ask the credit card. This use the default "API version". No way to force API version when using JS code.
-    		print '<script type="text/javascript" language="javascript">'."\n";
+			// Code to ask the credit card. This use the default "API version". No way to force API version when using JS code.
+			print '<script type="text/javascript" language="javascript">'."\n";
 
-    		if (!empty($conf->global->STRIPE_USE_NEW_CHECKOUT))
-    		{
-    			$amountstripe = $amount;
+			if (!empty($conf->global->STRIPE_USE_NEW_CHECKOUT))
+			{
+				$amountstripe = $amount;
 
-    			// Correct the amount according to unit of currency
-    			// See https://support.stripe.com/questions/which-zero-decimal-currencies-does-stripe-support
-    			$arrayzerounitcurrency = array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
-    			if (!in_array($currency, $arrayzerounitcurrency)) $amountstripe = $amountstripe * 100;
+				// Correct the amount according to unit of currency
+				// See https://support.stripe.com/questions/which-zero-decimal-currencies-does-stripe-support
+				$arrayzerounitcurrency = array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
+				if (!in_array($currency, $arrayzerounitcurrency)) $amountstripe = $amountstripe * 100;
 
-    			$ipaddress = getUserRemoteIP();
-    			$metadata = array('dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>$ipaddress);
-    			if (is_object($object))
-    			{
-    				$metadata['dol_type'] = $object->element;
-    				$metadata['dol_id'] = $object->id;
+				$ipaddress = getUserRemoteIP();
+				$metadata = array('dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>$ipaddress);
+				if (is_object($object))
+				{
+					$metadata['dol_type'] = $object->element;
+					$metadata['dol_id'] = $object->id;
 
-    				$ref = $object->ref;
-    			}
+					$ref = $object->ref;
+				}
 
-    			try {
-    				$arrayforpaymentintent = array(
-    					'description'=>'Stripe payment: '.$FULLTAG.($ref ? ' ref='.$ref : ''),
-    					"metadata" => $metadata
-    				);
-    				if ($TAG) $arrayforpaymentintent["statement_descriptor"] = dol_trunc($TAG, 10, 'right', 'UTF-8', 1); // 22 chars that appears on bank receipt (company + description)
+				try {
+					$arrayforpaymentintent = array(
+						'description'=>'Stripe payment: '.$FULLTAG.($ref ? ' ref='.$ref : ''),
+						"metadata" => $metadata
+					);
+					if ($TAG) $arrayforpaymentintent["statement_descriptor"] = dol_trunc($TAG, 10, 'right', 'UTF-8', 1); // 22 chars that appears on bank receipt (company + description)
 
-    				$arrayforcheckout = array(
-    					'payment_method_types' => array('card'),
-    					'line_items' => array(array(
-    						'name' => $langs->transnoentitiesnoconv("Payment").' '.$TAG, // Label of product line
-    						'description' => 'Stripe payment: '.$FULLTAG.($ref ? ' ref='.$ref : ''),
-    						'amount' => $amountstripe,
-    						'currency' => $currency,
-    						//'images' => array($urllogofull),
-    						'quantity' => 1,
-    					)),
-    					'client_reference_id' => $FULLTAG,
-    					'success_url' => $urlok,
-    					'cancel_url' => $urlko,
-    					'payment_intent_data' => $arrayforpaymentintent
-    				);
-    				if ($stripecu) $arrayforcheckout['customer'] = $stripecu;
-    				elseif (GETPOST('email', 'alpha') && isValidEmail(GETPOST('email', 'alpha'))) $arrayforcheckout['customer_email'] = GETPOST('email', 'alpha');
-    				$sessionstripe = \Stripe\Checkout\Session::create($arrayforcheckout);
+					$arrayforcheckout = array(
+						'payment_method_types' => array('card'),
+						'line_items' => array(array(
+							'name' => $langs->transnoentitiesnoconv("Payment").' '.$TAG, // Label of product line
+							'description' => 'Stripe payment: '.$FULLTAG.($ref ? ' ref='.$ref : ''),
+							'amount' => $amountstripe,
+							'currency' => $currency,
+							//'images' => array($urllogofull),
+							'quantity' => 1,
+						)),
+						'client_reference_id' => $FULLTAG,
+						'success_url' => $urlok,
+						'cancel_url' => $urlko,
+						'payment_intent_data' => $arrayforpaymentintent
+					);
+					if ($stripecu) $arrayforcheckout['customer'] = $stripecu;
+					elseif (GETPOST('email', 'alpha') && isValidEmail(GETPOST('email', 'alpha'))) $arrayforcheckout['customer_email'] = GETPOST('email', 'alpha');
+					$sessionstripe = \Stripe\Checkout\Session::create($arrayforcheckout);
 
-    				$remoteip = getUserRemoteIP();
+					$remoteip = getUserRemoteIP();
 
-    				// Save some data for the paymentok
-    				$_SESSION["currencyCodeType"] = $currency;
-    				$_SESSION["paymentType"] = '';
-    				$_SESSION["FinalPaymentAmt"] = $amount;
-    				$_SESSION['ipaddress'] = ($remoteip ? $remoteip : 'unknown'); // Payer ip
-    				$_SESSION['payerID'] = is_object($stripecu) ? $stripecu->id : '';
-    				$_SESSION['TRANSACTIONID'] = $sessionstripe->id;
-    			} catch (Exception $e)
-    			{
-    				print $e->getMessage();
-    			}
-    			?>
+					// Save some data for the paymentok
+					$_SESSION["currencyCodeType"] = $currency;
+					$_SESSION["paymentType"] = '';
+					$_SESSION["FinalPaymentAmt"] = $amount;
+					$_SESSION['ipaddress'] = ($remoteip ? $remoteip : 'unknown'); // Payer ip
+					$_SESSION['payerID'] = is_object($stripecu) ? $stripecu->id : '';
+					$_SESSION['TRANSACTIONID'] = $sessionstripe->id;
+				} catch (Exception $e)
+				{
+					print $e->getMessage();
+				}
+				?>
    			// Code for payment with option STRIPE_USE_NEW_CHECKOUT set
 
     	    // Create a Stripe client.
@@ -2002,9 +2025,9 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 
 
     			<?php
-    		} elseif (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
-    		{
-            	?>
+			} elseif (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
+			{
+				?>
     		// Code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION set
 
     	    // Create a Stripe client.
@@ -2107,9 +2130,9 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
             });
 
     			<?php
-    		} else // Old method (not SCA ready)
-    		{
-    			?>
+			} else // Old method (not SCA ready)
+			{
+				?>
     		// Old code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION off and STRIPE_USE_NEW_CHECKOUT off
 
     	    // Create a Stripe client.
@@ -2159,9 +2182,9 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
     	    form.addEventListener('submit', function(event) {
     	      event.preventDefault();
     			<?php
-    			if (empty($conf->global->STRIPE_USE_3DSECURE))	// Ask credit card directly, no 3DS test
-    			{
-    				?>
+				if (empty($conf->global->STRIPE_USE_3DSECURE))	// Ask credit card directly, no 3DS test
+				{
+					?>
     				/* Use token */
     				stripe.createToken(card).then(function(result) {
     			        if (result.error) {
@@ -2174,9 +2197,9 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
     			        }
     				});
     				<?php
-    			} else // Ask credit card with 3DS test
-    			{
-    				?>
+				} else // Ask credit card with 3DS test
+				{
+					?>
     				/* Use 3DS source */
     				stripe.createSource(card).then(function(result) {
     				    if (result.error) {
@@ -2189,8 +2212,8 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
     				    }
     				});
     				<?php
-    			}
-    			?>
+				}
+				?>
     	    });
 
 
@@ -2243,11 +2266,19 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
     		}
 
     	    	<?php
-    		}
+			}
 
-    		print '</script>';
+			print '</script>';
 		}
 	}
+	// This hook is used to show the embedded form to make payments with external payment modules (ie Payzen, ...)
+	$parameters = [
+		'paymentmethod' => $paymentmethod,
+		'amount' => price2num(GETPOST("newamount"), 'MT'),
+		'tag' => GETPOST("tag", 'alpha'),
+		'dopayment' => GETPOST('dopayment', 'alpha')
+	];
+	$reshook = $hookmanager->executeHooks('doPayment', $parameters, $object, $action);
 }
 
 
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index b3833bd14b5..ac92c958931 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -25,12 +25,14 @@
  *                  This token can be used to get more informations.
  */
 
-define("NOLOGIN", 1); // This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+if (!defined('NOLOGIN'))		define("NOLOGIN", 1); // This means this output page does not require to be logged.
+if (!defined('NOCSRFCHECK'))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
+// TODO This should be useless. Because entity must be retrieve from object ref and not from url.
 $entity = (!empty($_GET['e']) ? (int) $_GET['e'] : (!empty($_POST['e']) ? (int) $_POST['e'] : 1));
 if (is_numeric($entity)) define("DOLENTITY", $entity);
 
@@ -236,7 +238,7 @@ if ($urllogo)
 	print '>';
 	print '</div>';
 	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
-		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
+		print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 	}
 	print '</div>';
 }
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 3be1af4935e..5a49cec5bbe 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -25,12 +25,14 @@
  *                  This token can be used to get more informations.
  */
 
-define("NOLOGIN", 1); // This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+if (!defined('NOLOGIN'))		define("NOLOGIN", 1); // This means this output page does not require to be logged.
+if (!defined('NOCSRFCHECK'))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
+// TODO This should be useless. Because entity must be retrieve from object ref and not from url.
 $entity = (!empty($_GET['e']) ? (int) $_GET['e'] : (!empty($_POST['e']) ? (int) $_POST['e'] : 1));
 if (is_numeric($entity)) define("DOLENTITY", $entity);
 
@@ -176,7 +178,7 @@ if ($urllogo)
 	print '>';
 	print '</div>';
 	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
-		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
+		print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 	}
 	print '</div>';
 }
diff --git a/htdocs/public/recruitment/index.php b/htdocs/public/recruitment/index.php
index 0797ff20735..204d3bf3140 100644
--- a/htdocs/public/recruitment/index.php
+++ b/htdocs/public/recruitment/index.php
@@ -22,16 +22,18 @@
  */
 
 if (!defined('NOCSRFCHECK')) {
-    define('NOCSRFCHECK', '1');
+	define('NOCSRFCHECK', '1');
 }
 // Do not check anti CSRF attack test
 if (!defined('NOREQUIREMENU')) {
-    define('NOREQUIREMENU', '1');
+	define('NOREQUIREMENU', '1');
 }
 // If there is no need to load and show top and left menu
 if (!defined("NOLOGIN")) {
-    define("NOLOGIN", '1');
+	define("NOLOGIN", '1');
 }
+if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
 // If this page is public (can be called outside logged session)
 
 require '../../main.inc.php';
@@ -69,7 +71,8 @@ $user_assign = new User($db);
 $user_create = new User($db);
 
 if (!$conf->global->RECRUITMENT_ENABLE_PUBLIC_INTERFACE) {
-	print '<div class="error">'.$langs->trans('PublicInterfaceForbidden').'</div>';
+	$langs->load("errors");
+	print '<div class="error">'.$langs->trans('ErrorPublicInterfaceNotEnabled').'</div>';
 	$db->close();
 	exit();
 }
diff --git a/htdocs/public/recruitment/view.php b/htdocs/public/recruitment/view.php
index 94f85f911aa..b8858b921e9 100644
--- a/htdocs/public/recruitment/view.php
+++ b/htdocs/public/recruitment/view.php
@@ -24,6 +24,7 @@
 if (!defined('NOLOGIN'))		define("NOLOGIN", 1); // This means this output page does not require to be logged.
 if (!defined('NOCSRFCHECK'))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
 if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.php';
@@ -139,7 +140,7 @@ if ($action == "view" || $action == "presend" || $action == "close" || $action =
 $triggersendname = 'CANDIDATURE_SENTBYMAIL';
 $paramname = 'id';
 $autocopy = 'MAIN_MAIL_AUTOCOPY_CANDIDATURE_TO'; // used to know the automatic BCC to add
-$trackid = 'can'.$object->id;
+$trackid = 'recruitmentcandidature'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 
@@ -155,7 +156,8 @@ $conf->dol_hide_topmenu = 1;
 $conf->dol_hide_leftmenu = 1;
 
 if (!$conf->global->RECRUITMENT_ENABLE_PUBLIC_INTERFACE) {
-	print '<div class="error">'.$langs->trans('PublicInterfaceForbidden').'</div>';
+	$langs->load("errors");
+	print '<div class="error">'.$langs->trans('ErrorPublicInterfaceNotEnabled').'</div>';
 	$db->close();
 	exit();
 }
@@ -164,7 +166,7 @@ $arrayofjs = array();
 $arrayofcss = array();
 
 $replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
-llxHeader($head, $langs->trans("PositionToBeFilled"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea);
+llxHeader($head, $langs->trans("PositionToBeFilled"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea, 1);
 
 
 print '<span id="dolpaymentspan"></span>'."\n";
@@ -210,7 +212,7 @@ if ($urllogo)
 	print '>';
 	print '</div>';
 	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
-		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
+		print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 	}
 	print '</div>';
 }
@@ -277,7 +279,7 @@ if (empty($emailforcontact)) {
 		$emailforcontact = $mysoc->email;
 	}
 }
-print '<b>';
+print '<b class="wordbreak">';
 print $tmpuser->getFullName(-1);
 print ' - '.dol_print_email($emailforcontact, 0, 0, 1, 0, 0, 1);
 print '</b>';
diff --git a/htdocs/public/stripe/confirm_payment.php b/htdocs/public/stripe/confirm_payment.php
index 683a537fe69..5db7b49cc80 100644
--- a/htdocs/public/stripe/confirm_payment.php
+++ b/htdocs/public/stripe/confirm_payment.php
@@ -17,8 +17,10 @@
 
 // TODO Do we really need this page. We alread have a ipn.php page !
 
-define("NOLOGIN", 1); // This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+if (!defined('NOLOGIN'))		define("NOLOGIN", 1); // This means this output page does not require to be logged.
+if (!defined('NOCSRFCHECK'))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
 
 $entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
 if (is_numeric($entity)) define("DOLENTITY", $entity);
@@ -51,7 +53,7 @@ if (isset($_GET['connect']))
 	} else {
 		$endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_CONNECT_KEY;
 		$service = 'StripeLive';
-        $servicestatus = 1;
+		$servicestatus = 1;
 	}
 } else {
 	if (isset($_GET['test']))
@@ -100,28 +102,28 @@ $json_obj = json_decode($json_str);
 
 $intent = null;
 try {
-    if (isset($json_obj->payment_method_id)) {
-        // Create the PaymentIntent
-        $intent = \Stripe\PaymentIntent::create(array(
-            'payment_method' => $json_obj->payment_method_id,
-            'amount' => 1099,
-            'currency' => 'eur',
-            'confirmation_method' => 'manual',
-            'confirm' => true,
-        ));
-    }
-    if (isset($json_obj->payment_intent_id)) {
-        $intent = \Stripe\PaymentIntent::retrieve(
-            $json_obj->payment_intent_id
-            );
-        $intent->confirm();
-    }
-    generatePaymentResponse($intent);
+	if (isset($json_obj->payment_method_id)) {
+		// Create the PaymentIntent
+		$intent = \Stripe\PaymentIntent::create(array(
+			'payment_method' => $json_obj->payment_method_id,
+			'amount' => 1099,
+			'currency' => 'eur',
+			'confirmation_method' => 'manual',
+			'confirm' => true,
+		));
+	}
+	if (isset($json_obj->payment_intent_id)) {
+		$intent = \Stripe\PaymentIntent::retrieve(
+			$json_obj->payment_intent_id
+			);
+		$intent->confirm();
+	}
+	generatePaymentResponse($intent);
 } catch (\Stripe\Error\Base $e) {
-    // Display error on client
-    echo json_encode(array(
-        'error' => $e->getMessage()
-    ));
+	// Display error on client
+	echo json_encode(array(
+		'error' => $e->getMessage()
+	));
 }
 
 /**
@@ -132,25 +134,25 @@ try {
  */
 function generatePaymentResponse($intent)
 {
-    if ($intent->status == 'requires_source_action' &&
-        $intent->next_action->type == 'use_stripe_sdk') {
-        // Tell the client to handle the action
-        echo json_encode(array(
-            'requires_action' => true,
-            'payment_intent_client_secret' => $intent->client_secret
-        ));
-    } elseif ($intent->status == 'succeeded') {
-        // The payment didn’t need any additional actions and completed!
-        // Handle post-payment fulfillment
+	if ($intent->status == 'requires_source_action' &&
+		$intent->next_action->type == 'use_stripe_sdk') {
+		// Tell the client to handle the action
+		echo json_encode(array(
+			'requires_action' => true,
+			'payment_intent_client_secret' => $intent->client_secret
+		));
+	} elseif ($intent->status == 'succeeded') {
+		// The payment didn’t need any additional actions and completed!
+		// Handle post-payment fulfillment
 
-        // TODO
+		// TODO
 
-        echo json_encode(array(
-            "success" => true
-        ));
-    } else {
-        // Invalid status
-        http_response_code(500);
-        echo json_encode(array('error' => 'Invalid PaymentIntent status'));
-    }
+		echo json_encode(array(
+			"success" => true
+		));
+	} else {
+		// Invalid status
+		http_response_code(500);
+		echo json_encode(array('error' => 'Invalid PaymentIntent status'));
+	}
 }
diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index cc4d07b0a4b..bfb1bc99c5a 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -16,8 +16,10 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-define("NOLOGIN", 1); // This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+if (!defined('NOLOGIN'))		define("NOLOGIN", 1); // This means this output page does not require to be logged.
+if (!defined('NOCSRFCHECK'))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
 
 $entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
 if (is_numeric($entity)) define("DOLENTITY", $entity);
@@ -51,7 +53,7 @@ if (isset($_GET['connect']))
 	} else {
 		$endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_CONNECT_KEY;
 		$service = 'StripeLive';
-        $servicestatus = 1;
+		$servicestatus = 1;
 	}
 } else {
 	if (isset($_GET['test']))
@@ -68,9 +70,9 @@ if (isset($_GET['connect']))
 
 if (empty($endpoint_secret))
 {
-    print 'Error: Setup of module Stripe not complete for mode '.$service.'. The WEBHOOK_KEY is not defined.';
-    http_response_code(400); // PHP 5.4 or greater
-    exit();
+	print 'Error: Setup of module Stripe not complete for mode '.$service.'. The WEBHOOK_KEY is not defined.';
+	http_response_code(400); // PHP 5.4 or greater
+	exit();
 }
 
 
@@ -146,38 +148,38 @@ if ($event->type == 'payout.created') {
 
 	if ($result > 0)
 	{
-	    $subject = $societeName.' - [NOTIFICATION] Stripe payout scheduled';
-        if (!empty($user->email)) {
-            $sendto = dolGetFirstLastname($user->firstname, $user->lastname)." <".$user->email.">";
-        } else {
-            $sendto = $conf->global->MAIN_INFO_SOCIETE_MAIL.'" <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
-        }
-        $replyto = $sendto;
-        $sendtocc = '';
-        if (!empty($conf->global->ONLINE_PAYMENT_SENDEMAIL)) {
-            $sendtocc = $conf->global->ONLINE_PAYMENT_SENDEMAIL.'" <'.$conf->global->ONLINE_PAYMENT_SENDEMAIL.'>';
-        }
+		$subject = $societeName.' - [NOTIFICATION] Stripe payout scheduled';
+		if (!empty($user->email)) {
+			$sendto = dolGetFirstLastname($user->firstname, $user->lastname)." <".$user->email.">";
+		} else {
+			$sendto = $conf->global->MAIN_INFO_SOCIETE_MAIL.'" <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
+		}
+		$replyto = $sendto;
+		$sendtocc = '';
+		if (!empty($conf->global->ONLINE_PAYMENT_SENDEMAIL)) {
+			$sendtocc = $conf->global->ONLINE_PAYMENT_SENDEMAIL.'" <'.$conf->global->ONLINE_PAYMENT_SENDEMAIL.'>';
+		}
 
-        $message = "A bank transfer of ".price2num($event->data->object->amount / 100)." ".$event->data->object->currency." should arrive in your account the ".dol_print_date($event->data->object->arrival_date, 'dayhour');
+		$message = "A bank transfer of ".price2num($event->data->object->amount / 100)." ".$event->data->object->currency." should arrive in your account the ".dol_print_date($event->data->object->arrival_date, 'dayhour');
 
-        $mailfile = new CMailFile(
-            $subject,
-            $sendto,
-            $replyto,
-            $message,
-            array(),
-            array(),
-            array(),
-            $sendtocc,
-            '',
-            0,
-            -1
-        );
+		$mailfile = new CMailFile(
+			$subject,
+			$sendto,
+			$replyto,
+			$message,
+			array(),
+			array(),
+			array(),
+			$sendtocc,
+			'',
+			0,
+			-1
+		);
 
-        $ret = $mailfile->sendfile();
+		$ret = $mailfile->sendfile();
 
-        http_response_code(200); // PHP 5.4 or greater
-        return 1;
+		http_response_code(200); // PHP 5.4 or greater
+		return 1;
 	} else {
 		$error++;
 		http_response_code(500); // PHP 5.4 or greater
@@ -238,7 +240,7 @@ if ($event->type == 'payout.created') {
 
 		$message = "A bank transfer of ".price2num($event->data->object->amount / 100)." ".$event->data->object->currency." has been done to your account the ".dol_print_date($event->data->object->arrival_date, 'dayhour');
 
-        $mailfile = new CMailFile(
+		$mailfile = new CMailFile(
 			$subject,
 			$sendto,
 			$replyto,
@@ -268,15 +270,15 @@ if ($event->type == 'payout.created') {
 } elseif ($event->type == 'customer.source.delete') {
 	//TODO: delete customer's source
 } elseif ($event->type == 'customer.deleted') {
-    $db->begin();
-    $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_account WHERE key_account = '".$db->escape($event->data->object->id)."' and site='stripe'";
-    $db->query($sql);
-    $db->commit();
+	$db->begin();
+	$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_account WHERE key_account = '".$db->escape($event->data->object->id)."' and site='stripe'";
+	$db->query($sql);
+	$db->commit();
 } elseif ($event->type == 'payment_intent.succeeded') {		// Called when making payment with PaymentIntent method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on).
 	// TODO: create fees
 	// TODO: Redirect to paymentok.php
 } elseif ($event->type == 'payment_intent.payment_failed') {
-    // TODO: Redirect to paymentko.php
+	// TODO: Redirect to paymentko.php
 } elseif ($event->type == 'checkout.session.completed')		// Called when making payment with new Checkout method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on).
 {
 	// TODO: create fees
@@ -363,10 +365,10 @@ if ($event->type == 'payout.created') {
 	$db->query($sql);
 	$db->commit();
 } elseif ($event->type == 'charge.succeeded') {
-    // TODO: create fees
-    // TODO: Redirect to paymentok.php
+	// TODO: create fees
+	// TODO: Redirect to paymentok.php
 } elseif ($event->type == 'charge.failed') {
-    // TODO: Redirect to paymentko.php
+	// TODO: Redirect to paymentko.php
 } elseif (($event->type == 'source.chargeable') && ($event->data->object->type == 'three_d_secure') && ($event->data->object->three_d_secure->authenticated == true)) {
 	// This event is deprecated.
 }
diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index ffa4b24fc59..95265831670 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -162,8 +162,8 @@ if (!empty($conf->use_javascript_ajax)) include DOL_DOCUMENT_ROOT.'/core/tpl/aja
 
 $nav = '';
 $nav .= '<form name="dateselect" action="'.$_SERVER["PHP_SELF"].'?action=show_peruser'.$param.'">';
-if ($actioncode || isset($_GET['actioncode']) || isset($_POST['actioncode'])) $nav .= '<input type="hidden" name="actioncode" value="'.$actioncode.'">';
-if ($status || isset($_GET['status']) || isset($_POST['status']))  $nav .= '<input type="hidden" name="status" value="'.$status.'">';
+if ($actioncode || GETPOSTISSET('actioncode')) $nav .= '<input type="hidden" name="actioncode" value="'.$actioncode.'">';
+if ($status || GETPOSTISSET('status'))  $nav .= '<input type="hidden" name="status" value="'.$status.'">';
 if ($filter)  $nav .= '<input type="hidden" name="filter" value="'.$filter.'">';
 if ($filtert) $nav .= '<input type="hidden" name="filtert" value="'.$filtert.'">';
 if ($socid)   $nav .= '<input type="hidden" name="socid" value="'.$socid.'">';
diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index ed26c881fd7..1c81faca1ad 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -29,6 +29,8 @@ if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
 if (!defined('NOLOGIN'))        define("NOLOGIN", 1); // This means this output page does not require to be logged.
 if (!defined('NOCSRFCHECK'))    define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
 if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
+
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/actions_ticket.class.php';
@@ -49,6 +51,9 @@ $msg_id = GETPOST('msg_id', 'int');
 
 $action = GETPOST('action', 'aZ09');
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('publicnewticketcard', 'globalcard'));
+
 $object = new Ticket($db);
 $extrafields = new ExtraFields($db);
 
@@ -58,9 +63,16 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 /*
  * Actions
  */
-
+$parameters = array(
+	'id' => $id,
+);
+// Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 // Add file in email form
-if (GETPOST('addfile', 'alpha') && !GETPOST('add', 'alpha')) {
+if (empty($reshook) && GETPOST('addfile', 'alpha') && !GETPOST('add', 'alpha')) {
 	////$res = $object->fetch('','',GETPOST('track_id'));
 	////if($res > 0)
 	////{
@@ -79,7 +91,7 @@ if (GETPOST('addfile', 'alpha') && !GETPOST('add', 'alpha')) {
 }
 
 // Remove file
-if (GETPOST('removedfile', 'alpha') && !GETPOST('add', 'alpha')) {
+if (empty($reshook) && GETPOST('removedfile', 'alpha') && !GETPOST('add', 'alpha')) {
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 	// Set tmp directory
@@ -91,7 +103,7 @@ if (GETPOST('removedfile', 'alpha') && !GETPOST('add', 'alpha')) {
 	$action = 'create_ticket';
 }
 
-if ($action == 'create_ticket' && GETPOST('add', 'alpha')) {
+if (empty($reshook) && $action == 'create_ticket' && GETPOST('add', 'alpha')) {
 	$error = 0;
 	$origin_email = GETPOST('email', 'alpha');
 	if (empty($origin_email)) {
@@ -176,8 +188,7 @@ if ($action == 'create_ticket' && GETPOST('add', 'alpha')) {
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$object->db->commit();
 			$action = "infos_success";
 		} else {
@@ -186,8 +197,7 @@ if ($action == 'create_ticket' && GETPOST('add', 'alpha')) {
 			$action = 'create_ticket';
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$res = $object->fetch($id);
 			if ($res) {
 				// Create form object
@@ -212,7 +222,7 @@ if ($action == 'create_ticket' && GETPOST('add', 'alpha')) {
 				$message .= $langs->transnoentities('TicketNewEmailBodyInfosTicket').'<br>';
 
 				$url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
-				$infos_new_ticket = $langs->transnoentities('TicketNewEmailBodyInfosTrackId', '<a href="'.$url_public_ticket.'">'.$object->track_id.'</a>').'<br>';
+				$infos_new_ticket = $langs->transnoentities('TicketNewEmailBodyInfosTrackId', '<a href="'.$url_public_ticket.'" rel="nofollow noopener">'.$object->track_id.'</a>').'<br>';
 				$infos_new_ticket .= $langs->transnoentities('TicketNewEmailBodyInfosTrackUrl').'<br><br>';
 
 				$message .= $infos_new_ticket;
@@ -242,8 +252,7 @@ if ($action == 'create_ticket' && GETPOST('add', 'alpha')) {
 
 				// Send email to TICKET_NOTIFICATION_EMAIL_TO
 				$sendto = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
-				if ($sendto)
-				{
+				if ($sendto) {
 					$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectAdmin', $object->ref, $object->track_id);
 					$message_admin = $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id).'<br><br>';
 					$message_admin .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
@@ -263,7 +272,7 @@ if ($action == 'create_ticket' && GETPOST('add', 'alpha')) {
 
 					$message_admin .= '</ul>';
 					$message_admin .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
-					$message_admin .= '<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
+					$message_admin .= '<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'" rel="nofollow noopener">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
 
 					$from = $conf->global->MAIN_INFO_SOCIETE_NOM.' <'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
 					$replyto = $from;
@@ -317,8 +326,7 @@ if ($action == 'create_ticket' && GETPOST('add', 'alpha')) {
 $form = new Form($db);
 $formticket = new FormTicket($db);
 
-if (!$conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)
-{
+if (!$conf->global->TICKET_ENABLE_PUBLIC_INTERFACE) {
 	print '<div class="error">'.$langs->trans('TicketPublicInterfaceForbidden').'</div>';
 	$db->close();
 	exit();
diff --git a/htdocs/public/ticket/index.php b/htdocs/public/ticket/index.php
index be7c44580cd..b3e8a5e237e 100644
--- a/htdocs/public/ticket/index.php
+++ b/htdocs/public/ticket/index.php
@@ -26,10 +26,11 @@ if (!defined('NOCSRFCHECK'))   define('NOCSRFCHECK', '1');
 if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1');
 if (!defined("NOLOGIN"))       define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
+// TODO This should be useless. Because entity must be retrieve from object ref and not from url.
 $entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
 if (is_numeric($entity)) define("DOLENTITY", $entity);
 
@@ -70,9 +71,9 @@ llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
 print '<div class="ticketpublicarea">';
 print '<p style="text-align: center">'.($conf->global->TICKET_PUBLIC_TEXT_HOME ? $conf->global->TICKET_PUBLIC_TEXT_HOME : $langs->trans("TicketPublicDesc")).'</p>';
 print '<div class="ticketform">';
-print '<a href="create_ticket.php" class="butAction marginbottomonly"><div class="index_create bigrounded"><span class="fa fa-plus-circle valignmiddle btnTitle-icon"></span><br>'.dol_escape_htmltag($langs->trans("CreateTicket")).'</div></a>';
-print '<a href="list.php" class="butAction marginbottomonly"><div class="index_display bigrounded"><span class="fa fa-list-alt valignmiddle btnTitle-icon"></span><br>'.dol_escape_htmltag($langs->trans("ViewMyTicketList")).'</div></a>';
-print '<a href="view.php" class="butAction marginbottomonly"><div class="index_display bigrounded">'.img_picto('', 'ticket').'<br>'.dol_escape_htmltag($langs->trans("ShowTicketWithTrackId")).'</div></a>';
+print '<a href="create_ticket.php" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_create bigrounded"><span class="fa fa-plus-circle valignmiddle btnTitle-icon"></span><br>'.dol_escape_htmltag($langs->trans("CreateTicket")).'</div></a>';
+print '<a href="list.php" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_display bigrounded"><span class="fa fa-list-alt valignmiddle btnTitle-icon"></span><br>'.dol_escape_htmltag($langs->trans("ViewMyTicketList")).'</div></a>';
+print '<a href="view.php" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_display bigrounded">'.img_picto('', 'ticket').'<br>'.dol_escape_htmltag($langs->trans("ShowTicketWithTrackId")).'</div></a>';
 print '<div style="clear:both;"></div>';
 print '</div>';
 print '</div>';
diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index a64c551bba3..0f9542c986a 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -32,6 +32,8 @@ if (!defined('NOREQUIREMENU')) {
 if (!defined("NOLOGIN")) {
 	define("NOLOGIN", '1');
 }
+if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
 // If this page is public (can be called outside logged session)
 
 require '../../main.inc.php';
@@ -561,7 +563,7 @@ if ($action == "view_ticketlist")
 					// Subject
 					if (!empty($arrayfields['t.subject']['checked'])) {
 						print '<td>';
-						print '<a href="javascript:viewticket(\''.$obj->track_id.'\',\''.$_SESSION['email_customer'].'\');">'.$obj->subject.'</a>';
+						print '<a rel="nofollow" href="javascript:viewticket(\''.$obj->track_id.'\',\''.$_SESSION['email_customer'].'\');">'.$obj->subject.'</a>';
 						print '</td>';
 					}
 
diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php
index f8cab9c9b9a..02c7c9e51d8 100644
--- a/htdocs/public/ticket/view.php
+++ b/htdocs/public/ticket/view.php
@@ -33,6 +33,8 @@ if (!defined('NOREQUIREMENU')) {
 if (!defined("NOLOGIN")) {
 	define("NOLOGIN", '1');
 }
+if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
 // If this page is public (can be called outside logged session)
 
 require '../../main.inc.php';
@@ -372,7 +374,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 		print load_fiche_titre($langs->trans('TicketMessagesList'), '', 'object_conversation');
 		$object->viewTicketMessages(false, true, $object->dao);
 	} else {
-		print '<div class="error">Not Allowed<br><a href="'.$_SERVER['PHP_SELF'].'?track_id='.$object->dao->track_id.'">'.$langs->trans('Back').'</a></div>';
+		print '<div class="error">Not Allowed<br><a href="'.$_SERVER['PHP_SELF'].'?track_id='.$object->dao->track_id.'" rel="nofollow noopener">'.$langs->trans('Back').'</a></div>';
 	}
 } else {
 	print '<div class="center opacitymedium margintoponly marginbottomonly">'.$langs->trans("TicketPublicMsgViewLogIn").'</div>';
diff --git a/htdocs/public/website/index.php b/htdocs/public/website/index.php
index d09b8e10012..4edd733b9e6 100644
--- a/htdocs/public/website/index.php
+++ b/htdocs/public/website/index.php
@@ -36,6 +36,8 @@ if (!defined('NOCSRFCHECK'))    define("NOCSRFCHECK", 1); // We accept to go on
 if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
 if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
 if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
 
 /**
  * Header empty
diff --git a/htdocs/public/website/styles.css.php b/htdocs/public/website/styles.css.php
index 8854c13ea52..75257a8facc 100644
--- a/htdocs/public/website/styles.css.php
+++ b/htdocs/public/website/styles.css.php
@@ -27,6 +27,8 @@ if (!defined('NOCSRFCHECK'))    define("NOCSRFCHECK", 1); // We accept to go on
 if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
 if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
 if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
 
 /**
  * Header empty
@@ -69,20 +71,20 @@ if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli = $conf->global->MAIN_
 
 if (empty($pageid))
 {
-    require_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
 
-    $object = new Website($db);
-    if ($websiteid)
-    {
-        $object->fetch($websiteid);
-        $website = $object->ref;
-    } else {
-        $object->fetch(0, $website);
-    }
+	$object = new Website($db);
+	if ($websiteid)
+	{
+		$object->fetch($websiteid);
+		$website = $object->ref;
+	} else {
+		$object->fetch(0, $website);
+	}
 
-    $objectpage = new WebsitePage($db);
-    /* Not required for CSS file
+	$objectpage = new WebsitePage($db);
+	/* Not required for CSS file
     $array=$objectpage->fetchAll($object->id);
 
     if (is_array($array) && count($array) > 0)
@@ -113,7 +115,7 @@ $refname = basename(dirname($original_file)."/");
 // Limite acces si droits non corrects
 if (!$accessallowed)
 {
-    accessforbidden();
+	accessforbidden();
 }
 
 // Security:
@@ -121,10 +123,10 @@ if (!$accessallowed)
 // les noms de fichiers.
 if (preg_match('/\.\./', $original_file) || preg_match('/[<>|]/', $original_file))
 {
-    dol_syslog("Refused to deliver file ".$original_file);
-    $file = basename($original_file); // Do no show plain path of original_file in shown error message
-    dol_print_error(0, $langs->trans("ErrorFileNameInvalid", $file));
-    exit;
+	dol_syslog("Refused to deliver file ".$original_file);
+	$file = basename($original_file); // Do no show plain path of original_file in shown error message
+	dol_print_error(0, $langs->trans("ErrorFileNameInvalid", $file));
+	exit;
 }
 
 clearstatcache();
@@ -138,10 +140,10 @@ $original_file_osencoded = dol_osencode($original_file); // New file name encode
 // This test if file exists should be useless. We keep it to find bug more easily
 if (!file_exists($original_file_osencoded))
 {
-    $langs->load("website");
-    print $langs->trans("RequestedPageHasNoContentYet", $pageid);
-    //dol_print_error(0,$langs->trans("ErrorFileDoesNotExists",$original_file));
-    exit;
+	$langs->load("website");
+	print $langs->trans("RequestedPageHasNoContentYet", $pageid);
+	//dol_print_error(0,$langs->trans("ErrorFileDoesNotExists",$original_file));
+	exit;
 }
 
 
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index d41ce8e6bf4..3bac7265606 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -52,8 +52,8 @@ if (!empty($conf->fournisseur->enabled)) {
 }
 if (!empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
 if (!empty($conf->projet->enabled)) {
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
 $langs->loadLangs(array("receptions", "companies", "bills", 'deliveries', 'orders', 'stocks', 'other', 'propal', 'sendings'));
@@ -111,6 +111,8 @@ $hookmanager->initHooks(array('receptioncard', 'globalcard'));
 $permissiondellink = $user->rights->reception->creer; // Used by the include of actions_dellink.inc.php
 //var_dump($object->lines[0]->detail_batch);
 
+$date_delivery = dol_mktime(GETPOST('date_deliveryhour', 'int'), GETPOST('date_deliverymin', 'int'), 0, GETPOST('date_deliverymonth', 'int'), GETPOST('date_deliveryday', 'int'), GETPOST('date_deliveryyear', 'int'));
+
 
 /*
  * Actions
@@ -122,7 +124,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    if ($cancel)
+	if ($cancel)
 	{
 		$action = '';
 		$object->fetch($id); // show reception also after canceling modification
@@ -133,8 +135,8 @@ if (empty($reshook))
 	// Reopen
 	if ($action == 'reopen' && $user->rights->reception->creer)
 	{
-	    $object->fetch($id);
-	    $result = $object->reOpen();
+		$object->fetch($id);
+		$result = $object->reOpen();
 	}
 
 	// Confirm back to draft status
@@ -164,24 +166,24 @@ if (empty($reshook))
 	// Set incoterm
 	if ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
 	{
-	    $result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
 	}
 
 	if ($action == 'setref_supplier')
 	{
-        $result = $object->fetch($id);
-        if ($result < 0) {
-            setEventMessages($object->error, $object->errors, 'errors');
-        }
+		$result = $object->fetch($id);
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 
-        $result = $object->setValueFrom('ref_supplier', GETPOST('ref_supplier', 'alpha'), '', null, 'text', '', $user, 'RECEPTION_MODIFY');
-        if ($result < 0) {
-            setEventMessages($object->error, $object->errors, 'errors');
-            $action = 'editref_supplier';
-        } else {
-            header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-            exit;
-        }
+		$result = $object->setValueFrom('ref_supplier', GETPOST('ref_supplier', 'alpha'), '', null, 'text', '', $user, 'RECEPTION_MODIFY');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action = 'editref_supplier';
+		} else {
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		}
 	}
 
 	if ($action == 'update_extras')
@@ -226,8 +228,6 @@ if (empty($reshook))
 		$object->size_units = GETPOST('size_units', 'int');
 		$object->weight_units = GETPOST('weight_units', 'int');
 
-		$date_delivery = dol_mktime(GETPOST('date_deliveryhour', 'int'), GETPOST('date_deliverymin', 'int'), 0, GETPOST('date_deliverymonth', 'int'), GETPOST('date_deliveryday', 'int'), GETPOST('date_deliveryyear', 'int'));
-
 		// On va boucler sur chaque ligne du document d'origine pour completer objet reception
 		// avec info diverses + qte a livrer
 
@@ -338,76 +338,76 @@ if (empty($reshook))
 			}
 
 
-	        // Fill array 'array_options' with data from add form
-	        $ret = $extrafields->setOptionalsFromPost(null, $object);
-	        if ($ret < 0) $error++;
-	        if (!$error)
-	        {
-	            $ret = $object->create($user); // This create reception (like Odoo picking) and line of receptions. Stock movement will when validating reception.
+			// Fill array 'array_options' with data from add form
+			$ret = $extrafields->setOptionalsFromPost(null, $object);
+			if ($ret < 0) $error++;
+			if (!$error)
+			{
+				$ret = $object->create($user); // This create reception (like Odoo picking) and line of receptions. Stock movement will when validating reception.
 
-	            if ($ret <= 0)
-	            {
-	                setEventMessages($object->error, $object->errors, 'errors');
-	                $error++;
-	            }
-	        }
-	    } else {
-	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("QtyToReceive").'/'.$langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
-	        $error++;
-	    }
+				if ($ret <= 0)
+				{
+					setEventMessages($object->error, $object->errors, 'errors');
+					$error++;
+				}
+			}
+		} else {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("QtyToReceive").'/'.$langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
+			$error++;
+		}
 
-	    if (!$error)
-	    {
-	        $db->commit();
-	        header("Location: card.php?id=".$object->id);
-	        exit;
-	    } else {
-	        $db->rollback();
-	        $_GET["commande_id"] = GETPOST('commande_id', 'int');
-	        $action = 'create';
-	    }
+		if (!$error)
+		{
+			$db->commit();
+			header("Location: card.php?id=".$object->id);
+			exit;
+		} else {
+			$db->rollback();
+			$_GET["commande_id"] = GETPOST('commande_id', 'int');
+			$action = 'create';
+		}
 	} elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
-        ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->creer))
-       	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate)))
+		((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->creer))
+	   	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate)))
 	)
 	{
-	    $object->fetch_thirdparty();
+		$object->fetch_thirdparty();
 
-	    $result = $object->valid($user);
+		$result = $object->valid($user);
 
-	    if ($result < 0)
-	    {
+		if ($result < 0)
+		{
 			$langs->load("errors");
-	        setEventMessages($langs->trans($object->error), null, 'errors');
-	    } else {
-	    	// 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->model_pdf;
-	    		$ret = $object->fetch($id); // Reload to get new records
+			setEventMessages($langs->trans($object->error), null, 'errors');
+		} else {
+			// 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->model_pdf;
+				$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);
-	    	}
-	    }
+				$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				if ($result < 0) dol_print_error($db, $result);
+			}
+		}
 	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->reception->supprimer)
 	{
-	    $result = $object->delete($user);
-	    if ($result > 0)
-	    {
-	        header("Location: ".DOL_URL_ROOT.'/reception/index.php');
-	        exit;
-	    } else {
+		$result = $object->delete($user);
+		if ($result > 0)
+		{
+			header("Location: ".DOL_URL_ROOT.'/reception/index.php');
+			exit;
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
-	    }
+		}
 	}
 	// TODO add alternative status
 	/*elseif ($action == 'reopen' && (! empty($user->rights->reception->creer) || ! empty($user->rights->reception->reception_advance->validate)))
@@ -421,15 +421,15 @@ if (empty($reshook))
 
 	elseif ($action == 'setdate_livraison' && $user->rights->reception->creer)
 	{
-	    //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
-	    $datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
+		//print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
+		$datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
 
-	    $object->fetch($id);
-	    $result = $object->set_date_livraison($user, $datedelivery);
-	    if ($result < 0)
-	    {
-	        setEventMessages($object->error, $object->errors, 'errors');
-	    }
+		$object->fetch($id);
+		$result = $object->setDeliveryDate($user, $datedelivery);
+		if ($result < 0)
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	// Action update
@@ -440,33 +440,33 @@ if (empty($reshook))
 	|| $action == 'settrueDepth'
 	|| $action == 'setshipping_method_id')
 	{
-	    $error = 0;
+		$error = 0;
 
-	    if ($action == 'settracking_number')		$object->tracking_number = trim(GETPOST('tracking_number', 'alpha'));
-	    if ($action == 'settracking_url')		$object->tracking_url = trim(GETPOST('tracking_url', 'int'));
-	    if ($action == 'settrueWeight') {
-	    	$object->trueWeight = trim(GETPOST('trueWeight', 'int'));
+		if ($action == 'settracking_number')		$object->tracking_number = trim(GETPOST('tracking_number', 'alpha'));
+		if ($action == 'settracking_url')		$object->tracking_url = trim(GETPOST('tracking_url', 'int'));
+		if ($action == 'settrueWeight') {
+			$object->trueWeight = trim(GETPOST('trueWeight', 'int'));
 			$object->weight_units = GETPOST('weight_units', 'int');
-	    }
-	    if ($action == 'settrueWidth')			$object->trueWidth = trim(GETPOST('trueWidth', 'int'));
-	    if ($action == 'settrueHeight') {
-	    				$object->trueHeight = trim(GETPOST('trueHeight', 'int'));
+		}
+		if ($action == 'settrueWidth')			$object->trueWidth = trim(GETPOST('trueWidth', 'int'));
+		if ($action == 'settrueHeight') {
+						$object->trueHeight = trim(GETPOST('trueHeight', 'int'));
 						$object->size_units = GETPOST('size_units', 'int');
 		}
-	    if ($action == 'settrueDepth')			$object->trueDepth = trim(GETPOST('trueDepth', 'int'));
-	    if ($action == 'setshipping_method_id')	$object->shipping_method_id = trim(GETPOST('shipping_method_id', 'int'));
+		if ($action == 'settrueDepth')			$object->trueDepth = trim(GETPOST('trueDepth', 'int'));
+		if ($action == 'setshipping_method_id')	$object->shipping_method_id = trim(GETPOST('shipping_method_id', 'int'));
 
-	    if (!$error)
-	    {
-	        if ($object->update($user) >= 0)
-	        {
-	            header("Location: card.php?id=".$object->id);
-	            exit;
-	        }
-	        setEventMessages($object->error, $object->errors, 'errors');
-	    }
+		if (!$error)
+		{
+			if ($object->update($user) >= 0)
+			{
+				header("Location: card.php?id=".$object->id);
+				exit;
+			}
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 
-	    $action = "";
+		$action = "";
 	}
 
 	// Build document
@@ -475,22 +475,22 @@ if (empty($reshook))
 		// Save last template used to generate document
 		if (GETPOST('model')) $object->setDocModel($user, GETPOST('model', 'alpha'));
 
-	    // Define output language
-	    $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 = $reception->thirdparty->default_lang;
-	    if (!empty($newlang))
-	    {
-	        $outputlangs = new Translate("", $conf);
-	        $outputlangs->setDefaultLang($newlang);
-	    }
+		// Define output language
+		$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 = $reception->thirdparty->default_lang;
+		if (!empty($newlang))
+		{
+			$outputlangs = new Translate("", $conf);
+			$outputlangs->setDefaultLang($newlang);
+		}
 		$result = $object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-	    if ($result <= 0)
-	    {
+		if ($result <= 0)
+		{
 			setEventMessages($object->error, $object->errors, 'errors');
-	        $action = '';
-	    }
+			$action = '';
+		}
 	}
 
 	// Delete file in doc form
@@ -505,20 +505,20 @@ if (empty($reshook))
 		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
 	} elseif ($action == 'classifybilled')
 	{
-	    $object->fetch($id);
-	    $result = $object->set_billed();
-	    if ($result >= 0) {
-	    	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-	    	exit();
-	    }
+		$object->fetch($id);
+		$result = $object->set_billed();
+		if ($result >= 0) {
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+			exit();
+		}
 	} elseif ($action == 'classifyclosed')
 	{
-	    $object->fetch($id);
-	    $result = $object->setClosed();
-	    if ($result >= 0) {
-	    	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-	    	exit();
-	    }
+		$object->fetch($id);
+		$result = $object->setClosed();
+		if ($result >= 0) {
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+			exit();
+		}
 	}
 
 	/*
@@ -649,7 +649,7 @@ if (empty($reshook))
 			header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
 			exit();
 		}
-	} elseif ($action == 'updateline' && $user->rights->reception->creer && GETPOST('cancel', 'alpha') == $langs->trans('Cancel')) {
+	} elseif ($action == 'updateline' && $user->rights->reception->creer && GETPOST('cancel', 'alpha') == $langs->trans("Cancel")) {
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
 		exit();
 	}
@@ -683,165 +683,164 @@ $warehousestatic = new Entrepot($db);
 
 if ($action == 'create2')
 {
-    print load_fiche_titre($langs->trans("CreateReception"), '', 'dollyrevert');
+	print load_fiche_titre($langs->trans("CreateReception"), '', 'dollyrevert');
 
-    print '<br>'.$langs->trans("ReceptionCreationIsDoneFromOrder");
-    $action = ''; $id = ''; $ref = '';
+	print '<br>'.$langs->trans("ReceptionCreationIsDoneFromOrder");
+	$action = ''; $id = ''; $ref = '';
 }
 
 // Mode creation.
 if ($action == 'create')
 {
-    $recept = new Reception($db);
+	$recept = new Reception($db);
 
-    print load_fiche_titre($langs->trans("CreateReception"));
-    if (!$origin)
-    {
-        setEventMessages($langs->trans("ErrorBadParameters"), null, 'errors');
-    }
+	print load_fiche_titre($langs->trans("CreateReception"));
+	if (!$origin)
+	{
+		setEventMessages($langs->trans("ErrorBadParameters"), null, 'errors');
+	}
 
-    if ($origin)
-    {
+	if ($origin)
+	{
 		if ($origin == 'supplierorder')$classname = 'CommandeFournisseur';
-        else $classname = ucfirst($origin);
+		else $classname = ucfirst($origin);
 
-        $object = new $classname($db);
-        if ($object->fetch($origin_id))	// This include the fetch_lines
-        {
-            $soc = new Societe($db);
-            $soc->fetch($object->socid);
+		$object = new $classname($db);
+		if ($object->fetch($origin_id))	// This include the fetch_lines
+		{
+			$soc = new Societe($db);
+			$soc->fetch($object->socid);
 
-            $author = new User($db);
-            $author->fetch($object->user_author_id);
+			$author = new User($db);
+			$author->fetch($object->user_author_id);
 
-            if (!empty($conf->stock->enabled)) $entrepot = new Entrepot($db);
+			if (!empty($conf->stock->enabled)) $entrepot = new Entrepot($db);
 
-            print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            print '<input type="hidden" name="action" value="add">';
-            print '<input type="hidden" name="origin" value="'.$origin.'">';
-            print '<input type="hidden" name="origin_id" value="'.$object->id.'">';
-            print '<input type="hidden" name="ref_int" value="'.$object->ref_int.'">';
-            if (GETPOST('entrepot_id', 'int'))
-            {
-                print '<input type="hidden" name="entrepot_id" value="'.GETPOST('entrepot_id', 'int').'">';
-            }
+			print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="action" value="add">';
+			print '<input type="hidden" name="origin" value="'.$origin.'">';
+			print '<input type="hidden" name="origin_id" value="'.$object->id.'">';
+			print '<input type="hidden" name="ref_int" value="'.$object->ref_int.'">';
+			if (GETPOST('entrepot_id', 'int'))
+			{
+				print '<input type="hidden" name="entrepot_id" value="'.GETPOST('entrepot_id', 'int').'">';
+			}
 
-            dol_fiche_head('');
+			print dol_get_fiche_head('');
 
-            print '<table class="border centpercent">';
+			print '<table class="border centpercent">';
 
-            // Ref
-            print '<tr><td class="titlefieldcreate fieldrequired">';
-            if ($origin == 'supplierorder' && !empty($conf->fournisseur->enabled))
-            {
-                print $langs->trans("RefOrder").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/fourn/commande/card.php?id='.$object->id.'">'.img_object($langs->trans("ShowOrder"), 'order').' '.$object->ref;
-            }
-            if ($origin == 'propal' && !empty($conf->propal->enabled))
-            {
-                print $langs->trans("RefProposal").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/comm/card.php?id='.$object->id.'">'.img_object($langs->trans("ShowProposal"), 'propal').' '.$object->ref;
-            }
-            print '</a></td>';
-            print "</tr>\n";
+			// Ref
+			print '<tr><td class="titlefieldcreate fieldrequired">';
+			if ($origin == 'supplierorder' && !empty($conf->fournisseur->enabled))
+			{
+				print $langs->trans("RefOrder").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/fourn/commande/card.php?id='.$object->id.'">'.img_object($langs->trans("ShowOrder"), 'order').' '.$object->ref;
+			}
+			if ($origin == 'propal' && !empty($conf->propal->enabled))
+			{
+				print $langs->trans("RefProposal").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/comm/card.php?id='.$object->id.'">'.img_object($langs->trans("ShowProposal"), 'propal').' '.$object->ref;
+			}
+			print '</a></td>';
+			print "</tr>\n";
 
-            // Ref client
-            print '<tr><td>';
-            if ($origin == 'supplier_order') print $langs->trans('SupplierOrder');
-            else print $langs->trans('RefSupplier');
-            print '</td><td colspan="3">';
-            print '<input type="text" name="ref_supplier" value="'.$object->ref_supplier.'" />';
-            print '</td>';
-            print '</tr>';
+			// Ref client
+			print '<tr><td>';
+			if ($origin == 'supplier_order') print $langs->trans('SupplierOrder');
+			else print $langs->trans('RefSupplier');
+			print '</td><td colspan="3">';
+			print '<input type="text" name="ref_supplier" value="'.$object->ref_supplier.'" />';
+			print '</td>';
+			print '</tr>';
 
-            // Tiers
-            print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans('Company').'</td>';
-            print '<td colspan="3">'.$soc->getNomUrl(1).'</td>';
-            print '</tr>';
+			// Tiers
+			print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans('Company').'</td>';
+			print '<td colspan="3">'.$soc->getNomUrl(1).'</td>';
+			print '</tr>';
 
-            // Project
-            if (!empty($conf->projet->enabled))
-            {
-                $projectid = GETPOST('projectid', 'int') ?GETPOST('projectid', 'int') : 0;
-                if (empty($projectid) && !empty($object->fk_project)) $projectid = $object->fk_project;
-                if ($origin == 'project') $projectid = ($originid ? $originid : 0);
+			// Project
+			if (!empty($conf->projet->enabled))
+			{
+				$projectid = GETPOST('projectid', 'int') ?GETPOST('projectid', 'int') : 0;
+				if (empty($projectid) && !empty($object->fk_project)) $projectid = $object->fk_project;
+				if ($origin == 'project') $projectid = ($originid ? $originid : 0);
 
-                $langs->load("projects");
-                print '<tr>';
-                print '<td>'.$langs->trans("Project").'</td><td colspan="2">';
-                $numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid', 0);
-                print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="valignmiddle text-plus-circle">'.$langs->trans("AddProject").'</span><span class="fa fa-plus-circle valignmiddle"></span></a>';
-                print '</td>';
-                print '</tr>';
-            }
+				$langs->load("projects");
+				print '<tr>';
+				print '<td>'.$langs->trans("Project").'</td><td colspan="2">';
+				$numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid', 0);
+				print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="valignmiddle text-plus-circle">'.$langs->trans("AddProject").'</span><span class="fa fa-plus-circle valignmiddle"></span></a>';
+				print '</td>';
+				print '</tr>';
+			}
 
-            // Date delivery planned
-            print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
-            print '<td colspan="3">';
-            //print dol_print_date($object->date_livraison,"day");	// date_livraison come from order and will be stored into date_delivery planed.
-            $date_delivery = ($date_delivery ? $date_delivery : $object->date_livraison); // $date_delivery comes from GETPOST
-            print $form->selectDate($date_delivery ? $date_delivery : -1, 'date_delivery', 1, 1, 1);
-            print "</td>\n";
-            print '</tr>';
+			// Date delivery planned
+			print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
+			print '<td colspan="3">';
+			$date_delivery = ($date_delivery ? $date_delivery : $object->delivery_date); // $date_delivery comes from GETPOST
+			print $form->selectDate($date_delivery ? $date_delivery : -1, 'date_delivery', 1, 1, 1);
+			print "</td>\n";
+			print '</tr>';
 
-            // Note Public
-            print '<tr><td>'.$langs->trans("NotePublic").'</td>';
-            print '<td colspan="3">';
-            $doleditor = new DolEditor('note_public', $object->note_public, '', 60, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
-            print $doleditor->Create(1);
-            print "</td></tr>";
+			// Note Public
+			print '<tr><td>'.$langs->trans("NotePublic").'</td>';
+			print '<td colspan="3">';
+			$doleditor = new DolEditor('note_public', $object->note_public, '', 60, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+			print $doleditor->Create(1);
+			print "</td></tr>";
 
-            // Note Private
-            if ($object->note_private && !$user->socid)
-            {
-                print '<tr><td>'.$langs->trans("NotePrivate").'</td>';
-                print '<td colspan="3">';
-                $doleditor = new DolEditor('note_private', $object->note_private, '', 60, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
-        		print $doleditor->Create(1);
-                print "</td></tr>";
-            }
+			// Note Private
+			if ($object->note_private && !$user->socid)
+			{
+				print '<tr><td>'.$langs->trans("NotePrivate").'</td>';
+				print '<td colspan="3">';
+				$doleditor = new DolEditor('note_private', $object->note_private, '', 60, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+				print $doleditor->Create(1);
+				print "</td></tr>";
+			}
 
-            // Weight
-            print '<tr><td>';
-            print $langs->trans("Weight");
-            print '</td><td colspan="3"><input name="weight" size="4" value="'.GETPOST('weight', 'int').'"> ';
-            $text = $formproduct->selectMeasuringUnits("weight_units", "weight", GETPOST('weight_units', 'int'), 0, 2);
-            $htmltext = $langs->trans("KeepEmptyForAutoCalculation");
-            print $form->textwithpicto($text, $htmltext);
-            print '</td></tr>';
-            // Dim
-            print '<tr><td>';
-            print $langs->trans("Width").' x '.$langs->trans("Height").' x '.$langs->trans("Depth");
-            print ' </td><td colspan="3"><input name="sizeW" size="4" value="'.GETPOST('sizeW', 'int').'">';
-            print ' x <input name="sizeH" size="4" value="'.GETPOST('sizeH', 'int').'">';
-            print ' x <input name="sizeS" size="4" value="'.GETPOST('sizeS', 'int').'">';
-            print ' ';
-            $text = $formproduct->selectMeasuringUnits("size_units", "size", GETPOST('size_units', 'int'), 0, 2);
-            $htmltext = $langs->trans("KeepEmptyForAutoCalculation");
-            print $form->textwithpicto($text, $htmltext);
-            print '</td></tr>';
+			// Weight
+			print '<tr><td>';
+			print $langs->trans("Weight");
+			print '</td><td colspan="3"><input name="weight" size="4" value="'.GETPOST('weight', 'int').'"> ';
+			$text = $formproduct->selectMeasuringUnits("weight_units", "weight", GETPOST('weight_units', 'int'), 0, 2);
+			$htmltext = $langs->trans("KeepEmptyForAutoCalculation");
+			print $form->textwithpicto($text, $htmltext);
+			print '</td></tr>';
+			// Dim
+			print '<tr><td>';
+			print $langs->trans("Width").' x '.$langs->trans("Height").' x '.$langs->trans("Depth");
+			print ' </td><td colspan="3"><input name="sizeW" size="4" value="'.GETPOST('sizeW', 'int').'">';
+			print ' x <input name="sizeH" size="4" value="'.GETPOST('sizeH', 'int').'">';
+			print ' x <input name="sizeS" size="4" value="'.GETPOST('sizeS', 'int').'">';
+			print ' ';
+			$text = $formproduct->selectMeasuringUnits("size_units", "size", GETPOST('size_units', 'int'), 0, 2);
+			$htmltext = $langs->trans("KeepEmptyForAutoCalculation");
+			print $form->textwithpicto($text, $htmltext);
+			print '</td></tr>';
 
-            // Delivery method
-            print "<tr><td>".$langs->trans("ReceptionMethod")."</td>";
-            print '<td colspan="3">';
-            $recept->fetch_delivery_methods();
-            print $form->selectarray("shipping_method_id", $recept->meths, GETPOST('shipping_method_id', 'int'), 1, 0, 0, "", 1);
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-            print "</td></tr>\n";
+			// Delivery method
+			print "<tr><td>".$langs->trans("ReceptionMethod")."</td>";
+			print '<td colspan="3">';
+			$recept->fetch_delivery_methods();
+			print $form->selectarray("shipping_method_id", $recept->meths, GETPOST('shipping_method_id', 'int'), 1, 0, 0, "", 1);
+			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			print "</td></tr>\n";
 
-            // Tracking number
-            print "<tr><td>".$langs->trans("TrackingNumber")."</td>";
-            print '<td colspan="3">';
-            print '<input name="tracking_number" size="20" value="'.GETPOST('tracking_number', 'alpha').'">';
-            print "</td></tr>\n";
+			// Tracking number
+			print "<tr><td>".$langs->trans("TrackingNumber")."</td>";
+			print '<td colspan="3">';
+			print '<input name="tracking_number" size="20" value="'.GETPOST('tracking_number', 'alpha').'">';
+			print "</td></tr>\n";
 
-            // Other attributes
-            $parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'cols' => '3', 'socid'=>$socid);
-            $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $recept, $action); // Note that $action and $object may have been modified by hook
-            print $hookmanager->resPrint;
+			// Other attributes
+			$parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'cols' => '3', 'socid'=>$socid);
+			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $recept, $action); // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
 
-            // Here $object can be of an object Order
-            $extrafields->fetch_name_optionals_label($object->table_element);
-            if (empty($reshook) && !empty($extrafields->attributes[$object->table_element]['label'])) {
+			// Here $object can be of an object Order
+			$extrafields->fetch_name_optionals_label($object->table_element);
+			if (empty($reshook) && !empty($extrafields->attributes[$object->table_element]['label'])) {
 				// copy from order
 				if ($object->fetch_optionals() > 0) {
 					$recept->array_options = array_merge($recept->array_options, $object->array_options);
@@ -849,34 +848,34 @@ if ($action == 'create')
 				print $object->showOptionals($extrafields, 'edit', $parameters);
 			}
 
-            // Incoterms
+			// Incoterms
 			if (!empty($conf->incoterm->enabled))
 			{
 				print '<tr>';
 				print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $object->label_incoterms, 1).'</label></td>';
-		        print '<td colspan="3" class="maxwidthonsmartphone">';
-		        print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''));
+				print '<td colspan="3" class="maxwidthonsmartphone">';
+				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''));
 				print '</td></tr>';
 			}
 
-            // Document model
+			// Document model
 			include_once DOL_DOCUMENT_ROOT.'/core/modules/reception/modules_reception.php';
 			$liste = ModelePdfReception::liste_modeles($db);
 
 			if (count($liste) > 1)
 			{
-    			print "<tr><td>".$langs->trans("DefaultModel")."</td>";
-                print '<td colspan="3">';
-    			print $form->selectarray('model', $liste, $conf->global->RECEPTION_ADDON_PDF);
-                print "</td></tr>\n";
+				print "<tr><td>".$langs->trans("DefaultModel")."</td>";
+				print '<td colspan="3">';
+				print $form->selectarray('model', $liste, $conf->global->RECEPTION_ADDON_PDF);
+				print "</td></tr>\n";
 			}
 
-            print "</table>";
+			print "</table>";
 
-            dol_fiche_end();
+			print dol_get_fiche_end();
 
 
-            // Reception lines
+			// Reception lines
 			$numAsked = 0;
 			$dispatchLines = array();
 			foreach ($_POST as $key => $value)
@@ -917,51 +916,51 @@ if ($action == 'create')
 			}
 
 
-            print '<script type="text/javascript" language="javascript">
+			print '<script type="text/javascript" language="javascript">
             jQuery(document).ready(function() {
 	            jQuery("#autofill").click(function() {';
-    	    $i = 1;
-    	    while ($i <= $numAsked)
-    	    {
-    	    	print 'jQuery("#qtyl'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
-    	    	$i++;
-    	    }
-        	print '});
+			$i = 1;
+			while ($i <= $numAsked)
+			{
+				print 'jQuery("#qtyl'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
+				$i++;
+			}
+			print '});
 	            jQuery("#autoreset").click(function() {';
-    	    $i = 1;
-    	    while ($i <= $numAsked)
-    	    {
-    	    	print 'jQuery("#qtyl'.$i.'").val(0);'."\n";
-    	    	$i++;
-    	    }
-        	print '});
+			$i = 1;
+			while ($i <= $numAsked)
+			{
+				print 'jQuery("#qtyl'.$i.'").val(0);'."\n";
+				$i++;
+			}
+			print '});
         	});
             </script>';
 
-            print '<br>';
+			print '<br>';
 
-            print '<table class="noborder centpercent">';
+			print '<table class="noborder centpercent">';
 
-            // Load receptions already done for same order
-            $object->loadReceptions();
+			// Load receptions already done for same order
+			$object->loadReceptions();
 
-            if ($numAsked)
-            {
-                print '<tr class="liste_titre">';
-                print '<td>'.$langs->trans("Description").'</td>';
-                print '<td class="center">'.$langs->trans("QtyOrdered").'</td>';
-                print '<td class="center">'.$langs->trans("QtyReceived").'</td>';
-                print '<td class="center">'.$langs->trans("QtyToReceive");
+			if ($numAsked)
+			{
+				print '<tr class="liste_titre">';
+				print '<td>'.$langs->trans("Description").'</td>';
+				print '<td class="center">'.$langs->trans("QtyOrdered").'</td>';
+				print '<td class="center">'.$langs->trans("QtyReceived").'</td>';
+				print '<td class="center">'.$langs->trans("QtyToReceive");
 				if (empty($conf->productbatch->enabled))
 				{
-	                print ' <br>(<a href="#" id="autofill">'.$langs->trans("Fill").'</a>';
-	                print ' / <a href="#" id="autoreset">'.$langs->trans("Reset").'</a>)';
+					print ' <br>(<a href="#" id="autofill">'.$langs->trans("Fill").'</a>';
+					print ' / <a href="#" id="autoreset">'.$langs->trans("Reset").'</a>)';
 				}
-                print '</td>';
-                if (!empty($conf->stock->enabled))
-                {
+				print '</td>';
+				if (!empty($conf->stock->enabled))
+				{
 					print '<td class="left">'.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')</td>';
-                }
+				}
 				if (!empty($conf->productbatch->enabled))
 				{
 					print '<td class="left">'.$langs->trans("batch_number").'</td>';
@@ -972,13 +971,13 @@ if ($action == 'create')
 						print '<td class="left">'.$langs->trans("SellByDate").'</td>';
 					}
 				}
-                print "</tr>\n";
-            }
+				print "</tr>\n";
+			}
 
-            $indiceAsked = 1;
-            while ($indiceAsked <= $numAsked)
-            {
-                $product = new Product($db);
+			$indiceAsked = 1;
+			while ($indiceAsked <= $numAsked)
+			{
+				$product = new Product($db);
 				foreach ($object->lines as $supplierLine) {
 					if ($dispatchLines[$indiceAsked]['fk_commandefourndet'] == $supplierLine->id) {
 						$line = $supplierLine;
@@ -987,81 +986,81 @@ if ($action == 'create')
 				}
 
 
-                // Show product and description
-                $type = $line->product_type ? $line->product_type : $line->fk_product_type;
-                // Try to enhance type detection using date_start and date_end for free lines where type
-                // was not saved.
-                if (!empty($line->date_start)) $type = 1;
-                if (!empty($line->date_end)) $type = 1;
+				// Show product and description
+				$type = $line->product_type ? $line->product_type : $line->fk_product_type;
+				// Try to enhance type detection using date_start and date_end for free lines where type
+				// was not saved.
+				if (!empty($line->date_start)) $type = 1;
+				if (!empty($line->date_end)) $type = 1;
 
-                print '<!-- line '.$line->rowid.' for product -->'."\n";
-                print '<tr class="oddeven">'."\n";
+				print '<!-- line '.$line->rowid.' for product -->'."\n";
+				print '<tr class="oddeven">'."\n";
 
 
-                // Product label
-                if ($line->fk_product > 0)  // If predefined product
-                {
-                    $product->fetch($line->fk_product);
-                    $product->load_stock('warehouseopen'); // Load all $product->stock_warehouse[idwarehouse]->detail_batch
-                    //var_dump($product->stock_warehouse[1]);
+				// Product label
+				if ($line->fk_product > 0)  // If predefined product
+				{
+					$product->fetch($line->fk_product);
+					$product->load_stock('warehouseopen'); // Load all $product->stock_warehouse[idwarehouse]->detail_batch
+					//var_dump($product->stock_warehouse[1]);
 
-                    print '<td>';
-                    print '<a name="'.$line->id.'"></a>'; // ancre pour retourner sur la ligne
+					print '<td>';
+					print '<a name="'.$line->id.'"></a>'; // ancre pour retourner sur la ligne
 
-                    // Show product and description
-                    $product_static->type = $line->fk_product_type;
-                    $product_static->id = $line->fk_product;
-                    $product_static->ref = $line->ref;
-                    $product_static->status_batch = $line->product_tobatch;
+					// Show product and description
+					$product_static->type = $line->fk_product_type;
+					$product_static->id = $line->fk_product;
+					$product_static->ref = $line->ref;
+					$product_static->status_batch = $line->product_tobatch;
 
-                    $text = $product_static->getNomUrl(1);
-                    $text .= ' - '.(!empty($line->label) ? $line->label : $line->product_label);
-                    $description = ($conf->global->PRODUIT_DESC_IN_FORM ? '' : dol_htmlentitiesbr($line->desc));
-                    print $form->textwithtooltip($text, $description, 3, '', '', $i);
+					$text = $product_static->getNomUrl(1);
+					$text .= ' - '.(!empty($line->label) ? $line->label : $line->product_label);
+					$description = ($conf->global->PRODUIT_DESC_IN_FORM ? '' : dol_htmlentitiesbr($line->desc));
+					print $form->textwithtooltip($text, $description, 3, '', '', $i);
 
-                    // Show range
-                    print_date_range($db->jdate($line->date_start), $db->jdate($line->date_end));
+					// Show range
+					print_date_range($db->jdate($line->date_start), $db->jdate($line->date_end));
 
-                    // Add description in form
-                    if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
-                    {
-                        print ($line->desc && $line->desc != $line->product_label) ? '<br>'.dol_htmlentitiesbr($line->desc) : '';
-                    }
+					// Add description in form
+					if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
+					{
+						print ($line->desc && $line->desc != $line->product_label) ? '<br>'.dol_htmlentitiesbr($line->desc) : '';
+					}
 
-                    print '</td>';
-                } else {
-				    print "<td>";
-                    if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
-                    else $text = img_object($langs->trans('Product'), 'product');
+					print '</td>';
+				} else {
+					print "<td>";
+					if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
+					else $text = img_object($langs->trans('Product'), 'product');
 
-                    if (!empty($line->label)) {
-                    	$text .= ' <strong>'.$line->label.'</strong>';
-                    	print $form->textwithtooltip($text, $line->desc, 3, '', '', $i);
-                    } else {
-                    	print $text.' '.nl2br($line->desc);
-                    }
+					if (!empty($line->label)) {
+						$text .= ' <strong>'.$line->label.'</strong>';
+						print $form->textwithtooltip($text, $line->desc, 3, '', '', $i);
+					} else {
+						print $text.' '.nl2br($line->desc);
+					}
 
-                    // Show range
-                    print_date_range($db->jdate($line->date_start), $db->jdate($line->date_end));
-                    print "</td>\n";
-                }
+					// Show range
+					print_date_range($db->jdate($line->date_start), $db->jdate($line->date_end));
+					print "</td>\n";
+				}
 
-                // Qty
-                print '<td class="center">'.$line->qty;
+				// Qty
+				print '<td class="center">'.$line->qty;
 				print '<input type="hidden" name="fk_commandefournisseurdet'.$indiceAsked.'" value=\''.$line->id.'\' />';
 				print '<textarea style="display:none;"  name="comment'.$indiceAsked.'" >'.$line->desc.'</textarea>';
-                print '<input name="qtyasked'.$indiceAsked.'" id="qtyasked'.$indiceAsked.'" type="hidden" value="'.$line->qty.'">';
-                print '</td>';
-                $qtyProdCom = $line->qty;
+				print '<input name="qtyasked'.$indiceAsked.'" id="qtyasked'.$indiceAsked.'" type="hidden" value="'.$line->qty.'">';
+				print '</td>';
+				$qtyProdCom = $line->qty;
 
-                // Qty already received
-                print '<td class="center">';
+				// Qty already received
+				print '<td class="center">';
 
 
-                $quantityDelivered = $object->receptions[$line->id];
-                print $quantityDelivered;
-                print '<input name="qtydelivered'.$indiceAsked.'" id="qtydelivered'.$indiceAsked.'" type="hidden" value="'.$quantityDelivered.'">';
-                print '</td>';
+				$quantityDelivered = $object->receptions[$line->id];
+				print $quantityDelivered;
+				print '<input name="qtydelivered'.$indiceAsked.'" id="qtydelivered'.$indiceAsked.'" type="hidden" value="'.$quantityDelivered.'">';
+				print '</td>';
 
 
 				if ($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES))
@@ -1070,13 +1069,13 @@ if ($action == 'create')
 				} else {
 					$quantityToBeDelivered = $dispatchLines[$indiceAsked]['qty'];
 				}
-                $warehouse_id = $dispatchLines[$indiceAsked]['ent'];
+				$warehouse_id = $dispatchLines[$indiceAsked]['ent'];
 
 
 				$warehouseObject = null;
 				if (!empty($conf->stock->enabled))     // If warehouse was already selected or if product is not a predefined, we go into this part with no multiwarehouse selection
 				{
-				    print '<!-- Case warehouse already known or product not a predefined product -->';
+					print '<!-- Case warehouse already known or product not a predefined product -->';
 
 					$stock = + $product->stock_warehouse[$dispatchLines[$indiceAsked]['ent']]->real; // Convert to number
 					$deliverableQty = $dispatchLines[$indiceAsked]['qty'];
@@ -1085,8 +1084,8 @@ if ($action == 'create')
 					print '<td class="center">';
 					if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES))
 					{
-                        if (GETPOST('qtyl'.$indiceAsked, 'int')) $defaultqty = GETPOST('qtyl'.$indiceAsked, 'int');
-                        print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
+						if (GETPOST('qtyl'.$indiceAsked, 'int')) $defaultqty = GETPOST('qtyl'.$indiceAsked, 'int');
+						print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 						print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
 					} else print $langs->trans("NA");
 					print '</td>';
@@ -1155,26 +1154,26 @@ if ($action == 'create')
 					print $line->showOptionals($extrafields, 'edit', array('style'=>'class="oddeven"', 'colspan'=>$colspan), $indiceAsked);
 				}
 
-                $indiceAsked++;
-            }
+				$indiceAsked++;
+			}
 
-            print "</table>";
+			print "</table>";
 
-            print '<br>';
+			print '<br>';
 
-            print '<div class="center">';
-            print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
-            print '&nbsp; ';
-            print '<input type="'.($backtopage ? "submit" : "button").'" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
-            print '</div>';
+			print '<div class="center">';
+			print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
+			print '&nbsp; ';
+			print '<input type="'.($backtopage ? "submit" : "button").'" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
+			print '</div>';
 
-            print '</form>';
+			print '</form>';
 
-            print '<br>';
-        } else {
-            dol_print_error($db);
-        }
-    }
+			print '<br>';
+		} else {
+			dol_print_error($db);
+		}
+	}
 } elseif ($id || $ref)
 /* *************************************************************************** */
 /*                                                                             */
@@ -1203,7 +1202,7 @@ if ($action == 'create')
 		$res = $object->fetch_optionals();
 
 		$head = reception_prepare_head($object);
-		dol_fiche_head($head, 'reception', $langs->trans("Reception"), -1, 'dollyrevert');
+		print dol_get_fiche_head($head, 'reception', $langs->trans("Reception"), -1, 'dollyrevert');
 
 		$formconfirm = '';
 
@@ -1245,9 +1244,9 @@ if ($action == 'create')
 
 		if (!$formconfirm) {
 			$parameters = array('formConfirm' => $formconfirm);
-		    $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		    if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
-		    elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
+			$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
+			elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
 		}
 
 		// Print form confirm
@@ -1263,18 +1262,18 @@ if ($action == 'create')
 
 		if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
 		{
-		    $objectsrc = new Commande($db);
-		    $objectsrc->fetch($object->$typeobject->id);
+			$objectsrc = new Commande($db);
+			$objectsrc->fetch($object->$typeobject->id);
 		}
 		if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
 		{
-		    $objectsrc = new Propal($db);
-		    $objectsrc->fetch($object->$typeobject->id);
+			$objectsrc = new Propal($db);
+			$objectsrc->fetch($object->$typeobject->id);
 		}
 		if ($typeobject == 'CommandeFournisseur' && $object->$typeobject->id && !empty($conf->fournisseur->enabled))
 		{
-		    $objectsrc = new CommandeFournisseur($db);
-		    $objectsrc->fetch($object->$typeobject->id);
+			$objectsrc = new CommandeFournisseur($db);
+			$objectsrc->fetch($object->$typeobject->id);
 		}
 		// Reception card
 		$linkback = '<a href="'.DOL_URL_ROOT.'/reception/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
@@ -1285,53 +1284,53 @@ if ($action == 'create')
 		$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1);
 
 		// Thirdparty
-        $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-        // Project
-        if (!empty($conf->projet->enabled))
-        {
-            $langs->load("projects");
-            $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-            if (0) {    // Do not change on reception
-                if ($action != 'classify') {
-                    $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-                }
-                if ($action == 'classify') {
-                    // $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                    $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                    $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                    $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                    $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                    $morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-                    $morehtmlref .= '</form>';
-                } else {
-                    $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-                }
-            } else {
-                // We don't have project on reception, so we will use the project or source object instead
-                // TODO Add project on reception
-                $morehtmlref .= ' : ';
-                if (!empty($objectsrc->fk_project)) {
-                    $proj = new Project($db);
-                    $proj->fetch($objectsrc->fk_project);
-                    $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-                    $morehtmlref .= $proj->ref;
-                    $morehtmlref .= '</a>';
-                } else {
-                    $morehtmlref .= '';
-                }
-            }
-        }
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+		// Project
+		if (!empty($conf->projet->enabled))
+		{
+			$langs->load("projects");
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+			if (0) {    // Do not change on reception
+				if ($action != 'classify') {
+					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+				}
+				if ($action == 'classify') {
+					// $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				// We don't have project on reception, so we will use the project or source object instead
+				// TODO Add project on reception
+				$morehtmlref .= ' : ';
+				if (!empty($objectsrc->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($objectsrc->fk_project);
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
+				} else {
+					$morehtmlref .= '';
+				}
+			}
+		}
 		$morehtmlref .= '</div>';
 
 		$object->picto = 'sending';
-    	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-    	print '<div class="fichecenter">';
-    	print '<div class="fichehalfleft">';
-    	print '<div class="underbanner clearboth"></div>';
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
+		print '<div class="underbanner clearboth"></div>';
 
-        print '<table class="border centpercent">';
+		print '<table class="border centpercent">';
 
 		// Linked documents
 		if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
@@ -1404,14 +1403,14 @@ if ($action == 'create')
 			print '<input id="trueWeight" name="trueWeight" value="'.$object->trueWeight.'" type="text">';
 			print $formproduct->selectMeasuringUnits("weight_units", "weight", $object->weight_units, 0, 2);
 			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
-			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
+			print ' <input class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
 		} else {
 			print $object->trueWeight;
 			print ($object->trueWeight && $object->weight_units != '') ? ' '.measuringUnitString(0, "weight", $object->weight_units) : '';
 		}
 
-        // Calculated
+		// Calculated
 		if ($totalWeight > 0)
 		{
 			if (!empty($object->trueWeight)) print ' ('.$langs->trans("SumOfProductWeights").': ';
@@ -1437,7 +1436,7 @@ if ($action == 'create')
 			print '<input id="trueHeight" name="trueHeight" value="'.$object->trueHeight.'" type="text">';
 			print $formproduct->selectMeasuringUnits("size_units", "size", $object->size_units, 0, 2);
 			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
-			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
+			print ' <input class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
 		} else {
 			print $object->trueHeight;
@@ -1461,15 +1460,15 @@ if ($action == 'create')
 		$volumeUnit = 0;
 		if ($object->trueWidth && $object->trueHeight && $object->trueDepth)
 		{
-		    $calculatedVolume = ($object->trueWidth * $object->trueHeight * $object->trueDepth);
-		    $volumeUnit = $object->size_units * 3;
+			$calculatedVolume = ($object->trueWidth * $object->trueHeight * $object->trueDepth);
+			$volumeUnit = $object->size_units * 3;
 		}
 		// If reception volume not defined we use sum of products
 		if ($calculatedVolume > 0)
 		{
 			if ($volumeUnit < 50)
 			{
-			    print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no');
+				print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no');
 			} else print $calculatedVolume.' '.measuringUnitString(0, "volume", $volumeUnit);
 		}
 		if ($totalVolume > 0)
@@ -1536,21 +1535,21 @@ if ($action == 'create')
 		if (!empty($conf->incoterm->enabled))
 		{
 			print '<tr><td>';
-	        print '<table width="100%" class="nobordernopadding"><tr><td>';
-	        print $langs->trans('IncotermLabel');
-	        print '<td><td class="right">';
-	        if ($user->rights->reception->creer) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/reception/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
-	        else print '&nbsp;';
-	        print '</td></tr></table>';
-	        print '</td>';
-	        print '<td colspan="3">';
+			print '<table width="100%" class="nobordernopadding"><tr><td>';
+			print $langs->trans('IncotermLabel');
+			print '<td><td class="right">';
+			if ($user->rights->reception->creer) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/reception/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+			else print '&nbsp;';
+			print '</td></tr></table>';
+			print '</td>';
+			print '<td colspan="3">';
 			if ($action != 'editincoterm')
 			{
 				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
 			} else {
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 			}
-	        print '</td></tr>';
+			print '</td></tr>';
 		}
 
 		print "</table>";
@@ -1662,50 +1661,50 @@ if ($action == 'create')
 
 		if ($origin && $origin_id > 0)
 		{
-    		$sql = "SELECT obj.rowid, obj.fk_product, obj.label, obj.description, obj.product_type as fk_product_type, obj.qty as qty_asked, obj.date_start, obj.date_end";
-    		$sql .= ", ed.rowid as receptionline_id, ed.qty, ed.fk_reception as reception_id,  ed.fk_entrepot";
-    		$sql .= ", e.rowid as reception_id, e.ref as reception_ref, e.date_creation, e.date_valid, e.date_delivery, e.date_reception";
-    		//if ($conf->livraison_bon->enabled) $sql .= ", l.rowid as livraison_id, l.ref as livraison_ref, l.date_delivery, ld.qty as qty_received";
-    		$sql .= ', p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.tobatch as product_tobatch';
-    		$sql .= ', p.description as product_desc';
-    		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
-    		$sql .= ", ".MAIN_DB_PREFIX."reception as e";
-    		$sql .= ", ".MAIN_DB_PREFIX.$origin."det as obj";
-    		//if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_reception = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."livraisondet as ld ON ld.fk_livraison = l.rowid  AND obj.rowid = ld.fk_origin_line";
-    		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
-    		$sql .= " WHERE e.entity IN (".getEntity('reception').")";
-    		$sql .= " AND obj.fk_commande = ".$origin_id;
-    		$sql .= " AND obj.rowid = ed.fk_commandefourndet";
-    		$sql .= " AND ed.fk_reception = e.rowid";
-    		$sql .= " AND ed.fk_reception !=".$object->id;
-    		//if ($filter) $sql.= $filter;
-    		$sql .= " ORDER BY obj.fk_product";
+			$sql = "SELECT obj.rowid, obj.fk_product, obj.label, obj.description, obj.product_type as fk_product_type, obj.qty as qty_asked, obj.date_start, obj.date_end";
+			$sql .= ", ed.rowid as receptionline_id, ed.qty, ed.fk_reception as reception_id,  ed.fk_entrepot";
+			$sql .= ", e.rowid as reception_id, e.ref as reception_ref, e.date_creation, e.date_valid, e.date_delivery, e.date_reception";
+			//if ($conf->delivery_note->enabled) $sql .= ", l.rowid as livraison_id, l.ref as livraison_ref, l.date_delivery, ld.qty as qty_received";
+			$sql .= ', p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.tobatch as product_tobatch';
+			$sql .= ', p.description as product_desc';
+			$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
+			$sql .= ", ".MAIN_DB_PREFIX."reception as e";
+			$sql .= ", ".MAIN_DB_PREFIX.$origin."det as obj";
+			//if ($conf->delivery_note->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.fk_reception = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."deliverydet as ld ON ld.fk_delivery = l.rowid  AND obj.rowid = ld.fk_origin_line";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
+			$sql .= " WHERE e.entity IN (".getEntity('reception').")";
+			$sql .= " AND obj.fk_commande = ".$origin_id;
+			$sql .= " AND obj.rowid = ed.fk_commandefourndet";
+			$sql .= " AND ed.fk_reception = e.rowid";
+			$sql .= " AND ed.fk_reception !=".$object->id;
+			//if ($filter) $sql.= $filter;
+			$sql .= " ORDER BY obj.fk_product";
 
-    		dol_syslog("get list of reception lines", LOG_DEBUG);
-    		$resql = $db->query($sql);
-    		if ($resql)
-    		{
-    		    $num = $db->num_rows($resql);
-    		    $i = 0;
+			dol_syslog("get list of reception lines", LOG_DEBUG);
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$num = $db->num_rows($resql);
+				$i = 0;
 
-    		    while ($i < $num)
-    		    {
-        		    $obj = $db->fetch_object($resql);
-        		    if ($obj)
-        		    {
-        		        // $obj->rowid is rowid in $origin."det" table
-        		        $alreadysent[$obj->rowid][$obj->receptionline_id] = array('reception_ref'=>$obj->reception_ref, 'reception_id'=>$obj->reception_id, 'warehouse'=>$obj->fk_entrepot, 'qty'=>$obj->qty, 'date_valid'=>$obj->date_valid, 'date_delivery'=>$obj->date_delivery);
-        		    }
-        		    $i++;
-    		    }
-    		}
-    		//var_dump($alreadysent);
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
+					if ($obj)
+					{
+						// $obj->rowid is rowid in $origin."det" table
+						$alreadysent[$obj->rowid][$obj->receptionline_id] = array('reception_ref'=>$obj->reception_ref, 'reception_id'=>$obj->reception_id, 'warehouse'=>$obj->fk_entrepot, 'qty'=>$obj->qty, 'date_valid'=>$obj->date_valid, 'date_delivery'=>$obj->date_delivery);
+					}
+					$i++;
+				}
+			}
+			//var_dump($alreadysent);
 		}
 
 		// Loop on each product to send/sent
 		for ($i = 0; $i < $num_prod; $i++)
 		{
-		    print '<!-- origin line id = '.$lines[$i]->origin_line_id.' -->'; // id of order line
+			print '<!-- origin line id = '.$lines[$i]->origin_line_id.' -->'; // id of order line
 			print '<tr class="oddeven">';
 
 			// #
@@ -1755,7 +1754,7 @@ if ($action == 'create')
 
 			if ($action == 'editline' && $lines[$i]->id == $line_id)
 			{
-				print '<td ><textarea name="comment'.$line_id.'" id="comment'.$line_id.'" /> '.$lines[$i]->comment.'</textarea></td>';
+				print '<td><textarea name="comment'.$line_id.'" id="comment'.$line_id.'" /> '.$lines[$i]->comment.'</textarea></td>';
 			} else {
 				print '<td style="white-space: pre-wrap;max-width: 200px;" >'.$lines[$i]->comment.'</td>';
 			}
@@ -1765,35 +1764,35 @@ if ($action == 'create')
 			print '<td class="center">'.$lines[$i]->qty_asked.'</td>';
 
 			// Qty in other receptions (with reception and warehouse used)
-    		if ($origin && $origin_id > 0)
-    		{
-    			print '<td class="center nowrap">';
-    			foreach ($alreadysent as $key => $val)
-    			{
-    			    if ($lines[$i]->fk_commandefourndet == $key)
-    			    {
-    			        $j = 0;
-    			        foreach ($val as $receptionline_id=> $receptionline_var)
-    			        {
-    			            if ($receptionline_var['reception_id'] == $lines[$i]->fk_reception) continue; // We want to show only "other receptions"
+			if ($origin && $origin_id > 0)
+			{
+				print '<td class="center nowrap">';
+				foreach ($alreadysent as $key => $val)
+				{
+					if ($lines[$i]->fk_commandefourndet == $key)
+					{
+						$j = 0;
+						foreach ($val as $receptionline_id=> $receptionline_var)
+						{
+							if ($receptionline_var['reception_id'] == $lines[$i]->fk_reception) continue; // We want to show only "other receptions"
 
-    			            $j++;
-    			            if ($j > 1) print '<br>';
-    			            $reception_static->fetch($receptionline_var['reception_id']);
-    			            print $reception_static->getNomUrl(1);
-    			            print ' - '.$receptionline_var['qty'];
+							$j++;
+							if ($j > 1) print '<br>';
+							$reception_static->fetch($receptionline_var['reception_id']);
+							print $reception_static->getNomUrl(1);
+							print ' - '.$receptionline_var['qty'];
 
-    			            $htmltext = $langs->trans("DateValidation").' : '.(empty($receptionline_var['date_valid']) ? $langs->trans("Draft") : dol_print_date($receptionline_var['date_valid'], 'dayhour'));
-    			            if (!empty($conf->stock->enabled) && $receptionline_var['warehouse'] > 0)
-    			            {
-    			                $warehousestatic->fetch($receptionline_var['warehouse']);
-    			                $htmltext .= '<br>'.$langs->trans("From").' : '.$warehousestatic->getNomUrl(1);
-    			            }
-    			            print ' '.$form->textwithpicto('', $htmltext, 1);
-    			        }
-    			    }
-    			}
-    		}
+							$htmltext = $langs->trans("DateValidation").' : '.(empty($receptionline_var['date_valid']) ? $langs->trans("Draft") : dol_print_date($receptionline_var['date_valid'], 'dayhour'));
+							if (!empty($conf->stock->enabled) && $receptionline_var['warehouse'] > 0)
+							{
+								$warehousestatic->fetch($receptionline_var['warehouse']);
+								$htmltext .= '<br>'.$langs->trans("From").' : '.$warehousestatic->getNomUrl(1);
+							}
+							print ' '.$form->textwithpicto('', $htmltext, 1);
+						}
+					}
+				}
+			}
 			print '</td>';
 
 			if ($action == 'editline' && $lines[$i]->id == $line_id)
@@ -1903,8 +1902,8 @@ if ($action == 'create')
 			if ($action == 'editline' && $lines[$i]->id == $line_id)
 			{
 				print '<td class="center" colspan="2" valign="middle">';
-				print '<input type="submit" class="button" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'"><br>';
-				print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'"><br>';
+				print '<input type="submit" class="button button-save" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'"><br>';
+				print '<input type="submit" class="button button-cancel" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'"><br>';
 			} elseif ($object->statut == Reception::STATUS_DRAFT)
 			{
 				// edit-delete buttons
@@ -1949,7 +1948,7 @@ if ($action == 'create')
 	}
 
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	$object->fetchObjectLinked($object->id, $object->element);
@@ -1970,7 +1969,7 @@ if ($action == 'create')
 			if ($object->statut == Reception::STATUS_DRAFT && $num_prod > 0)
 			{
 				if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->creer))
-	  		     || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate)))
+	  			 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate)))
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
 				} else {
@@ -1990,7 +1989,7 @@ if ($action == 'create')
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ClassifyUnbilled").'</a>';
 				} else {
-			    	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
 				}
 			}
 
@@ -2026,8 +2025,8 @@ if ($action == 'create')
 					// Label here should be "Close" or "ClassifyBilled" if we decided to make bill on receptions instead of orders
 					if (!empty($conf->fournisseur->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_RECEPTION))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
 					{
-					    $label = "ClassifyBilled";
-					    $paramaction = 'classifybilled';
+						$label = "ClassifyBilled";
+						$paramaction = 'classifybilled';
 					}
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action='.$paramaction.'">'.$langs->trans($label).'</a>';
 				}
@@ -2049,9 +2048,9 @@ if ($action == 'create')
 
 	if ($action != 'presend' && $action != 'editline')
 	{
-        print '<div class="fichecenter"><div class="fichehalfleft">';
+		print '<div class="fichecenter"><div class="fichehalfleft">';
 
-        $objectref = dol_sanitizeFileName($object->ref);
+		$objectref = dol_sanitizeFileName($object->ref);
 		$filedir = $conf->reception->dir_output."/".$objectref;
 
 		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
@@ -2068,116 +2067,13 @@ if ($action == 'create')
 		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 	}
 
-	if ($action == 'presend')
-	{
-		$ref = dol_sanitizeFileName($object->ref);
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		$fileparams = dol_most_recent_file($conf->reception->dir_output.'/'.$ref, preg_quote($ref, '/').'[^\-]+');
-		$file = $fileparams['fullname'];
-		// Define output language
-		$outputlangs = $langs;
-		$newlang = '';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id']))
-			$newlang = $_REQUEST['lang_id'];
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-			$newlang = $object->thirdparty->default_lang;
-		if (!empty($newlang))
-		{
-			$outputlangs = new Translate('', $conf);
-			$outputlangs->setDefaultLang($newlang);
-			$outputlangs->load('receptions');
-		}
-		// Build document if it not exists
-		if (!$file || !is_readable($file))
-		{
-			$result = $object->generateDocument(GETPOST('model') ?GETPOST('model') : $object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result <= 0)
-			{
-				dol_print_error($db, $object->error, $object->errors);
-				exit;
-			}
-			$fileparams = dol_most_recent_file($conf->reception->dir_output.'/reception/'.$ref, preg_quote($ref, '/').'[^\-]+');
-			$file = $fileparams['fullname'];
-		}
-		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
-		print '<div class="clearboth"></div>';
-		print '<br>';
-		print load_fiche_titre($langs->trans('SendReceptionByEMail'));
-		dol_fiche_head('');
-		// Cree l'objet formulaire mail
-		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-		$formmail->param['langsmodels'] = (empty($newlang) ? $langs->defaultlang : $newlang);
-        $formmail->fromtype = (GETPOST('fromtype') ?GETPOST('fromtype') : (!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
-        if ($formmail->fromtype === 'user') {
-            $formmail->fromid = $user->id;
-        }
-		$formmail->trackid = 'shi'.$object->id;
-		if (!empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-		{
-			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-			$formmail->frommail = dolAddEmailTrackId($formmail->frommail, 'shi'.$object->id);
-		}
-		$formmail->withfrom = 1;
-		$liste = array();
-		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key] = $value;
-		$formmail->withto = GETPOST("sendto") ?GETPOST("sendto") : $liste;
-		$formmail->withtocc = $liste;
-		$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
-		$formmail->withtopic = $outputlangs->trans('SendReceptionRef', '__RECEPTIONREF__');
-		$formmail->withfile = 2;
-		$formmail->withbody = 1;
-		$formmail->withdeliveryreceipt = 1;
-		$formmail->withcancel = 1;
-		// Tableau des substitutions
-		$formmail->setSubstitFromObject($object, $langs);
-		$formmail->substit['__RECEPTIONREF__'] = $object->ref;
-		$formmail->substit['__RECEPTIONTRACKNUM__'] = $object->tracking_number;
-		$formmail->substit['__RECEPTIONTRACKNUMURL__'] = $object->tracking_url;
-		//Find the good contact adress
-		if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled)) {
-			$objectsrc = new Commande($db);
-			$objectsrc->fetch($object->$typeobject->id);
-		}
-		if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled)) {
-			$objectsrc = new Propal($db);
-			$objectsrc->fetch($object->$typeobject->id);
-		}
-		$custcontact = '';
-		$contactarr = array();
-		if (is_object($objectsrc))    // For the case the reception was created without orders
-		{
-    		$contactarr = $objectsrc->liste_contact(-1, 'external');
-		}
-		if (is_array($contactarr) && count($contactarr) > 0) {
-			foreach ($contactarr as $contact) {
-				if ($contact['libelle'] == $langs->trans('TypeContact_commande_external_CUSTOMER')) {
-					require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-					$contactstatic = new Contact($db);
-					$contactstatic->fetch($contact['id']);
-					$custcontact = $contactstatic->getFullName($langs, 1);
-				}
-			}
-			if (!empty($custcontact)) {
-				$formmail->substit['__CONTACTCIVNAME__'] = $custcontact;
-			}
-		}
-		// Tableau des parametres complementaires
-		$formmail->param['action'] = 'send';
-		$formmail->param['models'] = 'reception_send';
-		$formmail->param['models_id'] = GETPOST('modelmailselected', 'int');
-		$formmail->param['receptionid'] = $object->id;
-		$formmail->param['returnurl'] = $_SERVER["PHP_SELF"].'?id='.$object->id;
-		// Init list of files
-		if (GETPOST("mode") == 'init')
-		{
-			$formmail->clear_attached_files();
-			$formmail->add_attached_files($file, basename($file), dol_mimetype($file));
-		}
-		// Show form
-		print $formmail->get_form();
-		dol_fiche_end();
-	}
+	// Presend form
+	$modelmail = 'shipping_send';
+	$defaulttopic = 'SendReceptionRef';
+	$diroutput = $conf->reception->dir_output;
+	$trackid = 'rec'.$object->id;
+
+	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 }
 
 
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index 8ea45ccd1c8..ef12d844ddc 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2014		Cedric GROSS			<c.gross@kreiz-it.fr>
  * Copyright (C) 2014-2015  Marcos García           <marcosgdf@gmail.com>
- * Copyright (C) 2014-2015  Francis Appels          <francis.appels@yahoo.com>
+ * Copyright (C) 2014-2020  Francis Appels          <francis.appels@yahoo.com>
  * Copyright (C) 2015       Claudio Aschieri        <c.aschieri@19.coop>
  * Copyright (C) 2016		Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2018		Quentin Vial-Gouteyron  <quentin.vial-gouteyron@atm-consulting.fr>
@@ -46,7 +46,14 @@ class Reception extends CommonObject
 {
 	use CommonIncoterm;
 
+	/**
+	 * @var string element name
+	 */
 	public $element = "reception";
+
+	/**
+	 * @var string Fieldname with ID of parent key if this field has a parent
+	 */
 	public $fk_element = "fk_reception";
 	public $table_element = "reception";
 	public $table_element_line = "commande_fournisseur_dispatch";
@@ -57,35 +64,34 @@ class Reception extends CommonObject
 	 */
 	public $picto = 'dollyrevert';
 
-    public $socid;
-    public $ref_supplier;
+	public $socid;
+	public $ref_supplier;
 
-    /**
-     * @var int		Ref int
-     * @deprecated
-     */
-    public $ref_int;
+	/**
+	 * @var int		Ref int
+	 * @deprecated
+	 */
+	public $ref_int;
 
-    public $brouillon;
-    public $entrepot_id;
-    public $lines = array();
-    public $tracking_number;
-    public $tracking_url;
-    public $billed;
-    public $model_pdf;
+	public $brouillon;
+	public $entrepot_id;
+	public $tracking_number;
+	public $tracking_url;
+	public $billed;
+	public $model_pdf;
 
-    public $trueWeight;
-    public $weight_units;
-    public $trueWidth;
-    public $width_units;
-    public $trueHeight;
-    public $height_units;
-    public $trueDepth;
-    public $depth_units;
+	public $trueWeight;
+	public $weight_units;
+	public $trueWidth;
+	public $width_units;
+	public $trueHeight;
+	public $height_units;
+	public $trueDepth;
+	public $depth_units;
 	// A denormalized value
-    public $trueSize;
+	public $trueSize;
 
-    public $date_delivery; // Date delivery planed
+	public $date_delivery; // Date delivery planed
 
 
 	/**
@@ -103,8 +109,10 @@ class Reception extends CommonObject
 	 */
 	public $date_valid;
 
-    public $meths;
-    public $listmeths; // List of carriers
+	public $meths;
+	public $listmeths; // List of carriers
+
+	public $lines = array();
 
 
 	const STATUS_DRAFT = 0;
@@ -118,11 +126,9 @@ class Reception extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		$this->db = $db;
-		$this->lines = array();
-		$this->products = array();
 
 		// List of long language codes for status
 		$this->statuts = array();
@@ -145,33 +151,33 @@ class Reception extends CommonObject
 	 *	@param	Societe		$soc	Thirdparty object
 	 *	@return string				Free reference for contract
 	 */
-    public function getNextNumRef($soc)
+	public function getNextNumRef($soc)
 	{
 		global $langs, $conf;
 		$langs->load("receptions");
 
-	    if (!empty($conf->global->RECEPTION_ADDON_NUMBER))
-        {
+		if (!empty($conf->global->RECEPTION_ADDON_NUMBER))
+		{
 			$mybool = false;
 
 			$file = $conf->global->RECEPTION_ADDON_NUMBER.".php";
 			$classname = $conf->global->RECEPTION_ADDON_NUMBER;
 
-	        // Include file with class
-	        $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
-	        foreach ($dirmodels as $reldir) {
-		        $dir = dol_buildpath($reldir."core/modules/reception/");
+			foreach ($dirmodels as $reldir) {
+				$dir = dol_buildpath($reldir."core/modules/reception/");
 
-		        // Load file with numbering class (if found)
-		        $mybool |= @include_once $dir.$file;
-	        }
+				// Load file with numbering class (if found)
+				$mybool |= @include_once $dir.$file;
+			}
 
-	        if (!$mybool)
-	        {
-		        dol_print_error('', "Failed to include file ".$file);
-		        return '';
-	        }
+			if (!$mybool)
+			{
+				dol_print_error('', "Failed to include file ".$file);
+				return '';
+			}
 
 			$obj = new $classname();
 
@@ -185,10 +191,10 @@ class Reception extends CommonObject
 				dol_print_error($this->db, get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
-        } else {
-		    print $langs->trans("Error")." ".$langs->trans("Error_RECEPTION_ADDON_NUMBER_NotDefined");
-		    return "";
-	    }
+		} else {
+			print $langs->trans("Error")." ".$langs->trans("Error_RECEPTION_ADDON_NUMBER_NotDefined");
+			return "";
+		}
 	}
 
 	/**
@@ -198,7 +204,7 @@ class Reception extends CommonObject
 	 *  @param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *  @return int 				<0 si erreur, id reception creee si ok
 	 */
-    public function create($user, $notrigger = 0)
+	public function create($user, $notrigger = 0)
 	{
 		global $conf, $hookmanager;
 
@@ -223,7 +229,6 @@ class Reception extends CommonObject
 		$sql .= "ref";
 		$sql .= ", entity";
 		$sql .= ", ref_supplier";
-		$sql .= ", ref_int";
 		$sql .= ", date_creation";
 		$sql .= ", fk_user_author";
 		$sql .= ", date_reception";
@@ -246,7 +251,6 @@ class Reception extends CommonObject
 		$sql .= "'(PROV)'";
 		$sql .= ", ".$conf->entity;
 		$sql .= ", ".($this->ref_supplier ? "'".$this->db->escape($this->ref_supplier)."'" : "null");
-		$sql .= ", ".($this->ref_int ? "'".$this->db->escape($this->ref_int)."'" : "null");
 		$sql .= ", '".$this->db->idate($now)."'";
 		$sql .= ", ".$user->id;
 		$sql .= ", ".($this->date_reception > 0 ? "'".$this->db->idate($this->date_reception)."'" : "null");
@@ -264,8 +268,8 @@ class Reception extends CommonObject
 		$sql .= ", ".(!empty($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null");
 		$sql .= ", ".(!empty($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null");
 		$sql .= ", ".(!empty($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : "null");
-        $sql .= ", ".(int) $this->fk_incoterms;
-        $sql .= ", '".$this->db->escape($this->location_incoterms)."'";
+		$sql .= ", ".(int) $this->fk_incoterms;
+		$sql .= ", '".$this->db->escape($this->location_incoterms)."'";
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -313,10 +317,10 @@ class Reception extends CommonObject
 
 				if (!$error && !$notrigger)
 				{
-                    // Call trigger
-                    $result = $this->call_trigger('RECEPTION_CREATE', $user);
-                    if ($result < 0) { $error++; }
-                    // End call triggers
+					// Call trigger
+					$result = $this->call_trigger('RECEPTION_CREATE', $user);
+					if ($result < 0) { $error++; }
+					// End call triggers
 				}
 
 				if (!$error)
@@ -354,32 +358,32 @@ class Reception extends CommonObject
 	 *	@param	int		$id       	Id of object to load
 	 * 	@param	string	$ref		Ref of object
 	 * 	@param	string	$ref_ext	External reference of object
-     * 	@param	string	$notused	Internal reference of other object
+	 * 	@param	string	$notused	Internal reference of other object
 	 *	@return int			        >0 if OK, 0 if not found, <0 if KO
 	 */
-    public function fetch($id, $ref = '', $ref_ext = '', $notused = '')
+	public function fetch($id, $ref = '', $ref_ext = '', $notused = '')
 	{
 		global $conf;
 
 		// Check parameters
 		if (empty($id) && empty($ref) && empty($ref_ext)) return -1;
 
-		$sql = "SELECT e.rowid, e.ref, e.fk_soc as socid, e.date_creation, e.ref_supplier, e.ref_ext, e.ref_int, e.fk_user_author, e.fk_statut";
+		$sql = "SELECT e.rowid, e.ref, e.fk_soc as socid, e.date_creation, e.ref_supplier, e.ref_ext, e.fk_user_author, e.fk_statut";
 		$sql .= ", e.weight, e.weight_units, e.size, e.size_units, e.width, e.height";
 		$sql .= ", e.date_reception as date_reception, e.model_pdf,  e.date_delivery";
 		$sql .= ", e.fk_shipping_method, e.tracking_number";
 		$sql .= ", el.fk_source as origin_id, el.sourcetype as origin";
 		$sql .= ", e.note_private, e.note_public";
-        $sql .= ', e.fk_incoterms, e.location_incoterms';
-        $sql .= ', i.libelle as label_incoterms';
+		$sql .= ', e.fk_incoterms, e.location_incoterms';
+		$sql .= ', i.libelle as label_incoterms';
 		$sql .= " FROM ".MAIN_DB_PREFIX."reception as e";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = e.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON e.fk_incoterms = i.rowid';
 		$sql .= " WHERE e.entity IN (".getEntity('reception').")";
 		if ($id)   	  $sql .= " AND e.rowid=".$id;
-        if ($ref)     $sql .= " AND e.ref='".$this->db->escape($ref)."'";
-        if ($ref_ext) $sql .= " AND e.ref_ext='".$this->db->escape($ref_ext)."'";
-        if ($notused) $sql .= " AND e.ref_int='".$this->db->escape($notused)."'";
+		if ($ref)     $sql .= " AND e.ref='".$this->db->escape($ref)."'";
+		if ($ref_ext) $sql .= " AND e.ref_ext='".$this->db->escape($ref_ext)."'";
+		if ($notused) $sql .= " AND e.ref_int='".$this->db->escape($notused)."'";
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -393,8 +397,7 @@ class Reception extends CommonObject
 				$this->ref                  = $obj->ref;
 				$this->socid                = $obj->socid;
 				$this->ref_supplier = $obj->ref_supplier;
-				$this->ref_ext				= $obj->ref_ext;
-				$this->ref_int				= $obj->ref_int;
+				$this->ref_ext = $obj->ref_ext;
 				$this->statut               = $obj->fk_statut;
 				$this->user_author_id       = $obj->fk_user_author;
 				$this->date_creation        = $this->db->jdate($obj->date_creation);
@@ -402,9 +405,8 @@ class Reception extends CommonObject
 				$this->date_reception = $this->db->jdate($obj->date_reception); // TODO deprecated
 				$this->date_reception = $this->db->jdate($obj->date_reception); // Date real
 				$this->date_delivery        = $this->db->jdate($obj->date_delivery); // Date planed
-				$this->fk_delivery_address  = $obj->fk_address;
 				$this->model_pdf            = $obj->model_pdf;
-				$this->modelpdf             = $obj->model_pdf;	// deprecated
+				$this->modelpdf             = $obj->model_pdf; // deprecated
 				$this->shipping_method_id = $obj->fk_shipping_method;
 				$this->tracking_number      = $obj->tracking_number;
 				$this->origin               = ($obj->origin ? $obj->origin : 'commande'); // For compatibility
@@ -481,14 +483,14 @@ class Reception extends CommonObject
 	 *  Validate object and update stock if option enabled
 	 *
 	 *  @param      User		$user       Object user that validate
-     *  @param		int			$notrigger	1=Does not execute triggers, 0= execute triggers
+	 *  @param		int			$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *  @return     int						<0 if OK, >0 if KO
 	 */
-    public function valid($user, $notrigger = 0)
+	public function valid($user, $notrigger = 0)
 	{
 		global $conf, $langs;
 
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		dol_syslog(get_class($this)."::valid");
 
@@ -499,8 +501,8 @@ class Reception extends CommonObject
 			return 0;
 		}
 
-        if (!((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->creer))
-       	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate))))
+		if (!((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->creer))
+	   	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate))))
 		{
 			$this->error = 'Permission denied';
 			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
@@ -524,7 +526,7 @@ class Reception extends CommonObject
 			$numref = $this->ref;
 		}
 
-        $this->newref = dol_sanitizeFileName($numref);
+		$this->newref = dol_sanitizeFileName($numref);
 
 		$now = dol_now();
 
@@ -594,7 +596,7 @@ class Reception extends CommonObject
 						// line with batch detail
 
 						// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
-					    // Note: ->fk_origin_stock = id into table llx_product_batch (may be rename into llx_product_stock_batch in another version)
+						// Note: ->fk_origin_stock = id into table llx_product_batch (may be rename into llx_product_stock_batch in another version)
 						$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionValidatedInDolibarr", $numref), $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch);
 						if ($result < 0) {
 							$error++;
@@ -614,22 +616,22 @@ class Reception extends CommonObject
 		// Change status of order to "reception in process"
 		$ret = $this->setStatut(4, $this->origin_id, 'commande_fournisseur');
 
-        if (!$ret)
+		if (!$ret)
 		{
-		    $error++;
+			$error++;
 		}
 
 		if (!$error && !$notrigger)
 		{
-            // Call trigger
-            $result = $this->call_trigger('RECEPTION_VALIDATE', $user);
-            if ($result < 0) { $error++; }
-            // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('RECEPTION_VALIDATE', $user);
+			if ($result < 0) { $error++; }
+			// End call triggers
 		}
 
 		if (!$error)
 		{
-            $this->oldref = $this->ref;
+			$this->oldref = $this->ref;
 
 			// Rename directory if dir was a temporary ref
 			if (preg_match('/^[\(]?PROV/i', $this->ref))
@@ -651,17 +653,17 @@ class Reception extends CommonObject
 
 					if (@rename($dirsource, $dirdest))
 					{
-					    dol_syslog("Rename ok");
-                        // Rename docs starting with $oldref with $newref
-                        $listoffiles = dol_dir_list($conf->reception->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
-                        foreach ($listoffiles as $fileentry)
-                        {
-                        	$dirsource = $fileentry['name'];
-                        	$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
-                        	$dirsource = $fileentry['path'].'/'.$dirsource;
-                        	$dirdest = $fileentry['path'].'/'.$dirdest;
-                        	@rename($dirsource, $dirdest);
-                        }
+						dol_syslog("Rename ok");
+						// Rename docs starting with $oldref with $newref
+						$listoffiles = dol_dir_list($conf->reception->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+						foreach ($listoffiles as $fileentry)
+						{
+							$dirsource = $fileentry['name'];
+							$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+							$dirsource = $fileentry['path'].'/'.$dirsource;
+							$dirdest = $fileentry['path'].'/'.$dirdest;
+							@rename($dirsource, $dirdest);
+						}
 					}
 				}
 			}
@@ -681,8 +683,8 @@ class Reception extends CommonObject
 		} else {
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::valid ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::valid ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -704,9 +706,9 @@ class Reception extends CommonObject
 	 * @param	integer		$eatby					eat-by date
 	 * @param	integer		$sellby					sell-by date
 	 * @param	string		$batch					Lot number
-	 * @return	int							<0 if KO, >0 if OK
+	 * @return	int							<0 if KO, index of line if OK
 	 */
-    public function addline($entrepot_id, $id, $qty, $array_options = 0, $comment = '', $eatby = '', $sellby = '', $batch = '')
+	public function addline($entrepot_id, $id, $qty, $array_options = 0, $comment = '', $eatby = '', $sellby = '', $batch = '')
 	{
 		global $conf, $langs, $user;
 
@@ -726,7 +728,7 @@ class Reception extends CommonObject
 
 			if (!($entrepot_id > 0) && empty($conf->global->STOCK_WAREHOUSE_NOT_REQUIRED_FOR_RECEPTIONS))
 			{
-			    $langs->load("errors");
+				$langs->load("errors");
 				$this->error = $langs->trans("ErrorWarehouseRequiredIntoReceptionLine");
 				return -1;
 			}
@@ -752,19 +754,21 @@ class Reception extends CommonObject
 		$line->fk_reception = $this->id;
 
 		$this->lines[$num] = $line;
+
+		return $num;
 	}
 
 
-    /**
-     *  Update database
-     *
-     *  @param	User	$user        	User that modify
-     *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-     *  @return int 			       	<0 if KO, >0 if OK
-     */
-    public function update($user = null, $notrigger = 0)
-    {
-    	global $conf;
+	/**
+	 *  Update database
+	 *
+	 *  @param	User	$user        	User that modify
+	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
+	 *  @return int 			       	<0 if KO, >0 if OK
+	 */
+	public function update($user = null, $notrigger = 0)
+	{
+		global $conf;
 		$error = 0;
 
 		// Clean parameters
@@ -775,7 +779,6 @@ class Reception extends CommonObject
 		if (isset($this->socid)) $this->socid = trim($this->socid);
 		if (isset($this->fk_user_author)) $this->fk_user_author = trim($this->fk_user_author);
 		if (isset($this->fk_user_valid)) $this->fk_user_valid = trim($this->fk_user_valid);
-		if (isset($this->fk_delivery_address)) $this->fk_delivery_address = trim($this->fk_delivery_address);
 		if (isset($this->shipping_method_id)) $this->shipping_method_id = trim($this->shipping_method_id);
 		if (isset($this->tracking_number)) $this->tracking_number = trim($this->tracking_number);
 		if (isset($this->statut)) $this->statut = (int) $this->statut;
@@ -785,18 +788,17 @@ class Reception extends CommonObject
 		if (isset($this->size_units)) $this->size_units = trim($this->size_units);
 		if (isset($this->weight_units)) $this->weight_units = trim($this->weight_units);
 		if (isset($this->trueWeight)) $this->weight = trim($this->trueWeight);
-		if (isset($this->note_private)) $this->note = trim($this->note_private);
-		if (isset($this->note_public)) $this->note = trim($this->note_public);
+		if (isset($this->note_private)) $this->note_private = trim($this->note_private);
+		if (isset($this->note_public)) $this->note_public = trim($this->note_public);
 		if (isset($this->model_pdf)) $this->model_pdf = trim($this->model_pdf);
 
 
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."reception SET";
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."reception SET";
 
-		$sql .= " tms=".(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
 		$sql .= " ref=".(isset($this->ref) ? "'".$this->db->escape($this->ref)."'" : "null").",";
 		$sql .= " ref_supplier=".(isset($this->ref_supplier) ? "'".$this->db->escape($this->ref_supplier)."'" : "null").",";
 		$sql .= " fk_soc=".(isset($this->socid) ? $this->socid : "null").",";
@@ -820,32 +822,32 @@ class Reception extends CommonObject
 		$sql .= " model_pdf=".(isset($this->modelpdf) ? "'".$this->db->escape($this->modelpdf)."'" : "null").",";
 		$sql .= " entity=".$conf->entity;
 
-        $sql .= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
 		if (!$error)
 		{
 			if (!$notrigger)
 			{
-                // Call trigger
-                $result = $this->call_trigger('RECEPTION_MODIFY', $user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-	    	}
+				// Call trigger
+				$result = $this->call_trigger('RECEPTION_MODIFY', $user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
 		}
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -861,7 +863,7 @@ class Reception extends CommonObject
 	 *	@param	User	$user	Object user
 	 * 	@return	int				>0 if OK, 0 if deletion done but failed to delete files, <0 if KO
 	 */
-    public function delete(User $user)
+	public function delete(User $user)
 	{
 		global $conf, $langs, $user;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -909,9 +911,9 @@ class Reception extends CommonObject
 
 		if (!$error)
 		{
-                    $main = MAIN_DB_PREFIX.'commande_fournisseur_dispatch';
-                    $ef = $main."_extrafields";
-                    $sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_reception = ".$this->id.")";
+					$main = MAIN_DB_PREFIX.'commande_fournisseur_dispatch';
+					$ef = $main."_extrafields";
+					$sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_reception = ".$this->id.")";
 
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch";
 			$sql .= " WHERE fk_reception = ".$this->id;
@@ -936,18 +938,18 @@ class Reception extends CommonObject
 
 						if (!empty($this->origin) && $this->origin_id > 0)
 						{
-						    $this->fetch_origin();
-						    $origin = $this->origin;
-						    if ($this->$origin->statut == 4)     // If order source of reception is "partially received"
-						    {
-                                // Check if there is no more reception. If not, we can move back status of order to "validated" instead of "reception in progress"
-						        $this->$origin->loadReceptions();
-						        //var_dump($this->$origin->receptions);exit;
-						        if (count($this->$origin->receptions) <= 0)
-						        {
-                                    $this->$origin->setStatut(3); // ordered
-						        }
-						    }
+							$this->fetch_origin();
+							$origin = $this->origin;
+							if ($this->$origin->statut == 4)     // If order source of reception is "partially received"
+							{
+								// Check if there is no more reception. If not, we can move back status of order to "validated" instead of "reception in progress"
+								$this->$origin->loadReceptions();
+								//var_dump($this->$origin->receptions);exit;
+								if (count($this->$origin->receptions) <= 0)
+								{
+									$this->$origin->setStatut(3); // ordered
+								}
+							}
 						}
 
 						if (!$error)
@@ -1003,13 +1005,13 @@ class Reception extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Load lines
 	 *
 	 *	@return	int		>0 if OK, Otherwise if KO
 	 */
-    public function fetch_lines()
+	public function fetch_lines()
 	{
 		// phpcs:enable
 		dol_include_once('/fourn/class/fournisseur.commande.dispatch.class.php');
@@ -1018,12 +1020,12 @@ class Reception extends CommonObject
 
 		if (!empty($resql)) {
 			$this->lines = array();
-			while ($obj = $resql->fetch_object()) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$line = new CommandeFournisseurDispatch($this->db);
 				$line->fetch($obj->rowid);
 				$line->fetch_product();
 				$sql_commfourndet = 'SELECT qty, ref,  label, tva_tx, vat_src_code, subprice, multicurrency_subprice, remise_percent FROM llx_commande_fournisseurdet WHERE rowid='.$line->fk_commandefourndet;
-				$resql_commfourndet = $db->query($sql_commfourndet);
+				$resql_commfourndet = $this->db->query($sql_commfourndet);
 				if (!empty($resql_commfourndet)) {
 					$obj = $this->db->fetch_object($resql_commfourndet);
 					$line->qty_asked = $obj->qty;
@@ -1060,22 +1062,22 @@ class Reception extends CommonObject
 	}
 
 	/**
-     *	Return clicable link of object (with eventually picto)
-     *
-     *	@param      int			$withpicto      Add picto into link
-     *	@param      int			$option         Where point the link
-     *	@param      int			$max          	Max length to show
-     *	@param      int			$short			Use short labels
-     *  @param      int         $notooltip      1=No tooltip
-     *	@return     string          			String with URL
-     */
-    public function getNomUrl($withpicto = 0, $option = 0, $max = 0, $short = 0, $notooltip = 0)
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      int			$withpicto      Add picto into link
+	 *	@param      int			$option         Where point the link
+	 *	@param      int			$max          	Max length to show
+	 *	@param      int			$short			Use short labels
+	 *  @param      int         $notooltip      1=No tooltip
+	 *	@return     string          			String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = 0, $max = 0, $short = 0, $notooltip = 0)
 	{
 		global $conf, $langs;
 		$result = '';
 		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Reception").'</u>';
-        $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-        $label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.($this->ref_supplier ? $this->ref_supplier : $this->ref_client);
+		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.($this->ref_supplier ? $this->ref_supplier : $this->ref_client);
 
 		$url = DOL_URL_ROOT.'/reception/card.php?id='.$this->id;
 
@@ -1084,17 +1086,17 @@ class Reception extends CommonObject
 		$linkclose = '';
 		if (empty($notooltip))
 		{
-		    if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-		    {
-		        $label = $langs->trans("Reception");
-		        $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-		    }
-		    $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-		    $linkclose .= ' class="classfortooltip"';
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("Reception");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip"';
 		}
 
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart .= $linkclose.'>';
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		if ($withpicto) $result .= ($linkstart.img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).$linkend);
@@ -1104,15 +1106,15 @@ class Reception extends CommonObject
 	}
 
 	/**
-     *	Return status label
-     *
-     *	@param      int		$mode      	0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
-     *	@return     string      		Libelle
-     */
-    public function getLibStatut($mode = 0)
-    {
-        return $this->LibStatut($this->statut, $mode);
-    }
+	 *	Return status label
+	 *
+	 *	@param      int		$mode      	0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
+	 *	@return     string      		Libelle
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut($this->statut, $mode);
+	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
@@ -1122,30 +1124,30 @@ class Reception extends CommonObject
 	 * @param      int		$mode       0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
 	 * @return     string				Label of status
 	 */
-    public function LibStatut($status, $mode)
-    {
-    	// phpcs:enable
-    	global $langs;
+	public function LibStatut($status, $mode)
+	{
+		// phpcs:enable
+		global $langs;
 
-    	$labelStatus = $langs->trans($this->statuts[$status]);
-    	$labelStatusShort = $langs->trans($this->statutshorts[$status]);
+		$labelStatus = $langs->trans($this->statuts[$status]);
+		$labelStatusShort = $langs->trans($this->statutshorts[$status]);
 
-    	$statusType = 'status'.$status;
-    	if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
-    	if ($status == self::STATUS_CLOSED) $statusType = 'status6';
+		$statusType = 'status'.$status;
+		if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
+		if ($status == self::STATUS_CLOSED) $statusType = 'status6';
 
-    	return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
+		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
 	}
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
-     */
-    public function initAsSpecimen()
-    {
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
+	 */
+	public function initAsSpecimen()
+	{
 		global $langs;
 
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
@@ -1154,7 +1156,7 @@ class Reception extends CommonObject
 
 		dol_syslog(get_class($this)."::initAsSpecimen");
 
-        // Load array of products prodids
+		// Load array of products prodids
 		$num_prods = 0;
 		$prodids = array();
 		$sql = "SELECT rowid";
@@ -1191,17 +1193,16 @@ class Reception extends CommonObject
 		$this->date_reception = $now + 24 * 3600;
 
 		$this->entrepot_id          = 0;
-		$this->fk_delivery_address  = 0;
 		$this->socid                = 1;
 
 		$this->commande_id          = 0;
 		$this->commande             = $order;
 
-        $this->origin_id            = 1;
-        $this->origin               = 'commande';
+		$this->origin_id            = 1;
+		$this->origin               = 'commande';
 
-        $this->note_private = 'Private note';
-        $this->note_public = 'Public note';
+		$this->note_private = 'Private note';
+		$this->note_public = 'Public note';
 
 		$nbp = 5;
 		$xnbp = 0;
@@ -1219,28 +1220,27 @@ class Reception extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Set the planned delivery date
 	 *
 	 *	@param      User			$user        		Objet utilisateur qui modifie
-	 *	@param      integer 		$date_livraison     Date de livraison
+	 *	@param      integer 		$delivery_date     Delivery date
 	 *	@return     int         						<0 if KO, >0 if OK
 	 */
-    public function set_date_livraison($user, $date_livraison)
+	public function setDeliveryDate($user, $delivery_date)
 	{
 		// phpcs:enable
 		if ($user->rights->reception->creer)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."reception";
-			$sql .= " SET date_delivery = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
+			$sql .= " SET date_delivery = ".($delivery_date ? "'".$this->db->idate($delivery_date)."'" : 'null');
 			$sql .= " WHERE rowid = ".$this->id;
 
-			dol_syslog(get_class($this)."::set_date_livraison", LOG_DEBUG);
+			dol_syslog(get_class($this)."::setDeliveryDate", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				$this->date_delivery = $date_livraison;
+				$this->date_delivery = $delivery_date;
 				return 1;
 			} else {
 				$this->error = $this->db->error();
@@ -1251,13 +1251,13 @@ class Reception extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Fetch deliveries method and return an array. Load array this->meths(rowid=>label).
 	 *
 	 * 	@return	void
 	 */
-    public function fetch_delivery_methods()
+	public function fetch_delivery_methods()
 	{
 		// phpcs:enable
 		global $langs;
@@ -1279,101 +1279,101 @@ class Reception extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Fetch all deliveries method and return an array. Load array this->listmeths.
-     *
-     *  @param  int      $id     only this carrier, all if none
-     *  @return void
-     */
-    public function list_delivery_methods($id = '')
-    {
-        // phpcs:enable
-        global $langs;
-
-        $this->listmeths = array();
-        $i = 0;
-
-        $sql = "SELECT em.rowid, em.code, em.libelle, em.description, em.tracking, em.active";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
-        if ($id != '') $sql .= " WHERE em.rowid=".$id;
-
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            while ($obj = $this->db->fetch_object($resql)) {
-                $this->listmeths[$i]['rowid'] = $obj->rowid;
-                $this->listmeths[$i]['code'] = $obj->code;
-                $label = $langs->trans('ReceptionMethod'.$obj->code);
-                $this->listmeths[$i]['libelle'] = ($label != 'ReceptionMethod'.$obj->code ? $label : $obj->libelle);
-                $this->listmeths[$i]['description'] = $obj->description;
-                $this->listmeths[$i]['tracking'] = $obj->tracking;
-                $this->listmeths[$i]['active'] = $obj->active;
-                $i++;
-            }
-        }
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Update/create delivery method.
-     *
-     *  @param	string      $id     id method to activate
-     *
-     *  @return void
-     */
-    public function update_delivery_method($id = '')
-    {
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Fetch all deliveries method and return an array. Load array this->listmeths.
+	 *
+	 *  @param  int      $id     only this carrier, all if none
+	 *  @return void
+	 */
+	public function list_delivery_methods($id = '')
+	{
 		// phpcs:enable
-        if ($id == '')
-        {
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."c_shipment_mode (code, libelle, description, tracking)";
-            $sql .= " VALUES ('".$this->db->escape($this->update['code'])."','".$this->db->escape($this->update['libelle'])."','".$this->db->escape($this->update['description'])."','".$this->db->escape($this->update['tracking'])."')";
-            $resql = $this->db->query($sql);
-        } else {
-            $sql = "UPDATE ".MAIN_DB_PREFIX."c_shipment_mode SET";
-            $sql .= " code='".$this->db->escape($this->update['code'])."'";
-            $sql .= ",libelle='".$this->db->escape($this->update['libelle'])."'";
-            $sql .= ",description='".$this->db->escape($this->update['description'])."'";
-            $sql .= ",tracking='".$this->db->escape($this->update['tracking'])."'";
-            $sql .= " WHERE rowid=".$id;
-            $resql = $this->db->query($sql);
-        }
-        if ($resql < 0) dol_print_error($this->db, '');
-    }
+		global $langs;
+
+		$this->listmeths = array();
+		$i = 0;
+
+		$sql = "SELECT em.rowid, em.code, em.libelle, em.description, em.tracking, em.active";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
+		if ($id != '') $sql .= " WHERE em.rowid=".$id;
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$this->listmeths[$i]['rowid'] = $obj->rowid;
+				$this->listmeths[$i]['code'] = $obj->code;
+				$label = $langs->trans('ReceptionMethod'.$obj->code);
+				$this->listmeths[$i]['libelle'] = ($label != 'ReceptionMethod'.$obj->code ? $label : $obj->libelle);
+				$this->listmeths[$i]['description'] = $obj->description;
+				$this->listmeths[$i]['tracking'] = $obj->tracking;
+				$this->listmeths[$i]['active'] = $obj->active;
+				$i++;
+			}
+		}
+	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Activate delivery method.
-     *
-     *  @param      int      $id     id method to activate
-     *
-     *  @return void
-     */
-    public function activ_delivery_method($id)
-    {
+	/**
+	 *  Update/create delivery method.
+	 *
+	 *  @param	string      $id     id method to activate
+	 *
+	 *  @return void
+	 */
+	public function update_delivery_method($id = '')
+	{
 		// phpcs:enable
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=1';
-        $sql .= ' WHERE rowid='.$id;
+		if ($id == '')
+		{
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_shipment_mode (code, libelle, description, tracking)";
+			$sql .= " VALUES ('".$this->db->escape($this->update['code'])."','".$this->db->escape($this->update['libelle'])."','".$this->db->escape($this->update['description'])."','".$this->db->escape($this->update['tracking'])."')";
+			$resql = $this->db->query($sql);
+		} else {
+			$sql = "UPDATE ".MAIN_DB_PREFIX."c_shipment_mode SET";
+			$sql .= " code='".$this->db->escape($this->update['code'])."'";
+			$sql .= ",libelle='".$this->db->escape($this->update['libelle'])."'";
+			$sql .= ",description='".$this->db->escape($this->update['description'])."'";
+			$sql .= ",tracking='".$this->db->escape($this->update['tracking'])."'";
+			$sql .= " WHERE rowid=".$id;
+			$resql = $this->db->query($sql);
+		}
+		if ($resql < 0) dol_print_error($this->db, '');
+	}
 
-        $resql = $this->db->query($sql);
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  DesActivate delivery method.
-     *
-     *  @param      int      $id     id method to desactivate
-     *
-     *  @return void
-     */
-    public function disable_delivery_method($id)
-    {
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Activate delivery method.
+	 *
+	 *  @param      int      $id     id method to activate
+	 *
+	 *  @return void
+	 */
+	public function activ_delivery_method($id)
+	{
 		// phpcs:enable
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=0';
-        $sql .= ' WHERE rowid='.$id;
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=1';
+		$sql .= ' WHERE rowid='.$id;
 
-        $resql = $this->db->query($sql);
-    }
+		$resql = $this->db->query($sql);
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  DesActivate delivery method.
+	 *
+	 *  @param      int      $id     id method to desactivate
+	 *
+	 *  @return void
+	 */
+	public function disable_delivery_method($id)
+	{
+		// phpcs:enable
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=0';
+		$sql .= ' WHERE rowid='.$id;
+
+		$resql = $this->db->query($sql);
+	}
 
 
 	/**
@@ -1382,7 +1382,7 @@ class Reception extends CommonObject
 	 * @param	string	$value		Value
 	 * @return	void
 	 */
-    public function getUrlTrackingStatus($value = '')
+	public function getUrlTrackingStatus($value = '')
 	{
 		if (!empty($this->shipping_method_id))
 		{
@@ -1414,7 +1414,7 @@ class Reception extends CommonObject
 	 *
 	 *	@return     int     <0 if KO, >0 if OK
 	 */
-    public function setClosed()
+	public function setClosed()
 	{
 		global $conf, $langs, $user;
 
@@ -1501,8 +1501,8 @@ class Reception extends CommonObject
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
 							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionClassifyClosedInDolibarr", $numref));
 							if ($result < 0) {
-							    $this->error = $mouvS->error;
-							    $this->errors = $mouvS->errors;
+								$this->error = $mouvS->error;
+								$this->errors = $mouvS->errors;
 								$error++; break;
 							}
 						} else {
@@ -1512,9 +1512,9 @@ class Reception extends CommonObject
 							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionClassifyClosedInDolibarr", $numref), $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch);
 
 							if ($result < 0) {
-							    $this->error = $mouvS->error;
-							    $this->errors = $mouvS->errors;
-							    $error++; break;
+								$this->error = $mouvS->error;
+								$this->errors = $mouvS->errors;
+								$error++; break;
 							}
 						}
 					}
@@ -1527,36 +1527,36 @@ class Reception extends CommonObject
 			// Call trigger
 			if (!$error)
 			{
-    			$result = $this->call_trigger('RECEPTION_CLOSED', $user);
-    			if ($result < 0) {
-    			    $error++;
-    			}
+				$result = $this->call_trigger('RECEPTION_CLOSED', $user);
+				if ($result < 0) {
+					$error++;
+				}
 			}
 		} else {
 			dol_print_error($this->db);
-            $error++;
+			$error++;
 		}
 
 		if (!$error)
 		{
-		    $this->db->commit();
-		    return 1;
+			$this->db->commit();
+			return 1;
 		} else {
-		    $this->db->rollback();
-		    return -1;
+			$this->db->rollback();
+			return -1;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Classify the reception as invoiced (used when WORKFLOW_BILL_ON_RECEPTION is on)
 	 *
 	 *	@return     int     <0 if ko, >0 if ok
 	 */
-    public function set_billed()
+	public function set_billed()
 	{
 		// phpcs:enable
-	    global $user;
+		global $user;
 		$error = 0;
 
 		$this->db->begin();
@@ -1596,7 +1596,7 @@ class Reception extends CommonObject
 	 *
 	 *	@return     int     <0 if ko, >0 if ok
 	 */
-    public function reOpen()
+	public function reOpen()
 	{
 		global $conf, $langs, $user;
 
@@ -1656,8 +1656,8 @@ class Reception extends CommonObject
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
 							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionUnClassifyCloseddInDolibarr", $numref));
 							if ($result < 0) {
-							    $this->error = $mouvS->error;
-							    $this->errors = $mouvS->errors;
+								$this->error = $mouvS->error;
+								$this->errors = $mouvS->errors;
 								$error++; break;
 							}
 						} else {
@@ -1666,9 +1666,9 @@ class Reception extends CommonObject
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
 							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionUnClassifyCloseddInDolibarr", $numref), $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, $obj->fk_origin_stock);
 							if ($result < 0) {
-							    $this->error = $mouvS->error;
-							    $this->errors = $mouvS->errors;
-							    $error++; break;
+								$this->error = $mouvS->error;
+								$this->errors = $mouvS->errors;
+								$error++; break;
 							}
 						}
 					}
@@ -1680,11 +1680,11 @@ class Reception extends CommonObject
 
 			if (!$error)
 			{
-    			// Call trigger
-    			$result = $this->call_trigger('RECEPTION_REOPEN', $user);
-    			if ($result < 0) {
-    				$error++;
-    			}
+				// Call trigger
+				$result = $this->call_trigger('RECEPTION_REOPEN', $user);
+				if ($result < 0) {
+					$error++;
+				}
    			}
 
 			if ($this->origin == 'order_supplier') {
@@ -1708,41 +1708,41 @@ class Reception extends CommonObject
 	}
 
 	 /**
-     *	Set draft status
-     *
-     *	@param	User	$user			Object user that modify
-     *	@return	int						<0 if KO, >0 if OK
-     */
-    public function setDraft($user)
-    {
+	  *	Set draft status
+	  *
+	  *	@param	User	$user			Object user that modify
+	  *	@return	int						<0 if KO, >0 if OK
+	  */
+	public function setDraft($user)
+	{
 		// phpcs:enable
-        global $conf, $langs;
+		global $conf, $langs;
 
-        $error = 0;
+		$error = 0;
 
-        // Protection
-        if ($this->statut <= self::STATUS_DRAFT)
-        {
-            return 0;
-        }
+		// Protection
+		if ($this->statut <= self::STATUS_DRAFT)
+		{
+			return 0;
+		}
 
-        if (!((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->creer))
-       	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate))))
-        {
-            $this->error = 'Permission denied';
-            return -1;
-        }
+		if (!((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->creer))
+	   	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate))))
+		{
+			$this->error = 'Permission denied';
+			return -1;
+		}
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."reception";
-        $sql .= " SET fk_statut = ".self::STATUS_DRAFT;
-        $sql .= " WHERE rowid = ".$this->id;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."reception";
+		$sql .= " SET fk_statut = ".self::STATUS_DRAFT;
+		$sql .= " WHERE rowid = ".$this->id;
 
-        dol_syslog(__METHOD__, LOG_DEBUG);
-        if ($this->db->query($sql))
-        {
-            // If stock increment is done on closing
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		if ($this->db->query($sql))
+		{
+			// If stock increment is done on closing
 			if (!$error && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION))
 			{
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
@@ -1785,8 +1785,8 @@ class Reception extends CommonObject
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
 							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionBackToDraftInDolibarr", $this->ref));
 							if ($result < 0) {
-							    $this->error = $mouvS->error;
-							    $this->errors = $mouvS->errors;
+								$this->error = $mouvS->error;
+								$this->errors = $mouvS->errors;
 								$error++;
 								break;
 							}
@@ -1796,9 +1796,9 @@ class Reception extends CommonObject
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
 							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionBackToDraftInDolibarr", $this->ref), $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch);
 							if ($result < 0) {
-							    $this->error = $mouvS->error;
-							    $this->errors = $mouvS->errors;
-							    $error++; break;
+								$this->error = $mouvS->error;
+								$this->errors = $mouvS->errors;
+								$error++; break;
 							}
 						}
 					}
@@ -1808,11 +1808,11 @@ class Reception extends CommonObject
 				}
 			}
 
-            if (!$error) {
-            	// Call trigger
-            	$result = $this->call_trigger('RECEPTION_UNVALIDATE', $user);
-            	if ($result < 0) $error++;
-            }
+			if (!$error) {
+				// Call trigger
+				$result = $this->call_trigger('RECEPTION_UNVALIDATE', $user);
+				if ($result < 0) $error++;
+			}
 			if ($this->origin == 'order_supplier')
 			{
 				if (!empty($this->origin) && $this->origin_id > 0)
@@ -1844,20 +1844,20 @@ class Reception extends CommonObject
 				}
 			}
 
-            if (!$error) {
-                $this->statut = self::STATUS_DRAFT;
-                $this->db->commit();
-                return 1;
-            } else {
-                $this->db->rollback();
-                return -1;
-            }
-        } else {
-            $this->error = $this->db->error();
-            $this->db->rollback();
-            return -1;
-        }
-    }
+			if (!$error) {
+				$this->statut = self::STATUS_DRAFT;
+				$this->db->commit();
+				return 1;
+			} else {
+				$this->db->rollback();
+				return -1;
+			}
+		} else {
+			$this->error = $this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
 	/**
 	 *  Create a document onto disk according to template module.
diff --git a/htdocs/reception/class/receptionstats.class.php b/htdocs/reception/class/receptionstats.class.php
index d55bfeee8eb..297f99e53b0 100644
--- a/htdocs/reception/class/receptionstats.class.php
+++ b/htdocs/reception/class/receptionstats.class.php
@@ -34,35 +34,35 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
  */
 class ReceptionStats extends Stats
 {
-    public $table_element;
+	public $table_element;
 
-    public $socid;
-    public $userid;
+	public $socid;
+	public $userid;
 
-    public $from;
-    public $field;
-    public $where;
+	public $from;
+	public $field;
+	public $where;
 
 
-    /**
-     * Constructor
-     *
-     * @param	DoliDB	$db      	Database handler
+	/**
+	 * Constructor
+	 *
+	 * @param	DoliDB	$db      	Database handler
 	 * @param 	int		$socid	   	Id third party for filter
 	 * @param 	string	$mode	   	Option (not used)
 	 * @param   int		$userid    	Id user for filter (creation user)
-     */
-    public function __construct($db, $socid, $mode, $userid = 0)
-    {
+	 */
+	public function __construct($db, $socid, $mode, $userid = 0)
+	{
 		global $user, $conf;
 
 		$this->db = $db;
 
 		$this->socid = ($socid > 0 ? $socid : 0);
-        $this->userid = $userid;
+		$this->userid = $userid;
 		$this->cachefilesuffix = $mode;
 
-        $object = new Reception($this->db);
+		$object = new Reception($this->db);
 		$this->from = MAIN_DB_PREFIX.$object->table_element." as c";
 		//$this->from.= ", ".MAIN_DB_PREFIX."societe as s";
 		$this->field = 'weight'; // Warning, unit of weight is NOT USED AND MUST BE
@@ -75,32 +75,32 @@ class ReceptionStats extends Stats
 		{
 			$this->where .= " AND c.fk_soc = ".$this->socid;
 		}
-        if ($this->userid > 0) $this->where .= ' AND c.fk_user_author = '.$this->userid;
-    }
+		if ($this->userid > 0) $this->where .= ' AND c.fk_user_author = '.$this->userid;
+	}
 
-    /**
-     * Return reception number by month for a year
-     *
+	/**
+	 * Return reception number by month for a year
+	 *
 	 * @param	int		$year		Year to scan
 	 * @return	array				Array with number by month
-     */
-    public function getNbByMonth($year)
-    {
-        global $user;
+	 */
+	public function getNbByMonth($year)
+	{
+		global $user;
 
-        $sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb";
+		$sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) {
-            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        }
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		$res = $this->_getNbByMonth($year, $sql);
 		return $res;
-    }
+	}
 
 	/**
 	 * Return receptions number per year
@@ -108,7 +108,7 @@ class ReceptionStats extends Stats
 	 * @return	array	Array with number by year
 	 *
 	 */
-    public function getNbByYear()
+	public function getNbByYear()
 	{
 		global $user;
 
@@ -117,7 +117,7 @@ class ReceptionStats extends Stats
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getNbByYear($sql);
 	}
@@ -127,7 +127,7 @@ class ReceptionStats extends Stats
 	 *
 	 *  @return	array	Array of values
 	 */
-    public function getAllByYear()
+	public function getAllByYear()
 	{
 		global $user;
 
diff --git a/htdocs/reception/contact.php b/htdocs/reception/contact.php
index 0492c0db1b8..908f7a441be 100644
--- a/htdocs/reception/contact.php
+++ b/htdocs/reception/contact.php
@@ -31,8 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/reception.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 if (!empty($conf->projet->enabled)) {
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
 $langs->load("orders");
@@ -50,28 +50,28 @@ $result = restrictedArea($user, 'reception', $id, '');
 $object = new Reception($db);
 if ($id > 0 || !empty($ref))
 {
-    $object->fetch($id, $ref);
-    $object->fetch_thirdparty();
+	$object->fetch($id, $ref);
+	$object->fetch_thirdparty();
 
-    if (!empty($object->origin))
-    {
-        $origin = $object->origin;
+	if (!empty($object->origin))
+	{
+		$origin = $object->origin;
 
-        $object->fetch_origin();
+		$object->fetch_origin();
 		$typeobject = $object->origin;
-    }
+	}
 
-    // Linked documents
-    if ($origin == 'order_supplier' && $object->$typeobject->id && !empty($conf->fournisseur->enabled))
-    {
-        $objectsrc = new CommandeFournisseur($db);
-        $objectsrc->fetch($object->$typeobject->id);
-    }
-    if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
-    {
-        $objectsrc = new Propal($db);
-        $objectsrc->fetch($object->$typeobject->id);
-    }
+	// Linked documents
+	if ($origin == 'order_supplier' && $object->$typeobject->id && !empty($conf->fournisseur->enabled))
+	{
+		$objectsrc = new CommandeFournisseur($db);
+		$objectsrc->fetch($object->$typeobject->id);
+	}
+	if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
+	{
+		$objectsrc = new Propal($db);
+		$objectsrc->fetch($object->$typeobject->id);
+	}
 }
 
 
@@ -81,10 +81,10 @@ if ($id > 0 || !empty($ref))
 
 if ($action == 'addcontact' && $user->rights->reception->creer)
 {
-    if ($result > 0 && $id > 0)
-    {
+	if ($result > 0 && $id > 0)
+	{
   		$result = $objectsrc->add_contact(GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'), $_POST["type"], $_POST["source"]);
-    }
+	}
 
 	if ($result >= 0)
 	{
@@ -106,7 +106,7 @@ if ($action == 'addcontact' && $user->rights->reception->creer)
 // bascule du statut d'un contact
 elseif ($action == 'swapstatut' && $user->rights->reception->creer)
 {
-    $result = $objectsrc->swapContactStatus(GETPOST('ligne'));
+	$result = $objectsrc->swapContactStatus(GETPOST('ligne'));
 }
 
 // Efface un contact
@@ -155,7 +155,7 @@ if ($id > 0 || !empty($ref))
 	$langs->trans("OrderCard");
 
 	$head = reception_prepare_head($object);
-	dol_fiche_head($head, 'contact', $langs->trans("Reception"), -1, 'dollyrevert');
+	print dol_get_fiche_head($head, 'contact', $langs->trans("Reception"), -1, 'dollyrevert');
 
 
 	// Reception card
@@ -166,41 +166,41 @@ if ($id > 0 || !empty($ref))
 	$morehtmlref .= $form->editfieldkey("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', 0, 1);
 	$morehtmlref .= $form->editfieldval("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1);
 	// Thirdparty
-    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-    // Project
-    if (!empty($conf->projet->enabled)) {
-        $langs->load("projects");
-        $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-        if (0) {    // Do not change on reception
-            if ($action != 'classify') {
-                $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-            }
-            if ($action == 'classify') {
-                // $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-        } else {
-            // We don't have project on reception, so we will use the project or source object instead
-            // TODO Add project on reception
-            $morehtmlref .= ' : ';
-            if (!empty($objectsrc->fk_project)) {
-                $proj = new Project($db);
-                $proj->fetch($objectsrc->fk_project);
-                $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-                $morehtmlref .= $proj->ref;
-                $morehtmlref .= '</a>';
-            } else {
-                $morehtmlref .= '';
-            }
-        }
-    }
+	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+	// Project
+	if (!empty($conf->projet->enabled)) {
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if (0) {    // Do not change on reception
+			if ($action != 'classify') {
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			}
+			if ($action == 'classify') {
+				// $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			// We don't have project on reception, so we will use the project or source object instead
+			// TODO Add project on reception
+			$morehtmlref .= ' : ';
+			if (!empty($objectsrc->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($objectsrc->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
 	$morehtmlref .= '</div>';
 
 	$object->picto = 'sending';
@@ -208,32 +208,32 @@ if ($id > 0 || !empty($ref))
 
 
 	print '<div class="fichecenter">';
-    //print '<div class="fichehalfleft">';
+	//print '<div class="fichehalfleft">';
 	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border centpercent">';
-    // Linked documents
+	print '<table class="border centpercent">';
+	// Linked documents
 	if ($origin == 'order_supplier' && $object->$typeobject->id && !empty($conf->fournisseur->enabled))
 	{
-	    print '<tr><td class="titlefield">';
-	    $objectsrc = new CommandeFournisseur($db);
-	    $objectsrc->fetch($object->$typeobject->id);
-	    print $langs->trans("RefOrder").'</td>';
-	    print '<td colspan="3">';
-	    print $objectsrc->getNomUrl(1, 'commande');
-	    print "</td>\n";
-	    print '</tr>';
+		print '<tr><td class="titlefield">';
+		$objectsrc = new CommandeFournisseur($db);
+		$objectsrc->fetch($object->$typeobject->id);
+		print $langs->trans("RefOrder").'</td>';
+		print '<td colspan="3">';
+		print $objectsrc->getNomUrl(1, 'commande');
+		print "</td>\n";
+		print '</tr>';
 	}
 	if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
 	{
-	    print '<tr><td class="titlefield">';
-	    $objectsrc = new Propal($db);
-	    $objectsrc->fetch($object->$typeobject->id);
-	    print $langs->trans("RefProposal").'</td>';
-	    print '<td colspan="3">';
-	    print $objectsrc->getNomUrl(1, 'reception');
-	    print "</td>\n";
-	    print '</tr>';
+		print '<tr><td class="titlefield">';
+		$objectsrc = new Propal($db);
+		$objectsrc->fetch($object->$typeobject->id);
+		print $langs->trans("RefProposal").'</td>';
+		print '<td colspan="3">';
+		print $objectsrc->getNomUrl(1, 'reception');
+		print "</td>\n";
+		print '</tr>';
 	}
 
 	print "</table>";
@@ -252,7 +252,7 @@ if ($id > 0 || !empty($ref))
 	print '<div class="clearboth"></div>';
 
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	// Lines of contacts
 	echo '<br>';
diff --git a/htdocs/reception/index.php b/htdocs/reception/index.php
index e3951458e40..f707196b766 100644
--- a/htdocs/reception/index.php
+++ b/htdocs/reception/index.php
@@ -55,14 +55,14 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-    print '<form method="post" action="list.php">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder nohover centpercent">';
-    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    print '<tr class="oddeven"><td>';
-    print $langs->trans("Reception").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-    print "</table></div></form><br>\n";
+	print '<form method="post" action="list.php">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder nohover centpercent">';
+	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("Reception").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+	print "</table></div></form><br>\n";
 }
 
 
@@ -215,7 +215,7 @@ if ($resql)
 		$langs->load("orders");
 
 		$i = 0;
-        print '<div class="div-table-responsive-no-min">';
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print '<th colspan="3">'.$langs->trans("SuppliersOrdersToProcess").' <span class="badge">'.$num.'</span></th></tr>';
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index 891a5630c7f..e175437c0cc 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -88,27 +88,27 @@ $search_array_options = (array) $extrafields->getOptionalsFromPost($object->tabl
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-    'e.ref'=>"Ref",
-    's.nom'=>"ThirdParty",
-    'e.note_public'=>'NotePublic',
+	'e.ref'=>"Ref",
+	's.nom'=>"ThirdParty",
+	'e.note_public'=>'NotePublic',
 );
 if (empty($user->socid)) $fieldstosearchall["e.note_private"] = "NotePrivate";
 
 $checkedtypetiers = 0;
 $arrayfields = array(
-    'e.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-    'e.ref_supplier'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1),
-    's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
-    's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>1),
-    's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1),
-    'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0),
-    'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0),
-    'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers),
-    'e.date_delivery'=>array('label'=>$langs->trans("DateDeliveryPlanned"), 'checked'=>1),
-    'e.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-    'e.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
-    'e.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
-    'e.billed'=>array('label'=>$langs->trans("Billed"), 'checked'=>1, 'position'=>1000, 'enabled'=>(!empty($conf->global->WORKFLOW_BILL_ON_RECEPTION)))
+	'e.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+	'e.ref_supplier'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1),
+	's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
+	's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>1),
+	's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1),
+	'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0),
+	'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0),
+	'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers),
+	'e.date_delivery'=>array('label'=>$langs->trans("DateDeliveryPlanned"), 'checked'=>1),
+	'e.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
+	'e.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
+	'e.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
+	'e.billed'=>array('label'=>$langs->trans("Billed"), 'checked'=>1, 'position'=>1000, 'enabled'=>(!empty($conf->global->WORKFLOW_BILL_ON_RECEPTION)))
 );
 // Extra fields
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
@@ -140,45 +140,45 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
 	$search_ref_supplier = '';
-    $search_ref_rcp = '';
-    $search_ref_liv = '';
-    $search_company = '';
-    $search_town = '';
+	$search_ref_rcp = '';
+	$search_ref_liv = '';
+	$search_company = '';
+	$search_town = '';
 	$search_zip = "";
-    $search_state = "";
+	$search_state = "";
 	$search_country = '';
 	$search_type_thirdparty = '';
 	$search_billed = '';
-    $search_status = '';
-    $search_array_options = array();
+	$search_status = '';
+	$search_array_options = array();
 }
 
 if (empty($reshook))
 {
 	if ($massaction == 'confirm_createbills') {
-    	$receptions = GETPOST('toselect', 'array');
-    	$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
-    	$validate_invoices = GETPOST('validate_invoices', 'int');
+		$receptions = GETPOST('toselect', 'array');
+		$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
+		$validate_invoices = GETPOST('validate_invoices', 'int');
 
-    	$TFact = array();
-    	$TFactThird = array();
+		$TFact = array();
+		$TFactThird = array();
 
-    	$nb_bills_created = 0;
+		$nb_bills_created = 0;
 
-    	$db->begin();
+		$db->begin();
 		$errors = array();
-    	foreach ($receptions as $id_reception)
-    	{
-    		$rcp = new Reception($db);
+		foreach ($receptions as $id_reception)
+		{
+			$rcp = new Reception($db);
 			 // On ne facture que les réceptions validées
-    		if ($rcp->fetch($id_reception) <= 0 || $rcp->statut != 1) {
+			if ($rcp->fetch($id_reception) <= 0 || $rcp->statut != 1) {
 				$errors[] = $langs->trans('StatusOfRefMustBe', $rcp->ref, $langs->transnoentities("StatusSupplierOrderValidatedShort"));
 				$error++;
 				continue;
 			}
 
-    		$object = new FactureFournisseur($db);
-    		if (!empty($createbills_onebythird) && !empty($TFactThird[$rcp->socid])) {
+			$object = new FactureFournisseur($db);
+			if (!empty($createbills_onebythird) && !empty($TFactThird[$rcp->socid])) {
 				$object = $TFactThird[$rcp->socid]; // If option "one bill per third" is set, we use already created reception.
 				if (empty($object->rowid) && $object->id != null)$object->rowid = $object->id;
 				if (!empty($object->rowid))$object->fetchObjectLinked();
@@ -193,26 +193,26 @@ if (empty($reshook))
 					}
 				}
 			} else {
-    			$object->socid = $rcp->socid;
-    			$object->type = FactureFournisseur::TYPE_STANDARD;
-    			$object->cond_reglement_id	= $rcp->thirdparty->cond_reglement_supplier_id;
-    			$object->mode_reglement_id	= $rcp->thirdparty->mode_reglement_supplier_id;
+				$object->socid = $rcp->socid;
+				$object->type = FactureFournisseur::TYPE_STANDARD;
+				$object->cond_reglement_id	= $rcp->thirdparty->cond_reglement_supplier_id;
+				$object->mode_reglement_id	= $rcp->thirdparty->mode_reglement_supplier_id;
 				$object->fk_account = !empty($rcp->thirdparty->fk_account) ? $rcp->thirdparty->fk_account : 0;
 				$object->remise_percent 	= !empty($rcp->thirdparty->remise_percent) ? $rcp->thirdparty->remise_percent : 0;
 				$object->remise_absolue 	= !empty($rcp->thirdparty->remise_absolue) ? $rcp->thirdparty->remise_absolue : 0;
 
-    			$object->fk_project			= $rcp->fk_project;
-    			$object->ref_supplier = $rcp->ref_supplier;
+				$object->fk_project			= $rcp->fk_project;
+				$object->ref_supplier = $rcp->ref_supplier;
 
-    			$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-    			if (empty($datefacture))
-    			{
-    				$datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
-    			}
+				$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+				if (empty($datefacture))
+				{
+					$datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
+				}
 
-    			$object->date = $datefacture;
-    			$object->origin    = 'reception';
-    			$object->origin_id = $id_reception;
+				$object->date = $datefacture;
+				$object->origin    = 'reception';
+				$object->origin_id = $id_reception;
 
 				$rcp->fetchObjectLinked();
 				if (count($rcp->linkedObjectsIds['reception']) > 0)
@@ -223,19 +223,19 @@ if (empty($reshook))
 					}
 				}
 
-    			$res = $object->create($user);
+				$res = $object->create($user);
 				//var_dump($object->error);exit;
-    			if ($res > 0) {
+				if ($res > 0) {
 					$nb_bills_created++;
 					$object->id = $res;
 				} else {
 					$errors[] = $rcp->ref.' : '.$langs->trans($object->error);
 					$error++;
 				}
-    		}
+			}
 
-    		if ($object->id > 0)
-    		{
+			if ($object->id > 0)
+			{
 				if (!empty($createbills_onebythird) && !empty($TFactThird[$rcp->socid])) { //cause function create already add object linked for facturefournisseur
 					$res = $object->add_object_linked($object->origin, $id_reception);
 
@@ -246,152 +246,152 @@ if (empty($reshook))
 					}
 				}
 
-    			if (!$error)
-    			{
-	    			$lines = $rcp->lines;
-	    			if (empty($lines) && method_exists($rcp, 'fetch_lines'))
-	    			{
-	    				$rcp->fetch_lines();
-	    				$lines = $rcp->lines;
-	    			}
+				if (!$error)
+				{
+					$lines = $rcp->lines;
+					if (empty($lines) && method_exists($rcp, 'fetch_lines'))
+					{
+						$rcp->fetch_lines();
+						$lines = $rcp->lines;
+					}
 
-	    			$fk_parent_line = 0;
-	    			$num = count($lines);
+					$fk_parent_line = 0;
+					$num = count($lines);
 
-	    			for ($i = 0; $i < $num; $i++)
-	    			{
-	    				$desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
-	    				if ($lines[$i]->subprice < 0)
-	    				{
-	    					// Negative line, we create a discount line
-	    					$discount = new DiscountAbsolute($db);
-	    					$discount->fk_soc = $object->socid;
-	    					$discount->amount_ht = abs($lines[$i]->total_ht);
-	    					$discount->amount_tva = abs($lines[$i]->total_tva);
-	    					$discount->amount_ttc = abs($lines[$i]->total_ttc);
-	    					$discount->tva_tx = $lines[$i]->tva_tx;
-	    					$discount->fk_user = $user->id;
-	    					$discount->description = $desc;
-	    					$discountid = $discount->create($user);
-	    					if ($discountid > 0)
-	    					{
-	    						$result = $object->insert_discount($discountid);
-	    						//$result=$discount->link_to_invoice($lineid,$id);
-	    					} else {
-	    						setEventMessages($discount->error, $discount->errors, 'errors');
-	    						$error++;
-	    						break;
-	    					}
-	    				} else {
-	    					// Positive line
-	    					$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
-	    					// Date start
-	    					$date_start = false;
-	    					if ($lines[$i]->date_debut_prevue) $date_start = $lines[$i]->date_debut_prevue;
-	    					if ($lines[$i]->date_debut_reel) $date_start = $lines[$i]->date_debut_reel;
-	    					if ($lines[$i]->date_start) $date_start = $lines[$i]->date_start;
-	    					//Date end
-	    					$date_end = false;
-	    					if ($lines[$i]->date_fin_prevue) $date_end = $lines[$i]->date_fin_prevue;
-	    					if ($lines[$i]->date_fin_reel) $date_end = $lines[$i]->date_fin_reel;
-	    					if ($lines[$i]->date_end) $date_end = $lines[$i]->date_end;
-	    					// Reset fk_parent_line for no child products and special product
-	    					if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9)
-	    					{
-	    						$fk_parent_line = 0;
-	    					}
-                            $result = $object->addline(
-	    						$desc,
-	    						$lines[$i]->subprice,
-	    						$lines[$i]->tva_tx,
-	    						$lines[$i]->localtax1_tx,
-	    						$lines[$i]->localtax2_tx,
+					for ($i = 0; $i < $num; $i++)
+					{
+						$desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
+						if ($lines[$i]->subprice < 0)
+						{
+							// Negative line, we create a discount line
+							$discount = new DiscountAbsolute($db);
+							$discount->fk_soc = $object->socid;
+							$discount->amount_ht = abs($lines[$i]->total_ht);
+							$discount->amount_tva = abs($lines[$i]->total_tva);
+							$discount->amount_ttc = abs($lines[$i]->total_ttc);
+							$discount->tva_tx = $lines[$i]->tva_tx;
+							$discount->fk_user = $user->id;
+							$discount->description = $desc;
+							$discountid = $discount->create($user);
+							if ($discountid > 0)
+							{
+								$result = $object->insert_discount($discountid);
+								//$result=$discount->link_to_invoice($lineid,$id);
+							} else {
+								setEventMessages($discount->error, $discount->errors, 'errors');
+								$error++;
+								break;
+							}
+						} else {
+							// Positive line
+							$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
+							// Date start
+							$date_start = false;
+							if ($lines[$i]->date_debut_prevue) $date_start = $lines[$i]->date_debut_prevue;
+							if ($lines[$i]->date_debut_reel) $date_start = $lines[$i]->date_debut_reel;
+							if ($lines[$i]->date_start) $date_start = $lines[$i]->date_start;
+							//Date end
+							$date_end = false;
+							if ($lines[$i]->date_fin_prevue) $date_end = $lines[$i]->date_fin_prevue;
+							if ($lines[$i]->date_fin_reel) $date_end = $lines[$i]->date_fin_reel;
+							if ($lines[$i]->date_end) $date_end = $lines[$i]->date_end;
+							// Reset fk_parent_line for no child products and special product
+							if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9)
+							{
+								$fk_parent_line = 0;
+							}
+							$result = $object->addline(
+								$desc,
+								$lines[$i]->subprice,
+								$lines[$i]->tva_tx,
+								$lines[$i]->localtax1_tx,
+								$lines[$i]->localtax2_tx,
 								$lines[$i]->qty,
-	    						$lines[$i]->fk_product,
-	    						$lines[$i]->remise_percent,
-	    						$date_start,
-	    						$date_end,
-	    						0,
-	    						$lines[$i]->info_bits,
-	    						'HT',
-	    						$product_type,
-	    						$i,
-	    						false,
+								$lines[$i]->fk_product,
+								$lines[$i]->remise_percent,
+								$date_start,
+								$date_end,
+								0,
+								$lines[$i]->info_bits,
+								'HT',
+								$product_type,
+								$i,
+								false,
 								0,
 								null,
-	    						$lines[$i]->rowid,
+								$lines[$i]->rowid,
 								0,
 								$lines[$i]->ref_supplier
-	    					);
+							);
 
 							$rcp->add_object_linked('facture_fourn_det', $result);
 
-	    					if ($result > 0)
-	    					{
-	    						$lineid = $result;
-	    					} else {
-	    						$lineid = 0;
-	    						$error++;
-	    						break;
-	    					}
-	    					// Defined the new fk_parent_line
-	    					if ($result > 0 && $lines[$i]->product_type == 9)
-	    					{
-	    						$fk_parent_line = $result;
-	    					}
-	    				}
-	    			}
-    			}
-    		}
+							if ($result > 0)
+							{
+								$lineid = $result;
+							} else {
+								$lineid = 0;
+								$error++;
+								break;
+							}
+							// Defined the new fk_parent_line
+							if ($result > 0 && $lines[$i]->product_type == 9)
+							{
+								$fk_parent_line = $result;
+							}
+						}
+					}
+				}
+			}
 
-    		//$rcp->classifyBilled($user);        // Disabled. This behavior must be set or not using the workflow module.
+			//$rcp->classifyBilled($user);        // Disabled. This behavior must be set or not using the workflow module.
 
-    		if (!empty($createbills_onebythird) && empty($TFactThird[$rcp->socid])) $TFactThird[$rcp->socid] = $object;
-    		else $TFact[$object->id] = $object;
-    	}
+			if (!empty($createbills_onebythird) && empty($TFactThird[$rcp->socid])) $TFactThird[$rcp->socid] = $object;
+			else $TFact[$object->id] = $object;
+		}
 
-    	// Build doc with all invoices
-    	$TAllFact = empty($createbills_onebythird) ? $TFact : $TFactThird;
-    	$toselect = array();
+		// Build doc with all invoices
+		$TAllFact = empty($createbills_onebythird) ? $TFact : $TFactThird;
+		$toselect = array();
 
-    	if (!$error && $validate_invoices)
-    	{
-    		$massaction = $action = 'builddoc';
-    		foreach ($TAllFact as &$object)
-    		{
-    			$result = $object->validate($user);
-    			if ($result <= 0)
-    			{
-    				$error++;
-    				setEventMessages($object->error, $object->errors, 'errors');
-    				break;
-    			}
+		if (!$error && $validate_invoices)
+		{
+			$massaction = $action = 'builddoc';
+			foreach ($TAllFact as &$object)
+			{
+				$result = $object->validate($user);
+				if ($result <= 0)
+				{
+					$error++;
+					setEventMessages($object->error, $object->errors, 'errors');
+					break;
+				}
 
-    			$id = $object->id; // For builddoc action
+				$id = $object->id; // For builddoc action
 
-    			// Fac builddoc
-    			$donotredirect = 1;
-    			$upload_dir = $conf->fournisseur->facture->dir_output;
-    		    $permissiontoadd = $user->rights->fournisseur->facture->creer;
-    		    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-    		}
+				// Fac builddoc
+				$donotredirect = 1;
+				$upload_dir = $conf->fournisseur->facture->dir_output;
+				$permissiontoadd = $user->rights->fournisseur->facture->creer;
+				include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+			}
 
-    		$massaction = $action = 'confirm_createbills';
-    	}
+			$massaction = $action = 'confirm_createbills';
+		}
 
-    	if (!$error)
-    	{
-    		$db->commit();
-    		setEventMessage($langs->trans('BillCreated', $nb_bills_created));
-    	} else {
-    		$db->rollback();
-    		$action = 'create';
-    		$_GET["origin"] = $_POST["origin"];
-    		$_GET["originid"] = $_POST["originid"];
-    		setEventMessages($object->error, $errors, 'errors');
-    		$error++;
-    	}
-    }
+		if (!$error)
+		{
+			$db->commit();
+			setEventMessage($langs->trans('BillCreated', $nb_bills_created));
+		} else {
+			$db->rollback();
+			$action = 'create';
+			$_GET["origin"] = $_POST["origin"];
+			$_GET["originid"] = $_POST["originid"];
+			setEventMessages($object->error, $errors, 'errors');
+			$error++;
+		}
+	}
 }
 
 
@@ -409,7 +409,7 @@ $formfile = new FormFile($db);
 $helpurl = 'EN:Module_Receptions|FR:Module_Receptions|ES:M&oacute;dulo_Receptiones';
 llxHeader('', $langs->trans('ListOfReceptions'), $helpurl);
 
-$sql = "SELECT e.rowid, e.ref, e.ref_supplier, e.date_reception as date_reception, e.date_delivery as date_livraison, l.date_delivery as date_reception, e.fk_statut, e.billed,";
+$sql = "SELECT e.rowid, e.ref, e.ref_supplier, e.date_reception as date_reception, e.date_delivery as delivery_date, l.date_delivery as date_reception2, e.fk_statut, e.billed,";
 $sql .= ' s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client, ';
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
@@ -429,7 +429,7 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as ee ON e.rowid = ee.fk_source AND ee.sourcetype = 'reception' AND ee.targettype = 'delivery'";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.rowid = ee.fk_target";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.rowid = ee.fk_target";
 if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no permission to see all
 {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -462,16 +462,16 @@ if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
 // Add where from extra fields
 foreach ($search_array_options as $key => $val)
 {
-    $crit = $val;
-    $tmpkey = preg_replace('/search_options_/', '', $key);
-    $typ = $extrafields->attributes[$object->table_element]['type'][$tmpkey];
-    $mode = 0;
-    if (in_array($typ, array('int', 'double', 'real'))) $mode = 1; // Search on a numeric
-    if (in_array($typ, array('sellist')) && $crit != '0' && $crit != '-1') $mode = 2; // Search on a foreign key int
-    if ($crit != '' && (!in_array($typ, array('select', 'sellist')) || $crit != '0'))
-    {
-        $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
-    }
+	$crit = $val;
+	$tmpkey = preg_replace('/search_options_/', '', $key);
+	$typ = $extrafields->attributes[$object->table_element]['type'][$tmpkey];
+	$mode = 0;
+	if (in_array($typ, array('int', 'double', 'real'))) $mode = 1; // Search on a numeric
+	if (in_array($typ, array('sellist')) && $crit != '0' && $crit != '-1') $mode = 2; // Search on a foreign key int
+	if ($crit != '' && (!in_array($typ, array('select', 'sellist')) || $crit != '0'))
+	{
+		$sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
+	}
 }
 // Add where from hooks
 $parameters = array();
@@ -481,8 +481,8 @@ $sql .= $hookmanager->resPrint;
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
 }
 
 $sql .= $db->order($sortfield, $sortorder);
@@ -499,33 +499,33 @@ if ($resql)
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
 	$param = '';
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
-	if ($sall) $param .= "&amp;sall=".$sall;
-	if ($search_ref_rcp) $param .= "&amp;search_ref_rcp=".$search_ref_rcp;
-	if ($search_ref_liv) $param .= "&amp;search_ref_liv=".$search_ref_liv;
-	if ($search_company) $param .= "&amp;search_company=".$search_company;
-	if ($optioncss != '') $param .= '&amp;optioncss='.$optioncss;
-	if ($search_billed != '' && $search_billed >= 0)$param .= "&amp;search_billed=".$search_billed;
-	if ($search_town)  $param .= "&amp;search_town=".$search_town;
-	if ($search_zip)  $param .= "&amp;search_zip=".$search_zip;
-	if ($search_state) $param .= "&amp;search_state=".$search_state;
-	if ($search_status) $param .= "&amp;search_status=".$search_status;
-	if ($search_country) $param .= "&amp;search_country=".$search_country;
-	if ($search_type_thirdparty) $param .= "&amp;search_type_thirdparty=".$search_type_thirdparty;
-	if ($search_ref_supplier) $param .= "&amp;search_ref_supplier=".$search_ref_supplier;
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+	if ($sall) $param .= "&amp;sall=".urlencode($sall);
+	if ($search_ref_rcp) $param .= "&amp;search_ref_rcp=".urlencode($search_ref_rcp);
+	if ($search_ref_liv) $param .= "&amp;search_ref_liv=".urlencode($search_ref_liv);
+	if ($search_company) $param .= "&amp;search_company=".urlencode($search_company);
+	if ($optioncss != '') $param .= '&amp;optioncss='.urlencode($optioncss);
+	if ($search_billed != '' && $search_billed >= 0) $param .= "&amp;search_billed=".urlencode($search_billed);
+	if ($search_town)  $param .= "&amp;search_town=".urlencode($search_town);
+	if ($search_zip)  $param .= "&amp;search_zip=".urlencode($search_zip);
+	if ($search_state) $param .= "&amp;search_state=".urlencode($search_state);
+	if ($search_status) $param .= "&amp;search_status=".urlencode($search_status);
+	if ($search_country) $param .= "&amp;search_country=".urlencode($search_country);
+	if ($search_type_thirdparty) $param .= "&amp;search_type_thirdparty=".urlencode($search_type_thirdparty);
+	if ($search_ref_supplier) $param .= "&amp;search_ref_supplier=".urlencode($search_ref_supplier);
 	// Add $param from extra fields
 	foreach ($search_array_options as $key => $val)
 	{
-	    $crit = $val;
-	    $tmpkey = preg_replace('/search_options_/', '', $key);
-	    if ($val != '') $param .= '&search_options_'.$tmpkey.'='.urlencode($val);
+		$crit = $val;
+		$tmpkey = preg_replace('/search_options_/', '', $key);
+		if ($val != '') $param .= '&search_options_'.$tmpkey.'='.urlencode($val);
 	}
 
 
-    $arrayofmassactions = array(
-    // 'presend'=>$langs->trans("SendByMail"),
-    );
+	$arrayofmassactions = array(
+	// 'presend'=>$langs->trans("SendByMail"),
+	);
 
 	if ($user->rights->fournisseur->facture->creer)$arrayofmassactions['createbills'] = $langs->trans("CreateInvoiceForThisSupplier");
 	if ($massaction == 'createbills') $arrayofmassactions = array();
@@ -533,13 +533,13 @@ if ($resql)
 	//$massactionbutton=$form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
 
 	$i = 0;
-    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    print '<input type="hidden" name="action" value="list">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
 	print_barre_liste($langs->trans('ListOfReceptions'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'dollyrevert', 0, '', '', $limit, 0, 0, 1);
 
@@ -573,10 +573,10 @@ if ($resql)
 		print '<td>';
 		if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_BILL))
 		{
-		    print $form->selectyesno('validate_invoices', 0, 1, 1);
-		    print ' ('.$langs->trans("AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation").')';
+			print $form->selectyesno('validate_invoices', 0, 1, 1);
+			print ' ('.$langs->trans("AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation").')';
 		} else {
-            print $form->selectyesno('validate_invoices', 0, 1);
+			print $form->selectyesno('validate_invoices', 0, 1);
 		}
 		print '</td>';
 		print '</tr>';
@@ -585,100 +585,100 @@ if ($resql)
 		print '<br>';
 		print '<div class="center">';
 		print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('CreateInvoiceForThisSupplier').'">  ';
-		print '<input type="submit" class="button" id="cancel" name="cancel" value="'.$langs->trans('Cancel').'">';
+		print '<input type="submit" class="button button-cancel" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 		print '<br>';
 	}
 
-    if ($sall)
-    {
-        foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
-        print $langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall);
-    }
+	if ($sall)
+	{
+		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+		print $langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall);
+	}
 
-    $moreforfilter = '';
-    if (!empty($moreforfilter))
-    {
-        print '<div class="liste_titre liste_titre_bydiv centpercent">';
-        print $moreforfilter;
-        $parameters = array('type'=>$type);
-        $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-        print '</div>';
-    }
+	$moreforfilter = '';
+	if (!empty($moreforfilter))
+	{
+		print '<div class="liste_titre liste_titre_bydiv centpercent">';
+		print $moreforfilter;
+		$parameters = array('type'=>$type);
+		$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		print '</div>';
+	}
 
-    $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-    $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
-    // Fields title search
-    // --------------------------------------------------------------------
-    print '<tr class="liste_titre_filter">';
+	// Fields title search
+	// --------------------------------------------------------------------
+	print '<tr class="liste_titre_filter">';
 	// Ref
 	if (!empty($arrayfields['e.ref']['checked']))
 	{
-	    print '<td class="liste_titre">';
-    	print '<input class="flat" size="6" type="text" name="search_ref_rcp" value="'.$search_ref_rcp.'">';
-        print '</td>';
+		print '<td class="liste_titre">';
+		print '<input class="flat" size="6" type="text" name="search_ref_rcp" value="'.$search_ref_rcp.'">';
+		print '</td>';
 	}
 	// Ref customer
 	if (!empty($arrayfields['e.ref_supplier']['checked']))
 	{
-	    print '<td class="liste_titre">';
-    	print '<input class="flat" size="6" type="text" name="search_ref_supplier" value="'.$search_ref_supplier.'">';
-        print '</td>';
+		print '<td class="liste_titre">';
+		print '<input class="flat" size="6" type="text" name="search_ref_supplier" value="'.$search_ref_supplier.'">';
+		print '</td>';
 	}
 	// Thirdparty
 	if (!empty($arrayfields['s.nom']['checked']))
 	{
-    	print '<td class="liste_titre left">';
-    	print '<input class="flat" type="text" size="8" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
-    	print '</td>';
+		print '<td class="liste_titre left">';
+		print '<input class="flat" type="text" size="8" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
+		print '</td>';
 	}
 	// Town
 	if (!empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
 	// Zip
 	if (!empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_zip" value="'.$search_zip.'"></td>';
 	// State
-    if (!empty($arrayfields['state.nom']['checked']))
-    {
-        print '<td class="liste_titre">';
-    	print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
-    	print '</td>';
-    }
-    // Country
-    if (!empty($arrayfields['country.code_iso']['checked']))
-    {
-        print '<td class="liste_titre center">';
-    	print $form->select_country($search_country, 'search_country', '', 0, 'minwidth100imp maxwidth100');
-    	print '</td>';
-    }
+	if (!empty($arrayfields['state.nom']['checked']))
+	{
+		print '<td class="liste_titre">';
+		print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
+		print '</td>';
+	}
+	// Country
+	if (!empty($arrayfields['country.code_iso']['checked']))
+	{
+		print '<td class="liste_titre center">';
+		print $form->select_country($search_country, 'search_country', '', 0, 'minwidth100imp maxwidth100');
+		print '</td>';
+	}
 	// Company type
-    if (!empty($arrayfields['typent.code']['checked']))
-    {
-        print '<td class="liste_titre maxwidthonsmartphone center">';
-    	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
-    	print '</td>';
-    }
+	if (!empty($arrayfields['typent.code']['checked']))
+	{
+		print '<td class="liste_titre maxwidthonsmartphone center">';
+		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
+		print '</td>';
+	}
 	// Date delivery planned
 	if (!empty($arrayfields['e.date_delivery']['checked']))
 	{
-    	print '<td class="liste_titre">&nbsp;</td>';
+		print '<td class="liste_titre">&nbsp;</td>';
 	}
 	if (!empty($arrayfields['l.ref']['checked']))
 	{
-    	// Delivery ref
+		// Delivery ref
 		print '<td class="liste_titre">';
 		print '<input class="flat" size="10" type="text" name="search_ref_liv" value="'.$search_ref_liv.'"';
 		print '</td>';
 	}
 	if (!empty($arrayfields['l.date_delivery']['checked']))
 	{
-	    // Date received
+		// Date received
 		print '<td class="liste_titre">&nbsp;</td>';
 	}
 	// Extra fields
@@ -691,34 +691,34 @@ if ($resql)
 	// Date creation
 	if (!empty($arrayfields['e.datec']['checked']))
 	{
-	    print '<td class="liste_titre">';
-	    print '</td>';
+		print '<td class="liste_titre">';
+		print '</td>';
 	}
 	// Date modification
 	if (!empty($arrayfields['e.tms']['checked']))
 	{
-	    print '<td class="liste_titre">';
-	    print '</td>';
+		print '<td class="liste_titre">';
+		print '</td>';
 	}
 	// Status
 	if (!empty($arrayfields['e.fk_statut']['checked']))
 	{
-	    print '<td class="liste_titre maxwidthonsmartphone right">';
-	    print $form->selectarray('search_status', array('0'=>$langs->trans('StatusReceptionDraftShort'), '1'=>$langs->trans('StatusReceptionValidatedShort'), '2'=>$langs->trans('StatusReceptionProcessedShort')), $search_status, 1);
-	    print '</td>';
+		print '<td class="liste_titre maxwidthonsmartphone right">';
+		print $form->selectarray('search_status', array('0'=>$langs->trans('StatusReceptionDraftShort'), '1'=>$langs->trans('StatusReceptionValidatedShort'), '2'=>$langs->trans('StatusReceptionProcessedShort')), $search_status, 1);
+		print '</td>';
 	}
 	// Status billed
 	if (!empty($arrayfields['e.billed']['checked']))
 	{
-	    print '<td class="liste_titre maxwidthonsmartphone center">';
-	    print $form->selectyesno('search_billed', $search_billed, 1, 0, 1);
-	    print '</td>';
+		print '<td class="liste_titre maxwidthonsmartphone center">';
+		print $form->selectyesno('search_billed', $search_billed, 1, 0, 1);
+		print '</td>';
 	}
 	// Action column
 	print '<td class="liste_titre middle">';
 	$searchpicto = $form->showFilterAndCheckAddButtons(0);
 	print $searchpicto;
-    print '</td>';
+	print '</td>';
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
@@ -752,121 +752,121 @@ if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
 
-    	$reception->id = $obj->rowid;
-    	$reception->ref = $obj->ref;
+		$reception->id = $obj->rowid;
+		$reception->ref = $obj->ref;
 
-    	$companystatic->id = $obj->socid;
-    	$companystatic->ref = $obj->name;
-    	$companystatic->name = $obj->name;
+		$companystatic->id = $obj->socid;
+		$companystatic->ref = $obj->name;
+		$companystatic->name = $obj->name;
 
 
-    	print '<tr class="oddeven">';
+		print '<tr class="oddeven">';
 
 		// Ref
 		if (!empty($arrayfields['e.ref']['checked']))
 		{
-    		print "<td>";
-    		print $reception->getNomUrl(1);
-    		$filename = dol_sanitizeFileName($reception->ref);
-    		$filedir = $conf->reception->dir_output.'/'.dol_sanitizeFileName($reception->ref);
-    		$urlsource = $_SERVER['PHP_SELF'].'?id='.$reception->id;
-    		print $formfile->getDocumentsLink($reception->element, $filename, $filedir);
-    		print "</td>\n";
+			print "<td>";
+			print $reception->getNomUrl(1);
+			$filename = dol_sanitizeFileName($reception->ref);
+			$filedir = $conf->reception->dir_output.'/'.dol_sanitizeFileName($reception->ref);
+			$urlsource = $_SERVER['PHP_SELF'].'?id='.$reception->id;
+			print $formfile->getDocumentsLink($reception->element, $filename, $filedir);
+			print "</td>\n";
 
-    		if (!$i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Ref customer
 		if (!empty($arrayfields['e.ref_supplier']['checked']))
 		{
-		    print "<td>";
-		    print $obj->ref_supplier;
-		    print "</td>\n";
-		    if (!$i) $totalarray['nbfield']++;
+			print "<td>";
+			print $obj->ref_supplier;
+			print "</td>\n";
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Third party
 		if (!empty($arrayfields['s.nom']['checked']))
 		{
-    		print '<td>';
-    		print $companystatic->getNomUrl(1);
-    		print '</td>';
-    		if (!$i) $totalarray['nbfield']++;
+			print '<td>';
+			print $companystatic->getNomUrl(1);
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Town
 		if (!empty($arrayfields['s.town']['checked']))
 		{
-		    print '<td class="nocellnopadd">';
-		    print $obj->town;
-		    print '</td>';
-		    if (!$i) $totalarray['nbfield']++;
+			print '<td class="nocellnopadd">';
+			print $obj->town;
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Zip
 		if (!empty($arrayfields['s.zip']['checked']))
 		{
-		    print '<td class="nocellnopadd">';
-		    print $obj->zip;
-		    print '</td>';
-		    if (!$i) $totalarray['nbfield']++;
+			print '<td class="nocellnopadd">';
+			print $obj->zip;
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// State
 		if (!empty($arrayfields['state.nom']['checked']))
 		{
-		    print "<td>".$obj->state_name."</td>\n";
-		    if (!$i) $totalarray['nbfield']++;
+			print "<td>".$obj->state_name."</td>\n";
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Country
 		if (!empty($arrayfields['country.code_iso']['checked']))
 		{
-		    print '<td class="center">';
-		    $tmparray = getCountry($obj->fk_pays, 'all');
-		    print $tmparray['label'];
-		    print '</td>';
-		    if (!$i) $totalarray['nbfield']++;
+			print '<td class="center">';
+			$tmparray = getCountry($obj->fk_pays, 'all');
+			print $tmparray['label'];
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Type ent
 		if (!empty($arrayfields['typent.code']['checked']))
 		{
-		    print '<td class="center">';
-		    if (count($typenArray) == 0) $typenArray = $formcompany->typent_array(1);
-		    print $typenArray[$obj->typent_code];
-		    print '</td>';
-		    if (!$i) $totalarray['nbfield']++;
+			print '<td class="center">';
+			if (count($typenArray) == 0) $typenArray = $formcompany->typent_array(1);
+			print $typenArray[$obj->typent_code];
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Date delivery planed
 		if (!empty($arrayfields['e.date_delivery']['checked']))
 		{
-    		print '<td class="center">';
-    		print dol_print_date($db->jdate($obj->date_livraison), "day");
-    		/*$now = time();
+			print '<td class="center">';
+			print dol_print_date($db->jdate($obj->delivery_date), "day");
+			/*$now = time();
     		if ( ($now - $db->jdate($obj->date_reception)) > $conf->warnings->lim && $obj->statutid == 1 )
     		{
     		}*/
-    		print "</td>\n";
+			print "</td>\n";
 		}
 
 		if (!empty($arrayfields['l.ref']['checked']) || !empty($arrayfields['l.date_delivery']['checked']))
-        {
-		    $reception->fetchObjectLinked($reception->id, $reception->element);
-            $receiving = '';
-            if (count($reception->linkedObjects['delivery']) > 0) $receiving = reset($reception->linkedObjects['delivery']);
+		{
+			$reception->fetchObjectLinked($reception->id, $reception->element);
+			$receiving = '';
+			if (count($reception->linkedObjects['delivery']) > 0) $receiving = reset($reception->linkedObjects['delivery']);
 
-    		if (!empty($arrayfields['l.ref']['checked']))
-            {
-                // Ref
-                print '<td>';
-                print !empty($receiving) ? $receiving->getNomUrl($db) : '';
-                print '</td>';
-            }
+			if (!empty($arrayfields['l.ref']['checked']))
+			{
+				// Ref
+				print '<td>';
+				print !empty($receiving) ? $receiving->getNomUrl($db) : '';
+				print '</td>';
+			}
 
-    		if (!empty($arrayfields['l.date_delivery']['checked']))
-            {
-                // Date received
-            	print '<td class="center">';
-    			print dol_print_date($db->jdate($obj->date_reception), "day");
-    			print '</td>'."\n";
-            }
+			if (!empty($arrayfields['l.date_delivery']['checked']))
+			{
+				// Date received
+				print '<td class="center">';
+				print dol_print_date($db->jdate($obj->date_reception), "day");
+				print '</td>'."\n";
+			}
 		}
 
 		// Extra fields
@@ -879,24 +879,24 @@ if ($resql)
 		// Date creation
 		if (!empty($arrayfields['e.datec']['checked']))
 		{
-		    print '<td class="center nowrap">';
-		    print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
-		    print '</td>';
-		    if (!$i) $totalarray['nbfield']++;
+			print '<td class="center nowrap">';
+			print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Date modification
 		if (!empty($arrayfields['e.tms']['checked']))
 		{
-		    print '<td class="center nowrap">';
-		    print dol_print_date($db->jdate($obj->date_update), 'dayhour');
-		    print '</td>';
-		    if (!$i) $totalarray['nbfield']++;
+			print '<td class="center nowrap">';
+			print dol_print_date($db->jdate($obj->date_update), 'dayhour');
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Status
 		if (!empty($arrayfields['e.fk_statut']['checked']))
 		{
-		    print '<td class="right nowrap">'.$reception->LibStatut($obj->fk_statut, 5).'</td>';
-		    if (!$i) $totalarray['nbfield']++;
+			print '<td class="right nowrap">'.$reception->LibStatut($obj->fk_statut, 5).'</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Billed
 		if (!empty($arrayfields['e.billed']['checked']))
@@ -908,11 +908,11 @@ if ($resql)
 		// Action column
 		print '<td class="center">';
 		if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-        {
-            $selected = 0;
-    		if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
-    		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
-        }
+		{
+			$selected = 0;
+			if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 
diff --git a/htdocs/reception/note.php b/htdocs/reception/note.php
index ade403ab39b..b57f3ea2efb 100644
--- a/htdocs/reception/note.php
+++ b/htdocs/reception/note.php
@@ -29,8 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/reception.lib.php';
 dol_include_once('/fourn/class/fournisseur.commande.class.php');
 if (!empty($conf->projet->enabled)) {
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
 $langs->load("receptions");
@@ -54,27 +54,27 @@ $result = restrictedArea($user, $origin, $origin_id);
 $object = new Reception($db);
 if ($id > 0 || !empty($ref))
 {
-    $object->fetch($id, $ref);
-    $object->fetch_thirdparty();
+	$object->fetch($id, $ref);
+	$object->fetch_thirdparty();
 
-    if (!empty($object->origin))
-    {
-        $typeobject = $object->origin;
-        $origin = $object->origin;
-        $object->fetch_origin();
-    }
+	if (!empty($object->origin))
+	{
+		$typeobject = $object->origin;
+		$origin = $object->origin;
+		$object->fetch_origin();
+	}
 
-    // Linked documents
-    if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
-    {
-        $objectsrc = new Commande($db);
-        $objectsrc->fetch($object->$typeobject->id);
-    }
-    if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
-    {
-        $objectsrc = new Propal($db);
-        $objectsrc->fetch($object->$typeobject->id);
-    }
+	// Linked documents
+	if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
+	{
+		$objectsrc = new Commande($db);
+		$objectsrc->fetch($object->$typeobject->id);
+	}
+	if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
+	{
+		$objectsrc = new Propal($db);
+		$objectsrc->fetch($object->$typeobject->id);
+	}
 }
 
 $permissionnote = $user->rights->reception->creer; // Used by the include of actions_setnotes.inc.php
@@ -98,7 +98,7 @@ $form = new Form($db);
 if ($id > 0 || !empty($ref))
 {
 	$head = reception_prepare_head($object);
-	dol_fiche_head($head, 'note', $langs->trans("Reception"), -1, 'dollyrevert');
+	print dol_get_fiche_head($head, 'note', $langs->trans("Reception"), -1, 'dollyrevert');
 
 
 	// Reception card
@@ -110,52 +110,52 @@ if ($id > 0 || !empty($ref))
 	$morehtmlref .= $form->editfieldval("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-    // Project
-    if (!empty($conf->projet->enabled)) {
-        $langs->load("projects");
-        $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-        if (0) {    // Do not change on reception
-            if ($action != 'classify') {
-                $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-            }
-            if ($action == 'classify') {
-                // $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-        } else {
-            // We don't have project on reception, so we will use the project or source object instead
-            // TODO Add project on reception
-            $morehtmlref .= ' : ';
-            if (!empty($objectsrc->fk_project)) {
-                $proj = new Project($db);
-                $proj->fetch($objectsrc->fk_project);
-                $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-                $morehtmlref .= $proj->ref;
-                $morehtmlref .= '</a>';
-            } else {
-                $morehtmlref .= '';
-            }
-        }
-    }
-    $morehtmlref .= '</div>';
+	// Project
+	if (!empty($conf->projet->enabled)) {
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if (0) {    // Do not change on reception
+			if ($action != 'classify') {
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			}
+			if ($action == 'classify') {
+				// $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			// We don't have project on reception, so we will use the project or source object instead
+			// TODO Add project on reception
+			$morehtmlref .= ' : ';
+			if (!empty($objectsrc->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($objectsrc->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
+	$morehtmlref .= '</div>';
 
-    $object->picto = 'sending';
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	$object->picto = 'sending';
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 
 	$cssclass = 'titlefield';
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 
diff --git a/htdocs/reception/stats/index.php b/htdocs/reception/stats/index.php
index 5079671dafd..bf839b16154 100644
--- a/htdocs/reception/stats/index.php
+++ b/htdocs/reception/stats/index.php
@@ -37,8 +37,8 @@ $socid = GETPOST('socid', 'int');
 // Security check
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $nowyear = strftime("%Y", dol_now());
@@ -76,34 +76,34 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filenamenb = $dir.'/receptionsnbinyear-'.$user->id.'-'.$year.'.png';
+	$filenamenb = $dir.'/receptionsnbinyear-'.$user->id.'-'.$year.'.png';
 } else {
-    $filenamenb = $dir.'/receptionsnbinyear-'.$year.'.png';
+	$filenamenb = $dir.'/receptionsnbinyear-'.$year.'.png';
 }
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
 if (!$mesg)
 {
-    $px1->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px1->SetLegend($legend);
-    $px1->SetMaxValue($px1->GetCeilMaxValue());
-    $px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
-    $px1->SetWidth($WIDTH);
-    $px1->SetHeight($HEIGHT);
-    $px1->SetYLabel($langs->trans("NbOfReceptions"));
-    $px1->SetShading(3);
-    $px1->SetHorizTickIncrement(1);
-    $px1->mode = 'depth';
-    $px1->SetTitle($langs->trans("NumberOfReceptionsByMonth"));
+	$px1->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px1->SetLegend($legend);
+	$px1->SetMaxValue($px1->GetCeilMaxValue());
+	$px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
+	$px1->SetWidth($WIDTH);
+	$px1->SetHeight($HEIGHT);
+	$px1->SetYLabel($langs->trans("NbOfReceptions"));
+	$px1->SetShading(3);
+	$px1->SetHorizTickIncrement(1);
+	$px1->mode = 'depth';
+	$px1->SetTitle($langs->trans("NumberOfReceptionsByMonth"));
 
-    $px1->draw($filenamenb, $fileurlnb);
+	$px1->draw($filenamenb, $fileurlnb);
 }
 
 // Build graphic amount of object
@@ -207,7 +207,7 @@ $type = 'reception_stats';
 
 complete_head_from_modules($conf, $langs, null, $head, $h, $type);
 
-dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
+print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
@@ -289,9 +289,9 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 // Show graphs
 print '<table class="border centpercent"><tr valign="top"><td class="center">';
 if ($mesg) { print $mesg; } else {
-    print $px1->show();
-    print "<br>\n";
-    /*print $px2->show();
+	print $px1->show();
+	print "<br>\n";
+	/*print $px2->show();
     print "<br>\n";
     print $px3->show();*/
 }
@@ -301,7 +301,7 @@ print '</td></tr></table>';
 print '</div></div></div>';
 print '<div style="clear:both"></div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 
diff --git a/htdocs/reception/stats/month.php b/htdocs/reception/stats/month.php
index dab1a806406..f974b4edcff 100644
--- a/htdocs/reception/stats/month.php
+++ b/htdocs/reception/stats/month.php
@@ -55,14 +55,14 @@ $px = new DolGraph();
 $mesg = $px->isGraphKo();
 if (!$mesg)
 {
-    $px->SetData($data);
-    $px->SetMaxValue($px->GetCeilMaxValue());
-    $px->SetWidth($WIDTH);
-    $px->SetHeight($HEIGHT);
-    $px->SetYLabel($langs->trans("NbOfOrders"));
-    $px->SetShading(3);
+	$px->SetData($data);
+	$px->SetMaxValue($px->GetCeilMaxValue());
+	$px->SetWidth($WIDTH);
+	$px->SetHeight($HEIGHT);
+	$px->SetYLabel($langs->trans("NbOfOrders"));
+	$px->SetShading(3);
 	$px->SetHorizTickIncrement(1);
-    $px->draw($filename, $fileurl);
+	$px->draw($filename, $fileurl);
 }
 
 print '<table class="border centpercent">';
diff --git a/htdocs/reception/tpl/linkedobjectblock.tpl.php b/htdocs/reception/tpl/linkedobjectblock.tpl.php
index 7d902888cd0..014dbff00a0 100644
--- a/htdocs/reception/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/reception/tpl/linkedobjectblock.tpl.php
@@ -44,11 +44,11 @@ $linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1)
 $total = 0; $ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink)
 {
-    $ilink++;
+	$ilink++;
 
-    $trclass = 'oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
-    ?>
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	?>
     <tr class="<?php echo $trclass; ?>">
         <td class="linkedcol-element"><?php echo $langs->trans("Reception"); ?>
         <?php if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a'; ?>
@@ -57,27 +57,27 @@ foreach ($linkedObjectBlock as $key => $objectlink)
         <td class="linkedcol-ref center"></td>
     	<td class="linkedcol-date center"><?php echo dol_print_date($objectlink->date_delivery, 'day'); ?></td>
     	<td class="linkedcol-amount right"><?php
-    	if ($user->rights->reception->lire) {
-    		$total = $total + $objectlink->total_ht;
-    		echo price($objectlink->total_ht);
-    	} ?></td>
+		if ($user->rights->reception->lire) {
+			$total = $total + $objectlink->total_ht;
+			echo price($objectlink->total_ht);
+		} ?></td>
     	<td class="linkedcol-statut right"><?php echo $objectlink->getLibStatut(3); ?></td>
     	<td class="linkedcol-action right">
     	<?php
-    	// For now, receptions must stay linked to order, so link is not deletable
-    	if ($object->element != 'order_supplier') {
-    		?>
+		// For now, receptions must stay linked to order, so link is not deletable
+		if ($object->element != 'order_supplier') {
+			?>
     		<a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a>
     		<?php
-    	}
-    	?>
+		}
+		?>
    		</td>
     </tr>
     <?php
 }
 if (count($linkedObjectBlock) > 1)
 {
-    ?>
+	?>
     <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
         <td><?php echo $langs->trans("Total"); ?></td>
         <td></td>
diff --git a/htdocs/recruitment/admin/candidature_extrafields.php b/htdocs/recruitment/admin/candidature_extrafields.php
index b81668d6337..1d9e567da9d 100644
--- a/htdocs/recruitment/admin/candidature_extrafields.php
+++ b/htdocs/recruitment/admin/candidature_extrafields.php
@@ -65,11 +65,11 @@ print load_fiche_titre($langs->trans("RecruitmentSetup"), $linkback, 'title_setu
 
 $head = recruitmentAdminPrepareHead();
 
-dol_fiche_head($head, 'candidature_extrafields', '', -1, '');
+print dol_get_fiche_head($head, 'candidature_extrafields', '', -1, '');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/recruitment/admin/jobposition_extrafields.php b/htdocs/recruitment/admin/jobposition_extrafields.php
index 62d6b8418c2..af7a7c316a7 100644
--- a/htdocs/recruitment/admin/jobposition_extrafields.php
+++ b/htdocs/recruitment/admin/jobposition_extrafields.php
@@ -65,11 +65,11 @@ print load_fiche_titre($langs->trans("RecruitmentSetup"), $linkback, 'title_setu
 
 $head = recruitmentAdminPrepareHead();
 
-dol_fiche_head($head, 'jobposition_extrafields', '', -1, '');
+print dol_get_fiche_head($head, 'jobposition_extrafields', '', -1, '');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/recruitment/admin/public_interface.php b/htdocs/recruitment/admin/public_interface.php
index 1c943ae1085..a457c2a4427 100644
--- a/htdocs/recruitment/admin/public_interface.php
+++ b/htdocs/recruitment/admin/public_interface.php
@@ -50,15 +50,15 @@ if ($action == 'setRECRUITMENT_ENABLE_PUBLIC_INTERFACE') {
 if ($action == 'update') {
 	$public = GETPOST('RECRUITMENT_ENABLE_PUBLIC_INTERFACE');
 
-    $res = dolibarr_set_const($db, "RECRUITMENT_ENABLE_PUBLIC_INTERFACE", $public, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "RECRUITMENT_ENABLE_PUBLIC_INTERFACE", $public, 'chaine', 0, '', $conf->entity);
 
-    if (!$res > 0) $error++;
+	if (!$res > 0) $error++;
 
  	if (!$error) {
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-	    setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 
@@ -84,7 +84,7 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="action" value="update">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
-dol_fiche_head($head, 'publicurl', '', -1, '');
+print dol_get_fiche_head($head, 'publicurl', '', -1, '');
 
 
 print '<span class="opacitymedium">'.$langs->trans("PublicInterfaceRecruitmentDesc").'</span><br><br>';
@@ -165,7 +165,7 @@ if (!empty($conf->global->RECRUITMENT_ENABLE_PUBLIC_INTERFACE)) {
 }
 */
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '</form>';
 
diff --git a/htdocs/recruitment/admin/setup.php b/htdocs/recruitment/admin/setup.php
index 43ffd3af439..342d32840c5 100644
--- a/htdocs/recruitment/admin/setup.php
+++ b/htdocs/recruitment/admin/setup.php
@@ -54,6 +54,9 @@ $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 $value = GETPOST('value', 'alpha');
+$label = GETPOST('label', 'alpha');
+$scandir = GETPOST('scan_dir', 'alpha');
+$type = 'recruitmentjobposition';
 
 $arrayofparameters = array(
 //	'RECRUITMENT_MYPARAM1'=>array('css'=>'minwidth200', 'enabled'=>1),
@@ -131,47 +134,52 @@ if ($action == 'updateMask')
 }
 
 // Activate a model
-elseif ($action == 'set')
-{
+elseif ($action == 'set') {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-} elseif ($action == 'del')
-{
-	$tmpobjectkey = GETPOST('object');
-
+} elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
-		$constforval = strtoupper($tmpobjectkey).'_ADDON_PDF';
-		if ($conf->global->$constforval == "$value") dolibarr_del_const($db, $constforval, $conf->entity);
+	if ($ret > 0) {
+		$tmpobjectkey = GETPOST('object');
+		if (!empty($tmpobjectkey)) {
+			$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
+			if ($conf->global->$constforval == "$value") dolibarr_del_const($db, $constforval, $conf->entity);
+		}
+	}
+}
+
+elseif ($action == 'setmod') {
+	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
+	$tmpobjectkey = GETPOST('object');
+	if (!empty($tmpobjectkey)) {
+		$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey)."_ADDON";
+
+		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
 	}
 }
 
 // Set default model
-elseif ($action == 'setdoc')
-{
+elseif ($action == 'setdoc') {
 	$tmpobjectkey = GETPOST('object');
-	$constforval = strtoupper($tmpobjectkey).'_ADDON_PDF';
-	if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity))
-	{
-		// The constant that was read before the new set
-		// We therefore requires a variable to have a coherent view
-		$conf->global->$constforval = $value;
-	}
+	if (!empty($tmpobjectkey)) {
+		$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
+		if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
+			// The constant that was read before the new set
+			// We therefore requires a variable to have a coherent view
+			$conf->global->$constforval = $value;
+		}
 
-	// On active le modele
-	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
-		$ret = addDocumentModel($value, $type, $label, $scandir);
+		// We disable/enable the document template (into llx_document_model table)
+		$ret = delDocumentModel($value, $type);
+		if ($ret > 0) {
+			$ret = addDocumentModel($value, $type, $label, $scandir);
+		}
 	}
-} elseif ($action == 'setmod')
-{
-	// TODO Check if numbering module chosen can be activated
-	// by calling method canBeActivated
+} elseif ($action == 'unsetdoc') {
 	$tmpobjectkey = GETPOST('object');
-	$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey)."_ADDON";
-
-	dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
+	if (!empty($tmpobjectkey)) {
+		$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
+		dolibarr_del_const($db, $constforval, $conf->entity);
+	}
 }
 
 
@@ -194,7 +202,7 @@ print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
 
 // Configuration header
 $head = recruitmentAdminPrepareHead();
-dol_fiche_head($head, 'settings', '', -1, '');
+print dol_get_fiche_head($head, 'settings', '', -1, '');
 
 // Setup page goes here
 //echo '<span class="opacitymedium">'.$langs->trans("RecruitmentSetupPage").'</span><br><br>';
@@ -219,7 +227,7 @@ if ($action == 'edit')
 	print '</table>';
 
 	print '<br><div class="center">';
-	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
+	print '<input class="button button-save" type="submit" value="'.$langs->trans("Save").'">';
 	print '</div>';
 
 	print '</form>';
@@ -251,7 +259,7 @@ if ($action == 'edit')
 
 $moduledir = 'recruitment';
 $myTmpObjects = array();
-$myTmpObjects['RecruitmentJobPosition']=array('includerefgeneration'=>1, 'includedocgeneration'=>1);
+$myTmpObjects['RecruitmentJobPosition'] = array('includerefgeneration'=>1, 'includedocgeneration'=>1);
 
 
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
@@ -288,7 +296,6 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 						if (strpos($file, 'mod_'.strtolower($myTmpObjectKey).'_') === 0 && substr($file, dol_strlen($file) - 3, 3) == 'php')
 						{
 							$file = substr($file, 0, dol_strlen($file) - 4);
-
 							require_once $dir.'/'.$file.'.php';
 
 							$module = new $file($db);
@@ -308,8 +315,10 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 								// Show example of numbering model
 								print '<td class="nowrap">';
 								$tmp = $module->getExample();
-								if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-								elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+								if (preg_match('/^Error/', $tmp)) {
+									$langs->load("errors");
+									print '<div class="error">'.$langs->trans($tmp).'</div>';
+								} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
 								else print $tmp;
 								print '</td>'."\n";
 
@@ -375,8 +384,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 		$sql .= " WHERE type = '".$db->escape($type)."'";
 		$sql .= " AND entity = ".$conf->entity;
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$i = 0;
 			$num_rows = $db->num_rows($resql);
 			while ($i < $num_rows)
@@ -462,12 +470,13 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 
 										// Default
 										print '<td class="center">';
-										$constforvar = 'RECRUITMENT_'.strtoupper($myTmpObjectKey).'_ADDON';
-										if ($conf->global->$constforvar == $name)
-										{
-											print img_picto($langs->trans("Default"), 'on');
+										$constforvar = 'RECRUITMENT_'.strtoupper($myTmpObjectKey).'_ADDON_PDF';
+										if ($conf->global->$constforvar == $name) {
+											//print img_picto($langs->trans("Default"), 'on');
+											// Even if choice is the default value, we allow to disable it. Replace this with previous line if you need to disable unset
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&amp;token='.newToken().'&amp;object='.urlencode(strtolower($myTmpObjectKey)).'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type='.urlencode($type).'" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 										} else {
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;object='.urlencode(strtolower($myTmpObjectKey)).'&amp;value='.$name.'&amp;scan_dir='.urlencode($module->scandir).'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 										}
 										print '</td>';
 
@@ -517,7 +526,7 @@ if (empty($setupnotempty)) {
 }
 
 // Page end
-dol_fiche_end();
+print dol_get_fiche_end();
 
 llxFooter();
 $db->close();
diff --git a/htdocs/recruitment/admin/setup_candidatures.php b/htdocs/recruitment/admin/setup_candidatures.php
index b2b6f25524b..818e1479f0a 100644
--- a/htdocs/recruitment/admin/setup_candidatures.php
+++ b/htdocs/recruitment/admin/setup_candidatures.php
@@ -54,6 +54,9 @@ $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 $value = GETPOST('value', 'alpha');
+$label = GETPOST('label', 'alpha');
+$scandir = GETPOST('scan_dir', 'alpha');
+$type = 'recruitmentcandidature';
 
 $arrayofparameters = array(
 //	'RECRUITMENT_MYPARAM1'=>array('css'=>'minwidth200', 'enabled'=>1),
@@ -131,47 +134,49 @@ if ($action == 'updateMask')
 }
 
 // Activate a model
-elseif ($action == 'set')
-{
+elseif ($action == 'set') {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-} elseif ($action == 'del')
-{
+} elseif ($action == 'del') {
 	$tmpobjectkey = GETPOST('object');
 
 	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
-		$constforval = strtoupper($tmpobjectkey).'_ADDON_PDF';
+	if ($ret > 0) {
+		$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		if ($conf->global->$constforval == "$value") dolibarr_del_const($db, $constforval, $conf->entity);
 	}
 }
 
-// Set default model
-elseif ($action == 'setdoc')
-{
+elseif ($action == 'setmod') {
+	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
 	$tmpobjectkey = GETPOST('object');
-	$constforval = strtoupper($tmpobjectkey).'_ADDON_PDF';
-	if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity))
-	{
+	if (!empty($tmpobjectkey)) {
+		$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey)."_ADDON";
+
+		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
+	}
+}
+
+// Set default model
+elseif ($action == 'setdoc') {
+	$tmpobjectkey = GETPOST('object');
+	$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
+	if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
 		// The constant that was read before the new set
 		// We therefore requires a variable to have a coherent view
 		$conf->global->$constforval = $value;
 	}
 
-	// On active le modele
+	// We disable/enable the document template (into llx_document_model table)
 	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
+	if ($ret > 0) {
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-} elseif ($action == 'setmod')
-{
-	// TODO Check if numbering module chosen can be activated
-	// by calling method canBeActivated
+} elseif ($action == 'unsetdoc') {
 	$tmpobjectkey = GETPOST('object');
-	$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey)."_ADDON";
-
-	dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
+	if (!empty($tmpobjectkey)) {
+		$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
+		dolibarr_del_const($db, $constforval, $conf->entity);
+	}
 }
 
 
@@ -194,7 +199,7 @@ print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
 
 // Configuration header
 $head = recruitmentAdminPrepareHead();
-dol_fiche_head($head, 'settings_candidatures', '', -1, '');
+print dol_get_fiche_head($head, 'settings_candidatures', '', -1, '');
 
 // Setup page goes here
 //echo '<span class="opacitymedium">'.$langs->trans("RecruitmentSetupPage").'</span><br><br>';
@@ -219,7 +224,7 @@ if ($action == 'edit')
 	print '</table>';
 
 	print '<br><div class="center">';
-	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
+	print '<input class="button button-save" type="submit" value="'.$langs->trans("Save").'">';
 	print '</div>';
 
 	print '</form>';
@@ -308,8 +313,10 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 								// Show example of numbering model
 								print '<td class="nowrap">';
 								$tmp = $module->getExample();
-								if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-								elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+								if (preg_match('/^Error/', $tmp)) {
+									$langs->load("errors");
+									print '<div class="error">'.$langs->trans($tmp).'</div>';
+								} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
 								else print $tmp;
 								print '</td>'."\n";
 
@@ -463,11 +470,12 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										// Default
 										print '<td class="center">';
 										$constforvar = 'RECRUITMENT_'.strtoupper($myTmpObjectKey).'_ADDON';
-										if ($conf->global->$constforvar == $name)
-										{
-											print img_picto($langs->trans("Default"), 'on');
+										if ($conf->global->$constforvar == $name) {
+											//print img_picto($langs->trans("Default"), 'on');
+											// Even if choice is the default value, we allow to disable it. Replace this with previous line if you need to disable unset
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&amp;token='.newToken().'&amp;object='.urlencode(strtolower($myTmpObjectKey)).'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type='.urlencode($type).'" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 										} else {
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;object='.urlencode(strtolower($myTmpObjectKey)).'&amp;value='.$name.'&amp;scan_dir='.urlencode($module->scandir).'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 										}
 										print '</td>';
 
@@ -517,7 +525,7 @@ if (empty($setupnotempty)) {
 }
 
 // Page end
-dol_fiche_end();
+print dol_get_fiche_end();
 
 llxFooter();
 $db->close();
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index df96744526b..3049f83a053 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -68,6 +68,7 @@ class RecruitmentCandidature extends CommonObject
 	//const STATUS_INTERVIEW_SCHEDULED = 2;
 	const STATUS_CONTRACT_PROPOSED = 3;
 	const STATUS_CONTRACT_SIGNED = 5;
+	const STATUS_CONTRACT_REFUSED = 6;
 	const STATUS_REFUSED = 8;
 	const STATUS_CANCELED = 9;
 
@@ -86,7 +87,7 @@ class RecruitmentCandidature extends CommonObject
 	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
-	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
+	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
 	 *  'help' is a string visible as a tooltip on field
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
@@ -152,42 +153,6 @@ class RecruitmentCandidature extends CommonObject
 	// END MODULEBUILDER PROPERTIES
 
 
-	// If this object has a subtable with lines
-
-	/**
-	 * @var int    Name of subtable line
-	 */
-	//public $table_element_line = 'recruitment_recruitmentcandidatureline';
-
-	/**
-	 * @var int    Field with ID of parent key if this object has a parent
-	 */
-	//public $fk_element = 'fk_recruitmentcandidature';
-
-	/**
-	 * @var int    Name of subtable class that manage subtable lines
-	 */
-	//public $class_element_line = 'RecruitmentCandidatureline';
-
-	/**
-	 * @var array	List of child tables. To test if we can delete object.
-	 */
-	//protected $childtables = array();
-
-	/**
-	 * @var array    List of child tables. To know object to delete on cascade.
-	 *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
-	 *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
-	 */
-	//protected $childtablesoncascade = array('recruitment_recruitmentcandidaturedet');
-
-	/**
-	 * @var RecruitmentCandidatureLine[]     Array of subtable lines
-	 */
-	//public $lines = array();
-
-
-
 	/**
 	 * Constructor
 	 *
@@ -222,7 +187,7 @@ class RecruitmentCandidature extends CommonObject
 		{
 			foreach ($this->fields as $key => $val)
 			{
-				if (is_array($val['arrayofkeyval']))
+				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
 				{
 					foreach ($val['arrayofkeyval'] as $key2 => $val2)
 					{
@@ -276,11 +241,13 @@ class RecruitmentCandidature extends CommonObject
 		unset($object->fk_user_creat);
 		unset($object->import_key);
 
-
 		// Clear fields
-		$object->ref = empty($this->fields['ref']['default']) ? "copy_of_".$object->ref : $this->fields['ref']['default'];
-		$object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
-		$object->status = self::STATUS_DRAFT;
+		if (property_exists($object, 'ref')) $object->ref = empty($this->fields['ref']['default']) ? "Copy_Of_".$object->ref : $this->fields['ref']['default'];
+		if (property_exists($object, 'label')) $object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
+		if (property_exists($object, 'status')) { $object->status = self::STATUS_DRAFT; }
+		if (property_exists($object, 'date_creation')) { $object->date_creation = dol_now(); }
+		if (property_exists($object, 'date_modification')) { $object->date_modification = null; }
+
 		// ...
 		// Clear extrafields that are unique
 		if (is_array($object->array_options) && count($object->array_options) > 0)
@@ -679,7 +646,7 @@ class RecruitmentCandidature extends CommonObject
 	public function reopen($user, $notrigger = 0)
 	{
 		// Protection
-		if ($this->status != self::STATUS_CANCELED)
+		if ($this->status != self::STATUS_REFUSED && $this->status != self::STATUS_CANCELED && $this->status != self::STATUS_CONTRACT_REFUSED)
 		{
 			return 0;
 		}
@@ -712,14 +679,14 @@ class RecruitmentCandidature extends CommonObject
 
 		$result = '';
 
-		$label = img_picto('', $this->picto).' <u>'.$langs->trans("RecruitmentCandidature").'</u>';
+		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("RecruitmentCandidature").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 		$label .= '<br><b>'.$langs->trans('Email').':</b> '.$this->email;
 		$label .= '<br><b>'.$langs->trans('Name').':</b> '.$this->getFullName($langs);
-		if (isset($this->status)) {
-			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
-		}
 
 		$url = dol_buildpath('/recruitment/recruitmentcandidature_card.php', 1).'?id='.$this->id;
 
@@ -821,13 +788,15 @@ class RecruitmentCandidature extends CommonObject
 			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Received').' ('.$langs->trans("InterviewToDo").')';
 			$this->labelStatus[self::STATUS_CONTRACT_PROPOSED] = $langs->trans('ContractProposed');
 			$this->labelStatus[self::STATUS_CONTRACT_SIGNED] = $langs->trans('ContractSigned');
-			$this->labelStatus[self::STATUS_REFUSED] = $langs->trans('Refused');
+			$this->labelStatus[self::STATUS_CONTRACT_REFUSED] = $langs->trans('ContractRefused');
 			$this->labelStatus[self::STATUS_REFUSED] = $langs->trans('Refused');
 			$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Canceled');
 			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft');
 			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Received');
 			$this->labelStatusShort[self::STATUS_CONTRACT_PROPOSED] = $langs->trans('ContractProposed');
 			$this->labelStatusShort[self::STATUS_CONTRACT_SIGNED] = $langs->trans('ContractSigned');
+			$this->labelStatusShort[self::STATUS_CONTRACT_REFUSED] = $langs->trans('ContractRefused');
+			$this->labelStatusShort[self::STATUS_REFUSED] = $langs->trans('Refused');
 			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Canceled');
 		}
 
@@ -1003,18 +972,17 @@ class RecruitmentCandidature extends CommonObject
 		$langs->load("recruitment@recruitment");
 
 		if (!dol_strlen($modele)) {
-			$modele = 'standard_recruitmentcandidature';
-
-			if ($this->modelpdf) {
-				$modele = $this->modelpdf;
-			} elseif (!empty($conf->global->RECRUITMENTCANDIDATURE_ADDON_PDF)) {
+			if (!empty($conf->global->RECRUITMENTCANDIDATURE_ADDON_PDF))
+			{
 				$modele = $conf->global->RECRUITMENTCANDIDATURE_ADDON_PDF;
+			} else {
+				$modele = ''; // No default value. For job application, we allow to disable all PDF generation
 			}
 		}
 
 		$modelpath = "core/modules/recruitment/doc/";
 
-		if ($includedocgeneration) {
+		if ($includedocgeneration && !empty($modele)) {
 			$result = $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 		}
 
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index 355cae49c89..c202a523e58 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -16,7 +16,7 @@
  */
 
 /**
- * \file        class/recruitmentjobposition.class.php
+ * \file        htdocs/recruitment/class/recruitmentjobposition.class.php
  * \ingroup     recruitment
  * \brief       This file is a CRUD class file for RecruitmentJobPosition (Create/Read/Update/Delete)
  */
@@ -83,7 +83,7 @@ class RecruitmentJobPosition extends CommonObject
 	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
-	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
+	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
 	 *  'help' is a string visible as a tooltip on field
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
@@ -102,10 +102,10 @@ class RecruitmentJobPosition extends CommonObject
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'comment'=>"Id"),
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'position'=>5, 'notnull'=>1, 'default'=>'1', 'index'=>1),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
-		'label' => array('type'=>'varchar(255)', 'label'=>'JobLabel', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth500', 'showoncombobox'=>'1', 'autofocusoncreate'=>1),
+		'label' => array('type'=>'varchar(255)', 'label'=>'JobLabel', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth500', 'csslist'=>'tdoverflowmax300', 'showoncombobox'=>'1', 'autofocusoncreate'=>1),
 		'qty' => array('type'=>'integer', 'label'=>'NbOfEmployeesExpected', 'enabled'=>'1', 'position'=>45, 'notnull'=>1, 'visible'=>1, 'default'=>'1', 'isameasure'=>'1', 'css'=>'maxwidth75imp',),
 		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>'1', 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1,),
-		'fk_user_recruiter' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'ResponsibleOfRecruitement', 'enabled'=>'1', 'position'=>54, 'notnull'=>1, 'visible'=>1, 'foreignkey'=>'user.rowid',),
+		'fk_user_recruiter' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'ResponsibleOfRecruitement', 'enabled'=>'1', 'position'=>54, 'notnull'=>1, 'visible'=>1, 'foreignkey'=>'user.rowid', 'csslist'=>'tdoverflowmax150'),
 		'email_recruiter' => array('type'=>'varchar(255)', 'label'=>'EmailRecruiter', 'enabled'=>'1', 'position'=>54, 'notnull'=>0, 'visible'=>-1, 'help'=>'ToUseAGenericEmail'),
 		'fk_user_supervisor' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'FutureManager', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>-1, 'foreignkey'=>'user.rowid',),
 		'fk_establishment' => array('type'=>'integer:Establishment:hrm/class/establishment.class.php', 'label'=>'Establishment', 'enabled'=>'$conf->hrm->enabled', 'position'=>56, 'notnull'=>0, 'visible'=>-1, 'foreignkey'=>'establishment.rowid',),
@@ -115,7 +115,7 @@ class RecruitmentJobPosition extends CommonObject
 		'description' => array('type'=>'html', 'label'=>'Description', 'enabled'=>'1', 'position'=>65, 'notnull'=>0, 'visible'=>3,),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>101, 'notnull'=>0, 'visible'=>0,),
 		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>102, 'notnull'=>0, 'visible'=>0,),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
+		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-4,),
 		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
 		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
 		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
@@ -125,14 +125,32 @@ class RecruitmentJobPosition extends CommonObject
 		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>5, 'default'=>'0', 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated', '3'=>'Recruited', '9'=>'Canceled'),),
 	);
 	public $rowid;
+
+	/**
+	 * @var string ref
+	 */
 	public $ref;
 	public $entity;
+
+	/**
+	 * @var string label
+	 */
 	public $label;
 	public $qty;
 	public $fk_soc;
 	public $fk_project;
 	public $fk_user_recruiter;
+
+	/**
+	 * @var string recruiter email
+	 */
 	public $email_recruiter;
+
+	/**
+	 * @var string suggested remuneration
+	 */
+	public $remuneration_suggested;
+
 	public $fk_user_supervisor;
 	public $fk_establishment;
 	public $date_planned;
@@ -150,40 +168,6 @@ class RecruitmentJobPosition extends CommonObject
 	// END MODULEBUILDER PROPERTIES
 
 
-	// If this object has a subtable with lines
-
-	/**
-	 * @var int    Name of subtable line
-	 */
-	//public $table_element_line = 'recruitment_recruitmentjobpositionline';
-
-	/**
-	 * @var int    Field with ID of parent key if this field has a parent
-	 */
-	//public $fk_element = 'fk_recruitmentjobposition';
-
-	/**
-	 * @var int    Name of subtable class that manage subtable lines
-	 */
-	//public $class_element_line = 'RecruitmentJobPositionline';
-
-	/**
-	 * @var array	List of child tables. To test if we can delete object.
-	 */
-	//protected $childtables=array();
-
-	/**
-	 * @var array	List of child tables. To know object to delete on cascade.
-	 */
-	//protected $childtablesoncascade=array('recruitment_recruitmentjobpositiondet');
-
-	/**
-	 * @var RecruitmentJobPositionLine[]     Array of subtable lines
-	 */
-	//public $lines = array();
-
-
-
 	/**
 	 * Constructor
 	 *
@@ -218,7 +202,7 @@ class RecruitmentJobPosition extends CommonObject
 		{
 			foreach ($this->fields as $key => $val)
 			{
-				if (is_array($val['arrayofkeyval']))
+				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
 				{
 					foreach ($val['arrayofkeyval'] as $key2 => $val2)
 					{
@@ -272,11 +256,12 @@ class RecruitmentJobPosition extends CommonObject
 		unset($object->fk_user_creat);
 		unset($object->import_key);
 
-
 		// Clear fields
-		$object->ref = empty($this->fields['ref']['default']) ? "copy_of_".$object->ref : $this->fields['ref']['default'];
-		$object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
-		$object->status = self::STATUS_DRAFT;
+		if (property_exists($object, 'ref')) $object->ref = empty($this->fields['ref']['default']) ? "Copy_Of_".$object->ref : $this->fields['ref']['default'];
+		if (property_exists($object, 'label')) $object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
+		if (property_exists($object, 'status')) { $object->status = self::STATUS_DRAFT; }
+		if (property_exists($object, 'date_creation')) { $object->date_creation = dol_now(); }
+		if (property_exists($object, 'date_modification')) { $object->date_modification = null; }
 		// ...
 		// Clear extrafields that are unique
 		if (is_array($object->array_options) && count($object->array_options) > 0)
@@ -798,13 +783,13 @@ class RecruitmentJobPosition extends CommonObject
 
 		$result = '';
 
-		$label = img_picto('', $this->picto).' <u>'.$langs->trans("PositionToBeFilled").'</u>';
+		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("PositionToBeFilled").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 		$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
-		if (isset($this->status)) {
-			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
-		}
 
 		$url = dol_buildpath('/recruitment/recruitmentjobposition_card.php', 1).'?id='.$this->id;
 
@@ -1074,18 +1059,16 @@ class RecruitmentJobPosition extends CommonObject
 		$langs->load("recruitment");
 
 		if (!dol_strlen($modele)) {
-			$modele = 'standard_recruitmentjobposition';
-
-			if ($this->model_pdf) {
-				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->RECRUITMENTJOBPOSITION_ADDON_PDF)) {
+			if (!empty($conf->global->RECRUITMENTJOBPOSITION_ADDON_PDF)) {
 				$modele = $conf->global->RECRUITMENTJOBPOSITION_ADDON_PDF;
+			} else {
+				$modele = ''; // No default value. For job position, we allow to disable all PDF generation
 			}
 		}
 
 		$modelpath = "core/modules/recruitment/doc/";
 
-		if ($includedocgeneration) {
+		if ($includedocgeneration && !empty($modele)) {
 			$result = $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 		}
 
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
index eedc3fbc7c8..59ea51466b6 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
@@ -181,7 +181,7 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
-		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '<span class="opacitymedium">'.$langs->trans("ExampleOfDirectoriesForModelGen").'</span>';
 		$texte .= '</td>';
 		$texte .= '</tr>';
 
@@ -299,9 +299,9 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 				$contactobject = null;
 				if (!empty($usecontact))
 				{
-					// On peut utiliser le nom de la societe du contact
-					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else {
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+						$socobject = $object->contact;
+					} else {
 						$socobject = $object->thirdparty;
 						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
 						$contactobject = $object->contact;
@@ -316,7 +316,7 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 					'__FROM_EMAIL__' => $this->emetteur->email,
 					'__TOTAL_TTC__' => $object->total_ttc,
 					'__TOTAL_HT__' => $object->total_ht,
-					'__TOTAL_VAT__' => $object->total_vat
+					'__TOTAL_VAT__' => $object->total_tva
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
index ee0f63f6c4f..5f257f594cf 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
@@ -825,7 +825,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		// Show Draft Watermark
-		if ($object->statut == Facture::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK)))
+		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK)))
 		{
 			  pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FACTURE_DRAFT_WATERMARK);
 		}
@@ -885,7 +885,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
 		$textref = $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref);
-		if ($object->statut == Facture::STATUS_DRAFT)
+		if ($object->statut == $object::STATUS_DRAFT)
 		{
 			$pdf->SetTextColor(128, 0, 0);
 			$textref .= ' - '.$outputlangs->transnoentities("NotValidated");
@@ -1002,7 +1002,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 			}
 
 			// Recipient name
-			/*if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+			/*if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -1060,7 +1060,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'INVOICE_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 
@@ -1213,7 +1213,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 	        ),
 	        'border-left' => true, // add left line separator
 	    );
-	    if ($conf->global->PRODUCT_USE_UNITS) {
+	    if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 	        $this->cols['unit']['status'] = true;
 	    }
 
diff --git a/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php b/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
index a5739a53153..dbf4ef5040c 100644
--- a/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
+++ b/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
@@ -41,10 +41,12 @@ function recruitmentjobpositionPrepareHead($object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	$head[$h][0] = dol_buildpath("/recruitment/recruitmentjobposition_candidature.php", 1).'?id='.$object->id;
-	$head[$h][1] = $langs->trans("Candidatures");
-	$head[$h][2] = 'candidatures';
-	$h++;
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 1) {
+		$head[$h][0] = dol_buildpath("/recruitment/recruitmentjobposition_applications.php", 1).'?id='.$object->id;
+		$head[$h][1] = $langs->trans("Candidatures");
+		$head[$h][2] = 'candidatures';
+		$h++;
+	}
 
 	if (isset($object->fields['note_public']) || isset($object->fields['note_private']))
 	{
diff --git a/htdocs/recruitment/recruitmentcandidature_agenda.php b/htdocs/recruitment/recruitmentcandidature_agenda.php
index f8aff07c352..c125a14c647 100644
--- a/htdocs/recruitment/recruitmentcandidature_agenda.php
+++ b/htdocs/recruitment/recruitmentcandidature_agenda.php
@@ -137,7 +137,7 @@ if ($object->id > 0)
 	$head = recruitmentCandidaturePrepareHead($object);
 
 
-	dol_fiche_head($head, 'agenda', $langs->trans("RecruitmentCandidature"), -1, $object->picto);
+	print dol_get_fiche_head($head, 'agenda', $langs->trans("RecruitmentCandidature"), -1, $object->picto);
 
 	// Object card
 	// ------------------------------------------------------------
@@ -195,7 +195,7 @@ if ($object->id > 0)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 
diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
index e25de998a36..0a0cf4c061d 100644
--- a/htdocs/recruitment/recruitmentcandidature_card.php
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -59,11 +59,13 @@ if (!$res) die("Include of main fails");
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-dol_include_once('/recruitment/class/recruitmentcandidature.class.php');
-dol_include_once('/recruitment/lib/recruitment_recruitmentcandidature.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentcandidature.class.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment_recruitmentcandidature.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("recruitment", "other"));
+$langs->loadLangs(array("recruitment", "other", "users"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
@@ -165,6 +167,104 @@ if (empty($reshook))
 		}
 	}
 
+	if ($action == 'confirm_makeofferordecline' && $permissiontoadd && !GETPOST('cancel', 'alpha')) {
+		if (!(GETPOST('status', 'int') > 0)) {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CloseAs")), null, 'errors');
+			$action = 'makeofferordecline';
+		} else {
+			// prevent browser refresh from closing proposal several times
+			if ($object->status == $object::STATUS_VALIDATED)
+			{
+				$db->begin();
+
+				if (GETPOST('status', 'int') == $object::STATUS_REFUSED) {
+					$result = $object->setStatut($object::STATUS_REFUSED, null, '', $triggermodname);
+					if ($result < 0) {
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
+				} else {
+					$result = $object->setStatut($object::STATUS_CONTRACT_PROPOSED, null, '', $triggermodname);
+					if ($result < 0) {
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
+				}
+
+				if (!$error)
+				{
+					$db->commit();
+				} else {
+					$db->rollback();
+				}
+			}
+		}
+	}
+
+	if ($action == 'confirm_closeas' && $permissiontoadd && !GETPOST('cancel', 'alpha')) {
+		if (!(GETPOST('status', 'int') > 0)) {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CloseAs")), null, 'errors');
+			$action = 'makeofferordecline';
+		} else {
+			// prevent browser refresh from closing proposal several times
+			if ($object->status == $object::STATUS_CONTRACT_PROPOSED)
+			{
+				$db->begin();
+
+				if (GETPOST('status', 'int') == $object::STATUS_CONTRACT_REFUSED) {
+					$result = $object->setStatut($object::STATUS_CONTRACT_REFUSED, null, '', $triggermodname);
+					if ($result < 0) {
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
+				} else {
+					$result = $object->setStatut($object::STATUS_CONTRACT_SIGNED, null, '', $triggermodname);
+					if ($result < 0) {
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
+				}
+
+				if (!$error)
+				{
+					$db->commit();
+				} else {
+					$db->rollback();
+				}
+			}
+		}
+	}
+
+	// Create user from a member
+	if ($action == 'confirm_create_user' && $confirm == 'yes' && $user->rights->user->user->creer) {
+		if ($result > 0) {
+			$jobposition = new RecruitmentJobPosition($db);
+			$jobposition->fetch($object->fk_recruitmentjobposition);
+
+			// Creation user
+			$nuser = new User($db);
+			$nuser->login = GETPOST('login', 'alphanohtml');
+			$nuser->fk_soc = 0;
+			$nuser->employee = 1;
+			$nuser->firstname = $object->firstname;
+			$nuser->lastname = $object->lastname;
+			$nuser->personal_mobile = $object->phone;
+			$nuser->birth = $object->date_birth;
+			$nuser->salary = $object->remuneration_proposed;
+			$nuser->fk_user = $jobposition->fk_user_supervisor; // Supervisor
+
+			$result = $nuser->create($user);
+
+			if ($result < 0) {
+				$langs->load("errors");
+				setEventMessages($langs->trans($nuser->error), null, 'errors');
+				$action = 'create_user';
+			} else {
+				setEventMessages($langs->trans("NewUserCreated", $nuser->login), null, 'mesgs');
+				$action = '';
+			}
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action = 'create_user';
+		}
+	}
+
 	// Actions to send emails
 	$triggersendname = 'RECRUITMENTCANDIDATURE_SENTBYMAIL';
 	$autocopy = 'MAIN_MAIL_AUTOCOPY_RECRUITMENTCANDIDATURE_TO';
@@ -216,7 +316,7 @@ if ($action == 'create')
 	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 
-	dol_fiche_head(array(), '');
+	print dol_get_fiche_head(array(), '');
 
 	// Set some default values
 	//if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue';
@@ -231,12 +331,12 @@ if ($action == 'create')
 
 	print '</table>'."\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
 	print '&nbsp; ';
-	print '<input type="'.($backtopage ? "submit" : "button").'" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
+	print '<input type="'.($backtopage ? "submit" : "button").'" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
 	print '</div>';
 
 	print '</form>';
@@ -256,7 +356,7 @@ if (($id || $ref) && $action == 'edit')
 	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent tableforfieldedit">'."\n";
 
@@ -268,10 +368,10 @@ if (($id || $ref) && $action == 'edit')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
-	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+	print ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
@@ -283,7 +383,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$res = $object->fetch_optionals();
 
 	$head = recruitmentcandidaturePrepareHead($object);
-	dol_fiche_head($head, 'card', $langs->trans("RecruitmentCandidature"), -1, $object->picto);
+	print dol_get_fiche_head($head, 'card', $langs->trans("RecruitmentCandidature"), -1, $object->picto);
 
 	$formconfirm = '';
 
@@ -302,21 +402,52 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneAsk', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
 	}
 
-	// Confirmation of action xxxx
-	if ($action == 'xxx')
+	if ($action == 'makeofferordecline')
 	{
-		$formquestion = array();
-		/*
-		$forcecombo=0;
-		if ($conf->browser->name == 'ie') $forcecombo = 1;	// There is a bug in IE10 that make combo inside popup crazy
+		$langs->load("propal");
+
+		//Form to close proposal (signed or not)
 		$formquestion = array(
-			// 'text' => $langs->trans("ConfirmClone"),
-			// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
-			// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
-			// array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
+			array('type' => 'select', 'name' => 'status', 'label' => '<span class="fieldrequired">'.$langs->trans("CloseAs").'</span>', 'values' => array($object::STATUS_CONTRACT_PROPOSED => $object->LibStatut($object::STATUS_CONTRACT_PROPOSED), $object::STATUS_REFUSED => $object->LibStatut($object::STATUS_REFUSED))),
+			array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"), 'value' => '')				// Field to complete private note (not replace)
 		);
-		*/
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
+
+		$text = '';
+
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetAcceptedRefused'), $text, 'confirm_makeofferordecline', $formquestion, '', 1, 250);
+	}
+
+	if ($action == 'closeas')
+	{
+		$langs->load("propal");
+
+		//Form to close proposal (signed or not)
+		$formquestion = array(
+			array('type' => 'select', 'name' => 'status', 'label' => '<span class="fieldrequired">'.$langs->trans("CloseAs").'</span>', 'values' => array($object::STATUS_CONTRACT_SIGNED => $object->LibStatut($object::STATUS_CONTRACT_SIGNED), $object::STATUS_CONTRACT_REFUSED => $object->LibStatut($object::STATUS_CONTRACT_REFUSED))),
+			array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"), 'value' => '')				// Field to complete private note (not replace)
+		);
+
+		$text = '';
+
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetAcceptedRefused'), $text, 'confirm_closeas', $formquestion, '', 1, 250);
+	}
+
+	// Confirm create user
+	if ($action == 'create_user') {
+		$login = (GETPOSTISSET('login') ? GETPOST('login', 'alphanohtml') : $object->login);
+		if (empty($login)) {
+			// Full firstname and name separated with a dot : firstname.name
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+			$login = dol_buildlogin($object->lastname, $object->firstname);
+		}
+		if (empty($login)) $login = strtolower(substr($object->firstname, 0, 4)).strtolower(substr($object->lastname, 0, 4));
+
+		// Create a form array
+		$formquestion = array(
+			array('label' => $langs->trans("LoginToCreate"), 'type' => 'text', 'name' => 'login', 'value' => $login)
+		);
+		$text .= $langs->trans("ConfirmCreateLogin");
+		print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("CreateDolibarrLogin"), $text, "confirm_create_user", $formquestion, 'yes');
 	}
 
 	// Call Hook formConfirm
@@ -396,7 +527,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	/*
@@ -500,12 +631,21 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				}
 			}
 
-			// Refuse - Decline
-			if ($object->status >= $object::STATUS_VALIDATED && $object->status < $object::STATUS_REFUSED)
+			// Make offer - Refuse - Decline
+			if ($object->status >= $object::STATUS_VALIDATED && $object->status < $object::STATUS_CONTRACT_PROPOSED)
 			{
 				if ($permissiontoadd)
 				{
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_decline&confirm=yes">'.$langs->trans("Decline").'</a>';
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=makeofferordecline">'.$langs->trans("MakeOffer").' / '.$langs->trans("Decline").'</a>';
+				}
+			}
+
+			// Contract refused / accepted
+			if ($object->status == $object::STATUS_CONTRACT_PROPOSED)
+			{
+				if ($permissiontoadd)
+				{
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=closeas">'.$langs->trans("Accept").' / '.$langs->trans("Decline").'</a>';
 				}
 			}
 
@@ -515,30 +655,34 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=recruitmentcandidature">'.$langs->trans("ToClone").'</a>'."\n";
 			}
 
-			/*
-			if ($permissiontoadd)
+			// Button to convert into a user
+			if ($object->status == $object::STATUS_CONTRACT_SIGNED)
 			{
-				if ($object->status == $object::STATUS_ENABLED)
-				{
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=disable">'.$langs->trans("Disable").'</a>'."\n";
-				}
-				else
-				{
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=enable">'.$langs->trans("Enable").'</a>'."\n";
+				if ($user->rights->user->user->creer) {
+					// TODO Check if a user already exists
+					$useralreadyexists = 0;
+					if (empty($useralreadyexists)) {
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=create_user">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
+					} else {
+						print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
+					}
+				} else {
+					print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrLogin")."</font></div>";
 				}
 			}
+
+			// Cancel
 			if ($permissiontoadd)
 			{
 				if ($object->status == $object::STATUS_VALIDATED)
 				{
 					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close">'.$langs->trans("Cancel").'</a>'."\n";
 				}
-				else
+				elseif ($object->status == $object::STATUS_REFUSED || $object->status == $object::STATUS_CANCELED || $object->status == $object::STATUS_CONTRACT_REFUSED)
 				{
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen">'.$langs->trans("Re-Open").'</a>'."\n";
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_reopen&confirm=yes&token='.newToken().'">'.$langs->trans("Re-Open").'</a>'."\n";
 				}
 			}
-			*/
 
 			// Delete (need delete permission, or if draft, just need create/modify permission)
 			if ($permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd))
diff --git a/htdocs/recruitment/recruitmentcandidature_document.php b/htdocs/recruitment/recruitmentcandidature_document.php
index 780447ae804..1c801f27fd4 100644
--- a/htdocs/recruitment/recruitmentcandidature_document.php
+++ b/htdocs/recruitment/recruitmentcandidature_document.php
@@ -77,7 +77,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
-if ($id > 0 || !empty($ref)) $upload_dir = $conf->recruitment->multidir_output[$object->entity ? $object->entity : $conf->entity]."/recruitmentcandidature/".dol_sanitizeFileName($object->ref);
+if ($id > 0 || !empty($ref)) $upload_dir = $conf->recruitment->multidir_output[$object->entity ? $object->entity : $conf->entity]."/recruitmentcandidature/".get_exdir(0, 0, 0, 1, $object);
 
 // Security check - Protection if external user
 //if ($user->socid > 0) accessforbidden();
@@ -113,7 +113,7 @@ if ($object->id)
 	 */
 	$head = recruitmentCandidaturePrepareHead($object);
 
-	dol_fiche_head($head, 'document', $langs->trans("RecruitmentCandidature"), -1, $object->picto);
+	print dol_get_fiche_head($head, 'document', $langs->trans("RecruitmentCandidature"), -1, $object->picto);
 
 
 	// Build file list
@@ -186,7 +186,7 @@ if ($object->id)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$modulepart = 'recruitment';
 	$permission = $user->rights->recruitment->recruitmentjobposition->write;
diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
index 1db036f6878..70d3bc3be4d 100644
--- a/htdocs/recruitment/recruitmentcandidature_list.php
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -267,7 +267,7 @@ $sql .= $hookmanager->resPrint;
 
 /* If a group by is required
 $sql.= " GROUP BY ";
-foreach($object->fields as $key => $val)
+foreach ($object->fields as $key => $val)
 {
 	$sql.='t.'.$key.', ';
 }
@@ -277,9 +277,9 @@ if (! empty($extrafields->attributes[$object->table_element]['label'])) {
 }
 // Add where from hooks
 $parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListGroupBy',$parameters);    // Note that $action and $object may have been modified by hook
+$reshook=$hookmanager->executeHooks('printFieldListGroupBy', $parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
-$sql=preg_replace('/,\s*$/','', $sql);
+$sql=preg_replace('/,\s*$/', '', $sql);
 */
 
 $sql .= $db->order($sortfield, $sortorder);
@@ -433,7 +433,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
diff --git a/htdocs/recruitment/recruitmentcandidature_note.php b/htdocs/recruitment/recruitmentcandidature_note.php
index 81d227c5da6..c0673b35c52 100644
--- a/htdocs/recruitment/recruitmentcandidature_note.php
+++ b/htdocs/recruitment/recruitmentcandidature_note.php
@@ -95,7 +95,7 @@ if ($id > 0 || !empty($ref))
 
 	$head = recruitmentCandidaturePrepareHead($object);
 
-	dol_fiche_head($head, 'note', $langs->trans("RecruitmentCandidature"), -1, $object->picto);
+	print dol_get_fiche_head($head, 'note', $langs->trans("RecruitmentCandidature"), -1, $object->picto);
 
 	// Object card
 	// ------------------------------------------------------------
@@ -155,7 +155,7 @@ if ($id > 0 || !empty($ref))
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/recruitment/recruitmentindex.php b/htdocs/recruitment/recruitmentindex.php
index 93e4c53eb7c..a8649abbd21 100644
--- a/htdocs/recruitment/recruitmentindex.php
+++ b/htdocs/recruitment/recruitmentindex.php
@@ -114,7 +114,7 @@ if ($conf->use_javascript_ajax)
 		$listofstatus = array(0, 1, 3, 9);
 		foreach ($listofstatus as $status)
 		{
-			$dataseries[] = array(dol_html_entity_decode($staticrecruitmentjobposition->LibStatut($status, 1), ENT_QUOTES), (isset($vals[$status]) ? (int) $vals[$status] : 0));
+			$dataseries[] = array(dol_html_entity_decode($staticrecruitmentjobposition->LibStatut($status, 1), ENT_QUOTES | ENT_HTML5), (isset($vals[$status]) ? (int) $vals[$status] : 0));
 			if ($status == RecruitmentJobPosition::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
 			if ($status == RecruitmentJobPosition::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus4;
 			if ($status == RecruitmentJobPosition::STATUS_RECRUITED) $colorseries[$status] = $badgeStatus6;
@@ -190,7 +190,7 @@ if ($conf->use_javascript_ajax)
 		$listofstatus = array(0, 1, 3, 5, 8, 9);
 		foreach ($listofstatus as $status)
 		{
-			$dataseries[] = array(dol_html_entity_decode($staticrecruitmentcandidature->LibStatut($status, 1), ENT_QUOTES), (isset($vals[$status]) ? (int) $vals[$status] : 0));
+			$dataseries[] = array(dol_html_entity_decode($staticrecruitmentcandidature->LibStatut($status, 1), ENT_QUOTES | ENT_HTML5), (isset($vals[$status]) ? (int) $vals[$status] : 0));
 			if ($status == RecruitmentCandidature::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
 			if ($status == RecruitmentCandidature::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;
 			if ($status == RecruitmentCandidature::STATUS_CONTRACT_PROPOSED) $colorseries[$status] = $badgeStatus4;
@@ -323,12 +323,14 @@ $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 // Last modified job position
 if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitmentjobposition->read)
 {
-	$sql = "SELECT s.rowid, s.ref, s.label, s.date_creation, s.tms, s.status";
+	$sql = "SELECT s.rowid, s.ref, s.label, s.date_creation, s.tms, s.status, COUNT(rc.rowid) as nbapplications";
 	$sql .= " FROM ".MAIN_DB_PREFIX."recruitment_recruitmentjobposition as s";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature as rc ON rc.fk_recruitmentjobposition = s.rowid";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql .= " WHERE s.entity IN (".getEntity($staticrecruitmentjobposition->element).")";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 	if ($socid)	$sql .= " AND s.fk_soc = $socid";
+	$sql .= " GROUP BY s.rowid, s.ref, s.label, s.date_creation, s.tms, s.status";
 	$sql .= " ORDER BY s.tms DESC";
 	$sql .= $db->plimit($max, 0);
 
@@ -338,11 +340,15 @@ if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitme
 		$num = $db->num_rows($resql);
 		$i = 0;
 
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print '<th colspan="2">';
 		print $langs->trans("BoxTitleLatestModifiedJobPositions", $max);
 		print '</th>';
+		print '<th class="right">';
+		print $langs->trans("Applications");
+		print '</th>';
 		print '<th class="right" colspan="2"><a href="'.DOL_URL_ROOT.'/recruitment/recruitmentjobposition_list.php?sortfield=t.tms&sortorder=DESC">'.$langs->trans("FullList").'</th>';
 		print '</tr>';
 		if ($num)
@@ -360,8 +366,11 @@ if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitme
 				print '<td class="nowrap">'.$staticrecruitmentjobposition->getNomUrl(1, '').'</td>';
 				print '<td class="right nowrap">';
 				print "</td>";
+				print '<td class="right">';
+				print $objp->nbapplications;
+				print '</td>';
 				print '<td class="right nowrap">'.dol_print_date($db->jdate($objp->tms), 'day')."</td>";
-				print '<td class="right nowrap">';
+				print '<td class="right nowrap" width="16">';
 				print $staticrecruitmentjobposition->getLibStatut(3);
 				print "</td>";
 				print '</tr>';
@@ -372,7 +381,9 @@ if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitme
 		} else {
 			print '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 		}
-		print "</table><br>";
+		print "</table>";
+		print "</div>";
+		print "<br>";
 	} else {
 		dol_print_error($db);
 	}
@@ -397,6 +408,7 @@ if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitme
 		$num = $db->num_rows($resql);
 		$i = 0;
 
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print '<th colspan="2">';
@@ -422,7 +434,7 @@ if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitme
 				print '<td class="right nowrap">';
 				print "</td>";
 				print '<td class="right nowrap">'.dol_print_date($db->jdate($objp->tms), 'day')."</td>";
-				print '<td class="right nowrap">';
+				print '<td class="right nowrap" width="16">';
 				print $staticrecruitmentcandidature->getLibStatut(3);
 				print "</td>";
 				print '</tr>';
@@ -433,7 +445,9 @@ if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitme
 		} else {
 			print '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 		}
-		print "</table><br>";
+		print "</table>";
+		print "</div>";
+		print "<br>";
 	} else {
 		dol_print_error($db);
 	}
diff --git a/htdocs/recruitment/recruitmentjobposition_agenda.php b/htdocs/recruitment/recruitmentjobposition_agenda.php
index 2984deb0443..97ea279e8ae 100644
--- a/htdocs/recruitment/recruitmentjobposition_agenda.php
+++ b/htdocs/recruitment/recruitmentjobposition_agenda.php
@@ -137,7 +137,7 @@ if ($object->id > 0)
 	$head = recruitmentjobpositionPrepareHead($object);
 
 
-	dol_fiche_head($head, 'agenda', $langs->trans("RecruitmentJobPosition"), -1, $object->picto);
+	print dol_get_fiche_head($head, 'agenda', $langs->trans("RecruitmentJobPosition"), -1, $object->picto);
 
 	// Object card
 	// ------------------------------------------------------------
@@ -152,15 +152,15 @@ if ($object->id > 0)
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	*/
 	// Project
-	if (! empty($conf->projet->enabled))
+	if (!empty($conf->projet->enabled))
 	{
 		$langs->load("projects");
-		$morehtmlref .= $langs->trans('Project') . ' ';
+		$morehtmlref .= $langs->trans('Project').' ';
 		if ($permissiontoadd)
 		{
 			if ($action != 'classify')
 				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-			$morehtmlref .=' : ';
+			$morehtmlref .= ' : ';
 			if ($action == 'classify') {
 				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
 				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
@@ -170,10 +170,10 @@ if ($object->id > 0)
 				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 				$morehtmlref .= '</form>';
 			} else {
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 			}
 		} else {
-			if (! empty($object->fk_project)) {
+			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
 				$morehtmlref .= ': '.$proj->getNomUrl();
@@ -195,7 +195,7 @@ if ($object->id > 0)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 
diff --git a/htdocs/recruitment/recruitmentjobposition_candidature.php b/htdocs/recruitment/recruitmentjobposition_applications.php
similarity index 79%
rename from htdocs/recruitment/recruitmentjobposition_candidature.php
rename to htdocs/recruitment/recruitmentjobposition_applications.php
index a945df25bfc..ef151beb8d5 100644
--- a/htdocs/recruitment/recruitmentjobposition_candidature.php
+++ b/htdocs/recruitment/recruitmentjobposition_applications.php
@@ -16,9 +16,9 @@
  */
 
 /**
- *   	\file       recruitmentjobposition_candidature.php
+ *   	\file       recruitmentjobposition_applications.php
  *		\ingroup    recruitment
- *		\brief      Page to see/add candidatures
+ *		\brief      Page to see/add applications of a job position
  */
 
 //if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
@@ -202,7 +202,7 @@ if ($action == 'create')
 	// Set some default values
 	if (!GETPOSTISSET('fk_user_recruiter')) $_POST['fk_user_recruiter'] = $user->id;
 
-	dol_fiche_head(array(), '');
+	print dol_get_fiche_head(array(), '');
 
 	print '<table class="border centpercent tableforfieldcreate">'."\n";
 
@@ -214,12 +214,12 @@ if ($action == 'create')
 
 	print '</table>'."\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
 	print '&nbsp; ';
-	print '<input type="'.($backtopage ? "submit" : "button").'" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
+	print '<input type="'.($backtopage ? "submit" : "button").'" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
 	print '</div>';
 
 	print '</form>';
@@ -239,7 +239,7 @@ if (($id || $ref) && $action == 'edit')
 	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent tableforfieldedit">'."\n";
 
@@ -251,10 +251,10 @@ if (($id || $ref) && $action == 'edit')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
-	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+	print ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
@@ -266,7 +266,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$res = $object->fetch_optionals();
 
 	$head = recruitmentjobpositionPrepareHead($object);
-	dol_fiche_head($head, 'candidatures', $langs->trans("RecruitmentCandidatures"), -1, $object->picto);
+	print dol_get_fiche_head($head, 'candidatures', $langs->trans("RecruitmentCandidatures"), -1, $object->picto);
 
 	$formconfirm = '';
 
@@ -382,7 +382,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	/*
@@ -438,124 +438,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print "</form>\n";
 	}
 
-
-	// Buttons for actions
-
-	if ($action != 'presend' && $action != 'editline') {
-		print '<div class="tabsAction">'."\n";
-		$parameters = array();
-		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-		if (empty($reshook))
-		{
-			// Send
-			if (empty($user->socid)) {
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>'."\n";
-			}
-
-			// Back to draft
-			if ($object->status == $object::STATUS_VALIDATED)
-			{
-				if ($permissiontoadd)
-				{
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes">'.$langs->trans("SetToDraft").'</a>';
-				}
-			}
-
-			// Modify
-			if ($permissiontoadd)
-			{
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit">'.$langs->trans("Modify").'</a>'."\n";
-			} else {
-				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
-			}
-
-			// Validate
-			if ($object->status == $object::STATUS_DRAFT)
-			{
-				if ($permissiontoadd)
-				{
-					if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0))
-					{
-						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes">'.$langs->trans("Validate").'</a>';
-					} else {
-						$langs->load("errors");
-						print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
-					}
-				}
-			}
-
-			// Clone
-			if ($permissiontoadd)
-			{
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=recruitmentjobposition">'.$langs->trans("ToClone").'</a>'."\n";
-			}
-
-			/*
-			if ($permissiontoadd)
-			{
-				if ($object->status == $object::STATUS_ENABLED)
-				{
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=disable">'.$langs->trans("Disable").'</a>'."\n";
-				}
-				else
-				{
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=enable">'.$langs->trans("Enable").'</a>'."\n";
-				}
-			}
-			if ($permissiontoadd)
-			{
-				if ($object->status == $object::STATUS_VALIDATED)
-				{
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close">'.$langs->trans("Cancel").'</a>'."\n";
-				}
-				else
-				{
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen">'.$langs->trans("Re-Open").'</a>'."\n";
-				}
-			}
-			*/
-
-			// Delete (need delete permission, or if draft, just need create/modify permission)
-			if ($permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd))
-			{
-				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
-			} else {
-				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
-			}
-		}
-		print '</div>'."\n";
-	}
-
-
-	// Select mail models is same action as presend
-	if (GETPOST('modelselected')) {
-		$action = 'presend';
-	}
-
-	if ($action != 'presend')
-	{
-		print '<div class="fichecenter"><div class="fichehalfleft">';
-		print '<a name="builddoc"></a>'; // ancre
-
-
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
-
-		print '</div></div></div>';
-	}
-
-	//Select mail models is same action as presend
-	if (GETPOST('modelselected')) $action = 'presend';
-
-	// Presend form
-	$modelmail = 'recruitmentjobposition';
-	$defaulttopic = 'InformationMessage';
-	$diroutput = $conf->recruitment->dir_output;
-	$trackid = 'recruitmentjobposition'.$object->id;
-
-	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
+	print '<br>'.$langs->trans("FeatureNotYetAvailable");
 }
 
 // End of page
diff --git a/htdocs/recruitment/recruitmentjobposition_card.php b/htdocs/recruitment/recruitmentjobposition_card.php
index d4a115962f2..78736eed3ae 100644
--- a/htdocs/recruitment/recruitmentjobposition_card.php
+++ b/htdocs/recruitment/recruitmentjobposition_card.php
@@ -228,9 +228,9 @@ if ($action == 'create')
 	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 
 	// Set some default values
-	if (! GETPOSTISSET('fk_user_recruiter')) $_POST['fk_user_recruiter'] = $user->id;
+	if (!GETPOSTISSET('fk_user_recruiter')) $_POST['fk_user_recruiter'] = $user->id;
 
-	dol_fiche_head(array(), '');
+	print dol_get_fiche_head(array(), '');
 
 	print '<table class="border centpercent tableforfieldcreate">'."\n";
 
@@ -242,12 +242,12 @@ if ($action == 'create')
 
 	print '</table>'."\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
 	print '&nbsp; ';
-	print '<input type="'.($backtopage ? "submit" : "button").'" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
+	print '<input type="'.($backtopage ? "submit" : "button").'" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
 	print '</div>';
 
 	print '</form>';
@@ -267,7 +267,7 @@ if (($id || $ref) && $action == 'edit')
 	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent tableforfieldedit">'."\n";
 
@@ -279,10 +279,10 @@ if (($id || $ref) && $action == 'edit')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
-	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+	print ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
@@ -294,7 +294,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$res = $object->fetch_optionals();
 
 	$head = recruitmentjobpositionPrepareHead($object);
-	dol_fiche_head($head, 'card', $langs->trans("RecruitmentJobPosition"), -1, $object->picto);
+	print dol_get_fiche_head($head, 'card', $langs->trans("RecruitmentJobPosition"), -1, $object->picto);
 
 	$formconfirm = '';
 
@@ -357,27 +357,27 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	*/
 	// Project
-	if (! empty($conf->projet->enabled))
+	if (!empty($conf->projet->enabled))
 	{
 		$langs->load("projects");
-		$morehtmlref.=$langs->trans('Project') . ' ';
+		$morehtmlref .= $langs->trans('Project').' ';
 		if ($permissiontoadd)
 		{
-			if ($action != 'classify') $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
-			$morehtmlref.=' : ';
+			if ($action != 'classify') $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a>';
+			$morehtmlref .= ' : ';
 			if ($action == 'classify') {
 				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-				$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-				$morehtmlref.='<input type="hidden" name="action" value="classin">';
-				$morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
-				$morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-				$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-				$morehtmlref.='</form>';
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
 			} else {
-				$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 			}
 		} else {
-			if (! empty($object->fk_project)) {
+			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
 				$morehtmlref .= ': '.$proj->getNomUrl();
@@ -398,8 +398,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<table class="border centpercent tableforfield">'."\n";
 
 	// Common attributes
-	$keyforbreak='description';	// We change column just after this field
-	unset($object->fields['fk_project']);				// Hide field already shown in banner
+	$keyforbreak = 'description'; // We change column just after this field
+	unset($object->fields['fk_project']); // Hide field already shown in banner
 	//unset($object->fields['fk_soc']);					// Hide field already shown in banner
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
 
@@ -412,7 +412,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	/*
@@ -568,11 +568,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		// Documents
 		if ($includedocgeneration) {
 			$objref = dol_sanitizeFileName($object->ref);
-			$relativepath = $objref . '/' . $objref . '.pdf';
+			$relativepath = $objref.'/'.$objref.'.pdf';
 			$filedir = $conf->recruitment->dir_output.'/'.$object->element.'/'.$objref;
-			$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
-			$genallowed = $user->rights->recruitment->recruitmentjobposition->read;	// If you can read, you can build the PDF to read content
-			$delallowed = $user->rights->recruitment->recruitmentjobposition->write;	// If you can create/edit, you can remove a file on card
+			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+			$genallowed = $user->rights->recruitment->recruitmentjobposition->read; // If you can read, you can build the PDF to read content
+			$delallowed = $user->rights->recruitment->recruitmentjobposition->write; // If you can create/edit, you can remove a file on card
 			print $formfile->showdocuments('recruitment:RecruitmentJobPosition', $object->element.'/'.$objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
 		}
 
diff --git a/htdocs/recruitment/recruitmentjobposition_document.php b/htdocs/recruitment/recruitmentjobposition_document.php
index e34f5193bd1..3005b4cc1be 100644
--- a/htdocs/recruitment/recruitmentjobposition_document.php
+++ b/htdocs/recruitment/recruitmentjobposition_document.php
@@ -77,7 +77,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
-if ($id > 0 || !empty($ref)) $upload_dir = $conf->recruitment->multidir_output[$object->entity ? $object->entity : $conf->entity]."/recruitmentjobposition/".dol_sanitizeFileName($object->ref);
+if ($id > 0 || !empty($ref)) $upload_dir = $conf->recruitment->multidir_output[$object->entity ? $object->entity : $conf->entity]."/recruitmentjobposition/".get_exdir(0, 0, 0, 1, $object);
 
 // Security check - Protection if external user
 //if ($user->socid > 0) accessforbidden();
@@ -113,7 +113,7 @@ if ($object->id)
 	 */
 	$head = recruitmentjobpositionPrepareHead($object);
 
-	dol_fiche_head($head, 'document', $langs->trans("RecruitmentJobPosition"), -1, $object->picto);
+	print dol_get_fiche_head($head, 'document', $langs->trans("RecruitmentJobPosition"), -1, $object->picto);
 
 
 	// Build file list
@@ -137,15 +137,15 @@ if ($object->id)
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	*/
 	// Project
-	if (! empty($conf->projet->enabled))
+	if (!empty($conf->projet->enabled))
 	{
 		$langs->load("projects");
-		$morehtmlref .= $langs->trans('Project') . ' ';
+		$morehtmlref .= $langs->trans('Project').' ';
 		if ($permissiontoadd)
 		{
 			if ($action != 'classify')
 				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-			$morehtmlref .=' : ';
+			$morehtmlref .= ' : ';
 			if ($action == 'classify') {
 				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
 				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
@@ -155,10 +155,10 @@ if ($object->id)
 				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 				$morehtmlref .= '</form>';
 			} else {
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 			}
 		} else {
-			if (! empty($object->fk_project)) {
+			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
 				$morehtmlref .= ': '.$proj->getNomUrl();
@@ -186,7 +186,7 @@ if ($object->id)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$modulepart = 'recruitment';
 	$permission = $user->rights->recruitment->recruitmentjobposition->write;
diff --git a/htdocs/recruitment/recruitmentjobposition_list.php b/htdocs/recruitment/recruitmentjobposition_list.php
index 24c98a3fbb9..1891d9ce822 100644
--- a/htdocs/recruitment/recruitmentjobposition_list.php
+++ b/htdocs/recruitment/recruitmentjobposition_list.php
@@ -153,6 +153,7 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 	}
 }
 $object->fields = dol_sort_array($object->fields, 'position');
+$arrayfields['nbapplications'] = array('label'=>'Applications', 'checked'=>1, 'enabled'=>1, 'position'=>90);
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
 $permissiontoread = $user->rights->recruitment->recruitmentjobposition->read;
@@ -242,7 +243,9 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
+$sql .= ", COUNT(rc.rowid) as nbapplications";
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature as rc ON rc.fk_recruitmentjobposition = t.rowid";
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 if ($object->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (".getEntity($object->element).")";
 else $sql .= " WHERE 1 = 1";
@@ -265,22 +268,21 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
-/* If a group by is required
-$sql.= " GROUP BY ";
-foreach($object->fields as $key => $val)
+/* If a group by is required */
+$sql .= " GROUP BY ";
+foreach ($object->fields as $key => $val)
 {
-	$sql.='t.'.$key.', ';
+	$sql .= 't.'.$key.', ';
 }
 // Add fields from extrafields
-if (! empty($extrafields->attributes[$object->table_element]['label'])) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
 }
 // Add where from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListGroupBy',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql=preg_replace('/,\s*$/','', $sql);
-*/
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql = preg_replace('/,\s*$/', '', $sql);
 
 $sql .= $db->order($sortfield, $sortorder);
 
@@ -386,7 +388,7 @@ print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sort
 $topicmail = "SendRecruitmentJobPositionRef";
 $modelmail = "recruitmentjobposition";
 $objecttmp = new RecruitmentJobPosition($db);
-$trackid = 'xxxx'.$object->id;
+$trackid = 'recruitmentjobposition'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($search_all)
@@ -433,7 +435,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
@@ -442,11 +444,14 @@ foreach ($object->fields as $key => $val)
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
-
 // Fields from hook
 $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
+if (!empty($arrayfields['nbapplications']['checked']))
+{
+	print '<td class="liste_titre"></td>';
+}
 // Action column
 print '<td class="liste_titre maxwidthsearch">';
 $searchpicto = $form->showFilterButtons();
@@ -476,6 +481,10 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
+if (!empty($arrayfields['nbapplications']['checked']))
+{
+	print '<td class="liste_titre">'.$langs->trans("Applications").'</td>';
+}
 // Action column
 print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 print '</tr>'."\n";
@@ -508,7 +517,7 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	print '<tr class="oddeven">';
 	foreach ($object->fields as $key => $val)
 	{
-		$cssforfield = (empty($val['css']) ? '' : $val['css']);
+		$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
 		elseif ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
 
@@ -538,6 +547,10 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
+	if (!empty($arrayfields['nbapplications']['checked']))
+	{
+		print '<td class="right">'.$obj->nbapplications.'</td>';
+	}
 	// Action column
 	print '<td class="nowrap center">';
 	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
diff --git a/htdocs/recruitment/recruitmentjobposition_note.php b/htdocs/recruitment/recruitmentjobposition_note.php
index 12de0611cdf..2fe2f5a3257 100644
--- a/htdocs/recruitment/recruitmentjobposition_note.php
+++ b/htdocs/recruitment/recruitmentjobposition_note.php
@@ -95,7 +95,7 @@ if ($id > 0 || !empty($ref))
 
 	$head = recruitmentjobpositionPrepareHead($object);
 
-	dol_fiche_head($head, 'note', $langs->trans("RecruitmentJobPosition"), -1, $object->picto);
+	print dol_get_fiche_head($head, 'note', $langs->trans("RecruitmentJobPosition"), -1, $object->picto);
 
 	// Object card
 	// ------------------------------------------------------------
@@ -110,15 +110,15 @@ if ($id > 0 || !empty($ref))
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	*/
 	// Project
-	if (! empty($conf->projet->enabled))
+	if (!empty($conf->projet->enabled))
 	{
 		$langs->load("projects");
-		$morehtmlref .= $langs->trans('Project') . ' ';
+		$morehtmlref .= $langs->trans('Project').' ';
 		if ($permissiontoadd)
 		{
 			if ($action != 'classify')
 				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-			$morehtmlref .=' : ';
+			$morehtmlref .= ' : ';
 			if ($action == 'classify') {
 				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
 				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
@@ -128,10 +128,10 @@ if ($id > 0 || !empty($ref))
 				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 				$morehtmlref .= '</form>';
 			} else {
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 			}
 		} else {
-			if (! empty($object->fk_project)) {
+			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
 				$morehtmlref .= ': '.$proj->getNomUrl();
@@ -155,7 +155,7 @@ if ($id > 0 || !empty($ref))
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/resource/agenda.php b/htdocs/resource/agenda.php
index aaf9b451414..903a9653056 100644
--- a/htdocs/resource/agenda.php
+++ b/htdocs/resource/agenda.php
@@ -46,10 +46,10 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 if (GETPOST('actioncode', 'array'))
 {
-    $actioncode = GETPOST('actioncode', 'array', 3);
-    if (!count($actioncode)) $actioncode = '0';
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) $actioncode = '0';
 } else {
-    $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
@@ -89,19 +89,19 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Cancel
-    if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-    {
-        header("Location: ".$backtopage);
-        exit;
-    }
+	// Cancel
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage))
+	{
+		header("Location: ".$backtopage);
+		exit;
+	}
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $actioncode = '';
-        $search_agenda_label = '';
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$actioncode = '';
+		$search_agenda_label = '';
+	}
 }
 
 
@@ -131,40 +131,40 @@ if ($object->id > 0)
 	$head = resource_prepare_head($object);
 
 	$titre = $langs->trans("ResourceSingular");
-	dol_fiche_head($head, 'agenda', $titre, -1, $picto);
+	print dol_get_fiche_head($head, 'agenda', $titre, -1, $picto);
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/resource/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/resource/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    $morehtmlref = '<div class="refidno">';
-    $morehtmlref .= '</div>';
+	$morehtmlref = '<div class="refidno">';
+	$morehtmlref .= '</div>';
 
-    $shownav = 1;
-    if ($user->socid && !in_array('resource', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+	$shownav = 1;
+	if ($user->socid && !in_array('resource', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
-    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-    {
-    	$param = '&id='.$object->id.'&socid='.$socid;
-    	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-    	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
+	{
+		$param = '&id='.$object->id.'&socid='.$socid;
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 
 		print_barre_liste($langs->trans("ActionsOnResource"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlcenter, '', 0, 1, 1);
 
-        // List of all actions
+		// List of all actions
 		$filters = array();
-        $filters['search_agenda_label'] = $search_agenda_label;
+		$filters['search_agenda_label'] = $search_agenda_label;
 
-        // TODO Replace this with same code than into list.php
-        show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
-    }
+		// TODO Replace this with same code than into list.php
+		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
+	}
 }
 
 // End of page
diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index e170b038e7a..0909dd93b8e 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -40,7 +40,7 @@ $cancel					= GETPOST('cancel', 'alpha');
 $ref					= GETPOST('ref', 'alpha');
 $description			= GETPOST('description', 'restricthtml');
 $confirm				= GETPOST('confirm', 'aZ09');
-$fk_code_type_resource  = GETPOST('fk_code_type_resource', 'alpha');
+$fk_code_type_resource = GETPOST('fk_code_type_resource', 'alpha');
 $country_id				= GETPOST('country_id', 'int');
 
 // Protection if external user
@@ -212,10 +212,10 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0)
 	if ($action == 'create')
 	{
 		print load_fiche_titre($title, '', 'object_resource');
-		dol_fiche_head('');
+		print dol_get_fiche_head('');
 	} else {
 		$head = resource_prepare_head($object);
-		dol_fiche_head($head, 'resource', $title, -1, 'resource');
+		print dol_get_fiche_head($head, 'resource', $title, -1, 'resource');
 	}
 
 	if ($action == 'create' || $action == 'edit')
@@ -257,7 +257,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0)
 		// Other attributes
 		$parameters = array('objectsrc' => $objectsrc);
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
+		print $hookmanager->resPrint;
 		if (empty($reshook))
 		{
 			print $object->showOptionals($extrafields, 'edit');
@@ -265,12 +265,12 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0)
 
 		print '</table>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
 		print '<input type="submit" class="button" name="save" value="'.$langs->trans($action == "create" ? "Create" : "Modify").'">';
 		print ' &nbsp; &nbsp; ';
-		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 		print '</div>';
 
@@ -279,27 +279,27 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0)
 		$formconfirm = '';
 
 		// Confirm deleting resource line
-	    if ($action == 'delete')
-	    {
-	        $formconfirm = $form->formconfirm("card.php?&id=".$object->id, $langs->trans("DeleteResource"), $langs->trans("ConfirmDeleteResource"), "confirm_delete_resource", '', '', 1);
-	    }
+		if ($action == 'delete')
+		{
+			$formconfirm = $form->formconfirm("card.php?&id=".$object->id, $langs->trans("DeleteResource"), $langs->trans("ConfirmDeleteResource"), "confirm_delete_resource", '', '', 1);
+		}
 
-	    // Print form confirm
-	    print $formconfirm;
+		// Print form confirm
+		print $formconfirm;
 
 
-	    $linkback = '<a href="'.DOL_URL_ROOT.'/resource/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&id='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/resource/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&id='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 
-	    $morehtmlref = '<div class="refidno">';
-	    $morehtmlref .= '</div>';
+		$morehtmlref = '<div class="refidno">';
+		$morehtmlref .= '</div>';
 
 
-	    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-	    print '<div class="fichecenter">';
-	    print '<div class="underbanner clearboth"></div>';
+		print '<div class="fichecenter">';
+		print '<div class="underbanner clearboth"></div>';
 
 		/*---------------------------------------
 		 * View object
@@ -340,7 +340,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0)
 
 		print '<div class="clearboth"></div><br>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 	}
 
 
@@ -365,13 +365,13 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0)
 		}
 		if ($action != "delete" && $action != "create" && $action != "edit")
 		{
-		    // Delete resource
-		    if ($user->rights->resource->delete)
-		    {
-		        print '<div class="inline-block divButAction">';
-		        print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;action=delete&amp;token='.newToken().'" class="butActionDelete">'.$langs->trans('Delete').'</a>';
-		        print '</div>';
-		    }
+			// Delete resource
+			if ($user->rights->resource->delete)
+			{
+				print '<div class="inline-block divButAction">';
+				print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;action=delete&amp;token='.newToken().'" class="butActionDelete">'.$langs->trans('Delete').'</a>';
+				print '</div>';
+			}
 		}
 	}
 	print '</div>';
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index 43756f84405..ef4252f41df 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -52,8 +52,8 @@ class Dolresource extends CommonObject
 	public $mandatory;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_create;
 
 	public $type_label;
@@ -63,79 +63,75 @@ class Dolresource extends CommonObject
 
 	public $oldcopy;
 
-    /**
-     *  Constructor
-     *
-     *  @param	DoliDb		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param	DoliDb		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
-    /**
-     *  Create object 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
-     */
-    public function create($user, $notrigger = 0)
-    {
-        global $conf, $langs, $hookmanager;
-        $error = 0;
+	/**
+	 *  Create object 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
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		global $conf, $langs, $hookmanager;
+		$error = 0;
 
-    	// Clean parameters
+		// Clean parameters
 
-    	if (isset($this->ref)) $this->ref = trim($this->ref);
-    	if (isset($this->description)) $this->description = trim($this->description);
-        if (!is_numeric($this->country_id)) $this->country_id = 0;
-    	if (isset($this->fk_code_type_resource)) $this->fk_code_type_resource = trim($this->fk_code_type_resource);
-    	if (isset($this->note_public)) $this->note_public = trim($this->note_public);
-    	if (isset($this->note_private)) $this->note_private = trim($this->note_private);
+		if (isset($this->ref)) $this->ref = trim($this->ref);
+		if (isset($this->description)) $this->description = trim($this->description);
+		if (!is_numeric($this->country_id)) $this->country_id = 0;
+		if (isset($this->fk_code_type_resource)) $this->fk_code_type_resource = trim($this->fk_code_type_resource);
+		if (isset($this->note_public)) $this->note_public = trim($this->note_public);
+		if (isset($this->note_private)) $this->note_private = trim($this->note_private);
 
 
-    	// Insert request
-    	$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element."(";
+		// Insert request
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element."(";
+		$sql .= "entity,";
+		$sql .= "ref,";
+		$sql .= "description,";
+		$sql .= "fk_country,";
+		$sql .= "fk_code_type_resource,";
+		$sql .= "note_public,";
+		$sql .= "note_private";
+		$sql .= ") VALUES (";
+		$sql .= $conf->entity.", ";
+		$sql .= " ".(!isset($this->ref) ? 'NULL' : "'".$this->db->escape($this->ref)."'").",";
+		$sql .= " ".(!isset($this->description) ? 'NULL' : "'".$this->db->escape($this->description)."'").",";
+		$sql .= " ".($this->country_id > 0 ? $this->country_id : 'null').",";
+		$sql .= " ".(!isset($this->fk_code_type_resource) ? 'NULL' : "'".$this->db->escape($this->fk_code_type_resource)."'").",";
+		$sql .= " ".(!isset($this->note_public) ? 'NULL' : "'".$this->db->escape($this->note_public)."'").",";
+		$sql .= " ".(!isset($this->note_private) ? 'NULL' : "'".$this->db->escape($this->note_private)."'");
+		$sql .= ")";
 
-    	$sql .= "entity,";
-    	$sql .= "ref,";
-    	$sql .= "description,";
-    	$sql .= "fk_country,";
-    	$sql .= "fk_code_type_resource,";
-    	$sql .= "note_public,";
-    	$sql .= "note_private";
+		$this->db->begin();
 
-    	$sql .= ") VALUES (";
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
-    	$sql .= $conf->entity.", ";
-    	$sql .= " ".(!isset($this->ref) ? 'NULL' : "'".$this->db->escape($this->ref)."'").",";
-    	$sql .= " ".(!isset($this->description) ? 'NULL' : "'".$this->db->escape($this->description)."'").",";
-        $sql .= " ".($this->country_id > 0 ? $this->country_id : 'null').",";
-    	$sql .= " ".(!isset($this->fk_code_type_resource) ? 'NULL' : "'".$this->db->escape($this->fk_code_type_resource)."'").",";
-    	$sql .= " ".(!isset($this->note_public) ? 'NULL' : "'".$this->db->escape($this->note_public)."'").",";
-    	$sql .= " ".(!isset($this->note_private) ? 'NULL' : "'".$this->db->escape($this->note_private)."'");
+		if (!$error)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+		}
 
-    	$sql .= ")";
+		if (!$error)
+		{
+			$action = 'create';
 
-    	$this->db->begin();
-
-    	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-    	$resql = $this->db->query($sql);
-    	if (!$resql) {
-    		$error++; $this->errors[] = "Error ".$this->db->lasterror();
-    	}
-
-    	if (!$error)
-    	{
-    		$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
-    	}
-
-    	if (!$error)
-    	{
-    		$action = 'create';
-
-    		// Actions on extra fields
+			// Actions on extra fields
    			if (!$error)
    			{
    				$result = $this->insertExtraFields();
@@ -143,100 +139,100 @@ class Dolresource extends CommonObject
    				{
    					$error++;
    				}
-    		}
-    	}
+			}
+		}
 
-    	if (!$error && !$notrigger)
-    	{
-    		// Call trigger
-    		$result = $this->call_trigger('RESOURCE_CREATE', $user);
-    		if ($result < 0) $error++;
-    		// End call triggers
-    	}
+		if (!$error && !$notrigger)
+		{
+			// Call trigger
+			$result = $this->call_trigger('RESOURCE_CREATE', $user);
+			if ($result < 0) $error++;
+			// End call triggers
+		}
 
-    	// Commit or rollback
-    	if ($error)
-    	{
-    		foreach ($this->errors as $errmsg)
-    		{
-    			dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-    			$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-    		}
-    		$this->db->rollback();
-    		return -1 * $error;
-    	} else {
-    		$this->db->commit();
-    		return $this->id;
-    	}
-    }
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return $this->id;
+		}
+	}
 
-    /**
-     *    Load object in memory from database
-     *
-     *    @param    int		$id     Id of object
-     *    @param	string	$ref	Ref of object
-     *    @return   int         	<0 if KO, >0 if OK
-     */
-    public function fetch($id, $ref = '')
-    {
-    	global $langs;
-    	$sql = "SELECT";
-    	$sql .= " t.rowid,";
-    	$sql .= " t.entity,";
-    	$sql .= " t.ref,";
-    	$sql .= " t.description,";
+	/**
+	 *    Load object in memory from database
+	 *
+	 *    @param    int		$id     Id of object
+	 *    @param	string	$ref	Ref of object
+	 *    @return   int         	<0 if KO, >0 if OK
+	 */
+	public function fetch($id, $ref = '')
+	{
+		global $langs;
+		$sql = "SELECT";
+		$sql .= " t.rowid,";
+		$sql .= " t.entity,";
+		$sql .= " t.ref,";
+		$sql .= " t.description,";
 		$sql .= " t.fk_country,";
-    	$sql .= " t.fk_code_type_resource,";
-    	$sql .= " t.note_public,";
-    	$sql .= " t.note_private,";
-    	$sql .= " t.tms,";
-    	$sql .= " ty.label as type_label";
-    	$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
-    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_resource as ty ON ty.code=t.fk_code_type_resource";
-    	if ($id) $sql .= " WHERE t.rowid = ".$this->db->escape($id);
-    	else $sql .= " WHERE t.ref = '".$this->db->escape($ref)."'";
+		$sql .= " t.fk_code_type_resource,";
+		$sql .= " t.note_public,";
+		$sql .= " t.note_private,";
+		$sql .= " t.tms,";
+		$sql .= " ty.label as type_label";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_resource as ty ON ty.code=t.fk_code_type_resource";
+		if ($id) $sql .= " WHERE t.rowid = ".$this->db->escape($id);
+		else $sql .= " WHERE t.ref = '".$this->db->escape($ref)."'";
 
-    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-    	$resql = $this->db->query($sql);
-    	if ($resql)
-    	{
-    		if ($this->db->num_rows($resql))
-    		{
-    			$obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-    			$this->id = $obj->rowid;
-    			$this->entity = $obj->entity;
-    			$this->ref = $obj->ref;
-    			$this->description				= $obj->description;
-                $this->country_id = $obj->fk_country;
-    			$this->fk_code_type_resource = $obj->fk_code_type_resource;
-    			$this->note_public				= $obj->note_public;
-    			$this->note_private = $obj->note_private;
-    			$this->type_label = $obj->type_label;
+				$this->id = $obj->rowid;
+				$this->entity = $obj->entity;
+				$this->ref = $obj->ref;
+				$this->description				= $obj->description;
+				$this->country_id = $obj->fk_country;
+				$this->fk_code_type_resource = $obj->fk_code_type_resource;
+				$this->note_public				= $obj->note_public;
+				$this->note_private = $obj->note_private;
+				$this->type_label = $obj->type_label;
 
-    			// Retreive all extrafield
-    			// fetch optionals attributes and labels
-    			$this->fetch_optionals();
-    		}
-    		$this->db->free($resql);
+				// Retrieve all extrafield
+				// fetch optionals attributes and labels
+				$this->fetch_optionals();
+			}
+			$this->db->free($resql);
 
-    		return $this->id;
-    	} else {
-    		$this->error = "Error ".$this->db->lasterror();
-    		dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
-    		return -1;
-    	}
-    }
+			return $this->id;
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Update object into database
-     *
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    public function update($user = null, $notrigger = 0)
+	/**
+	 *  Update object into database
+	 *
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update($user = null, $notrigger = 0)
 	{
 		global $conf, $langs, $hookmanager;
 		$error = 0;
@@ -245,7 +241,7 @@ class Dolresource extends CommonObject
 		if (isset($this->ref)) $this->ref = trim($this->ref);
 		if (isset($this->fk_code_type_resource)) $this->fk_code_type_resource = trim($this->fk_code_type_resource);
 		if (isset($this->description)) $this->description = trim($this->description);
-        if (!is_numeric($this->country_id)) $this->country_id = 0;
+		if (!is_numeric($this->country_id)) $this->country_id = 0;
 
 		if (empty($this->oldcopy))
 		{
@@ -331,19 +327,19 @@ class Dolresource extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Load object in memory from database
-     *
-     *    @param      int	$id          id object
-     *    @return     int         <0 if KO, >0 if OK
-     */
-    public function fetch_element_resource($id)
-    {
-        // phpcs:enable
-    	global $langs;
-    	$sql = "SELECT";
-    	$sql .= " t.rowid,";
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Load object in memory from database
+	 *
+	 *    @param      int	$id          id object
+	 *    @return     int         <0 if KO, >0 if OK
+	 */
+	public function fetch_element_resource($id)
+	{
+		// phpcs:enable
+		global $langs;
+		$sql = "SELECT";
+		$sql .= " t.rowid,";
    		$sql .= " t.resource_id,";
 		$sql .= " t.resource_type,";
 		$sql .= " t.element_id,";
@@ -353,24 +349,24 @@ class Dolresource extends CommonObject
 		$sql .= " t.fk_user_create,";
 		$sql .= " t.tms";
 		$sql .= " FROM ".MAIN_DB_PREFIX."element_resources as t";
-    	$sql .= " WHERE t.rowid = ".$this->db->escape($id);
+		$sql .= " WHERE t.rowid = ".$this->db->escape($id);
 
-    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-    	$resql = $this->db->query($sql);
-    	if ($resql)
-    	{
-    		if ($this->db->num_rows($resql))
-    		{
-    			$obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-    			$this->id = $obj->rowid;
-    			$this->resource_id = $obj->resource_id;
-    			$this->resource_type	= $obj->resource_type;
-    			$this->element_id = $obj->element_id;
-    			$this->element_type		= $obj->element_type;
-    			$this->busy = $obj->busy;
-    			$this->mandatory = $obj->mandatory;
-    			$this->fk_user_create = $obj->fk_user_create;
+				$this->id = $obj->rowid;
+				$this->resource_id = $obj->resource_id;
+				$this->resource_type	= $obj->resource_type;
+				$this->element_id = $obj->element_id;
+				$this->element_type		= $obj->element_type;
+				$this->busy = $obj->busy;
+				$this->mandatory = $obj->mandatory;
+				$this->fk_user_create = $obj->fk_user_create;
 
 				if ($obj->resource_id && $obj->resource_type) {
 					$this->objresource = fetchObjectByElement($obj->resource_id, $obj->resource_type);
@@ -378,27 +374,27 @@ class Dolresource extends CommonObject
 				if ($obj->element_id && $obj->element_type) {
 					$this->objelement = fetchObjectByElement($obj->element_id, $obj->element_type);
 				}
-    		}
-    		$this->db->free($resql);
+			}
+			$this->db->free($resql);
 
-    		return $this->id;
-    	} else {
-    		$this->error = "Error ".$this->db->lasterror();
-    		return -1;
-    	}
-    }
+			return $this->id;
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
-    /**
-     *    Delete a resource object
-     *
-     *    @param	int		$rowid			Id of resource line to delete
-     *    @param	int		$notrigger		Disable all triggers
-     *    @return   int						>0 if OK, <0 if KO
-     */
-    public function delete($rowid, $notrigger = 0)
+	/**
+	 *    Delete a resource object
+	 *
+	 *    @param	int		$rowid			Id of resource line to delete
+	 *    @param	int		$notrigger		Disable all triggers
+	 *    @return   int						>0 if OK, <0 if KO
+	 */
+	public function delete($rowid, $notrigger = 0)
 	{
 		global $user, $langs, $conf;
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$error = 0;
 
@@ -471,108 +467,108 @@ class Dolresource extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Load resource objects into $this->lines
-     *
-     *  @param	string		$sortorder    sort order
-     *  @param	string		$sortfield    sort field
-     *  @param	int			$limit		  limit page
-     *  @param	int			$offset    	  page
-     *  @param	array		$filter    	  filter output
-     *  @return int          	<0 if KO, >0 if OK
-     */
-    public function fetch_all($sortorder, $sortfield, $limit, $offset, $filter = '')
-    {
-        // phpcs:enable
-    	global $conf;
-
-    	require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-    	$extrafields = new ExtraFields($this->db);
-
-    	$sql = "SELECT ";
-    	$sql .= " t.rowid,";
-    	$sql .= " t.entity,";
-    	$sql .= " t.ref,";
-    	$sql .= " t.description,";
-    	$sql .= " t.fk_code_type_resource,";
-    	$sql .= " t.tms,";
-    	// Add fields from extrafields
-    	if (!empty($extrafields->attributes[$this->table_element]['label']))
-    		foreach ($extrafields->attributes[$this->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$this->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
-    	$sql .= " ty.label as type_label";
-    	$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
-    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_resource as ty ON ty.code=t.fk_code_type_resource";
-    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$this->table_element."_extrafields as ef ON ef.fk_object=t.rowid";
-    	$sql .= " WHERE t.entity IN (".getEntity('resource').")";
-    	// Manage filter
-    	if (!empty($filter)) {
-    		foreach ($filter as $key => $value) {
-    			if (strpos($key, 'date')) {
-    				$sql .= ' AND '.$key.' = \''.$this->db->idate($value).'\'';
-    			} elseif (strpos($key, 'ef.') !== false) {
-    				$sql .= $value;
-    			} else {
-    				$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
-    			}
-    		}
-    	}
-    	$sql .= $this->db->order($sortfield, $sortorder);
-        $this->num_all = 0;
-        if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-        {
-            $result = $this->db->query($sql);
-            $this->num_all = $this->db->num_rows($result);
-        }
-    	if ($limit) $sql .= $this->db->plimit($limit, $offset);
-    	dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
-
-        $this->lines = array();
-    	$resql = $this->db->query($sql);
-    	if ($resql)
-    	{
-    		$num = $this->db->num_rows($resql);
-    		if ($num)
-    		{
-    			while ($obj = $this->db->fetch_object($resql))
-    			{
-    				$line = new Dolresource($this->db);
-    				$line->id = $obj->rowid;
-    				$line->ref = $obj->ref;
-    				$line->description = $obj->description;
-                    $line->country_id = $obj->fk_country;
-    				$line->fk_code_type_resource = $obj->fk_code_type_resource;
-    				$line->type_label = $obj->type_label;
-
-    				// fetch optionals attributes and labels
-
-    				$line->fetch_optionals();
-
-    				$this->lines[] = $line;
-    			}
-    			$this->db->free($resql);
-    		}
-    		return $num;
-    	} else {
-    		$this->error = $this->db->lasterror();
-    		return -1;
-    	}
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-     /**
-     *	Load all objects into $this->lines
-     *
-     *  @param	string		$sortorder    sort order
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Load resource objects into $this->lines
+	 *
+	 *  @param	string		$sortorder    sort order
 	 *  @param	string		$sortfield    sort field
 	 *  @param	int			$limit		  limit page
 	 *  @param	int			$offset    	  page
 	 *  @param	array		$filter    	  filter output
 	 *  @return int          	<0 if KO, >0 if OK
-     */
-    public function fetch_all_resources($sortorder, $sortfield, $limit, $offset, $filter = '')
-    {
-        // phpcs:enable
+	 */
+	public function fetch_all($sortorder, $sortfield, $limit, $offset, $filter = '')
+	{
+		// phpcs:enable
+		global $conf;
+
+		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+		$extrafields = new ExtraFields($this->db);
+
+		$sql = "SELECT ";
+		$sql .= " t.rowid,";
+		$sql .= " t.entity,";
+		$sql .= " t.ref,";
+		$sql .= " t.description,";
+		$sql .= " t.fk_code_type_resource,";
+		$sql .= " t.tms,";
+		// Add fields from extrafields
+		if (!empty($extrafields->attributes[$this->table_element]['label']))
+			foreach ($extrafields->attributes[$this->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$this->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+		$sql .= " ty.label as type_label";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_resource as ty ON ty.code=t.fk_code_type_resource";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$this->table_element."_extrafields as ef ON ef.fk_object=t.rowid";
+		$sql .= " WHERE t.entity IN (".getEntity('resource').")";
+		// Manage filter
+		if (!empty($filter)) {
+			foreach ($filter as $key => $value) {
+				if (strpos($key, 'date')) {
+					$sql .= ' AND '.$key.' = \''.$this->db->idate($value).'\'';
+				} elseif (strpos($key, 'ef.') !== false) {
+					$sql .= $value;
+				} else {
+					$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
+				}
+			}
+		}
+		$sql .= $this->db->order($sortfield, $sortorder);
+		$this->num_all = 0;
+		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+		{
+			$result = $this->db->query($sql);
+			$this->num_all = $this->db->num_rows($result);
+		}
+		if ($limit) $sql .= $this->db->plimit($limit, $offset);
+		dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
+
+		$this->lines = array();
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			if ($num)
+			{
+				while ($obj = $this->db->fetch_object($resql))
+				{
+					$line = new Dolresource($this->db);
+					$line->id = $obj->rowid;
+					$line->ref = $obj->ref;
+					$line->description = $obj->description;
+					$line->country_id = $obj->fk_country;
+					$line->fk_code_type_resource = $obj->fk_code_type_resource;
+					$line->type_label = $obj->type_label;
+
+					// fetch optionals attributes and labels
+
+					$line->fetch_optionals();
+
+					$this->lines[] = $line;
+				}
+				$this->db->free($resql);
+			}
+			return $num;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	 /**
+	  *	Load all objects into $this->lines
+	  *
+	  *  @param	string		$sortorder    sort order
+	  *  @param	string		$sortfield    sort field
+	  *  @param	int			$limit		  limit page
+	  *  @param	int			$offset    	  page
+	  *  @param	array		$filter    	  filter output
+	  *  @return int          	<0 if KO, >0 if OK
+	  */
+	public function fetch_all_resources($sortorder, $sortfield, $limit, $offset, $filter = '')
+	{
+		// phpcs:enable
    		global $conf;
    		$sql = "SELECT ";
    		$sql .= " t.rowid,";
@@ -597,7 +593,7 @@ class Dolresource extends CommonObject
    				}
    			}
    		}
-    	$sql .= $this->db->order($sortfield, $sortorder);
+		$sql .= $this->db->order($sortfield, $sortorder);
    		if ($limit) $sql .= $this->db->plimit($limit + 1, $offset);
    		dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
 
@@ -623,7 +619,7 @@ class Dolresource extends CommonObject
 						$line->objresource = fetchObjectByElement($obj->resource_id, $obj->resource_type);
 					if ($obj->element_id && $obj->element_type)
 						$line->objelement = fetchObjectByElement($obj->element_id, $obj->element_type);
-        			$this->lines[] = $line;
+					$this->lines[] = $line;
    				}
    				$this->db->free($resql);
    			}
@@ -632,119 +628,119 @@ class Dolresource extends CommonObject
    			$this->error = $this->db->lasterror();
    			return -1;
    		}
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Load all objects into $this->lines
-     *
-     *  @param	string		$sortorder    sort order
-     *  @param	string		$sortfield    sort field
-     *  @param	int			$limit		  limit page
-     *  @param	int			$offset    	  page
-     *  @param	array		$filter    	  filter output
-     *  @return int          	<0 if KO, >0 if OK
-     */
-    public function fetch_all_used($sortorder, $sortfield, $limit, $offset = 1, $filter = '')
-    {
-        // phpcs:enable
-    	global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Load all objects into $this->lines
+	 *
+	 *  @param	string		$sortorder    sort order
+	 *  @param	string		$sortfield    sort field
+	 *  @param	int			$limit		  limit page
+	 *  @param	int			$offset    	  page
+	 *  @param	array		$filter    	  filter output
+	 *  @return int          	<0 if KO, >0 if OK
+	 */
+	public function fetch_all_used($sortorder, $sortfield, $limit, $offset = 1, $filter = '')
+	{
+		// phpcs:enable
+		global $conf;
 
-    	if (!$sortorder) $sortorder = "ASC";
-    	if (!$sortfield) $sortfield = "t.rowid";
+		if (!$sortorder) $sortorder = "ASC";
+		if (!$sortfield) $sortfield = "t.rowid";
 
-    	$sql = "SELECT ";
-    	$sql .= " t.rowid,";
-    	$sql .= " t.resource_id,";
-    	$sql .= " t.resource_type,";
-    	$sql .= " t.element_id,";
-    	$sql .= " t.element_type,";
-    	$sql .= " t.busy,";
-    	$sql .= " t.mandatory,";
-    	$sql .= " t.fk_user_create,";
-    	$sql .= " t.tms";
-    	$sql .= ' FROM '.MAIN_DB_PREFIX.'element_resources as t ';
-    	$sql .= " WHERE t.entity IN (".getEntity('resource').")";
+		$sql = "SELECT ";
+		$sql .= " t.rowid,";
+		$sql .= " t.resource_id,";
+		$sql .= " t.resource_type,";
+		$sql .= " t.element_id,";
+		$sql .= " t.element_type,";
+		$sql .= " t.busy,";
+		$sql .= " t.mandatory,";
+		$sql .= " t.fk_user_create,";
+		$sql .= " t.tms";
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'element_resources as t ';
+		$sql .= " WHERE t.entity IN (".getEntity('resource').")";
 
-    	//Manage filter
-    	if (!empty($filter)) {
-    		foreach ($filter as $key => $value) {
-    			if (strpos($key, 'date')) {
-    				$sql .= ' AND '.$key.' = \''.$this->db->idate($value).'\'';
-    			} else {
-    				$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
-    			}
-    		}
-    	}
-    	$sql .= $this->db->order($sortfield, $sortorder);
-    	if ($limit) $sql .= $this->db->plimit($limit + 1, $offset);
-    	dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
+		//Manage filter
+		if (!empty($filter)) {
+			foreach ($filter as $key => $value) {
+				if (strpos($key, 'date')) {
+					$sql .= ' AND '.$key.' = \''.$this->db->idate($value).'\'';
+				} else {
+					$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
+				}
+			}
+		}
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) $sql .= $this->db->plimit($limit + 1, $offset);
+		dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
 
-    	$resql = $this->db->query($sql);
-    	if ($resql)
-    	{
-    		$num = $this->db->num_rows($resql);
-    		if ($num)
-    		{
-    			$this->lines = array();
-    			while ($obj = $this->db->fetch_object($resql))
-    			{
-    				$line = new Dolresource($this->db);
-    				$line->id = $obj->rowid;
-    				$line->resource_id = $obj->resource_id;
-    				$line->resource_type	= $obj->resource_type;
-    				$line->element_id = $obj->element_id;
-    				$line->element_type		= $obj->element_type;
-    				$line->busy = $obj->busy;
-    				$line->mandatory = $obj->mandatory;
-    				$line->fk_user_create = $obj->fk_user_create;
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			if ($num)
+			{
+				$this->lines = array();
+				while ($obj = $this->db->fetch_object($resql))
+				{
+					$line = new Dolresource($this->db);
+					$line->id = $obj->rowid;
+					$line->resource_id = $obj->resource_id;
+					$line->resource_type	= $obj->resource_type;
+					$line->element_id = $obj->element_id;
+					$line->element_type		= $obj->element_type;
+					$line->busy = $obj->busy;
+					$line->mandatory = $obj->mandatory;
+					$line->fk_user_create = $obj->fk_user_create;
 
-    				$this->lines[] = fetchObjectByElement($obj->resource_id, $obj->resource_type);
-    			}
-    			$this->db->free($resql);
-    		}
-    		return $num;
-    	} else {
-    		$this->error = $this->db->lasterror();
-    		return -1;
-    	}
-    }
+					$this->lines[] = fetchObjectByElement($obj->resource_id, $obj->resource_type);
+				}
+				$this->db->free($resql);
+			}
+			return $num;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Fetch all resources available, declared by modules
-     * Load available resource in array $this->available_resources
-     *
-     * @return int 	number of available resources declared by modules
-     * @deprecated, remplaced by hook getElementResources
-     * @see getElementResources()
-     */
-    public function fetch_all_available()
-    {
-        // phpcs:enable
-    	global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Fetch all resources available, declared by modules
+	 * Load available resource in array $this->available_resources
+	 *
+	 * @return int 	number of available resources declared by modules
+	 * @deprecated, remplaced by hook getElementResources
+	 * @see getElementResources()
+	 */
+	public function fetch_all_available()
+	{
+		// phpcs:enable
+		global $conf;
 
-    	if (!empty($conf->modules_parts['resources']))
-    	{
-    		$this->available_resources = (array) $conf->modules_parts['resources'];
+		if (!empty($conf->modules_parts['resources']))
+		{
+			$this->available_resources = (array) $conf->modules_parts['resources'];
 
-    		return count($this->available_resources);
-    	}
-    	return 0;
-    }
+			return count($this->available_resources);
+		}
+		return 0;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Update element resource into database
-     *
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    public function update_element_resource($user = null, $notrigger = 0)
-    {
-        // phpcs:enable
-    	global $conf, $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Update element resource into database
+	 *
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update_element_resource($user = null, $notrigger = 0)
+	{
+		// phpcs:enable
+		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -755,8 +751,8 @@ class Dolresource extends CommonObject
 		if (isset($this->busy)) $this->busy = trim($this->busy);
 		if (isset($this->mandatory)) $this->mandatory = trim($this->mandatory);
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."element_resources SET";
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."element_resources SET";
 		$sql .= " resource_id=".(isset($this->resource_id) ? "'".$this->db->escape($this->resource_id)."'" : "null").",";
 		$sql .= " resource_type=".(isset($this->resource_type) ? "'".$this->db->escape($this->resource_type)."'" : "null").",";
 		$sql .= " element_id=".(isset($this->element_id) ? $this->element_id : "null").",";
@@ -765,32 +761,32 @@ class Dolresource extends CommonObject
 		$sql .= " mandatory=".(isset($this->mandatory) ? $this->mandatory : "null").",";
 		$sql .= " tms=".(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : 'null')."";
 
-        $sql .= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
 		if (!$error)
 		{
 			if (!$notrigger)
 			{
-                // Call trigger
-                $result = $this->call_trigger('RESOURCE_MODIFY', $user);
-                if ($result < 0) $error++;
-                // End call triggers
-	    	}
+				// Call trigger
+				$result = $this->call_trigger('RESOURCE_MODIFY', $user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
 		}
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -798,201 +794,201 @@ class Dolresource extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-    }
+	}
 
 
-    /**
-     * Return an array with resources linked to the element
-     *
-     * @param string    $element        Element
-     * @param int       $element_id     Id
-     * @param string    $resource_type  Type
-     * @return array                    Aray of resources
-     */
-    public function getElementResources($element, $element_id, $resource_type = '')
-    {
-	    $resources = array();
+	/**
+	 * Return an array with resources linked to the element
+	 *
+	 * @param string    $element        Element
+	 * @param int       $element_id     Id
+	 * @param string    $resource_type  Type
+	 * @return array                    Aray of resources
+	 */
+	public function getElementResources($element, $element_id, $resource_type = '')
+	{
+		$resources = array();
 
-	    // Links beetween objects are stored in this table
-	    $sql = 'SELECT rowid, resource_id, resource_type, busy, mandatory';
-	    $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 '%".$this->db->escape($resource_type)."%'";
-	    $sql .= ' ORDER BY resource_type';
+		// Links beetween objects are stored in this table
+		$sql = 'SELECT rowid, resource_id, resource_type, busy, mandatory';
+		$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 '%".$this->db->escape($resource_type)."%'";
+		$sql .= ' ORDER BY resource_type';
 
-	    dol_syslog(get_class($this)."::getElementResources", LOG_DEBUG);
+		dol_syslog(get_class($this)."::getElementResources", LOG_DEBUG);
 
-        $resources = array();
-	    $resql = $this->db->query($sql);
-	    if ($resql)
-	    {
-	    	$num = $this->db->num_rows($resql);
-	    	$i = 0;
-	    	while ($i < $num)
-	    	{
-	    		$obj = $this->db->fetch_object($resql);
+		$resources = array();
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
 
-	    		$resources[$i] = array(
-	    			'rowid' => $obj->rowid,
-	    			'resource_id' => $obj->resource_id,
-	    			'resource_type'=>$obj->resource_type,
-	    			'busy'=>$obj->busy,
-	    			'mandatory'=>$obj->mandatory
-	    		);
-	    		$i++;
-	    	}
-	    }
+				$resources[$i] = array(
+					'rowid' => $obj->rowid,
+					'resource_id' => $obj->resource_id,
+					'resource_type'=>$obj->resource_type,
+					'busy'=>$obj->busy,
+					'mandatory'=>$obj->mandatory
+				);
+				$i++;
+			}
+		}
 
-	    return $resources;
-    }
+		return $resources;
+	}
 
-    /**
-     *  Return an int number of resources linked to the element
-     *
-     *  @param		string	$element		Element type
-     *  @param		int		$element_id		Element id
-     *  @return     int						Nb of resources loaded
-     */
-    public function fetchElementResources($element, $element_id)
-    {
-        $resources = $this->getElementResources($element, $element_id);
-        $i = 0;
-        foreach ($resources as $nb => $resource) {
-            $this->lines[$i] = fetchObjectByElement($resource['resource_id'], $resource['resource_type']);
-            $i++;
-        }
-        return $i;
-    }
+	/**
+	 *  Return an int number of resources linked to the element
+	 *
+	 *  @param		string	$element		Element type
+	 *  @param		int		$element_id		Element id
+	 *  @return     int						Nb of resources loaded
+	 */
+	public function fetchElementResources($element, $element_id)
+	{
+		$resources = $this->getElementResources($element, $element_id);
+		$i = 0;
+		foreach ($resources as $nb => $resource) {
+			$this->lines[$i] = fetchObjectByElement($resource['resource_id'], $resource['resource_type']);
+			$i++;
+		}
+		return $i;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *      Load in cache resource type code (setup in dictionary)
-     *
-     *      @return     int             Number of lines loaded, 0 if already loaded, <0 if KO
-     */
-    public function load_cache_code_type_resource()
-    {
-        // phpcs:enable
-    	global $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *      Load in cache resource type code (setup in dictionary)
+	 *
+	 *      @return     int             Number of lines loaded, 0 if already loaded, <0 if KO
+	 */
+	public function load_cache_code_type_resource()
+	{
+		// phpcs:enable
+		global $langs;
 
-    	if (is_array($this->cache_code_type_resource) && count($this->cache_code_type_resource)) return 0; // Cache deja charge
+		if (is_array($this->cache_code_type_resource) && count($this->cache_code_type_resource)) return 0; // Cache deja charge
 
-    	$sql = "SELECT rowid, code, label, active";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."c_type_resource";
-    	$sql .= " WHERE active > 0";
-    	$sql .= " ORDER BY rowid";
-    	dol_syslog(get_class($this)."::load_cache_code_type_resource", LOG_DEBUG);
-    	$resql = $this->db->query($sql);
-    	if ($resql)
-    	{
-    		$num = $this->db->num_rows($resql);
-    		$i = 0;
-    		while ($i < $num)
-    		{
-    			$obj = $this->db->fetch_object($resql);
-    			// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-    			$label = ($langs->trans("ResourceTypeShort".$obj->code) != ("ResourceTypeShort".$obj->code) ? $langs->trans("ResourceTypeShort".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
-    			$this->cache_code_type_resource[$obj->rowid]['code'] = $obj->code;
-    			$this->cache_code_type_resource[$obj->rowid]['label'] = $label;
-    			$this->cache_code_type_resource[$obj->rowid]['active'] = $obj->active;
-    			$i++;
-    		}
-    		return $num;
-    	} else {
-    		dol_print_error($this->db);
-    		return -1;
-    	}
-    }
+		$sql = "SELECT rowid, code, label, active";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_resource";
+		$sql .= " WHERE active > 0";
+		$sql .= " ORDER BY rowid";
+		dol_syslog(get_class($this)."::load_cache_code_type_resource", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
+				// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
+				$label = ($langs->trans("ResourceTypeShort".$obj->code) != ("ResourceTypeShort".$obj->code) ? $langs->trans("ResourceTypeShort".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
+				$this->cache_code_type_resource[$obj->rowid]['code'] = $obj->code;
+				$this->cache_code_type_resource[$obj->rowid]['label'] = $label;
+				$this->cache_code_type_resource[$obj->rowid]['active'] = $obj->active;
+				$i++;
+			}
+			return $num;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
-    /**
-     *	Return clicable link of object (with eventually picto)
-     *
-     *	@param      int		$withpicto					Add picto into link
-     *	@param      string	$option						Where point the link ('compta', 'expedition', 'document', ...)
-     *	@param      string	$get_params    				Parametres added to url
-     *	@param		int  	$notooltip					1=Disable tooltip
-     *  @param  	string  $morecss                    Add more css on link
-     *  @param  	int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *	@return     string          					String with URL
-     */
-    public function getNomUrl($withpicto = 0, $option = '', $get_params = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
-    {
-        global $conf, $langs;
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      int		$withpicto					Add picto into link
+	 *	@param      string	$option						Where point the link ('compta', 'expedition', 'document', ...)
+	 *	@param      string	$get_params    				Parametres added to url
+	 *	@param		int  	$notooltip					1=Disable tooltip
+	 *  @param  	string  $morecss                    Add more css on link
+	 *  @param  	int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return     string          					String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $get_params = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
+		global $conf, $langs;
 
-        $result = '';
-        $label = img_picto('', $this->picto).' <u>'.$langs->trans("Resource").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
-        /*if (isset($this->status)) {
+		$result = '';
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Resource").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		/*if (isset($this->status)) {
         	$label.= '<br><b>' . $langs->trans("Status").":</b> ".$this->getLibStatut(5);
         }*/
-        if (isset($this->type_label)) {
-        	$label .= '<br><b>'.$langs->trans("ResourceType").":</b> ".$this->type_label;
-        }
+		if (isset($this->type_label)) {
+			$label .= '<br><b>'.$langs->trans("ResourceType").":</b> ".$this->type_label;
+		}
 
-        $url = DOL_URL_ROOT.'/resource/card.php?id='.$this->id;
+		$url = DOL_URL_ROOT.'/resource/card.php?id='.$this->id;
 
-        if ($option != 'nolink')
-        {
-        	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-        	if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option != 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-        	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-        	{
-        		$label = $langs->trans("ShowMyObject");
-        		$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-        	}
-        	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-        	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowMyObject");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
-        $linkstart = '<a href="'.$url.$get_params.'"';
-        $linkstart .= $linkclose.'>';
-        $linkend = '</a>';
-        /*$linkstart = '<a href="'.dol_buildpath('/resource/card.php', 1).'?id='.$this->id.$get_params.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$linkstart = '<a href="'.$url.$get_params.'"';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
+		/*$linkstart = '<a href="'.dol_buildpath('/resource/card.php', 1).'?id='.$this->id.$get_params.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
         $linkend = '</a>';*/
 
-        $result .= $linkstart;
-        if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-        if ($withpicto != 2) $result .= $this->ref;
-        $result .= $linkend;
+		$result .= $linkstart;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->ref;
+		$result .= $linkend;
 
-        return $result;
-    }
+		return $result;
+	}
 
 
-    /**
-     *  Retourne le libelle du status d'un user (actif, inactif)
-     *
-     *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-     *  @return	string 			       Label of status
-     */
-    public function getLibStatut($mode = 0)
-    {
-        return $this->LibStatut($this->status, $mode);
-    }
+	/**
+	 *  Retourne le libelle du status d'un user (actif, inactif)
+	 *
+	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @return	string 			       Label of status
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut($this->status, $mode);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return the status
-     *
-     *  @param	int		$status        	Id status
-     *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 5=Long label + Picto
-     *  @return string 			       	Label of status
-     */
-    public static function LibStatut($status, $mode = 0)
-    {
-        // phpcs:enable
-        global $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return the status
+	 *
+	 *  @param	int		$status        	Id status
+	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 5=Long label + Picto
+	 *  @return string 			       	Label of status
+	 */
+	public static function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		global $langs;
 
-        return '';
-    }
+		return '';
+	}
 }
diff --git a/htdocs/resource/class/html.formresource.class.php b/htdocs/resource/class/html.formresource.class.php
index 451ca9922b1..0b6239b01e4 100644
--- a/htdocs/resource/class/html.formresource.class.php
+++ b/htdocs/resource/class/html.formresource.class.php
@@ -34,177 +34,177 @@ require_once DOL_DOCUMENT_ROOT."/resource/class/dolresource.class.php";
  */
 class FormResource
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $substit = array();
+	public $substit = array();
 
-    public $param = array();
+	public $param = array();
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
 
 	/**
-	* Constructor
-	*
-	* @param DoliDB $db Database handler
-	*/
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Output html form to select a resource
-     *
-     *	@param	int   	$selected       Preselected resource id
-     *	@param  string	$htmlname       Name of field in form
-     *  @param  string	$filter         Optionnal filters criteras (example: 's.rowid <> x')
-     *	@param	int		$showempty		Add an empty field
-     * 	@param	int		$showtype		Show third party type in combolist (customer, prospect or supplier)
-     * 	@param	int		$forcecombo		Force to use combo box
-     *  @param	array	$event			Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
-     *  @param	string	$filterkey		Filter on key value
-     *  @param	int		$outputmode		0=HTML select string, 1=Array, 2=without form tag
-     *  @param	int		$limit			Limit number of answers
-     *  @param	string	$morecss		More css
-     * 	@return	string					HTML string with
-     */
-    public function select_resource_list($selected = '', $htmlname = 'fk_resource', $filter = '', $showempty = 0, $showtype = 0, $forcecombo = 0, $event = array(), $filterkey = '', $outputmode = 0, $limit = 20, $morecss = '')
-    {
-        // phpcs:enable
-    	global $conf, $user, $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Output html form to select a resource
+	 *
+	 *	@param	int   	$selected       Preselected resource id
+	 *	@param  string	$htmlname       Name of field in form
+	 *  @param  string	$filter         Optionnal filters criteras (example: 's.rowid <> x')
+	 *	@param	int		$showempty		Add an empty field
+	 * 	@param	int		$showtype		Show third party type in combolist (customer, prospect or supplier)
+	 * 	@param	int		$forcecombo		Force to use combo box
+	 *  @param	array	$event			Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
+	 *  @param	string	$filterkey		Filter on key value
+	 *  @param	int		$outputmode		0=HTML select string, 1=Array, 2=without form tag
+	 *  @param	int		$limit			Limit number of answers
+	 *  @param	string	$morecss		More css
+	 * 	@return	string					HTML string with
+	 */
+	public function select_resource_list($selected = '', $htmlname = 'fk_resource', $filter = '', $showempty = 0, $showtype = 0, $forcecombo = 0, $event = array(), $filterkey = '', $outputmode = 0, $limit = 20, $morecss = '')
+	{
+		// phpcs:enable
+		global $conf, $user, $langs;
 
-    	$out = '';
-    	$outarray = array();
+		$out = '';
+		$outarray = array();
 
-    	$resourcestat = new Dolresource($this->db);
+		$resourcestat = new Dolresource($this->db);
 
-    	$resources_used = $resourcestat->fetch_all('ASC', 't.rowid', $limit, 0, $filter);
+		$resources_used = $resourcestat->fetch_all('ASC', 't.rowid', $limit, 0, $filter);
 
-    	if ($outputmode != 2)
-    	{
-    	    $out = '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-    	    $out .= '<input type="hidden" name="token" value="'.newToken().'">';
-    	}
+		if ($outputmode != 2)
+		{
+			$out = '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+			$out .= '<input type="hidden" name="token" value="'.newToken().'">';
+		}
 
-    	if ($resourcestat)
-    	{
-    		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->RESOURCE_USE_SEARCH_TO_SELECT) && !$forcecombo)
-    		{
-    			//$minLength = (is_numeric($conf->global->RESOURCE_USE_SEARCH_TO_SELECT)?$conf->global->RESOURCE_USE_SEARCH_TO_SELECT:2);
-    			$out .= ajax_combobox($htmlname, $event, $conf->global->RESOURCE_USE_SEARCH_TO_SELECT);
-    		} else {
-    			$out .= ajax_combobox($htmlname);
-    		}
+		if ($resourcestat)
+		{
+			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->RESOURCE_USE_SEARCH_TO_SELECT) && !$forcecombo)
+			{
+				//$minLength = (is_numeric($conf->global->RESOURCE_USE_SEARCH_TO_SELECT)?$conf->global->RESOURCE_USE_SEARCH_TO_SELECT:2);
+				$out .= ajax_combobox($htmlname, $event, $conf->global->RESOURCE_USE_SEARCH_TO_SELECT);
+			} else {
+				$out .= ajax_combobox($htmlname);
+			}
 
-    		// Construct $out and $outarray
-    		$out .= '<select id="'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">'."\n";
-    		if ($showempty) $out .= '<option value="-1">&nbsp;</option>'."\n";
+			// Construct $out and $outarray
+			$out .= '<select id="'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">'."\n";
+			if ($showempty) $out .= '<option value="-1">&nbsp;</option>'."\n";
 
-    		$num = 0;
-    		if (is_array($resourcestat->lines)) $num = count($resourcestat->lines);
+			$num = 0;
+			if (is_array($resourcestat->lines)) $num = count($resourcestat->lines);
 
-    		//var_dump($resourcestat->lines);
-    		$i = 0;
-    		if ($num)
-    		{
-    			while ($i < $num)
-    			{
-    			    $resourceclass = ucfirst($resourcestat->lines[$i]->element);
+			//var_dump($resourcestat->lines);
+			$i = 0;
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$resourceclass = ucfirst($resourcestat->lines[$i]->element);
 
-    				$label = $resourcestat->lines[$i]->ref ? $resourcestat->lines[$i]->ref : ''.$resourcestat->lines[$i]->label;
-    				if ($resourceclass != 'Dolresource') $label .= ' ('.$langs->trans($resourceclass).')';
+					$label = $resourcestat->lines[$i]->ref ? $resourcestat->lines[$i]->ref : ''.$resourcestat->lines[$i]->label;
+					if ($resourceclass != 'Dolresource') $label .= ' ('.$langs->trans($resourceclass).')';
 
-    				if ($selected > 0 && $selected == $resourcestat->lines[$i]->id)
-    				{
-    					$out .= '<option value="'.$resourcestat->lines[$i]->id.'" selected>'.$label.'</option>';
-    				} else {
-    					$out .= '<option value="'.$resourcestat->lines[$i]->id.'">'.$label.'</option>';
-    				}
+					if ($selected > 0 && $selected == $resourcestat->lines[$i]->id)
+					{
+						$out .= '<option value="'.$resourcestat->lines[$i]->id.'" selected>'.$label.'</option>';
+					} else {
+						$out .= '<option value="'.$resourcestat->lines[$i]->id.'">'.$label.'</option>';
+					}
 
-    				array_push($outarray, array('key'=>$resourcestat->lines[$i]->id, 'value'=>$resourcestat->lines[$i]->label, 'label'=>$resourcestat->lines[$i]->label));
+					array_push($outarray, array('key'=>$resourcestat->lines[$i]->id, 'value'=>$resourcestat->lines[$i]->label, 'label'=>$resourcestat->lines[$i]->label));
 
-    				$i++;
-    				if (($i % 10) == 0) $out .= "\n";
-    			}
-    		}
-    		$out .= '</select>'."\n";
+					$i++;
+					if (($i % 10) == 0) $out .= "\n";
+				}
+			}
+			$out .= '</select>'."\n";
 
-    		if ($outputmode != 2)
-    		{
-        		$out .= '<input type="submit" class="button" value="'.$langs->trans("Search").'"> &nbsp; &nbsp; ';
+			if ($outputmode != 2)
+			{
+				$out .= '<input type="submit" class="button" value="'.$langs->trans("Search").'"> &nbsp; &nbsp; ';
 
-        		$out .= '</form>';
-    		}
-    	} else {
-    		dol_print_error($this->db);
-    	}
+				$out .= '</form>';
+			}
+		} else {
+			dol_print_error($this->db);
+		}
 
-    	if ($outputmode && $outputmode != 2) return $outarray;
-    	return $out;
-    }
+		if ($outputmode && $outputmode != 2) return $outarray;
+		return $out;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return html list of tickets type
-     *
-     *  @param	string	$selected       Id du type pre-selectionne
-     *  @param  string	$htmlname       Nom de la zone select
-     *  @param  string	$filtertype     To filter on field type in llx_c_ticket_type (array('code'=>xx,'label'=>zz))
-     *  @param  int		$format         0=id+libelle, 1=code+code, 2=code+libelle, 3=id+code
-     *  @param  int		$empty			1=peut etre vide, 0 sinon
-     *  @param	int		$noadmininfo	0=Add admin info, 1=Disable admin info
-     *  @param  int		$maxlength      Max length of label
-     * 	@return	void
-     */
-    public function select_types_resource($selected = '', $htmlname = 'type_resource', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0)
-    {
-        // phpcs:enable
-    	global $langs, $user;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return html list of tickets type
+	 *
+	 *  @param	string	$selected       Id du type pre-selectionne
+	 *  @param  string	$htmlname       Nom de la zone select
+	 *  @param  string	$filtertype     To filter on field type in llx_c_ticket_type (array('code'=>xx,'label'=>zz))
+	 *  @param  int		$format         0=id+libelle, 1=code+code, 2=code+libelle, 3=id+code
+	 *  @param  int		$empty			1=peut etre vide, 0 sinon
+	 *  @param	int		$noadmininfo	0=Add admin info, 1=Disable admin info
+	 *  @param  int		$maxlength      Max length of label
+	 * 	@return	void
+	 */
+	public function select_types_resource($selected = '', $htmlname = 'type_resource', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0)
+	{
+		// phpcs:enable
+		global $langs, $user;
 
-    	$resourcestat = new Dolresource($this->db);
+		$resourcestat = new Dolresource($this->db);
 
-    	dol_syslog(get_class($this)."::select_types_resource ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);
+		dol_syslog(get_class($this)."::select_types_resource ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);
 
-    	$filterarray = array();
+		$filterarray = array();
 
-    	if ($filtertype != '' && $filtertype != '-1') $filterarray = explode(',', $filtertype);
+		if ($filtertype != '' && $filtertype != '-1') $filterarray = explode(',', $filtertype);
 
-    	$resourcestat->load_cache_code_type_resource();
-    	print '<select id="select'.$htmlname.'" class="flat maxwidthonsmartphone select_'.$htmlname.'" name="'.$htmlname.'">';
-    	if ($empty) print '<option value="">&nbsp;</option>';
-    	if (is_array($resourcestat->cache_code_type_resource) && count($resourcestat->cache_code_type_resource))
-    	{
-    		foreach ($resourcestat->cache_code_type_resource as $id => $arraytypes)
-    		{
-    			// We discard empty line if showempty is on because an empty line has already been output.
-    			if ($empty && empty($arraytypes['code'])) continue;
+		$resourcestat->load_cache_code_type_resource();
+		print '<select id="select'.$htmlname.'" class="flat maxwidthonsmartphone select_'.$htmlname.'" name="'.$htmlname.'">';
+		if ($empty) print '<option value="">&nbsp;</option>';
+		if (is_array($resourcestat->cache_code_type_resource) && count($resourcestat->cache_code_type_resource))
+		{
+			foreach ($resourcestat->cache_code_type_resource as $id => $arraytypes)
+			{
+				// We discard empty line if showempty is on because an empty line has already been output.
+				if ($empty && empty($arraytypes['code'])) continue;
 
-    			if ($format == 0) print '<option value="'.$id.'"';
-    			elseif ($format == 1) print '<option value="'.$arraytypes['code'].'"';
-    			elseif ($format == 2) print '<option value="'.$arraytypes['code'].'"';
-    			elseif ($format == 3) print '<option value="'.$id.'"';
-    			// Si selected est text, on compare avec code, sinon avec id
-    			if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code']) print ' selected';
-    			elseif ($selected == $id) print ' selected';
-    			print '>';
-    			if ($format == 0) $value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
-    			elseif ($format == 1) $value = $arraytypes['code'];
-    			elseif ($format == 2) $value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
-    			elseif ($format == 3) $value = $arraytypes['code'];
-    			print $value ? $value : '&nbsp;';
-    			print '</option>';
-    		}
-    	}
-    	print '</select>';
-    	if ($user->admin && !$noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-    }
+				if ($format == 0) print '<option value="'.$id.'"';
+				elseif ($format == 1) print '<option value="'.$arraytypes['code'].'"';
+				elseif ($format == 2) print '<option value="'.$arraytypes['code'].'"';
+				elseif ($format == 3) print '<option value="'.$id.'"';
+				// Si selected est text, on compare avec code, sinon avec id
+				if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code']) print ' selected';
+				elseif ($selected == $id) print ' selected';
+				print '>';
+				if ($format == 0) $value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
+				elseif ($format == 1) $value = $arraytypes['code'];
+				elseif ($format == 2) $value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
+				elseif ($format == 3) $value = $arraytypes['code'];
+				print $value ? $value : '&nbsp;';
+				print '</option>';
+			}
+		}
+		print '</select>';
+		if ($user->admin && !$noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+	}
 }
diff --git a/htdocs/resource/contact.php b/htdocs/resource/contact.php
index de4d0ad3e3f..0330579f06c 100644
--- a/htdocs/resource/contact.php
+++ b/htdocs/resource/contact.php
@@ -55,7 +55,8 @@ if ($action == 'addcontact' && $user->rights->resource->write)
 	if ($result > 0 && $id > 0)
 	{
 		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
-  		$result = $object->add_contact($contactid, GETPOST('type', 'int'), GETPOST('source', 'alpha'));
+		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 	}
 
 	if ($result >= 0)
@@ -115,7 +116,7 @@ if ($id > 0 || !empty($ref))
 
 
 	$head = resource_prepare_head($object);
-	dol_fiche_head($head, 'contact', $langs->trans("ResourceSingular"), -1, 'resource');
+	print dol_get_fiche_head($head, 'contact', $langs->trans("ResourceSingular"), -1, 'resource');
 
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/resource/list.php'.(!empty($socid) ? '?id='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
@@ -147,7 +148,7 @@ if ($id > 0 || !empty($ref))
 	print '</table>';
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<br>';
 
diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php
index 0e1e6ba5cc1..0019d6b99ed 100644
--- a/htdocs/resource/document.php
+++ b/htdocs/resource/document.php
@@ -89,7 +89,7 @@ if ($object->id > 0)
 
 	$head = resource_prepare_head($object);
 
-	dol_fiche_head($head, 'documents', $langs->trans("ResourceSingular"), -1, 'resource');
+	print dol_get_fiche_head($head, 'documents', $langs->trans("ResourceSingular"), -1, 'resource');
 
 
 	// Build file list
@@ -114,7 +114,7 @@ if ($object->id > 0)
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border tableforfield centpercent">';
+	print '<table class="border tableforfield centpercent">';
 
 	// Resource type
 	print '<tr>';
@@ -124,18 +124,18 @@ if ($object->id > 0)
 	print '</td>';
 	print '</tr>';
 
-    print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-    print '</table>';
+	print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    $modulepart = 'dolresource';
-    $permission = $user->rights->resource->write;
+	$modulepart = 'dolresource';
+	$permission = $user->rights->resource->write;
 
-    include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
 	print $langs->trans("ErrorUnknown");
 }
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index b850a6e2982..7da223dd02b 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -29,11 +29,11 @@ require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 if (!empty($conf->projet->enabled)) {
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
-    require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 }
 
 // Load translation files required by the page
@@ -46,7 +46,7 @@ $page                           = GETPOST('page','int');
 */
 
 if (!$user->rights->resource->read)
-        accessforbidden();
+		accessforbidden();
 
 $object = new Dolresource($db);
 
@@ -71,8 +71,8 @@ $socid                  = GETPOST('socid', 'int');
 
 if ($socid > 0) // Special for thirdparty
 {
-    $element_id = $socid;
-    $element = 'societe';
+	$element_id = $socid;
+	$element = 'societe';
 }
 
 
@@ -87,7 +87,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    $error = 0;
+	$error = 0;
 
 	if ($action == 'add_element_resource' && !$cancel)
 	{
@@ -101,65 +101,65 @@ if (empty($reshook))
 			$objstat = fetchObjectByElement($element_id, $element, $element_ref);
 			$objstat->element = $element; // For externals module, we need to keep @xx
 
-            // TODO : add this check at update_linked_resource and when modifying event start or end date
-            // check if an event resource is already in use
-            if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $objstat->element == 'action' && $resource_type == 'dolresource' && intval($busy) == 1) {
-                $eventDateStart = $objstat->datep;
-                $eventDateEnd   = $objstat->datef;
-                $isFullDayEvent = intval($objstat->fulldayevent);
-                if (empty($eventDateEnd)) {
-                    if ($isFullDayEvent) {
-                        $eventDateStartArr = dol_getdate($eventDateStart);
-                        $eventDateStart = dol_mktime(0, 0, 0, $eventDateStartArr['mon'], $eventDateStartArr['mday'], $eventDateStartArr['year']);
-                        $eventDateEnd   = dol_mktime(23, 59, 59, $eventDateStartArr['mon'], $eventDateStartArr['mday'], $eventDateStartArr['year']);
-                    }
-                }
+			// TODO : add this check at update_linked_resource and when modifying event start or end date
+			// check if an event resource is already in use
+			if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $objstat->element == 'action' && $resource_type == 'dolresource' && intval($busy) == 1) {
+				$eventDateStart = $objstat->datep;
+				$eventDateEnd   = $objstat->datef;
+				$isFullDayEvent = intval($objstat->fulldayevent);
+				if (empty($eventDateEnd)) {
+					if ($isFullDayEvent) {
+						$eventDateStartArr = dol_getdate($eventDateStart);
+						$eventDateStart = dol_mktime(0, 0, 0, $eventDateStartArr['mon'], $eventDateStartArr['mday'], $eventDateStartArr['year']);
+						$eventDateEnd   = dol_mktime(23, 59, 59, $eventDateStartArr['mon'], $eventDateStartArr['mday'], $eventDateStartArr['year']);
+					}
+				}
 
-                $sql  = "SELECT er.rowid, r.ref as r_ref, ac.id as ac_id, ac.label as ac_label";
-                $sql .= " FROM ".MAIN_DB_PREFIX."element_resources as er";
-                $sql .= " INNER JOIN ".MAIN_DB_PREFIX."resource as r ON r.rowid = er.resource_id AND er.resource_type = '".$db->escape($resource_type)."'";
-                $sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm as ac ON ac.id = er.element_id AND er.element_type = '".$db->escape($objstat->element)."'";
-                $sql .= " WHERE er.resource_id = ".$resource_id;
-                $sql .= " AND er.busy = 1";
-                $sql .= " AND (";
+				$sql  = "SELECT er.rowid, r.ref as r_ref, ac.id as ac_id, ac.label as ac_label";
+				$sql .= " FROM ".MAIN_DB_PREFIX."element_resources as er";
+				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."resource as r ON r.rowid = er.resource_id AND er.resource_type = '".$db->escape($resource_type)."'";
+				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm as ac ON ac.id = er.element_id AND er.element_type = '".$db->escape($objstat->element)."'";
+				$sql .= " WHERE er.resource_id = ".$resource_id;
+				$sql .= " AND er.busy = 1";
+				$sql .= " AND (";
 
-                // event date start between ac.datep and ac.datep2 (if datep2 is null we consider there is no end)
-                $sql .= " (ac.datep <= '".$db->idate($eventDateStart)."' AND (ac.datep2 IS NULL OR ac.datep2 >= '".$db->idate($eventDateStart)."'))";
-                // event date end between ac.datep and ac.datep2
-                if (!empty($eventDateEnd)) {
-                    $sql .= " OR (ac.datep <= '".$db->idate($eventDateEnd)."' AND (ac.datep2 >= '".$db->idate($eventDateEnd)."'))";
-                }
-                // event date start before ac.datep and event date end after ac.datep2
-                $sql .= " OR (";
-                $sql .= "ac.datep >= '".$db->idate($eventDateStart)."'";
-                if (!empty($eventDateEnd)) {
-                    $sql .= " AND (ac.datep2 IS NOT NULL AND ac.datep2 <= '".$db->idate($eventDateEnd)."')";
-                }
-                $sql .= ")";
+				// event date start between ac.datep and ac.datep2 (if datep2 is null we consider there is no end)
+				$sql .= " (ac.datep <= '".$db->idate($eventDateStart)."' AND (ac.datep2 IS NULL OR ac.datep2 >= '".$db->idate($eventDateStart)."'))";
+				// event date end between ac.datep and ac.datep2
+				if (!empty($eventDateEnd)) {
+					$sql .= " OR (ac.datep <= '".$db->idate($eventDateEnd)."' AND (ac.datep2 >= '".$db->idate($eventDateEnd)."'))";
+				}
+				// event date start before ac.datep and event date end after ac.datep2
+				$sql .= " OR (";
+				$sql .= "ac.datep >= '".$db->idate($eventDateStart)."'";
+				if (!empty($eventDateEnd)) {
+					$sql .= " AND (ac.datep2 IS NOT NULL AND ac.datep2 <= '".$db->idate($eventDateEnd)."')";
+				}
+				$sql .= ")";
 
-                $sql .= ")";
-                $resql = $db->query($sql);
-                if (!$resql) {
-                    $error++;
-                    $objstat->error    = $db->lasterror();
-                    $objstat->errors[] = $objstat->error;
-                } else {
-                    if ($db->num_rows($resql) > 0) {
-                        // already in use
-                        $error++;
-                        $objstat->error = $langs->trans('ErrorResourcesAlreadyInUse').' : ';
-                        while ($obj = $db->fetch_object($resql)) {
-                            $objstat->error .= '<br> - '.$langs->trans('ErrorResourceUseInEvent', $obj->r_ref, $obj->ac_label.' ['.$obj->ac_id.']');
-                        }
-                        $objstat->errors[] = $objstat->error;
-                    }
-                    $db->free($resql);
-                }
-            }
+				$sql .= ")";
+				$resql = $db->query($sql);
+				if (!$resql) {
+					$error++;
+					$objstat->error    = $db->lasterror();
+					$objstat->errors[] = $objstat->error;
+				} else {
+					if ($db->num_rows($resql) > 0) {
+						// already in use
+						$error++;
+						$objstat->error = $langs->trans('ErrorResourcesAlreadyInUse').' : ';
+						while ($obj = $db->fetch_object($resql)) {
+							$objstat->error .= '<br> - '.$langs->trans('ErrorResourceUseInEvent', $obj->r_ref, $obj->ac_label.' ['.$obj->ac_id.']');
+						}
+						$objstat->errors[] = $objstat->error;
+					}
+					$db->free($resql);
+				}
+			}
 
-            if (!$error) {
-                $res = $objstat->add_element_resource($resource_id, $resource_type, $busy, $mandatory);
-            }
+			if (!$error) {
+				$res = $objstat->add_element_resource($resource_id, $resource_type, $busy, $mandatory);
+			}
 		}
 
 		if (!$error && $res > 0)
@@ -182,68 +182,68 @@ if (empty($reshook))
 			$object->busy = $busy;
 			$object->mandatory = $mandatory;
 
-            if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $object->element_type == 'action' && $object->resource_type == 'dolresource' && intval($object->busy) == 1) {
-                $eventDateStart = $object->objelement->datep;
-                $eventDateEnd   = $object->objelement->datef;
-                $isFullDayEvent = intval($objstat->fulldayevent);
-                if (empty($eventDateEnd)) {
-                    if ($isFullDayEvent) {
-                        $eventDateStartArr = dol_getdate($eventDateStart);
-                        $eventDateStart = dol_mktime(0, 0, 0, $eventDateStartArr['mon'], $eventDateStartArr['mday'], $eventDateStartArr['year']);
-                        $eventDateEnd   = dol_mktime(23, 59, 59, $eventDateStartArr['mon'], $eventDateStartArr['mday'], $eventDateStartArr['year']);
-                    }
-                }
+			if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $object->element_type == 'action' && $object->resource_type == 'dolresource' && intval($object->busy) == 1) {
+				$eventDateStart = $object->objelement->datep;
+				$eventDateEnd   = $object->objelement->datef;
+				$isFullDayEvent = intval($objstat->fulldayevent);
+				if (empty($eventDateEnd)) {
+					if ($isFullDayEvent) {
+						$eventDateStartArr = dol_getdate($eventDateStart);
+						$eventDateStart = dol_mktime(0, 0, 0, $eventDateStartArr['mon'], $eventDateStartArr['mday'], $eventDateStartArr['year']);
+						$eventDateEnd   = dol_mktime(23, 59, 59, $eventDateStartArr['mon'], $eventDateStartArr['mday'], $eventDateStartArr['year']);
+					}
+				}
 
-                $sql  = "SELECT er.rowid, r.ref as r_ref, ac.id as ac_id, ac.label as ac_label";
-                $sql .= " FROM ".MAIN_DB_PREFIX."element_resources as er";
-                $sql .= " INNER JOIN ".MAIN_DB_PREFIX."resource as r ON r.rowid = er.resource_id AND er.resource_type = '".$db->escape($object->resource_type)."'";
-                $sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm as ac ON ac.id = er.element_id AND er.element_type = '".$db->escape($object->element_type)."'";
-                $sql .= " WHERE er.resource_id = ".$object->resource_id;
-                $sql .= " AND ac.id != ".$object->element_id;
-                $sql .= " AND er.busy = 1";
-                $sql .= " AND (";
+				$sql  = "SELECT er.rowid, r.ref as r_ref, ac.id as ac_id, ac.label as ac_label";
+				$sql .= " FROM ".MAIN_DB_PREFIX."element_resources as er";
+				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."resource as r ON r.rowid = er.resource_id AND er.resource_type = '".$db->escape($object->resource_type)."'";
+				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm as ac ON ac.id = er.element_id AND er.element_type = '".$db->escape($object->element_type)."'";
+				$sql .= " WHERE er.resource_id = ".$object->resource_id;
+				$sql .= " AND ac.id != ".$object->element_id;
+				$sql .= " AND er.busy = 1";
+				$sql .= " AND (";
 
-                // event date start between ac.datep and ac.datep2 (if datep2 is null we consider there is no end)
-                $sql .= " (ac.datep <= '".$db->idate($eventDateStart)."' AND (ac.datep2 IS NULL OR ac.datep2 >= '".$db->idate($eventDateStart)."'))";
-                // event date end between ac.datep and ac.datep2
-                if (!empty($eventDateEnd)) {
-                    $sql .= " OR (ac.datep <= '".$db->idate($eventDateEnd)."' AND (ac.datep2 IS NULL OR ac.datep2 >= '".$db->idate($eventDateEnd)."'))";
-                }
-                // event date start before ac.datep and event date end after ac.datep2
-                $sql .= " OR (";
-                $sql .= "ac.datep >= '".$db->idate($eventDateStart)."'";
-                if (!empty($eventDateEnd)) {
-                    $sql .= " AND (ac.datep2 IS NOT NULL AND ac.datep2 <= '".$db->idate($eventDateEnd)."')";
-                }
-                $sql .= ")";
+				// event date start between ac.datep and ac.datep2 (if datep2 is null we consider there is no end)
+				$sql .= " (ac.datep <= '".$db->idate($eventDateStart)."' AND (ac.datep2 IS NULL OR ac.datep2 >= '".$db->idate($eventDateStart)."'))";
+				// event date end between ac.datep and ac.datep2
+				if (!empty($eventDateEnd)) {
+					$sql .= " OR (ac.datep <= '".$db->idate($eventDateEnd)."' AND (ac.datep2 IS NULL OR ac.datep2 >= '".$db->idate($eventDateEnd)."'))";
+				}
+				// event date start before ac.datep and event date end after ac.datep2
+				$sql .= " OR (";
+				$sql .= "ac.datep >= '".$db->idate($eventDateStart)."'";
+				if (!empty($eventDateEnd)) {
+					$sql .= " AND (ac.datep2 IS NOT NULL AND ac.datep2 <= '".$db->idate($eventDateEnd)."')";
+				}
+				$sql .= ")";
 
-                $sql .= ")";
-                $resql = $db->query($sql);
-                if (!$resql) {
-                    $error++;
-                    $object->error    = $db->lasterror();
-                    $object->errors[] = $object->error;
-                } else {
-                    if ($db->num_rows($resql) > 0) {
-                        // already in use
-                        $error++;
-                        $object->error = $langs->trans('ErrorResourcesAlreadyInUse').' : ';
-                        while ($obj = $db->fetch_object($resql)) {
-                            $object->error .= '<br> - '.$langs->trans('ErrorResourceUseInEvent', $obj->r_ref, $obj->ac_label.' ['.$obj->ac_id.']');
-                        }
-                        $object->errors[] = $objstat->error;
-                    }
-                    $db->free($resql);
-                }
-            }
+				$sql .= ")";
+				$resql = $db->query($sql);
+				if (!$resql) {
+					$error++;
+					$object->error    = $db->lasterror();
+					$object->errors[] = $object->error;
+				} else {
+					if ($db->num_rows($resql) > 0) {
+						// already in use
+						$error++;
+						$object->error = $langs->trans('ErrorResourcesAlreadyInUse').' : ';
+						while ($obj = $db->fetch_object($resql)) {
+							$object->error .= '<br> - '.$langs->trans('ErrorResourceUseInEvent', $obj->r_ref, $obj->ac_label.' ['.$obj->ac_id.']');
+						}
+						$object->errors[] = $objstat->error;
+					}
+					$db->free($resql);
+				}
+			}
 
-            if (!$error) {
-			    $result = $object->update_element_resource($user);
-                if ($result < 0)    $error++;
-            }
+			if (!$error) {
+				$result = $object->update_element_resource($user);
+				if ($result < 0)    $error++;
+			}
 
 			if ($error) {
-                setEventMessages($object->error, $object->errors, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 			} else {
 				setEventMessages($langs->trans('RessourceLineSuccessfullyUpdated'), null, 'mesgs');
 				header("Location: ".$_SERVER['PHP_SELF']."?element=".$element."&element_id=".$element_id);
@@ -287,11 +287,11 @@ llxHeader('', $pagetitle, '');
 // Load available resource, declared by modules
 $ret = count($object->available_resources);
 if ($ret == -1) {
-    dol_print_error($db, $object->error);
-    exit;
+	dol_print_error($db, $object->error);
+	exit;
 }
 if (!$ret) {
-    print '<div class="warning">'.$langs->trans('NoResourceInDatabase').'</div>';
+	print '<div class="warning">'.$langs->trans('NoResourceInDatabase').'</div>';
 } else {
 	// Confirmation suppression resource line
 	if ($action == 'delete_resource')
@@ -310,7 +310,7 @@ if (!$ret) {
 		{
 			$head = actions_prepare_head($act);
 
-			dol_fiche_head($head, 'resources', $langs->trans("Action"), -1, 'action');
+			print dol_get_fiche_head($head, 'resources', $langs->trans("Action"), -1, 'action');
 
 			$linkback = img_picto($langs->trans("BackToList"), 'object_list', 'class="hideonsmartphone pictoactionview"');
 			$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list">'.$langs->trans("BackToList").'</a>';
@@ -334,19 +334,19 @@ if (!$ret) {
 			// Project
 			if (!empty($conf->projet->enabled))
 			{
-			    $langs->load("projects");
-			    //$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-			    $morehtmlref .= $langs->trans('Project').': ';
-		        if (!empty($act->fk_project)) {
-		            $proj = new Project($db);
-		            $proj->fetch($act->fk_project);
-		            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$act->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-		            $morehtmlref .= $proj->ref;
-		            $morehtmlref .= '</a>';
-		            if ($proj->title) $morehtmlref .= ' - '.$proj->title;
-		        } else {
-		            $morehtmlref .= '';
-		        }
+				$langs->load("projects");
+				//$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+				$morehtmlref .= $langs->trans('Project').': ';
+				if (!empty($act->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($act->fk_project);
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$act->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
+					if ($proj->title) $morehtmlref .= ' - '.$proj->title;
+				} else {
+					$morehtmlref .= '';
+				}
 			}
 			$morehtmlref .= '</div>';
 
@@ -427,11 +427,11 @@ if (!$ret) {
 
 			print '</div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 		}
 	}
 
-    // Specific to thirdparty module
+	// Specific to thirdparty module
 	if (($element_id || $element_ref) && $element == 'societe')
 	{
 		$socstatic = fetchObjectByElement($element_id, $element, $element_ref);
@@ -442,7 +442,7 @@ if (!$ret) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 			$head = societe_prepare_head($socstatic);
 
-			dol_fiche_head($head, 'resources', $langs->trans("ThirdParty"), -1, 'company');
+			print dol_get_fiche_head($head, 'resources', $langs->trans("ThirdParty"), -1, 'company');
 
 			dol_banner_tab($socstatic, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom', '', '&element='.$element);
 
@@ -460,7 +460,7 @@ if (!$ret) {
 
 			print '</div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			$object = $savobject;
 		}
@@ -471,14 +471,14 @@ if (!$ret) {
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
 
-        $fichinter = new Fichinter($db);
-        $fichinter->fetch($element_id, $element_ref);
-        $fichinter->fetch_thirdparty();
+		$fichinter = new Fichinter($db);
+		$fichinter->fetch($element_id, $element_ref);
+		$fichinter->fetch_thirdparty();
 
 		if (is_object($fichinter))
 		{
 			$head = fichinter_prepare_head($fichinter);
-			dol_fiche_head($head, 'resource', $langs->trans("InterventionCard"), -1, 'intervention');
+			print dol_get_fiche_head($head, 'resource', $langs->trans("InterventionCard"), -1, 'intervention');
 
 			// Intervention card
 			$linkback = '<a href="'.DOL_URL_ROOT.'/fichinter/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
@@ -527,17 +527,17 @@ if (!$ret) {
 
 			dol_banner_tab($fichinter, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '&element='.$element, 0, '', '', 1);
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 		}
 	}
 
 	// Specific to product/service module
 	if (($element_id || $element_ref) && ($element == 'product' || $element == 'service'))
 	{
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 
-        $product = new Product($db);
-        $product->fetch($element_id, $element_ref);
+		$product = new Product($db);
+		$product->fetch($element_id, $element_ref);
 
 		if (is_object($product))
 		{
@@ -545,14 +545,14 @@ if (!$ret) {
 			$titre = $langs->trans("CardProduct".$product->type);
 			$picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product');
 
-			dol_fiche_head($head, 'resources', $titre, -1, $picto);
+			print dol_get_fiche_head($head, 'resources', $titre, -1, $picto);
 
-            $shownav = 1;
-            if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+			$shownav = 1;
+			if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 			dol_banner_tab($product, 'ref', '', $shownav, 'ref', 'ref', '', '&element='.$element);
 
-			dol_fiche_end();
-        }
+			print dol_get_fiche_end();
+		}
 	}
 
 
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index a8a946e7578..ccf061b50b7 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -108,7 +108,7 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 
 if (!$user->rights->resource->read) {
-        accessforbidden();
+		accessforbidden();
 }
 $arrayfields = array(
 		't.ref' => array(
@@ -201,8 +201,8 @@ if ($ret == -1) {
 	$newcardbutton = '';
 	if ($user->rights->resource->write)
 	{
-        $newcardbutton .= dolGetButtonTitle($langs->trans('MenuResourceAdd'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/resource/card.php?action=create');
-    }
+		$newcardbutton .= dolGetButtonTitle($langs->trans('MenuResourceAdd'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/resource/card.php?action=create');
+	}
 
 	print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $ret + 1, $nbtotalofrecords, 'object_resource', 0, $newcardbutton, '', $limit, 0, 0, 1);
 }
@@ -246,45 +246,45 @@ print "</tr>\n";
 if ($ret)
 {
 	foreach ($object->lines as $resource)
-    {
-        print '<tr class="oddeven">';
+	{
+		print '<tr class="oddeven">';
 
-        if (!empty($arrayfields['t.ref']['checked']))
-        {
-        	print '<td>';
-        	print $resource->getNomUrl(5);
-        	print '</td>';
-	        if (!$i) $totalarray['nbfield']++;
-        }
+		if (!empty($arrayfields['t.ref']['checked']))
+		{
+			print '<td>';
+			print $resource->getNomUrl(5);
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
 
-        if (!empty($arrayfields['ty.label']['checked']))
-        {
-        	print '<td>';
-        	print $resource->type_label;
-        	print '</td>';
-	        if (!$i) $totalarray['nbfield']++;
-        }
-        // Extra fields
-        $obj = (Object) $resource->array_options;
-        include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+		if (!empty($arrayfields['ty.label']['checked']))
+		{
+			print '<td>';
+			print $resource->type_label;
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+		// Extra fields
+		$obj = (Object) $resource->array_options;
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 
-        print '<td class="center">';
-        print '<a class="editfielda" href="./card.php?action=edit&token='.newToken().'&id='.$resource->id.'">';
-        print img_edit();
-        print '</a>';
-        print '&nbsp;';
-        print '<a href="./card.php?action=delete&token='.newToken().'&id='.$resource->id.'">';
-        print img_delete('', 'class="marginleftonly"');
-        print '</a>';
-        print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+		print '<td class="center">';
+		print '<a class="editfielda" href="./card.php?action=edit&token='.newToken().'&id='.$resource->id.'">';
+		print img_edit();
+		print '</a>';
+		print '&nbsp;';
+		print '<a href="./card.php?action=delete&token='.newToken().'&id='.$resource->id.'">';
+		print img_delete('', 'class="marginleftonly"');
+		print '</a>';
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
 
-        print '</tr>';
-    }
+		print '</tr>';
+	}
 } else {
-    $colspan = 1;
-    foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
-    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+	$colspan = 1;
+	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
+	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 
 print '</table>';
diff --git a/htdocs/resource/note.php b/htdocs/resource/note.php
index 26038c74d96..385fb9f190a 100644
--- a/htdocs/resource/note.php
+++ b/htdocs/resource/note.php
@@ -64,7 +64,7 @@ $form = new Form($db);
 if ($id > 0 || !empty($ref))
 {
 	$head = resource_prepare_head($object);
-	dol_fiche_head($head, 'note', $langs->trans('ResourceSingular'), -1, 'resource');
+	print dol_get_fiche_head($head, 'note', $langs->trans('ResourceSingular'), -1, 'resource');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/resource/list.php'.(!empty($socid) ? '?id='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
@@ -97,7 +97,7 @@ if ($id > 0 || !empty($ref))
 	$cssclass = 'titlefield';
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/salaries/admin/salaries.php b/htdocs/salaries/admin/salaries.php
index 01c2b5c8be6..2b429dc79ec 100644
--- a/htdocs/salaries/admin/salaries.php
+++ b/htdocs/salaries/admin/salaries.php
@@ -34,7 +34,7 @@ $langs->loadLangs(array('admin', 'salaries'));
 
 // Security check
 if (!$user->admin)
-    accessforbidden();
+	accessforbidden();
 
 $action = GETPOST('action', 'aZ09');
 
@@ -49,22 +49,22 @@ $list = array(
 
 if ($action == 'update')
 {
-    $error = 0;
+	$error = 0;
 
-    foreach ($list as $constname) {
-        $constvalue = GETPOST($constname, 'alpha');
+	foreach ($list as $constname) {
+		$constvalue = GETPOST($constname, 'alpha');
 
-        if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
-            $error++;
-        }
-    }
+		if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+			$error++;
+		}
+	}
 
-    if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 /*
@@ -81,7 +81,7 @@ print load_fiche_titre($langs->trans('SalariesSetup'), $linkback, 'title_setup')
 
 $head = salaries_admin_prepare_head();
 
-dol_fiche_head($head, 'general', $langs->trans("Salaries"), -1, 'payment');
+print dol_get_fiche_head($head, 'general', $langs->trans("Salaries"), -1, 'payment');
 
 // Document templates
 print load_fiche_titre($langs->trans("Options"), '', '');
@@ -122,7 +122,7 @@ print '</tr>';
 
 print "</table>\n";
 
-//dol_fiche_end();
+//print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
 
diff --git a/htdocs/salaries/admin/salaries_extrafields.php b/htdocs/salaries/admin/salaries_extrafields.php
index bac3824db53..62073f8177b 100644
--- a/htdocs/salaries/admin/salaries_extrafields.php
+++ b/htdocs/salaries/admin/salaries_extrafields.php
@@ -69,11 +69,11 @@ print load_fiche_titre($langs->trans("SalariesSetup"), $linkback, 'title_setup')
 
 $head = salaries_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Salaries"), -1, 'user');
+print dol_get_fiche_head($head, 'attributes', $langs->trans("Salaries"), -1, 'payment');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
@@ -96,7 +96,7 @@ if ($action == 'create')
 	print '<div name="topofform"></div><br>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -109,7 +109,7 @@ if ($action == 'edit' && !empty($attrname))
 	print '<div name="topofform"></div><br>';
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index ec1184a77e6..7fb8427a517 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2011-2019  Alexandre Spangaro      <aspangaro@open-dsi.fr>
- * Copyright (C) 2014       Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2014-2020  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2015       Charlie BENKE           <charlie@patas-monkey.com>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
@@ -111,9 +111,9 @@ if ($action == 'add' && empty($cancel))
 	$fuser->fetch(GETPOST("fk_user", "int"));
 	$object->salary = $fuser->salary;
 
-    // Fill array 'array_options' with data from add form
-    $ret = $extrafields->setOptionalsFromPost(null, $object);
-    if ($ret < 0) $error++;
+	// Fill array 'array_options' with data from add form
+	$ret = $extrafields->setOptionalsFromPost(null, $object);
+	if ($ret < 0) $error++;
 
 	if (empty($datep) || empty($datev) || empty($datesp) || empty($dateep))
 	{
@@ -258,14 +258,14 @@ if ($action == 'create')
 
 	print load_fiche_titre($langs->trans("NewSalaryPayment"), '', 'object_payment');
 
-	dol_fiche_head('', '');
+	print dol_get_fiche_head('', '');
 
 	print '<table class="border centpercent">';
 
 	// Date payment
 	print '<tr><td>';
 	print $form->editfieldkey('DatePayment', 'datep', '', $object, 0, 'string', '', 1).'</td><td>';
-	print $form->selectDate((empty($datep) ?-1 : $datep), "datep", '', '', '', 'add', 1, 1);
+	print $form->selectDate((empty($datep) ? '' : $datep), "datep", 0, 0, 0, 'add', 1, 1);
 	print '</td></tr>';
 
 	// Date value for bank
@@ -274,6 +274,13 @@ if ($action == 'create')
 	print $form->selectDate((empty($datev) ?-1 : $datev), "datev", '', '', '', 'add', 1, 1);
 	print '</td></tr>';
 
+	// Employee
+	print '<tr><td>';
+	print $form->editfieldkey('Employee', 'fk_user', '', $object, 0, 'string', '', 1).'</td><td>';
+	$noactive = 0; // We keep active and unactive users
+	print $form->select_dolusers(GETPOST('fk_user', 'int'), 'fk_user', 1, '', 0, '', '', 0, 0, 0, 'AND employee=1', 0, '', 'maxwidth300', $noactive);
+	print '</td></tr>';
+
 	// Label
 	print '<tr><td>';
 	print $form->editfieldkey('Label', 'label', '', $object, 0, 'string', '', 1).'</td><td>';
@@ -292,29 +299,12 @@ if ($action == 'create')
 	print $form->selectDate($dateep, "dateep", '', '', '', 'add');
 	print '</td></tr>';
 
-	// Employee
-	print '<tr><td>';
-	print $form->editfieldkey('Employee', 'fk_user', '', $object, 0, 'string', '', 1).'</td><td>';
-	$noactive = 0; // We keep active and unactive users
-	print $form->select_dolusers(GETPOST('fk_user', 'int'), 'fk_user', 1, '', 0, '', '', 0, 0, 0, 'AND employee=1', 0, '', 'maxwidth300', $noactive);
-	print '</td></tr>';
-
 	// Amount
 	print '<tr><td>';
 	print $form->editfieldkey('Amount', 'amount', '', $object, 0, 'string', '', 1).'</td><td>';
 	print '<input name="amount" id="amount" class="minwidth100" value="'.GETPOST("amount").'">';
 	print '</td></tr>';
 
-	// Project
-	if (!empty($conf->projet->enabled))
-	{
-		$formproject = new FormProjets($db);
-
-		print '<tr><td>'.$langs->trans("Project").'</td><td>';
-		$formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1);
-		print '</td></tr>';
-	}
-
 	// Bank
 	if (!empty($conf->banque->enabled))
 	{
@@ -340,25 +330,35 @@ if ($action == 'create')
 		print '<td><input name="num_payment" id="num_payment" type="text" value="'.GETPOST("num_payment").'"></td></tr>'."\n";
 	}
 
-    // Other attributes
-    $parameters = array();
-    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-    if (empty($reshook))
-    {
-        print $object->showOptionals($extrafields, 'edit');
-    }
+	// Project
+	if (!empty($conf->projet->enabled))
+	{
+	    $formproject = new FormProjets($db);
+
+	    print '<tr><td>'.$langs->trans("Project").'</td><td>';
+	    $formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1);
+	    print '</td></tr>';
+	}
+
+	// Other attributes
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	if (empty($reshook))
+	{
+		print $object->showOptionals($extrafields, 'edit');
+	}
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
-	print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+	print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp; &nbsp;&nbsp;';
 	print '<input type="submit" class="button" name="saveandnew" value="'.$langs->trans("SaveAndNew").'">';
 	print '&nbsp;&nbsp; &nbsp;&nbsp;';
-	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
@@ -375,7 +375,7 @@ if ($id)
 {
 	$head = salaries_prepare_head($object);
 
-	dol_fiche_head($head, 'card', $langs->trans("SalaryPayment"), -1, 'payment');
+	print dol_get_fiche_head($head, 'card', $langs->trans("SalaryPayment"), -1, 'payment');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/salaries/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
@@ -466,19 +466,18 @@ if ($id)
 		}
 	}
 
-    // Other attributes
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+	// Other attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 	print '</table>';
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
-	/*
-	 * Action buttons
-	 */
+	// Action buttons
+
 	print '<div class="tabsAction">'."\n";
 	if ($object->rappro == 0)
 	{
diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index 34b58a5c0e4..6aee986396b 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -31,668 +31,678 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
  */
 class PaymentSalary extends CommonObject
 {
-    /**
-     * @var string ID to identify managed object
-     */
-    public $element = 'payment_salary';
-
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element = 'payment_salary';
-
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto = 'payment';
-
-    public $tms;
-
-    /**
-     * @var int User ID
-     */
-    public $fk_user;
-
-    public $datep;
-    public $datev;
-    public $amount;
-
-    /**
-     * @var int ID
-     */
-    public $fk_project;
-
-    public $type_payment;
-    public $num_payment;
-
-    /**
-     * @var string salary payments label
-     */
-    public $label;
-
-    public $datesp;
-    public $dateep;
-
-    /**
-     * @var int ID
-     */
-    public $fk_bank;
-
-    /**
-     * @var int ID
-     */
-    public $fk_user_author;
-
-    /**
-     * @var int ID
-     */
-    public $fk_user_modif;
-
-
-    /**
-     *	Constructor
-     *
-     *  @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-        $this->element = 'payment_salary';
-        $this->table_element = 'payment_salary';
-    }
-
-    /**
-     * Update database
-     *
-     * @param   User	$user        	User that modify
-     * @param	int		$notrigger	    0=no, 1=yes (no update trigger)
-     * @return  int         			<0 if KO, >0 if OK
-     */
-    public function update($user = null, $notrigger = 0)
-    {
-        global $conf, $langs;
-
-        $error = 0;
-
-        // Clean parameters
-        $this->amount = trim($this->amount);
-        $this->label = trim($this->label);
-        $this->note = trim($this->note);
-
-        // Check parameters
-        if (empty($this->fk_user) || $this->fk_user < 0)
-        {
-            $this->error = 'ErrorBadParameter';
-            return -1;
-        }
-
-        $this->db->begin();
-
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."payment_salary SET";
-
-        $sql .= " tms='".$this->db->idate($this->tms)."',";
-        $sql .= " fk_user=".$this->fk_user.",";
-        $sql .= " datep='".$this->db->idate($this->datep)."',";
-        $sql .= " datev='".$this->db->idate($this->datev)."',";
-        $sql .= " amount=".price2num($this->amount).",";
-        $sql .= " fk_projet=".((int) $this->fk_project).",";
-        $sql .= " fk_typepayment=".$this->fk_typepayment."',";
-        $sql .= " num_payment='".$this->db->escape($this->num_payment)."',";
-        $sql .= " label='".$this->db->escape($this->label)."',";
-        $sql .= " datesp='".$this->db->idate($this->datesp)."',";
-        $sql .= " dateep='".$this->db->idate($this->dateep)."',";
-        $sql .= " note='".$this->db->escape($this->note)."',";
-        $sql .= " fk_bank=".($this->fk_bank > 0 ? (int) $this->fk_bank : "null").",";
-        $sql .= " fk_user_author=".((int) $this->fk_user_author).",";
-        $sql .= " fk_user_modif=".($this->fk_user_modif > 0 ? (int) $this->fk_user_modif : 'null');
-
-        $sql .= " WHERE rowid=".$this->id;
-
-        dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql)
-        {
-            $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-
-        // Update extrafield
-        if (!$error)
-        {
-            if (!$error)
-            {
-                $result = $this->insertExtraFields();
-                if ($result < 0)
-                {
-                    $error++;
-                }
-            }
-        }
-
-        if (!$notrigger)
-        {
-            // Call trigger
-            $result = $this->call_trigger('PAYMENT_SALARY_MODIFY', $user);
-            if ($result < 0) $error++;
-            // End call triggers
-        }
-
-        if (!$error)
-        {
-            $this->db->commit();
-            return 1;
-        } else {
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-
-    /**
-     *  Load object in memory from database
-     *
-     *  @param	int		$id         id object
-     *  @param  User	$user       User that load
-     *  @return int         		<0 if KO, >0 if OK
-     */
-    public function fetch($id, $user = null)
-    {
-        global $langs;
-        $sql = "SELECT";
-        $sql .= " s.rowid,";
-
-        $sql .= " s.tms,";
-        $sql .= " s.fk_user,";
-        $sql .= " s.datep,";
-        $sql .= " s.datev,";
-        $sql .= " s.amount,";
-        $sql .= " s.fk_projet as fk_project,";
-        $sql .= " s.fk_typepayment,";
-        $sql .= " s.num_payment,";
-        $sql .= " s.label,";
-        $sql .= " s.datesp,";
-        $sql .= " s.dateep,";
-        $sql .= " s.note,";
-        $sql .= " s.fk_bank,";
-        $sql .= " s.fk_user_author,";
-        $sql .= " s.fk_user_modif,";
-        $sql .= " b.fk_account,";
-        $sql .= " b.fk_type,";
-        $sql .= " b.rappro";
-
-        $sql .= " FROM ".MAIN_DB_PREFIX."payment_salary as s";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON s.fk_bank = b.rowid";
-        $sql .= " WHERE s.rowid = ".$id;
-
-        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
-
-                $this->id = $obj->rowid;
-                $this->ref				= $obj->rowid;
-                $this->tms				= $this->db->jdate($obj->tms);
-                $this->fk_user = $obj->fk_user;
-                $this->datep			= $this->db->jdate($obj->datep);
-                $this->datev			= $this->db->jdate($obj->datev);
-                $this->amount = $obj->amount;
-                $this->fk_project = $obj->fk_project;
-                $this->type_payement = $obj->fk_typepayment;
-                $this->num_payment = $obj->num_payment;
-                $this->label			= $obj->label;
-                $this->datesp			= $this->db->jdate($obj->datesp);
-                $this->dateep			= $this->db->jdate($obj->dateep);
-                $this->note				= $obj->note;
-                $this->fk_bank = $obj->fk_bank;
-                $this->fk_user_author = $obj->fk_user_author;
-                $this->fk_user_modif = $obj->fk_user_modif;
-                $this->fk_account = $obj->fk_account;
-                $this->fk_type = $obj->fk_type;
-                $this->rappro = $obj->rappro;
-
-                // Retreive all extrafield
-                // fetch optionals attributes and labels
-                $this->fetch_optionals();
-            }
-            $this->db->free($resql);
-
-            return 1;
-        } else {
-            $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
-
-
-    /**
-     *  Delete object in database
-     *
-     *	@param	User	$user       User that delete
-     *	@return	int					<0 if KO, >0 if OK
-     */
-    public function delete($user)
-    {
-        global $conf, $langs;
-
-        $error = 0;
-
-        // Call trigger
-        $result = $this->call_trigger('PAYMENT_SALARY_DELETE', $user);
-        if ($result < 0) return -1;
-        // End call triggers
-
-        // Delete donation
-        if (!$error)
-        {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_salary_extrafields";
-            $sql .= " WHERE fk_object=".$this->id;
-
-            $resql = $this->db->query($sql);
-            if (!$resql)
-            {
-                $this->errors[] = $this->db->lasterror();
-                $error++;
-            }
-        }
-
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_salary";
-        $sql .= " WHERE rowid=".$this->id;
-
-        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql)
-        {
-            $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-
-        return 1;
-    }
-
-
-    /**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
-     */
-    public function initAsSpecimen()
-    {
-        $this->id = 0;
-
-        $this->tms = '';
-        $this->fk_user = '';
-        $this->datep = '';
-        $this->datev = '';
-        $this->amount = '';
-        $this->label = '';
-        $this->datesp = '';
-        $this->dateep = '';
-        $this->note = '';
-        $this->fk_bank = '';
-        $this->fk_user_author = '';
-        $this->fk_user_modif = '';
-    }
-
-    /**
-     *  Create in database
-     *
-     *  @param      User	$user       User that create
-     *  @return     int      			<0 if KO, >0 if OK
-     */
-    public function create($user)
-    {
-        global $conf, $langs;
-
-        $error = 0;
-        $now = dol_now();
-
-        // Clean parameters
-        $this->amount = price2num(trim($this->amount));
-        $this->label = trim($this->label);
-        $this->note = trim($this->note);
-        $this->fk_bank = trim($this->fk_bank);
-        $this->fk_user_author = trim($this->fk_user_author);
-        $this->fk_user_modif = trim($this->fk_user_modif);
-
-        // Check parameters
-        if (!$this->label)
-        {
-            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
-            return -3;
-        }
-        if ($this->fk_user < 0 || $this->fk_user == '')
-        {
-            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Employee"));
-            return -4;
-        }
-        if ($this->amount < 0 || $this->amount == '')
-        {
-            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
-            return -5;
-        }
-        if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
-        {
-            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
-            return -6;
-        }
-        if (!empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0))
-        {
-            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
-            return -7;
-        }
-
-        $this->db->begin();
-
-        // Insert into llx_payment_salary
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_salary (fk_user";
-        $sql .= ", datep";
-        $sql .= ", datev";
-        $sql .= ", amount";
-        $sql .= ", fk_projet";
-        $sql .= ", salary";
-        $sql .= ", fk_typepayment";
-        $sql .= ", num_payment";
-        if ($this->note) $sql .= ", note";
-        $sql .= ", label";
-        $sql .= ", datesp";
-        $sql .= ", dateep";
-        $sql .= ", fk_user_author";
-        $sql .= ", datec";
-        $sql .= ", fk_bank";
-        $sql .= ", entity";
-        $sql .= ") ";
-        $sql .= " VALUES (";
-        $sql .= "'".$this->db->escape($this->fk_user)."'";
-        $sql .= ", '".$this->db->idate($this->datep)."'";
-        $sql .= ", '".$this->db->idate($this->datev)."'";
-        $sql .= ", ".$this->amount;
-        $sql .= ", ".($this->fk_project > 0 ? $this->fk_project : 0);
-        $sql .= ", ".($this->salary > 0 ? $this->salary : "null");
-        $sql .= ", ".$this->db->escape($this->type_payment);
-        $sql .= ", '".$this->db->escape($this->num_payment)."'";
-        if ($this->note) $sql .= ", '".$this->db->escape($this->note)."'";
-        $sql .= ", '".$this->db->escape($this->label)."'";
-        $sql .= ", '".$this->db->idate($this->datesp)."'";
-        $sql .= ", '".$this->db->idate($this->dateep)."'";
-        $sql .= ", '".$this->db->escape($user->id)."'";
-        $sql .= ", '".$this->db->idate($now)."'";
-        $sql .= ", NULL";
-        $sql .= ", ".$conf->entity;
-        $sql .= ")";
-
-        dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_salary");
-
-            if ($this->id > 0)
-            {
-                if (!empty($conf->banque->enabled) && !empty($this->amount))
-                {
-                    // Insert into llx_bank
-                    require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-                    $acc = new Account($this->db);
-                    $result = $acc->fetch($this->accountid);
-                    if ($result <= 0) dol_print_error($this->db);
-
-                    // Update extrafield
-                    if (!$error) {
-                        if (!$error)
-                        {
-                            $result = $this->insertExtraFields();
-                            if ($result < 0)
-                            {
-                                $error++;
-                            }
-                        }
-                    }
-
-                    // Insert payment into llx_bank
-                    // Add link 'payment_salary' in bank_url between payment and bank transaction
-                    $bank_line_id = $acc->addline(
-                        $this->datep,
-                        $this->type_payment,
-                        $this->label,
-                        -abs($this->amount),
-                        $this->num_payment,
-                        '',
-                        $user,
-                        '',
-                        '',
-                        '',
-                        $this->datev
-                    );
-
-                    // Update fk_bank into llx_paiement.
-                    // So we know the payment which has generate the banking ecriture
-                    if ($bank_line_id > 0)
-                    {
-                        $this->update_fk_bank($bank_line_id);
-                    } else {
-                        $this->error = $acc->error;
-                        $error++;
-                    }
-
-                    if (!$error)
-                    {
-                        // Add link 'payment_salary' in bank_url between payment and bank transaction
-                        $url = DOL_URL_ROOT.'/salaries/card.php?id=';
-
-                        $result = $acc->add_url_line($bank_line_id, $this->id, $url, "(SalaryPayment)", "payment_salary");
-                        if ($result <= 0)
-                        {
-                            $this->error = $acc->error;
-                            $error++;
-                        }
-                    }
-
-                    $fuser = new User($this->db);
-                    $fuser->fetch($this->fk_user);
-
-                    // Add link 'user' in bank_url between operation and bank transaction
-                    $result = $acc->add_url_line(
-                        $bank_line_id,
-                        $this->fk_user,
-                        DOL_URL_ROOT.'/user/card.php?id=',
-                        $fuser->getFullName($langs),
-                        // $langs->trans("SalaryPayment").' '.$fuser->getFullName($langs).' '.dol_print_date($this->datesp,'dayrfc').' '.dol_print_date($this->dateep,'dayrfc'),
-                        'user'
-                    );
-
-                    if ($result <= 0)
-                    {
-                        $this->error = $acc->error;
-                        $error++;
-                    }
-                }
-
-                // Call trigger
-                $result = $this->call_trigger('PAYMENT_SALARY_CREATE', $user);
-                if ($result < 0) $error++;
-                // End call triggers
-            } else $error++;
-
-            if (!$error)
-            {
-                $this->db->commit();
-                return $this->id;
-            } else {
-                $this->db->rollback();
-                return -2;
-            }
-        } else {
-            $this->error = $this->db->error();
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Update link between payment salary and line generate into llx_bank
-     *
-     *  @param	int		$id_bank    Id bank account
-     *	@return	int					<0 if KO, >0 if OK
-     */
-    public function update_fk_bank($id_bank)
-    {
-        // phpcs:enable
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.'payment_salary SET fk_bank = '.$id_bank;
-        $sql .= ' WHERE rowid = '.$this->id;
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            return 1;
-        } else {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
-
-
-    /**
-     *	Send name clicable (with possibly the picto)
-     *
-     *	@param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
-     *	@param	string	$option						link option
-     *  @param	int  	$notooltip					1=Disable tooltip
-     *  @param  string  $morecss            		Add more css on link
-     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *	@return	string								Chaine with URL
-     */
-    public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
-    {
-        global $db, $conf, $langs, $hookmanager;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
-
-        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
-
-        $result = '';
-
-        $label = '<u>'.$langs->trans("ShowSalaryPayment").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
-
-        $url = DOL_URL_ROOT.'/salaries/card.php?id='.$this->id;
-
-        if ($option != 'nolink')
-        {
-            // Add param to save lastsearch_values or not
-            $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-            if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-            if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
-
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label = $langs->trans("ShowMyObject");
-                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-
-            /*
+	/**
+	 * @var string ID to identify managed object
+	 */
+	public $element = 'payment_salary';
+
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'payment_salary';
+
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'payment';
+
+	public $tms;
+
+	/**
+	 * @var int User ID
+	 */
+	public $fk_user;
+
+	public $datep;
+	public $datev;
+	public $amount;
+
+	/**
+	 * @var int ID
+	 */
+	public $fk_project;
+
+	public $type_payment;
+	public $num_payment;
+
+	/**
+	 * @var string salary payments label
+	 */
+	public $label;
+
+	public $datesp;
+	public $dateep;
+
+	/**
+	 * @var int ID
+	 */
+	public $fk_bank;
+
+	/**
+	 * @var int ID
+	 */
+	public $fk_user_author;
+
+	/**
+	 * @var int ID
+	 */
+	public $fk_user_modif;
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+		$this->element = 'payment_salary';
+		$this->table_element = 'payment_salary';
+	}
+
+	/**
+	 * Update database
+	 *
+	 * @param   User	$user        	User that modify
+	 * @param	int		$notrigger	    0=no, 1=yes (no update trigger)
+	 * @return  int         			<0 if KO, >0 if OK
+	 */
+	public function update($user = null, $notrigger = 0)
+	{
+		global $conf, $langs;
+
+		$error = 0;
+
+		// Clean parameters
+		$this->amount = trim($this->amount);
+		$this->label = trim($this->label);
+		$this->note = trim($this->note);
+
+		// Check parameters
+		if (empty($this->fk_user) || $this->fk_user < 0)
+		{
+			$this->error = 'ErrorBadParameter';
+			return -1;
+		}
+
+		$this->db->begin();
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."payment_salary SET";
+
+		$sql .= " tms='".$this->db->idate($this->tms)."',";
+		$sql .= " fk_user=".$this->fk_user.",";
+		$sql .= " datep='".$this->db->idate($this->datep)."',";
+		$sql .= " datev='".$this->db->idate($this->datev)."',";
+		$sql .= " amount=".price2num($this->amount).",";
+		$sql .= " fk_projet=".((int) $this->fk_project).",";
+		$sql .= " fk_typepayment=".$this->fk_typepayment."',";
+		$sql .= " num_payment='".$this->db->escape($this->num_payment)."',";
+		$sql .= " label='".$this->db->escape($this->label)."',";
+		$sql .= " datesp='".$this->db->idate($this->datesp)."',";
+		$sql .= " dateep='".$this->db->idate($this->dateep)."',";
+		$sql .= " note='".$this->db->escape($this->note)."',";
+		$sql .= " fk_bank=".($this->fk_bank > 0 ? (int) $this->fk_bank : "null").",";
+		$sql .= " fk_user_author=".((int) $this->fk_user_author).",";
+		$sql .= " fk_user_modif=".($this->fk_user_modif > 0 ? (int) $this->fk_user_modif : 'null');
+
+		$sql .= " WHERE rowid=".$this->id;
+
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql)
+		{
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+
+		// Update extrafield
+		if (!$error)
+		{
+			if (!$error)
+			{
+				$result = $this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
+		}
+
+		if (!$notrigger)
+		{
+			// Call trigger
+			$result = $this->call_trigger('PAYMENT_SALARY_MODIFY', $user);
+			if ($result < 0) $error++;
+			// End call triggers
+		}
+
+		if (!$error)
+		{
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *  Load object in memory from database
+	 *
+	 *  @param	int		$id         id object
+	 *  @param  User	$user       User that load
+	 *  @return int         		<0 if KO, >0 if OK
+	 */
+	public function fetch($id, $user = null)
+	{
+		global $langs;
+		$sql = "SELECT";
+		$sql .= " s.rowid,";
+
+		$sql .= " s.tms,";
+		$sql .= " s.fk_user,";
+		$sql .= " s.datep,";
+		$sql .= " s.datev,";
+		$sql .= " s.amount,";
+		$sql .= " s.fk_projet as fk_project,";
+		$sql .= " s.fk_typepayment,";
+		$sql .= " s.num_payment,";
+		$sql .= " s.label,";
+		$sql .= " s.datesp,";
+		$sql .= " s.dateep,";
+		$sql .= " s.note,";
+		$sql .= " s.fk_bank,";
+		$sql .= " s.fk_user_author,";
+		$sql .= " s.fk_user_modif,";
+		$sql .= " b.fk_account,";
+		$sql .= " b.fk_type,";
+		$sql .= " b.rappro";
+
+		$sql .= " FROM ".MAIN_DB_PREFIX."payment_salary as s";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON s.fk_bank = b.rowid";
+		$sql .= " WHERE s.rowid = ".$id;
+
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id = $obj->rowid;
+				$this->ref				= $obj->rowid;
+				$this->tms				= $this->db->jdate($obj->tms);
+				$this->fk_user = $obj->fk_user;
+				$this->datep			= $this->db->jdate($obj->datep);
+				$this->datev			= $this->db->jdate($obj->datev);
+				$this->amount = $obj->amount;
+				$this->fk_project = $obj->fk_project;
+				$this->type_payement = $obj->fk_typepayment;
+				$this->num_payment = $obj->num_payment;
+				$this->label			= $obj->label;
+				$this->datesp			= $this->db->jdate($obj->datesp);
+				$this->dateep			= $this->db->jdate($obj->dateep);
+				$this->note				= $obj->note;
+				$this->fk_bank = $obj->fk_bank;
+				$this->fk_user_author = $obj->fk_user_author;
+				$this->fk_user_modif = $obj->fk_user_modif;
+				$this->fk_account = $obj->fk_account;
+				$this->fk_type = $obj->fk_type;
+				$this->rappro = $obj->rappro;
+
+				// Retrieve all extrafield
+				// fetch optionals attributes and labels
+				$this->fetch_optionals();
+			}
+			$this->db->free($resql);
+
+			return 1;
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *  Delete object in database
+	 *
+	 *	@param	User	$user       User that delete
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
+	public function delete($user)
+	{
+		global $conf, $langs;
+
+		$error = 0;
+
+		// Call trigger
+		$result = $this->call_trigger('PAYMENT_SALARY_DELETE', $user);
+		if ($result < 0) return -1;
+		// End call triggers
+
+		// Delete donation
+		if (!$error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_salary_extrafields";
+			$sql .= " WHERE fk_object=".$this->id;
+
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[] = $this->db->lasterror();
+				$error++;
+			}
+		}
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_salary";
+		$sql .= " WHERE rowid=".$this->id;
+
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql)
+		{
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+
+		return 1;
+	}
+
+
+	/**
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->id = 0;
+
+		$this->tms = '';
+		$this->fk_user = '';
+		$this->datep = '';
+		$this->datev = '';
+		$this->amount = '';
+		$this->label = '';
+		$this->datesp = '';
+		$this->dateep = '';
+		$this->note = '';
+		$this->fk_bank = '';
+		$this->fk_user_author = '';
+		$this->fk_user_modif = '';
+	}
+
+	/**
+	 *  Create in database
+	 *
+	 *  @param      User	$user       User that create
+	 *  @return     int      			<0 if KO, >0 if OK
+	 */
+	public function create($user)
+	{
+		global $conf, $langs;
+
+		$error = 0;
+		$now = dol_now();
+
+		// Clean parameters
+		$this->amount = price2num(trim($this->amount));
+		$this->label = trim($this->label);
+		$this->note = trim($this->note);
+		$this->fk_bank = trim($this->fk_bank);
+		$this->fk_user_author = trim($this->fk_user_author);
+		$this->fk_user_modif = trim($this->fk_user_modif);
+
+		// Check parameters
+		if (!$this->label)
+		{
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
+			return -3;
+		}
+		if ($this->fk_user < 0 || $this->fk_user == '')
+		{
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Employee"));
+			return -4;
+		}
+		if ($this->amount < 0 || $this->amount == '')
+		{
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
+			return -5;
+		}
+		if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
+		{
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
+			return -6;
+		}
+		if (!empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0))
+		{
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
+			return -7;
+		}
+
+		$this->db->begin();
+
+		// Insert into llx_payment_salary
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_salary (fk_user";
+		$sql .= ", datep";
+		$sql .= ", datev";
+		$sql .= ", amount";
+		$sql .= ", fk_projet";
+		$sql .= ", salary";
+		$sql .= ", fk_typepayment";
+		$sql .= ", num_payment";
+		if ($this->note) $sql .= ", note";
+		$sql .= ", label";
+		$sql .= ", datesp";
+		$sql .= ", dateep";
+		$sql .= ", fk_user_author";
+		$sql .= ", datec";
+		$sql .= ", fk_bank";
+		$sql .= ", entity";
+		$sql .= ") ";
+		$sql .= " VALUES (";
+		$sql .= "'".$this->db->escape($this->fk_user)."'";
+		$sql .= ", '".$this->db->idate($this->datep)."'";
+		$sql .= ", '".$this->db->idate($this->datev)."'";
+		$sql .= ", ".$this->amount;
+		$sql .= ", ".($this->fk_project > 0 ? $this->fk_project : 0);
+		$sql .= ", ".($this->salary > 0 ? $this->salary : "null");
+		$sql .= ", ".$this->db->escape($this->type_payment);
+		$sql .= ", '".$this->db->escape($this->num_payment)."'";
+		if ($this->note) $sql .= ", '".$this->db->escape($this->note)."'";
+		$sql .= ", '".$this->db->escape($this->label)."'";
+		$sql .= ", '".$this->db->idate($this->datesp)."'";
+		$sql .= ", '".$this->db->idate($this->dateep)."'";
+		$sql .= ", '".$this->db->escape($user->id)."'";
+		$sql .= ", '".$this->db->idate($now)."'";
+		$sql .= ", NULL";
+		$sql .= ", ".$conf->entity;
+		$sql .= ")";
+
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_salary");
+
+			if ($this->id > 0)
+			{
+				if (!empty($conf->banque->enabled) && !empty($this->amount))
+				{
+					// Insert into llx_bank
+					require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+					$acc = new Account($this->db);
+					$result = $acc->fetch($this->accountid);
+					if ($result <= 0) dol_print_error($this->db);
+
+					// Update extrafield
+					if (!$error) {
+						if (!$error)
+						{
+							$result = $this->insertExtraFields();
+							if ($result < 0)
+							{
+								$error++;
+							}
+						}
+					}
+
+					// Insert payment into llx_bank
+					// Add link 'payment_salary' in bank_url between payment and bank transaction
+					$bank_line_id = $acc->addline(
+						$this->datep,
+						$this->type_payment,
+						$this->label,
+						-abs($this->amount),
+						$this->num_payment,
+						'',
+						$user,
+						'',
+						'',
+						'',
+						$this->datev
+					);
+
+					// Update fk_bank into llx_paiement.
+					// So we know the payment which has generate the banking ecriture
+					if ($bank_line_id > 0)
+					{
+						$this->update_fk_bank($bank_line_id);
+					} else {
+						$this->error = $acc->error;
+						$error++;
+					}
+
+					if (!$error)
+					{
+						// Add link 'payment_salary' in bank_url between payment and bank transaction
+						$url = DOL_URL_ROOT.'/salaries/card.php?id=';
+
+						$result = $acc->add_url_line($bank_line_id, $this->id, $url, "(SalaryPayment)", "payment_salary");
+						if ($result <= 0)
+						{
+							$this->error = $acc->error;
+							$error++;
+						}
+					}
+
+					$fuser = new User($this->db);
+					$fuser->fetch($this->fk_user);
+
+					// Add link 'user' in bank_url between operation and bank transaction
+					$result = $acc->add_url_line(
+						$bank_line_id,
+						$this->fk_user,
+						DOL_URL_ROOT.'/user/card.php?id=',
+						$fuser->getFullName($langs),
+						// $langs->trans("SalaryPayment").' '.$fuser->getFullName($langs).' '.dol_print_date($this->datesp,'dayrfc').' '.dol_print_date($this->dateep,'dayrfc'),
+						'user'
+					);
+
+					if ($result <= 0)
+					{
+						$this->error = $acc->error;
+						$error++;
+					}
+				}
+
+				// Call trigger
+				$result = $this->call_trigger('PAYMENT_SALARY_CREATE', $user);
+				if ($result < 0) $error++;
+				// End call triggers
+			} else $error++;
+
+			if (!$error)
+			{
+				$this->db->commit();
+				return $this->id;
+			} else {
+				$this->db->rollback();
+				return -2;
+			}
+		} else {
+			$this->error = $this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Update link between payment salary and line generate into llx_bank
+	 *
+	 *  @param	int		$id_bank    Id bank account
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
+	public function update_fk_bank($id_bank)
+	{
+		// phpcs:enable
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'payment_salary SET fk_bank = '.$id_bank;
+		$sql .= ' WHERE rowid = '.$this->id;
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
+
+
+	/**
+	 *	Send name clicable (with possibly the picto)
+	 *
+	 *	@param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
+	 *	@param	string	$option						link option
+	 *  @param	int  	$notooltip					1=Disable tooltip
+	 *  @param  string  $morecss            		Add more css on link
+	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return	string								Chaine with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
+		global $db, $conf, $langs, $hookmanager;
+		global $dolibarr_main_authentication, $dolibarr_main_demo;
+		global $menumanager;
+
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+
+		$result = '';
+
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("SalaryPayment").'</u>';
+		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		if (!empty($this->label)) {
+			$labeltoshow = $this->label;
+			$reg = array();
+			if (preg_match('/^\((.*)\)$/i', $this->label, $reg))
+			{
+				// Label generique car entre parentheses. On l'affiche en le traduisant
+				if ($reg[1] == 'paiement') $reg[1] = 'Payment';
+				$labeltoshow = $langs->trans($reg[1]);
+			}
+			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$labeltoshow;
+		}
+
+		$url = DOL_URL_ROOT.'/salaries/card.php?id='.$this->id;
+
+		if ($option != 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
+
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowMyObject");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+
+			/*
              $hookmanager->initHooks(array('myobjectdao'));
              $parameters=array('id'=>$this->id);
              $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
              if ($reshook > 0) $linkclose = $hookmanager->resPrint;
              */
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart .= $linkclose.'>';
-        $linkend = '</a>';
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
-        $result .= $linkstart;
-        if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-        if ($withpicto != 2) $result .= $this->ref;
-        $result .= $linkend;
-        //if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+		$result .= $linkstart;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->ref;
+		$result .= $linkend;
+		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
-        global $action, $hookmanager;
-        $hookmanager->initHooks(array('salarypayment'));
-        $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
-        $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-        if ($reshook > 0) $result = $hookmanager->resPrint;
-        else $result .= $hookmanager->resPrint;
+		global $action, $hookmanager;
+		$hookmanager->initHooks(array('salarypayment'));
+		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+		if ($reshook > 0) $result = $hookmanager->resPrint;
+		else $result .= $hookmanager->resPrint;
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Information on record
-     *
-     * @param	int		$id      Id of record
-     * @return	void
-     */
-    public function info($id)
-    {
-        $sql = 'SELECT ps.rowid, ps.datec, ps.fk_user_author';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'payment_salary as ps';
-        $sql .= ' WHERE ps.rowid = '.$id;
+	/**
+	 * Information on record
+	 *
+	 * @param	int		$id      Id of record
+	 * @return	void
+	 */
+	public function info($id)
+	{
+		$sql = 'SELECT ps.rowid, ps.datec, ps.fk_user_author';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'payment_salary as ps';
+		$sql .= ' WHERE ps.rowid = '.$id;
 
-        dol_syslog(get_class($this).'::info', LOG_DEBUG);
-        $result = $this->db->query($sql);
+		dol_syslog(get_class($this).'::info', LOG_DEBUG);
+		$result = $this->db->query($sql);
 
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
-                $this->id = $obj->rowid;
-                if ($obj->fk_user_author)
-                {
-                    $cuser = new User($this->db);
-                    $cuser->fetch($obj->fk_user_author);
-                    $this->user_creation = $cuser;
-                }
-                $this->date_creation     = $this->db->jdate($obj->datec);
-            }
-            $this->db->free($result);
-        } else {
-            dol_print_error($this->db);
-        }
-    }
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$this->id = $obj->rowid;
+				if ($obj->fk_user_author)
+				{
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
+				$this->date_creation = $this->db->jdate($obj->datec);
+			}
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 
 
-    /**
-     * Retourne le libelle du statut d'une facture (brouillon, validee, abandonnee, payee)
-     *
-     * @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-     * @return  string				Libelle
-     */
-    public function getLibStatut($mode = 0)
-    {
-        return $this->LibStatut($this->statut, $mode);
-    }
+	/**
+	 * Retourne le libelle du statut d'une facture (brouillon, validee, abandonnee, payee)
+	 *
+	 * @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 * @return  string				Libelle
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut($this->statut, $mode);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Renvoi le libelle d'un statut donne
-     *
-     * @param   int		$status     Statut
-     * @param   int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-     * @return	string  		    Libelle du statut
-     */
-    public function LibStatut($status, $mode = 0)
-    {
-        // phpcs:enable
-        global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Renvoi le libelle d'un statut donne
+	 *
+	 * @param   int		$status     Statut
+	 * @param   int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 * @return	string  		    Libelle du statut
+	 */
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage
 
-        $langs->load('compta');
-        /*if ($mode == 0)
+		$langs->load('compta');
+		/*if ($mode == 0)
         {
             if ($status == 0) return $langs->trans('ToValidate');
             if ($status == 1) return $langs->trans('Validated');
@@ -727,6 +737,6 @@ class PaymentSalary extends CommonObject
             if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1');
             if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
         }*/
-        return '';
-    }
+		return '';
+	}
 }
diff --git a/htdocs/salaries/class/salariesstats.class.php b/htdocs/salaries/class/salariesstats.class.php
index f20bde818a1..0fcef8682a8 100644
--- a/htdocs/salaries/class/salariesstats.class.php
+++ b/htdocs/salaries/class/salariesstats.class.php
@@ -29,138 +29,138 @@ include_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
  */
 class SalariesStats extends Stats
 {
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element;
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element;
 
-    public $socid;
-    public $userid;
+	public $socid;
+	public $userid;
 
-    public $from;
-    public $field;
-    public $where;
+	public $from;
+	public $field;
+	public $where;
 
-    /**
-     * Constructor
-     *
-     * @param   DoliDB      $db        Database handler
-     * @param   int         $socid     Id third party
-     * @param   mixed       $userid    Id user for filter or array of user ids
-     * @return  void
-     */
-    public function __construct($db, $socid = 0, $userid = 0)
-    {
-        global $conf;
+	/**
+	 * Constructor
+	 *
+	 * @param   DoliDB      $db        Database handler
+	 * @param   int         $socid     Id third party
+	 * @param   mixed       $userid    Id user for filter or array of user ids
+	 * @return  void
+	 */
+	public function __construct($db, $socid = 0, $userid = 0)
+	{
+		global $conf;
 
-        $this->db = $db;
-        $this->socid = $socid;
-        $this->userid = $userid;
+		$this->db = $db;
+		$this->socid = $socid;
+		$this->userid = $userid;
 
-        $object = new PaymentSalary($this->db);
-        $this->from = MAIN_DB_PREFIX.$object->table_element;
-        $this->field = 'amount';
+		$object = new PaymentSalary($this->db);
+		$this->from = MAIN_DB_PREFIX.$object->table_element;
+		$this->field = 'amount';
 
-        $this->where .= " entity = ".$conf->entity;
-        if ($this->socid) {
-            $this->where .= " AND fk_soc = ".$this->socid;
-        }
-        if (is_array($this->userid) && count($this->userid) > 0) $this->where .= ' AND fk_user IN ('.join(',', $this->userid).')';
-        elseif ($this->userid > 0) $this->where .= ' AND fk_user = '.$this->userid;
-    }
+		$this->where .= " entity = ".$conf->entity;
+		if ($this->socid) {
+			$this->where .= " AND fk_soc = ".$this->socid;
+		}
+		if (is_array($this->userid) && count($this->userid) > 0) $this->where .= ' AND fk_user IN ('.join(',', $this->userid).')';
+		elseif ($this->userid > 0) $this->where .= ' AND fk_user = '.$this->userid;
+	}
 
 
-    /**
-     *  Return the number of salary by year
-     *
-     *	@return		array	Array of values
-     */
-    public function getNbByYear()
-    {
-        $sql = "SELECT YEAR(datep) as dm, count(*)";
-        $sql .= " FROM ".$this->from;
-        $sql .= " GROUP BY dm DESC";
-        $sql .= " WHERE ".$this->where;
+	/**
+	 *  Return the number of salary by year
+	 *
+	 *	@return		array	Array of values
+	 */
+	public function getNbByYear()
+	{
+		$sql = "SELECT YEAR(datep) as dm, count(*)";
+		$sql .= " FROM ".$this->from;
+		$sql .= " GROUP BY dm DESC";
+		$sql .= " WHERE ".$this->where;
 
-        return $this->_getNbByYear($sql);
-    }
+		return $this->_getNbByYear($sql);
+	}
 
 
-    /**
-     *  Return the number of salary by month, for a given year
-     *
-     *	@param	string	$year		Year to scan
-     *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
-     *	@return	array				Array of values
-     */
-    public function getNbByMonth($year, $format = 0)
-    {
-        $sql = "SELECT MONTH(datep) as dm, count(*)";
-        $sql .= " FROM ".$this->from;
-        $sql .= " WHERE YEAR(datep) = ".$year;
-        $sql .= " AND ".$this->where;
-        $sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+	/**
+	 *  Return the number of salary by month, for a given year
+	 *
+	 *	@param	string	$year		Year to scan
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@return	array				Array of values
+	 */
+	public function getNbByMonth($year, $format = 0)
+	{
+		$sql = "SELECT MONTH(datep) as dm, count(*)";
+		$sql .= " FROM ".$this->from;
+		$sql .= " WHERE YEAR(datep) = ".$year;
+		$sql .= " AND ".$this->where;
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
 
-        $res = $this->_getNbByMonth($year, $sql, $format);
-        //var_dump($res);print '<br>';
-        return $res;
-    }
+		$res = $this->_getNbByMonth($year, $sql, $format);
+		//var_dump($res);print '<br>';
+		return $res;
+	}
 
 
-    /**
-     * 	Return amount of salaries by month for a given year
-     *
-     *	@param	int		$year		Year to scan
-    *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
-     *	@return	array				Array of values
-     */
-    public function getAmountByMonth($year, $format = 0)
-    {
-        $sql = "SELECT date_format(datep,'%m') as dm, sum(".$this->field.")";
-        $sql .= " FROM ".$this->from;
-        $sql .= " WHERE date_format(datep,'%Y') = '".$this->db->escape($year)."'";
-        $sql .= " AND ".$this->where;
-        $sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+	/**
+	 * 	Return amount of salaries by month for a given year
+	 *
+	 *	@param	int		$year		Year to scan
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@return	array				Array of values
+	 */
+	public function getAmountByMonth($year, $format = 0)
+	{
+		$sql = "SELECT date_format(datep,'%m') as dm, sum(".$this->field.")";
+		$sql .= " FROM ".$this->from;
+		$sql .= " WHERE date_format(datep,'%Y') = '".$this->db->escape($year)."'";
+		$sql .= " AND ".$this->where;
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
 
-        $res = $this->_getAmountByMonth($year, $sql, $format);
-        //var_dump($res);print '<br>';
+		$res = $this->_getAmountByMonth($year, $sql, $format);
+		//var_dump($res);print '<br>';
 
-        return $res;
-    }
+		return $res;
+	}
 
-    /**
-     *	Return average amount
-     *
-     *	@param	int		$year		Year to scan
-     *	@return	array				Array of values
-     */
-    public function getAverageByMonth($year)
-    {
-        $sql = "SELECT date_format(datep,'%m') as dm, avg(".$this->field.")";
-        $sql .= " FROM ".$this->from;
-        $sql .= " WHERE date_format(datep,'%Y') = '".$this->db->escape($year)."'";
-        $sql .= " AND ".$this->where;
-        $sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+	/**
+	 *	Return average amount
+	 *
+	 *	@param	int		$year		Year to scan
+	 *	@return	array				Array of values
+	 */
+	public function getAverageByMonth($year)
+	{
+		$sql = "SELECT date_format(datep,'%m') as dm, avg(".$this->field.")";
+		$sql .= " FROM ".$this->from;
+		$sql .= " WHERE date_format(datep,'%Y') = '".$this->db->escape($year)."'";
+		$sql .= " AND ".$this->where;
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
 
-        return $this->_getAverageByMonth($year, $sql);
-    }
+		return $this->_getAverageByMonth($year, $sql);
+	}
 
-    /**
-     *	Return nb, total and average
-     *
-     *	@return	array				Array of values
-     */
-    public function getAllByYear()
-    {
-        $sql = "SELECT date_format(datep,'%Y') as year, count(*) as nb, sum(".$this->field.") as total, avg(".$this->field.") as avg";
-        $sql .= " FROM ".$this->from;
-        $sql .= " WHERE ".$this->where;
-        $sql .= " GROUP BY year";
-        $sql .= $this->db->order('year', 'DESC');
+	/**
+	 *	Return nb, total and average
+	 *
+	 *	@return	array				Array of values
+	 */
+	public function getAllByYear()
+	{
+		$sql = "SELECT date_format(datep,'%Y') as year, count(*) as nb, sum(".$this->field.") as total, avg(".$this->field.") as avg";
+		$sql .= " FROM ".$this->from;
+		$sql .= " WHERE ".$this->where;
+		$sql .= " GROUP BY year";
+		$sql .= $this->db->order('year', 'DESC');
 
-        return $this->_getAllByYear($sql);
-    }
+		return $this->_getAllByYear($sql);
+	}
 }
diff --git a/htdocs/salaries/document.php b/htdocs/salaries/document.php
index 403a5b3af3b..6cc482f1304 100644
--- a/htdocs/salaries/document.php
+++ b/htdocs/salaries/document.php
@@ -90,7 +90,7 @@ if ($object->id)
 
 	$head = salaries_prepare_head($object);
 
-	dol_fiche_head($head, 'documents', $langs->trans("SalaryPayment"), -1, 'payment');
+	print dol_get_fiche_head($head, 'documents', $langs->trans("SalaryPayment"), -1, 'payment');
 
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
@@ -122,7 +122,7 @@ if ($object->id)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$modulepart = 'salaries';
 	$permission = $user->rights->salaries->write;
diff --git a/htdocs/salaries/info.php b/htdocs/salaries/info.php
index a0572522aeb..9461bae867e 100644
--- a/htdocs/salaries/info.php
+++ b/htdocs/salaries/info.php
@@ -52,7 +52,7 @@ $object->info($id);
 
 $head = salaries_prepare_head($object);
 
-dol_fiche_head($head, 'info', $langs->trans("SalaryPayment"), -1, 'payment');
+print dol_get_fiche_head($head, 'info', $langs->trans("SalaryPayment"), -1, 'payment');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/salaries/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
@@ -77,7 +77,7 @@ print '</td></tr></table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 9341599ba70..26477900be2 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -31,12 +31,42 @@ if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/account
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "salaries", "bills", "hrm"));
 
-// Security check
-$socid = GETPOST("socid", "int");
-if ($user->socid) $socid = $user->socid;
-$result = restrictedArea($user, 'salaries', '', '', '');
+$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
+$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
+$cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
+$toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'bomlist'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
+$optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
+// Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortfield) $sortfield = "s.datep,s.rowid";
+if (!$sortorder) $sortorder = "DESC,DESC";
+
+// Initialize technical objects
+$object = new PaymentSalary($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->user->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('salarieslist')); // Note that conf->hooks_modules contains array
+
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+if (!$sortfield) $sortfield = "s.datep,s.rowid";
+if (!$sortorder) $sortorder = "DESC,DESC";
+
 $search_ref = GETPOST('search_ref', 'int');
 $search_user = GETPOST('search_user', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
@@ -45,62 +75,114 @@ $search_date_end = dol_mktime(23, 59, 59, GETPOST('search_date_endmonth', 'int')
 $search_amount = GETPOST('search_amount', 'alpha');
 $search_account = GETPOST('search_account', 'int');
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
-$offset = $limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (!$sortfield) $sortfield = "s.datep,s.rowid";
-if (!$sortorder) $sortorder = "DESC,DESC";
-$optioncss = GETPOST('optioncss', 'alpha');
-
 $filtre = GETPOST("filtre", 'restricthtml');
 
-if (!GETPOST('typeid', 'int'))
+if (!GETPOST('search_type_id', 'int'))
 {
 	$newfiltre = str_replace('filtre=', '', $filtre);
 	$filterarray = explode('-', $newfiltre);
 	foreach ($filterarray as $val)
 	{
 		$part = explode(':', $val);
-		if ($part[0] == 's.fk_typepayment') $typeid = $part[1];
+		if ($part[0] == 's.fk_typepayment') $search_type_id = $part[1];
 	}
 } else {
-	$typeid = GETPOST('typeid', 'int');
+	$search_type_id = GETPOST('search_type_id', 'int');
 }
 
+$childids = $user->getAllChildIds(1);
+
+// Security check
+$socid = GETPOST("socid", "int");
+if ($user->socid) $socid = $user->socid;
+$result = restrictedArea($user, 'salaries', '', '', '');
+
+// Initialize array of search criterias
+$search_all = GETPOST("search_all", 'alpha');
+$search = array();
+foreach ($object->fields as $key => $val)
+{
+	if (GETPOST('search_'.$key, 'alpha') !== '') $search[$key] = GETPOST('search_'.$key, 'alpha');
+}
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array();
+foreach ($object->fields as $key => $val)
+{
+	if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
+}
+
+$permissiontoread = $user->rights->salaries->read;
+$permissiontoadd = $user->rights->salaries->write;
+$permissiontodelete = $user->rights->salaries->delete;
 
 
 /*
  * Actions
  */
 
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-{
-	$search_ref = "";
-	$search_user = "";
-	$search_label = "";
-	$search_date_start = '';
-	$search_date_end = '';
-	$search_amount = "";
-	$search_account = '';
-    $typeid = "";
-}
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
 
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
+	{
+		$search_ref = "";
+		$search_user = "";
+		$search_label = "";
+		$search_date_start = '';
+		$search_date_end = '';
+		$search_amount = "";
+		$search_account = '';
+		$search_type_id = "";
+	}
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
+	{
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+	}
+
+	// Mass actions
+	$objectclass = 'PaymentSalary';
+	$objectlabel = 'SalariesPayments';
+	$permissiontoread = $user->rights->salaries->read;
+	$permissiontodelete = $user->rights->salaries->delete;
+	$uploaddir = $conf->bom->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+
+	// Validate records
+	if (!$error && $massaction == 'buildsepa' && $permissiontoadd)
+	{
+		$objecttmp = new $objectclass($db);
+
+		// TODO
+	}
+}
 
 /*
  * View
  */
 
-llxHeader('', $langs->trans("Salaries"));
-
 $form = new Form($db);
 $salstatic = new PaymentSalary($db);
 $userstatic = new User($db);
 $accountstatic = new Account($db);
 
+$now = dol_now();
+
+//$help_url="EN:Module_BillOfMaterials|FR:Module_BillOfMaterials_FR|ES:Módulo_BillOfMaterials";
+$help_url = '';
+$title = $langs->trans('SalariesPayments');
+
 $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.admin, u.salary as current_salary, u.fk_soc as fk_soc, u.statut as status,";
 $sql .= " s.rowid, s.fk_user, s.amount, s.salary, s.label, s.datep as datep, s.datev as datev, s.fk_typepayment as type, s.num_payment, s.fk_bank,";
 $sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel,";
@@ -111,209 +193,319 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON s.fk_bank = b.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid,";
 $sql .= " ".MAIN_DB_PREFIX."user as u";
 $sql .= " WHERE u.rowid = s.fk_user";
-$sql .= " AND s.entity = ".$conf->entity;
+$sql .= " AND s.entity IN (".getEntity('payment_salaries').")";
+if (empty($user->rights->salaries->readall)) $sql .= " AND s.fk_user IN (".join(',', $childids).")";
 
 // Search criteria
-if ($search_ref)			$sql .= " AND s.rowid=".$search_ref;
+if ($search_ref)			$sql .= " AND s.rowid=".((int) $search_ref);
 if ($search_user)			$sql .= natural_search(array('u.login', 'u.lastname', 'u.firstname', 'u.email'), $search_user);
 if ($search_label)			$sql .= natural_search(array('s.label'), $search_label);
 if ($search_date_start)     $sql .= " AND s.datep >= '".$db->idate($search_date_start)."'";
 if ($search_date_end)		$sql .= " AND s.datep <= '".$db->idate($search_date_end)."'";
 if ($search_amount)			$sql .= natural_search("s.amount", $search_amount, 1);
-if ($search_account > 0)	$sql .= " AND b.fk_account=".$search_account;
+if ($search_account > 0)	$sql .= " AND b.fk_account=".((int) $search_account);
 if ($filtre) {
-    $filtre = str_replace(":", "=", $filtre);
-    $sql .= " AND ".$filtre;
+	$filtre = str_replace(":", "=", $filtre);
+	$sql .= " AND ".$filtre;
 }
-if ($typeid) {
-    $sql .= " AND s.fk_typepayment=".$typeid;
+if ($search_type_id) {
+	$sql .= " AND s.fk_typepayment=".$search_type_id;
 }
 $sql .= $db->order($sortfield, $sortorder);
 
-//$sql.= " GROUP BY u.rowid, u.lastname, u.firstname, s.rowid, s.fk_user, s.amount, s.label, s.datev, s.fk_typepayment, s.num_payment, pst.code";
-$totalnboflines = 0;
-$result = $db->query($sql);
-if ($result)
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $totalnboflines = $db->num_rows($result);
+	$resql = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($resql);
+	if (($page * $limit) > $nbtotalofrecords)	// if total of record found is smaller than page * limit, goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
-$sql .= $db->plimit($limit + 1, $offset);
-
-
-$result = $db->query($sql);
-if ($result)
+// if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
+if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
 {
-    $num = $db->num_rows($result);
-    $i = 0;
-    $total = 0;
+	$num = $nbtotalofrecords;
+} else {
+	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
-	$param = '';
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
-	if ($typeid) $param .= '&amp;typeid='.$typeid;
-	if ($optioncss != '') $param .= '&amp;optioncss='.$optioncss;
+	$resql = $db->query($sql);
+	if (!$resql)
+	{
+		dol_print_error($db);
+		exit;
+	}
 
-	$url = DOL_URL_ROOT.'/salaries/card.php?action=create';
-	if (!empty($socid)) $url .= '&socid='.$socid;
-	$newcardbutton = dolGetButtonTitle($langs->trans('NewSalaryPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->salaries->write);
+	$num = $db->num_rows($resql);
+}
 
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    print '<input type="hidden" name="action" value="list">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+// Output page
+// --------------------------------------------------------------------
 
-    print_barre_liste($langs->trans("SalariesPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $newcardbutton, '', $limit, 0, 0, 1);
+llxHeader('', $title, $help_url);
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+$arrayofselected = is_array($toselect) ? $toselect : array();
 
-	print '<tr class="liste_titre_filter">';
-	// Ref
-	print '<td class="liste_titre left">';
-	print '<input class="flat" type="text" size="3" name="search_ref" value="'.$db->escape($search_ref).'">';
-	print '</td>';
-	// Employee
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+if ($search_type_id) $param .= '&search_type_id='.urlencode($search_type_id);
+if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
+if ($search_ref) $param .= '&search_ref='.urlencode($search_ref);
+if ($search_user > 0) $param .= '&search_user='.urlencode($search_user);
+if ($search_label) $param .= '&search_label='.urlencode($search_label);
+if ($search_account) $param .= '&search_account='.urlencode($search_account);
+if ($search_date_start) $param .= '&search_date_startday='.urlencode(GETPOST('search_date_startday', 'int')).'&search_date_startmonth='.urlencode(GETPOST('search_date_startmonth', 'int')).'&search_date_startyear='.urlencode(GETPOST('search_date_startyear', 'int'));
+if ($search_date_end) $param .= '&search_date_endday='.urlencode(GETPOST('search_date_endday', 'int')).'&search_date_endmonth='.urlencode(GETPOST('search_date_endmonth', 'int')).'&search_date_endyear='.urlencode(GETPOST('search_date_endyear', 'int'));
+// Add $param from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+
+// List of mass actions available
+$arrayofmassactions = array(
+	//'presend'=>$langs->trans("SendByMail"),
+	//'buildsepa'=>$langs->trans("BuildSepa"),	// TODO
+);
+//if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+$url = DOL_URL_ROOT.'/salaries/card.php?action=create';
+if (!empty($socid)) $url .= '&socid='.$socid;
+$newcardbutton = dolGetButtonTitle($langs->trans('NewSalaryPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->salaries->write);
+
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $totalnboflines, 'object_payment', 0, $newcardbutton, '', $limit, 0, 0, 1);
+
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+//$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = '';
+$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
+
+print '<div class="div-table-responsive">';
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+
+// Fields title search
+// --------------------------------------------------------------------
+print '<tr class="liste_titre_filter">';
+// Ref
+print '<td class="liste_titre left">';
+print '<input class="flat" type="text" size="3" name="search_ref" value="'.$db->escape($search_ref).'">';
+print '</td>';
+// Employee
+print '<td class="liste_titre">';
+print '<input class="flat" type="text" size="6" name="search_user" value="'.$db->escape($search_user).'">';
+print '</td>';
+// Label
+print '<td class="liste_titre"><input type="text" class="flat width150" name="search_label" value="'.$db->escape($search_label).'"></td>';
+// Date
+print '<td class="liste_titre center">';
+print '<div class="nowrap">';
+print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+print '</div>';
+print '<div class="nowrap">';
+print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+print '</div>';
+print '</td>';
+// Type
+print '<td class="liste_titre left">';
+$form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16);
+print '</td>';
+// Account
+if (!empty($conf->banque->enabled))
+{
 	print '<td class="liste_titre">';
-	print '<input class="flat" type="text" size="6" name="search_user" value="'.$db->escape($search_user).'">';
-	print '</td>';
-	// Label
-	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_label" value="'.$db->escape($search_label).'"></td>';
-	// Date
-	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
-	print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
-	print '</div>';
-	print '<div class="nowrap">';
-	print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
-	print '</div>';
+	$form->select_comptes($search_account, 'search_account', 0, '', 1);
 	print '</td>';
+}
+// Amount
+print '<td class="liste_titre right"><input name="search_amount" class="flat" type="text" size="8" value="'.$db->escape($search_amount).'"></td>';
+
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
+
+// Fields from hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+// Action column
+print '<td class="liste_titre maxwidthsearch">';
+$searchpicto = $form->showFilterButtons();
+print $searchpicto;
+print '</td>';
+print '</tr>'."\n";
+
+
+// Fields title label
+// --------------------------------------------------------------------
+print '<tr class="liste_titre">';
+print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "s.rowid", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "u.rowid", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "s.label", "", $param, 'class="left"', $sortfield, $sortorder);
+print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "s.datep,s.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre("PaymentMode", $_SERVER["PHP_SELF"], "type", "", $param, 'class="left"', $sortfield, $sortorder);
+if (!empty($conf->banque->enabled)) print_liste_field_titre("BankAccount", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "s.amount", "", $param, 'class="right"', $sortfield, $sortorder);
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+// Hook fields
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+// Action column
+print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+print '</tr>'."\n";
+
+
+// Detect if we need a fetch on each output line
+$needToFetchEachLine = 0;
+if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0)
+{
+	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val)
+	{
+		if (preg_match('/\$object/', $val)) $needToFetchEachLine++; // There is at least one compute field that use $object
+	}
+}
+
+// Loop on record
+// --------------------------------------------------------------------
+$i = 0;
+$total = 0;
+$totalarray = array();
+while ($i < ($limit ? min($num, $limit) : $num))
+{
+	$obj = $db->fetch_object($resql);
+	if (empty($obj)) break; // Should not happen
+
+	// Store properties in $object
+	$object->setVarsFromFetchObj($obj);
+
+	// Show here line of result
+	print '<tr class="oddeven">';
+
+	$userstatic->id = $obj->uid;
+	$userstatic->lastname = $obj->lastname;
+	$userstatic->firstname = $obj->firstname;
+	$userstatic->admin = $obj->admin;
+	$userstatic->login = $obj->login;
+	$userstatic->email = $obj->email;
+	$userstatic->socid = $obj->fk_soc;
+	$userstatic->statut = $obj->status;
+
+	$salstatic->id = $obj->rowid;
+	$salstatic->ref = $obj->rowid;
+
+	// Ref
+	print "<td>".$salstatic->getNomUrl(1)."</td>\n";
+	if (!$i) $totalarray['nbfield']++;
+
+	// Employee
+	print "<td>".$userstatic->getNomUrl(1)."</td>\n";
+	if (!$i) $totalarray['nbfield']++;
+
+	// Label payment
+	print "<td>".dol_trunc($obj->label, 40)."</td>\n";
+	if (!$i) $totalarray['nbfield']++;
+
+	// Date payment
+	print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
+	if (!$i) $totalarray['nbfield']++;
+
 	// Type
-	print '<td class="liste_titre left">';
-	$form->select_types_paiements($typeid, 'typeid', '', 0, 1, 1, 16);
-	print '</td>';
+	print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
+	if (!$i) $totalarray['nbfield']++;
+
 	// Account
 	if (!empty($conf->banque->enabled))
-    {
-	    print '<td class="liste_titre">';
-	    $form->select_comptes($search_account, 'search_account', 0, '', 1);
-	    print '</td>';
-    }
+	{
+		print '<td>';
+		if ($obj->fk_bank > 0)
+		{
+			//$accountstatic->fetch($obj->fk_bank);
+			$accountstatic->id = $obj->bid;
+			$accountstatic->ref = $obj->bref;
+			$accountstatic->number = $obj->bnumber;
+
+			if (!empty($conf->accounting->enabled))
+			{
+				$accountstatic->account_number = $obj->account_number;
+
+				$accountingjournal = new AccountingJournal($db);
+				$accountingjournal->fetch($obj->fk_accountancy_journal);
+
+				$accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+			}
+			$accountstatic->label = $obj->blabel;
+			print $accountstatic->getNomUrl(1);
+		} else print '&nbsp;';
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
 	// Amount
-	print '<td class="liste_titre right"><input name="search_amount" class="flat" type="text" size="8" value="'.$db->escape($search_amount).'"></td>';
+	print '<td class="nowrap right">'.price($obj->amount).'</td>';
+	if (!$i) $totalarray['nbfield']++;
+	if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
+	$totalarray['val']['totalttcfield'] += $obj->amount;
 
-    print '<td class="liste_titre maxwidthsearch">';
-    $searchpicto = $form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
+	// Extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+	// Fields from hook
+	$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	// Action column
+	print '<td class="nowrap center">';
+	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+	{
+		$selected = 0;
+		if (in_array($object->id, $arrayofselected)) $selected = 1;
+		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+	}
+	print '</td>';
+	if (!$i) $totalarray['nbfield']++;
 
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "s.rowid", "", $param, "", $sortfield, $sortorder);
-    print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "u.rowid", "", $param, "", $sortfield, $sortorder);
-    print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "s.label", "", $param, 'class="left"', $sortfield, $sortorder);
-    print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "s.datep,s.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
-    print_liste_field_titre("PaymentMode", $_SERVER["PHP_SELF"], "type", "", $param, 'class="left"', $sortfield, $sortorder);
-    if (!empty($conf->banque->enabled)) print_liste_field_titre("BankAccount", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
-    print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "s.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-    print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
-    print "</tr>\n";
+	print '</tr>'."\n";
 
-	print "</tr>\n";
-
-    while ($i < min($num, $limit))
-    {
-        $obj = $db->fetch_object($result);
-
-        print '<tr class="oddeven">';
-
-        $userstatic->id = $obj->uid;
-        $userstatic->lastname = $obj->lastname;
-        $userstatic->firstname = $obj->firstname;
-        $userstatic->admin = $obj->admin;
-        $userstatic->login = $obj->login;
-        $userstatic->email = $obj->email;
-        $userstatic->socid = $obj->fk_soc;
-        $userstatic->statut = $obj->status;
-
-        $salstatic->id = $obj->rowid;
-		$salstatic->ref = $obj->rowid;
-
-        // Ref
-		print "<td>".$salstatic->getNomUrl(1)."</td>\n";
-		if (!$i) $totalarray['nbfield']++;
-
-		// Employee
-		print "<td>".$userstatic->getNomUrl(1)."</td>\n";
-		if (!$i) $totalarray['nbfield']++;
-
-		// Label payment
-        print "<td>".dol_trunc($obj->label, 40)."</td>\n";
-		if (!$i) $totalarray['nbfield']++;
-
-		// Date payment
-        print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
-		if (!$i) $totalarray['nbfield']++;
-
-        // Type
-        print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
-		if (!$i) $totalarray['nbfield']++;
-
-		// Account
-    	if (!empty($conf->banque->enabled))
-	    {
-	        print '<td>';
-	        if ($obj->fk_bank > 0)
-	        {
-	        	//$accountstatic->fetch($obj->fk_bank);
-	            $accountstatic->id = $obj->bid;
-	            $accountstatic->ref = $obj->bref;
-	            $accountstatic->number = $obj->bnumber;
-
-				if (!empty($conf->accounting->enabled))
-				{
-					$accountstatic->account_number = $obj->account_number;
-
-					$accountingjournal = new AccountingJournal($db);
-					$accountingjournal->fetch($obj->fk_accountancy_journal);
-
-					$accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
-				}
-	            $accountstatic->label = $obj->blabel;
-	        	print $accountstatic->getNomUrl(1);
-	        } else print '&nbsp;';
-	        print '</td>';
-			if (!$i) $totalarray['nbfield']++;
-	    }
-
-        // Amount
-        print '<td class="nowrap right">'.price($obj->amount).'</td>';
-		if (!$i) $totalarray['nbfield']++;
-		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
-		$totalarray['val']['totalttcfield'] += $obj->amount;
-
-        print '<td></td>';
-
-		if (!$i) $totalarray['nbfield']++;
-
-        print "</tr>\n";
-
-        $i++;
-    }
-
-	// Show total line
-	include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
-
-    print "</table>";
-    print '</div>';
-	print '</form>';
-
-    $db->free($result);
-} else {
-    dol_print_error($db);
+	$i++;
 }
 
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+
+// If no record found
+if ($num == 0)
+{
+	$colspan = 1;
+	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
+	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+}
+
+
+$db->free($resql);
+
+$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print '</table>'."\n";
+print '</div>'."\n";
+
+print '</form>'."\n";
+
+
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/salaries/stats/index.php b/htdocs/salaries/stats/index.php
index 06beda8ce41..1f0598f4245 100644
--- a/htdocs/salaries/stats/index.php
+++ b/htdocs/salaries/stats/index.php
@@ -185,7 +185,7 @@ $h++;
 
 complete_head_from_modules($conf, $langs, null, $head, $h, 'salaries_stats');
 
-dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
+print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
@@ -270,7 +270,7 @@ print '</div></div></div>';
 print '<div style="clear:both"></div>';
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/societe/admin/contact_extrafields.php b/htdocs/societe/admin/contact_extrafields.php
index d8a2ec15c52..a52bf52332b 100644
--- a/htdocs/societe/admin/contact_extrafields.php
+++ b/htdocs/societe/admin/contact_extrafields.php
@@ -69,11 +69,11 @@ print load_fiche_titre($langs->trans("CompanySetup"), $linkback, 'title_setup');
 
 $head = societe_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes_contacts', $langs->trans("ThirdParties"), -1, 'company');
+print dol_get_fiche_head($head, 'attributes_contacts', $langs->trans("ThirdParties"), -1, 'company');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index d27ebd79207..49b58d61d08 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -77,10 +77,10 @@ if ($action == 'updateoptions')
 		$res = dolibarr_set_const($db, "COMPANY_USE_SEARCH_TO_SELECT", $companysearch, 'chaine', 0, '', $conf->entity);
 		if (!$res > 0) $error++;
 		if (!$error)
-	    {
-		    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	    } else {
-		    setEventMessages($langs->trans("Error"), null, 'errors');
+		{
+			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("Error"), null, 'errors');
 		}
 	}
 
@@ -154,7 +154,7 @@ if ($action == 'setdoc')
 	$sql_del .= " WHERE nom = '".$db->escape(GETPOST('value', 'alpha'))."'";
 	$sql_del .= " AND type = '".$db->escape($type)."'";
 	$sql_del .= " AND entity = ".$conf->entity;
-    dol_syslog("societe.php ".$sql);
+	dol_syslog("societe.php ".$sql);
 	$result1 = $db->query($sql_del);
 
 	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
@@ -162,13 +162,13 @@ if ($action == 'setdoc')
 	$sql .= ($label ? "'".$db->escape($label)."'" : 'null').", ";
 	$sql .= (!empty($scandir) ? "'".$db->escape($scandir)."'" : "null");
 	$sql .= ")";
-    dol_syslog("societe.php", LOG_DEBUG);
+	dol_syslog("societe.php", LOG_DEBUG);
 	$result2 = $db->query($sql);
 	if ($result1 && $result2)
 	{
 		$db->commit();
 	} else {
-	    $db->rollback();
+		$db->rollback();
 	}
 }
 
@@ -198,6 +198,18 @@ if ($action == "setaddadressinlist") {
 	}
 }
 
+//Activate Set email phone town in contact list
+if ($action == "setaddemailphonetownincontactlist") {
+	$val = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST", $val, 'yesno', 0, '', $conf->entity);
+	if (!$res > 0) $error++;
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+}
+
 //Activate Ask For Preferred Shipping Method
 if ($action == "setaskforshippingmet") {
 	$setaskforshippingmet = GETPOST('value', 'int');
@@ -213,15 +225,15 @@ if ($action == "setaskforshippingmet") {
 
 //Activate "Disable prospect/customer type"
 if ($action == "setdisableprospectcustomer") {
-    $setdisableprospectcustomer = GETPOST('value', 'int');
-    $res = dolibarr_set_const($db, "SOCIETE_DISABLE_PROSPECTSCUSTOMERS", $setdisableprospectcustomer, 'yesno', 0, '', $conf->entity);
-    if (!$res > 0) $error++;
-    if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	$setdisableprospectcustomer = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "SOCIETE_DISABLE_PROSPECTSCUSTOMERS", $setdisableprospectcustomer, 'yesno', 0, '', $conf->entity);
+	if (!$res > 0) $error++;
+	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 //Activate ProfId unique
@@ -283,15 +295,15 @@ if ($action == 'sethideinactivethirdparty')
 	}
 }
 if ($action == 'setonsearchandlistgooncustomerorsuppliercard') {
-    $setonsearchandlistgooncustomerorsuppliercard = GETPOST('value', 'int');
-    $res = dolibarr_set_const($db, "SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD", $setonsearchandlistgooncustomerorsuppliercard, 'yesno', 0, '', $conf->entity);
-    if (!$res > 0) $error++;
-    if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	$setonsearchandlistgooncustomerorsuppliercard = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD", $setonsearchandlistgooncustomerorsuppliercard, 'yesno', 0, '', $conf->entity);
+	if (!$res > 0) $error++;
+	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 /*
@@ -311,7 +323,7 @@ print load_fiche_titre($langs->trans("CompanySetup"), $linkback, 'title_setup');
 
 $head = societe_admin_prepare_head();
 
-dol_fiche_head($head, 'general', $langs->trans("ThirdParties"), -1, 'company');
+print dol_get_fiche_head($head, 'general', $langs->trans("ThirdParties"), -1, 'company');
 
 $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 foreach ($conf->modules_parts['models'] as $mo)		$dirsociete[] = $mo.'core/modules/societe/'; //Add more models
@@ -336,34 +348,34 @@ foreach ($dirsociete as $dirroot)
 {
 	$dir = dol_buildpath($dirroot, 0);
 
-    $handle = @opendir($dir);
-    if (is_resource($handle))
-    {
-    	// Loop on each module find in opened directory
-    	while (($file = readdir($handle)) !== false)
-    	{
-    		if (substr($file, 0, 15) == 'mod_codeclient_' && substr($file, -3) == 'php')
-    		{
-    			$file = substr($file, 0, dol_strlen($file) - 4);
+	$handle = @opendir($dir);
+	if (is_resource($handle))
+	{
+		// Loop on each module find in opened directory
+		while (($file = readdir($handle)) !== false)
+		{
+			if (substr($file, 0, 15) == 'mod_codeclient_' && substr($file, -3) == 'php')
+			{
+				$file = substr($file, 0, dol_strlen($file) - 4);
 
-    			try {
-        			dol_include_once($dirroot.$file.'.php');
-    			} catch (Exception $e)
-    			{
-    			    dol_syslog($e->getMessage(), LOG_ERR);
-    			}
+				try {
+					dol_include_once($dirroot.$file.'.php');
+				} catch (Exception $e)
+				{
+					dol_syslog($e->getMessage(), LOG_ERR);
+				}
 
-    			$modCodeTiers = new $file;
+				$modCodeTiers = new $file;
 
-    			// Show modules according to features level
-    			if ($modCodeTiers->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-    			if ($modCodeTiers->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+				// Show modules according to features level
+				if ($modCodeTiers->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+				if ($modCodeTiers->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-    			$arrayofmodules[$file] = $modCodeTiers;
-    		}
-    	}
-    	closedir($handle);
-    }
+				$arrayofmodules[$file] = $modCodeTiers;
+			}
+		}
+		closedir($handle);
+	}
 }
 
 $arrayofmodules = dol_sort_array($arrayofmodules, 'position');
@@ -383,7 +395,7 @@ foreach ($arrayofmodules as $file => $modCodeTiers)
 	} else {
 		$disabled = (!empty($conf->multicompany->enabled) && (is_object($mc) && !empty($mc->sharings['referent']) && $mc->sharings['referent'] != $conf->entity) ? true : false);
 		print '<td class="center">';
-		if (!$disabled) print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodeclient&amp;token='.newToken().'&amp;value='.$file.'">';
+		if (!$disabled) print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodeclient&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
 		print img_picto($langs->trans("Disabled"), 'switch_off');
 		if (!$disabled) print '</a>';
 		print '</td>';
@@ -423,28 +435,28 @@ foreach ($dirsociete as $dirroot)
 	$dir = dol_buildpath($dirroot, 0);
 
 	$handle = @opendir($dir);
-    if (is_resource($handle))
-    {
-    	while (($file = readdir($handle)) !== false)
-    	{
-    		if (substr($file, 0, 15) == 'mod_codecompta_' && substr($file, -3) == 'php')
-    		{
-    			$file = substr($file, 0, dol_strlen($file) - 4);
+	if (is_resource($handle))
+	{
+		while (($file = readdir($handle)) !== false)
+		{
+			if (substr($file, 0, 15) == 'mod_codecompta_' && substr($file, -3) == 'php')
+			{
+				$file = substr($file, 0, dol_strlen($file) - 4);
 
-    		    try {
-        			dol_include_once($dirroot.$file.'.php');
-    			} catch (Exception $e)
-    			{
-    			    dol_syslog($e->getMessage(), LOG_ERR);
-    			}
+				try {
+					dol_include_once($dirroot.$file.'.php');
+				} catch (Exception $e)
+				{
+					dol_syslog($e->getMessage(), LOG_ERR);
+				}
 
-    			$modCodeCompta = new $file;
+				$modCodeCompta = new $file;
 
-    			$arrayofmodules[$file] = $modCodeCompta;
-    		}
-    	}
-        closedir($handle);
-    }
+				$arrayofmodules[$file] = $modCodeCompta;
+			}
+		}
+		closedir($handle);
+	}
 }
 
 $arrayofmodules = dol_sort_array($arrayofmodules, 'position');
@@ -452,27 +464,27 @@ $arrayofmodules = dol_sort_array($arrayofmodules, 'position');
 
 foreach ($arrayofmodules as $file => $modCodeCompta)
 {
-    print '<tr class="oddeven">';
-    print '<td>'.$modCodeCompta->name."</td><td>\n";
-    print $modCodeCompta->info($langs);
-    print '</td>';
-    print '<td class="nowrap">'.$modCodeCompta->getExample($langs)."</td>\n";
+	print '<tr class="oddeven">';
+	print '<td>'.$modCodeCompta->name."</td><td>\n";
+	print $modCodeCompta->info($langs);
+	print '</td>';
+	print '<td class="nowrap">'.$modCodeCompta->getExample($langs)."</td>\n";
 
-    if ($conf->global->SOCIETE_CODECOMPTA_ADDON == "$file")
-    {
-    	print '<td class="center">';
-    	print img_picto($langs->trans("Activated"), 'switch_on');
-    	print '</td>';
-    } else {
-    	print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodecompta&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
-    	print img_picto($langs->trans("Disabled"), 'switch_off');
-    	print '</a></td>';
-    }
-    print '<td class="center">';
-    $s = $modCodeCompta->getToolTip($langs, null, -1);
-    print $form->textwithpicto('', $s, 1);
-    print '</td>';
-    print "</tr>\n";
+	if ($conf->global->SOCIETE_CODECOMPTA_ADDON == "$file")
+	{
+		print '<td class="center">';
+		print img_picto($langs->trans("Activated"), 'switch_on');
+		print '</td>';
+	} else {
+		print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodecompta&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
+		print img_picto($langs->trans("Disabled"), 'switch_off');
+		print '</a></td>';
+	}
+	print '<td class="center">';
+	$s = $modCodeCompta->getToolTip($langs, null, -1);
+	print $form->textwithpicto('', $s, 1);
+	print '</td>';
+	print "</tr>\n";
 }
 print "</table>\n";
 print '</div>';
@@ -529,14 +541,14 @@ foreach ($dirsociete as $dirroot)
 				$name = substr($file, 4, dol_strlen($file) - 16);
 				$classname = substr($file, 0, dol_strlen($file) - 12);
 
-			    try {
-        			dol_include_once($dirroot.'doc/'.$file);
-    			} catch (Exception $e)
-    			{
-    			    dol_syslog($e->getMessage(), LOG_ERR);
-    			}
+				try {
+					dol_include_once($dirroot.'doc/'.$file);
+				} catch (Exception $e)
+				{
+					dol_syslog($e->getMessage(), LOG_ERR);
+				}
 
-    			$module = new $classname($db);
+				$module = new $classname($db);
 
 				$modulequalified = 1;
 				if (!empty($module->version)) {
@@ -559,7 +571,7 @@ foreach ($dirsociete as $dirroot)
 						print "<td class=\"center\">\n";
 						//if ($conf->global->COMPANY_ADDON_PDF != "$name")
 						//{
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">';
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'&token='.newToken().'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">';
 							print img_picto($langs->trans("Enabled"), 'switch_on');
 							print '</a>';
 						//}
@@ -571,12 +583,12 @@ foreach ($dirsociete as $dirroot)
 					} else {
 						if (versioncompare($module->phpmin, versionphparray()) > 0)
 						{
-							print "<td class=\"center\">\n";
+							print '<td class="center">'."\n";
 							print img_picto(dol_escape_htmltag($langs->trans("ErrorModuleRequirePHPVersion", join('.', $module->phpmin))), 'switch_off');
 							print "</td>";
 						} else {
-							print "<td class=\"center\">\n";
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+							print '<td class="center">'."\n";
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&token='.newToken().'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 							print "</td>";
 						}
 					}
@@ -599,7 +611,7 @@ foreach ($dirsociete as $dirroot)
 					print '<td class="center nowrap">';
 					if ($module->type == 'pdf')
 					{
-						$linkspec = '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
+						$linkspec = '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&token='.newToken().'&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
 					} else {
 						$linkspec = img_object($langs->trans("PreviewNotAvailable"), 'generic');
 					}
@@ -736,8 +748,8 @@ if (!$conf->use_javascript_ajax)
 	print '<td width="60" class="right">';
 	$arrval = array('0'=>$langs->trans("No"),
 	'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
-    '2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',
-    '3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',
+	'2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',
+	'3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',
 	);
 	print $form->selectarray("activate_COMPANY_USE_SEARCH_TO_SELECT", $arrval, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, 0, 0, '', 0, 0, 0, '', 'minwidth75imp');
 	print '</td><td class="right">';
@@ -800,23 +812,39 @@ if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST))
 print '</a></td>';
 print '</tr>';
 
-
-
 print '<tr class="oddeven">';
-print '<td width="80%">'.$langs->trans("AskForPreferredShippingMethod").'</td>';
+print '<td width="80%">'.$langs->trans("AddEmailPhoneTownInContactList").'</td>';
 print '<td>&nbsp</td>';
 print '<td class="center">';
-if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD))
-{
-	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&token='.newToken().'&value=0">';
+if (!empty($conf->global->CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST)) {
+	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddemailphonetownincontactlist&token='.newToken().'&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
 } else {
-	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&token='.newToken().'&value=1">';
+	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddemailphonetownincontactlist&token='.newToken().'&value=1">';
 	print img_picto($langs->trans("Disabled"), 'switch_off');
 }
 print '</a></td>';
 print '</tr>';
 
+if (!empty($conf->expedition->enabled)) {
+	if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {	// Visible on experimental only because seems to not be implemented everywhere (only on proposal)
+		print '<tr class="oddeven">';
+		print '<td width="80%">'.$langs->trans("AskForPreferredShippingMethod").'</td>';
+		print '<td>&nbsp</td>';
+		print '<td class="center">';
+		if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD))
+		{
+			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&token='.newToken().'&value=0">';
+			print img_picto($langs->trans("Activated"), 'switch_on');
+		} else {
+			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&token='.newToken().'&value=1">';
+			print img_picto($langs->trans("Disabled"), 'switch_off');
+		}
+		print '</a></td>';
+		print '</tr>';
+	}
+}
+
 // Disable Prospect/Customer thirdparty type
 print '<tr class="oddeven">';
 print '<td width="80%">'.$langs->trans("DisableProspectCustomerType").'</td>';
@@ -824,11 +852,11 @@ print '<td>&nbsp</td>';
 print '<td class="center">';
 if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS))
 {
-    print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setdisableprospectcustomer&token='.newToken().'&value=0">';
-    print img_picto($langs->trans("Activated"), 'switch_on');
+	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setdisableprospectcustomer&token='.newToken().'&value=0">';
+	print img_picto($langs->trans("Activated"), 'switch_on');
 } else {
-    print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setdisableprospectcustomer&token='.newToken().'&value=1">';
-    print img_picto($langs->trans("Disabled"), 'switch_off');
+	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setdisableprospectcustomer&token='.newToken().'&value=1">';
+	print img_picto($langs->trans("Disabled"), 'switch_off');
 }
 print '</a></td>';
 print '</tr>';
@@ -850,7 +878,7 @@ print '</div>';
 print '</form>';
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/societe/admin/societe_extrafields.php b/htdocs/societe/admin/societe_extrafields.php
index 02c7dc51231..16d88142588 100644
--- a/htdocs/societe/admin/societe_extrafields.php
+++ b/htdocs/societe/admin/societe_extrafields.php
@@ -69,11 +69,11 @@ print load_fiche_titre($langs->trans("CompanySetup"), $linkback, 'title_setup');
 
 $head = societe_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("ThirdParties"), -1, 'company');
+print dol_get_fiche_head($head, 'attributes', $langs->trans("ThirdParties"), -1, 'company');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 77953f73d7c..f98f7ac7ccf 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -36,10 +36,10 @@ $langs->loadLangs(array("companies", "bills", "propal", "orders"));
 
 if (GETPOST('actioncode', 'array'))
 {
-    $actioncode = GETPOST('actioncode', 'array', 3);
-    if (!count($actioncode)) $actioncode = '0';
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) $actioncode = '0';
 } else {
-    $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
@@ -73,19 +73,19 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Cancel
-    if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-    {
-        header("Location: ".$backtopage);
-        exit;
-    }
+	// Cancel
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage))
+	{
+		header("Location: ".$backtopage);
+		exit;
+	}
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $actioncode = '';
-        $search_agenda_label = '';
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$actioncode = '';
+		$search_agenda_label = '';
+	}
 }
 
 
@@ -111,66 +111,66 @@ if ($socid > 0)
 	if (!empty($conf->notification->enabled)) $langs->load("mails");
 	$head = societe_prepare_head($object);
 
-	dol_fiche_head($head, 'agenda', $langs->trans("ThirdParty"), -1, 'company');
+	print dol_get_fiche_head($head, 'agenda', $langs->trans("ThirdParty"), -1, 'company');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
+	dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 
-    $object->info($socid);
+	$object->info($socid);
 	dol_print_object_info($object, 1);
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 
 	// Actions buttons
 
-    $objthirdparty = $object;
-    $objcon = new stdClass();
+	$objthirdparty = $object;
+	$objcon = new stdClass();
 
-    $out = '';
-    $permok = $user->rights->agenda->myactions->create;
-    if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
-    {
+	$out = '';
+	$permok = $user->rights->agenda->myactions->create;
+	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
+	{
 		if (is_object($objthirdparty) && get_class($objthirdparty) == 'Societe') $out .= '&amp;originid='.$objthirdparty->id.($objthirdparty->id > 0 ? '&amp;socid='.$objthirdparty->id : '').'&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].($objthirdparty->id > 0 ? '?socid='.$objthirdparty->id : ''));
 		$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;percentage=-1';
 		$out .= '&amp;datep='.dol_print_date(dol_now(), 'dayhourlog');
 	}
 
 	$newcardbutton = '';
-    if (!empty($conf->agenda->enabled))
-    {
-    	if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
-    	{
-            $newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out);
-    	}
-    }
+	if (!empty($conf->agenda->enabled))
+	{
+		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
+		{
+			$newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out);
+		}
+	}
 
-    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-    {
-    	print '<br>';
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
+	{
+		print '<br>';
 
-        $param = '&socid='.$socid;
-        if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-        if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+		$param = '&socid='.$socid;
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
 		print load_fiche_titre($langs->trans("ActionsOnCompany"), $newcardbutton, '');
-        //print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $newcardbutton, '', 0, 1, 1);
+		//print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $newcardbutton, '', 0, 1, 1);
 
-        // List of all actions
+		// List of all actions
 		$filters = array();
-        $filters['search_agenda_label'] = $search_agenda_label;
+		$filters['search_agenda_label'] = $search_agenda_label;
 
-        // TODO Replace this with same code than into list.php
-        show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
-    }
+		// TODO Replace this with same code than into list.php
+		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
+	}
 }
 
 // End of page
diff --git a/htdocs/societe/ajaxcompanies.php b/htdocs/societe/ajaxcompanies.php
index b98a5f75d5b..da7591a419b 100644
--- a/htdocs/societe/ajaxcompanies.php
+++ b/htdocs/societe/ajaxcompanies.php
@@ -64,18 +64,18 @@ if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn'))
 	$sql .= " WHERE s.entity IN (".getEntity('societe').")";
 	if ($socid)
 	{
-        $sql .= " AND (";
-        // Add criteria on name/code
-        if (!empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE))   // Can use index
-        {
-            $sql .= "nom LIKE '".$db->escape($socid)."%'";
-            $sql .= " OR code_client LIKE '".$db->escape($socid)."%'";
-            $sql .= " OR code_fournisseur LIKE '".$db->escape($socid)."%'";
-        } else {
-    		$sql .= "nom LIKE '%".$db->escape($socid)."%'";
-    		$sql .= " OR code_client LIKE '%".$db->escape($socid)."%'";
-    		$sql .= " OR code_fournisseur LIKE '%".$db->escape($socid)."%'";
-        }
+		$sql .= " AND (";
+		// Add criteria on name/code
+		if (!empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE))   // Can use index
+		{
+			$sql .= "nom LIKE '".$db->escape($socid)."%'";
+			$sql .= " OR code_client LIKE '".$db->escape($socid)."%'";
+			$sql .= " OR code_fournisseur LIKE '".$db->escape($socid)."%'";
+		} else {
+			$sql .= "nom LIKE '%".$db->escape($socid)."%'";
+			$sql .= " OR code_client LIKE '%".$db->escape($socid)."%'";
+			$sql .= " OR code_fournisseur LIKE '%".$db->escape($socid)."%'";
+		}
 		if (!empty($conf->global->SOCIETE_ALLOW_SEARCH_ON_ROWID)) $sql .= " OR rowid = '".$db->escape($socid)."'";
 		$sql .= ")";
 	}
@@ -88,19 +88,19 @@ if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn'))
 	{
 		while ($row = $db->fetch_array($resql))
 		{
-		    $label = $row['nom'];
-		    if ($socid) $label = preg_replace('/('.preg_quote($socid, '/').')/i', '<strong>$1</strong>', $label, 1);
+			$label = $row['nom'];
+			if ($socid) $label = preg_replace('/('.preg_quote($socid, '/').')/i', '<strong>$1</strong>', $label, 1);
 			$row_array['label'] = $label;
 			$row_array['value'] = $row['nom'];
-	        $row_array['key'] = $row['rowid'];
+			$row_array['key'] = $row['rowid'];
 
-	        array_push($return_arr, $row_array);
-	    }
+			array_push($return_arr, $row_array);
+		}
 
-	    echo json_encode($return_arr);
+		echo json_encode($return_arr);
 	} else {
-	    echo json_encode(array('nom'=>'Error', 'label'=>'Error', 'key'=>'Error', 'value'=>'Error'));
+		echo json_encode(array('nom'=>'Error', 'label'=>'Error', 'key'=>'Error', 'value'=>'Error'));
 	}
 } else {
-    echo json_encode(array('nom'=>'ErrorBadParameter', 'label'=>'ErrorBadParameter', 'key'=>'ErrorBadParameter', 'value'=>'ErrorBadParameter'));
+	echo json_encode(array('nom'=>'ErrorBadParameter', 'label'=>'ErrorBadParameter', 'key'=>'ErrorBadParameter', 'value'=>'ErrorBadParameter'));
 }
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index fa650a4e1fd..83309e0faf1 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -27,15 +27,15 @@
  */
 abstract class ActionsCardCommon
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $dirmodule;
-    public $targetmodule;
-    public $canvas;
-    public $card;
+	public $dirmodule;
+	public $targetmodule;
+	public $canvas;
+	public $card;
 
 	//! Template container
 	public $tpl = array();
@@ -55,22 +55,22 @@ abstract class ActionsCardCommon
 
 
 	/**
-     *  Get object from id or ref and save it into this->object
+	 *  Get object from id or ref and save it into this->object
 	 *
-     *  @param		int		$id			Object id
-     *  @param		string	$ref		Object ref
-     *  @return		object				Object loaded
-     */
-    protected function getObject($id, $ref = '')
-    {
-    	//$ret = $this->getInstanceDao();
+	 *  @param		int		$id			Object id
+	 *  @param		string	$ref		Object ref
+	 *  @return		object				Object loaded
+	 */
+	protected function getObject($id, $ref = '')
+	{
+		//$ret = $this->getInstanceDao();
 
-    	$object = new Societe($this->db);
-    	if (!empty($id) || !empty($ref)) $object->fetch($id, $ref);
-    	$this->object = $object;
-    }
+		$object = new Societe($this->db);
+		if (!empty($id) || !empty($ref)) $object->fetch($id, $ref);
+		$this->object = $object;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Assign custom values for canvas (for example into this->tpl to be used by templates)
 	 *
@@ -78,32 +78,32 @@ abstract class ActionsCardCommon
 	 *    @param	integer	$id			Id of object
 	 *    @param	string	$ref		Ref of object
 	 *    @return	void
-     */
-    public function assign_values(&$action, $id = 0, $ref = '')
-    {
-        // phpcs:enable
-        global $conf, $langs, $db, $user, $mysoc, $canvas;
-        global $form, $formadmin, $formcompany;
+	 */
+	public function assign_values(&$action, $id = 0, $ref = '')
+	{
+		// phpcs:enable
+		global $conf, $langs, $db, $user, $mysoc, $canvas;
+		global $form, $formadmin, $formcompany;
 
-        if ($action == 'add' || $action == 'update') $this->assign_post($action);
+		if ($action == 'add' || $action == 'update') $this->assign_post($action);
 
-        if ($_GET["type"] == 'f') { $this->object->fournisseur = 1; }
-        if ($_GET["type"] == 'c') { $this->object->client = 1; }
-        if ($_GET["type"] == 'p') { $this->object->client = 2; }
-        if ($_GET["type"] == 'cp') { $this->object->client = 3; }
-        if ($_REQUEST["private"] == 1) { $this->object->particulier = 1; }
+		if ($_GET["type"] == 'f') { $this->object->fournisseur = 1; }
+		if ($_GET["type"] == 'c') { $this->object->client = 1; }
+		if ($_GET["type"] == 'p') { $this->object->client = 2; }
+		if ($_GET["type"] == 'cp') { $this->object->client = 3; }
+		if ($_REQUEST["private"] == 1) { $this->object->particulier = 1; }
 
-        foreach ($this->object as $key => $value)
-        {
-            $this->tpl[$key] = $value;
-        }
+		foreach ($this->object as $key => $value)
+		{
+			$this->tpl[$key] = $value;
+		}
 
-        $this->tpl['error'] = get_htmloutput_errors($this->object->error, $this->object->errors);
-        if (is_array($GLOBALS['errors'])) $this->tpl['error'] = get_htmloutput_mesg('', $GLOBALS['errors'], 'error');
+		$this->tpl['error'] = get_htmloutput_errors($this->object->error, $this->object->errors);
+		if (is_array($GLOBALS['errors'])) $this->tpl['error'] = get_htmloutput_mesg('', $GLOBALS['errors'], 'error');
 
-        if ($action == 'create')
-        {
-        	if ($conf->use_javascript_ajax)
+		if ($action == 'create')
+		{
+			if ($conf->use_javascript_ajax)
 			{
 				$this->tpl['ajax_selecttype'] = "\n".'<script type="text/javascript" language="javascript">
 				$(document).ready(function () {
@@ -122,11 +122,11 @@ abstract class ActionsCardCommon
 		          });
                 </script>'."\n";
 			}
-        }
+		}
 
-        if ($action == 'create' || $action == 'edit')
-        {
-        	if ($conf->use_javascript_ajax)
+		if ($action == 'create' || $action == 'edit')
+		{
+			if ($conf->use_javascript_ajax)
 			{
 				$this->tpl['ajax_selectcountry'] = "\n".'<script type="text/javascript" language="javascript">
 				$(document).ready(function () {
@@ -139,278 +139,278 @@ abstract class ActionsCardCommon
 				</script>'."\n";
 			}
 
-            // Load object modCodeClient
-            $module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
-            if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-            {
-                $module = substr($module, 0, dol_strlen($module) - 4);
-            }
-            $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-            foreach ($dirsociete as $dirroot)
-            {
-                $res = dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
-            }
-            $modCodeClient = new $module($db);
-            $this->tpl['auto_customercode'] = $modCodeClient->code_auto;
-            // We verified if the tag prefix is used
-            if ($modCodeClient->code_auto) $this->tpl['prefix_customercode'] = $modCodeClient->verif_prefixIsUsed();
+			// Load object modCodeClient
+			$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+			if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
+			{
+				$module = substr($module, 0, dol_strlen($module) - 4);
+			}
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+			foreach ($dirsociete as $dirroot)
+			{
+				$res = dol_include_once($dirroot.$module.'.php');
+				if ($res) break;
+			}
+			$modCodeClient = new $module($db);
+			$this->tpl['auto_customercode'] = $modCodeClient->code_auto;
+			// We verified if the tag prefix is used
+			if ($modCodeClient->code_auto) $this->tpl['prefix_customercode'] = $modCodeClient->verif_prefixIsUsed();
 
-            // TODO create a function
-            $this->tpl['select_customertype'] = Form::selectarray('client', array(
-                0 => $langs->trans('NorProspectNorCustomer'),
-                1 => $langs->trans('Customer'),
-                2 => $langs->trans('Prospect'),
-                3 => $langs->trans('ProspectCustomer')
-            ), $this->object->client);
+			// TODO create a function
+			$this->tpl['select_customertype'] = Form::selectarray('client', array(
+				0 => $langs->trans('NorProspectNorCustomer'),
+				1 => $langs->trans('Customer'),
+				2 => $langs->trans('Prospect'),
+				3 => $langs->trans('ProspectCustomer')
+			), $this->object->client);
 
-            // Customer
-            $this->tpl['customercode'] = $this->object->code_client;
-            if ((!$this->object->code_client || $this->object->code_client == -1) && $modCodeClient->code_auto) $this->tpl['customercode'] = $modCodeClient->getNextValue($this->object, 0);
-            $this->tpl['ismodifiable_customercode'] = $this->object->codeclient_modifiable();
-            $s = $modCodeClient->getToolTip($langs, $this->object, 0);
-            $this->tpl['help_customercode'] = $form->textwithpicto('', $s, 1);
+			// Customer
+			$this->tpl['customercode'] = $this->object->code_client;
+			if ((!$this->object->code_client || $this->object->code_client == -1) && $modCodeClient->code_auto) $this->tpl['customercode'] = $modCodeClient->getNextValue($this->object, 0);
+			$this->tpl['ismodifiable_customercode'] = $this->object->codeclient_modifiable();
+			$s = $modCodeClient->getToolTip($langs, $this->object, 0);
+			$this->tpl['help_customercode'] = $form->textwithpicto('', $s, 1);
 
-            if (!empty($conf->fournisseur->enabled))
-            {
-            	$this->tpl['supplier_enabled'] = 1;
+			if (!empty($conf->fournisseur->enabled))
+			{
+				$this->tpl['supplier_enabled'] = 1;
 
-            	// Load object modCodeFournisseur
-            	$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
-            	if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-            	{
-            		$module = substr($module, 0, dol_strlen($module) - 4);
-            	}
-                $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-                foreach ($dirsociete as $dirroot)
-                {
-                    $res = dol_include_once($dirroot.$module.'.php');
-                    if ($res) break;
-                }
-            	$modCodeFournisseur = new $module;
-            	$this->tpl['auto_suppliercode'] = $modCodeFournisseur->code_auto;
-            	// We verified if the tag prefix is used
-            	if ($modCodeFournisseur->code_auto) $this->tpl['prefix_suppliercode'] = $modCodeFournisseur->verif_prefixIsUsed();
+				// Load object modCodeFournisseur
+				$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
+				if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
+				{
+					$module = substr($module, 0, dol_strlen($module) - 4);
+				}
+				$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+				foreach ($dirsociete as $dirroot)
+				{
+					$res = dol_include_once($dirroot.$module.'.php');
+					if ($res) break;
+				}
+				$modCodeFournisseur = new $module;
+				$this->tpl['auto_suppliercode'] = $modCodeFournisseur->code_auto;
+				// We verified if the tag prefix is used
+				if ($modCodeFournisseur->code_auto) $this->tpl['prefix_suppliercode'] = $modCodeFournisseur->verif_prefixIsUsed();
 
-            	// Supplier
-            	$this->tpl['yn_supplier'] = $form->selectyesno("fournisseur", $this->object->fournisseur, 1);
-            	$this->tpl['suppliercode'] = $this->object->code_fournisseur;
-            	if ((!$this->object->code_fournisseur || $this->object->code_fournisseur == -1) && $modCodeFournisseur->code_auto) $this->tpl['suppliercode'] = $modCodeFournisseur->getNextValue($this->object, 1);
-            	$this->tpl['ismodifiable_suppliercode'] = $this->object->codefournisseur_modifiable();
-            	$s = $modCodeFournisseur->getToolTip($langs, $this->object, 1);
-            	$this->tpl['help_suppliercode'] = $form->textwithpicto('', $s, 1);
+				// Supplier
+				$this->tpl['yn_supplier'] = $form->selectyesno("fournisseur", $this->object->fournisseur, 1);
+				$this->tpl['suppliercode'] = $this->object->code_fournisseur;
+				if ((!$this->object->code_fournisseur || $this->object->code_fournisseur == -1) && $modCodeFournisseur->code_auto) $this->tpl['suppliercode'] = $modCodeFournisseur->getNextValue($this->object, 1);
+				$this->tpl['ismodifiable_suppliercode'] = $this->object->codefournisseur_modifiable();
+				$s = $modCodeFournisseur->getToolTip($langs, $this->object, 1);
+				$this->tpl['help_suppliercode'] = $form->textwithpicto('', $s, 1);
 
-            	$this->object->LoadSupplierCateg();
-            	$this->tpl['suppliercategory'] = $this->object->SupplierCategories;
-            }
+				$this->object->LoadSupplierCateg();
+				$this->tpl['suppliercategory'] = $this->object->SupplierCategories;
+			}
 
-            // Zip
-            $this->tpl['select_zip'] = $formcompany->select_ziptown($this->object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
+			// Zip
+			$this->tpl['select_zip'] = $formcompany->select_ziptown($this->object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
 
-            // Town
-            $this->tpl['select_town'] = $formcompany->select_ziptown($this->object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
+			// Town
+			$this->tpl['select_town'] = $formcompany->select_ziptown($this->object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
 
-            // Country
-            $this->object->country_id = ($this->object->country_id ? $this->object->country_id : $mysoc->country_id);
-            $this->object->country_code = ($this->object->country_code ? $this->object->country_code : $mysoc->country_code);
-            $this->tpl['select_country'] = $form->select_country($this->object->country_id, 'country_id');
-            $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
+			// Country
+			$this->object->country_id = ($this->object->country_id ? $this->object->country_id : $mysoc->country_id);
+			$this->object->country_code = ($this->object->country_code ? $this->object->country_code : $mysoc->country_code);
+			$this->tpl['select_country'] = $form->select_country($this->object->country_id, 'country_id');
+			$countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
-            if ($user->admin) $this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			if ($user->admin) $this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 
-            // State
-            if ($this->object->country_id) $this->tpl['select_state'] = $formcompany->select_state($this->object->state_id, $this->object->country_code);
-            else $this->tpl['select_state'] = $countrynotdefined;
+			// State
+			if ($this->object->country_id) $this->tpl['select_state'] = $formcompany->select_state($this->object->state_id, $this->object->country_code);
+			else $this->tpl['select_state'] = $countrynotdefined;
 
-            // Language
-            if (!empty($conf->global->MAIN_MULTILANGS)) $this->tpl['select_lang'] = $formadmin->select_language(($this->object->default_lang ? $this->object->default_lang : $conf->global->MAIN_LANG_DEFAULT), 'default_lang', 0, 0, 1);
+			// Language
+			if (!empty($conf->global->MAIN_MULTILANGS)) $this->tpl['select_lang'] = $formadmin->select_language(($this->object->default_lang ? $this->object->default_lang : $conf->global->MAIN_LANG_DEFAULT), 'default_lang', 0, 0, 1);
 
-            // VAT
-            $this->tpl['yn_assujtva'] = $form->selectyesno('assujtva_value', $this->tpl['tva_assuj'], 1); // Assujeti par defaut en creation
+			// VAT
+			$this->tpl['yn_assujtva'] = $form->selectyesno('assujtva_value', $this->tpl['tva_assuj'], 1); // Assujeti par defaut en creation
 
-            // Select users
-            $this->tpl['select_users'] = $form->select_dolusers($this->object->commercial_id, 'commercial_id', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+			// Select users
+			$this->tpl['select_users'] = $form->select_dolusers($this->object->commercial_id, 'commercial_id', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 
-            // Local Tax
-            // TODO mettre dans une classe propre au pays
-            if ($mysoc->country_code == 'ES')
-            {
-                $this->tpl['localtax'] = '';
+			// Local Tax
+			// TODO mettre dans une classe propre au pays
+			if ($mysoc->country_code == 'ES')
+			{
+				$this->tpl['localtax'] = '';
 
-                if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
-                {
-                    $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td>';
-                    $this->tpl['localtax'] .= $form->selectyesno('localtax1assuj_value', $this->object->localtax1_assuj, 1);
-                    $this->tpl['localtax'] .= '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
-                    $this->tpl['localtax'] .= $form->selectyesno('localtax2assuj_value', $this->object->localtax1_assuj, 1);
-                    $this->tpl['localtax'] .= '</td></tr>';
-                } elseif ($mysoc->localtax1_assuj == "1")
-                {
-                    $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
-                    $this->tpl['localtax'] .= $form->selectyesno('localtax1assuj_value', $this->object->localtax1_assuj, 1);
-                    $this->tpl['localtax'] .= '</td><tr>';
-                } elseif ($mysoc->localtax2_assuj == "1")
-                {
-                    $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
-                    $this->tpl['localtax'] .= $form->selectyesno('localtax2assuj_value', $this->object->localtax1_assuj, 1);
-                    $this->tpl['localtax'] .= '</td><tr>';
-                }
-            }
-        } else {
-            $head = societe_prepare_head($this->object);
+				if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
+				{
+					$this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td>';
+					$this->tpl['localtax'] .= $form->selectyesno('localtax1assuj_value', $this->object->localtax1_assuj, 1);
+					$this->tpl['localtax'] .= '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
+					$this->tpl['localtax'] .= $form->selectyesno('localtax2assuj_value', $this->object->localtax1_assuj, 1);
+					$this->tpl['localtax'] .= '</td></tr>';
+				} elseif ($mysoc->localtax1_assuj == "1")
+				{
+					$this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
+					$this->tpl['localtax'] .= $form->selectyesno('localtax1assuj_value', $this->object->localtax1_assuj, 1);
+					$this->tpl['localtax'] .= '</td><tr>';
+				} elseif ($mysoc->localtax2_assuj == "1")
+				{
+					$this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
+					$this->tpl['localtax'] .= $form->selectyesno('localtax2assuj_value', $this->object->localtax1_assuj, 1);
+					$this->tpl['localtax'] .= '</td><tr>';
+				}
+			}
+		} else {
+			$head = societe_prepare_head($this->object);
 
-            $this->tpl['showhead'] = dol_get_fiche_head($head, 'card', '', 0, 'company');
-            $this->tpl['showend'] = dol_get_fiche_end();
+			$this->tpl['showhead'] = dol_get_fiche_head($head, 'card', '', 0, 'company');
+			$this->tpl['showend'] = dol_get_fiche_end();
 
-            $this->tpl['showrefnav'] = $form->showrefnav($this->object, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
+			$this->tpl['showrefnav'] = $form->showrefnav($this->object, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-            $this->tpl['checkcustomercode'] = $this->object->check_codeclient();
-            $this->tpl['checksuppliercode'] = $this->object->check_codefournisseur();
-            $this->tpl['address'] = dol_nl2br($this->object->address);
+			$this->tpl['checkcustomercode'] = $this->object->check_codeclient();
+			$this->tpl['checksuppliercode'] = $this->object->check_codefournisseur();
+			$this->tpl['address'] = dol_nl2br($this->object->address);
 
-            $img = picto_from_langcode($this->object->country_code);
-            if ($this->object->isInEEC()) $this->tpl['country'] = $form->textwithpicto(($img ? $img.' ' : '').$this->object->country, $langs->trans("CountryIsInEEC"), 1, 0);
-            $this->tpl['country'] = ($img ? $img.' ' : '').$this->object->country;
+			$img = picto_from_langcode($this->object->country_code);
+			if ($this->object->isInEEC()) $this->tpl['country'] = $form->textwithpicto(($img ? $img.' ' : '').$this->object->country, $langs->trans("CountryIsInEEC"), 1, 0);
+			$this->tpl['country'] = ($img ? $img.' ' : '').$this->object->country;
 
-            $this->tpl['phone'] 	= dol_print_phone($this->object->phone, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
-            $this->tpl['fax'] 		= dol_print_phone($this->object->fax, $this->object->country_code, 0, $this->object->id, 'AC_FAX');
-            $this->tpl['email'] 	= dol_print_email($this->object->email, 0, $this->object->id, 'AC_EMAIL');
-            $this->tpl['url'] 		= dol_print_url($this->object->url);
+			$this->tpl['phone'] 	= dol_print_phone($this->object->phone, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
+			$this->tpl['fax'] 		= dol_print_phone($this->object->fax, $this->object->country_code, 0, $this->object->id, 'AC_FAX');
+			$this->tpl['email'] 	= dol_print_email($this->object->email, 0, $this->object->id, 'AC_EMAIL');
+			$this->tpl['url'] 		= dol_print_url($this->object->url);
 
-            $this->tpl['tva_assuj'] = yn($this->object->tva_assuj);
+			$this->tpl['tva_assuj'] = yn($this->object->tva_assuj);
 
-            // Third party type
-            $arr = $formcompany->typent_array(1);
-            $this->tpl['typent'] = $arr[$this->object->typent_code];
+			// Third party type
+			$arr = $formcompany->typent_array(1);
+			$this->tpl['typent'] = $arr[$this->object->typent_code];
 
-            if (!empty($conf->global->MAIN_MULTILANGS))
-            {
-                require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-                //$s=picto_from_langcode($this->default_lang);
-                //print ($s?$s.' ':'');
-                $langs->load("languages");
-                $this->tpl['default_lang'] = ($this->default_lang ? $langs->trans('Language_'.$this->object->default_lang) : '');
-            }
+			if (!empty($conf->global->MAIN_MULTILANGS))
+			{
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+				//$s=picto_from_langcode($this->default_lang);
+				//print ($s?$s.' ':'');
+				$langs->load("languages");
+				$this->tpl['default_lang'] = ($this->default_lang ? $langs->trans('Language_'.$this->object->default_lang) : '');
+			}
 
-            $this->tpl['image_edit'] = img_edit();
+			$this->tpl['image_edit'] = img_edit();
 
-            $this->tpl['display_rib'] = $this->object->display_rib();
+			$this->tpl['display_rib'] = $this->object->display_rib();
 
-            // Sales representatives
-            $this->tpl['sales_representatives'] = '';
-            $listsalesrepresentatives = $this->object->getSalesRepresentatives($user);
-            $nbofsalesrepresentative = count($listsalesrepresentatives);
-            if ($nbofsalesrepresentative > 3)   // We print only number
-            {
-            	$this->tpl['sales_representatives'] .= $nbofsalesrepresentative;
-            } elseif ($nbofsalesrepresentative > 0)
-            {
-            	$userstatic = new User($this->db);
-            	$i = 0;
-            	foreach ($listsalesrepresentatives as $val)
-            	{
-            		$userstatic->id = $val['id'];
-            		$userstatic->lastname = $val['name'];
-            		$userstatic->firstname = $val['firstname'];
-            		$this->tpl['sales_representatives'] .= $userstatic->getNomUrl(1);
-            		$i++;
-            		if ($i < $nbofsalesrepresentative) $this->tpl['sales_representatives'] .= ', ';
-            	}
-            } else $this->tpl['sales_representatives'] .= $langs->trans("NoSalesRepresentativeAffected");
+			// Sales representatives
+			$this->tpl['sales_representatives'] = '';
+			$listsalesrepresentatives = $this->object->getSalesRepresentatives($user);
+			$nbofsalesrepresentative = count($listsalesrepresentatives);
+			if ($nbofsalesrepresentative > 3)   // We print only number
+			{
+				$this->tpl['sales_representatives'] .= $nbofsalesrepresentative;
+			} elseif ($nbofsalesrepresentative > 0)
+			{
+				$userstatic = new User($this->db);
+				$i = 0;
+				foreach ($listsalesrepresentatives as $val)
+				{
+					$userstatic->id = $val['id'];
+					$userstatic->lastname = $val['name'];
+					$userstatic->firstname = $val['firstname'];
+					$this->tpl['sales_representatives'] .= $userstatic->getNomUrl(1);
+					$i++;
+					if ($i < $nbofsalesrepresentative) $this->tpl['sales_representatives'] .= ', ';
+				}
+			} else $this->tpl['sales_representatives'] .= $langs->trans("NoSalesRepresentativeAffected");
 
-            // Linked member
-            if (!empty($conf->adherent->enabled))
-            {
-                $langs->load("members");
-                $adh = new Adherent($this->db);
-                $result = $adh->fetch('', '', $this->object->id);
-                if ($result > 0)
-                {
-                    $adh->ref = $adh->getFullName($langs);
-                    $this->tpl['linked_member'] = $adh->getNomUrl(1);
-                } else {
-                    $this->tpl['linked_member'] = $langs->trans("ThirdpartyNotLinkedToMember");
-                }
-            }
+			// Linked member
+			if (!empty($conf->adherent->enabled))
+			{
+				$langs->load("members");
+				$adh = new Adherent($this->db);
+				$result = $adh->fetch('', '', $this->object->id);
+				if ($result > 0)
+				{
+					$adh->ref = $adh->getFullName($langs);
+					$this->tpl['linked_member'] = $adh->getNomUrl(1);
+				} else {
+					$this->tpl['linked_member'] = $langs->trans("ThirdpartyNotLinkedToMember");
+				}
+			}
 
-            // Local Tax
-            // TODO mettre dans une classe propre au pays
-            if ($mysoc->country_code == 'ES')
-            {
-                $this->tpl['localtax'] = '';
+			// Local Tax
+			// TODO mettre dans une classe propre au pays
+			if ($mysoc->country_code == 'ES')
+			{
+				$this->tpl['localtax'] = '';
 
-                if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
-                {
-                    $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>';
-                    $this->tpl['localtax'] .= '<td>'.yn($this->object->localtax1_assuj).'</td>';
-                    $this->tpl['localtax'] .= '<td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
-                    $this->tpl['localtax'] .= '<td>'.yn($this->object->localtax2_assuj).'</td></tr>';
-                } elseif ($mysoc->localtax1_assuj == "1")
-                {
-                    $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>';
-                    $this->tpl['localtax'] .= '<td colspan="3">'.yn($this->object->localtax1_assuj).'</td></tr>';
-                } elseif ($mysoc->localtax2_assuj == "1")
-                {
-                    $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
-                    $this->tpl['localtax'] .= '<td colspan="3">'.yn($this->object->localtax2_assuj).'</td></tr>';
-                }
-            }
-        }
-    }
+				if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
+				{
+					$this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>';
+					$this->tpl['localtax'] .= '<td>'.yn($this->object->localtax1_assuj).'</td>';
+					$this->tpl['localtax'] .= '<td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
+					$this->tpl['localtax'] .= '<td>'.yn($this->object->localtax2_assuj).'</td></tr>';
+				} elseif ($mysoc->localtax1_assuj == "1")
+				{
+					$this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>';
+					$this->tpl['localtax'] .= '<td colspan="3">'.yn($this->object->localtax1_assuj).'</td></tr>';
+				} elseif ($mysoc->localtax2_assuj == "1")
+				{
+					$this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
+					$this->tpl['localtax'] .= '<td colspan="3">'.yn($this->object->localtax2_assuj).'</td></tr>';
+				}
+			}
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Assign POST values into object
-     *
-     *	@param		string		$action		Action string
-     *  @return		string					HTML output
-     */
-    private function assign_post($action)
-    {
-        // phpcs:enable
-        global $langs, $mysoc;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Assign POST values into object
+	 *
+	 *	@param		string		$action		Action string
+	 *  @return		string					HTML output
+	 */
+	private function assign_post($action)
+	{
+		// phpcs:enable
+		global $langs, $mysoc;
 
-        $this->object->id = $_POST["socid"];
-        $this->object->name = $_POST["nom"];
-        $this->object->prefix_comm			= $_POST["prefix_comm"];
-        $this->object->client = $_POST["client"];
-        $this->object->code_client			= $_POST["code_client"];
-        $this->object->fournisseur			= $_POST["fournisseur"];
-        $this->object->code_fournisseur = $_POST["code_fournisseur"];
-        $this->object->address = $_POST["adresse"];
-        $this->object->zip = $_POST["zipcode"];
-        $this->object->town					= $_POST["town"];
-        $this->object->country_id = $_POST["country_id"] ? $_POST["country_id"] : $mysoc->country_id;
-        $this->object->state_id = $_POST["state_id"];
-        $this->object->phone				= $_POST["tel"];
-        $this->object->fax					= $_POST["fax"];
-        $this->object->email				= $_POST["email"];
-        $this->object->url					= $_POST["url"];
-        $this->object->capital				= $_POST["capital"];
-        $this->object->idprof1				= $_POST["idprof1"];
-        $this->object->idprof2				= $_POST["idprof2"];
-        $this->object->idprof3				= $_POST["idprof3"];
-        $this->object->idprof4				= $_POST["idprof4"];
-        $this->object->typent_id = $_POST["typent_id"];
-        $this->object->effectif_id = $_POST["effectif_id"];
-        $this->object->barcode				= $_POST["barcode"];
-        $this->object->forme_juridique_code = $_POST["forme_juridique_code"];
-        $this->object->default_lang			= $_POST["default_lang"];
-        $this->object->commercial_id		= $_POST["commercial_id"];
+		$this->object->id = $_POST["socid"];
+		$this->object->name = $_POST["nom"];
+		$this->object->prefix_comm			= $_POST["prefix_comm"];
+		$this->object->client = $_POST["client"];
+		$this->object->code_client			= $_POST["code_client"];
+		$this->object->fournisseur			= $_POST["fournisseur"];
+		$this->object->code_fournisseur = $_POST["code_fournisseur"];
+		$this->object->address = $_POST["adresse"];
+		$this->object->zip = $_POST["zipcode"];
+		$this->object->town					= $_POST["town"];
+		$this->object->country_id = $_POST["country_id"] ? $_POST["country_id"] : $mysoc->country_id;
+		$this->object->state_id = $_POST["state_id"];
+		$this->object->phone				= $_POST["tel"];
+		$this->object->fax					= $_POST["fax"];
+		$this->object->email				= $_POST["email"];
+		$this->object->url					= $_POST["url"];
+		$this->object->capital				= $_POST["capital"];
+		$this->object->idprof1				= $_POST["idprof1"];
+		$this->object->idprof2				= $_POST["idprof2"];
+		$this->object->idprof3				= $_POST["idprof3"];
+		$this->object->idprof4				= $_POST["idprof4"];
+		$this->object->typent_id = $_POST["typent_id"];
+		$this->object->effectif_id = $_POST["effectif_id"];
+		$this->object->barcode				= $_POST["barcode"];
+		$this->object->forme_juridique_code = $_POST["forme_juridique_code"];
+		$this->object->default_lang			= $_POST["default_lang"];
+		$this->object->commercial_id		= $_POST["commercial_id"];
 
-        $this->object->tva_assuj = $_POST["assujtva_value"] ? $_POST["assujtva_value"] : 1;
-        $this->object->tva_intra = $_POST["tva_intra"];
+		$this->object->tva_assuj = $_POST["assujtva_value"] ? $_POST["assujtva_value"] : 1;
+		$this->object->tva_intra = $_POST["tva_intra"];
 
-        //Local Taxes
-        $this->object->localtax1_assuj		= $_POST["localtax1assuj_value"];
-        $this->object->localtax2_assuj		= $_POST["localtax2assuj_value"];
+		//Local Taxes
+		$this->object->localtax1_assuj		= $_POST["localtax1assuj_value"];
+		$this->object->localtax2_assuj		= $_POST["localtax2assuj_value"];
 
-        // We set country_id, and country_code label of the chosen country
-        if ($this->object->country_id)
-        {
-            $tmparray = getCountry($this->object->country_id, 'all', $this->db, $langs, 0);
-            $this->object->country_code = $tmparray['code'];
-            $this->object->country_label = $tmparray['label'];
-        }
-    }
+		// We set country_id, and country_code label of the chosen country
+		if ($this->object->country_id)
+		{
+			$tmparray = getCountry($this->object->country_id, 'all', $this->db, $langs, 0);
+			$this->object->country_code = $tmparray['code'];
+			$this->object->country_label = $tmparray['label'];
+		}
+	}
 }
diff --git a/htdocs/societe/canvas/company/actions_card_company.class.php b/htdocs/societe/canvas/company/actions_card_company.class.php
index 73453aff62e..901a2c55a56 100644
--- a/htdocs/societe/canvas/company/actions_card_company.class.php
+++ b/htdocs/societe/canvas/company/actions_card_company.class.php
@@ -34,42 +34,42 @@ class ActionsCardCompany extends ActionsCardCommon
 	/**
 	 *    Constructor
 	 *
-     *    @param	DoliDB	$db				Handler acces base de donnees
-     *    @param	string	$dirmodule		Name of directory of module
-     *    @param	string	$targetmodule	Name of directory of module where canvas is stored
-     *    @param	string	$canvas			Name of canvas
-     *    @param	string	$card			Name of tab (sub-canvas)
+	 *    @param	DoliDB	$db				Handler acces base de donnees
+	 *    @param	string	$dirmodule		Name of directory of module
+	 *    @param	string	$targetmodule	Name of directory of module where canvas is stored
+	 *    @param	string	$canvas			Name of canvas
+	 *    @param	string	$card			Name of tab (sub-canvas)
 	 */
-    public function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
+	public function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
 	{
-        $this->db = $db;
-        $this->dirmodule = $dirmodule;
-        $this->targetmodule = $targetmodule;
-        $this->canvas = $canvas;
-        $this->card = $card;
+		$this->db = $db;
+		$this->dirmodule = $dirmodule;
+		$this->targetmodule = $targetmodule;
+		$this->canvas = $canvas;
+		$this->card = $card;
 	}
 
-    /**
-     *  Return the title of card
-     *
-     *  @param	string	$action		Action code
-     *  @return	string				Title
-     */
-    private function getTitle($action)
-    {
-        global $langs;
+	/**
+	 *  Return the title of card
+	 *
+	 *  @param	string	$action		Action code
+	 *  @return	string				Title
+	 */
+	private function getTitle($action)
+	{
+		global $langs;
 
-        $out = '';
+		$out = '';
 
-        if ($action == 'view')      $out .= $langs->trans("ThirdParty");
-        if ($action == 'edit')      $out .= $langs->trans("EditCompany");
-        if ($action == 'create')    $out .= $langs->trans("NewCompany");
+		if ($action == 'view')      $out .= $langs->trans("ThirdParty");
+		if ($action == 'edit')      $out .= $langs->trans("EditCompany");
+		if ($action == 'create')    $out .= $langs->trans("NewCompany");
 
-        return $out;
-    }
+		return $out;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Assign custom values for canvas (for example into this->tpl to be used by templates)
 	 *
@@ -78,9 +78,9 @@ class ActionsCardCompany extends ActionsCardCommon
 	 *    @param	string	$ref		Ref of object
 	 *    @return	void
 	 */
-    public function assign_values(&$action, $id = 0, $ref = '')
+	public function assign_values(&$action, $id = 0, $ref = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs, $user, $mysoc;
 		global $form, $formadmin, $formcompany;
 
@@ -88,9 +88,9 @@ class ActionsCardCompany extends ActionsCardCommon
 
 		parent::assign_values($action);
 
-        $this->tpl['title'] = load_fiche_titre($this->getTitle($action));
+		$this->tpl['title'] = load_fiche_titre($this->getTitle($action));
 
-        $this->tpl['profid1'] = $this->object->idprof1;
+		$this->tpl['profid1'] = $this->object->idprof1;
 		$this->tpl['profid2'] 	= $this->object->idprof2;
 		$this->tpl['profid3'] 	= $this->object->idprof3;
 		$this->tpl['profid4'] 	= $this->object->idprof4;
@@ -98,12 +98,12 @@ class ActionsCardCompany extends ActionsCardCommon
 		if ($conf->use_javascript_ajax && empty($conf->global->MAIN_DISABLEVATCHECK))
 		{
 			$js = "\n";
-	        $js .= '<script language="JavaScript" type="text/javascript">';
-	        $js .= "function CheckVAT(a) {\n";
-	        $js .= "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,230);\n";
-	        $js .= "}\n";
-	        $js .= '</script>';
-	        $js .= "\n";
+			$js .= '<script language="JavaScript" type="text/javascript">';
+			$js .= "function CheckVAT(a) {\n";
+			$js .= "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,230);\n";
+			$js .= "}\n";
+			$js .= '</script>';
+			$js .= "\n";
 			$this->tpl['js_checkVatPopup'] = $js;
 		}
 
@@ -188,7 +188,7 @@ class ActionsCardCompany extends ActionsCardCommon
 				$this->tpl['parent_company'] = $langs->trans("NoParentCompany");
 			}
 		}
-    }
+	}
 
 	/**
 	 * 	Check permissions of a user to show a page and an object. Check read permission
@@ -203,8 +203,8 @@ class ActionsCardCompany extends ActionsCardCommon
 	 *  @param      string	$dbt_select		Field name for select if not rowid. (optional)
 	 *  @return		int						1
 	 */
-    public function restrictedArea($user, $features = 'societe', $objectid = 0, $dbtablename = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid')
-    {
-        return restrictedArea($user, $features, $objectid, $dbtablename, $feature2, $dbt_keyfield, $dbt_select);
-    }
+	public function restrictedArea($user, $features = 'societe', $objectid = 0, $dbtablename = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid')
+	{
+		return restrictedArea($user, $features, $objectid, $dbtablename, $feature2, $dbt_keyfield, $dbt_select);
+	}
 }
diff --git a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
index 1e231a261c8..57b8a06b019 100644
--- a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
@@ -116,7 +116,7 @@ if ($this->control->tpl['fournisseur']) {
 	<td colspan="3"><?php echo $this->control->tpl['select_suppliercategory']; ?></td>
 </tr>
 		<?php
-    }
+	}
 }
 
 if (!empty($conf->barcode->enabled)) { ?>
@@ -215,9 +215,9 @@ if (!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax'
 <br>
 
 <div class="center">
-<input type="submit" class="button" name="save" value="<?php echo $langs->trans("Save"); ?>">
+<input type="submit" class="button button-save" name="save" value="<?php echo $langs->trans("Save"); ?>">
 &nbsp; &nbsp;
-<input type="submit" class="button" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>">
+<input type="submit" class="button button-cancel" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>">
 </div>
 
 </form>
diff --git a/htdocs/societe/canvas/company/tpl/card_view.tpl.php b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
index 6591e38e1cb..c56e7f9223c 100644
--- a/htdocs/societe/canvas/company/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
@@ -30,7 +30,7 @@ print "<!-- BEGIN PHP TEMPLATE CARD_VIEW.TPL.PHP COMPANY -->\n";
 
 $head = societe_prepare_head($soc);
 
-dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
+print dol_get_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
 
 ?>
 
@@ -235,7 +235,7 @@ for ($i = 1; $i <= 4; $i++) {
 
 </table>
 
-<?php dol_fiche_end(); ?>
+<?php print dol_get_fiche_end(); ?>
 
 <div class="tabsAction">
 <?php if ($user->rights->societe->creer) { ?>
diff --git a/htdocs/societe/canvas/individual/actions_card_individual.class.php b/htdocs/societe/canvas/individual/actions_card_individual.class.php
index 3abb9e9b6f7..cab8a965ee0 100644
--- a/htdocs/societe/canvas/individual/actions_card_individual.class.php
+++ b/htdocs/societe/canvas/individual/actions_card_individual.class.php
@@ -30,63 +30,63 @@ include_once DOL_DOCUMENT_ROOT.'/societe/canvas/actions_card_common.class.php';
  */
 class ActionsCardIndividual extends ActionsCardCommon
 {
-    /**
+	/**
 	 *    Constructor
 	 *
-     *    @param	DoliDB	$db				Handler acces base de donnees
-     *    @param	string	$dirmodule		Name of directory of module
-     *    @param	string	$targetmodule	Name of directory of module where canvas is stored
-     *    @param	string	$canvas			Name of canvas
-     *    @param	string	$card			Name of tab (sub-canvas)
-     */
-    public function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
-    {
-        $this->db = $db;
-        $this->dirmodule = $dirmodule;
-        $this->targetmodule = $targetmodule;
-        $this->canvas = $canvas;
-        $this->card = $card;
-    }
+	 *    @param	DoliDB	$db				Handler acces base de donnees
+	 *    @param	string	$dirmodule		Name of directory of module
+	 *    @param	string	$targetmodule	Name of directory of module where canvas is stored
+	 *    @param	string	$canvas			Name of canvas
+	 *    @param	string	$card			Name of tab (sub-canvas)
+	 */
+	public function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
+	{
+		$this->db = $db;
+		$this->dirmodule = $dirmodule;
+		$this->targetmodule = $targetmodule;
+		$this->canvas = $canvas;
+		$this->card = $card;
+	}
 
 
-    /**
-     *  Return the title of card
-     *
-     *  @param	string	$action		Action code
-     *  @return	string				Title
-     */
-    private function getTitle($action)
-    {
-        global $langs;
+	/**
+	 *  Return the title of card
+	 *
+	 *  @param	string	$action		Action code
+	 *  @return	string				Title
+	 */
+	private function getTitle($action)
+	{
+		global $langs;
 
-        $out = '';
+		$out = '';
 
-        if ($action == 'view')      $out .= $langs->trans("Individual");
-        if ($action == 'edit')      $out .= $langs->trans("EditCompany");
-        if ($action == 'create')    $out .= $langs->trans("NewCompany");
+		if ($action == 'view')      $out .= $langs->trans("Individual");
+		if ($action == 'edit')      $out .= $langs->trans("EditCompany");
+		if ($action == 'create')    $out .= $langs->trans("NewCompany");
 
-        return $out;
-    }
+		return $out;
+	}
 
 
 	/**
 	 * Execute actions
-     * @deprecated Use the doActions of hooks instead of this.
+	 * @deprecated Use the doActions of hooks instead of this.
 	 *
 	 * @param	string	$action	Action
 	 * @param	int		$id			Id of object (may be empty for creation)
 	 * @return	int					<0 if KO, >0 if OK
 	 */
-    public function doActions(&$action, $id)
-    {
+	public function doActions(&$action, $id)
+	{
 		$ret = $this->getObject($id);
 
 		$return = parent::doActions($action);
 
 		return $return;
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Assign custom values for canvas (for example into this->tpl to be used by templates)
 	 *
@@ -95,9 +95,9 @@ class ActionsCardIndividual extends ActionsCardCommon
 	 *    @param	string	$ref		Ref of object
 	 *    @return	void
 	 */
-    public function assign_values(&$action, $id = 0, $ref = '')
-    {
-        // phpcs:enable
+	public function assign_values(&$action, $id = 0, $ref = '')
+	{
+		// phpcs:enable
 		global $conf, $langs;
 		global $form, $formcompany;
 
@@ -105,7 +105,7 @@ class ActionsCardIndividual extends ActionsCardCommon
 
 		parent::assign_values($action);
 
-        $this->tpl['title'] = load_fiche_titre($this->getTitle($action));
+		$this->tpl['title'] = load_fiche_titre($this->getTitle($action));
 
 		if ($action == 'create' || $action == 'edit')
 		{
@@ -117,7 +117,7 @@ class ActionsCardIndividual extends ActionsCardCommon
 				$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$this->object->id, $langs->trans("DeleteAnIndividual"), $langs->trans("ConfirmDeleteIndividual"), "confirm_delete", '', 0, "1,action-delete");
 			}
 		}
-    }
+	}
 
 	/**
 	 * 	Check permissions of a user to show a page and an object. Check read permission
@@ -132,8 +132,8 @@ class ActionsCardIndividual extends ActionsCardCommon
 	 *  @param      string	$dbt_select		Field name for select if not rowid. (optional)
 	 *  @return		int						1
 	 */
-    public function restrictedArea($user, $features = 'societe', $objectid = 0, $dbtablename = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid')
-    {
-        return restrictedArea($user, $features, $objectid, $dbtablename, $feature2, $dbt_keyfield, $dbt_select);
-    }
+	public function restrictedArea($user, $features = 'societe', $objectid = 0, $dbtablename = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid')
+	{
+		return restrictedArea($user, $features, $objectid, $dbtablename, $feature2, $dbt_keyfield, $dbt_select);
+	}
 }
diff --git a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
index 1571709868e..b5f57544c5f 100644
--- a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
@@ -114,7 +114,7 @@ if ($this->control->tpl['fournisseur']) {
 	<td colspan="3"><?php echo $this->control->tpl['select_suppliercategory']; ?></td>
 </tr>
 		<?php
-    }
+	}
 }
 ?>
 
@@ -179,9 +179,9 @@ if ($this->control->tpl['fournisseur']) {
 <br>
 
 <div class="center">
-<input type="submit" class="button" name="save" value="<?php echo $langs->trans("Save"); ?>">
+<input type="submit" class="button button-save" name="save" value="<?php echo $langs->trans("Save"); ?>">
 &nbsp; &nbsp;
-<input type="submit" class="button" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>">
+<input type="submit" class="button button-cancel" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>">
 </div>
 
 </form>
diff --git a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
index a49dbcde698..0ee2f271312 100644
--- a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
@@ -30,7 +30,7 @@ print "<!-- BEGIN PHP TEMPLATE CARD_VIEW.TPL.PHP INDIVIDUAL -->\n";
 
 $head = societe_prepare_head($object);
 
-dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
+print dol_get_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
 
 if ($this->control->tpl['error']) echo $this->control->tpl['error'];
 if ($this->control->tpl['action_delete']) echo $this->control->tpl['action_delete']; ?>
@@ -178,7 +178,7 @@ if ($this->control->tpl['action_delete']) echo $this->control->tpl['action_delet
 
 </table>
 
-<?php dol_fiche_end(); ?>
+<?php print dol_get_fiche_end(); ?>
 
 <div class="tabsAction">
 <?php if ($user->rights->societe->creer) { ?>
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 9e6ad514da6..ab2cddb940d 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -89,14 +89,24 @@ $canvas = $object->canvas ? $object->canvas : GETPOST("canvas");
 $objcanvas = null;
 if (!empty($canvas))
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
-    $objcanvas = new Canvas($db, $action);
-    $objcanvas->getCanvas('thirdparty', 'card', $canvas);
+	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
+	$objcanvas = new Canvas($db, $action);
+	$objcanvas->getCanvas('thirdparty', 'card', $canvas);
 }
 
 // Security check
 $result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', 0);
 
+/*
+if ($object->id > 0) {
+	if ($object->client == 0 && $object->fournisseur > 0) {
+		if (!empty($user->rights->fournisseur->lire)) {
+			accessforbidden();
+		}
+	}
+}
+*/
+
 $permissiontoread = $user->rights->societe->lire;
 $permissiontoadd = $user->rights->societe->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontodelete = $user->rights->societe->delete || ($permissiontoadd && isset($object->status) && $object->status == 0);
@@ -115,15 +125,15 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    if ($cancel)
-    {
-        $action = '';
-        if (!empty($backtopage))
-        {
-            header("Location: ".$backtopage);
-            exit;
-        }
-    }
+	if ($cancel)
+	{
+		$action = '';
+		if (!empty($backtopage))
+		{
+			header("Location: ".$backtopage);
+			exit;
+		}
+	}
 
 	if ($action == 'confirm_merge' && $confirm == 'yes' && $user->rights->societe->creer)
 	{
@@ -144,7 +154,7 @@ if (empty($reshook))
 
 			if (!$error)
 			{
-			    // TODO Move the merge function into class of object.
+				// TODO Move the merge function into class of object.
 
 				$db->begin();
 
@@ -166,11 +176,11 @@ if (empty($reshook))
 
 				// Concat some data
 				$listofproperties = array(
-				    'note_public', 'note_private'
+					'note_public', 'note_private'
 				);
 				foreach ($listofproperties as $property)
 				{
-				    $object->$property = dol_concatdesc($object->$property, $soc_origin->$property);
+					$object->$property = dol_concatdesc($object->$property, $soc_origin->$property);
 				}
 
 				// Merge extrafields
@@ -178,7 +188,7 @@ if (empty($reshook))
 				{
 					foreach ($soc_origin->array_options as $key => $val)
 					{
-					    if (empty($object->array_options[$key])) $object->array_options[$key] = $val;
+						if (empty($object->array_options[$key])) $object->array_options[$key] = $val;
 					}
 				}
 
@@ -218,6 +228,8 @@ if (empty($reshook))
 				// Move links
 				if (!$error)
 				{
+					// This list is also into the api_thirdparties.class.php
+					// TODO Mutualise the list into object societe.class.php
 					$objects = array(
 						'Adherent' => '/adherents/class/adherent.class.php',
 						'Societe' => '/societe/class/societe.class.php',
@@ -228,6 +240,7 @@ if (empty($reshook))
 						'Facture' => '/compta/facture/class/facture.class.php',
 						'FactureRec' => '/compta/facture/class/facture-rec.class.php',
 						'LignePrelevement' => '/compta/prelevement/class/ligneprelevement.class.php',
+						'Mo' => '/mrp/class/mo.class.php',
 						'Contact' => '/contact/class/contact.class.php',
 						'Contrat' => '/contrat/class/contrat.class.php',
 						'Expedition' => '/expedition/class/expedition.class.php',
@@ -236,10 +249,11 @@ if (empty($reshook))
 						'FactureFournisseur' => '/fourn/class/fournisseur.facture.class.php',
 						'SupplierProposal' => '/supplier_proposal/class/supplier_proposal.class.php',
 						'ProductFournisseur' => '/fourn/class/fournisseur.product.class.php',
-						'Livraison' => '/livraison/class/livraison.class.php',
+						'Livraison' => '/delivery/class/delivery.class.php',
 						'Product' => '/product/class/product.class.php',
 						'Project' => '/projet/class/project.class.php',
-						'User' => '/user/class/user.class.php',
+						'Ticket' => '/ticket/class/ticket.class.php',
+						'User' => '/user/class/user.class.php'
 					);
 
 					//First, all core objects must update their tables
@@ -299,7 +313,7 @@ if (empty($reshook))
 					setEventMessages($langs->trans('ThirdpartiesMergeSuccess'), null, 'mesgs');
 					$db->commit();
 				} else {
-				    $langs->load("errors");
+					$langs->load("errors");
 					setEventMessages($langs->trans('ErrorsThirdpartyMerge'), null, 'errors');
 					$db->rollback();
 				}
@@ -307,160 +321,160 @@ if (empty($reshook))
 		}
 	}
 
-    if (GETPOST('getcustomercode'))
-    {
-        // We defined value code_client
-        $_POST["customer_code"] = "Acompleter";
-    }
+	if (GETPOST('getcustomercode'))
+	{
+		// We defined value code_client
+		$_POST["customer_code"] = "Acompleter";
+	}
 
-    if (GETPOST('getsuppliercode'))
-    {
-        // We defined value code_fournisseur
-        $_POST["supplier_code"] = "Acompleter";
-    }
+	if (GETPOST('getsuppliercode'))
+	{
+		// We defined value code_fournisseur
+		$_POST["supplier_code"] = "Acompleter";
+	}
 
-    if ($action == 'set_localtax1')
-    {
-    	//obtidre selected del combobox
-    	$value = GETPOST('lt1');
-    	$object->fetch($socid);
-    	$res = $object->setValueFrom('localtax1_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
-    }
-    if ($action == 'set_localtax2')
-    {
-    	//obtidre selected del combobox
-    	$value = GETPOST('lt2');
-    	$object->fetch($socid);
-    	$res = $object->setValueFrom('localtax2_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
-    }
+	if ($action == 'set_localtax1')
+	{
+		//obtidre selected del combobox
+		$value = GETPOST('lt1');
+		$object->fetch($socid);
+		$res = $object->setValueFrom('localtax1_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
+	}
+	if ($action == 'set_localtax2')
+	{
+		//obtidre selected del combobox
+		$value = GETPOST('lt2');
+		$object->fetch($socid);
+		$res = $object->setValueFrom('localtax2_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
+	}
 
-    if ($action == 'update_extras') {
-        $object->fetch($socid);
+	if ($action == 'update_extras') {
+		$object->fetch($socid);
 
-        $object->oldcopy = dol_clone($object);
+		$object->oldcopy = dol_clone($object);
 
-        // Fill array 'array_options' with data from update form
-        $extrafields->fetch_name_optionals_label($object->table_element);
+		// Fill array 'array_options' with data from update form
+		$extrafields->fetch_name_optionals_label($object->table_element);
 
-        $ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
-        if ($ret < 0) $error++;
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
+		if ($ret < 0) $error++;
 
-        if (!$error)
-        {
-        	$result = $object->insertExtraFields('COMPANY_MODIFY');
-        	if ($result < 0)
-        	{
-        		setEventMessages($object->error, $object->errors, 'errors');
-        		$error++;
-        	}
-        }
+		if (!$error)
+		{
+			$result = $object->insertExtraFields('COMPANY_MODIFY');
+			if ($result < 0)
+			{
+				setEventMessages($object->error, $object->errors, 'errors');
+				$error++;
+			}
+		}
 
-        if ($error) $action = 'edit_extras';
-    }
+		if ($error) $action = 'edit_extras';
+	}
 
-    // Add new or update third party
-    if ((!GETPOST('getcustomercode') && !GETPOST('getsuppliercode'))
-    && ($action == 'add' || $action == 'update') && $user->rights->societe->creer)
-    {
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+	// Add new or update third party
+	if ((!GETPOST('getcustomercode') && !GETPOST('getsuppliercode'))
+	&& ($action == 'add' || $action == 'update') && $user->rights->societe->creer)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-        if (!GETPOST('name'))
-        {
-            setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdPartyName")), null, 'errors');
-            $error++;
-        }
-        if (GETPOST('client') < 0)
-        {
-            setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProspectCustomer")), null, 'errors');
-            $error++;
-        }
-        if (GETPOST('fournisseur') < 0)
-        {
-            setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Supplier")), null, 'errors');
-            $error++;
-        }
+		if (!GETPOST('name'))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdPartyName")), null, 'errors');
+			$error++;
+		}
+		if (GETPOST('client') < 0)
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProspectCustomer")), null, 'errors');
+			$error++;
+		}
+		if (GETPOST('fournisseur') < 0)
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Supplier")), null, 'errors');
+			$error++;
+		}
 
-        if (!$error)
-        {
-        	if ($action == 'update')
-	        {
-	        	$ret = $object->fetch($socid);
+		if (!$error)
+		{
+			if ($action == 'update')
+			{
+				$ret = $object->fetch($socid);
 				$object->oldcopy = clone $object;
-	        } else $object->canvas = $canvas;
+			} else $object->canvas = $canvas;
 
-	        if (GETPOST("private", 'int') == 1)	// Ask to create a contact
-	        {
-	            $object->particulier		= GETPOST("private", 'int');
+			if (GETPOST("private", 'int') == 1)	// Ask to create a contact
+			{
+				$object->particulier		= GETPOST("private", 'int');
 
-	            $object->name = dolGetFirstLastname(GETPOST('firstname', 'alphanohtml'), GETPOST('name', 'alphanohtml'));
-	            $object->civility_id		= GETPOST('civility_id', 'alphanohtml'); // Note: civility id is a code, not an int
-	            // Add non official properties
-	            $object->name_bis = GETPOST('name', 'alphanohtml');
-	            $object->firstname = GETPOST('firstname', 'alphanohtml');
-	        } else {
-	            $object->name = GETPOST('name', 'alphanohtml');
-	        }
-	        $object->entity					= (GETPOSTISSET('entity') ? GETPOST('entity', 'int') : $conf->entity);
-	        $object->name_alias = GETPOST('name_alias', 'alphanohtml');
-	        $object->address				= GETPOST('address', 'alphanohtml');
-	        $object->zip = GETPOST('zipcode', 'alphanohtml');
-	        $object->town = GETPOST('town', 'alphanohtml');
-	        $object->country_id = GETPOST('country_id', 'int');
-	        $object->state_id = GETPOST('state_id', 'int');
-	        //$object->skype					= GETPOST('skype', 'alpha');
-	        //$object->twitter				= GETPOST('twitter', 'alpha');
-	        //$object->facebook				= GETPOST('facebook', 'alpha');
-            //$object->linkedin				= GETPOST('linkedin', 'alpha');
-            $object->socialnetworks = array();
-            if (!empty($conf->socialnetworks->enabled)) {
-                foreach ($socialnetworks as $key => $value) {
-                    if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') {
-                        $object->socialnetworks[$key] = GETPOST($key, 'alphanohtml');
-                    }
-                }
-            }
-            $object->phone = GETPOST('phone', 'alpha');
-	        $object->fax					= GETPOST('fax', 'alpha');
-	        $object->email = trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL));
-	        $object->url					= trim(GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL));
-	        $object->idprof1				= trim(GETPOST('idprof1', 'alphanohtml'));
-	        $object->idprof2				= trim(GETPOST('idprof2', 'alphanohtml'));
-	        $object->idprof3				= trim(GETPOST('idprof3', 'alphanohtml'));
-	        $object->idprof4				= trim(GETPOST('idprof4', 'alphanohtml'));
-	        $object->idprof5				= trim(GETPOST('idprof5', 'alphanohtml'));
-	        $object->idprof6				= trim(GETPOST('idprof6', 'alphanohtml'));
-	        $object->prefix_comm			= GETPOST('prefix_comm', 'alphanohtml');
-	        $object->code_client			= GETPOSTISSET('customer_code') ?GETPOST('customer_code', 'alpha') : GETPOST('code_client', 'alpha');
-	        $object->code_fournisseur = GETPOSTISSET('supplier_code') ?GETPOST('supplier_code', 'alpha') : GETPOST('code_fournisseur', 'alpha');
-	        $object->capital				= GETPOST('capital', 'alphanohtml');
-	        $object->barcode				= GETPOST('barcode', 'alphanohtml');
+				$object->name = dolGetFirstLastname(GETPOST('firstname', 'alphanohtml'), GETPOST('name', 'alphanohtml'));
+				$object->civility_id		= GETPOST('civility_id', 'alphanohtml'); // Note: civility id is a code, not an int
+				// Add non official properties
+				$object->name_bis = GETPOST('name', 'alphanohtml');
+				$object->firstname = GETPOST('firstname', 'alphanohtml');
+			} else {
+				$object->name = GETPOST('name', 'alphanohtml');
+			}
+			$object->entity					= (GETPOSTISSET('entity') ? GETPOST('entity', 'int') : $conf->entity);
+			$object->name_alias = GETPOST('name_alias', 'alphanohtml');
+			$object->address				= GETPOST('address', 'alphanohtml');
+			$object->zip = GETPOST('zipcode', 'alphanohtml');
+			$object->town = GETPOST('town', 'alphanohtml');
+			$object->country_id = GETPOST('country_id', 'int');
+			$object->state_id = GETPOST('state_id', 'int');
+			//$object->skype					= GETPOST('skype', 'alpha');
+			//$object->twitter				= GETPOST('twitter', 'alpha');
+			//$object->facebook				= GETPOST('facebook', 'alpha');
+			//$object->linkedin				= GETPOST('linkedin', 'alpha');
+			$object->socialnetworks = array();
+			if (!empty($conf->socialnetworks->enabled)) {
+				foreach ($socialnetworks as $key => $value) {
+					if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') {
+						$object->socialnetworks[$key] = GETPOST($key, 'alphanohtml');
+					}
+				}
+			}
+			$object->phone = GETPOST('phone', 'alpha');
+			$object->fax					= GETPOST('fax', 'alpha');
+			$object->email = trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL));
+			$object->url					= trim(GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL));
+			$object->idprof1				= trim(GETPOST('idprof1', 'alphanohtml'));
+			$object->idprof2				= trim(GETPOST('idprof2', 'alphanohtml'));
+			$object->idprof3				= trim(GETPOST('idprof3', 'alphanohtml'));
+			$object->idprof4				= trim(GETPOST('idprof4', 'alphanohtml'));
+			$object->idprof5				= trim(GETPOST('idprof5', 'alphanohtml'));
+			$object->idprof6				= trim(GETPOST('idprof6', 'alphanohtml'));
+			$object->prefix_comm			= GETPOST('prefix_comm', 'alphanohtml');
+			$object->code_client			= GETPOSTISSET('customer_code') ?GETPOST('customer_code', 'alpha') : GETPOST('code_client', 'alpha');
+			$object->code_fournisseur = GETPOSTISSET('supplier_code') ?GETPOST('supplier_code', 'alpha') : GETPOST('code_fournisseur', 'alpha');
+			$object->capital				= GETPOST('capital', 'alphanohtml');
+			$object->barcode				= GETPOST('barcode', 'alphanohtml');
 
-	        $object->tva_intra				= GETPOST('tva_intra', 'alphanohtml');
-	        $object->tva_assuj				= GETPOST('assujtva_value', 'alpha');
-	        $object->status = GETPOST('status', 'alpha');
+			$object->tva_intra				= GETPOST('tva_intra', 'alphanohtml');
+			$object->tva_assuj				= GETPOST('assujtva_value', 'alpha');
+			$object->status = GETPOST('status', 'alpha');
 
-	        // Local Taxes
-	        $object->localtax1_assuj		= GETPOST('localtax1assuj_value', 'alpha');
-	        $object->localtax2_assuj		= GETPOST('localtax2assuj_value', 'alpha');
+			// Local Taxes
+			$object->localtax1_assuj		= GETPOST('localtax1assuj_value', 'alpha');
+			$object->localtax2_assuj		= GETPOST('localtax2assuj_value', 'alpha');
 
-	        $object->localtax1_value		= GETPOST('lt1', 'alpha');
-	        $object->localtax2_value		= GETPOST('lt2', 'alpha');
+			$object->localtax1_value		= GETPOST('lt1', 'alpha');
+			$object->localtax2_value		= GETPOST('lt2', 'alpha');
 
-	        $object->forme_juridique_code = GETPOST('forme_juridique_code', 'int');
-	        $object->effectif_id			= GETPOST('effectif_id', 'int');
-	        $object->typent_id = GETPOST('typent_id', 'int');
+			$object->forme_juridique_code = GETPOST('forme_juridique_code', 'int');
+			$object->effectif_id			= GETPOST('effectif_id', 'int');
+			$object->typent_id = GETPOST('typent_id', 'int');
 
-	        $object->typent_code			= dol_getIdFromCode($db, $object->typent_id, 'c_typent', 'id', 'code'); // Force typent_code too so check in verify() will be done on new type
+			$object->typent_code			= dol_getIdFromCode($db, $object->typent_id, 'c_typent', 'id', 'code'); // Force typent_code too so check in verify() will be done on new type
 
-	        $object->client = GETPOST('client', 'int');
-	        $object->fournisseur			= GETPOST('fournisseur', 'int');
+			$object->client = GETPOST('client', 'int');
+			$object->fournisseur			= GETPOST('fournisseur', 'int');
 
-	        $object->commercial_id = GETPOST('commercial_id', 'int');
-	        $object->default_lang = GETPOST('default_lang');
+			$object->commercial_id = GETPOST('commercial_id', 'int');
+			$object->default_lang = GETPOST('default_lang');
 
-	        // Webservices url/key
-	        $object->webservices_url		= GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
-	        $object->webservices_key		= GETPOST('webservices_key', 'san_alpha');
+			// Webservices url/key
+			$object->webservices_url		= GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
+			$object->webservices_key		= GETPOST('webservices_key', 'san_alpha');
 
 			// Incoterms
 			if (!empty($conf->incoterm->enabled))
@@ -475,8 +489,8 @@ if (empty($reshook))
 				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
 			}
 
-	        // Fill array 'array_options' with data from add form
-	        $ret = $extrafields->setOptionalsFromPost(null, $object);
+			// Fill array 'array_options' with data from add form
+			$ret = $extrafields->setOptionalsFromPost(null, $object);
 			if ($ret < 0)
 			{
 				 $error++;
@@ -490,58 +504,58 @@ if (empty($reshook))
 			}
 			//var_dump($object->array_languages);exit;
 
-	        if (GETPOST('deletephoto')) $object->logo = '';
-	        elseif (!empty($_FILES['photo']['name'])) $object->logo = dol_sanitizeFileName($_FILES['photo']['name']);
+			if (GETPOST('deletephoto')) $object->logo = '';
+			elseif (!empty($_FILES['photo']['name'])) $object->logo = dol_sanitizeFileName($_FILES['photo']['name']);
 
-	        // Check parameters
-	        if (!GETPOST('cancel', 'alpha'))
-	        {
-	            if (!empty($object->email) && !isValidEMail($object->email))
-	            {
-	                $langs->load("errors");
-	                $error++;
-	                setEventMessages('', $langs->trans("ErrorBadEMail", $object->email), 'errors');
-	            }
-	            if (!empty($object->url) && !isValidUrl($object->url))
-	            {
-	                $langs->load("errors");
-	                setEventMessages('', $langs->trans("ErrorBadUrl", $object->url), 'errors');
-	            }
-	            if (!empty($object->webservices_url)) {
-	                //Check if has transport, without any the soap client will give error
-	                if (strpos($object->webservices_url, "http") === false)
-	                {
-	                    $object->webservices_url = "http://".$object->webservices_url;
-	                }
-	                if (!isValidUrl($object->webservices_url)) {
-	                    $langs->load("errors");
-	                    $error++; $errors[] = $langs->trans("ErrorBadUrl", $object->webservices_url);
-	                }
-	            }
+			// Check parameters
+			if (!GETPOST('cancel', 'alpha'))
+			{
+				if (!empty($object->email) && !isValidEMail($object->email))
+				{
+					$langs->load("errors");
+					$error++;
+					setEventMessages('', $langs->trans("ErrorBadEMail", $object->email), 'errors');
+				}
+				if (!empty($object->url) && !isValidUrl($object->url))
+				{
+					$langs->load("errors");
+					setEventMessages('', $langs->trans("ErrorBadUrl", $object->url), 'errors');
+				}
+				if (!empty($object->webservices_url)) {
+					//Check if has transport, without any the soap client will give error
+					if (strpos($object->webservices_url, "http") === false)
+					{
+						$object->webservices_url = "http://".$object->webservices_url;
+					}
+					if (!isValidUrl($object->webservices_url)) {
+						$langs->load("errors");
+						$error++; $errors[] = $langs->trans("ErrorBadUrl", $object->webservices_url);
+					}
+				}
 
-	            // We set country_id, country_code and country for the selected country
-	            $object->country_id = GETPOST('country_id') != '' ?GETPOST('country_id') : $mysoc->country_id;
-	            if ($object->country_id)
-	            {
-	            	$tmparray = getCountry($object->country_id, 'all');
-	            	$object->country_code = $tmparray['code'];
-	            	$object->country = $tmparray['label'];
-	            }
-	        }
-        }
+				// We set country_id, country_code and country for the selected country
+				$object->country_id = GETPOST('country_id') != '' ?GETPOST('country_id') : $mysoc->country_id;
+				if ($object->country_id)
+				{
+					$tmparray = getCountry($object->country_id, 'all');
+					$object->country_code = $tmparray['code'];
+					$object->country = $tmparray['label'];
+				}
+			}
+		}
 
-        if (!$error)
-        {
-            if ($action == 'add')
-            {
-            	$error = 0;
+		if (!$error)
+		{
+			if ($action == 'add')
+			{
+				$error = 0;
 
-                $db->begin();
+				$db->begin();
 
-                if (empty($object->client))      $object->code_client = '';
-                if (empty($object->fournisseur)) $object->code_fournisseur = '';
+				if (empty($object->client))      $object->code_client = '';
+				if (empty($object->fournisseur)) $object->code_fournisseur = '';
 
-                $result = $object->create($user);
+				$result = $object->create($user);
 
 				if ($result >= 0)
 				{
@@ -583,106 +597,106 @@ if (empty($reshook))
 						setEventMessages($object->error, $object->errors, 'errors');
 					}
 
-                    // Logo/Photo save
-                    $dir     = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos/";
-                    $file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
-                    if ($file_OK)
-                    {
-                        if (image_format_supported($_FILES['photo']['name']))
-                        {
-                            dol_mkdir($dir);
+					// Logo/Photo save
+					$dir     = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos/";
+					$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
+					if ($file_OK)
+					{
+						if (image_format_supported($_FILES['photo']['name']))
+						{
+							dol_mkdir($dir);
 
-                            if (@is_dir($dir))
-                            {
-                                $newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
-                                $result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
+							if (@is_dir($dir))
+							{
+								$newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
+								$result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
 
-                                if (!$result > 0)
-                                {
-                                    $errors[] = "ErrorFailedToSaveFile";
-                                } else {
-                                    // Create thumbs
-                                    $object->addThumbs($newfile);
-                                }
-                            }
-                        }
-                    } else {
+								if (!$result > 0)
+								{
+									$errors[] = "ErrorFailedToSaveFile";
+								} else {
+									// Create thumbs
+									$object->addThumbs($newfile);
+								}
+							}
+						}
+					} else {
 						switch ($_FILES['photo']['error'])
 						{
-						    case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
-						    case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
-						        $errors[] = "ErrorFileSizeTooLarge";
-						        break;
-	      					case 3: //uploaded file was only partially uploaded
-						        $errors[] = "ErrorFilePartiallyUploaded";
-						        break;
+							case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
+							case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
+								$errors[] = "ErrorFileSizeTooLarge";
+								break;
+		  					case 3: //uploaded file was only partially uploaded
+								$errors[] = "ErrorFilePartiallyUploaded";
+								break;
 						}
-	                }
-                    // Gestion du logo de la société
-                } else {
-				    if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') // TODO Sometime errors on duplicate on profid and not on code, so we must manage this case
+					}
+					// Gestion du logo de la société
+				} else {
+					if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') // TODO Sometime errors on duplicate on profid and not on code, so we must manage this case
 					{
 						$duplicate_code_error = true;
 						$object->code_fournisseur = null;
 						$object->code_client = null;
 					}
 
-                    setEventMessages($object->error, $object->errors, 'errors');
-                   	$error++;
-                }
+					setEventMessages($object->error, $object->errors, 'errors');
+				   	$error++;
+				}
 
-                if ($result >= 0 && !$error)
-                {
-                    $db->commit();
+				if ($result >= 0 && !$error)
+				{
+					$db->commit();
 
-                    if (!empty($backtopage))
-                	{
-                		$backtopage = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $backtopage); // New method to autoselect project after a New on another form object creation
-                		if (preg_match('/\?/', $backtopage)) $backtopage .= '&socid='.$object->id; // Old method
-               		    header("Location: ".$backtopage);
-                    	exit;
-                	} else {
-                		$url = $_SERVER["PHP_SELF"]."?socid=".$object->id; // Old method
-                    	if (($object->client == 1 || $object->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url = DOL_URL_ROOT."/comm/card.php?socid=".$object->id;
-                    	elseif ($object->fournisseur == 1) $url = DOL_URL_ROOT."/fourn/card.php?socid=".$object->id;
+					if (!empty($backtopage))
+					{
+						$backtopage = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $backtopage); // New method to autoselect project after a New on another form object creation
+						if (preg_match('/\?/', $backtopage)) $backtopage .= '&socid='.$object->id; // Old method
+			   			header("Location: ".$backtopage);
+						exit;
+					} else {
+						$url = $_SERVER["PHP_SELF"]."?socid=".$object->id; // Old method
+						if (($object->client == 1 || $object->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url = DOL_URL_ROOT."/comm/card.php?socid=".$object->id;
+						elseif ($object->fournisseur == 1) $url = DOL_URL_ROOT."/fourn/card.php?socid=".$object->id;
 
-                		header("Location: ".$url);
-                    	exit;
-                	}
-                } else {
-                    $db->rollback();
-                    $action = 'create';
-                }
-            }
+						header("Location: ".$url);
+						exit;
+					}
+				} else {
+					$db->rollback();
+					$action = 'create';
+				}
+			}
 
-            if ($action == 'update')
-            {
-            	$error = 0;
+			if ($action == 'update')
+			{
+				$error = 0;
 
-                if (GETPOST('cancel', 'alpha'))
-                {
-                	if (!empty($backtopage))
-                	{
-               		    header("Location: ".$backtopage);
-                    	exit;
-                	} else {
-               		    header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
-                    	exit;
-                	}
-                }
+				if (GETPOST('cancel', 'alpha'))
+				{
+					if (!empty($backtopage))
+					{
+			   			header("Location: ".$backtopage);
+						exit;
+					} else {
+			   			header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
+						exit;
+					}
+				}
 
-                // To not set code if third party is not concerned. But if it had values, we keep them.
-                if (empty($object->client) && empty($object->oldcopy->code_client))          $object->code_client = '';
-                if (empty($object->fournisseur) && empty($object->oldcopy->code_fournisseur)) $object->code_fournisseur = '';
-                //var_dump($object);exit;
+				// To not set code if third party is not concerned. But if it had values, we keep them.
+				if (empty($object->client) && empty($object->oldcopy->code_client))          $object->code_client = '';
+				if (empty($object->fournisseur) && empty($object->oldcopy->code_fournisseur)) $object->code_fournisseur = '';
+				//var_dump($object);exit;
 
-                $result = $object->update($socid, $user, 1, $object->oldcopy->codeclient_modifiable(), $object->oldcopy->codefournisseur_modifiable(), 'update', 0);
+				$result = $object->update($socid, $user, 1, $object->oldcopy->codeclient_modifiable(), $object->oldcopy->codefournisseur_modifiable(), 'update', 0);
 
-                if ($result <= 0)
-                {
-                    setEventMessages($object->error, $object->errors, 'errors');
-                    $error++;
-                }
+				if ($result <= 0)
+				{
+					setEventMessages($object->error, $object->errors, 'errors');
+					$error++;
+				}
 
 				// Links with users
 				$salesreps = GETPOST('commercial', 'array');
@@ -715,128 +729,128 @@ if (empty($reshook))
 					}
 				}
 
-                // Logo/Photo save
-                $dir     = $conf->societe->multidir_output[$object->entity]."/".$object->id."/logos";
-                $file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
-                if (GETPOST('deletephoto') && $object->logo)
-                {
-                    $fileimg = $dir.'/'.$object->logo;
-                    $dirthumbs = $dir.'/thumbs';
-                    dol_delete_file($fileimg);
-                    dol_delete_dir_recursive($dirthumbs);
-                }
-                if ($file_OK)
-                {
-                    if (image_format_supported($_FILES['photo']['name']) > 0)
-                    {
-                        dol_mkdir($dir);
+				// Logo/Photo save
+				$dir     = $conf->societe->multidir_output[$object->entity]."/".$object->id."/logos";
+				$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
+				if (GETPOST('deletephoto') && $object->logo)
+				{
+					$fileimg = $dir.'/'.$object->logo;
+					$dirthumbs = $dir.'/thumbs';
+					dol_delete_file($fileimg);
+					dol_delete_dir_recursive($dirthumbs);
+				}
+				if ($file_OK)
+				{
+					if (image_format_supported($_FILES['photo']['name']) > 0)
+					{
+						dol_mkdir($dir);
 
-                        if (@is_dir($dir))
-                        {
-                            $newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
-                            $result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
+						if (@is_dir($dir))
+						{
+							$newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
+							$result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
 
-                            if (!$result > 0)
-                            {
-                                $errors[] = "ErrorFailedToSaveFile";
-                            } else {
-                            	// Create thumbs
-                            	$object->addThumbs($newfile);
+							if (!$result > 0)
+							{
+								$errors[] = "ErrorFailedToSaveFile";
+							} else {
+								// Create thumbs
+								$object->addThumbs($newfile);
 
-                                // Index file in database
-                                if (!empty($conf->global->THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD))
-                                {
-                                	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-                                	// the dir dirname($newfile) is directory of logo, so we should have only one file at once into index, so we delete indexes for the dir
-                                	deleteFilesIntoDatabaseIndex(dirname($newfile), '', '');
-                                	// now we index the uploaded logo file
-                                	addFileIntoDatabaseIndex(dirname($newfile), basename($newfile), '', 'uploaded', 1);
-                                }
-                            }
-                        }
-                    } else {
-                        $errors[] = "ErrorBadImageFormat";
-                    }
-                } else {
+								// Index file in database
+								if (!empty($conf->global->THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD))
+								{
+									require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+									// the dir dirname($newfile) is directory of logo, so we should have only one file at once into index, so we delete indexes for the dir
+									deleteFilesIntoDatabaseIndex(dirname($newfile), '', '');
+									// now we index the uploaded logo file
+									addFileIntoDatabaseIndex(dirname($newfile), basename($newfile), '', 'uploaded', 1);
+								}
+							}
+						}
+					} else {
+						$errors[] = "ErrorBadImageFormat";
+					}
+				} else {
 					switch ($_FILES['photo']['error'])
 					{
-					    case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
-					    case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
-					        $errors[] = "ErrorFileSizeTooLarge";
-					        break;
-      					case 3: //uploaded file was only partially uploaded
-					        $errors[] = "ErrorFilePartiallyUploaded";
-					        break;
+						case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
+						case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
+							$errors[] = "ErrorFileSizeTooLarge";
+							break;
+	  					case 3: //uploaded file was only partially uploaded
+							$errors[] = "ErrorFilePartiallyUploaded";
+							break;
 					}
-                }
-                // Gestion du logo de la société
+				}
+				// Gestion du logo de la société
 
 
-                // Update linked member
-                if (!$error && $object->fk_soc > 0)
-                {
-                	$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
-                	$sql .= " SET fk_soc = NULL WHERE fk_soc = ".$id;
-                	if (!$object->db->query($sql))
-                	{
-                		$error++;
-                		$object->error .= $object->db->lasterror();
-                		setEventMessages($object->error, $object->errors, 'errors');
-                	}
-                }
+				// Update linked member
+				if (!$error && $object->fk_soc > 0)
+				{
+					$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
+					$sql .= " SET fk_soc = NULL WHERE fk_soc = ".$id;
+					if (!$object->db->query($sql))
+					{
+						$error++;
+						$object->error .= $object->db->lasterror();
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
+				}
 
-                if (!$error && !count($errors))
-                {
-                	if (!empty($backtopage))
-                	{
-               		    header("Location: ".$backtopage);
-                    	exit;
-                	} else {
-               		    header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
-                    	exit;
-                	}
-                } else {
-                    $object->id = $socid;
-                    $action = "edit";
-                }
-            }
-        } else {
-        	$action = ($action == 'add' ? 'create' : 'edit');
-        }
-    }
+				if (!$error && !count($errors))
+				{
+					if (!empty($backtopage))
+					{
+			   			header("Location: ".$backtopage);
+						exit;
+					} else {
+			   			header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
+						exit;
+					}
+				} else {
+					$object->id = $socid;
+					$action = "edit";
+				}
+			}
+		} else {
+			$action = ($action == 'add' ? 'create' : 'edit');
+		}
+	}
 
-    // Delete third party
-    if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->societe->supprimer)
-    {
-        $object->fetch($socid);
-        $object->oldcopy = clone $object;
-        $result = $object->delete($socid, $user);
+	// Delete third party
+	if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->societe->supprimer)
+	{
+		$object->fetch($socid);
+		$object->oldcopy = clone $object;
+		$result = $object->delete($socid, $user);
 
-        if ($result > 0)
-        {
-            header("Location: ".DOL_URL_ROOT."/societe/list.php?restore_lastsearch_values=1&delsoc=".urlencode($object->name));
-            exit;
-        } else {
-            $langs->load("errors");
-           	setEventMessages($object->error, $object->errors, 'errors');
-           	$error++;
-            $action = '';
-        }
-    }
+		if ($result > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/societe/list.php?restore_lastsearch_values=1&delsoc=".urlencode($object->name));
+			exit;
+		} else {
+			$langs->load("errors");
+		   	setEventMessages($object->error, $object->errors, 'errors');
+		   	$error++;
+			$action = '';
+		}
+	}
 
-    // Set parent company
-    if ($action == 'set_thirdparty' && $user->rights->societe->creer)
-    {
-    	$object->fetch($socid);
-    	$result = $object->set_parent(GETPOST('editparentcompany', 'int'));
-    }
+	// Set parent company
+	if ($action == 'set_thirdparty' && $user->rights->societe->creer)
+	{
+		$object->fetch($socid);
+		$result = $object->set_parent(GETPOST('editparentcompany', 'int'));
+	}
 
-    // Set incoterm
-    if ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
-    {
-    	$object->fetch($socid);
-    	$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
-    }
+	// Set incoterm
+	if ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
+	{
+		$object->fetch($socid);
+		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+	}
 
 	// Set sales representatives
 	if ($action == 'set_salesrepresentatives' && $user->rights->societe->creer)
@@ -845,26 +859,26 @@ if (empty($reshook))
 		$result = $object->setSalesRep(GETPOST('commercial', 'array'));
 	}
 
-    $id = $socid;
-    $object->fetch($socid);
+	$id = $socid;
+	$object->fetch($socid);
 
 	// Selection of new fields
 	if (!empty($conf->global->MAIN_DUPLICATE_CONTACTS_TAB_ON_MAIN_CARD) && (empty($conf->global->SOCIETE_DISABLE_CONTACTS) || !empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT))) {
-		include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php';
+		include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 	}
 
-    // Actions to send emails
-    $triggersendname = 'COMPANY_SENTBYMAIL';
-    $paramname = 'socid';
-    $mode = 'emailfromthirdparty';
-    $trackid = 'thi'.$object->id;
-    include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+	// Actions to send emails
+	$triggersendname = 'COMPANY_SENTBYMAIL';
+	$paramname = 'socid';
+	$mode = 'emailfromthirdparty';
+	$trackid = 'thi'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
-    // Actions to build doc
-    $id = $socid;
-    $upload_dir = $conf->societe->dir_output;
-    $permissiontoadd = $user->rights->societe->creer;
-    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+	// Actions to build doc
+	$id = $socid;
+	$upload_dir = $conf->societe->dir_output;
+	$permissiontoadd = $user->rights->societe->creer;
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 }
 
 
@@ -879,7 +893,7 @@ $formcompany = new FormCompany($db);
 
 if ($socid > 0 && empty($object->id))
 {
-    $result = $object->fetch($socid);
+	$result = $object->fetch($socid);
 	if ($result <= 0) dol_print_error('', $object->error);
 }
 
@@ -892,173 +906,172 @@ $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("
 
 if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 {
-    // -----------------------------------------
-    // When used with CANVAS
-    // -----------------------------------------
+	// -----------------------------------------
+	// When used with CANVAS
+	// -----------------------------------------
    	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
-    $objcanvas->display_canvas($action); // Show template
+	$objcanvas->display_canvas($action); // Show template
 } else {
-    // -----------------------------------------
-    // When used in standard mode
-    // -----------------------------------------
-    if ($action == 'create')
-    {
-        /*
+	// -----------------------------------------
+	// When used in standard mode
+	// -----------------------------------------
+	if ($action == 'create')
+	{
+		/*
          *  Creation
          */
 		$private = GETPOST("private", "int");
 		if (!empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT) && !GETPOSTISSET('private')) $private = 1;
-    	if (empty($private)) $private = 0;
+		if (empty($private)) $private = 0;
 
-        // Load object modCodeTiers
-        $module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
-        if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-        {
-            $module = substr($module, 0, dol_strlen($module) - 4);
-        }
-        $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-        foreach ($dirsociete as $dirroot)
-        {
-            $res = dol_include_once($dirroot.$module.'.php');
-            if ($res) break;
-        }
-        $modCodeClient = new $module;
-        // Load object modCodeFournisseur
-        $module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
-        if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-        {
-            $module = substr($module, 0, dol_strlen($module) - 4);
-        }
-        $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-        foreach ($dirsociete as $dirroot)
-        {
-            $res = dol_include_once($dirroot.$module.'.php');
-            if ($res) break;
-        }
-        $modCodeFournisseur = new $module;
+		// Load object modCodeTiers
+		$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+		if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
+		{
+			$module = substr($module, 0, dol_strlen($module) - 4);
+		}
+		$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+		foreach ($dirsociete as $dirroot)
+		{
+			$res = dol_include_once($dirroot.$module.'.php');
+			if ($res) break;
+		}
+		$modCodeClient = new $module;
+		// Load object modCodeFournisseur
+		$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+		if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
+		{
+			$module = substr($module, 0, dol_strlen($module) - 4);
+		}
+		$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+		foreach ($dirsociete as $dirroot)
+		{
+			$res = dol_include_once($dirroot.$module.'.php');
+			if ($res) break;
+		}
+		$modCodeFournisseur = new $module;
 
-        // Define if customer/prospect or supplier status is set or not
-        if (GETPOST("type") != 'f')
-        {
-            $object->client = -1;
-            if (!empty($conf->global->THIRDPARTY_CUSTOMERPROSPECT_BY_DEFAULT)) { $object->client = 3; }
-        }
-        // Prospect / Customer
-        if (GETPOST("type") == 'c') {
-        	if (!empty($conf->global->THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT)) {
-        		$object->client = $conf->global->THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT;
-        	} else {
-        		$object->client = 3;
-        	}
-        }
-        if (GETPOST("type") == 'p') { $object->client = 2; }
-        if (!empty($conf->fournisseur->enabled) && (GETPOST("type") == 'f' || (GETPOST("type") == '' && !empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)))) { $object->fournisseur = 1; }
+		// Define if customer/prospect or supplier status is set or not
+		if (GETPOST("type") != 'f')
+		{
+			$object->client = -1;
+			if (!empty($conf->global->THIRDPARTY_CUSTOMERPROSPECT_BY_DEFAULT)) { $object->client = 3; }
+		}
+		// Prospect / Customer
+		if (GETPOST("type") == 'c') {
+			if (!empty($conf->global->THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT)) {
+				$object->client = $conf->global->THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT;
+			} else {
+				$object->client = 3;
+			}
+		}
+		if (GETPOST("type") == 'p') { $object->client = 2; }
+		if (!empty($conf->fournisseur->enabled) && (GETPOST("type") == 'f' || (GETPOST("type") == '' && !empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)))) { $object->fournisseur = 1; }
 
-        $object->name = GETPOST('name', 'alphanohtml');
-        $object->name_alias	= GETPOST('name_alias', 'alphanohtml');
-        $object->firstname = GETPOST('firstname', 'alphanohtml');
-        $object->particulier		= $private;
-        $object->prefix_comm		= GETPOST('prefix_comm', 'alphanohtml');
-        $object->client = GETPOST('client', 'int') ?GETPOST('client', 'int') : $object->client;
+		$object->name = GETPOST('name', 'alphanohtml');
+		$object->name_alias = GETPOST('name_alias', 'alphanohtml');
+		$object->firstname = GETPOST('firstname', 'alphanohtml');
+		$object->particulier		= $private;
+		$object->prefix_comm		= GETPOST('prefix_comm', 'alphanohtml');
+		$object->client = GETPOST('client', 'int') ?GETPOST('client', 'int') : $object->client;
 
-        if (empty($duplicate_code_error)) {
-	        $object->code_client		= GETPOST('customer_code', 'alpha');
-	        $object->fournisseur		= GETPOST('fournisseur') ? GETPOST('fournisseur', 'int') : $object->fournisseur;
-            $object->code_fournisseur = GETPOST('supplier_code', 'alpha');
-        } else {
+		if (empty($duplicate_code_error)) {
+			$object->code_client		= GETPOST('customer_code', 'alpha');
+			$object->fournisseur		= GETPOST('fournisseur') ? GETPOST('fournisseur', 'int') : $object->fournisseur;
+			$object->code_fournisseur = GETPOST('supplier_code', 'alpha');
+		} else {
 			setEventMessages($langs->trans('NewCustomerSupplierCodeProposed'), '', 'warnings');
 		}
 
+		$object->address = GETPOST('address', 'alphanohtml');
+		$object->zip = GETPOST('zipcode', 'alphanohtml');
+		$object->town = GETPOST('town', 'alphanohtml');
+		$object->state_id = GETPOST('state_id', 'int');
+		//$object->skype				= GETPOST('skype', 'alpha');
+		//$object->twitter			= GETPOST('twitter', 'alpha');
+		//$object->facebook			= GETPOST('facebook', 'alpha');
+		//$object->linkedin			= GETPOST('linkedin', 'alpha');
+		$object->socialnetworks = array();
+		if (!empty($conf->socialnetworks->enabled)) {
+			foreach ($socialnetworks as $key => $value) {
+				if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') {
+					$object->socialnetworks[$key] = GETPOST($key, 'alphanohtml');
+				}
+			}
+		}
+		$object->phone				= GETPOST('phone', 'alpha');
+		$object->fax				= GETPOST('fax', 'alpha');
+		$object->email				= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
+		$object->url				= GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
+		$object->capital			= GETPOST('capital', 'alphanohtml');
+		$object->barcode			= GETPOST('barcode', 'alphanohtml');
+		$object->idprof1			= GETPOST('idprof1', 'alphanohtml');
+		$object->idprof2			= GETPOST('idprof2', 'alphanohtml');
+		$object->idprof3			= GETPOST('idprof3', 'alphanohtml');
+		$object->idprof4			= GETPOST('idprof4', 'alphanohtml');
+		$object->idprof5			= GETPOST('idprof5', 'alphanohtml');
+		$object->idprof6			= GETPOST('idprof6', 'alphanohtml');
+		$object->typent_id = GETPOST('typent_id', 'int');
+		$object->effectif_id		= GETPOST('effectif_id', 'int');
+		$object->civility_id		= GETPOST('civility_id', 'alpha');
 
-        $object->address = GETPOST('address', 'alphanohtml');
-        $object->zip = GETPOST('zipcode', 'alphanohtml');
-        $object->town = GETPOST('town', 'alphanohtml');
-        $object->state_id = GETPOST('state_id', 'int');
-        //$object->skype				= GETPOST('skype', 'alpha');
-        //$object->twitter			= GETPOST('twitter', 'alpha');
-        //$object->facebook			= GETPOST('facebook', 'alpha');
-        //$object->linkedin			= GETPOST('linkedin', 'alpha');
-        $object->socialnetworks = array();
-        if (!empty($conf->socialnetworks->enabled)) {
-            foreach ($socialnetworks as $key => $value) {
-                if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') {
-                    $object->socialnetworks[$key] = GETPOST($key, 'alphanohtml');
-                }
-            }
-        }
-        $object->phone				= GETPOST('phone', 'alpha');
-        $object->fax				= GETPOST('fax', 'alpha');
-        $object->email				= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
-        $object->url				= GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
-        $object->capital			= GETPOST('capital', 'alphanohtml');
-        $object->barcode			= GETPOST('barcode', 'alphanohtml');
-        $object->idprof1			= GETPOST('idprof1', 'alphanohtml');
-        $object->idprof2			= GETPOST('idprof2', 'alphanohtml');
-        $object->idprof3			= GETPOST('idprof3', 'alphanohtml');
-        $object->idprof4			= GETPOST('idprof4', 'alphanohtml');
-        $object->idprof5			= GETPOST('idprof5', 'alphanohtml');
-        $object->idprof6			= GETPOST('idprof6', 'alphanohtml');
-        $object->typent_id = GETPOST('typent_id', 'int');
-        $object->effectif_id		= GETPOST('effectif_id', 'int');
-        $object->civility_id		= GETPOST('civility_id', 'alpha');
+		$object->tva_assuj = GETPOST('assujtva_value', 'int');
+		$object->status = GETPOST('status', 'int');
 
-        $object->tva_assuj = GETPOST('assujtva_value', 'int');
-        $object->status = GETPOST('status', 'int');
+		//Local Taxes
+		$object->localtax1_assuj	= GETPOST('localtax1assuj_value', 'int');
+		$object->localtax2_assuj	= GETPOST('localtax2assuj_value', 'int');
 
-        //Local Taxes
-        $object->localtax1_assuj	= GETPOST('localtax1assuj_value', 'int');
-        $object->localtax2_assuj	= GETPOST('localtax2assuj_value', 'int');
+		$object->localtax1_value	= GETPOST('lt1', 'int');
+		$object->localtax2_value	= GETPOST('lt2', 'int');
 
-        $object->localtax1_value	= GETPOST('lt1', 'int');
-        $object->localtax2_value	= GETPOST('lt2', 'int');
+		$object->tva_intra = GETPOST('tva_intra', 'alphanohtml');
 
-        $object->tva_intra = GETPOST('tva_intra', 'alphanohtml');
+		$object->commercial_id = GETPOST('commercial_id', 'int');
+		$object->default_lang = GETPOST('default_lang');
 
-        $object->commercial_id = GETPOST('commercial_id', 'int');
-        $object->default_lang = GETPOST('default_lang');
+		$object->logo = (isset($_FILES['photo']) ?dol_sanitizeFileName($_FILES['photo']['name']) : '');
 
-        $object->logo = (isset($_FILES['photo']) ?dol_sanitizeFileName($_FILES['photo']['name']) : '');
+		// Gestion du logo de la société
+		$dir     = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos";
+		$file_OK = (isset($_FILES['photo']) ?is_uploaded_file($_FILES['photo']['tmp_name']) : false);
+		if ($file_OK)
+		{
+			if (image_format_supported($_FILES['photo']['name']))
+			{
+				dol_mkdir($dir);
 
-        // Gestion du logo de la société
-        $dir     = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos";
-        $file_OK = (isset($_FILES['photo']) ?is_uploaded_file($_FILES['photo']['tmp_name']) : false);
-        if ($file_OK)
-        {
-            if (image_format_supported($_FILES['photo']['name']))
-            {
-                dol_mkdir($dir);
+				if (@is_dir($dir))
+				{
+					$newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
+					$result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
 
-                if (@is_dir($dir))
-                {
-                    $newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
-                    $result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
+					if (!$result > 0)
+					{
+						$errors[] = "ErrorFailedToSaveFile";
+					} else {
+						// Create thumbs
+						$object->addThumbs($newfile);
+					}
+				}
+			}
+		}
 
-                    if (!$result > 0)
-                    {
-                        $errors[] = "ErrorFailedToSaveFile";
-                    } else {
-                        // Create thumbs
-                        $object->addThumbs($newfile);
-                    }
-                }
-            }
-        }
+		// We set country_id, country_code and country for the selected country
+		$object->country_id = GETPOST('country_id') ?GETPOST('country_id') : $mysoc->country_id;
+		if ($object->country_id)
+		{
+			$tmparray = getCountry($object->country_id, 'all');
+			$object->country_code = $tmparray['code'];
+			$object->country = $tmparray['label'];
+		}
+		$object->forme_juridique_code = GETPOST('forme_juridique_code');
+		/* Show create form */
 
-        // We set country_id, country_code and country for the selected country
-        $object->country_id = GETPOST('country_id') ?GETPOST('country_id') : $mysoc->country_id;
-        if ($object->country_id)
-        {
-            $tmparray = getCountry($object->country_id, 'all');
-            $object->country_code = $tmparray['code'];
-            $object->country = $tmparray['label'];
-        }
-        $object->forme_juridique_code = GETPOST('forme_juridique_code');
-        /* Show create form */
+		$linkback = "";
+		print load_fiche_titre($langs->trans("NewThirdParty"), $linkback, 'building');
 
-        $linkback = "";
-        print load_fiche_titre($langs->trans("NewThirdParty"), $linkback, 'building');
-
-        if (!empty($conf->use_javascript_ajax)) {
+		if (!empty($conf->use_javascript_ajax)) {
 			if (!empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION)) {
 				print "\n".'<script type="text/javascript">';
 				print '$(document).ready(function () {
@@ -1155,325 +1168,321 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			}
 		}
 
-        dol_htmloutput_mesg(is_numeric($error) ? '' : $error, $errors, 'error');
+		dol_htmloutput_mesg(is_numeric($error) ? '' : $error, $errors, 'error');
 
-        print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formsoc" autocomplete="off">'; // Chrome ignor autocomplete
+		print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formsoc" autocomplete="off">'; // Chrome ignor autocomplete
 
-        print '<input type="hidden" name="action" value="add">';
-        print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-        print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<input type="hidden" name="private" value='.$object->particulier.'>';
-        print '<input type="hidden" name="type" value='.GETPOST("type", 'alpha').'>';
-        print '<input type="hidden" name="LastName" value="'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName').'">';
-        print '<input type="hidden" name="ThirdPartyName" value="'.$langs->trans('ThirdPartyName').'">';
-        if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">';
+		print '<input type="hidden" name="action" value="add">';
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="private" value='.$object->particulier.'>';
+		print '<input type="hidden" name="type" value='.GETPOST("type", 'alpha').'>';
+		print '<input type="hidden" name="LastName" value="'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName').'">';
+		print '<input type="hidden" name="ThirdPartyName" value="'.$langs->trans('ThirdPartyName').'">';
+		if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">';
 
-        dol_fiche_head(null, 'card', '', 0, '');
+		print dol_get_fiche_head(null, 'card', '', 0, '');
 
-        print '<table class="border centpercent">';
+		print '<table class="border centpercent">';
 
-        // Name, firstname
-	    print '<tr class="tr-field-thirdparty-name"><td class="titlefieldcreate tdtop">';
-        if ($object->particulier || $private)
-        {
-	        print '<span id="TypeName" class="fieldrequired">'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName', 'name').'</span>';
-        } else {
+		// Name, firstname
+		print '<tr class="tr-field-thirdparty-name"><td class="titlefieldcreate tdtop">';
+		if ($object->particulier || $private)
+		{
+			print '<span id="TypeName" class="fieldrequired">'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName', 'name').'</span>';
+		} else {
 			print '<span id="TypeName" class="fieldrequired">'.$form->editfieldkey('ThirdPartyName', 'name', '', $object, 0).'</span>';
-        }
-	    print '</td><td'.(empty($conf->global->SOCIETE_USEPREFIX) ? ' colspan="3"' : '').'>';
-	    print '<input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.dol_escape_htmltag($object->name).'" autofocus="autofocus">';
-	    print $form->widgetForTranslation("name", $object, $permissiontoadd, 'string', 'alpahnohtml', 'minwidth300');
-	    print '</td>';
-	    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-	    {
-	    	print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.dol_escape_htmltag($object->prefix_comm).'"></td>';
-	    }
-	    print '</tr>';
+		}
+		print '</td><td'.(empty($conf->global->SOCIETE_USEPREFIX) ? ' colspan="3"' : '').'>';
+		print '<input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.dol_escape_htmltag($object->name).'" autofocus="autofocus">';
+		print $form->widgetForTranslation("name", $object, $permissiontoadd, 'string', 'alpahnohtml', 'minwidth300');
+		print '</td>';
+		if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+		{
+			print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.dol_escape_htmltag($object->prefix_comm).'"></td>';
+		}
+		print '</tr>';
 
-        // If javascript on, we show option individual
-        if ($conf->use_javascript_ajax)
-        {
-        	if (!empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION))
-        	{
-        		// Firstname
-	            print '<tr class="individualline"><td>'.$form->editfieldkey('FirstName', 'firstname', '', $object, 0).'</td>';
-		        print '<td colspan="3"><input type="text" class="minwidth300" maxlength="128" name="firstname" id="firstname" value="'.dol_escape_htmltag($object->firstname).'"></td>';
-	            print '</tr>';
+		// If javascript on, we show option individual
+		if ($conf->use_javascript_ajax)
+		{
+			if (!empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION))
+			{
+				// Firstname
+				print '<tr class="individualline"><td>'.$form->editfieldkey('FirstName', 'firstname', '', $object, 0).'</td>';
+				print '<td colspan="3"><input type="text" class="minwidth300" maxlength="128" name="firstname" id="firstname" value="'.dol_escape_htmltag($object->firstname).'"></td>';
+				print '</tr>';
 
-	            // Title
-	            print '<tr class="individualline"><td>'.$form->editfieldkey('UserTitle', 'civility_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
-	            print $formcompany->select_civility($object->civility_id, 'civility_id', 'maxwidth100').'</td>';
-	            print '</tr>';
-        	}
-        }
+				// Title
+				print '<tr class="individualline"><td>'.$form->editfieldkey('UserTitle', 'civility_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
+				print $formcompany->select_civility($object->civility_id, 'civility_id', 'maxwidth100').'</td>';
+				print '</tr>';
+			}
+		}
 
-        // Alias names (commercial, trademark or alias names)
-        print '<tr id="name_alias"><td><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
-        print '<td colspan="3"><input type="text" class="minwidth300" name="name_alias" id="name_alias_input" value="'.dol_escape_htmltag($object->name_alias).'"></td></tr>';
+		// Alias names (commercial, trademark or alias names)
+		print '<tr id="name_alias"><td><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
+		print '<td colspan="3"><input type="text" class="minwidth300" name="name_alias" id="name_alias_input" value="'.dol_escape_htmltag($object->name_alias).'"></td></tr>';
 
-        // Prospect/Customer
-        print '<tr><td class="titlefieldcreate">'.$form->editfieldkey('ProspectCustomer', 'customerprospect', '', $object, 0, 'string', '', 1).'</td>';
-	    print '<td class="maxwidthonsmartphone">';
-	    $selected = (GETPOSTISSET('client') ?GETPOST('client', 'int') : $object->client);
-	    print $formcompany->selectProspectCustomerType($selected);
-	    print '</td>';
+		// Prospect/Customer
+		print '<tr><td class="titlefieldcreate">'.$form->editfieldkey('ProspectCustomer', 'customerprospect', '', $object, 0, 'string', '', 1).'</td>';
+		print '<td class="maxwidthonsmartphone">';
+		$selected = (GETPOSTISSET('client') ?GETPOST('client', 'int') : $object->client);
+		print $formcompany->selectProspectCustomerType($selected);
+		print '</td>';
 
-	    if ($conf->browser->layout == 'phone') print '</tr><tr>';
+		if ($conf->browser->layout == 'phone') print '</tr><tr>';
 
-        print '<td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td>';
-        print '<table class="nobordernopadding"><tr><td>';
+		print '<td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td>';
+		print '<table class="nobordernopadding"><tr><td>';
 		$tmpcode = $object->code_client;
-        if (empty($tmpcode) && !empty($modCodeClient->code_auto)) $tmpcode = $modCodeClient->getNextValue($object, 0);
-        print '<input type="text" name="customer_code" id="customer_code" class="maxwidthonsmartphone" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
-        print '</td><td>';
-        $s = $modCodeClient->getToolTip($langs, $object, 0);
-        print $form->textwithpicto('', $s, 1);
-        print '</td></tr></table>';
-        print '</td></tr>';
+		if (empty($tmpcode) && !empty($modCodeClient->code_auto)) $tmpcode = $modCodeClient->getNextValue($object, 0);
+		print '<input type="text" name="customer_code" id="customer_code" class="maxwidthonsmartphone" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
+		print '</td><td>';
+		$s = $modCodeClient->getToolTip($langs, $object, 0);
+		print $form->textwithpicto('', $s, 1);
+		print '</td></tr></table>';
+		print '</td></tr>';
 
-        if ((!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
-        	|| (!empty($conf->supplier_proposal->enabled) && !empty($user->rights->supplier_proposal->lire)))
-        {
-            // Supplier
-            print '<tr>';
-            print '<td>'.$form->editfieldkey('Vendor', 'fournisseur', '', $object, 0, 'string', '', 1).'</td><td>';
-            $default = -1;
-            if (!empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)) $default = 1;
-            print $form->selectyesno("fournisseur", (GETPOST('fournisseur', 'int') != '' ? GETPOST('fournisseur', 'int') : (GETPOST("type", 'alpha') == '' ? $default : $object->fournisseur)), 1, 0, (GETPOST("type", 'alpha') == '' ? 1 : 0));
-            print '</td>';
+		if ((!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
+			|| (!empty($conf->supplier_proposal->enabled) && !empty($user->rights->supplier_proposal->lire)))
+		{
+			// Supplier
+			print '<tr>';
+			print '<td>'.$form->editfieldkey('Vendor', 'fournisseur', '', $object, 0, 'string', '', 1).'</td><td>';
+			$default = -1;
+			if (!empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)) $default = 1;
+			print $form->selectyesno("fournisseur", (GETPOST('fournisseur', 'int') != '' ? GETPOST('fournisseur', 'int') : (GETPOST("type", 'alpha') == '' ? $default : $object->fournisseur)), 1, 0, (GETPOST("type", 'alpha') == '' ? 1 : 0), 1);
+			print '</td>';
 
 
-            if ($conf->browser->layout == 'phone') print '</tr><tr>';
+			if ($conf->browser->layout == 'phone') print '</tr><tr>';
 
-            print '<td>';
-            if (!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
-            {
-            	print $form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0);
-            }
-            print '</td><td>';
-            if (!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
-            {
-	            print '<table class="nobordernopadding"><tr><td>';
-	            $tmpcode = $object->code_fournisseur;
-	            if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) $tmpcode = $modCodeFournisseur->getNextValue($object, 1);
-	            print '<input type="text" name="supplier_code" id="supplier_code" class="maxwidthonsmartphone" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
-	            print '</td><td>';
-	            $s = $modCodeFournisseur->getToolTip($langs, $object, 1);
-	            print $form->textwithpicto('', $s, 1);
-	            print '</td></tr></table>';
-            }
-            print '</td></tr>';
-        }
+			print '<td>';
+			if (!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
+			{
+				print $form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0);
+			}
+			print '</td><td>';
+			if (!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
+			{
+				print '<table class="nobordernopadding"><tr><td>';
+				$tmpcode = $object->code_fournisseur;
+				if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) $tmpcode = $modCodeFournisseur->getNextValue($object, 1);
+				print '<input type="text" name="supplier_code" id="supplier_code" class="maxwidthonsmartphone" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
+				print '</td><td>';
+				$s = $modCodeFournisseur->getToolTip($langs, $object, 1);
+				print $form->textwithpicto('', $s, 1);
+				print '</td></tr></table>';
+			}
+			print '</td></tr>';
+		}
 
-        // Status
-        print '<tr><td>'.$form->editfieldkey('Status', 'status', '', $object, 0).'</td><td colspan="3">';
-        print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), 1);
-        print '</td></tr>';
+		// Status
+		print '<tr><td>'.$form->editfieldkey('Status', 'status', '', $object, 0).'</td><td colspan="3">';
+		print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), 1, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100', 1);
+		print '</td></tr>';
 
-        // Barcode
-        if (!empty($conf->barcode->enabled))
-        {
-        	print '<tr><td>'.$form->editfieldkey('Gencod', 'barcode', '', $object, 0).'</td>';
-	        print '<td colspan="3"><input type="text" name="barcode" id="barcode" value="'.dol_escape_htmltag($object->barcode).'">';
-            print '</td></tr>';
-        }
+		// Barcode
+		if (!empty($conf->barcode->enabled))
+		{
+			print '<tr><td>'.$form->editfieldkey('Gencod', 'barcode', '', $object, 0).'</td>';
+			print '<td colspan="3"><input type="text" name="barcode" id="barcode" value="'.dol_escape_htmltag($object->barcode).'">';
+			print '</td></tr>';
+		}
 
-        // Address
-        print '<tr><td class="tdtop">';
-        print $form->editfieldkey('Address', 'address', '', $object, 0);
-        print '</td>';
-	    print '<td colspan="3">';
-	    print '<textarea name="address" id="address" class="quatrevingtpercent" rows="'.ROWS_2.'" wrap="soft">';
-	    print dol_escape_htmltag($object->address);
-        print '</textarea>';
-        print $form->widgetForTranslation("address", $object, $permissiontoadd, 'textarea', 'alphanohtml', 'quatrevingtpercent');
-        print '</td></tr>';
+		// Address
+		print '<tr><td class="tdtop">';
+		print $form->editfieldkey('Address', 'address', '', $object, 0);
+		print '</td>';
+		print '<td colspan="3">';
+		print '<textarea name="address" id="address" class="quatrevingtpercent" rows="'.ROWS_2.'" wrap="soft">';
+		print dol_escape_htmltag($object->address, 0, 1);
+		print '</textarea>';
+		print $form->widgetForTranslation("address", $object, $permissiontoadd, 'textarea', 'alphanohtml', 'quatrevingtpercent');
+		print '</td></tr>';
 
-        // Zip / Town
-        print '<tr><td>'.$form->editfieldkey('Zip', 'zipcode', '', $object, 0).'</td><td>';
-        print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
-        print '</td>';
-        if ($conf->browser->layout == 'phone') print '</tr><tr>';
-        print '<td class="tdtop">'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td>';
-        print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
-        print $form->widgetForTranslation("town", $object, $permissiontoadd, 'string', 'alphanohtml', 'maxwidth100 quatrevingtpercent');
-        print '</td></tr>';
+		// Zip / Town
+		print '<tr><td>'.$form->editfieldkey('Zip', 'zipcode', '', $object, 0).'</td><td>';
+		print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
+		print '</td>';
+		if ($conf->browser->layout == 'phone') print '</tr><tr>';
+		print '<td class="tdtop">'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td>';
+		print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
+		print $form->widgetForTranslation("town", $object, $permissiontoadd, 'string', 'alphanohtml', 'maxwidth100 quatrevingtpercent');
+		print '</td></tr>';
 
-        // Country
-        print '<tr><td>'.$form->editfieldkey('Country', 'selectcountry_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
-        print img_picto('', 'globe-americas', 'class="paddingrightonly"');
-        print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth300 widthcentpercentminusx');
-        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-        print '</td></tr>';
+		// Country
+		print '<tr><td>'.$form->editfieldkey('Country', 'selectcountry_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
+		print img_picto('', 'globe-americas', 'class="paddingrightonly"');
+		print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth300 maxwidth500 widthcentpercentminusx');
+		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		print '</td></tr>';
 
-        // State
-        if (empty($conf->global->SOCIETE_DISABLE_STATE))
-        {
-            if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
-            {
-                print '<tr><td>'.$form->editfieldkey('Region-State', 'state_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
-            } else {
-                print '<tr><td>'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
-            }
+		// State
+		if (empty($conf->global->SOCIETE_DISABLE_STATE))
+		{
+			if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
+			{
+				print '<tr><td>'.$form->editfieldkey('Region-State', 'state_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
+			} else {
+				print '<tr><td>'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
+			}
 
-            if ($object->country_id) print $formcompany->select_state($object->state_id, $object->country_code);
-            else print $countrynotdefined;
-            print '</td></tr>';
-        }
+			if ($object->country_id) print $formcompany->select_state($object->state_id, $object->country_code);
+			else print $countrynotdefined;
+			print '</td></tr>';
+		}
 
-        // Phone / Fax
-        print '<tr><td>'.$form->editfieldkey('Phone', 'phone', '', $object, 0).'</td>';
-        print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>'.img_picto('', 'object_phoning').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ?GETPOST('phone', 'alpha') : $object->phone).'"></td>';
-        if ($conf->browser->layout == 'phone') print '</tr><tr>';
-        print '<td>'.$form->editfieldkey('Fax', 'fax', '', $object, 0).'</td>';
-        print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>'.img_picto('', 'object_phoning_fax').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ?GETPOST('fax', 'alpha') : $object->fax).'"></td></tr>';
+		// Phone / Fax
+		print '<tr><td>'.$form->editfieldkey('Phone', 'phone', '', $object, 0).'</td>';
+		print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ?GETPOST('phone', 'alpha') : $object->phone).'"></td>';
+		if ($conf->browser->layout == 'phone') print '</tr><tr>';
+		print '<td>'.$form->editfieldkey('Fax', 'fax', '', $object, 0).'</td>';
+		print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning_fax').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ?GETPOST('fax', 'alpha') : $object->fax).'"></td></tr>';
 
-        // Email / Web
-        print '<tr><td>'.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '', $conf->global->SOCIETE_EMAIL_MANDATORY).'</td>';
-	    print '<td colspan="3">'.img_picto('', 'object_email').' <input type="text" class="widthcentpercentminusx" name="email" id="email" value="'.$object->email.'"></td></tr>';
-        print '<tr><td>'.$form->editfieldkey('Web', 'url', '', $object, 0).'</td>';
-	    print '<td colspan="3">'.img_picto('', 'globe').' <input type="text" class="widthcentpercentminusx" name="url" id="url" value="'.$object->url.'"></td></tr>';
+		// Email / Web
+		print '<tr><td>'.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '', $conf->global->SOCIETE_EMAIL_MANDATORY).'</td>';
+		print '<td colspan="3">'.img_picto('', 'object_email').' <input type="text" class="maxwidth500 widthcentpercentminusx" name="email" id="email" value="'.$object->email.'"></td></tr>';
+		print '<tr><td>'.$form->editfieldkey('Web', 'url', '', $object, 0).'</td>';
+		print '<td colspan="3">'.img_picto('', 'globe').' <input type="text" class="maxwidth500 widthcentpercentminusx" name="url" id="url" value="'.$object->url.'"></td></tr>';
 
-        if (!empty($conf->socialnetworks->enabled)) {
-            foreach ($socialnetworks as $key => $value) {
-                if ($value['active']) {
-                    print '<tr>';
-                    print '<td><label for="'.$value['label'].'">'.$form->editfieldkey($value['label'], $key, '', $object, 0).'</label></td>';
-                    print '<td colspan="3">';
-                    print '<input type="text" name="'.$key.'" id="'.$key.'" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET($key) ?GETPOST($key, 'alphanohtml') : $object->socialnetworks[$key]).'">';
-                    print '</td>';
-                    print '</tr>';
-                } elseif (!empty($object->socialnetworks[$key])) {
-                    print '<input type="hidden" name="'.$key.'" value="'.$object->socialnetworks[$key].'">';
-                }
-            }
-        }
+		if (!empty($conf->socialnetworks->enabled)) {
+			foreach ($socialnetworks as $key => $value) {
+				if ($value['active']) {
+					print '<tr>';
+					print '<td><label for="'.$value['label'].'">'.$form->editfieldkey($value['label'], $key, '', $object, 0).'</label></td>';
+					print '<td colspan="3">';
+					print '<input type="text" name="'.$key.'" id="'.$key.'" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET($key) ?GETPOST($key, 'alphanohtml') : $object->socialnetworks[$key]).'">';
+					print '</td>';
+					print '</tr>';
+				} elseif (!empty($object->socialnetworks[$key])) {
+					print '<input type="hidden" name="'.$key.'" value="'.$object->socialnetworks[$key].'">';
+				}
+			}
+		}
 
-        // Prof ids
-        $i = 1; $j = 0; $NBCOLS = ($conf->browser->layout == 'phone' ? 1 : 2);
-        while ($i <= 6)
-        {
-            $idprof = $langs->transcountry('ProfId'.$i, $object->country_code);
-            if ($idprof != '-')
-            {
-	            $key = 'idprof'.$i;
+		// Prof ids
+		$i = 1; $j = 0; $NBCOLS = ($conf->browser->layout == 'phone' ? 1 : 2);
+		while ($i <= 6) {
+			$idprof = $langs->transcountry('ProfId'.$i, $object->country_code);
+			if ($idprof != '-')	{
+				$key = 'idprof'.$i;
 
-                if (($j % $NBCOLS) == 0) print '<tr>';
+				if (($j % $NBCOLS) == 0) print '<tr>';
 
-                $idprof_mandatory = 'SOCIETE_IDPROF'.($i).'_MANDATORY';
-                print '<td>'.$form->editfieldkey($idprof, $key, '', $object, 0, 'string', '', (empty($conf->global->$idprof_mandatory) ? 0 : 1)).'</td><td>';
+				$idprof_mandatory = 'SOCIETE_IDPROF'.($i).'_MANDATORY';
+				print '<td>'.$form->editfieldkey($idprof, $key, '', $object, 0, 'string', '', (empty($conf->global->$idprof_mandatory) ? 0 : 1)).'</td><td>';
 
-                print $formcompany->get_input_id_prof($i, $key, $object->$key, $object->country_code);
-                print '</td>';
-                if (($j % $NBCOLS) == ($NBCOLS - 1)) print '</tr>';
-                $j++;
-            }
-            $i++;
-        }
-        if ($NBCOLS > 1 && ($j % 2 == 1)) print '<td colspan="2"></td></tr>';
+				print $formcompany->get_input_id_prof($i, $key, $object->$key, $object->country_code);
+				print '</td>';
+				if (($j % $NBCOLS) == ($NBCOLS - 1)) print '</tr>';
+				$j++;
+			}
+			$i++;
+		}
+		if ($NBCOLS > 1 && ($j % 2 == 1)) print '<td colspan="2"></td></tr>';
 
-        // Vat is used
-        print '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td>';
-        print '<td>';
-        print $form->selectyesno('assujtva_value', GETPOSTISSET('assujtva_value') ?GETPOST('assujtva_value', 'int') : 1, 1); // Assujeti par defaut en creation
-        print '</td>';
-        if ($conf->browser->layout == 'phone') print '</tr><tr>';
-        print '<td class="nowrap">'.$form->editfieldkey('VATIntra', 'intra_vat', '', $object, 0).'</td>';
-        print '<td class="nowrap">';
-        $s = '<input type="text" class="flat maxwidthonsmartphone" name="tva_intra" id="intra_vat" maxlength="20" value="'.$object->tva_intra.'">';
+		// Vat is used
+		print '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td>';
+		print '<td>';
+		print $form->selectyesno('assujtva_value', GETPOSTISSET('assujtva_value') ?GETPOST('assujtva_value', 'int') : 1, 1); // Assujeti par defaut en creation
+		print '</td>';
+		if ($conf->browser->layout == 'phone') print '</tr><tr>';
+		print '<td class="nowrap">'.$form->editfieldkey('VATIntra', 'intra_vat', '', $object, 0).'</td>';
+		print '<td class="nowrap">';
+		$s = '<input type="text" class="flat maxwidthonsmartphone" name="tva_intra" id="intra_vat" maxlength="20" value="'.$object->tva_intra.'">';
 
-        if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object))
-        {
-            $s .= ' ';
+		if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object)) {
+			$s .= ' ';
 
-            if (!empty($conf->use_javascript_ajax))
-            {
-            	$widthpopup = 600;
-            	if (!empty($conf->dol_use_jmobile)) $widthpopup = 350;
-            	$heightpopup = 400;
-                print "\n";
-                print '<script language="JavaScript" type="text/javascript">';
-                print "function CheckVAT(a) {\n";
-                print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a, '".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."', ".$widthpopup.", ".$heightpopup.");\n";
-                print "}\n";
-                print '</script>';
-                print "\n";
-                $s .= '<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
-                $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
-            } else {
-                $s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
-            }
-        }
-        print $s;
-        print '</td>';
-        print '</tr>';
+			if (!empty($conf->use_javascript_ajax))	{
+				$widthpopup = 600;
+				if (!empty($conf->dol_use_jmobile)) $widthpopup = 350;
+				$heightpopup = 400;
+				print "\n";
+				print '<script language="JavaScript" type="text/javascript">';
+				print "function CheckVAT(a) {\n";
+				print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a, '".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."', ".$widthpopup.", ".$heightpopup.");\n";
+				print "}\n";
+				print '</script>';
+				print "\n";
+				$s .= '<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
+				$s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
+			} else {
+				$s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
+			}
+		}
+		print $s;
+		print '</td>';
+		print '</tr>';
 
-        // Local Taxes
-        //TODO: Place into a function to control showing by country or study better option
-        if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
-        {
-            print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
-            print $form->selectyesno('localtax1assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1 : 0), 1);
-            print '</td>';
-            if ($conf->browser->layout == 'phone') print '</tr><tr>';
-            print '<td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
-            print $form->selectyesno('localtax2assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2 : 0), 1);
-            print '</td></tr>';
-        } elseif ($mysoc->localtax1_assuj == "1")
-        {
-            print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td colspan="3">';
-            print $form->selectyesno('localtax1assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1 : 0), 1);
-            print '</td></tr>';
-        } elseif ($mysoc->localtax2_assuj == "1")
-        {
-            print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td colspan="3">';
-            print $form->selectyesno('localtax2assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2 : 0), 1);
-            print '</td></tr>';
-        }
+		// Local Taxes
+		//TODO: Place into a function to control showing by country or study better option
+		if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
+		{
+			print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
+			print $form->selectyesno('localtax1assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1 : 0), 1);
+			print '</td>';
+			if ($conf->browser->layout == 'phone') print '</tr><tr>';
+			print '<td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
+			print $form->selectyesno('localtax2assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2 : 0), 1);
+			print '</td></tr>';
+		} elseif ($mysoc->localtax1_assuj == "1")
+		{
+			print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td colspan="3">';
+			print $form->selectyesno('localtax1assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1 : 0), 1);
+			print '</td></tr>';
+		} elseif ($mysoc->localtax2_assuj == "1")
+		{
+			print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td colspan="3">';
+			print $form->selectyesno('localtax2assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2 : 0), 1);
+			print '</td></tr>';
+		}
 
-        // Type - Size
-        print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>'."\n";
-        $sortparam = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
-        print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam);
-        if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-        print '</td>';
-        if ($conf->browser->layout == 'phone') print '</tr><tr>';
-        print '<td>'.$form->editfieldkey('Staff', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>';
-        print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id);
-        if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-        print '</td></tr>';
+		// Type - Workforce/Staff
+		print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'."\n";
+		$sortparam = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
+		print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam, '', 1);
+		if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		print '</td>';
+		if ($conf->browser->layout == 'phone') print '</tr><tr>';
+		print '<td>'.$form->editfieldkey('Workforce', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>';
+		print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id, 0, 0, 0, '', 0, 0, 0, '', '', 1);
+		if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		print '</td></tr>';
 
-        // Legal Form
-        print '<tr><td>'.$form->editfieldkey('JuridicalStatus', 'forme_juridique_code', '', $object, 0).'</td>';
-        print '<td colspan="3" class="maxwidthonsmartphone">';
-        if ($object->country_id)
-        {
-            print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'forme_juridique_code');
-        } else {
-            print $countrynotdefined;
-        }
-        print '</td></tr>';
+		// Legal Form
+		print '<tr><td>'.$form->editfieldkey('JuridicalStatus', 'forme_juridique_code', '', $object, 0).'</td>';
+		print '<td colspan="3" class="maxwidthonsmartphone">';
+		if ($object->country_id)
+		{
+			print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'forme_juridique_code');
+		} else {
+			print $countrynotdefined;
+		}
+		print '</td></tr>';
 
-        // Capital
-        print '<tr><td>'.$form->editfieldkey('Capital', 'capital', '', $object, 0).'</td>';
-	    print '<td colspan="3"><input type="text" name="capital" id="capital" class="maxwidth100" value="'.$object->capital.'"> ';
-        print '<span class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</span></td></tr>';
+		// Capital
+		print '<tr><td>'.$form->editfieldkey('Capital', 'capital', '', $object, 0).'</td>';
+		print '<td colspan="3"><input type="text" name="capital" id="capital" class="maxwidth100" value="'.$object->capital.'"> ';
+		print '<span class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</span></td></tr>';
 
-        if (!empty($conf->global->MAIN_MULTILANGS))
-        {
-            print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">'."\n";
-            print $formadmin->select_language(GETPOST('default_lang', 'alpha') ? GETPOST('default_lang', 'alpha') : ($object->default_lang ? $object->default_lang : ''), 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone');
-            print '</td>';
-            print '</tr>';
-        }
+		if (!empty($conf->global->MAIN_MULTILANGS))
+		{
+			print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">'."\n";
+			print $formadmin->select_language(GETPOST('default_lang', 'alpha') ? GETPOST('default_lang', 'alpha') : ($object->default_lang ? $object->default_lang : ''), 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone');
+			print '</td>';
+			print '</tr>';
+		}
 
 		// Incoterms
 		if (!empty($conf->incoterm->enabled))
 		{
 			print '<tr>';
 			print '<td>'.$form->editfieldkey('IncotermLabel', 'incoterm_id', '', $object, 0).'</td>';
-	        print '<td colspan="3" class="maxwidthonsmartphone">';
-	        print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''));
+			print '<td colspan="3" class="maxwidthonsmartphone">';
+			print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''));
 			print '</td></tr>';
 		}
 
@@ -1486,7 +1495,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			//if ($object->prospect || $object->client || (! $object->fournisseur && ! empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER))) {
 			print '<tr class="visibleifcustomer"><td class="toptd">'.$form->editfieldkey('CustomersProspectsCategoriesShort', 'custcats', '', $object, 0).'</td><td colspan="3">';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, 'parent', null, null, 1);
-			print $form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), null, null, null, null, "90%");
+			print img_picto('', 'category').$form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), null, null, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 			print "</td></tr>";
 			//}
 
@@ -1494,7 +1503,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			//if ($object->fournisseur) {
 			print '<tr class="visibleifsupplier"><td class="toptd">'.$form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0).'</td><td colspan="3">';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, 'parent', null, null, 1);
-			print $form->multiselectarray('suppcats', $cate_arbo, GETPOST('suppcats', 'array'), null, null, null, null, "90%");
+			print img_picto('', 'category').$form->multiselectarray('suppcats', $cate_arbo, GETPOST('suppcats', 'array'), null, null, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 			print "</td></tr>";
 			//}
 		}
@@ -1504,8 +1513,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		{
 			print '<tr>';
 			print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
-	        print '<td colspan="3" class="maxwidthonsmartphone">';
-	        print $form->selectMultiCurrency(($object->multicurrency_code ? $object->multicurrency_code : $conf->currency), 'multicurrency_code', 1);
+			print '<td colspan="3" class="maxwidthonsmartphone">';
+			print $form->selectMultiCurrency(($object->multicurrency_code ? $object->multicurrency_code : $conf->currency), 'multicurrency_code', 1);
 			print '</td></tr>';
 		}
 
@@ -1517,136 +1526,135 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '<tr>';
 		print '<td>'.$form->editfieldkey('AllocateCommercial', 'commercial_id', '', $object, 0).'</td>';
 		print '<td colspan="3" class="maxwidthonsmartphone">';
-		$userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', 0, 1);
+		$userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, 'AND u.statut = 1', 0, '', '', 0, 1);
 		// Note: If user has no right to "see all thirdparties", we force selection of sale representative to him, so after creation he can see the record.
 		$selected = (count(GETPOST('commercial', 'array')) > 0 ? GETPOST('commercial', 'array') : (GETPOST('commercial', 'int') > 0 ? array(GETPOST('commercial', 'int')) : (empty($user->rights->societe->client->voir) ? array($user->id) : array())));
-		print $form->multiselectarray('commercial', $userlist, $selected, null, null, null, null, "90%");
+		print img_picto('', 'user').$form->multiselectarray('commercial', $userlist, $selected, null, null, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 		print '</td></tr>';
 
-        // Ajout du logo
-        print '<tr class="hideonsmartphone">';
-        print '<td>'.$form->editfieldkey('Logo', 'photoinput', '', $object, 0).'</td>';
-        print '<td colspan="3">';
-        print '<input class="flat" type="file" name="photo" id="photoinput" />';
-        print '</td>';
-        print '</tr>';
+		// Ajout du logo
+		print '<tr class="hideonsmartphone">';
+		print '<td>'.$form->editfieldkey('Logo', 'photoinput', '', $object, 0).'</td>';
+		print '<td colspan="3">';
+		print '<input class="flat" type="file" name="photo" id="photoinput" />';
+		print '</td>';
+		print '</tr>';
 
-        print '</table>'."\n";
+		print '</table>'."\n";
 
-        dol_fiche_end();
+		print dol_get_fiche_end();
 
-        print '<div class="center">';
-        print '<input type="submit" class="button" name="create" value="'.$langs->trans('AddThirdParty').'">';
-        if (!empty($backtopage))
-        {
-            print ' &nbsp; &nbsp; ';
-            print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
-        } else {
-            print ' &nbsp; &nbsp; ';
-            print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
-        }
-        print '</div>'."\n";
+		print '<div class="center">';
+		print '<input type="submit" class="button" name="create" value="'.$langs->trans('AddThirdParty').'">';
+		if (!empty($backtopage))
+		{
+			print ' &nbsp; &nbsp; ';
+			print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+		} else {
+			print ' &nbsp; &nbsp; ';
+			print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+		}
+		print '</div>'."\n";
 
-        print '</form>'."\n";
-    } elseif ($action == 'edit')
-    {
-        //print load_fiche_titre($langs->trans("EditCompany"));
+		print '</form>'."\n";
+	} elseif ($action == 'edit') {
+		//print load_fiche_titre($langs->trans("EditCompany"));
 
-        if ($socid)
-        {
-        	$res = $object->fetch_optionals();
-            //if ($res < 0) { dol_print_error($db); exit; }
+		if ($socid)
+		{
+			$res = $object->fetch_optionals();
+			//if ($res < 0) { dol_print_error($db); exit; }
 
-	        $head = societe_prepare_head($object);
+			$head = societe_prepare_head($object);
 
-            // Load object modCodeTiers
-            $module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
-            if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-            {
-                $module = substr($module, 0, dol_strlen($module) - 4);
-            }
-            $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-            foreach ($dirsociete as $dirroot)
-            {
-                $res = dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
-            }
-            $modCodeClient = new $module($db);
-            // We verified if the tag prefix is used
-            if ($modCodeClient->code_auto)
-            {
-                $prefixCustomerIsUsed = $modCodeClient->verif_prefixIsUsed();
-            }
-            $module = $conf->global->SOCIETE_CODECLIENT_ADDON;
-            if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-            {
-                $module = substr($module, 0, dol_strlen($module) - 4);
-            }
-            $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-            foreach ($dirsociete as $dirroot)
-            {
-                $res = dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
-            }
-            $modCodeFournisseur = new $module($db);
-            // On verifie si la balise prefix est utilisee
-            if ($modCodeFournisseur->code_auto)
-            {
-                $prefixSupplierIsUsed = $modCodeFournisseur->verif_prefixIsUsed();
-            }
+			// Load object modCodeTiers
+			$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+			if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
+			{
+				$module = substr($module, 0, dol_strlen($module) - 4);
+			}
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+			foreach ($dirsociete as $dirroot)
+			{
+				$res = dol_include_once($dirroot.$module.'.php');
+				if ($res) break;
+			}
+			$modCodeClient = new $module($db);
+			// We verified if the tag prefix is used
+			if ($modCodeClient->code_auto)
+			{
+				$prefixCustomerIsUsed = $modCodeClient->verif_prefixIsUsed();
+			}
+			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
+			if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
+			{
+				$module = substr($module, 0, dol_strlen($module) - 4);
+			}
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+			foreach ($dirsociete as $dirroot)
+			{
+				$res = dol_include_once($dirroot.$module.'.php');
+				if ($res) break;
+			}
+			$modCodeFournisseur = new $module($db);
+			// On verifie si la balise prefix est utilisee
+			if ($modCodeFournisseur->code_auto)
+			{
+				$prefixSupplierIsUsed = $modCodeFournisseur->verif_prefixIsUsed();
+			}
 
 			$object->oldcopy = clone $object;
 
-            if (GETPOSTISSET('name'))
-            {
-                // We overwrite with values if posted
-                $object->name = GETPOST('name', 'alphanohtml');
-                $object->prefix_comm			= GETPOST('prefix_comm', 'alphanohtml');
-                $object->client = GETPOST('client', 'int');
-                $object->code_client			= GETPOST('customer_code', 'alpha');
-                $object->fournisseur			= GETPOST('fournisseur', 'int');
-                $object->code_fournisseur = GETPOST('supplier_code', 'alpha');
-                $object->address = GETPOST('address', 'alphanohtml');
-                $object->zip = GETPOST('zipcode', 'alphanohtml');
-                $object->town = GETPOST('town', 'alphanohtml');
-                $object->country_id = GETPOST('country_id') ?GETPOST('country_id', 'int') : $mysoc->country_id;
-                $object->state_id = GETPOST('state_id', 'int');
-                //$object->skype				= GETPOST('skype', 'alpha');
-                //$object->twitter				= GETPOST('twitter', 'alpha');
-                //$object->facebook				= GETPOST('facebook', 'alpha');
-                //$object->linkedin				= GETPOST('linkedin', 'alpha');
-                $object->socialnetworks = array();
-                if (!empty($conf->socialnetworks->enabled)) {
-                    foreach ($socialnetworks as $key => $value) {
-                        if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') {
-                            $object->socialnetworks[$key] = GETPOST($key, 'alphanohtml');
-                        }
-                    }
-                }
-                $object->phone					= GETPOST('phone', 'alpha');
-                $object->fax					= GETPOST('fax', 'alpha');
-                $object->email					= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
-                $object->url					= GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
-                $object->capital				= GETPOST('capital', 'alphanohtml');
-                $object->idprof1				= GETPOST('idprof1', 'alphanohtml');
-                $object->idprof2				= GETPOST('idprof2', 'alphanohtml');
-                $object->idprof3				= GETPOST('idprof3', 'alphanohtml');
-                $object->idprof4				= GETPOST('idprof4', 'alphanohtml');
-                $object->idprof5				= GETPOST('idprof5', 'alphanohtml');
-                $object->idprof6				= GETPOST('idprof6', 'alphanohtml');
-                $object->typent_id = GETPOST('typent_id', 'int');
-                $object->effectif_id = GETPOST('effectif_id', 'int');
-                $object->barcode				= GETPOST('barcode', 'alphanohtml');
-                $object->forme_juridique_code = GETPOST('forme_juridique_code', 'int');
-                $object->default_lang = GETPOST('default_lang', 'alpha');
+			if (GETPOSTISSET('name'))
+			{
+				// We overwrite with values if posted
+				$object->name = GETPOST('name', 'alphanohtml');
+				$object->prefix_comm			= GETPOST('prefix_comm', 'alphanohtml');
+				$object->client = GETPOST('client', 'int');
+				$object->code_client			= GETPOST('customer_code', 'alpha');
+				$object->fournisseur			= GETPOST('fournisseur', 'int');
+				$object->code_fournisseur = GETPOST('supplier_code', 'alpha');
+				$object->address = GETPOST('address', 'alphanohtml');
+				$object->zip = GETPOST('zipcode', 'alphanohtml');
+				$object->town = GETPOST('town', 'alphanohtml');
+				$object->country_id = GETPOST('country_id') ?GETPOST('country_id', 'int') : $mysoc->country_id;
+				$object->state_id = GETPOST('state_id', 'int');
+				//$object->skype				= GETPOST('skype', 'alpha');
+				//$object->twitter				= GETPOST('twitter', 'alpha');
+				//$object->facebook				= GETPOST('facebook', 'alpha');
+				//$object->linkedin				= GETPOST('linkedin', 'alpha');
+				$object->socialnetworks = array();
+				if (!empty($conf->socialnetworks->enabled)) {
+					foreach ($socialnetworks as $key => $value) {
+						if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') {
+							$object->socialnetworks[$key] = GETPOST($key, 'alphanohtml');
+						}
+					}
+				}
+				$object->phone					= GETPOST('phone', 'alpha');
+				$object->fax					= GETPOST('fax', 'alpha');
+				$object->email					= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
+				$object->url					= GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
+				$object->capital				= GETPOST('capital', 'alphanohtml');
+				$object->idprof1				= GETPOST('idprof1', 'alphanohtml');
+				$object->idprof2				= GETPOST('idprof2', 'alphanohtml');
+				$object->idprof3				= GETPOST('idprof3', 'alphanohtml');
+				$object->idprof4				= GETPOST('idprof4', 'alphanohtml');
+				$object->idprof5				= GETPOST('idprof5', 'alphanohtml');
+				$object->idprof6				= GETPOST('idprof6', 'alphanohtml');
+				$object->typent_id = GETPOST('typent_id', 'int');
+				$object->effectif_id = GETPOST('effectif_id', 'int');
+				$object->barcode				= GETPOST('barcode', 'alphanohtml');
+				$object->forme_juridique_code = GETPOST('forme_juridique_code', 'int');
+				$object->default_lang = GETPOST('default_lang', 'alpha');
 
-                $object->tva_assuj				= GETPOST('assujtva_value', 'int');
-                $object->tva_intra				= GETPOST('tva_intra', 'alphanohtml');
-                $object->status = GETPOST('status', 'int');
+				$object->tva_assuj				= GETPOST('assujtva_value', 'int');
+				$object->tva_intra				= GETPOST('tva_intra', 'alphanohtml');
+				$object->status = GETPOST('status', 'int');
 
-                // Webservices url/key
-                $object->webservices_url        = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
-                $object->webservices_key        = GETPOST('webservices_key', 'san_alpha');
+				// Webservices url/key
+				$object->webservices_url        = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
+				$object->webservices_key        = GETPOST('webservices_key', 'san_alpha');
 
 				//Incoterms
 				if (!empty($conf->incoterm->enabled))
@@ -1655,33 +1663,33 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 					$object->location_incoterms = GETPOST('lcoation_incoterms', 'alpha');
 				}
 
-                //Local Taxes
-                $object->localtax1_assuj		= GETPOST('localtax1assuj_value');
-                $object->localtax2_assuj		= GETPOST('localtax2assuj_value');
+				//Local Taxes
+				$object->localtax1_assuj		= GETPOST('localtax1assuj_value');
+				$object->localtax2_assuj		= GETPOST('localtax2assuj_value');
 
-                $object->localtax1_value		= GETPOST('lt1');
-                $object->localtax2_value		= GETPOST('lt2');
+				$object->localtax1_value		= GETPOST('lt1');
+				$object->localtax2_value		= GETPOST('lt2');
 
-                // We set country_id, and country_code label of the chosen country
-                if ($object->country_id > 0)
-                {
-                	$tmparray = getCountry($object->country_id, 'all');
-                    $object->country_code = $tmparray['code'];
-                    $object->country = $tmparray['label'];
-                }
-            }
+				// We set country_id, and country_code label of the chosen country
+				if ($object->country_id > 0)
+				{
+					$tmparray = getCountry($object->country_id, 'all');
+					$object->country_code = $tmparray['code'];
+					$object->country = $tmparray['label'];
+				}
+			}
 
-            if ($object->localtax1_assuj == 0) {
-            	$sub = 0;
-            } else {$sub = 1; }
-            if ($object->localtax2_assuj == 0) {
-            	$sub2 = 0;
-            } else {$sub2 = 1; }
+			if ($object->localtax1_assuj == 0) {
+				$sub = 0;
+			} else {$sub = 1; }
+			if ($object->localtax2_assuj == 0) {
+				$sub2 = 0;
+			} else {$sub2 = 1; }
 
-            if ($conf->use_javascript_ajax)
-            {
-            	print "\n".'<script type="text/javascript">';
-            	print '$(document).ready(function () {
+			if ($conf->use_javascript_ajax)
+			{
+				print "\n".'<script type="text/javascript">';
+				print '$(document).ready(function () {
     			var val='.$sub.';
     			var val2='.$sub2.';
     			if("#localtax1assuj_value".value==undefined){
@@ -1753,347 +1761,347 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
         			});
 
                 })';
-                print '</script>'."\n";
-            }
-
-            print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="post" name="formsoc">';
-            print '<input type="hidden" name="action" value="update">';
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            print '<input type="hidden" name="socid" value="'.$object->id.'">';
-            print '<input type="hidden" name="entity" value="'.$object->entity.'">';
-            if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">';
-
-
-            dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
-
-            print '<div class="fichecenter2">';
-            print '<table class="border centpercent">';
-
-            // Ref/ID
-			if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
-			{
-		        print '<tr><td class="titlefieldcreate">'.$langs->trans("ID").'</td><td colspan="3">';
-            	print $object->ref;
-            	print '</td></tr>';
+				print '</script>'."\n";
 			}
 
-            // Name
-            print '<tr><td class="titlefieldcreate">'.$form->editfieldkey('ThirdPartyName', 'name', '', $object, 0, 'string', '', 1).'</td>';
-	        print '<td colspan="3"><input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.dol_escape_htmltag($object->name).'" autofocus="autofocus">';
-	        print $form->widgetForTranslation("name", $object, $permissiontoadd, 'string', 'alpahnohtml', 'minwidth300');
-	        print '</td></tr>';
+			print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="post" name="formsoc">';
+			print '<input type="hidden" name="action" value="update">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="socid" value="'.$object->id.'">';
+			print '<input type="hidden" name="entity" value="'.$object->entity.'">';
+			if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">';
 
-	        // Alias names (commercial, trademark or alias names)
-	        print '<tr id="name_alias"><td><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
-	        print '<td colspan="3"><input type="text" class="minwidth300" name="name_alias" id="name_alias_input" value="'.dol_escape_htmltag($object->name_alias).'"></td></tr>';
 
-            // Prefix
-            if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-            {
-                print '<tr><td>'.$form->editfieldkey('Prefix', 'prefix', '', $object, 0).'</td><td colspan="3">';
-                // It does not change the prefix mode using the auto numbering prefix
-                if (($prefixCustomerIsUsed || $prefixSupplierIsUsed) && $object->prefix_comm)
-                {
-                    print '<input type="hidden" name="prefix_comm" value="'.dol_escape_htmltag($object->prefix_comm).'">';
-                    print $object->prefix_comm;
-                } else {
-                    print '<input type="text" size="5" maxlength="5" name="prefix_comm" id="prefix" value="'.dol_escape_htmltag($object->prefix_comm).'">';
-                }
-                print '</td>';
-            }
+			print dol_get_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
 
-            // Prospect/Customer
-            print '<tr><td>'.$form->editfieldkey('ProspectCustomer', 'customerprospect', '', $object, 0, 'string', '', 1).'</td>';
-	        print '<td class="maxwidthonsmartphone">';
-	        print $formcompany->selectProspectCustomerType($object->client);
-            print '</td>';
-            if ($conf->browser->layout == 'phone') print '</tr><tr>';
-            print '<td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td>';
+			print '<div class="fichecenter2">';
+			print '<table class="border centpercent">';
 
-            print '<table class="nobordernopadding"><tr><td>';
-            if ((!$object->code_client || $object->code_client == -1) && $modCodeClient->code_auto)
-            {
-                $tmpcode = $object->code_client;
-                if (empty($tmpcode) && !empty($object->oldcopy->code_client)) $tmpcode = $object->oldcopy->code_client; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
-                if (empty($tmpcode) && !empty($modCodeClient->code_auto)) $tmpcode = $modCodeClient->getNextValue($object, 0);
-                print '<input type="text" name="customer_code" id="customer_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
-            } elseif ($object->codeclient_modifiable())
-            {
-            	print '<input type="text" name="customer_code" id="customer_code" size="16" value="'.dol_escape_htmltag($object->code_client).'" maxlength="15">';
-            } else {
-                print $object->code_client;
-                print '<input type="hidden" name="customer_code" value="'.dol_escape_htmltag($object->code_client).'">';
-            }
-            print '</td><td>';
-            $s = $modCodeClient->getToolTip($langs, $object, 0);
-            print $form->textwithpicto('', $s, 1);
-            print '</td></tr></table>';
+			// Ref/ID
+			if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
+			{
+				print '<tr><td class="titlefieldcreate">'.$langs->trans("ID").'</td><td colspan="3">';
+				print $object->ref;
+				print '</td></tr>';
+			}
 
-            print '</td></tr>';
+			// Name
+			print '<tr><td class="titlefieldcreate">'.$form->editfieldkey('ThirdPartyName', 'name', '', $object, 0, 'string', '', 1).'</td>';
+			print '<td colspan="3"><input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.dol_escape_htmltag($object->name).'" autofocus="autofocus">';
+			print $form->widgetForTranslation("name", $object, $permissiontoadd, 'string', 'alpahnohtml', 'minwidth300');
+			print '</td></tr>';
 
-            // Supplier
-            if ((!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
-            	|| (!empty($conf->supplier_proposal->enabled) && !empty($user->rights->supplier_proposal->lire)))
-            {
-                print '<tr>';
-                print '<td>'.$form->editfieldkey('Supplier', 'fournisseur', '', $object, 0, 'string', '', 1).'</td>';
-                print '<td class="maxwidthonsmartphone">';
-                print $form->selectyesno("fournisseur", $object->fournisseur, 1);
-                print '</td>';
-                if ($conf->browser->layout == 'phone') print '</tr><tr>';
-                print '<td>';
-                if (!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
-                {
-                	print $form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0);
-                }
-                print '</td>';
-                print '<td>';
-                print '<table class="nobordernopadding"><tr><td>';
-                if ((!$object->code_fournisseur || $object->code_fournisseur == -1) && $modCodeFournisseur->code_auto)
-                {
-                    $tmpcode = $object->code_fournisseur;
-                    if (empty($tmpcode) && !empty($object->oldcopy->code_fournisseur)) $tmpcode = $object->oldcopy->code_fournisseur; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
-                    if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) $tmpcode = $modCodeFournisseur->getNextValue($object, 1);
-                    print '<input type="text" name="supplier_code" id="supplier_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
-                } elseif ($object->codefournisseur_modifiable())
-                {
-                	print '<input type="text" name="supplier_code" id="supplier_code" size="16" value="'.dol_escape_htmltag($object->code_fournisseur).'" maxlength="15">';
-                } else {
-                    print $object->code_fournisseur;
-                    print '<input type="hidden" name="supplier_code" value="'.$object->code_fournisseur.'">';
-                }
-                print '</td><td>';
-                $s = $modCodeFournisseur->getToolTip($langs, $object, 1);
-                print $form->textwithpicto('', $s, 1);
-                print '</td></tr></table>';
-                print '</td></tr>';
-            }
+			// Alias names (commercial, trademark or alias names)
+			print '<tr id="name_alias"><td><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
+			print '<td colspan="3"><input type="text" class="minwidth300" name="name_alias" id="name_alias_input" value="'.dol_escape_htmltag($object->name_alias).'"></td></tr>';
 
-            // Barcode
-            if (!empty($conf->barcode->enabled))
-            {
-                print '<tr><td class="tdtop">'.$form->editfieldkey('Gencod', 'barcode', '', $object, 0).'</td>';
-	            print '<td colspan="3"><input type="text" name="barcode" id="barcode" value="'.dol_escape_htmltag($object->barcode).'">';
-                print '</td></tr>';
-            }
+			// Prefix
+			if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+			{
+				print '<tr><td>'.$form->editfieldkey('Prefix', 'prefix', '', $object, 0).'</td><td colspan="3">';
+				// It does not change the prefix mode using the auto numbering prefix
+				if (($prefixCustomerIsUsed || $prefixSupplierIsUsed) && $object->prefix_comm)
+				{
+					print '<input type="hidden" name="prefix_comm" value="'.dol_escape_htmltag($object->prefix_comm).'">';
+					print $object->prefix_comm;
+				} else {
+					print '<input type="text" size="5" maxlength="5" name="prefix_comm" id="prefix" value="'.dol_escape_htmltag($object->prefix_comm).'">';
+				}
+				print '</td>';
+			}
 
-            // Status
-            print '<tr><td>'.$form->editfieldkey('Status', 'status', '', $object, 0).'</td><td colspan="3">';
-            print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $object->status);
-            print '</td></tr>';
+			// Prospect/Customer
+			print '<tr><td>'.$form->editfieldkey('ProspectCustomer', 'customerprospect', '', $object, 0, 'string', '', 1).'</td>';
+			print '<td class="maxwidthonsmartphone">';
+			print $formcompany->selectProspectCustomerType($object->client);
+			print '</td>';
+			if ($conf->browser->layout == 'phone') print '</tr><tr>';
+			print '<td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td>';
 
-            // Address
-            print '<tr><td class="tdtop">'.$form->editfieldkey('Address', 'address', '', $object, 0).'</td>';
-	        print '<td colspan="3"><textarea name="address" id="address" class="quatrevingtpercent" rows="3" wrap="soft">';
-	        print dol_escape_htmltag($object->address);
-            print '</textarea>';
-            print $form->widgetForTranslation("address", $object, $permissiontoadd, 'textarea', 'alphanohtml', 'quatrevingtpercent');
-            print '</td></tr>';
+			print '<table class="nobordernopadding"><tr><td>';
+			if ((!$object->code_client || $object->code_client == -1) && $modCodeClient->code_auto)
+			{
+				$tmpcode = $object->code_client;
+				if (empty($tmpcode) && !empty($object->oldcopy->code_client)) $tmpcode = $object->oldcopy->code_client; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
+				if (empty($tmpcode) && !empty($modCodeClient->code_auto)) $tmpcode = $modCodeClient->getNextValue($object, 0);
+				print '<input type="text" name="customer_code" id="customer_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
+			} elseif ($object->codeclient_modifiable())
+			{
+				print '<input type="text" name="customer_code" id="customer_code" size="16" value="'.dol_escape_htmltag($object->code_client).'" maxlength="15">';
+			} else {
+				print $object->code_client;
+				print '<input type="hidden" name="customer_code" value="'.dol_escape_htmltag($object->code_client).'">';
+			}
+			print '</td><td>';
+			$s = $modCodeClient->getToolTip($langs, $object, 0);
+			print $form->textwithpicto('', $s, 1);
+			print '</td></tr></table>';
 
-            // Zip / Town
-            print '<tr><td>'.$form->editfieldkey('Zip', 'zipcode', '', $object, 0).'</td><td>';
-            print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth50onsmartphone');
-            print '</td>';
-            if ($conf->browser->layout == 'phone') print '</tr><tr>';
-            print '<td>'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td>';
-            print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
-            print $form->widgetForTranslation("town", $object, $permissiontoadd, 'string', 'alphanohtml', 'maxwidth100 quatrevingtpercent');
-            print '</td></tr>';
+			print '</td></tr>';
 
-            // Country
-            print '<tr><td>'.$form->editfieldkey('Country', 'selectcounty_id', '', $object, 0).'</td><td colspan="3">';
-            print img_picto('', 'globe-americas', 'class="paddingrightonly"');
-            print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth300 widthcentpercentminusx');
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-            print '</td></tr>';
+			// Supplier
+			if ((!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
+				|| (!empty($conf->supplier_proposal->enabled) && !empty($user->rights->supplier_proposal->lire)))
+			{
+				print '<tr>';
+				print '<td>'.$form->editfieldkey('Supplier', 'fournisseur', '', $object, 0, 'string', '', 1).'</td>';
+				print '<td class="maxwidthonsmartphone">';
+				print $form->selectyesno("fournisseur", $object->fournisseur, 1, false, 0, 1);
+				print '</td>';
+				if ($conf->browser->layout == 'phone') print '</tr><tr>';
+				print '<td>';
+				if (!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
+				{
+					print $form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0);
+				}
+				print '</td>';
+				print '<td>';
+				print '<table class="nobordernopadding"><tr><td>';
+				if ((!$object->code_fournisseur || $object->code_fournisseur == -1) && $modCodeFournisseur->code_auto)
+				{
+					$tmpcode = $object->code_fournisseur;
+					if (empty($tmpcode) && !empty($object->oldcopy->code_fournisseur)) $tmpcode = $object->oldcopy->code_fournisseur; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
+					if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) $tmpcode = $modCodeFournisseur->getNextValue($object, 1);
+					print '<input type="text" name="supplier_code" id="supplier_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
+				} elseif ($object->codefournisseur_modifiable())
+				{
+					print '<input type="text" name="supplier_code" id="supplier_code" size="16" value="'.dol_escape_htmltag($object->code_fournisseur).'" maxlength="15">';
+				} else {
+					print $object->code_fournisseur;
+					print '<input type="hidden" name="supplier_code" value="'.$object->code_fournisseur.'">';
+				}
+				print '</td><td>';
+				$s = $modCodeFournisseur->getToolTip($langs, $object, 1);
+				print $form->textwithpicto('', $s, 1);
+				print '</td></tr></table>';
+				print '</td></tr>';
+			}
 
-            // State
-            if (empty($conf->global->SOCIETE_DISABLE_STATE))
-            {
-                if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
-                {
-                    print '<tr><td>'.$form->editfieldkey('Region-State', 'state_id', '', $object, 0).'</td><td colspan="3">';
-                } else {
-                    print '<tr><td>'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td colspan="3">';
-                }
+			// Barcode
+			if (!empty($conf->barcode->enabled))
+			{
+				print '<tr><td class="tdtop">'.$form->editfieldkey('Gencod', 'barcode', '', $object, 0).'</td>';
+				print '<td colspan="3"><input type="text" name="barcode" id="barcode" value="'.dol_escape_htmltag($object->barcode).'">';
+				print '</td></tr>';
+			}
 
-                print $formcompany->select_state($object->state_id, $object->country_code);
-                print '</td></tr>';
-            }
+			// Status
+			print '<tr><td>'.$form->editfieldkey('Status', 'status', '', $object, 0).'</td><td colspan="3">';
+			print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $object->status, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100', 1);
+			print '</td></tr>';
 
-            // Phone / Fax
-            print '<tr><td>'.$form->editfieldkey('Phone', 'phone', GETPOST('phone', 'alpha'), $object, 0).'</td>';
-            print '<td>'.img_picto('', 'object_phoning').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ?GETPOST('phone', 'alpha') : $object->phone).'"></td>';
-            if ($conf->browser->layout == 'phone') print '</tr><tr>';
-            print '<td>'.$form->editfieldkey('Fax', 'fax', GETPOST('fax', 'alpha'), $object, 0).'</td>';
-            print '<td>'.img_picto('', 'object_phoning_fax').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ?GETPOST('fax', 'alpha') : $object->fax).'"></td></tr>';
+			// Address
+			print '<tr><td class="tdtop">'.$form->editfieldkey('Address', 'address', '', $object, 0).'</td>';
+			print '<td colspan="3"><textarea name="address" id="address" class="quatrevingtpercent" rows="3" wrap="soft">';
+			print dol_escape_htmltag($object->address, 0, 1);
+			print '</textarea>';
+			print $form->widgetForTranslation("address", $object, $permissiontoadd, 'textarea', 'alphanohtml', 'quatrevingtpercent');
+			print '</td></tr>';
 
-            // EMail / Web
-            print '<tr><td>'.$form->editfieldkey('EMail', 'email', GETPOST('email', 'alpha'), $object, 0, 'string', '', (!empty($conf->global->SOCIETE_EMAIL_MANDATORY))).'</td>';
-            print '<td colspan="3">'.img_picto('', 'object_email').' <input type="text" name="email" id="email" class="maxwidth200onsmartphone widthcentpercentminusx" value="'.(GETPOSTISSET('email') ?GETPOST('email', 'alpha') : $object->email).'"></td></tr>';
-	        print '<tr><td>'.$form->editfieldkey('Web', 'url', GETPOST('url', 'alpha'), $object, 0).'</td>';
-	        print '<td colspan="3">'.img_picto('', 'globe').' <input type="text" name="url" id="url" class="maxwidth200onsmartphone widthcentpercentminusx " value="'.(GETPOSTISSET('url') ?GETPOST('url', 'alpha') : $object->url).'"></td></tr>';
+			// Zip / Town
+			print '<tr><td>'.$form->editfieldkey('Zip', 'zipcode', '', $object, 0).'</td><td>';
+			print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth50onsmartphone');
+			print '</td>';
+			if ($conf->browser->layout == 'phone') print '</tr><tr>';
+			print '<td>'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td>';
+			print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
+			print $form->widgetForTranslation("town", $object, $permissiontoadd, 'string', 'alphanohtml', 'maxwidth100 quatrevingtpercent');
+			print '</td></tr>';
 
-            if (!empty($conf->socialnetworks->enabled)) {
-                foreach ($socialnetworks as $key => $value) {
-                    if ($value['active']) {
-                        print '<tr>';
-                        print '<td><label for="'.$value['label'].'">'.$form->editfieldkey($value['label'], $key, '', $object, 0).'</label></td>';
-                        print '<td colspan="3">';
-                        print '<input type="text" name="'.$key.'" id="'.$key.'" class="minwidth100" maxlength="80" value="'.$object->socialnetworks[$key].'">';
-                        print '</td>';
-                        print '</tr>';
-                    } elseif (!empty($object->socialnetworks[$key])) {
-                        print '<input type="hidden" name="'.$key.'" value="'.$object->socialnetworks[$key].'">';
-                    }
-                }
-            }
+			// Country
+			print '<tr><td>'.$form->editfieldkey('Country', 'selectcounty_id', '', $object, 0).'</td><td colspan="3">';
+			print img_picto('', 'globe-americas', 'class="paddingrightonly"');
+			print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth300 widthcentpercentminusx');
+			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			print '</td></tr>';
 
-            // Prof ids
-            $i = 1; $j = 0; $NBCOLS = ($conf->browser->layout == 'phone' ? 1 : 2);
-            while ($i <= 6)
-            {
-                $idprof = $langs->transcountry('ProfId'.$i, $object->country_code);
-                if ($idprof != '-')
-                {
-	                $key = 'idprof'.$i;
+			// State
+			if (empty($conf->global->SOCIETE_DISABLE_STATE))
+			{
+				if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
+				{
+					print '<tr><td>'.$form->editfieldkey('Region-State', 'state_id', '', $object, 0).'</td><td colspan="3">';
+				} else {
+					print '<tr><td>'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td colspan="3">';
+				}
 
-	                if (($j % $NBCOLS) == 0) print '<tr>';
+				print $formcompany->select_state($object->state_id, $object->country_code);
+				print '</td></tr>';
+			}
 
-	                $idprof_mandatory = 'SOCIETE_IDPROF'.($i).'_MANDATORY';
-	                print '<td>'.$form->editfieldkey($idprof, $key, '', $object, 0, 'string', '', !(empty($conf->global->$idprof_mandatory) || !$object->isACompany())).'</td><td>';
-	                print $formcompany->get_input_id_prof($i, $key, $object->$key, $object->country_code);
-                    print '</td>';
-                    if (($j % $NBCOLS) == ($NBCOLS - 1)) print '</tr>';
-                    $j++;
-                }
-                $i++;
-            }
-            if ($NBCOLS > 0 && $j % 2 == 1) print '<td colspan="2"></td></tr>';
+			// Phone / Fax
+			print '<tr><td>'.$form->editfieldkey('Phone', 'phone', GETPOST('phone', 'alpha'), $object, 0).'</td>';
+			print '<td>'.img_picto('', 'object_phoning').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ?GETPOST('phone', 'alpha') : $object->phone).'"></td>';
+			if ($conf->browser->layout == 'phone') print '</tr><tr>';
+			print '<td>'.$form->editfieldkey('Fax', 'fax', GETPOST('fax', 'alpha'), $object, 0).'</td>';
+			print '<td>'.img_picto('', 'object_phoning_fax').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ?GETPOST('fax', 'alpha') : $object->fax).'"></td></tr>';
 
-            // VAT is used
-            print '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td><td colspan="3">';
-            print $form->selectyesno('assujtva_value', $object->tva_assuj, 1);
-            print '</td></tr>';
+			// EMail / Web
+			print '<tr><td>'.$form->editfieldkey('EMail', 'email', GETPOST('email', 'alpha'), $object, 0, 'string', '', (!empty($conf->global->SOCIETE_EMAIL_MANDATORY))).'</td>';
+			print '<td colspan="3">'.img_picto('', 'object_email').' <input type="text" name="email" id="email" class="maxwidth200onsmartphone widthcentpercentminusx" value="'.(GETPOSTISSET('email') ?GETPOST('email', 'alpha') : $object->email).'"></td></tr>';
+			print '<tr><td>'.$form->editfieldkey('Web', 'url', GETPOST('url', 'alpha'), $object, 0).'</td>';
+			print '<td colspan="3">'.img_picto('', 'globe').' <input type="text" name="url" id="url" class="maxwidth200onsmartphone widthcentpercentminusx " value="'.(GETPOSTISSET('url') ?GETPOST('url', 'alpha') : $object->url).'"></td></tr>';
 
-            // Local Taxes
-            //TODO: Place into a function to control showing by country or study better option
-            if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
-            {
-                print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed", $mysoc->country_code), 'localtax1assuj_value', '', $object, 0).'</td><td>';
-                print $form->selectyesno('localtax1assuj_value', $object->localtax1_assuj, 1);
-                if (!isOnlyOneLocalTax(1))
-                {
-                    print '<span class="cblt1">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
-                    $formcompany->select_localtax(1, $object->localtax1_value, "lt1");
-                    print '</span>';
-                }
-                print '</td>';
-                print '</tr><tr>';
-                print '<td>'.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed", $mysoc->country_code), 'localtax2assuj_value', '', $object, 0).'</td><td>';
-                print $form->selectyesno('localtax2assuj_value', $object->localtax2_assuj, 1);
-                if (!isOnlyOneLocalTax(2))
-                {
-                    print '<span class="cblt2">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
-                    $formcompany->select_localtax(2, $object->localtax2_value, "lt2");
-                    print '</span>';
-                }
-                print '</td></tr>';
-            } elseif ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj != "1")
-            {
-                print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed", $mysoc->country_code), 'localtax1assuj_value', '', $object, 0).'</td><td colspan="3">';
-                print $form->selectyesno('localtax1assuj_value', $object->localtax1_assuj, 1);
-                if (!isOnlyOneLocalTax(1))
-                {
-                    print '<span class="cblt1">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
-                    $formcompany->select_localtax(1, $object->localtax1_value, "lt1");
-                    print '</span>';
-                }
-                print '</td></tr>';
-            } elseif ($mysoc->localtax2_assuj == "1" && $mysoc->localtax1_assuj != "1")
-            {
-                print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed", $mysoc->country_code), 'localtax2assuj_value', '', $object, 0).'</td><td colspan="3">';
-                print $form->selectyesno('localtax2assuj_value', $object->localtax2_assuj, 1);
-                if (!isOnlyOneLocalTax(2))
-                {
-                    print '<span class="cblt2">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
-                    $formcompany->select_localtax(2, $object->localtax2_value, "lt2");
-                    print '</span>';
-                }
-                print '</td></tr>';
-            }
+			if (!empty($conf->socialnetworks->enabled)) {
+				foreach ($socialnetworks as $key => $value) {
+					if ($value['active']) {
+						print '<tr>';
+						print '<td><label for="'.$value['label'].'">'.$form->editfieldkey($value['label'], $key, '', $object, 0).'</label></td>';
+						print '<td colspan="3">';
+						print '<input type="text" name="'.$key.'" id="'.$key.'" class="minwidth100" maxlength="80" value="'.$object->socialnetworks[$key].'">';
+						print '</td>';
+						print '</tr>';
+					} elseif (!empty($object->socialnetworks[$key])) {
+						print '<input type="hidden" name="'.$key.'" value="'.$object->socialnetworks[$key].'">';
+					}
+				}
+			}
 
-            // VAT Code
-            print '<tr><td>'.$form->editfieldkey('VATIntra', 'intra_vat', '', $object, 0).'</td>';
-            print '<td colspan="3">';
-            $s = '<input type="text" class="flat maxwidthonsmartphone" name="tva_intra" id="intra_vat" maxlength="20" value="'.$object->tva_intra.'">';
+			// Prof ids
+			$i = 1; $j = 0; $NBCOLS = ($conf->browser->layout == 'phone' ? 1 : 2);
+			while ($i <= 6)
+			{
+				$idprof = $langs->transcountry('ProfId'.$i, $object->country_code);
+				if ($idprof != '-')
+				{
+					$key = 'idprof'.$i;
 
-            if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object))
-            {
-                $s .= ' &nbsp; ';
+					if (($j % $NBCOLS) == 0) print '<tr>';
 
-                if ($conf->use_javascript_ajax)
-                {
-                	$widthpopup = 600;
-                	if (!empty($conf->dol_use_jmobile)) $widthpopup = 350;
-                	$heightpopup = 400;
-                	print "\n";
-                    print '<script language="JavaScript" type="text/javascript">';
-                    print "function CheckVAT(a) {\n";
-                    print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."', ".$widthpopup.", ".$heightpopup.");\n";
-                    print "}\n";
-                    print '</script>';
-                    print "\n";
-                    $s .= '<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
-                    $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
-                } else {
-                    $s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
-                }
-            }
-            print $s;
-            print '</td>';
-            print '</tr>';
+					$idprof_mandatory = 'SOCIETE_IDPROF'.($i).'_MANDATORY';
+					print '<td>'.$form->editfieldkey($idprof, $key, '', $object, 0, 'string', '', !(empty($conf->global->$idprof_mandatory) || !$object->isACompany())).'</td><td>';
+					print $formcompany->get_input_id_prof($i, $key, $object->$key, $object->country_code);
+					print '</td>';
+					if (($j % $NBCOLS) == ($NBCOLS - 1)) print '</tr>';
+					$j++;
+				}
+				$i++;
+			}
+			if ($NBCOLS > 0 && $j % 2 == 1) print '<td colspan="2"></td></tr>';
 
-            // Type - Size
-            print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
-            print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-            print '</td>';
-            if ($conf->browser->layout == 'phone') print '</tr><tr>';
-            print '<td>'.$form->editfieldkey('Staff', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
-            print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id);
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-            print '</td></tr>';
+			// VAT is used
+			print '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td><td colspan="3">';
+			print $form->selectyesno('assujtva_value', $object->tva_assuj, 1);
+			print '</td></tr>';
 
-            // Juridical type
-            print '<tr><td>'.$form->editfieldkey('JuridicalStatus', 'forme_juridique_code', '', $object, 0).'</td><td class="maxwidthonsmartphone" colspan="3">';
-            print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'forme_juridique_code');
-            print '</td></tr>';
+			// Local Taxes
+			//TODO: Place into a function to control showing by country or study better option
+			if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
+			{
+				print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed", $mysoc->country_code), 'localtax1assuj_value', '', $object, 0).'</td><td>';
+				print $form->selectyesno('localtax1assuj_value', $object->localtax1_assuj, 1);
+				if (!isOnlyOneLocalTax(1))
+				{
+					print '<span class="cblt1">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
+					$formcompany->select_localtax(1, $object->localtax1_value, "lt1");
+					print '</span>';
+				}
+				print '</td>';
+				print '</tr><tr>';
+				print '<td>'.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed", $mysoc->country_code), 'localtax2assuj_value', '', $object, 0).'</td><td>';
+				print $form->selectyesno('localtax2assuj_value', $object->localtax2_assuj, 1);
+				if (!isOnlyOneLocalTax(2))
+				{
+					print '<span class="cblt2">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
+					$formcompany->select_localtax(2, $object->localtax2_value, "lt2");
+					print '</span>';
+				}
+				print '</td></tr>';
+			} elseif ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj != "1")
+			{
+				print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed", $mysoc->country_code), 'localtax1assuj_value', '', $object, 0).'</td><td colspan="3">';
+				print $form->selectyesno('localtax1assuj_value', $object->localtax1_assuj, 1);
+				if (!isOnlyOneLocalTax(1))
+				{
+					print '<span class="cblt1">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
+					$formcompany->select_localtax(1, $object->localtax1_value, "lt1");
+					print '</span>';
+				}
+				print '</td></tr>';
+			} elseif ($mysoc->localtax2_assuj == "1" && $mysoc->localtax1_assuj != "1")
+			{
+				print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed", $mysoc->country_code), 'localtax2assuj_value', '', $object, 0).'</td><td colspan="3">';
+				print $form->selectyesno('localtax2assuj_value', $object->localtax2_assuj, 1);
+				if (!isOnlyOneLocalTax(2))
+				{
+					print '<span class="cblt2">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
+					$formcompany->select_localtax(2, $object->localtax2_value, "lt2");
+					print '</span>';
+				}
+				print '</td></tr>';
+			}
 
-            // Capital
-            print '<tr><td>'.$form->editfieldkey('Capital', 'capital', '', $object, 0).'</td>';
-	        print '<td colspan="3"><input type="text" name="capital" id="capital" size="10" value="';
-	        print $object->capital != '' ? dol_escape_htmltag(price($object->capital)) : '';
-	        print '"> <font class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</font></td></tr>';
+			// VAT Code
+			print '<tr><td>'.$form->editfieldkey('VATIntra', 'intra_vat', '', $object, 0).'</td>';
+			print '<td colspan="3">';
+			$s = '<input type="text" class="flat maxwidthonsmartphone" name="tva_intra" id="intra_vat" maxlength="20" value="'.$object->tva_intra.'">';
 
-            // Default language
-            if (!empty($conf->global->MAIN_MULTILANGS))
-            {
-                print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).'</td><td colspan="3">'."\n";
-                print $formadmin->select_language($object->default_lang, 'default_lang', 0, 0, 1);
-                print '</td>';
-                print '</tr>';
-            }
+			if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object))
+			{
+				$s .= ' &nbsp; ';
 
-            // Incoterms
-            if (!empty($conf->incoterm->enabled))
-            {
-            	print '<tr>';
-      				print '<td>'.$form->editfieldkey('IncotermLabel', 'incoterm_id', '', $object, 0).'</td>';
-            	print '<td colspan="3" class="maxwidthonsmartphone">';
-            	print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''));
-            	print '</td></tr>';
-            }
+				if ($conf->use_javascript_ajax)
+				{
+					$widthpopup = 600;
+					if (!empty($conf->dol_use_jmobile)) $widthpopup = 350;
+					$heightpopup = 400;
+					print "\n";
+					print '<script language="JavaScript" type="text/javascript">';
+					print "function CheckVAT(a) {\n";
+					print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."', ".$widthpopup.", ".$heightpopup.");\n";
+					print "}\n";
+					print '</script>';
+					print "\n";
+					$s .= '<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
+					$s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
+				} else {
+					$s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
+				}
+			}
+			print $s;
+			print '</td>';
+			print '</tr>';
+
+			// Type - Workforce/Staff
+			print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
+			print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
+			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			print '</td>';
+			if ($conf->browser->layout == 'phone') print '</tr><tr>';
+			print '<td>'.$form->editfieldkey('Workforce', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
+			print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id, 0, 0, 0, '', 0, 0, 0, '', '', 1);
+			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			print '</td></tr>';
+
+			// Juridical type
+			print '<tr><td>'.$form->editfieldkey('JuridicalStatus', 'forme_juridique_code', '', $object, 0).'</td><td class="maxwidthonsmartphone" colspan="3">';
+			print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'forme_juridique_code');
+			print '</td></tr>';
+
+			// Capital
+			print '<tr><td>'.$form->editfieldkey('Capital', 'capital', '', $object, 0).'</td>';
+			print '<td colspan="3"><input type="text" name="capital" id="capital" size="10" value="';
+			print $object->capital != '' ? dol_escape_htmltag(price($object->capital)) : '';
+			print '"> <font class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</font></td></tr>';
+
+			// Default language
+			if (!empty($conf->global->MAIN_MULTILANGS))
+			{
+				print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).'</td><td colspan="3">'."\n";
+				print $formadmin->select_language($object->default_lang, 'default_lang', 0, 0, 1);
+				print '</td>';
+				print '</tr>';
+			}
+
+			// Incoterms
+			if (!empty($conf->incoterm->enabled))
+			{
+				print '<tr>';
+	  				print '<td>'.$form->editfieldkey('IncotermLabel', 'incoterm_id', '', $object, 0).'</td>';
+				print '<td colspan="3" class="maxwidthonsmartphone">';
+				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''));
+				print '</td></tr>';
+			}
 
 			// Categories
 			if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
@@ -2108,7 +2116,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				foreach ($cats as $cat) {
 					$arrayselected[] = $cat->id;
 				}
-				print $form->multiselectarray('custcats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%');
+				print img_picto('', 'category').$form->multiselectarray('custcats', $cate_arbo, $arrayselected, 0, 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 				print "</td></tr>";
 
 				// Supplier
@@ -2121,7 +2129,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				foreach ($cats as $cat) {
 					$arrayselected[] = $cat->id;
 				}
-				print $form->multiselectarray('suppcats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%');
+				print img_picto('', 'category').$form->multiselectarray('suppcats', $cate_arbo, $arrayselected, 0, 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 				print "</td></tr>";
 			}
 
@@ -2130,8 +2138,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			{
 				print '<tr>';
 				print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
-		        print '<td colspan="3" class="maxwidthonsmartphone">';
-		        print $form->selectMultiCurrency(($object->multicurrency_code ? $object->multicurrency_code : $conf->currency), 'multicurrency_code', 1);
+				print '<td colspan="3" class="maxwidthonsmartphone">';
+				print $form->selectMultiCurrency(($object->multicurrency_code ? $object->multicurrency_code : $conf->currency), 'multicurrency_code', 1);
 				print '</td></tr>';
 			}
 
@@ -2139,332 +2147,332 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			$parameters = array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
 
-            // Webservices url/key
-            if (!empty($conf->syncsupplierwebservices->enabled)) {
-                print '<tr><td>'.$form->editfieldkey('WebServiceURL', 'webservices_url', '', $object, 0).'</td>';
-                print '<td><input type="text" name="webservices_url" id="webservices_url" size="32" value="'.$object->webservices_url.'"></td>';
-                print '<td>'.$form->editfieldkey('WebServiceKey', 'webservices_key', '', $object, 0).'</td>';
-                print '<td><input type="text" name="webservices_key" id="webservices_key" size="32" value="'.$object->webservices_key.'"></td></tr>';
-            }
+			// Webservices url/key
+			if (!empty($conf->syncsupplierwebservices->enabled)) {
+				print '<tr><td>'.$form->editfieldkey('WebServiceURL', 'webservices_url', '', $object, 0).'</td>';
+				print '<td><input type="text" name="webservices_url" id="webservices_url" size="32" value="'.$object->webservices_url.'"></td>';
+				print '<td>'.$form->editfieldkey('WebServiceKey', 'webservices_key', '', $object, 0).'</td>';
+				print '<td><input type="text" name="webservices_key" id="webservices_key" size="32" value="'.$object->webservices_key.'"></td></tr>';
+			}
 
-            // Logo
-            print '<tr class="hideonsmartphone">';
-            print '<td>'.$form->editfieldkey('Logo', 'photoinput', '', $object, 0).'</td>';
-            print '<td colspan="3">';
-            if ($object->logo) print $form->showphoto('societe', $object);
-            $caneditfield = 1;
-            if ($caneditfield)
-            {
-                if ($object->logo) print "<br>\n";
-                print '<table class="nobordernopadding">';
-                if ($object->logo) print '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
-                //print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
-                print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
-                print '</table>';
-            }
-            print '</td>';
-            print '</tr>';
+			// Logo
+			print '<tr class="hideonsmartphone">';
+			print '<td>'.$form->editfieldkey('Logo', 'photoinput', '', $object, 0).'</td>';
+			print '<td colspan="3">';
+			if ($object->logo) print $form->showphoto('societe', $object);
+			$caneditfield = 1;
+			if ($caneditfield)
+			{
+				if ($object->logo) print "<br>\n";
+				print '<table class="nobordernopadding">';
+				if ($object->logo) print '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
+				//print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
+				print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
+				print '</table>';
+			}
+			print '</td>';
+			print '</tr>';
 
-            // Assign sale representative
-            print '<tr>';
-            print '<td>'.$form->editfieldkey('AllocateCommercial', 'commercial_id', '', $object, 0).'</td>';
-            print '<td colspan="3" class="maxwidthonsmartphone">';
-            $userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', 0, 1);
-            $arrayselected = GETPOST('commercial', 'array');
-            if (empty($arrayselected)) $arrayselected = $object->getSalesRepresentatives($user, 1);
-            print $form->multiselectarray('commercial', $userlist, $arrayselected, null, null, null, null, "90%");
-            print '</td></tr>';
+			// Assign sale representative
+			print '<tr>';
+			print '<td>'.$form->editfieldkey('AllocateCommercial', 'commercial_id', '', $object, 0).'</td>';
+			print '<td colspan="3" class="maxwidthonsmartphone">';
+			$userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, 'AND u.statut = 1', 0, '', '', 0, 1);
+			$arrayselected = GETPOST('commercial', 'array');
+			if (empty($arrayselected)) $arrayselected = $object->getSalesRepresentatives($user, 1);
+			print img_picto('', 'user').$form->multiselectarray('commercial', $userlist, $arrayselected, 0, 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0, '', '', '', 1);
+			print '</td></tr>';
 
-            print '</table>';
-            print '</div>';
+			print '</table>';
+			print '</div>';
 
-	          dol_fiche_end();
+			  print dol_get_fiche_end();
 
-            print '<div class="center">';
-            print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-            print ' &nbsp; &nbsp; ';
-            print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-            print '</div>';
+			print '<div class="center">';
+			print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+			print ' &nbsp; &nbsp; ';
+			print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+			print '</div>';
 
-            print '</form>';
-        }
-    } else {
-    	/*
+			print '</form>';
+		}
+	} else {
+		/*
          * View
          */
 
-        if (!empty($object->id)) $res = $object->fetch_optionals();
-        //if ($res < 0) { dol_print_error($db); exit; }
+		if (!empty($object->id)) $res = $object->fetch_optionals();
+		//if ($res < 0) { dol_print_error($db); exit; }
 
 
-        $head = societe_prepare_head($object);
+		$head = societe_prepare_head($object);
 
-        dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), -1, 'company');
+		print dol_get_fiche_head($head, 'card', $langs->trans("ThirdParty"), -1, 'company');
 
-        // Confirm delete third party
-        if ($action == 'delete' || ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile)))
-        {
-            print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("DeleteACompany"), $langs->trans("ConfirmDeleteCompany"), "confirm_delete", '', 0, "action-delete");
-        }
+		// Confirm delete third party
+		if ($action == 'delete' || ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile)))
+		{
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("DeleteACompany"), $langs->trans("ConfirmDeleteCompany"), "confirm_delete", '', 0, "action-delete");
+		}
 
-	    if ($action == 'merge')
-	    {
-		    $formquestion = array(
-			    array(
-				    'name' => 'soc_origin',
-			    	'label' => $langs->trans('MergeOriginThirdparty'),
-				    'type' => 'other',
-				    'value' => $form->select_company('', 'soc_origin', 's.rowid <> '.$object->id, 'SelectThirdParty', 0, 0, array(), 0, 'minwidth200')
-			    )
-		    );
+		if ($action == 'merge')
+		{
+			$formquestion = array(
+				array(
+					'name' => 'soc_origin',
+					'label' => $langs->trans('MergeOriginThirdparty'),
+					'type' => 'other',
+					'value' => $form->select_company('', 'soc_origin', 's.rowid <> '.$object->id, 'SelectThirdParty', 0, 0, array(), 0, 'minwidth200')
+				)
+			);
 
-		    print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("MergeThirdparties"), $langs->trans("ConfirmMergeThirdparties"), "confirm_merge", $formquestion, 'no', 1, 250);
-	    }
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("MergeThirdparties"), $langs->trans("ConfirmMergeThirdparties"), "confirm_merge", $formquestion, 'no', 1, 250);
+		}
 
-        dol_htmloutput_mesg(is_numeric($error) ? '' : $error, $errors, 'error');
+		dol_htmloutput_mesg(is_numeric($error) ? '' : $error, $errors, 'error');
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
+		dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
 
 
-        print '<div class="fichecenter">';
-        print '<div class="fichehalfleft">';
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
 
-    	// Prospect/Customer
-    	print '<tr><td class="titlefield">'.$langs->trans('ProspectCustomer').'</td><td>';
-    	print $object->getLibCustProspStatut();
-    	print '</td></tr>';
+		// Prospect/Customer
+		print '<tr><td class="titlefield">'.$langs->trans('ProspectCustomer').'</td><td>';
+		print $object->getLibCustProspStatut();
+		print '</td></tr>';
 
-    	// Supplier
+		// Supplier
    		if (!empty($conf->fournisseur->enabled) || !empty($conf->supplier_proposal->enabled))
-    	{
-    		print '<tr><td>'.$langs->trans('Supplier').'</td><td>';
-    		print yn($object->fournisseur);
-    		print '</td></tr>';
-    	}
+		{
+			print '<tr><td>'.$langs->trans('Supplier').'</td><td>';
+			print yn($object->fournisseur);
+			print '</td></tr>';
+		}
 
-    	// Prefix
-        if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-        {
-            print '<tr><td>'.$langs->trans('Prefix').'</td><td>'.$object->prefix_comm.'</td>';
-            print '</tr>';
-        }
-
-        // Customer code
-        if ($object->client)
-        {
-            print '<tr><td>';
-            print $langs->trans('CustomerCode').'</td><td>';
-            print $object->code_client;
-            if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-            print '</td>';
-            print '</tr>';
-        }
-
-        // Supplier code
-        if (!empty($conf->fournisseur->enabled) && $object->fournisseur && !empty($user->rights->fournisseur->lire))
-        {
-            print '<tr><td>';
-            print $langs->trans('SupplierCode').'</td><td>';
-            print $object->code_fournisseur;
-            if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-            print '</td>';
-            print '</tr>';
-        }
-
-        // Barcode
-        if (!empty($conf->barcode->enabled))
-        {
-            print '<tr><td>';
-            print $langs->trans('Gencod').'</td><td>'.dol_escape_htmltag($object->barcode);
-            print '</td>';
-            print '</tr>';
-        }
-
-        // Prof ids
-        $i = 1; $j = 0;
-        while ($i <= 6)
-        {
-            $idprof = $langs->transcountry('ProfId'.$i, $object->country_code);
-            if ($idprof != '-')
-            {
-                //if (($j % 2) == 0) print '<tr>';
-                print '<tr>';
-            	print '<td>'.$idprof.'</td><td>';
-                $key = 'idprof'.$i;
-                print $object->$key;
-                if ($object->$key)
-                {
-                    if ($object->id_prof_check($i, $object) > 0) print ' &nbsp; '.$object->id_prof_url($i, $object);
-                    else print ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
-                }
-                print '</td>';
-                //if (($j % 2) == 1) print '</tr>';
-                print '</tr>';
-                $j++;
-            }
-            $i++;
-        }
-        //if ($j % 2 == 1)  print '<td colspan="2"></td></tr>';
-
-
-        // This fields are used to know VAT to include in an invoice when the thirdparty is making a sale, so when it is a supplier.
-        // We don't need them into customer profile.
-        // Except for spain and localtax where localtax depends on buyer and not seller
-
-        if ($object->fournisseur)
-        {
-	        // VAT is used
-	        print '<tr><td>';
-	        print $form->textwithpicto($langs->trans('VATIsUsed'), $langs->trans('VATIsUsedWhenSelling'));
-	        print '</td><td>';
-	        print yn($object->tva_assuj);
-	        print '</td>';
+		// Prefix
+		if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+		{
+			print '<tr><td>'.$langs->trans('Prefix').'</td><td>'.$object->prefix_comm.'</td>';
 			print '</tr>';
-        }
+		}
+
+		// Customer code
+		if ($object->client)
+		{
+			print '<tr><td>';
+			print $langs->trans('CustomerCode').'</td><td>';
+			print $object->code_client;
+			if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+			print '</td>';
+			print '</tr>';
+		}
+
+		// Supplier code
+		if (!empty($conf->fournisseur->enabled) && $object->fournisseur && !empty($user->rights->fournisseur->lire))
+		{
+			print '<tr><td>';
+			print $langs->trans('SupplierCode').'</td><td>';
+			print $object->code_fournisseur;
+			if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+			print '</td>';
+			print '</tr>';
+		}
+
+		// Barcode
+		if (!empty($conf->barcode->enabled))
+		{
+			print '<tr><td>';
+			print $langs->trans('Gencod').'</td><td>'.dol_escape_htmltag($object->barcode);
+			print '</td>';
+			print '</tr>';
+		}
+
+		// Prof ids
+		$i = 1; $j = 0;
+		while ($i <= 6)
+		{
+			$idprof = $langs->transcountry('ProfId'.$i, $object->country_code);
+			if ($idprof != '-')
+			{
+				//if (($j % 2) == 0) print '<tr>';
+				print '<tr>';
+				print '<td>'.$idprof.'</td><td>';
+				$key = 'idprof'.$i;
+				print $object->$key;
+				if ($object->$key)
+				{
+					if ($object->id_prof_check($i, $object) > 0) print ' &nbsp; '.$object->id_prof_url($i, $object);
+					else print ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
+				}
+				print '</td>';
+				//if (($j % 2) == 1) print '</tr>';
+				print '</tr>';
+				$j++;
+			}
+			$i++;
+		}
+		//if ($j % 2 == 1)  print '<td colspan="2"></td></tr>';
+
+
+		// This fields are used to know VAT to include in an invoice when the thirdparty is making a sale, so when it is a supplier.
+		// We don't need them into customer profile.
+		// Except for spain and localtax where localtax depends on buyer and not seller
+
+		if ($object->fournisseur)
+		{
+			// VAT is used
+			print '<tr><td>';
+			print $form->textwithpicto($langs->trans('VATIsUsed'), $langs->trans('VATIsUsedWhenSelling'));
+			print '</td><td>';
+			print yn($object->tva_assuj);
+			print '</td>';
+			print '</tr>';
+		}
 
 		// Local Taxes
-        if ($object->fournisseur || $mysoc->country_code == 'ES')
-        {
-        	if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
+		if ($object->fournisseur || $mysoc->country_code == 'ES')
+		{
+			if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
 			{
-			    print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
-			    print yn($object->localtax1_assuj);
-			    print '</td></tr><tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
-			    print yn($object->localtax2_assuj);
-			    print '</td></tr>';
+				print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
+				print yn($object->localtax1_assuj);
+				print '</td></tr><tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
+				print yn($object->localtax2_assuj);
+				print '</td></tr>';
 
-			    if ($object->localtax1_assuj == "1" && (!isOnlyOneLocalTax(1)))
-			    {
-			        print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
-			        print '<input type="hidden" name="action" value="set_localtax1">';
-			        print '<input type="hidden" name="token" value="'.newToken().'">';
-			        print '<tr><td>'.$langs->transcountry("Localtax1", $mysoc->country_code).' <a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editRE&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
-			        if ($action == 'editRE')
-			        {
-			            print '<td class="left">';
-			            $formcompany->select_localtax(1, $object->localtax1_value, "lt1");
-			            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			        } else {
-			            print '<td>'.$object->localtax1_value.'</td>';
-			        }
-			        print '</tr></form>';
-			    }
-			    if ($object->localtax2_assuj == "1" && (!isOnlyOneLocalTax(2)))
-			    {
-			        print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
-			        print '<input type="hidden" name="action" value="set_localtax2">';
-			        print '<input type="hidden" name="token" value="'.newToken().'">';
-			        print '<tr><td>'.$langs->transcountry("Localtax2", $mysoc->country_code).'<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
-			        if ($action == 'editIRPF') {
-			            print '<td class="left">';
-			            $formcompany->select_localtax(2, $object->localtax2_value, "lt2");
-			            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			        } else {
-			            print '<td>'.$object->localtax2_value.'</td>';
-			        }
-			        print '</tr></form>';
-			    }
+				if ($object->localtax1_assuj == "1" && (!isOnlyOneLocalTax(1)))
+				{
+					print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
+					print '<input type="hidden" name="action" value="set_localtax1">';
+					print '<input type="hidden" name="token" value="'.newToken().'">';
+					print '<tr><td>'.$langs->transcountry("Localtax1", $mysoc->country_code).' <a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editRE&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
+					if ($action == 'editRE')
+					{
+						print '<td class="left">';
+						$formcompany->select_localtax(1, $object->localtax1_value, "lt1");
+						print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+					} else {
+						print '<td>'.$object->localtax1_value.'</td>';
+					}
+					print '</tr></form>';
+				}
+				if ($object->localtax2_assuj == "1" && (!isOnlyOneLocalTax(2)))
+				{
+					print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
+					print '<input type="hidden" name="action" value="set_localtax2">';
+					print '<input type="hidden" name="token" value="'.newToken().'">';
+					print '<tr><td>'.$langs->transcountry("Localtax2", $mysoc->country_code).'<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
+					if ($action == 'editIRPF') {
+						print '<td class="left">';
+						$formcompany->select_localtax(2, $object->localtax2_value, "lt2");
+						print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+					} else {
+						print '<td>'.$object->localtax2_value.'</td>';
+					}
+					print '</tr></form>';
+				}
 			} elseif ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj != "1")
 			{
-			    print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
-			    print yn($object->localtax1_assuj);
-			    print '</td></tr>';
-			    if ($object->localtax1_assuj == "1" && (!isOnlyOneLocalTax(1)))
-			    {
-			        print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
-			        print '<input type="hidden" name="action" value="set_localtax1">';
-			        print '<input type="hidden" name="token" value="'.newToken().'">';
-			        print '<tr><td> '.$langs->transcountry("Localtax1", $mysoc->country_code).'<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editRE&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
-			        if ($action == 'editRE') {
-			            print '<td class="left">';
-			            $formcompany->select_localtax(1, $object->localtax1_value, "lt1");
-			            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			        } else {
-			            print '<td>'.$object->localtax1_value.'</td>';
-			        }
-			        print '</tr></form>';
-			    }
+				print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
+				print yn($object->localtax1_assuj);
+				print '</td></tr>';
+				if ($object->localtax1_assuj == "1" && (!isOnlyOneLocalTax(1)))
+				{
+					print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
+					print '<input type="hidden" name="action" value="set_localtax1">';
+					print '<input type="hidden" name="token" value="'.newToken().'">';
+					print '<tr><td> '.$langs->transcountry("Localtax1", $mysoc->country_code).'<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editRE&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
+					if ($action == 'editRE') {
+						print '<td class="left">';
+						$formcompany->select_localtax(1, $object->localtax1_value, "lt1");
+						print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+					} else {
+						print '<td>'.$object->localtax1_value.'</td>';
+					}
+					print '</tr></form>';
+				}
 			} elseif ($mysoc->localtax2_assuj == "1" && $mysoc->localtax1_assuj != "1")
 			{
-			    print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
-			    print yn($object->localtax2_assuj);
-			    print '</td></tr>';
-			    if ($object->localtax2_assuj == "1" && (!isOnlyOneLocalTax(2)))
-			    {
-			        print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
-			        print '<input type="hidden" name="action" value="set_localtax2">';
-			        print '<input type="hidden" name="token" value="'.newToken().'">';
-			        print '<tr><td> '.$langs->transcountry("Localtax2", $mysoc->country_code).' <a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
-			        if ($action == 'editIRPF') {
-			            print '<td class="left">';
-			            $formcompany->select_localtax(2, $object->localtax2_value, "lt2");
-			            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			        } else {
-			            print '<td>'.$object->localtax2_value.'</td>';
-			        }
-			        print '</tr></form>';
-			    }
+				print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
+				print yn($object->localtax2_assuj);
+				print '</td></tr>';
+				if ($object->localtax2_assuj == "1" && (!isOnlyOneLocalTax(2)))
+				{
+					print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
+					print '<input type="hidden" name="action" value="set_localtax2">';
+					print '<input type="hidden" name="token" value="'.newToken().'">';
+					print '<tr><td> '.$langs->transcountry("Localtax2", $mysoc->country_code).' <a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
+					if ($action == 'editIRPF') {
+						print '<td class="left">';
+						$formcompany->select_localtax(2, $object->localtax2_value, "lt2");
+						print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+					} else {
+						print '<td>'.$object->localtax2_value.'</td>';
+					}
+					print '</tr></form>';
+				}
 			}
-        }
+		}
 
-        // Sale tax code (VAT code)
-        print '<tr>';
+		// Sale tax code (VAT code)
+		print '<tr>';
 		print '<td class="nowrap">'.$langs->trans('VATIntra').'</td><td>';
-        if ($object->tva_intra)
-        {
-            $s = '';
-            $s .= dol_escape_htmltag($object->tva_intra);
-            $s .= '<input type="hidden" id="tva_intra" name="tva_intra" maxlength="20" value="'.$object->tva_intra.'">';
+		if ($object->tva_intra)
+		{
+			$s = '';
+			$s .= dol_escape_htmltag($object->tva_intra);
+			$s .= '<input type="hidden" id="tva_intra" name="tva_intra" maxlength="20" value="'.$object->tva_intra.'">';
 
-            if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object))
-            {
-                $s .= ' &nbsp; ';
+			if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object))
+			{
+				$s .= ' &nbsp; ';
 
-                if ($conf->use_javascript_ajax)
-                {
-                	$widthpopup = 600;
-                	if (!empty($conf->dol_use_jmobile)) $widthpopup = 350;
-                	$heightpopup = 400;
-                    print "\n";
-                    print '<script language="JavaScript" type="text/javascript">';
-                    print "function CheckVAT(a) {\n";
-                    print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a, '".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."', ".$widthpopup.", ".$heightpopup.");\n";
-                    print "}\n";
-                    print '</script>';
-                    print "\n";
-                    $s .= '<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT( $(\'#tva_intra\').val() );">'.$langs->trans("VATIntraCheck").'</a>';
-                    $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
-                } else {
-                    $s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
-                }
-            }
-            print $s;
-        } else {
-            print '&nbsp;';
-        }
-        print '</td>';
-        print '</tr>';
+				if ($conf->use_javascript_ajax)
+				{
+					$widthpopup = 600;
+					if (!empty($conf->dol_use_jmobile)) $widthpopup = 350;
+					$heightpopup = 400;
+					print "\n";
+					print '<script language="JavaScript" type="text/javascript">';
+					print "function CheckVAT(a) {\n";
+					print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a, '".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."', ".$widthpopup.", ".$heightpopup.");\n";
+					print "}\n";
+					print '</script>';
+					print "\n";
+					$s .= '<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT( $(\'#tva_intra\').val() );">'.$langs->trans("VATIntraCheck").'</a>';
+					$s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
+				} else {
+					$s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
+				}
+			}
+			print $s;
+		} else {
+			print '&nbsp;';
+		}
+		print '</td>';
+		print '</tr>';
 
-        // Type + Staff
-        $arr = $formcompany->typent_array(1);
-        $object->typent = $arr[$object->typent_code];
-        print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>'.$object->typent.'</td>';
-        print '<tr><td>'.$langs->trans("Staff").'</td><td>'.$object->effectif.'</td></tr>';
+		// Type + Workforce/Staff
+		$arr = $formcompany->typent_array(1);
+		$object->typent = $arr[$object->typent_code];
+		print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>'.$object->typent.'</td>';
+		print '<tr><td>'.$langs->trans("Workforce").'</td><td>'.$object->effectif.'</td></tr>';
 
-        print '</table>';
+		print '</table>';
 
-        print '</div>';
-        print '<div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div>';
+		print '<div class="fichehalfright"><div class="ficheaddleft">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
 
-    	// Tags / categories
+		// Tags / categories
 		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
 		{
 			// Customer
@@ -2484,56 +2492,56 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			}
 		}
 
-        // Legal
-        print '<tr><td class="titlefield">'.$langs->trans('JuridicalStatus').'</td><td>'.$object->forme_juridique.'</td></tr>';
+		// Legal
+		print '<tr><td class="titlefield">'.$langs->trans('JuridicalStatus').'</td><td>'.$object->forme_juridique.'</td></tr>';
 
-        // Capital
-        print '<tr><td>'.$langs->trans('Capital').'</td><td>';
-        if ($object->capital) print price($object->capital, '', $langs, 0, -1, -1, $conf->currency);
-        else print '&nbsp;';
-        print '</td></tr>';
+		// Capital
+		print '<tr><td>'.$langs->trans('Capital').'</td><td>';
+		if ($object->capital) print price($object->capital, '', $langs, 0, -1, -1, $conf->currency);
+		else print '&nbsp;';
+		print '</td></tr>';
 
-        // Default language
-        if (!empty($conf->global->MAIN_MULTILANGS))
-        {
-            require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-            print '<tr><td>'.$langs->trans("DefaultLang").'</td><td>';
-            //$s=picto_from_langcode($object->default_lang);
-            //print ($s?$s.' ':'');
-            $langs->load("languages");
-            $labellang = ($object->default_lang ? $langs->trans('Language_'.$object->default_lang) : '');
-            print $labellang;
-            print '</td></tr>';
-        }
+		// Default language
+		if (!empty($conf->global->MAIN_MULTILANGS))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+			print '<tr><td>'.$langs->trans("DefaultLang").'</td><td>';
+			//$s=picto_from_langcode($object->default_lang);
+			//print ($s?$s.' ':'');
+			$langs->load("languages");
+			$labellang = ($object->default_lang ? $langs->trans('Language_'.$object->default_lang) : '');
+			print $labellang;
+			print '</td></tr>';
+		}
 
-        // Incoterms
-        if (!empty($conf->incoterm->enabled))
-        {
-        	print '<tr><td>';
-        	print '<table width="100%" class="nobordernopadding"><tr><td>';
-        	print $langs->trans('IncotermLabel');
-        	print '<td><td class="right">';
-        	if ($user->rights->societe->creer) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$object->id.'&action=editincoterm">'.img_edit('', 1).'</a>';
-        	else print '&nbsp;';
-        	print '</td></tr></table>';
-        	print '</td>';
-        	print '<td colspan="3">';
-        	if ($action != 'editincoterm')
-        	{
-        		print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-        	} else {
-        		print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?socid='.$object->id);
-        	}
-        	print '</td></tr>';
-        }
+		// Incoterms
+		if (!empty($conf->incoterm->enabled))
+		{
+			print '<tr><td>';
+			print '<table width="100%" class="nobordernopadding"><tr><td>';
+			print $langs->trans('IncotermLabel');
+			print '<td><td class="right">';
+			if ($user->rights->societe->creer) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$object->id.'&action=editincoterm">'.img_edit('', 1).'</a>';
+			else print '&nbsp;';
+			print '</td></tr></table>';
+			print '</td>';
+			print '<td colspan="3">';
+			if ($action != 'editincoterm')
+			{
+				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
+			} else {
+				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?socid='.$object->id);
+			}
+			print '</td></tr>';
+		}
 
 		// Multicurrency
 		if (!empty($conf->multicurrency->enabled))
 		{
 			print '<tr>';
 			print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
-	        print '<td>';
-	        print !empty($object->multicurrency_code) ? currency_name($object->multicurrency_code, 1) : '';
+			print '<td>';
+			print !empty($object->multicurrency_code) ? currency_name($object->multicurrency_code, 1) : '';
 			print '</td></tr>';
 		}
 
@@ -2541,69 +2549,69 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		$parameters = array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
-        // Parent company
-        if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY))
-        {
-        	print '<tr><td>';
-        	print '<table class="nobordernopadding" width="100%"><tr><td>';
-        	print $langs->trans('ParentCompany');
-        	print '</td>';
-        	if ($action != 'editparentcompany') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editparentcompany&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
-        	print '</tr></table>';
-        	print '</td><td>';
-        	if ($action == 'editparentcompany')
-        	{
-        		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->parent, 'editparentcompany', 's.rowid <> '.$object->id, 1);
-        	} else {
-        		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->parent, 'none', 's.rowid <> '.$object->id, 1);
-        	}
-        	print '</td>';
-        	print '</tr>';
-        }
+		// Parent company
+		if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY))
+		{
+			print '<tr><td>';
+			print '<table class="nobordernopadding" width="100%"><tr><td>';
+			print $langs->trans('ParentCompany');
+			print '</td>';
+			if ($action != 'editparentcompany') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editparentcompany&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
+			print '</tr></table>';
+			print '</td><td>';
+			if ($action == 'editparentcompany')
+			{
+				$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->parent, 'editparentcompany', 's.rowid <> '.$object->id, 1);
+			} else {
+				$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->parent, 'none', 's.rowid <> '.$object->id, 1);
+			}
+			print '</td>';
+			print '</tr>';
+		}
 
-        // Sales representative
-        include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
+		// Sales representative
+		include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
 
-        // Module Adherent
-        if (!empty($conf->adherent->enabled))
-        {
-            $langs->load("members");
-            print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
-            print '<td>';
-            $adh = new Adherent($db);
-            $result = $adh->fetch('', '', $object->id);
-            if ($result > 0)
-            {
-                $adh->ref = $adh->getFullName($langs);
-                print $adh->getNomUrl(1);
-            } else {
-                print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
-            }
-            print '</td>';
-            print "</tr>\n";
-        }
+		// Module Adherent
+		if (!empty($conf->adherent->enabled))
+		{
+			$langs->load("members");
+			print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
+			print '<td>';
+			$adh = new Adherent($db);
+			$result = $adh->fetch('', '', $object->id);
+			if ($result > 0)
+			{
+				$adh->ref = $adh->getFullName($langs);
+				print $adh->getNomUrl(1);
+			} else {
+				print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
+			}
+			print '</td>';
+			print "</tr>\n";
+		}
 
-        // Webservices url/key
-        if (!empty($conf->syncsupplierwebservices->enabled)) {
-            print '<tr><td>'.$langs->trans("WebServiceURL").'</td><td>'.dol_print_url($object->webservices_url).'</td>';
-            print '<td class="nowrap">'.$langs->trans('WebServiceKey').'</td><td>'.$object->webservices_key.'</td></tr>';
-        }
+		// Webservices url/key
+		if (!empty($conf->syncsupplierwebservices->enabled)) {
+			print '<tr><td>'.$langs->trans("WebServiceURL").'</td><td>'.dol_print_url($object->webservices_url).'</td>';
+			print '<td class="nowrap">'.$langs->trans('WebServiceKey').'</td><td>'.$object->webservices_key.'</td></tr>';
+		}
 
-        print '</table>';
+		print '</table>';
 		print '</div>';
 
-        print '</div></div>';
-        print '<div style="clear:both"></div>';
+		print '</div></div>';
+		print '<div style="clear:both"></div>';
 
-        dol_fiche_end();
+		print dol_get_fiche_end();
 
 
-        /*
+		/*
          *  Actions
          */
-        if ($action != 'presend')
-        {
-	        print '<div class="tabsAction">'."\n";
+		if ($action != 'presend')
+		{
+			print '<div class="tabsAction">'."\n";
 
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
@@ -2622,50 +2630,50 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 				if (empty($user->socid)) {
 					if (!empty($object->email) || $at_least_one_email_contact)
-			        {
-			        	$langs->load("mails");
-			        	print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
-			        } else {
-			        	$langs->load("mails");
-			       		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a>';
-			        }
+					{
+						$langs->load("mails");
+						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
+					} else {
+						$langs->load("mails");
+				   		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a>';
+					}
 				}
 
-		        if ($user->rights->societe->creer)
-		        {
-		            print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
-		        }
+				if ($user->rights->societe->creer)
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
+				}
 
-		        if (!empty($conf->adherent->enabled))
-		        {
+				if (!empty($conf->adherent->enabled))
+				{
 					$adh = new Adherent($db);
 					$result = $adh->fetch('', '', $object->id);
 					if ($result == 0 && ($object->client == 1 || $object->client == 3) && !empty($conf->global->MEMBER_CAN_CONVERT_CUSTOMERS_TO_MEMBERS))
-            		{
-            			print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/card.php?&action=create&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("NewMember")).'">'.$langs->trans("NewMember").'</a>';
-            		}
-            	}
+					{
+						print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/card.php?&action=create&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("NewMember")).'">'.$langs->trans("NewMember").'</a>';
+					}
+				}
 
-		        if ($user->rights->societe->supprimer)
-		        {
-		        	print '<a class="butActionDelete" href="card.php?action=merge&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("MergeThirdparties")).'">'.$langs->trans('Merge').'</a>';
-		        }
+				if ($user->rights->societe->supprimer)
+				{
+					print '<a class="butActionDelete" href="card.php?action=merge&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("MergeThirdparties")).'">'.$langs->trans('Merge').'</a>';
+				}
 
-		        if ($user->rights->societe->supprimer)
-		        {
-		            if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))	// We can't use preloaded confirm form with jmobile
-		            {
-		                print '<span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span>'."\n";
-		            } else {
-		                print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
-		            }
-		        }
+				if ($user->rights->societe->supprimer)
+				{
+					if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))	// We can't use preloaded confirm form with jmobile
+					{
+						print '<span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span>'."\n";
+					} else {
+						print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
+					}
+				}
 			}
 
-	        print '</div>'."\n";
-        }
+			print '</div>'."\n";
+		}
 
-        //Select mail models is same action as presend
+		//Select mail models is same action as presend
 		if (GETPOST('modelselected')) {
 			$action = 'presend';
 		}
@@ -2674,20 +2682,20 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		{
 			print '<div class="fichecenter"><div class="fichehalfleft">';
 
-	        if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC))
-	        {
+			if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC))
+			{
 				print '<a name="builddoc"></a>'; // ancre
 
-	            /*
+				/*
 	             * Documents generes
 	             */
-	            $filedir = $conf->societe->multidir_output[$object->entity].'/'.$object->id;
-	            $urlsource = $_SERVER["PHP_SELF"]."?socid=".$object->id;
-	            $genallowed = $user->rights->societe->lire;
-	            $delallowed = $user->rights->societe->creer;
+				$filedir = $conf->societe->multidir_output[$object->entity].'/'.$object->id;
+				$urlsource = $_SERVER["PHP_SELF"]."?socid=".$object->id;
+				$genallowed = $user->rights->societe->lire;
+				$delallowed = $user->rights->societe->creer;
 
-	            print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
-	        }
+				print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
+			}
 
 			// Subsidiaries list
 			if (empty($conf->global->SOCIETE_DISABLE_SUBSIDIARIES))
@@ -2699,7 +2707,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 			$MAXEVENT = 10;
 
-            $morehtmlright = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id);
+			$morehtmlright = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id);
 
 			// List of actions on element
 			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
@@ -2731,7 +2739,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		$trackid = 'thi'.$object->id;
 
 		include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
-    }
+	}
 }
 
 // End of page
diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
index 725cab96065..4b3cb68e3bb 100644
--- a/htdocs/societe/checkvat/checkVatPopup.php
+++ b/htdocs/societe/checkvat/checkVatPopup.php
@@ -65,10 +65,10 @@ if (!$vatNumber)
 
 	// Set the WebService URL
 	dol_syslog("Create nusoap_client for URL=".$WS_DOL_URL." WSDL=".$WS_DOL_URL_WSDL);
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-    $params = getSoapParams();
-    //ini_set('default_socket_timeout', $params['response_timeout']);
-    //$soapclient = new SoapClient($WS_DOL_URL_WSDL,$params);
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+	$params = getSoapParams();
+	//ini_set('default_socket_timeout', $params['response_timeout']);
+	//$soapclient = new SoapClient($WS_DOL_URL_WSDL,$params);
 	$soapclient = new nusoap_client($WS_DOL_URL_WSDL, true, $params['proxy_host'], $params['proxy_port'], $params['proxy_login'], $params['proxy_password'], $params['connection_timeout'], $params['response_timeout']);
 	$soapclient->soap_defencoding = 'utf-8';
 	$soapclient->xml_encoding = 'utf-8';
diff --git a/htdocs/societe/checkvat/checkVatService.xml b/htdocs/societe/checkvat/checkVatService.xml
index 373775c2487..b6d7661cdc6 100644
--- a/htdocs/societe/checkvat/checkVatService.xml
+++ b/htdocs/societe/checkvat/checkVatService.xml
@@ -167,7 +167,7 @@
   </wsdl:binding>
   <wsdl:service name="checkVatService">
     <wsdl:port name="checkVatPort" binding="impl:checkVatBinding">
-      <wsdlsoap:address location="http://ec.europa.eu/taxation_customs/vies/services/checkVatService"/>
+      <wsdlsoap:address location="https://ec.europa.eu/taxation_customs/vies/services/checkVatService"/>
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index d5280ee80dd..82984409325 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -46,7 +46,7 @@ class Contacts extends DolibarrApi
 	/**
 	 * Constructor
 	 */
-    public function __construct()
+	public function __construct()
 	{
 		global $db, $conf;
 		$this->db = $db;
@@ -64,11 +64,12 @@ class Contacts extends DolibarrApi
 	 *
 	 * @param 	int    $id                  ID of contact
 	 * @param   int    $includecount        Count and return also number of elements the contact is used as a link for
+	 * @param   int    $includeroles        Includes roles of the contact
 	 * @return 	array|mixed data without useless information
 	 *
 	 * @throws 	RestException
 	 */
-    public function get($id, $includecount = 0)
+	public function get($id, $includecount = 0, $includeroles = 0)
 	{
 		if (!DolibarrApiAccess::$user->rights->societe->contact->lire)
 		{
@@ -92,7 +93,12 @@ class Contacts extends DolibarrApi
 
 		if ($includecount)
 		{
-		    $this->contact->load_ref_elements();
+			$this->contact->load_ref_elements();
+		}
+
+		if ($includeroles)
+		{
+			$this->contact->fetchRoles();
 		}
 
 		return $this->_cleanObjectDatas($this->contact);
@@ -103,6 +109,7 @@ class Contacts extends DolibarrApi
 	 *
 	 * @param 	string 	$email 					Email of contact
 	 * @param   int    $includecount        Count and return also number of elements the contact is used as a link for
+	 * @param   int    $includeroles        Includes roles of the contact
 	 * @return 	array|mixed data without useless information
 	 *
 	 * @url GET email/{email}
@@ -110,7 +117,7 @@ class Contacts extends DolibarrApi
 	 * @throws RestException 401     Insufficient rights
 	 * @throws RestException 404     User or group not found
 	 */
-    public function getByEmail($email, $includecount = 0)
+	public function getByEmail($email, $includecount = 0, $includeroles = 0)
 	{
 		if (!DolibarrApiAccess::$user->rights->societe->contact->lire)
 		{
@@ -134,7 +141,12 @@ class Contacts extends DolibarrApi
 
 		if ($includecount)
 		{
-		    $this->contact->load_ref_elements();
+			$this->contact->load_ref_elements();
+		}
+
+		if ($includeroles)
+		{
+			$this->contact->fetchRoles();
 		}
 
 		return $this->_cleanObjectDatas($this->contact);
@@ -150,25 +162,26 @@ class Contacts extends DolibarrApi
 	 * @param int		$limit		        Limit for list
 	 * @param int		$page		        Page number
 	 * @param string   	$thirdparty_ids	    Thirdparty ids to filter contacts of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
-	 * @param  int    	$category   Use this param to filter list by category
+	 * @param int    	$category   Use this param to filter list by category
 	 * @param string    $sqlfilters         Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
 	 * @param int       $includecount       Count and return also number of elements the contact is used as a link for
+	 * @param int    	$includeroles        Includes roles of the contact
 	 * @return array                        Array of contact objects
-     *
+	 *
 	 * @throws RestException
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $category = 0, $sqlfilters = '', $includecount = 0)
-    {
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $category = 0, $sqlfilters = '', $includecount = 0, $includeroles = 0)
+	{
 		global $db, $conf;
 
 		$obj_ret = array();
 
 		if (!DolibarrApiAccess::$user->rights->societe->contact->lire)
 		{
-		    throw new RestException(401, 'No permission to read contacts');
+			throw new RestException(401, 'No permission to read contacts');
 		}
 
-        // case of external user, $thirdparty_ids param is ignored and replaced by user's socid
+		// case of external user, $thirdparty_ids param is ignored and replaced by user's socid
 		$socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
 
 		// If the internal user must only see his customers, force searching by him
@@ -178,9 +191,9 @@ class Contacts extends DolibarrApi
 
 		$sql = "SELECT t.rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as t";
-    	if ($category > 0) {
+		if ($category > 0) {
 			$sql .= ", ".MAIN_DB_PREFIX."categorie_contact as c";
-    	}
+		}
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople_extrafields as te ON te.fk_object = t.rowid";
 		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
 			// We need this table joined to the select in order to filter by sale
@@ -200,24 +213,24 @@ class Contacts extends DolibarrApi
 			$sql .= " AND sc.fk_user = ".$search_sale;
 		}
 
-    	// Select contacts of given category
-    	if ($category > 0) {
+		// Select contacts of given category
+		if ($category > 0) {
 			$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
 			$sql .= " AND c.fk_socpeople = t.rowid ";
-    	}
+		}
 
-	    // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
+		$sql .= $this->db->order($sortfield, $sortorder);
 
 		if ($limit)
 		{
@@ -234,17 +247,23 @@ class Contacts extends DolibarrApi
 		{
 			$num = $this->db->num_rows($result);
 			$min = min($num, ($limit <= 0 ? $num : $limit));
-            $i = 0;
+			$i = 0;
 			while ($i < $min)
 			{
 				$obj = $this->db->fetch_object($result);
 				$contact_static = new Contact($this->db);
 				if ($contact_static->fetch($obj->rowid))
 				{
-		            if ($includecount)
-		            {
-		                $contact_static->load_ref_elements();
-		            }
+					$contact_static->fetchRoles();
+					if ($includecount)
+					{
+						$contact_static->load_ref_elements();
+					}
+					if ($includeroles)
+					{
+						$contact_static->fetchRoles();
+					}
+
 					$obj_ret[] = $this->_cleanObjectDatas($contact_static);
 				}
 
@@ -266,8 +285,8 @@ class Contacts extends DolibarrApi
 	 * @param   array   $request_data   Request datas
 	 * @return  int     ID of contact
 	 */
-    public function post($request_data = null)
-    {
+	public function post($request_data = null)
+	{
 		if (!DolibarrApiAccess::$user->rights->societe->contact->creer)
 		{
 			throw new RestException(401, 'No permission to create/update contacts');
@@ -280,7 +299,7 @@ class Contacts extends DolibarrApi
 			$this->contact->$field = $value;
 		}
 		if ($this->contact->create(DolibarrApiAccess::$user) < 0) {
-		    throw new RestException(500, "Error creating contact", array_merge(array($this->contact->error), $this->contact->errors));
+			throw new RestException(500, "Error creating contact", array_merge(array($this->contact->error), $this->contact->errors));
 		}
 		return $this->contact->id;
 	}
@@ -292,8 +311,8 @@ class Contacts extends DolibarrApi
 	 * @param array $request_data   Datas
 	 * @return int
 	 */
-    public function put($id, $request_data = null)
-    {
+	public function put($id, $request_data = null)
+	{
 		if (!DolibarrApiAccess::$user->rights->societe->contact->creer)
 		{
 			throw new RestException(401, 'No permission to create/update contacts');
@@ -312,8 +331,8 @@ class Contacts extends DolibarrApi
 
 		foreach ($request_data as $field => $value)
 		{
-            if ($field == 'id') continue;
-		    $this->contact->$field = $value;
+			if ($field == 'id') continue;
+			$this->contact->$field = $value;
 		}
 
 		if ($this->contact->update($id, DolibarrApiAccess::$user, 1, '', '', 'update'))
@@ -328,8 +347,8 @@ class Contacts extends DolibarrApi
 	 * @param   int     $id Contact ID
 	 * @return  integer
 	 */
-    public function delete($id)
-    {
+	public function delete($id)
+	{
 		if (!DolibarrApiAccess::$user->rights->societe->contact->supprimer)
 		{
 			throw new RestException(401, 'No permission to delete contacts');
@@ -344,7 +363,7 @@ class Contacts extends DolibarrApi
 		{
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-        $this->contact->oldcopy = clone $this->contact;
+		$this->contact->oldcopy = clone $this->contact;
 		return $this->contact->delete();
 	}
 
@@ -357,62 +376,62 @@ class Contacts extends DolibarrApi
 	 *
 	 * @url	POST {id}/createUser
 	 */
-    public function createUser($id, $request_data = null)
-    {
-	    //if (!DolibarrApiAccess::$user->rights->user->user->creer) {
-	    //throw new RestException(401);
-	    //}
+	public function createUser($id, $request_data = null)
+	{
+		//if (!DolibarrApiAccess::$user->rights->user->user->creer) {
+		//throw new RestException(401);
+		//}
 
-	    if (!isset($request_data["login"]))
-    		throw new RestException(400, "login field missing");
-	    if (!isset($request_data["password"]))
-	    	throw new RestException(400, "password field missing");
+		if (!isset($request_data["login"]))
+			throw new RestException(400, "login field missing");
+		if (!isset($request_data["password"]))
+			throw new RestException(400, "password field missing");
 
-	    if (!DolibarrApiAccess::$user->rights->societe->contact->lire) {
-	        throw new RestException(401, 'No permission to read contacts');
-	    }
-	    if (!DolibarrApiAccess::$user->rights->user->user->creer) {
-	        throw new RestException(401, 'No permission to create user');
-	    }
+		if (!DolibarrApiAccess::$user->rights->societe->contact->lire) {
+			throw new RestException(401, 'No permission to read contacts');
+		}
+		if (!DolibarrApiAccess::$user->rights->user->user->creer) {
+			throw new RestException(401, 'No permission to create user');
+		}
 
-	    $contact = new Contact($this->db);
-	    $contact->fetch($id);
-	    if ($contact->id <= 0) {
-	        throw new RestException(404, 'Contact not found');
-	    }
+		$contact = new Contact($this->db);
+		$contact->fetch($id);
+		if ($contact->id <= 0) {
+			throw new RestException(404, 'Contact not found');
+		}
 
-	    if (!DolibarrApi::_checkAccessToResource('contact', $contact->id, 'socpeople&societe')) {
-	        throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-	    }
+		if (!DolibarrApi::_checkAccessToResource('contact', $contact->id, 'socpeople&societe')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-	    // Check mandatory fields
-	    $login = $request_data["login"];
-	    $password = $request_data["password"];
-	    $useraccount = new User($this->db);
-	    $result = $useraccount->create_from_contact($contact, $login, $password);
-	    if ($result <= 0) {
-	        throw new RestException(500, "User not created");
-	    }
-	    // password parameter not used in create_from_contact
-	    $useraccount->setPassword($useraccount, $password);
+		// Check mandatory fields
+		$login = $request_data["login"];
+		$password = $request_data["password"];
+		$useraccount = new User($this->db);
+		$result = $useraccount->create_from_contact($contact, $login, $password);
+		if ($result <= 0) {
+			throw new RestException(500, "User not created");
+		}
+		// password parameter not used in create_from_contact
+		$useraccount->setPassword($useraccount, $password);
 
-	    return $result;
+		return $result;
 	}
 
-    /**
-     * Get categories for a contact
-     *
-     * @param int		$id         ID of contact
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     *
-     * @return mixed
-     *
-     * @url GET {id}/categories
-     */
-    public function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
+	/**
+	 * Get categories for a contact
+	 *
+	 * @param int		$id         ID of contact
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
+	 *
+	 * @return mixed
+	 *
+	 * @url GET {id}/categories
+	 */
+	public function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
 	{
 		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
 			throw new RestException(401);
@@ -431,131 +450,131 @@ class Contacts extends DolibarrApi
 		}
 
 		return $result;
-    }
+	}
 
-    /**
-     * Add a category to a contact
-     *
-     * @url POST {id}/categories/{category_id}
-     *
-     * @param   int		$id             Id of contact
-     * @param   int     $category_id    Id of category
-     *
-     * @return  mixed
-     *
-     * @throws RestException 401 Insufficient rights
-     * @throws RestException 404 Category or contact not found
-     */
-    public function addCategory($id, $category_id)
-    {
-        if (!DolibarrApiAccess::$user->rights->societe->contact->creer) {
-            throw new RestException(401, 'Insufficient rights');
-        }
+	/**
+	 * Add a category to a contact
+	 *
+	 * @url POST {id}/categories/{category_id}
+	 *
+	 * @param   int		$id             Id of contact
+	 * @param   int     $category_id    Id of category
+	 *
+	 * @return  mixed
+	 *
+	 * @throws RestException 401 Insufficient rights
+	 * @throws RestException 404 Category or contact not found
+	 */
+	public function addCategory($id, $category_id)
+	{
+		if (!DolibarrApiAccess::$user->rights->societe->contact->creer) {
+			throw new RestException(401, 'Insufficient rights');
+		}
 
-        $result = $this->contact->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Contact not found');
-        }
-        $category = new Categorie($this->db);
-        $result = $category->fetch($category_id);
-        if (!$result) {
-            throw new RestException(404, 'category not found');
-        }
+		$result = $this->contact->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Contact not found');
+		}
+		$category = new Categorie($this->db);
+		$result = $category->fetch($category_id);
+		if (!$result) {
+			throw new RestException(404, 'category not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        if (!DolibarrApi::_checkAccessToResource('category', $category->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		if (!DolibarrApi::_checkAccessToResource('category', $category->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $category->add_type($this->contact, 'contact');
+		$category->add_type($this->contact, 'contact');
 
-        return $this->_cleanObjectDatas($this->contact);
-    }
+		return $this->_cleanObjectDatas($this->contact);
+	}
 
-    /**
-     * Remove the link between a category and a contact
-     *
-     * @url DELETE {id}/categories/{category_id}
-     *
-     * @param   int		$id				Id of contact
-     * @param   int		$category_id	Id of category
-     * @return  mixed
-     *
-     * @throws  RestException 401     Insufficient rights
-     * @throws  RestException 404     Category or contact not found
-     */
-    public function deleteCategory($id, $category_id)
-    {
-        if (!DolibarrApiAccess::$user->rights->societe->contact->creer) {
-            throw new RestException(401, 'Insufficient rights');
-        }
+	/**
+	 * Remove the link between a category and a contact
+	 *
+	 * @url DELETE {id}/categories/{category_id}
+	 *
+	 * @param   int		$id				Id of contact
+	 * @param   int		$category_id	Id of category
+	 * @return  mixed
+	 *
+	 * @throws  RestException 401     Insufficient rights
+	 * @throws  RestException 404     Category or contact not found
+	 */
+	public function deleteCategory($id, $category_id)
+	{
+		if (!DolibarrApiAccess::$user->rights->societe->contact->creer) {
+			throw new RestException(401, 'Insufficient rights');
+		}
 
-        $result = $this->contact->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Contact not found');
-        }
-        $category = new Categorie($this->db);
-        $result = $category->fetch($category_id);
-        if (!$result) {
-            throw new RestException(404, 'category not found');
-        }
+		$result = $this->contact->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Contact not found');
+		}
+		$category = new Categorie($this->db);
+		$result = $category->fetch($category_id);
+		if (!$result) {
+			throw new RestException(404, 'category not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        if (!DolibarrApi::_checkAccessToResource('category', $category->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		if (!DolibarrApi::_checkAccessToResource('category', $category->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $category->del_type($this->contact, 'contact');
+		$category->del_type($this->contact, 'contact');
 
-        return $this->_cleanObjectDatas($this->contact);
-    }
+		return $this->_cleanObjectDatas($this->contact);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   Object  $object     Object to clean
-     * @return  array               Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->total_ht);
-        unset($object->total_tva);
-        unset($object->total_localtax1);
-        unset($object->total_localtax2);
-        unset($object->total_ttc);
+		unset($object->total_ht);
+		unset($object->total_tva);
+		unset($object->total_localtax1);
+		unset($object->total_localtax2);
+		unset($object->total_ttc);
 
-        unset($object->note);
-        unset($object->lines);
-        unset($object->thirdparty);
+		unset($object->note);
+		unset($object->lines);
+		unset($object->thirdparty);
 
-        return $object;
-    }
+		return $object;
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param   array|null     $data   Data to validate
-     * @return  array
-     * @throws  RestException
-     */
-    private function _validate($data)
-    {
-        $contact = array();
-        foreach (Contacts::$FIELDS as $field) {
-            if (!isset($data[$field])) {
-                throw new RestException(400, "$field field missing");
-            }
-            $contact[$field] = $data[$field];
-        }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param   array|null     $data   Data to validate
+	 * @return  array
+	 * @throws  RestException
+	 */
+	private function _validate($data)
+	{
+		$contact = array();
+		foreach (Contacts::$FIELDS as $field) {
+			if (!isset($data[$field])) {
+				throw new RestException(400, "$field field missing");
+			}
+			$contact[$field] = $data[$field];
+		}
 
-        return $contact;
-    }
+		return $contact;
+	}
 }
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 8551cb61f10..7a793b04a8c 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2018   Pierre Chéné            <pierre.chene44@gmail.com>
  * Copyright (C) 2019   Cedric Ancelin          <icedo.anc@gmail.com>
+ * Copyright (C) 2020       Frédéric 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
@@ -45,7 +46,7 @@ class Thirdparties extends DolibarrApi
 	/**
 	 * Constructor
 	 */
-    public function __construct()
+	public function __construct()
 	{
 		global $db, $conf;
 		$this->db = $db;
@@ -68,14 +69,14 @@ class Thirdparties extends DolibarrApi
 	 * Return an array with thirdparty informations
 	 *
 	 * @param 	int 	$id Id of third party to load
-	 * @return 	array|mixed data without useless information
+	 * @return 	Object Cleaned Societe object
 	 *
 	 * @throws 	RestException
 	 */
-    public function get($id)
+	public function get($id)
 	{
-        return $this->_fetch($id);
-    }
+		return $this->_fetch($id);
+	}
 
 	/**
 	 * Get properties of a thirdparty object by email.
@@ -83,7 +84,7 @@ class Thirdparties extends DolibarrApi
 	 * Return an array with thirdparty informations
 	 *
 	 * @param string    $email  Email of third party to load
-	 * @return array|mixed data without useless information
+	 * @return Object Cleaned Societe object
 	 *
 	 * @url     GET email/{email}
 	 *
@@ -91,7 +92,7 @@ class Thirdparties extends DolibarrApi
 	 */
 	public function getByEmail($email)
 	{
-	    return $this->_fetch('', '', '', '', '', '', '', '', '', '', $email);
+		return $this->_fetch('', '', '', '', '', '', '', '', '', '', $email);
 	}
 
 	/**
@@ -100,7 +101,7 @@ class Thirdparties extends DolibarrApi
 	 * Return an array with thirdparty informations
 	 *
 	 * @param string    $barcode  Barcode of third party to load
-	 * @return array|mixed data without useless information
+	 * @return Object Cleaned Societe object
 	 *
 	 * @url     GET barcode/{barcode}
 	 *
@@ -108,7 +109,7 @@ class Thirdparties extends DolibarrApi
 	 */
 	public function getByBarcode($barcode)
 	{
-	    return $this->_fetch('', '', '', $barcode);
+		return $this->_fetch('', '', '', $barcode);
 	}
 
 	/**
@@ -128,10 +129,8 @@ class Thirdparties extends DolibarrApi
 	 * @param   string  $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.nom:like:'TheCompany%') and (t.date_creation:<:'20160101')"
 	 * @return  array               Array of thirdparty objects
 	 */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $sqlfilters = '')
-    {
-		global $db;
-
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $sqlfilters = '')
+	{
 		$obj_ret = array();
 
 		// case of external user, we force socids
@@ -144,26 +143,26 @@ class Thirdparties extends DolibarrApi
 		$sql = "SELECT t.rowid";
 		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as t";
-    	if ($category > 0) {
+		if ($category > 0) {
 			if ($mode != 4) $sql .= ", ".MAIN_DB_PREFIX."categorie_societe as c";
 			if (!in_array($mode, array(1, 2, 3))) $sql .= ", ".MAIN_DB_PREFIX."categorie_fournisseur as cc";
-    	}
+		}
 		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 		$sql .= ", ".MAIN_DB_PREFIX."c_stcomm as st";
 		$sql .= " WHERE t.entity IN (".getEntity('societe').")";
 		$sql .= " AND t.fk_stcomm = st.id";
 
 		if ($mode == 1) $sql .= " AND t.client IN (1, 3)";
-		if ($mode == 2) $sql .= " AND t.client IN (2, 3)";
-		if ($mode == 3) $sql .= " AND t.client IN (0)";
-		if ($mode == 4) $sql .= " AND t.fournisseur IN (1)";
+		elseif ($mode == 2) $sql .= " AND t.client IN (2, 3)";
+		elseif ($mode == 3) $sql .= " AND t.client IN (0)";
+		elseif ($mode == 4) $sql .= " AND t.fournisseur IN (1)";
 
-    	// Select thirdparties of given category
-    	if ($category > 0) {
-    		if (!empty($mode) && $mode != 4) { $sql .= " AND c.fk_categorie = ".$this->db->escape($category)." AND c.fk_soc = t.rowid"; }
-    		elseif (!empty($mode) && $mode == 4) { $sql .= " AND cc.fk_categorie = ".$this->db->escape($category)." AND cc.fk_soc = t.rowid"; }
-    		else { $sql .= " AND ((c.fk_categorie = ".$this->db->escape($category)." AND c.fk_soc = t.rowid) OR (cc.fk_categorie = ".$this->db->escape($category)." AND cc.fk_soc = t.rowid))"; }
-    	}
+		// Select thirdparties of given category
+		if ($category > 0) {
+			if (!empty($mode) && $mode != 4) { $sql .= " AND c.fk_categorie = ".$this->db->escape($category)." AND c.fk_soc = t.rowid"; }
+			elseif (!empty($mode) && $mode == 4) { $sql .= " AND cc.fk_categorie = ".$this->db->escape($category)." AND cc.fk_soc = t.rowid"; }
+			else { $sql .= " AND ((c.fk_categorie = ".$this->db->escape($category)." AND c.fk_soc = t.rowid) OR (cc.fk_categorie = ".$this->db->escape($category)." AND cc.fk_soc = t.rowid))"; }
+		}
 
 		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc";
 		//if ($email != NULL) $sql.= " AND s.email = \"".$email."\"";
@@ -188,8 +187,7 @@ class Thirdparties extends DolibarrApi
 		$sql .= $this->db->order($sortfield, $sortorder);
 
 		if ($limit) {
-			if ($page < 0)
-			{
+			if ($page < 0) {
 				$page = 0;
 			}
 			$offset = $limit * $page;
@@ -202,7 +200,7 @@ class Thirdparties extends DolibarrApi
 		{
 			$num = $this->db->num_rows($result);
 			$min = min($num, ($limit <= 0 ? $num : $limit));
-            $i = 0;
+			$i = 0;
 			while ($i < $min)
 			{
 				$obj = $this->db->fetch_object($result);
@@ -227,7 +225,7 @@ class Thirdparties extends DolibarrApi
 	 * @param array $request_data   Request datas
 	 * @return int  ID of thirdparty
 	 */
-    public function post($request_data = null)
+	public function post($request_data = null)
 	{
 		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
@@ -249,9 +247,9 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @param int   $id             Id of thirdparty to update
 	 * @param array $request_data   Datas
-	 * @return int
+	 * @return Object|boolean
 	 */
-    public function put($id, $request_data = null)
+	public function put($id, $request_data = null)
 	{
 		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
@@ -271,8 +269,9 @@ class Thirdparties extends DolibarrApi
 			$this->company->$field = $value;
 		}
 
-		if ($this->company->update($id, DolibarrApiAccess::$user, 1, '', '', 'update'))
+		if ($this->company->update($id, DolibarrApiAccess::$user, 1, '', '', 'update')) {
 			return $this->get($id);
+		}
 
 		return false;
 	}
@@ -291,9 +290,9 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url PUT {id}/merge/{idtodelete}
 	 */
-    public function merge($id, $idtodelete)
+	public function merge($id, $idtodelete)
 	{
-		global $db, $hookmanager;
+		global $hookmanager;
 
 		$error = 0;
 
@@ -397,8 +396,9 @@ class Thirdparties extends DolibarrApi
 		}
 
 		// Move links
-		if (!$error)
-		{
+		if (!$error) {
+			// This list is also into the societe/card.php file
+			// TODO Mutualise the list into object societe.class.php
 			$objects = array(
 				'Adherent' => '/adherents/class/adherent.class.php',
 				'Societe' => '/societe/class/societe.class.php',
@@ -409,6 +409,7 @@ class Thirdparties extends DolibarrApi
 				'Facture' => '/compta/facture/class/facture.class.php',
 				'FactureRec' => '/compta/facture/class/facture-rec.class.php',
 				'LignePrelevement' => '/compta/prelevement/class/ligneprelevement.class.php',
+				'Mo' => '/mrp/class/mo.class.php',
 				'Contact' => '/contact/class/contact.class.php',
 				'Contrat' => '/contrat/class/contrat.class.php',
 				'Expedition' => '/expedition/class/expedition.class.php',
@@ -417,10 +418,11 @@ class Thirdparties extends DolibarrApi
 				'FactureFournisseur' => '/fourn/class/fournisseur.facture.class.php',
 				'SupplierProposal' => '/supplier_proposal/class/supplier_proposal.class.php',
 				'ProductFournisseur' => '/fourn/class/fournisseur.product.class.php',
-				'Livraison' => '/livraison/class/livraison.class.php',
+				'Livraison' => '/delivery/class/delivery.class.php',
 				'Product' => '/product/class/product.class.php',
 				'Project' => '/projet/class/project.class.php',
-				'User' => '/user/class/user.class.php',
+				'Ticket' => '/ticket/class/ticket.class.php',
+				'User' => '/user/class/user.class.php'
 			);
 
 			//First, all core objects must update their tables
@@ -428,57 +430,49 @@ class Thirdparties extends DolibarrApi
 			{
 				require_once DOL_DOCUMENT_ROOT.$object_file;
 
-				if (!$errors && !$object_name::replaceThirdparty($this->db, $soc_origin->id, $object->id))
-				{
-					$errors++;
+				if (!$error && !$object_name::replaceThirdparty($this->db, $soc_origin->id, $object->id)) {
+					$error++;
 					//setEventMessages($this->db->lasterror(), null, 'errors');
 				}
 			}
 		}
 
 		// External modules should update their ones too
-		if (!$errors)
-		{
-            $reshook = $hookmanager->executeHooks('replaceThirdparty', array(
+		if (!$error) {
+			$reshook = $hookmanager->executeHooks('replaceThirdparty', array(
 				'soc_origin' => $soc_origin->id,
 				'soc_dest' => $object->id
 			), $soc_dest, $action);
 
-			if ($reshook < 0)
-			{
+			if ($reshook < 0) {
 				//setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-				$errors++;
+				$error++;
 			}
 		}
 
 
-		if (!$error)
-		{
+		if (!$error) {
 			$object->context = array('merge'=>1, 'mergefromid'=>$soc_origin->id);
 
 			// Call trigger
 			$result = $object->call_trigger('COMPANY_MODIFY', $user);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				//setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
 			}
 			// End call triggers
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			//We finally remove the old thirdparty
-			if ($soc_origin->delete($soc_origin->id, $user) < 1)
-			{
-				$errors++;
+			if ($soc_origin->delete($soc_origin->id, $user) < 1) {
+				$error++;
 			}
 		}
 
 		// End of merge
 
-		if ($error)
-		{
+		if ($error) {
 			$this->db->rollback();
 
 			throw new RestException(500, 'Error failed to merged thirdparty '.$this->companytoremove->id.' into '.$id.'. Enable and read log file for more information.');
@@ -495,7 +489,7 @@ class Thirdparties extends DolibarrApi
 	 * @param int $id   Thirparty ID
 	 * @return integer
 	 */
-    public function delete($id)
+	public function delete($id)
 	{
 		if (!DolibarrApiAccess::$user->rights->societe->supprimer) {
 			throw new RestException(401);
@@ -507,9 +501,9 @@ class Thirdparties extends DolibarrApi
 		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-        $this->company->oldcopy = clone $this->company;
+		$this->company->oldcopy = clone $this->company;
 		return $this->company->delete($id);
-    }
+	}
 
 	/**
 	 * Set new price level for the given thirdparty
@@ -543,29 +537,29 @@ class Thirdparties extends DolibarrApi
 		}
 
 		if ($priceLevel < 1 || $priceLevel > $conf->global->PRODUIT_MULTIPRICES_LIMIT) {
-			throw new RestException(400, 'Price level must be between 1 and ' . $conf->global->PRODUIT_MULTIPRICES_LIMIT);
+			throw new RestException(400, 'Price level must be between 1 and '.$conf->global->PRODUIT_MULTIPRICES_LIMIT);
 		}
 
 		if (empty(DolibarrApiAccess::$user->rights->societe->creer)) {
-			throw new RestException(401, 'Access to thirdparty ' . $id . ' not allowed for login '. DolibarrApiAccess::$user->login);
+			throw new RestException(401, 'Access to thirdparty '.$id.' not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$result = $this->company->fetch($id);
 		if ($result < 0) {
-			throw new RestException(404, 'Thirdparty ' . $id . ' not found');
+			throw new RestException(404, 'Thirdparty '.$id.' not found');
 		}
 
 		if (empty($result)) {
-			throw new RestException(500, 'Error fetching thirdparty ' . $id, array_merge(array($this->company->error), $this->company->errors));
+			throw new RestException(500, 'Error fetching thirdparty '.$id, array_merge(array($this->company->error), $this->company->errors));
 		}
 
 		if (empty(DolibarrApi::_checkAccessToResource('societe', $this->company->id))) {
-			throw new RestException(401, 'Access to thirdparty ' . $id . ' not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(401, 'Access to thirdparty '.$id.' not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$result = $this->company->set_price_level($priceLevel, DolibarrApiAccess::$user);
 		if ($result <= 0) {
-			throw new RestException(500, 'Error setting new price level for thirdparty ' . $id, array($this->company->db->lasterror()));
+			throw new RestException(500, 'Error setting new price level for thirdparty '.$id, array($this->company->db->lasterror()));
 		}
 
 		return $this->_cleanObjectDatas($this->company);
@@ -584,7 +578,7 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url GET {id}/categories
 	 */
-    public function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
+	public function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
 	{
 		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
 			throw new RestException(401);
@@ -623,7 +617,7 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url POST {id}/categories/{category_id}
 	 */
-    public function addCategory($id, $category_id)
+	public function addCategory($id, $category_id)
 	{
 		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
@@ -661,7 +655,7 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url DELETE {id}/categories/{category_id}
 	 */
-    public function deleteCategory($id, $category_id)
+	public function deleteCategory($id, $category_id)
 	{
 		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
@@ -702,7 +696,7 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url GET {id}/supplier_categories
 	 */
-    public function getSupplierCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
+	public function getSupplierCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
 	{
 		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
 			throw new RestException(401);
@@ -741,7 +735,7 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url POST {id}/supplier_categories/{category_id}
 	 */
-    public function addSupplierCategory($id, $category_id)
+	public function addSupplierCategory($id, $category_id)
 	{
 		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
@@ -779,7 +773,7 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url DELETE {id}/supplier_categories/{category_id}
 	 */
-    public function deleteSupplierCategory($id, $category_id)
+	public function deleteSupplierCategory($id, $category_id)
 	{
 		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
@@ -822,10 +816,8 @@ class Thirdparties extends DolibarrApi
 	 * @throws RestException 401
 	 * @throws RestException 404
 	 */
-    public function getOutStandingProposals($id, $mode = 'customer')
+	public function getOutStandingProposals($id, $mode = 'customer')
 	{
-		$obj_ret = array();
-
 		if (!DolibarrApiAccess::$user->rights->societe->lire) {
 			throw new RestException(401);
 		}
@@ -866,10 +858,8 @@ class Thirdparties extends DolibarrApi
 	 * @throws RestException 401
 	 * @throws RestException 404
 	 */
-    public function getOutStandingOrder($id, $mode = 'customer')
+	public function getOutStandingOrder($id, $mode = 'customer')
 	{
-		$obj_ret = array();
-
 		if (!DolibarrApiAccess::$user->rights->societe->lire) {
 			throw new RestException(401);
 		}
@@ -909,10 +899,8 @@ class Thirdparties extends DolibarrApi
 	 * @throws RestException 401
 	 * @throws RestException 404
 	 */
-    public function getOutStandingInvoices($id, $mode = 'customer')
+	public function getOutStandingInvoices($id, $mode = 'customer')
 	{
-		$obj_ret = array();
-
 		if (!DolibarrApiAccess::$user->rights->societe->lire) {
 			throw new RestException(401);
 		}
@@ -952,10 +940,8 @@ class Thirdparties extends DolibarrApi
 	 * @throws RestException 401
 	 * @throws RestException 404
 	 */
-    public function getSalesRepresentatives($id, $mode = 0)
+	public function getSalesRepresentatives($id, $mode = 0)
 	{
-		$obj_ret = array();
-
 		if (!DolibarrApiAccess::$user->rights->societe->lire) {
 			throw new RestException(401);
 		}
@@ -995,7 +981,7 @@ class Thirdparties extends DolibarrApi
 	 * @throws RestException 404
 	 * @throws RestException 503
 	 */
-    public function getFixedAmountDiscounts($id, $filter = "none", $sortfield = "f.type", $sortorder = 'ASC')
+	public function getFixedAmountDiscounts($id, $filter = "none", $sortfield = "f.type", $sortorder = 'ASC')
 	{
 		$obj_ret = array();
 
@@ -1053,8 +1039,8 @@ class Thirdparties extends DolibarrApi
 	 * @throws RestException 404
 	 * @throws RestException 405
 	 */
-    public function getInvoicesQualifiedForReplacement($id)
-    {
+	public function getInvoicesQualifiedForReplacement($id)
+	{
 		if (!DolibarrApiAccess::$user->rights->facture->lire) {
 			throw new RestException(401);
 		}
@@ -1096,8 +1082,8 @@ class Thirdparties extends DolibarrApi
 	 * @throws RestException 404
 	 * @throws RestException 405
 	 */
-    public function getInvoicesQualifiedForCreditNote($id)
-    {
+	public function getInvoicesQualifiedForCreditNote($id)
+	{
 		if (!DolibarrApiAccess::$user->rights->facture->lire) {
 			throw new RestException(401);
 		}
@@ -1132,10 +1118,8 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url GET {id}/bankaccounts
 	 */
-    public function getCompanyBankAccount($id)
-    {
-		global $db, $conf;
-
+	public function getCompanyBankAccount($id)
+	{
 		if (!DolibarrApiAccess::$user->rights->facture->lire) {
 			throw new RestException(401);
 		}
@@ -1210,7 +1194,7 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url POST {id}/bankaccounts
 	 */
-    public function createCompanyBankAccount($id, $request_data = null)
+	public function createCompanyBankAccount($id, $request_data = null)
 	{
 		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
@@ -1253,7 +1237,7 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url PUT {id}/bankaccounts/{bankaccount_id}
 	 */
-    public function updateCompanyBankAccount($id, $bankaccount_id, $request_data = null)
+	public function updateCompanyBankAccount($id, $bankaccount_id, $request_data = null)
 	{
 		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
@@ -1297,8 +1281,8 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url DELETE {id}/bankaccounts/{bankaccount_id}
 	 */
-    public function deleteCompanyBankAccount($id, $bankaccount_id)
-    {
+	public function deleteCompanyBankAccount($id, $bankaccount_id)
+	{
 		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
@@ -1325,58 +1309,54 @@ class Thirdparties extends DolibarrApi
 	 */
 	public function generateBankAccountDocument($id, $companybankid = null, $model = 'sepamandate')
 	{
-		global $conf;
+		global $conf, $langs;
 
-		$this->langs->loadLangs(array("main", "dict", "commercial", "products", "companies", "banks", "bills", "withdrawals"));
+		$langs->loadLangs(array("main", "dict", "commercial", "products", "companies", "banks", "bills", "withdrawals"));
 
-		$this->company->fetch($id);
+		if ($this->company->fetch($id) <= 0) {
+			throw new RestException(404, 'Thirdparty not found');
+		}
 
-		$action = 'builddoc';
-		if (!DolibarrApiAccess::$user->rights->societe->creer)
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
+		}
 
 		$this->company->setDocModel(DolibarrApiAccess::$user, $model);
 
 		$this->company->fk_bank = $this->company->fk_account;
 
-		$outputlangs = $this->langs;
+		$outputlangs = $langs;
 		$newlang = '';
 
-		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->thirdparty->default_lang)) $newlang = $this->company->thirdparty->default_lang; // for proposal, order, invoice, ...
-		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->default_lang)) $newlang = $this->company->default_lang; // for thirdparty
+		//if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+		if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang)) {
+			if (isset($this->company->thirdparty->default_lang)) {
+				$newlang = $this->company->thirdparty->default_lang; // for proposal, order, invoice, ...
+			} elseif (isset($this->company->default_lang)) {
+				$newlang = $this->company->default_lang; // for thirdparty
+			}
+		}
 		if (!empty($newlang)) {
 			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang($newlang);
 		}
 
-		// To be sure vars is defined
-		$hidedetails = $hidedesc = $hideref = 0;
-		$moreparams = null;
-		if (empty($hidedetails)) $hidedetails = 0;
-		if (empty($hidedesc)) $hidedesc = 0;
-		if (empty($hideref)) $hideref = 0;
-		if (empty($moreparams)) $moreparams = null;
-
-
 		$sql = "SELECT rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib";
 		if ($id) $sql .= " WHERE fk_soc  = ".$id." ";
-		if ($companybankid) $sql .= " AND id = ".$companybankid."";
+		if ($companybankid) $sql .= " AND rowid = ".$companybankid."";
 
 		$i = 0;
 		$accounts = array();
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($result->num_rows == 0) {
+		if ($result) {
+			if ($this->db->num_rows($result) == 0) {
 				throw new RestException(404, 'Bank account not found');
 			}
 
 			$num = $this->db->num_rows($result);
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
 
 				$account = new CompanyBankAccount($this->db);
@@ -1386,27 +1366,24 @@ class Thirdparties extends DolibarrApi
 				$i++;
 			}
 		} else {
-			throw new RestException(404, 'Bank account not found');
+			throw new RestException(500, 'Sql error '.$this->db->lasterror());
 		}
 
 		$moreparams = array(
-			'use_companybankid'=>$accounts[0]->id,
-			'force_dir_output'=>$this->conf->societe->multidir_output[$this->company->entity].'/'.dol_sanitizeFileName($this->company->id)
+			'use_companybankid' => $accounts[0]->id,
+			'force_dir_output' => $conf->societe->multidir_output[$this->company->entity].'/'.dol_sanitizeFileName($this->company->id)
 		);
 
-		$result = 0;
+		$result = $this->company->generateDocument($model, $outputlangs, 0, 0, 0, $moreparams);
 
-		$result = $this->company->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
-
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			return array("success" => $result);
 		} else {
 			throw new RestException(500);
 		}
-    }
+	}
 
-    /**
+	/**
 	 * Get a specific gateway attached to a thirdparty (by specifying the site key)
 	 *
 	 * @param int $id ID of thirdparty
@@ -1418,10 +1395,8 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url GET {id}/gateways/
 	 */
-    public function getSocieteAccounts($id, $site = null)
-    {
-		global $db, $conf;
-
+	public function getSocieteAccounts($id, $site = null)
+	{
 		if (!DolibarrApiAccess::$user->rights->societe->lire) {
 			throw new RestException(401);
 		}
@@ -1439,7 +1414,7 @@ class Thirdparties extends DolibarrApi
 
 		$result = $this->db->query($sql);
 
-		if ($result->num_rows == 0) {
+		if ($result && $this->db->num_rows($result) == 0) {
 			throw new RestException(404, 'This thirdparty does not have any gateway attached or does not exist.');
 		}
 
@@ -1495,10 +1470,8 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url POST {id}/gateways
 	 */
-    public function createSocieteAccount($id, $request_data = null)
+	public function createSocieteAccount($id, $request_data = null)
 	{
-		global $db;
-
 		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
@@ -1510,7 +1483,7 @@ class Thirdparties extends DolibarrApi
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '".$this->db->escape($request_data['site'])."'";
 		$result = $this->db->query($sql);
 
-		if ($result->num_rows == 0) {
+		if ($result && $this->db->num_rows($result) == 0) {
 			$account = new SocieteAccount($this->db);
 			if (!isset($request_data['login'])) {
 				$account->login = "";
@@ -1554,10 +1527,8 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url PUT {id}/gateways/{site}
 	 */
-    public function putSocieteAccount($id, $site, $request_data = null)
+	public function putSocieteAccount($id, $site, $request_data = null)
 	{
-		global $db;
-
 		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
@@ -1566,7 +1537,7 @@ class Thirdparties extends DolibarrApi
 		$result = $this->db->query($sql);
 
 		// We do not found an existing SocieteAccount entity for this fk_soc and site ; we then create a new one.
-		if ($result->num_rows == 0) {
+		if ($result && $this->db->num_rows == 0) {
 			if (!isset($request_data['key_account'])) {
 				throw new RestException(422, 'Unprocessable Entity: You must pass the key_account attribute in your request data !');
 			}
@@ -1591,7 +1562,7 @@ class Thirdparties extends DolibarrApi
 				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '".$this->db->escape($request_data['site'])."' ";
 				$result = $this->db->query($sql);
 
-				if ($result->num_rows !== 0) {
+				if ($result && $this->db->num_rows($result) !== 0) {
 					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) from $site to ".$request_data['site']." but another SocieteAccount entity already exists with this site key.");
 				}
 			}
@@ -1637,10 +1608,8 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url PATCH {id}/gateways/{site}
 	 */
-    public function patchSocieteAccount($id, $site, $request_data = null)
+	public function patchSocieteAccount($id, $site, $request_data = null)
 	{
-		global $db;
-
 		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
@@ -1648,7 +1617,7 @@ class Thirdparties extends DolibarrApi
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id AND site = '$site' ";
 		$result = $this->db->query($sql);
 
-		if ($result->num_rows == 0) {
+		if ($result && $this->db->num_rows($result) == 0) {
 			throw new RestException(404, "This thirdparty does not have $site gateway attached or does not exist.");
 		} else {
 			// If the user tries to edit the site member, we check first if
@@ -1656,7 +1625,7 @@ class Thirdparties extends DolibarrApi
 				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '".$this->db->escape($request_data['site'])."' ";
 				$result = $this->db->query($sql);
 
-				if ($result->num_rows !== 0)
+				if ($result && $this->db->num_rows($result) !== 0)
 					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) site member from $site to ".$request_data['site']." but another SocieteAccount entity already exists for this thirdparty with this site key.");
 			}
 
@@ -1690,10 +1659,8 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url DELETE {id}/gateways/{site}
 	 */
-    public function deleteSocieteAccount($id, $site)
-    {
-		global $db;
-
+	public function deleteSocieteAccount($id, $site)
+	{
 		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
@@ -1701,7 +1668,7 @@ class Thirdparties extends DolibarrApi
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id AND site = '".$this->db->escape($site)."'";
 		$result = $this->db->query($sql);
 
-		if ($result->num_rows == 0) {
+		if ($result && $this->db->num_rows($result) == 0) {
 			throw new RestException(404);
 		} else {
 			$obj = $this->db->fetch_object($result);
@@ -1720,16 +1687,14 @@ class Thirdparties extends DolibarrApi
 	 * @param int $id ID of thirdparty
 	 *
 	 * @return void
-	 * @throws RestException(401) Unauthorized: User does not have permission to delete thirdparties gateways
-	 * @throws RestException(404) Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
-	 * @throws RestException(500) Internal Server Error: Error deleting SocieteAccount entity
+	 * @throws RestException 401 Unauthorized: User does not have permission to delete thirdparties gateways
+	 * @throws RestException 404 Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
+	 * @throws RestException 500 Internal Server Error: Error deleting SocieteAccount entity
 	 *
 	 * @url DELETE {id}/gateways
 	 */
-    public function deleteSocieteAccounts($id)
-    {
-		global $db;
-
+	public function deleteSocieteAccounts($id)
+	{
 		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
@@ -1743,7 +1708,7 @@ class Thirdparties extends DolibarrApi
 
 		$result = $this->db->query($sql);
 
-		if ($result->num_rows == 0) {
+		if ($result && $this->db->num_rows($result) == 0) {
 			throw new RestException(404, 'This third party does not have any gateway attached or does not exist.');
 		} else {
 			$i = 0;
@@ -1763,16 +1728,16 @@ class Thirdparties extends DolibarrApi
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * Clean sensible object datas
 	 *
-	 * @param   object  $object    Object to clean
-	 * @return    array    Array of cleaned object properties
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
 	 */
 	protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
+	{
+		// phpcs:enable
 		$object = parent::_cleanObjectDatas($object);
 
 		unset($object->nom); // ->name already defined and nom deprecated
@@ -1797,6 +1762,11 @@ class Thirdparties extends DolibarrApi
 
 		unset($object->fk_delivery_address); // deprecated feature
 
+		unset($object->skype);
+		unset($object->twitter);
+		unset($object->facebook);
+		unset($object->linkedin);
+
 		return $object;
 	}
 
@@ -1808,23 +1778,23 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @throws RestException
 	 */
-    private function _validate($data)
-    {
-        $thirdparty = array();
-        foreach (Thirdparties::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $thirdparty[$field] = $data[$field];
-        }
-        return $thirdparty;
-    }
+	private function _validate($data)
+	{
+		$thirdparty = array();
+		foreach (Thirdparties::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$thirdparty[$field] = $data[$field];
+		}
+		return $thirdparty;
+	}
 
-    /**
-     * Fetch properties of a thirdparty object.
-     *
-     * Return an array with thirdparty informations
-     *
-     * @param    int	$rowid      Id of third party to load
+	/**
+	 * Fetch properties of a thirdparty object.
+	 *
+	 * Return an array with thirdparty informations
+	 *
+	 * @param    int	$rowid      Id of third party to load
 	 * @param    string	$ref        Reference of third party, name (Warning, this can return several records)
 	 * @param    string	$ref_ext    External reference of third party (Warning, this information is a free field not provided by Dolibarr)
 	 * @param    string	$barcode    Barcode of third party to load
@@ -1836,39 +1806,42 @@ class Thirdparties extends DolibarrApi
 	 * @param    string	$idprof6		Prof id 6 of third party (Warning, this can return several records)
 	 * @param    string	$email   		Email of third party (Warning, this can return several records)
 	 * @param    string	$ref_alias  Name_alias of third party (Warning, this can return several records)
-     * @return array|mixed data without useless information
-     *
-     * @throws RestException
-    */
-    private function _fetch($rowid, $ref = '', $ref_ext = '', $barcode = '', $idprof1 = '', $idprof2 = '', $idprof3 = '', $idprof4 = '', $idprof5 = '', $idprof6 = '', $email = '', $ref_alias = '')
-    {
-        global $conf;
-        if (!DolibarrApiAccess::$user->rights->societe->lire) {
-            throw new RestException(401);
-        }
+	 * @return Object cleaned Societe object
+	 *
+	 * @throws RestException
+	 */
+	private function _fetch($rowid, $ref = '', $ref_ext = '', $barcode = '', $idprof1 = '', $idprof2 = '', $idprof3 = '', $idprof4 = '', $idprof5 = '', $idprof6 = '', $email = '', $ref_alias = '')
+	{
+		global $conf;
+		if (!DolibarrApiAccess::$user->rights->societe->lire) {
+			throw new RestException(401);
+		}
+		if ($rowid == 0) {
+			$result = $this->company->initAsSpecimen();
+		} else {
+			$result = $this->company->fetch($rowid, $ref, $ref_ext, $barcode, $idprof1, $idprof2, $idprof3, $idprof4, $idprof5, $idprof6, $email, $ref_alias);
+		}
+		if (!$result) {
+			throw new RestException(404, 'Thirdparty not found');
+		}
 
-        $result = $this->company->fetch($rowid, $ref, $ref_ext, $barcode, $idprof1, $idprof2, $idprof3, $idprof4, $idprof5, $idprof6, $email, $ref_alias);
-        if (!$result) {
-            throw new RestException(404, 'Thirdparty not found');
-        }
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+			$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+		} else {
+			$filterabsolutediscount = "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')";
+			$filtercreditnote = "fk_facture_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";
+		}
 
-        if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-            $filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-            $filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-        } else {
-            $filterabsolutediscount = "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')";
-            $filtercreditnote = "fk_facture_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";
-        }
+		$absolute_discount = $this->company->getAvailableDiscounts('', $filterabsolutediscount);
+		$absolute_creditnote = $this->company->getAvailableDiscounts('', $filtercreditnote);
+		$this->company->absolute_discount = price2num($absolute_discount, 'MT');
+		$this->company->absolute_creditnote = price2num($absolute_creditnote, 'MT');
 
-        $absolute_discount = $this->company->getAvailableDiscounts('', $filterabsolutediscount);
-        $absolute_creditnote = $this->company->getAvailableDiscounts('', $filtercreditnote);
-        $this->company->absolute_discount = price2num($absolute_discount, 'MT');
-        $this->company->absolute_creditnote = price2num($absolute_creditnote, 'MT');
-
-        return $this->_cleanObjectDatas($this->company);
-    }
+		return $this->_cleanObjectDatas($this->company);
+	}
 }
diff --git a/htdocs/societe/class/client.class.php b/htdocs/societe/class/client.class.php
index f3cdd3c805b..f88027b1491 100644
--- a/htdocs/societe/class/client.class.php
+++ b/htdocs/societe/class/client.class.php
@@ -30,66 +30,66 @@ include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
  */
 class Client extends Societe
 {
-    public $next_prev_filter = "te.client in (1,2,3)"; // Used to add a filter in Form::showrefnav method
+	public $next_prev_filter = "te.client in (1,2,3)"; // Used to add a filter in Form::showrefnav method
 
-    public $cacheprospectstatus = array();
+	public $cacheprospectstatus = array();
 
 
 	/**
-     *  Constructor
-     *
-     *  @param	DoliDB	$db		Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
+	 *  Constructor
+	 *
+	 *  @param	DoliDB	$db		Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-        $this->client = 3;
-        $this->fournisseur = 0;
-    }
+		$this->client = 3;
+		$this->fournisseur = 0;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Load indicators into this->nb for board
-     *
-     *  @return     int         <0 if KO, >0 if OK
-     */
-    public function load_state_board()
-    {
-        // phpcs:enable
-        global $user;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Load indicators into this->nb for board
+	 *
+	 *  @return     int         <0 if KO, >0 if OK
+	 */
+	public function load_state_board()
+	{
+		// phpcs:enable
+		global $user;
 
-        $this->nb = array("prospects" => 0, "customers" => 0);
-        $clause = "WHERE";
+		$this->nb = array("prospects" => 0, "customers" => 0);
+		$clause = "WHERE";
 
-        $sql = "SELECT count(s.rowid) as nb, s.client";
-        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-        if (!$user->rights->societe->client->voir && !$user->socid)
-        {
-        	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
-        	$sql .= " WHERE sc.fk_user = ".$user->id;
-        	$clause = "AND";
-        }
-        $sql .= " ".$clause." s.client IN (1,2,3)";
-        $sql .= ' AND s.entity IN ('.getEntity($this->element).')';
-        $sql .= " GROUP BY s.client";
+		$sql = "SELECT count(s.rowid) as nb, s.client";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$user->socid)
+		{
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+			$sql .= " WHERE sc.fk_user = ".$user->id;
+			$clause = "AND";
+		}
+		$sql .= " ".$clause." s.client IN (1,2,3)";
+		$sql .= ' AND s.entity IN ('.getEntity($this->element).')';
+		$sql .= " GROUP BY s.client";
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            while ($obj = $this->db->fetch_object($resql))
-            {
-                if ($obj->client == 1 || $obj->client == 3) $this->nb["customers"] += $obj->nb;
-                if ($obj->client == 2 || $obj->client == 3) $this->nb["prospects"] += $obj->nb;
-            }
-            $this->db->free($resql);
-            return 1;
-        } else {
-            dol_print_error($this->db);
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				if ($obj->client == 1 || $obj->client == 3) $this->nb["customers"] += $obj->nb;
+				if ($obj->client == 2 || $obj->client == 3) $this->nb["prospects"] += $obj->nb;
+			}
+			$this->db->free($resql);
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
 	/**
 	 *  Load array of prospect status
@@ -97,20 +97,20 @@ class Client extends Societe
 	 *  @param	int		$active     1=Active only, 0=Not active only, -1=All
 	 *  @return int					<0 if KO, >0 if OK
 	 */
-    public function loadCacheOfProspStatus($active = 1)
-    {
-    	global $langs;
+	public function loadCacheOfProspStatus($active = 1)
+	{
+		global $langs;
 
-   		$sql="SELECT id, code, libelle as label, picto FROM ".MAIN_DB_PREFIX."c_stcomm";
+   		$sql = "SELECT id, code, libelle as label, picto FROM ".MAIN_DB_PREFIX."c_stcomm";
    		if ($active >= 0) $sql .= " WHERE active = ".$active;
 		$resql = $this->db->query($sql);
 		$num = $this->db->num_rows($resql);
 		$i = 0;
 		while ($i < $num) {
 			$obj = $this->db->fetch_object($resql);
-			$this->cacheprospectstatus[$obj->id] = array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>($langs->trans("ST_".strtoupper($obj->code))=="ST_".strtoupper($obj->code))?$obj->label:$langs->trans("ST_".strtoupper($obj->code)), 'picto'=>$obj->picto);
+			$this->cacheprospectstatus[$obj->id] = array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>($langs->trans("ST_".strtoupper($obj->code)) == "ST_".strtoupper($obj->code)) ? $obj->label : $langs->trans("ST_".strtoupper($obj->code)), 'picto'=>$obj->picto);
 			$i++;
 		}
 		return 1;
-    }
+	}
 }
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 283c32573e0..a123fa749c9 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -41,18 +41,18 @@ class CompanyBankAccount extends Account
 	public $date_rum;
 
 	/**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
 	/**
-     * Date modification record (tms)
-     *
-     * @var integer
-     */
-    public $datem;
+	 * Date modification record (tms)
+	 *
+	 * @var integer
+	 */
+	public $datem;
 
 
 	/**
@@ -78,7 +78,7 @@ class CompanyBankAccount extends Account
 	 * @param   int    $notrigger   1=Disable triggers
 	 * @return	int					<0 if KO, >= 0 if OK
 	 */
-    public function create(User $user = null, $notrigger = 0)
+	public function create(User $user = null, $notrigger = 0)
 	{
 		$now	= dol_now();
 		$error = 0;
@@ -131,7 +131,7 @@ class CompanyBankAccount extends Account
 	 *  @param  int     $notrigger   1=Disable triggers
 	 *	@return	int				     <=0 if KO, >0 if OK
 	 */
-    public function update(User $user = null, $notrigger = 0)
+	public function update(User $user = null, $notrigger = 0)
 	{
 		global $conf;
 		$error = 0;
@@ -197,7 +197,7 @@ class CompanyBankAccount extends Account
 	 *  @param	int		$type		If id of company filled, we say if we want record of this type only
 	 * 	@return	int					<0 if KO, >0 if OK
 	 */
-    public function fetch($id, $socid = 0, $default = 1, $type = 'ban')
+	public function fetch($id, $socid = 0, $default = 1, $type = 'ban')
 	{
 		if (empty($id) && empty($socid)) return -1;
 
@@ -258,7 +258,7 @@ class CompanyBankAccount extends Account
 	 *	@param  	int		$notrigger	1=Disable triggers
 	 *  @return		int		            <0 if KO, >0 if OK
 	 */
-    public function delete(User $user = null, $notrigger = 0)
+	public function delete(User $user = null, $notrigger = 0)
 	{
 		global $conf;
 
@@ -325,7 +325,7 @@ class CompanyBankAccount extends Account
 	 * @param   int     $rib    RIB id
 	 * @return  int             0 if KO, 1 if OK
 	 */
-    public function setAsDefault($rib = 0)
+	public function setAsDefault($rib = 0)
 	{
 		$sql1 = "SELECT rowid as id, fk_soc  FROM ".MAIN_DB_PREFIX."societe_rib";
 		$sql1 .= " WHERE rowid = ".($rib ? $rib : $this->id);
@@ -375,7 +375,7 @@ class CompanyBankAccount extends Account
 	 *
 	 *  @return	void
 	 */
-    public function initAsSpecimen()
+	public function initAsSpecimen()
 	{
 		$this->specimen        = 1;
 		$this->ref             = 'CBA';
diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php
index 93f0d13b498..e88ea0e4f7c 100644
--- a/htdocs/societe/class/companypaymentmode.class.php
+++ b/htdocs/societe/class/companypaymentmode.class.php
@@ -133,12 +133,12 @@ class CompanyPaymentMode extends CommonObject
 	/**
 	 * @var int Thirdparty ID
 	 */
-    public $fk_soc;
+	public $fk_soc;
 
 	/**
-     * @var string company payment mode label
-     */
-    public $label;
+	 * @var string company payment mode label
+	 */
+	public $label;
 
 	public $bank;
 	public $code_banque;
@@ -178,18 +178,18 @@ class CompanyPaymentMode extends CommonObject
 	public $ending_date;
 
 	/**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
 	/**
-     * Date modification record (tms)
-     *
-     * @var integer
-     */
-    public $tms;
+	 * Date modification record (tms)
+	 *
+	 * @var integer
+	 */
+	public $tms;
 
 	public $import_key;
 	// END MODULEBUILDER PROPERTIES
@@ -199,19 +199,19 @@ class CompanyPaymentMode extends CommonObject
 	// If this object has a subtable with lines
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	//public $table_element_line = 'companypaymentmodedet';
 	/**
-	 * @var int    Field with ID of parent key if this field has a parent
+	 * @var string    Field with ID of parent key if this field has a parent
 	 */
 	//public $fk_element = 'fk_companypaymentmode';
 	/**
-	 * @var int    Name of subtable class that manage subtable lines
+	 * @var string    Name of subtable class that manage subtable lines
 	 */
 	//public $class_element_line = 'CompanyPaymentModeline';
 	/**
-     * @var array	List of child tables. To test if we can delete object.
+	 * @var array	List of child tables. To test if we can delete object.
 	 */
 	//protected $childtables=array();
 	/**
@@ -260,45 +260,45 @@ class CompanyPaymentMode extends CommonObject
 	public function createFromClone(User $user, $fromid)
 	{
 		global $hookmanager, $langs;
-	    $error = 0;
+		$error = 0;
 
-	    dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
-	    $object = new self($this->db);
+		$object = new self($this->db);
 
-	    $this->db->begin();
+		$this->db->begin();
 
-	    // Load source object
-	    $object->fetchCommon($fromid);
-	    // Reset some properties
-	    unset($object->id);
-	    unset($object->fk_user_creat);
-	    unset($object->import_key);
+		// Load source object
+		$object->fetchCommon($fromid);
+		// Reset some properties
+		unset($object->id);
+		unset($object->fk_user_creat);
+		unset($object->import_key);
 
-	    // Clear fields
-	    $object->ref = "copy_of_".$object->ref;
-	    $object->title = $langs->trans("CopyOf")." ".$object->title;
-	    // ...
+		// Clear fields
+		$object->ref = "copy_of_".$object->ref;
+		$object->title = $langs->trans("CopyOf")." ".$object->title;
+		// ...
 
-	    // Create clone
+		// Create clone
 		$object->context['createfromclone'] = 'createfromclone';
-	    $result = $object->createCommon($user);
-	    if ($result < 0) {
-	        $error++;
-	        $this->error = $object->error;
-	        $this->errors = $object->errors;
-	    }
+		$result = $object->createCommon($user);
+		if ($result < 0) {
+			$error++;
+			$this->error = $object->error;
+			$this->errors = $object->errors;
+		}
 
-	    unset($object->context['createfromclone']);
+		unset($object->context['createfromclone']);
 
-	    // End
-	    if (!$error) {
-	        $this->db->commit();
-	        return $object;
-	    } else {
-	        $this->db->rollback();
-	        return -1;
-	    }
+		// End
+		if (!$error) {
+			$this->db->commit();
+			return $object;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
 	}
 
 	/**
@@ -364,47 +364,47 @@ class CompanyPaymentMode extends CommonObject
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option						On what the link point to ('nolink', ...)
-     *  @param	int  	$notooltip					1=Disable tooltip
-     *  @param  string  $morecss            		Add more css on link
-     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param	int  	$notooltip					1=Disable tooltip
+	 *  @param  string  $morecss            		Add more css on link
+	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string								String with URL
 	 */
-    public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
 	{
 		global $db, $conf, $langs;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
+		global $dolibarr_main_authentication, $dolibarr_main_demo;
+		global $menumanager;
 
-        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-        $result = '';
-        $companylink = '';
+		$result = '';
+		$companylink = '';
 
-        $label = '<u>'.$langs->trans("CompanyPaymentMode").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label = '<u>'.$langs->trans("CompanyPaymentMode").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-        $url = dol_buildpath('/monmodule/companypaymentmode_card.php', 1).'?id='.$this->id;
+		$url = dol_buildpath('/monmodule/companypaymentmode_card.php', 1).'?id='.$this->id;
 
-        if ($option != 'nolink')
-        {
-	        // Add param to save lastsearch_values or not
-	        $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-	        if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-	        if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option != 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label = $langs->trans("ShowCompanyPaymentMode");
-                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowCompanyPaymentMode");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -426,7 +426,7 @@ class CompanyPaymentMode extends CommonObject
 	 * @param	string	$alltypes	1=The default is for all payment types instead of per type
 	 * @return  int             	0 if KO, 1 if OK
 	 */
-    public function setAsDefault($id = 0, $alltypes = 0)
+	public function setAsDefault($id = 0, $alltypes = 0)
 	{
 		$sql1 = "SELECT rowid as id, fk_soc, type FROM ".MAIN_DB_PREFIX."societe_rib";
 		$sql1 .= " WHERE rowid = ".($id ? $id : $this->id);
@@ -480,12 +480,12 @@ class CompanyPaymentMode extends CommonObject
 	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
 	 *  @return	string 			       Label of status
 	 */
-    public function getLibStatut($mode = 0)
+	public function getLibStatut($mode = 0)
 	{
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return the status
 	 *
@@ -518,7 +518,7 @@ class CompanyPaymentMode extends CommonObject
 	 *	@param  int		$id       Id of object
 	 *	@return	void
 	 */
-    public function info($id)
+	public function info($id)
 	{
 		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
 		$sql .= ' fk_user_creat, fk_user_modif';
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index a8b2caa59c1..f18a6e1b9a8 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -59,13 +59,13 @@ class Societe extends CommonObject
 	public $table_element = 'societe';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent or for child tables
+	 * @var string Field with ID of parent key if this field has a parent or for child tables
 	 */
 	public $fk_element = 'fk_soc';
 
-    /**
-     * @var string Fields for combobox
-     */
+	/**
+	 * @var string Fields for combobox
+	 */
 	public $fieldsforcombobox = 'nom,name_alias';
 
 	/**
@@ -161,8 +161,8 @@ class Societe extends CommonObject
 		'instagram' =>array('type'=>'varchar(255)', 'label'=>'Instagram', 'enabled'=>1, 'visible'=>-1, 'position'=>155),
 		'facebook' =>array('type'=>'varchar(255)', 'label'=>'Facebook', 'enabled'=>1, 'visible'=>-1, 'position'=>160),
 		'twitter' =>array('type'=>'varchar(255)', 'label'=>'Twitter', 'enabled'=>1, 'visible'=>-1, 'position'=>165),*/
-		'fk_effectif' =>array('type'=>'integer', 'label'=>'Fk effectif', 'enabled'=>1, 'visible'=>-1, 'position'=>170),
-		'fk_typent' =>array('type'=>'integer', 'label'=>'Fk typent', 'enabled'=>1, 'visible'=>-1, 'position'=>175),
+		'fk_effectif' =>array('type'=>'integer', 'label'=>'Workforce', 'enabled'=>1, 'visible'=>-1, 'position'=>170),
+		'fk_typent' =>array('type'=>'integer', 'label'=>'TypeOfCompany', 'enabled'=>1, 'visible'=>-1, 'position'=>175),
 		'fk_forme_juridique' =>array('type'=>'integer', 'label'=>'JuridicalStatus', 'enabled'=>1, 'visible'=>-1, 'position'=>180),
 		'fk_currency' =>array('type'=>'varchar(3)', 'label'=>'Currency', 'enabled'=>1, 'visible'=>-1, 'position'=>185),
 		'siren' =>array('type'=>'varchar(128)', 'label'=>'Idprof1', 'enabled'=>1, 'visible'=>-1, 'position'=>190),
@@ -173,7 +173,7 @@ class Societe extends CommonObject
 		'idprof6' =>array('type'=>'varchar(128)', 'label'=>'Idprof6', 'enabled'=>1, 'visible'=>-1, 'position'=>207),
 		'tva_intra' =>array('type'=>'varchar(20)', 'label'=>'Tva intra', 'enabled'=>1, 'visible'=>-1, 'position'=>210),
 		'capital' =>array('type'=>'double(24,8)', 'label'=>'Capital', 'enabled'=>1, 'visible'=>-1, 'position'=>215),
-		'fk_stcomm' =>array('type'=>'integer', 'label'=>'Fk stcomm', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>220),
+		'fk_stcomm' =>array('type'=>'integer', 'label'=>'CommercialStatus', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>220),
 		'note_private' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>225),
 		'note_public' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>230),
 		'prefix_comm' =>array('type'=>'varchar(5)', 'label'=>'Prefix comm', 'enabled'=>'$conf->global->SOCIETE_USEPREFIX', 'visible'=>-1, 'position'=>235),
@@ -245,9 +245,9 @@ class Societe extends CommonObject
 	 */
 	public $name_alias;
 
-    /**
-     * @var int Physical thirdparty not a company
-     */
+	/**
+	 * @var int Physical thirdparty not a company
+	 */
 	public $particulier;
 
 	/**
@@ -255,14 +255,14 @@ class Societe extends CommonObject
 	 */
 	public $address;
 
-    /**
-     * @var string Zip code of thirdparty
-     */
+	/**
+	 * @var string Zip code of thirdparty
+	 */
 	public $zip;
 
-    /**
-     * @var string Town of thirdparty
-     */
+	/**
+	 * @var string Town of thirdparty
+	 */
 	public $town;
 
 	/**
@@ -277,14 +277,14 @@ class Societe extends CommonObject
 	 */
 	public $state_id;
 
-    /**
-     * @var string State code
-     */
+	/**
+	 * @var string State code
+	 */
 	public $state_code;
 
-    /**
-     * @var string State name
-     */
+	/**
+	 * @var string State name
+	 */
 	public $state;
 
 	/**
@@ -293,9 +293,9 @@ class Societe extends CommonObject
 	 */
 	public $region_code;
 
-    /**
-     * @var string Region name
-     */
+	/**
+	 * @var string Region name
+	 */
 	public $region;
 
 	/**
@@ -335,10 +335,10 @@ class Societe extends CommonObject
 	 */
 	public $email;
 
-    /**
-     * @var array array of socialnetworks
-     */
-    public $socialnetworks;
+	/**
+	 * @var array array of socialnetworks
+	 */
+	public $socialnetworks;
 
 	/**
 	 * Skype username
@@ -361,11 +361,11 @@ class Societe extends CommonObject
 	 */
 	public $facebook;
 
-    /**
-     * LinkedIn username
-     * @var string
+	/**
+	 * LinkedIn username
+	 * @var string
 	 * @deprecated
-     */
+	 */
 	public $linkedin;
 
 	/**
@@ -418,9 +418,9 @@ class Societe extends CommonObject
 	 */
 	public $idprof6;
 
-    /**
-     * @var string Prefix comm
-     */
+	/**
+	 * @var string Prefix comm
+	 */
 	public $prefix_comm;
 
 	/**
@@ -440,14 +440,14 @@ class Societe extends CommonObject
 	public $localtax2_assuj;
 	public $localtax2_value;
 
-    /**
-     * @var string Manager
-     */
+	/**
+	 * @var string Manager
+	 */
 	public $managers;
 
-    /**
-     * @var float Capital
-     */
+	/**
+	 * @var float Capital
+	 */
 	public $capital;
 
 	/**
@@ -464,10 +464,11 @@ class Societe extends CommonObject
 	public $remise_supplier_percent;
 	public $mode_reglement_supplier_id;
 	public $cond_reglement_supplier_id;
+	public $transport_mode_supplier_id;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_prospectlevel;
 
 	/**
@@ -500,9 +501,6 @@ class Societe extends CommonObject
 	 */
 	public $user_creation;
 
-
-	public $specimen;
-
 	/**
 	 * 0=no customer, 1=customer, 2=prospect, 3=customer and prospect
 	 * @var int
@@ -539,11 +537,11 @@ class Societe extends CommonObject
 	 */
 	public $code_compta;
 
-    /**
-     * Accounting code for client
-     * @var string
-     */
-    public $code_compta_client;
+	/**
+	 * Accounting code for client
+	 * @var string
+	 */
+	public $code_compta_client;
 
 	/**
 	 * Accounting code for suppliers
@@ -604,9 +602,9 @@ class Societe extends CommonObject
 	 */
 	public $order_min_amount;
 
-    /**
-     * @var string Supplier min order amount
-     */
+	/**
+	 * @var string Supplier min order amount
+	 */
 	public $supplier_order_min_amount;
 
 	/**
@@ -665,46 +663,46 @@ class Societe extends CommonObject
 	 */
 	public $webservices_key;
 
-    /**
-     * @var string Logo
-     */
+	/**
+	 * @var string Logo
+	 */
 	public $logo;
 
-    /**
-     * @var string logo small
-     */
+	/**
+	 * @var string logo small
+	 */
 	public $logo_small;
 
-    /**
-     * @var string Logo mini
-     */
+	/**
+	 * @var string Logo mini
+	 */
 	public $logo_mini;
 
-    /**
-     * @var string Logo squarred
-     */
+	/**
+	 * @var string Logo squarred
+	 */
 	public $logo_squarred;
 
-    /**
-     * @var string Logo squarred small
-     */
+	/**
+	 * @var string Logo squarred small
+	 */
 	public $logo_squarred_small;
 
-    /**
-     * @var string Logo squarred mini
-     */
+	/**
+	 * @var string Logo squarred mini
+	 */
 	public $logo_squarred_mini;
 
 
 	// Multicurrency
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_multicurrency;
 
-    /**
-     * @var string Multicurrency code
-     */
+	/**
+	 * @var string Multicurrency code
+	 */
 	public $multicurrency_code;
 
 
@@ -763,7 +761,7 @@ class Societe extends CommonObject
 		$this->tva_assuj = 1;
 		$this->status = 1;
 
-		if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {
+		if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
 			$this->fields['address']['showoncombobox'] = $conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST;
 			$this->fields['zip']['showoncombobox'] = $conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST;
 			$this->fields['town']['showoncombobox'] = $conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST;
@@ -779,7 +777,7 @@ class Societe extends CommonObject
 	 *    @param	User	$user       Object of user that ask creation
 	 *    @return   int         		>=0 if OK, <0 if KO
 	 */
-    public function create(User $user)
+	public function create(User $user)
 	{
 		global $langs, $conf, $mysoc;
 
@@ -788,8 +786,7 @@ class Societe extends CommonObject
 		// Clean parameters
 		if (empty($this->status)) $this->status = 0;
 		$this->name = $this->name ?trim($this->name) : trim($this->nom);
-		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name = ucwords($this->name);
-		if (!empty($conf->global->MAIN_ALL_TO_UPPER)) $this->name = strtoupper($this->name);
+		$this->setUpperOrLowerCase();
 		$this->nom = $this->name; // For backward compatibility
 		if (empty($this->client))      $this->client = 0;
 		if (empty($this->fournisseur)) $this->fournisseur = 0;
@@ -890,16 +887,16 @@ class Societe extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Create a contact/address from thirdparty
 	 *
 	 * @param 	User	$user		Object user
 	 * @return 	int					<0 if KO, >0 if OK
 	 */
-    public function create_individual(User $user)
+	public function create_individual(User $user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 		$contact = new Contact($this->db);
 
@@ -935,7 +932,7 @@ class Societe extends CommonObject
 	 *
 	 *    @return     int		0 if OK, <0 if KO
 	 */
-    public function verify()
+	public function verify()
 	{
 		global $conf, $langs, $mysoc;
 
@@ -1079,7 +1076,7 @@ class Societe extends CommonObject
 	 *		@param	int		$nosyncmember				Do not synchronize info of linked member
 	 *      @return int  			           			<0 if KO, >=0 if OK
 	 */
-    public function update($id, $user = '', $call_trigger = 1, $allowmodcodeclient = 0, $allowmodcodefournisseur = 0, $action = 'update', $nosyncmember = 1)
+	public function update($id, $user = '', $call_trigger = 1, $allowmodcodeclient = 0, $allowmodcodefournisseur = 0, $action = 'update', $nosyncmember = 1)
 	{
 		global $langs, $conf, $hookmanager;
 
@@ -1093,8 +1090,6 @@ class Societe extends CommonObject
 
 		$now = dol_now();
 
-		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name = ucwords($this->name);
-		if (!empty($conf->global->MAIN_ALL_TO_UPPER)) $this->name = strtoupper($this->name);
 		// Clean parameters
 		$this->id = $id;
 		$this->entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
@@ -1104,7 +1099,8 @@ class Societe extends CommonObject
 		$this->ref_ext		= trim($this->ref_ext);
 		$this->address		= $this->address ?trim($this->address) : trim($this->address);
 		$this->zip = $this->zip ?trim($this->zip) : trim($this->zip);
-		$this->town			= $this->town ?trim($this->town) : trim($this->town);
+		$this->town = $this->town ?trim($this->town) : trim($this->town);
+		$this->setUpperOrLowerCase();
 		$this->state_id = trim($this->state_id);
 		$this->country_id = ($this->country_id > 0) ? $this->country_id : 0;
 		$this->phone		= trim($this->phone);
@@ -1253,8 +1249,8 @@ class Societe extends CommonObject
 
 			$sql .= ",phone = ".(!empty($this->phone) ? "'".$this->db->escape($this->phone)."'" : "null");
 			$sql .= ",fax = ".(!empty($this->fax) ? "'".$this->db->escape($this->fax)."'" : "null");
-            $sql .= ",email = ".(!empty($this->email) ? "'".$this->db->escape($this->email)."'" : "null");
-            $sql .= ", socialnetworks = '".$this->db->escape(json_encode($this->socialnetworks))."'";
+			$sql .= ",email = ".(!empty($this->email) ? "'".$this->db->escape($this->email)."'" : "null");
+			$sql .= ", socialnetworks = '".$this->db->escape(json_encode($this->socialnetworks))."'";
 			$sql .= ",url = ".(!empty($this->url) ? "'".$this->db->escape($this->url)."'" : "null");
 
 			$sql .= ",parent = ".($this->parent > 0 ? $this->parent : "null");
@@ -1307,8 +1303,10 @@ class Societe extends CommonObject
 
 			$sql .= ",mode_reglement = ".(!empty($this->mode_reglement_id) ? "'".$this->db->escape($this->mode_reglement_id)."'" : "null");
 			$sql .= ",cond_reglement = ".(!empty($this->cond_reglement_id) ? "'".$this->db->escape($this->cond_reglement_id)."'" : "null");
+			$sql .= ",transport_mode = ".(!empty($this->transport_mode_id) ? "'".$this->db->escape($this->transport_mode_id)."'" : "null");
 			$sql .= ",mode_reglement_supplier = ".(!empty($this->mode_reglement_supplier_id) ? "'".$this->db->escape($this->mode_reglement_supplier_id)."'" : "null");
 			$sql .= ",cond_reglement_supplier = ".(!empty($this->cond_reglement_supplier_id) ? "'".$this->db->escape($this->cond_reglement_supplier_id)."'" : "null");
+			$sql .= ",transport_mode_supplier = ".(!empty($this->transport_mode_supplier_id) ? "'".$this->db->escape($this->transport_mode_supplier_id)."'" : "null");
 			$sql .= ",fk_shipping_method = ".(!empty($this->shipping_method_id) ? "'".$this->db->escape($this->shipping_method_id)."'" : "null");
 
 			$sql .= ",client = ".(!empty($this->client) ? $this->client : 0);
@@ -1508,8 +1506,10 @@ class Societe extends CommonObject
 		$sql .= ', s.fk_forme_juridique as forme_juridique_code';
 		$sql .= ', s.webservices_url, s.webservices_key';
 		$sql .= ', s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur, s.parent, s.barcode';
-		$sql .= ', s.fk_departement as state_id, s.fk_pays as country_id, s.fk_stcomm, s.remise_supplier, s.mode_reglement, s.cond_reglement, s.fk_account, s.tva_assuj';
-		$sql .= ', s.mode_reglement_supplier, s.cond_reglement_supplier, s.localtax1_assuj, s.localtax1_value, s.localtax2_assuj, s.localtax2_value, s.fk_prospectlevel, s.default_lang, s.logo, s.logo_squarred';
+		$sql .= ', s.fk_departement as state_id, s.fk_pays as country_id, s.fk_stcomm, s.remise_supplier, s.mode_reglement, s.cond_reglement, s.transport_mode';
+		$sql .= ', s.fk_account, s.tva_assuj';
+		$sql .= ', s.mode_reglement_supplier, s.cond_reglement_supplier, s.transport_mode_supplier';
+		$sql .= ', s.localtax1_assuj, s.localtax1_value, s.localtax2_assuj, s.localtax2_value, s.fk_prospectlevel, s.default_lang, s.logo, s.logo_squarred';
 		$sql .= ', s.fk_shipping_method';
 		$sql .= ', s.outstanding_limit, s.import_key, s.canvas, s.fk_incoterms, s.location_incoterms';
 		$sql .= ', s.order_min_amount, s.supplier_order_min_amount';
@@ -1590,9 +1590,9 @@ class Societe extends CommonObject
 				$label = ($transcode != 'StatusProspect'.$obj->fk_stcomm ? $transcode : $obj->stcomm);
 				$this->stcomm_id = $obj->fk_stcomm; // id status prospect
 				$this->status_prospect_label = $label; // label status prospect
-				$this->stcomm_picto = $obj->stcomm_picto;     // picto statut commercial
+				$this->stcomm_picto = $obj->stcomm_picto; // picto statut commercial
 
-                $this->email = $obj->email;
+				$this->email = $obj->email;
 				$this->socialnetworks = (array) json_decode($obj->socialnetworks, true);
 
 				$this->url = $obj->url;
@@ -1646,19 +1646,21 @@ class Societe extends CommonObject
 				$this->remise_supplier_percent = $obj->remise_supplier;
 				$this->mode_reglement_id 	= $obj->mode_reglement;
 				$this->cond_reglement_id 	= $obj->cond_reglement;
+				$this->transport_mode_id 	= $obj->transport_mode;
 				$this->mode_reglement_supplier_id 	= $obj->mode_reglement_supplier;
 				$this->cond_reglement_supplier_id 	= $obj->cond_reglement_supplier;
+				$this->transport_mode_supplier_id = $obj->transport_mode_supplier;
 				$this->shipping_method_id = ($obj->fk_shipping_method > 0) ? $obj->fk_shipping_method : null;
 				$this->fk_account = $obj->fk_account;
 
-				$this->client      = $obj->client;
+				$this->client = $obj->client;
 				$this->fournisseur = $obj->fournisseur;
 
 				$this->note = $obj->note_private; // TODO Deprecated for backward comtability
 				$this->note_private = $obj->note_private;
 				$this->note_public = $obj->note_public;
 				$this->model_pdf = $obj->model_pdf;
-				$this->modelpdf = $obj->model_pdf;
+				$this->modelpdf = $obj->model_pdf; // deprecated
 				$this->default_lang = $obj->default_lang;
 				$this->logo = $obj->logo;
 				$this->logo_squarred = $obj->logo_squarred;
@@ -1713,7 +1715,7 @@ class Societe extends CommonObject
 	 *    @param    int		$call_trigger   0=No, 1=yes
 	 *    @return	int						<0 if KO, 0 if nothing done, >0 if OK
 	 */
-    public function delete($id, User $fuser = null, $call_trigger = 1)
+	public function delete($id, User $fuser = null, $call_trigger = 1)
 	{
 		global $langs, $conf, $user;
 
@@ -1771,11 +1773,11 @@ class Societe extends CommonObject
 			{
 				foreach ($this->childtablesoncascade as $tabletodelete)
 				{
-					$deleteFromObject=explode(':', $tabletodelete);
-					if (count($deleteFromObject)>=2) {
-						$className=str_replace('@', '', $deleteFromObject[0]);
-						$filepath=$deleteFromObject[1];
-						$columnName=$deleteFromObject[2];
+					$deleteFromObject = explode(':', $tabletodelete);
+					if (count($deleteFromObject) >= 2) {
+						$className = str_replace('@', '', $deleteFromObject[0]);
+						$filepath = $deleteFromObject[1];
+						$columnName = $deleteFromObject[2];
 						if (dol_include_once($filepath)) {
 							$child_object = new $className($this->db);
 							$result = $child_object->deleteByParentField($id, $columnName);
@@ -1786,12 +1788,12 @@ class Societe extends CommonObject
 							}
 						} else {
 							$error++;
-							$this->errors[] = 'Cannot include child class file ' .$filepath;
+							$this->errors[] = 'Cannot include child class file '.$filepath;
 							break;
 						}
 					} else {
-						$sql = "DELETE FROM " . MAIN_DB_PREFIX . $tabletodelete;
-						$sql .= " WHERE fk_soc = " . $id;
+						$sql = "DELETE FROM ".MAIN_DB_PREFIX.$tabletodelete;
+						$sql .= " WHERE fk_soc = ".$id;
 						if (!$this->db->query($sql)) {
 							$error++;
 							$this->errors[] = $this->db->lasterror();
@@ -1861,15 +1863,15 @@ class Societe extends CommonObject
 		return 0;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Define third party as a customer
 	 *
 	 *	@return		int		<0 if KO, >0 if OK
 	 */
-    public function set_as_client()
+	public function set_as_client()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if ($this->id)
 		{
 			$newclient = 1;
@@ -1897,9 +1899,9 @@ class Societe extends CommonObject
 	 *  @param  User	$user		User who sets the discount
 	 *	@return	int					<0 if KO, >0 if OK
 	 */
-    public function set_remise_client($remise, $note, User $user)
+	public function set_remise_client($remise, $note, User $user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		// Parameter cleaning
@@ -1960,9 +1962,9 @@ class Societe extends CommonObject
 	 *  @param  User	$user		User who sets the discount
 	 *	@return	int					<0 if KO, >0 if OK
 	 */
-    public function set_remise_supplier($remise, $note, User $user)
+	public function set_remise_supplier($remise, $note, User $user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		// Parameter cleaning
@@ -2014,7 +2016,7 @@ class Societe extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    	Add a discount for third party
 	 *
@@ -2025,9 +2027,9 @@ class Societe extends CommonObject
 	 *      @param	int		$discount_type	0 => customer discount, 1 => supplier discount
 	 *		@return	int						<0 if KO, id of discount record if OK
 	 */
-    public function set_remise_except($remise, User $user, $desc, $vatrate = '', $discount_type = 0)
+	public function set_remise_except($remise, User $user, $desc, $vatrate = '', $discount_type = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		// Clean parameters
@@ -2068,7 +2070,7 @@ class Societe extends CommonObject
 			$discount->amount_tva = $discount->multicurrency_amount_tva = price2num($remise * $vatrate / 100, 'MT');
 			$discount->amount_ttc = $discount->multicurrency_amount_ttc = price2num($discount->amount_ht + $discount->amount_tva, 'MT');
 
-			$discount->tva_tx = price2num($vatrate, 'MT');
+			$discount->tva_tx = price2num($vatrate);
 			$discount->vat_src_code = $vat_src_code;
 
 			$discount->description = $desc;
@@ -2093,7 +2095,7 @@ class Societe extends CommonObject
 	 * 	@param	int		$discount_type	0 => customer discount, 1 => supplier discount
 	 *	@return	int					<0 if KO, Credit note amount otherwise
 	 */
-    public function getAvailableDiscounts($user = '', $filter = '', $maxvalue = 0, $discount_type = 0)
+	public function getAvailableDiscounts($user = '', $filter = '', $maxvalue = 0, $discount_type = 0)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
@@ -2117,7 +2119,7 @@ class Societe extends CommonObject
 	 *  @param	string		$sortorder		Sort order, separated by comma. Example: 'ASC,DESC';
 	 *  @return array       				Array of sales representatives of third party
 	 */
-    public function getSalesRepresentatives(User $user, $mode = 0, $sortfield = null, $sortorder = null)
+	public function getSalesRepresentatives(User $user, $mode = 0, $sortfield = null, $sortorder = null)
 	{
 		global $conf;
 
@@ -2174,7 +2176,7 @@ class Societe extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set the price level
 	 *
@@ -2182,9 +2184,9 @@ class Societe extends CommonObject
 	 * @param 	User	$user			Use making change
 	 * @return	int						<0 if KO, >0 if OK
 	 */
-    public function set_price_level($price_level, User $user)
+	public function set_price_level($price_level, User $user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if ($this->id)
 		{
 			$now = dol_now();
@@ -2213,7 +2215,7 @@ class Societe extends CommonObject
 		return -1;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Add link to sales representative
 	 *
@@ -2221,67 +2223,67 @@ class Societe extends CommonObject
 	 *	@param	int		$commid		Id of user
 	 *	@return	int					<=0 if KO, >0 if OK
 	 */
-    public function add_commercial(User $user, $commid)
+	public function add_commercial(User $user, $commid)
 	{
 		// phpcs:enable
 		$error = 0;
 
 		if ($this->id > 0 && $commid > 0)
 		{
-		    $this->db->begin();
+			$this->db->begin();
 
-		    if (!$error)
-		    {
-    			$sql = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux";
-    			$sql .= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
+			if (!$error)
+			{
+				$sql = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux";
+				$sql .= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
 
-    			$resql = $this->db->query($sql);
-    			if (!$resql)
-    			{
-    			    dol_syslog(get_class($this)."::add_commercial Error ".$this->db->lasterror());
-    			    $error++;
-    			}
-		    }
+				$resql = $this->db->query($sql);
+				if (!$resql)
+				{
+					dol_syslog(get_class($this)."::add_commercial Error ".$this->db->lasterror());
+					$error++;
+				}
+			}
 
-		    if (!$error)
-    		{
-    			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_commerciaux";
-    			$sql .= " (fk_soc, fk_user)";
-    			$sql .= " VALUES (".$this->id.", ".$commid.")";
+			if (!$error)
+			{
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_commerciaux";
+				$sql .= " (fk_soc, fk_user)";
+				$sql .= " VALUES (".$this->id.", ".$commid.")";
 
-    			$resql = $this->db->query($sql);
-    			if (!$resql)
-    			{
-    				dol_syslog(get_class($this)."::add_commercial Error ".$this->db->lasterror());
-                    $error++;
-    			}
-    		}
+				$resql = $this->db->query($sql);
+				if (!$resql)
+				{
+					dol_syslog(get_class($this)."::add_commercial Error ".$this->db->lasterror());
+					$error++;
+				}
+			}
 
 			if (!$error)
 			{
 				$this->context = array('commercial_modified'=>$commid);
 
 				$result = $this->call_trigger('COMPANY_LINK_SALE_REPRESENTATIVE', $user);
-                if ($result < 0)
-                {
-                    $error++;
-                }
+				if ($result < 0)
+				{
+					$error++;
+				}
 			}
 
 			if (!$error)
 			{
-                $this->db->commit();
-                return 1;
+				$this->db->commit();
+				return 1;
 			} else {
-			    $this->db->rollback();
-			    return -1;
+				$this->db->rollback();
+				return -1;
 			}
 		}
 
 		return 0;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Add link to sales representative
 	 *
@@ -2289,14 +2291,14 @@ class Societe extends CommonObject
 	 *	@param	int		$commid		Id of user
 	 *	@return	void
 	 */
-    public function del_commercial(User $user, $commid)
+	public function del_commercial(User $user, $commid)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$error = 0;
 		$this->context = array('commercial_modified'=>$commid);
 
 		$result = $this->call_trigger('COMPANY_UNLINK_SALE_REPRESENTATIVE', $user);
-        if ($result < 0) $error++;
+		if ($result < 0) $error++;
 
 		if ($this->id > 0 && $commid > 0)
 		{
@@ -2321,7 +2323,7 @@ class Societe extends CommonObject
 	 *      @param  int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *		@return	string					          String with URL
 	 */
-    public function getNomUrl($withpicto = 0, $option = '', $maxlen = 0, $notooltip = 0, $save_lastsearch_value = -1)
+	public function getNomUrl($withpicto = 0, $option = '', $maxlen = 0, $notooltip = 0, $save_lastsearch_value = -1)
 	{
 		global $conf, $langs, $hookmanager;
 
@@ -2329,35 +2331,28 @@ class Societe extends CommonObject
 
 		$name = $this->name ? $this->name : $this->nom;
 
-        if (!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)) {
-            if (empty($option) && $this->client > 0) $option = 'customer';
-            if (empty($option) && $this->fournisseur > 0) $option = 'supplier';
-        }
+		if (!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)) {
+			if (empty($option) && $this->client > 0) $option = 'customer';
+			if (empty($option) && $this->fournisseur > 0) $option = 'supplier';
+		}
 
 		if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
 		{
 			$code = '';
-			if (($this->client) && (!empty($this->code_client))
-				&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1 || $conf->global->SOCIETE_ADD_REF_IN_LIST == 2
-				)
-			)
-			{
+			if (($this->client) && (!empty($this->code_client)) && ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1 || $conf->global->SOCIETE_ADD_REF_IN_LIST == 2)) {
 				$code = $this->code_client.' - ';
 			}
 
-			if (($this->fournisseur) && (!empty($this->code_fournisseur))
-				&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1 || $conf->global->SOCIETE_ADD_REF_IN_LIST == 3
-				)
-			)
-			{
+			if (($this->fournisseur) && (!empty($this->code_fournisseur)) && ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1 || $conf->global->SOCIETE_ADD_REF_IN_LIST == 3)) {
 				$code .= $this->code_fournisseur.' - ';
 			}
 
-			if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
-			{
-				$name = $code.' '.$name;
-			} else {
-				$name = $code;
+			if ($code) {
+				if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1) {
+					$name = $code.' '.$name;
+				} else {
+					$name = $code;
+				}
 			}
 		}
 
@@ -2382,55 +2377,58 @@ class Societe extends CommonObject
 
 		if ($option == 'customer' || $option == 'compta' || $option == 'category')
 		{
-			$label .= img_picto('', $this->picto).' <u>'.$langs->trans("Customer").'</u>';
-		    $linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
+			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Customer").'</u>';
+			$linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
 		} elseif ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
 		{
-			$label .= img_picto('', $this->picto).' <u>'.$langs->trans("Prospect").'</u>';
+			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Prospect").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
 		} elseif ($option == 'supplier' || $option == 'category_supplier')
 		{
-			$label .= img_picto('', $this->picto).' <u>'.$langs->trans("Supplier").'</u>';
+			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Supplier").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id;
 		} elseif ($option == 'agenda')
 		{
-			$label .= img_picto('', $this->picto).' <u>'.$langs->trans("ThirdParty").'</u>';
+			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$this->id;
 		} elseif ($option == 'project')
 		{
-			$label .= img_picto('', $this->picto).' <u>'.$langs->trans("ThirdParty").'</u>';
+			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/project.php?socid='.$this->id;
 		} elseif ($option == 'margin')
 		{
-			$label .= img_picto('', $this->picto).' <u>'.$langs->trans("ThirdParty").'</u>';
+			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$this->id.'&type=1';
 		} elseif ($option == 'contact')
 		{
-			$label .= img_picto('', $this->picto).' <u>'.$langs->trans("ThirdParty").'</u>';
+			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/contact.php?socid='.$this->id;
 		} elseif ($option == 'ban')
 		{
-			$label .= img_picto('', $this->picto).' <u>'.$langs->trans("ThirdParty").'</u>';
+			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$this->id;
 		}
 
 		// By default
 		if (empty($linkstart))
 		{
-			$label .= img_picto('', $this->picto).' <u>'.$langs->trans("ThirdParty").'</u>';
+			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$this->id;
 		}
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
 
 		if (!empty($this->name))
 		{
-			$label .= '<br><b>'.$langs->trans('Name').':</b> '.$this->name;
-			if (!empty($this->name_alias)) $label .= ' ('.$this->name_alias.')';
+			$label .= '<br><b>'.$langs->trans('Name').':</b> '.dol_escape_htmltag($this->name);
+			if (!empty($this->name_alias)) $label .= ' ('.dol_escape_htmltag($this->name_alias).')';
 		}
 		$label .= '<br><b>'.$langs->trans('Email').':</b> '.$this->email;
 		if (!empty($this->country_code))
 			$label .= '<br><b>'.$langs->trans('Country').':</b> '.$this->country_code;
 		if (!empty($this->tva_intra) || (!empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP) && strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'vatnumber') !== false))
-			$label .= '<br><b>'.$langs->trans('VATIntra').':</b> '.$this->tva_intra;
+			$label .= '<br><b>'.$langs->trans('VATIntra').':</b> '.dol_escape_htmltag($this->tva_intra);
 		if (!empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP))
 		{
 			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid1') !== false) $label .= '<br><b>'.$langs->trans('ProfId1'.$this->country_code).':</b> '.$this->idprof1;
@@ -2448,9 +2446,6 @@ class Societe extends CommonObject
 			$label .= '<br><b>'.$langs->trans('CustomerAccountancyCode').':</b> '.($this->code_compta ? $this->code_compta : $this->code_compta_client);
 		if (!empty($conf->accounting->enabled) && $this->fournisseur)
 			$label .= '<br><b>'.$langs->trans('SupplierAccountancyCode').':</b> '.$this->code_compta_fournisseur;
-		if (isset($this->status)) {
-			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
-		}
 		$label .= '</div>';
 
 		// Add type of canvas
@@ -2491,7 +2486,7 @@ class Societe extends CommonObject
 
 		$result .= $linkstart;
 		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= ($maxlen ?dol_trunc($name, $maxlen) : $name);
+		if ($withpicto != 2) $result .= dol_escape_htmltag($maxlen ? dol_trunc($name, $maxlen) : $name);
 		$result .= $linkend;
 
 		global $action;
@@ -2518,7 +2513,7 @@ class Societe extends CommonObject
 	 *    @param  	int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
 	 *    @return   string     	   		Label of status
 	 */
-    public function getLibStatut($mode = 0)
+	public function getLibStatut($mode = 0)
 	{
 		return $this->LibStatut($this->status, $mode);
 	}
@@ -2531,14 +2526,14 @@ class Societe extends CommonObject
 	 *  @param	int		$mode           0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
 	 *  @return	string          		Status label
 	 */
-    public function LibStatut($status, $mode = 0)
+	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$langs->load('companies');
 
 		$statusType = 'status4';
-		if ($status == 0) $statusType = 'status5';
+		if ($status == 0) $statusType = 'status6';
 
 		if (empty($this->labelStatus) || empty($this->labelStatusShort))
 		{
@@ -2549,18 +2544,18 @@ class Societe extends CommonObject
 		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Return list of contacts emails existing for third party
 	 *
 	 *	  @param	  int		$addthirdparty		1=Add also a record for thirdparty email
 	 *    @return     array       					Array of contacts emails
 	 */
-    public function thirdparty_and_contact_email_array($addthirdparty = 0)
+	public function thirdparty_and_contact_email_array($addthirdparty = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$contact_emails = $this->contact_property_array('email', 1);
@@ -2573,15 +2568,15 @@ class Societe extends CommonObject
 		return $contact_emails;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Return list of contacts mobile phone existing for third party
 	 *
 	 *    @return     array       Array of contacts emails
 	 */
-    public function thirdparty_and_contact_phone_array()
+	public function thirdparty_and_contact_phone_array()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$contact_phone = $this->contact_property_array('mobile');
@@ -2595,7 +2590,7 @@ class Societe extends CommonObject
 		return $contact_phone;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of contacts emails or mobile existing for third party
 	 *
@@ -2603,9 +2598,9 @@ class Societe extends CommonObject
 	 * 	@param	int		$hidedisabled		1=Hide contact if disabled
 	 *  @return array       				Array of contacts emails or mobile. Example: array(id=>'Name <email>')
 	 */
-    public function contact_property_array($mode = 'email', $hidedisabled = 0)
+	public function contact_property_array($mode = 'email', $hidedisabled = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$contact_property = array();
@@ -2668,9 +2663,9 @@ class Societe extends CommonObject
 	 *
 	 *    @return     array      array of contacts
 	 */
-    public function contact_array()
+	public function contact_array()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$contacts = array();
 
 		$sql = "SELECT rowid, lastname, firstname FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
@@ -2700,9 +2695,9 @@ class Societe extends CommonObject
 	 *
 	 *    @return    array    $contacts    array of contacts
 	 */
-    public function contact_array_objects()
+	public function contact_array_objects()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 		$contacts = array();
 
@@ -2729,7 +2724,7 @@ class Societe extends CommonObject
 		return $contacts;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return property of contact from its id
 	 *
@@ -2737,9 +2732,9 @@ class Societe extends CommonObject
 	 *  @param  string	$mode       'email' or 'mobile'
 	 *  @return string  			Email of contact with format: "Full name <email>"
 	 */
-    public function contact_get_property($rowid, $mode)
+	public function contact_get_property($rowid, $mode)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$contact_property = '';
 
 		if (empty($rowid)) return '';
@@ -2767,16 +2762,16 @@ class Societe extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return bank number property of thirdparty (label or rum)
 	 *
 	 *	@param	string	$mode	'label' or 'rum' or 'format'
 	 *  @return	string			Bank label or RUM or '' if no bank account found
 	 */
-    public function display_rib($mode = 'label')
+	public function display_rib($mode = 'label')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 
 		$bac = new CompanyBankAccount($this->db);
@@ -2803,15 +2798,15 @@ class Societe extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return Array of RIB
 	 *
 	 * @return     array|int        0 if KO, Array of CompanyBanckAccount if OK
 	 */
-    public function get_all_rib()
+	public function get_all_rib()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib WHERE type='ban' AND fk_soc = ".$this->id;
 		$result = $this->db->query($sql);
@@ -2842,9 +2837,9 @@ class Societe extends CommonObject
 	 *	@param	int			$type		Should be 0 to say customer
 	 *  @return void
 	 */
-    public function get_codeclient($objsoc = 0, $type = 0)
+	public function get_codeclient($objsoc = 0, $type = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
@@ -2874,9 +2869,9 @@ class Societe extends CommonObject
 	 *	@param	int			$type		Should be 1 to say supplier
 	 *  @return void
 	 */
-    public function get_codefournisseur($objsoc = 0, $type = 1)
+	public function get_codefournisseur($objsoc = 0, $type = 1)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
@@ -2903,9 +2898,9 @@ class Societe extends CommonObject
 	 *
 	 *    @return     int		0=No, 1=Yes
 	 */
-    public function codeclient_modifiable()
+	public function codeclient_modifiable()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
@@ -2937,9 +2932,9 @@ class Societe extends CommonObject
 	 *
 	 *    @return     int		0=No, 1=Yes
 	 */
-    public function codefournisseur_modifiable()
+	public function codefournisseur_modifiable()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
@@ -2965,7 +2960,7 @@ class Societe extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Check customer code
 	 *
@@ -2975,9 +2970,9 @@ class Societe extends CommonObject
 	 * 								-3 ErrorCustomerCodeAlreadyUsed
 	 * 								-4 ErrorPrefixRequired
 	 */
-    public function check_codeclient()
+	public function check_codeclient()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
@@ -3004,7 +2999,7 @@ class Societe extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Check supplier code
 	 *
@@ -3014,9 +3009,9 @@ class Societe extends CommonObject
 	 * 							-3 ErrorCustomerCodeAlreadyUsed
 	 * 							-4 ErrorPrefixRequired
 	 */
-    public function check_codefournisseur()
+	public function check_codefournisseur()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
@@ -3052,9 +3047,9 @@ class Societe extends CommonObject
 	 *    	@param	string	$type		Type of thirdparty ('customer' or 'supplier')
 	 *		@return	int					0 if OK, <0 if $type is not valid
 	 */
-    public function get_codecompta($type)
+	public function get_codecompta($type)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		if (!empty($conf->global->SOCIETE_CODECOMPTA_ADDON))
@@ -3091,16 +3086,16 @@ class Societe extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Define parent commany of current company
 	 *
 	 *    @param	int		$id     Id of thirdparty to set or '' to remove
 	 *    @return	int     		<0 if KO, >0 if OK
 	 */
-    public function set_parent($id)
+	public function set_parent($id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if ($this->id)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
@@ -3118,37 +3113,37 @@ class Societe extends CommonObject
 		} else return -1;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Returns if a profid sould be verified
+	 *  Returns if a profid sould be verified to be unique
 	 *
-	 *  @param	int		$idprof		1,2,3,4,5,6 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm,5=idprof5,6=idprof6)
-	 *  @return boolean         	true , false
+	 *  @param	int		$idprof		1,2,3,4,5,6 (Example: 1=siren, 2=siret, 3=naf, 4=rcs/rm, 5=eori, 6=idprof6)
+	 *  @return boolean         	true if the ID must be unique
 	 */
-    public function id_prof_verifiable($idprof)
+	public function id_prof_verifiable($idprof)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 	 	switch ($idprof)
 		{
 			case 1:
-				$ret = (!$conf->global->SOCIETE_IDPROF1_UNIQUE ?false:true);
+				$ret = (empty($conf->global->SOCIETE_IDPROF1_UNIQUE) ? false : true);
 				break;
 			case 2:
-				$ret = (!$conf->global->SOCIETE_IDPROF2_UNIQUE ?false:true);
+				$ret = (empty($conf->global->SOCIETE_IDPROF2_UNIQUE) ? false : true);
 				break;
 			case 3:
-				$ret = (!$conf->global->SOCIETE_IDPROF3_UNIQUE ?false:true);
+				$ret = (empty($conf->global->SOCIETE_IDPROF3_UNIQUE) ? false : true);
 				break;
 			case 4:
-				$ret = (!$conf->global->SOCIETE_IDPROF4_UNIQUE ?false:true);
+				$ret = (empty($conf->global->SOCIETE_IDPROF4_UNIQUE) ? false : true);
 				break;
 			case 5:
-				$ret = (!$conf->global->SOCIETE_IDPROF5_UNIQUE ?false:true);
+				$ret = (empty($conf->global->SOCIETE_IDPROF5_UNIQUE) ? false : true);
 				break;
 			case 6:
-				$ret = (!$conf->global->SOCIETE_IDPROF6_UNIQUE ?false:true);
+				$ret = (empty($conf->global->SOCIETE_IDPROF6_UNIQUE) ? false : true);
 				break;
 			default:
 				$ret = false;
@@ -3157,7 +3152,7 @@ class Societe extends CommonObject
 		return $ret;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Verify if a profid exists into database for others thirds
 	 *
@@ -3166,9 +3161,9 @@ class Societe extends CommonObject
 	 *    @param	int		$socid		Id of thirdparty to exclude (if update)
 	 *    @return   boolean				True if exists, False if not
 	 */
-    public function id_prof_exists($idprof, $value, $socid = 0)
+	public function id_prof_exists($idprof, $value, $socid = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$field = $idprof;
 
 	 	switch ($idprof)	// For backward compatibility
@@ -3224,9 +3219,9 @@ class Societe extends CommonObject
 	 *  @return int             			<=0 if KO, >0 if OK
 	 *  TODO better to have this in a lib than into a business class
 	 */
-    public function id_prof_check($idprof, $soc)
+	public function id_prof_check($idprof, $soc)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$ok = 1;
@@ -3246,7 +3241,7 @@ class Societe extends CommonObject
 			// si son index (position dans la chaîne en commence à 0 au premier caractère) est impair
 			// on double sa valeur et si cette dernière est supérieure à 9, on lui retranche 9
 			// on ajoute cette valeur à la somme totale
-
+			$sum = 0;
 			for ($index = 0; $index < 9; $index++)
 			{
 				$number = (int) $chaine[$index];
@@ -3271,7 +3266,7 @@ class Societe extends CommonObject
 			// si son index (position dans la chaîne en commence à 0 au premier caractère) est pair
 			// on double sa valeur et si cette dernière est supérieure à 9, on lui retranche 9
 			// on ajoute cette valeur à la somme totale
-
+			$sum = 0;
 			for ($index = 0; $index < 14; $index++)
 			{
 				$number = (int) $chaine[$index];
@@ -3348,10 +3343,6 @@ class Societe extends CommonObject
 			$string = trim($this->idprof1);
 			$string = preg_replace('/(\s)/', '', $string);
 
-			for ($i = 0; $i < 9; $i++) {
-				$num[$i] = substr($string, $i, 1);
-			}
-
 			//Check NIF
 			if (preg_match('/(^[0-9]{9}$)/', $string)) {
 				return 1;
@@ -3363,7 +3354,7 @@ class Societe extends CommonObject
 		return $ok;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *   Return an url to check online a professional id or empty string
 	 *
@@ -3372,9 +3363,9 @@ class Societe extends CommonObject
 	 *   @return	string          		Url or empty string if no URL known
 	 *   TODO better in a lib than into business class
 	 */
-    public function id_prof_url($idprof, $thirdparty)
+	public function id_prof_url($idprof, $thirdparty)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs, $hookmanager;
 
 		$url = '';
@@ -3389,7 +3380,7 @@ class Societe extends CommonObject
 			}
 
 			// TODO Move links to validate professional ID into a dictionary table "country" + "link"
-            $strippedIdProf1 = str_replace(' ', '', $thirdparty->idprof1);
+			$strippedIdProf1 = str_replace(' ', '', $thirdparty->idprof1);
 			if ($idprof == 1 && $thirdparty->country_code == 'FR') {
 				$url = 'http://www.societe.com/cgi-bin/search?champs='.$strippedIdProf1; // See also http://avis-situation-sirene.insee.fr/
 			}
@@ -3422,9 +3413,9 @@ class Societe extends CommonObject
 	 *
 	 *   @return     bool	   true if the company has projects, false otherwise
 	 */
-    public function has_projects()
+	public function has_projects()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = 'SELECT COUNT(*) as numproj FROM '.MAIN_DB_PREFIX.'projet WHERE fk_soc = '.$this->id;
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -3446,7 +3437,7 @@ class Societe extends CommonObject
 	 *  @param  int		$id     Id of thirdparty to load
 	 *  @return	void
 	 */
-    public function info($id)
+	public function info($id)
 	{
 		$sql = "SELECT s.rowid, s.nom as name, s.datec as date_creation, tms as date_modification,";
 		$sql .= " fk_user_creat, fk_user_modif";
@@ -3490,7 +3481,7 @@ class Societe extends CommonObject
 	 *
 	 *  @return    boolean     true=is a company, false=a and user
 	 */
-    public function isACompany()
+	public function isACompany()
 	{
 		global $conf;
 
@@ -3515,7 +3506,7 @@ class Societe extends CommonObject
 	 *
 	 *  @return     boolean		true = country inside EEC, false = country outside EEC
 	 */
-    public function isInEEC()
+	public function isInEEC()
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 		return isInEEC($this);
@@ -3527,9 +3518,9 @@ class Societe extends CommonObject
 	 *
 	 *  @return    int      0 if success, <> 0 if error
 	 */
-    public function LoadSupplierCateg()
+	public function LoadSupplierCateg()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->SupplierCategories = array();
 		$sql = "SELECT rowid, label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."categorie";
@@ -3548,16 +3539,16 @@ class Societe extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Insert link supplier - category
 	 *
 	 *	@param	int		$categorie_id		Id of category
 	 *  @return int      					0 if success, <> 0 if error
 	 */
-    public function AddFournisseurInCategory($categorie_id)
+	public function AddFournisseurInCategory($categorie_id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if ($categorie_id > 0 && $this->id > 0)
 		{
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_fournisseur (fk_categorie, fk_soc) ";
@@ -3571,7 +3562,7 @@ class Societe extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Create a third party into database from a member object
 	 *
@@ -3581,9 +3572,9 @@ class Societe extends CommonObject
 	 *  @param	string		$customercode	Customer code
 	 *  @return int							<0 if KO, id of created account if OK
 	 */
-    public function create_from_member(Adherent $member, $socname = '', $socalias = '', $customercode = '')
+	public function create_from_member(Adherent $member, $socname = '', $socalias = '', $customercode = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs;
 
 		dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
@@ -3604,7 +3595,7 @@ class Societe extends CommonObject
 		$this->country_id = $member->country_id;
 		$this->phone = $member->phone; // Prof phone
 		$this->email = $member->email;
-        $this->socialnetworks = $member->socialnetworks;
+		$this->socialnetworks = $member->socialnetworks;
 		$this->entity = $member->entity;
 
 		$this->client = 1; // A member is a customer by default
@@ -3647,7 +3638,7 @@ class Societe extends CommonObject
 	 * 	@param	Conf	$conf		Conf object (possibility to use another entity)
 	 * 	@return	void
 	 */
-    public function setMysoc(Conf $conf)
+	public function setMysoc(Conf $conf)
 	{
 		global $langs;
 
@@ -3722,12 +3713,12 @@ class Societe extends CommonObject
 		$this->youtube_url = empty($conf->global->MAIN_INFO_SOCIETE_YOUTUBE_URL) ? '' : $conf->global->MAIN_INFO_SOCIETE_YOUTUBE_URL;
 		$this->github_url = empty($conf->global->MAIN_INFO_SOCIETE_GITHUB_URL) ? '' : $conf->global->MAIN_INFO_SOCIETE_GITHUB_URL;
 		$this->socialnetworks = array();
-		if (! empty($this->facebook_url)) $this->socialnetworks['facebook'] = $this->facebook_url;
-		if (! empty($this->twitter_url)) $this->socialnetworks['twitter'] = $this->twitter_url;
-		if (! empty($this->linkedin_url)) $this->socialnetworks['linkedin'] = $this->linkedin_url;
-		if (! empty($this->instagram_url)) $this->socialnetworks['instagram'] = $this->instagram_url;
-		if (! empty($this->youtube_url)) $this->socialnetworks['youtube'] = $this->youtube_url;
-		if (! empty($this->github_url)) $this->socialnetworks['github'] = $this->github_url;
+		if (!empty($this->facebook_url)) $this->socialnetworks['facebook'] = $this->facebook_url;
+		if (!empty($this->twitter_url)) $this->socialnetworks['twitter'] = $this->twitter_url;
+		if (!empty($this->linkedin_url)) $this->socialnetworks['linkedin'] = $this->linkedin_url;
+		if (!empty($this->instagram_url)) $this->socialnetworks['instagram'] = $this->instagram_url;
+		if (!empty($this->youtube_url)) $this->socialnetworks['youtube'] = $this->youtube_url;
+		if (!empty($this->github_url)) $this->socialnetworks['github'] = $this->github_url;
 
 		// Id prof generiques
 		$this->idprof1 = empty($conf->global->MAIN_INFO_SIREN) ? '' : $conf->global->MAIN_INFO_SIREN;
@@ -3764,12 +3755,13 @@ class Societe extends CommonObject
 	 *
 	 *  @return	int >0 if ok
 	 */
-    public function initAsSpecimen()
+	public function initAsSpecimen()
 	{
 		$now = dol_now();
 
 		// Initialize parameters
 		$this->id = 0;
+		$this->entity = 1;
 		$this->name = 'THIRDPARTY SPECIMEN '.dol_print_date($now, 'dayhourlog');
 		$this->nom = $this->name; // For backward compatibility
 		$this->ref_ext = 'Ref ext';
@@ -3820,7 +3812,7 @@ class Societe extends CommonObject
 	 *	@param		int		$localTaxNum	To get info for only localtax1 or localtax2
 	 *  @return		boolean					true or false
 	 */
-    public function useLocalTax($localTaxNum = 0)
+	public function useLocalTax($localTaxNum = 0)
 	{
 		$sql  = "SELECT t.localtax1, t.localtax2";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
@@ -3842,7 +3834,7 @@ class Societe extends CommonObject
 	 *
 	 *  @return		boolean					true or false
 	 */
-    public function useNPR()
+	public function useNPR()
 	{
 		$sql  = "SELECT t.rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
@@ -3863,7 +3855,7 @@ class Societe extends CommonObject
 	 *
 	 *  @return		boolean			true or false
 	 */
-    public function useRevenueStamp()
+	public function useRevenueStamp()
 	{
 		$sql  = "SELECT COUNT(*) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r, ".MAIN_DB_PREFIX."c_country as c";
@@ -3887,21 +3879,21 @@ class Societe extends CommonObject
 	 *
 	 *  @return     string        Libelle
 	 */
-    public function getLibProspLevel()
+	public function getLibProspLevel()
 	{
 		return $this->LibProspLevel($this->fk_prospectlevel);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return label of prospect level
 	 *
 	 *  @param	int		$fk_prospectlevel   	Prospect level
 	 *  @return string        					label of level
 	 */
-    public function LibProspLevel($fk_prospectlevel)
+	public function LibProspLevel($fk_prospectlevel)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$lib = $langs->trans("ProspectLevel".$fk_prospectlevel);
@@ -3922,9 +3914,9 @@ class Societe extends CommonObject
 	 *	@return	int					<0 if KO, >0 if OK
 	 * @deprecated Use update function instead
 	 */
-    public function set_prospect_level(User $user)
+	public function set_prospect_level(User $user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return $this->update($this->id, $user);
 	}
 
@@ -3935,12 +3927,12 @@ class Societe extends CommonObject
 	 *  @param	string	$label		Label to use for status for added status
 	 *  @return string        		Libelle
 	 */
-    public function getLibProspCommStatut($mode = 0, $label = '')
+	public function getLibProspCommStatut($mode = 0, $label = '')
 	{
 		return $this->LibProspCommStatut($this->stcomm_id, $mode, $label, $this->stcomm_picto);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return label of a given status
 	 *
@@ -3954,9 +3946,9 @@ class Societe extends CommonObject
 	 *                                      Example: /mydir/mysubdir/picto.png  if picto.png is stored into htdocs/mydir/mysubdir (pictoisfullpath must be set to 1)
 	 *  @return string       	 			Label of prospection status
 	 */
-    public function LibProspCommStatut($status, $mode = 0, $label = '', $picto = '')
+	public function LibProspCommStatut($status, $mode = 0, $label = '', $picto = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$langs->load('customers');
 
@@ -3992,7 +3984,7 @@ class Societe extends CommonObject
 		return "Error, mode/status not found";
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Set outstanding value
 	 *
@@ -4000,9 +3992,9 @@ class Societe extends CommonObject
 	 *	@return	int					<0 if KO, >0 if OK
 	 * @deprecated Use update function instead
 	 */
-    public function set_OutstandingBill(User $user)
+	public function set_OutstandingBill(User $user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return $this->update($this->id, $user);
 	}
 
@@ -4012,7 +4004,7 @@ class Societe extends CommonObject
 	 *  @param     string      $mode    'customer' or 'supplier'
 	 *  @return    array				array('opened'=>Amount, 'total'=>Total amount)
 	 */
-    public function getOutstandingProposals($mode = 'customer')
+	public function getOutstandingProposals($mode = 'customer')
 	{
 		$table = 'propal';
 		if ($mode == 'supplier') $table = 'supplier_proposal';
@@ -4050,7 +4042,7 @@ class Societe extends CommonObject
 	 *  @param     string      $mode    'customer' or 'supplier'
 	 *  @return		array				array('opened'=>Amount, 'total'=>Total amount)
 	 */
-    public function getOutstandingOrders($mode = 'customer')
+	public function getOutstandingOrders($mode = 'customer')
 	{
 		$table = 'commande';
 		if ($mode == 'supplier') $table = 'commande_fournisseur';
@@ -4086,9 +4078,10 @@ class Societe extends CommonObject
 	 *  Return amount of bill not paid and total
 	 *
 	 *  @param     string      $mode    'customer' or 'supplier'
+	 *  @param     int      $late    	0 => all invoice, 1=> only late
 	 *  @return		array				array('opened'=>Amount, 'total'=>Total amount)
 	 */
-    public function getOutstandingBills($mode = 'customer')
+	public function getOutstandingBills($mode = 'customer', $late = 0)
 	{
 		$table = 'facture';
 		if ($mode == 'supplier') $table = 'facture_fourn';
@@ -4103,6 +4096,9 @@ class Societe extends CommonObject
 		if ($mode == 'supplier') $sql = "SELECT rowid, total_ht as total_ht, total_ttc, paye, type, fk_statut as status, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
 		else $sql = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut as status, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
 		$sql .= " WHERE fk_soc = ".$this->id;
+		if (!empty($late)) {
+			$sql .= " AND date_lim_reglement < '".$this->db->idate(dol_now())."'";
+		}
 		if ($mode == 'supplier') {
 			$sql .= " AND entity IN (".getEntity('facture_fourn').")";
 		} else {
@@ -4125,10 +4121,10 @@ class Societe extends CommonObject
 				$tmpobject = new Facture($this->db);
 			}
 			while ($obj = $this->db->fetch_object($resql)) {
-                $tmpobject->id = $obj->rowid;
+				$tmpobject->id = $obj->rowid;
 
-                if ($obj->status != $tmpobject::STATUS_DRAFT                                           // Not a draft
-                	&& !($obj->status == $tmpobject::STATUS_ABANDONED && $obj->close_code == 'replaced')  // Not a replaced invoice
+				if ($obj->status != $tmpobject::STATUS_DRAFT                                           // Not a draft
+					&& !($obj->status == $tmpobject::STATUS_ABANDONED && $obj->close_code == 'replaced')  // Not a replaced invoice
 					)
 				{
 					$outstandingTotal += $obj->total_ht;
@@ -4147,12 +4143,12 @@ class Societe extends CommonObject
 					$outstandingOpened += $obj->total_ttc - $paiement - $creditnotes - $deposits;
 				}
 
-                //if credit note is converted but not used
-                // TODO Do this also for customer ?
-                if ($mode == 'supplier' && $obj->type == FactureFournisseur::TYPE_CREDIT_NOTE && $tmpobject->isCreditNoteUsed())
-                {
-                	$outstandingOpened -= $tmpobject->getSumFromThisCreditNotesNotUsed();
-                }
+				//if credit note is converted but not used
+				// TODO Do this also for customer ?
+				if ($mode == 'supplier' && $obj->type == FactureFournisseur::TYPE_CREDIT_NOTE && $tmpobject->isCreditNoteUsed())
+				{
+					$outstandingOpened -= $tmpobject->getSumFromThisCreditNotesNotUsed();
+				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
 		} else {
@@ -4165,21 +4161,21 @@ class Societe extends CommonObject
 	 *
 	 * @return   string        	Label
 	 */
-    public function getLibCustProspStatut()
+	public function getLibCustProspStatut()
 	{
 		return $this->LibCustProspStatut($this->client);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return the label of the customer/prospect status
 	 *
 	 *  @param	int		$status         Id of prospection status
 	 *  @return	string          		Label of prospection status
 	 */
-    public function LibCustProspStatut($status)
+	public function LibCustProspStatut($status)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$langs->load('companies');
 
@@ -4227,7 +4223,7 @@ class Societe extends CommonObject
 				}
 			}
 
-			if (! isset($this->bank_account)) {
+			if (!isset($this->bank_account)) {
 				require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 				$bac = new CompanyBankAccount($this->db);
 				$result = $bac->fetch(0, $this->id);
diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index ba32086cc4d..a315044683b 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -119,7 +119,7 @@ class SocieteAccount extends CommonObject
 	/**
 	 * @var int Thirdparty ID
 	 */
-    public $fk_soc;
+	public $fk_soc;
 
 	public $site;
 	public $site_account;
@@ -142,13 +142,13 @@ class SocieteAccount extends CommonObject
 	public $tms;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_creat;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
 	public $import_key;
@@ -161,33 +161,6 @@ class SocieteAccount extends CommonObject
 	// END MODULEBUILDER PROPERTIES
 
 
-
-
-	// If this object has a subtable with lines
-
-	/**
-	 * @var int    Name of subtable line
-	 */
-	//public $table_element_line = 'societe_accountdet';
-	/**
-	 * @var int    Field with ID of parent key if this field has a parent
-	 */
-	//public $fk_element = 'fk_societe_account';
-	/**
-	 * @var int    Name of subtable class that manage subtable lines
-	 */
-	//public $class_element_line = 'societeAccountline';
-	/**
-     * @var array	List of child tables. To test if we can delete object.
-	 */
-	//protected $childtables=array();
-	/**
-	 * @var societeAccountLine[]     Array of subtable lines
-	 */
-	//public $lines = array();
-
-
-
 	/**
 	 * Constructor
 	 *
@@ -224,45 +197,45 @@ class SocieteAccount extends CommonObject
 	public function createFromClone(User $user, $fromid)
 	{
 		global $hookmanager, $langs;
-	    $error = 0;
+		$error = 0;
 
-	    dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
-	    $object = new self($this->db);
+		$object = new self($this->db);
 
-	    $this->db->begin();
+		$this->db->begin();
 
-	    // Load source object
-	    $object->fetchCommon($fromid);
-	    // Reset some properties
-	    unset($object->id);
-	    unset($object->fk_user_creat);
-	    unset($object->import_key);
+		// Load source object
+		$object->fetchCommon($fromid);
+		// Reset some properties
+		unset($object->id);
+		unset($object->fk_user_creat);
+		unset($object->import_key);
 
-	    // Clear fields
-	    $object->ref = "copy_of_".$object->ref;
-	    $object->title = $langs->trans("CopyOf")." ".$object->title;
-	    // ...
+		// Clear fields
+		$object->ref = "copy_of_".$object->ref;
+		$object->title = $langs->trans("CopyOf")." ".$object->title;
+		// ...
 
-	    // Create clone
+		// Create clone
 		$object->context['createfromclone'] = 'createfromclone';
-	    $result = $object->createCommon($user);
-	    if ($result < 0) {
-	        $error++;
-	        $this->error = $object->error;
-	        $this->errors = $object->errors;
-	    }
+		$result = $object->createCommon($user);
+		if ($result < 0) {
+			$error++;
+			$this->error = $object->error;
+			$this->errors = $object->errors;
+		}
 
-	    unset($object->context['createfromclone']);
+		unset($object->context['createfromclone']);
 
-	    // End
-	    if (!$error) {
-	        $this->db->commit();
-	        return $object;
-	    } else {
-	        $this->db->rollback();
-	        return -1;
-	    }
+		// End
+		if (!$error) {
+			$this->db->commit();
+			return $object;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
 	}
 
 	/**
@@ -331,14 +304,14 @@ class SocieteAccount extends CommonObject
 	}
 
 	/**
-	* Try to find the thirdparty id from an another site/system external id.
-	*
-	* @param	string	$id			Id of customer in external system (example: 'cu_xxxxxxxxxxxxx', ...)
-	* @param	string	$site		Site (example: 'stripe', '...')
-	* @param	int		$status		Status (0=test, 1=live)
-	* @return	int					Id of third party
-	* @see getCustomerAccount()
-	*/
+	 * Try to find the thirdparty id from an another site/system external id.
+	 *
+	 * @param	string	$id			Id of customer in external system (example: 'cu_xxxxxxxxxxxxx', ...)
+	 * @param	string	$site		Site (example: 'stripe', '...')
+	 * @param	int		$status		Status (0=test, 1=live)
+	 * @return	int					Id of third party
+	 * @see getCustomerAccount()
+	 */
 	public function getThirdPartyID($id, $site, $status = 0)
 	{
 		$socid = 0;
@@ -390,50 +363,50 @@ class SocieteAccount extends CommonObject
 	 *  Return a link to the object card (with optionaly the picto)
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-     *	@param	string	$option						On what the link point to ('nolink', ...)
-     *  @param	int  	$notooltip					1=Disable tooltip
-     *  @param  string  $morecss            		Add more css on link
-     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *	@return	string								String with URL
-     */
-    public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
-    {
+	 *	@param	string	$option						On what the link point to ('nolink', ...)
+	 *  @param	int  	$notooltip					1=Disable tooltip
+	 *  @param  string  $morecss            		Add more css on link
+	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return	string								String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
 		global $db, $conf, $langs;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
+		global $dolibarr_main_authentication, $dolibarr_main_demo;
+		global $menumanager;
 
-        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-        $result = '';
+		$result = '';
 
-        $this->ref = $this->login;
+		$this->ref = $this->login;
 
-        $label = '<u>'.$langs->trans("WebsiteAccount").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Login').':</b> '.$this->ref;
-        //$label.= '<b>' . $langs->trans('WebSite') . ':</b> ' . $this->ref;
+		$label = '<u>'.$langs->trans("WebsiteAccount").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Login').':</b> '.$this->ref;
+		//$label.= '<b>' . $langs->trans('WebSite') . ':</b> ' . $this->ref;
 
-        $url = dol_buildpath('/website/websiteaccount_card.php', 1).'?id='.$this->id;
+		$url = dol_buildpath('/website/websiteaccount_card.php', 1).'?id='.$this->id;
 
-        if ($option != 'nolink')
-        {
-	        // Add param to save lastsearch_values or not
-	        $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-	        if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-	        if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option != 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label = $langs->trans("WebsiteAccount");
-                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("WebsiteAccount");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -445,7 +418,7 @@ class SocieteAccount extends CommonObject
 		$result .= $linkend;
 
 		return $result;
-    }
+	}
 
 	/**
 	 *  Retourne le libelle du status d'un user (actif, inactif)
@@ -458,7 +431,7 @@ class SocieteAccount extends CommonObject
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return the status
 	 *
@@ -468,7 +441,7 @@ class SocieteAccount extends CommonObject
 	 */
 	public static function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if ($mode == 0)
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 9733b870786..7c66a8a148f 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -61,10 +61,10 @@ $year = GETPOST('year', 'int');
 // Clean up on purge search criteria ?
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
 {
-    $sref = '';
-    $sprod_fulldescr = '';
-    $year = '';
-    $month = '';
+	$sref = '';
+	$sprod_fulldescr = '';
+	$year = '';
+	$month = '';
 }
 // Customer or supplier selected in drop box
 $thirdTypeSelect = GETPOST("third_select_id");
@@ -107,7 +107,7 @@ if (empty($socid))
 }
 
 $head = societe_prepare_head($object);
-dol_fiche_head($head, 'consumption', $langs->trans("ThirdParty"), -1, 'company');
+print dol_get_fiche_head($head, 'consumption', $langs->trans("ThirdParty"), -1, 'company');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -170,7 +170,7 @@ print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 print '<br>';
 
 
@@ -253,16 +253,16 @@ if ($type_element == 'supplier_invoice')
 }
 if ($type_element == 'supplier_proposal')
 {
-    require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
-    $documentstatic = new SupplierProposal($db);
-    $sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, ';
-    $tables_from = MAIN_DB_PREFIX."supplier_proposal as c,".MAIN_DB_PREFIX."supplier_proposaldet as d";
-    $where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
-    $where .= " AND d.fk_supplier_proposal = c.rowid";
-    $where .= " AND c.entity = ".$conf->entity;
-    $dateprint = 'c.date_valid';
-    $doc_number = 'c.ref';
-    $thirdTypeSelect = 'supplier';
+	require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
+	$documentstatic = new SupplierProposal($db);
+	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, ';
+	$tables_from = MAIN_DB_PREFIX."supplier_proposal as c,".MAIN_DB_PREFIX."supplier_proposaldet as d";
+	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
+	$where .= " AND d.fk_supplier_proposal = c.rowid";
+	$where .= " AND c.entity = ".$conf->entity;
+	$dateprint = 'c.date_valid';
+	$doc_number = 'c.ref';
+	$thirdTypeSelect = 'supplier';
 }
 if ($type_element == 'supplier_order')
 { 	// Supplier : Show products from orders.
@@ -312,10 +312,10 @@ if (!empty($sql_select))
 	if ($sref) $sql .= " AND ".$doc_number." LIKE '%".$db->escape($sref)."%'";
 	if ($sprod_fulldescr)
 	{
-	    $sql .= " AND (d.description LIKE '%".$db->escape($sprod_fulldescr)."%'";
-	    if (GETPOST('type_element') != 'fichinter') $sql .= " OR p.ref LIKE '%".$db->escape($sprod_fulldescr)."%'";
-	    if (GETPOST('type_element') != 'fichinter') $sql .= " OR p.label LIKE '%".$db->escape($sprod_fulldescr)."%'";
-	    $sql .= ")";
+		$sql .= " AND (d.description LIKE '%".$db->escape($sprod_fulldescr)."%'";
+		if (GETPOST('type_element') != 'fichinter') $sql .= " OR p.ref LIKE '%".$db->escape($sprod_fulldescr)."%'";
+		if (GETPOST('type_element') != 'fichinter') $sql .= " OR p.label LIKE '%".$db->escape($sprod_fulldescr)."%'";
+		$sql .= ")";
 	}
 	$sql .= $db->order($sortfield, $sortorder);
 
@@ -330,8 +330,8 @@ $disabled = 0;
 $showempty = 2;
 if (empty($elementTypeArray) && !$object->client && !$object->fournisseur)
 {
-    $showempty = $langs->trans("ThirdpartyNotCustomerNotSupplierSoNoRef");
-    $disabled = 1;
+	$showempty = $langs->trans("ThirdpartyNotCustomerNotSupplierSoNoRef");
+	$disabled = 1;
 }
 
 // Define type of elements
@@ -356,7 +356,7 @@ if ($sql_select)
 	$num = $db->num_rows($resql);
 
 	$param = "&socid=".urlencode($socid)."&type_element=".urlencode($type_element);
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 	if ($sprod_fulldescr) $param .= "&sprod_fulldescr=".urlencode($sprod_fulldescr);
 	if ($sref) $param .= "&sref=".urlencode($sref);
@@ -364,45 +364,45 @@ if ($sql_select)
 	if ($year) $param .= "&year=".urlencode($year);
 	if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
 
-    print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, '', 0, '', '', $limit);
+	print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, '', 0, '', '', $limit);
 
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="liste centpercent">'."\n";
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="liste centpercent">'."\n";
 
-    // Filters
-    print '<tr class="liste_titre">';
-    print '<td class="liste_titre left">';
-    print '<input class="flat" type="text" name="sref" size="8" value="'.$sref.'">';
-    print '</td>';
-    print '<td class="liste_titre nowrap center">'; // date
-    print $formother->select_month($month ? $month : -1, 'month', 1, 0, 'valignmiddle');
-    $formother->select_year($year ? $year : -1, 'year', 1, 20, 1);
-    print '</td>';
-    print '<td class="liste_titre center">';
-    print '</td>';
-    print '<td class="liste_titre left">';
-    print '<input class="flat" type="text" name="sprod_fulldescr" size="15" value="'.dol_escape_htmltag($sprod_fulldescr).'">';
-    print '</td>';
-    print '<td class="liste_titre center">';
-    print '</td>';
-    print '<td class="liste_titre center">';
-    print '</td>';
-    print '<td class="liste_titre maxwidthsearch">';
-    $searchpicto = $form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
-    print '</tr>';
+	// Filters
+	print '<tr class="liste_titre">';
+	print '<td class="liste_titre left">';
+	print '<input class="flat" type="text" name="sref" size="8" value="'.$sref.'">';
+	print '</td>';
+	print '<td class="liste_titre nowrap center">'; // date
+	print $formother->select_month($month ? $month : -1, 'month', 1, 0, 'valignmiddle');
+	$formother->select_year($year ? $year : -1, 'year', 1, 20, 1);
+	print '</td>';
+	print '<td class="liste_titre center">';
+	print '</td>';
+	print '<td class="liste_titre left">';
+	print '<input class="flat" type="text" name="sprod_fulldescr" size="15" value="'.dol_escape_htmltag($sprod_fulldescr).'">';
+	print '</td>';
+	print '<td class="liste_titre center">';
+	print '</td>';
+	print '<td class="liste_titre center">';
+	print '</td>';
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
+	print '</td>';
+	print '</tr>';
 
-    // Titles with sort buttons
-    print '<tr class="liste_titre">';
-    print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left ');
-    print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'width="150"', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_statut', '', $param, '', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
-    print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, '', $sortfield, $sortorder, 'right ');
-    print_liste_field_titre('TotalHT', $_SERVER['PHP_SELF'], 'total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
-    print_liste_field_titre('UnitPrice', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
-    print "</tr>\n";
+	// Titles with sort buttons
+	print '<tr class="liste_titre">';
+	print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left ');
+	print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'width="150"', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_statut', '', $param, '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
+	print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre('TotalHT', $_SERVER['PHP_SELF'], 'total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre('UnitPrice', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
+	print "</tr>\n";
 
 
 	$i = 0;
@@ -602,25 +602,25 @@ if ($sql_select)
 	$db->free($resql);
 } elseif (empty($type_element) || $type_element == -1)
 {
-    print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
+	print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
 
-    print '<table class="liste centpercent">'."\n";
-    // Titles with sort buttons
-    print '<tr class="liste_titre">';
-    print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left ');
-    print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'width="150"', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_status', '', $param, '', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
-    print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, '', $sortfield, $sortorder, 'right ');
-    print "</tr>\n";
+	print '<table class="liste centpercent">'."\n";
+	// Titles with sort buttons
+	print '<tr class="liste_titre">';
+	print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left ');
+	print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'width="150"', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_status', '', $param, '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
+	print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, '', $sortfield, $sortorder, 'right ');
+	print "</tr>\n";
 
 	print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).'</td></tr>';
 
 	print "</table>";
 } else {
-    print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
+	print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
 
-    print '<table class="liste centpercent">'."\n";
+	print '<table class="liste centpercent">'."\n";
 
 	print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
 
diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php
index c1761c7f601..e57c059a633 100644
--- a/htdocs/societe/contact.php
+++ b/htdocs/societe/contact.php
@@ -80,9 +80,9 @@ $canvas = $object->canvas ? $object->canvas : GETPOST("canvas");
 $objcanvas = null;
 if (!empty($canvas))
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
-    $objcanvas = new Canvas($db, $action);
-    $objcanvas->getCanvas('thirdparty', 'card', $canvas);
+	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
+	$objcanvas = new Canvas($db, $action);
+	$objcanvas->getCanvas('thirdparty', 'card', $canvas);
 }
 
 // Security check
@@ -101,17 +101,17 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 if (empty($reshook))
 {
 	if ($cancel)
-    {
-        $action = '';
-        if (!empty($backtopage))
-        {
-            header("Location: ".$backtopage);
-            exit;
-        }
-    }
+	{
+		$action = '';
+		if (!empty($backtopage))
+		{
+			header("Location: ".$backtopage);
+			exit;
+		}
+	}
 
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 }
 
 
@@ -126,7 +126,7 @@ $formcompany = new FormCompany($db);
 
 if ($socid > 0 && empty($object->id))
 {
-    $result = $object->fetch($socid);
+	$result = $object->fetch($socid);
 	if ($result <= 0) dol_print_error('', $object->error);
 }
 
@@ -144,13 +144,13 @@ if (!empty($object->id)) $res = $object->fetch_optionals();
 
 $head = societe_prepare_head($object);
 
-dol_fiche_head($head, 'contact', $langs->trans("ThirdParty"), 0, 'company');
+print dol_get_fiche_head($head, 'contact', $langs->trans("ThirdParty"), 0, 'company');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom', '', '', 0, '', '', 'arearefnobottom');
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<br>';
 
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index ba0241a90f7..66ace3650a9 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -105,7 +105,7 @@ if ($object->id)
 
 	$form = new Form($db);
 
-	dol_fiche_head($head, 'document', $langs->trans("ThirdParty"), -1, 'company');
+	print dol_get_fiche_head($head, 'document', $langs->trans("ThirdParty"), -1, 'company');
 
 
 	// Build file list
@@ -116,13 +116,13 @@ if ($object->id)
 		$totalsize += $file['size'];
 	}
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
+	dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border tableforfield centpercent">';
 
 	// Prefix
@@ -159,7 +159,7 @@ if ($object->id)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$modulepart = 'societe';
 	$permission = $user->rights->societe->creer;
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index 447f57ee40d..ddd865521d7 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -289,26 +289,24 @@ if ($result)
 			print "</td>\n";
 			// Type
 			print '<td class="center">';
-			if ($thirdparty_static->client == 1 || $thirdparty_static->client == 3)
+			$obj = $thirdparty_static;
+			$s = '';
+			if (($obj->client == 2 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
 			{
-				$thirdparty_static->name = $langs->trans("Customer");
-				print $thirdparty_static->getNomUrl(0, 'customer', 0, 1);
+				$s .= '<a class="customer-back opacitymedium" title="'.$langs->trans("Prospect").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$thirdparty_static->id.'">'.dol_substr($langs->trans("Prospect"), 0, 1).'</a>';
 			}
-			if ($thirdparty_static->client == 3 && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print " / ";
-			if (($thirdparty_static->client == 2 || $thirdparty_static->client == 3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
+			if (($obj->client == 1 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
 			{
-				$thirdparty_static->name = $langs->trans("Prospect");
-				print $thirdparty_static->getNomUrl(0, 'prospect', 0, 1);
+				$s .= '<a class="customer-back" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$thirdparty_static->id.'">'.dol_substr($langs->trans("Customer"), 0, 1).'</a>';
 			}
-			if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $thirdparty_static->fournisseur)
+			if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $obj->fournisseur)
 			{
-				if ($thirdparty_static->client) print " / ";
-				$thirdparty_static->name = $langs->trans("Supplier");
-				print $thirdparty_static->getNomUrl(0, 'supplier', 0, 1);
+				$s .= '<a class="vendor-back" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$thirdparty_static->id.'">'.dol_substr($langs->trans("Supplier"), 0, 1).'</a>';
 			}
+			print $s;
 			print '</td>';
 			// Last modified date
-			print '<td class="right">';
+			print '<td class="right tddate">';
 			print dol_print_date($thirdparty_static->date_modification, 'day');
 			print "</td>";
 			print '<td class="right nowrap">';
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 0534d5d0346..71f0f08cc9d 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -52,7 +52,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'thi
 
 if ($contextpage == 'poslist')
 {
-    $_GET['optioncss'] = 'print';
+	$_GET['optioncss'] = 'print';
 }
 
 // Security check
@@ -72,6 +72,7 @@ $search_customer_code = trim(GETPOST('search_customer_code', 'alpha'));
 $search_supplier_code = trim(GETPOST('search_supplier_code', 'alpha'));
 $search_account_customer_code = trim(GETPOST('search_account_customer_code', 'alpha'));
 $search_account_supplier_code = trim(GETPOST('search_account_supplier_code', 'alpha'));
+$search_address = trim(GETPOST('search_address', 'alpha'));
 $search_town = trim(GETPOST("search_town", 'alpha'));
 $search_zip = trim(GETPOST("search_zip", 'alpha'));
 $search_state = trim(GETPOST("search_state", 'alpha'));
@@ -120,6 +121,7 @@ $pagenext = $page + 1;
 
 if ($type == 'c') { if (empty($contextpage) || $contextpage == 'thirdpartylist') $contextpage = 'customerlist'; if ($search_type == '') $search_type = '1,3'; }
 if ($type == 'p') { if (empty($contextpage) || $contextpage == 'thirdpartylist') $contextpage = 'prospectlist'; if ($search_type == '') $search_type = '2,3'; }
+if ($type == 't') { if (empty($contextpage) || $contextpage == 'poslist') $contextpage = 'poslist'; if ($search_type == '') $search_type = '1,2,3'; }
 if ($type == 'f') { if (empty($contextpage) || $contextpage == 'thirdpartylist') $contextpage = 'supplierlist'; if ($search_type == '') $search_type = '4'; }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -185,6 +187,7 @@ $arrayfields = array(
 	's.code_fournisseur'=>array('label'=>"SupplierCodeShort", 'position'=>11, 'checked'=>$checkedsuppliercode, 'enabled'=>(!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))),
 	's.code_compta'=>array('label'=>"CustomerAccountancyCodeShort", 'position'=>13, 'checked'=>$checkedcustomeraccountcode),
 	's.code_compta_fournisseur'=>array('label'=>"SupplierAccountancyCodeShort", 'position'=>14, 'checked'=>$checkedsupplieraccountcode, 'enabled'=>(!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))),
+	's.address'=>array('label'=>"Address", 'position'=>19, 'checked'=>1),
 	's.town'=>array('label'=>"Town", 'position'=>20, 'checked'=>1),
 	's.zip'=>array('label'=>"Zip", 'position'=>21, 'checked'=>1),
 	'state.nom'=>array('label'=>"State", 'position'=>22, 'checked'=>0),
@@ -213,14 +216,8 @@ $arrayfields = array(
 	's.import_key'=>array('label'=>"ImportId", 'checked'=>0, 'position'=>1100),
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
@@ -231,9 +228,9 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 
 if ($action == "change")	// Change customer for TakePOS
 {
-    $idcustomer = GETPOST('idcustomer', 'int');
+	$idcustomer = GETPOST('idcustomer', 'int');
 
-    // Check if draft invoice already exists, if not create it
+	// Check if draft invoice already exists, if not create it
 	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")' AND entity IN (".getEntity('invoice').")";
 	$result = $db->query($sql);
 	$num_lines = $db->num_rows($result);
@@ -251,9 +248,9 @@ if ($action == "change")	// Change customer for TakePOS
 		$db->query($sql);
 	}
 
-    $sql = "UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".$idcustomer." where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
-    $resql = $db->query($sql);
-    ?>
+	$sql = "UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".$idcustomer." where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
+	$resql = $db->query($sql);
+	?>
 	    <script>
 	    console.log("Reload page invoice.php with place=<?php print $place; ?>");
 	    parent.$("#poslines").load("invoice.php?place=<?php print $place; ?>", function() {
@@ -265,7 +262,7 @@ if ($action == "change")	// Change customer for TakePOS
 	    });
 	    </script>
     <?php
-    exit;
+	exit;
 }
 
 if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
@@ -294,6 +291,7 @@ if (empty($reshook))
 		$search_supplier_code = '';
 		$search_account_customer_code = '';
 		$search_account_supplier_code = '';
+		$search_address = '';
 		$search_town = "";
 		$search_zip = "";
 		$search_state = "";
@@ -391,7 +389,7 @@ if ($resql)
 	}
 } else dol_print_error($db);
 
-$sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.barcode, s.town, s.zip, s.datec, s.code_client, s.code_fournisseur, s.logo,";
+$sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.barcode, s.address, s.town, s.zip, s.datec, s.code_client, s.code_fournisseur, s.logo,";
 $sql .= " s.entity,";
 $sql .= " st.libelle as stcomm, st.picto as stcomm_picto, s.fk_stcomm as stcomm_id, s.fk_prospectlevel, s.prefix_comm, s.client, s.fournisseur, s.canvas, s.status as status,";
 $sql .= " s.email, s.phone, s.fax, s.url, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4 as idprof4, s.idprof5 as idprof5, s.idprof6 as idprof6, s.tva_intra, s.fk_pays,";
@@ -453,6 +451,7 @@ if ($search_customer_code) $sql .= natural_search("s.code_client", $search_custo
 if ($search_supplier_code) $sql .= natural_search("s.code_fournisseur", $search_supplier_code);
 if ($search_account_customer_code) $sql .= natural_search("s.code_compta", $search_account_customer_code);
 if ($search_account_supplier_code) $sql .= natural_search("s.code_compta_fournisseur", $search_account_supplier_code);
+if ($search_address)	   $sql.= natural_search('s.address', $search_address);
 if ($search_town)          $sql .= natural_search("s.town", $search_town);
 if (strlen($search_zip))   $sql .= natural_search("s.zip", $search_zip);
 if ($search_state)         $sql .= natural_search("state.nom", $search_state);
@@ -470,7 +469,7 @@ if (strlen($search_idprof5)) $sql .= natural_search("s.idprof5", $search_idprof5
 if (strlen($search_idprof6)) $sql .= natural_search("s.idprof6", $search_idprof6);
 if (strlen($search_vat))     $sql .= natural_search("s.tva_intra", $search_vat);
 // Filter on type of thirdparty
-if ($search_type > 0 && in_array($search_type, array('1,3', '2,3'))) $sql .= " AND s.client IN (".$db->sanitize($db->escape($search_type)).")";
+if ($search_type > 0 && in_array($search_type, array('1,3', '1,2,3', '2,3'))) $sql .= " AND s.client IN (".$db->sanitize($db->escape($search_type)).")";
 if ($search_type > 0 && in_array($search_type, array('4')))         $sql .= " AND s.fournisseur = 1";
 if ($search_type == '0') $sql .= " AND s.client = 0 AND s.fournisseur = 0";
 if ($search_status != '' && $search_status >= 0) $sql .= natural_search("s.status", $search_status, 2);
@@ -520,21 +519,21 @@ $num = $db->num_rows($resql);
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && ($search_all != '' || $search_cti != '') && $action != 'list') {
-    $obj = $db->fetch_object($resql);
-    $id = $obj->rowid;
-    if (!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)) {
-        if ($obj->client > 0) {
-            header("Location: ".DOL_URL_ROOT.'/comm/card.php?socid='.$id);
-            exit;
-        }
-        if ($obj->fournisseur > 0) {
-            header("Location: ".DOL_URL_ROOT.'/fourn/card.php?socid='.$id);
-            exit;
-        }
-    }
+	$obj = $db->fetch_object($resql);
+	$id = $obj->rowid;
+	if (!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)) {
+		if ($obj->client > 0) {
+			header("Location: ".DOL_URL_ROOT.'/comm/card.php?socid='.$id);
+			exit;
+		}
+		if ($obj->fournisseur > 0) {
+			header("Location: ".DOL_URL_ROOT.'/fourn/card.php?socid='.$id);
+			exit;
+		}
+	}
 
-    header("Location: ".DOL_URL_ROOT.'/societe/card.php?socid='.$id);
-    exit;
+	header("Location: ".DOL_URL_ROOT.'/societe/card.php?socid='.$id);
+	exit;
 }
 
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
@@ -550,6 +549,7 @@ if ($search_sale > 0)	   $param .= '&search_sale='.urlencode($search_sale);
 if ($search_id > 0)        $param .= "&search_id=".urlencode($search_id);
 if ($search_nom != '')     $param .= "&search_nom=".urlencode($search_nom);
 if ($search_alias != '')   $param .= "&search_alias=".urlencode($search_alias);
+if ($search_address != '') $param .= '&search_address=' . urlencode($search_address);
 if ($search_town != '')    $param .= "&search_town=".urlencode($search_town);
 if ($search_zip != '')     $param .= "&search_zip=".urlencode($search_zip);
 if ($search_phone != '')   $param .= "&search_phone=".urlencode($search_phone);
@@ -609,15 +609,18 @@ if (!empty($type))
 	if ($type == 'f') $label = 'NewSupplier';
 }
 
+if ($contextpage == 'poslist' && $type == 't' && (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))) {
+	print get_htmloutput_mesg(img_warning('default').' '.$langs->trans("BecarefullChangeThirdpartyBeforeAddProductToInvoice"), '', 'warning', 1);
+}
+
 // Show the new button only when this page is not opend from the Extended POS (pop-up window)
 // but allow it too, when a user has the rights to create a new customer
-if ($contextpage != 'poslist')
-{
+if ($contextpage != 'poslist') {
 	$url = DOL_URL_ROOT.'/societe/card.php?action=create'.$typefilter;
 	if (!empty($socid)) $url .= '&socid='.$socid;
 	$newcardbutton = dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', $url, '', $user->rights->societe->creer);
 } elseif ($user->rights->societe->creer) {
-	$url = DOL_URL_ROOT.'/societe/card.php?action=create&type=c&contextpage=poslist&optioncss=print&backtopage='.$_SERVER["PHP_SELF"].'?contextpage=poslist&nomassaction=1&optioncss=print&place='.urlencode($place);
+	$url = DOL_URL_ROOT.'/societe/card.php?action=create&type=t&contextpage=poslist&optioncss=print&backtopage='.urlencode($_SERVER["PHP_SELF"].'?type=t&contextpage=poslist&nomassaction=1&optioncss=print&place='.$place);
 	$label = 'MenuNewCustomer';
 	$newcardbutton .= dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', $url);
 }
@@ -662,7 +665,7 @@ if ($search_all)
 $moreforfilter = '';
 if (empty($type) || $type == 'c' || $type == 'p')
 {
-	if (!empty($conf->categorie->enabled))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -673,7 +676,7 @@ if (empty($type) || $type == 'c' || $type == 'p')
 }
 if (empty($type) || $type == 'f')
 {
-	if (!empty($conf->categorie->enabled))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -767,6 +770,13 @@ if (!empty($arrayfields['s.code_compta_fournisseur']['checked']))
 	print '<input class="flat maxwidth75imp" type="text" name="search_account_supplier_code" value="'.dol_escape_htmltag($search_account_supplier_code).'">';
 	print '</td>';
 }
+// Address
+if (!empty($arrayfields['s.address']['checked']))
+{
+	print '<td class="liste_titre">';
+	print '<input class="flat searchstring maxwidth50imp" type="text" name="search_address" value="'.dol_escape_htmltag($search_address).'">';
+	print '</td>';
+}
 // Town
 if (!empty($arrayfields['s.town']['checked']))
 {
@@ -806,14 +816,14 @@ if (!empty($arrayfields['country.code_iso']['checked']))
 if (!empty($arrayfields['typent.code']['checked']))
 {
 	print '<td class="liste_titre maxwidthonsmartphone center">';
-	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
+	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), 'maxwidth75', 1);
 	print '</td>';
 }
 // Staff
 if (!empty($arrayfields['staff.code']['checked']))
 {
 	print '<td class="liste_titre maxwidthonsmartphone center">';
-	print $form->selectarray("search_staff", $formcompany->effectif_array(0), $search_staff, 0, 0, 0, '', 0, 0, 0, $sort, 'maxwidth100');
+	print $form->selectarray("search_staff", $formcompany->effectif_array(0), $search_staff, 0, 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth100', 1);
 	print '</td>';
 }
 if (!empty($arrayfields['s.email']['checked']))
@@ -918,14 +928,14 @@ if (!empty($arrayfields['s.fk_stcomm']['checked']))
 	{
 		$arraystcomm[$val['id']] = ($langs->trans("StatusProspect".$val['id']) != "StatusProspect".$val['id'] ? $langs->trans("StatusProspect".$val['id']) : $val['label']);
 	}
-	print $form->selectarray('search_stcomm', $arraystcomm, $search_stcomm, -2);
+	print $form->selectarray('search_stcomm', $arraystcomm, $search_stcomm, -2, 0, 0, '', 0, 0, 0, '', '', 1);
 	print '</td>';
 }
 if (!empty($arrayfields['s2.nom']['checked']))
 {
-    print '<td class="liste_titre center">';
-    print '<input class="flat searchstring maxwidth75imp" type="text" name="search_parent_name" value="'.dol_escape_htmltag($search_parent_name).'">';
-    print '</td>';
+	print '<td class="liste_titre center">';
+	print '<input class="flat searchstring maxwidth75imp" type="text" name="search_parent_name" value="'.dol_escape_htmltag($search_parent_name).'">';
+	print '</td>';
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -950,7 +960,7 @@ if (!empty($arrayfields['s.tms']['checked']))
 if (!empty($arrayfields['s.status']['checked']))
 {
 	print '<td class="liste_titre center minwidth75imp">';
-	print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $search_status, 1);
+	print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $search_status, 1, 0, 0, '', 0, 0, 0, '', '', 1);
 	print '</td>';
 }
 if (!empty($arrayfields['s.import_key']['checked']))
@@ -976,6 +986,7 @@ if (!empty($arrayfields['s.code_client']['checked']))             print_liste_fi
 if (!empty($arrayfields['s.code_fournisseur']['checked']))        print_liste_field_titre($arrayfields['s.code_fournisseur']['label'], $_SERVER["PHP_SELF"], "s.code_fournisseur", "", $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['s.code_compta']['checked']))             print_liste_field_titre($arrayfields['s.code_compta']['label'], $_SERVER["PHP_SELF"], "s.code_compta", "", $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['s.code_compta_fournisseur']['checked'])) print_liste_field_titre($arrayfields['s.code_compta_fournisseur']['label'], $_SERVER["PHP_SELF"], "s.code_compta_fournisseur", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['s.address']['checked']))		 print_liste_field_titre($arrayfields['s.address']['label'], $_SERVER['PHP_SELF'], 's.address', '', $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], "s.town", "", $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], "s.zip", "", $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['state.nom']['checked']))        print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
@@ -1042,7 +1053,7 @@ while ($i < min($num, $limit))
 	print '<tr class="oddeven"';
 	if ($contextpage == 'poslist')
 	{
-	    print ' onclick="location.href=\'list.php?action=change&contextpage=poslist&idcustomer='.$obj->rowid.'&place='.urlencode($place).'\'"';
+		print ' onclick="location.href=\'list.php?action=change&contextpage=poslist&idcustomer='.$obj->rowid.'&place='.urlencode($place).'\'"';
 	}
 	print '>';
 	if (!empty($arrayfields['s.rowid']['checked']))
@@ -1059,13 +1070,13 @@ while ($i < min($num, $limit))
 		print '<td'.(empty($conf->global->MAIN_SOCIETE_SHOW_COMPLETE_NAME) ? ' class="tdoverflowmax200"' : '').'>';
 		if ($contextpage == 'poslist')
 		{
-		    print $obj->name;
+			print $obj->name;
 		} else {
-		    print $companystatic->getNomUrl(1, '', 100, 0, 1);
+			print $companystatic->getNomUrl(1, '', 100, 0, 1);
 		}
 		print "</td>\n";
 		$companystatic->name_alias = $savalias;
-        if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['s.name_alias']['checked']))
 	{
@@ -1104,6 +1115,12 @@ while ($i < min($num, $limit))
 		print '<td>'.$obj->code_compta_fournisseur.'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
+	// Address
+	if (!empty($arrayfields['s.address']['checked']))
+	{
+		print '<td>'.$obj->address.'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
 	// Town
 	if (!empty($arrayfields['s.town']['checked']))
 	{
@@ -1252,13 +1269,13 @@ while ($i < min($num, $limit))
 	{
 		// Prospect status
 		print '<td class="center nowrap"><div class="nowrap">';
-		print '<div class="inline-block">' . $companystatic->LibProspCommStatut($obj->stcomm_id, 2, $prospectstatic->cacheprospectstatus[$obj->stcomm_id]['label'], $obj->stcomm_picto);
+		print '<div class="inline-block">'.$companystatic->LibProspCommStatut($obj->stcomm_id, 2, $prospectstatic->cacheprospectstatus[$obj->stcomm_id]['label'], $obj->stcomm_picto);
 		print '</div> - <div class="inline-block">';
 		foreach ($prospectstatic->cacheprospectstatus as $key => $val)
 		{
 			$titlealt = 'default';
 			if (!empty($val['code']) && !in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt = $val['label'];
-			if ($obj->stcomm_id != $val['id']) print '<a class="pictosubstatus" href="' . $_SERVER["PHP_SELF"] . '?stcommsocid=' . $obj->rowid . '&stcomm=' . $val['code'] . '&action=setstcomm&token='.newToken() . $param . ($page ? '&page=' . urlencode($page) : '') . '">' . img_action($titlealt, $val['code'], $val['picto']) . '</a>';
+			if ($obj->stcomm_id != $val['id']) print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?stcommsocid='.$obj->rowid.'&stcomm='.$val['code'].'&action=setstcomm&token='.newToken().$param.($page ? '&page='.urlencode($page) : '').'">'.img_action($titlealt, $val['code'], $val['picto']).'</a>';
 		}
 		print '</div></div></td>';
 		if (!$i) $totalarray['nbfield']++;
@@ -1266,14 +1283,14 @@ while ($i < min($num, $limit))
 	// Parent company
 	if (!empty($arrayfields['s2.nom']['checked']))
 	{
-	    print '<td class="center">';
-	    if ($companystatic->fk_parent > 0)
-	    {
-	        $companyparent->fetch($companystatic->fk_parent);
-	        print $companyparent->getNomUrl(1);
-	    }
-	    print "</td>";
-	    if (!$i) $totalarray['nbfield']++;
+		print '<td class="center">';
+		if ($companystatic->fk_parent > 0)
+		{
+			$companyparent->fetch($companystatic->fk_parent);
+			print $companyparent->getNomUrl(1);
+		}
+		print "</td>";
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php
index 866a0e0964f..0632fde21c2 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -67,61 +67,61 @@ llxHeader('', $title, $help_url);
 
 if ($object->id > 0)
 {
-    /*
+	/*
      * Affichage onglets
      */
-    if (!empty($conf->notification->enabled)) $langs->load("mails");
+	if (!empty($conf->notification->enabled)) $langs->load("mails");
 
-    $head = societe_prepare_head($object);
+	$head = societe_prepare_head($object);
 
-    dol_fiche_head($head, 'note', $langs->trans("ThirdParty"), -1, 'company');
+	print dol_get_fiche_head($head, 'note', $langs->trans("ThirdParty"), -1, 'company');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
+	dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-    $cssclass = 'titlefield';
-    //if ($action == 'editnote_public') $cssclass='titlefieldcreate';
-    //if ($action == 'editnote_private') $cssclass='titlefieldcreate';
+	$cssclass = 'titlefield';
+	//if ($action == 'editnote_public') $cssclass='titlefieldcreate';
+	//if ($action == 'editnote_private') $cssclass='titlefieldcreate';
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
-    print '<table class="border centpercent tableforfield">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">';
 
-    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-    {
-        print '<tr><td class="'.$cssclass.'">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
-    }
+	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+	{
+		print '<tr><td class="'.$cssclass.'">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+	}
 
-    if ($object->client)
-    {
-        print '<tr><td class="'.$cssclass.'">';
-        print $langs->trans('CustomerCode').'</td><td colspan="3">';
-        print $object->code_client;
-        if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-        print '</td></tr>';
-    }
+	if ($object->client)
+	{
+		print '<tr><td class="'.$cssclass.'">';
+		print $langs->trans('CustomerCode').'</td><td colspan="3">';
+		print $object->code_client;
+		if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		print '</td></tr>';
+	}
 
-    if ($object->fournisseur)
-    {
-        print '<tr><td class="'.$cssclass.'">';
-        print $langs->trans('SupplierCode').'</td><td colspan="3">';
-        print $object->code_fournisseur;
-        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-        print '</td></tr>';
-    }
+	if ($object->fournisseur)
+	{
+		print '<tr><td class="'.$cssclass.'">';
+		print $langs->trans('SupplierCode').'</td><td colspan="3">';
+		print $object->code_fournisseur;
+		if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		print '</td></tr>';
+	}
 
-    print "</table>";
+	print "</table>";
 
-    print '</div>';
+	print '</div>';
 
-    //print '<br>';
+	//print '<br>';
 
-    //print '<div class="underbanner clearboth"></div>';
-    include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+	//print '<div class="underbanner clearboth"></div>';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 } else {
 	$langs->load("errors");
 	print $langs->trans("ErrorRecordNotFound");
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index ba1ea5d54a5..9a16c1aa1be 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -72,57 +72,57 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    $error = 0;
+	$error = 0;
 
-    // Add a notification
-    if ($action == 'add')
-    {
-        if (empty($contactid))
-        {
-    	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Contact")), null, 'errors');
-            $error++;
-        }
-        if ($actionid <= 0)
-        {
-    	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Action")), null, 'errors');
-            $error++;
-        }
+	// Add a notification
+	if ($action == 'add')
+	{
+		if (empty($contactid))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Contact")), null, 'errors');
+			$error++;
+		}
+		if ($actionid <= 0)
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Action")), null, 'errors');
+			$error++;
+		}
 
-        if (!$error)
-        {
-            $db->begin();
+		if (!$error)
+		{
+			$db->begin();
 
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
-            $sql .= " WHERE fk_soc=".$socid." AND fk_contact=".$contactid." AND fk_action=".$actionid;
-            if ($db->query($sql))
-            {
-                $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_soc, fk_contact, fk_action)";
-                $sql .= " VALUES ('".$db->idate($now)."',".$socid.",".$contactid.",".$actionid.")";
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
+			$sql .= " WHERE fk_soc=".$socid." AND fk_contact=".$contactid." AND fk_action=".$actionid;
+			if ($db->query($sql))
+			{
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_soc, fk_contact, fk_action)";
+				$sql .= " VALUES ('".$db->idate($now)."',".$socid.",".$contactid.",".$actionid.")";
 
-                if (!$db->query($sql))
-                {
-                    $error++;
-                    dol_print_error($db);
-                }
-            } else {
-                dol_print_error($db);
-            }
+				if (!$db->query($sql))
+				{
+					$error++;
+					dol_print_error($db);
+				}
+			} else {
+				dol_print_error($db);
+			}
 
-            if (!$error)
-            {
-                $db->commit();
-            } else {
-                $db->rollback();
-            }
-        }
-    }
+			if (!$error)
+			{
+				$db->commit();
+			} else {
+				$db->rollback();
+			}
+		}
+	}
 
-    // Remove a notification
-    if ($action == 'delete')
-    {
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".GETPOST('actid', 'int');
-        $db->query($sql);
-    }
+	// Remove a notification
+	if ($action == 'delete')
+	{
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".GETPOST('actid', 'int');
+		$db->query($sql);
+	}
 }
 
 
@@ -144,46 +144,46 @@ llxHeader('', $title, $help_url);
 
 if ($result > 0)
 {
-    $langs->load("other");
+	$langs->load("other");
 
-    $head = societe_prepare_head($object);
+	$head = societe_prepare_head($object);
 
-    dol_fiche_head($head, 'notify', $langs->trans("ThirdParty"), -1, 'company');
+	print dol_get_fiche_head($head, 'notify', $langs->trans("ThirdParty"), -1, 'company');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
+	dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
-    print '<table class="border centpercent">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent">';
 
-    // Prefix
-    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-    {
-        print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
-    }
+	// Prefix
+	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+	{
+		print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+	}
 
-    if ($object->client)
-    {
-        print '<tr><td class="titlefield">';
-        print $langs->trans('CustomerCode').'</td><td colspan="3">';
-        print $object->code_client;
-        if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-        print '</td></tr>';
-    }
+	if ($object->client)
+	{
+		print '<tr><td class="titlefield">';
+		print $langs->trans('CustomerCode').'</td><td colspan="3">';
+		print $object->code_client;
+		if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		print '</td></tr>';
+	}
 
-    if (!empty($conf->fournisseur->enabled) && $object->fournisseur && !empty($user->rights->fournisseur->lire))
-    {
-        print '<tr><td class="titlefield">';
-        print $langs->trans('SupplierCode').'</td><td colspan="3">';
-        print $object->code_fournisseur;
-        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-        print '</td></tr>';
-    }
+	if (!empty($conf->fournisseur->enabled) && $object->fournisseur && !empty($user->rights->fournisseur->lire))
+	{
+		print '<tr><td class="titlefield">';
+		print $langs->trans('SupplierCode').'</td><td colspan="3">';
+		print $object->code_fournisseur;
+		if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		print '</td></tr>';
+	}
 
-    /*print '<tr><td class="titlefield">'.$langs->trans("NbOfActiveNotifications").'</td>';   // Notification for this thirdparty
+	/*print '<tr><td class="titlefield">'.$langs->trans("NbOfActiveNotifications").'</td>';   // Notification for this thirdparty
     print '<td colspan="3">';
     $nbofrecipientemails=0;
     $notify=new Notify($db);
@@ -195,159 +195,159 @@ if ($result > 0)
     print $nbofrecipientemails;
     print '</td></tr>';*/
 
-    print '</table>';
+	print '</table>';
 
-    print '</div>';
-
-    dol_fiche_end();
-
-    print "\n";
-
-    // Help
-    print '<div class="opacitymedium">';
-    print $langs->trans("NotificationsDesc");
-    print '<br>'.$langs->trans("NotificationsDescUser");
-    print '<br>'.$langs->trans("NotificationsDescContact");
-    print '<br>'.$langs->trans("NotificationsDescGlobal");
 	print '</div>';
 
-    print '<br><br>'."\n";
+	print dol_get_fiche_end();
+
+	print "\n";
+
+	// Help
+	print '<div class="opacitymedium">';
+	print $langs->trans("NotificationsDesc");
+	print '<br>'.$langs->trans("NotificationsDescUser");
+	print '<br>'.$langs->trans("NotificationsDescContact");
+	print '<br>'.$langs->trans("NotificationsDescGlobal");
+	print '</div>';
+
+	print '<br><br>'."\n";
 
 
-    // Add notification form
-    print load_fiche_titre($langs->trans("AddNewNotification"), '', '');
+	// Add notification form
+	print load_fiche_titre($langs->trans("AddNewNotification"), '', '');
 
-    print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$socid.'" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="add">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$socid.'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="add">';
 
-    $param = "&socid=".$socid;
+	$param = "&socid=".$socid;
 
-    // Line with titles
-    print '<table width="100%" class="noborder">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
-    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
-    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
-    print_liste_field_titre('');
+	// Line with titles
+	print '<table width="100%" class="noborder">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
+	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
+	print_liste_field_titre('');
 	print "</tr>\n";
 
-    $var = false;
-    $listofemails = $object->thirdparty_and_contact_email_array();
-    if (count($listofemails) > 0)
-    {
-        $actions = array();
+	$var = false;
+	$listofemails = $object->thirdparty_and_contact_email_array();
+	if (count($listofemails) > 0)
+	{
+		$actions = array();
 
-        // Load array of available notifications
-        $notificationtrigger = new InterfaceNotification($db);
-        $listofmanagedeventfornotification = $notificationtrigger->getListOfManagedEvents();
+		// Load array of available notifications
+		$notificationtrigger = new InterfaceNotification($db);
+		$listofmanagedeventfornotification = $notificationtrigger->getListOfManagedEvents();
 
-        foreach ($listofmanagedeventfornotification as $managedeventfornotification)
-        {
+		foreach ($listofmanagedeventfornotification as $managedeventfornotification)
+		{
  			$label = ($langs->trans("Notify_".$managedeventfornotification['code']) != "Notify_".$managedeventfornotification['code'] ? $langs->trans("Notify_".$managedeventfornotification['code']) : $managedeventfornotification['label']);
-            $actions[$managedeventfornotification['rowid']] = $label;
-        }
-        print '<tr class="oddeven nohover"><td class="maxwidthonsmartphone">';
-        print img_picto('', 'contact', '', false, 0, 0, '', 'paddingright').$form->selectarray("contactid", $listofemails, '', 0, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
-        print '</td>';
-        print '<td class="maxwidthonsmartphone">';
-        print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$form->selectarray("actionid", $actions, '', 1, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
-        print '</td>';
-        print '<td>';
-        $type = array('email'=>$langs->trans("EMail"));
-        print $form->selectarray("typeid", $type);
-        print '</td>';
-        print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
-        print '</tr>';
-    } else {
-        print '<tr class="oddeven"><td colspan="4" class="opacitymedium">';
-        print $langs->trans("YouMustCreateContactFirst");
-        print '</td></tr>';
-    }
+			$actions[$managedeventfornotification['rowid']] = $label;
+		}
+		print '<tr class="oddeven nohover"><td class="maxwidthonsmartphone">';
+		print img_picto('', 'contact', '', false, 0, 0, '', 'paddingright').$form->selectarray("contactid", $listofemails, '', 0, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
+		print '</td>';
+		print '<td class="maxwidthonsmartphone">';
+		print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$form->selectarray("actionid", $actions, '', 1, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
+		print '</td>';
+		print '<td>';
+		$type = array('email'=>$langs->trans("EMail"));
+		print $form->selectarray("typeid", $type);
+		print '</td>';
+		print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
+		print '</tr>';
+	} else {
+		print '<tr class="oddeven"><td colspan="4" class="opacitymedium">';
+		print $langs->trans("YouMustCreateContactFirst");
+		print '</td></tr>';
+	}
 
-    print '</table>';
+	print '</table>';
 
 
-    print '</form>';
-    print '<br>';
+	print '</form>';
+	print '<br>';
 
 
-    // List of notifications enabled for contacts
-    $sql = "SELECT n.rowid, n.type,";
-    $sql .= " a.code, a.label,";
-    $sql .= " c.rowid as contactid, c.lastname, c.firstname, c.email";
-    $sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
-    $sql .= " ".MAIN_DB_PREFIX."notify_def as n,";
-    $sql .= " ".MAIN_DB_PREFIX."socpeople c";
-    $sql .= " WHERE a.rowid = n.fk_action";
-    $sql .= " AND c.rowid = n.fk_contact";
-    $sql .= " AND c.fk_soc = ".$object->id;
+	// List of notifications enabled for contacts
+	$sql = "SELECT n.rowid, n.type,";
+	$sql .= " a.code, a.label,";
+	$sql .= " c.rowid as contactid, c.lastname, c.firstname, c.email";
+	$sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
+	$sql .= " ".MAIN_DB_PREFIX."notify_def as n,";
+	$sql .= " ".MAIN_DB_PREFIX."socpeople c";
+	$sql .= " WHERE a.rowid = n.fk_action";
+	$sql .= " AND c.rowid = n.fk_contact";
+	$sql .= " AND c.fk_soc = ".$object->id;
 
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-    } else {
-        dol_print_error($db);
-    }
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+	} else {
+		dol_print_error($db);
+	}
 
-    // List of active notifications
-    print load_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')', '', '');
+	// List of active notifications
+	print load_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')', '', '');
 
-    // Line with titles
-    print '<table width="100%" class="noborder">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
-    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
-    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
-    print_liste_field_titre('', '', '');
-    print '</tr>';
+	// Line with titles
+	print '<table width="100%" class="noborder">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
+	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
+	print_liste_field_titre('', '', '');
+	print '</tr>';
 
 	$langs->load("errors");
 	$langs->load("other");
 
-    if ($num)
-    {
-        $i = 0;
+	if ($num)
+	{
+		$i = 0;
 
-        $contactstatic = new Contact($db);
+		$contactstatic = new Contact($db);
 
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($resql);
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
 
-            $contactstatic->id = $obj->contact_id;
-            $contactstatic->lastname = $obj->lastname;
-            $contactstatic->firstname = $obj->firstname;
-            print '<tr class="oddeven"><td>'.$contactstatic->getNomUrl(1);
-            if ($obj->type == 'email')
-            {
-                if (isValidEmail($obj->email))
-                {
-                    print ' &lt;'.$obj->email.'&gt;';
-                } else {
-                    $langs->load("errors");
-                    print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email);
-                }
-            }
-            print '</td>';
-            print '<td>';
-            $label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
-            print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$label;
-            print '</td>';
-            print '<td>';
-            if ($obj->type == 'email') print $langs->trans("Email");
-            if ($obj->type == 'sms') print $langs->trans("SMS");
-            print '</td>';
-            print '<td class="right"><a href="card.php?socid='.$socid.'&action=delete&token='.newToken().'&actid='.$obj->rowid.'">'.img_delete().'</a></td>';
-            print '</tr>';
-            $i++;
-        }
-        $db->free($resql);
-    }
+			$contactstatic->id = $obj->contact_id;
+			$contactstatic->lastname = $obj->lastname;
+			$contactstatic->firstname = $obj->firstname;
+			print '<tr class="oddeven"><td>'.$contactstatic->getNomUrl(1);
+			if ($obj->type == 'email')
+			{
+				if (isValidEmail($obj->email))
+				{
+					print ' &lt;'.$obj->email.'&gt;';
+				} else {
+					$langs->load("errors");
+					print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email);
+				}
+			}
+			print '</td>';
+			print '<td>';
+			$label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
+			print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$label;
+			print '</td>';
+			print '<td>';
+			if ($obj->type == 'email') print $langs->trans("Email");
+			if ($obj->type == 'sms') print $langs->trans("SMS");
+			print '</td>';
+			print '<td class="right"><a href="card.php?socid='.$socid.'&action=delete&token='.newToken().'&actid='.$obj->rowid.'">'.img_delete().'</a></td>';
+			print '</tr>';
+			$i++;
+		}
+		$db->free($resql);
+	}
 
-    // List of notifications enabled for fixed email
-    /*
+	// List of notifications enabled for fixed email
+	/*
     foreach($conf->global as $key => $val)
     {
     	if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_(.*)/', $key, $reg)) continue;
@@ -389,7 +389,7 @@ if ($result > 0)
 		print '</tr>';
     }*/
 
-    /*if ($user->admin)
+	/*if ($user->admin)
     {
 	    $var = ! $var;
 		print '<tr class="oddeven"><td colspan="4">';
@@ -397,104 +397,104 @@ if ($result > 0)
 		print '</td></tr>';
     }*/
 
-    print '</table>';
+	print '</table>';
 
 
-    print '<br><br>'."\n";
+	print '<br><br>'."\n";
 
 
-    // List
-    $sql = "SELECT n.rowid, n.daten, n.email, n.objet_type as object_type, n.objet_id as object_id, n.type,";
-    $sql .= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";
-    $sql .= " a.code, a.label";
-    $sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
-    $sql .= " ".MAIN_DB_PREFIX."notify as n ";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as c ON n.fk_contact = c.rowid";
-    $sql .= " WHERE a.rowid = n.fk_action";
-    $sql .= " AND n.fk_soc = ".$object->id;
-    $sql .= $db->order($sortfield, $sortorder);
+	// List
+	$sql = "SELECT n.rowid, n.daten, n.email, n.objet_type as object_type, n.objet_id as object_id, n.type,";
+	$sql .= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";
+	$sql .= " a.code, a.label";
+	$sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
+	$sql .= " ".MAIN_DB_PREFIX."notify as n ";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as c ON n.fk_contact = c.rowid";
+	$sql .= " WHERE a.rowid = n.fk_action";
+	$sql .= " AND n.fk_soc = ".$object->id;
+	$sql .= $db->order($sortfield, $sortorder);
 
-    // Count total nb of records
-    $nbtotalofrecords = '';
-    if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-    {
-        $result = $db->query($sql);
-        $nbtotalofrecords = $db->num_rows($result);
-        if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-        {
-        	$page = 0;
-        	$offset = 0;
-        }
-    }
+	// Count total nb of records
+	$nbtotalofrecords = '';
+	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+	{
+		$result = $db->query($sql);
+		$nbtotalofrecords = $db->num_rows($result);
+		if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+		{
+			$page = 0;
+			$offset = 0;
+		}
+	}
 
-    $sql .= $db->plimit($limit + 1, $offset);
+	$sql .= $db->plimit($limit + 1, $offset);
 
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-    } else {
-        dol_print_error($db);
-    }
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+	} else {
+		dol_print_error($db);
+	}
 
-    $param = '&socid='.$object->id;
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+	$param = '&socid='.$object->id;
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
-    print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
-    print '<input type="hidden" name="socid" value="'.$object->id.'">';
+	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="socid" value="'.$object->id.'">';
 
-    // List of active notifications
-    print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
+	// List of active notifications
+	print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
 
-    // Line with titles
-    print '<table width="100%" class="noborder">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '', $sortfield, $sortorder);
-    //print_liste_field_titre("Object",$_SERVER["PHP_SELF"],"",'',$param,'"',$sortfield,$sortorder);
-    print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "n.daten", '', $param, '', $sortfield, $sortorder, 'right ');
-    print '</tr>';
+	// Line with titles
+	print '<table width="100%" class="noborder">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '', $sortfield, $sortorder);
+	//print_liste_field_titre("Object",$_SERVER["PHP_SELF"],"",'',$param,'"',$sortfield,$sortorder);
+	print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "n.daten", '', $param, '', $sortfield, $sortorder, 'right ');
+	print '</tr>';
 
-    if ($num > 0)
-    {
-        $i = 0;
+	if ($num > 0)
+	{
+		$i = 0;
 
-        $contactstatic = new Contact($db);
+		$contactstatic = new Contact($db);
 
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($resql);
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
 
-            print '<tr class="oddeven"><td>';
-            if ($obj->id > 0)
-            {
-	            $contactstatic->id = $obj->id;
-	            $contactstatic->lastname = $obj->lastname;
-	            $contactstatic->firstname = $obj->firstname;
-	            print $contactstatic->getNomUrl(1);
-	            print $obj->email ? ' &lt;'.$obj->email.'&gt;' : $langs->trans("NoMail");
-            } else {
+			print '<tr class="oddeven"><td>';
+			if ($obj->id > 0)
+			{
+				$contactstatic->id = $obj->id;
+				$contactstatic->lastname = $obj->lastname;
+				$contactstatic->firstname = $obj->firstname;
+				print $contactstatic->getNomUrl(1);
+				print $obj->email ? ' &lt;'.$obj->email.'&gt;' : $langs->trans("NoMail");
+			} else {
 				print $obj->email;
-            }
-            print '</td>';
-            print '<td>';
-            $label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
-            print $label;
-            print '</td>';
-            print '<td>';
-            if ($obj->type == 'email') print $langs->trans("Email");
-            if ($obj->type == 'sms') print $langs->trans("Sms");
-            print '</td>';
-            // TODO Add link to object here for other types
-            /*print '<td>';
+			}
+			print '</td>';
+			print '<td>';
+			$label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
+			print $label;
+			print '</td>';
+			print '<td>';
+			if ($obj->type == 'email') print $langs->trans("Email");
+			if ($obj->type == 'sms') print $langs->trans("Sms");
+			print '</td>';
+			// TODO Add link to object here for other types
+			/*print '<td>';
             if ($obj->object_type == 'order')
             {
 				$orderstatic->id=$obj->object_id;
@@ -502,19 +502,19 @@ if ($result > 0)
 				print $orderstatic->getNomUrl(1);
             }
            	print '</td>';*/
-            // print
-            print'<td class="right">'.dol_print_date($db->jdate($obj->daten), 'dayhour').'</td>';
-            print '</tr>';
-            $i++;
-        }
-        $db->free($resql);
-    } else {
-    	print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
-    }
+			// print
+			print'<td class="right">'.dol_print_date($db->jdate($obj->daten), 'dayhour').'</td>';
+			print '</tr>';
+			$i++;
+		}
+		$db->free($resql);
+	} else {
+		print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
+	}
 
-    print '</table>';
+	print '</table>';
 
-    print '</form>';
+	print '</form>';
 } else dol_print_error('', 'RecordNotFound');
 
 // End of page
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 3b2cc60cce4..fa06ea5eae1 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -550,12 +550,12 @@ if (empty($reshook))
 
 			$db->begin();
 
-            if (empty($newcu)) {
-                $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_account WHERE site = 'stripe' AND (site_account IS NULL or site_account = '' or site_account = '".$db->escape($site_account)."') AND fk_soc = ".$object->id." AND status = ".$servicestatus." AND entity = ".$conf->entity;
-            } else {
-                $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX."societe_account";
-                $sql .= " WHERE site = 'stripe' AND (site_account IS NULL or site_account = '' or site_account = '".$db->escape($site_account)."') AND fk_soc = ".$object->id." AND status = ".$servicestatus." AND entity = ".$conf->entity; // Keep = here for entity. Only 1 record must be modified !
-            }
+			if (empty($newcu)) {
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_account WHERE site = 'stripe' AND (site_account IS NULL or site_account = '' or site_account = '".$db->escape($site_account)."') AND fk_soc = ".$object->id." AND status = ".$servicestatus." AND entity = ".$conf->entity;
+			} else {
+				$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX."societe_account";
+				$sql .= " WHERE site = 'stripe' AND (site_account IS NULL or site_account = '' or site_account = '".$db->escape($site_account)."') AND fk_soc = ".$object->id." AND status = ".$servicestatus." AND entity = ".$conf->entity; // Keep = here for entity. Only 1 record must be modified !
+			}
 
 			$resql = $db->query($sql);
 			$num = $db->num_rows($resql); // Note: $num is always 0 on an update and delete, it is defined for select only.
@@ -601,21 +601,21 @@ if (empty($reshook))
 
 			$db->begin();
 
-            if (empty($newsup)) {
-                $sql = "DELETE FROM ".MAIN_DB_PREFIX."oauth_token WHERE fk_soc = ".$object->id." AND service = '".$db->escape($service)."' AND entity = ".$conf->entity;
-                // TODO Add site and site_account on oauth_token table
-                //$sql = "DELETE FROM ".MAIN_DB_PREFIX."oauth_token WHERE site = 'stripe' AND (site_account IS NULL or site_account = '".$db->escape($site_account)."') AND fk_soc = ".$object->id." AND service = '".$db->escape($service)."' AND entity = ".$conf->entity;
-            } else {
-                try {
-                    $stripesup = \Stripe\Account::retrieve($db->escape(GETPOST('key_account_supplier', 'alpha')));
-                    $tokenstring['stripe_user_id'] = $stripesup->id;
-                    $tokenstring['type'] = $stripesup->type;
-                    $sql = "UPDATE ".MAIN_DB_PREFIX."oauth_token";
-                    $sql .= " SET tokenstring = '".dol_json_encode($tokenstring)."'";
-                    $sql .= " WHERE site = 'stripe' AND (site_account IS NULL or site_account = '".$db->escape($site_account)."') AND fk_soc = ".$object->id." AND service = '".$db->escape($service)."' AND entity = ".$conf->entity; // Keep = here for entity. Only 1 record must be modified !
-                    // TODO Add site and site_account on oauth_token table
-                    $sql .= " WHERE fk_soc = ".$object->id." AND service = '".$db->escape($service)."' AND entity = ".$conf->entity; // Keep = here for entity. Only 1 record must be modified !
-                } catch (Exception $e) {
+			if (empty($newsup)) {
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."oauth_token WHERE fk_soc = ".$object->id." AND service = '".$db->escape($service)."' AND entity = ".$conf->entity;
+				// TODO Add site and site_account on oauth_token table
+				//$sql = "DELETE FROM ".MAIN_DB_PREFIX."oauth_token WHERE site = 'stripe' AND (site_account IS NULL or site_account = '".$db->escape($site_account)."') AND fk_soc = ".$object->id." AND service = '".$db->escape($service)."' AND entity = ".$conf->entity;
+			} else {
+				try {
+					$stripesup = \Stripe\Account::retrieve($db->escape(GETPOST('key_account_supplier', 'alpha')));
+					$tokenstring['stripe_user_id'] = $stripesup->id;
+					$tokenstring['type'] = $stripesup->type;
+					$sql = "UPDATE ".MAIN_DB_PREFIX."oauth_token";
+					$sql .= " SET tokenstring = '".$db->escape(json_encode($tokenstring))."'";
+					$sql .= " WHERE site = 'stripe' AND (site_account IS NULL or site_account = '".$db->escape($site_account)."') AND fk_soc = ".$object->id." AND service = '".$db->escape($service)."' AND entity = ".$conf->entity; // Keep = here for entity. Only 1 record must be modified !
+					// TODO Add site and site_account on oauth_token table
+					$sql .= " WHERE fk_soc = ".$object->id." AND service = '".$db->escape($service)."' AND entity = ".$conf->entity; // Keep = here for entity. Only 1 record must be modified !
+				} catch (Exception $e) {
 					$error++;
 					setEventMessages($e->getMessage(), null, 'errors');
 				}
@@ -625,14 +625,14 @@ if (empty($reshook))
 			$num = $db->num_rows($resql);
 			if (empty($num) && !empty($newsup))
 			{
-                try {
-                    $stripesup = \Stripe\Account::retrieve($db->escape(GETPOST('key_account_supplier', 'alpha')));
-                    $tokenstring['stripe_user_id'] = $stripesup->id;
-                    $tokenstring['type'] = $stripesup->type;
-                    $sql = "INSERT INTO ".MAIN_DB_PREFIX."oauth_token (service, fk_soc, entity, tokenstring)";
-                    $sql .= " VALUES ('".$db->escape($service)."', ".$object->id.", ".$conf->entity.", '".dol_json_encode($tokenstring)."')";
-                    // TODO Add site and site_account on oauth_token table
-                } catch (Exception $e) {
+				try {
+					$stripesup = \Stripe\Account::retrieve($db->escape(GETPOST('key_account_supplier', 'alpha')));
+					$tokenstring['stripe_user_id'] = $stripesup->id;
+					$tokenstring['type'] = $stripesup->type;
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."oauth_token (service, fk_soc, entity, tokenstring)";
+					$sql .= " VALUES ('".$db->escape($service)."', ".$object->id.", ".$conf->entity.", '".$db->escape(json_encode($tokenstring))."')";
+					// TODO Add site and site_account on oauth_token table
+				} catch (Exception $e) {
 					$error++;
 					setEventMessages($e->getMessage(), null, 'errors');
 				}
@@ -686,22 +686,22 @@ if (empty($reshook))
 			try {
 				if (preg_match('/pm_/', $source))
 				{
-                    $payment_method = \Stripe\PaymentMethod::retrieve($source, array("stripe_account" => $stripeacc));
-                    if ($payment_method)
-			        {
-					    $payment_method->detach();
-				    }
+					$payment_method = \Stripe\PaymentMethod::retrieve($source, array("stripe_account" => $stripeacc));
+					if ($payment_method)
+					{
+						$payment_method->detach();
+					}
 				} else {
-				    $cu = $stripe->customerStripe($object, $stripeacc, $servicestatus);
-				    $card = $cu->sources->retrieve("$source");
-				    if ($card) {
-					    // $card->detach();  Does not work with card_, only with src_
-					    if (method_exists($card, 'detach')) {
+					$cu = $stripe->customerStripe($object, $stripeacc, $servicestatus);
+					$card = $cu->sources->retrieve("$source");
+					if ($card) {
+						// $card->detach();  Does not work with card_, only with src_
+						if (method_exists($card, 'detach')) {
 							$card->detach();
 						} else {
 							$card->delete();
 						}
-				    }
+					}
 				}
 
 				$url = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
@@ -773,7 +773,7 @@ if ($socid && ($action == 'create' || $action == 'createcard') && $user->rights-
 // View
 if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard' && $action != 'createcard')
 {
-	dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"), -1, 'company');
+	print dol_get_fiche_head($head, 'rib', $langs->trans("ThirdParty"), -1, 'company');
 
 	// Confirm delete ban
 	if ($action == 'delete')
@@ -832,7 +832,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			print $form->editfieldval("StripeCustomerId", 'key_account', $stripecu, $object, $permissiontowrite, 'string', '', null, null, '', 2, '', 'socid');
 			if (!empty($conf->stripe->enabled) && $stripecu && $action != 'editkey_account')
 			{
-			    $connect = '';
+				$connect = '';
 				if (!empty($stripeacc)) $connect = $stripeacc.'/';
 				$url = 'https://dashboard.stripe.com/'.$connect.'test/customers/'.$stripecu;
 				if ($servicestatus)
@@ -853,7 +853,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			}
 			print '</td></tr>';
 		}
-    }
+	}
 
 	if ($object->fournisseur)
 	{
@@ -886,7 +886,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		print $form->editfieldval("StripeConnectAccount", 'key_account_supplier', $stripesupplieracc, $object, $permissiontowrite, 'string', '', null, null, '', 2, '', 'socid');
 		if (!empty($conf->stripe->enabled) && $stripesupplieracc && $action != 'editkey_account_supplier')
 		{
-		    $connect = '';
+			$connect = '';
 
 			$url = 'https://dashboard.stripe.com/test/connect/accounts/'.$stripesupplieracc;
 			if ($servicestatus)
@@ -912,7 +912,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 	print '</table>';
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<br>';
 
@@ -922,7 +922,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		$morehtmlright = '';
 		if (!empty($conf->global->STRIPE_ALLOW_LOCAL_CARD))
 		{
-            $morehtmlright .= dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=createcard');
+			$morehtmlright .= dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=createcard');
 		}
 		print load_fiche_titre($langs->trans('StripePaymentModes').($stripeacc ? ' (Stripe connection with StripeConnect account '.$stripeacc.')' : ' (Stripe connection with keys from Stripe module setup)'), $morehtmlright, 'stripe-s');
 
@@ -1038,9 +1038,9 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 							print $companypaymentmodetemp->stripe_card_ref;
 							if ($companypaymentmodetemp->stripe_card_ref)
 							{
-							    $connect = '';
-							    if (!empty($stripeacc)) $connect = $stripeacc.'/';
-							    $url = 'https://dashboard.stripe.com/'.$connect.'test/search?query='.$companypaymentmodetemp->stripe_card_ref;
+								$connect = '';
+								if (!empty($stripeacc)) $connect = $stripeacc.'/';
+								$url = 'https://dashboard.stripe.com/'.$connect.'test/search?query='.$companypaymentmodetemp->stripe_card_ref;
 								if ($servicestatus)
 								{
 									$url = 'https://dashboard.stripe.com/'.$connect.'search?query='.$companypaymentmodetemp->stripe_card_ref;
@@ -1138,8 +1138,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				$url = 'https://dashboard.stripe.com/'.$connect.'test/search?query='.$src->id;
 				if ($servicestatus)
 				{
-				    //$url='https://dashboard.stripe.com/'.$connect.'sources/'.$src->id;
-				    $url = 'https://dashboard.stripe.com/'.$connect.'search?query='.$src->id;
+					//$url='https://dashboard.stripe.com/'.$connect.'sources/'.$src->id;
+					$url = 'https://dashboard.stripe.com/'.$connect.'search?query='.$src->id;
 				}
 				print " <a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'globe')."</a>";
 				print '</td>';
@@ -1266,30 +1266,30 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		}
 		print "</table>";
 		print "</div>";
-        print '<br>';
+		print '<br>';
 	}
 
   	// List of Stripe payment modes
 	if (!empty($conf->stripe->enabled) && !empty($conf->stripeconnect->enabled) && !empty($stripesupplieracc))
 	{
-        print load_fiche_titre($langs->trans('StripeBalance').($stripesupplieracc ? ' (Stripe connection with StripeConnect account '.$stripesupplieracc.')' : ' (Stripe connection with keys from Stripe module setup)'), $morehtmlright, 'stripe-s');
-        $balance = \Stripe\Balance::retrieve(array("stripe_account" => $stripesupplieracc));
+		print load_fiche_titre($langs->trans('StripeBalance').($stripesupplieracc ? ' (Stripe connection with StripeConnect account '.$stripesupplieracc.')' : ' (Stripe connection with keys from Stripe module setup)'), $morehtmlright, 'stripe-s');
+		$balance = \Stripe\Balance::retrieve(array("stripe_account" => $stripesupplieracc));
 		print '<table class="liste centpercent">'."\n";
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans('Currency').'</td>';
 		print '<td>'.$langs->trans('Available').'</td>';
 		print '<td>'.$langs->trans('Pending').'</td>';
-        print '<td>'.$langs->trans('Total').'</td>';
-        print '</tr>';
+		print '<td>'.$langs->trans('Total').'</td>';
+		print '</tr>';
 
-        $currencybalance = array();
+		$currencybalance = array();
 		if (is_array($balance->available) && count($balance->available))
 		{
 			foreach ($balance->available as $cpt)
 			{
-		        $arrayzerounitcurrency = array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
-		        if (!in_array($cpt->currency, $arrayzerounitcurrency)) {
-    					$currencybalance[$cpt->currency]['available'] = $cpt->amount / 100;
+				$arrayzerounitcurrency = array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
+				if (!in_array($cpt->currency, $arrayzerounitcurrency)) {
+						$currencybalance[$cpt->currency]['available'] = $cpt->amount / 100;
 				} else {
 					$currencybalance[$cpt->currency]['available'] = $cpt->amount;
 				}
@@ -1297,7 +1297,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			}
 		}
 
-        if (is_array($balance->pending) && count($balance->pending))
+		if (is_array($balance->pending) && count($balance->pending))
 		{
 			foreach ($balance->pending as $cpt)
 			{
@@ -1308,7 +1308,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 					$currencybalance[$cpt->currency]['pending'] = $currencybalance[$cpt->currency]['available'] + $cpt->amount;
 				}
 			}
-        }
+		}
 
 		if (is_array($currencybalance))
 		{
@@ -1318,13 +1318,13 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			}
 		}
 
-        print '</table>';
-        print '<br>';
+		print '</table>';
+		print '<br>';
 	}
 
 	// List of bank accounts
 
-    $morehtmlright = dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=create');
+	$morehtmlright = dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=create');
 
 	print load_fiche_titre($langs->trans("BankAccounts"), $morehtmlright, 'bank');
 
@@ -1371,11 +1371,11 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				} elseif ($val == 'BankAccountNumberKey') {
 					$string .= $rib->cle_rib.' ';
 				}
-                // Already output after
-                // } elseif ($val == 'BIC') {
-                //     $string .= $rib->bic.' ';
-                // } elseif ($val == 'IBAN') {
-                //     $string .= $rib->iban.' ';*/
+				// Already output after
+				// } elseif ($val == 'BIC') {
+				//     $string .= $rib->bic.' ';
+				// } elseif ($val == 'IBAN') {
+				//     $string .= $rib->iban.' ';*/
 				//}
 			}
 			if (!empty($rib->label) && $rib->number) {
@@ -1581,7 +1581,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 // Edit BAN
 if ($socid && $action == 'edit' && $user->rights->societe->creer)
 {
-	dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"), 0, 'company');
+	print dol_get_fiche_head($head, 'rib', $langs->trans("ThirdParty"), 0, 'company');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -1686,19 +1686,19 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
 	}
 
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input class="button" value="'.$langs->trans("Modify").'" type="submit">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
+	print '<input class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 	print '</div>';
 }
 
 // Edit Card
 if ($socid && $action == 'editcard' && $user->rights->societe->creer)
 {
-	dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"), 0, 'company');
+	print dol_get_fiche_head($head, 'rib', $langs->trans("ThirdParty"), 0, 'company');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -1733,12 +1733,12 @@ if ($socid && $action == 'editcard' && $user->rights->societe->creer)
 	print '</table>';
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input class="button" value="'.$langs->trans("Modify").'" type="submit">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
+	print '<input class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 	print '</div>';
 }
 
@@ -1746,7 +1746,7 @@ if ($socid && $action == 'editcard' && $user->rights->societe->creer)
 // Create BAN
 if ($socid && $action == 'create' && $user->rights->societe->creer)
 {
-	dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"), 0, 'company');
+	print dol_get_fiche_head($head, 'rib', $langs->trans("ThirdParty"), 0, 'company');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -1847,21 +1847,21 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	dol_set_focus('#label');
 
 	print '<div class="center">';
 	print '<input class="button" value="'.$langs->trans("Add").'" type="submit">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input name="cancel" class="button" value="'.$langs->trans("Cancel").'" type="submit">';
+	print '<input name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 	print '</div>';
 }
 
 // Create Card
 if ($socid && $action == 'createcard' && $user->rights->societe->creer)
 {
-	dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"), 0, 'company');
+	print dol_get_fiche_head($head, 'rib', $langs->trans("ThirdParty"), 0, 'company');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -1897,14 +1897,14 @@ if ($socid && $action == 'createcard' && $user->rights->societe->creer)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	dol_set_focus('#label');
 
 	print '<div class="center">';
 	print '<input class="button" value="'.$langs->trans("Add").'" type="submit">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input name="cancel" class="button" value="'.$langs->trans("Cancel").'" type="submit">';
+	print '<input name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 	print '</div>';
 }
 
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index 4a709fb9009..a06b1f0940e 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -43,6 +43,9 @@ $langs->loadLangs(array("products", "companies", "bills"));
 $action = GETPOST('action', 'aZ09');
 $search_prod = GETPOST('search_prod', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
+$search_label = GETPOST('search_label', 'alpha');
+$search_price = GETPOST('search_price');
+$search_price_ttc = GETPOST('search_price_ttc');
 
 // Security check
 $socid = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
@@ -68,112 +71,112 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
-    {
-        $search_prod = '';
-    }
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
+	{
+		$search_prod = $search_label = $search_price = $search_price_ttc = '';
+	}
 
-    if ($action == 'add_customer_price_confirm' && !$cancel && ($user->rights->produit->creer || $user->rights->service->creer)) {
-    	if (! (GETPOST('prodid', 'int') > 0)) {
-    		$error++;
-    		setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Product")), null, 'errors');
-    		$action = 'add_customer_price';
-    	}
+	if ($action == 'add_customer_price_confirm' && !$cancel && ($user->rights->produit->creer || $user->rights->service->creer)) {
+		if (!(GETPOST('prodid', 'int') > 0)) {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Product")), null, 'errors');
+			$action = 'add_customer_price';
+		}
 
-    	if (! $error) {
-	    	$update_child_soc = GETPOST('updatechildprice');
+		if (!$error) {
+			$update_child_soc = GETPOST('updatechildprice');
 
-	    	// add price by customer
-	    	$prodcustprice->fk_soc = $socid;
-	    	$prodcustprice->fk_product = GETPOST('prodid', 'int');
-	    	$prodcustprice->price = price2num(GETPOST("price"), 'MU');
-	    	$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
-	    	$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
+			// add price by customer
+			$prodcustprice->fk_soc = $socid;
+			$prodcustprice->fk_product = GETPOST('prodid', 'int');
+			$prodcustprice->price = price2num(GETPOST("price"), 'MU');
+			$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
+			$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
 
-	    	$tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
+			$tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
 
-	    	// We must define tva_tx, npr and local taxes
-	    	$vatratecode = '';
-	    	$tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt); // keep remove all after the numbers and dot
-	    	$npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
-	    	$localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
-	    	// If value contains the unique code of vat line (new recommended method), we use it to find npr and local taxes
-	    	if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
-	    	{
-	    	    // We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in update price.
-	    	    $vatratecode = $reg[1];
-	    	    // Get record from code
-	    	    $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
-	    	    $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-	    	    $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
-	    	    $sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
-	    	    $sql .= " AND t.code ='".$db->escape($vatratecode)."'";
-	    	    $resql = $db->query($sql);
-	    	    if ($resql)
-	    	    {
-	    	        $obj = $db->fetch_object($resql);
-	    	        $npr = $obj->recuperableonly;
-	    	        $localtax1 = $obj->localtax1;
-	    	        $localtax2 = $obj->localtax2;
-	    	        $localtax1_type = $obj->localtax1_type;
-	    	        $localtax2_type = $obj->localtax2_type;
-	    	    }
-	    	}
+			// We must define tva_tx, npr and local taxes
+			$vatratecode = '';
+			$tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt); // keep remove all after the numbers and dot
+			$npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
+			$localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
+			// If value contains the unique code of vat line (new recommended method), we use it to find npr and local taxes
+			if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
+			{
+				// We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in update price.
+				$vatratecode = $reg[1];
+				// Get record from code
+				$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+				$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+				$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+				$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+				$sql .= " AND t.code ='".$db->escape($vatratecode)."'";
+				$resql = $db->query($sql);
+				if ($resql)
+				{
+					$obj = $db->fetch_object($resql);
+					$npr = $obj->recuperableonly;
+					$localtax1 = $obj->localtax1;
+					$localtax2 = $obj->localtax2;
+					$localtax1_type = $obj->localtax1_type;
+					$localtax2_type = $obj->localtax2_type;
+				}
+			}
 
-	    	$prodcustprice->default_vat_code = $vatratecode;
-	    	$prodcustprice->tva_tx = $tva_tx;
-	    	$prodcustprice->recuperableonly = $npr;
-	    	$prodcustprice->localtax1_tx = $localtax1;
-	    	$prodcustprice->localtax2_tx = $localtax2;
-	    	$prodcustprice->localtax1_type = $localtax1_type;
-	    	$prodcustprice->localtax2_type = $localtax2_type;
+			$prodcustprice->default_vat_code = $vatratecode;
+			$prodcustprice->tva_tx = $tva_tx;
+			$prodcustprice->recuperableonly = $npr;
+			$prodcustprice->localtax1_tx = $localtax1;
+			$prodcustprice->localtax2_tx = $localtax2;
+			$prodcustprice->localtax1_type = $localtax1_type;
+			$prodcustprice->localtax2_type = $localtax2_type;
 
-	    	$result = $prodcustprice->create($user, 0, $update_child_soc);
+			$result = $prodcustprice->create($user, 0, $update_child_soc);
 
-	    	if ($result < 0) {
-	    		setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
-	    	} else {
-	    		setEventMessages($langs->trans('Save'), null, 'mesgs');
-	    	}
+			if ($result < 0) {
+				setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
+			} else {
+				setEventMessages($langs->trans("Save"), null, 'mesgs');
+			}
 
-	    	$action = '';
-    	}
-    }
+			$action = '';
+		}
+	}
 
-    if ($action == 'delete_customer_price' && ($user->rights->produit->creer || $user->rights->service->creer)) {
-    	// Delete price by customer
-    	$prodcustprice->id = GETPOST('lineid');
-    	$result = $prodcustprice->delete($user);
+	if ($action == 'delete_customer_price' && ($user->rights->produit->creer || $user->rights->service->creer)) {
+		// Delete price by customer
+		$prodcustprice->id = GETPOST('lineid');
+		$result = $prodcustprice->delete($user);
 
-    	if ($result < 0) {
-    		setEventMessages($prodcustprice->error, $prodcustprice->errors, 'mesgs');
-    	} else {
-    		setEventMessages($langs->trans('Delete'), null, 'errors');
-    	}
-    	$action = '';
-    }
+		if ($result < 0) {
+			setEventMessages($prodcustprice->error, $prodcustprice->errors, 'mesgs');
+		} else {
+			setEventMessages($langs->trans('Delete'), null, 'errors');
+		}
+		$action = '';
+	}
 
-    if ($action == 'update_customer_price_confirm' && !$_POST ["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer)) {
-    	$prodcustprice->fetch(GETPOST('lineid', 'int'));
+	if ($action == 'update_customer_price_confirm' && !$_POST ["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer)) {
+		$prodcustprice->fetch(GETPOST('lineid', 'int'));
 
-    	$update_child_soc = GETPOST('updatechildprice');
+		$update_child_soc = GETPOST('updatechildprice');
 
-    	// update price by customer
-    	$prodcustprice->price = price2num(GETPOST("price"), 'MU');
-    	$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
-    	$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
-    	$prodcustprice->tva_tx = str_replace('*', '', GETPOST("tva_tx"));
-    	$prodcustprice->recuperableonly = (preg_match('/\*/', GETPOST("tva_tx")) ? 1 : 0);
+		// update price by customer
+		$prodcustprice->price = price2num(GETPOST("price"), 'MU');
+		$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
+		$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
+		$prodcustprice->tva_tx = str_replace('*', '', GETPOST("tva_tx"));
+		$prodcustprice->recuperableonly = (preg_match('/\*/', GETPOST("tva_tx")) ? 1 : 0);
 
-    	$result = $prodcustprice->update($user, 0, $update_child_soc);
-    	if ($result < 0) {
-    		setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
-    	} else {
-    		setEventMessages($langs->trans('Save'), null, 'mesgs');
-    	}
+		$result = $prodcustprice->update($user, 0, $update_child_soc);
+		if ($result < 0) {
+			setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
+		} else {
+			setEventMessages($langs->trans("Save"), null, 'mesgs');
+		}
 
-    	$action = '';
-    }
+		$action = '';
+	}
 }
 
 
@@ -192,7 +195,7 @@ if (!empty($conf->notification->enabled))
 	$langs->load("mails");
 $head = societe_prepare_head($object);
 
-dol_fiche_head($head, 'price', $langs->trans("ThirdParty"), -1, 'company');
+print dol_get_fiche_head($head, 'price', $langs->trans("ThirdParty"), -1, 'company');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -230,7 +233,7 @@ print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 
@@ -239,7 +242,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
 	$sortfield = GETPOST("sortfield", 'alpha');
 	$sortorder = GETPOST("sortorder", 'alpha');
-    $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+	$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 	if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 	$offset = $limit * $page;
@@ -259,6 +262,18 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		$filter ['prod.ref'] = $search_prod;
 	}
 
+	if (!empty($search_label)) {
+		$filter ['prod.label'] = $search_label;
+	}
+
+	if (!empty($search_price)) {
+		$filter ['t.price'] = $search_price;
+	}
+
+	if (!empty($search_price_ttc)) {
+		$filter ['t.price_ttc'] = $search_price_ttc;
+	}
+
 	if ($action == 'add_customer_price') {
 		// Create mode
 
@@ -328,9 +343,9 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print '</table>';
 
 		print '<br><div class="center">';
-		print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+		print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 
 		print '<br></form>';
@@ -407,14 +422,14 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print '</table>';
 
 		print '<br><div class="center">';
-		print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+		print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 
 		print '<br></form>';
 	} elseif ($action == 'showlog_customer_price') {
-	    print '<br>';
+		print '<br>';
 		print '<!-- showlog_customer_price -->'."\n";
 
 		$filter = array(
@@ -488,7 +503,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'">'.$langs->trans("Ok").'</a></div>';
 		print "\n</div><br>\n";
 	} else {
-        // View mode
+		// View mode
 
 		/* ************************************************************************** */
 		/*                                                                            */
@@ -504,112 +519,118 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print "\n</div>\n";
 
 
-        // Count total nb of records
-        $nbtotalofrecords = '';
-        if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-        {
-            $nbtotalofrecords = $prodcustprice->fetch_all('', '', 0, 0, $filter);
-        }
+		// Count total nb of records
+		$nbtotalofrecords = '';
+		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+		{
+			$nbtotalofrecords = $prodcustprice->fetch_all('', '', 0, 0, $filter);
+		}
 
-        $result = $prodcustprice->fetch_all($sortorder, $sortfield, $conf->liste_limit, $offset, $filter);
-        if ($result < 0)
-        {
-            setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
-        }
+		$result = $prodcustprice->fetch_all($sortorder, $sortfield, $conf->liste_limit, $offset, $filter);
+		if ($result < 0)
+		{
+			setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
+		}
 
-        $option = '&search_prod='.$search_prod.'&id='.$object->id;
+		$option = '&search_prod='.$search_prod.'&id='.$object->id.'&label='.$search_label.'&price='.$search_price.'&price_ttc='.$search_price_ttc;
 
-	    print '<!-- view specific price for each product -->'."\n";
+		print '<!-- view specific price for each product -->'."\n";
 
-	    print_barre_liste($langs->trans('PriceForEachProduct'), $page, $_SERVER['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords, '');
+		print_barre_liste($langs->trans('PriceForEachProduct'), $page, $_SERVER['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords, '');
 
-        print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
-        print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<input type="hidden" name="id" value="'.$object->id.'">';
+		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-        print '<table class="noborder centpercent">';
+		print '<table class="noborder centpercent">';
 
-        print '<tr class="liste_titre">';
-        print '<td>'.$langs->trans("Product").'</td>';
-        print '<td>'.$langs->trans("AppliedPricesFrom").'</td>';
-        print '<td class="center">'.$langs->trans("PriceBase").'</td>';
-        print '<td class="right">'.$langs->trans("VAT").'</td>';
-        print '<td class="right">'.$langs->trans("HT").'</td>';
-        print '<td class="right">'.$langs->trans("TTC").'</td>';
-        print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("HT").'</td>';
-        print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("TTC").'</td>';
-        print '<td class="right">'.$langs->trans("ChangedBy").'</td>';
-        print '<td>&nbsp;</td>';
-        print '</tr>';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("Ref").'</td>';
+		print '<td>'.$langs->trans("Product").'</td>';
+		print '<td>'.$langs->trans("AppliedPricesFrom").'</td>';
+		print '<td class="center">'.$langs->trans("PriceBase").'</td>';
+		print '<td class="right">'.$langs->trans("VAT").'</td>';
+		print '<td class="right">'.$langs->trans("HT").'</td>';
+		print '<td class="right">'.$langs->trans("TTC").'</td>';
+		print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("HT").'</td>';
+		print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("TTC").'</td>';
+		print '<td class="right">'.$langs->trans("ChangedBy").'</td>';
+		print '<td>&nbsp;</td>';
+		print '</tr>';
 
-        if (count($prodcustprice->lines) > 0 || $search_prod)
-        {
-            print '<tr class="liste_titre">';
+		if (count($prodcustprice->lines) > 0 || $search_prod)
+		{
+			print '<tr class="liste_titre">';
 			print '<td class="liste_titre"><input type="text" class="flat" name="search_prod" value="'.$search_prod.'" size="20"></td>';
-            print '<td class="liste_titre" colspan="8">&nbsp;</td>';
-            // Print the search button
-            print '<td class="liste_titre maxwidthsearch">';
-            $searchpicto = $form->showFilterAndCheckAddButtons(0);
-            print $searchpicto;
-            print '</td>';
-            print '</tr>';
-        }
+			print '<td class="liste_titre" ><input type="text" class="flat" name="search_label" value="'.$search_label.'" size="20"></td>';
+			print '<td class="liste_titre" colspan="3">&nbsp;</td>';
+			print '<td class="liste_titre" align="right"><input type="text" class="flat" name="search_price" value="'.$search_price.'" size="10"></td>';
+			print '<td class="liste_titre" align="right"><input type="text" class="flat" name="search_price_ttc" value="'.$search_price_ttc.'" size="10"></td>';
+			print '<td class="liste_titre" colspan="3">&nbsp;</td>';
+			// Print the search button
+			print '<td class="liste_titre maxwidthsearch">';
+			$searchpicto = $form->showFilterAndCheckAddButtons(0);
+			print $searchpicto;
+			print '</td>';
+			print '</tr>';
+		}
 
-        if (count($prodcustprice->lines) > 0)
-        {
-            foreach ($prodcustprice->lines as $line)
-            {
-                print '<tr class="oddeven">';
+		if (count($prodcustprice->lines) > 0)
+		{
+			foreach ($prodcustprice->lines as $line)
+			{
+				print '<tr class="oddeven">';
 
-                $staticprod = new Product($db);
-                $staticprod->fetch($line->fk_product);
+				$staticprod = new Product($db);
+				$staticprod->fetch($line->fk_product);
 
-                print "<td>".$staticprod->getNomUrl(1)."</td>";
-                print "<td>".dol_print_date($line->datec, "dayhour")."</td>";
+				print "<td>".$staticprod->getNomUrl(1)."</td>";
+				print "<td>".$staticprod->label."</td>";
+				print "<td>".dol_print_date($line->datec, "dayhour")."</td>";
 
-                print '<td class="center">'.$langs->trans($line->price_base_type)."</td>";
-                print '<td class="right">'.vatrate($line->tva_tx.($line->default_vat_code ? ' ('.$line->default_vat_code.')' : ''), true, $line->recuperableonly)."</td>";
-                print '<td class="right">'.price($line->price)."</td>";
-                print '<td class="right">'.price($line->price_ttc)."</td>";
-                print '<td class="right">'.price($line->price_min).'</td>';
-                print '<td class="right">'.price($line->price_min_ttc).'</td>';
+				print '<td class="center">'.$langs->trans($line->price_base_type)."</td>";
+				print '<td class="right">'.vatrate($line->tva_tx.($line->default_vat_code ? ' ('.$line->default_vat_code.')' : ''), true, $line->recuperableonly)."</td>";
+				print '<td class="right">'.price($line->price)."</td>";
+				print '<td class="right">'.price($line->price_ttc)."</td>";
+				print '<td class="right">'.price($line->price_min).'</td>';
+				print '<td class="right">'.price($line->price_min_ttc).'</td>';
 
-                // User
-                $userstatic = new User($db);
-                $userstatic->fetch($line->fk_user);
-                print '<td class="right">';
-                print $userstatic->getLoginUrl(1);
-                print '</td>';
+				// User
+				$userstatic = new User($db);
+				$userstatic->fetch($line->fk_user);
+				print '<td class="right">';
+				print $userstatic->getLoginUrl(1);
+				print '</td>';
 
-                // Action
-                if ($user->rights->produit->creer || $user->rights->service->creer)
-                {
-                    print '<td class="right nowraponall">';
-                    print '<a class="paddingleftonly paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=showlog_customer_price&amp;socid='.$object->id.'&amp;prodid='.$line->fk_product.'">';
-                    print img_info();
-                    print '</a>';
-                    print ' ';
-                    print '<a class="editfielda paddingleftonly paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=edit_customer_price&amp;socid='.$object->id.'&amp;lineid='.$line->id.'">';
-                    print img_edit('default', 0, 'style="vertical-align: middle;"');
-                    print '</a>';
-                    print ' ';
-                    print '<a class="paddingleftonly paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=delete_customer_price&amp;token='.newToken().'&amp;socid='.$object->id.'&amp;lineid='.$line->id.'">';
-                    print img_delete('default', 'style="vertical-align: middle;"');
-                    print '</a>';
-                    print '</td>';
-                }
+				// Action
+				if ($user->rights->produit->creer || $user->rights->service->creer)
+				{
+					print '<td class="right nowraponall">';
+					print '<a class="paddingleftonly paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=showlog_customer_price&amp;socid='.$object->id.'&amp;prodid='.$line->fk_product.'">';
+					print img_info();
+					print '</a>';
+					print ' ';
+					print '<a class="editfielda paddingleftonly paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=edit_customer_price&amp;socid='.$object->id.'&amp;lineid='.$line->id.'">';
+					print img_edit('default', 0, 'style="vertical-align: middle;"');
+					print '</a>';
+					print ' ';
+					print '<a class="paddingleftonly paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=delete_customer_price&amp;token='.newToken().'&amp;socid='.$object->id.'&amp;lineid='.$line->id.'">';
+					print img_delete('default', 'style="vertical-align: middle;"');
+					print '</a>';
+					print '</td>';
+				}
 
-                print "</tr>\n";
-            }
-        } else {
-            $colspan = 9;
-            if ($user->rights->produit->supprimer || $user->rights->service->supprimer) $colspan += 1;
-            print '<tr class="oddeven"><td colspan="'.$colspan.'">'.$langs->trans('None').'</td></tr>';
-        }
+				print "</tr>\n";
+			}
+		} else {
+			$colspan = 9;
+			if ($user->rights->produit->supprimer || $user->rights->service->supprimer) $colspan += 1;
+			print '<tr class="oddeven"><td colspan="'.$colspan.'">'.$langs->trans('None').'</td></tr>';
+		}
 
-        print "</table>";
+		print "</table>";
 
-        print "</form>";
+		print "</form>";
 	}
 }
 
diff --git a/htdocs/societe/project.php b/htdocs/societe/project.php
index 1c2604e0e44..aae44983401 100644
--- a/htdocs/societe/project.php
+++ b/htdocs/societe/project.php
@@ -78,21 +78,21 @@ if ($socid)
 	if (!empty($conf->notification->enabled)) $langs->load("mails");
 	$head = societe_prepare_head($object);
 
-	dol_fiche_head($head, 'project', $langs->trans("ThirdParty"), -1, 'company');
+	print dol_get_fiche_head($head, 'project', $langs->trans("ThirdParty"), -1, 'company');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
+	dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">';
 
-    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-    {
-        print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
-    }
+	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+	{
+		print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+	}
 
 	if ($object->client)
 	{
@@ -116,17 +116,17 @@ if ($socid)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$params = '';
 
 	$newcardbutton .= dolGetButtonTitle($langs->trans("NewProject"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/card.php?action=create&socid='.$object->id.'&amp;backtopage='.urlencode($backtopage), '', 1, $params);
 
-    print '<br>';
+	print '<br>';
 
 
 	// Projects list
-    $result = show_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1, $newcardbutton);
+	$result = show_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1, $newcardbutton);
 }
 
 // End of page
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index 20ddbfa4cf7..0d1ae48e9e3 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -68,11 +68,12 @@ if ($action == 'addcontact' && $user->rights->societe->creer)
 {
 	$result = $object->fetch($id);
 
-    if ($result > 0 && $id > 0)
-    {
-    	$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
-  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
-    }
+	if ($result > 0 && $id > 0)
+	{
+		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
+	}
 
 	if ($result >= 0)
 	{
@@ -94,7 +95,7 @@ elseif ($action == 'swapstatut' && $user->rights->societe->creer)
 {
 	if ($object->fetch($id))
 	{
-	    $result = $object->swapContactStatus(GETPOST('ligne'));
+		$result = $object->swapContactStatus(GETPOST('ligne'));
 	} else {
 		dol_print_error($db);
 	}
@@ -152,22 +153,22 @@ if ($id > 0 || !empty($ref))
 		$soc->fetch($object->socid);
 
 		$head = societe_prepare_head($object);
-		dol_fiche_head($head, 'contact', $langs->trans("ThirdParty"), -1, 'company');
+		print dol_get_fiche_head($head, 'contact', $langs->trans("ThirdParty"), -1, 'company');
 
 		print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
+		dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-    	print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
+		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border centpercent">';
 
-    	// Prospect/Customer
-    	/*print '<tr><td class="titlefield">'.$langs->trans('ProspectCustomer').'</td><td>';
+		// Prospect/Customer
+		/*print '<tr><td class="titlefield">'.$langs->trans('ProspectCustomer').'</td><td>';
     	print $object->getLibCustProspStatut();
     	print '</td></tr>';
 
@@ -178,25 +179,25 @@ if ($id > 0 || !empty($ref))
 
 		if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
 		{
-		    print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+			print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 		}
 
 		if ($object->client)
 		{
-		    print '<tr><td class="titlefield">';
-		    print $langs->trans('CustomerCode').'</td><td colspan="3">';
-		    print $object->code_client;
-		    if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-		    print '</td></tr>';
+			print '<tr><td class="titlefield">';
+			print $langs->trans('CustomerCode').'</td><td colspan="3">';
+			print $object->code_client;
+			if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+			print '</td></tr>';
 		}
 
 		if ($object->fournisseur)
 		{
-		    print '<tr><td class="titlefield">';
-		    print $langs->trans('SupplierCode').'</td><td colspan="3">';
-		    print $object->code_fournisseur;
-		    if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-		    print '</td></tr>';
+			print '<tr><td class="titlefield">';
+			print $langs->trans('SupplierCode').'</td><td colspan="3">';
+			print $object->code_fournisseur;
+			if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+			print '</td></tr>';
 		}
 		print '</table>';
 
diff --git a/htdocs/societe/tpl/linesalesrepresentative.tpl.php b/htdocs/societe/tpl/linesalesrepresentative.tpl.php
index 039379be8c7..4f09bebfe71 100644
--- a/htdocs/societe/tpl/linesalesrepresentative.tpl.php
+++ b/htdocs/societe/tpl/linesalesrepresentative.tpl.php
@@ -29,22 +29,22 @@ print $langs->trans('SalesRepresentatives');
 print '</td>';
 if ($action != 'editsalesrepresentatives' && $user->rights->societe->creer) {
 	print '<td class="right">';
-	print '<a class="editfielda reposition" href="' . $_SERVER["PHP_SELF"] . '?action=editsalesrepresentatives&amp;socid=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('Edit'), 1) . '</a>';
+	print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editsalesrepresentatives&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a>';
 	print '</td>';
 }
 print '</tr></table>';
 print '</td><td colspan="3">';
 
 if ($action == 'editsalesrepresentatives') {
-	print '<form method="post" action="' . $_SERVER['PHP_SELF'] . '">';
+	print '<form method="post" action="'.$_SERVER['PHP_SELF'].'">';
 	print '<input type="hidden" name="action" value="set_salesrepresentatives" />';
-	print '<input type="hidden" name="token" value="' . newToken() . '" />';
-	print '<input type="hidden" name="socid" value="' . $object->id . '" />';
+	print '<input type="hidden" name="token" value="'.newToken().'" />';
+	print '<input type="hidden" name="socid" value="'.$object->id.'" />';
 	$userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', 0, 1);
 	$arrayselected = GETPOST('commercial', 'array');
 	if (empty($arrayselected)) $arrayselected = $object->getSalesRepresentatives($user, 1);
 	print $form->multiselectarray('commercial', $userlist, $arrayselected, null, null, null, null, "90%");
-	print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '" />';
+	print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'" />';
 	print '</form>';
 } else {
 	$listsalesrepresentatives = $object->getSalesRepresentatives($user);
@@ -65,6 +65,6 @@ if ($action == 'editsalesrepresentatives') {
 			print $userstatic->getNomUrl(-1);
 			print ' ';
 		}
-	} else print '<span class="opacitymedium">' . $langs->trans("NoSalesRepresentativeAffected") . '</span>';
+	} else print '<span class="opacitymedium">'.$langs->trans("NoSalesRepresentativeAffected").'</span>';
 	print '</td></tr>';
 }
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index 883908e8d5d..24c4ede34b3 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -127,39 +127,39 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Cancel
-    if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-    {
-        header("Location: ".$backtopage);
-        exit;
-    }
+	// Cancel
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage))
+	{
+		header("Location: ".$backtopage);
+		exit;
+	}
 
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-    	foreach ($objectwebsiteaccount->fields as $key => $val)
-    	{
-    		$search[$key] = '';
-    	}
-    	$toselect = '';
-    	$search_array_options = array();
-    }
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
-    	|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
-    {
-    	$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		foreach ($objectwebsiteaccount->fields as $key => $val)
+		{
+			$search[$key] = '';
+		}
+		$toselect = '';
+		$search_array_options = array();
+	}
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
+	{
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+	}
 
-    // Mass actions
-    $objectclass = 'WebsiteAccount';
-    $objectlabel = 'WebsiteAccount';
-    $permissiontoread = $user->rights->societe->lire;
-    $permissiontodelete = $user->rights->societe->supprimer;
-    $uploaddir = $conf->societe->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+	// Mass actions
+	$objectclass = 'WebsiteAccount';
+	$objectlabel = 'WebsiteAccount';
+	$permissiontoread = $user->rights->societe->lire;
+	$permissiontodelete = $user->rights->societe->supprimer;
+	$uploaddir = $conf->societe->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 
@@ -191,7 +191,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 $head = societe_prepare_head($object);
 
-dol_fiche_head($head, 'website', $langs->trans("ThirdParty"), - 1, 'company');
+print dol_get_fiche_head($head, 'website', $langs->trans("ThirdParty"), - 1, 'company');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -231,14 +231,14 @@ print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 $newcardbutton = '';
 if (!empty($conf->website->enabled)) {
 	if (!empty($user->rights->societe->lire)) {
 		$newcardbutton .= dolGetButtonTitle($langs->trans("AddWebsiteAccount"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/website/websiteaccount_card.php?action=create&fk_soc='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id));
-    } else {
-    	$newcardbutton .= dolGetButtonTitle($langs->trans("AddAction"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/website/websiteaccount_card.php?action=create&fk_soc='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', 0);
+	} else {
+		$newcardbutton .= dolGetButtonTitle($langs->trans("AddAction"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/website/websiteaccount_card.php?action=create&fk_soc='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', 0);
 	}
 }
 
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index efcef759da4..c304a00ce3f 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -82,11 +82,11 @@ if ($action == 'setvalue' && $user->admin)
 	$result = dolibarr_set_const($db, "STRIPE_BANK_ACCOUNT_FOR_PAYMENTS", GETPOST('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 'int'), 'chaine', 0, '', $conf->entity);
 	if (!$result > 0)
 		$error++;
-    $result = dolibarr_set_const($db, "STRIPE_USER_ACCOUNT_FOR_ACTIONS", GETPOST('STRIPE_USER_ACCOUNT_FOR_ACTIONS', 'int'), 'chaine', 0, '', $conf->entity);
-    if (!$result > 0) {
-        $error++;
-    }
-    $result = dolibarr_set_const($db, "STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS", GETPOST('STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 'int'), 'chaine', 0, '', $conf->entity);
+	$result = dolibarr_set_const($db, "STRIPE_USER_ACCOUNT_FOR_ACTIONS", GETPOST('STRIPE_USER_ACCOUNT_FOR_ACTIONS', 'int'), 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) {
+		$error++;
+	}
+	$result = dolibarr_set_const($db, "STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS", GETPOST('STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 'int'), 'chaine', 0, '', $conf->entity);
 	if (!$result > 0)
 		$error++;
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_CSS_URL", GETPOST('ONLINE_PAYMENT_CSS_URL', 'alpha'), 'chaine', 0, '', $conf->entity);
@@ -161,7 +161,7 @@ print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="setvalue">';
 
-dol_fiche_head($head, 'stripeaccount', '', -1);
+print dol_get_fiche_head($head, 'stripeaccount', '', -1);
 
 $stripearrayofwebhookevents = array('account.updated', 'payout.created', 'payout.paid', 'charge.pending', 'charge.refunded', 'charge.succeeded', 'charge.failed', 'payment_intent.succeeded', 'payment_intent.payment_failed', 'payment_method.attached', 'payment_method.updated', 'payment_method.card_automatically_updated', 'payment_method.detached', 'source.chargeable', 'customer.deleted');
 
@@ -169,6 +169,7 @@ print '<span class="opacitymedium">'.$langs->trans("StripeDesc")."</span><br>\n"
 
 print '<br>';
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("AccountParameter").'</td>';
@@ -177,13 +178,13 @@ print '<td></td>';
 print "</tr>\n";
 
 print '<tr class="oddeven">';
-print '<td class="titlefield">';
+print '<td>';
 print $langs->trans("StripeLiveEnabled").'</td><td>';
 if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('STRIPE_LIVE');
+	print ajax_constantonoff('STRIPE_LIVE');
 } else {
-    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("STRIPE_LIVE", $arrval, $conf->global->STRIPE_LIVE);
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $form->selectarray("STRIPE_LIVE", $arrval, $conf->global->STRIPE_LIVE);
 }
 print '</td><td></td></tr>';
 
@@ -204,47 +205,47 @@ if (empty($conf->stripeconnect->enabled))
 	print '<tr class="oddeven"><td>';
 	print '<span class="titlefield">'.$langs->trans("STRIPE_TEST_WEBHOOK_KEY").'</span></td><td>';
 	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
-	    print '<input class="minwidth300" type="text" name="STRIPE_TEST_WEBHOOK_ID" value="'.$conf->global->STRIPE_TEST_WEBHOOK_ID.'">';
-        print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': we_xxxxxxxxxxxxxxxxxxxxxxxx</span><br>';
+		print '<input class="minwidth300" type="text" name="STRIPE_TEST_WEBHOOK_ID" value="'.$conf->global->STRIPE_TEST_WEBHOOK_ID.'">';
+		print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': we_xxxxxxxxxxxxxxxxxxxxxxxx</span><br>';
 	}
 	print '<input class="minwidth300" type="text" name="STRIPE_TEST_WEBHOOK_KEY" value="'.$conf->global->STRIPE_TEST_WEBHOOK_KEY.'">';
 	print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx</span>';
-	  $out = img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForTestWebhook").' ';
-    $url = dol_buildpath('/public/stripe/ipn.php?test', 3);
-	$out .= '<input type="text" id="onlinetestwebhookurl" class="minwidth500" value="'.$url.'">';
+	  $out = img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForTestWebhook").'</span> ';
+	$url = dol_buildpath('/public/stripe/ipn.php?test', 3);
+	$out .= '<input type="text" id="onlinetestwebhookurl" class="minwidth500" value="'.$url.'" disabled>';
 	$out .= ajax_autoselect("onlinetestwebhookurl", 0);
 	print '<br>'.$out;
 	print '</td><td>';
 	if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 	{
-	    if (!empty($conf->global->STRIPE_TEST_WEBHOOK_KEY) && !empty($conf->global->STRIPE_TEST_SECRET_KEY) && !empty($conf->global->STRIPE_TEST_WEBHOOK_ID))
-    	{
-            \Stripe\Stripe::setApiKey($conf->global->STRIPE_TEST_SECRET_KEY);
-            $endpoint = \Stripe\WebhookEndpoint::retrieve($conf->global->STRIPE_TEST_WEBHOOK_ID);
-            $endpoint->enabled_events = $stripearrayofwebhookevents;
-            if (GETPOST('webhook', 'alpha') == $conf->global->STRIPE_TEST_WEBHOOK_ID) {
-                if (!GETPOST('status', 'alpha')) {
-                    $endpoint->disabled = true;
-                } else {
-                    $endpoint->disabled = false;
-                }
-            }
-            $endpoint->url = dol_buildpath('/public/stripe/ipn.php?test', 3);
-            $endpoint->save();
-            if ($endpoint->status == 'enabled')
-            {
-            	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=0">';
-            	print img_picto($langs->trans("Activated"), 'switch_on');
-            } else {
-            	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=1">';
-            	print img_picto($langs->trans("Disabled"), 'switch_off');
-            }
-            //print $endpoint;
-        } else {
-            print img_picto($langs->trans("inactive"), 'statut5');
-        }
+		if (!empty($conf->global->STRIPE_TEST_WEBHOOK_KEY) && !empty($conf->global->STRIPE_TEST_SECRET_KEY) && !empty($conf->global->STRIPE_TEST_WEBHOOK_ID))
+		{
+			\Stripe\Stripe::setApiKey($conf->global->STRIPE_TEST_SECRET_KEY);
+			$endpoint = \Stripe\WebhookEndpoint::retrieve($conf->global->STRIPE_TEST_WEBHOOK_ID);
+			$endpoint->enabled_events = $stripearrayofwebhookevents;
+			if (GETPOST('webhook', 'alpha') == $conf->global->STRIPE_TEST_WEBHOOK_ID) {
+				if (!GETPOST('status', 'alpha')) {
+					$endpoint->disabled = true;
+				} else {
+					$endpoint->disabled = false;
+				}
+			}
+			$endpoint->url = dol_buildpath('/public/stripe/ipn.php?test', 3);
+			$endpoint->save();
+			if ($endpoint->status == 'enabled')
+			{
+				print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=0">';
+				print img_picto($langs->trans("Activated"), 'switch_on');
+			} else {
+				print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=1">';
+				print img_picto($langs->trans("Disabled"), 'switch_off');
+			}
+			//print $endpoint;
+		} else {
+			print img_picto($langs->trans("inactive"), 'statut5');
+		}
 	}
-    print'</td></tr>';
+	print'</td></tr>';
 } else {
 	print '<tr class="oddeven"><td>'.$langs->trans("StripeConnect").'</td>';
 	print '<td><b>'.$langs->trans("StripeConnect_Mode").'</b><br/>';
@@ -273,47 +274,47 @@ if (empty($conf->stripeconnect->enabled))
 	print '<tr class="oddeven"><td>';
 	print '<span class="titlefield">'.$langs->trans("STRIPE_LIVE_WEBHOOK_KEY").'</span></td><td>';
 	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
-        print '<input class="minwidth300" type="text" name="STRIPE_LIVE_WEBHOOK_ID" value="'.$conf->global->STRIPE_LIVE_WEBHOOK_ID.'">';
-        print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': we_xxxxxxxxxxxxxxxxxxxxxxxx</span><br>';
+		print '<input class="minwidth300" type="text" name="STRIPE_LIVE_WEBHOOK_ID" value="'.$conf->global->STRIPE_LIVE_WEBHOOK_ID.'">';
+		print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': we_xxxxxxxxxxxxxxxxxxxxxxxx</span><br>';
 	}
 	print '<input class="minwidth300" type="text" name="STRIPE_LIVE_WEBHOOK_KEY" value="'.$conf->global->STRIPE_LIVE_WEBHOOK_KEY.'">';
 	print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx</span>';
-    $out = img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForLiveWebhook").' ';
-    $url = dol_buildpath('/public/stripe/ipn.php', 3);
-	$out .= '<input type="text" id="onlinelivewebhookurl" class="minwidth500" value="'.$url.'">';
+	$out = img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForLiveWebhook").'</span> ';
+	$url = dol_buildpath('/public/stripe/ipn.php', 3);
+	$out .= '<input type="text" id="onlinelivewebhookurl" class="minwidth500" value="'.$url.'" disabled>';
 	$out .= ajax_autoselect("onlinelivewebhookurl", 0);
 	print '<br>'.$out;
 	print '</td><td>';
 	if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 	{
-	    if (!empty($conf->global->STRIPE_LIVE_WEBHOOK_KEY) && !empty($conf->global->STRIPE_LIVE_SECRET_KEY) && !empty($conf->global->STRIPE_LIVE_WEBHOOK_ID))
-	    {
-            \Stripe\Stripe::setApiKey($conf->global->STRIPE_LIVE_SECRET_KEY);
-            $endpoint = \Stripe\WebhookEndpoint::retrieve($conf->global->STRIPE_LIVE_WEBHOOK_ID);
-            $endpoint->enabled_events = $stripearrayofwebhookevents;
-            if (GETPOST('webhook', 'alpha') == $conf->global->STRIPE_LIVE_WEBHOOK_ID) {
-                if (empty(GETPOST('status', 'alpha'))) {
-                    $endpoint->disabled = true;
-                } else {
-                    $endpoint->disabled = false;
-                }
-            }
-            $endpoint->url = dol_buildpath('/public/stripe/ipn.php', 3);
-            $endpoint->save();
-            if ($endpoint->status == 'enabled')
-            {
-                print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=0">';
-                print img_picto($langs->trans("Activated"), 'switch_on');
-            } else {
-                print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=1">';
-                print img_picto($langs->trans("Disabled"), 'switch_off');
-            }
-            //print $endpoint;
-        } else {
-            print img_picto($langs->trans("inactive"), 'statut5');
-        }
+		if (!empty($conf->global->STRIPE_LIVE_WEBHOOK_KEY) && !empty($conf->global->STRIPE_LIVE_SECRET_KEY) && !empty($conf->global->STRIPE_LIVE_WEBHOOK_ID))
+		{
+			\Stripe\Stripe::setApiKey($conf->global->STRIPE_LIVE_SECRET_KEY);
+			$endpoint = \Stripe\WebhookEndpoint::retrieve($conf->global->STRIPE_LIVE_WEBHOOK_ID);
+			$endpoint->enabled_events = $stripearrayofwebhookevents;
+			if (GETPOST('webhook', 'alpha') == $conf->global->STRIPE_LIVE_WEBHOOK_ID) {
+				if (empty(GETPOST('status', 'alpha'))) {
+					$endpoint->disabled = true;
+				} else {
+					$endpoint->disabled = false;
+				}
+			}
+			$endpoint->url = dol_buildpath('/public/stripe/ipn.php', 3);
+			$endpoint->save();
+			if ($endpoint->status == 'enabled')
+			{
+				print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=0">';
+				print img_picto($langs->trans("Activated"), 'switch_on');
+			} else {
+				print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=1">';
+				print img_picto($langs->trans("Disabled"), 'switch_off');
+			}
+			//print $endpoint;
+		} else {
+			print img_picto($langs->trans("inactive"), 'statut5');
+		}
 	}
-    print '</td></tr>';
+	print '</td></tr>';
 } else {
 	print '<tr class="oddeven"><td>'.$langs->trans("StripeConnect").'</td>';
 	print '<td>'.$langs->trans("StripeConnect_Mode").'</td><td></td></tr>';
@@ -321,13 +322,15 @@ if (empty($conf->stripeconnect->enabled))
 
 
 print '</table>';
+print '</div>';
 
 print '<br>';
 
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
-print '<td class="titlefield">'.$langs->trans("UsageParameter").'</td>';
+print '<td>'.$langs->trans("UsageParameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
@@ -339,11 +342,12 @@ print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("StripeUserAccountForActions").'</td><td>';
-print $form->select_dolusers($conf->global->STRIPE_USER_ACCOUNT_FOR_ACTIONS, 'STRIPE_USER_ACCOUNT_FOR_ACTIONS', 0);
+print img_picto('', 'user').$form->select_dolusers($conf->global->STRIPE_USER_ACCOUNT_FOR_ACTIONS, 'STRIPE_USER_ACCOUNT_FOR_ACTIONS', 0);
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("BankAccount").'</td><td>';
+print img_picto('', 'bank_account').' ';
 $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS, 'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
 print '</td></tr>';
 
@@ -358,14 +362,14 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// What is this for ?
 // Activate Payment Request API
 if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// TODO Not used by current code
 {
-    print '<tr class="oddeven"><td>';
+	print '<tr class="oddeven"><td>';
 	print $langs->trans("STRIPE_PAYMENT_REQUEST_API").'</td><td>';
-    if ($conf->use_javascript_ajax) {
-        print ajax_constantonoff('STRIPE_PAYMENT_REQUEST_API');
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("STRIPE_PAYMENT_REQUEST_API", $arrval, $conf->global->STRIPE_PAYMENT_REQUEST_API);
-    }
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('STRIPE_PAYMENT_REQUEST_API');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("STRIPE_PAYMENT_REQUEST_API", $arrval, $conf->global->STRIPE_PAYMENT_REQUEST_API);
+	}
 	print '</td></tr>';
 }
 
@@ -374,12 +378,12 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// TODO Not used by current code
 {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("STRIPE_SEPA_DIRECT_DEBIT").'</td><td>';
-    if ($conf->use_javascript_ajax) {
-        print ajax_constantonoff('STRIPE_SEPA_DIRECT_DEBIT');
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("STRIPE_SEPA_DIRECT_DEBIT", $arrval, $conf->global->STRIPE_SEPA_DIRECT_DEBIT);
-    }
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('STRIPE_SEPA_DIRECT_DEBIT');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("STRIPE_SEPA_DIRECT_DEBIT", $arrval, $conf->global->STRIPE_SEPA_DIRECT_DEBIT);
+	}
 	print '</td></tr>';
 }
 
@@ -437,6 +441,19 @@ print '<input class="minwidth200" type="text" name="ONLINE_PAYMENT_SENDEMAIL" va
 print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': myemail@myserver.com, Payment service &lt;myemail2@myserver2.com&gt;</span>';
 print '</td></tr>';
 
+print '</table>';
+print '</div>';
+
+print '<br>';
+
+print '<div class="div-table-responsive-no-min">';
+print '<table class="noborder centpercent">';
+
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("UrlGenerationParameters").'</td>';
+print '<td>'.$langs->trans("Value").'</td>';
+print "</tr>\n";
+
 // Payment token for URL
 print '<tr class="oddeven"><td>';
 print $langs->trans("SecurityToken").'</td><td>';
@@ -444,7 +461,7 @@ print '<input class="minwidth300"  type="text" id="PAYMENT_SECURITY_TOKEN" name=
 if (!empty($conf->use_javascript_ajax)) {
 	print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
 }
-if (! empty($conf->global->PAYMENT_SECURITY_ACCEPT_ANY_TOKEN)) {
+if (!empty($conf->global->PAYMENT_SECURITY_ACCEPT_ANY_TOKEN)) {
 	$langs->load("errors");
 	print img_warning($langs->trans("WarningTheHiddenOptionIsOn", 'PAYMENT_SECURITY_ACCEPT_ANY_TOKEN'), '', 'pictowarning marginleftonly');
 }
@@ -453,18 +470,19 @@ print '</td></tr>';
 print '<tr class="oddeven"><td>';
 print $langs->trans("SecurityTokenIsUnique").'</td><td>';
 if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('PAYMENT_SECURITY_TOKEN_UNIQUE');
+	print ajax_constantonoff('PAYMENT_SECURITY_TOKEN_UNIQUE');
 } else {
-    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("PAYMENT_SECURITY_TOKEN_UNIQUE", $arrval, $conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE);
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $form->selectarray("PAYMENT_SECURITY_TOKEN_UNIQUE", $arrval, $conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE);
 }
 print '</td></tr>';
 
 print '</table>';
+print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
+print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
 
 print '</form>';
 
@@ -481,12 +499,14 @@ if (!empty($conf->use_javascript_ajax))
 {
 	print "\n".'<script type="text/javascript">';
 	print '$(document).ready(function () {
-            $("#apidoc").hide();
-            $("#apidoca").click(function() {
-                $("#apidoc").show();
-            	$("#apidoca").hide();
-            });
-    });';
+	            $("#apidoc").hide();
+	            $("#apidoca").click(function() {
+					console.log("We click on apidoca show/hide");
+	                $("#apidoc").show();
+	            	$("#apidoca").hide();
+					return false;
+	            });
+		   });';
 	print '</script>';
 }
 
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index 8544417b2e4..beadfee1a89 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -76,8 +76,7 @@ $stripeacc = $stripe->getStripeAccount($service);
 	print $langs->trans('ErrorStripeAccountNotDefined');
 }*/
 
-if (!$rowid)
-{
+if (!$rowid) {
 	$option = array('limit' => $limit + 1);
 	$num = 0;
 
@@ -102,185 +101,185 @@ if (!$rowid)
 		//$param.='&ending_before_'.($page+1).'='.$list->data[($limit-1)]->id;
 
 		$moreforfilter = '';
-
-		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	    print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-	    print '<input type="hidden" name="action" value="list">';
-	    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-	    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	    print '<input type="hidden" name="page" value="'.$page.'">';
-
-	    $title = $langs->trans("StripeChargeList");
-	    $title .= ($stripeacc ? ' (Stripe connection with Stripe OAuth Connect account '.$stripeacc.')' : ' (Stripe connection with keys from Stripe module setup)');
-
-		print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy.png', 0, '', 'hidepaginationprevious', $limit);
-
-	    print '<div class="div-table-responsive">';
-	    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
-
-	    print '<tr class="liste_titre">';
-	    print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
-	    print_liste_field_titre("StripeCustomerId", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
-	    print_liste_field_titre("Customer", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
-	    print_liste_field_titre("Origin", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
-	    print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center ');
-	    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'left ');
-	    print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right ');
-	    print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", '', '', '', 'right ');
-	    print "</tr>\n";
-
-		//print $list;
-		$i = 0;
-		foreach ($list->data as $charge)
-		{
-			if ($i >= $limit) {
-				break;
-			}
-
-		    if ($charge->refunded == '1') {
-		    	$status = img_picto($langs->trans("refunded"), 'statut6');
-		    } elseif ($charge->paid == '1') {
-	            $status = img_picto($langs->trans((string) $charge->status), 'statut4');
-		    } else {
-		    	$label = $langs->trans("Message").": ".$charge->failure_message."<br>";
-		    	$label .= $langs->trans("Network").": ".$charge->outcome->network_status."<br>";
-		    	$label .= $langs->trans("Status").": ".$langs->trans((string) $charge->outcome->seller_message);
-		    	$status = $form->textwithpicto(img_picto($langs->trans((string) $charge->status), 'statut8'), $label, -1);
-		    }
-
-	        if ($charge->payment_method_details->type == 'card') {
-			    $type = $langs->trans("card");
-		    } elseif ($charge->source->type == 'card') {
-				$type = $langs->trans("card");
-		    } elseif ($charge->payment_method_details->type == 'three_d_secure') {
-				$type = $langs->trans("card3DS");
-		    } elseif ($charge->payment_method_details->type == 'sepa_debit') {
-				$type = $langs->trans("sepadebit");
-		    } elseif ($charge->payment_method_details->type == 'ideal') {
-				$type = $langs->trans("iDEAL");
-		    }
-
-		    // Why this ?
-	        /*if (! empty($charge->payment_intent)) {
-				if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
-		    		$charge = \Stripe\PaymentIntent::retrieve($charge->payment_intent);
-				} else {
-					$charge = \Stripe\PaymentIntent::retrieve($charge->payment_intent, array("stripe_account" => $stripeacc));
-				}
-	        }*/
-
-			// The metadata FULLTAG is defined by the online payment page
-			$FULLTAG = $charge->metadata->FULLTAG;
-
-			// Save into $tmparray all metadata
-			$tmparray = dolExplodeIntoArray($FULLTAG, '.', '=');
-			// Load origin object according to metadata
-			if (!empty($tmparray['CUS']) && $tmparray['CUS'] > 0)
-			{
-				$societestatic->fetch($tmparray['CUS']);
-			} elseif (!empty($charge->metadata->dol_thirdparty_id) && $charge->metadata->dol_thirdparty_id > 0)
-			{
-				$societestatic->fetch($charge->metadata->dol_thirdparty_id);
-			} else {
-				$societestatic->id = 0;
-			}
-			if (!empty($tmparray['MEM']) && $tmparray['MEM'] > 0)
-			{
-				$memberstatic->fetch($tmparray['MEM']);
-			} else {
-				$memberstatic->id = 0;
-			}
-
-			print '<tr class="oddeven">';
-
-	        if (!empty($stripeacc)) $connect = $stripeacc.'/';
-
-			// Ref
-			$url = 'https://dashboard.stripe.com/'.$connect.'test/payments/'.$charge->id;
-	        if ($servicestatus)
-	        {
-	        	$url = 'https://dashboard.stripe.com/'.$connect.'payments/'.$charge->id;
-	        }
-			print "<td>";
-	        print "<a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'globe')." ".$charge->id."</a>";
-	        if ($charge->payment_intent) print '<br><span class="opacitymedium">'.$charge->payment_intent.'</span>';
-			print "</td>\n";
-
-			// Stripe customer
-			print "<td>";
-	        if (!empty($conf->stripe->enabled) && !empty($stripeacc)) $connect = $stripeacc.'/';
-			$url = 'https://dashboard.stripe.com/'.$connect.'test/customers/'.$charge->customer;
-			if ($servicestatus)
-			{
-	            $url = 'https://dashboard.stripe.com/'.$connect.'customers/'.$charge->customer;
-			}
-			if (!empty($charge->customer))
-			{
-	    		print '<a href="'.$url.'" target="_stripe">'.img_picto($langs->trans('ShowInStripe'), 'globe').' '.$charge->customer.'</a>';
-			}
-	        print "</td>\n";
-
-			// Link
-			print "<td>";
-			if ($societestatic->id > 0)
-			{
-				print $societestatic->getNomUrl(1);
-			} elseif ($memberstatic->id > 0)
-			{
-				print $memberstatic->getNomUrl(1);
-			}
-			print "</td>\n";
-
-			// Origin
-			print "<td>";
-			if ($charge->metadata->dol_type == "order" || $charge->metadata->dol_type == "commande") {
-				$object = new Commande($db);
-				$object->fetch($charge->metadata->dol_id);
-	            if ($object->id > 0) {
-	                print "<a href='".DOL_URL_ROOT."/commande/card.php?id=".$object->id."'>".img_picto('', 'object_order')." ".$object->ref."</a>";
-	            } else {
-	                print $FULLTAG;
-	            }
-			} elseif ($charge->metadata->dol_type == "invoice" || $charge->metadata->dol_type == "facture") {
-				print $charge->metadata->dol_type.' '.$charge->metadata->dol_id.' - ';
-				$object = new Facture($db);
-				$object->fetch($charge->metadata->dol_id);
-	            if ($object->id > 0) {
-			        print "<a href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->dol_id."'>".img_picto('', 'object_invoice')." ".$object->ref."</a>";
-	            } else {
-					print $FULLTAG;
-				}
-			} else {
-				print $FULLTAG;
-			}
-		    print "</td>\n";
-
-			// Date payment
-		    print '<td class="center">'.dol_print_date($charge->created, '%d/%m/%Y %H:%M')."</td>\n";
-		    // Type
-		    print '<td>';
-			print $type;
-		    print '</td>';
-		    // Amount
-		    print '<td class="right">'.price(($charge->amount - $charge->amount_refunded) / 100, 0, '', 1, - 1, - 1, strtoupper($charge->currency))."</td>";
-		    // Status
-		    print '<td class="right">';
-		    print $status;
-		    print "</td>\n";
-
-		    print "</tr>\n";
-
-		    $i++;
-		}
-
-		print '</table>';
-		print '</div>';
-		print '</form>';
 	} catch (Exception $e) {
 		print $e->getMessage();
 	}
+
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
+
+	$title = $langs->trans("StripeChargeList");
+	$title .= ($stripeacc ? ' (Stripe connection with Stripe OAuth Connect account '.$stripeacc.')' : ' (Stripe connection with keys from Stripe module setup)');
+
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy.png', 0, '', 'hidepaginationprevious', $limit);
+
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre("StripeCustomerId", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre("Customer", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre("Origin", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'left ');
+	print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", '', '', '', 'right ');
+	print "</tr>\n";
+
+	//print $list;
+	$i = 0;
+	foreach ($list->data as $charge)
+	{
+		if ($i >= $limit) {
+			break;
+		}
+
+		if ($charge->refunded == '1') {
+			$status = img_picto($langs->trans("refunded"), 'statut6');
+		} elseif ($charge->paid == '1') {
+			$status = img_picto($langs->trans((string) $charge->status), 'statut4');
+		} else {
+			$label = $langs->trans("Message").": ".$charge->failure_message."<br>";
+			$label .= $langs->trans("Network").": ".$charge->outcome->network_status."<br>";
+			$label .= $langs->trans("Status").": ".$langs->trans((string) $charge->outcome->seller_message);
+			$status = $form->textwithpicto(img_picto($langs->trans((string) $charge->status), 'statut8'), $label, -1);
+		}
+
+		if ($charge->payment_method_details->type == 'card') {
+			$type = $langs->trans("card");
+		} elseif ($charge->source->type == 'card') {
+			$type = $langs->trans("card");
+		} elseif ($charge->payment_method_details->type == 'three_d_secure') {
+			$type = $langs->trans("card3DS");
+		} elseif ($charge->payment_method_details->type == 'sepa_debit') {
+			$type = $langs->trans("sepadebit");
+		} elseif ($charge->payment_method_details->type == 'ideal') {
+			$type = $langs->trans("iDEAL");
+		}
+
+		// Why this ?
+		/*if (! empty($charge->payment_intent)) {
+		 if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
+		 $charge = \Stripe\PaymentIntent::retrieve($charge->payment_intent);
+		 } else {
+		 $charge = \Stripe\PaymentIntent::retrieve($charge->payment_intent, array("stripe_account" => $stripeacc));
+		 }
+		 }*/
+
+		// The metadata FULLTAG is defined by the online payment page
+		$FULLTAG = $charge->metadata->FULLTAG;
+
+		// Save into $tmparray all metadata
+		$tmparray = dolExplodeIntoArray($FULLTAG, '.', '=');
+		// Load origin object according to metadata
+		if (!empty($tmparray['CUS']) && $tmparray['CUS'] > 0)
+		{
+			$societestatic->fetch($tmparray['CUS']);
+		} elseif (!empty($charge->metadata->dol_thirdparty_id) && $charge->metadata->dol_thirdparty_id > 0)
+		{
+			$societestatic->fetch($charge->metadata->dol_thirdparty_id);
+		} else {
+			$societestatic->id = 0;
+		}
+		if (!empty($tmparray['MEM']) && $tmparray['MEM'] > 0)
+		{
+			$memberstatic->fetch($tmparray['MEM']);
+		} else {
+			$memberstatic->id = 0;
+		}
+
+		print '<tr class="oddeven">';
+
+		if (!empty($stripeacc)) $connect = $stripeacc.'/';
+
+		// Ref
+		$url = 'https://dashboard.stripe.com/'.$connect.'test/payments/'.$charge->id;
+		if ($servicestatus)
+		{
+			$url = 'https://dashboard.stripe.com/'.$connect.'payments/'.$charge->id;
+		}
+		print "<td>";
+		print "<a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'globe')." ".$charge->id."</a>";
+		if ($charge->payment_intent) print '<br><span class="opacitymedium">'.$charge->payment_intent.'</span>';
+		print "</td>\n";
+
+		// Stripe customer
+		print "<td>";
+		if (!empty($conf->stripe->enabled) && !empty($stripeacc)) $connect = $stripeacc.'/';
+		$url = 'https://dashboard.stripe.com/'.$connect.'test/customers/'.$charge->customer;
+		if ($servicestatus)
+		{
+			$url = 'https://dashboard.stripe.com/'.$connect.'customers/'.$charge->customer;
+		}
+		if (!empty($charge->customer))
+		{
+			print '<a href="'.$url.'" target="_stripe">'.img_picto($langs->trans('ShowInStripe'), 'globe').' '.$charge->customer.'</a>';
+		}
+		print "</td>\n";
+
+		// Link
+		print "<td>";
+		if ($societestatic->id > 0)
+		{
+			print $societestatic->getNomUrl(1);
+		} elseif ($memberstatic->id > 0)
+		{
+			print $memberstatic->getNomUrl(1);
+		}
+		print "</td>\n";
+
+		// Origin
+		print "<td>";
+		if ($charge->metadata->dol_type == "order" || $charge->metadata->dol_type == "commande") {
+			$object = new Commande($db);
+			$object->fetch($charge->metadata->dol_id);
+			if ($object->id > 0) {
+				print "<a href='".DOL_URL_ROOT."/commande/card.php?id=".$object->id."'>".img_picto('', 'object_order')." ".$object->ref."</a>";
+			} else {
+				print $FULLTAG;
+			}
+		} elseif ($charge->metadata->dol_type == "invoice" || $charge->metadata->dol_type == "facture") {
+			print $charge->metadata->dol_type.' '.$charge->metadata->dol_id.' - ';
+			$object = new Facture($db);
+			$object->fetch($charge->metadata->dol_id);
+			if ($object->id > 0) {
+				print "<a href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->dol_id."'>".img_picto('', 'object_invoice')." ".$object->ref."</a>";
+			} else {
+				print $FULLTAG;
+			}
+		} else {
+			print $FULLTAG;
+		}
+		print "</td>\n";
+
+		// Date payment
+		print '<td class="center">'.dol_print_date($charge->created, '%d/%m/%Y %H:%M')."</td>\n";
+		// Type
+		print '<td>';
+		print $type;
+		print '</td>';
+		// Amount
+		print '<td class="right">'.price(($charge->amount - $charge->amount_refunded) / 100, 0, '', 1, - 1, - 1, strtoupper($charge->currency))."</td>";
+		// Status
+		print '<td class="right">';
+		print $status;
+		print "</td>\n";
+
+		print "</tr>\n";
+
+		$i++;
+	}
+
+	print '</table>';
+	print '</div>';
+	print '</form>';
 }
 
 // End of page
diff --git a/htdocs/stripe/class/actions_stripe.class.php b/htdocs/stripe/class/actions_stripe.class.php
index a7a868f7e4a..159444bb029 100644
--- a/htdocs/stripe/class/actions_stripe.class.php
+++ b/htdocs/stripe/class/actions_stripe.class.php
@@ -37,9 +37,9 @@ $langs->load("stripe@stripe");
 class ActionsStripeconnect
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	private $config = array();
 
@@ -53,10 +53,10 @@ class ActionsStripeconnect
 	 *
 	 *	@param	DoliDB	$db		Database handler
 	 */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
 	/**
@@ -65,10 +65,10 @@ class ActionsStripeconnect
 	 * @param	array	$parameters		Parameters
 	 * @param	Object	$object			Object
 	 * @param	string	$action			Action
-     * @return bool
+	 * @return bool
 	 */
-    public function formObjectOptions($parameters, &$object, &$action)
-    {
+	public function formObjectOptions($parameters, &$object, &$action)
+	{
 		global $db, $conf, $user, $langs, $form;
 
 		if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha')))
@@ -160,7 +160,7 @@ class ActionsStripeconnect
 			$this->resprints .= '</td></tr>';
 		}
 		return 0;
-    }
+	}
 
 	/**
 	 * addMoreActionsButtons
@@ -170,8 +170,8 @@ class ActionsStripeconnect
 	 * @param string	$action		action
 	 * @return int					0
 	 */
-    public function addMoreActionsButtons($parameters, &$object, &$action)
-    {
+	public function addMoreActionsButtons($parameters, &$object, &$action)
+	{
 		global $db, $conf, $user, $langs, $form;
 		if (is_object($object) && $object->element == 'facture') {
 			// On verifie si la facture a des paiements
@@ -220,5 +220,5 @@ class ActionsStripeconnect
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("StripeAutoSubscription")).'">'.$langs->trans("StripeAutoSubscription").'</a>';
 		}
 		return 0;
-    }
+	}
 }
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index a710f092b89..93f1ed066af 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -110,7 +110,7 @@ class Stripe extends CommonObject
 				$obj = $this->db->fetch_object($result);
 				$tokenstring = $obj->tokenstring;
 
-				$tmparray = dol_json_decode($tokenstring);
+				$tmparray = json_decode($tokenstring);
 				$key = $tmparray->stripe_user_id;
 			} else {
 				$tokenstring = '';
@@ -186,9 +186,11 @@ class Stripe extends CommonObject
 
 				try {
 					if (empty($key)) {				// If the Stripe connect account not set, we use common API usage
-						$customer = \Stripe\Customer::retrieve("$tiers");
+						//$customer = \Stripe\Customer::retrieve("$tiers");
+						$customer = \Stripe\Customer::retrieve(array('id'=>"$tiers", 'expand[]'=>'sources'));
 					} else {
-						$customer = \Stripe\Customer::retrieve("$tiers", array("stripe_account" => $key));
+						//$customer = \Stripe\Customer::retrieve("$tiers", array("stripe_account" => $key));
+						$customer = \Stripe\Customer::retrieve(array('id'=>"$tiers", 'expand[]'=>'sources'), array("stripe_account" => $key));
 					}
 				} catch (Exception $e)
 				{
@@ -299,7 +301,7 @@ class Stripe extends CommonObject
 	 * Warning. If a payment was tried and failed, a payment intent was created.
 	 * But if we change something on object to pay (amount or other), reusing same payment intent is not allowed by Stripe.
 	 * Recommended solution is to recreate a new payment intent each time we need one (old one will be automatically closed after a delay),
-	 * that's why i comment the part of code to retreive a payment intent with object id (never mind if we cumulate payment intent with old ones that will not be used)
+	 * that's why i comment the part of code to retrieve a payment intent with object id (never mind if we cumulate payment intent with old ones that will not be used)
 	 * Note: This is used when option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION is on when making a payment from the public/payment/newpayment.php page
 	 * but not when using the STRIPE_USE_NEW_CHECKOUT.
 	 *
@@ -354,7 +356,7 @@ class Stripe extends CommonObject
 			// But if we change something on object to pay (amount or other that does not change the idempotency key), reusing same payment intent is not allowed by Stripe.
 			// Recommended solution is to recreate a new payment intent each time we need one (old one will be automatically closed by Stripe after a delay), Stripe will
 			// automatically return the existing payment intent if idempotency is provided when we try to create the new one.
-			// That's why we can comment the part of code to retreive a payment intent with object id (never mind if we cumulate payment intent with old ones that will not be used)
+			// That's why we can comment the part of code to retrieve a payment intent with object id (never mind if we cumulate payment intent with old ones that will not be used)
 
 			$sql = "SELECT pi.ext_payment_id, pi.entity, pi.fk_facture, pi.sourcetype, pi.ext_payment_site";
 			$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pi";
@@ -536,7 +538,7 @@ class Stripe extends CommonObject
 	 * Warning. If a payment was tried and failed, a payment intent was created.
 	 * But if we change something on object to pay (amount or other), reusing same payment intent is not allowed.
 	 * Recommanded solution is to recreate a new payment intent each time we need one (old one will be automatically closed after a delay),
-	 * that's why i comment the part of code to retreive a payment intent with object id (never mind if we cumulate payment intent with old ones that will not be used)
+	 * that's why i comment the part of code to retrieve a payment intent with object id (never mind if we cumulate payment intent with old ones that will not be used)
 	 * Note: This is used when option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION is on when making a payment from the public/payment/newpayment.php page
 	 * but not when using the STRIPE_USE_NEW_CHECKOUT.
 	 *
@@ -680,7 +682,7 @@ class Stripe extends CommonObject
 	/**
 	 * Get the Stripe card of a company payment mode (option to create it on Stripe if not linked yet is no more available on new Stripe API)
 	 *
-	 * @param	\Stripe\StripeCustomer	$cu								Object stripe customer
+	 * @param	\Stripe\StripeCustomer	$cu								Object stripe customer.
 	 * @param	CompanyPaymentMode		$object							Object companypaymentmode to check, or create on stripe (create on stripe also update the societe_rib table for current entity)
 	 * @param	string					$stripeacc						''=Use common API. If not '', it is the Stripe connect account 'acc_....' to use Stripe connect
 	 * @param	int						$status							Status (0=test, 1=live)
@@ -711,14 +713,14 @@ class Stripe extends CommonObject
 				{
 					try {
 						if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
-							if (!preg_match('/^pm_/', $cardref))
+							if (!preg_match('/^pm_/', $cardref) && !empty($cu->sources))
 							{
 								$card = $cu->sources->retrieve($cardref);
 							} else {
 								$card = \Stripe\PaymentMethod::retrieve($cardref);
 							}
 						} else {
-							if (!preg_match('/^pm_/', $cardref))
+							if (!preg_match('/^pm_/', $cardref) && !empty($cu->sources))
 							{
 								//$card = $cu->sources->retrieve($cardref, array("stripe_account" => $stripeacc));		// this API fails when array stripe_account is provided
 								$card = $cu->sources->retrieve($cardref);
@@ -740,9 +742,11 @@ class Stripe extends CommonObject
 					$cvc = $obj->cvn; // cvn in database, cvc for stripe
 					$cardholdername = $obj->proprio;
 
+					$ipaddress = getUserRemoteIP();
+
 					$dataforcard = array(
 						"source" => array('object'=>'card', 'exp_month'=>$exp_date_month, 'exp_year'=>$exp_date_year, 'number'=>$number, 'cvc'=>$cvc, 'name'=>$cardholdername),
-						"metadata" => array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']))
+						"metadata" => array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>$ipaddress)
 					);
 
 					//$a = \Stripe\Stripe::getApiKey();
@@ -887,6 +891,8 @@ class Stripe extends CommonObject
 			$description = "INV=".$ref.".CUS=".$societe->id.".PM=stripe";
 		}
 
+		$ipaddress = getUserRemoteIP();
+
 		$metadata = array(
 			"dol_id" => "".$item."",
 			"dol_type" => "".$origin."",
@@ -894,7 +900,7 @@ class Stripe extends CommonObject
 			'dol_thirdparty_name' => $societe->name,
 			'dol_version'=>DOL_VERSION,
 			'dol_entity'=>$conf->entity,
-			'ipaddress'=>(empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR'])
+			'ipaddress'=>$ipaddress
 		);
 		$return = new Stripe($this->db);
 		try {
@@ -1034,7 +1040,7 @@ class Stripe extends CommonObject
 
 			if (preg_match('/pm_/i', $source))
 			{
-				$return->message = 'Payment retreived by card status = '.$charge->status;
+				$return->message = 'Payment retrieved by card status = '.$charge->status;
 			} else {
 				if ($charge->source->type == 'card') {
 					$return->message = $charge->source->card->brand." ....".$charge->source->card->last4;
diff --git a/htdocs/stripe/config.php b/htdocs/stripe/config.php
index e6dc75c04ec..c7fa11df498 100644
--- a/htdocs/stripe/config.php
+++ b/htdocs/stripe/config.php
@@ -34,12 +34,12 @@ global $stripearrayofkeysbyenv;
 
 $stripearrayofkeysbyenv = array(
 	0=>array(
-		"secret_key"      => $conf->global->STRIPE_TEST_SECRET_KEY,
-		"publishable_key" => $conf->global->STRIPE_TEST_PUBLISHABLE_KEY
+		"secret_key"      => empty($conf->global->STRIPE_TEST_SECRET_KEY) ? '' : $conf->global->STRIPE_TEST_SECRET_KEY,
+		"publishable_key" => empty($conf->global->STRIPE_TEST_PUBLISHABLE_KEY) ? '' : $conf->global->STRIPE_TEST_PUBLISHABLE_KEY
 	),
 	1=>array(
-		"secret_key"      => $conf->global->STRIPE_LIVE_SECRET_KEY,
-		"publishable_key" => $conf->global->STRIPE_LIVE_PUBLISHABLE_KEY
+		"secret_key"      => empty($conf->global->STRIPE_LIVE_SECRET_KEY) ? '' : $conf->global->STRIPE_LIVE_SECRET_KEY,
+		"publishable_key" => empty($conf->global->STRIPE_LIVE_PUBLISHABLE_KEY) ? '' : $conf->global->STRIPE_LIVE_PUBLISHABLE_KEY
 	)
 );
 
@@ -53,4 +53,4 @@ if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))
 
 \Stripe\Stripe::setApiKey($stripearrayofkeys['secret_key']);
 \Stripe\Stripe::setAppInfo("Dolibarr Stripe", DOL_VERSION, "https://www.dolibarr.org"); // add dolibarr version
-\Stripe\Stripe::setApiVersion(empty($conf->global->STRIPE_FORCE_VERSION) ? "2019-09-09" : $conf->global->STRIPE_FORCE_VERSION); // force version API
+\Stripe\Stripe::setApiVersion(empty($conf->global->STRIPE_FORCE_VERSION) ? "2020-08-27" : $conf->global->STRIPE_FORCE_VERSION); // force version API
diff --git a/htdocs/stripe/lib/stripe.lib.php b/htdocs/stripe/lib/stripe.lib.php
index 23771b28c63..f1d03ae39be 100644
--- a/htdocs/stripe/lib/stripe.lib.php
+++ b/htdocs/stripe/lib/stripe.lib.php
@@ -21,6 +21,8 @@
  *  \brief			Library for common stripe functions
  */
 
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+
 /**
  *  Define head array for tabs of stripe tools setup pages
  *
@@ -40,96 +42,15 @@ function stripeadmin_prepare_head()
 
 	$object = new stdClass();
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'stripeadmin');
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'stripeadmin', 'remove');
 
-    return $head;
-}
-
-
-
-/**
- * Return string with full Url
- *
- * @param   string	$type		Type of URL ('free', 'order', 'invoice', 'contractline', 'membersubscription' ...)
- * @param	string	$ref		Ref of object
- * @return	string				Url string
- */
-function showStripePaymentUrl($type, $ref)
-{
-	global $conf, $langs;
-
-	$langs->load("paypal");
-    $langs->load("paybox");
-	$langs->load("stripe");
-
-    $servicename = 'Stripe';
-    $out = '<br><br>';
-    $out .= img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'<br>';
-    $url = getStripePaymentUrl(0, $type, $ref);
-    $out .= '<input type="text" id="stripeurl" class="quatrevingtpercent" value="'.$url.'"><br>';
-    $out .= ajax_autoselect("stripeurl", 0);
-    return $out;
-}
-
-/**
- * Return string with full Url
- *
- * @param   int		$mode		0=True url, 1=Url formated with colors
- * @param   string	$type		Type of URL ('free', 'order', 'invoice', 'contractline', 'membersubscription' ...)
- * @param	string	$ref		Ref of object
- * @param	int		$amount		Amount
- * @param	string	$freetag	Free tag
- * @return	string				Url string
- */
-function getStripePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag = 'your_tag')
-{
-	global $conf;
-
-	$ref = str_replace(' ', '', $ref);
-
-    if ($type == 'free')
-    {
-	    $out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?amount='.($mode ? '<font color="#666666">' : '').$amount.($mode ? '</font>' : '').'&tag='.($mode ? '<font color="#666666">' : '').$freetag.($mode ? '</font>' : '');
-    }
-    if ($type == 'order')
-    {
-        $out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=order&ref='.($mode ? '<font color="#666666">' : '');
-        if ($mode == 1) $out .= 'order_ref';
-        if ($mode == 0) $out .= urlencode($ref);
-	    $out .= ($mode ? '</font>' : '');
-    }
-    if ($type == 'invoice')
-    {
-        $out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=invoice&ref='.($mode ? '<font color="#666666">' : '');
-        if ($mode == 1) $out .= 'invoice_ref';
-        if ($mode == 0) $out .= urlencode($ref);
-	    $out .= ($mode ? '</font>' : '');
-    }
-    if ($type == 'contractline')
-    {
-        $out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=contractline&ref='.($mode ? '<font color="#666666">' : '');
-        if ($mode == 1) $out .= 'contractline_ref';
-        if ($mode == 0) $out .= urlencode($ref);
-	    $out .= ($mode ? '</font>' : '');
-    }
-    if ($type == 'membersubscription')
-    {
-        $out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=membersubscription&ref='.($mode ? '<font color="#666666">' : '');
-        if ($mode == 1) $out .= 'member_ref';
-        if ($mode == 0) $out .= urlencode($ref);
-	    $out .= ($mode ? '</font>' : '');
-    }
-
-    // For multicompany
-    $out .= "&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
-
-    return $out;
+	return $head;
 }
 
 
diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php
index 6cc093417ad..baa4497f4f2 100644
--- a/htdocs/stripe/payout.php
+++ b/htdocs/stripe/payout.php
@@ -78,8 +78,8 @@ $stripeacc = $stripe->getStripeAccount($service);
 if (!$rowid) {
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	if ($optioncss != '') {
-        print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    }
+		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	}
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
@@ -101,7 +101,7 @@ if (!$rowid) {
 	//print_liste_field_titre("CustomerId", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
 	//print_liste_field_titre("Origin", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
 	print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre("DateOperation", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre("DateOperation", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center ');
 	print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'left ');
 	print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", '', '', '', 'right ');
@@ -157,14 +157,14 @@ if (!$rowid) {
 			print '<tr class="oddeven">';
 
 			// Ref
-	        if (!empty($stripeacc)) $connect = $stripeacc.'/';
+			if (!empty($stripeacc)) $connect = $stripeacc.'/';
 
 			$url = 'https://dashboard.stripe.com/'.$connect.'test/payouts/'.$payout->id;
 			if ($servicestatus) {
 				$url = 'https://dashboard.stripe.com/'.$connect.'payouts/'.$payout->id;
 			}
 
-	        print "<td><a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'globe')." ".$payout->id."</a></td>\n";
+			print "<td><a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'globe')." ".$payout->id."</a></td>\n";
 
 
 			// Stripe customer
@@ -194,7 +194,7 @@ if (!$rowid) {
 			//print "</td>\n";
 			// Date payment
 			print '<td class="center">'.dol_print_date($payout->created, '%d/%m/%Y %H:%M')."</td>\n";
-	        // Date payment
+			// Date payment
 			print '<td class="center">'.dol_print_date($payout->arrival_date, '%d/%m/%Y %H:%M')."</td>\n";
 			// Type
 			print '<td>'.$payout->description.'</td>';
@@ -203,16 +203,16 @@ if (!$rowid) {
 			// Status
 			print "<td class='right'>";
 			if ($payout->status == 'paid') {
-	            print img_picto($langs->trans("".$payout->status.""), 'statut4');
-	        } elseif ($payout->status == 'pending') {
-	            print img_picto($langs->trans("".$payout->status.""), 'statut7');
-	        } elseif ($payout->status == 'in_transit') {
-	            print img_picto($langs->trans("".$payout->status.""), 'statut7');
-	        } elseif ($payout->status == 'failed') {
-	            print img_picto($langs->trans("".$payout->status.""), 'statut7');
-	        } elseif ($payout->status == 'canceled') {
-	            print img_picto($langs->trans("".$payout->status.""), 'statut8');
-	        }
+				print img_picto($langs->trans("".$payout->status.""), 'statut4');
+			} elseif ($payout->status == 'pending') {
+				print img_picto($langs->trans("".$payout->status.""), 'statut7');
+			} elseif ($payout->status == 'in_transit') {
+				print img_picto($langs->trans("".$payout->status.""), 'statut7');
+			} elseif ($payout->status == 'failed') {
+				print img_picto($langs->trans("".$payout->status.""), 'statut7');
+			} elseif ($payout->status == 'canceled') {
+				print img_picto($langs->trans("".$payout->status.""), 'statut8');
+			}
 			print '</td>';
 			print "</tr>\n";
 		}
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index cd75fec476c..60e09c5d743 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -77,8 +77,7 @@ $stripeacc = $stripe->getStripeAccount($service);
 
 if (!$rowid) {
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	if ($optioncss != '')
-		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
@@ -106,8 +105,6 @@ if (!$rowid) {
 	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", '', '', '', 'right ');
 	print "</tr>\n";
 
-	print "</tr>\n";
-
 	try {
 		if ($stripeacc)
 		{
@@ -156,26 +153,26 @@ if (!$rowid) {
 			print '<tr class="oddeven">';
 
 			// Ref
-	        if (!empty($stripeacc)) $connect = $stripeacc.'/';
+			if (!empty($stripeacc)) $connect = $stripeacc.'/';
 
 			// Ref
-	        if (preg_match('/po_/i', $txn->source)) {
-	            $origin = "payouts";
-	        } elseif (preg_match('/fee_/i', $txn->source)) {
-	            $origin = "connect/application_fees";
-	        } else {
-	            $origin = "payments";
-	        }
+			if (preg_match('/po_/i', $txn->source)) {
+				$origin = "payouts";
+			} elseif (preg_match('/fee_/i', $txn->source)) {
+				$origin = "connect/application_fees";
+			} else {
+				$origin = "payments";
+			}
 
 			$url = 'https://dashboard.stripe.com/'.$connect.'test/'.$origin.'/'.$txn->source;
 			if ($servicestatus) {
 				$url = 'https://dashboard.stripe.com/'.$connect.$origin.'/'.$txn->source;
 			}
-	        if ($txn->type == 'stripe_fee' || $txn->type == 'reserve_transaction') {
-	            print "<td>".$txn->type."</td>";
-	        } else {
-	            print "<td><a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'globe')." ".$txn->source."</a></td>\n";
-	        }
+			if ($txn->type == 'stripe_fee' || $txn->type == 'reserve_transaction') {
+				print "<td>".$txn->type."</td>";
+			} else {
+				print "<td><a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'globe')." ".$txn->source."</a></td>\n";
+			}
 
 			// Stripe customer
 			//print "<td>".$charge->customer."</td>\n";
@@ -211,13 +208,13 @@ if (!$rowid) {
 			print '<td class="right">'.price(($txn->fee) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency))."</td>";
 			// Status
 			print "<td class='right'>";
-	        if ($txn->status == 'available') {
-	            print img_picto($langs->trans("".$txn->status.""), 'statut4');
-	        } elseif ($txn->status == 'pending') {
-	            print img_picto($langs->trans("".$txn->status.""), 'statut7');
-	        } elseif ($txn->status == 'failed') {
-	            print img_picto($langs->trans("".$txn->status.""), 'statut8');
-	        }
+			if ($txn->status == 'available') {
+				print img_picto($langs->trans("".$txn->status.""), 'statut4');
+			} elseif ($txn->status == 'pending') {
+				print img_picto($langs->trans("".$txn->status.""), 'statut7');
+			} elseif ($txn->status == 'failed') {
+				print img_picto($langs->trans("".$txn->status.""), 'statut8');
+			}
 			print '</td>';
 			print "</tr>\n";
 		}
diff --git a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
index 61077e2c5bd..1663ded21ad 100644
--- a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
+++ b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
@@ -64,19 +64,19 @@ print load_fiche_titre($langs->trans("SupplierProposalSetup"), $linkback, 'title
 
 $head = supplier_proposal_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("CommRequests"), -1, 'supplier_proposal');
+print dol_get_fiche_head($head, 'attributes', $langs->trans("CommRequests"), -1, 'supplier_proposal');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a></div>';
-    print "</div>";
+	print '<div class="tabsAction">';
+	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a></div>';
+	print "</div>";
 }
 
 
@@ -88,10 +88,10 @@ if ($action != 'create' && $action != 'edit')
 
 if ($action == 'create')
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print "<br>";
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -101,10 +101,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && !empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
index 08f17504de9..8e906f2aa57 100644
--- a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
+++ b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
@@ -69,19 +69,19 @@ print load_fiche_titre($langs->trans("SupplierProposalSetup"), $linkback, 'title
 
 $head = supplier_proposal_admin_prepare_head();
 
-dol_fiche_head($head, 'attributeslines', $langs->trans("CommRequests"), -1, 'supplier_proposal');
+print dol_get_fiche_head($head, 'attributeslines', $langs->trans("CommRequests"), -1, 'supplier_proposal');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -96,7 +96,7 @@ if ($action == 'create')
 	print '<br><div id="newattrib"></div>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -106,10 +106,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && !empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 1190b29aa3c..ae40784aa68 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -97,22 +97,22 @@ if ($id > 0 || !empty($ref)) {
 }
 
 // Common permissions
-$usercanread		= $user->rights->supplier_proposal->lire;
+$usercanread = $user->rights->supplier_proposal->lire;
 $usercancreate		= $user->rights->supplier_proposal->creer;
 $usercandelete		= $user->rights->supplier_proposal->supprimer;
 
 // Advanced permissions
-$usercanvalidate	= ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->validate_advance)));
-$usercansend		= (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->supplier_proposal->send_advance);
+$usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->validate_advance)));
+$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->supplier_proposal->send_advance);
 
 // Additional area permissions
-$usercanclose		= $user->rights->supplier_proposal->cloturer;
-$usercancreateorder	= $user->rights->fournisseur->commande->creer;
+$usercanclose = $user->rights->supplier_proposal->cloturer;
+$usercancreateorder = $user->rights->fournisseur->commande->creer;
 
 // Permissions for includes
-$permissionnote		= $usercancreate; // Used by the include of actions_setnotes.inc.php
-$permissiondellink	= $usercancreate; // Used by the include of actions_dellink.inc.php
-$permissiontoedit	= $usercancreate; // Used by the include of actions_lineupdown.inc.php
+$permissionnote = $usercancreate; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $usercancreate; // Used by the include of actions_dellink.inc.php
+$permissiontoedit = $usercancreate; // Used by the include of actions_lineupdown.inc.php
 
 
 /*
@@ -229,7 +229,7 @@ if (empty($reshook))
 			else setEventMessages($langs->trans($object->error), null, 'errors');
 		}
 	} elseif ($action == 'setdate_livraison' && $usercancreate) {
-		$result = $object->set_date_livraison($user, dol_mktime(12, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']));
+		$result = $object->setDeliveryDate($user, dol_mktime(12, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']));
 		if ($result < 0)
 			dol_print_error($db, $object->error);
 	}
@@ -257,7 +257,8 @@ if (empty($reshook))
 			{
 				if ($object->fetch(GETPOST('copie_supplier_proposal')) > 0) {
 					$object->ref = GETPOST('ref');
-					$object->date_livraison = $date_delivery;
+					$object->date_livraison = $date_delivery; // deprecated
+					$object->delivery_date = $date_delivery;
 					$object->shipping_method_id = GETPOST('shipping_method_id', 'int');
 					$object->cond_reglement_id = GETPOST('cond_reglement_id');
 					$object->mode_reglement_id = GETPOST('mode_reglement_id');
@@ -271,14 +272,13 @@ if (empty($reshook))
 					$object->note = GETPOST('note', 'restricthtml');
 					$object->note_private = GETPOST('note', 'restricthtml');
 					$object->statut = SupplierProposal::STATUS_DRAFT;
-
-					$id = $object->create_from($user);
 				} else {
 					setEventMessages($langs->trans("ErrorFailedToCopyProposal", GETPOST('copie_supplier_proposal')), null, 'errors');
 				}
 			} else {
 				$object->ref = GETPOST('ref');
 				$object->date_livraison = $date_delivery;
+				$object->delivery_date = $date_delivery;
 				$object->demand_reason_id = GETPOST('demand_reason_id');
 				$object->shipping_method_id = GETPOST('shipping_method_id', 'int');
 				$object->cond_reglement_id = GETPOST('cond_reglement_id');
@@ -495,7 +495,7 @@ if (empty($reshook))
 	// Actions to send emails
 	$triggersendname = 'PROPOSAL_SUPPLIER_SENTBYMAIL';
 	$autocopy = 'MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO';
-	$trackid = 'spr'.$object->id;
+	$trackid = 'spro'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 	// Actions to build doc
@@ -545,14 +545,13 @@ if (empty($reshook))
 		$date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
 		$ref_supplier = GETPOST('fourn_ref', 'alpha');
 		$prod_entry_mode = GETPOST('prod_entry_mode');
-		if ($prod_entry_mode == 'free')
-		{
+		if ($prod_entry_mode == 'free')	{
 			$idprod = 0;
 			$price_ht = GETPOST('price_ht');
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 		} else {
 			$idprod = GETPOST('idprod', 'int');
-			$price_ht = '';
+			$price_ht = GETPOST('price_ht');
 			$tva_tx = '';
 		}
 
@@ -586,8 +585,8 @@ if (empty($reshook))
 			$error++;
 		}
 		if (!$error && ($qty >= 0)) {
-			$pu_ht = 0;
-			$pu_ttc = 0;
+		    $pu_ht = price2num($price_ht, 'MU');
+		    $pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 			$price_min = 0;
 			$price_base_type = (GETPOST('price_base_type', 'alpha') ? GETPOST('price_base_type', 'alpha') : 'HT');
 
@@ -636,7 +635,7 @@ if (empty($reshook))
 
 					// if we use supplier description of the products
 					if (!empty($productsupplier->desc_supplier) && !empty($conf->global->PRODUIT_FOURN_TEXTS)) {
-					    $desc = $productsupplier->desc_supplier;
+						$desc = $productsupplier->desc_supplier;
 					} else $desc = $productsupplier->description;
 
 					if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
@@ -652,12 +651,12 @@ if (empty($reshook))
 					$localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $object->thirdparty, $tva_npr);
 					$localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $object->thirdparty, $tva_npr);
 
-					$pu_ht = $productsupplier->fourn_pu;
 					if (empty($pu_ht)) $pu_ht = 0; // If pu is '' or null, we force to have a numeric value
 
 					// If GETPOST('idprodfournprice') is a numeric, we can use it. If it is empty or if it is 'idprod_123', we should use -1 (not used)
 					$fournprice = (is_numeric(GETPOST('idprodfournprice', 'alpha')) ? GETPOST('idprodfournprice', 'alpha') : -1);
 					$buyingprice = 0;
+					$pu_ht_devise = price2num($price_ht_devise, 'MU');
 
 					$result = $object->addline(
 						$desc,
@@ -683,10 +682,10 @@ if (empty($reshook))
 						$productsupplier->fk_unit,
 						'',
 						0,
-						$productsupplier->fourn_multicurrency_unitprice,
+						$pu_ht_devise,
 						$date_start,
 						$date_end
-                    );
+					);
 
 					//var_dump($tva_tx);var_dump($productsupplier->fourn_pu);var_dump($price_base_type);exit;
 					if ($result < 0)
@@ -1000,7 +999,7 @@ if (empty($reshook))
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}	elseif ($action == 'updateline' && $usercancreate && GETPOST('cancel', 'alpha') == $langs->trans('Cancel')) {
+	}	elseif ($action == 'updateline' && $usercancreate && GETPOST('cancel', 'alpha') == $langs->trans("Cancel")) {
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
 		exit();
 	}
@@ -1135,7 +1134,7 @@ if ($action == 'create')
 		print '<input type="hidden" name="originid" value="'.$originid.'">';
 	}
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">';
 
@@ -1350,12 +1349,12 @@ if ($action == 'create')
 
 	if (!empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE)) print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("CreateDraft").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+	print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 	print '</div>';
 
 	print "</form>";
@@ -1383,7 +1382,7 @@ if ($action == 'create')
 	$soc->fetch($object->socid);
 
 	$head = supplier_proposal_prepare_head($object);
-	dol_fiche_head($head, 'comm', $langs->trans('CommRequest'), -1, 'supplier_proposal');
+	print dol_get_fiche_head($head, 'comm', $langs->trans('CommRequest'), -1, 'supplier_proposal');
 
 	$formconfirm = '';
 
@@ -1563,11 +1562,11 @@ if ($action == 'create')
 		print '<form name="editdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post" class="formconsumeproduce">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="setdate_livraison">';
-		print $form->selectDate($object->date_livraison, 'liv_', '', '', '', "editdate_livraison");
+		print $form->selectDate($object->delivery_date, 'liv_', '', '', '', "editdate_livraison");
 		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 		print '</form>';
 	} else {
-		print dol_print_date($object->date_livraison, 'daytext');
+		print dol_print_date($object->delivery_date, 'daytext');
 	}
 	print '</td>';
 	print '</tr>';
@@ -1804,7 +1803,7 @@ if ($action == 'create')
 	print '</div>';
 	print "</form>\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	if ($action == 'statut')
 	{
@@ -1826,8 +1825,8 @@ if ($action == 'create')
 		$form_close .= $object->note;
 		$form_close .= '</textarea></td></tr>';
 		$form_close .= '<tr><td class="center" colspan="2">';
-		$form_close .= '<input type="submit" class="button" name="validate" value="'.$langs->trans('Save').'">';
-		$form_close .= ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
+		$form_close .= '<input type="submit" class="button button-save" name="validate" value="'.$langs->trans("Save").'">';
+		$form_close .= ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 		$form_close .= '<a name="acceptedrefused">&nbsp;</a>';
 		$form_close .= '</td>';
 		$form_close .= '</tr></table></form>';
@@ -1952,7 +1951,7 @@ if ($action == 'create')
 	$defaulttopic = 'SendAskRef';
 	$diroutput = $conf->supplier_proposal->dir_output;
 	$autocopy = 'MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO';
-	$trackid = 'spr'.$object->id;
+	$trackid = 'spro'.$object->id;
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 }
diff --git a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
index ba2fa37e1b9..bf91be32d8d 100644
--- a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
+++ b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
@@ -30,185 +30,185 @@ require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class
 class Supplierproposals extends DolibarrApi
 {
 
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'socid'
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'socid'
+	);
 
-    /**
-     * @var SupplierProposal $supplier_proposal {@type SupplierProposal}
-     */
-    public $supplier_proposal;
+	/**
+	 * @var SupplierProposal $supplier_proposal {@type SupplierProposal}
+	 */
+	public $supplier_proposal;
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-        $this->supplier_proposal = new SupplierProposal($this->db);
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->supplier_proposal = new SupplierProposal($this->db);
+	}
 
-    /**
-     * Get properties of a supplier proposal (price request) object
-     *
-     * Return an array with supplier proposal informations
-     *
-     * @param       int         $id         ID of supplier proposal
-     * @return 	array|mixed data without useless information
-     *
-     * @throws 	RestException
-     */
-    public function get($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->supplier_proposal->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a supplier proposal (price request) object
+	 *
+	 * Return an array with supplier proposal informations
+	 *
+	 * @param       int         $id         ID of supplier proposal
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->supplier_proposal->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->supplier_proposal->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Supplier Proposal not found');
-        }
+		$result = $this->supplier_proposal->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Supplier Proposal not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('supplier_proposal', $this->propal->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('supplier_proposal', $this->propal->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $this->supplier_proposal->fetchObjectLinked();
-        return $this->_cleanObjectDatas($this->supplier_proposal);
-    }
+		$this->supplier_proposal->fetchObjectLinked();
+		return $this->_cleanObjectDatas($this->supplier_proposal);
+	}
 
-    /**
-     * List supplier proposals
-     *
-     * Get a list of supplier proposals
-     *
-     * @param string	$sortfield	        Sort field
-     * @param string	$sortorder	        Sort order
-     * @param int		$limit		        Limit for list
-     * @param int		$page		        Page number
-     * @param string   	$thirdparty_ids	    Thirdparty ids to filter supplier proposals (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
-     * @param string    $sqlfilters         Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.datec:<:'20160101')"
-     * @return  array                       Array of order objects
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
-    {
-        global $db, $conf;
+	/**
+	 * List supplier proposals
+	 *
+	 * Get a list of supplier proposals
+	 *
+	 * @param string	$sortfield	        Sort field
+	 * @param string	$sortorder	        Sort order
+	 * @param int		$limit		        Limit for list
+	 * @param int		$page		        Page number
+	 * @param string   	$thirdparty_ids	    Thirdparty ids to filter supplier proposals (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
+	 * @param string    $sqlfilters         Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.datec:<:'20160101')"
+	 * @return  array                       Array of order objects
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        // case of external user, $thirdparty_ids param is ignored and replaced by user's socid
-        $socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
+		// case of external user, $thirdparty_ids param is ignored and replaced by user's socid
+		$socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
 
-        // If the internal user must only see his customers, force searching by him
-        $search_sale = 0;
-        if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+		// If the internal user must only see his customers, force searching by him
+		$search_sale = 0;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
 
-        $sql = "SELECT t.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as t";
+		$sql = "SELECT t.rowid";
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as t";
 
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql .= ' WHERE t.entity IN ('.getEntity('propal').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-        if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
-        if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
-        // Insert sale filter
-        if ($search_sale > 0)
-        {
-            $sql .= " AND sc.fk_user = ".$search_sale;
-        }
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		$sql .= ' WHERE t.entity IN ('.getEntity('propal').')';
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
+		if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
+		if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		// Insert sale filter
+		if ($search_sale > 0)
+		{
+			$sql .= " AND sc.fk_user = ".$search_sale;
+		}
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        $result = $this->db->query($sql);
+		$result = $this->db->query($sql);
 
-        if ($result)
-        {
-        	$num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            $i = 0;
-            while ($i < $min)
-            {
-            	$obj = $this->db->fetch_object($result);
-            	$propal_static = new SupplierProposal($this->db);
-                if ($propal_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($propal_static);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieving supplier proposal list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No supplier proposal found');
-        }
-        return $obj_ret;
-    }
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			$i = 0;
+			while ($i < $min)
+			{
+				$obj = $this->db->fetch_object($result);
+				$propal_static = new SupplierProposal($this->db);
+				if ($propal_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($propal_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving supplier proposal list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No supplier proposal found');
+		}
+		return $obj_ret;
+	}
 
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param   array           $data   Array with data to verify
-     * @return  array
-     * @throws  RestException
-     */
-    private function _validate($data)
-    {
-        $propal = array();
-        foreach (SupplierProposals::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $propal[$field] = $data[$field];
-        }
-        return $propal;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param   array           $data   Array with data to verify
+	 * @return  array
+	 * @throws  RestException
+	 */
+	private function _validate($data)
+	{
+		$propal = array();
+		foreach (SupplierProposals::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$propal[$field] = $data[$field];
+		}
+		return $propal;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->name);
-        unset($object->lastname);
-        unset($object->firstname);
-        unset($object->civility_id);
-        unset($object->address);
-        unset($object->datec);
-        unset($object->datev);
+		unset($object->name);
+		unset($object->lastname);
+		unset($object->firstname);
+		unset($object->civility_id);
+		unset($object->address);
+		unset($object->datec);
+		unset($object->datev);
 
-        return $object;
-    }
+		return $object;
+	}
 }
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 92759515ba4..7a1e10eed3f 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -13,7 +13,7 @@
  * Copyright (C) 2014      Marcos García            <marcosgdf@gmail.com>
  * Copyright (C) 2016      Ferran Marcet            <fmarcet@2byte.es>
  * Copyright (C) 2018      Nicolas ZABOURI			<info@inovea-conseil.com>
- * Copyright (C) 2019      Frédéric France          <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2020 Frédéric France          <frederic.france@netlogic.fr>
  * Copyright (C) 2020		Tobias Sekan			<tobias.sekan@startmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -61,12 +61,12 @@ class SupplierProposal extends CommonObject
 	public $table_element = 'supplier_proposal';
 
 	/**
-	 * @var int    Name of subtable line
+	 * @var string    Name of subtable line
 	 */
 	public $table_element_line = 'supplier_proposaldet';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_supplier_proposal';
 
@@ -111,9 +111,15 @@ class SupplierProposal extends CommonObject
 
 	/**
 	 * @var integer|string date_livraison
+	 * @deprecated
 	 */
 	public $date_livraison;
 
+	/**
+	 * @var integer|string date_livraison
+	 */
+	public $delivery_date;
+
 	/**
 	 * @deprecated
 	 * @see $date_creation
@@ -165,9 +171,7 @@ class SupplierProposal extends CommonObject
 	public $remise_percent = 0;
 	public $remise_absolue = 0;
 
-	public $products = array();
 	public $extraparams = array();
-
 	public $lines = array();
 	public $line;
 
@@ -177,8 +181,6 @@ class SupplierProposal extends CommonObject
 	public $nbtodo;
 	public $nbtodolate;
 
-	public $specimen;
-
 	// Multicurrency
 	/**
 	 * @var int ID
@@ -233,15 +235,12 @@ class SupplierProposal extends CommonObject
 
 		$this->socid = $socid;
 		$this->id = $supplier_proposalid;
-
-		$this->products = array();
 	}
 
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * 	Add line into array products
-	 *  $this->client doit etre charge
+	 * 	Add line into array ->lines
 	 *
 	 * 	@param  int		$idproduct       	Product Id to add
 	 * 	@param  int		$qty             	Quantity
@@ -249,7 +248,6 @@ class SupplierProposal extends CommonObject
 	 *  @return	int							<0 if KO, >0 if OK
 	 *
 	 *	TODO	Remplacer les appels a cette fonction par generation objet Ligne
-	 *			insere dans tableau $this->products
 	 */
 	public function add_product($idproduct, $qty, $remise_percent = 0)
 	{
@@ -503,7 +501,7 @@ class SupplierProposal extends CommonObject
 			$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
 			$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 
-			if ($conf->multicurrency->enabled && $pu_ht_devise > 0) {
+			if (!empty($conf->multicurrency->enabled) && $pu_ht_devise > 0) {
 				$pu = 0;
 			}
 
@@ -692,7 +690,7 @@ class SupplierProposal extends CommonObject
 				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 			}
 
-			if ($conf->multicurrency->enabled && $pu_ht_devise > 0) {
+			if (!empty($conf->multicurrency->enabled) && $pu_ht_devise > 0) {
 				$pu = 0;
 			}
 
@@ -857,8 +855,6 @@ class SupplierProposal extends CommonObject
 			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 			return -3;
 		}
-
-		// Check parameters
 		if (!empty($this->ref))	// We check that ref is not already used
 		{
 			$result = self::isExistingObject($this->element, 0, $this->ref); // Check ref is not yet used
@@ -871,6 +867,9 @@ class SupplierProposal extends CommonObject
 			}
 		}
 
+		// Set tmp vars
+		$delivery_date = empty($this->delivery_date) ? $this->date_livraison : $this->delivery_date;
+
 		// Multicurrency
 		if (!empty($this->multicurrency_code)) list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $now);
 		if (empty($this->fk_multicurrency))
@@ -925,7 +924,7 @@ class SupplierProposal extends CommonObject
 		$sql .= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'NULL');
 		$sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'NULL');
 		$sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
-		$sql .= ", ".($this->date_livraison != '' ? "'".$this->db->idate($this->date_livraison)."'" : "null");
+		$sql .= ", ".($delivery_date ? "'".$this->db->idate($delivery_date)."'" : "null");
 		$sql .= ", ".($this->shipping_method_id > 0 ? $this->shipping_method_id : 'NULL');
 		$sql .= ", ".($this->fk_project ? $this->fk_project : "null");
 		$sql .= ", ".$conf->entity;
@@ -955,7 +954,7 @@ class SupplierProposal extends CommonObject
 				}
 
 				// Add object linked
-				if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects))
+				if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects))
 				{
 					foreach ($this->linked_objects as $origin => $tmp_origin_id)
 					{
@@ -1080,23 +1079,6 @@ class SupplierProposal extends CommonObject
 		}
 	}
 
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *	Insert into DB a supplier_proposal object completely defined by its data members (ex, results from copy).
-	 *
-	 *	@param 		User	$user	User that create
-	 *	@return    	int				Id of the new object if ok, <0 if ko
-	 *	@see       	create()
-	 */
-	public function create_from($user)
-	{
-		// phpcs:enable
-		$this->products = $this->lines;
-
-		return $this->create($user);
-	}
-
 	/**
 	 *		Load an object from its id and create a new one in database
 	 *
@@ -1203,7 +1185,7 @@ class SupplierProposal extends CommonObject
 		$sql .= ", p.total, p.tva, p.localtax1, p.localtax2, p.total_ht";
 		$sql .= ", p.datec";
 		$sql .= ", p.date_valid as datev";
-		$sql .= ", p.date_livraison as date_livraison";
+		$sql .= ", p.date_livraison as delivery_date";
 		$sql .= ", p.model_pdf, p.extraparams";
 		$sql .= ", p.note_private, p.note_public";
 		$sql .= ", p.fk_projet as fk_project, p.fk_statut";
@@ -1248,7 +1230,7 @@ class SupplierProposal extends CommonObject
 				$this->socid                = $obj->fk_soc;
 				$this->fk_project           = $obj->fk_project;
 				$this->model_pdf            = $obj->model_pdf;
-				$this->modelpdf             = $obj->model_pdf;	// deprecated
+				$this->modelpdf             = $obj->model_pdf; // deprecated
 				$this->note                 = $obj->note_private; // TODO deprecated
 				$this->note_private         = $obj->note_private;
 				$this->note_public          = $obj->note_public;
@@ -1258,7 +1240,8 @@ class SupplierProposal extends CommonObject
 				$this->datev                = $this->db->jdate($obj->datev); // TODO deprecated
 				$this->date_creation = $this->db->jdate($obj->datec); //Creation date
 				$this->date_validation = $this->db->jdate($obj->datev); //Validation date
-				$this->date_livraison       = $this->db->jdate($obj->date_livraison);
+				$this->date_livraison       = $this->db->jdate($obj->delivery_date); // deprecated
+				$this->delivery_date        = $this->db->jdate($obj->delivery_date);
 				$this->shipping_method_id   = ($obj->fk_shipping_method > 0) ? $obj->fk_shipping_method : null;
 
 				$this->mode_reglement_id    = $obj->fk_mode_reglement;
@@ -1289,7 +1272,7 @@ class SupplierProposal extends CommonObject
 					$this->brouillon = 1;
 				}
 
-				// Retreive all extrafield
+				// Retrieve all extrafield
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
 
@@ -1379,7 +1362,7 @@ class SupplierProposal extends CommonObject
 					return -1;
 				}
 
-				// Retreive all extrafield
+				// Retrieve all extrafield
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
 
@@ -1510,26 +1493,40 @@ class SupplierProposal extends CommonObject
 	/**
 	 *	Set delivery date
 	 *
-	 *	@param      User 		$user        		Object user that modify
-	 *	@param      int			$date_livraison     Delivery date
-	 *	@return     int         					<0 if ko, >0 if ok
+	 *	@param      User 	$user        		Object user that modify
+	 *	@param      int		$delivery_date		Delivery date
+	 *	@return     int         				<0 if ko, >0 if ok
+	 *	@deprecated Use  setDeliveryDate
 	 */
-	public function set_date_livraison($user, $date_livraison)
+	public function set_date_livraison($user, $delivery_date)
 	{
 		// phpcs:enable
+		return $this->setDeliveryDate($user, $delivery_date);
+	}
+
+	/**
+	 *	Set delivery date
+	 *
+	 *	@param      User 		$user        		Object user that modify
+	 *	@param      int			$delivery_date     Delivery date
+	 *	@return     int         					<0 if ko, >0 if ok
+	 */
+	public function setDeliveryDate($user, $delivery_date)
+	{
 		if (!empty($user->rights->supplier_proposal->creer))
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal ";
-			$sql .= " SET date_livraison = ".($date_livraison != '' ? "'".$this->db->idate($date_livraison)."'" : 'null');
+			$sql .= " SET date_livraison = ".($delivery_date != '' ? "'".$this->db->idate($delivery_date)."'" : 'null');
 			$sql .= " WHERE rowid = ".$this->id;
 
 			if ($this->db->query($sql))
 			{
-				$this->date_livraison = $date_livraison;
+				$this->date_livraison = $delivery_date;
+				$this->delivery_date = $delivery_date;
 				return 1;
 			} else {
 				$this->error = $this->db->error();
-				dol_syslog(get_class($this)."::set_date_livraison Erreur SQL");
+				dol_syslog(get_class($this)."::setDeliveryDate Erreur SQL");
 				return -1;
 			}
 		}
@@ -1688,13 +1685,13 @@ class SupplierProposal extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$modelpdf = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED : $this->modelpdf;
+			$modelpdf = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED : (empty($this->modelpdf) ? '' : $this->modelpdf);
 			$triggerName = 'PROPOSAL_SUPPLIER_CLOSE_REFUSED';
 
 			if ($status == 2)
 			{
 				$triggerName = 'PROPOSAL_SUPPLIER_CLOSE_SIGNED';
-				$modelpdf = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL : $this->modelpdf;
+				$modelpdf = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL : (empty($this->modelpdf) ? '' : $this->modelpdf);
 
 				if (!empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL))     // TODO This option was not tested correctly. Error if product ref does not exists
 				{
@@ -2103,7 +2100,7 @@ class SupplierProposal extends CommonObject
 		$sql .= " c.datec, c.date_valid as datev, c.date_cloture as dateo,";
 		$sql .= " c.fk_user_author, c.fk_user_valid, c.fk_user_cloture";
 		$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as c";
-		$sql .= " WHERE c.rowid = ".$id;
+		$sql .= " WHERE c.rowid = ".((int) $id);
 
 		$result = $this->db->query($sql);
 
@@ -2474,15 +2471,15 @@ class SupplierProposal extends CommonObject
 		$url = '';
 		$result = '';
 
-		$label = img_picto('', $this->picto).' <u>'.$langs->trans("SupplierProposal").'</u>';
+		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("SupplierProposal").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
 		if (!empty($this->ref)) $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 		if (!empty($this->ref_fourn)) $label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_fourn;
 		if (!empty($this->total_ht)) $label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
 		if (!empty($this->total_tva)) $label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
 		if (!empty($this->total_ttc)) $label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
-		if (isset($this->status)) {
-		   	$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
-		}
 
 		if ($option == '') {
 			$url = DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$this->id.$get_params;
diff --git a/htdocs/supplier_proposal/contact.php b/htdocs/supplier_proposal/contact.php
index f0d6a62d9c9..ce76b9d8bf7 100644
--- a/htdocs/supplier_proposal/contact.php
+++ b/htdocs/supplier_proposal/contact.php
@@ -55,11 +55,11 @@ if ($action == 'addcontact' && $permissiontoedit)
 {
 	$result = $object->fetch($id);
 
-    if ($result > 0 && $id > 0)
-    {
-    	$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
+	if ($result > 0 && $id > 0)
+	{
+		$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
   		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
-    }
+	}
 
 	if ($result >= 0)
 	{
@@ -81,7 +81,7 @@ elseif ($action == 'swapstatut' && $permissiontoedit)
 {
 	if ($object->fetch($id))
 	{
-	    $result = $object->swapContactStatus(GETPOST('ligne'));
+		$result = $object->swapContactStatus(GETPOST('ligne'));
 	} else {
 		dol_print_error($db);
 	}
@@ -132,7 +132,7 @@ if ($id > 0 || !empty($ref))
 		$object->fetch_thirdparty();
 
 		$head = supplier_proposal_prepare_head($object);
-		dol_fiche_head($head, 'contact', $langs->trans("CommRequest"), -1, 'supplier_proposal');
+		print dol_get_fiche_head($head, 'contact', $langs->trans("CommRequest"), -1, 'supplier_proposal');
 
 		// Supplier order card
 
@@ -147,43 +147,43 @@ if ($id > 0 || !empty($ref))
 		// Project
 		if (!empty($conf->projet->enabled))
 		{
-		    $langs->load("projects");
-		    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		    if ($permissiontoedit)
-		    {
-		        if ($action != 'classify') {
-		        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			$langs->load("projects");
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+			if ($permissiontoedit)
+			{
+				if ($action != 'classify') {
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
 				}
-	        	if ($action == 'classify') {
-	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-	                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-	                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref .= '</form>';
-	            } else {
-	                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-		    } else {
-		        if (!empty($object->fk_project)) {
-		            $proj = new Project($db);
-		            $proj->fetch($object->fk_project);
-		            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-		            $morehtmlref .= $proj->ref;
-		            $morehtmlref .= '</a>';
-		        } else {
-		            $morehtmlref .= '';
-		        }
-		    }
+				if ($action == 'classify') {
+					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				if (!empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
+				} else {
+					$morehtmlref .= '';
+				}
+			}
 		}
 		$morehtmlref .= '</div>';
 
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		// Contacts lines
 		include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index 5b58c7de461..127b45466e8 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -86,7 +86,7 @@ if ($object->id > 0)
 	$upload_dir = $conf->supplier_proposal->dir_output.'/'.dol_sanitizeFileName($object->ref);
 
 	$head = supplier_proposal_prepare_head($object);
-	dol_fiche_head($head, 'document', $langs->trans('CommRequest'), -1, 'supplier_proposal');
+	print dol_get_fiche_head($head, 'document', $langs->trans('CommRequest'), -1, 'supplier_proposal');
 
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
@@ -110,36 +110,36 @@ if ($object->id > 0)
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    if ($user->rights->supplier_proposal->creer)
-	    {
-	        if ($action != 'classify') {
-	        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->supplier_proposal->creer)
+		{
+			if ($action != 'classify') {
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
-            }
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	            $morehtmlref .= $proj->ref;
-	            $morehtmlref .= '</a>';
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+			}
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
@@ -159,7 +159,7 @@ if ($object->id > 0)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$modulepart = 'supplier_proposal';
 	$permission = $user->rights->supplier_proposal->creer;
diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php
index 6ba425f323a..476c2a14db2 100644
--- a/htdocs/supplier_proposal/index.php
+++ b/htdocs/supplier_proposal/index.php
@@ -67,15 +67,15 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-    print '<form method="post" action="'.DOL_URL_ROOT.'/supplier_proposal/list.php">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder nohover centpercent">';
-    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    print '<tr class="oddeven"><td>';
-    print $langs->trans("SupplierProposal").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-    print '</tr>';
-    print "</table></div></form><br>\n";
+	print '<form method="post" action="'.DOL_URL_ROOT.'/supplier_proposal/list.php">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder nohover centpercent">';
+	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("SupplierProposal").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+	print '</tr>';
+	print "</table></div></form><br>\n";
 }
 
 
@@ -94,76 +94,76 @@ $sql .= " GROUP BY p.fk_statut";
 $resql = $db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
-    $i = 0;
+	$num = $db->num_rows($resql);
+	$i = 0;
 
-    $total = 0;
-    $totalinprocess = 0;
-    $dataseries = array();
-    $colorseries = array();
-    $vals = array();
-    // -1=Canceled, 0=Draft, 1=Validated, (2=Accepted/On process not managed for customer orders), 3=Closed (Sent/Received, billed or not)
-    while ($i < $num)
-    {
-        $row = $db->fetch_row($resql);
-        if ($row)
-        {
-            //if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))
-            {
-                $vals[$row[1]] = $row[0];
-                $totalinprocess += $row[0];
-            }
-            $total += $row[0];
-        }
-        $i++;
-    }
-    $db->free($resql);
+	$total = 0;
+	$totalinprocess = 0;
+	$dataseries = array();
+	$colorseries = array();
+	$vals = array();
+	// -1=Canceled, 0=Draft, 1=Validated, (2=Accepted/On process not managed for customer orders), 3=Closed (Sent/Received, billed or not)
+	while ($i < $num)
+	{
+		$row = $db->fetch_row($resql);
+		if ($row)
+		{
+			//if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))
+			{
+				$vals[$row[1]] = $row[0];
+				$totalinprocess += $row[0];
+			}
+			$total += $row[0];
+		}
+		$i++;
+	}
+	$db->free($resql);
 
-    include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
+	include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
 
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CommRequests").'</th></tr>'."\n";
-    $listofstatus = array(0, 1, 2, 3, 4);
-    foreach ($listofstatus as $status)
-    {
-    	$dataseries[] = array($supplier_proposalstatic->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
-    	if ($status == SupplierProposal::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
-    	if ($status == SupplierProposal::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;
-    	if ($status == SupplierProposal::STATUS_SIGNED) $colorseries[$status] = $badgeStatus4;
-    	if ($status == SupplierProposal::STATUS_NOTSIGNED) $colorseries[$status] = $badgeStatus9;
-    	if ($status == SupplierProposal::STATUS_CLOSE) $colorseries[$status] = $badgeStatus6;
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CommRequests").'</th></tr>'."\n";
+	$listofstatus = array(0, 1, 2, 3, 4);
+	foreach ($listofstatus as $status)
+	{
+		$dataseries[] = array($supplier_proposalstatic->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
+		if ($status == SupplierProposal::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
+		if ($status == SupplierProposal::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;
+		if ($status == SupplierProposal::STATUS_SIGNED) $colorseries[$status] = $badgeStatus4;
+		if ($status == SupplierProposal::STATUS_NOTSIGNED) $colorseries[$status] = $badgeStatus9;
+		if ($status == SupplierProposal::STATUS_CLOSE) $colorseries[$status] = $badgeStatus6;
 
-    	if (empty($conf->use_javascript_ajax))
-    	{
-    		print '<tr class="oddeven">';
-    		print '<td>'.$supplier_proposalstatic->LibStatut($status, 0).'</td>';
-    		print '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).'</a></td>';
-    		print "</tr>\n";
-    	}
-    }
-    if ($conf->use_javascript_ajax)
-    {
-        print '<tr><td class="center" colspan="2">';
+		if (empty($conf->use_javascript_ajax))
+		{
+			print '<tr class="oddeven">';
+			print '<td>'.$supplier_proposalstatic->LibStatut($status, 0).'</td>';
+			print '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).'</a></td>';
+			print "</tr>\n";
+		}
+	}
+	if ($conf->use_javascript_ajax)
+	{
+		print '<tr><td class="center" colspan="2">';
 
-        include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
-        $dolgraph = new DolGraph();
-        $dolgraph->SetData($dataseries);
-        $dolgraph->SetDataColor(array_values($colorseries));
-        $dolgraph->setShowLegend(2);
-        $dolgraph->setShowPercent(1);
-        $dolgraph->SetType(array('pie'));
-        $dolgraph->setHeight('200');
-        $dolgraph->draw('idgraphstatus');
-        print $dolgraph->show($total ? 0 : 1);
+		include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+		$dolgraph = new DolGraph();
+		$dolgraph->SetData($dataseries);
+		$dolgraph->SetDataColor(array_values($colorseries));
+		$dolgraph->setShowLegend(2);
+		$dolgraph->setShowPercent(1);
+		$dolgraph->SetType(array('pie'));
+		$dolgraph->setHeight('200');
+		$dolgraph->draw('idgraphstatus');
+		print $dolgraph->show($total ? 0 : 1);
 
-        print '</td></tr>';
-    }
+		print '</td></tr>';
+	}
 
-    print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
-    print "</table></div><br>";
+	print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
+	print "</table></div><br>";
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
@@ -185,7 +185,7 @@ if (!empty($conf->supplier_proposal->enabled))
 	$resql = $db->query($sql);
 	if ($resql)
 	{
-        print '<div class="div-table-responsive-no-min">';
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print '<th colspan="2">'.$langs->trans("DraftRequests").'</th></tr>';
@@ -242,7 +242,7 @@ $sql .= $db->plimit($max, 0);
 $resql = $db->query($sql);
 if ($resql)
 {
-    print '<div class="div-table-responsive-no-min">';
+	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<th colspan="4">'.$langs->trans("LastModifiedRequests", $max).'</th></tr>';
@@ -323,7 +323,7 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
 		$i = 0;
 		if ($num > 0)
 		{
-            print '<div class="div-table-responsive-no-min">';
+			print '<div class="div-table-responsive-no-min">';
 			print '<table class="noborder centpercent">';
 			print '<tr class="liste_titre"><th colspan="5">'.$langs->trans("RequestsOpened").' <a href="'.DOL_URL_ROOT.'/supplier_proposal/list.php?search_status=1"><span class="badge">'.$num.'</span></a></th></tr>';
 
diff --git a/htdocs/supplier_proposal/info.php b/htdocs/supplier_proposal/info.php
index 8c1d007e39a..dbff367b7c8 100644
--- a/htdocs/supplier_proposal/info.php
+++ b/htdocs/supplier_proposal/info.php
@@ -59,7 +59,7 @@ $object->info($object->id);
 
 
 $head = supplier_proposal_prepare_head($object);
-dol_fiche_head($head, 'info', $langs->trans('CommRequest'), -1, 'supplier_proposal');
+print dol_get_fiche_head($head, 'info', $langs->trans('CommRequest'), -1, 'supplier_proposal');
 
 // Supplier proposal card
 $linkback = '<a href="'.DOL_URL_ROOT.'/supplier_proposal/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
@@ -74,36 +74,36 @@ $morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl
 // Project
 if (!empty($conf->projet->enabled))
 {
-    $langs->load("projects");
-    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-    if ($user->rights->supplier_proposal->creer)
-    {
-        if ($action != 'classify') {
-        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	$langs->load("projects");
+	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+	if ($user->rights->supplier_proposal->creer)
+	{
+		if ($action != 'classify') {
+			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 			$morehtmlref .= ' : ';
-        }
-        if ($action == 'classify') {
-            //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-            $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-            $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-            $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-            $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-            $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-            $morehtmlref .= '</form>';
-        } else {
-            $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-        }
-    } else {
-        if (!empty($object->fk_project)) {
-            $proj = new Project($db);
-            $proj->fetch($object->fk_project);
-            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-            $morehtmlref .= $proj->ref;
-            $morehtmlref .= '</a>';
-        } else {
-            $morehtmlref .= '';
-        }
-    }
+		}
+		if ($action == 'classify') {
+			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+			$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			$morehtmlref .= '</form>';
+		} else {
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+		}
+	} else {
+		if (!empty($object->fk_project)) {
+			$proj = new Project($db);
+			$proj->fetch($object->fk_project);
+			$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+			$morehtmlref .= $proj->ref;
+			$morehtmlref .= '</a>';
+		} else {
+			$morehtmlref .= '';
+		}
+	}
 }
 $morehtmlref .= '</div>';
 
@@ -122,7 +122,7 @@ print '</td></tr></table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index b0f8bf40609..5fc27d63a8c 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -408,7 +408,7 @@ if ($resql)
 	$arrayofmassactions = array(
 		'generate_doc'=>$langs->trans("ReGeneratePDF"),
 		'builddoc'=>$langs->trans("PDFMerge"),
-	    //'presend'=>$langs->trans("SendByMail"),
+		//'presend'=>$langs->trans("SendByMail"),
 	);
 	if ($user->rights->supplier_proposal->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
@@ -463,7 +463,7 @@ if ($resql)
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view products
-	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
diff --git a/htdocs/supplier_proposal/note.php b/htdocs/supplier_proposal/note.php
index 16e3d192547..464f31aaaae 100644
--- a/htdocs/supplier_proposal/note.php
+++ b/htdocs/supplier_proposal/note.php
@@ -72,13 +72,13 @@ if ($id > 0 || !empty($ref))
 
 	if ($object->fetch($id, $ref))
 	{
-	    $object->fetch_thirdparty();
+		$object->fetch_thirdparty();
 
 		$societe = new Societe($db);
 		if ($societe->fetch($object->socid))
 		{
 			$head = supplier_proposal_prepare_head($object);
-			dol_fiche_head($head, 'note', $langs->trans('CommRequest'), -1, 'supplier_proposal');
+			print dol_get_fiche_head($head, 'note', $langs->trans('CommRequest'), -1, 'supplier_proposal');
 
 
 			// Supplier proposal card
@@ -94,36 +94,36 @@ if ($id > 0 || !empty($ref))
 			// Project
 			if (!empty($conf->projet->enabled))
 			{
-			    $langs->load("projects");
-			    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-			    if ($user->rights->supplier_proposal->creer)
-			    {
-			        if ($action != 'classify') {
-			        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				$langs->load("projects");
+				$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+				if ($user->rights->supplier_proposal->creer)
+				{
+					if ($action != 'classify') {
+						//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 						$morehtmlref .= ' : ';
-                    }
-		            if ($action == 'classify') {
-		                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-		                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-		                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-		                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-		                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-		                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-		                $morehtmlref .= '</form>';
-		            } else {
-		                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-		            }
-			    } else {
-			        if (!empty($object->fk_project)) {
-			            $proj = new Project($db);
-			            $proj->fetch($object->fk_project);
-			            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-			            $morehtmlref .= $proj->ref;
-			            $morehtmlref .= '</a>';
-			        } else {
-			            $morehtmlref .= '';
-			        }
-			    }
+					}
+					if ($action == 'classify') {
+						//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+						$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+						$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+						$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+						$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+						$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+						$morehtmlref .= '</form>';
+					} else {
+						$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+					}
+				} else {
+					if (!empty($object->fk_project)) {
+						$proj = new Project($db);
+						$proj->fetch($object->fk_project);
+						$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+						$morehtmlref .= $proj->ref;
+						$morehtmlref .= '</a>';
+					} else {
+						$morehtmlref .= '';
+					}
+				}
 			}
 			$morehtmlref .= '</div>';
 
@@ -139,7 +139,7 @@ if ($id > 0 || !empty($ref))
 
 			print '</div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 		}
 	}
 }
diff --git a/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
index c4891f52f81..ea6f45e18be 100644
--- a/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
@@ -37,21 +37,21 @@ $total = 0;
 $ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink)
 {
-    $ilink++;
+	$ilink++;
 
-    $trclass = 'oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
-    ?>
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	?>
     <tr class="<?php echo $trclass; ?>">
     	<td><?php echo $langs->trans("SupplierProposal"); ?></td>
     	<td><a href="<?php echo DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$objectlink->id ?>"><?php echo img_object($langs->trans("ShowSupplierProposal"), "supplier_proposal").' '.$objectlink->ref; ?></a></td>
     	<td></td>
     	<td class="center"><?php echo dol_print_date($objectlink->datec, 'day'); ?></td>
     	<td class="right"><?php
-    	if ($user->rights->supplier_proposal->lire) {
-    		$total = $total + $objectlink->total_ht;
-    		echo price($objectlink->total_ht);
-    	} ?></td>
+		if ($user->rights->supplier_proposal->lire) {
+			$total = $total + $objectlink->total_ht;
+			echo price($objectlink->total_ht);
+		} ?></td>
     	<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
     	<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
     </tr>
@@ -59,7 +59,7 @@ foreach ($linkedObjectBlock as $key => $objectlink)
 }
 if (count($linkedObjectBlock) > 1)
 {
-    ?>
+	?>
     <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
         <td><?php echo $langs->trans("Total"); ?></td>
         <td></td>
diff --git a/htdocs/support/index.php b/htdocs/support/index.php
index e6632d2b0e0..cecada7ed65 100644
--- a/htdocs/support/index.php
+++ b/htdocs/support/index.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2008-2015	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2008-2012	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
+ * add german links 2020    Udo Tamm            <dev@dolibit.de>
  *
  * 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
@@ -87,6 +88,7 @@ print '<tr><td align="center">';
 $urlwiki = 'https://wiki.dolibarr.org';
 if (preg_match('/fr/i', $langs->defaultlang)) $urlwiki = 'https://wiki.dolibarr.org/index.php/Accueil';
 if (preg_match('/es/i', $langs->defaultlang)) $urlwiki = 'https://wiki.dolibarr.org/index.php/Portada';
+if (preg_match('/de/i', $langs->defaultlang)) $urlwiki = 'https://wiki.dolibarr.org/index.php/Hauptseite';
 print '<br>'.$langs->trans("ForDocumentationSeeWiki", $urlwiki, $urlwiki);
 print '<br>';
 $urlforum = 'https://www.dolibarr.org/forum/';
@@ -95,6 +97,7 @@ if (preg_match('/fr/i', $langs->defaultlang)) $urlforumlocal = 'https://www.doli
 if (preg_match('/es/i', $langs->defaultlang)) $urlforumlocal = 'https://www.dolibarr.es/foro/';
 if (preg_match('/it/i', $langs->defaultlang)) $urlforumlocal = 'http://www.dolibarr.it/forum/';
 if (preg_match('/gr/i', $langs->defaultlang)) $urlforumlocal = 'https://www.dolibarr.gr/forum/';
+if (preg_match('/de/i', $langs->defaultlang)) $urlforumlocal = 'https://www.dolibarr.de/forum/';
 print '<br>'.$langs->trans("ForAnswersSeeForum", $urlforumlocal, $urlforumlocal).'<br>';
 if ($urlforumlocal != $urlforum) print '<b><a href="'.$urlforum.'">'.$urlforum.'</a></b>';
 print '</td></tr></table>';
diff --git a/htdocs/takepos/admin/appearance.php b/htdocs/takepos/admin/appearance.php
index 54e0752736c..baceed47f3e 100644
--- a/htdocs/takepos/admin/appearance.php
+++ b/htdocs/takepos/admin/appearance.php
@@ -50,16 +50,16 @@ if (GETPOST('action', 'alpha') == 'set')
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        $db->commit();
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        $db->rollback();
-	    setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	{
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		$db->rollback();
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 } elseif (GETPOST('action', 'alpha') == 'setmethod')
 {
-    dolibarr_set_const($db, "TAKEPOS_PRINT_METHOD", GETPOST('value', 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "TAKEPOS_PRINT_METHOD", GETPOST('value', 'alpha'), 'chaine', 0, '', $conf->entity);
 }
 
 
@@ -75,7 +75,7 @@ llxHeader('', $langs->trans("CashDeskSetup"));
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup');
 $head = takepos_admin_prepare_head();
-dol_fiche_head($head, 'appearance', 'TakePOS', -1, 'cash-register');
+print dol_get_fiche_head($head, 'appearance', 'TakePOS', -1, 'cash-register');
 
 print '<form action="'.$_SERVER["PHP_SELF"].'?terminal='.(empty($terminal) ? 1 : $terminal).'" method="post">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -120,7 +120,7 @@ print '</table>';
 
 print '<br>';
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
+print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
 
 print "</form>\n";
 
diff --git a/htdocs/takepos/admin/bar.php b/htdocs/takepos/admin/bar.php
index b026f53ce69..f5f678ec900 100644
--- a/htdocs/takepos/admin/bar.php
+++ b/htdocs/takepos/admin/bar.php
@@ -65,6 +65,10 @@ if (GETPOST('action', 'alpha') == 'set')
 	}
 }
 
+if ($conf->global->TAKEPOS_ORDER_NOTES == 1) {
+	$extrafields = new ExtraFields($db);
+	$extrafields->addExtraField('order_notes', 'Order notes', 'varchar', 0, 255, 'facturedet', 0, 0, '', '', 0, '', 0, 1);
+}
 
 /*
  * View
@@ -80,7 +84,7 @@ llxHeader('', $langs->trans("CashDeskSetup"), '', '', 0, 0, $arrayofjs, $arrayof
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup');
 $head = takepos_admin_prepare_head();
-dol_fiche_head($head, 'bar', 'TakePOS', -1, 'cash-register');
+print dol_get_fiche_head($head, 'bar', 'TakePOS', -1, 'cash-register');
 
 
 // Mode
@@ -179,7 +183,7 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 
 	print '<br>';
 
-	print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
+	print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
 }
 
 if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
diff --git a/htdocs/takepos/admin/orderprinters.php b/htdocs/takepos/admin/orderprinters.php
index b396655dea4..9ec59fb388b 100644
--- a/htdocs/takepos/admin/orderprinters.php
+++ b/htdocs/takepos/admin/orderprinters.php
@@ -42,6 +42,7 @@ $catname = GETPOST('catname', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $printer1 = GETPOST('printer1', 'alpha');
 $printer2 = GETPOST('printer2', 'alpha');
+$printer3 = GETPOST('printer3', 'alpha');
 
 if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
 
@@ -64,6 +65,14 @@ if ($action == "SavePrinter2") {
 	dolibarr_set_const($db, "TAKEPOS_PRINTED_CATEGORIES_2", $printedcategories, 'chaine', 0, '', $conf->entity);
 }
 
+if ($action == "SavePrinter3") {
+	$printedcategories = ";";
+	if (is_array($printer3)) foreach ($printer3 as $cat) {
+		$printedcategories = $printedcategories.$cat.";";
+	}
+	dolibarr_set_const($db, "TAKEPOS_PRINTED_CATEGORIES_3", $printedcategories, 'chaine', 0, '', $conf->entity);
+}
+
 
 /*
  * View
@@ -179,7 +188,7 @@ if ($nbofentries > 0)
 	print '</tr>';
 }
 print "</table>";
-print '<input type="submit" value="'.$langs->trans("Save").'"></form><br><br>';
+print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></form><br><br>';
 
 //Printer2
 print '<table class="liste nohover" width="100%">';
@@ -207,7 +216,36 @@ if ($nbofentries > 0)
 	print '</tr>';
 }
 print "</table>";
-print '<input type="submit" value="'.$langs->trans("Save").'"></form>';
+print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></form>';
+
+//Printer3
+print '<table class="liste nohover" width="100%">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Printer").' 3</td><td></td><td class="right">';
+print '</td></tr>';
+$nbofentries = (count($data) - 1);
+print '<form action="orderprinters.php">';
+if ($nbofentries > 0)
+{
+	print '<tr class="pair"><td colspan="3">';
+	print '<input type="hidden" name="action" value="SavePrinter3">';
+	foreach ($data as $row) {
+		if (strpos($conf->global->TAKEPOS_PRINTED_CATEGORIES_3, ';'.$row["rowid"].';') !== false) $checked = 'checked'; else $checked = '';
+		if ($row["fk_menu"] == 0) print '<input type="checkbox" name="printer3[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
+	}
+	print '</td></tr>';
+} else {
+	print '<tr class="pair">';
+	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('', 'treemenu/branchbottom.gif').'</td>';
+	print '<td valign="middle">';
+	print $langs->trans("NoCategoryYet");
+	print '</td>';
+	print '<td>&nbsp;</td>';
+	print '</table></td>';
+	print '</tr>';
+}
+
+print "</table>";
+print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></form>';
 
 print '</div>';
 
diff --git a/htdocs/takepos/admin/other.php b/htdocs/takepos/admin/other.php
index 82940f2296a..6874665ace7 100644
--- a/htdocs/takepos/admin/other.php
+++ b/htdocs/takepos/admin/other.php
@@ -83,10 +83,6 @@ if (GETPOST('action', 'alpha') == 'set') {
 		$res = dolibarr_set_const($db, "TAKEPOS_SUMUP_AFFILIATE", GETPOST('TAKEPOS_SUMUP_AFFILIATE', 'alpha'), 'chaine', 0, '', $conf->entity);
 		$res = dolibarr_set_const($db, "TAKEPOS_SUMUP_APPID", GETPOST('TAKEPOS_SUMUP_APPID', 'alpha'), 'chaine', 0, '', $conf->entity);
 	}
-	if ($conf->global->TAKEPOS_ORDER_NOTES == 1) {
-		$extrafields = new ExtraFields($db);
-		$extrafields->addExtraField('order_notes', 'Order notes', 'varchar', 0, 255, 'facturedet', 0, 0, '', '', 0, '', 0, 1);
-	}
 
 	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
 
@@ -111,7 +107,7 @@ llxHeader('', $langs->trans("CashDeskSetup"));
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup');
 $head = takepos_admin_prepare_head();
-dol_fiche_head($head, 'other', 'TakePOS', -1, 'cash-register');
+print dol_get_fiche_head($head, 'other', 'TakePOS', -1, 'cash-register');
 print '<br>';
 
 
diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index d7162138fe3..30a9d45ad5a 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -47,7 +47,7 @@ if (GETPOST('action', 'alpha') == 'set')
 	$res = dolibarr_set_const($db, "TAKEPOS_RECEIPT_NAME", GETPOST('TAKEPOS_RECEIPT_NAME', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_SHOW_CUSTOMER", GETPOST('TAKEPOS_SHOW_CUSTOMER', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_AUTO_PRINT_TICKETS", GETPOST('TAKEPOS_AUTO_PRINT_TICKETS', 'int'), 'int', 0, '', $conf->entity);
-    $res = dolibarr_set_const($db, "TAKEPOS_PRINT_SERVER", GETPOST('TAKEPOS_PRINT_SERVER', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_PRINT_SERVER", GETPOST('TAKEPOS_PRINT_SERVER', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_PRINT_PAYMENT_METHOD", GETPOST('TAKEPOS_PRINT_PAYMENT_METHOD', 'alpha'), 'chaine', 0, '', $conf->entity);
 
 	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
@@ -55,16 +55,18 @@ if (GETPOST('action', 'alpha') == 'set')
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        $db->commit();
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        $db->rollback();
-	    setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	{
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		$db->rollback();
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 } elseif (GETPOST('action', 'alpha') == 'setmethod')
 {
-    dolibarr_set_const($db, "TAKEPOS_PRINT_METHOD", GETPOST('value', 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "TAKEPOS_PRINT_METHOD", GETPOST('value', 'alpha'), 'chaine', 0, '', $conf->entity);
+	// TakePOS connector require ReceiptPrinter module
+	if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector" && !$conf->receiptprinter->enabled) activateModule("modReceiptPrinter");
 }
 
 
@@ -80,7 +82,7 @@ llxHeader('', $langs->trans("CashDeskSetup"));
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup');
 $head = takepos_admin_prepare_head();
-dol_fiche_head($head, 'receipt', 'TakePOS', -1, 'cash-register');
+print dol_get_fiche_head($head, 'receipt', 'TakePOS', -1, 'cash-register');
 
 print '<form action="'.$_SERVER["PHP_SELF"].'?terminal='.(empty($terminal) ? 1 : $terminal).'" method="post">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -102,34 +104,32 @@ print $langs->trans('BrowserMethodDescription');
 print '</td><td class="right">';
 if ($conf->global->TAKEPOS_PRINT_METHOD == "browser")
 {
-    print img_picto($langs->trans("Activated"), 'switch_on');
+	print img_picto($langs->trans("Activated"), 'switch_on');
 } else {
-    print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&token='.newToken().'&value=browser">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&token='.newToken().'&value=browser">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 }
 print "</td></tr>\n";
 
 // Receipt printer module
-if ($conf->global->MAIN_FEATURES_LEVEL >= 1) {
-	print '<tr class="oddeven"><td>';
-	print $langs->trans('DolibarrReceiptPrinter');
-	print '<td>';
-	print $langs->trans('ReceiptPrinterMethodDescription');
-	print '<br>';
-	print '<a href="'.DOL_URL_ROOT.'/admin/receiptprinter.php">'.$langs->trans("Setup").'</a>';
-	print '</td><td class="right">';
-	if ($conf->receiptprinter->enabled) {
-		if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
-			print img_picto($langs->trans("Activated"), 'switch_on');
-		} else {
-			print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&token='.newToken().'&value=receiptprinter">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-		}
+print '<tr class="oddeven"><td>';
+print $langs->trans('DolibarrReceiptPrinter');
+print '<td>';
+print $langs->trans('ReceiptPrinterMethodDescription');
+print '<br>';
+print '<a href="'.DOL_URL_ROOT.'/admin/receiptprinter.php">'.$langs->trans("Setup").'</a>';
+print '</td><td class="right">';
+if ($conf->receiptprinter->enabled) {
+	if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
+		print img_picto($langs->trans("Activated"), 'switch_on');
 	} else {
-		print '<span class="opacitymedium">';
-		print $langs->trans("ModuleReceiptPrinterMustBeEnabled");
-		print '</span>';
+		print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&token='.newToken().'&value=receiptprinter">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	}
-	print "</td></tr>\n";
+} else {
+	print '<span class="opacitymedium">';
+	print $langs->trans("ModuleReceiptPrinterMustBeEnabled");
+	print '</span>';
 }
+print "</td></tr>\n";
 
 // TakePOS Connector
 print '<tr class="oddeven"><td>';
@@ -139,9 +139,9 @@ print $langs->trans('TakeposConnectorMethodDescription');
 print '</td><td class="right">';
 if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector")
 {
-    print img_picto($langs->trans("Activated"), 'switch_on');
+	print img_picto($langs->trans("Activated"), 'switch_on');
 } else {
-    print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&token='.newToken().'&value=takeposconnector">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&token='.newToken().'&value=takeposconnector">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 }
 print "</td></tr>\n";
 print '</table>';
@@ -246,7 +246,7 @@ print '</div>';
 
 print '<br>';
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
+print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
 
 print "</form>\n";
 
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index 9471e9d1ea4..84efe32839e 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -77,27 +77,22 @@ if ($action == 'set')
 	$res = dolibarr_set_const($db, "TAKEPOS_SORTPRODUCTFIELD", GETPOST('TAKEPOS_SORTPRODUCTFIELD', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_NUM_TERMINALS", GETPOST('TAKEPOS_NUM_TERMINALS', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_ADDON", GETPOST('TAKEPOS_ADDON', 'alpha'), 'int', 0, '', $conf->entity);
-    $res = dolibarr_set_const($db, "TAKEPOS_EMAIL_TEMPLATE_INVOICE", GETPOST('TAKEPOS_EMAIL_TEMPLATE_INVOICE', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_EMAIL_TEMPLATE_INVOICE", GETPOST('TAKEPOS_EMAIL_TEMPLATE_INVOICE', 'alpha'), 'chaine', 0, '', $conf->entity);
 	if (!empty($conf->global->TAKEPOS_ENABLE_SUMUP)) {
 		$res = dolibarr_set_const($db, "TAKEPOS_SUMUP_AFFILIATE", GETPOST('TAKEPOS_SUMUP_AFFILIATE', 'alpha'), 'chaine', 0, '', $conf->entity);
 		$res = dolibarr_set_const($db, "TAKEPOS_SUMUP_APPID", GETPOST('TAKEPOS_SUMUP_APPID', 'alpha'), 'chaine', 0, '', $conf->entity);
 	}
-	if ($conf->global->TAKEPOS_ORDER_NOTES == 1)
-	{
-		$extrafields = new ExtraFields($db);
-		$extrafields->addExtraField('order_notes', 'Order notes', 'varchar', 0, 255, 'facturedet', 0, 0, '', '', 0, '', 0, 1);
-	}
 
 	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
 
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        $db->commit();
-    } else {
-        $db->rollback();
-    }
+	{
+		$db->commit();
+	} else {
+		$db->rollback();
+	}
 } elseif ($action == 'updateMask') {
 	$maskconst = GETPOST('maskconst', 'alpha');
 	$maskvalue = GETPOST('maskvalue', 'alpha');
@@ -131,7 +126,7 @@ llxHeader('', $langs->trans("CashDeskSetup"));
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup');
 $head = takepos_admin_prepare_head();
-dol_fiche_head($head, 'setup', 'TakePOS', -1, 'cash-register');
+print dol_get_fiche_head($head, 'setup', 'TakePOS', -1, 'cash-register');
 
 // Numbering modules
 $now = dol_now();
@@ -184,8 +179,10 @@ foreach ($dirmodels as $reldir)
 						// Show example of numbering module
 						print '<td class="nowrap">';
 						$tmp = $module->getExample();
-						if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-						elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						if (preg_match('/^Error/', $tmp)) {
+							$langs->load("errors");
+							print '<div class="error">'.$langs->trans($tmp).'</div>';
+						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
 						else print $tmp;
 						print '</td>'."\n";
 
@@ -235,6 +232,8 @@ foreach ($dirmodels as $reldir)
 }
 print "</table><br>\n";
 
+print '<br>';
+
 // Mode
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -244,7 +243,7 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
-print '<td class="titlefield">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
+print '<td class="notitlefield">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
 // Terminals
@@ -304,11 +303,12 @@ print $form->selectarray('TAKEPOS_NUMPAD', $array, (empty($conf->global->TAKEPOS
 print "</td></tr>\n";
 
 // Numpad use payment icons
-print '<tr class="oddeven"><td>';
+/*print '<tr class="oddeven"><td>';
 print $langs->trans('TakeposNumpadUsePaymentIcon');
 print '<td colspan="2">';
 print ajax_constantonoff("TAKEPOS_NUMPAD_USE_PAYMENT_ICON", array(), $conf->entity, 0, 0, 1, 0);
 print "</td></tr>\n";
+*/
 
 // Direct Payment
 print '<tr class="oddeven"><td>';
@@ -336,14 +336,14 @@ $nboftemplates = $formmail->fetchAllEMailTemplate('facture_send', $user, null, -
 //$arraydefaultmessage = $formmail->getEMailTemplate($db, $tmp[1], $user, null, 0, 1, '');
 $arrayofmessagename = array();
 if (is_array($formmail->lines_model)) {
-    foreach ($formmail->lines_model as $modelmail) {
-        //var_dump($modelmail);
-        $moreonlabel = '';
-        if (!empty($arrayofmessagename[$modelmail->label])) {
-            $moreonlabel = ' <span class="opacitymedium">('.$langs->trans("SeveralLangugeVariatFound").')</span>';
-        }
-        $arrayofmessagename[$modelmail->id] = $langs->trans(preg_replace('/\(|\)/', '', $modelmail->topic)).$moreonlabel;
-    }
+	foreach ($formmail->lines_model as $modelmail) {
+		//var_dump($modelmail);
+		$moreonlabel = '';
+		if (!empty($arrayofmessagename[$modelmail->label])) {
+			$moreonlabel = ' <span class="opacitymedium">('.$langs->trans("SeveralLangugeVariatFound").')</span>';
+		}
+		$arrayofmessagename[$modelmail->id] = $langs->trans(preg_replace('/\(|\)/', '', $modelmail->topic)).$moreonlabel;
+	}
 }
 //var_dump($arraydefaultmessage);
 //var_dump($arrayofmessagename);
@@ -460,7 +460,7 @@ if ($conf->global->TAKEPOS_ENABLE_SUMUP) {
 
 print '<br>';
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
+print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
 
 print "</form>\n";
 
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index 384be4f8f13..d8ad03a057c 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -41,7 +41,7 @@ if (!empty($_REQUEST['CASHDESK_ID_THIRDPARTY'.$terminal.'_id']))
 // Security check
 if (!$user->admin) accessforbidden();
 
-$langs->loadLangs(array("admin", "cashdesk", "printing"));
+$langs->loadLangs(array("admin", "cashdesk", "printing", "receiptprinter"));
 
 global $db;
 
@@ -78,17 +78,18 @@ if (GETPOST('action', 'alpha') == 'set')
 		$res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_SUMUP".$terminaltouse, (GETPOST('CASHDESK_ID_BANKACCOUNT_SUMUP'.$terminaltouse, 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_SUMUP'.$terminaltouse, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
 	}
 	foreach ($paiements as $modep) {
-        if (in_array($modep->code, array('LIQ', 'CB', 'CHQ'))) continue;
-        $name = "CASHDESK_ID_BANKACCOUNT_".$modep->code.$terminaltouse;
+		if (in_array($modep->code, array('LIQ', 'CB', 'CHQ'))) continue;
+		$name = "CASHDESK_ID_BANKACCOUNT_".$modep->code.$terminaltouse;
 		$res = dolibarr_set_const($db, $name, (GETPOST($name, 'alpha') > 0 ? GETPOST($name, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
-    }
-    $res = dolibarr_set_const($db, "CASHDESK_ID_WAREHOUSE".$terminaltouse, (GETPOST('CASHDESK_ID_WAREHOUSE'.$terminaltouse, 'alpha') > 0 ? GETPOST('CASHDESK_ID_WAREHOUSE'.$terminaltouse, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
-    $res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK".$terminaltouse, GETPOST('CASHDESK_NO_DECREASE_STOCK'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
-    $res = dolibarr_set_const($db, "TAKEPOS_PRINTER_TO_USE".$terminaltouse, GETPOST('TAKEPOS_PRINTER_TO_USE'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
-    $res = dolibarr_set_const($db, "TAKEPOS_ORDER_PRINTER1_TO_USE".$terminaltouse, GETPOST('TAKEPOS_ORDER_PRINTER1_TO_USE'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
-    $res = dolibarr_set_const($db, "TAKEPOS_ORDER_PRINTER2_TO_USE".$terminaltouse, GETPOST('TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
-    $res = dolibarr_set_const($db, "TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES".$terminaltouse, GETPOST('TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
-    $res = dolibarr_set_const($db, "TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS".$terminaltouse, GETPOST('TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
+	}
+	$res = dolibarr_set_const($db, "CASHDESK_ID_WAREHOUSE".$terminaltouse, (GETPOST('CASHDESK_ID_WAREHOUSE'.$terminaltouse, 'alpha') > 0 ? GETPOST('CASHDESK_ID_WAREHOUSE'.$terminaltouse, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK".$terminaltouse, GETPOST('CASHDESK_NO_DECREASE_STOCK'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_PRINTER_TO_USE".$terminaltouse, GETPOST('TAKEPOS_PRINTER_TO_USE'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_ORDER_PRINTER1_TO_USE".$terminaltouse, GETPOST('TAKEPOS_ORDER_PRINTER1_TO_USE'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_ORDER_PRINTER2_TO_USE".$terminaltouse, GETPOST('TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_ORDER_PRINTER3_TO_USE".$terminaltouse, GETPOST('TAKEPOS_ORDER_PRINTER3_TO_USE'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES".$terminaltouse, GETPOST('TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS".$terminaltouse, GETPOST('TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
 
 	$res = dolibarr_set_const($db, 'CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse, (GETPOST('CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse, 'int') > 0 ? GETPOST('CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse, 'int') : ''), 'chaine', 0, '', $conf->entity);
 
@@ -103,13 +104,13 @@ if (GETPOST('action', 'alpha') == 'set')
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        $db->commit();
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        $db->rollback();
-	    setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	{
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		$db->rollback();
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 
@@ -125,7 +126,7 @@ llxHeader('', $langs->trans("CashDeskSetup"));
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup');
 $head = takepos_admin_prepare_head();
-dol_fiche_head($head, 'terminal'.$terminal, 'TakePOS', -1, 'cash-register');
+print dol_get_fiche_head($head, 'terminal'.$terminal, 'TakePOS', -1, 'cash-register');
 print '<br>';
 
 
@@ -148,7 +149,7 @@ print '</td></tr>';
 $atleastonefound = 0;
 if (!empty($conf->banque->enabled))
 {
-    print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForSell").'</td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForSell").'</td>';
 	print '<td>';
 	$form->select_comptes($conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse}, 'CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse, 0, "courant=2", 1);
 	if (!empty($conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse})) $atleastonefound++;
@@ -172,8 +173,8 @@ if (!empty($conf->banque->enabled))
 	}
 
 	foreach ($paiements as $modep) {
-        if (in_array($modep->code, array('LIQ', 'CB', 'CHQ'))) continue; // Already managed before
-        $name = "CASHDESK_ID_BANKACCOUNT_".$modep->code.$terminaltouse;
+		if (in_array($modep->code, array('LIQ', 'CB', 'CHQ'))) continue; // Already managed before
+		$name = "CASHDESK_ID_BANKACCOUNT_".$modep->code.$terminaltouse;
 		print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountFor").' '.$langs->trans($modep->label).'</td>';
 		print '<td>';
 		if (!empty($conf->global->$name)) $atleastonefound++;
@@ -188,13 +189,13 @@ if (!empty($conf->stock->enabled))
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskDoNotDecreaseStock").'</td>'; // Force warehouse (this is not a default value)
 	print '<td>';
 	if (empty($conf->productbatch->enabled) || !empty($conf->global->CASHDESK_FORCE_DECREASE_STOCK)) {
-	    print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK'.$terminal, $conf->global->{'CASHDESK_NO_DECREASE_STOCK'.$terminal}, 1);
+		print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK'.$terminal, $conf->global->{'CASHDESK_NO_DECREASE_STOCK'.$terminal}, 1);
 	} else {
-	    if (!$conf->global->{'CASHDESK_NO_DECREASE_STOCK'.$terminal}) {
-	        $res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK".$terminal, 1, 'chaine', 0, '', $conf->entity);
-	    }
-	    print $langs->trans("Yes").'<br>';
-	    print '<span class="opacitymedium">'.$langs->trans('StockDecreaseForPointOfSaleDisabledbyBatch').'</span>';
+		if (!$conf->global->{'CASHDESK_NO_DECREASE_STOCK'.$terminal}) {
+			$res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK".$terminal, 1, 'chaine', 0, '', $conf->entity);
+		}
+		print $langs->trans("Yes").'<br>';
+		print '<span class="opacitymedium">'.$langs->trans('StockDecreaseForPointOfSaleDisabledbyBatch').'</span>';
 	}
 	print '</td></tr>';
 
@@ -220,35 +221,41 @@ if (!empty($conf->stock->enabled))
 	}
 }
 
-if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
+if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
 	// Select printer to use with terminal
 	require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
 	$printer = new dolReceiptPrinter($db);
-	$printer->listprinters();
-	$printers = array();
-	foreach ($printer->listprinters as $key => $value) {
-		$printers[$value['rowid']] = $value['name'];
-	}
-	print '<tr class="oddeven"><td>'.$langs->trans("MainPrinterToUse").'</td>';
-	print '<td>';
-	print $form->selectarray('TAKEPOS_PRINTER_TO_USE'.$terminal, $printers, (empty($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_PRINTER_TO_USE'.$terminal}), 1);
-	print '</td></tr>';
-	if ($conf->global->TAKEPOS_ORDER_PRINTERS) {
-	    print '<tr class="oddeven"><td>'.$langs->trans("OrderPrinterToUse").' - '.$langs->trans("Printer").' 1</td>';
+	if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
+		$printer->listprinters();
+		$printers = array();
+		foreach ($printer->listprinters as $key => $value) {
+			$printers[$value['rowid']] = $value['name'];
+		}
+		print '<tr class="oddeven"><td>'.$langs->trans("MainPrinterToUse").'</td>';
 		print '<td>';
-		print $form->selectarray('TAKEPOS_ORDER_PRINTER1_TO_USE'.$terminal, $printers, (empty($conf->global->{'TAKEPOS_ORDER_PRINTER1_TO_USE'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_ORDER_PRINTER1_TO_USE'.$terminal}), 1);
-		print '</td></tr>';
-		print '<tr class="oddeven"><td>'.$langs->trans("OrderPrinterToUse").' - '.$langs->trans("Printer").' 2</td>';
-		print '<td>';
-		print $form->selectarray('TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminal, $printers, (empty($conf->global->{'TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminal}), 1);
+		print $form->selectarray('TAKEPOS_PRINTER_TO_USE'.$terminal, $printers, (empty($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_PRINTER_TO_USE'.$terminal}), 1);
 		print '</td></tr>';
+		if ($conf->global->TAKEPOS_ORDER_PRINTERS) {
+			print '<tr class="oddeven"><td>'.$langs->trans("OrderPrinterToUse").' - '.$langs->trans("Printer").' 1</td>';
+			print '<td>';
+			print $form->selectarray('TAKEPOS_ORDER_PRINTER1_TO_USE'.$terminal, $printers, (empty($conf->global->{'TAKEPOS_ORDER_PRINTER1_TO_USE'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_ORDER_PRINTER1_TO_USE'.$terminal}), 1);
+			print '</td></tr>';
+			print '<tr class="oddeven"><td>'.$langs->trans("OrderPrinterToUse").' - '.$langs->trans("Printer").' 2</td>';
+			print '<td>';
+			print $form->selectarray('TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminal, $printers, (empty($conf->global->{'TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminal}), 1);
+			print '</td></tr>';
+			print '<tr class="oddeven"><td>'.$langs->trans("OrderPrinterToUse").' - '.$langs->trans("Printer").' 3</td>';
+			print '<td>';
+			print $form->selectarray('TAKEPOS_ORDER_PRINTER3_TO_USE'.$terminal, $printers, (empty($conf->global->{'TAKEPOS_ORDER_PRINTER3_TO_USE'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_ORDER_PRINTER3_TO_USE'.$terminal}), 1);
+			print '</td></tr>';
+		}
 	}
 	$printer->listPrintersTemplates();
 	$templates = array();
 	foreach ($printer->listprinterstemplates as $key => $value) {
 		$templates[$value['rowid']] = $value['name'];
 	}
-	print '<tr class="oddeven"><td>'.$langs->trans("MainTemplateToUse").'</td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MainTemplateToUse").' (<a href="'.DOL_URL_ROOT.'/admin/receiptprinter.php?mode=template">'.$langs->trans("SetupReceiptTemplate").'</a>)</td>';
 	print '<td>';
 	print $form->selectarray('TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminal, $templates, (empty($conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminal}), 1);
 	print '</td></tr>';
@@ -302,7 +309,7 @@ if ($conf->global->TAKEPOS_ADDON == "terminal") {
 							// Charging the numbering class
 							require_once $dir.$filebis;
 
-                        	$module = new $classname($db);
+							$module = new $classname($db);
 
 							// Show modules according to features level
 							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
@@ -331,8 +338,8 @@ print '</div>';
 // add free text on each terminal of cash desk
 $substitutionarray = pdf_getSubstitutionArray($langs, null, null, 2);
 $substitutionarray['__(AnyTranslationKey)__'] = $langs->trans('Translation');
-$htmltext = '<i>' . $langs->trans('AvailableVariables') . ':<br>';
-foreach ($substitutionarray as $key => $val)	$htmltext .= $key . '<br>';
+$htmltext = '<i>'.$langs->trans('AvailableVariables').':<br>';
+foreach ($substitutionarray as $key => $val)	$htmltext .= $key.'<br>';
 $htmltext .= '</i>';
 
 print '<br>';
@@ -341,7 +348,7 @@ print load_fiche_titre($langs->trans('FreeLegalTextOnInvoices'), '', '');
 print '<div class="div-table-responsive">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
-print '<td>' . $langs->trans("Parameters") . '</td><td>' . $langs->trans('Value') . '</td>';
+print '<td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans('Value').'</td>';
 print '</tr>';
 
 // free text on header
@@ -350,11 +357,11 @@ print '<td>';
 print $form->textwithpicto($langs->trans('Header'), $htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 print '</td>';
 print '<td>';
-$variablename = 'TAKEPOS_HEADER' . $terminaltouse;
+$variablename = 'TAKEPOS_HEADER'.$terminaltouse;
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
-	print '<textarea name="' . $variablename . '" class="flat" cols="120">' . $conf->global->{$variablename} . '</textarea>';
+	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->{$variablename}.'</textarea>';
 } else {
-	include_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 	$doleditor = new DolEditor($variablename, $conf->global->{$variablename}, '', 80, 'dolibarr_notes');
 	print $doleditor->Create();
 }
@@ -366,11 +373,11 @@ print '<td>';
 print $form->textwithpicto($langs->trans('Footer'), $htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 print '</td>';
 print '<td>';
-$variablename = 'TAKEPOS_FOOTER' . $terminaltouse;
+$variablename = 'TAKEPOS_FOOTER'.$terminaltouse;
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
-	print '<textarea name="' . $variablename . '" class="flat" cols="120">' . $conf->global->{$variablename} . '</textarea>';
+	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->{$variablename}.'</textarea>';
 } else {
-	include_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 	$doleditor = new DolEditor($variablename, $conf->global->{$variablename}, '', 80, 'dolibarr_notes');
 	print $doleditor->Create();
 }
@@ -386,7 +393,7 @@ if ($atleastonefound == 0 && !empty($conf->banque->enabled))
 
 print '<br>';
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
+print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
 
 print "</form>\n";
 
diff --git a/htdocs/takepos/ajax/ajax.php b/htdocs/takepos/ajax/ajax.php
index 531598668a7..6da8c74361c 100644
--- a/htdocs/takepos/ajax/ajax.php
+++ b/htdocs/takepos/ajax/ajax.php
@@ -30,6 +30,7 @@ if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');
 if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');
 if (!defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');
 if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
 
 require '../../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
@@ -49,25 +50,25 @@ if (empty($user->rights->takepos->run)) {
  */
 
 if ($action == 'getProducts') {
-    $object = new Categorie($db);
+	$object = new Categorie($db);
 	if ($category == "supplements") $category = $conf->global->TAKEPOS_SUPPLEMENTS_CATEGORY;
-    $result = $object->fetch($category);
-    if ($result > 0)
-    {
-	    $prods = $object->getObjectsInCateg("product", 0, 0, 0, $conf->global->TAKEPOS_SORTPRODUCTFIELD, 'ASC');
-	    // Removed properties we don't need
-	    if (is_array($prods) && count($prods) > 0)
-	    {
-	    	foreach ($prods as $prod)
-	    	{
-	    		unset($prod->fields);
-	    		unset($prod->db);
-	    	}
-	    }
-    	echo json_encode($prods);
-    } else {
-    	echo 'Failed to load category with id='.$category;
-    }
+	$result = $object->fetch($category);
+	if ($result > 0)
+	{
+		$prods = $object->getObjectsInCateg("product", 0, 0, 0, $conf->global->TAKEPOS_SORTPRODUCTFIELD, 'ASC');
+		// Removed properties we don't need
+		if (is_array($prods) && count($prods) > 0)
+		{
+			foreach ($prods as $prod)
+			{
+				unset($prod->fields);
+				unset($prod->db);
+			}
+		}
+		echo json_encode($prods);
+	} else {
+		echo 'Failed to load category with id='.$category;
+	}
 } elseif ($action == 'search' && $term != '') {
 	// Change thirdparty with barcode
 	require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
@@ -75,14 +76,14 @@ if ($action == 'getProducts') {
 	$thirdparty = new Societe($db);
 	$result = $thirdparty->fetch('', '', '', $term);
 
-	if ( $result && $thirdparty->id > 0) {
-	    $rows = array();
-	    	$rows[] = array(
-	    		'rowid' => $thirdparty->id,
-	    		'name' => $thirdparty->name,
-	    		'barcode' => $thirdparty->barcode,
-          'object' => 'thirdparty'
-	    	);
+	if ($result && $thirdparty->id > 0) {
+		$rows = array();
+			$rows[] = array(
+				'rowid' => $thirdparty->id,
+				'name' => $thirdparty->name,
+				'barcode' => $thirdparty->barcode,
+		  'object' => 'thirdparty'
+			);
 			echo json_encode($rows);
 			exit;
 	}
@@ -101,54 +102,54 @@ if ($action == 'getProducts') {
 		}
 	}
 
-    $sql = 'SELECT rowid, ref, label, tosell, tobuy, barcode, price FROM '.MAIN_DB_PREFIX.'product as p';
-    $sql .= ' WHERE entity IN ('.getEntity('product').')';
-    if ($filteroncategids) {
-    	$sql .= ' AND EXISTS (SELECT cp.fk_product FROM '.MAIN_DB_PREFIX.'categorie_product as cp WHERE cp.fk_product = p.rowid AND cp.fk_categorie IN ('.$filteroncategids.'))';
-    }
-    $sql .= ' AND tosell = 1';
-    $sql .= natural_search(array('ref', 'label', 'barcode'), $term);
-    $resql = $db->query($sql);
+	$sql = 'SELECT rowid, ref, label, tosell, tobuy, barcode, price FROM '.MAIN_DB_PREFIX.'product as p';
+	$sql .= ' WHERE entity IN ('.getEntity('product').')';
+	if ($filteroncategids) {
+		$sql .= ' AND EXISTS (SELECT cp.fk_product FROM '.MAIN_DB_PREFIX.'categorie_product as cp WHERE cp.fk_product = p.rowid AND cp.fk_categorie IN ('.$filteroncategids.'))';
+	}
+	$sql .= ' AND tosell = 1';
+	$sql .= natural_search(array('ref', 'label', 'barcode'), $term);
+	$resql = $db->query($sql);
 	if ($resql)
 	{
-	    $rows = array();
-	    while ($obj = $db->fetch_object($resql)) {
-	    	$rows[] = array(
-	    		'rowid' => $obj->rowid,
-	    		'ref' => $obj->ref,
-	    		'label' => $obj->label,
-	    		'tosell' => $obj->tosell,
-	    		'tobuy' => $obj->tobuy,
-	    		'barcode' => $obj->barcode,
-	    		'price' => $obj->price,
+		$rows = array();
+		while ($obj = $db->fetch_object($resql)) {
+			$rows[] = array(
+				'rowid' => $obj->rowid,
+				'ref' => $obj->ref,
+				'label' => $obj->label,
+				'tosell' => $obj->tosell,
+				'tobuy' => $obj->tobuy,
+				'barcode' => $obj->barcode,
+				'price' => $obj->price,
 			'object' => 'product'
-	    		//'price_formated' => price(price2num($obj->price, 'MU'), 1, $langs, 1, -1, -1, $conf->currency)
-	    	);
-	    }
-	    echo json_encode($rows);
+				//'price_formated' => price(price2num($obj->price, 'MU'), 1, $langs, 1, -1, -1, $conf->currency)
+			);
+		}
+		echo json_encode($rows);
 	} else {
 		echo 'Failed to search product : '.$db->lasterror();
 	}
 } elseif ($action == "opendrawer" && $term != '') {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
-    $printer = new dolReceiptPrinter($db);
-    // check printer for terminal
-    if ($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term} > 0) {
-        $printer->initPrinter($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term});
-        // open cashdrawer
-        $printer->pulse();
-        $printer->close();
-    }
+	require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
+	$printer = new dolReceiptPrinter($db);
+	// check printer for terminal
+	if ($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term} > 0) {
+		$printer->initPrinter($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term});
+		// open cashdrawer
+		$printer->pulse();
+		$printer->close();
+	}
 } elseif ($action == "printinvoiceticket" && $term != '' && $id > 0 && !empty($user->rights->facture->lire)) {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-    $printer = new dolReceiptPrinter($db);
-    // check printer for terminal
-    if ($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term} > 0 && $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$term} > 0) {
-        $object = new Facture($db);
-        $object->fetch($id);
-        $ret = $printer->sendToPrinter($object, $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$term}, $conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term});
-    }
+	require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+	$printer = new dolReceiptPrinter($db);
+	// check printer for terminal
+	if (($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term} > 0 || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") && $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$term} > 0) {
+		$object = new Facture($db);
+		$object->fetch($id);
+		$ret = $printer->sendToPrinter($object, $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$term}, $conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term});
+	}
 } elseif ($action == 'getInvoice') {
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
@@ -162,6 +163,6 @@ if ($action == 'getProducts') {
 	$place = GETPOST('place', 'alpha');
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
-    $printer = new dolReceiptPrinter($db);
-    $printer->sendToPrinter($object, $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$term}, $conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term});
+	$printer = new dolReceiptPrinter($db);
+	$printer->sendToPrinter($object, $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$term}, $conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term});
 }
diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php
index 973bbabba2d..6cd6073eb48 100644
--- a/htdocs/takepos/css/pos.css.php
+++ b/htdocs/takepos/css/pos.css.php
@@ -125,6 +125,10 @@ button.calcbutton2 {
     border-radius: 3px;
 }
 
+button.calcbutton2 .iconwithlabel {
+	padding-bottom: 10px;
+}
+
 button.calcbutton3 {
 	display: inline-block;
 	position: relative;
@@ -454,7 +458,7 @@ p.description_content{
 div.description_content {
 	display: -webkit-box;
     -webkit-box-orient: vertical;
-    -webkit-line-clamp: <?php echo $conf->global->TAKEPOS_LINES_TO_SHOW;?>;
+    -webkit-line-clamp: <?php echo $conf->global->TAKEPOS_LINES_TO_SHOW; ?>;
     overflow: hidden;
     padding-left: 2px;
     padding-right: 2px;
@@ -463,7 +467,7 @@ div.description_content {
 .header{
 	margin: 0 auto;
 	width: 100%;
-	height: 50px;
+	height: 52px;
 	background: rgb(60,70,100);
 }
 
@@ -479,8 +483,7 @@ div.description_content {
 	width: unset;
 }
 .topnav{
-	background: rgb(<?php echo $colorbackhmenu1 ?>);
-	background-image: linear-gradient(-45deg, <?php echo colorAdjustBrightness(colorArrayToHex(colorStringToArray($colorbackhmenu1)), '5'); ?>, rgb(<?php echo $colorbackhmenu1 ?>));
+	background: var(--colorbackhmenu1);
 	overflow: hidden;
 	height: 100%;
 }
diff --git a/htdocs/takepos/floors.php b/htdocs/takepos/floors.php
index 257c8db7fa0..72f25a86ce4 100644
--- a/htdocs/takepos/floors.php
+++ b/htdocs/takepos/floors.php
@@ -23,15 +23,16 @@
 
 //if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
-//if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');
-if (!defined('NOCSRFCHECK'))		define('NOCSRFCHECK', '1');
+//if (! defined('NOREQUIRESOC'))	define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN'))	define('NOREQUIRETRAN','1');
+if (!defined('NOCSRFCHECK'))	define('NOCSRFCHECK', '1');
 if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');
-if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIREMENU'))	define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML'))	define('NOREQUIREHTML', '1');
+if (!defined('NOREQUIREAJAX'))	define('NOREQUIREAJAX', '1');
 
 require '../main.inc.php'; // Load $user and permissions
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 $langs->loadLangs(array("bills", "orders", "commercial", "cashdesk"));
 
@@ -58,36 +59,39 @@ if (empty($user->rights->takepos->run)) {
 
 if ($action == "getTables")
 {
-    $sql = "SELECT rowid, entity, label, leftpos, toppos, floor FROM ".MAIN_DB_PREFIX."takepos_floor_tables where floor=".$floor;
-    $resql = $db->query($sql);
-    $rows = array();
-    while ($row = $db->fetch_array($resql)) {
-        $rows[] = $row;
-    }
-    echo json_encode($rows);
-    exit;
+	$sql = "SELECT rowid, entity, label, leftpos, toppos, floor FROM ".MAIN_DB_PREFIX."takepos_floor_tables where floor=".$floor;
+	$resql = $db->query($sql);
+	$rows = array();
+	while ($row = $db->fetch_array($resql)) {
+		$invoice = new Facture($db);
+		$result = $invoice->fetch('', '(PROV-POS'.$_SESSION['takeposterminal'].'-'.$row['rowid'].')');
+		if ($result > 0) $row['occupied'] = "red";
+		$rows[] = $row;
+	}
+	echo json_encode($rows);
+	exit;
 }
 
 if ($action == "update")
 {
-    if ($left > 95) $left = 95;
-    if ($top > 95) $top = 95;
-    if ($left > 3 or $top > 4) $db->query("UPDATE ".MAIN_DB_PREFIX."takepos_floor_tables set leftpos=".$left.", toppos=".$top." WHERE rowid='".$place."'");
-    else $db->query("DELETE from ".MAIN_DB_PREFIX."takepos_floor_tables where rowid='".$place."'");
+	if ($left > 95) $left = 95;
+	if ($top > 95) $top = 95;
+	if ($left > 3 or $top > 4) $db->query("UPDATE ".MAIN_DB_PREFIX."takepos_floor_tables set leftpos=".$left.", toppos=".$top." WHERE rowid='".$place."'");
+	else $db->query("DELETE from ".MAIN_DB_PREFIX."takepos_floor_tables where rowid='".$place."'");
 }
 
 if ($action == "updatename")
 {
-    $newname = preg_replace("/[^a-zA-Z0-9\s]/", "", $newname); // Only English chars
-    if (strlen($newname) > 3) $newname = substr($newname, 0, 3); // Only 3 chars
-    $db->query("UPDATE ".MAIN_DB_PREFIX."takepos_floor_tables set label='".$db->escape($newname)."' WHERE rowid='".$place."'");
+	$newname = preg_replace("/[^a-zA-Z0-9\s]/", "", $newname); // Only English chars
+	if (strlen($newname) > 3) $newname = substr($newname, 0, 3); // Only 3 chars
+	$db->query("UPDATE ".MAIN_DB_PREFIX."takepos_floor_tables set label='".$db->escape($newname)."' WHERE rowid='".$place."'");
 }
 
 if ($action == "add")
 {
-    $sql = "INSERT INTO ".MAIN_DB_PREFIX."takepos_floor_tables(entity, label, leftpos, toppos, floor) VALUES (".$conf->entity.", '', '45', '45', ".$floor.")";
-    $asdf = $db->query($sql);
-    $db->query("update ".MAIN_DB_PREFIX."takepos_floor_tables set label=rowid where label=''"); // No empty table names
+	$sql = "INSERT INTO ".MAIN_DB_PREFIX."takepos_floor_tables(entity, label, leftpos, toppos, floor) VALUES (".$conf->entity.", '', '45', '45', ".$floor.")";
+	$asdf = $db->query($sql);
+	$db->query("update ".MAIN_DB_PREFIX."takepos_floor_tables set label=rowid where label=''"); // No empty table names
 }
 
 
@@ -113,6 +117,9 @@ text-align: center;
 font-size:300%;
 color:white;
 }
+div.red{
+color:red;
+}
 html, body
 {
 height: 100%;
@@ -172,7 +179,7 @@ $( document ).ready(function() {
 				$(this).focus();
 			})
 			<?php } else {?>
-			$('body').append('<div class="tablediv" onclick="LoadPlace('+val.rowid+');" style="position: absolute; left: '+val.leftpos+'%; top: '+val.toppos+'%;" id="tablename'+val.rowid+'">'+val.label+'</div>');
+			$('body').append('<div class="tablediv '+val.occupied+'" onclick="LoadPlace('+val.rowid+');" style="position: absolute; left: '+val.leftpos+'%; top: '+val.toppos+'%;" id="tablename'+val.rowid+'">'+val.label+'</div>');
 			<?php } ?>
 		});
 	});
diff --git a/htdocs/takepos/freezone.php b/htdocs/takepos/freezone.php
index 79a638456f2..4cca5816fab 100644
--- a/htdocs/takepos/freezone.php
+++ b/htdocs/takepos/freezone.php
@@ -24,13 +24,13 @@
 
 //if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
-//if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');
-if (!defined('NOCSRFCHECK'))		define('NOCSRFCHECK', '1');
+//if (! defined('NOREQUIRESOC'))	define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN'))	define('NOREQUIRETRAN','1');
+if (!defined('NOCSRFCHECK'))	define('NOCSRFCHECK', '1');
 if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');
-if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIREMENU'))	define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML'))	define('NOREQUIREHTML', '1');
+if (!defined('NOREQUIREAJAX'))	define('NOREQUIREAJAX', '1');
 
 require '../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
diff --git a/htdocs/takepos/genimg/index.php b/htdocs/takepos/genimg/index.php
index 9ec730bfad8..bdd237d1a15 100644
--- a/htdocs/takepos/genimg/index.php
+++ b/htdocs/takepos/genimg/index.php
@@ -83,7 +83,7 @@ if ($query == "cat")
 		}
 	}
 } else {
-    // TODO We don't need this. Size of image must be defined on HTML page, image must NOT be resize when downloaded.
+	// TODO We don't need this. Size of image must be defined on HTML page, image must NOT be resize when downloaded.
 
 	// The file
 	$filename = $query.".jpg";
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 66212ab3203..a2293786924 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -25,13 +25,13 @@
 
 //if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
-//if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');
-if (!defined('NOCSRFCHECK'))		define('NOCSRFCHECK', '1');
+//if (! defined('NOREQUIRESOC'))	define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN'))	define('NOREQUIRETRAN','1');
+if (!defined('NOCSRFCHECK'))	define('NOCSRFCHECK', '1');
 if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');
-if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIREMENU'))	define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML'))	define('NOREQUIREHTML', '1');
+if (!defined('NOREQUIREAJAX'))	define('NOREQUIREAJAX', '1');
 
 require '../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
@@ -44,6 +44,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Bar or Restaurant or multiple sales
 $action = GETPOST('action', 'aZ09');
 $setterminal = GETPOST('setterminal', 'int');
+$setcurrency = GETPOST('setcurrency', 'aZ09');
 
 if ($_SESSION["takeposterminal"] == "")
 {
@@ -57,6 +58,11 @@ if ($setterminal > 0)
 	setcookie("takeposterminal", $setterminal, (time() + (86400 * 354)), '/', null, false, true); // Permanent takeposterminal var in a cookie
 }
 
+if ($setcurrency != "")
+{
+	$_SESSION["takeposcustomercurrency"] = $setcurrency;
+}
+
 $_SESSION["urlfrom"] = '/takepos/index.php';
 
 $langs->loadLangs(array("bills", "orders", "commercial", "cashdesk", "receiptprinter", "banks"));
@@ -67,8 +73,8 @@ $maxcategbydefaultforthisdevice = 12;
 $maxproductbydefaultforthisdevice = 24;
 if ($conf->browser->layout == 'phone')
 {
-    $maxcategbydefaultforthisdevice = 8;
-    $maxproductbydefaultforthisdevice = 16;
+	$maxcategbydefaultforthisdevice = 8;
+	$maxproductbydefaultforthisdevice = 16;
 	//REDIRECT TO BASIC LAYOUT IF TERMINAL SELECTED AND BASIC MOBILE LAYOUT ENABLED
 	if ($_SESSION["takeposterminal"] != "" && $conf->global->TAKEPOS_PHONE_BASIC_LAYOUT == 1)
 	{
@@ -124,14 +130,14 @@ $categories = $categorie->get_full_arbo('product', (($conf->global->TAKEPOS_ROOT
 $levelofrootcategory = 0;
 if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0)
 {
-    foreach ($categories as $key => $categorycursor)
-    {
-        if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID)
-        {
-            $levelofrootcategory = $categorycursor['level'];
-            break;
-        }
-    }
+	foreach ($categories as $key => $categorycursor)
+	{
+		if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID)
+		{
+			$levelofrootcategory = $categorycursor['level'];
+			break;
+		}
+	}
 }
 $levelofmaincategories = $levelofrootcategory + 1;
 
@@ -139,12 +145,12 @@ $maincategories = array();
 $subcategories = array();
 foreach ($categories as $key => $categorycursor)
 {
-    if ($categorycursor['level'] == $levelofmaincategories)
-    {
-        $maincategories[$key] = $categorycursor;
-    } else {
-        $subcategories[$key] = $categorycursor;
-    }
+	if ($categorycursor['level'] == $levelofmaincategories)
+	{
+		$maincategories[$key] = $categorycursor;
+	} else {
+		$subcategories[$key] = $categorycursor;
+	}
 }
 
 $maincategories = dol_sort_array($maincategories, 'label');
@@ -424,7 +430,7 @@ function ClickProduct(position) {
 function ChangeThirdparty(idcustomer) {
 	 console.log("ChangeThirdparty");
 		// Call page list.php to change customer
-		$("#poslines").load("../societe/list.php?action=change&contextpage=poslist&idcustomer="+idcustomer+"&place="+place+"", function() {
+		$("#poslines").load("../societe/list.php?action=change&type=t&contextpage=poslist&idcustomer="+idcustomer+"&place="+place+"", function() {
 		});
 
 	ClearSearch();
@@ -440,7 +446,7 @@ function deleteline() {
 
 function Customer() {
 	console.log("Open box to select the thirdparty place="+place);
-	$.colorbox({href:"../societe/list.php?contextpage=poslist&nomassaction=1&place="+place, width:"90%", height:"80%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("Customer"); ?>"});
+	$.colorbox({href:"../societe/list.php?type=t&contextpage=poslist&nomassaction=1&place="+place, width:"90%", height:"80%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("Customer"); ?>"});
 }
 
 function History()
@@ -725,14 +731,10 @@ function CashReport(rowid)
     $.colorbox({href:"../compta/cashcontrol/report.php?id="+rowid+"&contextpage=takepos", width:"60%", height:"90%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("CashReport"); ?>"});
 }
 
-// Popup to select the terminal to use
-function TerminalsDialog()
+// TakePOS Popup
+function ModalBox(ModalID)
 {
-    var modal = document.getElementById("ModalTerminal");
-	var span = document.getElementsByClassName("close")[0];
-	span.onclick = function() {
-		modal.style.display = "none";
-	}
+    var modal = document.getElementById(ModalID);
 	modal.style.display = "block";
 }
 
@@ -767,7 +769,7 @@ $( document ).ready(function() {
 	//IF NO TERMINAL SELECTED
 	if ($_SESSION["takeposterminal"] == "")
 	{
-		print "TerminalsDialog();";
+		print "ModalBox('ModalTerminal');";
 	}
 	if ($conf->global->TAKEPOS_CONTROL_CASH_OPENING)
 	{
@@ -798,7 +800,7 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 		<div class="topnav">
 			<div class="topnav-left">
 			<div class="inline-block valignmiddle">
-			<a class="topnav-terminalhour" onclick="TerminalsDialog();">
+			<a class="topnav-terminalhour" onclick="ModalBox('ModalTerminal');">
 			<span class="fa fa-cash-register"></span>
 			<span class="hideonsmartphone">
 			<?php echo $langs->trans("Terminal"); ?>
@@ -808,7 +810,15 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 			else echo $_SESSION["takeposterminal"];
 			echo '<span class="hideonsmartphone"> - '.dol_print_date(dol_now(), "day").'</span>';
 			?>
-			</a></div>
+			</a>
+			<?php
+			if (!empty($conf->multicurrency->enabled)) {
+				print '<a class="valignmiddle tdoverflowmax100" id="multicurrency" onclick="ModalBox(\'ModalCurrency\');" title=""><span class="fas fa-coins paddingrightonly"></span>';
+				print '<span class="hideonsmartphone">'.$langs->trans("Currency").'</span>';
+				print '</a>';
+			}
+			?>
+			</div>
 			<!-- section for customer and open sales -->
 			<div class="inline-block valignmiddle" id="customerandsales">
 			</div>
@@ -822,7 +832,7 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 				<a onclick="ClearSearch();"><span class="fa fa-backspace"></span></a>
 				<a onclick="window.location.href='<?php echo DOL_URL_ROOT.'/'; ?>';"><span class="fas fa-home"></span></a>
 				<?php if (empty($conf->dol_use_jmobile)) { ?>
-				<a onclick="FullScreen();"><span class="fa fa-expand-arrows-alt"></span></a>
+				<a class="hideonsmartphone" onclick="FullScreen();"><span class="fa fa-expand-arrows-alt"></span></a>
 				<?php } ?>
 				</div>
 				<div class="login_block_user">
@@ -841,11 +851,11 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 <div id="ModalTerminal" class="modal">
 	<div class="modal-content">
 		<div class="modal-header">
-		<span class="close">&times;</span>
-		<h3><?php print $langs->trans("TerminalSelect");?></h3>
+		<span class="close" href="#" onclick="document.getElementById('ModalTerminal').style.display = 'none';">&times;</span>
+		<h3><?php print $langs->trans("TerminalSelect"); ?></h3>
 	</div>
 	<div class="modal-body">
-		<button type="button" class="block" onclick="location.href='index.php?setterminal=1'"><?php print $langs->trans("Terminal");?> 1</button>
+		<button type="button" class="block" onclick="location.href='index.php?setterminal=1'"><?php print $langs->trans("Terminal"); ?> 1</button>
 		<?php
 		for ($i = 2; $i <= $conf->global->TAKEPOS_NUM_TERMINALS; $i++)
 		{
@@ -854,10 +864,45 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 		?>
 	</div>
 </div>
-
 </div>
 
+<!-- Modal multicurrency box -->
+<?php if (!empty($conf->multicurrency->enabled)) { ?>
+<div id="ModalCurrency" class="modal">
+	<div class="modal-content">
+		<div class="modal-header">
+			<span class="close" href="#" onclick="document.getElementById('ModalCurrency').style.display = 'none';">&times;</span>
+			<h3><?php print $langs->trans("SetMultiCurrencyCode"); ?></h3>
+		</div>
+		<div class="modal-body">
+			<?php
+			$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'multicurrency';
+			$sql .= " WHERE entity IN ('".getEntity('multicurrency')."')";
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				while ($obj = $db->fetch_object($resql))
+				print '<button type="button" class="block" onclick="location.href=\'index.php?setcurrency='.$obj->code.'\'">'.$obj->code.'</button>';
+			}
+			?>
+		</div>
+	</div>
+</div>
+<?php } ?>
 
+<!-- Modal terminal Credit Note -->
+<div id="ModalCreditNote" class="modal">
+	<div class="modal-content">
+		<div class="modal-header">
+		<span class="close" href="#" onclick="document.getElementById('ModalCreditNote').style.display = 'none';">&times;</span>
+		<h3><?php print $langs->trans("invoiceAvoirWithLines"); ?></h3>
+	</div>
+	<div class="modal-body">
+		<button type="button" class="block" onclick="CreditNote(); document.getElementById('ModalCreditNote').style.display = 'none';"><?php print $langs->trans("Yes"); ?></button>
+		<button type="button" class="block" onclick="document.getElementById('ModalCreditNote').style.display = 'none';"><?php print $langs->trans("No"); ?></button>
+	</div>
+</div>
+</div>
 
 	<div class="row1<?php if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) print 'withhead'; ?>">
 
@@ -895,9 +940,9 @@ $resql = $db->query($sql);
 $paiementsModes = array();
 if ($resql) {
 	while ($obj = $db->fetch_object($resql)) {
-        $paycode = $obj->code;
-        if ($paycode == 'LIQ') $paycode = 'CASH';
-        if ($paycode == 'CHQ') $paycode = 'CHEQUE';
+		$paycode = $obj->code;
+		if ($paycode == 'LIQ') $paycode = 'CASH';
+		if ($paycode == 'CHQ') $paycode = 'CHEQUE';
 
 		$constantforkey = "CASHDESK_ID_BANKACCOUNT_".$paycode.$_SESSION["takeposterminal"];
 		//var_dump($constantforkey.' '.$conf->global->$constantforkey);
@@ -919,10 +964,10 @@ $r = 0;
 
 if (empty($conf->global->TAKEPOS_BAR_RESTAURANT))
 {
-    $menus[$r++] = array('title'=>'<span class="fa fa-layer-group paddingrightonly"></span><div class="trunc">'.$langs->trans("New").'</div>', 'action'=>'New();');
+	$menus[$r++] = array('title'=>'<span class="fa fa-layer-group paddingrightonly"></span><div class="trunc">'.$langs->trans("New").'</div>', 'action'=>'New();');
 } else {
-    // BAR RESTAURANT specific menu
-    $menus[$r++] = array('title'=>'<span class="fa fa-layer-group paddingrightonly"></span><div class="trunc">'.$langs->trans("Place").'</div>', 'action'=>'Floors();');
+	// BAR RESTAURANT specific menu
+	$menus[$r++] = array('title'=>'<span class="fa fa-layer-group paddingrightonly"></span><div class="trunc">'.$langs->trans("Place").'</div>', 'action'=>'Floors();');
 }
 
 if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
@@ -947,7 +992,7 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT)
 	//Button to print receipt before payment
 	if ($conf->global->TAKEPOS_BAR_RESTAURANT)
 	{
-	    if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
+		if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
 			if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) $menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', 'action'=>'TakeposConnector(placeid);');
 			else $menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', 'action'=>'TakeposPrinting(placeid);');
 		} elseif ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
@@ -958,19 +1003,19 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT)
 	}
 	if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector" && $conf->global->TAKEPOS_ORDER_NOTES == 1)
 	{
-	    $menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("OrderNotes").'</div>', 'action'=>'TakeposOrderNotes();');
+		$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("OrderNotes").'</div>', 'action'=>'TakeposOrderNotes();');
 	}
 	if ($conf->global->TAKEPOS_SUPPLEMENTS)
 	{
-	    $menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("ProductSupplements").'</div>', 'action'=>'LoadProducts(\'supplements\');');
+		$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("ProductSupplements").'</div>', 'action'=>'LoadProducts(\'supplements\');');
 	}
 }
 
 if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
-    $menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("DOL_OPEN_DRAWER").'</div>', 'action'=>'OpenDrawer();');
+	$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("DOL_OPEN_DRAWER").'</div>', 'action'=>'OpenDrawer();');
 }
 if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
-    $menus[$r++] = array(
+	$menus[$r++] = array(
 		'title' => '<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("DOL_OPEN_DRAWER").'</div>',
 		'action' => 'DolibarrOpenDrawer();',
 	);
@@ -1017,17 +1062,17 @@ if ($conf->global->TAKEPOS_WEIGHING_SCALE)
 		<!-- Show buttons -->
 		<div class="div3">
 		<?php
-        $i = 0;
-        foreach ($menus as $menu)
-        {
-        	$i++;
-        	if (count($menus) > 12 and $i == 12)
-        	{
-        		echo '<button style="'.$menu['style'].'" type="button" id="actionnext" class="actionbutton" onclick="MoreActions('.count($menus).');">'.$langs->trans("Next").'</button>';
-        		echo '<button style="display: none;" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
-        	} elseif ($i > 12) echo '<button style="display: none;" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
-            else echo '<button style="'.$menu['style'].'" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
-        }
+		$i = 0;
+		foreach ($menus as $menu)
+		{
+			$i++;
+			if (count($menus) > 12 and $i == 12)
+			{
+				echo '<button style="'.$menu['style'].'" type="button" id="actionnext" class="actionbutton" onclick="MoreActions('.count($menus).');">'.$langs->trans("Next").'</button>';
+				echo '<button style="display: none;" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
+			} elseif ($i > 12) echo '<button style="display: none;" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
+			else echo '<button style="'.$menu['style'].'" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
+		}
 
 		if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 			print '<!-- Show the search input text -->'."\n";
@@ -1036,7 +1081,7 @@ if ($conf->global->TAKEPOS_WEIGHING_SCALE)
 			print '<a class="marginleftonly hideonsmartphone" onclick="ClearSearch();">'.img_picto('', 'searchclear').'</a>';
 			print '</div>';
 		}
-        ?>
+		?>
 		</div>
 	</div>
 
@@ -1048,17 +1093,17 @@ if ($conf->global->TAKEPOS_WEIGHING_SCALE)
 	$count = 0;
 	while ($count < $MAXCATEG)
 	{
-	    ?>
+		?>
 			<div class="wrapper" <?php if ($count == ($MAXCATEG - 2)) echo 'onclick="MoreCategories(\'less\');"'; elseif ($count == ($MAXCATEG - 1)) echo 'onclick="MoreCategories(\'more\');"'; else echo 'onclick="LoadProducts('.$count.');"'; ?> id="catdiv<?php echo $count; ?>">
 				<?php
 				if ($count == ($MAXCATEG - 2)) {
-				    //echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="catimg'.$count.'" />';
-				    echo '<span class="fa fa-chevron-left centerinmiddle" style="font-size: 5em;"></span>';
+					//echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="catimg'.$count.'" />';
+					echo '<span class="fa fa-chevron-left centerinmiddle" style="font-size: 5em;"></span>';
 				} elseif ($count == ($MAXCATEG - 1)) {
-				    //echo '<img class="imgwrapper" src="img/arrow-next-top.png" height="100%" id="catimg'.$count.'" />';
-				    echo '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em;"></span>';
+					//echo '<img class="imgwrapper" src="img/arrow-next-top.png" height="100%" id="catimg'.$count.'" />';
+					echo '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em;"></span>';
 				} else {
-				    if (!$conf->global->TAKEPOS_HIDE_CATEGORY_IMAGES) echo '<img class="imgwrapper" height="100%" id="catimg'.$count.'" />';
+					if (!$conf->global->TAKEPOS_HIDE_CATEGORY_IMAGES) echo '<img class="imgwrapper" height="100%" id="catimg'.$count.'" />';
 				}
 				?>
 				<?php if ($count != ($MAXCATEG - 2) && $count != ($MAXCATEG - 1)) { ?>
@@ -1069,7 +1114,7 @@ if ($conf->global->TAKEPOS_WEIGHING_SCALE)
 				<div class="catwatermark" id='catwatermark<?php echo $count; ?>'>...</div>
 			</div>
 	    <?php
-        $count++;
+		$count++;
 	}
 	?>
 		</div>
@@ -1077,26 +1122,26 @@ if ($conf->global->TAKEPOS_WEIGHING_SCALE)
 	    <!--  Show product -->
 		<div class="div5">
     <?php
-    $count = 0;
-    while ($count < $MAXPRODUCT)
-    {
-        ?>
+	$count = 0;
+	while ($count < $MAXPRODUCT)
+	{
+		?>
     			<div class="wrapper2" id='prodiv<?php echo $count; ?>' <?php if ($count == ($MAXPRODUCT - 2)) {?> onclick="MoreProducts('less');" <?php } if ($count == ($MAXPRODUCT - 1)) {?> onclick="MoreProducts('more');" <?php } else echo 'onclick="ClickProduct('.$count.');"'; ?>>
     				<?php
-    				if ($count == ($MAXPRODUCT - 2)) {
-    				    //echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="proimg'.$count.'" />';
-    					print '<span class="fa fa-chevron-left centerinmiddle" style="font-size: 5em;"></span>';
-    				} elseif ($count == ($MAXPRODUCT - 1)) {
-    				    //echo '<img class="imgwrapper" src="img/arrow-next-top.png" height="100%" id="proimg'.$count.'" />';
-    					print '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em;"></span>';
-    				} else {
+					if ($count == ($MAXPRODUCT - 2)) {
+						//echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="proimg'.$count.'" />';
+						print '<span class="fa fa-chevron-left centerinmiddle" style="font-size: 5em;"></span>';
+					} elseif ($count == ($MAXPRODUCT - 1)) {
+						//echo '<img class="imgwrapper" src="img/arrow-next-top.png" height="100%" id="proimg'.$count.'" />';
+						print '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em;"></span>';
+					} else {
 						if ($conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES) echo '<button type="button" id="probutton'.$count.'" class="productbutton" style="display: none;"></button>';
-    					else {
+						else {
 							print '<div class="" id="proprice'.$count.'"></div>';
 							print '<img class="imgwrapper" height="100%" title="" id="proimg'.$count.'">';
 						}
-    				}
-    				?>
+					}
+					?>
 					<?php if ($count != ($MAXPRODUCT - 2) && $count != ($MAXPRODUCT - 1) && !$conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES) { ?>
     				<div class="description" id="prodivdesc<?php echo $count; ?>">
     					<div class="description_content" id="prodesc<?php echo $count; ?>"></div>
@@ -1105,9 +1150,9 @@ if ($conf->global->TAKEPOS_WEIGHING_SCALE)
     				<div class="catwatermark" id='prowatermark<?php echo $count; ?>'>...</div>
     			</div>
         <?php
-        $count++;
-    }
-    ?>
+		$count++;
+	}
+	?>
 		</div>
 	</div>
 </div>
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index f560fee0b44..d2fd153e5be 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -46,11 +46,17 @@ $action = GETPOST('action', 'aZ09');
 $idproduct = GETPOST('idproduct', 'int');
 $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Bar or Restaurant
 $placeid = 0; // $placeid is ID of invoice
+// Terminal is stored into $_SESSION["takeposterminal"];
 
 if (empty($user->rights->takepos->run) && !defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 	accessforbidden();
 }
 
+
+/*
+ * View
+ */
+
 if (($conf->global->TAKEPOS_PHONE_BASIC_LAYOUT == 1 && $conf->browser->layout == 'phone') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE'))
 {
 	// DIRECT LINK TO THIS PAGE FROM MOBILE AND NO TERMINAL SELECTED
@@ -110,9 +116,8 @@ $sql = "SELECT id FROM ".MAIN_DB_PREFIX."c_paiement";
 $sql .= " WHERE entity IN (".getEntity('c_paiement').")";
 $sql .= " AND code = '".$db->escape($paycode)."'";
 $resql = $db->query($sql);
-$codes = $db->fetch_array($resql);
-$paiementid = $codes[0];
-
+$obj = $db->fetch_object($resql);
+$paiementid = $obj->id;
 
 $invoice = new Facture($db);
 if ($invoiceid > 0)
@@ -145,8 +150,7 @@ if ($action == 'valid' && $user->rights->facture->creer)
 
 	if (!empty($conf->global->TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT)) {
 		$bankaccount = GETPOST('accountid', 'int');
-	}
-	else {
+	} else {
 		if ($pay == "cash") $bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$_SESSION["takeposterminal"]};            // For backward compatibility
 		elseif ($pay == "card") $bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CB'.$_SESSION["takeposterminal"]};          // For backward compatibility
 		elseif ($pay == "cheque") $bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$_SESSION["takeposterminal"]};    // For backward compatibility
@@ -207,7 +211,8 @@ if ($action == 'valid' && $user->rights->facture->creer)
 			dol_htmloutput_errors($langs->trans("InvoiceIsAlreadyValidated", "TakePos"), null, 1);
 		}
 	} elseif (count($invoice->lines) == 0) {
-		dol_syslog("Sale without lines");
+		$error++;
+		dol_syslog('Sale without lines');
 		dol_htmloutput_errors($langs->trans("NoLinesToBill", "TakePos"), null, 1);
 	} elseif (!empty($conf->stock->enabled) && $conf->global->$constantforkey != "1") {
 		$savconst = $conf->global->STOCK_CALCULATE_ON_BILL;
@@ -225,6 +230,10 @@ if ($action == 'valid' && $user->rights->facture->creer)
 		$conf->global->STOCK_CALCULATE_ON_BILL = $savconst;
 	} else {
 		$res = $invoice->validate($user);
+		if ($res < 0) {
+			$error++;
+			dol_htmloutput_errors($invoice->error, $invoice->errors, 1);
+		}
 	}
 
 	// Restore save values
@@ -253,7 +262,7 @@ if ($action == 'valid' && $user->rights->facture->creer)
 			if ($pay != "delayed") {
 				$payment->create($user);
 				$payment->addPaymentToBank($user, 'payment', '(CustomerInvoicePayment)', $bankaccount, '', '');
-				$remaintopay = $invoice->getRemainToPay();    // Recalculate remain to pay after the payment is recorded
+				$remaintopay = $invoice->getRemainToPay(); // Recalculate remain to pay after the payment is recorded
 			}
 		}
 
@@ -271,19 +280,173 @@ if ($action == 'valid' && $user->rights->facture->creer)
 	}
 }
 
-if ($action == 'history')
+if ($action == 'creditnote')
 {
-	$placeid = (int) GETPOST('placeid', 'int');
+	$creditnote = new Facture($db);
+	$creditnote->socid = $invoice->socid;
+	$creditnote->date = dol_now();
+	$creditnote->type = Facture::TYPE_CREDIT_NOTE;
+	$creditnote->fk_facture_source = $placeid;
+	$creditnote->remise_absolue = $invoice->remise_absolue;
+	$creditnote->remise_percent = $invoice->remise_percent;
+	$creditnote->create($user);
+
+	foreach ($invoice->lines as $line)
+	{
+		// Extrafields
+		if (method_exists($line, 'fetch_optionals')) {
+			// load extrafields
+			$line->fetch_optionals();
+		}
+		// Reset fk_parent_line for no child products and special product
+		if (($line->product_type != 9 && empty($line->fk_parent_line)) || $line->product_type == 9) {
+			$fk_parent_line = 0;
+		}
+		if ($invoice->type == Facture::TYPE_SITUATION)
+		{
+			$source_fk_prev_id = $line->fk_prev_id; // temporary storing situation invoice fk_prev_id
+			$line->fk_prev_id  = $line->id; // The new line of the new credit note we are creating must be linked to the situation invoice line it is created from
+			if (!empty($invoice->tab_previous_situation_invoice))
+			{
+				// search the last standard invoice in cycle and the possible credit note between this last and invoice
+				// TODO Move this out of loop of $invoice->lines
+				$tab_jumped_credit_notes = array();
+				$lineIndex = count($invoice->tab_previous_situation_invoice) - 1;
+				$searchPreviousInvoice = true;
+				while ($searchPreviousInvoice)
+				{
+					if ($invoice->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_SITUATION || $lineIndex < 1)
+					{
+						$searchPreviousInvoice = false; // find, exit;
+						break;
+					} else {
+						if ($invoice->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_CREDIT_NOTE) {
+							$tab_jumped_credit_notes[$lineIndex] = $invoice->tab_previous_situation_invoice[$lineIndex]->id;
+						}
+						$lineIndex--; // go to previous invoice in cycle
+					}
+				}
+
+				$maxPrevSituationPercent = 0;
+				foreach ($invoice->tab_previous_situation_invoice[$lineIndex]->lines as $prevLine)
+				{
+					if ($prevLine->id == $source_fk_prev_id)
+					{
+						$maxPrevSituationPercent = max($maxPrevSituationPercent, $prevLine->situation_percent);
+
+						//$line->subprice  = $line->subprice - $prevLine->subprice;
+						$line->total_ht  = $line->total_ht - $prevLine->total_ht;
+						$line->total_tva = $line->total_tva - $prevLine->total_tva;
+						$line->total_ttc = $line->total_ttc - $prevLine->total_ttc;
+						$line->total_localtax1 = $line->total_localtax1 - $prevLine->total_localtax1;
+						$line->total_localtax2 = $line->total_localtax2 - $prevLine->total_localtax2;
+
+						$line->multicurrency_subprice  = $line->multicurrency_subprice - $prevLine->multicurrency_subprice;
+						$line->multicurrency_total_ht  = $line->multicurrency_total_ht - $prevLine->multicurrency_total_ht;
+						$line->multicurrency_total_tva = $line->multicurrency_total_tva - $prevLine->multicurrency_total_tva;
+						$line->multicurrency_total_ttc = $line->multicurrency_total_ttc - $prevLine->multicurrency_total_ttc;
+					}
+				}
+
+				// prorata
+				$line->situation_percent = $maxPrevSituationPercent - $line->situation_percent;
+
+				//print 'New line based on invoice id '.$invoice->tab_previous_situation_invoice[$lineIndex]->id.' fk_prev_id='.$source_fk_prev_id.' will be fk_prev_id='.$line->fk_prev_id.' '.$line->total_ht.' '.$line->situation_percent.'<br>';
+
+				// If there is some credit note between last situation invoice and invoice used for credit note generation (note: credit notes are stored as delta)
+				$maxPrevSituationPercent = 0;
+				foreach ($tab_jumped_credit_notes as $index => $creditnoteid) {
+					foreach ($invoice->tab_previous_situation_invoice[$index]->lines as $prevLine)
+					{
+						if ($prevLine->fk_prev_id == $source_fk_prev_id)
+						{
+							$maxPrevSituationPercent = $prevLine->situation_percent;
+
+							$line->total_ht  -= $prevLine->total_ht;
+							$line->total_tva -= $prevLine->total_tva;
+							$line->total_ttc -= $prevLine->total_ttc;
+							$line->total_localtax1 -= $prevLine->total_localtax1;
+							$line->total_localtax2 -= $prevLine->total_localtax2;
+
+							$line->multicurrency_subprice  -= $prevLine->multicurrency_subprice;
+							$line->multicurrency_total_ht  -= $prevLine->multicurrency_total_ht;
+							$line->multicurrency_total_tva -= $prevLine->multicurrency_total_tva;
+							$line->multicurrency_total_ttc -= $prevLine->multicurrency_total_ttc;
+						}
+					}
+				}
+
+				// prorata
+				$line->situation_percent += $maxPrevSituationPercent;
+
+				//print 'New line based on invoice id '.$invoice->tab_previous_situation_invoice[$lineIndex]->id.' fk_prev_id='.$source_fk_prev_id.' will be fk_prev_id='.$line->fk_prev_id.' '.$line->total_ht.' '.$line->situation_percent.'<br>';
+			}
+		}
+
+		$line->fk_facture = $creditnote->id;
+		$line->fk_parent_line = $fk_parent_line;
+
+		$line->subprice = -$line->subprice; // invert price for object
+		$line->pa_ht = $line->pa_ht; // we choosed to have buy/cost price always positive, so no revert of sign here
+		$line->total_ht = -$line->total_ht;
+		$line->total_tva = -$line->total_tva;
+		$line->total_ttc = -$line->total_ttc;
+		$line->total_localtax1 = -$line->total_localtax1;
+		$line->total_localtax2 = -$line->total_localtax2;
+
+		$line->multicurrency_subprice = -$line->multicurrency_subprice;
+		$line->multicurrency_total_ht = -$line->multicurrency_total_ht;
+		$line->multicurrency_total_tva = -$line->multicurrency_total_tva;
+		$line->multicurrency_total_ttc = -$line->multicurrency_total_ttc;
+
+		$result = $line->insert(0, 1); // When creating credit note with same lines than source, we must ignore error if discount alreayd linked
+
+		$creditnote->lines[] = $line; // insert new line in current object
+
+		// Defined the new fk_parent_line
+		if ($result > 0 && $line->product_type == 9) {
+			$fk_parent_line = $result;
+		}
+	}
+	$creditnote->update_price(1);
+
+	$constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"];
+	if (!empty($conf->stock->enabled) && $conf->global->$constantforkey != "1") {
+		$savconst = $conf->global->STOCK_CALCULATE_ON_BILL;
+		$conf->global->STOCK_CALCULATE_ON_BILL = 1;
+		$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
+		dol_syslog("Validate invoice with stock change into warehouse defined into constant ".$constantforkey." = ".$conf->global->$constantforkey);
+		$batch_rule = 0;
+		if (!empty($conf->productbatch->enabled) && !empty($conf->global->CASHDESK_FORCE_DECREASE_STOCK)) {
+			require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
+			$batch_rule = Productbatch::BATCH_RULE_SELLBY_EATBY_DATES_FIRST;
+		}
+		$res = $creditnote->validate($user, '', $conf->global->$constantforkey, 0, $batch_rule);
+		$conf->global->STOCK_CALCULATE_ON_BILL = $savconst;
+	} else {
+		$res = $creditnote->validate($user);
+	}
+}
+
+if ($action == 'history' || $action == 'creditnote')
+{
+	if ($action == 'creditnote') $placeid = $creditnote->id;
+	else $placeid = (int) GETPOST('placeid', 'int');
 	$invoice = new Facture($db);
 	$invoice->fetch($placeid);
 }
 
+if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "") {
+	$invoice->setMulticurrencyCode($_SESSION["takeposcustomercurrency"]);
+}
+
 if (($action == "addline" || $action == "freezone") && $placeid == 0)
 {
 	$invoice->socid = $conf->global->$constforcompanyid;
 	$invoice->date = dol_now();
 	$invoice->module_source = 'takepos';
 	$invoice->pos_source = $_SESSION["takeposterminal"];
+	$invoice->entity = !empty($_SESSION["takeposinvoiceentity"]) ? $_SESSION["takeposinvoiceentity"] : $conf->entity;
 
 	if ($invoice->socid <= 0)
 	{
@@ -402,7 +565,11 @@ if ($action == "deleteline") {
 		$invoice->deleteline($deletelineid);
 		$invoice->fetch($placeid);
 	}
-	if (count($invoice->lines) == 0) $invoice->delete($user);
+	if (count($invoice->lines) == 0) {
+		$invoice->delete($user);
+		header("Location: ".DOL_URL_ROOT."/takepos/invoice.php");
+		exit;
+	}
 }
 
 if ($action == "delete") {
@@ -423,22 +590,25 @@ if ($action == "delete") {
 			$db->begin();
 
 			// We delete the lines
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet_extrafields where fk_object = ".$placeid;
-			$resql1 = $db->query($sql);
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet where fk_facture = ".$placeid;
-			$resql2 = $db->query($sql);
-			$sql = "UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".$conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]};
-			$sql .= " WHERE ref='(PROV-POS".$db->escape($_SESSION["takeposterminal"])."-".$db->escape($place).")'";
-			$resql3 = $db->query($sql);
-
-			$invoice->update_price(1);
-			if ($resql1 && $resql2 && $resql3)
-			{
-				$db->commit();
-			} else {
-				$db->rollback();
+			$resdeletelines = 1;
+			foreach ($invoice->lines as $line) {
+				$tmpres = $invoice->deleteline($line->id);
+				if ($tmpres < 0) {
+					$resdeletelines = 0;
+					break;
+				}
 			}
 
+			$sql = "UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".$conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]};
+			$sql .= " WHERE ref='(PROV-POS".$db->escape($_SESSION["takeposterminal"]."-".$place).")'";
+			$resql1 = $db->query($sql);
+
+			if ($resdeletelines && $resql1) {
+            	$db->commit();
+            } else {
+            	$db->rollback();
+            }
+
 			$invoice->fetch($placeid);
 		}
 	}
@@ -514,17 +684,22 @@ if ($action == "updatereduction")
 if ($action == "order" and $placeid != 0)
 {
 	include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-	if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
+	if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
 		require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
 		$printer = new dolReceiptPrinter($db);
 	}
 
-	$headerorder = '<html><br><b>'.$langs->trans('Place').' '.$place.'<br><table width="65%"><thead><tr><th class="left">'.$langs->trans("Label").'</th><th class="right">'.$langs->trans("Qty").'</th></tr></thead><tbody>';
+	$sql = "SELECT label FROM ".MAIN_DB_PREFIX."takepos_floor_tables where rowid=".((int) $place);
+	$resql = $db->query($sql);
+	$row = $db->fetch_object($resql);
+	$headerorder = '<html><br><b>'.$langs->trans('Place').' '.$row->label.'<br><table width="65%"><thead><tr><th class="left">'.$langs->trans("Label").'</th><th class="right">'.$langs->trans("Qty").'</th></tr></thead><tbody>';
 	$footerorder = '</tbody></table>'.dol_print_date(dol_now(), 'dayhour').'<br></html>';
 	$order_receipt_printer1 = "";
 	$order_receipt_printer2 = "";
+	$order_receipt_printer3 = "";
 	$catsprinter1 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_1);
 	$catsprinter2 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_2);
+	$catsprinter3 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_3);
 	foreach ($invoice->lines as $line)
 	{
 		if ($line->special_code == "4") {
@@ -534,19 +709,26 @@ if ($action == "order" and $placeid != 0)
 		$existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id');
 		$result = array_intersect($catsprinter1, $existing);
 		$count = count($result);
+		if (!$line->fk_product) $count++; // Print Free-text item (Unassigned printer) to Printer 1
 		if ($count > 0) {
 			$linestoprint++;
 			$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='1' where rowid=".$line->id; //Set to print on printer 1
 			$db->query($sql);
-			$order_receipt_printer1 .= '<tr>'.$line->product_label.'<td class="right">'.$line->qty;
+			$order_receipt_printer1 .= '<tr><td class="left">';
+			if ($line->fk_product) $order_receipt_printer1 .= $line->product_label;
+			else $order_receipt_printer1 .= $line->description;
+			$order_receipt_printer1 .= '</td><td class="right">'.$line->qty;
 			if (!empty($line->array_options['options_order_notes'])) $order_receipt_printer1 .= "<br>(".$line->array_options['options_order_notes'].")";
 			$order_receipt_printer1 .= '</td></tr>';
 		}
 	}
-	if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" && $linestoprint > 0) {
+	if (($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") && $linestoprint > 0) {
 		$invoice->fetch($placeid); //Reload object before send to printer
 		$printer->orderprinter = 1;
+		echo "<script>";
+		echo "var orderprinter1esc='";
 		$ret = $printer->sendToPrinter($invoice, $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$_SESSION["takeposterminal"]}, $conf->global->{'TAKEPOS_ORDER_PRINTER1_TO_USE'.$_SESSION["takeposterminal"]}); // PRINT TO PRINTER 1
+		echo "';</script>";
 	}
 	$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='4' where special_code='1' and fk_facture=".$invoice->id; // Set as printed
 	$db->query($sql);
@@ -571,18 +753,52 @@ if ($action == "order" and $placeid != 0)
 			$order_receipt_printer2 .= '</td></tr>';
 		}
 	}
-	if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" && $linestoprint > 0) {
+	if (($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") && $linestoprint > 0) {
 		$invoice->fetch($placeid); //Reload object before send to printer
 		$printer->orderprinter = 2;
+		echo "<script>";
+		echo "var orderprinter2esc='";
 		$ret = $printer->sendToPrinter($invoice, $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$_SESSION["takeposterminal"]}, $conf->global->{'TAKEPOS_ORDER_PRINTER2_TO_USE'.$_SESSION["takeposterminal"]}); // PRINT TO PRINTER 2
+		echo "';</script>";
 	}
 	$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='4' where special_code='2' and fk_facture=".$invoice->id; // Set as printed
 	$db->query($sql);
 	$invoice->fetch($placeid); //Reload object after set lines as printed
+	$linestoprint = 0;
+
+	foreach ($invoice->lines as $line)
+	{
+		if ($line->special_code == "4") {
+			continue;
+		}
+		$c = new Categorie($db);
+		$existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id');
+		$result = array_intersect($catsprinter3, $existing);
+		$count = count($result);
+		if ($count > 0) {
+			$linestoprint++;
+			$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='3' where rowid=".$line->id; //Set to print on printer 3
+			$db->query($sql);
+			$order_receipt_printer3 .= '<tr>'.$line->product_label.'<td class="right">'.$line->qty;
+			if (!empty($line->array_options['options_order_notes'])) $order_receipt_printer3 .= "<br>(".$line->array_options['options_order_notes'].")";
+			$order_receipt_printer3 .= '</td></tr>';
+		}
+	}
+	if (($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") && $linestoprint > 0) {
+		$invoice->fetch($placeid); //Reload object before send to printer
+		$printer->orderprinter = 3;
+		echo "<script>";
+		echo "var orderprinter3esc='";
+		$ret = $printer->sendToPrinter($invoice, $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$_SESSION["takeposterminal"]}, $conf->global->{'TAKEPOS_ORDER_PRINTER3_TO_USE'.$_SESSION["takeposterminal"]}); // PRINT TO PRINTER 3
+		echo "';</script>";
+	}
+	$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='4' where special_code='3' and fk_facture=".$invoice->id; // Set as printed
+	$db->query($sql);
+	$invoice->fetch($placeid); //Reload object after set lines as printed
 }
 
 $sectionwithinvoicelink = '';
-if ($action == "valid" || $action == "history")
+if ($action == "valid" || $action == "history" || $action == 'creditnote')
 {
 	$sectionwithinvoicelink .= '<!-- Section with invoice link -->'."\n";
 	$sectionwithinvoicelink .= '<span style="font-size:120%;" class="center">';
@@ -595,7 +811,7 @@ if ($action == "valid" || $action == "history")
 		if ($invoice->paye) $sectionwithinvoicelink .= '<span class="amountpaymentcomplete" style="font-size: unset">'.$langs->trans("Paid").'</span>';
 		else $sectionwithinvoicelink .= $langs->trans('BillShortStatusValidated');
 	}
-	$sectionwithinvoicelink .= '</span>';
+	$sectionwithinvoicelink .= '</span><br>';
 	if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
 		if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) $sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="TakeposConnector('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
 		else $sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="TakeposPrinting('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
@@ -604,7 +820,7 @@ if ($action == "valid" || $action == "history")
 	} else {
 		$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="Print('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
 		if ($conf->global->TAKEPOS_GIFT_RECEIPT) {
-			$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="Print('.$placeid.', 1);">'.$langs->trans('GiftReceipt').'</button><br>';
+			$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="Print('.$placeid.', 1);">'.$langs->trans('GiftReceipt').'</button>';
 		}
 	}
 	if ($conf->global->TAKEPOS_EMAIL_TEMPLATE_INVOICE > 0)
@@ -653,25 +869,59 @@ $(document).ready(function() {
 <?php
 
 if ($action == "order" and $order_receipt_printer1 != "") {
-	?>
-    $.ajax({
-        type: "POST",
-        url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print',
-        data: '<?php
-		print $headerorder.$order_receipt_printer1.$footerorder; ?>'
-    });
-    <?php
+	if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
+		?>
+		$.ajax({
+			type: "POST",
+			url: '<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>/printer/index.php',
+			data: 'invoice='+orderprinter1esc
+		});
+		<?php
+	}
+	else {
+		?>
+		$.ajax({
+			type: "POST",
+			url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print',
+			data: '<?php
+			print $headerorder.$order_receipt_printer1.$footerorder; ?>'
+		});
+		<?php
+	}
 }
 
 if ($action == "order" and $order_receipt_printer2 != "") {
-	?>
-    $.ajax({
-        type: "POST",
-        url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print2',
-        data: '<?php
-		print $headerorder.$order_receipt_printer2.$footerorder; ?>'
-    });
-    <?php
+	if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
+		?>
+		$.ajax({
+			type: "POST",
+			url: '<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>/printer/index.php?printer=2',
+			data: 'invoice='+orderprinter2esc
+		});
+		<?php
+	}
+	else {
+		?>
+		$.ajax({
+			type: "POST",
+			url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print2',
+			data: '<?php
+			print $headerorder.$order_receipt_printer2.$footerorder; ?>'
+		});
+    	<?php
+	}
+}
+
+if ($action == "order" and $order_receipt_printer3 != "") {
+	if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
+		?>
+		$.ajax({
+			type: "POST",
+			url: '<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>/printer/index.php?printer=3',
+			data: 'invoice='+orderprinter3esc
+		});
+		<?php
+	}
 }
 
 // Set focus to search field
@@ -716,6 +966,7 @@ function Print(id, gift){
 
 function TakeposPrinting(id){
     var receipt;
+	console.log("TakeposPrinting" + id);
     $.get("receipt.php?facid="+id, function(data, status){
         receipt=data.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '');
         $.ajax({
@@ -728,15 +979,12 @@ function TakeposPrinting(id){
 
 function TakeposConnector(id){
 	console.log("TakeposConnector" + id);
-	var invoice='<?php
-	$data = json_encode($invoice);
-	$data = base64_encode($data);
-	echo $data;
-	?>';
-    $.ajax({
-        type: "POST",
-        url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print.php',
-        data: 'invoice='+invoice
+	$.get("ajax/ajax.php?action=printinvoiceticket&term=<?php echo $_SESSION["takeposterminal"]; ?>&id="+id, function(data, status){
+        $.ajax({
+			type: "POST",
+			url: '<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>/printer/index.php',
+			data: 'invoice='+data
+		});
     });
 }
 
@@ -748,6 +996,11 @@ function DolibarrTakeposPrinting(id) {
     });
 }
 
+function CreditNote() {
+	$("#poslines").load("invoice.php?action=creditnote&invoiceid="+placeid, function() {
+	});
+}
+
 
 $( document ).ready(function() {
 	console.log("Set customer info and sales in header");
@@ -761,11 +1014,11 @@ $( document ).ready(function() {
 
     $("#customerandsales").html('');
 
-	$("#customerandsales").append('<a class="valignmiddle tdoverflowmax100 minwidth75" id="customer" onclick="Customer();" title="<?php print dol_escape_js($s); ?>"><span class="fas fa-building paddingrightonly"></span><?php print dol_escape_js($s); ?></a>');
+	$("#customerandsales").append('<a class="valignmiddle tdoverflowmax100 minwidth100" id="customer" onclick="Customer();" title="<?php print dol_escape_js($s); ?>"><span class="fas fa-building paddingrightonly"></span><?php print dol_escape_js($s); ?></a>');
 
 	<?php
 	$sql = "SELECT rowid, datec, ref FROM ".MAIN_DB_PREFIX."facture";
-	$sql .= " WHERE ref LIKE '(PROV-POS".$_SESSION["takeposterminal"]."-0%'";
+	$sql .= " WHERE ref LIKE '(PROV-POS".$_SESSION["takeposterminal"]."-0%' AND entity IN (".getEntity('invoice').")";
 	$sql .= $db->order('datec', 'ASC');
 	$resql = $db->query($sql);
 	if ($resql) {
@@ -856,11 +1109,14 @@ if (!empty($conf->use_javascript_ajax))
 print '<!-- invoice.php place='.(int) $place.' invoice='.$invoice->ref.' mobilepage='.$mobilepage.' $_SESSION["basiclayout"]='.$_SESSION["basiclayout"].' conf->global->TAKEPOS_BAR_RESTAURANT='.$conf->global->TAKEPOS_BAR_RESTAURANT.' -->'."\n";
 print '<div class="div-table-responsive-no-min invoice">';
 print '<table id="tablelines" class="noborder noshadow postablelines" width="100%">';
+if ($sectionwithinvoicelink && ($mobilepage == "invoice" || $mobilepage == "")) {
+	print '<tr><td colspan="4">'.$sectionwithinvoicelink.'</td></tr>';
+}
 print '<tr class="liste_titre nodrag nodrop">';
 print '<td class="linecoldescription">';
 // In phone version only show when it is invoice page
 if ($mobilepage == "invoice" || $mobilepage == "") {
-	print '<input type="hidden" name="invoiceid" id="invoiceid" value="'.$invoice->id.'">'.$sectionwithinvoicelink;
+	print '<input type="hidden" name="invoiceid" id="invoiceid" value="'.$invoice->id.'">';
 }
 if ($conf->global->TAKEPOS_BAR_RESTAURANT)
 {
@@ -893,6 +1149,13 @@ if ($_SESSION["basiclayout"] != 1)
 	// In phone version only show when it is invoice page
 	if ($mobilepage == "invoice" || $mobilepage == "") {
 		print '<span id="linecolht-span-total" style="font-size:1.3em; font-weight: bold;">'.price($invoice->total_ttc, 1, '', 1, -1, -1, $conf->currency).'</span>';
+		if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
+			//Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency
+			include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
+			$multicurrency = new MultiCurrency($db);
+			$multicurrency->fetch(0, $_SESSION["takeposcustomercurrency"]);
+			print '<br><span id="linecolht-span-total" style="font-size:0.9em; font-style:italic;">('.price($invoice->total_ttc * $multicurrency->rate->rate).' '.$_SESSION["takeposcustomercurrency"].')</span>';
+		}
 		print '</td>';
 	}
 	print '</td>';
@@ -979,7 +1242,7 @@ if ($placeid > 0)
 
 	if (is_array($invoice->lines) && count($invoice->lines))
 	{
-		print '<!-- Show lines of invoices -->'."\n";
+		print '<!-- invoice.php show lines of invoices -->'."\n";
 		$tmplines = array_reverse($invoice->lines);
 		foreach ($tmplines as $line)
 		{
@@ -1052,7 +1315,9 @@ if ($placeid > 0)
 				}
 			}
 			if (!empty($line->array_options['options_order_notes'])) $htmlforlines .= "<br>(".$line->array_options['options_order_notes'].")";
-			if ($_SESSION["basiclayout"] == 1) $htmlforlines .= '</td><td class="right phonetable"><button type="button" onclick="SetQty(place, '.$line->rowid.', '.($line->qty - 1).');" class="publicphonebutton2 phonered">-</button>&nbsp;&nbsp;<button type="button" onclick="SetQty(place, '.$line->rowid.', '.($line->qty + 1).');" class="publicphonebutton2 phonegreen">+</button>';
+			if ($_SESSION["basiclayout"] == 1) {
+				$htmlforlines .= '</td><td class="right phonetable"><button type="button" onclick="SetQty(place, '.$line->rowid.', '.($line->qty - 1).');" class="publicphonebutton2 phonered">-</button>&nbsp;&nbsp;<button type="button" onclick="SetQty(place, '.$line->rowid.', '.($line->qty + 1).');" class="publicphonebutton2 phonegreen">+</button>';
+			}
 			if ($_SESSION["basiclayout"] != 1)
 			{
 				$moreinfo = '';
@@ -1063,34 +1328,51 @@ if ($placeid > 0)
 				$moreinfo .= '<br>'.$langs->transcountry("TotalLT2", $mysoc->country_code).': '.price($line->total_localtax2);
 				$moreinfo .= '<br>'.$langs->transcountry("TotalTTC", $mysoc->country_code).': '.price($line->total_ttc);
 				//$moreinfo .= $langs->trans("TotalHT").': '.$line->total_ht;
-
+				if ($line->date_start || $line->date_end) $htmlforlines .= '<br><div class="clearboth nowraponall">'.get_date_range($line->date_start, $line->date_end).'</div>';
 				$htmlforlines .= '</td>';
 				$htmlforlines .= '<td class="right">'.vatrate($line->remise_percent, true).'</td>';
 				$htmlforlines .= '<td class="right">';
-				if (!empty($conf->stock->enabled))
+				if (!empty($conf->stock->enabled) && !empty($user->rights->stock->mouvement->lire))
 				{
 					$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
-					$sql = "SELECT e.rowid, e.ref, e.lieu, e.fk_parent, e.statut, ps.reel, ps.rowid as product_stock_id, p.pmp";
-					$sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e,";
-					$sql .= " ".MAIN_DB_PREFIX."product_stock as ps";
-					$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = ps.fk_product";
-					$sql .= " WHERE ps.reel != 0";
-					$sql .= " AND ps.fk_entrepot = ".$conf->global->$constantforkey;
-					$sql .= " AND e.entity IN (".getEntity('stock').")";
-					$sql .= " AND ps.fk_product = ".$line->fk_product;
-					$resql = $db->query($sql);
-					if ($resql) {
-						$obj = $db->fetch_object($resql);
-						$stock_real = price2num($obj->reel, 'MS');
+					if (!empty($conf->global->$constantforkey) && $line->fk_product > 0) {
+						$sql = "SELECT e.rowid, e.ref, e.lieu, e.fk_parent, e.statut, ps.reel, ps.rowid as product_stock_id, p.pmp";
+						$sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e,";
+						$sql .= " ".MAIN_DB_PREFIX."product_stock as ps";
+						$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = ps.fk_product";
+						$sql .= " WHERE ps.reel != 0";
+						$sql .= " AND ps.fk_entrepot = ".$conf->global->$constantforkey;
+						$sql .= " AND e.entity IN (".getEntity('stock').")";
+						$sql .= " AND ps.fk_product = ".$line->fk_product;
+						$resql = $db->query($sql);
+						if ($resql) {
+							$obj = $db->fetch_object($resql);
+							$stock_real = price2num($obj->reel, 'MS');
+							$htmlforlines .= $line->qty;
+							if ($line->qty && $line->qty > $stock_real) $htmlforlines .= '<span style="color: var(--amountremaintopaycolor)">';
+							$htmlforlines .= ' <span class="posstocktoolow">('.$langs->trans("Stock").' '.$stock_real.')</span>';
+							if ($line->qty && $line->qty > $stock_real) $htmlforlines .= "</span>";
+						} else {
+							dol_print_error($db);
+						}
+					} else {
 						$htmlforlines .= $line->qty;
-						if ($line->qty && $line->qty > $stock_real) $htmlforlines .= '<span style="color: var(--amountremaintopaycolor)">';
-						$htmlforlines .= ' <span class="posstocktoolow">('.$langs->trans("Stock").' '.$stock_real.')</span>';
-						if ($line->qty && $line->qty > $stock_real) $htmlforlines .= "</span>";
 					}
+				} else {
+					$htmlforlines .= $line->qty;
+				}
+
+				$htmlforlines .= '</td>';
+				$htmlforlines .= '<td class="right classfortooltip" title="'.$moreinfo.'">';
+				$htmlforlines .= price($line->total_ttc, 1, '', 1, -1, -1, $conf->currency);
+				if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
+					//Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency
+					include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
+					$multicurrency = new MultiCurrency($db);
+					$multicurrency->fetch(0, $_SESSION["takeposcustomercurrency"]);
+					$htmlforlines .= '<br><span id="linecolht-span-total" style="font-size:0.9em; font-style:italic;">('.price($line->total_ttc * $multicurrency->rate->rate).' '.$_SESSION["takeposcustomercurrency"].')</span>';
 				}
-				else $htmlforlines .= $line->qty;
 				$htmlforlines .= '</td>';
-				$htmlforlines .= '<td class="right classfortooltip" title="'.$moreinfo.'">'.price($line->total_ttc).'</td>';
 			}
 			$htmlforlines .= '</tr>'."\n";
 			$htmlforlines .= $htmlsupplements[$line->id];
@@ -1106,6 +1388,10 @@ if ($placeid > 0)
 
 print '</table>';
 
+if (($action == "valid" || $action == "history") && $invoice->type != Facture::TYPE_CREDIT_NOTE) {
+	print '<button id="buttonprint" type="button" onclick="ModalBox(\'ModalCreditNote\')">'.$langs->trans('CreateCreditNote').'</button>';
+}
+
 
 if ($action == "search")
 {
diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index 128aa674f3a..c1683073371 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -192,8 +192,14 @@ else print "var received=0;";
 		}
 		console.log("We click on the payment mode to pay amount = "+amountpayed);
 		parent.$("#poslines").load("invoice.php?place=<?php echo $place; ?>&action=valid&pay="+payment+"&amount="+amountpayed+"&excess="+excess+"&invoiceid="+invoiceid+"&accountid="+accountid, function() {
-		    if (amountpayed > <?php echo $remaintopay; ?> || amountpayed == <?php echo $remaintopay; ?> || amountpayed==0 ) parent.$.colorbox.close();
-			else location.reload();
+		    if (amountpayed > <?php echo $remaintopay; ?> || amountpayed == <?php echo $remaintopay; ?> || amountpayed==0 ) {
+		    	console.log("Close popup");
+		    	parent.$.colorbox.close();
+		    }
+			else {
+				console.log("Amount is not comple, so we do NOT close popup and reload it.");
+				location.reload();
+			}
 		});
 	}
 
@@ -231,21 +237,21 @@ else print "var received=0;";
 <div style="position:relative; padding-top: 20px; left:5%; height:150px; width:90%;">
 
 <div class="paymentbordline paymentbordlinetotal">
-	<center><span class="takepospay"><font color="white"><?php echo $langs->trans('TotalTTC'); ?>: </font><span id="totaldisplay" class="colorwhite"><?php echo price($invoice->total_ttc, 1, '', 1, -1, -1) ?></span></span></center>
+	<center><span class="takepospay"><font color="white"><?php echo $langs->trans('TotalTTC'); ?>: </font><span id="totaldisplay" class="colorwhite"><?php echo price($invoice->total_ttc, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span></span></center>
 </div>
 <?php if ($remaintopay != $invoice->total_ttc) { ?>
 <div class="paymentbordline paymentbordlineremain">
-	<center><span class="takepospay"><font color="white"><?php echo $langs->trans('RemainToPay'); ?>: </font><span id="remaintopaydisplay" class="colorwhite"><?php echo price($remaintopay, 1, '', 1, -1, -1) ?></span></span></center>
+	<center><span class="takepospay"><font color="white"><?php echo $langs->trans('RemainToPay'); ?>: </font><span id="remaintopaydisplay" class="colorwhite"><?php echo price($remaintopay, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span></span></center>
 </div>
 <?php } ?>
 <div class="paymentbordline paymentbordlinereceived">
-    <center><span class="takepospay"><font color="white"><?php echo $langs->trans("Received"); ?>: </font><span class="change1 colorred"><?php echo price(0) ?></span><input type="hidden" id="change1" class="change1" value="0"></span></center>
+    <center><span class="takepospay"><font color="white"><?php echo $langs->trans("Received"); ?>: </font><span class="change1 colorred"><?php echo price(0, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span><input type="hidden" id="change1" class="change1" value="0"></span></center>
 </div>
 <div class="paymentbordline paymentbordlinechange">
-	<center><span class="takepospay"><font color="white"><?php echo $langs->trans("Change"); ?>: </font><span class="change2 colorwhite"><?php echo price(0) ?></span><input type="hidden" id="change2" class="change2" value="0"></span></center>
+	<center><span class="takepospay"><font color="white"><?php echo $langs->trans("Change"); ?>: </font><span class="change2 colorwhite"><?php echo price(0, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span><input type="hidden" id="change2" class="change2" value="0"></span></center>
 </div>
 <?php
-if (! empty($conf->global->TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT)) {
+if (!empty($conf->global->TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT)) {
 	print '<div class="paymentbordline paddingtop paddingbottom">
 	<center>';
 	$filter = '';
@@ -288,16 +294,16 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 	$payIcon = '';
 	if ($paycode == 'LIQ') {
 		$paycode = 'cash';
-		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'coins';
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'coins';
 	} elseif ($paycode == 'CB') {
 		$paycode = 'card';
-		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'credit-card';
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'credit-card';
 	} elseif ($paycode == 'CHQ') {
 		$paycode = 'cheque';
-		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
 	}
 
-	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.'"></span>' : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code)).'</button>';
+	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span><span class="hideonsmartphone"><br>'. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code) : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code)).'</span></button>';
 } else {
 	print '<button type="button" class="calcbutton2">'.$langs->trans("NoPaimementModesDefined").'</button>';
 }
@@ -311,16 +317,16 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 	$payIcon = '';
 	if ($paycode == 'LIQ') {
 		$paycode = 'cash';
-		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'coins';
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'coins';
 	} elseif ($paycode == 'CB') {
 		$paycode = 'card';
-		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'credit-card';
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'credit-card';
 	} elseif ($paycode == 'CHQ') {
 		$paycode = 'cheque';
-		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
 	}
 
-	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.'"></span>' : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[1]->code)).'</button>';
+	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span><br> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[1]->code) : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[1]->code)).'</button>';
 } else {
 	$button = array_pop($action_buttons);
 	print '<button type="button" class="calcbutton2" onclick="'.$button["function"].'"><span '.$button["span"].'>'.$button["text"].'</span></button>';
@@ -335,16 +341,16 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 	$payIcon = '';
 	if ($paycode == 'LIQ') {
 		$paycode = 'cash';
-		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'coins';
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'coins';
 	} elseif ($paycode == 'CB') {
 		$paycode = 'card';
-		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'credit-card';
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'credit-card';
 	} elseif ($paycode == 'CHQ') {
 		$paycode = 'cheque';
-		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
 	}
 
-	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.'"></span>' : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[2]->code)).'</button>';
+	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span>'.(!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS) ? '<br> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[2]->code) : '') : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[2]->code)).'</button>';
 } else {
 	$button = array_pop($action_buttons);
 	print '<button type="button" class="calcbutton2" onclick="'.$button["function"].'"><span '.$button["span"].'>'.$button["text"].'</span></button>';
diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index 14ca718740b..9084fc448f1 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -64,7 +64,7 @@ if (empty($user->rights->takepos->run) && !defined('INCLUDE_PHONEPAGE_FROM_PUBLI
 
 if ($action == "productinfo") {
 	$prod = new Product($db);
-    $prod->fetch($idproduct);
+	$prod->fetch($idproduct);
 	print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="AddProductConfirm(place, '.$idproduct.');">'.$langs->trans('Add').'</button>';
 	print "<br><b>".$prod->label."</b><br>";
 	print '<img class="imgwrapper" width="60%" src="'.DOL_URL_ROOT.'/takepos/public/auto_order.php?genimg=pro&query=pro&id='.$idproduct.'">';
@@ -104,7 +104,7 @@ elseif ($action == "checkplease") {
 		$printer->printer->feed();
 		$printer->printer->feed();
 		$printer->close();
-	}	else {
+	} else {
 		print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="CheckPlease(\'Cash\');">'.$langs->trans('Cash').'</button>';
 		print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="CheckPlease(\'CreditCard\');">'.$langs->trans('CreditCard').'</button>';
 		print '<br>';
@@ -115,8 +115,8 @@ elseif ($action == "checkplease") {
 	$invoice = new Facture($db);
 	$invoice->fetch($placeid);
 	foreach ($invoice->lines as $line)
-    {
-        if ($line->id == $selectedline)
+	{
+		if ($line->id == $selectedline)
 		{
 			$prod = new Product($db);
 			$prod->fetch($line->fk_product);
@@ -128,8 +128,8 @@ elseif ($action == "checkplease") {
 			print '<button type="button" class="publicphonebutton2 phonered width24" onclick="SetQty(place, '.$selectedline.', '.($line->qty - 1).');">-</button>';
 			print '<button type="button" class="publicphonebutton2 phonegreen width24" onclick="SetQty(place, '.$selectedline.', '.($line->qty + 1).');">+</button>';
 			print '<button type="button" class="publicphonebutton2 phoneblue width24" onclick="SetNote(place, '.$selectedline.');">'.$langs->trans('Note').'</button>';
-        }
-    }
+		}
+	}
 } else {
 	// Title
 	$title = 'TakePOS - Dolibarr '.DOL_VERSION;
@@ -151,14 +151,14 @@ elseif ($action == "checkplease") {
 	$levelofrootcategory = 0;
 	if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0)
 	{
-    	foreach ($categories as $key => $categorycursor)
-    	{
-        	if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID)
-        	{
-            	$levelofrootcategory = $categorycursor['level'];
-            	break;
-        	}
-    	}
+		foreach ($categories as $key => $categorycursor)
+		{
+			if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID)
+			{
+				$levelofrootcategory = $categorycursor['level'];
+				break;
+			}
+		}
 	}
 	$levelofmaincategories = $levelofrootcategory + 1;
 
@@ -166,12 +166,12 @@ elseif ($action == "checkplease") {
 	$subcategories = array();
 	foreach ($categories as $key => $categorycursor)
 	{
-    	if ($categorycursor['level'] == $levelofmaincategories)
-    	{
-        	$maincategories[$key] = $categorycursor;
-    	} else {
-        	$subcategories[$key] = $categorycursor;
-    	}
+		if ($categorycursor['level'] == $levelofmaincategories)
+		{
+			$maincategories[$key] = $categorycursor;
+		} else {
+			$subcategories[$key] = $categorycursor;
+		}
 	}
 
 	sort($maincategories);
@@ -341,7 +341,7 @@ function CheckPlease(payment){
 	}
 	else{
 		console.log("Request the check to the waiter");
-		$("#phonediv1").load("auto_order.php?action=checkplease&place=<?php echo $place;?>&payment="+payment, function() {
+		$("#phonediv1").load("auto_order.php?action=checkplease&place=<?php echo $place; ?>&payment="+payment, function() {
 		});
 	}
 }
diff --git a/htdocs/takepos/public/auto_order.php b/htdocs/takepos/public/auto_order.php
index 910c00327b4..e7853f7141b 100644
--- a/htdocs/takepos/public/auto_order.php
+++ b/htdocs/takepos/public/auto_order.php
@@ -23,6 +23,7 @@
 
 if (!defined("NOLOGIN"))       define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 if (!defined('NOIPCHECK'))	   define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
 
 require '../../main.inc.php';
 
diff --git a/htdocs/takepos/public/menu.php b/htdocs/takepos/public/menu.php
index 217da157c2f..5814888f2cf 100644
--- a/htdocs/takepos/public/menu.php
+++ b/htdocs/takepos/public/menu.php
@@ -23,6 +23,7 @@
 
 if (!defined("NOLOGIN"))       define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 if (!defined('NOIPCHECK'))	   define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
 
 require '../../main.inc.php';
 
@@ -53,14 +54,14 @@ $categories = $categorie->get_full_arbo('product', (($conf->global->TAKEPOS_ROOT
 $levelofrootcategory = 0;
 if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0)
 {
-    foreach ($categories as $key => $categorycursor)
-    {
-        if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID)
-        {
-            $levelofrootcategory = $categorycursor['level'];
-            break;
-        }
-    }
+	foreach ($categories as $key => $categorycursor)
+	{
+		if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID)
+		{
+			$levelofrootcategory = $categorycursor['level'];
+			break;
+		}
+	}
 }
 $levelofmaincategories = $levelofrootcategory + 1;
 
@@ -68,17 +69,17 @@ $maincategories = array();
 $subcategories = array();
 foreach ($categories as $key => $categorycursor)
 {
-    if ($categorycursor['level'] == $levelofmaincategories)
-    {
-        $maincategories[$key] = $categorycursor;
-    } else {
-        $subcategories[$key] = $categorycursor;
-    }
+	if ($categorycursor['level'] == $levelofmaincategories)
+	{
+		$maincategories[$key] = $categorycursor;
+	} else {
+		$subcategories[$key] = $categorycursor;
+	}
 }
 
 $maincategories = dol_sort_array($maincategories, 'label');
 
-foreach ($maincategories as $cat){
+foreach ($maincategories as $cat) {
 	print '<div class="text-center">
             <a id="'.$cat['id'].'"></a><h3>'.$cat['label'].'</h3>
           </div>
@@ -87,7 +88,7 @@ foreach ($maincategories as $cat){
 	$object = new Categorie($db);
 	$result = $object->fetch($cat['id']);
 	$prods = $object->getObjectsInCateg("product", 0, 0, 0, $conf->global->TAKEPOS_SORTPRODUCTFIELD, 'ASC');
-	foreach ($prods as $pro){
+	foreach ($prods as $pro) {
 		print '
 		<div class="cell small-6 medium-4">
 			<div class="item">
diff --git a/htdocs/takepos/receipt.php b/htdocs/takepos/receipt.php
index c7ca395a316..6a305362839 100644
--- a/htdocs/takepos/receipt.php
+++ b/htdocs/takepos/receipt.php
@@ -20,12 +20,23 @@
  */
 
 /**
- *	\file       htdocs/takepos/floors.php
+ *	\file       htdocs/takepos/receipt.php
  *	\ingroup    takepos
  *	\brief      Page to show a receipt.
  */
 
-if (!isset($action)) require '../main.inc.php'; // If this file is called from send.php avoid load again
+if (!isset($action)) {
+	//if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER', '1');	// Not disabled cause need to load personalized language
+	//if (! defined('NOREQUIREDB'))		define('NOREQUIREDB', '1');		// Not disabled cause need to load personalized language
+	//if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC', '1');
+	//if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN', '1');
+	if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');
+	if (!defined('NOREQUIREMENU'))	define('NOREQUIREMENU', '1');
+	if (!defined('NOREQUIREHTML'))	define('NOREQUIREHTML', '1');
+	if (!defined('NOREQUIREAJAX'))	define('NOREQUIREAJAX', '1');
+
+	require '../main.inc.php'; // If this file is called from send.php avoid load again
+}
 include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 $langs->loadLangs(array("main", "cashdesk", "companies"));
@@ -49,13 +60,13 @@ top_httphead('text/html');
 
 if ($place > 0)
 {
-    $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
-    $resql = $db->query($sql);
-    $obj = $db->fetch_object($resql);
-    if ($obj)
-    {
-        $facid = $obj->rowid;
-    }
+	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
+	$resql = $db->query($sql);
+	$obj = $db->fetch_object($resql);
+	if ($obj)
+	{
+		$facid = $obj->rowid;
+	}
 }
 $object = new Facture($db);
 $object->fetch($facid);
@@ -64,7 +75,7 @@ $object->fetch($facid);
 $hookmanager->initHooks(array('takeposfrontend'), $facid);
 $reshook = $hookmanager->executeHooks('TakeposReceipt', $parameters, $object);
 if (!empty($hookmanager->resPrint)) {
-    print $hookmanager->resPrint;
+	print $hookmanager->resPrint;
 	exit;
 }
 
@@ -91,7 +102,7 @@ if (!empty($hookmanager->resPrint)) {
 <br>
 <p class="left">
 <?php
-$constFreeText = 'TAKEPOS_HEADER' . $_SESSION['takeposterminal'];
+$constFreeText = 'TAKEPOS_HEADER'.$_SESSION['takeposterminal'];
 if (!empty($conf->global->TAKEPOS_HEADER) || !empty($conf->global->{$constFreeText}))
 {
 	$newfreetext = '';
@@ -127,34 +138,34 @@ if ($conf->global->TAKEPOS_SHOW_CUSTOMER)
 	<tr>
         <th class="center"><?php print $langs->trans("Label"); ?></th>
         <th class="right"><?php print $langs->trans("Qty"); ?></th>
-        <th class="right"><?php if ($gift!=1) print $langs->trans("Price"); ?></th>
-        <th class="right"><?php if ($gift!=1) print $langs->trans("TotalTTC"); ?></th>
+        <th class="right"><?php if ($gift != 1) print $langs->trans("Price"); ?></th>
+        <th class="right"><?php if ($gift != 1) print $langs->trans("TotalTTC"); ?></th>
 	</tr>
     </thead>
     <tbody>
     <?php
-    foreach ($object->lines as $line)
-    {
-        ?>
+	foreach ($object->lines as $line)
+	{
+		?>
     <tr>
         <td>
 		<?php if (!empty($line->product_label)) echo $line->product_label;
-        else echo $line->description; ?>
+		else echo $line->description; ?>
         </td>
         <td class="right"><?php echo $line->qty; ?></td>
-        <td class="right"><?php if ($gift!=1) echo price(price2num($line->total_ttc / $line->qty, 'MT'), 1); ?></td>
-        <td class="right"><?php if ($gift!=1) echo price($line->total_ttc, 1); ?></td>
+        <td class="right"><?php if ($gift != 1) echo price(price2num($line->total_ttc / $line->qty, 'MT'), 1); ?></td>
+        <td class="right"><?php if ($gift != 1) echo price($line->total_ttc, 1); ?></td>
     </tr>
         <?php
-    }
-    ?>
+	}
+	?>
     </tbody>
 </table>
 <br>
 <table class="right">
 <tr>
-    <th class="right"><?php if ($gift!=1) echo $langs->trans("TotalHT"); ?></th>
-    <td class="right"><?php if ($gift!=1) echo price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
+    <th class="right"><?php if ($gift != 1) echo $langs->trans("TotalHT"); ?></th>
+    <td class="right"><?php if ($gift != 1) echo price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
 </tr>
 <?php if ($conf->global->TAKEPOS_TICKET_VAT_GROUPPED) {
 	$vat_groups = array();
@@ -166,22 +177,32 @@ if ($conf->global->TAKEPOS_SHOW_CUSTOMER)
 		$vat_groups[$line->tva_tx] += $line->total_tva;
 	}
 	foreach ($vat_groups as $key => $val) {
-	    ?>
+		?>
 	<tr>
-		<th align="right"><?php if ($gift!=1) echo $langs->trans("VAT").' '.vatrate($key, 1); ?></th>
-		<td align="right"><?php if ($gift!=1) echo price($val, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
+		<th align="right"><?php if ($gift != 1) echo $langs->trans("VAT").' '.vatrate($key, 1); ?></th>
+		<td align="right"><?php if ($gift != 1) echo price($val, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
 	</tr>
         <?php
 	}
 } else { ?>
 <tr>
-	<th class="right"><?php if ($gift!=1) echo $langs->trans("TotalVAT").'</th><td class="right">'.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
+	<th class="right"><?php if ($gift != 1) echo $langs->trans("TotalVAT").'</th><td class="right">'.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
 </tr>
 <?php } ?>
 <tr>
-	<th class="right"><?php if ($gift!=1) echo ''.$langs->trans("TotalTTC").'</th><td class="right">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
+	<th class="right"><?php if ($gift != 1) echo ''.$langs->trans("TotalTTC").'</th><td class="right">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
 </tr>
 <?php
+if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
+	//Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency
+	include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
+	$multicurrency = new MultiCurrency($db);
+	$multicurrency->fetch(0, $_SESSION["takeposcustomercurrency"]);
+	echo '<tr><th class="right">';
+	if ($gift != 1) echo ''.$langs->trans("TotalTTC").' '.$_SESSION["takeposcustomercurrency"].'</th><td class="right">'.price($object->total_ttc * $multicurrency->rate->rate, 1, '', 1, - 1, - 1, $_SESSION["takeposcustomercurrency"])."\n";
+	echo '</td></tr>';
+}
+
 if ($conf->global->TAKEPOS_PRINT_PAYMENT_METHOD) {
 	$sql = "SELECT p.pos_change as pos_change, p.datep as date, p.fk_paiement, p.num_paiement as num, pf.amount as amount, pf.multicurrency_amount,";
 	$sql .= " cp.code";
@@ -201,12 +222,12 @@ if ($conf->global->TAKEPOS_PRINT_PAYMENT_METHOD) {
 			echo $langs->transnoentitiesnoconv("PaymentTypeShort".$row->code);
 			echo '</td>';
 			echo '<td class="right">';
-			$amount_payment=($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount;
+			$amount_payment = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount;
 			if ($row->code == "LIQ") $amount_payment = $amount_payment + $row->pos_change; // Show amount with excess received if is cash payment
 			echo price($amount_payment, 1, '', 1, - 1, - 1, $conf->currency);
 			echo '</td>';
 			echo '</tr>';
-			if ($row->code == "LIQ" && $row->pos_change>0) // Print change only in cash payments
+			if ($row->code == "LIQ" && $row->pos_change > 0) // Print change only in cash payments
 			{
 				echo '<tr>';
 				echo '<td class="right">';
@@ -228,7 +249,7 @@ if ($conf->global->TAKEPOS_PRINT_PAYMENT_METHOD) {
 <br>
 <br>
 <?php
-$constFreeText = 'TAKEPOS_FOOTER' . $_SESSION['takeposterminal'];
+$constFreeText = 'TAKEPOS_FOOTER'.$_SESSION['takeposterminal'];
 if (!empty($conf->global->TAKEPOS_FOOTER) || !empty($conf->global->{$constFreeText}))
 {
 	$newfreetext = '';
diff --git a/htdocs/takepos/reduction.php b/htdocs/takepos/reduction.php
index e882957ad14..dd808d9a19d 100644
--- a/htdocs/takepos/reduction.php
+++ b/htdocs/takepos/reduction.php
@@ -50,21 +50,21 @@ if (empty($user->rights->takepos->run)) {
 $invoice = new Facture($db);
 if ($invoiceid > 0)
 {
-    $invoice->fetch($invoiceid);
+	$invoice->fetch($invoiceid);
 } else {
-    $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
-    $resql = $db->query($sql);
-    $obj = $db->fetch_object($resql);
-    if ($obj)
-    {
-        $invoiceid = $obj->rowid;
-    }
-    if (!$invoiceid)
-    {
-        $invoiceid = 0; // Invoice does not exist yet
-    } else {
-        $invoice->fetch($invoiceid);
-    }
+	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
+	$resql = $db->query($sql);
+	$obj = $db->fetch_object($resql);
+	if ($obj)
+	{
+		$invoiceid = $obj->rowid;
+	}
+	if (!$invoiceid)
+	{
+		$invoiceid = 0; // Invoice does not exist yet
+	} else {
+		$invoice->fetch($invoiceid);
+	}
 }
 
 $arrayofcss = array('/takepos/css/pos.css.php');
@@ -74,9 +74,9 @@ top_htmlhead($head, '', 0, 0, $arrayofjs, $arrayofcss);
 
 $langs->loadLangs(array('main', 'bills', 'cashdesk'));
 
-if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
+if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
 	$htmlReductionPercent = '<span class="fa fa-2x fa-percent"></span>';
-	$htmlReductionAmount = '<span class="fa fa-2x fa-money"></span>';
+	$htmlReductionAmount = '<span class="fa fa-2x fa-money"></span><br>'.$langs->trans('Amount');
 } else {
 	$htmlReductionPercent = $langs->trans('ReductionShort').'<br>%';
 	$htmlReductionAmount = $langs->trans('ReductionShort').'<br>'.$langs->trans('Amount');
@@ -198,7 +198,7 @@ if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
 <div style="position:absolute; top:2%; left:5%; width:91%;">
 <center>
 <?php
-    print '<input type="text" class="takepospay" id="reduction_total" name="reduction_total" style="width: 50%;" placeholder="'.$langs->trans('Reduction').'">';
+	print '<input type="text" class="takepospay" id="reduction_total" name="reduction_total" style="width: 50%;" placeholder="'.$langs->trans('Reduction').'">';
 ?>
 </center>
 </div>
diff --git a/htdocs/takepos/send.php b/htdocs/takepos/send.php
index ba1e3f5e5ad..f33457992a7 100644
--- a/htdocs/takepos/send.php
+++ b/htdocs/takepos/send.php
@@ -24,13 +24,13 @@
 
 //if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER', '1');	// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB', '1');		// Not disabled cause need to load personalized language
-//if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC', '1');
-//if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN', '1');
-if (!defined('NOCSRFCHECK'))		define('NOCSRFCHECK', '1');
+//if (! defined('NOREQUIRESOC'))	define('NOREQUIRESOC', '1');
+//if (! defined('NOREQUIRETRAN'))	define('NOREQUIRETRAN', '1');
+if (!defined('NOCSRFCHECK'))	define('NOCSRFCHECK', '1');
 if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');
-if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIREMENU'))	define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML'))	define('NOREQUIREHTML', '1');
+if (!defined('NOREQUIREAJAX'))	define('NOREQUIREAJAX', '1');
 
 require '../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -51,29 +51,31 @@ $invoice->fetch($facid);
 $customer = new Societe($db);
 $customer->fetch($invoice->socid);
 
-if ($action=="send")
+if ($action == "send")
 {
-    include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-    $formmail = new FormMail($db);
-    $outputlangs = new Translate('', $conf);
-    $model_id = $conf->global->TAKEPOS_EMAIL_TEMPLATE_INVOICE;
-    $arraydefaultmessage = $formmail->getEMailTemplate($db, 'facture_send', $user, $outputlangs, $model_id);
-    $subject = $arraydefaultmessage->topic;
-    ob_start(); // turn on output receipt
-    include 'receipt.php';
-    $receipt = ob_get_contents(); // get the contents of the output buffer
-    ob_end_clean();
-    $msg="<html>".$arraydefaultmessage->content."<br>".$receipt."</html>";
-    $sendto=$email;
-    $from=$mysoc->email;
-    $mail = new CMailFile($subject, $sendto, $from, $msg, array(), array(), array(), '', '', 0, 1);
-    if ($mail->error || $mail->errors) {
-        setEventMessages($mail->error, $mail->errors, 'errors');
-    } else {
-        $result = $mail->sendfile();
-    }
-    exit;
+	include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+	$formmail = new FormMail($db);
+	$outputlangs = new Translate('', $conf);
+	$model_id = $conf->global->TAKEPOS_EMAIL_TEMPLATE_INVOICE;
+	$arraydefaultmessage = $formmail->getEMailTemplate($db, 'facture_send', $user, $outputlangs, $model_id);
+	$subject = $arraydefaultmessage->topic;
+
+	ob_start(); // turn on output receipt
+	include 'receipt.php';
+	$receipt = ob_get_contents(); // get the contents of the output buffer
+	ob_end_clean();
+
+	$msg = "<html>".$arraydefaultmessage->content."<br>".$receipt."</html>";
+	$sendto = $email;
+	$from = $mysoc->email;
+	$mail = new CMailFile($subject, $sendto, $from, $msg, array(), array(), array(), '', '', 0, 1);
+	if ($mail->error || $mail->errors) {
+		setEventMessages($mail->error, $mail->errors, 'errors');
+	} else {
+		$result = $mail->sendfile();
+	}
+	exit;
 }
 $arrayofcss = array('/takepos/css/pos.css.php');
 $arrayofjs  = array();
diff --git a/htdocs/takepos/smpcb.php b/htdocs/takepos/smpcb.php
index 0e25a0cb7b0..1e02e9bc591 100644
--- a/htdocs/takepos/smpcb.php
+++ b/htdocs/takepos/smpcb.php
@@ -1,4 +1,26 @@
 <?php
+/* Copyright (C) 2020	Andreu Bisquerra Gaya <jove@bisquerra.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/takepos/smpcb.php
+ *	\ingroup	takepos
+ *	\brief      Page with the content for smpcb payment
+ */
+
 if (!defined('NOCSRFCHECK'))		define('NOCSRFCHECK', '1');
 if (!defined('NOTOKENRENEWAL'))	    define('NOTOKENRENEWAL', '1');
 if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');
@@ -11,25 +33,25 @@ if (empty($user->rights->takepos->run)) {
 	accessforbidden();
 }
 
-if (isset($_GET['status'])) {
+if (GETPOSTISSET('status')) {
 	die(strtoupper($_SESSION['SMP_CURRENT_PAYMENT']));
 }
 
-if ($_GET['smp-status']) {
-	print '<html lang="en">
-<head>
-    <meta charset="utf-8">
+if (GETPOST('smp-status')) {
+	print '<html lang="en">';
+	print '<head>';
+	print '<meta charset="utf-8">
 
     <title>The HTML5 Herald</title>
     <meta name="description" content="The HTML5 Herald">
     <meta name="author" content="SitePoint">
 
-    <link rel="stylesheet" href="css/styles.css?v=1.0">
+    <link rel="stylesheet" href="css/styles.css?v=1.0">';
 
-</head>
+	print '</head>';
 
-<body>';
-	$_SESSION['SMP_CURRENT_PAYMENT'] = $_GET['smp-status'];
+	print '<body>';
+	$_SESSION['SMP_CURRENT_PAYMENT'] = GETPOST('smp-status');
 
 	print '<script type="application/javascript">
                 window.onload = function() {
@@ -39,7 +61,8 @@ if ($_GET['smp-status']) {
 
 	print "Transaction status registered, you can close this";
 
-	die('</body></html>');
+	print '</body></html>';
+	exit();
 }
 
-    print 'NOOP';
+print 'NOOP';
diff --git a/htdocs/theme/common/flags/unknown.png b/htdocs/theme/common/flags/unknown.png
new file mode 100644
index 0000000000000000000000000000000000000000..08efc7b264d7eab8e1c4c13424342999084a4965
GIT binary patch
literal 1595
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

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/badges.inc.php b/htdocs/theme/eldy/badges.inc.php
index 36296bb0b8a..86f5971891e 100644
--- a/htdocs/theme/eldy/badges.inc.php
+++ b/htdocs/theme/eldy/badges.inc.php
@@ -59,6 +59,13 @@ a.badge:focus, a.badge:hover {
     color: #fff;
 }
 
+span.badgeneutral {
+    padding: 2px 7px 2px 7px;
+    background-color: #e4e4e4;
+    color: #666;
+    border-radius: 10px;
+}
+
 
 /* PRIMARY */
 .badge-primary{
diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index c866b187638..364723e2152 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -7,11 +7,13 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
             --btncolorbg: #fbfbfb;
             --btncolorborderhover: none;
             --btncolorborder: #FFF;
+            /* --butactionbg:rgba(150, 110, 162, 0.95); */
+            --butactionbg:rgb(118, 145, 225);
+            --butactionbg:rgba(150, 110, 162, 0.95);
             --butactiondeletebg: rgb(234,228,225);
             /* tertiary color */
             /* --butactionbg:rgb(218, 235, 225); */
             /* --butactionbg:rgb(228, 218, 235); */
-            --butactionbg:rgb(118, 145, 225);
 }
 
 <?php
@@ -27,7 +29,7 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
             --btncolorbg: rgb(26,27,27);
             --btncolorborderhover: #ffffff;
             --btncolorborder: #2b2c2e;
-            --butactionbg:rgb(173,140,79);
+            --butactionbg: rgb(173,140,79);
             --butactiondeletebg: rgb(252,84,91);
 
       }\n";
diff --git a/htdocs/theme/eldy/ckeditor/config.js b/htdocs/theme/eldy/ckeditor/config.js
index b52fd6f7e51..50bf77c00ff 100644
--- a/htdocs/theme/eldy/ckeditor/config.js
+++ b/htdocs/theme/eldy/ckeditor/config.js
@@ -73,7 +73,7 @@ CKEDITOR.editorConfig = function( config )
 	 	['Maximize'],
 	 	['SpellChecker', 'Scayt'],		// 'Cut','Copy','Paste','-', are useless, can be done with right click, even on smarpthone
 	 	['Undo','Redo','-','Find','Replace'],
-	    ['Format','Font','FontSize'],
+	    ['Font','FontSize'],
 	 	['Bold','Italic','Underline','Strike','Superscript','-','TextColor','RemoveFormat'],
 	 	['NumberedList','BulletedList','Outdent','Indent'],
 	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 96bf875bf3b..1b104ce95dd 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -21,7 +21,8 @@
 	--colorbackbody: rgb(<?php print $colorbackbody; ?>);
 	--colortexttitlenotab: rgb(<?php print $colortexttitlenotab; ?>);
 	--colortexttitlenotab2: rgb(<?php print $colortexttitlenotab2; ?>);
-	--colortexttitle: rgb(<?php print $colortexttitle; ?>);
+	--colortexttitle: rgba(<?php print $colortexttitle; ?>, 0.9);
+	--colortexttitlelink: rgba(<?php print $colortexttitlelink; ?>, 0.9);
 	--colortext: rgb(<?php print $colortext; ?>);
 	--colortextlink: rgb(<?php print $colortextlink; ?>);
 	--colortextbackhmenu: #<?php echo $colortextbackhmenu; ?>;
@@ -96,10 +97,7 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
 body {
 <?php if (GETPOST('optioncss', 'aZ09') == 'print') {  ?>
 	background-color: #FFFFFF;
-<?php } else { ?>
-	background: var(--colorbackbody);
 <?php } ?>
-	color: var(--colortext);
 	font-size: <?php print is_numeric($fontsize) ? $fontsize.'px' : $fontsize; ?>;
 	line-height: 1.4;
 	font-family: <?php print $fontlist ?>;
@@ -107,9 +105,11 @@ body {
     margin-bottom: 0;
     margin-right: 0;
     margin-left: 0;
+    font-weight: 400;
     <?php print 'direction: '.$langs->trans("DIRECTION").";\n"; ?>
 }
 
+/* Style used to protect html content in output to avoid attack by replacing full page with js content */
 .sensiblehtmlcontent * {
 	position: static !important;
 }
@@ -143,7 +143,7 @@ table.liste th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), table.liste td.
 .liste_titre input[name=search_smonth], .liste_titre input[name=search_month], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre select[name=month],
 .liste_titre input[name=month_lim], .liste_titre input[name=month_start], .liste_titre input[name=month_end], .liste_titre input[name=month_create],
 .liste_titre input[name=search_month_lim], .liste_titre input[name=search_month_start], .liste_titre input[name=search_month_end], .liste_titre input[name=search_month_create],
-.liste_titre input[name=search_month_create], .liste_titre input[name=search_month_start], .liste_titre input[name=search_month_end],
+.liste_titre input[name=search_month_update], .liste_titre input[name=search_month_start], .liste_titre input[name=search_month_end],
 .liste_titre input[name=day_date_when], .liste_titre input[name=dayvalid], .liste_titre input[name=search_orderday], .liste_titre input[name=search_deliveryday],
 .liste_titre input[name=search_sday], .liste_titre input[name=search_day], .liste_titre input[name=search_eday], .liste_titre input[name=sday], .liste_titre input[name=day], .liste_titre select[name=day],
 .liste_titre input[name=day_lim], .liste_titre input[name=day_start], .liste_titre input[name=day_end], .liste_titre input[name=day_create],
@@ -316,6 +316,7 @@ input.buttonpaymentstripe {
 }
 .logopublicpayment #dolpaymentlogo {
 	max-height: 100px;
+	max-width: 320px;
 }
 
 a.buttonticket {
@@ -330,15 +331,15 @@ span.timesheetalreadyrecorded input {
     border-bottom: solid 1px rgba(0,0,0,0.4);
     margin-right: 1px !important;
 }
-td.weekend {
-	background-color: #eee;
-}
 td.onholidaymorning, td.onholidayafternoon {
 	background-color: #fdf6f2;
 }
 td.onholidayallday {
 	background-color: #f4eede;
 }
+td.weekend {	/* must be after td.onholidayallday */
+	background-color: #eee;
+}
 /*
 td.leftborder, td.hide0 {
 	border-left: 1px solid #ccc;
@@ -363,6 +364,10 @@ input.pageplusone {
     padding-top: 4px;
 }
 
+.saturatemedium {
+	filter: saturate(0.8);
+}
+
 .optionblue {
 	color: var(--colortextlink);
 }
@@ -510,7 +515,7 @@ form {
 form#addproduct {
     padding-top: 10px;
 }
-div.float
+div.float, span.floatleft
 {
     float:<?php print $left; ?>;
 }
@@ -622,6 +627,9 @@ textarea.centpercent {
 .nowrap {
 	white-space: <?php print ($dol_optimize_smallscreen ? 'normal' : 'nowrap'); ?>;
 }
+.nowraponsmartphone {
+	white-space: <?php print ($dol_optimize_smallscreen ? 'nowrap' : 'normal'); ?>;
+}
 .liste_titre .nowrap {
 	white-space: nowrap;
 }
@@ -713,7 +721,7 @@ textarea.centpercent {
 .longmessagecut {
     max-height: 250px;
     max-width: 100%;
-    overflow-y: scroll;
+    overflow-y: auto;
 }
 
 body[class*="colorblind-"] .text-warning{
@@ -983,6 +991,12 @@ select.flat.selectlimit {
     text-overflow: ellipsis;
     white-space: nowrap;
 }
+.tdoverflowmax125 {			/* For tdoverflow, the max-midth become a minimum ! */
+    max-width: 125px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
 .tdoverflowmax150 {			/* For tdoverflow, the max-midth become a minimum ! */
     max-width: 150px;
     overflow: hidden;
@@ -1022,27 +1036,34 @@ select.flat.selectlimit {
 .tablelistofcalendars {
 	margin-top: 25px !important;
 }
+
+/* Styles for amount on card */
+table.paymenttable td.amountpaymentcomplete, table.paymenttable td.amountremaintopay {
+    padding-top: 0px;
+    padding-bottom: 0px;
+}
 .amountalreadypaid {
 }
 .amountpaymentcomplete {
 	color: var(--amountpaymentcomplete);
 	font-weight: bold;
-	font-size: 1.2em;
+	font-size: 1.7em;
 }
 .amountremaintopay {
 	color: var(--amountremaintopaycolor);
 	font-weight: bold;
-	font-size: 1.2em;
+	font-size: 1.7em;
 }
 .amountremaintopayback {
 	color: var(--amountremaintopaybackcolor);
 	font-weight: bold;
-	font-size: 1.2em;
+	font-size: 1.7em;
 }
 .amountpaymentneutral {
 	font-weight: bold;
-	font-size: 1.2em;
+	font-size: 1.7em;
 }
+
 .onlinepaymentbody .amountpaymentcomplete {
     background-color: var(--amountpaymentcomplete);
     color: #fff;
@@ -1199,6 +1220,7 @@ table[summary="list_of_modules"] .fa-cog {
 .width50  { width: 50px; }
 .width75  { width: 75px; }
 .width100 { width: 100px; }
+.width125 { width: 125px; }
 .width150 { width: 150px; }
 .width200 { width: 200px; }
 .maxwidth25  { max-width: 25px; }
@@ -1271,8 +1293,12 @@ table[summary="list_of_modules"] .fa-cog {
     .minwidth500imp { min-width: 250px !important; }
 }
 
-.widthcentpercentminusx {
-	width: calc(100% - 50px) !important;
+select.widthcentpercentminusx, input.widthcentpercentminusx {
+	width: calc(100% - 52px) !important;
+	display: inline-block;
+}
+select.widthcentpercentminusxx, input.widthcentpercentminusxx {
+	width: calc(100% - 70px) !important;
 	display: inline-block;
 }
 
@@ -1287,6 +1313,10 @@ table[summary="list_of_modules"] .fa-cog {
     	padding-right: 5px;
     }
 
+	div.divphotoref {
+	    padding-right: 10px !important;
+	}
+
     .hideonsmartphone { display: none; }
     .hideonsmartphoneimp { display: none !important; }
 
@@ -1298,15 +1328,29 @@ table[summary="list_of_modules"] .fa-cog {
 		margin-bottom: 15px !important;
 	}
 
-	select.minwidth100imp, select.minwidth100, select.minwidth200, select.minwidth300 {
-		width: calc(100% - 50px) !important;
+	select.minwidth100imp, select.minwidth100, select.minwidth200, select.minwidth200imp, select.minwidth300 {
+		width: calc(100% - 40px) !important;
 		display: inline-block;
 	}
 
-	.clearbothonsmartphone { clear: both; display: block; }
-	/*img.photoref, div.photoref {
-		box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.2);
-	}*/
+	.logopublicpayment #dolpaymentlogo {
+		max-width: 260px;
+	}
+	#tablepublicpayment {
+		width:	auto !important;
+	}
+	.poweredbypublicpayment {
+    	float: unset !important;
+		top: unset !important;
+    	bottom: 8px;
+    	position: relative !important;
+    }
+    .poweredbyimg {
+    	width: 48px;
+    }
+    input.buttonpayment, button.buttonpayment, div.buttonpayment {
+    	min-width: 270px;
+    }
 }
 
 /* Force values for small screen 570 */
@@ -1488,7 +1532,7 @@ td.showDragHandle {
 #id-left {
 	padding-top: 20px;
 	padding-bottom: 5px;
-	<?php if (!empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN) && ! empty($conf->global->MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)) { ?>
+	<?php if (!empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN) && !empty($conf->global->MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)) { ?>
 	padding-top: 8px;
 	<?php } ?>
 }
@@ -1811,8 +1855,8 @@ td.nobordernopadding.widthpictotitle.col-picto {
     color: #999;
 }
 
+/*
 span.widthpictotitle.pictotitle {
-	/* background: rgba(70, 3, 62, 0.5); */
     background: var(--colortexttitlenotab);
     opacity: 0.8;
     color: #fff !important;
@@ -1821,10 +1865,12 @@ span.widthpictotitle.pictotitle {
     min-width: 30px;
     text-align: center;
 }
+*/
 .pictotitle {
 	margin-<?php echo $right; ?>: 8px;
 	/* margin-bottom: 4px; */
 }
+
 .pictoobjectwidth {
 	width: 14px;
 }
@@ -1837,7 +1883,7 @@ span.widthpictotitle.pictotitle {
 	vertical-align: middle;
 	margin-top: -3px
 }
-.pictowarning, .pictopreview {
+.pictowarning, .pictoerror, .pictopreview {
     padding-<?php echo $left; ?>: 3px;
 }
 .pictowarning {
@@ -1920,8 +1966,8 @@ div.statusrefbis {
 }
 img.photoref, div.photoref {
 	/* border: 1px solid #DDD; */
-    -webkit-box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
-    box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
+    -webkit-box-shadow: 1px 1px 8px rgba(0, 0, 0, 0.2);
+    box-shadow: 1px 1px 8px rgba(0, 0, 0, 0.2);
     padding: 4px;
 	height: 80px;
 	width: 80px;
@@ -2033,7 +2079,7 @@ a.tmenudisabled:link, a.tmenudisabled:visited, a.tmenudisabled:hover, a.tmenudis
 }
 
 a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active {
-	padding: 0px 4px 0px 4px;
+	padding: 0px 2px 0px 2px;
 	white-space: nowrap;
 	color: var(--colortextbackhmenu);
     text-decoration: none;
@@ -2128,6 +2174,8 @@ div.menu_titre {
 {
 	padding-<?php print $left; ?>: 2px;
 	padding-<?php print $right; ?>: 2px;
+	font-family: Roboto,<?php echo $fontlist; ?>;
+	font-weight: 400;
 }
 
 div.mainmenu {
@@ -2172,70 +2220,70 @@ a.tmenuimage:hover{
     <?php include dol_buildpath($path.'/theme/'.$theme.'/main_menu_fa_icons.inc.php', 0); ?>
 
     <?php
-    // Add here more div for other menu entries. moduletomainmenu=array('module name'=>'name of class for div')
+	// Add here more div for other menu entries. moduletomainmenu=array('module name'=>'name of class for div')
 
-    $moduletomainmenu = array(
-        'user'=>'', 'syslog'=>'', 'societe'=>'companies', 'projet'=>'project', 'propale'=>'commercial', 'commande'=>'commercial',
-        'produit'=>'products', 'service'=>'products', 'stock'=>'products',
-        'don'=>'accountancy', 'tax'=>'accountancy', 'banque'=>'accountancy', 'facture'=>'accountancy', 'compta'=>'accountancy', 'accounting'=>'accountancy', 'adherent'=>'members', 'import'=>'tools', 'export'=>'tools', 'mailing'=>'tools',
-        'contrat'=>'commercial', 'ficheinter'=>'commercial', 'ticket'=>'ticket', 'deplacement'=>'commercial',
-        'fournisseur'=>'companies',
-        'barcode'=>'', 'fckeditor'=>'', 'categorie'=>'',
-    );
-    $mainmenuused = 'home';
-    foreach ($conf->modules as $val)
-    {
-        $mainmenuused .= ','.(isset($moduletomainmenu[$val]) ? $moduletomainmenu[$val] : $val);
-    }
-    $mainmenuusedarray = array_unique(explode(',', $mainmenuused));
+	$moduletomainmenu = array(
+		'user'=>'', 'syslog'=>'', 'societe'=>'companies', 'projet'=>'project', 'propale'=>'commercial', 'commande'=>'commercial',
+		'produit'=>'products', 'service'=>'products', 'stock'=>'products',
+		'don'=>'accountancy', 'tax'=>'accountancy', 'banque'=>'accountancy', 'facture'=>'accountancy', 'compta'=>'accountancy', 'accounting'=>'accountancy', 'adherent'=>'members', 'import'=>'tools', 'export'=>'tools', 'mailing'=>'tools',
+		'contrat'=>'commercial', 'ficheinter'=>'commercial', 'ticket'=>'ticket', 'deplacement'=>'commercial',
+		'fournisseur'=>'companies',
+		'barcode'=>'', 'fckeditor'=>'', 'categorie'=>'',
+	);
+	$mainmenuused = 'home';
+	foreach ($conf->modules as $val)
+	{
+		$mainmenuused .= ','.(isset($moduletomainmenu[$val]) ? $moduletomainmenu[$val] : $val);
+	}
+	$mainmenuusedarray = array_unique(explode(',', $mainmenuused));
 
-    $generic = 1;
-    // Put here list of menu entries when the div.mainmenu.menuentry was previously defined
-    $divalreadydefined = array('home', 'companies', 'products', 'mrp', 'commercial', 'externalsite', 'accountancy', 'project', 'tools', 'members', 'agenda', 'ftp', 'holiday', 'hrm', 'bookmark', 'cashdesk', 'takepos', 'ecm', 'geoipmaxmind', 'gravatar', 'clicktodial', 'paypal', 'stripe', 'webservices', 'website');
-    // Put here list of menu entries we are sure we don't want
-    $divnotrequired = array('multicurrency', 'salaries', 'ticket', 'margin', 'opensurvey', 'paybox', 'expensereport', 'incoterm', 'prelevement', 'propal', 'workflow', 'notification', 'supplier_proposal', 'cron', 'product', 'productbatch', 'expedition');
-    foreach ($mainmenuusedarray as $val)
-    {
-        if (empty($val) || in_array($val, $divalreadydefined)) continue;
-        if (in_array($val, $divnotrequired)) continue;
-        //print "XXX".$val;
+	$generic = 1;
+	// Put here list of menu entries when the div.mainmenu.menuentry was previously defined
+	$divalreadydefined = array('home', 'companies', 'products', 'mrp', 'commercial', 'externalsite', 'accountancy', 'project', 'tools', 'members', 'agenda', 'ftp', 'holiday', 'hrm', 'bookmark', 'cashdesk', 'takepos', 'ecm', 'geoipmaxmind', 'gravatar', 'clicktodial', 'paypal', 'stripe', 'webservices', 'website');
+	// Put here list of menu entries we are sure we don't want
+	$divnotrequired = array('multicurrency', 'salaries', 'ticket', 'margin', 'opensurvey', 'paybox', 'expensereport', 'incoterm', 'prelevement', 'propal', 'workflow', 'notification', 'supplier_proposal', 'cron', 'product', 'productbatch', 'expedition');
+	foreach ($mainmenuusedarray as $val)
+	{
+		if (empty($val) || in_array($val, $divalreadydefined)) continue;
+		if (in_array($val, $divnotrequired)) continue;
+		//print "XXX".$val;
 
-        // Search img file in module dir
-        $found = 0; $url = '';
-        foreach ($conf->file->dol_document_root as $dirroot)
-        {
-    		if (file_exists($dirroot."/".$val."/img/".$val.".png"))
-    		{
-    			$url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
-    			$found = 1;
-    			break;
-    		}
-        }
-        // Img file not found
-        if (!$found)
-        {
-            if (!defined('DISABLE_FONT_AWSOME')) {
-                print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one. */\n";
+		// Search img file in module dir
+		$found = 0; $url = '';
+		foreach ($conf->file->dol_document_root as $dirroot)
+		{
+			if (file_exists($dirroot."/".$val."/img/".$val.".png"))
+			{
+				$url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
+				$found = 1;
+				break;
+			}
+		}
+		// Img file not found
+		if (!$found)
+		{
+			if (!defined('DISABLE_FONT_AWSOME')) {
+				print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one. */\n";
  				print "/* Overwrite this definition in your own css with a different content to use your own font awesome icon. */\n";
-                print 'div.mainmenu.'.$val.'::before {
+				print 'div.mainmenu.'.$val.'::before {
                     content: "\f249";
                 }'."\n";
-            } else {
-                print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n";
-                $url = dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.(min($generic, 4))."_over.png", 1);
-                print "div.mainmenu.".$val." {\n";
-                print "	background-image: url(".$url.");\n";
-                print "}\n";
-            }
-            $generic++;
-        } else {
-            print "div.mainmenu.".$val." {\n";
-            print "	background-image: url(".$url.");\n";
-            print "}\n";
-        }
-    }
-    // End of part to add more div class css
-    ?>
+			} else {
+				print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n";
+				$url = dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.(min($generic, 4))."_over.png", 1);
+				print "div.mainmenu.".$val." {\n";
+				print "	background-image: url(".$url.");\n";
+				print "}\n";
+			}
+			$generic++;
+		} else {
+			print "div.mainmenu.".$val." {\n";
+			print "	background-image: url(".$url.");\n";
+			print "}\n";
+		}
+	}
+	// End of part to add more div class css
+	?>
 <?php } // End test if $dol_hide_topmenu ?>
 
 .tmenuimage {
@@ -2402,7 +2450,8 @@ div.login_block a {
 	display: inline-block;
 }
 div.login_block span.aversion {
-	color: <?php echo colorAgressiveness($colortextbackhmenu, -40); ?>;
+	color: var(--colortextbackhmenu);
+	filter: contrast(0.7);
 }
 div.login_block table {
 	display: inline;
@@ -2448,7 +2497,7 @@ div.login_block_other {
 	height: 25px;
 }
 .atoplogin, .atoplogin:hover {
-	color: #<?php echo $colortextbackhmenu; ?> !important;
+	color: var(--colortextbackhmenu) !important;
 }
 .login_block_getinfo {
 	text-align: center;
@@ -2482,11 +2531,13 @@ img.login, img.printer, img.entity {
 	font-weight: bold;
 }
 .userimg.atoplogin img.userphoto, .userimgatoplogin img.userphoto {		/* size for user photo in login bar */
-	width: <?php echo $disableimages ? '26' : '32'; ?>px;
-    height: <?php echo $disableimages ? '26' : '32'; ?>px;
+	width: <?php echo $disableimages ? '26' : '30'; ?>px;
+    height: <?php echo $disableimages ? '26' : '30'; ?>px;
     border-radius: 50%;
     background-size: contain;
     background-size: contain;
+    border: 1px solid;
+    border-color: rgba(255, 255, 255, 0.2);
 }
 img.userphoto {			/* size for user photo in lists */
 	border-radius: 0.72em;
@@ -2503,6 +2554,9 @@ img.userphotosmall {			/* size for user photo in lists */
     vertical-align: middle;
     background-color: #FFF;
 }
+img.userphoto[alt="Gravatar avatar"], img.photouserphoto.dropdown-user-image[alt="Gravatar avatar"] {
+    background: #fff;
+}
 .span-icon-user {
 	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/object_user.png', 1); ?>);
 	background-repeat: no-repeat;
@@ -2558,7 +2612,7 @@ input.vmenusearchselectcombo[type=text] {
 a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active, span.vmenu, span.vsmenu { white-space: nowrap; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; }
 a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active,
 span.vmenu, span.vmenu:link, span.vmenu:visited, span.vmenu:hover, span.vmenu:active { font-weight: bold;  }	/* bold = 600, 500 is ko with Edge on 1200x960 */
-font.vmenudisabled  { font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; color: #aaa; margin-left: 4px; }												/* bold = 600, 500 is ko with Edge on 1200x960 */
+font.vmenudisabled  { font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; color: #aaa; margin-left: 4px; white-space: nowrap; }												/* bold = 600, 500 is ko with Edge on 1200x960 */
 a.vmenu:link, a.vmenu:visited { color: var(--colortextbackvmenu); }
 
 a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active, span.vsmenu {
@@ -2576,6 +2630,19 @@ font.vsmenudisabledmargin { margin: 1px 1px 1px 6px; }
 li a.vsmenudisabled, li.vsmenudisabled { color: #aaa !important; }
 
 a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { text-align: <?php print $left; ?>; color: #aaa; text-decoration: none; }
+.helppresent, .helppresent:hover {
+	/* color: #f3e4ac !important; */
+}
+.helppresentcircle {
+    color: var(--colorbackhmenu1);
+    filter: invert(0.8);
+    margin-left: -7px;
+    display: inline-block;
+    margin-top: -10px;
+    font-size: x-small;
+    vertical-align: super;
+    opacity: 0.95;
+}
 
 .vmenu div.blockvmenufirst, .vmenu div.blockvmenulogo, .vmenu div.blockvmenusearchphone, .vmenu div.blockvmenubookmarks
 {
@@ -2881,8 +2948,7 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
 
 	border-right: 1px solid #CCC !important;
 	border-left: 1px solid #CCC !important;
-	/* border-top: <?php echo 2; ?>px solid rgb(<?php echo $colortopbordertitle1; ?>) !important; */
-	border-top: <?php echo 2; ?>px solid var(--colorbackhmenu1) !important;
+	border-top: 3px solid var(--colorbackhmenu1) !important;
 }
 a.tab:hover
 {
@@ -2962,6 +3028,10 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
 .unsetcolor {
 	color: unset !important;
 }
+
+.smallpaddingimp {
+    padding: 4px !important;
+}
 .nopaddingleft {
 	padding-<?php print $left; ?>: 0px;
 }
@@ -3020,9 +3090,8 @@ div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border
 }
 div .tdtop {
     vertical-align: top !important;
-	padding-top: 10px !important;
-	padding-bottom: 2px !important;
-	padding-bottom: 0px;
+	/*padding-top: 10px !important;
+	padding-bottom: 2px !important; */
 }
 
 table.border td, table.bordernooddeven td, div.border div div.tagtd {
@@ -3529,7 +3598,7 @@ tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste
 }
 tr.liste_titre th a, th.liste_titre a, tr.liste_titre td a, td.liste_titre a, form.liste_titre div a, div.liste_titre a {
 	text-shadow: none !important;
-	color: rgb(<?php echo $colortexttitlelink ?>);
+	color: var(--colortexttitlelink);
 }
 tr.liste_titre_topborder td {
 	border-top-width: <?php echo $borderwidth; ?>px;
@@ -3599,9 +3668,6 @@ table.tableforservicepart1 tr td {
 }
 
 .paymenttable, .margintable {
-	/*border-top-width: <?php echo $borderwidth ?>px !important;
-	border-top-color: rgb(<?php echo $colortopbordertitle1 ?>) !important;
-	border-top-style: solid !important;*/
 	border-top: none !important;
 	margin: 0px 0px 0px 0px !important;
 }
@@ -3755,6 +3821,15 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 
 @media only screen and (max-width: 767px)
 {
+	.tabBar .arearef .pagination.paginationref {
+	    max-width: calc(50%);
+	}
+
+	.clearbothonsmartphone {
+	    clear: both;
+	    display: block !important;
+	}
+
 	div.tabs {
 		padding-left: 0 !important;
 		padding-right: 0!important;
@@ -3950,7 +4025,7 @@ img.boxhandle, img.boxclose {
 .ok      { color: #114466; }
 .warning { color: #887711 !important; }
 .error   { color: #660000 !important; font-weight: bold; }
-.green   { color: #118822; }
+.green   { color: #118822 !important; }
 
 div.ok {
   color: #114466;
@@ -4105,7 +4180,7 @@ div.titre {
 	text-decoration: none;
 	padding-top: 5px;
     padding-bottom: 5px;
-    /* text-transform: capitalize; */
+    font-weight: 400;
 }
 div.fiche > table.table-fiche-title:first-of-type div {
     color: var(--colortexttitlenotab);
@@ -4143,7 +4218,7 @@ div.backgreypublicpayment { background-color: #f0f0f0; padding: 20px; border-bot
     color: #222;
     opacity: 0.3;
 }
-#dolpaymenttable { min-width: 320px; font-size: 16px; }	/* Width must have min to make stripe input area visible. Lower than 320 makes input area crazy for credit card that need zip code */
+#dolpaymenttable { min-width: 290px; font-size: 16px; }	/* Width must have min to make stripe input area visible. Lower than 320 makes input area crazy for credit card that need zip code */
 #tablepublicpayment { border: 1px solid #CCCCCC !important; width: 100%; padding: 20px; }
 #tablepublicpayment .CTableRow1  { background-color: #F0F0F0 !important; }
 #tablepublicpayment tr.liste_total { border-bottom: 1px solid #CCCCCC !important; }
@@ -4536,7 +4611,7 @@ table.cal_event td.cal_event_right { padding: 4px 4px !important; }
 .cal_event a:link       { color: #111111; font-weight: normal !important; }
 .cal_event a:visited    { color: #111111; font-weight: normal !important; }
 .cal_event a:active     { color: #111111; font-weight: normal !important; }
-.cal_event_notbusy a.cal_event_title:hover { color: #111111; font-weight: normal !important; color:rgba(255,255,255,.75); }
+.cal_event_notbusy a.cal_event_title:hover { color: #111111; font-weight: normal !important; }
 .cal_event_busy      { }
 .cal_peruserviewname { max-width: 140px; height: 30px !important; }
 .cal_event span.badge.badge-status { border: 1px solid #aaa; }
@@ -4985,9 +5060,14 @@ div.scroll2 {
 	width: <?php print isset($_SESSION['dol_screenwidth']) ?max($_SESSION['dol_screenwidth'] - 830, 450) : '450'; ?>px !important;
 }
 
-.gtaskname div, .gtaskname {
+div#GanttChartDIVglisthead, div#GanttChartDIVgcharthead {
+    line-height: 2;
+}
+
+.gtaskname div, .gtaskname, .gstartdate div, .gstartdate, .genddate div, .genddate {
 	font-size: unset !important;
 }
+
 div.gantt, .gtaskheading, .gmajorheading, .gminorheading, .gminorheadingwkend {
 	font-size: unset !important;
 	font-weight: normal !important;
@@ -5107,6 +5187,12 @@ div.ecmjqft {
 	right:4px;
 	clear: both;
 }
+#ecm-layout-north {
+	min-height: 40px;
+}
+#ecm-layout-north div.attachareaformuserfileecm {
+    padding-bottom: 0px;
+}
 div#ecm-layout-west {
     width: 380px;
     vertical-align: top;
@@ -5261,13 +5347,17 @@ div.dataTables_length select {
 /*  Select2                                                                       */
 /* ============================================================================== */
 
+span.select2-selection--single.flat[aria-disabled="true"] span.select2-selection__rendered {
+	opacity: 0.5;
+}
+
 span#select2-taskid-container[title^='--'] {
     opacity: 0.3;
 }
 
 .select2-container--default .select2-results__option--highlighted[aria-selected] {
     background-color: rgb(<?php echo $colorbackhmenu1 ?>);
-    color: #<?php echo $colortextbackhmenu; ?>;
+    color: var(--colortextbackhmenu);
 }
 .select2-container--default .select2-results__option--highlighted[aria-selected] span {
     color: #fff !important;
@@ -5306,6 +5396,12 @@ input.select2-input {
 {
     background-color: var(--colorbackvmenu1);
 }
+.select2-container--default .select2-selection--single {
+    background-color: var(--colorbackbody);
+}
+#blockvmenusearch .select2-container--default .select2-selection--single .select2-selection__placeholder {
+    color: var(--colortextbackvmenu);
+}
 .select2-container--default .select2-selection--single .select2-selection__rendered {
     color: var(--colortext);
     /* background-color: var(--colorbackvmenu1); */
@@ -5411,6 +5507,8 @@ input.select2-input {
 	/*background-color: var(--colorbackvmenu1);
 	border: 1px solid var(--colorbackvmenu1); */
 	box-shadow: 1px 2px 10px var(--colorbackvmenu1);
+	background-color: var(--colorbackbody);
+	color: var(--colortext);
 }
 .select2-dropdown-open {
 	background-color: var(--colorbackvmenu1);
@@ -5468,6 +5566,9 @@ a span.select2-chosen
 .select2-results {
 	max-height:	400px;
 }
+.select2-results__option {
+	word-break: break-word;
+}
 .select2-container.select2-container-disabled .select2-choice, .select2-container-multi.select2-container-disabled .select2-choices {
 	background-color: var(--colorbackvmenu1);
 	background-image: none;
@@ -6361,6 +6462,9 @@ div.tabsElem a.tab {
 /* CSS style for debugbar                                                         */
 /* ============================================================================== */
 
+div.phpdebugbar * {
+	font-weight: unset;
+}
 span.phpdebugbar-tooltip.phpdebugbar-tooltip-extra-wide, span.phpdebugbar-tooltip.phpdebugbar-tooltip-wide {
     width: 250px !important;
 }
@@ -6370,7 +6474,15 @@ span.phpdebugbar-tooltip.phpdebugbar-tooltip-extra-wide, span.phpdebugbar-toolti
 a.phpdebugbar-tab.phpdebugbar-active {
 	background-image: unset !important;
 }
-.phpdebugbar-indicator .fa {
+.phpdebugbar-fa-tags:before {
+    content: "\f121";
+    font-weight: 600 !important;
+}
+.phpdebugbar-fa-tasks:before {
+    content: "\f550";
+    font-weight: 600 !important;
+}
+.phpdebugbar-fa-tags, .phpdebugbar-fa-tasks, .phpdebugbar-indicator .fa {
 	font-family: "Font Awesome 5 Free";
 	font-weight: 600;
 }
diff --git a/htdocs/theme/eldy/img/object_intracommreport.png b/htdocs/theme/eldy/img/object_intracommreport.png
new file mode 100644
index 0000000000000000000000000000000000000000..08db8957e9be24fa18c2e5e213a712e5df3be53c
GIT binary patch
literal 1384
zcmV-u1(*7XP)<h;3K|Lk000e1NJLTq001BW000~a1^@s60K&Z@00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY8~p$P8~p*7(FZmF000McNliru;RYHF7Y0QTk}LoK1ocTo
zK~zY`?Urjy6jv0-&z+gw*$4Y{fdyfaM=7YVEL1carHG*+Ra@Hnz(^~mP4tV@G)--r
z)})rEF-=WlV=!rLQ-f`+LaHqq6cv>~Qv_kr3d_2%y1=qemRW|G*_qofEr}_LUz+p-
zzfb2RC;$9&&pG#AfCU!#zcW2B@JP<OT>q+xMIw*nQ@3wFwLUdpfg(Mf^ffjX2b!DT
zAr%S_KRQ}x-?(ulBFR-qE)N<?OV3kU?V$Vc;au*)gM$*!^Wm#kj{!jE=^t;&w^kML
zbLn1a8H9@RY(VoFxVv-bBFu5UGj8`{B$ElGR@=gRJVQVbwFn`gjK;hAl9Jl+wQHw^
zK)^uKG$5I5L|gIV{>%^GZ+g7)3-IxwcMZh6XN0i~$z+S=X7doK)v}aIl@Az8q)NrB
z^Yhz9hKc7!Ms|n{Ll`S6suY=-D@m<3nd$0!=}EHIm77p|hdcB%1~32sq9_w0h`Xxg
z%ijY4C15NEQCy?U%KDx6`PvalDrGvINp3c4uqg6?Q1nT%gAPBw(LOx?3;+Paq6mWD
z|EsO7t-8bBr>BgI%5f~l#U>{^1;5{-Teq%<VOiGO&~Ow;5=gb$Vc1aK1dV4NE1G7}
zBX%Z6&TBw!HZxch>yS*=0{{?LP{;w`bBLnuD3+w%BxrhlVs0jzQCYOqbHV<FG#U1#
zuC{%Hw$#{PuQ?_A;kzBeT)O_iG$u(xnsW$SE)PNZhODPrqmRD6ZWw$Rsq48nwl^3E
zfF;=gwxvsY*XA2`@2V{B?zNAqz20cf3@ZjVZ_07~-BrtUR4~dYVhFvm{S*QKiHY)n
zG3G5P`Xk@gS032Cr!juS9c~++U~=OZsREUomsOoUYj<cgv`ep7)Q3Xsp0sr10VfwV
zJBRMSUA3BMDPCb~%}7h3E_HcdV`d0Nsv`2{kz?+yK0i~Nm=HIzySlLU`-YzEKydo7
zAV_vgs%|eSk!z99A3ex0T!dk`XpeoY?B&Wm5yw#A1E(ugY_ldgT*KkS?%SgkWu+Ns
zTUwpFSXSt~KOD^ADZ)W1g|`Y)xLzllX}RYLZMi?rl^NBNHa9Ezmfh|tdFT;WlO$5n
zG=(Eme5M$alG&M9c7ZkNk}W^^;_MbI%T4I)@7ib9sA*D&iQ6?Ax-2upc;QS#Rd#_j
z=~JISO8?x{Z$StoQIui`5Qt)o;$spvni9Nv1s^L}O4dEQ#Kfv)d`G;2P9~6`qDVqa
zGHW7nar7htP)ZW!8HR`Pai)+L#DrM`ktyz(^%W;Nm?$Sw6!8boi;js2rhIGlPha)*
zkME*sir=}tAfixE$~d*W8UVNqi;>F7Frx&M5nFRJ($lh6>_|;A(pl+g&xieEXz)+Z
zd6FV%JiAXIh$0p!ieLfo4cBnUH)|jeWYdS;;o?=rmbQiyTlN<gB)y^0(B!4op?xty
zOyBlu-j@z%pxc^fb~&7ZM4e7Cwyi4fs5RT%N2?7cliYh|p!Zt0H0Az{Wr7?Cq2s@_
zsG3Lu-vNMI2tof08#|Yhsym_AD+jz@Mll(gk<B^T2M@K*#@BDUR$+|wk6h39CZ78z
zZf)<gox9vU+TP>Bfrx-d9*pDW=8M7l<MlQF`AgYy<t6|CTsdBYKL6~K{Jgy7Yl@0&
qR#6m{001XXo?Q4&EU>@=^YRxwHb02fU8nj00000<MNUMnLSTZa$c$G2

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 4ce9de9b1ec..d582260ca63 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -25,7 +25,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 .info-box.info-box-sm {
     min-height: 80px;
     margin-bottom: 10px;
-    background: #fff;
+	/* background: #fff; */
 }
 .opened-dash-board-wrap .info-box.info-box-sm {
     border-radius: 0 0 0 20px;
@@ -87,12 +87,12 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 }
 .info-box-sm .info-box-icon {
     height: 80px;
-    width: 80px;
+    width: 78px;
     font-size: 25px;
     line-height: 92px;
 }
 .opened-dash-board-wrap .info-box-sm .info-box-icon {
-    border-radius: 0 20px 0 20px;
+    border-radius: 0 0 0 20px;
 }
 .opened-dash-board-wrap .info-box-sm .info-box-icon {
     line-height: 80px;
@@ -214,6 +214,8 @@ a.info-box-text-a i.fa.fa-exclamation-triangle {
 	text-transform: uppercase;
 	font-weight: bold;
 	margin-bottom: 3px;	/* not too much space so we can add another lines */
+	opacity: 0.6;
+	/* color: var(--colortexttitlenotab); */
 }
 .info-box-text{
 	font-size: 0.92em;
@@ -268,6 +270,13 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
 	margin: 2px;
 	border-radius: 3px;
 }
+.user-back {
+	background-color: #79633f !important;
+	color: #FFF !important;
+	padding: 2px;
+	margin: 2px;
+	border-radius: 3px;
+}
 
 
 
@@ -308,14 +317,14 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
 .infobox-action{
 	color: #b06080 !important;
 }
-.infobox-propal,
-.infobox-facture,
-.infobox-commande{
+.infobox-propal:not(.pictotitle),
+.infobox-facture:not(.pictotitle),
+.infobox-commande:not(.pictotitle) {
 	color: #65955d !important;
 }
-.infobox-supplier_proposal,
-.infobox-invoice_supplier,
-.infobox-order_supplier{
+.infobox-supplier_proposal:not(.pictotitle),
+.infobox-invoice_supplier:not(.pictotitle),
+.infobox-order_supplier:not(.pictotitle){
 	color: #599caf !important;
 }
 .infobox-contrat, .infobox-ticket{
@@ -428,19 +437,20 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
 	min-width: 350px;
     max-width: 350px;
 }
+
 @media only screen and (max-width: 1740px) {
 	.info-box-module {
 	    min-width: 315px;
 	    max-width: 315px;
 	}
 }
+
 @media only screen and (max-width: 767px) {
 	.info-box-module {
 		min-width: 260px;
 	}
 }
 
-
 .info-box-module .info-box-content {
 	height: 98px;
 }
@@ -456,9 +466,18 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
 	    margin: 0 0 0 0px !important;
 	    width: 100% !important;
 	}
-
 	.info-box-module {
 		width: 100%;
 		max-width: unset;
 	}
+	.info-box-sm .info-box-icon {
+		width: 60px;
+	}
+	.info-box-sm .info-box-content {
+		margin-left: 60px;
+	}
+	.info-box {
+		border: 1px solid #e0e0e0;
+	}
+}
 }
diff --git a/htdocs/theme/eldy/main_menu_fa_icons.inc.php b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
index e89fdeec39f..fbccc810fe7 100644
--- a/htdocs/theme/eldy/main_menu_fa_icons.inc.php
+++ b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
@@ -16,6 +16,9 @@
 	color: #<?php echo $colortextbackhmenu; ?>;
 }
 
+.fa-15x {
+    font-size: 1.5em;
+}
 
 div.mainmenu.menu {
 	background-image: none;
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 59aaf0ecc2c..319789b6fde 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -31,7 +31,7 @@ if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled because need to do translations
 if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
 if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
-if (!defined('NOLOGIN'))         define('NOLOGIN', 1); 			// File must be accessed by logon page so without login.
+if (!defined('NOLOGIN'))         define('NOLOGIN', 1); // File must be accessed by logon page so without login.
 //if (!defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);  	// We load menu manager class (note that object loaded may have wrong content because NOLOGIN is set and some values depends on login)
 if (!defined('NOREQUIREHTML'))   define('NOREQUIREHTML', 1);
 if (!defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
@@ -53,12 +53,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 // and permission, so we can later calculate number of top menu ($nbtopmenuentries) according to user profile.
 if (empty($user->id) && !empty($_SESSION['dol_login']))
 {
-    $user->fetch('', $_SESSION['dol_login'], '', 1);
-    $user->getrights();
+	$user->fetch('', $_SESSION['dol_login'], '', 1);
+	$user->getrights();
 
-    // Reload menu now we have the good user (and we need the good menu to have ->showmenu('topnb') correct.
-    $menumanager = new MenuManager($db, empty($user->socid) ? 0 : 1);
-    $menumanager->loadMenu();
+	// Reload menu now we have the good user (and we need the good menu to have ->showmenu('topnb') correct.
+	$menumanager = new MenuManager($db, empty($user->socid) ? 0 : 1);
+	$menumanager->loadMenu();
 }
 
 
@@ -81,7 +81,7 @@ $theme = 'eldy'; // Value of theme
 if (!empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path = '/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme = $conf->global->MAIN_OVERWRITE_THEME_RES; }
 
 // Define image path files and other constants
-$fontlist = 'roboto,arial,tahoma,verdana,helvetica'; //$fontlist='helvetica, verdana, arial, sans-serif';
+$fontlist = 'arial,tahoma,verdana,helvetica'; //$fontlist='helvetica, verdana, arial, sans-serif';
 //$fontlist='"open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;';
 $img_head = '';
 $img_button = dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png', 1);
@@ -111,11 +111,11 @@ if (!isset($conf->global->THEME_ELDY_TEXTLINK)) $conf->global->THEME_ELDY_TEXTLI
 // Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on
 if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
 {
-    $conf->global->THEME_ELDY_BACKTABCARD1 = '255,255,255'; // card
-    $conf->global->THEME_ELDY_BACKTABACTIVE = '234,234,234';
-    $conf->global->THEME_ELDY_TEXT = '0,0,0';
-    $conf->global->THEME_ELDY_FONT_SIZE1 = $fontsize;
-    $conf->global->THEME_ELDY_FONT_SIZE2 = '0.75em';
+	$conf->global->THEME_ELDY_BACKTABCARD1 = '255,255,255'; // card
+	$conf->global->THEME_ELDY_BACKTABACTIVE = '234,234,234';
+	$conf->global->THEME_ELDY_TEXT = '0,0,0';
+	$conf->global->THEME_ELDY_FONT_SIZE1 = $fontsize;
+	$conf->global->THEME_ELDY_FONT_SIZE2 = '0.75em';
 }
 
 // Case of option availables only if THEME_ELDY_ENABLE_PERSONALIZED is on
@@ -144,8 +144,8 @@ $colorbacklinepairhover = ((!isset($conf->global->THEME_ELDY_USE_HOVER) || (stri
 $colorbacklinepairchecked = ((!isset($conf->global->THEME_ELDY_USE_CHECKED) || (string) $conf->global->THEME_ELDY_USE_CHECKED === '255,255,255') ? '' : ($conf->global->THEME_ELDY_USE_CHECKED === '1' ? 'e6edf0' : $conf->global->THEME_ELDY_USE_CHECKED));
 if (!empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED))
 {
-    $colorbacklinepairhover = ((!isset($user->conf->THEME_ELDY_USE_HOVER) || $user->conf->THEME_ELDY_USE_HOVER === '0') ? '' : ($user->conf->THEME_ELDY_USE_HOVER === '1' ? 'e6edf0' : $user->conf->THEME_ELDY_USE_HOVER));
-    $colorbacklinepairchecked = ((!isset($user->conf->THEME_ELDY_USE_CHECKED) || $user->conf->THEME_ELDY_USE_CHECKED === '0') ? '' : ($user->conf->THEME_ELDY_USE_CHECKED === '1' ? 'e6edf0' : $user->conf->THEME_ELDY_USE_CHECKED));
+	$colorbacklinepairhover = ((!isset($user->conf->THEME_ELDY_USE_HOVER) || $user->conf->THEME_ELDY_USE_HOVER === '0') ? '' : ($user->conf->THEME_ELDY_USE_HOVER === '1' ? 'e6edf0' : $user->conf->THEME_ELDY_USE_HOVER));
+	$colorbacklinepairchecked = ((!isset($user->conf->THEME_ELDY_USE_CHECKED) || $user->conf->THEME_ELDY_USE_CHECKED === '0') ? '' : ($user->conf->THEME_ELDY_USE_CHECKED === '1' ? 'e6edf0' : $user->conf->THEME_ELDY_USE_CHECKED));
 }
 
 
@@ -165,8 +165,8 @@ $colorbacktitle1 = join(',', colorStringToArray($colorbacktitle1)); // Normalize
 $tmppart = explode(',', $colorbacktitle1);
 if ($colortexttitle == '')
 {
-    $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
-    if ($tmpval <= 460) { $colortexttitle = 'FFFFFF'; $colorshadowtitle = '888888'; } else { $colortexttitle = '000000'; $colorshadowtitle = 'FFFFFF'; }
+	$tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
+	if ($tmpval <= 460) { $colortexttitle = 'FFFFFF'; $colorshadowtitle = '888888'; } else { $colortexttitle = '000000'; $colorshadowtitle = 'FFFFFF'; }
 } else $colorshadowtitle = '888888';
 
 $colorbacktabcard1 = join(',', colorStringToArray($colorbacktabcard1)); // Normalize value to 'x,y,z'
@@ -199,7 +199,7 @@ if ($conf->browser->layout == 'phone') $nbtopmenuentries = max($nbtopmenuentries
 
 
 $minwidthtmenu = 66; /* minimum width for one top menu entry */
-$heightmenu = 48; /* height of top menu, part with image */
+$heightmenu = 50; /* height of top menu, part with image */
 $heightmenu2 = 49; /* height of top menu, part with login  */
 $disableimages = 0;
 $maxwidthloginblock = 180;
@@ -239,7 +239,7 @@ print 'fontsizesmaller='.$fontsizesmaller."\n";
 print 'topMenuFontSize='.$topMenuFontSize."\n";
 print 'toolTipBgColor='.$toolTipBgColor."\n";
 print 'toolTipFontColor='.$toolTipFontColor."\n";
-print 'conf->global->THEME_SATURATE_RATIO='.$conf->global->THEME_SATURATE_RATIO." (must be between 0 and 1)\n";
+print 'conf->global->THEME_SATURATE_RATIO='.(empty($conf->global->THEME_SATURATE_RATIO) ? '' : $conf->global->THEME_SATURATE_RATIO)." (must be between 0 and 1)\n";
 print '*/'."\n";
 
 
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index 293dc6a2c39..572404f3eea 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -65,9 +65,9 @@ $colorbacklinepairhover = '230,237,244'; // line hover
 $colorbacklinepairchecked = '230,237,244'; // line checked
 $colorbacklinebreak = '248,247,244'; // line break
 $colorbackbody = '255,255,255';
-$colortexttitlenotab = '10,120,140'; // 150,90,121 140,80,10 or 10,140,80  #875a7b  green=0,123,140, violet: 0,50,120
+$colortexttitlenotab = '35,135,140'; // 150,90,121 140,80,10 or 10,140,80  #875a7b  green=0,123,140, violet: 0,50,120
 $colortexttitlenotab2 = '100,0,100'; // 150,90,121 140,80,10 or 10,140,80  #875a7b  green=0,123,140, violet: 0,50,120
-$colortexttitle = '0,0,0';
+$colortexttitle = '40, 40, 60';
 $colortexttitlelink = '10, 20, 100';
 $colortext = '0,0,0';
 $colortextlink = '10, 20, 100';
@@ -81,7 +81,7 @@ $toolTipFontColor = '#333';
 $textSuccess   = '#28a745';
 $colorblind_deuteranopes_textSuccess = '#37de5d';
 $textWarning   = '#bc9526'; // See $badgeWarning
-$textDanger    = '#9f4705'; // See $badgeDanger
+$textDanger    = '#af4705'; // See $badgeDanger
 $colorblind_deuteranopes_textWarning = $textWarning; // currently not tested with a color blind people so use default color
 
 
@@ -91,7 +91,7 @@ $badgeSecondary = '#aaaabb';
 $badgeInfo      = '#aaaabb';
 $badgeSuccess   = '#55a580';
 $badgeWarning   = '#bc9526'; // See $textWarning bc9526
-$badgeDanger    = '#9f4705'; // See $textDanger
+$badgeDanger    = '#af4705'; // See $textDanger
 $badgeDark      = '#343a40';
 $badgeLight     = '#f8f9fa';
 
@@ -110,8 +110,8 @@ $badgeStatus1 = '#bc9526'; // validated
 $badgeStatus1b = '#bc9526'; // validated
 $badgeStatus2 = '#9c9c26'; // approved
 $badgeStatus3 = '#bca52b';
-$badgeStatus4 = '#55a580'; // Color ok
-$badgeStatus4b = '#55a580'; // Color ok
+$badgeStatus4 = '#25a580'; // Color ok
+$badgeStatus4b = '#25a580'; // Color ok
 $badgeStatus5 = '#cad2d2';
 $badgeStatus6 = '#cad2d2';
 $badgeStatus7 = '#baa32b';
diff --git a/htdocs/theme/eldy/timeline.inc.php b/htdocs/theme/eldy/timeline.inc.php
index eb13821c221..d5fba863b3d 100644
--- a/htdocs/theme/eldy/timeline.inc.php
+++ b/htdocs/theme/eldy/timeline.inc.php
@@ -112,7 +112,7 @@ a.timeline-btn:hover
 {
     background-color: #e7e7e7;
     color: #333;
-    border-color: #adadad;;
+    border-color: #adadad;
 }
 
 
diff --git a/htdocs/theme/md/img/object_intracommreport.png b/htdocs/theme/md/img/object_intracommreport.png
new file mode 100644
index 0000000000000000000000000000000000000000..08db8957e9be24fa18c2e5e213a712e5df3be53c
GIT binary patch
literal 1384
zcmV-u1(*7XP)<h;3K|Lk000e1NJLTq001BW000~a1^@s60K&Z@00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY8~p$P8~p*7(FZmF000McNliru;RYHF7Y0QTk}LoK1ocTo
zK~zY`?Urjy6jv0-&z+gw*$4Y{fdyfaM=7YVEL1carHG*+Ra@Hnz(^~mP4tV@G)--r
z)})rEF-=WlV=!rLQ-f`+LaHqq6cv>~Qv_kr3d_2%y1=qemRW|G*_qofEr}_LUz+p-
zzfb2RC;$9&&pG#AfCU!#zcW2B@JP<OT>q+xMIw*nQ@3wFwLUdpfg(Mf^ffjX2b!DT
zAr%S_KRQ}x-?(ulBFR-qE)N<?OV3kU?V$Vc;au*)gM$*!^Wm#kj{!jE=^t;&w^kML
zbLn1a8H9@RY(VoFxVv-bBFu5UGj8`{B$ElGR@=gRJVQVbwFn`gjK;hAl9Jl+wQHw^
zK)^uKG$5I5L|gIV{>%^GZ+g7)3-IxwcMZh6XN0i~$z+S=X7doK)v}aIl@Az8q)NrB
z^Yhz9hKc7!Ms|n{Ll`S6suY=-D@m<3nd$0!=}EHIm77p|hdcB%1~32sq9_w0h`Xxg
z%ijY4C15NEQCy?U%KDx6`PvalDrGvINp3c4uqg6?Q1nT%gAPBw(LOx?3;+Paq6mWD
z|EsO7t-8bBr>BgI%5f~l#U>{^1;5{-Teq%<VOiGO&~Ow;5=gb$Vc1aK1dV4NE1G7}
zBX%Z6&TBw!HZxch>yS*=0{{?LP{;w`bBLnuD3+w%BxrhlVs0jzQCYOqbHV<FG#U1#
zuC{%Hw$#{PuQ?_A;kzBeT)O_iG$u(xnsW$SE)PNZhODPrqmRD6ZWw$Rsq48nwl^3E
zfF;=gwxvsY*XA2`@2V{B?zNAqz20cf3@ZjVZ_07~-BrtUR4~dYVhFvm{S*QKiHY)n
zG3G5P`Xk@gS032Cr!juS9c~++U~=OZsREUomsOoUYj<cgv`ep7)Q3Xsp0sr10VfwV
zJBRMSUA3BMDPCb~%}7h3E_HcdV`d0Nsv`2{kz?+yK0i~Nm=HIzySlLU`-YzEKydo7
zAV_vgs%|eSk!z99A3ex0T!dk`XpeoY?B&Wm5yw#A1E(ugY_ldgT*KkS?%SgkWu+Ns
zTUwpFSXSt~KOD^ADZ)W1g|`Y)xLzllX}RYLZMi?rl^NBNHa9Ezmfh|tdFT;WlO$5n
zG=(Eme5M$alG&M9c7ZkNk}W^^;_MbI%T4I)@7ib9sA*D&iQ6?Ax-2upc;QS#Rd#_j
z=~JISO8?x{Z$StoQIui`5Qt)o;$spvni9Nv1s^L}O4dEQ#Kfv)d`G;2P9~6`qDVqa
zGHW7nar7htP)ZW!8HR`Pai)+L#DrM`ktyz(^%W;Nm?$Sw6!8boi;js2rhIGlPha)*
zkME*sir=}tAfixE$~d*W8UVNqi;>F7Frx&M5nFRJ($lh6>_|;A(pl+g&xieEXz)+Z
zd6FV%JiAXIh$0p!ieLfo4cBnUH)|jeWYdS;;o?=rmbQiyTlN<gB)y^0(B!4op?xty
zOyBlu-j@z%pxc^fb~&7ZM4e7Cwyi4fs5RT%N2?7cliYh|p!Zt0H0Az{Wr7?Cq2s@_
zsG3Lu-vNMI2tof08#|Yhsym_AD+jz@Mll(gk<B^T2M@K*#@BDUR$+|wk6h39CZ78z
zZf)<gox9vU+TP>Bfrx-d9*pDW=8M7l<MlQF`AgYy<t6|CTsdBYKL6~K{Jgy7Yl@0&
qR#6m{001XXo?Q4&EU>@=^YRxwHb02fU8nj00000<MNUMnLSTZa$c$G2

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php
index d024d824ea8..a784a1ec7d9 100644
--- a/htdocs/theme/md/info-box.inc.php
+++ b/htdocs/theme/md/info-box.inc.php
@@ -33,6 +33,13 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
 	margin: 2px;
 	border-radius: 3px;
 }
+.user-back {
+	background-color: #79633f !important;
+	color: #FFF !important;
+	padding: 2px;
+	margin: 2px;
+	border-radius: 3px;
+}
 
 
 .bg-infobox-project{
@@ -466,6 +473,12 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
 	min-width: 350px;
     max-width: 350px;
 }
+
+.info-box-module .info-box-content {
+	height: 6.3em;
+}
+
+
 @media only screen and (max-width: 1740px) {
 	.info-box-module {
 	    min-width: 315px;
@@ -476,8 +489,11 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
 	.info-box-module {
 		min-width: 260px;
 	}
+	.info-box-sm .info-box-icon {
+		width: 60px;
+	}
+	.info-box-sm .info-box-content {
+		margin-left: 60px;
+	}
 }
 
-.info-box-module .info-box-content {
-	height: 6.3em;
-}
diff --git a/htdocs/theme/md/main_menu_fa_icons.inc.php b/htdocs/theme/md/main_menu_fa_icons.inc.php
index 2bca6430d0b..3aa45726975 100644
--- a/htdocs/theme/md/main_menu_fa_icons.inc.php
+++ b/htdocs/theme/md/main_menu_fa_icons.inc.php
@@ -16,7 +16,9 @@
 	color: #<?php echo $colortextbackhmenu; ?>;
 }
 
-
+.fa-15x {
+    font-size: 1.5em;
+}
 
 div.mainmenu.ticket::before {
     content: "\f3ff";
diff --git a/htdocs/theme/md/manifest.json.php b/htdocs/theme/md/manifest.json.php
index 33a5fcddb52..03c5894fdde 100644
--- a/htdocs/theme/md/manifest.json.php
+++ b/htdocs/theme/md/manifest.json.php
@@ -25,21 +25,21 @@
  *		\brief      File for The Web App
  */
 
-if (! defined('NOREQUIREUSER'))   define('NOREQUIREUSER', '1');
-if (! defined('NOREQUIREDB'))     define('NOREQUIREDB', '1');
-if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
-if (! defined('NOREQUIRETRAN'))   define('NOREQUIRETRAN', '1');
-if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK', '1');
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', '1');
-if (! defined('NOLOGIN'))         define('NOLOGIN', '1');
-if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU', '1');
-if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML', '1');
-if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIREUSER'))   define('NOREQUIREUSER', '1');
+if (!defined('NOREQUIREDB'))     define('NOREQUIREDB', '1');
+if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
+if (!defined('NOREQUIRETRAN'))   define('NOREQUIRETRAN', '1');
+if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', '1');
+if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', '1');
+if (!defined('NOLOGIN'))         define('NOLOGIN', '1');
+if (!defined('NOREQUIREMENU'))   define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML'))   define('NOREQUIREHTML', '1');
+if (!defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
 
 require_once __DIR__.'/../../main.inc.php';
 
-$appli=constant('DOL_APPLICATION_TITLE');
-if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
+$appli = constant('DOL_APPLICATION_TITLE');
+if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli = $conf->global->MAIN_APPLICATION_TITLE;
 
 top_httphead('text/json');
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index dcfbc402927..ad0b03366db 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -499,6 +499,10 @@ input.pageplusone {
     padding-top: 4px;
 }
 
+.saturatemedium {
+	filter: saturate(0.8);
+}
+
 .optionblue {
 	color: rgb(<?php echo $colortextlink; ?>);
 }
@@ -632,7 +636,7 @@ form {
     padding:0px;
     margin:0px;
 }
-div.float
+div.float, span.floatleft
 {
     float:<?php print $left; ?>;
 }
@@ -725,6 +729,9 @@ textarea.centpercent {
 .nowrap {
 	white-space: <?php print ($dol_optimize_smallscreen ? 'normal' : 'nowrap'); ?>;
 }
+.nowraponsmartphone {
+	white-space: <?php print ($dol_optimize_smallscreen ? 'nowrap' : 'normal'); ?>;
+}
 .liste_titre .nowrap {
 	white-space: nowrap;
 }
@@ -795,7 +802,7 @@ textarea.centpercent {
 .longmessagecut {
     max-height: 250px;
     max-width: 100%;
-    overflow-y: scroll;
+    overflow-y: auto;
 }
 
 .text-warning{
@@ -1011,6 +1018,12 @@ select.flat.selectlimit {
     text-overflow: ellipsis;
     white-space: nowrap;
 }
+.tdoverflowmax125 {			/* For tdoverflow, the max-midth become a minimum ! */
+    max-width: 125px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
 .tdoverflowmax150 {			/* For tdoverflow, the max-midth become a minimum ! */
     max-width: 150px;
     overflow: hidden;
@@ -1200,6 +1213,7 @@ table[summary="list_of_modules"] .fa-cog {
 .width50  { width: 50px; }
 .width75  { width: 75px; }
 .width100 { width: 100px; }
+.width125 { width: 125px; }
 .width150 { width: 150px; }
 .width200 { width: 200px; }
 .maxwidth25  { max-width: 25px; }
@@ -1269,6 +1283,16 @@ table[summary="list_of_modules"] .fa-cog {
     .minwidth500imp { min-width: 250px !important; }
 }
 
+/* Set a width. Note: add also a max-width that will be used in priority */ 
+.widthcentpercentminusx {
+	width: calc(100% - 50px) !important;
+	display: inline-block;
+}
+.widthcentpercentminusxx {
+	width: calc(100% - 70px) !important;
+	display: inline-block;
+}
+
 /* Force values for small screen 767 */
 @media only screen and (max-width: 767px)
 {
@@ -1279,7 +1303,9 @@ table[summary="list_of_modules"] .fa-cog {
 		font-size: <?php print is_numeric($fontsize) ? ($fontsize).'px' : $fontsize; ?> !important;
 	}
 
-	.clearbothonsmartphone { clear: both; display: block; }
+	div.divphotoref {
+	    padding-right: 10px !important;
+	}
 }
 
 /* Force values for small screen 570 */
@@ -1288,6 +1314,7 @@ table[summary="list_of_modules"] .fa-cog {
 	body {
 		font-size: <?php print is_numeric($fontsize) ? ($fontsize).'px' : $fontsize; ?>;
 	}
+
 	div.refidno {
 		font-size: <?php print is_numeric($fontsize) ? ($fontsize).'px' : $fontsize; ?> !important;
 	}
@@ -1295,6 +1322,17 @@ table[summary="list_of_modules"] .fa-cog {
 	.login_vertical_align {
     	padding-left: 0;
     }
+    .login_table input#username, .login_table input#password, .login_table input#securitycode {
+		margin-left: 5px !important;    
+    }
+	div#login_left, div#login_right {
+	    min-width: 150px !important;
+	    padding-left: 5px !important;
+	    padding-right: 5px !important;
+    }
+    .login_table div#login_right .tdinputlogin, .login_table div#login_right .tdinputlogin input {
+	    min-width: 150px !important;
+    }
 
 	.divmainbodylarge { margin-left: 20px; margin-right: 20px; }
 
@@ -1779,7 +1817,7 @@ div.nopadding {
 	vertical-align: middle;
 	margin-top: -3px
 }
-.pictowarning, .pictopreview {
+.pictowarning, .pictoerror, .pictopreview {
     padding-<?php echo $left; ?>: 3px;
 }
 .pictowarning {
@@ -2205,30 +2243,30 @@ div.mainmenu.website {
 		$found = 0; $url = '';
 		foreach ($conf->file->dol_document_root as $dirroot)
 		{
-		    if (file_exists($dirroot."/".$val."/img/".$val.".png"))
+			if (file_exists($dirroot."/".$val."/img/".$val.".png"))
 			{
-			    $url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
-			    $found = 1;
-			    break;
+				$url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
+				$found = 1;
+				break;
 			}
 		}
 		// Img file not found
 		if (!$found)
 		{
-		    if (!defined('DISABLE_FONT_AWSOME')) {
-		        print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n";
-		        print 'div.mainmenu.'.$val.'::before {
+			if (!defined('DISABLE_FONT_AWSOME')) {
+				print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n";
+				print 'div.mainmenu.'.$val.'::before {
 	                    content: "\f249";
 	                }';
-		    } else {
-		    	print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one. */\n";
-		    	print "/* Overwrite this definition in your own css with a different content to use your own font awesome icon. */\n";
-		        $url = dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.(min($generic, 4))."_over.png", 1);
-		        print "div.mainmenu.".$val." {\n";
-		        print "	background-image: url(".$url.");\n";
-		        print "}\n";
-	    	}
-	    	$generic++;
+			} else {
+				print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one. */\n";
+				print "/* Overwrite this definition in your own css with a different content to use your own font awesome icon. */\n";
+				$url = dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.(min($generic, 4))."_over.png", 1);
+				print "div.mainmenu.".$val." {\n";
+				print "	background-image: url(".$url.");\n";
+				print "}\n";
+			}
+			$generic++;
 		} else {
 			print "div.mainmenu.".$val." {\n";
 			print "	background-image: url(".$url.");\n";
@@ -2324,10 +2362,12 @@ form#login {
 }
 .login_table .tdinputlogin {
     background-color: #fff;
-    border: 2px solid #ccc;
     min-width: 220px;
     border-radius: 2px;
 }
+.login_table .tdinputlogin {
+	border-bottom: 1px solid #ccc; 
+}
 .login_table .tdinputlogin .fa {
 	padding-left: 10px;
 	width: 14px;
@@ -2499,6 +2539,9 @@ img.userphotosmall {			/* size for user photo in lists */
     background-size: contain;
     vertical-align: middle;
 }
+img.userphoto[alt="Gravatar avatar"] {
+    background: #fff;
+}
 .span-icon-user {
 	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/object_user.png', 1); ?>);
 	background-repeat: no-repeat;
@@ -2544,7 +2587,7 @@ div.vmenu, td.vmenu {
 .searchform { padding-top: 10px; }
 
 a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active, span.vmenu, span.vsmenu { white-space: nowrap; font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; }
-font.vmenudisabled  { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; color: #aaa; margin-left: 4px; }
+font.vmenudisabled  { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; color: #aaa; margin-left: 4px; white-space: nowrap; }
 a.vmenu:link, a.vmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; }
 
 a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active, span.vsmenu { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 8px; }
@@ -2554,6 +2597,17 @@ font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; }
 
 a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { text-align: <?php print $left; ?>; font-weight: normal; color: #999; text-decoration: none; }
 
+.helppresentcircle {
+    color: var(--colorbackhmenu1);
+    filter: invert(0.5);
+    margin-left: -7px;
+    display: inline-block;
+    margin-top: -10px;
+    font-size: x-small;
+    vertical-align: super;
+    opacity: 0.95;
+}
+
 div.blockvmenulogo
 {
 	border-bottom: 0 !important;
@@ -2949,6 +3003,10 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
 .unsetcolor {
 	color: unset !important;
 }
+
+.smallpaddingimp {
+    padding: 4px !important;
+}
 .nopaddingleft {
 	padding-<?php print $left; ?>: 0px;
 }
@@ -3690,6 +3748,15 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 }
 @media only screen and (max-width: 767px)
 {
+	.tabBar .arearef .pagination.paginationref {
+	    max-width: calc(50%);
+	}
+
+	.clearbothonsmartphone {
+	    clear: both;
+	    display: block !important;
+	}
+
 	div.tabs {
 		padding-left: 0 !important;
 		margin-left: 0 !important;
@@ -3847,7 +3914,7 @@ img.boxhandle, img.boxclose {
 .ok      { color: #114466; }
 .warning { color: #887711 !important; }
 .error   { color: #550000 !important; font-weight: bold; }
-.green   { color: #118822; }
+.green   { color: #118822 !important; }
 
 div.ok {
   color: #114466;
@@ -4885,9 +4952,14 @@ div.scroll2 {
 	width: <?php print isset($_SESSION['dol_screenwidth']) ?max($_SESSION['dol_screenwidth'] - 830, 450) : '450'; ?>px !important;
 }
 
-.gtaskname div, .gtaskname {
+div#GanttChartDIVglisthead, div#GanttChartDIVgcharthead {
+    line-height: 2;
+}
+
+.gtaskname div, .gtaskname, .gstartdate div, .gstartdate, .genddate div, .genddate {
 	font-size: unset !important;
 }
+
 div.gantt, .gtaskheading, .gmajorheading, .gminorheading, .gminorheadingwkend {
 	font-size: unset !important;
 	font-weight: normal !important;
@@ -5327,6 +5399,9 @@ a span.select2-chosen
 .select2-results {
 	max-height:	400px;
 }
+.select2-results__option {
+	word-break: break-word;
+}
 .select2-container.select2-container-disabled .select2-choice, .select2-container-multi.select2-container-disabled .select2-choices {
 	background-color: #FFFFFF;
 	background-image: none;
@@ -6451,11 +6526,11 @@ if (is_object($db)) $db->close();
 ::-webkit-scrollbar {
 	width: 12px;
 }
-::-webkit-scrollbar-button {
-	background: #aaa;
-}
+/*::-webkit-scrollbar-button {
+	background: #bbb;
+}*/
 ::-webkit-scrollbar-track-piece {
-	background: #fff;
+	background: #f4f4f4;
 }
 ::-webkit-scrollbar-thumb {
 	background: #ddd;
diff --git a/htdocs/ticket/agenda.php b/htdocs/ticket/agenda.php
index 13874eb7ecb..be68e1f68ee 100644
--- a/htdocs/ticket/agenda.php
+++ b/htdocs/ticket/agenda.php
@@ -41,8 +41,8 @@ $socid    = GETPOST('socid', 'int');
 $action   = GETPOST('action', 'aZ09');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", "alpha");
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST("sortfield", "aZ09comma");
+$sortorder = GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $page = is_numeric($page) ? $page : 0;
 $page = $page == -1 ? 0 : $page;
@@ -131,24 +131,24 @@ $help_url = 'FR:DocumentationModuleTicket';
 llxHeader('', $title, $help_url);
 
 if ($socid > 0) {
-    $object->fetch_thirdparty();
-    $head = societe_prepare_head($object->thirdparty);
+	$object->fetch_thirdparty();
+	$head = societe_prepare_head($object->thirdparty);
 
-    dol_fiche_head($head, 'ticket', $langs->trans("ThirdParty"), 0, 'company');
+	print dol_get_fiche_head($head, 'ticket', $langs->trans("ThirdParty"), 0, 'company');
 
-    dol_banner_tab($object->thirdparty, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
+	dol_banner_tab($object->thirdparty, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 if (!$user->socid && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) {
-    $object->next_prev_filter = "te.fk_user_assign = '".$user->id."'";
+	$object->next_prev_filter = "te.fk_user_assign = '".$user->id."'";
 } elseif ($user->socid > 0) {
-    $object->next_prev_filter = "te.fk_soc = '".$user->socid."'";
+	$object->next_prev_filter = "te.fk_soc = '".$user->socid."'";
 }
 $head = ticket_prepare_head($object);
 
-dol_fiche_head($head, 'tabTicketLogs', $langs->trans("Ticket"), 0, 'ticket');
+print dol_get_fiche_head($head, 'tabTicketLogs', $langs->trans("Ticket"), 0, 'ticket');
 
 $morehtmlref = '<div class="refidno">';
 $morehtmlref .= $object->subject;
@@ -220,7 +220,7 @@ $linkback = '<a href="'.dol_buildpath('/ticket/list.php', 1).'"><strong>'.$langs
 
 dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<br>';
 
@@ -231,17 +231,17 @@ if (!empty($object->id))
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
-    $morehtmlright = '';
+	$morehtmlright = '';
 
 	$messagingUrl = DOL_URL_ROOT.'/ticket/messaging.php?track_id='.$object->track_id;
-    $morehtmlright .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 1);
-    $messagingUrl = DOL_URL_ROOT.'/ticket/agenda.php?track_id='.$object->track_id;
-    $morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-list-alt imgforviewmode', $messagingUrl, '', 1, array('morecss'=>'btnTitleSelected'));
+	$morehtmlright .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 1);
+	$messagingUrl = DOL_URL_ROOT.'/ticket/agenda.php?track_id='.$object->track_id;
+	$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-list-alt imgforviewmode', $messagingUrl, '', 1, array('morecss'=>'btnTitleSelected'));
 
-    // Show link to add a message (if read and not closed)
-    $btnstatus = $object->fk_statut < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage";
-    $url = 'card.php?track_id='.$object->track_id.'&action=presend_addmessage&mode=init';
-    $morehtmlright .= dolGetButtonTitle($langs->trans('TicketAddMessage'), '', 'fa fa-comment-dots', $url, 'add-new-ticket-title-button', $btnstatus);
+	// Show link to add a message (if read and not closed)
+	$btnstatus = $object->fk_statut < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage";
+	$url = 'card.php?track_id='.$object->track_id.'&action=presend_addmessage&mode=init';
+	$morehtmlright .= dolGetButtonTitle($langs->trans('TicketAddMessage'), '', 'fa fa-comment-dots', $url, 'add-new-ticket-title-button', $btnstatus);
 
 	// Show link to add event (if read and not closed)
 	$btnstatus = $object->fk_statut < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage";
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 1719013bdf5..c67476f8c00 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -59,10 +59,10 @@ $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 
 if (GETPOST('actioncode', 'array')) {
-    $actioncode = GETPOST('actioncode', 'array', 3);
-    if (!count($actioncode)) $actioncode = '0';
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) $actioncode = '0';
 } else {
-    $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
@@ -170,8 +170,12 @@ if (empty($reshook)) {
 			$object->message = GETPOST("message", 'restricthtml');
 
 			$object->type_code = GETPOST("type_code", 'alpha');
+			$object->type_label = $langs->trans($langs->getLabelFromKey($db, $object->type_code, 'c_ticket_type', 'code', 'label'));
 			$object->category_code = GETPOST("category_code", 'alpha');
+			$object->category_label = $langs->trans($langs->getLabelFromKey($db, $object->category_code, 'c_ticket_category', 'code', 'label'));
 			$object->severity_code = GETPOST("severity_code", 'alpha');
+			$object->severity_label = $langs->trans($langs->getLabelFromKey($db, $object->severity_code, 'c_ticket_severity', 'code', 'label'));
+			$object->email_from = $user->email;
 			$notifyTiers = GETPOST("notify_tiers_at_create", 'alpha');
 			$object->notify_tiers_at_create = empty($notifyTiers) ? 0 : 1;
 
@@ -190,7 +194,8 @@ if (empty($reshook)) {
 				$type_contact = GETPOST("type", 'alpha');
 
 				if ($contactid > 0 && $type_contact) {
-					$result = $object->add_contact($contactid, GETPOST("type"), 'external');
+					$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+					$result = $object->add_contact($contactid, $typeid, 'external');
 				}
 
 				// altairis: link ticket to project
@@ -478,15 +483,18 @@ if (empty($reshook)) {
 			}
 
 			if ($action == 'setsubject' && empty($object->subject)) {
-				$mesg .= ($mesg ? '<br>' : '').$langs->trans("ErrorFieldRequired", $langs->transnoentities("Subject"));
+				$error++;
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Subject")), null, 'errors');
 			}
 
-			if (!$mesg) {
+			if (!$error) {
 				if ($object->update($user) >= 0) {
 					header("Location: ".$_SERVER['PHP_SELF']."?track_id=".$object->track_id);
 					exit;
+				} else {
+					$error++;
+					setEventMessages($object->error, $object->errors, 'errors');
 				}
-				$mesg = $object->error;
 			}
 		}
 	}
@@ -503,6 +511,9 @@ if (empty($reshook)) {
 					$url = 'card.php?action=view&track_id='.$object->track_id;
 					header("Location: ".$url);
 					exit();
+				} else {
+					$error++;
+					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
 		}
@@ -539,6 +550,9 @@ if (empty($reshook)) {
 				$log_action .= Diff::toString(Diff::compare(strip_tags($oldvalue_message), strip_tags($object->message)));
 
 				setEventMessages($langs->trans('TicketMessageSuccesfullyUpdated'), null, 'mesgs');
+			} else {
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
 
@@ -556,6 +570,9 @@ if (empty($reshook)) {
 				$url = 'card.php?action=view&track_id='.$object->track_id;
 				header("Location: ".$url);
 				exit();
+			} else {
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
 	}
@@ -593,6 +610,9 @@ if (empty($reshook)) {
 			$log_action = $langs->trans('TicketLogPropertyChanged', $oldvalue_label, $newvalue_label);
 
 			setEventMessages($langs->trans('TicketUpdated'), null, 'mesgs');
+		} else {
+			$error++;
+			setEventMessages($object->error, $object->errors, 'errors');
 		}
 		$action = 'view';
 	}
@@ -662,7 +682,7 @@ if ($action == 'create' || $action == 'presend')
 	print '<input type="hidden" name="action" value="update">';
 	print '<input type="hidden" name="tack_id" value="'.$object->track_id.'">';
 
-	dol_fiche_head($head, 'card', $langs->trans('Ticket'), 0, 'ticket');
+	print dol_get_fiche_head($head, 'card', $langs->trans('Ticket'), 0, 'ticket');
 
 	print '<div class="fichecenter2">';
 	print '<table class="border" width="100%">';
@@ -698,12 +718,12 @@ if ($action == 'create' || $action == 'presend')
 	print '</table>';
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
-	print '<input type="submit" class="button" name="save" value="'.$langs->trans('Save').'">';
+	print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
 	print ' &nbsp; &nbsp; ';
-	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
@@ -753,7 +773,7 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
 				//print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
 
 				$head = project_prepare_head($projectstat);
-				dol_fiche_head($head, 'ticket', $langs->trans("Project"), 0, ($projectstat->public ? 'projectpub' : 'project'));
+				print dol_get_fiche_head($head, 'ticket', $langs->trans("Project"), 0, ($projectstat->public ? 'projectpub' : 'project'));
 
 				/*
                  *   Projet synthese pour rappel
@@ -809,11 +829,11 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
 			$object->fetch_thirdparty();
 			$head = societe_prepare_head($object->thirdparty);
 
-			dol_fiche_head($head, 'ticket', $langs->trans("ThirdParty"), 0, 'company');
+			print dol_get_fiche_head($head, 'ticket', $langs->trans("ThirdParty"), 0, 'company');
 
 			dol_banner_tab($object->thirdparty, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 		}
 
 		if (!$user->socid && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) {
@@ -824,7 +844,7 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
 
 		$head = ticket_prepare_head($object);
 
-		dol_fiche_head($head, 'tabTicket', $langs->trans("Ticket"), -1, 'ticket');
+		print dol_get_fiche_head($head, 'tabTicket', $langs->trans("Ticket"), -1, 'ticket');
 
 		$morehtmlref = '<div class="refidno">';
 		$morehtmlref .= $object->subject;
@@ -1223,7 +1243,7 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
 		print '</div></div></div>';
 		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		// Buttons for actions
diff --git a/htdocs/ticket/class/actions_ticket.class.php b/htdocs/ticket/class/actions_ticket.class.php
index 49185f093fc..895cacdb4ed 100644
--- a/htdocs/ticket/class/actions_ticket.class.php
+++ b/htdocs/ticket/class/actions_ticket.class.php
@@ -234,7 +234,7 @@ class ActionsTicket
 		if (!empty($user->rights->ticket->manage) && $action == 'edit_message_init') {
 			print '<div class="center">';
 			print ' <input type="submit" class="button" value="'.$langs->trans('Modify').'">';
-			print ' <input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
+			print ' <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 			print '</div>';
 		}
 		print '</td>';
diff --git a/htdocs/ticket/class/api_tickets.class.php b/htdocs/ticket/class/api_tickets.class.php
index 4a3c9b66203..4a0bcbe7b92 100644
--- a/htdocs/ticket/class/api_tickets.class.php
+++ b/htdocs/ticket/class/api_tickets.class.php
@@ -29,542 +29,544 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/ticket.lib.php';
  */
 class Tickets extends DolibarrApi
 {
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    public static $FIELDS = array(
-        'subject',
-        'message'
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	public static $FIELDS = array(
+		'subject',
+		'message'
+	);
 
-    /**
-     * @var array   $FIELDS_MESSAGES     Mandatory fields, checked when create and update object
-     */
-    public static $FIELDS_MESSAGES = array(
-        'track_id',
-        'message'
-    );
+	/**
+	 * @var array   $FIELDS_MESSAGES     Mandatory fields, checked when create and update object
+	 */
+	public static $FIELDS_MESSAGES = array(
+		'track_id',
+		'message'
+	);
 
-    /**
-     * @var Ticket $ticket {@type Ticket}
-     */
-    public $ticket;
+	/**
+	 * @var Ticket $ticket {@type Ticket}
+	 */
+	public $ticket;
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db;
-        $this->db = $db;
-        $this->ticket = new Ticket($this->db);
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db;
+		$this->db = $db;
+		$this->ticket = new Ticket($this->db);
+	}
 
-    /**
-     * Get properties of a Ticket object.
-     *
-     * Return an array with ticket informations
-     *
-     * @param	int 			$id 		ID of ticket
-     * @return 	array|mixed 				Data without useless information
-     *
-     * @throws RestException 401
-     * @throws RestException 403
-     * @throws RestException 404
-     */
-    public function get($id)
-    {
-        return $this->getCommon($id, '', '');
-    }
+	/**
+	 * Get properties of a Ticket object.
+	 *
+	 * Return an array with ticket informations
+	 *
+	 * @param	int 			$id 		ID of ticket
+	 * @return 	array|mixed 				Data without useless information
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 403
+	 * @throws RestException 404
+	 */
+	public function get($id)
+	{
+		return $this->getCommon($id, '', '');
+	}
 
-    /**
-     * Get properties of a Ticket object from track id
-     *
-     * Return an array with ticket informations
-     *
-     * @param	string  		$track_id 	Tracking ID of ticket
-     * @return 	array|mixed 				Data without useless information
-     *
-     * @url GET track_id/{track_id}
-     *
-     * @throws RestException 	401
-     * @throws RestException 	403
-     * @throws RestException 	404
-     */
-    public function getByTrackId($track_id)
-    {
-        return $this->getCommon(0, $track_id, '');
-    }
+	/**
+	 * Get properties of a Ticket object from track id
+	 *
+	 * Return an array with ticket informations
+	 *
+	 * @param	string  		$track_id 	Tracking ID of ticket
+	 * @return 	array|mixed 				Data without useless information
+	 *
+	 * @url GET track_id/{track_id}
+	 *
+	 * @throws RestException 	401
+	 * @throws RestException 	403
+	 * @throws RestException 	404
+	 */
+	public function getByTrackId($track_id)
+	{
+		return $this->getCommon(0, $track_id, '');
+	}
 
-    /**
-     * Get properties of a Ticket object from ref
-     *
-     * Return an array with ticket informations
-     *
-     * @param	string  		$ref    	Reference for ticket
-     * @return 	array|mixed 				Data without useless information
-     *
-     * @url GET ref/{ref}
-     *
-     * @throws RestException 401
-     * @throws RestException 403
-     * @throws RestException 404
-     */
-    public function getByRef($ref)
-    {
-        try {
-            return $this->getCommon(0, '', $ref);
-        } catch (Exception $e)
-        {
-               throw $e;
-        }
-    }
+	/**
+	 * Get properties of a Ticket object from ref
+	 *
+	 * Return an array with ticket informations
+	 *
+	 * @param	string  		$ref    	Reference for ticket
+	 * @return 	array|mixed 				Data without useless information
+	 *
+	 * @url GET ref/{ref}
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 403
+	 * @throws RestException 404
+	 */
+	public function getByRef($ref)
+	{
+		try {
+			return $this->getCommon(0, '', $ref);
+		} catch (Exception $e)
+		{
+			   throw $e;
+		}
+	}
 
-    /**
-     * Get properties of a Ticket object
-     * Return an array with ticket informations
-     *
-     * @param	int 			$id 		ID of ticket
-     * @param	string  		$track_id 	Tracking ID of ticket
-     * @param	string  		$ref    	Reference for ticket
-     * @return 	array|mixed 				Data without useless information
-     */
-    private function getCommon($id = 0, $track_id = '', $ref = '')
-    {
-        if (!DolibarrApiAccess::$user->rights->ticket->read) {
-            throw new RestException(403);
-        }
+	/**
+	 * Get properties of a Ticket object
+	 * Return an array with ticket informations
+	 *
+	 * @param	int 			$id 		ID of ticket
+	 * @param	string  		$track_id 	Tracking ID of ticket
+	 * @param	string  		$ref    	Reference for ticket
+	 * @return 	array|mixed 				Data without useless information
+	 */
+	private function getCommon($id = 0, $track_id = '', $ref = '')
+	{
+		if (!DolibarrApiAccess::$user->rights->ticket->read) {
+			throw new RestException(403);
+		}
 
-        // Check parameters
-        if (!$id && !$track_id && !$ref) {
-            throw new RestException(401, 'Wrong parameters');
-        }
+		// Check parameters
+		if (($id < 0) && !$track_id && !$ref) {
+			throw new RestException(401, 'Wrong parameters');
+		}
+		if ($id == 0) {
+			$result = $this->ticket->initAsSpecimen();
+		} else {
+			$result = $this->ticket->fetch($id, $ref, $track_id);
+		}
+		if (!$result) {
+			throw new RestException(404, 'Ticket not found');
+		}
 
-        $result = $this->ticket->fetch($id, $ref, $track_id);
-        if (!$result) {
-            throw new RestException(404, 'Ticket not found');
-        }
+		// String for user assigned
+		if ($this->ticket->fk_user_assign > 0) {
+			$userStatic = new User($this->db);
+			$userStatic->fetch($this->ticket->fk_user_assign);
+			$this->ticket->fk_user_assign_string = $userStatic->firstname.' '.$userStatic->lastname;
+		}
 
-        // String for user assigned
-        if ($this->ticket->fk_user_assign > 0) {
-            $userStatic = new User($this->db);
-            $userStatic->fetch($this->ticket->fk_user_assign);
-            $this->ticket->fk_user_assign_string = $userStatic->firstname.' '.$userStatic->lastname;
-        }
+		// Messages of ticket
+		$messages = array();
+		$this->ticket->loadCacheMsgsTicket();
+		if (is_array($this->ticket->cache_msgs_ticket) && count($this->ticket->cache_msgs_ticket) > 0) {
+			$num = count($this->ticket->cache_msgs_ticket);
+			$i = 0;
+			while ($i < $num) {
+				if ($this->ticket->cache_msgs_ticket[$i]['fk_user_author'] > 0) {
+					$user_action = new User($this->db);
+					$user_action->fetch($this->ticket->cache_msgs_ticket[$i]['fk_user_author']);
+				}
 
-        // Messages of ticket
-        $messages = array();
-        $this->ticket->loadCacheMsgsTicket();
-        if (is_array($this->ticket->cache_msgs_ticket) && count($this->ticket->cache_msgs_ticket) > 0) {
-            $num = count($this->ticket->cache_msgs_ticket);
-            $i = 0;
-            while ($i < $num) {
-                if ($this->ticket->cache_msgs_ticket[$i]['fk_user_author'] > 0) {
-                    $user_action = new User($this->db);
-                    $user_action->fetch($this->ticket->cache_msgs_ticket[$i]['fk_user_author']);
-                }
+				// Now define messages
+				$messages[] = array(
+				'id' => $this->ticket->cache_msgs_ticket[$i]['id'],
+				'fk_user_action' => $this->ticket->cache_msgs_ticket[$i]['fk_user_author'],
+				'fk_user_action_socid' =>  $user_action->socid,
+				'fk_user_action_string' => dolGetFirstLastname($user_action->firstname, $user_action->lastname),
+				'message' => $this->ticket->cache_msgs_ticket[$i]['message'],
+				'datec' => $this->ticket->cache_msgs_ticket[$i]['datec'],
+				'private' => $this->ticket->cache_msgs_ticket[$i]['private']
+				);
+				$i++;
+			}
+			$this->ticket->messages = $messages;
+		}
 
-                // Now define messages
-                $messages[] = array(
-                'id' => $this->ticket->cache_msgs_ticket[$i]['id'],
-                'fk_user_action' => $this->ticket->cache_msgs_ticket[$i]['fk_user_author'],
-                'fk_user_action_socid' =>  $user_action->socid,
-                'fk_user_action_string' => dolGetFirstLastname($user_action->firstname, $user_action->lastname),
-                'message' => $this->ticket->cache_msgs_ticket[$i]['message'],
-                'datec' => $this->ticket->cache_msgs_ticket[$i]['datec'],
-                'private' => $this->ticket->cache_msgs_ticket[$i]['private']
-                );
-                $i++;
-            }
-            $this->ticket->messages = $messages;
-        }
+		// History
+		$history = array();
+		$this->ticket->loadCacheLogsTicket();
+		if (is_array($this->ticket->cache_logs_ticket) && count($this->ticket->cache_logs_ticket) > 0) {
+			$num = count($this->ticket->cache_logs_ticket);
+			$i = 0;
+			while ($i < $num) {
+				if ($this->ticket->cache_logs_ticket[$i]['fk_user_create'] > 0) {
+					$user_action = new User($this->db);
+					$user_action->fetch($this->ticket->cache_logs_ticket[$i]['fk_user_create']);
+				}
 
-        // History
-        $history = array();
-        $this->ticket->loadCacheLogsTicket();
-        if (is_array($this->ticket->cache_logs_ticket) && count($this->ticket->cache_logs_ticket) > 0) {
-            $num = count($this->ticket->cache_logs_ticket);
-            $i = 0;
-            while ($i < $num) {
-                if ($this->ticket->cache_logs_ticket[$i]['fk_user_create'] > 0) {
-                    $user_action = new User($this->db);
-                    $user_action->fetch($this->ticket->cache_logs_ticket[$i]['fk_user_create']);
-                }
+				// Now define messages
+				$history[] = array(
+				'id' => $this->ticket->cache_logs_ticket[$i]['id'],
+				'fk_user_author' => $this->ticket->cache_msgs_ticket[$i]['fk_user_author'],
+				'fk_user_action' => $this->ticket->cache_logs_ticket[$i]['fk_user_create'],
+				'fk_user_action_string' => dolGetFirstLastname($user_action->firstname, $user_action->lastname),
+				'message' => $this->ticket->cache_logs_ticket[$i]['message'],
+				'datec' => $this->ticket->cache_logs_ticket[$i]['datec'],
+				);
+				$i++;
+			}
+			$this->ticket->history = $history;
+		}
 
-                // Now define messages
-                $history[] = array(
-                'id' => $this->ticket->cache_logs_ticket[$i]['id'],
-                'fk_user_author' => $this->ticket->cache_msgs_ticket[$i]['fk_user_author'],
-                'fk_user_action' => $this->ticket->cache_logs_ticket[$i]['fk_user_create'],
-                'fk_user_action_string' => dolGetFirstLastname($user_action->firstname, $user_action->lastname),
-                'message' => $this->ticket->cache_logs_ticket[$i]['message'],
-                'datec' => $this->ticket->cache_logs_ticket[$i]['datec'],
-                );
-                $i++;
-            }
-            $this->ticket->history = $history;
-        }
+		if (!DolibarrApi::_checkAccessToResource('ticket', $this->ticket->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		return $this->_cleanObjectDatas($this->ticket);
+	}
 
+	/**
+	 * List tickets
+	 *
+	 * Get a list of tickets
+	 *
+	 * @param int       $socid      Filter list with thirdparty ID
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
+	 * @param string	$sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101') and (t.fk_statut:=:1)"
+	 *
+	 * @return array Array of ticket objects
+	 *
+	 */
+	public function index($socid = 0, $sortfield = "t.rowid", $sortorder = "ASC", $limit = 100, $page = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        if (!DolibarrApi::_checkAccessToResource('ticket', $this->ticket->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        return $this->_cleanObjectDatas($this->ticket);
-    }
+		$obj_ret = array();
 
-    /**
-     * List tickets
-     *
-     * Get a list of tickets
-     *
-     * @param int       $socid      Filter list with thirdparty ID
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     * @param string	$sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101') and (t.fk_statut:=:1)"
-     *
-     * @return array Array of ticket objects
-     *
-     */
-    public function index($socid = 0, $sortfield = "t.rowid", $sortorder = "ASC", $limit = 100, $page = 0, $sqlfilters = '')
-    {
-        global $db, $conf;
+		if (!$socid && DolibarrApiAccess::$user->socid) {
+			$socid = DolibarrApiAccess::$user->socid;
+		}
 
-        $obj_ret = array();
+		// If the internal user must only see his customers, force searching by him
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) {
+			$search_sale = DolibarrApiAccess::$user->id;
+		}
 
-        if (!$socid && DolibarrApiAccess::$user->socid) {
-            $socid = DolibarrApiAccess::$user->socid;
-        }
+		$sql = "SELECT t.rowid";
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+			$sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		}
+		$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
 
-        // If the internal user must only see his customers, force searching by him
-        if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) {
-            $search_sale = DolibarrApiAccess::$user->id;
-        }
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		}
 
-        $sql = "SELECT t.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
-            $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        }
-        $sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
+		$sql .= ' WHERE t.entity IN ('.getEntity('ticket', 1).')';
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+			$sql .= " AND t.fk_soc = sc.fk_soc";
+		}
+		if ($socid > 0) {
+			$sql .= " AND t.fk_soc = ".$socid;
+		}
+		if ($search_sale > 0) {
+			$sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		}
 
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
-            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
-        }
+		// Insert sale filter
+		if ($search_sale > 0) {
+			$sql .= " AND sc.fk_user = ".$search_sale;
+		}
+		// Add sql filters
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= ' WHERE t.entity IN ('.getEntity('ticket', 1).')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
-            $sql .= " AND t.fk_soc = sc.fk_soc";
-        }
-        if ($socid > 0) {
-            $sql .= " AND t.fk_soc = ".$socid;
-        }
-        if ($search_sale > 0) {
-            $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
-        }
+		$sql .= $this->db->order($sortfield, $sortorder);
 
-        // Insert sale filter
-        if ($search_sale > 0) {
-            $sql .= " AND sc.fk_user = ".$search_sale;
-        }
-        // Add sql filters
-        if ($sqlfilters) {
-            if (!DolibarrApi::_checkFilters($sqlfilters)) {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-        $sql .= $this->db->order($sortfield, $sortorder);
+			$sql .= $this->db->plimit($limit, $offset);
+		}
 
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$result = $this->db->query($sql);
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			while ($i < $num) {
+				$obj = $this->db->fetch_object($result);
+				$ticket_static = new Ticket($this->db);
+				if ($ticket_static->fetch($obj->rowid)) {
+					if ($ticket_static->fk_user_assign > 0) {
+						$userStatic = new User($this->db);
+						$userStatic->fetch($ticket_static->fk_user_assign);
+						$ticket_static->fk_user_assign_string = $userStatic->firstname.' '.$userStatic->lastname;
+					}
+					$obj_ret[] = $this->_cleanObjectDatas($ticket_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve ticket list');
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No ticket found');
+		}
+			return $obj_ret;
+	}
 
-            $sql .= $this->db->plimit($limit, $offset);
-        }
+	/**
+	 * Create ticket object
+	 *
+	 * @param array $request_data   Request datas
+	 * @return int  ID of ticket
+	 */
+	public function post($request_data = null)
+	{
+		$ticketstatic = new Ticket($this->db);
+		if (!DolibarrApiAccess::$user->rights->ticket->write) {
+			throw new RestException(401);
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        $result = $this->db->query($sql);
-        if ($result) {
-        	$num = $this->db->num_rows($result);
-            $i = 0;
-            while ($i < $num) {
-            	$obj = $this->db->fetch_object($result);
-            	$ticket_static = new Ticket($this->db);
-                if ($ticket_static->fetch($obj->rowid)) {
-                    if ($ticket_static->fk_user_assign > 0) {
-                        $userStatic = new User($this->db);
-                        $userStatic->fetch($ticket_static->fk_user_assign);
-                        $ticket_static->fk_user_assign_string = $userStatic->firstname.' '.$userStatic->lastname;
-                    }
-                    $obj_ret[] = $this->_cleanObjectDatas($ticket_static);
-                }
-                $i++;
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieve ticket list');
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No ticket found');
-        }
-            return $obj_ret;
-    }
+		foreach ($request_data as $field => $value) {
+			$this->ticket->$field = $value;
+		}
+		if (empty($this->ticket->ref)) {
+			$this->ticket->ref = $ticketstatic->getDefaultRef();
+		}
+		if (empty($this->ticket->track_id)) {
+			$this->ticket->track_id = generate_random_id(16);
+		}
 
-    /**
-     * Create ticket object
-     *
-     * @param array $request_data   Request datas
-     * @return int  ID of ticket
-     */
-    public function post($request_data = null)
-    {
-        $ticketstatic = new Ticket($this->db);
-        if (!DolibarrApiAccess::$user->rights->ticket->write) {
-            throw new RestException(401);
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+		if ($this->ticket->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, "Error creating ticket", array_merge(array($this->ticket->error), $this->ticket->errors));
+		}
 
-        foreach ($request_data as $field => $value) {
-            $this->ticket->$field = $value;
-        }
-        if (empty($this->ticket->ref)) {
-            $this->ticket->ref = $ticketstatic->getDefaultRef();
-        }
-        if (empty($this->ticket->track_id)) {
-            $this->ticket->track_id = generate_random_id(16);
-        }
+		return $this->ticket->id;
+	}
 
-        if ($this->ticket->create(DolibarrApiAccess::$user) < 0) {
-        	throw new RestException(500, "Error creating ticket", array_merge(array($this->ticket->error), $this->ticket->errors));
-        }
+	/**
+	 * Create ticket object
+	 *
+	 * @param array $request_data   Request datas
+	 * @return int  ID of ticket
+	 *
+	 */
+	public function postNewMessage($request_data = null)
+	{
+		$ticketstatic = new Ticket($this->db);
+		if (!DolibarrApiAccess::$user->rights->ticket->write) {
+			throw new RestException(401);
+		}
+		// Check mandatory fields
+		$result = $this->_validateMessage($request_data);
 
-        return $this->ticket->id;
-    }
+		foreach ($request_data as $field => $value) {
+			$this->ticket->$field = $value;
+		}
+		$ticketMessageText = $this->ticket->message;
+		$result = $this->ticket->fetch('', '', $this->ticket->track_id);
+		if (!$result) {
+			throw new RestException(404, 'Ticket not found');
+		}
+		$this->ticket->message = $ticketMessageText;
+		if (!$this->ticket->createTicketMessage(DolibarrApiAccess::$user)) {
+			throw new RestException(500);
+		}
+		return $this->ticket->id;
+	}
 
-    /**
-     * Create ticket object
-     *
-     * @param array $request_data   Request datas
-     * @return int  ID of ticket
-     *
-     */
-    public function postNewMessage($request_data = null)
-    {
-        $ticketstatic = new Ticket($this->db);
-        if (!DolibarrApiAccess::$user->rights->ticket->write) {
-            throw new RestException(401);
-        }
-        // Check mandatory fields
-        $result = $this->_validateMessage($request_data);
+	/**
+	 * Update ticket
+	 *
+	 * @param int   $id             Id of ticket to update
+	 * @param array $request_data   Datas
+	 * @return int
+	 *
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->ticket->write) {
+			throw new RestException(401);
+		}
 
-        foreach ($request_data as $field => $value) {
-            $this->ticket->$field = $value;
-        }
-        $ticketMessageText = $this->ticket->message;
-        $result = $this->ticket->fetch('', '', $this->ticket->track_id);
-        if (!$result) {
-            throw new RestException(404, 'Ticket not found');
-        }
-        $this->ticket->message = $ticketMessageText;
-        if (!$this->ticket->createTicketMessage(DolibarrApiAccess::$user)) {
-            throw new RestException(500);
-        }
-        return $this->ticket->id;
-    }
+		$result = $this->ticket->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Ticket not found');
+		}
 
-    /**
-     * Update ticket
-     *
-     * @param int   $id             Id of ticket to update
-     * @param array $request_data   Datas
-     * @return int
-     *
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->ticket->write) {
-            throw new RestException(401);
-        }
+		if (!DolibarrApi::_checkAccessToResource('ticket', $this->ticket->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $result = $this->ticket->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Ticket not found');
-        }
+		foreach ($request_data as $field => $value) {
+			$this->ticket->$field = $value;
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('ticket', $this->ticket->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if ($this->ticket->update($id, DolibarrApiAccess::$user)) {
+			return $this->get($id);
+		}
 
-        foreach ($request_data as $field => $value) {
-            $this->ticket->$field = $value;
-        }
+		return false;
+	}
 
-        if ($this->ticket->update($id, DolibarrApiAccess::$user)) {
-            return $this->get($id);
-        }
+	/**
+	 * Delete ticket
+	 *
+	 * @param   int     $id   Ticket ID
+	 * @return  array
+	 *
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->ticket->delete) {
+			throw new RestException(401);
+		}
+		$result = $this->ticket->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Ticket not found');
+		}
 
-        return false;
-    }
+		if (!DolibarrApi::_checkAccessToResource('ticket', $this->ticket->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-    /**
-     * Delete ticket
-     *
-     * @param   int     $id   Ticket ID
-     * @return  array
-     *
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->ticket->delete) {
-            throw new RestException(401);
-        }
-        $result = $this->ticket->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Ticket not found');
-        }
+		if (!$this->ticket->delete($id)) {
+			throw new RestException(500);
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('ticket', $this->ticket->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Ticket deleted'
+			)
+		);
+	}
 
-        if (!$this->ticket->delete($id)) {
-            throw new RestException(500);
-        }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param array $data   Data to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	private function _validate($data)
+	{
+		$ticket = array();
+		foreach (Tickets::$FIELDS as $field) {
+			if (!isset($data[$field])) {
+				throw new RestException(400, "$field field missing");
+			}
+			$ticket[$field] = $data[$field];
+		}
+		return $ticket;
+	}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Ticket deleted'
-            )
-        );
-    }
+	/**
+	 * Validate fields before create or update object message
+	 *
+	 * @param array $data   Data to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	private function _validateMessage($data)
+	{
+		$ticket = array();
+		foreach (Tickets::$FIELDS_MESSAGES as $field) {
+			if (!isset($data[$field])) {
+				throw new RestException(400, "$field field missing");
+			}
+			$ticket[$field] = $data[$field];
+		}
+		return $ticket;
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param array $data   Data to validate
-     * @return array
-     *
-     * @throws RestException
-     */
-    private function _validate($data)
-    {
-        $ticket = array();
-        foreach (Tickets::$FIELDS as $field) {
-            if (!isset($data[$field])) {
-                throw new RestException(400, "$field field missing");
-            }
-            $ticket[$field] = $data[$field];
-        }
-        return $ticket;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 *
+	 * @todo use an array for properties to clean
+	 *
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-    /**
-     * Validate fields before create or update object message
-     *
-     * @param array $data   Data to validate
-     * @return array
-     *
-     * @throws RestException
-     */
-    private function _validateMessage($data)
-    {
-        $ticket = array();
-        foreach (Tickets::$FIELDS_MESSAGES as $field) {
-            if (!isset($data[$field])) {
-                throw new RestException(400, "$field field missing");
-            }
-            $ticket[$field] = $data[$field];
-        }
-        return $ticket;
-    }
+		// Other attributes to clean
+		$attr2clean = array(
+			"contact",
+			"contact_id",
+			"ref_previous",
+			"ref_next",
+			"ref_ext",
+			"table_element_line",
+			"statut",
+			"country",
+			"country_id",
+			"country_code",
+			"barcode_type",
+			"barcode_type_code",
+			"barcode_type_label",
+			"barcode_type_coder",
+			"mode_reglement_id",
+			"cond_reglement_id",
+			"cond_reglement",
+			"fk_delivery_address",
+			"shipping_method_id",
+			"modelpdf",
+			"fk_account",
+			"note_public",
+			"note_private",
+			"note",
+			"total_ht",
+			"total_tva",
+			"total_localtax1",
+			"total_localtax2",
+			"total_ttc",
+			"fk_incoterms",
+			"label_incoterms",
+			"location_incoterms",
+			"name",
+			"lastname",
+			"firstname",
+			"civility_id",
+			"canvas",
+			"cache_msgs_ticket",
+			"cache_logs_ticket",
+			"cache_types_tickets",
+			"cache_category_tickets",
+			"regeximgext",
+			"statuts_short",
+			"statuts"
+		);
+		foreach ($attr2clean as $toclean) {
+			unset($object->$toclean);
+		}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object	Object to clean
-     * @return	array	Array of cleaned object properties
-     *
-     * @todo use an array for properties to clean
-     *
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+		// If object has lines, remove $db property
+		if (isset($object->lines) && count($object->lines) > 0) {
+			$nboflines = count($object->lines);
+			for ($i = 0; $i < $nboflines; $i++) {
+				$this->_cleanObjectDatas($object->lines[$i]);
+			}
+		}
 
-        // Other attributes to clean
-        $attr2clean = array(
-            "contact",
-            "contact_id",
-            "ref_previous",
-            "ref_next",
-            "ref_ext",
-            "table_element_line",
-            "statut",
-            "country",
-            "country_id",
-            "country_code",
-            "barcode_type",
-            "barcode_type_code",
-            "barcode_type_label",
-            "barcode_type_coder",
-            "mode_reglement_id",
-            "cond_reglement_id",
-            "cond_reglement",
-            "fk_delivery_address",
-            "shipping_method_id",
-            "modelpdf",
-            "fk_account",
-            "note_public",
-            "note_private",
-            "note",
-            "total_ht",
-            "total_tva",
-            "total_localtax1",
-            "total_localtax2",
-            "total_ttc",
-            "fk_incoterms",
-            "label_incoterms",
-            "location_incoterms",
-            "name",
-            "lastname",
-            "firstname",
-            "civility_id",
-        	"canvas",
-            "cache_msgs_ticket",
-            "cache_logs_ticket",
-        	"cache_types_tickets",
-        	"cache_category_tickets",
-        	"regeximgext",
-            "statuts_short",
-            "statuts"
-        );
-        foreach ($attr2clean as $toclean) {
-            unset($object->$toclean);
-        }
-
-        // If object has lines, remove $db property
-        if (isset($object->lines) && count($object->lines) > 0) {
-            $nboflines = count($object->lines);
-            for ($i = 0; $i < $nboflines; $i++) {
-                $this->_cleanObjectDatas($object->lines[$i]);
-            }
-        }
-
-        // If object has linked objects, remove $db property
-        if (isset($object->linkedObjects) && count($object->linkedObjects) > 0) {
-            foreach ($object->linkedObjects as $type_object => $linked_object) {
-                foreach ($linked_object as $object2clean) {
-                    $this->_cleanObjectDatas($object2clean);
-                }
-            }
-        }
-        return $object;
-    }
+		// If object has linked objects, remove $db property
+		if (isset($object->linkedObjects) && count($object->linkedObjects) > 0) {
+			foreach ($object->linkedObjects as $type_object => $linked_object) {
+				foreach ($linked_object as $object2clean) {
+					$this->_cleanObjectDatas($object2clean);
+				}
+			}
+		}
+		return $object;
+	}
 }
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 2264fb3d9ee..e5818fa7762 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2018 Jean-François Ferry <hello@librethic.io>
  * Copyright (C) 2016      Christophe Battarel <christophe@altairis.fr>
- * Copyright (C) 2019      Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2020 Frédéric France     <frederic.france@netlogic.fr>
  * Copyright (C) 2020      Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -108,8 +108,13 @@ class Ticket extends CommonObject
 
 	/**
 	 * @var int  Ticket statut
+	 * @deprecated
+	 */
+	public $fk_statut;
+
+	/**
+	 * @var int  Ticket status
 	 */
-	public $fk_statut; // deprecated
 	public $status;
 
 	/**
@@ -143,7 +148,27 @@ class Ticket extends CommonObject
 	public $severity_code;
 
 	/**
-	 * @var int Création date
+	 * Type label
+	 */
+	public $type_label;
+
+	/**
+	 * Category label
+	 */
+	public $category_label;
+
+	/**
+	 * Severity label
+	 */
+	public $severity_label;
+
+	/**
+	 * Email from user
+	 */
+	public $email_from;
+
+	/**
+	 * @var int Creation date
 	 */
 	public $datec = '';
 
@@ -168,10 +193,13 @@ class Ticket extends CommonObject
 	public $cache_category_tickets;
 
 	/**
-	 * @var int Notify tiers at create
+	 * @var int Notify thirdparty at create
 	 */
 	public $notify_tiers_at_create;
 
+	/**
+	 * @var string msgid
+	 */
 	public $email_msgid;
 
 	public $lines;
@@ -208,7 +236,7 @@ class Ticket extends CommonObject
 	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
-	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
+	 *  'css' and 'cssview' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. For example: 'maxwidth200', 'wordbreak'
 	 *  'help' is a string visible as a tooltip on field
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
@@ -237,7 +265,7 @@ class Ticket extends CommonObject
 		'timing' => array('type'=>'varchar(20)', 'label'=>'Timing', 'visible'=>-1, 'enabled'=>1, 'position'=>42, 'notnull'=>-1, 'help'=>""),
 		'datec' => array('type'=>'datetime', 'label'=>'DateCreation', 'visible'=>1, 'enabled'=>1, 'position'=>500, 'notnull'=>1),
 		'date_read' => array('type'=>'datetime', 'label'=>'TicketReadOn', 'visible'=>1, 'enabled'=>1, 'position'=>501, 'notnull'=>1),
-		'fk_user_assign' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'AssignedTo', 'visible'=>1, 'enabled'=>1, 'position'=>505, 'notnull'=>1),
+		'fk_user_assign' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'AssignedTo', 'visible'=>1, 'enabled'=>1, 'position'=>505, 'notnull'=>1, 'css'=>'tdoverflowmax150'),
 		'date_close' => array('type'=>'datetime', 'label'=>'TicketCloseOn', 'visible'=>-1, 'enabled'=>1, 'position'=>510, 'notnull'=>1),
 		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'visible'=>-1, 'enabled'=>1, 'position'=>520, 'notnull'=>1),
 		'message' => array('type'=>'text', 'label'=>'Message', 'visible'=>-2, 'enabled'=>1, 'position'=>540, 'notnull'=>-1,),
@@ -259,8 +287,26 @@ class Ticket extends CommonObject
 	{
 		$this->db = $db;
 
-		$this->statuts_short = array(self::STATUS_NOT_READ => 'Unread', self::STATUS_READ => 'Read', self::STATUS_ASSIGNED => 'Assigned', self::STATUS_IN_PROGRESS => 'InProgress', self::STATUS_NEED_MORE_INFO => 'NeedMoreInformation', self::STATUS_WAITING => 'Suspended', self::STATUS_CLOSED => 'Closed', self::STATUS_CANCELED => 'Canceled');
-		$this->statuts       = array(self::STATUS_NOT_READ => 'Unread', self::STATUS_READ => 'Read', self::STATUS_ASSIGNED => 'Assigned', self::STATUS_IN_PROGRESS => 'InProgress', self::STATUS_NEED_MORE_INFO => 'NeedMoreInformation', self::STATUS_WAITING => 'Suspended', self::STATUS_CLOSED => 'Closed', self::STATUS_CANCELED => 'Canceled');
+		$this->statuts_short = array(
+			self::STATUS_NOT_READ => 'Unread',
+			self::STATUS_READ => 'Read',
+			self::STATUS_ASSIGNED => 'Assigned',
+			self::STATUS_IN_PROGRESS => 'InProgress',
+			self::STATUS_NEED_MORE_INFO => 'NeedMoreInformation',
+			self::STATUS_WAITING => 'Suspended',
+			self::STATUS_CLOSED => 'Closed',
+			self::STATUS_CANCELED => 'Canceled'
+		);
+		$this->statuts = array(
+			self::STATUS_NOT_READ => 'Unread',
+			self::STATUS_READ => 'Read',
+			self::STATUS_ASSIGNED => 'Assigned',
+			self::STATUS_IN_PROGRESS => 'InProgress',
+			self::STATUS_NEED_MORE_INFO => 'NeedMoreInformation',
+			self::STATUS_WAITING => 'Suspended',
+			self::STATUS_CLOSED => 'Closed',
+			self::STATUS_CANCELED => 'Canceled'
+		);
 	}
 
 	/**
@@ -1033,12 +1079,12 @@ class Ticket extends CommonObject
 	 *     Initialise object with example values
 	 *     Id must be 0 if object instance is a specimen
 	 *
-	 *     @return void
+	 *     @return int
 	 */
 	public function initAsSpecimen()
 	{
 		$this->id = 0;
-
+		$this->entity = 1;
 		$this->ref = 'TI0501-001';
 		$this->track_id = 'XXXXaaaa';
 		$this->origin_email = 'email@email.com';
@@ -1047,7 +1093,7 @@ class Ticket extends CommonObject
 		$this->fk_user_assign = 1;
 		$this->subject = 'Subject of ticket';
 		$this->message = 'Message of ticket';
-		$this->fk_statut = 0;
+		$this->status = 0;
 		$this->resolution = '1';
 		$this->progress = '10';
 		$this->timing = '30';
@@ -1058,6 +1104,7 @@ class Ticket extends CommonObject
 		$this->date_read = '';
 		$this->date_close = '';
 		$this->tms = '';
+		return 1;
 	}
 
 	/**
@@ -1269,7 +1316,8 @@ class Ticket extends CommonObject
 
 		$result = '';
 
-		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Ticket").'</u>';
+		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Ticket").'</u>';
+		$label .= ' '.$this->getLibStatut(4);
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref.'<br>';
 		$label .= '<b>'.$langs->trans('TicketTrackId').':</b> '.$this->track_id.'<br>';
@@ -1467,7 +1515,7 @@ class Ticket extends CommonObject
 				$message .= $langs->transnoentities('TicketNotificationRecipient').' : '.$recipient."\n";
 				$message .= "\n";
 				$message .= '* '.$langs->transnoentities('TicketNotificationLogMessage').' *'."\n";
-				$message .= dol_html_entity_decode($log_message, ENT_QUOTES)."\n";
+				$message .= dol_html_entity_decode($log_message, ENT_QUOTES | ENT_HTML5)."\n";
 
 				if ($info_sendto['source'] == 'internal') {
 					$url_internal_ticket = dol_buildpath('/ticket/card.php', 2).'?track_id='.$this->track_id;
@@ -1495,6 +1543,8 @@ class Ticket extends CommonObject
 					$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 				}
 				include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+				$sendtocc = '';
+				$deliveryreceipt = 0;
 				$mailfile = new CMailFile($subject, $info_sendto['email'], $from, $message, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, 0);
 				if ($mailfile->error || $mailfile->errors) {
 					setEventMessages($mailfile->error, $mailfile->errors, 'errors');
@@ -2937,6 +2987,21 @@ class Ticket extends CommonObject
 			return -1;
 		}
 	}
+
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB 	$db 			Database handler
+	 * @param int 		$origin_id 		Old thirdparty id
+	 * @param int 		$dest_id 		New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty($db, $origin_id, $dest_id)
+	{
+		$tables = array('ticket');
+
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
 }
 
 
diff --git a/htdocs/ticket/class/ticketstats.class.php b/htdocs/ticket/class/ticketstats.class.php
index f2fd2155247..588037a6d2f 100644
--- a/htdocs/ticket/class/ticketstats.class.php
+++ b/htdocs/ticket/class/ticketstats.class.php
@@ -29,136 +29,136 @@ require_once 'ticket.class.php';
  */
 class TicketStats extends Stats
 {
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element;
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element;
 
-    public $socid;
-    public $userid;
+	public $socid;
+	public $userid;
 
-    public $from;
-    public $field;
-    public $where;
+	public $from;
+	public $field;
+	public $where;
 
-    /**
-     * Constructor
-     *
-     * @param  DoliDB $db     Database handler
-     * @param  int    $socid  Id third party
-     * @param  mixed  $userid Id user for filter or array of user ids
-     * @return void
-     */
-    public function __construct($db, $socid = 0, $userid = 0)
-    {
-        global $conf;
+	/**
+	 * Constructor
+	 *
+	 * @param  DoliDB $db     Database handler
+	 * @param  int    $socid  Id third party
+	 * @param  mixed  $userid Id user for filter or array of user ids
+	 * @return void
+	 */
+	public function __construct($db, $socid = 0, $userid = 0)
+	{
+		global $conf;
 
-        $this->db = $db;
-        $this->socid = $socid;
-        $this->userid = $userid;
+		$this->db = $db;
+		$this->socid = $socid;
+		$this->userid = $userid;
 
-        $object = new Ticket($this->db);
-        $this->from = MAIN_DB_PREFIX.$object->table_element;
-        $this->field = 'timing';
+		$object = new Ticket($this->db);
+		$this->from = MAIN_DB_PREFIX.$object->table_element;
+		$this->field = 'timing';
 
-        $this->where = " fk_statut > 0";
-        $this->where .= " AND entity = ".$conf->entity;
-        if ($this->socid > 0) {
-            $this->where .= " AND fk_soc = ".$this->socid;
-        }
-        if (is_array($this->userid) && count($this->userid) > 0) {
-            $this->where .= ' AND fk_user_create IN ('.join(',', $this->userid).')';
-        } elseif ($this->userid > 0) {
-            $this->where .= ' AND fk_user_create = '.$this->userid;
-        }
-    }
+		$this->where = " fk_statut > 0";
+		$this->where .= " AND entity = ".$conf->entity;
+		if ($this->socid > 0) {
+			$this->where .= " AND fk_soc = ".$this->socid;
+		}
+		if (is_array($this->userid) && count($this->userid) > 0) {
+			$this->where .= ' AND fk_user_create IN ('.join(',', $this->userid).')';
+		} elseif ($this->userid > 0) {
+			$this->where .= ' AND fk_user_create = '.$this->userid;
+		}
+	}
 
-    /**
-     *     Renvoie le nombre de tickets par annee
-     *
-     *    @return array    Array of values
-     */
-    public function getNbByYear()
-    {
-        $sql = "SELECT YEAR(datec) as dm, count(*)";
-        $sql .= " FROM ".$this->from;
-        $sql .= " GROUP BY dm DESC";
-        $sql .= " WHERE ".$this->where;
+	/**
+	 *     Renvoie le nombre de tickets par annee
+	 *
+	 *    @return array    Array of values
+	 */
+	public function getNbByYear()
+	{
+		$sql = "SELECT YEAR(datec) as dm, count(*)";
+		$sql .= " FROM ".$this->from;
+		$sql .= " GROUP BY dm DESC";
+		$sql .= " WHERE ".$this->where;
 
-        return $this->_getNbByYear($sql);
-    }
+		return $this->_getNbByYear($sql);
+	}
 
-    /**
-     *     Renvoie le nombre de facture par mois pour une annee donnee
-     *
-     *    @param  string $year Year to scan
-     *    @return array            Array of values
-     */
-    public function getNbByMonth($year)
-    {
-        $sql = "SELECT MONTH(datec) as dm, count(*)";
-        $sql .= " FROM ".$this->from;
-        $sql .= " WHERE YEAR(datec) = ".$year;
-        $sql .= " AND ".$this->where;
-        $sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+	/**
+	 *     Renvoie le nombre de facture par mois pour une annee donnee
+	 *
+	 *    @param  string $year Year to scan
+	 *    @return array            Array of values
+	 */
+	public function getNbByMonth($year)
+	{
+		$sql = "SELECT MONTH(datec) as dm, count(*)";
+		$sql .= " FROM ".$this->from;
+		$sql .= " WHERE YEAR(datec) = ".$year;
+		$sql .= " AND ".$this->where;
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
 
-        $res = $this->_getNbByMonth($year, $sql);
-        //var_dump($res);print '<br>';
-        return $res;
-    }
+		$res = $this->_getNbByMonth($year, $sql);
+		//var_dump($res);print '<br>';
+		return $res;
+	}
 
-    /**
-     *     Renvoie le montant de facture par mois pour une annee donnee
-     *
-     *    @param  int $year Year to scan
-     *    @return array                Array of values
-     */
-    public function getAmountByMonth($year)
-    {
-        $sql = "SELECT date_format(datec,'%m') as dm, sum(".$this->field.")";
-        $sql .= " FROM ".$this->from;
-        $sql .= " WHERE date_format(datec,'%Y') = '".$this->db->escape($year)."'";
-        $sql .= " AND ".$this->where;
-        $sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+	/**
+	 *     Renvoie le montant de facture par mois pour une annee donnee
+	 *
+	 *    @param  int $year Year to scan
+	 *    @return array                Array of values
+	 */
+	public function getAmountByMonth($year)
+	{
+		$sql = "SELECT date_format(datec,'%m') as dm, sum(".$this->field.")";
+		$sql .= " FROM ".$this->from;
+		$sql .= " WHERE date_format(datec,'%Y') = '".$this->db->escape($year)."'";
+		$sql .= " AND ".$this->where;
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
 
-        $res = $this->_getAmountByMonth($year, $sql);
-        //var_dump($res);print '<br>';
-        return $res;
-    }
+		$res = $this->_getAmountByMonth($year, $sql);
+		//var_dump($res);print '<br>';
+		return $res;
+	}
 
-    /**
-     *    Return average amount
-     *
-     *    @param  int $year Year to scan
-     *    @return array                Array of values
-     */
-    public function getAverageByMonth($year)
-    {
-        $sql = "SELECT date_format(datec,'%m') as dm, avg(".$this->field.")";
-        $sql .= " FROM ".$this->from;
-        $sql .= " WHERE date_format(datec,'%Y') = '".$this->db->escape($year)."'";
-        $sql .= " AND ".$this->where;
-        $sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+	/**
+	 *    Return average amount
+	 *
+	 *    @param  int $year Year to scan
+	 *    @return array                Array of values
+	 */
+	public function getAverageByMonth($year)
+	{
+		$sql = "SELECT date_format(datec,'%m') as dm, avg(".$this->field.")";
+		$sql .= " FROM ".$this->from;
+		$sql .= " WHERE date_format(datec,'%Y') = '".$this->db->escape($year)."'";
+		$sql .= " AND ".$this->where;
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
 
-        return $this->_getAverageByMonth($year, $sql);
-    }
+		return $this->_getAverageByMonth($year, $sql);
+	}
 
-    /**
-     *    Return nb, total and average
-     *
-     *    @return array                Array of values
-     */
-    public function getAllByYear()
-    {
-        $sql = "SELECT date_format(datec,'%Y') as year, count(*) as nb, sum(".$this->field.") as total, avg(".$this->field.") as avg";
-        $sql .= " FROM ".$this->from;
-        $sql .= " WHERE ".$this->where;
-        $sql .= " GROUP BY year";
-        $sql .= $this->db->order('year', 'DESC');
+	/**
+	 *    Return nb, total and average
+	 *
+	 *    @return array                Array of values
+	 */
+	public function getAllByYear()
+	{
+		$sql = "SELECT date_format(datec,'%Y') as year, count(*) as nb, sum(".$this->field.") as total, avg(".$this->field.") as avg";
+		$sql .= " FROM ".$this->from;
+		$sql .= " WHERE ".$this->where;
+		$sql .= " GROUP BY year";
+		$sql .= $this->db->order('year', 'DESC');
 
-        return $this->_getAllByYear($sql);
-    }
+		return $this->_getAllByYear($sql);
+	}
 }
diff --git a/htdocs/ticket/class/utils_diff.class.php b/htdocs/ticket/class/utils_diff.class.php
index 84075d395ab..6edccdfa0ff 100644
--- a/htdocs/ticket/class/utils_diff.class.php
+++ b/htdocs/ticket/class/utils_diff.class.php
@@ -22,17 +22,17 @@ class Diff
 
 	/**
 	 * Returns the diff for two strings. The return value is an array, each of
-     * whose values is an array containing two values: a line (or character, if
-     * $compareCharacters is true), and one of the constants DIFF::UNMODIFIED (the
-     * line or character is in both strings), DIFF::DELETED (the line or character
-     * is only in the first string), and DIFF::INSERTED (the line or character is
-     * only in the second string). The parameters are:
-     *
-     * @param	string	$string1            First string
-     * @param	string	$string2            Second string
-     * @param	string	$compareCharacters  true to compare characters, and false to compare lines; this optional parameter defaults to false
-     * @return	array						Array of diff
-     */
+	 * whose values is an array containing two values: a line (or character, if
+	 * $compareCharacters is true), and one of the constants DIFF::UNMODIFIED (the
+	 * line or character is in both strings), DIFF::DELETED (the line or character
+	 * is only in the first string), and DIFF::INSERTED (the line or character is
+	 * only in the second string). The parameters are:
+	 *
+	 * @param	string	$string1            First string
+	 * @param	string	$string2            Second string
+	 * @param	string	$compareCharacters  true to compare characters, and false to compare lines; this optional parameter defaults to false
+	 * @return	array						Array of diff
+	 */
 	public static function compare($string1, $string2, $compareCharacters = false)
 	{
 		// initialise the sequences and comparison start and end positions
@@ -89,12 +89,12 @@ class Diff
 
 	/**
 	 * Returns the diff for two files. The parameters are:
-     *
-     * @param	string	$file1              Path to the first file
-     * @param	string	$file2              Path to the second file
-     * @param	boolean	$compareCharacters  true to compare characters, and false to compare lines; this optional parameter defaults to false
-     * @return	array						Array of diff
-     */
+	 *
+	 * @param	string	$file1              Path to the first file
+	 * @param	string	$file2              Path to the second file
+	 * @param	boolean	$compareCharacters  true to compare characters, and false to compare lines; this optional parameter defaults to false
+	 * @return	array						Array of diff
+	 */
 	public static function compareFiles(
 		$file1,
 		$file2,
@@ -111,14 +111,14 @@ class Diff
 
 	/**
 	 * Returns the table of longest common subsequence lengths for the specified sequences. The parameters are:
-     *
-     * @param	string	$sequence1 	the first sequence
-     * @param	string	$sequence2 	the second sequence
-     * @param	string	$start     	the starting index
-     * @param	string	$end1      	the ending index for the first sequence
-     * @param	string	$end2      	the ending index for the second sequence
-     * @return	array				array of diff
-     */
+	 *
+	 * @param	string	$sequence1 	the first sequence
+	 * @param	string	$sequence2 	the second sequence
+	 * @param	string	$start     	the starting index
+	 * @param	string	$end1      	the ending index for the first sequence
+	 * @param	string	$end2      	the ending index for the second sequence
+	 * @return	array				array of diff
+	 */
 	private static function computeTable($sequence1, $sequence2, $start, $end1, $end2)
 	{
 		// determine the lengths to be compared
@@ -152,14 +152,14 @@ class Diff
 	/**
 	 * Returns the partial diff for the specificed sequences, in reverse order.
 	 * The parameters are:
-     *
-     * @param	string	$table     	the table returned by the computeTable function
-     * @param	string	$sequence1 	the first sequence
-     * @param	string	$sequence2 	the second sequence
-     * @param	string	$start     	the starting index
-     * @return	array				array of diff
-     */
-	private static function generatePartialDiff($table,	$sequence1,	$sequence2, $start)
+	 *
+	 * @param	string	$table     	the table returned by the computeTable function
+	 * @param	string	$sequence1 	the first sequence
+	 * @param	string	$sequence2 	the second sequence
+	 * @param	string	$start     	the starting index
+	 * @return	array				array of diff
+	 */
+	private static function generatePartialDiff($table, $sequence1, $sequence2, $start)
 	{
 		//  initialise the diff
 		$diff = array();
@@ -197,13 +197,13 @@ class Diff
 
 	/**
 	 * Returns a diff as a string, where unmodified lines are prefixed by '  ',
-     * deletions are prefixed by '- ', and insertions are prefixed by '+ '. The
-     * parameters are:
-     *
-     * @param	array	$diff      	the diff array
-     * @param	string	$separator 	the separator between lines; this optional parameter defaults to "\n"
-     * @return	string				String
-     */
+	 * deletions are prefixed by '- ', and insertions are prefixed by '+ '. The
+	 * parameters are:
+	 *
+	 * @param	array	$diff      	the diff array
+	 * @param	string	$separator 	the separator between lines; this optional parameter defaults to "\n"
+	 * @return	string				String
+	 */
 	public static function toString($diff, $separator = "\n")
 	{
 		// initialise the string
@@ -234,13 +234,13 @@ class Diff
 
 	/**
 	 * Returns a diff as an HTML string, where unmodified lines are contained
-     * within 'span' elements, deletions are contained within 'del' elements, and
-     * insertions are contained within 'ins' elements. The parameters are:
-     *
-     * @param	string	$diff      	the diff array
-     * @param	string	$separator 	the separator between lines; this optional parameter defaults to '<br>'
-     * @return	string				HTML string
-     */
+	 * within 'span' elements, deletions are contained within 'del' elements, and
+	 * insertions are contained within 'ins' elements. The parameters are:
+	 *
+	 * @param	string	$diff      	the diff array
+	 * @param	string	$separator 	the separator between lines; this optional parameter defaults to '<br>'
+	 * @return	string				HTML string
+	 */
 	public static function toHTML($diff, $separator = '<br>')
 	{
 		// initialise the HTML
@@ -275,12 +275,12 @@ class Diff
 
 	/**
 	 * Returns a diff as an HTML table. The parameters are:
-     *
-     * @param	string	$diff        	the diff array
-     * @param	string	$indentation 	indentation to add to every line of the generated HTML; this optional parameter defaults to ''
-     * @param	string	$separator   	the separator between lines; this optional parameter defaults to '<br>'
-     * @return	string					HTML string
-     */
+	 *
+	 * @param	string	$diff        	the diff array
+	 * @param	string	$indentation 	indentation to add to every line of the generated HTML; this optional parameter defaults to ''
+	 * @param	string	$separator   	the separator between lines; this optional parameter defaults to '<br>'
+	 * @return	string					HTML string
+	 */
 	public static function toTable($diff, $indentation = '', $separator = '<br>')
 	{
 		// initialise the HTML
@@ -364,15 +364,15 @@ class Diff
 
 	/**
 	 * Returns the content of the cell, for use in the toTable function. The
-     * parameters are:
-     *
-     * @param	string	$diff        	the diff array
-     * @param	string	$indentation 	indentation to add to every line of the generated HTML
-     * @param	string	$separator   	the separator between lines
-     * @param	string	$index       	the current index, passes by reference
-     * @param	string	$type        	the type of line
-     * @return	string					HTML string
-     */
+	 * parameters are:
+	 *
+	 * @param	string	$diff        	the diff array
+	 * @param	string	$indentation 	indentation to add to every line of the generated HTML
+	 * @param	string	$separator   	the separator between lines
+	 * @param	string	$index       	the current index, passes by reference
+	 * @param	string	$type        	the type of line
+	 * @return	string					HTML string
+	 */
 	private static function getCellContent($diff, $indentation, $separator, &$index, $type)
 	{
 		// initialise the HTML
diff --git a/htdocs/ticket/contact.php b/htdocs/ticket/contact.php
index fbb9ee291f1..13419cf795e 100644
--- a/htdocs/ticket/contact.php
+++ b/htdocs/ticket/contact.php
@@ -52,8 +52,8 @@ $lineid = GETPOST('lineid', 'int');
 
 // Protection if external user
 if ($user->socid > 0) {
-    $socid = $user->socid;
-    accessforbidden();
+	$socid = $user->socid;
+	accessforbidden();
 }
 
 // Store current page url
@@ -67,45 +67,46 @@ $object = new Ticket($db);
  */
 
 if ($action == 'addcontact' && $user->rights->ticket->write) {
-    $result = $object->fetch($id, '', $track_id);
+	$result = $object->fetch($id, '', $track_id);
 
-    if ($result > 0 && ($id > 0 || (!empty($track_id)))) {
-        $contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
-        $result = $object->add_contact($contactid, $type, $source);
-    }
+	if ($result > 0 && ($id > 0 || (!empty($track_id)))) {
+		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
+	}
 
-    if ($result >= 0) {
-        Header("Location: ".$url_page_current."?id=".$object->id);
-        exit;
-    } else {
-        if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-            $langs->load("errors");
-            setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-        } else {
-            setEventMessages($object->error, $object->errors, 'errors');
-        }
-    }
+	if ($result >= 0) {
+		Header("Location: ".$url_page_current."?id=".$object->id);
+		exit;
+	} else {
+		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+			$langs->load("errors");
+			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
 }
 
 // bascule du statut d'un contact
 if ($action == 'swapstatut' && $user->rights->ticket->write) {
-    if ($object->fetch($id, '', $track_id)) {
-        $result = $object->swapContactStatus($ligne);
-    } else {
-        dol_print_error($db, $object->error);
-    }
+	if ($object->fetch($id, '', $track_id)) {
+		$result = $object->swapContactStatus($ligne);
+	} else {
+		dol_print_error($db, $object->error);
+	}
 }
 
 // Efface un contact
 if ($action == 'deletecontact' && $user->rights->ticket->write) {
-    if ($object->fetch($id, '', $track_id)) {
-        $result = $object->delete_contact($lineid);
+	if ($object->fetch($id, '', $track_id)) {
+		$result = $object->delete_contact($lineid);
 
-        if ($result >= 0) {
-            Header("Location: ".$url_page_current."?id=".$object->id);
-            exit;
-        }
-    }
+		if ($result >= 0) {
+			Header("Location: ".$url_page_current."?id=".$object->id);
+			exit;
+		}
+	}
 }
 
 
@@ -124,112 +125,112 @@ $userstatic = new User($db);
 
 if ($id > 0 || !empty($track_id) || !empty($ref)) {
 	if ($object->fetch($id, $ref, $track_id) > 0)
-    {
-        if ($socid > 0) {
-            $object->fetch_thirdparty();
-            $head = societe_prepare_head($object->thirdparty);
-            dol_fiche_head($head, 'ticket', $langs->trans("ThirdParty"), 0, 'company');
-            dol_banner_tab($object->thirdparty, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
-            dol_fiche_end();
-        }
+	{
+		if ($socid > 0) {
+			$object->fetch_thirdparty();
+			$head = societe_prepare_head($object->thirdparty);
+			print dol_get_fiche_head($head, 'ticket', $langs->trans("ThirdParty"), 0, 'company');
+			dol_banner_tab($object->thirdparty, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
+			print dol_get_fiche_end();
+		}
 
-        if (!$user->socid && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) {
-            $object->next_prev_filter = "te.fk_user_assign = '".$user->id."'";
-        } elseif ($user->socid > 0) {
-            $object->next_prev_filter = "te.fk_soc = '".$user->socid."'";
-        }
+		if (!$user->socid && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) {
+			$object->next_prev_filter = "te.fk_user_assign = '".$user->id."'";
+		} elseif ($user->socid > 0) {
+			$object->next_prev_filter = "te.fk_soc = '".$user->socid."'";
+		}
 
-        $head = ticket_prepare_head($object);
+		$head = ticket_prepare_head($object);
 
-        dol_fiche_head($head, 'contact', $langs->trans("Ticket"), -1, 'ticket');
+		print dol_get_fiche_head($head, 'contact', $langs->trans("Ticket"), -1, 'ticket');
 
-        $morehtmlref = '<div class="refidno">';
-        $morehtmlref .= $object->subject;
-        // Author
-        if ($object->fk_user_create > 0) {
-        	$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
+		$morehtmlref = '<div class="refidno">';
+		$morehtmlref .= $object->subject;
+		// Author
+		if ($object->fk_user_create > 0) {
+			$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
 
-        	$langs->load("users");
-        	$fuser = new User($db);
-        	$fuser->fetch($object->fk_user_create);
-        	$morehtmlref .= $fuser->getNomUrl(0);
-        }
-        if (!empty($object->origin_email)) {
-        	$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
-        	$morehtmlref .= $object->origin_email.' <small>('.$langs->trans("TicketEmailOriginIssuer").')</small>';
-        }
+			$langs->load("users");
+			$fuser = new User($db);
+			$fuser->fetch($object->fk_user_create);
+			$morehtmlref .= $fuser->getNomUrl(0);
+		}
+		if (!empty($object->origin_email)) {
+			$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
+			$morehtmlref .= $object->origin_email.' <small>('.$langs->trans("TicketEmailOriginIssuer").')</small>';
+		}
 
-        // Thirdparty
-        if (!empty($conf->societe->enabled))
-        {
-        	$morehtmlref .= '<br>'.$langs->trans('ThirdParty');
-        	/*if ($action != 'editcustomer' && $object->fk_statut < 8 && !$user->socid && $user->rights->ticket->write) {
+		// Thirdparty
+		if (!empty($conf->societe->enabled))
+		{
+			$morehtmlref .= '<br>'.$langs->trans('ThirdParty');
+			/*if ($action != 'editcustomer' && $object->fk_statut < 8 && !$user->socid && $user->rights->ticket->write) {
         		$morehtmlref.='<a class="editfielda" href="' . $url_page_current . '?action=editcustomer&amp;track_id=' . $object->track_id . '">' . img_edit($langs->transnoentitiesnoconv('Edit'), 1) . '</a>';
         	}*/
-        	$morehtmlref .= ' : ';
-        	if ($action == 'editcustomer') {
-        		$morehtmlref .= $form->form_thirdparty($url_page_current.'?track_id='.$object->track_id, $object->socid, 'editcustomer', '', 1, 0, 0, array(), 1);
-        	} else {
-        		$morehtmlref .= $form->form_thirdparty($url_page_current.'?track_id='.$object->track_id, $object->socid, 'none', '', 1, 0, 0, array(), 1);
-        	}
-        }
+			$morehtmlref .= ' : ';
+			if ($action == 'editcustomer') {
+				$morehtmlref .= $form->form_thirdparty($url_page_current.'?track_id='.$object->track_id, $object->socid, 'editcustomer', '', 1, 0, 0, array(), 1);
+			} else {
+				$morehtmlref .= $form->form_thirdparty($url_page_current.'?track_id='.$object->track_id, $object->socid, 'none', '', 1, 0, 0, array(), 1);
+			}
+		}
 
-        // Project
-        if (!empty($conf->projet->enabled))
-        {
-        	$langs->load("projects");
-        	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-        	if ($user->rights->ticket->write)
-        	{
-        		if ($action != 'classify') {
-        			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+		// Project
+		if (!empty($conf->projet->enabled))
+		{
+			$langs->load("projects");
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+			if ($user->rights->ticket->write)
+			{
+				if ($action != 'classify') {
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
 					$morehtmlref .= ' : ';
 				}
-        		if ($action == 'classify') {
-        			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-        			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-        			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
-        			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-        			$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1);
-        			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-        			$morehtmlref .= '</form>';
-        		} else {
-        			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-        		}
-        	} else {
-        		if (!empty($object->fk_project)) {
-        			$proj = new Project($db);
-        			$proj->fetch($object->fk_project);
-        			$morehtmlref .= $proj->getNomUrl(1);
-        		} else {
-        			$morehtmlref .= '';
-        		}
-        	}
-        }
+				if ($action == 'classify') {
+					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				if (!empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref .= $proj->getNomUrl(1);
+				} else {
+					$morehtmlref .= '';
+				}
+			}
+		}
 
-        $morehtmlref .= '</div>';
+		$morehtmlref .= '</div>';
 
-        $linkback = '<a href="'.dol_buildpath('/ticket/list.php', 1).'"><strong>'.$langs->trans("BackToList").'</strong></a> ';
+		$linkback = '<a href="'.dol_buildpath('/ticket/list.php', 1).'"><strong>'.$langs->trans("BackToList").'</strong></a> ';
 
-        dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref', 'ref', $morehtmlref, $param, 0, '', '', 1, '');
+		dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref', 'ref', $morehtmlref, $param, 0, '', '', 1, '');
 
-        dol_fiche_end();
+		print dol_get_fiche_end();
 
-        //print '<br>';
+		//print '<br>';
 
-        $permission = $user->rights->ticket->write;
+		$permission = $user->rights->ticket->write;
 
-        // Contacts lines (modules that overwrite templates must declare this into descriptor)
-        $dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
-        foreach ($dirtpls as $reldir) {
-            $res = @include dol_buildpath($reldir.'/contacts.tpl.php');
-            if ($res) {
-            	break;
-            }
-        }
-    } else {
-        print "ErrorRecordNotFound";
-    }
+		// Contacts lines (modules that overwrite templates must declare this into descriptor)
+		$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
+		foreach ($dirtpls as $reldir) {
+			$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
+			if ($res) {
+				break;
+			}
+		}
+	} else {
+		print "ErrorRecordNotFound";
+	}
 }
 
 // End of page
diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php
index e37db95c23d..45ee7aba268 100644
--- a/htdocs/ticket/document.php
+++ b/htdocs/ticket/document.php
@@ -44,7 +44,7 @@ $confirm  = GETPOST('confirm', 'alpha');
 
 // Security check
 if (!$user->rights->ticket->read) {
-    accessforbidden();
+	accessforbidden();
 }
 
 // Get parameters
@@ -65,7 +65,7 @@ $result = $object->fetch($id, $ref, $track_id);
 if ($result < 0) {
 	setEventMessages($object->error, $object->errors, 'errors');
 } else {
-    $upload_dir = $conf->ticket->dir_output."/".dol_sanitizeFileName($object->ref);
+	$upload_dir = $conf->ticket->dir_output."/".dol_sanitizeFileName($object->ref);
 }
 
 
@@ -91,112 +91,112 @@ if ($object->id)
 	/*
 	 * Show tabs
 	 */
-    if ($socid > 0) {
-        $object->fetch_thirdparty();
-        $head = societe_prepare_head($object->thirdparty);
-        dol_fiche_head($head, 'ticket', $langs->trans("ThirdParty"), 0, 'company');
-        dol_banner_tab($object->thirdparty, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
-        dol_fiche_end();
-    }
+	if ($socid > 0) {
+		$object->fetch_thirdparty();
+		$head = societe_prepare_head($object->thirdparty);
+		print dol_get_fiche_head($head, 'ticket', $langs->trans("ThirdParty"), 0, 'company');
+		dol_banner_tab($object->thirdparty, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
+		print dol_get_fiche_end();
+	}
 
-    if (!$user->socid && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) {
-        $object->next_prev_filter = "te.fk_user_assign = '".$user->id."'";
-    } elseif ($user->socid > 0) {
-        $object->next_prev_filter = "te.fk_soc = '".$user->socid."'";
-    }
+	if (!$user->socid && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) {
+		$object->next_prev_filter = "te.fk_user_assign = '".$user->id."'";
+	} elseif ($user->socid > 0) {
+		$object->next_prev_filter = "te.fk_soc = '".$user->socid."'";
+	}
 
-    $head = ticket_prepare_head($object);
+	$head = ticket_prepare_head($object);
 
-    dol_fiche_head($head, 'tabTicketDocument', $langs->trans("Ticket"), 0, 'ticket');
+	print dol_get_fiche_head($head, 'tabTicketDocument', $langs->trans("Ticket"), 0, 'ticket');
 
-    $morehtmlref = '<div class="refidno">';
-    $morehtmlref .= $object->subject;
-    // Author
-    if ($object->fk_user_create > 0) {
-    	$morehtmlref .= '<br>'.$langs->trans("CreatedBy").'  : ';
+	$morehtmlref = '<div class="refidno">';
+	$morehtmlref .= $object->subject;
+	// Author
+	if ($object->fk_user_create > 0) {
+		$morehtmlref .= '<br>'.$langs->trans("CreatedBy").'  : ';
 
-    	$langs->load("users");
-    	$fuser = new User($db);
-    	$fuser->fetch($object->fk_user_create);
-    	$morehtmlref .= $fuser->getNomUrl(0);
-    }
-    if (!empty($object->origin_email)) {
-    	$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
-    	$morehtmlref .= $object->origin_email.' <small>('.$langs->trans("TicketEmailOriginIssuer").')</small>';
-    }
+		$langs->load("users");
+		$fuser = new User($db);
+		$fuser->fetch($object->fk_user_create);
+		$morehtmlref .= $fuser->getNomUrl(0);
+	}
+	if (!empty($object->origin_email)) {
+		$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
+		$morehtmlref .= $object->origin_email.' <small>('.$langs->trans("TicketEmailOriginIssuer").')</small>';
+	}
 
-    // Thirdparty
-    if (!empty($conf->societe->enabled))
-    {
-    	$morehtmlref .= '<br>'.$langs->trans('ThirdParty');
-    	/*if ($action != 'editcustomer' && $object->fk_statut < 8 && !$user->socid && $user->rights->ticket->write) {
+	// Thirdparty
+	if (!empty($conf->societe->enabled))
+	{
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty');
+		/*if ($action != 'editcustomer' && $object->fk_statut < 8 && !$user->socid && $user->rights->ticket->write) {
     		$morehtmlref.='<a class="editfielda" href="' . $url_page_current . '?action=editcustomer&amp;track_id=' . $object->track_id . '">' . img_edit($langs->transnoentitiesnoconv('Edit'), 1) . '</a>';
     	}*/
-    	$morehtmlref .= ' : ';
-    	if ($action == 'editcustomer') {
-    		$morehtmlref .= $form->form_thirdparty($url_page_current.'?track_id='.$object->track_id, $object->socid, 'editcustomer', '', 1, 0, 0, array(), 1);
-    	} else {
-    		$morehtmlref .= $form->form_thirdparty($url_page_current.'?track_id='.$object->track_id, $object->socid, 'none', '', 1, 0, 0, array(), 1);
-    	}
-    }
+		$morehtmlref .= ' : ';
+		if ($action == 'editcustomer') {
+			$morehtmlref .= $form->form_thirdparty($url_page_current.'?track_id='.$object->track_id, $object->socid, 'editcustomer', '', 1, 0, 0, array(), 1);
+		} else {
+			$morehtmlref .= $form->form_thirdparty($url_page_current.'?track_id='.$object->track_id, $object->socid, 'none', '', 1, 0, 0, array(), 1);
+		}
+	}
 
-    // Project
-    if (!empty($conf->projet->enabled))
-    {
-    	$langs->load("projects");
-    	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-    	if ($user->rights->ticket->write)
-    	{
-    		if ($action != 'classify') {
-    			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+	// Project
+	if (!empty($conf->projet->enabled))
+	{
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->ticket->write)
+		{
+			if ($action != 'classify') {
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
 				$morehtmlref .= ' : ';
 			}
-    		if ($action == 'classify') {
-    			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-    			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-    			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
-    			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-    			$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1);
-    			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-    			$morehtmlref .= '</form>';
-    		} else {
-    			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-    		}
-    	} else {
-    		if (!empty($object->fk_project)) {
-    			$proj = new Project($db);
-    			$proj->fetch($object->fk_project);
-    			$morehtmlref .= $proj->getNomUrl(1);
-    		} else {
-    			$morehtmlref .= '';
-    		}
-    	}
-    }
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= $proj->getNomUrl(1);
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
 
-    $morehtmlref .= '</div>';
+	$morehtmlref .= '</div>';
 
-    $linkback = '<a href="'.dol_buildpath('/ticket/list.php', 1).'"><strong>'.$langs->trans("BackToList").'</strong></a> ';
+	$linkback = '<a href="'.dol_buildpath('/ticket/list.php', 1).'"><strong>'.$langs->trans("BackToList").'</strong></a> ';
 
-    dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
+	dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    // Build file list
-    $filearray = dol_dir_list($upload_dir, "files", 0, '', '\.meta$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);
-    $totalsize = 0;
-    foreach ($filearray as $key => $file) {
-        $totalsize += $file['size'];
-    }
+	// Build file list
+	$filearray = dol_dir_list($upload_dir, "files", 0, '', '\.meta$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);
+	$totalsize = 0;
+	foreach ($filearray as $key => $file) {
+		$totalsize += $file['size'];
+	}
 
-    //$object->ref = $object->track_id;	// For compatibility we use track ID for directory
-    $modulepart = 'ticket';
+	//$object->ref = $object->track_id;	// For compatibility we use track ID for directory
+	$modulepart = 'ticket';
   	$permission = $user->rights->ticket->write;
   	$permtoedit = $user->rights->ticket->write;
   	$param = '&id='.$object->id;
 
   	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
-    accessforbidden('', 0, 1);
+	accessforbidden('', 0, 1);
 }
 
 // End of page
diff --git a/htdocs/ticket/index.php b/htdocs/ticket/index.php
index a6d9ad3d0b0..52e10f78454 100644
--- a/htdocs/ticket/index.php
+++ b/htdocs/ticket/index.php
@@ -45,7 +45,7 @@ $msg_id = GETPOST('msg_id', 'int');
 $action = GETPOST('action', 'aZ09');
 
 if ($user->socid) {
-    $socid = $user->socid;
+	$socid = $user->socid;
 }
 
 // Security check
@@ -90,22 +90,22 @@ $param_shownb = 'DOLUSERCOOKIE_ticket_by_status_shownb';
 $param_showtot = 'DOLUSERCOOKIE_ticket_by_status_showtot';
 $autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
 if (in_array('DOLUSERCOOKIE_ticket_by_status', $autosetarray)) {
-    $endyear = GETPOST($param_year, 'int');
-    $shownb = GETPOST($param_shownb, 'alpha');
-    $showtot = GETPOST($param_showtot, 'alpha');
+	$endyear = GETPOST($param_year, 'int');
+	$shownb = GETPOST($param_shownb, 'alpha');
+	$showtot = GETPOST($param_showtot, 'alpha');
 } else {
-    $tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_ticket_by_status'], true);
-    $endyear = $tmparray['year'];
-    $shownb = $tmparray['shownb'];
-    $showtot = $tmparray['showtot'];
+	$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_ticket_by_status'], true);
+	$endyear = $tmparray['year'];
+	$shownb = $tmparray['shownb'];
+	$showtot = $tmparray['showtot'];
 }
 if (empty($shownb) && empty($showtot)) {
-    $showtot = 1;
+	$showtot = 1;
 }
 
 $nowarray = dol_getdate(dol_now(), true);
 if (empty($endyear)) {
-    $endyear = $nowarray['year'];
+	$endyear = $nowarray['year'];
 }
 
 $startyear = $endyear - 1;
@@ -118,92 +118,92 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
  * Statistics area
  */
 $tick = array(
-    'unread' => 0,
-    'read' => 0,
-    'answered' => 0,
-    'assigned' => 0,
-    'inprogress' => 0,
-    'waiting' => 0,
-    'closed' => 0,
-    'deleted' => 0,
+	'unread' => 0,
+	'read' => 0,
+	'answered' => 0,
+	'assigned' => 0,
+	'inprogress' => 0,
+	'waiting' => 0,
+	'closed' => 0,
+	'deleted' => 0,
 );
 
 $sql = "SELECT t.fk_statut, COUNT(t.fk_statut) as nb";
 $sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
 if (!$user->rights->societe->client->voir && !$socid) {
-    $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= ' WHERE t.entity IN ('.getEntity('ticket').')';
 $sql .= dolSqlDateFilter('datec', 0, 0, $endyear);
 
 if (!$user->rights->societe->client->voir && !$socid) {
-    $sql .= " AND t.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+	$sql .= " AND t.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 }
 
 // External users restriction
 if ($user->socid > 0) {
-    $sql .= " AND t.fk_soc= ".((int) $user->socid);
+	$sql .= " AND t.fk_soc= ".((int) $user->socid);
 } else {
-    // For internals users,
-    if (!empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) && !$user->rights->ticket->manage) {
-        $sql .= " AND t.fk_user_assign = ".$user->id;
-    }
+	// For internals users,
+	if (!empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) && !$user->rights->ticket->manage) {
+		$sql .= " AND t.fk_user_assign = ".$user->id;
+	}
 }
 $sql .= " GROUP BY t.fk_statut";
 
 $result = $db->query($sql);
 if ($result) {
-    while ($objp = $db->fetch_object($result)) {
-        $found = 0;
-        if ($objp->fk_statut == Ticket::STATUS_NOT_READ) {
-            $tick['unread'] = $objp->nb;
-        }
-        if ($objp->fk_statut == Ticket::STATUS_READ) {
-            $tick['read'] = $objp->nb;
-        }
-        if ($objp->fk_statut == Ticket::STATUS_NEED_MORE_INFO) {
-        	$tick['needmoreinfo'] = $objp->nb;
-        }
-        if ($objp->fk_statut == Ticket::STATUS_ASSIGNED) {
-            $tick['assigned'] = $objp->nb;
-        }
-        if ($objp->fk_statut == Ticket::STATUS_IN_PROGRESS) {
-            $tick['inprogress'] = $objp->nb;
-        }
-        if ($objp->fk_statut == Ticket::STATUS_WAITING) {
-            $tick['waiting'] = $objp->nb;
-        }
-        if ($objp->fk_statut == Ticket::STATUS_CLOSED) {
-            $tick['closed'] = $objp->nb;
-        }
-        if ($objp->fk_statut == Ticket::STATUS_CANCELED) {
-            $tick['canceled'] = $objp->nb;
-        }
-    }
+	while ($objp = $db->fetch_object($result)) {
+		$found = 0;
+		if ($objp->fk_statut == Ticket::STATUS_NOT_READ) {
+			$tick['unread'] = $objp->nb;
+		}
+		if ($objp->fk_statut == Ticket::STATUS_READ) {
+			$tick['read'] = $objp->nb;
+		}
+		if ($objp->fk_statut == Ticket::STATUS_NEED_MORE_INFO) {
+			$tick['needmoreinfo'] = $objp->nb;
+		}
+		if ($objp->fk_statut == Ticket::STATUS_ASSIGNED) {
+			$tick['assigned'] = $objp->nb;
+		}
+		if ($objp->fk_statut == Ticket::STATUS_IN_PROGRESS) {
+			$tick['inprogress'] = $objp->nb;
+		}
+		if ($objp->fk_statut == Ticket::STATUS_WAITING) {
+			$tick['waiting'] = $objp->nb;
+		}
+		if ($objp->fk_statut == Ticket::STATUS_CLOSED) {
+			$tick['closed'] = $objp->nb;
+		}
+		if ($objp->fk_statut == Ticket::STATUS_CANCELED) {
+			$tick['canceled'] = $objp->nb;
+		}
+	}
 
-    include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
+	include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
 
-    $dataseries = array();
-    $colorseries = array();
+	$dataseries = array();
+	$colorseries = array();
 
-    $dataseries[] = array('label' => $langs->trans("Unread"), 'data' => round($tick['unread']));
-    $colorseries[Ticket::STATUS_NOT_READ] = '-'.$badgeStatus0;
-    $dataseries[] = array('label' => $langs->trans("Read"), 'data' => round($tick['read']));
-    $colorseries[Ticket::STATUS_READ] = $badgeStatus1;
-    $dataseries[] = array('label' => $langs->trans("Assigned"), 'data' => round($tick['assigned']));
-    $colorseries[Ticket::STATUS_ASSIGNED] = $badgeStatus3;
-    $dataseries[] = array('label' => $langs->trans("InProgress"), 'data' => round($tick['inprogress']));
-    $colorseries[Ticket::STATUS_IN_PROGRESS] = $badgeStatus4;
-    $dataseries[] = array('label' => $langs->trans("Suspended"), 'data' => round($tick['waiting']));
-    $colorseries[Ticket::STATUS_WAITING] = '-'.$badgeStatus3;
-    $dataseries[] = array('label' => $langs->trans("NeedMoreInformation"), 'data' => round($tick['needmoreinfo']));
-    $colorseries[Ticket::STATUS_NEED_MORE_INFO] = $badgeStatus9;
-    $dataseries[] = array('label' => $langs->trans("Canceled"), 'data' => round($tick['canceled']));
-    $colorseries[Ticket::STATUS_CANCELED] = $badgeStatus9;
-    $dataseries[] = array('label' => $langs->trans("Closed"), 'data' => round($tick['closed']));
-    $colorseries[Ticket::STATUS_CLOSED] = $badgeStatus6;
+	$dataseries[] = array('label' => $langs->trans("Unread"), 'data' => round($tick['unread']));
+	$colorseries[Ticket::STATUS_NOT_READ] = '-'.$badgeStatus0;
+	$dataseries[] = array('label' => $langs->trans("Read"), 'data' => round($tick['read']));
+	$colorseries[Ticket::STATUS_READ] = $badgeStatus1;
+	$dataseries[] = array('label' => $langs->trans("Assigned"), 'data' => round($tick['assigned']));
+	$colorseries[Ticket::STATUS_ASSIGNED] = $badgeStatus3;
+	$dataseries[] = array('label' => $langs->trans("InProgress"), 'data' => round($tick['inprogress']));
+	$colorseries[Ticket::STATUS_IN_PROGRESS] = $badgeStatus4;
+	$dataseries[] = array('label' => $langs->trans("Suspended"), 'data' => round($tick['waiting']));
+	$colorseries[Ticket::STATUS_WAITING] = '-'.$badgeStatus3;
+	$dataseries[] = array('label' => $langs->trans("NeedMoreInformation"), 'data' => round($tick['needmoreinfo']));
+	$colorseries[Ticket::STATUS_NEED_MORE_INFO] = $badgeStatus9;
+	$dataseries[] = array('label' => $langs->trans("Canceled"), 'data' => round($tick['canceled']));
+	$colorseries[Ticket::STATUS_CANCELED] = $badgeStatus9;
+	$dataseries[] = array('label' => $langs->trans("Closed"), 'data' => round($tick['closed']));
+	$colorseries[Ticket::STATUS_CLOSED] = $badgeStatus6;
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 $stringtoshow = '<script type="text/javascript" language="javascript">
@@ -238,38 +238,38 @@ if (!empty($dataseries) && count($dataseries) > 1) {
 	}
 
 	$data = array();
-    foreach ($dataseries as $key => $value) {
-        $data[] = array($value['label'], $value['data']);
-    }
-    $px1 = new DolGraph();
-    $mesg = $px1->isGraphKo();
-    if (!$mesg) {
-        $px1->SetData($data);
-        $px1->SetDataColor(array_values($colorseries));
+	foreach ($dataseries as $key => $value) {
+		$data[] = array($value['label'], $value['data']);
+	}
+	$px1 = new DolGraph();
+	$mesg = $px1->isGraphKo();
+	if (!$mesg) {
+		$px1->SetData($data);
+		$px1->SetDataColor(array_values($colorseries));
 
-        unset($data1);
-        $i = $startyear;
-        $legend = array();
-        while ($i <= $endyear) {
-            $legend[] = $i;
-            $i++;
-        }
-        $px1->setShowLegend(2);
-        $px1->SetType(array('pie'));
-        $px1->SetLegend($legend);
-        $px1->SetMaxValue($px1->GetCeilMaxValue());
-        //$px1->SetWidth($WIDTH);
-        $px1->SetHeight($HEIGHT);
-        $px1->SetYLabel($langs->trans("TicketStatByStatus"));
-        $px1->SetShading(3);
-        $px1->SetHorizTickIncrement(1);
-        $px1->SetCssPrefix("cssboxes");
-        $px1->mode = 'depth';
-        //$px1->SetTitle($langs->trans("TicketStatByStatus"));
+		unset($data1);
+		$i = $startyear;
+		$legend = array();
+		while ($i <= $endyear) {
+			$legend[] = $i;
+			$i++;
+		}
+		$px1->setShowLegend(2);
+		$px1->SetType(array('pie'));
+		$px1->SetLegend($legend);
+		$px1->SetMaxValue($px1->GetCeilMaxValue());
+		//$px1->SetWidth($WIDTH);
+		$px1->SetHeight($HEIGHT);
+		$px1->SetYLabel($langs->trans("TicketStatByStatus"));
+		$px1->SetShading(3);
+		$px1->SetHorizTickIncrement(1);
+		$px1->SetCssPrefix("cssboxes");
+		$px1->mode = 'depth';
+		//$px1->SetTitle($langs->trans("TicketStatByStatus"));
 
-        $px1->draw($filenamenb, $fileurlnb);
-        print $px1->show($totalnb ? 0 : 1);
-    }
+		$px1->draw($filenamenb, $fileurlnb);
+		print $px1->show($totalnb ? 0 : 1);
+	}
 }
 print '</td></tr>';
 
@@ -289,28 +289,30 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 $max = 10;
 
 $sql = "SELECT t.rowid, t.ref, t.track_id, t.datec, t.subject, t.type_code, t.category_code, t.severity_code, t.fk_statut, t.progress,";
-$sql .= " type.label as type_label, category.label as category_label, severity.label as severity_label";
+$sql .= " type.code as type_code, type.label as type_label,";
+$sql .= " category.code as category_code, category.label as category_label,";
+$sql .= " severity.code as severity_code, severity.label as severity_label";
 $sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code=t.severity_code";
 if (!$user->rights->societe->client->voir && !$socid) {
-    $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 
 $sql .= ' WHERE t.entity IN ('.getEntity('ticket').')';
 $sql .= " AND t.fk_statut=0";
 if (!$user->rights->societe->client->voir && !$socid) {
-    $sql .= " AND t.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+	$sql .= " AND t.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 }
 
 if ($user->socid > 0) {
-    $sql .= " AND t.fk_soc= ".((int) $user->socid);
+	$sql .= " AND t.fk_soc= ".((int) $user->socid);
 } else {
-    // Restricted to assigned user only
-    if ($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY && !$user->rights->ticket->manage) {
-        $sql .= " AND t.fk_user_assign=".$user->id;
-    }
+	// Restricted to assigned user only
+	if ($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY && !$user->rights->ticket->manage) {
+		$sql .= " AND t.fk_user_assign=".$user->id;
+	}
 }
 $sql .= $db->order("t.datec", "DESC");
 $sql .= $db->plimit($max, 0);
@@ -318,77 +320,82 @@ $sql .= $db->plimit($max, 0);
 //print $sql;
 $result = $db->query($sql);
 if ($result) {
-    $num = $db->num_rows($result);
+	$num = $db->num_rows($result);
 
-    $i = 0;
+	$i = 0;
 
-    $transRecordedType = $langs->trans("LatestNewTickets", $max);
+	$transRecordedType = $langs->trans("LatestNewTickets", $max);
 
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre"><th colspan="5">'.$transRecordedType.'</th>';
-    print '<th class="right" colspan="2"><a href="'.DOL_URL_ROOT.'/ticket/list.php?search_fk_statut[]='.Ticket::STATUS_NOT_READ.'">'.$langs->trans("FullList").'</th>';
-    print '</tr>';
-    if ($num > 0) {
-        while ($i < $num) {
-            $objp = $db->fetch_object($result);
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><th colspan="5">'.$transRecordedType.'</th>';
+	print '<th class="right" colspan="2"><a href="'.DOL_URL_ROOT.'/ticket/list.php?search_fk_statut[]='.Ticket::STATUS_NOT_READ.'">'.$langs->trans("FullList").'</th>';
+	print '</tr>';
+	if ($num > 0) {
+		while ($i < $num) {
+			$objp = $db->fetch_object($result);
 
-            $tickesupstatic->id = $objp->rowid;
-            $tickesupstatic->ref = $objp->ref;
-            $tickesupstatic->track_id = $objp->track_id;
-            $tickesupstatic->fk_statut = $objp->fk_statut;
-            $tickesupstatic->progress = $objp->progress;
-            $tickesupstatic->subject = $objp->subject;
+			$tickesupstatic->id = $objp->rowid;
+			$tickesupstatic->ref = $objp->ref;
+			$tickesupstatic->track_id = $objp->track_id;
+			$tickesupstatic->fk_statut = $objp->fk_statut;
+			$tickesupstatic->progress = $objp->progress;
+			$tickesupstatic->subject = $objp->subject;
 
-            print '<tr class="oddeven">';
+			print '<tr class="oddeven">';
 
-            // Ref
-            print '<td class="nowraponall">';
-            print $tickesupstatic->getNomUrl(1);
-            print "</td>\n";
+			// Ref
+			print '<td class="nowraponall">';
+			print $tickesupstatic->getNomUrl(1);
+			print "</td>\n";
 
-            // Creation date
-            print '<td class="left">';
-            print dol_print_date($db->jdate($objp->datec), 'dayhour');
-            print "</td>";
+			// Creation date
+			print '<td class="left">';
+			print dol_print_date($db->jdate($objp->datec), 'dayhour');
+			print "</td>";
 
-            // Subject
-            print '<td class="nowrap">';
-            print '<a href="card.php?track_id='.$objp->track_id.'">'.dol_trunc($objp->subject, 30).'</a>';
-            print "</td>\n";
+			// Subject
+			print '<td class="nowrap">';
+			print '<a href="card.php?track_id='.$objp->track_id.'">'.dol_trunc($objp->subject, 30).'</a>';
+			print "</td>\n";
 
-            // Type
-            print '<td class="nowrap">';
-            print $objp->type_label;
-            print '</td>';
+			// Type
+			print '<td class="nowrap tdoverflowmax100">';
+			$s = $langs->getLabelFromKey($db, 'TicketTypeShort'.$objp->type_code, 'c_ticket_type', 'code', 'label', $objp->type_code);
+			print '<span title="'.dol_escape_htmltag($s).'">'.$s.'</span>';
+			print '</td>';
 
-            // Category
-            print '<td class="nowrap">';
-            print $objp->category_label;
-            print "</td>";
+			// Category
+			print '<td class="nowrap">';
+			$s = $langs->getLabelFromKey($db, 'TicketCategoryShort'.$objp->category_code, 'c_ticket_category', 'code', 'label', $objp->category_code);
+			print '<span title="'.dol_escape_htmltag($s).'">'.$s.'</span>';
+			//print $objp->category_label;
+			print "</td>";
 
-            // Severity
-            print '<td class="nowrap">';
-            print $objp->severity_label;
-            print "</td>";
+			// Severity
+			print '<td class="nowrap">';
+			$s = $langs->getLabelFromKey($db, 'TicketSeverityShort'.$objp->severity_code, 'c_ticket_severity', 'code', 'label', $objp->severity_code);
+			print '<span title="'.dol_escape_htmltag($s).'">'.$s.'</span>';
+			//print $objp->severity_label;
+			print "</td>";
 
-            print '<td class="nowraponall right">';
-            print $tickesupstatic->getLibStatut(5);
-            print "</td>";
+			print '<td class="nowraponall right">';
+			print $tickesupstatic->getLibStatut(5);
+			print "</td>";
 
-            print "</tr>\n";
-            $i++;
-        }
+			print "</tr>\n";
+			$i++;
+		}
 
-        $db->free();
-    } else {
-        print '<tr><td colspan="6" class="opacitymedium">'.$langs->trans('NoUnreadTicketsFound').'</td></tr>';
-    }
+		$db->free($result);
+	} else {
+		print '<tr><td colspan="6" class="opacitymedium">'.$langs->trans('NoUnreadTicketsFound').'</td></tr>';
+	}
 
-    print "</table>";
-    print '</div>';
+	print "</table>";
+	print '</div>';
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 print '</div></div></div>';
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 91d84270a30..fc1cca1aa0f 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -112,14 +112,8 @@ foreach ($object->fields as $key => $val)
 	if (!empty($val['visible'])) $arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
 }
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 //if ($socid > 0) $arrayfields['t.fk_soc']['enabled']=0;
@@ -128,7 +122,7 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 
 // Security check
 if (!$user->rights->ticket->read) {
-    accessforbidden();
+	accessforbidden();
 }
 
 // Store current page url
@@ -322,42 +316,42 @@ if ($socid > 0)
 
 foreach ($search as $key => $val)
 {
-    if ($key == 'fk_statut')
+	if ($key == 'fk_statut' && !empty($search['fk_statut']))
 	{
 		$newarrayofstatus = array();
 		foreach ($search['fk_statut'] as $key2 => $val2) {
 			if (in_array($val2, array('openall', 'closeall'))) continue;
 			$newarrayofstatus[] = $val2;
 		}
-	    if ($search['fk_statut'] == 'openall' || in_array('openall', $search['fk_statut'])) {
-	    	$newarrayofstatus[] = Ticket::STATUS_NOT_READ;
-	    	$newarrayofstatus[] = Ticket::STATUS_ASSIGNED;
-	    	$newarrayofstatus[] = Ticket::STATUS_IN_PROGRESS;
-	    	$newarrayofstatus[] = Ticket::STATUS_NEED_MORE_INFO;
-	    	$newarrayofstatus[] = Ticket::STATUS_WAITING;
-	    }
-	    if ($search['fk_statut'] == 'closeall' || in_array('closeall', $search['fk_statut'])) {
-	    	$newarrayofstatus[] = Ticket::STATUS_CLOSED;
-	    	$newarrayofstatus[] = Ticket::STATUS_CANCELED;
-	    }
-	    if (count($newarrayofstatus)) $sql .= natural_search($key, join(',', $newarrayofstatus), 2);
-	    continue;
+		if ($search['fk_statut'] == 'openall' || in_array('openall', $search['fk_statut'])) {
+			$newarrayofstatus[] = Ticket::STATUS_NOT_READ;
+			$newarrayofstatus[] = Ticket::STATUS_ASSIGNED;
+			$newarrayofstatus[] = Ticket::STATUS_IN_PROGRESS;
+			$newarrayofstatus[] = Ticket::STATUS_NEED_MORE_INFO;
+			$newarrayofstatus[] = Ticket::STATUS_WAITING;
+		}
+		if ($search['fk_statut'] == 'closeall' || in_array('closeall', $search['fk_statut'])) {
+			$newarrayofstatus[] = Ticket::STATUS_CLOSED;
+			$newarrayofstatus[] = Ticket::STATUS_CANCELED;
+		}
+		if (count($newarrayofstatus)) $sql .= natural_search($key, join(',', $newarrayofstatus), 2);
+		continue;
 	}
-	if ($key == 'fk_user_assign')
+	if ($key == 'fk_user_assign' || $key == 'fk_user_create')
 	{
-	    if ($search[$key] > 0) $sql .= natural_search($key, $search[$key], 2);
-	    continue;
+		if ($search[$key] > 0) $sql .= natural_search($key, $search[$key], 2);
+		continue;
 	}
 	$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
-    if ($search[$key] != '') $sql .= natural_search($key, $search[$key], $mode_search);
+	if ($search[$key] != '') $sql .= natural_search($key, $search[$key], $mode_search);
 }
 if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 if ($search_societe)     $sql .= natural_search('s.nom', $search_societe);
 if ($search_fk_project) $sql .= natural_search('fk_project', $search_fk_project, 2);
 if (!$user->socid && ($mode == "mine" || (!$user->admin && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY))) {
-    $sql .= " AND (t.fk_user_assign = ".$user->id;
-    if (empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY)) $sql .= " OR t.fk_user_create = ".$user->id;
-    $sql .= ")";
+	$sql .= " AND (t.fk_user_assign = ".$user->id;
+	if (empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY)) $sql .= " OR t.fk_user_create = ".$user->id;
+	$sql .= ")";
 }
 
 // Add where from extra fields
@@ -415,118 +409,118 @@ llxHeader('', $title, $help_url);
 
 
 if ($socid && !$projectid && !$project_ref && $user->rights->societe->lire) {
-    $socstat = new Societe($db);
-    $res = $socstat->fetch($socid);
-    if ($res > 0) {
-    	$tmpobject = $object;
-    	$object = $socstat; // $object must be of type Societe when calling societe_prepare_head
-        $head = societe_prepare_head($socstat);
+	$socstat = new Societe($db);
+	$res = $socstat->fetch($socid);
+	if ($res > 0) {
+		$tmpobject = $object;
+		$object = $socstat; // $object must be of type Societe when calling societe_prepare_head
+		$head = societe_prepare_head($socstat);
 		$object = $tmpobject;
 
-        dol_fiche_head($head, 'ticket', $langs->trans("ThirdParty"), -1, 'company');
+		print dol_get_fiche_head($head, 'ticket', $langs->trans("ThirdParty"), -1, 'company');
 
-        dol_banner_tab($socstat, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
+		dol_banner_tab($socstat, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-        print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border centpercent tableforfield">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border centpercent tableforfield">';
 
-        // Customer code
-        if ($socstat->client && !empty($socstat->code_client)) {
-            print '<tr><td class="titlefield">';
-            print $langs->trans('CustomerCode').'</td><td>';
-            print $socstat->code_client;
-            if ($socstat->check_codeclient() != 0) {
-                print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-            }
+		// Customer code
+		if ($socstat->client && !empty($socstat->code_client)) {
+			print '<tr><td class="titlefield">';
+			print $langs->trans('CustomerCode').'</td><td>';
+			print $socstat->code_client;
+			if ($socstat->check_codeclient() != 0) {
+				print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+			}
 
-            print '</td>';
-            print '</tr>';
-        }
-        // Supplier code
-        if ($socstat->fournisseur && !empty($socstat->code_fournisseur)) {
-        	print '<tr><td class="titlefield">';
-        	print $langs->trans('SupplierCode').'</td><td>';
-        	print $socstat->code_fournisseur;
-        	if ($socstat->check_codefournisseur() != 0) {
-        		print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-        	}
+			print '</td>';
+			print '</tr>';
+		}
+		// Supplier code
+		if ($socstat->fournisseur && !empty($socstat->code_fournisseur)) {
+			print '<tr><td class="titlefield">';
+			print $langs->trans('SupplierCode').'</td><td>';
+			print $socstat->code_fournisseur;
+			if ($socstat->check_codefournisseur() != 0) {
+				print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+			}
 
-        	print '</td>';
-        	print '</tr>';
-        }
+			print '</td>';
+			print '</tr>';
+		}
 
-        print '</table>';
-        print '</div>';
-        dol_fiche_end();
-    }
+		print '</table>';
+		print '</div>';
+		print dol_get_fiche_end();
+	}
 }
 
 if ($projectid > 0 || $project_ref) {
-    $projectstat = new Project($db);
-    if ($projectstat->fetch($projectid, $project_ref) > 0) {
-    	$projectid = $projectstat->id;
-        $projectstat->fetch_thirdparty();
+	$projectstat = new Project($db);
+	if ($projectstat->fetch($projectid, $project_ref) > 0) {
+		$projectid = $projectstat->id;
+		$projectstat->fetch_thirdparty();
 
-        $savobject = $object;
-        $object = $projectstat;
+		$savobject = $object;
+		$object = $projectstat;
 
-        // To verify role of users
-        //$userAccess = $object->restrictedProjectArea($user,'read');
-        $userWrite = $projectstat->restrictedProjectArea($user, 'write');
-        //$userDelete = $object->restrictedProjectArea($user,'delete');
-        //print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
+		// To verify role of users
+		//$userAccess = $object->restrictedProjectArea($user,'read');
+		$userWrite = $projectstat->restrictedProjectArea($user, 'write');
+		//$userDelete = $object->restrictedProjectArea($user,'delete');
+		//print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
 
-        $head = project_prepare_head($projectstat);
-        dol_fiche_head($head, 'ticket', $langs->trans("Project"), -1, ($projectstat->public ? 'projectpub' : 'project'));
+		$head = project_prepare_head($projectstat);
+		print dol_get_fiche_head($head, 'ticket', $langs->trans("Project"), -1, ($projectstat->public ? 'projectpub' : 'project'));
 
-        // Project card
+		// Project card
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        $morehtmlref = '<div class="refidno">';
-        // Title
-        $morehtmlref .= $object->title;
-        // Thirdparty
-        if ($object->thirdparty->id > 0)
-        {
-        	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
-        }
-        $morehtmlref .= '</div>';
+		$morehtmlref = '<div class="refidno">';
+		// Title
+		$morehtmlref .= $object->title;
+		// Thirdparty
+		if ($object->thirdparty->id > 0)
+		{
+			$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
+		}
+		$morehtmlref .= '</div>';
 
-        // Define a complementary filter for search of next/prev ref.
-        if (!$user->rights->projet->all->lire)
-        {
-        	$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
-        	$object->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
-        }
+		// Define a complementary filter for search of next/prev ref.
+		if (!$user->rights->projet->all->lire)
+		{
+			$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
+			$object->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+		}
 
-        dol_banner_tab($object, 'project_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>';
+		print '<div class="fichecenter">';
+		print '<div class="underbanner clearboth"></div>';
 
-        print '<table class="border tableforfield" width="100%">';
+		print '<table class="border tableforfield" width="100%">';
 
-        // Visibility
-        print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-        if ($projectstat->public) {
-            print $langs->trans('SharedProject');
-        } else {
-            print $langs->trans('PrivateProject');
-        }
-        print '</td></tr>';
+		// Visibility
+		print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
+		if ($projectstat->public) {
+			print $langs->trans('SharedProject');
+		} else {
+			print $langs->trans('PrivateProject');
+		}
+		print '</td></tr>';
 
-        print "</table>";
+		print "</table>";
 
-        print '</div>';
-        dol_fiche_end();
+		print '</div>';
+		print dol_get_fiche_end();
 
-        $object = $savobject;
-    } else {
-        print "ErrorRecordNotFound";
-    }
+		$object = $savobject;
+	} else {
+		print "ErrorRecordNotFound";
+	}
 }
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
@@ -536,8 +530,8 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&co
 if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 foreach ($search as $key => $val)
 {
-    if (is_array($search[$key]) && count($search[$key])) foreach ($search[$key] as $skey) $param .= '&search_'.$key.'[]='.urlencode($skey);
-    else $param .= '&search_'.$key.'='.urlencode($search[$key]);
+	if (is_array($search[$key]) && count($search[$key])) foreach ($search[$key] as $skey) $param .= '&search_'.$key.'[]='.urlencode($skey);
+	else $param .= '&search_'.$key.'='.urlencode($search[$key]);
 }
 if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
@@ -578,13 +572,13 @@ if ($socid > 0) $picto = '';
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 if ($mode == 'mine') {
-    print '<div class="opacitymedium">'.$langs->trans('TicketAssignedToMeInfos').'</div><br>';
+	print '<div class="opacitymedium">'.$langs->trans('TicketAssignedToMeInfos').'</div><br>';
 }
 // Add code for pre mass action (confirmation or email presend form)
 $topicmail = "SendTicketRef";
 $modelmail = "ticket";
 $objecttmp = new Ticket($db);
-$trackid = 'tick'.$object->id;
+$trackid = 'tic'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($search_all)
@@ -638,32 +632,32 @@ foreach ($object->fields as $key => $val)
 			$formTicket->selectGroupTickets(dol_escape_htmltag($search[$key]), 'search_'.$key.'', '', 2, 1, 1, 0, ($val['css'] ? $val['css'] : 'maxwidth150'));
 			print '</td>';
 		} elseif ($key == 'severity_code') {
-			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
+			print '<td class="liste_titre center'.($cssforfield ? ' '.$cssforfield : '').'">';
 			$formTicket->selectSeveritiesTickets(dol_escape_htmltag($search[$key]), 'search_'.$key.'', '', 2, 1, 1, 0, ($val['css'] ? $val['css'] : 'maxwidth150'));
 			print '</td>';
-		} elseif ($key == 'fk_user_assign') {
-		    print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		    print $form->select_dolusers($search[$key], 'search_'.$key, 1, null, 0, '', '', '0', 0, 0, '', 0, '', ($val['css'] ? $val['css'] : 'maxwidth150'));
-		    print '</td>';
+		} elseif ($key == 'fk_user_assign' || $key == 'fk_user_create') {
+			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
+			print $form->select_dolusers($search[$key], 'search_'.$key, 1, null, 0, '', '', '0', 0, 0, '', 0, '', ($val['css'] ? $val['css'] : 'maxwidth150'));
+			print '</td>';
 		} elseif ($key == 'fk_statut') {
-		    $arrayofstatus = array();
-		    $arrayofstatus['openall'] = '-- '.$langs->trans('OpenAll').' --';
-		    foreach ($object->statuts_short as $key2 => $val2)
-		    {
-		    	if ($key2 == Ticket::STATUS_CLOSED) $arrayofstatus['closeall'] = '-- '.$langs->trans('ClosedAll').' --';
-		    	$arrayofstatus[$key2] = $val2;
-		    }
-		    print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		    //var_dump($arrayofstatus);var_dump($search['fk_statut']);var_dump(array_values($search[$key]));
-		    $selectedarray = null;
-		    if ($search[$key]) $selectedarray = array_values($search[$key]);
+			$arrayofstatus = array();
+			$arrayofstatus['openall'] = '-- '.$langs->trans('OpenAll').' --';
+			foreach ($object->statuts_short as $key2 => $val2)
+			{
+				if ($key2 == Ticket::STATUS_CLOSED) $arrayofstatus['closeall'] = '-- '.$langs->trans('ClosedAll').' --';
+				$arrayofstatus[$key2] = $val2;
+			}
+			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
+			//var_dump($arrayofstatus);var_dump($search['fk_statut']);var_dump(array_values($search[$key]));
+			$selectedarray = null;
+			if ($search[$key]) $selectedarray = array_values($search[$key]);
 			print Form::multiselectarray('search_fk_statut', $arrayofstatus, $selectedarray, 0, 0, 'minwidth150', 1, 0, '', '', '');
 			print '</td>';
 		} elseif ($key == "fk_soc") {
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'"><input type="text" class="flat maxwidth75" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
 		} else {
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-			if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 			elseif (strpos($val['type'], 'integer:') === 0) {
 				print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 			} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
@@ -692,13 +686,13 @@ print '<tr class="liste_titre">';
 foreach ($object->fields as $key => $val)
 {
 	$cssforfield = (empty($val['css']) ? '' : $val['css']);
-	if ($key == 'fk_statut') $cssforfield .= ($cssforfield ? ' ' : '').'center';
+	if ($key == 'fk_statut' || $key == 'severity_code') $cssforfield .= ($cssforfield ? ' ' : '').'center';
 	elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
 	elseif (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 	elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') $cssforfield .= ($cssforfield ? ' ' : '').'right';
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
-        print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, '', $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, '', $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
 	}
 }
 // Extra fields
@@ -748,7 +742,7 @@ while ($i < min($num, $limit))
 		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
 		if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 		if (in_array($key, array('ref', 'fk_project'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowraponall';
-		if ($key == 'fk_statut') $cssforfield .= ($cssforfield ? ' ' : '').'center';
+		if ($key == 'fk_statut' || $key == 'severity_code') $cssforfield .= ($cssforfield ? ' ' : '').'center';
 		if (!empty($arrayfields['t.'.$key]['checked']))
 		{
 			print '<td';
@@ -765,8 +759,18 @@ while ($i < min($num, $limit))
 				print $s;
 				print '</span>';
 			}
-			elseif ($key == 'category_code') print $langs->getLabelFromKey($db, 'TicketCategoryShort'.$object->category_code, 'c_ticket_category', 'code', 'label', $object->category_code);
-			elseif ($key == 'severity_code') print $langs->getLabelFromKey($db, 'TicketSeverityShort'.$object->severity_code, 'c_ticket_severity', 'code', 'label', $object->severity_code);
+			elseif ($key == 'category_code') {
+				$s = $langs->getLabelFromKey($db, 'TicketCategoryShort'.$object->category_code, 'c_ticket_category', 'code', 'label', $object->category_code);
+				print '<span title="'.$s.'">';
+				print $s;
+				print '</span>';
+			}
+			elseif ($key == 'severity_code') {
+				$s = $langs->getLabelFromKey($db, 'TicketSeverityShort'.$object->severity_code, 'c_ticket_severity', 'code', 'label', $object->severity_code);
+				print '<span title="'.$s.'">';
+				print $s;
+				print '</span>';
+			}
 			elseif ($key == 'tms') print dol_print_date($db->jdate($obj->$key), 'dayhour', 'tzuser');
 			elseif ($key == 'fk_user_create') {
 				if ($object->fk_user_create > 0) {
diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php
index fc0bce96cb8..49f15412965 100644
--- a/htdocs/ticket/messaging.php
+++ b/htdocs/ticket/messaging.php
@@ -41,8 +41,8 @@ $socid    = GETPOST('socid', 'int');
 $action   = GETPOST('action', 'aZ09');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", "alpha");
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST("sortfield", "aZ09comma");
+$sortorder = GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $page = is_numeric($page) ? $page : 0;
 $page = $page == -1 ? 0 : $page;
@@ -130,24 +130,24 @@ $help_url = 'FR:DocumentationModuleTicket';
 llxHeader('', $title, $help_url);
 
 if ($socid > 0) {
-    $object->fetch_thirdparty();
-    $head = societe_prepare_head($object->thirdparty);
+	$object->fetch_thirdparty();
+	$head = societe_prepare_head($object->thirdparty);
 
-    dol_fiche_head($head, 'ticket', $langs->trans("ThirdParty"), 0, 'company');
+	print dol_get_fiche_head($head, 'ticket', $langs->trans("ThirdParty"), 0, 'company');
 
-    dol_banner_tab($object->thirdparty, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
+	dol_banner_tab($object->thirdparty, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 if (!$user->socid && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) {
-    $object->next_prev_filter = "te.fk_user_assign = '".$user->id."'";
+	$object->next_prev_filter = "te.fk_user_assign = '".$user->id."'";
 } elseif ($user->socid > 0) {
-    $object->next_prev_filter = "te.fk_soc = '".$user->socid."'";
+	$object->next_prev_filter = "te.fk_soc = '".$user->socid."'";
 }
 $head = ticket_prepare_head($object);
 
-dol_fiche_head($head, 'tabTicketLogs', $langs->trans("Ticket"), 0, 'ticket');
+print dol_get_fiche_head($head, 'tabTicketLogs', $langs->trans("Ticket"), 0, 'ticket');
 
 $morehtmlref = '<div class="refidno">';
 $morehtmlref .= $object->subject;
@@ -219,7 +219,7 @@ $linkback = '<a href="'.dol_buildpath('/ticket/list.php', 1).'"><strong>'.$langs
 
 dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<br>';
 
@@ -230,10 +230,10 @@ if (!empty($object->id))
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
-    $morehtmlright = '';
+	$morehtmlright = '';
 
-    $messagingUrl = DOL_URL_ROOT.'/ticket/messaging.php?track_id='.$object->track_id;
-    $morehtmlright .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 1, array('morecss'=>'btnTitleSelected'));
+	$messagingUrl = DOL_URL_ROOT.'/ticket/messaging.php?track_id='.$object->track_id;
+	$morehtmlright .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 1, array('morecss'=>'btnTitleSelected'));
 	$messagingUrl = DOL_URL_ROOT.'/ticket/agenda.php?track_id='.$object->track_id;
 	$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-list-alt imgforviewmode', $messagingUrl, '', 1);
 
@@ -254,7 +254,7 @@ if (!empty($object->id))
 	// List of all actions
 	$filters = array();
 	$filters['search_agenda_label'] = $search_agenda_label;
-    show_ticket_messaging($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
+	show_ticket_messaging($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
 }
 
 // End of page
diff --git a/htdocs/ticket/stats/index.php b/htdocs/ticket/stats/index.php
index fe66b9c2231..045943bbfda 100644
--- a/htdocs/ticket/stats/index.php
+++ b/htdocs/ticket/stats/index.php
@@ -32,19 +32,19 @@ $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
 if (!$user->rights->ticket->read) accessforbidden();
 
-$object_status = GETPOST('object_status');
+$object_status = GETPOST('object_status', 'intcomma');
 
 $userid = GETPOST('userid', 'int');
 $socid = GETPOST('socid', 'int');
 // Security check
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $nowyear = strftime("%Y", dol_now());
-$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
+$year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
 //$startyear=$year-2;
 $startyear = $year - 1;
 $endyear = $year;
@@ -82,36 +82,36 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filenamenb = $dir.'/ticketsnbinyear-'.$user->id.'-'.$year.'.png';
-    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsnbinyear-'.$user->id.'-'.$year.'.png';
+	$filenamenb = $dir.'/ticketsnbinyear-'.$user->id.'-'.$year.'.png';
+	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsnbinyear-'.$user->id.'-'.$year.'.png';
 } else {
-    $filenamenb = $dir.'/ticketsnbinyear-'.$year.'.png';
-    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsnbinyear-'.$year.'.png';
+	$filenamenb = $dir.'/ticketsnbinyear-'.$year.'.png';
+	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsnbinyear-'.$year.'.png';
 }
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
 if (!$mesg)
 {
-    $px1->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px1->SetLegend($legend);
-    $px1->SetMaxValue($px1->GetCeilMaxValue());
-    $px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
-    $px1->SetWidth($WIDTH);
-    $px1->SetHeight($HEIGHT);
-    $px1->SetYLabel($langs->trans("NbOfTicket"));
-    $px1->SetShading(3);
-    $px1->SetHorizTickIncrement(1);
-    $px1->mode = 'depth';
-    $px1->SetTitle($langs->trans("NumberOfTicketsByMonth"));
+	$px1->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px1->SetLegend($legend);
+	$px1->SetMaxValue($px1->GetCeilMaxValue());
+	$px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
+	$px1->SetWidth($WIDTH);
+	$px1->SetHeight($HEIGHT);
+	$px1->SetYLabel($langs->trans("NbOfTicket"));
+	$px1->SetShading(3);
+	$px1->SetHorizTickIncrement(1);
+	$px1->mode = 'depth';
+	$px1->SetTitle($langs->trans("NumberOfTicketsByMonth"));
 
-    $px1->draw($filenamenb, $fileurlnb);
+	$px1->draw($filenamenb, $fileurlnb);
 }
 
 // Build graphic amount of object
@@ -121,36 +121,36 @@ $data = $stats->getAmountByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filenameamount = $dir.'/ticketsamountinyear-'.$user->id.'-'.$year.'.png';
-    $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsamountinyear-'.$user->id.'-'.$year.'.png';
+	$filenameamount = $dir.'/ticketsamountinyear-'.$user->id.'-'.$year.'.png';
+	$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsamountinyear-'.$user->id.'-'.$year.'.png';
 } else {
-    $filenameamount = $dir.'/ticketsamountinyear-'.$year.'.png';
-    $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsamountinyear-'.$year.'.png';
+	$filenameamount = $dir.'/ticketsamountinyear-'.$year.'.png';
+	$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsamountinyear-'.$year.'.png';
 }
 
 $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
 if (!$mesg)
 {
-    $px2->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px2->SetLegend($legend);
-    $px2->SetMaxValue($px2->GetCeilMaxValue());
-    $px2->SetMinValue(min(0, $px2->GetFloorMinValue()));
-    $px2->SetWidth($WIDTH);
-    $px2->SetHeight($HEIGHT);
-    $px2->SetYLabel($langs->trans("AmountOfTickets"));
-    $px2->SetShading(3);
-    $px2->SetHorizTickIncrement(1);
-    $px2->mode = 'depth';
-    $px2->SetTitle($langs->trans("AmountOfTicketsByMonthHT"));
+	$px2->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px2->SetLegend($legend);
+	$px2->SetMaxValue($px2->GetCeilMaxValue());
+	$px2->SetMinValue(min(0, $px2->GetFloorMinValue()));
+	$px2->SetWidth($WIDTH);
+	$px2->SetHeight($HEIGHT);
+	$px2->SetYLabel($langs->trans("AmountOfTickets"));
+	$px2->SetShading(3);
+	$px2->SetHorizTickIncrement(1);
+	$px2->mode = 'depth';
+	$px2->SetTitle($langs->trans("AmountOfTicketsByMonthHT"));
 
-    $px2->draw($filenameamount, $fileurlamount);
+	$px2->draw($filenameamount, $fileurlamount);
 }
 
 
@@ -158,36 +158,36 @@ $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filename_avg = $dir.'/ticketsaverage-'.$user->id.'-'.$year.'.png';
-    $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsaverage-'.$user->id.'-'.$year.'.png';
+	$filename_avg = $dir.'/ticketsaverage-'.$user->id.'-'.$year.'.png';
+	$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsaverage-'.$user->id.'-'.$year.'.png';
 } else {
-    $filename_avg = $dir.'/ticketsaverage-'.$year.'.png';
-    $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsaverage-'.$year.'.png';
+	$filename_avg = $dir.'/ticketsaverage-'.$year.'.png';
+	$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsaverage-'.$year.'.png';
 }
 
 $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
 if (!$mesg)
 {
-    $px3->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px3->SetLegend($legend);
-    $px3->SetYLabel($langs->trans("AmountAverage"));
-    $px3->SetMaxValue($px3->GetCeilMaxValue());
-    $px3->SetMinValue($px3->GetFloorMinValue());
-    $px3->SetWidth($WIDTH);
-    $px3->SetHeight($HEIGHT);
-    $px3->SetShading(3);
-    $px3->SetHorizTickIncrement(1);
-    $px3->mode = 'depth';
-    $px3->SetTitle($langs->trans("AmountAverage"));
+	$px3->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px3->SetLegend($legend);
+	$px3->SetYLabel($langs->trans("AmountAverage"));
+	$px3->SetMaxValue($px3->GetCeilMaxValue());
+	$px3->SetMinValue($px3->GetFloorMinValue());
+	$px3->SetWidth($WIDTH);
+	$px3->SetHeight($HEIGHT);
+	$px3->SetShading(3);
+	$px3->SetHorizTickIncrement(1);
+	$px3->mode = 'depth';
+	$px3->SetTitle($langs->trans("AmountAverage"));
 
-    $px3->draw($filename_avg, $fileurl_avg);
+	$px3->draw($filename_avg, $fileurl_avg);
 }
 
 
@@ -213,7 +213,7 @@ $type = 'ticket_stats';
 
 complete_head_from_modules($conf, $langs, null, $head, $h, $type);
 
-dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
+print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
@@ -235,7 +235,7 @@ print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0
 // Status
 print '<tr><td class="left">'.$langs->trans("Status").'</td><td class="left">';
 $liststatus = $object->fields['fk_statut']['arrayofkeyval'];
-print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'int'), -4, 0, 0, '', 1);
+print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'intcomma'), -4, 0, 0, '', 1);
 print '</td></tr>';
 // Year
 print '<tr><td class="left">'.$langs->trans("Year").'</td><td class="left">';
@@ -304,11 +304,11 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
 if ($mesg) { print $mesg; } else {
-    print $px1->show();
-    print "<br>\n";
-    //print $px2->show();
-    //print "<br>\n";
-    //print $px3->show();
+	print $px1->show();
+	print "<br>\n";
+	//print $px2->show();
+	//print "<br>\n";
+	//print $px3->show();
 }
 print '</td></tr></table>';
 
@@ -316,7 +316,7 @@ print '</td></tr></table>';
 print '</div></div></div>';
 print '<div style="clear:both"></div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/ticket/tpl/linkedobjectblock.tpl.php b/htdocs/ticket/tpl/linkedobjectblock.tpl.php
index 4f425db4f96..572ffc0672f 100644
--- a/htdocs/ticket/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/ticket/tpl/linkedobjectblock.tpl.php
@@ -53,20 +53,20 @@ foreach ($linkedObjectBlock as $key => $objectlink)
     	<td class="linkedcol-ref center"><?php echo $objectlink->ref_client; ?></td>
     	<td class="linkedcol-date center"><?php echo dol_print_date($objectlink->datec, 'day'); ?></td>
 	    <?php
-	    //$objectlink->socid = $objectlink->fk_soc;
-	    //$objectlink->fetch_thirdparty();
-	    ?>
+		//$objectlink->socid = $objectlink->fk_soc;
+		//$objectlink->fetch_thirdparty();
+		?>
     	<td class="linkedcol-amount right"><?php //echo $objectlink->thirdparty->getNomUrl(1); ?></td>
     	<td class="linkedcol-statut right"><?php echo $objectlink->getLibStatut(3); ?></td>
     	<td class="linkedcol-action right">
     		<?php
-    		// For now, shipments must stay linked to order, so link is not deletable
-    		if ($object->element != 'shipping') {
-    			?>
+			// For now, shipments must stay linked to order, so link is not deletable
+			if ($object->element != 'shipping') {
+				?>
     			<a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a>
     			<?php
-    		}
-    		?>
+			}
+			?>
     	</td>
 </tr>
 	<?php
diff --git a/htdocs/user/admin/group_extrafields.php b/htdocs/user/admin/group_extrafields.php
index 6690f6e933e..fd71d43d4f0 100644
--- a/htdocs/user/admin/group_extrafields.php
+++ b/htdocs/user/admin/group_extrafields.php
@@ -71,11 +71,11 @@ print load_fiche_titre($langs->trans("UsersSetup"), $linkback, 'title_setup');
 
 $head = user_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes_group', $langs->trans("MenuUsersAndGroups"), -1, 'user');
+print dol_get_fiche_head($head, 'attributes_group', $langs->trans("MenuUsersAndGroups"), -1, 'user');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/user/admin/user_extrafields.php b/htdocs/user/admin/user_extrafields.php
index 52e97a48c0a..45d645ce3dd 100644
--- a/htdocs/user/admin/user_extrafields.php
+++ b/htdocs/user/admin/user_extrafields.php
@@ -70,11 +70,11 @@ print load_fiche_titre($langs->trans("UsersSetup"), $linkback, 'title_setup');
 
 $head = user_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("MenuUsersAndGroups"), -1, 'user');
+print dol_get_fiche_head($head, 'attributes', $langs->trans("MenuUsersAndGroups"), -1, 'user');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
@@ -97,7 +97,7 @@ if ($action == 'create')
 	print '<br><div id="newattrib"></div>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -110,7 +110,7 @@ if ($action == 'edit' && !empty($attrname))
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index 77d6acdaeed..8d320a839ef 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -150,7 +150,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 
 $head = user_prepare_head($object);
 
-dol_fiche_head($head, 'extsites', $langs->trans("User"), -1, 'user');
+print dol_get_fiche_head($head, 'extsites', $langs->trans("User"), -1, 'user');
 
 $linkback = '';
 
@@ -215,10 +215,10 @@ print '</div>';
 
 
 print '<div class="center">';
-print "<input type=\"submit\" id=\"save\" name=\"save\" class=\"button hideifnotset\" value=\"".$langs->trans("Save")."\">";
+print '<input type="submit" id="save" name="save" class="button hideifnotset button-save" value="'.$langs->trans("Save").'">';
 print "</div>";
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print "</form>\n";
 
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index af7aa162790..20369e37d69 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -40,6 +40,7 @@ if (!empty($conf->salaries->enabled)) require_once DOL_DOCUMENT_ROOT.'/salaries/
 $langs->loadLangs(array('companies', 'commercial', 'banks', 'bills', 'trips', 'holiday', 'salaries'));
 
 $id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alphanohtml');
 $bankid = GETPOST('bankid', 'int');
 $action = GETPOST("action", 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
@@ -76,6 +77,8 @@ if (!$bankid)
 }
 if (empty($account->userid)) $account->userid = $object->id;
 
+$permissiontoaddbankaccount = (!empty($user->rights->salaries->write) || !empty($user->rights->hrm->employee->write) || !empty($user->rights->user->creer));
+
 
 /*
  *	Actions
@@ -105,16 +108,16 @@ if ($action == 'add' && !$cancel)
 		setEventMessages($account->error, $account->errors, 'errors');
 		$action = 'edit'; // Force chargement page edition
 	} else {
-        setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
-        $action = '';
+		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+		$action = '';
 	}
 }
 
 if ($action == 'update' && !$cancel)
 {
-    $account->userid = $object->id;
+	$account->userid = $object->id;
 
-    /*
+	/*
     if ($action == 'update' && !$cancel)
     {
     	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -172,43 +175,38 @@ if ($action == 'update' && !$cancel)
 
 	$result = $account->update($user);
 
-    if (!$result)
-	{
+	if (!$result) {
 		setEventMessages($account->error, $account->errors, 'errors');
 		$action = 'edit'; // Force chargement page edition
 	} else {
-        setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
-        $action = '';
-    }
+		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+		$action = '';
+	}
 }
 
 // update personal email
-if ($action == 'setpersonal_email')
-{
-	$object->personal_email = GETPOST('personal_email');
+if ($action == 'setpersonal_email') {
+	$object->personal_email = (string) GETPOST('personal_email', 'alphanohtml');
 	$result = $object->update($user);
 	if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 }
 
 // update personal mobile
-if ($action == 'setpersonal_mobile')
-{
-	$object->personal_mobile = GETPOST('personal_mobile');
+if ($action == 'setpersonal_mobile') {
+	$object->personal_mobile = (string) GETPOST('personal_mobile', 'alphanohtml');
 	$result = $object->update($user);
 	if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 }
 
 // update default_c_exp_tax_cat
-if ($action == 'setdefault_c_exp_tax_cat')
-{
+if ($action == 'setdefault_c_exp_tax_cat') {
 	$object->default_c_exp_tax_cat = GETPOST('default_c_exp_tax_cat', 'int');
 	$result = $object->update($user);
 	if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 }
 
 // update default range
-if ($action == 'setdefault_range')
-{
+if ($action == 'setdefault_range') {
 	$object->default_range = GETPOST('default_range', 'int');
 	$result = $object->update($user);
 	if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
@@ -220,6 +218,8 @@ if ($action == 'setdefault_range')
  *	View
  */
 
+$form = new Form($db);
+
 $childids = $user->getAllChildIds(1);
 
 llxHeader(null, $langs->trans("BankAccounts"));
@@ -228,18 +228,18 @@ $head = user_prepare_head($object);
 
 if ($id && $bankid && $action == 'edit' && $user->rights->user->user->creer)
 {
-    print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="update">';
-    print '<input type="hidden" name="id" value="'.GETPOST("id", 'int').'">';
-    print '<input type="hidden" name="bankid" value="'.$bankid.'">';
+	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="update">';
+	print '<input type="hidden" name="id" value="'.GETPOST("id", 'int').'">';
+	print '<input type="hidden" name="bankid" value="'.$bankid.'">';
 }
 if ($id && $action == 'create' && $user->rights->user->user->creer)
 {
-    print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="add">';
-    print '<input type="hidden" name="bankid" value="'.$bankid.'">';
+	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="add">';
+	print '<input type="hidden" name="bankid" value="'.$bankid.'">';
 }
 
 
@@ -247,7 +247,7 @@ if ($id && $action == 'create' && $user->rights->user->user->creer)
 if ($action != 'edit' && $action != 'create')		// If not bank account yet, $account may be empty
 {
 	$title = $langs->trans("User");
-	dol_fiche_head($head, 'bank', $title, -1, 'user');
+	print dol_get_fiche_head($head, 'bank', $title, -1, 'user');
 
 	$linkback = '';
 
@@ -255,17 +255,17 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 		$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	}
 
-    dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
 
-    print '<div class="fichecenter"><div class="fichehalfleft">';
+	print '<div class="fichecenter"><div class="fichehalfleft">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border centpercent tableforfield">';
+	print '<table class="border centpercent tableforfield">';
 
-    print '<tr><td class="titlefield">'.$langs->trans("Login").'</td>';
-    print '<td>'.$object->login.'</td>';
-    print '</tr>';
+	print '<tr><td class="titlefield">'.$langs->trans("Login").'</td>';
+	print '<td>'.$object->login.'</td>';
+	print '</tr>';
 
 	print '<tr class="nowrap">';
 	print '<td>';
@@ -296,7 +296,7 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 			$ret .= '<input type="hidden" name="id" value="'.$object->id.'">';
 			$ret .= $form->selectExpenseCategories($object->default_c_exp_tax_cat, 'default_c_exp_tax_cat', 1);
 			$ret .= '<input type="submit" class="button" name="modify" value="'.$langs->trans("Modify").'"> ';
-			$ret .= '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+			$ret .= '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 			$ret .= '</form>';
 			print $ret;
 		} else {
@@ -318,7 +318,7 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 			$maxRangeNum = ExpenseReportIk::getMaxRangeNumber($object->default_c_exp_tax_cat);
 			$ret .= $form->selectarray('default_range', range(0, $maxRangeNum), $object->default_range);
 			$ret .= '<input type="submit" class="button" name="modify" value="'.$langs->trans("Modify").'"> ';
-			$ret .= '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+			$ret .= '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 			$ret .= '</form>';
 			print $ret;
 		} else {
@@ -328,16 +328,14 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 		print '</tr>';
 	}
 
-    print '</table>';
+	print '</table>';
 
 	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 	// Nbre max d'elements des petites listes
 	$MAXLIST = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
-	/*
-	 * Latest salary payments
-	 */
+	// Latest payments of salaries
 	if (!empty($conf->salaries->enabled) &&
 		$user->rights->salaries->read && (in_array($object->id, $childids) || $object->id == $user->id)
 		)
@@ -355,9 +353,9 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 		{
 			$num = $db->num_rows($resql);
 
-	        print '<table class="noborder centpercent">';
+			print '<table class="noborder centpercent">';
 
-            print '<tr class="liste_titre">';
+			print '<tr class="liste_titre">';
    			print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastSalaries", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/salaries/list.php?search_user='.$object->login.'">'.$langs->trans("AllSalaries").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
    			print '</tr></table></td>';
    			print '</tr>';
@@ -368,14 +366,17 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 				$objp = $db->fetch_object($resql);
 
 				print '<tr class="oddeven">';
-                print '<td class="nowrap">';
-                $salary->id = $objp->rowid;
+				print '<td class="nowraponall">';
+				$salary->id = $objp->rowid;
 				$salary->ref = $objp->rowid;
+				print $salary->getNomUrl(1);
+				print '</td>';
 
-                print $salary->getNomUrl(1);
-				print '</td><td class="right" width="80px">'.dol_print_date($db->jdate($objp->datesp), 'day')."</td>\n";
+				print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->datesp), 'day')."</td>\n";
 				print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->dateep), 'day')."</td>\n";
-				print '<td class="right" style="min-width: 60px">'.price($objp->amount).'</td></tr>';
+				print '<td class="right" style="min-width: 60px">'.price($objp->amount).'</td>';
+
+				print '</tr>';
 				$i++;
 			}
 			$db->free($resql);
@@ -391,15 +392,15 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 	 * Last holidays
 	 */
 	if (!empty($conf->holiday->enabled) &&
-		($user->rights->holiday->read_all || ($user->rights->holiday->read && $object->id == $user->id))
+		($user->rights->holiday->readall || ($user->rights->holiday->read && $object->id == $user->id))
 		)
 	{
 		$holiday = new Holiday($db);
 
-		$sql = "SELECT h.rowid, h.statut, h.fk_type, h.date_debut, h.date_fin, h.halfday";
+		$sql = "SELECT h.rowid, h.statut as status, h.fk_type, h.date_debut, h.date_fin, h.halfday";
 		$sql .= " FROM ".MAIN_DB_PREFIX."holiday as h";
 		$sql .= " WHERE h.fk_user = ".$object->id;
-		$sql .= " AND h.entity = ".$conf->entity;
+		$sql .= " AND h.entity IN (".getEntity('holiday').")";
 		$sql .= " ORDER BY h.date_debut DESC";
 
 		$resql = $db->query($sql);
@@ -407,9 +408,9 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 		{
 			$num = $db->num_rows($resql);
 
-	        print '<table class="noborder centpercent">';
+			print '<table class="noborder centpercent">';
 
-            print '<tr class="liste_titre">';
+			print '<tr class="liste_titre">';
   			print '<td colspan="4"><table class="nobordernopadding centpercent"><tr><td>'.$langs->trans("LastHolidays", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/holiday/list.php?id='.$object->id.'">'.$langs->trans("AllHolidays").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
    			print '</tr></table></td>';
    			print '</tr>';
@@ -419,17 +420,18 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 			{
 				$objp = $db->fetch_object($resql);
 
-				print '<tr class="oddeven">';
-                print '<td class="nowrap">';
-                $holiday->id = $objp->rowid;
+				$holiday->id = $objp->rowid;
 				$holiday->ref = $objp->rowid;
-                $holiday->fk_type = $objp->fk_type;
+				$holiday->fk_type = $objp->fk_type;
+				$holiday->statut = $objp->status;
 				$nbopenedday = num_open_day($db->jdate($objp->date_debut), $db->jdate($objp->date_fin), 0, 1, $objp->halfday);
 
-                print $holiday->getNomUrl(1);
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">';
+				print $holiday->getNomUrl(1);
 				print '</td><td class="right" width="80px">'.dol_print_date($db->jdate($objp->date_debut), 'day')."</td>\n";
 				print '<td class="right" style="min-width: 60px">'.$nbopenedday.' '.$langs->trans('DurationDays').'</td>';
-				print '<td class="right" style="min-width: 60px" class="nowrap">'.$holiday->LibStatut($objp->statut, 5).'</td></tr>';
+				print '<td class="right" style="min-width: 60px" class="nowrap">'.$holiday->LibStatut($objp->status, 5).'</td></tr>';
 				$i++;
 			}
 			$db->free($resql);
@@ -450,7 +452,7 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 	{
 		$exp = new ExpenseReport($db);
 
-		$sql = "SELECT e.rowid, e.ref, e.fk_statut, e.date_debut, e.total_ttc";
+		$sql = "SELECT e.rowid, e.ref, e.fk_statut as status, e.date_debut, e.total_ttc";
 		$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as e";
 		$sql .= " WHERE e.fk_user_author = ".$object->id;
 		$sql .= " AND e.entity = ".$conf->entity;
@@ -461,9 +463,9 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 		{
 			$num = $db->num_rows($resql);
 
-	        print '<table class="noborder centpercent">';
+			print '<table class="noborder centpercent">';
 
-            print '<tr class="liste_titre">';
+			print '<tr class="liste_titre">';
    			print '<td colspan="4"><table class="nobordernopadding centpercent"><tr><td>'.$langs->trans("LastExpenseReports", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/expensereport/list.php?id='.$object->id.'">'.$langs->trans("AllExpenseReports").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
    			print '</tr></table></td>';
    			print '</tr>';
@@ -473,16 +475,17 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 			{
 				$objp = $db->fetch_object($resql);
 
-				print '<tr class="oddeven">';
-                print '<td class="nowrap">';
-                $exp->id = $objp->rowid;
+				$exp->id = $objp->rowid;
 				$exp->ref = $objp->ref;
-                $exp->fk_type = $objp->fk_type;
+				$exp->fk_type = $objp->fk_type;
+				$exp->status = $objp->status;
 
-                print $exp->getNomUrl(1);
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">';
+				print $exp->getNomUrl(1);
 				print '</td><td class="right" width="80px">'.dol_print_date($db->jdate($objp->date_debut), 'day')."</td>\n";
 				print '<td class="right" style="min-width: 60px">'.price($objp->total_ttc).'</td>';
-				print '<td class="right nowrap" style="min-width: 60px">'.$exp->LibStatut($objp->fk_statut, 5).'</td></tr>';
+				print '<td class="right nowrap" style="min-width: 60px">'.$exp->LibStatut($objp->status, 5).'</td></tr>';
 				$i++;
 			}
 			$db->free($resql);
@@ -494,16 +497,22 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 		}
 	}
 
-    print '</div></div></div>';
+	print '</div></div></div>';
 	print '<div style="clear:both"></div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
 	// List of bank accounts (Currently only one bank account possible for each employee)
 
 	$morehtmlright = '';
 	if ($account->id == 0) {
-		$morehtmlright = dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=create');
+		if ($permissiontoaddbankaccount) {
+			$morehtmlright = dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=create');
+		} else {
+			$morehtmlright = dolGetButtonTitle($langs->trans('Add'), 'NotEnoughPermission', 'fa fa-plus-circle', '', '', -2);
+		}
+	} else {
+		$morehtmlright = dolGetButtonTitle($langs->trans('Add'), 'AlreadyOneBankAccount', 'fa fa-plus-circle', '', '', -2);
 	}
 
 	print load_fiche_titre($langs->trans("BankAccounts"), $morehtmlright, 'bank_account');
@@ -569,8 +578,8 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 
 		// Edit/Delete
 		print '<td class="right nowraponall">';
-		if ($user->rights->hrm->employee->write || $user->rights->user->creer) {
-			print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&bankid='.$account->id.'&action=edit">';
+		if ($permissiontoaddbankaccount) {
+			print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&bankid='.$account->id.'&action=edit">';
 			print img_picto($langs->trans("Modify"), 'edit');
 			print '</a>';
 		}
@@ -594,22 +603,22 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 if ($id && ($action == 'edit' || $action == 'create') && $user->rights->user->user->creer)
 {
 	$title = $langs->trans("User");
-	dol_fiche_head($head, 'bank', $title, 0, 'user');
+	print dol_get_fiche_head($head, 'bank', $title, 0, 'user');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
 
-    //print '<div class="fichecenter">';
+	//print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">';
 
-    print '<tr><td class="titlefield fieldrequired">'.$langs->trans("LabelRIB").'</td>';
-    print '<td colspan="4"><input size="30" type="text" name="label" value="'.$account->label.'"></td></tr>';
+	print '<tr><td class="titlefield fieldrequired">'.$langs->trans("LabelRIB").'</td>';
+	print '<td colspan="4"><input size="30" type="text" name="label" value="'.$account->label.'"></td></tr>';
 
-    print '<tr><td class="fieldrequired">'.$langs->trans("BankName").'</td>';
-    print '<td><input size="30" type="text" name="bank" value="'.$account->bank.'"></td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("BankName").'</td>';
+	print '<td><input size="30" type="text" name="bank" value="'.$account->bank.'"></td></tr>';
 
 	// Show fields of bank account
 	foreach ($account->getFieldsToShow() as $val) {
@@ -636,38 +645,38 @@ if ($id && ($action == 'edit' || $action == 'create') && $user->rights->user->us
 		print '</tr>';
 	}
 
-    // IBAN
-    print '<tr><td class="fieldrequired">'.$langs->trans("IBAN").'</td>';
-    print '<td colspan="4"><input size="30" type="text" name="iban" value="'.$account->iban.'"></td></tr>';
+	// IBAN
+	print '<tr><td class="fieldrequired">'.$langs->trans("IBAN").'</td>';
+	print '<td colspan="4"><input size="30" type="text" name="iban" value="'.$account->iban.'"></td></tr>';
 
-    print '<tr><td class="fieldrequired">'.$langs->trans("BIC").'</td>';
-    print '<td colspan="4"><input size="12" type="text" name="bic" value="'.$account->bic.'"></td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("BIC").'</td>';
+	print '<td colspan="4"><input size="12" type="text" name="bic" value="'.$account->bic.'"></td></tr>';
 
-    print '<tr><td class="tdtop">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="4">';
-    print '<textarea name="domiciliation" rows="4" class="quatrevingtpercent">';
-    print $account->domiciliation;
-    print "</textarea></td></tr>";
+	print '<tr><td class="tdtop">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="4">';
+	print '<textarea name="domiciliation" rows="4" class="quatrevingtpercent">';
+	print $account->domiciliation;
+	print "</textarea></td></tr>";
 
-    print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
-    print '<td colspan="4"><input size="30" type="text" name="proprio" value="'.$account->proprio.'"></td></tr>';
-    print "</td></tr>\n";
+	print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
+	print '<td colspan="4"><input size="30" type="text" name="proprio" value="'.$account->proprio.'"></td></tr>';
+	print "</td></tr>\n";
 
-    print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="4">';
-    print '<textarea name="owner_address" rows="4" class="quatrevingtpercent">';
-    print $account->owner_address;
-    print "</textarea></td></tr>";
+	print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="4">';
+	print '<textarea name="owner_address" rows="4" class="quatrevingtpercent">';
+	print $account->owner_address;
+	print "</textarea></td></tr>";
 
-    print '</table>';
+	print '</table>';
 
-    //print '</div>';
+	//print '</div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input class="button" value="'.$langs->trans("Modify").'" type="submit">';
-    print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
-    print '</div>';
+	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+	print '<input class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
+	print '</div>';
 }
 
 if ($id && $action == 'edit' && $user->rights->user->user->creer) print '</form>';
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 95a60804cfb..a35ffbad1b5 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -13,7 +13,7 @@
  * Copyright (C) 2015      Ari Elbaz (elarifr)  <github@accedinfo.com>
  * Copyright (C) 2015-2018 Charlene Benke       <charlie@patas-monkey.com>
  * Copyright (C) 2016      Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2018-2019  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric France     <frederic.france@netlogic.fr>
  * Copyright (C) 2018       David Beniamine     <David.Beniamine@Tetras-Libre.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -204,6 +204,7 @@ if (empty($reshook)) {
 		}
 
 		if (!$error) {
+			$object->civility_code = GETPOST("civility_code", 'aZ09');
 			$object->lastname = GETPOST("lastname", 'alphanohtml');
 			$object->firstname = GETPOST("firstname", 'alphanohtml');
 			$object->login = GETPOST("login", 'alphanohtml');
@@ -366,6 +367,7 @@ if (empty($reshook)) {
 
 				$db->begin();
 
+				$object->civility_code = GETPOST("civility_code", 'aZ09');
 				$object->lastname = GETPOST("lastname", 'alphanohtml');
 				$object->firstname = GETPOST("firstname", 'alphanohtml');
 				$object->login = GETPOST("login", 'alphanohtml');
@@ -509,15 +511,15 @@ if (empty($reshook)) {
 				}
 
 				if (!$error && !count($object->errors)) {
-					if (GETPOST('deletephoto') && $object->photo) {
-						$fileimg = $conf->user->dir_output.'/'.get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/logos/'.$object->photo;
-						$dirthumbs = $conf->user->dir_output.'/'.get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/logos/thumbs';
+					if (GETPOST('deletephoto') && $object->oldcopy->photo) {
+						$fileimg = $conf->user->dir_output.'/'.get_exdir(0, 0, 0, 0, $object, 'user').$object->oldcopy->photo;
+						$dirthumbs = $conf->user->dir_output.'/'.get_exdir(0, 0, 0, 0, $object, 'user').'/thumbs';
 						dol_delete_file($fileimg);
 						dol_delete_dir_recursive($dirthumbs);
 					}
 
 					if (isset($_FILES['photo']['tmp_name']) && trim($_FILES['photo']['tmp_name'])) {
-						$dir = $conf->user->dir_output.'/'.get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id;
+						$dir = $conf->user->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, 'user');
 
 						dol_mkdir($dir);
 
@@ -690,12 +692,6 @@ llxHeader('', $langs->trans("UserCard"));
 
 if ($action == 'create' || $action == 'adduserldap')
 {
-	/* ************************************************************************** */
-	/*                                                                            */
-	/* Affichage fiche en mode creation                                           */
-	/*                                                                            */
-	/* ************************************************************************** */
-
 	print load_fiche_titre($langs->trans("NewUser"), '', 'user');
 
 	print '<span class="opacitymedium">'.$langs->trans("CreateInternalUserDesc")."</span><br>\n";
@@ -704,11 +700,7 @@ if ($action == 'create' || $action == 'adduserldap')
 
 	if (!empty($conf->ldap->enabled) && (isset($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr'))
 	{
-		/*
-         * Affiche formulaire d'ajout d'un compte depuis LDAP
-         * si on est en synchro LDAP vers Dolibarr
-         */
-
+		// Show form to add an account from LDAP if sync LDAP -> Dolibarr is set
 		$ldap = new Ldap();
 		$result = $ldap->connect_bind();
 		if ($result >= 0)
@@ -747,10 +739,12 @@ if ($action == 'create' || $action == 'adduserldap')
 					$label = '';
 					foreach ($required_fields as $value)
 					{
-						if ($value)
-						{
-							$label .= $value."=".$ldapuser[$value]." ";
-						}
+						if ($value === $conf->global->LDAP_FIELD_PASSWORD || $value === $conf->global->LDAP_FIELD_PASSWORD_CRYPTED)
+ 						{
+ 							$label .= $value."=******* ";
+ 						} elseif ($value) {
+ 							$label .= $value."=".$ldapuser[$value]." ";
+ 						}
 					}
 					$liste[$key] = $label;
 				}
@@ -793,12 +787,17 @@ if ($action == 'create' || $action == 'adduserldap')
 	if (!empty($ldap_sid)) print '<input type="hidden" name="ldap_sid" value="'.dol_escape_htmltag($ldap_sid).'">';
 	print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
 
-	dol_fiche_head('', '', '', 0, '');
+	print dol_get_fiche_head('', '', '', 0, '');
 
 	print dol_set_focus('#lastname');
 
 	print '<table class="border centpercent">';
 
+	// Civility
+	print '<tr><td><label for="civility_code">'.$langs->trans("UserTitle").'</label></td><td colspan="3">';
+	print $formcompany->select_civility(GETPOSTISSET("civility_code") ? GETPOST("civility_code", 'aZ09') : $object->civility_code, 'civility_code');
+	print '</td></tr>';
+
 	// Lastname
 	print '<tr>';
 	print '<td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Lastname").'</span></td>';
@@ -940,12 +939,6 @@ if ($action == 'create' || $action == 'adduserldap')
 		print "</td></tr>\n";
 	}
 
-	// Type
-	print '<tr><td>'.$langs->trans("Type").'</td>';
-	print '<td>';
-	print $form->textwithpicto($langs->trans("Internal"), $langs->trans("InternalExternalDesc"), 1, 'help', '', 0, 2);
-	print '</td></tr>';
-
 	// Gender
 	print '<tr><td>'.$langs->trans("Gender").'</td>';
 	print '<td>';
@@ -963,7 +956,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	// Hierarchy
 	print '<tr><td class="titlefieldcreate">'.$langs->trans("HierarchicalResponsible").'</td>';
 	print '<td>';
-	print $form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $conf->entity, 0, 0, '', 0, '', 'maxwidth300');
+	print img_picto('', 'user').$form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $conf->entity, 0, 0, '', 0, '', 'maxwidth300');
 	print '</td>';
 	print "</tr>\n";
 
@@ -975,7 +968,7 @@ if ($action == 'create' || $action == 'adduserldap')
 		print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
 		print '</td>';
 		print '<td>';
-		print $form->select_dolusers($object->fk_user_expense_validator, 'fk_user_expense_validator', 1, array($object->id), 0, '', 0, $conf->entity, 0, 0, '', 0, '', 'maxwidth300');
+		print img_picto('', 'user').$form->select_dolusers($object->fk_user_expense_validator, 'fk_user_expense_validator', 1, array($object->id), 0, '', 0, $conf->entity, 0, 0, '', 0, '', 'maxwidth300');
 		print '</td>';
 		print "</tr>\n";
 	}
@@ -988,11 +981,16 @@ if ($action == 'create' || $action == 'adduserldap')
 		print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
 		print '</td>';
 		print '<td>';
-		print $form->select_dolusers($object->fk_user_holiday_validator, 'fk_user_holiday_validator', 1, array($object->id), 0, '', 0, $conf->entity, 0, 0, '', 0, '', 'maxwidth300');
+		print img_picto('', 'user').$form->select_dolusers($object->fk_user_holiday_validator, 'fk_user_holiday_validator', 1, array($object->id), 0, '', 0, $conf->entity, 0, 0, '', 0, '', 'maxwidth300');
 		print '</td>';
 		print "</tr>\n";
 	}
 
+	// External user
+	print '<tr><td>'.$langs->trans("ExternalUser").' ?</td>';
+	print '<td>';
+	print $form->textwithpicto($langs->trans("Internal"), $langs->trans("InternalExternalDesc"), 1, 'help', '', 0, 2);
+	print '</td></tr>';
 
 	print '</table><hr><table class="border centpercent">';
 
@@ -1028,50 +1026,54 @@ if ($action == 'create' || $action == 'adduserldap')
 	}
 
 	// Tel
-	print '<tr><td>'.img_picto('', 'object_phoning').' '.$langs->trans("PhonePro").'</td>';
+	print '<tr><td>'.$langs->trans("PhonePro").'</td>';
 	print '<td>';
+	print img_picto('', 'object_phoning');
 	if (!empty($ldap_phone))
 	{
 		print '<input type="hidden" name="office_phone" value="'.dol_escape_htmltag($ldap_phone).'">';
 		print $ldap_phone;
 	} else {
-		print '<input size="20" type="text" name="office_phone" value="'.dol_escape_htmltag(GETPOST('office_phone', 'alphanohtml')).'">';
+		print '<input type="text" name="office_phone" value="'.dol_escape_htmltag(GETPOST('office_phone', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
 
 	// Tel portable
-	print '<tr><td>'.img_picto('', 'object_phoning_mobile').' '.$langs->trans("PhoneMobile").'</td>';
+	print '<tr><td>'.$langs->trans("PhoneMobile").'</td>';
 	print '<td>';
+	print img_picto('', 'object_phoning_mobile');
 	if (!empty($ldap_mobile))
 	{
 		print '<input type="hidden" name="user_mobile" value="'.dol_escape_htmltag($ldap_mobile).'">';
 		print $ldap_mobile;
 	} else {
-		print '<input size="20" type="text" name="user_mobile" value="'.dol_escape_htmltag(GETPOST('user_mobile', 'alphanohtml')).'">';
+		print '<input type="text" name="user_mobile" value="'.dol_escape_htmltag(GETPOST('user_mobile', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
 
 	// Fax
-	print '<tr><td>'.img_picto('', 'object_phoning_fax').' '.$langs->trans("Fax").'</td>';
+	print '<tr><td>'.$langs->trans("Fax").'</td>';
 	print '<td>';
+	print img_picto('', 'object_phoning_fax');
 	if (!empty($ldap_fax))
 	{
 		print '<input type="hidden" name="office_fax" value="'.dol_escape_htmltag($ldap_fax).'">';
 		print $ldap_fax;
 	} else {
-		print '<input size="20" type="text" name="office_fax" value="'.dol_escape_htmltag(GETPOST('office_fax', 'alphanohtml')).'">';
+		print '<input type="text" name="office_fax" value="'.dol_escape_htmltag(GETPOST('office_fax', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
 
 	// EMail
-	print '<tr><td'.(!empty($conf->global->USER_MAIL_REQUIRED) ? ' class="fieldrequired"' : '').'>'.img_picto('', 'object_email').' '.$langs->trans("EMail").'</td>';
+	print '<tr><td'.(!empty($conf->global->USER_MAIL_REQUIRED) ? ' class="fieldrequired"' : '').'>'.$langs->trans("EMail").'</td>';
 	print '<td>';
+	print img_picto('', 'object_email');
 	if (!empty($ldap_mail))
 	{
 		print '<input type="hidden" name="email" value="'.dol_escape_htmltag($ldap_mail).'">';
 		print $ldap_mail;
 	} else {
-		print '<input size="40" type="text" name="email" value="'.dol_escape_htmltag(GETPOST('email', 'alphanohtml')).'">';
+		print '<input type="text" name="email" class="maxwidth500 widthcentpercentminusx" value="'.dol_escape_htmltag(GETPOST('email', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
 
@@ -1103,7 +1105,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	{
 		print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
 		print '<td>';
-		print '<input size="30" type="text" name="accountancy_code" value="'.dol_escape_htmltag(GETPOST('accountancy_code', 'alphanohtml')).'">';
+		print '<input type="text" name="accountancy_code" value="'.dol_escape_htmltag(GETPOST('accountancy_code', 'alphanohtml')).'">';
 		print '</td></tr>';
 	}
 
@@ -1262,22 +1264,17 @@ if ($action == 'create' || $action == 'adduserldap')
 
 	print "</table>\n";
 
- 	dol_fiche_end();
+ 	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input class="button" value="'.$langs->trans("CreateUser").'" name="create" type="submit">';
 	//print '&nbsp; &nbsp; &nbsp;';
-	//print '<input value="'.$langs->trans("Cancel").'" class="button" type="submit" name="cancel">';
+	//print '<input value="'.$langs->trans("Cancel").'" class="button button-cancel" type="submit" name="cancel">';
 	print '</div>';
 
 	print "</form>";
 } else {
-	/* ************************************************************************** */
-	/*                                                                            */
-	/* View and edition                                                            */
-	/*                                                                            */
-	/* ************************************************************************** */
-
+	// View and edit mode
 	if ($id > 0)
 	{
 		$object->fetch($id, '', '', 1);
@@ -1395,7 +1392,7 @@ if ($action == 'create' || $action == 'adduserldap')
          */
 		if ($action != 'edit')
 		{
-			dol_fiche_head($head, 'user', $title, -1, 'user');
+			print dol_get_fiche_head($head, 'user', $title, -1, 'user');
 
 			dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
 
@@ -1446,8 +1443,10 @@ if ($action == 'create' || $action == 'adduserldap')
 			}
 			if (preg_match('/dolibarr/', $dolibarr_main_authentication))
 			{
-				if ($object->pass) $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').preg_replace('/./i', '*', $object->pass);
-				else {
+				if ($object->pass) {
+					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '');
+					$valuetoshow .= '<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
+				} else {
 					if ($user->admin && $user->id == $object->id) {
 						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '');
 						//$valuetoshow .= '<span class="opacitymedium">'.$langs->trans("Crypted").' - </span>';
@@ -1574,10 +1573,12 @@ if ($action == 'create' || $action == 'adduserldap')
 			if (!empty($conf->stock->enabled) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER))
 			{
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
-				$warehousestatic = new Entrepot($db);
-				$warehousestatic->fetch($object->fk_warehouse);
 				print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
-				print $warehousestatic->getNomUrl(1);
+				if ($object->fk_warehouse > 0) {
+					$warehousestatic = new Entrepot($db);
+					$warehousestatic->fetch($object->fk_warehouse);
+					print $warehousestatic->getNomUrl(1);
+				}
 				print '</td></tr>';
 			}
 
@@ -1755,22 +1756,28 @@ if ($action == 'create' || $action == 'adduserldap')
 			{
 				print '<tr><td>'.$langs->trans("LinkToCompanyContact").'</td>';
 				print '<td>';
+				$s = '';
 				if (isset($object->socid) && $object->socid > 0)
 				{
 					$societe = new Societe($db);
 					$societe->fetch($object->socid);
-					print $societe->getNomUrl(1, '');
+					if ($societe->id > 0) {
+						$s .= $societe->getNomUrl(1, '');
+					}
 				} else {
-					print $langs->trans("ThisUserIsNot");
+					$s .= '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ThisUserIsNot").'</span>';
 				}
 				if (!empty($object->contact_id))
 				{
 					$contact = new Contact($db);
 					$contact->fetch($object->contact_id);
-					if ($object->socid > 0) print ' / ';
-					else print '<br>';
-					print $contact->getNomUrl(1, '');
+					if ($contact->id > 0) {
+						if ($object->socid > 0 && $s) $s .= ' / ';
+						else $s .= '<br>';
+						$s .= $contact->getNomUrl(1, '');
+					}
 				}
+				print $s;
 				print '</td>';
 				print '</tr>'."\n";
 			}
@@ -1786,9 +1793,9 @@ if ($action == 'create' || $action == 'adduserldap')
 					$adh = new Adherent($db);
 					$adh->fetch($object->fk_member);
 					$adh->ref = $adh->getFullname($langs); // Force to show login instead of id
-					print $adh->getNomUrl(1);
+					print $adh->getNomUrl(-1);
 				} else {
-					print $langs->trans("UserNotLinkedToMember");
+					print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("UserNotLinkedToMember").'</span>';
 				}
 				print '</td>';
 				print '</tr>'."\n";
@@ -1815,7 +1822,7 @@ if ($action == 'create' || $action == 'adduserldap')
 			print '<div style="clear:both"></div>';
 
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 
 			/*
@@ -1841,8 +1848,7 @@ if ($action == 'create' || $action == 'adduserldap')
 
 				if ($caneditfield && (empty($conf->multicompany->enabled) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
 				{
-					if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
-					{
+					if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("DisabledInMonoUserMode")).'">'.$langs->trans("Modify").'</a></div>';
 					} else {
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>';
@@ -2024,7 +2030,7 @@ if ($action == 'create' || $action == 'adduserldap')
 			print '<input type="hidden" name="action" value="update">';
 			print '<input type="hidden" name="entity" value="'.$object->entity.'">';
 
-			dol_fiche_head($head, 'user', $title, 0, 'user');
+			print dol_get_fiche_head($head, 'user', $title, 0, 'user');
 
 			print '<table class="border centpercent">';
 
@@ -2038,6 +2044,11 @@ if ($action == 'create' || $action == 'adduserldap')
 				print '</tr>';
 			}
 
+			// Civility
+			print '<tr><td><label for="civility_code">'.$langs->trans("UserTitle").'</label></td><td colspan="3">';
+			print $formcompany->select_civility(GETPOSTISSET("civility_code") ? GETPOST("civility_code", 'aZ09') : $object->civility_code, 'civility_code');
+			print '</td></tr>';
+
 			// Lastname
 			print "<tr>";
 			print '<td class="titlefield fieldrequired">'.$langs->trans("Lastname").'</td>';
@@ -2198,36 +2209,6 @@ if ($action == 'create' || $action == 'adduserldap')
 				print '</td></tr>';
 			}
 
-		   	// Type
-		   	print '<tr><td>'.$langs->trans("Type").'</td>';
-		   	print '<td>';
-		   	if ($user->id == $object->id || !$user->admin)
-		   	{
-		   		// Read mode
-			   	$type = $langs->trans("Internal");
-			   	if ($object->socid) $type = $langs->trans("External");
-			   	print $form->textwithpicto($type, $langs->trans("InternalExternalDesc"));
-			   	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
-		   	} else {
-				// Select mode
-				$type = 0;
-				if ($object->contact_id) $type = $object->contact_id;
-
-				if ($object->socid > 0 && ! ($object->contact_id > 0)) {	// external user but no link to a contact
-					print img_picto('', 'company').$form->select_company($object->socid, 'socid', '', '&nbsp;');
-					print img_picto('', 'contact').$form->selectcontacts(0, 0, 'contactid', 1, '', '', 1, '', false, 1);
-					if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
-				} elseif ($object->socid > 0 && $object->contact_id > 0) {	// external user with a link to a contact
-					print img_picto('', 'company').$form->select_company(0, 'socid', '', '&nbsp;');	// We keep thirdparty empty, contact is already set
-					print img_picto('', 'contact').$form->selectcontacts(0, $object->contact_id, 'contactid', 1, '', '', 1, '', false, 1);
-			   		if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
-				} else {	// $object->socid is not > 0 here
-					print img_picto('', 'company').$form->select_company(0, 'socid', '', '&nbsp;');	// We keep thirdparty empty, contact is already set
-					print img_picto('', 'contact').$form->selectcontacts(0, 0, 'contactid', 1, '', '', 1, '', false, 1);
-				}
-			}
-		   	print '</td></tr>';
-
 		   	// Gender
 		   	print '<tr><td>'.$langs->trans("Gender").'</td>';
 		   	print '<td>';
@@ -2308,6 +2289,35 @@ if ($action == 'create' || $action == 'adduserldap')
 				print "</tr>\n";
 			}
 
+			// External user ?
+			print '<tr><td>'.$langs->trans("ExternalUser").' ?</td>';
+			print '<td>';
+			if ($user->id == $object->id || !$user->admin)
+			{
+				// Read mode
+				$type = $langs->trans("Internal");
+				if ($object->socid) $type = $langs->trans("External");
+				print $form->textwithpicto($type, $langs->trans("InternalExternalDesc"));
+				if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
+			} else {
+				// Select mode
+				$type = 0;
+				if ($object->contact_id) $type = $object->contact_id;
+
+				if ($object->socid > 0 && !($object->contact_id > 0)) {	// external user but no link to a contact
+					print img_picto('', 'company').$form->select_company($object->socid, 'socid', '', '&nbsp;');
+					print img_picto('', 'contact').$form->selectcontacts(0, 0, 'contactid', 1, '', '', 1, '', false, 1);
+					if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
+				} elseif ($object->socid > 0 && $object->contact_id > 0) {	// external user with a link to a contact
+					print img_picto('', 'company').$form->select_company(0, 'socid', '', '&nbsp;'); // We keep thirdparty empty, contact is already set
+					print img_picto('', 'contact').$form->selectcontacts(0, $object->contact_id, 'contactid', 1, '', '', 1, '', false, 1);
+					if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
+				} else {	// $object->socid is not > 0 here
+					print img_picto('', 'company').$form->select_company(0, 'socid', '', '&nbsp;'); // We keep thirdparty empty, contact is already set
+					print img_picto('', 'contact').$form->selectcontacts(0, 0, 'contactid', 1, '', '', 1, '', false, 1);
+				}
+			}
+			print '</td></tr>';
 
 		   	print '</table><hr><table class="border centpercent">';
 
@@ -2362,11 +2372,12 @@ if ($action == 'create' || $action == 'adduserldap')
 			}
 
 			// Tel pro
-			print "<tr>".'<td>'.img_picto('', 'object_phoning').' '.$langs->trans("PhonePro").'</td>';
+			print "<tr>".'<td>'.$langs->trans("PhonePro").'</td>';
 			print '<td>';
+			print img_picto('', 'object_phoning');
 			if ($caneditfield && empty($object->ldap_sid))
 			{
-				print '<input size="20" type="text" name="office_phone" class="flat" value="'.$object->office_phone.'">';
+				print '<input type="text" name="office_phone" class="flat maxwidth200" value="'.$object->office_phone.'">';
 			} else {
 				print '<input type="hidden" name="office_phone" value="'.$object->office_phone.'">';
 				print $object->office_phone;
@@ -2374,11 +2385,12 @@ if ($action == 'create' || $action == 'adduserldap')
 			print '</td></tr>';
 
 			// Tel mobile
-			print "<tr>".'<td>'.img_picto('', 'object_phoning_mobile').' '.$langs->trans("PhoneMobile").'</td>';
+			print "<tr>".'<td>'.$langs->trans("PhoneMobile").'</td>';
 			print '<td>';
+			print img_picto('', 'object_phoning_mobile');
 			if ($caneditfield && empty($object->ldap_sid))
 			{
-				print '<input size="20" type="text" name="user_mobile" class="flat" value="'.$object->user_mobile.'">';
+				print '<input type="text" name="user_mobile" class="flat maxwidth200" value="'.$object->user_mobile.'">';
 			} else {
 				print '<input type="hidden" name="user_mobile" value="'.$object->user_mobile.'">';
 				print $object->user_mobile;
@@ -2386,11 +2398,12 @@ if ($action == 'create' || $action == 'adduserldap')
 			print '</td></tr>';
 
 			// Fax
-			print "<tr>".'<td>'.img_picto('', 'object_phoning_fax').' '.$langs->trans("Fax").'</td>';
+			print "<tr>".'<td>'.$langs->trans("Fax").'</td>';
 			print '<td>';
+			print img_picto('', 'object_phoning_fax');
 			if ($caneditfield && empty($object->ldap_sid))
 			{
-				print '<input size="20" type="text" name="office_fax" class="flat" value="'.$object->office_fax.'">';
+				print '<input type="text" name="office_fax" class="flat maxwidth200" value="'.$object->office_fax.'">';
 			} else {
 				print '<input type="hidden" name="office_fax" value="'.$object->office_fax.'">';
 				print $object->office_fax;
@@ -2398,11 +2411,12 @@ if ($action == 'create' || $action == 'adduserldap')
 			print '</td></tr>';
 
 			// EMail
-			print "<tr>".'<td'.(!empty($conf->global->USER_MAIL_REQUIRED) ? ' class="fieldrequired"' : '').'>'.img_picto('', 'object_email').' '.$langs->trans("EMail").'</td>';
+			print "<tr>".'<td'.(!empty($conf->global->USER_MAIL_REQUIRED) ? ' class="fieldrequired"' : '').'>'.$langs->trans("EMail").'</td>';
 			print '<td>';
+			print img_picto('', 'object_email');
 			if ($caneditfield && empty($object->ldap_sid))
 			{
-				print '<input class="minwidth100" type="text" name="email" class="flat" value="'.$object->email.'">';
+				print '<input class="minwidth100 maxwidth500 widthcentpercentminusx" type="text" name="email" class="flat" value="'.$object->email.'">';
 			} else {
 				print '<input type="hidden" name="email" value="'.$object->email.'">';
 				print $object->email;
@@ -2480,7 +2494,7 @@ if ($action == 'create' || $action == 'adduserldap')
 			print '<tr>';
 			print '<td>'.$langs->trans("Photo").'</td>';
 			print '<td>';
-			print $form->showphoto('userphoto', $object, 60, 0, $caneditfield, 'photowithmargin', 'small');
+			print $form->showphoto('userphoto', $object, 60, 0, $caneditfield, 'photowithmargin', 'small', 1, 0, 'user', 1);
 			print '</td>';
 			print '</tr>';
 
@@ -2536,9 +2550,9 @@ if ($action == 'create' || $action == 'adduserldap')
 						print ' / <a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$object->contact_id.'">'.img_object($langs->trans("ShowContact"), 'contact').' '.dol_trunc($contact->getFullName($langs), 32).'</a>';
 					}
 				} else {
-					print $langs->trans("ThisUserIsNot");
+					print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ThisUserIsNot").'</span>';
 				}
-				print ' ('.$langs->trans("UseTypeFieldToChange").')';
+				print ' <span class="opacitymedium hideonsmartphone">('.$langs->trans("UseTypeFieldToChange").')</span>';
 				print '</td>';
 				print "</tr>\n";
 			}
@@ -2556,7 +2570,7 @@ if ($action == 'create' || $action == 'adduserldap')
 					$adh->ref = $adh->login; // Force to show login instead of id
 					print $adh->getNomUrl(1);
 				} else {
-					print $langs->trans("UserNotLinkedToMember");
+					print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("UserNotLinkedToMember").'</span>';
 				}
 				print '</td>';
 				print "</tr>\n";
@@ -2745,12 +2759,12 @@ if ($action == 'create' || $action == 'adduserldap')
 
 			print '</table>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
-			print '<input value="'.$langs->trans("Save").'" class="button" type="submit" name="save">';
+			print '<input value="'.$langs->trans("Save").'" class="button button-save" type="submit" name="save">';
 			print '&nbsp; &nbsp; &nbsp;';
-			print '<input value="'.$langs->trans("Cancel").'" class="button" type="submit" name="cancel">';
+			print '<input value="'.$langs->trans("Cancel").'" class="button button-cancel" type="submit" name="cancel">';
 			print '</div>';
 
 			print '</form>';
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index 5245ff0b961..e68ecb8bc1d 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -45,8 +45,8 @@ class Users extends DolibarrApi
 	/**
 	 * Constructor
 	 */
-    public function __construct()
-    {
+	public function __construct()
+	{
 		global $db, $conf;
 		$this->db = $db;
 		$this->useraccount = new User($this->db);
@@ -63,82 +63,79 @@ class Users extends DolibarrApi
 	 * @param int		$limit		Limit for list
 	 * @param int		$page		Page number
 	 * @param string   	$user_ids   User ids filter field. Example: '1' or '1,2,3'          {@pattern /^[0-9,]*$/i}
-     * @param  int    $category   Use this param to filter list by category
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+	 * @param  int    $category   Use this param to filter list by category
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
 	 * @return  array               Array of User objects
 	 */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = 0, $category = 0, $sqlfilters = '')
-    {
-	    global $db, $conf;
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = 0, $category = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
-	    $obj_ret = array();
+		$obj_ret = array();
 
 		if (!DolibarrApiAccess::$user->rights->user->user->lire) {
-	        throw new RestException(401, "You are not allowed to read list of users");
-	    }
+			throw new RestException(401, "You are not allowed to read list of users");
+		}
 
-	    // case of external user, $societe param is ignored and replaced by user's socid
-	    //$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $societe;
+		// case of external user, $societe param is ignored and replaced by user's socid
+		//$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $societe;
 
-	    $sql = "SELECT t.rowid";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."user as t";
-        if ($category > 0) {
-            $sql .= ", ".MAIN_DB_PREFIX."categorie_user as c";
-        }
-	    $sql .= ' WHERE t.entity IN ('.getEntity('user').')';
-	    if ($user_ids) $sql .= " AND t.rowid IN (".$user_ids.")";
+		$sql = "SELECT t.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."user as t";
+		if ($category > 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."categorie_user as c";
+		}
+		$sql .= ' WHERE t.entity IN ('.getEntity('user').')';
+		if ($user_ids) {
+			$sql .= " AND t.rowid IN (".$user_ids.")";
+		}
 
-    	// Select products of given category
-    	if ($category > 0) {
-    		$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
+		// Select products of given category
+		if ($category > 0) {
+			$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
 			$sql .= " AND c.fk_user = t.rowid ";
-    	}
+		}
 
-	    // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		// Add sql filters
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-	    if ($limit) {
-	        if ($page < 0)
-	        {
-	            $page = 0;
-	        }
-	        $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-	        $sql .= $this->db->plimit($limit + 1, $offset);
-	    }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-	    $result = $this->db->query($sql);
+		$result = $this->db->query($sql);
 
-	    if ($result)
-	    {
-	        $i = 0;
-	        $num = $this->db->num_rows($result);
-	        $min = min($num, ($limit <= 0 ? $num : $limit));
-	        while ($i < $min)
-	        {
-	        	$obj = $this->db->fetch_object($result);
-	        	$user_static = new User($this->db);
-	            if ($user_static->fetch($obj->rowid)) {
-	                $obj_ret[] = $this->_cleanObjectDatas($user_static);
-	            }
-	            $i++;
-	        }
-	    } else {
-	    	throw new RestException(503, 'Error when retrieve User list : '.$this->db->lasterror());
-	    }
-	    if (!count($obj_ret)) {
-	        throw new RestException(404, 'No User found');
-	    }
-	    return $obj_ret;
+		if ($result) {
+			$i = 0;
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min) {
+				$obj = $this->db->fetch_object($result);
+				$user_static = new User($this->db);
+				if ($user_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($user_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve User list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No User found');
+		}
+		return $obj_ret;
 	}
 
 	/**
@@ -151,20 +148,21 @@ class Users extends DolibarrApi
 	 * @throws RestException 401     Insufficient rights
 	 * @throws RestException 404     User or group not found
 	 */
-    public function get($id, $includepermissions = 0)
-    {
+	public function get($id, $includepermissions = 0)
+	{
 		//if (!DolibarrApiAccess::$user->rights->user->user->lire) {
 			//throw new RestException(401);
 		//}
-
-		$result = $this->useraccount->fetch($id);
-		if (!$result)
-		{
+		if ($id == 0) {
+			$result = $this->useraccount->initAsSpecimen();
+		} else {
+			$result = $this->useraccount->fetch($id);
+		}
+		if (!$result) {
 			throw new RestException(404, 'User not found');
 		}
 
-		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user'))
-		{
+		if ($id > 0 && !DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -187,20 +185,18 @@ class Users extends DolibarrApi
 	 * @throws RestException 401     Insufficient rights
 	 * @throws RestException 404     User or group not found
 	 */
-    public function getByLogin($login, $includepermissions = 0)
-    {
+	public function getByLogin($login, $includepermissions = 0)
+	{
 		//if (!DolibarrApiAccess::$user->rights->user->user->lire) {
 			//throw new RestException(401);
 		//}
 
 		$result = $this->useraccount->fetch('', $login);
-		if (!$result)
-		{
+		if (!$result) {
 			throw new RestException(404, 'User not found');
 		}
 
-		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user'))
-		{
+		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -223,20 +219,18 @@ class Users extends DolibarrApi
 	 * @throws RestException 401     Insufficient rights
 	 * @throws RestException 404     User or group not found
 	 */
-    public function getByEmail($email, $includepermissions = 0)
-    {
+	public function getByEmail($email, $includepermissions = 0)
+	{
 		//if (!DolibarrApiAccess::$user->rights->user->user->lire) {
 			//throw new RestException(401);
 		//}
 
 		$result = $this->useraccount->fetch('', '', '', 0, -1, $email);
-		if (!$result)
-		{
+		if (!$result) {
 			throw new RestException(404, 'User not found');
 		}
 
-		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user'))
-		{
+		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -247,39 +241,44 @@ class Users extends DolibarrApi
 		return $this->_cleanObjectDatas($this->useraccount);
 	}
 
-    /**
-     * Get properties of user connected
-     *
-     * @url	GET /info
-     *
-     * @return  array|mixed Data without useless information
-     *
-     * @throws RestException 401     Insufficient rights
-     * @throws RestException 404     User or group not found
-     */
-    public function getInfo()
-    {
-        $apiUser = DolibarrApiAccess::$user;
+	/**
+	 * Get properties of user connected
+	 *
+	 * @url	GET /info
+	 *
+	 * @param	int		$includepermissions	Set this to 1 to have the array of permissions loaded (not done by default for performance purpose)
+	 * @return  array|mixed Data without useless information
+	 *
+	 * @throws RestException 401     Insufficient rights
+	 * @throws RestException 404     User or group not found
+	 */
+	public function getInfo($includepermissions = 0)
+	{
+		$apiUser = DolibarrApiAccess::$user;
 
-        $result = $this->useraccount->fetch($apiUser->id);
-        if (!$result) {
-            throw new RestException(404, 'User not found');
-        }
+		$result = $this->useraccount->fetch($apiUser->id);
+		if (!$result) {
+			throw new RestException(404, 'User not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $usergroup = new UserGroup($this->db);
-        $userGroupList = $usergroup->listGroupsForUser($apiUser->id, false);
-        if (!is_array($userGroupList)) {
-            throw new RestException(404, 'User group not found');
-        }
+		if ($includepermissions) {
+			$this->useraccount->getRights();
+		}
 
-        $this->useraccount->user_group_list = $this->_cleanUserGroupListDatas($userGroupList);
+		$usergroup = new UserGroup($this->db);
+		$userGroupList = $usergroup->listGroupsForUser($apiUser->id, false);
+		if (!is_array($userGroupList)) {
+			throw new RestException(404, 'User group not found');
+		}
 
-        return $this->_cleanObjectDatas($this->useraccount);
-    }
+		$this->useraccount->user_group_list = $this->_cleanUserGroupListDatas($userGroupList);
+
+		return $this->_cleanObjectDatas($this->useraccount);
+	}
 
 	/**
 	 * Create user account
@@ -287,30 +286,29 @@ class Users extends DolibarrApi
 	 * @param array $request_data New user data
 	 * @return int
 	 */
-    public function post($request_data = null)
-    {
-	    // check user authorization
-	    //if(! DolibarrApiAccess::$user->rights->user->creer) {
-	    //   throw new RestException(401, "User creation not allowed");
-	    //}
-	    // check mandatory fields
-	    /*if (!isset($request_data["login"]))
-	        throw new RestException(400, "login field missing");
-	    if (!isset($request_data["password"]))
-	        throw new RestException(400, "password field missing");
-	    if (!isset($request_data["lastname"]))
-	         throw new RestException(400, "lastname field missing");*/
-	    //assign field values
-        foreach ($request_data as $field => $value)
-	    {
-	          $this->useraccount->$field = $value;
-	    }
+	public function post($request_data = null)
+	{
+		// check user authorization
+		//if(! DolibarrApiAccess::$user->rights->user->creer) {
+		//   throw new RestException(401, "User creation not allowed");
+		//}
+		// check mandatory fields
+		/*if (!isset($request_data["login"]))
+			throw new RestException(400, "login field missing");
+		if (!isset($request_data["password"]))
+			throw new RestException(400, "password field missing");
+		if (!isset($request_data["lastname"]))
+			 throw new RestException(400, "lastname field missing");*/
+		//assign field values
+		foreach ($request_data as $field => $value) {
+			  $this->useraccount->$field = $value;
+		}
 
-	    if ($this->useraccount->create(DolibarrApiAccess::$user) < 0) {
-             throw new RestException(500, 'Error creating', array_merge(array($this->useraccount->error), $this->useraccount->errors));
-	    }
-	    return $this->useraccount->id;
-    }
+		if ($this->useraccount->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, 'Error creating', array_merge(array($this->useraccount->error), $this->useraccount->errors));
+		}
+		return $this->useraccount->id;
+	}
 
 
 	/**
@@ -319,50 +317,48 @@ class Users extends DolibarrApi
 	 * @param int   $id             Id of account to update
 	 * @param array $request_data   Datas
 	 * @return array
-     *
-     * @throws 	RestException
+	 *
+	 * @throws 	RestException
 	 */
-    public function put($id, $request_data = null)
-    {
+	public function put($id, $request_data = null)
+	{
 		//if (!DolibarrApiAccess::$user->rights->user->user->creer) {
 			//throw new RestException(401);
 		//}
 
 		$result = $this->useraccount->fetch($id);
-		if (!$result)
-		{
+		if (!$result) {
 			throw new RestException(404, 'Account not found');
 		}
 
-		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user'))
-		{
+		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		foreach ($request_data as $field => $value)
-		{
-			if ($field == 'id') continue;
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') {
+				continue;
+			}
 			// The status must be updated using setstatus() because it
 			// is not handled by the update() method.
 			if ($field == 'statut') {
 				$result = $this->useraccount->setstatus($value);
 				if ($result < 0) {
-				    throw new RestException(500, 'Error when updating status of user: '.$this->useraccount->error);
+					throw new RestException(500, 'Error when updating status of user: '.$this->useraccount->error);
 				}
 			} else {
-			    $this->useraccount->$field = $value;
+				$this->useraccount->$field = $value;
 			}
 		}
 
 		// If there is no error, update() returns the number of affected
 		// rows so if the update is a no op, the return value is zezo.
-		if ($this->useraccount->update(DolibarrApiAccess::$user) >= 0)
-		{
+		if ($this->useraccount->update(DolibarrApiAccess::$user) >= 0) {
 			return $this->get($id);
 		} else {
 			throw new RestException(500, $this->useraccount->error);
 		}
-    }
+	}
 
 
 	/**
@@ -372,7 +368,7 @@ class Users extends DolibarrApi
 	 * @return array      Array of group objects
 	 *
 	 * @throws RestException 403 Not allowed
-     * @throws RestException 404 Not found
+	 * @throws RestException 404 Not found
 	 *
 	 * @url GET {id}/groups
 	 */
@@ -400,18 +396,18 @@ class Users extends DolibarrApi
 	}
 
 
-    /**
+	/**
 	 * Add a user into a group
 	 *
 	 * @param   int     $id        User ID
 	 * @param   int     $group     Group ID
 	 * @param   int     $entity    Entity ID (valid only for superadmin in multicompany transverse mode)
 	 * @return  int                1 if success
-     *
+	 *
 	 * @url	GET {id}/setGroup/{group}
 	 */
-    public function setGroup($id, $group, $entity = 1)
-    {
+	public function setGroup($id, $group, $entity = 1)
+	{
 
 		global $conf;
 
@@ -419,18 +415,15 @@ class Users extends DolibarrApi
 			//throw new RestException(401);
 		//}
 		$result = $this->useraccount->fetch($id);
-		if (!$result)
-		{
+		if (!$result) {
 			throw new RestException(404, 'User not found');
 		}
 
-		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user'))
-		{
+		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && !empty(DolibarrApiAccess::$user->admin) && empty(DolibarrApiAccess::$user->entity))
-		{
+		if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && !empty(DolibarrApiAccess::$user->admin) && empty(DolibarrApiAccess::$user->entity)) {
 			$entity = (!empty($entity) ? $entity : $conf->entity);
 		} else {
 			// When using API, action is done on entity of logged user because a user of entity X with permission to create user should not be able to
@@ -439,8 +432,7 @@ class Users extends DolibarrApi
 		}
 
 		$result = $this->useraccount->SetInGroup($group, $entity);
-		if (!($result > 0))
-		{
+		if (!($result > 0)) {
 			throw new RestException(500, $this->useraccount->error);
 		}
 
@@ -462,68 +454,65 @@ class Users extends DolibarrApi
 	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
 	 * @return  array               Array of User objects
 	 */
-    public function listGroups($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $group_ids = 0, $sqlfilters = '')
-    {
-	    global $db, $conf;
+	public function listGroups($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $group_ids = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
-	    $obj_ret = array();
+		$obj_ret = array();
 
 		if (!DolibarrApiAccess::$user->rights->user->group_advance->read) {
-	        throw new RestException(401, "You are not allowed to read list of groups");
-	    }
+			throw new RestException(401, "You are not allowed to read list of groups");
+		}
 
-	    // case of external user, $societe param is ignored and replaced by user's socid
-	    //$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $societe;
+		// case of external user, $societe param is ignored and replaced by user's socid
+		//$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $societe;
 
-	    $sql = "SELECT t.rowid";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."usergroup as t";
-	    $sql .= ' WHERE t.entity IN ('.getEntity('user').')';
-	    if ($group_ids) $sql .= " AND t.rowid IN (".$group_ids.")";
-	    // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		$sql = "SELECT t.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."usergroup as t";
+		$sql .= ' WHERE t.entity IN ('.getEntity('user').')';
+		if ($group_ids) {
+			$sql .= " AND t.rowid IN (".$group_ids.")";
+		}
+		// Add sql filters
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-	    if ($limit) {
-	        if ($page < 0)
-	        {
-	            $page = 0;
-	        }
-	        $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-	        $sql .= $this->db->plimit($limit + 1, $offset);
-	    }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-	    $result = $this->db->query($sql);
+		$result = $this->db->query($sql);
 
-	    if ($result)
-	    {
-	        $i = 0;
-	        $num = $this->db->num_rows($result);
-	        $min = min($num, ($limit <= 0 ? $num : $limit));
-	        while ($i < $min)
-	        {
-	        	$obj = $this->db->fetch_object($result);
-	            $group_static = new UserGroup($this->db);
-	            if ($group_static->fetch($obj->rowid)) {
-	                $obj_ret[] = $this->_cleanObjectDatas($group_static);
-	            }
-	            $i++;
-	        }
-	    } else {
-	    	throw new RestException(503, 'Error when retrieve Group list : '.$this->db->lasterror());
-	    }
-	    if (!count($obj_ret)) {
-	        throw new RestException(404, 'No Group found');
-	    }
-	    return $obj_ret;
+		if ($result) {
+			$i = 0;
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min) {
+				$obj = $this->db->fetch_object($result);
+				$group_static = new UserGroup($this->db);
+				if ($group_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($group_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve Group list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No Group found');
+		}
+		return $obj_ret;
 	}
 
 	/**
@@ -537,23 +526,22 @@ class Users extends DolibarrApi
 	 * @param int       $load_members     Load members list or not {@min 0} {@max 1}
 	 * @return  array               Array of User objects
 	 */
-    public function infoGroups($group, $load_members = 0)
-    {
-	    global $db, $conf;
+	public function infoGroups($group, $load_members = 0)
+	{
+		global $db, $conf;
 
 		if (!DolibarrApiAccess::$user->rights->user->group_advance->read) {
-	        throw new RestException(401, "You are not allowed to read groups");
-	    }
+			throw new RestException(401, "You are not allowed to read groups");
+		}
 
-	            $group_static = new UserGroup($this->db);
-	            $result = $group_static->fetch($group, '', $load_members);
+		$group_static = new UserGroup($this->db);
+		$result = $group_static->fetch($group, '', $load_members);
 
-		if (!$result)
-		{
+		if (!$result) {
 			throw new RestException(404, 'Group not found');
 		}
 
-	    return $this->_cleanObjectDatas($group_static);
+		return $this->_cleanObjectDatas($group_static);
 	}
 
 	/**
@@ -562,153 +550,151 @@ class Users extends DolibarrApi
 	 * @param   int     $id Account ID
 	 * @return  array
 	 */
-    public function delete($id)
-    {
+	public function delete($id)
+	{
 		//if (!DolibarrApiAccess::$user->rights->user->user->supprimer) {
 			//throw new RestException(401);
 		//}
 		$result = $this->useraccount->fetch($id);
-		if (!$result)
-		{
+		if (!$result) {
 			throw new RestException(404, 'User not found');
 		}
 
-		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user'))
-		{
+		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-        $this->useraccount->oldcopy = clone $this->useraccount;
+		$this->useraccount->oldcopy = clone $this->useraccount;
 		return $this->useraccount->delete(DolibarrApiAccess::$user);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * Clean sensible object datas
 	 *
-	 * @param   object  $object    Object to clean
-	 * @return  array    			Array of cleaned object properties
+	 * @param   Object	$object    	Object to clean
+	 * @return  Object    			Object with cleaned properties
 	 */
 	protected function _cleanObjectDatas($object)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
-	    $object = parent::_cleanObjectDatas($object);
+		$object = parent::_cleanObjectDatas($object);
 
-	    unset($object->default_values);
-	    unset($object->lastsearch_values);
-	    unset($object->lastsearch_values_tmp);
+		unset($object->default_values);
+		unset($object->lastsearch_values);
+		unset($object->lastsearch_values_tmp);
 
-	    unset($object->total_ht);
-	    unset($object->total_tva);
-	    unset($object->total_localtax1);
-	    unset($object->total_localtax2);
-	    unset($object->total_ttc);
+		unset($object->total_ht);
+		unset($object->total_tva);
+		unset($object->total_localtax1);
+		unset($object->total_localtax2);
+		unset($object->total_ttc);
 
-	    unset($object->label_incoterms);
-	    unset($object->location_incoterms);
+		unset($object->label_incoterms);
+		unset($object->location_incoterms);
 
-	    unset($object->fk_delivery_address);
-	    unset($object->fk_incoterms);
-	    unset($object->all_permissions_are_loaded);
-	    unset($object->shipping_method_id);
-	    unset($object->nb_rights);
-	    unset($object->search_sid);
-	    unset($object->ldap_sid);
-	    unset($object->clicktodial_loaded);
+		unset($object->fk_delivery_address);
+		unset($object->fk_incoterms);
+		unset($object->all_permissions_are_loaded);
+		unset($object->shipping_method_id);
+		unset($object->nb_rights);
+		unset($object->search_sid);
+		unset($object->ldap_sid);
+		unset($object->clicktodial_loaded);
 
-	    // List of properties never returned by API, whatever are permissions
-	    unset($object->pass);
-	    unset($object->pass_indatabase);
-	    unset($object->pass_indatabase_crypted);
-	    unset($object->pass_temp);
-	    unset($object->api_key);
-	    unset($object->clicktodial_password);
-	    unset($object->openid);
+		// List of properties never returned by API, whatever are permissions
+		unset($object->pass);
+		unset($object->pass_indatabase);
+		unset($object->pass_indatabase_crypted);
+		unset($object->pass_temp);
+		unset($object->api_key);
+		unset($object->clicktodial_password);
+		unset($object->openid);
 
-	    unset($object->lines);
-	    unset($object->model_pdf);
-	    unset($object->skype);
-	    unset($object->twitter);
-	    unset($object->facebook);
-	    unset($object->linkedin);
+		unset($object->lines);
+		unset($object->model_pdf);
+		unset($object->skype);
+		unset($object->twitter);
+		unset($object->facebook);
+		unset($object->linkedin);
 
-	    $canreadsalary = ((!empty($conf->salaries->enabled) && !empty(DolibarrApiAccess::$user->rights->salaries->read))
-	    	|| (!empty($conf->hrm->enabled) && !empty(DolibarrApiAccess::$user->rights->hrm->employee->read)));
+		$canreadsalary = ((!empty($conf->salaries->enabled) && !empty(DolibarrApiAccess::$user->rights->salaries->read))
+			|| (!empty($conf->hrm->enabled) && !empty(DolibarrApiAccess::$user->rights->hrm->employee->read)));
 
-		if (!$canreadsalary)
-		{
+		if (!$canreadsalary) {
 			unset($object->salary);
 			unset($object->salaryextra);
 			unset($object->thm);
 			unset($object->tjm);
 		}
 
-	    return $object;
+		return $object;
 	}
 
-    /**
-     * Clean sensible user group list datas
-     *
-     * @param   array  $objectList   Array of object to clean
-     * @return  array                Array of cleaned object properties
-     */
-    private function _cleanUserGroupListDatas($objectList)
-    {
-        $cleanObjectList = array();
+	/**
+	 * Clean sensible user group list datas
+	 *
+	 * @param   array  $objectList   Array of object to clean
+	 * @return  array                Array of cleaned object properties
+	 */
+	private function _cleanUserGroupListDatas($objectList)
+	{
+		$cleanObjectList = array();
 
-        foreach ($objectList as $object) {
-            $cleanObject = parent::_cleanObjectDatas($object);
+		foreach ($objectList as $object) {
+			$cleanObject = parent::_cleanObjectDatas($object);
 
-            unset($cleanObject->default_values);
-            unset($cleanObject->lastsearch_values);
-            unset($cleanObject->lastsearch_values_tmp);
+			unset($cleanObject->default_values);
+			unset($cleanObject->lastsearch_values);
+			unset($cleanObject->lastsearch_values_tmp);
 
-            unset($cleanObject->total_ht);
-            unset($cleanObject->total_tva);
-            unset($cleanObject->total_localtax1);
-            unset($cleanObject->total_localtax2);
-            unset($cleanObject->total_ttc);
+			unset($cleanObject->total_ht);
+			unset($cleanObject->total_tva);
+			unset($cleanObject->total_localtax1);
+			unset($cleanObject->total_localtax2);
+			unset($cleanObject->total_ttc);
 
-            unset($cleanObject->libelle_incoterms);
-            unset($cleanObject->location_incoterms);
+			unset($cleanObject->libelle_incoterms);
+			unset($cleanObject->location_incoterms);
 
-            unset($cleanObject->fk_delivery_address);
-            unset($cleanObject->fk_incoterms);
-            unset($cleanObject->all_permissions_are_loaded);
-            unset($cleanObject->shipping_method_id);
-            unset($cleanObject->nb_rights);
-            unset($cleanObject->search_sid);
-            unset($cleanObject->ldap_sid);
-            unset($cleanObject->clicktodial_loaded);
+			unset($cleanObject->fk_delivery_address);
+			unset($cleanObject->fk_incoterms);
+			unset($cleanObject->all_permissions_are_loaded);
+			unset($cleanObject->shipping_method_id);
+			unset($cleanObject->nb_rights);
+			unset($cleanObject->search_sid);
+			unset($cleanObject->ldap_sid);
+			unset($cleanObject->clicktodial_loaded);
 
-            unset($cleanObject->datec);
-            unset($cleanObject->datem);
-            unset($cleanObject->members);
-            unset($cleanObject->note);
-            unset($cleanObject->note_private);
+			unset($cleanObject->datec);
+			unset($cleanObject->datem);
+			unset($cleanObject->members);
+			unset($cleanObject->note);
+			unset($cleanObject->note_private);
 
-            $cleanObjectList[] = $cleanObject;
-        }
+			$cleanObjectList[] = $cleanObject;
+		}
 
-        return $cleanObjectList;
-    }
+		return $cleanObjectList;
+	}
 
 	/**
 	 * Validate fields before create or update object
-     *
+	 *
 	 * @param   array|null     $data   Data to validate
 	 * @return  array
 	 * @throws RestException
-     */
-    private function _validate($data)
-    {
-        $account = array();
-        foreach (Users::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $account[$field] = $data[$field];
-        }
-        return $account;
-    }
+	 */
+	private function _validate($data)
+	{
+		$account = array();
+		foreach (Users::$FIELDS as $field) {
+			if (!isset($data[$field])) {
+				throw new RestException(400, "$field field missing");
+			}
+			$account[$field] = $data[$field];
+		}
+		return $account;
+	}
 }
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 786af8c81d1..eb92bd51eb9 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2018       charlene Benke          <charlie@patas-monkey.com>
  * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2020  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2019       Abbes Bahfir            <dolipar@dolipar.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -54,7 +54,7 @@ class User extends CommonObject
 	public $table_element = 'user';
 
 	/**
-	 * @var int Field with ID of parent key if this field has a parent
+	 * @var string Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_user';
 
@@ -64,6 +64,9 @@ class User extends CommonObject
 	 */
 	public $ismultientitymanaged = 1;
 
+	/**
+	 * @var string picto
+	 */
 	public $picto = 'user';
 
 	public $id = 0;
@@ -71,18 +74,61 @@ class User extends CommonObject
 	public $ldap_sid;
 	public $search_sid;
 	public $employee;
+	public $civility_code;
+
+	/**
+	 * @var string gender
+	 */
 	public $gender;
 	public $birth;
-	public $email;
-	public $personal_email;
 
+	/**
+	 * @var string email
+	 */
+	public $email;
+
+	/**
+	 * @var string personal email
+	 */
+	public $personal_email;
 
 	/**
 	 * @var array array of socialnetworks
 	 */
 	public $socialnetworks;
 
-	public $job; // job position
+	/**
+	 * @var string skype account
+	 * @deprecated
+	 */
+	public $skype;
+
+	/**
+	 * @var string twitter account
+	 * @deprecated
+	 */
+	public $twitter;
+
+	/**
+	 * @var string facebook account
+	 * @deprecated
+	 */
+	public $facebook;
+
+	/**
+	 * @var string linkedin account
+	 * @deprecated
+	 */
+	public $linkedin;
+
+	/**
+	 * @var string job position
+	 */
+	public $job;
+
+	/**
+	 * @var string user signature
+	 */
 	public $signature;
 
 	/**
@@ -90,17 +136,52 @@ class User extends CommonObject
 	 */
 	public $address;
 
+	/**
+	 * @var string zip code
+	 */
 	public $zip;
+
+	/**
+	 * @var string town
+	 */
 	public $town;
 	public $state_id; // The state/department
 	public $state_code;
 	public $state;
+
+	/**
+	 * @var string office phone
+	 */
 	public $office_phone;
+
+	/**
+	 * @var string office fax
+	 */
 	public $office_fax;
+
+	/**
+	 * @var string phone mobile
+	 */
 	public $user_mobile;
+
+	/**
+	 * @var string personal phone mobile
+	 */
 	public $personal_mobile;
+
+	/**
+	 * @var int 1 if admin 0 if standard user
+	 */
 	public $admin;
+
+	/**
+	 * @var string user login
+	 */
 	public $login;
+
+	/**
+	 * @var string user apikey
+	 */
 	public $api_key;
 
 	/**
@@ -108,13 +189,26 @@ class User extends CommonObject
 	 */
 	public $entity;
 
-	//! Clear password in memory
+	/**
+	 * @var string Clear password in memory
+	 */
 	public $pass;
-	//! Clear password in database (defined if DATABASE_PWD_ENCRYPTED=0)
+
+	/**
+	 * @var string Clear password in database (defined if DATABASE_PWD_ENCRYPTED=0)
+	 */
 	public $pass_indatabase;
-	//! Encrypted password in database (always defined)
+
+	/**
+	 * @var string Encrypted password in database (always defined)
+	 */
 	public $pass_indatabase_crypted;
 
+	/**
+	 * @var string Temporary password
+	 */
+	public $pass_temp;
+
 	/**
 	 * Date creation record (datec)
 	 *
@@ -129,9 +223,14 @@ class User extends CommonObject
 	 */
 	public $datem;
 
-	//! If this is defined, it is an external user
+	/**
+	 * @var int If this is defined, it is an external user
+	 */
 	public $socid;
-	//! If this is defined, it is a user created from a contact
+
+	/**
+	 * @var int If this is defined, it is a user created from a contact
+	 */
 	public $contact_id;
 
 	/**
@@ -140,37 +239,82 @@ class User extends CommonObject
 	public $fk_member;
 
 	/**
-	 * @var int User ID
+	 * @var int User ID of supervisor
 	 */
 	public $fk_user;
+
+	/**
+	 * @var int User ID of expense validator
+	 */
 	public $fk_user_expense_validator;
+
+	/**
+	 * @var int User ID of holidays validator
+	 */
 	public $fk_user_holiday_validator;
 
+	/**
+	 * @string clicktodial url
+	 */
 	public $clicktodial_url;
+
+	/**
+	 * @var string clicktodial login
+	 */
 	public $clicktodial_login;
+
+	/**
+	 * @var string clicktodial password
+	 */
 	public $clicktodial_password;
+
+	/**
+	 * @var string clicktodial poste
+	 */
 	public $clicktodial_poste;
 
 	public $datelastlogin;
 	public $datepreviouslogin;
 	public $datestartvalidity;
 	public $dateendvalidity;
+
+	/**
+	 * @var string photo filename
+	 */
 	public $photo;
 	public $lang;
 
-	public $rights; // Array of permissions user->rights->permx
-	public $all_permissions_are_loaded; // All permission are loaded
-	public $nb_rights; // Number of rights granted to the user
-	private $_tab_loaded = array(); // Cache array of already loaded permissions
+	/**
+	 * @var stdClass Class of permissions user->rights->permx
+	 */
+	public $rights;
 
-	public $conf; // To store personal config
+	/**
+	 * @var int  All permissions are loaded
+	 */
+	public $all_permissions_are_loaded;
+
+	/**
+	 * @var int Number of rights granted to the user
+	 */
+	public $nb_rights;
+
+	/**
+	 * @var array Cache array of already loaded permissions
+	 */
+	private $_tab_loaded = array();
+
+	/**
+	 * @var stdClass To store personal config
+	 */
+	public $conf;
 	public $default_values; // To store default values for user
 	public $lastsearch_values_tmp; // To store current search criterias for user
 	public $lastsearch_values; // To store last saved search criterias for user
 
 	public $users = array(); // To store all tree of users hierarchy
 	public $parentof; // To store an array of all parents for all ids.
-	private $cache_childids;	// Cache array of already loaded childs
+	private $cache_childids; // Cache array of already loaded childs
 
 	public $accountancy_code; // Accountancy code in prevision of the complete accountancy module
 
@@ -181,7 +325,10 @@ class User extends CommonObject
 	public $salaryextra; // Monthly salary extra - Denormalized value from llx_user_employment
 	public $weeklyhours; // Weekly hours         - Denormalized value from llx_user_employment
 
-	public $color; // Define background color for user in agenda
+	/**
+	 * @var string Define background color for user in agenda
+	 */
+	public $color;
 
 	public $dateemployment; // Define date of employment by company
 	public $dateemploymentend; // Define date of employment end by company
@@ -189,12 +336,15 @@ class User extends CommonObject
 	public $default_c_exp_tax_cat;
 	public $default_range;
 
+	/**
+	 *@var int id of warehouse
+	 */
 	public $fk_warehouse;
 
 	public $fields = array(
 		'rowid'=>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
-		'lastname'=>array('type'=>'varchar(50)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>20, 'searchall'=>1, 'comment'=>'Reference of object'),
-		'firstname'=>array('type'=>'varchar(50)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
+		'lastname'=>array('type'=>'varchar(50)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>20, 'searchall'=>1),
+		'firstname'=>array('type'=>'varchar(50)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1),
 	);
 
 
@@ -251,7 +401,7 @@ class User extends CommonObject
 		$login = trim($login);
 
 		// Get user
-		$sql = "SELECT u.rowid, u.lastname, u.firstname, u.employee, u.gender, u.birth, u.email, u.personal_email, u.job,";
+		$sql = "SELECT u.rowid, u.lastname, u.firstname, u.employee, u.gender, u.civility as civility_code, u.birth, u.email, u.personal_email, u.job,";
 		$sql .= " u.socialnetworks,";
 		$sql .= " u.signature, u.office_phone, u.office_fax, u.user_mobile, u.personal_mobile,";
 		$sql .= " u.address, u.zip, u.town, u.fk_state as state_id, u.fk_country as country_id,";
@@ -263,6 +413,7 @@ class User extends CommonObject
 		$sql .= " u.tms as datem,";
 		$sql .= " u.datelastlogin as datel,";
 		$sql .= " u.datepreviouslogin as datep,";
+		$sql .= " u.datelastpassvalidation,";
 		$sql .= " u.datestartvalidity,";
 		$sql .= " u.dateendvalidity,";
 		$sql .= " u.photo as photo,";
@@ -284,29 +435,26 @@ class User extends CommonObject
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON u.fk_country = c.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON u.fk_state = d.rowid";
 
-		if ($entity < 0)
-		{
-			if ((empty($conf->multicompany->enabled) || empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) && (!empty($user->entity)))
-			{
+		if ($entity < 0) {
+			if ((empty($conf->multicompany->enabled) || empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) && (!empty($user->entity))) {
 				$sql .= " WHERE u.entity IN (0,".$conf->entity.")";
 			} else {
 				$sql .= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
 			}
-		} else // The fetch was forced on an entity
-		{
-			if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+		} else {
+			// The fetch was forced on an entity
+			if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				$sql .= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
-			else $sql .= " WHERE u.entity IN (0, ".(($entity != '' && $entity >= 0) ? $entity : $conf->entity).")"; // search in entity provided in parameter
+			} else {
+				$sql .= " WHERE u.entity IN (0, ".(($entity != '' && $entity >= 0) ? $entity : $conf->entity).")"; // search in entity provided in parameter
+			}
 		}
 
-		if ($sid)    // permet une recherche du user par son SID ActiveDirectory ou Samba
-		{
+		if ($sid) {    // permet une recherche du user par son SID ActiveDirectory ou Samba
 			$sql .= " AND (u.ldap_sid = '".$this->db->escape($sid)."' OR u.login = '".$this->db->escape($login)."') LIMIT 1";
-		} elseif ($login)
-		{
+		} elseif ($login) {
 			$sql .= " AND u.login = '".$this->db->escape($login)."'";
-		} elseif ($email)
-		{
+		} elseif ($email) {
 			$sql .= " AND u.email = '".$this->db->escape($email)."'";
 		} else {
 			$sql .= " AND u.rowid = ".$id;
@@ -314,21 +462,20 @@ class User extends CommonObject
 		$sql .= " ORDER BY u.entity ASC"; // Avoid random result when there is 2 login in 2 different entities
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$obj = $this->db->fetch_object($result);
-			if ($obj)
-			{
+			if ($obj) {
 				$this->id = $obj->rowid;
 				$this->ref = $obj->rowid;
 
-				$this->ref_ext 		= $obj->ref_ext;
+				$this->ref_ext = $obj->ref_ext;
 
-				$this->ldap_sid 	= $obj->ldap_sid;
-				$this->lastname		= $obj->lastname;
+				$this->ldap_sid = $obj->ldap_sid;
+				$this->civility_code = $obj->civility_code;
+				$this->lastname = $obj->lastname;
 				$this->firstname = $obj->firstname;
 
-				$this->employee		= $obj->employee;
+				$this->employee = $obj->employee;
 
 				$this->login = $obj->login;
 				$this->gender       = $obj->gender;
@@ -399,9 +546,11 @@ class User extends CommonObject
 
 				// Protection when module multicompany was set, admin was set to first entity and then, the module was disabled,
 				// in such case, this admin user must be admin for ALL entities.
-				if (empty($conf->multicompany->enabled) && $this->admin && $this->entity == 1) $this->entity = 0;
+				if (empty($conf->multicompany->enabled) && $this->admin && $this->entity == 1) {
+					$this->entity = 0;
+				}
 
-				// Retreive all extrafield
+				// Retrieve all extrafield
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
 
@@ -419,23 +568,22 @@ class User extends CommonObject
 		}
 
 		// To get back the global configuration unique to the user
-		if ($loadpersonalconf)
-		{
+		if ($loadpersonalconf) {
 			// Load user->conf for user
 			$sql = "SELECT param, value FROM ".MAIN_DB_PREFIX."user_param";
 			$sql .= " WHERE fk_user = ".$this->id;
 			$sql .= " AND entity = ".$conf->entity;
 			//dol_syslog(get_class($this).'::fetch load personalized conf', LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$num = $this->db->num_rows($resql);
 				$i = 0;
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					$p = (!empty($obj->param) ? $obj->param : '');
-					if (!empty($p)) $this->conf->$p = $obj->value;
+					if (!empty($p)) {
+						$this->conf->$p = $obj->value;
+					}
 					$i++;
 				}
 				$this->db->free($resql);
@@ -446,8 +594,7 @@ class User extends CommonObject
 
 			$result = $this->loadDefaultValues();
 
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$this->error = $this->db->lasterror();
 				return -3;
 			}
@@ -471,20 +618,16 @@ class User extends CommonObject
 		$sql .= " WHERE entity IN (".($this->entity > 0 ? $this->entity.", " : "").$conf->entity.")"; // Entity of user (if defined) + current entity
 		$sql .= " AND user_id IN (0".($this->id > 0 ? ", ".$this->id : "").")"; // User 0 (all) + me (if defined)
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
-				if (!empty($obj->page) && !empty($obj->type) && !empty($obj->param))
-				{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				if (!empty($obj->page) && !empty($obj->type) && !empty($obj->param)) {
 					// $obj->page is relative URL with or without params
 					// $obj->type can be 'filters', 'sortorder', 'createform', ...
 					// $obj->param is key or param
 					$pagewithoutquerystring = $obj->page;
 					$pagequeries = '';
 					$reg = array();
-					if (preg_match('/^([^\?]+)\?(.*)$/', $pagewithoutquerystring, $reg))	// There is query param
-					{
+					if (preg_match('/^([^\?]+)\?(.*)$/', $pagewithoutquerystring, $reg)) {	// There is query param
 						$pagewithoutquerystring = $reg[1];
 						$pagequeries = $reg[2];
 					}
@@ -494,10 +637,8 @@ class User extends CommonObject
 			}
 			// Sort by key, so _noquery_ is last
 			if (!empty($this->default_values)) {
-				foreach ($this->default_values as $a => $b)
-				{
-					foreach ($b as $c => $d)
-					{
+				foreach ($this->default_values as $a => $b) {
+					foreach ($b as $c => $d) {
 						krsort($this->default_values[$a][$c]);
 					}
 				}
@@ -534,50 +675,56 @@ class User extends CommonObject
 
 		$this->db->begin();
 
-		if (!empty($rid))
-		{
+		if (!empty($rid)) {
+			$module = $perms = $subperms = '';
+
 			// Si on a demande ajout d'un droit en particulier, on recupere
 			// les caracteristiques (module, perms et subperms) de ce droit.
 			$sql = "SELECT module, perms, subperms";
 			$sql .= " FROM ".MAIN_DB_PREFIX."rights_def";
-			$sql .= " WHERE id = '".$this->db->escape($rid)."'";
-			$sql .= " AND entity = ".$entity;
+			$sql .= " WHERE id = ".((int) $rid);
+			$sql .= " AND entity = ".((int) $entity);
 
 			$result = $this->db->query($sql);
 			if ($result) {
 				$obj = $this->db->fetch_object($result);
-				$module = $obj->module;
-				$perms = $obj->perms;
-				$subperms = $obj->subperms;
+
+				if ($obj) {
+					$module = $obj->module;
+					$perms = $obj->perms;
+					$subperms = $obj->subperms;
+				}
 			} else {
 				$error++;
 				dol_print_error($this->db);
 			}
 
 			// Where pour la liste des droits a ajouter
-			$whereforadd = "id=".$this->db->escape($rid);
+			$whereforadd = "id=".((int) $rid);
 			// Ajout des droits induits
-			if (!empty($subperms))   $whereforadd .= " OR (module='$module' AND perms='$perms' AND (subperms='lire' OR subperms='read'))";
-			elseif (!empty($perms)) $whereforadd .= " OR (module='$module' AND (perms='lire' OR perms='read') AND subperms IS NULL)";
+			if (!empty($subperms)) {
+				$whereforadd .= " OR (module='".$this->db->escape($module)."' AND perms='".$this->db->escape($perms)."' AND (subperms='lire' OR subperms='read'))";
+			} elseif (!empty($perms)) {
+				$whereforadd .= " OR (module='".$this->db->escape($module)."' AND (perms='lire' OR perms='read') AND subperms IS NULL)";
+			}
 		} else {
 			// On a pas demande un droit en particulier mais une liste de droits
 			// sur la base d'un nom de module de de perms
 			// Where pour la liste des droits a ajouter
-			if (!empty($allmodule))
-			{
-				if ($allmodule == 'allmodules')
-				{
+			if (!empty($allmodule)) {
+				if ($allmodule == 'allmodules') {
 					$whereforadd = 'allmodules';
 				} else {
 					$whereforadd = "module='".$this->db->escape($allmodule)."'";
-					if (!empty($allperms))  $whereforadd .= " AND perms='".$this->db->escape($allperms)."'";
+					if (!empty($allperms)) {
+						$whereforadd .= " AND perms='".$this->db->escape($allperms)."'";
+					}
 				}
 			}
 		}
 
 		// Ajout des droits trouves grace au critere whereforadd
-		if (!empty($whereforadd))
-		{
+		if (!empty($whereforadd)) {
 			//print "$module-$perms-$subperms";
 			$sql = "SELECT id";
 			$sql .= " FROM ".MAIN_DB_PREFIX."rights_def";
@@ -587,19 +734,21 @@ class User extends CommonObject
 			}
 
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$num = $this->db->num_rows($result);
 				$i = 0;
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($result);
 					$nid = $obj->id;
 
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = ".$this->id." AND fk_id=".$nid." AND entity = ".$entity;
-					if (!$this->db->query($sql)) $error++;
+					if (!$this->db->query($sql)) {
+						$error++;
+					}
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_rights (entity, fk_user, fk_id) VALUES (".$entity.", ".$this->id.", ".$nid.")";
-					if (!$this->db->query($sql)) $error++;
+					if (!$this->db->query($sql)) {
+						$error++;
+					}
 
 					$i++;
 				}
@@ -609,14 +758,15 @@ class User extends CommonObject
 			}
 		}
 
-		if (!$error && !$notrigger)
-		{
+		if (!$error && !$notrigger) {
 			$langs->load("other");
 			$this->context = array('audit'=>$langs->trans("PermissionsAdd").($rid ? ' (id='.$rid.')' : ''));
 
 			// Call trigger
 			$result = $this->call_trigger('USER_MODIFY', $user);
-			if ($result < 0) { $error++; }
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
@@ -652,6 +802,8 @@ class User extends CommonObject
 		$this->db->begin();
 
 		if (!empty($rid)) {
+			$module = $perms = $subperms = '';
+
 			// Si on a demande supression d'un droit en particulier, on recupere
 			// les caracteristiques module, perms et subperms de ce droit.
 			$sql = "SELECT module, perms, subperms";
@@ -662,37 +814,43 @@ class User extends CommonObject
 			$result = $this->db->query($sql);
 			if ($result) {
 				$obj = $this->db->fetch_object($result);
-				$module = $obj->module;
-				$perms = $obj->perms;
-				$subperms = $obj->subperms;
+
+				if ($obj) {
+					$module = $obj->module;
+					$perms = $obj->perms;
+					$subperms = $obj->subperms;
+				}
 			} else {
 				$error++;
 				dol_print_error($this->db);
 			}
 
 			// Where pour la liste des droits a supprimer
-			$wherefordel = "id=".$this->db->escape($rid);
+			$wherefordel = "id=".((int) $rid);
 			// Suppression des droits induits
-			if ($subperms == 'lire' || $subperms == 'read') $wherefordel .= " OR (module='$module' AND perms='$perms' AND subperms IS NOT NULL)";
-			if ($perms == 'lire' || $perms == 'read')       $wherefordel .= " OR (module='$module')";
+			if ($subperms == 'lire' || $subperms == 'read') {
+				$wherefordel .= " OR (module='".$this->db->escape($module)."' AND perms='".$this->db->escape($perms)."' AND subperms IS NOT NULL)";
+			}
+			if ($perms == 'lire' || $perms == 'read') {
+				$wherefordel .= " OR (module='".$this->db->escape($module)."')";
+			}
 		} else {
 			// On a demande suppression d'un droit sur la base d'un nom de module ou perms
 			// Where pour la liste des droits a supprimer
-			if (!empty($allmodule))
-			{
-				if ($allmodule == 'allmodules')
-				{
+			if (!empty($allmodule)) {
+				if ($allmodule == 'allmodules') {
 					$wherefordel = 'allmodules';
 				} else {
 					$wherefordel = "module='".$this->db->escape($allmodule)."'";
-					if (!empty($allperms))  $whereforadd .= " AND perms='".$this->db->escape($allperms)."'";
+					if (!empty($allperms)) {
+						$wherefordel .= " AND perms='".$this->db->escape($allperms)."'";
+					}
 				}
 			}
 		}
 
 		// Suppression des droits selon critere defini dans wherefordel
-		if (!empty($wherefordel))
-		{
+		if (!empty($wherefordel)) {
 			//print "$module-$perms-$subperms";
 			$sql = "SELECT id";
 			$sql .= " FROM ".MAIN_DB_PREFIX."rights_def";
@@ -701,20 +859,28 @@ class User extends CommonObject
 				$sql .= " AND ".$wherefordel;
 			}
 
+			// avoid admin can remove his own important rights
+			if ($this->admin == 1) {
+				$sql .= " AND id NOT IN (251, 252, 253, 254, 255, 256)"; // other users rights
+				$sql .= " AND id NOT IN (341, 342, 343, 344)"; // own rights
+				$sql .= " AND id NOT IN (351, 352, 353, 354)"; // groups rights
+				$sql .= " AND id NOT IN (358)"; // user export
+			}
+
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$num = $this->db->num_rows($result);
 				$i = 0;
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($result);
 					$nid = $obj->id;
 
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights";
 					$sql .= " WHERE fk_user = ".$this->id." AND fk_id=".$nid;
 					$sql .= " AND entity = ".$entity;
-					if (!$this->db->query($sql)) $error++;
+					if (!$this->db->query($sql)) {
+						$error++;
+					}
 
 					$i++;
 				}
@@ -724,14 +890,15 @@ class User extends CommonObject
 			}
 		}
 
-		if (!$error && !$notrigger)
-		{
+		if (!$error && !$notrigger) {
 			$langs->load("other");
 			$this->context = array('audit'=>$langs->trans("PermissionsDelete").($rid ? ' (id='.$rid.')' : ''));
 
 			// Call trigger
 			$result = $this->call_trigger('USER_MODIFY', $user);
-			if ($result < 0) { $error++; }
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
@@ -754,7 +921,7 @@ class User extends CommonObject
 	public function clearrights()
 	{
 		dol_syslog(get_class($this)."::clearrights reset user->rights");
-		$this->rights = '';
+		$this->rights = null;
 		$this->nb_rights = 0;
 		$this->all_permissions_are_loaded = 0;
 		$this->_tab_loaded = array();
@@ -773,16 +940,13 @@ class User extends CommonObject
 	{
 		global $conf;
 
-		if (empty($forcereload))
-		{
-			if ($moduletag && isset($this->_tab_loaded[$moduletag]) && $this->_tab_loaded[$moduletag])
-			{
+		if (empty($forcereload)) {
+			if ($moduletag && isset($this->_tab_loaded[$moduletag]) && $this->_tab_loaded[$moduletag]) {
 				// Rights for this module are already loaded, so we leave
 				return;
 			}
 
-			if (!empty($this->all_permissions_are_loaded))
-			{
+			if (!empty($this->all_permissions_are_loaded)) {
 				// We already loaded all rights for this user, so we leave
 				return;
 			}
@@ -795,43 +959,52 @@ class User extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."user_rights as ur";
 		$sql .= ", ".MAIN_DB_PREFIX."rights_def as r";
 		$sql .= " WHERE r.id = ur.fk_id";
-		if (!empty($conf->global->MULTICOMPANY_BACKWARD_COMPATIBILITY))
-		{
+		if (!empty($conf->global->MULTICOMPANY_BACKWARD_COMPATIBILITY)) {
 			$sql .= " AND r.entity IN (0,".(!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) ? "1," : "").$conf->entity.")";
 		} else {
 			$sql .= " AND ur.entity = ".$conf->entity;
 		}
 		$sql .= " AND ur.fk_user= ".$this->id;
 		$sql .= " AND r.perms IS NOT NULL";
-		if ($moduletag) $sql .= " AND r.module = '".$this->db->escape($moduletag)."'";
+		if ($moduletag) {
+			$sql .= " AND r.module = '".$this->db->escape($moduletag)."'";
+		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
-				$module = $obj->module;
-				$perms = $obj->perms;
-				$subperms = $obj->subperms;
+				if ($obj) {
+					$module = $obj->module;
+					$perms = $obj->perms;
+					$subperms = $obj->subperms;
 
-				if ($perms)
-				{
-					if (!isset($this->rights) || !is_object($this->rights)) $this->rights = new stdClass(); // For avoid error
-					if ($module)
-					{
-						if (!isset($this->rights->$module) || !is_object($this->rights->$module)) $this->rights->$module = new stdClass();
-						if ($subperms)
-						{
-							if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) $this->rights->$module->$perms = new stdClass();
-							if (empty($this->rights->$module->$perms->$subperms)) $this->nb_rights++;
-							$this->rights->$module->$perms->$subperms = 1;
-						} else {
-							if (empty($this->rights->$module->$perms)) $this->nb_rights++;
-							$this->rights->$module->$perms = 1;
+					if (!empty($perms)) {
+						if (!isset($this->rights) || !is_object($this->rights)) {
+							$this->rights = new stdClass(); // For avoid error
+						}
+						if (!empty($module)) {
+							if (!isset($this->rights->$module) || !is_object($this->rights->$module)) {
+								$this->rights->$module = new stdClass();
+							}
+							if (!empty($subperms)) {
+								if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) {
+									$this->rights->$module->$perms = new stdClass();
+								}
+								if (empty($this->rights->$module->$perms->$subperms)) {
+									$this->nb_rights++;
+								}
+								$this->rights->$module->$perms->$subperms = 1;
+							} else {
+								if (empty($this->rights->$module->$perms)) {
+									$this->nb_rights++;
+								}
+								$this->rights->$module->$perms = 1;
+							}
 						}
 					}
 				}
@@ -846,8 +1019,7 @@ class User extends CommonObject
 		$sql .= " ".MAIN_DB_PREFIX."usergroup_user as gu,";
 		$sql .= " ".MAIN_DB_PREFIX."rights_def as r";
 		$sql .= " WHERE r.id = gr.fk_id";
-		if (!empty($conf->global->MULTICOMPANY_BACKWARD_COMPATIBILITY))
-		{
+		if (!empty($conf->global->MULTICOMPANY_BACKWARD_COMPATIBILITY)) {
 			if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				$sql .= " AND gu.entity IN (0,".$conf->entity.")";
 			} else {
@@ -861,34 +1033,48 @@ class User extends CommonObject
 		$sql .= " AND gr.fk_usergroup = gu.fk_usergroup";
 		$sql .= " AND gu.fk_user = ".$this->id;
 		$sql .= " AND r.perms IS NOT NULL";
-		if ($moduletag) $sql .= " AND r.module = '".$this->db->escape($moduletag)."'";
+		if ($moduletag) {
+			$sql .= " AND r.module = '".$this->db->escape($moduletag)."'";
+		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
-				$module = $obj->module;
-				$perms = $obj->perms;
-				$subperms = $obj->subperms;
+				if ($obj) {
+					$module = $obj->module;
+					$perms = $obj->perms;
+					$subperms = $obj->subperms;
 
-				if ($perms)
-				{
-					if (!isset($this->rights) || !is_object($this->rights)) $this->rights = new stdClass(); // For avoid error
-					if (!isset($this->rights->$module) || !is_object($this->rights->$module)) $this->rights->$module = new stdClass();
-					if ($subperms)
-					{
-						if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) $this->rights->$module->$perms = new stdClass();
-						if (empty($this->rights->$module->$perms->$subperms)) $this->nb_rights++;
-						$this->rights->$module->$perms->$subperms = 1;
-					} else {
-						if (empty($this->rights->$module->$perms)) $this->nb_rights++;
-						// if we have already define a subperm like this $this->rights->$module->level1->level2 with llx_user_rights, we don't want override level1 because the level2 can be not define on user group
-						if (!is_object($this->rights->$module->$perms)) $this->rights->$module->$perms = 1;
+					if (!empty($perms)) {
+						if (!isset($this->rights) || !is_object($this->rights)) {
+							$this->rights = new stdClass(); // For avoid error
+						}
+						if (!empty($module)) {
+							if (!isset($this->rights->$module) || !is_object($this->rights->$module)) {
+								$this->rights->$module = new stdClass();
+							}
+							if (!empty($subperms)) {
+								if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) {
+									$this->rights->$module->$perms = new stdClass();
+								}
+								if (empty($this->rights->$module->$perms->$subperms)) {
+									$this->nb_rights++;
+								}
+								$this->rights->$module->$perms->$subperms = 1;
+							} else {
+								if (empty($this->rights->$module->$perms)) {
+									$this->nb_rights++;
+								}
+								// if we have already define a subperm like this $this->rights->$module->level1->level2 with llx_user_rights, we don't want override level1 because the level2 can be not define on user group
+								if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) {
+									$this->rights->$module->$perms = 1;
+								}
+							}
+						}
 					}
 				}
 				$i++;
@@ -897,11 +1083,14 @@ class User extends CommonObject
 		}
 
 		// For backward compatibility
-		if (isset($this->rights->propale) && !isset($this->rights->propal)) $this->rights->propal = $this->rights->propale;
-		if (isset($this->rights->propal) && !isset($this->rights->propale)) $this->rights->propale = $this->rights->propal;
+		if (isset($this->rights->propale) && !isset($this->rights->propal)) {
+			$this->rights->propal = $this->rights->propale;
+		}
+		if (isset($this->rights->propal) && !isset($this->rights->propale)) {
+			$this->rights->propale = $this->rights->propal;
+		}
 
-		if (!$moduletag)
-		{
+		if (!$moduletag) {
 			// Si module etait non defini, alors on a tout charge, on peut donc considerer
 			// que les droits sont en cache (car tous charges) pour cet instance de user
 			$this->all_permissions_are_loaded = 1;
@@ -924,8 +1113,11 @@ class User extends CommonObject
 		$error = 0;
 
 		// Check parameters
-		if ($this->statut == $status) return 0;
-		else $this->statut = $status;
+		if ($this->statut == $status) {
+			return 0;
+		} else {
+			$this->statut = $status;
+		}
 
 		$this->db->begin();
 
@@ -936,16 +1128,16 @@ class User extends CommonObject
 		$result = $this->db->query($sql);
 
 		dol_syslog(get_class($this)."::setstatus", LOG_DEBUG);
-		if ($result)
-		{
+		if ($result) {
 			// Call trigger
 			$result = $this->call_trigger('USER_ENABLEDISABLE', $user);
-			if ($result < 0) { $error++; }
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
-		if ($error)
-		{
+		if ($error) {
 			$this->db->rollback();
 			return -$error;
 		} else {
@@ -1024,68 +1216,57 @@ class User extends CommonObject
 		// Remove rights
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = ".$this->id;
 
-		if (!$error && !$this->db->query($sql))
-		{
+		if (!$error && !$this->db->query($sql)) {
 			$error++;
 			$this->error = $this->db->lasterror();
 		}
 
 		// Remove group
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_user WHERE fk_user  = ".$this->id;
-		if (!$error && !$this->db->query($sql))
-		{
+		if (!$error && !$this->db->query($sql)) {
 			$error++;
 			$this->error = $this->db->lasterror();
 		}
 
 		// Remove params
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param WHERE fk_user  = ".$this->id;
-		if (!$error && !$this->db->query($sql))
-		{
+		if (!$error && !$this->db->query($sql)) {
 			$error++;
 			$this->error = $this->db->lasterror();
 		}
 
 		// If contact, remove link
-		if ($this->contact_id > 0)
-		{
+		if ($this->contact_id > 0) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET fk_user_creat = null WHERE rowid = ".$this->contact_id;
-			if (!$error && !$this->db->query($sql))
-			{
+			if (!$error && !$this->db->query($sql)) {
 				$error++;
 				$this->error = $this->db->lasterror();
 			}
 		}
 
 		// Remove extrafields
-		if (!$error)
-		{
+		if (!$error) {
 			$result = $this->deleteExtraFields();
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$error++;
 				dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
 			}
 		}
 
 		// Remove user
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."user WHERE rowid = ".$this->id;
-		   	dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-		   	if (!$this->db->query($sql))
-		   	{
-		   		$error++;
-		   		$this->error = $this->db->lasterror();
-		   	}
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			if (!$this->db->query($sql)) {
+				$error++;
+				$this->error = $this->db->lasterror();
+			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Call trigger
 			$result = $this->call_trigger('USER_DELETE', $user);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$error++;
 				$this->db->rollback();
 				return -1;
@@ -1113,25 +1294,23 @@ class User extends CommonObject
 		global $mysoc;
 
 		// Clean parameters
+		$this->setUpperOrLowerCase();
 
-		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname = ucwords($this->lastname);
-		if (!empty($conf->global->MAIN_ALL_TO_UPPER)) $this->lastname = strtoupper($this->lastname);
-		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname = ucwords($this->firstname);
-
+		$this->civility_code = trim($this->civility_code);
 		$this->login = trim($this->login);
-		if (!isset($this->entity)) $this->entity = $conf->entity; // If not defined, we use default value
+		if (!isset($this->entity)) {
+			$this->entity = $conf->entity; // If not defined, we use default value
+		}
 
 		dol_syslog(get_class($this)."::create login=".$this->login.", user=".(is_object($user) ? $user->id : ''), LOG_DEBUG);
 
 		// Check parameters
-		if (!empty($conf->global->USER_MAIL_REQUIRED) && !isValidEMail($this->email))
-		{
+		if (!empty($conf->global->USER_MAIL_REQUIRED) && !isValidEMail($this->email)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorBadEMail", $this->email);
 			return -1;
 		}
-		if (empty($this->login))
-		{
+		if (empty($this->login)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login"));
 			return -1;
@@ -1148,13 +1327,11 @@ class User extends CommonObject
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$this->db->free($resql);
 
-			if ($num)
-			{
+			if ($num) {
 				$this->error = 'ErrorLoginAlreadyExists';
 				dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);
 				$this->db->rollback();
@@ -1165,20 +1342,17 @@ class User extends CommonObject
 				$result = $this->db->query($sql);
 
 				dol_syslog(get_class($this)."::create", LOG_DEBUG);
-				if ($result)
-				{
+				if ($result) {
 					$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."user");
 
 					// Set default rights
-					if ($this->set_default_rights() < 0)
-					{
+					if ($this->set_default_rights() < 0) {
 						$this->error = 'ErrorFailedToSetDefaultRightOfUser';
 						$this->db->rollback();
 						return -5;
 					}
 
-					if (! empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER) && !empty($conf->global->STOCK_USERSTOCK_AUTOCREATE))
-					{
+					if (!empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER) && !empty($conf->global->STOCK_USERSTOCK_AUTOCREATE)) {
 						require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 						$langs->load("stocks");
 						$entrepot = new Entrepot($this->db);
@@ -1194,22 +1368,21 @@ class User extends CommonObject
 
 					// Update minor fields
 					$result = $this->update($user, 1, 1);
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$this->db->rollback();
 						return -4;
 					}
 
-					if (!$notrigger)
-					{
+					if (!$notrigger) {
 						// Call trigger
 						$result = $this->call_trigger('USER_CREATE', $user);
-						if ($result < 0) { $error++; }
+						if ($result < 0) {
+							$error++;
+						}
 						// End call triggers
 					}
 
-					if (!$error)
-					{
+					if (!$error) {
 						$this->db->commit();
 						return $this->id;
 					} else {
@@ -1250,6 +1423,7 @@ class User extends CommonObject
 
 		// Define parameters
 		$this->admin = 0;
+		$this->civility_code = $contact->civility_code;
 		$this->lastname = $contact->lastname;
 		$this->firstname = $contact->firstname;
 		$this->gender = $contact->gender;
@@ -1265,29 +1439,35 @@ class User extends CommonObject
 		$this->country_id = $contact->country_id;
 		$this->employee = 0;
 
-		if (empty($login)) $login = strtolower(substr($contact->firstname, 0, 4)).strtolower(substr($contact->lastname, 0, 4));
+		if (empty($login)) {
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+			$login = dol_buildlogin($contact->lastname, $contact->firstname);
+		}
 		$this->login = $login;
 
 		$this->db->begin();
 
 		// Create user and set $this->id. Trigger is disabled because executed later.
 		$result = $this->create($user, 1);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."user";
 			$sql .= " SET fk_socpeople=".$contact->id;
-			if ($contact->socid) $sql .= ", fk_soc=".$contact->socid;
+			$sql .= ", civility=".$contact->civility_code;
+			if ($contact->socid) {
+				$sql .= ", fk_soc=".$contact->socid;
+			}
 			$sql .= " WHERE rowid=".$this->id;
 			$resql = $this->db->query($sql);
 
 			dol_syslog(get_class($this)."::create_from_contact", LOG_DEBUG);
-			if ($resql)
-			{
+			if ($resql) {
 				$this->context['createfromcontact'] = 'createfromcontact';
 
 				// Call trigger
 				$result = $this->call_trigger('USER_CREATE', $user);
-				if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+				if ($result < 0) {
+					$error++; $this->db->rollback(); return -1;
+				}
 				// End call triggers
 
 				$this->db->commit();
@@ -1309,11 +1489,12 @@ class User extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Create a user into database from a member object
+	 *  Create a user into database from a member object.
+	 *  If $member->fk_soc is set, it will be an external user.
 	 *
-	 *  @param	Adherent	$member		Object member source
-	 * 	@param	string		$login		Login to force
-	 *  @return int						<0 if KO, if OK, return id of created account
+	 *  @param	Adherent		$member		Object member source
+	 * 	@param	string			$login		Login to force
+	 *  @return int							<0 if KO, if OK, return id of created account
 	 */
 	public function create_from_member($member, $login = '')
 	{
@@ -1322,6 +1503,7 @@ class User extends CommonObject
 
 		// Set properties on new user
 		$this->admin = 0;
+		$this->civility_code = $member->civility_id;
 		$this->lastname     = $member->lastname;
 		$this->firstname    = $member->firstname;
 		$this->gender = $member->gender;
@@ -1337,40 +1519,41 @@ class User extends CommonObject
 		$this->pass         = $member->pass;
 		$this->pass_crypted = $member->pass_indatabase_crypted;
 
-		if (empty($login)) $login = strtolower(substr($member->firstname, 0, 4)).strtolower(substr($member->lastname, 0, 4));
+		if (empty($login)) {
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+			$login = dol_buildlogin($member->lastname, $member->firstname);
+		}
 		$this->login = $login;
 
 		$this->db->begin();
 
 		// Create and set $this->id
 		$result = $this->create($user);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			if (!empty($this->pass)) {	// If a clear password was received (this situation should not happen anymore now), we use it to save it into database
 				$newpass = $this->setPassword($user, $this->pass);
-				if (is_numeric($newpass) && $newpass < 0) $result = -2;
+				if (is_numeric($newpass) && $newpass < 0) {
+					$result = -2;
+				}
 			} elseif (!empty($this->pass_crypted)) {	// If a crypted password is already known, we save it directly into database because the previous create did not save it.
 				$sql = "UPDATE ".MAIN_DB_PREFIX."user";
 				$sql .= " SET pass_crypted = '".$this->db->escape($this->pass_crypted)."'";
 				$sql .= " WHERE rowid=".$this->id;
 
 				$resql = $this->db->query($sql);
-				if (!$resql)
-				{
+				if (!$resql) {
 					$result = -1;
 				}
 			}
 
-			if ($result > 0 && $member->fk_soc)	// If member is linked to a thirdparty
-			{
+			if ($result > 0 && $member->fk_soc) {	// If member is linked to a thirdparty
 				$sql = "UPDATE ".MAIN_DB_PREFIX."user";
 				$sql .= " SET fk_soc=".$member->fk_soc;
 				$sql .= " WHERE rowid=".$this->id;
 
 				dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
 				$resql = $this->db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$this->db->commit();
 					return $this->id;
 				} else {
@@ -1382,8 +1565,7 @@ class User extends CommonObject
 			}
 		}
 
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			$this->db->commit();
 			return $this->id;
 		} else {
@@ -1404,18 +1586,17 @@ class User extends CommonObject
 		// phpcs:enable
 		global $conf;
 
+		$rd = array();
+		$num = 0;
 		$sql = "SELECT id FROM ".MAIN_DB_PREFIX."rights_def";
 		$sql .= " WHERE bydefault = 1";
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			$rd = array();
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$row = $this->db->fetch_row($resql);
 				$rd[$i] = $row[0];
 				$i++;
@@ -1423,14 +1604,15 @@ class User extends CommonObject
 			$this->db->free($resql);
 		}
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = $this->id AND fk_id=$rd[$i]";
 			$result = $this->db->query($sql);
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_rights (fk_user, fk_id) VALUES ($this->id, $rd[$i])";
 			$result = $this->db->query($sql);
-			if (!$result) return -1;
+			if (!$result) {
+				return -1;
+			}
 			$i++;
 		}
 
@@ -1457,11 +1639,7 @@ class User extends CommonObject
 		dol_syslog(get_class($this)."::update notrigger=".$notrigger.", nosyncmember=".$nosyncmember.", nosyncmemberpass=".$nosyncmemberpass);
 
 		// Clean parameters
-
-		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname = ucwords($this->lastname);
-		if (!empty($conf->global->MAIN_ALL_TO_UPPER)) $this->lastname = strtoupper($this->lastname);
-		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname = ucwords($this->firstname);
-
+		$this->civility_code = trim($this->civility_code);
 		$this->lastname     = trim($this->lastname);
 		$this->firstname    = trim($this->firstname);
 		$this->employee    	= $this->employee ? $this->employee : 0;
@@ -1469,9 +1647,10 @@ class User extends CommonObject
 		$this->gender       = trim($this->gender);
 		$this->pass         = trim($this->pass);
 		$this->api_key      = trim($this->api_key);
-		$this->address = $this->address ?trim($this->address) : trim($this->address);
-		$this->zip = $this->zip ?trim($this->zip) : trim($this->zip);
-		$this->town = $this->town ?trim($this->town) : trim($this->town);
+		$this->address = $this->address ? trim($this->address) : trim($this->address);
+		$this->zip = $this->zip ? trim($this->zip) : trim($this->zip);
+		$this->town = $this->town ? trim($this->town) : trim($this->town);
+		$this->setUpperOrLowerCase();
 		$this->state_id = trim($this->state_id);
 		$this->country_id = ($this->country_id > 0) ? $this->country_id : 0;
 		$this->office_phone = trim($this->office_phone);
@@ -1497,17 +1676,15 @@ class User extends CommonObject
 		$this->datestartvalidity = empty($this->datestartvalidity) ? '' : $this->datestartvalidity;
 		$this->dateendvalidity = empty($this->dateendvalidity) ? '' : $this->dateendvalidity;
 		$this->birth        = trim($this->birth);
-		$this->fk_warehouse = trim(empty($this->fk_warehouse) ? '' : $this->fk_warehouse);
+		$this->fk_warehouse = (int) $this->fk_warehouse;
 
 		// Check parameters
-		if (!empty($conf->global->USER_MAIL_REQUIRED) && !isValidEMail($this->email))
-		{
+		if (!empty($conf->global->USER_MAIL_REQUIRED) && !isValidEMail($this->email)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorBadEMail", $this->email);
 			return -1;
 		}
-		if (empty($this->login))
-		{
+		if (empty($this->login)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorFieldRequired", 'Login');
 			return -1;
@@ -1517,14 +1694,17 @@ class User extends CommonObject
 
 		// Update datas
 		$sql = "UPDATE ".MAIN_DB_PREFIX."user SET";
-		$sql .= " lastname = '".$this->db->escape($this->lastname)."'";
+		$sql .= " civility = '".$this->db->escape($this->civility_code)."'";
+		$sql .= ", lastname = '".$this->db->escape($this->lastname)."'";
 		$sql .= ", firstname = '".$this->db->escape($this->firstname)."'";
 		$sql .= ", employee = ".(int) $this->employee;
 		$sql .= ", login = '".$this->db->escape($this->login)."'";
 		$sql .= ", api_key = ".($this->api_key ? "'".$this->db->escape($this->api_key)."'" : "null");
 		$sql .= ", gender = ".($this->gender != -1 ? "'".$this->db->escape($this->gender)."'" : "null"); // 'man' or 'woman'
 		$sql .= ", birth=".(strval($this->birth) != '' ? "'".$this->db->idate($this->birth)."'" : 'null');
-		if (!empty($user->admin)) $sql .= ", admin = ".(int) $this->admin; // admin flag can be set/unset only by an admin user
+		if (!empty($user->admin)) {
+			$sql .= ", admin = ".(int) $this->admin; // admin flag can be set/unset only by an admin user
+		}
 		$sql .= ", address = '".$this->db->escape($this->address)."'";
 		$sql .= ", zip = '".$this->db->escape($this->zip)."'";
 		$sql .= ", town = '".$this->db->escape($this->town)."'";
@@ -1552,53 +1732,61 @@ class User extends CommonObject
 		$sql .= ", fk_user = ".($this->fk_user > 0 ? "'".$this->db->escape($this->fk_user)."'" : "null");
 		$sql .= ", fk_user_expense_validator = ".($this->fk_user_expense_validator > 0 ? "'".$this->db->escape($this->fk_user_expense_validator)."'" : "null");
 		$sql .= ", fk_user_holiday_validator = ".($this->fk_user_holiday_validator > 0 ? "'".$this->db->escape($this->fk_user_holiday_validator)."'" : "null");
-		if (isset($this->thm) || $this->thm != '')                 $sql .= ", thm= ".($this->thm != '' ? "'".$this->db->escape($this->thm)."'" : "null");
-		if (isset($this->tjm) || $this->tjm != '')                 $sql .= ", tjm= ".($this->tjm != '' ? "'".$this->db->escape($this->tjm)."'" : "null");
-		if (isset($this->salary) || $this->salary != '')           $sql .= ", salary= ".($this->salary != '' ? "'".$this->db->escape($this->salary)."'" : "null");
-		if (isset($this->salaryextra) || $this->salaryextra != '') $sql .= ", salaryextra= ".($this->salaryextra != '' ? "'".$this->db->escape($this->salaryextra)."'" : "null");
+		if (isset($this->thm) || $this->thm != '') {
+			$sql .= ", thm= ".($this->thm != '' ? "'".$this->db->escape($this->thm)."'" : "null");
+		}
+		if (isset($this->tjm) || $this->tjm != '') {
+			$sql .= ", tjm= ".($this->tjm != '' ? "'".$this->db->escape($this->tjm)."'" : "null");
+		}
+		if (isset($this->salary) || $this->salary != '') {
+			$sql .= ", salary= ".($this->salary != '' ? "'".$this->db->escape($this->salary)."'" : "null");
+		}
+		if (isset($this->salaryextra) || $this->salaryextra != '') {
+			$sql .= ", salaryextra= ".($this->salaryextra != '' ? "'".$this->db->escape($this->salaryextra)."'" : "null");
+		}
 		$sql .= ", weeklyhours= ".($this->weeklyhours != '' ? "'".$this->db->escape($this->weeklyhours)."'" : "null");
 		$sql .= ", entity = '".$this->db->escape($this->entity)."'";
 		$sql .= ", default_range = ".($this->default_range > 0 ? $this->default_range : 'null');
 		$sql .= ", default_c_exp_tax_cat = ".($this->default_c_exp_tax_cat > 0 ? $this->default_c_exp_tax_cat : 'null');
-		$sql .= ", fk_warehouse = ".($this->fk_warehouse ? "'".$this->db->escape($this->fk_warehouse)."'" : "null");
+		$sql .= ", fk_warehouse = ".($this->fk_warehouse > 0 ? $this->fk_warehouse : "null");
 		$sql .= ", lang = ".($this->lang ? "'".$this->db->escape($this->lang)."'" : "null");
 		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$nbrowsaffected += $this->db->affected_rows($resql);
 
 			// Update password
-			if (!empty($this->pass))
-			{
-				if ($this->pass != $this->pass_indatabase && $this->pass != $this->pass_indatabase_crypted)
-				{
+			if (!empty($this->pass)) {
+				if ($this->pass != $this->pass_indatabase && $this->pass != $this->pass_indatabase_crypted) {
 					// Si mot de passe saisi et different de celui en base
 					$result = $this->setPassword($user, $this->pass, 0, $notrigger, $nosyncmemberpass);
-					if (!$nbrowsaffected) $nbrowsaffected++;
+					if (!$nbrowsaffected) {
+						$nbrowsaffected++;
+					}
 				}
 			}
 
 			// If user is linked to a member, remove old link to this member
-			if ($this->fk_member > 0)
-			{
+			if ($this->fk_member > 0) {
 				dol_syslog(get_class($this)."::update remove link with member. We will recreate it later", LOG_DEBUG);
 				$sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member = NULL where fk_member = ".$this->fk_member;
 				$resql = $this->db->query($sql);
-				if (!$resql) { $this->error = $this->db->error(); $this->db->rollback(); return -5; }
+				if (!$resql) {
+					$this->error = $this->db->error(); $this->db->rollback(); return -5;
+				}
 			}
 			// Set link to user
 			dol_syslog(get_class($this)."::update set link with member", LOG_DEBUG);
 			$sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member =".($this->fk_member > 0 ? $this->fk_member : 'null')." where rowid = ".$this->id;
 			$resql = $this->db->query($sql);
-			if (!$resql) { $this->error = $this->db->error(); $this->db->rollback(); return -5; }
+			if (!$resql) {
+				$this->error = $this->db->error(); $this->db->rollback(); return -5;
+			}
 
-			if ($nbrowsaffected)	// If something has changed in data
-			{
-				if ($this->fk_member > 0 && !$nosyncmember)
-				{
+			if ($nbrowsaffected) {	// If something has changed in data
+				if ($this->fk_member > 0 && !$nosyncmember) {
 					dol_syslog(get_class($this)."::update user is linked with a member. We try to update member too.", LOG_DEBUG);
 
 					require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
@@ -1608,8 +1796,8 @@ class User extends CommonObject
 					$adh = new Adherent($this->db);
 					$result = $adh->fetch($this->fk_member);
 
-					if ($result > 0)
-					{
+					if ($result > 0) {
+						$adh->civility_code = $this->civility_code;
 						$adh->firstname = $this->firstname;
 						$adh->lastname = $this->lastname;
 						$adh->login = $this->login;
@@ -1637,23 +1825,20 @@ class User extends CommonObject
 						$adh->user_login = $this->login;
 
 						$result = $adh->update($user, 0, 1, 0);
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							$this->error = $adh->error;
 							$this->errors = $adh->errors;
 							dol_syslog(get_class($this)."::update error after calling adh->update to sync it with user: ".$this->error, LOG_ERR);
 							$error++;
 						}
-					} elseif ($result < 0)
-					{
+					} elseif ($result < 0) {
 						$this->error = $adh->error;
 						$this->errors = $adh->errors;
 						$error++;
 					}
 				}
 
-				if ($this->contact_id > 0 && !$nosynccontact)
-				{
+				if ($this->contact_id > 0 && !$nosynccontact) {
 					dol_syslog(get_class($this)."::update user is linked with a contact. We try to update contact too.", LOG_DEBUG);
 
 					require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
@@ -1662,8 +1847,8 @@ class User extends CommonObject
 					$tmpobj = new Contact($this->db);
 					$result = $tmpobj->fetch($this->contact_id);
 
-					if ($result >= 0)
-					{
+					if ($result >= 0) {
+						$tmpobj->civility_code = $this->civility_code;
 						$tmpobj->firstname = $this->firstname;
 						$tmpobj->lastname = $this->lastname;
 						$tmpobj->login = $this->login;
@@ -1692,8 +1877,7 @@ class User extends CommonObject
 						$tmpobj->user_login = $this->login;
 
 						$result = $tmpobj->update($tmpobj->id, $user, 0, 'update', 1);
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							$this->error = $tmpobj->error;
 							$this->errors = $tmpobj->errors;
 							dol_syslog(get_class($this)."::update error after calling adh->update to sync it with user: ".$this->error, LOG_ERR);
@@ -1710,25 +1894,23 @@ class User extends CommonObject
 			$action = 'update';
 
 			// Actions on extra fields
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('USER_MODIFY', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return $nbrowsaffected;
 			} else {
@@ -1763,8 +1945,7 @@ class User extends CommonObject
 
 		dol_syslog(get_class($this)."::update_last_login_date user->id=".$this->id." ".$sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->datepreviouslogin = $this->datelastlogin;
 			$this->datelastlogin = $now;
 			return 1;
@@ -1795,8 +1976,7 @@ class User extends CommonObject
 		dol_syslog(get_class($this)."::setPassword user=".$user->id." password=".preg_replace('/./i', '*', $password)." changelater=".$changelater." notrigger=".$notrigger." nosyncmember=".$nosyncmember, LOG_DEBUG);
 
 		// If new password not provided, we generate one
-		if (!$password)
-		{
+		if (!$password) {
 			$password = getRandomPassword(false);
 		}
 
@@ -1804,17 +1984,17 @@ class User extends CommonObject
 		$password_crypted = dol_hash($password);
 
 		// Mise a jour
-		if (!$changelater)
-		{
-			if (!is_object($this->oldcopy)) $this->oldcopy = clone $this;
+		if (!$changelater) {
+			if (!is_object($this->oldcopy)) {
+				$this->oldcopy = clone $this;
+			}
 
 			$this->db->begin();
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."user";
 			$sql .= " SET pass_crypted = '".$this->db->escape($password_crypted)."',";
 			$sql .= " pass_temp = null";
-			if (!empty($conf->global->DATABASE_PWD_ENCRYPTED))
-			{
+			if (!empty($conf->global->DATABASE_PWD_ENCRYPTED)) {
 				$sql .= ", pass = null";
 			} else {
 				$sql .= ", pass = '".$this->db->escape($password)."'";
@@ -1823,16 +2003,13 @@ class User extends CommonObject
 
 			dol_syslog(get_class($this)."::setPassword", LOG_DEBUG);
 			$result = $this->db->query($sql);
-			if ($result)
-			{
-				if ($this->db->affected_rows($result))
-				{
+			if ($result) {
+				if ($this->db->affected_rows($result)) {
 					$this->pass = $password;
 					$this->pass_indatabase = $password;
 					$this->pass_indatabase_crypted = $password_crypted;
 
-					if ($this->fk_member && !$nosyncmember)
-					{
+					if ($this->fk_member && !$nosyncmember) {
 						require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 
 						// This user is linked with a member, so we also update members informations
@@ -1840,11 +2017,9 @@ class User extends CommonObject
 						$adh = new Adherent($this->db);
 						$result = $adh->fetch($this->fk_member);
 
-						if ($result >= 0)
-						{
+						if ($result >= 0) {
 							$result = $adh->setPassword($user, $this->pass, (empty($conf->global->DATABASE_PWD_ENCRYPTED) ? 0 : 1), 1); // Cryptage non gere dans module adherent
-							if ($result < 0)
-							{
+							if ($result < 0) {
 								$this->error = $adh->error;
 								dol_syslog(get_class($this)."::setPassword ".$this->error, LOG_ERR);
 								$error++;
@@ -1857,11 +2032,12 @@ class User extends CommonObject
 
 					dol_syslog(get_class($this)."::setPassword notrigger=".$notrigger." error=".$error, LOG_DEBUG);
 
-					if (!$error && !$notrigger)
-					{
+					if (!$error && !$notrigger) {
 						// Call trigger
 						$result = $this->call_trigger('USER_NEW_PASSWORD', $user);
-						if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+						if ($result < 0) {
+							$error++; $this->db->rollback(); return -1;
+						}
 						// End call triggers
 					}
 
@@ -1885,8 +2061,7 @@ class User extends CommonObject
 
 			dol_syslog(get_class($this)."::setPassword", LOG_DEBUG); // No log
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				return $password;
 			} else {
 				dol_print_error($this->db);
@@ -1921,8 +2096,7 @@ class User extends CommonObject
 		$outputlangs = new Translate("", $conf);
 
 		if (isset($this->conf->MAIN_LANG_DEFAULT)
-		&& $this->conf->MAIN_LANG_DEFAULT != 'auto')
-		{	// If user has defined its own language (rare because in most cases, auto is used)
+		&& $this->conf->MAIN_LANG_DEFAULT != 'auto') {	// If user has defined its own language (rare because in most cases, auto is used)
 			$outputlangs->getDefaultLang($this->conf->MAIN_LANG_DEFAULT);
 		}
 
@@ -1936,7 +2110,9 @@ class User extends CommonObject
 		$outputlangs->loadLangs(array("main", "errors", "users", "other"));
 
 		$appli = constant('DOL_APPLICATION_TITLE');
-		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli = $conf->global->MAIN_APPLICATION_TITLE;
+		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+			$appli = $conf->global->MAIN_APPLICATION_TITLE;
+		}
 
 		$subject = $outputlangs->transnoentitiesnoconv("SubjectNewPassword", $appli);
 
@@ -1944,8 +2120,7 @@ class User extends CommonObject
 		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
 		$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 
-		if (!$changelater)
-		{
+		if (!$changelater) {
 			$url = $urlwithroot.'/';
 			$mesg .= $outputlangs->transnoentitiesnoconv("RequestToResetPasswordReceived").".\n";
 			$mesg .= $outputlangs->transnoentitiesnoconv("NewKeyIs")." :\n\n";
@@ -1992,8 +2167,7 @@ class User extends CommonObject
 			$trackid
 		);
 
-		if ($mailfile->sendfile())
-		{
+		if ($mailfile->sendfile()) {
 			return 1;
 		} else {
 			$langs->trans("errors");
@@ -2027,10 +2201,8 @@ class User extends CommonObject
 		$sql .= " WHERE u.fk_user = ".$this->id;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->clicktodial_url = $obj->url;
@@ -2076,8 +2248,7 @@ class User extends CommonObject
 
 		dol_syslog(get_class($this).'::update_clicktodial', LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -2117,21 +2288,20 @@ class User extends CommonObject
 		$sql .= " VALUES (".$entity.",".$this->id.",".$group.")";
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if (!$error && !$notrigger)
-			{
+		if ($result) {
+			if (!$error && !$notrigger) {
 				$this->newgroupid = $group; // deprecated. Remove this.
 				$this->context = array('audit'=>$langs->trans("UserSetInGroup"), 'newgroupid'=>$group);
 
 				// Call trigger
 				$result = $this->call_trigger('USER_MODIFY', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -2170,21 +2340,20 @@ class User extends CommonObject
 		$sql .= " AND entity = ".$entity;
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if (!$error && !$notrigger)
-			{
+		if ($result) {
+			if (!$error && !$notrigger) {
 				$this->oldgroupid = $group; // deprecated. Remove this.
 				$this->context = array('audit'=>$langs->trans("UserRemovedFromGroup"), 'oldgroupid'=>$group);
 
 				// Call trigger
 				$result = $this->call_trigger('USER_MODIFY', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -2240,14 +2409,17 @@ class User extends CommonObject
 		global $dolibarr_main_authentication, $dolibarr_main_demo;
 		global $menumanager;
 
-		if (!$user->rights->user->user->lire && $user->id != $this->id) $option = 'nolink';
+		if (!$user->rights->user->user->lire && $user->id != $this->id) {
+			$option = 'nolink';
+		}
 
-		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpictoimg) $withpictoimg = 0;
+		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpictoimg) {
+			$withpictoimg = 0;
+		}
 
 		$result = ''; $label = '';
 
-		if (!empty($this->photo))
-		{
+		if (!empty($this->photo)) {
 			$label .= '<div class="photointooltip">';
 			$label .= Form::showphoto('userphoto', $this, 0, 60, 0, 'photowithmargin photologintooltip', 'small', 0, 1); // Force height to 60 so we total height of tooltip can be calculated and collision can be managed
 			$label .= '</div><div style="clear: both;"></div>';
@@ -2255,31 +2427,40 @@ class User extends CommonObject
 
 		// Info Login
 		$label .= '<div class="centpercent">';
-		$label .= img_picto('', $this->picto).' <u>'.$langs->trans("User").'</u><br>';
-		$label .= '<b>'.$langs->trans('Name').':</b> '.$this->getFullName($langs, '');
-		if (!empty($this->login)) $label .= '<br><b>'.$langs->trans('Login').':</b> '.$this->login;
-		if (!empty($this->job)) $label .= '<br><b>'.$langs->trans("Job").':</b> '.$this->job;
+		$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("User").'</u>';
+		$label .= ' '.$this->getLibStatut(4);
+		$label .= '<br><b>'.$langs->trans('Name').':</b> '.$this->getFullName($langs, '');
+		if (!empty($this->login)) {
+			$label .= '<br><b>'.$langs->trans('Login').':</b> '.$this->login;
+		}
+		if (!empty($this->job)) {
+			$label .= '<br><b>'.$langs->trans("Job").':</b> '.$this->job;
+		}
 		$label .= '<br><b>'.$langs->trans("Email").':</b> '.$this->email;
-		if (!empty($this->phone)) $label .= '<br><b>'.$langs->trans("Phone").':</b> '.$this->phone;
-		if (!empty($this->admin))
+		if (!empty($this->phone)) {
+			$label .= '<br><b>'.$langs->trans("Phone").':</b> '.$this->phone;
+		}
+		if (!empty($this->admin)) {
 			$label .= '<br><b>'.$langs->trans("Administrator").'</b>: '.yn($this->admin);
-		if (!empty($this->socid))	// Add thirdparty for external users
-		{
+		}
+		if (!empty($this->socid)) {	// Add thirdparty for external users
 			$thirdpartystatic = new Societe($db);
 			$thirdpartystatic->fetch($this->socid);
-			if (empty($hidethirdpartylogo)) $companylink = ' '.$thirdpartystatic->getNomUrl(2, (($option == 'nolink') ? 'nolink' : '')); // picto only of company
+			if (empty($hidethirdpartylogo)) {
+				$companylink = ' '.$thirdpartystatic->getNomUrl(2, (($option == 'nolink') ? 'nolink' : '')); // picto only of company
+			}
 			$company = ' ('.$langs->trans("Company").': '.$thirdpartystatic->name.')';
 		}
 		$type = ($this->socid ? $langs->trans("External").$company : $langs->trans("Internal"));
 		$label .= '<br><b>'.$langs->trans("Type").':</b> '.$type;
-		$label .= '<br><b>'.$langs->trans("Status").'</b>: '.$this->getLibStatut(4);
 		$label .= '</div>';
-		if ($infologin > 0)
-		{
+		if ($infologin > 0) {
 			$label .= '<br>';
 			$label .= '<br><u>'.$langs->trans("Session").'</u>';
 			$label .= '<br><b>'.$langs->trans("IPAddress").'</b>: '.$_SERVER["REMOTE_ADDR"];
-			if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $label .= '<br><b>'.$langs->trans("ConnectedOnMultiCompany").':</b> '.$conf->entity.' (user entity '.$this->entity.')';
+			if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY)) {
+				$label .= '<br><b>'.$langs->trans("ConnectedOnMultiCompany").':</b> '.$conf->entity.' (user entity '.$this->entity.')';
+			}
 			$label .= '<br><b>'.$langs->trans("AuthenticationMode").':</b> '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo) ? '' : ' (demo)');
 			$label .= '<br><b>'.$langs->trans("ConnectedSince").':</b> '.dol_print_date($this->datelastlogin, "dayhour", 'tzuser');
 			$label .= '<br><b>'.$langs->trans("PreviousConnexion").':</b> '.dol_print_date($this->datepreviouslogin, "dayhour", 'tzuser');
@@ -2290,28 +2471,37 @@ class User extends CommonObject
 			$label .= '<br><b>'.$langs->trans("Browser").':</b> '.$conf->browser->name.($conf->browser->version ? ' '.$conf->browser->version : '').' ('.$_SERVER['HTTP_USER_AGENT'].')';
 			$label .= '<br><b>'.$langs->trans("Layout").':</b> '.$conf->browser->layout;
 			$label .= '<br><b>'.$langs->trans("Screen").':</b> '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
-			if ($conf->browser->layout == 'phone') $label .= '<br><b>'.$langs->trans("Phone").':</b> '.$langs->trans("Yes");
-			if (!empty($_SESSION["disablemodules"])) $label .= '<br><b>'.$langs->trans("DisabledModules").':</b> <br>'.join(', ', explode(',', $_SESSION["disablemodules"]));
+			if ($conf->browser->layout == 'phone') {
+				$label .= '<br><b>'.$langs->trans("Phone").':</b> '.$langs->trans("Yes");
+			}
+			if (!empty($_SESSION["disablemodules"])) {
+				$label .= '<br><b>'.$langs->trans("DisabledModules").':</b> <br>'.join(', ', explode(',', $_SESSION["disablemodules"]));
+			}
+		}
+		if ($infologin < 0) {
+			$label = '';
 		}
-		if ($infologin < 0) $label = '';
 
 		$url = DOL_URL_ROOT.'/user/card.php?id='.$this->id;
-		if ($option == 'leave') $url = DOL_URL_ROOT.'/holiday/list.php?id='.$this->id;
+		if ($option == 'leave') {
+			$url = DOL_URL_ROOT.'/holiday/list.php?id='.$this->id;
+		}
 
-		if ($option != 'nolink')
-		{
+		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkclose = "";
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$langs->load("users");
 				$label = $langs->trans("ShowUser");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
@@ -2332,22 +2522,33 @@ class User extends CommonObject
 
 		//if ($withpictoimg == -1) $result.='<div class="nowrap">';
 		$result .= (($option == 'nolink') ? '' : $linkstart);
-		if ($withpictoimg)
-		{
-		  	$paddafterimage = '';
-		  	if (abs($withpictoimg) == 1) $paddafterimage = 'style="margin-'.($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right').': 3px;"';
+		if ($withpictoimg) {
+			$paddafterimage = '';
+			if (abs($withpictoimg) == 1) {
+				$paddafterimage = 'style="margin-'.($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right').': 3px;"';
+			}
 			// Only picto
-			if ($withpictoimg > 0) $picto = '<!-- picto user --><span class="nopadding userimg'.($morecss ? ' '.$morecss : '').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip ? '' : 'class="paddingright classfortooltip"'), 0, 0, $notooltip ? 0 : 1).'</span>';
+			if ($withpictoimg > 0) {
+				$picto = '<!-- picto user --><span class="nopadding userimg'.($morecss ? ' '.$morecss : '').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip ? '' : 'class="paddingright classfortooltip"'), 0, 0, $notooltip ? 0 : 1).'</span>';
+			}
 			// Picto must be a photo
-			else $picto = '<!-- picto photo user --><span class="nopadding userimg'.($morecss ? ' '.$morecss : '').'"'.($paddafterimage ? ' '.$paddafterimage : '').'>'.Form::showphoto('userphoto', $this, 0, 0, 0, 'userphoto'.($withpictoimg == -3 ? 'small' : ''), 'mini', 0, 1).'</span>';
+			else {
+				$picto = '<!-- picto photo user --><span class="nopadding userimg'.($morecss ? ' '.$morecss : '').'"'.($paddafterimage ? ' '.$paddafterimage : '').'>'.Form::showphoto('userphoto', $this, 0, 0, 0, 'userphoto'.($withpictoimg == -3 ? 'small' : ''), 'mini', 0, 1).'</span>';
+			}
 			$result .= $picto;
 		}
-		if ($withpictoimg > -2 && $withpictoimg != 2)
-		{
-			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result .= '<span class=" nopadding usertext'.((!isset($this->statut) || $this->statut) ? '' : ' strikefordisabled').($morecss ? ' '.$morecss : '').'">';
-			if ($mode == 'login') $result .= dol_trunc($this->login, $maxlen);
-			else $result .= $this->getFullName($langs, '', ($mode == 'firstelselast' ? 3 : ($mode == 'firstname' ? 2 : -1)), $maxlen);
-			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result .= '</span>';
+		if ($withpictoimg > -2 && $withpictoimg != 2) {
+			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+				$result .= '<span class=" nopadding usertext'.((!isset($this->statut) || $this->statut) ? '' : ' strikefordisabled').($morecss ? ' '.$morecss : '').'">';
+			}
+			if ($mode == 'login') {
+				$result .= dol_trunc($this->login, $maxlen);
+			} else {
+				$result .= $this->getFullName($langs, '', ($mode == 'firstelselast' ? 3 : ($mode == 'firstname' ? 2 : -1)), $maxlen);
+			}
+			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+				$result .= '</span>';
+			}
 		}
 		$result .= (($option == 'nolink') ? '' : $linkend);
 		//if ($withpictoimg == -1) $result.='</div>';
@@ -2358,8 +2559,11 @@ class User extends CommonObject
 		$hookmanager->initHooks(array('userdao'));
 		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -2381,22 +2585,24 @@ class User extends CommonObject
 		$linkend = '</a>';
 
 		//Check user's rights to see an other user
-		if ((!$user->rights->user->user->lire && $this->id != $user->id)) $option = 'nolink';
+		if ((!$user->rights->user->user->lire && $this->id != $user->id)) {
+			$option = 'nolink';
+		}
 
-		if ($option == 'xxx')
-		{
+		if ($option == 'xxx') {
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'">';
 			$linkend = '</a>';
 		}
 
-		if ($option == 'nolink')
-		{
+		if ($option == 'nolink') {
 			$linkstart = '';
 			$linkend = '';
 		}
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object($langs->trans("ShowUser"), 'user', 'class="paddingright"');
+		if ($withpicto) {
+			$result .= img_object($langs->trans("ShowUser"), 'user', 'class="paddingright"');
+		}
 		$result .= $this->login;
 		$result .= $linkend;
 		return $result;
@@ -2426,8 +2632,7 @@ class User extends CommonObject
 		// phpcs:enable
 		global $langs;
 
-		if (empty($this->labelStatus) || empty($this->labelStatusShort))
-		{
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule");
 			$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Enabled');
@@ -2437,7 +2642,9 @@ class User extends CommonObject
 		}
 
 		$statusType = 'status5';
-		if ($status == self::STATUS_ENABLED) $statusType = 'status4';
+		if ($status == self::STATUS_ENABLED) {
+			$statusType = 'status4';
+		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
@@ -2459,9 +2666,13 @@ class User extends CommonObject
 		// phpcs:enable
 		global $conf;
 		$dn = '';
-		if ($mode == 0) $dn = $conf->global->LDAP_KEY_USERS."=".$info[$conf->global->LDAP_KEY_USERS].",".$conf->global->LDAP_USER_DN;
-		elseif ($mode == 1) $dn = $conf->global->LDAP_USER_DN;
-		elseif ($mode == 2) $dn = $conf->global->LDAP_KEY_USERS."=".$info[$conf->global->LDAP_KEY_USERS];
+		if ($mode == 0) {
+			$dn = $conf->global->LDAP_KEY_USERS."=".$info[$conf->global->LDAP_KEY_USERS].",".$conf->global->LDAP_USER_DN;
+		} elseif ($mode == 1) {
+			$dn = $conf->global->LDAP_USER_DN;
+		} elseif ($mode == 2) {
+			$dn = $conf->global->LDAP_KEY_USERS."=".$info[$conf->global->LDAP_KEY_USERS];
+		}
 		return $dn;
 	}
 
@@ -2478,6 +2689,9 @@ class User extends CommonObject
 		global $conf, $langs;
 
 		$info = array();
+
+		$socialnetworks = getArrayOfSocialNetworks();
+
 		$keymodified = false;
 
 		// Object classes
@@ -2497,70 +2711,85 @@ class User extends CommonObject
 			'LDAP_FIELD_FAX'		=> 'office_fax',
 			'LDAP_FIELD_MAIL'		=> 'email',
 			'LDAP_FIELD_SID'		=> 'ldap_sid',
-			'LDAP_FIELD_SKYPE'		=> 'skype',
-			'LDAP_FIELD_TWITTER'	=> 'twitter',
-			'LDAP_FIELD_FACEBOOK'	=> 'facebook',
-			'LDAP_FIELD_LINKEDIN'	=> 'linkedin'
 		);
 
 		// Champs
-		foreach ($ldapkey as $constname => $varname)
-		{
-			if (!empty($this->$varname) && !empty($conf->global->$constname))
-			{
+		foreach ($ldapkey as $constname => $varname) {
+			if (!empty($this->$varname) && !empty($conf->global->$constname)) {
 				$info[$conf->global->$constname] = $this->$varname;
 
 				// Check if it is the LDAP key and if its value has been changed
-				if (!empty($conf->global->LDAP_KEY_USERS) && $conf->global->LDAP_KEY_USERS == $conf->global->$constname)
-				{
-					if (!empty($this->oldcopy) && $this->$varname != $this->oldcopy->$varname) $keymodified = true; // For check if LDAP key has been modified
+				if (!empty($conf->global->LDAP_KEY_USERS) && $conf->global->LDAP_KEY_USERS == $conf->global->$constname) {
+					if (!empty($this->oldcopy) && $this->$varname != $this->oldcopy->$varname) {
+						$keymodified = true; // For check if LDAP key has been modified
+					}
 				}
 			}
 		}
-		if ($this->address && !empty($conf->global->LDAP_FIELD_ADDRESS))			$info[$conf->global->LDAP_FIELD_ADDRESS] = $this->address;
-		if ($this->zip && !empty($conf->global->LDAP_FIELD_ZIP))					$info[$conf->global->LDAP_FIELD_ZIP] = $this->zip;
-		if ($this->town && !empty($conf->global->LDAP_FIELD_TOWN))					$info[$conf->global->LDAP_FIELD_TOWN] = $this->town;
-		if ($this->note_public && !empty($conf->global->LDAP_FIELD_DESCRIPTION))	$info[$conf->global->LDAP_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note_public, 2);
-		if ($this->socid > 0)
-		{
+		foreach ($socialnetworks as $key => $value) {
+			if ($this->socialnetworks[$value['label']] && !empty($conf->global->{'LDAP_FIELD_'.strtoupper($value['label'])})) {
+				$info[$conf->global->{'LDAP_FIELD_'.strtoupper($value['label'])}] = $this->socialnetworks[$value['label']];
+			}
+		}
+		if ($this->address && !empty($conf->global->LDAP_FIELD_ADDRESS)) {
+			$info[$conf->global->LDAP_FIELD_ADDRESS] = $this->address;
+		}
+		if ($this->zip && !empty($conf->global->LDAP_FIELD_ZIP)) {
+			$info[$conf->global->LDAP_FIELD_ZIP] = $this->zip;
+		}
+		if ($this->town && !empty($conf->global->LDAP_FIELD_TOWN)) {
+			$info[$conf->global->LDAP_FIELD_TOWN] = $this->town;
+		}
+		if ($this->note_public && !empty($conf->global->LDAP_FIELD_DESCRIPTION)) {
+			$info[$conf->global->LDAP_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note_public, 2);
+		}
+		if ($this->socid > 0) {
 			$soc = new Societe($this->db);
 			$soc->fetch($this->socid);
 
 			$info[$conf->global->LDAP_FIELD_COMPANY] = $soc->name;
-			if ($soc->client == 1)      $info["businessCategory"] = "Customers";
-			if ($soc->client == 2)      $info["businessCategory"] = "Prospects";
-			if ($soc->fournisseur == 1) $info["businessCategory"] = "Suppliers";
+			if ($soc->client == 1) {
+				$info["businessCategory"] = "Customers";
+			}
+			if ($soc->client == 2) {
+				$info["businessCategory"] = "Prospects";
+			}
+			if ($soc->fournisseur == 1) {
+				$info["businessCategory"] = "Suppliers";
+			}
 		}
 
 		// When password is modified
-		if (!empty($this->pass))
-		{
-			if (!empty($conf->global->LDAP_FIELD_PASSWORD))				$info[$conf->global->LDAP_FIELD_PASSWORD] = $this->pass; // this->pass = mot de passe non crypte
-			if (!empty($conf->global->LDAP_FIELD_PASSWORD_CRYPTED))		$info[$conf->global->LDAP_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass, 4); // Create OpenLDAP MD5 password (TODO add type of encryption)
+		if (!empty($this->pass)) {
+			if (!empty($conf->global->LDAP_FIELD_PASSWORD)) {
+				$info[$conf->global->LDAP_FIELD_PASSWORD] = $this->pass; // this->pass = mot de passe non crypte
+			}
+			if (!empty($conf->global->LDAP_FIELD_PASSWORD_CRYPTED)) {
+				$info[$conf->global->LDAP_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass, 4); // Create OpenLDAP MD5 password (TODO add type of encryption)
+			}
 		}
 		// Set LDAP password if possible
-		elseif ($conf->global->LDAP_SERVER_PROTOCOLVERSION !== '3') // If ldap key is modified and LDAPv3 we use ldap_rename function for avoid lose encrypt password
-		{
-			if (!empty($conf->global->DATABASE_PWD_ENCRYPTED))
-			{
+		elseif ($conf->global->LDAP_SERVER_PROTOCOLVERSION !== '3') { // If ldap key is modified and LDAPv3 we use ldap_rename function for avoid lose encrypt password
+			if (!empty($conf->global->DATABASE_PWD_ENCRYPTED)) {
 				// Just for the default MD5 !
-				if (empty($conf->global->MAIN_SECURITY_HASH_ALGO))
-				{
+				if (empty($conf->global->MAIN_SECURITY_HASH_ALGO)) {
 					if ($this->pass_indatabase_crypted && !empty($conf->global->LDAP_FIELD_PASSWORD_CRYPTED)) {
 						$info[$conf->global->LDAP_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass_indatabase_crypted, 5); // Create OpenLDAP MD5 password from Dolibarr MD5 password
 					}
 				}
 			}
 			// Use $this->pass_indatabase value if exists
-			elseif (!empty($this->pass_indatabase))
-			{
-				if (!empty($conf->global->LDAP_FIELD_PASSWORD))				$info[$conf->global->LDAP_FIELD_PASSWORD] = $this->pass_indatabase; // $this->pass_indatabase = mot de passe non crypte
-				if (!empty($conf->global->LDAP_FIELD_PASSWORD_CRYPTED))		$info[$conf->global->LDAP_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass_indatabase, 4); // md5 for OpenLdap TODO add type of encryption
+			elseif (!empty($this->pass_indatabase)) {
+				if (!empty($conf->global->LDAP_FIELD_PASSWORD)) {
+					$info[$conf->global->LDAP_FIELD_PASSWORD] = $this->pass_indatabase; // $this->pass_indatabase = mot de passe non crypte
+				}
+				if (!empty($conf->global->LDAP_FIELD_PASSWORD_CRYPTED)) {
+					$info[$conf->global->LDAP_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass_indatabase, 4); // md5 for OpenLdap TODO add type of encryption
+				}
 			}
 		}
 
-		if ($conf->global->LDAP_SERVER_TYPE == 'egroupware')
-		{
+		if ($conf->global->LDAP_SERVER_TYPE == 'egroupware') {
 			$info["objectclass"][4] = "phpgwContact"; // compatibilite egroupware
 
 			$info['uidnumber'] = $this->id;
@@ -2573,18 +2802,23 @@ class User extends CommonObject
 			$info["phpgwContactCatId"] = 0;
 			$info["phpgwContactAccess"] = "public";
 
-			if (dol_strlen($this->egroupware_id) == 0)
-			{
+			if (dol_strlen($this->egroupware_id) == 0) {
 				$this->egroupware_id = 1;
 			}
 
 			$info["phpgwContactOwner"] = $this->egroupware_id;
 
-			if ($this->email) $info["rfc822Mailbox"] = $this->email;
-			if ($this->phone_mobile) $info["phpgwCellTelephoneNumber"] = $this->phone_mobile;
+			if ($this->email) {
+				$info["rfc822Mailbox"] = $this->email;
+			}
+			if ($this->phone_mobile) {
+				$info["phpgwCellTelephoneNumber"] = $this->phone_mobile;
+			}
 		}
 
-		if (!empty($conf->global->LDAP_FIELD_USERID))$info[$conf->global->LDAP_FIELD_USERID] = $this->id;
+		if (!empty($conf->global->LDAP_FIELD_USERID)) {
+			$info[$conf->global->LDAP_FIELD_USERID] = $this->id;
+		}
 		if (!empty($info[$conf->global->LDAP_FIELD_GROUPID])) {
 			$usergroup = new UserGroup($this->db);
 			$groupslist = $usergroup->listGroupsForUser($this->id);
@@ -2596,7 +2830,9 @@ class User extends CommonObject
 				}
 			}
 		}
-		if (!empty($this->firstname) && !empty($conf->global->LDAP_FIELD_HOMEDIRECTORY) && !empty($conf->global->LDAP_FIELD_HOMEDIRECTORYPREFIX)) $info[$conf->global->LDAP_FIELD_HOMEDIRECTORY] = "{$conf->global->LDAP_FIELD_HOMEDIRECTORYPREFIX}/$this->firstname";
+		if (!empty($this->firstname) && !empty($conf->global->LDAP_FIELD_HOMEDIRECTORY) && !empty($conf->global->LDAP_FIELD_HOMEDIRECTORYPREFIX)) {
+			$info[$conf->global->LDAP_FIELD_HOMEDIRECTORY] = "{$conf->global->LDAP_FIELD_HOMEDIRECTORYPREFIX}/$this->firstname";
+		}
 
 		return $info;
 	}
@@ -2607,7 +2843,7 @@ class User extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return	int
 	 */
 	public function initAsSpecimen()
 	{
@@ -2650,6 +2886,7 @@ class User extends CommonObject
 		$this->statut = 1;
 
 		$this->entity = 1;
+		return 1;
 	}
 
 	/**
@@ -2666,10 +2903,8 @@ class User extends CommonObject
 		$sql .= " WHERE u.rowid = ".$id;
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 
 				$this->id = $obj->rowid;
@@ -2700,8 +2935,7 @@ class User extends CommonObject
 		$sql .= " AND mc.statut NOT IN (-1,0)"; // -1 erreur, 0 non envoye, 1 envoye avec succes
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			$nb = $obj->nb;
 
@@ -2727,21 +2961,22 @@ class User extends CommonObject
 
 		$sql = "SELECT count(rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."user";
-		if ($option == 'superadmin')
-		{
+		if ($option == 'superadmin') {
 			$sql .= " WHERE entity = 0";
-			if ($admin >= 0) $sql .= " AND admin = ".$admin;
 		} else {
 			$sql .= " WHERE entity IN (".getEntity('user', 0).")";
-			if ($limitTo == 'active') $sql .= " AND statut = 1";
-			if ($admin >= 0) $sql .= " AND admin = ".$admin;
+			if ($limitTo == 'active') {
+				$sql .= " AND statut = 1";
+			}
+		}
+		if ($admin >= 0) {
+			$sql .= " AND admin = ".(int) $admin;
 		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
-			$nb = $obj->nb;
+			$nb = (int) $obj->nb;
 
 			$this->db->free($resql);
 			return $nb;
@@ -2764,6 +2999,8 @@ class User extends CommonObject
 		// TODO: Voir pourquoi le update met à jour avec toutes les valeurs vide (global $user écrase ?)
 		global $user, $conf;
 
+		$socialnetworks = getArrayOfSocialNetworks();
+
 		$this->firstname = $ldapuser->{$conf->global->LDAP_FIELD_FIRSTNAME};
 		$this->lastname = $ldapuser->{$conf->global->LDAP_FIELD_NAME};
 		$this->login = $ldapuser->{$conf->global->LDAP_FIELD_LOGIN};
@@ -2774,14 +3011,14 @@ class User extends CommonObject
 		$this->user_mobile = $ldapuser->{$conf->global->LDAP_FIELD_MOBILE};
 		$this->office_fax = $ldapuser->{$conf->global->LDAP_FIELD_FAX};
 		$this->email = $ldapuser->{$conf->global->LDAP_FIELD_MAIL};
-		$this->skype = $ldapuser->{$conf->global->LDAP_FIELD_SKYPE};
-		$this->twitter = $ldapuser->{$conf->global->LDAP_FIELD_TWITTER};
-		$this->facebook = $ldapuser->{$conf->global->LDAP_FIELD_FACEBOOK};
-		$this->linkedin = $ldapuser->{$conf->global->LDAP_FIELD_LINKEDIN};
+		foreach ($socialnetworks as $key => $value) {
+			$tmpkey = 'LDAP_FIELD_'.strtoupper($value['label']);
+			$this->socialnetworks[$value['label']] = $ldapuser->{$conf->global->$tmpkey};
+		}
 		$this->ldap_sid = $ldapuser->{$conf->global->LDAP_FIELD_SID};
 
 		$this->job = $ldapuser->{$conf->global->LDAP_FIELD_TITLE};
-		$this->note = $ldapuser->{$conf->global->LDAP_FIELD_DESCRIPTION};
+		$this->note_public = $ldapuser->{$conf->global->LDAP_FIELD_DESCRIPTION};
 
 		$result = $this->update($user);
 
@@ -2806,11 +3043,9 @@ class User extends CommonObject
 
 		dol_syslog(get_class($this)."::get_children sql=".$sql, LOG_DEBUG);
 		$res = $this->db->query($sql);
-		if ($res)
-		{
+		if ($res) {
 			$users = array();
-			while ($rec = $this->db->fetch_array($res))
-			{
+			while ($rec = $this->db->fetch_array($res)) {
 				$user = new User($this->db);
 				$user->fetch($rec['rowid']);
 				$users[] = $user;
@@ -2842,10 +3077,8 @@ class User extends CommonObject
 
 		dol_syslog(get_class($this)."::loadParentOf", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$this->parentof[$obj->id_son] = $obj->id_parent;
 			}
 			return 1;
@@ -2894,15 +3127,15 @@ class User extends CommonObject
 		} else {
 			$sql .= " WHERE u.entity IN (".getEntity('user').")";
 		}
-		if ($filter) $sql .= " AND ".$filter;
+		if ($filter) {
+			$sql .= " AND ".$filter;
+		}
 
 		dol_syslog(get_class($this)."::get_full_tree get user list", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$i = 0;
-			while ($obj = $this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				$this->users[$obj->rowid]['rowid'] = $obj->rowid;
 				$this->users[$obj->rowid]['id'] = $obj->rowid;
 				$this->users[$obj->rowid]['fk_user'] = $obj->fk_user;
@@ -2925,29 +3158,24 @@ class User extends CommonObject
 
 		// We add the fullpath property to each elements of first level (no parent exists)
 		dol_syslog(get_class($this)."::get_full_tree call to build_path_from_id_user", LOG_DEBUG);
-		foreach ($this->users as $key => $val)
-		{
+		foreach ($this->users as $key => $val) {
 			$result = $this->build_path_from_id_user($key, 0); // Process a branch from the root user key (this user has no parent)
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$this->error = 'ErrorLoopInHierarchy';
 				return -1;
 			}
 		}
 
 		// Exclude leaf including $deleteafterid from tree
-		if ($deleteafterid)
-		{
+		if ($deleteafterid) {
 			//print "Look to discard user ".$deleteafterid."\n";
 			$keyfilter1 = '^'.$deleteafterid.'$';
 			$keyfilter2 = '_'.$deleteafterid.'$';
 			$keyfilter3 = '^'.$deleteafterid.'_';
 			$keyfilter4 = '_'.$deleteafterid.'_';
-			foreach ($this->users as $key => $val)
-			{
+			foreach ($this->users as $key => $val) {
 				if (preg_match('/'.$keyfilter1.'/', $val['fullpath']) || preg_match('/'.$keyfilter2.'/', $val['fullpath'])
-					|| preg_match('/'.$keyfilter3.'/', $val['fullpath']) || preg_match('/'.$keyfilter4.'/', $val['fullpath']))
-				{
+					|| preg_match('/'.$keyfilter3.'/', $val['fullpath']) || preg_match('/'.$keyfilter4.'/', $val['fullpath'])) {
 					unset($this->users[$key]);
 				}
 			}
@@ -2973,8 +3201,7 @@ class User extends CommonObject
 	{
 		$childids = array();
 
-		if (isset($this->cache_childids[$this->id]))
-		{
+		if (isset($this->cache_childids[$this->id])) {
 			$childids = $this->cache_childids[$this->id];
 		} else {
 			// Init this->users
@@ -2983,15 +3210,18 @@ class User extends CommonObject
 			$idtoscan = $this->id;
 
 			dol_syslog("Build childid for id = ".$idtoscan);
-			foreach ($this->users as $id => $val)
-			{
+			foreach ($this->users as $id => $val) {
 				//var_dump($val['fullpath']);
-				if (preg_match('/_'.$idtoscan.'_/', $val['fullpath'])) $childids[$val['id']] = $val['id'];
+				if (preg_match('/_'.$idtoscan.'_/', $val['fullpath'])) {
+					$childids[$val['id']] = $val['id'];
+				}
 			}
 		}
 		$this->cache_childids[$this->id] = $childids;
 
-		if ($addcurrentuser) $childids[$this->id] = $this->id;
+		if ($addcurrentuser) {
+			$childids[$this->id] = $this->id;
+		}
 
 		return $childids;
 	}
@@ -3010,8 +3240,7 @@ class User extends CommonObject
 		// phpcs:enable
 		//dol_syslog(get_class($this)."::build_path_from_id_user id_user=".$id_user." protection=".$protection, LOG_DEBUG);
 
-		if (!empty($this->users[$id_user]['fullpath']))
-		{
+		if (!empty($this->users[$id_user]['fullpath'])) {
 			// Already defined
 			dol_syslog(get_class($this)."::build_path_from_id_user fullpath and fullname already defined", LOG_WARNING);
 			return 0;
@@ -3023,10 +3252,8 @@ class User extends CommonObject
 		$i = 0; $cursor_user = $id_user;
 
 		$useridfound = array($id_user);
-		while (!empty($this->parentof[$cursor_user]))
-		{
-			if (in_array($this->parentof[$cursor_user], $useridfound))
-			{
+		while (!empty($this->parentof[$cursor_user])) {
+			if (in_array($this->parentof[$cursor_user], $useridfound)) {
 				dol_syslog("The hierarchy of user has a recursive loop", LOG_WARNING);
 				return -1; // Should not happen. Protection against looping hierarchy
 			}
@@ -3079,10 +3306,8 @@ class User extends CommonObject
 		$sql .= " AND u.entity IN (".getEntity('user').")";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$this->nb["users"] = $obj->nb;
 			}
 			$this->db->free($resql);
@@ -3112,10 +3337,8 @@ class User extends CommonObject
 		$langs->load("user");
 
 		// Positionne le modele sur le nom du modele a utiliser
-		if (!dol_strlen($modele))
-		{
-			if (!empty($conf->global->USER_ADDON_PDF))
-			{
+		if (!dol_strlen($modele)) {
+			if (!empty($conf->global->USER_ADDON_PDF)) {
 				$modele = $conf->global->USER_ADDON_PDF;
 			} else {
 				$modele = 'bluesky';
@@ -3140,23 +3363,26 @@ class User extends CommonObject
 		// phpcs:enable
 		$user_property = '';
 
-		if (empty($rowid)) return '';
+		if (empty($rowid)) {
+			return '';
+		}
 
 		$sql = "SELECT rowid, email, user_mobile, civility, lastname, firstname";
 		$sql .= " FROM ".MAIN_DB_PREFIX."user";
 		$sql .= " WHERE rowid = ".((int) $rowid);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$nump = $this->db->num_rows($resql);
 
-			if ($nump)
-			{
+			if ($nump) {
 				$obj = $this->db->fetch_object($resql);
 
-				if ($mode == 'email') $user_property = dolGetFirstLastname($obj->firstname, $obj->lastname)." <".$obj->email.">";
-				elseif ($mode == 'mobile') $user_property = $obj->user_mobile;
+				if ($mode == 'email') {
+					$user_property = dolGetFirstLastname($obj->firstname, $obj->lastname)." <".$obj->email.">";
+				} elseif ($mode == 'mobile') {
+					$user_property = $obj->user_mobile;
+				}
 			}
 			return $user_property;
 		} else {
@@ -3183,10 +3409,8 @@ class User extends CommonObject
 		$sql = "SELECT t.rowid";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t ';
 
-		if ($entityfilter)
-		{
-			if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
-			{
+		if ($entityfilter) {
+			if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
 					$sql .= " WHERE t.entity IS NOT NULL"; // Show all users
 				} else {
@@ -3221,19 +3445,18 @@ class User extends CommonObject
 			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
 		}
 		$sql .= $this->db->order($sortfield, $sortorder);
-		if ($limit) $sql .= $this->db->plimit($limit + 1, $offset);
+		if ($limit) {
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->users = array();
 			$num = $this->db->num_rows($resql);
-			if ($num)
-			{
-				while ($obj = $this->db->fetch_object($resql))
-				{
+			if ($num) {
+				while ($obj = $this->db->fetch_object($resql)) {
 					$line = new self($this->db);
 					$result = $line->fetch($obj->rowid);
 					if ($result > 0 && !empty($line->id)) {
@@ -3270,8 +3493,7 @@ class User extends CommonObject
 	 */
 	public function findUserIdByEmail($email)
 	{
-		if ($this->findUserIdByEmailCache[$email])
-		{
+		if ($this->findUserIdByEmailCache[$email]) {
 			return $this->findUserIdByEmailCache[$email];
 		}
 
@@ -3282,25 +3504,21 @@ class User extends CommonObject
 		$sql = 'SELECT rowid';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'user';
 
-		if (!empty($conf->global->AGENDA_DISABLE_EXACT_USER_EMAIL_COMPARE_FOR_EXTERNAL_CALENDAR))
-		{
+		if (!empty($conf->global->AGENDA_DISABLE_EXACT_USER_EMAIL_COMPARE_FOR_EXTERNAL_CALENDAR)) {
 			$sql .= ' WHERE email LIKE "%'.$email.'%"';
-		}
-		else {
+		} else {
 			$sql .= ' WHERE email = "'.$email.'"';
 		}
 
 		$sql .= ' LIMIT 1';
 
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			return -1;
 		}
 
 		$obj = $this->db->fetch_object($resql);
-		if (!$obj)
-		{
+		if (!$obj) {
 			return -1;
 		}
 
diff --git a/htdocs/user/class/userbankaccount.class.php b/htdocs/user/class/userbankaccount.class.php
index 25c751b4cb9..2fc43e929ec 100644
--- a/htdocs/user/class/userbankaccount.class.php
+++ b/htdocs/user/class/userbankaccount.class.php
@@ -45,183 +45,183 @@ class UserBankAccount extends Account
 	public $table_element = 'user_rib';
 
 
-    /**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	/**
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
-    /**
-     * Date modification record (tms)
-     *
-     * @var integer
-     */
-    public $datem;
+	/**
+	 * Date modification record (tms)
+	 *
+	 * @var integer
+	 */
+	public $datem;
 
-    /**
-     * User id of bank account
-     *
-     * @var integer
-     */
-    public $userid;
+	/**
+	 * User id of bank account
+	 *
+	 * @var integer
+	 */
+	public $userid;
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB		$db      Database handler
-     */
-    public function __construct(DoliDB $db)
-    {
-        $this->db = $db;
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB		$db      Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
 
-        $this->userid = 0;
-        $this->solde = 0;
-        $this->error_number = 0;
-    }
+		$this->userid = 0;
+		$this->solde = 0;
+		$this->error_number = 0;
+	}
 
 
-    /**
-     * Create bank information record
-     *
-     * @param	User	$user		User
-     * @param	int		$notrigger	1=Disable triggers
-     * @return	int					<0 if KO, >= 0 if OK
-     */
-    public function create(User $user = null, $notrigger = 0)
-    {
-        $now = dol_now();
+	/**
+	 * Create bank information record
+	 *
+	 * @param	User	$user		User
+	 * @param	int		$notrigger	1=Disable triggers
+	 * @return	int					<0 if KO, >= 0 if OK
+	 */
+	public function create(User $user = null, $notrigger = 0)
+	{
+		$now = dol_now();
 
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."user_rib (fk_user, datec)";
-        $sql .= " VALUES (".$this->userid.", '".$this->db->idate($now)."')";
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->affected_rows($resql))
-            {
-                $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."user_rib");
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_rib (fk_user, datec)";
+		$sql .= " VALUES (".$this->userid.", '".$this->db->idate($now)."')";
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->affected_rows($resql))
+			{
+				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."user_rib");
 
-                return $this->update($user);
-            }
-        } else {
-            print $this->db->error();
-            return 0;
-        }
-    }
+				return $this->update($user);
+			}
+		} else {
+			print $this->db->error();
+			return 0;
+		}
+	}
 
-    /**
-     *	Update bank account
-     *
-     *	@param	User	$user		Object user
-     *	@param	int		$notrigger	1=Disable triggers
-     *	@return	int					<=0 if KO, >0 if OK
-     */
-    public function update(User $user = null, $notrigger = 0)
-    {
-        global $conf;
+	/**
+	 *	Update bank account
+	 *
+	 *	@param	User	$user		Object user
+	 *	@param	int		$notrigger	1=Disable triggers
+	 *	@return	int					<=0 if KO, >0 if OK
+	 */
+	public function update(User $user = null, $notrigger = 0)
+	{
+		global $conf;
 
-        if (!$this->id)
-        {
-            $this->create();
-        }
+		if (!$this->id)
+		{
+			$this->create();
+		}
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."user_rib SET";
-        $sql .= " bank = '".$this->db->escape($this->bank)."'";
-        $sql .= ",code_banque='".$this->db->escape($this->code_banque)."'";
-        $sql .= ",code_guichet='".$this->db->escape($this->code_guichet)."'";
-        $sql .= ",number='".$this->db->escape($this->number)."'";
-        $sql .= ",cle_rib='".$this->db->escape($this->cle_rib)."'";
-        $sql .= ",bic='".$this->db->escape($this->bic)."'";
-        $sql .= ",iban_prefix = '".$this->db->escape($this->iban)."'";
-        $sql .= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
-        $sql .= ",proprio = '".$this->db->escape($this->proprio)."'";
-        $sql .= ",owner_address = '".$this->db->escape($this->owner_address)."'";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."user_rib SET";
+		$sql .= " bank = '".$this->db->escape($this->bank)."'";
+		$sql .= ",code_banque='".$this->db->escape($this->code_banque)."'";
+		$sql .= ",code_guichet='".$this->db->escape($this->code_guichet)."'";
+		$sql .= ",number='".$this->db->escape($this->number)."'";
+		$sql .= ",cle_rib='".$this->db->escape($this->cle_rib)."'";
+		$sql .= ",bic='".$this->db->escape($this->bic)."'";
+		$sql .= ",iban_prefix = '".$this->db->escape($this->iban)."'";
+		$sql .= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
+		$sql .= ",proprio = '".$this->db->escape($this->proprio)."'";
+		$sql .= ",owner_address = '".$this->db->escape($this->owner_address)."'";
 
-        if (trim($this->label) != '')
-            $sql .= ",label = '".$this->db->escape($this->label)."'";
-        else $sql .= ",label = NULL";
-        $sql .= " WHERE rowid = ".$this->id;
+		if (trim($this->label) != '')
+			$sql .= ",label = '".$this->db->escape($this->label)."'";
+		else $sql .= ",label = NULL";
+		$sql .= " WHERE rowid = ".$this->id;
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            return 1;
-        } else {
-            dol_print_error($this->db);
-            return 0;
-        }
-    }
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			return 0;
+		}
+	}
 
-    /**
-     * 	Load record from database
-     *
-     *	@param	int		$id			Id of record
-     *	@param	string	$ref		Ref of record
-     *  @param  int     $userid     User id
-     * 	@return	int					<0 if KO, >0 if OK
-     */
-    public function fetch($id, $ref = '', $userid = 0)
-    {
-        if (empty($id) && empty($ref) && empty($userid)) return -1;
+	/**
+	 * 	Load record from database
+	 *
+	 *	@param	int		$id			Id of record
+	 *	@param	string	$ref		Ref of record
+	 *  @param  int     $userid     User id
+	 * 	@return	int					<0 if KO, >0 if OK
+	 */
+	public function fetch($id, $ref = '', $userid = 0)
+	{
+		if (empty($id) && empty($ref) && empty($userid)) return -1;
 
-        $sql = "SELECT rowid, fk_user, entity, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
-        $sql .= " owner_address, label, datec, tms as datem";
-        $sql .= " FROM ".MAIN_DB_PREFIX."user_rib";
-        if ($id) $sql .= " WHERE rowid = ".$id;
-        if ($ref) $sql .= " WHERE label = '".$this->db->escape($ref)."'";
-        if ($userid) $sql .= " WHERE fk_user = ".((int) $userid);
+		$sql = "SELECT rowid, fk_user, entity, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
+		$sql .= " owner_address, label, datec, tms as datem";
+		$sql .= " FROM ".MAIN_DB_PREFIX."user_rib";
+		if ($id) $sql .= " WHERE rowid = ".$id;
+		if ($ref) $sql .= " WHERE label = '".$this->db->escape($ref)."'";
+		if ($userid) $sql .= " WHERE fk_user = ".((int) $userid);
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->rowid;
-                $this->userid = $obj->fk_soc;
-                $this->bank = $obj->bank;
-                $this->code_banque = $obj->code_banque;
-                $this->code_guichet = $obj->code_guichet;
-                $this->number = $obj->number;
-                $this->cle_rib = $obj->cle_rib;
-                $this->bic = $obj->bic;
-                $this->iban = $obj->iban;
-                $this->domiciliation = $obj->domiciliation;
-                $this->proprio = $obj->proprio;
-                $this->owner_address = $obj->owner_address;
-                $this->label = $obj->label;
-                $this->datec = $this->db->jdate($obj->datec);
-                $this->datem = $this->db->jdate($obj->datem);
-            }
-            $this->db->free($resql);
+				$this->id = $obj->rowid;
+				$this->userid = $obj->fk_soc;
+				$this->bank = $obj->bank;
+				$this->code_banque = $obj->code_banque;
+				$this->code_guichet = $obj->code_guichet;
+				$this->number = $obj->number;
+				$this->cle_rib = $obj->cle_rib;
+				$this->bic = $obj->bic;
+				$this->iban = $obj->iban;
+				$this->domiciliation = $obj->domiciliation;
+				$this->proprio = $obj->proprio;
+				$this->owner_address = $obj->owner_address;
+				$this->label = $obj->label;
+				$this->datec = $this->db->jdate($obj->datec);
+				$this->datem = $this->db->jdate($obj->datem);
+			}
+			$this->db->free($resql);
 
-            return 1;
-        } else {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
-    /**
-     * Return RIB
-     *
-     * @param   boolean     $displayriblabel     Prepend or Hide Label
-     * @return  string      RIB
-     */
-    public function getRibLabel($displayriblabel = true)
-    {
-        $rib = '';
+	/**
+	 * Return RIB
+	 *
+	 * @param   boolean     $displayriblabel     Prepend or Hide Label
+	 * @return  string      RIB
+	 */
+	public function getRibLabel($displayriblabel = true)
+	{
+		$rib = '';
 
-        if ($this->code_banque || $this->code_guichet || $this->number || $this->cle_rib) {
-            if ($this->label && $displayriblabel) {
-                $rib = $this->label." : ";
-            }
+		if ($this->code_banque || $this->code_guichet || $this->number || $this->cle_rib) {
+			if ($this->label && $displayriblabel) {
+				$rib = $this->label." : ";
+			}
 
-            $rib .= (string) $this;
-        }
+			$rib .= (string) $this;
+		}
 
-        return $rib;
-    }
+		return $rib;
+	}
 }
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 5b58bd06a41..5ba6b5553af 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -77,20 +77,23 @@ class UserGroup extends CommonObject
 	public $globalgroup; // Global group
 
 	/**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
 	/**
-     * Date modification record (tms)
-     *
-     * @var integer
-     */
-    public $datem;
+	 * Date modification record (tms)
+	 *
+	 * @var integer
+	 */
+	public $datem;
 
-	public $note; // Description
+	/**
+	 * @var string Description
+	 */
+	public $note;
 
 	public $members = array(); // Array of users
 
@@ -111,7 +114,7 @@ class UserGroup extends CommonObject
 	);
 
 	/**
-	 * @var int    Field with ID of parent key if this field has a parent
+	 * @var string    Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_usergroup';
 
@@ -127,15 +130,15 @@ class UserGroup extends CommonObject
 
 
 	/**
-     *    Constructor de la classe
-     *
-     *    @param   DoliDb  $db     Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-        $this->nb_rights = 0;
-    }
+	 *    Constructor de la classe
+	 *
+	 *    @param   DoliDb  $db     Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+		$this->nb_rights = 0;
+	}
 
 
 	/**
@@ -158,7 +161,7 @@ class UserGroup extends CommonObject
 			$result = $this->fetchCommon($id);
 		}
 
-		$this->name = $this->nom;	// For compatibility with field name
+		$this->name = $this->nom; // For compatibility with field name
 
 		if ($result)
 		{
@@ -307,33 +310,33 @@ class UserGroup extends CommonObject
 
 		if (!empty($rid))
 		{
+			$module = $perms = $subperms = '';
+
 			// Si on a demande ajout d'un droit en particulier, on recupere
 			// les caracteristiques (module, perms et subperms) de ce droit.
 			$sql = "SELECT module, perms, subperms";
 			$sql .= " FROM ".MAIN_DB_PREFIX."rights_def";
-			$sql .= " WHERE id = '".$this->db->escape($rid)."'";
-			$sql .= " AND entity = ".$entity;
+			$sql .= " WHERE id = ".((int) $rid);
+			$sql .= " AND entity = ".((int) $entity);
 
 			$result = $this->db->query($sql);
 			if ($result) {
 				$obj = $this->db->fetch_object($result);
-				$module = $obj->module;
-				$perms = $obj->perms;
-				$subperms = $obj->subperms;
+				if ($obj) {
+					$module = $obj->module;
+					$perms = $obj->perms;
+					$subperms = $obj->subperms;
+				}
 			} else {
 				$error++;
 				dol_print_error($this->db);
 			}
 
 			// Where pour la liste des droits a ajouter
-			$whereforadd = "id=".$this->db->escape($rid);
-			// Ajout des droits induits
-			if ($subperms)   $whereforadd .= " OR (module='$module' AND perms='$perms' AND (subperms='lire' OR subperms='read'))";
-			elseif ($perms) $whereforadd .= " OR (module='$module' AND (perms='lire' OR perms='read') AND subperms IS NULL)";
-
-			// Pour compatibilite, si lowid = 0, on est en mode ajout de tout
-			// TODO A virer quand sera gere par l'appelant
-			//if (substr($rid,-1,1) == 0) $whereforadd="module='$module'";
+			$whereforadd = "id=".((int) $rid);
+			// Find also rights that are herited to add them too
+			if ($subperms)   $whereforadd .= " OR (module='".$this->db->escape($module)."' AND perms='".$this->db->escape($perms)."' AND (subperms='lire' OR subperms='read'))";
+			elseif ($perms) $whereforadd .= " OR (module='".$this->db->escape($module)."' AND (perms='lire' OR perms='read') AND subperms IS NULL)";
 		} else {
 			// Where pour la liste des droits a ajouter
 			if (!empty($allmodule))
@@ -348,7 +351,7 @@ class UserGroup extends CommonObject
 			}
 		}
 
-		// Ajout des droits de la liste whereforadd
+		// Add permission of the list $whereforadd
 		if (!empty($whereforadd))
 		{
 			//print "$module-$perms-$subperms";
@@ -386,10 +389,10 @@ class UserGroup extends CommonObject
 				$langs->load("other");
 				$this->context = array('audit'=>$langs->trans("PermissionsAdd").($rid ? ' (id='.$rid.')' : ''));
 
-			    // Call trigger
-			    $result = $this->call_trigger('USERGROUP_MODIFY', $user);
-			    if ($result < 0) { $error++; }
-			    // End call triggers
+				// Call trigger
+				$result = $this->call_trigger('USERGROUP_MODIFY', $user);
+				if ($result < 0) { $error++; }
+				// End call triggers
 			}
 		}
 
@@ -425,6 +428,8 @@ class UserGroup extends CommonObject
 
 		if (!empty($rid))
 		{
+			$module = $perms = $subperms = '';
+
 			// Si on a demande supression d'un droit en particulier, on recupere
 			// les caracteristiques module, perms et subperms de ce droit.
 			$sql = "SELECT module, perms, subperms";
@@ -435,9 +440,11 @@ class UserGroup extends CommonObject
 			$result = $this->db->query($sql);
 			if ($result) {
 				$obj = $this->db->fetch_object($result);
-				$module = $obj->module;
-				$perms = $obj->perms;
-				$subperms = $obj->subperms;
+				if ($obj) {
+					$module = $obj->module;
+					$perms = $obj->perms;
+					$subperms = $obj->subperms;
+				}
 			} else {
 				$error++;
 				dol_print_error($this->db);
@@ -446,14 +453,14 @@ class UserGroup extends CommonObject
 			// Where pour la liste des droits a supprimer
 			$wherefordel = "id=".$this->db->escape($rid);
 			// Suppression des droits induits
-			if ($subperms == 'lire' || $subperms == 'read') $wherefordel .= " OR (module='$module' AND perms='$perms' AND subperms IS NOT NULL)";
-			if ($perms == 'lire' || $perms == 'read')    $wherefordel .= " OR (module='$module')";
+			if ($subperms == 'lire' || $subperms == 'read') $wherefordel .= " OR (module='".$this->db->escape($module)."' AND perms='".$this->db->escape($perms)."' AND subperms IS NOT NULL)";
+			if ($perms == 'lire' || $perms == 'read') $wherefordel .= " OR (module='".$this->db->escape($module)."')";
 
 			// Pour compatibilite, si lowid = 0, on est en mode suppression de tout
 			// TODO A virer quand sera gere par l'appelant
 			//if (substr($rid,-1,1) == 0) $wherefordel="module='$module'";
 		} else {
-			// Where pour la liste des droits a supprimer
+			// Add permission of the list $wherefordel
 			if (!empty($allmodule))
 			{
 				if ($allmodule == 'allmodules')
@@ -461,7 +468,7 @@ class UserGroup extends CommonObject
 					$wherefordel = 'allmodules';
 				} else {
 					$wherefordel = "module='".$this->db->escape($allmodule)."'";
-					if (!empty($allperms))  $whereforadd .= " AND perms='".$this->db->escape($allperms)."'";
+					if (!empty($allperms)) $wherefordel .= " AND perms='".$this->db->escape($allperms)."'";
 				}
 			}
 		}
@@ -484,8 +491,12 @@ class UserGroup extends CommonObject
 				$i = 0;
 				while ($i < $num)
 				{
+					$nid = 0;
+
 					$obj = $this->db->fetch_object($result);
-					$nid = $obj->id;
+					if ($obj) {
+						$nid = $obj->id;
+					}
 
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_rights";
 					$sql .= " WHERE fk_usergroup = $this->id AND fk_id=".$nid;
@@ -504,10 +515,10 @@ class UserGroup extends CommonObject
 				$langs->load("other");
 				$this->context = array('audit'=>$langs->trans("PermissionsDelete").($rid ? ' (id='.$rid.')' : ''));
 
-			    // Call trigger
-			    $result = $this->call_trigger('USERGROUP_MODIFY', $user);
-			    if ($result < 0) { $error++; }
-			    // End call triggers
+				// Call trigger
+				$result = $this->call_trigger('USERGROUP_MODIFY', $user);
+				if ($result < 0) { $error++; }
+				// End call triggers
 			}
 		}
 
@@ -565,22 +576,24 @@ class UserGroup extends CommonObject
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				$module = $obj->module;
-				$perms = $obj->perms;
-				$subperms = $obj->subperms;
+				if ($obj) {
+					$module = $obj->module;
+					$perms = $obj->perms;
+					$subperms = $obj->subperms;
 
-				if ($perms)
-				{
-					if (!isset($this->rights)) $this->rights = new stdClass(); // For avoid error
-					if (!isset($this->rights->$module) || !is_object($this->rights->$module)) $this->rights->$module = new stdClass();
-					if ($subperms)
+					if ($perms)
 					{
-						if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) $this->rights->$module->$perms = new stdClass();
-						if (empty($this->rights->$module->$perms->$subperms)) $this->nb_rights++;
-						$this->rights->$module->$perms->$subperms = 1;
-					} else {
-						if (empty($this->rights->$module->$perms)) $this->nb_rights++;
-						$this->rights->$module->$perms = 1;
+						if (!isset($this->rights)) $this->rights = new stdClass(); // For avoid error
+						if (!isset($this->rights->$module) || !is_object($this->rights->$module)) $this->rights->$module = new stdClass();
+						if ($subperms)
+						{
+							if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) $this->rights->$module->$perms = new stdClass();
+							if (empty($this->rights->$module->$perms->$subperms)) $this->nb_rights++;
+							$this->rights->$module->$perms->$subperms = 1;
+						} else {
+							if (empty($this->rights->$module->$perms)) $this->nb_rights++;
+							$this->rights->$module->$perms = 1;
+						}
 					}
 				}
 
@@ -596,10 +609,10 @@ class UserGroup extends CommonObject
 			$this->all_permissions_are_loaded = 1;
 		} else {
 			// If module defined, we flag it as loaded into cache
-		    $this->_tab_loaded[$moduletag] = 1;
+			$this->_tab_loaded[$moduletag] = 1;
 		}
 
-        return 1;
+		return 1;
 	}
 
 	/**
@@ -659,10 +672,10 @@ class UserGroup extends CommonObject
 	 */
 	public function getLibStatut($mode = 0)
 	{
-	    return $this->LibStatut(0, $mode);
+		return $this->LibStatut(0, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un statut donne
 	 *
@@ -672,10 +685,10 @@ class UserGroup extends CommonObject
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
-	    global $langs;
-	    $langs->load('users');
-	    return '';
+		// phpcs:enable
+		global $langs;
+		$langs->load('users');
+		return '';
 	}
 
 	/**
@@ -765,9 +778,9 @@ class UserGroup extends CommonObject
 	 *									2=Return key only (uid=qqq)
 	 *	@return		string				DN
 	 */
-    public function _load_ldap_dn($info, $mode = 0)
+	public function _load_ldap_dn($info, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		$dn = '';
 		if ($mode == 0) $dn = $conf->global->LDAP_KEY_GROUPS."=".$info[$conf->global->LDAP_KEY_GROUPS].",".$conf->global->LDAP_GROUP_DN;
@@ -784,9 +797,9 @@ class UserGroup extends CommonObject
 	 *
 	 *	@return		array		Tableau info des attributs
 	 */
-    public function _load_ldap_info()
+	public function _load_ldap_info()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$info = array();
@@ -809,22 +822,22 @@ class UserGroup extends CommonObject
 				$valueofldapfield[] = $muser->_load_ldap_dn($info2);
 			}
 			$info[$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS] = (!empty($valueofldapfield) ? $valueofldapfield : '');
-        }
-        if (!empty($info[$conf->global->LDAP_GROUP_FIELD_GROUPID])) {
-            $info[$conf->global->LDAP_GROUP_FIELD_GROUPID] = $this->id;
-        }
+		}
+		if (!empty($info[$conf->global->LDAP_GROUP_FIELD_GROUPID])) {
+			$info[$conf->global->LDAP_GROUP_FIELD_GROUPID] = $this->id;
+		}
 		return $info;
 	}
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
-     */
-    public function initAsSpecimen()
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
+	 */
+	public function initAsSpecimen()
 	{
 		global $conf, $user, $langs;
 
@@ -838,11 +851,11 @@ class UserGroup extends CommonObject
 		$this->datec = time();
 		$this->datem = time();
 
-        // Members of this group is just me
-        $this->members = array(
-            $user->id => $user
-        );
-    }
+		// Members of this group is just me
+		$this->members = array(
+			$user->id => $user
+		);
+	}
 
 	/**
 	 *  Create a document onto disk according to template module.
@@ -852,7 +865,7 @@ class UserGroup extends CommonObject
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
-     *  @param      null|array  $moreparams     Array to provide more information
+	 *  @param      null|array  $moreparams     Array to provide more information
 	 * 	@return     int         				0 if KO, 1 if OK
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index cebb7824303..fff39a3d45f 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -28,8 +28,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 // Load translation files required by page
 $langs->loadLangs(array('users', 'admin'));
 
-$action = GETPOST('action', 'aZ09');
-$id = GETPOST('id', 'int');
+$action = (string) GETPOST('action', 'aZ09');
+$id = (int) GETPOST('id', 'int');
 
 // Security check
 $socid = 0;
@@ -50,21 +50,20 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook)) {
-    if ($action == 'update' && !GETPOST('cancel', 'alpha')) {
-        $edituser = new User($db);
-        $edituser->fetch($id);
+	if ($action == 'update' && !GETPOST('cancel', 'alpha')) {
+		$edituser = new User($db);
+		$edituser->fetch($id);
 
-        $edituser->clicktodial_url = GETPOST("url");
-        $edituser->clicktodial_login = GETPOST("login");
-        $edituser->clicktodial_password = GETPOST("password");
-        $edituser->clicktodial_poste = GETPOST("poste");
+		$edituser->clicktodial_url = (string) GETPOST("url", "alpha");
+		$edituser->clicktodial_login = (string) GETPOST("login", "alpha");
+		$edituser->clicktodial_password = (string) GETPOST("password", "alpha");
+		$edituser->clicktodial_poste = (string) GETPOST("poste", "alpha");
 
-        $result = $edituser->update_clicktodial();
-        if ($result < 0)
-        {
-            setEventMessages($edituser->error, $edituser->errors, 'errors');
-        }
-    }
+		$result = $edituser->update_clicktodial();
+		if ($result < 0) {
+			setEventMessages($edituser->error, $edituser->errors, 'errors');
+		}
+	}
 }
 
 
@@ -79,10 +78,10 @@ llxHeader("", "ClickToDial");
 
 if ($id > 0)
 {
-    $object = new User($db);
-    $object->fetch($id, '', '', 1);
-    $object->getrights();
-    $object->fetch_clicktodial();
+	$object = new User($db);
+	$object->fetch($id, '', '', 1);
+	$object->getrights();
+	$object->fetch_clicktodial();
 
 
 	$head = user_prepare_head($object);
@@ -94,7 +93,7 @@ if ($id > 0)
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
 
-	dol_fiche_head($head, 'clicktodial', $title, -1, 'user');
+	print dol_get_fiche_head($head, 'clicktodial', $title, -1, 'user');
 
 	$linkback = '';
 
@@ -102,109 +101,109 @@ if ($id > 0)
 		$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	}
 
-    dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
-    // Edit mode
-    if ($action == 'edit')
-    {
-        print '<table class="border centpercent">';
+	// Edit mode
+	if ($action == 'edit')
+	{
+		print '<table class="border centpercent">';
 
-        if ($user->admin)
-        {
-            print '<tr><td class="titlefield fieldrequired">ClickToDial URL</td>';
-            print '<td class="valeur">';
-            print '<input name="url" value="'.(!empty($object->clicktodial_url) ? $object->clicktodial_url : '').'" size="92">';
-            if (empty($conf->global->CLICKTODIAL_URL) && empty($object->clicktodial_url))
-            {
-                $langs->load("errors");
-                print '<font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("ClickToDial")).'</font>';
-            } else {
-                print ' &nbsp; &nbsp; '.$form->textwithpicto($langs->trans("KeepEmptyToUseDefault").': '.$conf->global->CLICKTODIAL_URL, $langs->trans("ClickToDialUrlDesc"));
-            }
-            print '</td>';
-            print '</tr>';
-        }
+		if ($user->admin)
+		{
+			print '<tr><td class="titlefield fieldrequired">ClickToDial URL</td>';
+			print '<td class="valeur">';
+			print '<input name="url" value="'.(!empty($object->clicktodial_url) ? $object->clicktodial_url : '').'" size="92">';
+			if (empty($conf->global->CLICKTODIAL_URL) && empty($object->clicktodial_url))
+			{
+				$langs->load("errors");
+				print '<font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("ClickToDial")).'</font>';
+			} else {
+				print ' &nbsp; &nbsp; '.$form->textwithpicto($langs->trans("KeepEmptyToUseDefault").': '.$conf->global->CLICKTODIAL_URL, $langs->trans("ClickToDialUrlDesc"));
+			}
+			print '</td>';
+			print '</tr>';
+		}
 
-        print '<tr><td class="titlefield fieldrequired">ClickToDial '.$langs->trans("IdPhoneCaller").'</td>';
-        print '<td class="valeur">';
-        print '<input name="poste" value="'.(!empty($object->clicktodial_poste) ? $object->clicktodial_poste : '').'"></td>';
-        print "</tr>\n";
+		print '<tr><td class="titlefield fieldrequired">ClickToDial '.$langs->trans("IdPhoneCaller").'</td>';
+		print '<td class="valeur">';
+		print '<input name="poste" value="'.(!empty($object->clicktodial_poste) ? $object->clicktodial_poste : '').'"></td>';
+		print "</tr>\n";
 
-        print '<tr><td>ClickToDial '.$langs->trans("Login").'</td>';
-        print '<td class="valeur">';
-        print '<input name="login" value="'.(!empty($object->clicktodial_login) ? $object->clicktodial_login : '').'"></td>';
-        print '</tr>';
+		print '<tr><td>ClickToDial '.$langs->trans("Login").'</td>';
+		print '<td class="valeur">';
+		print '<input name="login" value="'.(!empty($object->clicktodial_login) ? $object->clicktodial_login : '').'"></td>';
+		print '</tr>';
 
-        print '<tr><td>ClickToDial '.$langs->trans("Password").'</td>';
-        print '<td class="valeur">';
-        print '<input type="password" name="password" value="'.(!empty($object->clicktodial_password) ? $object->clicktodial_password : '').'"></td>';
-        print "</tr>\n";
+		print '<tr><td>ClickToDial '.$langs->trans("Password").'</td>';
+		print '<td class="valeur">';
+		print '<input type="password" name="password" value="'.(!empty($object->clicktodial_password) ? $object->clicktodial_password : '').'"></td>';
+		print "</tr>\n";
 
-        print '</table>';
-    } else // View mode
-    {
-        print '<table class="border centpercent tableforfield">';
+		print '</table>';
+	} else // View mode
+	{
+		print '<table class="border centpercent tableforfield">';
 
-        if (!empty($user->admin))
-        {
-        	print '<tr><td class="titlefield">ClickToDial URL</td>';
-        	print '<td class="valeur">';
-        	$url = $conf->global->CLICKTODIAL_URL;
-        	if (!empty($object->clicktodial_url)) $url = $object->clicktodial_url;
-        	if (empty($url))
-        	{
-        	    $langs->load("errors");
-        	    print '<font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("ClickToDial")).'</font>';
-        	} else {
-        		print $form->textwithpicto((empty($object->clicktodial_url) ? '<span class="opacitymedium">'.$langs->trans("DefaultLink").':</span> ' : '').$url, $langs->trans("ClickToDialUrlDesc"));
-        	}
-        	print '</td>';
-        	print '</tr>';
-        }
+		if (!empty($user->admin))
+		{
+			print '<tr><td class="titlefield">ClickToDial URL</td>';
+			print '<td class="valeur">';
+			$url = $conf->global->CLICKTODIAL_URL;
+			if (!empty($object->clicktodial_url)) $url = $object->clicktodial_url;
+			if (empty($url))
+			{
+				$langs->load("errors");
+				print '<font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("ClickToDial")).'</font>';
+			} else {
+				print $form->textwithpicto((empty($object->clicktodial_url) ? '<span class="opacitymedium">'.$langs->trans("DefaultLink").':</span> ' : '').$url, $langs->trans("ClickToDialUrlDesc"));
+			}
+			print '</td>';
+			print '</tr>';
+		}
 
-        print '<tr><td class="titlefield">ClickToDial '.$langs->trans("IdPhoneCaller").'</td>';
-        print '<td class="valeur">'.(!empty($object->clicktodial_poste) ? $object->clicktodial_poste : '').'</td>';
-        print "</tr>";
+		print '<tr><td class="titlefield">ClickToDial '.$langs->trans("IdPhoneCaller").'</td>';
+		print '<td class="valeur">'.(!empty($object->clicktodial_poste) ? $object->clicktodial_poste : '').'</td>';
+		print "</tr>";
 
-        print '<tr><td>ClickToDial '.$langs->trans("Login").'</td>';
-        print '<td class="valeur">'.(!empty($object->clicktodial_login) ? $object->clicktodial_login : '').'</td>';
-        print '</tr>';
+		print '<tr><td>ClickToDial '.$langs->trans("Login").'</td>';
+		print '<td class="valeur">'.(!empty($object->clicktodial_login) ? $object->clicktodial_login : '').'</td>';
+		print '</tr>';
 
-        print '<tr><td>ClickToDial '.$langs->trans("Password").'</td>';
-        print '<td class="valeur">'.preg_replace('/./', '*', (!empty($object->clicktodial_password) ? $object->clicktodial_password : '')).'</a></td>';
-        print "</tr>\n";
+		print '<tr><td>ClickToDial '.$langs->trans("Password").'</td>';
+		print '<td class="valeur">'.preg_replace('/./', '*', (!empty($object->clicktodial_password) ? $object->clicktodial_password : '')).'</a></td>';
+		print "</tr>\n";
 
-        print "</table>\n";
-    }
+		print "</table>\n";
+	}
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    if ($action == 'edit')
-    {
-    	print '<br>';
-        print '<div class="center"><input class="button" type="submit" value="'.$langs->trans("Save").'">';
-        print '&nbsp;&nbsp;&nbsp;&nbsp&nbsp;';
-        print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
-        print '</div>';
-    }
+	if ($action == 'edit')
+	{
+		print '<br>';
+		print '<div class="center"><input class="button button-save" type="submit" value="'.$langs->trans("Save").'">';
+		print '&nbsp;&nbsp;&nbsp;&nbsp&nbsp;';
+		print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
+		print '</div>';
+	}
 
-    print '</div>';
-    print '</form>';
+	print '</div>';
+	print '</form>';
 
-    /*
+	/*
      * Barre d'actions
      */
-    print '<div class="tabsAction">';
+	print '<div class="tabsAction">';
 
-    if (!empty($user->admin) && $action <> 'edit')
-    {
-        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
-    }
+	if (!empty($user->admin) && $action <> 'edit')
+	{
+		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
+	}
 
-    print "</div>\n";
+	print "</div>\n";
 }
 
 // End of page
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 83b525d03de..950742305fb 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -49,17 +49,17 @@ $canreadgroup = $canreaduser;
 $caneditgroup = $canedituser;
 if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
-    $canreadgroup = (!empty($user->admin) || $user->rights->user->group_advance->read);
-    $caneditgroup = (!empty($user->admin) || $user->rights->user->group_advance->write);
+	$canreadgroup = (!empty($user->admin) || $user->rights->user->group_advance->read);
+	$caneditgroup = (!empty($user->admin) || $user->rights->user->group_advance->write);
 }
 // Define value to know what current user can do on properties of edited user
 if ($id)
 {
-    // $user est le user qui edite, $id est l'id de l'utilisateur edite
-    $caneditfield = ((($user->id == $id) && $user->rights->user->self->creer)
-    || (($user->id != $id) && $user->rights->user->user->creer));
-    $caneditpassword = ((($user->id == $id) && $user->rights->user->self->password)
-    || (($user->id != $id) && $user->rights->user->user->password));
+	// $user est le user qui edite, $id est l'id de l'utilisateur edite
+	$caneditfield = ((($user->id == $id) && $user->rights->user->self->creer)
+	|| (($user->id != $id) && $user->rights->user->user->creer));
+	$caneditpassword = ((($user->id == $id) && $user->rights->user->self->password)
+	|| (($user->id != $id) && $user->rights->user->user->password));
 }
 
 // Security check
@@ -128,17 +128,17 @@ if ($object->id)
 
 	$form = new Form($db);
 
-	dol_fiche_head($head, 'document', $langs->trans("User"), -1, 'user');
+	print dol_get_fiche_head($head, 'document', $langs->trans("User"), -1, 'user');
 
 	$linkback = '';
 	if ($user->rights->user->user->lire || $user->admin) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	}
 
-    dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
@@ -151,8 +151,8 @@ if ($object->id)
 
 	print '<table class="border tableforfield centpercent">';
 
-    // Login
-    print '<tr><td class="titlefield">'.$langs->trans("Login").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
+	// Login
+	print '<tr><td class="titlefield">'.$langs->trans("Login").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
 
 	// Nbre files
 	print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td>'.count($filearray).'</td></tr>';
@@ -161,9 +161,9 @@ if ($object->id)
 	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>'.dol_print_size($totalsize, 1, 1).'</td></tr>';
 
 	print '</table>';
-    print '</div>';
+	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	$modulepart = 'user';
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index e8ffbd7c1f7..68d9639990c 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -40,10 +40,10 @@ $feature2 = 'user';
 // Advanced permissions
 if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
-    $canreadperms = ($user->admin || $user->rights->user->group_advance->read);
-    $caneditperms = ($user->admin || $user->rights->user->group_advance->write);
-    $candisableperms = ($user->admin || $user->rights->user->group_advance->delete);
-    $feature2 = 'group_advance';
+	$canreadperms = ($user->admin || $user->rights->user->group_advance->read);
+	$caneditperms = ($user->admin || $user->rights->user->group_advance->write);
+	$candisableperms = ($user->admin || $user->rights->user->group_advance->delete);
+	$feature2 = 'group_advance';
 }
 
 // Load translation files required by page
@@ -64,7 +64,7 @@ $result = restrictedArea($user, 'user', $id, 'usergroup&usergroup', $feature2);
 // Users/Groups management only in master entity if transverse mode
 if (!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
 {
-    accessforbidden();
+	accessforbidden();
 }
 
 $object = new Usergroup($db);
@@ -125,7 +125,7 @@ if (empty($reshook)) {
 	{
 		if ($caneditperms)
 		{
-			if (! GETPOST("nom", "nohtml")) {
+			if (!GETPOST("nom", "nohtml")) {
 				setEventMessages($langs->trans("NameNotDefined"), null, 'errors');
 				$action = "create"; // Go back to create page
 			} else {
@@ -249,18 +249,18 @@ $formfile = new FormFile($db);
 
 if ($action == 'create')
 {
-    print load_fiche_titre($langs->trans("NewGroup"), '', 'object_group');
+	print load_fiche_titre($langs->trans("NewGroup"), '', 'object_group');
 
-    print dol_set_focus('#nom');
+	print dol_set_focus('#nom');
 
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="add">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="add">';
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
-    dol_fiche_head('', '', '', 0, '');
+	print dol_get_fiche_head('', '', '', 0, '');
 
-    print '<table class="border centpercent tableforfieldcreate">';
+	print '<table class="border centpercent tableforfieldcreate">';
 
 	// Multicompany
 	if (!empty($conf->multicompany->enabled) && is_object($mc))
@@ -283,15 +283,15 @@ if ($action == 'create')
 
 	print "</table>\n";
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '<div class="center">';
-    print '<input class="button" name="add" value="'.$langs->trans("CreateGroup").'" type="submit">';
-    print ' &nbsp; ';
-    print '<input class="button" value="'.$langs->trans("Cancel").'" name="cancel" type="submit">';
-    print '</div>';
+	print '<div class="center">';
+	print '<input class="button" name="add" value="'.$langs->trans("CreateGroup").'" type="submit">';
+	print ' &nbsp; ';
+	print '<input class="button button-cancel" value="'.$langs->trans("Cancel").'" name="cancel" type="submit">';
+	print '</div>';
 
-    print "</form>";
+	print "</form>";
 }
 
 
@@ -301,12 +301,12 @@ if ($action == 'create')
 /*                                                                            */
 /* ************************************************************************** */
 else {
-    if ($id)
-    {
+	if ($id)
+	{
 		$res = $object->fetch_optionals();
 
-        $head = group_prepare_head($object);
-        $title = $langs->trans("Group");
+		$head = group_prepare_head($object);
+		$title = $langs->trans("Group");
 
 		/*
 		 * Confirmation suppression
@@ -322,7 +322,7 @@ else {
 
 		if ($action != 'edit')
 		{
-			dol_fiche_head($head, 'group', $title, -1, 'group');
+			print dol_get_fiche_head($head, 'group', $title, -1, 'group');
 
 			$linkback = '<a href="'.DOL_URL_ROOT.'/user/group/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -334,17 +334,17 @@ else {
 
 			print '<table class="border centpercent tableforfield">';
 
-            // Name (already in dol_banner, we keep it to have the GlobalGroup picto, but we should move it in dol_banner)
-            if (!empty($conf->mutlicompany->enabled))
-            {
-    			print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>';
-    			print '<td class="valeur">'.dol_escape_htmltag($object->name);
-    			if (empty($object->entity))
-    			{
-    				print img_picto($langs->trans("GlobalGroup"), 'redstar');
-    			}
-    			print "</td></tr>\n";
-            }
+			// Name (already in dol_banner, we keep it to have the GlobalGroup picto, but we should move it in dol_banner)
+			if (!empty($conf->mutlicompany->enabled))
+			{
+				print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>';
+				print '<td class="valeur">'.dol_escape_htmltag($object->name);
+				if (empty($object->entity))
+				{
+					print img_picto($langs->trans("GlobalGroup"), 'redstar');
+				}
+				print "</td></tr>\n";
+			}
 
 			// Multicompany
 			if (!empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity)
@@ -370,7 +370,7 @@ else {
 
 			print '<div class="clearboth"></div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 
 			/*
@@ -395,12 +395,12 @@ else {
 
 			print "</div>\n";
 
-            // List users in group
+			// List users in group
 
-            print load_fiche_titre($langs->trans("ListOfUsersInGroup"), '', 'user');
+			print load_fiche_titre($langs->trans("ListOfUsersInGroup"), '', 'user');
 
-            // On selectionne les users qui ne sont pas deja dans le groupe
-            $exclude = array();
+			// On selectionne les users qui ne sont pas deja dans le groupe
+			$exclude = array();
 
 			if (!empty($object->members))
 			{
@@ -455,10 +455,10 @@ else {
 						print '<td>';
 						print $useringroup->getNomUrl(-1, '', 0, 0, 24, 0, 'login');
 						if ($useringroup->admin && !$useringroup->entity) {
-                            print img_picto($langs->trans("SuperAdministrator"), 'redstar');
-                        } elseif ($useringroup->admin) {
-                            print img_picto($langs->trans("Administrator"), 'star');
-                        }
+							print img_picto($langs->trans("SuperAdministrator"), 'redstar');
+						} elseif ($useringroup->admin) {
+							print img_picto($langs->trans("Administrator"), 'star');
+						}
 						print '</td>';
 						print '<td>'.$useringroup->lastname.'</td>';
 						print '<td>'.$useringroup->firstname.'</td>';
@@ -487,41 +487,41 @@ else {
 	         * Documents generes
 	         */
 
-	        $filename = dol_sanitizeFileName($object->ref);
-	        $filedir = $conf->usergroup->dir_output."/".dol_sanitizeFileName($object->ref);
-	        $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
-	        $genallowed = $user->rights->user->user->creer;
-	        $delallowed = $user->rights->user->user->supprimer;
+			$filename = dol_sanitizeFileName($object->ref);
+			$filedir = $conf->usergroup->dir_output."/".dol_sanitizeFileName($object->ref);
+			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+			$genallowed = $user->rights->user->user->creer;
+			$delallowed = $user->rights->user->user->supprimer;
 
-	        $somethingshown = $formfile->showdocuments('usergroup', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
+			$somethingshown = $formfile->showdocuments('usergroup', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
 
-	        // Show links to link elements
-	        $linktoelem = $form->showLinkToObjectBlock($object, null, null);
-	        $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+			// Show links to link elements
+			$linktoelem = $form->showLinkToObjectBlock($object, null, null);
+			$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
-	        print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 			// List of actions on element
 			/*include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
 			$formactions = new FormActions($db);
 			$somethingshown = $formactions->showactions($object, 'usergroup', $socid, 1);*/
 
-	        print '</div></div></div>';
-        }
+			print '</div></div></div>';
+		}
 
-        /*
+		/*
          * Fiche en mode edition
          */
 
-        if ($action == 'edit' && $caneditperms)
-        {
-            print '<form action="'.$_SERVER['PHP_SELF'].'" method="post" name="updategroup" enctype="multipart/form-data">';
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            print '<input type="hidden" name="action" value="update">';
+		if ($action == 'edit' && $caneditperms)
+		{
+			print '<form action="'.$_SERVER['PHP_SELF'].'" method="post" name="updategroup" enctype="multipart/form-data">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="action" value="update">';
 			print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 			print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-            dol_fiche_head($head, 'group', $title, 0, 'group');
+			print dol_get_fiche_head($head, 'group', $title, 0, 'group');
 
 			print '<table class="border centpercent tableforfieldedit">'."\n";
 
@@ -546,15 +546,15 @@ else {
 
 			print '</table>';
 
-            dol_fiche_end();
+			print dol_get_fiche_end();
 
-			print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-			print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+			print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+			print ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 			print '</div>';
 
-            print '</form>';
-        }
-    }
+			print '</form>';
+		}
+	}
 }
 
 // End of page
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index d280fe37701..c17512b6169 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -99,7 +99,7 @@ llxHeader();
 
 $head = group_prepare_head($object);
 
-dol_fiche_head($head, 'ldap', $langs->trans("Group"), -1, 'group');
+print dol_get_fiche_head($head, 'ldap', $langs->trans("Group"), -1, 'group');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/user/group/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -113,13 +113,13 @@ print '<table class="border centpercent">';
 // Name (already in dol_banner, we keep it to have the GlobalGroup picto, but we should move it in dol_banner)
 if (!empty($conf->mutlicompany->enabled))
 {
-    print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>';
-    print '<td class="valeur">'.$object->name;
-    if (!$object->entity)
-    {
-    	print img_picto($langs->trans("GlobalGroup"), 'redstar');
-    }
-    print "</td></tr>\n";
+	print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>';
+	print '<td class="valeur">'.$object->name;
+	if (!$object->entity)
+	{
+		print img_picto($langs->trans("GlobalGroup"), 'redstar');
+	}
+	print "</td></tr>\n";
 }
 
 // Note
@@ -144,7 +144,7 @@ print "</table>\n";
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 /*
@@ -188,7 +188,7 @@ if ($result > 0)
 	//var_dump($records);
 
 	// Show tree
-    if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0))
+	if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0))
 	{
 		if (!is_array($records))
 		{
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index 0b6cdf23d47..3fce8718287 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -70,8 +70,8 @@ if (!$sortorder) $sortorder = "ASC";
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-    'g.nom'=>"Group",
-    'g.note'=>"Note"
+	'g.nom'=>"Group",
+	'g.note'=>"Note"
 );
 
 
@@ -88,17 +88,17 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-    {
-        $search_label = "";
-        $search_date_creation = "";
-        $search_date_update = "";
-        $search_array_options = array();
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
+	{
+		$search_label = "";
+		$search_date_creation = "";
+		$search_date_update = "";
+		$search_array_options = array();
+	}
 }
 
 
@@ -127,100 +127,100 @@ $sql .= $db->order($sortfield, $sortorder);
 $resql = $db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
+	$num = $db->num_rows($resql);
 
-    $nbtotalofrecords = $num;
+	$nbtotalofrecords = $num;
 
-    $i = 0;
+	$i = 0;
 
-    $param = "&amp;search_group=".urlencode($search_group)."&amp;sall=".urlencode($sall);
-    if ($optioncss != '') $param .= '&amp;optioncss='.$optioncss;
+	$param = "&amp;search_group=".urlencode($search_group)."&amp;sall=".urlencode($sall);
+	if ($optioncss != '') $param .= '&amp;optioncss='.$optioncss;
 
-    $text = $langs->trans("ListOfGroups");
+	$text = $langs->trans("ListOfGroups");
 
-    $newcardbutton = '';
-    if ($caneditperms)
-    {
-        $newcardbutton .= dolGetButtonTitle($langs->trans('NewGroup'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/user/group/card.php?action=create&leftmenu=');
-    }
+	$newcardbutton = '';
+	if ($caneditperms)
+	{
+		$newcardbutton .= dolGetButtonTitle($langs->trans('NewGroup'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/user/group/card.php?action=create&leftmenu=');
+	}
 
-    print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="mode" value="'.$mode.'">';
-    print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="mode" value="'.$mode.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-    print_barre_liste($text, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num, $nbtotalofrecords, 'object_group', 0, $newcardbutton, '', $limit, 0, 0, 1);
+	print_barre_liste($text, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num, $nbtotalofrecords, 'object_group', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
-    if ($sall)
-    {
-        foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
-        print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
-    }
+	if ($sall)
+	{
+		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+	}
 
-    $moreforfilter = '';
+	$moreforfilter = '';
 
 	//$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
 	//$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Group", $_SERVER["PHP_SELF"], "g.nom", $param, "", "", $sortfield, $sortorder);
-    //multicompany
-    if (!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1)
-    {
-    	print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], "g.entity", $param, "", '', $sortfield, $sortorder, 'center ');
-    }
-    print_liste_field_titre("NbOfUsers", $_SERVER["PHP_SELF"], "nb", $param, "", '', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre("NbOfPermissions", $_SERVER["PHP_SELF"], "nbpermissions", $param, "", '', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre("DateCreationShort", $_SERVER["PHP_SELF"], "g.datec", $param, "", '', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre("", $_SERVER["PHP_SELF"]);
-    print "</tr>\n";
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Group", $_SERVER["PHP_SELF"], "g.nom", $param, "", "", $sortfield, $sortorder);
+	//multicompany
+	if (!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1)
+	{
+		print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], "g.entity", $param, "", '', $sortfield, $sortorder, 'center ');
+	}
+	print_liste_field_titre("NbOfUsers", $_SERVER["PHP_SELF"], "nb", $param, "", '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre("NbOfPermissions", $_SERVER["PHP_SELF"], "nbpermissions", $param, "", '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre("DateCreationShort", $_SERVER["PHP_SELF"], "g.datec", $param, "", '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre("", $_SERVER["PHP_SELF"]);
+	print "</tr>\n";
 
-    $grouptemp = new UserGroup($db);
+	$grouptemp = new UserGroup($db);
 
-    while ($i < $num)
-    {
-        $obj = $db->fetch_object($resql);
+	while ($i < $num)
+	{
+		$obj = $db->fetch_object($resql);
 
-        $grouptemp->id = $obj->rowid;
-        $grouptemp->name = $obj->name;
-        $grouptemp->note = $obj->note;
+		$grouptemp->id = $obj->rowid;
+		$grouptemp->name = $obj->name;
+		$grouptemp->note = $obj->note;
 
-        print '<tr class="oddeven">';
-        print '<td>';
-        print $grouptemp->getNomUrl(1);
-        if (!$obj->entity)
-        {
-        	print img_picto($langs->trans("GlobalGroup"), 'redstar');
-        }
-        print "</td>";
-        //multicompany
-        if (!empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1)
-        {
-            $mc->getInfo($obj->entity);
-            print '<td class="center">'.$mc->label.'</td>';
-        }
-        print '<td class="center">'.$obj->nb.'</td>';
-        print '<td class="center">'.$obj->nbpermissions.'</td>';
-        print '<td class="center nowrap">'.dol_print_date($db->jdate($obj->datec), "dayhour").'</td>';
-        print '<td></td>';
-        print "</tr>\n";
-        $i++;
-    }
-    print "</table>";
+		print '<tr class="oddeven">';
+		print '<td>';
+		print $grouptemp->getNomUrl(1);
+		if (!$obj->entity)
+		{
+			print img_picto($langs->trans("GlobalGroup"), 'redstar');
+		}
+		print "</td>";
+		//multicompany
+		if (!empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1)
+		{
+			$mc->getInfo($obj->entity);
+			print '<td class="center">'.$mc->label.'</td>';
+		}
+		print '<td class="center">'.$obj->nb.'</td>';
+		print '<td class="center">'.$obj->nbpermissions.'</td>';
+		print '<td class="center nowrap">'.dol_print_date($db->jdate($obj->datec), "dayhour").'</td>';
+		print '<td></td>';
+		print "</tr>\n";
+		$i++;
+	}
+	print "</table>";
 
-    print '</div>';
-    print "</form>\n";
+	print '</div>';
+	print "</form>\n";
 
-    $db->free($resql);
+	$db->free($resql);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // End of page
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 82e268a6300..badf3840582 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -119,7 +119,7 @@ if ($object->id > 0)
 
 	$head = group_prepare_head($object);
 	$title = $langs->trans("Group");
-	dol_fiche_head($head, 'rights', $title, -1, 'group');
+	print dol_get_fiche_head($head, 'rights', $title, -1, 'group');
 
 	// Charge les modules soumis a permissions
 	$modules = array();
@@ -374,7 +374,7 @@ if ($object->id > 0)
 	$reshook = $hookmanager->executeHooks('insertExtraFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 6918d1638e4..1a6a630d27c 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -43,6 +43,9 @@ if ($user->socid > 0)
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_user = GETPOST('search_user', 'alpha');
 
+// Load mode employee
+$mode = GETPOST("mode", 'alpha');
+
 $userstatic = new User($db);
 $search_statut = GETPOST('search_statut', 'int');
 
@@ -65,8 +68,8 @@ $canadduser = (!empty($user->admin) || $user->rights->user->user->creer);
 $form = new Form($db);
 
 $arrayofjs = array(
-    '/includes/jquery/plugins/jquerytreeview/jquery.treeview.js',
-    '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js',
+	'/includes/jquery/plugins/jquerytreeview/jquery.treeview.js',
+	'/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js',
 );
 $arrayofcss = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
 
@@ -78,139 +81,136 @@ $user_arbo = $userstatic->get_full_tree(0, ($search_statut != '' && $search_stat
 
 if (!is_array($user_arbo) && $user_arbo < 0)
 {
-    setEventMessages($userstatic->error, $userstatic->errors, 'warnings');
+	setEventMessages($userstatic->error, $userstatic->errors, 'warnings');
 } else {
-    // Define fulltree array
-    $fulltree = $user_arbo;
-    //var_dump($fulltree);
-    // Define data (format for treeview)
-    $data = array();
-    $data[] = array('rowid'=>0, 'fk_menu'=>-1, 'title'=>"racine", 'mainmenu'=>'', 'leftmenu'=>'', 'fk_mainmenu'=>'', 'fk_leftmenu'=>'');
-    foreach ($fulltree as $key => $val)
-    {
-    	$userstatic->id = $val['id'];
-    	$userstatic->ref = $val['label'];
-    	$userstatic->login = $val['login'];
-    	$userstatic->firstname = $val['firstname'];
-    	$userstatic->lastname = $val['lastname'];
-    	$userstatic->statut = $val['statut'];
-        $userstatic->email = $val['email'];
-        $userstatic->gender = $val['gender'];
-    	$userstatic->socid = $val['fk_soc'];
-    	$userstatic->admin = $val['admin'];
-    	$userstatic->entity = $val['entity'];
-    	$userstatic->photo = $val['photo'];
+	// Define fulltree array
+	$fulltree = $user_arbo;
+	//var_dump($fulltree);
+	// Define data (format for treeview)
+	$data = array();
+	$data[] = array('rowid'=>0, 'fk_menu'=>-1, 'title'=>"racine", 'mainmenu'=>'', 'leftmenu'=>'', 'fk_mainmenu'=>'', 'fk_leftmenu'=>'');
+	foreach ($fulltree as $key => $val)
+	{
+		$userstatic->id = $val['id'];
+		$userstatic->ref = $val['label'];
+		$userstatic->login = $val['login'];
+		$userstatic->firstname = $val['firstname'];
+		$userstatic->lastname = $val['lastname'];
+		$userstatic->statut = $val['statut'];
+		$userstatic->email = $val['email'];
+		$userstatic->gender = $val['gender'];
+		$userstatic->socid = $val['fk_soc'];
+		$userstatic->admin = $val['admin'];
+		$userstatic->entity = $val['entity'];
+		$userstatic->photo = $val['photo'];
 
-    	$entity = $val['entity'];
-    	$entitystring = '';
+		$entity = $val['entity'];
+		$entitystring = '';
 
-    	// TODO Set of entitystring should be done with a hook
-    	if (!empty($conf->multicompany->enabled) && is_object($mc))
-    	{
-    		if (empty($entity))
-    		{
-    			$entitystring = $langs->trans("AllEntities");
-    		} else {
-    			$mc->getInfo($entity);
-    			$entitystring = $mc->label;
-    		}
-    	}
+		// TODO Set of entitystring should be done with a hook
+		if (!empty($conf->multicompany->enabled) && is_object($mc))
+		{
+			if (empty($entity))
+			{
+				$entitystring = $langs->trans("AllEntities");
+			} else {
+				$mc->getInfo($entity);
+				$entitystring = $mc->label;
+			}
+		}
 
-    	$li = $userstatic->getNomUrl(-1, '', 0, 1);
-    	if (!empty($conf->multicompany->enabled) && $userstatic->admin && !$userstatic->entity)
-    	{
-    		$li .= img_picto($langs->trans("SuperAdministrator"), 'redstar');
-    	} elseif ($userstatic->admin)
-    	{
-    		$li .= img_picto($langs->trans("Administrator"), 'star');
-    	}
-    	$li .= ' ('.$val['login'].($entitystring ? ' - '.$entitystring : '').')';
+		$li = $userstatic->getNomUrl(-1, '', 0, 1);
+		if (!empty($conf->multicompany->enabled) && $userstatic->admin && !$userstatic->entity)
+		{
+			$li .= img_picto($langs->trans("SuperAdministrator"), 'redstar');
+		} elseif ($userstatic->admin)
+		{
+			$li .= img_picto($langs->trans("Administrator"), 'star');
+		}
+		$li .= ' ('.$val['login'].($entitystring ? ' - '.$entitystring : '').')';
 
-    	$entry = '<table class="nobordernopadding centpercent"><tr><td class="'.($val['statut'] ? 'usertdenabled' : 'usertddisabled').'">'.$li.'</td><td align="right" class="'.($val['statut'] ? 'usertdenabled' : 'usertddisabled').'">'.$userstatic->getLibStatut(2).'</td></tr></table>';
+		$entry = '<table class="nobordernopadding centpercent"><tr><td class="'.($val['statut'] ? 'usertdenabled' : 'usertddisabled').'">'.$li.'</td><td align="right" class="'.($val['statut'] ? 'usertdenabled' : 'usertddisabled').'">'.$userstatic->getLibStatut(2).'</td></tr></table>';
 
-    	$data[] = array(
-    		'rowid'=>$val['rowid'],
-    		'fk_menu'=>$val['fk_user'],
-    		'statut'=>$val['statut'],
-    		'entry'=>$entry
-    	);
-    }
+		$data[] = array(
+			'rowid'=>$val['rowid'],
+			'fk_menu'=>$val['fk_user'],
+			'statut'=>$val['statut'],
+			'entry'=>$entry
+		);
+	}
 
-    //var_dump($data);
+	//var_dump($data);
 
-    $title = $langs->trans("ListOfUsers").' - '.$langs->trans("HierarchicView");
+	$title = $langs->trans("ListOfUsers").' - '.$langs->trans("HierarchicView");
 
-    $param = "search_statut=".urlencode($search_statut);
+	$param = "search_statut=".urlencode($search_statut);
 
-    $newcardbutton = '';
-    if ($canadduser)
-    {
-        $newcardbutton .= dolGetButtonTitle($langs->trans('NewUser'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/user/card.php?action=create'.($mode == 'employee' ? '&employee=1' : '').'&leftmenu=');
-    }
+	$newcardbutton = '';
+	$newcardbutton .= dolGetButtonTitle($langs->trans('NewUser'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/user/card.php?action=create'.($mode == 'employee' ? '&employee=1' : '').'&leftmenu=', '', $canadduser);
 
-    $morehtmlright .= dolGetButtonTitle($langs->trans("List"), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/user/list.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''));
-    $param = array('morecss'=>'marginleftonly btnTitleSelected');
-    $morehtmlright .= dolGetButtonTitle($langs->trans("HierarchicView"), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/user/hierarchy.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''), '', 1, $param);
+	$morehtmlright .= dolGetButtonTitle($langs->trans("List"), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/user/list.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''));
+	$param = array('morecss'=>'marginleftonly btnTitleSelected');
+	$morehtmlright .= dolGetButtonTitle($langs->trans("HierarchicView"), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/user/hierarchy.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''), '', 1, $param);
 
-    print load_fiche_titre($title, $morehtmlright.' '.$newcardbutton, 'user');
+	print load_fiche_titre($title, $morehtmlright.' '.$newcardbutton, 'user');
 
-    print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
-    print '<input type="hidden" name="mode" value="'.$mode.'">';
-    print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="mode" value="'.$mode.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-    print '<table class="liste nohover centpercent">';
+	print '<table class="liste nohover centpercent">';
 
-    print '<tr class="liste_titre_filter">';
-    print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre">&nbsp;</td>';
-    // Status
-    print '<td class="liste_titre right">';
-    print $form->selectarray('search_statut', array('-1'=>'', '1'=>$langs->trans('Enabled')), $search_statut);
-    print '</td>';
-    print '<td class="liste_titre maxwidthsearch">';
-    $searchpicto = $form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
-    print '</tr>';
+	print '<tr class="liste_titre_filter">';
+	print '<td class="liste_titre">&nbsp;</td>';
+	print '<td class="liste_titre">&nbsp;</td>';
+	// Status
+	print '<td class="liste_titre right">';
+	print $form->selectarray('search_statut', array('-1'=>'', '1'=>$langs->trans('Enabled')), $search_statut);
+	print '</td>';
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
+	print '</td>';
+	print '</tr>';
 
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("HierarchicView");
-    print_liste_field_titre('<div id="iddivjstreecontrol"><a href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a> | <a href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a></div>', $_SERVER['PHP_SELF'], "", '', "", 'align="center"');
-    print_liste_field_titre("Status", $_SERVER['PHP_SELF'], "", '', "", 'align="right"');
-    print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', '', '', 'maxwidthsearch ');
-    print '</tr>';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("HierarchicView");
+	print_liste_field_titre('<div id="iddivjstreecontrol"><a href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a> | <a href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a></div>', $_SERVER['PHP_SELF'], "", '', "", 'align="center"');
+	print_liste_field_titre("Status", $_SERVER['PHP_SELF'], "", '', "", 'align="right"');
+	print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', '', '', 'maxwidthsearch ');
+	print '</tr>';
 
 
-    $nbofentries = (count($data) - 1);
+	$nbofentries = (count($data) - 1);
 
-    if ($nbofentries > 0)
-    {
-    	print '<tr><td colspan="3">';
-    	tree_recur($data, $data[0], 0);
-    	print '</td>';
-    	print '<td></td>';
-    	print '</tr>';
-    } else {
-    	print '<tr class="oddeven">';
-    	print '<td colspan="3">';
-    	print '<table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('', 'treemenu/branchbottom.gif').'</td>';
-    	print '<td valign="middle">';
-    	print $langs->trans("NoCategoryYet");
-    	print '</td>';
-    	print '<td>&nbsp;</td>';
-    	print '</table>';
-    	print '</td>';
-    	print '<td></td>';
-    	print '</tr>';
-    }
+	if ($nbofentries > 0)
+	{
+		print '<tr><td colspan="3">';
+		tree_recur($data, $data[0], 0);
+		print '</td>';
+		print '<td></td>';
+		print '</tr>';
+	} else {
+		print '<tr class="oddeven">';
+		print '<td colspan="3">';
+		print '<table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('', 'treemenu/branchbottom.gif').'</td>';
+		print '<td valign="middle">';
+		print $langs->trans("NoCategoryYet");
+		print '</td>';
+		print '<td>&nbsp;</td>';
+		print '</table>';
+		print '</td>';
+		print '<td></td>';
+		print '</tr>';
+	}
 
-    print "</table>";
-    print "</form>\n";
+	print "</table>";
+	print "</form>\n";
 }
 
 //
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index 3e08fc7098a..4d215685f53 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -152,7 +152,7 @@ if ($resql)
 
 		print '<tr class="oddeven">';
 		print '<td class="nowraponall">';
-        print $fuserstatic->getNomUrl(-1);
+		print $fuserstatic->getNomUrl(-1);
 		if (!empty($conf->multicompany->enabled) && $obj->admin && !$obj->entity)
 		{
 			print img_picto($langs->trans("SuperAdministrator"), 'redstar');
@@ -165,7 +165,7 @@ if ($resql)
 		print "<td>";
 		if ($obj->fk_soc)
 		{
-            print $companystatic->getNomUrl(1);
+			print $companystatic->getNomUrl(1);
 		} else {
 			print $langs->trans("InternalUser");
 		}
@@ -176,7 +176,7 @@ if ($resql)
 
 		$entity = $obj->entity;
 		$entitystring = '';
-        // TODO Set of entitystring should be done with a hook
+		// TODO Set of entitystring should be done with a hook
 		if (!empty($conf->multicompany->enabled) && is_object($mc))
 		{
 			if (empty($entity))
@@ -187,13 +187,13 @@ if ($resql)
 				$entitystring = $mc->label;
 			}
 		}
-        print ($entitystring ? ' ('.$entitystring.')' : '');
+		print ($entitystring ? ' ('.$entitystring.')' : '');
 
 		print '</td>';
 		print '<td class="center nowrap">'.dol_print_date($db->jdate($obj->datec), 'dayhour').'</td>';
-        print '<td class="right">';
-        print $fuserstatic->getLibStatut(3);
-        print '</td>';
+		print '<td class="right">';
+		print $fuserstatic->getLibStatut(3);
+		print '</td>';
 
 		print '</tr>';
 		$i++;
@@ -259,10 +259,10 @@ if ($canreadperms)
 			print "</td>";
 			if (!empty($conf->multicompany->enabled) && is_object($mc))
 			{
-	        	$mc->getInfo($obj->entity);
-	        	print '<td>';
-	        	print $mc->label;
-	        	print '</td>';
+				$mc->getInfo($obj->entity);
+				print '<td>';
+				print $mc->label;
+				print '</td>';
 			}
 			print '<td class="nowrap right">'.dol_print_date($db->jdate($obj->datec), 'dayhour').'</td>';
 			print "</tr>";
diff --git a/htdocs/user/info.php b/htdocs/user/info.php
index ab22461d562..f38d9ef2162 100644
--- a/htdocs/user/info.php
+++ b/htdocs/user/info.php
@@ -63,7 +63,7 @@ llxHeader();
 $head = user_prepare_head($object);
 
 $title = $langs->trans("User");
-dol_fiche_head($head, 'info', $title, -1, 'user');
+print dol_get_fiche_head($head, 'info', $title, -1, 'user');
 
 
 $linkback = '';
@@ -88,7 +88,7 @@ dol_print_object_info($object);
 print '</div>';
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index eaa3de2c55d..44c7f553d11 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -92,7 +92,7 @@ llxHeader();
 $head = user_prepare_head($object);
 
 $title = $langs->trans("User");
-dol_fiche_head($head, 'ldap', $title, 0, 'user');
+print dol_get_fiche_head($head, 'ldap', $title, 0, 'user');
 
 $linkback = '';
 
@@ -147,7 +147,7 @@ print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 /*
  * Barre d'actions
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 0bed08c3c31..e7a8a31af4e 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -109,45 +109,32 @@ if (!empty($conf->api->enabled))
 
 // Definition of fields for list
 $arrayfields = array(
-	'u.login'=>array('label'=>$langs->trans("Login"), 'checked'=>1),
-	'u.lastname'=>array('label'=>$langs->trans("Lastname"), 'checked'=>1),
-	'u.firstname'=>array('label'=>$langs->trans("Firstname"), 'checked'=>1),
-	'u.gender'=>array('label'=>$langs->trans("Gender"), 'checked'=>0),
-	'u.employee'=>array('label'=>$langs->trans("Employee"), 'checked'=>($mode == 'employee' ? 1 : 0)),
-	'u.accountancy_code'=>array('label'=>$langs->trans("AccountancyCode"), 'checked'=>0),
-	'u.email'=>array('label'=>$langs->trans("EMail"), 'checked'=>1),
-	'u.api_key'=>array('label'=>$langs->trans("ApiKey"), 'checked'=>0, "enabled"=>($conf->api->enabled && $user->admin)),
-	'u.fk_soc'=>array('label'=>$langs->trans("Company"), 'checked'=>1),
-	'u.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))),
-	'u.fk_user'=>array('label'=>$langs->trans("HierarchicalResponsible"), 'checked'=>1),
-	'u.datelastlogin'=>array('label'=>$langs->trans("LastConnexion"), 'checked'=>1, 'position'=>100),
-	'u.datepreviouslogin'=>array('label'=>$langs->trans("PreviousConnexion"), 'checked'=>0, 'position'=>110),
-	'u.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-	'u.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
-	'u.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
+	'u.login'=>array('label'=>"Login", 'checked'=>1, 'position'=>10),
+    'u.lastname'=>array('label'=>"Lastname", 'checked'=>1, 'position'=>15),
+    'u.firstname'=>array('label'=>"Firstname", 'checked'=>1, 'position'=>20),
+    'u.entity'=>array('label'=>"Entity", 'checked'=>1, 'position'=>50, 'enabled'=>(!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))),
+    'u.gender'=>array('label'=>"Gender", 'checked'=>0, 'position'=>22),
+    'u.employee'=>array('label'=>"Employee", 'checked'=>($mode == 'employee' ? 1 : 0), 'position'=>25),
+    'u.fk_user'=>array('label'=>"HierarchicalResponsible", 'checked'=>1, 'position'=>27),
+    'u.accountancy_code'=>array('label'=>"AccountancyCode", 'checked'=>0, 'position'=>30),
+    'u.email'=>array('label'=>"EMail", 'checked'=>1, 'position'=>35),
+    'u.api_key'=>array('label'=>"ApiKey", 'checked'=>0, 'position'=>40, "enabled"=>($conf->api->enabled && $user->admin)),
+    'u.fk_soc'=>array('label'=>"Company", 'checked'=>($contextpage == 'employeelist' ? 0 : 1), 'position'=>45),
+    'u.salary'=>array('label'=>"Salary", 'checked'=>1, 'position'=>80, 'enabled'=>($conf->salaries->enabled && !empty($user->rights->salaries->readall))),
+    'u.datelastlogin'=>array('label'=>"LastConnexion", 'checked'=>1, 'position'=>100),
+	'u.datepreviouslogin'=>array('label'=>"PreviousConnexion", 'checked'=>0, 'position'=>110),
+	'u.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
+	'u.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
+	'u.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
-			$arrayfields["ef.".$key] = array(
-				'label'=>$extrafields->attributes[$object->table_element]['label'][$key],
-				'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1),
-				'position'=>$extrafields->attributes[$object->table_element]['pos'][$key],
-				'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]),
-				'langfile'=>$extrafields->attributes[$object->table_element]['langfile'][$key],
-				'help'=>$extrafields->attributes[$object->table_element]['help'][$key]
-			);
-		}
-	}
-}
+include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
 // Init search fields
-$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_user = GETPOST('search_user', 'alpha');
 $search_login = GETPOST('search_login', 'alpha');
 $search_lastname = GETPOST('search_lastname', 'alpha');
@@ -183,6 +170,8 @@ if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 
 $error = 0;
 
+$childids = $user->getAllChildIds(1);
+
 
 /*
  * Actions
@@ -220,7 +209,7 @@ if (empty($reshook))
 		$search_date_creation = "";
 		$search_date_update = "";
 		$search_array_options = array();
-        $search_categ = 0;
+		$search_categ = 0;
 	}
 
 	// Mass actions
@@ -299,19 +288,23 @@ $formother = new FormOther($db);
 
 //$help_url="EN:Module_MyObject|FR:Module_MyObject_FR|ES:Módulo_MyObject";
 $help_url = '';
-$text = $langs->trans("ListOfUsers");
+if ($contextpage == 'employeelist' && $search_employee == 1) {
+	$text = $langs->trans("ListOfEmployees");
+} else {
+	$text = $langs->trans("ListOfUsers");
+}
 
 $user2 = new User($db);
 
 $sql = "SELECT DISTINCT u.rowid, u.lastname, u.firstname, u.admin, u.fk_soc, u.login, u.email, u.api_key, u.accountancy_code, u.gender, u.employee, u.photo,";
-$sql .= " u.datelastlogin, u.datepreviouslogin,";
+$sql .= " u.salary, u.datelastlogin, u.datepreviouslogin,";
 $sql .= " u.ldap_sid, u.statut, u.entity,";
 $sql .= " u.tms as date_update, u.datec as date_creation,";
 $sql .= " u2.rowid as id2, u2.login as login2, u2.firstname as firstname2, u2.lastname as lastname2, u2.admin as admin2, u2.fk_soc as fk_soc2, u2.email as email2, u2.gender as gender2, u2.photo as photo2, u2.entity as entity2, u2.statut as statut2,";
 $sql .= " s.nom as name, s.canvas";
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key.', ' : '');
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
 }
 // Add fields from hooks
 $parameters = array();
@@ -339,7 +332,7 @@ if ($search_thirdparty != '') $sql .= natural_search(array('s.nom'), $search_thi
 if ($search_login != '')      $sql .= natural_search("u.login", $search_login);
 if ($search_lastname != '')   $sql .= natural_search("u.lastname", $search_lastname);
 if ($search_firstname != '')  $sql .= natural_search("u.firstname", $search_firstname);
-if ($search_gender != '' && $search_gender != '-1')     $sql .= natural_search("u.gender", $search_gender);
+if ($search_gender != '' && $search_gender != '-1')     $sql .= " AND u.gender = '".$db->escape($search_gender)."'"; // Cannot use natural_search as looking for %man% also includes woman
 if (is_numeric($search_employee) && $search_employee >= 0) {
 	$sql .= ' AND u.employee = '.(int) $search_employee;
 }
@@ -352,6 +345,7 @@ if ($catid > 0)     $sql .= " AND cu.fk_categorie = ".((int) $catid);
 if ($catid == -2)   $sql .= " AND cu.fk_categorie IS NULL";
 if ($search_categ > 0)   $sql .= " AND cu.fk_categorie = ".$db->escape($search_categ);
 if ($search_categ == -2) $sql .= " AND cu.fk_categorie IS NULL";
+if ($mode == 'employee' && empty($user->rights->salaries->readall)) $sql .= " AND s.fk_user IN (".join(',', $childids).")";
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
@@ -463,11 +457,11 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if (!empty($catid))
 {
-    print "<div id='ways'>";
-    $c = new Categorie($db);
-    $ways = $c->print_all_ways(' &gt; ', 'user/list.php');
-    print " &gt; ".$ways[0]."<br>\n";
-    print "</div><br>";
+	print "<div id='ways'>";
+	$c = new Categorie($db);
+	$ways = $c->print_all_ways(' &gt; ', 'user/list.php');
+	print " &gt; ".$ways[0]."<br>\n";
+	print "</div><br>";
 }
 
 if ($search_all)
@@ -482,12 +476,12 @@ $moreforfilter = '';
  $moreforfilter.= '</div>';*/
 
 // Filter on categories
-if (!empty($conf->categorie->enabled))
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 {
-    $moreforfilter .= '<div class="divsearchfield">';
-    $moreforfilter .= $langs->trans('Categories').': ';
-    $moreforfilter .= $formother->select_categories(Categorie::TYPE_USER, $search_categ, 'search_categ', 1);
-    $moreforfilter .= '</div>';
+	$moreforfilter .= '<div class="divsearchfield">';
+	$moreforfilter .= $langs->trans('Categories').': ';
+	$moreforfilter .= $formother->select_categories(Categorie::TYPE_USER, $search_categ, 'search_categ', 1);
+	$moreforfilter .= '</div>';
 }
 
 $parameters = array();
@@ -497,9 +491,9 @@ else $moreforfilter = $hookmanager->resPrint;
 
 if (!empty($moreforfilter))
 {
-    print '<div class="liste_titre liste_titre_bydiv centpercent">';
-    print $moreforfilter;
-    print '</div>';
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+	print '</div>';
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
@@ -537,6 +531,13 @@ if (!empty($arrayfields['u.employee']['checked']))
 	print $form->selectyesno('search_employee', $search_employee, 1, false, 1);
 	print '</td>';
 }
+// Supervisor
+if (!empty($arrayfields['u.fk_user']['checked']))
+{
+    print '<td class="liste_titre">';
+    print $form->select_dolusers($search_supervisor, 'search_supervisor', 1, array(), 0, '', 0, 0, 0, 0, '', 0, '', 'maxwidth200');
+    print '</td>';
+}
 if (!empty($arrayfields['u.accountancy_code']['checked']))
 {
 	print '<td class="liste_titre"><input type="text" name="search_accountancy_code" class="maxwidth50" value="'.$search_accountancy_code.'"></td>';
@@ -557,12 +558,9 @@ if (!empty($arrayfields['u.entity']['checked']))
 {
 	print '<td class="liste_titre"></td>';
 }
-// Supervisor
-if (!empty($arrayfields['u.fk_user']['checked']))
+if (!empty($arrayfields['u.salary']['checked']))
 {
-	print '<td class="liste_titre">';
-	print $form->select_dolusers($search_supervisor, 'search_supervisor', 1, array(), 0, '', 0, 0, 0, 0, '', 0, '', 'maxwidth200');
-	print '</td>';
+    print '<td class="liste_titre"></td>';
 }
 if (!empty($arrayfields['u.datelastlogin']['checked']))
 {
@@ -611,12 +609,13 @@ if (!empty($arrayfields['u.lastname']['checked']))       print_liste_field_titre
 if (!empty($arrayfields['u.firstname']['checked']))      print_liste_field_titre("FirstName", $_SERVER['PHP_SELF'], "u.firstname", $param, "", "", $sortfield, $sortorder);
 if (!empty($arrayfields['u.gender']['checked']))         print_liste_field_titre("Gender", $_SERVER['PHP_SELF'], "u.gender", $param, "", "", $sortfield, $sortorder);
 if (!empty($arrayfields['u.employee']['checked']))       print_liste_field_titre("Employee", $_SERVER['PHP_SELF'], "u.employee", $param, "", "", $sortfield, $sortorder);
+if (!empty($arrayfields['u.fk_user']['checked']))        print_liste_field_titre("HierarchicalResponsible", $_SERVER['PHP_SELF'], "u.fk_user", $param, "", "", $sortfield, $sortorder);
 if (!empty($arrayfields['u.accountancy_code']['checked'])) print_liste_field_titre("AccountancyCode", $_SERVER['PHP_SELF'], "u.accountancy_code", $param, "", "", $sortfield, $sortorder);
 if (!empty($arrayfields['u.email']['checked']))          print_liste_field_titre("EMail", $_SERVER['PHP_SELF'], "u.email", $param, "", "", $sortfield, $sortorder);
 if (!empty($arrayfields['u.api_key']['checked']))        print_liste_field_titre("ApiKey", $_SERVER['PHP_SELF'], "u.api_key", $param, "", "", $sortfield, $sortorder);
 if (!empty($arrayfields['u.fk_soc']['checked']))         print_liste_field_titre("Company", $_SERVER['PHP_SELF'], "u.fk_soc", $param, "", "", $sortfield, $sortorder);
 if (!empty($arrayfields['u.entity']['checked']))         print_liste_field_titre("Entity", $_SERVER['PHP_SELF'], "u.entity", $param, "", "", $sortfield, $sortorder);
-if (!empty($arrayfields['u.fk_user']['checked']))        print_liste_field_titre("HierarchicalResponsible", $_SERVER['PHP_SELF'], "u.fk_user", $param, "", "", $sortfield, $sortorder);
+if (!empty($arrayfields['u.salary']['checked']))         print_liste_field_titre("Salary", $_SERVER['PHP_SELF'], "u.salary", $param, "", "", $sortfield, $sortorder, 'right ');
 if (!empty($arrayfields['u.datelastlogin']['checked']))  print_liste_field_titre("LastConnexion", $_SERVER['PHP_SELF'], "u.datelastlogin", $param, "", '', $sortfield, $sortorder, 'center ');
 if (!empty($arrayfields['u.datepreviouslogin']['checked'])) print_liste_field_titre("PreviousConnexion", $_SERVER['PHP_SELF'], "u.datepreviouslogin", $param, "", '', $sortfield, $sortorder, 'center ');
 // Extra fields
@@ -648,6 +647,7 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
+$arrayofselected = array();
 while ($i < ($limit ? min($num, $limit) : $num))
 {
 	$obj = $db->fetch_object($resql);
@@ -693,29 +693,60 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	}
 	if (!empty($arrayfields['u.firstname']['checked']))
 	{
-	    print '<td class="tdoverflowmax150">'.$obj->firstname.'</td>';
+		print '<td class="tdoverflowmax150">'.$obj->firstname.'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['u.gender']['checked']))
 	{
-	    print '<td>';
-	    if ($obj->gender) print $langs->trans("Gender".$obj->gender);
-	    print '</td>';
+		print '<td>';
+		if ($obj->gender) print $langs->trans("Gender".$obj->gender);
+		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['u.employee']['checked']))
 	{
-	    print '<td>'.yn($obj->employee).'</td>';
+		print '<td>'.yn($obj->employee).'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
+
+	// Supervisor
+	if (!empty($arrayfields['u.fk_user']['checked']))
+	{
+	    // Resp
+	    print '<td class="nowrap">';
+	    if ($obj->login2)
+	    {
+	        $user2->id = $obj->id2;
+	        $user2->login = $obj->login2;
+	        $user2->lastname = $obj->lastname2;
+	        $user2->firstname = $obj->firstname2;
+	        $user2->gender = $obj->gender2;
+	        $user2->photo = $obj->photo2;
+	        $user2->admin = $obj->admin2;
+	        $user2->email = $obj->email2;
+	        $user2->socid = $obj->fk_soc2;
+	        $user2->statut = $obj->statut2;
+	        print $user2->getNomUrl(-1, '', 0, 0, 24, 0, '', '', 1);
+	        if (!empty($conf->multicompany->enabled) && $obj->admin2 && !$obj->entity2)
+	        {
+	            print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
+	        } elseif ($obj->admin2)
+	        {
+	            print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
+	        }
+	    }
+	    print '</td>';
+	    if (!$i) $totalarray['nbfield']++;
+	}
+
 	if (!empty($arrayfields['u.accountancy_code']['checked']))
 	{
-	    print '<td>'.$obj->accountancy_code.'</td>';
+		print '<td>'.$obj->accountancy_code.'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['u.email']['checked']))
 	{
-	    print '<td>'.$obj->email.'</td>';
+		print '<td>'.$obj->email.'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['u.api_key']['checked']))
@@ -758,34 +789,12 @@ while ($i < ($limit ? min($num, $limit) : $num))
 			if (!$i) $totalarray['nbfield']++;
 		}
 	}
-	// Supervisor
-	if (!empty($arrayfields['u.fk_user']['checked']))
+
+	// Salary
+	if (!empty($arrayfields['u.salary']['checked']))
 	{
-		// Resp
-		print '<td class="nowrap">';
-		if ($obj->login2)
-		{
-			$user2->id = $obj->id2;
-			$user2->login = $obj->login2;
-			$user2->lastname = $obj->lastname2;
-			$user2->firstname = $obj->firstname2;
-			$user2->gender = $obj->gender2;
-			$user2->photo = $obj->photo2;
-			$user2->admin = $obj->admin2;
-			$user2->email = $obj->email2;
-			$user2->socid = $obj->fk_soc2;
-            $user2->statut = $obj->statut2;
-			print $user2->getNomUrl(-1, '', 0, 0, 24, 0, '', '', 1);
-			if (!empty($conf->multicompany->enabled) && $obj->admin2 && !$obj->entity2)
-			{
-			  	print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
-			} elseif ($obj->admin2)
-			{
-				print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
-			}
-		}
-		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+	    print '<td class="nowraponall right">'.($obj->salary ? price($obj->salary) : '').'</td>';
+	    if (!$i) $totalarray['nbfield']++;
 	}
 
 	// Date last login
@@ -826,9 +835,9 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	// Status
 	if (!empty($arrayfields['u.statut']['checked']))
 	{
-	    $userstatic->statut = $obj->statut;
-	    print '<td class="center">'.$userstatic->getLibStatut(5).'</td>';
-	    if (!$i) $totalarray['nbfield']++;
+		$userstatic->statut = $obj->statut;
+		print '<td class="center">'.$userstatic->getLibStatut(5).'</td>';
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Action column
 	print '<td class="nowrap center">';
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index 955c1f14599..95527747d2e 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -64,7 +64,7 @@ if (empty($reshook)) {
 	if ($action == 'update' && $user->rights->user->user->creer && !$_POST["cancel"]) {
 		$db->begin();
 
-		$res = $object->update_note(dol_html_entity_decode(GETPOST('note_private', 'restricthtml'), ENT_QUOTES));
+		$res = $object->update_note(dol_html_entity_decode(GETPOST('note_private', 'restricthtml'), ENT_QUOTES | ENT_HTML5));
 		if ($res < 0) {
 			$mesg = '<div class="error">'.$adh->error.'</div>';
 			$db->rollback();
@@ -88,7 +88,7 @@ if ($id)
 	$head = user_prepare_head($object);
 
 	$title = $langs->trans("User");
-	dol_fiche_head($head, 'note', $title, -1, 'user');
+	print dol_get_fiche_head($head, 'note', $title, -1, 'user');
 
 	$linkback = '';
 
@@ -96,27 +96,29 @@ if ($id)
 		$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	}
 
-    dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 
-    print "<form method=\"post\" action=\"".$_SERVER['PHP_SELF']."\">";
+	print "<form method=\"post\" action=\"".$_SERVER['PHP_SELF']."\">";
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 
 	print '<div class="fichecenter">';
-    print '<table class="border centpercent tableforfield">';
+	print '<table class="border centpercent tableforfield">';
 
-    // Login
-    print '<tr><td class="titlefield">'.$langs->trans("Login").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
+	// Login
+	print '<tr><td class="titlefield">'.$langs->trans("Login").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
+
+	$editenabled = (($action == 'edit') && !empty($user->rights->user->user->creer));
 
 	// Note
-    print '<tr><td class="tdtop">'.$langs->trans("Note").'</td>';
-	print '<td class="sensiblehtmlcontent">';
-	if ($action == 'edit' && $user->rights->user->user->creer)
+	print '<tr><td class="tdtop">'.$langs->trans("Note").'</td>';
+	print '<td class="'.($editenabled ? '' : 'sensiblehtmlcontent').'">';
+	if ($editenabled)
 	{
 		print "<input type=\"hidden\" name=\"action\" value=\"update\">";
 		print "<input type=\"hidden\" name=\"id\" value=\"".$object->id."\">";
-	    // Editeur wysiwyg
+		// Editeur wysiwyg
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$doleditor = new DolEditor('note_private', $object->note_private, '', 280, 'dolibarr_notes', 'In', true, false, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_8, '90%');
 		$doleditor->Create();
@@ -125,17 +127,17 @@ if ($id)
 	}
 	print "</td></tr>";
 
-    print "</table>";
-    print '</div>';
+	print "</table>";
+	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	if ($action == 'edit')
 	{
 		print '<div class="center">';
-		print '<input type="submit" class="button" name="update" value="'.$langs->trans("Save").'">';
+		print '<input type="submit" class="button button-save" name="update" value="'.$langs->trans("Save").'">';
 		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 	}
 
@@ -144,14 +146,14 @@ if ($id)
      * Actions
      */
 
-    print '<div class="tabsAction">';
+	print '<div class="tabsAction">';
 
-    if ($user->rights->user->user->creer && $action != 'edit')
-    {
-        print "<a class=\"butAction\" href=\"note.php?id=".$object->id."&amp;action=edit\">".$langs->trans('Modify')."</a>";
-    }
+	if ($user->rights->user->user->creer && $action != 'edit')
+	{
+		print "<a class=\"butAction\" href=\"note.php?id=".$object->id."&amp;action=edit\">".$langs->trans('Modify')."</a>";
+	}
 
-    print "</div>";
+	print "</div>";
 
 	print "</form>\n";
 }
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index ca90e7f60e9..3c7395fe1e8 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -63,48 +63,48 @@ $now = dol_now();
 // Add a notification
 if ($action == 'add')
 {
-    $error = 0;
+	$error = 0;
 
-    if ($actionid <= 0)
-    {
-	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Action")), null, 'errors');
-        $error++;
-    }
+	if ($actionid <= 0)
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Action")), null, 'errors');
+		$error++;
+	}
 
-    if (!$error)
-    {
-        $db->begin();
+	if (!$error)
+	{
+		$db->begin();
 
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
-        $sql .= " WHERE fk_user=".$id." AND fk_action=".$actionid;
-        if ($db->query($sql))
-        {
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_user, fk_action)";
-            $sql .= " VALUES ('".$db->idate($now)."',".$id.",".$actionid.")";
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
+		$sql .= " WHERE fk_user=".$id." AND fk_action=".$actionid;
+		if ($db->query($sql))
+		{
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_user, fk_action)";
+			$sql .= " VALUES ('".$db->idate($now)."',".$id.",".$actionid.")";
 
-            if (!$db->query($sql))
-            {
-                $error++;
-                dol_print_error($db);
-            }
-        } else {
-            dol_print_error($db);
-        }
+			if (!$db->query($sql))
+			{
+				$error++;
+				dol_print_error($db);
+			}
+		} else {
+			dol_print_error($db);
+		}
 
-        if (!$error)
-        {
-            $db->commit();
-        } else {
-            $db->rollback();
-        }
-    }
+		if (!$error)
+		{
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
+	}
 }
 
 // Remove a notification
 if ($action == 'delete')
 {
-    $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".GETPOST("actid", "int");
-    $db->query($sql);
+	$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".GETPOST("actid", "int");
+	$db->query($sql);
 }
 
 
@@ -127,32 +127,32 @@ llxHeader('', $title, $help_url);
 
 if ($result > 0)
 {
-    $langs->load("other");
+	$langs->load("other");
 
-    $head = user_prepare_head($object);
+	$head = user_prepare_head($object);
 
-    dol_fiche_head($head, 'notify', $langs->trans("User"), -1, 'user');
+	print dol_get_fiche_head($head, 'notify', $langs->trans("User"), -1, 'user');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin, 'rowid', 'ref', '', '', 0, '', '', 0, '');
+	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin, 'rowid', 'ref', '', '', 0, '', '', 0, '');
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
-    print '<table class="border centpercent tableforfield">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">';
 
-    // Login
-    print '<tr><td class="titlefield">'.$langs->trans("Login").'</td>';
-    if (!empty($object->ldap_sid) && $object->statut == 0)
-    {
-        print '<td class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
-    } else {
-        print '<td>'.$object->login.'</td>';
-    }
-    print '</tr>'."\n";
+	// Login
+	print '<tr><td class="titlefield">'.$langs->trans("Login").'</td>';
+	if (!empty($object->ldap_sid) && $object->statut == 0)
+	{
+		print '<td class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
+	} else {
+		print '<td>'.$object->login.'</td>';
+	}
+	print '</tr>'."\n";
 
-    /*print '<tr><td class="titlefield">'.$langs->trans("NbOfActiveNotifications").'</td>';   // Notification for this thirdparty
+	/*print '<tr><td class="titlefield">'.$langs->trans("NbOfActiveNotifications").'</td>';   // Notification for this thirdparty
     print '<td colspan="3">';
     $nbofrecipientemails=0;
     $notify=new Notify($db);
@@ -164,164 +164,164 @@ if ($result > 0)
     print $nbofrecipientemails;
     print '</td></tr>';*/
 
-    print '</table>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print "\n";
+	print "\n";
 
-    // Help
-    print '<span class="opacitymedium">';
-    print '<br>'.$langs->trans("NotificationsDesc");
-    print '<br>'.$langs->trans("NotificationsDescUser");
-    print '<br>'.$langs->trans("NotificationsDescContact");
-    print '<br>'.$langs->trans("NotificationsDescGlobal");
-    print '</span>';
+	// Help
+	print '<span class="opacitymedium">';
+	print '<br>'.$langs->trans("NotificationsDesc");
+	print '<br>'.$langs->trans("NotificationsDescUser");
+	print '<br>'.$langs->trans("NotificationsDescContact");
+	print '<br>'.$langs->trans("NotificationsDescGlobal");
+	print '</span>';
 
-    print '<br><br><br>'."\n";
+	print '<br><br><br>'."\n";
 
 
-    // Add notification form
-    print load_fiche_titre($langs->trans("AddNewNotification"), '', '');
+	// Add notification form
+	print load_fiche_titre($langs->trans("AddNewNotification"), '', '');
 
-    print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="add">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="add">';
 
-    $param = "&id=".$id;
+	$param = "&id=".$id;
 
-    // Line with titles
-    print '<table width="100%" class="noborder">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
-    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
-    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
-    print_liste_field_titre('');
+	// Line with titles
+	print '<table width="100%" class="noborder">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
+	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
+	print_liste_field_titre('');
 	print "</tr>\n";
 
 
-    // $listofemails=$object->thirdparty_and_contact_email_array();
-    if ($object->email)
-    {
-        $actions = array();
+	// $listofemails=$object->thirdparty_and_contact_email_array();
+	if ($object->email)
+	{
+		$actions = array();
 
-        // Load array of available notifications
-        $notificationtrigger = new InterfaceNotification($db);
-        $listofnotifiedevents = $notificationtrigger->getListOfManagedEvents();
+		// Load array of available notifications
+		$notificationtrigger = new InterfaceNotification($db);
+		$listofnotifiedevents = $notificationtrigger->getListOfManagedEvents();
 
-        foreach ($listofnotifiedevents as $notifiedevent)
-        {
+		foreach ($listofnotifiedevents as $notifiedevent)
+		{
  			$label = ($langs->trans("Notify_".$notifiedevent['code']) != "Notify_".$notifiedevent['code'] ? $langs->trans("Notify_".$notifiedevent['code']) : $notifiedevent['label']);
-            $actions[$notifiedevent['rowid']] = $label;
-        }
-        print '<tr class="oddeven nohover"><td>';
-        print $object->getNomUrl(1);
-        if (isValidEmail($object->email))
-        {
-            print ' &lt;'.$object->email.'&gt;';
-        } else {
-            $langs->load("errors");
-            print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $object->email);
-        }
-        print '</td>';
-        print '<td>';
-        print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$form->selectarray("actionid", $actions, '', 1);
-        print '</td>';
-        print '<td>';
-        $type = array('email'=>$langs->trans("EMail"));
-        print $form->selectarray("typeid", $type);
-        print '</td>';
-        print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
-        print '</tr>';
-    } else {
-        print '<tr class="oddeven"><td colspan="4">';
-        print $langs->trans("YouMustAssignUserMailFirst");
-        print '</td></tr>';
-    }
+			$actions[$notifiedevent['rowid']] = $label;
+		}
+		print '<tr class="oddeven nohover"><td>';
+		print $object->getNomUrl(1);
+		if (isValidEmail($object->email))
+		{
+			print ' &lt;'.$object->email.'&gt;';
+		} else {
+			$langs->load("errors");
+			print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $object->email);
+		}
+		print '</td>';
+		print '<td>';
+		print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$form->selectarray("actionid", $actions, '', 1);
+		print '</td>';
+		print '<td>';
+		$type = array('email'=>$langs->trans("EMail"));
+		print $form->selectarray("typeid", $type);
+		print '</td>';
+		print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
+		print '</tr>';
+	} else {
+		print '<tr class="oddeven"><td colspan="4">';
+		print $langs->trans("YouMustAssignUserMailFirst");
+		print '</td></tr>';
+	}
 
-    print '</table>';
+	print '</table>';
 
-    print '</form>';
-    print '<br>';
+	print '</form>';
+	print '<br>';
 
-    // List of notifications enabled for contacts
-    $sql = "SELECT n.rowid, n.type,";
-    $sql .= " a.code, a.label,";
-    $sql .= " c.rowid as userid, c.lastname, c.firstname, c.email";
-    $sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
-    $sql .= " ".MAIN_DB_PREFIX."notify_def as n,";
-    $sql .= " ".MAIN_DB_PREFIX."user c";
-    $sql .= " WHERE a.rowid = n.fk_action";
-    $sql .= " AND c.rowid = n.fk_user";
-    $sql .= " AND c.rowid = ".$object->id;
+	// List of notifications enabled for contacts
+	$sql = "SELECT n.rowid, n.type,";
+	$sql .= " a.code, a.label,";
+	$sql .= " c.rowid as userid, c.lastname, c.firstname, c.email";
+	$sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
+	$sql .= " ".MAIN_DB_PREFIX."notify_def as n,";
+	$sql .= " ".MAIN_DB_PREFIX."user c";
+	$sql .= " WHERE a.rowid = n.fk_action";
+	$sql .= " AND c.rowid = n.fk_user";
+	$sql .= " AND c.rowid = ".$object->id;
 
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-    } else {
-        dol_print_error($db);
-    }
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+	} else {
+		dol_print_error($db);
+	}
 
-    // List of active notifications
-    print load_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')', '', '');
+	// List of active notifications
+	print load_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')', '', '');
 
-    // Line with titles
-    print '<table width="100%" class="noborder">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
-    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
-    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
-    print_liste_field_titre('', '', '');
-    print '</tr>';
+	// Line with titles
+	print '<table width="100%" class="noborder">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
+	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
+	print_liste_field_titre('', '', '');
+	print '</tr>';
 
 	$langs->load("errors");
 	$langs->load("other");
 
-    if ($num)
-    {
-        $i = 0;
+	if ($num)
+	{
+		$i = 0;
 
-        $userstatic = new user($db);
+		$userstatic = new user($db);
 
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($resql);
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
 
-            $userstatic->id = $obj->userid;
-            $userstatic->lastname = $obj->lastname;
-            $userstatic->firstname = $obj->firstname;
-            print '<tr class="oddeven"><td>'.$userstatic->getNomUrl(1);
-            if ($obj->type == 'email')
-            {
-                if (isValidEmail($obj->email))
-                {
-                    print ' &lt;'.$obj->email.'&gt;';
-                } else {
-                    $langs->load("errors");
-                    print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email);
-                }
-            }
-            print '</td>';
-            print '<td>';
-            $label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
-            print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$label;
-            print '</td>';
-            print '<td>';
-            if ($obj->type == 'email') print $langs->trans("Email");
-            if ($obj->type == 'sms') print $langs->trans("SMS");
-            print '</td>';
-            print '<td class="right"><a href="card.php?id='.$id.'&amp;action=delete&amp;token='.newToken().'&amp;actid='.$obj->rowid.'">'.img_delete().'</a></td>';
-            print '</tr>';
-            $i++;
-        }
-        $db->free($resql);
+			$userstatic->id = $obj->userid;
+			$userstatic->lastname = $obj->lastname;
+			$userstatic->firstname = $obj->firstname;
+			print '<tr class="oddeven"><td>'.$userstatic->getNomUrl(1);
+			if ($obj->type == 'email')
+			{
+				if (isValidEmail($obj->email))
+				{
+					print ' &lt;'.$obj->email.'&gt;';
+				} else {
+					$langs->load("errors");
+					print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email);
+				}
+			}
+			print '</td>';
+			print '<td>';
+			$label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
+			print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$label;
+			print '</td>';
+			print '<td>';
+			if ($obj->type == 'email') print $langs->trans("Email");
+			if ($obj->type == 'sms') print $langs->trans("SMS");
+			print '</td>';
+			print '<td class="right"><a href="card.php?id='.$id.'&amp;action=delete&amp;token='.newToken().'&amp;actid='.$obj->rowid.'">'.img_delete().'</a></td>';
+			print '</tr>';
+			$i++;
+		}
+		$db->free($resql);
 	}
 
-    // List of notifications enabled for fixed email
-    /*
+	// List of notifications enabled for fixed email
+	/*
     foreach($conf->global as $key => $val)
     {
     	if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_(.*)/', $key, $reg)) continue;
@@ -362,7 +362,7 @@ if ($result > 0)
 		print '<td class="right">'.$langs->trans("SeeModuleSetup", $langs->transnoentitiesnoconv("Module600Name")).'</td>';
 		print '</tr>';
     }*/
-    /*if ($user->admin)
+	/*if ($user->admin)
     {
 	    $var = ! $var;
 		print '<tr class="oddeven"><td colspan="4">';
@@ -370,104 +370,104 @@ if ($result > 0)
 		print '</td></tr>';
     }*/
 
-    print '</table>';
+	print '</table>';
 
 
-    print '<br><br>'."\n";
+	print '<br><br>'."\n";
 
 
-    // List
-    $sql = "SELECT n.rowid, n.daten, n.email, n.objet_type as object_type, n.objet_id as object_id, n.type,";
-    $sql .= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";
-    $sql .= " a.code, a.label";
-    $sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
-    $sql .= " ".MAIN_DB_PREFIX."notify as n";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as c ON n.fk_user = c.rowid";
-    $sql .= " WHERE a.rowid = n.fk_action";
-    $sql .= " AND n.fk_user = ".$object->id;
-    $sql .= $db->order($sortfield, $sortorder);
+	// List
+	$sql = "SELECT n.rowid, n.daten, n.email, n.objet_type as object_type, n.objet_id as object_id, n.type,";
+	$sql .= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";
+	$sql .= " a.code, a.label";
+	$sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
+	$sql .= " ".MAIN_DB_PREFIX."notify as n";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as c ON n.fk_user = c.rowid";
+	$sql .= " WHERE a.rowid = n.fk_action";
+	$sql .= " AND n.fk_user = ".$object->id;
+	$sql .= $db->order($sortfield, $sortorder);
 
-    // Count total nb of records
-    $nbtotalofrecords = '';
-    if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-    {
-        $result = $db->query($sql);
-        $nbtotalofrecords = $db->num_rows($result);
-        if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-        {
-        	$page = 0;
-        	$offset = 0;
-        }
-    }
+	// Count total nb of records
+	$nbtotalofrecords = '';
+	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+	{
+		$result = $db->query($sql);
+		$nbtotalofrecords = $db->num_rows($result);
+		if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+		{
+			$page = 0;
+			$offset = 0;
+		}
+	}
 
-    $sql .= $db->plimit($limit + 1, $offset);
+	$sql .= $db->plimit($limit + 1, $offset);
 
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-    } else {
-        dol_print_error($db);
-    }
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+	} else {
+		dol_print_error($db);
+	}
 
-    $param = '&id='.$object->id;
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+	$param = '&id='.$object->id;
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
-    print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
-    print '<input type="hidden" name="id" value="'.$object->id.'">';
+	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-    // List of notifications done
-    print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
+	// List of notifications done
+	print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
 
-    // Line with titles
-    print '<table width="100%" class="noborder">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '', $sortfield, $sortorder);
-    //print_liste_field_titre("Object",$_SERVER["PHP_SELF"],"",'',$param,'"',$sortfield,$sortorder);
-    print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "n.daten", '', $param, '', $sortfield, $sortorder, 'right ');
-    print '</tr>';
+	// Line with titles
+	print '<table width="100%" class="noborder">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '', $sortfield, $sortorder);
+	//print_liste_field_titre("Object",$_SERVER["PHP_SELF"],"",'',$param,'"',$sortfield,$sortorder);
+	print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "n.daten", '', $param, '', $sortfield, $sortorder, 'right ');
+	print '</tr>';
 
-    if ($num)
-    {
-        $i = 0;
+	if ($num)
+	{
+		$i = 0;
 
-        $userstatic = new User($db);
+		$userstatic = new User($db);
 
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($resql);
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
 
-            print '<tr class="oddeven"><td>';
-            if ($obj->id > 0)
-            {
-	            $userstatic->id = $obj->id;
-	            $userstatic->lastname = $obj->lastname;
-	            $userstatic->firstname = $obj->firstname;
-	            print $userstatic->getNomUrl(1);
-	            print $obj->email ? ' &lt;'.$obj->email.'&gt;' : $langs->trans("NoMail");
-            } else {
+			print '<tr class="oddeven"><td>';
+			if ($obj->id > 0)
+			{
+				$userstatic->id = $obj->id;
+				$userstatic->lastname = $obj->lastname;
+				$userstatic->firstname = $obj->firstname;
+				print $userstatic->getNomUrl(1);
+				print $obj->email ? ' &lt;'.$obj->email.'&gt;' : $langs->trans("NoMail");
+			} else {
 				print $obj->email;
-            }
-            print '</td>';
-            print '<td>';
-            $label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
-            print $label;
-            print '</td>';
-            print '<td>';
-            if ($obj->type == 'email') print $langs->trans("Email");
-            if ($obj->type == 'sms') print $langs->trans("Sms");
-            print '</td>';
-            // TODO Add link to object here for other types
-            /*print '<td>';
+			}
+			print '</td>';
+			print '<td>';
+			$label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
+			print $label;
+			print '</td>';
+			print '<td>';
+			if ($obj->type == 'email') print $langs->trans("Email");
+			if ($obj->type == 'sms') print $langs->trans("Sms");
+			print '</td>';
+			// TODO Add link to object here for other types
+			/*print '<td>';
             if ($obj->object_type == 'order')
             {
 				$orderstatic->id=$obj->object_id;
@@ -475,19 +475,19 @@ if ($result > 0)
 				print $orderstatic->getNomUrl(1);
             }
            	print '</td>';*/
-            // print
-            print'<td class="right">'.dol_print_date($db->jdate($obj->daten), 'dayhour').'</td>';
-            print '</tr>';
-            $i++;
-        }
-        $db->free($resql);
-    } else {
-    	print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
-    }
+			// print
+			print'<td class="right">'.dol_print_date($db->jdate($obj->daten), 'dayhour').'</td>';
+			print '</tr>';
+			$i++;
+		}
+		$db->free($resql);
+	} else {
+		print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
+	}
 
-    print '</table>';
+	print '</table>';
 
-    print '</form>';
+	print '</form>';
 } else dol_print_error('', 'RecordNotFound');
 
 // End of page
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index b331e6c1cc2..52f7a28be44 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -198,7 +198,7 @@ if ($action == 'edit')
 
 if ($action == 'edit')
 {
-	dol_fiche_head($head, 'guisetup', $title, -1, 'user');
+	print dol_get_fiche_head($head, 'guisetup', $title, -1, 'user');
 
 	$linkback = '';
 
@@ -316,16 +316,16 @@ if ($action == 'edit')
 	// Theme
 	showSkins($object, (($user->admin || empty($dolibarr_main_demo)) ? 1 : 0), true);
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	print '<div class="center">';
-	print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+	print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 } else {
-	dol_fiche_head($head, 'guisetup', $title, -1, 'user');
+	print dol_get_fiche_head($head, 'guisetup', $title, -1, 'user');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -386,7 +386,7 @@ if ($action == 'edit')
 	// Skin
 	showSkins($object, 0, true);
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	print '<div class="tabsAction">';
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 96497492a15..15df6371891 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -37,8 +37,8 @@ $langs->loadLangs(array('errors', 'users', 'companies', 'ldap', 'other'));
 // Security check
 if (!empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK))
 {
-    header("Location: ".DOL_URL_ROOT.'/');
-    exit;
+	header("Location: ".DOL_URL_ROOT.'/');
+	exit;
 }
 
 $action = GETPOST('action', 'aZ09');
@@ -64,86 +64,94 @@ if (GETPOST('dol_use_jmobile', 'alpha') || !empty($_SESSION['dol_use_jmobile']))
  * Actions
  */
 
-// Validate new password
-if ($action == 'validatenewpassword' && $username && $passwordhash)
-{
-    $edituser = new User($db);
-    $result = $edituser->fetch('', $_GET["username"]);
-    if ($result < 0)
-    {
-        $message = '<div class="error">'.$langs->trans("ErrorLoginDoesNotExists", $username).'</div>';
-    } else {
-        if (dol_verifyHash($edituser->pass_temp, $passwordhash))
-        {
-        	// Clear session
-        	unset($_SESSION['dol_login']);
-        	$_SESSION['dol_loginmesg'] = $langs->trans('NewPasswordValidated');	// Save message for the session page
+$parameters = array('username' => $username);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+    $message = $hookmanager->error;
+}
 
-        	$newpassword = $edituser->setPassword($user, $edituser->pass_temp, 0);
-            dol_syslog("passwordforgotten.php new password for user->id=".$edituser->id." validated in database");
-            header("Location: ".DOL_URL_ROOT.'/');
-            exit;
+if (empty($reshook)) {
+    // Validate new password
+    if ($action == 'validatenewpassword' && $username && $passwordhash)
+    {
+        $edituser = new User($db);
+        $result = $edituser->fetch('', $_GET["username"]);
+        if ($result < 0)
+        {
+            $message = '<div class="error">'.dol_escape_htmltag($langs->trans("ErrorLoginDoesNotExists", $username)).'</div>';
         } else {
-        	$langs->load("errors");
-            $message = '<div class="error">'.$langs->trans("ErrorFailedToValidatePasswordReset").'</div>';
+            if (dol_verifyHash($edituser->pass_temp, $passwordhash))
+            {
+                // Clear session
+                unset($_SESSION['dol_login']);
+                $_SESSION['dol_loginmesg'] = $langs->trans('NewPasswordValidated'); // Save message for the session page
+
+                $newpassword = $edituser->setPassword($user, $edituser->pass_temp, 0);
+                dol_syslog("passwordforgotten.php new password for user->id=".$edituser->id." validated in database");
+                header("Location: ".DOL_URL_ROOT.'/');
+                exit;
+            } else {
+                $langs->load("errors");
+                $message = '<div class="error">'.$langs->trans("ErrorFailedToValidatePasswordReset").'</div>';
+            }
         }
     }
-}
-// Action modif mot de passe
-if ($action == 'buildnewpassword' && $username)
-{
-    $sessionkey = 'dol_antispam_value';
-    $ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
-
-    // Verify code
-    if (!$ok)
+    // Action modif mot de passe
+    if ($action == 'buildnewpassword' && $username)
     {
-        $message = '<div class="error">'.$langs->trans("ErrorBadValueForCode").'</div>';
-    } else {
-    	$isanemail = preg_match('/@/', $username);
+        $sessionkey = 'dol_antispam_value';
+        $ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
 
-        $edituser = new User($db);
-        $result = $edituser->fetch('', $username, '', 1);
-        if ($result == 0 && $isanemail)
+        // Verify code
+        if (!$ok)
         {
-        	$result = $edituser->fetch('', '', '', 1, -1, $username);
-        }
-
-        if ($result <= 0 && $edituser->error == 'USERNOTFOUND')
-        {
-        	$message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">';
-        	if (! $isanemail) {
-        		$message .= $langs->trans("IfLoginExistPasswordRequestSent");
-        	} else {
-            	$message .= $langs->trans("IfEmailExistPasswordRequestSent");
-        	}
-        	$message .= '</div>';
-            $username = '';
+            $message = '<div class="error">'.$langs->trans("ErrorBadValueForCode").'</div>';
         } else {
-            if (!$edituser->email)
+            $isanemail = preg_match('/@/', $username);
+
+            $edituser = new User($db);
+            $result = $edituser->fetch('', $username, '', 1);
+            if ($result == 0 && $isanemail)
             {
-                $message = '<div class="error">'.$langs->trans("ErrorLoginHasNoEmail").'</div>';
-            } else {
-                $newpassword = $edituser->setPassword($user, '', 1);
-                if ($newpassword < 0)
-                {
-                    // Failed
-                    $message = '<div class="error">'.$langs->trans("ErrorFailedToChangePassword").'</div>';
+                $result = $edituser->fetch('', '', '', 1, -1, $username);
+            }
+
+            if ($result <= 0 && $edituser->error == 'USERNOTFOUND')
+            {
+                $message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">';
+                if (!$isanemail) {
+                    $message .= $langs->trans("IfLoginExistPasswordRequestSent");
                 } else {
-                    // Success
-                    if ($edituser->send_password($user, $newpassword, 1) > 0)
+                    $message .= $langs->trans("IfEmailExistPasswordRequestSent");
+                }
+                $message .= '</div>';
+                $username = '';
+            } else {
+                if (!$edituser->email)
+                {
+                    $message = '<div class="error">'.$langs->trans("ErrorLoginHasNoEmail").'</div>';
+                } else {
+                    $newpassword = $edituser->setPassword($user, '', 1);
+                    if ($newpassword < 0)
                     {
-                    	$message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">';
-                    	if (! $isanemail) {
-                    		$message .= $langs->trans("IfLoginExistPasswordRequestSent");
-                    	} else {
-                    		$message .= $langs->trans("IfEmailExistPasswordRequestSent");
-                    	}
-                    	//$message .= $langs->trans("PasswordChangeRequestSent", $edituser->login, dolObfuscateEmail($edituser->email));
-                    	$message .= '</div>';
-                        $username = '';
+                        // Failed
+                        $message = '<div class="error">'.$langs->trans("ErrorFailedToChangePassword").'</div>';
                     } else {
-                        $message .= '<div class="error">'.$edituser->error.'</div>';
+                        // Success
+                        if ($edituser->send_password($user, $newpassword, 1) > 0)
+                        {
+                            $message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">';
+                            if (!$isanemail) {
+                                $message .= $langs->trans("IfLoginExistPasswordRequestSent");
+                            } else {
+                                $message .= $langs->trans("IfEmailExistPasswordRequestSent");
+                            }
+                            //$message .= $langs->trans("PasswordChangeRequestSent", $edituser->login, dolObfuscateEmail($edituser->email));
+                            $message .= '</div>';
+                            $username = '';
+                        } else {
+                            $message .= '<div class="error">'.$edituser->error.'</div>';
+                        }
                     }
                 }
             }
@@ -165,9 +173,9 @@ if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = $conf->global->MAIN_
 // Select templates
 if (file_exists(DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/passwordforgotten.tpl.php"))
 {
-    $template_dir = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/";
+	$template_dir = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/";
 } else {
-    $template_dir = DOL_DOCUMENT_ROOT."/core/tpl/";
+	$template_dir = DOL_DOCUMENT_ROOT."/core/tpl/";
 }
 
 if (!$username) $focus_element = 'username';
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 7672a3d8dbb..b058bae9743 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -26,7 +26,7 @@
  *		\brief		Page to set permission of a user record
  */
 
-if (! defined('CSRFCHECK_WITH_TOKEN')) define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+if (!defined('CSRFCHECK_WITH_TOKEN')) define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
@@ -142,7 +142,7 @@ llxHeader('', $langs->trans("Permissions"));
 $head = user_prepare_head($object);
 
 $title = $langs->trans("User");
-dol_fiche_head($head, 'rights', $title, -1, 'user');
+print dol_get_fiche_head($head, 'rights', $title, -1, 'user');
 
 
 $db->begin();
@@ -458,7 +458,7 @@ $reshook = $hookmanager->executeHooks('insertExtraFooter', $parameters, $object,
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/user/vcard.php b/htdocs/user/vcard.php
index 5d99a4a9e89..6cdcd04417f 100644
--- a/htdocs/user/vcard.php
+++ b/htdocs/user/vcard.php
@@ -40,8 +40,6 @@ if ($user->socid > 0) $socid = $user->socid;
 $feature2 = 'user';
 $result = restrictedArea($user, 'user', $id, 'user', $feature2);
 
-if ($user->id <> $id && !$canreaduser) accessforbidden();
-
 
 $result = $user2->fetch($id);
 if ($result <= 0)
@@ -63,7 +61,7 @@ $v = new vCard();
 $v->setProdId('Dolibarr '.DOL_VERSION);
 
 $v->setUid('DOLIBARR-USERID-'.$user2->id);
-$v->setName($user2->lastname, $user2->firstname, "", $user2->civility, "");
+$v->setName($user2->lastname, $user2->firstname, "", $user2->civility_code, "");
 $v->setFormattedName($user2->getFullName($langs, 1));
 
 $v->setPhoneNumber($user2->phone_pro, "TYPE=WORK;VOICE");
@@ -71,7 +69,7 @@ $v->setPhoneNumber($user2->phone_pro, "TYPE=WORK;VOICE");
 $v->setPhoneNumber($user2->phone_mobile, "TYPE=CELL;VOICE");
 $v->setPhoneNumber($user2->fax, "TYPE=WORK;FAX");
 
-$country = $user2->country_code ? $user2->country : '' ;
+$country = $user2->country_code ? $user2->country : '';
 
 $v->setAddress("", "", $user2->address, $user2->town, $user2->state, $user2->zip, $country, "TYPE=WORK;POSTAL");
 $v->setLabel("", "", $user2->address, $user2->town, $user2->state, $user2->zip, $country, "TYPE=WORK");
@@ -84,9 +82,9 @@ $v->setTitle($user2->poste);
 if ($company->id)
 {
 	$v->setURL($company->url, "TYPE=WORK");
-	if (! $user2->phone_pro) $v->setPhoneNumber($company->phone, "TYPE=WORK;VOICE");
-	if (! $user2->fax)       $v->setPhoneNumber($company->fax, "TYPE=WORK;FAX");
-	if (! $user2->zip)       $v->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "TYPE=WORK;POSTAL");
+	if (!$user2->phone_pro) $v->setPhoneNumber($company->phone, "TYPE=WORK;VOICE");
+	if (!$user2->fax)       $v->setPhoneNumber($company->fax, "TYPE=WORK;FAX");
+	if (!$user2->zip)       $v->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "TYPE=WORK;POSTAL");
 
 	// when company e-mail is empty, use only user e-mail
 	if (empty(trim($company->email)))
@@ -128,7 +126,7 @@ $db->close();
 
 $output = $v->getVCard();
 
-$filename = trim(urldecode($v->getFileName()));      // "Nom prenom.vcf"
+$filename = trim(urldecode($v->getFileName())); // "Nom prenom.vcf"
 $filenameurlencoded = dol_sanitizeFileName(urlencode($filename));
 //$filename = dol_sanitizeFileName($filename);
 
diff --git a/htdocs/variants/admin/admin.php b/htdocs/variants/admin/admin.php
index d97211d46bf..64209076916 100644
--- a/htdocs/variants/admin/admin.php
+++ b/htdocs/variants/admin/admin.php
@@ -22,53 +22,69 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 
 $langs->loadLangs(array("admin", "products"));
 
+$action = GETPOST('action', 'alphanohtml');
+
 // Security check
 if (!$user->admin || (empty($conf->product->enabled) && empty($conf->service->enabled)))
 	accessforbidden();
 
-if ($_POST) {
+$error = 0;
+
+
+/*
+ * Actions
+ */
+
+if ($action) {
 	$value = GETPOST('PRODUIT_ATTRIBUTES_HIDECHILD');
 
-	if (dolibarr_set_const($db, 'PRODUIT_ATTRIBUTES_HIDECHILD', $value, 'chaine', 0, '', $conf->entity)) {
-		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
-	} else {
+	if (!dolibarr_set_const($db, 'PRODUIT_ATTRIBUTES_HIDECHILD', $value, 'chaine', 0, '', $conf->entity)) {
 		setEventMessages($langs->trans('CoreErrorMessage'), null, 'errors');
+		$error++;
 	}
 
-    if (dolibarr_set_const($db, 'PRODUIT_ATTRIBUTES_SEPARATOR', GETPOST('PRODUIT_ATTRIBUTES_SEPARATOR'), 'chaine', 0, '', $conf->entity)) {
-        setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans('CoreErrorMessage'), null, 'errors');
-    }
+	if (!dolibarr_set_const($db, 'PRODUIT_ATTRIBUTES_SEPARATOR', GETPOST('PRODUIT_ATTRIBUTES_SEPARATOR'), 'chaine', 0, '', $conf->entity)) {
+		setEventMessages($langs->trans('CoreErrorMessage'), null, 'errors');
+		$error++;
+	}
+
+	if (!$error) {
+		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+	}
 }
 
-$title = $langs->trans('ModuleSetup').' '.$langs->trans('ProductAttributes');
+$title = $langs->trans('ModuleSetup').' '.$langs->trans('Module610Name');
 llxHeader('', $title);
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($title, $linkback, 'title_setup');
 
-dol_fiche_head(array(), 'general', $tab, 0, 'product');
-
 print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update">';
 
 print '<table class="noborder centpercent">';
+
 print '<tr class="liste_titre">';
-print '<th>'.$langs->trans("Parameters").'</td>'."\n";
-print '<th class="right" width="60">'.$langs->trans("Value").'</td>'."\n";
-print '<th width="80">&nbsp;</td></tr>'."\n";
+print '<th>'.$langs->trans("Parameters").'</th>'."\n";
+print '<th class="right" width="60">'.$langs->trans("Value").'</th>'."\n";
+print '</tr>'."\n";
+
 print '<tr class="oddeven"><td>'.$langs->trans('HideProductCombinations').'</td><td>';
 print $form->selectyesno("PRODUIT_ATTRIBUTES_HIDECHILD", $conf->global->PRODUIT_ATTRIBUTES_HIDECHILD, 1).'</td></tr>';
+
 print '<tr class="oddeven"><td>'.$langs->trans('CombinationsSeparator').'</td>';
 if (isset($conf->global->PRODUIT_ATTRIBUTES_SEPARATOR)) {
-    $separator = $conf->global->PRODUIT_ATTRIBUTES_SEPARATOR;
+	$separator = $conf->global->PRODUIT_ATTRIBUTES_SEPARATOR;
 } else {
-    $separator = "_";
+	$separator = "_";
 }
 print '<td class="right"><input size="3" type="text" class="flat" name="PRODUIT_ATTRIBUTES_SEPARATOR" value="'.$separator.'"></td></tr>';
+
 print '</table>';
-print '<br><div class="center"><input type="submit" value="'.$langs->trans('Save').'" class="button"></div>';
+
+print '<br><div class="center"><input type="submit" value="'.$langs->trans("Save").'" class="button button-save"></div>';
+
 print '</form>';
 
 // End of page
diff --git a/htdocs/variants/ajax/getCombinations.php b/htdocs/variants/ajax/getCombinations.php
index c0bf58baa62..67c1dd4284c 100644
--- a/htdocs/variants/ajax/getCombinations.php
+++ b/htdocs/variants/ajax/getCombinations.php
@@ -31,18 +31,18 @@ header('Content-Type: application/json');
 $id = GETPOST('id', 'int');
 
 if (!$id) {
-    print json_encode(array(
-        'error' => 'ID not set'
-    ));
-    exit();
+	print json_encode(array(
+		'error' => 'ID not set'
+	));
+	exit();
 }
 
 $product = new Product($db);
 
 if ($product->fetch($id) < 0) {
-    print json_encode(array(
-        'error' => 'Product not found'
-    ));
+	print json_encode(array(
+		'error' => 'Product not found'
+	));
 }
 
 $prodcomb = new ProductCombination($db);
diff --git a/htdocs/variants/ajax/get_attribute_values.php b/htdocs/variants/ajax/get_attribute_values.php
index defc85c1e91..e80cb9aae2b 100644
--- a/htdocs/variants/ajax/get_attribute_values.php
+++ b/htdocs/variants/ajax/get_attribute_values.php
@@ -31,19 +31,19 @@ header('Content-Type: application/json');
 $id = GETPOST('id', 'int');
 
 if (!$id) {
-    print json_encode(array(
-        'error' => 'ID not set'
-    ));
-    exit();
+	print json_encode(array(
+		'error' => 'ID not set'
+	));
+	exit();
 }
 
 $prodattr = new ProductAttribute($db);
 
 if ($prodattr->fetch($id) < 0) {
-    print json_encode(array(
-        'error' => 'Attribute not found'
-    ));
-    exit();
+	print json_encode(array(
+		'error' => 'Attribute not found'
+	));
+	exit();
 }
 
 $prodattrval = new ProductAttributeValue($db);
@@ -51,10 +51,10 @@ $prodattrval = new ProductAttributeValue($db);
 $res = $prodattrval->fetchAllByProductAttribute($id);
 
 if ($res == -1) {
-    print json_encode(array(
-        'error' => 'Internal error'
-    ));
-    exit();
+	print json_encode(array(
+		'error' => 'Internal error'
+	));
+	exit();
 }
 
 print json_encode($res);
diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php
index c1bbc6fe6e2..6cda745056a 100644
--- a/htdocs/variants/card.php
+++ b/htdocs/variants/card.php
@@ -43,7 +43,7 @@ if ($object->fetch($id) < 1) {
 
 if ($cancel) $action = '';
 
-if ($_POST) {
+if ($action) {
 	if ($action == 'edit') {
 		$object->ref = $ref;
 		$object->label = $label;
@@ -136,16 +136,16 @@ $head[$h][1] = $langs->trans("ProductAttributeName");
 $head[$h][2] = 'variant';
 $h++;
 
-dol_fiche_head($head, 'variant', $langs->trans('ProductAttributeName'), -1, 'generic');
+print dol_get_fiche_head($head, 'variant', $langs->trans('ProductAttributeName'), -1, 'generic');
 
 if ($action == 'edit') {
-    print '<form method="POST">';
+	print '<form method="POST">';
 }
 
 
 if ($action != 'edit') {
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 }
 print '<table class="border centpercent tableforfield">';
 print '<tr>';
@@ -173,17 +173,17 @@ print '</table>';
 
 
 if ($action != 'edit') {
-    print '</div>';
+	print '</div>';
 }
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 if ($action == 'edit') {
 	print '<div style="text-align: center;">';
 	print '<div class="inline-block divButAction">';
-	print '<input type="submit" class="button" value="'.$langs->trans('Save').'">';
+	print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 	print '&nbsp; &nbsp;';
-	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 	print '</div></form>';
 } else {
@@ -252,9 +252,9 @@ if ($action == 'edit') {
 				<td><input type="text" name="ref" value="<?php echo $attrval->ref ?>"></td>
 				<td><input type="text" name="value" value="<?php echo $attrval->value ?>"></td>
 				<td class="right">
-					<input type="submit" value="<?php echo $langs->trans('Save') ?>" class="button">
+					<input type="submit" value="<?php echo $langs->trans("Save") ?>" class="button button-save">
 					&nbsp; &nbsp;
-					<input type="submit" name="cancel" value="<?php echo $langs->trans('Cancel') ?>" class="button">
+					<input type="submit" name="cancel" value="<?php echo $langs->trans("Cancel") ?>" class="button button-cancel">
 				</td>
 			<?php
 		} else {
diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index 721d31ef3ca..9152336bbe4 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -78,10 +78,10 @@ class ProductCombination
 	public $combination_price_levels;
 
 	/**
-     * External ref
-     * @var string
-     */
-    public $variation_ref_ext = '';
+	 * External ref
+	 * @var string
+	 */
+	public $variation_ref_ext = '';
 
 	/**
 	 * Constructor
@@ -126,7 +126,7 @@ class ProductCombination
 		$this->variation_price = $obj->variation_price;
 		$this->variation_price_percentage = $obj->variation_price_percentage;
 		$this->variation_weight = $obj->variation_weight;
-        $this->variation_ref_ext = $obj->variation_ref_ext;
+		$this->variation_ref_ext = $obj->variation_ref_ext;
 
 		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
 			$this->fetchCombinationPriceLevels();
@@ -301,7 +301,7 @@ class ProductCombination
 			$tmp->variation_price = $result->variation_price;
 			$tmp->variation_price_percentage = $result->variation_price_percentage;
 			$tmp->variation_weight = $result->variation_weight;
-            $tmp->variation_ref_ext = $result->variation_ref_ext;
+			$tmp->variation_ref_ext = $result->variation_ref_ext;
 
 			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
 				$tmp->fetchCombinationPriceLevels();
@@ -383,7 +383,7 @@ class ProductCombination
 		$sql .= " SET fk_product_parent = ".(int) $this->fk_product_parent.", fk_product_child = ".(int) $this->fk_product_child.",";
 		$sql .= " variation_price = ".(float) $this->variation_price.", variation_price_percentage = ".(int) $this->variation_price_percentage.",";
 		$sql .= " variation_ref_ext = '".$this->db->escape($this->variation_ref_ext)."',";
-        $sql .= " variation_weight = ".(float) $this->variation_weight." WHERE rowid = ".((int) $this->id);
+		$sql .= " variation_weight = ".(float) $this->variation_weight." WHERE rowid = ".((int) $this->id);
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
@@ -671,7 +671,7 @@ class ProductCombination
 	 * @param bool|float 	$forced_pricevar 	If the price variation is forced
 	 * @param bool|float 	$forced_weightvar 	If the weight variation is forced
 	 * @param bool|string 	$forced_refvar 		If the reference is forced
-     * @param string 	    $ref_ext            External reference
+	 * @param string 	    $ref_ext            External reference
 	 * @return int 								<0 KO, >0 OK
 	 */
 	public function createProductCombination(User $user, Product $product, array $combinations, array $variations, $price_var_percent = false, $forced_pricevar = false, $forced_weightvar = false, $forced_refvar = false, $ref_ext = '')
@@ -790,7 +790,7 @@ class ProductCombination
 		$newcomb->variation_price_percentage = $price_var_percent;
 		$newcomb->variation_price = $price_impact[1];
 		$newcomb->variation_weight = $weight_impact;
-        $newcomb->variation_ref_ext = $this->db->escape($ref_ext);
+		$newcomb->variation_ref_ext = $this->db->escape($ref_ext);
 
 		// Init price level
 		if ($conf->global->PRODUIT_MULTIPRICES) {
diff --git a/htdocs/variants/class/ProductCombination2ValuePair.class.php b/htdocs/variants/class/ProductCombination2ValuePair.class.php
index e8ebbf57afd..0d23910b703 100644
--- a/htdocs/variants/class/ProductCombination2ValuePair.class.php
+++ b/htdocs/variants/class/ProductCombination2ValuePair.class.php
@@ -52,15 +52,15 @@ class ProductCombination2ValuePair
 	 */
 	public $fk_prod_attr_val;
 
-    /**
-     * Constructor
-     *
-     * @param   DoliDB $db     Database handler
-     */
-    public function __construct(DoliDB $db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param   DoliDB $db     Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
+	}
 
 	/**
 	 * Translates this class to a human-readable string
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index c9835440103..3a2936d0df5 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -72,7 +72,7 @@ $selectedvariant = $_SESSION['addvariant_'.$object->id];
 
 if ($cancel) {
 	$action = '';
-	$massactions = '';
+	$massaction = '';
 	unset($_SESSION['addvariant_'.$object->id]);
 }
 
@@ -101,179 +101,177 @@ $prodcomb2val = new ProductCombination2ValuePair($db);
 
 $productCombination2ValuePairs1 = array();
 
-if ($_POST) {
-	if (($action == 'add' || $action == 'create') && empty($massaction) && !GETPOST('selectvariant', 'alpha'))	// We click on Create all defined combinations
-	{
-		//$features = GETPOST('features', 'array');
-		$features = $_SESSION['addvariant_'.$object->id];
+if (($action == 'add' || $action == 'create') && empty($massaction) && !GETPOST('selectvariant', 'alpha'))	// We click on Create all defined combinations
+{
+	//$features = GETPOST('features', 'array');
+	$features = $_SESSION['addvariant_'.$object->id];
 
-		if (!$features) {
-			setEventMessages($langs->trans('ErrorFieldsRequired'), null, 'errors');
-		} else {
-			$reference = trim($reference);
-			if (empty($reference)) {
-				$reference = false;
-			}
-			$weight_impact = price2num($weight_impact);
-			$price_impact = price2num($price_impact);
-
-			// for conf PRODUIT_MULTIPRICES
-			if ($conf->global->PRODUIT_MULTIPRICES) {
-				$level_price_impact = array_map('price2num', $level_price_impact);
-			}
-			else {
-				$level_price_impact = array(1 => $weight_impact);
-				$level_price_impact_percent = array(1 => $price_impact_percent);
-			}
-
-			$sanit_features = array();
-
-			//First, sanitize
-			foreach ($features as $feature) {
-				$explode = explode(':', $feature);
-
-				if ($prodattr->fetch($explode[0]) < 0) {
-					continue;
-				}
-
-				if ($prodattr_val->fetch($explode[1]) < 0) {
-					continue;
-				}
-
-				// Valuepair
-				$sanit_features[$explode[0]] = $explode[1];
-
-				$tmp = new ProductCombination2ValuePair($db);
-				$tmp->fk_prod_attr = $explode[0];
-				$tmp->fk_prod_attr_val = $explode[1];
-
-				$productCombination2ValuePairs1[] = $tmp;
-			}
-
-			$db->begin();
-
-			// sanit_feature is an array with 1 (and only 1) value per attribute.
-			// For example:  Color->blue, Size->Small, Option->2
-			//var_dump($sanit_features);
-			if (!$prodcomb->fetchByProductCombination2ValuePairs($id, $sanit_features))
-			{
-				$result = $prodcomb->createProductCombination($user, $object, $sanit_features, array(), $level_price_impact_percent, $level_price_impact, $weight_impact, $reference);
-				if ($result > 0)
-				{
-					setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
-					unset($_SESSION['addvariant_'.$object->id]);
-
-					$db->commit();
-					header('Location: '.dol_buildpath('/variants/combinations.php?id='.$id, 2));
-					exit();
-				} else {
-					$langs->load("errors");
-					setEventMessages($prodcomb->error, $prodcomb->errors, 'errors');
-				}
-			} else {
-				setEventMessages($langs->trans('ErrorRecordAlreadyExists'), null, 'errors');
-			}
-
-			$db->rollback();
+	if (!$features) {
+		setEventMessages($langs->trans('ErrorFieldsRequired'), null, 'errors');
+	} else {
+		$reference = trim($reference);
+		if (empty($reference)) {
+			$reference = false;
 		}
-	} elseif (!empty($massaction))
-	{
-		$bulkaction = $massaction;
-		$error = 0;
-
-
-
-		$db->begin();
-
-		foreach ($toselect as $prodid) {
-			// need create new of Product to prevent rename dir behavior
-			$prodstatic = new Product($db);
-
-			if ($prodstatic->fetch($prodid) < 0) {
-				continue;
-			}
-
-			if ($bulkaction == 'on_sell') {
-				$prodstatic->status = 1;
-				$res = $prodstatic->update($prodstatic->id, $user);
-			} elseif ($bulkaction == 'on_buy') {
-				$prodstatic->status_buy = 1;
-				$res = $prodstatic->update($prodstatic->id, $user);
-			} elseif ($bulkaction == 'not_sell') {
-				$prodstatic->status = 0;
-				$res = $prodstatic->update($prodstatic->id, $user);
-			} elseif ($bulkaction == 'not_buy') {
-				$prodstatic->status_buy = 0;
-				$res = $prodstatic->update($prodstatic->id, $user);
-			} elseif ($bulkaction == 'delete') {
-				$res = $prodstatic->delete($user, $prodstatic->id);
-			} else {
-				break;
-			}
-
-			if ($res <= 0) {
-				$error++;
-				break;
-			}
-		}
-
-		if ($error) {
-			$db->rollback();
-
-			if ($prodstatic->error) {
-				setEventMessages($prodstatic->error, $prodstatic->errors, 'errors');
-			} else {
-				setEventMessages($langs->trans('CoreErrorMessage'), null, 'errors');
-			}
-		} else {
-			$db->commit();
-			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
-		}
-	} elseif ($valueid > 0) {
-		if ($prodcomb->fetch($valueid) < 0) {
-			dol_print_error($db, $langs->trans('ErrorRecordNotFound'));
-			exit();
-		}
-
-		$prodcomb->variation_weight = $weight_impact;
+		$weight_impact = price2num($weight_impact);
+		$price_impact = price2num($price_impact);
 
 		// for conf PRODUIT_MULTIPRICES
 		if ($conf->global->PRODUIT_MULTIPRICES) {
 			$level_price_impact = array_map('price2num', $level_price_impact);
-
-			$prodcomb->variation_price = $level_price_impact[1];
-			$prodcomb->variation_price_percentage = (bool) $level_price_impact_percent[1];
 		}
 		else {
-			$level_price_impact = array(1 => $weight_impact);
+			$level_price_impact = array(1 => $price_impact);
 			$level_price_impact_percent = array(1 => $price_impact_percent);
-
-			$prodcomb->variation_price = $price_impact;
-			$prodcomb->variation_price_percentage = $price_impact_percent;
 		}
 
-		if ($conf->global->PRODUIT_MULTIPRICES) {
-			$prodcomb->combination_price_levels = array();
-			for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
-				$productCombinationLevel = new ProductCombinationLevel($db);
-				$productCombinationLevel->fk_product_attribute_combination = $prodcomb->id;
-				$productCombinationLevel->fk_price_level = $i;
-				$productCombinationLevel->variation_price = $level_price_impact[$i];
-				$productCombinationLevel->variation_price_percentage = (bool) $level_price_impact_percent[$i];
-				$prodcomb->combination_price_levels[$i] = $productCombinationLevel;
+		$sanit_features = array();
+
+		//First, sanitize
+		foreach ($features as $feature) {
+			$explode = explode(':', $feature);
+
+			if ($prodattr->fetch($explode[0]) < 0) {
+				continue;
 			}
+
+			if ($prodattr_val->fetch($explode[1]) < 0) {
+				continue;
+			}
+
+			// Valuepair
+			$sanit_features[$explode[0]] = $explode[1];
+
+			$tmp = new ProductCombination2ValuePair($db);
+			$tmp->fk_prod_attr = $explode[0];
+			$tmp->fk_prod_attr_val = $explode[1];
+
+			$productCombination2ValuePairs1[] = $tmp;
 		}
 
-		if ($prodcomb->update($user) > 0) {
-			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
-			header('Location: '.dol_buildpath('/variants/combinations.php?id='.$id, 2));
-			exit();
+		$db->begin();
+
+		// sanit_feature is an array with 1 (and only 1) value per attribute.
+		// For example:  Color->blue, Size->Small, Option->2
+		//var_dump($sanit_features);
+		if (!$prodcomb->fetchByProductCombination2ValuePairs($id, $sanit_features))
+		{
+			$result = $prodcomb->createProductCombination($user, $object, $sanit_features, array(), $level_price_impact_percent, $level_price_impact, $weight_impact, $reference);
+			if ($result > 0)
+			{
+				setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+				unset($_SESSION['addvariant_'.$object->id]);
+
+				$db->commit();
+				header('Location: '.dol_buildpath('/variants/combinations.php?id='.$id, 2));
+				exit();
+			} else {
+				$langs->load("errors");
+				setEventMessages($prodcomb->error, $prodcomb->errors, 'errors');
+			}
 		} else {
-			setEventMessages($prodcomb->error, $prodcomb->errors, 'errors');
+			setEventMessages($langs->trans('ErrorRecordAlreadyExists'), null, 'errors');
+		}
+
+		$db->rollback();
+	}
+} elseif (!empty($massaction)) {
+	$bulkaction = $massaction;
+	$error = 0;
+
+
+
+	$db->begin();
+
+	foreach ($toselect as $prodid) {
+		// need create new of Product to prevent rename dir behavior
+		$prodstatic = new Product($db);
+
+		if ($prodstatic->fetch($prodid) < 0) {
+			continue;
+		}
+
+		if ($bulkaction == 'on_sell') {
+			$prodstatic->status = 1;
+			$res = $prodstatic->update($prodstatic->id, $user);
+		} elseif ($bulkaction == 'on_buy') {
+			$prodstatic->status_buy = 1;
+			$res = $prodstatic->update($prodstatic->id, $user);
+		} elseif ($bulkaction == 'not_sell') {
+			$prodstatic->status = 0;
+			$res = $prodstatic->update($prodstatic->id, $user);
+		} elseif ($bulkaction == 'not_buy') {
+			$prodstatic->status_buy = 0;
+			$res = $prodstatic->update($prodstatic->id, $user);
+		} elseif ($bulkaction == 'delete') {
+			$res = $prodstatic->delete($user, $prodstatic->id);
+		} else {
+			break;
+		}
+
+		if ($res <= 0) {
+			$error++;
+			break;
 		}
 	}
+
+	if ($error) {
+		$db->rollback();
+
+		if ($prodstatic->error) {
+			setEventMessages($prodstatic->error, $prodstatic->errors, 'errors');
+		} else {
+			setEventMessages($langs->trans('CoreErrorMessage'), null, 'errors');
+		}
+	} else {
+		$db->commit();
+		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+	}
+} elseif ($valueid > 0) {
+	if ($prodcomb->fetch($valueid) < 0) {
+		dol_print_error($db, $langs->trans('ErrorRecordNotFound'));
+		exit();
+	}
+
+	$prodcomb->variation_weight = $weight_impact;
+
+	// for conf PRODUIT_MULTIPRICES
+	if ($conf->global->PRODUIT_MULTIPRICES) {
+		$level_price_impact = array_map('price2num', $level_price_impact);
+
+		$prodcomb->variation_price = $level_price_impact[1];
+		$prodcomb->variation_price_percentage = (bool) $level_price_impact_percent[1];
+	}
+	else {
+		$level_price_impact = array(1 => $price_impact);
+		$level_price_impact_percent = array(1 => $price_impact_percent);
+
+		$prodcomb->variation_price = $price_impact;
+		$prodcomb->variation_price_percentage = $price_impact_percent;
+	}
+
+	if ($conf->global->PRODUIT_MULTIPRICES) {
+		$prodcomb->combination_price_levels = array();
+		for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
+			$productCombinationLevel = new ProductCombinationLevel($db);
+			$productCombinationLevel->fk_product_attribute_combination = $prodcomb->id;
+			$productCombinationLevel->fk_price_level = $i;
+			$productCombinationLevel->variation_price = $level_price_impact[$i];
+			$productCombinationLevel->variation_price_percentage = (bool) $level_price_impact_percent[$i];
+			$prodcomb->combination_price_levels[$i] = $productCombinationLevel;
+		}
+	}
+
+	if ($prodcomb->update($user) > 0) {
+		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+		header('Location: '.dol_buildpath('/variants/combinations.php?id='.$id, 2));
+		exit();
+	} else {
+		setEventMessages($prodcomb->error, $prodcomb->errors, 'errors');
+	}
 }
 
+
 // Reload variants
 $productCombinations = $prodcomb->fetchAllByFkProductParent($object->id);
 
@@ -341,7 +339,7 @@ if (!empty($id) || !empty($ref))
 	$titre = $langs->trans("CardProduct".$object->type);
 	$picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
 
-	dol_fiche_head($head, 'combinations', $titre, -1, $picto);
+	print dol_get_fiche_head($head, 'combinations', $titre, -1, $picto);
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
 	$object->next_prev_filter = " fk_product_type = ".$object->type;
@@ -406,7 +404,7 @@ if (!empty($id) || !empty($ref))
 	print '</div>';
 	print '<div style="clear:both"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$listofvariantselected = '';
 
@@ -414,7 +412,7 @@ if (!empty($id) || !empty($ref))
 	if ($action == 'add' || ($action == 'edit')) {
 		if ($action == 'add') {
 			$title = $langs->trans('NewProductCombination');
-			// dol_fiche_head();
+			// print dol_get_fiche_head();
 			$features = $_SESSION['addvariant_'.$object->id];
 			//First, sanitize
 			$listofvariantselected = '<div id="parttoaddvariant">';
@@ -434,7 +432,7 @@ if (!empty($id) || !empty($ref))
 				}
 			}
 			$listofvariantselected .= '</div>';
-			//dol_fiche_end();
+			//print dol_get_fiche_end();
 		} else {
 			$title = $langs->trans('EditProductCombination');
 		}
@@ -539,7 +537,7 @@ if (!empty($id) || !empty($ref))
 			print '<input type="hidden" name="valueid" value="'.$valueid.'">'."\n";
 		}
 
-		dol_fiche_head();
+		print dol_get_fiche_head();
 
 
 		if ($action == 'add') {
@@ -699,13 +697,13 @@ if (!empty($id) || !empty($ref))
 			<?php
 		}
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 		?>
 
 		<div style="text-align: center">
-		<input type="submit" name="create" <?php if (!is_array($productCombination2ValuePairs1)) print ' disabled="disabled"'; ?> value="<?php echo $action == 'add' ? $langs->trans('Create') : $langs->trans('Save') ?>" class="button">
+		<input type="submit" name="create" <?php if (!is_array($productCombination2ValuePairs1)) print ' disabled="disabled"'; ?> value="<?php echo $action == 'add' ? $langs->trans('Create') : $langs->trans("Save") ?>" class="button button-save">
 		&nbsp;
-		<input type="submit" name="cancel" value="<?php echo $langs->trans('Cancel'); ?>" class="button">
+		<input type="submit" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>" class="button button-cancel">
 		</div>
 
 		<?php
@@ -772,11 +770,6 @@ if (!empty($id) || !empty($ref))
 			print '<a href="combinations.php?id='.$object->id.'&action=copy" class="butAction">'.$langs->trans('PropagateVariant').'</a>';
 		}
 
-		// Too much bugged page.
-		/*
-		print '<a href="generator.php?id='.$object->id.'" class="butAction">'.$langs->trans('ProductCombinationGenerator').'</a>';
-		*/
-
 		print '	</div>';
 
 		print '</div>';
diff --git a/htdocs/variants/create.php b/htdocs/variants/create.php
index c11f6b5f485..84530e01cb5 100644
--- a/htdocs/variants/create.php
+++ b/htdocs/variants/create.php
@@ -22,13 +22,14 @@ require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
 $ref = GETPOST('ref', 'alpha');
 $label = GETPOST('label', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
+$action = GETPOST('action', 'alpha');
 
 
 /*
  * Actions
  */
 
-if ($_POST) {
+if ($action == 'create') {
 	if (empty($ref) || empty($label)) {
 		setEventMessages($langs->trans('ErrorFieldsRequired'), null, 'errors');
 	} else {
@@ -65,7 +66,7 @@ llxHeader('', $title);
 
 print load_fiche_titre($title);
 
-dol_fiche_head();
+print dol_get_fiche_head();
 
 print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -89,7 +90,7 @@ print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	</table>
 
 <?php
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Create").'"></div>';
 
diff --git a/htdocs/variants/create_val.php b/htdocs/variants/create_val.php
index b5a57d514ae..b422df90120 100644
--- a/htdocs/variants/create_val.php
+++ b/htdocs/variants/create_val.php
@@ -87,7 +87,7 @@ $head[$h][1] = $langs->trans("ProductAttributeName");
 $head[$h][2] = 'variant';
 $h++;
 
-dol_fiche_head($head, 'variant', $langs->trans('ProductAttributeName'), -1, 'generic');
+print dol_get_fiche_head($head, 'variant', $langs->trans('ProductAttributeName'), -1, 'generic');
 
 print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';
@@ -106,7 +106,7 @@ print '<div class="underbanner clearboth"></div>';
 <?php
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<br>';
 
@@ -119,7 +119,7 @@ print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
 print load_fiche_titre($langs->trans('NewProductAttributeValue'));
 
-dol_fiche_head();
+print dol_get_fiche_head();
 
 ?>
 	<table class="border" style="width: 100%">
@@ -134,12 +134,12 @@ dol_fiche_head();
 	</table>
 <?php
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center">';
 print '<input type="submit" class="button" name="create" value="'.$langs->trans("Create").'">';
 print ' &nbsp; ';
-print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 print '</div>';
 
 print '</form>';
diff --git a/htdocs/variants/generator.php b/htdocs/variants/generator.php
deleted file mode 100644
index 6627ca6c7ad..00000000000
--- a/htdocs/variants/generator.php
+++ /dev/null
@@ -1,385 +0,0 @@
-<?php
-/* Copyright (C) 2016   Marcos García   <marcosgdf@gmail.com>
- * Copyright (C) 2018   Frédéric 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
-require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttributeValue.class.php';
-require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
-require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination2ValuePair.class.php';
-
-$langs->loadLangs(array("products", "other"));
-
-$id = GETPOST('id', 'int');
-$ref = GETPOST('ref');
-$form = new Form($db);
-
-// Security check
-$fieldvalue = (!empty($id) ? $id : $ref);
-$fieldtype = (!empty($ref) ? 'ref' : 'rowid');
-$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
-
-$prodattr = new ProductAttribute($db);
-$prodattrval = new ProductAttributeValue($db);
-$product = new Product($db);
-
-$product->fetch($id);
-
-$error = 0;
-
-
-/*
- * Actions
- */
-
-if (!$product->isProduct()) {
-	header('Location: '.dol_buildpath('/product/card.php?id='.$product->id, 2));
-	exit();
-}
-
-/**
- * Posible combinations. Format.
- * attrval => array(
- * 		valueid => array(
- * 			price => ''
- * 			weight => ''
- * 		)
- * )
- */
-$combinations = GETPOST('combinations', 'array');
-$price_var_percent = (bool) GETPOST('price_var_percent');
-$donotremove = true;
-
-if ($_POST)
-{
-	$donotremove = (bool) GETPOST('donotremove');
-
-	//We must check if all those given combinations actually exist
-	$sanitized_values = array();
-
-	foreach ($combinations as $attr => $val) {
-		if ($prodattr->fetch($attr) > 0) {
-			foreach ($val as $valueid => $content) {
-				if ($prodattrval->fetch($valueid) > 0) {
-					$sanitized_values[$attr][$valueid] = $content;
-				}
-			}
-		}
-	}
-
-	if ($sanitized_values) {
-		require DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-
-		$adapted_values = array();
-
-		//Adapt the array to the cartesian function
-		foreach ($sanitized_values as $attr => $val) {
-			$adapted_values[$attr] = array_keys($val);
-		}
-
-		$db->begin();
-
-		$combination = new ProductCombination($db);
-
-		$delete_prev_comb_res = 1;
-
-		if (!$donotremove) {
-			$delete_prev_comb_res = $combination->deleteByFkProductParent($user, $id);
-		}
-
-		//Current combinations will be deleted
-		if ($delete_prev_comb_res > 0) {
-			$res = 1;
-
-			$cartesianarray = cartesianArray($adapted_values);
-			foreach ($cartesianarray as $currcomb)
-			{
-				$res = $combination->createProductCombination($user, $product, $currcomb, $sanitized_values, $price_var_percent);
-				if ($res < 0) {
-				    $error++;
-				    setEventMessages($combination->error, $combination->errors, 'errors');
-				    break;
-				}
-			}
-
-			if ($res > 0) {
-				$db->commit();
-				setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
-				header('Location: '.dol_buildpath('/variants/combinations.php?id='.$id, 2));
-				exit;
-			}
-		} else {
-			setEventMessages($langs->trans('ErrorDeletingGeneratedProducts'), null, 'errors');
-		}
-
-		$db->rollback();
-	} else {
-		setEventMessages($langs->trans('ErrorFieldsRequired'), null, 'errors');
-	}
-}
-
-
-
-/*
- *	View
- */
-
-if (!empty($id) || !empty($ref)) {
-	$object = new Product($db);
-	$result = $object->fetch($id, $ref);
-
-	llxHeader("", "", $langs->trans("CardProduct".$object->type));
-
-	if ($result > 0)
-	{
-		$showbarcode = empty($conf->barcode->enabled) ? 0 : 1;
-		if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode = 0;
-
-		$head = product_prepare_head($object);
-		$titre = $langs->trans("CardProduct".$object->type);
-		$picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
-		dol_fiche_head($head, 'combinations', $titre, 0, $picto);
-
-		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
-		$object->next_prev_filter = " fk_product_type = ".$object->type;
-
-		dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref', '', '', '', 0, '', '', 1);
-
-		dol_fiche_end();
-	}
-
-	print load_fiche_titre($langs->trans('ProductCombinationGenerator'));
-
-	$dictionary_attr = array();
-
-	foreach ($prodattr->fetchAll() as $attr) {
-		$dictionary_attr[$attr->id] = $attr;
-		foreach ($prodattrval->fetchAllByProductAttribute($attr->id) as $attrval) {
-			$dictionary_attr[$attr->id]->values[$attrval->id] = $attrval;
-		}
-	}
-	?>
-
-	<script>
-
-		dictionary_attr = <?php echo json_encode($dictionary_attr) ?>;
-		weight_units = '<?php echo measuringUnitString(0, 'weight', $object->weight_units) ?>';
-		attr_selected = {};
-		percentage_variation = jQuery('input#price_var_percent').prop('checked');
-
-		function parseSelectedFeatures(attr, val, inputs) {
-
-			var price = '';
-			var weight = '';
-
-			if (typeof(inputs) == 'object') {
-				price = inputs.price;
-				weight = inputs.weight;
-			}
-
-			if (!attr_selected.hasOwnProperty(attr)) {
-
-				var label = dictionary_attr[attr].label;
-
-				var table = jQuery(document.createElement('table'))
-					.attr('id', 'combinations_'+attr)
-					.css('width', '100%')
-					.addClass('liste')
-					.append(
-						jQuery(document.createElement('thead'))
-							.append(jQuery(document.createElement('tr'))
-								.addClass('liste_titre')
-								.append(
-									jQuery(document.createElement('th'))
-										.addClass('liste_titre')
-										.css('width', '40%')
-										.text(label),
-									jQuery(document.createElement('th')).addClass('liste_titre').css('text-align', 'center').html('<?php echo $langs->trans('PriceImpact') ?>'),
-									jQuery(document.createElement('th')).addClass('liste_titre').css('text-align', 'center').html('<?php echo $langs->trans('WeightImpact') ?>')
-								)
-							)
-					)
-				;
-
-
-				jQuery('form#combinationsform').prepend(table);
-
-				attr_selected[attr] = [];
-			} else {
-				if (jQuery.inArray(val, attr_selected[attr]) != -1) {
-					return;
-				}
-			}
-
-			var combinations_table = jQuery('table#combinations_' + attr);
-			var html = jQuery(document.createElement('tr'));
-
-			if (combinations_table.children('tbody').children('tr').length % 2 === 0) {
-				html.addClass('pair');
-			} else {
-				html.addClass('impair');
-			}
-
-			var percent_symbol_html = jQuery(document.createElement('span')).attr('id', 'percentsymbol').html(' %');
-
-			if (!percentage_variation) {
-				percent_symbol_html.hide();
-			}
-
-			html.append(
-				jQuery(document.createElement('td')).text(dictionary_attr[attr].values[val].value),
-				jQuery(document.createElement('td')).css('text-align', 'center').append(
-					jQuery(document.createElement('input')).attr('type', 'text').css('width', '50px').attr('name', 'combinations[' + attr + '][' + val + '][price]').val(price),
-					percent_symbol_html
-				),
-				jQuery(document.createElement('td')).css('text-align', 'center').append(
-					jQuery(document.createElement('input')).attr('type', 'text').css('width', '50px').attr('name', 'combinations[' + attr + '][' + val + '][weight]').val(weight),
-					' ' + weight_units
-				)
-			);
-
-			combinations_table.append(html);
-
-			attr_selected[attr].push(val);
-		}
-
-		function showHidePercentageSymbol(checked) {
-
-			percentage_variation = checked;
-
-			if (checked) {
-				jQuery('span#percentsymbol').show();
-			} else {
-				jQuery('span#percentsymbol').hide();
-			}
-		}
-
-		jQuery(document).ready(function() {
-
-			var input_price_var_percent = jQuery('input#price_var_percent');
-
-			jQuery.each(<?php echo json_encode($combinations) ?>, function(key, val) {
-				jQuery.each(val, function(valkey, valcontent) {
-					parseSelectedFeatures(key, valkey, valcontent);
-				});
-			});
-
-			jQuery('#addfeature').click(function() {
-				jQuery('#features option:selected').each(function(selector) {
-					var explode = jQuery(this).val().split(':');
-					parseSelectedFeatures(explode[0], explode[1]);
-				});
-			});
-
-			jQuery('#delfeature').click(function() {
-				jQuery('#features option:selected').each(function(selector) {
-					var explode = jQuery(this).val().split(':');
-
-					if (attr_selected.hasOwnProperty(explode[0])) {
-						var tr = jQuery('input[name="combinations[' + explode[0] + '][' + explode[1] + '][price]"').parent().parent();
-
-						var index_value = jQuery.inArray(explode[1], attr_selected[explode[0]]);
-
-						attr_selected[explode[0]].splice(index_value, 1);
-
-						if (tr.parent().children('tr').length === 1) {
-							tr.parent().parent().detach();
-							delete attr_selected[explode[0]]
-						} else {
-							tr.detach();
-						}
-					}
-				});
-			});
-
-			input_price_var_percent.click(function() {
-				showHidePercentageSymbol(jQuery(this).prop('checked'));
-			});
-
-			jQuery('input#donotremove').click(function() {
-				if (jQuery(this).prop('checked')) {
-					jQuery('div#info_donotremove').hide();
-				} else {
-					jQuery('div#info_donotremove').show();
-				}
-			});
-		});
-
-	</script>
-
-	<div style="width: 100%;display:block; height: 300px">
-
-		<div style="float:right; width: 79%; margin-left: 1%">
-
-			<form method="post" id="combinationsform">
-
-					<p><?php echo $langs->trans('TooMuchCombinationsWarning', $langs->transnoentitiesnoconv('DoNotRemovePreviousCombinations')) ?></p>
-					<input type="checkbox" name="price_var_percent"
-					       id="price_var_percent"<?php echo $price_var_percent ? ' checked' : '' ?>> <label
-						for="price_var_percent"><?php echo $langs->trans('UsePercentageVariations') ?></label>
-					<br>
-					<input type="checkbox" name="donotremove"
-					       id="donotremove"<?php echo $donotremove ? ' checked' : '' ?>> <label for="donotremove"><?php echo $langs->trans('DoNotRemovePreviousCombinations') ?></label>
-
-					<br>
-					<div id="info_donotremove" class="info" style="<?php echo $donotremove ? 'display: none' : '' ?>">
-						<?php echo img_warning() ?>
-						<?php echo $langs->trans('ProductCombinationGeneratorWarning') ?>
-					</div>
-					<br>
-
-				<div style="text-align: center">
-					<input type="submit" value="<?php echo $langs->trans('Generate') ?>" class="button" name="submit">
-				</div>
-
-			</form>
-
-		</div>
-		<div style="float:left; width: 20%">
-
-			<select id="features" multiple style="width: 100%; height: 300px; overflow: auto">
-				<?php foreach ($dictionary_attr as $attr): ?>
-				<optgroup label="<?php echo $attr->label ?>">
-					<?php foreach ($attr->values as $attrval): ?>
-						<option value="<?php echo $attr->id.':'.$attrval->id ?>"<?php
-						if (isset($combinations[$attr->id][$attrval->id])) {
-							echo ' selected';
-						}
-						?>><?php echo dol_htmlentities($attrval->value) ?></option>
-					<?php endforeach ?>
-				</optgroup>
-				<?php endforeach ?>
-			</select>
-
-			<br><br>
-			<a class="button" id="delfeature" style="float: right"><?php echo img_edit_remove() ?></a>
-			<a class="button" id="addfeature"><?php echo img_edit_add() ?></a>
-
-		</div>
-
-	</div>
-
-
-	<?php
-
-    // End of page
-    llxFooter();
-}
-
-$db->close();
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php
index 7973553f6d0..683b28719a9 100644
--- a/htdocs/variants/list.php
+++ b/htdocs/variants/list.php
@@ -58,7 +58,7 @@ llxHeader('', $title);
 $newcardbutton = '';
 if ($user->rights->produit->creer)
 {
-    $newcardbutton .= dolGetButtonTitle($langs->trans('Create'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/variants/create.php');
+	$newcardbutton .= dolGetButtonTitle($langs->trans('Create'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/variants/create.php');
 }
 
 print load_fiche_titre($title, $newcardbutton, 'product');
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index f13b786082a..983c7996898 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -121,14 +121,14 @@ if ($modulepart == 'fckeditor') $modulepart = 'medias'; // For backward compatib
 
 if (GETPOST("cache", 'alpha'))
 {
-    // Important: Following code is to avoid page request by browser and PHP CPU at
-    // each Dolibarr page access.
-    if (empty($dolibarr_nocache))
-    {
-        header('Cache-Control: max-age=3600, public, must-revalidate');
-        header('Pragma: cache'); // This is to avoid having Pragma: no-cache
-    } else header('Cache-Control: no-cache');
-    //print $dolibarr_nocache; exit;
+	// Important: Following code is to avoid page request by browser and PHP CPU at
+	// each Dolibarr page access.
+	if (empty($dolibarr_nocache))
+	{
+		header('Cache-Control: max-age=3600, public, must-revalidate');
+		header('Pragma: cache'); // This is to avoid having Pragma: no-cache
+	} else header('Cache-Control: no-cache');
+	//print $dolibarr_nocache; exit;
 }
 
 // If we have a hash public (hashp), we guess the original_file.
@@ -195,7 +195,7 @@ if (!empty($hashp)) {
 	$accessallowed = 1; // When using hashp, link is public so we force $accessallowed
 	$sqlprotectagainstexternals = '';
 } elseif (isset($_GET["publictakepos"])) {
-	if (! empty($conf->global->TAKEPOS_AUTO_ORDER)) {
+	if (!empty($conf->global->TAKEPOS_AUTO_ORDER)) {
 		$accessallowed = 1; // Only if TakePOS Public Auto Order is enabled and received publictakepos variable
 	}
 } else {
@@ -244,71 +244,71 @@ if (preg_match('/\.\./', $fullpath_original_file) || preg_match('/[<>|]/', $full
 
 if ($modulepart == 'barcode')
 {
-    $generator = GETPOST("generator", "alpha");
-    $code = GETPOST("code", 'none'); // This can be rich content (qrcode, datamatrix, ...)
-    $encoding = GETPOST("encoding", "alpha");
-    $readable = GETPOST("readable", 'alpha') ?GETPOST("readable", "alpha") : "Y";
+	$generator = GETPOST("generator", "alpha");
+	$code = GETPOST("code", 'none'); // This can be rich content (qrcode, datamatrix, ...)
+	$encoding = GETPOST("encoding", "alpha");
+	$readable = GETPOST("readable", 'alpha') ?GETPOST("readable", "alpha") : "Y";
 
-    if (empty($generator) || empty($encoding))
-    {
-        print 'Error: Parameter "generator" or "encoding" not defined';
-        exit;
-    }
+	if (empty($generator) || empty($encoding))
+	{
+		print 'Error: Parameter "generator" or "encoding" not defined';
+		exit;
+	}
 
-    $dirbarcode = array_merge(array("/core/modules/barcode/doc/"), $conf->modules_parts['barcode']);
+	$dirbarcode = array_merge(array("/core/modules/barcode/doc/"), $conf->modules_parts['barcode']);
 
-    $result = 0;
+	$result = 0;
 
-    foreach ($dirbarcode as $reldir)
-    {
-        $dir = dol_buildpath($reldir, 0);
-        $newdir = dol_osencode($dir);
+	foreach ($dirbarcode as $reldir)
+	{
+		$dir = dol_buildpath($reldir, 0);
+		$newdir = dol_osencode($dir);
 
-        // Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php)
-        if (!is_dir($newdir)) continue;
+		// Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php)
+		if (!is_dir($newdir)) continue;
 
-        $result = @include_once $newdir.$generator.'.modules.php';
-        if ($result) break;
-    }
+		$result = @include_once $newdir.$generator.'.modules.php';
+		if ($result) break;
+	}
 
-    // Load barcode class
-    $classname = "mod".ucfirst($generator);
-    $module = new $classname($db);
-    if ($module->encodingIsSupported($encoding))
-    {
-        $result = $module->buildBarCode($code, $encoding, $readable);
-    }
+	// Load barcode class
+	$classname = "mod".ucfirst($generator);
+	$module = new $classname($db);
+	if ($module->encodingIsSupported($encoding))
+	{
+		$result = $module->buildBarCode($code, $encoding, $readable);
+	}
 } else {
-    // Open and return file
-    clearstatcache();
+	// Open and return file
+	clearstatcache();
 
-    $filename = basename($fullpath_original_file);
+	$filename = basename($fullpath_original_file);
 
-    // Output files on browser
-    dol_syslog("viewimage.php return file $fullpath_original_file filename=$filename content-type=$type");
+	// Output files on browser
+	dol_syslog("viewimage.php return file $fullpath_original_file filename=$filename content-type=$type");
 
-    // This test is to avoid error images when image is not available (for example thumbs).
-    if (!dol_is_file($fullpath_original_file) && empty($_GET["noalt"]))
-    {
-        $fullpath_original_file = DOL_DOCUMENT_ROOT.'/public/theme/common/nophoto.png';
-        /*$error='Error: File '.$_GET["file"].' does not exists or filesystems permissions are not allowed';
+	// This test is to avoid error images when image is not available (for example thumbs).
+	if (!dol_is_file($fullpath_original_file) && empty($_GET["noalt"]))
+	{
+		$fullpath_original_file = DOL_DOCUMENT_ROOT.'/public/theme/common/nophoto.png';
+		/*$error='Error: File '.$_GET["file"].' does not exists or filesystems permissions are not allowed';
         print $error;
         exit;*/
-    }
+	}
 
-    // Permissions are ok and file found, so we return it
-    if ($type)
-    {
-        top_httphead($type);
-        header('Content-Disposition: inline; filename="'.basename($fullpath_original_file).'"');
-    } else {
-        top_httphead('image/png');
-        header('Content-Disposition: inline; filename="'.basename($fullpath_original_file).'"');
-    }
+	// Permissions are ok and file found, so we return it
+	if ($type)
+	{
+		top_httphead($type);
+		header('Content-Disposition: inline; filename="'.basename($fullpath_original_file).'"');
+	} else {
+		top_httphead('image/png');
+		header('Content-Disposition: inline; filename="'.basename($fullpath_original_file).'"');
+	}
 
-    $fullpath_original_file_osencoded = dol_osencode($fullpath_original_file);
+	$fullpath_original_file_osencoded = dol_osencode($fullpath_original_file);
 
-    readfile($fullpath_original_file_osencoded);
+	readfile($fullpath_original_file_osencoded);
 }
 
 
diff --git a/htdocs/webservices/admin/index.php b/htdocs/webservices/admin/index.php
index 9017aa40815..2c14d2d07f5 100644
--- a/htdocs/webservices/admin/index.php
+++ b/htdocs/webservices/admin/index.php
@@ -37,21 +37,21 @@ $actionsave = GETPOST("save");
 // Sauvegardes parametres
 if ($actionsave)
 {
-    $i = 0;
+	$i = 0;
 
-    $db->begin();
+	$db->begin();
 
-    $i += dolibarr_set_const($db, 'WEBSERVICES_KEY', GETPOST("WEBSERVICES_KEY"), 'chaine', 0, '', $conf->entity);
+	$i += dolibarr_set_const($db, 'WEBSERVICES_KEY', GETPOST("WEBSERVICES_KEY"), 'chaine', 0, '', $conf->entity);
 
-    if ($i >= 1)
-    {
-        $db->commit();
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
-        $db->rollback();
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if ($i >= 1)
+	{
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	}
+	else {
+		$db->rollback();
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 
@@ -62,13 +62,16 @@ if ($actionsave)
 llxHeader();
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+
 print load_fiche_titre($langs->trans("WebServicesSetup"), $linkback, 'title_setup');
 
 print '<span class="opacitymedium">'.$langs->trans("WebServicesDesc")."</span><br>\n";
 print "<br>\n";
 
-print '<form name="agendasetupform" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<form name="agendasetupform" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="save">';
+
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
@@ -78,7 +81,7 @@ print "<td>".$langs->trans("Value")."</td>";
 print "<td>&nbsp;</td>";
 print "</tr>";
 
-print '<tr class="impair">';
+print '<tr class="oddeven">';
 print '<td class="fieldrequired">'.$langs->trans("KeyForWebServicesAccess").'</td>';
 print '<td><input type="text" class="flat" id="WEBSERVICES_KEY" name="WEBSERVICES_KEY" value="'.(GETPOST('WEBSERVICES_KEY') ?GETPOST('WEBSERVICES_KEY') : (!empty($conf->global->WEBSERVICES_KEY) ? $conf->global->WEBSERVICES_KEY : '')).'" size="40">';
 if (!empty($conf->use_javascript_ajax))
@@ -90,7 +93,7 @@ print '</tr>';
 print '</table>';
 
 print '<br><div class="center">';
-print '<input type="submit" name="save" class="button" value="'.$langs->trans("Save").'">';
+print '<input type="submit" name="save" class="button button-save" value="'.$langs->trans("Save").'">';
 print '</div>';
 
 print '</form>';
@@ -109,7 +112,7 @@ $webservices = array(
 		'actioncomm'		=> '!empty($conf->agenda->enabled)',
 		'category'			=> '!empty($conf->categorie->enabled)',
 		'project'			=> '!empty($conf->projet->enabled)',
-        'other'				=> ''
+		'other'				=> ''
 );
 
 
diff --git a/htdocs/webservices/server_actioncomm.php b/htdocs/webservices/server_actioncomm.php
index c9e035edc6b..7864c93243f 100644
--- a/htdocs/webservices/server_actioncomm.php
+++ b/htdocs/webservices/server_actioncomm.php
@@ -39,11 +39,11 @@ dol_syslog("Call ActionComm webservices interfaces");
 // Enable and test if module web services is enabled
 if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
 {
-    $langs->load("admin");
-    dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-    print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
-    print $langs->trans("ToActivateModule");
-    exit;
+	$langs->load("admin");
+	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
+	print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
+	print $langs->trans("ToActivateModule");
+	exit;
 }
 
 // Create the soap Object
@@ -57,36 +57,36 @@ $server->wsdl->schemaTargetNamespace = $ns;
 
 // Define WSDL Authentication object
 $server->wsdl->addComplexType(
-    'authentication',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
-    	'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
-    	'login' => array('name'=>'login', 'type'=>'xsd:string'),
-    	'password' => array('name'=>'password', 'type'=>'xsd:string'),
-        'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
-    )
+	'authentication',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
+		'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
+		'login' => array('name'=>'login', 'type'=>'xsd:string'),
+		'password' => array('name'=>'password', 'type'=>'xsd:string'),
+		'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
+	)
 );
 
 // Define WSDL Return object
 $server->wsdl->addComplexType(
-    'result',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
-    )
+	'result',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
+		'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
+	)
 );
 
 
 $actioncomm_fields = array(
-    'id' => array('name'=>'id', 'type'=>'xsd:string'),
+	'id' => array('name'=>'id', 'type'=>'xsd:string'),
 	'ref' => array('name'=>'ref', 'type'=>'xsd:string'),
 	'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
 	'type_id' => array('name'=>'type_id', 'type'=>'xsd:string'),
@@ -114,7 +114,7 @@ $actioncomm_fields = array(
 
 $elementtype = 'actioncomm';
 
-//Retreive all extrafield for actioncomm
+//Retrieve all extrafield for actioncomm
 // fetch optionals attributes and labels
 $extrafields = new ExtraFields($db);
 $extrafields->fetch_name_optionals_label($elementtype, true);
@@ -137,11 +137,11 @@ if (is_array($extrafield_array)) $actioncomm_fields = array_merge($actioncomm_fi
 
 // Define other specific objects
 $server->wsdl->addComplexType(
-    'actioncomm',
-    'complexType',
-    'struct',
-    'all',
-    '',
+	'actioncomm',
+	'complexType',
+	'struct',
+	'all',
+	'',
 	$actioncomm_fields
 );
 
@@ -165,12 +165,12 @@ $server->wsdl->addComplexType(
 	'sequence',
 	'',
 	array(
-        'actioncommtype' => array(
-            'name' => 'actioncommtype',
-            'type' => 'tns:actioncommtype',
-            'minOccurs' => '0',
-            'maxOccurs' => 'unbounded'
-        )
+		'actioncommtype' => array(
+			'name' => 'actioncommtype',
+			'type' => 'tns:actioncommtype',
+			'minOccurs' => '0',
+			'maxOccurs' => 'unbounded'
+		)
 	)
 );
 
@@ -199,16 +199,16 @@ $server->register(
 
 // Register WSDL
 $server->register(
-    'getActionComm',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'id'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result', 'actioncomm'=>'tns:actioncomm'),
-    $ns,
-    $ns.'#getActionComm',
-    $styledoc,
-    $styleuse,
-    'WS to get actioncomm'
+	'getActionComm',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'id'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result', 'actioncomm'=>'tns:actioncomm'),
+	$ns,
+	$ns.'#getActionComm',
+	$styledoc,
+	$styleuse,
+	'WS to get actioncomm'
 );
 
 // Register WSDL
@@ -251,100 +251,100 @@ $server->register(
  */
 function getActionComm($authentication, $id)
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    dol_syslog("Function: getActionComm login=".$authentication['login']." id=".$id);
+	dol_syslog("Function: getActionComm login=".$authentication['login']." id=".$id);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-    // Init and check authentication
-    $objectresp = array();
-    $errorcode = ''; $errorlabel = '';
-    $error = 0;
-    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
-    // Check parameters
-    if ($error || (!$id))
-    {
-        $error++;
-        $errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
-    }
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Check parameters
+	if ($error || (!$id))
+	{
+		$error++;
+		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
+	}
 
-    if (!$error)
-    {
-        $fuser->getrights();
+	if (!$error)
+	{
+		$fuser->getrights();
 
-        if ($fuser->rights->agenda->allactions->read)
-        {
-            $actioncomm = new ActionComm($db);
-            $result = $actioncomm->fetch($id);
-            if ($result > 0)
-            {
-            	$actioncomm_result_fields = array(
+		if ($fuser->rights->agenda->allactions->read)
+		{
+			$actioncomm = new ActionComm($db);
+			$result = $actioncomm->fetch($id);
+			if ($result > 0)
+			{
+				$actioncomm_result_fields = array(
 						'id' => $actioncomm->id,
 						'ref'=> $actioncomm->ref,
-			        	'ref_ext'=> $actioncomm->ref_ext,
-			        	'type_id'=> $actioncomm->type_id,
-			        	'type_code'=> $actioncomm->type_code,
-			        	'type'=> $actioncomm->type,
-			        	'label'=> $actioncomm->label,
-			        	'datep'=> dol_print_date($actioncomm->datep, 'dayhourrfc'),
-			        	'datef'=> dol_print_date($actioncomm->datef, 'dayhourrfc'),
-			        	'datec'=> dol_print_date($actioncomm->datec, 'dayhourrfc'),
-			        	'datem'=> dol_print_date($actioncomm->datem, 'dayhourrfc'),
-			        	'note'=> $actioncomm->note_private,
-			        	'percentage'=> $actioncomm->percentage,
-			        	'author'=> $actioncomm->authorid,
-			        	'usermod'=> $actioncomm->usermodid,
-			        	'userownerid'=> $actioncomm->userownerid,
-			        	'priority'=> $actioncomm->priority,
-			        	'fulldayevent'=> $actioncomm->fulldayevent,
-			        	'location'=> $actioncomm->location,
-			        	'socid'=> $actioncomm->socid,
-			        	'contactid'=> $actioncomm->contact_id,
-			        	'projectid'=> $actioncomm->fk_project,
-			        	'fk_element'=> $actioncomm->fk_element,
-			        	'elementtype'=> $actioncomm->elementtype
-            	);
+						'ref_ext'=> $actioncomm->ref_ext,
+						'type_id'=> $actioncomm->type_id,
+						'type_code'=> $actioncomm->type_code,
+						'type'=> $actioncomm->type,
+						'label'=> $actioncomm->label,
+						'datep'=> dol_print_date($actioncomm->datep, 'dayhourrfc'),
+						'datef'=> dol_print_date($actioncomm->datef, 'dayhourrfc'),
+						'datec'=> dol_print_date($actioncomm->datec, 'dayhourrfc'),
+						'datem'=> dol_print_date($actioncomm->datem, 'dayhourrfc'),
+						'note'=> $actioncomm->note_private,
+						'percentage'=> $actioncomm->percentage,
+						'author'=> $actioncomm->authorid,
+						'usermod'=> $actioncomm->usermodid,
+						'userownerid'=> $actioncomm->userownerid,
+						'priority'=> $actioncomm->priority,
+						'fulldayevent'=> $actioncomm->fulldayevent,
+						'location'=> $actioncomm->location,
+						'socid'=> $actioncomm->socid,
+						'contactid'=> $actioncomm->contact_id,
+						'projectid'=> $actioncomm->fk_project,
+						'fk_element'=> $actioncomm->fk_element,
+						'elementtype'=> $actioncomm->elementtype
+				);
 
-            	$elementtype = 'actioncomm';
+				$elementtype = 'actioncomm';
 
-	        	// Retreive all extrafield for actioncomm
-	        	// fetch optionals attributes and labels
-	        	$extrafields = new ExtraFields($db);
-	        	$extrafields->fetch_name_optionals_label($elementtype, true);
-	        	//Get extrafield values
-	        	$actioncomm->fetch_optionals();
+				// Retrieve all extrafield for actioncomm
+				// fetch optionals attributes and labels
+				$extrafields = new ExtraFields($db);
+				$extrafields->fetch_name_optionals_label($elementtype, true);
+				//Get extrafield values
+				$actioncomm->fetch_optionals();
 
-	        	if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
-	        	{
-	        		foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
-		        	{
-		        		$actioncomm_result_fields = array_merge($actioncomm_result_fields, array('options_'.$key => $actioncomm->array_options['options_'.$key]));
-		        	}
-	        	}
+				if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+				{
+					foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+					{
+						$actioncomm_result_fields = array_merge($actioncomm_result_fields, array('options_'.$key => $actioncomm->array_options['options_'.$key]));
+					}
+				}
 
-                // Create
-                $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'actioncomm'=>$actioncomm_result_fields);
-            }
-            else {
-                $error++;
-                $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
-            }
-        }
-        else {
-            $error++;
-            $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
-        }
-    }
+				// Create
+				$objectresp = array(
+					'result'=>array('result_code'=>'OK', 'result_label'=>''),
+					'actioncomm'=>$actioncomm_result_fields);
+			}
+			else {
+				$error++;
+				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
+			}
+		}
+		else {
+			$error++;
+			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+		}
+	}
 
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 
@@ -384,8 +384,8 @@ function getListActionCommType($authentication)
 				}
 
 				 $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'actioncommtypes'=>$resultarray);
+					'result'=>array('result_code'=>'OK', 'result_label'=>''),
+					'actioncommtypes'=>$resultarray);
 			} else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
@@ -450,7 +450,7 @@ function createActionComm($authentication, $actioncomm)
 
 		$elementtype = 'actioncomm';
 
-		//Retreive all extrafield for actioncomm
+		//Retrieve all extrafield for actioncomm
 		// fetch optionals attributes and labels
 		$extrafields = new ExtraFields($db);
 		$extrafields->fetch_name_optionals_label($elementtype, true);
@@ -547,7 +547,7 @@ function updateActionComm($authentication, $actioncomm)
 
 			$elementtype = 'actioncomm';
 
-			//Retreive all extrafield for actioncomm
+			//Retrieve all extrafield for actioncomm
 			// fetch optionals attributes and labels
 			$extrafields = new ExtraFields($db);
 			$extrafields->fetch_name_optionals_label($elementtype, true);
diff --git a/htdocs/webservices/server_category.php b/htdocs/webservices/server_category.php
index d7382447749..949c95dc530 100644
--- a/htdocs/webservices/server_category.php
+++ b/htdocs/webservices/server_category.php
@@ -93,16 +93,16 @@ $server->wsdl->addComplexType(
  * Les catégories filles, sous tableau dez la catégorie
  */
 $server->wsdl->addComplexType(
-    'FillesArray',
-    'complexType',
-    'array',
-    '',
-    'SOAP-ENC:Array',
-    array(),
-    array(
-        array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:categorie[]')
-    ),
-    'tns:categorie'
+	'FillesArray',
+	'complexType',
+	'array',
+	'',
+	'SOAP-ENC:Array',
+	array(),
+	array(
+		array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:categorie[]')
+	),
+	'tns:categorie'
 );
 
  /*
@@ -172,10 +172,10 @@ $server->register(
 	// Exit values
 	array('result'=>'tns:result', 'categorie'=>'tns:categorie'),
 	$ns,
-    $ns.'#getCategory',
-    $styledoc,
-    $styleuse,
-    'WS to get category'
+	$ns.'#getCategory',
+	$styledoc,
+	$styleuse,
+	'WS to get category'
 );
 
 
@@ -232,7 +232,7 @@ function getCategory($authentication, $id)
 					'type' => $categorie->type,
 					'dir' => $pdir,
 					'photos' => $categorie->liste_photos($dir, $nbmax)
-		    	);
+				);
 
 				$cats = $categorie->get_filles();
 				if (count($cats) > 0)
@@ -256,11 +256,11 @@ function getCategory($authentication, $id)
 					}
 				}
 
-			    // Create
-			    $objectresp = array(
+				// Create
+				$objectresp = array(
 					'result'=>array('result_code'=>'OK', 'result_label'=>''),
 					'categorie'=> $cat
-			    );
+				);
 			}
 			else {
 				$error++;
diff --git a/htdocs/webservices/server_contact.php b/htdocs/webservices/server_contact.php
index 023cdc1c4ac..9abc7b6088f 100644
--- a/htdocs/webservices/server_contact.php
+++ b/htdocs/webservices/server_contact.php
@@ -35,11 +35,11 @@ dol_syslog("Call Contact webservices interfaces");
 // Enable and test if module web services is enabled
 if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
 {
-    $langs->load("admin");
-    dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-    print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
-    print $langs->trans("ToActivateModule");
-    exit;
+	$langs->load("admin");
+	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
+	print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
+	print $langs->trans("ToActivateModule");
+	exit;
 }
 
 // Create the soap Object
@@ -53,31 +53,31 @@ $server->wsdl->schemaTargetNamespace = $ns;
 
 // Define WSDL Authentication object
 $server->wsdl->addComplexType(
-    'authentication',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
-    	'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
-    	'login' => array('name'=>'login', 'type'=>'xsd:string'),
-    	'password' => array('name'=>'password', 'type'=>'xsd:string'),
-        'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
-    )
+	'authentication',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
+		'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
+		'login' => array('name'=>'login', 'type'=>'xsd:string'),
+		'password' => array('name'=>'password', 'type'=>'xsd:string'),
+		'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
+	)
 );
 
 // Define WSDL Return object
 $server->wsdl->addComplexType(
-    'result',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
-    )
+	'result',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
+		'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
+	)
 );
 
 $contact_fields = array(
@@ -119,7 +119,7 @@ $contact_fields = array(
 $elementtype = 'socpeople';
 
 
-//Retreive all extrafield for contact
+//Retrieve all extrafield for contact
 // fetch optionals attributes and labels
 $extrafields = new ExtraFields($db);
 $extrafields->fetch_name_optionals_label($elementtype, true);
@@ -142,11 +142,11 @@ if (is_array($extrafield_array)) $contact_fields = array_merge($contact_fields,
 
 // Define other specific objects
 $server->wsdl->addComplexType(
-    'contact',
-    'complexType',
-    'struct',
-    'all',
-    '',
+	'contact',
+	'complexType',
+	'struct',
+	'all',
+	'',
 	$contact_fields
 );
 
@@ -179,16 +179,16 @@ $styleuse = 'encoded'; // encoded/literal/literal wrapped
 
 // Register WSDL
 $server->register(
-    'getContact',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref_ext'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result', 'contact'=>'tns:contact'),
-    $ns,
-    $ns.'#getContact',
-    $styledoc,
-    $styleuse,
-    'WS to get a contact'
+	'getContact',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref_ext'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result', 'contact'=>'tns:contact'),
+	$ns,
+	$ns.'#getContact',
+	$styledoc,
+	$styleuse,
+	'WS to get a contact'
 );
 
 // Register WSDL
@@ -243,113 +243,113 @@ $server->register(
  */
 function getContact($authentication, $id, $ref_ext)
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    dol_syslog("Function: getContact login=".$authentication['login']." id=".$id." ref_ext=".$ref_ext);
+	dol_syslog("Function: getContact login=".$authentication['login']." id=".$id." ref_ext=".$ref_ext);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-    // Init and check authentication
-    $objectresp = array();
-    $errorcode = ''; $errorlabel = '';
-    $error = 0;
-    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
-    // Check parameters
-    if (!$error && ($id && $ref_ext))
-    {
-        $error++;
-        $errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id and ref_ext can't be both provided. You must choose one or other but not both.";
-    }
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Check parameters
+	if (!$error && ($id && $ref_ext))
+	{
+		$error++;
+		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id and ref_ext can't be both provided. You must choose one or other but not both.";
+	}
 
-    if (!$error)
-    {
-        $fuser->getrights();
+	if (!$error)
+	{
+		$fuser->getrights();
 
-        $contact = new Contact($db);
-        $result = $contact->fetch($id, 0, $ref_ext);
-        if ($result > 0)
-        {
-        	// Only internal user who have contact read permission
-        	// Or for external user who have contact read permission, with restrict on societe_id
-	        if (
-	        	$fuser->rights->societe->contact->lire && !$fuser->societe_id
-	        	|| ($fuser->rights->societe->contact->lire && ($fuser->societe_id == $contact->socid))
-	        ) {
-            	$contact_result_fields = array(
-	            	'id' => $contact->id,
-	            	'ref_ext' => $contact->ref_ext,
-	            	'lastname' => $contact->lastname,
-	            	'firstname' => $contact->firstname,
-	            	'address' => $contact->address,
-	            	'zip' => $contact->zip,
-	            	'town' => $contact->town,
-	            	'state_id' => $contact->state_id,
-	            	'state_code' => $contact->state_code,
-	            	'state' => $contact->state,
-	            	'country_id' => $contact->country_id,
-	            	'country_code' => $contact->country_code,
-	            	'country' => $contact->country,
-	            	'socid' => $contact->socid,
-	            	'status' => $contact->statut,
-	            	'phone_pro' => $contact->phone_pro,
-	            	'fax' => $contact->fax,
-	            	'phone_perso' => $contact->phone_perso,
-	            	'phone_mobile' => $contact->phone_mobile,
-	            	'code' => $contact->code,
-	            	'email' => $contact->email,
-	            	'birthday' => $contact->birthday,
-	            	'default_lang' => $contact->default_lang,
-	            	'note' => $contact->note,
-	            	'ref_facturation' => $contact->ref_facturation,
-	            	'ref_contrat' => $contact->ref_contrat,
-	            	'ref_commande' => $contact->ref_commande,
-	            	'ref_propal' => $contact->ref_propal,
-	            	'user_id' => $contact->user_id,
-	            	'user_login' => $contact->user_login,
-	            	'civility_id' => $contact->civility_id,
-            		'poste' => $contact->poste
-            	);
+		$contact = new Contact($db);
+		$result = $contact->fetch($id, 0, $ref_ext);
+		if ($result > 0)
+		{
+			// Only internal user who have contact read permission
+			// Or for external user who have contact read permission, with restrict on societe_id
+			if (
+				$fuser->rights->societe->contact->lire && !$fuser->societe_id
+				|| ($fuser->rights->societe->contact->lire && ($fuser->societe_id == $contact->socid))
+			) {
+				$contact_result_fields = array(
+					'id' => $contact->id,
+					'ref_ext' => $contact->ref_ext,
+					'lastname' => $contact->lastname,
+					'firstname' => $contact->firstname,
+					'address' => $contact->address,
+					'zip' => $contact->zip,
+					'town' => $contact->town,
+					'state_id' => $contact->state_id,
+					'state_code' => $contact->state_code,
+					'state' => $contact->state,
+					'country_id' => $contact->country_id,
+					'country_code' => $contact->country_code,
+					'country' => $contact->country,
+					'socid' => $contact->socid,
+					'status' => $contact->statut,
+					'phone_pro' => $contact->phone_pro,
+					'fax' => $contact->fax,
+					'phone_perso' => $contact->phone_perso,
+					'phone_mobile' => $contact->phone_mobile,
+					'code' => $contact->code,
+					'email' => $contact->email,
+					'birthday' => $contact->birthday,
+					'default_lang' => $contact->default_lang,
+					'note' => $contact->note,
+					'ref_facturation' => $contact->ref_facturation,
+					'ref_contrat' => $contact->ref_contrat,
+					'ref_commande' => $contact->ref_commande,
+					'ref_propal' => $contact->ref_propal,
+					'user_id' => $contact->user_id,
+					'user_login' => $contact->user_login,
+					'civility_id' => $contact->civility_id,
+					'poste' => $contact->poste
+				);
 
-            	$elementtype = 'socpeople';
+				$elementtype = 'socpeople';
 
-            	//Retreive all extrafield for thirdsparty
-            	// fetch optionals attributes and labels
-            	$extrafields = new ExtraFields($db);
-            	$extrafields->fetch_name_optionals_label($elementtype, true);
-            	//Get extrafield values
-            	$contact->fetch_optionals();
+				//Retrieve all extrafield for thirdsparty
+				// fetch optionals attributes and labels
+				$extrafields = new ExtraFields($db);
+				$extrafields->fetch_name_optionals_label($elementtype, true);
+				//Get extrafield values
+				$contact->fetch_optionals();
 
-            	if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
-            	{
-            		foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
-	            	{
-	            		$contact_result_fields = array_merge($contact_result_fields, array('options_'.$key => $contact->array_options['options_'.$key]));
-	            	}
-            	}
+				if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+				{
+					foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+					{
+						$contact_result_fields = array_merge($contact_result_fields, array('options_'.$key => $contact->array_options['options_'.$key]));
+					}
+				}
 
-                // Create
-                $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'contact'=>$contact_result_fields
-                );
-	        }
-	        else {
-	            $error++;
-	            $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
-	        }
-        }
-        else {
-            $error++;
-            $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref_ext='.$ref_ext;
-        }
-    }
+				// Create
+				$objectresp = array(
+					'result'=>array('result_code'=>'OK', 'result_label'=>''),
+					'contact'=>$contact_result_fields
+				);
+			}
+			else {
+				$error++;
+				$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+			}
+		}
+		else {
+			$error++;
+			$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref_ext='.$ref_ext;
+		}
+	}
 
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 
@@ -420,7 +420,7 @@ function createContact($authentication, $contact)
 
 		$elementtype = 'socpeople';
 
-		//Retreive all extrafield for thirdsparty
+		//Retrieve all extrafield for thirdsparty
 		// fetch optionals attributes and labels
 		$extrafields = new ExtraFields($db);
 		$extrafields->fetch_name_optionals_label($elementtype, true);
@@ -623,11 +623,11 @@ function updateContact($authentication, $contact)
 		$error++; $errorcode = 'KO'; $errorlabel = "Contact id or ref_ext is mandatory.";
 	}
 	// Check parameters
-    if (!$error && ($id && $ref_ext))
-    {
-        $error++;
-        $errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id and ref_ext can't be all provided. You must choose one of them.";
-    }
+	if (!$error && ($id && $ref_ext))
+	{
+		$error++;
+		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id and ref_ext can't be all provided. You must choose one of them.";
+	}
 
 	if (!$error)
 	{
@@ -667,7 +667,7 @@ function updateContact($authentication, $contact)
 
 			$elementtype = 'socpeople';
 
-			//Retreive all extrafield for contact
+			//Retrieve all extrafield for contact
 			// fetch optionals attributes and labels
 			$extrafields = new ExtraFields($db);
 			$extrafields->fetch_name_optionals_label($elementtype, true);
diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index 194a2331b2c..5a8e6fb241c 100644
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -58,57 +58,57 @@ $server->wsdl->schemaTargetNamespace = $ns;
 
 // Define WSDL Authentication object
 $server->wsdl->addComplexType(
-    'authentication',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
-    	'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
-    	'login' => array('name'=>'login', 'type'=>'xsd:string'),
-        'password' => array('name'=>'password', 'type'=>'xsd:string'),
-        'entity' => array('name'=>'entity', 'type'=>'xsd:string')
-    )
+	'authentication',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
+		'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
+		'login' => array('name'=>'login', 'type'=>'xsd:string'),
+		'password' => array('name'=>'password', 'type'=>'xsd:string'),
+		'entity' => array('name'=>'entity', 'type'=>'xsd:string')
+	)
 );
 // Define WSDL Return object
 $server->wsdl->addComplexType(
-    'result',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
-    )
+	'result',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
+		'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
+	)
 );
 
 // Define other specific objects
 $server->wsdl->addComplexType(
-    'line',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'id' => array('name'=>'id', 'type'=>'xsd:string'),
-        'type' => array('name'=>'type', 'type'=>'xsd:int'),
-        'desc' => array('name'=>'desc', 'type'=>'xsd:string'),
-        'vat_rate' => array('name'=>'vat_rate', 'type'=>'xsd:double'),
-        'qty' => array('name'=>'qty', 'type'=>'xsd:double'),
-        'unitprice' => array('name'=>'unitprice', 'type'=>'xsd:double'),
-        'total_net' => array('name'=>'total_net', 'type'=>'xsd:double'),
-    	'total_vat' => array('name'=>'total_vat', 'type'=>'xsd:double'),
-    	'total' => array('name'=>'total', 'type'=>'xsd:double'),
-        'date_start' => array('name'=>'date_start', 'type'=>'xsd:date'),
-        'date_end' => array('name'=>'date_end', 'type'=>'xsd:date'),
-        // From product
-        'product_id' => array('name'=>'product_id', 'type'=>'xsd:int'),
-        'product_ref' => array('name'=>'product_ref', 'type'=>'xsd:string'),
-        'product_label' => array('name'=>'product_label', 'type'=>'xsd:string'),
-        'product_desc' => array('name'=>'product_desc', 'type'=>'xsd:string')
-    )
+	'line',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'id' => array('name'=>'id', 'type'=>'xsd:string'),
+		'type' => array('name'=>'type', 'type'=>'xsd:int'),
+		'desc' => array('name'=>'desc', 'type'=>'xsd:string'),
+		'vat_rate' => array('name'=>'vat_rate', 'type'=>'xsd:double'),
+		'qty' => array('name'=>'qty', 'type'=>'xsd:double'),
+		'unitprice' => array('name'=>'unitprice', 'type'=>'xsd:double'),
+		'total_net' => array('name'=>'total_net', 'type'=>'xsd:double'),
+		'total_vat' => array('name'=>'total_vat', 'type'=>'xsd:double'),
+		'total' => array('name'=>'total', 'type'=>'xsd:double'),
+		'date_start' => array('name'=>'date_start', 'type'=>'xsd:date'),
+		'date_end' => array('name'=>'date_end', 'type'=>'xsd:date'),
+		// From product
+		'product_id' => array('name'=>'product_id', 'type'=>'xsd:int'),
+		'product_ref' => array('name'=>'product_ref', 'type'=>'xsd:string'),
+		'product_label' => array('name'=>'product_label', 'type'=>'xsd:string'),
+		'product_desc' => array('name'=>'product_desc', 'type'=>'xsd:string')
+	)
 );
 
 /*$server->wsdl->addComplexType(
@@ -124,55 +124,55 @@ $server->wsdl->addComplexType(
     'tns:line'
 );*/
 $server->wsdl->addComplexType(
-    'LinesArray2',
-    'complexType',
-    'array',
-    'sequence',
-    '',
-    array(
-        'line' => array(
-            'name' => 'line',
-            'type' => 'tns:line',
-            'minOccurs' => '0',
-            'maxOccurs' => 'unbounded'
-        )
-    ),
-    null,
-    'tns:line'
+	'LinesArray2',
+	'complexType',
+	'array',
+	'sequence',
+	'',
+	array(
+		'line' => array(
+			'name' => 'line',
+			'type' => 'tns:line',
+			'minOccurs' => '0',
+			'maxOccurs' => 'unbounded'
+		)
+	),
+	null,
+	'tns:line'
 );
 
 
 $server->wsdl->addComplexType(
-    'invoice',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-    	'id' => array('name'=>'id', 'type'=>'xsd:string'),
-        'ref' => array('name'=>'ref', 'type'=>'xsd:string'),
-        'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
-        'thirdparty_id' => array('name'=>'thirdparty_id', 'type'=>'xsd:int'),
-        'fk_user_author' => array('name'=>'fk_user_author', 'type'=>'xsd:string'),
-        'fk_user_valid' => array('name'=>'fk_user_valid', 'type'=>'xsd:string'),
-        'date' => array('name'=>'date', 'type'=>'xsd:date'),
-        'date_due' => array('name'=>'date_due', 'type'=>'xsd:date'),
-        'date_creation' => array('name'=>'date_creation', 'type'=>'xsd:dateTime'),
-        'date_validation' => array('name'=>'date_validation', 'type'=>'xsd:dateTime'),
-        'date_modification' => array('name'=>'date_modification', 'type'=>'xsd:dateTime'),
-    	'payment_mode_id' => array('name'=>'payment_mode_id', 'type'=>'xsd:string'),
-        'type' => array('name'=>'type', 'type'=>'xsd:int'),
-        'total_net' => array('name'=>'type', 'type'=>'xsd:double'),
-        'total_vat' => array('name'=>'type', 'type'=>'xsd:double'),
-        'total' => array('name'=>'type', 'type'=>'xsd:double'),
-        'note_private' => array('name'=>'note_private', 'type'=>'xsd:string'),
-        'note_public' => array('name'=>'note_public', 'type'=>'xsd:string'),
-        'status' => array('name'=>'status', 'type'=>'xsd:int'),
-        'close_code' => array('name'=>'close_code', 'type'=>'xsd:string'),
-        'close_note' => array('name'=>'close_note', 'type'=>'xsd:string'),
-        'project_id' => array('name'=>'project_id', 'type'=>'xsd:string'),
-        'lines' => array('name'=>'lines', 'type'=>'tns:LinesArray2')
-    )
+	'invoice',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'id' => array('name'=>'id', 'type'=>'xsd:string'),
+		'ref' => array('name'=>'ref', 'type'=>'xsd:string'),
+		'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
+		'thirdparty_id' => array('name'=>'thirdparty_id', 'type'=>'xsd:int'),
+		'fk_user_author' => array('name'=>'fk_user_author', 'type'=>'xsd:string'),
+		'fk_user_valid' => array('name'=>'fk_user_valid', 'type'=>'xsd:string'),
+		'date' => array('name'=>'date', 'type'=>'xsd:date'),
+		'date_due' => array('name'=>'date_due', 'type'=>'xsd:date'),
+		'date_creation' => array('name'=>'date_creation', 'type'=>'xsd:dateTime'),
+		'date_validation' => array('name'=>'date_validation', 'type'=>'xsd:dateTime'),
+		'date_modification' => array('name'=>'date_modification', 'type'=>'xsd:dateTime'),
+		'payment_mode_id' => array('name'=>'payment_mode_id', 'type'=>'xsd:string'),
+		'type' => array('name'=>'type', 'type'=>'xsd:int'),
+		'total_net' => array('name'=>'type', 'type'=>'xsd:double'),
+		'total_vat' => array('name'=>'type', 'type'=>'xsd:double'),
+		'total' => array('name'=>'type', 'type'=>'xsd:double'),
+		'note_private' => array('name'=>'note_private', 'type'=>'xsd:string'),
+		'note_public' => array('name'=>'note_public', 'type'=>'xsd:string'),
+		'status' => array('name'=>'status', 'type'=>'xsd:int'),
+		'close_code' => array('name'=>'close_code', 'type'=>'xsd:string'),
+		'close_note' => array('name'=>'close_note', 'type'=>'xsd:string'),
+		'project_id' => array('name'=>'project_id', 'type'=>'xsd:string'),
+		'lines' => array('name'=>'lines', 'type'=>'tns:LinesArray2')
+	)
 );
 /*
 $server->wsdl->addComplexType(
@@ -188,21 +188,21 @@ $server->wsdl->addComplexType(
     'tns:invoice'
 );*/
 $server->wsdl->addComplexType(
-    'InvoicesArray2',
-    'complexType',
-    'array',
-    'sequence',
-    '',
-    array(
-        'invoice' => array(
-            'name' => 'invoice',
-            'type' => 'tns:invoice',
-            'minOccurs' => '0',
-            'maxOccurs' => 'unbounded'
-        )
-    ),
-    null,
-    'tns:invoice'
+	'InvoicesArray2',
+	'complexType',
+	'array',
+	'sequence',
+	'',
+	array(
+		'invoice' => array(
+			'name' => 'invoice',
+			'type' => 'tns:invoice',
+			'minOccurs' => '0',
+			'maxOccurs' => 'unbounded'
+		)
+	),
+	null,
+	'tns:invoice'
 );
 
 
@@ -216,40 +216,40 @@ $styleuse = 'encoded'; // encoded/literal/literal wrapped
 
 // Register WSDL
 $server->register(
-    'getInvoice',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result', 'invoice'=>'tns:invoice'),
-    $ns,
-    $ns.'#getInvoice',
-    $styledoc,
-    $styleuse,
-    'WS to get a particular invoice'
+	'getInvoice',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result', 'invoice'=>'tns:invoice'),
+	$ns,
+	$ns.'#getInvoice',
+	$styledoc,
+	$styleuse,
+	'WS to get a particular invoice'
 );
 $server->register(
-    'getInvoicesForThirdParty',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'idthirdparty'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result', 'invoices'=>'tns:InvoicesArray2'),
-    $ns,
-    $ns.'#getInvoicesForThirdParty',
-    $styledoc,
-    $styleuse,
-    'WS to get all invoices of a third party'
+	'getInvoicesForThirdParty',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'idthirdparty'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result', 'invoices'=>'tns:InvoicesArray2'),
+	$ns,
+	$ns.'#getInvoicesForThirdParty',
+	$styledoc,
+	$styleuse,
+	'WS to get all invoices of a third party'
 );
 $server->register(
-    'createInvoice',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'invoice'=>'tns:invoice'),
-    // Exit values
-    array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
-    $ns,
-    $ns.'#createInvoice',
-    $styledoc,
-    $styleuse,
-    'WS to create an invoice'
+	'createInvoice',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'invoice'=>'tns:invoice'),
+	// Exit values
+	array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
+	$ns,
+	$ns.'#createInvoice',
+	$styledoc,
+	$styleuse,
+	'WS to create an invoice'
 );
 $server->register(
 		'createInvoiceFromOrder',
@@ -264,16 +264,16 @@ $server->register(
 		'WS to create an invoice from an order'
 );
 $server->register(
-    'updateInvoice',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'invoice'=>'tns:invoice'),
-    // Exit values
-    array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
-    $ns,
-    $ns.'#updateInvoice',
-    $styledoc,
-    $styleuse,
-    'WS to update an invoice'
+	'updateInvoice',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'invoice'=>'tns:invoice'),
+	// Exit values
+	array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
+	$ns,
+	$ns.'#updateInvoice',
+	$styledoc,
+	$styleuse,
+	'WS to update an invoice'
 );
 
 
@@ -294,12 +294,12 @@ function getInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
 
 	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-    // Init and check authentication
-    $objectresp = array();
-    $errorcode = ''; $errorlabel = '';
-    $error = 0;
-    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
-    // Check parameters
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Check parameters
 	if (!$error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
 	{
 		$error++;
@@ -324,51 +324,51 @@ function getInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
 					$linesresp[] = array(
 						'id'=>$line->id,
 						'type'=>$line->product_type,
-                                                'desc'=>dol_htmlcleanlastbr($line->desc),
-                                                'total_net'=>$line->total_ht,
-                                                'total_vat'=>$line->total_tva,
-                                                'total'=>$line->total_ttc,
-                                                'vat_rate'=>$line->tva_tx,
-                                                'qty'=>$line->qty,
-                                                'unitprice'=> $line->subprice,
-                                                'date_start'=> $line->date_start ?dol_print_date($line->date_start, 'dayrfc') : '',
-                                                'date_end'=> $line->date_end ?dol_print_date($line->date_end, 'dayrfc') : '',
-                                                'product_id'=>$line->fk_product,
-                                                'product_ref'=>$line->product_ref,
-                                                'product_label'=>$line->product_label,
-                                                'product_desc'=>$line->product_desc,
+												'desc'=>dol_htmlcleanlastbr($line->desc),
+												'total_net'=>$line->total_ht,
+												'total_vat'=>$line->total_tva,
+												'total'=>$line->total_ttc,
+												'vat_rate'=>$line->tva_tx,
+												'qty'=>$line->qty,
+												'unitprice'=> $line->subprice,
+												'date_start'=> $line->date_start ?dol_print_date($line->date_start, 'dayrfc') : '',
+												'date_end'=> $line->date_end ?dol_print_date($line->date_end, 'dayrfc') : '',
+												'product_id'=>$line->fk_product,
+												'product_ref'=>$line->product_ref,
+												'product_label'=>$line->product_label,
+												'product_desc'=>$line->product_desc,
 					);
 					$i++;
 				}
 
-			    // Create invoice
-			    $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'invoice'=>array(
-				    	'id' => $invoice->id,
+				// Create invoice
+				$objectresp = array(
+					'result'=>array('result_code'=>'OK', 'result_label'=>''),
+					'invoice'=>array(
+						'id' => $invoice->id,
 			   			'ref' => $invoice->ref,
-			        	'ref_ext' => $invoice->ref_ext ? $invoice->ref_ext : '', // If not defined, field is not added into soap
-			        	'thirdparty_id' => $invoice->socid,
-			        	'fk_user_author' => $invoice->user_author ? $invoice->user_author : '',
-			        	'fk_user_valid' => $invoice->user_valid ? $invoice->user_valid : '',
-			        	'date' => $invoice->date ?dol_print_date($invoice->date, 'dayrfc') : '',
-			        	'date_due' => $invoice->date_lim_reglement ?dol_print_date($invoice->date_lim_reglement, 'dayrfc') : '',
-			        	'date_creation' => $invoice->date_creation ?dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
-			        	'date_validation' => $invoice->date_validation ?dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
-			        	'date_modification' => $invoice->datem ?dol_print_date($invoice->datem, 'dayhourrfc') : '',
-			        	'type' => $invoice->type,
-			        	'total_net' => $invoice->total_ht,
-			        	'total_vat' => $invoice->total_tva,
-			        	'total' => $invoice->total_ttc,
-			        	'note_private' => $invoice->note_private ? $invoice->note_private : '',
-			        	'note_public' => $invoice->note_public ? $invoice->note_public : '',
-			        	'status' => $invoice->statut,
+						'ref_ext' => $invoice->ref_ext ? $invoice->ref_ext : '', // If not defined, field is not added into soap
+						'thirdparty_id' => $invoice->socid,
+						'fk_user_author' => $invoice->user_author ? $invoice->user_author : '',
+						'fk_user_valid' => $invoice->user_valid ? $invoice->user_valid : '',
+						'date' => $invoice->date ?dol_print_date($invoice->date, 'dayrfc') : '',
+						'date_due' => $invoice->date_lim_reglement ?dol_print_date($invoice->date_lim_reglement, 'dayrfc') : '',
+						'date_creation' => $invoice->date_creation ?dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
+						'date_validation' => $invoice->date_validation ?dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
+						'date_modification' => $invoice->datem ?dol_print_date($invoice->datem, 'dayhourrfc') : '',
+						'type' => $invoice->type,
+						'total_net' => $invoice->total_ht,
+						'total_vat' => $invoice->total_tva,
+						'total' => $invoice->total_ttc,
+						'note_private' => $invoice->note_private ? $invoice->note_private : '',
+						'note_public' => $invoice->note_public ? $invoice->note_public : '',
+						'status' => $invoice->statut,
 					'project_id' => $invoic->fk_project,
-			        	'close_code' => $invoice->close_code ? $invoice->close_code : '',
-			        	'close_note' => $invoice->close_note ? $invoice->close_note : '',
-			        	'payment_mode_id' => $invoice->mode_reglement_id ? $invoice->mode_reglement_id : '',
-			        	'lines' => $linesresp
-			        ));
+						'close_code' => $invoice->close_code ? $invoice->close_code : '',
+						'close_note' => $invoice->close_note ? $invoice->close_note : '',
+						'payment_mode_id' => $invoice->mode_reglement_id ? $invoice->mode_reglement_id : '',
+						'lines' => $linesresp
+					));
 			}
 			else {
 				$error++;
@@ -405,11 +405,11 @@ function getInvoicesForThirdParty($authentication, $idthirdparty)
 
 	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-    // Init and check authentication
-    $objectresp = array();
-    $errorcode = ''; $errorlabel = '';
-    $error = 0;
-    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
 	if ($fuser->socid) $socid = $fuser->socid;
 
@@ -436,76 +436,76 @@ function getInvoicesForThirdParty($authentication, $idthirdparty)
 			$i = 0;
 			while ($i < $num)
 			{
-                // En attendant remplissage par boucle
-			    $obj = $db->fetch_object($resql);
+				// En attendant remplissage par boucle
+				$obj = $db->fetch_object($resql);
 
-			    $invoice = new Facture($db);
-			    $invoice->fetch($obj->facid);
+				$invoice = new Facture($db);
+				$invoice->fetch($obj->facid);
 
-			    // Sécurité pour utilisateur externe
-			    if ($socid && ($socid != $invoice->socid))
-			    {
-			    	$error++;
-			    	$errorcode = 'PERMISSION_DENIED'; $errorlabel = $invoice->socid.' User does not have permission for this request';
-			    }
+				// Sécurité pour utilisateur externe
+				if ($socid && ($socid != $invoice->socid))
+				{
+					$error++;
+					$errorcode = 'PERMISSION_DENIED'; $errorlabel = $invoice->socid.' User does not have permission for this request';
+				}
 
-			    if (!$error)
-			    {
-			    	// Define lines of invoice
-			    	$linesresp = array();
-			    	foreach ($invoice->lines as $line)
-			    	{
-			    		$linesresp[] = array(
-			    			'id'=>$line->id,
-			    			'type'=>$line->product_type,
-			    			'total_net'=>$line->total_ht,
-			    			'total_vat'=>$line->total_tva,
-			    			'total'=>$line->total_ttc,
-			    			'vat_rate'=>$line->tva_tx,
-			    			'qty'=>$line->qty,
-			    			'unitprice'=> $line->subprice,
-			    			'date_start'=> $line->date_start ?dol_print_date($line->date_start, 'dayrfc') : '',
-			    			'date_end'=> $line->date_end ?dol_print_date($line->date_end, 'dayrfc') : '',
-			    			'product_id'=>$line->fk_product,
-			    			'product_ref'=>$line->product_ref,
-			    			'product_label'=>$line->product_label,
-			    			'product_desc'=>$line->product_desc,
-			    		);
-			    	}
+				if (!$error)
+				{
+					// Define lines of invoice
+					$linesresp = array();
+					foreach ($invoice->lines as $line)
+					{
+						$linesresp[] = array(
+							'id'=>$line->id,
+							'type'=>$line->product_type,
+							'total_net'=>$line->total_ht,
+							'total_vat'=>$line->total_tva,
+							'total'=>$line->total_ttc,
+							'vat_rate'=>$line->tva_tx,
+							'qty'=>$line->qty,
+							'unitprice'=> $line->subprice,
+							'date_start'=> $line->date_start ?dol_print_date($line->date_start, 'dayrfc') : '',
+							'date_end'=> $line->date_end ?dol_print_date($line->date_end, 'dayrfc') : '',
+							'product_id'=>$line->fk_product,
+							'product_ref'=>$line->product_ref,
+							'product_label'=>$line->product_label,
+							'product_desc'=>$line->product_desc,
+						);
+					}
 
-			    	// Now define invoice
-			    	$linesinvoice[] = array(
-			    		'id' => $invoice->id,
-			    		'ref' => $invoice->ref,
-			    		'ref_ext' => $invoice->ref_ext ? $invoice->ref_ext : '', // If not defined, field is not added into soap
-			    		'fk_user_author' => $invoice->user_author ? $invoice->user_author : '',
-			    		'fk_user_valid' => $invoice->user_valid ? $invoice->user_valid : '',
-			    		'date' => $invoice->date ?dol_print_date($invoice->date, 'dayrfc') : '',
-			    		'date_due' => $invoice->date_lim_reglement ?dol_print_date($invoice->date_lim_reglement, 'dayrfc') : '',
-                                        'date_creation' => $invoice->date_creation ?dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
-			    		'date_validation' => $invoice->date_validation ?dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
-			    		'date_modification' => $invoice->datem ?dol_print_date($invoice->datem, 'dayhourrfc') : '',
-			    		'type' => $invoice->type,
-			    		'total_net' => $invoice->total_ht,
-			    		'total_vat' => $invoice->total_tva,
-			    		'total' => $invoice->total_ttc,
-			    		'note_private' => $invoice->note_private ? $invoice->note_private : '',
-			    		'note_public' => $invoice->note_public ? $invoice->note_public : '',
-			    		'status'=> $invoice->statut,
-                                        'project_id' => $invoic->fk_project,
-			    		'close_code' => $invoice->close_code ? $invoice->close_code : '',
-			    		'close_note' => $invoice->close_note ? $invoice->close_note : '',
-			    		'payment_mode_id' => $invoice->mode_reglement_id ? $invoice->mode_reglement_id : '',
-			    		'lines' => $linesresp
-			    	);
-			    }
+					// Now define invoice
+					$linesinvoice[] = array(
+						'id' => $invoice->id,
+						'ref' => $invoice->ref,
+						'ref_ext' => $invoice->ref_ext ? $invoice->ref_ext : '', // If not defined, field is not added into soap
+						'fk_user_author' => $invoice->user_author ? $invoice->user_author : '',
+						'fk_user_valid' => $invoice->user_valid ? $invoice->user_valid : '',
+						'date' => $invoice->date ?dol_print_date($invoice->date, 'dayrfc') : '',
+						'date_due' => $invoice->date_lim_reglement ?dol_print_date($invoice->date_lim_reglement, 'dayrfc') : '',
+										'date_creation' => $invoice->date_creation ?dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
+						'date_validation' => $invoice->date_validation ?dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
+						'date_modification' => $invoice->datem ?dol_print_date($invoice->datem, 'dayhourrfc') : '',
+						'type' => $invoice->type,
+						'total_net' => $invoice->total_ht,
+						'total_vat' => $invoice->total_tva,
+						'total' => $invoice->total_ttc,
+						'note_private' => $invoice->note_private ? $invoice->note_private : '',
+						'note_public' => $invoice->note_public ? $invoice->note_public : '',
+						'status'=> $invoice->statut,
+										'project_id' => $invoic->fk_project,
+						'close_code' => $invoice->close_code ? $invoice->close_code : '',
+						'close_note' => $invoice->close_note ? $invoice->close_note : '',
+						'payment_mode_id' => $invoice->mode_reglement_id ? $invoice->mode_reglement_id : '',
+						'lines' => $linesresp
+					);
+				}
 
-			    $i++;
+				$i++;
 			}
 
 			$objectresp = array(
-		    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-		        'invoices'=>$linesinvoice
+				'result'=>array('result_code'=>'OK', 'result_label'=>''),
+				'invoices'=>$linesinvoice
 
 			);
 		}
@@ -533,112 +533,112 @@ function getInvoicesForThirdParty($authentication, $idthirdparty)
  */
 function createInvoice($authentication, $invoice)
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    $now = dol_now();
+	$now = dol_now();
 
-    dol_syslog("Function: createInvoice login=".$authentication['login']." id=".$invoice->id.
-    		", ref=".$invoice->ref.", ref_ext=".$invoice->ref_ext);
+	dol_syslog("Function: createInvoice login=".$authentication['login']." id=".$invoice->id.
+			", ref=".$invoice->ref.", ref_ext=".$invoice->ref_ext);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-    // Init and check authentication
-    $objectresp = array();
-    $errorcode = ''; $errorlabel = '';
-    $error = 0;
-    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
-    // Check parameters
-    if (empty($invoice['id']) && empty($invoice['ref']) && empty($invoice['ref_ext'])) {
-    	$error++; $errorcode = 'KO'; $errorlabel = "Invoice id or ref or ref_ext is mandatory.";
-    }
+	// Check parameters
+	if (empty($invoice['id']) && empty($invoice['ref']) && empty($invoice['ref_ext'])) {
+		$error++; $errorcode = 'KO'; $errorlabel = "Invoice id or ref or ref_ext is mandatory.";
+	}
 
-    if (!$error)
-    {
-        $new_invoice = new Facture($db);
-        $new_invoice->socid = $invoice['thirdparty_id'];
-        $new_invoice->type = $invoice['type'];
-        $new_invoice->ref_ext = $invoice['ref_ext'];
-        $new_invoice->date = dol_stringtotime($invoice['date'], 'dayrfc');
-        $new_invoice->note_private = $invoice['note_private'];
-        $new_invoice->note_public = $invoice['note_public'];
-        $new_invoice->statut = Facture::STATUS_DRAFT; // We start with status draft
-        $new_invoice->fk_project = $invoice['project_id'];
-        $new_invoice->date_creation = $now;
+	if (!$error)
+	{
+		$new_invoice = new Facture($db);
+		$new_invoice->socid = $invoice['thirdparty_id'];
+		$new_invoice->type = $invoice['type'];
+		$new_invoice->ref_ext = $invoice['ref_ext'];
+		$new_invoice->date = dol_stringtotime($invoice['date'], 'dayrfc');
+		$new_invoice->note_private = $invoice['note_private'];
+		$new_invoice->note_public = $invoice['note_public'];
+		$new_invoice->statut = Facture::STATUS_DRAFT; // We start with status draft
+		$new_invoice->fk_project = $invoice['project_id'];
+		$new_invoice->date_creation = $now;
 
-	    //take mode_reglement and cond_reglement from thirdparty
-        $soc = new Societe($db);
-        $res = $soc->fetch($new_invoice->socid);
-        if ($res > 0) {
-    	    $new_invoice->mode_reglement_id = !empty($invoice['payment_mode_id']) ? $invoice['payment_mode_id'] : $soc->mode_reglement_id;
-            $new_invoice->cond_reglement_id  = $soc->cond_reglement_id;
-        }
-        else $new_invoice->mode_reglement_id = $invoice['payment_mode_id'];
+		//take mode_reglement and cond_reglement from thirdparty
+		$soc = new Societe($db);
+		$res = $soc->fetch($new_invoice->socid);
+		if ($res > 0) {
+			$new_invoice->mode_reglement_id = !empty($invoice['payment_mode_id']) ? $invoice['payment_mode_id'] : $soc->mode_reglement_id;
+			$new_invoice->cond_reglement_id = $soc->cond_reglement_id;
+		}
+		else $new_invoice->mode_reglement_id = $invoice['payment_mode_id'];
 
-        // Trick because nusoap does not store data with same structure if there is one or several lines
-        $arrayoflines = array();
-        if (isset($invoice['lines']['line'][0])) $arrayoflines = $invoice['lines']['line'];
-        else $arrayoflines = $invoice['lines'];
+		// Trick because nusoap does not store data with same structure if there is one or several lines
+		$arrayoflines = array();
+		if (isset($invoice['lines']['line'][0])) $arrayoflines = $invoice['lines']['line'];
+		else $arrayoflines = $invoice['lines'];
 
-        foreach ($arrayoflines as $key => $line)
-        {
-            // $key can be 'line' or '0','1',...
-            $newline = new FactureLigne($db);
-            $newline->product_type = $line['type'];
-            $newline->desc = $line['desc'];
-            $newline->fk_product = $line['fk_product'];
-            $newline->tva_tx = $line['vat_rate'];
-            $newline->qty = $line['qty'];
-            $newline->subprice = $line['unitprice'];
-            $newline->total_ht = $line['total_net'];
-            $newline->total_tva = $line['total_vat'];
-            $newline->total_ttc = $line['total'];
-            $newline->date_start = dol_stringtotime($line['date_start']);
-            $newline->date_end = dol_stringtotime($line['date_end']);
-            $newline->fk_product = $line['product_id'];
-            $new_invoice->lines[] = $newline;
-        }
-        //var_dump($newobject->date_lim_reglement); exit;
-        //var_dump($invoice['lines'][0]['type']);
+		foreach ($arrayoflines as $key => $line)
+		{
+			// $key can be 'line' or '0','1',...
+			$newline = new FactureLigne($db);
+			$newline->product_type = $line['type'];
+			$newline->desc = $line['desc'];
+			$newline->fk_product = $line['fk_product'];
+			$newline->tva_tx = $line['vat_rate'];
+			$newline->qty = $line['qty'];
+			$newline->subprice = $line['unitprice'];
+			$newline->total_ht = $line['total_net'];
+			$newline->total_tva = $line['total_vat'];
+			$newline->total_ttc = $line['total'];
+			$newline->date_start = dol_stringtotime($line['date_start']);
+			$newline->date_end = dol_stringtotime($line['date_end']);
+			$newline->fk_product = $line['product_id'];
+			$new_invoice->lines[] = $newline;
+		}
+		//var_dump($newobject->date_lim_reglement); exit;
+		//var_dump($invoice['lines'][0]['type']);
 
-        $db->begin();
+		$db->begin();
 
-        $result = $new_invoice->create($fuser, 0, dol_stringtotime($invoice['date_due'], 'dayrfc'));
-        if ($result < 0)
-        {
-            $error++;
-        }
+		$result = $new_invoice->create($fuser, 0, dol_stringtotime($invoice['date_due'], 'dayrfc'));
+		if ($result < 0)
+		{
+			$error++;
+		}
 
-        if (!$error && $invoice['status'] == Facture::STATUS_VALIDATED)   // We want invoice to have status validated
-        {
-            $result = $new_invoice->validate($fuser);
-            if ($result < 0)
-            {
-                $error++;
-            }
-        }
+		if (!$error && $invoice['status'] == Facture::STATUS_VALIDATED)   // We want invoice to have status validated
+		{
+			$result = $new_invoice->validate($fuser);
+			if ($result < 0)
+			{
+				$error++;
+			}
+		}
 
-        if (!$error)
-        {
-            $db->commit();
-            $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$new_invoice->id,
-            		'ref'=>$new_invoice->ref, 'ref_ext'=>$new_invoice->ref_ext);
-        }
-        else {
-            $db->rollback();
-            $error++;
-            $errorcode = 'KO';
-            $errorlabel = $new_invoice->error;
-            dol_syslog("Function: createInvoice error while creating".$errorlabel);
-        }
-    }
+		if (!$error)
+		{
+			$db->commit();
+			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$new_invoice->id,
+					'ref'=>$new_invoice->ref, 'ref_ext'=>$new_invoice->ref_ext);
+		}
+		else {
+			$db->rollback();
+			$error++;
+			$errorcode = 'KO';
+			$errorlabel = $new_invoice->error;
+			dol_syslog("Function: createInvoice error while creating".$errorlabel);
+		}
+	}
 
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 /**
@@ -656,7 +656,7 @@ function createInvoiceFromOrder($authentication, $id_order = '', $ref_order = ''
 
 	$now = dol_now();
 
-    dol_syslog("Function: createInvoiceFromOrder login=".$authentication['login']." id=".$id_order.
+	dol_syslog("Function: createInvoiceFromOrder login=".$authentication['login']." id=".$id_order.
 			", ref=".$ref_order.", ref_ext=".$ref_ext_order);
 
 	if ($authentication['entity']) $conf->entity = $authentication['entity'];
@@ -666,7 +666,7 @@ function createInvoiceFromOrder($authentication, $id_order = '', $ref_order = ''
 	$errorcode = ''; $errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
-    if ($fuser->socid) $socid = $fuser->socid;
+	if ($fuser->socid) $socid = $fuser->socid;
 
 	// Check parameters
 	if (empty($id_order) && empty($ref_order) && empty($ref_ext_order)) {
@@ -736,8 +736,8 @@ function updateInvoice($authentication, $invoice)
 {
 	global $db, $conf, $langs;
 
-    dol_syslog("Function: updateInvoice login=".$authentication['login']." id=".$invoice['id'].
-    		", ref=".$invoice['ref'].", ref_ext=".$invoice['ref_ext']);
+	dol_syslog("Function: updateInvoice login=".$authentication['login']." id=".$invoice['id'].
+			", ref=".$invoice['ref'].", ref_ext=".$invoice['ref_ext']);
 
 	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php
index 98c9be86cfc..62e8dc99d72 100644
--- a/htdocs/webservices/server_order.php
+++ b/htdocs/webservices/server_order.php
@@ -112,7 +112,7 @@ $line_fields = array(
 
 $elementtype = 'commandedet';
 
-//Retreive all extrafield for thirdsparty
+//Retrieve all extrafield for thirdsparty
 // fetch optionals attributes and labels
 $extrafields = new ExtraFields($db);
 $extrafields->fetch_name_optionals_label($elementtype, true);
@@ -216,7 +216,7 @@ $order_fields = array(
 
 $elementtype = 'commande';
 
-//Retreive all extrafield for thirdsparty
+//Retrieve all extrafield for thirdsparty
 // fetch optionals attributes and labels
 $extrafields = new ExtraFields($db);
 $extrafields->fetch_name_optionals_label($elementtype, true);
@@ -464,7 +464,7 @@ function getOrder($authentication, $id = '', $ref = '', $ref_ext = '')
 					'mode_reglement_code' => $order->mode_reglement_code,
 					'mode_reglement' => $order->mode_reglement,
 
-					'date_livraison' => $order->date_livraison,
+					'date_livraison' => $order->delivery_date,
 
 					'demand_reason_id' => $order->demand_reason_id,
 					'demand_reason_code' => $order->demand_reason_code,
@@ -476,13 +476,13 @@ function getOrder($authentication, $id = '', $ref = '', $ref_ext = '')
 			else {
 				$error++;
 				$errorcode = 'NOT_FOUND';
-                $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
+				$errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		}
 		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED';
-            $errorlabel = 'User does not have permission for this request';
+			$errorlabel = 'User does not have permission for this request';
 		}
 	}
 
@@ -553,7 +553,7 @@ function getOrdersForThirdParty($authentication, $idthirdparty)
 				{
 					$error++;
 					$errorcode = 'PERMISSION_DENIED';
-                    $errorlabel = $order->socid.' User does not have permission for this request';
+					$errorlabel = $order->socid.' User does not have permission for this request';
 				}
 
 				if (!$error)
@@ -621,7 +621,7 @@ function getOrdersForThirdParty($authentication, $idthirdparty)
 					'mode_reglement' => $order->mode_reglement,
 					'mode_reglement_code' => $order->mode_reglement_code,
 
-					'date_livraison' => $order->date_livraison,
+					'date_livraison' => $order->delivery_date,
 
 					'demand_reason_id' => $order->demand_reason_id,
 					'demand_reason_code' => $order->demand_reason_code,
@@ -675,7 +675,7 @@ function createOrder($authentication, $order)
 	// Init and check authentication
 	$objectresp = array();
 	$errorcode = '';
-    $errorlabel = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
@@ -818,7 +818,7 @@ function validOrder($authentication, $id = '', $id_warehouse = 0)
 	// Init and check authentication
 	$objectresp = array();
 	$errorcode = '';
-    $errorlabel = '';
+	$errorlabel = '';
 	$error = 0;
 	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
@@ -944,7 +944,7 @@ function updateOrder($authentication, $order)
 
 			$elementtype = 'commande';
 
-			//Retreive all extrafield for object
+			//Retrieve all extrafield for object
 			// fetch optionals attributes and labels
 			$extrafields = new ExtraFields($db);
 			$extrafields->fetch_name_optionals_label($elementtype, true);
diff --git a/htdocs/webservices/server_payment.php b/htdocs/webservices/server_payment.php
index 5145c4a3b7b..8a9b19d76d6 100644
--- a/htdocs/webservices/server_payment.php
+++ b/htdocs/webservices/server_payment.php
@@ -44,11 +44,11 @@ $langs->load("main");
 // Enable and test if module web services is enabled
 if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
 {
-       $langs->load("admin");
-       dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-       print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
-       print $langs->trans("ToActivateModule");
-       exit;
+	   $langs->load("admin");
+	   dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
+	   print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
+	   print $langs->trans("ToActivateModule");
+	   exit;
 }
 
 // Create the soap Object
@@ -62,50 +62,50 @@ $server->wsdl->schemaTargetNamespace = $ns;
 
 // Define WSDL Authentication object
 $server->wsdl->addComplexType(
-    'authentication',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'dolibarrkey'       => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
-       'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
-       'login'             => array('name'=>'login', 'type'=>'xsd:string'),
-        'password'          => array('name'=>'password', 'type'=>'xsd:string'),
-        'entity'            => array('name'=>'entity', 'type'=>'xsd:string')
-    )
+	'authentication',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'dolibarrkey'       => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
+	   'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
+	   'login'             => array('name'=>'login', 'type'=>'xsd:string'),
+		'password'          => array('name'=>'password', 'type'=>'xsd:string'),
+		'entity'            => array('name'=>'entity', 'type'=>'xsd:string')
+	)
 );
 // Define WSDL Return object
 $server->wsdl->addComplexType(
-    'result',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'result_code'  => array('name'=>'result_code', 'type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
-    )
+	'result',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'result_code'  => array('name'=>'result_code', 'type'=>'xsd:string'),
+		'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
+	)
 );
 
 // Define WSDL for Payment object
 $server->wsdl->addComplexType(
-    'payment',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'amount'          => array('name'=>'amount', 'type'=>'xsd:double'),
-        'num_payment'     => array('name'=>'num_payment', 'type'=>'xsd:string'),
-        'thirdparty_id'   => array('name'=>'thirdparty_id', 'type'=>'xsd:int'),
-               'bank_account'    => array('name'=>'bank_account', 'type'=>'xsd:int'),
-               'payment_mode_id' => array('name'=>'payment_mode_id', 'type'=>'xsd:int'),
-               'invoice_id'      => array('name'=>'invoice_id', 'type'=>'xsd:int'),
-               'int_label'       => array('name'=>'int_label', 'type'=>'xsd:string'),
-               'emitter'         => array('name'=>'emitter', 'type'=>'xsd:string'),
-               'bank_source'     => array('name'=>'bank_source', 'type'=>'xsd:string'),
-    )
+	'payment',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'amount'          => array('name'=>'amount', 'type'=>'xsd:double'),
+		'num_payment'     => array('name'=>'num_payment', 'type'=>'xsd:string'),
+		'thirdparty_id'   => array('name'=>'thirdparty_id', 'type'=>'xsd:int'),
+			   'bank_account'    => array('name'=>'bank_account', 'type'=>'xsd:int'),
+			   'payment_mode_id' => array('name'=>'payment_mode_id', 'type'=>'xsd:int'),
+			   'invoice_id'      => array('name'=>'invoice_id', 'type'=>'xsd:int'),
+			   'int_label'       => array('name'=>'int_label', 'type'=>'xsd:string'),
+			   'emitter'         => array('name'=>'emitter', 'type'=>'xsd:string'),
+			   'bank_source'     => array('name'=>'bank_source', 'type'=>'xsd:string'),
+	)
 );
 
 // 5 styles: RPC/encoded, RPC/literal, Document/encoded (not WS-I compliant), Document/literal, Document/literal wrapped
@@ -117,16 +117,16 @@ $styleuse = 'encoded'; // encoded/literal/literal wrapped
 
 // Register WSDL
 $server->register(
-    'createPayment',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'payment'=>'tns:payment'),
-    // Exit values
-    array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
-    $ns,
-    $ns.'#createPayment',
-    $styledoc,
-    $styleuse,
-    'WS to create a new payment'
+	'createPayment',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'payment'=>'tns:payment'),
+	// Exit values
+	array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
+	$ns,
+	$ns.'#createPayment',
+	$styledoc,
+	$styleuse,
+	'WS to create a new payment'
 );
 
 
@@ -139,79 +139,79 @@ $server->register(
  */
 function createPayment($authentication, $payment)
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    $now = dol_now();
+	$now = dol_now();
 
-    dol_syslog("Function: createPayment login=".$authentication['login']." id=".$payment->id.
-               ", ref=".$payment->ref.", ref_ext=".$payment->ref_ext);
+	dol_syslog("Function: createPayment login=".$authentication['login']." id=".$payment->id.
+			   ", ref=".$payment->ref.", ref_ext=".$payment->ref_ext);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-    // Init and check authentication
-    $objectresp = array();
-    $errorcode  = '';
-    $errorlabel = '';
-    $error      = 0;
-    $fuser      = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode  = '';
+	$errorlabel = '';
+	$error      = 0;
+	$fuser      = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
-    // Check parameters
-    if (empty($payment['amount']) && empty($payment['thirdparty_id'])) {
-        $error++;
-        $errorcode  = 'KO';
-        $errorlabel = "You must specify the amount and the third party's ID.";
-    }
+	// Check parameters
+	if (empty($payment['amount']) && empty($payment['thirdparty_id'])) {
+		$error++;
+		$errorcode  = 'KO';
+		$errorlabel = "You must specify the amount and the third party's ID.";
+	}
 
-    if (!$error)
-    {
-        $soc = new Societe($db);
-        $res = $soc->fetch($payment['thirdparty_id']);
+	if (!$error)
+	{
+		$soc = new Societe($db);
+		$res = $soc->fetch($payment['thirdparty_id']);
 
-        $new_payment              = new Paiement($db);
-        $new_payment->amount      = doubleval($payment['amount']);
-        $new_payment->num_payment = $payment['num_payment'];
-        $new_payment->fk_account  = intval($payment['bank_account']);
-        $new_payment->paiementid  = !empty($payment['payment_mode_id']) ? intval($payment['payment_mode_id']) : $soc->mode_reglement_id;
-        $new_payment->datepaye    = $now;
-        $new_payment->author      = $payment['thirdparty_id'];
-        $new_payment->amounts     = array();
+		$new_payment              = new Paiement($db);
+		$new_payment->amount      = doubleval($payment['amount']);
+		$new_payment->num_payment = $payment['num_payment'];
+		$new_payment->fk_account  = intval($payment['bank_account']);
+		$new_payment->paiementid  = !empty($payment['payment_mode_id']) ? intval($payment['payment_mode_id']) : $soc->mode_reglement_id;
+		$new_payment->datepaye    = $now;
+		$new_payment->author      = $payment['thirdparty_id'];
+		$new_payment->amounts     = array();
 
-        if (intval($payment['invoice_id']) > 0) {
-            $new_payment->amounts[$payment['invoice_id']] = $new_payment->amount;
-        }
+		if (intval($payment['invoice_id']) > 0) {
+			$new_payment->amounts[$payment['invoice_id']] = $new_payment->amount;
+		}
 
-        $db->begin();
-        $result = $new_payment->create($fuser, true);
+		$db->begin();
+		$result = $new_payment->create($fuser, true);
 
-        if ($payment['bank_account']) {
-            $new_payment->addPaymentToBank($fuser, 'payment', $payment['int_label'], $payment['bank_account'], $payment['emitter'], $payment['bank_source']);
-        }
+		if ($payment['bank_account']) {
+			$new_payment->addPaymentToBank($fuser, 'payment', $payment['int_label'], $payment['bank_account'], $payment['emitter'], $payment['bank_source']);
+		}
 
-        if ($result < 0)
-        {
-            $error++;
-        }
+		if ($result < 0)
+		{
+			$error++;
+		}
 
-        if (!$error)
-        {
-            $db->commit();
-            $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$new_payment->id);
-        }
-        else {
-            $db->rollback();
-            $error++;
-            $errorcode = 'KO';
-            $errorlabel = $new_payment->error;
-            dol_syslog("Function: createInvoice error while creating".$errorlabel);
-        }
-    }
+		if (!$error)
+		{
+			$db->commit();
+			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$new_payment->id);
+		}
+		else {
+			$db->rollback();
+			$error++;
+			$errorcode = 'KO';
+			$errorlabel = $new_payment->error;
+			dol_syslog("Function: createInvoice error while creating".$errorlabel);
+		}
+	}
 
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 // Return the results.
diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index bf29795f0de..f723dcfd054 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -44,11 +44,11 @@ $langs->load("main");
 // Enable and test if module web services is enabled
 if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
 {
-    $langs->load("admin");
-    dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-    print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
-    print $langs->trans("ToActivateModule");
-    exit;
+	$langs->load("admin");
+	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
+	print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
+	print $langs->trans("ToActivateModule");
+	exit;
 }
 
 // Create the soap Object
@@ -62,79 +62,79 @@ $server->wsdl->schemaTargetNamespace = $ns;
 
 // Define WSDL Authentication object
 $server->wsdl->addComplexType(
-    'authentication',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
-    	'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
-    	'login' => array('name'=>'login', 'type'=>'xsd:string'),
-        'password' => array('name'=>'password', 'type'=>'xsd:string'),
-        'entity' => array('name'=>'entity', 'type'=>'xsd:string')
-    )
+	'authentication',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
+		'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
+		'login' => array('name'=>'login', 'type'=>'xsd:string'),
+		'password' => array('name'=>'password', 'type'=>'xsd:string'),
+		'entity' => array('name'=>'entity', 'type'=>'xsd:string')
+	)
 );
 // Define WSDL Return object
 $server->wsdl->addComplexType(
-    'result',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label', 'type'=>'xsd:string')
-    )
+	'result',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
+		'result_label' => array('name'=>'result_label', 'type'=>'xsd:string')
+	)
 );
 
 $productorservice_fields = array(
-    'id' => array('name'=>'id', 'type'=>'xsd:string'),
-    'ref' => array('name'=>'ref', 'type'=>'xsd:string'),
-    'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
-    'type' => array('name'=>'type', 'type'=>'xsd:string'),
-    'label' => array('name'=>'label', 'type'=>'xsd:string'),
-    'description' => array('name'=>'description', 'type'=>'xsd:string'),
-    'date_creation' => array('name'=>'date_creation', 'type'=>'xsd:dateTime'),
-    'date_modification' => array('name'=>'date_modification', 'type'=>'xsd:dateTime'),
-    'note' => array('name'=>'note', 'type'=>'xsd:string'),
-    'status_tobuy' => array('name'=>'status_tobuy', 'type'=>'xsd:string'),
-    'status_tosell' => array('name'=>'status_tosell', 'type'=>'xsd:string'),
-    'barcode' => array('name'=>'barcode', 'type'=>'xsd:string'),
-    'barcode_type' => array('name'=>'barcode_type', 'type'=>'xsd:string'),
-    'country_id' => array('name'=>'country_id', 'type'=>'xsd:string'),
-    'country_code' => array('name'=>'country_code', 'type'=>'xsd:string'),
-    'customcode' => array('name'=>'customcode', 'type'=>'xsd:string'),
+	'id' => array('name'=>'id', 'type'=>'xsd:string'),
+	'ref' => array('name'=>'ref', 'type'=>'xsd:string'),
+	'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
+	'type' => array('name'=>'type', 'type'=>'xsd:string'),
+	'label' => array('name'=>'label', 'type'=>'xsd:string'),
+	'description' => array('name'=>'description', 'type'=>'xsd:string'),
+	'date_creation' => array('name'=>'date_creation', 'type'=>'xsd:dateTime'),
+	'date_modification' => array('name'=>'date_modification', 'type'=>'xsd:dateTime'),
+	'note' => array('name'=>'note', 'type'=>'xsd:string'),
+	'status_tobuy' => array('name'=>'status_tobuy', 'type'=>'xsd:string'),
+	'status_tosell' => array('name'=>'status_tosell', 'type'=>'xsd:string'),
+	'barcode' => array('name'=>'barcode', 'type'=>'xsd:string'),
+	'barcode_type' => array('name'=>'barcode_type', 'type'=>'xsd:string'),
+	'country_id' => array('name'=>'country_id', 'type'=>'xsd:string'),
+	'country_code' => array('name'=>'country_code', 'type'=>'xsd:string'),
+	'customcode' => array('name'=>'customcode', 'type'=>'xsd:string'),
 
-    'price_net' => array('name'=>'price_net', 'type'=>'xsd:string'),
-    'price' => array('name'=>'price', 'type'=>'xsd:string'),
-    'price_min_net' => array('name'=>'price_min_net', 'type'=>'xsd:string'),
-    'price_min' => array('name'=>'price_min', 'type'=>'xsd:string'),
+	'price_net' => array('name'=>'price_net', 'type'=>'xsd:string'),
+	'price' => array('name'=>'price', 'type'=>'xsd:string'),
+	'price_min_net' => array('name'=>'price_min_net', 'type'=>'xsd:string'),
+	'price_min' => array('name'=>'price_min', 'type'=>'xsd:string'),
 
-    'price_base_type' => array('name'=>'price_base_type', 'type'=>'xsd:string'),
+	'price_base_type' => array('name'=>'price_base_type', 'type'=>'xsd:string'),
 
-    'vat_rate' => array('name'=>'vat_rate', 'type'=>'xsd:string'),
-    'vat_npr' => array('name'=>'vat_npr', 'type'=>'xsd:string'),
-    'localtax1_tx' => array('name'=>'localtax1_tx', 'type'=>'xsd:string'),
-    'localtax2_tx' => array('name'=>'localtax2_tx', 'type'=>'xsd:string'),
+	'vat_rate' => array('name'=>'vat_rate', 'type'=>'xsd:string'),
+	'vat_npr' => array('name'=>'vat_npr', 'type'=>'xsd:string'),
+	'localtax1_tx' => array('name'=>'localtax1_tx', 'type'=>'xsd:string'),
+	'localtax2_tx' => array('name'=>'localtax2_tx', 'type'=>'xsd:string'),
 
-    'stock_alert' => array('name'=>'stock_alert', 'type'=>'xsd:string'),
-    'stock_real' => array('name'=>'stock_real', 'type'=>'xsd:string'),
-    'stock_pmp' => array('name'=>'stock_pmp', 'type'=>'xsd:string'),
-    'warehouse_ref' => array('name'=>'warehouse_ref', 'type'=>'xsd:string'), // Used only for create or update to set which warehouse to use for stock correction if stock_real differs from database
+	'stock_alert' => array('name'=>'stock_alert', 'type'=>'xsd:string'),
+	'stock_real' => array('name'=>'stock_real', 'type'=>'xsd:string'),
+	'stock_pmp' => array('name'=>'stock_pmp', 'type'=>'xsd:string'),
+	'warehouse_ref' => array('name'=>'warehouse_ref', 'type'=>'xsd:string'), // Used only for create or update to set which warehouse to use for stock correction if stock_real differs from database
 
-    'canvas' => array('name'=>'canvas', 'type'=>'xsd:string'),
-    'import_key' => array('name'=>'import_key', 'type'=>'xsd:string'),
+	'canvas' => array('name'=>'canvas', 'type'=>'xsd:string'),
+	'import_key' => array('name'=>'import_key', 'type'=>'xsd:string'),
 
-    'dir' => array('name'=>'dir', 'type'=>'xsd:string'),
-    'images' => array('name'=>'images', 'type'=>'tns:ImagesArray')
+	'dir' => array('name'=>'dir', 'type'=>'xsd:string'),
+	'images' => array('name'=>'images', 'type'=>'tns:ImagesArray')
 );
 
 
 $elementtype = 'product';
 
 
-//Retreive all extrafield for product
+//Retrieve all extrafield for product
 // fetch optionals attributes and labels
 $extrafields = new ExtraFields($db);
 $extrafields->fetch_name_optionals_label($elementtype, true);
@@ -158,12 +158,12 @@ if (is_array($extrafield_array)) $productorservice_fields = array_merge($product
 
 // Define other specific objects
 $server->wsdl->addComplexType(
-    'product',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    $productorservice_fields
+	'product',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	$productorservice_fields
 );
 
 
@@ -206,33 +206,33 @@ $server->wsdl->addComplexType(
 
 // Define other specific objects
 $server->wsdl->addComplexType(
-    'filterproduct',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        //'limit' => array('name'=>'limit','type'=>'xsd:string'),
+	'filterproduct',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		//'limit' => array('name'=>'limit','type'=>'xsd:string'),
 		'type' => array('name'=>'type', 'type'=>'xsd:string'),
-	    'status_tobuy' => array('name'=>'status_tobuy', 'type'=>'xsd:string'),
-	    'status_tosell' => array('name'=>'status_tosell', 'type'=>'xsd:string'),
-    )
+		'status_tobuy' => array('name'=>'status_tobuy', 'type'=>'xsd:string'),
+		'status_tosell' => array('name'=>'status_tosell', 'type'=>'xsd:string'),
+	)
 );
 
 $server->wsdl->addComplexType(
-    'ProductsArray2',
-    'complexType',
-    'array',
-    'sequence',
-    '',
-    array(
-        'product' => array(
-            'name' => 'product',
-            'type' => 'tns:product',
-            'minOccurs' => '0',
-            'maxOccurs' => 'unbounded'
-        )
-    )
+	'ProductsArray2',
+	'complexType',
+	'array',
+	'sequence',
+	'',
+	array(
+		'product' => array(
+			'name' => 'product',
+			'type' => 'tns:product',
+			'minOccurs' => '0',
+			'maxOccurs' => 'unbounded'
+		)
+	)
 );
 
 
@@ -247,72 +247,72 @@ $styleuse = 'encoded'; // encoded/literal/literal wrapped
 
 // Register WSDL
 $server->register(
-    'getProductOrService',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string', 'lang'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result', 'product'=>'tns:product'),
-    $ns,
-    $ns.'#getProductOrService',
-    $styledoc,
-    $styleuse,
-    'WS to get product or service'
+	'getProductOrService',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string', 'lang'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result', 'product'=>'tns:product'),
+	$ns,
+	$ns.'#getProductOrService',
+	$styledoc,
+	$styleuse,
+	'WS to get product or service'
 );
 
 // Register WSDL
 $server->register(
-    'createProductOrService',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'product'=>'tns:product'),
-    // Exit values
-    array('result'=>'tns:result', 'id'=>'xsd:string'),
-    $ns,
-    $ns.'#createProductOrService',
-    $styledoc,
-    $styleuse,
-    'WS to create a product or service'
+	'createProductOrService',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'product'=>'tns:product'),
+	// Exit values
+	array('result'=>'tns:result', 'id'=>'xsd:string'),
+	$ns,
+	$ns.'#createProductOrService',
+	$styledoc,
+	$styleuse,
+	'WS to create a product or service'
 );
 
 // Register WSDL
 $server->register(
-    'updateProductOrService',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'product'=>'tns:product'),
-    // Exit values
-    array('result'=>'tns:result', 'id'=>'xsd:string'),
-    $ns,
-    $ns.'#updateProductOrService',
-    $styledoc,
-    $styleuse,
-    'WS to update a product or service'
+	'updateProductOrService',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'product'=>'tns:product'),
+	// Exit values
+	array('result'=>'tns:result', 'id'=>'xsd:string'),
+	$ns,
+	$ns.'#updateProductOrService',
+	$styledoc,
+	$styleuse,
+	'WS to update a product or service'
 );
 
 // Register WSDL
 $server->register(
-    'deleteProductOrService',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'listofid'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result', 'nbdeleted'=>'xsd:int'),
-    $ns,
-    $ns.'#deleteProductOrService',
-    $styledoc,
-    $styleuse,
-    'WS to delete a product or service'
+	'deleteProductOrService',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'listofid'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result', 'nbdeleted'=>'xsd:int'),
+	$ns,
+	$ns.'#deleteProductOrService',
+	$styledoc,
+	$styleuse,
+	'WS to delete a product or service'
 );
 
 // Register WSDL
 $server->register(
-    'getListOfProductsOrServices',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'filterproduct'=>'tns:filterproduct'),
-    // Exit values
-    array('result'=>'tns:result', 'products'=>'tns:ProductsArray2'),
-    $ns,
-    $ns.'#getListOfProductsOrServices',
-    $styledoc,
-    $styleuse,
-    'WS to get list of all products or services id and ref'
+	'getListOfProductsOrServices',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'filterproduct'=>'tns:filterproduct'),
+	// Exit values
+	array('result'=>'tns:result', 'products'=>'tns:ProductsArray2'),
+	$ns,
+	$ns.'#getListOfProductsOrServices',
+	$styledoc,
+	$styleuse,
+	'WS to get list of all products or services id and ref'
 );
 
 // Register WSDL
@@ -342,131 +342,131 @@ $server->register(
  */
 function getProductOrService($authentication, $id = '', $ref = '', $ref_ext = '', $lang = '')
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    dol_syslog("Function: getProductOrService login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
+	dol_syslog("Function: getProductOrService login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
-    $langcode = ($lang ? $lang : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
-    $langs->setDefaultLang($langcode);
+	$langcode = ($lang ? $lang : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
+	$langs->setDefaultLang($langcode);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-    // Init and check authentication
-    $objectresp = array();
-    $errorcode = ''; $errorlabel = '';
-    $error = 0;
-    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
-    // Check parameters
-    if (!$error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
-    {
-        $error++;
-        $errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
-    }
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Check parameters
+	if (!$error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
+	{
+		$error++;
+		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
+	}
 
-    if (!$error)
-    {
-    	$langcode = ($lang ? $lang : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
-    	$langs->setDefaultLang($langcode);
+	if (!$error)
+	{
+		$langcode = ($lang ? $lang : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
+		$langs->setDefaultLang($langcode);
 
-        $fuser->getrights();
+		$fuser->getrights();
 
-        $nbmax = 10;
-        if ($fuser->rights->produit->lire || $fuser->rights->service->lire)
-        {
-            $product = new Product($db);
-            $result = $product->fetch($id, $ref, $ref_ext);
+		$nbmax = 10;
+		if ($fuser->rights->produit->lire || $fuser->rights->service->lire)
+		{
+			$product = new Product($db);
+			$result = $product->fetch($id, $ref, $ref_ext);
 
-            if ($result > 0)
-            {
-            	$product->load_stock();
+			if ($result > 0)
+			{
+				$product->load_stock();
 
-            	$dir = (!empty($conf->product->dir_output) ? $conf->product->dir_output : $conf->service->dir_output);
-            	$pdir = get_exdir($product->id, 2, 0, 0, $product, 'product').$product->ref."/";
-            	$dir = $dir.'/'.$pdir;
+				$dir = (!empty($conf->product->dir_output) ? $conf->product->dir_output : $conf->service->dir_output);
+				$pdir = get_exdir($product->id, 2, 0, 0, $product, 'product').$product->ref."/";
+				$dir = $dir.'/'.$pdir;
 
-            	if (!empty($product->multilangs[$langs->defaultlang]["label"]))     		$product->label = $product->multilangs[$langs->defaultlang]["label"];
-            	if (!empty($product->multilangs[$langs->defaultlang]["description"]))     	$product->description = $product->multilangs[$langs->defaultlang]["description"];
-            	if (!empty($product->multilangs[$langs->defaultlang]["note"]))     		$product->note = $product->multilangs[$langs->defaultlang]["note"];
+				if (!empty($product->multilangs[$langs->defaultlang]["label"]))     		$product->label = $product->multilangs[$langs->defaultlang]["label"];
+				if (!empty($product->multilangs[$langs->defaultlang]["description"]))     	$product->description = $product->multilangs[$langs->defaultlang]["description"];
+				if (!empty($product->multilangs[$langs->defaultlang]["note"]))     		$product->note = $product->multilangs[$langs->defaultlang]["note"];
 
-            	$productorservice_result_fields = array(
-	            	'id' => $product->id,
-	            	'ref' => $product->ref,
-	            	'ref_ext' => $product->ref_ext,
-	            	'label' => $product->label,
-	            	'description' => $product->description,
-	            	'date_creation' => dol_print_date($product->date_creation, 'dayhourrfc'),
-	            	'date_modification' => dol_print_date($product->date_modification, 'dayhourrfc'),
-	            	'note' => $product->note,
-	            	'status_tosell' => $product->status,
-	            	'status_tobuy' => $product->status_buy,
-	            	'type' => $product->type,
-	            	'barcode' => $product->barcode,
-	            	'barcode_type' => $product->barcode_type,
-	            	'country_id' => $product->country_id > 0 ? $product->country_id : '',
-	            	'country_code' => $product->country_code,
-	            	'custom_code' => $product->customcode,
+				$productorservice_result_fields = array(
+					'id' => $product->id,
+					'ref' => $product->ref,
+					'ref_ext' => $product->ref_ext,
+					'label' => $product->label,
+					'description' => $product->description,
+					'date_creation' => dol_print_date($product->date_creation, 'dayhourrfc'),
+					'date_modification' => dol_print_date($product->date_modification, 'dayhourrfc'),
+					'note' => $product->note,
+					'status_tosell' => $product->status,
+					'status_tobuy' => $product->status_buy,
+					'type' => $product->type,
+					'barcode' => $product->barcode,
+					'barcode_type' => $product->barcode_type,
+					'country_id' => $product->country_id > 0 ? $product->country_id : '',
+					'country_code' => $product->country_code,
+					'custom_code' => $product->customcode,
 
-	            	'price_net' => $product->price,
-	            	'price' => $product->price_ttc,
-	            	'price_min_net' => $product->price_min,
-	            	'price_min' => $product->price_min_ttc,
-	            	'price_base_type' => $product->price_base_type,
-	            	'vat_rate' => $product->tva_tx,
-	            	//! French VAT NPR
-	            	'vat_npr' => $product->tva_npr,
-	            	//! Spanish local taxes
-	            	'localtax1_tx' => $product->localtax1_tx,
-	            	'localtax2_tx' => $product->localtax2_tx,
+					'price_net' => $product->price,
+					'price' => $product->price_ttc,
+					'price_min_net' => $product->price_min,
+					'price_min' => $product->price_min_ttc,
+					'price_base_type' => $product->price_base_type,
+					'vat_rate' => $product->tva_tx,
+					//! French VAT NPR
+					'vat_npr' => $product->tva_npr,
+					//! Spanish local taxes
+					'localtax1_tx' => $product->localtax1_tx,
+					'localtax2_tx' => $product->localtax2_tx,
 
-            	    'stock_real' => $product->stock_reel,
-            	    'stock_virtual' => $product->stock_theorique,
-	            	'stock_alert' => $product->seuil_stock_alerte,
-	            	'pmp' => $product->pmp,
-	            	'import_key' => $product->import_key,
-	            	'dir' => $pdir,
-            		'images' => $product->liste_photos($dir, $nbmax)
-            	);
+					'stock_real' => $product->stock_reel,
+					'stock_virtual' => $product->stock_theorique,
+					'stock_alert' => $product->seuil_stock_alerte,
+					'pmp' => $product->pmp,
+					'import_key' => $product->import_key,
+					'dir' => $pdir,
+					'images' => $product->liste_photos($dir, $nbmax)
+				);
 
-            	$elementtype = 'product';
+				$elementtype = 'product';
 
-                //Retreive all extrafield for thirdsparty
-            	// fetch optionals attributes and labels
-            	$extrafields = new ExtraFields($db);
-            	$extrafields->fetch_name_optionals_label($elementtype, true);
-            	//Get extrafield values
-            	$product->fetch_optionals();
+				//Retrieve all extrafield for thirdsparty
+				// fetch optionals attributes and labels
+				$extrafields = new ExtraFields($db);
+				$extrafields->fetch_name_optionals_label($elementtype, true);
+				//Get extrafield values
+				$product->fetch_optionals();
 
-            	if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
-            	{
-            		foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
-	            	{
-	            		$productorservice_result_fields = array_merge($productorservice_result_fields, array('options_'.$key => $product->array_options['options_'.$key]));
-	            	}
-            	}
+				if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+				{
+					foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+					{
+						$productorservice_result_fields = array_merge($productorservice_result_fields, array('options_'.$key => $product->array_options['options_'.$key]));
+					}
+				}
 
-                // Create
-                $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'product'=>$productorservice_result_fields
-                );
-            }
-            else {
-                $error++;
-                $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
-            }
-        }
-        else {
-            $error++;
-            $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
-        }
-    }
+				// Create
+				$objectresp = array(
+					'result'=>array('result_code'=>'OK', 'result_label'=>''),
+					'product'=>$productorservice_result_fields
+				);
+			}
+			else {
+				$error++;
+				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
+			}
+		}
+		else {
+			$error++;
+			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+		}
+	}
 
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
 	//var_dump($objectresp);exit;
-    return $objectresp;
+	return $objectresp;
 }
 
 
@@ -479,54 +479,54 @@ function getProductOrService($authentication, $id = '', $ref = '', $ref_ext = ''
  */
 function createProductOrService($authentication, $product)
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    $now = dol_now();
+	$now = dol_now();
 
-    dol_syslog("Function: createProductOrService login=".$authentication['login']);
+	dol_syslog("Function: createProductOrService login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-    // Init and check authentication
-    $objectresp = array();
-    $errorcode = ''; $errorlabel = '';
-    $error = 0;
-    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
-    // Check parameters
-    if ($product['price_net'] > 0) $product['price_base_type'] = 'HT';
-    if ($product['price'] > 0)     $product['price_base_type'] = 'TTC';
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Check parameters
+	if ($product['price_net'] > 0) $product['price_base_type'] = 'HT';
+	if ($product['price'] > 0)     $product['price_base_type'] = 'TTC';
 
-    if ($product['price_net'] > 0 && $product['price'] > 0)
-    {
-        $error++; $errorcode = 'KO'; $errorlabel = "You must choose between price or price_net to provide price.";
-    }
+	if ($product['price_net'] > 0 && $product['price'] > 0)
+	{
+		$error++; $errorcode = 'KO'; $errorlabel = "You must choose between price or price_net to provide price.";
+	}
 
-    if ($product['barcode'] && !$product['barcode_type'])
-    {
-        $error++; $errorcode = 'KO'; $errorlabel = "You must set a barcode type when setting a barcode.";
-    }
+	if ($product['barcode'] && !$product['barcode_type'])
+	{
+		$error++; $errorcode = 'KO'; $errorlabel = "You must set a barcode type when setting a barcode.";
+	}
 
 
 
-    if (!$error)
-    {
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+	if (!$error)
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
-        $newobject = new Product($db);
-        $newobject->ref = $product['ref'];
-        $newobject->ref_ext = $product['ref_ext'];
-        $newobject->type = $product['type'];
-        $newobject->label = $product['label'];
-        $newobject->description = $product['description'];
-        $newobject->note_public = $product['note_public'];
-        $newobject->note_private = $product['note_private'];
-        $newobject->status = $product['status_tosell'];
-        $newobject->status_buy = $product['status_tobuy'];
-        $newobject->price = $product['price_net'];
-        $newobject->price_ttc = $product['price'];
-        $newobject->tva_tx = $product['vat_rate'];
-        $newobject->price_base_type = $product['price_base_type'];
-        $newobject->date_creation = $now;
+		$newobject = new Product($db);
+		$newobject->ref = $product['ref'];
+		$newobject->ref_ext = $product['ref_ext'];
+		$newobject->type = $product['type'];
+		$newobject->label = $product['label'];
+		$newobject->description = $product['description'];
+		$newobject->note_public = $product['note_public'];
+		$newobject->note_private = $product['note_private'];
+		$newobject->status = $product['status_tosell'];
+		$newobject->status_buy = $product['status_tobuy'];
+		$newobject->price = $product['price_net'];
+		$newobject->price_ttc = $product['price'];
+		$newobject->tva_tx = $product['vat_rate'];
+		$newobject->price_base_type = $product['price_base_type'];
+		$newobject->date_creation = $now;
 
 		if ($product['barcode'])
 		{
@@ -534,16 +534,16 @@ function createProductOrService($authentication, $product)
 			$newobject->barcode_type = $product['barcode_type'];
 		}
 
-        $newobject->stock_reel = $product['stock_real'];
-        $newobject->pmp = $product['pmp'];
-        $newobject->seuil_stock_alert = $product['stock_alert'];
+		$newobject->stock_reel = $product['stock_real'];
+		$newobject->pmp = $product['pmp'];
+		$newobject->seuil_stock_alert = $product['stock_alert'];
 
-        $newobject->country_id = $product['country_id'];
-        if ($product['country_code']) $newobject->country_id = getCountry($product['country_code'], 3);
-        $newobject->customcode = $product['customcode'];
+		$newobject->country_id = $product['country_id'];
+		if ($product['country_code']) $newobject->country_id = getCountry($product['country_code'], 3);
+		$newobject->customcode = $product['customcode'];
 
-        $newobject->canvas = $product['canvas'];
-        /*foreach($product['lines'] as $line)
+		$newobject->canvas = $product['canvas'];
+		/*foreach($product['lines'] as $line)
         {
             $newline=new FactureLigne($db);
             $newline->type=$line['type'];
@@ -556,13 +556,13 @@ function createProductOrService($authentication, $product)
             $newline->qty=$line['qty'];
             $newline->fk_product=$line['product_id'];
         }*/
-        //var_dump($product['ref_ext']);
-        //var_dump($product['lines'][0]['type']);
+		//var_dump($product['ref_ext']);
+		//var_dump($product['lines'][0]['type']);
 
-        $elementtype = 'product';
+		$elementtype = 'product';
 
-        $extrafields = new ExtraFields($db);
-        $extrafields->fetch_name_optionals_label($elementtype, true);
+		$extrafields = new ExtraFields($db);
+		$extrafields->fetch_name_optionals_label($elementtype, true);
 		if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 		{
 			foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
@@ -572,17 +572,17 @@ function createProductOrService($authentication, $product)
 			}
 		}
 
-        $db->begin();
+		$db->begin();
 
-        $result = $newobject->create($fuser, 0);
-        if ($result <= 0)
-        {
-            $error++;
-        }
+		$result = $newobject->create($fuser, 0);
+		if ($result <= 0)
+		{
+			$error++;
+		}
 
-        if (!$error)
-        {
-        	// Update stock if stock count is provided and differs from database after creation or update
+		if (!$error)
+		{
+			// Update stock if stock count is provided and differs from database after creation or update
 			if (isset($product['stock_real']) && $product['stock_real'] != '' && !empty($conf->global->stock->enabled))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
@@ -619,25 +619,25 @@ function createProductOrService($authentication, $product)
 			}
 		}
 
-        if (!$error)
-        {
-            $db->commit();
-            $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
-        }
-        else {
-            $db->rollback();
-            $error++;
-            $errorcode = 'KO';
-            $errorlabel = $newobject->error;
-        }
-    }
+		if (!$error)
+		{
+			$db->commit();
+			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
+		}
+		else {
+			$db->rollback();
+			$error++;
+			$errorcode = 'KO';
+			$errorlabel = $newobject->error;
+		}
+	}
 
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 
@@ -650,87 +650,72 @@ function createProductOrService($authentication, $product)
  */
 function updateProductOrService($authentication, $product)
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    $now = dol_now();
+	$now = dol_now();
 
-    dol_syslog("Function: updateProductOrService login=".$authentication['login']);
+	dol_syslog("Function: updateProductOrService login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-    // Init and check authentication
-    $objectresp = array();
-    $errorcode = ''; $errorlabel = '';
-    $error = 0;
-    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
-    // Check parameters
-    if ($product['price_net'] > 0) $product['price_base_type'] = 'HT';
-    if ($product['price'] > 0)     $product['price_base_type'] = 'TTC';
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Check parameters
+	if ($product['price_net'] > 0) $product['price_base_type'] = 'HT';
+	if ($product['price'] > 0)     $product['price_base_type'] = 'TTC';
 
-    if ($product['price_net'] > 0 && $product['price'] > 0)
-    {
-        $error++; $errorcode = 'KO'; $errorlabel = "You must choose between price or price_net to provide price.";
-    }
+	if ($product['price_net'] > 0 && $product['price'] > 0)
+	{
+		$error++; $errorcode = 'KO'; $errorlabel = "You must choose between price or price_net to provide price.";
+	}
 
 
-    if ($product['barcode'] && !$product['barcode_type'])
-    {
-        $error++; $errorcode = 'KO'; $errorlabel = "You must set a barcode type when setting a barcode.";
-    }
+	if ($product['barcode'] && !$product['barcode_type'])
+	{
+		$error++; $errorcode = 'KO'; $errorlabel = "You must set a barcode type when setting a barcode.";
+	}
 
-    if (!$error)
-    {
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+	if (!$error)
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
-        $newobject = new Product($db);
-        $newobject->fetch($product['id']);
+		$newobject = new Product($db);
+		$newobject->fetch($product['id']);
 
-        if (isset($product['ref']))     $newobject->ref = $product['ref'];
-        if (isset($product['ref_ext'])) $newobject->ref_ext = $product['ref_ext'];
-        $newobject->type = $product['type'];
-        $newobject->label = $product['label'];
-        $newobject->description = $product['description'];
-        $newobject->note = $product['note'];
-        $newobject->status = $product['status_tosell'];
-        $newobject->status_buy = $product['status_tobuy'];
-        $newobject->price = $product['price_net'];
-        $newobject->price_ttc = $product['price'];
-        $newobject->tva_tx = $product['vat_rate'];
-        $newobject->price_base_type = $product['price_base_type'];
-        $newobject->date_creation = $now;
+		if (isset($product['ref']))     $newobject->ref = $product['ref'];
+		if (isset($product['ref_ext'])) $newobject->ref_ext = $product['ref_ext'];
+		$newobject->type = $product['type'];
+		$newobject->label = $product['label'];
+		$newobject->description = $product['description'];
+		$newobject->note = $product['note'];
+		$newobject->status = $product['status_tosell'];
+		$newobject->status_buy = $product['status_tobuy'];
+		$newobject->price = $product['price_net'];
+		$newobject->price_ttc = $product['price'];
+		$newobject->tva_tx = $product['vat_rate'];
+		$newobject->price_base_type = $product['price_base_type'];
+		$newobject->date_creation = $now;
 
-        if ($product['barcode'])
-        {
-                $newobject->barcode = $product['barcode'];
-                $newobject->barcode_type = $product['barcode_type'];
-        }
+		if ($product['barcode'])
+		{
+				$newobject->barcode = $product['barcode'];
+				$newobject->barcode_type = $product['barcode_type'];
+		}
 
-        $newobject->stock_reel = $product['stock_real'];
-        $newobject->pmp = $product['pmp'];
-        $newobject->seuil_stock_alert = $product['stock_alert'];
+		$newobject->stock_reel = $product['stock_real'];
+		$newobject->pmp = $product['pmp'];
+		$newobject->seuil_stock_alert = $product['stock_alert'];
 
-        $newobject->country_id = $product['country_id'];
-        if ($product['country_code']) $newobject->country_id = getCountry($product['country_code'], 3);
-        $newobject->customcode = $product['customcode'];
+		$newobject->country_id = $product['country_id'];
+		if ($product['country_code']) $newobject->country_id = getCountry($product['country_code'], 3);
+		$newobject->customcode = $product['customcode'];
 
-        $newobject->canvas = $product['canvas'];
-        /*foreach($product['lines'] as $line)
-        {
-            $newline=new FactureLigne($db);
-            $newline->type=$line['type'];
-            $newline->desc=$line['desc'];
-            $newline->fk_product=$line['fk_product'];
-            $newline->total_ht=$line['total_net'];
-            $newline->total_vat=$line['total_vat'];
-            $newline->total_ttc=$line['total'];
-            $newline->vat=$line['vat_rate'];
-            $newline->qty=$line['qty'];
-            $newline->fk_product=$line['product_id'];
-        }*/
-        //var_dump($product['ref_ext']);
-        //var_dump($product['lines'][0]['type']);
+		$newobject->canvas = $product['canvas'];
 
-        $elementtype = 'product';
+		$elementtype = 'product';
 
 		$extrafields = new ExtraFields($db);
 		$extrafields->fetch_name_optionals_label($elementtype, true);
@@ -743,15 +728,15 @@ function updateProductOrService($authentication, $product)
 			}
 		}
 
-        $db->begin();
+		$db->begin();
 
-        $result = $newobject->update($newobject->id, $fuser);
-        if ($result <= 0)
-        {
-            $error++;
-        }
-        else {
-        	// Update stock if stock count is provided and differs from database after creation or update
+		$result = $newobject->update($newobject->id, $fuser);
+		if ($result <= 0)
+		{
+			$error++;
+		}
+		else {
+			// Update stock if stock count is provided and differs from database after creation or update
 			if (isset($product['stock_real']) && $product['stock_real'] != '' && !empty($conf->global->stock->enabled))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
@@ -786,47 +771,47 @@ function updateProductOrService($authentication, $product)
 					}
 				}
 			}
-        }
+		}
 
-        if (!$error)
-        {
-            if ($newobject->price_base_type == 'HT')
-            {
-                $result = $newobject->updatePrice($newobject->price, $newobject->price_base_type, $fuser);
-                if ($result <= 0)
-                {
-                    $error++;
-                }
-            }
-            elseif ($newobject->price_base_type == 'TTC')
-            {
-                $result = $newobject->updatePrice($newobject->price_ttc, $newobject->price_base_type);
-                if ($result <= 0)
-                {
-                    $error++;
-                }
-            }
-        }
+		if (!$error)
+		{
+			if ($newobject->price_base_type == 'HT')
+			{
+				$result = $newobject->updatePrice($newobject->price, $newobject->price_base_type, $fuser);
+				if ($result <= 0)
+				{
+					$error++;
+				}
+			}
+			elseif ($newobject->price_base_type == 'TTC')
+			{
+				$result = $newobject->updatePrice($newobject->price_ttc, $newobject->price_base_type);
+				if ($result <= 0)
+				{
+					$error++;
+				}
+			}
+		}
 
-        if (!$error)
-        {
-            $db->commit();
-            $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
-        }
-        else {
-            $db->rollback();
-            $error++;
-            $errorcode = 'KO';
-            $errorlabel = $newobject->error;
-        }
-    }
+		if (!$error)
+		{
+			$db->commit();
+			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
+		}
+		else {
+			$db->rollback();
+			$error++;
+			$errorcode = 'KO';
+			$errorlabel = $newobject->error;
+		}
+	}
 
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 
@@ -839,87 +824,87 @@ function updateProductOrService($authentication, $product)
  */
 function deleteProductOrService($authentication, $listofidstring)
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    dol_syslog("Function: deleteProductOrService login=".$authentication['login']);
+	dol_syslog("Function: deleteProductOrService login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-    // Init and check authentication
-    $objectresp = array();
-    $errorcode = ''; $errorlabel = '';
-    $error = 0;
-    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
 	// User must be defined to user authenticated
-    global $user;
-    $user = $fuser;
+	global $user;
+	$user = $fuser;
 
-    $listofid = explode(',', trim($listofidstring));
-    $listofiddeleted = array();
+	$listofid = explode(',', trim($listofidstring));
+	$listofiddeleted = array();
 
-    // Check parameters
-    if (count($listofid) == 0 || empty($listofid[0]))
-    {
-        $error++; $errorcode = 'KO'; $errorlabel = "List of Id of products or services to delete are required.";
-    }
+	// Check parameters
+	if (count($listofid) == 0 || empty($listofid[0]))
+	{
+		$error++; $errorcode = 'KO'; $errorlabel = "List of Id of products or services to delete are required.";
+	}
 
-    if (!$error)
-    {
-    	$firsterror = '';
+	if (!$error)
+	{
+		$firsterror = '';
 
 		$db->begin();
 
-    	foreach ($listofid as $key => $id)
+		foreach ($listofid as $key => $id)
 		{
-	        $newobject = new Product($db);
-	        $result = $newobject->fetch($id);
+			$newobject = new Product($db);
+			$result = $newobject->fetch($id);
 
-	        if ($result == 0)
-	        {
-	        	$error++;
-		        $firsterror = 'Product or service with id '.$id.' not found';
-		        break;
-	        }
-	        else {
-		        $result = $newobject->delete($user);
-		        if ($result <= 0)
-		        {
-		            $error++;
-		            $firsterror = $newobject->error;
-		            break;
-		        }
+			if ($result == 0)
+			{
+				$error++;
+				$firsterror = 'Product or service with id '.$id.' not found';
+				break;
+			}
+			else {
+				$result = $newobject->delete($user);
+				if ($result <= 0)
+				{
+					$error++;
+					$firsterror = $newobject->error;
+					break;
+				}
 
-		        $listofiddeleted[] = $id;
+				$listofiddeleted[] = $id;
 			}
 		}
 
-	    if (!$error)
-	    {
-	        $db->commit();
-            //$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'listofid'=>$listofiddeleted);
-            $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'nbdeleted'=>count($listofiddeleted));
-	    }
-	    else {
-	    	$db->rollback();
-	        $error++;
-	        $errorcode = 'KO';
-	        $errorlabel = $firsterror;
+		if (!$error)
+		{
+			$db->commit();
+			//$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'listofid'=>$listofiddeleted);
+			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'nbdeleted'=>count($listofiddeleted));
 		}
-    }
+		else {
+			$db->rollback();
+			$error++;
+			$errorcode = 'KO';
+			$errorlabel = $firsterror;
+		}
+	}
 
-    if ($error)
-    {
-        //$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel), 'listofid'=>$listofiddeleted);
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel), 'nbdeleted'=>0);
-    }
-    elseif (count($listofiddeleted) == 0)
-    {
+	if ($error)
+	{
+		//$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel), 'listofid'=>$listofiddeleted);
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel), 'nbdeleted'=>0);
+	}
+	elseif (count($listofiddeleted) == 0)
+	{
    		//$objectresp=array('result'=>array('result_code'=>'NOT_FOUND', 'result_label'=>'No product or service with id '.join(',',$listofid).' found'), 'listofid'=>$listofiddeleted);
    		$objectresp = array('result'=>array('result_code'=>'NOT_FOUND', 'result_label'=>'No product or service with id '.join(',', $listofid).' found'), 'nbdeleted'=>0);
-    }
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 
@@ -932,65 +917,65 @@ function deleteProductOrService($authentication, $listofidstring)
  */
 function getListOfProductsOrServices($authentication, $filterproduct)
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    dol_syslog("Function: getListOfProductsOrServices login=".$authentication['login']);
+	dol_syslog("Function: getListOfProductsOrServices login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-    // Init and check authentication
-    $objectresp = array();
-    $arrayproducts = array();
-    $errorcode = ''; $errorlabel = '';
-    $error = 0;
-    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
-    // Check parameters
+	// Init and check authentication
+	$objectresp = array();
+	$arrayproducts = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Check parameters
 
-    if (!$error)
-    {
-        $sql = "SELECT rowid, ref, ref_ext";
-        $sql .= " FROM ".MAIN_DB_PREFIX."product";
-        $sql .= " WHERE entity=".$conf->entity;
-        foreach ($filterproduct as $key => $val)
-        {
-		    if ($key == 'type' && $val >= 0) $sql .= " AND fk_product_type = ".$db->escape($val);
-		    if ($key == 'status_tosell') $sql .= " AND tosell = ".$db->escape($val);
-		    if ($key == 'status_tobuy') $sql .= " AND tobuy = ".$db->escape($val);
-        }
+	if (!$error)
+	{
+		$sql = "SELECT rowid, ref, ref_ext";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product";
+		$sql .= " WHERE entity=".$conf->entity;
+		foreach ($filterproduct as $key => $val)
+		{
+			if ($key == 'type' && $val >= 0) $sql .= " AND fk_product_type = ".$db->escape($val);
+			if ($key == 'status_tosell') $sql .= " AND tosell = ".$db->escape($val);
+			if ($key == 'status_tobuy') $sql .= " AND tobuy = ".$db->escape($val);
+		}
 		$resql = $db->query($sql);
-        if ($resql)
-        {
-         	$num = $db->num_rows($resql);
+		if ($resql)
+		{
+		 	$num = $db->num_rows($resql);
 
-         	$i = 0;
-         	while ($i < $num)
-         	{
-         		$obj = $db->fetch_object($resql);
-         		$arrayproducts[] = array('id'=>$obj->rowid, 'ref'=>$obj->ref, 'ref_ext'=>$obj->ref_ext);
-         		$i++;
-         	}
-        }
-        else {
-            $error++;
-            $errorcode = $db->lasterrno();
-            $errorlabel = $db->lasterror();
-        }
-    }
+		 	$i = 0;
+		 	while ($i < $num)
+		 	{
+		 		$obj = $db->fetch_object($resql);
+		 		$arrayproducts[] = array('id'=>$obj->rowid, 'ref'=>$obj->ref, 'ref_ext'=>$obj->ref_ext);
+		 		$i++;
+		 	}
+		}
+		else {
+			$error++;
+			$errorcode = $db->lasterrno();
+			$errorlabel = $db->lasterror();
+		}
+	}
 
-    if ($error)
-    {
-        $objectresp = array(
+	if ($error)
+	{
+		$objectresp = array(
 			'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel),
-        	'products'=>$arrayproducts
-        );
-    } else {
-        $objectresp = array(
+			'products'=>$arrayproducts
+		);
+	} else {
+		$objectresp = array(
 			'result'=>array('result_code' => 'OK', 'result_label' => ''),
-        	'products'=>$arrayproducts
-        );
-    }
+			'products'=>$arrayproducts
+		);
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 
@@ -1065,40 +1050,40 @@ function getProductsForCategory($authentication, $id, $lang = '')
 							$dir = $dir.'/'.$pdir;
 
 							$products[] = array(
-						    	'id' => $tmpproduct->id,
+								'id' => $tmpproduct->id,
 					   			'ref' => $tmpproduct->ref,
 					   			'ref_ext' => $tmpproduct->ref_ext,
-					    		'label' => !empty($tmpproduct->multilangs[$langs->defaultlang]["label"]) ? $tmpproduct->multilangs[$langs->defaultlang]["label"] : $tmpproduct->label,
-					    		'description' => !empty($tmpproduct->multilangs[$langs->defaultlang]["description"]) ? $tmpproduct->multilangs[$langs->defaultlang]["description"] : $tmpproduct->description,
-					    		'date_creation' => dol_print_date($tmpproduct->date_creation, 'dayhourrfc'),
-					    		'date_modification' => dol_print_date($tmpproduct->date_modification, 'dayhourrfc'),
-					            'note' => !empty($tmpproduct->multilangs[$langs->defaultlang]["note"]) ? $tmpproduct->multilangs[$langs->defaultlang]["note"] : $tmpproduct->note,
-					            'status_tosell' => $tmpproduct->status,
-					            'status_tobuy' => $tmpproduct->status_buy,
-		                		'type' => $tmpproduct->type,
-						        'barcode' => $tmpproduct->barcode,
-						        'barcode_type' => $tmpproduct->barcode_type,
-		                		'country_id' => $tmpproduct->country_id > 0 ? $tmpproduct->country_id : '',
-						        'country_code' => $tmpproduct->country_code,
-						        'custom_code' => $tmpproduct->customcode,
+								'label' => !empty($tmpproduct->multilangs[$langs->defaultlang]["label"]) ? $tmpproduct->multilangs[$langs->defaultlang]["label"] : $tmpproduct->label,
+								'description' => !empty($tmpproduct->multilangs[$langs->defaultlang]["description"]) ? $tmpproduct->multilangs[$langs->defaultlang]["description"] : $tmpproduct->description,
+								'date_creation' => dol_print_date($tmpproduct->date_creation, 'dayhourrfc'),
+								'date_modification' => dol_print_date($tmpproduct->date_modification, 'dayhourrfc'),
+								'note' => !empty($tmpproduct->multilangs[$langs->defaultlang]["note"]) ? $tmpproduct->multilangs[$langs->defaultlang]["note"] : $tmpproduct->note,
+								'status_tosell' => $tmpproduct->status,
+								'status_tobuy' => $tmpproduct->status_buy,
+								'type' => $tmpproduct->type,
+								'barcode' => $tmpproduct->barcode,
+								'barcode_type' => $tmpproduct->barcode_type,
+								'country_id' => $tmpproduct->country_id > 0 ? $tmpproduct->country_id : '',
+								'country_code' => $tmpproduct->country_code,
+								'custom_code' => $tmpproduct->customcode,
 
-						        'price_net' => $tmpproduct->price,
-						        'price' => $tmpproduct->price_ttc,
-						        'vat_rate' => $tmpproduct->tva_tx,
+								'price_net' => $tmpproduct->price,
+								'price' => $tmpproduct->price_ttc,
+								'vat_rate' => $tmpproduct->tva_tx,
 
 								'price_base_type' => $tmpproduct->price_base_type,
 
-						        'stock_real' => $tmpproduct->stock_reel,
-		                		'stock_alert' => $tmpproduct->seuil_stock_alerte,
-						        'pmp' => $tmpproduct->pmp,
-		                		'import_key' => $tmpproduct->import_key,
-		                		'dir' => $pdir,
+								'stock_real' => $tmpproduct->stock_reel,
+								'stock_alert' => $tmpproduct->seuil_stock_alerte,
+								'pmp' => $tmpproduct->pmp,
+								'import_key' => $tmpproduct->import_key,
+								'dir' => $pdir,
 								'images' => $tmpproduct->liste_photos($dir, $nbmax)
 							);
 
 							$elementtype = 'product';
 
-							//Retreive all extrafield for thirdsparty
+							//Retrieve all extrafield for thirdsparty
 							// fetch optionals attributes and labels
 							$extrafields = new ExtraFields($db);
 							$extrafields->fetch_name_optionals_label($elementtype, true);
diff --git a/htdocs/webservices/server_project.php b/htdocs/webservices/server_project.php
index dc8fc81db2c..9d4c93c9ce9 100644
--- a/htdocs/webservices/server_project.php
+++ b/htdocs/webservices/server_project.php
@@ -39,29 +39,29 @@ $langs->load("main");
 // Enable and test if module web services is enabled
 if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
 {
-    $langs->load("admin");
-    dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-    print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
-    print $langs->trans("ToActivateModule");
-    exit;
+	$langs->load("admin");
+	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
+	print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
+	print $langs->trans("ToActivateModule");
+	exit;
 }
 
 // Create associated types array, with each table
 $listofreferent = array(
-    'propal' => 'propal',
-    'order' => 'commande',
-    'invoice' => 'facture',
-    'invoice_predefined' => 'facture_rec',
-    'proposal_supplier' => 'commande_fournisseur',
-    'order_supplier' => 'commande_fournisseur',
-    'invoice_supplier' => 'facture_fourn',
-    'contract' => 'contrat',
-    'intervention' => 'fichinter',
-    'trip' => 'deplacement',
-    'expensereport' => 'expensereport_det',
-    'donation' => 'don',
-    'agenda' => 'actioncomm',
-    'project_task' => 'projet_task',
+	'propal' => 'propal',
+	'order' => 'commande',
+	'invoice' => 'facture',
+	'invoice_predefined' => 'facture_rec',
+	'proposal_supplier' => 'commande_fournisseur',
+	'order_supplier' => 'commande_fournisseur',
+	'invoice_supplier' => 'facture_fourn',
+	'contract' => 'contrat',
+	'intervention' => 'fichinter',
+	'trip' => 'deplacement',
+	'expensereport' => 'expensereport_det',
+	'donation' => 'don',
+	'agenda' => 'actioncomm',
+	'project_task' => 'projet_task',
 );
 
 // Create the soap Object
@@ -74,121 +74,121 @@ $server->wsdl->schemaTargetNamespace = $ns;
 
 // Define WSDL Authentication object
 $server->wsdl->addComplexType(
-    'authentication',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
-        'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
-        'login' => array('name'=>'login', 'type'=>'xsd:string'),
-        'password' => array('name'=>'password', 'type'=>'xsd:string'),
-        'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
-    )
+	'authentication',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
+		'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
+		'login' => array('name'=>'login', 'type'=>'xsd:string'),
+		'password' => array('name'=>'password', 'type'=>'xsd:string'),
+		'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
+	)
 );
 
 // Define WSDL Return object
 $server->wsdl->addComplexType(
-    'result',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
-    )
+	'result',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
+		'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
+	)
 );
 
 // Define other specific objects
 $server->wsdl->addComplexType(
-    'element',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'id' => array('name'=>'id', 'type'=>'xsd:int'),
-        'user' => array('name'=>'user', 'type'=>'xsd:int'),
-    )
+	'element',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'id' => array('name'=>'id', 'type'=>'xsd:int'),
+		'user' => array('name'=>'user', 'type'=>'xsd:int'),
+	)
 );
 
 $server->wsdl->addComplexType(
-    'elementsArray',
-    'complexType',
-    'array',
-    'sequence',
-    '',
-    array(
-        'elements' => array(
-            'name' => 'elementsArray',
-            'type' => 'tns:element',
-            'minOccurs' => '0',
-            'maxOccurs' => 'unbounded'
-        )
-    )
+	'elementsArray',
+	'complexType',
+	'array',
+	'sequence',
+	'',
+	array(
+		'elements' => array(
+			'name' => 'elementsArray',
+			'type' => 'tns:element',
+			'minOccurs' => '0',
+			'maxOccurs' => 'unbounded'
+		)
+	)
 );
 
 $project_elements = array();
 foreach ($listofreferent as $key => $_)
 {
-    $project_elements[$key] = array('name'=>$key, 'type'=>'tns:elementsArray');
+	$project_elements[$key] = array('name'=>$key, 'type'=>'tns:elementsArray');
 }
 $server->wsdl->addComplexType(
-    'elements',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    $project_elements
+	'elements',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	$project_elements
 );
 
 // Define project
 $project_fields = array(
-    'id' => array('name'=>'id', 'type'=>'xsd:string'),
-    'ref' => array('name'=>'ref', 'type'=>'xsd:string'),
-    'label' => array('name'=>'label', 'type'=>'xsd:string'),
-    'thirdparty_id' => array('name'=>'thirdparty_id', 'type'=>'xsd:int'),
-    'public' => array('name'=>'public', 'type'=>'xsd:int'),
-    'status' => array('name'=>'status', 'type'=>'xsd:int'),
-    'date_start' => array('name'=>'date_start', 'type'=>'xsd:date'),
-    'date_end' => array('name'=>'date_end', 'type'=>'xsd:date'),
-    'budget' => array('name'=>'budget', 'type'=>'xsd:int'),
-    'description' => array('name'=>'description', 'type'=>'xsd:string'),
-    'elements' => array('name'=>'elements', 'type'=>'tns:elements')
+	'id' => array('name'=>'id', 'type'=>'xsd:string'),
+	'ref' => array('name'=>'ref', 'type'=>'xsd:string'),
+	'label' => array('name'=>'label', 'type'=>'xsd:string'),
+	'thirdparty_id' => array('name'=>'thirdparty_id', 'type'=>'xsd:int'),
+	'public' => array('name'=>'public', 'type'=>'xsd:int'),
+	'status' => array('name'=>'status', 'type'=>'xsd:int'),
+	'date_start' => array('name'=>'date_start', 'type'=>'xsd:date'),
+	'date_end' => array('name'=>'date_end', 'type'=>'xsd:date'),
+	'budget' => array('name'=>'budget', 'type'=>'xsd:int'),
+	'description' => array('name'=>'description', 'type'=>'xsd:string'),
+	'elements' => array('name'=>'elements', 'type'=>'tns:elements')
 );
 
 $elementtype = 'project';
 
-//Retreive all extrafield for thirdsparty
+//Retrieve all extrafield for thirdsparty
 // fetch optionals attributes and labels
 $extrafields = new ExtraFields($db);
 $extrafields->fetch_name_optionals_label($elementtype, true);
 $extrafield_array = null;
 if (is_array($extrafields) && count($extrafields) > 0) {
-    $extrafield_array = array();
+	$extrafield_array = array();
 }
 if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 {
 	foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 	{
-	    //$value=$object->array_options["options_".$key];
-	    $type = $extrafields->attributes[$elementtype]['type'][$key];
-	    if ($type == 'date' || $type == 'datetime') {$type = 'xsd:dateTime'; }
-	    else {$type = 'xsd:string'; }
-	    $extrafield_array['options_'.$key] = array('name'=>'options_'.$key, 'type'=>$type);
+		//$value=$object->array_options["options_".$key];
+		$type = $extrafields->attributes[$elementtype]['type'][$key];
+		if ($type == 'date' || $type == 'datetime') {$type = 'xsd:dateTime'; }
+		else {$type = 'xsd:string'; }
+		$extrafield_array['options_'.$key] = array('name'=>'options_'.$key, 'type'=>$type);
 	}
 }
 if (is_array($extrafield_array)) $project_fields = array_merge($project_fields, $extrafield_array);
 
 $server->wsdl->addComplexType(
-    'project',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    $project_fields
+	'project',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	$project_fields
 );
 
 // 5 styles: RPC/encoded, RPC/literal, Document/encoded (not WS-I compliant), Document/literal, Document/literal wrapped
@@ -200,30 +200,30 @@ $styleuse = 'encoded'; // encoded/literal/literal wrapped
 
 // Register WSDL
 $server->register(
-    'createProject',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'project'=>'tns:project'),
-    // Exit values
-    array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string'),
-    $ns,
-    $ns.'#createProject',
-    $styledoc,
-    $styleuse,
-    'WS to create project'
+	'createProject',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'project'=>'tns:project'),
+	// Exit values
+	array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string'),
+	$ns,
+	$ns.'#createProject',
+	$styledoc,
+	$styleuse,
+	'WS to create project'
 );
 
 // Register WSDL
 $server->register(
-    'getProject',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result', 'project'=>'tns:project'),
-    $ns,
-    $ns.'#getProject',
-    $styledoc,
-    $styleuse,
-    'WS to get project'
+	'getProject',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result', 'project'=>'tns:project'),
+	$ns,
+	$ns.'#getProject',
+	$styledoc,
+	$styleuse,
+	'WS to get project'
 );
 
 // Full methods code
@@ -236,96 +236,96 @@ $server->register(
  */
 function createProject($authentication, $project)
 {
-    global $db, $conf;
+	global $db, $conf;
 
-    dol_syslog("Function: createProject login=".$authentication['login']);
+	dol_syslog("Function: createProject login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-    // Init and check authentication
-    $objectresp = array();
-    $errorcode = ''; $errorlabel = '';
-    $error = 0;
-    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
-    // Check parameters
-    if (empty($project['ref']))
-    {
-        $error++; $errorcode = 'KO'; $errorlabel = "Name is mandatory.";
-    }
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Check parameters
+	if (empty($project['ref']))
+	{
+		$error++; $errorcode = 'KO'; $errorlabel = "Name is mandatory.";
+	}
 
 
-    if (!$error)
-    {
-        $fuser->getrights();
+	if (!$error)
+	{
+		$fuser->getrights();
 
-        if ($fuser->rights->projet->creer)
-        {
-            $newobject = new Project($db);
-            $newobject->ref = $project['ref'];
-            $newobject->title = $project['label'];
-            $newobject->socid = $project['thirdparty_id'];
-            $newobject->public = $project['public'];
-            $newobject->statut = $project['status'];
-            $newobject->date_start = dol_stringtotime($project['date_start'], 'dayrfc');
-            $newobject->date_end = dol_stringtotime($project['date_end'], 'dayrfc');
-            $newobject->budget_amount = $project['budget'];
-            $newobject->description = $project['description'];
+		if ($fuser->rights->projet->creer)
+		{
+			$newobject = new Project($db);
+			$newobject->ref = $project['ref'];
+			$newobject->title = $project['label'];
+			$newobject->socid = $project['thirdparty_id'];
+			$newobject->public = $project['public'];
+			$newobject->statut = $project['status'];
+			$newobject->date_start = dol_stringtotime($project['date_start'], 'dayrfc');
+			$newobject->date_end = dol_stringtotime($project['date_end'], 'dayrfc');
+			$newobject->budget_amount = $project['budget'];
+			$newobject->description = $project['description'];
 
-            $elementtype = 'project';
+			$elementtype = 'project';
 
-            // Retrieve all extrafields for project
-            // fetch optionals attributes and labels
-            $extrafields = new ExtraFields($db);
-            $extrafields->fetch_name_optionals_label($elementtype, true);
-            if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
-            {
-            	foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
-	            {
-	                $key = 'options_'.$key;
-	                $newobject->array_options[$key] = $project[$key];
-	            }
-            }
+			// Retrieve all extrafields for project
+			// fetch optionals attributes and labels
+			$extrafields = new ExtraFields($db);
+			$extrafields->fetch_name_optionals_label($elementtype, true);
+			if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+			{
+				foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+				{
+					$key = 'options_'.$key;
+					$newobject->array_options[$key] = $project[$key];
+				}
+			}
 
-            $db->begin();
+			$db->begin();
 
-            $result = $newobject->create($fuser);
-            if (!$error && $result > 0)
-            {
-                // Add myself as project leader
-                $result = $newobject->add_contact($fuser->id, 'PROJECTLEADER', 'internal');
-                if ($result < 0)
-                {
-                    $error++;
-                }
-            }
-            else {
-                $error++;
-            }
+			$result = $newobject->create($fuser);
+			if (!$error && $result > 0)
+			{
+				// Add myself as project leader
+				$result = $newobject->add_contact($fuser->id, 'PROJECTLEADER', 'internal');
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
+			else {
+				$error++;
+			}
 
-            if (!$error)
-            {
-                $db->commit();
-                $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
-            }
-            else {
-                $db->rollback();
-                $error++;
-                $errorcode = 'KO';
-                $errorlabel = $newobject->error;
-            }
-        }
-        else {
-            $error++;
-            $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
-        }
-    }
+			if (!$error)
+			{
+				$db->commit();
+				$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
+			}
+			else {
+				$db->rollback();
+				$error++;
+				$errorcode = 'KO';
+				$errorlabel = $newobject->error;
+			}
+		}
+		else {
+			$error++;
+			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+		}
+	}
 
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 /**
@@ -338,106 +338,106 @@ function createProject($authentication, $project)
  */
 function getProject($authentication, $id = '', $ref = '')
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    dol_syslog("Function: getProject login=".$authentication['login']." id=".$id." ref=".$ref);
+	dol_syslog("Function: getProject login=".$authentication['login']." id=".$id." ref=".$ref);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-    // Init and check authentication
-    $objectresp = array();
-    $errorcode = ''; $errorlabel = '';
-    $error = 0;
-    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
-    // Check parameters
-    if (!$error && (($id && $ref)))
-    {
-        $error++;
-        $errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id and ref can't be both provided. You must choose one or other but not both.";
-    }
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Check parameters
+	if (!$error && (($id && $ref)))
+	{
+		$error++;
+		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id and ref can't be both provided. You must choose one or other but not both.";
+	}
 
-    if (!$error)
-    {
-        $fuser->getrights();
+	if (!$error)
+	{
+		$fuser->getrights();
 
-        if ($fuser->rights->projet->lire)
-        {
-            $project = new Project($db);
-            $result = $project->fetch($id, $ref);
-            if ($result > 0)
-            {
-                $project_result_fields = array(
-                    'id' => $project->id,
-                    'ref' => $project->ref,
-                    'label' => $project->title,
-                    'thirdparty_id' => $project->socid,
-                    'public' => $project->public,
-                    'status' => $project->statut,
-                    'date_start' => $project->date_start ? dol_print_date($project->date_start, 'dayrfc') : '',
-                    'date_end' => $project->date_end ? dol_print_date($project->date_end, 'dayrfc') : '',
-                    'budget' => $project->budget_amount,
-                    'description' => $project->description,
-                );
+		if ($fuser->rights->projet->lire)
+		{
+			$project = new Project($db);
+			$result = $project->fetch($id, $ref);
+			if ($result > 0)
+			{
+				$project_result_fields = array(
+					'id' => $project->id,
+					'ref' => $project->ref,
+					'label' => $project->title,
+					'thirdparty_id' => $project->socid,
+					'public' => $project->public,
+					'status' => $project->statut,
+					'date_start' => $project->date_start ? dol_print_date($project->date_start, 'dayrfc') : '',
+					'date_end' => $project->date_end ? dol_print_date($project->date_end, 'dayrfc') : '',
+					'budget' => $project->budget_amount,
+					'description' => $project->description,
+				);
 
-                $elementtype = 'project';
+				$elementtype = 'project';
 
-                //Retrieve all extrafields for project
-                $extrafields = new ExtraFields($db);
-                $extrafields->fetch_name_optionals_label($elementtype, true);
+				//Retrieve all extrafields for project
+				$extrafields = new ExtraFields($db);
+				$extrafields->fetch_name_optionals_label($elementtype, true);
 
-                //Get extrafield values
-                if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
-                {
-                	$project->fetch_optionals();
-	                foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
-	                {
-	                    $project_result_fields = array_merge($project_result_fields, array('options_'.$key => $project->array_options['options_'.$key]));
-	                }
-                }
+				//Get extrafield values
+				if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+				{
+					$project->fetch_optionals();
+					foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+					{
+						$project_result_fields = array_merge($project_result_fields, array('options_'.$key => $project->array_options['options_'.$key]));
+					}
+				}
 
-                //Get linked elements
-                global $listofreferent;
-                $elements = array();
-                foreach ($listofreferent as $key => $tablename)
-                {
-                    $elements[$key] = array();
-                    $element_array = $project->get_element_list($key, $tablename);
-                    if (count($element_array) > 0 && is_array($element_array))
-                    {
-                        foreach ($element_array as $element)
-                        {
-                            $tmp = explode('_', $element);
-                            $idofelement = count($tmp) > 0 ? $tmp[0] : "";
-                            $idofelementuser = count($tmp) > 1 ? $tmp[1] : "";
-                            $elements[$key][] = array('id' => $idofelement, 'user' => $idofelementuser);
-                        }
-                    }
-                }
-                $project_result_fields['elements'] = $elements;
+				//Get linked elements
+				global $listofreferent;
+				$elements = array();
+				foreach ($listofreferent as $key => $tablename)
+				{
+					$elements[$key] = array();
+					$element_array = $project->get_element_list($key, $tablename);
+					if (count($element_array) > 0 && is_array($element_array))
+					{
+						foreach ($element_array as $element)
+						{
+							$tmp = explode('_', $element);
+							$idofelement = count($tmp) > 0 ? $tmp[0] : "";
+							$idofelementuser = count($tmp) > 1 ? $tmp[1] : "";
+							$elements[$key][] = array('id' => $idofelement, 'user' => $idofelementuser);
+						}
+					}
+				}
+				$project_result_fields['elements'] = $elements;
 
-                //Result
-                $objectresp = array(
-                    'result'=>array('result_code'=>'OK', 'result_label'=>''),
-                    'project'=>$project_result_fields
-                );
-            }
-            else {
-                $error++;
-                $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref;
-            }
-        }
-        else {
-            $error++;
-            $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
-        }
-    }
+				//Result
+				$objectresp = array(
+					'result'=>array('result_code'=>'OK', 'result_label'=>''),
+					'project'=>$project_result_fields
+				);
+			}
+			else {
+				$error++;
+				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref;
+			}
+		}
+		else {
+			$error++;
+			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+		}
+	}
 
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 // Return the results.
diff --git a/htdocs/webservices/server_supplier_invoice.php b/htdocs/webservices/server_supplier_invoice.php
index ecf2c51fd1f..be90b60c36f 100644
--- a/htdocs/webservices/server_supplier_invoice.php
+++ b/htdocs/webservices/server_supplier_invoice.php
@@ -54,128 +54,128 @@ $server->wsdl->schemaTargetNamespace = $ns;
 
 // Define WSDL Authentication object
 $server->wsdl->addComplexType(
-    'authentication',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
-    	'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
-    	'login' => array('name'=>'login', 'type'=>'xsd:string'),
-        'password' => array('name'=>'password', 'type'=>'xsd:string'),
-        'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
-    )
+	'authentication',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
+		'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
+		'login' => array('name'=>'login', 'type'=>'xsd:string'),
+		'password' => array('name'=>'password', 'type'=>'xsd:string'),
+		'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
+	)
 );
 // Define WSDL Return object
 $server->wsdl->addComplexType(
-    'result',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
-    )
+	'result',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
+		'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
+	)
 );
 
 // Define other specific objects
 $server->wsdl->addComplexType(
-    'line',
-    'element',
-    'struct',
-    'all',
-    '',
-    array(
-        'id' => array('name'=>'id', 'type'=>'xsd:string'),
-        'type' => array('name'=>'type', 'type'=>'xsd:int'),
-        'desc' => array('name'=>'desc', 'type'=>'xsd:string'),
-    	'fk_product' => array('name'=>'fk_product', 'type'=>'xsd:int'),
-        'total_net' => array('name'=>'total_net', 'type'=>'xsd:double'),
-    	'total_vat' => array('name'=>'total_vat', 'type'=>'xsd:double'),
-    	'total' => array('name'=>'total', 'type'=>'xsd:double'),
-        'vat_rate' => array('name'=>'vat_rate', 'type'=>'xsd:double'),
-        'qty' => array('name'=>'qty', 'type'=>'xsd:double'),
-        'date_start' => array('name'=>'date_start', 'type'=>'xsd:date'),
-        'date_end' => array('name'=>'date_end', 'type'=>'xsd:date'),
-        // From product
-        'product_ref' => array('name'=>'product_ref', 'type'=>'xsd:string'),
-        'product_label' => array('name'=>'product_label', 'type'=>'xsd:string'),
-        'product_desc' => array('name'=>'product_desc', 'type'=>'xsd:string')
-    )
+	'line',
+	'element',
+	'struct',
+	'all',
+	'',
+	array(
+		'id' => array('name'=>'id', 'type'=>'xsd:string'),
+		'type' => array('name'=>'type', 'type'=>'xsd:int'),
+		'desc' => array('name'=>'desc', 'type'=>'xsd:string'),
+		'fk_product' => array('name'=>'fk_product', 'type'=>'xsd:int'),
+		'total_net' => array('name'=>'total_net', 'type'=>'xsd:double'),
+		'total_vat' => array('name'=>'total_vat', 'type'=>'xsd:double'),
+		'total' => array('name'=>'total', 'type'=>'xsd:double'),
+		'vat_rate' => array('name'=>'vat_rate', 'type'=>'xsd:double'),
+		'qty' => array('name'=>'qty', 'type'=>'xsd:double'),
+		'date_start' => array('name'=>'date_start', 'type'=>'xsd:date'),
+		'date_end' => array('name'=>'date_end', 'type'=>'xsd:date'),
+		// From product
+		'product_ref' => array('name'=>'product_ref', 'type'=>'xsd:string'),
+		'product_label' => array('name'=>'product_label', 'type'=>'xsd:string'),
+		'product_desc' => array('name'=>'product_desc', 'type'=>'xsd:string')
+	)
 );
 
 $server->wsdl->addComplexType(
-    'LinesArray',
-    'complexType',
-    'array',
-    '',
-    'SOAP-ENC:Array',
-    array(),
-    array(
-        array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:line[]')
-    ),
-    'tns:line'
+	'LinesArray',
+	'complexType',
+	'array',
+	'',
+	'SOAP-ENC:Array',
+	array(),
+	array(
+		array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:line[]')
+	),
+	'tns:line'
 );
 
 $server->wsdl->addComplexType(
-    'invoice',
-    'element', // If we put element here instead of complexType to have tag called invoice in getInvoicesForThirdParty we brek getInvoice
-    'struct',
-    'all',
-    '',
-    array(
-    	'id' => array('name'=>'id', 'type'=>'xsd:string'),
-        'ref' => array('name'=>'ref', 'type'=>'xsd:string'),
-        'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
-        'ref_supplier' => array('name'=>'ref_supplier', 'type'=>'xsd:string'),
-        'fk_user_author' => array('name'=>'fk_user_author', 'type'=>'xsd:int'),
-        'fk_user_valid' => array('name'=>'fk_user_valid', 'type'=>'xsd:int'),
-        'fk_thirdparty' => array('name'=>'fk_thirdparty', 'type'=>'xsd:int'),
-        'date_creation' => array('name'=>'date_creation', 'type'=>'xsd:dateTime'),
-        'date_validation' => array('name'=>'date_validation', 'type'=>'xsd:dateTime'),
-        'date_modification' => array('name'=>'date_modification', 'type'=>'xsd:dateTime'),
-        'date_invoice' => array('name'=>'date_invoice', 'type'=>'xsd:date'),
-        'date_term' => array('name'=>'date_modification', 'type'=>'xsd:date'),
-    	'label' => array('name'=>'label', 'type'=>'xsd:date'),
-    	'type' => array('name'=>'type', 'type'=>'xsd:int'),
-        'total_net' => array('name'=>'type', 'type'=>'xsd:double'),
-        'total_vat' => array('name'=>'type', 'type'=>'xsd:double'),
-        'total' => array('name'=>'type', 'type'=>'xsd:double'),
-        'note_private' => array('name'=>'note_private', 'type'=>'xsd:string'),
-        'note_public' => array('name'=>'note_public', 'type'=>'xsd:string'),
-        'status' => array('name'=>'status', 'type'=>'xsd:int'),
-        'close_code' => array('name'=>'close_code', 'type'=>'xsd:string'),
-        'close_note' => array('name'=>'close_note', 'type'=>'xsd:string'),
-    	'lines' => array('name'=>'lines', 'type'=>'tns:LinesArray')
-    )
+	'invoice',
+	'element', // If we put element here instead of complexType to have tag called invoice in getInvoicesForThirdParty we brek getInvoice
+	'struct',
+	'all',
+	'',
+	array(
+		'id' => array('name'=>'id', 'type'=>'xsd:string'),
+		'ref' => array('name'=>'ref', 'type'=>'xsd:string'),
+		'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
+		'ref_supplier' => array('name'=>'ref_supplier', 'type'=>'xsd:string'),
+		'fk_user_author' => array('name'=>'fk_user_author', 'type'=>'xsd:int'),
+		'fk_user_valid' => array('name'=>'fk_user_valid', 'type'=>'xsd:int'),
+		'fk_thirdparty' => array('name'=>'fk_thirdparty', 'type'=>'xsd:int'),
+		'date_creation' => array('name'=>'date_creation', 'type'=>'xsd:dateTime'),
+		'date_validation' => array('name'=>'date_validation', 'type'=>'xsd:dateTime'),
+		'date_modification' => array('name'=>'date_modification', 'type'=>'xsd:dateTime'),
+		'date_invoice' => array('name'=>'date_invoice', 'type'=>'xsd:date'),
+		'date_term' => array('name'=>'date_modification', 'type'=>'xsd:date'),
+		'label' => array('name'=>'label', 'type'=>'xsd:date'),
+		'type' => array('name'=>'type', 'type'=>'xsd:int'),
+		'total_net' => array('name'=>'type', 'type'=>'xsd:double'),
+		'total_vat' => array('name'=>'type', 'type'=>'xsd:double'),
+		'total' => array('name'=>'type', 'type'=>'xsd:double'),
+		'note_private' => array('name'=>'note_private', 'type'=>'xsd:string'),
+		'note_public' => array('name'=>'note_public', 'type'=>'xsd:string'),
+		'status' => array('name'=>'status', 'type'=>'xsd:int'),
+		'close_code' => array('name'=>'close_code', 'type'=>'xsd:string'),
+		'close_note' => array('name'=>'close_note', 'type'=>'xsd:string'),
+		'lines' => array('name'=>'lines', 'type'=>'tns:LinesArray')
+	)
 );
 
 $server->wsdl->addComplexType(
-    'InvoicesArray',
-    'complexType',
-    'array',
-    '',
-    'SOAP-ENC:Array',
-    array(),
-    array(
-        array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:invoice[]')
-    ),
-    'tns:invoice'
+	'InvoicesArray',
+	'complexType',
+	'array',
+	'',
+	'SOAP-ENC:Array',
+	array(),
+	array(
+		array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:invoice[]')
+	),
+	'tns:invoice'
 );
 
 $server->wsdl->addComplexType(
-    'invoices',
-    'complexType',
-    'array',
-    '',
-    'SOAP-ENC:Array',
-    array(),
-    array(
-        array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:invoice[]')
-    ),
-    'tns:invoice'
+	'invoices',
+	'complexType',
+	'array',
+	'',
+	'SOAP-ENC:Array',
+	array(),
+	array(
+		array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:invoice[]')
+	),
+	'tns:invoice'
 );
 
 
@@ -189,28 +189,28 @@ $styleuse = 'encoded'; // encoded/literal/literal wrapped
 
 // Register WSDL
 $server->register(
-    'getSupplierInvoice',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result', 'invoice'=>'tns:invoice'),
-    $ns,
-    $ns.'#getSupplierInvoice',
-    $styledoc,
-    $styleuse,
-    'WS to get SupplierInvoice'
+	'getSupplierInvoice',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result', 'invoice'=>'tns:invoice'),
+	$ns,
+	$ns.'#getSupplierInvoice',
+	$styledoc,
+	$styleuse,
+	'WS to get SupplierInvoice'
 );
 $server->register(
-    'getSupplierInvoicesForThirdParty',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'idthirdparty'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result', 'invoices'=>'tns:invoices'),
-    $ns,
-    $ns.'#getSupplierInvoicesForThirdParty',
-    $styledoc,
-    $styleuse,
-    'WS to get SupplierInvoicesForThirdParty'
+	'getSupplierInvoicesForThirdParty',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'idthirdparty'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result', 'invoices'=>'tns:invoices'),
+	$ns,
+	$ns.'#getSupplierInvoicesForThirdParty',
+	$styledoc,
+	$styleuse,
+	'WS to get SupplierInvoicesForThirdParty'
 );
 
 
@@ -231,12 +231,12 @@ function getSupplierInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
 
 	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-    // Init and check authentication
-    $objectresp = array();
-    $errorcode = ''; $errorlabel = '';
-    $error = 0;
-    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
-    // Check parameters
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Check parameters
 	if (!$error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
 	{
 		$error++;
@@ -264,44 +264,44 @@ function getSupplierInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
 						'total_net'=>$line->total_ht,
 						'total_vat'=>$line->total_tva,
 						'total'=>$line->total_ttc,
-                        'vat_rate'=>$line->tva_tx,
-                        'qty'=>$line->qty
+						'vat_rate'=>$line->tva_tx,
+						'qty'=>$line->qty
 					);
 					$i++;
 				}
 
-			    // Create invoice
-			    $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'invoice'=>array(
-				    'id' => $invoice->id,
+				// Create invoice
+				$objectresp = array(
+					'result'=>array('result_code'=>'OK', 'result_label'=>''),
+					'invoice'=>array(
+					'id' => $invoice->id,
 		   			'ref' => $invoice->ref,
-                    'ref_supplier'=>$invoice->ref_supplier,
-		            'ref_ext' => $invoice->ref_ext,
-		            'fk_user_author' => $invoice->fk_user_author,
-		            'fk_user_valid' => $invoice->fk_user_valid,
-                    'fk_thirdparty' => $invoice->fk_soc,
-                    'type'=>$invoice->type,
-                    'status'=>$invoice->statut,
-                    'total_net'=>$invoice->total_ht,
-                    'total_vat'=>$invoice->total_tva,
-                    'total'=>$invoice->total_ttc,
-                    'date_creation'=>dol_print_date($invoice->datec, 'dayhourrfc'),
-                    'date_modification'=>dol_print_date($invoice->tms, 'dayhourrfc'),
-                    'date_invoice'=>dol_print_date($invoice->date, 'dayhourrfc'),
-                    'date_term'=>dol_print_date($invoice->date_echeance, 'dayhourrfc'),
-                    'label'=>$invoice->label,
-                    'paid'=>$invoice->paid,
-                    'note_private'=>$invoice->note_private,
-                    'note_public'=>$invoice->note_public,
-                    'close_code'=>$invoice->close_code,
-                    'close_note'=>$invoice->close_note,
+					'ref_supplier'=>$invoice->ref_supplier,
+					'ref_ext' => $invoice->ref_ext,
+					'fk_user_author' => $invoice->fk_user_author,
+					'fk_user_valid' => $invoice->fk_user_valid,
+					'fk_thirdparty' => $invoice->fk_soc,
+					'type'=>$invoice->type,
+					'status'=>$invoice->statut,
+					'total_net'=>$invoice->total_ht,
+					'total_vat'=>$invoice->total_tva,
+					'total'=>$invoice->total_ttc,
+					'date_creation'=>dol_print_date($invoice->datec, 'dayhourrfc'),
+					'date_modification'=>dol_print_date($invoice->tms, 'dayhourrfc'),
+					'date_invoice'=>dol_print_date($invoice->date, 'dayhourrfc'),
+					'date_term'=>dol_print_date($invoice->date_echeance, 'dayhourrfc'),
+					'label'=>$invoice->label,
+					'paid'=>$invoice->paid,
+					'note_private'=>$invoice->note_private,
+					'note_public'=>$invoice->note_public,
+					'close_code'=>$invoice->close_code,
+					'close_note'=>$invoice->close_note,
 
-                    'lines' => $linesresp,
-                    // 'lines' => array('0'=>array('id'=>222,'type'=>1),
-                    // '1'=>array('id'=>333,'type'=>1)),
+					'lines' => $linesresp,
+					// 'lines' => array('0'=>array('id'=>222,'type'=>1),
+					// '1'=>array('id'=>333,'type'=>1)),
 
-			    ));
+				));
 			}
 			else {
 				$error++;
@@ -339,12 +339,12 @@ function getSupplierInvoicesForThirdParty($authentication, $idthirdparty)
 
 	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-    // Init and check authentication
-    $objectresp = array();
-    $errorcode = ''; $errorlabel = '';
-    $error = 0;
-    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
-    // Check parameters
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Check parameters
 	if (!$error && empty($idthirdparty))
 	{
 		$error++;
@@ -361,7 +361,7 @@ function getSupplierInvoicesForThirdParty($authentication, $idthirdparty)
 		//$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product = p.rowid';
 		//$sql.=" WHERE f.fk_soc = s.rowid AND nom = '".$db->escape($idthirdparty)."'";
 		//$sql.=" WHERE f.fk_soc = s.rowid AND nom = '".$db->escape($idthirdparty)."'";
-        $sql .= " WHERE f.entity = ".$conf->entity;
+		$sql .= " WHERE f.entity = ".$conf->entity;
 		if ($idthirdparty != 'all') $sql .= " AND f.fk_soc = ".$db->escape($idthirdparty);
 
 		$resql = $db->query($sql);
@@ -371,11 +371,11 @@ function getSupplierInvoicesForThirdParty($authentication, $idthirdparty)
 			$i = 0;
 			while ($i < $num)
 			{
-                // En attendant remplissage par boucle
-			    $obj = $db->fetch_object($resql);
+				// En attendant remplissage par boucle
+				$obj = $db->fetch_object($resql);
 
-			    $invoice = new FactureFournisseur($db);
-			    $result = $invoice->fetch($obj->facid);
+				$invoice = new FactureFournisseur($db);
+				$result = $invoice->fetch($obj->facid);
 				if ($result < 0)
 				{
 					$error++;
@@ -387,55 +387,55 @@ function getSupplierInvoicesForThirdParty($authentication, $idthirdparty)
 				$linesresp = array();
 				foreach ($invoice->lines as $line)
 				{
-   				    $linesresp[] = array(
-    					'id'=>$line->rowid,
-    					'type'=>$line->product_type,
-                        'desc'=>dol_htmlcleanlastbr($line->description),
-    					'total_net'=>$line->total_ht,
-    					'total_vat'=>$line->total_tva,
-    					'total'=>$line->total_ttc,
-                        'vat_rate'=>$line->tva_tx,
-                        'qty'=>$line->qty,
-   				        'product_ref'=>$line->product_ref,
-                        'product_label'=>$line->product_label,
-                        'product_desc'=>$line->product_desc,
-   				    );
+   					$linesresp[] = array(
+						'id'=>$line->rowid,
+						'type'=>$line->product_type,
+						'desc'=>dol_htmlcleanlastbr($line->description),
+						'total_net'=>$line->total_ht,
+						'total_vat'=>$line->total_tva,
+						'total'=>$line->total_ttc,
+						'vat_rate'=>$line->tva_tx,
+						'qty'=>$line->qty,
+   						'product_ref'=>$line->product_ref,
+						'product_label'=>$line->product_label,
+						'product_desc'=>$line->product_desc,
+   					);
 				}
 
 				// Now define invoice
 				$linesinvoice[] = array(
 					'id'=>$invoice->id,
-				    'ref'=>$invoice->ref,
-				    'ref_supplier'=>$invoice->ref_supplier,
-				    'ref_ext'=>$invoice->ref_ext,
-                    'fk_user_author' => $invoice->fk_user_author,
-                    'fk_user_valid' => $invoice->fk_user_valid,
-                    'fk_thirdparty' => $invoice->fk_soc,
-				    'type'=>$invoice->type,
-                    'status'=>$invoice->statut,
-				    'total_net'=>$invoice->total_ht,
+					'ref'=>$invoice->ref,
+					'ref_supplier'=>$invoice->ref_supplier,
+					'ref_ext'=>$invoice->ref_ext,
+					'fk_user_author' => $invoice->fk_user_author,
+					'fk_user_valid' => $invoice->fk_user_valid,
+					'fk_thirdparty' => $invoice->fk_soc,
+					'type'=>$invoice->type,
+					'status'=>$invoice->statut,
+					'total_net'=>$invoice->total_ht,
 					'total_vat'=>$invoice->total_tva,
 					'total'=>$invoice->total_ttc,
-                    'date_creation'=>dol_print_date($invoice->datec, 'dayhourrfc'),
-                    'date_modification'=>dol_print_date($invoice->tms, 'dayhourrfc'),
-                    'date_invoice'=>dol_print_date($invoice->date, 'dayhourrfc'),
-                    'date_term'=>dol_print_date($invoice->date_echeance, 'dayhourrfc'),
-                    'label'=>$invoice->label,
-                    'paid'=>$invoice->paid,
-                    'note_private'=>$invoice->note_private,
-                    'note_public'=>$invoice->note_public,
-                    'close_code'=>$invoice->close_code,
-                    'close_note'=>$invoice->close_note,
+					'date_creation'=>dol_print_date($invoice->datec, 'dayhourrfc'),
+					'date_modification'=>dol_print_date($invoice->tms, 'dayhourrfc'),
+					'date_invoice'=>dol_print_date($invoice->date, 'dayhourrfc'),
+					'date_term'=>dol_print_date($invoice->date_echeance, 'dayhourrfc'),
+					'label'=>$invoice->label,
+					'paid'=>$invoice->paid,
+					'note_private'=>$invoice->note_private,
+					'note_public'=>$invoice->note_public,
+					'close_code'=>$invoice->close_code,
+					'close_note'=>$invoice->close_note,
 
-				    'lines' => $linesresp
+					'lines' => $linesresp
 				);
 
 				$i++;
 			}
 
 			$objectresp = array(
-		    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-		        'invoices'=>$linesinvoice
+				'result'=>array('result_code'=>'OK', 'result_label'=>''),
+				'invoices'=>$linesinvoice
 
 			);
 		}
diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index 1e9f8355d52..3a1e911f510 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -56,69 +56,69 @@ $server->wsdl->schemaTargetNamespace = $ns;
 
 // Define WSDL Authentication object
 $server->wsdl->addComplexType(
-    'authentication',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
-    	'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
-    	'login' => array('name'=>'login', 'type'=>'xsd:string'),
-        'password' => array('name'=>'password', 'type'=>'xsd:string'),
-        'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
-    )
+	'authentication',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
+		'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
+		'login' => array('name'=>'login', 'type'=>'xsd:string'),
+		'password' => array('name'=>'password', 'type'=>'xsd:string'),
+		'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
+	)
 );
 // Define WSDL Return object
 $server->wsdl->addComplexType(
-    'result',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
-    )
+	'result',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
+		'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
+	)
 );
 
 
 $thirdparty_fields = array(
-    	'id' => array('name'=>'id', 'type'=>'xsd:string'),
-        'ref' => array('name'=>'name', 'type'=>'xsd:string'),
-        'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
-        'fk_user_author' => array('name'=>'fk_user_author', 'type'=>'xsd:string'),
+		'id' => array('name'=>'id', 'type'=>'xsd:string'),
+		'ref' => array('name'=>'name', 'type'=>'xsd:string'),
+		'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
+		'fk_user_author' => array('name'=>'fk_user_author', 'type'=>'xsd:string'),
 		'status' => array('name'=>'status', 'type'=>'xsd:string'),
-        'client' => array('name'=>'client', 'type'=>'xsd:string'),
-        'supplier' => array('name'=>'supplier', 'type'=>'xsd:string'),
-        'customer_code' => array('name'=>'customer_code', 'type'=>'xsd:string'),
-        'supplier_code' => array('name'=>'supplier_code', 'type'=>'xsd:string'),
-        'customer_code_accountancy' => array('name'=>'customer_code_accountancy', 'type'=>'xsd:string'),
-        'supplier_code_accountancy' => array('name'=>'supplier_code_accountancy', 'type'=>'xsd:string'),
-        'date_creation' => array('name'=>'date_creation', 'type'=>'xsd:dateTime'),
-        'date_modification' => array('name'=>'date_modification', 'type'=>'xsd:dateTime'),
-        'note_private' => array('name'=>'note_private', 'type'=>'xsd:string'),
+		'client' => array('name'=>'client', 'type'=>'xsd:string'),
+		'supplier' => array('name'=>'supplier', 'type'=>'xsd:string'),
+		'customer_code' => array('name'=>'customer_code', 'type'=>'xsd:string'),
+		'supplier_code' => array('name'=>'supplier_code', 'type'=>'xsd:string'),
+		'customer_code_accountancy' => array('name'=>'customer_code_accountancy', 'type'=>'xsd:string'),
+		'supplier_code_accountancy' => array('name'=>'supplier_code_accountancy', 'type'=>'xsd:string'),
+		'date_creation' => array('name'=>'date_creation', 'type'=>'xsd:dateTime'),
+		'date_modification' => array('name'=>'date_modification', 'type'=>'xsd:dateTime'),
+		'note_private' => array('name'=>'note_private', 'type'=>'xsd:string'),
 		'note_public' => array('name'=>'note_public', 'type'=>'xsd:string'),
-    	'address' => array('name'=>'address', 'type'=>'xsd:string'),
-    	'zip' => array('name'=>'zip', 'type'=>'xsd:string'),
-    	'town' => array('name'=>'town', 'type'=>'xsd:string'),
-    	'province_id' => array('name'=>'province_id', 'type'=>'xsd:string'),
-    	'country_id' => array('name'=>'country_id', 'type'=>'xsd:string'),
-    	'country_code' => array('name'=>'country_code', 'type'=>'xsd:string'),
-    	'country' => array('name'=>'country', 'type'=>'xsd:string'),
-        'phone' => array('name'=>'phone', 'type'=>'xsd:string'),
-    	'fax' => array('name'=>'fax', 'type'=>'xsd:string'),
-    	'email' => array('name'=>'email', 'type'=>'xsd:string'),
-    	'url' => array('name'=>'url', 'type'=>'xsd:string'),
-    	'profid1' => array('name'=>'profid1', 'type'=>'xsd:string'),
-    	'profid2' => array('name'=>'profid2', 'type'=>'xsd:string'),
-    	'profid3' => array('name'=>'profid3', 'type'=>'xsd:string'),
-    	'profid4' => array('name'=>'profid4', 'type'=>'xsd:string'),
-    	'profid5' => array('name'=>'profid5', 'type'=>'xsd:string'),
-    	'profid6' => array('name'=>'profid6', 'type'=>'xsd:string'),
-        'capital' => array('name'=>'capital', 'type'=>'xsd:string'),
-    	'vat_used' => array('name'=>'vat_used', 'type'=>'xsd:string'),
-    	'vat_number' => array('name'=>'vat_number', 'type'=>'xsd:string'));
+		'address' => array('name'=>'address', 'type'=>'xsd:string'),
+		'zip' => array('name'=>'zip', 'type'=>'xsd:string'),
+		'town' => array('name'=>'town', 'type'=>'xsd:string'),
+		'province_id' => array('name'=>'province_id', 'type'=>'xsd:string'),
+		'country_id' => array('name'=>'country_id', 'type'=>'xsd:string'),
+		'country_code' => array('name'=>'country_code', 'type'=>'xsd:string'),
+		'country' => array('name'=>'country', 'type'=>'xsd:string'),
+		'phone' => array('name'=>'phone', 'type'=>'xsd:string'),
+		'fax' => array('name'=>'fax', 'type'=>'xsd:string'),
+		'email' => array('name'=>'email', 'type'=>'xsd:string'),
+		'url' => array('name'=>'url', 'type'=>'xsd:string'),
+		'profid1' => array('name'=>'profid1', 'type'=>'xsd:string'),
+		'profid2' => array('name'=>'profid2', 'type'=>'xsd:string'),
+		'profid3' => array('name'=>'profid3', 'type'=>'xsd:string'),
+		'profid4' => array('name'=>'profid4', 'type'=>'xsd:string'),
+		'profid5' => array('name'=>'profid5', 'type'=>'xsd:string'),
+		'profid6' => array('name'=>'profid6', 'type'=>'xsd:string'),
+		'capital' => array('name'=>'capital', 'type'=>'xsd:string'),
+		'vat_used' => array('name'=>'vat_used', 'type'=>'xsd:string'),
+		'vat_number' => array('name'=>'vat_number', 'type'=>'xsd:string'));
 
 $elementtype = 'societe';
 
@@ -147,55 +147,55 @@ if (is_array($extrafield_array)) $thirdparty_fields = array_merge($thirdparty_fi
 
 // Define other specific objects
 $server->wsdl->addComplexType(
-    'thirdparty',
-    'complexType',
-    'struct',
-    'all',
-    '',
+	'thirdparty',
+	'complexType',
+	'struct',
+	'all',
+	'',
 	$thirdparty_fields
 );
 
 // Define other specific objects
 $server->wsdl->addComplexType(
-    'filterthirdparty',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        //'limit' => array('name'=>'limit','type'=>'xsd:string'),
-        'client' => array('name'=>'client', 'type'=>'xsd:string'),
-        'supplier' => array('name'=>'supplier', 'type'=>'xsd:string'),
-    	'category' => array('name'=>'category', 'type'=>'xsd:string')
-    )
+	'filterthirdparty',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		//'limit' => array('name'=>'limit','type'=>'xsd:string'),
+		'client' => array('name'=>'client', 'type'=>'xsd:string'),
+		'supplier' => array('name'=>'supplier', 'type'=>'xsd:string'),
+		'category' => array('name'=>'category', 'type'=>'xsd:string')
+	)
 );
 
 $server->wsdl->addComplexType(
-    'ThirdPartiesArray',
-    'complexType',
-    'array',
-    '',
-    'SOAP-ENC:Array',
-    array(),
-    array(
-        array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:thirdparty[]')
-    ),
-    'tns:thirdparty'
+	'ThirdPartiesArray',
+	'complexType',
+	'array',
+	'',
+	'SOAP-ENC:Array',
+	array(),
+	array(
+		array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:thirdparty[]')
+	),
+	'tns:thirdparty'
 );
 $server->wsdl->addComplexType(
-    'ThirdPartiesArray2',
-    'complexType',
-    'array',
-    'sequence',
-    '',
-    array(
-        'thirdparty' => array(
-            'name' => 'thirdparty',
-            'type' => 'tns:thirdparty',
-            'minOccurs' => '0',
-            'maxOccurs' => 'unbounded'
-        )
-    )
+	'ThirdPartiesArray2',
+	'complexType',
+	'array',
+	'sequence',
+	'',
+	array(
+		'thirdparty' => array(
+			'name' => 'thirdparty',
+			'type' => 'tns:thirdparty',
+			'minOccurs' => '0',
+			'maxOccurs' => 'unbounded'
+		)
+	)
 );
 
 
@@ -208,30 +208,30 @@ $styleuse = 'encoded'; // encoded/literal/literal wrapped
 
 // Register WSDL
 $server->register(
-    'getThirdParty',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result', 'thirdparty'=>'tns:thirdparty'),
-    $ns,
-    $ns.'#getThirdParty',
-    $styledoc,
-    $styleuse,
-    'WS to get a thirdparty from its id, ref or ref_ext'
+	'getThirdParty',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result', 'thirdparty'=>'tns:thirdparty'),
+	$ns,
+	$ns.'#getThirdParty',
+	$styledoc,
+	$styleuse,
+	'WS to get a thirdparty from its id, ref or ref_ext'
 );
 
 // Register WSDL
 $server->register(
-    'createThirdParty',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'thirdparty'=>'tns:thirdparty'),
-    // Exit values
-    array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string'),
-    $ns,
-    $ns.'#createThirdParty',
-    $styledoc,
-    $styleuse,
-    'WS to create a thirdparty'
+	'createThirdParty',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'thirdparty'=>'tns:thirdparty'),
+	// Exit values
+	array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string'),
+	$ns,
+	$ns.'#createThirdParty',
+	$styledoc,
+	$styleuse,
+	'WS to create a thirdparty'
 );
 
 // Register WSDL
@@ -251,16 +251,16 @@ $server->register(
 
 // Register WSDL
 $server->register(
-    'getListOfThirdParties',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'filterthirdparty'=>'tns:filterthirdparty'),
-    // Exit values
-    array('result'=>'tns:result', 'thirdparties'=>'tns:ThirdPartiesArray2'),
-    $ns,
-    $ns.'#getListOfThirdParties',
-    $styledoc,
-    $styleuse,
-    'WS to get list of thirdparties id and ref'
+	'getListOfThirdParties',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'filterthirdparty'=>'tns:filterthirdparty'),
+	// Exit values
+	array('result'=>'tns:result', 'thirdparties'=>'tns:ThirdPartiesArray2'),
+	$ns,
+	$ns.'#getListOfThirdParties',
+	$styledoc,
+	$styleuse,
+	'WS to get list of thirdparties id and ref'
 );
 
 // Register WSDL
@@ -296,12 +296,12 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 
 	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-    // Init and check authentication
-    $objectresp = array();
-    $errorcode = ''; $errorlabel = '';
-    $error = 0;
-    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
-    // Check parameters
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Check parameters
 	if (!$error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
 	{
 		$error++;
@@ -319,40 +319,40 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 			if ($result > 0)
 			{
 				$thirdparty_result_fields = array(
-				    	'id' => $thirdparty->id,
+						'id' => $thirdparty->id,
 			   			'ref' => $thirdparty->name,
 			   			'ref_ext' => $thirdparty->ref_ext,
 			   			'status' => $thirdparty->status,
-			            'client' => $thirdparty->client,
-			            'supplier' => $thirdparty->fournisseur,
-				        'customer_code' => $thirdparty->code_client,
-			            'supplier_code' => $thirdparty->code_fournisseur,
-				        'customer_code_accountancy' => $thirdparty->code_compta,
-			            'supplier_code_accountancy' => $thirdparty->code_compta_fournisseur,
-			            'fk_user_author' => $thirdparty->fk_user_author,
-			    		'date_creation' => dol_print_date($thirdparty->date_creation, 'dayhourrfc'),
-			    		'date_modification' => dol_print_date($thirdparty->date_modification, 'dayhourrfc'),
-			            'address' => $thirdparty->address,
-				        'zip' => $thirdparty->zip,
-				        'town' => $thirdparty->town,
-				        'province_id' => $thirdparty->state_id,
-				        'country_id' => $thirdparty->country_id,
-				        'country_code' => $thirdparty->country_code,
-				        'country' => $thirdparty->country,
-			            'phone' => $thirdparty->phone,
-				        'fax' => $thirdparty->fax,
-				        'email' => $thirdparty->email,
-				        'url' => $thirdparty->url,
-				        'profid1' => $thirdparty->idprof1,
-				        'profid2' => $thirdparty->idprof2,
-				        'profid3' => $thirdparty->idprof3,
-				        'profid4' => $thirdparty->idprof4,
-				        'profid5' => $thirdparty->idprof5,
-				        'profid6' => $thirdparty->idprof6,
-			            'capital' => $thirdparty->capital,
+						'client' => $thirdparty->client,
+						'supplier' => $thirdparty->fournisseur,
+						'customer_code' => $thirdparty->code_client,
+						'supplier_code' => $thirdparty->code_fournisseur,
+						'customer_code_accountancy' => $thirdparty->code_compta,
+						'supplier_code_accountancy' => $thirdparty->code_compta_fournisseur,
+						'fk_user_author' => $thirdparty->fk_user_author,
+						'date_creation' => dol_print_date($thirdparty->date_creation, 'dayhourrfc'),
+						'date_modification' => dol_print_date($thirdparty->date_modification, 'dayhourrfc'),
+						'address' => $thirdparty->address,
+						'zip' => $thirdparty->zip,
+						'town' => $thirdparty->town,
+						'province_id' => $thirdparty->state_id,
+						'country_id' => $thirdparty->country_id,
+						'country_code' => $thirdparty->country_code,
+						'country' => $thirdparty->country,
+						'phone' => $thirdparty->phone,
+						'fax' => $thirdparty->fax,
+						'email' => $thirdparty->email,
+						'url' => $thirdparty->url,
+						'profid1' => $thirdparty->idprof1,
+						'profid2' => $thirdparty->idprof2,
+						'profid3' => $thirdparty->idprof3,
+						'profid4' => $thirdparty->idprof4,
+						'profid5' => $thirdparty->idprof5,
+						'profid6' => $thirdparty->idprof6,
+						'capital' => $thirdparty->capital,
 			   			'barcode' => $thirdparty->barcode,
-			            'vat_used' => $thirdparty->tva_assuj,
-				        'vat_number' => $thirdparty->tva_intra,
+						'vat_used' => $thirdparty->tva_assuj,
+						'vat_number' => $thirdparty->tva_intra,
 						'note_private' => $thirdparty->note_private,
 						'note_public' => $thirdparty->note_public);
 
@@ -373,10 +373,10 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 					}
 				}
 
-			    // Create
-			    $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'thirdparty'=>$thirdparty_result_fields);
+				// Create
+				$objectresp = array(
+					'result'=>array('result_code'=>'OK', 'result_label'=>''),
+					'thirdparty'=>$thirdparty_result_fields);
 			}
 			else {
 				$error++;
@@ -408,125 +408,125 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
  */
 function createThirdParty($authentication, $thirdparty)
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    $now = dol_now();
+	$now = dol_now();
 
-    dol_syslog("Function: createThirdParty login=".$authentication['login']);
+	dol_syslog("Function: createThirdParty login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-    // Init and check authentication
-    $objectresp = array();
-    $errorcode = ''; $errorlabel = '';
-    $error = 0;
-    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
-    // Check parameters
-    if (empty($thirdparty['ref']))
-    {
-        $error++; $errorcode = 'KO'; $errorlabel = "Name is mandatory.";
-    }
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Check parameters
+	if (empty($thirdparty['ref']))
+	{
+		$error++; $errorcode = 'KO'; $errorlabel = "Name is mandatory.";
+	}
 
 
-    if (!$error)
-    {
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+	if (!$error)
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
-        $newobject = new Societe($db);
-        $newobject->ref = $thirdparty['ref'];
-        $newobject->name = $thirdparty['ref'];
-        $newobject->ref_ext = $thirdparty['ref_ext'];
-        $newobject->status = $thirdparty['status'];
-        $newobject->client = $thirdparty['client'];
-        $newobject->fournisseur = $thirdparty['supplier'];
-        $newobject->code_client = $thirdparty['customer_code'];
-        $newobject->code_fournisseur = $thirdparty['supplier_code'];
-        $newobject->code_compta = $thirdparty['customer_code_accountancy'];
-        $newobject->code_compta_fournisseur = $thirdparty['supplier_code_accountancy'];
-        $newobject->date_creation = $now;
-        $newobject->note_private = $thirdparty['note_private'];
-        $newobject->note_public = $thirdparty['note_public'];
-        $newobject->address = $thirdparty['address'];
-        $newobject->zip = $thirdparty['zip'];
-        $newobject->town = $thirdparty['town'];
+		$newobject = new Societe($db);
+		$newobject->ref = $thirdparty['ref'];
+		$newobject->name = $thirdparty['ref'];
+		$newobject->ref_ext = $thirdparty['ref_ext'];
+		$newobject->status = $thirdparty['status'];
+		$newobject->client = $thirdparty['client'];
+		$newobject->fournisseur = $thirdparty['supplier'];
+		$newobject->code_client = $thirdparty['customer_code'];
+		$newobject->code_fournisseur = $thirdparty['supplier_code'];
+		$newobject->code_compta = $thirdparty['customer_code_accountancy'];
+		$newobject->code_compta_fournisseur = $thirdparty['supplier_code_accountancy'];
+		$newobject->date_creation = $now;
+		$newobject->note_private = $thirdparty['note_private'];
+		$newobject->note_public = $thirdparty['note_public'];
+		$newobject->address = $thirdparty['address'];
+		$newobject->zip = $thirdparty['zip'];
+		$newobject->town = $thirdparty['town'];
 
-        $newobject->country_id = $thirdparty['country_id'];
-        if ($thirdparty['country_code']) $newobject->country_id = getCountry($thirdparty['country_code'], 3);
-        $newobject->province_id = $thirdparty['province_id'];
-        //if ($thirdparty['province_code']) $newobject->province_code=getCountry($thirdparty['province_code'],3);
+		$newobject->country_id = $thirdparty['country_id'];
+		if ($thirdparty['country_code']) $newobject->country_id = getCountry($thirdparty['country_code'], 3);
+		$newobject->province_id = $thirdparty['province_id'];
+		//if ($thirdparty['province_code']) $newobject->province_code=getCountry($thirdparty['province_code'],3);
 
-        $newobject->phone = $thirdparty['phone'];
-        $newobject->fax = $thirdparty['fax'];
-        $newobject->email = $thirdparty['email'];
-        $newobject->url = $thirdparty['url'];
-        $newobject->idprof1 = $thirdparty['profid1'];
-        $newobject->idprof2 = $thirdparty['profid2'];
-        $newobject->idprof3 = $thirdparty['profid3'];
-        $newobject->idprof4 = $thirdparty['profid4'];
-        $newobject->idprof5 = $thirdparty['profid5'];
-        $newobject->idprof6 = $thirdparty['profid6'];
+		$newobject->phone = $thirdparty['phone'];
+		$newobject->fax = $thirdparty['fax'];
+		$newobject->email = $thirdparty['email'];
+		$newobject->url = $thirdparty['url'];
+		$newobject->idprof1 = $thirdparty['profid1'];
+		$newobject->idprof2 = $thirdparty['profid2'];
+		$newobject->idprof3 = $thirdparty['profid3'];
+		$newobject->idprof4 = $thirdparty['profid4'];
+		$newobject->idprof5 = $thirdparty['profid5'];
+		$newobject->idprof6 = $thirdparty['profid6'];
 
-        $newobject->capital = $thirdparty['capital'];
+		$newobject->capital = $thirdparty['capital'];
 
-        $newobject->barcode = $thirdparty['barcode'];
-        $newobject->tva_assuj = $thirdparty['vat_used'];
-        $newobject->tva_intra = $thirdparty['vat_number'];
+		$newobject->barcode = $thirdparty['barcode'];
+		$newobject->tva_assuj = $thirdparty['vat_used'];
+		$newobject->tva_intra = $thirdparty['vat_number'];
 
-        $newobject->canvas = $thirdparty['canvas'];
-        $newobject->particulier = $thirdparty['individual'];
+		$newobject->canvas = $thirdparty['canvas'];
+		$newobject->particulier = $thirdparty['individual'];
 
-        $elementtype = 'societe';
+		$elementtype = 'societe';
 
-        // Retrieve all extrafields for thirdsparty
-        // fetch optionals attributes and labels
-        $extrafields = new ExtraFields($db);
-        $extrafields->fetch_name_optionals_label($elementtype, true);
-        if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
-        {
-        	foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
-	        {
-	        	$key = 'options_'.$key;
-	        	$newobject->array_options[$key] = $thirdparty[$key];
-	        }
-        }
+		// Retrieve all extrafields for thirdsparty
+		// fetch optionals attributes and labels
+		$extrafields = new ExtraFields($db);
+		$extrafields->fetch_name_optionals_label($elementtype, true);
+		if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+		{
+			foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+			{
+				$key = 'options_'.$key;
+				$newobject->array_options[$key] = $thirdparty[$key];
+			}
+		}
 
-        $db->begin();
+		$db->begin();
 
-        $result = $newobject->create($fuser);
-        if ($newobject->particulier && $result > 0) {
-            $newobject->firstname = $thirdparty['firstname'];
-            $newobject->name_bis = $thirdparty['lastname'];
-            $result = $newobject->create_individual($fuser);
-        }
-        if ($result <= 0)
-        {
-            $error++;
-        }
+		$result = $newobject->create($fuser);
+		if ($newobject->particulier && $result > 0) {
+			$newobject->firstname = $thirdparty['firstname'];
+			$newobject->name_bis = $thirdparty['lastname'];
+			$result = $newobject->create_individual($fuser);
+		}
+		if ($result <= 0)
+		{
+			$error++;
+		}
 
-        if (!$error)
-        {
-            $db->commit();
+		if (!$error)
+		{
+			$db->commit();
 
-            // Patch to add capability to associate (one) sale representative
-            if ($thirdparty['commid'] && $thirdparty['commid'] > 0)
-                $newobject->add_commercial($fuser, $thirdparty["commid"]);
+			// Patch to add capability to associate (one) sale representative
+			if ($thirdparty['commid'] && $thirdparty['commid'] > 0)
+				$newobject->add_commercial($fuser, $thirdparty["commid"]);
 
-            $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
-        }
-        else {
-            $db->rollback();
-            $error++;
-            $errorcode = 'KO';
-            $errorlabel = $newobject->error;
-        }
-    }
+			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
+		}
+		else {
+			$db->rollback();
+			$error++;
+			$errorcode = 'KO';
+			$errorlabel = $newobject->error;
+		}
+	}
 
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 /**
@@ -672,103 +672,103 @@ function updateThirdParty($authentication, $thirdparty)
  */
 function getListOfThirdParties($authentication, $filterthirdparty)
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    $now = dol_now();
+	$now = dol_now();
 
-    dol_syslog("Function: getListOfThirdParties login=".$authentication['login']);
+	dol_syslog("Function: getListOfThirdParties login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-    // Init and check authentication
-    $objectresp = array();
-    $arraythirdparties = array();
+	// Init and check authentication
+	$objectresp = array();
+	$arraythirdparties = array();
 
-    $errorcode = ''; $errorlabel = '';
-    $error = 0;
-    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
-    // Check parameters
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Check parameters
 
-    if (!$error)
-    {
-        $sql  = "SELECT s.rowid as socRowid, s.nom as ref, s.ref_ext, s.address, s.zip, s.town, c.label as country, s.phone, s.fax, s.url, extra.*";
-        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON s.fk_pays = c.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as extra ON s.rowid=fk_object";
+	if (!$error)
+	{
+		$sql  = "SELECT s.rowid as socRowid, s.nom as ref, s.ref_ext, s.address, s.zip, s.town, c.label as country, s.phone, s.fax, s.url, extra.*";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON s.fk_pays = c.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as extra ON s.rowid=fk_object";
 
-        $sql .= " WHERE entity=".$conf->entity;
-        foreach ($filterthirdparty as $key => $val)
-        {
-            if ($key == 'name' && $val != '')  $sql .= " AND s.name LIKE '%".$db->escape($val)."%'";
-        	if ($key == 'client' && (int) $val > 0)  $sql .= " AND s.client = ".$db->escape($val);
-            if ($key == 'supplier' && (int) $val > 0)  $sql .= " AND s.fournisseur = ".$db->escape($val);
-            if ($key == 'category' && (int) $val > 0)  $sql .= " AND s.rowid IN (SELECT fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe WHERE fk_categorie=".$db->escape($val).") ";
-        }
-        dol_syslog("Function: getListOfThirdParties", LOG_DEBUG);
+		$sql .= " WHERE entity=".$conf->entity;
+		foreach ($filterthirdparty as $key => $val)
+		{
+			if ($key == 'name' && $val != '')  $sql .= " AND s.name LIKE '%".$db->escape($val)."%'";
+			if ($key == 'client' && (int) $val > 0)  $sql .= " AND s.client = ".$db->escape($val);
+			if ($key == 'supplier' && (int) $val > 0)  $sql .= " AND s.fournisseur = ".$db->escape($val);
+			if ($key == 'category' && (int) $val > 0)  $sql .= " AND s.rowid IN (SELECT fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe WHERE fk_categorie=".$db->escape($val).") ";
+		}
+		dol_syslog("Function: getListOfThirdParties", LOG_DEBUG);
 
-        $elementtype = 'societe';
+		$elementtype = 'societe';
 
-        $extrafields = new ExtraFields($db);
-        $extrafields->fetch_name_optionals_label($elementtype, true);
+		$extrafields = new ExtraFields($db);
+		$extrafields->fetch_name_optionals_label($elementtype, true);
 
 
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $num = $db->num_rows($resql);
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$num = $db->num_rows($resql);
 
-            $i = 0;
-            while ($i < $num)
-            {
-                $extrafieldsOptions = array();
-                $obj = $db->fetch_object($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$extrafieldsOptions = array();
+				$obj = $db->fetch_object($resql);
 
-                if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
-                {
-                	foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
-	                {
-	                    $extrafieldsOptions['options_'.$key] = $obj->{$key};
-	                }
-                }
+				if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+				{
+					foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+					{
+						$extrafieldsOptions['options_'.$key] = $obj->{$key};
+					}
+				}
 
-                $arraythirdparties[] = array('id'=>$obj->socRowid,
-                    'ref'=>$obj->ref,
-                    'ref_ext'=>$obj->ref_ext,
-                    'adress'=>$obj->adress,
-                    'zip'=>$obj->zip,
-                    'town'=>$obj->town,
-                    'country'=>$obj->country,
-                    'phone'=>$obj->phone,
-                    'fax'=>$obj->fax,
-                    'url'=>$obj->url
-                );
-                $arraythirdparties[$i] = array_merge($arraythirdparties[$i], $extrafieldsOptions);
+				$arraythirdparties[] = array('id'=>$obj->socRowid,
+					'ref'=>$obj->ref,
+					'ref_ext'=>$obj->ref_ext,
+					'adress'=>$obj->adress,
+					'zip'=>$obj->zip,
+					'town'=>$obj->town,
+					'country'=>$obj->country,
+					'phone'=>$obj->phone,
+					'fax'=>$obj->fax,
+					'url'=>$obj->url
+				);
+				$arraythirdparties[$i] = array_merge($arraythirdparties[$i], $extrafieldsOptions);
 
-                $i++;
-            }
-        }
-        else {
-            $error++;
-            $errorcode = $db->lasterrno();
-            $errorlabel = $db->lasterror();
-        }
-    }
+				$i++;
+			}
+		}
+		else {
+			$error++;
+			$errorcode = $db->lasterrno();
+			$errorlabel = $db->lasterror();
+		}
+	}
 
-    if ($error)
-    {
-        $objectresp = array(
-            'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel),
-            'thirdparties'=>$arraythirdparties
-        );
-    }
-    else {
-        $objectresp = array(
-            'result'=>array('result_code' => 'OK', 'result_label' => ''),
-            'thirdparties'=>$arraythirdparties
-        );
-    }
+	if ($error)
+	{
+		$objectresp = array(
+			'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel),
+			'thirdparties'=>$arraythirdparties
+		);
+	}
+	else {
+		$objectresp = array(
+			'result'=>array('result_code' => 'OK', 'result_label' => ''),
+			'thirdparties'=>$arraythirdparties
+		);
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 /**
diff --git a/htdocs/webservices/server_user.php b/htdocs/webservices/server_user.php
index 000bad4b563..6f7ed5c10aa 100644
--- a/htdocs/webservices/server_user.php
+++ b/htdocs/webservices/server_user.php
@@ -38,11 +38,11 @@ $langs->load("main");
 // Enable and test if module web services is enabled
 if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
 {
-    $langs->load("admin");
-    dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-    print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
-    print $langs->trans("ToActivateModule");
-    exit;
+	$langs->load("admin");
+	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
+	print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
+	print $langs->trans("ToActivateModule");
+	exit;
 }
 
 // Create the soap Object
@@ -56,70 +56,70 @@ $server->wsdl->schemaTargetNamespace = $ns;
 
 // Define WSDL Authentication object
 $server->wsdl->addComplexType(
-    'authentication',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
-    	'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
-    	'login' => array('name'=>'login', 'type'=>'xsd:string'),
-    	'password' => array('name'=>'password', 'type'=>'xsd:string'),
-        'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
-    )
+	'authentication',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
+		'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
+		'login' => array('name'=>'login', 'type'=>'xsd:string'),
+		'password' => array('name'=>'password', 'type'=>'xsd:string'),
+		'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
+	)
 );
 
 // Define WSDL Return object
 $server->wsdl->addComplexType(
-    'result',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
-    )
+	'result',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
+		'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
+	)
 );
 
 // Define other specific objects
 $server->wsdl->addComplexType(
-    'user',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'element' => array('name'=>'element', 'type'=>'xsd:string'),
-        'id' => array('name'=>'id', 'type'=>'xsd:string'),
-        'lastname' => array('name'=>'lastname', 'type'=>'xsd:string'),
-        'firstname' => array('name'=>'firstname', 'type'=>'xsd:string'),
-        'note' => array('name'=>'note', 'type'=>'xsd:string'),
-        'email' => array('name'=>'email', 'type'=>'xsd:string'),
-        'signature' => array('name'=>'signature', 'type'=>'xsd:string'),
-        'office_phone' => array('name'=>'office_phone', 'type'=>'xsd:string'),
-        'office_fax' => array('name'=>'office_fax', 'type'=>'xsd:string'),
-        'user_mobile' => array('name'=>'user_mobile', 'type'=>'xsd:string'),
-        'admin' => array('name'=>'admin', 'type'=>'xsd:string'),
-        'login' => array('name'=>'login', 'type'=>'xsd:string'),
-        'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
-        'pass_indatabase' => array('name'=>'pass_indatabase', 'type'=>'xsd:string'),
-        'pass_indatabase_crypted' => array('name'=>'pass_indatabase_crypted', 'type'=>'xsd:string'),
-        'datec' => array('name'=>'datec', 'type'=>'xsd:dateTime'),
-        'datem' => array('name'=>'datem', 'type'=>'xsd:dateTime'),
-        'fk_thirdparty' => array('name'=>'fk_thirdparty', 'type'=>'xsd:string'),
-        'fk_contact' => array('name'=>'fk_contact', 'type'=>'xsd:string'),
-        'fk_member' => array('name'=>'fk_member', 'type'=>'xsd:string'),
-        'datelastlogin' => array('name'=>'datelastlogin', 'type'=>'xsd:dateTime'),
-        'datepreviouslogin' => array('name'=>'datepreviouslogin', 'type'=>'xsd:dateTime'),
-        'statut' => array('name'=>'statut', 'type'=>'xsd:string'),
-        'photo' => array('name'=>'photo', 'type'=>'xsd:string'),
-        'lang' => array('name'=>'lang', 'type'=>'xsd:string'),
-        'entrepots' => array('name'=>'entrepots', 'type'=>'xsd:string'),
-        //'rights' => array('name'=>'rights','type'=>'xsd:string'),
-        'canvas' => array('name'=>'canvas', 'type'=>'xsd:string')
-    )
+	'user',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'element' => array('name'=>'element', 'type'=>'xsd:string'),
+		'id' => array('name'=>'id', 'type'=>'xsd:string'),
+		'lastname' => array('name'=>'lastname', 'type'=>'xsd:string'),
+		'firstname' => array('name'=>'firstname', 'type'=>'xsd:string'),
+		'note' => array('name'=>'note', 'type'=>'xsd:string'),
+		'email' => array('name'=>'email', 'type'=>'xsd:string'),
+		'signature' => array('name'=>'signature', 'type'=>'xsd:string'),
+		'office_phone' => array('name'=>'office_phone', 'type'=>'xsd:string'),
+		'office_fax' => array('name'=>'office_fax', 'type'=>'xsd:string'),
+		'user_mobile' => array('name'=>'user_mobile', 'type'=>'xsd:string'),
+		'admin' => array('name'=>'admin', 'type'=>'xsd:string'),
+		'login' => array('name'=>'login', 'type'=>'xsd:string'),
+		'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
+		'pass_indatabase' => array('name'=>'pass_indatabase', 'type'=>'xsd:string'),
+		'pass_indatabase_crypted' => array('name'=>'pass_indatabase_crypted', 'type'=>'xsd:string'),
+		'datec' => array('name'=>'datec', 'type'=>'xsd:dateTime'),
+		'datem' => array('name'=>'datem', 'type'=>'xsd:dateTime'),
+		'fk_thirdparty' => array('name'=>'fk_thirdparty', 'type'=>'xsd:string'),
+		'fk_contact' => array('name'=>'fk_contact', 'type'=>'xsd:string'),
+		'fk_member' => array('name'=>'fk_member', 'type'=>'xsd:string'),
+		'datelastlogin' => array('name'=>'datelastlogin', 'type'=>'xsd:dateTime'),
+		'datepreviouslogin' => array('name'=>'datepreviouslogin', 'type'=>'xsd:dateTime'),
+		'statut' => array('name'=>'statut', 'type'=>'xsd:string'),
+		'photo' => array('name'=>'photo', 'type'=>'xsd:string'),
+		'lang' => array('name'=>'lang', 'type'=>'xsd:string'),
+		'entrepots' => array('name'=>'entrepots', 'type'=>'xsd:string'),
+		//'rights' => array('name'=>'rights','type'=>'xsd:string'),
+		'canvas' => array('name'=>'canvas', 'type'=>'xsd:string')
+	)
 );
 
 // Define other specific objects
@@ -185,7 +185,7 @@ $thirdpartywithuser_fields = array(
 
 $elementtype = 'socpeople';
 
-//Retreive all extrafield for contact
+//Retrieve all extrafield for contact
 // fetch optionals attributes and labels
 $extrafields = new ExtraFields($db);
 $extrafields->fetch_name_optionals_label($elementtype, true);
@@ -243,16 +243,16 @@ $styleuse = 'encoded'; // encoded/literal/literal wrapped
 
 // Register WSDL
 $server->register(
-    'getUser',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result', 'user'=>'tns:user'),
-    $ns,
-    $ns.'#getUser',
-    $styledoc,
-    $styleuse,
-    'WS to get user'
+	'getUser',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result', 'user'=>'tns:user'),
+	$ns,
+	$ns.'#getUser',
+	$styledoc,
+	$styleuse,
+	'WS to get user'
 );
 
 $server->register(
@@ -308,41 +308,41 @@ $server->register(
  */
 function getUser($authentication, $id, $ref = '', $ref_ext = '')
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    dol_syslog("Function: getUser login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
+	dol_syslog("Function: getUser login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-    // Init and check authentication
-    $objectresp = array();
-    $errorcode = ''; $errorlabel = '';
-    $error = 0;
-    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
-    // Check parameters
-    if (!$error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
-    {
-        $error++;
-        $errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
-    }
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Check parameters
+	if (!$error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
+	{
+		$error++;
+		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
+	}
 
-    if (!$error)
-    {
-        $fuser->getrights();
+	if (!$error)
+	{
+		$fuser->getrights();
 
-        if ($fuser->rights->user->user->lire
-        	|| ($fuser->rights->user->self->creer && $id && $id == $fuser->id)
-        	|| ($fuser->rights->user->self->creer && $ref && $ref == $fuser->login)
-        	|| ($fuser->rights->user->self->creer && $ref_ext && $ref_ext == $fuser->ref_ext))
-        {
-            $user = new User($db);
-            $result = $user->fetch($id, $ref, $ref_ext);
-            if ($result > 0)
-            {
-                // Create
-                $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'user'=>array(
+		if ($fuser->rights->user->user->lire
+			|| ($fuser->rights->user->self->creer && $id && $id == $fuser->id)
+			|| ($fuser->rights->user->self->creer && $ref && $ref == $fuser->login)
+			|| ($fuser->rights->user->self->creer && $ref_ext && $ref_ext == $fuser->ref_ext))
+		{
+			$user = new User($db);
+			$result = $user->fetch($id, $ref, $ref_ext);
+			if ($result > 0)
+			{
+				// Create
+				$objectresp = array(
+					'result'=>array('result_code'=>'OK', 'result_label'=>''),
+					'user'=>array(
 						'id' => $user->id,
 						'lastname' => $user->lastname,
 						'firstname' => $user->firstname,
@@ -369,26 +369,26 @@ function getUser($authentication, $id, $ref = '', $ref_ext = '')
 						'lang' => $user->lang,
 						//'rights' => $user->rights,
 						'canvas' => $user->canvas
-                    )
-                );
-            }
-            else {
-                $error++;
-                $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
-            }
-        }
-        else {
-            $error++;
-            $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
-        }
-    }
+					)
+				);
+			}
+			else {
+				$error++;
+				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
+			}
+		}
+		else {
+			$error++;
+			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+		}
+	}
 
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 /**
@@ -595,7 +595,7 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 
 						$elementtype = 'socpeople';
 
-						//Retreive all extrafield for thirdsparty
+						//Retrieve all extrafield for thirdsparty
 						// fetch optionals attributes and labels
 						$extrafields = new ExtraFields($db);
 						$extrafields->fetch_name_optionals_label($elementtype, true);
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 768ddbdb19c..42b39e7e902 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -99,6 +99,10 @@ class Website extends CommonObject
 	 * @var integer
 	 */
 	public $fk_default_home;
+
+	/**
+	 * @var int User Create Id
+	 */
 	public $fk_user_creat;
 
 	/**
@@ -169,15 +173,15 @@ class Website extends CommonObject
 		if (isset($this->status)) {
 			 $this->status = (int) $this->status;
 		}
-        if (empty($this->date_creation)) {
-            $this->date_creation = $now;
-        }
-        if (empty($this->date_modification)) {
-            $this->date_modification = $now;
-        }
-        // Remove spaces and be sure we have main language only
-        $this->lang = preg_replace('/[_-].*$/', '', trim($this->lang)); // en_US or en-US -> en
-        $tmparray = explode(',', $this->otherlang);
+		if (empty($this->date_creation)) {
+			$this->date_creation = $now;
+		}
+		if (empty($this->date_modification)) {
+			$this->date_modification = $now;
+		}
+		// Remove spaces and be sure we have main language only
+		$this->lang = preg_replace('/[_-].*$/', '', trim($this->lang)); // en_US or en-US -> en
+		$tmparray = explode(',', $this->otherlang);
 		if (is_array($tmparray)) {
 			foreach ($tmparray as $key => $val) {
 				$tmparray[$key] = preg_replace('/[_-].*$/', '', trim($val)); // en_US or en-US -> en
@@ -185,14 +189,14 @@ class Website extends CommonObject
 			$this->otherlang = join(',', $tmparray);
 		}
 
-        // Check parameters
-        if (empty($this->entity)) {
-            $this->entity = $conf->entity;
-        }
-        if (empty($this->lang)) {
-        	$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("MainLanguage"));
-        	return -1;
-        }
+		// Check parameters
+		if (empty($this->entity)) {
+			$this->entity = $conf->entity;
+		}
+		if (empty($this->lang)) {
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("MainLanguage"));
+			return -1;
+		}
 
 		// Insert request
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.'(';
@@ -245,23 +249,23 @@ class Website extends CommonObject
 				}
 			}
 
-            // Uncomment this and change MYOBJECT to your own tag if you
-            // want this action to call a trigger.
-            // if (!$notrigger) {
+			// Uncomment this and change MYOBJECT to your own tag if you
+			// want this action to call a trigger.
+			// if (!$notrigger) {
 
-            //     // Call triggers
-            //     $result = $this->call_trigger('MYOBJECT_CREATE',$user);
-            //     if ($result < 0) $error++;
-            //     // End call triggers
-            // }
-        }
+			//     // Call triggers
+			//     $result = $this->call_trigger('MYOBJECT_CREATE',$user);
+			//     if ($result < 0) $error++;
+			//     // End call triggers
+			// }
+		}
 
-	    if (! $error) {
-	    	$stringtodolibarrfile = "# Some properties for Dolibarr web site CMS\n";
-	    	$stringtodolibarrfile .= "param=value\n";
-	    	//print $conf->website->dir_output.'/'.$this->ref.'/.dolibarr';exit;
-	    	file_put_contents($conf->website->dir_output.'/'.$this->ref.'/.dolibarr', $stringtodolibarrfile);
-        }
+		if (!$error) {
+			$stringtodolibarrfile = "# Some properties for Dolibarr web site CMS\n";
+			$stringtodolibarrfile .= "param=value\n";
+			//print $conf->website->dir_output.'/'.$this->ref.'/.dolibarr';exit;
+			file_put_contents($conf->website->dir_output.'/'.$this->ref.'/.dolibarr', $stringtodolibarrfile);
+		}
 
 		// Commit or rollback
 		if ($error) {
@@ -415,7 +419,7 @@ class Website extends CommonObject
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-		    $sql .= ' '.$this->db->plimit($limit, $offset);
+			$sql .= ' '.$this->db->plimit($limit, $offset);
 		}
 		$this->records = array();
 
@@ -630,17 +634,17 @@ class Website extends CommonObject
 	 */
 	public function createFromClone($user, $fromid, $newref, $newlang = '')
 	{
-        global $conf, $langs;
+		global $conf, $langs;
 		global $dolibarr_main_data_root;
 
 		$now = dol_now();
 		$error = 0;
 
-        dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$object = new self($this->db);
 
-        // Check no site with ref exists
+		// Check no site with ref exists
 		if ($object->fetch(0, $newref) > 0)
 		{
 			$this->error = 'ErrorNewRefIsAlreadyUsed';
@@ -726,7 +730,7 @@ class Website extends CommonObject
 				//print $pageid.' = '.$objectpageold->pageurl.' -> '.$objectpagenew->id.' = '.$objectpagenew->pageurl.'<br>';
 				if (is_object($objectpagenew) && $objectpagenew->pageurl)
 				{
-		            $filealias = $pathofwebsitenew.'/'.$objectpagenew->pageurl.'.php';
+					$filealias = $pathofwebsitenew.'/'.$objectpagenew->pageurl.'.php';
 					$filetplnew = $pathofwebsitenew.'/page'.$objectpagenew->id.'.tpl.php';
 
 					// Save page alias
@@ -752,22 +756,22 @@ class Website extends CommonObject
 		{
 			// Restore id of home page
 			$object->fk_default_home = $newidforhome;
-		    $res = $object->update($user);
-		    if (!$res > 0)
-		    {
-		        $error++;
-		        setEventMessages($object->error, $object->errors, 'errors');
-		    }
+			$res = $object->update($user);
+			if (!$res > 0)
+			{
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
 
-		    if (!$error)
-		    {
-		    	$filetpl = $pathofwebsitenew.'/page'.$newidforhome.'.tpl.php';
-		    	$filewrapper = $pathofwebsitenew.'/wrapper.php';
+			if (!$error)
+			{
+				$filetpl = $pathofwebsitenew.'/page'.$newidforhome.'.tpl.php';
+				$filewrapper = $pathofwebsitenew.'/wrapper.php';
 
-		    	// Generate the index.php page to be the home page
-		    	//-------------------------------------------------
-		    	$result = dolSaveIndexPage($pathofwebsitenew, $fileindex, $filetpl, $filewrapper);
-		    }
+				// Generate the index.php page to be the home page
+				//-------------------------------------------------
+				$result = dolSaveIndexPage($pathofwebsitenew, $fileindex, $filetpl, $filewrapper);
+			}
 		}
 
 		unset($object->context['createfromclone']);
@@ -790,37 +794,37 @@ class Website extends CommonObject
 	 *
 	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option				On what the link point to
-     *  @param	integer	$notooltip			1=Disable tooltip
-     *  @param	int		$maxlen				Max length of visible user name
-     *  @param  string  $morecss            Add more css on link
+	 *  @param	integer	$notooltip			1=Disable tooltip
+	 *  @param	int		$maxlen				Max length of visible user name
+	 *  @param  string  $morecss            Add more css on link
 	 *	@return	string						String with URL
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $maxlen = 24, $morecss = '')
 	{
 		global $langs, $conf, $db;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
+		global $dolibarr_main_authentication, $dolibarr_main_demo;
+		global $menumanager;
 
 
-        $result = '';
-        $companylink = '';
+		$result = '';
+		$companylink = '';
 
-        $label = '<u>'.$langs->trans("WebSite").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref.'<br>';
-        $label .= '<b>'.$langs->trans('MainLanguage').':</b> '.$this->lang;
+		$label = '<u>'.$langs->trans("WebSite").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref.'<br>';
+		$label .= '<b>'.$langs->trans('MainLanguage').':</b> '.$this->lang;
 
-        $linkstart = '<a href="'.DOL_URL_ROOT.'/website/card.php?id='.$this->id.'"';
-        $linkstart .= ($notooltip ? '' : ' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss ? ' '.$morecss : '').'"');
-        $linkstart .= '>';
+		$linkstart = '<a href="'.DOL_URL_ROOT.'/website/card.php?id='.$this->id.'"';
+		$linkstart .= ($notooltip ? '' : ' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss ? ' '.$morecss : '').'"');
+		$linkstart .= '>';
 		$linkend = '</a>';
 
 		$linkstart = $linkend = '';
 
-        if ($withpicto)
-        {
-            $result .= ($linkstart.img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? '' : 'class="classfortooltip"')).$linkend);
-            if ($withpicto != 2) $result .= ' ';
+		if ($withpicto)
+		{
+			$result .= ($linkstart.img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? '' : 'class="classfortooltip"')).$linkend);
+			if ($withpicto != 2) $result .= ' ';
 		}
 		$result .= $linkstart.$this->ref.$linkend;
 		return $result;
@@ -837,7 +841,7 @@ class Website extends CommonObject
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un status donne
 	 *
@@ -847,7 +851,7 @@ class Website extends CommonObject
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if (empty($this->labelStatus) || empty($this->labelStatusShort))
@@ -875,16 +879,16 @@ class Website extends CommonObject
 	 */
 	public function initAsSpecimen()
 	{
-	    global $user;
+		global $user;
 
 		$this->id = 0;
-
+		$this->specimen = 1;
 		$this->entity = 1;
 		$this->ref = 'myspecimenwebsite';
 		$this->description = 'A specimen website';
 		$this->lang = 'en';
 		$this->otherlang = 'fr,es';
-		$this->status = '';
+		$this->status = 1;
 		$this->fk_default_home = null;
 		$this->virtualhost = 'http://myvirtualhost';
 		$this->fk_user_creat = $user->id;
@@ -937,13 +941,13 @@ class Website extends CommonObject
 		$arrayreplacementincss['medias/image/'.$website->ref.'/'] = "medias/image/__WEBSITE_KEY__/";
 		$arrayreplacementincss['medias/js/'.$website->ref.'/'] = "medias/js/__WEBSITE_KEY__/";
 		if ($mysoc->logo_small) {
-		    $arrayreplacementincss['file=logos%2Fthumbs%2F'.$mysoc->logo_small] = "file=logos%2Fthumbs%2F__LOGO_SMALL_KEY__";
+			$arrayreplacementincss['file=logos%2Fthumbs%2F'.$mysoc->logo_small] = "file=logos%2Fthumbs%2F__LOGO_SMALL_KEY__";
 		}
 		if ($mysoc->logo_mini) {
-		    $arrayreplacementincss['file=logos%2Fthumbs%2F'.$mysoc->logo_mini] = "file=logos%2Fthumbs%2F__LOGO_MINI_KEY__";
+			$arrayreplacementincss['file=logos%2Fthumbs%2F'.$mysoc->logo_mini] = "file=logos%2Fthumbs%2F__LOGO_MINI_KEY__";
 		}
 		if ($mysoc->logo) {
-		    $arrayreplacementincss['file=logos%2Fthumbs%2F'.$mysoc->logo] = "file=logos%2Fthumbs%2F__LOGO_KEY__";
+			$arrayreplacementincss['file=logos%2Fthumbs%2F'.$mysoc->logo] = "file=logos%2Fthumbs%2F__LOGO_KEY__";
 		}
 
 		// Create output directories
@@ -1079,8 +1083,8 @@ class Website extends CommonObject
 			//var_dump($this->fk_default_home.' - '.$objectpageold->id.' - '.$objectpageold->newid);exit;
 			if ($this->fk_default_home > 0 && ($objectpageold->id == $this->fk_default_home) && ($objectpageold->newid > 0))	// This is the record with home page
 			{
-			    // Warning: We must keep llx_ here. It is a generic SQL.
-			    $line = "UPDATE llx_website SET fk_default_home = ".($objectpageold->newid > 0 ? $this->db->escape($objectpageold->newid)."__+MAX_llx_website_page__" : "null")." WHERE rowid = __WEBSITE_ID__;";
+				// Warning: We must keep llx_ here. It is a generic SQL.
+				$line = "UPDATE llx_website SET fk_default_home = ".($objectpageold->newid > 0 ? $this->db->escape($objectpageold->newid)."__+MAX_llx_website_page__" : "null")." WHERE rowid = __WEBSITE_ID__;";
 				$line .= "\n";
 				fputs($fp, $line);
 			}
@@ -1305,14 +1309,14 @@ class Website extends CommonObject
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'website_page WHERE fk_website = '.$this->id;
 
 		$resql = $this->db->query($sql);
-		if (! $resql) {
+		if (!$resql) {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
 
 		$num = $this->db->num_rows($resql);
 
-		$i=0;
+		$i = 0;
 		while ($i < $num) {
 			$obj = $this->db->fetch_object($resql);
 
@@ -1349,8 +1353,7 @@ class Website extends CommonObject
 			$i++;
 		}
 
-		if ($error)
-		{
+		if ($error) {
 			return -1;
 		} else {
 			return $num;
@@ -1415,9 +1418,9 @@ class Website extends CommonObject
 		$pageid = 0;
 		if (!empty($websitepagefile))
 		{
-		    $websitepagefileshort = basename($websitepagefile);
-		    if ($websitepagefileshort == 'index.php') $pageid = $website->fk_default_home;
-		    else $pageid = str_replace(array('.tpl.php', 'page'), array('', ''), $websitepagefileshort);
+			$websitepagefileshort = basename($websitepagefile);
+			if ($websitepagefileshort == 'index.php') $pageid = $website->fk_default_home;
+			else $pageid = str_replace(array('.tpl.php', 'page'), array('', ''), $websitepagefileshort);
 			if ($pageid > 0)
 			{
 				$tmppage->fetch($pageid);
@@ -1468,7 +1471,7 @@ class Website extends CommonObject
 		$url = preg_replace('/(\?|&)l=([a-zA-Z_]*)/', '', $url); // We remove param l from url
 		//$url = preg_replace('/(\?|&)lang=([a-zA-Z_]*)/', '', $url);	// We remove param lang from url
 		$url .= (preg_match('/\?/', $url) ? '&' : '?').'l=';
-		if (! preg_match('/^\//', $url)) $url = '/'.$url;
+		if (!preg_match('/^\//', $url)) $url = '/'.$url;
 
 		$HEIGHTOPTION = 40;
 		$MAXHEIGHT = 4 * $HEIGHTOPTION;
@@ -1513,28 +1516,28 @@ class Website extends CommonObject
 			$out .= '</li></a>';
 		}
 		$i = 0;
-        if (is_array($languagecodes))
-        {
-            foreach ($languagecodes as $languagecode)
-            {
-            	// Convert $languagecode into a long language code
-                if (strlen($languagecode) == 2) {
-                	$languagecode = (empty($arrayofspecialmainlanguages[$languagecode]) ? $languagecode.'_'.strtoupper($languagecode) : $arrayofspecialmainlanguages[$languagecode]);
-                }
+		if (is_array($languagecodes))
+		{
+			foreach ($languagecodes as $languagecode)
+			{
+				// Convert $languagecode into a long language code
+				if (strlen($languagecode) == 2) {
+					$languagecode = (empty($arrayofspecialmainlanguages[$languagecode]) ? $languagecode.'_'.strtoupper($languagecode) : $arrayofspecialmainlanguages[$languagecode]);
+				}
 
-                if ($languagecode == $languagecodeselected) continue; // Already output
+				if ($languagecode == $languagecodeselected) continue; // Already output
 
-                $countrycode = strtolower(substr($languagecode, -2));
-                $label = $weblangs->trans("Language_".$languagecode);
-                if ($countrycode == 'us') $label = preg_replace('/\s*\(.*\)/', '', $label);
-                $out .= '<a href="'.$url.substr($languagecode, 0, 2).'"><li><img height="12px" src="/medias/image/common/flags/'.$countrycode.'.png" style="margin-right: 5px;"/><span class="websitecomponentlilang">'.$label.'</span>';
-                if (empty($i) && empty($languagecodeselected)) $out .= '<span class="fa fa-caret-down" style="padding-left: 5px;" />';
-                $out .= '</li></a>';
-                $i++;
-            }
-        }
-        $out .= '</ul>';
+				$countrycode = strtolower(substr($languagecode, -2));
+				$label = $weblangs->trans("Language_".$languagecode);
+				if ($countrycode == 'us') $label = preg_replace('/\s*\(.*\)/', '', $label);
+				$out .= '<a href="'.$url.substr($languagecode, 0, 2).'"><li><img height="12px" src="/medias/image/common/flags/'.$countrycode.'.png" style="margin-right: 5px;"/><span class="websitecomponentlilang">'.$label.'</span>';
+				if (empty($i) && empty($languagecodeselected)) $out .= '<span class="fa fa-caret-down" style="padding-left: 5px;" />';
+				$out .= '</li></a>';
+				$i++;
+			}
+		}
+		$out .= '</ul>';
 
-        return $out;
-    }
+		return $out;
+	}
 }
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 8e9584a86ac..30961013806 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -52,8 +52,8 @@ class WebsitePage extends CommonObject
 
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_website;
 
 	public $pageurl;
@@ -81,6 +81,7 @@ class WebsitePage extends CommonObject
 	 */
 	public $lang;
 
+	public $allowed_in_frames;
 	public $htmlheader;
 	public $content;
 	public $grabbed_from;
@@ -106,14 +107,14 @@ class WebsitePage extends CommonObject
 	public $author_alias;
 
    	/**
-     * @var string path of external object
-     */
-    public $object_type;
+   	 * @var string path of external object
+   	 */
+	public $object_type;
 
-    /**
-     * @var string id of external object
-     */
-    public $fk_object;
+	/**
+	 * @var string id of external object
+	 */
+	public $fk_object;
 
 	const STATUS_DRAFT = 0;
 	const STATUS_VALIDATED = 1;
@@ -145,25 +146,26 @@ class WebsitePage extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-     * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
-     */
+	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 */
 	public $fields = array(
-	    'rowid'          =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
+		'rowid'          =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
 		'pageurl'        =>array('type'=>'varchar(16)', 'label'=>'WEBSITE_PAGENAME', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Ref/alias of page'),
 		'aliasalt'       =>array('type'=>'varchar(255)', 'label'=>'AliasAlt', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'index'=>0, 'position'=>11, 'searchall'=>0, 'comment'=>'Alias alternative of page'),
 		'type_container' =>array('type'=>'varchar(16)', 'label'=>'Type', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'index'=>0, 'position'=>12, 'comment'=>'Type of container'),
 		'title'          =>array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1, 'help'=>'UseTextBetween5And70Chars'),
-	    'description'    =>array('type'=>'varchar(255)', 'label'=>'Description', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1),
+		'description'    =>array('type'=>'varchar(255)', 'label'=>'Description', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1),
 		'image'          =>array('type'=>'varchar(255)', 'label'=>'Image', 'enabled'=>1, 'visible'=>1, 'position'=>32, 'searchall'=>0, 'help'=>'Relative path of media. Used if Type is "blogpost"'),
 		'keywords'       =>array('type'=>'varchar(255)', 'label'=>'Keywords', 'enabled'=>1, 'visible'=>1, 'position'=>45, 'searchall'=>0),
 		'lang'           =>array('type'=>'varchar(6)', 'label'=>'Lang', 'enabled'=>1, 'notnull'=>-1, 'visible'=>1, 'position'=>45, 'searchall'=>0),
 		//'status'        =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'index'=>true,   'position'=>1000),
-	    'fk_website'     =>array('type'=>'integer', 'label'=>'WebsiteId', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>40, 'searchall'=>0, 'foreignkey'=>'websitepage.rowid'),
-	    'fk_page'        =>array('type'=>'integer', 'label'=>'ParentPageId', 'enabled'=>1, 'visible'=>1, 'notnull'=>-1, 'position'=>45, 'searchall'=>0, 'foreignkey'=>'website.rowid'),
-	    'htmlheader'     =>array('type'=>'text', 'label'=>'HtmlHeader', 'enabled'=>1, 'visible'=>0, 'position'=>50, 'searchall'=>0),
-	    'content'        =>array('type'=>'mediumtext', 'label'=>'Content', 'enabled'=>1, 'visible'=>0, 'position'=>51, 'searchall'=>0),
+		'fk_website'     =>array('type'=>'integer', 'label'=>'WebsiteId', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>40, 'searchall'=>0, 'foreignkey'=>'websitepage.rowid'),
+		'fk_page'        =>array('type'=>'integer', 'label'=>'ParentPageId', 'enabled'=>1, 'visible'=>1, 'notnull'=>-1, 'position'=>45, 'searchall'=>0, 'foreignkey'=>'website.rowid'),
+		'allowed_in_frames'   =>array('type'=>'integer', 'label'=>'AllowedInFrames', 'enabled'=>1, 'visible'=>-1, 'position'=>48, 'searchall'=>0),
+		'htmlheader'     =>array('type'=>'text', 'label'=>'HtmlHeader', 'enabled'=>1, 'visible'=>0, 'position'=>50, 'searchall'=>0),
+		'content'        =>array('type'=>'mediumtext', 'label'=>'Content', 'enabled'=>1, 'visible'=>0, 'position'=>51, 'searchall'=>0),
 		'grabbed_from'   =>array('type'=>'varchar(255)', 'label'=>'GrabbedFrom', 'enabled'=>1, 'visible'=>1, 'index'=>1, 'position'=>400, 'comment'=>'URL page content was grabbed from'),
-	    'date_creation'  =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>500),
+		'date_creation'  =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>500),
 		'tms'            =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>501),
 		//'date_valid'    =>array('type'=>'datetime',     'label'=>'DateValidation',     'enabled'=>1, 'visible'=>-1, 'position'=>502),
 		'fk_user_creat'  =>array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-1, 'notnull'=>true, 'position'=>510),
@@ -171,27 +173,27 @@ class WebsitePage extends CommonObject
 		'fk_user_modif'  =>array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-1, 'position'=>512),
 		//'fk_user_valid' =>array('type'=>'integer',      'label'=>'UserValidation',        'enabled'=>1, 'visible'=>-1, 'position'=>512),
 		'import_key'     =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-1, 'index'=>1, 'position'=>1000, 'notnull'=>-1),
-		'object_type' => array('type' => 'varchar(255)','label' => 'ObjectType', 'enabled'=>1, 'visible'=>1, 'position'=>46, 'searchall'=>0, 'help'=>''),
-	    'fk_object' => array('type' => 'varchar(255)','label' => 'ObjectId', 'enabled'=>1, 'visible'=>1, 'position'=>47, 'searchall'=>0, 'help'=>'')
+		'object_type' => array('type' => 'varchar(255)', 'label' => 'ObjectType', 'enabled'=>1, 'visible'=>0, 'position'=>46, 'searchall'=>0, 'help'=>''),
+		'fk_object' => array('type' => 'varchar(255)', 'label' => 'ObjectId', 'enabled'=>1, 'visible'=>0, 'position'=>47, 'searchall'=>0, 'help'=>'')
 	);
 	// END MODULEBUILDER PROPERTIES
 
 
 	// If this object has a subtable with lines
 
-	/**
-	 * @var int    Name of subtable line
-	 */
+	// /**
+	//  * @var string    Name of subtable line
+	//  */
 	//public $table_element_line = 'mymodule_myobjectline';
 
 	/**
-	 * @var int 	Field with ID of parent key if this field has a parent or for child tables
+	 * @var string 	Field with ID of parent key if this field has a parent or for child tables
 	 */
 	public $fk_element = 'fk_website_page';
 
-	/**
-	 * @var int    Name of subtable class that manage subtable lines
-	 */
+	// /**
+	//  * @var string    Name of subtable class that manage subtable lines
+	//  */
 	//public $class_element_line = 'MyObjectline';
 
 	/**
@@ -265,6 +267,7 @@ class WebsitePage extends CommonObject
 		$sql .= " t.content,";
 		$sql .= " t.lang,";
 		$sql .= " t.fk_page,";
+		$sql .= " t.allowed_in_frames,";
 		$sql .= " t.status,";
 		$sql .= " t.grabbed_from,";
 		$sql .= " t.date_creation,";
@@ -274,7 +277,7 @@ class WebsitePage extends CommonObject
 		$sql .= " t.fk_user_modif,";
 		$sql .= " t.import_key,";
 		$sql .= " t.object_type,";
-        $sql .= " t.fk_object";
+		$sql .= " t.fk_object";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		//$sql .= ' WHERE entity IN ('.getEntity('website').')';       // entity is on website level
 		$sql .= ' WHERE 1 = 1';
@@ -285,22 +288,22 @@ class WebsitePage extends CommonObject
 		else {
 			if ($id < 0) $sql .= ' AND t.rowid <> '.abs($id);
 			if (null !== $website_id) {
-			    $sql .= " AND t.fk_website = '".$this->db->escape($website_id)."'";
-			    if ($page) {
-			    	$pagetouse = $page;
-			    	$langtouse = '';
-			    	$tmppage = explode('/', $page);
-			    	if (!empty($tmppage[1])) {
-			    		$pagetouse = $tmppage[1];
-			    		if (strlen($tmppage[0])) $langtouse = $tmppage[0];
-			    	}
-			    	$sql .= " AND t.pageurl = '".$this->db->escape($pagetouse)."'";
-			    	if ($langtouse) $sql .= " AND t.lang = '".$this->db->escape($langtouse)."'";
-			    }
-			    if ($aliasalt)	$sql .= " AND (t.aliasalt LIKE '%,".$this->db->escape($aliasalt).",%' OR t.aliasalt LIKE '%, ".$this->db->escape($aliasalt).",%')";
+				$sql .= " AND t.fk_website = '".$this->db->escape($website_id)."'";
+				if ($page) {
+					$pagetouse = $page;
+					$langtouse = '';
+					$tmppage = explode('/', $page);
+					if (!empty($tmppage[1])) {
+						$pagetouse = $tmppage[1];
+						if (strlen($tmppage[0])) $langtouse = $tmppage[0];
+					}
+					$sql .= " AND t.pageurl = '".$this->db->escape($pagetouse)."'";
+					if ($langtouse) $sql .= " AND t.lang = '".$this->db->escape($langtouse)."'";
+				}
+				if ($aliasalt)	$sql .= " AND (t.aliasalt LIKE '%,".$this->db->escape($aliasalt).",%' OR t.aliasalt LIKE '%, ".$this->db->escape($aliasalt).",%')";
 			}
 		}
-        $sql .= $this->db->plimit(1);
+		$sql .= $this->db->plimit(1);
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -325,6 +328,7 @@ class WebsitePage extends CommonObject
 				$this->content = $obj->content;
 				$this->lang = $obj->lang;
 				$this->fk_page = $obj->fk_page;
+				$this->allowed_in_frames = $obj->allowed_in_frames;
 				$this->status = $obj->status;
 				$this->grabbed_from = $obj->grabbed_from;
 				$this->date_creation = $this->db->jdate($obj->date_creation);
@@ -334,7 +338,7 @@ class WebsitePage extends CommonObject
 				$this->fk_user_modif = $obj->fk_user_modif;
 				$this->import_key = $obj->import_key;
 				$this->object_type = $obj->object_type;
-                $this->fk_object = $obj->fk_object;
+				$this->fk_object = $obj->fk_object;
 			}
 			$this->db->free($resql);
 
@@ -383,6 +387,7 @@ class WebsitePage extends CommonObject
 		$sql .= " t.content,";
 		$sql .= " t.lang,";
 		$sql .= " t.fk_page,";
+		$sql .= " t.allowed_in_frames,";
 		$sql .= " t.status,";
 		$sql .= " t.grabbed_from,";
 		$sql .= " t.date_creation,";
@@ -392,7 +397,7 @@ class WebsitePage extends CommonObject
 		$sql .= " t.fk_user_modif,";
 		$sql .= " t.import_key,";
 		$sql .= " t.object_type,";
-        $sql .= " t.fk_object";
+		$sql .= " t.fk_object";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE t.fk_website = '.$websiteid;
 		// Manage filter
@@ -453,6 +458,7 @@ class WebsitePage extends CommonObject
 				$record->content = $obj->content;
 				$record->lang = $obj->lang;
 				$record->fk_page = $obj->fk_page;
+				$record->allowed_in_frames = $obj->allowed_in_frames;
 				$record->status = $obj->status;
 				$record->grabbed_from = $obj->grabbed_from;
 				$record->date_creation = $this->db->jdate($obj->date_creation);
@@ -619,7 +625,7 @@ class WebsitePage extends CommonObject
 			}
 		}
 
-		if (! $error) {
+		if (!$error) {
 			return 1;
 		} else {
 			return -1;
@@ -676,6 +682,7 @@ class WebsitePage extends CommonObject
 		$object->author_alias = '';
 		$object->date_creation = $now;
 		$object->title = ($newtitle == '1' ? $object->title : ($newtitle ? $newtitle : $object->title));
+		$object->description = $object->title;
 		if (!empty($newlang)) $object->lang = $newlang;
 		if ($istranslation) $object->fk_page = $fromid;
 		else $object->fk_page = 0;
@@ -712,43 +719,43 @@ class WebsitePage extends CommonObject
 	 *
 	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option				On what the link point to
-     *  @param	integer	$notooltip			1=Disable tooltip
-     *  @param	int		$maxlen				Max length of visible user name
-     *  @param  string  $morecss            Add more css on link
+	 *  @param	integer	$notooltip			1=Disable tooltip
+	 *  @param	int		$maxlen				Max length of visible user name
+	 *  @param  string  $morecss            Add more css on link
 	 *	@return	string						String with URL
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $maxlen = 24, $morecss = '')
 	{
 		global $langs, $conf, $db;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
+		global $dolibarr_main_authentication, $dolibarr_main_demo;
+		global $menumanager;
 
-        $result = '';
+		$result = '';
 
-        $label = '<u>'.$langs->trans("Page").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref.'<br>';
-        $label .= '<b>'.$langs->trans('ID').':</b> '.$this->id.'<br>';
-        $label .= '<b>'.$langs->trans('Title').':</b> '.$this->title.'<br>';
-        $label .= '<b>'.$langs->trans('Language').':</b> '.$this->lang;
+		$label = '<u>'.$langs->trans("Page").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref.'<br>';
+		$label .= '<b>'.$langs->trans('ID').':</b> '.$this->id.'<br>';
+		$label .= '<b>'.$langs->trans('Title').':</b> '.$this->title.'<br>';
+		$label .= '<b>'.$langs->trans('Language').':</b> '.$this->lang;
 
-        $url = DOL_URL_ROOT.'/website/index.php?websiteid='.$this->fk_website.'&pageid='.$this->id;
+		$url = DOL_URL_ROOT.'/website/index.php?websiteid='.$this->fk_website.'&pageid='.$this->id;
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-        	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-        	{
-        		$label = $langs->trans("ShowMyObject");
-        		$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-        	}
-        	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-        	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowMyObject");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		}
+		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart .= $linkclose.'>';
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		//$linkstart = $linkend = '';
@@ -772,7 +779,7 @@ class WebsitePage extends CommonObject
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un status donne
 	 *
@@ -782,7 +789,7 @@ class WebsitePage extends CommonObject
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if (empty($this->labelStatus) || empty($this->labelStatusShort))
@@ -839,6 +846,7 @@ class WebsitePage extends CommonObject
 		$this->description = 'This is my page';
 		$this->image = '';
 		$this->keywords = 'keyword1, keyword2';
+		$this->allowed_in_frames = 1;
 		$this->htmlheader = '';
 		$this->content = '<html><body>This is a html content</body></html>';
 		$this->status = '';
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index fed5be51e87..99d00c019ad 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -130,10 +130,10 @@ if ($pageid < 0) $pageid = 0;
 if (($pageid > 0 || $pageref) && $action != 'addcontainer')
 {
 	$res = $objectpage->fetch($pageid, ($object->id > 0 ? $object->id : null), $pageref);
-    if ($res == 0)
-    {
-        $res = $objectpage->fetch($pageid, ($object->id > 0 ? $object->id : null), null, $pageref);
-    }
+	if ($res == 0)
+	{
+		$res = $objectpage->fetch($pageid, ($object->id > 0 ? $object->id : null), null, $pageref);
+	}
 
 	// Check if pageid is inside the new website, if not we reset param pageid
 	if ($res >= 0 && $object->id > 0)
@@ -273,7 +273,7 @@ if (GETPOST('optionsitefiles')) $algo .= 'sitefiles';
 
 if (empty($sortfield)) {
 	if ($action == 'file_manager') {
-		$sortfield='name'; $sortorder = 'ASC';
+		$sortfield = 'name'; $sortorder = 'ASC';
 	} else {
 		$sortfield = 'pageurl'; $sortorder = 'ASC';
 	}
@@ -303,28 +303,28 @@ $permissiontodelete = $user->rights->website->delete;
 // Protections
 if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x') || GETPOST('refreshpage') || GETPOST('refreshpage_x') || GETPOST('refreshpage.x'))
 {
-    $action = 'preview'; // To avoid to make an action on another page or another site when we click on button to select another site or page.
+	$action = 'preview'; // To avoid to make an action on another page or another site when we click on button to select another site or page.
 }
 if (GETPOST('refreshsite', 'alpha') || GETPOST('refreshsite.x', 'alpha') || GETPOST('refreshsite_x', 'alpha'))		// If we change the site, we reset the pageid and cancel addsite action.
 {
-    if ($action == 'addsite') $action = 'preview';
-    if ($action == 'updatesource') $action = 'preview';
+	if ($action == 'addsite') $action = 'preview';
+	if ($action == 'updatesource') $action = 'preview';
 
-    $pageid = $object->fk_default_home;
-    if (empty($pageid))
-    {
-    	$array = $objectpage->fetchAll($object->id, 'ASC,ASC', 'type_container,pageurl');
-    	if (!is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
-    	$atleastonepage = (is_array($array) && count($array) > 0);
+	$pageid = $object->fk_default_home;
+	if (empty($pageid))
+	{
+		$array = $objectpage->fetchAll($object->id, 'ASC,ASC', 'type_container,pageurl');
+		if (!is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
+		$atleastonepage = (is_array($array) && count($array) > 0);
 
-    	$firstpageid = 0; $homepageid = 0;
-    	foreach ($array as $key => $valpage)
-    	{
-    		if (empty($firstpageid)) $firstpageid = $valpage->id;
-    		if ($object->fk_default_home && $key == $object->fk_default_home) $homepageid = $valpage->id;
-    	}
-    	$pageid = ($homepageid ? $homepageid : $firstpageid); // We choose home page and if not defined yet, we take first page
-    }
+		$firstpageid = 0; $homepageid = 0;
+		foreach ($array as $key => $valpage)
+		{
+			if (empty($firstpageid)) $firstpageid = $valpage->id;
+			if ($object->fk_default_home && $key == $object->fk_default_home) $homepageid = $valpage->id;
+		}
+		$pageid = ($homepageid ? $homepageid : $firstpageid); // We choose home page and if not defined yet, we take first page
+	}
 }
 if (GETPOST('refreshpage', 'alpha') && !in_array($action, array('updatecss'))) $action = 'preview';
 
@@ -529,9 +529,9 @@ if ($action == 'addsite')
 	$db->begin();
 
 	if (GETPOST('virtualhost', 'alpha') && !preg_match('/^http/', GETPOST('virtualhost', 'alpha')))
-    {
-        $error++;
-        setEventMessages($langs->trans('ErrorURLMustStartWithHttp', $langs->transnoentitiesnoconv("VirtualHost")), null, 'errors');
+	{
+		$error++;
+		setEventMessages($langs->trans('ErrorURLMustStartWithHttp', $langs->transnoentitiesnoconv("VirtualHost")), null, 'errors');
 	}
 
 	if (!$error && !GETPOST('WEBSITE_REF', 'alpha'))
@@ -940,6 +940,7 @@ if ($action == 'addcontainer')
 		$objectpage->otherlang = GETPOST('WEBSITE_OTHERLANG', 'aZ09comma');
 		$objectpage->image = GETPOST('WEBSITE_IMAGE', 'alpha');
 		$objectpage->keywords = str_replace(array('<', '>'), '', GETPOST('WEBSITE_KEYWORDS', 'alphanohtml'));
+		$objectpage->allowed_in_frames = GETPOST('WEBSITE_ALLOWED_IN_FRAMES', 'aZ09');
 		$objectpage->htmlheader = GETPOST('htmlheader', 'none');
 		$objectpage->author_alias = GETPOST('WEBSITE_AUTHORALIAS', 'alphanohtml');
 		$objectpage->object_type = GETPOST('WEBSITE_OBJECTCLASS');
@@ -1206,7 +1207,7 @@ if (GETPOSTISSET('pageid') && $action == 'delete' && $permissiontodelete) {
 	}
 }
 // Delete page (from menu search)
-if (! GETPOSTISSET('pageid')) {
+if (!GETPOSTISSET('pageid')) {
 	$objectclass = 'WebsitePage';
 
 	// Add part of code from actions_massactions.inc.php
@@ -1278,54 +1279,54 @@ if ($action == 'updatecss')
 		{
 			$tmpvirtualhost = preg_replace('/\/$/', '', GETPOST('virtualhost', 'alpha'));
 			if ($tmpvirtualhost && !preg_match('/^http/', $tmpvirtualhost))
-    		{
-    		    $error++;
-    		    setEventMessages($langs->trans('ErrorURLMustStartWithHttp', $langs->transnoentitiesnoconv("VirtualHost")), null, 'errors');
-    		    $action = 'editcss';
-    		}
+			{
+				$error++;
+				setEventMessages($langs->trans('ErrorURLMustStartWithHttp', $langs->transnoentitiesnoconv("VirtualHost")), null, 'errors');
+				$action = 'editcss';
+			}
 
-    		if (!$error)
-    		{
-    			$arrayotherlang = explode(',', GETPOST('WEBSITE_OTHERLANG', 'alphanohtml'));
-    			foreach ($arrayotherlang as $key => $val) {
-    				$arrayotherlang[$key] = substr(trim($val), 0, 2); // Kept short language code only
-    			}
+			if (!$error)
+			{
+				$arrayotherlang = explode(',', GETPOST('WEBSITE_OTHERLANG', 'alphanohtml'));
+				foreach ($arrayotherlang as $key => $val) {
+					$arrayotherlang[$key] = substr(trim($val), 0, 2); // Kept short language code only
+				}
 
-    			$object->virtualhost = $tmpvirtualhost;
-    		    $object->lang = GETPOST('WEBSITE_LANG', 'aZ09');
-    		    $object->otherlang = join(',', $arrayotherlang);
-    		    $object->use_manifest = GETPOST('use_manifest', 'alpha');
+				$object->virtualhost = $tmpvirtualhost;
+				$object->lang = GETPOST('WEBSITE_LANG', 'aZ09');
+				$object->otherlang = join(',', $arrayotherlang);
+				$object->use_manifest = GETPOST('use_manifest', 'alpha');
 
-    		    $result = $object->update($user);
-        		if ($result < 0)
-        		{
-        		    $error++;
-        		    setEventMessages($object->error, $object->errors, 'errors');
-        		    $action = 'editcss';
-        		}
-    		}
+				$result = $object->update($user);
+				if ($result < 0)
+				{
+					$error++;
+					setEventMessages($object->error, $object->errors, 'errors');
+					$action = 'editcss';
+				}
+			}
 		}
 
 		if (!$error)
 		{
-    		// Save master.inc.php file
-    		dol_syslog("Save master file ".$filemaster);
+			// Save master.inc.php file
+			dol_syslog("Save master file ".$filemaster);
 
-    		dol_mkdir($pathofwebsite);
+			dol_mkdir($pathofwebsite);
 
-    		// Now generate the master.inc.php page
-    		$result = dolSaveMasterFile($filemaster);
-    		if (!$result)
-    		{
-    			$error++;
-    			setEventMessages('Failed to write file '.$filemaster, null, 'errors');
-    		}
+			// Now generate the master.inc.php page
+			$result = dolSaveMasterFile($filemaster);
+			if (!$result)
+			{
+				$error++;
+				setEventMessages('Failed to write file '.$filemaster, null, 'errors');
+			}
 
 
-    		// Html header file
-    		$htmlheadercontent = '';
+			// Html header file
+			$htmlheadercontent = '';
 
-    		/* We disable php code since htmlheader is never executed as an include but only read by fgets_content.
+			/* We disable php code since htmlheader is never executed as an include but only read by fgets_content.
     	    $htmlheadercontent.= "<?php // BEGIN PHP\n";
     	    $htmlheadercontent.= '$websitekey=basename(__DIR__);'."\n";
     	    $htmlheadercontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load env if not already loaded"."\n";
@@ -1335,84 +1336,84 @@ if ($action == 'updatecss')
     	    // $htmlheadercontent.= "header('Content-type: text/html');\n";		// Not required. htmlheader.html is never call as a standalone page
     	    $htmlheadercontent.= "// END PHP ?>\n";*/
 
-    		$htmlheadercontent .= preg_replace(array('/<html>\n*/ims', '/<\/html>\n*/ims'), array('', ''), GETPOST('WEBSITE_HTML_HEADER', 'none'));
+			$htmlheadercontent .= preg_replace(array('/<html>\n*/ims', '/<\/html>\n*/ims'), array('', ''), GETPOST('WEBSITE_HTML_HEADER', 'none'));
 
-    		/*$htmlheadercontent.= "\n".'<?php // BEGIN PHP'."\n";
+			/*$htmlheadercontent.= "\n".'<?php // BEGIN PHP'."\n";
     	    $htmlheadercontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp);'."\n";
     	    $htmlheadercontent.= "// END PHP ?>"."\n";*/
 
-    		$htmlheadercontent = trim($htmlheadercontent)."\n";
+			$htmlheadercontent = trim($htmlheadercontent)."\n";
 
-    		$result = dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent);
-    		if (!$result)
-    		{
-    			$error++;
-    			setEventMessages('Failed to write file '.$filehtmlheader, null, 'errors');
-    		}
+			$result = dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent);
+			if (!$result)
+			{
+				$error++;
+				setEventMessages('Failed to write file '.$filehtmlheader, null, 'errors');
+			}
 
 
-    		// Css file
-    		$csscontent = '';
+			// Css file
+			$csscontent = '';
 
-    		$csscontent .= "<?php // BEGIN PHP\n";
-    		$csscontent .= '$websitekey=basename(__DIR__);'."\n";
-    		$csscontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
-    		$csscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-    		$csscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-    		$csscontent .= "ob_start();\n";
-    		$csscontent .= "if (! headers_sent()) {	/* because file is included inline when in edit mode and we don't want warning */ \n";
-    		$csscontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
-    		$csscontent .= "header('Content-type: text/css');\n";
-    		$csscontent .= "}\n";
-    		$csscontent .= "// END PHP ?>\n";
+			$csscontent .= "<?php // BEGIN PHP\n";
+			$csscontent .= '$websitekey=basename(__DIR__);'."\n";
+			$csscontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
+			$csscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+			$csscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+			$csscontent .= "ob_start();\n";
+			$csscontent .= "if (! headers_sent()) {	/* because file is included inline when in edit mode and we don't want warning */ \n";
+			$csscontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+			$csscontent .= "header('Content-type: text/css');\n";
+			$csscontent .= "}\n";
+			$csscontent .= "// END PHP ?>\n";
 
-    		$csscontent .= trim(GETPOST('WEBSITE_CSS_INLINE', 'none'))."\n";
+			$csscontent .= trim(GETPOST('WEBSITE_CSS_INLINE', 'none'))."\n";
 
-    		$csscontent .= '<?php // BEGIN PHP'."\n";
-    		$csscontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "css");'."\n";
-    		$csscontent .= "// END PHP ?>\n";
+			$csscontent .= '<?php // BEGIN PHP'."\n";
+			$csscontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "css");'."\n";
+			$csscontent .= "// END PHP ?>\n";
 
-    		dol_syslog("Save css content into ".$filecss);
+			dol_syslog("Save css content into ".$filecss);
 
-    		$result = dolSaveCssFile($filecss, $csscontent);
-    		if (!$result)
-    		{
-    			$error++;
-    			setEventMessages('Failed to write file '.$filecss, null, 'errors');
-    		}
+			$result = dolSaveCssFile($filecss, $csscontent);
+			if (!$result)
+			{
+				$error++;
+				setEventMessages('Failed to write file '.$filecss, null, 'errors');
+			}
 
 
-    		// Js file
-    		$jscontent = '';
+			// Js file
+			$jscontent = '';
 
-    		$jscontent .= "<?php // BEGIN PHP\n";
-    		$jscontent .= '$websitekey=basename(__DIR__);'."\n";
-    		$jscontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
-    		$jscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-    		$jscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-    		$jscontent .= "ob_start();\n";
-    		$jscontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
-    		$jscontent .= "header('Content-type: application/javascript');\n";
-    		$jscontent .= "// END PHP ?>\n";
+			$jscontent .= "<?php // BEGIN PHP\n";
+			$jscontent .= '$websitekey=basename(__DIR__);'."\n";
+			$jscontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
+			$jscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+			$jscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+			$jscontent .= "ob_start();\n";
+			$jscontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+			$jscontent .= "header('Content-type: application/javascript');\n";
+			$jscontent .= "// END PHP ?>\n";
 
-    		$jscontent .= trim(GETPOST('WEBSITE_JS_INLINE', 'none'))."\n";
+			$jscontent .= trim(GETPOST('WEBSITE_JS_INLINE', 'none'))."\n";
 
-    		$jscontent .= '<?php // BEGIN PHP'."\n";
-    		$jscontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "js");'."\n";
-    		$jscontent .= "// END PHP ?>\n";
+			$jscontent .= '<?php // BEGIN PHP'."\n";
+			$jscontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "js");'."\n";
+			$jscontent .= "// END PHP ?>\n";
 
-    		$result = dolSaveJsFile($filejs, $jscontent);
-    		if (!$result)
-    		{
-    			$error++;
-    			setEventMessages('Failed to write file '.$filejs, null, 'errors');
-    		}
+			$result = dolSaveJsFile($filejs, $jscontent);
+			if (!$result)
+			{
+				$error++;
+				setEventMessages('Failed to write file '.$filejs, null, 'errors');
+			}
 
 
-    		// Robot file
-    		$robotcontent = '';
+			// Robot file
+			$robotcontent = '';
 
-    		/*$robotcontent.= "<?php // BEGIN PHP\n";
+			/*$robotcontent.= "<?php // BEGIN PHP\n";
     	    $robotcontent.= '$websitekey=basename(__DIR__);'."\n";
     	    $robotcontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load env if not already loaded"."\n";
     	    $robotcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
@@ -1422,63 +1423,63 @@ if ($action == 'updatecss')
     	    $robotcontent.= "header('Content-type: text/css');\n";
     	    $robotcontent.= "// END PHP ?>\n";*/
 
-    		$robotcontent .= trim(GETPOST('WEBSITE_ROBOT', 'restricthtml'))."\n";
+			$robotcontent .= trim(GETPOST('WEBSITE_ROBOT', 'restricthtml'))."\n";
 
-    		/*$robotcontent.= "\n".'<?php // BEGIN PHP'."\n";
+			/*$robotcontent.= "\n".'<?php // BEGIN PHP'."\n";
     	    $robotcontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "robot");'."\n";
     	    $robotcontent.= "// END PHP ?>"."\n";*/
 
-    		$result = dolSaveRobotFile($filerobot, $robotcontent);
-    		if (!$result)
-    		{
-    			$error++;
-    			setEventMessages('Failed to write file '.$filerobot, null, 'errors');
-    		}
+			$result = dolSaveRobotFile($filerobot, $robotcontent);
+			if (!$result)
+			{
+				$error++;
+				setEventMessages('Failed to write file '.$filerobot, null, 'errors');
+			}
 
 
-    		// Htaccess file
-    		$htaccesscontent = '';
-    		$htaccesscontent .= trim(GETPOST('WEBSITE_HTACCESS', 'restricthtml'))."\n";
+			// Htaccess file
+			$htaccesscontent = '';
+			$htaccesscontent .= trim(GETPOST('WEBSITE_HTACCESS', 'restricthtml'))."\n";
 
-    		$result = dolSaveHtaccessFile($filehtaccess, $htaccesscontent);
-    		if (!$result)
-    		{
-    			$error++;
-    			setEventMessages('Failed to write file '.$filehtaccess, null, 'errors');
-    		}
+			$result = dolSaveHtaccessFile($filehtaccess, $htaccesscontent);
+			if (!$result)
+			{
+				$error++;
+				setEventMessages('Failed to write file '.$filehtaccess, null, 'errors');
+			}
 
 
-       		// manifest.json file
-       		$manifestjsoncontent = '';
+	   		// manifest.json file
+	   		$manifestjsoncontent = '';
 
-       		$manifestjsoncontent .= "<?php // BEGIN PHP\n";
-       		$manifestjsoncontent .= '$websitekey=basename(__DIR__);'."\n";
-       		$manifestjsoncontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
-       		$manifestjsoncontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-       		$manifestjsoncontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-       		$manifestjsoncontent .= "ob_start();\n";
-       		$manifestjsoncontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
-       		$manifestjsoncontent .= "header('Content-type: application/manifest+json');\n";
-       		$manifestjsoncontent .= "// END PHP ?>\n";
+	   		$manifestjsoncontent .= "<?php // BEGIN PHP\n";
+	   		$manifestjsoncontent .= '$websitekey=basename(__DIR__);'."\n";
+	   		$manifestjsoncontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
+	   		$manifestjsoncontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+	   		$manifestjsoncontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+	   		$manifestjsoncontent .= "ob_start();\n";
+	   		$manifestjsoncontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+	   		$manifestjsoncontent .= "header('Content-type: application/manifest+json');\n";
+	   		$manifestjsoncontent .= "// END PHP ?>\n";
 
-       		$manifestjsoncontent .= trim(GETPOST('WEBSITE_MANIFEST_JSON', 'none'))."\n";
+	   		$manifestjsoncontent .= trim(GETPOST('WEBSITE_MANIFEST_JSON', 'none'))."\n";
 
-       		$manifestjsoncontent .= '<?php // BEGIN PHP'."\n";
-       		$manifestjsoncontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
-       		$manifestjsoncontent .= "// END PHP ?>\n";
+	   		$manifestjsoncontent .= '<?php // BEGIN PHP'."\n";
+	   		$manifestjsoncontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
+	   		$manifestjsoncontent .= "// END PHP ?>\n";
 
-       		$result = dolSaveManifestJson($filemanifestjson, $manifestjsoncontent);
-       		if (!$result)
-       		{
-       			$error++;
-       			setEventMessages('Failed to write file '.$filemanifestjson, null, 'errors');
-       		}
+	   		$result = dolSaveManifestJson($filemanifestjson, $manifestjsoncontent);
+	   		if (!$result)
+	   		{
+	   			$error++;
+	   			setEventMessages('Failed to write file '.$filemanifestjson, null, 'errors');
+	   		}
 
 
-       		// README.md file
-       		$readmecontent = '';
+	   		// README.md file
+	   		$readmecontent = '';
 
-       		/*$readmecontent.= "<?php // BEGIN PHP\n";
+	   		/*$readmecontent.= "<?php // BEGIN PHP\n";
        		$readmecontent.= '$websitekey=basename(__DIR__);'."\n";
        		$readmecontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded"."\n";	// For the css, we need to set path of master using the dirname of css file.
        		$readmecontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
@@ -1488,42 +1489,42 @@ if ($action == 'updatecss')
        		$readmecontent.= "header('Content-type: application/manifest+json');\n";
        		$readmecontent.= "// END PHP ?>\n";*/
 
-       		$readmecontent .= trim(GETPOST('WEBSITE_README', 'restricthtml'))."\n";
+	   		$readmecontent .= trim(GETPOST('WEBSITE_README', 'restricthtml'))."\n";
 
-       		/*$readmecontent.= '<?php // BEGIN PHP'."\n";
+	   		/*$readmecontent.= '<?php // BEGIN PHP'."\n";
        		$readmecontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
        		$readmecontent.= "// END PHP ?>"."\n";*/
 
-       		$result = dolSaveReadme($filereadme, $readmecontent);
-       		if (!$result)
-       		{
-       			$error++;
-       			setEventMessages('Failed to write file '.$filereadme, null, 'errors');
-       		}
+	   		$result = dolSaveReadme($filereadme, $readmecontent);
+	   		if (!$result)
+	   		{
+	   			$error++;
+	   			setEventMessages('Failed to write file '.$filereadme, null, 'errors');
+	   		}
 
 
-       		// Save wrapper.php
+	   		// Save wrapper.php
 			$result = dolSaveIndexPage($pathofwebsite, '', '', $filewrapper);
 
 
-    		// Message if no error
-    		if (!$error)
-    		{
-    			setEventMessages($langs->trans("Saved"), null, 'mesgs');
-    		}
+			// Message if no error
+			if (!$error)
+			{
+				setEventMessages($langs->trans("Saved"), null, 'mesgs');
+			}
 
-    		if (!GETPOSTISSET('updateandstay'))	// If we click on "Save And Stay", we don not make the redirect
-    		{
-    			$action = 'preview';
-    			if ($backtopage)
-	    		{
-	    			header("Location: ".$backtopage);
-	    			exit;
-	    		}
-    		}
-    		else {
-    			$action = 'editcss';
-    		}
+			if (!GETPOSTISSET('updateandstay'))	// If we click on "Save And Stay", we don not make the redirect
+			{
+				$action = 'preview';
+				if ($backtopage)
+				{
+					header("Location: ".$backtopage);
+					exit;
+				}
+			}
+			else {
+				$action = 'editcss';
+			}
 		}
 	}
 }
@@ -1562,7 +1563,7 @@ if ($action == 'setashome')
 	}
 }
 
-// Update page (meta)
+// Update page properties (meta)
 if ($action == 'updatemeta')
 {
 	$db->begin();
@@ -1656,11 +1657,12 @@ if ($action == 'updatemeta')
 		$objectpage->description = str_replace(array('<', '>'), '', GETPOST('WEBSITE_DESCRIPTION', 'alphanohtml'));
 		$objectpage->image = GETPOST('WEBSITE_IMAGE', 'alpha');
 		$objectpage->keywords = str_replace(array('<', '>'), '', GETPOST('WEBSITE_KEYWORDS', 'alphanohtml'));
+		$objectpage->allowed_in_frames = GETPOST('WEBSITE_ALLOWED_IN_FRAMES', 'aZ09');
 		$objectpage->htmlheader = trim(GETPOST('htmlheader', 'none'));
 		$objectpage->fk_page = (GETPOST('pageidfortranslation', 'int') > 0 ? GETPOST('pageidfortranslation', 'int') : 0);
 		$objectpage->author_alias = trim(GETPOST('WEBSITE_AUTHORALIAS', 'alphanohtml'));
 		$objectpage->object_type = GETPOST('WEBSITE_OBJECTCLASS', 'alpha');
-        $objectpage->fk_object = GETPOST('WEBSITE_OBJECTID', 'aZ09');
+		$objectpage->fk_object = GETPOST('WEBSITE_OBJECTID', 'aZ09');
 
 		$newdatecreation = dol_mktime(GETPOST('datecreationhour', 'int'), GETPOST('datecreationmin', 'int'), GETPOST('datecreationsec', 'int'), GETPOST('datecreationmonth', 'int'), GETPOST('datecreationday', 'int'), GETPOST('datecreationyear', 'int'));
 		if ($newdatecreation) $objectpage->date_creation = $newdatecreation;
@@ -1822,8 +1824,7 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 		// Protection if it is a translation page
 		if ($istranslation)
 		{
-			if (GETPOST('newlang', 'aZ09') == $objectpage->lang)
-			{
+			if (GETPOST('newlang', 'aZ09') == $objectpage->lang || !GETPOST('newlang', 'aZ09')) {
 				$error++;
 				setEventMessages($langs->trans("LanguageMustNotBeSameThanClonedPage"), null, 'errors');
 				$action = 'preview';
@@ -1932,35 +1933,35 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 
 			$objectpage->content = GETPOST('PAGE_CONTENT', 'none');
 
-            // Security analysis
+			// Security analysis
 			$phpfullcodestring = dolKeepOnlyPhpCode($objectpage->content);
 			//print dol_escape_htmltag($phpfullcodestring);exit;
-            $forbiddenphpcommands = array("exec", "passthru", "system", "shell_exec", "proc_open");
-            if (empty($conf->global->WEBSITE_PHP_ALLOW_WRITE))    // If option is not on, we disallow functions to write files
-            {
-                $forbiddenphpcommands = array_merge($forbiddenphpcommands, array("fopen", "file_put_contents", "fputs", "fputscsv", "fwrite", "fpassthru", "unlink", "mkdir", "rmdir", "symlink", "touch", "umask"));
-            }
-            foreach ($forbiddenphpcommands as $forbiddenphpcommand)
-            {
-                if (preg_match('/'.$forbiddenphpcommand.'\s*\(/ms', $phpfullcodestring))
-                {
-                    $error++;
-                    setEventMessages($langs->trans("DynamicPHPCodeContainsAForbiddenInstruction", $forbiddenphpcommand), null, 'errors');
-                    if ($action == 'updatesource') $action = 'editsource';
-                    if ($action == 'updatecontent') $action = 'editcontent';
-                }
-            }
+			$forbiddenphpcommands = array("exec", "passthru", "system", "shell_exec", "proc_open");
+			if (empty($conf->global->WEBSITE_PHP_ALLOW_WRITE))    // If option is not on, we disallow functions to write files
+			{
+				$forbiddenphpcommands = array_merge($forbiddenphpcommands, array("fopen", "file_put_contents", "fputs", "fputscsv", "fwrite", "fpassthru", "unlink", "mkdir", "rmdir", "symlink", "touch", "umask"));
+			}
+			foreach ($forbiddenphpcommands as $forbiddenphpcommand)
+			{
+				if (preg_match('/'.$forbiddenphpcommand.'\s*\(/ms', $phpfullcodestring))
+				{
+					$error++;
+					setEventMessages($langs->trans("DynamicPHPCodeContainsAForbiddenInstruction", $forbiddenphpcommand), null, 'errors');
+					if ($action == 'updatesource') $action = 'editsource';
+					if ($action == 'updatecontent') $action = 'editcontent';
+				}
+			}
 
-            if (empty($user->rights->website->writephp))
-            {
-                if ($phpfullcodestringold != $phpfullcodestring)
-                {
-                    $error++;
-                    setEventMessages($langs->trans("NotAllowedToAddDynamicContent"), null, 'errors');
-                    if ($action == 'updatesource') $action = 'editsource';
-                    if ($action == 'updatecontent') $action = 'editcontent';
-                }
-            }
+			if (empty($user->rights->website->writephp))
+			{
+				if ($phpfullcodestringold != $phpfullcodestring)
+				{
+					$error++;
+					setEventMessages($langs->trans("NotAllowedToAddDynamicContent"), null, 'errors');
+					if ($action == 'updatesource') $action = 'editsource';
+					if ($action == 'updatecontent') $action = 'editcontent';
+				}
+			}
 
 			// Clean data. We remove all the head section.
 			$objectpage->content = preg_replace('/<head>.*<\/head>/ims', '', $objectpage->content);
@@ -2298,7 +2299,7 @@ if (!GETPOST('hide_websitemenu'))
 
 
 	//var_dump($objectpage);exit;
-	print '<div class="centpercent websitebar">';
+	print '<div class="centpercent websitebar'.(GETPOST('dol_openinpopup', 'int') ? ' hidden' : '').'">';
 
 	//
 	// Toolbar for websites
@@ -2322,7 +2323,7 @@ if (!GETPOST('hide_websitemenu'))
 		$out = '';
 		$out .= '<select name="website" class="minwidth100 width200 maxwidth150onsmartphone" id="website">';
 		if (empty($object->records)) $out .= '<option value="-1">&nbsp;</option>';
-		if (! empty($conf->use_javascript_ajax)) {
+		if (!empty($conf->use_javascript_ajax)) {
 			$valueoption = '<span class="classlink">'.img_picto('', 'add', 'class="paddingrightonly"').$langs->trans("AddWebsite").'</span>';
 			$out .= '<option value="-2" data-html="'.dol_escape_htmltag($valueoption).'">'.$valueoption.'</option>';
 		}
@@ -2337,7 +2338,7 @@ if (!GETPOST('hide_websitemenu'))
 			$out .= '<option value="'.$valwebsite->ref.'"';
 			if ($websitekey == $valwebsite->ref) $out .= ' selected'; // To preselect a value
 			//$outoption = $valwebsite->getLibStatut(3).' '.$valwebsite->ref.' ';
-			$outoption = (($valwebsite->status == $valwebsite::STATUS_DRAFT)?'<span class="opacitymedium">':'').$valwebsite->ref.(($valwebsite->status == $valwebsite::STATUS_DRAFT)?'</span>':'');
+			$outoption = (($valwebsite->status == $valwebsite::STATUS_DRAFT) ? '<span class="opacitymedium">' : '').$valwebsite->ref.(($valwebsite->status == $valwebsite::STATUS_DRAFT) ? '</span>' : '');
 			$out .= ' data-html="'.dol_escape_htmltag($outoption).'"';
 			$out .= '>';
 			$out .= $valwebsite->ref;
@@ -2375,7 +2376,7 @@ if (!GETPOST('hide_websitemenu'))
 
 			$importlabel = $langs->trans("ImportSite");
 			$exportlabel = $langs->trans("ExportSite");
-			if (! empty($conf->dol_optimize_smallscreen)) {
+			if (!empty($conf->dol_optimize_smallscreen)) {
 				$importlabel = $langs->trans("Import");
 				$exportlabel = $langs->trans("Export");
 			}
@@ -2406,28 +2407,12 @@ if (!GETPOST('hide_websitemenu'))
 		if ($websitekey && $websitekey != '-1' && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite'))
 		{
 			print '<span class="websiteselection">';
-			print '<a href="'.$_SERVER["PHP_SEFL"].'?action=file_manager&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("MediaFiles")).'"><span class="fa fa-image"><span></a>';
+			//print '<a href="'.$_SERVER["PHP_SELF"].'?action=file_manager&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("MediaFiles")).'"><span class="fa fa-image"><span></a>';
+			print dolButtonToOpenUrlInDialogPopup('file_manager', $langs->transnoentitiesnoconv("MediaFiles"), '<span class="fa fa-image"><span>', '/website/index.php?action=file_manager&website='.$website->ref, $disabled);
 
-			if (! empty($conf->categorie->enabled)) {
+			if (!empty($conf->categorie->enabled)) {
 				//print '<a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=website&dol_hide_leftmenu=1&nosearch=1&type=website_page&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("Categories")).'"><span class="fa fa-tags"><span></a>';
-
-				//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("MediaFiles")).'" name="file_manager">';
-				print '<a class="button bordertransp button_categories"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("Categories")).'"><span class="fa fa-tags"><span></a>';
-				print '<script language="javascript">
-				 jQuery(document).ready(function () {
-					 jQuery(".button_categories").click(function () {
-						 var $dialog = $(\'<div></div>\').html(\'<iframe class="iframedialog" style="border: 0px;" src="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=website&nosearch=1&type=website_page&website='.$website->ref.'" width="100%" height="98%"></iframe>\')
-						 .dialog({
-						 	autoOpen: false,
-						 	modal: true,
-						 	height: (window.innerHeight - 150),
-						 	width: \'80%\',
-						 	title: "'.dol_escape_js($langs->transnoentitiesnoconv("Categories")).'"
-						 });
-						 $dialog.dialog(\'open\');
-					 });
-				 });
-				 </script>';
+				print dolButtonToOpenUrlInDialogPopup('categories', $langs->transnoentitiesnoconv("Categories"), '<span class="fa fa-tags"><span>', '/categories/index.php?leftmenu=website&nosearch=1&type=website_page&website='.$website->ref, $disabled);
 			}
 
 			print '</span>';
@@ -2451,28 +2436,28 @@ if (!GETPOST('hide_websitemenu'))
 		$htmltext = '';
 		if (empty($object->fk_default_home))
 		{
-		    $htmltext .= '<br><span class="error">'.$langs->trans("YouMustDefineTheHomePage").'</span><br><br>';
+			$htmltext .= '<br><span class="error">'.$langs->trans("YouMustDefineTheHomePage").'</span><br><br>';
 		}
 		elseif (empty($virtualurl))
 		{
-		    //$htmltext .= '<br><span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span><br><br>';
+			//$htmltext .= '<br><span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span><br><br>';
 		}
 		else {
-		    $htmltext .= '<br><center>'.$langs->trans("GoTo").' <a href="'.$virtualurl.'" target="_website">'.$virtualurl.'</a></center><br>';
+			$htmltext .= '<br><center>'.$langs->trans("GoTo").' <a href="'.$virtualurl.'" target="_website">'.$virtualurl.'</a></center><br>';
 		}
 		if (!empty($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER))
 		{
-		    $htmltext .= '<br>'.$langs->trans($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER);
+			$htmltext .= '<br>'.$langs->trans($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER);
 		}
 		else {
-    		$htmltext .= $langs->trans("SetHereVirtualHost", $dataroot);
-    		$htmltext .= '<br>';
-    		$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
-    		$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
+			$htmltext .= $langs->trans("SetHereVirtualHost", $dataroot);
+			$htmltext .= '<br>';
+			$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
+			$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
 
-    		$examplewithapache = '#php_admin_value open_basedir /tmp/:'.DOL_DOCUMENT_ROOT.':'.DOL_DATA_ROOT.':/dev/urandom'."\n";
-    		$examplewithapache .= '<Directory "'.DOL_DOCUMENT_ROOT.'">'."\n";
-    		$examplewithapache .= 'AllowOverride FileInfo Options
+			$examplewithapache = '#php_admin_value open_basedir /tmp/:'.DOL_DOCUMENT_ROOT.':'.DOL_DATA_ROOT.':/dev/urandom'."\n";
+			$examplewithapache .= '<Directory "'.DOL_DOCUMENT_ROOT.'">'."\n";
+			$examplewithapache .= 'AllowOverride FileInfo Options
     		Options       -Indexes -MultiViews -FollowSymLinks -ExecCGI
     		Require all granted
     		</Directory>
@@ -2487,14 +2472,14 @@ if (!GETPOST('hide_websitemenu'))
     		Require all granted
     		</Directory>';
 
-    		$htmltext .= '<br>'.$langs->trans("ExampleToUseInApacheVirtualHostConfig").':<br>';
-    		$htmltext .= '<div class="centpercent exampleapachesetup">'.dol_nl2br(dol_escape_htmltag($examplewithapache, 1, 1)).'</div>';
+			$htmltext .= '<br>'.$langs->trans("ExampleToUseInApacheVirtualHostConfig").':<br>';
+			$htmltext .= '<div class="centpercent exampleapachesetup">'.dol_nl2br(dol_escape_htmltag($examplewithapache, 1, 1)).'</div>';
 
-    		$htmltext .= '<br>';
-    		$htmltext .= $langs->trans("YouCanAlsoTestWithPHPS", $dataroot);
-    		$htmltext .= '<br>';
-    		$htmltext .= '<br>';
-    		$htmltext .= $langs->trans("YouCanAlsoDeployToAnotherWHP");
+			$htmltext .= '<br>';
+			$htmltext .= $langs->trans("YouCanAlsoTestWithPHPS", $dataroot);
+			$htmltext .= '<br>';
+			$htmltext .= '<br>';
+			$htmltext .= $langs->trans("YouCanAlsoDeployToAnotherWHP");
 		}
 		print $form->textwithpicto($linktotestonwebserver, $htmltext, 1, 'none', 'valignmiddle', 0, 3, 'helpvirtualhost');
 		print '</span>';
@@ -2503,9 +2488,9 @@ if (!GETPOST('hide_websitemenu'))
 	if (in_array($action, array('editcss', 'editmenu', 'file_manager', 'replacesite', 'replacesiteconfirm')))
 	{
 		if ($action == 'editcss') print '<input type="submit" id="savefilean stay" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
-		if (preg_match('/^create/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') print '<input type="submit" id="savefile" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
-		if (preg_match('/^edit/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') print '<input type="submit" id="savefile" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
-		if ($action != 'preview') print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="cancel">';
+		if (preg_match('/^create/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+		if (preg_match('/^edit/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+		if ($action != 'preview') print '<input type="submit" class="button button-cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="cancel">';
 	}
 
 	print '</span>';
@@ -2533,27 +2518,33 @@ if (!GETPOST('hide_websitemenu'))
 
 		if ($action != 'addcontainer')
 		{
-			print '<span class="websiteselection">';
-			print $formwebsite->selectContainer($website, 'pageid', $pageid, 0, $action, 'maxwidth200onsmartphone');
-			print '</span>';
-
-			$urltocreatenewpage = $_SERVER["PHP_SEFL"].'?action=createcontainer&website='.$website->ref;
-
 			$out = '';
-			if (!empty($conf->use_javascript_ajax)) {
-				$out .= '<script language="javascript">';
-				$out .= 'jQuery(document).ready(function () {';
-				$out .= '	jQuery("#pageid").change(function () {';
-				$out .= '   	console.log("We select "+jQuery("#pageid option:selected").val());';
-				$out .= '   	if (jQuery("#pgeid option:selected").val() == \'-2\') {';
-				$out .= '  			window.location.href = "'.$urltocreatenewpage.'";';
-				$out .= '		} else {';
-				$out .= '  			window.location.href = "'.$_SERVER["PHP_SEFL"].'?website='.$website->ref.'&pageid="+jQuery("#pageid option:selected").val();';
-				$out .= '       }';
-				$out .= '   });';
-				$out .= '});';
-				$out .= '</script>';
+
+			$s = $formwebsite->selectContainer($website, 'pageid', $pageid, 0, $action, 'maxwidth200onsmartphone');
+
+			if ($formwebsite->num > 0) {
+				$out .= '<span class="websiteselection">';
+				$out .= $s;
+				$out .= '</span>';
+
+				$urltocreatenewpage = $_SERVER["PHP_SEFL"].'?action=createcontainer&website='.$website->ref;
+
+				if (!empty($conf->use_javascript_ajax)) {
+					$out .= '<script language="javascript">';
+					$out .= 'jQuery(document).ready(function () {';
+					$out .= '	jQuery("#pageid").change(function () {';
+					$out .= '   	console.log("We select "+jQuery("#pageid option:selected").val());';
+					$out .= '   	if (jQuery("#pgeid option:selected").val() == \'-2\') {';
+					$out .= '  			window.location.href = "'.$urltocreatenewpage.'";';
+					$out .= '		} else {';
+					$out .= '  			window.location.href = "'.$_SERVER["PHP_SEFL"].'?website='.$website->ref.'&pageid="+jQuery("#pageid option:selected").val();';
+					$out .= '       }';
+					$out .= '   });';
+					$out .= '});';
+					$out .= '</script>';
+				}
 			}
+
 			print $out;
 		}
 		else {
@@ -2594,9 +2585,9 @@ if (!GETPOST('hide_websitemenu'))
 		}
 
 		if ($pagepreviousid) print '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?website='.urlencode($object->ref).'&pageid='.$pagepreviousid.'&action='.$action.'">'.img_previous($langs->trans("PreviousContainer")).'</a>';
-		else print '<span class="valignmiddle opacitymedium">'.img_previous($langs->trans("PreviousContainer")).'</span>';
+		else print '<span class="valignmiddle opacitymedium">'.img_previous($langs->trans("Previous")).'</span>';
 		if ($pagenextid) print '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?website='.urlencode($object->ref).'&pageid='.$pagenextid.'&action='.$action.'">'.img_next($langs->trans("NextContainer")).'</a>';
-		else print '<span class="valignmiddle opacitymedium">'.img_next($langs->trans("NextContainer")).'</span>';
+		else print '<span class="valignmiddle opacitymedium">'.img_next($langs->trans("Next")).'</span>';
 
 		$websitepage = new WebSitePage($db);
 		if ($pageid > 0 && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone'))
@@ -2641,28 +2632,32 @@ if (!GETPOST('hide_websitemenu'))
 				// Confirmation to clone
 				if ($action == 'createpagefromclone') {
 					// Create an array for form
-					$preselectedlanguage = GETPOST('newlang', 'aZ09') ? GETPOST('newlang', 'aZ09') : '';	// Dy default, we do not force any language on pages
+					$preselectedlanguage = GETPOST('newlang', 'aZ09') ? GETPOST('newlang', 'aZ09') : ''; // Dy default, we do not force any language on pages
 					$onlylang = array();
 					if ($website->otherlang) {
-						if (! empty($website->lang)) {
-							$onlylang[$website->lang] = $website->lang;
+						if (!empty($website->lang)) {
+							$onlylang[$website->lang] = $website->lang.' ('.$langs->trans("Default").')';
 						}
 						foreach (explode(',', $website->otherlang) as $langkey) {
 							$onlylang[$langkey] = $langkey;
 						}
-						$textifempty = 1;
+						$textifempty = $langs->trans("Default");
 					} else {
-						$onlylang['none'] = '';
+						$onlylang['none'] = 'none';
+						$textifempty = $langs->trans("Default");
 					}
-					$textifempty = 1;
 					$formquestion = array(
 						array('type' => 'hidden', 'name' => 'sourcepageurl', 'value'=> $objectpage->pageurl),
 						array('type' => 'other', 'tdclass'=>'fieldrequired', 'name' => 'newwebsite', 'label' => $langs->trans("WebSite"), 'value' => $formwebsite->selectWebsite($object->id, 'newwebsite', 0)),
-						array('type' => 'text', 'tdclass'=>'maxwidth200 fieldrequired', 'name' => 'newtitle', 'label'=> $langs->trans("WEBSITE_TITLE"), 'value'=> $langs->trans("CopyOf").' '.$objectpage->title),
-						array('type' => 'text', 'tdclass'=>'maxwidth200', 'name' => 'newpageurl', 'label'=> $langs->trans("WEBSITE_PAGENAME"), 'value'=> ''),
-						array('type' => 'checkbox', 'tdclass'=>'maxwidth200', 'name' => 'is_a_translation', 'label' => $langs->trans("PageIsANewTranslation"), 'value' => 0, 'morecss'=>'margintoponly'),
-						array('type' => 'other', 'name' => 'newlang', 'label' => $form->textwithpicto($langs->trans("Language"), $langs->trans("DefineListOfAltLanguagesInWebsiteProperties")), 'value' => $formadmin->select_language($preselectedlanguage, 'newlang', 0, null, $textifempty, 0, 0, 'minwidth200', 0, 1, 0, $onlylang, 1)),
-					);
+						array('type' => 'text', 'tdclass'=>'maxwidth200 fieldrequired', 'moreattr'=>'autofocus="autofocus"', 'name' => 'newtitle', 'label'=> $langs->trans("WEBSITE_TITLE"), 'value'=> $langs->trans("CopyOf").' '.$objectpage->title),
+						array('type' => 'text', 'tdclass'=>'maxwidth200', 'name' => 'newpageurl', 'label'=> $langs->trans("WEBSITE_PAGENAME"), 'value'=> '')
+						);
+					if (count($onlylang) > 1) {
+						$formquestion[] = array('type' => 'checkbox', 'tdclass'=>'maxwidth200', 'name' => 'is_a_translation', 'label' => $langs->trans("PageIsANewTranslation"), 'value' => 0, 'morecss'=>'margintoponly');
+					}
+
+					$value= $formadmin->select_language($preselectedlanguage, 'newlang', 0, null, $textifempty, 0, 0, 'minwidth200', 1, 0, 0, $onlylang, 1);
+					$formquestion[] = array('type' => 'other', 'name' => 'newlang', 'label' => $form->textwithpicto($langs->trans("Language"), $langs->trans("DefineListOfAltLanguagesInWebsiteProperties")), 'value' => $value);
 
 				   	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid, $langs->trans('ClonePage'), '', 'confirm_createpagefromclone', $formquestion, 0, 1, 300, 550);
 
@@ -2819,9 +2814,9 @@ if (!GETPOST('hide_websitemenu'))
 		if (!in_array($action, array('editcss', 'editmenu', 'file_manager', 'replacesite', 'replacesiteconfirm', 'createsite', 'createcontainer', 'createfromclone', 'createpagefromclone', 'deletesite')))
 		{
 			if ($action == 'editsource' || $action == 'editmeta') print '<input type="submit" id="savefilean stay" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
-			if (preg_match('/^create/', $action)) print '<input type="submit" id="savefile" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
-			if (preg_match('/^edit/', $action)) print '<input type="submit" id="savefile" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
-			if ($action != 'preview') print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="cancel">';
+			if (preg_match('/^create/', $action)) print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+			if (preg_match('/^edit/', $action)) print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+			if ($action != 'preview') print '<input type="submit" class="button button-cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="cancel">';
 		}
 
 		print '</span>'; // end websitetools
@@ -2835,19 +2830,18 @@ if (!GETPOST('hide_websitemenu'))
 			$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSource2", $url);
 			$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSourceMore", $url);
 			$htmltext .= '<br>';
-            if ($conf->browser->layout == 'phone')
-            {
-                print $form->textwithpicto('', $htmltext, 1, 'help', 'inline-block', 1, 2, 'tooltipsubstitution');
-            }
-            else {
-            	//img_help(($tooltiptrigger != '' ? 2 : 1), $alt)
-            	print $form->textwithpicto($langs->trans("SyntaxHelp").' '.img_help(2, $langs->trans("SyntaxHelp")), $htmltext, 1, 'none', 'inline-block', 1, 2, 'tooltipsubstitution');
-            }
+			if ($conf->browser->layout == 'phone')
+			{
+				print $form->textwithpicto('', $htmltext, 1, 'help', 'inline-block', 1, 2, 'tooltipsubstitution');
+			}
+			else {
+				//img_help(($tooltiptrigger != '' ? 2 : 1), $alt)
+				print $form->textwithpicto($langs->trans("SyntaxHelp").' '.img_help(2, $langs->trans("SyntaxHelp")), $htmltext, 1, 'none', 'inline-block', 1, 2, 'tooltipsubstitution');
+			}
 		}
 		print '</span>'; // end websitehelp
 
 
-
 		if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone')
 		{
 			// Adding jquery code to change on the fly url of preview ext
@@ -2903,7 +2897,6 @@ if (!GETPOST('hide_websitemenu'))
 }
 
 
-
 $head = array();
 
 
@@ -3023,9 +3016,9 @@ if ($action == 'editcss')
 		//$readmecontent.="";
 	}
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
-	print '<!-- Edit CSS -->'."\n";
+	print '<!-- Edit Website properties -->'."\n";
 	print '<table class="border centpercent">';
 
 	// Website
@@ -3055,8 +3048,8 @@ if ($action == 'editcss')
 
 	// Other languages
 	print '<tr><td class="tdtop">';
-	$htmltext = '';
-	print $form->textwithpicto($langs->trans('OtherLanguages'), $htmltext, 1, 'help', '', 0, 2, 'WEBSITE_OTHERLANG');
+	$htmltext = $langs->trans("Example").': fr,de,sv,it,pt';
+	print $form->textwithpicto($langs->trans('OtherLanguages'), $htmltext, 1, 'help', '', 0, 2);
 	print '</td><td>';
 	print '<input type="text" class="flat" value="'.(GETPOSTISSET('WEBSITE_OTHERLANG') ? GETPOST('WEBSITE_OTHERLANG', 'alpha') : $object->otherlang).'" name="WEBSITE_OTHERLANG">';
 	print '</td>';
@@ -3065,10 +3058,11 @@ if ($action == 'editcss')
 	// VirtualHost
 	print '<tr><td class="tdtop">';
 
-	$htmltext = $langs->trans("SetHereVirtualHost", DOL_DATA_ROOT.'/website/<i>'.$websitekey.'</i>');
+	$htmltext = $langs->trans("SetHereVirtualHost", DOL_DATA_ROOT.'/website/{s1}'.$websitekey.'{s2}');
+	$htmltext = str_replace(array('{s1}', '{s2}'), array('<i>', '</i>'), $htmltext);
 	$htmltext .= '<br>';
-	$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
-	$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
+	$htmltext .= '<br>'.$langs->transnoentitiesnoconv("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
+	$htmltext .= '<br>'.$langs->transnoentitiesnoconv("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
 
 	print $form->textwithpicto($langs->trans('Virtualhost'), $htmltext, 1, 'help', '', 0, 2, 'virtualhosttooltip');
 	print '</td><td>';
@@ -3167,7 +3161,7 @@ if ($action == 'editcss')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '</div>';
 
@@ -3189,7 +3183,7 @@ if ($action == 'createsite')
    	$head[$h][2] = 'card';
 	$h++;
 
-    dol_fiche_head($head, 'card', $langs->trans("AddSite"), -1, 'globe');
+    print dol_get_fiche_head($head, 'card', $langs->trans("AddSite"), -1, 'globe');
     */
 	if ($action == 'createcontainer') print load_fiche_titre($langs->trans("AddSite"));
 
@@ -3249,7 +3243,7 @@ if ($action == 'createsite')
 		print '<div class="center">';
 
 		print '<input class="button" type="submit" name="addcontainer" value="'.$langs->trans("Create").'">';
-		print '<input class="button" type="submit" name="preview" value="'.$langs->trans("Cancel").'">';
+		print '<input class="button button-cancel" type="submit" name="preview" value="'.$langs->trans("Cancel").'">';
 
 		print '</div>';
 	}
@@ -3257,7 +3251,7 @@ if ($action == 'createsite')
 
 	//print '</div>';
 
-	//dol_fiche_end();
+	//print dol_get_fiche_end();
 
 	print '</div>';
 
@@ -3272,14 +3266,14 @@ if ($action == 'importsite')
 
 	print load_fiche_titre($langs->trans("ImportSite"));
 
-	dol_fiche_head(array(), '0', '', -1);
+	print dol_get_fiche_head(array(), '0', '', -1);
 
 	print '<span class="opacitymedium">'.$langs->trans("ZipOfWebsitePackageToImport").'</span><br><br>';
 
 	print '<input type="hidden" name="max_file_size" value="'.$conf->maxfilesize.'">';
 	print '<input class="flat minwidth400" type="file" name="userfile[]" accept=".zip">';
 	print '<input type="submit" class="button" name="buttonsubmitimportfile" value="'.dol_escape_htmltag($langs->trans("Upload")).'">';
-	print '<input type="submit" class="button" name="preview" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+	print '<input type="submit" class="button button-cancel" name="preview" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 
 	print '<br><br><br>';
 
@@ -3288,14 +3282,14 @@ if ($action == 'importsite')
 
 	showWebsiteTemplates($website);
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '</div>';
 
 	print '<br>';
 }
 
-if ($action == 'editmeta' || $action == 'createcontainer')
+if ($action == 'editmeta' || $action == 'createcontainer')	// Edit properties of a web site OR properties of a web page
 {
 	print '<div class="fiche">';
 
@@ -3309,7 +3303,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
    	$head[$h][2] = 'card';
 	$h++;
 
-    dol_fiche_head($head, 'card', $langs->trans("AddPage"), -1, 'globe');
+    print dol_get_fiche_head($head, 'card', $langs->trans("AddPage"), -1, 'globe');
     */
 	if ($action == 'createcontainer') print load_fiche_titre($langs->trans("AddPage"));
 
@@ -3382,6 +3376,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 		$pageimage = $objectpage->image;
 		$pagekeywords = $objectpage->keywords;
 		$pagelang = $objectpage->lang;
+		$pageallowedinframes = $objectpage->allowed_in_frames;
 		$pagehtmlheader = $objectpage->htmlheader;
 		$pagedatecreation = $objectpage->date_creation;
 		$pagedatemodification = $objectpage->date_modification;
@@ -3405,6 +3400,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	if (GETPOST('WEBSITE_IMAGE', 'alpha'))       $pageimage = GETPOST('WEBSITE_IMAGE', 'alpha');
 	if (GETPOST('WEBSITE_KEYWORDS', 'alpha'))    $pagekeywords = str_replace(array('<', '>'), '', GETPOST('WEBSITE_KEYWORDS', 'alphanohtml'));
 	if (GETPOST('WEBSITE_LANG', 'aZ09'))         $pagelang = GETPOST('WEBSITE_LANG', 'aZ09');
+	if (GETPOST('WEBSITE_ALLOWED_IN_FRAMES', 'aZ09')) $pageallowedinframes = GETPOST('WEBSITE_ALLOWED_IN_FRAMES', 'aZ09');
 	if (GETPOST('htmlheader', 'none'))			 $pagehtmlheader = GETPOST('htmlheader', 'none');
 
 	if ($action != 'createcontainer')
@@ -3558,12 +3554,21 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	}
 	print '</td></tr>';
 
+	// Allowed in frames
+	print '<tr><td>';
+	print $langs->trans('AllowedInFrames');
+	//$htmlhelp = $langs->trans("AllowedInFramesDesc");
+	//print $form->textwithpicto($langs->trans('AllowedInFrames'), $htmlhelp, 1, 'help', '', 0, 2, 'allowedinframestooltip');
+	print '</td><td>';
+	print '<input type="checkbox" class="flat" name="WEBSITE_ALLOWED_IN_FRAMES" value="1"'.($pageallowedinframes ? 'checked="checked"' : '').'>';
+	print '</td></tr>';
+
 	// Categories
 	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
 	{
 		$langs->load('categories');
 
-		if (! GETPOSTISSET('categories')) {
+		if (!GETPOSTISSET('categories')) {
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_WEBSITE_PAGE, '', null, null, null, 1);
 			$c = new Categorie($db);
 			$cats = $c->containing($objectpage->id, Categorie::TYPE_WEBSITE_PAGE);
@@ -3578,22 +3583,23 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 		}
 
 		print '<tr class="visibleifsupplier"><td class="toptd">'.$form->editfieldkey('Categories', 'categories', '', $objectpage, 0).'</td><td colspan="3">';
-		print img_picto('', 'category', 'class="paddingright"').$form->multiselectarray('categories', $cate_arbo, (GETPOSTISSET('categories') ? GETPOST('categories', 'array') : $arrayselected), null, null, null, null, "90%");
+		print img_picto('', 'category', 'class="paddingright"').$form->multiselectarray('categories', $cate_arbo, (GETPOSTISSET('categories') ? GETPOST('categories', 'array') : $arrayselected), null, null, 'quatrevingtpercent widthcentpercentminusx');
 		print "</td></tr>";
 	}
 
-	print '<tr><td class="titlefieldcreate">';
-    print 'ObjectClass';
-    print '</td><td>';
-    print '<input type="text" class="flat minwidth300" name="WEBSITE_OBJECTCLASS" placeholder="ClassName::/path/class/ObjectClass.class.php" >';
-    print '</td></tr>';
-
-    print '<tr><td class="titlefieldcreate">';
-    print 'ObjectID';
-    print '</td><td>';
-    print '<input type="text" class="flat minwidth300" name="WEBSITE_OBJECTID" >';
-    print '</td></tr>';
+	if (!empty($conf->global->WEBSITE_PAGE_SHOW_INTERNAL_LINKS_TO_OBJECT)) {
+		print '<tr><td class="titlefieldcreate">';
+		print 'ObjectClass';
+		print '</td><td>';
+		print '<input type="text" class="flat minwidth300" name="WEBSITE_OBJECTCLASS" placeholder="ClassName::/path/class/ObjectClass.class.php" >';
+		print '</td></tr>';
 
+		print '<tr><td class="titlefieldcreate">';
+		print 'ObjectID';
+		print '</td><td>';
+		print '<input type="text" class="flat minwidth300" name="WEBSITE_OBJECTID" >';
+		print '</td></tr>';
+	}
 
 	$fuser = new User($db);
 
@@ -3602,8 +3608,8 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	print '</td><td>';
 	if ($pageauthorid > 0)
 	{
-	    $fuser->fetch($pageauthorid);
-	    print $fuser->getNomUrl(1);
+		$fuser->fetch($pageauthorid);
+		print $fuser->getNomUrl(1);
 	} else {
 		print '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>';
 	}
@@ -3624,17 +3630,17 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 
 	if ($action != 'createcontainer')
 	{
-	    print '<tr><td>';
-	    print $langs->trans('UserModif');
-	    print '</td><td>';
-	    if ($pageusermodifid > 0)
-	    {
-	        $fuser->fetch($pageusermodifid);
-	        print $fuser->getNomUrl(1);
-	    }
-	    print '</td></tr>';
+		print '<tr><td>';
+		print $langs->trans('UserModif');
+		print '</td><td>';
+		if ($pageusermodifid > 0)
+		{
+			$fuser->fetch($pageusermodifid);
+			print $fuser->getNomUrl(1);
+		}
+		print '</td></tr>';
 
-	    print '<tr><td>';
+		print '<tr><td>';
 		print $langs->trans('DateModification');
 		print '</td><td>';
 		print dol_print_date($pagedatemodification, 'dayhour', 'tzuser');
@@ -3657,7 +3663,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 		print '<div class="center tablecheckboxcreatemanually'.$hiddenmanuallyafterload.'">';
 
 		print '<input class="button" type="submit" name="addcontainer" value="'.$langs->trans("Create").'">';
-		print '<input class="button" type="submit" name="preview" value="'.$langs->trans("Cancel").'">';
+		print '<input class="button button-cancel" type="submit" name="preview" value="'.$langs->trans("Cancel").'">';
 
 		print '</div>';
 	}
@@ -3701,7 +3707,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	}
 	//print '</div>';
 
-	//dol_fiche_end();
+	//print dol_get_fiche_end();
 
 	print '</div>';
 
@@ -4249,7 +4255,7 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
 		// Change the contenteditable to "true" or "false" when mode Edit Inline is on or off
 		if (empty($conf->global->WEBSITE_EDITINLINE))
 		{
-		    // Remove the contenteditable="true"
+			// Remove the contenteditable="true"
 			$newcontent = preg_replace('/(div|section)(\s[^\>]*)contenteditable="true"/', '\1\2', $newcontent);
 		}
 		else {
diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php
index 403128a0f8b..17f50e709b7 100644
--- a/htdocs/website/websiteaccount_card.php
+++ b/htdocs/website/websiteaccount_card.php
@@ -55,7 +55,7 @@ $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val)
 {
-    if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
+	if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
 }
 
 if (empty($action) && empty($id) && empty($ref)) $action = 'view';
@@ -139,7 +139,7 @@ if ($action == 'create')
 	print '<input type="hidden" name="action" value="add">';
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">'."\n";
 
@@ -151,12 +151,12 @@ if ($action == 'create')
 
 	print '</table>'."\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
 	print '&nbsp; ';
-	print '<input type="'.($backtopage ? "submit" : "button").'" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
+	print '<input type="'.($backtopage ? "submit" : "button").'" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
 	print '</div>';
 
 	print '</form>';
@@ -172,7 +172,7 @@ if (($id || $ref) && $action == 'edit')
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">'."\n";
 
@@ -184,10 +184,10 @@ if (($id || $ref) && $action == 'edit')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
-	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+	print ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
@@ -198,16 +198,16 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 {
 	if ($object->fk_soc > 0 && empty($socid)) $socid = $object->fk_soc;
 
-    $res = $object->fetch_optionals();
+	$res = $object->fetch_optionals();
 
 	$head = websiteaccountPrepareHead($object);
-	dol_fiche_head($head, 'card', $langs->trans("WebsiteAccount"), -1, 'websiteaccount@website');
+	print dol_get_fiche_head($head, 'card', $langs->trans("WebsiteAccount"), -1, 'websiteaccount@website');
 
 	$formconfirm = '';
 
 	// Confirmation to delete
 	if ($action == 'delete') {
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteWebsiteAccount'), $langs->trans('ConfirmDeleteWebsiteAccount'), 'confirm_delete', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteWebsiteAccount'), $langs->trans('ConfirmDeleteWebsiteAccount'), 'confirm_delete', '', 0, 1);
 	}
 
 	// Call Hook formConfirm
@@ -293,29 +293,29 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div><br>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	// Buttons for actions
 	if ($action != 'presend' && $action != 'editline') {
-    	print '<div class="tabsAction">'."\n";
-    	$parameters = array();
-    	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		print '<div class="tabsAction">'."\n";
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-    	if (empty($reshook))
-    	{
-    	    // Send
-    		if (empty($user->socid)) {
-    			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>'."\n";
-    		}
+		if (empty($reshook))
+		{
+			// Send
+			if (empty($user->socid)) {
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>'."\n";
+			}
 
-    		if ($user->rights->website->write)
-    		{
-    			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
-    		}
+			if ($user->rights->website->write)
+			{
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
+			}
 
-    		/*
+			/*
     		if ($user->rights->sellyoursaas->create)
     		{
     			if ($object->status == 1)
@@ -329,28 +329,28 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		}
     		*/
 
-    		if ($user->rights->website->delete)
-    		{
-    			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a></div>'."\n";
-    		}
-    	}
-    	print '</div>'."\n";
+			if ($user->rights->website->delete)
+			{
+				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a></div>'."\n";
+			}
+		}
+		print '</div>'."\n";
 	}
 
 
 	// Select mail models is same action as presend
 	if (GETPOST('modelselected')) {
-	    $action = 'presend';
+		$action = 'presend';
 	}
 
 	if ($action != 'presend')
 	{
-	    print '<div class="fichecenter"><div class="fichehalfleft">';
-	    print '<a name="builddoc"></a>'; // ancre
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+		print '<a name="builddoc"></a>'; // ancre
 
-	    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-	    /*
+		/*
 	    $MAXEVENT = 10;
 
 	    // List of actions on element
@@ -359,7 +359,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	    $somethingshown = $formactions->showactions($object, 'websiteaccount', $socid, 1, '', $MAXEVENT);
 	    */
 
-	    print '</div></div></div>';
+		print '</div></div></div>';
 	}
 
 	// Presend form
diff --git a/htdocs/zapier/admin/about.php b/htdocs/zapier/admin/about.php
index 31d54c35893..e67ba8861a2 100644
--- a/htdocs/zapier/admin/about.php
+++ b/htdocs/zapier/admin/about.php
@@ -64,13 +64,13 @@ print load_fiche_titre($langs->trans($page_name), $linkback, 'object_zapier@zapi
 
 // Configuration header
 $head = zapierAdminPrepareHead();
-dol_fiche_head($head, 'about', '', 0, 'zapier@zapier');
+print dol_get_fiche_head($head, 'about', '', 0, 'zapier@zapier');
 
 dol_include_once('/zapier/core/modules/modZapier.class.php');
 $tmpmodule = new modZapier($db);
 print $tmpmodule->getDescLong();
 
 // Page end
-dol_fiche_end();
+print dol_get_fiche_end();
 llxFooter();
 $db->close();
diff --git a/htdocs/zapier/admin/setup.php b/htdocs/zapier/admin/setup.php
index 7077551749e..0d10ac95231 100644
--- a/htdocs/zapier/admin/setup.php
+++ b/htdocs/zapier/admin/setup.php
@@ -40,8 +40,8 @@ $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 $arrayofparameters = array(
-    'ZAPIERFORDOLIBARR_MYPARAM1'=>array('css'=>'minwidth200', 'enabled'=>1),
-    'ZAPIERFORDOLIBARR_MYPARAM2'=>array('css'=>'minwidth500', 'enabled'=>1)
+	'ZAPIERFORDOLIBARR_MYPARAM1'=>array('css'=>'minwidth200', 'enabled'=>1),
+	'ZAPIERFORDOLIBARR_MYPARAM2'=>array('css'=>'minwidth500', 'enabled'=>1)
 );
 
 
@@ -49,7 +49,7 @@ $arrayofparameters = array(
  * Actions
  */
 if ((float) DOL_VERSION >= 6) {
-    include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 }
 
 
@@ -67,57 +67,57 @@ print load_fiche_titre($langs->trans($page_name), $linkback, 'object_zapier@zapi
 
 // Configuration header
 $head = zapierAdminPrepareHead();
-dol_fiche_head($head, 'settings', '', -1, "zapier@zapier");
+print dol_get_fiche_head($head, 'settings', '', -1, "zapier@zapier");
 
 // Setup page goes here
 echo $langs->trans("ZapierSetupPage").'<br><br>';
 
 
 if ($action == 'edit') {
-    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="update">';
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="update">';
 
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-    foreach ($arrayofparameters as $key => $val) {
-        print '<tr class="oddeven"><td>';
-        print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
-        print '</td><td><input name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->$key.'"></td></tr>';
-    }
-    print '</table>';
+	foreach ($arrayofparameters as $key => $val) {
+		print '<tr class="oddeven"><td>';
+		print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
+		print '</td><td><input name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->$key.'"></td></tr>';
+	}
+	print '</table>';
 
-    print '<br><div class="center">';
-    print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
-    print '</div>';
+	print '<br><div class="center">';
+	print '<input class="button button-save" type="submit" value="'.$langs->trans("Save").'">';
+	print '</div>';
 
-    print '</form>';
-    print '<br>';
+	print '</form>';
+	print '<br>';
 } else {
-    if (!empty($arrayofparameters)) {
-        print '<table class="noborder centpercent">';
-        print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	if (!empty($arrayofparameters)) {
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-        foreach ($arrayofparameters as $key => $val) {
-            print '<tr class="oddeven"><td>';
-            print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
-            print '</td><td>'.$conf->global->$key.'</td></tr>';
-        }
+		foreach ($arrayofparameters as $key => $val) {
+			print '<tr class="oddeven"><td>';
+			print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
+			print '</td><td>'.$conf->global->$key.'</td></tr>';
+		}
 
-        print '</table>';
+		print '</table>';
 
-        print '<div class="tabsAction">';
-        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
-        print '</div>';
-    } else {
-        print '<br>'.$langs->trans("NothingToSetup");
-    }
+		print '<div class="tabsAction">';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
+		print '</div>';
+	} else {
+		print '<br>'.$langs->trans("NothingToSetup");
+	}
 }
 
 
 // Page end
-dol_fiche_end();
+print dol_get_fiche_end();
 
 llxFooter();
 $db->close();
diff --git a/htdocs/zapier/class/api_zapier.class.php b/htdocs/zapier/class/api_zapier.class.php
index 9fbaf56c303..945a6a69a8f 100644
--- a/htdocs/zapier/class/api_zapier.class.php
+++ b/htdocs/zapier/class/api_zapier.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2020  Frédéric 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
@@ -18,9 +18,7 @@
 
 use Luracast\Restler\RestException;
 
-dol_include_once('/zapier/class/hook.class.php');
-
-
+require_once DOL_DOCUMENT_ROOT.'/zapier/class/hook.class.php';
 
 /**
  * \file    htdocs/zapier/class/api_zapier.class.php
@@ -36,243 +34,242 @@ dol_include_once('/zapier/class/hook.class.php');
  */
 class ZapierApi extends DolibarrApi
 {
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'url',
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'url',
+	);
 
 
-    /**
-     * @var Hook $hook {@type Hook}
-     */
-    public $hook;
+	/**
+	 * @var Hook $hook {@type Hook}
+	 */
+	public $hook;
 
-    /**
-     * Constructor
-     *
-     * @url     GET /
-     *
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-        $this->hook = new Hook($this->db);
-    }
+	/**
+	 * Constructor
+	 *
+	 * @url     GET /
+	 *
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->hook = new Hook($this->db);
+	}
 
-    /**
-     * Get properties of a hook object
-     *
-     * Return an array with hook informations
-     *
-     * @param   int             $id ID of hook
-     * @return  array|mixed     data without useless information
-     *
-     * @url GET /hooks/{id}
-     * @throws  RestException
-     */
-    public function get($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->zapier->read) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a hook object
+	 *
+	 * Return an array with hook informations
+	 *
+	 * @param   int             $id ID of hook
+	 * @return  array|mixed     data without useless information
+	 *
+	 * @url GET /hooks/{id}
+	 * @throws  RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->zapier->read) {
+			throw new RestException(401);
+		}
 
-        $result = $this->hook->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Hook not found');
-        }
+		$result = $this->hook->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Hook not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('hook', $this->hook->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('hook', $this->hook->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        return $this->_cleanObjectDatas($this->hook);
-    }
+		return $this->_cleanObjectDatas($this->hook);
+	}
 
+	/**
+	 * Get list of possibles choices for module
+	 *
+	 * Return an array with hook informations
+	 *
+	 * @return  array     data
+	 *
+	 * @url GET /getmoduleschoices/
+	 * @throws  RestException
+	 */
+	public function getModulesChoices()
+	{
+		if (!DolibarrApiAccess::$user->rights->zapier->read) {
+			throw new RestException(401);
+		}
+		$arraychoices = array(
+			'invoices' => 'Invoices',
+			'orders' => 'Orders',
+			'thirdparties' => 'Thirparties',
+			'contacts' => 'Contacts',
+			'users' => 'Users',
+		);
+		// $result = $this->hook->fetch($id);
+		// if (! $result ) {
+		//     throw new RestException(404, 'Hook not found');
+		// }
 
-    /**
-     * Get list of possibles choices for module
-     *
-     * Return an array with hook informations
-     * @param integer $id ID
-     *
-     * @return  array|mixed     data
-     *
-     * @url GET /getmoduleschoices/
-     * @throws  RestException
-     */
-    public function getModulesChoices($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->zapier->read) {
-            throw new RestException(401);
-        }
-        $arraychoices = array(
-            'invoices' => 'Invoices',
-            'orders' => 'Orders',
-            'thirdparties' => 'Thirparties',
-            'contacts' => 'Contacts',
-        );
-        // $result = $this->hook->fetch($id);
-        // if (! $result ) {
-        //     throw new RestException(404, 'Hook not found');
-        // }
+		// if (! DolibarrApi::_checkAccessToResource('hook', $this->hook->id)) {
+		//     throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		// }
 
-        // if (! DolibarrApi::_checkAccessToResource('hook', $this->hook->id)) {
-        //     throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        // }
+		return $arraychoices;
+	}
 
-        return $arraychoices;
-    }
+	/**
+	 * List hooks
+	 *
+	 * Get a list of hooks
+	 *
+	 * @param string           $sortfield           Sort field
+	 * @param string           $sortorder           Sort order
+	 * @param int              $limit               Limit for list
+	 * @param int              $page                Page number
+	 * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+	 * @return  array                               Array of order objects
+	 *
+	 * @throws RestException
+	 *
+	 * @url GET /hooks/
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
+		$obj_ret = array();
 
-    /**
-     * List hooks
-     *
-     * Get a list of hooks
-     *
-     * @param string	       $sortfield	        Sort field
-     * @param string	       $sortorder	        Sort order
-     * @param int		       $limit		        Limit for list
-     * @param int		       $page		        Page number
-     * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-     * @return  array                               Array of order objects
-     *
-     * @throws RestException
-     *
-     * @url GET /hooks/
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
-    {
-        global $db, $conf;
+		$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : '';
 
-        $obj_ret = array();
+		// Set to 1 if there is a field socid in table of object
+		$restrictonsocid = 0;
 
-        $socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : '';
+		// If the internal user must only see his customers, force searching by him
+		$search_sale = 0;
+		if ($restrictonsocid && !DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) {
+			$search_sale = DolibarrApiAccess::$user->id;
+		}
 
-        // Set to 1 if there is a field socid in table of object
-        $restrictonsocid = 0;
+		$sql = "SELECT t.rowid";
+		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+			// We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+			$sql .= ", sc.fk_soc, sc.fk_user";
+		}
+		$sql .= " FROM ".MAIN_DB_PREFIX."hook_mytable as t";
 
-        // If the internal user must only see his customers, force searching by him
-        $search_sale = 0;
-        if ($restrictonsocid && !DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) {
-            $search_sale = DolibarrApiAccess::$user->id;
-        }
+		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		$sql .= " WHERE 1 = 1";
 
-        $sql = "SELECT t.rowid";
-        if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
-            // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-            $sql .= ", sc.fk_soc, sc.fk_user";
-        }
-        $sql .= " FROM ".MAIN_DB_PREFIX."hook_mytable as t";
+		// Example of use $mode
+		//if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
+		//if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
 
-        if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
-        $sql .= " WHERE 1 = 1";
+		$tmpobject = new Hook($this->db);
+		if ($tmpobject->ismultientitymanaged) {
+			$sql .= ' AND t.entity IN ('.getEntity('hook').')';
+		}
+		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+			$sql .= " AND t.fk_soc = sc.fk_soc";
+		}
+		if ($restrictonsocid && $socid) {
+			$sql .= " AND t.fk_soc = ".$socid;
+		}
+		if ($restrictonsocid && $search_sale > 0) {
+			// Join for the needed table to filter by sale
+			$sql .= " AND t.rowid = sc.fk_soc";
+		}
+		// Insert sale filter
+		if ($restrictonsocid && $search_sale > 0) {
+			$sql .= " AND sc.fk_user = ".$search_sale;
+		}
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        // Example of use $mode
-        //if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
-        //if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-        $tmpobject = new Hook($this->db);
-        if ($tmpobject->ismultientitymanaged) {
-            $sql .= ' AND t.entity IN ('.getEntity('hook').')';
-        }
-        if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
-            $sql .= " AND t.fk_soc = sc.fk_soc";
-        }
-        if ($restrictonsocid && $socid) {
-            $sql .= " AND t.fk_soc = ".$socid;
-        }
-        if ($restrictonsocid && $search_sale > 0) {
-            // Join for the needed table to filter by sale
-            $sql .= " AND t.rowid = sc.fk_soc";
-        }
-        // Insert sale filter
-        if ($restrictonsocid && $search_sale > 0) {
-            $sql .= " AND sc.fk_user = ".$search_sale;
-        }
-        if ($sqlfilters) {
-            if (!DolibarrApi::_checkFilters($sqlfilters)) {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
-
-        $result = $this->db->query($sql);
+		$result = $this->db->query($sql);
 		$i = 0;
-        if ($result) {
-        	$num = $this->db->num_rows($result);
-            while ($i < $num) {
-            	$obj = $this->db->fetch_object($result);
-            	$hook_static = new Hook($this->db);
-                if ($hook_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($hook_static);
-                }
-                $i++;
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieve hook list');
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No hook found');
-        }
-        return $obj_ret;
-    }
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			while ($i < $num) {
+				$obj = $this->db->fetch_object($result);
+				$hook_static = new Hook($this->db);
+				if ($hook_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($hook_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve hook list');
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No hook found');
+		}
+		return $obj_ret;
+	}
 
-    /**
-     * Create hook object
-     *
-     * @param array $request_data   Request datas
-     * @return int  ID of hook
-     *
-     * @url	POST /hook/
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->zapier->write) {
-            throw new RestException(401);
-        }
-        // Check mandatory fields
-        $fields = array(
-            'url',
-        );
-        $result = $this->validate($request_data, $fields);
+	/**
+	 * Create hook object
+	 *
+	 * @param array $request_data   Request datas
+	 * @return int  ID of hook
+	 *
+	 * @url	POST /hook/
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->zapier->write) {
+			throw new RestException(401);
+		}
+		// Check mandatory fields
+		$fields = array(
+			'url',
+		);
+		dol_syslog("API Zapier create hook receive : ".print_r($request_data, true), LOG_DEBUG);
+		$result = $this->validate($request_data, $fields);
 
-        foreach ($request_data as $field => $value) {
-            $this->hook->$field = $value;
-        }
-        $this->hook->fk_user = DolibarrApiAccess::$user->id;
-        // on crée le hook dans la base
-        if (!$this->hook->create(DolibarrApiAccess::$user)) {
-            throw new RestException(500, "Error creating Hook", array_merge(array($this->hook->error), $this->hook->errors));
-        }
-        return array(
-            'id' => $this->hook->id,
-        );
-    }
+		foreach ($request_data as $field => $value) {
+			$this->hook->$field = $value;
+		}
+		$this->hook->fk_user = DolibarrApiAccess::$user->id;
+		// on crée le hook dans la base
+		if (!$this->hook->create(DolibarrApiAccess::$user)) {
+			throw new RestException(500, "Error creating Hook", array_merge(array($this->hook->error), $this->hook->errors));
+		}
+		return array(
+			'id' => $this->hook->id,
+		);
+	}
 
-    // /**
-    //  * Update hook
-    //  *
-    //  * @param int   $id             Id of hook to update
-    //  * @param array $request_data   Datas
-    //  * @return int
-    //  *
-    //  * @url	PUT /hooks/{id}
-    //  */
-    /*public function put($id, $request_data = null)
+	// /**
+	//  * Update hook
+	//  *
+	//  * @param int   $id             Id of hook to update
+	//  * @param array $request_data   Datas
+	//  * @return int
+	//  *
+	//  * @url	PUT /hooks/{id}
+	//  */
+	/*public function put($id, $request_data = null)
     {
         if (! DolibarrApiAccess::$user->rights->zapier->write) {
             throw new RestException(401);
@@ -301,80 +298,80 @@ class ZapierApi extends DolibarrApi
         }
     }*/
 
-    /**
-     * Delete hook
-     *
-     * @param   int     $id   Hook ID
-     * @return  array
-     *
-     * @url DELETE /hook/{id}
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->zapier->delete) {
-            throw new RestException(401);
-        }
-        $result = $this->hook->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Hook not found');
-        }
+	/**
+	 * Delete hook
+	 *
+	 * @param   int     $id   Hook ID
+	 * @return  array
+	 *
+	 * @url DELETE /hook/{id}
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->zapier->delete) {
+			throw new RestException(401);
+		}
+		$result = $this->hook->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Hook not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('hook', $this->hook->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('hook', $this->hook->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if (!$this->hook->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(500, 'Error when deleting Hook : '.$this->hook->error);
-        }
+		if (!$this->hook->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(500, 'Error when deleting Hook : '.$this->hook->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Hook deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Hook deleted'
+			)
+		);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return  array    Array of cleaned object properties
-     */
-    public function _cleanObjectDatas($object)
-    {
-        // phpcs:disable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	public function _cleanObjectDatas($object)
+	{
+		// phpcs:disable
+		$object = parent::_cleanObjectDatas($object);
 
-        /*unset($object->note);
+		/*unset($object->note);
         unset($object->address);
         unset($object->barcode_type);
         unset($object->barcode_type_code);
         unset($object->barcode_type_label);
         unset($object->barcode_type_coder);*/
 
-        return $object;
-    }
+		return $object;
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param   array       $data       Array of data to validate
-     * @param   array       $fields     Array of fields needed
-     * @return  array
-     *
-     * @throws  RestException
-     */
-    private function validate($data, $fields)
-    {
-        $hook = array();
-        foreach ($fields as $field) {
-            if (!isset($data[$field])) {
-                throw new RestException(400, $field." field missing");
-            }
-            $hook[$field] = $data[$field];
-        }
-        return $hook;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param   array       $data       Array of data to validate
+	 * @param   array       $fields     Array of fields needed
+	 * @return  array
+	 *
+	 * @throws  RestException
+	 */
+	private function validate($data, $fields)
+	{
+		$hook = array();
+		foreach ($fields as $field) {
+			if (!isset($data[$field])) {
+				throw new RestException(400, $field." field missing");
+			}
+			$hook[$field] = $data[$field];
+		}
+		return $hook;
+	}
 }
diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index e7ce317096d..b71c5aec1d7 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -126,7 +126,7 @@ class Hook extends CommonObject
 		),
 		'module' => array(
 			'type' => 'varchar(128)',
-			'label' => 'Url',
+			'label' => 'Module',
 			'enabled' => 1,
 			'visible' => 1,
 			'position' => 30,
@@ -137,7 +137,7 @@ class Hook extends CommonObject
 		),
 		'action' => array(
 			'type' => 'varchar(128)',
-			'label' => 'Url',
+			'label' => 'Action',
 			'enabled' => 1,
 			'visible' => 1,
 			'position' => 30,
@@ -212,9 +212,14 @@ class Hook extends CommonObject
 	public $label;
 
 	/**
-	 * @var string amount
+	 * @var string url of webhook
 	 */
-	public $amount;
+	public $url;
+
+	/**
+	 * @var int ID of user owner webhook
+	 */
+	public $fk_user;
 
 	/**
 	 * @var int Status
@@ -247,35 +252,6 @@ class Hook extends CommonObject
 	public $import_key;
 
 
-	// If this object has a subtable with lines
-
-	/**
-	 * @var int    Name of subtable line
-	 */
-	//public $table_element_line = 'hookdet';
-
-	/**
-	 * @var int    Field with ID of parent key if this field has a parent
-	 */
-	//public $fk_element = 'fk_hook';
-
-	/**
-	 * @var int    Name of subtable class that manage subtable lines
-	 */
-	//public $class_element_line = 'MyObjectline';
-
-	/**
-	 * @var array  Array of child tables (child tables to delete before deleting a record)
-	 */
-	//protected $childtables=array('hookdet');
-
-	/**
-	 * @var MyObjectLine[]     Array of subtable lines
-	 */
-	//public $lines = array();
-
-
-
 	/**
 	 * Constructor
 	 *
diff --git a/htdocs/zapier/hook_agenda.php b/htdocs/zapier/hook_agenda.php
index 89f2415ad05..6ae9d7d57aa 100644
--- a/htdocs/zapier/hook_agenda.php
+++ b/htdocs/zapier/hook_agenda.php
@@ -42,10 +42,10 @@ $cancel     = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 if (GETPOST('actioncode', 'array')) {
-    $actioncode = GETPOST('actioncode', 'array', 3);
-    if (!count($actioncode)) $actioncode = '0';
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) $actioncode = '0';
 } else {
-    $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
@@ -89,17 +89,17 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook)) {
-    // Cancel
-    if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
-        header("Location: ".$backtopage);
-        exit;
-    }
+	// Cancel
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
+		header("Location: ".$backtopage);
+		exit;
+	}
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 		$actioncode = '';
-        $search_agenda_label = '';
-    }
+		$search_agenda_label = '';
+	}
 }
 
 
@@ -122,7 +122,7 @@ if ($object->id > 0) {
 	$head = myobjectPrepareHead($object);
 
 
-	dol_fiche_head($head, 'agenda', $langs->trans("MyObject"), -1, 'myobject@mymodule');
+	print dol_get_fiche_head($head, 'agenda', $langs->trans("MyObject"), -1, 'myobject@mymodule');
 
 	// Object card
 	// ------------------------------------------------------------
@@ -173,62 +173,62 @@ if ($object->id > 0) {
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
-    $object->info($object->id);
+	$object->info($object->id);
 	dol_print_object_info($object, 1);
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 
 	// Actions buttons
 
-    $objthirdparty = $object;
-    $objcon = new stdClass();
+	$objthirdparty = $object;
+	$objcon = new stdClass();
 
-    $out = '';
-    $permok = $user->rights->agenda->myactions->create;
-    if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
-        //$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
-        if (get_class($objthirdparty) == 'Societe') $out .= '&amp;socid='.$objthirdparty->id;
-        $out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage=1&amp;percentage=-1';
-    	//$out.=$langs->trans("AddAnAction").' ';
-    	//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
-    	//$out.="</a>";
+	$out = '';
+	$permok = $user->rights->agenda->myactions->create;
+	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
+		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
+		if (get_class($objthirdparty) == 'Societe') $out .= '&amp;socid='.$objthirdparty->id;
+		$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage=1&amp;percentage=-1';
+		//$out.=$langs->trans("AddAnAction").' ';
+		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
+		//$out.="</a>";
 	}
 
 
 	print '<div class="tabsAction">';
 
-    if (!empty($conf->agenda->enabled)) {
-    	if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
-        	print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
-    	} else {
-        	print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
-    	}
-    }
+	if (!empty($conf->agenda->enabled)) {
+		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
+			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
+		} else {
+			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
+		}
+	}
 
-    print '</div>';
+	print '</div>';
 
-    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
-        $param = '&socid='.$socid;
-        if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-        if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+		$param = '&socid='.$socid;
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
 
 		print load_fiche_titre($langs->trans("ActionsOnMyObject"), '', '');
 
-        // List of all actions
+		// List of all actions
 		$filters = array();
-        $filters['search_agenda_label'] = $search_agenda_label;
+		$filters['search_agenda_label'] = $search_agenda_label;
 
-        // TODO Replace this with same code than into list.php
-        //show_actions_done($conf,$langs,$db,$object,null,0,$actioncode, '', $filters, $sortfield, $sortorder);
-    }
+		// TODO Replace this with same code than into list.php
+		//show_actions_done($conf,$langs,$db,$object,null,0,$actioncode, '', $filters, $sortfield, $sortorder);
+	}
 }
 
 // End of page
diff --git a/htdocs/zapier/hook_card.php b/htdocs/zapier/hook_card.php
index 721b40ebfd9..43706c0c533 100644
--- a/htdocs/zapier/hook_card.php
+++ b/htdocs/zapier/hook_card.php
@@ -82,31 +82,25 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook)) {
-    $error = 0;
+	$error = 0;
 
-    $permissiontoadd = $user->rights->mymodule->write;
-    $permissiontodelete = $user->rights->mymodule->delete || ($permissiontoadd && $object->status == 0);
-    $backurlforlist = dol_buildpath('/mymodule/myobject_list.php', 1);
-    if (empty($backtopage)) {
-        if (empty($id)) $backtopage = $backurlforlist;
-        else $backtopage = dol_buildpath('/mymodule/myobject_card.php', 1).($id > 0 ? $id : '__ID__');
-    }
-    $triggermodname = 'MYMODULE_MYOBJECT_MODIFY'; // Name of trigger action code to execute when we modify record
+	$permissiontoadd = $user->rights->mymodule->write;
+	$permissiontodelete = $user->rights->mymodule->delete || ($permissiontoadd && $object->status == 0);
+	$backurlforlist = dol_buildpath('/mymodule/myobject_list.php', 1);
+	if (empty($backtopage)) {
+		if (empty($id)) $backtopage = $backurlforlist;
+		else $backtopage = dol_buildpath('/mymodule/myobject_card.php', 1).($id > 0 ? $id : '__ID__');
+	}
+	$triggermodname = 'MYMODULE_MYOBJECT_MODIFY'; // Name of trigger action code to execute when we modify record
 
-    // Actions cancel, add, update, delete or clone
-    include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+	// Actions cancel, add, update, delete or clone
+	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
 
-    // Actions when linking object each other
-    include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
+	// Actions when linking object each other
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
 
-    // Actions when printing a doc from card
-    include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
-
-    // Actions to send emails
-    $triggersendname = 'MYOBJECT_SENTBYMAIL';
-    $autocopy = 'MAIN_MAIL_AUTOCOPY_MYOBJECT_TO';
-    $trackid = 'myobject'.$object->id;
-    include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+	// Actions when printing a doc from card
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 }
 
 
@@ -148,7 +142,7 @@ if ($action == 'create') {
 	print '<input type="hidden" name="action" value="add">';
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
-	dol_fiche_head(array(), '');
+	print dol_get_fiche_head(array(), '');
 
 	print '<table class="border centpercent">'."\n";
 
@@ -160,12 +154,12 @@ if ($action == 'create') {
 
 	print '</table>'."\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
 	print '&nbsp; ';
-	print '<input type="'.($backtopage ? "submit" : "button").'" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
+	print '<input type="'.($backtopage ? "submit" : "button").'" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
 	print '</div>';
 
 	print '</form>';
@@ -176,12 +170,12 @@ if (($id || $ref) && $action == 'edit') {
 	print load_fiche_titre($langs->trans("MyObject"));
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">'."\n";
 
@@ -193,10 +187,10 @@ if (($id || $ref) && $action == 'edit') {
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
-	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+	print ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
@@ -204,16 +198,16 @@ if (($id || $ref) && $action == 'edit') {
 
 // Part to show record
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
-    $res = $object->fetch_optionals();
+	$res = $object->fetch_optionals();
 
 	$head = myobjectPrepareHead($object);
-	dol_fiche_head($head, 'card', $langs->trans("MyObject"), -1, 'myobject@mymodule');
+	print dol_get_fiche_head($head, 'card', $langs->trans("MyObject"), -1, 'myobject@mymodule');
 
 	$formconfirm = '';
 
 	// Confirmation to delete
 	if ($action == 'delete') {
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMyObject'), $langs->trans('ConfirmDeleteMyObject'), 'confirm_delete', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMyObject'), $langs->trans('ConfirmDeleteMyObject'), 'confirm_delete', '', 0, 1);
 	}
 
 	// Clone confirmation
@@ -226,7 +220,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Confirmation of action xxxx
 	if ($action == 'xxx') {
 		$formquestion = array();
-	    /*
+		/*
 		$forcecombo=0;
 		if ($conf->browser->name == 'ie') $forcecombo = 1;	// There is a bug in IE10 that make combo inside popup crazy
 	    $formquestion = array(
@@ -236,7 +230,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	        // array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
         );
 	    */
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
 	}
 
 	// Call Hook formConfirm
@@ -315,30 +309,30 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div><br>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	// Buttons for actions
 	if ($action != 'presend' && $action != 'editline') {
-    	print '<div class="tabsAction">'."\n";
-    	$parameters = array();
-    	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		print '<div class="tabsAction">'."\n";
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-    	if (empty($reshook)) {
-            // Modify
-    		if ($user->rights->mymodule->write) {
-    			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
-    		} else {
-    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
-    		}
+		if (empty($reshook)) {
+			// Modify
+			if ($user->rights->mymodule->write) {
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
+			} else {
+				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
+			}
 
-    		// Clone
-    		if ($user->rights->mymodule->write) {
-    			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object=order">'.$langs->trans("ToClone").'</a></div>';
-    		}
+			// Clone
+			if ($user->rights->mymodule->write) {
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object=order">'.$langs->trans("ToClone").'</a></div>';
+			}
 
-    		/*
+			/*
     		if ($user->rights->mymodule->write)
     		{
     			if ($object->status == 1)
@@ -352,13 +346,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		}
     		*/
 
-    		if ($user->rights->mymodule->delete) {
-    			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
-    		} else {
-    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
-    		}
-    	}
-    	print '</div>'."\n";
+			if ($user->rights->mymodule->delete) {
+				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
+			} else {
+				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
+			}
+		}
+		print '</div>'."\n";
 	}
 
 
@@ -368,42 +362,29 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	}
 
 	if ($action != 'presend') {
-	    print '<div class="fichecenter"><div class="fichehalfleft">';
-	    print '<a name="builddoc"></a>'; // ancre
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+		print '<a name="builddoc"></a>'; // ancre
 
-	    // Show links to link elements
-	    $linktoelem = $form->showLinkToObjectBlock($object, null, array('myobject'));
-	    $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+		// Show links to link elements
+		$linktoelem = $form->showLinkToObjectBlock($object, null, array('myobject'));
+		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 
-	    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-	    $MAXEVENT = 10;
+		$MAXEVENT = 10;
 
-	    $morehtmlright = '<a href="'.dol_buildpath('/mymodule/myobject_info.php', 1).'?id='.$object->id.'">';
-	    $morehtmlright .= $langs->trans("SeeAll");
-	    $morehtmlright .= '</a>';
+		$morehtmlright = '<a href="'.dol_buildpath('/mymodule/myobject_info.php', 1).'?id='.$object->id.'">';
+		$morehtmlright .= $langs->trans("SeeAll");
+		$morehtmlright .= '</a>';
 
-	    // List of actions on element
-	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-	    $formactions = new FormActions($db);
-	    $somethingshown = $formactions->showactions($object, 'myobject', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
+		// List of actions on element
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+		$formactions = new FormActions($db);
+		$somethingshown = $formactions->showactions($object, 'myobject', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
 
-	    print '</div></div></div>';
+		print '</div></div></div>';
 	}
-
-	//Select mail models is same action as presend
-	/*
-	 if (GETPOST('modelselected')) $action = 'presend';
-
-	 // Presend form
-	 $modelmail='inventory';
-	 $defaulttopic='InformationMessage';
-	 $diroutput = $conf->product->dir_output.'/inventory';
-	 $trackid = 'stockinv'.$object->id;
-
-	 include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
-	 */
 }
 
 // End of page
diff --git a/htdocs/zapier/hook_document.php b/htdocs/zapier/hook_document.php
index 9b43ded60c8..15ec591bea6 100644
--- a/htdocs/zapier/hook_document.php
+++ b/htdocs/zapier/hook_document.php
@@ -98,7 +98,7 @@ if ($object->id) {
 	 */
 	$head = myobjectPrepareHead($object);
 
-	dol_fiche_head($head, 'document', $langs->trans("MyObject"), -1, 'myobject@mymodule');
+	print dol_get_fiche_head($head, 'document', $langs->trans("MyObject"), -1, 'myobject@mymodule');
 
 
 	// Build file list
@@ -114,9 +114,9 @@ if ($object->id) {
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">';
 
 	// Number of files
@@ -129,7 +129,7 @@ if ($object->id) {
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 } else {
 	accessforbidden('', 0, 0);
 }
diff --git a/htdocs/zapier/hook_list.php b/htdocs/zapier/hook_list.php
index d36d909b399..59432aea44b 100644
--- a/htdocs/zapier/hook_list.php
+++ b/htdocs/zapier/hook_list.php
@@ -28,10 +28,10 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once __DIR__.'/class/hook.class.php';
+require_once DOL_DOCUMENT_ROOT.'/zapier/class/hook.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("mymodule@mymodule", "other"));
+$langs->loadLangs(array("zapier", "other"));
 
 // The action 'add', 'create', 'edit', 'update', 'view', ...
 $action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';
@@ -51,10 +51,10 @@ $id = GETPOST('id', 'int');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : (int) GETPOST("page", 'int');
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
-    // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
-    $page = 0;
+	// If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
+	$page = 0;
 }
 $offset = $limit * $page;
 $pageprev = $page - 1;
@@ -65,9 +65,9 @@ $pagenext = $page + 1;
 // Initialize technical objects
 $object = new Hook($db);
 $extrafields = new ExtraFields($db);
-$diroutputmassaction = $conf->mymodule->dir_output.'/temp/massgeneration/'.$user->id;
+$diroutputmassaction = $conf->zapier->dir_output.'/temp/massgeneration/'.$user->id;
 // Note that conf->hooks_modules contains array
-$hookmanager->initHooks(array('hooklist'));
+$hookmanager->initHooks(array('zapierhooklist'));
 
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -76,47 +76,47 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // Default sort order (if not yet defined by previous GETPOST)
 if (!$sortfield) {
-    // Set here default search field. By default 1st field in definition.
-    $sortfield = "t.".key($object->fields);
+	// Set here default search field. By default 1st field in definition.
+	$sortfield = "t.".key($object->fields);
 }
 if (!$sortorder) {
-    $sortorder = "ASC";
+	$sortorder = "ASC";
 }
 
 // Security check
 $socid = 0;
 if ($user->socid > 0) {
-    // Protection if external user
-    //$socid = $user->socid;
-    accessforbidden();
+	// Protection if external user
+	//$socid = $user->socid;
+	accessforbidden();
 }
-//$result = restrictedArea($user, 'mymodule', $id, '');
+//$result = restrictedArea($user, 'zapier', $id, '');
 
 // Initialize array of search criterias
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
-    if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
+	if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
 }
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach ($object->fields as $key => $val) {
-    if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
+	if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
 }
 
 // Definition of fields for list
 $arrayfields = array();
 foreach ($object->fields as $key => $val) {
-    // If $val['visible']==0, then we never show the field
-    if (!empty($val['visible'])) $arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
+	// If $val['visible']==0, then we never show the field
+	if (!empty($val['visible'])) $arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
 }
 // Extra fields
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
-    foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-        if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-            $arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-    }
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
+			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
+	}
 }
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
@@ -128,11 +128,11 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
  */
 
 if (GETPOST('cancel', 'alpha')) {
-    $action = 'list';
-    $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
-    $massaction = '';
+	$massaction = '';
 }
 
 $parameters = array();
@@ -140,30 +140,30 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook)) {
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
-        // All tests are required to be compatible with all browsers
-        foreach ($object->fields as $key => $val) {
-            $search[$key] = '';
-        }
-        $toselect = '';
-        $search_array_options = array();
-    }
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
-        || GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
-        $massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+		// All tests are required to be compatible with all browsers
+		foreach ($object->fields as $key => $val) {
+			$search[$key] = '';
+		}
+		$toselect = '';
+		$search_array_options = array();
+	}
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+	}
 
-    // Mass actions
-    $objectclass = 'Hook';
-    $objectlabel = 'Hook';
-    $permissiontoread = $user->rights->mymodule->read;
-    $permissiontodelete = $user->rights->mymodule->delete;
-    $uploaddir = $conf->mymodule->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+	// Mass actions
+	$objectclass = 'Hook';
+	$objectlabel = 'Hook';
+	$permissiontoread = $user->rights->zapier->read;
+	$permissiontodelete = $user->rights->zapier->delete;
+	$uploaddir = $conf->zapier->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 
@@ -185,13 +185,13 @@ $title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("Hooks"));
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
 foreach ($object->fields as $key => $val) {
-    $sql .= 't.'.$key.', ';
+	$sql .= 't.'.$key.', ';
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
-    foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-        $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
-    }
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+	}
 }
 // Add fields from hooks
 $parameters = array();
@@ -201,21 +201,21 @@ $sql = preg_replace('/, $/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 if ($object->ismultientitymanaged == 1) {
-    $sql .= " WHERE t.entity IN (".getEntity($object->element).")";
+	$sql .= " WHERE t.entity IN (".getEntity($object->element).")";
 } else {
-    $sql .= " WHERE 1 = 1";
+	$sql .= " WHERE 1 = 1";
 }
 foreach ($search as $key => $val) {
-    if ($key == 'status' && $search[$key] == -1) {
-        continue;
-    }
-    $mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
-    if ($search[$key] != '') {
-        $sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
-    }
+	if ($key == 'status' && $search[$key] == -1) {
+		continue;
+	}
+	$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
+	if ($search[$key] != '') {
+		$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+	}
 }
 if ($search_all) {
-    $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -245,35 +245,35 @@ $sql .= $db->order($sortfield, $sortorder);
 // Count total nb of records
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-    $resql = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($resql);
-    if (($page * $limit) > $nbtotalofrecords) {
-        // if total of record found is smaller than page * limit, goto and load page 0
-        $page = 0;
-        $offset = 0;
-    }
+	$resql = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($resql);
+	if (($page * $limit) > $nbtotalofrecords) {
+		// if total of record found is smaller than page * limit, goto and load page 0
+		$page = 0;
+		$offset = 0;
+	}
 }
 // if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords) {
-    $num = $nbtotalofrecords;
+	$num = $nbtotalofrecords;
 } else {
-    $sql .= $db->plimit($limit + 1, $offset);
+	$sql .= $db->plimit($limit + 1, $offset);
 
-    $resql = $db->query($sql);
-    if (!$resql) {
-        dol_print_error($db);
-        exit;
-    }
+	$resql = $db->query($sql);
+	if (!$resql) {
+		dol_print_error($db);
+		exit;
+	}
 
-    $num = $db->num_rows($resql);
+	$num = $db->num_rows($resql);
 }
 
 // Direct jump if only one record found
 if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all) {
-    $obj = $db->fetch_object($resql);
-    $id = $obj->rowid;
-    header("Location: ".dol_buildpath('/zapierfordolibarr/hook_card.php', 1).'?id='.$id);
-    exit;
+	$obj = $db->fetch_object($resql);
+	$id = $obj->rowid;
+	header("Location: ".dol_buildpath('/zapierfordolibarr/hook_card.php', 1).'?id='.$id);
+	exit;
 }
 
 
@@ -283,19 +283,19 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 llxHeader('', $title, $help_url);
 
 // Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-    function init_myfunc()
-    {
-        jQuery("#myid").removeAttr(\'disabled\');
-        jQuery("#myid").attr(\'disabled\',\'disabled\');
-    }
-    init_myfunc();
-    jQuery("#mybutton").click(function() {
-        init_myfunc();
-    });
-});
-</script>';
+// print '<script type="text/javascript" language="javascript">
+// jQuery(document).ready(function() {
+//     function init_myfunc()
+//     {
+//         jQuery("#myid").removeAttr(\'disabled\');
+//         jQuery("#myid").attr(\'disabled\',\'disabled\');
+//     }
+//     init_myfunc();
+//     jQuery("#mybutton").click(function() {
+//         init_myfunc();
+//     });
+// });
+// </script>';
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
@@ -303,13 +303,13 @@ $param = '';
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
 if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 foreach ($search as $key => $val) {
-    if (is_array($search[$key]) && count($search[$key])) {
-        foreach ($search[$key] as $skey) {
-            $param .= '&search_'.$key.'[]='.urlencode($skey);
-        }
-    } else {
-        $param .= '&search_'.$key.'='.urlencode($search[$key]);
-    }
+	if (is_array($search[$key]) && count($search[$key])) {
+		foreach ($search[$key] as $skey) {
+			$param .= '&search_'.$key.'[]='.urlencode($skey);
+		}
+	} else {
+		$param .= '&search_'.$key.'='.urlencode($search[$key]);
+	}
 }
 if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
@@ -317,10 +317,10 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 // List of mass actions available
 $arrayofmassactions = array(
-    //'presend'=>$langs->trans("SendByMail"),
-    //'builddoc'=>$langs->trans("PDFMerge"),
+	//'presend'=>$langs->trans("SendByMail"),
+	//'builddoc'=>$langs->trans("PDFMerge"),
 );
-if ($user->rights->mymodule->delete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+if ($user->rights->zapier->delete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
@@ -335,11 +335,11 @@ print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $newcardbutton = '';
-//if ($user->rights->mymodule->creer)
+//if ($user->rights->zapier->creer)
 //{
-    $newcardbutton = '<a class="butActionNew" href="hook_card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']).'"><span class="valignmiddle text-plus-circle">'.$langs->trans('New').'</span>';
-    $newcardbutton .= '<span class="fa fa-plus-circle valignmiddle"></span>';
-    $newcardbutton .= '</a>';
+	$newcardbutton = '<a class="butActionNew" href="hook_card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']).'"><span class="valignmiddle text-plus-circle">'.$langs->trans('New').'</span>';
+	$newcardbutton .= '<span class="fa fa-plus-circle valignmiddle"></span>';
+	$newcardbutton .= '</a>';
 //}
 //else
 //{
@@ -354,12 +354,12 @@ print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sort
 $topicmail = "SendHookRef";
 $modelmail = "hook";
 $objecttmp = new Hook($db);
-$trackid = 'xxxx'.$object->id;
+$trackid = 'zapier'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($sall) {
-    foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
-    print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 }
 
 $moreforfilter = '';
@@ -373,9 +373,9 @@ if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 else $moreforfilter = $hookmanager->resPrint;
 
 if (!empty($moreforfilter)) {
-    print '<div class="liste_titre liste_titre_bydiv centpercent">';
-    print $moreforfilter;
-    print '</div>';
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+	print '</div>';
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
@@ -390,22 +390,22 @@ print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" :
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 foreach ($object->fields as $key => $val) {
-    $cssforfield = '';
-    if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
-        $cssforfield .= ($cssforfield ? ' ' : '').'center';
-    }
-    if (in_array($val['type'], array('timestamp'))) {
-        $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-    }
-    if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real'))) {
-        $cssforfield .= ($cssforfield ? ' ' : '').'right';
-    }
-    if ($key == 'status') {
-        $cssforfield .= ($cssforfield ? ' ' : '').'center';
-    }
-    if (!empty($arrayfields['t.'.$key]['checked'])) {
-        print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
-    }
+	$cssforfield = '';
+	if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	}
+	if (in_array($val['type'], array('timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+	}
+	if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'right';
+	}
+	if ($key == 'status') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	}
+	if (!empty($arrayfields['t.'.$key]['checked'])) {
+		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
+	}
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -426,25 +426,25 @@ print '</tr>'."\n";
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 foreach ($object->fields as $key => $val) {
-    $cssforfield = '';
-    if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-    if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-    if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real'))) $cssforfield .= ($cssforfield ? ' ' : '').'right';
-    if ($key == 'status') {
-        $cssforfield .= ($cssforfield ? ' ' : '').'center';
-    }
-    if (!empty($arrayfields['t.'.$key]['checked'])) {
-        print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
-    }
+	$cssforfield = '';
+	if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
+	if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+	if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real'))) $cssforfield .= ($cssforfield ? ' ' : '').'right';
+	if ($key == 'status') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	}
+	if (!empty($arrayfields['t.'.$key]['checked'])) {
+		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+	}
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
 $parameters = array(
-    'arrayfields' => $arrayfields,
-    'param' => $param,
-    'sortfield' => $sortfield,
-    'sortorder' => $sortorder,
+	'arrayfields' => $arrayfields,
+	'param' => $param,
+	'sortfield' => $sortfield,
+	'sortorder' => $sortorder,
 );
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
@@ -456,12 +456,12 @@ print '</tr>'."\n";
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
 if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
-    foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val) {
-        if (preg_match('/\$object/', $val)) {
-            // There is at least one compute field that use $object
-            $needToFetchEachLine++;
-        }
-    }
+	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val) {
+		if (preg_match('/\$object/', $val)) {
+			// There is at least one compute field that use $object
+			$needToFetchEachLine++;
+		}
+	}
 }
 
 
@@ -470,71 +470,71 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 $i = 0;
 $totalarray = array();
 while ($i < min($num, $limit)) {
-    $obj = $db->fetch_object($resql);
-    if (empty($obj)) {
-        break; // Should not happen
-    }
+	$obj = $db->fetch_object($resql);
+	if (empty($obj)) {
+		break; // Should not happen
+	}
 
-    // Store properties in $object
-    $object->id = $obj->rowid;
-    foreach ($object->fields as $key => $val) {
-        if (isset($obj->$key)) $object->$key = $obj->$key;
-    }
+	// Store properties in $object
+	$object->id = $obj->rowid;
+	foreach ($object->fields as $key => $val) {
+		if (isset($obj->$key)) $object->$key = $obj->$key;
+	}
 
-    // Show here line of result
-    print '<tr class="oddeven">';
-    foreach ($object->fields as $key => $val) {
-        $cssforfield = '';
-        if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
-            $cssforfield .= ($cssforfield ? ' ' : '').'center';
-        } elseif ($key == 'status') {
-            $cssforfield .= ($cssforfield ? ' ' : '').'center';
-        }
+	// Show here line of result
+	print '<tr class="oddeven">';
+	foreach ($object->fields as $key => $val) {
+		$cssforfield = '';
+		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+		} elseif ($key == 'status') {
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+		}
 
-        if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-        elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 
-        if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real'))) $cssforfield .= ($cssforfield ? ' ' : '').'right';
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real'))) $cssforfield .= ($cssforfield ? ' ' : '').'right';
 
-        if (!empty($arrayfields['t.'.$key]['checked'])) {
-            print '<td';
-            if ($cssforfield || $val['css']) print ' class="';
-            print $cssforfield;
-            if ($cssforfield && $val['css']) print ' ';
-            print $val['css'];
-            if ($cssforfield || $val['css']) print '"';
-            print '>';
-            if ($key == 'status') print $object->getLibStatut(5);
-            elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) print $object->showOutputField($val, $key, $db->jdate($obj->$key), '');
-            else print $object->showOutputField($val, $key, $obj->$key, '');
-            print '</td>';
-            if (!$i) $totalarray['nbfield']++;
-            if (!empty($val['isameasure'])) {
-                if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
-                $totalarray['val']['t.'.$key] += $obj->$key;
-            }
-        }
-    }
-    // Extra fields
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-    // Fields from hook
-    $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-    $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-    // Action column
-    print '<td class="nowrap center">';
-    if ($massactionbutton || $massaction) {
-        // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-        $selected = 0;
-        if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
-        print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
-    }
-    print '</td>';
-    if (!$i) $totalarray['nbfield']++;
+		if (!empty($arrayfields['t.'.$key]['checked'])) {
+			print '<td';
+			if ($cssforfield || $val['css']) print ' class="';
+			print $cssforfield;
+			if ($cssforfield && $val['css']) print ' ';
+			print $val['css'];
+			if ($cssforfield || $val['css']) print '"';
+			print '>';
+			if ($key == 'status') print $object->getLibStatut(5);
+			elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) print $object->showOutputField($val, $key, $db->jdate($obj->$key), '');
+			else print $object->showOutputField($val, $key, $obj->$key, '');
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+			if (!empty($val['isameasure'])) {
+				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+				$totalarray['val']['t.'.$key] += $obj->$key;
+			}
+		}
+	}
+	// Extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+	// Fields from hook
+	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	// Action column
+	print '<td class="nowrap center">';
+	if ($massactionbutton || $massaction) {
+		// If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+		$selected = 0;
+		if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+	}
+	print '</td>';
+	if (!$i) $totalarray['nbfield']++;
 
-    print '</tr>';
+	print '</tr>';
 
-    $i++;
+	$i++;
 }
 
 // Show total line
@@ -543,21 +543,21 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
 // If no record found
 if ($num == 0) {
-    $colspan = 1;
-    foreach ($arrayfields as $key => $val) {
-        if (!empty($val['checked'])) {
-            $colspan++;
-        }
-    }
-    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+	$colspan = 1;
+	foreach ($arrayfields as $key => $val) {
+		if (!empty($val['checked'])) {
+			$colspan++;
+		}
+	}
+	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 
 
 $db->free($resql);
 
 $parameters = array(
-    'arrayfields' => $arrayfields,
-    'sql' => $sql,
+	'arrayfields' => $arrayfields,
+	'sql' => $sql,
 );
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
@@ -568,23 +568,23 @@ print '</div>'."\n";
 print '</form>'."\n";
 
 if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
-    $hidegeneratedfilelistifempty = 1;
-    if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
-        $hidegeneratedfilelistifempty = 0;
-    }
+	$hidegeneratedfilelistifempty = 1;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+		$hidegeneratedfilelistifempty = 0;
+	}
 
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-    $formfile = new FormFile($db);
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+	$formfile = new FormFile($db);
 
-    // Show list of available documents
-    $urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-    $urlsource .= str_replace('&amp;', '&', $param);
+	// Show list of available documents
+	$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource .= str_replace('&amp;', '&', $param);
 
-    $filedir = $diroutputmassaction;
-    $genallowed = $user->rights->mymodule->read;
-    $delallowed = $user->rights->mymodule->create;
+	$filedir = $diroutputmassaction;
+	$genallowed = $user->rights->zapier->read;
+	$delallowed = $user->rights->zapier->create;
 
-    print $formfile->showdocuments('massfilesarea_mymodule', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+	print $formfile->showdocuments('massfilesarea_zapier', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }
 
 // End of page
diff --git a/htdocs/zapier/hook_note.php b/htdocs/zapier/hook_note.php
index d8a5404fd3c..da0484160a3 100644
--- a/htdocs/zapier/hook_note.php
+++ b/htdocs/zapier/hook_note.php
@@ -82,7 +82,7 @@ if ($id > 0 || !empty($ref)) {
 
 	$head = myobjectPrepareHead($object);
 
-	dol_fiche_head($head, 'note', $langs->trans("MyObject"), -1, 'myobject@mymodule');
+	print dol_get_fiche_head($head, 'note', $langs->trans("MyObject"), -1, 'myobject@mymodule');
 
 	// Object card
 	// ------------------------------------------------------------
@@ -143,7 +143,7 @@ if ($id > 0 || !empty($ref)) {
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/zapier/lib/zapier.lib.php b/htdocs/zapier/lib/zapier.lib.php
index 8fc4810599d..1e2d4f5ec64 100644
--- a/htdocs/zapier/lib/zapier.lib.php
+++ b/htdocs/zapier/lib/zapier.lib.php
@@ -28,31 +28,31 @@
  */
 function zapierAdminPrepareHead()
 {
-    global $langs, $conf;
+	global $langs, $conf;
 
-    $langs->load("zapier@zapier");
+	$langs->load("zapier@zapier");
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = dol_buildpath("/zapier/admin/setup.php", 1);
-    $head[$h][1] = $langs->trans("Settings");
-    $head[$h][2] = 'settings';
-    $h++;
-    $head[$h][0] = dol_buildpath("/zapier/admin/about.php", 1);
-    $head[$h][1] = $langs->trans("About");
-    $head[$h][2] = 'about';
-    $h++;
+	$head[$h][0] = dol_buildpath("/zapier/admin/setup.php", 1);
+	$head[$h][1] = $langs->trans("Settings");
+	$head[$h][2] = 'settings';
+	$h++;
+	$head[$h][0] = dol_buildpath("/zapier/admin/about.php", 1);
+	$head[$h][1] = $langs->trans("About");
+	$head[$h][2] = 'about';
+	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    //$this->tabs = array(
-    //	'entity:+tabname:Title:@zapier:/zapier/mypage.php?id=__ID__'
-    //); // to add new tab
-    //$this->tabs = array(
-    //	'entity:-tabname:Title:@zapier:/zapier/mypage.php?id=__ID__'
-    //); // to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'zapier');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	//$this->tabs = array(
+	//	'entity:+tabname:Title:@zapier:/zapier/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@zapier:/zapier/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'zapier');
 
-    return $head;
+	return $head;
 }
diff --git a/nightwatch.conf.js b/nightwatch.conf.js
new file mode 100644
index 00000000000..e72febea918
--- /dev/null
+++ b/nightwatch.conf.js
@@ -0,0 +1,27 @@
+const admin_username = process.env.ADMIN_USERNAME || 'admin';
+const admin_password = process.env.ADMIN_PASSWORD || 'password';
+const launch_url = process.env.LAUNCH_URL || 'http://localhost/dolibarr/htdocs/';
+module.exports = {
+	page_objects_path : './test/acceptance/pageObjects/', // jshint ignore:line
+	src_folders : ['test'],
+
+	test_settings : {
+		default : {
+			selenium_host : '127.0.0.1',
+			launchUrl : launch_url,
+			globals : {
+				backend_url : launch_url,
+				adminUsername : admin_username,
+				adminPassword : admin_password
+			},
+			desiredCapabilities : {
+				browserName : 'chrome',
+				javascriptEnabled : true,
+				chromeOptions : {
+					args : ['disable-gpu', 'window-size=1280,1024'],
+					w3c : false
+				}
+			}
+		}
+	}
+};
diff --git a/package.json b/package.json
new file mode 100644
index 00000000000..56f8ced1d4b
--- /dev/null
+++ b/package.json
@@ -0,0 +1,15 @@
+{
+  "devDependencies": {
+    "cucumber": "^6.0.5",
+    "nightwatch": "^1.4.3",
+    "nightwatch-api": "^3.0.1"
+  },
+  "scripts": {
+    "test:e2e": "node_modules/cucumber/bin/cucumber-js --require test/acceptance/index.js --require test/acceptance/setup.js --require test/acceptance/stepDefinitions -f node_modules/cucumber-pretty"
+  },
+  "dependencies": {
+    "chart.js": "^2.9.4",
+    "cucumber-pretty": "^6.0.0",
+    "node-fetch": "^2.6.1"
+  }
+}
diff --git a/phpstan.neon b/phpstan.neon
index 71b70a42218..02e47e753d7 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -41,7 +41,7 @@ parameters:
 		- %currentWorkingDirectory%/htdocs/core/modules/facture
 		- %currentWorkingDirectory%/htdocs/core/modules/fichinter
 		- %currentWorkingDirectory%/htdocs/core/modules/holiday
-		- %currentWorkingDirectory%/htdocs/core/modules/livraison
+		- %currentWorkingDirectory%/htdocs/core/modules/delivery
 		#- %currentWorkingDirectory%/htdocs/core/modules/member
 		- %currentWorkingDirectory%/htdocs/core/modules/payment
 		- %currentWorkingDirectory%/htdocs/core/modules/product
diff --git a/scripts/accountancy/export-thirdpartyaccount.php b/scripts/accountancy/export-thirdpartyaccount.php
index ba4fe922ab9..4dc22193262 100755
--- a/scripts/accountancy/export-thirdpartyaccount.php
+++ b/scripts/accountancy/export-thirdpartyaccount.php
@@ -25,6 +25,10 @@
  * \brief		Page to detect empty accounting account
  */
 
+if (!defined('NOSESSION')) define('NOSESSION', '1');
+
+$path = __DIR__.'/';
+
 require_once $path."../../htdocs/master.inc.php";
 require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
diff --git a/scripts/bank/export-bank-receipts.php b/scripts/bank/export-bank-receipts.php
index 4f2a256275a..d8c4b91550d 100755
--- a/scripts/bank/export-bank-receipts.php
+++ b/scripts/bank/export-bank-receipts.php
@@ -22,6 +22,9 @@
  * \ingroup bank
  * \brief Script file to export bank receipts into Excel files
  */
+
+if (!defined('NOSESSION')) define('NOSESSION', '1');
+
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path = __DIR__.'/';
@@ -169,7 +172,7 @@ if (!isset($num))
 	$sql .= " OR b.num_releve is null";
 $sql .= " AND b.fk_account = ba.rowid";
 $sql .= $db->order("b.num_releve, b.datev, b.datec", "ASC"); // We add date of creation to have correct order when everything is done the same day
-                                                             // print $sql;
+															 // print $sql;
 
 $resql = $db->query($sql);
 if ($resql) {
@@ -256,7 +259,7 @@ if ($resql) {
 						$invoicestatic->fetch($tmpval);
 						if ($accountelem) {
 							$accountelem .= ', ';
-                        }
+						}
 						$accountelem .= $invoicestatic->ref;
 					}
 				}
@@ -268,7 +271,7 @@ if ($resql) {
 						$invoicesupplierstatic->fetch($tmpval);
 						if ($accountelem) {
 							$accountelem .= ', ';
-                        }
+						}
 						$accountelem .= $invoicesupplierstatic->ref;
 					}
 				}
@@ -276,20 +279,20 @@ if ($resql) {
 				$paymentsocialcontributionstatic->fetch($links[$key]['url_id']);
 				if ($accountelem) {
 					$accountelem .= ', ';
-                }
+				}
 				$accountelem .= $langs->transnoentitiesnoconv("SocialContribution").' '.$paymentsocialcontributionstatic->ref;
 			} elseif ($links[$key]['type'] == 'payment_vat') {
 				$paymentvatstatic->fetch($links[$key]['url_id']);
 				if ($accountelem) {
 					$accountelem .= ', ';
-                }
+				}
 				$accountelem .= $langs->transnoentitiesnoconv("VATPayments").' '.$paymentvatstatic->ref;
 			} elseif ($links[$key]['type'] == 'banktransfert') {
 				$comment = $outputlangs->transnoentitiesnoconv("Transfer");
 				if ($objp->amount > 0) {
 					if ($comment) {
 						$comment .= ' ';
-                    }
+					}
 					$banklinestatic->fetch($links[$key]['url_id']);
 					$bankstatic->id = $banklinestatic->fk_account;
 					$bankstatic->label = $banklinestatic->bank_account_label;
@@ -303,7 +306,7 @@ if ($resql) {
 				} else {
 					if ($comment) {
 						$comment .= ' ';
-                    }
+					}
 					$bankstatic->id = $objp->bankid;
 					$bankstatic->label = $objp->bankref;
 					$comment .= ' ('.$langs->transnoentitiesnoconv("from").' ';
@@ -318,13 +321,13 @@ if ($resql) {
 			} elseif ($links[$key]['type'] == 'company') {
 				if ($thirdparty) {
 					$thirdparty .= ', ';
-                }
+				}
 				$thirdparty .= dol_trunc($links[$key]['label'], 24);
 				$newline = 0;
 			} elseif ($links[$key]['type'] == 'member') {
 				if ($thirdparty) {
 					$accountelem .= ', ';
-                }
+				}
 				$thirdparty .= $links[$key]['label'];
 				$newline = 0;
 			}
diff --git a/scripts/company/export-contacts-xls-example.php b/scripts/company/export-contacts-xls-example.php
deleted file mode 100755
index 07262b83c0e..00000000000
--- a/scripts/company/export-contacts-xls-example.php
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- * Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2009-2013 Laurent Destailleur <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- * \file scripts/company/export-contacts-xls-example.php
- * \ingroup company
- * \brief Script file to export contacts into an Excel file
- */
-$sapi_type = php_sapi_name();
-$script_file = basename(__FILE__);
-$path = __DIR__.'/';
-
-// Test if batch mode
-if (substr($sapi_type, 0, 3) == 'cgi') {
-	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
-}
-
-if (!isset($argv[1]) || !$argv[1]) {
-	print "Usage: $script_file now\n";
-	exit(-1);
-}
-$now = $argv[1];
-
-require_once $path."../../htdocs/master.inc.php";
-// require_once PHP_WRITEEXCEL_PATH."/class.writeexcel_workbook.inc.php";
-// require_once PHP_WRITEEXCEL_PATH."/class.writeexcel_worksheet.inc.php";
-
-require_once PHPEXCEL_PATH."/PHPExcel.php";
-// require_once PHPEXCEL_PATH."/PHPExcel/Writer/Excel2007.php";
-require_once PHPEXCEL_PATH."/PHPExcel/Writer/Excel5.php";
-
-// Global variables
-$version = DOL_VERSION;
-$error = 0;
-
-/*
- * Main
- */
-
-@set_time_limit(0);
-print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',', $argv));
-
-$fname = DOL_DATA_ROOT.'/export-contacts.xls';
-
-// $objPHPExcel = new writeexcel_workbook($fname);
-$objPHPExcel = new PHPExcel();
-$objPHPExcel->getProperties()->setCreator("Dolibarr script");
-$objPHPExcel->getProperties()->setLastModifiedBy("Dolibarr script");
-$objPHPExcel->getProperties()->setTitle("Test Document");
-$objPHPExcel->getProperties()->setSubject("Test Document");
-$objPHPExcel->getProperties()->setDescription("Test document, generated using PHP classes.");
-
-// $page = &$objPHPExcel->addworksheet('Export Dolibarr');
-$objPHPExcel->setActiveSheetIndex(0);
-$objPHPExcel->getActiveSheet()->setTitle('Contacts');
-
-// $page->set_column(0,4,18); // A
-
-$sql = "SELECT distinct c.lastname, c.firstname, c.email, s.nom as name";
-$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on s.rowid = c.fk_soc";
-
-$resql = $db->query($sql);
-if ($resql) {
-	$num = $db->num_rows($resql);
-
-	print "Lines ".$num."\n";
-
-	$i = 0;
-	$j = 1;
-
-	$objPHPExcel->getActiveSheet()->SetCellValue('A1', $langs->trans("Firstname"));
-	$objPHPExcel->getActiveSheet()->SetCellValue('B1', $langs->trans("Lastname"));
-	$objPHPExcel->getActiveSheet()->SetCellValue('C1', $langs->trans("Email"));
-	$objPHPExcel->getActiveSheet()->SetCellValue('D1', $langs->trans("ThirdPart"));
-
-	while ($i < $num) {
-		$obj = $db->fetch_object($resql);
-
-		$objPHPExcel->getActiveSheet()->SetCellValue('A'.($i + 2), $obj->firstname);
-		$objPHPExcel->getActiveSheet()->SetCellValue('B'.($i + 2), $obj->lastname);
-		$objPHPExcel->getActiveSheet()->SetCellValue('C'.($i + 2), $obj->email);
-		$objPHPExcel->getActiveSheet()->SetCellValue('D'.($i + 2), $obj->name);
-
-		$j++;
-		$i++;
-	}
-}
-
-// $objWriter = new PHPExcel_Writer_Excel2007($objPHPExcel);
-$objWriter = new PHPExcel_Writer_Excel5($objPHPExcel);
-$objWriter->save($fname);
-
-// $objPHPExcel->close();
-
-print 'File '.$fname.' was generated.'."\n";
-
-exit(0);
diff --git a/scripts/company/sync_contacts_dolibarr2ldap.php b/scripts/company/sync_contacts_dolibarr2ldap.php
index caaa762dea5..8e5274fb69a 100755
--- a/scripts/company/sync_contacts_dolibarr2ldap.php
+++ b/scripts/company/sync_contacts_dolibarr2ldap.php
@@ -23,6 +23,9 @@
  * \ingroup ldap company
  * \brief Script to update all contacts from Dolibarr into a LDAP database
  */
+
+if (!defined('NOSESSION')) define('NOSESSION', '1');
+
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path = __DIR__.'/';
diff --git a/scripts/contracts/email_expire_services_to_customers.php b/scripts/contracts/email_expire_services_to_customers.php
index ae449484e7b..5c98dc2913b 100755
--- a/scripts/contracts/email_expire_services_to_customers.php
+++ b/scripts/contracts/email_expire_services_to_customers.php
@@ -24,6 +24,9 @@
  * \ingroup facture
  * \brief Script to send a mail to customers with services to expire
  */
+
+if (!defined('NOSESSION')) define('NOSESSION', '1');
+
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path = __DIR__.'/';
diff --git a/scripts/contracts/email_expire_services_to_representatives.php b/scripts/contracts/email_expire_services_to_representatives.php
index 06cb67c99e9..eec151376ee 100755
--- a/scripts/contracts/email_expire_services_to_representatives.php
+++ b/scripts/contracts/email_expire_services_to_representatives.php
@@ -24,6 +24,9 @@
  * \ingroup contracts
  * \brief Script to send a mail to dolibarr users linked to companies with services to expire
  */
+
+if (!defined('NOSESSION')) define('NOSESSION', '1');
+
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path = __DIR__.'/';
diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php
index 9058577aa21..ecec277995d 100755
--- a/scripts/cron/cron_run_jobs.php
+++ b/scripts/cron/cron_run_jobs.php
@@ -30,7 +30,7 @@ if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
 if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
 if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
 if (!defined('NOLOGIN'))        define('NOLOGIN', '1');
-
+if (!defined('NOSESSION'))      define('NOSESSION', '1');
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
@@ -165,7 +165,7 @@ $nbofjobslaunchedok = 0;
 $nbofjobslaunchedko = 0;
 
 if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0)) {
-    $savconf = dol_clone($conf);
+	$savconf = dol_clone($conf);
 
 	// Loop over job
 	foreach ($qualifiedjobs as $line) {
@@ -178,34 +178,34 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0)) {
 			dol_syslog("cron_run_jobs.php we work on another entity conf than ".$conf->entity." so we reload mysoc, langs, user and conf", LOG_DEBUG);
 			echo " -> we change entity so we reload mysoc, langs, user and conf";
 
-		    $conf->entity = (empty($line->entity) ? 1 : $line->entity);
-		    $conf->setValues($db); // This make also the $mc->setValues($conf); that reload $mc->sharings
-		    $mysoc->setMysoc($conf);
+			$conf->entity = (empty($line->entity) ? 1 : $line->entity);
+			$conf->setValues($db); // This make also the $mc->setValues($conf); that reload $mc->sharings
+			$mysoc->setMysoc($conf);
 
-		    // Force recheck that user is ok for the entity to process and reload permission for entity
-		    if ($conf->entity != $user->entity && $user->entity != 0)
-		    {
-    		    $result = $user->fetch('', $userlogin, '', 0, $conf->entity);
-    		    if ($result < 0)
-    		    {
-    		        echo "\nUser Error: ".$user->error."\n";
-    		        dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
-    		        exit(-1);
-    		    } else {
-    		        if ($result == 0)
-    		        {
-    		            echo "\nUser login: ".$userlogin." does not exists for entity ".$conf->entity."\n";
-    		            dol_syslog("User login:".$userlogin." does not exists", LOG_ERR);
-    		            exit(-1);
-    		        }
-    		    }
-    		    $user->getrights();
-		    }
+			// Force recheck that user is ok for the entity to process and reload permission for entity
+			if ($conf->entity != $user->entity && $user->entity != 0)
+			{
+				$result = $user->fetch('', $userlogin, '', 0, $conf->entity);
+				if ($result < 0)
+				{
+					echo "\nUser Error: ".$user->error."\n";
+					dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
+					exit(-1);
+				} else {
+					if ($result == 0)
+					{
+						echo "\nUser login: ".$userlogin." does not exists for entity ".$conf->entity."\n";
+						dol_syslog("User login:".$userlogin." does not exists", LOG_ERR);
+						exit(-1);
+					}
+				}
+				$user->getrights();
+			}
 
-		    // Reload langs
-		    $langcode = (empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT);
-		    if (! empty($user->conf->MAIN_LANG_DEFAULT)) $langcode = $user->conf->MAIN_LANG_DEFAULT;
-		    if ($langs->getDefaultLang() != $langcode) $langs->setDefaultLang($langcode);
+			// Reload langs
+			$langcode = (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT);
+			if (!empty($user->conf->MAIN_LANG_DEFAULT)) $langcode = $user->conf->MAIN_LANG_DEFAULT;
+			if ($langs->getDefaultLang() != $langcode) $langs->setDefaultLang($langcode);
 		}
 
 		//If date_next_jobs is less of current date, execute the program, and store the execution time of the next execution in database
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index 7cde66db687..fab2452c2b8 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -21,10 +21,13 @@
  */
 
 /**
- * \file scripts/emailings/mailing-send.php
+ * \file 	scripts/emailings/mailing-send.php
  * \ingroup mailing
- * \brief Script d'envoi d'un mailing prepare et valide
+ * \brief 	Script to send a prepared and validated emaling from command line
  */
+
+if (!defined('NOSESSION')) define('NOSESSION', '1');
+
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path = __DIR__.'/';
@@ -36,14 +39,20 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 if (!isset($argv[1]) || !$argv[1]) {
-	print "Usage: ".$script_file." (ID_MAILING|all)\n";
+	print "Usage: ".$script_file." (ID_MAILING|all) [userloginforsignature] [maxnbofemails]\n";
 	exit(-1);
 }
+
 $id = $argv[1];
-if (isset($argv[2]) || !empty($argv[2]))
-	$login = $argv[2];
+
+if (isset($argv[2]) || !empty($argv[2])) $login = $argv[2];
 else $login = '';
 
+$max = 0;
+
+if (isset($argv[3]) || !empty($argv[3])) $max = $argv[3];
+
+
 require_once $path."../../htdocs/master.inc.php";
 require_once DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php";
 require_once DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php";
@@ -52,6 +61,12 @@ require_once DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php";
 $version = DOL_VERSION;
 $error = 0;
 
+if (empty($conf->global->MAILING_LIMIT_SENDBYCLI))
+{
+	$conf->global->MAILING_LIMIT_SENDBYCLI = 0;
+}
+
+
 /*
  * Main
  */
@@ -110,9 +125,13 @@ if ($resql) {
 			// ou envoyes en erreur (statut=-1)
 			$sql2 = "SELECT mc.rowid, mc.fk_mailing, mc.lastname, mc.firstname, mc.email, mc.other, mc.source_url, mc.source_id, mc.source_type, mc.tag";
 			$sql2 .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
-			$sql2 .= " WHERE mc.statut < 1 AND mc.fk_mailing = ".$id;
-			if ($conf->global->MAILING_LIMIT_SENDBYCLI > 0) {
+			$sql2 .= " WHERE mc.statut < 1 AND mc.fk_mailing = ".((int) $id);
+			if ($conf->global->MAILING_LIMIT_SENDBYCLI > 0 && empty($max)) {
 				$sql2 .= " LIMIT ".$conf->global->MAILING_LIMIT_SENDBYCLI;
+			} elseif ($conf->global->MAILING_LIMIT_SENDBYCLI > 0 && $max > 0) {
+				$sql2 .= " LIMIT ".min($conf->global->MAILING_LIMIT_SENDBYCLI, $max);
+			} elseif ($max > 0) {
+				$sql2 .= " LIMIT ".$max;
 			}
 
 			$resql2 = $db->query($sql2);
@@ -125,7 +144,7 @@ if ($resql) {
 					$now = dol_now();
 
 					// Positionne date debut envoi
-					$sqlstartdate = "UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi='".$db->idate($now)."' WHERE rowid=".$id;
+					$sqlstartdate = "UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi='".$db->idate($now)."' WHERE rowid=".((int) $id);
 					$resqlstartdate = $db->query($sqlstartdate);
 					if (!$resqlstartdate) {
 						dol_print_error($db);
diff --git a/scripts/emailings/reset-invalid-emails.php b/scripts/emailings/reset-invalid-emails.php
new file mode 100755
index 00000000000..bc35f0f4240
--- /dev/null
+++ b/scripts/emailings/reset-invalid-emails.php
@@ -0,0 +1,176 @@
+#!/usr/bin/env php
+<?php
+/* Copyright (C) 2020 Laurent Destailleur <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file scripts/emailings/reset-invalid-emails.php
+ * \ingroup 	mailing
+ * \brief 		Script to reset (set email to empty) from a list of email
+ */
+
+if (!defined('NOSESSION')) define('NOSESSION', '1');
+if (!defined('MAXEMAILS')) define('MAXEMAILS', 100);
+
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path = __DIR__.'/';
+
+// Test if batch mode
+if (substr($sapi_type, 0, 3) == 'cgi') {
+	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+	exit(-1);
+}
+
+if (!isset($argv[3]) || !$argv[3]) {
+	print "Usage: ".$script_file." inputfile-with-invalid-emails type [test|confirm]\n";
+	print "- inputfile-with-invalid-emails is a file with list of invalid email\n";
+	print "- type can be 'all' or 'thirdparties', 'contacts', 'members', 'users'\n";
+	exit(-1);
+}
+$fileofinvalidemail = $argv[1];
+$type = $argv[2];
+$mode = $argv[3];
+
+require_once $path."../../htdocs/master.inc.php";
+require_once DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php";
+require_once DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php";
+
+// Global variables
+$version = DOL_VERSION;
+$error = 0;
+
+/*
+ * Main
+ */
+
+$user = new User($db);
+
+@set_time_limit(0);
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
+
+if (!in_array($type, array('thirdparties', 'contacts', 'users', 'members'))) {
+	print "Bad value for parameter type.\n";
+	exit(-1);
+}
+
+$db->begin();
+
+
+$myfile = fopen($fileofinvalidemail, "r");
+if (!$myfile)
+{
+	echo "Failed to open file";
+	exit(-1);
+}
+
+$tmp = 1;
+$counter = 1;
+$numerasedtotal = 0;
+
+while ($tmp != null)
+{
+	$groupofemails = array();
+	for ($i = 0; $i < MAXEMAILS; $i++)
+	{
+		$tmp = fgets($myfile);
+		if ($tmp == null)
+		{
+			break;
+		}
+		$groupofemails[$i] = trim($tmp, "\n");
+	}
+
+	// Generate the string tp allow a mass update (with a limit of MAXEMAILS per request).
+	$emailsin = '';
+	foreach ($groupofemails as $email) {
+		$emailsin .= ($emailsin ? ", " : "")."'".$db->escape($email)."'";
+	}
+
+	// For each groupofemail, we update tables to set email field to empty
+	$nbingroup = count($groupofemails);
+
+	print "Process group of ".$nbingroup." emails (".$counter." - ".($counter + $nbingroup - 1)."), type = ".$type."\n";
+
+	$numerased = 0;
+
+	$sql_base = "UPDATE ".MAIN_DB_PREFIX;
+
+	if ($type == 'all' || $type == 'users')
+	{
+		// Loop on each record and update the email to null if email into $groupofemails
+		$sql = $sql_base."user as u SET u.email = NULL WHERE u.email IN (".$emailsin.");";
+		print "Try to update users, ";
+		$resql = $db->query($sql);
+		if (!$resql) {
+			dol_print_error($db);
+		}
+		$numerased += $db->affected_rows($resql);
+	}
+
+	if ($type == 'all' || $type == 'thirdparties')
+	{
+		// Loop on each record and update the email to null if email into $groupofemails
+		$sql = $sql_base."societe as s SET s.email = NULL WHERE s.email IN (".$emailsin.");";
+		print "Try to update thirdparties, ";
+		$resql = $db->query($sql);
+		if (!$resql) {
+			dol_print_error($db);
+		}
+		$numerased += $db->affected_rows($resql);
+	}
+
+	if ($type == 'all' || $type == 'contacts')
+	{
+		// Loop on each record and update the email to null if email into $groupofemails
+
+		$sql = $sql_base."socpeople as s SET s.email = NULL WHERE s.email IN (".$emailsin.");";
+		print "Try to update contacts, ";
+		$resql = $db->query($sql);
+		if (!$resql) {
+			dol_print_error($db);
+		}
+		$numerased += $db->affected_rows($resql);
+	}
+
+	if ($type == 'all' || $type == 'members')
+	{
+		// Loop on each record and update the email to null if email into $groupofemails
+
+		$sql = $sql_base."adherent as a SET a.email = NULL WHERE a.email IN (".$emailsin.");";
+		print "Try to update members, ";
+		$resql = $db->query($sql);
+		if (!$resql) {
+			dol_print_error($db);
+		}
+		$numerased += $db->affected_rows($resql);
+	}
+
+	$numerasedtotal += $numerased;
+
+	print $numerased." emails cleared.\n";
+	$counter = $counter + $nbingroup;
+}
+
+if (!$error && $mode == 'confirm') {
+	print "Commit - ".$numerasedtotal." operations validated.\n";
+	$db->commit();
+} else {
+	print "Rollback - ".$numerasedtotal." Operations canceled.\n";
+	$db->rollback();
+}
+
+exit($error);
diff --git a/scripts/invoices/email_unpaid_invoices_to_customers.php b/scripts/invoices/email_unpaid_invoices_to_customers.php
index 5617751b58b..9b59fcab6f7 100755
--- a/scripts/invoices/email_unpaid_invoices_to_customers.php
+++ b/scripts/invoices/email_unpaid_invoices_to_customers.php
@@ -24,6 +24,9 @@
  * \ingroup facture
  * \brief Script to send a mail to customers with unpaid invoices
  */
+
+if (!defined('NOSESSION')) define('NOSESSION', '1');
+
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path = __DIR__.'/';
diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php
index 9bdd37ca599..d401894363d 100755
--- a/scripts/invoices/email_unpaid_invoices_to_representatives.php
+++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php
@@ -24,6 +24,9 @@
  * \ingroup facture
  * \brief Script to send a mail to dolibarr users linked to companies with unpaid invoices
  */
+
+if (!defined('NOSESSION')) define('NOSESSION', '1');
+
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path = __DIR__.'/';
diff --git a/scripts/invoices/rebuild_merge_pdf.php b/scripts/invoices/rebuild_merge_pdf.php
index fa54bac9da8..22c55eeeb99 100755
--- a/scripts/invoices/rebuild_merge_pdf.php
+++ b/scripts/invoices/rebuild_merge_pdf.php
@@ -22,6 +22,9 @@
  * \ingroup facture
  * \brief Script to rebuild PDF and merge PDF files into one
  */
+
+if (!defined('NOSESSION')) define('NOSESSION', '1');
+
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path = __DIR__.'/';
diff --git a/scripts/members/sync_members_dolibarr2ldap.php b/scripts/members/sync_members_dolibarr2ldap.php
index 7b91a651b34..f0edb2fb8f3 100755
--- a/scripts/members/sync_members_dolibarr2ldap.php
+++ b/scripts/members/sync_members_dolibarr2ldap.php
@@ -23,6 +23,9 @@
  * \ingroup ldap member
  * \brief Script de mise a jour des adherents dans LDAP depuis base Dolibarr
  */
+
+if (!defined('NOSESSION')) define('NOSESSION', '1');
+
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path = __DIR__.'/';
@@ -40,7 +43,7 @@ require_once DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php";
 $langs->load("main");
 
 // Global variables
-$version = DOL_VERSION;
+$version = constant('DOL_VERSION');
 $error = 0;
 $confirmed = 0;
 
diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php
index 4166772cb10..21a5075326c 100755
--- a/scripts/members/sync_members_ldap2dolibarr.php
+++ b/scripts/members/sync_members_ldap2dolibarr.php
@@ -23,6 +23,9 @@
  * \ingroup ldap member
  * \brief Script de mise a jour des adherents dans Dolibarr depuis LDAP
  */
+
+if (!defined('NOSESSION')) define('NOSESSION', '1');
+
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path = __DIR__.'/';
@@ -42,7 +45,7 @@ require_once DOL_DOCUMENT_ROOT."/adherents/class/subscription.class.php";
 $langs->loadLangs(array("main", "errors"));
 
 // Global variables
-$version = DOL_VERSION;
+$version = constant('DOL_VERSION');
 $error = 0;
 $forcecommit = 0;
 $confirmed = 0;
diff --git a/scripts/members/sync_members_types_dolibarr2ldap.php b/scripts/members/sync_members_types_dolibarr2ldap.php
index a07ec0a1ff3..d0cf6ae7f04 100755
--- a/scripts/members/sync_members_types_dolibarr2ldap.php
+++ b/scripts/members/sync_members_types_dolibarr2ldap.php
@@ -24,6 +24,9 @@
  * \ingroup ldap core
  * \brief Script de mise a jour des types de membres dans LDAP depuis base Dolibarr
  */
+
+if (!defined('NOSESSION')) define('NOSESSION', '1');
+
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path = __DIR__.'/';
@@ -38,6 +41,7 @@ if (!isset($argv[1]) || !$argv[1]) {
 	print "Usage: ".$script_file." now\n";
 	exit(-1);
 }
+
 $now = $argv[1];
 
 require_once $path."../../htdocs/master.inc.php";
@@ -45,7 +49,7 @@ require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php";
 require_once DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php";
 
 // Global variables
-$version = DOL_VERSION;
+$version = constant('DOL_VERSION');
 $error = 0;
 
 /*
@@ -85,7 +89,7 @@ if ($resql) {
 			$membertype->id = $obj->rowid;
 			$membertype->fetch($membertype->id);
 
-			print $langs->trans("UpdateMemberType")." rowid=".$membertype->id." ".$membertype - label;
+			print $langs->trans("UpdateMemberType")." rowid=".$membertype->id." ".$membertype->label;
 
 			$oldobject = $membertype;
 
diff --git a/scripts/members/sync_members_types_ldap2dolibarr.php b/scripts/members/sync_members_types_ldap2dolibarr.php
index 547b2664070..f24faf9b76a 100755
--- a/scripts/members/sync_members_types_ldap2dolibarr.php
+++ b/scripts/members/sync_members_types_ldap2dolibarr.php
@@ -25,6 +25,9 @@
  * \ingroup ldap member
  * \brief Script to update members types into Dolibarr from LDAP
  */
+
+if (!defined('NOSESSION')) define('NOSESSION', '1');
+
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path = __DIR__.'/';
@@ -43,7 +46,7 @@ require_once DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php";
 $langs->loadLangs(array("main", "errors"));
 
 // Global variables
-$version = DOL_VERSION;
+$version = constant('DOL_VERSION');
 $error = 0;
 $forcecommit = 0;
 $confirmed = 0;
diff --git a/scripts/product/migrate_picture_path.php b/scripts/product/migrate_picture_path.php
index 8e452ba13b2..849eca44514 100755
--- a/scripts/product/migrate_picture_path.php
+++ b/scripts/product/migrate_picture_path.php
@@ -23,6 +23,9 @@
  * \ingroup scripts
  * \brief Migrate pictures from old system prior to 3.7 to new path for 3.7+
  */
+
+if (!defined('NOSESSION')) define('NOSESSION', '1');
+
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path = __DIR__.'/';
diff --git a/scripts/product/regenerate_thumbs.php b/scripts/product/regenerate_thumbs.php
index 8434bdd9097..0d8c6380eb3 100755
--- a/scripts/product/regenerate_thumbs.php
+++ b/scripts/product/regenerate_thumbs.php
@@ -23,6 +23,9 @@
  * \ingroup scripts
  * \brief Migrate pictures from old system prior to 3.7 to new path for 3.7+
  */
+
+if (!defined('NOSESSION')) define('NOSESSION', '1');
+
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path = __DIR__.'/';
diff --git a/scripts/user/migrate_picture_path.php b/scripts/user/migrate_picture_path.php
index c80097bb36b..795d03b710d 100755
--- a/scripts/user/migrate_picture_path.php
+++ b/scripts/user/migrate_picture_path.php
@@ -23,6 +23,9 @@
  * \ingroup scripts
  * \brief Migrate pictures from old system prior to 3.7 to new path for 3.7+
  */
+
+if (!defined('NOSESSION')) define('NOSESSION', '1');
+
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path = __DIR__.'/';
diff --git a/scripts/user/sync_groups_dolibarr2ldap.php b/scripts/user/sync_groups_dolibarr2ldap.php
index c52a0151887..eb229c3d4ed 100755
--- a/scripts/user/sync_groups_dolibarr2ldap.php
+++ b/scripts/user/sync_groups_dolibarr2ldap.php
@@ -23,6 +23,9 @@
  * \ingroup ldap core
  * \brief Script de mise a jour des groupes dans LDAP depuis base Dolibarr
  */
+
+if (!defined('NOSESSION')) define('NOSESSION', '1');
+
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path = __DIR__.'/';
diff --git a/scripts/user/sync_groups_ldap2dolibarr.php b/scripts/user/sync_groups_ldap2dolibarr.php
index 28c580dce63..26e12c2c5e4 100755
--- a/scripts/user/sync_groups_ldap2dolibarr.php
+++ b/scripts/user/sync_groups_ldap2dolibarr.php
@@ -24,6 +24,9 @@
  * \ingroup ldap member
  * \brief Script to update groups into Dolibarr from LDAP
  */
+
+if (!defined('NOSESSION')) define('NOSESSION', '1');
+
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path = __DIR__.'/';
@@ -167,7 +170,7 @@ if ($result >= 0) {
 				if ($key === 'count')
 					continue;
 				if (empty($userList[$userdn])) { // Récupération de l'utilisateur
-				                                 // Schéma rfc2307: les membres sont listés dans l'attribut memberUid sous form de login uniquement
+												 // Schéma rfc2307: les membres sont listés dans l'attribut memberUid sous form de login uniquement
 					if ($conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS === 'memberUid') {
 						$userKey = array($userdn);
 					} else { // Pour les autres schémas, les membres sont listés sous forme de DN complets
diff --git a/scripts/user/sync_users_dolibarr2ldap.php b/scripts/user/sync_users_dolibarr2ldap.php
index 5d36bcf44be..4f6fd00d1c7 100755
--- a/scripts/user/sync_users_dolibarr2ldap.php
+++ b/scripts/user/sync_users_dolibarr2ldap.php
@@ -23,6 +23,9 @@
  * \ingroup ldap core
  * \brief Script de mise a jour des users dans LDAP depuis base Dolibarr
  */
+
+if (!defined('NOSESSION')) define('NOSESSION', '1');
+
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path = __DIR__.'/';
diff --git a/scripts/user/sync_users_ldap2dolibarr.php b/scripts/user/sync_users_ldap2dolibarr.php
index c8502cd1f14..375cb2f43ba 100755
--- a/scripts/user/sync_users_ldap2dolibarr.php
+++ b/scripts/user/sync_users_ldap2dolibarr.php
@@ -23,6 +23,9 @@
  * \ingroup ldap member
  * \brief Script to update users into Dolibarr from LDAP
  */
+
+if (!defined('NOSESSION')) define('NOSESSION', '1');
+
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path = __DIR__.'/';
diff --git a/scripts/website/migrate-news-joomla2dolibarr.php b/scripts/website/migrate-news-joomla2dolibarr.php
index b4399ba0885..dfd92a19acf 100755
--- a/scripts/website/migrate-news-joomla2dolibarr.php
+++ b/scripts/website/migrate-news-joomla2dolibarr.php
@@ -22,6 +22,8 @@
  * \brief Migrate news from a Joomla databse into a Dolibarr website
  */
 
+if (!defined('NOSESSION')) define('NOSESSION', '1');
+
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path = __DIR__.'/';
diff --git a/scripts/website/regenerate-pages.php b/scripts/website/regenerate-pages.php
index dfd49c1fe29..a50db09708d 100755
--- a/scripts/website/regenerate-pages.php
+++ b/scripts/website/regenerate-pages.php
@@ -22,6 +22,8 @@
  * \brief Regenerate all pages of a web site
  */
 
+if (!defined('NOSESSION')) define('NOSESSION', '1');
+
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path = __DIR__.'/';
diff --git a/scripts/withdrawals/build_withdrawal_file.php b/scripts/withdrawals/build_withdrawal_file.php
index d6ffe710a90..5ae7ba70bf4 100755
--- a/scripts/withdrawals/build_withdrawal_file.php
+++ b/scripts/withdrawals/build_withdrawal_file.php
@@ -23,6 +23,9 @@
  * \ingroup prelevement
  * \brief Script de prelevement
  */
+
+if (!defined('NOSESSION')) define('NOSESSION', '1');
+
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path = __DIR__.'/';
@@ -40,7 +43,7 @@ require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
 require_once DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php";
 
 // Global variables
-$version = DOL_VERSION;
+$version = constant('DOL_VERSION');
 $error = 0;
 
 /*
diff --git a/test/README b/test/README
index 2c53e31daee..012d8cf44e2 100644
--- a/test/README
+++ b/test/README
@@ -71,7 +71,7 @@ PHPDEPEND
 
 * Launch PDepend analysis:
 > cd test
-> pdepend --debug -d memory_limit=-1 --configuration=./phpunit/phpunittest.xml --phpunit-xml=./report/logs/pdepend.xml --summary-xml=./report/logs/summary.xml --jdepend-chart=./report/logs/jdepend.svg --overview-pyramid=./report/logs/pyramid.svg --ignore=custom,custom2,adodbtime,artichow,ckeditor,efc_xfss,fckeditor,fpdf,geoip,magpierss,nusoap,odtphp,phpexcel,php_writeexcel,smarty,smtps,tcpdf,vcard ../htdocs
+> pdepend --debug -d memory_limit=-1 --configuration=./phpunit/phpunittest.xml --phpunit-xml=./report/logs/pdepend.xml --summary-xml=./report/logs/summary.xml --jdepend-chart=./report/logs/jdepend.svg --overview-pyramid=./report/logs/pyramid.svg --ignore=custom,custom2,adodbtime,artichow,ckeditor,efc_xfss,fckeditor,fpdf,geoip,magpierss,nusoap,odtphp,php_writeexcel,smarty,smtps,tcpdf,vcard ../htdocs
 
 * To clean pdepend cache files
 > rm -fr ~/.pdepend/* 
diff --git a/test/acceptance/README.md b/test/acceptance/README.md
new file mode 100644
index 00000000000..ada096c0b69
--- /dev/null
+++ b/test/acceptance/README.md
@@ -0,0 +1,78 @@
+# Run End-to-End Tests
+
+### Run Selenium
+
+Selenium has been used for automating the browser.
+
+[Download](https://www.selenium.dev/downloads/) the `latest stable version` of the `Selenium standalone server JAR file`.
+
+Also [download](https://chromedriver.chromium.org/downloads) the `latest stable version` of `Chrome Driver`.
+
+Once you have downloaded Chrome Driver, you need to unzip it by running the following command:
+
+  `unzip chromedriver_linux64.zip`
+    
+Once you have unzipped it, you need to move the *chromedriver* file (shared library) and place it inside the same folder where you have placed the Selenium standalone server file.
+
+Now we can run selenium by two ways:
+
+* Start selenium server with a command which usually looks like:
+
+   `java -jar selenium-server-standalone-<selenium version>.jar -port 4444`
+
+
+* Run selenium in docker with
+
+   `docker run -d -p 4444:4444 -p 5900:5900 -v /dev/shm:/dev/shm selenium/standalone-chrome-debug`
+   
+   or `docker run -d --network="host" -v /dev/shm:/dev/shm selenium/standalone-chrome-debug`
+
+   or `docker run -d --network host -v /dev/shm:/dev/shm selenium/standalone-chrome-debug`
+
+### Run the acceptance tests 
+
+* Install *yarn*. For example on Ubuntu:
+
+   ```
+   apt install yarnpkg
+   ```
+
+* Install *nodejs* libraries. For example on Ubuntu:
+
+   ```
+   apt install npm
+   npm install cucumber
+   npm install nightwatch-api
+   npm install nightwatch
+   npm update
+   ```
+
+* In *nightwatch.conf.js* file inside the root directory of the project and inside the configuration file following environment variable has been specified. We can change the default values according to our local configuration.
+
+   ```
+    const admin_username = process.env.ADMIN_USERNAME || 'admin';
+
+    const admin_password = process.env.ADMIN_PASSWORD || 'password';
+
+    const launch_url = process.env.LAUNCH_URL || 'http://localhost/dolibarr/htdocs/';
+   ```
+
+* You can run a test using following commands
+
+  `LAUNCH_URL='<launch_url>'; ADMIN_USERNAME='<admin_username>'; ADMIN_PASSWORD='<admin_password>';`
+  
+  `yarn run test:e2e test/acceptance/features/<feature_file>`
+   
+  For example: `yarn run test:e2e test/acceptance/features/WebUI/addUsers.feature`
+ 
+  Note: The script to run all the acceptance tests is specified in `scripts` object of `package.json` file inside the project's root directory as :
+ 
+  `"test:e2e": "node_modules/cucumber/bin/cucumber-js --require test/acceptance/index.js --require test/acceptance/stepDefinitions -f node_modules/cucumber-pretty"`
+     
+  After you run the above command you can see the test running. For that : 
+  
+* open `Remmina` (Remmina is a Remote Desktop Client and comes installed with Ubuntu)
+  
+* choose `VNC` and enter `localhost` on the address bar
+  
+* enter `secret` as the password
diff --git a/test/acceptance/features/Api/apiAddUsers.feature b/test/acceptance/features/Api/apiAddUsers.feature
new file mode 100644
index 00000000000..77bb811d224
--- /dev/null
+++ b/test/acceptance/features/Api/apiAddUsers.feature
@@ -0,0 +1,78 @@
+Feature: Add user
+  As an admin
+  I want to add users
+  So that the authorized access is possible
+
+  Scenario: Admin adds user without permission
+    Given the user with login "harrypotter@gmail.com" does not exist
+    When the admin creates user with following details using API
+      | last name | Potter                |
+      | login     | harrypotter@gmail.com |
+      | password  | password              |
+    Then the response status code should be "200"
+    And user with login "harrypotter@gmail.com" should exist
+
+  Scenario: Admin creates already existing user
+    Given the admin has created the following users
+      | login | last name | password |
+      | Harry | Potter    | hello123 |
+    When the admin creates user with following details using API
+      | last name | Potter   |
+      | login     | Harry    |
+      | password  | hello123 |
+    Then the response status code should be "500"
+    And the response message should be "ErrorLoginAlreadyExists"
+
+  Scenario Outline: Admin adds user with incomplete essential credentials
+    Given the user with login "Harry" does not exist
+    When the admin creates user with following details using API
+      | last name | <last name> |
+      | login     | Harry       |
+      | password  | <password>  |
+    Then the response status code should be "200"
+    And user with login "Harry" should exist
+    Examples:
+      | last name | password |
+      |           |          |
+      | Manson    |          |
+      |           | 123      |
+
+  Scenario Outline: Admin adds user without login
+    Given the user with login "harrypotter@gmail.com" does not exist
+    When the admin creates user with following details using API
+      | last name | <last name> |
+      | login     |             |
+      | password  | <password>  |
+    Then the response status code should be "500"
+    And the response message should be "Field 'Login' is required"
+    Examples:
+      | last name | password |
+      | Potter    | Hello123 |
+      | Potter    |          |
+      |           | hello123 |
+
+  Scenario Outline: Admin adds user with last name as special characters
+    Given the user with login "<login>" does not exist
+    When the admin creates user with following details using API
+      | last name | <last name> |
+      | login     | <login>     |
+      | password  | password    |
+    Then the response status code should be "200"
+    And user with login "<login>" should exist
+    Examples:
+      | last name     | login                  |
+      | swi@          | s$5^2                  |
+      | g!!@%ui       | नेपाली                 |
+      | swikriti@h    | सिमप्ले $%#?&@name.txt |
+      | !@#$%^&*()-_+ | España§àôœ€            |
+
+  Scenario: Non-admin user with api key adds user
+    Given the admin has created the following users
+      | login | last name | password | api_key     |
+      | Harry | Potter    | hello123 | harrypotter |
+    When the non-admin user "Harry" with password "hello123" creates user with following details using API
+      | last name | Potter   |
+      | login     | Ginny    |
+      | password  | password |
+    Then the response status code should be "200"
+    And user with login "Ginny" should exist
diff --git a/test/acceptance/features/Api/apiListUsers.feature b/test/acceptance/features/Api/apiListUsers.feature
new file mode 100644
index 00000000000..c5b64ece7be
--- /dev/null
+++ b/test/acceptance/features/Api/apiListUsers.feature
@@ -0,0 +1,23 @@
+Feature: list users
+  As an admin user
+  I want to view the list of users
+  So that I can manage users
+
+  Scenario: Admin user should be able to see list of created users
+    Given the admin has created the following users
+      | login | last name | password |
+      | Harry | Potter    | hello123 |
+    When the admin gets the list of all users using the API
+    Then the response status code should be "200"
+    And the user list returned by API should be following
+      | login    | last name  |
+      | dolibarr | SuperAdmin |
+      | Harry    | Potter     |
+
+  Scenario: Non-admin user should not be able to see list of created users
+    Given the admin has created the following users
+      | login | last name | password | api_key     |
+      | Harry | Potter    | hello123 | harrypotter |
+    When user "Harry" with password "hello123" tries to list all users using the API
+    Then the response status code should be "401"
+    And the error message should be "Unauthorized: You are not allowed to read list of users"
diff --git a/test/acceptance/features/WebUI/addUsers.feature b/test/acceptance/features/WebUI/addUsers.feature
new file mode 100644
index 00000000000..918bff771c2
--- /dev/null
+++ b/test/acceptance/features/WebUI/addUsers.feature
@@ -0,0 +1,86 @@
+Feature: Add user
+  As an admin
+  I want to add users
+  So that the authorized access is possible
+
+  Background:
+    Given the administrator has logged in using the webUI
+    And the administrator has browsed to the new users page
+
+  Scenario: Admin adds user without permission
+    When the admin creates user with following details
+      | last name | Potter                |
+      | login     | harrypotter@gmail.com |
+      | password  | password              |
+    Then new user "Potter" should be created
+    And message "This user has no permissions defined" should be displayed in the webUI
+
+  Scenario Outline: Admin adds user with permission
+    When the admin creates user with following details
+      | last name     | Potter                |
+      | login         | harrypotter@gmail.com |
+      | password      | password              |
+      | administrator | <administrator>       |
+      | gender        | <gender>              |
+    Then message "This user has no permissions defined" <shouldOrShouldNot> be displayed in the webUI
+    And new user "Potter" should be created
+    Examples:
+      | administrator | gender | shouldOrShouldNot |
+      | No            |        | should            |
+      | No            | Man    | should            |
+      | No            | Woman  | should            |
+      | Yes           |        | should not        |
+      | Yes           | Man    | should not        |
+      | Yes           | Woman  | should not        |
+
+  Scenario Outline: Admin adds user with last name as special characters
+    When the admin creates user with following details
+      | last name | <last name> |
+      | login     | harry       |
+      | password  | password    |
+    Then message "This user has no permissions defined" should be displayed in the webUI
+    And new user "<last name>" should be created
+    Examples:
+      | last name                  |
+      | swi@                       |
+      | g!!@%ui                    |
+      | swikriti@h                 |
+      | !@#$%^&*()-_+=[]{}:;,.<>?~ |
+      | $w!kr!t!                   |
+      | España§àôœ€                |
+      | नेपाली                     |
+      | सिमप्ले $%#?&@name.txt     |
+
+  Scenario Outline: Admin adds user with incomplete essential credentials
+    When the admin creates user with following details
+      | last name | <last name> |
+      | login     | <login>     |
+      | password  | <password>  |
+    Then message "<message>" should be displayed in the webUI
+    And new user "<last name>" should not be created
+    Examples:
+      | last name | login          | password | message                                     |
+      |           |                |          | Name is not defined.\nLogin is not defined. |
+      | Joseph    |                |          | Login is not defined.                       |
+      |           | john@gmail.com |          | Name is not defined.                        |
+      | Joseph    |                | hihi     | Login is not defined.                       |
+
+  Scenario: Admin adds user with incomplete essential credentials
+    When the admin creates user with following details
+      | last name | Doe  |
+      | login     | John |
+      | password  |      |
+    Then message "This user has no permissions defined" should be displayed in the webUI
+    And new user "Doe" should be created
+
+  Scenario: Admin tries to add user with pre-existing login credential
+    Given a user has been created with following details
+      | login | last name | password |
+      | Tyler | Joseph    | pass1234 |
+    And the administrator has browsed to the new users page
+    When the admin creates user with following details
+      | last name | Dun      |
+      | login     | Tyler    |
+      | password  | pass1234 |
+    Then message "Login already exists." should be displayed in the webUI
+    And new user "Dun" should not be created
diff --git a/test/acceptance/features/WebUI/listUsers.feature b/test/acceptance/features/WebUI/listUsers.feature
new file mode 100644
index 00000000000..e9c0443cdd4
--- /dev/null
+++ b/test/acceptance/features/WebUI/listUsers.feature
@@ -0,0 +1,29 @@
+Feature: list users
+  As an admin user
+  I want to view the list of users
+  So that I can manage users
+
+  Background:
+    Given the administrator has logged in using the webUI
+
+  Scenario: Admin user should be able to see list of created users when no new users are created
+    When the administrator browses to the list of users page using the webUI
+    Then following users should be displayed in the users list
+      | login    | last name  |
+      | dolibarr | SuperAdmin |
+    And the number of created users should be 1
+
+  Scenario: Admin user should be able to see number of created users
+    Given the admin has created the following users
+      | login    | last name | password |
+      | Harry    | Potter    | hello123 |
+      | Hermoine | Granger   | hello123 |
+      | Ron      | Weasley   | hello123 |
+    When the administrator browses to the list of users page using the webUI
+    Then following users should be displayed in the users list
+      | login    | last name  |
+      | dolibarr | SuperAdmin |
+      | Harry    | Potter     |
+      | Hermoine | Granger    |
+      | Ron      | Weasley    |
+    And the number of created users should be 4
diff --git a/test/acceptance/features/WebUI/login.feature b/test/acceptance/features/WebUI/login.feature
new file mode 100644
index 00000000000..fd7058812cf
--- /dev/null
+++ b/test/acceptance/features/WebUI/login.feature
@@ -0,0 +1,27 @@
+Feature: user login
+  As a user/admin
+  I want to login to my account
+  So that I can have access to my functionality
+
+  Background:
+    Given the user has browsed to the login page
+
+  Scenario: Admin user should be able to login successfully
+    When user logs in with username "dolibarr" and password "password"
+    Then the user should be directed to the homepage
+
+  Scenario: Admin user with empty credentials should not be able to login
+    When user logs in with username "" and password ""
+    Then the user should not be able to login
+
+  Scenario Outline: user logs in with invalid credentials
+    When user logs in with username "<username>" and password "<password>"
+    Then the user should not be able to login
+    And error message "Bad value for login or password" should be displayed in the webUI
+    Examples:
+      | username | password |
+      | dolibar  | pass     |
+      | dolibarr | passw    |
+      | dolibar  |          |
+      | dolibarr |          |
+      | dolibar  | password |
diff --git a/test/acceptance/features/WebUI/logout.feature b/test/acceptance/features/WebUI/logout.feature
new file mode 100644
index 00000000000..137c5260008
--- /dev/null
+++ b/test/acceptance/features/WebUI/logout.feature
@@ -0,0 +1,10 @@
+Feature: user logs out
+  As a user
+  I want to log out of my account
+  So that I can protect my work, identity and be assured of my privacy
+
+  Scenario: User can logout
+    Given the administrator has logged in using the webUI
+    When the user opens the user profile using the webUI
+    And the user logs out using the webUI
+    Then the user should be logged out successfully
diff --git a/test/acceptance/index.js b/test/acceptance/index.js
new file mode 100644
index 00000000000..08eaa728110
--- /dev/null
+++ b/test/acceptance/index.js
@@ -0,0 +1,14 @@
+const {setDefaultTimeout, After, Before} = require('cucumber')
+const {createSession, closeSession, startWebDriver, stopWebDriver} = require('nightwatch-api')
+
+setDefaultTimeout(60000)
+
+Before(async () => {
+    await startWebDriver();
+    await createSession();
+})
+
+After(async () => {
+    await closeSession();
+    await stopWebDriver();
+})
diff --git a/test/acceptance/pageObjects/addUsersPage.js b/test/acceptance/pageObjects/addUsersPage.js
new file mode 100644
index 00000000000..a365a6d0121
--- /dev/null
+++ b/test/acceptance/pageObjects/addUsersPage.js
@@ -0,0 +1,128 @@
+const util = require('util');
+module.exports = {
+    url: function () {
+        return this.api.launchUrl + 'user/card.php?leftmenu=users&action=create';
+    },
+
+    commands: [
+        {
+            adminCreatesUser: async function (dataTable) {
+                const userDetails = dataTable.rowsHash();
+                let administrator = userDetails['administrator'];
+                let gender = userDetails['gender'];
+                await this.waitForElementVisible('@newUserAddOption')
+                    .useXpath()
+                    .waitForElementVisible('@lastnameField')
+                    .clearValue('@lastnameField')
+                    .setValue('@lastnameField', userDetails['last name'])
+                    .waitForElementVisible('@loginField')
+                    .clearValue('@loginField')
+                    .setValue('@loginField', userDetails['login'])
+                    .waitForElementVisible('@newUserPasswordField')
+                    .clearValue('@newUserPasswordField')
+                    .setValue('@newUserPasswordField', userDetails['password']);
+
+                if (userDetails['administrator']) {
+                    const admin = util.format(this.elements.administratorSelectOption.selector, administrator);
+                    await this.waitForElementVisible('@administratorField')
+                        .click('@administratorField')
+                        .waitForElementVisible(admin)
+                        .click(admin);
+                }
+
+                if (userDetails['gender']) {
+                    const genderValue = util.format(this.elements.genderSelectOption.selector, gender)
+                    await this.waitForElementVisible('@genderField')
+                        .click('@genderField')
+                        .waitForElementVisible(genderValue)
+                        .click(genderValue);
+                }
+                return this.waitForElementVisible('@submitButton')
+                    .click('@submitButton')
+                    .useCss();
+            },
+
+            noPermissionMessage: async function (message) {
+                await this.useXpath()
+                    .waitForElementVisible('@noPermissionDefinedMessage')
+                    .expect.element('@noPermissionDefinedMessage')
+                    .text.to.equal(message);
+                return this.useCss();
+            },
+
+            newUserShouldBeCreated: async function (lastname) {
+                await this.useXpath()
+                    .waitForElementVisible('@newUserCreated')
+                    .expect.element('@newUserCreated')
+                    .text.to.equal(lastname);
+                return this.useCss();
+            },
+
+            noPermissionDefinedMessageNotShown: function (message) {
+                return this.useXpath()
+                    .waitForElementNotPresent('@noPermissionDefinedMessage')
+                    .useCss();
+            },
+
+            userNotCreated: function (lastname) {
+                return this.waitForElementVisible('@newUserAddOption');
+            }
+        }
+    ],
+
+    elements: {
+        newUserAddOption: {
+            selector: '.fiche'
+        },
+
+        lastnameField: {
+            selector: '//table[@class="border centpercent"]/tbody/tr/td//input[@id="lastname"]',
+            locateStrategy: 'xpath'
+        },
+
+        loginField: {
+            selector: '//table[@class="border centpercent"]/tbody/tr/td//input[@name="login"]',
+            locateStrategy: 'xpath'
+        },
+
+        newUserPasswordField: {
+            selector: '//table[@class="border centpercent"]/tbody/tr/td//input[@name="password"]',
+            locateStrategy: 'xpath'
+        },
+
+        submitButton: {
+            selector: '//div[@class="center"]/input[@class="button"]',
+            locateStrategy: 'xpath'
+        },
+
+        administratorField: {
+            selector: '//table[@class="border centpercent"]/tbody/tr/td//select[@id="admin"]',
+            locateStrategy: 'xpath'
+        },
+
+        administratorSelectOption: {
+            selector: '//select[@id="admin"]/option[.="%s"]',
+            locateStrategy: 'xpath'
+
+        },
+
+        genderField: {
+            selector: '//table[@class="border centpercent"]/tbody/tr/td//select[@id="gender"]',
+            locateStrategy: 'xpath'
+        },
+        genderSelectOption: {
+            selector: '//select[@id="gender"]/option[.="%s"]',
+            locateStrategy: 'xpath'
+        },
+
+        noPermissionDefinedMessage: {
+            selector: '//div[@class="jnotify-message"]',
+            locateStrategy: 'xpath'
+        },
+
+        newUserCreated: {
+            selector: '//div[contains(@class,"valignmiddle")]//div[contains(@class,"inline-block floatleft valignmiddle")]',
+            locateStrategy: 'xpath'
+        }
+    }
+};
diff --git a/test/acceptance/pageObjects/homePage.js b/test/acceptance/pageObjects/homePage.js
new file mode 100644
index 00000000000..c17be05ecae
--- /dev/null
+++ b/test/acceptance/pageObjects/homePage.js
@@ -0,0 +1,44 @@
+module.exports = {
+    url: function () {
+        return this.api.launchUrl + 'admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete';
+    },
+
+    commands: [
+        {
+            browsedToNewUserPage: function () {
+                return this.useXpath()
+                    .waitForElementVisible('@usersAndGroups')
+                    .click('@usersAndGroups')
+                    .waitForElementVisible('@newUser')
+                    .click('@newUser')
+                    .useCss();
+            },
+
+            browsedToListOfUsers: function () {
+                return this.useXpath()
+                    .waitForElementVisible('@usersAndGroups')
+                    .click('@usersAndGroups')
+                    .waitForElementVisible('@listOfUsers')
+                    .click('@listOfUsers')
+                    .useCss();
+            }
+        }
+    ],
+
+    elements: {
+        usersAndGroups: {
+            selector: '//div[@class="menu_titre"]/a[@title="Users & Groups"]',
+            locateStrategy: 'xpath'
+        },
+
+        newUser: {
+            selector: '//div[@class="menu_contenu menu_contenu_user_card"]/a[@title="New user"]',
+            locateStrategy: 'xpath'
+        },
+
+        listOfUsers: {
+            selector: '//a[@class="vsmenu"][@title="List of users"]',
+            locateStrategy: 'xpath'
+        }
+    }
+};
diff --git a/test/acceptance/pageObjects/listUsersPage.js b/test/acceptance/pageObjects/listUsersPage.js
new file mode 100644
index 00000000000..74b97459bd5
--- /dev/null
+++ b/test/acceptance/pageObjects/listUsersPage.js
@@ -0,0 +1,47 @@
+const util = require('util');
+module.exports = {
+    url: function () {
+        return this.api.launchUrl + 'user/list.php?leftmenu=users';
+    },
+
+    commands: [
+        {
+            listOfUsersDisplayed: async function (dataTable) {
+                const usersList = dataTable.hashes();
+                this.useXpath();
+                for (const row of usersList) {
+                    let login = row['login'];
+                    let lastName = row['last name'];
+                    const userDetail = util.format(this.elements.userList.selector, login, lastName);
+                    await this.waitForElementVisible('@userRow')
+                        .waitForElementVisible(userDetail);
+                }
+                return this.useCss();
+            },
+
+            numberOfUsersDisplayed: async function (number) {
+                const userCount = util.format(this.elements.numberOfUsers.selector, number);
+                await this.useXpath()
+                    .waitForElementVisible(userCount);
+                return this.useCss();
+            }
+        }
+    ],
+
+    elements: {
+        userRow: {
+            selector: '//table[contains(@class,"tagtable")]/tbody/tr[position()>2]',
+            locateStrategy: 'xpath'
+        },
+
+        numberOfUsers: {
+            selector: '//div[contains(@class, "titre inline-block") and contains(., "List of users")]/span[.="(%d)"]',
+            locateStrategy: 'xpath'
+        },
+
+        userList: {
+            selector: '//table[contains(@class,"tagtable")]/tbody/tr[position()>2]/td/a//span[normalize-space(@class="nopadding usertext")][.="%s"]/../../following-sibling::td[.="%s"]',
+            locateStrategy: 'xpath'
+        }
+    }
+};
diff --git a/test/acceptance/pageObjects/loginPage.js b/test/acceptance/pageObjects/loginPage.js
new file mode 100644
index 00000000000..8e514625f4a
--- /dev/null
+++ b/test/acceptance/pageObjects/loginPage.js
@@ -0,0 +1,84 @@
+module.exports = {
+    url: function () {
+        return this.api.launchUrl;
+    },
+
+    commands: [
+        {
+            waitForLoginPage: function () {
+                return this.waitForElementVisible('@loginTable');
+            },
+
+            userLogsInWithUsernameAndPassword: function (username, password) {
+                return this.waitForElementVisible('@userNameField')
+                    .setValue('@userNameField', username)
+                    .waitForElementVisible('@passwordField')
+                    .setValue('@passwordField', password)
+                    .useXpath()
+                    .waitForElementVisible('@loginButton')
+                    .click('@loginButton')
+                    .useCss();
+            },
+
+            successfulLogin: function () {
+                return this.waitForElementNotPresent('@loginTable')
+                    .waitForElementVisible('@userProfileDropdown');
+            },
+
+            userIsLoggedIn: async function (login) {
+                await this.waitForElementNotPresent('@loginTable')
+                    .useXpath()
+                    .waitForElementVisible('@userLogin')
+                    .expect.element('@userLogin')
+                    .text.to.equal(login);
+                return this.useCss();
+            },
+
+            unsuccessfulLogin: function () {
+                return this.waitForElementVisible('@loginTable')
+                    .waitForElementNotPresent('@userProfileDropdown');
+            },
+
+            loginErrorDisplayed: async function (errorMessage) {
+                await this.useXpath()
+                    .waitForElementVisible('@loginError')
+                    .expect.element('@loginError')
+                    .text.to.equal(errorMessage);
+                return this.useCss();
+            }
+        }
+    ],
+
+    elements: {
+        loginButton: {
+            selector: '//div[@id="login-submit-wrapper"]/input[@type="submit"]',
+            locateStrategy: 'xpath'
+        },
+
+        userNameField: {
+            selector: '#username'
+        },
+
+        passwordField: {
+            selector: '#password'
+        },
+
+        loginTable: {
+            selector: '.login_table'
+        },
+
+        userProfileDropdown: {
+            selector: '#topmenu-login-dropdown'
+        },
+
+        userLogin: {
+            selector: '//div[@id="topmenu-login-dropdown"]/a//span[contains(@class,"atoploginusername")]',
+            locateStrategy: 'xpath'
+        },
+
+        loginError: {
+            selector: '//div[@class="center login_main_message"]/div[@class="error"]',
+            locateStrategy: 'xpath'
+        }
+    }
+};
diff --git a/test/acceptance/pageObjects/logoutPage.js b/test/acceptance/pageObjects/logoutPage.js
new file mode 100644
index 00000000000..a5b8f481d03
--- /dev/null
+++ b/test/acceptance/pageObjects/logoutPage.js
@@ -0,0 +1,34 @@
+module.exports = {
+    url: function () {
+        return this.api.launchUrl + 'admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete';
+    },
+
+    commands:
+        [
+            {
+                userOpensProfile: async function () {
+                    await this.useXpath()
+                        .waitForElementVisible('@userProfileDropdown')
+                        .click('@userProfileDropdown')
+                    return this.useCss();
+                },
+
+                userLogsOut: function () {
+                    return this.waitForElementVisible('@logoutButton')
+                        .click('@logoutButton');
+                }
+            }
+        ],
+
+    elements: {
+
+        logoutButton: {
+            selector: '.pull-right'
+        },
+
+        userProfileDropdown: {
+            selector: '//div[@id="topmenu-login-dropdown"]',
+            locateStrategy: 'xpath'
+        }
+    }
+};
diff --git a/test/acceptance/setup.js b/test/acceptance/setup.js
new file mode 100644
index 00000000000..51d719cb9a7
--- /dev/null
+++ b/test/acceptance/setup.js
@@ -0,0 +1,99 @@
+const {Before, After} = require('cucumber');
+const {client} = require('nightwatch-api');
+const fetch = require('node-fetch');
+let initialUsers = {};
+let dolApiKey = '';
+
+const getUsers = async function (api_key = null) {
+    const header = {};
+    let dolApiKey;
+    const url = client.globals.backend_url + 'api/index.php/users';
+    if (api_key === null) {
+        dolApiKey = client.globals.dolApiKey;
+    } else {
+        dolApiKey = api_key;
+    }
+    header['Accept'] = 'application/json';
+    header['DOLAPIKEY'] = dolApiKey;
+    await fetch(url, {
+        method: 'GET',
+        headers: header
+    })
+        .then(async (response) => {
+            client.globals.response = response;
+        });
+};
+
+const getUsersId = async function () {
+    const users = {};
+    await getUsers();
+    const json_response = await client.globals.response.json();
+    for (const user of json_response) {
+        users[user.id] = user.id;
+    }
+    return users;
+};
+
+const getDolApiKey = async function (login = null, password = null) {
+    const header = {};
+    if (login === null && password === null) {
+        login = client.globals.adminUsername;
+        password = client.globals.adminPassword;
+    }
+    const params = new URLSearchParams();
+    params.set('login', login);
+    params.set('password', password);
+    const apiKey = client.globals.backend_url + `api/index.php/login?${params.toString()}`;
+    header['Accept'] = 'application/json';
+    await fetch(apiKey, {
+        method: 'GET',
+        headers: header
+    })
+        .then(async (response) => {
+            const jsonResponse = await response.json();
+            dolApiKey = jsonResponse['success']['token'];
+            if (login === client.globals.adminUsername && password === client.globals.adminPassword) {
+                client.globals.dolApiKey = dolApiKey;
+            }
+        });
+    return dolApiKey;
+};
+
+Before(async function getAdminDolApiKey() {
+    await getDolApiKey();
+});
+
+Before(async () => {
+    initialUsers = await getUsersId();
+});
+
+After(async () => {
+    const finalUsers = await getUsersId();
+    const header = {};
+    const url = client.globals.backend_url + 'api/index.php/users/';
+    header['Accept'] = 'application/json';
+    header['DOLAPIKEY'] = client.globals.dolApiKey;
+    let found;
+    for (const finaluser in finalUsers) {
+        for (const initialuser in initialUsers) {
+            found = false;
+            if (initialuser === finaluser) {
+                found = true;
+                break;
+            }
+        }
+        if (!found) {
+            await fetch(url + finaluser, {
+                method: 'DELETE',
+                headers: header
+            })
+                .then(res => {
+                    if (res.status < 200 || res.status >= 400) {
+                        throw new Error("Failed to delete user: " + res.statusText);
+                    }
+                });
+        }
+    }
+});
+
+module.exports = {getDolApiKey, getUsers};
diff --git a/test/acceptance/stepDefinitions/addUsersContext.js b/test/acceptance/stepDefinitions/addUsersContext.js
new file mode 100644
index 00000000000..19b57403b48
--- /dev/null
+++ b/test/acceptance/stepDefinitions/addUsersContext.js
@@ -0,0 +1,179 @@
+const {Given, When, Then} = require('cucumber');
+const {client} = require('nightwatch-api');
+const fetch = require('node-fetch');
+const assert = require('assert');
+const {getDolApiKey} = require('../setup');
+let Login = {};
+
+Given('the administrator has browsed to the new users page', function () {
+    return client.page.homePage().browsedToNewUserPage();
+});
+
+When('the admin creates user with following details', function (datatable) {
+    return client.page.addUsersPage().adminCreatesUser(datatable);
+});
+
+Then('new user {string} should be created', function (lastname) {
+    return client.page.addUsersPage().newUserShouldBeCreated(lastname);
+});
+
+Then('message {string} should be displayed in the webUI', function (message) {
+    return client.page.addUsersPage().noPermissionMessage(message);
+});
+
+Then('message {string} should not be displayed in the webUI', function (message) {
+    return client.page.addUsersPage().noPermissionDefinedMessageNotShown(message);
+});
+
+Then('new user {string} should not be created', function (lastname) {
+    return client.page.addUsersPage().userNotCreated(lastname);
+});
+
+Given('a user has been created with following details', function (dataTable) {
+    return adminHasCreatedUser(dataTable);
+});
+
+Given('the admin has created the following users', function (dataTable) {
+    return adminHasCreatedUser(dataTable);
+});
+
+When('the admin creates user with following details using API', function (dataTable) {
+    return adminCreatesUserWithAPI(dataTable);
+});
+
+Given('the user with login {string} does not exist', async function (login) {
+    await userDoesNotExist(login);
+});
+
+Then('the response status code should be {string}', function (expectedStatusCode) {
+    return getStatusCode(expectedStatusCode);
+});
+
+Then('user with login {string} should exist', function (login) {
+    return userShouldExist(login);
+});
+
+Then('the response message should be {string}', function (expectedResponseMessage) {
+    return getResponseMessage(expectedResponseMessage);
+});
+
+When('the non-admin user {string} with password {string} creates user with following details using API', async function (login, password, dataTable) {
+    const userDolApikey = await getDolApiKey(login, password);
+    return userCreatesUserWithApi(dataTable, userDolApikey);
+});
+
+const createUserRequest = function (login, lastname, password, api_key = null, dolApiKey = null) {
+    const header = {};
+    const url = client.globals.backend_url + 'api/index.php/users';
+    header['Accept'] = 'application/json';
+    if (dolApiKey === null) {
+        header['DOLAPIKEY'] = client.globals.dolApiKey;
+    } else {
+        header['DOLAPIKEY'] = dolApiKey;
+    }
+    header['Content-Type'] = 'application/json';
+    return fetch(url, {
+        method: 'POST',
+        headers: header,
+        body: JSON.stringify(
+            {
+                login: login,
+                lastname: lastname,
+                pass: password,
+                api_key: api_key
+            }
+        )
+    });
+};
+
+const adminCreatesUserWithAPI = function (dataTable) {
+    const userDetails = dataTable.rowsHash();
+    return createUserRequest(userDetails['login'], userDetails['last name'], userDetails['password'])
+        .then((res) => {
+            client.globals.response = res;
+        });
+};
+
+const userCreatesUserWithApi = function (dataTable, dolApiKey) {
+    const userDetails = dataTable.rowsHash();
+    return createUserRequest(userDetails['login'], userDetails['last name'], userDetails['password'], null, dolApiKey)
+        .then((res) => {
+            client.globals.response = res;
+        });
+};
+
+const adminHasCreatedUser = async function (dataTable) {
+    const userDetails = dataTable.hashes();
+    for (const user of userDetails) {
+
+        if (user['api_key']) {
+            await createUserRequest(user['login'], user['last name'], user['password'], user['api_key'])
+                .then((response) => {
+                    if (response.status < 200 || response.status >= 400) {
+                        throw new Error('Failed to create user: ' + user['login'] +
+                            ' ' + response.statusText);
+                    }
+                });
+        } else {
+            await createUserRequest(user['login'], user['last name'], user['password'])
+                .then((response) => {
+                    if (response.status < 200 || response.status >= 400) {
+                        throw new Error('Failed to create user: ' + user['login'] +
+                            ' ' + response.statusText);
+                    }
+                });
+        }
+    }
+};
+
+const getUsersLogin = async function () {
+    const header = {};
+    const url = client.globals.backend_url + 'api/index.php/users/';
+    header['Accept'] = 'application/json';
+    header['DOLAPIKEY'] = client.globals.dolApiKey;
+    header['Content-Type'] = 'application/json';
+    await fetch(url, {
+        method: 'GET',
+        headers: header
+    })
+        .then(async (response) => {
+            const json_response = await response.json();
+            for (const user of json_response) {
+                Login[user.login] = user.login;
+            }
+        });
+};
+
+const userDoesNotExist = async function (login) {
+    await getUsersLogin();
+    if (login in Login) {
+        Login = {};
+        throw new Error(`user ${login} exists`);
+    }
+    Login = {};
+    return;
+};
+
+const userShouldExist = async function (login) {
+    await getUsersLogin();
+    if (login in Login) {
+        Login = {};
+        return;
+    } else {
+        Login = {};
+        throw new Error(`User ${login} does not Exist`);
+    }
+};
+
+const getStatusCode = async function (expectedStatusCode) {
+    const actualStatusCode = client.globals.response.status.toString();
+    return assert.strictEqual(actualStatusCode, expectedStatusCode,
+        `The expected status code was ${expectedStatusCode} but got ${actualStatusCode}`);
+};
+
+const getResponseMessage = async function (expectedResponseMessage) {
+    const json_response = await client.globals.response.json();
+    const actualResponseMessage = json_response['error']['0'];
+    return assert.strictEqual(actualResponseMessage, expectedResponseMessage,
+        `the expected response message was ${expectedResponseMessage} but got ${actualResponseMessage}`);
+};
diff --git a/test/acceptance/stepDefinitions/listUsersContext.js b/test/acceptance/stepDefinitions/listUsersContext.js
new file mode 100644
index 00000000000..8acbcd766bb
--- /dev/null
+++ b/test/acceptance/stepDefinitions/listUsersContext.js
@@ -0,0 +1,62 @@
+const {When, Then} = require('cucumber');
+const {client} = require('nightwatch-api');
+const {getDolApiKey, getUsers} = require('../setup');
+const assert = require('assert');
+
+When('the administrator browses to the list of users page using the webUI', function () {
+    return client.page.homePage().browsedToListOfUsers();
+});
+
+Then('following users should be displayed in the users list', function (dataTable) {
+    return client.page.listUsersPage().listOfUsersDisplayed(dataTable);
+});
+
+Then('the number of created users should be {int}', function (number) {
+    return client.page.listUsersPage().numberOfUsersDisplayed(number);
+});
+
+When('the admin gets the list of all users using the API', function () {
+    return getUsers();
+});
+
+Then('the user list returned by API should be following', function (dataTable) {
+    return theUsersShouldBe(dataTable);
+});
+
+When('user {string} with password {string} tries to list all users using the API', async function (login, password) {
+    const userDolApikey = await getDolApiKey(login, password);
+    return getUsers(userDolApikey);
+});
+
+Then('the error message should be {string}', function (errorMessage) {
+    return getErrorMessage(errorMessage);
+});
+
+const theUsersShouldBe = async function (dataTable) {
+    const expectedUsers = dataTable.hashes();
+    let users = {};
+    const json_response = await client.globals.response.json();
+
+    for (const expectedUser of expectedUsers) {
+        let found;
+        for (const user of json_response) {
+            users["login"] = user.login;
+            users["last name"] = user.lastname;
+            found = false;
+            if (expectedUser["login"] === users.login && expectedUser["last name"] === users["last name"]) {
+                found = true;
+                break;
+            } else {
+                found = false;
+            }
+        }
+        assert.strictEqual(found, true);
+    }
+};
+
+const getErrorMessage = async function (expectedErrorMessage) {
+    const json_response = await client.globals.response.json();
+    const actualErrorMessage = json_response['error']['message'];
+    return assert.strictEqual(actualErrorMessage, expectedErrorMessage,
+        `the expected response message was ${expectedErrorMessage} but got ${actualErrorMessage}`);
+};
diff --git a/test/acceptance/stepDefinitions/loginContext.js b/test/acceptance/stepDefinitions/loginContext.js
new file mode 100644
index 00000000000..686b3715597
--- /dev/null
+++ b/test/acceptance/stepDefinitions/loginContext.js
@@ -0,0 +1,28 @@
+const {Given, When, Then} = require('cucumber')
+const {client} = require('nightwatch-api')
+
+Given('the administrator has logged in using the webUI', async function () {
+	await client.page.loginPage().navigate().waitForLoginPage();
+	await client.page.loginPage().userLogsInWithUsernameAndPassword(client.globals.adminUsername, client.globals.adminPassword);
+	return client.page.loginPage().userIsLoggedIn(client.globals.adminUsername);
+});
+
+Given('the user has browsed to the login page', function () {
+    return client.page.loginPage().navigate();
+});
+
+When('user logs in with username {string} and password {string}', function (username, password) {
+    return client.page.loginPage().userLogsInWithUsernameAndPassword(username, password);
+});
+
+Then('the user should be directed to the homepage', function () {
+    return client.page.loginPage().successfulLogin();
+});
+
+Then('the user should not be able to login', function () {
+    return client.page.loginPage().unsuccessfulLogin();
+});
+
+Then('error message {string} should be displayed in the webUI', function (errormessage) {
+    return client.page.loginPage().loginErrorDisplayed(errormessage);
+});
diff --git a/test/acceptance/stepDefinitions/logoutContext.js b/test/acceptance/stepDefinitions/logoutContext.js
new file mode 100644
index 00000000000..ec264ae5e26
--- /dev/null
+++ b/test/acceptance/stepDefinitions/logoutContext.js
@@ -0,0 +1,14 @@
+const {When, Then} = require('cucumber');
+const {client} = require('nightwatch-api');
+
+When('the user opens the user profile using the webUI', function () {
+    return client.page.logoutPage().userOpensProfile();
+});
+
+When('the user logs out using the webUI', function () {
+    return client.page.logoutPage().userLogsOut();
+});
+
+Then('the user should be logged out successfully', function () {
+    return client.page.loginPage().waitForLoginPage();
+});
diff --git a/test/test_serialize.php b/test/other/test_serialize.php
similarity index 100%
rename from test/test_serialize.php
rename to test/other/test_serialize.php
diff --git a/test/phpunit/AdminLibTest.php b/test/phpunit/AdminLibTest.php
index e3c38c1df86..c7b5aee9e37 100644
--- a/test/phpunit/AdminLibTest.php
+++ b/test/phpunit/AdminLibTest.php
@@ -165,13 +165,17 @@ class AdminLibTest extends PHPUnit\Framework\TestCase
 		require_once dirname(__FILE__).'/../../htdocs/core/modules/modExpenseReport.class.php';
 		print "Enable module modExpenseReport";
 		$moduledescriptor=new modExpenseReport($db);
-		$moduledescriptor->init();
+		$result = $moduledescriptor->init();
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(1, $result);
 		$conf->setValues($db);
 
 		require_once dirname(__FILE__).'/../../htdocs/core/modules/modApi.class.php';
 		print "Enable module modAPI";
 		$moduledescriptor=new modApi($db);
-		$moduledescriptor->init();
+		$result = $moduledescriptor->init();
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(1, $result);
 		$conf->setValues($db);
     }
 }
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index 09c075c1083..163bf320075 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -242,11 +242,6 @@ class AllTests
         require_once dirname(__FILE__).'/ScriptsTest.php';
         $suite->addTestSuite('ScriptsTest');
 
-        require_once dirname(__FILE__).'/FormAdminTest.php';
-        $suite->addTestSuite('FormAdminTest');
-        require_once dirname(__FILE__).'/FormTest.php';
-        $suite->addTestSuite('FormTest');
-
         require_once dirname(__FILE__).'/ModulesTest.php';  // At end because it's the longer
         $suite->addTestSuite('ModulesTest');
 
@@ -254,10 +249,15 @@ class AllTests
         // GUI
         require_once dirname(__FILE__).'/FormAdminTest.php';
         $suite->addTestSuite('FormAdminTest');
+        require_once dirname(__FILE__).'/FormTest.php';
+        $suite->addTestSuite('FormTest');
 
 
+        // Payment services
         require_once dirname(__FILE__).'/PaypalTest.php';
         $suite->addTestSuite('PaypalTest');
+        require_once dirname(__FILE__).'/StripeTest.php';
+        $suite->addTestSuite('StripeTest');
 
         return $suite;
     }
diff --git a/test/phpunit/BOMTest.php b/test/phpunit/BOMTest.php
index 39268bdeaea..872d0b09d18 100644
--- a/test/phpunit/BOMTest.php
+++ b/test/phpunit/BOMTest.php
@@ -148,4 +148,30 @@ class BOMTest extends PHPUnit\Framework\TestCase
 
 		return $result;
 	}
+
+	/**
+	 * testBOMDelete
+	 *
+	 * @param	int		$id		Id of object
+	 * @return	void
+	 *
+	 * @depends	testBOMCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testBOMDelete($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$localobject=new BOM($this->savdb);
+		$result=$localobject->fetch($id);
+		$result=$localobject->delete($user);
+
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $result;
+	}
 }
diff --git a/test/phpunit/CategorieTest.php b/test/phpunit/CategorieTest.php
index a62d362a972..189ef10ecdc 100644
--- a/test/phpunit/CategorieTest.php
+++ b/test/phpunit/CategorieTest.php
@@ -244,7 +244,7 @@ class CategorieTest extends PHPUnit\Framework\TestCase
     /**
      * testCategorieUpdate
      *
-     * @param   Category        $localobject        Category
+     * @param   Categorie        $localobject        Category
      * @return  int
 
      * @depends testCategorieFetch
@@ -269,7 +269,7 @@ class CategorieTest extends PHPUnit\Framework\TestCase
     /**
      * testCategorieOther
      *
-     * @param   Category    $localobject    Category
+     * @param   Categorie    $localobject    Category
      * @return  int
      *
      * @depends testCategorieUpdate
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index b819671578c..9acb13432d2 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -255,7 +255,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
                 //if ($reg[0] != 'db') $ok=false;
             }
             //print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-            $this->assertTrue($ok, 'Found a $this->db->idate to forge a sql request without quotes around this date field '.$file['relativename'].' :: '.$val[0]);
+            $this->assertTrue($ok, 'Found a $this->db->idate to forge a sql request without quotes around this date field '.$file['relativename']);
             //exit;
 
 
@@ -274,14 +274,14 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
                 //if ($reg[0] != 'db') $ok=false;
             }
             //print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-            $this->assertTrue($ok, 'Found non escaped string in building of a sql request '.$file['relativename'].': '.$val[0].' - Bad.');
+            $this->assertTrue($ok, 'Found non escaped string in building of a sql request '.$file['relativename'].' - Bad.');
             //exit;
 
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
             preg_match_all('/sql.+\s*\'"\s*\.\s*\$(.........)/', $filecontent, $matches, PREG_SET_ORDER);
             foreach ($matches as $key => $val)
             {
-            	if (! in_array($val[1], array('this->db-', 'this->esc', 'db->escap', 'db->idate', 'excludeGr', 'includeGr'))) {
+            	if (! in_array($val[1], array('this->db-', 'this->esc', 'db->escap', 'dbsession', 'db->idate', 'excludeGr', 'includeGr'))) {
             		$ok=false;
             		break;
             	}
@@ -341,7 +341,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
             $ok=true;
             $matches=array();
             // Check string   name="token" value="'.$_SESSINON
-            preg_match_all('/name="token" value="\'\.\$_SESSION/', $filecontent, $matches, PREG_SET_ORDER);
+            preg_match_all('/name="token" value="\'\s*\.\s*\$_SESSION/', $filecontent, $matches, PREG_SET_ORDER);
             foreach ($matches as $key => $val)
             {
             	if ($file['name'] != 'excludefile.php')
diff --git a/test/phpunit/CodingSqlTest.php b/test/phpunit/CodingSqlTest.php
index 245a7869811..3e065bb141c 100644
--- a/test/phpunit/CodingSqlTest.php
+++ b/test/phpunit/CodingSqlTest.php
@@ -170,7 +170,7 @@ class CodingSqlTest extends PHPUnit\Framework\TestCase
                 $filecontent = str_replace('`rank`', '_rank_', $filecontent);
 
                 $result=strpos($filecontent, '`');
-                print __METHOD__." Result for checking we don't have back quote = ".$result."\n";
+                //print __METHOD__." Result for checking we don't have back quote = ".$result."\n";
                 $this->assertTrue($result===false, 'Found back quote into '.$file.'. Bad.');
 
                 $result=strpos($filecontent, '"');
@@ -178,27 +178,27 @@ class CodingSqlTest extends PHPUnit\Framework\TestCase
                 {
                 	$result=(! strpos($filecontent, '["') && ! strpos($filecontent, '{"'));
                 }
-                print __METHOD__." Result for checking we don't have double quote = ".$result."\n";
+                //print __METHOD__." Result for checking we don't have double quote = ".$result."\n";
                 $this->assertTrue($result===false, 'Found double quote that is not [" neither {" (used for json content) into '.$file.'. Bad.');
 
                 $result=strpos($filecontent, 'int(');
-                print __METHOD__." Result for checking we don't have 'int(' instead of 'integer' = ".$result."\n";
+                //print __METHOD__." Result for checking we don't have 'int(' instead of 'integer' = ".$result."\n";
                 $this->assertTrue($result===false, 'Found int(x) or tinyint(x) instead of integer or tinyint into '.$file.'. Bad.');
 
                 $result=strpos($filecontent, 'ON DELETE CASCADE');
-                print __METHOD__." Result for checking we don't have 'ON DELETE CASCADE' = ".$result."\n";
+                //print __METHOD__." Result for checking we don't have 'ON DELETE CASCADE' = ".$result."\n";
                 $this->assertTrue($result===false, 'Found ON DELETE CASCADE into '.$file.'. Bad.');
 
                 $result=strpos($filecontent, 'NUMERIC(');
-                print __METHOD__." Result for checking we don't have 'NUMERIC(' = ".$result."\n";
+                //print __METHOD__." Result for checking we don't have 'NUMERIC(' = ".$result."\n";
                 $this->assertTrue($result===false, 'Found NUMERIC( into '.$file.'. Bad.');
 
                 $result=strpos($filecontent, 'NUMERIC(');
-                print __METHOD__." Result for checking we don't have 'curdate(' = ".$result."\n";
+                //print __METHOD__." Result for checking we don't have 'curdate(' = ".$result."\n";
                 $this->assertTrue($result===false, 'Found curdate( into '.$file.'. Bad. Current date must be generated with PHP.');
 
                 $result=strpos($filecontent, 'integer(');
-                print __METHOD__." Result for checking we don't have 'integer(' = ".$result."\n";
+                //print __METHOD__." Result for checking we don't have 'integer(' = ".$result."\n";
                 $this->assertTrue($result===false, 'Found value in parenthesis after the integer. It must be integer not integer(x) into '.$file.'. Bad.');
 
                 if ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/migration')
@@ -214,11 +214,11 @@ class CodingSqlTest extends PHPUnit\Framework\TestCase
                     } else {
                         // Test for non key files only
                         $result=(strpos($filecontent, 'KEY ') && strpos($filecontent, 'PRIMARY KEY') == 0);
-                        print __METHOD__." Result for checking we don't have ' KEY ' instead of a sql file to create index = ".$result."\n";
+                        //print __METHOD__." Result for checking we don't have ' KEY ' instead of a sql file to create index = ".$result."\n";
                         $this->assertTrue($result===false, 'Found KEY into '.$file.'. Bad.');
 
                         $result=stripos($filecontent, 'ENGINE=innodb');
-                        print __METHOD__." Result for checking we have the ENGINE=innodb string = ".$result."\n";
+                        //print __METHOD__." Result for checking we have the ENGINE=innodb string = ".$result."\n";
                         $this->assertGreaterThan(0, $result, 'The ENGINE=innodb was not found into '.$file.'. Add it or just fix syntax to match case.');
                     }
                 }
diff --git a/test/phpunit/ContactTest.php b/test/phpunit/ContactTest.php
index 0c5687e67c9..7d7e2740bc1 100755
--- a/test/phpunit/ContactTest.php
+++ b/test/phpunit/ContactTest.php
@@ -334,25 +334,6 @@ class ContactTest extends PHPUnit\Framework\TestCase
     	return $result;
     }
 
-    /**
-	 *	testContactStatic
-	 *
-	 *	@return	void
-     */
-    public function testContactStatic()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $localobject=new Contact($db);
-
-
-        return;
-    }
-
     /**
      * testContactGetFullAddress
      *
diff --git a/test/phpunit/CoreTest.php b/test/phpunit/CoreTest.php
index 87c43798a0f..22649a80724 100644
--- a/test/phpunit/CoreTest.php
+++ b/test/phpunit/CoreTest.php
@@ -236,173 +236,4 @@ class CoreTest extends PHPUnit\Framework\TestCase
 
         return true;
     }
-
-
-    /**
-     * testSqlAndScriptInject
-     *
-     * @return  void
-     */
-    public function testSqlAndScriptInject()
-    {
-        global $dolibarr_main_prod;
-
-        global $dolibarr_main_url_root;
-        global $dolibarr_main_data_root;
-        global $dolibarr_main_document_root;
-        global $dolibarr_main_data_root_alt;
-        global $dolibarr_main_document_root_alt;
-        global $dolibarr_main_db_host;
-        global $dolibarr_main_db_port;
-        global $dolibarr_main_db_type;
-        global $dolibarr_main_db_prefix;
-
-
-        // This is code copied from main.inc.php !!!!!!!!!!!!!!!
-
-        // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-        /**
-         * Security: SQL Injection and XSS Injection (scripts) protection (Filters on GET, POST, PHP_SELF).
-         *
-         * @param       string $val     Value
-         * @param       string $type    1=GET, 0=POST, 2=PHP_SELF
-         * @return      int             >0 if there is an injection
-         */
-        function testSqlAndScriptInject($val, $type)
-        {
-            // phpcs:enable
-		    $inj = 0;
-		    // For SQL Injection (only GET and POST are used to be included into bad escaped SQL requests)
-		    if ($type != 2)
-		    {
-		        $inj += preg_match('/delete\s+from/i', $val);
-		        $inj += preg_match('/create\s+table/i', $val);
-		        $inj += preg_match('/update.+set.+=/i', $val);
-		        $inj += preg_match('/insert\s+into/i', $val);
-		        $inj += preg_match('/select.+from/i', $val);
-		        $inj += preg_match('/union.+select/i', $val);
-		        $inj += preg_match('/into\s+(outfile|dumpfile)/i', $val);
-		        $inj += preg_match('/(\.\.%2f)+/i', $val);
-		    }
-		    // For XSS Injection done by adding javascript with script
-		    // This is all cases a browser consider text is javascript:
-		    // When it found '<script', 'javascript:', '<style', 'onload\s=' on body tag, '="&' on a tag size with old browsers
-		    // All examples on page: http://ha.ckers.org/xss.html#XSScalc
-		    // More on https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet
-		    $inj += preg_match('/<script/i', $val);
-		    $inj += preg_match('/<iframe/i', $val);
-			$inj += preg_match('/Set\.constructor/i', $val);	// ECMA script 6
-		    if (! defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
-		    $inj += preg_match('/base[\s]+href/si', $val);
-		    $inj += preg_match('/<.*onmouse/si', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
-		    $inj += preg_match('/onerror\s*=/i', $val);       // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
-		    $inj += preg_match('/onfocus\s*=/i', $val);       // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
-		    $inj += preg_match('/onload\s*=/i', $val);        // onload can be set on svg tag <svg/onload=alert(1)> or other tag like body <body onload=alert(1)>
-		    //$inj += preg_match('/on[A-Z][a-z]+\*=/', $val);   // To lock event handlers onAbort(), ...
-			$inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val);		// refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
-			//if ($type == 1)
-		    //{
-				$inj += preg_match('/javascript:/i', $val);
-		        $inj += preg_match('/vbscript:/i', $val);
-		    //}
-		    // For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)
-		    if ($type == 1) $inj += preg_match('/"/i', $val);		// We refused " in GET parameters value
-		    if ($type == 2) $inj += preg_match('/[;"]/', $val);		// PHP_SELF is a file system path. It can contains spaces.
-		    return $inj;
-        }
-
-        // Run tests
-        // More on https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet
-
-        // Should be OK
-        $expectedresult=0;
-
-        $_SERVER["PHP_SELF"]='/DIR WITH SPACE/htdocs/admin/index.php?mainmenu=home&leftmenu=setup&username=weservices';
-        $result=testSqlAndScriptInject($_SERVER["PHP_SELF"], 2);
-        $this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject 1a');
-
-        // Should detect XSS
-        $expectedresult=1;
-
-        $_SERVER["PHP_SELF"]='/DIR WITH SPACE/htdocs/admin/index.php?mainmenu=home&leftmenu=setup&username=weservices;badaction';
-        $result=testSqlAndScriptInject($_SERVER["PHP_SELF"], 2);
-        $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject 1b');
-
-        $test="<img src='1.jpg' onerror =javascript:alert('XSS')>";
-        $result=testSqlAndScriptInject($test, 0);
-        $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa');
-
-        $test="<img src='1.jpg' onerror =javascript:alert('XSS')>";
-        $result=testSqlAndScriptInject($test, 2);
-        $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa2');
-
-        $test='<IMG SRC=# onmouseover="alert(1)">';
-        $result=testSqlAndScriptInject($test, 0);
-        $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa3');
-        $test='<IMG SRC onmouseover="alert(1)">';
-        $result=testSqlAndScriptInject($test, 0);
-        $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa4');
-        $test='<IMG onmouseover="alert(1)">';
-        $result=testSqlAndScriptInject($test, 0);
-        $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa5');
-        $test='<IMG SRC=/ onerror="alert(1)">';
-        $result=testSqlAndScriptInject($test, 0);
-        $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa6');
-		$test='<IMG SRC=" &#14;  javascript:alert(1);">';
-		$result=testSqlAndScriptInject($test, 0);
-		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa7');
-
-		$test='<IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#39;&#88;&#83;&#83;&#39;&#41;>';
-		$result=testSqlAndScriptInject($test, 0);
-        $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject bbb');
-
-        $test='<SCRIPT SRC=http://xss.rocks/xss.js></SCRIPT>';
-        $result=testSqlAndScriptInject($test, 0);
-        $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject ccc');
-
-        $test='<IMG SRC="javascript:alert(\'XSS\');">';
-        $result=testSqlAndScriptInject($test, 1);
-        $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject ddd');
-
-        $test='<IMG """><SCRIPT>alert("XSS")</SCRIPT>">';
-        $result=testSqlAndScriptInject($test, 0);
-        $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject eee');
-
-        $test='<!-- Google analytics -->
-			<script>
-			  (function(i,s,o,g,r,a,m){i[\'GoogleAnalyticsObject\']=r;i[r]=i[r]||function(){
-			  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-			  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-			  })(window,document,\'script\',\'https://www.google-analytics.com/analytics.js\',\'ga\');
-
-			  ga(\'create\',\'UA-99999999-9\', \'auto\');
-			  ga(\'send\', \'pageview\');
-
-			</script>';
-        $result=testSqlAndScriptInject($test, 0);
-        $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject eee');
-
-        $test="<IMG SRC=\"jav\tascript:alert('XSS');\">";		// Is locked by some browser like chrome because the default directive no-referrer-when-downgrade is sent when requesting the SRC and then refused because of browser protection on img src load without referrer.
-		$test="<IMG SRC=\"jav&#x0D;ascript:alert('XSS');\">";	// Same
-
-		$test='<SCRIPT/XSS SRC="http://xss.rocks/xss.js"></SCRIPT>';
-		$result=testSqlAndScriptInject($test, 0);
-		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject fff1');
-		$test='<SCRIPT/SRC="http://xss.rocks/xss.js"></SCRIPT>';
-		$result=testSqlAndScriptInject($test, 0);
-		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject fff2');
-
-		// This case seems to be filtered by browsers now.
-		$test='<BODY onload!#$%&()*~+-_.,:;?@[/|\]^`=alert(1)>';
-		//$result=testSqlAndScriptInject($test, 0);
-		//$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject ggg');
-
-		$test='<iframe src=http://xss.rocks/scriptlet.html <';
-		$result=testSqlAndScriptInject($test, 0);
-		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject hhh');
-
-		$test='Set.constructor`alert\x281\x29```';
-		$result=testSqlAndScriptInject($test, 0);
-		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject iii');
-    }
 }
diff --git a/test/phpunit/ExpenseReportTest.php b/test/phpunit/ExpenseReportTest.php
index 3f6402262c3..2d6fdca3b27 100644
--- a/test/phpunit/ExpenseReportTest.php
+++ b/test/phpunit/ExpenseReportTest.php
@@ -281,15 +281,9 @@ class ExpenseReportTest extends PHPUnit\Framework\TestCase
         $langs=$this->savlangs;
         $db=$this->savdb;
 
-        /*$result=$localobject->setstatus(0);
+        $result=$localobject->getSumPayments();
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        */
-
-        /*$localobject->info($localobject->id);
-        print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
-        $this->assertNotEquals($localobject->date_creation, '');
-        */
+        $this->assertGreaterThanOrEqual(0, $result);
 
         return $localobject->id;
     }
@@ -316,7 +310,7 @@ class ExpenseReportTest extends PHPUnit\Framework\TestCase
         $result=$localobject->delete($user);
 
         print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+        $this->assertGreaterThan(0, $result);
         return $result;
     }
 }
diff --git a/test/phpunit/ExportTest.php b/test/phpunit/ExportTest.php
index 2a3cb079baf..0f5b0bd82e3 100644
--- a/test/phpunit/ExportTest.php
+++ b/test/phpunit/ExportTest.php
@@ -149,7 +149,7 @@ class ExportTest extends PHPUnit\Framework\TestCase
         $file = "export_".$model.".modules.php";
         $classname = "Export".$model;
         require_once $dir.$file;
-        $objmodel = new $classname($this->db);
+        $objmodel = new $classname($db);
 
         // First test without option USE_STRICT_CSV_RULES
         unset($conf->global->USE_STRICT_CSV_RULES);
@@ -364,7 +364,7 @@ class ExportTest extends PHPUnit\Framework\TestCase
         	$sql = "";
 			$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
 			$expectedresult = 1;
-	        $this->assertEquals($expectedresult, $result, "Call build_file() to export ".$exportfile.' failed');
+	        $this->assertEquals($expectedresult, $result, "Call build_file() to export ".$exportfile.' failed: '.$objexport->error);
 	        $result=dol_is_file($exportfile);
 	        $this->assertTrue($result, 'File '.$exportfile.' not found');
         }
diff --git a/test/phpunit/FactureRecTest.php b/test/phpunit/FactureRecTest.php
index 3778989945a..0250b659e47 100644
--- a/test/phpunit/FactureRecTest.php
+++ b/test/phpunit/FactureRecTest.php
@@ -183,22 +183,18 @@ class FactureRecTest extends PHPUnit\Framework\TestCase
     {
         $retAr=array();
 
-        if (get_class($oA) !== get_class($oB))
-        {
+        if (get_class($oA) !== get_class($oB)) {
             $retAr[]="Supplied objects are not of same class.";
         } else {
             $oVarsA=get_object_vars($oA);
             $oVarsB=get_object_vars($oB);
             $aKeys=array_keys($oVarsA);
-            foreach ($aKeys as $sKey)
-            {
+            foreach ($aKeys as $sKey) {
                 if (in_array($sKey, $fieldstoignorearray)) continue;
-                if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey])
-                {
+                if (! $ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
                     $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
                 }
-                if ($ignoretype && $oVarsA[$sKey] != $oVarsB[$sKey])
-                {
+                if ($ignoretype && ($oVarsA[$sKey] != $oVarsB[$sKey])) {
                     $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
                 }
             }
diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php
index dc34b061806..64959e1cd4f 100644
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@@ -239,9 +239,10 @@ class FactureTest extends PHPUnit\Framework\TestCase
 			array(
 				'newref','oldref','id','lines','client','thirdparty','brouillon','user_author','date_creation','date_validation','datem','date_modification',
 				'ref','statut','paye','specimen','ref','actiontypecode','actionmsg2','actionmsg','mode_reglement','cond_reglement',
-				'cond_reglement_doc','situation_cycle_ref','situation_counter','situation_final','multicurrency_total_ht','multicurrency_total_tva',
-				'multicurrency_total_ttc','fk_multicurrency','multicurrency_code','multicurrency_tx',
-                'retained_warranty' ,'retained_warranty_date_limit', 'retained_warranty_fk_cond_reglement'
+				'cond_reglement_doc', 'modelpdf',
+				'multicurrency_total_ht','multicurrency_total_tva',	'multicurrency_total_ttc','fk_multicurrency','multicurrency_code','multicurrency_tx',
+				'retained_warranty' ,'retained_warranty_date_limit', 'retained_warranty_fk_cond_reglement', 'specimen', 'situation_cycle_ref', 'situation_counter', 'situation_final',
+				'trackid','user_creat','user_valid'
 			)
 		);
         $this->assertEquals($arraywithdiff, array());    // Actual, Expected
@@ -362,22 +363,18 @@ class FactureTest extends PHPUnit\Framework\TestCase
     {
         $retAr=array();
 
-        if (get_class($oA) !== get_class($oB))
-        {
+        if (get_class($oA) !== get_class($oB)) {
             $retAr[]="Supplied objects are not of same class.";
         } else {
             $oVarsA=get_object_vars($oA);
             $oVarsB=get_object_vars($oB);
             $aKeys=array_keys($oVarsA);
-            foreach ($aKeys as $sKey)
-            {
+            foreach ($aKeys as $sKey) {
                 if (in_array($sKey, $fieldstoignorearray)) continue;
-                if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey])
-                {
+                if (! $ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
                     $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
                 }
-                if ($ignoretype && $oVarsA[$sKey] != $oVarsB[$sKey])
-                {
+                if ($ignoretype && ($oVarsA[$sKey] != $oVarsB[$sKey])) {
                     $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
                 }
             }
diff --git a/test/phpunit/FormTest.php b/test/phpunit/FormTest.php
index bec23048e9f..76e7c4e69a8 100644
--- a/test/phpunit/FormTest.php
+++ b/test/phpunit/FormTest.php
@@ -143,14 +143,14 @@ class FormTest extends PHPUnit\Framework\TestCase
 		$result=$localobject->select_produits_list('', 'productid', '', 5, 0, '', 1, 2, 1);
 
     	$this->assertEquals(count($result), 5);
-    	print __METHOD__." result=".$result."\n";
+    	print __METHOD__." count result=".count($result)."\n";
 
     	$conf->global->ENTREPOT_EXTRA_STATUS = 1;
 
     	// Exclude stock in warehouseinternal
     	$result=$localobject->select_produits_list('', 'productid', '', 5, 0, '', 1, 2, 1, 0, '1', 0, '', 0, 'warehouseclosed,warehouseopen');
     	$this->assertEquals(count($result), 5);
-    	print __METHOD__." result=".$result."\n";
+    	print __METHOD__." count result=".count($result)."\n";
 
     	return $result;
     }
diff --git a/test/phpunit/Functions2LibTest.php b/test/phpunit/Functions2LibTest.php
index 21fa1f29257..be050b83b4f 100644
--- a/test/phpunit/Functions2LibTest.php
+++ b/test/phpunit/Functions2LibTest.php
@@ -148,6 +148,13 @@ class Functions2LibTest extends PHPUnit\Framework\TestCase
      */
     public function testIsValidMailDomain()
     {
+    	$mail = 'bidon@unvalid.unvalid';
+    	$result = isValidMailDomain($mail);
+    	$this->assertEquals(0, $result, 'Email isValidMailDomain('.$mail.') should return 0 (not valid) but returned '.$result);
+
+    	$mail = 'bidon@dolibarr.org';
+    	$result = isValidMailDomain($mail);
+    	$this->assertEquals(1, $result, 'Email isValidMailDomain('.$mail.') should return 1 (valid) but returned '.$result);
     }
 
     /**
diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index d113cde8035..7cbb6af5955 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -1225,7 +1225,18 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
      */
     public function testDolPrice2Num()
     {
-        $this->assertEquals(1000, price2num('1 000.0'));
+    	global $langs, $conf;
+
+    	$oldlangs = $langs;
+
+    	$newlangs = new Translate('', $conf);
+    	$newlangs->setDefaultLang('en_US');
+    	$newlangs->load("main");
+    	$langs = $newlangs;
+
+    	$this->assertEquals(150, price2num('(SELECT/**/CASE/**/WHEN/**/(0<1)/**/THEN/**/SLEEP(5)/**/ELSE/**/SLEEP(0)/**/END)'));
+
+    	$this->assertEquals(1000, price2num('1 000.0'));
         $this->assertEquals(1000, price2num('1 000', 'MT'));
         $this->assertEquals(1000, price2num('1 000', 'MU'));
 
@@ -1239,9 +1250,58 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
         $this->assertEquals(1000.13, price2num('1 000.125456', 'MT'));
         $this->assertEquals(1000.12546, price2num('1 000.125456', 'MU'), "Test MU");
 
+        $this->assertEquals(1, price2num('1.000'), 'Test 1.000 give 1 with english language');
+
         // Text can't be converted
         $this->assertEquals('12.4$', price2num('12.4$'));
-        $this->assertEquals('12r.4$', price2num('12r.4$'));
+        $this->assertEquals('12.4$', price2num('12r.4$'));
+
+        // For spanish language
+        $newlangs2 = new Translate('', $conf);
+        $newlangs2->setDefaultLang('es_ES');
+        $newlangs2->load("main");
+        $langs = $newlangs2;
+
+        // Test with 3 chars after . or ,
+        // If a . is used and there is 3 digits after, it is a thousand separator
+        $this->assertEquals(1234, price2num('1.234', '', 2), 'Test 1.234 give 1234 with spanish language if user input');
+        $this->assertEquals(1.234, price2num('1,234', '', 2), 'Test 1,234 give 1234 with spanish language if user input');
+        $this->assertEquals(1234, price2num('1 234', '', 2), 'Test 1 234 give 1234 with spanish language if user input');
+        $this->assertEquals(-1.234, price2num('-1.234'), 'Test 1.234 give 1.234 with spanish language');
+        $this->assertEquals(-1.234, price2num('-1,234'), 'Test 1,234 give 1234 with spanish language');
+        $this->assertEquals(-1234, price2num('-1 234'), 'Test 1 234 give 1234 with spanish language');
+        $this->assertEquals(21500123, price2num('21.500.123'), 'Test 21.500.123 give 21500123 with spanish language');
+        $this->assertEquals(21500123, price2num('21500.123', 0, 2), 'Test 21500.123 give 21500123 with spanish language if user input');
+        $this->assertEquals(21500.123, price2num('21500.123'), 'Test 21500.123 give 21500123 with spanish language');
+        $this->assertEquals(21500.123, price2num('21500,123'), 'Test 21500,123 give 21500.123 with spanish language');
+        // Test with 2 digits
+        $this->assertEquals(21500.12, price2num('21500.12'), 'Test 21500.12 give 21500.12 with spanish language');
+        $this->assertEquals(21500.12, price2num('21500,12'), 'Test 21500,12 give 21500.12 with spanish language');
+        // Test with 3 digits
+        $this->assertEquals(12123, price2num('12.123', '', 2), 'Test 12.123 give 12123 with spanish language if user input');
+        $this->assertEquals(12.123, price2num('12,123', '', 2), 'Test 12,123 give 12.123 with spanish language if user input');
+        $this->assertEquals(12.123, price2num('12.123'), 'Test 12.123 give 12.123 with spanish language');
+        $this->assertEquals(12.123, price2num('12,123'), 'Test 12,123 give 12.123 with spanish language');
+
+        // For french language
+        $newlangs3 = new Translate('', $conf);
+        $newlangs3->setDefaultLang('fr_FR');
+        $newlangs3->load("main");
+        $langs = $newlangs3;
+
+        $this->assertEquals(1, price2num('1.000', '', 2), 'Test 1.000 give 1 with french language if user input');
+        $this->assertEquals(1, price2num('1.000'), 'Test 1.000 give 1 with french language');
+        $this->assertEquals(1000, price2num('1 000'), 'Test 1.000 give 1 with french language');
+        $this->assertEquals(1.234, price2num('1.234', '', 2), 'Test 1.234 give 1.234 with french language if user input');
+        $this->assertEquals(1.234, price2num('1.234'), 'Test 1.234 give 1.234 with french language');
+        $this->assertEquals(1.234, price2num('1,234', '', 2), 'Test 1,234 give 1.234 with french language if user input');
+        $this->assertEquals(1.234, price2num('1,234'), 'Test 1,234 give 1.234 with french language');
+        $this->assertEquals(21500000, price2num('21500 000'), 'Test 21500 000 give 21500000 with french language');
+        $this->assertEquals(21500000, price2num('21 500 000'), 'Test 21 500 000 give 21500000 with french language');
+        $this->assertEquals(21500, price2num('21500.00'), 'Test 21500.00 give 21500 with french language');
+        $this->assertEquals(21500, price2num('21500,00'), 'Test 21500,00 give 21500 with french language');
+
+        $langs = $oldlangs;
 
         return true;
     }
@@ -1257,9 +1317,6 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
 
         $conf->global->MAIN_START_WEEK = 0;
 
-        $tmp=dol_getdate(1);				// 1/1/1970 and 1 second = thirday
-        $this->assertEquals(4, $tmp['wday']);
-
         $tmp=dol_getdate(24*60*60+1);		// 2/1/1970 and 1 second = friday
         $this->assertEquals(5, $tmp['wday']);
 
@@ -1271,12 +1328,77 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
         $tmp=dol_getdate(24*60*60+1);		// 2/1/1970 and 1 second = friday
         $this->assertEquals(5, $tmp['wday']);
 
+        $tmp=dol_getdate(1, false, "Europe/Paris");						// 1/1/1970 and 1 second = thirday
+        $this->assertEquals(1970, $tmp['year']);
+        $this->assertEquals(1, $tmp['mon']);
+        $this->assertEquals(1, $tmp['mday']);
+        $this->assertEquals(4, $tmp['wday']);
+        $this->assertEquals(0, $tmp['yday']);
+        $this->assertEquals(1, $tmp['hours']);		// We are winter, so we are GMT+1 even during summer
+        $this->assertEquals(0, $tmp['minutes']);
+        $this->assertEquals(1, $tmp['seconds']);
+
+        $tmp=dol_getdate(15638401, false, "Europe/Paris");					// 1/7/1970 and 1 second = wednesday
+        $this->assertEquals(1970, $tmp['year']);
+        $this->assertEquals(7, $tmp['mon']);
+        $this->assertEquals(1, $tmp['mday']);
+        $this->assertEquals(3, $tmp['wday']);
+        $this->assertEquals(181, $tmp['yday']);
+        $this->assertEquals(1, $tmp['hours']);		// There is no daylight in 1970, so we are GMT+1 even during summer
+        $this->assertEquals(0, $tmp['minutes']);
+        $this->assertEquals(1, $tmp['seconds']);
+
+        $tmp=dol_getdate(1593561601, false, "Europe/Paris");				// 1/7/2020 and 1 second = wednesday
+        $this->assertEquals(2020, $tmp['year']);
+        $this->assertEquals(7, $tmp['mon']);
+        $this->assertEquals(1, $tmp['mday']);
+        $this->assertEquals(3, $tmp['wday']);
+        $this->assertEquals(182, $tmp['yday']);		// 182 and not 181, due to the 29th february
+        $this->assertEquals(2, $tmp['hours']);		// There is a daylight, so we are GMT+2
+        $this->assertEquals(0, $tmp['minutes']);
+        $this->assertEquals(1, $tmp['seconds']);
+
+        $conf->global->MAIN_USE_OLD_FUNCTIONS_FOR_GETDATE = 1;
+
+        $tmp=dol_getdate(1);						// 1/1/1970 and 1 second = thirday
+        $this->assertEquals(1970, $tmp['year']);
+        $this->assertEquals(1, $tmp['mon']);
+        $this->assertEquals(1, $tmp['mday']);
+        $this->assertEquals(4, $tmp['wday']);
+        $this->assertEquals(0, $tmp['yday']);
+        // We must disable this because on CI, timezone is may be UTC or something else
+        //$this->assertEquals(1, $tmp['hours']);		// We are winter, so we are GMT+1 even during summer
+        $this->assertEquals(0, $tmp['minutes']);
+        $this->assertEquals(1, $tmp['seconds']);
+
+        $tmp=dol_getdate(15638401);					// 1/7/1970 and 1 second = wednesday
+        $this->assertEquals(1970, $tmp['year']);
+        $this->assertEquals(7, $tmp['mon']);
+        $this->assertEquals(1, $tmp['mday']);
+        $this->assertEquals(3, $tmp['wday']);
+        $this->assertEquals(181, $tmp['yday']);
+        // We must disable this because on CI, timezone is may be UTC or something else
+        //$this->assertEquals(1, $tmp['hours']);		// There is no daylight in 1970, so we are GMT+1 even during summer
+        $this->assertEquals(0, $tmp['minutes']);
+        $this->assertEquals(1, $tmp['seconds']);
+
+        $tmp=dol_getdate(1593561601);				// 1/7/2020 and 1 second = wednesday
+        $this->assertEquals(2020, $tmp['year']);
+        $this->assertEquals(7, $tmp['mon']);
+        $this->assertEquals(1, $tmp['mday']);
+        $this->assertEquals(3, $tmp['wday']);
+        $this->assertEquals(182, $tmp['yday']);		// 182 and not 181, due to the 29th february
+        // We must disable this because on CI, timezone is may be UTC or something else
+        //$this->assertEquals(2, $tmp['hours']);		// There is a daylight, so we are GMT+2
+        $this->assertEquals(0, $tmp['minutes']);
+        $this->assertEquals(1, $tmp['seconds']);
+
         return true;
     }
 
 
     /**
-     * testDolGetDate
+     * testMakeSubstitutions
      *
      * @return boolean
      */
diff --git a/test/phpunit/HolidayTest.php b/test/phpunit/HolidayTest.php
index e7e3e8749cd..e7ad436b586 100644
--- a/test/phpunit/HolidayTest.php
+++ b/test/phpunit/HolidayTest.php
@@ -366,7 +366,7 @@ class HolidayTest extends PHPUnit\Framework\TestCase
     	$localobjecta=new Holiday($this->savdb);
 
     	$localobjecta->updateConfCP('lastUpdate', '20100101120000');
-
-    	$localobjecta->updateBalance();
+    	$result = $localobjecta->updateBalance();
+    	$this->assertEquals($result, 1);
     }
 }
diff --git a/test/phpunit/ImportTest.php b/test/phpunit/ImportTest.php
index ce689fda4a4..e9bf019740c 100644
--- a/test/phpunit/ImportTest.php
+++ b/test/phpunit/ImportTest.php
@@ -140,7 +140,7 @@ class ImportTest extends PHPUnit\Framework\TestCase
         // TODO
         // Run import on file and check the record with field "auto" are filled
         // according to option
-
+        $this->assertEquals(0, 0);
 
 		return true;
     }
diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php
index c064a03e2f8..1c1f8ed0e8a 100644
--- a/test/phpunit/LangTest.php
+++ b/test/phpunit/LangTest.php
@@ -191,12 +191,39 @@ class LangTest extends PHPUnit\Framework\TestCase
 				print 'Check lang file '.$file."\n";
 				$filecontent=file_get_contents(DOL_DOCUMENT_ROOT.'/langs/'.$code.'/'.$file);
 
-				$result=strpos($filecontent, '％');
-				print __METHOD__." Result for checking we don't have bad percent char = ".$result."\n";
-				$this->assertTrue($result===false, 'Found a bad percent char ％ instead of % into file '.$code.'/'.$file);
+				$result=preg_match('/=--$/m', $filecontent);	// A special % char we don't want. We want the common one.
+				//print __METHOD__." Result for checking we don't have bad percent char = ".$result."\n";
+				$this->assertTrue($result == 0, 'Found a translation KEY=-- into file '.$code.'/'.$file.'. We probably want Key=- instead.');
+
+				$result=strpos($filecontent, '％');	// A special % char we don't want. We want the common one.
+				//print __METHOD__." Result for checking we don't have bad percent char = ".$result."\n";
+				$this->assertTrue($result === false, 'Found a bad percent char ％ instead of % into file '.$code.'/'.$file);
 			}
 		}
 
         return;
     }
+
+    /**
+     * testTrans
+     *
+     * @return string
+     */
+    public function testTrans()
+    {
+    	global $conf,$user,$langs,$db;
+    	$conf=$this->savconf;
+    	$user=$this->savuser;
+    	$langs=$this->savlangs;
+    	$db=$this->savdb;
+
+    	$tmplangs=new Translate('', $conf);
+    	$langcode='en_US';
+    	$tmplangs->setDefaultLang($langcode);
+    	$tmplangs->load("main");
+
+    	$result = $tmplangs->trans("FilterOnInto", "<input autofocus onfocus='alert(1337)' <--!");
+    	print __METHOD__." result trans FilterOnInto = ".$result."\n";
+    	$this->assertEquals($result, "Search criteria '<b>&lt;input autofocus onfocus='alert(1337)' &lt;--!</b>' into fields ", 'Result of lang->trans must have original translation string with its original HTML tag, but inserted values must be fully encoded.');
+    }
 }
diff --git a/test/phpunit/PaypalTest.php b/test/phpunit/PaypalTest.php
index 47d8341f501..7a2e31cbdad 100644
--- a/test/phpunit/PaypalTest.php
+++ b/test/phpunit/PaypalTest.php
@@ -131,7 +131,7 @@ class PaypalTest extends PHPUnit\Framework\TestCase
     }
 
     /**
-     * testProductCreate
+     * testPaypalOk
      *
      * @return	void
      */
@@ -143,13 +143,13 @@ class PaypalTest extends PHPUnit\Framework\TestCase
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
-		$urltotest=getPaypalPaymentUrl(0, 'free');
+		$urltotest=getOnlinePaymentUrl(0, 'free');
 		print "urltotest=".$urltotest."\n";
 
-		$result=getURLContent($urltotest, 'GET');
+		$result=getURLContent($urltotest, 'GET', '', 1, array(), array('http', 'https'), 2);
 
-        print __METHOD__." result=".$result."\n";
-    	$this->assertLessThanOrEqual($result, 0);
+        print __METHOD__." result=".$result['http_code']."\n";
+        $this->assertEquals(200, $result['http_code']);
 
     	return $result;
     }
diff --git a/test/phpunit/ProductTest.php b/test/phpunit/ProductTest.php
index 650d8a93e37..e574d3e1d20 100644
--- a/test/phpunit/ProductTest.php
+++ b/test/phpunit/ProductTest.php
@@ -147,7 +147,7 @@ class ProductTest extends PHPUnit\Framework\TestCase
         $result=$localobject->create($user);
 
         print __METHOD__." result=".$result."\n";
-        $this->assertLessThanOrEqual($result, 0);
+        $this->assertLessThanOrEqual($result, 0, "Creation of product");
 
         return $result;
     }
@@ -177,31 +177,6 @@ class ProductTest extends PHPUnit\Framework\TestCase
         return $localobject;
     }
 
-    /**
-     * testProductGetArboEachProd
-     *
-     * @return  void
-     */
-    public function testProductGetArboEachProd()
-    {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-		/*
-    	$localobject=new Product($db);
-    	$localobject->fetch(208);
-    	$localobject->get_sousproduits_arbo();
-    	$localobject->get_arbo_each_prod();
-
-    	var_dump($localobject->res); print (json_encode($localobject->res)); exit;
-		*/
-
-    	return;
-    }
-
     /**
      * testProductUpdate
      *
@@ -219,7 +194,8 @@ class ProductTest extends PHPUnit\Framework\TestCase
         $langs=$this->savlangs;
         $db=$this->savdb;
 
-        $localobject->note='New note after update';
+        $localobject->note_public = 'New public note after update';
+        $localobject->note_private = 'New private note after update';
         $result=$localobject->update($localobject->id, $user);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
@@ -244,6 +220,7 @@ class ProductTest extends PHPUnit\Framework\TestCase
         $langs=$this->savlangs;
         $db=$this->savdb;
 
+        $this->assertEquals(0, 0);
 
         return $localobject->id;
     }
@@ -274,23 +251,4 @@ class ProductTest extends PHPUnit\Framework\TestCase
 
         return $result;
     }
-
-    /**
-     * testProductStatic
-     *
-     * @return  void
-     */
-    public function testProductStatic()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $localobject=new Product($db);
-
-
-        return;
-    }
 }
diff --git a/test/phpunit/PropalTest.php b/test/phpunit/PropalTest.php
index 068fb53b052..ea678e8df34 100644
--- a/test/phpunit/PropalTest.php
+++ b/test/phpunit/PropalTest.php
@@ -190,11 +190,11 @@ class PropalTest extends PHPUnit\Framework\TestCase
     	$langs=$this->savlangs;
     	$db=$this->savdb;
 
-    	$localobject->note_private='New note private after update';
-    	$result=$localobject->update($user);
+    	$localobject->note_private = 'New note private after update';
+    	$result = $localobject->update($user);
 
     	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$id." result=".$result."\n";
+    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
     	return $localobject;
     }
 
diff --git a/test/phpunit/RestAPIDocumentTest.php b/test/phpunit/RestAPIDocumentTest.php
index 65b8c206c9d..8dbaafab018 100644
--- a/test/phpunit/RestAPIDocumentTest.php
+++ b/test/phpunit/RestAPIDocumentTest.php
@@ -120,7 +120,7 @@ class RestAPIDocumentTest extends PHPUnit\Framework\TestCase
         $password = 'admin';
         $url = $this->api_url.'/login?login='.$login.'&password='.$password;
         // Call the API login method to save api_key for this test class
-        $result = getURLContent($url, 'GET', '', 1, array());
+        $result = getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
         echo __METHOD__.' result = '.var_export($result, true)."\n";
         echo __METHOD__.' curl_error_no: '.$result['curl_error_no']."\n";
         $this->assertEquals($result['curl_error_no'], '');
@@ -171,7 +171,7 @@ class RestAPIDocumentTest extends PHPUnit\Framework\TestCase
             'fileencoding'=>""
         );
 
-        $result = getURLContent($url, 'POST', $data, 1);
+        $result = getURLContent($url, 'POST', $data, 1, array(), array('http', 'https'), 2);
         echo __METHOD__.' Result for sending document: '.var_export($result, true)."\n";
         echo __METHOD__.' curl_error_no: '.$result['curl_error_no']."\n";
         $object = json_decode($result['content'], true);
@@ -192,7 +192,7 @@ class RestAPIDocumentTest extends PHPUnit\Framework\TestCase
             'fileencoding'=>""
         );
 
-        $result2 = getURLContent($url, 'POST', $data, 1);
+        $result2 = getURLContent($url, 'POST', $data, 1, array(), array('http', 'https'), 2);
         echo __METHOD__.' Result for sending document: '.var_export($result2, true)."\n";
         echo __METHOD__.' curl_error_no: '.$result2['curl_error_no']."\n";
         $object2 = json_decode($result2['content'], true);
diff --git a/test/phpunit/RestAPIUserTest.php b/test/phpunit/RestAPIUserTest.php
index 9d49d10af73..a937bdbd9f8 100644
--- a/test/phpunit/RestAPIUserTest.php
+++ b/test/phpunit/RestAPIUserTest.php
@@ -125,7 +125,7 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
         $password='admin';
         $url=$this->api_url.'/login?login='.$login.'&password='.$password;
         // Call the API login method to save api_key for this test class
-        $result=getURLContent($url, 'GET', '', 1, array());
+        $result=getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
         print __METHOD__." result = ".var_export($result, true)."\n";
         print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
         $this->assertEquals($result['curl_error_no'], '');
@@ -163,7 +163,7 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
         //$addheaders=array('Content-Type: application/json');
 
         print __METHOD__." Request GET url=".$url."\n";
-        $result=getURLContent($url, 'GET', '', 1, array());
+        $result=getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
         //print __METHOD__." Result for unexisting user: ".var_export($result, true)."\n";
         print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
         $this->assertEquals($result['curl_error_no'], '');
@@ -174,7 +174,7 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
         $url = $this->api_url.'/users/1?api_key='.$this->api_key;
 
         print __METHOD__." Request GET url=".$url."\n";
-        $result=getURLContent($url, 'GET', '', 1, array());
+        $result=getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
         //print __METHOD__." Result for existing user user: ".var_export($result, true)."\n";
         print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
         $this->assertEquals($result['curl_error_no'], '');
@@ -203,7 +203,7 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
         $body = json_encode($bodyobj);
 
         print __METHOD__." Request POST url=".$url."\n";
-        $result=getURLContent($url, 'POST', $body, 1, $addheaders);
+        $result=getURLContent($url, 'POST', $body, 1, $addheaders, array('http', 'https'), 2);
         //print __METHOD__." Result for creating incomplete user".var_export($result, true)."\n";
         print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
         $this->assertEquals($result['curl_error_no'], '');
@@ -221,7 +221,7 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
         );
         $body = json_encode($bodyobj);
         print __METHOD__." Request POST url=".$url."\n";
-        $result=getURLContent($url, 'POST', $body, 1, $addheaders);
+        $result=getURLContent($url, 'POST', $body, 1, $addheaders, array('http', 'https'), 2);
         print __METHOD__." Result code for creating user ".var_export($result, true)."\n";
         print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
         $this->assertEquals($result['curl_error_no'], '');
@@ -231,7 +231,7 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
 
         // attempt to create duplicated user
         print __METHOD__." Request POST url=".$url."\n";
-        $result=getURLContent($url, 'POST', $body, 1, $addheaders);
+        $result=getURLContent($url, 'POST', $body, 1, $addheaders, array('http', 'https'), 2);
         //print __METHOD__." Result for creating duplicate user".var_export($result, true)."\n";
         print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
         $this->assertEquals($result['curl_error_no'], '');
diff --git a/test/phpunit/ScriptsTest.php b/test/phpunit/ScriptsTest.php
index 16884214418..82d1ee28e39 100644
--- a/test/phpunit/ScriptsTest.php
+++ b/test/phpunit/ScriptsTest.php
@@ -68,7 +68,7 @@ class ScriptsTest extends PHPUnit\Framework\TestCase
 	 * Constructor
 	 * We save global variables into local variables
 	 *
-	 * @return SecurityTest
+	 * @return ScriptsTest
 	 */
 	public function __construct()
 	{
@@ -152,6 +152,10 @@ class ScriptsTest extends PHPUnit\Framework\TestCase
 		$db=$this->savdb;
 
 		$script=dirname(__FILE__).'/../../scripts/bank/export-bank-receipts.php BANKDUMMY RECEIPTDUMMY excel2007 lang=fr_FR';
+
+		$returnvar = 0;
+		$output = array();
+
 		$result=exec($script, $output, $returnvar);
 
 		print __METHOD__." result=".$result."\n";
@@ -187,6 +191,8 @@ class ScriptsTest extends PHPUnit\Framework\TestCase
 		$this->assertEquals($result,'Failed to find bank account with ref BANKDUMMY.');
 		$this->assertEquals($returnvar,255);
 		*/
+		$this->assertEquals(0, 0);
+
         return '';
     }
 
@@ -204,6 +210,9 @@ class ScriptsTest extends PHPUnit\Framework\TestCase
     	$langs=$this->savlangs;
     	$db=$this->savdb;
 
+    	$returnvar = 0;
+    	$output = array();
+
     	$script=dirname(__FILE__).'/../../scripts/contracts/email_expire_services_to_customers.php test thirdparties';
     	$result=exec($script, $output, $returnvar);
     	print __METHOD__." result=".$result."\n";
@@ -242,6 +251,9 @@ class ScriptsTest extends PHPUnit\Framework\TestCase
     	$langs=$this->savlangs;
     	$db=$this->savdb;
 
+    	$returnvar = 0;
+    	$output = array();
+
     	$script=dirname(__FILE__).'/../../scripts/invoices/email_unpaid_invoices_to_customers.php test thirdparties';
     	$result=exec($script, $output, $returnvar);
     	print __METHOD__." result=".$result."\n";
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 6c4d2270d1a..3eda8354113 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -26,20 +26,20 @@
 global $conf,$user,$langs,$db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
-require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
-require_once dirname(__FILE__).'/../../htdocs/core/lib/security.lib.php';
-require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php';
 
-if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER', '1');
-if (! defined('NOREQUIREDB'))    define('NOREQUIREDB', '1');
 if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
 if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
 if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
 if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
 if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
 if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+if (! defined("NOSESSION"))      define("NOSESSION", '1');
+
+require_once dirname(__FILE__).'/../../htdocs/main.inc.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/security.lib.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php';
+
 
 if (empty($user->id))
 {
@@ -156,6 +156,112 @@ class SecurityTest extends PHPUnit\Framework\TestCase
     	$this->assertEquals($tmplangs->defaultlang, 'malicioustextwithquote_MALICIOUSTEXTWITHQUOTE');
     }
 
+    /**
+     * testSqlAndScriptInjectWithPHPUnit
+     *
+     * @return  void
+     */
+    public function testSqlAndScriptInjectWithPHPUnit()
+    {
+    	// Run tests
+    	// More on https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet
+
+    	// Should be OK
+    	$expectedresult=0;
+
+    	$_SERVER["PHP_SELF"]='/DIR WITH SPACE/htdocs/admin/index.php?mainmenu=home&leftmenu=setup&username=weservices';
+    	$result=testSqlAndScriptInject($_SERVER["PHP_SELF"], 2);
+    	$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject 1a');
+
+    	// Should detect XSS
+    	$expectedresult=1;
+
+    	$_SERVER["PHP_SELF"]='/DIR WITH SPACE/htdocs/admin/index.php?mainmenu=home&leftmenu=setup&username=weservices;badaction';
+    	$result=testSqlAndScriptInject($_SERVER["PHP_SELF"], 2);
+    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject 1b');
+
+    	$test="<img src='1.jpg' onerror =javascript:alert('XSS')>";
+    	$result=testSqlAndScriptInject($test, 0);
+    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa');
+
+    	$test="<img src='1.jpg' onerror =javascript:alert('XSS')>";
+    	$result=testSqlAndScriptInject($test, 2);
+    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa2');
+
+    	$test='<IMG SRC=# onmouseover="alert(1)">';
+    	$result=testSqlAndScriptInject($test, 0);
+    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa3');
+    	$test='<IMG SRC onmouseover="alert(1)">';
+    	$result=testSqlAndScriptInject($test, 0);
+    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa4');
+    	$test='<IMG onmouseover="alert(1)">';
+    	$result=testSqlAndScriptInject($test, 0);
+    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa5');
+    	$test='<IMG SRC=/ onerror="alert(1)">';
+    	$result=testSqlAndScriptInject($test, 0);
+    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa6');
+    	$test='<IMG SRC=" &#14;  javascript:alert(1);">';
+    	$result=testSqlAndScriptInject($test, 0);
+    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa7');
+
+    	$test='<IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#39;&#88;&#83;&#83;&#39;&#41;>';
+    	$result=testSqlAndScriptInject($test, 0);
+    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject bbb');
+
+    	$test='<SCRIPT SRC=http://xss.rocks/xss.js></SCRIPT>';
+    	$result=testSqlAndScriptInject($test, 0);
+    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject ccc');
+
+    	$test='<IMG SRC="javascript:alert(\'XSS\');">';
+    	$result=testSqlAndScriptInject($test, 1);
+    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject ddd');
+
+    	$test='<IMG """><SCRIPT>alert("XSS")</SCRIPT>">';
+    	$result=testSqlAndScriptInject($test, 0);
+    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject eee');
+
+    	$test='<!-- Google analytics -->
+			<script>
+			  (function(i,s,o,g,r,a,m){i[\'GoogleAnalyticsObject\']=r;i[r]=i[r]||function(){
+			  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+			  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+			  })(window,document,\'script\',\'https://www.google-analytics.com/analytics.js\',\'ga\');
+
+			  ga(\'create\',\'UA-99999999-9\', \'auto\');
+			  ga(\'send\', \'pageview\');
+
+			</script>';
+    	$result=testSqlAndScriptInject($test, 0);
+    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject eee');
+
+    	$test="<IMG SRC=\"jav\tascript:alert('XSS');\">";		// Is locked by some browser like chrome because the default directive no-referrer-when-downgrade is sent when requesting the SRC and then refused because of browser protection on img src load without referrer.
+    	$test="<IMG SRC=\"jav&#x0D;ascript:alert('XSS');\">";	// Same
+
+    	$test='<SCRIPT/XSS SRC="http://xss.rocks/xss.js"></SCRIPT>';
+    	$result=testSqlAndScriptInject($test, 0);
+    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject fff1');
+    	$test='<SCRIPT/SRC="http://xss.rocks/xss.js"></SCRIPT>';
+    	$result=testSqlAndScriptInject($test, 0);
+    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject fff2');
+
+    	// This case seems to be filtered by browsers now.
+    	$test='<BODY onload!#$%&()*~+-_.,:;?@[/|\]^`=alert(1)>';
+    	//$result=testSqlAndScriptInject($test, 0);
+    	//$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject ggg');
+
+    	$test='<iframe src=http://xss.rocks/scriptlet.html <';
+    	$result=testSqlAndScriptInject($test, 0);
+    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject hhh');
+
+    	$test='Set.constructor`alert\x281\x29```';
+    	$result=testSqlAndScriptInject($test, 0);
+    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject iii');
+
+    	$test="on<!-- ab\nc -->error=alert(1)";
+    	$result=testSqlAndScriptInject($test, 0);
+    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject jjj');
+    }
+
     /**
      * testGETPOST
      *
@@ -179,9 +285,10 @@ class SecurityTest extends PHPUnit\Framework\TestCase
         $_POST["param6"]="&quot;&gt;<svg o&#110;load='console.log(&quot;123&quot;)'&gt;";
         $_GET["param7"]='"c:\this is a path~1\aaa&#110;" abc<bad>def</bad>';
         $_POST["param8"]="Hacker<svg o&#110;load='console.log(&quot;123&quot;)'";	// html tag is not closed so it is not detected as html tag but is still harmfull
+		$_POST["param9"]='is_object($object) ? ($object->id < 10 ? round($object->id / 2, 2) : (2 * $user->id) * (int) substr($mysoc->zip, 1, 2)) : \'objnotdefined\'';
+		$_POST["param10"]='is_object($object) ? ($object->id < 10 ? round($object->id / 2, 2) : (2 * $user->id) * (int) substr($mysoc->zip, 1, 2)) : \'<abc>objnotdefined\'';
 
-        // Test int
-        $result=GETPOST('id', 'int');              // Must return nothing
+		$result=GETPOST('id', 'int');              // Must return nothing
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result, '');
 
@@ -241,6 +348,14 @@ class SecurityTest extends PHPUnit\Framework\TestCase
         print __METHOD__." result=".$result."\n";
         $this->assertEquals("Hacker<svg onload='console.log(123)'", $result);
 
+        $result=GETPOST("param9", 'alphanohtml');
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals($_POST["param9"], $result);
+
+        $result=GETPOST("param10", 'alphanohtml');
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals($_POST["param9"], $result, 'We should get param9 after processing param10');
+
         return $result;
     }
 
@@ -261,7 +376,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 
         $login=checkLoginPassEntity('admin', 'admin', 1, array('dolibarr'));            // Should works because admin/admin exists
         print __METHOD__." login=".$login."\n";
-        $this->assertEquals($login, 'admin');
+        $this->assertEquals($login, 'admin', 'The test to check if pass of user "admin" is "admin" has failed');
 
         $login=checkLoginPassEntity('admin', 'admin', 1, array('http','dolibarr'));    // Should work because of second authetntication method
         print __METHOD__." login=".$login."\n";
@@ -294,6 +409,46 @@ class SecurityTest extends PHPUnit\Framework\TestCase
         return 0;
     }
 
+    /**
+     * testDolStringOnlyTheseHtmlTags
+     *
+     * @return number
+     */
+    public function testDolHTMLEntityDecode()
+    {
+    	$stringtotest = 'a &colon; b &quot; c &#039; d &apos; e &eacute;';
+    	$decodedstring = dol_html_entity_decode($stringtotest, ENT_QUOTES);
+    	$this->assertEquals('a &colon; b " c \' d &apos; e é', $decodedstring, 'Function did not sanitize correclty');
+
+    	$stringtotest = 'a &colon; b &quot; c &#039; d &apos; e &eacute;';
+    	$decodedstring = dol_html_entity_decode($stringtotest, ENT_QUOTES|ENT_HTML5);
+    	$this->assertEquals('a : b " c \' d \' e é', $decodedstring, 'Function did not sanitize correclty');
+
+    	return 0;
+    }
+
+    /**
+     * testDolStringOnlyTheseHtmlTags
+     *
+     * @return number
+     */
+    public function testDolStringOnlyTheseHtmlTags()
+    {
+    	$stringtotest = '<a href="javascript:aaa">bbbڴ';
+    	$decodedstring = dol_string_onlythesehtmltags($stringtotest, 1, 1, 1);
+        $this->assertEquals('<a href="aaa">bbbڴ', $decodedstring, 'Function did not sanitize correclty with test 1');
+
+        $stringtotest = '<a href="java'.chr(0).'script:aaa">bbbڴ';
+        $decodedstring = dol_string_onlythesehtmltags($stringtotest, 1, 1, 1);
+        $this->assertEquals('<a href="aaa">bbbڴ', $decodedstring, 'Function did not sanitize correclty with test 2');
+
+        $stringtotest = '<a href="javascript&colon;aaa">bbbڴ';
+        $decodedstring = dol_string_onlythesehtmltags($stringtotest, 1, 1, 1);
+        $this->assertEquals('<a href="aaa">bbbڴ', $decodedstring, 'Function did not sanitize correclty with test 3');
+
+        return 0;
+    }
+
     /**
      * testGetRandomPassword
      *
@@ -343,4 +498,82 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$result=restrictedArea($user, 'societe');
 		$this->assertEquals(1, $result);
     }
+
+
+    /**
+     * testGetRandomPassword
+     *
+     * @return number
+     */
+    public function testGetURLContent()
+    {
+    	global $conf;
+    	include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+
+    	$url = 'ftp://mydomain.com';
+    	$tmp = getURLContent($url);
+    	print __METHOD__." url=".$url."\n";
+    	$this->assertGreaterThan(0, strpos($tmp['curl_error_msg'], 'not supported'));	// Test error if return does not contains 'not supported'
+
+    	$url = 'https://www.dolibarr.fr';	// This is a redirect 301 page
+    	$tmp = getURLContent($url, 'GET', '', 0);	// We do NOT follow
+    	print __METHOD__." url=".$url."\n";
+    	$this->assertEquals(301, $tmp['http_code'], 'GET url 301 without following -> 301');
+
+    	$url = 'https://www.dolibarr.fr';	// This is a redirect 301 page
+    	$tmp = getURLContent($url);		// We DO follow
+    	print __METHOD__." url=".$url."\n";
+    	$this->assertEquals(200, $tmp['http_code'], 'GET url 301 with following -> 200');	// Test error if return does not contains 'not supported'
+
+    	$url = 'http://localhost';
+    	$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
+    	print __METHOD__." url=".$url."\n";
+    	$this->assertEquals(400, $tmp['http_code'], 'GET url to '.$url.' that resolves to a local URL');	// Test we receive an error because localtest.me is not an external URL
+
+    	$url = 'http://127.0.0.1';
+    	$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
+    	print __METHOD__." url=".$url."\n";
+    	$this->assertEquals(400, $tmp['http_code'], 'GET url to '.$url.' that is a local URL');	// Test we receive an error because localtest.me is not an external URL
+
+    	$url = 'https://169.254.0.1';
+    	$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
+    	print __METHOD__." url=".$url."\n";
+    	$this->assertEquals(400, $tmp['http_code'], 'GET url to '.$url.' that is a local URL');	// Test we receive an error because localtest.me is not an external URL
+
+    	$url = 'http://[::1]';
+    	$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
+    	print __METHOD__." url=".$url."\n";
+    	$this->assertEquals(400, $tmp['http_code'], 'GET url to '.$url.' that is a local URL');	// Test we receive an error because localtest.me is not an external URL
+
+    	/*$url = 'localtest.me';
+    	$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
+    	print __METHOD__." url=".$url."\n";
+    	$this->assertEquals(400, $tmp['http_code'], 'GET url to '.$url.' that resolves to a local URL');	// Test we receive an error because localtest.me is not an external URL
+		*/
+
+    	return 0;
+    }
+
+    /**
+     * testDolSanitizeFileName
+     *
+     * @return void
+     */
+    public function testDolSanitizeFileName()
+    {
+    	global $conf,$user,$langs,$db;
+    	$conf=$this->savconf;
+    	$user=$this->savuser;
+    	$langs=$this->savlangs;
+    	$db=$this->savdb;
+
+    	//$dummyuser=new User($db);
+    	//$result=restrictedArea($dummyuser,'societe');
+
+    	$result=dol_sanitizeFileName('bad file | evilaction');
+    	$this->assertEquals('bad file _ evilaction', $result);
+
+    	$result=dol_sanitizeFileName('bad file --evilparam');
+    	$this->assertEquals('bad file _evilparam', $result);
+    }
 }
diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php
index 4ed0771d668..0ca6cc8792b 100755
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php
@@ -382,25 +382,6 @@ class SocieteTest extends PHPUnit\Framework\TestCase
         return $result;
     }
 
-    /**
-     * testSocieteStatic
-     *
-     * @return  void
-     */
-    public function testSocieteStatic()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $localobject=new Societe($db);
-
-
-        return;
-    }
-
 
     /**
      * testSocieteGetFullAddress
diff --git a/test/phpunit/StripeTest.php b/test/phpunit/StripeTest.php
new file mode 100644
index 00000000000..72d4722b34e
--- /dev/null
+++ b/test/phpunit/StripeTest.php
@@ -0,0 +1,156 @@
+<?php
+/* Copyright (C) 2020 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ *      \file       test/phpunit/StripeTest.php
+ *		\ingroup    test
+ *      \brief      PHPUnit test
+ *		\remarks	To run this script as CLI:  phpunit filename.php
+ */
+
+global $conf,$user,$langs,$db;
+//define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
+//require_once 'PHPUnit/Autoload.php';
+require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/geturl.lib.php';
+require_once dirname(__FILE__).'/../../htdocs/stripe/lib/stripe.lib.php';
+
+if (empty($user->id))
+{
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
+}
+$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+
+
+/**
+ * Class for PHPUnit tests
+ *
+ * @backupGlobals disabled
+ * @backupStaticAttributes enabled
+ * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
+ */
+class StripeTest extends PHPUnit\Framework\TestCase
+{
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
+
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return ProductTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
+
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
+
+    /**
+     * setUpBeforeClass
+     *
+     * @return void
+     */
+    public static function setUpBeforeClass()
+    {
+    	global $conf,$user,$langs,$db;
+
+    	if (empty($conf->stripe->enabled)) { print __METHOD__." Module Stripe must be enabled.\n"; die(); }
+
+        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+
+    	print __METHOD__."\n";
+    }
+
+    /**
+     * tearDownAfterClass
+     *
+     * @return	void
+     */
+    public static function tearDownAfterClass()
+    {
+    	global $conf,$user,$langs,$db;
+		$db->rollback();
+
+		print __METHOD__."\n";
+    }
+
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return	void
+	 */
+    protected function setUp()
+    {
+    	global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		print __METHOD__."\n";
+    }
+
+	/**
+	 * End phpunit tests
+	 *
+	 * @return	void
+	 */
+    protected function tearDown()
+    {
+    	print __METHOD__."\n";
+    }
+
+    /**
+     * testStripeOk
+     *
+     * @return	void
+     */
+    public function testStripeOk()
+    {
+    	global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$urltotest=getOnlinePaymentUrl(0, 'free');
+		print "urltotest=".$urltotest."\n";
+
+		$result=getURLContent($urltotest, 'GET', '', 1, array(), array('http', 'https'), 2);
+
+        print __METHOD__." result=".$result['http_code']."\n";
+        $this->assertEquals(200, $result['http_code']);
+
+    	return $result;
+    }
+}
diff --git a/test/phpunit/UserGroupTest.php b/test/phpunit/UserGroupTest.php
index 7e3cdd24b3a..3ec92449f08 100644
--- a/test/phpunit/UserGroupTest.php
+++ b/test/phpunit/UserGroupTest.php
@@ -257,15 +257,10 @@ class UserGroupTest extends PHPUnit\Framework\TestCase
         $langs=$this->savlangs;
         $db=$this->savdb;
 
-        /*$result=$localobject->setstatus(0);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        */
+        $result = $localobject->generateDocument('templatenamethadoesnotexist', $langs);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(-1, $result, 'Calling generateDocument with a not existing template should return 0');
 
-        /*$localobject->info($localobject->id);
-        print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
-        $this->assertNotEquals($localobject->date_creation, '');
-        */
         return $localobject->id;
     }
 
diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php
index 08338de949b..a8486451c47 100644
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -200,7 +200,7 @@ class UserTest extends PHPUnit\Framework\TestCase
         $newlocalobject=new User($this->savdb);
         $newlocalobject->initAsSpecimen();
         $this->changeProperties($newlocalobject);
-        $this->assertEquals($this->objCompare($localobject, $newlocalobject, true, array('id','socid','societe_id','note','ref','pass','pass_indatabase','pass_indatabase_crypted','datec','datem','datelastlogin','datepreviouslogin')), array());    // Actual, Expected
+        $this->assertEquals($this->objCompare($localobject, $newlocalobject, true, array('id','socid','societe_id','specimen','note','ref','pass','pass_indatabase','pass_indatabase_crypted','pass_temp','datec','datem','datelastlogin','datepreviouslogin','trackid')), array());    // Actual, Expected
 
         return $localobject;
     }
@@ -340,12 +340,11 @@ class UserTest extends PHPUnit\Framework\TestCase
             $oVarsB=get_object_vars($oB);
             $aKeys=array_keys($oVarsA);
             foreach ($aKeys as $sKey) {
-                if (in_array($sKey, $fieldstoignorearray))
-                    continue;
-                if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey]) {
+                if (in_array($sKey, $fieldstoignorearray)) continue;
+                if (! $ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
                     $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
                 }
-                if ($ignoretype && $oVarsA[$sKey] != $oVarsB[$sKey]) {
+                if ($ignoretype && ($oVarsA[$sKey] != $oVarsB[$sKey])) {
                     $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
                 }
             }
diff --git a/test/phpunit/WebservicesOrdersTest.php b/test/phpunit/WebservicesOrdersTest.php
index 803247e2598..fb649a52e44 100644
--- a/test/phpunit/WebservicesOrdersTest.php
+++ b/test/phpunit/WebservicesOrdersTest.php
@@ -183,7 +183,7 @@ class WebservicesOrdersTest extends PHPUnit\Framework\TestCase
             print "\n";
         }
 
-        print __METHOD__." result=".$result."\n";
+        print __METHOD__." count(result)=".count($result)."\n";
         $this->assertEquals('OK', $result['result']['result_code']);
 
         return $result;
diff --git a/test/phpunit/WebservicesOtherTest.php b/test/phpunit/WebservicesOtherTest.php
index 10c74bb1821..69449320537 100644
--- a/test/phpunit/WebservicesOtherTest.php
+++ b/test/phpunit/WebservicesOtherTest.php
@@ -188,7 +188,7 @@ class WebservicesOtherTest extends PHPUnit\Framework\TestCase
             print "\n";
         }
 
-        print __METHOD__." result=".$result."\n";
+        print __METHOD__." count(result)=".count($result)."\n";
         $this->assertEquals('OK', $result['result']['result_code']);
 
         // Test method that does not exists
@@ -212,7 +212,7 @@ class WebservicesOtherTest extends PHPUnit\Framework\TestCase
             print "\n";
         }
 
-        print __METHOD__." result=".$result."\n";
+        print __METHOD__." count(result)=".count($result)."\n";
         $this->assertEquals("SOAP-ENV:Client: Operation 'methodthatdoesnotexists' is not defined in the WSDL for this service", $soapclient->error_str);
 
         return $result;
diff --git a/test/phpunit/WebservicesProductsTest.php b/test/phpunit/WebservicesProductsTest.php
index 90911b289bc..132f3363608 100644
--- a/test/phpunit/WebservicesProductsTest.php
+++ b/test/phpunit/WebservicesProductsTest.php
@@ -202,7 +202,7 @@ class WebservicesProductsTest extends PHPUnit\Framework\TestCase
             print "\n";
         }
 
-        print __METHOD__." result=".$result."\n";
+        print __METHOD__." count(result)=".count($result)."\n";
         $this->assertEquals('OK', $result['result']['result_code']);
 
         return $result['id'];
@@ -265,7 +265,7 @@ class WebservicesProductsTest extends PHPUnit\Framework\TestCase
             print "\n";
         }
 
-        print __METHOD__." result=".$result."\n";
+        print __METHOD__." count(result)=".count($result)."\n";
         $this->assertEquals('OK', $result['result']['result_code']);
 
         return $id;
@@ -328,7 +328,7 @@ class WebservicesProductsTest extends PHPUnit\Framework\TestCase
             print "\n";
         }
 
-        print __METHOD__." result=".$result."\n";
+        print __METHOD__." count(result)=".count($result)."\n";
         $this->assertEquals('OK', $result['result']['result_code']);
 
         return 0;
diff --git a/test/phpunit/WebservicesUserTest.php b/test/phpunit/WebservicesUserTest.php
index f78386fc5bf..a683c99eac3 100644
--- a/test/phpunit/WebservicesUserTest.php
+++ b/test/phpunit/WebservicesUserTest.php
@@ -148,13 +148,15 @@ class WebservicesUserTest extends PHPUnit\Framework\TestCase
         $ns='http://www.dolibarr.org/ns/';
 
         // Set the WebService URL
-        print __METHOD__."Create nusoap_client for URL=".$WS_DOL_URL."\n";
+        print __METHOD__." Create nusoap_client for URL=".$WS_DOL_URL."\n";
         $soapclient = new nusoap_client($WS_DOL_URL);
         if ($soapclient) {
             $soapclient->soap_defencoding='UTF-8';
             $soapclient->decodeUTF8(false);
         }
 
+        //$soapclient->setDebugLevel(5);
+
         // Call the WebService method and store its result in $result.
         $authentication=array(
             'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
@@ -167,7 +169,7 @@ class WebservicesUserTest extends PHPUnit\Framework\TestCase
         // Test URL
         $result='';
         $parameters = array('authentication'=>$authentication,'id'=>0,'ref'=>'admin');
-        print __METHOD__."Call method ".$WS_METHOD."\n";
+        print __METHOD__." Call method ".$WS_METHOD."\n";
         try {
             $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
         } catch (SoapFault $exception) {
@@ -188,8 +190,8 @@ class WebservicesUserTest extends PHPUnit\Framework\TestCase
             print "\n";
         }
 
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals('OK', $result['result']['result_code'], 'Test on ref admin');
+        print __METHOD__." count(result)=".count($result)."\n";
+        $this->assertEquals('OK', empty($result['result']['result_code'])?'':$result['result']['result_code'], 'Test on ref admin');
 
         // Test URL
         $result='';
@@ -211,7 +213,7 @@ class WebservicesUserTest extends PHPUnit\Framework\TestCase
             print "\n";
         }
 
-        print __METHOD__." result=".$result."\n";
+        print __METHOD__." count(result)=".count($result)."\n";
         $this->assertEquals('NOT_FOUND', $result['result']['result_code'], 'Test on ref that does not exists');
 
         return $result;
diff --git a/test/phpunit/phpunittest.xml b/test/phpunit/phpunittest.xml
index d648edb6814..7e903daa16d 100644
--- a/test/phpunit/phpunittest.xml
+++ b/test/phpunit/phpunittest.xml
@@ -17,20 +17,6 @@
         <!-- Also don't forget to change suhosin.memory_limit=4G -->
 	</php>
 	<filter>
-	  <blacklist>
-	    <directory suffix=".php">../../build/</directory>
-	    <directory suffix=".php">../../dev/</directory>
-	    <directory suffix=".php">../../doc/</directory>
-	    <directory suffix=".php">../../test/</directory>
-	    <directory suffix=".php">../../documents/</directory>
-	    <directory suffix=".php">../../htdocs/custom/</directory>
-	    <directory suffix=".php">../../htdocs/documents/custom/</directory>
-	    <directory suffix=".php">../../htdocs/nltechno/</directory>
-	    <directory suffix=".php">../../htdocs/products/canvas/</directory>
-	    <directory suffix=".php">../../htdocs/contact/canvas/</directory>
-	    <directory suffix=".php">../../htdocs/societe/canvas/</directory>
-	    <directory suffix=".php">../../htdocs/includes/</directory>
-	  </blacklist>
 	  <whitelist addUncoveredFilesFromWhitelist="true">
 	    <directory suffix=".class.php">../../htdocs/</directory>
 	    <directory suffix=".lib.php">../../htdocs/</directory>
@@ -54,8 +40,21 @@
 	    <directory suffix=".php">../../htdocs/contact/canvas/</directory>
 	    <directory suffix=".php">../../htdocs/societe/canvas/</directory>
 	    <directory suffix=".php">../../htdocs/includes/</directory>
-	    <file>../../htdocs/holiday/common.inc.php</file>
 	    </exclude>
 	  </whitelist>
+	  <blacklist>
+	    <directory suffix=".php">../../build/</directory>
+	    <directory suffix=".php">../../dev/</directory>
+	    <directory suffix=".php">../../doc/</directory>
+	    <directory suffix=".php">../../test/</directory>
+	    <directory suffix=".php">../../documents/</directory>
+	    <directory suffix=".php">../../htdocs/custom/</directory>
+	    <directory suffix=".php">../../htdocs/documents/custom/</directory>
+	    <directory suffix=".php">../../htdocs/nltechno/</directory>
+	    <directory suffix=".php">../../htdocs/products/canvas/</directory>
+	    <directory suffix=".php">../../htdocs/contact/canvas/</directory>
+	    <directory suffix=".php">../../htdocs/societe/canvas/</directory>
+	    <directory suffix=".php">../../htdocs/includes/</directory>
+	  </blacklist>
 	</filter>
 </phpunit>

From 9653033e997c93a50e9265bb27bb61cb203f8c85 Mon Sep 17 00:00:00 2001
From: David Bensel <40593993+davidNDU@users.noreply.github.com>
Date: Mon, 14 Dec 2020 23:01:04 +0300
Subject: [PATCH 424/888] update

---
 htdocs/modulebuilder/template/myobject_agenda.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index 4889146d2c9..8db58b7ad4e 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -230,6 +230,7 @@ if ($object->id > 0)
 	$permok = $user->rights->agenda->myactions->create;
 	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
 	{
+		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
 		if (get_class($objthirdparty) == 'Societe') $out .= '&socid='.urlencode($objthirdparty->id);
 		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '').'&percentage=-1';
 		//$out.=$langs->trans("AddAnAction").' ';

From 81d47d7460c20ac42870284d69609b97e56ef6b6 Mon Sep 17 00:00:00 2001
From: David Bensel <40593993+davidNDU@users.noreply.github.com>
Date: Mon, 14 Dec 2020 23:17:58 +0300
Subject: [PATCH 425/888] action=confirm_deleteline ... method_exists has
 object as first parameter

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

diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index 5a93a6ded0b..1c874fd2418 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -261,7 +261,7 @@ if ($action == 'confirm_delete' && !empty($permissiontodelete))
 // Remove a line
 if ($action == 'confirm_deleteline' && $confirm == 'yes' && !empty($permissiontoadd))
 {
-	if (method_exists('deleteline', $object)) {
+	if (method_exists($object, 'deleteline')) {
 		$result = $object->deleteline($user, $lineid); // For backward compatibility
 	} else {
 		$result = $object->deleteLine($user, $lineid);

From a64f30d23e0e0573108932fe170fa0df2f2b5dea Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Dec 2020 00:16:58 +0100
Subject: [PATCH 426/888] Fix message

---
 htdocs/website/index.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 99d00c019ad..9cada0bc506 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2453,7 +2453,8 @@ if (!GETPOST('hide_websitemenu'))
 			$htmltext .= $langs->trans("SetHereVirtualHost", $dataroot);
 			$htmltext .= '<br>';
 			$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
-			$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
+			$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), '{s1}');
+			$htmltext = str_replace('{s1}', DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias', $htmltext);
 
 			$examplewithapache = '#php_admin_value open_basedir /tmp/:'.DOL_DOCUMENT_ROOT.':'.DOL_DATA_ROOT.':/dev/urandom'."\n";
 			$examplewithapache .= '<Directory "'.DOL_DOCUMENT_ROOT.'">'."\n";
@@ -2783,7 +2784,8 @@ if (!GETPOST('hide_websitemenu'))
 
 			$htmltext = $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $realpage, $dataroot);
 			$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
-			$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
+			$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), '{s1}');
+			$htmltext = str_replace('{s1}', DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias', $htmltext);
 
 			print '<div class="websiteinputurl inline-block paddingright">';
 			print '<a class="websitebuttonsitepreview inline-block" id="previewpage" href="'.$realpage.'&nocache='.dol_now().'" class="button" target="tab'.$websitekey.'" alt="'.dol_escape_htmltag($htmltext).'">';
@@ -3061,8 +3063,9 @@ if ($action == 'editcss')
 	$htmltext = $langs->trans("SetHereVirtualHost", DOL_DATA_ROOT.'/website/{s1}'.$websitekey.'{s2}');
 	$htmltext = str_replace(array('{s1}', '{s2}'), array('<i>', '</i>'), $htmltext);
 	$htmltext .= '<br>';
-	$htmltext .= '<br>'.$langs->transnoentitiesnoconv("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
-	$htmltext .= '<br>'.$langs->transnoentitiesnoconv("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
+	$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
+	$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), '{s1}');
+	$htmltext = str_replace('{s1}', DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias', $htmltext);
 
 	print $form->textwithpicto($langs->trans('Virtualhost'), $htmltext, 1, 'help', '', 0, 2, 'virtualhosttooltip');
 	print '</td><td>';
@@ -3228,7 +3231,8 @@ if ($action == 'createsite')
 	$htmltext = $langs->trans("SetHereVirtualHost", DOL_DATA_ROOT.'/website/<i>websiteref</i>');
 	$htmltext .= '<br>';
 	$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
-	$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
+	$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), '{s1}');
+	$htmltext = str_replace('{s1}', DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias', $htmltext);
 
 	print $form->textwithpicto($langs->trans('Virtualhost'), $htmltext, 1, 'help', '', 0, 2, 'virtualhosttooltip');
 	print '</td><td>';

From de37c0bff086c098735f52adb3735a9d4e6cbfe7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Dec 2020 01:59:18 +0100
Subject: [PATCH 427/888] Fix Warning

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

diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 7a1e10eed3f..b022c76d0d8 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -1006,7 +1006,7 @@ class SupplierProposal extends CommonObject
 							$fk_parent_line,
 							$this->lines[$i]->fk_fournprice,
 							$this->lines[$i]->pa_ht,
-							$this->lines[$i]->label,
+							empty($this->lines[$i]->label) ? '' : $this->lines[$i]->label,		// deprecated
 							$this->lines[$i]->array_options,
 							$this->lines[$i]->ref_fourn,
 							$this->lines[$i]->fk_unit,

From d3ba87b09aaa945451759a843fa0d519af065b33 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Dec 2020 02:32:56 +0100
Subject: [PATCH 428/888] Better gantt

---
 htdocs/core/boxes/box_funnel_of_prospection.php | 2 ++
 htdocs/theme/eldy/global.inc.php                | 3 +++
 htdocs/theme/md/style.css.php                   | 4 +++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/boxes/box_funnel_of_prospection.php b/htdocs/core/boxes/box_funnel_of_prospection.php
index a50426e1b29..6ffce6d781b 100644
--- a/htdocs/core/boxes/box_funnel_of_prospection.php
+++ b/htdocs/core/boxes/box_funnel_of_prospection.php
@@ -61,6 +61,8 @@ class box_funnel_of_prospection extends ModeleBoxes
 
 		$this->db = $db;
 
+		$this->enabled = ($conf->global->MAIN_FEATURES_LEVEL >= 1); // Not enabled by default, still need some work
+
 		$this->hidden = !($user->rights->projet->lire);
 	}
 
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 1b104ce95dd..40440f4fc41 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -5105,6 +5105,9 @@ td.gminorheading {
     max-width: 40px !important;
     width: 40px !important;
 }
+td.gtaskheading.gstartdate, td.gtaskheading.genddate {
+    white-space: break-spaces;
+}
 
 
 /* ============================================================================== */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index ad0b03366db..003416a5baf 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -4997,7 +4997,9 @@ td.gminorheading {
     max-width: 40px !important;
     width: 40px !important;
 }
-
+td.gtaskheading.gstartdate, td.gtaskheading.genddate {
+    white-space: break-spaces;
+}
 
 
 /* ============================================================================== */

From 506659a9d21cbc1e31219a6d6fc39ad41362fde5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Dec 2020 03:55:46 +0100
Subject: [PATCH 429/888] Update jsGant lib to 2.7.3

---
 COPYRIGHT                               |    2 +-
 htdocs/includes/jsgantt/CONTRIBUTING.md |    2 +-
 htdocs/includes/jsgantt/LICENSE         |    6 +-
 htdocs/includes/jsgantt/README.md       |  148 +-
 htdocs/includes/jsgantt/home-bg.jpg     |  Bin 380517 -> 0 bytes
 htdocs/includes/jsgantt/index.html      | 1167 ----
 htdocs/includes/jsgantt/jsgantt.css     |  991 ++-
 htdocs/includes/jsgantt/jsgantt.js      | 7587 +++++++++++++++--------
 htdocs/includes/jsgantt/main.css        |  126 -
 htdocs/includes/jsgantt/main.js         |   85 -
 htdocs/includes/jsgantt/project.xml     |  131 -
 htdocs/projet/ganttchart.inc.php        |   12 +-
 htdocs/projet/ganttview.php             |    3 +-
 htdocs/theme/eldy/global.inc.php        |   14 +-
 htdocs/theme/md/btn.inc.php             |   37 +-
 htdocs/theme/md/style.css.php           |   20 +-
 16 files changed, 6115 insertions(+), 4216 deletions(-)
 delete mode 100644 htdocs/includes/jsgantt/home-bg.jpg
 delete mode 100644 htdocs/includes/jsgantt/index.html
 delete mode 100644 htdocs/includes/jsgantt/main.css
 delete mode 100644 htdocs/includes/jsgantt/main.js
 delete mode 100644 htdocs/includes/jsgantt/project.xml

diff --git a/COPYRIGHT b/COPYRIGHT
index 5eab2669ce9..10b06b86811 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -52,7 +52,7 @@ jQuery jqueryFileTree  1.0.1         GPL and MIT License         Yes
 jQuery jquerytreeview  1.4.1         MIT License                 Yes             JS library for filetree
 jQuery TableDnD        0.6           GPL and MIT License         Yes             JS library plugin TableDnD (to reorder table rows)
 jQuery Timepicker      1.1.0         GPL and MIT License         Yes             JS library Timepicker addon for Datepicker
-jsGanttImproved        1.7.5.4       BSD License                 Yes             JS library (to build Gantt reports)
+jsGanttImproved        2.7.3         BSD License                 Yes             JS library (to build Gantt reports)
 JsTimezoneDetect       1.0.6         MIT License                 Yes             JS library to detect user timezone
 SwaggerUI			   2.0.24		 GPL-2+                      Yes             JS library to offer the REST API explorer
 
diff --git a/htdocs/includes/jsgantt/CONTRIBUTING.md b/htdocs/includes/jsgantt/CONTRIBUTING.md
index fa7bb2ca8d5..3f0d74a0c03 100644
--- a/htdocs/includes/jsgantt/CONTRIBUTING.md
+++ b/htdocs/includes/jsgantt/CONTRIBUTING.md
@@ -177,4 +177,4 @@ You can find out more detailed information about contributing in the [Documentat
 [github]: https://github.com/jsGanttImproved/jsgantt-improved
 [js-style-guide]: https://google.github.io/styleguide/jsguide.html
 [closing-issues]: https://help.github.com/articles/closing-issues-via-commit-messages/
-[docs]: https://github.com/jsGanttImproved/jsgantt-improved/wiki/Documentation
+[docs]: https://github.com/jsGanttImproved/jsgantt-improved/wiki/Documentation
\ No newline at end of file
diff --git a/htdocs/includes/jsgantt/LICENSE b/htdocs/includes/jsgantt/LICENSE
index bcfabfb5aa7..d384a6b01be 100644
--- a/htdocs/includes/jsgantt/LICENSE
+++ b/htdocs/includes/jsgantt/LICENSE
@@ -1,5 +1,4 @@
-* Copyright (c) 2013-2017, Paul Geldart, Eduardo Rodrigues and Ricardo Cardoso.
-* All rights reserved.
+* Copyright (c) 2013-2018, Paul Geldart, Eduardo Rodrigues and Ricardo Cardoso.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
@@ -26,7 +25,6 @@
 This project is based on jsGantt 1.2, the original project license follows:
 
 * Copyright (c) 2008, Shlomy Gantz/BlueBrick Inc.
-* All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
@@ -48,4 +46,4 @@ This project is based on jsGantt 1.2, the original project license follows:
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/htdocs/includes/jsgantt/README.md b/htdocs/includes/jsgantt/README.md
index 802580640ba..a628b6f12b9 100644
--- a/htdocs/includes/jsgantt/README.md
+++ b/htdocs/includes/jsgantt/README.md
@@ -1,21 +1,151 @@
-A fully featured gantt chart component built entirely in Javascript, CSS and AJAX. It is lightweight and there is no need of external libraries or additional images.
+[![Build Status](https://travis-ci.com/jsGanttImproved/jsgantt-improved.svg?branch=master)](https://travis-ci.com/jsGanttImproved/jsgantt-improved)
 
-You can view a live example at https://jsGanttImproved.github.io/jsgantt-improved
 
-Features include:
+A fully featured gantt chart component built entirely in Javascript, CSS and AJAX. It is lightweight and there is no need of external libraries or additional images. 
+
+
+![Demo Image](/docs/demo.gif)
+
+
+Start using with including the files `jsgantt.js` and `jsgantt.css` that are inside `docs/` folder.
+
+Or install and use in JS 
+
+`npm install jsgantt-improved`
+
+Import in your JS `import {JSGantt} from 'jsgantt-improved';`
+
+See the [FULL DOCUMENTATION](./Documentation.md) for more details in all features.
+
+For **Angular** use the component [ng-gantt](https://github.com/jsGanttImproved/ng-gantt) 
+
+For **React** use the component [react-jsgantt](https://github.com/jsGanttImproved/react-jsgantt) 
+
+
+For **Vue** , see this example: https://stackblitz.com/edit/vue-jsgantt
+
+
+For **.NET** , see this example: [.NET Documentation](./docs/DotNet.md)
+
+
+## Example
+
+
+You can view a Solo live example at:
+
+* https://jsganttimproved.github.io/jsgantt-improved/docs/demo.html
+
+Or use a live coding example at Codenpen:
+
+* https://codepen.io/mariomol/pen/mQzBPV
+
+
+## Easy to Use
+
+```html
+<link href="jsgantt.css" rel="stylesheet" type="text/css"/>
+<script src="jsgantt.js" type="text/javascript"></script>
+
+<div style="position:relative" class="gantt" id="GanttChartDIV"></div>
+
+<script>
+
+var g = new JSGantt.GanttChart(document.getElementById('GanttChartDIV'), 'day');
+
+g.setOptions({
+  vCaptionType: 'Complete',  // Set to Show Caption : None,Caption,Resource,Duration,Complete,     
+  vQuarterColWidth: 36,
+  vDateTaskDisplayFormat: 'day dd month yyyy', // Shown in tool tip box
+  vDayMajorDateDisplayFormat: 'mon yyyy - Week ww',// Set format to dates in the "Major" header of the "Day" view
+  vWeekMinorDateDisplayFormat: 'dd mon', // Set format to display dates in the "Minor" header of the "Week" view
+  vLang: 'en',
+  vShowTaskInfoLink: 1, // Show link in tool tip (0/1)
+  vShowEndWeekDate: 0,  // Show/Hide the date for the last day of the week in header for daily
+  vAdditionalHeaders: { // Add data columns to your table
+      category: {
+        title: 'Category'
+      },
+      sector: {
+        title: 'Sector'
+      }
+    },
+  vUseSingleCell: 10000, // Set the threshold cell per table row (Helps performance for large data.
+  vFormatArr: ['Day', 'Week', 'Month', 'Quarter'], // Even with setUseSingleCell using Hour format on such a large chart can cause issues in some browsers,
+  
+});
+
+// Load from a Json url
+JSGantt.parseJSON('./fixes/data.json', g);
+
+// Or Adding  Manually
+g.AddTaskItemObject({
+  pID: 1,
+  pName: "Define Chart <strong>API</strong>",
+  pStart: "2017-02-25",
+  pEnd: "2017-03-17",
+  pPlanStart: "2017-04-01",
+  pPlanEnd: "2017-04-15 12:00",
+  pClass: "ggroupblack",
+  pLink: "",
+  pMile: 0,
+  pRes: "Brian",
+  pComp: 0,
+  pGroup: 0,
+  pParent: 0,
+  pOpen: 1,
+  pDepend: "",
+  pCaption: "",
+  pCost: 1000,
+  pNotes: "Some Notes text",
+  category: "My Category",
+  sector: "Finance"
+});
+
+g.Draw();
+
+</script>
+```
+
+## Features
+
   * Tasks & Collapsible Task Groups
-  * Dependencies
+  * Dependencies and Highlight when hover a task
+  * Edit data in gantt table with list of responsible
   * Task Completion
-  * Task Styling
+  * Table with Additional Columns
+  * Task Styling or as HTML tags
   * Milestones
   * Resources
+  * Costs
+  * Plan Start and End Dates
+  * Gantt with Planned vs Executed
   * Dynamic Loading of Tasks
   * Dynamic change of format: Hour, Day, Week, Month, Quarter
-  * Load Gantt from XML
+  * Load Gantt from JSON and XML
     * From external files (including experimental support for MS Project XML files)
     * From JavaScript Strings
-  * Support for Internationalization (all hard coded strings can be overridden)
+  * Support for Internationalization 
 
-Project forked as I was unable to contact the original maintainers. This work was done to support a personal project that didn't warrant a more heavyweight system (e.g. the dojo toolkit gantt chart features).
+## Documentation
+
+See the [Documentation](./Documentation.md) wiki page or the included ``docs/index.html`` file for instructions on use.
+
+Project based on https://code.google.com/p/jsgantt/.
+
+
+## Want to Collaborate?
+
+Its easy to get it set:
+
+* Clone this repo
+* Install lib dependencies: `npm i` 
+* Install global dependencies: `npm i -g browserify nodemon onchange` 
+* Run the demo, This will start a `localhost:8080` with a live  example:  `npm start`. 
+* Use `npm run watch` or do your change in `src` and restart this command refresh the changes.
+
+For testing use `npm run test` with e2e tests.
+
+Or help us donating...
+
+[![](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=S7B43P63C5QEN)
 
-See the [Documentation](https://github.com/jsGanttImproved/jsgantt-improved/wiki/Documentation) wiki page or the included ``index.html`` file for instructions on use.
diff --git a/htdocs/includes/jsgantt/home-bg.jpg b/htdocs/includes/jsgantt/home-bg.jpg
deleted file mode 100644
index 9a035005681df8b4b293ffce45a9f67011ab6b43..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 380517
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%0DX@Tm-D1ulJgdOKRAm{&*c^>A&OBys7O
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

diff --git a/htdocs/includes/jsgantt/index.html b/htdocs/includes/jsgantt/index.html
deleted file mode 100644
index 9c73737d828..00000000000
--- a/htdocs/includes/jsgantt/index.html
+++ /dev/null
@@ -1,1167 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" class="no-js">
-
-<!-- Head -->
-  <head>
-  <!-- Meta data -->
-    <meta charset="utf-8">
-    <title>jsGantt Improved</title>
-    <meta name="description" content="FREE javascript gantt - jsGantt Improved HTML, CSS and AJAX only">
-    <meta name="keywords" content="jsgantt-improved free javascript gantt-chart html css ajax">
-    <meta name="viewport" content="width=device-width,initial-scale=1">
-
-  <!-- External resources -->
-    <!-- jQuery + Ajax [required by Bootstrap] -->
-      <script src="https://code.jquery.com/jquery-3.1.1.slim.min.js" integrity="sha384-A7FZj7v+d/sdmMqp/nOQwliLvUsJfDHW+k9Omg/a/EheAdgtzNs3hpfag6Ed950n" crossorigin="anonymous"></script>
-      <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script>
-      <!-- Required by smooth scrolling -->
-        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
-    <!-- Bootstrap v4.0.0 Alpha -->
-      <link href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous" />
-      <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script>
-    <!-- Font Awesome -->
-      <script src="https://use.fontawesome.com/78d1e57168.js"></script>
-    <!-- Google's Code Prettify -->
-      <script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js?lang=css&amp;skin=sunburst"></script>
-    <!-- Google Fonts -->
-      <link href="https://fonts.googleapis.com/css?family=Cookie|Satisfy|Kelly+Slab|Overlock" rel="stylesheet">
-
-  <!-- Internal resources -->
-    <!-- Webpage -->
-      <link href="main.css" rel="stylesheet" type="text/css" />
-      <script src="main.js" type="text/javascript"></script>
-    <!-- jsGanttImproved App -->
-      <link href="jsgantt.css" rel="stylesheet" type="text/css"/>
-      <script src="jsgantt.js" type="text/javascript"></script>
-  </head>
-
-<!-- Content -->
-  <body data-spy="scroll" data-target="#my-navbar-nav">
-  <!-- Navigation bar -->
-    <nav class="navbar navbar-toggleable-md navbar-inverse bg-inverse fixed-top">
-      <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#my-navbar-nav" aria-controls="my-navbar-nav" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <a class="navbar-brand product-name" id="my-nav-brand" href="#home">jsGanttImproved</a>
-
-      <div class="collapse navbar-collapse" id="my-navbar-nav">
-        <ul class="navbar-nav mr-auto" role="tablist">
-          <li class="nav-item">
-            <a class="nav-link" href="#home">Home <span class="sr-only">(current)</span></a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link" href="#demo">Demo</a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link" href="#features">Features</a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link" href="#usage">Usage</a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link" href="#credits">Credits</a>
-          </li>
-        </ul>
-        <form class="form-inline my-2 my-lg-0">
-          <a class="btn btn-outline-danger my-2 my-sm-0 mx-1" href="https://api.github.com/repos/jsGanttImproved/jsgantt-improved/zipball">Download</a>
-          <a class="btn btn-outline-primary my-2 my-sm-0 mx-1" href="https://github.com/jsGanttImproved/jsgantt-improved" target="_blank">View on GitHub</a>
-        </form>
-      </div>
-    </nav>
-
-  <!-- Content -->
-    <!-- Home -->
-      <div class="container-fluid" id="home">
-        <div class="row"> 
-          <div class="col-lg-6 text-center">
-            <h1 class="display-1 product-name" id="home-title">jsGanttImproved</h1>
-            <h2 class="display-2" id="home-subtitle">latest v1.7.5.4</h2>
-            <a class="btn btn-danger my-2 my-sm-0 mx-1" href="https://api.github.com/repos/jsGanttImproved/jsgantt-improved/zipball">Download</a>
-            <a class="btn btn-primary my-2 my-sm-0 mx-1" href="https://github.com/jsGanttImproved/jsgantt-improved" target="_blank">View on GitHub</a>
-          </div>
-          <div class="col-lg-6">
-            <div class="card text-center" id="slide-card">
-              <div class="card-block">
-                <span class="card-text slide">
-                  <p><i class="fa fa-code slide-icon"></i></p>
-                  <p>100% HTML + CSS + JavaScript Gantt Chart</p>
-                </span>
-                <span class="card-text slide">
-                  <p><i class="fa fa-usd slide-icon"></i></p>
-                  <p>Completely FREE</p>
-                </span>
-                <span class="card-text slide">
-                  <p><i class="fa fa-github slide-icon"></i></p>
-                  <p>Open source</p>
-                </span>
-              </div>
-              <div class="card-footer text-muted" id="slide-dots">
-                <span class="dot"></span>
-                <span class="dot"></span>
-                <span class="dot"></span>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="row">
-          <div class="col text-center">
-            <a class="btn btn-outline-info" href="#demo" id="learn-more"><i class="fa fa-chevron-down"></i></a>
-          </div>
-        </div>
-      </div>
-    <!-- Demo -->
-      <div class="container-fluid section" id="demo">
-        <h1>Demo</h1>
-        <div class="btn-group" data-toggle="buttons">
-          <label class="btn btn-primary btn-demo">
-            <input type="checkbox" autocomplete="off"><i class="fa fa-code"></i> Embedded Code
-          </label>
-          <label class="btn btn-primary btn-demo">
-            <input type="checkbox" autocomplete="off"><i class="fa fa-file-code-o"></i> External XML File
-          </label>
-        </div>
-        <div id="embedded-Gantt">
-          <script type="text/javascript">
-var g = new JSGantt.GanttChart(document.getElementById('embedded-Gantt'), 'week');
-if (g.getDivId() != null) {
-  g.setCaptionType('Complete');  // Set to Show Caption (None,Caption,Resource,Duration,Complete)
-  g.setQuarterColWidth(36);
-  g.setDateTaskDisplayFormat('day dd month yyyy'); // Shown in tool tip box
-  g.setDayMajorDateDisplayFormat('mon yyyy - Week ww') // Set format to display dates in the "Major" header of the "Day" view
-  g.setWeekMinorDateDisplayFormat('dd mon') // Set format to display dates in the "Minor" header of the "Week" view
-  g.setShowTaskInfoLink(1); // Show link in tool tip (0/1)
-  g.setShowEndWeekDate(0); // Show/Hide the date for the last day of the week in header for daily view (1/0)
-  g.setUseSingleCell(10000); // Set the threshold at which we will only use one cell per table row (0 disables).  Helps with rendering performance for large charts.
-  g.setFormatArr('Day', 'Week', 'Month', 'Quarter'); // Even with setUseSingleCell using Hour format on such a large chart can cause issues in some browsers
-  // Parameters                     (pID, pName,                  pStart,       pEnd,        pStyle,         pLink (unused)  pMile, pRes,       pComp, pGroup, pParent, pOpen, pDepend, pCaption, pNotes, pGantt)
-  g.AddTaskItem(new JSGantt.TaskItem(1,   'Define Chart API',     '',           '',          'ggroupblack',  '',                 0, 'Brian',    0,     1,      0,       1,     '',      '',      'Some Notes text', g ));
-  g.AddTaskItem(new JSGantt.TaskItem(11,  'Chart Object',         '2017-02-20','2017-02-20', 'gmilestone',   '',                 1, 'Shlomy',   100,   0,      1,       1,     '',      '',      '',      g));
-  g.AddTaskItem(new JSGantt.TaskItem(12,  'Task Objects',         '',           '',          'ggroupblack',  '',                 0, 'Shlomy',   40,    1,      1,       1,     '',      '',      '',      g));
-  g.AddTaskItem(new JSGantt.TaskItem(121, 'Constructor Proc',     '2017-02-21','2017-03-09', 'gtaskblue',    '',                 0, 'Brian T.', 60,    0,      12,      1,     '',      '',      '',      g));
-  g.AddTaskItem(new JSGantt.TaskItem(122, 'Task Variables',       '2017-03-06','2017-03-11', 'gtaskred',     '',                 0, 'Brian',    60,    0,      12,      1,     121,     '',      '',      g));
-  g.AddTaskItem(new JSGantt.TaskItem(123, 'Task by Minute/Hour',  '2017-03-09','2017-03-14 12:00', 'gtaskyellow', '',            0, 'Ilan',     60,    0,      12,      1,     '',      '',      '',      g));
-  g.AddTaskItem(new JSGantt.TaskItem(124, 'Task Functions',       '2017-03-09','2017-03-29', 'gtaskred',     '',                 0, 'Anyone',   60,    0,      12,      1,     '123SS', 'This is a caption', null, g));
-  g.AddTaskItem(new JSGantt.TaskItem(2,   'Create HTML Shell',    '2017-03-24','2017-03-24', 'gtaskyellow',  '',                 0, 'Brian',    20,    0,      0,       1,     122,     '',      '',      g));
-  g.AddTaskItem(new JSGantt.TaskItem(3,   'Code Javascript',      '',           '',          'ggroupblack',  '',                 0, 'Brian',    0,     1,      0,       1,     '',      '',      '',      g));
-  g.AddTaskItem(new JSGantt.TaskItem(31,  'Define Variables',     '2017-02-25','2017-03-17', 'gtaskpurple',  '',                 0, 'Brian',    30,    0,      3,       1,     '',      'Caption 1','',   g));
-  g.AddTaskItem(new JSGantt.TaskItem(32,  'Calculate Chart Size', '2017-03-15','2017-03-24', 'gtaskgreen',   '',                 0, 'Shlomy',   40,    0,      3,       1,     '',      '',      '',      g));
-  g.AddTaskItem(new JSGantt.TaskItem(33,  'Draw Task Items',      '',           '',          'ggroupblack',  '',                 0, 'Someone',  40,    2,      3,       1,     '',      '',      '',      g));
-  g.AddTaskItem(new JSGantt.TaskItem(332, 'Task Label Table',     '2017-03-06','2017-03-09', 'gtaskblue',    '',                 0, 'Brian',    60,    0,      33,      1,     '',      '',      '',      g));
-  g.AddTaskItem(new JSGantt.TaskItem(333, 'Task Scrolling Grid',  '2017-03-11','2017-03-20', 'gtaskblue',    '',                 0, 'Brian',    0,     0,      33,      1,     '332',   '',      '',      g));
-  g.AddTaskItem(new JSGantt.TaskItem(34,  'Draw Task Bars',       '',           '',          'ggroupblack',  '',                 0, 'Anybody',  60,    1,      3,       0,     '',      '',      '',      g));
-  g.AddTaskItem(new JSGantt.TaskItem(341, 'Loop each Task',       '2017-03-26','2017-04-11', 'gtaskred',     '',                 0, 'Brian',    60,    0,      34,      1,     '',      '',      '',      g));
-  g.AddTaskItem(new JSGantt.TaskItem(342, 'Calculate Start/Stop', '2017-04-12','2017-05-18', 'gtaskpink',    '',                 0, 'Brian',    60,    0,      34,      1,     '',      '',      '',      g));
-  g.AddTaskItem(new JSGantt.TaskItem(343, 'Draw Task Div',        '2017-05-13','2017-05-17', 'gtaskred',     '',                 0, 'Brian',    60,    0,      34,      1,     '',      '',      '',      g));
-  g.AddTaskItem(new JSGantt.TaskItem(344, 'Draw Completion Div',  '2017-05-17','2017-06-04', 'gtaskred',     '',                 0, 'Brian',    60,    0,      34,      1,     "342,343",'',     '',      g));
-  g.AddTaskItem(new JSGantt.TaskItem(35,  'Make Updates',         '2017-07-17','2017-09-04', 'gtaskpurple',  '',                 0, 'Brian',    30,    0,      3,       1,     '333',   '',      '',      g));
-
-  g.Draw();
-} else {
-  alert("Error, unable to create Gantt Chart");
-}
-          </script>
-        </div>
-        <div id="external-Gantt">
-          <script type="text/javascript">
-var g = new JSGantt.GanttChart(document.getElementById('external-Gantt'), 'day');
-
-if (g.getDivId() != null) {
-  g.setCaptionType('Resource');  // Set to Show Caption (None,Caption,Resource,Duration,Complete)
-  g.setShowTaskInfoLink(1); // Show link in tool tip (0/1)
-  g.setDayMajorDateDisplayFormat('dd mon');
-  g.setDateTaskDisplayFormat('dd month yyyy HH:MI');
-  // Use the XML file parser
-  JSGantt.parseXML('project.xml', g)
-
-  g.Draw();
-} else {
-  alert("Error, unable to create Gantt Chart");
-}
-          </script>
-        </div>
-      </div>
-    <!-- Features -->
-      <div class="container-fluid section" id="features">
-        <h1>Features</h1>
-        <p>jsGanttImproved is a fully featured gantt chart component built entirely in Javascript, CSS and AJAX. It is lightweight and there is no need of external libraries or additional images.</p>
-        <div class="row">
-          <div class="col-lg">
-            <h2>Basic Features</h2>
-            <ul>
-              <li>Tasks &amp; Collapsible Task Groups</li>
-              <li>Multiple Dependencies</li>
-              <li>Task Completion</li>
-              <li>Task Style</li>
-              <li>Milestones</li>
-              <li>Resources</li>
-            </ul>
-          </div>
-          <div class="col-lg">
-            <h2>Advanced Features</h3>
-            <ul>
-              <li>Dynamic Loading of Tasks</li>
-              <li>Dynamic change of format: Hour, Day, Week, Month, Quarter</li>
-              <li>
-                Load Gantt from:
-                <ul>
-                  <li>External XML files (including experimental support for Microsoft Project XML files)</li>
-                  <li>JavaScript strings</li>
-                </ul>
-              </li>
-              <li>Export Gantt as XML string</li>
-              <li>Support for internationalization</li>
-            </ul>
-          </div>
-        </div>
-        <h2>Current Known Issues:</h3>
-        <ul>
-          <li>If the browser is viewing the page at anything other than 100% zoom then bars may not be sized or positioned correctly.</li>
-        </ul>
-        <h2>Changelog:</h3>
-        <p>Check the full list of changes on <a href="https://github.com/jsGanttImproved/jsgantt-improved/releases">GitHub releases page</a>.</p>
-        <h3>v1.7.5.4:</h3>
-        <ul>
-          <li>Left part of the chart is now created first on JavaScript and establishes the left floating reference</li>
-          <li>Minimum width updated to 632px so that the left part of the chart has a fixed width of 532px and the right part fills out the rest with a minimum of 100px</li>
-        </ul>
-        <h3>v1.7.5.3:</h3>
-        <ul>
-          <li>Fixed group completion percentage that now is a weighted average</li>
-          <li>Start and end dates specified on standard group tasks will now be respected if they fall outside of the calculated group date range</li>
-          <li>Fixed problem that would occur if Tool Tips were disabled</li>
-          <li>Moved example dates forward so the current date marker is visible</li>
-        </ul>
-        <h3>v1.7.5:</h3>
-        <ul>
-          <li>Project Migrated to GitHub</li>
-          <li>Instantiating a new JSGantt.TaskItem will now also accept Date objects for start and end dates</li>
-          <li>Fixed old Internet Explorer compatibilty broken by v1.7</li>
-          <li>Fixed bug in Iso week date format</li>
-          <li>Changed to solid arrows on dependency lines to be more printer friendly</li>
-          <li>Code refactoring and clean up</li>
-        </ul>
-        <h3>v1.7:</h3>
-        <ul>
-          <li>
-            Fixed nasty long-standing bug where the first Gantt chart created must be stored in a javascript variable named &quot;g&quot;
-            <ul>
-              <li>NOTE: This required a change in the method to instatiate a JSGantt.TaskItem object to pass the related chart.</li>
-              <li>A temporary fix is included that still assumes the use of "g" for the chart if the chart object is not passed, this will be removed in v1.8</li>
-            </ul>
-          </li>
-          <li>Altered XML export functionality so that dates are output in the specified input format for the chart</li>
-          <li>Added method to read XML directly from an input string</li>
-          <li>Prevented creation of a task with a duplicate &quot;unique&quot; ID</li>
-          <li>Fixed bug where attempting to remove the first task defined would prevent the chart from redrawing</li>
-          <li>Some general code clean up</li>
-        </ul>
-      </div>
-    <!-- Usage -->
-      <div class="container-fluid section" id="usage">
-        <h1>Usage</h1>
-        <p>Following the steps below you will be able to get create a basic Gantt Chart. If you notice any bugs, please post them to <a href="https://github.com/jsGanttImproved/jsgantt-improved/issues">GitHub&nbsp;issues</a>.</p>
-        <ol>
-          <li>
-            Include JSGantt CSS and Javascript
-            <pre class="prettyprint lang-html code-block"><code>&lt;link rel="stylesheet" type="text/css" href="jsgantt.css" /&gt;
-&lt;script language="javascript" src="jsgantt.js"&gt;&lt;/script&gt;</code></pre>
-          </li>
-          <li>
-            Create a div element to hold the gantt chart
-            <pre class="prettyprint lang-html"><code>&lt;div style="position:relative" class="gantt" id="GanttChartDIV"&gt;&lt;/div&gt;</code></pre>
-          </li>
-          <li>
-            Start a &lt;script&gt; block
-            <pre class="prettyprint lang-html"><code>&lt;script type="text/javascript"&gt;</code></pre>
-          </li>
-          <li>
-            Instantiate JSGantt using GanttChart()
-            <pre class="prettyprint lang-js"><code>var g = new JSGantt.GanttChart(document.getElementById('GanttChartDIV'), 'day');</code></pre>
-            <p>Method definition:
-              <strong>GanttChart(<em>pDiv, pFormat</em>)</strong>
-            </p>
-            <p><table>
-              <tr>
-                <th>pDiv:</th>
-                <td>(required) this is a DIV object created in HTML</td>
-              </tr>
-              <tr>
-                <th>pFormat:</th>
-                <td>(required) - used to indicate whether chart should be drawn in "hour", "day", "week", "month", or "quarter" format</td>
-              </tr>
-            </table></p>
-          </li>
-          <li>
-            <p>Customize the look and feel using configuration methods (see <a href="#options">Configuration Options</a>)</p>
-          </li>
-          <li>
-            Add Tasks
-            <ul>
-              <li>
-                using AddTaskItem()
-                <pre class="prettyprint lang-js"><code>g.AddTaskItem(new JSGantt.TaskItem(1, 'Define Chart API','',          '',          'ggroupblack','', 0, 'Brian', 0,  1,0,1,'','','Some Notes text',g));
-g.AddTaskItem(new JSGantt.TaskItem(11,'Chart Object',    '2016-02-20','2016-02-20','gmilestone', '', 1, 'Shlomy',100,0,1,1,'','','',g));
-                </code></pre>
-                <p>Method definition:
-                  <strong>TaskItem(<em>pID, pName, pStart, pEnd, pColor, pLink, pMile, pRes, pComp, pGroup, pParent, pOpen, pDepend, pCaption, pNotes, pGantt</em>)</strong>
-                </p>
-                <table>
-                  <tr>
-                    <th>pID:</th>
-                    <td>(required) a unique numeric ID used to identify each row</td>
-                  </tr>
-                  <tr>
-                    <th>pName:</th>
-                    <td>(required) the task Label</td>
-                  </tr>
-                  <tr>
-                    <th>pStart:</th>
-                    <td>(required) the task start date, can enter empty date ('') for groups. You can also enter specific time (2016-02-20 12:00) for additional precision.</td>
-                  </tr>
-                  <tr>
-                    <th>pEnd:</th>
-                    <td>(required) the task end date, can enter empty date ('') for groups</td>
-                  </tr>
-                  <tr>
-                    <th>pClass:</th>
-                    <td>(required) the css class for this task</td>
-                  </tr>
-                  <tr>
-                    <th>pLink:</th>
-                    <td>(optional) any http link to be displayed in tool tip as the "More information" link.</td>
-                  </tr>
-                  <tr>
-                    <th>pMile:</th>
-                    <td>(optional) indicates whether this is a milestone task - Numeric; 1 = milestone, 0 = not milestone</td>
-                  </tr>
-                  <tr>
-                    <th>pRes:</th>
-                    <td>(optional) resource name</td>
-                  </tr>
-                  <tr>
-                    <th>pComp:</th>
-                    <td>(required) completion percent, numeric</td>
-                  </tr>
-                  <tr>
-                    <th>pGroup:</th>
-                    <td>(optional) indicates whether this is a group task (parent) - Numeric; 0 = normal task, 1 = standard group task, 2 = combined group task<a href='#combinedtasks' class="footnote">*</a></td>
-                  </tr>
-                  <tr>
-                    <th>pParent:</th>
-                    <td>(required) identifies a parent pID, this causes this task to be a child of identified task. Numeric, top level tasks should have pParent set to 0</td>
-                  </tr>
-                  <tr>
-                    <th>pOpen:</th>
-                    <td>(required) indicates whether a standard group task is open when chart is first drawn. Value must be set for all items but is only used by standard group tasks.  Numeric, 1 = open, 0 = closed</td>
-                  </tr>
-                  <tr>
-                    <th>pDepend:</th>
-                    <td>
-                      (optional) comma separated list of id&#39;s this task is dependent on. A line will be drawn from each listed task to this item<br />Each id can optionally be followed by a dependency type suffix. Valid values are:
-                      <blockquote>'FS' - Finish to Start (default if suffix is omitted)<br />'SF' - Start to Finish<br />'SS' - Start to Start<br />'FF' - Finish to Finish</blockquote>
-                      If present the suffix must be added directly to the id e.g. '123SS'
-                    </td>
-                  </tr>
-                  <tr>
-                    <th>pCaption:</th>
-                    <td>(optional) caption that will be added after task bar if CaptionType set to "Caption"</td>
-                  </tr>
-                  <tr>
-                    <th>pNotes:</th>
-                    <td>(optional) Detailed task information that will be displayed in tool tip for this task</td>
-                  </tr>
-                  <tr>
-                    <th>pGantt:</th>
-                    <td>(required) javascript JSGantt.GanttChart object from which to take settings.  Defaults to &quot;g&quot; for backwards compatibility</td>
-                  </tr>
-                </table>
-                <p id='combinedtasks'><span style="color: red;">*</span> Combined group tasks show all sub-tasks on one row. The information displayed in the task list and row caption are taken from the parent task.  Tool tips are generated individually for each sub-task from its own information.  Milestones are not valid as sub-tasks of a combined group task and will not be displayed. No bounds checking of start and end dates of sub-tasks is performed therefore it is possible for these task bars to overlap. Dependencies can be set to and from sub-tasks only.</p>
-              </li>
-              <li>
-                using parseXML() with an external XML file
-                <pre class="prettyprint lang-js"><code>JSGantt.parseXML("project.xml",g);</code></pre>
-                <p>Method definition:
-                  <strong>JSGantt.parseXML(<em>pFile, pGanttObj</em>)</strong>
-                </p>
-                <table>
-                  <tr>
-                    <th>pFile:</th>
-                    <td>(required) this is the filename of the XML</td>
-                  </tr>
-                  <tr>
-                    <th>pGanttObj:</th>
-                    <td>(required) a GanttChart object returned by a call to JSGantt.GanttChart()</td>
-                  </tr>
-                </table>
-                <p>The structure of the native XML file:</p>
-                <pre class="prettyprint lang-ml"><code>&lt;project&gt;
-  &lt;task&gt;
-    &lt;pID&gt;25&lt;/pID&gt;
-    &lt;pName&gt;WCF Changes&lt;/pName&gt;
-    &lt;pStart&gt;&lt;/pStart&gt;
-    &lt;pEnd&gt;&lt;/pEnd&gt;
-    &lt;pClass&gt;gtaskred&lt;/pClass&gt;
-    &lt;pLink&gt;&lt;/pLink&gt;
-    &lt;pMile&gt;0&lt;/pMile&gt;
-    &lt;pRes&gt;&lt;/pRes&gt;
-    &lt;pComp&gt;0&lt;/pComp&gt;
-    &lt;pGroup&gt;1&lt;/pGroup&gt;
-    &lt;pParent&gt;2&lt;/pParent&gt;
-    &lt;pOpen&gt;1&lt;/pOpen&gt;
-    &lt;pDepend&gt;2,24&lt;/pDepend&gt;
-    &lt;pCaption&gt;A caption&lt;/pCaption&gt;
-    &lt;pNotes&gt;Text - can include limited HTML&lt;/pNotes&gt;
-  &lt;/task&gt;
-&lt;/project&gt;</code></pre>
-                <p>Field definitions are as described for the parameters to TaskItem above. The pClass element is optional in XML files and will default to "ggroupblack" for group tasks, "gtaskblue" for normal tasks and "gmilestone" for milestones. The pGantt element is not required for XML import.</p>
-                <p>JSGannt Improved will also test the provided XML file to see if it appears to be in Microsoft Project XML format. If so an attempt will be made to load up the project. This feature is experimental, the import is best effort and not guaranteed. Once loaded the project as interpreted by JSGantt Improved can be extracted using the <a href="#xmlExport">XML Export methods</a> provided.</p>
-              </li>
-              <li>
-                using parseXMLString() with XML held in a javascript string object
-                <pre class="prettyprint lang-js"><code>JSGantt.parseXMLString("&lt;project&gt;&lt;task&gt;...&lt;/task&gt;&lt;/project&gt;",g);</code></pre>
-                <p>Method definition:
-                  <strong>JSGantt.parseXMLString(<em>pStr, pGanttObj</em>)</strong>
-                </p>
-                <table>
-                  <tr>
-                    <th>pStr:</th>
-                    <td>(required) this is a javascript String containing XML</td>
-                  </tr>
-                  <tr>
-                    <th>pGanttObj:</th>
-                    <td>(required) a GanttChart object returned by a call to JSGantt.GanttChart()</td>
-                  </tr>
-                </table>
-                <p>The XML provided will be parsed in exactly the same way as the contents of an external XML file and hence must match the format as described for JSGantt.parseXML() above</p>
-              </li>
-            </ul>
-          </li>
-          <li>
-            <p>Call Draw()</p>
-            <pre class="prettyprint lang-js"><code>g.Draw();</code></pre>
-          </li>
-          <li>
-            <p>Close the &lt;script&gt; block</p>
-            <pre class="prettyprint lang-html"><code>&lt;/script&gt;</code></pre>
-          </li>
-        </ol>
-        <p>It is possible to add items to the chart in realtime via javascript using either direct method calls or additional XML files.
-          It is also possible to delete tasks using RemoveTaskItem() method.
-        </p>
-        <pre class="prettyprint lang-js"><code>g.RemoveTaskItem(11);</code></pre>
-        <p>Method definition:
-          <strong>RemoveTaskItem(<em>pID</em>)</strong>
-        </p>
-        <table>
-          <tr>
-            <th>pID:</th>
-            <td>(required) the unique numeric ID of the item to be removed</td>
-          </tr>
-        </table>
-        <p>If the task removed is a group item, all child tasks will also be removed. </p>
-        <p>After adding or removing tasks a call to "g.Draw()" must be made to redraw the chart.</p>
-        <h2 id="options">Configuration Options</h2>
-        <h3>Switches</h3>
-        <p>Many of the features of jsGanttImproved can be customised through the use of setter methods available on the GanttChart object returned by a call to JSGantt.GanttChart()</p>
-        <p>The following options take a single numeric parameter; a value of 1 will enable the describe functionality, 0 will disable it</p>
-        <table class="configlist">
-          <tr>
-            <th id="setUseToolTip">setUseToolTip():</th>
-            <td>Controls the display of tool tip boxes, defaults to 1 (enabled)</td>
-          </tr>
-          <tr>
-            <th id="setUseFade">setUseFade():</th>
-            <td>Controls use of the fade effect when showing/hiding tool tips, defaults to 1 (enabled)</td>
-          </tr>
-          <tr>
-            <th id="setUseMove">setUseMove():</th>
-            <td>Controls use of the sliding effect when changing between different task tool tips, defaults to 1 (enabled)</td>
-          </tr>
-          <tr>
-            <th id="setUseRowHlt">setUseRowHlt():</th>
-            <td>Controls the use of row mouseover highlighting, defaults to 1 (enabled)</td>
-          </tr>
-          <tr>
-            <th id="setUseSort">setUseSort():</th>
-            <td>Controls whether the task list is sorted into parent task / start time order or is simply displayed in the order created, defaults to 1 (sort enabled)</td>
-          </tr>
-          <tr>
-            <th id="setShowRes">setShowRes():</th>
-            <td>Controls whether the Resource column is displayed in the task list, defaults to 1 (show column)</td>
-          </tr>
-          <tr>
-            <th id="setShowDur">setShowDur():</th>
-            <td>Controls whether the Task Duration column is displayed in the task list, defaults to 1 (show column)</td>
-          </tr>
-          <tr>
-            <th id="setShowComp">setShowComp():</th>
-            <td>Controls whether the Percentage Complete column is displayed in the task list, defaults to 1 (show column)</td>
-          </tr>
-          <tr>
-            <th id="setShowStartDate">setShowStartDate():</th>
-            <td>Controls whether the Task Start Date column is displayed in the task list, defaults to 1 (show column)</td>
-          </tr>
-          <tr>
-            <th id="setShowEndDate">setShowEndDate():</th>
-            <td>Controls whether the Task End Date column is displayed in the task list, defaults to 1 (show column)</td>
-          </tr>
-          <tr>
-            <th id="setShowTaskInfoRes">setShowTaskInfoRes():</th>
-            <td>Controls whether the Resource information is displayed in the task tool tip, defaults to 1 (show information)</td>
-          </tr>
-          <tr>
-            <th id="setShowTaskInfoDur">setShowTaskInfoDur():</th>
-            <td>Controls whether the Task Duration information is displayed in the task tool tip, defaults to 1 (show information)</td>
-          </tr>
-          <tr>
-            <th id="setShowTaskInfoComp">setShowTaskInfoComp():</th>
-            <td>Controls whether the Percentage Complete information is displayed in the task tool tip, defaults to 1 (show information)</td>
-          </tr>
-          <tr>
-            <th id="setShowTaskInfoStartDate">setShowTaskInfoStartDate():</th>
-            <td>Controls whether the Task Start Date information is displayed in the task tool tip, defaults to 1 (show information)</td>
-          </tr>
-          <tr>
-            <th id="setShowTaskInfoEndDate">setShowTaskInfoEndDate():</th>
-            <td>Controls whether the Task End Date information is displayed in the task tool tip, defaults to 1 (show information)</td>
-          </tr>
-          <tr>
-            <th id="setShowTaskInfoLink">setShowTaskInfoLink():</th>
-            <td>Controls whether the More Information link is displayed in the task tool tip, defaults to 0 (do NOT show link)</td>
-          </tr>
-          <tr>
-            <th id="setShowTaskInfoNotes">setShowTaskInfoNotes():</th>
-            <td>Controls whether the Additional Notes data is displayed in the task tool tip, defaults to 1 (show notes)</td>
-          </tr>
-          <tr>
-            <th id="setShowEndWeekDate">setShowEndWeekDate():</th>
-            <td>Controls whether the major heading in "Day" view displays the week end-date in the appropriate format (see <a href="#setDayMajorDateDisplayFormat">below</a>), defaults to 1 (show date)</td>
-          </tr>
-          <tr>
-            <th id="setShowDeps">setShowDeps():</th>
-            <td>Controls display of dependancy lines, defaults to 1 (show dependencies)</td>
-          </tr>
-        </table>
-        <h3>Key Values</h3>
-        <p>The following options enable functionality using a set of specific key values</p>
-        <table class="configlist">
-          <tr>
-            <th id="setShowSelector">setShowSelector():</th>
-            <td>Controls where the format selector is displayed, accepts multiple parameters.<br/>Valid parameter values are &quot;Top&quot;, &quot;Bottom&quot;.<br/>Defaults to "Top".</td>
-          </tr>
-          <tr>
-            <th id="setFormatArr">setFormatArr():</th>
-            <td>Controls which format options are shown in the format selector, accepts multiple parameters.<br/>Valid parameter values are &quot;Hour&quot;, &quot;Day&quot;, &quot;Week&quot;, &quot;Month&quot;, &quot;Quarter&quot;.<br/>Defaults to all valid values.</td>
-          </tr>
-          <tr>
-            <th id="setCaptionType">setCaptionType():</th>
-            <td>Controls which task field to use as a caption on the Gantt Chart task bar, accepts a single parameter.<br/>Valid parameter values are &quot;None&quot;, &quot;Caption&quot;, &quot;Resource&quot;, &quot;Duration&quot;, &quot;Complete&quot;.<br/>Defaults to &quot;None&quot;</td>
-          </tr>
-          <tr>
-            <th id="setDateInputFormat">setDateInputFormat():</th>
-            <td>Defines the input format used for dates in task creation, accepts a single parameter.<br/>Valid parameter values are &quot;yyyy-mm-dd&quot;, &quot;dd/mm/yyyy&quot;, &quot;mm/dd/yyyy&quot;.<br/>Defaults to &quot;yyyy-mm-dd&quot;</td>
-          </tr>
-          <tr>
-            <th id="setScrollTo">setScrollTo():</th>
-            <td>Sets the date the Gantt Chart will be scrolled to, specified in the date input format set by setDateInputFormat() above. Also accepts the special value &quot;today&quot;<br/>Defaults to minimum display date</td>
-          </tr>
-          <tr>
-            <th id="setUseSingleCell">setUseSingleCell():</th>
-            <td>Sets the threshold total number of cells at which the task list will use a single table cell for each row rather than one cell per period.  Useful to improve performance on large charts.  A value of 0 disables this functionality (always use multiple cells), defaults to 25000</td>
-          </tr>
-          <tr>
-            <th id="setLang">setLang():</th>
-            <td>Sets translation to use when drawing the chart.  Defaults to "en" as this is the only language provided in the base installation (see <a href="#optionsLanguage">internationalization</a> below for details on how to add more translations.)</td>
-          </tr>
-        </table>
-        <h3>Layout</h3>
-        <p>Most of the look and feel of the Gantt Chart can be controlled using CSS however, as the length of a task bar is determined by column width, the following methods take a single numeric parameter that defines the appropriate column width in pixels.</p>
-        <p>Note that the task bar sizing code assumes the use of collapsed table borders 1px wide.</p>
-        <table class="configlist">
-          <tr>
-            <th id="setHourColWidth">setHourColWidth():</th>
-            <td>Width of Gantt Chart columns in pixels when drawn in "Hour" format. Defaults to 18.</td>
-          </tr>
-          <tr>
-            <th id="setDayColWidth">setDayColWidth():</th>
-            <td>Width of Gantt Chart columns in pixels when drawn in "Day" format. Defaults to 18.</td>
-          </tr>
-          <tr>
-            <th id="setWeekColWidth">setWeekColWidth():</th>
-            <td>Width of Gantt Chart columns in pixels when drawn in "Week" format. Defaults to 36.</td>
-          </tr>
-          <tr>
-            <th id="setMonthColWidth">setMonthColWidth():</th>
-            <td>Width of Gantt Chart columns in pixels when drawn in "Month" format. Defaults to 36.</td>
-          </tr>
-          <tr>
-            <th id="setQuarterColWidth">setQuarterColWidth():</th>
-            <td>Width of Gantt Chart columns in pixels when drawn in "Quarter" format, although not mandatory it is recommended that this be set to a value divisible by 3. Defaults to 18.</td>
-          </tr>
-          <tr>
-            <th id="setRowHeight">setRowHeight():</th>
-            <td>Height of Gantt Chart rows in pixels. Used to route dependency lines near end points. Defaults to 20.</td>
-          </tr>
-          <tr>
-            <th id="setMinGpLen">setMinGpLen():</th>
-            <td>Group tasks have their task bars embellished with end points, this value specifies the width of one of these end points in pixels.  A short task bar&#39;s length will be rounded up to display either a single or both endpoints correctly. Defaults to 8.</td>
-          </tr>
-        </table>
-        <h3>Display Date Formats</h3>
-        <p>Date display formats can be individually controlled. The methods used to set these display formats each take a single format string parameter.  The format string can be made up of the following components (case sensitive)</p>
-        <blockquote>
-          <table>
-            <tr>
-              <th>h:</th>
-              <td>Hour (1-12)</td>
-            </tr>
-            <tr>
-              <th>hh:</th>
-              <td>Hour (01-12)</td>
-            </tr>
-            <tr>
-              <th>pm:</th>
-              <td>am/pm indicator</td>
-            </tr>
-            <tr>
-              <th>PM:</th>
-              <td>AM/PM indicator</td>
-            </tr>
-            <tr>
-              <th>H:</th>
-              <td>Hour (0-23)</td>
-            </tr>
-            <tr>
-              <th>HH:</th>
-              <td>Hour (01-23)</td>
-            </tr>
-            <tr>
-              <th>mi:</th>
-              <td>Minutes (1-59)</td>
-            </tr>
-            <tr>
-              <th>MI:</th>
-              <td>Minutes (01-59)</td>
-            </tr>
-            <tr>
-              <th>d:</th>
-              <td>Day (1-31)</td>
-            </tr>
-            <tr>
-              <th>dd:</th>
-              <td>Day (01-31)</td>
-            </tr>
-            <tr>
-              <th>day:</th>
-              <td>Abbreviated day of week</td>
-            </tr>
-            <tr>
-              <th>DAY:</th>
-              <td>Day of week</td>
-            </tr>
-            <tr>
-              <th>m:</th>
-              <td>Month (1-12)</td>
-            </tr>
-            <tr>
-              <th>mm:</th>
-              <td>Month (01-12)</td>
-            </tr>
-            <tr>
-              <th>mon:</th>
-              <td>Abbreviated month text</td>
-            </tr>
-            <tr>
-              <th>month:</th>
-              <td>Full month text</td>
-            </tr>
-            <tr>
-              <th>yy:</th>
-              <td>Year, excluding century</td>
-            </tr>
-            <tr>
-              <th>yyyy:</th>
-              <td>Year</td>
-            </tr>
-            <tr>
-              <th>q:</th>
-              <td>Quarter (1-4)</td>
-            </tr>
-            <tr>
-              <th>qq:</th>
-              <td>Quarter (Q1-Q4)</td>
-            </tr>
-            <tr>
-              <th>w:</th>
-              <td>ISO Week number (1-53)</td>
-            </tr>
-            <tr>
-              <th>ww:</th>
-              <td>ISO Week number (01-53)</td>
-            </tr>
-            <tr>
-              <th>week:</th>
-              <td>Full ISO Week date format</td>
-            </tr>
-          </table>
-          <p>separated by one of the following characters: <strong>&quot;/\-.,&#39;&lt;space&gt;:</strong></p>
-          <p>Any text between separators that does not match one of the components above will be checked using a case insensitive match for a valid internationalized string (see <a href="#optionsLanguage">internationalization</a> below).  If the value is still not found the text will be output unchanged.</p>
-        </blockquote>
-        <p>The available date display methods are</p>
-        <table class="dateconfiglist">
-          <tr>
-            <th id="setDateTaskTableDisplayFormat">setDateTaskTableDisplayFormat():</th>
-            <td>Date format used for start and end dates in the main task list. Defaults to 'dd/mm/yyyy'.</td>
-          </tr>
-          <tr>
-            <th id="setDateTaskDisplayFormat">setDateTaskDisplayFormat():</th>
-            <td>Date format used for start and end dates in task tool tips. Defaults to 'dd month yyyy'.</td>
-          </tr>
-          <tr>
-            <th id="setHourMajorDateDisplayFormat">setHourMajorDateDisplayFormat():</th>
-            <td>Date format used for Gantt Chart major date headings displayed in "Hour" format. Defaults to 'day dd month yyyy'.</td>
-          </tr>
-          <tr>
-            <th id="setDayMajorDateDisplayFormat">setDayMajorDateDisplayFormat():</th>
-            <td>Date format used for Gantt Chart major date headings displayed in "Day" format. Defaults to 'dd/mm/yyyy'.</td>
-          </tr>
-          <tr>
-            <th id="setWeekMajorDateDisplayFormat">setWeekMajorDateDisplayFormat():</th>
-            <td>Date format used for Gantt Chart major date headings displayed in "Week" format. Defaults to 'yyyy'.</td>
-          </tr>
-          <tr>
-            <th id="setMonthMajorDateDisplayFormat">setMonthMajorDateDisplayFormat():</th>
-            <td>Date format used for Gantt Chart major date headings displayed in "Month" format. Defaults to 'yyyy'.</td>
-          </tr>
-          <tr>
-            <th id="setQuarterMajorDateDisplayFormat">setQuarterMajorDateDisplayFormat():</th>
-            <td>Date format used for Gantt Chart major date headings displayed in "Year" format. Defaults to 'yyyy'.</td>
-          </tr>
-          <tr>
-            <th id="setHourMinorDateDisplayFormat">setHourMinorDateDisplayFormat():</th>
-            <td>Date format used for Gantt Chart minor date headings displayed in "Hour" format. Defaults to 'HH'.</td>
-          </tr>
-          <tr>
-            <th id="setDayMinorDateDisplayFormat">setDayMinorDateDisplayFormat():</th>
-            <td>Date format used for Gantt Chart minor date headings displayed in "Day" format. Defaults to 'dd'.</td>
-          </tr>
-          <tr>
-            <th id="setWeekMinjorDateDisplayFormat">setWeekMinjorDateDisplayFormat():</th>
-            <td>Date format used for Gantt Chart minor date headings displayed in "Week" format. Defaults to 'dd/mm'.</td>
-          </tr>
-          <tr>
-            <th id="setMonthMinorDateDisplayFormat">setMonthMinorDateDisplayFormat():</th>
-            <td>Date format used for Gantt Chart minor date headings displayed in "Month" format. Defaults to 'mon'.</td>
-          </tr>
-          <tr>
-            <th id="setQuarterMinorDateDisplayFormat">setQuarterMinorDateDisplayFormat():</th>
-            <td>Date format used for Gantt Chart minor date headings displayed in "Year" format. Defaults to 'qq'.</td>
-          </tr>
-        </table>
-        <h3 id="optionsLanguage">Internationalization</h3>
-        <p>jsGanttImproved only provides English text however all hard coded strings can be replaced by calling the addLang() method available on the GanttChart object returned by a call to JSGantt.GanttChart()</p>
-        <p>The addLang() method takes two parameters.  The first is a string identifier for the language, the second is a javascript object containing all the replacement text pairs, the default English settings are:</p>
-        <blockquote>
-          <table class="multipleColumns">
-            <tbody>
-              <tr>
-                <td class="lang">
-                  <table>
-                    <tr>
-                      <th>january:</th>
-                      <td>January</td>
-                    </tr>
-                    <tr>
-                      <th>february:</th>
-                      <td>February</td>
-                    </tr>
-                    <tr>
-                      <th>march:</th>
-                      <td>March</td>
-                    </tr>
-                    <tr>
-                      <th>april:</th>
-                      <td>April</td>
-                    </tr>
-                    <tr>
-                      <th>maylong:</th>
-                      <td>May</td>
-                    </tr>
-                    <tr>
-                      <th>june:</th>
-                      <td>June</td>
-                    </tr>
-                    <tr>
-                      <th>july:</th>
-                      <td>July</td>
-                    </tr>
-                    <tr>
-                      <th>august:</th>
-                      <td>August</td>
-                    </tr>
-                    <tr>
-                      <th>september:</th>
-                      <td>September</td>
-                    </tr>
-                    <tr>
-                      <th>october:</th>
-                      <td>October</td>
-                    </tr>
-                    <tr>
-                      <th>november:</th>
-                      <td>November</td>
-                    </tr>
-                    <tr>
-                      <th>december:</th>
-                      <td>December</td>
-                    </tr>
-                    <tr>
-                      <th>jan:</th>
-                      <td>Jan</td>
-                    </tr>
-                    <tr>
-                      <th>feb:</th>
-                      <td>Feb</td>
-                    </tr>
-                    <tr>
-                      <th>mar:</th>
-                      <td>Mar</td>
-                    </tr>
-                    <tr>
-                      <th>apr:</th>
-                      <td>Apr</td>
-                    </tr>
-                    <tr>
-                      <th>may:</th>
-                      <td>May</td>
-                    </tr>
-                    <tr>
-                      <th>jun:</th>
-                      <td>Jun</td>
-                    </tr>
-                    <tr>
-                      <th>jul:</th>
-                      <td>Jul</td>
-                    </tr>
-                    <tr>
-                      <th>aug:</th>
-                      <td>Aug</td>
-                    </tr>
-                    <tr>
-                      <th>sep:</th>
-                      <td>Sep</td>
-                    </tr>
-                    <tr>
-                      <th>oct:</th>
-                      <td>Oct</td>
-                    </tr>
-                    <tr>
-                      <th>nov:</th>
-                      <td>Nov</td>
-                    </tr>
-                    <tr>
-                      <th>dec:</th>
-                      <td>Dec</td>
-                    </tr>
-                  </table>
-                </td>
-                <td class="lang">
-                  <table>
-                    <tr>
-                      <th>sunday:</th>
-                      <td>Sunday</td>
-                    </tr>
-                    <tr>
-                      <th>monday:</th>
-                      <td>Monday</td>
-                    </tr>
-                    <tr>
-                      <th>tuesday:</th>
-                      <td>Tuesday</td>
-                    </tr>
-                    <tr>
-                      <th>wednesday:</th>
-                      <td>Wednesday</td>
-                    </tr>
-                    <tr>
-                      <th>thursday:</th>
-                      <td>Thursday</td>
-                    </tr>
-                    <tr>
-                      <th>friday:</th>
-                      <td>Friday</td>
-                    </tr>
-                    <tr>
-                      <th>saturday:</th>
-                      <td>Saturday</td>
-                    </tr>
-                    <tr>
-                      <th>sun:</th>
-                      <td>Sun</td>
-                    </tr>
-                    <tr>
-                      <th>mon:</th>
-                      <td>Mon</td>
-                    </tr>
-                    <tr>
-                      <th>tue:</th>
-                      <td>Tue</td>
-                    </tr>
-                    <tr>
-                      <th>wed:</th>
-                      <td>Wed</td>
-                    </tr>
-                    <tr>
-                      <th>thu:</th>
-                      <td>Thu</td>
-                    </tr>
-                    <tr>
-                      <th>fri:</th>
-                      <td>Fri</td>
-                    </tr>
-                    <tr>
-                      <th>sat:</th>
-                      <td>Sat</td>
-                    </tr>
-                    <tr>
-                      <th>resource:</th>
-                      <td>Resource</td>
-                    </tr>
-                    <tr>
-                      <th>duration:</th>
-                      <td>Duration</td>
-                    </tr>
-                    <tr>
-                      <th>comp:</th>
-                      <td>% Comp.</td>
-                    </tr>
-                    <tr>
-                      <th>completion:</th>
-                      <td>Completion</td>
-                    </tr>
-                    <tr>
-                      <th>startdate:</th>
-                      <td>Start Date</td>
-                    </tr>
-                    <tr>
-                      <th>enddate:</th>
-                      <td>End Date</td>
-                    </tr>
-                    <tr>
-                      <th>moreinfo:</th>
-                      <td>More Information</td>
-                    </tr>
-                    <tr>
-                      <th>notes:</th>
-                      <td>Notes</td>
-                    </tr>
-                  </table>
-                </td>
-                <td class="lang">
-                  <table>
-                    <tr>
-                      <th>format:</th>
-                      <td>Format</td>
-                    </tr>
-                    <tr>
-                      <th>hour:</th>
-                      <td>Hour</td>
-                    </tr>
-                    <tr>
-                      <th>day:</th>
-                      <td>Day</td>
-                    </tr>
-                    <tr>
-                      <th>week:</th>
-                      <td>Week</td>
-                    </tr>
-                    <tr>
-                      <th>month:</th>
-                      <td>Month</td>
-                    </tr>
-                    <tr>
-                      <th>quarter:</th>
-                      <td>Quarter</td>
-                    </tr>
-                    <tr>
-                      <th>hours:</th>
-                      <td>Hours</td>
-                    </tr>
-                    <tr>
-                      <th>days:</th>
-                      <td>Days</td>
-                    </tr>
-                    <tr>
-                      <th>weeks:</th>
-                      <td>Weeks</td>
-                    </tr>
-                    <tr>
-                      <th>months:</th>
-                      <td>Months</td>
-                    </tr>
-                    <tr>
-                      <th>quarters:</th>
-                      <td>Quarters</td>
-                    </tr>
-                    <tr>
-                      <th>hr:</th>
-                      <td>Hr</td>
-                    </tr>
-                    <tr>
-                      <th>dy:</th>
-                      <td>Day</td>
-                    </tr>
-                    <tr>
-                      <th>wk:</th>
-                      <td>Wk</td>
-                    </tr>
-                    <tr>
-                      <th>mth:</th>
-                      <td>Mth</td>
-                    </tr>
-                    <tr>
-                      <th>qtr:</th>
-                      <td>Qtr</td>
-                    </tr>
-                    <tr>
-                      <th>hrs:</th>
-                      <td>Hrs</td>
-                    </tr>
-                    <tr>
-                      <th>dys:</th>
-                      <td>Days</td>
-                    </tr>
-                    <tr>
-                      <th>wks:</th>
-                      <td>Wks</td>
-                    </tr>
-                    <tr>
-                      <th>mths:</th>
-                      <td>Mths</td>
-                    </tr>
-                    <tr>
-                      <th>qtrs:</th>
-                      <td>Qtrs</td>
-                    </tr>
-                  </table>
-                </td>
-            </tbody>
-          </table>
-        </blockquote>
-        <p>When adding a language any translations that are not provided will use the default English language value.  This provides a simple way to override default strings e.g.</p>
-        <pre class="prettyprint lang-js"><code>g.addLang('en2', {'format':'Select', 'comp':'Complete'});</code></pre>
-        <p>would create a language called 'en2' where the text in the format selector was "Select" rather than "Format" and the header for the Percentage Complete column in the task list is "Complete" rather than "% Comp."</p>
-        <p>Once a translation has been added a call must be made to <a href="#setLang">setLang()</a> with the appropriate langage identifier before calling Draw().</p>
-        <h3 id="tOptionsExamples">Example Options</h3>
-        <p>The configuration options used in the example chart above are:</p>
-        <pre class="prettyprint lang-js"><code>g.setCaptionType('Complete');  // Set to Show Caption (None,Caption,Resource,Duration,Complete)
-g.setQuarterColWidth(36);
-g.setDateTaskDisplayFormat('day dd month yyyy'); // Shown in tool tip box
-g.setDayMajorDateDisplayFormat('mon yyyy - Week ww'); // Set format to display dates in the "Major" header of the "Day" view
-g.setWeekMinorDateDisplayFormat('dd mon'); // Set format to display dates in the "Minor" header of the "Week" view
-g.setShowTaskInfoLink(1); //Show link in tool tip (0/1)
-g.setShowEndWeekDate(0); // Show/Hide the date for the last day of the week in header for daily view (1/0)
-g.setUseSingleCell(10000); // Set the threshold at which we will only use one cell per table row (0 disables).  Helps with rendering performance for large charts.
-g.setFormatArr('Day', 'Week', 'Month', 'Quarter'); // Even with setUseSingleCell using Hour format on such a large chart can cause issues in some browsers
-        </code></pre>
-        <p>Putting all this information together the final code to produce the chart above is as follows:</p>
-        <pre class="prettyprint lang-html"><code>&lt;link rel="stylesheet" type="text/css" href="jsgantt.css" /&gt;
-&lt;script language="javascript" src="jsgantt.js"&gt;&lt;/script&gt;
-&lt;div style="position:relative" class="gantt" id="GanttChartDIV"&gt;&lt;/div&gt;
-&lt;script&gt;
-
-var g = new JSGantt.GanttChart('g',document.getElementById('GanttChartDIV'), 'day');
-
-if( g.getDivId() != null ) {
-g.setCaptionType('Complete');
-g.setQuarterColWidth(36);
-g.setDateTaskDisplayFormat('day dd month yyyy');
-g.setDayMajorDateDisplayFormat('mon yyyy - Week ww');
-g.setWeekMinorDateDisplayFormat('dd mon');
-g.setShowTaskInfoLink(1);
-g.setShowEndWeekDate(0);
-g.setUseSingleCell(10000);
-g.setFormatArr('Day', 'Week', 'Month', 'Quarter');
-
-g.AddTaskItem(new JSGantt.TaskItem(1,   'Define Chart API',     '',           '',          'ggroupblack',  '',       0, 'Brian',    0,   1, 0,  1, '',      '',      'Some Notes text', g ));
-g.AddTaskItem(new JSGantt.TaskItem(11,  'Chart Object',         '2016-02-20','2016-02-20', 'gmilestone',   '',       1, 'Shlomy',   100, 0, 1,  1, '',      '',      '',      g));
-g.AddTaskItem(new JSGantt.TaskItem(12,  'Task Objects',         '',           '',          'ggroupblack',  '',       0, 'Shlomy',   40,  1, 1,  1, '',      '',      '',      g));
-g.AddTaskItem(new JSGantt.TaskItem(121, 'Constructor Proc',     '2016-02-21','2016-03-09', 'gtaskblue',    '',       0, 'Brian T.', 60,  0, 12, 1, '',      '',      '',      g));
-g.AddTaskItem(new JSGantt.TaskItem(122, 'Task Variables',       '2016-03-06','2016-03-11', 'gtaskred',     '',       0, 'Brian',    60,  0, 12, 1, 121,     '',      '',      g));
-g.AddTaskItem(new JSGantt.TaskItem(123, 'Task by Minute/Hour',  '2016-03-09','2016-03-14 12:00', 'gtaskyellow', '',  0, 'Ilan',     60,  0, 12, 1, '',      '',      '',      g));
-g.AddTaskItem(new JSGantt.TaskItem(124, 'Task Functions',       '2016-03-09','2016-03-29', 'gtaskred',     '',       0, 'Anyone',   60,  0, 12, 1, '123SS', 'This is a caption', null, g));
-g.AddTaskItem(new JSGantt.TaskItem(2,   'Create HTML Shell',    '2016-03-24','2016-03-24', 'gtaskyellow',  '',       0, 'Brian',    20,  0, 0,  1, 122,     '',      '',      g));
-g.AddTaskItem(new JSGantt.TaskItem(3,   'Code Javascript',      '',           '',          'ggroupblack',  '',       0, 'Brian',    0,   1, 0,  1, '',      '',      '',      g));
-g.AddTaskItem(new JSGantt.TaskItem(31,  'Define Variables',     '2016-02-25','2016-03-17', 'gtaskpurple',  '',       0, 'Brian',    30,  0, 3,  1, '',      'Caption 1','',   g));
-g.AddTaskItem(new JSGantt.TaskItem(32,  'Calculate Chart Size', '2016-03-15','2016-03-24', 'gtaskgreen',   '',       0, 'Shlomy',   40,  0, 3,  1, '',      '',      '',      g));
-g.AddTaskItem(new JSGantt.TaskItem(33,  'Draw Task Items',      '',           '',          'ggroupblack',  '',       0, 'Someone',  40,  2, 3,  1, '',      '',      '',      g));
-g.AddTaskItem(new JSGantt.TaskItem(332, 'Task Label Table',     '2016-03-06','2016-03-09', 'gtaskblue',    '',       0, 'Brian',    60,  0, 33, 1, '',      '',      '',      g));
-g.AddTaskItem(new JSGantt.TaskItem(333, 'Task Scrolling Grid',  '2016-03-11','2016-03-20', 'gtaskblue',    '',       0, 'Brian',    0,   0, 33, 1, '332',   '',      '',      g));
-g.AddTaskItem(new JSGantt.TaskItem(34,  'Draw Task Bars',       '',           '',          'ggroupblack',  '',       0, 'Anybody',  60,  1, 3,  0, '',      '',      '',      g));
-g.AddTaskItem(new JSGantt.TaskItem(341, 'Loop each Task',       '2016-03-26','2016-04-11', 'gtaskred',     '',       0, 'Brian',    60,  0, 34, 1, '',      '',      '',      g));
-g.AddTaskItem(new JSGantt.TaskItem(342, 'Calculate Start/Stop', '2016-04-12','2016-05-18', 'gtaskpink',    '',       0, 'Brian',    60,  0, 34, 1, '',      '',      '',      g));
-g.AddTaskItem(new JSGantt.TaskItem(343, 'Draw Task Div',        '2016-05-13','2016-05-17', 'gtaskred',     '',       0, 'Brian',    60,  0, 34, 1, '',      '',      '',      g));
-g.AddTaskItem(new JSGantt.TaskItem(344, 'Draw Completion Div',  '2016-05-17','2016-06-04', 'gtaskred',     '',       0, 'Brian',    60,  0, 34, 1, "342,343",'',     '',      g));
-g.AddTaskItem(new JSGantt.TaskItem(35,  'Make Updates',         '2016-07-17','2017-09-04', 'gtaskpurple',  '',       0, 'Brian',    30,  0, 3,  1, '333',   '',      '',      g));
-
-g.Draw();
-}
-else
-{
-alert("Error, unable to create Gantt Chart");
-}
-
-&lt;/script&gt;</code></pre>
-        <h2 id="xmlExport">XML Export</h2>
-        <p>The following methods can be used to extract details of tasks in the project in XML format</p>
-        <p>Method definition: <strong>getXMLProject()</strong></p>
-        <p>Returns a string containing the entire project in JSGantt Improved XML format. Dates will be exported in the currently defined input format as set by setDateInputFormat()</p>
-        <p>Method definition: <strong>getXMLTask(<em>pID, pIdx</em>)</strong></p>
-        <table>
-          <tr>
-            <th>pID:</th>
-            <td>(required) the numeric ID that identifies the task to extract</td>
-          </tr>
-          <tr>
-            <th>pIdx:</th>
-            <td>(optional) Boolean - if present and set to "true" the number passed in the pID parameter is treated as an array index for the task list rather than an ID</td>
-          </tr>
-        </table>
-        <p>Returns a string containing the specified task item in JSGantt Improved XML format. Dates will be exported in the currently defined input format as set by setDateInputFormat()</p>
-      </div>
-    <!-- Credits -->
-      <div class="container-fluid section" id="credits">
-        <h1>Credits</h1>
-        <div class="card-group">
-          <div class="card contact-card">
-            <img class="img-fluid" src="https://avatars.githubusercontent.com/eduardomourar" alt="Eduardo Rodrigues">
-            <div class="card-block">
-              <h4 class="card-title">Eduardo Rodrigues</h4>
-              <p class="card-text">Developer</p>
-              <div class="text-right">
-                <a href="https://github.com/eduardomourar" class="card-link contact-link"><i class="fa fa-github"></i></a>
-              </div>
-            </div>
-          </div>
-          <div class="card contact-card">
-            <img class="img-fluid" src="https://avatars.githubusercontent.com/RickCardoso" alt="Ricardo Cardoso">
-            <div class="card-block">
-              <h4 class="card-title">Ricardo Cardoso</h4>
-              <p class="card-text">Developer</p>
-              <div class="text-right">
-                <a href="https://github.com/RickCardoso" class="card-link contact-link"><i class="fa fa-github"></i></a>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-
-    <!-- Footer -->
-      <div class="footer text-center">
-        <p>© Copyright 2013-2017 jsGanttImproved<br />
-        Designed with <a href="https://v4-alpha.getbootstrap.com" target="_blank">Bootstrap</a> and <a href="http://fontawesome.io" target="_blank">Font Awesome</a></p>
-      </div>
-
-  </body>
-
-</html>
diff --git a/htdocs/includes/jsgantt/jsgantt.css b/htdocs/includes/jsgantt/jsgantt.css
index f8f58017cca..f5c2d2971f8 100644
--- a/htdocs/includes/jsgantt/jsgantt.css
+++ b/htdocs/includes/jsgantt/jsgantt.css
@@ -1,228 +1,793 @@
-/* Sample CSS for jsGanttImproved v1.7.5.4 */
-div.gantt		{ font-family:tahoma, arial, verdana, Sans-serif; font-size:10px; color: #656565; }
+/* Sample CSS for jsGanttImproved v1.8.0 */
 
-.gantt table	{ border-collapse: collapse; }
-.gantt td { padding: 0px; }
+div.gantt {
+  font-family: tahoma, arial, verdana, Sans-serif;
+  font-size: 10px;
+  color: #656565;
+}
+
+.gantt table {
+  border-collapse: collapse;
+}
+
+.gantt td {
+  padding: 0px;
+}
 
 /* cell defaults */
+.headweekends div {
+  font-size: 8px;
+  width: 100% !important;
+  margin: 0;
+}
+
 .gmajorheading,
 .gminorheading,
 .gminorheadingwkend,
 .gtaskcell,
-.gtaskcellwkend				{ height: 19px; font-size: 12px; border: #efefef 1px solid; text-align: center; cursor: default }
-.gtasklist					{ height: 19px; min-width: 5px; max-width: 5px; width: 5px; border: #efefef 1px solid; border-right: none; } /* all three width values set just to make sure - helps resizing code */
+.gtaskcellcurrent,
+.gtaskcellwkend {
+  height: 19px;
+  font-size: 12px;
+  border: #efefef 1px solid;
+  text-align: center;
+  cursor: default
+}
+
+
+.gtasklist {
+  height: 19px;
+  min-width: 5px;
+  max-width: 5px;
+  width: 5px;
+  border: #efefef 1px solid;
+  border-right: none;
+}
+
+.gtasknolist-label{
+  padding: 10px 50px;
+}
+/* all three width values set just to make sure - helps resizing code */
 
 /* Additional values for some cell elements */
+
 .gtaskheading,
 .gmajorheading,
-.gminorheading				{ background-color: #ffffff; font-weight: bold; font-size: 9px; white-space: nowrap; }
+.gminorheading {
+  background-color: #ffffff;
+  font-weight: bold;
+  font-size: 9px;
+  white-space: nowrap;
+}
+
 .gtaskcellwkend,
-.gminorheadingwkend			{ background-color: #f7f7f7; font-weight: bold; font-size: 9px; white-space: nowrap; }
-td.gtaskcell				{ text-align: left }
-td.gspanning				{ border-left: none; border-right: none; }
-.gtaskcelldiv				{ position: relative; }
+.gtaskcellcurrent,
+.gminorheadingwkend {
+  background-color: #f7f7f7;
+  font-weight: bold;
+  font-size: 9px;
+  white-space: nowrap;
+}
+
+.gtaskcellcurrent {
+  background-color: #e1e0f7;
+}
+
+td.gtaskcell {
+  text-align: left;
+}
+
+td.gspanning {
+  border-left: none;
+  border-right: none;
+}
+
+.gtaskcelldiv {
+  position: relative;
+}
 
 /* Task list defaults */
+
 .gtaskheading,
 .gname,
 .gtaskname,
-.gresource,
-.gduration,
-.gpccomplete,
+.gres,
+.gdur,
+.gcomp,
 .gstartdate,
-.genddate					{ height: 18px; white-space: nowrap; border: #efefef 1px solid; }
+.gplanstartdate,
+.gplanenddate,
+.gcost,
+.genddate {
+  height: 18px;
+  white-space: nowrap;
+  border: #efefef 1px solid;
+}
+
+.gtaskheading div,
+.gname div,
+.gtaskname div,
+.gres div,
+.gdur div,
+.gcomp div,
+.gstartdate div,
+.gplanstartdate div,
+.gplanenddate div,
+.gcost div,
+.genddate div {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.gtaskbarcontainer.gplan {
+  position: absolute !important;
+  top: 0px;
+  opacity: 0.3;
+  background: white;
+  z-index: 10000;
+  border: 1px solid black;
+}
 
 /* Additional values for some task list elements */
-.gresource,
-.gduration,
-.gpccomplete,
-.gstartdate div, /* needed for IE8 */
-.gstartdate					{ text-align: center; min-width: 70px; max-width: 70px; width: 70px; font-size: 10px; }
-.genddate div, /* needed for IE8 */
-.genddate					{ text-align: center; min-width: 70px; max-width: 70px; width: 70px; font-size: 10px; }
-.gtaskheading				{ text-align: center; }
-.gtaskname div, /* needed for IE8 */
-.gtaskname					{ min-width: 170px; max-width: 170px; width: 170px; font-size: 9px; border-left: none; }
 
-.gselector					{ text-align: left; white-space: nowrap; min-width: 170px; max-width: 170px; width: 170px; }
+/* needed for IE8 */
+
+.gstartdate div,
+.gplanstartdate,
+.gplanenddate,
+.gstartdate,
+.genddate {
+  text-align: center;
+  min-width: 105px;
+  width: 105px;
+  max-width: 105px;
+  font-size: 10px;
+}
+
+.gtaskheading {
+  text-align: center;
+}
+
+.gtaskname div,
+/* needed for IE8 */
+
+.gtaskname {
+  min-width: 170px;
+  max-width: 170px;
+  width: 170px;
+  font-size: 9px;
+  border-left: none;
+}
+
+.gtaskheading,
+.gtaskname {
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+
+.gtaskname.gtaskeditable div,
+.gtaskname.gtaskeditable {
+  overflow: unset;
+}
+
+.gselector {
+  text-align: left;
+  white-space: nowrap;
+  min-width: 170px;
+  max-width: 170px;
+  width: 170px;
+}
+
+.gformlabel {
+  position: relative;
+  top: 0px;
+  cursor: pointer;
+  border: #ffffff 1px solid;
+  margin-left: 2px;
+  padding-left: 2px;
+  padding-right: 2px;
+}
 
-.gformlabel					{ position:relative; top:0px; cursor:pointer; border: #ffffff 1px solid; margin-left: 2px; padding-left: 2px; padding-right: 2px; }
 span.gformlabel:hover,
-span.gselected				{ background-color: #dbecff; border: #cccccc 1px solid;}
+span.gselected {
+  background-color: #dbecff;
+  border: #cccccc 1px solid;
+}
 
-span.gfoldercollapse		{ color:#000000; cursor:pointer; font-weight:bold; font-size: 12px; font-family: Courier, "Courier New", monospace; }
+span.gfoldercollapse {
+  color: #000000;
+  cursor: pointer;
+  font-weight: bold;
+  font-size: 12px;
+  font-family: Courier, "Courier New", monospace;
+}
 
 .gtasktableh,
-.gtasktable					{ border-right: #efefef 1px solid; }
-.gcharttable				{ border: #efefef 1px solid; }  /* for some reason firefox needs this */
+.gtasktable {
+  border-right: #efefef 1px solid;
+  width: 100%;
+}
+
+.gcharttableh,
+.gtasktableh,
+.gtasktable,
+.gcharttable {
+  border-collapse: collapse;
+}
+
+.gcharttable,
+.gcharttableh {
+  table-layout: fixed;
+}
+
+.gcharttable {
+  border: #efefef 1px solid;
+}
+
+/* for some reason firefox needs this */
 
 /* Differentiate Group, Milestone and Ordinary task items (applied to row) */
-.ggroupitem					{ background-color: #fbfbfb; font-weight: bold; }
+
+.ggroupitem {
+  background-color: #fbfbfb;
+  font-weight: bold;
+}
+
 .gmileitem,
-.glineitem					{ background-color: #ffffff; }
+.glineitem {
+  background-color: #ffffff;
+}
 
 /* highlight row (applied to row) */
-.gitemhighlight	td			{ background-image: none; background-color: #fffde5;}
+
+.gitemhighlight td {
+  background-image: none;
+  background-color: #fffde5;
+}
 
 /* task bar caption text styles */
+
 .gmilecaption,
 .ggroupcaption,
-.gcaption					{ font-weight: normal; font-size: 9px; text-align: left; white-space: nowrap; top:1px; position: absolute; top:2px; }
+.gcaption {
+  font-weight: normal;
+  font-size: 9px;
+  text-align: left;
+  white-space: nowrap;
+  top: 1px;
+  position: absolute;
+  top: 2px;
+}
 
 .ggroupcaption,
-.gcaption					{ right: -126px; }
+.gcaption {
+  right: -126px;
+}
 
 /* Task complete %age bar shared attributes */
-.gtaskcomplete				{ float:left; overflow: hidden; }
+
+.gtaskcomplete {
+  float: left;
+  overflow: hidden;
+}
 
 /* Task complete %age bar */
-.gtaskcomplete				{ height:5px; background-color:#000000; margin-top:4px; opacity:0.4; filter: alpha(opacity=40); }
+
+.gtaskcomplete {
+  height: 5px;
+  background-color: #000000;
+  margin-top: 4px;
+  opacity: 0.4;
+  filter: alpha(opacity=40);
+}
 
 /* Milestones */
-.gmilestone					{ font-size: 14px; position: absolute; top: -2px; }
-.gmdtop						{ top: 2px; overflow: hidden; width:0px; height:0px; border-bottom: 5px solid black; border-left: 5px solid transparent; border-top: 5px solid transparent; border-right: 5px solid transparent;}
-.gmdbottom					{ top: 2px; overflow: hidden; width:0px; height:0px; border-top: 5px solid black; border-left: 5px solid transparent; border-bottom: 5px solid transparent; border-right: 5px solid transparent;}
+
+.gmilestone {
+  font-size: 14px;
+  position: absolute;
+  top: -2px;
+}
+
+.gmdtop {
+  top: 2px;
+  overflow: hidden;
+  width: 0px;
+  height: 0px;
+  border-bottom: 5px solid black;
+  border-left: 5px solid transparent;
+  border-top: 5px solid transparent;
+  border-right: 5px solid transparent;
+}
+
+.gmdbottom {
+  top: 2px;
+  overflow: hidden;
+  width: 0px;
+  height: 0px;
+  border-top: 5px solid black;
+  border-left: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-right: 5px solid transparent;
+}
 
 /* Task bar shared attributes */
+
 .ggroupblack,
 .gtaskblue,
 .gtaskred,
 .gtaskgreen,
 .gtaskyellow,
 .gtaskpurple,
-.gtaskpink					{ height: 13px; filter: alpha(opacity=90); opacity:0.9; margin-top: 1px; }
+.gtaskpink {
+  height: 13px;
+  filter: alpha(opacity=90);
+  opacity: 0.9;
+  margin-top: 1px;
+}
 
 /* Task bars - ggroupblack is set as the default class on the task if it is undefined */
-.ggroupblack { height: 7px; background: #000000; margin-top: 2px; }
-.ggroupblackendpointleft	{ overflow: hidden; width:0px; height:0px; top: 2px; border-top: 4px solid black; border-left: 4px solid transparent; border-bottom: 4px solid transparent; border-right: 4px solid transparent; float: left; }
-.ggroupblackendpointright	{ overflow: hidden; width:0px; height:0px; top: 2px; border-top: 4px solid black; border-left: 4px solid transparent; border-bottom: 4px solid transparent; border-right: 4px solid transparent; float: right; }
-.ggroupblackcomplete		{ float:left; overflow: hidden; height:3px; filter: alpha(opacity=80); opacity:0.8; background-color:#777777; margin-top:2px; margin-bottom: 2px; }
+
+.ggroupblack {
+  height: 7px;
+  background: #000000;
+  margin-top: 2px;
+}
+
+.ggroupblackendpointleft {
+  overflow: hidden;
+  width: 0px;
+  height: 0px;
+  top: 2px;
+  border-top: 4px solid black;
+  border-left: 4px solid transparent;
+  border-bottom: 4px solid transparent;
+  border-right: 4px solid transparent;
+  float: left;
+}
+
+.ggroupblackendpointright {
+  overflow: hidden;
+  width: 0px;
+  height: 0px;
+  top: 2px;
+  border-top: 4px solid black;
+  border-left: 4px solid transparent;
+  border-bottom: 4px solid transparent;
+  border-right: 4px solid transparent;
+  float: right;
+}
+
+.ggroupblackcomplete {
+  float: left;
+  overflow: hidden;
+  height: 3px;
+  filter: alpha(opacity=80);
+  opacity: 0.8;
+  background-color: #777777;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
 .gtaskblue {
-	background: rgb(58,132,195); /* Old browsers */
-	background: linear-gradient(to bottom,  rgba(58,132,195,1) 0%,rgba(65,154,214,1) 20%,rgba(75,184,240,1) 40%,rgba(58,139,194,1) 70%,rgba(38,85,139,1) 100%); /* W3C */
-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4bb8f0', endColorstr='#3a84c3',GradientType=0 ); /* IE6-9 */
+  background: rgb(58, 132, 195);
+  /* Old browsers */
+  background: linear-gradient(to bottom, rgba(58, 132, 195, 1) 0%, rgba(65, 154, 214, 1) 20%, rgba(75, 184, 240, 1) 40%, rgba(58, 139, 194, 1) 70%, rgba(38, 85, 139, 1) 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#4bb8f0', endColorstr='#3a84c3', GradientType=0);
+  /* IE6-9 */
 }
+
 .gtaskred {
-	background: rgb(196,58,58); /* Old browsers */
-	background: linear-gradient(to bottom,  rgba(196,58,58,1) 0%,rgba(211,65,65,1) 20%,rgba(239,76,76,1) 40%,rgba(196,58,58,1) 70%,rgba(135,37,37,1) 100%); /* W3C */
-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ef4c4c', endColorstr='#c43a3a',GradientType=0 ); /* IE6-9 */
+  background: rgb(196, 58, 58);
+  /* Old browsers */
+  background: linear-gradient(to bottom, rgba(196, 58, 58, 1) 0%, rgba(211, 65, 65, 1) 20%, rgba(239, 76, 76, 1) 40%, rgba(196, 58, 58, 1) 70%, rgba(135, 37, 37, 1) 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ef4c4c', endColorstr='#c43a3a', GradientType=0);
+  /* IE6-9 */
 }
+
 .gtaskgreen {
-	background: rgb(80,193,58); /* Old browsers */
-	background: linear-gradient(to bottom,  rgba(80,193,58,1) 0%,rgba(88,209,64,1) 20%,rgba(102,237,75,1) 40%,rgba(80,193,58,1) 70%,rgba(53,132,37,1) 100%); /* W3C */
-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#66ED4B', endColorstr='#50c13a',GradientType=0 ); /* IE6-9 */
+  background: rgb(80, 193, 58);
+  /* Old browsers */
+  background: linear-gradient(to bottom, rgba(80, 193, 58, 1) 0%, rgba(88, 209, 64, 1) 20%, rgba(102, 237, 75, 1) 40%, rgba(80, 193, 58, 1) 70%, rgba(53, 132, 37, 1) 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#66ED4B', endColorstr='#50c13a', GradientType=0);
+  /* IE6-9 */
 }
+
 .gtaskyellow {
-	background: rgb(247,228,56); /* Old browsers */
-	background: linear-gradient(to bottom,  rgba(247,228,56,1) 0%,rgba(239,239,55,1) 20%,rgba(255,255,58,1) 40%,rgba(242,236,55,1) 70%,rgba(241,218,54,1) 100%); /* W3C */
-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffff3a', endColorstr='#f7e438',GradientType=0 ); /* IE6-9 */
+  background: rgb(247, 228, 56);
+  /* Old browsers */
+  background: linear-gradient(to bottom, rgba(247, 228, 56, 1) 0%, rgba(239, 239, 55, 1) 20%, rgba(255, 255, 58, 1) 40%, rgba(242, 236, 55, 1) 70%, rgba(241, 218, 54, 1) 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffff3a', endColorstr='#f7e438', GradientType=0);
+  /* IE6-9 */
 }
+
 .gtaskpurple {
-	background: rgb(193,58,193); /* Old browsers */
-	background: linear-gradient(to bottom,  rgba(193,58,193,1) 0%,rgba(211,65,211,1) 20%,rgba(239,76,239,1) 40%,rgba(193,58,193,1) 70%,rgba(137,38,137,1) 100%); /* W3C */
-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ef4cef', endColorstr='#892689',GradientType=0 ); /* IE6-9 */
+  background: rgb(193, 58, 193);
+  /* Old browsers */
+  background: linear-gradient(to bottom, rgba(193, 58, 193, 1) 0%, rgba(211, 65, 211, 1) 20%, rgba(239, 76, 239, 1) 40%, rgba(193, 58, 193, 1) 70%, rgba(137, 38, 137, 1) 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ef4cef', endColorstr='#892689', GradientType=0);
+  /* IE6-9 */
 }
+
 .gtaskpink {
-	background: rgb(249,177,245); /* Old browsers */
-	background: linear-gradient(to bottom,  rgba(249,177,245,1) 0%,rgba(247,192,243,1) 20%,rgba(247,202,244,1) 40%,rgba(249,192,246,1) 70%,rgba(252,174,247,1) 100%); /* W3C */
-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f7caf4', endColorstr='#fcaef7',GradientType=0 ); /* IE6-9 */
+  background: rgb(249, 177, 245);
+  /* Old browsers */
+  background: linear-gradient(to bottom, rgba(249, 177, 245, 1) 0%, rgba(247, 192, 243, 1) 20%, rgba(247, 202, 244, 1) 40%, rgba(249, 192, 246, 1) 70%, rgba(252, 174, 247, 1) 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f7caf4', endColorstr='#fcaef7', GradientType=0);
+  /* IE6-9 */
 }
+
 .gtaskbluecomplete,
 .gtaskredcomplete,
 .gtaskgreencomplete,
 .gtaskyellowcomplete,
 .gtaskpurplecomplete,
-.gtaskpinkcomplete			{ float:left; overflow: hidden; height:5px; filter: alpha(opacity=40); opacity:0.4; background-color: #000000; margin-top:4px; }
-
-/* Printer friendly styles - we could use these all the time but they are not as pretty! */
-/* note that "@media print" is not supported in IE6 or 7.  Fully patched IE8 should be OK */
-@media print {
-	.ggroupblack { height:0px; border-top: 7px solid; border-color: #000000; }
-	.gtaskblue { height:0px; border-top: 13px solid; border-color: rgb(58,132,195); }
-	.gtaskred { height:0px; border-top: 13px solid; border-color: rgb(196,58,58); }
-	.gtaskgreen { height:0px; border-top: 13px solid; border-color: rgb(80,193,58); }
-	.gtaskyellow { height:0px; border-top: 13px solid; border-color: rgb(247,228,56); }
-	.gtaskpurple { height:0px; border-top: 13px solid; border-color: rgb(193,58,193); }
-	.gtaskpink { height:0px; border-top: 13px solid; border-color: rgb(249,177,245); }
-
-	.gtaskbluecomplete,
-	.gtaskredcomplete,
-	.gtaskgreencomplete,
-	.gtaskyellowcomplete,
-	.gtaskpurplecomplete,
-	.gtaskpinkcomplete { height:0px; filter: alpha(opacity=40); opacity:0.4; margin-top: -9px; border-top: 5px solid; border-color: #000000; }
-	.ggroupblackcomplete { height: 0px; filter: alpha(opacity=80); opacity:0.8; margin-top:-5px; border-top:3px solid; border-color:#777777; }
+.gtaskpinkcomplete {
+  float: left;
+  overflow: hidden;
+  height: 5px;
+  filter: alpha(opacity=40);
+  opacity: 0.4;
+  background-color: #000000;
+  margin-top: 4px;
 }
 
 /*  END Task bar styles */
-.glinev { border-left: 1px solid; width: 0px; }
-.glineh { border-top: 1px solid; height: 0px; }
+
+.glinev {
+  border-left: 1px solid;
+  width: 0px;
+}
+
+.glineh {
+  border-top: 1px solid;
+  height: 0px;
+}
 
 .gDepFS,
 .gDepSS,
 .gDepSF,
-.gDepFF				{ border-color: #ff0000; }
+.gDepFF {
+  border-color: #ff0000;
+}
+
 .gDepFSArw,
-.gDepSSArw			{ overflow: hidden; width:0px; height:0px; border-bottom: 4px solid transparent; border-left: 4px solid #ff0000; border-top: 4px solid transparent; border-right: 4px solid transparent;}
+.gDepSSArw {
+  overflow: hidden;
+  width: 0px;
+  height: 0px;
+  border-bottom: 4px solid transparent;
+  border-left: 4px solid #ff0000;
+  border-top: 4px solid transparent;
+  border-right: 4px solid transparent;
+}
+
 .gDepFFArw,
-.gDepSFArw			{ overflow: hidden; width:0px; height:0px; border-bottom: 4px solid transparent; border-left: 4px solid transparent; border-top: 4px solid transparent; border-right: 4px solid #ff0000;}
-.gCurDate			{ border-color: #0000ff; }
+.gDepSFArw {
+  overflow: hidden;
+  width: 0px;
+  height: 0px;
+  border-bottom: 4px solid transparent;
+  border-left: 4px solid transparent;
+  border-top: 4px solid transparent;
+  border-right: 4px solid #ff0000;
+}
 
+.gCurDate {
+  border-color: #0000ff;
+}
 
-div.gtaskbarcontainer		{ z-index: 1; position: absolute; top: 0px }
+div.gtaskbarcontainer {
+  z-index: 1;
+  position: absolute;
+  top: 0px
+}
 
-.JSGanttToolTip		{position: absolute; display: block; z-index: 2;}
-.JSGanttToolTipcont	{font-family: tahoma, arial, verdana; font-size: 10px; display: block; background: #ffffff; color: #656565}
-.gTaskInfo			{background: #dbecff; width: 400px; border: #656565 1px solid; border-radius: 10px; padding: 4px 6px 4px 6px; float: left;}
-.gTtTitle			{display: block; font-size: 12px; font-weight: bold; color: #404040; margin-left: 4px; margin-bottom: 1em;}
-.gTaskLabel 		{font-size: 11px; font-weight: bold; color: #656565; margin-left: 4px;}
-.gTaskText	 		{position:absolute; left: 90px; padding-top: 1px; font-size: 10px; font-weight: normal; color: #656565;}
-.gTaskNotes 		{font-size: 11px; font-weight: normal; color: #323232; padding: 0 15px; display: block;}
-.gTIn	 			{padding-top: 10px;}
+.textbar {
+  word-break: break-all;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 40%;
+  display: inline-block;
+}
 
-.gantt				{ min-width: 632px;	/* 2x LC width */ }
-.gchartcontainer	{ /* padding-left: 532px; LC width */ line-height: 1; /* Overrides inherited CSS (e.g. from Bootstrap) */ }
-.gcontainercol		{ position: relative; } /* Add a max-height value here if wanted */
-.glistgrid			{ width: 532px; /* LC width */ float: left; /* LC width */ padding-right: 0px; padding-left: 0px; padding-bottom: 0px; padding-top: 0px; background-color: #ffffff; overflow: hidden; }
-.glistlbl			{ width: 532px; /* LC width */ float: left; /* LC width */ padding-right: 0px; padding-left: 0px; padding-bottom: 0px; padding-top: 0px; background-color: #ffffff; overflow: hidden; }
-.glabelfooter		{ clear: both; }
-.ggridfooter		{ clear: both; }
+.JSGanttToolTip {
+  position: absolute;
+  display: block;
+  z-index: 10000;
+}
 
-.rhscrpad			{ width: 150px; position: absolute; top: 0px; height: 1px; }
+.JSGanttToolTipcont {
+  font-family: tahoma, arial, verdana;
+  font-size: 10px;
+  display: block;
+  background: #ffffff;
+  color: #656565
+}
 
-.gchartgrid			{ padding-right: 0px; padding-left: 0px; padding-bottom: 0px; padding-top: 0px; background-color: #ffffff; position: relative; overflow: auto; min-height: 0%; }
-.gchartlbl			{ padding-right: 0px; padding-left: 0px; padding-bottom: 0px; padding-top: 0px; background-color: #ffffff; position: relative; overflow: hidden; }
+.gTaskInfo {
+  background: #dbecff;
+  width: 400px;
+  border: #656565 1px solid;
+  border-radius: 10px;
+  padding: 4px 6px 4px 6px;
+  float: left;
+}
+
+.gTtTitle {
+  display: block;
+  font-size: 12px;
+  font-weight: bold;
+  color: #404040;
+  margin-left: 4px;
+  margin-bottom: 1em;
+}
+
+.gTaskLabel {
+  font-size: 11px;
+  font-weight: bold;
+  color: #656565;
+  margin-left: 4px;
+}
+
+.gTaskText {
+  position: absolute;
+  left: 90px;
+  padding-top: 1px;
+  font-size: 10px;
+  font-weight: normal;
+  color: #656565;
+}
+
+.gTaskNotes {
+  font-size: 11px;
+  font-weight: normal;
+  color: #323232;
+  padding: 0 15px;
+  display: block;
+}
+
+.gTIn {
+  padding-top: 10px;
+}
+
+.gantt {
+  min-width: 632px;
+  /* 2x LC width */
+}
+
+.gchartcontainer {
+  /* padding-left: 532px; LC width */
+  line-height: 1;
+  /* Overrides inherited CSS (e.g. from Bootstrap) */
+  display: flex;
+}
+
+.gcontainercol {
+  position: relative;
+}
+
+/* Add a max-height value here if wanted */
+
+.glistgrid {
+  min-width: 132px;
+  /* LC width */
+  float: left;
+  /* LC width */
+  padding-right: 0px;
+  padding-left: 0px;
+  padding-bottom: 0px;
+  padding-top: 0px;
+  background-color: #ffffff;
+  overflow: hidden;
+}
+
+.glistlbl {
+  min-width: 132px;
+  /* LC width */
+  float: left;
+  /* LC width */
+  padding-right: 0px;
+  padding-left: 0px;
+  padding-bottom: 0px;
+  padding-top: 0px;
+  background-color: #ffffff;
+  overflow: hidden;
+  flex: none;
+}
+
+.glistlbl,
+.gchartgrid {
+  display: flex;
+  flex-direction: column;
+}
+
+.glabelfooter {
+  clear: both;
+}
+
+.ggridfooter {
+  clear: both;
+}
+
+.rhscrpad {
+  width: 150px;
+  position: absolute;
+  top: 0px;
+  height: 1px;
+}
+
+.gchartgrid {
+  padding-right: 0px;
+  padding-left: 0px;
+  padding-bottom: 0px;
+  padding-top: 0px;
+  background-color: #ffffff;
+  position: relative;
+  /* overflow: auto; */
+  overflow: unset;
+  overflow-y: auto;
+  min-height: 0%;
+}
+
+.gchartlbl {
+  padding-right: 0px;
+  padding-left: 0px;
+  padding-bottom: 0px;
+  padding-top: 0px;
+  background-color: #ffffff;
+  position: relative;
+  overflow: hidden;
+  flex: none;
+}
 
 /* Old Internet Explorer version hacks */
-.gantt						{ _height: 100% }	/* otherwise the chart disappears! */
-div .gantt					{ /* _width: 1064px; ie6 fixed width */ }
+
+.gantt {
+  _height: 100%
+}
+
+/* otherwise the chart disappears! */
+
+div .gantt {
+  /* _width: 1064px; ie6 fixed width */
+}
+
 div.gchartlbl,
-div.gchartgrid				{/* _width: 532px; */}	/* ie6 fixed width */
+div.gchartgrid {
+  /* _width: 532px; */
+}
+
+/* ie6 fixed width */
+
 div.glistlbl,
 div.glistgrid {
-	*right: 0px;			/* ie7 pulls the content too far left with the negative margin */
-	_right: 532px;			/* but ie6 fixed width needs this */
-	_margin-left: -532px;	/* ie6 fixed width */
-	float: left;
+  *right: 0px;
+  /* ie7 pulls the content too far left with the negative margin */
+  _right: 532px;
+  /* but ie6 fixed width needs this */
+  _margin-left: -532px;
+  /* ie6 fixed width */
+  float: left;
 }
-div.gchartgrid { *padding-bottom: 20px; *overflow-y: hidden; } /* variable height design, no need for vertical scroll */
-td.gmajorheading div { *overflow: hidden; } /* stops resizing fixed width columns if the text is too wide */
-td.gspanning div { *overflow: hidden; } /* stops resizing fixed width columns if the text is too wide */
+
+div.gchartgrid {
+  *padding-bottom: 20px;
+  *overflow-y: hidden;
+}
+
+/* variable height design, no need for vertical scroll */
+
+td.gmajorheading div {
+  *overflow: hidden;
+}
+
+/* stops resizing fixed width columns if the text is too wide */
+
+td.gspanning div {
+  *overflow: hidden;
+}
+
+/* stops resizing fixed width columns if the text is too wide */
 
 /* border transparency tricks */
-.ggroupblackendpointleft { _border-top: 4px solid black; _border-left: 4px solid pink; _border-bottom: 4px solid pink; _border-right: 4px solid pink; _filter: chroma(color=pink); }
-.ggroupblackendpointright { _border-top: 4px solid black; _border-left: 4px solid pink; _border-bottom: 4px solid pink; _border-right: 4px solid pink;_filter: chroma(color=pink); }
 
-.gmdtop { _border-left: 5px solid pink; _border-top: 5px solid pink; _border-right: 5px solid pink; _filter: chroma(color=pink);}
-.gmdbottom { _border-left: 5px solid pink; _border-bottom: 5px solid pink; _border-right: 5px solid pink; _filter: chroma(color=pink);}
+.ggroupblackendpointleft {
+  _border-top: 4px solid black;
+  _border-left: 4px solid pink;
+  _border-bottom: 4px solid pink;
+  _border-right: 4px solid pink;
+  _filter: chroma(color=pink);
+}
+
+.ggroupblackendpointright {
+  _border-top: 4px solid black;
+  _border-left: 4px solid pink;
+  _border-bottom: 4px solid pink;
+  _border-right: 4px solid pink;
+  _filter: chroma(color=pink);
+}
+
+.gmdtop {
+  _border-left: 5px solid pink;
+  _border-top: 5px solid pink;
+  _border-right: 5px solid pink;
+  _filter: chroma(color=pink);
+}
+
+.gmdbottom {
+  _border-left: 5px solid pink;
+  _border-bottom: 5px solid pink;
+  _border-right: 5px solid pink;
+  _filter: chroma(color=pink);
+}
 
 .gDepFSArw,
-.gDepSSArw { _border-bottom: 4px solid pink; _border-top: 4px solid pink; _border-right: 4px solid pink; _filter: chroma(color=pink);}
+.gDepSSArw {
+  _border-bottom: 4px solid pink;
+  _border-top: 4px solid pink;
+  _border-right: 4px solid pink;
+  _filter: chroma(color=pink);
+}
+
 .gDepFFArw,
-.gDepSFArw { _border-bottom: 4px solid pink; _border-left: 4px solid pink; _border-top: 4px solid pink; _filter: chroma(color=pink);}
+.gDepSFArw {
+  _border-bottom: 4px solid pink;
+  _border-left: 4px solid pink;
+  _border-top: 4px solid pink;
+  _filter: chroma(color=pink);
+}
 
 /* Workaround for odd bug in old versions of Opera - no other browser needs this */
-.glinediv {position: absolute; top: 0px; left: 0px;}
+
+.glinediv {
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  z-index: 1px;
+}
+
+.gantt-inputtable {
+  max-width: 100%;
+  max-height: 16px;
+}
+
+.gadditional {
+  border: #efefef 1px solid;
+}
+
+.gadditional,
+.gres,
+.gdur,
+.gcomp,
+.gcost {
+  text-align: center;
+  width: 70px;
+  max-width: 70px;
+  min-width: 70px;
+  font-size: 10px;
+}
+
+@media print {
+
+  /* All your print styles go here */
+  html,
+  .gchartgrid {
+    overflow: unset !important;
+  }
+
+  .glistgrid {
+    float: none !important;
+  }
+}
 
 /* if using setUseSingleCell(1) the following is a suggested set of CSS3 styles to recreate the table grid - won't work on old browsers
 .ggrouphour td,
@@ -241,3 +806,177 @@ td.gspanning div { *overflow: hidden; } /* stops resizing fixed width columns if
 .gmilequarter td,
 .gitemquarter td		{ background-size: 19px 1px; background-image: linear-gradient(to left, #efefef, transparent 1px, transparent 18px); width: 100%; height: 19px; }
 */
+
+.gmain {
+  height: 100%;
+
+  display: flex;
+  flex-direction: column;
+}
+
+.gmainright {
+  overflow: hidden;
+  flex: auto;
+}
+
+.gmainleft {
+  overflow: hidden;
+  flex: 0 0 50%;
+}
+
+.gtasktableh tr,
+.gcharttable tr,
+.gcharttableh tr,
+.gtasktable tr {
+  height: 22px !important;
+}
+
+.gtasktableouterwrapper {
+  overflow: hidden;
+}
+
+.gtasktablewrapper {
+  overflow-y: scroll;
+  flex: auto;
+  height: 100%;
+}
+
+.chartgrid {
+  overflow: auto;
+  flex: auto;
+}
+
+/* .gtasktable {
+  margin-bottom: 14px;
+} */
+
+/* Printer friendly styles - we could use these all the time but they are not as pretty! */
+
+/* note that "@media print" is not supported in IE6 or 7.  Fully patched IE8 should be OK */
+
+@media print {
+  .ggroupblack {
+    height: 0px;
+    border-top: 7px solid;
+    border-color: #000000;
+  }
+
+  .gtaskblue {
+    height: 0px;
+    border-top: 13px solid;
+    border-color: rgb(58, 132, 195);
+  }
+
+  .gtaskred {
+    height: 0px;
+    border-top: 13px solid;
+    border-color: rgb(196, 58, 58);
+  }
+
+  .gtaskgreen {
+    height: 0px;
+    border-top: 13px solid;
+    border-color: rgb(80, 193, 58);
+  }
+
+  .gtaskyellow {
+    height: 0px;
+    border-top: 13px solid;
+    border-color: rgb(247, 228, 56);
+  }
+
+  .gtaskpurple {
+    height: 0px;
+    border-top: 13px solid;
+    border-color: rgb(193, 58, 193);
+  }
+
+  .gtaskpink {
+    height: 0px;
+    border-top: 13px solid;
+    border-color: rgb(249, 177, 245);
+  }
+
+  .gtaskbluecomplete,
+  .gtaskredcomplete,
+  .gtaskgreencomplete,
+  .gtaskyellowcomplete,
+  .gtaskpurplecomplete,
+  .gtaskpinkcomplete {
+    height: 0px;
+    filter: alpha(opacity=40);
+    opacity: 0.4;
+    margin-top: -9px;
+    border-top: 5px solid;
+    border-color: #000000;
+  }
+
+  .ggroupblackcomplete {
+    height: 0px;
+    filter: alpha(opacity=80);
+    opacity: 0.8;
+    margin-top: -5px;
+    border-top: 3px solid;
+    border-color: #777777;
+  }
+
+  .gmainright,
+  .gmainleft {
+    overflow: hidden;
+    width: auto;
+  }
+
+  table {
+    page-break-after: auto
+  }
+
+  tr {
+    page-break-inside: avoid;
+    page-break-after: auto
+  }
+
+  td {
+    page-break-inside: avoid;
+    page-break-after: auto
+  }
+
+  thead {
+    display: table-header-group
+  }
+
+  tfoot {
+    display: table-footer-group
+  }
+}
+
+/* Fix for OSx trackpad hiding the scroll bars*/
+.frame::-webkit-scrollbar {
+  -webkit-appearance: none;
+}
+
+.frame::-webkit-scrollbar:vertical {
+  width: 11px;
+}
+
+.frame::-webkit-scrollbar:horizontal {
+  height: 11px;
+}
+
+.frame::-webkit-scrollbar-thumb {
+  border-radius: 8px;
+  border: 2px solid white;
+  /* should match background, can't be transparent */
+  background-color: rgba(0, 0, 0, .5);
+}
+
+.frame::-webkit-scrollbar-track {
+  background-color: #fff;
+  border-radius: 8px;
+}
+
+.gscrollbar-calculation-container {
+  visibility: hidden;
+  overflow: scroll;
+  -ms-overflow-style: scrollbar;
+  display: block;
+}
\ No newline at end of file
diff --git a/htdocs/includes/jsgantt/jsgantt.js b/htdocs/includes/jsgantt/jsgantt.js
index 04921b92405..be9a20611f2 100644
--- a/htdocs/includes/jsgantt/jsgantt.js
+++ b/htdocs/includes/jsgantt/jsgantt.js
@@ -1,2577 +1,5064 @@
-/*
-	   _        ___            _   _    _____                                        _
-	  (_)___   / _ \__ _ _ __ | |_| |_  \_   \_ __ ___  _ __  _ __ _____   _____  __| |
-	  | / __| / /_\/ _` | '_ \| __| __|  / /\/ '_ ` _ \| '_ \| '__/ _ \ \ / / _ \/ _` |
-	  | \__ \/ /_\\ (_| | | | | |_| |_/\/ /_ | | | | | | |_) | | | (_) \ V /  __/ (_| |
-	 _/ |___/\____/\__,_|_| |_|\__|\__\____/ |_| |_| |_| .__/|_|  \___/ \_/ \___|\__,_|
-	|__/                                               |_|
-	jsGanttImproved 1.7.5.4
-
-	The current version of this code can be found at https://github.com/jsGanttImproved/jsgantt-improved/
-
-	* Copyright (c) 2013-2017, Paul Geldart, Eduardo Rodrigues and Ricardo Cardoso.
-	* All rights reserved.
-	*
-	* Redistribution and use in source and binary forms, with or without
-	* modification, are permitted provided that the following conditions are met:
-	*     * Redistributions of source code must retain the above copyright
-	*       notice, this list of conditions and the following disclaimer.
-	*     * Redistributions in binary form must reproduce the above copyright
-	*       notice, this list of conditions and the following disclaimer in the
-	*       documentation and/or other materials provided with the distribution.
-	*     * Neither the name of Paul Geldart, Eduardo Rodrigues and Ricardo Cardoso nor the names of its contributors
-	*       may be used to endorse or promote products derived from this software
-	*       without specific prior written permission.
-	*
-	* THIS SOFTWARE IS PROVIDED BY PAUL GELDART, EDUARDO RODRIGUES AND RICARDO CARDOSO ''AS IS'' AND ANY EXPRESS OR
-	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-	* IN NO EVENT SHALL PAUL GELDART, EDUARDO RODRIGUES AND RICARDO CARDOSO BE LIABLE FOR ANY DIRECT,
-	* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-	This project is based on jsGantt 1.2, (which can be obtained from
-	https://code.google.com/p/jsgantt/) and remains under the original BSD license.
-	The original project license follows:
-
-	Copyright (c) 2009, Shlomy Gantz BlueBrick Inc. All rights reserved.
-
-	* Redistribution and use in source and binary forms, with or without
-	* modification, are permitted provided that the following conditions are met:
-	*     * Redistributions of source code must retain the above copyright
-	*       notice, this list of conditions and the following disclaimer.
-	*     * Redistributions in binary form must reproduce the above copyright
-	*       notice, this list of conditions and the following disclaimer in the
-	*       documentation and/or other materials provided with the distribution.
-	*     * Neither the name of Shlomy Gantz or BlueBrick Inc. nor the
-	*       names of its contributors may be used to endorse or promote products
-	*       derived from this software without specific prior written permission.
-	*
-	* THIS SOFTWARE IS PROVIDED BY SHLOMY GANTZ/BLUEBRICK INC. ''AS IS'' AND ANY
-	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-	* DISCLAIMED. IN NO EVENT SHALL SHLOMY GANTZ/BLUEBRICK INC. BE LIABLE FOR ANY
-	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-var JSGantt; if (!JSGantt) JSGantt={};
-
-var vBenchTime=new Date().getTime();
-
-JSGantt.isIE=function ()
-{
-	if(typeof document.all!='undefined')
-	{
-		if ('pageXOffset' in window) return false;	// give IE9 and above the benefit of the doubt!
-		else return true;
-	}
-	else return false;
-};
-
-JSGantt.TaskItem=function(pID, pName, pStart, pEnd, pClass, pLink, pMile, pRes, pComp, pGroup, pParent, pOpen, pDepend, pCaption, pNotes, pGantt)
-{
-
-	var vID=parseInt(document.createTextNode(pID).data);
-	var vName=document.createTextNode(pName).data;
-	var vStart=new Date(0);
-	var vEnd=new Date(0);
-	var vGroupMinStart=null;
-	var vGroupMinEnd=null;
-	var vClass=document.createTextNode(pClass).data;
-	var vLink=document.createTextNode(pLink).data;
-	var vMile=parseInt(document.createTextNode(pMile).data);
-	var vRes=document.createTextNode(pRes).data;
-	var vComp=parseFloat(document.createTextNode(pComp).data);
-	var vGroup=parseInt(document.createTextNode(pGroup).data);
-	var vParent=document.createTextNode(pParent).data;
-	var vOpen=(vGroup==2)?1:parseInt(document.createTextNode(pOpen).data);
-	var vDepend=new Array();
-	var vDependType=new Array();
-	var vCaption=document.createTextNode(pCaption).data;
-	var vDuration='';
-	var vLevel=0;
-	var vNumKid=0;
-	var vWeight=0;
-	var vVisible=1;
-	var vSortIdx=0;
-	var vToDelete=false;
-	var x1, y1, x2, y2;
-	var vNotes;
-	var vParItem=null;
-	var vCellDiv=null;
-	var vGantt=(pGantt instanceof JSGantt.GanttChart)? pGantt : g; //hack for backwards compatibility
-	var vBarDiv=null;
-	var vTaskDiv=null;
-	var vListChildRow=null;
-	var vChildRow=null;
-	var vGroupSpan=null;
-
-	vNotes=document.createElement('span');
-	vNotes.className='gTaskNotes';
-	if (pNotes!=null)
-	{
-		vNotes.innerHTML=pNotes;
-		JSGantt.stripUnwanted(vNotes);
-	}
-
-	if (pStart!=null && pStart!='')
-	{
-		vStart=(pStart instanceof Date)?pStart:JSGantt.parseDateStr(document.createTextNode(pStart).data,vGantt.getDateInputFormat());
-		vGroupMinStart=vStart;
-	}
-
-	if (pEnd!=null && pEnd!='')
-	{
-		vEnd  =(pEnd instanceof Date)?pEnd:JSGantt.parseDateStr(document.createTextNode(pEnd).data,vGantt.getDateInputFormat());
-		vGroupMinEnd=vEnd;
-	}
-
-	if (pDepend!=null)
-	{
-		var vDependStr=pDepend+'';
-		var vDepList=vDependStr.split(',');
-		var n=vDepList.length;
-
-		for(var k=0;k<n;k++)
-		{
-			if(vDepList[k].toUpperCase().indexOf('SS')!=-1)
-			{
-				vDepend[k]=vDepList[k].substring(0,vDepList[k].toUpperCase().indexOf('SS'));
-				vDependType[k]='SS';
-			}
-			else if(vDepList[k].toUpperCase().indexOf('FF')!=-1)
-			{
-				vDepend[k]=vDepList[k].substring(0,vDepList[k].toUpperCase().indexOf('FF'));
-				vDependType[k]='FF';
-			}
-			else if(vDepList[k].toUpperCase().indexOf('SF')!=-1)
-			{
-				vDepend[k]=vDepList[k].substring(0,vDepList[k].toUpperCase().indexOf('SF'));
-				vDependType[k]='SF';
-			}
-			else if(vDepList[k].toUpperCase().indexOf('FS')!=-1)
-			{
-				vDepend[k]=vDepList[k].substring(0,vDepList[k].toUpperCase().indexOf('FS'));
-				vDependType[k]='FS';
-			}
-			else
-			{
-				vDepend[k]=vDepList[k];
-				vDependType[k]='FS';
-			}
-		}
-	}
-
-	this.getID=function(){return vID;};
-	this.getName=function(){return vName;};
-	this.getStart=function(){return vStart;};
-	this.getEnd=function(){return vEnd;};
-	this.getGroupMinStart=function(){return vGroupMinStart;};
-	this.getGroupMinEnd=function(){return vGroupMinEnd;};
-	this.getClass=function(){return vClass;};
-	this.getLink=function(){return vLink;};
-	this.getMile=function(){return vMile;};
-	this.getDepend=function(){if(vDepend) return vDepend; else return null;};
-	this.getDepType=function(){if(vDependType) return vDependType; else return null;};
-	this.getCaption=function(){if(vCaption) return vCaption; else return '';};
-	this.getResource=function(){if(vRes) return vRes; else return '\u00A0';};
-	this.getCompVal=function(){if(vComp) return vComp; else return 0;};
-	this.getCompStr=function(){if(vComp) return vComp+'%'; else return '';};
-	this.getNotes=function(){return vNotes;};
-	this.getSortIdx=function(){return vSortIdx;};
-	this.getToDelete=function(){return vToDelete;};
-
-	this.getDuration=function(pFormat, pLang)
-	{
-		if (vMile)
-		{
-			vDuration='-';
-		}
-		else
-		{
-			var vTaskEnd=new Date(this.getEnd().getTime());
-			var vUnits=null;
-			switch(pFormat)
-			{
-				case 'week':  vUnits='day'; break;
-				case 'month':  vUnits='week'; break;
-				case 'quarter': vUnits='month'; break;
-				default: vUnits=pFormat; break;
-			}
-
-			if ((vTaskEnd.getTime()-(vTaskEnd.getTimezoneOffset()*60000))%(86400000)==0)
-			{
-				vTaskEnd=new Date(vTaskEnd.getFullYear(), vTaskEnd.getMonth(), vTaskEnd.getDate()+1, vTaskEnd.getHours(), vTaskEnd.getMinutes(), vTaskEnd.getSeconds());
-			}
-			var tmpPer=(JSGantt.getOffset(this.getStart(), vTaskEnd, 999, vUnits))/1000;
-			if(Math.floor(tmpPer)!=tmpPer) tmpPer=Math.round(tmpPer*10)/10;
-			switch(vUnits)
-			{
-				case 'hour': vDuration=tmpPer+' '+((tmpPer!=1)?pLang['hrs']:pLang['hr']); break;
-				case 'day': vDuration=tmpPer+' '+((tmpPer!=1)?pLang['dys']:pLang['dy']); break;
-				case 'week': vDuration=tmpPer+' '+((tmpPer!=1)?pLang['wks']:pLang['wk']); break;
-				case 'month': vDuration=tmpPer+' '+((tmpPer!=1)?pLang['mths']:pLang['mth']); break;
-				case 'quarter': vDuration=tmpPer+' '+((tmpPer!=1)?pLang['qtrs']:pLang['qtr']); break;
-			}
-		}
-		return vDuration;
-	};
-
-	this.getParent=function(){return vParent;};
-	this.getGroup=function(){return vGroup;};
-	this.getOpen=function(){return vOpen;};
-	this.getLevel=function(){return vLevel;};
-	this.getNumKids=function(){return vNumKid;};
-	this.getWeight=function(){return vWeight;};
-	this.getStartX=function(){return x1;};
-	this.getStartY=function(){return y1;};
-	this.getEndX=function(){return x2;};
-	this.getEndY=function(){return y2;};
-	this.getVisible=function(){return vVisible;};
-	this.getParItem=function(){return vParItem;};
-	this.getCellDiv=function(){return vCellDiv;};
-	this.getBarDiv=function(){return vBarDiv;};
-	this.getTaskDiv=function(){return vTaskDiv;};
-	this.getChildRow=function(){return vChildRow;};
-	this.getListChildRow=function(){return vListChildRow;};
-	this.getGroupSpan=function(){return vGroupSpan;};
-	this.setStart=function(pStart){if(pStart instanceof Date)vStart=pStart;};
-	this.setEnd=function(pEnd){if(pEnd instanceof Date)vEnd=pEnd;};
-	this.setGroupMinStart=function(pStart){if(pStart instanceof Date)vGroupMinStart=pStart;};
-	this.setGroupMinEnd=function(pEnd){if(pEnd instanceof Date)vGroupMinEnd=pEnd;};
-	this.setLevel=function(pLevel){vLevel=parseInt(document.createTextNode(pLevel).data);};
-	this.setNumKid=function(pNumKid){vNumKid=parseInt(document.createTextNode(pNumKid).data);};
-	this.setWeight=function(pWeight){vWeight=parseInt(document.createTextNode(pWeight).data);};
-	this.setCompVal=function(pCompVal){vComp=parseFloat(document.createTextNode(pCompVal).data);};
-	this.setStartX=function(pX){x1=parseInt(document.createTextNode(pX).data);};
-	this.setStartY=function(pY){y1=parseInt(document.createTextNode(pY).data);};
-	this.setEndX=function(pX){x2=parseInt(document.createTextNode(pX).data);};
-	this.setEndY=function(pY){y2=parseInt(document.createTextNode(pY).data);};
-	this.setOpen=function(pOpen){vOpen=parseInt(document.createTextNode(pOpen).data);};
-	this.setVisible=function(pVisible){vVisible=parseInt(document.createTextNode(pVisible).data);};
-	this.setSortIdx=function(pSortIdx){vSortIdx=parseInt(document.createTextNode(pSortIdx).data);};
-	this.setToDelete=function(pToDelete){if (pToDelete) vToDelete=true; else vToDelete=false;};
-	this.setParItem=function(pParItem){if(pParItem instanceof JSGantt.TaskItem) vParItem=pParItem;};
-	this.setCellDiv=function(pCellDiv){if(typeof HTMLDivElement !== 'function' || pCellDiv instanceof HTMLDivElement) vCellDiv=pCellDiv;}; //"typeof HTMLDivElement !== 'function'" to play nice with ie6 and 7
-	this.setGroup=function(pGroup){vGroup=parseInt(document.createTextNode(pGroup).data);};
-	this.setBarDiv=function(pDiv){if(typeof HTMLDivElement !== 'function' || pDiv instanceof HTMLDivElement)vBarDiv=pDiv;};
-	this.setTaskDiv=function(pDiv){if(typeof HTMLDivElement !== 'function' || pDiv instanceof HTMLDivElement)vTaskDiv=pDiv;};
-	this.setChildRow=function(pRow){if(typeof HTMLTableRowElement !== 'function' || pRow instanceof HTMLTableRowElement)vChildRow=pRow;};
-	this.setListChildRow=function(pRow){if(typeof HTMLTableRowElement !== 'function' || pRow instanceof HTMLTableRowElement)vListChildRow=pRow;};
-	this.setGroupSpan=function(pSpan){if(typeof HTMLSpanElement !== 'function' || pSpan instanceof HTMLSpanElement)vGroupSpan=pSpan;};
-};
-
-// function that loads the main gantt chart properties and functions
-// pDiv: (required) this is a div object created in HTML
-// pFormat: (required) - used to indicate whether chart should be drawn in "hour", "day", "week", "month", or "quarter" format
-JSGantt.GanttChart=function(pDiv, pFormat)
-{
-	var vDiv=pDiv;
-	var vFormat=pFormat;
-	var vDivId=null;
-	var vUseFade=1;
-	var vUseMove=1;
-	var vUseRowHlt=1;
-	var vUseToolTip=1;
-	var vUseSort=1;
-	var vUseSingleCell=25000;
-	var vShowRes=1;
-	var vShowDur=1;
-	var vShowComp=1;
-	var vShowStartDate=1;
-	var vShowEndDate=1;
-	var vShowEndWeekDate=1;
-	var vShowTaskInfoRes=1;
-	var vShowTaskInfoDur=1;
-	var vShowTaskInfoComp=1;
-	var vShowTaskInfoStartDate=1;
-	var vShowTaskInfoEndDate=1;
-	var vShowTaskInfoNotes=1;
-	var vShowTaskInfoLink=0;
-	var vShowDeps=1;
-	var vShowSelector=new Array('top');
-	var vDateInputFormat='yyyy-mm-dd';
-	var vDateTaskTableDisplayFormat=JSGantt.parseDateFormatStr('dd/mm/yyyy');
-	var vDateTaskDisplayFormat=JSGantt.parseDateFormatStr('dd month yyyy');
-	var vHourMajorDateDisplayFormat=JSGantt.parseDateFormatStr('day dd month yyyy');
-	var vHourMinorDateDisplayFormat=JSGantt.parseDateFormatStr('HH');
-	var vDayMajorDateDisplayFormat=JSGantt.parseDateFormatStr('dd/mm/yyyy');
-	var vDayMinorDateDisplayFormat=JSGantt.parseDateFormatStr('dd');
-	var vWeekMajorDateDisplayFormat=JSGantt.parseDateFormatStr('yyyy');
-	var vWeekMinorDateDisplayFormat=JSGantt.parseDateFormatStr('dd/mm');
-	var vMonthMajorDateDisplayFormat=JSGantt.parseDateFormatStr('yyyy');
-	var vMonthMinorDateDisplayFormat=JSGantt.parseDateFormatStr('mon');
-	var vQuarterMajorDateDisplayFormat=JSGantt.parseDateFormatStr('yyyy');
-	var vQuarterMinorDateDisplayFormat=JSGantt.parseDateFormatStr('qq');
-	var vUseFullYear=JSGantt.parseDateFormatStr('dd/mm/yyyy');
-	var vCaptionType;
-	var vDepId=1;
-	var vTaskList=new Array();
-	var vFormatArr=new Array('hour','day','week','month','quarter');
-	var vMonthDaysArr=new Array(31,28,31,30,31,30,31,31,30,31,30,31);
-	var vProcessNeeded=true;
-	var vMinGpLen=8;
-	var vScrollTo='';
-	var vHourColWidth=18;
-	var vDayColWidth=18;
-	var vWeekColWidth=36;
-	var vMonthColWidth=36;
-	var vQuarterColWidth=18;
-	var vRowHeight=20;
-	var vTodayPx=-1;
-	var vLangs={'en':
-			{'format':'Format','hour':'Hour','day':'Day','week':'Week','month':'Month','quarter':'Quarter','hours':'Hours','days':'Days',
-			 'weeks':'Weeks','months':'Months','quarters':'Quarters','hr':'Hr','dy':'Day','wk':'Wk','mth':'Mth','qtr':'Qtr','hrs':'Hrs',
-			 'dys':'Days','wks':'Wks','mths':'Mths','qtrs':'Qtrs','resource':'Resource','duration':'Duration','comp':'%',
-			 'completion':'Completion','startdate':'Start Date','enddate':'End Date','moreinfo':'More Information','notes':'Notes',
-			 'january':'January','february':'February','march':'March','april':'April','maylong':'May','june':'June','july':'July',
-			 'august':'August','september':'September','october':'October','november':'November','december':'December','jan':'Jan',
-			 'feb':'Feb','mar':'Mar','apr':'Apr','may':'May','jun':'Jun','jul':'Jul','aug':'Aug','sep':'Sep','oct':'Oct','nov':'Nov',
-			 'dec':'Dec','sunday':'Sunday','monday':'Monday','tuesday':'Tuesday','wednesday':'Wednesday','thursday':'Thursday',
-			 'friday':'Friday','saturday':'Saturday','sun':'Sun','mon':'Mon','tue':'Tue','wed':'Wed','thu':'Thu','fri':'Fri','sat':'Sat'}
-		};
-	var vLang='en';
-	var vChartBody=null;
-	var vChartHead=null;
-	var vListBody=null;
-	var vChartTable=null;
-	var vLines=null;
-	var vTimer=20;
-
-	this.setUseFade=function(pVal){vUseFade=pVal;};
-	this.setUseMove=function(pVal){vUseMove=pVal;};
-	this.setUseRowHlt=function(pVal){vUseRowHlt=pVal;};
-	this.setUseToolTip=function(pVal){vUseToolTip=pVal;};
-	this.setUseSort=function(pVal){vUseSort=pVal;};
-	this.setUseSingleCell=function(pVal){vUseSingleCell=pVal*1;};
-	this.setFormatArr=function()
-	{
-		var vValidFormats='hour day week month quarter';
-		vFormatArr=new Array();
-		for(var i=0, j=0; i<arguments.length; i++)
-		{
-			if (vValidFormats.indexOf(arguments[i].toLowerCase())!=-1 && arguments[i].length>1)
-			{
-				vFormatArr[j++]=arguments[i].toLowerCase();
-				var vRegExp=new RegExp('(?:^|\s)'+arguments[i]+'(?!\S)', 'g');
-				vValidFormats=vValidFormats.replace(vRegExp, '');
-			}
-		}
-	};
-	this.setShowRes=function(pVal){vShowRes=pVal;};
-	this.setShowDur=function(pVal){vShowDur=pVal;};
-	this.setShowComp=function(pVal){vShowComp=pVal;};
-	this.setShowStartDate=function(pVal){vShowStartDate=pVal;};
-	this.setShowEndDate=function(pVal){vShowEndDate=pVal;};
-	this.setShowTaskInfoRes=function(pVal){vShowTaskInfoRes=pVal;};
-	this.setShowTaskInfoDur=function(pVal){vShowTaskInfoDur=pVal;};
-	this.setShowTaskInfoComp=function(pVal){vShowTaskInfoComp=pVal;};
-	this.setShowTaskInfoStartDate=function(pVal){vShowTaskInfoStartDate=pVal;};
-	this.setShowTaskInfoEndDate=function(pVal){vShowTaskInfoEndDate=pVal;};
-	this.setShowTaskInfoNotes=function(pVal){vShowTaskInfoNotes=pVal;};
-	this.setShowTaskInfoLink=function(pVal){vShowTaskInfoLink=pVal;};
-	this.setShowEndWeekDate=function(pVal){vShowEndWeekDate=pVal;};
-	this.setShowSelector=function()
-	{
-		var vValidSelectors='top bottom';
-		vShowSelector=new Array();
-		for(var i=0, j=0; i<arguments.length; i++)
-		{
-			if (vValidSelectors.indexOf(arguments[i].toLowerCase())!=-1 && arguments[i].length>1)
-			{
-				vShowSelector[j++]=arguments[i].toLowerCase();
-				var vRegExp=new RegExp('(?:^|\s)'+arguments[i]+'(?!\S)', 'g');
-				vValidSelectors=vValidSelectors.replace(vRegExp, '');
-			}
-		}
-	};
-	this.setShowDeps=function(pVal){vShowDeps=pVal;};
-	this.setDateInputFormat=function(pVal){vDateInputFormat=pVal;};
-	this.setDateTaskTableDisplayFormat=function(pVal){vDateTaskTableDisplayFormat=JSGantt.parseDateFormatStr(pVal);};
-	this.setDateTaskDisplayFormat=function(pVal){vDateTaskDisplayFormat=JSGantt.parseDateFormatStr(pVal);};
-	this.setHourMajorDateDisplayFormat=function(pVal){vHourMajorDateDisplayFormat=JSGantt.parseDateFormatStr(pVal);};
-	this.setHourMinorDateDisplayFormat=function(pVal){vHourMinorDateDisplayFormat=JSGantt.parseDateFormatStr(pVal);};
-	this.setDayMajorDateDisplayFormat=function(pVal){vDayMajorDateDisplayFormat=JSGantt.parseDateFormatStr(pVal);};
-	this.setDayMinorDateDisplayFormat=function(pVal){vDayMinorDateDisplayFormat=JSGantt.parseDateFormatStr(pVal);};
-	this.setWeekMajorDateDisplayFormat=function(pVal){vWeekMajorDateDisplayFormat=JSGantt.parseDateFormatStr(pVal);};
-	this.setWeekMinorDateDisplayFormat=function(pVal){vWeekMinorDateDisplayFormat=JSGantt.parseDateFormatStr(pVal);};
-	this.setMonthMajorDateDisplayFormat=function(pVal){vMonthMajorDateDisplayFormat=JSGantt.parseDateFormatStr(pVal);};
-	this.setMonthMinorDateDisplayFormat=function(pVal){vMonthMinorDateDisplayFormat=JSGantt.parseDateFormatStr(pVal);};
-	this.setQuarterMajorDateDisplayFormat=function(pVal){vQuarterMajorDateDisplayFormat=JSGantt.parseDateFormatStr(pVal);};
-	this.setQuarterMinorDateDisplayFormat=function(pVal){vQuarterMinorDateDisplayFormat=JSGantt.parseDateFormatStr(pVal);};
-	this.setCaptionType=function(pType){vCaptionType=pType;};
-	this.setFormat=function(pFormat)
-	{
-		vFormat=pFormat;
-		this.Draw();
-	};
-	this.setMinGpLen=function(pMinGpLen){vMinGpLen=pMinGpLen;};
-	this.setScrollTo=function(pDate){vScrollTo=pDate;};
-	this.setHourColWidth=function(pWidth){vHourColWidth=pWidth;};
-	this.setDayColWidth=function(pWidth){vDayColWidth=pWidth;};
-	this.setWeekColWidth=function(pWidth){vWeekColWidth=pWidth;};
-	this.setMonthColWidth=function(pWidth){vMonthColWidth=pWidth;};
-	this.setQuarterColWidth=function(pWidth){vQuarterColWidth=pWidth;};
-	this.setRowHeight=function(pHeight){vRowHeight=pHeight;};
-	this.setLang=function(pLang){if(vLangs[pLang])vLang=pLang;};
-	this.setChartBody=function(pDiv){if(typeof HTMLDivElement !== 'function' || pDiv instanceof HTMLDivElement)vChartBody=pDiv;};
-	this.setChartHead=function(pDiv){if(typeof HTMLDivElement !== 'function' || pDiv instanceof HTMLDivElement)vChartHead=pDiv;};
-	this.setListBody=function(pDiv){if(typeof HTMLDivElement !== 'function' || pDiv instanceof HTMLDivElement)vListBody=pDiv;};
-	this.setChartTable=function(pTable){if(typeof HTMLTableElement !== 'function' || pTable instanceof HTMLTableElement)vChartTable=pTable;};
-	this.setLines=function(pDiv){if(typeof HTMLDivElement !== 'function' || pDiv instanceof HTMLDivElement)vLines=pDiv;};
-	this.setTimer=function(pVal){vTimer=pVal*1;};
-	this.addLang=function(pLang, pVals){
-		if(!vLangs[pLang])
-		{
-			vLangs[pLang]=new Object();
-			for(var vKey in vLangs['en'])vLangs[pLang][vKey]=(pVals[vKey])?document.createTextNode(pVals[vKey]).data:vLangs['en'][vKey];
-		}
-	};
-
-	this.getDivId=function(){return vDivId;};
-	this.getUseFade=function(){return vUseFade;};
-	this.getUseMove=function(){return vUseMove;};
-	this.getUseRowHlt=function(){return vUseRowHlt;};
-	this.getUseToolTip=function(){return vUseToolTip;};
-	this.getUseSort=function(){return vUseSort;};
-	this.getUseSingleCell=function(){return vUseSingleCell;};
-	this.getFormatArr=function(){return vFormatArr;};
-	this.getShowRes=function(){return vShowRes;};
-	this.getShowDur=function(){return vShowDur;};
-	this.getShowComp=function(){return vShowComp;};
-	this.getShowStartDate=function(){return vShowStartDate;};
-	this.getShowEndDate=function(){return vShowEndDate;};
-	this.getShowTaskInfoRes=function(){return vShowTaskInfoRes;};
-	this.getShowTaskInfoDur=function(){return vShowTaskInfoDur;};
-	this.getShowTaskInfoComp=function(){return vShowTaskInfoComp;};
-	this.getShowTaskInfoStartDate=function(){return vShowTaskInfoStartDate;};
-	this.getShowTaskInfoEndDate=function(){return vShowTaskInfoEndDate;};
-	this.getShowTaskInfoNotes=function(){return vShowTaskInfoNotes;};
-	this.getShowTaskInfoLink=function(){return vShowTaskInfoLink;};
-	this.getShowEndWeekDate=function(){return vShowEndWeekDate;};
-	this.getShowSelector=function(){return vShowSelector;};
-	this.getShowDeps=function(){return vShowDeps;};
-	this.getDateInputFormat=function(){return vDateInputFormat;};
-	this.getDateTaskTableDisplayFormat=function(){return vDateTaskTableDisplayFormat;};
-	this.getDateTaskDisplayFormat=function(){return vDateTaskDisplayFormat;};
-	this.getHourMajorDateDisplayFormat=function(){return vHourMajorDateDisplayFormat;};
-	this.getHourMinorDateDisplayFormat=function(){return vHourMinorDateDisplayFormat;};
-	this.getDayMajorDateDisplayFormat=function(){return vDayMajorDateDisplayFormat;};
-	this.getDayMinorDateDisplayFormat=function(){return vDayMinorDateDisplayFormat;};
-	this.getWeekMajorDateDisplayFormat=function(){return vWeekMajorDateDisplayFormat;};
-	this.getWeekMinorDateDisplayFormat=function(){return vWeekMinorDateDisplayFormat;};
-	this.getMonthMajorDateDisplayFormat=function(){return vMonthMajorDateDisplayFormat;};
-	this.getMonthMinorDateDisplayFormat=function(){return vMonthMinorDateDisplayFormat;};
-	this.getQuarterMajorDateDisplayFormat=function(){return vQuarterMajorDateDisplayFormat;};
-	this.getQuarterMinorDateDisplayFormat=function(){return vQuarterMinorDateDisplayFormat;};
-	this.getCaptionType=function(){return vCaptionType;};
-	this.getMinGpLen=function(){return vMinGpLen;};
-	this.getScrollTo=function(){return vScrollTo;};
-	this.getHourColWidth=function(){return vHourColWidth;};
-	this.getDayColWidth=function(){return vDayColWidth;};
-	this.getWeekColWidth=function(){return vWeekColWidth;};
-	this.getMonthColWidth=function(){return vMonthColWidth;};
-	this.getQuarterColWidth=function(){return vQuarterColWidth;};
-	this.getRowHeight=function(){return vRowHeight;};
-	this.getChartBody=function(){return vChartBody;};
-	this.getChartHead=function(){return vChartHead;};
-	this.getListBody=function(){return vListBody;};
-	this.getChartTable=function(){return vChartTable;};
-	this.getLines=function(){return vLines;};
-	this.getTimer=function(){return vTimer;};
-
-	this.CalcTaskXY=function()
-	{
-		var vID;
-		var vList=this.getList();
-		var vBarDiv;
-		var vTaskDiv;
-		var vParDiv;
-		var vLeft, vTop, vWidth;
-		var vHeight=Math.floor((this.getRowHeight()/2));
-
-		for(var i=0; i<vList.length; i++)
-		{
-			vID=vList[i].getID();
-			vBarDiv=vList[i].getBarDiv();
-			vTaskDiv=vList[i].getTaskDiv();
-			if((vList[i].getParItem() && vList[i].getParItem().getGroup()==2))
-			{
-				vParDiv=vList[i].getParItem().getChildRow();
-			}
-			else vParDiv=vList[i].getChildRow();
-
-			if(vBarDiv)
-			{
-				vList[i].setStartX(vBarDiv.offsetLeft+1);
-				vList[i].setStartY(vParDiv.offsetTop+vBarDiv.offsetTop+vHeight-1);
-				vList[i].setEndX(vBarDiv.offsetLeft+vBarDiv.offsetWidth+1);
-				vList[i].setEndY(vParDiv.offsetTop+vBarDiv.offsetTop+vHeight-1);
-			}
-		}
-	};
-
-	this.AddTaskItem=function(value)
-	{
-		var vExists=false;
-		for (var i=0; i<vTaskList.length; i++)
-		{
-			if (vTaskList[i].getID()==value.getID())
-			{
-				i=vTaskList.length;
-				vExists=true;
-			}
-		}
-		if(!vExists)
-		{
-			vTaskList.push(value);
-			vProcessNeeded=true;
-		}
-	};
-
-	this.RemoveTaskItem=function(pID)
-	{
-		// simply mark the task for removal at this point - actually remove it next time we re-draw the chart
-		for (var i=0; i<vTaskList.length; i++)
-		{
-			if (vTaskList[i].getID()==pID) vTaskList[i].setToDelete(true);
-			else if (vTaskList[i].getParent()==pID) this.RemoveTaskItem(vTaskList[i].getID());
-		}
-		vProcessNeeded=true;
-	};
-
-	this.getList=function(){return vTaskList;};
-
-	this.clearDependencies=function()
-	{
-		var parent=this.getLines();
-		while(parent.hasChildNodes())parent.removeChild(parent.firstChild);
-		vDepId=1;
-	};
-
-
-	// sLine: Draw a straight line (colored one-pixel wide div)
-	this.sLine=function(x1,y1,x2,y2,pClass)
-	{
-		var vLeft=Math.min(x1,x2);
-		var vTop=Math.min(y1,y2);
-		var vWid=Math.abs(x2-x1)+1;
-		var vHgt=Math.abs(y2-y1)+1;
-
-		var vTmpDiv=document.createElement('div');
-		vTmpDiv.id=vDivId+'line'+vDepId++;
-		vTmpDiv.style.position='absolute';
-		vTmpDiv.style.overflow='hidden';
-		vTmpDiv.style.zIndex=0;
-		vTmpDiv.style.left=vLeft+'px';
-		vTmpDiv.style.top=vTop+'px';
-		vTmpDiv.style.width=vWid+'px';
-		vTmpDiv.style.height=vHgt+'px';
-
-		vTmpDiv.style.visibility='visible';
-
-		if (vWid==1) vTmpDiv.className='glinev';
-		else vTmpDiv.className='glineh';
-
-		if (pClass) vTmpDiv.className+=' '+pClass;
-
-		this.getLines().appendChild(vTmpDiv);
-
-		return vTmpDiv;
-	};
-
-	this.drawDependency =function(x1,y1,x2,y2,pType,pClass)
-	{
-		var vDir=1;
-		var vBend=false;
-		var vShort=4;
-		var vRow=Math.floor(this.getRowHeight()/2);
-
-		if(y2<y1) vRow*=-1;
-
-		switch(pType)
-		{
-			case 'SF':
-				vShort*=-1;
-				if(x1-10<=x2 && y1!=y2) vBend=true;
-				vDir=-1;
-				break;
-			case 'SS':
-				if (x1<x2) vShort*=-1;
-				else vShort=x2-x1-(2*vShort);
-				break;
-			case 'FF':
-				if (x1<=x2) vShort=x2-x1+(2*vShort);
-				vDir=-1;
-				break;
-			default:
-				if(x1+10>=x2 && y1!=y2) vBend=true;
-				break;
-		}
-
-		if (vBend)
-		{
-			this.sLine(x1,y1,x1+vShort,y1,pClass);
-			this.sLine(x1+vShort,y1,x1+vShort,y2-vRow,pClass);
-			this.sLine(x1+vShort,y2-vRow,x2-(vShort*2),y2-vRow,pClass);
-			this.sLine(x2-(vShort*2),y2-vRow,x2-(vShort*2),y2,pClass);
-			this.sLine(x2-(vShort*2),y2,x2-(1*vDir),y2,pClass);
-		}
-		else if (y1!=y2)
-		{
-			this.sLine(x1,y1,x1+vShort,y1,pClass);
-			this.sLine(x1+vShort,y1,x1+vShort,y2,pClass);
-			this.sLine(x1+vShort,y2,x2-(1*vDir),y2,pClass);
-		}
-		else this.sLine(x1,y1,x2-(1*vDir),y2,pClass);
-
-		var vTmpDiv=this.sLine(x2,y2,x2-3-((vDir<0)?1:0),y2-3-((vDir<0)?1:0),pClass+"Arw");
-		vTmpDiv.style.width='0px';
-		vTmpDiv.style.height='0px';
-	};
-
-	this.DrawDependencies=function()
-	{
-		if (this.getShowDeps()==1)
-		{
-			//First recalculate the x,y
-			this.CalcTaskXY();
-			this.clearDependencies();
-
-			var vList=this.getList();
-			for(var i=0; i<vList.length; i++)
-			{
-				var vDepend=vList[i].getDepend();
-				var vDependType=vList[i].getDepType();
-				var n=vDepend.length;
-
-				if(n>0 && vList[i].getVisible()==1)
-				{
-					for(var k=0;k<n;k++)
-					{
-						var vTask=this.getArrayLocationByID(vDepend[k]);
-						if (vTask>=0 && vList[vTask].getGroup()!=2)
-						{
-							if(vList[vTask].getVisible()==1)
-							{
-								if(vDependType[k]=='SS')this.drawDependency(vList[vTask].getStartX()-1,vList[vTask].getStartY(),vList[i].getStartX()-1,vList[i].getStartY(),'SS','gDepSS');
-								else if(vDependType[k]=='FF')this.drawDependency(vList[vTask].getEndX(),vList[vTask].getEndY(),vList[i].getEndX(),vList[i].getEndY(),'FF','gDepFF');
-								else if(vDependType[k]=='SF')this.drawDependency(vList[vTask].getStartX()-1,vList[vTask].getStartY(),vList[i].getEndX(),vList[i].getEndY(),'SF','gDepSF');
-								else if(vDependType[k]=='FS')this.drawDependency(vList[vTask].getEndX(),vList[vTask].getEndY(),vList[i].getStartX()-1,vList[i].getStartY(),'FS','gDepFS');
-							}
-						}
-					}
-				}
-			}
-		}
-		// draw the current date line
-		if (vTodayPx>=0) this.sLine(vTodayPx, 0, vTodayPx, this.getChartTable().offsetHeight-1, 'gCurDate');
-	};
-
-	this.getArrayLocationByID=function(pId)
-	{
-		var vList=this.getList();
-		for(var i=0; i<vList.length; i++)
-		{
-			if(vList[i].getID()==pId)
-			return i;
-		}
-		return -1;
-	};
-
-	this.newNode=function(pParent, pNodeType, pId, pClass, pText, pWidth, pLeft, pDisplay, pColspan, pAttribs)
-	{
-		var vNewNode=pParent.appendChild(document.createElement(pNodeType));
-		if (pAttribs)
-		{
-			for (var i=0; i+1<pAttribs.length; i+=2)
-			{
-				vNewNode.setAttribute(pAttribs[i],pAttribs[i+1]);
-			}
-		}
-		// I wish I could do this with setAttribute but older IEs don't play nice
-		if (pId)vNewNode.id=pId;
-		if (pClass)vNewNode.className=pClass;
-		if (pWidth)vNewNode.style.width=(isNaN(pWidth*1))?pWidth:pWidth+'px';
-		if (pLeft)vNewNode.style.left=(isNaN(pLeft*1))?pLeft:pLeft+'px';
-		if (pText)vNewNode.appendChild(document.createTextNode(pText));
-		if (pDisplay)vNewNode.style.display=pDisplay;
-		if (pColspan)vNewNode.colSpan=pColspan;
-		return vNewNode;
-	};
-
-	this.Draw=function()
-	{
-		var vMaxDate=new Date();
-		var vMinDate=new Date();
-		var vTmpDate=new Date();
-		var vTaskLeftPx=0;
-		var vTaskRightPx=0;
-		var vTaskWidth=1;
-		var vNumCols=0;
-		var vNumRows=0;
-		var vSingleCell=false;
-		var vID=0;
-		var vMainTable='';
-		var vDateRow=null;
-		var vFirstCellItemRowStr='';
-		var vItemRowStr='';
-		var vColWidth=0;
-		var vColUnit=0;
-		var vChild;
-		var vGroup;
-		var vTaskDiv;
-		var vParDiv;
-
-		if(vTaskList.length>0)
-		{
-			// Process all tasks, reset parent date and completion % if task list has altered
-			if (vProcessNeeded)	JSGantt.processRows(vTaskList, 0, -1, 1, 1, this.getUseSort());
-			vProcessNeeded=false;
-
-			// get overall min/max dates plus padding
-			vMinDate=JSGantt.getMinDate(vTaskList, vFormat);
-			vMaxDate=JSGantt.getMaxDate(vTaskList, vFormat);
-
-			// Calculate chart width variables.
-			if(vFormat=='day') vColWidth=vDayColWidth;
-			else if(vFormat=='week') vColWidth=vWeekColWidth;
-			else if(vFormat=='month') vColWidth=vMonthColWidth;
-			else if(vFormat=='quarter') vColWidth=vQuarterColWidth;
-			else if(vFormat=='hour') vColWidth=vHourColWidth;
-
-			// DRAW the Left-side of the chart (names, resources, comp%)
-			var vLeftHeader=document.createDocumentFragment();
-
-			var vTmpDiv=this.newNode(vLeftHeader, 'div', vDivId+'glisthead', 'glistlbl gcontainercol');
-			var vTmpTab=this.newNode(vTmpDiv, 'table', null, 'gtasktableh');
-			var vTmpTBody=this.newNode(vTmpTab, 'tbody');
-			var vTmpRow=this.newNode(vTmpTBody, 'tr');
-			this.newNode(vTmpRow, 'td', null, 'gtasklist', '\u00A0');
-			var vTmpCell=this.newNode(vTmpRow, 'td', null, 'gspanning gtaskname');
-			vTmpCell.appendChild(this.drawSelector('top'));
-			if(vShowRes==1)this.newNode(vTmpRow, 'td', null, 'gspanning gresource', '\u00A0');
-			if(vShowDur==1)this.newNode(vTmpRow, 'td', null, 'gspanning gduration', '\u00A0');
-			if(vShowComp==1)this.newNode(vTmpRow, 'td', null, 'gspanning gpccomplete', '\u00A0');
-			if(vShowStartDate==1)this.newNode(vTmpRow, 'td', null, 'gspanning gstartdate', '\u00A0');
-			if(vShowEndDate==1)this.newNode(vTmpRow, 'td', null, 'gspanning genddate', '\u00A0');
-
-			vTmpRow=this.newNode(vTmpTBody, 'tr');
-			this.newNode(vTmpRow, 'td', null, 'gtasklist', '\u00A0');
-			this.newNode(vTmpRow, 'td', null, 'gtaskname', '\u00A0');
-			if(vShowRes==1)this.newNode(vTmpRow, 'td', null, 'gtaskheading gresource', vLangs[vLang]['resource']);
-			if(vShowDur==1)this.newNode(vTmpRow, 'td', null, 'gtaskheading gduration', vLangs[vLang]['duration']);
-			if(vShowComp==1)this.newNode(vTmpRow, 'td', null, 'gtaskheading gpccomplete', vLangs[vLang]['comp']);
-			if(vShowStartDate==1)this.newNode(vTmpRow, 'td', null, 'gtaskheading gstartdate', vLangs[vLang]['startdate']);
-			if(vShowEndDate==1)this.newNode(vTmpRow, 'td', null, 'gtaskheading genddate', vLangs[vLang]['enddate']);
-
-			var vLeftTable=document.createDocumentFragment();
-			var vTmpDiv2=this.newNode(vLeftTable, 'div', vDivId+'glistbody', 'glistgrid gcontainercol');
-			this.setListBody(vTmpDiv2);
-			vTmpTab=this.newNode(vTmpDiv2, 'table', null, 'gtasktable');
-			vTmpTBody=this.newNode(vTmpTab, 'tbody');
-
-			for(i=0; i<vTaskList.length; i++)
-			{
-				if(vTaskList[i].getGroup()==1) var vBGColor='ggroupitem';
-				else vBGColor='glineitem';
-
-				vID=vTaskList[i].getID();
-
-				if((!(vTaskList[i].getParItem() && vTaskList[i].getParItem().getGroup()==2)) || vTaskList[i].getGroup()==2)
-				{
-					if(vTaskList[i].getVisible()==0) vTmpRow=this.newNode(vTmpTBody, 'tr', vDivId+'child_'+vID, 'gname '+vBGColor, null, null, null, 'none');
-					else vTmpRow=this.newNode(vTmpTBody, 'tr', vDivId+'child_'+vID, 'gname '+vBGColor);
-					vTaskList[i].setListChildRow(vTmpRow);
-					this.newNode(vTmpRow, 'td', null, 'gtasklist', '\u00A0');
-					vTmpCell=this.newNode(vTmpRow, 'td', null, 'gtaskname');
-
-					var vCellContents ='';
-					for(j=1; j<vTaskList[i].getLevel(); j++)
-					{
-						vCellContents+='\u00A0\u00A0\u00A0\u00A0';
-					}
-
-					if(vTaskList[i].getGroup()==1)
-					{
-						vTmpDiv=this.newNode(vTmpCell, 'div', null, null, vCellContents);
-						var vTmpSpan=this.newNode(vTmpDiv, 'span', vDivId+'group_'+vID, 'gfoldercollapse', (vTaskList[i].getOpen()==1)?'-':'+');
-						vTaskList[i].setGroupSpan(vTmpSpan);
-						JSGantt.addFolderListeners(this, vTmpSpan, vID);
-						vTmpDiv.appendChild(document.createTextNode('\u00A0'+vTaskList[i].getName()));
-					}
-					else
-					{
-						vCellContents+='\u00A0\u00A0\u00A0\u00A0';
-						vTmpDiv=this.newNode(vTmpCell, 'div', null, null, vCellContents+vTaskList[i].getName());
-					}
-
-					if(vShowRes==1)
-					{
-						vTmpCell=this.newNode(vTmpRow, 'td', null, 'gresource');
-						/*vTmpDiv=this.newNode(vTmpCell, 'div', null, null, vTaskList[i].getResource());*/
-                        var vTmpNode=this.newNode(vTmpCell, 'div', null, '');
-                        vTmpNode=this.newNode(vTmpNode, 'a', null, '', (vTaskList[i].getLink() != '' ? vLangs[vLang]['moreinfo'] : ''));
-                        vTmpNode.setAttribute('href',vTaskList[i].getLink());
- 						
-					}
-					if(vShowDur==1)
-					{
-						vTmpCell=this.newNode(vTmpRow, 'td', null, 'gduration');
-						vTmpDiv=this.newNode(vTmpCell, 'div', null, null, vTaskList[i].getDuration(vFormat, vLangs[vLang]));
-					}
-					if(vShowComp==1)
-					{
-						vTmpCell=this.newNode(vTmpRow, 'td', null, 'gpccomplete');
-						vTmpDiv=this.newNode(vTmpCell, 'div', null, null, vTaskList[i].getCompStr());
-					}
-					if(vShowStartDate==1)
-					{
-						vTmpCell=this.newNode(vTmpRow, 'td', null, 'gstartdate');
-						vTmpDiv=this.newNode(vTmpCell, 'div', null, null, JSGantt.formatDateStr(vTaskList[i].getStart(), vDateTaskTableDisplayFormat, vLangs[vLang]));
-					}
-					if(vShowEndDate==1)
-					{
-						vTmpCell=this.newNode(vTmpRow, 'td', null, 'genddate');
-						vTmpDiv=this.newNode(vTmpCell, 'div', null, null, JSGantt.formatDateStr(vTaskList[i].getEnd(), vDateTaskTableDisplayFormat, vLangs[vLang]));
-					}
-					vNumRows++;
-				}
-			}
-
-			// DRAW the date format selector at bottom left.
-			vTmpRow=this.newNode(vTmpTBody, 'tr');
-			this.newNode(vTmpRow, 'td', null, 'gtasklist', '\u00A0');
-			vTmpCell=this.newNode(vTmpRow, 'td', null, 'gspanning gtaskname');
-			vTmpCell.appendChild(this.drawSelector('bottom'));
-			if(vShowRes==1)this.newNode(vTmpRow, 'td', null, 'gspanning gresource', '\u00A0');
-			if(vShowDur==1)this.newNode(vTmpRow, 'td', null, 'gspanning gduration', '\u00A0');
-			if(vShowComp==1)this.newNode(vTmpRow, 'td', null, 'gspanning gpccomplete', '\u00A0');
-			if(vShowStartDate==1)this.newNode(vTmpRow, 'td', null, 'gspanning gstartdate', '\u00A0');
-			if(vShowEndDate==1)this.newNode(vTmpRow, 'td', null, 'gspanning genddate', '\u00A0');
-			// Add some white space so the vertical scroll distance should always be greater
-			// than for the right pane (keep to a minimum as it is seen in unconstrained height designs)
-			this.newNode(vTmpDiv2, 'br');
-			this.newNode(vTmpDiv2, 'br');
-
-			// Draw the Chart Rows
-			var vRightHeader=document.createDocumentFragment();
-			vTmpDiv=this.newNode(vRightHeader, 'div', vDivId+'gcharthead', 'gchartlbl gcontainercol');
-			this.setChartHead(vTmpDiv);
-			vTmpTab=this.newNode(vTmpDiv, 'table', vDivId+'chartTableh', 'gcharttableh');
-			vTmpTBody=this.newNode(vTmpTab, 'tbody');
-			vTmpRow=this.newNode(vTmpTBody, 'tr');
-
-			vTmpDate.setFullYear(vMinDate.getFullYear(), vMinDate.getMonth(), vMinDate.getDate());
-			if(vFormat=='hour')vTmpDate.setHours(vMinDate.getHours());
-			else vTmpDate.setHours(0);
-			vTmpDate.setMinutes(0);
-			vTmpDate.setSeconds(0);
-			vTmpDate.setMilliseconds(0);
-
-			var vColSpan=1;
-			// Major Date Header
-			while(vTmpDate.getTime()<=vMaxDate.getTime())
-			{
-				var vHeaderCellClass='gmajorheading';
-				vCellContents='';
-
-				if(vFormat=='day')
-				{
-					vTmpCell=this.newNode(vTmpRow, 'td', null, vHeaderCellClass, null, null, null, null, 7);
-					vCellContents+=JSGantt.formatDateStr(vTmpDate,vDayMajorDateDisplayFormat,vLangs[vLang]);
-					vTmpDate.setDate(vTmpDate.getDate()+6);
-
-					if (vShowEndWeekDate==1) vCellContents+=' - ' +JSGantt.formatDateStr(vTmpDate, vDayMajorDateDisplayFormat,vLangs[vLang]);
-
-					this.newNode(vTmpCell, 'div', null, null, vCellContents, vColWidth*7);
-					vTmpDate.setDate(vTmpDate.getDate()+1);
-				}
-				else if(vFormat=='week')
-				{
-					vTmpCell=this.newNode(vTmpRow, 'td', null, vHeaderCellClass, null, vColWidth);
-					this.newNode(vTmpCell, 'div', null, null, JSGantt.formatDateStr(vTmpDate,vWeekMajorDateDisplayFormat,vLangs[vLang]), vColWidth);
-					vTmpDate.setDate(vTmpDate.getDate()+7);
-				}
-				else if(vFormat=='month')
-				{
-					vColSpan=(12-vTmpDate.getMonth());
-					if (vTmpDate.getFullYear()==vMaxDate.getFullYear()) vColSpan-=(11-vMaxDate.getMonth());
-					vTmpCell=this.newNode(vTmpRow, 'td', null, vHeaderCellClass, null, null, null, null, vColSpan);
-					this.newNode(vTmpCell, 'div', null, null, JSGantt.formatDateStr(vTmpDate,vMonthMajorDateDisplayFormat,vLangs[vLang]), vColWidth*vColSpan);
-					vTmpDate.setFullYear(vTmpDate.getFullYear()+1,0,1);
-				}
-				else if(vFormat=='quarter')
-				{
-					vColSpan=(4-Math.floor(vTmpDate.getMonth()/3));
-					if (vTmpDate.getFullYear()==vMaxDate.getFullYear()) vColSpan-=(3-Math.floor(vMaxDate.getMonth()/3));
-					vTmpCell=this.newNode(vTmpRow, 'td', null, vHeaderCellClass, null, null, null, null, vColSpan);
-					this.newNode(vTmpCell, 'div', null, null, JSGantt.formatDateStr(vTmpDate,vQuarterMajorDateDisplayFormat,vLangs[vLang]), vColWidth*vColSpan);
-					vTmpDate.setFullYear(vTmpDate.getFullYear()+1,0,1);
-				}
-				else if(vFormat=='hour')
-				{
-					vColSpan=(24-vTmpDate.getHours());
-					if (vTmpDate.getFullYear()==vMaxDate.getFullYear() &&
-						vTmpDate.getMonth()==vMaxDate.getMonth() &&
-						vTmpDate.getDate()==vMaxDate.getDate()) vColSpan-=(23-vMaxDate.getHours());
-					vTmpCell=this.newNode(vTmpRow, 'td', null, vHeaderCellClass, null, null, null, null, vColSpan);
-					this.newNode(vTmpCell, 'div', null, null, JSGantt.formatDateStr(vTmpDate,vHourMajorDateDisplayFormat,vLangs[vLang]), vColWidth*vColSpan);
-					vTmpDate.setHours(0);
-					vTmpDate.setDate(vTmpDate.getDate()+1);
-				}
-			}
-
-			vTmpRow=this.newNode(vTmpTBody, 'tr');
-
-			// Minor Date header and Cell Rows
-			vTmpDate.setFullYear(vMinDate.getFullYear(), vMinDate.getMonth(), vMinDate.getDate(), vMinDate.getHours());
-			if(vFormat=='hour')vTmpDate.setHours(vMinDate.getHours());
-			vNumCols=0;
-
-			while(vTmpDate.getTime()<=vMaxDate.getTime())
-			{
-				vHeaderCellClass='gminorheading';
-				var vCellClass='gtaskcell';
-
-				if(vFormat=='day')
-				{
-					if(vTmpDate.getDay()%6==0)
-					{
-						vHeaderCellClass+='wkend';
-						vCellClass+='wkend';
-					}
-
-					if(vTmpDate<=vMaxDate)
-					{
-						vTmpCell=this.newNode(vTmpRow, 'td', null, vHeaderCellClass);
-						this.newNode(vTmpCell, 'div', null, null, JSGantt.formatDateStr(vTmpDate,vDayMinorDateDisplayFormat,vLangs[vLang]), vColWidth);
-						vNumCols++;
-					}
-
-					vTmpDate.setDate(vTmpDate.getDate()+1);
-				}
-				else if(vFormat=='week')
-				{
-					if(vTmpDate<=vMaxDate)
-					{
-						vTmpCell=this.newNode(vTmpRow, 'td', null, vHeaderCellClass);
-						this.newNode(vTmpCell, 'div', null, null, JSGantt.formatDateStr(vTmpDate,vWeekMinorDateDisplayFormat,vLangs[vLang]), vColWidth);
-						vNumCols++;
-					}
-
-					vTmpDate.setDate(vTmpDate.getDate()+7);
-				}
-				else if(vFormat=='month')
-				{
-					if(vTmpDate<=vMaxDate)
-					{
-						vTmpCell=this.newNode(vTmpRow, 'td', null, vHeaderCellClass);
-						this.newNode(vTmpCell, 'div', null, null, JSGantt.formatDateStr(vTmpDate,vMonthMinorDateDisplayFormat,vLangs[vLang]), vColWidth);
-						vNumCols++;
-					}
-
-					vTmpDate.setDate(vTmpDate.getDate()+1);
-
-					while(vTmpDate.getDate()>1)
-					{
-						vTmpDate.setDate(vTmpDate.getDate()+1);
-					}
-				}
-				else if(vFormat=='quarter')
-				{
-					if(vTmpDate<=vMaxDate)
-					{
-						vTmpCell=this.newNode(vTmpRow, 'td', null, vHeaderCellClass);
-						this.newNode(vTmpCell, 'div', null, null, JSGantt.formatDateStr(vTmpDate,vQuarterMinorDateDisplayFormat,vLangs[vLang]), vColWidth);
-						vNumCols++;
-					}
-
-					vTmpDate.setDate(vTmpDate.getDate()+81);
-
-					while(vTmpDate.getDate()>1) vTmpDate.setDate(vTmpDate.getDate()+1);
-				}
-				else if(vFormat=='hour')
-				{
-					for(i=vTmpDate.getHours();i<24;i++)
-					{
-						vTmpDate.setHours(i);//works around daylight savings but may look a little odd on days where the clock goes forward
-						if(vTmpDate<=vMaxDate)
-						{
-							vTmpCell=this.newNode(vTmpRow, 'td', null, vHeaderCellClass);
-							this.newNode(vTmpCell, 'div', null, null, JSGantt.formatDateStr(vTmpDate,vHourMinorDateDisplayFormat,vLangs[vLang]), vColWidth);
-							vNumCols++;
-						}
-					}
-					vTmpDate.setHours(0);
-					vTmpDate.setDate(vTmpDate.getDate()+1);
-				}
-			}
-			vDateRow=vTmpRow;
-
-			vTaskLeftPx=(vNumCols *(vColWidth+1))+1;
-
-			if(vUseSingleCell!=0 && vUseSingleCell<(vNumCols*vNumRows))vSingleCell=true;
-
-			this.newNode(vTmpDiv, 'div', null, 'rhscrpad', null, null, vTaskLeftPx+1);
-
-			vTmpDiv=this.newNode(vRightHeader, 'div', null, 'glabelfooter');
-
-			var vRightTable=document.createDocumentFragment();
-			vTmpDiv=this.newNode(vRightTable, 'div', vDivId+'gchartbody', 'gchartgrid gcontainercol');
-			this.setChartBody(vTmpDiv);
-			vTmpTab=this.newNode(vTmpDiv, 'table', vDivId+'chartTable', 'gcharttable', null, vTaskLeftPx);
-			this.setChartTable(vTmpTab);
-			this.newNode(vTmpDiv, 'div', null, 'rhscrpad', null, null, vTaskLeftPx+1);
-			vTmpTBody=this.newNode(vTmpTab, 'tbody');
-
-			// Draw each row
-
-			var i=0;
-			var j=0;
-			for(i=0; i<vTaskList.length; i++)
-			{
-				var curTaskStart=vTaskList[i].getStart();
-				var curTaskEnd=vTaskList[i].getEnd();
-				if ((curTaskEnd.getTime()-(curTaskEnd.getTimezoneOffset()*60000))%(86400000)==0) curTaskEnd=new Date(curTaskEnd.getFullYear(), curTaskEnd.getMonth(), curTaskEnd.getDate()+1, curTaskEnd.getHours(), curTaskEnd.getMinutes(), curTaskEnd.getSeconds()); // add 1 day here to simplify calculations below
-
-				vTaskLeftPx=JSGantt.getOffset(vMinDate, curTaskStart, vColWidth, vFormat);
-				vTaskRightPx=JSGantt.getOffset(curTaskStart, curTaskEnd, vColWidth, vFormat);
-
-				vID=vTaskList[i].getID();
-				var vComb=(vTaskList[i].getParItem() && vTaskList[i].getParItem().getGroup()==2);
-				var vCellFormat='';
-
-				var vTmpItem=vTaskList[i];
-				var vCaptionStr='';
-				var vCaptClass=null;
-				if(vTaskList[i].getMile() && !vComb)
-				{
-					vTmpRow=this.newNode(vTmpTBody, 'tr', vDivId+'childrow_'+vID, 'gmileitem gmile'+vFormat, null, null, null, ((vTaskList[i].getVisible()==0)? 'none' : null));
-					vTaskList[i].setChildRow(vTmpRow);
-					JSGantt.addThisRowListeners(this, vTaskList[i].getListChildRow(), vTmpRow);
-					vTmpCell=this.newNode(vTmpRow, 'td', null, 'gtaskcell');
-					vTmpDiv=this.newNode(vTmpCell, 'div', null, 'gtaskcelldiv', '\u00A0\u00A0');
-					vTmpDiv=this.newNode(vTmpDiv, 'div', vDivId+'bardiv_'+vID, 'gtaskbarcontainer', null, 12, vTaskLeftPx-6);
-					vTaskList[i].setBarDiv(vTmpDiv);
-					vTmpDiv2=this.newNode(vTmpDiv, 'div', vDivId+'taskbar_'+vID, vTaskList[i].getClass(), null, 12);
-					vTaskList[i].setTaskDiv(vTmpDiv2);
-
-					if(vTaskList[i].getCompVal()<100)
-						vTmpDiv2.appendChild(document.createTextNode('\u25CA'));
-					else
-					{
-						vTmpDiv2=this.newNode(vTmpDiv2, 'div', null, 'gmilediamond');
-						this.newNode(vTmpDiv2, 'div', null, 'gmdtop');
-						this.newNode(vTmpDiv2, 'div', null, 'gmdbottom');
-					}
-
-					vCaptClass='gmilecaption';
-
-					if(!vSingleCell && !vComb)
-					{
-						vCellFormat='';
-						for(j=0; j<vNumCols-1; j++)
-						{
-							if(vFormat=='day'&&((j%7==4)||(j%7==5))) vCellFormat='gtaskcellwkend';
-							else vCellFormat='gtaskcell';
-							this.newNode(vTmpRow, 'td', null, vCellFormat, '\u00A0\u00A0');
-						}
-					}
-				}
-				else
-				{
-					vTaskWidth=vTaskRightPx-1;
-
-					// Draw Group Bar which has outer div with inner group div and several small divs to left and right to create angled-end indicators
-					if(vTaskList[i].getGroup())
-					{
-						vTaskWidth=(vTaskWidth>vMinGpLen && vTaskWidth<vMinGpLen*2)? vMinGpLen*2 : vTaskWidth; // Expand to show two end points
-						vTaskWidth=(vTaskWidth<vMinGpLen)? vMinGpLen : vTaskWidth; // expand to show one end point
-
-						vTmpRow=this.newNode(vTmpTBody, 'tr', vDivId+'childrow_'+vID, ((vTaskList[i].getGroup()==2)?'glineitem gitem':'ggroupitem ggroup')+vFormat, null, null, null, ((vTaskList[i].getVisible()==0)? 'none' : null));
-						vTaskList[i].setChildRow(vTmpRow);
-						JSGantt.addThisRowListeners(this, vTaskList[i].getListChildRow(), vTmpRow);
-						vTmpCell=this.newNode(vTmpRow, 'td', null, 'gtaskcell');
-						vTmpDiv=this.newNode(vTmpCell, 'div', null, 'gtaskcelldiv', '\u00A0\u00A0');
-						vTaskList[i].setCellDiv(vTmpDiv);
-						if(vTaskList[i].getGroup()==1)
-						{
-							vTmpDiv=this.newNode(vTmpDiv, 'div', vDivId+'bardiv_'+vID, 'gtaskbarcontainer', null, vTaskWidth, vTaskLeftPx);
-							vTaskList[i].setBarDiv(vTmpDiv);
-							vTmpDiv2=this.newNode(vTmpDiv, 'div', vDivId+'taskbar_'+vID, vTaskList[i].getClass(), null, vTaskWidth);
-							vTaskList[i].setTaskDiv(vTmpDiv2);
-
-							this.newNode(vTmpDiv2, 'div', vDivId+'complete_'+vID, vTaskList[i].getClass() +'complete', null, vTaskList[i].getCompStr());
-
-							this.newNode(vTmpDiv, 'div', null, vTaskList[i].getClass() +'endpointleft');
-							if (vTaskWidth>=vMinGpLen*2) this.newNode(vTmpDiv, 'div', null, vTaskList[i].getClass() +'endpointright');
-
-							vCaptClass='ggroupcaption';
-						}
-
-						if(!vSingleCell && !vComb)
-						{
-							vCellFormat='';
-							for(j=0; j<vNumCols-1; j++)
-							{
-								if(vFormat=='day'&&((j%7==4)||(j%7==5))) vCellFormat='gtaskcellwkend';
-								else vCellFormat='gtaskcell';
-								this.newNode(vTmpRow, 'td', null, vCellFormat, '\u00A0\u00A0');
-							}
-						}
-					}
-					else
-					{
-						vTaskWidth=(vTaskWidth<=0)? 1 : vTaskWidth;
-
-						if(vComb)
-						{
-							vTmpDiv=vTaskList[i].getParItem().getCellDiv();
-						}
-						else
-						{
-							vTmpRow=this.newNode(vTmpTBody, 'tr', vDivId+'childrow_'+vID, 'glineitem gitem'+vFormat, null, null, null, ((vTaskList[i].getVisible()==0)? 'none' : null));
-							vTaskList[i].setChildRow(vTmpRow);
-							JSGantt.addThisRowListeners(this, vTaskList[i].getListChildRow(), vTmpRow);
-							vTmpCell=this.newNode(vTmpRow, 'td', null, 'gtaskcell');
-							vTmpDiv=this.newNode(vTmpCell, 'div', null, 'gtaskcelldiv', '\u00A0\u00A0');
-						}
-						// Draw Task Bar which has colored bar div, and opaque completion div
-						vTmpDiv=this.newNode(vTmpDiv, 'div', vDivId+'bardiv_'+vID, 'gtaskbarcontainer', null, vTaskWidth, vTaskLeftPx);
-						vTaskList[i].setBarDiv(vTmpDiv);
-						vTmpDiv2=this.newNode(vTmpDiv, 'div', vDivId+'taskbar_'+vID, vTaskList[i].getClass(), null, vTaskWidth);
-						vTaskList[i].setTaskDiv(vTmpDiv2);
-						this.newNode(vTmpDiv2, 'div', vDivId+'complete_'+vID, vTaskList[i].getClass() +'complete', null, vTaskList[i].getCompStr());
-
-						if(vComb)vTmpItem=vTaskList[i].getParItem();
-						if(!vComb || (vComb && vTaskList[i].getParItem().getEnd()==vTaskList[i].getEnd())) vCaptClass='gcaption';
-
-						if(!vSingleCell && !vComb)
-						{
-							vCellFormat='';
-							for(j=0; j<vNumCols-1; j++)
-							{
-								if(vFormat=='day'&&((j%7==4)||(j%7==5))) vCellFormat='gtaskcellwkend';
-								else vCellFormat='gtaskcell';
-								this.newNode(vTmpRow, 'td', null, vCellFormat, '\u00A0\u00A0');
-							}
-						}
-					}
-				}
-
-				if(this.getCaptionType() && vCaptClass!==null)
-				{
-					switch(this.getCaptionType())
-					{
-						case 'Caption': var vCaptionStr=vTmpItem.getCaption(); break;
-						case 'Resource': vCaptionStr=vTmpItem.getResource(); break;
-						case 'Duration': vCaptionStr=vTmpItem.getDuration(vFormat, vLangs[vLang]); break;
-						case 'Complete': vCaptionStr=vTmpItem.getCompStr(); break;
-					}
-					this.newNode(vTmpDiv, 'div', null, vCaptClass, vCaptionStr, 120, (vCaptClass=='gmilecaption')?12:0);
-				}
-
-				if (vTaskList[i].getTaskDiv() && vTmpDiv)
-				{
-					// Add Task Info div for tooltip
-					vTmpDiv2=this.newNode(vTmpDiv, 'div', vDivId+'tt'+vID, null, null, null, null, 'none');
-					vTmpDiv2.appendChild(this.createTaskInfo(vTaskList[i]));
-					JSGantt.addTooltipListeners(this, vTaskList[i].getTaskDiv(), vTmpDiv2);
-				}
-			}
-
-			if(!vSingleCell) vTmpTBody.appendChild(vDateRow.cloneNode(true));
-
-			while(vDiv.hasChildNodes())vDiv.removeChild(vDiv.firstChild);
-			vTmpDiv=this.newNode(vDiv, 'div', null, 'gchartcontainer');
-			vTmpDiv.appendChild(vLeftHeader);
-			vTmpDiv.appendChild(vRightHeader);
-			vTmpDiv.appendChild(vLeftTable);
-			vTmpDiv.appendChild(vRightTable);
-			this.newNode(vTmpDiv, 'div', null, 'ggridfooter');
-			vTmpDiv2=this.newNode(this.getChartBody(), 'div', vDivId+'Lines', 'glinediv');
-			vTmpDiv2.style.visibility='hidden';
-			this.setLines(vTmpDiv2);
-
-/* Quick hack to show the generated HTML on older browsers - add a '/' to the begining of this line to activate
-			var tmpGenSrc=document.createElement('textarea');
-			tmpGenSrc.appendChild(document.createTextNode(vTmpDiv.innerHTML));
-			vDiv.appendChild(tmpGenSrc);
-//*/
-			// Now all the content exists, register scroll listeners
-			JSGantt.addScrollListeners(this);
-
-			// now check if we are actually scrolling the pane
-			if (vScrollTo!='')
-			{
-				var vScrollDate=new Date(vMinDate.getTime());
-				var vScrollPx=0;
-
-				if(vScrollTo.substr(0,2)=='px')
-				{
-					vScrollPx=parseInt(vScrollTo.substr(2));
-				}
-				else
-				{
-					vScrollDate=JSGantt.parseDateStr(vScrollTo, this.getDateInputFormat());
-					if(vFormat=='hour')vScrollDate.setMinutes(0,0,0);
-					else vScrollDate.setHours(0,0,0,0);
-					vScrollPx=JSGantt.getOffset(vMinDate, vScrollDate, vColWidth, vFormat);
-				}
-				this.getChartBody().scrollLeft=vScrollPx;
-			}
-
-			if (vMinDate.getTime()<=(new Date()).getTime() && vMaxDate.getTime()>=(new Date()).getTime()) vTodayPx=JSGantt.getOffset(vMinDate, new Date(), vColWidth, vFormat);
-			else vTodayPx=-1;
-			this.DrawDependencies();
-		}
-	}; //this.draw
-
-	this.mouseOver=function(pObj1, pObj2)
-	{
-		if (this.getUseRowHlt())
-		{
-			pObj1.className+=' gitemhighlight';
-			pObj2.className+=' gitemhighlight';
-		}
-	};
-
-	this.mouseOut=function(pObj1, pObj2)
-	{
-		if (this.getUseRowHlt())
-		{
-			pObj1.className=pObj1.className.replace(/(?:^|\s)gitemhighlight(?!\S)/g, '');
-			pObj2.className=pObj2.className.replace(/(?:^|\s)gitemhighlight(?!\S)/g, '');
-		}
-	};
-
-	this.drawSelector=function(pPos)
-	{
-		var vOutput=document.createDocumentFragment();
-		var vDisplay=false;
-
-		for (var i=0; i<vShowSelector.length && !vDisplay; i++)
-		{
-			if (vShowSelector[i].toLowerCase()==pPos.toLowerCase()) vDisplay=true;
-		}
-
-		if (vDisplay)
-		{
-			var vTmpDiv=this.newNode(vOutput, 'div', null, 'gselector', vLangs[vLang]['format']+':');
-
-			if (vFormatArr.join().toLowerCase().indexOf('hour')!=-1)
-				JSGantt.addFormatListeners(this, 'hour', this.newNode(vTmpDiv, 'span', vDivId+'formathour'+pPos, 'gformlabel'+((vFormat=='hour')?' gselected':''), vLangs[vLang]['hour']));
-
-			if (vFormatArr.join().toLowerCase().indexOf('day')!=-1)
-				JSGantt.addFormatListeners(this, 'day', this.newNode(vTmpDiv, 'span', vDivId+'formatday'+pPos, 'gformlabel'+((vFormat=='day')?' gselected':''), vLangs[vLang]['day']));
-
-			if (vFormatArr.join().toLowerCase().indexOf('week')!=-1)
-				JSGantt.addFormatListeners(this, 'week', this.newNode(vTmpDiv, 'span', vDivId+'formatweek'+pPos, 'gformlabel'+((vFormat=='week')?' gselected':''), vLangs[vLang]['week']));
-
-			if (vFormatArr.join().toLowerCase().indexOf('month')!=-1)
-				JSGantt.addFormatListeners(this, 'month', this.newNode(vTmpDiv, 'span', vDivId+'formatmonth'+pPos, 'gformlabel'+((vFormat=='month')?' gselected':''), vLangs[vLang]['month']));
-
-			if (vFormatArr.join().toLowerCase().indexOf('quarter')!=-1)
-				JSGantt.addFormatListeners(this, 'quarter', this.newNode(vTmpDiv, 'span', vDivId+'formatquarter'+pPos, 'gformlabel'+((vFormat=='quarter')?' gselected':''), vLangs[vLang]['quarter']));
-		}
-		else
-		{
-			this.newNode(vOutput, 'div', null, 'gselector');
-		}
-		return vOutput;
-	};
-
-	this.createTaskInfo=function(pTask)
-	{
-		var vTmpDiv;
-		var vTaskInfoBox=document.createDocumentFragment();
-		var vTaskInfo=this.newNode(vTaskInfoBox, 'div', null, 'gTaskInfo');
-		this.newNode(vTaskInfo, 'span', null, 'gTtTitle', pTask.getName());
-		if(vShowTaskInfoStartDate==1){
-			vTmpDiv=this.newNode(vTaskInfo, 'div', null, 'gTILine gTIsd');
-			this.newNode(vTmpDiv, 'span', null, 'gTaskLabel', vLangs[vLang]['startdate']+': ');
-			this.newNode(vTmpDiv, 'span', null, 'gTaskText', JSGantt.formatDateStr(pTask.getStart(), vDateTaskDisplayFormat,vLangs[vLang]));
-		}
-		if(vShowTaskInfoEndDate==1){
-			vTmpDiv=this.newNode(vTaskInfo, 'div', null, 'gTILine gTIed');
-			this.newNode(vTmpDiv, 'span', null, 'gTaskLabel', vLangs[vLang]['enddate']+': ');
-			this.newNode(vTmpDiv, 'span', null, 'gTaskText', JSGantt.formatDateStr(pTask.getEnd(), vDateTaskDisplayFormat,vLangs[vLang]));
-		}
-		if(vShowTaskInfoDur==1 && !pTask.getMile()){
-			vTmpDiv=this.newNode(vTaskInfo, 'div', null, 'gTILine gTId');
-			this.newNode(vTmpDiv, 'span', null, 'gTaskLabel', vLangs[vLang]['duration']+': ');
-			this.newNode(vTmpDiv, 'span', null, 'gTaskText', pTask.getDuration(vFormat, vLangs[vLang]));
-		}
-		if(vShowTaskInfoComp==1){
-			vTmpDiv=this.newNode(vTaskInfo, 'div', null, 'gTILine gTIc');
-			this.newNode(vTmpDiv, 'span', null, 'gTaskLabel', vLangs[vLang]['completion']+': ');
-			this.newNode(vTmpDiv, 'span', null, 'gTaskText', pTask.getCompStr());
-		}
-		if(vShowTaskInfoRes==1){
-			vTmpDiv=this.newNode(vTaskInfo, 'div', null, 'gTILine gTIr');
-			this.newNode(vTmpDiv, 'span', null, 'gTaskLabel', vLangs[vLang]['resource']+': ');
-			this.newNode(vTmpDiv, 'span', null, 'gTaskText', pTask.getResource());
-		}
-		if(vShowTaskInfoLink==1 && pTask.getLink()!=''){
-			vTmpDiv=this.newNode(vTaskInfo, 'div', null, 'gTILine gTIl');
-			var vTmpNode=this.newNode(vTmpDiv, 'span', null, 'gTaskLabel');
-			vTmpNode=this.newNode(vTmpNode, 'a', null, 'gTaskText', vLangs[vLang]['moreinfo']);
-			vTmpNode.setAttribute('href',pTask.getLink());
-		}
-		if(vShowTaskInfoNotes==1){
-			vTmpDiv=this.newNode(vTaskInfo, 'div', null, 'gTILine gTIn');
-			this.newNode(vTmpDiv, 'span', null, 'gTaskLabel', vLangs[vLang]['notes']+': ');
-			if(pTask.getNotes())vTmpDiv.appendChild(pTask.getNotes());
-		}
-		return vTaskInfoBox;
-	};
-
-	this.getXMLProject=function()
-	{
-		var vProject='<?xml version="1.0" encoding="UTF-8" standalone="yes"?><project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">';
-		for (var i=0; i<vTaskList.length; i++)
-		{
-			vProject+=this.getXMLTask(i,true);
-		}
-		vProject+='</project>';
-		return vProject;
-	};
-
-	this.getXMLTask=function(pID,pIdx)
-	{
-		var i=0;
-		var vIdx=-1;
-		var vTask='';
-		var vOutFrmt=JSGantt.parseDateFormatStr(this.getDateInputFormat()+' HH:MI');
-		if (pIdx===true)vIdx=pID;
-		else
-		{
-			for (i=0; i<vTaskList.length; i++)
-			{
-				if (vTaskList[i].getID()==pID) {vIdx=i; break;}
-			}
-		}
-		if (vIdx>=0 && vIdx<vTaskList.length)
-		{
-			/* Simplest way to return case sensitive node names is to just build a string */
-			vTask='<task>';
-			vTask+='<pID>'+vTaskList[vIdx].getID()+'</pID>';
-			vTask+='<pName>'+vTaskList[vIdx].getName()+'</pName>';
-			vTask+='<pStart>'+JSGantt.formatDateStr(vTaskList[vIdx].getStart(),vOutFrmt,vLangs[vLang])+'</pStart>';
-			vTask+='<pEnd>'+JSGantt.formatDateStr(vTaskList[vIdx].getEnd(),vOutFrmt,vLangs[vLang])+'</pEnd>';
-			vTask+='<pClass>'+vTaskList[vIdx].getClass()+'</pClass>';
-			vTask+='<pLink>'+vTaskList[vIdx].getLink()+'</pLink>';
-			vTask+='<pMile>'+vTaskList[vIdx].getMile()+'</pMile>';
-			if(vTaskList[vIdx].getResource()!='\u00A0') vTask+='<pRes>'+vTaskList[vIdx].getResource()+'</pRes>';
-			vTask+='<pComp>'+vTaskList[vIdx].getCompVal()+'</pComp>';
-			vTask+='<pGroup>'+vTaskList[vIdx].getGroup()+'</pGroup>';
-			vTask+='<pParent>'+vTaskList[vIdx].getParent()+'</pParent>';
-			vTask+='<pOpen>'+vTaskList[vIdx].getOpen()+'</pOpen>';
-			vTask+='<pDepend>';
-			var vDepList=vTaskList[vIdx].getDepend();
-			for (i=0;i<vDepList.length;i++)
-			{
-				if(i>0)vTask+=',';
-				if(vDepList[i]>0)vTask+=vDepList[i]+vTaskList[vIdx].getDepType()[i];
-			}
-			vTask+='</pDepend>';
-			vTask+='<pCaption>'+vTaskList[vIdx].getCaption()+'</pCaption>';
-
-			var vTmpFrag=document.createDocumentFragment();
-			var vTmpDiv=this.newNode(vTmpFrag, 'div', null, null,vTaskList[vIdx].getNotes().innerHTML);
-			vTask+='<pNotes>'+vTmpDiv.innerHTML+'</pNotes>';
-			vTask+='</task>';
-		}
-		return vTask;
-	};
-	if (vDiv && vDiv.nodeName.toLowerCase()=='div') vDivId=vDiv.id;
+(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.JSGantt = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var jsGantt = require("./src/jsgantt");
+module.exports = jsGantt.JSGantt;
+exports.JSGantt = jsGantt.JSGantt;
+
+},{"./src/jsgantt":6}],2:[function(require,module,exports){
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var lang = require("./lang");
+var events_1 = require("./events");
+var general_utils_1 = require("./utils/general_utils");
+var task_1 = require("./task");
+var xml_1 = require("./xml");
+var draw_columns_1 = require("./draw_columns");
+var draw_utils_1 = require("./utils/draw_utils");
+var draw_dependencies_1 = require("./draw_dependencies");
+var options_1 = require("./options");
+var date_utils_1 = require("./utils/date_utils");
+/**
+ * function that loads the main gantt chart properties and functions
+ * @param pDiv (required) this is a div object created in HTML
+ * @param pFormat (required) - used to indicate whether chart should be drawn in "hour", "day", "week", "month", or "quarter" format
+ */
+exports.GanttChart = function (pDiv, pFormat) {
+    this.vDiv = pDiv;
+    this.vFormat = pFormat;
+    this.vDivId = null;
+    this.vUseFade = 1;
+    this.vUseMove = 1;
+    this.vUseRowHlt = 1;
+    this.vUseToolTip = 1;
+    this.vUseSort = 1;
+    this.vUseSingleCell = 25000;
+    this.vShowRes = 1;
+    this.vShowDur = 1;
+    this.vShowComp = 1;
+    this.vShowStartDate = 1;
+    this.vShowEndDate = 1;
+    this.vShowPlanStartDate = 0;
+    this.vShowPlanEndDate = 0;
+    this.vShowCost = 0;
+    this.vShowAddEntries = 0;
+    this.vShowEndWeekDate = 1;
+    this.vShowWeekends = 1;
+    this.vShowTaskInfoRes = 1;
+    this.vShowTaskInfoDur = 1;
+    this.vShowTaskInfoComp = 1;
+    this.vShowTaskInfoStartDate = 1;
+    this.vShowTaskInfoEndDate = 1;
+    this.vShowTaskInfoNotes = 1;
+    this.vShowTaskInfoLink = 0;
+    this.vShowDeps = 1;
+    this.vTotalHeight = undefined;
+    this.vWorkingDays = {
+        0: true,
+        1: true,
+        2: true,
+        3: true,
+        4: true,
+        5: true,
+        6: true
+    };
+    this.vEventClickCollapse = null;
+    this.vEventClickRow = null;
+    this.vEvents = {
+        taskname: null,
+        res: null,
+        dur: null,
+        comp: null,
+        startdate: null,
+        enddate: null,
+        planstartdate: null,
+        planenddate: null,
+        cost: null,
+        beforeDraw: null,
+        afterDraw: null,
+        beforeLineDraw: null,
+        afterLineDraw: null,
+        onLineDraw: null,
+        onLineContainerHover: null
+    };
+    this.vEventsChange = {
+        taskname: null,
+        res: null,
+        dur: null,
+        comp: null,
+        startdate: null,
+        enddate: null,
+        planstartdate: null,
+        planenddate: null,
+        cost: null,
+        line: null
+    };
+    this.vResources = null;
+    this.vAdditionalHeaders = {};
+    this.vColumnOrder = draw_columns_1.COLUMN_ORDER;
+    this.vEditable = false;
+    this.vDebug = false;
+    this.vShowSelector = new Array('top');
+    this.vDateInputFormat = 'yyyy-mm-dd';
+    this.vDateTaskTableDisplayFormat = date_utils_1.parseDateFormatStr('dd/mm/yyyy');
+    this.vDateTaskDisplayFormat = date_utils_1.parseDateFormatStr('dd month yyyy');
+    this.vHourMajorDateDisplayFormat = date_utils_1.parseDateFormatStr('day dd month yyyy');
+    this.vHourMinorDateDisplayFormat = date_utils_1.parseDateFormatStr('HH');
+    this.vDayMajorDateDisplayFormat = date_utils_1.parseDateFormatStr('dd/mm/yyyy');
+    this.vDayMinorDateDisplayFormat = date_utils_1.parseDateFormatStr('dd');
+    this.vWeekMajorDateDisplayFormat = date_utils_1.parseDateFormatStr('yyyy');
+    this.vWeekMinorDateDisplayFormat = date_utils_1.parseDateFormatStr('dd/mm');
+    this.vMonthMajorDateDisplayFormat = date_utils_1.parseDateFormatStr('yyyy');
+    this.vMonthMinorDateDisplayFormat = date_utils_1.parseDateFormatStr('mon');
+    this.vQuarterMajorDateDisplayFormat = date_utils_1.parseDateFormatStr('yyyy');
+    this.vQuarterMinorDateDisplayFormat = date_utils_1.parseDateFormatStr('qq');
+    this.vUseFullYear = date_utils_1.parseDateFormatStr('dd/mm/yyyy');
+    this.vCaptionType;
+    this.vDepId = 1;
+    this.vTaskList = new Array();
+    this.vFormatArr = new Array('hour', 'day', 'week', 'month', 'quarter');
+    this.vMonthDaysArr = new Array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+    this.vProcessNeeded = true;
+    this.vMinGpLen = 8;
+    this.vScrollTo = '';
+    this.vHourColWidth = 18;
+    this.vDayColWidth = 18;
+    this.vWeekColWidth = 36;
+    this.vMonthColWidth = 36;
+    this.vQuarterColWidth = 18;
+    this.vRowHeight = 20;
+    this.vTodayPx = -1;
+    this.vLangs = lang;
+    this.vLang = navigator.language && navigator.language in lang ? navigator.language : 'en';
+    this.vChartBody = null;
+    this.vChartHead = null;
+    this.vListBody = null;
+    this.vChartTable = null;
+    this.vLines = null;
+    this.vTimer = 20;
+    this.vTooltipDelay = 1500;
+    this.vTooltipTemplate = null;
+    this.vMinDate = null;
+    this.vMaxDate = null;
+    this.includeGetSet = options_1.includeGetSet.bind(this);
+    this.includeGetSet();
+    this.mouseOver = events_1.mouseOver;
+    this.mouseOut = events_1.mouseOut;
+    this.addListener = events_1.addListener.bind(this);
+    this.removeListener = events_1.removeListener.bind(this);
+    this.createTaskInfo = task_1.createTaskInfo;
+    this.AddTaskItem = task_1.AddTaskItem;
+    this.AddTaskItemObject = task_1.AddTaskItemObject;
+    this.RemoveTaskItem = task_1.RemoveTaskItem;
+    this.ClearTasks = task_1.ClearTasks;
+    this.getXMLProject = xml_1.getXMLProject;
+    this.getXMLTask = xml_1.getXMLTask;
+    this.CalcTaskXY = draw_utils_1.CalcTaskXY.bind(this);
+    // sLine: Draw a straight line (colored one-pixel wide div)
+    this.sLine = draw_utils_1.sLine.bind(this);
+    this.drawDependency = draw_dependencies_1.drawDependency.bind(this);
+    this.DrawDependencies = draw_dependencies_1.DrawDependencies.bind(this);
+    this.getArrayLocationByID = draw_utils_1.getArrayLocationByID.bind(this);
+    this.drawSelector = draw_utils_1.drawSelector.bind(this);
+    this.clearDependencies = function () {
+        var parent = this.getLines();
+        if (this.vEventsChange.line &&
+            typeof this.vEventsChange.line === 'function') {
+            this.removeListener('click', this.vEventsChange.line, parent);
+            this.addListener('click', this.vEventsChange.line, parent);
+        }
+        while (parent.hasChildNodes())
+            parent.removeChild(parent.firstChild);
+        this.vDepId = 1;
+    };
+    this.drawListHead = function (vLeftHeader) {
+        var _this = this;
+        var vTmpDiv = draw_utils_1.newNode(vLeftHeader, 'div', this.vDivId + 'glisthead', 'glistlbl gcontainercol');
+        var gListLbl = vTmpDiv;
+        this.setListBody(vTmpDiv);
+        var vTmpTab = draw_utils_1.newNode(vTmpDiv, 'table', null, 'gtasktableh');
+        var vTmpTBody = draw_utils_1.newNode(vTmpTab, 'tbody');
+        var vTmpRow = draw_utils_1.newNode(vTmpTBody, 'tr');
+        draw_utils_1.newNode(vTmpRow, 'td', null, 'gtasklist', '\u00A0');
+        var vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, 'gspanning gtaskname', null, null, null, null, this.getColumnOrder().length + 1);
+        vTmpCell.appendChild(this.drawSelector('top'));
+        vTmpRow = draw_utils_1.newNode(vTmpTBody, 'tr');
+        draw_utils_1.newNode(vTmpRow, 'td', null, 'gtasklist', '\u00A0');
+        draw_utils_1.newNode(vTmpRow, 'td', null, 'gtaskname', '\u00A0');
+        this.getColumnOrder().forEach(function (column) {
+            if (_this[column] == 1 || column === 'vAdditionalHeaders') {
+                draw_columns_1.draw_task_headings(column, vTmpRow, _this.vLangs, _this.vLang, _this.vAdditionalHeaders, _this.vEvents);
+            }
+        });
+        return gListLbl;
+    };
+    this.drawListBody = function (vLeftHeader) {
+        var _this = this;
+        var vTmpContentTabOuterWrapper = draw_utils_1.newNode(vLeftHeader, 'div', null, 'gtasktableouterwrapper');
+        var vTmpContentTabWrapper = draw_utils_1.newNode(vTmpContentTabOuterWrapper, 'div', null, 'gtasktablewrapper');
+        vTmpContentTabWrapper.style.width = "calc(100% + " + general_utils_1.getScrollbarWidth() + "px)";
+        var vTmpContentTab = draw_utils_1.newNode(vTmpContentTabWrapper, 'table', null, 'gtasktable');
+        var vTmpContentTBody = draw_utils_1.newNode(vTmpContentTab, 'tbody');
+        var vNumRows = 0;
+        var _loop_1 = function (i) {
+            var vBGColor = void 0;
+            if (this_1.vTaskList[i].getGroup() == 1)
+                vBGColor = 'ggroupitem';
+            else
+                vBGColor = 'glineitem';
+            var vID = this_1.vTaskList[i].getID();
+            var vTmpRow_1, vTmpCell_1 = void 0;
+            if ((!(this_1.vTaskList[i].getParItem() && this_1.vTaskList[i].getParItem().getGroup() == 2)) || this_1.vTaskList[i].getGroup() == 2) {
+                if (this_1.vTaskList[i].getVisible() == 0)
+                    vTmpRow_1 = draw_utils_1.newNode(vTmpContentTBody, 'tr', this_1.vDivId + 'child_' + vID, 'gname ' + vBGColor, null, null, null, 'none');
+                else
+                    vTmpRow_1 = draw_utils_1.newNode(vTmpContentTBody, 'tr', this_1.vDivId + 'child_' + vID, 'gname ' + vBGColor);
+                this_1.vTaskList[i].setListChildRow(vTmpRow_1);
+                draw_utils_1.newNode(vTmpRow_1, 'td', null, 'gtasklist', '\u00A0');
+                var editableClass = this_1.vEditable ? 'gtaskname gtaskeditable' : 'gtaskname';
+                vTmpCell_1 = draw_utils_1.newNode(vTmpRow_1, 'td', null, editableClass);
+                var vCellContents = '';
+                for (var j = 1; j < this_1.vTaskList[i].getLevel(); j++) {
+                    vCellContents += '\u00A0\u00A0\u00A0\u00A0';
+                }
+                var task_2 = this_1.vTaskList[i];
+                var vEventClickRow_1 = this_1.vEventClickRow;
+                var vEventClickCollapse_1 = this_1.vEventClickCollapse;
+                events_1.addListener('click', function (e) {
+                    if (e.target.classList.contains('gfoldercollapse') === false) {
+                        if (vEventClickRow_1 && typeof vEventClickRow_1 === "function") {
+                            vEventClickRow_1(task_2);
+                        }
+                    }
+                    else {
+                        if (vEventClickCollapse_1 && typeof vEventClickCollapse_1 === "function") {
+                            vEventClickCollapse_1(task_2);
+                        }
+                    }
+                }, vTmpRow_1);
+                if (this_1.vTaskList[i].getGroup() == 1) {
+                    var vTmpDiv = draw_utils_1.newNode(vTmpCell_1, 'div', null, null, vCellContents);
+                    var vTmpSpan = draw_utils_1.newNode(vTmpDiv, 'span', this_1.vDivId + 'group_' + vID, 'gfoldercollapse', (this_1.vTaskList[i].getOpen() == 1) ? '-' : '+');
+                    this_1.vTaskList[i].setGroupSpan(vTmpSpan);
+                    events_1.addFolderListeners(this_1, vTmpSpan, vID);
+                    var divTask = document.createElement('span');
+                    divTask.innerHTML = '\u00A0' + this_1.vTaskList[i].getName();
+                    vTmpDiv.appendChild(divTask);
+                    // const text = makeInput(this.vTaskList[i].getName(), this.vEditable, 'text');
+                    // vTmpDiv.appendChild(document.createNode(text));
+                    var callback = function (task, e) { return task.setName(e.target.value); };
+                    events_1.addListenerInputCell(vTmpCell_1, this_1.vEventsChange, callback, this_1.vTaskList, i, 'taskname', this_1.Draw.bind(this_1));
+                    events_1.addListenerClickCell(vTmpDiv, this_1.vEvents, this_1.vTaskList[i], 'taskname');
+                }
+                else {
+                    vCellContents += '\u00A0\u00A0\u00A0\u00A0';
+                    var text = draw_utils_1.makeInput(this_1.vTaskList[i].getName(), this_1.vEditable, 'text');
+                    var vTmpDiv = draw_utils_1.newNode(vTmpCell_1, 'div', null, null, vCellContents + text);
+                    var callback = function (task, e) { return task.setName(e.target.value); };
+                    events_1.addListenerInputCell(vTmpCell_1, this_1.vEventsChange, callback, this_1.vTaskList, i, 'taskname', this_1.Draw.bind(this_1));
+                    events_1.addListenerClickCell(vTmpCell_1, this_1.vEvents, this_1.vTaskList[i], 'taskname');
+                }
+                this_1.getColumnOrder().forEach(function (column) {
+                    if (_this[column] == 1 || column === 'vAdditionalHeaders') {
+                        draw_columns_1.draw_header(column, i, vTmpRow_1, _this.vTaskList, _this.vEditable, _this.vEventsChange, _this.vEvents, _this.vDateTaskTableDisplayFormat, _this.vAdditionalHeaders, _this.vFormat, _this.vLangs, _this.vLang, _this.vResources, _this.Draw.bind(_this));
+                    }
+                });
+                vNumRows++;
+            }
+        };
+        var this_1 = this;
+        for (var i = 0; i < this.vTaskList.length; i++) {
+            _loop_1(i);
+        }
+        // Render no daa in the chart
+        if (this.vTaskList.length == 0) {
+            var totalColumns = this.getColumnOrder()
+                .filter(function (column) { return _this[column] == 1 || column === 'vAdditionalHeaders'; })
+                .length;
+            var vTmpRow_2 = draw_utils_1.newNode(vTmpContentTBody, 'tr', this.vDivId + 'child_', 'gname ');
+            // this.vTaskList[i].setListChildRow(vTmpRow);
+            var vTmpCell_2 = draw_utils_1.newNode(vTmpRow_2, 'td', null, 'gtasknolist', '', null, null, null, totalColumns);
+            var vOutput = document.createDocumentFragment();
+            draw_utils_1.newNode(vOutput, 'div', null, 'gtasknolist-label', this.vLangs[this.vLang]['nodata'] + '.');
+            vTmpCell_2.appendChild(vOutput);
+        }
+        // DRAW the date format selector at bottom left.
+        var vTmpRow = draw_utils_1.newNode(vTmpContentTBody, 'tr');
+        draw_utils_1.newNode(vTmpRow, 'td', null, 'gtasklist', '\u00A0');
+        var vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, 'gspanning gtaskname');
+        vTmpCell.appendChild(this.drawSelector('bottom'));
+        this.getColumnOrder().forEach(function (column) {
+            if (_this[column] == 1 || column === 'vAdditionalHeaders') {
+                draw_columns_1.draw_bottom(column, vTmpRow, _this.vAdditionalHeaders);
+            }
+        });
+        // Add some white space so the vertical scroll distance should always be greater
+        // than for the right pane (keep to a minimum as it is seen in unconstrained height designs)
+        // newNode(vTmpDiv2, 'br');
+        // newNode(vTmpDiv2, 'br');
+        return {
+            vNumRows: vNumRows,
+            vTmpContentTabWrapper: vTmpContentTabWrapper
+        };
+    };
+    /**
+     *
+     * DRAW CHAR HEAD
+     *
+     */
+    this.drawChartHead = function (vMinDate, vMaxDate, vColWidth, vNumRows) {
+        var vRightHeader = document.createDocumentFragment();
+        var vTmpDiv = draw_utils_1.newNode(vRightHeader, 'div', this.vDivId + 'gcharthead', 'gchartlbl gcontainercol');
+        var gChartLbl = vTmpDiv;
+        this.setChartHead(vTmpDiv);
+        var vTmpTab = draw_utils_1.newNode(vTmpDiv, 'table', this.vDivId + 'chartTableh', 'gcharttableh');
+        var vTmpTBody = draw_utils_1.newNode(vTmpTab, 'tbody');
+        var vTmpRow = draw_utils_1.newNode(vTmpTBody, 'tr');
+        var vTmpDate = new Date();
+        vTmpDate.setFullYear(vMinDate.getFullYear(), vMinDate.getMonth(), vMinDate.getDate());
+        if (this.vFormat == 'hour')
+            vTmpDate.setHours(vMinDate.getHours());
+        else
+            vTmpDate.setHours(0);
+        vTmpDate.setMinutes(0);
+        vTmpDate.setSeconds(0);
+        vTmpDate.setMilliseconds(0);
+        var vColSpan = 1;
+        // Major Date Header
+        while (vTmpDate.getTime() <= vMaxDate.getTime()) {
+            var vHeaderCellClass = 'gmajorheading';
+            var vCellContents = '';
+            if (this.vFormat == 'day') {
+                var colspan = 7;
+                if (!this.vShowWeekends) {
+                    vHeaderCellClass += ' headweekends';
+                    colspan = 5;
+                }
+                var vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, vHeaderCellClass, null, null, null, null, colspan);
+                vCellContents += date_utils_1.formatDateStr(vTmpDate, this.vDayMajorDateDisplayFormat, this.vLangs[this.vLang]);
+                vTmpDate.setDate(vTmpDate.getDate() + 6);
+                if (this.vShowEndWeekDate == 1)
+                    vCellContents += ' - ' + date_utils_1.formatDateStr(vTmpDate, this.vDayMajorDateDisplayFormat, this.vLangs[this.vLang]);
+                draw_utils_1.newNode(vTmpCell, 'div', null, null, vCellContents, vColWidth * colspan);
+                vTmpDate.setDate(vTmpDate.getDate() + 1);
+            }
+            else if (this.vFormat == 'week') {
+                var vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, vHeaderCellClass, null, vColWidth);
+                draw_utils_1.newNode(vTmpCell, 'div', null, null, date_utils_1.formatDateStr(vTmpDate, this.vWeekMajorDateDisplayFormat, this.vLangs[this.vLang]), vColWidth);
+                vTmpDate.setDate(vTmpDate.getDate() + 7);
+            }
+            else if (this.vFormat == 'month') {
+                vColSpan = (12 - vTmpDate.getMonth());
+                if (vTmpDate.getFullYear() == vMaxDate.getFullYear())
+                    vColSpan -= (11 - vMaxDate.getMonth());
+                var vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, vHeaderCellClass, null, null, null, null, vColSpan);
+                draw_utils_1.newNode(vTmpCell, 'div', null, null, date_utils_1.formatDateStr(vTmpDate, this.vMonthMajorDateDisplayFormat, this.vLangs[this.vLang]), vColWidth * vColSpan);
+                vTmpDate.setFullYear(vTmpDate.getFullYear() + 1, 0, 1);
+            }
+            else if (this.vFormat == 'quarter') {
+                vColSpan = (4 - Math.floor(vTmpDate.getMonth() / 3));
+                if (vTmpDate.getFullYear() == vMaxDate.getFullYear())
+                    vColSpan -= (3 - Math.floor(vMaxDate.getMonth() / 3));
+                var vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, vHeaderCellClass, null, null, null, null, vColSpan);
+                draw_utils_1.newNode(vTmpCell, 'div', null, null, date_utils_1.formatDateStr(vTmpDate, this.vQuarterMajorDateDisplayFormat, this.vLangs[this.vLang]), vColWidth * vColSpan);
+                vTmpDate.setFullYear(vTmpDate.getFullYear() + 1, 0, 1);
+            }
+            else if (this.vFormat == 'hour') {
+                vColSpan = (24 - vTmpDate.getHours());
+                if (vTmpDate.getFullYear() == vMaxDate.getFullYear() &&
+                    vTmpDate.getMonth() == vMaxDate.getMonth() &&
+                    vTmpDate.getDate() == vMaxDate.getDate())
+                    vColSpan -= (23 - vMaxDate.getHours());
+                var vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, vHeaderCellClass, null, null, null, null, vColSpan);
+                draw_utils_1.newNode(vTmpCell, 'div', null, null, date_utils_1.formatDateStr(vTmpDate, this.vHourMajorDateDisplayFormat, this.vLangs[this.vLang]), vColWidth * vColSpan);
+                vTmpDate.setHours(0);
+                vTmpDate.setDate(vTmpDate.getDate() + 1);
+            }
+        }
+        vTmpRow = draw_utils_1.newNode(vTmpTBody, 'tr', null, 'footerdays');
+        // Minor Date header and Cell Rows
+        vTmpDate.setFullYear(vMinDate.getFullYear(), vMinDate.getMonth(), vMinDate.getDate()); // , vMinDate.getHours()
+        if (this.vFormat == 'hour')
+            vTmpDate.setHours(vMinDate.getHours());
+        var vNumCols = 0;
+        while (vTmpDate.getTime() <= vMaxDate.getTime()) {
+            var vMinorHeaderCellClass = 'gminorheading';
+            if (this.vFormat == 'day') {
+                if (vTmpDate.getDay() % 6 == 0) {
+                    if (!this.vShowWeekends) {
+                        vTmpDate.setDate(vTmpDate.getDate() + 1);
+                        continue;
+                    }
+                    vMinorHeaderCellClass += 'wkend';
+                }
+                if (vTmpDate <= vMaxDate) {
+                    var vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, vMinorHeaderCellClass);
+                    draw_utils_1.newNode(vTmpCell, 'div', null, null, date_utils_1.formatDateStr(vTmpDate, this.vDayMinorDateDisplayFormat, this.vLangs[this.vLang]), vColWidth);
+                    vNumCols++;
+                }
+                vTmpDate.setDate(vTmpDate.getDate() + 1);
+            }
+            else if (this.vFormat == 'week') {
+                if (vTmpDate <= vMaxDate) {
+                    var vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, vMinorHeaderCellClass);
+                    draw_utils_1.newNode(vTmpCell, 'div', null, null, date_utils_1.formatDateStr(vTmpDate, this.vWeekMinorDateDisplayFormat, this.vLangs[this.vLang]), vColWidth);
+                    vNumCols++;
+                }
+                vTmpDate.setDate(vTmpDate.getDate() + 7);
+            }
+            else if (this.vFormat == 'month') {
+                if (vTmpDate <= vMaxDate) {
+                    var vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, vMinorHeaderCellClass);
+                    draw_utils_1.newNode(vTmpCell, 'div', null, null, date_utils_1.formatDateStr(vTmpDate, this.vMonthMinorDateDisplayFormat, this.vLangs[this.vLang]), vColWidth);
+                    vNumCols++;
+                }
+                vTmpDate.setDate(vTmpDate.getDate() + 1);
+                while (vTmpDate.getDate() > 1) {
+                    vTmpDate.setDate(vTmpDate.getDate() + 1);
+                }
+            }
+            else if (this.vFormat == 'quarter') {
+                if (vTmpDate <= vMaxDate) {
+                    var vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, vMinorHeaderCellClass);
+                    draw_utils_1.newNode(vTmpCell, 'div', null, null, date_utils_1.formatDateStr(vTmpDate, this.vQuarterMinorDateDisplayFormat, this.vLangs[this.vLang]), vColWidth);
+                    vNumCols++;
+                }
+                vTmpDate.setDate(vTmpDate.getDate() + 81);
+                while (vTmpDate.getDate() > 1)
+                    vTmpDate.setDate(vTmpDate.getDate() + 1);
+            }
+            else if (this.vFormat == 'hour') {
+                for (var i = vTmpDate.getHours(); i < 24; i++) {
+                    vTmpDate.setHours(i); //works around daylight savings but may look a little odd on days where the clock goes forward
+                    if (vTmpDate <= vMaxDate) {
+                        var vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, vMinorHeaderCellClass);
+                        draw_utils_1.newNode(vTmpCell, 'div', null, null, date_utils_1.formatDateStr(vTmpDate, this.vHourMinorDateDisplayFormat, this.vLangs[this.vLang]), vColWidth);
+                        vNumCols++;
+                    }
+                }
+                vTmpDate.setHours(0);
+                vTmpDate.setDate(vTmpDate.getDate() + 1);
+            }
+        }
+        var vDateRow = vTmpRow;
+        // Calculate size of grids  : Plus 3 because 1 border left + 2 of paddings
+        var vTaskLeftPx = (vNumCols * (vColWidth + 3)) + 1;
+        // Fix a small space at the end for day
+        if (this.vFormat === 'day') {
+            vTaskLeftPx += 2;
+        }
+        vTmpTab.style.width = vTaskLeftPx + 'px'; // Ensure that the headings has exactly the same width as the chart grid
+        // const vTaskPlanLeftPx = (vNumCols * (vColWidth + 3)) + 1;
+        var vSingleCell = false;
+        if (this.vUseSingleCell !== 0 && this.vUseSingleCell < (vNumCols * vNumRows))
+            vSingleCell = true;
+        draw_utils_1.newNode(vTmpDiv, 'div', null, 'rhscrpad', null, null, vTaskLeftPx + 1);
+        vTmpDiv = draw_utils_1.newNode(vRightHeader, 'div', null, 'glabelfooter');
+        return { gChartLbl: gChartLbl, vTaskLeftPx: vTaskLeftPx, vSingleCell: vSingleCell, vDateRow: vDateRow, vRightHeader: vRightHeader, vNumCols: vNumCols };
+    };
+    /**
+     *
+     * DRAW CHART BODY
+     *
+     */
+    this.drawCharBody = function (vTaskLeftPx, vTmpContentTabWrapper, gChartLbl, gListLbl, vMinDate, vMaxDate, vSingleCell, vNumCols, vColWidth, vDateRow) {
+        var vRightTable = document.createDocumentFragment();
+        var vTmpDiv = draw_utils_1.newNode(vRightTable, 'div', this.vDivId + 'gchartbody', 'gchartgrid gcontainercol');
+        this.setChartBody(vTmpDiv);
+        var vTmpTab = draw_utils_1.newNode(vTmpDiv, 'table', this.vDivId + 'chartTable', 'gcharttable', null, vTaskLeftPx);
+        this.setChartTable(vTmpTab);
+        draw_utils_1.newNode(vTmpDiv, 'div', null, 'rhscrpad', null, null, vTaskLeftPx + 1);
+        var vTmpTBody = draw_utils_1.newNode(vTmpTab, 'tbody');
+        var vTmpTFoot = draw_utils_1.newNode(vTmpTab, 'tfoot');
+        events_1.syncScroll([vTmpContentTabWrapper, vTmpDiv], 'scrollTop');
+        events_1.syncScroll([gChartLbl, vTmpDiv], 'scrollLeft');
+        events_1.syncScroll([vTmpContentTabWrapper, gListLbl], 'scrollLeft');
+        // Draw each row
+        var i = 0;
+        var j = 0;
+        var bd;
+        if (this.vDebug) {
+            bd = new Date();
+            console.info('before tasks loop', bd);
+        }
+        for (i = 0; i < this.vTaskList.length; i++) {
+            var curTaskStart = this.vTaskList[i].getStart() ? this.vTaskList[i].getStart() : this.vTaskList[i].getPlanStart();
+            var curTaskEnd = this.vTaskList[i].getEnd() ? this.vTaskList[i].getEnd() : this.vTaskList[i].getPlanEnd();
+            var vTaskLeftPx_1 = general_utils_1.getOffset(vMinDate, curTaskStart, vColWidth, this.vFormat, this.vShowWeekends);
+            var vTaskRightPx = general_utils_1.getOffset(curTaskStart, curTaskEnd, vColWidth, this.vFormat, this.vShowWeekends);
+            var curTaskPlanStart = void 0, curTaskPlanEnd = void 0;
+            curTaskPlanStart = this.vTaskList[i].getPlanStart();
+            curTaskPlanEnd = this.vTaskList[i].getPlanEnd();
+            var vTaskPlanLeftPx = 0;
+            var vTaskPlanRightPx = 0;
+            if (curTaskPlanStart && curTaskPlanEnd) {
+                vTaskPlanLeftPx = general_utils_1.getOffset(vMinDate, curTaskPlanStart, vColWidth, this.vFormat, this.vShowWeekends);
+                vTaskPlanRightPx = general_utils_1.getOffset(curTaskPlanStart, curTaskPlanEnd, vColWidth, this.vFormat, this.vShowWeekends);
+            }
+            var vID = this.vTaskList[i].getID();
+            var vComb = (this.vTaskList[i].getParItem() && this.vTaskList[i].getParItem().getGroup() == 2);
+            var vCellFormat = '';
+            var vTmpDiv_1 = null;
+            var vTmpItem = this.vTaskList[i];
+            var vCaptClass = null;
+            // set cell width only for first row because of table-layout:fixed
+            var taskCellWidth = i === 0 ? vColWidth : null;
+            if (this.vTaskList[i].getMile() && !vComb) {
+                var vTmpRow = draw_utils_1.newNode(vTmpTBody, 'tr', this.vDivId + 'childrow_' + vID, 'gmileitem gmile' + this.vFormat, null, null, null, ((this.vTaskList[i].getVisible() == 0) ? 'none' : null));
+                this.vTaskList[i].setChildRow(vTmpRow);
+                events_1.addThisRowListeners(this, this.vTaskList[i].getListChildRow(), vTmpRow);
+                var vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, 'gtaskcell gtaskcellmile', null, vColWidth, null, null, null);
+                vTmpDiv_1 = draw_utils_1.newNode(vTmpCell, 'div', null, 'gtaskcelldiv', '\u00A0\u00A0');
+                vTmpDiv_1 = draw_utils_1.newNode(vTmpDiv_1, 'div', this.vDivId + 'bardiv_' + vID, 'gtaskbarcontainer', null, 12, vTaskLeftPx_1 + vTaskRightPx - 6);
+                this.vTaskList[i].setBarDiv(vTmpDiv_1);
+                var vTmpDiv2 = draw_utils_1.newNode(vTmpDiv_1, 'div', this.vDivId + 'taskbar_' + vID, this.vTaskList[i].getClass(), null, 12);
+                this.vTaskList[i].setTaskDiv(vTmpDiv2);
+                if (this.vTaskList[i].getCompVal() < 100)
+                    vTmpDiv2.appendChild(document.createTextNode('\u25CA'));
+                else {
+                    vTmpDiv2 = draw_utils_1.newNode(vTmpDiv2, 'div', null, 'gmilediamond');
+                    draw_utils_1.newNode(vTmpDiv2, 'div', null, 'gmdtop');
+                    draw_utils_1.newNode(vTmpDiv2, 'div', null, 'gmdbottom');
+                }
+                vCaptClass = 'gmilecaption';
+                if (!vSingleCell && !vComb) {
+                    this.drawColsChart(vNumCols, vTmpRow, taskCellWidth, vMinDate, vMaxDate);
+                }
+            }
+            else {
+                var vTaskWidth = vTaskRightPx;
+                // Draw Group Bar which has outer div with inner group div
+                // and several small divs to left and right to create angled-end indicators
+                if (this.vTaskList[i].getGroup()) {
+                    vTaskWidth = (vTaskWidth > this.vMinGpLen && vTaskWidth < this.vMinGpLen * 2) ? this.vMinGpLen * 2 : vTaskWidth; // Expand to show two end points
+                    vTaskWidth = (vTaskWidth < this.vMinGpLen) ? this.vMinGpLen : vTaskWidth; // expand to show one end point
+                    var vTmpRow = draw_utils_1.newNode(vTmpTBody, 'tr', this.vDivId + 'childrow_' + vID, ((this.vTaskList[i].getGroup() == 2) ? 'glineitem gitem' : 'ggroupitem ggroup') + this.vFormat, null, null, null, ((this.vTaskList[i].getVisible() == 0) ? 'none' : null));
+                    this.vTaskList[i].setChildRow(vTmpRow);
+                    events_1.addThisRowListeners(this, this.vTaskList[i].getListChildRow(), vTmpRow);
+                    var vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, 'gtaskcell gtaskcellbar', null, vColWidth, null, null);
+                    vTmpDiv_1 = draw_utils_1.newNode(vTmpCell, 'div', null, 'gtaskcelldiv', '\u00A0\u00A0');
+                    this.vTaskList[i].setCellDiv(vTmpDiv_1);
+                    if (this.vTaskList[i].getGroup() == 1) {
+                        vTmpDiv_1 = draw_utils_1.newNode(vTmpDiv_1, 'div', this.vDivId + 'bardiv_' + vID, 'gtaskbarcontainer', null, vTaskWidth, vTaskLeftPx_1);
+                        this.vTaskList[i].setBarDiv(vTmpDiv_1);
+                        var vTmpDiv2 = draw_utils_1.newNode(vTmpDiv_1, 'div', this.vDivId + 'taskbar_' + vID, this.vTaskList[i].getClass(), null, vTaskWidth);
+                        this.vTaskList[i].setTaskDiv(vTmpDiv2);
+                        draw_utils_1.newNode(vTmpDiv2, 'div', this.vDivId + 'complete_' + vID, this.vTaskList[i].getClass() + 'complete', null, this.vTaskList[i].getCompStr());
+                        draw_utils_1.newNode(vTmpDiv_1, 'div', null, this.vTaskList[i].getClass() + 'endpointleft');
+                        if (vTaskWidth >= this.vMinGpLen * 2)
+                            draw_utils_1.newNode(vTmpDiv_1, 'div', null, this.vTaskList[i].getClass() + 'endpointright');
+                        vCaptClass = 'ggroupcaption';
+                    }
+                    if (!vSingleCell && !vComb) {
+                        this.drawColsChart(vNumCols, vTmpRow, taskCellWidth, vMinDate, vMaxDate);
+                    }
+                }
+                else {
+                    vTaskWidth = (vTaskWidth <= 0) ? 1 : vTaskWidth;
+                    /**
+                     * DRAW THE BOXES FOR GANTT
+                     */
+                    var vTmpDivCell = void 0, vTmpRow = void 0;
+                    if (vComb) {
+                        vTmpDivCell = vTmpDiv_1 = this.vTaskList[i].getParItem().getCellDiv();
+                    }
+                    else {
+                        // Draw Task Bar which has colored bar div
+                        vTmpRow = draw_utils_1.newNode(vTmpTBody, 'tr', this.vDivId + 'childrow_' + vID, 'glineitem gitem' + this.vFormat, null, null, null, ((this.vTaskList[i].getVisible() == 0) ? 'none' : null));
+                        this.vTaskList[i].setChildRow(vTmpRow);
+                        events_1.addThisRowListeners(this, this.vTaskList[i].getListChildRow(), vTmpRow);
+                        var vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, 'gtaskcell gtaskcellcolorbar', null, taskCellWidth, null, null);
+                        vTmpDivCell = vTmpDiv_1 = draw_utils_1.newNode(vTmpCell, 'div', null, 'gtaskcelldiv', '\u00A0\u00A0');
+                    }
+                    // DRAW TASK BAR
+                    vTmpDiv_1 = draw_utils_1.newNode(vTmpDiv_1, 'div', this.vDivId + 'bardiv_' + vID, 'gtaskbarcontainer', null, vTaskWidth, vTaskLeftPx_1);
+                    this.vTaskList[i].setBarDiv(vTmpDiv_1);
+                    var vTmpDiv2 = void 0;
+                    if (this.vTaskList[i].getStartVar()) {
+                        // textbar
+                        vTmpDiv2 = draw_utils_1.newNode(vTmpDiv_1, 'div', this.vDivId + 'taskbar_' + vID, this.vTaskList[i].getClass(), null, vTaskWidth);
+                        if (this.vTaskList[i].getBarText()) {
+                            draw_utils_1.newNode(vTmpDiv2, 'span', this.vDivId + 'tasktextbar_' + vID, 'textbar', this.vTaskList[i].getBarText(), this.vTaskList[i].getCompRestStr());
+                        }
+                        this.vTaskList[i].setTaskDiv(vTmpDiv2);
+                    }
+                    // PLANNED
+                    // If exist and one of them are different, show plan bar... show if there is no real vStart as well (just plan dates)
+                    if (vTaskPlanLeftPx && ((vTaskPlanLeftPx != vTaskLeftPx_1 || vTaskPlanRightPx != vTaskRightPx) || !this.vTaskList[i].getStartVar())) {
+                        var vTmpPlanDiv = draw_utils_1.newNode(vTmpDivCell, 'div', this.vDivId + 'bardiv_' + vID, 'gtaskbarcontainer gplan', null, vTaskPlanRightPx, vTaskPlanLeftPx);
+                        var vTmpPlanDiv2 = draw_utils_1.newNode(vTmpPlanDiv, 'div', this.vDivId + 'taskbar_' + vID, this.vTaskList[i].getClass() + ' gplan', null, vTaskPlanRightPx);
+                        this.vTaskList[i].setPlanTaskDiv(vTmpPlanDiv2);
+                    }
+                    // and opaque completion div
+                    if (vTmpDiv2) {
+                        draw_utils_1.newNode(vTmpDiv2, 'div', this.vDivId + 'complete_' + vID, this.vTaskList[i].getClass() + 'complete', null, this.vTaskList[i].getCompStr());
+                    }
+                    // caption
+                    if (vComb)
+                        vTmpItem = this.vTaskList[i].getParItem();
+                    if (!vComb || (vComb && this.vTaskList[i].getParItem().getEnd() == this.vTaskList[i].getEnd()))
+                        vCaptClass = 'gcaption';
+                    // Background cells
+                    if (!vSingleCell && !vComb && vTmpRow) {
+                        this.drawColsChart(vNumCols, vTmpRow, taskCellWidth, vMinDate, vMaxDate);
+                    }
+                }
+            }
+            if (this.getCaptionType() && vCaptClass !== null) {
+                var vCaptionStr = void 0;
+                switch (this.getCaptionType()) {
+                    case 'Caption':
+                        vCaptionStr = vTmpItem.getCaption();
+                        break;
+                    case 'Resource':
+                        vCaptionStr = vTmpItem.getResource();
+                        break;
+                    case 'Duration':
+                        vCaptionStr = vTmpItem.getDuration(this.vFormat, this.vLangs[this.vLang]);
+                        break;
+                    case 'Complete':
+                        vCaptionStr = vTmpItem.getCompStr();
+                        break;
+                }
+                draw_utils_1.newNode(vTmpDiv_1, 'div', null, vCaptClass, vCaptionStr, 120, (vCaptClass == 'gmilecaption') ? 12 : 0);
+            }
+            // Add Task Info div for tooltip
+            if (this.vTaskList[i].getTaskDiv() && vTmpDiv_1) {
+                var vTmpDiv2 = draw_utils_1.newNode(vTmpDiv_1, 'div', this.vDivId + 'tt' + vID, null, null, null, null, 'none');
+                var _a = this.createTaskInfo(this.vTaskList[i], this.vTooltipTemplate), component = _a.component, callback = _a.callback;
+                vTmpDiv2.appendChild(component);
+                events_1.addTooltipListeners(this, this.vTaskList[i].getTaskDiv(), vTmpDiv2, callback);
+            }
+            // Add Plan Task Info div for tooltip
+            if (this.vTaskList[i].getPlanTaskDiv() && vTmpDiv_1) {
+                var vTmpDiv2 = draw_utils_1.newNode(vTmpDiv_1, 'div', this.vDivId + 'tt' + vID, null, null, null, null, 'none');
+                var _b = this.createTaskInfo(this.vTaskList[i], this.vTooltipTemplate), component = _b.component, callback = _b.callback;
+                vTmpDiv2.appendChild(component);
+                events_1.addTooltipListeners(this, this.vTaskList[i].getPlanTaskDiv(), vTmpDiv2, callback);
+            }
+        }
+        // Include the footer with the days/week/month...
+        if (vSingleCell) {
+            var vTmpTFootTRow = draw_utils_1.newNode(vTmpTFoot, 'tr');
+            var vTmpTFootTCell = draw_utils_1.newNode(vTmpTFootTRow, 'td', null, null, null, '100%');
+            var vTmpTFootTCellTable = draw_utils_1.newNode(vTmpTFootTCell, 'table', null, 'gcharttableh', null, '100%');
+            var vTmpTFootTCellTableTBody = draw_utils_1.newNode(vTmpTFootTCellTable, 'tbody');
+            vTmpTFootTCellTableTBody.appendChild(vDateRow.cloneNode(true));
+        }
+        else {
+            vTmpTFoot.appendChild(vDateRow.cloneNode(true));
+        }
+        return { vRightTable: vRightTable };
+    };
+    this.drawColsChart = function (vNumCols, vTmpRow, taskCellWidth, pStartDate, pEndDate) {
+        if (pStartDate === void 0) { pStartDate = null; }
+        if (pEndDate === void 0) { pEndDate = null; }
+        var columnCurrentDay = null;
+        // Find the Current day cell to put a different class
+        if (this.vShowWeekends !== false && pStartDate && pEndDate && (this.vFormat == 'day' || this.vFormat == 'week')) {
+            var curTaskStart = new Date(pStartDate.getTime());
+            var curTaskEnd = new Date();
+            var onePeriod = 3600000;
+            if (this.vFormat == 'day') {
+                onePeriod *= 24;
+            }
+            else if (this.vFormat == 'week') {
+                onePeriod *= 24 * 7;
+            }
+            columnCurrentDay = Math.floor(general_utils_1.calculateCurrentDateOffset(curTaskStart, curTaskEnd) / onePeriod) - 1;
+        }
+        for (var j = 0; j < vNumCols - 1; j++) {
+            var vCellFormat = 'gtaskcell gtaskcellcols';
+            if (this.vShowWeekends !== false && this.vFormat == 'day' && ((j % 7 == 4) || (j % 7 == 5))) {
+                vCellFormat = 'gtaskcellwkend';
+            }
+            //When is the column is the current day/week,give a different class
+            else if ((this.vFormat == 'week' || this.vFormat == 'day') && j === columnCurrentDay) {
+                vCellFormat = 'gtaskcellcurrent';
+            }
+            draw_utils_1.newNode(vTmpRow, 'td', null, vCellFormat, '\u00A0\u00A0', taskCellWidth);
+        }
+    };
+    /**
+     *
+     *
+     * DRAWING PROCESS
+     *
+     *  vTaskRightPx,vTaskWidth,vTaskPlanLeftPx,vTaskPlanRightPx,vID
+     */
+    this.Draw = function () {
+        var vMaxDate = new Date();
+        var vMinDate = new Date();
+        var vColWidth = 0;
+        var bd;
+        if (this.vEvents && this.vEvents.beforeDraw) {
+            this.vEvents.beforeDraw();
+        }
+        if (this.vDebug) {
+            bd = new Date();
+            console.info('before draw', bd);
+        }
+        // Process all tasks, reset parent date and completion % if task list has altered
+        if (this.vProcessNeeded)
+            task_1.processRows(this.vTaskList, 0, -1, 1, 1, this.getUseSort(), this.vDebug);
+        this.vProcessNeeded = false;
+        // get overall min/max dates plus padding
+        vMinDate = date_utils_1.getMinDate(this.vTaskList, this.vFormat, this.getMinDate() && date_utils_1.coerceDate(this.getMinDate()));
+        vMaxDate = date_utils_1.getMaxDate(this.vTaskList, this.vFormat, this.getMaxDate() && date_utils_1.coerceDate(this.getMaxDate()));
+        // Calculate chart width variables.
+        if (this.vFormat == 'day')
+            vColWidth = this.vDayColWidth;
+        else if (this.vFormat == 'week')
+            vColWidth = this.vWeekColWidth;
+        else if (this.vFormat == 'month')
+            vColWidth = this.vMonthColWidth;
+        else if (this.vFormat == 'quarter')
+            vColWidth = this.vQuarterColWidth;
+        else if (this.vFormat == 'hour')
+            vColWidth = this.vHourColWidth;
+        // DRAW the Left-side of the chart (names, resources, comp%)
+        var vLeftHeader = document.createDocumentFragment();
+        /**
+         * LIST HEAD
+        */
+        var gListLbl = this.drawListHead(vLeftHeader);
+        /**
+         * LIST BODY
+        */
+        var _a = this.drawListBody(vLeftHeader), vNumRows = _a.vNumRows, vTmpContentTabWrapper = _a.vTmpContentTabWrapper;
+        /**
+         * CHART HEAD
+         */
+        var _b = this.drawChartHead(vMinDate, vMaxDate, vColWidth, vNumRows), gChartLbl = _b.gChartLbl, vTaskLeftPx = _b.vTaskLeftPx, vSingleCell = _b.vSingleCell, vRightHeader = _b.vRightHeader, vDateRow = _b.vDateRow, vNumCols = _b.vNumCols;
+        /**
+         * CHART GRID
+         */
+        var vRightTable = this.drawCharBody(vTaskLeftPx, vTmpContentTabWrapper, gChartLbl, gListLbl, vMinDate, vMaxDate, vSingleCell, vNumCols, vColWidth, vDateRow).vRightTable;
+        if (this.vDebug) {
+            var ad = new Date();
+            console.info('after tasks loop', ad, (ad.getTime() - bd.getTime()));
+        }
+        // MAIN VIEW: Appending all generated components to main view
+        while (this.vDiv.hasChildNodes())
+            this.vDiv.removeChild(this.vDiv.firstChild);
+        var vTmpDiv = draw_utils_1.newNode(this.vDiv, 'div', null, 'gchartcontainer');
+        vTmpDiv.style.height = this.vTotalHeight;
+        var leftvTmpDiv = draw_utils_1.newNode(vTmpDiv, 'div', null, 'gmain gmainleft');
+        leftvTmpDiv.appendChild(vLeftHeader);
+        // leftvTmpDiv.appendChild(vLeftTable);
+        var rightvTmpDiv = draw_utils_1.newNode(vTmpDiv, 'div', null, 'gmain gmainright');
+        rightvTmpDiv.appendChild(vRightHeader);
+        rightvTmpDiv.appendChild(vRightTable);
+        vTmpDiv.appendChild(leftvTmpDiv);
+        vTmpDiv.appendChild(rightvTmpDiv);
+        draw_utils_1.newNode(vTmpDiv, 'div', null, 'ggridfooter');
+        var vTmpDiv2 = draw_utils_1.newNode(this.getChartBody(), 'div', this.vDivId + 'Lines', 'glinediv');
+        if (this.vEvents.onLineContainerHover && typeof this.vEvents.onLineContainerHover === 'function') {
+            events_1.addListener('mouseover', this.vEvents.onLineContainerHover, vTmpDiv2);
+            events_1.addListener('mouseout', this.vEvents.onLineContainerHover, vTmpDiv2);
+        }
+        vTmpDiv2.style.visibility = 'hidden';
+        this.setLines(vTmpDiv2);
+        /* Quick hack to show the generated HTML on older browsers
+              let tmpGenSrc=document.createElement('textarea');
+              tmpGenSrc.appendChild(document.createTextNode(vTmpDiv.innerHTML));
+              vDiv.appendChild(tmpGenSrc);
+        //*/
+        // LISTENERS: Now all the content exists, register scroll listeners
+        events_1.addScrollListeners(this);
+        // SCROLL: now check if we are actually scrolling the pane
+        if (this.vScrollTo != '') {
+            var vScrollDate = new Date(vMinDate.getTime());
+            var vScrollPx = 0;
+            if (this.vScrollTo.substr && this.vScrollTo.substr(0, 2) == 'px') {
+                vScrollPx = parseInt(this.vScrollTo.substr(2));
+            }
+            else {
+                if (this.vScrollTo === 'today') {
+                    vScrollDate = new Date();
+                }
+                else if (this.vScrollTo instanceof Date) {
+                    vScrollDate = this.vScrollTo;
+                }
+                else {
+                    vScrollDate = date_utils_1.parseDateStr(this.vScrollTo, this.getDateInputFormat());
+                }
+                if (this.vFormat == 'hour')
+                    vScrollDate.setMinutes(0, 0, 0);
+                else
+                    vScrollDate.setHours(0, 0, 0, 0);
+                vScrollPx = general_utils_1.getOffset(vMinDate, vScrollDate, vColWidth, this.vFormat, this.vShowWeekends) - 30;
+            }
+            this.getChartBody().scrollLeft = vScrollPx;
+        }
+        if (vMinDate.getTime() <= (new Date()).getTime() && vMaxDate.getTime() >= (new Date()).getTime()) {
+            this.vTodayPx = general_utils_1.getOffset(vMinDate, new Date(), vColWidth, this.vFormat, this.vShowWeekends);
+        }
+        else
+            this.vTodayPx = -1;
+        // DEPENDENCIES: Draw lines of Dependencies
+        var bdd;
+        if (this.vDebug) {
+            bdd = new Date();
+            console.info('before DrawDependencies', bdd);
+        }
+        if (this.vEvents && typeof this.vEvents.beforeLineDraw === 'function') {
+            this.vEvents.beforeLineDraw();
+        }
+        this.DrawDependencies(this.vDebug);
+        events_1.addListenerDependencies(this.vLineOptions);
+        // EVENTS
+        if (this.vEvents && typeof this.vEvents.afterLineDraw === 'function') {
+            this.vEvents.afterLineDraw();
+        }
+        if (this.vDebug) {
+            var ad = new Date();
+            console.info('after DrawDependencies', ad, (ad.getTime() - bdd.getTime()));
+        }
+        this.drawComplete(vMinDate, vColWidth, bd);
+    };
+    /**
+     * Actions after all the render process
+     */
+    this.drawComplete = function (vMinDate, vColWidth, bd) {
+        if (this.vDebug) {
+            var ad = new Date();
+            console.info('after draw', ad, (ad.getTime() - bd.getTime()));
+        }
+        events_1.updateGridHeaderWidth(this);
+        this.chartRowDateToX = function (date) {
+            return general_utils_1.getOffset(vMinDate, date, vColWidth, this.vFormat, this.vShowWeekends);
+        };
+        if (this.vEvents && this.vEvents.afterDraw) {
+            this.vEvents.afterDraw();
+        }
+    };
+    if (this.vDiv && this.vDiv.nodeName && this.vDiv.nodeName.toLowerCase() == 'div')
+        this.vDivId = this.vDiv.id;
 }; //GanttChart
 
-JSGantt.updateFlyingObj=function (e, pGanttChartObj, pTimer) {
-	var vCurTopBuf=3;
-	var vCurLeftBuf=5;
-	var vCurBotBuf=3;
-	var vCurRightBuf=15;
-	var vMouseX=(e)?e.clientX:window.event.clientX;
-	var vMouseY=(e)?e.clientY:window.event.clientY;
-	var vViewportX=document.documentElement.clientWidth||document.getElementsByTagName('body')[0].clientWidth;
-	var vViewportY=document.documentElement.clientHeight||document.getElementsByTagName('body')[0].clientHeight;
-	var vNewX=vMouseX;
-	var vNewY=vMouseY;
-
-	if (navigator.appName.toLowerCase ()=='microsoft internet explorer') {
-		// the clientX and clientY properties include the left and top borders of the client area
-		vMouseX-=document.documentElement.clientLeft;
-		vMouseY-=document.documentElement.clientTop;
-
-		var vZoomFactor=JSGantt.getZoomFactor ();
-		if (vZoomFactor!=1) {// IE 7 at non-default zoom level
-			vMouseX=Math.round (vMouseX / vZoomFactor);
-			vMouseY=Math.round (vMouseY / vZoomFactor);
-		}
-	}
-
-	var vScrollPos=JSGantt.getScrollPositions();
-
-	/* Code for positioned right of the mouse by default*/
-	/*
-	if (vMouseX+vCurRightBuf+pGanttChartObj.vTool.offsetWidth>vViewportX)
-	{
-		if (vMouseX-vCurLeftBuf-pGanttChartObj.vTool.offsetWidth<0) vNewX=vScrollPos.x;
-		else vNewX=vMouseX+vScrollPos.x-vCurLeftBuf-pGanttChartObj.vTool.offsetWidth;
-	}
-	else vNewX=vMouseX+vScrollPos.x+vCurRightBuf;
-	*/
-
-	/* Code for positioned left of the mouse by default */
-	if (vMouseX-vCurLeftBuf-pGanttChartObj.vTool.offsetWidth<0)
-	{
-		if (vMouseX+vCurRightBuf+pGanttChartObj.vTool.offsetWidth>vViewportX) vNewX=vScrollPos.x;
-		else vNewX=vMouseX+vScrollPos.x+vCurRightBuf;
-	}
-	else vNewX=vMouseX+vScrollPos.x-vCurLeftBuf-pGanttChartObj.vTool.offsetWidth;
-
-	/* Code for positioned below the mouse by default */
-	if (vMouseY+vCurBotBuf+pGanttChartObj.vTool.offsetHeight>vViewportY)
-	{
-		if (vMouseY-vCurTopBuf-pGanttChartObj.vTool.offsetHeight<0) vNewY=vScrollPos.y;
-		else vNewY=vMouseY+vScrollPos.y-vCurTopBuf-pGanttChartObj.vTool.offsetHeight;
-	}
-	else vNewY=vMouseY+vScrollPos.y+vCurBotBuf;
-
-	/* Code for positioned above the mouse by default */
-	/*
-	if (vMouseY-vCurTopBuf-pGanttChartObj.vTool.offsetHeight<0)
-	{
-		if (vMouseY+vCurBotBuf+pGanttChartObj.vTool.offsetHeight>vViewportY) vNewY=vScrollPos.y;
-		else vNewY=vMouseY+vScrollPos.y+vCurBotBuf;
-	}
-	else vNewY=vMouseY+vScrollPos.y-vCurTopBuf-pGanttChartObj.vTool.offsetHeight;
-	*/
-
-	if (pGanttChartObj.getUseMove())
-	{
-		clearInterval(pGanttChartObj.vTool.moveInterval);
-		pGanttChartObj.vTool.moveInterval=setInterval(function(){JSGantt.moveToolTip(vNewX, vNewY, pGanttChartObj.vTool, pTimer);},pTimer);
-	}
-	else
-	{
-		pGanttChartObj.vTool.style.left=vNewX +'px';
-		pGanttChartObj.vTool.style.top=vNewY +'px';
-	}
+},{"./draw_columns":3,"./draw_dependencies":4,"./events":5,"./lang":8,"./options":9,"./task":10,"./utils/date_utils":11,"./utils/draw_utils":12,"./utils/general_utils":13,"./xml":14}],3:[function(require,module,exports){
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var date_utils_1 = require("./utils/date_utils");
+var task_1 = require("./task");
+var events_1 = require("./events");
+var draw_utils_1 = require("./utils/draw_utils");
+exports.COLUMN_ORDER = [
+    'vShowRes',
+    'vShowDur',
+    'vShowComp',
+    'vShowStartDate',
+    'vShowEndDate',
+    'vShowPlanStartDate',
+    'vShowPlanEndDate',
+    'vShowCost',
+    'vAdditionalHeaders',
+    'vShowAddEntries'
+];
+var COLUMNS_TYPES = {
+    'vShowRes': 'res',
+    'vShowDur': 'dur',
+    'vShowComp': 'comp',
+    'vShowStartDate': 'startdate',
+    'vShowEndDate': 'enddate',
+    'vShowPlanStartDate': 'planstartdate',
+    'vShowPlanEndDate': 'planenddate',
+    'vShowCost': 'cost',
+    'vShowAddEntries': 'addentries'
+};
+exports.draw_header = function (column, i, vTmpRow, vTaskList, vEditable, vEventsChange, vEvents, vDateTaskTableDisplayFormat, vAdditionalHeaders, vFormat, vLangs, vLang, vResources, Draw) {
+    var vTmpCell, vTmpDiv;
+    if ('vShowRes' === column) {
+        vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, 'gres');
+        var text = draw_utils_1.makeInput(vTaskList[i].getResource(), vEditable, 'resource', vTaskList[i].getResource(), vResources);
+        vTmpDiv = draw_utils_1.newNode(vTmpCell, 'div', null, null, text);
+        var callback = function (task, e) { return task.setResource(e.target.value); };
+        events_1.addListenerInputCell(vTmpCell, vEventsChange, callback, vTaskList, i, 'res', Draw, 'change');
+        events_1.addListenerClickCell(vTmpCell, vEvents, vTaskList[i], 'res');
+    }
+    if ('vShowDur' === column) {
+        vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, 'gdur');
+        var text = draw_utils_1.makeInput(vTaskList[i].getDuration(vFormat, vLangs[vLang]), vEditable, 'text', vTaskList[i].getDuration());
+        vTmpDiv = draw_utils_1.newNode(vTmpCell, 'div', null, null, text);
+        var callback = function (task, e) { return task.setDuration(e.target.value); };
+        events_1.addListenerInputCell(vTmpCell, vEventsChange, callback, vTaskList, i, 'dur', Draw);
+        events_1.addListenerClickCell(vTmpCell, vEvents, vTaskList[i], 'dur');
+    }
+    if ('vShowComp' === column) {
+        vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, 'gcomp');
+        var text = draw_utils_1.makeInput(vTaskList[i].getCompStr(), vEditable, 'percentage', vTaskList[i].getCompVal());
+        vTmpDiv = draw_utils_1.newNode(vTmpCell, 'div', null, null, text);
+        var callback = function (task, e) { task.setComp(e.target.value); task.setCompVal(e.target.value); };
+        events_1.addListenerInputCell(vTmpCell, vEventsChange, callback, vTaskList, i, 'comp', Draw);
+        events_1.addListenerClickCell(vTmpCell, vEvents, vTaskList[i], 'comp');
+    }
+    if ('vShowStartDate' === column) {
+        vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, 'gstartdate');
+        var v = date_utils_1.formatDateStr(vTaskList[i].getStartVar(), vDateTaskTableDisplayFormat, vLangs[vLang]);
+        var text = draw_utils_1.makeInput(v, vEditable, 'date', vTaskList[i].getStartVar());
+        vTmpDiv = draw_utils_1.newNode(vTmpCell, 'div', null, null, text);
+        var callback = function (task, e) { return task.setStart(e.target.value); };
+        events_1.addListenerInputCell(vTmpCell, vEventsChange, callback, vTaskList, i, 'start', Draw);
+        events_1.addListenerClickCell(vTmpCell, vEvents, vTaskList[i], 'start');
+    }
+    if ('vShowEndDate' === column) {
+        vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, 'genddate');
+        var v = date_utils_1.formatDateStr(vTaskList[i].getEndVar(), vDateTaskTableDisplayFormat, vLangs[vLang]);
+        var text = draw_utils_1.makeInput(v, vEditable, 'date', vTaskList[i].getEndVar());
+        vTmpDiv = draw_utils_1.newNode(vTmpCell, 'div', null, null, text);
+        var callback = function (task, e) { return task.setEnd(e.target.value); };
+        events_1.addListenerInputCell(vTmpCell, vEventsChange, callback, vTaskList, i, 'end', Draw);
+        events_1.addListenerClickCell(vTmpCell, vEvents, vTaskList[i], 'end');
+    }
+    if ('vShowPlanStartDate' === column) {
+        vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, 'gplanstartdate');
+        var v = vTaskList[i].getPlanStart() ? date_utils_1.formatDateStr(vTaskList[i].getPlanStart(), vDateTaskTableDisplayFormat, vLangs[vLang]) : '';
+        var text = draw_utils_1.makeInput(v, vEditable, 'date', vTaskList[i].getPlanStart());
+        vTmpDiv = draw_utils_1.newNode(vTmpCell, 'div', null, null, text);
+        var callback = function (task, e) { return task.setPlanStart(e.target.value); };
+        events_1.addListenerInputCell(vTmpCell, vEventsChange, callback, vTaskList, i, 'planstart', Draw);
+        events_1.addListenerClickCell(vTmpCell, vEvents, vTaskList[i], 'planstart');
+    }
+    if ('vShowPlanEndDate' === column) {
+        vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, 'gplanenddate');
+        var v = vTaskList[i].getPlanEnd() ? date_utils_1.formatDateStr(vTaskList[i].getPlanEnd(), vDateTaskTableDisplayFormat, vLangs[vLang]) : '';
+        var text = draw_utils_1.makeInput(v, vEditable, 'date', vTaskList[i].getPlanEnd());
+        vTmpDiv = draw_utils_1.newNode(vTmpCell, 'div', null, null, text);
+        var callback = function (task, e) { return task.setPlanEnd(e.target.value); };
+        events_1.addListenerInputCell(vTmpCell, vEventsChange, callback, vTaskList, i, 'planend', Draw);
+        events_1.addListenerClickCell(vTmpCell, vEvents, vTaskList[i], 'planend');
+    }
+    if ('vShowCost' === column) {
+        vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, 'gcost');
+        var text = draw_utils_1.makeInput(vTaskList[i].getCost(), vEditable, 'cost');
+        vTmpDiv = draw_utils_1.newNode(vTmpCell, 'div', null, null, text);
+        var callback = function (task, e) { return task.setCost(e.target.value); };
+        events_1.addListenerInputCell(vTmpCell, vEventsChange, callback, vTaskList, i, 'cost', Draw);
+        events_1.addListenerClickCell(vTmpCell, vEvents, vTaskList[i], 'cost');
+    }
+    if ('vAdditionalHeaders' === column && vAdditionalHeaders) {
+        for (var key in vAdditionalHeaders) {
+            var header = vAdditionalHeaders[key];
+            var css = header.class ? header.class : "gadditional-" + key;
+            var data = vTaskList[i].getDataObject();
+            vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, "gadditional " + css);
+            vTmpDiv = draw_utils_1.newNode(vTmpCell, 'div', null, null, data ? data[key] : '');
+            events_1.addListenerClickCell(vTmpCell, vEvents, vTaskList[i], "additional_" + key);
+            // const callback = (task, e) => task.setCost(e.target.value);
+            // addListenerInputCell(vTmpCell, vEventsChange, callback, vTaskList, i, 'costdate');
+        }
+    }
+    if ('vShowAddEntries' === column) {
+        vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, 'gaddentries');
+        var button = "<button>+</button>";
+        vTmpDiv = draw_utils_1.newNode(vTmpCell, 'div', null, null, button);
+        var callback = function (task, e) {
+            task_1.AddTaskItemObject({
+                vParent: task.getParent()
+            });
+        };
+        events_1.addListenerInputCell(vTmpCell, vEventsChange, callback, vTaskList, i, 'addentries', Draw.bind(this));
+        events_1.addListenerClickCell(vTmpCell, vEvents, vTaskList[i], 'addentries');
+    }
+};
+exports.draw_bottom = function (column, vTmpRow, vAdditionalHeaders) {
+    if ('vAdditionalHeaders' === column && vAdditionalHeaders) {
+        for (var key in vAdditionalHeaders) {
+            var header = vAdditionalHeaders[key];
+            var css = header.class ? header.class : "gadditional-" + key;
+            draw_utils_1.newNode(vTmpRow, 'td', null, "gspanning gadditional " + css, '\u00A0');
+        }
+    }
+    else {
+        var type = COLUMNS_TYPES[column];
+        draw_utils_1.newNode(vTmpRow, 'td', null, "gspanning g" + type, '\u00A0');
+    }
+};
+// export const draw_list_headings = function (column, vTmpRow, vAdditionalHeaders, vEvents) {
+//   let nodeCreated;
+//   if ('vAdditionalHeaders' === column && vAdditionalHeaders) {
+//     for (const key in vAdditionalHeaders) {
+//       const header = vAdditionalHeaders[key];
+//       const css = header.class ? header.class : `gadditional-${key}`;
+//       newNode(vTmpRow, 'td', null, `gspanning gadditional ${css}`, '\u00A0');
+//     }
+//   } else {
+//     const type = COLUMNS_TYPES[column];
+//     nodeCreated = newNode(vTmpRow, 'td', null, `gspanning g${type}`, '\u00A0');
+//     addListenerClickCell(nodeCreated, vEvents, { hader: true, column }, type);
+//   }
+// }
+exports.draw_task_headings = function (column, vTmpRow, vLangs, vLang, vAdditionalHeaders, vEvents) {
+    var nodeCreated;
+    if ('vAdditionalHeaders' === column && vAdditionalHeaders) {
+        for (var key in vAdditionalHeaders) {
+            var header = vAdditionalHeaders[key];
+            var text = header.translate ? vLangs[vLang][header.translate] : header.title;
+            var css = header.class ? header.class : "gadditional-" + key;
+            nodeCreated = draw_utils_1.newNode(vTmpRow, 'td', null, "gtaskheading gadditional " + css, text);
+        }
+    }
+    else {
+        var type = COLUMNS_TYPES[column];
+        nodeCreated = draw_utils_1.newNode(vTmpRow, 'td', null, "gtaskheading g" + type, vLangs[vLang][type]);
+        events_1.addListenerClickCell(nodeCreated, vEvents, { hader: true, column: column }, type);
+    }
 };
 
-JSGantt.showToolTip=function(pGanttChartObj, e, pContents, pWidth, pTimer){
-	var vTtDivId=pGanttChartObj.getDivId()+'JSGanttToolTip';
-	var vMaxW=500;
-	var vMaxAlpha=100;
-	var vShowing=pContents.id;
-
-	if(pGanttChartObj.getUseToolTip())
-	{
-		if(pGanttChartObj.vTool==null){
-			pGanttChartObj.vTool=document.createElement('div');
-			pGanttChartObj.vTool.id=vTtDivId;
-			pGanttChartObj.vTool.className='JSGanttToolTip';
-			pGanttChartObj.vTool.vToolCont=document.createElement('div');
-			pGanttChartObj.vTool.vToolCont.id=vTtDivId+'cont';
-			pGanttChartObj.vTool.vToolCont.className='JSGanttToolTipcont';
-			pGanttChartObj.vTool.vToolCont.setAttribute('showing','');
-			pGanttChartObj.vTool.appendChild(pGanttChartObj.vTool.vToolCont);
-			document.body.appendChild(pGanttChartObj.vTool);
-			pGanttChartObj.vTool.style.opacity=0;
-			pGanttChartObj.vTool.setAttribute('currentOpacity',0);
-			pGanttChartObj.vTool.setAttribute('fadeIncrement',10);
-			pGanttChartObj.vTool.setAttribute('moveSpeed',10);
-			pGanttChartObj.vTool.style.filter='alpha(opacity=0)';
-			pGanttChartObj.vTool.style.visibility='hidden';
-			pGanttChartObj.vTool.style.left=Math.floor(((e)?e.clientX:window.event.clientX)/2)+'px';
-			pGanttChartObj.vTool.style.top=Math.floor(((e)?e.clientY:window.event.clientY)/2)+'px';
-			JSGantt.addListener('mouseover', function () {clearTimeout(pGanttChartObj.vTool.delayTimeout);}, pGanttChartObj.vTool);
-			JSGantt.addListener('mouseout', function () {JSGantt.delayedHide(pGanttChartObj, pGanttChartObj.vTool, pTimer);}, pGanttChartObj.vTool);
-		}
-		clearTimeout(pGanttChartObj.vTool.delayTimeout);
-		if(pGanttChartObj.vTool.vToolCont.getAttribute('showing')!=vShowing || pGanttChartObj.vTool.style.visibility!='visible')
-		{
-			if (pGanttChartObj.vTool.vToolCont.getAttribute('showing')!=vShowing)
-			{
-				pGanttChartObj.vTool.vToolCont.setAttribute('showing',vShowing);
-
-				pGanttChartObj.vTool.vToolCont.innerHTML=pContents.innerHTML;
-				// as we are allowing arbitrary HTML we should remove any tag ids to prevent duplication
-				JSGantt.stripIds(pGanttChartObj.vTool.vToolCont);
-			}
-
-			pGanttChartObj.vTool.style.visibility='visible';
-			// Rather than follow the mouse just have it stay put
-			JSGantt.updateFlyingObj(e, pGanttChartObj, pTimer);
-			pGanttChartObj.vTool.style.width=(pWidth)? pWidth+'px' : 'auto';
-			if(!pWidth && JSGantt.isIE()){
-				pGanttChartObj.vTool.style.width=pGanttChartObj.vTool.offsetWidth;
-			}
-			if(pGanttChartObj.vTool.offsetWidth>vMaxW){pGanttChartObj.vTool.style.width=vMaxW+'px';}
-		}
-
-		if (pGanttChartObj.getUseFade())
-		{
-			clearInterval(pGanttChartObj.vTool.fadeInterval);
-			pGanttChartObj.vTool.fadeInterval=setInterval(function(){JSGantt.fadeToolTip(1, pGanttChartObj.vTool, vMaxAlpha);},pTimer);
-		}
-		else
-		{
-			pGanttChartObj.vTool.style.opacity=vMaxAlpha * 0.01;
-			pGanttChartObj.vTool.style.filter='alpha(opacity='+vMaxAlpha+')';
-		}
-	}
-};
-
-JSGantt.stripIds=function(pNode){
-	for(var i=0; i<pNode.childNodes.length; i++)
-	{
-		if ('removeAttribute' in pNode.childNodes[i]) pNode.childNodes[i].removeAttribute('id');
-		if (pNode.childNodes[i].hasChildNodes()) JSGantt.stripIds(pNode.childNodes[i]);
-	}
-};
-
-JSGantt.stripUnwanted=function(pNode){
-	var vAllowedTags=new Array('#text','p','br','ul','ol','li','div','span','img');
-	for(var i=0; i<pNode.childNodes.length; i++)
-	{
-		/* versions of IE<9 don't support indexOf on arrays so add trailing comma to the joined array and lookup value to stop substring matches */
-		if ((vAllowedTags.join().toLowerCase()+',').indexOf(pNode.childNodes[i].nodeName.toLowerCase()+',')==-1)
-		{
-			pNode.replaceChild(document.createTextNode(pNode.childNodes[i].outerHTML), pNode.childNodes[i]);
-		}
-		if (pNode.childNodes[i].hasChildNodes()) JSGantt.stripUnwanted(pNode.childNodes[i]);
-	}
-};
-
-JSGantt.delayedHide=function(pGanttChartObj, pTool, pTimer){
-	var vDelay=1500;
-	if(pTool) pTool.delayTimeout=setTimeout(function(){JSGantt.hideToolTip(pGanttChartObj, pTool, pTimer);}, vDelay);
-};
-
-JSGantt.hideToolTip=function(pGanttChartObj, pTool, pTimer){
-	if (pGanttChartObj.getUseFade())
-	{
-		clearInterval(pTool.fadeInterval);
-		pTool.fadeInterval=setInterval(function(){JSGantt.fadeToolTip(-1, pTool, 0);}, pTimer);
-	}
-	else
-	{
-		pTool.style.opacity=0;
-		pTool.style.filter='alpha(opacity=0)';
-		pTool.style.visibility='hidden';
-	}
-};
-
-JSGantt.fadeToolTip=function(pDirection, pTool, pMaxAlpha){
-	var vIncrement=parseInt(pTool.getAttribute('fadeIncrement'));
-	var vAlpha=pTool.getAttribute('currentOpacity');
-	var vCurAlpha=parseInt(vAlpha);
-	if((vCurAlpha!=pMaxAlpha && pDirection==1) || (vCurAlpha!=0 && pDirection==-1)){
-		var i=vIncrement;
-		if(pMaxAlpha-vCurAlpha<vIncrement && pDirection==1){
-			i=pMaxAlpha-vCurAlpha;
-		}else if(vAlpha<vIncrement && pDirection==-1){
-			i=vCurAlpha;
-		}
-		vAlpha=vCurAlpha+(i * pDirection);
-		pTool.style.opacity=vAlpha * 0.01;
-		pTool.style.filter='alpha(opacity='+vAlpha+')';
-		pTool.setAttribute('currentOpacity', vAlpha);
-	}else{
-		clearInterval(pTool.fadeInterval);
-		if(pDirection==-1){
-			pTool.style.opacity=0;
-			pTool.style.filter='alpha(opacity=0)';
-			pTool.style.visibility='hidden';
-		}
-	}
-};
-
-JSGantt.moveToolTip=function(pNewX, pNewY, pTool){
-	var vSpeed=parseInt(pTool.getAttribute('moveSpeed'));
-	var vOldX=parseInt(pTool.style.left);
-	var vOldY=parseInt(pTool.style.top);
-
-	if (pTool.style.visibility!='visible')
-	{
-		pTool.style.left=pNewX +'px';
-		pTool.style.top=pNewY +'px';
-		clearInterval(pTool.moveInterval);
-	}
-	else
-	{
-		if(pNewX!=vOldX && pNewY!=vOldY)
-		{
-			vOldX+=Math.ceil((pNewX-vOldX)/vSpeed);
-			vOldY+=Math.ceil((pNewY-vOldY)/vSpeed);
-			pTool.style.left=vOldX +'px';
-			pTool.style.top=vOldY +'px';
-		}
-		else
-		{
-			clearInterval(pTool.moveInterval);
-		}
-	}
-};
-
-JSGantt.getZoomFactor=function() {
-	var vFactor=1;
-	if (document.body.getBoundingClientRect)
-	{
-		// rect is only in physical pixel size in IE before version 8
-		var vRect=document.body.getBoundingClientRect ();
-		var vPhysicalW=vRect.right-vRect.left;
-		var vLogicalW=document.body.offsetWidth;
-
-		// the zoom level is always an integer percent value
-		vFactor=Math.round ((vPhysicalW / vLogicalW) * 100) / 100;
-	}
-	return vFactor;
-};
-
-JSGantt.getScrollPositions=function() {
-	var vScrollLeft=window.pageXOffset;
-	var vScrollTop=window.pageYOffset;
-	if (!('pageXOffset' in window))	// Internet Explorer before version 9
-	{
-		var vZoomFactor=JSGantt.getZoomFactor ();
-		vScrollLeft=Math.round (document.documentElement.scrollLeft / vZoomFactor);
-		vScrollTop=Math.round (document.documentElement.scrollTop / vZoomFactor);
-	}
-	return {x : vScrollLeft, y : vScrollTop};
-};
-
-JSGantt.getOffset=function(pStartDate, pEndDate, pColWidth, pFormat)
-{
-	var vMonthDaysArr=new Array(31,28,31,30,31,30,31,31,30,31,30,31);
-	var curTaskStart=new Date(pStartDate.getTime());
-	var curTaskEnd=new Date(pEndDate.getTime());
-	var vTaskRightPx=0;
-	var tmpTaskStart=Date.UTC(curTaskStart.getFullYear(), curTaskStart.getMonth(), curTaskStart.getDate(), curTaskStart.getHours(), 0, 0);
-	var tmpTaskEnd=Date.UTC(curTaskEnd.getFullYear(), curTaskEnd.getMonth(), curTaskEnd.getDate(), curTaskEnd.getHours(), 0, 0);
-
-	var vTaskRight=(tmpTaskEnd-tmpTaskStart)/3600000; // Length of task in hours
-
-	if(pFormat=='day')
-	{
-		vTaskRightPx=Math.ceil((vTaskRight/24) * (pColWidth+1));
-	}
-	else if(pFormat=='week')
-	{
-		vTaskRightPx=Math.ceil(((vTaskRight/24) * (pColWidth+1))/7);
-	}
-	else if(pFormat=='month')
-	{
-		var vMonthsDiff=(12 * (curTaskEnd.getFullYear()-curTaskStart.getFullYear()))+(curTaskEnd.getMonth()-curTaskStart.getMonth());
-		var vPosTmpDate=new Date(curTaskEnd.getTime());
-		vPosTmpDate.setDate(curTaskStart.getDate());
-		var vDaysCrctn=(curTaskEnd.getTime()-vPosTmpDate.getTime())/ (86400000);
-
-		vTaskRightPx=Math.ceil((vMonthsDiff * (pColWidth+1))+(vDaysCrctn * (pColWidth/vMonthDaysArr[curTaskEnd.getMonth()])));
-	}
-	else if(pFormat=='quarter')
-	{
-		vMonthsDiff=(12 * (curTaskEnd.getFullYear()-curTaskStart.getFullYear()))+(curTaskEnd.getMonth()-curTaskStart.getMonth());
-		vPosTmpDate=new Date(curTaskEnd.getTime());
-		vPosTmpDate.setDate(curTaskStart.getDate());
-		vDaysCrctn=(curTaskEnd.getTime()-vPosTmpDate.getTime())/ (86400000);
-
-		vTaskRightPx=Math.ceil((vMonthsDiff * ((pColWidth+1)/3))+(vDaysCrctn * (pColWidth/90)));
-	}
-	else if(pFormat=='hour')
-	{
-		// can't just calculate sum because of daylight savings changes
-		vPosTmpDate=new Date(curTaskEnd.getTime());
-		vPosTmpDate.setMinutes(curTaskStart.getMinutes(), 0);
-		var vMinsCrctn=(curTaskEnd.getTime()-vPosTmpDate.getTime())/(3600000);
-
-		vTaskRightPx=Math.ceil((vTaskRight * (pColWidth+1))+(vMinsCrctn * (pColWidth)));
-	}
-	return vTaskRightPx;
-};
-
-// Recursively process task tree ... set min, max dates of parent tasks and identfy task level.
-JSGantt.processRows=function(pList, pID, pRow, pLevel, pOpen, pUseSort)
-{
-	var vMinDate=new Date();
-	var vMaxDate=new Date();
-	var vVisible=pOpen;
-	var vCurItem=null;
-	var vCompSum=0;
-	var vMinSet=0;
-	var vMaxSet=0;
-	var vNumKid=0;
-	var vWeight=0;
-	var vLevel=pLevel;
-	var vList=pList;
-	var vComb=false;
-	var i=0;
-
-	for(i=0; i<pList.length; i++)
-	{
-		if (pList[i].getToDelete())
-		{
-			pList.splice(i,1);
-			i--;
-		}
-		if (i>=0 && pList[i].getID()==pID)vCurItem=pList[i];
-	}
-
-	for(i=0; i<pList.length; i++)
-	{
-		if(pList[i].getParent()==pID)
-		{
-			vVisible=pOpen;
-			pList[i].setParItem(vCurItem);
-			pList[i].setVisible(vVisible);
-			if(vVisible==1 && pList[i].getOpen()==0) vVisible=0;
-
-			if(pList[i].getMile() && pList[i].getParItem() && pList[i].getParItem().getGroup()==2)
-			{//remove milestones owned by combined groups
-				pList.splice(i,1);
-				i--;
-				continue;
-			}
-
-			pList[i].setLevel(vLevel);
-
-			if(pList[i].getGroup())
-			{
-				if(pList[i].getParItem() && pList[i].getParItem().getGroup()==2)pList[i].setGroup(2);
-				JSGantt.processRows(vList, pList[i].getID(), i, vLevel+1, vVisible, 0);
-			}
-
-			if(vMinSet==0 || pList[i].getStart()<vMinDate)
-			{
-				vMinDate=pList[i].getStart();
-				vMinSet=1;
-			}
-
-			if(vMaxSet==0 || pList[i].getEnd()>vMaxDate)
-			{
-				vMaxDate=pList[i].getEnd();
-				vMaxSet=1;
-			}
-
-			vNumKid++;
-			vWeight+=pList[i].getEnd()-pList[i].getStart()+1;
-			vCompSum+=pList[i].getCompVal()*(pList[i].getEnd()-pList[i].getStart()+1);
-			pList[i].setSortIdx(i*pList.length);
-		}
-	}
-
-	if(pRow>=0)
-	{
-		if(pList[pRow].getGroupMinStart()!=null && pList[pRow].getGroupMinStart()<vMinDate)
-		{
-			vMinDate=pList[pRow].getGroupMinStart();
-		}
-
-		if(pList[pRow].getGroupMinEnd()!=null && pList[pRow].getGroupMinEnd()>vMaxDate)
-		{
-			vMaxDate=pList[pRow].getGroupMinEnd();
-		}
-		pList[pRow].setStart(vMinDate);
-		pList[pRow].setEnd(vMaxDate);
-		pList[pRow].setNumKid(vNumKid);
-		pList[pRow].setWeight(vWeight);
-		pList[pRow].setCompVal(Math.ceil(vCompSum/vWeight));
-	}
-
-	if (pID==0 && pUseSort==1)
-	{
-		JSGantt.sortTasks(pList, 0, 0);
-		pList.sort(function(a,b){return a.getSortIdx()-b.getSortIdx();});
-	}
-	if (pID==0 && pUseSort!=1) // Need to sort combined tasks regardless
-	{
-		for(i=0; i<pList.length; i++)
-		{
-			if (pList[i].getGroup()==2)
-			{
-				vComb=true;
-				JSGantt.sortTasks(pList, pList[i].getID(), pList[i].getSortIdx()+1);
-			}
-		}
-		if(vComb==true) pList.sort(function(a,b){return a.getSortIdx()-b.getSortIdx();});
-	}
-};
-
-JSGantt.sortTasks=function (pList, pID, pIdx)
-{
-	var sortIdx=pIdx;
-	var sortArr=new Array();
-
-	for(var i=0; i<pList.length; i++)
-	{
-		if(pList[i].getParent()==pID)sortArr.push(pList[i]);
-	}
-
-	if (sortArr.length>0)
-	{
-		sortArr.sort(function(a,b){ var i=a.getStart().getTime()-b.getStart().getTime();
-									if (i==0) i=a.getEnd().getTime()-b.getEnd().getTime();
-									if (i==0) return a.getID()-b.getID();
-									else return i; });
-	}
-
-	for (var j=0; j<sortArr.length; j++)
-	{
-		for(i=0; i<pList.length; i++)
-		{
-			if(pList[i].getID()==sortArr[j].getID())
-			{
-				pList[i].setSortIdx(sortIdx++);
-				sortIdx=JSGantt.sortTasks(pList, pList[i].getID(), sortIdx);
-			}
-		}
-	}
-	return sortIdx;
-};
-
-// Used to determine the minimum date of all tasks and set lower bound based on format
-JSGantt.getMinDate=function getMinDate(pList, pFormat)
-{
-	var vDate=new Date();
-	vDate.setTime(pList[0].getStart().getTime());
-
-	// Parse all Task End dates to find min
-	for(var i=0; i<pList.length; i++)
-	{
-		if(pList[i].getStart().getTime()<vDate.getTime()) vDate.setTime(pList[i].getStart().getTime());
-	}
-
-	// Adjust min date to specific format boundaries (first of week or first of month)
-	if (pFormat=='day')
-	{
-		vDate.setDate(vDate.getDate()-1);
-		while(vDate.getDay()%7!=1) vDate.setDate(vDate.getDate()-1);
-	}
-	else if (pFormat=='week')
-	{
-		vDate.setDate(vDate.getDate()-1);
-		while(vDate.getDay()%7!=1) vDate.setDate(vDate.getDate()-1);
-	}
-	else if (pFormat=='month')
-	{
-		vDate.setDate(vDate.getDate()-15);
-		while(vDate.getDate()>1) vDate.setDate(vDate.getDate()-1);
-	}
-	else if (pFormat=='quarter')
-	{
-		vDate.setDate(vDate.getDate()-31);
-		if(vDate.getMonth()==0 || vDate.getMonth()==1 || vDate.getMonth()==2)
-			vDate.setFullYear(vDate.getFullYear(), 0, 1);
-		else if(vDate.getMonth()==3 || vDate.getMonth()==4 || vDate.getMonth()==5)
-			vDate.setFullYear(vDate.getFullYear(), 3, 1);
-		else if(vDate.getMonth()==6 || vDate.getMonth()==7 || vDate.getMonth()==8)
-			vDate.setFullYear(vDate.getFullYear(), 6, 1);
-		else if(vDate.getMonth()==9 || vDate.getMonth()==10 || vDate.getMonth()==11)
-			vDate.setFullYear(vDate.getFullYear(), 9, 1);
-	}
-	else if (pFormat=='hour')
-	{
-		vDate.setHours(vDate.getHours()-1);
-		while(vDate.getHours()%6!=0) vDate.setHours(vDate.getHours()-1);
-	}
-
-	if(pFormat=='hour')vDate.setMinutes(0,0);
-	else vDate.setHours(0,0,0);
-	return(vDate);
-};
-
-// Used to determine the maximum date of all tasks and set upper bound based on format
-JSGantt.getMaxDate=function (pList, pFormat)
-{
-	var vDate=new Date();
-
-	vDate.setTime(pList[0].getEnd().getTime());
-
-	// Parse all Task End dates to find max
-	for(var i=0; i<pList.length; i++)
-	{
-		if(pList[i].getEnd().getTime()>vDate.getTime()) vDate.setTime(pList[i].getEnd().getTime());
-	}
-
-	// Adjust max date to specific format boundaries (end of week or end of month)
-	if (pFormat=='day')
-	{
-		vDate.setDate(vDate.getDate()+1);
-
-		while(vDate.getDay()%7!=0) vDate.setDate(vDate.getDate()+1);
-	}
-	else if (pFormat=='week')
-	{
-		//For weeks, what is the last logical boundary?
-		vDate.setDate(vDate.getDate()+1);
-
-		while(vDate.getDay()%7!=0) vDate.setDate(vDate.getDate()+1);
-	}
-	else if (pFormat=='month')
-	{
-		// Set to last day of current Month
-		while(vDate.getDate()>1) vDate.setDate(vDate.getDate()+1);
-		vDate.setDate(vDate.getDate()-1);
-	}
-	else if (pFormat=='quarter')
-	{
-		// Set to last day of current Quarter
-		if(vDate.getMonth()==0 || vDate.getMonth()==1 || vDate.getMonth()==2)
-			vDate.setFullYear(vDate.getFullYear(), 2, 31);
-		else if(vDate.getMonth()==3 || vDate.getMonth()==4 || vDate.getMonth()==5)
-			vDate.setFullYear(vDate.getFullYear(), 5, 30);
-		else if(vDate.getMonth()==6 || vDate.getMonth()==7 || vDate.getMonth()==8)
-			vDate.setFullYear(vDate.getFullYear(), 8, 30);
-		else if(vDate.getMonth()==9 || vDate.getMonth()==10 || vDate.getMonth()==11)
-			vDate.setFullYear(vDate.getFullYear(), 11, 31);
-	}
-	else if (pFormat=='hour')
-	{
-		if(vDate.getHours()==0)vDate.setDate(vDate.getDate()+1);
-		vDate.setHours(vDate.getHours()+1);
-
-		while(vDate.getHours()%6!=5) vDate.setHours(vDate.getHours()+1);
-	}
-	return(vDate);
-};
-
-// This function finds the document id of the specified object
-JSGantt.findObj=function (theObj, theDoc)
-{
-	var p, i, foundObj;
-	if(!theDoc) theDoc=document;
-	if(document.getElementById) foundObj=document.getElementById(theObj);
-	return foundObj;
-};
-
-JSGantt.changeFormat=function(pFormat,ganttObj)
-{
-	if(ganttObj) ganttObj.setFormat(pFormat);
-	else alert('Chart undefined');
+},{"./events":5,"./task":10,"./utils/date_utils":11,"./utils/draw_utils":12}],4:[function(require,module,exports){
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.drawDependency = function (x1, y1, x2, y2, pType, pClass) {
+    var vDir = 1;
+    var vBend = false;
+    var vShort = 4;
+    var vRow = Math.floor(this.getRowHeight() / 2);
+    if (y2 < y1)
+        vRow *= -1;
+    switch (pType) {
+        case 'SF':
+            vShort *= -1;
+            if (x1 - 10 <= x2 && y1 != y2)
+                vBend = true;
+            vDir = -1;
+            break;
+        case 'SS':
+            if (x1 < x2)
+                vShort *= -1;
+            else
+                vShort = x2 - x1 - (2 * vShort);
+            break;
+        case 'FF':
+            if (x1 <= x2)
+                vShort = x2 - x1 + (2 * vShort);
+            vDir = -1;
+            break;
+        default:
+            if (x1 + 10 >= x2 && y1 != y2)
+                vBend = true;
+            break;
+    }
+    if (vBend) {
+        this.sLine(x1, y1, x1 + vShort, y1, pClass);
+        this.sLine(x1 + vShort, y1, x1 + vShort, y2 - vRow, pClass);
+        this.sLine(x1 + vShort, y2 - vRow, x2 - (vShort * 2), y2 - vRow, pClass);
+        this.sLine(x2 - (vShort * 2), y2 - vRow, x2 - (vShort * 2), y2, pClass);
+        this.sLine(x2 - (vShort * 2), y2, x2 - (1 * vDir), y2, pClass);
+    }
+    else if (y1 != y2) {
+        this.sLine(x1, y1, x1 + vShort, y1, pClass);
+        this.sLine(x1 + vShort, y1, x1 + vShort, y2, pClass);
+        this.sLine(x1 + vShort, y2, x2 - (1 * vDir), y2, pClass);
+    }
+    else
+        this.sLine(x1, y1, x2 - (1 * vDir), y2, pClass);
+    var vTmpDiv = this.sLine(x2, y2, x2 - 3 - ((vDir < 0) ? 1 : 0), y2 - 3 - ((vDir < 0) ? 1 : 0), pClass + "Arw");
+    vTmpDiv.style.width = '0px';
+    vTmpDiv.style.height = '0px';
+};
+exports.DrawDependencies = function (vDebug) {
+    if (vDebug === void 0) { vDebug = false; }
+    if (this.getShowDeps() == 1) {
+        this.CalcTaskXY(); //First recalculate the x,y
+        this.clearDependencies();
+        var vList = this.getList();
+        for (var i = 0; i < vList.length; i++) {
+            var vDepend = vList[i].getDepend();
+            var vDependType = vList[i].getDepType();
+            var n = vDepend.length;
+            if (n > 0 && vList[i].getVisible() == 1) {
+                for (var k = 0; k < n; k++) {
+                    var vTask = this.getArrayLocationByID(vDepend[k]);
+                    if (vTask >= 0 && vList[vTask].getGroup() != 2) {
+                        if (vList[vTask].getVisible() == 1) {
+                            if (vDebug) {
+                                console.info("init drawDependency ", vList[vTask].getID(), new Date());
+                            }
+                            var cssClass = 'gDepId' + vList[vTask].getID() +
+                                ' ' + 'gDepNextId' + vList[i].getID();
+                            var dependedData = vList[vTask].getDataObject();
+                            var nextDependedData = vList[i].getDataObject();
+                            if (dependedData && dependedData.pID && nextDependedData && nextDependedData.pID) {
+                                cssClass += ' gDepDataId' + dependedData.pID + ' ' + 'gDepNextDataId' + nextDependedData.pID;
+                            }
+                            if (vDependType[k] == 'SS')
+                                this.drawDependency(vList[vTask].getStartX() - 1, vList[vTask].getStartY(), vList[i].getStartX() - 1, vList[i].getStartY(), 'SS', cssClass + ' gDepSS');
+                            else if (vDependType[k] == 'FF')
+                                this.drawDependency(vList[vTask].getEndX(), vList[vTask].getEndY(), vList[i].getEndX(), vList[i].getEndY(), 'FF', cssClass + ' gDepFF');
+                            else if (vDependType[k] == 'SF')
+                                this.drawDependency(vList[vTask].getStartX() - 1, vList[vTask].getStartY(), vList[i].getEndX(), vList[i].getEndY(), 'SF', cssClass + ' gDepSF');
+                            else if (vDependType[k] == 'FS')
+                                this.drawDependency(vList[vTask].getEndX(), vList[vTask].getEndY(), vList[i].getStartX() - 1, vList[i].getStartY(), 'FS', cssClass + ' gDepFS');
+                        }
+                    }
+                }
+            }
+        }
+    }
+    // draw the current date line
+    if (this.vTodayPx >= 0) {
+        this.sLine(this.vTodayPx, 0, this.vTodayPx, this.getChartTable().offsetHeight - 1, 'gCurDate');
+    }
 };
 
+},{}],5:[function(require,module,exports){
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var general_utils_1 = require("./utils/general_utils");
 // Function to open/close and hide/show children of specified task
-JSGantt.folder=function (pID,ganttObj)
-{
-	var vList=ganttObj.getList();
-	var vDivId=ganttObj.getDivId();
-
-	ganttObj.clearDependencies(); // clear these first so slow rendering doesn't look odd
-
-	for(var i=0; i<vList.length; i++)
-	{
-		if(vList[i].getID()==pID)
-		{
-			if(vList[i].getOpen()==1)
-			{
-				vList[i].setOpen(0);
-				JSGantt.hide(pID,ganttObj);
-
-				if (JSGantt.isIE())
-					vList[i].getGroupSpan().innerText='+';
-				else
-					vList[i].getGroupSpan().textContent='+';
-			}
-			else
-			{
-				vList[i].setOpen(1);
-				JSGantt.show(pID, 1, ganttObj);
-
-				if (JSGantt.isIE())
-					vList[i].getGroupSpan().innerText='-';
-				else
-					vList[i].getGroupSpan().textContent='-';
-			}
-		}
-	}
-	ganttObj.DrawDependencies();
+exports.folder = function (pID, ganttObj) {
+    var vList = ganttObj.getList();
+    ganttObj.clearDependencies(); // clear these first so slow rendering doesn't look odd
+    for (var i = 0; i < vList.length; i++) {
+        if (vList[i].getID() == pID) {
+            if (vList[i].getOpen() == 1) {
+                vList[i].setOpen(0);
+                exports.hide(pID, ganttObj);
+                if (general_utils_1.isIE())
+                    vList[i].getGroupSpan().innerText = '+';
+                else
+                    vList[i].getGroupSpan().textContent = '+';
+            }
+            else {
+                vList[i].setOpen(1);
+                exports.show(pID, 1, ganttObj);
+                if (general_utils_1.isIE())
+                    vList[i].getGroupSpan().innerText = '-';
+                else
+                    vList[i].getGroupSpan().textContent = '-';
+            }
+        }
+    }
+    var bd;
+    if (this.vDebug) {
+        bd = new Date();
+        console.info('after drawDependency', bd);
+    }
+    ganttObj.DrawDependencies(this.vDebug);
+    if (this.vDebug) {
+        var ad = new Date();
+        console.info('after drawDependency', ad, (ad.getTime() - bd.getTime()));
+    }
 };
-
-JSGantt.hide=function (pID,ganttObj)
-{
-	var vList=ganttObj.getList();
-	var vID=0;
-	var vDivId=ganttObj.getDivId();
-
-	for(var i=0; i<vList.length; i++)
-	{
-		if(vList[i].getParent()==pID)
-		{
-			vID=vList[i].getID();
-			// it's unlikely but if the task list has been updated since
-			// the chart was drawn some of the rows may not exist
-			if (vList[i].getListChildRow()) vList[i].getListChildRow().style.display='none';
-			if (vList[i].getChildRow()) vList[i].getChildRow().style.display='none';
-			vList[i].setVisible(0);
-			if(vList[i].getGroup()) JSGantt.hide(vID,ganttObj);
-		}
-	}
+exports.hide = function (pID, ganttObj) {
+    var vList = ganttObj.getList();
+    var vID = 0;
+    for (var i = 0; i < vList.length; i++) {
+        if (vList[i].getParent() == pID) {
+            vID = vList[i].getID();
+            // it's unlikely but if the task list has been updated since
+            // the chart was drawn some of the rows may not exist
+            if (vList[i].getListChildRow())
+                vList[i].getListChildRow().style.display = 'none';
+            if (vList[i].getChildRow())
+                vList[i].getChildRow().style.display = 'none';
+            vList[i].setVisible(0);
+            if (vList[i].getGroup())
+                exports.hide(vID, ganttObj);
+        }
+    }
 };
-
 // Function to show children of specified task
-JSGantt.show=function (pID, pTop, ganttObj)
-{
-	var vList=ganttObj.getList();
-	var vID=0;
-	var vDivId=ganttObj.getDivId();
-	var vState='';
-
-	for(var i=0; i<vList.length; i++)
-	{
-		if(vList[i].getParent()==pID)
-		{
-			if (vList[i].getParItem().getGroupSpan())
-			{
-				if (JSGantt.isIE()) vState=vList[i].getParItem().getGroupSpan().innerText;
-				else vState=vList[i].getParItem().getGroupSpan().textContent;
-			}
-			i=vList.length;
-		}
-	}
-
-	for(i=0; i<vList.length; i++)
-	{
-		if(vList[i].getParent()==pID)
-		{
-			var vChgState=false;
-			vID=vList[i].getID();
-
-			if(pTop==1 && vState=='+')vChgState=true;
-			else if(vState=='-')vChgState=true;
-			else if(vList[i].getParItem() && vList[i].getParItem().getGroup()==2)vList[i].setVisible(1);
-
-			if(vChgState)
-			{
-				if (vList[i].getListChildRow()) vList[i].getListChildRow().style.display='';
-				if (vList[i].getChildRow()) vList[i].getChildRow().style.display='';
-				vList[i].setVisible(1);
-			}
-			if(vList[i].getGroup()) JSGantt.show(vID, 0,ganttObj);
-		}
-	}
+exports.show = function (pID, pTop, ganttObj) {
+    var vList = ganttObj.getList();
+    var vID = 0;
+    var vState = '';
+    for (var i = 0; i < vList.length; i++) {
+        if (vList[i].getParent() == pID) {
+            if (!vList[i].getParItem()) {
+                console.error("Cant find parent on who event (maybe problems with Task ID and Parent Id mixes?)");
+            }
+            if (vList[i].getParItem().getGroupSpan()) {
+                if (general_utils_1.isIE())
+                    vState = vList[i].getParItem().getGroupSpan().innerText;
+                else
+                    vState = vList[i].getParItem().getGroupSpan().textContent;
+            }
+            i = vList.length;
+        }
+    }
+    for (var i = 0; i < vList.length; i++) {
+        if (vList[i].getParent() == pID) {
+            var vChgState = false;
+            vID = vList[i].getID();
+            if (pTop == 1 && vState == '+')
+                vChgState = true;
+            else if (vState == '-')
+                vChgState = true;
+            else if (vList[i].getParItem() && vList[i].getParItem().getGroup() == 2)
+                vList[i].setVisible(1);
+            if (vChgState) {
+                if (vList[i].getListChildRow())
+                    vList[i].getListChildRow().style.display = '';
+                if (vList[i].getChildRow())
+                    vList[i].getChildRow().style.display = '';
+                vList[i].setVisible(1);
+            }
+            if (vList[i].getGroup())
+                exports.show(vID, 0, ganttObj);
+        }
+    }
+};
+exports.mouseOver = function (pObj1, pObj2) {
+    if (this.getUseRowHlt()) {
+        pObj1.className += ' gitemhighlight';
+        pObj2.className += ' gitemhighlight';
+    }
+};
+exports.mouseOut = function (pObj1, pObj2) {
+    if (this.getUseRowHlt()) {
+        pObj1.className = pObj1.className.replace(/(?:^|\s)gitemhighlight(?!\S)/g, '');
+        pObj2.className = pObj2.className.replace(/(?:^|\s)gitemhighlight(?!\S)/g, '');
+    }
+};
+exports.showToolTip = function (pGanttChartObj, e, pContents, pWidth, pTimer) {
+    var vTtDivId = pGanttChartObj.getDivId() + 'JSGanttToolTip';
+    var vMaxW = 500;
+    var vMaxAlpha = 100;
+    var vShowing = pContents.id;
+    if (pGanttChartObj.getUseToolTip()) {
+        if (pGanttChartObj.vTool == null) {
+            pGanttChartObj.vTool = document.createElement('div');
+            pGanttChartObj.vTool.id = vTtDivId;
+            pGanttChartObj.vTool.className = 'JSGanttToolTip';
+            pGanttChartObj.vTool.vToolCont = document.createElement('div');
+            pGanttChartObj.vTool.vToolCont.id = vTtDivId + 'cont';
+            pGanttChartObj.vTool.vToolCont.className = 'JSGanttToolTipcont';
+            pGanttChartObj.vTool.vToolCont.setAttribute('showing', '');
+            pGanttChartObj.vTool.appendChild(pGanttChartObj.vTool.vToolCont);
+            document.body.appendChild(pGanttChartObj.vTool);
+            pGanttChartObj.vTool.style.opacity = 0;
+            pGanttChartObj.vTool.setAttribute('currentOpacity', 0);
+            pGanttChartObj.vTool.setAttribute('fadeIncrement', 10);
+            pGanttChartObj.vTool.setAttribute('moveSpeed', 10);
+            pGanttChartObj.vTool.style.filter = 'alpha(opacity=0)';
+            pGanttChartObj.vTool.style.visibility = 'hidden';
+            pGanttChartObj.vTool.style.left = Math.floor(((e) ? e.clientX : window.event.clientX) / 2) + 'px';
+            pGanttChartObj.vTool.style.top = Math.floor(((e) ? e.clientY : window.event.clientY) / 2) + 'px';
+            this.addListener('mouseover', function () { clearTimeout(pGanttChartObj.vTool.delayTimeout); }, pGanttChartObj.vTool);
+            this.addListener('mouseout', function () { general_utils_1.delayedHide(pGanttChartObj, pGanttChartObj.vTool, pTimer); }, pGanttChartObj.vTool);
+        }
+        clearTimeout(pGanttChartObj.vTool.delayTimeout);
+        var newHTML = pContents.innerHTML;
+        if (pGanttChartObj.vTool.vToolCont.getAttribute("content") !== newHTML) {
+            pGanttChartObj.vTool.vToolCont.innerHTML = pContents.innerHTML;
+            // as we are allowing arbitrary HTML we should remove any tag ids to prevent duplication
+            general_utils_1.stripIds(pGanttChartObj.vTool.vToolCont);
+            pGanttChartObj.vTool.vToolCont.setAttribute("content", newHTML);
+        }
+        if (pGanttChartObj.vTool.vToolCont.getAttribute('showing') != vShowing || pGanttChartObj.vTool.style.visibility != 'visible') {
+            if (pGanttChartObj.vTool.vToolCont.getAttribute('showing') != vShowing) {
+                pGanttChartObj.vTool.vToolCont.setAttribute('showing', vShowing);
+            }
+            pGanttChartObj.vTool.style.visibility = 'visible';
+            // Rather than follow the mouse just have it stay put
+            general_utils_1.updateFlyingObj(e, pGanttChartObj, pTimer);
+            pGanttChartObj.vTool.style.width = (pWidth) ? pWidth + 'px' : 'auto';
+            if (!pWidth && general_utils_1.isIE()) {
+                pGanttChartObj.vTool.style.width = pGanttChartObj.vTool.offsetWidth;
+            }
+            if (pGanttChartObj.vTool.offsetWidth > vMaxW) {
+                pGanttChartObj.vTool.style.width = vMaxW + 'px';
+            }
+        }
+        if (pGanttChartObj.getUseFade()) {
+            clearInterval(pGanttChartObj.vTool.fadeInterval);
+            pGanttChartObj.vTool.fadeInterval = setInterval(function () { general_utils_1.fadeToolTip(1, pGanttChartObj.vTool, vMaxAlpha); }, pTimer);
+        }
+        else {
+            pGanttChartObj.vTool.style.opacity = vMaxAlpha * 0.01;
+            pGanttChartObj.vTool.style.filter = 'alpha(opacity=' + vMaxAlpha + ')';
+        }
+    }
+};
+exports.addListener = function (eventName, handler, control) {
+    // Check if control is a string
+    if (control === String(control))
+        control = general_utils_1.findObj(control);
+    if (control.addEventListener) //Standard W3C
+     {
+        return control.addEventListener(eventName, handler, false);
+    }
+    else if (control.attachEvent) //IExplore
+     {
+        return control.attachEvent('on' + eventName, handler);
+    }
+    else {
+        return false;
+    }
+};
+exports.removeListener = function (eventName, handler, control) {
+    // Check if control is a string
+    if (control === String(control))
+        control = general_utils_1.findObj(control);
+    if (control.removeEventListener) {
+        //Standard W3C
+        return control.removeEventListener(eventName, handler, false);
+    }
+    else if (control.detachEvent) {
+        //IExplore
+        return control.attachEvent('on' + eventName, handler);
+    }
+    else {
+        return false;
+    }
+};
+exports.syncScroll = function (elements, attrName) {
+    var syncFlags = new Map(elements.map(function (e) { return [e, false]; }));
+    function scrollEvent(e) {
+        if (!syncFlags.get(e.target)) {
+            for (var _i = 0, elements_2 = elements; _i < elements_2.length; _i++) {
+                var el = elements_2[_i];
+                if (el !== e.target) {
+                    syncFlags.set(el, true);
+                    el[attrName] = e.target[attrName];
+                }
+            }
+        }
+        syncFlags.set(e.target, false);
+    }
+    for (var _i = 0, elements_1 = elements; _i < elements_1.length; _i++) {
+        var el = elements_1[_i];
+        el.addEventListener('scroll', scrollEvent);
+    }
+};
+exports.addTooltipListeners = function (pGanttChart, pObj1, pObj2, callback) {
+    var isShowingTooltip = false;
+    exports.addListener('mouseover', function (e) {
+        if (isShowingTooltip || !callback) {
+            exports.showToolTip(pGanttChart, e, pObj2, null, pGanttChart.getTimer());
+        }
+        else if (callback) {
+            isShowingTooltip = true;
+            var promise = callback();
+            exports.showToolTip(pGanttChart, e, pObj2, null, pGanttChart.getTimer());
+            if (promise && promise.then) {
+                promise.then(function () {
+                    if (pGanttChart.vTool.vToolCont.getAttribute('showing') === pObj2.id &&
+                        pGanttChart.vTool.style.visibility === 'visible') {
+                        exports.showToolTip(pGanttChart, e, pObj2, null, pGanttChart.getTimer());
+                    }
+                });
+            }
+        }
+    }, pObj1);
+    exports.addListener('mouseout', function (e) {
+        var outTo = e.relatedTarget;
+        if (general_utils_1.isParentElementOrSelf(outTo, pObj1) || (pGanttChart.vTool && general_utils_1.isParentElementOrSelf(outTo, pGanttChart.vTool))) {
+            // not actually out
+        }
+        else {
+            isShowingTooltip = false;
+        }
+        general_utils_1.delayedHide(pGanttChart, pGanttChart.vTool, pGanttChart.getTimer());
+    }, pObj1);
+};
+exports.addThisRowListeners = function (pGanttChart, pObj1, pObj2) {
+    exports.addListener('mouseover', function () { pGanttChart.mouseOver(pObj1, pObj2); }, pObj1);
+    exports.addListener('mouseover', function () { pGanttChart.mouseOver(pObj1, pObj2); }, pObj2);
+    exports.addListener('mouseout', function () { pGanttChart.mouseOut(pObj1, pObj2); }, pObj1);
+    exports.addListener('mouseout', function () { pGanttChart.mouseOut(pObj1, pObj2); }, pObj2);
+};
+exports.updateGridHeaderWidth = function (pGanttChart) {
+    var head = pGanttChart.getChartHead();
+    var body = pGanttChart.getChartBody();
+    if (!head || !body)
+        return;
+    var isScrollVisible = body.scrollHeight > body.clientHeight;
+    if (isScrollVisible) {
+        head.style.width = "calc(100% - " + general_utils_1.getScrollbarWidth() + "px)";
+    }
+    else {
+        head.style.width = '100%';
+    }
+};
+exports.addFolderListeners = function (pGanttChart, pObj, pID) {
+    exports.addListener('click', function () {
+        exports.folder(pID, pGanttChart);
+        exports.updateGridHeaderWidth(pGanttChart);
+    }, pObj);
+};
+exports.addFormatListeners = function (pGanttChart, pFormat, pObj) {
+    exports.addListener('click', function () { general_utils_1.changeFormat(pFormat, pGanttChart); }, pObj);
+};
+exports.addScrollListeners = function (pGanttChart) {
+    exports.addListener('resize', function () { pGanttChart.getChartHead().scrollLeft = pGanttChart.getChartBody().scrollLeft; }, window);
+    exports.addListener('resize', function () {
+        pGanttChart.getListBody().scrollTop = pGanttChart.getChartBody().scrollTop;
+    }, window);
+};
+exports.addListenerClickCell = function (vTmpCell, vEvents, task, column) {
+    exports.addListener('click', function (e) {
+        if (e.target.classList.contains('gfoldercollapse') === false &&
+            vEvents[column] && typeof vEvents[column] === 'function') {
+            vEvents[column](task, e, vTmpCell, column);
+        }
+    }, vTmpCell);
+};
+exports.addListenerInputCell = function (vTmpCell, vEventsChange, callback, tasks, index, column, draw, event) {
+    if (draw === void 0) { draw = null; }
+    if (event === void 0) { event = 'blur'; }
+    var task = tasks[index];
+    if (vTmpCell.children[0] && vTmpCell.children[0].children && vTmpCell.children[0].children[0]) {
+        var tagName = vTmpCell.children[0].children[0].tagName;
+        var selectInputOrButton = tagName === 'SELECT' || tagName === 'INPUT' || tagName === 'BUTTON';
+        if (selectInputOrButton) {
+            exports.addListener(event, function (e) {
+                if (callback) {
+                    callback(task, e);
+                }
+                if (vEventsChange[column] && typeof vEventsChange[column] === 'function') {
+                    var q = vEventsChange[column](tasks, task, e, vTmpCell, vColumnsNames[column]);
+                    if (q && q.then) {
+                        q.then(function (e) { return draw(); });
+                    }
+                    else {
+                        draw();
+                    }
+                }
+                else {
+                    draw();
+                }
+            }, vTmpCell.children[0].children[0]);
+        }
+    }
+};
+exports.addListenerDependencies = function (vLineOptions) {
+    var elements = document.querySelectorAll('.gtaskbarcontainer');
+    for (var i = 0; i < elements.length; i++) {
+        var taskDiv = elements[i];
+        taskDiv.addEventListener('mouseover', function (e) {
+            toggleDependencies(e, vLineOptions);
+        });
+        taskDiv.addEventListener('mouseout', function (e) {
+            toggleDependencies(e, vLineOptions);
+        });
+    }
+};
+var toggleDependencies = function (e, vLineOptions) {
+    var target = e.currentTarget;
+    var ids = target.getAttribute('id').split('_');
+    var style = vLineOptions && vLineOptions.borderStyleHover !== undefined ? vLineOptions.hoverStyle : 'groove';
+    if (e.type === 'mouseout') {
+        style = '';
+    }
+    if (ids.length > 1) {
+        var frameZones = Array.from(document.querySelectorAll(".gDepId" + ids[1]));
+        frameZones.forEach(function (c) {
+            c.style.borderStyle = style;
+        });
+        // document.querySelectorAll(`.gDepId${ids[1]}`).forEach((c: any) => {
+        // c.style.borderStyle = style;
+        // });
+    }
+};
+var vColumnsNames = {
+    taskname: 'pName',
+    res: 'pRes',
+    dur: '',
+    comp: 'pComp',
+    start: 'pStart',
+    end: 'pEnd',
+    planstart: 'pPlanStart',
+    planend: 'pPlanEnd',
+    link: 'pLink',
+    cost: 'pCost',
+    mile: 'pMile',
+    group: 'pGroup',
+    parent: 'pParent',
+    open: 'pOpen',
+    depend: 'pDepend',
+    caption: 'pCaption',
+    note: 'pNotes'
 };
 
+},{"./utils/general_utils":13}],6:[function(require,module,exports){
+"use strict";
+/*
+    * Copyright (c) 2013-2018, Paul Geldart, Eduardo Rodrigues, Ricardo Cardoso and Mario Mol.
+    *
+    * Redistribution and use in source and binary forms, with or without
+    * modification, are permitted provided that the following conditions are met:
+    *     * Redistributions of source code must retain the above copyright
+    *       notice, this list of conditions and the following disclaimer.
+    *     * Redistributions in binary form must reproduce the above copyright
+    *       notice, this list of conditions and the following disclaimer in the
+    *       documentation and/or other materials provided with the distribution.
+    *     * Neither the name of AUTHORS nor the names of its contributors
+    *       may be used to endorse or promote products derived from this software
+    *       without specific prior written permission.
+    *
+    * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS OR
+    * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+    * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+    * IN NO EVENT SHALL AUTHORS BE LIABLE FOR ANY DIRECT,
+    * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+    * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+    * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+    * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+    * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+    This project is based on jsGantt 1.2, (which can be obtained from
+    https://code.google.com/p/jsgantt/) and remains under the original BSD license.
+    Copyright (c) 2009, Shlomy Gantz BlueBrick Inc.
+*/
+Object.defineProperty(exports, "__esModule", { value: true });
+var events_1 = require("./events");
+var general_utils_1 = require("./utils/general_utils");
+var xml_1 = require("./xml");
+var task_1 = require("./task");
+var draw_1 = require("./draw");
+var json_1 = require("./json");
+var date_utils_1 = require("./utils/date_utils");
+if (!exports.JSGantt)
+    exports.JSGantt = {};
+exports.JSGantt.isIE = general_utils_1.isIE;
+exports.JSGantt.TaskItem = task_1.TaskItem;
+exports.JSGantt.GanttChart = draw_1.GanttChart;
+exports.JSGantt.updateFlyingObj = general_utils_1.updateFlyingObj;
+exports.JSGantt.showToolTip = events_1.showToolTip;
+exports.JSGantt.stripIds = general_utils_1.stripIds;
+exports.JSGantt.stripUnwanted = general_utils_1.stripUnwanted;
+exports.JSGantt.delayedHide = general_utils_1.delayedHide;
+exports.JSGantt.hideToolTip = general_utils_1.hideToolTip;
+exports.JSGantt.fadeToolTip = general_utils_1.fadeToolTip;
+exports.JSGantt.moveToolTip = general_utils_1.moveToolTip;
+exports.JSGantt.getZoomFactor = general_utils_1.getZoomFactor;
+exports.JSGantt.getOffset = general_utils_1.getOffset;
+exports.JSGantt.getScrollPositions = general_utils_1.getScrollPositions;
+exports.JSGantt.processRows = task_1.processRows;
+exports.JSGantt.sortTasks = task_1.sortTasks;
+// Used to determine the minimum date of all tasks and set lower bound based on format
+exports.JSGantt.getMinDate = date_utils_1.getMinDate;
+// Used to determine the maximum date of all tasks and set upper bound based on format
+exports.JSGantt.getMaxDate = date_utils_1.getMaxDate;
+// This function finds the document id of the specified object
+exports.JSGantt.findObj = general_utils_1.findObj;
+exports.JSGantt.changeFormat = general_utils_1.changeFormat;
+// Tasks
+exports.JSGantt.folder = events_1.folder;
+exports.JSGantt.hide = events_1.hide;
+exports.JSGantt.show = events_1.show;
+exports.JSGantt.taskLink = task_1.taskLink;
+exports.JSGantt.parseDateStr = date_utils_1.parseDateStr;
+exports.JSGantt.formatDateStr = date_utils_1.formatDateStr;
+exports.JSGantt.parseDateFormatStr = date_utils_1.parseDateFormatStr;
+// XML 
+exports.JSGantt.parseXML = xml_1.parseXML;
+exports.JSGantt.parseXMLString = xml_1.parseXMLString;
+exports.JSGantt.findXMLNode = xml_1.findXMLNode;
+exports.JSGantt.getXMLNodeValue = xml_1.getXMLNodeValue;
+exports.JSGantt.AddXMLTask = xml_1.AddXMLTask;
+// JSON
+exports.JSGantt.parseJSON = json_1.parseJSON;
+exports.JSGantt.parseJSONString = json_1.parseJSONString;
+exports.JSGantt.addJSONTask = json_1.addJSONTask;
+exports.JSGantt.benchMark = general_utils_1.benchMark;
+exports.JSGantt.getIsoWeek = date_utils_1.getIsoWeek;
+exports.JSGantt.addListener = events_1.addListener;
+exports.JSGantt.addTooltipListeners = events_1.addTooltipListeners;
+exports.JSGantt.addThisRowListeners = events_1.addThisRowListeners;
+exports.JSGantt.addFolderListeners = events_1.addFolderListeners;
+exports.JSGantt.addFormatListeners = events_1.addFormatListeners;
+exports.JSGantt.addScrollListeners = events_1.addScrollListeners;
+exports.JSGantt.criticalPath = general_utils_1.criticalPath;
+
+},{"./draw":2,"./events":5,"./json":7,"./task":10,"./utils/date_utils":11,"./utils/general_utils":13,"./xml":14}],7:[function(require,module,exports){
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var task_1 = require("./task");
+var general_utils_1 = require("./utils/general_utils");
+/**
+ *
+ * @param pFile
+ * @param pGanttlet
+ */
+exports.parseJSON = function (pFile, pGanttVar, vDebug, redrawAfter) {
+    if (vDebug === void 0) { vDebug = false; }
+    if (redrawAfter === void 0) { redrawAfter = true; }
+    return __awaiter(this, void 0, void 0, function () {
+        var jsonObj, bd, ad;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, general_utils_1.makeRequest(pFile, true, true)];
+                case 1:
+                    jsonObj = _a.sent();
+                    if (vDebug) {
+                        bd = new Date();
+                        console.info('before jsonparse', bd);
+                    }
+                    exports.addJSONTask(pGanttVar, jsonObj);
+                    if (this.vDebug) {
+                        ad = new Date();
+                        console.info('after addJSONTask', ad, (ad.getTime() - bd.getTime()));
+                    }
+                    if (redrawAfter) {
+                        pGanttVar.Draw();
+                    }
+                    return [2 /*return*/, jsonObj];
+            }
+        });
+    });
+};
+exports.parseJSONString = function (pStr, pGanttVar) {
+    exports.addJSONTask(pGanttVar, JSON.parse(pStr));
+};
+exports.addJSONTask = function (pGanttVar, pJsonObj) {
+    for (var index = 0; index < pJsonObj.length; index++) {
+        var id = void 0;
+        var name_1 = void 0;
+        var start = void 0;
+        var end = void 0;
+        var planstart = void 0;
+        var planend = void 0;
+        var itemClass = void 0;
+        var link = '';
+        var milestone = 0;
+        var resourceName = '';
+        var completion = void 0;
+        var group = 0;
+        var parent_1 = void 0;
+        var open_1 = void 0;
+        var dependsOn = '';
+        var caption = '';
+        var notes = '';
+        var cost = void 0;
+        var duration = '';
+        var bartext = '';
+        var additionalObject = {};
+        for (var prop in pJsonObj[index]) {
+            var property = prop;
+            var value = pJsonObj[index][property];
+            switch (property.toLowerCase()) {
+                case 'pid':
+                case 'id':
+                    id = value;
+                    break;
+                case 'pname':
+                case 'name':
+                    name_1 = value;
+                    break;
+                case 'pstart':
+                case 'start':
+                    start = value;
+                    break;
+                case 'pend':
+                case 'end':
+                    end = value;
+                    break;
+                case 'pplanstart':
+                case 'planstart':
+                    planstart = value;
+                    break;
+                case 'pplanend':
+                case 'planend':
+                    planend = value;
+                    break;
+                case 'pclass':
+                case 'class':
+                    itemClass = value;
+                    break;
+                case 'plink':
+                case 'link':
+                    link = value;
+                    break;
+                case 'pmile':
+                case 'mile':
+                    milestone = value;
+                    break;
+                case 'pres':
+                case 'res':
+                    resourceName = value;
+                    break;
+                case 'pcomp':
+                case 'comp':
+                    completion = value;
+                    break;
+                case 'pgroup':
+                case 'group':
+                    group = value;
+                    break;
+                case 'pparent':
+                case 'parent':
+                    parent_1 = value;
+                    break;
+                case 'popen':
+                case 'open':
+                    open_1 = value;
+                    break;
+                case 'pdepend':
+                case 'depend':
+                    dependsOn = value;
+                    break;
+                case 'pcaption':
+                case 'caption':
+                    caption = value;
+                    break;
+                case 'pnotes':
+                case 'notes':
+                    notes = value;
+                    break;
+                case 'pcost':
+                case 'cost':
+                    cost = value;
+                    break;
+                case 'duration':
+                case 'pduration':
+                    duration = value;
+                    break;
+                case 'bartext':
+                case 'pbartext':
+                    bartext = value;
+                    break;
+                default:
+                    additionalObject[property.toLowerCase()] = value;
+            }
+        }
+        //if (id != undefined && !isNaN(parseInt(id)) && isFinite(id) && name && start && end && itemClass && completion != undefined && !isNaN(parseFloat(completion)) && isFinite(completion) && !isNaN(parseInt(parent)) && isFinite(parent)) {
+        pGanttVar.AddTaskItem(new task_1.TaskItem(id, name_1, start, end, itemClass, link, milestone, resourceName, completion, group, parent_1, open_1, dependsOn, caption, notes, pGanttVar, cost, planstart, planend, duration, bartext, additionalObject));
+        //}
+    }
+};
+
+},{"./task":10,"./utils/general_utils":13}],8:[function(require,module,exports){
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var es = {
+    'january': 'Enero',
+    'february': 'Febrero',
+    'march': 'Marzo',
+    'april': 'Abril',
+    'maylong': 'Mayo',
+    'june': 'Junio',
+    'july': 'Julio',
+    'august': 'Agosto',
+    'september': 'Septiembre',
+    'october': 'Octubre',
+    'november': 'Noviembre',
+    'december': 'Diciembre',
+    'jan': 'Ene',
+    'feb': 'Feb',
+    'mar': 'Mar',
+    'apr': 'Abr',
+    'may': 'May',
+    'jun': 'Jun',
+    'jul': 'Jul',
+    'aug': 'Ago',
+    'sep': 'Sep',
+    'oct': 'Oct',
+    'nov': 'Nov',
+    'dec': 'Dic',
+    'sunday': 'Domingo',
+    'monday': 'Lunes',
+    'tuesday': 'Martes',
+    'wednesday': 'Miércoles',
+    'thursday': 'Jueves',
+    'friday': 'Viernes',
+    'saturday': 'Sábado',
+    'sun': '	Dom',
+    'mon': '	Lun',
+    'tue': '	Mar',
+    'wed': '	Mie',
+    'thu': '	Jue',
+    'fri': '	Vie',
+    'sat': '	Sab',
+    'res': 'Recurso',
+    'dur': 'Duración',
+    'comp': '% Compl.',
+    'completion': 'Completado',
+    'startdate': 'Inicio',
+    'planstartdate': 'Inicio Planificado',
+    'cost': 'Coste',
+    'enddate': 'Fin',
+    'planenddate': 'Fin Planificado',
+    'moreinfo': 'Más Información',
+    'nodata': 'No tasks found',
+    'notes': 'Notas',
+    'format': 'Formato',
+    'hour': 'Hora',
+    'day': 'Día',
+    'week': 'Semana',
+    'month': 'Mes',
+    'quarter': 'Trimestre',
+    'hours': 'Horas',
+    'days': 'Días',
+    'weeks': 'Semanas',
+    'months': 'Meses',
+    'quarters': 'Trimestres',
+    'hr': 'h',
+    'dy': 'Día',
+    'wk': 'Sem.',
+    'mth': 'Mes',
+    'qtr': 'Trim.',
+    'hrs': 'h',
+    'dys': 'Días',
+    'wks': 'Sem.',
+    'mths': 'Meses',
+    'qtrs': 'Trim.',
+    'tooltipLoading': 'Cargando...'
+};
+exports.es = es;
+var en = {
+    'format': 'Format',
+    'hour': 'Hour',
+    'day': 'Day',
+    'week': 'Week',
+    'month': 'Month',
+    'quarter': 'Quarter',
+    'hours': 'Hours',
+    'days': 'Days',
+    'weeks': 'Weeks',
+    'months': 'Months',
+    'quarters': 'Quarters',
+    'hr': 'Hr',
+    'dy': 'Day',
+    'wk': 'Wk',
+    'mth': 'Mth',
+    'qtr': 'Qtr',
+    'hrs': 'Hrs',
+    'dys': 'Days',
+    'wks': 'Wks',
+    'mths': 'Mths',
+    'qtrs': 'Qtrs',
+    'res': 'Resource',
+    'dur': 'Duration',
+    'comp': '% Comp.',
+    'completion': 'Completion',
+    'startdate': 'Start Date',
+    'planstartdate': 'Plan Start Date',
+    'enddate': 'End Date',
+    'planenddate': 'Plan End Date',
+    'cost': 'Cost',
+    'moreinfo': 'More Information',
+    'nodata': 'No tasks found',
+    'notes': 'Notes',
+    'january': 'January',
+    'february': 'February',
+    'march': 'March',
+    'april': 'April',
+    'maylong': 'May',
+    'june': 'June',
+    'july': 'July',
+    'august': 'August',
+    'september': 'September',
+    'october': 'October',
+    'november': 'November',
+    'december': 'December',
+    'jan': 'Jan',
+    'feb': 'Feb',
+    'mar': 'Mar',
+    'apr': 'Apr',
+    'may': 'May',
+    'jun': 'Jun',
+    'jul': 'Jul',
+    'aug': 'Aug',
+    'sep': 'Sep',
+    'oct': 'Oct',
+    'nov': 'Nov',
+    'dec': 'Dec',
+    'sunday': 'Sunday',
+    'monday': 'Monday',
+    'tuesday': 'Tuesday',
+    'wednesday': 'Wednesday',
+    'thursday': 'Thursday',
+    'friday': 'Friday',
+    'saturday': 'Saturday',
+    'sun': 'Sun',
+    'mon': 'Mon',
+    'tue': 'Tue',
+    'wed': 'Wed',
+    'thu': 'Thu',
+    'fri': 'Fri',
+    'sat': 'Sat',
+    'tooltipLoading': 'Loading...'
+};
+exports.en = en;
+var de = {
+    'format': 'Ansicht',
+    'hour': 'Stunde',
+    'day': 'Tag',
+    'week': 'Woche',
+    'month': 'Monat',
+    'quarter': 'Quartal',
+    'hours': 'Stunden',
+    'days': 'Tage',
+    'weeks': 'Wochen',
+    'months': 'Monate',
+    'quarters': 'Quartale',
+    'hr': 'h',
+    'dy': 'T',
+    'wk': 'W',
+    'mth': 'M',
+    'qtr': 'Q',
+    'hrs': 'Std',
+    'dys': 'Tage',
+    'wks': 'Wochen',
+    'mths': 'Monate',
+    'qtrs': 'Quartal',
+    'res': 'Resource',
+    'dur': 'Dauer',
+    'comp': '%Fertig',
+    'completion': 'Fertigstellung',
+    'startdate': 'Erste Buchu',
+    'planstartdate': 'Erste Buchu Plan',
+    'enddate': 'Letzte Buchung',
+    'planenddate': 'Plan Letzte Buchung',
+    'cost': 'Cost',
+    'moreinfo': 'Weitere Infos',
+    'nodata': 'No tasks found',
+    'notes': 'Anmerkung',
+    'january': 'Jänner',
+    'february': 'Februar',
+    'march': 'März',
+    'april': 'April',
+    'maylong': 'Mai',
+    'june': 'Juni',
+    'july': 'Juli',
+    'august': 'August',
+    'september': 'September',
+    'october': 'Oktober',
+    'november': 'November',
+    'december': 'Dezember',
+    'jan': 'Jan',
+    'feb': 'Feb',
+    'mar': 'Mar',
+    'apr': 'Apr',
+    'may': 'Mai',
+    'jun': 'Jun',
+    'jul': 'Jul',
+    'aug': 'Aug',
+    'sep': 'Sep',
+    'oct': 'Okt',
+    'nov': 'Nov',
+    'dec': 'Dez',
+    'sunday': 'Sonntag',
+    'monday': 'Montag',
+    'tuesday': 'Dienstag',
+    'wednesday': 'Mittwoch',
+    'thursday': 'Donnerstag',
+    'friday': 'Freitag',
+    'saturday': 'Samstag',
+    'sun': 'So',
+    'mon': 'Mo', 'tue': 'Di', 'wed': 'Mi', 'thu': 'Do', 'fri': 'Fr', 'sat': 'Sa'
+};
+exports.de = de;
+var pt = {
+    'hours': 'Horas',
+    'days': 'Dias',
+    'weeks': 'Weeks',
+    'months': 'Months',
+    'quarters': 'Quarters',
+    'format': 'Formato',
+    'hour': 'Hora',
+    'day': 'Dia',
+    'week': 'Semana',
+    'month': 'Mês',
+    'quarter': 'Trimestre',
+    'hr': 'hr',
+    'dy': 'dia',
+    'wk': 'sem.',
+    'mth': 'mês',
+    'qtr': 'qtr',
+    'hrs': 'hrs',
+    'dys': 'dias',
+    'wks': 'sem.',
+    'mths': 'meses',
+    'qtrs': 'qtrs',
+    'completion': 'Terminado',
+    'comp': '% Completado',
+    'moreinfo': 'Mais informações',
+    'nodata': 'Sem atividades',
+    'notes': 'Notas',
+    'res': 'Responsável',
+    'dur': 'Duração',
+    'startdate': 'Data inicial',
+    'planstartdate': 'Plan Data inicial',
+    'enddate': 'Data final',
+    'planenddate': 'Plan Data final',
+    'cost': 'Custo',
+    'jan': 'Jan',
+    'feb': 'Fev',
+    'mar': 'Mar',
+    'apr': 'Abr',
+    'may': 'Mai',
+    'jun': 'Jun',
+    'jul': 'Jul',
+    'aug': 'Ago',
+    'sep': 'Set',
+    'oct': 'Out',
+    'nov': 'Nov',
+    'dec': 'Dez',
+    'january': 'Janeiro',
+    'february': 'Fevereiro',
+    'march': 'Março',
+    'april': 'Abril',
+    'maylong': 'Maio',
+    'june': 'Junho',
+    'july': 'Julho',
+    'august': 'Agosto',
+    'september': 'Setembro',
+    'october': 'Outubro',
+    'november': 'Novembro',
+    'december': 'Dezembro',
+    'sun': 'Dom',
+    'mon': 'Seg',
+    'tue': 'Ter',
+    'wed': 'Qua',
+    'thu': 'Qui',
+    'fri': 'Sex',
+    'sat': 'Sab'
+};
+exports.pt = pt;
+var ru = {
+    'january': 'Январь',
+    'february': 'Февраль',
+    'march': 'Март',
+    'april': 'Апрель',
+    'maylong': 'Май',
+    'june': 'Июнь',
+    'july': 'Июль',
+    'august': 'Август', 'september': 'Сентябрь',
+    'october': 'Октябрь',
+    'november': 'Ноябрь',
+    'december': 'Декабрь',
+    'jan': 'Янв',
+    'feb': 'Фев',
+    'mar': 'Мар',
+    'apr': 'Апр',
+    'may': 'Май',
+    'jun': 'Июн',
+    'jul': 'Июл',
+    'aug': 'Авг',
+    'sep': 'Сен',
+    'oct': 'Окт',
+    'nov': 'Ноя',
+    'dec': 'Дек',
+    'sunday': 'Воскресенье',
+    'monday': 'Понедельник',
+    'tuesday': 'Вторник',
+    'wednesday': 'Среда',
+    'thursday': 'Четверг',
+    'friday': 'Пятница',
+    'saturday': 'Суббота',
+    'sun': '	Вс',
+    'mon': '	Пн',
+    'tue': '	Вт',
+    'wed': '	Ср',
+    'thu': '	Чт',
+    'fri': '	Пт',
+    'sat': '	Сб',
+    'res': 'Ресурс',
+    'dur': 'Длительность',
+    'comp': '% выполнения',
+    'completion': 'Выполнено',
+    'startdate': 'Нач. дата',
+    'planstartdate': 'Plan Нач. дата',
+    'enddate': 'Кон. дата',
+    'planenddate': 'Plan Кон. дата',
+    'cost': 'Cost',
+    'moreinfo': 'Детали',
+    'nodata': 'No tasks found',
+    'notes': 'Заметки',
+    'format': 'Формат',
+    'hour': 'Час',
+    'day': 'День',
+    'week': 'Неделя',
+    'month': 'Месяц',
+    'quarter': 'Кварт',
+    'hours': 'Часов',
+    'days': 'Дней',
+    'weeks': 'Недель',
+    'months': 'Месяцев',
+    'quarters': 'Кварталов',
+    'hr': 'ч.',
+    'dy': 'дн.',
+    'wk': 'нед.',
+    'mth': 'мес.',
+    'qtr': 'кв.',
+    'hrs': 'ч.',
+    'dys': 'дн.',
+    'wks': 'нед.',
+    'mths': 'мес.',
+    'qtrs': 'кв.',
+    'tooltipLoading': 'Загрузка...'
+};
+exports.ru = ru;
+/**
+ * Mois : http://bdl.oqlf.gouv.qc.ca/bdl/gabarit_bdl.asp?id=3619
+   Jours : http://bdl.oqlf.gouv.qc.ca/bdl/gabarit_bdl.asp?id=3617
+ */
+var fr = {
+    'january': 'Janvier',
+    'february': 'Février',
+    'march': 'Mars',
+    'april': 'Avril',
+    'maylong': 'Mai',
+    'june': 'Juin',
+    'july': 'Juillet',
+    'august': 'Août',
+    'september': 'Septembre',
+    'october': 'Octobre',
+    'november': 'Novembre',
+    'december': 'Décembre',
+    'jan': 'Janv',
+    'feb': 'Févr',
+    'mar': 'Mars',
+    'apr': 'Avr',
+    'may': 'Mai',
+    'jun': 'Juin',
+    'jul': 'Juil',
+    'aug': 'Août',
+    'sep': 'Sept',
+    'oct': 'Oct',
+    'nov': 'Nov',
+    'dec': 'Déc',
+    'sunday': 'Dimanche',
+    'monday': 'Lundi',
+    'tuesday': 'Mardi',
+    'wednesday': 'Mercredi',
+    'thursday': 'Jeudi',
+    'friday': 'Vendredi',
+    'saturday': 'Samedi',
+    'sun': 'Dim',
+    'mon': 'Lun',
+    'tue': 'Mar',
+    'wed': 'Mer',
+    'thu': 'Jeu',
+    'fri': 'Ven',
+    'sat': 'Sam',
+    'res': 'Ressource',
+    'dur': 'Durée',
+    'comp': '% Term.',
+    'completion': 'Terminé',
+    'startdate': 'Début',
+    'planstartdate': 'Plan Début',
+    'enddate': 'Fin',
+    'planenddate': 'Plan Fin',
+    'cost': 'Cost',
+    'moreinfo': "Plus d'informations",
+    'nodata': 'No tasks found',
+    'notes': 'Notes',
+    'format': 'Format',
+    'hour': 'Heure',
+    'day': 'Jour',
+    'week': 'Semaine',
+    'month': 'Mois',
+    'quarter': 'Trimestre',
+    'hours': 'Heures',
+    'days': 'Jours',
+    'weeks': 'Semaines',
+    'months': 'Mois',
+    'quarters': 'Trimestres',
+    'hr': 'h',
+    'dy': 'j',
+    'wk': 'sem',
+    'mth': 'mois',
+    'qtr': 'tri',
+    'hrs': 'h',
+    'dys': 'j',
+    'wks': 'sem',
+    'mths': 'mois',
+    'qtrs': 'tri'
+};
+exports.fr = fr;
+var cn = {
+    'january': '一月',
+    'february': '二月',
+    'march': '三月',
+    'april': '四月',
+    'maylong': '五月',
+    'june': '六月',
+    'july': '七月',
+    'august': '八月',
+    'september': '九月',
+    'october': '十月',
+    'november': '十一月',
+    'december': '十二月',
+    'jan': '一月',
+    'feb': '二月',
+    'mar': '三月',
+    'apr': '四月',
+    'may': '五月',
+    'jun': '六月',
+    'jul': '七月',
+    'aug': '八月',
+    'sep': '九月',
+    'oct': '十月',
+    'nov': '十一月',
+    'dec': '十二月',
+    'sunday': '星期日',
+    'monday': '星期一',
+    'tuesday': '星期二',
+    'wednesday': '星期三',
+    'thursday': '星期四',
+    'friday': '星期五',
+    'saturday': '星期六',
+    'sun': '星期日',
+    'mon': '星期一',
+    'tue': '星期二',
+    'wed': '星期三',
+    'thu': '星期四',
+    'fri': '星期五',
+    'sat': '星期六',
+    'res': '資源',
+    'dur': '時程',
+    'comp': '達成率',
+    'completion': '達成',
+    'startdate': '起始日期',
+    'planstartdate': '計劃起始日期',
+    'enddate': '截止日期',
+    'planenddate': '計劃截止日期',
+    'cost': '成本',
+    'moreinfo': "更多資訊",
+    'nodata': 'No tasks found',
+    'notes': '備註',
+    'format': '格式',
+    'hour': '時',
+    'day': '日',
+    'week': '星期',
+    'month': '月',
+    'quarter': '季',
+    'hours': '小時',
+    'days': '天',
+    'weeks': '週',
+    'months': '月',
+    'quarters': '季',
+    'hr': '小時',
+    'dy': '天',
+    'wk': '週',
+    'mth': '月',
+    'qtr': '季',
+    'hrs': '小時',
+    'dys': '天',
+    'wks': '週',
+    'mths': '月',
+    'qtrs': '季'
+};
+exports.cn = cn;
+var sv = {
+    'format': 'Filter',
+    'hour': 'Timme',
+    'day': 'Dag',
+    'week': 'Vecka',
+    'month': 'Månad',
+    'quarter': 'Kvartal',
+    'hours': 'Timmar',
+    'days': 'Dagar',
+    'weeks': 'Veckor',
+    'months': 'Månader',
+    'quarters': 'Kvartal',
+    'hr': 'Timme',
+    'dy': 'Dag',
+    'wk': 'Vecka',
+    'mth': 'Månad',
+    'qtr': 'Q',
+    'hrs': 'Timmar',
+    'dys': 'Dagar',
+    'wks': 'Veckor',
+    'mths': 'Månader',
+    'qtrs': 'Q',
+    'res': 'Resurs',
+    'dur': 'Tidsåtgång',
+    'comp': '% klart',
+    'completion': 'Klart',
+    'startdate': 'Startdatum',
+    'planstartdate': 'Planerad startdatum',
+    'enddate': 'Slutdatum',
+    'planenddate': 'Planerad slutdatum',
+    'cost': 'Kostnad',
+    'moreinfo': 'Mer Information',
+    'nodata': 'No tasks found',
+    'notes': 'Notes',
+    'january': 'januari',
+    'february': 'februari',
+    'march': 'mars',
+    'april': 'april',
+    'maylong': 'maj',
+    'june': 'juni',
+    'july': 'juli',
+    'august': 'augusti',
+    'september': 'september',
+    'october': 'oktober',
+    'november': 'november',
+    'december': 'december',
+    'jan': 'jan',
+    'feb': 'feb',
+    'mar': 'mar',
+    'apr': 'apr',
+    'may': 'maj',
+    'jun': 'jun',
+    'jul': 'jul',
+    'aug': 'aug',
+    'sep': 'sep',
+    'oct': 'okt',
+    'nov': 'nov',
+    'dec': 'dec',
+    'sunday': 'söndag',
+    'monday': 'måndag',
+    'tuesday': 'tisdag',
+    'wednesday': 'onsdag',
+    'thursday': 'torsdag',
+    'friday': 'fredag',
+    'saturday': 'lördag',
+    'sun': 'sön',
+    'mon': 'mån',
+    'tue': 'tis',
+    'wed': 'ons',
+    'thu': 'tor',
+    'fri': 'fre',
+    'sat': 'lör'
+};
+exports.sv = sv;
+var nl = {
+    'format': 'Format',
+    'hour': 'Uur',
+    'day': 'Dag',
+    'week': 'Week',
+    'month': 'Maand',
+    'quarter': 'Kwartaal',
+    'hours': 'Uren',
+    'days': 'Dagen',
+    'weeks': 'Weken',
+    'months': 'Maanden',
+    'quarters': 'Kwartalen',
+    'hr': 'uur',
+    'dy': 'dag',
+    'wk': 'wk',
+    'mth': 'mnd',
+    'qtr': 'kw',
+    'hrs': 'uren',
+    'dys': 'dagen',
+    'wks': 'weken',
+    'mths': 'maanden',
+    'qtrs': 'kwartalen',
+    'res': 'Resource',
+    'dur': 'Doorlooptijd',
+    'comp': '% gereed',
+    'completion': 'Gereed',
+    'startdate': 'Startdatum',
+    'planstartdate': 'Geplande startdatum',
+    'enddate': 'Einddatum',
+    'planenddate': 'Geplande einddatum',
+    'cost': 'Kosten',
+    'moreinfo': 'Meer informatie',
+    'nodata': 'No tasks found',
+    'notes': 'Notities',
+    'january': 'januari',
+    'february': 'februari',
+    'march': 'maart',
+    'april': 'april',
+    'maylong': 'mei',
+    'june': 'juni',
+    'july': 'juli',
+    'august': 'augustus',
+    'september': 'september',
+    'october': 'oktober',
+    'november': 'november',
+    'december': 'december',
+    'jan': 'jan',
+    'feb': 'feb',
+    'mar': 'mrt',
+    'apr': 'apr',
+    'may': 'mei',
+    'jun': 'jun',
+    'jul': 'jul',
+    'aug': 'aug',
+    'sep': 'sep',
+    'oct': 'okt',
+    'nov': 'nov',
+    'dec': 'dec',
+    'sunday': 'zondag',
+    'monday': 'maandag',
+    'tuesday': 'dinsdag',
+    'wednesday': 'woensdag',
+    'thursday': 'donderdag',
+    'friday': 'vrijdag',
+    'saturday': 'zaterdag',
+    'sun': 'zo',
+    'mon': 'ma',
+    'tue': 'di',
+    'wed': 'wo',
+    'thu': 'do',
+    'fri': 'vr',
+    'sat': 'za'
+};
+exports.nl = nl;
+var id = {
+    'format': 'Format',
+    'hour': 'Jam',
+    'day': 'Hari',
+    'week': 'Minggu',
+    'month': 'Bulan',
+    'quarter': 'Kuartal',
+    'hours': 'Jam',
+    'days': 'Hari',
+    'weeks': 'Minggu',
+    'months': 'Bulan',
+    'quarters': 'Kuartal',
+    'hr': 'Jam',
+    'dy': 'Hari',
+    'wk': 'Min',
+    'mth': 'Bln',
+    'qtr': 'Krtl',
+    'hrs': 'Jam',
+    'dys': 'Hari',
+    'wks': 'Min',
+    'mths': 'Bln',
+    'qtrs': 'Krtl',
+    'res': 'Sumber Daya',
+    'dur': 'Durasi',
+    'comp': '% Penyelesaian',
+    'completion': 'Penyelesaian',
+    'startdate': 'Tanggal Mulai',
+    'planstartdate': 'Perencanaan Tanggal Mulai',
+    'enddate': 'Tanggal Akhir',
+    'planenddate': 'Perencanaan Tanggal Akhir',
+    'cost': 'Biaya',
+    'moreinfo': 'Informasi Lebih Lanjut',
+    'nodata': 'No tasks found',
+    'notes': 'Catatan',
+    'january': 'Januari',
+    'february': 'Februari',
+    'march': 'Maret',
+    'april': 'April',
+    'maylong': 'Mei',
+    'june': 'Juni',
+    'july': 'Juli',
+    'august': 'Agustus',
+    'september': 'September',
+    'october': 'Oktober',
+    'november': 'November',
+    'december': 'Desember',
+    'jan': 'Jan',
+    'feb': 'Feb',
+    'mar': 'Mar',
+    'apr': 'Apr',
+    'may': 'Mei',
+    'jun': 'Jun',
+    'jul': 'Jul',
+    'aug': 'Agu',
+    'sep': 'Sep',
+    'oct': 'Okt',
+    'nov': 'Nov',
+    'dec': 'Des',
+    'sunday': 'Minggu',
+    'monday': 'Senin',
+    'tuesday': 'Selasa',
+    'wednesday': 'Rabu',
+    'thursday': 'Kamis',
+    'friday': 'Jumat',
+    'saturday': 'Sabtu',
+    'sun': 'Min',
+    'mon': 'Sen',
+    'tue': 'Sel',
+    'wed': 'Rab',
+    'thu': 'Kam',
+    'fri': 'Jum',
+    'sat': 'Sab'
+};
+exports.id = id;
+var tr = {
+    'format': 'Biçim',
+    'hour': 'Saat',
+    'day': 'Gün',
+    'week': 'Hafta',
+    'month': 'Ay',
+    'quarter': 'Çeyrek Yıl',
+    'hours': 'Saat',
+    'days': 'Gün',
+    'weeks': 'Hafta',
+    'months': 'Ay',
+    'quarters': 'Çeyrek Yıl',
+    'hr': 'Saat',
+    'dy': 'Gün',
+    'wk': 'Hft',
+    'mth': 'Ay',
+    'qtr': 'Çyrk',
+    'hrs': 'Saat',
+    'dys': 'Gün',
+    'wks': 'Hft',
+    'mths': 'Ay',
+    'qtrs': 'Çyrk',
+    'res': 'Kaynak',
+    'dur': 'Süre',
+    'comp': '% Tamamlanma.',
+    'completion': 'Tamamlanma',
+    'startdate': 'Başlangıç Tarihi',
+    'planstartdate': 'Plan Başlama Tarihi',
+    'enddate': 'Bitiş Tarihi',
+    'planenddate': 'Plan Bitiş Tarihi',
+    'cost': 'Tutar',
+    'moreinfo': 'Daha Fazla Bilgi',
+    'nodata': 'No tasks found',
+    'notes': 'Notlar',
+    'january': 'Ocak',
+    'february': 'Şubat',
+    'march': 'Mart',
+    'april': 'Nisan',
+    'maylong': 'Mayıs',
+    'june': 'Haziran',
+    'july': 'Temmuz',
+    'august': 'Ağustos',
+    'september': 'Eylül',
+    'october': 'Ekim',
+    'november': 'Kasım',
+    'december': 'Aralık',
+    'jan': 'Oca',
+    'feb': 'Şub',
+    'mar': 'Mar',
+    'apr': 'Nis',
+    'may': 'May',
+    'jun': 'Haz',
+    'jul': 'Tem',
+    'aug': 'Ağu',
+    'sep': 'Eyl',
+    'oct': 'Eki',
+    'nov': 'Kas',
+    'dec': 'Ara',
+    'sunday': 'Pazar',
+    'monday': 'Pazartesi',
+    'tuesday': 'Salı',
+    'wednesday': 'Çarşamba',
+    'thursday': 'Perşembe',
+    'friday': 'Cuma',
+    'saturday': 'Cumartesi',
+    'sun': 'Paz',
+    'mon': 'Pzt',
+    'tue': 'Sal',
+    'wed': 'Çrş',
+    'thu': 'Prş',
+    'fri': 'Cum',
+    'sat': 'Cmt'
+};
+exports.tr = tr;
+var ja = {
+    'format': 'タイムライン表示',
+    'hour': '時',
+    'day': '日',
+    'week': '週',
+    'month': '月',
+    'quarter': '四半期',
+    'hours': '時間',
+    'days': '日間',
+    'weeks': '週間',
+    'months': '月間',
+    'quarters': '四半期',
+    'hr': '時',
+    'dy': '日',
+    'wk': '週',
+    'mth': '月',
+    'qtr': '四',
+    'hrs': '時間',
+    'dys': '日間',
+    'wks': '週間',
+    'mths': '月間',
+    'qtrs': '四半期',
+    'res': 'リソース',
+    'dur': '期間',
+    'comp': '進捗率',
+    'completion': '進捗率',
+    'startdate': '開始日',
+    'planstartdate': '予定開始日',
+    'enddate': '期日',
+    'planenddate': '予定期日',
+    'cost': 'コスト',
+    'moreinfo': '詳細',
+    'nodata': 'No tasks found',
+    'notes': 'ノート',
+    'january': '1月',
+    'february': '2月',
+    'march': '3月',
+    'april': '4月',
+    'maylong': '5月',
+    'june': '6月',
+    'july': '7月',
+    'august': '8月',
+    'september': '9月',
+    'october': '10月',
+    'november': '11月',
+    'december': '12月',
+    'jan': '1月',
+    'feb': '2月',
+    'mar': '3月',
+    'apr': '4月',
+    'may': '5月',
+    'jun': '6月',
+    'jul': '7月',
+    'aug': '8月',
+    'sep': '9月',
+    'oct': '10月',
+    'nov': '11月',
+    'dec': '12月',
+    'sunday': '日曜日',
+    'monday': '月曜日',
+    'tuesday': '火曜日',
+    'wednesday': '水曜日',
+    'thursday': '木曜日',
+    'friday': '金曜日',
+    'saturday': '土曜日',
+    'sun': '日',
+    'mon': '月',
+    'tue': '火',
+    'wed': '水',
+    'thu': '木',
+    'fri': '金',
+    'sat': '土',
+    'tooltipLoading': 'ローディング中...'
+};
+exports.ja = ja;
+var cs = {
+    'format': 'Zobrazení',
+    'hour': 'Hodina',
+    'day': 'Den',
+    'week': 'Týden',
+    'month': 'Měsíc',
+    'quarter': 'Kvartál',
+    'hours': 'Hodiny',
+    'days': 'Dni',
+    'weeks': 'Týdny',
+    'months': 'Měsíce',
+    'quarters': 'Kvartály',
+    'hr': 'Ho',
+    'dy': 'Den',
+    'wk': 'Tyd',
+    'mth': 'Měs',
+    'qtr': 'Kvar',
+    'hrs': 'Ho',
+    'dys': 'Dni',
+    'wks': 'Tyd',
+    'mths': 'Měs',
+    'qtrs': 'Kvar',
+    'res': 'Přiřazeno',
+    'dur': 'Trvání',
+    'comp': '% Hotovo',
+    'completion': 'Hotovo',
+    'startdate': 'Start',
+    'planstartdate': 'Plánovaný start',
+    'enddate': 'Konec',
+    'planenddate': 'Plánovaný konec',
+    'cost': 'Náklady',
+    'moreinfo': 'Více informací',
+    'nodata': 'No tasks found',
+    'notes': 'Poznámky',
+    'january': 'Leden',
+    'february': 'Únor',
+    'march': 'Březen',
+    'april': 'Duben',
+    'maylong': 'Květen',
+    'june': 'Červen',
+    'july': 'Červenec',
+    'august': 'Srpen',
+    'september': 'Září',
+    'october': 'Říjen',
+    'november': 'Listopad',
+    'december': 'Prosinec',
+    'jan': 'Led',
+    'feb': 'Úno',
+    'mar': 'Bře',
+    'apr': 'Dub',
+    'may': 'Kvě',
+    'jun': 'Čer',
+    'jul': 'Čvc',
+    'aug': 'Srp',
+    'sep': 'Zář',
+    'oct': 'Říj',
+    'nov': 'Lis',
+    'dec': 'Pro',
+    'sunday': 'Neděle',
+    'monday': 'Pondělí',
+    'tuesday': 'Úterý',
+    'wednesday': 'Středa',
+    'thursday': 'Čtvrtek',
+    'friday': 'Pátek',
+    'saturday': 'Sobota',
+    'sun': 'Ne',
+    'mon': 'Po',
+    'tue': 'Út',
+    'wed': 'St',
+    'thu': 'Čt',
+    'fri': 'Pa',
+    'sat': 'So',
+    'tooltipLoading': 'Nahrávám...'
+};
+exports.cs = cs;
+var hu = {
+    'format': 'Formátum',
+    'hour': 'Óra',
+    'day': 'Nap',
+    'week': 'Hét',
+    'month': 'Hónap',
+    'quarter': 'Negyedév ',
+    'hours': 'Órák',
+    'days': 'Nap',
+    'weeks': 'Hét',
+    'months': 'Hónap',
+    'quarters': 'Negyedév',
+    'hr': 'Ó',
+    'dy': 'Nap',
+    'wk': 'Hét',
+    'mth': 'Hó',
+    'qtr': 'NÉ',
+    'hrs': 'Óra',
+    'dys': 'Nap',
+    'wks': 'Hét',
+    'mths': 'Hó',
+    'qtrs': 'NÉ',
+    'res': 'Erőforrás',
+    'dur': 'Időtartam',
+    'comp': '% Kész',
+    'completion': 'Elkészült',
+    'startdate': 'Kezdés',
+    'planstartdate': 'Tervezett kezdés',
+    'enddate': 'Befejezés',
+    'planenddate': 'Tervezett befejezés',
+    'cost': 'Költség',
+    'moreinfo': 'További információ',
+    'nodata': 'No tasks found',
+    'notes': 'Jegyzetek',
+    'january': 'Január',
+    'february': 'Február',
+    'march': 'Március',
+    'april': 'Április',
+    'maylong': 'Május',
+    'june': 'Június',
+    'july': 'Július',
+    'august': 'Augusztus',
+    'september': 'Szeptember',
+    'october': 'Október',
+    'november': 'November',
+    'december': 'December',
+    'jan': 'Jan',
+    'feb': 'Feb',
+    'mar': 'Már',
+    'apr': 'Ápr',
+    'may': 'Máj',
+    'jun': 'Jún',
+    'jul': 'Júl',
+    'aug': 'Aug',
+    'sep': 'Szep',
+    'oct': 'Okt',
+    'nov': 'Nov',
+    'dec': 'Dec',
+    'sunday': 'Vasárnap',
+    'monday': 'Hétfő',
+    'tuesday': 'Kedd',
+    'wednesday': 'Szerda',
+    'thursday': 'Csütörtök',
+    'friday': 'Péntek',
+    'saturday': 'Szombat',
+    'sun': 'Vas',
+    'mon': 'Hé',
+    'tue': 'Ke',
+    'wed': 'Sze',
+    'thu': 'Csü',
+    'fri': 'Pén',
+    'sat': 'Szo',
+    'tooltipLoading': 'Belöltés...'
+};
+exports.hu = hu;
+var ko = {
+    'format': '구분',
+    'hour': '시',
+    'day': '일',
+    'week': '주',
+    'month': '월',
+    'quarter': '분기',
+    'hours': '시',
+    'days': '일',
+    'weeks': '주',
+    'months': '월',
+    'quarters': '분기',
+    'hr': '시',
+    'dy': '일',
+    'wk': '주',
+    'mth': '월',
+    'qtr': '분기',
+    'hrs': '시',
+    'dys': '일',
+    'wks': '주',
+    'mths': '월',
+    'qtrs': '분기',
+    'res': '이름',
+    'dur': '기간',
+    'comp': '% ',
+    'completion': '완료',
+    'startdate': '시작일자',
+    'planstartdate': '계획 시작일자',
+    'enddate': '종료일자',
+    'planenddate': '계획 종료일자',
+    'cost': '비용',
+    'moreinfo': '더 많은 정보',
+    'nodata': 'No tasks found',
+    'notes': '비고',
+    'january': '1월',
+    'february': '2월',
+    'march': '3월',
+    'april': '4월',
+    'maylong': '5월',
+    'june': '6월',
+    'july': '7월',
+    'august': '8월',
+    'september': '9월',
+    'october': '10월',
+    'november': '11월',
+    'december': '12월',
+    'jan': '1',
+    'feb': '2',
+    'mar': '3',
+    'apr': '4',
+    'may': '5',
+    'jun': '6',
+    'jul': '7',
+    'aug': '8',
+    'sep': '9',
+    'oct': '10',
+    'nov': '11',
+    'dec': '12',
+    'sunday': '일요일',
+    'monday': '월요일',
+    'tuesday': '화요일',
+    'wednesday': '수요일',
+    'thursday': '목요일',
+    'friday': '금요일',
+    'saturday': '토요일',
+    'sun': '일',
+    'mon': '월',
+    'tue': '화',
+    'wed': '수',
+    'thu': '목',
+    'fri': '금',
+    'sat': '토',
+    'tooltipLoading': '로딩중...'
+};
+exports.ko = ko;
+
+},{}],9:[function(require,module,exports){
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var date_utils_1 = require("./utils/date_utils");
+var draw_columns_1 = require("./draw_columns");
+exports.includeGetSet = function () {
+    /**
+     * SETTERS
+     */
+    this.setOptions = function (options) {
+        var keys = Object.keys(options);
+        for (var i = 0; i < keys.length; i++) {
+            var key = keys[i];
+            var val = options[key];
+            if (key === 'vResources' || key === 'vColumnOrder') {
+                // ev = `this.set${key.substr(1)}(val)`;
+                this['set' + key.substr(1)](val);
+            }
+            else if (val instanceof Array) {
+                // ev = `this.set${key.substr(1)}(...val)`;
+                this['set' + key.substr(1)].apply(this, val);
+            }
+            else {
+                // ev = `this.set${key.substr(1)}(val)`;
+                this['set' + key.substr(1)](val);
+            }
+        }
+    };
+    this.setUseFade = function (pVal) { this.vUseFade = pVal; };
+    this.setUseMove = function (pVal) { this.vUseMove = pVal; };
+    this.setUseRowHlt = function (pVal) { this.vUseRowHlt = pVal; };
+    this.setUseToolTip = function (pVal) { this.vUseToolTip = pVal; };
+    this.setUseSort = function (pVal) { this.vUseSort = pVal; };
+    this.setUseSingleCell = function (pVal) { this.vUseSingleCell = pVal * 1; };
+    this.setFormatArr = function () {
+        var vValidFormats = 'hour day week month quarter';
+        this.vFormatArr = new Array();
+        for (var i = 0, j = 0; i < arguments.length; i++) {
+            if (vValidFormats.indexOf(arguments[i].toLowerCase()) != -1 && arguments[i].length > 1) {
+                this.vFormatArr[j++] = arguments[i].toLowerCase();
+                var vRegExp = new RegExp('(?:^|\s)' + arguments[i] + '(?!\S)', 'g');
+                vValidFormats = vValidFormats.replace(vRegExp, '');
+            }
+        }
+    };
+    this.setShowRes = function (pVal) { this.vShowRes = pVal; };
+    this.setShowDur = function (pVal) { this.vShowDur = pVal; };
+    this.setShowComp = function (pVal) { this.vShowComp = pVal; };
+    this.setShowStartDate = function (pVal) { this.vShowStartDate = pVal; };
+    this.setShowEndDate = function (pVal) { this.vShowEndDate = pVal; };
+    this.setShowPlanStartDate = function (pVal) { this.vShowPlanStartDate = pVal; };
+    this.setShowPlanEndDate = function (pVal) { this.vShowPlanEndDate = pVal; };
+    this.setShowCost = function (pVal) { this.vShowCost = pVal; };
+    this.setShowAddEntries = function (pVal) { this.vShowAddEntries = pVal; };
+    this.setShowTaskInfoRes = function (pVal) { this.vShowTaskInfoRes = pVal; };
+    this.setShowTaskInfoDur = function (pVal) { this.vShowTaskInfoDur = pVal; };
+    this.setShowTaskInfoComp = function (pVal) { this.vShowTaskInfoComp = pVal; };
+    this.setShowTaskInfoStartDate = function (pVal) { this.vShowTaskInfoStartDate = pVal; };
+    this.setShowTaskInfoEndDate = function (pVal) { this.vShowTaskInfoEndDate = pVal; };
+    this.setShowTaskInfoNotes = function (pVal) { this.vShowTaskInfoNotes = pVal; };
+    this.setShowTaskInfoLink = function (pVal) { this.vShowTaskInfoLink = pVal; };
+    this.setShowEndWeekDate = function (pVal) { this.vShowEndWeekDate = pVal; };
+    this.setShowWeekends = function (pVal) { this.vShowWeekends = pVal; };
+    this.setShowSelector = function () {
+        var vValidSelectors = 'top bottom';
+        this.vShowSelector = new Array();
+        for (var i = 0, j = 0; i < arguments.length; i++) {
+            if (vValidSelectors.indexOf(arguments[i].toLowerCase()) != -1 && arguments[i].length > 1) {
+                this.vShowSelector[j++] = arguments[i].toLowerCase();
+                var vRegExp = new RegExp('(?:^|\s)' + arguments[i] + '(?!\S)', 'g');
+                vValidSelectors = vValidSelectors.replace(vRegExp, '');
+            }
+        }
+    };
+    this.setShowDeps = function (pVal) { this.vShowDeps = pVal; };
+    this.setDateInputFormat = function (pVal) { this.vDateInputFormat = pVal; };
+    this.setDateTaskTableDisplayFormat = function (pVal) { this.vDateTaskTableDisplayFormat = date_utils_1.parseDateFormatStr(pVal); };
+    this.setDateTaskDisplayFormat = function (pVal) { this.vDateTaskDisplayFormat = date_utils_1.parseDateFormatStr(pVal); };
+    this.setHourMajorDateDisplayFormat = function (pVal) { this.vHourMajorDateDisplayFormat = date_utils_1.parseDateFormatStr(pVal); };
+    this.setHourMinorDateDisplayFormat = function (pVal) { this.vHourMinorDateDisplayFormat = date_utils_1.parseDateFormatStr(pVal); };
+    this.setDayMajorDateDisplayFormat = function (pVal) { this.vDayMajorDateDisplayFormat = date_utils_1.parseDateFormatStr(pVal); };
+    this.setDayMinorDateDisplayFormat = function (pVal) { this.vDayMinorDateDisplayFormat = date_utils_1.parseDateFormatStr(pVal); };
+    this.setWeekMajorDateDisplayFormat = function (pVal) { this.vWeekMajorDateDisplayFormat = date_utils_1.parseDateFormatStr(pVal); };
+    this.setWeekMinorDateDisplayFormat = function (pVal) { this.vWeekMinorDateDisplayFormat = date_utils_1.parseDateFormatStr(pVal); };
+    this.setMonthMajorDateDisplayFormat = function (pVal) { this.vMonthMajorDateDisplayFormat = date_utils_1.parseDateFormatStr(pVal); };
+    this.setMonthMinorDateDisplayFormat = function (pVal) { this.vMonthMinorDateDisplayFormat = date_utils_1.parseDateFormatStr(pVal); };
+    this.setQuarterMajorDateDisplayFormat = function (pVal) { this.vQuarterMajorDateDisplayFormat = date_utils_1.parseDateFormatStr(pVal); };
+    this.setQuarterMinorDateDisplayFormat = function (pVal) { this.vQuarterMinorDateDisplayFormat = date_utils_1.parseDateFormatStr(pVal); };
+    this.setCaptionType = function (pType) { this.vCaptionType = pType; };
+    this.setFormat = function (pFormat) {
+        this.vFormat = pFormat;
+        this.Draw();
+    };
+    this.setWorkingDays = function (workingDays) { this.vWorkingDays = workingDays; };
+    this.setMinGpLen = function (pMinGpLen) { this.vMinGpLen = pMinGpLen; };
+    this.setScrollTo = function (pDate) { this.vScrollTo = pDate; };
+    this.setHourColWidth = function (pWidth) { this.vHourColWidth = pWidth; };
+    this.setDayColWidth = function (pWidth) { this.vDayColWidth = pWidth; };
+    this.setWeekColWidth = function (pWidth) { this.vWeekColWidth = pWidth; };
+    this.setMonthColWidth = function (pWidth) { this.vMonthColWidth = pWidth; };
+    this.setQuarterColWidth = function (pWidth) { this.vQuarterColWidth = pWidth; };
+    this.setRowHeight = function (pHeight) { this.vRowHeight = pHeight; };
+    this.setLang = function (pLang) { if (this.vLangs[pLang])
+        this.vLang = pLang; };
+    this.setChartBody = function (pDiv) { if (typeof HTMLDivElement !== 'function' || pDiv instanceof HTMLDivElement)
+        this.vChartBody = pDiv; };
+    this.setChartHead = function (pDiv) { if (typeof HTMLDivElement !== 'function' || pDiv instanceof HTMLDivElement)
+        this.vChartHead = pDiv; };
+    this.setListBody = function (pDiv) { if (typeof HTMLDivElement !== 'function' || pDiv instanceof HTMLDivElement)
+        this.vListBody = pDiv; };
+    this.setChartTable = function (pTable) { if (typeof HTMLTableElement !== 'function' || pTable instanceof HTMLTableElement)
+        this.vChartTable = pTable; };
+    this.setLines = function (pDiv) { if (typeof HTMLDivElement !== 'function' || pDiv instanceof HTMLDivElement)
+        this.vLines = pDiv; };
+    this.setLineOptions = function (lineOptions) { this.vLineOptions = lineOptions; };
+    this.setTimer = function (pVal) { this.vTimer = pVal * 1; };
+    this.setTooltipDelay = function (pVal) { this.vTooltipDelay = pVal * 1; };
+    this.setTooltipTemplate = function (pVal) { this.vTooltipTemplate = pVal; };
+    this.setMinDate = function (pVal) { this.vMinDate = pVal; };
+    this.setMaxDate = function (pVal) { this.vMaxDate = pVal; };
+    this.addLang = function (pLang, pVals) {
+        if (!this.vLangs[pLang]) {
+            this.vLangs[pLang] = new Object();
+            for (var vKey in this.vLangs['en'])
+                this.vLangs[pLang][vKey] = (pVals[vKey]) ? document.createTextNode(pVals[vKey]).data : this.vLangs['en'][vKey];
+        }
+    };
+    this.setTotalHeight = function (pVal) { this.vTotalHeight = pVal; };
+    // EVENTS
+    this.setEvents = function (pEvents) { this.vEvents = pEvents; };
+    this.setEventsChange = function (pEventsChange) { this.vEventsChange = pEventsChange; };
+    this.setEventClickRow = function (fn) { this.vEventClickRow = fn; };
+    this.setEventClickCollapse = function (fn) { this.vEventClickCollapse = fn; };
+    this.setResources = function (resources) { this.vResources = resources; };
+    this.setAdditionalHeaders = function (headers) { this.vAdditionalHeaders = headers; };
+    this.setColumnOrder = function (order) { this.vColumnOrder = order; };
+    this.setEditable = function (editable) { this.vEditable = editable; };
+    this.setDebug = function (debug) { this.vDebug = debug; };
+    /**
+     * GETTERS
+     */
+    this.getDivId = function () { return this.vDivId; };
+    this.getUseFade = function () { return this.vUseFade; };
+    this.getUseMove = function () { return this.vUseMove; };
+    this.getUseRowHlt = function () { return this.vUseRowHlt; };
+    this.getUseToolTip = function () { return this.vUseToolTip; };
+    this.getUseSort = function () { return this.vUseSort; };
+    this.getUseSingleCell = function () { return this.vUseSingleCell; };
+    this.getFormatArr = function () { return this.vFormatArr; };
+    this.getShowRes = function () { return this.vShowRes; };
+    this.getShowDur = function () { return this.vShowDur; };
+    this.getShowComp = function () { return this.vShowComp; };
+    this.getShowStartDate = function () { return this.vShowStartDate; };
+    this.getShowEndDate = function () { return this.vShowEndDate; };
+    this.getShowPlanStartDate = function () { return this.vShowPlanStartDate; };
+    this.getShowPlanEndDate = function () { return this.vShowPlanEndDate; };
+    this.getShowCost = function () { return this.vShowCost; };
+    this.getShowAddEntries = function () { return this.vShowAddEntries; };
+    this.getShowTaskInfoRes = function () { return this.vShowTaskInfoRes; };
+    this.getShowTaskInfoDur = function () { return this.vShowTaskInfoDur; };
+    this.getShowTaskInfoComp = function () { return this.vShowTaskInfoComp; };
+    this.getShowTaskInfoStartDate = function () { return this.vShowTaskInfoStartDate; };
+    this.getShowTaskInfoEndDate = function () { return this.vShowTaskInfoEndDate; };
+    this.getShowTaskInfoNotes = function () { return this.vShowTaskInfoNotes; };
+    this.getShowTaskInfoLink = function () { return this.vShowTaskInfoLink; };
+    this.getShowEndWeekDate = function () { return this.vShowEndWeekDate; };
+    this.getShowWeekends = function () { return this.vShowWeekends; };
+    this.getShowSelector = function () { return this.vShowSelector; };
+    this.getShowDeps = function () { return this.vShowDeps; };
+    this.getDateInputFormat = function () { return this.vDateInputFormat; };
+    this.getDateTaskTableDisplayFormat = function () { return this.vDateTaskTableDisplayFormat; };
+    this.getDateTaskDisplayFormat = function () { return this.vDateTaskDisplayFormat; };
+    this.getHourMajorDateDisplayFormat = function () { return this.vHourMajorDateDisplayFormat; };
+    this.getHourMinorDateDisplayFormat = function () { return this.vHourMinorDateDisplayFormat; };
+    this.getDayMajorDateDisplayFormat = function () { return this.vDayMajorDateDisplayFormat; };
+    this.getDayMinorDateDisplayFormat = function () { return this.vDayMinorDateDisplayFormat; };
+    this.getWeekMajorDateDisplayFormat = function () { return this.vWeekMajorDateDisplayFormat; };
+    this.getWeekMinorDateDisplayFormat = function () { return this.vWeekMinorDateDisplayFormat; };
+    this.getMonthMajorDateDisplayFormat = function () { return this.vMonthMajorDateDisplayFormat; };
+    this.getMonthMinorDateDisplayFormat = function () { return this.vMonthMinorDateDisplayFormat; };
+    this.getQuarterMajorDateDisplayFormat = function () { return this.vQuarterMajorDateDisplayFormat; };
+    this.getQuarterMinorDateDisplayFormat = function () { return this.vQuarterMinorDateDisplayFormat; };
+    this.getCaptionType = function () { return this.vCaptionType; };
+    this.getMinGpLen = function () { return this.vMinGpLen; };
+    this.getScrollTo = function () { return this.vScrollTo; };
+    this.getHourColWidth = function () { return this.vHourColWidth; };
+    this.getDayColWidth = function () { return this.vDayColWidth; };
+    this.getWeekColWidth = function () { return this.vWeekColWidth; };
+    this.getMonthColWidth = function () { return this.vMonthColWidth; };
+    this.getQuarterColWidth = function () { return this.vQuarterColWidth; };
+    this.getRowHeight = function () { return this.vRowHeight; };
+    this.getChartBody = function () { return this.vChartBody; };
+    this.getChartHead = function () { return this.vChartHead; };
+    this.getListBody = function () { return this.vListBody; };
+    this.getChartTable = function () { return this.vChartTable; };
+    this.getLines = function () { return this.vLines; };
+    this.getTimer = function () { return this.vTimer; };
+    this.getMinDate = function () { return this.vMinDate; };
+    this.getMaxDate = function () { return this.vMaxDate; };
+    this.getTooltipDelay = function () { return this.vTooltipDelay; };
+    this.getList = function () { return this.vTaskList; };
+    //EVENTS
+    this.getEventsClickCell = function () { return this.vEvents; };
+    this.getEventsChange = function () { return this.vEventsChange; };
+    this.getEventClickRow = function () { return this.vEventClickRow; };
+    this.getEventClickCollapse = function () { return this.vEventClickCollapse; };
+    this.getResources = function () { return this.vResources; };
+    this.getAdditionalHeaders = function () { return this.vAdditionalHeaders; };
+    this.getColumnOrder = function () { return this.vColumnOrder || draw_columns_1.COLUMN_ORDER; };
+};
+
+},{"./draw_columns":3,"./utils/date_utils":11}],10:[function(require,module,exports){
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var general_utils_1 = require("./utils/general_utils");
+var draw_utils_1 = require("./utils/draw_utils");
+var date_utils_1 = require("./utils/date_utils");
 // function to open window to display task link
-JSGantt.taskLink=function(pRef,pWidth,pHeight)
-{
-
-	if(pWidth) var vWidth =pWidth; else vWidth =400;
-	if(pHeight) var vHeight=pHeight; else vHeight=400;
-
-	var OpenWindow=window.open(pRef, 'newwin', 'height='+vHeight+',width='+vWidth);
+exports.taskLink = function (pRef, pWidth, pHeight) {
+    var vWidth, vHeight;
+    if (pWidth)
+        vWidth = pWidth;
+    else
+        vWidth = 400;
+    if (pHeight)
+        vHeight = pHeight;
+    else
+        vHeight = 400;
+    window.open(pRef, 'newwin', 'height=' + vHeight + ',width=' + vWidth); // let OpenWindow = 
+};
+exports.sortTasks = function (pList, pID, pIdx) {
+    if (pList.length < 2) {
+        return pIdx;
+    }
+    var sortIdx = pIdx;
+    var sortArr = new Array();
+    for (var i = 0; i < pList.length; i++) {
+        if (pList[i].getParent() == pID)
+            sortArr.push(pList[i]);
+    }
+    if (sortArr.length > 0) {
+        sortArr.sort(function (a, b) {
+            var i = a.getStart().getTime() - b.getStart().getTime();
+            if (i == 0)
+                i = a.getEnd().getTime() - b.getEnd().getTime();
+            if (i == 0)
+                return a.getID() - b.getID();
+            else
+                return i;
+        });
+    }
+    for (var j = 0; j < sortArr.length; j++) {
+        for (var i = 0; i < pList.length; i++) {
+            if (pList[i].getID() == sortArr[j].getID()) {
+                pList[i].setSortIdx(sortIdx++);
+                sortIdx = exports.sortTasks(pList, pList[i].getID(), sortIdx);
+            }
+        }
+    }
+    return sortIdx;
+};
+exports.TaskItemObject = function (object) {
+    var pDataObject = __assign({}, object);
+    general_utils_1.internalProperties.forEach(function (property) {
+        delete pDataObject[property];
+    });
+    return new exports.TaskItem(object.pID, object.pName, object.pStart, object.pEnd, object.pClass, object.pLink, object.pMile, object.pRes, object.pComp, object.pGroup, object.pParent, object.pOpen, object.pDepend, object.pCaption, object.pNotes, object.pGantt, object.pCost, object.pPlanStart, object.pPlanEnd, object.pDuration, object.pBarText, object);
+};
+exports.TaskItem = function (pID, pName, pStart, pEnd, pClass, pLink, pMile, pRes, pComp, pGroup, pParent, pOpen, pDepend, pCaption, pNotes, pGantt, pCost, pPlanStart, pPlanEnd, pDuration, pBarText, pDataObject) {
+    if (pCost === void 0) { pCost = null; }
+    if (pPlanStart === void 0) { pPlanStart = null; }
+    if (pPlanEnd === void 0) { pPlanEnd = null; }
+    if (pDuration === void 0) { pDuration = null; }
+    if (pBarText === void 0) { pBarText = null; }
+    if (pDataObject === void 0) { pDataObject = null; }
+    var vGantt = pGantt ? pGantt : this;
+    var _id = document.createTextNode(pID).data;
+    var vID = general_utils_1.hashKey(document.createTextNode(pID).data);
+    var vName = document.createTextNode(pName).data;
+    var vStart = null;
+    var vEnd = null;
+    var vPlanStart = null;
+    var vPlanEnd = null;
+    var vGroupMinStart = null;
+    var vGroupMinEnd = null;
+    var vGroupMinPlanStart = null;
+    var vGroupMinPlanEnd = null;
+    var vClass = document.createTextNode(pClass).data;
+    var vLink = document.createTextNode(pLink).data;
+    var vMile = parseInt(document.createTextNode(pMile).data);
+    var vRes = document.createTextNode(pRes).data;
+    var vComp = parseFloat(document.createTextNode(pComp).data);
+    var vCost = parseInt(document.createTextNode(pCost).data);
+    var vGroup = parseInt(document.createTextNode(pGroup).data);
+    var vDataObject = pDataObject;
+    var vCompVal;
+    var parent = document.createTextNode(pParent).data;
+    if (parent && parent !== '0') {
+        parent = general_utils_1.hashKey(parent).toString();
+    }
+    var vParent = parent;
+    var vOpen = (vGroup == 2) ? 1 : parseInt(document.createTextNode(pOpen).data);
+    var vDepend = new Array();
+    var vDependType = new Array();
+    var vCaption = document.createTextNode(pCaption).data;
+    var vDuration = pDuration || '';
+    var vBarText = pBarText || '';
+    var vLevel = 0;
+    var vNumKid = 0;
+    var vWeight = 0;
+    var vVisible = 1;
+    var vSortIdx = 0;
+    var vToDelete = false;
+    var x1, y1, x2, y2;
+    var vNotes;
+    var vParItem = null;
+    var vCellDiv = null;
+    var vBarDiv = null;
+    var vTaskDiv = null;
+    var vPlanTaskDiv = null;
+    var vListChildRow = null;
+    var vChildRow = null;
+    var vGroupSpan = null;
+    vNotes = document.createElement('span');
+    vNotes.className = 'gTaskNotes';
+    if (pNotes != null) {
+        vNotes.innerHTML = pNotes;
+        general_utils_1.stripUnwanted(vNotes);
+    }
+    if (pStart != null && pStart != '') {
+        vStart = (pStart instanceof Date) ? pStart : date_utils_1.parseDateStr(document.createTextNode(pStart).data, vGantt.getDateInputFormat());
+        vGroupMinStart = vStart;
+    }
+    if (pEnd != null && pEnd != '') {
+        vEnd = (pEnd instanceof Date) ? pEnd : date_utils_1.parseDateStr(document.createTextNode(pEnd).data, vGantt.getDateInputFormat());
+        vGroupMinEnd = vEnd;
+    }
+    if (pPlanStart != null && pPlanStart != '') {
+        vPlanStart = (pPlanStart instanceof Date) ? pPlanStart : date_utils_1.parseDateStr(document.createTextNode(pPlanStart).data, vGantt.getDateInputFormat());
+        vGroupMinPlanStart = vPlanStart;
+    }
+    if (pPlanEnd != null && pPlanEnd != '') {
+        vPlanEnd = (pPlanEnd instanceof Date) ? pPlanEnd : date_utils_1.parseDateStr(document.createTextNode(pPlanEnd).data, vGantt.getDateInputFormat());
+        vGroupMinPlanEnd = vPlanEnd;
+    }
+    if (pDepend != null) {
+        var vDependStr = pDepend + '';
+        var vDepList = vDependStr.split(',');
+        var n = vDepList.length;
+        for (var k = 0; k < n; k++) {
+            if (vDepList[k].toUpperCase().endsWith('SS')) {
+                vDepend[k] = vDepList[k].substring(0, vDepList[k].length - 2);
+                vDependType[k] = 'SS';
+            }
+            else if (vDepList[k].toUpperCase().endsWith('FF')) {
+                vDepend[k] = vDepList[k].substring(0, vDepList[k].length - 2);
+                vDependType[k] = 'FF';
+            }
+            else if (vDepList[k].toUpperCase().endsWith('SF')) {
+                vDepend[k] = vDepList[k].substring(0, vDepList[k].length - 2);
+                vDependType[k] = 'SF';
+            }
+            else if (vDepList[k].toUpperCase().endsWith('FS')) {
+                vDepend[k] = vDepList[k].substring(0, vDepList[k].length - 2);
+                vDependType[k] = 'FS';
+            }
+            else {
+                vDepend[k] = vDepList[k];
+                vDependType[k] = 'FS';
+            }
+            if (vDepend[k]) {
+                vDepend[k] = general_utils_1.hashKey(vDepend[k]).toString();
+            }
+        }
+    }
+    this.getID = function () { return vID; };
+    this.getOriginalID = function () { return _id; };
+    this.getGantt = function () { return vGantt; };
+    this.getName = function () { return vName; };
+    this.getStart = function () {
+        if (vStart)
+            return vStart;
+        else if (vPlanStart)
+            return vPlanStart;
+        else
+            return new Date();
+    };
+    this.getStartVar = function () {
+        return vStart;
+    };
+    this.getEnd = function () {
+        if (vEnd)
+            return vEnd;
+        else if (vPlanEnd)
+            return vPlanEnd;
+        else if (vStart && vDuration) {
+            var date = new Date(vStart);
+            var vUnits = vDuration.split(' ');
+            var value = parseInt(vUnits[0]);
+            switch (vUnits[1]) {
+                case 'hour':
+                    date.setMinutes(date.getMinutes() + (value * 60));
+                    break;
+                case 'day':
+                    date.setMinutes(date.getMinutes() + (value * 60 * 24));
+                    break;
+                case 'week':
+                    date.setMinutes(date.getMinutes() + (value * 60 * 24 * 7));
+                    break;
+                case 'month':
+                    date.setMonth(date.getMonth() + (value));
+                    break;
+                case 'quarter':
+                    date.setMonth(date.getMonth() + (value * 3));
+                    break;
+            }
+            return date;
+        }
+        else
+            return new Date();
+    };
+    this.getEndVar = function () {
+        return vEnd;
+    };
+    this.getPlanStart = function () { return vPlanStart ? vPlanStart : vStart; };
+    this.getPlanEnd = function () { return vPlanEnd ? vPlanEnd : vEnd; };
+    this.getCost = function () { return vCost; };
+    this.getGroupMinStart = function () { return vGroupMinStart; };
+    this.getGroupMinEnd = function () { return vGroupMinEnd; };
+    this.getGroupMinPlanStart = function () { return vGroupMinPlanStart; };
+    this.getGroupMinPlanEnd = function () { return vGroupMinPlanEnd; };
+    this.getClass = function () { return vClass; };
+    this.getLink = function () { return vLink; };
+    this.getMile = function () { return vMile; };
+    this.getDepend = function () {
+        if (vDepend)
+            return vDepend;
+        else
+            return null;
+    };
+    this.getDataObject = function () { return vDataObject; };
+    this.getDepType = function () { if (vDependType)
+        return vDependType;
+    else
+        return null; };
+    this.getCaption = function () { if (vCaption)
+        return vCaption;
+    else
+        return ''; };
+    this.getResource = function () { if (vRes)
+        return vRes;
+    else
+        return '\u00A0'; };
+    this.getCompVal = function () { if (vComp)
+        return vComp;
+    else if (vCompVal)
+        return vCompVal;
+    else
+        return 0; };
+    this.getCompStr = function () { if (vComp)
+        return vComp + '%';
+    else if (vCompVal)
+        return vCompVal + '%';
+    else
+        return ''; };
+    this.getCompRestStr = function () { if (vComp)
+        return (100 - vComp) + '%';
+    else if (vCompVal)
+        return (100 - vCompVal) + '%';
+    else
+        return ''; };
+    this.getNotes = function () { return vNotes; };
+    this.getSortIdx = function () { return vSortIdx; };
+    this.getToDelete = function () { return vToDelete; };
+    this.getDuration = function (pFormat, pLang) {
+        if (vMile) {
+            vDuration = '-';
+        }
+        else if (!vEnd && !vStart && vPlanStart && vPlanEnd) {
+            return calculateVDuration(pFormat, pLang, this.getPlanStart(), this.getPlanEnd());
+        }
+        else if (!vEnd && vDuration) {
+            return vDuration;
+        }
+        else {
+            vDuration = calculateVDuration(pFormat, pLang, this.getStart(), this.getEnd());
+        }
+        return vDuration;
+    };
+    function calculateVDuration(pFormat, pLang, start, end) {
+        var vDuration;
+        var vUnits = null;
+        switch (pFormat) {
+            case 'week':
+                vUnits = 'day';
+                break;
+            case 'month':
+                vUnits = 'week';
+                break;
+            case 'quarter':
+                vUnits = 'month';
+                break;
+            default:
+                vUnits = pFormat;
+                break;
+        }
+        // let vTaskEnd = new Date(this.getEnd().getTime());
+        // if ((vTaskEnd.getTime() - (vTaskEnd.getTimezoneOffset() * 60000)) % (86400000) == 0) {
+        //   vTaskEnd = new Date(vTaskEnd.getFullYear(), vTaskEnd.getMonth(), vTaskEnd.getDate() + 1, vTaskEnd.getHours(), vTaskEnd.getMinutes(), vTaskEnd.getSeconds());
+        // }
+        // let tmpPer = (getOffset(this.getStart(), vTaskEnd, 999, vUnits)) / 1000;
+        var hours = (end.getTime() - start.getTime()) / 1000 / 60 / 60;
+        var tmpPer;
+        switch (vUnits) {
+            case 'hour':
+                tmpPer = Math.round(hours);
+                vDuration = tmpPer + ' ' + ((tmpPer != 1) ? pLang['hrs'] : pLang['hr']);
+                break;
+            case 'day':
+                tmpPer = Math.round(hours / 24);
+                vDuration = tmpPer + ' ' + ((tmpPer != 1) ? pLang['dys'] : pLang['dy']);
+                break;
+            case 'week':
+                tmpPer = Math.round(hours / 24 / 7);
+                vDuration = tmpPer + ' ' + ((tmpPer != 1) ? pLang['wks'] : pLang['wk']);
+                break;
+            case 'month':
+                tmpPer = Math.round(hours / 24 / 7 / 30);
+                vDuration = tmpPer + ' ' + ((tmpPer != 1) ? pLang['mths'] : pLang['mth']);
+                break;
+            case 'quarter':
+                tmpPer = Math.round(hours / 24 / 7 / 30 / 3);
+                vDuration = tmpPer + ' ' + ((tmpPer != 1) ? pLang['qtrs'] : pLang['qtr']);
+                break;
+        }
+        return vDuration;
+    }
+    this.getBarText = function () { return vBarText; };
+    this.getParent = function () { return vParent; };
+    this.getGroup = function () { return vGroup; };
+    this.getOpen = function () { return vOpen; };
+    this.getLevel = function () { return vLevel; };
+    this.getNumKids = function () { return vNumKid; };
+    this.getWeight = function () { return vWeight; };
+    this.getStartX = function () { return x1; };
+    this.getStartY = function () { return y1; };
+    this.getEndX = function () { return x2; };
+    this.getEndY = function () { return y2; };
+    this.getVisible = function () { return vVisible; };
+    this.getParItem = function () { return vParItem; };
+    this.getCellDiv = function () { return vCellDiv; };
+    this.getBarDiv = function () { return vBarDiv; };
+    this.getTaskDiv = function () { return vTaskDiv; };
+    this.getPlanTaskDiv = function () { return vPlanTaskDiv; };
+    this.getChildRow = function () { return vChildRow; };
+    this.getListChildRow = function () { return vListChildRow; };
+    this.getGroupSpan = function () { return vGroupSpan; };
+    this.setName = function (pName) { vName = pName; };
+    this.setNotes = function (pNotes) { vNotes = pNotes; };
+    this.setClass = function (pClass) { vClass = pClass; };
+    this.setCost = function (pCost) { vCost = pCost; };
+    this.setResource = function (pRes) { vRes = pRes; };
+    this.setDuration = function (pDuration) { vDuration = pDuration; };
+    this.setDataObject = function (pDataObject) { vDataObject = pDataObject; };
+    this.setStart = function (pStart) {
+        if (pStart instanceof Date) {
+            vStart = pStart;
+        }
+        else {
+            var temp = new Date(pStart);
+            if (temp instanceof Date && !isNaN(temp.valueOf())) {
+                vStart = temp;
+            }
+        }
+    };
+    this.setEnd = function (pEnd) {
+        if (pEnd instanceof Date) {
+            vEnd = pEnd;
+        }
+        else {
+            var temp = new Date(pEnd);
+            if (temp instanceof Date && !isNaN(temp.valueOf())) {
+                vEnd = temp;
+            }
+        }
+    };
+    this.setPlanStart = function (pPlanStart) {
+        if (pPlanStart instanceof Date)
+            vPlanStart = pPlanStart;
+        else
+            vPlanStart = new Date(pPlanStart);
+    };
+    this.setPlanEnd = function (pPlanEnd) {
+        if (pPlanEnd instanceof Date)
+            vPlanEnd = pPlanEnd;
+        else
+            vPlanEnd = new Date(pPlanEnd);
+    };
+    this.setGroupMinStart = function (pStart) { if (pStart instanceof Date)
+        vGroupMinStart = pStart; };
+    this.setGroupMinEnd = function (pEnd) { if (pEnd instanceof Date)
+        vGroupMinEnd = pEnd; };
+    this.setLevel = function (pLevel) { vLevel = parseInt(document.createTextNode(pLevel).data); };
+    this.setNumKid = function (pNumKid) { vNumKid = parseInt(document.createTextNode(pNumKid).data); };
+    this.setWeight = function (pWeight) { vWeight = parseInt(document.createTextNode(pWeight).data); };
+    this.setCompVal = function (pCompVal) { vCompVal = parseFloat(document.createTextNode(pCompVal).data); };
+    this.setComp = function (pComp) {
+        vComp = parseInt(document.createTextNode(pComp).data);
+    };
+    this.setStartX = function (pX) { x1 = parseInt(document.createTextNode(pX).data); };
+    this.setStartY = function (pY) { y1 = parseInt(document.createTextNode(pY).data); };
+    this.setEndX = function (pX) { x2 = parseInt(document.createTextNode(pX).data); };
+    this.setEndY = function (pY) { y2 = parseInt(document.createTextNode(pY).data); };
+    this.setOpen = function (pOpen) { vOpen = parseInt(document.createTextNode(pOpen).data); };
+    this.setVisible = function (pVisible) { vVisible = parseInt(document.createTextNode(pVisible).data); };
+    this.setSortIdx = function (pSortIdx) { vSortIdx = parseInt(document.createTextNode(pSortIdx).data); };
+    this.setToDelete = function (pToDelete) { if (pToDelete)
+        vToDelete = true;
+    else
+        vToDelete = false; };
+    this.setParItem = function (pParItem) { if (pParItem)
+        vParItem = pParItem; };
+    this.setCellDiv = function (pCellDiv) { if (typeof HTMLDivElement !== 'function' || pCellDiv instanceof HTMLDivElement)
+        vCellDiv = pCellDiv; }; //"typeof HTMLDivElement !== 'function'" to play nice with ie6 and 7
+    this.setGroup = function (pGroup) {
+        if (pGroup === true || pGroup === 'true') {
+            vGroup = 1;
+        }
+        else if (pGroup === false || pGroup === 'false') {
+            vGroup = 0;
+        }
+        else {
+            vGroup = parseInt(document.createTextNode(pGroup).data);
+        }
+    };
+    this.setBarText = function (pBarText) { if (pBarText)
+        vBarText = pBarText; };
+    this.setBarDiv = function (pDiv) { if (typeof HTMLDivElement !== 'function' || pDiv instanceof HTMLDivElement)
+        vBarDiv = pDiv; };
+    this.setTaskDiv = function (pDiv) { if (typeof HTMLDivElement !== 'function' || pDiv instanceof HTMLDivElement)
+        vTaskDiv = pDiv; };
+    this.setPlanTaskDiv = function (pDiv) { if (typeof HTMLDivElement !== 'function' || pDiv instanceof HTMLDivElement)
+        vPlanTaskDiv = pDiv; };
+    this.setChildRow = function (pRow) { if (typeof HTMLTableRowElement !== 'function' || pRow instanceof HTMLTableRowElement)
+        vChildRow = pRow; };
+    this.setListChildRow = function (pRow) { if (typeof HTMLTableRowElement !== 'function' || pRow instanceof HTMLTableRowElement)
+        vListChildRow = pRow; };
+    this.setGroupSpan = function (pSpan) { if (typeof HTMLSpanElement !== 'function' || pSpan instanceof HTMLSpanElement)
+        vGroupSpan = pSpan; };
+    this.getAllData = function () {
+        return {
+            pID: vID,
+            pName: vName,
+            pStart: vStart,
+            pEnd: vEnd,
+            pPlanStart: vPlanStart,
+            pPlanEnd: vPlanEnd,
+            pGroupMinStart: vGroupMinStart,
+            pGroupMinEnd: vGroupMinEnd,
+            pClass: vClass,
+            pLink: vLink,
+            pMile: vMile,
+            pRes: vRes,
+            pComp: vComp,
+            pCost: vCost,
+            pGroup: vGroup,
+            pDataObjec: vDataObject
+        };
+    };
+};
+/**
+ * @param pTask
+ * @param templateStrOrFn template string or function(task). In any case parameters in template string are substituted.
+ *        If string - just a static template.
+ *        If function(task): string - per task template. Can return null|undefined to fallback to default template.
+ *        If function(task): Promise<string>) - async per task template. Tooltip will show 'Loading...' if promise is not yet complete.
+ *          Otherwise returned template will be handled in the same manner as in other cases.
+ */
+exports.createTaskInfo = function (pTask, templateStrOrFn) {
+    var _this = this;
+    if (templateStrOrFn === void 0) { templateStrOrFn = null; }
+    var vTmpDiv;
+    var vTaskInfoBox = document.createDocumentFragment();
+    var vTaskInfo = draw_utils_1.newNode(vTaskInfoBox, 'div', null, 'gTaskInfo');
+    var setupTemplate = function (template) {
+        vTaskInfo.innerHTML = "";
+        if (template) {
+            var allData_1 = pTask.getAllData();
+            general_utils_1.internalProperties.forEach(function (key) {
+                var lang;
+                if (general_utils_1.internalPropertiesLang[key]) {
+                    lang = _this.vLangs[_this.vLang][general_utils_1.internalPropertiesLang[key]];
+                }
+                if (!lang) {
+                    lang = key;
+                }
+                var val = allData_1[key];
+                template = template.replace("{{" + key + "}}", val);
+                if (lang) {
+                    template = template.replace("{{Lang:" + key + "}}", lang);
+                }
+                else {
+                    template = template.replace("{{Lang:" + key + "}}", key);
+                }
+            });
+            draw_utils_1.newNode(vTaskInfo, 'span', null, 'gTtTemplate', template);
+        }
+        else {
+            draw_utils_1.newNode(vTaskInfo, 'span', null, 'gTtTitle', pTask.getName());
+            if (_this.vShowTaskInfoStartDate == 1) {
+                vTmpDiv = draw_utils_1.newNode(vTaskInfo, 'div', null, 'gTILine gTIsd');
+                draw_utils_1.newNode(vTmpDiv, 'span', null, 'gTaskLabel', _this.vLangs[_this.vLang]['startdate'] + ': ');
+                draw_utils_1.newNode(vTmpDiv, 'span', null, 'gTaskText', date_utils_1.formatDateStr(pTask.getStart(), _this.vDateTaskDisplayFormat, _this.vLangs[_this.vLang]));
+            }
+            if (_this.vShowTaskInfoEndDate == 1) {
+                vTmpDiv = draw_utils_1.newNode(vTaskInfo, 'div', null, 'gTILine gTIed');
+                draw_utils_1.newNode(vTmpDiv, 'span', null, 'gTaskLabel', _this.vLangs[_this.vLang]['enddate'] + ': ');
+                draw_utils_1.newNode(vTmpDiv, 'span', null, 'gTaskText', date_utils_1.formatDateStr(pTask.getEnd(), _this.vDateTaskDisplayFormat, _this.vLangs[_this.vLang]));
+            }
+            if (_this.vShowTaskInfoDur == 1 && !pTask.getMile()) {
+                vTmpDiv = draw_utils_1.newNode(vTaskInfo, 'div', null, 'gTILine gTId');
+                draw_utils_1.newNode(vTmpDiv, 'span', null, 'gTaskLabel', _this.vLangs[_this.vLang]['duration'] + ': ');
+                draw_utils_1.newNode(vTmpDiv, 'span', null, 'gTaskText', pTask.getDuration(_this.vFormat, _this.vLangs[_this.vLang]));
+            }
+            if (_this.vShowTaskInfoComp == 1) {
+                vTmpDiv = draw_utils_1.newNode(vTaskInfo, 'div', null, 'gTILine gTIc');
+                draw_utils_1.newNode(vTmpDiv, 'span', null, 'gTaskLabel', _this.vLangs[_this.vLang]['completion'] + ': ');
+                draw_utils_1.newNode(vTmpDiv, 'span', null, 'gTaskText', pTask.getCompStr());
+            }
+            if (_this.vShowTaskInfoRes == 1) {
+                vTmpDiv = draw_utils_1.newNode(vTaskInfo, 'div', null, 'gTILine gTIr');
+                draw_utils_1.newNode(vTmpDiv, 'span', null, 'gTaskLabel', _this.vLangs[_this.vLang]['resource'] + ': ');
+                draw_utils_1.newNode(vTmpDiv, 'span', null, 'gTaskText', pTask.getResource());
+            }
+            if (_this.vShowTaskInfoLink == 1 && pTask.getLink() != '') {
+                vTmpDiv = draw_utils_1.newNode(vTaskInfo, 'div', null, 'gTILine gTIl');
+                var vTmpNode = draw_utils_1.newNode(vTmpDiv, 'span', null, 'gTaskLabel');
+                vTmpNode = draw_utils_1.newNode(vTmpNode, 'a', null, 'gTaskText', _this.vLangs[_this.vLang]['moreinfo']);
+                vTmpNode.setAttribute('href', pTask.getLink());
+            }
+            if (_this.vShowTaskInfoNotes == 1) {
+                vTmpDiv = draw_utils_1.newNode(vTaskInfo, 'div', null, 'gTILine gTIn');
+                draw_utils_1.newNode(vTmpDiv, 'span', null, 'gTaskLabel', _this.vLangs[_this.vLang]['notes'] + ': ');
+                if (pTask.getNotes())
+                    vTmpDiv.appendChild(pTask.getNotes());
+            }
+        }
+    };
+    var callback;
+    if (typeof templateStrOrFn === 'function') {
+        callback = function () {
+            var strOrPromise = templateStrOrFn(pTask);
+            if (!strOrPromise || typeof strOrPromise === 'string') {
+                setupTemplate(strOrPromise);
+            }
+            else if (strOrPromise.then) {
+                setupTemplate(_this.vLangs[_this.vLang]['tooltipLoading'] || _this.vLangs['en']['tooltipLoading']);
+                return strOrPromise.then(setupTemplate);
+            }
+        };
+    }
+    else {
+        setupTemplate(templateStrOrFn);
+    }
+    return { component: vTaskInfoBox, callback: callback };
+};
+exports.AddTaskItem = function (value) {
+    var vExists = false;
+    for (var i = 0; i < this.vTaskList.length; i++) {
+        if (this.vTaskList[i].getID() == value.getID()) {
+            i = this.vTaskList.length;
+            vExists = true;
+        }
+    }
+    if (!vExists) {
+        this.vTaskList.push(value);
+        this.vProcessNeeded = true;
+    }
+};
+exports.AddTaskItemObject = function (object) {
+    if (!object.pGantt) {
+        object.pGantt = this;
+    }
+    return this.AddTaskItem(exports.TaskItemObject(object));
+};
+exports.RemoveTaskItem = function (pID) {
+    // simply mark the task for removal at this point - actually remove it next time we re-draw the chart
+    for (var i = 0; i < this.vTaskList.length; i++) {
+        if (this.vTaskList[i].getID() == pID)
+            this.vTaskList[i].setToDelete(true);
+        else if (this.vTaskList[i].getParent() == pID)
+            this.RemoveTaskItem(this.vTaskList[i].getID());
+    }
+    this.vProcessNeeded = true;
+};
+exports.ClearTasks = function () {
+    var _this = this;
+    this.vTaskList.map(function (task) { return _this.RemoveTaskItem(task.getID()); });
+    this.vProcessNeeded = true;
+};
+// Recursively process task tree ... set min, max dates of parent tasks and identfy task level.
+exports.processRows = function (pList, pID, pRow, pLevel, pOpen, pUseSort, vDebug) {
+    if (vDebug === void 0) { vDebug = false; }
+    var vMinDate = null;
+    var vMaxDate = null;
+    var vMinPlanDate = null;
+    var vMaxPlanDate = null;
+    var vVisible = pOpen;
+    var vCurItem = null;
+    var vCompSum = 0;
+    var vMinSet = 0;
+    var vMaxSet = 0;
+    var vMinPlanSet = 0;
+    var vMaxPlanSet = 0;
+    var vNumKid = 0;
+    var vWeight = 0;
+    var vLevel = pLevel;
+    var vList = pList;
+    var vComb = false;
+    var i = 0;
+    for (i = 0; i < pList.length; i++) {
+        if (pList[i].getToDelete()) {
+            pList.splice(i, 1);
+            i--;
+        }
+        if (i >= 0 && pList[i].getID() == pID)
+            vCurItem = pList[i];
+    }
+    for (i = 0; i < pList.length; i++) {
+        if (pList[i].getParent() == pID) {
+            vVisible = pOpen;
+            pList[i].setParItem(vCurItem);
+            pList[i].setVisible(vVisible);
+            if (vVisible == 1 && pList[i].getOpen() == 0)
+                vVisible = 0;
+            if (pList[i].getMile() && pList[i].getParItem() && pList[i].getParItem().getGroup() == 2) { //remove milestones owned by combined groups
+                pList.splice(i, 1);
+                i--;
+                continue;
+            }
+            pList[i].setLevel(vLevel);
+            if (pList[i].getGroup()) {
+                if (pList[i].getParItem() && pList[i].getParItem().getGroup() == 2)
+                    pList[i].setGroup(2);
+                exports.processRows(vList, pList[i].getID(), i, vLevel + 1, vVisible, 0);
+            }
+            if (pList[i].getStartVar() && (vMinSet == 0 || pList[i].getStartVar() < vMinDate)) {
+                vMinDate = pList[i].getStartVar();
+                vMinSet = 1;
+            }
+            if (pList[i].getEndVar() && (vMaxSet == 0 || pList[i].getEndVar() > vMaxDate)) {
+                vMaxDate = pList[i].getEndVar();
+                vMaxSet = 1;
+            }
+            if (vMinPlanSet == 0 || pList[i].getPlanStart() < vMinPlanDate) {
+                vMinPlanDate = pList[i].getPlanStart();
+                vMinPlanSet = 1;
+            }
+            if (vMaxPlanSet == 0 || pList[i].getPlanEnd() > vMaxPlanDate) {
+                vMaxPlanDate = pList[i].getPlanEnd();
+                vMaxPlanSet = 1;
+            }
+            vNumKid++;
+            vWeight += pList[i].getEnd() - pList[i].getStart() + 1;
+            vCompSum += pList[i].getCompVal() * (pList[i].getEnd() - pList[i].getStart() + 1);
+            pList[i].setSortIdx(i * pList.length);
+        }
+    }
+    if (pRow >= 0) {
+        if (pList[pRow].getGroupMinStart() != null && pList[pRow].getGroupMinStart() < vMinDate) {
+            vMinDate = pList[pRow].getGroupMinStart();
+        }
+        if (pList[pRow].getGroupMinEnd() != null && pList[pRow].getGroupMinEnd() > vMaxDate) {
+            vMaxDate = pList[pRow].getGroupMinEnd();
+        }
+        if (vMinDate) {
+            pList[pRow].setStart(vMinDate);
+        }
+        if (vMaxDate) {
+            pList[pRow].setEnd(vMaxDate);
+        }
+        if (pList[pRow].getGroupMinPlanStart() != null && pList[pRow].getGroupMinPlanStart() < vMinPlanDate) {
+            vMinPlanDate = pList[pRow].getGroupMinPlanStart();
+        }
+        if (pList[pRow].getGroupMinPlanEnd() != null && pList[pRow].getGroupMinPlanEnd() > vMaxPlanDate) {
+            vMaxPlanDate = pList[pRow].getGroupMinPlanEnd();
+        }
+        if (vMinPlanDate) {
+            pList[pRow].setPlanStart(vMinPlanDate);
+        }
+        if (vMaxPlanDate) {
+            pList[pRow].setPlanEnd(vMaxPlanDate);
+        }
+        pList[pRow].setNumKid(vNumKid);
+        pList[pRow].setWeight(vWeight);
+        pList[pRow].setCompVal(Math.ceil(vCompSum / vWeight));
+    }
+    if (pID == 0 && pUseSort == 1) {
+        var bd = void 0;
+        if (vDebug) {
+            bd = new Date();
+            console.info('before afterTasks', bd);
+        }
+        exports.sortTasks(pList, 0, 0);
+        if (vDebug) {
+            var ad = new Date();
+            console.info('after afterTasks', ad, (ad.getTime() - bd.getTime()));
+        }
+        pList.sort(function (a, b) { return a.getSortIdx() - b.getSortIdx(); });
+    }
+    if (pID == 0 && pUseSort != 1) // Need to sort combined tasks regardless
+     {
+        for (i = 0; i < pList.length; i++) {
+            if (pList[i].getGroup() == 2) {
+                vComb = true;
+                var bd = void 0;
+                if (vDebug) {
+                    bd = new Date();
+                    console.info('before sortTasks', bd);
+                }
+                exports.sortTasks(pList, pList[i].getID(), pList[i].getSortIdx() + 1);
+                if (vDebug) {
+                    var ad = new Date();
+                    console.info('after sortTasks', ad, (ad.getTime() - bd.getTime()));
+                }
+            }
+        }
+        if (vComb == true)
+            pList.sort(function (a, b) { return a.getSortIdx() - b.getSortIdx(); });
+    }
 };
 
-JSGantt.parseDateStr=function(pDateStr,pFormatStr)
-{
-	var vDate=new Date();
-	var vDateParts=pDateStr.split(/[^0-9]/);
-	if (pDateStr.length>=10 && vDateParts.length>=3)
-	{
-		while(vDateParts.length<5)vDateParts.push(0);
-
-		switch(pFormatStr)
-		{
-			case 'mm/dd/yyyy':
-			vDate=new Date(vDateParts[2], vDateParts[0]-1, vDateParts[1], vDateParts[3], vDateParts[4]);
-			break;
-			case 'dd/mm/yyyy':
-			vDate=new Date(vDateParts[2], vDateParts[1]-1, vDateParts[0], vDateParts[3], vDateParts[4]);
-			break;
-			case 'yyyy-mm-dd':
-			vDate=new Date(vDateParts[0], vDateParts[1]-1, vDateParts[2], vDateParts[3], vDateParts[4]);
-			break;
-		}
-	}
-	return(vDate);
+},{"./utils/date_utils":11,"./utils/draw_utils":12,"./utils/general_utils":13}],11:[function(require,module,exports){
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * DATES
+ */
+exports.getMinDate = function (pList, pFormat, pMinDate) {
+    var vDate = new Date();
+    if (pList.length <= 0)
+        return pMinDate || vDate;
+    vDate.setTime((pMinDate && pMinDate.getTime()) || pList[0].getStart().getTime());
+    // Parse all Task Start dates to find min
+    for (var i = 0; i < pList.length; i++) {
+        if (pList[i].getStart().getTime() < vDate.getTime())
+            vDate.setTime(pList[i].getStart().getTime());
+        if (pList[i].getPlanStart() && pList[i].getPlanStart().getTime() < vDate.getTime())
+            vDate.setTime(pList[i].getPlanStart().getTime());
+    }
+    // Adjust min date to specific format boundaries (first of week or first of month)
+    if (pFormat == 'day') {
+        vDate.setDate(vDate.getDate() - 1);
+        while (vDate.getDay() % 7 != 1)
+            vDate.setDate(vDate.getDate() - 1);
+    }
+    else if (pFormat == 'week') {
+        vDate.setDate(vDate.getDate() - 1);
+        while (vDate.getDay() % 7 != 1)
+            vDate.setDate(vDate.getDate() - 1);
+    }
+    else if (pFormat == 'month') {
+        vDate.setDate(vDate.getDate() - 15);
+        while (vDate.getDate() > 1)
+            vDate.setDate(vDate.getDate() - 1);
+    }
+    else if (pFormat == 'quarter') {
+        vDate.setDate(vDate.getDate() - 31);
+        if (vDate.getMonth() == 0 || vDate.getMonth() == 1 || vDate.getMonth() == 2)
+            vDate.setFullYear(vDate.getFullYear(), 0, 1);
+        else if (vDate.getMonth() == 3 || vDate.getMonth() == 4 || vDate.getMonth() == 5)
+            vDate.setFullYear(vDate.getFullYear(), 3, 1);
+        else if (vDate.getMonth() == 6 || vDate.getMonth() == 7 || vDate.getMonth() == 8)
+            vDate.setFullYear(vDate.getFullYear(), 6, 1);
+        else if (vDate.getMonth() == 9 || vDate.getMonth() == 10 || vDate.getMonth() == 11)
+            vDate.setFullYear(vDate.getFullYear(), 9, 1);
+    }
+    else if (pFormat == 'hour') {
+        vDate.setHours(vDate.getHours() - 1);
+        while (vDate.getHours() % 6 != 0)
+            vDate.setHours(vDate.getHours() - 1);
+    }
+    if (pFormat == 'hour')
+        vDate.setMinutes(0, 0);
+    else
+        vDate.setHours(0, 0, 0);
+    return (vDate);
+};
+exports.getMaxDate = function (pList, pFormat, pMaxDate) {
+    var vDate = new Date();
+    if (pList.length <= 0)
+        return pMaxDate || vDate;
+    vDate.setTime((pMaxDate && pMaxDate.getTime()) || pList[0].getEnd().getTime());
+    // Parse all Task End dates to find max
+    for (var i = 0; i < pList.length; i++) {
+        if (pList[i].getEnd().getTime() > vDate.getTime())
+            vDate.setTime(pList[i].getEnd().getTime());
+        if (pList[i].getPlanEnd() && pList[i].getPlanEnd().getTime() > vDate.getTime())
+            vDate.setTime(pList[i].getPlanEnd().getTime());
+    }
+    // Adjust max date to specific format boundaries (end of week or end of month)
+    if (pFormat == 'day') {
+        vDate.setDate(vDate.getDate() + 1);
+        while (vDate.getDay() % 7 != 0)
+            vDate.setDate(vDate.getDate() + 1);
+    }
+    else if (pFormat == 'week') {
+        //For weeks, what is the last logical boundary?
+        vDate.setDate(vDate.getDate() + 1);
+        while (vDate.getDay() % 7 != 0)
+            vDate.setDate(vDate.getDate() + 1);
+    }
+    else if (pFormat == 'month') {
+        // Set to last day of current Month
+        while (vDate.getDate() > 1)
+            vDate.setDate(vDate.getDate() + 1);
+        vDate.setDate(vDate.getDate() - 1);
+    }
+    else if (pFormat == 'quarter') {
+        // Set to last day of current Quarter
+        if (vDate.getMonth() == 0 || vDate.getMonth() == 1 || vDate.getMonth() == 2)
+            vDate.setFullYear(vDate.getFullYear(), 2, 31);
+        else if (vDate.getMonth() == 3 || vDate.getMonth() == 4 || vDate.getMonth() == 5)
+            vDate.setFullYear(vDate.getFullYear(), 5, 30);
+        else if (vDate.getMonth() == 6 || vDate.getMonth() == 7 || vDate.getMonth() == 8)
+            vDate.setFullYear(vDate.getFullYear(), 8, 30);
+        else if (vDate.getMonth() == 9 || vDate.getMonth() == 10 || vDate.getMonth() == 11)
+            vDate.setFullYear(vDate.getFullYear(), 11, 31);
+    }
+    else if (pFormat == 'hour') {
+        if (vDate.getHours() == 0)
+            vDate.setDate(vDate.getDate() + 1);
+        vDate.setHours(vDate.getHours() + 1);
+        while (vDate.getHours() % 6 != 5)
+            vDate.setHours(vDate.getHours() + 1);
+    }
+    return (vDate);
+};
+exports.coerceDate = function (date) {
+    if (date instanceof Date) {
+        return date;
+    }
+    else {
+        var temp = new Date(date);
+        if (temp instanceof Date && !isNaN(temp.valueOf())) {
+            return temp;
+        }
+    }
+};
+exports.parseDateStr = function (pDateStr, pFormatStr) {
+    var vDate = new Date();
+    var vDateParts = pDateStr.split(/[^0-9]/);
+    if (pDateStr.length >= 10 && vDateParts.length >= 3) {
+        while (vDateParts.length < 5)
+            vDateParts.push(0);
+        switch (pFormatStr) {
+            case 'mm/dd/yyyy':
+                vDate = new Date(vDateParts[2], vDateParts[0] - 1, vDateParts[1], vDateParts[3], vDateParts[4]);
+                break;
+            case 'dd/mm/yyyy':
+                vDate = new Date(vDateParts[2], vDateParts[1] - 1, vDateParts[0], vDateParts[3], vDateParts[4]);
+                break;
+            case 'yyyy-mm-dd':
+                vDate = new Date(vDateParts[0], vDateParts[1] - 1, vDateParts[2], vDateParts[3], vDateParts[4]);
+                break;
+            case 'yyyy-mm-dd HH:MI:SS':
+                vDate = new Date(vDateParts[0], vDateParts[1] - 1, vDateParts[2], vDateParts[3], vDateParts[4], vDateParts[5]);
+                break;
+        }
+    }
+    return (vDate);
+};
+exports.formatDateStr = function (pDate, pDateFormatArr, pL) {
+    // Fix on issue #303 - getXMLTask is passing null as pDates
+    if (!pDate) {
+        return;
+    }
+    var vDateStr = '';
+    var vYear2Str = pDate.getFullYear().toString().substring(2, 4);
+    var vMonthStr = (pDate.getMonth() + 1) + '';
+    var vMonthArr = new Array(pL['january'], pL['february'], pL['march'], pL['april'], pL['maylong'], pL['june'], pL['july'], pL['august'], pL['september'], pL['october'], pL['november'], pL['december']);
+    var vDayArr = new Array(pL['sunday'], pL['monday'], pL['tuesday'], pL['wednesday'], pL['thursday'], pL['friday'], pL['saturday']);
+    var vMthArr = new Array(pL['jan'], pL['feb'], pL['mar'], pL['apr'], pL['may'], pL['jun'], pL['jul'], pL['aug'], pL['sep'], pL['oct'], pL['nov'], pL['dec']);
+    var vDyArr = new Array(pL['sun'], pL['mon'], pL['tue'], pL['wed'], pL['thu'], pL['fri'], pL['sat']);
+    for (var i = 0; i < pDateFormatArr.length; i++) {
+        switch (pDateFormatArr[i]) {
+            case 'dd':
+                if (pDate.getDate() < 10)
+                    vDateStr += '0'; // now fall through
+            case 'd':
+                vDateStr += pDate.getDate();
+                break;
+            case 'day':
+                vDateStr += vDyArr[pDate.getDay()];
+                break;
+            case 'DAY':
+                vDateStr += vDayArr[pDate.getDay()];
+                break;
+            case 'mm':
+                if (parseInt(vMonthStr, 10) < 10)
+                    vDateStr += '0'; // now fall through
+            case 'm':
+                vDateStr += vMonthStr;
+                break;
+            case 'mon':
+                vDateStr += vMthArr[pDate.getMonth()];
+                break;
+            case 'month':
+                vDateStr += vMonthArr[pDate.getMonth()];
+                break;
+            case 'yyyy':
+                vDateStr += pDate.getFullYear();
+                break;
+            case 'yy':
+                vDateStr += vYear2Str;
+                break;
+            case 'qq':
+                vDateStr += pL['qtr']; // now fall through
+            case 'q':
+                vDateStr += Math.floor(pDate.getMonth() / 3) + 1;
+                break;
+            case 'hh':
+                if ((((pDate.getHours() % 12) == 0) ? 12 : pDate.getHours() % 12) < 10)
+                    vDateStr += '0'; // now fall through
+            case 'h':
+                vDateStr += ((pDate.getHours() % 12) == 0) ? 12 : pDate.getHours() % 12;
+                break;
+            case 'HH':
+                if ((pDate.getHours()) < 10)
+                    vDateStr += '0'; // now fall through
+            case 'H':
+                vDateStr += (pDate.getHours());
+                break;
+            case 'MI':
+                if (pDate.getMinutes() < 10)
+                    vDateStr += '0'; // now fall through
+            case 'mi':
+                vDateStr += pDate.getMinutes();
+                break;
+            case 'SS':
+                if (pDate.getSeconds() < 10)
+                    vDateStr += '0'; // now fall through
+            case 'ss':
+                vDateStr += pDate.getSeconds();
+                break;
+            case 'pm':
+                vDateStr += ((pDate.getHours()) < 12) ? 'am' : 'pm';
+                break;
+            case 'PM':
+                vDateStr += ((pDate.getHours()) < 12) ? 'AM' : 'PM';
+                break;
+            case 'ww':
+                if (exports.getIsoWeek(pDate) < 10)
+                    vDateStr += '0'; // now fall through
+            case 'w':
+                vDateStr += exports.getIsoWeek(pDate);
+                break;
+            case 'week':
+                var vWeekNum = exports.getIsoWeek(pDate);
+                var vYear = pDate.getFullYear();
+                var vDayOfWeek = (pDate.getDay() == 0) ? 7 : pDate.getDay();
+                if (vWeekNum >= 52 && parseInt(vMonthStr, 10) === 1)
+                    vYear--;
+                if (vWeekNum == 1 && parseInt(vMonthStr, 10) === 12)
+                    vYear++;
+                if (vWeekNum < 10)
+                    vWeekNum = parseInt('0' + vWeekNum, 10);
+                vDateStr += vYear + '-W' + vWeekNum + '-' + vDayOfWeek;
+                break;
+            default:
+                if (pL[pDateFormatArr[i].toLowerCase()])
+                    vDateStr += pL[pDateFormatArr[i].toLowerCase()];
+                else
+                    vDateStr += pDateFormatArr[i];
+                break;
+        }
+    }
+    return vDateStr;
+};
+exports.parseDateFormatStr = function (pFormatStr) {
+    var vComponantStr = '';
+    var vCurrChar = '';
+    var vSeparators = new RegExp('[\/\\ -.,\'":]');
+    var vDateFormatArray = new Array();
+    for (var i = 0; i < pFormatStr.length; i++) {
+        vCurrChar = pFormatStr.charAt(i);
+        if ((vCurrChar.match(vSeparators)) || (i + 1 == pFormatStr.length)) // separator or end of string
+         {
+            if ((i + 1 == pFormatStr.length) && (!(vCurrChar.match(vSeparators)))) // at end of string add any non-separator chars to the current component
+             {
+                vComponantStr += vCurrChar;
+            }
+            vDateFormatArray.push(vComponantStr);
+            if (vCurrChar.match(vSeparators))
+                vDateFormatArray.push(vCurrChar);
+            vComponantStr = '';
+        }
+        else {
+            vComponantStr += vCurrChar;
+        }
+    }
+    return vDateFormatArray;
+};
+/**
+ * We have to compare against the monday of the first week of the year containing 04 jan *not* 01/01
+ * 60*60*24*1000=86400000
+ * @param pDate
+ */
+exports.getIsoWeek = function (pDate) {
+    var dayMiliseconds = 86400000;
+    var keyDay = new Date(pDate.getFullYear(), 0, 4, 0, 0, 0);
+    var keyDayOfWeek = (keyDay.getDay() == 0) ? 6 : keyDay.getDay() - 1; // define monday as 0
+    var firstMondayYearTime = keyDay.getTime() - (keyDayOfWeek * dayMiliseconds);
+    var thisDate = new Date(pDate.getFullYear(), pDate.getMonth(), pDate.getDate(), 0, 0, 0); // This at 00:00:00
+    var thisTime = thisDate.getTime();
+    var daysFromFirstMonday = Math.round(((thisTime - firstMondayYearTime) / dayMiliseconds));
+    var lastWeek = 99;
+    var thisWeek = 99;
+    var firstMondayYear = new Date(firstMondayYearTime);
+    thisWeek = Math.ceil((daysFromFirstMonday + 1) / 7);
+    if (thisWeek <= 0)
+        thisWeek = exports.getIsoWeek(new Date(pDate.getFullYear() - 1, 11, 31, 0, 0, 0));
+    else if (thisWeek == 53 && (new Date(pDate.getFullYear(), 0, 1, 0, 0, 0)).getDay() != 4 && (new Date(pDate.getFullYear(), 11, 31, 0, 0, 0)).getDay() != 4)
+        thisWeek = 1;
+    return thisWeek;
 };
 
-JSGantt.formatDateStr=function(pDate, pDateFormatArr, pL)
-{
-	var vDateStr='';
-
-	var vYear2Str=pDate.getFullYear().toString().substring(2,4);
-	var vMonthStr=(pDate.getMonth()+1)+'';
-	var vMonthArr=new Array(pL['january'],pL['february'],pL['march'],pL['april'],pL['maylong'],pL['june'],pL['july'],pL['august'],pL['september'],pL['october'],pL['november'],pL['december']);
-	var vDayArr=new Array(pL['sunday'],pL['monday'],pL['tuesday'],pL['wednesday'],pL['thursday'],pL['friday'],pL['saturday']);
-	var vMthArr=new Array(pL['jan'],pL['feb'],pL['mar'],pL['apr'],pL['may'],pL['jun'],pL['jul'],pL['aug'],pL['sep'],pL['oct'],pL['nov'],pL['dec']);
-	var vDyArr=new Array(pL['sun'],pL['mon'],pL['tue'],pL['wed'],pL['thu'],pL['fri'],pL['sat']);
-
-	for (var i=0; i<pDateFormatArr.length; i++)
-	{
-		switch(pDateFormatArr[i])
-		{
-			case 'dd':
-				if (pDate.getDate()<10) vDateStr+='0'; // now fall through
-			case 'd':
-				vDateStr+=pDate.getDate();
-				break;
-			case 'day':
-				vDateStr+=vDyArr[pDate.getDay()];
-				break;
-			case 'DAY':
-				vDateStr+=vDayArr[pDate.getDay()];
-				break;
-			case 'mm':
-				if (vMonthStr<10) vDateStr+='0'; // now fall through
-			case 'm':
-				vDateStr+=vMonthStr;
-				break;
-			case 'mon':
-				vDateStr+=vMthArr[pDate.getMonth()];
-				break;
-			case 'month':
-				vDateStr+=vMonthArr[pDate.getMonth()];
-				break;
-			case 'yyyy':
-				vDateStr+=pDate.getFullYear();
-				break;
-			case 'yy':
-				vDateStr+=vYear2Str;
-				break;
-			case 'qq':
-				vDateStr+='Q'; // now fall through
-			case 'q':
-				vDateStr+=Math.floor(pDate.getMonth()/3)+1;
-				break;
-			case 'hh':
-				if ((((pDate.getHours()%12)==0)?12:pDate.getHours()%12)<10) vDateStr+='0'; // now fall through
-			case 'h':
-				vDateStr+=((pDate.getHours()%12)==0)?12:pDate.getHours()%12;
-				break;
-			case 'HH':
-				if ((pDate.getHours())<10) vDateStr+='0'; // now fall through
-			case 'H':
-				vDateStr+=(pDate.getHours());
-				break;
-			case 'MI':
-				if (pDate.getMinutes()<10) vDateStr+='0'; // now fall through
-			case 'mi':
-				vDateStr+=pDate.getMinutes();
-				break;
-			case 'pm':
-				vDateStr+=((pDate.getHours())<12)?'am':'pm';
-				break;
-			case 'PM':
-				vDateStr+=((pDate.getHours())<12)?'AM':'PM';
-				break;
-			case 'ww':
-				if (JSGantt.getIsoWeek(pDate)<10) vDateStr+='0'; // now fall through
-			case 'w':
-				vDateStr+=JSGantt.getIsoWeek(pDate);
-				break;
-			case 'week':
-				var vWeekNum=JSGantt.getIsoWeek(pDate);
-				var vYear=pDate.getFullYear();
-				var vDayOfWeek=(pDate.getDay()==0)? 7 : pDate.getDay();
-				if (vWeekNum>=52 && vMonthStr==1) vYear--;
-				if (vWeekNum==1 && vMonthStr==12) vYear++;
-				if (vWeekNum<10) vWeekNum='0'+vWeekNum;
-
-				vDateStr+=vYear+'-W'+vWeekNum+'-'+vDayOfWeek;
-				break;
-			default:
-				if (pL[pDateFormatArr[i].toLowerCase()]) vDateStr+=pL[pDateFormatArr[i].toLowerCase()];
-				else vDateStr+=pDateFormatArr[i];
-				break;
-		}
-	}
-	return vDateStr;
+},{}],12:[function(require,module,exports){
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var events_1 = require("../events");
+exports.makeInput = function (formattedValue, editable, type, value, choices) {
+    if (type === void 0) { type = 'text'; }
+    if (value === void 0) { value = null; }
+    if (choices === void 0) { choices = null; }
+    if (!value) {
+        value = formattedValue;
+    }
+    if (editable) {
+        switch (type) {
+            case 'date':
+                // Take timezone into account before converting to ISO String
+                value = value ? new Date(value.getTime() - (value.getTimezoneOffset() * 60000)).toISOString().split('T')[0] : '';
+                return "<input class=\"gantt-inputtable\" type=\"date\" value=\"" + value + "\">";
+            case 'resource':
+                if (choices) {
+                    var found = choices.filter(function (c) { return c.id == value || c.name == value; });
+                    if (found && found.length > 0) {
+                        value = found[0].id;
+                    }
+                    else {
+                        choices.push({ id: value, name: value });
+                    }
+                    return "<select>" + choices.map(function (c) { return "<option value=\"" + c.id + "\" " + (value == c.id ? 'selected' : '') + " >" + c.name + "</option>"; }).join('') + "</select>";
+                }
+                else {
+                    return "<input class=\"gantt-inputtable\" type=\"text\" value=\"" + (value ? value : '') + "\">";
+                }
+            case 'cost':
+                return "<input class=\"gantt-inputtable\" type=\"number\" max=\"100\" min=\"0\" value=\"" + (value ? value : '') + "\">";
+            default:
+                return "<input class=\"gantt-inputtable\" value=\"" + (value ? value : '') + "\">";
+        }
+    }
+    else {
+        return formattedValue;
+    }
+};
+exports.newNode = function (pParent, pNodeType, pId, pClass, pText, pWidth, pLeft, pDisplay, pColspan, pAttribs) {
+    if (pId === void 0) { pId = null; }
+    if (pClass === void 0) { pClass = null; }
+    if (pText === void 0) { pText = null; }
+    if (pWidth === void 0) { pWidth = null; }
+    if (pLeft === void 0) { pLeft = null; }
+    if (pDisplay === void 0) { pDisplay = null; }
+    if (pColspan === void 0) { pColspan = null; }
+    if (pAttribs === void 0) { pAttribs = null; }
+    var vNewNode = pParent.appendChild(document.createElement(pNodeType));
+    if (pAttribs) {
+        for (var i = 0; i + 1 < pAttribs.length; i += 2) {
+            vNewNode.setAttribute(pAttribs[i], pAttribs[i + 1]);
+        }
+    }
+    if (pId)
+        vNewNode.id = pId; // I wish I could do this with setAttribute but older IEs don't play nice
+    if (pClass)
+        vNewNode.className = pClass;
+    if (pWidth)
+        vNewNode.style.width = (isNaN(pWidth * 1)) ? pWidth : pWidth + 'px';
+    if (pLeft)
+        vNewNode.style.left = (isNaN(pLeft * 1)) ? pLeft : pLeft + 'px';
+    if (pText) {
+        if (pText.indexOf && pText.indexOf('<') === -1) {
+            vNewNode.appendChild(document.createTextNode(pText));
+        }
+        else {
+            vNewNode.insertAdjacentHTML('beforeend', pText);
+        }
+    }
+    if (pDisplay)
+        vNewNode.style.display = pDisplay;
+    if (pColspan)
+        vNewNode.colSpan = pColspan;
+    return vNewNode;
+};
+exports.getArrayLocationByID = function (pId) {
+    var vList = this.getList();
+    for (var i = 0; i < vList.length; i++) {
+        if (vList[i].getID() == pId)
+            return i;
+    }
+    return -1;
+};
+exports.CalcTaskXY = function () {
+    var vID;
+    var vList = this.getList();
+    var vBarDiv;
+    var vTaskDiv;
+    var vParDiv;
+    var vLeft, vTop, vWidth;
+    var vHeight = Math.floor((this.getRowHeight() / 2));
+    for (var i = 0; i < vList.length; i++) {
+        vID = vList[i].getID();
+        vBarDiv = vList[i].getBarDiv();
+        vTaskDiv = vList[i].getTaskDiv();
+        if ((vList[i].getParItem() && vList[i].getParItem().getGroup() == 2)) {
+            vParDiv = vList[i].getParItem().getChildRow();
+        }
+        else
+            vParDiv = vList[i].getChildRow();
+        if (vBarDiv) {
+            vList[i].setStartX(vBarDiv.offsetLeft + 1);
+            vList[i].setStartY(vParDiv.offsetTop + vBarDiv.offsetTop + vHeight - 1);
+            vList[i].setEndX(vBarDiv.offsetLeft + vBarDiv.offsetWidth + 1);
+            vList[i].setEndY(vParDiv.offsetTop + vBarDiv.offsetTop + vHeight - 1);
+        }
+    }
+};
+exports.sLine = function (x1, y1, x2, y2, pClass) {
+    var vLeft = Math.min(x1, x2);
+    var vTop = Math.min(y1, y2);
+    var vWid = Math.abs(x2 - x1) + 1;
+    var vHgt = Math.abs(y2 - y1) + 1;
+    var vTmpDiv = document.createElement('div');
+    vTmpDiv.id = this.vDivId + 'line' + this.vDepId++;
+    vTmpDiv.style.position = 'absolute';
+    vTmpDiv.style.overflow = 'hidden';
+    vTmpDiv.style.zIndex = '0';
+    vTmpDiv.style.left = vLeft + 'px';
+    vTmpDiv.style.top = vTop + 'px';
+    vTmpDiv.style.width = vWid + 'px';
+    vTmpDiv.style.height = vHgt + 'px';
+    vTmpDiv.style.visibility = 'visible';
+    if (vWid == 1)
+        vTmpDiv.className = 'glinev';
+    else
+        vTmpDiv.className = 'glineh';
+    if (pClass)
+        vTmpDiv.className += ' ' + pClass;
+    this.getLines().appendChild(vTmpDiv);
+    if (this.vEvents.onLineDraw && typeof this.vEvents.onLineDraw === 'function') {
+        this.vEvents.onLineDraw(vTmpDiv);
+    }
+    return vTmpDiv;
+};
+exports.drawSelector = function (pPos) {
+    var vOutput = document.createDocumentFragment();
+    var vDisplay = false;
+    for (var i = 0; i < this.vShowSelector.length && !vDisplay; i++) {
+        if (this.vShowSelector[i].toLowerCase() == pPos.toLowerCase())
+            vDisplay = true;
+    }
+    if (vDisplay) {
+        var vTmpDiv = exports.newNode(vOutput, 'div', null, 'gselector', this.vLangs[this.vLang]['format'] + ':');
+        if (this.vFormatArr.join().toLowerCase().indexOf('hour') != -1)
+            events_1.addFormatListeners(this, 'hour', exports.newNode(vTmpDiv, 'span', this.vDivId + 'formathour' + pPos, 'gformlabel' + ((this.vFormat == 'hour') ? ' gselected' : ''), this.vLangs[this.vLang]['hour']));
+        if (this.vFormatArr.join().toLowerCase().indexOf('day') != -1)
+            events_1.addFormatListeners(this, 'day', exports.newNode(vTmpDiv, 'span', this.vDivId + 'formatday' + pPos, 'gformlabel' + ((this.vFormat == 'day') ? ' gselected' : ''), this.vLangs[this.vLang]['day']));
+        if (this.vFormatArr.join().toLowerCase().indexOf('week') != -1)
+            events_1.addFormatListeners(this, 'week', exports.newNode(vTmpDiv, 'span', this.vDivId + 'formatweek' + pPos, 'gformlabel' + ((this.vFormat == 'week') ? ' gselected' : ''), this.vLangs[this.vLang]['week']));
+        if (this.vFormatArr.join().toLowerCase().indexOf('month') != -1)
+            events_1.addFormatListeners(this, 'month', exports.newNode(vTmpDiv, 'span', this.vDivId + 'formatmonth' + pPos, 'gformlabel' + ((this.vFormat == 'month') ? ' gselected' : ''), this.vLangs[this.vLang]['month']));
+        if (this.vFormatArr.join().toLowerCase().indexOf('quarter') != -1)
+            events_1.addFormatListeners(this, 'quarter', exports.newNode(vTmpDiv, 'span', this.vDivId + 'formatquarter' + pPos, 'gformlabel' + ((this.vFormat == 'quarter') ? ' gselected' : ''), this.vLangs[this.vLang]['quarter']));
+    }
+    else {
+        exports.newNode(vOutput, 'div', null, 'gselector');
+    }
+    return vOutput;
 };
 
-JSGantt.parseDateFormatStr=function(pFormatStr)
-{
-	var vDateStr='';
-	var vComponantStr='';
-	var vCurrChar='';
-	var vSeparators=new RegExp('[\/\\ -.,\'":]');
-	var vDateFormatArray=new Array();
-
-	for (var i=0; i<pFormatStr.length; i++)
-	{
-		vCurrChar=pFormatStr.charAt(i);
-		if ((vCurrChar.match(vSeparators)) || (i+1==pFormatStr.length)) // separator or end of string
-		{
-			if ((i+1==pFormatStr.length) && (!(vCurrChar.match(vSeparators)))) // at end of string add any non-separator chars to the current component
-			{
-				vComponantStr+=vCurrChar;
-			}
-			vDateFormatArray.push(vComponantStr);
-			if (vCurrChar.match(vSeparators)) vDateFormatArray.push(vCurrChar);
-			vComponantStr='';
-		}
-		else
-		{
-			vComponantStr+=vCurrChar;
-		}
-
-	}
-	return vDateFormatArray;
+},{"../events":5}],13:[function(require,module,exports){
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.internalProperties = ['pID', 'pName', 'pStart', 'pEnd', 'pClass', 'pLink', 'pMile', 'pRes', 'pComp', 'pGroup', 'pParent',
+    'pOpen', 'pDepend', 'pCaption', 'pNotes', 'pGantt', 'pCost', 'pPlanStart', 'pPlanEnd'];
+exports.internalPropertiesLang = {
+    'pID': 'id',
+    'pName': 'name',
+    'pStart': 'startdate',
+    'pEnd': 'enddate',
+    'pLink': 'link',
+    'pMile': 'mile',
+    'pRes': 'resource',
+    'pComp': 'comp',
+    'pGroup': 'group',
+    'pParent': 'parent',
+    'pOpen': 'open',
+    'pDepend': 'depend',
+    'pCaption': 'caption',
+    'pNotes': 'notes',
+    'pCost': 'cost',
+    'pPlanStart': 'planstartdate',
+    'pPlanEnd': 'planenddate'
+};
+exports.findObj = function (theObj, theDoc) {
+    if (theDoc === void 0) { theDoc = null; }
+    var p, i, foundObj;
+    if (!theDoc)
+        theDoc = document;
+    if (document.getElementById)
+        foundObj = document.getElementById(theObj);
+    return foundObj;
+};
+exports.changeFormat = function (pFormat, ganttObj) {
+    if (ganttObj)
+        ganttObj.setFormat(pFormat);
+    else
+        alert('Chart undefined');
+};
+exports.stripIds = function (pNode) {
+    for (var i = 0; i < pNode.childNodes.length; i++) {
+        if ('removeAttribute' in pNode.childNodes[i])
+            pNode.childNodes[i].removeAttribute('id');
+        if (pNode.childNodes[i].hasChildNodes())
+            exports.stripIds(pNode.childNodes[i]);
+    }
+};
+exports.stripUnwanted = function (pNode) {
+    var vAllowedTags = new Array('#text', 'p', 'br', 'ul', 'ol', 'li', 'div', 'span', 'img');
+    for (var i = 0; i < pNode.childNodes.length; i++) {
+        /* versions of IE<9 don't support indexOf on arrays so add trailing comma to the joined array and lookup value to stop substring matches */
+        if ((vAllowedTags.join().toLowerCase() + ',').indexOf(pNode.childNodes[i].nodeName.toLowerCase() + ',') == -1) {
+            pNode.replaceChild(document.createTextNode(pNode.childNodes[i].outerHTML), pNode.childNodes[i]);
+        }
+        if (pNode.childNodes[i].hasChildNodes())
+            exports.stripUnwanted(pNode.childNodes[i]);
+    }
+};
+exports.delayedHide = function (pGanttChartObj, pTool, pTimer) {
+    var vDelay = pGanttChartObj.getTooltipDelay() || 1500;
+    if (pTool)
+        pTool.delayTimeout = setTimeout(function () { exports.hideToolTip(pGanttChartObj, pTool, pTimer); }, vDelay);
+};
+exports.getZoomFactor = function () {
+    var vFactor = 1;
+    if (document.body.getBoundingClientRect) {
+        // rect is only in physical pixel size in IE before version 8
+        var vRect = document.body.getBoundingClientRect();
+        var vPhysicalW = vRect.right - vRect.left;
+        var vLogicalW = document.body.offsetWidth;
+        // the zoom level is always an integer percent value
+        vFactor = Math.round((vPhysicalW / vLogicalW) * 100) / 100;
+    }
+    return vFactor;
+};
+exports.benchMark = function (pItem) {
+    var vEndTime = new Date().getTime();
+    alert(pItem + ': Elapsed time: ' + ((vEndTime - this.vBenchTime) / 1000) + ' seconds.');
+    this.vBenchTime = new Date().getTime();
+};
+exports.getScrollPositions = function () {
+    var vScrollLeft = window.pageXOffset;
+    var vScrollTop = window.pageYOffset;
+    if (!('pageXOffset' in window)) // Internet Explorer before version 9
+     {
+        var vZoomFactor = exports.getZoomFactor();
+        vScrollLeft = Math.round(document.documentElement.scrollLeft / vZoomFactor);
+        vScrollTop = Math.round(document.documentElement.scrollTop / vZoomFactor);
+    }
+    return { x: vScrollLeft, y: vScrollTop };
+};
+var scrollbarWidth = undefined;
+exports.getScrollbarWidth = function () {
+    if (scrollbarWidth)
+        return scrollbarWidth;
+    var outer = document.createElement('div');
+    outer.className = 'gscrollbar-calculation-container';
+    document.body.appendChild(outer);
+    // Creating inner element and placing it in the container
+    var inner = document.createElement('div');
+    outer.appendChild(inner);
+    // Calculating difference between container's full width and the child width
+    scrollbarWidth = (outer.offsetWidth - inner.offsetWidth);
+    // Removing temporary elements from the DOM
+    outer.parentNode.removeChild(outer);
+    return scrollbarWidth;
+};
+exports.calculateCurrentDateOffset = function (curTaskStart, curTaskEnd) {
+    var tmpTaskStart = Date.UTC(curTaskStart.getFullYear(), curTaskStart.getMonth(), curTaskStart.getDate(), curTaskStart.getHours(), 0, 0);
+    var tmpTaskEnd = Date.UTC(curTaskEnd.getFullYear(), curTaskEnd.getMonth(), curTaskEnd.getDate(), curTaskEnd.getHours(), 0, 0);
+    return (tmpTaskEnd - tmpTaskStart);
+};
+exports.getOffset = function (pStartDate, pEndDate, pColWidth, pFormat, pShowWeekends) {
+    var DAY_CELL_MARGIN_WIDTH = 3; // Cell margin for 'day' format
+    var WEEK_CELL_MARGIN_WIDTH = 3; // Cell margin for 'week' format
+    var MONTH_CELL_MARGIN_WIDTH = 3; // Cell margin for 'month' format
+    var QUARTER_CELL_MARGIN_WIDTH = 3; // Cell margin for 'quarter' format
+    var HOUR_CELL_MARGIN_WIDTH = 3; // Cell margin for 'hour' format
+    var vMonthDaysArr = new Array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+    var curTaskStart = new Date(pStartDate.getTime());
+    var curTaskEnd = new Date(pEndDate.getTime());
+    var vTaskRightPx = 0;
+    // Length of task in hours
+    var oneHour = 3600000;
+    var vTaskRight = exports.calculateCurrentDateOffset(curTaskStart, curTaskEnd) / oneHour;
+    var vPosTmpDate;
+    if (pFormat == 'day') {
+        if (!pShowWeekends) {
+            var start = curTaskStart;
+            var end = curTaskEnd;
+            var countWeekends = 0;
+            while (start < end) {
+                var day = start.getDay();
+                if (day === 6 || day == 0) {
+                    countWeekends++;
+                }
+                start = new Date(start.getTime() + 24 * oneHour);
+            }
+            vTaskRight -= countWeekends * 24;
+        }
+        vTaskRightPx = Math.ceil((vTaskRight / 24) * (pColWidth + DAY_CELL_MARGIN_WIDTH) - 1);
+    }
+    else if (pFormat == 'week') {
+        vTaskRightPx = Math.ceil((vTaskRight / (24 * 7)) * (pColWidth + WEEK_CELL_MARGIN_WIDTH) - 1);
+    }
+    else if (pFormat == 'month') {
+        var vMonthsDiff = (12 * (curTaskEnd.getFullYear() - curTaskStart.getFullYear())) + (curTaskEnd.getMonth() - curTaskStart.getMonth());
+        vPosTmpDate = new Date(curTaskEnd.getTime());
+        vPosTmpDate.setDate(curTaskStart.getDate());
+        var vDaysCrctn = (curTaskEnd.getTime() - vPosTmpDate.getTime()) / (86400000);
+        vTaskRightPx = Math.ceil((vMonthsDiff * (pColWidth + MONTH_CELL_MARGIN_WIDTH)) + (vDaysCrctn * (pColWidth / vMonthDaysArr[curTaskEnd.getMonth()])) - 1);
+    }
+    else if (pFormat == 'quarter') {
+        var vMonthsDiff = (12 * (curTaskEnd.getFullYear() - curTaskStart.getFullYear())) + (curTaskEnd.getMonth() - curTaskStart.getMonth());
+        vPosTmpDate = new Date(curTaskEnd.getTime());
+        vPosTmpDate.setDate(curTaskStart.getDate());
+        var vDaysCrctn = (curTaskEnd.getTime() - vPosTmpDate.getTime()) / (86400000);
+        vTaskRightPx = Math.ceil((vMonthsDiff * ((pColWidth + QUARTER_CELL_MARGIN_WIDTH) / 3)) + (vDaysCrctn * (pColWidth / 90)) - 1);
+    }
+    else if (pFormat == 'hour') {
+        // can't just calculate sum because of daylight savings changes
+        vPosTmpDate = new Date(curTaskEnd.getTime());
+        vPosTmpDate.setMinutes(curTaskStart.getMinutes(), 0);
+        var vMinsCrctn = (curTaskEnd.getTime() - vPosTmpDate.getTime()) / (3600000);
+        vTaskRightPx = Math.ceil((vTaskRight * (pColWidth + HOUR_CELL_MARGIN_WIDTH)) + (vMinsCrctn * (pColWidth)));
+    }
+    return vTaskRightPx;
+};
+exports.isIE = function () {
+    if (typeof document.all != 'undefined') {
+        if ('pageXOffset' in window)
+            return false; // give IE9 and above the benefit of the doubt!
+        else
+            return true;
+    }
+    else
+        return false;
+};
+exports.hideToolTip = function (pGanttChartObj, pTool, pTimer) {
+    if (pGanttChartObj.getUseFade()) {
+        clearInterval(pTool.fadeInterval);
+        pTool.fadeInterval = setInterval(function () { exports.fadeToolTip(-1, pTool, 0); }, pTimer);
+    }
+    else {
+        pTool.style.opacity = 0;
+        pTool.style.filter = 'alpha(opacity=0)';
+        pTool.style.visibility = 'hidden';
+        pTool.vToolCont.setAttribute("showing", null);
+    }
+};
+exports.fadeToolTip = function (pDirection, pTool, pMaxAlpha) {
+    var vIncrement = parseInt(pTool.getAttribute('fadeIncrement'));
+    var vAlpha = pTool.getAttribute('currentOpacity');
+    var vCurAlpha = parseInt(vAlpha);
+    if ((vCurAlpha != pMaxAlpha && pDirection == 1) || (vCurAlpha != 0 && pDirection == -1)) {
+        var i = vIncrement;
+        if (pMaxAlpha - vCurAlpha < vIncrement && pDirection == 1) {
+            i = pMaxAlpha - vCurAlpha;
+        }
+        else if (vAlpha < vIncrement && pDirection == -1) {
+            i = vCurAlpha;
+        }
+        vAlpha = vCurAlpha + (i * pDirection);
+        pTool.style.opacity = vAlpha * 0.01;
+        pTool.style.filter = 'alpha(opacity=' + vAlpha + ')';
+        pTool.setAttribute('currentOpacity', vAlpha);
+    }
+    else {
+        clearInterval(pTool.fadeInterval);
+        if (pDirection == -1) {
+            pTool.style.opacity = 0;
+            pTool.style.filter = 'alpha(opacity=0)';
+            pTool.style.visibility = 'hidden';
+            pTool.vToolCont.setAttribute("showing", null);
+        }
+    }
+};
+exports.hashString = function (key) {
+    if (!key) {
+        key = 'default';
+    }
+    key += '';
+    var hash = 5381;
+    for (var i = 0; i < key.length; i++) {
+        if (key.charCodeAt) {
+            // tslint:disable-next-line:no-bitwise
+            hash = (hash << 5) + hash + key.charCodeAt(i);
+        }
+        // tslint:disable-next-line:no-bitwise
+        hash = hash & hash;
+    }
+    // tslint:disable-next-line:no-bitwise
+    return hash >>> 0;
+};
+exports.hashKey = function (key) {
+    return this.hashString(key);
+};
+exports.criticalPath = function (tasks) {
+    var path = {};
+    // calculate duration
+    tasks.forEach(function (task) {
+        task.duration = new Date(task.pEnd).getTime() - new Date(task.pStart).getTime();
+    });
+    tasks.forEach(function (task) {
+        if (!path[task.pID]) {
+            path[task.pID] = task;
+        }
+        if (!path[task.pParent]) {
+            path[task.pParent] = {
+                childrens: []
+            };
+        }
+        if (!path[task.pID].childrens) {
+            path[task.pID].childrens = [];
+        }
+        path[task.pParent].childrens.push(task);
+        var max = path[task.pParent].childrens[0].duration;
+        path[task.pParent].childrens.forEach(function (t) {
+            if (t.duration > max) {
+                max = t.duration;
+            }
+        });
+        path[task.pParent].duration = max;
+    });
+    var finalNodes = { 0: path[0] };
+    var node = path[0];
+    var _loop_1 = function () {
+        if (node.childrens.length > 0) {
+            var found_1 = node.childrens[0];
+            var max_1 = found_1.duration;
+            node.childrens.forEach(function (c) {
+                if (c.duration > max_1) {
+                    found_1 = c;
+                    max_1 = c.duration;
+                }
+            });
+            finalNodes[found_1.pID] = found_1;
+            node = found_1;
+        }
+        else {
+            node = null;
+        }
+    };
+    while (node) {
+        _loop_1();
+    }
+};
+function isParentElementOrSelf(child, parent) {
+    while (child) {
+        if (child === parent)
+            return true;
+        child = child.parentElement;
+    }
+}
+exports.isParentElementOrSelf = isParentElementOrSelf;
+exports.updateFlyingObj = function (e, pGanttChartObj, pTimer) {
+    var vCurTopBuf = 3;
+    var vCurLeftBuf = 5;
+    var vCurBotBuf = 3;
+    var vCurRightBuf = 15;
+    var vMouseX = (e) ? e.clientX : window.event.clientX;
+    var vMouseY = (e) ? e.clientY : window.event.clientY;
+    var vViewportX = document.documentElement.clientWidth || document.getElementsByTagName('body')[0].clientWidth;
+    var vViewportY = document.documentElement.clientHeight || document.getElementsByTagName('body')[0].clientHeight;
+    var vNewX = vMouseX;
+    var vNewY = vMouseY;
+    var screenX = screen.availWidth || window.innerWidth;
+    var screenY = screen.availHeight || window.innerHeight;
+    var vOldX = parseInt(pGanttChartObj.vTool.style.left);
+    var vOldY = parseInt(pGanttChartObj.vTool.style.top);
+    if (navigator.appName.toLowerCase() == 'microsoft internet explorer') {
+        // the clientX and clientY properties include the left and top borders of the client area
+        vMouseX -= document.documentElement.clientLeft;
+        vMouseY -= document.documentElement.clientTop;
+        var vZoomFactor = exports.getZoomFactor();
+        if (vZoomFactor != 1) { // IE 7 at non-default zoom level
+            vMouseX = Math.round(vMouseX / vZoomFactor);
+            vMouseY = Math.round(vMouseY / vZoomFactor);
+        }
+    }
+    var vScrollPos = exports.getScrollPositions();
+    /* Code for positioned right of the mouse by default*/
+    /*
+    if (vMouseX+vCurRightBuf+pGanttChartObj.vTool.offsetWidth>vViewportX)
+    {
+        if (vMouseX-vCurLeftBuf-pGanttChartObj.vTool.offsetWidth<0) vNewX=vScrollPos.x;
+        else vNewX=vMouseX+vScrollPos.x-vCurLeftBuf-pGanttChartObj.vTool.offsetWidth;
+    }
+    else vNewX=vMouseX+vScrollPos.x+vCurRightBuf;
+    */
+    /* Code for positioned left of the mouse by default */
+    if (vMouseX - vCurLeftBuf - pGanttChartObj.vTool.offsetWidth < 0) {
+        if (vMouseX + vCurRightBuf + pGanttChartObj.vTool.offsetWidth > vViewportX)
+            vNewX = vScrollPos.x;
+        else
+            vNewX = vMouseX + vScrollPos.x + vCurRightBuf;
+    }
+    else
+        vNewX = vMouseX + vScrollPos.x - vCurLeftBuf - pGanttChartObj.vTool.offsetWidth;
+    /* Code for positioned below the mouse by default */
+    if (vMouseY + vCurBotBuf + pGanttChartObj.vTool.offsetHeight > vViewportY) {
+        if (vMouseY - vCurTopBuf - pGanttChartObj.vTool.offsetHeight < 0)
+            vNewY = vScrollPos.y;
+        else
+            vNewY = vMouseY + vScrollPos.y - vCurTopBuf - pGanttChartObj.vTool.offsetHeight;
+    }
+    else
+        vNewY = vMouseY + vScrollPos.y + vCurBotBuf;
+    /* Code for positioned above the mouse by default */
+    /*
+    if (vMouseY-vCurTopBuf-pGanttChartObj.vTool.offsetHeight<0)
+    {
+        if (vMouseY+vCurBotBuf+pGanttChartObj.vTool.offsetHeight>vViewportY) vNewY=vScrollPos.y;
+        else vNewY=vMouseY+vScrollPos.y+vCurBotBuf;
+    }
+    else vNewY=vMouseY+vScrollPos.y-vCurTopBuf-pGanttChartObj.vTool.offsetHeight;
+    */
+    var outViewport = Math.abs(vOldX - vNewX) > screenX || Math.abs(vOldY - vNewY) > screenY;
+    if (pGanttChartObj.getUseMove() && !outViewport) {
+        clearInterval(pGanttChartObj.vTool.moveInterval);
+        pGanttChartObj.vTool.moveInterval = setInterval(function () { exports.moveToolTip(vNewX, vNewY, pGanttChartObj.vTool, pTimer); }, pTimer);
+    }
+    else {
+        pGanttChartObj.vTool.style.left = vNewX + 'px';
+        pGanttChartObj.vTool.style.top = vNewY + 'px';
+    }
+};
+exports.moveToolTip = function (pNewX, pNewY, pTool, timer) {
+    var vSpeed = parseInt(pTool.getAttribute('moveSpeed'));
+    var vOldX = parseInt(pTool.style.left);
+    var vOldY = parseInt(pTool.style.top);
+    if (pTool.style.visibility != 'visible') {
+        pTool.style.left = pNewX + 'px';
+        pTool.style.top = pNewY + 'px';
+        clearInterval(pTool.moveInterval);
+    }
+    else {
+        if (pNewX != vOldX && pNewY != vOldY) {
+            vOldX += Math.ceil((pNewX - vOldX) / vSpeed);
+            vOldY += Math.ceil((pNewY - vOldY) / vSpeed);
+            pTool.style.left = vOldX + 'px';
+            pTool.style.top = vOldY + 'px';
+        }
+        else {
+            clearInterval(pTool.moveInterval);
+        }
+    }
+};
+exports.makeRequest = function (pFile, json, vDebug) {
+    if (json === void 0) { json = true; }
+    if (vDebug === void 0) { vDebug = false; }
+    if (window.fetch) {
+        var f = fetch(pFile);
+        if (json) {
+            return f.then(function (res) { return res.json(); });
+        }
+        else {
+            return f;
+        }
+    }
+    else {
+        return exports.makeRequestOldBrowsers(pFile, vDebug)
+            .then(function (xhttp) {
+            if (json) {
+                var jsonObj = JSON.parse(xhttp.response);
+                return jsonObj;
+            }
+            else {
+                var xmlDoc = xhttp.responseXML;
+                return xmlDoc;
+            }
+        });
+    }
+};
+exports.makeRequestOldBrowsers = function (pFile, vDebug) {
+    if (vDebug === void 0) { vDebug = false; }
+    return new Promise(function (resolve, reject) {
+        var bd;
+        if (vDebug) {
+            bd = new Date();
+            console.info('before jsonparse', bd);
+        }
+        var xhttp;
+        if (window.XMLHttpRequest) {
+            xhttp = new XMLHttpRequest();
+        }
+        else { // IE 5/6
+            xhttp = new window.ActiveXObject('Microsoft.XMLHTTP');
+        }
+        xhttp.open('GET', pFile, true);
+        xhttp.send(null);
+        xhttp.onload = function (e) {
+            if (xhttp.readyState === 4) {
+                if (xhttp.status === 200) {
+                    // resolve(xhttp.responseText);
+                }
+                else {
+                    console.error(xhttp.statusText);
+                }
+                if (vDebug) {
+                    bd = new Date();
+                    console.info('before jsonparse', bd);
+                }
+                resolve(xhttp);
+            }
+        };
+        xhttp.onerror = function (e) {
+            reject(xhttp.statusText);
+        };
+    });
+};
+exports.calculateStartEndFromDepend = function (tasksList) {
 };
 
-JSGantt.parseXML=function(pFile,pGanttVar)
-{
-	if (window.XMLHttpRequest) {
-		var xhttp=new XMLHttpRequest();
-	} else {	// IE 5/6
-		xhttp=new ActiveXObject('Microsoft.XMLHTTP');
-	}
-
-	xhttp.open('GET', pFile, false);
-	xhttp.send(null);
-	var xmlDoc=xhttp.responseXML;
-
-	JSGantt.AddXMLTask(pGanttVar, xmlDoc);
+},{}],14:[function(require,module,exports){
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var task_1 = require("./task");
+var date_utils_1 = require("./utils/date_utils");
+var draw_utils_1 = require("./utils/draw_utils");
+var general_utils_1 = require("./utils/general_utils");
+exports.parseXML = function (pFile, pGanttVar) {
+    return general_utils_1.makeRequest(pFile, false, false)
+        .then(function (xmlDoc) {
+        exports.AddXMLTask(pGanttVar, xmlDoc);
+    });
 };
-
-JSGantt.parseXMLString=function(pStr,pGanttVar)
-{
-	if (typeof window.DOMParser!='undefined') {
-		var xmlDoc =(new window.DOMParser()).parseFromString(pStr, 'text/xml');
-	} else if (typeof window.ActiveXObject!='undefined' &&
-		   new window.ActiveXObject('Microsoft.XMLDOM')) {
-		xmlDoc=new window.ActiveXObject('Microsoft.XMLDOM');
-		xmlDoc.async='false';
-		xmlDoc.loadXML(pStr);
-	}
-
-	JSGantt.AddXMLTask(pGanttVar, xmlDoc);
+exports.parseXMLString = function (pStr, pGanttVar) {
+    var xmlDoc;
+    if (typeof window.DOMParser != 'undefined') {
+        xmlDoc = (new window.DOMParser()).parseFromString(pStr, 'text/xml');
+    }
+    else if (typeof window.ActiveXObject != 'undefined' &&
+        new window.ActiveXObject('Microsoft.XMLDOM')) {
+        xmlDoc = new window.ActiveXObject('Microsoft.XMLDOM');
+        xmlDoc.async = 'false';
+        xmlDoc.loadXML(pStr);
+    }
+    exports.AddXMLTask(pGanttVar, xmlDoc);
 };
-
-
-JSGantt.findXMLNode=function(pRoot,pNodeName)
-{
-	var vRetValue;
-
-	try {vRetValue=pRoot.getElementsByTagName(pNodeName);
-	} catch (error)	{ ; } // do nothing, we'll return undefined
-
-	return vRetValue;
+exports.findXMLNode = function (pRoot, pNodeName) {
+    var vRetValue;
+    try {
+        vRetValue = pRoot.getElementsByTagName(pNodeName);
+    }
+    catch (error) {
+        ;
+    } // do nothing, we'll return undefined
+    return vRetValue;
 };
-
 // pType can be 1=numeric, 2=String, all other values just return raw data
-JSGantt.getXMLNodeValue=function(pRoot,pNodeName,pType,pDefault)
-{
-	var vRetValue;
-
-	try {vRetValue=pRoot.getElementsByTagName(pNodeName)[0].childNodes[0].nodeValue;
-	} catch (error)
-	{
-		if (typeof pDefault!='undefined')vRetValue=pDefault;
-	}
-
-	if (typeof vRetValue!='undefined' && vRetValue!=null)
-	{
-		if (pType==1)vRetValue*=1;
-		else if (pType==2)vRetValue=vRetValue.toString();
-	}
-	return vRetValue;
+exports.getXMLNodeValue = function (pRoot, pNodeName, pType, pDefault) {
+    var vRetValue;
+    try {
+        vRetValue = pRoot.getElementsByTagName(pNodeName)[0].childNodes[0].nodeValue;
+    }
+    catch (error) {
+        if (typeof pDefault != 'undefined')
+            vRetValue = pDefault;
+    }
+    if (typeof vRetValue != 'undefined' && vRetValue != null) {
+        if (pType == 1)
+            vRetValue *= 1;
+        else if (pType == 2)
+            vRetValue = vRetValue.toString();
+    }
+    return vRetValue;
+};
+exports.AddXMLTask = function (pGanttVar, pXmlDoc) {
+    var project = '';
+    var Task;
+    var n = 0;
+    var m = 0;
+    var i = 0;
+    var j = 0;
+    var k = 0;
+    var maxPID = 0;
+    var ass = new Array();
+    var assRes = new Array();
+    var res = new Array();
+    var pars = new Array();
+    var projNode = exports.findXMLNode(pXmlDoc, 'Project');
+    if (typeof projNode != 'undefined' && projNode.length > 0) {
+        project = projNode[0].getAttribute('xmlns');
+    }
+    if (project == 'http://schemas.microsoft.com/project') {
+        pGanttVar.setDateInputFormat('yyyy-mm-dd');
+        Task = exports.findXMLNode(pXmlDoc, 'Task');
+        if (typeof Task == 'undefined')
+            n = 0;
+        else
+            n = Task.length;
+        var resources = exports.findXMLNode(pXmlDoc, 'Resource');
+        if (typeof resources == 'undefined') {
+            n = 0;
+            m = 0;
+        }
+        else
+            m = resources.length;
+        for (i = 0; i < m; i++) {
+            var resname = exports.getXMLNodeValue(resources[i], 'Name', 2, '');
+            var uid = exports.getXMLNodeValue(resources[i], 'UID', 1, -1);
+            if (resname.length > 0 && uid > 0)
+                res[uid] = resname;
+        }
+        var assignments = exports.findXMLNode(pXmlDoc, 'Assignment');
+        if (typeof assignments == 'undefined')
+            j = 0;
+        else
+            j = assignments.length;
+        for (i = 0; i < j; i++) {
+            var uid = void 0;
+            var resUID = exports.getXMLNodeValue(assignments[i], 'ResourceUID', 1, -1);
+            uid = exports.getXMLNodeValue(assignments[i], 'TaskUID', 1, -1);
+            if (uid > 0) {
+                if (resUID > 0)
+                    assRes[uid] = res[resUID];
+                ass[uid] = assignments[i];
+            }
+        }
+        // Store information about parent UIDs in an easily searchable form
+        for (i = 0; i < n; i++) {
+            var uid = void 0;
+            uid = exports.getXMLNodeValue(Task[i], 'UID', 1, 0);
+            var vOutlineNumber = void 0;
+            if (uid != 0)
+                vOutlineNumber = exports.getXMLNodeValue(Task[i], 'OutlineNumber', 2, '0');
+            if (uid > 0)
+                pars[vOutlineNumber] = uid;
+            if (uid > maxPID)
+                maxPID = uid;
+        }
+        for (i = 0; i < n; i++) {
+            // optional parameters may not have an entry
+            // Task ID must NOT be zero otherwise it will be skipped
+            var pID = exports.getXMLNodeValue(Task[i], 'UID', 1, 0);
+            if (pID != 0) {
+                var pName = exports.getXMLNodeValue(Task[i], 'Name', 2, 'No Task Name');
+                var pStart = exports.getXMLNodeValue(Task[i], 'Start', 2, '');
+                var pEnd = exports.getXMLNodeValue(Task[i], 'Finish', 2, '');
+                var pPlanStart = exports.getXMLNodeValue(Task[i], 'PlanStart', 2, '');
+                var pPlanEnd = exports.getXMLNodeValue(Task[i], 'PlanFinish', 2, '');
+                var pDuration = exports.getXMLNodeValue(Task[i], 'Duration', 2, '');
+                var pLink = exports.getXMLNodeValue(Task[i], 'HyperlinkAddress', 2, '');
+                var pMile = exports.getXMLNodeValue(Task[i], 'Milestone', 1, 0);
+                var pComp = exports.getXMLNodeValue(Task[i], 'PercentWorkComplete', 1, 0);
+                var pCost = exports.getXMLNodeValue(Task[i], 'Cost', 2, 0);
+                var pGroup = exports.getXMLNodeValue(Task[i], 'Summary', 1, 0);
+                var pParent = 0;
+                var vOutlineLevel = exports.getXMLNodeValue(Task[i], 'OutlineLevel', 1, 0);
+                var vOutlineNumber = void 0;
+                if (vOutlineLevel > 1) {
+                    vOutlineNumber = exports.getXMLNodeValue(Task[i], 'OutlineNumber', 2, '0');
+                    pParent = pars[vOutlineNumber.substr(0, vOutlineNumber.lastIndexOf('.'))];
+                }
+                var pNotes = void 0;
+                try {
+                    pNotes = Task[i].getElementsByTagName('Notes')[0].childNodes[1].nodeValue; //this should be a CDATA node
+                }
+                catch (error) {
+                    pNotes = '';
+                }
+                var pRes = void 0;
+                if (typeof assRes[pID] != 'undefined')
+                    pRes = assRes[pID];
+                else
+                    pRes = '';
+                var predecessors = exports.findXMLNode(Task[i], 'PredecessorLink');
+                if (typeof predecessors == 'undefined')
+                    j = 0;
+                else
+                    j = predecessors.length;
+                var pDepend = '';
+                for (k = 0; k < j; k++) {
+                    var depUID = exports.getXMLNodeValue(predecessors[k], 'PredecessorUID', 1, -1);
+                    var depType = exports.getXMLNodeValue(predecessors[k], 'Type', 1, 1);
+                    if (depUID > 0) {
+                        if (pDepend.length > 0)
+                            pDepend += ',';
+                        switch (depType) {
+                            case 0:
+                                pDepend += depUID + 'FF';
+                                break;
+                            case 1:
+                                pDepend += depUID + 'FS';
+                                break;
+                            case 2:
+                                pDepend += depUID + 'SF';
+                                break;
+                            case 3:
+                                pDepend += depUID + 'SS';
+                                break;
+                            default:
+                                pDepend += depUID + 'FS';
+                                break;
+                        }
+                    }
+                }
+                var pOpen = 1;
+                var pCaption = '';
+                var pClass = void 0;
+                if (pGroup > 0)
+                    pClass = 'ggroupblack';
+                else if (pMile > 0)
+                    pClass = 'gmilestone';
+                else
+                    pClass = 'gtaskblue';
+                // check for split tasks
+                var splits = exports.findXMLNode(ass[pID], 'TimephasedData');
+                if (typeof splits == 'undefined')
+                    j = 0;
+                else
+                    j = splits.length;
+                var vSplitStart = pStart;
+                var vSplitEnd = pEnd;
+                var vSubCreated = false;
+                var vDepend = pDepend.replace(/,*[0-9]+[FS]F/g, '');
+                for (k = 0; k < j; k++) {
+                    var vDuration = exports.getXMLNodeValue(splits[k], 'Value', 2, '0');
+                    //remove all text
+                    vDuration = '0' + vDuration.replace(/\D/g, '');
+                    vDuration *= 1;
+                    if ((vDuration == 0 && !vSubCreated) || (k + 1 == j && pGroup == 2)) {
+                        // No time booked in the given period (or last entry)
+                        // Make sure the parent task is set as a combined group
+                        pGroup = 2;
+                        // Handle last loop
+                        if (k + 1 == j)
+                            vDepend = pDepend.replace(/,*[0-9]+[FS]S/g, '');
+                        // Now create a subtask
+                        maxPID++;
+                        vSplitEnd = exports.getXMLNodeValue(splits[k], (k + 1 == j) ? 'Finish' : 'Start', 2, '');
+                        pGanttVar.AddTaskItem(new task_1.TaskItem(maxPID, pName, vSplitStart, vSplitEnd, 'gtaskblue', pLink, pMile, pRes, pComp, 0, pID, pOpen, vDepend, pCaption, pNotes, pGanttVar, pCost, pPlanStart, pPlanEnd, pDuration));
+                        vSubCreated = true;
+                        vDepend = '';
+                    }
+                    else if (vDuration != 0 && vSubCreated) {
+                        vSplitStart = exports.getXMLNodeValue(splits[k], 'Start', 2, '');
+                        vSubCreated = false;
+                    }
+                }
+                if (vSubCreated)
+                    pDepend = '';
+                // Finally add the task
+                pGanttVar.AddTaskItem(new task_1.TaskItem(pID, pName, pStart, pEnd, pClass, pLink, pMile, pRes, pComp, pGroup, pParent, pOpen, pDepend, pCaption, pNotes, pGanttVar, pCost, pPlanStart, pPlanEnd, pDuration));
+            }
+        }
+    }
+    else {
+        Task = pXmlDoc.getElementsByTagName('task');
+        n = Task.length;
+        for (i = 0; i < n; i++) {
+            // optional parameters may not have an entry
+            // Task ID must NOT be zero otherwise it will be skipped
+            var pID = exports.getXMLNodeValue(Task[i], 'pID', 1, 0);
+            if (pID != 0) {
+                var pName = exports.getXMLNodeValue(Task[i], 'pName', 2, 'No Task Name');
+                var pStart = exports.getXMLNodeValue(Task[i], 'pStart', 2, '');
+                var pEnd = exports.getXMLNodeValue(Task[i], 'pEnd', 2, '');
+                var pPlanStart = exports.getXMLNodeValue(Task[i], 'pPlanStart', 2, '');
+                var pPlanEnd = exports.getXMLNodeValue(Task[i], 'pPlanEnd', 2, '');
+                var pDuration = exports.getXMLNodeValue(Task[i], 'pDuration', 2, '');
+                var pLink = exports.getXMLNodeValue(Task[i], 'pLink', 2, '');
+                var pMile = exports.getXMLNodeValue(Task[i], 'pMile', 1, 0);
+                var pComp = exports.getXMLNodeValue(Task[i], 'pComp', 1, 0);
+                var pCost = exports.getXMLNodeValue(Task[i], 'pCost', 2, 0);
+                var pGroup = exports.getXMLNodeValue(Task[i], 'pGroup', 1, 0);
+                var pParent = exports.getXMLNodeValue(Task[i], 'pParent', 1, 0);
+                var pRes = exports.getXMLNodeValue(Task[i], 'pRes', 2, '');
+                var pOpen = exports.getXMLNodeValue(Task[i], 'pOpen', 1, 1);
+                var pDepend = exports.getXMLNodeValue(Task[i], 'pDepend', 2, '');
+                var pCaption = exports.getXMLNodeValue(Task[i], 'pCaption', 2, '');
+                var pNotes = exports.getXMLNodeValue(Task[i], 'pNotes', 2, '');
+                var pClass = exports.getXMLNodeValue(Task[i], 'pClass', 2, '');
+                if (typeof pClass == 'undefined') {
+                    if (pGroup > 0)
+                        pClass = 'ggroupblack';
+                    else if (pMile > 0)
+                        pClass = 'gmilestone';
+                    else
+                        pClass = 'gtaskblue';
+                }
+                // Finally add the task
+                pGanttVar.AddTaskItem(new task_1.TaskItem(pID, pName, pStart, pEnd, pClass, pLink, pMile, pRes, pComp, pGroup, pParent, pOpen, pDepend, pCaption, pNotes, pGanttVar, pCost, pPlanStart, pPlanEnd, pDuration));
+            }
+        }
+    }
+};
+exports.getXMLProject = function () {
+    var vProject = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">';
+    for (var i = 0; i < this.vTaskList.length; i++) {
+        vProject += this.getXMLTask(i, true);
+    }
+    vProject += '</project>';
+    return vProject;
+};
+exports.getXMLTask = function (pID, pIdx) {
+    var i = 0;
+    var vIdx = -1;
+    var vTask = '';
+    var vOutFrmt = date_utils_1.parseDateFormatStr(this.getDateInputFormat() + ' HH:MI:SS');
+    if (pIdx === true)
+        vIdx = pID;
+    else {
+        for (i = 0; i < this.vTaskList.length; i++) {
+            if (this.vTaskList[i].getID() == pID) {
+                vIdx = i;
+                break;
+            }
+        }
+    }
+    if (vIdx >= 0 && vIdx < this.vTaskList.length) {
+        /* Simplest way to return case sensitive node names is to just build a string */
+        vTask = '<task>';
+        vTask += '<pID>' + this.vTaskList[vIdx].getID() + '</pID>';
+        vTask += '<pName>' + this.vTaskList[vIdx].getName() + '</pName>';
+        vTask += '<pStart>' + date_utils_1.formatDateStr(this.vTaskList[vIdx].getStart(), vOutFrmt, this.vLangs[this.vLang]) + '</pStart>';
+        vTask += '<pEnd>' + date_utils_1.formatDateStr(this.vTaskList[vIdx].getEnd(), vOutFrmt, this.vLangs[this.vLang]) + '</pEnd>';
+        vTask += '<pPlanStart>' + date_utils_1.formatDateStr(this.vTaskList[vIdx].getPlanStart(), vOutFrmt, this.vLangs[this.vLang]) + '</pPlanStart>';
+        vTask += '<pPlanEnd>' + date_utils_1.formatDateStr(this.vTaskList[vIdx].getPlanEnd(), vOutFrmt, this.vLangs[this.vLang]) + '</pPlanEnd>';
+        vTask += '<pDuration>' + this.vTaskList[vIdx].getDuration() + '</pDuration>';
+        vTask += '<pClass>' + this.vTaskList[vIdx].getClass() + '</pClass>';
+        vTask += '<pLink>' + this.vTaskList[vIdx].getLink() + '</pLink>';
+        vTask += '<pMile>' + this.vTaskList[vIdx].getMile() + '</pMile>';
+        if (this.vTaskList[vIdx].getResource() != '\u00A0')
+            vTask += '<pRes>' + this.vTaskList[vIdx].getResource() + '</pRes>';
+        vTask += '<pComp>' + this.vTaskList[vIdx].getCompVal() + '</pComp>';
+        vTask += '<pCost>' + this.vTaskList[vIdx].getCost() + '</pCost>';
+        vTask += '<pGroup>' + this.vTaskList[vIdx].getGroup() + '</pGroup>';
+        vTask += '<pParent>' + this.vTaskList[vIdx].getParent() + '</pParent>';
+        vTask += '<pOpen>' + this.vTaskList[vIdx].getOpen() + '</pOpen>';
+        vTask += '<pDepend>';
+        var vDepList = this.vTaskList[vIdx].getDepend();
+        for (i = 0; i < vDepList.length; i++) {
+            if (i > 0)
+                vTask += ',';
+            if (vDepList[i] > 0)
+                vTask += vDepList[i] + this.vTaskList[vIdx].getDepType()[i];
+        }
+        vTask += '</pDepend>';
+        vTask += '<pCaption>' + this.vTaskList[vIdx].getCaption() + '</pCaption>';
+        var vTmpFrag = document.createDocumentFragment();
+        var vTmpDiv = draw_utils_1.newNode(vTmpFrag, 'div', null, null, this.vTaskList[vIdx].getNotes().innerHTML);
+        vTask += '<pNotes>' + vTmpDiv.innerHTML + '</pNotes>';
+        vTask += '</task>';
+    }
+    return vTask;
 };
 
-JSGantt.AddXMLTask=function(pGanttVar, pXmlDoc)
-{
-	var project='';
-	var vMSP=false;
-	var Task;
-	var n=0;
-	var m=0;
-	var i=0;
-	var j=0;
-	var k=0;
-	var maxPID=0;
-	var ass=new Array();
-	var assRes=new Array();
-	var res=new Array();
-	var pars=new Array();
-
-	var projNode=JSGantt.findXMLNode(pXmlDoc,'Project');
-	if (typeof projNode!='undefined' && projNode.length>0) project=projNode[0].getAttribute('xmlns');
-
-	if(project=='http://schemas.microsoft.com/project')
-	{
-		vMSP=true;
-		pGanttVar.setDateInputFormat('yyyy-mm-dd');
-		Task=JSGantt.findXMLNode(pXmlDoc,'Task');
-		if (typeof Task=='undefined')n=0;
-		else n=Task.length;
-
-		var resources=JSGantt.findXMLNode(pXmlDoc,'Resource');
-		if (typeof resources=='undefined'){n=0; m=0;}
-		else m=resources.length;
-
-		for(i=0;i<m;i++)
-		{
-			var resname=JSGantt.getXMLNodeValue(resources[i],'Name',2,'');
-			var uid=JSGantt.getXMLNodeValue(resources[i],'UID',1,-1);
-
-			if (resname.length>0 && uid>0) res[uid]=resname;
-		}
-
-		var assignments=JSGantt.findXMLNode(pXmlDoc,'Assignment');
-		if (typeof assignments=='undefined') j=0;
-		else j=assignments.length;
-
-		for(i=0;i<j;i++)
-		{
-			var resUID=JSGantt.getXMLNodeValue(assignments[i],'ResourceUID',1,-1);
-			uid=JSGantt.getXMLNodeValue(assignments[i],'TaskUID',1,-1);
-
-			if (uid>0)
-			{
-				if (resUID>0) assRes[uid]=res[resUID];
-				ass[uid]=assignments[i];
-			}
-		}
-
-		// Store information about parent UIDs in an easily searchable form
-		for(i=0;i<n;i++)
-		{
-			uid=JSGantt.getXMLNodeValue(Task[i],'UID',1,0);
-
-			if(uid!=0) var vOutlineNumber=JSGantt.getXMLNodeValue(Task[i],'OutlineNumber',2,'0');
-			if (uid>0) pars[vOutlineNumber]=uid;
-			if (uid>maxPID)maxPID=uid;
-		}
-
-		for(i=0;i<n;i++)
-		{
-			// optional parameters may not have an entry
-			// Task ID must NOT be zero otherwise it will be skipped
-			var pID=JSGantt.getXMLNodeValue(Task[i],'UID',1,0);
-
-			if(pID!=0)
-			{
-				var pName=JSGantt.getXMLNodeValue(Task[i],'Name',2,'No Task Name');
-				var pStart=JSGantt.getXMLNodeValue(Task[i],'Start',2,'');
-				var pEnd=JSGantt.getXMLNodeValue(Task[i],'Finish',2,'');
-				var pLink=JSGantt.getXMLNodeValue(Task[i],'HyperlinkAddress',2,'');
-				var pMile=JSGantt.getXMLNodeValue(Task[i],'Milestone',1,0);
-				var pComp=JSGantt.getXMLNodeValue(Task[i],'PercentWorkComplete',1,0);
-				var pGroup=JSGantt.getXMLNodeValue(Task[i],'Summary',1,0);
-
-				var pParent=0;
-
-				var vOutlineLevel=JSGantt.getXMLNodeValue(Task[i],'OutlineLevel',1,0);
-				if (vOutlineLevel>1)
-				{
-					vOutlineNumber=JSGantt.getXMLNodeValue(Task[i],'OutlineNumber',2,'0');
-					pParent=pars[vOutlineNumber.substr(0, vOutlineNumber.lastIndexOf('.'))];
-				}
-
-				try {var pNotes=Task[i].getElementsByTagName('Notes')[0].childNodes[1].nodeValue; //this should be a CDATA node
-				} catch (error)
-				{pNotes ='';}
-
-				if(typeof assRes[pID]!='undefined') var pRes=assRes[pID];
-				else pRes='';
-
-				var predecessors=JSGantt.findXMLNode(Task[i],'PredecessorLink');
-				if (typeof predecessors=='undefined') j=0;
-				else j=predecessors.length;
-				var pDepend='';
-
-				for(k=0;k<j;k++)
-				{
-					var depUID=JSGantt.getXMLNodeValue(predecessors[k],'PredecessorUID',1,-1);
-					var depType=JSGantt.getXMLNodeValue(predecessors[k],'Type',1,1);
-
-					if (depUID>0)
-					{
-						if (pDepend.length>0)pDepend+=',';
-						switch(depType)
-						{
-							case 0:  pDepend+=depUID+'FF'; break;
-							case 1:  pDepend+=depUID+'FS'; break;
-							case 2:  pDepend+=depUID+'SF'; break;
-							case 3:  pDepend+=depUID+'SS'; break;
-							default: pDepend+=depUID+'FS'; break;
-						}
-					}
-				}
-
-				var pOpen=1;
-				var pCaption='';
-
-				if(pGroup>0) var pClass ='ggroupblack';
-				else if(pMile>0) pClass ='gmilestone';
-				else pClass ='gtaskblue';
-
-				// check for split tasks
-
-				var splits=JSGantt.findXMLNode(ass[pID],'TimephasedData');
-				if (typeof splits=='undefined') j=0;
-				else j=splits.length;
-
-				var vSplitStart=pStart;
-				var vSplitEnd=pEnd;
-				var vSubCreated=false;
-				var vDepend=pDepend.replace(/,*[0-9]+[FS]F/g,'');
-
-				for(k=0;k<j;k++)
-				{
-					var vDuration=JSGantt.getXMLNodeValue(splits[k],'Value',2,'0');
-					//remove all text
-					vDuration='0'+vDuration.replace(/\D/g,'');
-					vDuration*=1;
-					if ((vDuration==0 && !vSubCreated)|| (k+1==j && pGroup==2))
-					{
-						// No time booked in the given period (or last entry)
-						// Make sure the parent task is set as a combined group
-						pGroup=2;
-						// Handle last loop
-						if (k+1==j)vDepend=pDepend.replace(/,*[0-9]+[FS]S/g,'');
-						// Now create a subtask
-						maxPID++;
-						vSplitEnd=JSGantt.getXMLNodeValue(splits[k],(k+1==j)?'Finish':'Start',2,'');
-						pGanttVar.AddTaskItem(new JSGantt.TaskItem(maxPID, pName, vSplitStart, vSplitEnd, 'gtaskblue', pLink, pMile, pRes, pComp, 0, pID, pOpen, vDepend, pCaption, pNotes, pGanttVar));
-						vSubCreated=true;
-						vDepend='';
-					}
-					else if (vDuration!=0 && vSubCreated)
-					{
-						vSplitStart=JSGantt.getXMLNodeValue(splits[k],'Start',2,'');
-						vSubCreated=false;
-					}
-				}
-				if (vSubCreated)pDepend='';
-
-				// Finally add the task
-				pGanttVar.AddTaskItem(new JSGantt.TaskItem(pID, pName, pStart, pEnd, pClass, pLink, pMile, pRes, pComp, pGroup, pParent, pOpen, pDepend, pCaption, pNotes, pGanttVar));
-			}
-		}
-	}
-	else
-	{
-		Task=pXmlDoc.getElementsByTagName('task');
-		n=Task.length;
-
-		for(i=0;i<n;i++)
-		{
-			// optional parameters may not have an entry
-			// Task ID must NOT be zero otherwise it will be skipped
-			pID=JSGantt.getXMLNodeValue(Task[i],'pID',1,0);
-
-			if(pID!=0)
-			{
-				pName=JSGantt.getXMLNodeValue(Task[i],'pName',2,'No Task Name');
-				pStart=JSGantt.getXMLNodeValue(Task[i],'pStart',2,'');
-				pEnd=JSGantt.getXMLNodeValue(Task[i],'pEnd',2,'');
-				pLink=JSGantt.getXMLNodeValue(Task[i],'pLink',2,'');
-				pMile=JSGantt.getXMLNodeValue(Task[i],'pMile',1,0);
-				pComp=JSGantt.getXMLNodeValue(Task[i],'pComp',1,0);
-				pGroup=JSGantt.getXMLNodeValue(Task[i],'pGroup',1,0);
-				pParent=JSGantt.getXMLNodeValue(Task[i],'pParent',1,0);
-				pRes=JSGantt.getXMLNodeValue(Task[i],'pRes',2,'');
-				pOpen=JSGantt.getXMLNodeValue(Task[i],'pOpen',1,1);
-				pDepend=JSGantt.getXMLNodeValue(Task[i],'pDepend',2,'');
-				pCaption=JSGantt.getXMLNodeValue(Task[i],'pCaption',2,'');
-				pNotes=JSGantt.getXMLNodeValue(Task[i],'pNotes',2,'');
-				pClass=JSGantt.getXMLNodeValue(Task[i],'pClass',2);
-				if (typeof pClass=='undefined')
-				{
-					if(pGroup>0) pClass ='ggroupblack';
-					else if(pMile>0) pClass ='gmilestone';
-					else pClass ='gtaskblue';
-				}
-
-				// Finally add the task
-				pGanttVar.AddTaskItem(new JSGantt.TaskItem(pID, pName, pStart, pEnd, pClass, pLink, pMile, pRes, pComp, pGroup, pParent, pOpen, pDepend, pCaption, pNotes, pGanttVar));
-			}
-		}
-	}
-};
-
-
-JSGantt.benchMark=function(pItem)
-{
-	var vEndTime=new Date().getTime();
-	alert(pItem+': Elapsed time: '+((vEndTime-vBenchTime)/1000)+' seconds.');
-	vBenchTime=new Date().getTime();
-};
-
-JSGantt.getIsoWeek=function(pDate){
-	// We have to compare against the monday of the first week of the year containing 04 jan *not* 01/01
-	// 60*60*24*1000=86400000
-	var dayMiliseconds=86400000;
-	var keyDay=new Date(pDate.getFullYear(),0,4,0,0,0);
-	var keyDayOfWeek=(keyDay.getDay()==0) ? 6 : keyDay.getDay()-1; // define monday as 0
-	var firstMondayYearTime=keyDay.getTime()-(keyDayOfWeek * dayMiliseconds);
-	var thisDate=new Date(pDate.getFullYear(), pDate.getMonth(),pDate.getDate(),0,0,0); // This at 00:00:00
-	var thisTime=thisDate.getTime();
-	var daysFromFirstMonday=Math.round(((thisTime-firstMondayYearTime) / dayMiliseconds));
-	var lastWeek=99;
-	var thisWeek=99;
-
-	var firstMondayYear=new Date(firstMondayYearTime);
-
-	thisWeek=Math.ceil((daysFromFirstMonday+1)/7);
-
-	if (thisWeek<=0) thisWeek=JSGantt.getIsoWeek(new Date(pDate.getFullYear()-1,11,31,0,0,0));
-	else if (thisWeek==53 && (new Date(pDate.getFullYear(),0,1,0,0,0)).getDay()!=4 && (new Date(pDate.getFullYear(),11,31,0,0,0)).getDay()!=4) thisWeek=1;
-	return thisWeek;
-};
-
-JSGantt.addListener=function (eventName, handler, control)
-{
-	// Check if control is a string
-	if (control===String(control)) control=JSGantt.findObj(control);
-
-	if(control.addEventListener) //Standard W3C
-	{
-		return control.addEventListener(eventName, handler, false);
-	}
-	else if (control.attachEvent) //IExplore
-	{
-		return control.attachEvent('on'+eventName, handler);
-	}
-	else
-	{
-		return false;
-	}
-};
-
-JSGantt.addTooltipListeners=function(pGanttChart, pObj1, pObj2)
-{
-	JSGantt.addListener('mouseover', function (e) {JSGantt.showToolTip(pGanttChart, e, pObj2, null, pGanttChart.getTimer());}, pObj1);
-	JSGantt.addListener('mouseout', function (e) {JSGantt.delayedHide(pGanttChart, pGanttChart.vTool, pGanttChart.getTimer());}, pObj1);
-};
-
-JSGantt.addThisRowListeners=function(pGanttChart, pObj1, pObj2)
-{
-	JSGantt.addListener('mouseover', function () {pGanttChart.mouseOver(pObj1, pObj2);}, pObj1);
-	JSGantt.addListener('mouseover', function () {pGanttChart.mouseOver(pObj1, pObj2);}, pObj2);
-	JSGantt.addListener('mouseout', function () {pGanttChart.mouseOut(pObj1, pObj2);}, pObj1);
-	JSGantt.addListener('mouseout', function () {pGanttChart.mouseOut(pObj1, pObj2);}, pObj2);
-};
-
-JSGantt.addFolderListeners=function(pGanttChart, pObj, pID)
-{
-	JSGantt.addListener('click', function () {JSGantt.folder(pID, pGanttChart);}, pObj);
-};
-
-JSGantt.addFormatListeners=function(pGanttChart, pFormat, pObj)
-{
-	JSGantt.addListener('click', function () {JSGantt.changeFormat(pFormat, pGanttChart);}, pObj);
-};
-
-JSGantt.addScrollListeners=function(pGanttChart)
-{
-	JSGantt.addListener('scroll', function () {pGanttChart.getChartBody().scrollTop=pGanttChart.getListBody().scrollTop;}, pGanttChart.getListBody());
-	JSGantt.addListener('scroll', function () {pGanttChart.getListBody().scrollTop=pGanttChart.getChartBody().scrollTop;}, pGanttChart.getChartBody());
-	JSGantt.addListener('scroll', function () {pGanttChart.getChartHead().scrollLeft=pGanttChart.getChartBody().scrollLeft;}, pGanttChart.getChartBody());
-	JSGantt.addListener('scroll', function () {pGanttChart.getChartBody().scrollLeft=pGanttChart.getChartHead().scrollLeft;}, pGanttChart.getChartHead());
-	JSGantt.addListener('resize', function () {pGanttChart.getChartHead().scrollLeft=pGanttChart.getChartBody().scrollLeft;}, window);
-	JSGantt.addListener('resize', function () {pGanttChart.getListBody().scrollTop=pGanttChart.getChartBody().scrollTop;}, window);
-};
+},{"./task":10,"./utils/date_utils":11,"./utils/draw_utils":12,"./utils/general_utils":13}]},{},[1])(1)
+});
\ No newline at end of file
diff --git a/htdocs/includes/jsgantt/main.css b/htdocs/includes/jsgantt/main.css
deleted file mode 100644
index 544192b1b2d..00000000000
--- a/htdocs/includes/jsgantt/main.css
+++ /dev/null
@@ -1,126 +0,0 @@
-body {
-  position: relative;
-}
-
-.product-name {
-  font-family: Satisfy;
-}
-
-#my-navbar-nav {
-  font-size: 16px;
-}
-
-#my-nav-brand {
-  font-size: 24px;
-  margin: 2px 40px 0 10px;
-  color: #ffffff;
-}
-
-#home {
-  background: #323232 url(home-bg.jpg) center 0 no-repeat;
-  background-attachment: fixed;
-  background-size: cover;
-  min-height: 660px;
-  color: #ffffff;
-}
-#home-title {
-  font-size: 70px;
-  margin-top: 180px;
-}
-#home-subtitle {
-  font-size: 36px;
-  margin-top: 40px;
-  margin-bottom: 50px;
-}
-#learn-more {
-  padding: 0;
-  width: 50px;
-  height: 50px;
-  border-radius: 50%;
-  font-size: 38px;
-  margin-top: 60px;
-}
-@media screen and (max-width: 991px) {
-  #learn-more {
-    display: none;
-  }
-}
-
-.section {
-  margin: 0 15vw;
-  padding: 5px 0 0;
-}
-
-h1 {
-  font-family: Kelly Slab;
-  font-size: 56px;
-  margin: 50px 0 20px;
-}
-
-h2 {
-  font-family: Kelly Slab;
-  margin: 20px 0 10px;
-}
-
-h3 {
-  font-family: Kelly Slab;
-}
-#embedded-Gantt, #external-Gantt {
-}
-
-.code-block {
-  background-color: #222222;
-}
-
-.contact-card {
-  max-width: 200px;
-  margin: auto;
-}
-
-.contact-link {
-  font-size: 28px;
-}
-
-.footer {
-  margin-top: 10px;
-  padding-top: 10px;
-  border-top: solid #bbbbbb 1px;
-}
-
-#slide-card {
-  background: transparent;
-  border: none;
-  margin: 180px 50px 50px;
-}
-#slide-dots {
-  background: transparent;
-  border: none;
-}
-.dot {
-  cursor:pointer;
-  height: 13px;
-  width: 13px;
-  margin: 0 2px;
-  background-color: #ffffff;
-  opacity: 0.3;
-  border-radius: 50%;
-  display: inline-block;
-  -webkit-transition: all .5s; /* Safari */
-  transition: all .5s;
-}
-.dot:hover {
-  opacity: 1;
-}
-.dot.active {
-  opacity: 1;
-}
-.slide {
-  width: 100%;
-  height: 150px;
-  font-size: 20px;
-  display: none;
-  opacity: 0;
-}
-.slide-icon {
-  font-size: 60px;
-}
diff --git a/htdocs/includes/jsgantt/main.js b/htdocs/includes/jsgantt/main.js
deleted file mode 100644
index 53f5f8f0c10..00000000000
--- a/htdocs/includes/jsgantt/main.js
+++ /dev/null
@@ -1,85 +0,0 @@
-$(document).ready(function() {
-
-  // Scrollspy changes navbar active links
-    $("body").scrollspy({target:"#my-navbar-nav", offset:50});
-
-  // Smooth scroll
-    $("a").click(function(event) {
-      if (this.hash !== "") {
-       event.preventDefault();
-       var linkOffset = 0;
-       if ($.inArray(this.hash,["#options","#xmlExport","#optionsLanguage","#setDayMajorDateDisplayFormat"]) != -1) {
-         linkOffset = -25;
-       }
-       $("html, body").animate({
-         scrollTop: $(this.hash).offset().top - $(".navbar").height() + linkOffset
-       }, 600);
-      }
-    });
-
-  // Demo buttons
-    $("#embedded-Gantt").hide(0);
-    $("#external-Gantt").hide(0);
-
-    $(".btn-demo").click(function() {
-      if ($(this).html().indexOf("Embedded Code") != -1) {
-        if ($("#external-Gantt").is(":visible")) {
-          $("#external-Gantt").animate({
-            height: "toggle",
-            opacity: "toggle"}, 300, function () {
-              $("#embedded-Gantt").animate({
-                height: "toggle",
-                opacity: "toggle"}, 600
-              );
-            }
-          );
-          $(".btn-demo:nth-child(2)").removeClass("active");
-        } else {
-          $("#embedded-Gantt").animate({
-            height: "toggle",
-            opacity: "toggle"}, 600
-          );
-        }
-      } else {
-        if ($("#embedded-Gantt").is(":visible")) {
-          $("#embedded-Gantt").animate({
-            height: "toggle",
-            opacity: "toggle"}, 300, function() {
-              $("#external-Gantt").animate({
-                height: "toggle",
-                opacity: "toggle"}, 600
-              );
-            }
-          );
-          $(".btn-demo:nth-child(1)").removeClass("active");
-        } else {
-          $("#external-Gantt").animate({
-            height: "toggle",
-            opacity: "toggle"}, 600
-          );
-        }
-      }
-    });
-
-  // Slideshow
-    var slideIndex = 0;
-    carousel();
-
-    function carousel() {
-      var i;
-      var x = document.getElementsByClassName("slide");
-      var d = document.getElementsByClassName("dot");
-      for (i = 0; i < x.length; i++) {
-        x[i].style.display = "none";
-      }
-      slideIndex++;
-      if (slideIndex > x.length) {slideIndex = 1}
-      x[slideIndex-1].style.display = "inline-block";
-      $(".slide:nth-child(" + (slideIndex).toString() + ")").animate({
-        opacity: 1
-      }, 500);
-      $(".dot").removeClass("active");
-      $(".dot:nth-child(" + (slideIndex).toString() + ")").addClass("active");
-      setTimeout(carousel, 2000); // Change image every 2 seconds
-    }
-  });
diff --git a/htdocs/includes/jsgantt/project.xml b/htdocs/includes/jsgantt/project.xml
deleted file mode 100644
index 80637aa7cae..00000000000
--- a/htdocs/includes/jsgantt/project.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<task>
-		<pID>10</pID>
-		<pName>WCF Changes</pName>
-		<pStart></pStart>
-		<pEnd></pEnd>
-		<pClass>ggroupblack</pClass>
-		<pLink></pLink>
-		<pMile>0</pMile>
-		<pRes></pRes>
-		<pComp>0</pComp>
-		<pGroup>1</pGroup>
-		<pParent>0</pParent>
-		<pOpen>1</pOpen>
-		<pDepend />
-	</task>
-	<task>
-		<pID>20</pID>
-		<pName>Move to WCF from remoting</pName>
-		<pStart>2017-05-11 09:00</pStart>
-		<pEnd>2017-05-15</pEnd>
-		<pClass>gtaskblue</pClass>
-		<pLink></pLink>
-		<pMile>0</pMile>
-		<pRes>Paul</pRes>
-		<pComp>10</pComp>
-		<pGroup>0</pGroup>
-		<pParent>10</pParent>
-		<pOpen>1</pOpen>
-		<pDepend></pDepend>
-		<pCaption>Paul</pCaption>
-		<pNotes>This text is only available in tool tips</pNotes>
-	</task>
-	<task>
-		<pID>30</pID>
-		<pName>add Auditing</pName>
-		<pStart>2017-05-18 10:30</pStart>
-		<pEnd>2017-05-20 12:00</pEnd>
-		<pClass>gtaskblue</pClass>
-		<pLink></pLink>
-		<pMile>0</pMile>
-		<pRes>Eduardo</pRes>
-		<pComp>50</pComp>
-		<pGroup>0</pGroup>
-		<pParent>10</pParent>
-		<pOpen>1</pOpen>
-		<pDepend>20</pDepend>
-		<pCaption>Eduardo</pCaption>
-	</task>
-	<task>
-		<pID>40</pID>
-		<pName>Yet another task</pName>
-		<pStart>2017-05-24</pStart>
-		<pEnd>2017-05-25</pEnd>
-		<pClass>gtaskblue</pClass>
-		<pLink></pLink>
-		<pMile>0</pMile>
-		<pRes>Ricardo</pRes>
-		<pComp>30</pComp>
-		<pGroup>0</pGroup>
-		<pParent>0</pParent>
-		<pOpen>1</pOpen>
-		<pDepend>20,30</pDepend>
-		<pCaption>Ricardo</pCaption>
-	</task>
-	<task>
-		<pID>50</pID>
-		<pName>Another Group</pName>
-		<pStart></pStart>
-		<pEnd></pEnd>
-		<pClass>ggroupblack</pClass>
-		<pLink></pLink>
-		<pMile>0</pMile>
-		<pRes></pRes>
-		<pComp>0</pComp>
-		<pGroup>1</pGroup>
-		<pParent>0</pParent>
-		<pOpen>1</pOpen>
-		<pDepend />
-	</task>
-	<task>
-		<pID>60</pID>
-		<pName>Move to GitHub</pName>
-		<pStart>2017-05-14 09:00</pStart>
-		<pEnd>2017-05-16</pEnd>
-		<pClass>gtaskblue</pClass>
-		<pLink></pLink>
-		<pMile>0</pMile>
-		<pRes>Ricardo</pRes>
-		<pComp>10</pComp>
-		<pGroup>0</pGroup>
-		<pParent>50</pParent>
-		<pOpen>1</pOpen>
-		<pDepend></pDepend>
-		<pCaption>Ricardo</pCaption>
-		<pNotes>This text is only available in tool tips</pNotes>
-	</task>
-	<task>
-		<pID>70</pID>
-		<pName>Updating files</pName>
-		<pStart>2017-05-18 10:30</pStart>
-		<pEnd>2017-05-21 12:00</pEnd>
-		<pClass>gtaskred</pClass>
-		<pLink></pLink>
-		<pMile>0</pMile>
-		<pRes>Paul</pRes>
-		<pComp>50</pComp>
-		<pGroup>0</pGroup>
-		<pParent>50</pParent>
-		<pOpen>1</pOpen>
-		<pDepend>60</pDepend>
-		<pCaption>Paul</pCaption>
-	</task>
-	<task>
-		<pID>80</pID>
-		<pName>Yet another task</pName>
-		<pStart>2017-05-23</pStart>
-		<pEnd>2017-05-25</pEnd>
-		<pClass>gtaskyellow</pClass>
-		<pLink></pLink>
-		<pMile>0</pMile>
-		<pRes>Eduardo</pRes>
-		<pComp>30</pComp>
-		<pGroup>0</pGroup>
-		<pParent>50</pParent>
-		<pOpen>1</pOpen>
-		<pDepend>60,70</pDepend>
-		<pCaption>Eduardo</pCaption>
-	</task>
-</project>
diff --git a/htdocs/projet/ganttchart.inc.php b/htdocs/projet/ganttchart.inc.php
index 457345d2fe3..bacd7607f82 100644
--- a/htdocs/projet/ganttchart.inc.php
+++ b/htdocs/projet/ganttchart.inc.php
@@ -126,9 +126,14 @@ if (g.getDivId() != null)
 			$projecttmp = new Project($db);
 			$projecttmp->fetch($t['task_project_id']);
 			$tmpt = array(
-				'task_id'=> '-'.$t['task_project_id'], 'task_alternate_id'=> '-'.$t['task_project_id'], 'task_name'=>$projecttmp->ref.' '.$projecttmp->title, 'task_resources'=>'',
-				'task_start_date'=>'', 'task_end_date'=>'',
-				'task_is_group'=>1, 'task_position'=>0, 'task_css'=>'ggroupblack', 'task_milestone'=> 0, 'task_parent'=>0, 'task_parent_alternate_id'=>0, 'task_notes'=>'',
+				'task_id'=> '-'.$t['task_project_id'],
+				'task_alternate_id'=> '-'.$t['task_project_id'],
+				'task_name'=>$projecttmp->ref.' '.$projecttmp->title,
+				'task_resources'=>'',
+				'task_start_date'=>'',
+				'task_end_date'=>'',
+				'task_is_group'=>1, 'task_position'=>0, 'task_css'=>'ggroupblack', 'task_milestone'=> 0, 'task_parent'=>0, 'task_parent_alternate_id'=>0,
+				'task_notes'=>'',
 				'task_planned_workload'=>0
 			);
 			constructGanttLine($tasks, $tmpt, array(), 0, $t['task_project_id']);
@@ -180,6 +185,7 @@ function constructGanttLine($tarr, $task, $task_dependencies, $level = 0, $proje
 	$end_date = dol_print_date($end_date, $dateformatinput2);
 	// Resources
 	$resources = $task["task_resources"];
+
 	// Define depend (ex: "", "4,13", ...)
 	$depend = '';
 	$count = 0;
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index eeb2fcb7659..8b2f41554d3 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -334,10 +334,11 @@ if (count($tasksarray) > 0)
 				}
 			}
 		}
-		//if ($s) $tasks[$taskcursor]['task_resources']='<a href="'.DOL_URL_ROOT.'/projet/tasks/contact.php?id='.$val->id.'&withproject=1" title="'.dol_escape_htmltag($s).'">'.$langs->trans("List").'</a>';
+
 		/* For JSGanttImproved */
 		//if ($s) $tasks[$taskcursor]['task_resources']=implode(',',$idofusers);
 		$tasks[$taskcursor]['task_resources'] = $s;
+		if ($s) $tasks[$taskcursor]['task_resources'] = '<a href="'.DOL_URL_ROOT.'/projet/tasks/contact.php?id='.$val->id.'&withproject=1" title="'.dol_escape_htmltag($s).'">'.$langs->trans("List").'</a>';
 		//print "xxx".$val->id.$tasks[$taskcursor]['task_resources'];
 		$tasks[$taskcursor]['note'] = $task->note_public;
 		$taskcursor++;
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 40440f4fc41..24751dfb9d7 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -5095,10 +5095,15 @@ td.gminorheading {
 .glistlbl, .glistgrid {
 	width: 582px !important;
 }
-.gtaskname div, .gtaskname {
+/*.gtaskname div, .gtaskname {
     min-width: 250px !important;
     max-width: 250px !important;
     width: 250px !important;
+}*/
+.gtaskname div, .gtaskname {
+    min-width: 250px !important;
+    max-width: unset !important;
+    width: unset !important;
 }
 .gpccomplete div, .gpccomplete {
     min-width: 40px !important;
@@ -5108,7 +5113,12 @@ td.gminorheading {
 td.gtaskheading.gstartdate, td.gtaskheading.genddate {
     white-space: break-spaces;
 }
-
+.gtasktableh tr:nth-child(2) td:nth-child(2), .gtasktableh tr:nth-child(2) td:nth-child(3), .gtasktableh tr:nth-child(2) td:nth-child(4), .gtasktableh tr:nth-child(2) td:nth-child(5), .gtasktableh tr:nth-child(2) td:nth-child(6), .gtasktableh tr:nth-child(2) td:nth-child(7) {
+    color: transparent !important;
+    border-left: none;
+    border-right: none;
+    border-top: none;
+}
 
 /* ============================================================================== */
 /*  jFileTree                                                                     */
diff --git a/htdocs/theme/md/btn.inc.php b/htdocs/theme/md/btn.inc.php
index 1982fb113b9..1b27e7eeafb 100644
--- a/htdocs/theme/md/btn.inc.php
+++ b/htdocs/theme/md/btn.inc.php
@@ -359,12 +359,41 @@ div.pagination .btnTitle:hover .btnTitle-label{
     display: block;
 }
 
-
-
-
+/* rule to reduce top menu - 2nd reduction: Reduce width of top menu icons again */
+@media only screen and (max-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC2) ? round($nbtopmenuentries * 69, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC2; ?>px)	/* reduction 2 */
+{
+	.butAction, .butActionRefused, .butActionDelete {
+		font-size: 0.95em;
+	}
+	.btnTitle, a.btnTitle {
+	    display: inline-block;
+	    padding: 4px 4px 4px 4px;
+		min-width: unset;
+	}
+}
 
 <?php if (!empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) && (!$user->admin)) { ?>
 .butActionRefused, .butActionNewRefused, .btnTitle.refused {
     display: none !important;
 }
-<?php }
+<?php } ?>
+
+
+/*
+ * BTN LINK
+ */
+
+.btn-link{
+	margin-right: 5px;
+	border: 1px solid #ddd;
+	color: #333;
+	padding: 5px 10px;
+	border-radius:1em;
+	text-decoration: none !important;
+}
+
+.btn-link:hover{
+	background-color: #ddd;
+	border: 1px solid #ddd;
+}
+
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 003416a5baf..f1084f5a537 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -549,8 +549,8 @@ input.removedfile {
 }
 
 input[type=file ]    { background-color: transparent; border-top: none; border-left: none; border-right: none; box-shadow: none; }
-input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; }
-input[type=radio]    { background-color: transparent; border: none; box-shadow: none; }
+input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; vertical-align: middle; }
+input[type=radio]    { background-color: transparent; border: none; box-shadow: none; vertical-align: middle; }
 input[type=image]    { background-color: transparent; border: none; box-shadow: none; }
 input:-webkit-autofill {
 	background-color: #FBFFEA !important;
@@ -1899,6 +1899,11 @@ img.photoref, div.photoref {
 	width: 80px;
     object-fit: contain;
 }
+
+div.photoref .fa, div.photoref .fas, div.photoref .far {
+    font-size: 2.5em;
+}
+
 img.fitcontain {
     object-fit: contain;
 }
@@ -4071,7 +4076,6 @@ div.titre {
     padding-bottom: 5px;
     text-transform: uppercase;
 	/* text-shadow: 1px 1px 2px #FFFFFF; */
-	<?php print (empty($conf->dol_optimize_smallscreen) ? '' : 'margin-top: 4px;'); ?>
 }
 div.titre {
 	color: var(--colortexttitlenotab);
@@ -5000,6 +5004,12 @@ td.gminorheading {
 td.gtaskheading.gstartdate, td.gtaskheading.genddate {
     white-space: break-spaces;
 }
+.gtasktableh tr:nth-child(2) td:nth-child(2), .gtasktableh tr:nth-child(2) td:nth-child(3), .gtasktableh tr:nth-child(2) td:nth-child(4), .gtasktableh tr:nth-child(2) td:nth-child(5), .gtasktableh tr:nth-child(2) td:nth-child(6), .gtasktableh tr:nth-child(2) td:nth-child(7) {
+    color: transparent !important;
+    border-left: none;
+    border-right: none;
+    border-top: none;
+}
 
 
 /* ============================================================================== */
@@ -6484,12 +6494,10 @@ div.phpdebugbar-widgets-templates a.phpdebugbar-widgets-editor-link:before
 		padding-right: 5px;
 	}
     img.photoref, div.photoref {
-    	border: none;
+    	border: 1px solid rgba(0, 0, 0, 0.2);
     	-webkit-box-shadow: none;
         box-shadow: none;
         padding: 4px;
-    	height: 20px;
-    	width: 20px;
         object-fit: contain;
     }
 

From 943f1022c01da67fe383134efb6f5d33092dc1da Mon Sep 17 00:00:00 2001
From: zuiko <zuiko@free.fr>
Date: Tue, 15 Dec 2020 09:26:27 +0100
Subject: [PATCH 430/888] Update fournisseurs.php

Product: purchase price tab, the supplier price table with its list of products is not "responsive", as a result, the right-clickable areas, including the "Add purchase price" button, disappear to the right of the screens that are not full HD which forces the user to drag his window with the mouse.
The solution is to change the CSS class of the table to adopt the CSS class of the equivalent table of the selling price tab, which is "responsive" to it.
We therefore replace :
print '<table class="centpercent list">';
by :
print '<table class="noborder centpercent">';

Knowing that the class is used in 24 files, there might be other places where this class poses the same ergonomic problem. I don't know enough Dolibarr to generalize the correction ...
---
 htdocs/product/fournisseurs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 3e43937e697..b6f09346385 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -877,7 +877,7 @@ SCRIPT;
 
 				// Suppliers list title
 				print '<div class="div-table-responsive">';
-				print '<table class="liste centpercent">';
+				print '<table class="noborder centpercent">';
 
 				$param = "&id=".$object->id;
 

From 5ec7b01fb4817badfeb51205caa6a1960c12306c Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 15 Dec 2020 09:34:46 +0100
Subject: [PATCH 431/888] FIX: Link to subaccount ledger

---
 htdocs/accountancy/bookkeeping/listbyaccount.php | 2 +-
 htdocs/langs/en_US/accountancy.lang              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 18661f8a887..cd15eea52be 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -380,7 +380,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
 	$newcardbutton = dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param);
-	$newcardbutton .= dolGetButtonTitle($langs->trans('VueByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('VueBySubAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbysubaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
 
 	$newcardbutton .= ' &nbsp; ';
 
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 41a4cfa59d5..82338c8f98d 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup

From 1624b8636f402d916d6a49312e3e71400372af6d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Dec 2020 10:43:19 +0100
Subject: [PATCH 432/888] Show timeone

---
 htdocs/core/boxes/box_scheduled_jobs.php |  4 ++--
 htdocs/cron/card.php                     | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/boxes/box_scheduled_jobs.php b/htdocs/core/boxes/box_scheduled_jobs.php
index 81e73f4e0c1..23d520e9a8a 100644
--- a/htdocs/core/boxes/box_scheduled_jobs.php
+++ b/htdocs/core/boxes/box_scheduled_jobs.php
@@ -71,7 +71,7 @@ class box_scheduled_jobs extends ModeleBoxes
 	 */
 	public function loadBox($max = 5)
 	{
-		global $user, $langs, $conf;
+		global $user, $langs, $conf, $form;
 
 		$langs->load("cron");
 		$this->info_box_head = array('text' => $langs->trans("BoxScheduledJobs", $max));
@@ -151,7 +151,7 @@ class box_scheduled_jobs extends ModeleBoxes
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'textnoformat' => dol_print_date($resultarray[$line][2], "dayhoursec")
+						'textnoformat' => (empty($resultarray[$line][2]) ? '' : $form->textwithpicto(dol_print_date($resultarray[$line][2], "dayhoursec"), $langs->trans("CurrentTimeZone")))
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right" ',
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index b0e5936d326..facb5976f85 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -623,12 +623,12 @@ if (($action == "create") || ($action == "edit"))
 
 	print '<tr><td>';
 	print $langs->trans('CronDtStart')."</td><td>";
-	if (!empty($object->datestart)) {print dol_print_date($object->datestart, 'dayhoursec'); }
+	if (!empty($object->datestart)) {print $form->textwithpicto(dol_print_date($object->datestart, 'dayhoursec'), $langs->trans("CurrentTimeZone")); }
 	print "</td></tr>";
 
 	print "<tr><td>";
 	print $langs->trans('CronDtEnd')."</td><td>";
-	if (!empty($object->dateend)) {print dol_print_date($object->dateend, 'dayhoursec'); }
+	if (!empty($object->dateend)) {print $form->textwithpicto(dol_print_date($object->dateend, 'dayhoursec'), $langs->trans("CurrentTimeZone")); }
 	print "</td></tr>";
 
 	print "<tr><td>";
@@ -653,7 +653,7 @@ if (($action == "create") || ($action == "edit"))
 	print ' ('.$langs->trans('CronFrom').')';
 	print "</td><td>";
 	if (!$object->status) print $langs->trans("Disabled");
-	elseif (!empty($object->datenextrun)) { print img_picto('', 'object_calendarday').' '.dol_print_date($object->datenextrun, 'dayhoursec'); } else { print $langs->trans('CronNone'); }
+	elseif (!empty($object->datenextrun)) { print img_picto('', 'object_calendarday').' '.$form->textwithpicto(dol_print_date($object->datenextrun, 'dayhoursec'), $langs->trans("CurrentTimeZone")); } else { print $langs->trans('CronNone'); }
 	if ($object->status == Cronjob::STATUS_ENABLED)
 	{
 		if ($object->maxrun && $object->nbrun >= $object->maxrun) print img_warning($langs->trans("MaxRunReached"));
@@ -672,12 +672,12 @@ if (($action == "create") || ($action == "edit"))
 
 	print '<tr><td class="titlefield">';
 	print $langs->trans('CronDtLastLaunch')."</td><td>";
-	if (!empty($object->datelastrun)) {print dol_print_date($object->datelastrun, 'dayhoursec'); } else {print $langs->trans('CronNone'); }
+	if (!empty($object->datelastrun)) {print $form->textwithpicto(dol_print_date($object->datelastrun, 'dayhoursec'), $langs->trans("CurrentTimeZone")); } else {print $langs->trans('CronNone'); }
 	print "</td></tr>";
 
 	print '<tr><td>';
 	print $langs->trans('CronDtLastResult')."</td><td>";
-	if (!empty($object->datelastresult)) {print dol_print_date($object->datelastresult, 'dayhoursec'); } else {print $langs->trans('CronNone'); }
+	if (!empty($object->datelastresult)) {print $form->textwithpicto(dol_print_date($object->datelastresult, 'dayhoursec'), $langs->trans("CurrentTimeZone")); } else {print $langs->trans('CronNone'); }
 	print "</td></tr>";
 
 	print '<tr><td>';

From f2a4f880ca8fbdf89014fcaa35097f2a208f3f54 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Dec 2020 10:49:07 +0100
Subject: [PATCH 433/888] Fix warning

---
 htdocs/core/class/dolgraph.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 36638be33c1..4495c5ae50d 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -1215,6 +1215,7 @@ class DolGraph
 				} else {
 					$textoflegend = $this->Legend[$i];
 				}
+
 				if ($usecolorvariantforgroupby) {
 					$newcolor = $this->datacolor[$arrayofgroupslegend[$i]['stacknum']];
 					// If we change the stack
@@ -1243,6 +1244,7 @@ class DolGraph
 					$bordercolor = 'rgb(' . $newcolor[0] . ', ' . $newcolor[1] . ', ' . $newcolor[2] . ')';
 				} else { // We do not use a 'group by'
 					if ($isfunnel) {
+						$bordercolor == 'null';
 						if (is_array($this->datacolor[$i])) {
 							$color = 'rgb(' . $this->datacolor[$i][0] . ', ' . $this->datacolor[$i][1] . ', ' . $this->datacolor[$i][2] . ', 0.9)'; // If datacolor is array(R, G, B)
 						} else {
@@ -1262,9 +1264,9 @@ class DolGraph
 									if (strpos($tmp, '-') !== false) $bordercolor = '#' . str_replace('-', '', $tmp); // If $val is '-123'
 									else $bordercolor = 'null'; // If $val is '123' or '#123'
 								}
-								$bordercolor == 'null' ? "'rgba(0,0,0,0.2)'" : "'" . $bordercolor . "'";
 							}
 						}
+						$bordercolor == 'null' ? "'rgba(0,0,0,0.2)'" : "'" . $bordercolor . "'";
 					} else {
 						$color = 'rgb('.$this->datacolor[$i][0].', '.$this->datacolor[$i][1].', '.$this->datacolor[$i][2].', 0.9)';
 						$bordercolor = $color;

From 32741dd6f67c080c753d321ef0329ec901941212 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Dec 2020 10:51:35 +0100
Subject: [PATCH 434/888] Fix warning

---
 .../supplier_proposal/class/supplier_proposal.class.php   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index b022c76d0d8..cf8e712a103 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -547,8 +547,8 @@ class SupplierProposal extends CommonObject
 			$this->line->tva_tx = $txtva;
 			$this->line->localtax1_tx = ($total_localtax1 ? $localtaxes_type[1] : 0);
 			$this->line->localtax2_tx = ($total_localtax2 ? $localtaxes_type[3] : 0);
-			$this->line->localtax1_type = $localtaxes_type[0];
-			$this->line->localtax2_type = $localtaxes_type[2];
+			$this->line->localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
+			$this->line->localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
 			$this->line->fk_product = $fk_product;
 			$this->line->remise_percent = $remise_percent;
 			$this->line->subprice = $pu_ht;
@@ -736,8 +736,8 @@ class SupplierProposal extends CommonObject
 			$this->line->tva_tx = $txtva;
 			$this->line->localtax1_tx		= $txlocaltax1;
 			$this->line->localtax2_tx		= $txlocaltax2;
-			$this->line->localtax1_type		= $localtaxes_type[0];
-			$this->line->localtax2_type		= $localtaxes_type[2];
+			$this->line->localtax1_type		= empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
+			$this->line->localtax2_type		= empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
 			$this->line->remise_percent		= $remise_percent;
 			$this->line->subprice			= $pu;
 			$this->line->info_bits			= $info_bits;

From 31693eed21ffa7fd8784e42527cb76ec7a0910d3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Dec 2020 11:10:35 +0100
Subject: [PATCH 435/888] Fix setup was not clear

---
 htdocs/langs/am_ET/products.lang |  2 +-
 htdocs/langs/en_US/admin.lang    |  1 +
 htdocs/langs/en_US/products.lang |  3 +-
 htdocs/product/admin/product.php | 53 ++++++++++++++++++--------------
 4 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/htdocs/langs/am_ET/products.lang b/htdocs/langs/am_ET/products.lang
index 97db059594f..18af7f2f252 100644
--- a/htdocs/langs/am_ET/products.lang
+++ b/htdocs/langs/am_ET/products.lang
@@ -108,7 +108,7 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index b6784b75835..d314c44aa0e 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -56,6 +56,7 @@ GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
+ModuleMustBeEnabled=Module <b>%s</b> must be enabled
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 8c30b2e02c1..f0c4a5362b8 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 16c3c849ce6..af158278079 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -127,8 +127,8 @@ if ($action == 'other')
 	$value = GETPOST('price_base_type', 'alpha');
 	$res = dolibarr_set_const($db, "PRODUCT_PRICE_BASE_TYPE", $value, 'chaine', 0, '', $conf->entity);
 
-	$value = GETPOST('PRODUIT_SOUSPRODUITS', 'alpha');
-	$res = dolibarr_set_const($db, "PRODUIT_SOUSPRODUITS", $value, 'chaine', 0, '', $conf->entity);
+	/*$value = GETPOST('PRODUIT_SOUSPRODUITS', 'alpha');
+	$res = dolibarr_set_const($db, "PRODUIT_SOUSPRODUITS", $value, 'chaine', 0, '', $conf->entity);*/
 
 	$value = GETPOST('activate_viewProdDescInForm', 'alpha');
 	$res = dolibarr_set_const($db, "PRODUIT_DESC_IN_FORM", $value, 'chaine', 0, '', $conf->entity);
@@ -312,7 +312,6 @@ print '  <td class="center" width="80">'.$langs->trans("Status").'</td>';
 print '  <td class="center" width="60">'.$langs->trans("ShortInfo").'</td>';
 print "</tr>\n";
 
-$var = true;
 foreach ($dirproduct as $dirroot)
 {
 	$dir = dol_buildpath($dirroot, 0);
@@ -340,7 +339,6 @@ foreach ($dirproduct as $dirroot)
 				if ($modCodeProduct->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 				if ($modCodeProduct->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-				$var = !$var;
 				print '<tr class="oddeven">'."\n";
 				print '<td width="140">'.$modCodeProduct->name.'</td>'."\n";
 				print '<td>'.$modCodeProduct->info($langs).'</td>'."\n";
@@ -537,17 +535,35 @@ print '<td class="right" width="60">'.$langs->trans("Value").'</td>'."\n";
 print '</tr>'."\n";
 
 
-/*
- * Other parameters
- */
+// Enable kits (subproducts)
 
-$rowspan = 4;
-if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $rowspan++;
-if (empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) $rowspan++;
-if (!empty($conf->global->MAIN_MULTILANGS)) $rowspan++;
-if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) $rowspan++;
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("AssociatedProductsAbility").'</td>';
+print '<td class="right">';
+print ajax_constantonoff("PRODUIT_SOUSPRODUITS", array(), $conf->entity, 0, 0, 1, 0);
+//print $form->selectyesno("PRODUIT_SOUSPRODUITS", $conf->global->PRODUIT_SOUSPRODUITS, 1);
+print '</td>';
+print '</tr>';
 
 
+// Enable variants
+
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("VariantsAbility").'</td>';
+print '<td class="right">';
+//print ajax_constantonoff("PRODUIT_SOUSPRODUITS", array(), $conf->entity, 0, 0, 1, 0);
+//print $form->selectyesno("PRODUIT_SOUSPRODUITS", $conf->global->PRODUIT_SOUSPRODUITS, 1);
+if (empty($conf->variants->enabled)) {
+	print '<span class="opacitymedium">'.$langs->trans("ModuleMustBeEnabled", $langs->transnoentitiesnoconv("Module610Name")).'</span>';
+} else {
+	print yn(1).' <span class="opacitymedium">('.$langs->trans("ModuleIsEnabled", $langs->transnoentitiesnoconv("Module610Name")).')</span>';
+}
+print '</td>';
+print '</tr>';
+
+
+// Rule for price
+
 print '<tr class="oddeven">';
 if (empty($conf->multicompany->enabled))
 {
@@ -575,7 +591,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 	print '</tr>';
 }
 
-//Default product price base type
+// Default product price base type
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("DefaultPriceType").'</td>';
 print '<td width="60" class="right">';
@@ -583,16 +599,7 @@ print $form->selectPriceBaseType($conf->global->PRODUCT_PRICE_BASE_TYPE, "price_
 print '</td>';
 print '</tr>';
 
-// sousproduits activation/desactivation
-
-print '<tr class="oddeven">';
-print '<td>'.$langs->trans("AssociatedProductsAbility").'</td>';
-print '<td class="right">';
-print $form->selectyesno("PRODUIT_SOUSPRODUITS", $conf->global->PRODUIT_SOUSPRODUITS, 1);
-print '</td>';
-print '</tr>';
-
-// Utilisation formulaire Ajax sur choix produit
+// Use Ajax form to select a product
 
 print '<tr class="oddeven">';
 print '<td>'.$form->textwithpicto($langs->trans("UseSearchToSelectProduct"), $langs->trans('UseSearchToSelectProductTooltip'), 1).'</td>';

From 2ae1aac5a46b53cf7df7c2e449aa02ba81fc3610 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Dec 2020 11:18:29 +0100
Subject: [PATCH 436/888] Fix setup

---
 htdocs/core/class/html.form.class.php | 8 ++++----
 htdocs/langs/en_US/admin.lang         | 3 ++-
 htdocs/langs/en_US/modulebuilder.lang | 1 -
 htdocs/modulebuilder/index.php        | 2 +-
 htdocs/product/admin/product.php      | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index fdcdc89e53e..57e48242ce3 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3611,15 +3611,14 @@ class Form
 	 *
 	 *  @param	string	$selected       Id pre-selectionne
 	 *  @param  string	$htmlname       Nom de la zone select
+	 *  @param	string	$addjscombo		Add js combo
 	 * 	@return	string					Code of HTML select to chose tax or not
 	 */
-	public function selectPriceBaseType($selected = '', $htmlname = 'price_base_type')
+	public function selectPriceBaseType($selected = '', $htmlname = 'price_base_type', $addjscombo = 0)
 	{
 		global $langs;
 
-		$return = '';
-
-		$return .= '<select class="flat maxwidth75" id="select_'.$htmlname.'" name="'.$htmlname.'">';
+		$return = '<select class="flat maxwidth100" id="select_'.$htmlname.'" name="'.$htmlname.'">';
 		$options = array(
 			'HT'=>$langs->trans("HT"),
 			'TTC'=>$langs->trans("TTC")
@@ -3635,6 +3634,7 @@ class Form
 			$return .= '</option>';
 		}
 		$return .= '</select>';
+		if ($addjscombo) $return .= ajax_combobox('select_'.$htmlname);
 
 		return $return;
 	}
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index d314c44aa0e..8e087ae6110 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -56,7 +56,8 @@ GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
-ModuleMustBeEnabled=Module <b>%s</b> must be enabled
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 6b61f8c06c1..6f8fdcad996 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -126,7 +126,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index babce9eba15..fba9b0d4855 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -2385,7 +2385,7 @@ if ($module == 'initmodule')
 		   					print ' &nbsp; ';
 		   					if (empty($conf->global->$const_name))	// If module is not activated
 		   					{
-		   						print '<a href="#" target="apiexplorer" title="'.$langs->trans("ModuleMustBeEnabled").'"><strike>'.$langs->trans("GoToApiExplorer").'</strike></a>';
+		   						print '<a href="#" target="apiexplorer" title="'.$langs->trans("ModuleMustBeEnabled", $module).'"><strike>'.$langs->trans("GoToApiExplorer").'</strike></a>';
 		   					} else {
 		   						print '<a href="'.DOL_URL_ROOT.'/api/index.php/explorer/" target="apiexplorer">'.$langs->trans("GoToApiExplorer").'</a>';
 		   					}
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index af158278079..6cd727d33b8 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -594,7 +594,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 // Default product price base type
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("DefaultPriceType").'</td>';
-print '<td width="60" class="right">';
+print '<td class="right">';
 print $form->selectPriceBaseType($conf->global->PRODUCT_PRICE_BASE_TYPE, "price_base_type");
 print '</td>';
 print '</tr>';

From 50b27239a7dcb80b882d7998701931280a404fcd Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Tue, 15 Dec 2020 11:34:04 +0100
Subject: [PATCH 437/888] Fix missing hook for project overview control

---
 htdocs/projet/class/project.class.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index a0b6e38423b..335b06a0456 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -576,6 +576,9 @@ class Project extends CommonObject
 	public function get_element_list($type, $tablename, $datefieldname = '', $dates = '', $datee = '', $projectkey = 'fk_projet')
 	{
 		// phpcs:enable
+
+		global $hookmanager;
+
 		$elements = array();
 
 		if ($this->id <= 0) return $elements;
@@ -630,6 +633,21 @@ class Project extends CommonObject
 			if (empty($datefieldname)) return 'Error this object has no date field defined';
 			$sql .= " AND (".$datefieldname." <= '".$this->db->idate($datee)."' OR ".$datefieldname." IS NULL)";
 		}
+
+		$hookmanager->initHooks(array('projectdao'));
+		$parameters = array(
+			'sql'=>$sql,
+			'type' => $type,
+			'tablename' => $tablename,
+			'datefieldname'  => $datefieldname,
+			'dates' => $dates,
+			'datee' => $datee,
+			'fk_projet' => $projectkey
+		);
+		$reshook = $hookmanager->executeHooks('getElementList', $parameters, $object, $action);
+		if ($reshook > 0) $sql = $hookmanager->resPrint;
+		else $sql .= $hookmanager->resPrint;
+
 		if (!$sql) return -1;
 
 		//print $sql;

From a2bd92037183f7d6885e684e7f4d0a5d1f475caa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Dec 2020 11:39:18 +0100
Subject: [PATCH 438/888] Fix translation of units

---
 htdocs/core/lib/product.lib.php               | 24 ++++++++++-------
 .../product/doc/pdf_standard.modules.php      | 19 +++++++++-----
 htdocs/langs/en_US/other.lang                 |  2 +-
 htdocs/product/class/product.class.php        | 26 +++++++++----------
 4 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 909e51dc6d7..9ce8d84d7e3 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -546,16 +546,17 @@ function show_stats_for_company($product, $socid)
  *	Return translation label of a unit key.
  *  Function kept for backward compatibility.
  *
- *  @param	string  $scale				 Scale of unit: '0', '-3', '6', ...
- *	@param  string	$measuring_style     Style of unit: weight, volume,...
- *	@param	int		$unit                ID of unit (rowid in llx_c_units table)
- *  @param	int		$use_short_label	 1=Use short label ('g' instead of 'gram'). Short labels are not translated.
- *	@return	string	   			         Unit string
+ *  @param	string  	$scale				Scale of unit: '0', '-3', '6', ...
+ *	@param  string		$measuring_style    Style of unit: weight, volume,...
+ *	@param	int			$unit               ID of unit (rowid in llx_c_units table)
+ *  @param	int			$use_short_label	1=Use short label ('g' instead of 'gram'). Short labels are not translated.
+ *  @param	Translate	$outputlangs		Language object
+ *	@return	string	   			         	Unit string
  * 	@see	measuringUnitString() formproduct->selectMeasuringUnits()
  */
-function measuring_units_string($scale = '', $measuring_style = '', $unit = 0, $use_short_label = 0)
+function measuring_units_string($scale = '', $measuring_style = '', $unit = 0, $use_short_label = 0, $outputlangs = null)
 {
-	return measuringUnitString($unit, $measuring_style, $scale, $use_short_label);
+	return measuringUnitString($unit, $measuring_style, $scale, $use_short_label, $outputlangs);
 }
 
 /**
@@ -565,14 +566,19 @@ function measuring_units_string($scale = '', $measuring_style = '', $unit = 0, $
  *	@param  string	$measuring_style     Style of unit: 'weight', 'volume', ..., '' = 'net_measure' for option PRODUCT_ADD_NET_MEASURE
  *  @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.
+ *  @param	Translate	$outputlangs		Language object
  *	@return	string	   			         Unit string
  * 	@see	formproduct->selectMeasuringUnits()
  */
-function measuringUnitString($unit, $measuring_style = '', $scale = '', $use_short_label = 0)
+function measuringUnitString($unit, $measuring_style = '', $scale = '', $use_short_label = 0, $outputlangs = null)
 {
 	global $langs, $db;
 	global $measuring_unit_cache;
 
+	if (empty($outputlangs)) {
+		$outputlangs = $langs;
+	}
+
 	if (empty($measuring_unit_cache[$unit.'_'.$measuring_style.'_'.$scale.'_'.$use_short_label]))
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/class/cunits.class.php';
@@ -605,7 +611,7 @@ function measuringUnitString($unit, $measuring_style = '', $scale = '', $use_sho
 		} else {
 			if (is_array($measuringUnits->records) && count($measuringUnits->records) > 0) {
 				if ($use_short_label) $labeltoreturn = $measuringUnits->records[key($measuringUnits->records)]->short_label;
-				else $labeltoreturn = $langs->transnoentitiesnoconv($measuringUnits->records[key($measuringUnits->records)]->label);
+				else $labeltoreturn = $outputlangs->transnoentitiesnoconv($measuringUnits->records[key($measuringUnits->records)]->label);
 			} else {
 				$labeltoreturn = '';
 			}
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index 82143123c40..dcd8419bca6 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -265,7 +265,7 @@ class pdf_standard extends ModelePDFProduct
 				$tab_height = 130;
 				$tab_height_newpage = 150;
 
-				//
+				// Label of product
 				$pdf->SetFont('', 'B', $default_font_size);
 				$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $tab_top, dol_htmlentitiesbr($object->label), 0, 1);
 				$nexY = $pdf->GetY();
@@ -276,29 +276,34 @@ class pdf_standard extends ModelePDFProduct
 
 				$nexY += 5;
 
+				$outputlangs->load("other");
 				if ($object->weight)
 				{
-					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Weight").': '.dol_htmlentitiesbr($object->weight), 0, 1);
+					$texttoshow = $langs->trans("Weight").': '.dol_htmlentitiesbr($object->weight);
+					if (isset($object->weight_units)) $texttoshow .= ' '.measuring_units_string($object->weight_units, 'weight', 0, 0, $outputlangs);
+					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $texttoshow, 0, 1);
 					$nexY = $pdf->GetY();
 				}
 				if ($object->weight)
 				{
-					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").': '.($object->length != '' ? $object->length : '?').' x '.($object->width != '' ? $object->width : '?').' x '.($object->height != '' ? $object->height : '?'), 0, 1);
+					$texttoshow = $langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").': '.($object->length != '' ? $object->length : '?').' x '.($object->width != '' ? $object->width : '?').' x '.($object->height != '' ? $object->height : '?');
+					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $texttoshow, 0, 1);
 					$nexY = $pdf->GetY();
 				}
 				if ($object->surface)
 				{
-					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Area").': '.dol_htmlentitiesbr($object->surface), 0, 1);
+					$texttoshow = $langs->trans("Area").': '.dol_htmlentitiesbr($object->surface);
+					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $texttoshow, 0, 1);
 					$nexY = $pdf->GetY();
 				}
 				if ($object->volume)
 				{
-					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Volume").': '.dol_htmlentitiesbr($object->volume), 0, 1);
+					$texttoshow = $langs->trans("Volume").': '.dol_htmlentitiesbr($object->volume);
+					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $texttoshow, 0, 1);
 	   				$nexY = $pdf->GetY();
 				}
 
-
-				// Affiche notes
+				// Show notes
 				// TODO There is no public note on product yet
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
 				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 7495291cf3f..011352f1dcd 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -138,7 +138,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index bcf32cdce26..7d0d82ec147 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -280,20 +280,20 @@ class Product extends CommonObject
 
 	//! Metric of products
 	public $weight;
-	public $weight_units;
+	public $weight_units;	// scale -3, 0, 3, 6
 	public $length;
-	public $length_units;
+	public $length_units;	// scale -3, 0, 3, 6
 	public $width;
-	public $width_units;
+	public $width_units;	// scale -3, 0, 3, 6
 	public $height;
-	public $height_units;
+	public $height_units;	// scale -3, 0, 3, 6
 	public $surface;
-	public $surface_units;
+	public $surface_units;	// scale -3, 0, 3, 6
 	public $volume;
-	public $volume_units;
+	public $volume_units;	// scale -3, 0, 3, 6
 
 	public $net_measure;
-	public $net_measure_units;
+	public $net_measure_units;	// scale -3, 0, 3, 6
 
 	public $accountancy_code_sell;
 	public $accountancy_code_sell_intra;
@@ -5387,19 +5387,19 @@ class Product extends CommonObject
 		$this->date_modification = $now;
 
 		$this->weight = 4;
-		$this->weight_unit = 1;
+		$this->weight_units = 3;
 
 		$this->length = 5;
-		$this->length_unit = 1;
+		$this->length_units = 1;
 		$this->width = 6;
-		$this->width_unit = 0;
+		$this->width_units = 0;
 		$this->height = null;
-		$this->height_unit = null;
+		$this->height_units = null;
 
 		$this->surface = 30;
-		$this->surface_unit = 0;
+		$this->surface_units = 0;
 		$this->volume = 300;
-		$this->volume_unit = 0;
+		$this->volume_units = 0;
 
 		$this->barcode = -1; // Create barcode automatically
 	}

From cee63335a20b3bb52e46129318454a406e42cf8a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Dec 2020 13:38:21 +0100
Subject: [PATCH 439/888] FIX #15754 Mor complete PR

---
 htdocs/accountancy/bookkeeping/list.php       |  1 +
 .../accountancy/bookkeeping/listbyaccount.php | 41 +++++++++++-----
 .../bookkeeping/listbysubaccount.php          | 49 ++++++++++++++++---
 htdocs/langs/en_US/accountancy.lang           |  4 +-
 htdocs/theme/eldy/global.inc.php              |  7 +++
 htdocs/theme/md/style.css.php                 |  7 +++
 6 files changed, 89 insertions(+), 20 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 92de49d66ed..b3cec7710a4 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -642,6 +642,7 @@ if (empty($reshook)) {
 
 	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
 	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbysubaccount.php', '', 1, array('morecss' => 'marginleftonly'));
 
 	$url = './card.php?action=create';
 	if (!empty($socid)) $url .= '&socid='.$socid;
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 18661f8a887..7b8467f60bd 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -39,8 +39,14 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 $langs->loadLangs(array("accountancy", "compta"));
 
 $action = GETPOST('action', 'aZ09');
-$search_date_start = dol_mktime(0, 0, 0, GETPOST('search_date_startmonth', 'int'), GETPOST('search_date_startday', 'int'), GETPOST('search_date_startyear', 'int'));
-$search_date_end = dol_mktime(0, 0, 0, GETPOST('search_date_endmonth', 'int'), GETPOST('search_date_endday', 'int'), GETPOST('search_date_endyear', 'int'));
+$search_date_startyear =  GETPOST('search_date_startyear', 'int');
+$search_date_startmonth =  GETPOST('search_date_startmonth', 'int');
+$search_date_startday =  GETPOST('search_date_startday', 'int');
+$search_date_endyear =  GETPOST('search_date_endyear', 'int');
+$search_date_endmonth =  GETPOST('search_date_endmonth', 'int');
+$search_date_endday =  GETPOST('search_date_endday', 'int');
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);
+$search_date_end = dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
 
 $search_accountancy_code = GETPOST("search_accountancy_code");
@@ -126,9 +132,24 @@ $arrayfields = array(
 
 if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) unset($arrayfields['t.lettering_code']);
 
+if ($search_date_start && empty($search_date_startyear)) {
+	$tmparray = dol_getdate($search_date_start);
+	$search_date_startyear = $tmparray['year'];
+	$search_date_startmonth = $tmparray['mon'];
+	$search_date_startday = $tmparray['mday'];
+}
+if ($search_date_end && empty($search_date_endyear)) {
+	$tmparray = dol_getdate($search_date_end);
+	$search_date_endyear = $tmparray['year'];
+	$search_date_endmonth = $tmparray['mon'];
+	$search_date_endday = $tmparray['mday'];
+}
+
+
 /*
  * Action
  */
+
 if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
 
@@ -172,11 +193,11 @@ if (empty($reshook))
 
 	if (!empty($search_date_start)) {
 		$filter['t.doc_date>='] = $search_date_start;
-		$param .= '&search_date_startmonth='.GETPOST('search_date_startmonth', 'int').'&search_date_startday='.GETPOST('search_date_startday', 'int').'&search_date_startyear='.GETPOST('search_date_startyear', 'int');
+		$param .= '&search_date_startmonth='.$search_date_startmonth.'&search_date_startday='.$search_date_startday.'&search_date_startyear='.$search_date_startyear;
 	}
 	if (!empty($search_date_end)) {
 		$filter['t.doc_date<='] = $search_date_end;
-		$param .= '&search_date_endmonth='.GETPOST('search_date_endmonth', 'int').'&search_date_endday='.GETPOST('search_date_endday', 'int').'&search_date_endyear='.GETPOST('search_date_endyear', 'int');
+		$param .= '&search_date_endmonth='.$search_date_endmonth.'&search_date_endday='.$search_date_endday.'&search_date_endyear='.$search_date_endyear;
 	}
 	if (!empty($search_doc_date)) {
 		$filter['t.doc_date'] = $search_doc_date;
@@ -242,7 +263,7 @@ if ($action == 'delbookkeeping' && $user->rights->accounting->mouvements->suppri
 		}
 
 		// Make a redirect to avoid to launch the delete later after a back button
-		header("Location: listbyaccount.php".($param ? '?'.$param : ''));
+		header("Location: ".$_SERVER["PHP_SELF"].($param ? '?'.$param : ''));
 		exit;
 	}
 }
@@ -267,7 +288,7 @@ if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouveme
 		}
 
 		// Make a redirect to avoid to launch the delete later after a back button
-		header("Location: listbyaccount.php".($param ? '?'.$param : ''));
+		header("Location: ".$_SERVER["PHP_SELF"].($param ? '?'.$param : ''));
 		exit;
 	} else {
 		setEventMessages("NoRecordDeleted", null, 'warnings');
@@ -284,7 +305,7 @@ if ($action == 'delmouvconfirm' && $user->rights->accounting->mouvements->suppri
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 		}
 
-		header("Location: listbyaccount.php?noreset=1".($param ? '&'.$param : ''));
+		header("Location: ".$_SERVER["PHP_SELF"]."?noreset=1".($param ? '&'.$param : ''));
 		exit;
 	}
 }
@@ -303,7 +324,6 @@ $title_page = $langs->trans("Operations").' - '.$langs->trans("VueByAccountAccou
 
 llxHeader('', $title_page);
 
-
 // List
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
@@ -380,9 +400,8 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
 	$newcardbutton = dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param);
-	$newcardbutton .= dolGetButtonTitle($langs->trans('VueByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
-
-	$newcardbutton .= ' &nbsp; ';
+	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbysubaccount.php', '', 1, array('morecss' => 'marginleftonly'));
 
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=create');
 }
diff --git a/htdocs/accountancy/bookkeeping/listbysubaccount.php b/htdocs/accountancy/bookkeeping/listbysubaccount.php
index 3bc0351b09b..48c449df43e 100644
--- a/htdocs/accountancy/bookkeeping/listbysubaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbysubaccount.php
@@ -39,8 +39,14 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 $langs->loadLangs(array("accountancy", "compta"));
 
 $action = GETPOST('action', 'aZ09');
-$search_date_start = dol_mktime(0, 0, 0, GETPOST('search_date_startmonth', 'int'), GETPOST('search_date_startday', 'int'), GETPOST('search_date_startyear', 'int'));
-$search_date_end = dol_mktime(0, 0, 0, GETPOST('search_date_endmonth', 'int'), GETPOST('search_date_endday', 'int'), GETPOST('search_date_endyear', 'int'));
+$search_date_startyear =  GETPOST('search_date_startyear', 'int');
+$search_date_startmonth =  GETPOST('search_date_startmonth', 'int');
+$search_date_startday =  GETPOST('search_date_startday', 'int');
+$search_date_endyear =  GETPOST('search_date_endyear', 'int');
+$search_date_endmonth =  GETPOST('search_date_endmonth', 'int');
+$search_date_endday =  GETPOST('search_date_endday', 'int');
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);
+$search_date_end = dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
 
 $search_accountancy_code = GETPOST("search_accountancy_code");
@@ -126,6 +132,20 @@ $arrayfields = array(
 
 if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) unset($arrayfields['t.lettering_code']);
 
+if ($search_date_start && empty($search_date_startyear)) {
+	$tmparray = dol_getdate($search_date_start);
+	$search_date_startyear = $tmparray['year'];
+	$search_date_startmonth = $tmparray['mon'];
+	$search_date_startday = $tmparray['mday'];
+}
+if ($search_date_end && empty($search_date_endyear)) {
+	$tmparray = dol_getdate($search_date_end);
+	$search_date_endyear = $tmparray['year'];
+	$search_date_endmonth = $tmparray['mon'];
+	$search_date_endday = $tmparray['mday'];
+}
+
+
 /*
  * Action
  */
@@ -172,11 +192,11 @@ if (empty($reshook))
 
 	if (!empty($search_date_start)) {
 		$filter['t.doc_date>='] = $search_date_start;
-		$param .= '&search_date_startmonth='.GETPOST('search_date_startmonth', 'int').'&search_date_startday='.GETPOST('search_date_startday', 'int').'&search_date_startyear='.GETPOST('search_date_startyear', 'int');
+		$param .= '&search_date_startmonth='.$search_date_startmonth.'&search_date_startday='.$search_date_startday.'&search_date_startyear='.$search_date_startyear;
 	}
 	if (!empty($search_date_end)) {
 		$filter['t.doc_date<='] = $search_date_end;
-		$param .= '&search_date_endmonth='.GETPOST('search_date_endmonth', 'int').'&search_date_endday='.GETPOST('search_date_endday', 'int').'&search_date_endyear='.GETPOST('search_date_endyear', 'int');
+		$param .= '&search_date_endmonth='.$search_date_endmonth.'&search_date_endday='.$search_date_endday.'&search_date_endyear='.$search_date_endyear;
 	}
 	if (!empty($search_doc_date)) {
 		$filter['t.doc_date'] = $search_doc_date;
@@ -242,7 +262,7 @@ if ($action == 'delbookkeeping' && $user->rights->accounting->mouvements->suppri
 		}
 
 		// Make a redirect to avoid to launch the delete later after a back button
-		header("Location: listbyaccount.php".($param ? '?'.$param : ''));
+		header("Location: ".$_SERVER["PHP_SELF"].($param ? '?'.$param : ''));
 		exit;
 	}
 }
@@ -380,7 +400,10 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 $parameters = array();
 $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
-	$newcardbutton = dolGetButtonTitle($langs->trans('ViewAccountList'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php', '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
+	$newcardbutton = dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param);
+	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php', '', 1, array('morecss' => 'marginleftonly'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbysubaccount.php', '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
+
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=create');
 }
 
@@ -389,6 +412,8 @@ if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($l
 
 print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit);
 
+print info_admin($langs->trans("WarningRecordWithoutSubledgerAreExcluded"));
+
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
@@ -554,8 +579,16 @@ while ($i < min($num, $limit))
 		// Show the break account
 		print "<tr>";
 		print '<td colspan="'.($totalarray['nbfield'] ? $totalarray['nbfield'] : 9).'" style="font-weight:bold; border-bottom: 1pt solid black;">';
-		if ($line->subledger_account != "" && $line->subledger_account != '-1') print length_accounta($line->subledger_account).' : '.$object->get_compte_desc($line->numero_compte);
-		else print '<span class="error">'.$langs->trans("Unknown").'</span>';
+		if ($line->subledger_account != "" && $line->subledger_account != '-1') {
+			print $object->get_compte_desc($line->numero_compte).' : '.length_accounta($line->subledger_account);
+		} else {
+			// Should not happen: subledger account must be null or a non empty value
+			print '<span class="error">'.$langs->trans("Unknown");
+			if ($line->subledger_label) print ' ('.$line->subledger_label.')';
+			$htmltext = 'EmptyStringForSubledgerAccountButSubledgerLabelDefined';
+			print $form->textwithpicto('', $htmltext);
+			print '</span>';
+		}
 		print '</td>';
 		print '</tr>';
 
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 41a4cfa59d5..2a53a171962 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -207,7 +207,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -294,6 +295,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 24751dfb9d7..1dc8f27b644 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -396,6 +396,13 @@ input.pageplusone {
 	color: #000;
 }
 
+.vmirror {
+    transform: scale(1, -1);
+}
+.hmirror {
+    transform: scale(-1, 1);
+}
+
 select:invalid {
 	color: gray;
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index f1084f5a537..7b4ecf08e8e 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -528,6 +528,13 @@ input.pageplusone {
 	color: #000;
 }
 
+.vmirror {
+    transform: scale(1, -1);
+}
+.hmirror {
+    transform: scale(-1, 1);
+}
+
 select:invalid {
 	color: gray;
 }

From 479e742d0c219c8c09eee2d987374f3ba5b27bb5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Dec 2020 13:46:13 +0100
Subject: [PATCH 440/888] FIX #15753

---
 htdocs/compta/cashcontrol/report.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index 515067900e3..04cdea52f7f 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -133,7 +133,8 @@ if ($resql) {
 	print "<center><h2>";
 	if ($cashcontrol->status != $cashcontrol::STATUS_DRAFT) print $langs->trans("CashControl")." ".$cashcontrol->id;
 	else print $langs->trans("CashControl")." - ".$langs->trans("Draft");
-	print "<br>".$langs->trans("DateCreationShort").": ".dol_print_date($cashcontrol->date_creation, 'dayhour')."</h2></center>";
+	print "<br>".$langs->trans("DateCreationShort").": ".dol_print_date($cashcontrol->date_creation, 'dayhour');
+	print "</h2></center>";
 
 	$invoicetmp = new Facture($db);
 
@@ -156,8 +157,6 @@ if ($resql) {
 	print_liste_field_titre($arrayfields['b.credit']['label'], $_SERVER['PHP_SELF'], 'b.amount', '', $param, '', $sortfield, $sortorder, 'right ');
 	print "</tr>\n";
 
-	$posconciliatecol = 0;
-
 	// Loop on each record
 	$sign = 1;
 	$cash = $bank = $cheque = $other = 0;
@@ -263,7 +262,7 @@ if ($resql) {
 	print "</table>";
 
 	//$cash = $amountpertype['LIQ'] + $cashcontrol->opening;
-	$cash = $cash + $cashcontrol->opening;
+	$cash = price2num($cash + $cashcontrol->opening, 'MT');
 
 	print "<div style='text-align: right'><h2>";
 	print $langs->trans("Cash").": ".price($cash);

From 1f6f4742d56ea3d708e82df8846397305c8c577d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Dec 2020 14:01:25 +0100
Subject: [PATCH 441/888] Trans

---
 htdocs/langs/en_US/companies.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 8a18520c2fc..99bed13179f 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential

From 37fe5bb3efc4aa986fa97ef22b37fb40bac3cd05 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Dec 2020 15:18:01 +0100
Subject: [PATCH 442/888] Solve blocking feature. Can increase stock of a Kit
 without changing subproduct stock.

---
 htdocs/langs/en_US/main.lang                  |  1 +
 htdocs/langs/en_US/stocks.lang                |  1 +
 htdocs/product/class/product.class.php        | 16 ++--
 htdocs/product/composition/card.php           | 18 ++---
 .../stock/class/mouvementstock.class.php      | 41 ++++++-----
 htdocs/product/stock/product.php              | 73 ++++++++++++-------
 htdocs/product/stock/stockatdate.php          | 10 ++-
 .../product/stock/tpl/stockcorrection.tpl.php | 15 +++-
 .../product/stock/tpl/stocktransfer.tpl.php   |  5 +-
 9 files changed, 109 insertions(+), 71 deletions(-)

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index c32e4d01ddd..73c9964000e 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -29,6 +29,7 @@ AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index d2c1b2cb382..1b54e53d6de 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
\ No newline at end of file
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 7d0d82ec147..e1b25b9e3b7 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4229,9 +4229,9 @@ class Product extends CommonObject
 		// phpcs:enable
 		$this->res = array();
 		if (isset($this->sousprods) && is_array($this->sousprods)) {
-			foreach ($this->sousprods as $prod_name => $desc_product)
-			{
-				if (is_array($desc_product)) { $this->fetch_prod_arbo($desc_product, "", $multiply, 1, $this->id);
+			foreach ($this->sousprods as $prod_name => $desc_product) {
+				if (is_array($desc_product)) {
+					$this->fetch_prod_arbo($desc_product, "", $multiply, 1, $this->id);
 				}
 			}
 		}
@@ -4777,9 +4777,10 @@ class Product extends CommonObject
 	 * @param  string $inventorycode  Inventory code
 	 * @param  string $origin_element Origin element type
 	 * @param  int    $origin_id      Origin id of element
+	 * @param  int	  $disablestockchangeforsubproduct	Disable stock change for sub-products of kit (usefull only if product is a subproduct)
 	 * @return int                     <0 if KO, >0 if OK
 	 */
-	public function correct_stock($user, $id_entrepot, $nbpiece, $movement, $label = '', $price = 0, $inventorycode = '', $origin_element = '', $origin_id = null)
+	public function correct_stock($user, $id_entrepot, $nbpiece, $movement, $label = '', $price = 0, $inventorycode = '', $origin_element = '', $origin_id = null, $disablestockchangeforsubproduct = 0)
 	{
 		// phpcs:enable
 		if ($id_entrepot) {
@@ -4792,7 +4793,7 @@ class Product extends CommonObject
 
 			$movementstock = new MouvementStock($this->db);
 			$movementstock->setOrigin($origin_element, $origin_id); // Set ->origin and ->origin->id
-			$result = $movementstock->_create($user, $this->id, $id_entrepot, $op[$movement], $movement, $price, $label, $inventorycode);
+			$result = $movementstock->_create($user, $this->id, $id_entrepot, $op[$movement], $movement, $price, $label, $inventorycode, '', '', '', '', false, 0, $disablestockchangeforsubproduct);
 
 			if ($result >= 0) {
 				$this->db->commit();
@@ -4823,9 +4824,10 @@ class Product extends CommonObject
 	 * @param  string   $inventorycode  Inventory code
 	 * @param  string   $origin_element Origin element type
 	 * @param  int      $origin_id      Origin id of element
+	 * @param  int	    $disablestockchangeforsubproduct	Disable stock change for sub-products of kit (usefull only if product is a subproduct)
 	 * @return int                      <0 if KO, >0 if OK
 	 */
-	public function correct_stock_batch($user, $id_entrepot, $nbpiece, $movement, $label = '', $price = 0, $dlc = '', $dluo = '', $lot = '', $inventorycode = '', $origin_element = '', $origin_id = null)
+	public function correct_stock_batch($user, $id_entrepot, $nbpiece, $movement, $label = '', $price = 0, $dlc = '', $dluo = '', $lot = '', $inventorycode = '', $origin_element = '', $origin_id = null, $disablestockchangeforsubproduct = 0)
 	{
 		// phpcs:enable
 		if ($id_entrepot) {
@@ -4838,7 +4840,7 @@ class Product extends CommonObject
 
 			$movementstock = new MouvementStock($this->db);
 			$movementstock->setOrigin($origin_element, $origin_id);
-			$result = $movementstock->_create($user, $this->id, $id_entrepot, $op[$movement], $movement, $price, $label, $inventorycode, '', $dlc, $dluo, $lot);
+			$result = $movementstock->_create($user, $this->id, $id_entrepot, $op[$movement], $movement, $price, $label, $inventorycode, '', $dlc, $dluo, $lot, false, 0, $disablestockchangeforsubproduct);
 
 			if ($result >= 0) {
 				$this->db->commit();
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 13ef4582d20..8459fa3e479 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2007  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2017  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2020  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005       Eric Seigne             <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2018  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2006       Andre Cianfarani        <acianfa@free.fr>
@@ -137,7 +137,7 @@ if ($action == 'search')
 	$current_lang = $langs->getDefaultLang();
 
 	$sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.fk_product_type as type, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,';
-	$sql .= ' p.fk_product_type, p.tms as datem';
+	$sql .= ' p.fk_product_type, p.tms as datem, p.tobatch';
 	if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= ', pl.label as labelm, pl.description as descriptionm';
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON p.rowid = cp.fk_product';
@@ -204,7 +204,7 @@ if ($id > 0 || !empty($ref))
 
 		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref', '', '', '', 0, '', '', 0);
 
-		if ($object->type != Product::TYPE_SERVICE || empty($conf->global->PRODUIT_MULTIPRICES))
+		if ($object->type != Product::TYPE_SERVICE || !empty($conf->global->STOCK_SUPPORTS_SERVICES) || empty($conf->global->PRODUIT_MULTIPRICES))
 		{
 			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
@@ -320,14 +320,11 @@ if ($id > 0 || !empty($ref))
 		print '</tr>'."\n";
 
 		$totalsell = 0;
-		if (count($prods_arbo))
-		{
-			foreach ($prods_arbo as $value)
-			{
+		if (count($prods_arbo))	{
+			foreach ($prods_arbo as $value)	{
 				$productstatic->fetch($value['id']);
 
-				if ($value['level'] <= 1)
-				{
+				if ($value['level'] <= 1) {
 					print '<tr class="oddeven">';
 
 					$notdefined = 0;
@@ -380,7 +377,7 @@ if ($id > 0 || !empty($ref))
 					// Qty + IncDec
 					if ($user->rights->produit->creer || $user->rights->service->creer)
 					{
-						print '<td class="center"><input type="text" value="'.$nb_of_subproduct.'" name="TProduct['.$productstatic->id.'][qty]" size="4" /></td>';
+						print '<td class="center"><input type="text" value="'.$nb_of_subproduct.'" name="TProduct['.$productstatic->id.'][qty]" size="4" class="right" /></td>';
 						print '<td class="center"><input type="checkbox" name="TProduct['.$productstatic->id.'][incdec]" value="1" '.($value['incdec'] == 1 ? 'checked' : '').' /></td>';
 					} else {
 						print '<td>'.$nb_of_subproduct.'</td>';
@@ -566,6 +563,7 @@ if ($id > 0 || !empty($ref))
 						$productstatic->label = $objp->label;
 						$productstatic->type = $objp->type;
 						$productstatic->entity = $objp->entity;
+						$productstatic->status_batch = $objp->tobatch;
 
 						print '<td>'.$productstatic->getNomUrl(1, '', 24).'</td>';
 						$labeltoshow = $objp->label;
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index c97c56b2887..631cedd0a25 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -128,26 +128,27 @@ class MouvementStock extends CommonObject
 	 *	Add a movement of stock (in one direction only).
 	 *  $this->origin can be also be set to save the source object of movement.
 	 *
-	 *	@param		User	$user			User object
-	 *	@param		int		$fk_product		Id of product
-	 *	@param		int		$entrepot_id	Id of warehouse
-	 *	@param		int		$qty			Qty of movement (can be <0 or >0 depending on parameter type)
-	 *	@param		int		$type			Direction of movement:
-	 *										0=input (stock increase by a stock transfer), 1=output (stock decrease by a stock transfer),
-	 *										2=output (stock decrease), 3=input (stock increase)
-	 *                                      Note that qty should be > 0 with 0 or 3, < 0 with 1 or 2.
-	 *	@param		int		$price			Unit price HT of product, used to calculate average weighted price (AWP or PMP in french). If 0, average weighted price is not changed.
-	 *	@param		string	$label			Label of stock movement
-	 *	@param		string	$inventorycode	Inventory code
-	 *	@param		string	$datem			Force date of movement
-	 *	@param		integer	$eatby			eat-by date. Will be used if lot does not exists yet and will be created.
-	 *	@param		integer	$sellby			sell-by date. Will be used if lot does not exists yet and will be created.
-	 *	@param		string	$batch			batch number
-	 *	@param		boolean	$skip_batch		If set to true, stock movement is done without impacting batch record
+	 *	@param		User	$user				User object
+	 *	@param		int		$fk_product			Id of product
+	 *	@param		int		$entrepot_id		Id of warehouse
+	 *	@param		int		$qty				Qty of movement (can be <0 or >0 depending on parameter type)
+	 *	@param		int		$type				Direction of movement:
+	 *											0=input (stock increase by a stock transfer), 1=output (stock decrease by a stock transfer),
+	 *											2=output (stock decrease), 3=input (stock increase)
+	 *                                      	Note that qty should be > 0 with 0 or 3, < 0 with 1 or 2.
+	 *	@param		int		$price				Unit price HT of product, used to calculate average weighted price (AWP or PMP in french). If 0, average weighted price is not changed.
+	 *	@param		string	$label				Label of stock movement
+	 *	@param		string	$inventorycode		Inventory code
+	 *	@param		string	$datem				Force date of movement
+	 *	@param		integer	$eatby				eat-by date. Will be used if lot does not exists yet and will be created.
+	 *	@param		integer	$sellby				sell-by date. Will be used if lot does not exists yet and will be created.
+	 *	@param		string	$batch				batch number
+	 *	@param		boolean	$skip_batch			If set to true, stock movement is done without impacting batch record
 	 * 	@param		int		$id_product_batch	Id product_batch (when skip_batch is false and we already know which record of product_batch to use)
-	 *	@return		int						<0 if KO, 0 if fk_product is null or product id does not exists, >0 if OK
+	 *  @param		int		$disablestockchangeforsubproduct	Disable stock change for sub-products of kit (usefull only if product is a subproduct)
+	 *	@return		int							<0 if KO, 0 if fk_product is null or product id does not exists, >0 if OK
 	 */
-	public function _create($user, $fk_product, $entrepot_id, $qty, $type, $price = 0, $label = '', $inventorycode = '', $datem = '', $eatby = '', $sellby = '', $batch = '', $skip_batch = false, $id_product_batch = 0)
+	public function _create($user, $fk_product, $entrepot_id, $qty, $type, $price = 0, $label = '', $inventorycode = '', $datem = '', $eatby = '', $sellby = '', $batch = '', $skip_batch = false, $id_product_batch = 0, $disablestockchangeforsubproduct = 0)
 	{
 		// phpcs:disable
 		global $conf, $langs;
@@ -571,9 +572,9 @@ class MouvementStock extends CommonObject
 		}
 
 		// Add movement for sub products (recursive call)
-		if (!$error && !empty($conf->global->PRODUIT_SOUSPRODUITS) && empty($conf->global->INDEPENDANT_SUBPRODUCT_STOCK))
+		if (!$error && !empty($conf->global->PRODUIT_SOUSPRODUITS) && empty($conf->global->INDEPENDANT_SUBPRODUCT_STOCK) && empty($disablestockchangeforsubproduct))
 		{
-			$error = $this->_createSubProduct($user, $fk_product, $entrepot_id, $qty, $type, 0, $label, $inventorycode); // we use 0 as price, because pmp is not changed for subproduct
+			$error = $this->_createSubProduct($user, $fk_product, $entrepot_id, $qty, $type, 0, $label, $inventorycode); // we use 0 as price, because AWP must not change for subproduct
 		}
 
 		if ($movestock && !$error)
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 0ea05495e5a..89df906feda 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -108,6 +108,8 @@ if (!empty($canvas))
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('stockproductcard', 'globalcard'));
 
+$error = 0;
+
 
 /*
  *	Actions
@@ -221,17 +223,14 @@ if ($action == "correct_stock" && !$cancel)
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$priceunit = price2num(GETPOST("unitprice"));
 		$nbpiece = price2num(GETPOST("nbpiece", 'alphanohtml'));
-		if (is_numeric($nbpiece) && $nbpiece != 0 && $id)
-		{
+		if (is_numeric($nbpiece) && $nbpiece != 0 && $id) {
 			$origin_element = '';
 			$origin_id = null;
 
-			if (GETPOST('projectid', 'int'))
-			{
+			if (GETPOST('projectid', 'int')) {
 				$origin_element = 'project';
 				$origin_id = GETPOST('projectid', 'int');
 			}
@@ -240,8 +239,13 @@ if ($action == "correct_stock" && !$cancel)
 				$object = new Product($db);
 				$result = $object->fetch($id);
 			}
-			if ($object->hasbatch())
-			{
+
+			$disablestockchangeforsubproduct = 0;
+			if (GETPOST('disablesubproductstockchange')) {
+				$disablestockchangeforsubproduct = 1;
+			}
+
+			if ($object->hasbatch()) {
 				$result = $object->correct_stock_batch(
 					$user,
 					GETPOST("id_entrepot", 'int'),
@@ -254,7 +258,8 @@ if ($action == "correct_stock" && !$cancel)
 					$batchnumber,
 					GETPOST('inventorycode', 'alphanohtml'),
 					$origin_element,
-					$origin_id
+					$origin_id,
+					$disablestockchangeforsubproduct
 				); // We do not change value of stock for a correction
 			} else {
 				$result = $object->correct_stock(
@@ -266,14 +271,13 @@ if ($action == "correct_stock" && !$cancel)
 					$priceunit,
 					GETPOST('inventorycode', 'alphanohtml'),
 					$origin_element,
-					$origin_id
+					$origin_id,
+					$disablestockchangeforsubproduct
 				); // We do not change value of stock for a correction
 			}
 
-			if ($result > 0)
-			{
-				if ($backtopage)
-				{
+			if ($result > 0) {
+				if ($backtopage) {
 					header("Location: ".$backtopage);
 					exit;
 				} else {
@@ -535,12 +539,14 @@ if ($id > 0 || $ref)
 
 		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-		print '<div class="fichecenter">';
-
-		print '<div class="underbanner clearboth"></div>';
-		print '<table class="border tableforfield" width="100%">';
-
 		if (!$variants) {
+			print '<div class="fichecenter">';
+
+			print '<div class="fichehalfleft">';
+			print '<div class="underbanner clearboth"></div>';
+
+			print '<table class="border tableforfield centpercent">';
+
 			if ($conf->productbatch->enabled) {
 				print '<tr><td class="titlefield">'.$langs->trans("ManageLotSerial").'</td><td>';
 				print $object->getLibStatut(0, 2);
@@ -604,16 +610,23 @@ if ($id > 0 || $ref)
 				print '</td></tr>';
 			}
 
-			// Stock alert threshold
-			print '<tr><td>'.$form->editfieldkey($form->textwithpicto($langs->trans("StockLimit"), $langs->trans("StockLimitDesc"), 1), 'seuil_stock_alerte', $object->seuil_stock_alerte, $object, $user->rights->produit->creer).'</td><td>';
-			print $form->editfieldval("StockLimit", 'seuil_stock_alerte', $object->seuil_stock_alerte, $object, $user->rights->produit->creer, 'string');
-			print '</td></tr>';
-
 			// Hook formObject
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
 
+			print '</table>';
+
+			print '</div>';
+			print '<div class="fichehalfright"><div class="ficheaddleft"><div class="underbanner clearboth"></div>';
+
+			print '<table class="border tableforfield centpercent">';
+
+			// Stock alert threshold
+			print '<tr><td>'.$form->editfieldkey($form->textwithpicto($langs->trans("StockLimit"), $langs->trans("StockLimitDesc"), 1), 'seuil_stock_alerte', $object->seuil_stock_alerte, $object, $user->rights->produit->creer).'</td><td>';
+			print $form->editfieldval("StockLimit", 'seuil_stock_alerte', $object->seuil_stock_alerte, $object, $user->rights->produit->creer, 'string');
+			print '</td></tr>';
+
 			// Desired stock
 			print '<tr><td>'.$form->editfieldkey($form->textwithpicto($langs->trans("DesiredStock"), $langs->trans("DesiredStockDesc"), 1), 'desiredstock', $object->desiredstock, $object, $user->rights->produit->creer);
 			print '</td><td>';
@@ -727,11 +740,15 @@ if ($id > 0 || $ref)
 				}
 				print "</td></tr>";
 			}
-		}
-		print "</table>";
 
-		print '</div>';
-		print '<div style="clear:both"></div>';
+			print "</table>";
+
+			print '</div>';
+			print '</div>';
+			print '</div>';
+
+			print '<div style="clear:both"></div>';
+		}
 
 		print dol_get_fiche_end();
 	}
diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index f48ac986d20..91159984a35 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -347,10 +347,14 @@ print '<input type="hidden" name="mode" value="'.$mode.'">';
 print '<div class="inline-block valignmiddle" style="padding-right: 20px;">';
 print '<span class="fieldrequired">'.$langs->trans('Date').'</span> '.$form->selectDate(($date ? $date : -1), 'date');
 
-print ' <span class="clearbothonsmartphone marginleftonly paddingleftonly marginrightonly paddinrightonly">&nbsp;</span> '.$langs->trans('Product').'</span> ';
+print ' <span class="clearbothonsmartphone marginleftonly paddingleftonly marginrightonly paddinrightonly">&nbsp;</span> ';
+print img_picto('', 'product').' ';
+print $langs->trans('Product').'</span> ';
 $form->select_produits($productid, 'productid', '', 0, 0, -1, 2, '', 0, array(), 0, '1', 0, 'maxwidth300');
 
-print ' <span class="clearbothonsmartphone marginleftonly paddingleftonly marginrightonly paddinrightonly">&nbsp;</span> '.$langs->trans('Warehouse').'</span> ';
+print ' <span class="clearbothonsmartphone marginleftonly paddingleftonly marginrightonly paddinrightonly">&nbsp;</span> ';
+print img_picto('', 'stock').' ';
+print $langs->trans('Warehouse').'</span> ';
 print $formproduct->selectWarehouses((GETPOSTISSET('fk_warehouse') ? $fk_warehouse : 'ifone'), 'fk_warehouse', '', 1);
 print '</div>';
 
@@ -558,7 +562,7 @@ print $hookmanager->resPrint;
 if (empty($date) || ! $dateIsValid) {
 	$colspan = 6;
 	if ($mode == 'future') $colspan++;
-	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("EmptySearchString").'</span></td></tr>';
+	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("EnterADateCriteria").'</span></td></tr>';
 }
 
 print '</table>';
diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
index 0885e9ef777..4f88b448239 100644
--- a/htdocs/product/stock/tpl/stockcorrection.tpl.php
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -70,7 +70,7 @@ if ($object->element == 'product') {
 	print '<td>';
 	$ident = (GETPOST("dwid") ?GETPOST("dwid", 'int') : (GETPOST('id_entrepot') ? GETPOST('id_entrepot', 'int') : ($object->element == 'product' && $object->fk_default_warehouse ? $object->fk_default_warehouse : 'ifone')));
 	if (empty($ident) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) $ident = $conf->global->MAIN_DEFAULT_WAREHOUSE;
-	print $formproduct->selectWarehouses($ident, 'id_entrepot', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'minwidth100');
+	print img_picto('', 'stock').$formproduct->selectWarehouses($ident, 'id_entrepot', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'minwidth100');
 	print ' &nbsp; <select class="button buttongen" name="mouvement" id="mouvement">';
 	print '<option value="0">'.$langs->trans("Add").'</option>';
 	print '<option value="1"'.(GETPOST('mouvement') ? ' selected="selected"' : '').'>'.$langs->trans("Delete").'</option>';
@@ -80,6 +80,7 @@ if ($object->element == 'product') {
 if ($object->element == 'stock') {
 	print '<td class="fieldrequired">'.$langs->trans("Product").'</td>';
 	print '<td>';
+	print img_picto('', 'product');
 	$form->select_produits(GETPOST('product_id', 'int'), 'product_id', (empty($conf->global->STOCK_SUPPORTS_SERVICES) ? '0' : ''), 0, 0, -1, 2, '', 0, null, 0, 1, 0, 'maxwidth500');
 	print ' &nbsp; <select class="button buttongen" name="mouvement" id="mouvement">';
 	print '<option value="0">'.$langs->trans("Add").'</option>';
@@ -91,6 +92,17 @@ print '<td class="fieldrequired">'.$langs->trans("NumberOfUnit").'</td>';
 print '<td><input name="nbpiece" id="nbpiece" class="maxwidth75" value="'.GETPOST("nbpiece").'"></td>';
 print '</tr>';
 
+// If product is a Kit, we ask if we must disable stock change of subproducts
+if (!empty($conf->global->PRODUIT_SOUSPRODUITS) && $object->element == 'product' && $object->hasFatherOrChild(1)) {
+	print '<tr>';
+	print '<td></td>';
+	print '<td colspan="3">';
+	print '<input type="checkbox" name="disablesubproductstockchange" id="disablesubproductstockchange" value="1"'.(GETPOST('disablesubproductstockchange') ? ' checked="checked"' : '').'">';
+	print ' <label for="disablesubproductstockchange">'.$langs->trans("DisableStockChangeOfSubProduct").'</label>';
+	print '</td>';
+	print '</tr>';
+}
+
 // Serial / Eat-by date
 if (!empty($conf->productbatch->enabled) &&
 (($object->element == 'product' && $object->hasbatch())
@@ -126,6 +138,7 @@ if (!empty($conf->projet->enabled))
 {
 	print '<td>'.$langs->trans('Project').'</td>';
 	print '<td>';
+	print img_picto('', 'project');
 	$formproject->select_projects(-1, '', 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0, 'maxwidth300');
 	print '</td>';
 }
diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php
index 7e159a35b32..20445445e8e 100644
--- a/htdocs/product/stock/tpl/stocktransfer.tpl.php
+++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php
@@ -71,18 +71,19 @@ print '<tr>';
 if ($object->element == 'product') {
 	print '<td class="fieldrequired">'.$langs->trans("WarehouseSource").'</td>';
 	print '<td>';
-	print $formproduct->selectWarehouses((GETPOST("dwid") ?GETPOST("dwid", 'int') : (GETPOST('id_entrepot') ?GETPOST('id_entrepot', 'int') : ($object->element == 'product' && $object->fk_default_warehouse ? $object->fk_default_warehouse : 'ifone'))), 'id_entrepot', 'warehouseopen,warehouseinternal', 1);
+	print img_picto('', 'stock').$formproduct->selectWarehouses((GETPOST("dwid") ?GETPOST("dwid", 'int') : (GETPOST('id_entrepot') ?GETPOST('id_entrepot', 'int') : ($object->element == 'product' && $object->fk_default_warehouse ? $object->fk_default_warehouse : 'ifone'))), 'id_entrepot', 'warehouseopen,warehouseinternal', 1);
 	print '</td>';
 }
 if ($object->element == 'stock') {
 	print '<td class="fieldrequired">'.$langs->trans("Product").'</td>';
 	print '<td>';
+	print img_picto('', 'product');
 	$form->select_produits(GETPOST('product_id', 'int'), 'product_id', (empty($conf->global->STOCK_SUPPORTS_SERVICES) ? '0' : ''), 0, 0, -1, 2, '', 0, null, 0, 1, 0, 'maxwidth500');
 	print '</td>';
 }
 
 print '<td class="fieldrequired">'.$langs->trans("WarehouseTarget").'</td><td>';
-print $formproduct->selectWarehouses(GETPOST('id_entrepot_destination'), 'id_entrepot_destination', 'warehouseopen,warehouseinternal', 1);
+print img_picto('', 'stock').$formproduct->selectWarehouses(GETPOST('id_entrepot_destination'), 'id_entrepot_destination', 'warehouseopen,warehouseinternal', 1);
 print '</td></tr>';
 print '<tr><td class="fieldrequired">'.$langs->trans("NumberOfUnit").'</td><td colspan="3"><input type="text" name="nbpiece" size="10" value="'.dol_escape_htmltag(GETPOST("nbpiece")).'"></td>';
 print '</tr>';

From a5b86f74ce62e2a0f9b91af89bad9fa48777a985 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Dec 2020 15:18:41 +0100
Subject: [PATCH 443/888] Update doc

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 82f82c0b051..8b3b3c97157 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@ NEW: Accountancy - change menu disposition
 NEW: Accountancy - on transfers, select the periodicity by default
 NEW: Accountancy - Add export for Gestinum (v3 & v5)
 NEW: new currency rate editor
+NEW: Solve blocking feature. Can increase stock of a Kit without changing subproduct stock.
 NEW: add a widget to show the customers with outstanding limits reached
 NEW: add 2 rules for emailcollector: Message send/not sent from Dolibarr
 NEW: add a counter of number of words for pages in website module

From 574f1f0336e43205cd1c5059d51e986d5dfab9f9 Mon Sep 17 00:00:00 2001
From: StephaneLesage <root@srv-dolibarr.ateis>
Date: Sat, 21 Nov 2020 22:40:31 +0100
Subject: [PATCH 444/888] Add edit/delete action icons on categories list pages
 + classes for icons + format color as in latest commits

---
 htdocs/categories/edit.php    | 23 +++++++++++++----
 htdocs/categories/index.php   | 40 +++++++++++++++++++++--------
 htdocs/categories/viewcat.php | 48 ++++++++++++++++++++++++++---------
 3 files changed, 83 insertions(+), 28 deletions(-)

diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index f4b7e12cc30..acb0aef2793 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -39,6 +39,7 @@ $type = GETPOST('type', 'aZ09');		// Can be int or string
 $action = (GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'edit');
 $confirm = GETPOST('confirm');
 $cancel = GETPOST('cancel', 'alpha');
+$backtopage = GETPOST('backtopage', 'alpha');
 
 $socid = (int) GETPOST('socid', 'int');
 $label = (string) GETPOST('label', 'alphanohtml');
@@ -74,8 +75,13 @@ $error = 0;
  */
 
 if ($cancel) {
-	header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type);
-	exit;
+	if ($backtopage) {
+		header("Location: ".$backtopage);
+		exit;
+	} else {
+		header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type);
+		exit;
+	}
 }
 
 // Action mise a jour d'une categorie
@@ -98,9 +104,15 @@ if ($action == 'update' && $user->rights->categorie->creer) {
 		$ret = $extrafields->setOptionalsFromPost(null, $object);
 		if ($ret < 0) $error++;
 
-		if (!$error && $object->update($user) > 0) {
-			header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type);
-			exit;
+		if (!$error && $object->update($user) > 0)
+		{
+			if ($backtopage) {
+				header("Location: ".$backtopage);
+				exit;
+			} else {
+				header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type);
+				exit;
+			}
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -131,6 +143,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="update">';
 print '<input type="hidden" name="id" value="'.$object->id.'">';
 print '<input type="hidden" name="type" value="'.$type.'">';
+print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
 print dol_get_fiche_head('');
 
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index 5adc7bbb17b..ff897db86a7 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -109,7 +109,7 @@ if (empty($nosearch)) {
 
 		foreach ($cats as $cat)
 		{
-			$color = $categstatic->color ? ' style="background: #'.$categstatic->color.';"' : ' style="background: #bbb"';
+			$color = $categstatic->color ? ' style="background: #'.sprintf("%06s", $categstatic->color).';"' : ' style="background: #bbb"';
 
 			print "\t".'<tr class="oddeven">'."\n";
 			print "\t\t<td>";
@@ -160,26 +160,45 @@ foreach ($fulltree as $key => $val)
 	$categstatic->ref = $val['label'];
 	$categstatic->color = $val['color'];
 	$categstatic->type = $type;
-	$li = $categstatic->getNomUrl(1, '', 60, $moreparam.'&backtolist='.urlencode($_SERVER["PHP_SELF"].'?type='.$type.$moreparam));
 	$desc = dol_htmlcleanlastbr($val['description']);
 
 	$counter = '';
-
 	if ($conf->global->CATEGORY_SHOW_COUNTS)
 	{
 		// we need only a count of the elements, so it is enough to consume only the id's from the database
-		$elements = $categstatic->getObjectsInCateg($type, 1);
+		$elements = $type == Categorie::TYPE_ACCOUNT
+			? $categstatic->getObjectsInCateg("account", 1)			// Categorie::TYPE_ACCOUNT is "bank_account" instead of "account"
+			: $categstatic->getObjectsInCateg($type, 1);
+
 		$counter = "<td class='left' width='40px;'>".(is_countable($elements) ? count($elements) : '0')."</td>";
 	}
 
 	$color = $categstatic->color ? ' style="background: #'.sprintf("%06s", $categstatic->color).';"' : ' style="background: #bbb"';
+	$li = $categstatic->getNomUrl(1, '', 60, '&backtolist='.urlencode($_SERVER["PHP_SELF"].'?type='.$type.$moreparam));
 
-	$data[] = array(
-	'rowid'=>$val['rowid'],
-	'fk_menu'=>$val['fk_parent'],
-	'entry'=>'<table class="nobordernopadding centpercent"><tr><td><span class="noborderoncategories"'.$color.'>'.$li.'</span></td>'.$counter.
-		'<td class="right" width="20px;"><a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$val['id'].'&type='.$type.$moreparam.'&backtolist='.urlencode($_SERVER["PHP_SELF"].'?type='.$type.$moreparam).'">'.img_view().'</a></td></tr></table>'
-	);
+	$entry = '<table class="nobordernopadding centpercent">';
+	$entry .= '<tr>';
+
+	$entry .= '<td>';
+	$entry .= '<span class="noborderoncategories" '.$color.'>'.$li.'</span>';
+	$entry .= '</td>';
+
+	$entry .= $counter;
+
+	$entry .= '<td class="right" width="20px;">';
+	$entry .= '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$val['id'].'&type='.$type.$moreparam.'&backtolist='.urlencode($_SERVER["PHP_SELF"].'?type='.$type).'">'.img_view().'</a>';
+	$entry .= '</td>';
+	$entry .= '<td class="right" width="20px;">';
+	$entry .= '<a class="editfielda" href="'.DOL_URL_ROOT.'/categories/edit.php?id='.$val['id'].'&type='.$type.$moreparam.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?type='.$type).'">'.img_edit().'</a>';
+	$entry .= '</td>';
+	$entry .= '<td class="right" width="20px;">';
+	$entry .= '<a class="deletefilelink" href="'.DOL_URL_ROOT.'/categories/viewcat.php?action=delete&token='.newToken().'&id='.$val['id'].'&type='.$type.$moreparam.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?type='.$type.$moreparam).'&backtolist='.urlencode($_SERVER["PHP_SELF"].'?type='.$type.$moreparam).'">'.img_delete().'</a>';
+	$entry .= '</td>';
+
+	$entry .= '</tr>';
+	$entry .= '</table>';
+
+	$data[] = array('rowid' => $val['rowid'], 'fk_menu' => $val['fk_parent'], 'entry' => $entry);
 }
 
 
@@ -194,7 +213,6 @@ if (!empty($conf->use_javascript_ajax))
 print '</td></tr>';
 
 $nbofentries = (count($data) - 1);
-
 if ($nbofentries > 0)
 {
 	print '<tr class="pair"><td colspan="3">';
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 864de6e2e98..b376b3d3320 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -104,6 +104,14 @@ if ($objecttype != $type) {
  *	Actions
  */
 
+if ($confirm == 'no')
+{
+	if ($backtopage) {
+		header("Location: ".$backtopage);
+		exit;
+	}
+}
+
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 // Remove element from category
@@ -164,8 +172,13 @@ if ($user->rights->categorie->supprimer && $action == 'confirm_delete' && $confi
 {
 	if ($object->delete($user) >= 0)
 	{
-		header("Location: ".DOL_URL_ROOT.'/categories/index.php?type='.$type);
-		exit;
+		if ($backtopage) {
+			header("Location: ".$backtopage);
+			exit;
+		} else {
+			header("Location: ".DOL_URL_ROOT.'/categories/index.php?type='.$type);
+			exit;
+		}
 	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -250,7 +263,11 @@ dol_banner_tab($object, 'label', $linkback, ($user->socid ? 0 : 1), 'label', 'la
 
 if ($action == 'delete')
 {
-	print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;type='.$type, $langs->trans('DeleteCategory'), $langs->trans('ConfirmDeleteCategory'), 'confirm_delete', '', '', 1);
+	if ($backtopage) {
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&type='.$type.'&backtopage='.urlencode($backtopage), $langs->trans('DeleteCategory'), $langs->trans('ConfirmDeleteCategory'), 'confirm_delete', '', '', 2);
+	} else {
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&type='.$type, $langs->trans('DeleteCategory'), $langs->trans('ConfirmDeleteCategory'), 'confirm_delete', '', '', 1);
+	}
 }
 
 print '<br>';
@@ -294,7 +311,7 @@ if ($user->rights->categorie->creer)
 
 if ($user->rights->categorie->supprimer)
 {
-	print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id.'&type='.$type.'">'.$langs->trans("Delete").'</a>';
+	print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id.'&type='.$type.'&backtolist='.urlencode($backtolist).'">'.$langs->trans("Delete").'</a>';
 }
 
 print "</div>";
@@ -376,8 +393,7 @@ if ($cats < 0)
 		$categstatic->type = $type;
 		$desc = dol_htmlcleanlastbr($val['description']);
 
-		$counter = 0;
-
+		$counter = '';
 		if ($conf->global->CATEGORY_SHOW_COUNTS)
 		{
 			// we need only a count of the elements, so it is enough to consume only the id's from the database
@@ -385,22 +401,29 @@ if ($cats < 0)
 				? $categstatic->getObjectsInCateg("account", 1)			// Categorie::TYPE_ACCOUNT is "bank_account" instead of "account"
 				: $categstatic->getObjectsInCateg($type, 1);
 
-			$counter = is_countable($elements) ? count($elements) : 0;
+			$counter = "<td class='left' width='40px;'>".(is_countable($elements) ? count($elements) : '0')."</td>";
 		}
 
-		$color = $categstatic->color ? ' style="background: #'.$categstatic->color.';"' : ' style="background: #aaa"';
+		$color = $categstatic->color ? ' style="background: #'.sprintf("%06s", $categstatic->color).';"' : ' style="background: #bbb"';
+		$li = $categstatic->getNomUrl(1, '', 60, '&backtolist='.urlencode($_SERVER["PHP_SELF"].'?id='.$id.'&type='.$type));
 
 		$entry = '<table class="nobordernopadding centpercent">';
 		$entry .= '<tr>';
 
 		$entry .= '<td>';
-		$entry .= '<span class="noborderoncategories" '.$color.'>'.$categstatic->getNomUrl(1, '', 60).'</span>';
+		$entry .= '<span class="noborderoncategories" '.$color.'>'.$li.'</span>';
 		$entry .= '</td>';
 
-		$entry .= '<td class="left" width="40px;">'.$counter.'</td>';
+		$entry .= $counter;
 
 		$entry .= '<td class="right" width="20px;">';
-		$entry .= '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$val['id'].'&type='.$type.'">'.img_view().'</a>';
+		$entry .= '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$val['id'].'&type='.$type.'&backtolist='.urlencode($_SERVER["PHP_SELF"].'?id='.$id.'&type='.$type).'">'.img_view().'</a>';
+		$entry .= '</td>';
+		$entry .= '<td class="right" width="20px;">';
+		$entry .= '<a class="editfielda" href="'.DOL_URL_ROOT.'/categories/edit.php?id='.$val['id'].'&type='.$type.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$id.'&type='.$type).'">'.img_edit().'</a>';
+		$entry .= '</td>';
+		$entry .= '<td class="right" width="20px;">';
+		$entry .= '<a class="deletefilelink" href="'.DOL_URL_ROOT.'/categories/viewcat.php?action=delete&token='.newToken().'&id='.$val['id'].'&type='.$type.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$id.'&type='.$type).'&backtolist='.urlencode($_SERVER["PHP_SELF"].'?id='.$id.'&type='.$type).'">'.img_delete().'</a>';
 		$entry .= '</td>';
 
 		$entry .= '</tr>';
@@ -409,7 +432,8 @@ if ($cats < 0)
 		$data[] = array('rowid' => $val['rowid'], 'fk_menu' => $val['fk_parent'], 'entry' => $entry);
 	}
 
-	if ((count($data) - 1))
+	$nbofentries = (count($data) - 1);
+	if ($nbofentries > 0)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
 		print '<tr class="pair">';

From 695eacf099e8d4b8cde3412e74467fa13f81b22b Mon Sep 17 00:00:00 2001
From: Stephane Lesage <stephane.lesage@ateis.com>
Date: Tue, 1 Dec 2020 19:30:09 +0100
Subject: [PATCH 445/888] Create/Edit extra-field with multi-line text area for
 computed value

---
 htdocs/core/tpl/admin_extrafields_add.tpl.php  | 7 +++++--
 htdocs/core/tpl/admin_extrafields_edit.tpl.php | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 2a9438f4413..de16915fe3c 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -182,11 +182,14 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:con
 <!-- Language file -->
 <tr><td class="titlefield"><?php echo $langs->trans("LanguageFile"); ?></td><td class="valeur"><input type="text" id="langfile" name="langfile" class="minwidth200" value="<?php echo dol_escape_htmltag(GETPOST('langfile', 'alpha')); ?>"></td></tr>
 <!-- Computed Value -->
+<tr class="extra_computed_value">
 <?php if (empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS)) { ?>
-	<tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?></td><td class="valeur"><input id="computed_value" type="text" name="computed_value" class="quatrevingtpercent" value="<?php echo (GETPOSTISSET('computed_value') ? GETPOST('computed_value', 'none') : ''); ?>"></td></tr>
+	<td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?></td>
 <?php } else { ?>
-	<tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc")).$form->textwithpicto($langs->trans("Computedpersistent"), $langs->trans("ComputedpersistentDesc"), 1, 'warning'); ?></td><td class="valeur"><input id="computed_value" class="quatrevingtpercent" type="text" name="computed_value" value="<?php echo dol_escape_htmltag($computed); ?>"></td></tr>
+	<td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc")).$form->textwithpicto($langs->trans("Computedpersistent"), $langs->trans("ComputedpersistentDesc"), 1, 'warning'); ?></td>
 <?php } ?>
+<td class="valeur"><textarea name="computed_value" id="computed_value" class="quatrevingtpercent" rows="<?php echo ROWS_4 ?>"><?php echo (GETPOST('computed_value', 'none') ?GETPOST('computed_value', 'none') : ''); ?></textarea></td>
+</tr>
 <!-- Default Value (at sql setup level) -->
 <tr class="extra_default_value"><td><?php echo $langs->trans("DefaultValue").' ('.$langs->trans("Database").')'; ?></td><td class="valeur"><input id="default_value" type="text" name="default_value" size="5" value="<?php echo (GETPOST('default_value', 'alpha') ?GETPOST('default_value', 'alpha') : ''); ?>"></td></tr>
 <!-- Unique -->
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index 8990f75951d..9e893bf93e3 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -265,11 +265,14 @@ if (in_array($type, array_keys($typewecanchangeinto)))
 <tr><td class="titlefield"><?php echo $langs->trans("LanguageFile"); ?></td><td class="valeur"><input type="text" name="langfile" class="minwidth200" value="<?php echo dol_escape_htmltag($langfile); ?>"></td></tr>
 
 <!-- Computed value -->
+<tr class="extra_computed_value">
 <?php if (empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS)) { ?>
-	<tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?></td><td class="valeur"><input id="computed_value" class="quatrevingtpercent" type="text" name="computed_value" value="<?php echo dol_escape_htmltag($computed); ?>"></td></tr>
+	<td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?></td>
 <?php } else { ?>
-	<tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc")).$form->textwithpicto($langs->trans("Computedpersistent"), $langs->trans("ComputedpersistentDesc"), 1, 'warning'); ?></td><td class="valeur"><input id="computed_value" class="quatrevingtpercent" type="text" name="computed_value" value="<?php echo dol_escape_htmltag($computed); ?>"></td></tr>
+	<td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc")).$form->textwithpicto($langs->trans("Computedpersistent"), $langs->trans("ComputedpersistentDesc"), 1, 'warning'); ?></td>
 <?php } ?>
+<td class="valeur"><textarea name="computed_value" id="computed_value" class="quatrevingtpercent" rows="<?php echo ROWS_4 ?>"><?php echo dol_htmlcleanlastbr($computed); ?></textarea></td>
+</tr>
 
 <!-- Default Value (at sql setup level) -->
 <tr class="extra_default_value"><td><?php echo $langs->trans("DefaultValue").' ('.$langs->trans("Database").')'; ?></td><td class="valeur"><input id="default_value" type="text" name="default_value" size="5" value="<?php echo dol_escape_htmltag($default); ?>"></td></tr>

From 7853e77d3f61d971af9f09707a54629f5fff5b10 Mon Sep 17 00:00:00 2001
From: Stephane Lesage <stephane.lesage@ateis.com>
Date: Mon, 30 Nov 2020 11:01:56 +0100
Subject: [PATCH 446/888] Export/Import categories missing fields and clean

---
 htdocs/categories/class/categorie.class.php |   8 +-
 htdocs/core/modules/modCategorie.class.php  | 667 +++++++++++---------
 htdocs/langs/en_US/categories.lang          |  16 +-
 htdocs/langs/fr_FR/categories.lang          |  10 +-
 4 files changed, 408 insertions(+), 293 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index f55b3403546..e49e0ae8838 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -98,6 +98,7 @@ class Categorie extends CommonObject
 		8 => 'bank_line',
 		9 => 'warehouse',
 		10 => 'actioncomm',
+        11 => 'website_page'
 	);
 
 	/**
@@ -221,7 +222,6 @@ class Categorie extends CommonObject
 	/**
 	 * @var string	Category type
 	 *
-	 * @see Categorie::TYPE_ACCOUNT
 	 * @see Categorie::TYPE_PRODUCT
 	 * @see Categorie::TYPE_SUPPLIER
 	 * @see Categorie::TYPE_CUSTOMER
@@ -229,9 +229,11 @@ class Categorie extends CommonObject
 	 * @see Categorie::TYPE_CONTACT
 	 * @see Categorie::TYPE_USER
 	 * @see Categorie::TYPE_PROJECT
+	 * @see Categorie::TYPE_ACCOUNT
 	 * @see Categorie::TYPE_BANK_LINE
-	 * @see Categorie::TYPE_WAREHOUSE
-	 * @see Categorie::TYPE_ACTIONCOMM
+     * @see Categorie::TYPE_WAREHOUSE
+     * @see Categorie::TYPE_ACTIONCOMM
+     * @see Categorie::TYPE_WEBSITE_PAGE
 	 */
 	public $type;
 
diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index bb6c36b353c..d2218d33483 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005      Matthieu Valleton    <mv@seeschloss.org>
  * Copyright (C) 2005-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2012-2016 Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2020      Stéphane Lesage		<stephane.lesage@ateis.com>
  *
  * 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
@@ -25,6 +26,7 @@
  *      \brief      Fichier de description et activation du module Categorie
  */
 include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 
 /**
@@ -64,7 +66,7 @@ class modCategorie extends DolibarrModules
 
 		// Config pages
 		$this->config_page_url = array('categorie.php@categories');
-		$this->langfiles = array("products", "companies", "categories", "members");
+		$this->langfiles = array("products", "companies", "categories", "members", "stocks", "website");
 
 		// Constants
 		$this->const = array();
@@ -116,265 +118,297 @@ class modCategorie extends DolibarrModules
 		//--------
 		$r = 0;
 
+		// All Categories List
 		$r++;
-		$this->export_code[$r] = 'category_'.$r;
-		$this->export_label[$r] = 'CatSupList';
-		$this->export_icon[$r] = 'category';
-		$this->export_enabled[$r] = '!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)';
-		$this->export_permission[$r] = array(array("categorie", "lire"), array("fournisseur", "lire"));
-		$this->export_fields_array[$r] = array(
-			'u.rowid'=>"CategId", 'u.label'=>"Label", 'u.description'=>"Description", 's.rowid'=>'IdThirdParty', 's.nom'=>'Name', 's.prefix_comm'=>"Prefix",
-			's.client'=>"Customer", 's.datec'=>"DateCreation", 's.tms'=>"DateLastModification", 's.code_client'=>"CustomerCode", 's.address'=>"Address",
-			's.zip'=>"Zip", 's.town'=>"Town", 'c.label'=>"Country", 'c.code'=>"CountryCode", 's.phone'=>"Phone", 's.fax'=>"Fax", 's.url'=>"Url", 's.email'=>"Email",
-			's.siret'=>"ProfId1", 's.siren'=>"ProfId2", 's.ape'=>"ProfId3", 's.idprof4'=>"ProfId4", 's.tva_intra'=>"VATIntraShort", 's.capital'=>"Capital",
-			's.note_public'=>"NotePublic"
-		);
-		$this->export_TypeFields_array[$r] = array(
-			'u.label'=>"Text", 'u.description'=>"Text", 's.rowid'=>'List:societe:nom', 's.nom'=>'Text', 's.prefix_comm'=>"Text", 's.client'=>"Text", 's.datec'=>"Date",
-			's.tms'=>"Date", 's.code_client'=>"Text", 's.address'=>"Text", 's.zip'=>"Text", 's.town'=>"Text", 'c.label'=>"List:c_country:label:label", 'c.code'=>"Text",
-			's.phone'=>"Text", 's.fax'=>"Text", 's.url'=>"Text", 's.email'=>"Text", 's.siret'=>"Text", 's.siren'=>"Text", 's.ape'=>"Text", 's.idprof4'=>"Text",
-			's.tva_intra'=>"Text", 's.capital'=>"Numeric", 's.note_public'=>"Text"
-		);
-		$this->export_entities_array[$r] = array(
-			's.rowid'=>'company', 's.nom'=>'company', 's.prefix_comm'=>"company", 's.client'=>"company", 's.datec'=>"company", 's.tms'=>"company",
-			's.code_client'=>"company", 's.address'=>"company", 's.zip'=>"company", 's.town'=>"company", 'c.label'=>"company", 'c.code'=>"company",
-			's.phone'=>"company", 's.fax'=>"company", 's.url'=>"company", 's.email'=>"company", 's.siret'=>"company", 's.siren'=>"company", 's.ape'=>"company",
-			's.idprof4'=>"company", 's.tva_intra'=>"company", 's.capital'=>"company", 's.note_public'=>"company"
-		); // We define here only fields that use another picto
+		$this->export_code[$r] = $this->rights_class.'_list';
+		$this->export_label[$r] = 'CatList';
+		$this->export_icon[$r] = $this->picto;
+        $this->export_enabled[$r] = 'true';
+		$this->export_permission[$r] = array(array("categorie", "lire"));
+
+		$typeexample = "";
+		if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) { $typeexample .= ($typeexample ? "/" : "")."0=Product-Service"; }
+		if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) { $typeexample .= ($typeexample ? "/" : "")."1=Supplier"; }
+		if (!empty($conf->societe->enabled)) { $typeexample .= ($typeexample ? "/" : "")."2=Customer-Prospect"; }
+		if (!empty($conf->adherent->enabled)) { $typeexample .= ($typeexample ? "/" : "")."3=Member"; }
+		if (!empty($conf->societe->enabled)) { $typeexample .= ($typeexample ? "/" : "")."4=Contact"; }
+		if (!empty($conf->bank->enabled)) { $typeexample .= ($typeexample ? "/" : "")."5=Bank account"; }
+		if (!empty($conf->projet->enabled)) { $typeexample .= ($typeexample ? "/" : "")."6=Project"; }
+		if (!empty($conf->user->enabled)) { $typeexample .= ($typeexample ? "/" : "")."7=User"; }
+		if (!empty($conf->bank->enabled)) { $typeexample .= ($typeexample ? "/" : "")."8=Bank line"; }
+		if (!empty($conf->stock->enabled)) { $typeexample .= ($typeexample ? "/" : "")."9=Warehouse"; }
+		if (!empty($conf->agenda->enabled)) { $typeexample .= ($typeexample ? "/" : "")."10=Agenda event"; }
+		if (!empty($conf->website->enabled)) { $typeexample .= ($typeexample ? "/" : "")."11=Website page"; }
+
+		$this->export_fields_array[$r] = array('cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.type'=>"Type ".$typeexample, 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategory", 'pcat.label'=>"ParentCategoryLabel" );
+		$this->export_TypeFields_array[$r] = array('cat.label'=>"Text", 'cat.type'=>"Numeric", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid', 'pcat.label'=>'Text' );
+		$this->export_entities_array[$r] = array(); // We define here only fields that use another picto
+
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
-		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as u, ';
-		$this->export_sql_end[$r] .= MAIN_DB_PREFIX.'categorie_fournisseur as cf, ';
-		$this->export_sql_end[$r] .= MAIN_DB_PREFIX.'societe as s LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as ce ON s.fk_effectif = ce.id LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code';
-		$this->export_sql_end[$r] .= ' WHERE u.rowid = cf.fk_categorie AND cf.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .= ' AND u.entity IN ('.getEntity('category').')';
-		$this->export_sql_end[$r] .= ' AND u.type = 1'; // Supplier categories
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as cat';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as pcat ON pcat.rowid = cat.fk_parent';
+		$this->export_sql_end[$r] .= ' WHERE cat.entity IN ('.getEntity('category').')';
 
+		// 0 Products
 		$r++;
-		$this->export_code[$r] = 'category_'.$r;
-		$this->export_label[$r] = 'CatCusList';
-		$this->export_icon[$r] = 'category';
-		$this->export_enabled[$r] = '$conf->societe->enabled';
-		$this->export_permission[$r] = array(array("categorie", "lire"), array("societe", "lire"));
-		$this->export_fields_array[$r] = array(
-			'u.rowid'=>"CategId", 'u.label'=>"Label", 'u.description'=>"Description", 's.rowid'=>'IdThirdParty', 's.nom'=>'Name', 's.prefix_comm'=>"Prefix",
-			's.client'=>"Customer", 's.datec'=>"DateCreation", 's.tms'=>"DateLastModification", 's.code_client'=>"CustomerCode", 's.address'=>"Address",
-			's.zip'=>"Zip", 's.town'=>"Town", 'c.label'=>"Country", 'c.code'=>"CountryCode", 's.phone'=>"Phone", 's.fax'=>"Fax", 's.url'=>"Url", 's.email'=>"Email",
-			's.siret'=>"ProfId1", 's.siren'=>"ProfId2", 's.ape'=>"ProfId3", 's.idprof4'=>"ProfId4", 's.tva_intra'=>"VATIntraShort", 's.capital'=>"Capital",
-			's.note_public'=>"NotePublic", 's.fk_prospectlevel'=>'ProspectLevel', 's.fk_stcomm'=>'ProspectStatus'
-		);
-		$this->export_TypeFields_array[$r] = array(
-			'u.label'=>"Text", 'u.description'=>"Text", 's.rowid'=>'List:societe:nom', 's.nom'=>'Text', 's.prefix_comm'=>"Text", 's.client'=>"Text",
-			's.datec'=>"Date", 's.tms'=>"Date", 's.code_client'=>"Text", 's.address'=>"Text", 's.zip'=>"Text", 's.town'=>"Text", 'c.label'=>"List:c_country:label:label",
-			'c.code'=>"Text", 's.phone'=>"Text", 's.fax'=>"Text", 's.url'=>"Text", 's.email'=>"Text", 's.siret'=>"Text", 's.siren'=>"Text", 's.ape'=>"Text",
-			's.idprof4'=>"Text", 's.tva_intra'=>"Text", 's.capital'=>"Numeric", 's.note_public'=>"Text", 's.fk_prospectlevel'=>'List:c_prospectlevel:label:code',
-			's.fk_stcomm'=>'List:c_stcomm:libelle:code'
-		);
-		$this->export_entities_array[$r] = array(
-			's.rowid'=>'company', 's.nom'=>'company', 's.prefix_comm'=>"company", 's.client'=>"company", 's.datec'=>"company", 's.tms'=>"company",
-			's.code_client'=>"company", 's.address'=>"company", 's.zip'=>"company", 's.town'=>"company", 'c.label'=>"company", 'c.code'=>"company",
-			's.phone'=>"company", 's.fax'=>"company", 's.url'=>"company", 's.email'=>"company", 's.siret'=>"company", 's.siren'=>"company", 's.ape'=>"company",
-			's.idprof4'=>"company", 's.tva_intra'=>"company", 's.capital'=>"company", 's.note_public'=>"company", 's.fk_prospectlevel'=>'company',
-			's.fk_stcomm'=>'company'
-		); // We define here only fields that use another picto
+		$this->export_code[$r] = $this->rights_class.'_0_'.Categorie::$MAP_ID_TO_CODE[0];
+		$this->export_label[$r] = 'CatProdList';
+		$this->export_icon[$r] = $this->picto;
+		$this->export_enabled[$r] = '!empty($conf->product->enabled) || !empty($conf->service->abled)';
+		$this->export_permission[$r] = array(array("categorie", "lire"), array("produit", "export"));
+		$this->export_fields_array[$r] = array('cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategory", 'p.rowid'=>'ProductId', 'p.ref'=>'Ref', 'p.label'=>'Label');
+		$this->export_TypeFields_array[$r] = array('cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid', 'p.ref'=>'Text', 'p.label'=>'Text');
+		$this->export_entities_array[$r] = array('p.rowid'=>'product', 'p.ref'=>'product', 'p.label'=>'product'); // We define here only fields that use another picto
 
-		$keyforselect = 'societe'; $keyforelement = 'company'; $keyforaliasextra = 'extrasoc';
+		$keyforselect = 'product'; $keyforelement = 'product'; $keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
-		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as u, ';
-		$this->export_sql_end[$r] .= MAIN_DB_PREFIX.'categorie_societe as cf, ';
-		$this->export_sql_end[$r] .= MAIN_DB_PREFIX.'societe as s';
-		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as ce ON s.fk_effectif = ce.id LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code';
-	 	$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extrasoc ON s.rowid = extrasoc.fk_object ';
-		$this->export_sql_end[$r] .= ' WHERE u.rowid = cf.fk_categorie AND cf.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .= ' AND u.entity IN ('.getEntity('category').')';
-		$this->export_sql_end[$r] .= ' AND u.type = 2'; // Customer/Prospect categories
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as cat';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_categorie = cat.rowid';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'product as p ON p.rowid = cp.fk_product';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON extra.fk_object = p.rowid';
+		$this->export_sql_end[$r] .= ' WHERE cat.entity IN ('.getEntity('category').')';
+		$this->export_sql_end[$r] .= ' AND cat.type = 0';
 
+		// 1 Suppliers
 		$r++;
-		$this->export_code[$r] = 'category_'.$r;
-		$this->export_label[$r] = 'CatProdList';
-		$this->export_icon[$r] = 'category';
-		$this->export_enabled[$r] = '$conf->product->enabled || $conf->service->enabled';
-		$this->export_permission[$r] = array(array("categorie", "lire"), array("produit", "lire"));
-		$this->export_fields_array[$r] = array('u.rowid'=>"CategId", 'u.label'=>"Label", 'u.description'=>"Description", 'p.rowid'=>'ProductId', 'p.ref'=>'Ref');
-		$this->export_TypeFields_array[$r] = array('u.label'=>"Text", 'u.description'=>"Text", 'p.ref'=>'Text');
-		$this->export_entities_array[$r] = array('p.rowid'=>'product', 'p.ref'=>'product'); // We define here only fields that use another picto
-		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
-		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_product as cp, '.MAIN_DB_PREFIX.'product as p';
-		$this->export_sql_end[$r] .= ' WHERE u.rowid = cp.fk_categorie AND cp.fk_product = p.rowid';
-		$this->export_sql_end[$r] .= ' AND u.entity IN ('.getEntity('category').')';
-		$this->export_sql_end[$r] .= ' AND u.type = 0'; // Supplier categories
-
-		$r++;
-		$this->export_code[$r] = 'category_'.$r;
-		$this->export_label[$r] = 'CatMemberList';
-		$this->export_icon[$r] = 'category';
-		$this->export_enabled[$r] = '$conf->adherent->enabled';
-		$this->export_permission[$r] = array(array("categorie", "lire"), array("adherent", "lire"));
-		$this->export_fields_array[$r] = array('u.rowid'=>"CategId", 'u.label'=>"Label", 'u.description'=>"Description", 'p.rowid'=>'MemberId', 'p.lastname'=>'LastName', 'p.firstname'=>'Firstname');
-		$this->export_TypeFields_array[$r] = array('u.label'=>"Text", 'u.description'=>"Text", 'p.lastname'=>'Text', 'p.firstname'=>'Text');
-		$this->export_entities_array[$r] = array('p.rowid'=>'member', 'p.lastname'=>'member', 'p.firstname'=>'member'); // We define here only fields that use another picto
-		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
-		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_member as cp, '.MAIN_DB_PREFIX.'adherent as p';
-		$this->export_sql_end[$r] .= ' WHERE u.rowid = cp.fk_categorie AND cp.fk_member = p.rowid';
-		$this->export_sql_end[$r] .= ' AND u.entity IN ('.getEntity('category').')';
-		$this->export_sql_end[$r] .= ' AND u.type = 3'; // Member categories
-
-		$r++;
-		$this->export_code[$r] = 'category_'.$r;
-		$this->export_label[$r] = 'CatContactList';
-		$this->export_icon[$r] = 'category';
-		$this->export_enabled[$r] = '$conf->societe->enabled';
-		$this->export_permission[$r] = array(array("categorie", "lire"), array("societe", "lire"));
+		$this->export_code[$r] = $this->rights_class.'_1_'.Categorie::$MAP_ID_TO_CODE[1];
+		$this->export_label[$r] = 'CatSupList';
+		$this->export_icon[$r] = $this->picto;
+		$this->export_enabled[$r] = '!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)';
+		$this->export_permission[$r] = array(array("categorie", "lire"), array("fournisseur", "lire"));
 		$this->export_fields_array[$r] = array(
-			'u.rowid' => "CategId",
-			'u.label' => "Label",
-			'u.description' => "Description",
-			'p.rowid' => 'ContactId',
-			'p.civility' => 'UserTitle',
-			'p.lastname' => 'LastName',
-			'p.firstname' => 'Firstname',
-			'p.address' => 'Address',
-			'p.zip' => 'Zip',
-			'p.town' => 'Town',
-			'country.code' => 'CountryCode',
-			'country.label' => 'Country',
-			'p.birthday' => 'DateOfBirth',
-			'p.poste' => 'PostOrFunction',
-			'p.phone' => 'Phone',
-			'p.phone_perso' => 'PhonePerso',
-			'p.phone_mobile' => 'PhoneMobile',
-			'p.fax' => 'Fax',
-			'p.email' => 'Email',
-			'p.note_private' => 'NotePrivate',
-			'p.note_public' => 'NotePublic',
-			'p.statut' => 'Status',
-			's.nom'=>"Name",
-			's.client'=>"Customer",
-			's.fournisseur'=>"Supplier",
-			's.status'=>"Status",
-			's.address'=>"Address",
-			's.zip'=>"Zip",
-			's.town'=>"Town",
-			's.phone'=>"Phone",
-			's.fax'=>"Fax",
-			's.url'=>"Url",
-			's.email'=>"Email"
+			'cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategory",
+			's.rowid'=>'IdThirdParty', 's.nom'=>'Name', 's.prefix_comm'=>"Prefix", 's.fournisseur'=>"Supplier", 's.datec'=>"DateCreation", 's.tms'=>"DateLastModification", 's.code_fournisseur'=>"SupplierCode",
+			's.address'=>"Address", 's.zip'=>"Zip", 's.town'=>"Town", 'c.label'=>"Country", 'c.code'=>"CountryCode",
+			's.phone'=>"Phone", 's.fax'=>"Fax", 's.url'=>"Url", 's.email'=>"Email",
+			's.siret'=>"ProfId1", 's.siren'=>"ProfId2", 's.ape'=>"ProfId3", 's.idprof4'=>"ProfId4", 's.tva_intra'=>"VATIntraShort", 's.capital'=>"Capital", 's.note_public'=>"NotePublic",
+			't.libelle'=>'ThirdPartyType'
 		);
 		$this->export_TypeFields_array[$r] = array(
-			'u.label' => "Text",
-			'u.description' => "Text",
-			'p.lastname' => 'Text',
-			'p.firstname' => 'Text',
-			'p.statut'=>"Numeric",
-			's.nom'=>"Text",
-			's.status'=>"Text",
-			's.address'=>"Text",
-			's.zip'=>"Text",
-			's.town'=>"Text",
-			's.phone'=>"Text",
-			's.fax'=>"Text",
-			's.url'=>"Text",
-			's.email'=>"Text"
+			'cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid',
+			's.rowid'=>'List:societe:nom', 's.nom'=>'Text', 's.prefix_comm'=>"Text", 's.fournisseur'=>"Text", 's.datec'=>"Date", 's.tms'=>"Date", 's.code_fournisseur'=>"Text",
+			's.address'=>"Text", 's.zip'=>"Text", 's.town'=>"Text", 'c.label'=>"List:c_country:label:label", 'c.code'=>"Text",
+			's.phone'=>"Text", 's.fax'=>"Text", 's.url'=>"Text", 's.email'=>"Text",
+			's.siret'=>"Text", 's.siren'=>"Text", 's.ape'=>"Text", 's.idprof4'=>"Text", 's.tva_intra'=>"Text", 's.capital'=>"Numeric", 's.note_public'=>"Text",
+			't.libelle'=>'List:c_typent:libelle:code'
 		);
 		$this->export_entities_array[$r] = array(
-			'u.rowid' => "category",
-			'u.label' => "category",
-			'u.description' => "category",
-			'p.rowid' => 'contact',
-			'p.civility' => 'contact',
-			'p.lastname' => 'contact',
-			'p.firstname' => 'contact',
-			'p.address' => 'contact',
-			'p.zip' => 'contact',
-			'p.town' => 'contact',
-			'country.code' => 'contact',
-			'country.label' => 'contact',
-			'p.birthday' => 'contact',
-			'p.poste' => 'contact',
-			'p.phone' => 'contact',
-			'p.phone_perso' => 'contact',
-			'p.phone_mobile' => 'contact',
-			'p.fax' => 'contact',
-			'p.email' => 'contact',
-			'p.note_private' => 'contact',
-			'p.note_public' => 'contact',
-			'p.statut' => 'contact',
-			's.nom'=>"company",
-			's.client'=>"company",
-			's.fournisseur'=>"company",
-			's.status'=>"company",
-			's.address'=>"company",
-			's.zip'=>"company",
-			's.town'=>"company",
-			's.phone'=>"company",
-			's.fax'=>"company",
-			's.url'=>"company",
-			's.email'=>"company"
+			's.rowid'=>'company', 's.nom'=>'company', 's.prefix_comm'=>"company", 's.fournisseur'=>"company", 's.datec'=>"company", 's.tms'=>"company", 's.code_fournisseur'=>"company",
+			's.address'=>"company", 's.zip'=>"company", 's.town'=>"company", 'c.label'=>"company", 'c.code'=>"company",
+			's.phone'=>"company", 's.fax'=>"company", 's.url'=>"company", 's.email'=>"company",
+			's.siret'=>"company", 's.siren'=>"company", 's.ape'=>"company", 's.idprof4'=>"company", 's.tva_intra'=>"company", 's.capital'=>"company", 's.note_public'=>"company",
+			't.libelle'=>'company'
 		); // We define here only fields that use another picto
 
-		// Add extra fields
-		$sql = "SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'socpeople' AND entity IN (0, ".$conf->entity.")";
-		$resql = $this->db->query($sql);
-		if ($resql)    // This can fail when class is used on old database (during migration for example)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
-				$fieldname = 'extra.'.$obj->name;
-				$fieldlabel = ucfirst($obj->label);
-				$typeFilter = "Text";
-				switch ($obj->type)
-				{
-					case 'int':
-					case 'double':
-					case 'price':
-						$typeFilter = "Numeric";
-						break;
-					case 'date':
-					case 'datetime':
-						$typeFilter = "Date";
-						break;
-					case 'boolean':
-						$typeFilter = "Boolean";
-						break;
-					case 'sellist':
-						$typeFilter = "List:".$obj->param;
-						break;
-					case 'select':
-						$typeFilter = "Select:".$obj->param;
-						break;
-				}
-				$this->export_fields_array[$r][$fieldname] = $fieldlabel;
-				$this->export_TypeFields_array[$r][$fieldname] = $typeFilter;
-				$this->export_entities_array[$r][$fieldname] = 'contact';
-			}
-		}
-		// End add axtra fields
+		$keyforselect = 'societe'; $keyforelement = 'company'; $keyforaliasextra = 'extra';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
-		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_contact as cp, '.MAIN_DB_PREFIX.'socpeople as p';
-		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as country ON p.fk_pays = country.rowid';
-		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as cat';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'categorie_fournisseur as cf ON cf.fk_categorie = cat.rowid';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = cf.fk_soc';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra ON s.rowid = extra.fk_object';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id';
+		$this->export_sql_end[$r] .= ' WHERE cat.entity IN ('.getEntity('category').')';
+		$this->export_sql_end[$r] .= ' AND cat.type = 1';
+
+		// 2 Customers/Prospects
+		$r++;
+		$this->export_code[$r] = $this->rights_class.'_2_'.Categorie::$MAP_ID_TO_CODE[2];
+		$this->export_label[$r] = 'CatCusList';
+		$this->export_icon[$r] = $this->picto;
+		$this->export_enabled[$r] = '!empty($conf->societe->enabled)';
+		$this->export_permission[$r] = array(array("categorie", "lire"), array("societe", "export"));
+		$this->export_fields_array[$r] = array(
+			'cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategory",
+			's.rowid'=>'IdThirdParty', 's.nom'=>'Name', 's.prefix_comm'=>"Prefix", 's.client'=>"Customer", 's.datec'=>"DateCreation", 's.tms'=>"DateLastModification", 's.code_client'=>"CustomerCode",
+			's.address'=>"Address", 's.zip'=>"Zip", 's.town'=>"Town", 'c.label'=>"Country", 'c.code'=>"CountryCode",
+			's.phone'=>"Phone", 's.fax'=>"Fax", 's.url'=>"Url", 's.email'=>"Email",
+			's.siret'=>"ProfId1", 's.siren'=>"ProfId2", 's.ape'=>"ProfId3", 's.idprof4'=>"ProfId4", 's.tva_intra'=>"VATIntraShort", 's.capital'=>"Capital", 's.note_public'=>"NotePublic",
+			't.libelle'=>'ThirdPartyType', 'pl.code'=>'ProspectLevel', 'st.code'=>'ProspectStatus'
+		);
+		$this->export_TypeFields_array[$r] = array(
+			'cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid',
+			's.rowid'=>'List:societe:nom', 's.nom'=>'Text', 's.prefix_comm'=>"Text", 's.client'=>"Text", 's.datec'=>"Date", 's.tms'=>"Date", 's.code_client'=>"Text",
+			's.address'=>"Text", 's.zip'=>"Text", 's.town'=>"Text", 'c.label'=>"List:c_country:label:label", 'c.code'=>"Text",
+			's.phone'=>"Text", 's.fax'=>"Text", 's.url'=>"Text", 's.email'=>"Text",
+			's.siret'=>"Text", 's.siren'=>"Text", 's.ape'=>"Text", 's.idprof4'=>"Text", 's.tva_intra'=>"Text", 's.capital'=>"Numeric", 's.note_public'=>"Text",
+			't.libelle'=>'List:c_typent:libelle:code', 'pl.code'=>'List:c_prospectlevel:label:code', 'st.code'=>'List:c_stcomm:libelle:code'
+		);
+		$this->export_entities_array[$r] = array(
+			's.rowid'=>'company', 's.nom'=>'company', 's.prefix_comm'=>"company", 's.client'=>"company", 's.datec'=>"company", 's.tms'=>"company", 's.code_client'=>"company",
+			's.address'=>"company", 's.zip'=>"company", 's.town'=>"company", 'c.label'=>"company", 'c.code'=>"company",
+			's.phone'=>"company", 's.fax'=>"company", 's.url'=>"company", 's.email'=>"company",
+			's.siret'=>"company", 's.siren'=>"company", 's.ape'=>"company", 's.idprof4'=>"company", 's.tva_intra'=>"company", 's.capital'=>"company", 's.note_public'=>"company",
+			't.libelle'=>'company', 'pl.code'=>'company', 'st.code'=>'company'
+		); // We define here only fields that use another picto
+
+		$keyforselect = 'societe'; $keyforelement = 'company'; $keyforaliasextra = 'extra';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as cat';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'categorie_societe as cs ON cs.fk_categorie = cat.rowid';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = cs.fk_soc';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra ON s.rowid = extra.fk_object';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_prospectlevel as pl ON s.fk_prospectlevel = pl.code';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_stcomm as st ON s.fk_stcomm = st.id';
+		$this->export_sql_end[$r] .= ' WHERE cat.entity IN ('.getEntity('category').')';
+		$this->export_sql_end[$r] .= ' AND cat.type = 2';
+
+		// 3 Members
+		$r++;
+		$this->export_code[$r] = $this->rights_class.'_3_'.Categorie::$MAP_ID_TO_CODE[3];
+		$this->export_label[$r] = 'CatMemberList';
+		$this->export_icon[$r] = $this->picto;
+		$this->export_enabled[$r] = '!empty($conf->adherent->enabled)';
+		$this->export_permission[$r] = array(array("categorie", "lire"), array("adherent", "export"));
+		$this->export_fields_array[$r] = array('cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategory", 'p.rowid'=>'MemberId', 'p.lastname'=>'LastName', 'p.firstname'=>'Firstname');
+		$this->export_TypeFields_array[$r] = array('cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid', 'p.lastname'=>'Text', 'p.firstname'=>'Text');
+		$this->export_entities_array[$r] = array('p.rowid'=>'member', 'p.lastname'=>'member', 'p.firstname'=>'member'); // We define here only fields that use another picto
+
+		$keyforselect = 'adherent'; $keyforelement = 'member'; $keyforaliasextra = 'extra';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as cat';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'categorie_member as cm ON cm.fk_categorie = cat.rowid';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'adherent as p ON p.rowid = cm.fk_member';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'adherent_extrafields as extra ON cat.rowid = extra.fk_object ';
+		$this->export_sql_end[$r] .= ' WHERE cat.entity IN ('.getEntity('category').')';
+		$this->export_sql_end[$r] .= ' AND cat.type = 3';
+
+		// 4 Contacts
+		$r++;
+		$this->export_code[$r] = $this->rights_class.'_4_'.Categorie::$MAP_ID_TO_CODE[4];
+		$this->export_label[$r] = 'CatContactList';
+		$this->export_icon[$r] = $this->picto;
+		$this->export_enabled[$r] = '!empty($conf->societe->enabled)';
+		$this->export_permission[$r] = array(array("categorie", "lire"), array("societe", "contact", "export"));
+		$this->export_fields_array[$r] = array(
+			'cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategory",
+			'p.rowid' => 'ContactId', 'civ.label' => 'UserTitle', 'p.lastname' => 'LastName', 'p.firstname' => 'Firstname',
+			'p.address' => 'Address', 'p.zip' => 'Zip', 'p.town' => 'Town', 'c.code' => 'CountryCode', 'c.label' => 'Country',
+			'p.birthday' => 'DateOfBirth', 'p.poste' => 'PostOrFunction',
+			'p.phone' => 'Phone', 'p.phone_perso' => 'PhonePerso', 'p.phone_mobile' => 'PhoneMobile', 'p.fax' => 'Fax', 'p.email' => 'Email',
+			'p.note_private' => 'NotePrivate', 'p.note_public' => 'NotePublic', 'p.statut' => 'Status',
+			's.nom'=>"Name", 's.client'=>"Customer", 's.fournisseur'=>"Supplier", 's.status'=>"Status",
+			's.address'=>"Address", 's.zip'=>"Zip", 's.town'=>"Town",
+			's.phone'=>"Phone", 's.fax'=>"Fax", 's.url'=>"Url", 's.email'=>"Email"
+		);
+		$this->export_TypeFields_array[$r] = array(
+			'cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid',
+			'civ.label' => 'List:c_civility:label:label', 'p.lastname' => 'Text', 'p.firstname' => 'Text',
+			'p.address' => 'Text', 'p.zip' => 'Text', 'p.town' => 'Text', 'c.code' => 'Text', 'c.label' => 'List:c_country:label:label',
+			'p.birthday' => 'Date', 'p.poste' => 'Text',
+			'p.phone' => 'Text', 'p.phone_perso' => 'Text', 'p.phone_mobile' => 'Text', 'p.fax' => 'Text', 'p.email' => 'Text',
+			'p.note_private' => 'Text', 'p.note_public' => 'Text', 'p.statut' => 'Boolean',
+			's.nom'=>"Text", 's.client'=>"Boolean", 's.fournisseur'=>"Boolean", 's.status'=>"Boolean",
+			's.address'=>"Text", 's.zip'=>"Text", 's.town'=>"Text",
+			's.phone'=>"Text", 's.fax'=>"Text", 's.url'=>"Text", 's.email'=>"Text"
+		);
+		$this->export_entities_array[$r] = array(
+			'p.rowid' => 'contact', 'civ.label' => 'contact', 'p.lastname' => 'contact', 'p.firstname' => 'contact',
+			'p.address' => 'contact', 'p.zip' => 'contact', 'p.town' => 'contact', 'c.code' => 'contact', 'c.label' => 'contact',
+			'p.birthday' => 'contact', 'p.poste' => 'contact',
+			'p.phone' => 'contact', 'p.phone_perso' => 'contact', 'p.phone_mobile' => 'contact', 'p.fax' => 'contact', 'p.email' => 'contact',
+			'p.note_private' => 'contact', 'p.note_public' => 'contact', 'p.statut' => 'contact',
+			's.nom'=>"company", 's.client'=>"company", 's.fournisseur'=>"company", 's.status'=>"company",
+			's.address'=>"company", 's.zip'=>"company", 's.town'=>"company",
+			's.phone'=>"company", 's.fax'=>"company", 's.url'=>"company", 's.email'=>"company"
+		); // We define here only fields that use another picto
+
+		$keyforselect = 'socpeople'; $keyforelement = 'contact'; $keyforaliasextra = 'extra';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as cat';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'categorie_contact as cc ON cc.fk_categorie = cat.rowid';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'socpeople as p ON p.rowid = cc.fk_socpeople';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra ON extra.fk_object = p.rowid';
-		$this->export_sql_end[$r] .= ' WHERE u.rowid = cp.fk_categorie AND cp.fk_socpeople = p.rowid AND u.entity IN ('.getEntity('category').')';
-		$this->export_sql_end[$r] .= ' AND u.type = 4'; // contact categories
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_civility as civ ON civ.rowid = p.civility';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON c.rowid = p.fk_pays';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc';
+		$this->export_sql_end[$r] .= ' WHERE cat.entity IN ('.getEntity('category').')';
+		$this->export_sql_end[$r] .= ' AND cat.type = 4';
+
+		// 5 Bank accounts, TODO ?
+
+		// 6 Projects
+		$r++;
+		$this->export_code[$r] = $this->rights_class.'_6_'.Categorie::$MAP_ID_TO_CODE[6];
+		$this->export_label[$r] = 'CatProjectsList';
+		$this->export_icon[$r] = $this->picto;
+		$this->export_enabled[$r] = '!empty($conf->projet->enabled)';
+		$this->export_permission[$r] = array(array("categorie", "lire"), array("projet", "export"));
+		$this->export_fields_array[$r] = array('cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategory", 'p.rowid'=>'ProjectId', 'p.ref'=>'Ref', 's.rowid'=>"IdThirdParty", 's.nom'=>"Name");
+		$this->export_TypeFields_array[$r] = array('cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid', 'p.ref'=>'Text', 's.rowid'=>"List:societe:nom:rowid", 's.nom'=>"Text");
+		$this->export_entities_array[$r] = array('p.rowid'=>'project', 'p.ref'=>'project', 's.rowid'=>"company", 's.nom'=>"company"); // We define here only fields that use another picto
+
+		$keyforselect = 'projet'; $keyforelement = 'project'; $keyforaliasextra = 'extra';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as cat';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'categorie_project as cp ON cp.fk_categorie = cat.rowid';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'projet as p ON p.rowid = cp.fk_project';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet_extrafields as extra ON extra.fk_object = p.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc';
+		$this->export_sql_end[$r] .= ' WHERE cat.entity IN ('.getEntity('category').')';
+		$this->export_sql_end[$r] .= ' AND cat.type = 6';
+
+		// 7 Users
+		$r++;
+		$this->export_code[$r] = $this->rights_class.'_7_'.Categorie::$MAP_ID_TO_CODE[7];
+		$this->export_label[$r] = 'CatUsersList';
+		$this->export_icon[$r] = $this->picto;
+		$this->export_enabled[$r] = '!empty($conf->user->enabled)';
+		$this->export_permission[$r] = array(array("categorie", "lire"), array("user", "export"));
+		$this->export_fields_array[$r] = array('cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategory", 'p.rowid'=>'TechnicalID', 'p.login'=>'Login', 'p.lastname'=>'Lastname', 'p.firstname'=>'Firstname');
+		$this->export_TypeFields_array[$r] = array('cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid', 'p.login'=>'Text', 'p.lastname'=>'Text', 'p.firstname'=>'Text');
+		$this->export_entities_array[$r] = array('p.rowid'=>'user', 'p.login'=>'user', 'p.lastname'=>'user', 'p.firstname'=>'user'); // We define here only fields that use another picto
+
+		$keyforselect = 'user'; $keyforelement = 'user'; $keyforaliasextra = 'extra';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as cat';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'categorie_user as cu ON cu.fk_categorie = cat.rowid';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'user as p ON p.rowid = cu.fk_user';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user_extrafields as extra ON extra.fk_object = p.rowid';
+		$this->export_sql_end[$r] .= ' WHERE cat.entity IN ('.getEntity('category').')';
+		$this->export_sql_end[$r] .= ' AND cat.type = 7';
+
+		// 8 Bank Lines, TODO ?
+
+		// 9 Warehouses, TODO ?
+
+		// 10 Agenda Events, TODO ?
+
+		// 11 Website Pages, TODO ?
 
 		// Imports
 		//--------
 
 		$r = 0;
 
+		// Categories
 		$r++;
-		$this->import_code[$r] = $this->rights_class.'_'.$r;
+		$this->import_code[$r] = $this->rights_class.'_list';
 		$this->import_label[$r] = "CatList"; // Translation key
 		$this->import_icon[$r] = $this->picto;
 		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
 		$this->import_tables_array[$r] = array('ca'=>MAIN_DB_PREFIX.'categorie');
 		$this->import_fields_array[$r] = array(
 			'ca.label'=>"Label*", 'ca.type'=>"Type*", 'ca.description'=>"Description",
-			'ca.fk_parent' => 'Parent'
+			'ca.fk_parent' => 'ParentCategory'
 		);
-		$this->import_regex_array[$r] = array('ca.type'=>'^\d+$');
+		$this->import_regex_array[$r] = array('ca.type'=>'^(0|1|2|3|4|5|6|7|8|9|10|11)$');
 		$this->import_convertvalue_array[$r] = array(
 			'ca.fk_parent' => array(
 				'rule'          => 'fetchidfromcodeandlabel',
@@ -385,21 +419,18 @@ class modCategorie extends DolibarrModules
 				'codefromfield' => 'ca.type'
 			)
 		);
-		$typeexample = "";
-		if (!empty($conf->product->enabled)) { $typeexample .= ($typeexample ? "/" : "")."0=Product"; }
-		if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) { $typeexample .= ($typeexample ? "/" : "")."1=Supplier"; }
-		if (!empty($conf->societe->enabled)) { $typeexample .= ($typeexample ? "/" : "")."2=Customer-Prospect"; }
-		if (!empty($conf->adherent->enabled)) { $typeexample .= ($typeexample ? "/" : "")."3=Member"; }
-		$this->import_examplevalues_array[$r] = array(
-			'ca.label'=>"Supplier Category", 'ca.type'=>$typeexample, 'ca.description'=>"My Category description",
-			'ca.fk_parent' => '0'
-		);
 
+		$this->import_examplevalues_array[$r] = array(
+			'ca.label'=>"My Category Label", 'ca.type'=>$typeexample, 'ca.description'=>"My Category description",		// $typeexample built above in exports
+			'ca.fk_parent' => 'rowid or label'
+		);
+		$this->import_updatekeys_array[$r] = array('ca.label'=>'Label');
+
+		// 0 Products
 		if (!empty($conf->product->enabled))
 		{
-			//Products
 			$r++;
-			$this->import_code[$r] = $this->rights_class.'_'.$r;
+			$this->import_code[$r] = $this->rights_class.'_0_'.Categorie::$MAP_ID_TO_CODE[0];
 			$this->import_label[$r] = "CatProdLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
@@ -409,57 +440,16 @@ class modCategorie extends DolibarrModules
 
 			$this->import_convertvalue_array[$r] = array(
 					'cp.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
-					'cp.fk_product'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/class/product.class.php', 'class'=>'Product', 'method'=>'fetch', 'element'=>'product')
+					'cp.fk_product'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/class/product.class.php', 'class'=>'Product', 'method'=>'fetch', 'element'=>'Product')
 			);
-			$this->import_examplevalues_array[$r] = array('cp.fk_categorie'=>"Imported category", 'cp.fk_product'=>"PREF123456");
-		}
-
-		if (!empty($conf->societe->enabled))
-		{
-			// Customers
-			$r++;
-			$this->import_code[$r] = $this->rights_class.'_'.$r;
-			$this->import_label[$r] = "CatCusLinks"; // Translation key
-			$this->import_icon[$r] = $this->picto;
-			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-			$this->import_tables_array[$r] = array('cs'=>MAIN_DB_PREFIX.'categorie_societe');
-			$this->import_fields_array[$r] = array('cs.fk_categorie'=>"Category*", 'cs.fk_soc'=>"ThirdParty*");
-			$this->import_regex_array[$r] = array(
-				'cs.fk_categorie'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=2',
-				'cs.fk_soc'=>'rowid@'.MAIN_DB_PREFIX.'societe:client>0'
-			);
-
-			$this->import_convertvalue_array[$r] = array(
-					'cs.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
-					'cs.fk_soc'=>array('rule'=>'fetchidfromref', 'classfile'=>'/societe/class/societe.class.php', 'class'=>'Societe', 'method'=>'fetch', 'element'=>'ThirdParty')
-			);
-			$this->import_examplevalues_array[$r] = array('cs.fk_categorie'=>"Imported category", 'cs.fk_soc'=>"MyBigCompany");
-
-			// Contacts/Addresses
-			$r++;
-			$this->import_code[$r] = $this->rights_class.'_'.$r;
-			$this->import_label[$r] = "CatContactsLinks"; // Translation key
-			$this->import_icon[$r] = $this->picto;
-			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-			$this->import_tables_array[$r] = array('cs'=>MAIN_DB_PREFIX.'categorie_contact');
-			$this->import_fields_array[$r] = array('cs.fk_categorie'=>"Category*", 'cs.fk_socpeople'=>"Contact ID*");
-			$this->import_regex_array[$r] = array(
-				'cs.fk_categorie'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=4'
-				//'cs.fk_socpeople'=>'rowid@'.MAIN_DB_PREFIX.'socpeople'
-			);
-
-			$this->import_convertvalue_array[$r] = array(
-				'cs.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category')
-				//'cs.fk_socpeople'=>array('rule'=>'fetchidfromref','classfile'=>'/contact/class/contact.class.php','class'=>'Contact','method'=>'fetch','element'=>'Contact')
-			);
-			$this->import_examplevalues_array[$r] = array('cs.fk_categorie'=>"Imported category", 'cs.fk_socpeople'=>"123");
+			$this->import_examplevalues_array[$r] = array('cp.fk_categorie'=>"rowid or label", 'cp.fk_product'=>"rowid or ref");
 		}
 
+		// 1 Suppliers
 		if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
 		{
-			// Suppliers
 			$r++;
-			$this->import_code[$r] = $this->rights_class.'_'.$r;
+			$this->import_code[$r] = $this->rights_class.'_1_'.Categorie::$MAP_ID_TO_CODE[1];
 			$this->import_label[$r] = "CatSupLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
@@ -474,8 +464,119 @@ class modCategorie extends DolibarrModules
 					'cs.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
 					'cs.fk_soc'=>array('rule'=>'fetchidfromref', 'classfile'=>'/societe/class/societe.class.php', 'class'=>'Societe', 'method'=>'fetch', 'element'=>'ThirdParty')
 			);
-			$this->import_examplevalues_array[$r] = array('cs.fk_categorie'=>"Imported category", 'cs.fk_soc'=>"MyBigCompany");
+			$this->import_examplevalues_array[$r] = array('cs.fk_categorie'=>"rowid or label", 'cs.fk_soc'=>"rowid or ref");
 		}
+
+		// 2 Customers
+		if (!empty($conf->societe->enabled))
+		{
+			$r++;
+			$this->import_code[$r] = $this->rights_class.'_2_'.Categorie::$MAP_ID_TO_CODE[2];
+			$this->import_label[$r] = "CatCusLinks"; // Translation key
+			$this->import_icon[$r] = $this->picto;
+			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
+			$this->import_tables_array[$r] = array('cs'=>MAIN_DB_PREFIX.'categorie_societe');
+			$this->import_fields_array[$r] = array('cs.fk_categorie'=>"Category*", 'cs.fk_soc'=>"Customer*");
+			$this->import_regex_array[$r] = array(
+				'cs.fk_categorie'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=2',
+				'cs.fk_soc'=>'rowid@'.MAIN_DB_PREFIX.'societe:client>0'
+			);
+
+			$this->import_convertvalue_array[$r] = array(
+					'cs.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
+					'cs.fk_soc'=>array('rule'=>'fetchidfromref', 'classfile'=>'/societe/class/societe.class.php', 'class'=>'Societe', 'method'=>'fetch', 'element'=>'ThirdParty')
+			);
+			$this->import_examplevalues_array[$r] = array('cs.fk_categorie'=>"rowid or label", 'cs.fk_soc'=>"rowid or ref");
+		}
+
+		// 3 Members
+		if (!empty($conf->adherent->enabled))
+		{
+			$r++;
+			$this->import_code[$r] = $this->rights_class.'_3_'.Categorie::$MAP_ID_TO_CODE[3];
+			$this->import_label[$r] = "CatMembersLinks"; // Translation key
+			$this->import_icon[$r] = $this->picto;
+			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
+			$this->import_tables_array[$r] = array('cm'=>MAIN_DB_PREFIX.'categorie_contact');
+			$this->import_fields_array[$r] = array('cm.fk_categorie'=>"Category*", 'cm.fk_member'=>"Member*");
+			$this->import_regex_array[$r] = array('cm.fk_categorie'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=3');
+
+			$this->import_convertvalue_array[$r] = array(
+				'cs.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
+				'cs.fk_member'=>array('rule'=>'fetchidfromref','classfile'=>'/adherents/class/adherent.class.php','class'=>'Adherent','method'=>'fetch','element'=>'Member')
+			);
+			$this->import_examplevalues_array[$r] = array('cs.fk_categorie'=>"rowid or label", 'cs.fk_member'=>"rowid or ref");
+		}
+
+		// 4 Contacts/Addresses
+		if (!empty($conf->societe->enabled))
+		{
+			$r++;
+			$this->import_code[$r] = $this->rights_class.'_4_'.Categorie::$MAP_ID_TO_CODE[4];
+			$this->import_label[$r] = "CatContactsLinks"; // Translation key
+			$this->import_icon[$r] = $this->picto;
+			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
+			$this->import_tables_array[$r] = array('cc'=>MAIN_DB_PREFIX.'categorie_contact');
+			$this->import_fields_array[$r] = array('cc.fk_categorie'=>"Category*", 'cc.fk_socpeople'=>"IdContact*");
+			$this->import_regex_array[$r] = array(
+				'cc.fk_categorie'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=4'
+				//'cc.fk_socpeople'=>'rowid@'.MAIN_DB_PREFIX.'socpeople'
+			);
+
+			$this->import_convertvalue_array[$r] = array(
+				'cc.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
+				//'cc.fk_socpeople'=>array('rule'=>'fetchidfromref','classfile'=>'/contact/class/contact.class.php','class'=>'Contact','method'=>'fetch','element'=>'Contact')
+			);
+			$this->import_examplevalues_array[$r] = array('cc.fk_categorie'=>"rowid or label", 'cc.fk_socpeople'=>"rowid");
+		}
+
+		// 5 Bank accounts, TODO ?
+
+		// 6 Projects
+		if (!empty($conf->projet->enabled))
+		{
+			$r++;
+			$this->import_code[$r] = $this->rights_class.'_6_'.Categorie::$MAP_ID_TO_CODE[6];
+			$this->import_label[$r] = "CatProjectsLinks"; // Translation key
+			$this->import_icon[$r] = $this->picto;
+			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
+			$this->import_tables_array[$r] = array('cp'=>MAIN_DB_PREFIX.'categorie_project');
+			$this->import_fields_array[$r] = array('cp.fk_categorie'=>"Category*", 'cp.fk_project'=>"Project*");
+			$this->import_regex_array[$r] = array('cp.fk_categorie'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=6');
+
+			$this->import_convertvalue_array[$r] = array(
+				'cs.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
+				'cs.fk_project'=>array('rule'=>'fetchidfromref','classfile'=>'/projet/class/project.class.php','class'=>'Project','method'=>'fetch','element'=>'Project')
+			);
+			$this->import_examplevalues_array[$r] = array('cp.fk_categorie'=>"rowid or label", 'cp.fk_project'=>"rowid or ref");
+		}
+
+		// 7 Users
+		if (!empty($conf->user->enabled))
+		{
+			$r++;
+			$this->import_code[$r] = $this->rights_class.'_7_'.Categorie::$MAP_ID_TO_CODE[7];
+			$this->import_label[$r] = "CatUsersLinks"; // Translation key
+			$this->import_icon[$r] = $this->picto;
+			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
+			$this->import_tables_array[$r] = array('cu'=>MAIN_DB_PREFIX.'categorie_user');
+			$this->import_fields_array[$r] = array('cu.fk_categorie'=>"Category*", 'cu.fk_user'=>"User*");
+			$this->import_regex_array[$r] = array('cu.fk_categorie'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=7');
+
+			$this->import_convertvalue_array[$r] = array(
+				'cu.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
+				'cu.fk_user'=>array('rule'=>'fetchidfromref','classfile'=>'/user/class/user.class.php','class'=>'User','method'=>'fetch','element'=>'User')
+			);
+			$this->import_examplevalues_array[$r] = array('cu.fk_categorie'=>"rowid or label", 'cu.fk_user'=>"rowid or login");
+		}
+
+		// 8 Bank Lines, TODO ?
+
+		// 9 Warehouses, TODO ?
+
+		// 10 Agenda Events, TODO ?
+
+		// 11 Website Pages, TODO ?
 	}
 
 
diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang
index ba37a43b4ec..36d1d3e545a 100644
--- a/htdocs/langs/en_US/categories.lang
+++ b/htdocs/langs/en_US/categories.lang
@@ -65,16 +65,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index 580e98a38e9..f69d8573827 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -65,16 +65,22 @@ UsersCategoriesShort=Tags utlisateurs
 StockCategoriesShort=Tags/catégories d’entrepôt
 ThisCategoryHasNoItems=Cette catégorie ne contient aucun élément.
 CategId=ID du(de la) tag/catégorie
+ParentCategory=Tag/catégorie parent
+ParentCategoryLabel=Libellé du/de la tag/catégorie parent
 CatSupList=Liste des tags/catégories de fournisseurs
 CatCusList=Liste des tags/catégories de clients/prospects
 CatProdList=Liste des tags/catégories de produits/services
 CatMemberList=Liste des tags/catégories de membres
-CatContactList=Liste des tags/catégories de contact
+CatContactList=Liste des tags/catégories de contacts
+CatProjectsList=Liste des tags/catégories de projets
+CatUsersList=Liste des tags/catégories d'utilisateurs
 CatSupLinks=Liens entre fournisseurs et tags/catégories
 CatCusLinks=Liens entre clients/prospects et tags/catégories
 CatContactsLinks=Liens entre contacts/adresses et tags/catégories
 CatProdLinks=Liens entre produits/services et tags/catégories
-CatProJectLinks=Liens entre projets et tags/catégories
+CatMembersLinks=Liens entre membres et tags/catégories
+CatProjectsLinks=Liens entre projets et tags/catégories
+CatUsersLinks=Liens entre utilisateurs et tags/catégories
 DeleteFromCat=Enlever des tags/catégories
 ExtraFieldsCategories=Attributs supplémentaires
 CategoriesSetup=Configuration des tags/catégories

From 7749138a810a01470cb9327455b4f7be82498195 Mon Sep 17 00:00:00 2001
From: StephaneLesage <root@srv-dolibarr.ateis>
Date: Sat, 21 Nov 2020 13:28:37 +0100
Subject: [PATCH 447/888] Fix /categories/edit.php which used type parameter
 instead of object's type Do not read type parameter Security check, display
 error and exit Get type from category object

---
 htdocs/categories/edit.php       |  9 ++++++---
 htdocs/categories/info.php       |  7 ++++---
 htdocs/categories/photos.php     |  7 ++++---
 htdocs/categories/traduction.php |  4 ++--
 htdocs/categories/viewcat.php    | 14 ++------------
 5 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index f4b7e12cc30..ba04cde0b54 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -35,7 +35,6 @@ $langs->load("categories");
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alphanohtml');
-$type = GETPOST('type', 'aZ09');		// Can be int or string
 $action = (GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'edit');
 $confirm = GETPOST('confirm');
 $cancel = GETPOST('cancel', 'alpha');
@@ -56,10 +55,14 @@ if ($id == "") {
 $result = restrictedArea($user, 'categorie', $id, '&category');
 
 $object = new Categorie($db);
-if ($id > 0) {
-	$result = $object->fetch($id);
+$result = $object->fetch($id, $label);
+if ($result <= 0) {
+	dol_print_error($db, $object->error); exit;
 }
 
+$type = $object->type;
+if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+
 $extrafields = new ExtraFields($db);
 $extrafields->fetch_name_optionals_label($object->table_element);
 
diff --git a/htdocs/categories/info.php b/htdocs/categories/info.php
index f64f3be8f9e..2dd0476c5cd 100644
--- a/htdocs/categories/info.php
+++ b/htdocs/categories/info.php
@@ -43,10 +43,11 @@ if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'categorie', $id, '&category');
 
 $object = new Categorie($db);
-if (!$object->fetch($id) > 0) {
-	dol_print_error($db);
-	exit;
+$result = $object->fetch($id);
+if ($result <= 0) {
+	dol_print_error($db, $object->error); exit;
 }
+
 $type = $object->type;
 if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
 
diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php
index 73c7664f6c2..d09cf595620 100644
--- a/htdocs/categories/photos.php
+++ b/htdocs/categories/photos.php
@@ -38,7 +38,6 @@ $langs->loadlangs(array('categories', 'bills'));
 
 $id      = GETPOST('id', 'int');
 $label   = GETPOST('label', 'alpha');
-$type    = GETPOST('type');
 $action  = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
 
@@ -52,7 +51,7 @@ if ($id == '' && $label == '')
 $result = restrictedArea($user, 'categorie', $id, '&category');
 
 $object = new Categorie($db);
-$result = $object->fetch($id, $label, $type);
+$result = $object->fetch($id, $label);
 if ($result <= 0) {
 	dol_print_error($db, $object->error); exit;
 }
@@ -60,10 +59,12 @@ $object->fetch_optionals();
 if ($result <= 0) {
 	dol_print_error($db, $object->error); exit;
 }
-$upload_dir = $conf->categorie->multidir_output[$object->entity];
 
+$type = $object->type;
 if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
 
+$upload_dir = $conf->categorie->multidir_output[$object->entity];
+
 /*
  * Actions
  */
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index 423819c49ac..825f52f5b80 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -39,7 +39,6 @@ $id     = GETPOST('id', 'int');
 $label  = GETPOST('label', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
-$type   = GETPOST('type', 'aZ09');
 
 if ($id == '' && $label == '')
 {
@@ -51,7 +50,7 @@ if ($id == '' && $label == '')
 $result = restrictedArea($user, 'categorie', $id, '&category');
 
 $object = new Categorie($db);
-$result = $object->fetch($id, $label, $type);
+$result = $object->fetch($id, $label);
 if ($result <= 0) {
 	dol_print_error($db, $object->error); exit;
 }
@@ -60,6 +59,7 @@ if ($result <= 0) {
 	dol_print_error($db, $object->error); exit;
 }
 
+$type = $object->type;
 if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
 
 /*
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 864de6e2e98..5503a7977be 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -38,7 +38,6 @@ $langs->load("categories");
 
 $id         = GETPOST('id', 'int');
 $label      = GETPOST('label', 'alpha');
-$type       = GETPOST('type', 'aZ09');
 $removeelem = GETPOST('removeelem', 'int');
 $elemid     = GETPOST('elemid', 'int');
 
@@ -73,7 +72,7 @@ if ($id == "" && $label == "")
 $result = restrictedArea($user, 'categorie', $id, '&category');
 
 $object = new Categorie($db);
-$result = $object->fetch($id, $label, $type);
+$result = $object->fetch($id, $label);
 if ($result <= 0) {
 	dol_print_error($db, $object->error); exit;
 }
@@ -82,10 +81,7 @@ if ($result <= 0) {
 	dol_print_error($db, $object->error); exit;
 }
 
-$objecttype = $object->type;
-if (is_numeric($objecttype)) $objecttype = Categorie::$MAP_ID_TO_CODE[$objecttype];
-if ($type === '') $type = $objecttype;
-
+$type = $object->type;
 if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
 
 $extrafields = new ExtraFields($db);
@@ -94,12 +90,6 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('categorycard', 'globalcard'));
 
-// Protection when type provided is not similare to type of category
-if ($objecttype != $type) {
-	print 'Error: Value for type parameter does not match value of the type of the category with id='.$id;
-	exit;
-}
-
 /*
  *	Actions
  */

From 49225f3f57a2196915c2942cb43b2b1b8f79edbd Mon Sep 17 00:00:00 2001
From: StephaneLesage <root@srv-dolibarr.ateis>
Date: Sat, 21 Nov 2020 15:57:11 +0100
Subject: [PATCH 448/888] Fix /categories/info.php navigation

---
 htdocs/categories/info.php         | 7 ++++---
 htdocs/categories/photos.php       | 6 ------
 htdocs/categories/traduction.php   | 4 ----
 htdocs/categories/viewcat.php      | 7 +------
 htdocs/core/lib/categories.lib.php | 2 +-
 5 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/htdocs/categories/info.php b/htdocs/categories/info.php
index 2dd0476c5cd..536b0c20a2c 100644
--- a/htdocs/categories/info.php
+++ b/htdocs/categories/info.php
@@ -37,13 +37,14 @@ $langs->loadLangs(array('categories', 'sendings'));
 
 $socid = 0;
 $id = GETPOST('id', 'int');
+$label = GETPOST('label', 'alpha');
 
 // Security check
 if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'categorie', $id, '&category');
 
 $object = new Categorie($db);
-$result = $object->fetch($id);
+$result = $object->fetch($id, $label);
 if ($result <= 0) {
 	dol_print_error($db, $object->error); exit;
 }
@@ -64,11 +65,11 @@ llxHeader('', $langs->trans('Categories'), '');
 $title = Categorie::$MAP_TYPE_TITLE_AREA[$type];
 
 $head = categories_prepare_head($object, $type);
-
 print dol_get_fiche_head($head, 'info', $langs->trans($title), -1, 'category');
+
 $backtolist = (GETPOST('backtolist') ? GETPOST('backtolist') : DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type);
 $linkback = '<a href="'.$backtolist.'">'.$langs->trans("BackToList").'</a>';
-$object->next_prev_filter = ' type = '.$type;
+$object->next_prev_filter = ' type = '.$object->type;
 $object->ref = $object->label;
 $morehtmlref = '<br><div class="refidno"><a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type.'">'.$langs->trans("Root").'</a> >> ';
 $ways = $object->print_all_ways(" &gt;&gt; ", '', 1);
diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php
index d09cf595620..6bb5d79980c 100644
--- a/htdocs/categories/photos.php
+++ b/htdocs/categories/photos.php
@@ -55,10 +55,6 @@ $result = $object->fetch($id, $label);
 if ($result <= 0) {
 	dol_print_error($db, $object->error); exit;
 }
-$object->fetch_optionals();
-if ($result <= 0) {
-	dol_print_error($db, $object->error); exit;
-}
 
 $type = $object->type;
 if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
@@ -116,8 +112,6 @@ if ($object->id)
 	$title = Categorie::$MAP_TYPE_TITLE_AREA[$type];
 
 	$head = categories_prepare_head($object, $type);
-
-
 	print dol_get_fiche_head($head, 'photos', $langs->trans($title), -1, 'category');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type.'">'.$langs->trans("BackToList").'</a>';
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index 825f52f5b80..898484d0d51 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -54,10 +54,6 @@ $result = $object->fetch($id, $label);
 if ($result <= 0) {
 	dol_print_error($db, $object->error); exit;
 }
-$object->fetch_optionals();
-if ($result <= 0) {
-	dol_print_error($db, $object->error); exit;
-}
 
 $type = $object->type;
 if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 5503a7977be..20f54a40788 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -76,10 +76,6 @@ $result = $object->fetch($id, $label);
 if ($result <= 0) {
 	dol_print_error($db, $object->error); exit;
 }
-$object->fetch_optionals();
-if ($result <= 0) {
-	dol_print_error($db, $object->error); exit;
-}
 
 $type = $object->type;
 if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
@@ -216,9 +212,8 @@ llxHeader("", $langs->trans("Categories"), $helpurl, '', 0, 0, $arrayofjs, $arra
 $title = Categorie::$MAP_TYPE_TITLE_AREA[$type];
 
 $head = categories_prepare_head($object, $type);
-
-
 print dol_get_fiche_head($head, 'card', $langs->trans($title), -1, 'category');
+
 $backtolist = (GETPOST('backtolist') ? GETPOST('backtolist') : DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type);
 $linkback = '<a href="'.$backtolist.'">'.$langs->trans("BackToList").'</a>';
 $object->next_prev_filter = ' type = '.$object->type;
diff --git a/htdocs/core/lib/categories.lib.php b/htdocs/core/lib/categories.lib.php
index e900e6ff424..f6942cb5265 100644
--- a/htdocs/core/lib/categories.lib.php
+++ b/htdocs/core/lib/categories.lib.php
@@ -57,7 +57,7 @@ function categories_prepare_head(Categorie $object, $type)
 		$h++;
 	}
 
-	$head[$h][0] = DOL_URL_ROOT.'/categories/info.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/categories/info.php?id='.$object->id.'&amp;type='.$type;
 	$head[$h][1] = $langs->trans("Info");
 	$head[$h][2] = 'info';
 	$h++;

From 7a93c11ae0e2473918397646bdccbe09ab7256cd Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 15 Dec 2020 22:01:33 +0100
Subject: [PATCH 449/888] FIX : dupliacete customer or supplier code must be
 error dipslayed with new code proposed

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

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index b8af6777daa..56793184f65 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -634,11 +634,16 @@ if (empty($reshook))
                 }
                 else
 				{
-				    if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') // TODO Sometime errors on duplicate on profid and not on code, so we must manage this case
+					if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS' || ($result==-3 && in_array('ErrorCustomerCodeAlreadyUsed', $object->errors))) // TODO Sometime errors on duplicate on profid and not on code, so we must manage this case
+					{
+						$duplicate_code_error = true;
+						$object->code_client = null;
+					}
+
+					if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS' || ($result==-3 && in_array('ErrorSupplierCodeAlreadyUsed',$object->errors))) // TODO Sometime errors on duplicate on profid and not on code, so we must manage this case
 					{
 						$duplicate_code_error = true;
 						$object->code_fournisseur = null;
-						$object->code_client = null;
 					}
 
                     setEventMessages($object->error, $object->errors, 'errors');

From b80bd8d1f8af4ced9e3c978ed41f5dbc605169b0 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 15 Dec 2020 22:03:15 +0100
Subject: [PATCH 450/888] FIX : dupliacete customer or supplier code must be
 error dipslayed with new code proposed

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

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 56793184f65..93e0196f1ae 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -634,18 +634,22 @@ if (empty($reshook))
                 }
                 else
 				{
-					if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS' || ($result==-3 && in_array('ErrorCustomerCodeAlreadyUsed', $object->errors))) // TODO Sometime errors on duplicate on profid and not on code, so we must manage this case
+					if ($result==-3 && in_array('ErrorCustomerCodeAlreadyUsed', $object->errors))
 					{
 						$duplicate_code_error = true;
 						$object->code_client = null;
 					}
 
-					if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS' || ($result==-3 && in_array('ErrorSupplierCodeAlreadyUsed',$object->errors))) // TODO Sometime errors on duplicate on profid and not on code, so we must manage this case
+					if ($result==-3 && in_array('ErrorSupplierCodeAlreadyUsed',$object->errors))
 					{
 						$duplicate_code_error = true;
 						$object->code_fournisseur = null;
 					}
 
+					if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+						$duplicate_code_error = true;
+					}
+
                     setEventMessages($object->error, $object->errors, 'errors');
                    	$error++;
                 }

From 9ca2e98a662a16bf57fb51f62729c1e6e4bca443 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 15 Dec 2020 21:12:52 +0000
Subject: [PATCH 451/888] Fixing style errors.

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

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 93e0196f1ae..d79a5c1a9e0 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -640,7 +640,7 @@ if (empty($reshook))
 						$object->code_client = null;
 					}
 
-					if ($result==-3 && in_array('ErrorSupplierCodeAlreadyUsed',$object->errors))
+					if ($result==-3 && in_array('ErrorSupplierCodeAlreadyUsed', $object->errors))
 					{
 						$duplicate_code_error = true;
 						$object->code_fournisseur = null;

From 5fe8c599d22c9c261b8cd4a5727c9bd6cf9499cb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Dec 2020 00:28:57 +0100
Subject: [PATCH 452/888] Fix warning

---
 htdocs/comm/propal/class/propal.class.php                  | 1 +
 htdocs/supplier_proposal/class/supplier_proposal.class.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 274c04b0698..f572f6110bf 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -598,6 +598,7 @@ class Propal extends CommonObject
 			$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
 
 			// Clean vat code
+			$reg = array();
 			$vat_src_code = '';
 			if (preg_match('/\((.*)\)/', $txtva, $reg))
 			{
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index cf8e712a103..022c5a13354 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -593,8 +593,8 @@ class SupplierProposal extends CommonObject
 			// Mise en option de la ligne
 			if (empty($qty) && empty($special_code)) $this->line->special_code = 3;
 
-			if (is_array($array_option) && count($array_option) > 0) {
-				$this->line->array_options = $array_option;
+			if (is_array($array_options) && count($array_options) > 0) {
+				$this->line->array_options = $array_options;
 			}
 
 			$result = $this->line->insert();

From 834058a81669ab94c965e94ddfd82adb021ecf77 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Dec 2020 02:33:21 +0100
Subject: [PATCH 453/888] Debug api to create a document

---
 htdocs/api/class/api_documents.class.php | 44 ++++++++-------
 htdocs/core/lib/files.lib.php            |  2 +-
 htdocs/core/lib/geturl.lib.php           |  2 +-
 test/phpunit/AllTests.php                |  2 +
 test/phpunit/RestAPIDocumentTest.php     | 69 +++++++++++++++++++-----
 5 files changed, 85 insertions(+), 34 deletions(-)

diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index da9545aa248..bdf86a5c2c9 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -535,13 +535,14 @@ class Documents extends DolibarrApi
 	 * Test sample for supplier invoice: { "filename": "mynewfile.txt", "modulepart": "supplier_invoice", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
 	 * Test sample for medias file: { "filename": "mynewfile.txt", "modulepart": "medias", "ref": "", "subdir": "image/mywebsite", "filecontent": "Y29udGVudCB0ZXh0Cg==", "fileencoding": "base64", "overwriteifexists": "0" }.
 	 *
-	 * @param   string  $filename           Name of file to create ('FA1705-0123.txt')
-	 * @param   string  $modulepart         Name of module or area concerned by file upload ('facture', 'project', 'project_task', ...)
-	 * @param   string  $ref                Reference of object (This will define subdir automatically and store submited file into it)
-	 * @param   string  $subdir       		Subdirectory (Only if ref not provided)
-	 * @param   string  $filecontent        File content (string with file content. An empty file will be created if this parameter is not provided)
-	 * @param   string  $fileencoding       File encoding (''=no encoding, 'base64'=Base 64)
-	 * @param   int 	$overwriteifexists  Overwrite file if exists (1 by default)
+	 * @param   string  $filename           	Name of file to create ('FA1705-0123.txt')
+	 * @param   string  $modulepart         	Name of module or area concerned by file upload ('facture', 'project', 'project_task', ...)
+	 * @param   string  $ref                	Reference of object (This will define subdir automatically and store submited file into it)
+	 * @param   string  $subdir       			Subdirectory (Only if ref not provided)
+	 * @param   string  $filecontent        	File content (string with file content. An empty file will be created if this parameter is not provided)
+	 * @param   string  $fileencoding       	File encoding (''=no encoding, 'base64'=Base 64)
+	 * @param   int 	$overwriteifexists  	Overwrite file if exists (1 by default)
+	 * @param   int 	$createdirifnotexists  	Create subdirectories if the doesn't exists (1 by default)
 	 * @return  string
 	 *
 	 * @throws RestException 400
@@ -551,7 +552,7 @@ class Documents extends DolibarrApi
 	 *
 	 * @url POST /upload
 	 */
-	public function post($filename, $modulepart, $ref = '', $subdir = '', $filecontent = '', $fileencoding = '', $overwriteifexists = 0)
+	public function post($filename, $modulepart, $ref = '', $subdir = '', $filecontent = '', $fileencoding = '', $overwriteifexists = 0, $createdirifnotexists = 1)
 	{
 		global $db, $conf;
 
@@ -578,6 +579,8 @@ class Documents extends DolibarrApi
 		// Define $uploadir
 		$object = null;
 		$entity = DolibarrApiAccess::$user->entity;
+		if (empty($entity)) $entity = 1;
+
 		if ($ref)
 		{
 			$tmpreldir = '';
@@ -663,8 +666,7 @@ class Documents extends DolibarrApi
 				}
 			}
 
-			if (!($object->id > 0))
-			{
+			if (!($object->id > 0)) {
    				throw new RestException(404, 'The object '.$modulepart." with ref '".$ref."' was not found.");
 			}
 
@@ -681,29 +683,32 @@ class Documents extends DolibarrApi
 
 			if (empty($upload_dir) || $upload_dir == '/')
 			{
-				throw new RestException(500, 'This value of modulepart does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.');
+				throw new RestException(500, 'This value of modulepart ('.$modulepart.') does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.');
 			}
 		} else {
 			if ($modulepart == 'invoice') $modulepart = 'facture';
 			if ($modulepart == 'member') $modulepart = 'adherent';
 
 			$relativefile = $subdir;
-
 			$tmp = dol_check_secure_access_document($modulepart, $relativefile, $entity, DolibarrApiAccess::$user, '', 'write');
 			$upload_dir = $tmp['original_file']; // No dirname here, tmp['original_file'] is already the dir because dol_check_secure_access_document was called with param original_file that is only the dir
 
-			if (empty($upload_dir) || $upload_dir == '/')
-			{
-				throw new RestException(500, 'This value of modulepart does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.');
+			if (empty($upload_dir) || $upload_dir == '/') {
+				if (!empty($tmp['error'])) {
+					throw new RestException(401, 'Error returned by dol_check_secure_access_document: '.$tmp['error']);
+				} else {
+					throw new RestException(500, 'This value of modulepart ('.$modulepart.') is not allowed with this value of subdir ('.$relativefile.')');
+				}
 			}
 		}
 		// $original_file here is still value of filename without any dir.
 
 		$upload_dir = dol_sanitizePathName($upload_dir);
 
-		if (dol_mkdir($upload_dir) < 0) // needed by products
-		{
-			throw new RestException(500, 'Error while trying to create directory.');
+		if (!empty($createdirifnotexists)) {
+			if (dol_mkdir($upload_dir) < 0) { // needed by products
+				throw new RestException(500, 'Error while trying to create directory.');
+			}
 		}
 
 		$destfile = $upload_dir.'/'.$original_file;
@@ -715,8 +720,7 @@ class Documents extends DolibarrApi
 			throw new RestException(401, 'Directory not exists : '.dirname($destfile));
 		}
 
-		if (!$overwriteifexists && dol_is_file($destfile))
-		{
+		if (!$overwriteifexists && dol_is_file($destfile)) {
 			throw new RestException(500, "File with name '".$original_file."' already exists.");
 		}
 
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 0be1cfbc3bc..22545b78cf8 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2231,7 +2231,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	// Fix modulepart
 	if ($modulepart == 'users') $modulepart = 'user';
 
-	dol_syslog('modulepart='.$modulepart.' original_file='.$original_file.' entity='.$entity);
+	dol_syslog('dol_check_secure_access_document modulepart='.$modulepart.' original_file='.$original_file.' entity='.$entity);
 
 	// We define $accessallowed and $sqlprotectagainstexternals
 	$accessallowed = 0;
diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index 8cfc08222cd..7e93623f3c1 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -33,7 +33,7 @@
  * @param	string[]  $addheaders			Array of string to add into header. Example: ('Accept: application/xrds+xml', ....)
  * @param	string[]  $allowedschemes		List of schemes that are allowed ('http' + 'https' only by default)
  * @param	int		  $localurl				0=Only external URL are possible, 1=Only local URL, 2=Both external and local URL are allowed.
- * @return	array						    Returns an associative array containing the response from the server array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
+ * @return	array						    Returns an associative array containing the response from the server array('content'=>response, 'curl_error_no'=>errno, 'curl_error_msg'=>errmsg...)
  */
 function getURLContent($url, $postorget = 'GET', $param = '', $followlocation = 1, $addheaders = array(), $allowedschemes = array('http', 'https'), $localurl = 0)
 {
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index 163bf320075..ce7f1074721 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -216,6 +216,8 @@ class AllTests
 
         require_once dirname(__FILE__).'/RestAPIUserTest.php';
         $suite->addTestSuite('RestAPIUserTest');
+        require_once dirname(__FILE__).'/RestAPIDocumentTest.php';
+        $suite->addTestSuite('RestAPIDocumentTest');
 
         // Test only with php7.2 or less
         //if ((float) phpversion() < 7.3)
diff --git a/test/phpunit/RestAPIDocumentTest.php b/test/phpunit/RestAPIDocumentTest.php
index 8dbaafab018..f45e0437ce5 100644
--- a/test/phpunit/RestAPIDocumentTest.php
+++ b/test/phpunit/RestAPIDocumentTest.php
@@ -152,35 +152,43 @@ class RestAPIDocumentTest extends PHPUnit\Framework\TestCase
     {
         global $conf,$user,$langs,$db;
 
-        $url = $this->api_url.'/documents/?api_key='.$this->api_key;
+        $url = $this->api_url.'/documents/upload?api_key='.$this->api_key;
 
         echo __METHOD__.' Request POST url='.$url."\n";
 
 
         // Send to non existent directory
 
-        dol_delete_dir_recursive(DOL_DATA_ROOT.'/medias/tmpphpunit');
+        dol_delete_dir_recursive(DOL_DATA_ROOT.'/medias/tmpphpunit/tmpphpunit1');
 
         //$data = '{ "filename": "mynewfile.txt", "modulepart": "medias", "ref": "", "subdir": "mysubdir1/mysubdir2", "filecontent": "content text", "fileencoding": "" }';
         $data = array(
             'filename'=>"mynewfile.txt",
             'modulepart'=>"medias",
-            'ref'=>"",
-            'subdir'=>"tmpphpunit/tmpphpunit2",
+            'subdir'=>"tmpphpunit/tmpphpunit1",
             'filecontent'=>"content text",
-            'fileencoding'=>""
+            'fileencoding'=>"",
+        	'overwriteifexists'=>0,
+        	'createdirifnotexists'=>0
         );
 
-        $result = getURLContent($url, 'POST', $data, 1, array(), array('http', 'https'), 2);
+        $param = '';
+        foreach($data as $key => $val) {
+        	$param .= '&'.$key.'='.urlencode($val);
+        }
+
+        $result = getURLContent($url, 'POST', $param, 1, array(), array('http', 'https'), 2);
         echo __METHOD__.' Result for sending document: '.var_export($result, true)."\n";
         echo __METHOD__.' curl_error_no: '.$result['curl_error_no']."\n";
         $object = json_decode($result['content'], true);
-        $this->assertNotNull($object, 'Parsing of json result must no be null');
-        $this->assertEquals('401', $object['error']['code']);
+        $this->assertNotNull($object, 'Parsing of json result must not be null');
+        $this->assertEquals('401', $result['http_code'], 'Return code is not 401');
+        $this->assertEquals('401', empty($object['error']['code']) ? '' : $object['error']['code'], 'Error code is not 401');
 
 
         // Send to existent directory
 
+        dol_delete_dir_recursive(DOL_DATA_ROOT.'/medias/tmpphpunit/tmpphpunit2');
         dol_mkdir(DOL_DATA_ROOT.'/medias/tmpphpunit/tmpphpunit2');
 
         $data = array(
@@ -189,16 +197,53 @@ class RestAPIDocumentTest extends PHPUnit\Framework\TestCase
             'ref'=>"",
             'subdir'=>"tmpphpunit/tmpphpunit2",
             'filecontent'=>"content text",
-            'fileencoding'=>""
+            'fileencoding'=>"",
+        	'overwriteifexists'=>0,
+        	'createdirifnotexists'=>0
         );
 
-        $result2 = getURLContent($url, 'POST', $data, 1, array(), array('http', 'https'), 2);
+        $param = '';
+        foreach($data as $key => $val) {
+        	$param .= '&'.$key.'='.urlencode($val);
+        }
+
+        $result2 = getURLContent($url, 'POST', $param, 1, array(), array('http', 'https'), 2);
         echo __METHOD__.' Result for sending document: '.var_export($result2, true)."\n";
         echo __METHOD__.' curl_error_no: '.$result2['curl_error_no']."\n";
         $object2 = json_decode($result2['content'], true);
-        $this->assertNotNull($object2, 'Parsing of json result must no be null');
+        //$this->assertNotNull($object2, 'Parsing of json result must not be null');
+        $this->assertEquals('200', $result2['http_code'], 'Return code must be 200');
         $this->assertEquals($result2['curl_error_no'], '');
-        $this->assertEquals($result2['content'], 'true');
+        $this->assertEquals($object2, 'mynewfile.txt', 'Must contains basename of file');
+
+
+        dol_delete_dir_recursive(DOL_DATA_ROOT.'/medias/tmpphpunit/tmpphpunit3');
+
+        $data = array(
+        	'filename'=>"mynewfile.txt",
+        	'modulepart'=>"medias",
+        	'ref'=>"",
+        	'subdir'=>"tmpphpunit/tmpphpunit3",
+        	'filecontent'=>"content text",
+        	'fileencoding'=>"",
+        	'overwriteifexists'=>0,
+        	'createdirifnotexists'=>1
+        );
+
+        $param = '';
+        foreach($data as $key => $val) {
+        	$param .= '&'.$key.'='.urlencode($val);
+        }
+
+        $result3 = getURLContent($url, 'POST', $param, 1, array(), array('http', 'https'), 2);
+        echo __METHOD__.' Result for sending document: '.var_export($result3, true)."\n";
+        echo __METHOD__.' curl_error_no: '.$result3['curl_error_no']."\n";
+        $object3 = json_decode($result3['content'], true);
+        //$this->assertNotNull($object2, 'Parsing of json result must not be null');
+        $this->assertEquals('200', $result3['http_code'], 'Return code must be 200');
+        $this->assertEquals($result3['curl_error_no'], '');
+        $this->assertEquals($object3, 'mynewfile.txt', 'Must contains basename of file');
+
 
         dol_delete_dir_recursive(DOL_DATA_ROOT.'/medias/tmpphpunit');
     }

From 69061e422bab02386d0c6bf02f01befe3cb3f87b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Dec 2020 02:44:48 +0100
Subject: [PATCH 454/888] Removed warning

---
 htdocs/commande/class/commande.class.php | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 9ea05a13065..00cba2055f7 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -492,26 +492,21 @@ class Commande extends CommonOrder
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// If stock is incremented on validate order, we must increment it
-			if ($result >= 0 && !empty($conf->stock->enabled) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
-			{
+			if ($result >= 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1) {
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 				$langs->load("agenda");
 
 				// Loop on each line
 				$cpt = count($this->lines);
-				for ($i = 0; $i < $cpt; $i++)
-				{
-					if ($this->lines[$i]->fk_product > 0)
-					{
+				for ($i = 0; $i < $cpt; $i++) {
+					if ($this->lines[$i]->fk_product > 0) {
 						$mouvP = new MouvementStock($this->db);
 						$mouvP->origin = &$this;
 						// We decrement stock of product (and sub-products)
 						$result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("OrderValidatedInDolibarr", $num));
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							$error++;
 							$this->error = $mouvP->error;
 						}
@@ -521,16 +516,14 @@ class Commande extends CommonOrder
 			}
 		}
 
-		if (!$error && !$notrigger)
-		{
+		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('ORDER_VALIDATE', $user);
 			if ($result < 0) $error++;
 			// End call triggers
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->oldref = $this->ref;
 
 			// Rename directory if dir was a temporary ref

From a03de433be4e962a7af509d945781e26cf572e0c Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 16 Dec 2020 05:03:37 +0100
Subject: [PATCH 455/888] FIX: Accountancy - Quadra export format - Manage
 negative amount

---
 .../class/accountancyexport.class.php         | 56 +++++++++++--------
 1 file changed, 33 insertions(+), 23 deletions(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index f15a2a0c704..899eddc0e56 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -505,9 +505,9 @@ class AccountancyExport
 
 		$end_line = "\r\n";
 
-		//We should use dol_now function not time however this is wrong date to transfert in accounting
-		//$date_ecriture = dol_print_date(dol_now(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
-		//$date_ecriture = dol_print_date(time(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
+		// We should use dol_now function not time however this is wrong date to transfert in accounting
+		// $date_ecriture = dol_print_date(dol_now(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
+		// $date_ecriture = dol_print_date(time(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
 		foreach ($TData as $data) {
 			$code_compta = $data->numero_compte;
 			if (!empty($data->subledger_account))
@@ -519,36 +519,46 @@ class AccountancyExport
 			$Tab['code_journal'] = str_pad(self::trunc($data->code_journal, 2), 2);
 			$Tab['folio'] = '000';
 
-			//We use invoice date $data->doc_date not $date_ecriture which is the transfert date
-			//maybe we should set an option for customer who prefer to keep in accounting software the tranfert date instead of invoice date ?
+			// We use invoice date $data->doc_date not $date_ecriture which is the transfert date
+			// maybe we should set an option for customer who prefer to keep in accounting software the tranfert date instead of invoice date ?
 			//$Tab['date_ecriture'] = $date_ecriture;
 			$Tab['date_ecriture'] = dol_print_date($data->doc_date, '%d%m%y');
 			$Tab['filler'] = ' ';
 			$Tab['libelle_ecriture'] = str_pad(self::trunc(dol_string_unaccent($data->doc_ref).' '.dol_string_unaccent($data->label_operation), 20), 20);
-			$Tab['sens'] = $data->sens; // C or D
-			$Tab['signe_montant'] = '+';
 
-			//elarifr le montant doit etre en centimes sans point decimal !
-			$Tab['montant'] = str_pad(abs($data->montant * 100), 12, '0', STR_PAD_LEFT); // TODO manage negative amount
-			// $Tab['montant'] = str_pad(abs($data->montant), 12, '0', STR_PAD_LEFT); // TODO manage negative amount
+			// Credit invoice - invert sens
+            if ($data->montant < 0) {
+                if ($data->sens == 'C') {
+                    $Tab['sens'] = 'D';
+                } else {
+                    $Tab['sens'] = 'C';
+                }
+                $Tab['signe_montant'] = '-';
+            } else {
+                $Tab['sens'] = $data->sens; // C or D
+                $Tab['signe_montant'] = '+';
+            }
+
+			// The amount must be in centimes without decimal points.
+			$Tab['montant'] = str_pad(abs($data->montant * 100), 12, '0', STR_PAD_LEFT);
 			$Tab['contrepartie'] = str_repeat(' ', 8);
 
-			// elarifr:  date format must be fixed format : 6 char ddmmyy = %d%m%yand not defined by user / dolibarr setting
+			// Force date format : %d%m%y
 			if (!empty($data->date_echeance)) {
 				//$Tab['date_echeance'] = dol_print_date($data->date_echeance, $conf->global->ACCOUNTING_EXPORT_DATE);
-				$Tab['date_echeance'] = dol_print_date($data->date_echeance, '%d%m%y'); // elarifr:  format must be ddmmyy
+				$Tab['date_echeance'] = dol_print_date($data->date_echeance, '%d%m%y'); // Format must be ddmmyy
 			} else {
 				$Tab['date_echeance'] = '000000';
 			}
 
-			//elarifr please keep quadra named field lettrage(2) + codestat(3) instead of fake lettrage(5)
-			//$Tab['lettrage'] = str_repeat(' ', 5);
+			// Please keep quadra named field lettrage(2) + codestat(3) instead of fake lettrage(5)
+			// $Tab['lettrage'] = str_repeat(' ', 5);
 			$Tab['lettrage'] = str_repeat(' ', 2);
 			$Tab['codestat'] = str_repeat(' ', 3);
 			$Tab['num_piece'] = str_pad(self::trunc($data->piece_num, 5), 5);
 
-			//elarifr keep correct quadra named field instead of anon filler
-			//$Tab['filler2'] = str_repeat(' ', 20);
+			// Keep correct quadra named field instead of anon filler
+			// $Tab['filler2'] = str_repeat(' ', 20);
 			$Tab['affaire'] = str_repeat(' ', 10);
 			$Tab['quantity1'] = str_repeat(' ', 10);
 			$Tab['num_piece2'] = str_pad(self::trunc($data->piece_num, 8), 8);
@@ -556,17 +566,17 @@ class AccountancyExport
 			$Tab['code_journal2'] = str_pad(self::trunc($data->code_journal, 3), 3);
 			$Tab['filler3'] = str_repeat(' ', 3);
 
-			//elarifr keep correct quadra named field instead of anon filler libelle_ecriture2 is 30 char not 32 !!!!
-			//as we use utf8, we must remove accent to have only one ascii char instead of utf8 2 chars for specials that report wrong line size that will exceed import format spec
-			//todo we should filter more than only accent to avoid wrong line size
-			//TODO: remove invoice number doc_ref in libelle,
-			//TODO: we should offer an option for customer to build the libelle using invoice number / name / date in accounting software
+			// Keep correct quadra named field instead of anon filler libelle_ecriture2 is 30 char not 32 !!!!
+			// as we use utf8, we must remove accent to have only one ascii char instead of utf8 2 chars for specials that report wrong line size that will exceed import format spec
+			// TODO: we should filter more than only accent to avoid wrong line size
+			// TODO: remove invoice number doc_ref in libelle,
+			// TODO: we should offer an option for customer to build the libelle using invoice number / name / date in accounting software
 			//$Tab['libelle_ecriture2'] = str_pad(self::trunc(dol_string_unaccent($data->doc_ref) . ' ' . dol_string_unaccent($data->label_operation), 30), 30);
 			$Tab['libelle_ecriture2'] = str_pad(self::trunc(dol_string_unaccent($data->label_operation), 30), 30);
 			$Tab['codetva'] = str_repeat(' ', 2);
 
-			//elarifr we need to keep the 10 lastest number of invoice doc_ref not the beginning part that is the unusefull almost same part
-			//$Tab['num_piece3'] = str_pad(self::trunc($data->piece_num, 10), 10);
+			// We need to keep the 10 lastest number of invoice doc_ref not the beginning part that is the unusefull almost same part
+			// $Tab['num_piece3'] = str_pad(self::trunc($data->piece_num, 10), 10);
 			$Tab['num_piece3'] = substr(self::trunc($data->doc_ref, 20), -10);
 			$Tab['filler4'] = str_repeat(' ', 73);
 

From ca40d5e52ada5507534c91a107374b5c0219a42b Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 16 Dec 2020 05:16:08 +0100
Subject: [PATCH 456/888] NEW: Accountancy - Introduce FEC "2" Format to
 resolve conflict with some software

---
 .../class/accountancyexport.class.php         | 109 ++++++++++++++++++
 htdocs/langs/en_US/accountancy.lang           |   1 +
 2 files changed, 110 insertions(+)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index f15a2a0c704..b9c4cc9c8ff 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -60,6 +60,7 @@ class AccountancyExport
 	public static $EXPORT_TYPE_GESTINUMV3 = 130;
 	public static $EXPORT_TYPE_GESTINUMV5 = 135;
 	public static $EXPORT_TYPE_FEC = 1000;
+	public static $EXPORT_TYPE_FEC2 = 1010;
 
 
 	/**
@@ -121,6 +122,7 @@ class AccountancyExport
 			self::$EXPORT_TYPE_GESTINUMV3 => $langs->trans('Modelcsv_Gestinum_v3'),
 			self::$EXPORT_TYPE_GESTINUMV5 => $langs->trans('Modelcsv_Gestinum_v5'),
 			self::$EXPORT_TYPE_FEC => $langs->trans('Modelcsv_FEC'),
+			self::$EXPORT_TYPE_FEC2 => $langs->trans('Modelcsv_FEC2'),
 		);
 
 		ksort($listofexporttypes, SORT_NUMERIC);
@@ -155,6 +157,7 @@ class AccountancyExport
 			self::$EXPORT_TYPE_GESTINUMV3 => 'gestinumv3',
 			self::$EXPORT_TYPE_GESTINUMV5 => 'gestinumv5',
 			self::$EXPORT_TYPE_FEC => 'fec',
+			self::$EXPORT_TYPE_FEC2 => 'fec2',
 		);
 
 		return $formatcode[$type];
@@ -234,6 +237,10 @@ class AccountancyExport
 					'label' => $langs->trans('Modelcsv_FEC'),
 					'ACCOUNTING_EXPORT_FORMAT' => 'txt',
 				),
+				self::$EXPORT_TYPE_FEC2 => array(
+					'label' => $langs->trans('Modelcsv_FEC2'),
+					'ACCOUNTING_EXPORT_FORMAT' => 'txt',
+				),
 			),
 			'cr'=> array(
 				'1' => $langs->trans("Unix"),
@@ -322,6 +329,9 @@ class AccountancyExport
 			case self::$EXPORT_TYPE_FEC :
 				$this->exportFEC($TData);
 				break;
+			case self::$EXPORT_TYPE_FEC2 :
+				$this->exportFEC2($TData);
+				break;
 			default:
 				$this->errors[] = $langs->trans('accountancy_error_modelnotfound');
 				break;
@@ -891,6 +901,105 @@ class AccountancyExport
 		}
 	}
 
+	/**
+	 * Export format : FEC2
+	 *
+	 * @param array $objectLines data
+	 * @return void
+	 */
+	public function exportFEC2($objectLines)
+	{
+		$separator = "\t";
+		$end_line = "\r\n";
+
+		print "JournalCode".$separator;
+		print "JournalLib".$separator;
+		print "EcritureNum".$separator;
+		print "EcritureDate".$separator;
+		print "CompteNum".$separator;
+		print "CompteLib".$separator;
+		print "CompAuxNum".$separator;
+		print "CompAuxLib".$separator;
+		print "PieceRef".$separator;
+		print "PieceDate".$separator;
+		print "EcritureLib".$separator;
+		print "Debit".$separator;
+		print "Credit".$separator;
+		print "EcritureLet".$separator;
+		print "DateLet".$separator;
+		print "ValidDate".$separator;
+		print "Montantdevise".$separator;
+		print "Idevise";
+		print $end_line;
+
+		foreach ($objectLines as $line) {
+			if ($line->debit == 0 && $line->credit == 0) {
+				unset($array[$line]);
+			} else {
+				$date_creation = dol_print_date($line->date_creation, '%Y%m%d');
+				$date_document = dol_print_date($line->doc_date, '%Y%m%d');
+				$date_lettering = dol_print_date($line->date_lettering, '%Y%m%d');
+				$date_validation = dol_print_date($line->date_validated, '%Y%m%d');
+
+				// FEC:JournalCode
+				print $line->code_journal . $separator;
+
+				// FEC:JournalLib
+				print $line->journal_label . $separator;
+
+				// FEC:EcritureNum
+				print $line->piece_num . $separator;
+
+				// FEC:EcritureDate
+				print $date_creation . $separator;
+
+				// FEC:CompteNum
+				print $line->numero_compte . $separator;
+
+				// FEC:CompteLib
+				print dol_string_unaccent($line->label_compte) . $separator;
+
+				// FEC:CompAuxNum
+				print $line->subledger_account . $separator;
+
+				// FEC:CompAuxLib
+				print dol_string_unaccent($line->subledger_label) . $separator;
+
+				// FEC:PieceRef
+				print $line->doc_ref . $separator;
+
+				// FEC:PieceDate
+				print $date_document . $separator;
+
+				// FEC:EcritureLib
+				print dol_string_unaccent($line->label_operation) . $separator;
+
+				// FEC:Debit
+				print price2fec($line->debit) . $separator;
+
+				// FEC:Credit
+				print price2fec($line->credit) . $separator;
+
+				// FEC:EcritureLet
+				print $line->lettering_code . $separator;
+
+				// FEC:DateLet
+				print $date_lettering . $separator;
+
+				// FEC:ValidDate
+				print $date_validation . $separator;
+
+				// FEC:Montantdevise
+				print $line->multicurrency_amount . $separator;
+
+				// FEC:Idevise
+				print $line->multicurrency_code;
+
+				print $end_line;
+			}
+		}
+	}
+
 	/**
 	 * Export format : SAGE50SWISS
 	 *
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 2a53a171962..83d20f59581 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -340,6 +340,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)

From b01a9d6cc307911886869ba8a4aeffee205d4b48 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 16 Dec 2020 05:32:36 +0100
Subject: [PATCH 457/888] FIX: Accountancy - Reconciled options not working on
 ledger et subaccount ledger

---
 .../accountancy/bookkeeping/listbyaccount.php | 26 +++++++++++++----
 .../bookkeeping/listbysubaccount.php          | 28 ++++++++++++++-----
 .../accountancy/class/bookkeeping.class.php   |  4 +++
 3 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 7b8467f60bd..52bedeb73f2 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -543,8 +543,15 @@ while ($i < min($num, $limit))
 
 	// Is it a break ?
 	if ($accountg != $displayed_account_number || !isset($displayed_account_number)) {
-		$colspan = $totalarray['nbfield'] - 3;
-		$colspanend = $totalarray['nbfield'] - 7;
+        if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
+            $colnumber = 3;
+            $colnumberend = 7;
+        } else {
+            $colnumber = 4;
+            $colnumberend = 7;
+        }
+        $colspan = $totalarray['nbfield'] - $colnumber;
+        $colspanend = $totalarray['nbfield'] - $colnumberend;
 		// Show a subtotal by accounting account
 		if (isset($displayed_account_number)) {
 			print '<tr class="liste_total">';
@@ -665,11 +672,11 @@ while ($i < min($num, $limit))
 			// Other type
 		}
 
-		print '<td class="nowrap">';
+		print '<td class="maxwidth400">';
 
 		print '<table class="nobordernopadding"><tr class="nocellnopadd">';
 		// Picto + Ref
-		print '<td class="nobordernopadding nowrap">';
+		print '<td class="nobordernopadding">';
 
 		if ($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice' || $line->doc_type == 'expense_report')
 		{
@@ -744,8 +751,15 @@ while ($i < min($num, $limit))
 }
 
 // Show sub-total of last shown account
-$colspan = $totalarray['nbfield'] - 3;
-$colspanend = $totalarray['nbfield'] - 8;
+if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
+    $colnumber = 3;
+    $colnumberend = 7;
+} else {
+    $colnumber = 4;
+    $colnumberend = 7;
+}
+$colspan = $totalarray['nbfield'] - $colnumber;
+$colspanend = $totalarray['nbfield'] - $colnumberend;
 print '<tr class="liste_total">';
 print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.$accountg.':</td>';
 print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
diff --git a/htdocs/accountancy/bookkeeping/listbysubaccount.php b/htdocs/accountancy/bookkeeping/listbysubaccount.php
index 48c449df43e..2bdf5e11d09 100644
--- a/htdocs/accountancy/bookkeeping/listbysubaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbysubaccount.php
@@ -410,7 +410,7 @@ if (empty($reshook)) {
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
 if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 
-print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit);
+print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 print info_admin($langs->trans("WarningRecordWithoutSubledgerAreExcluded"));
 
@@ -546,8 +546,15 @@ while ($i < min($num, $limit))
 
 	// Is it a break ?
 	if ($accountg != $displayed_account_number || !isset($displayed_account_number)) {
-		$colspan = $totalarray['nbfield'] - 3;
-		$colspanend = $totalarray['nbfield'] - 7;
+        if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
+            $colnumber = 3;
+            $colnumberend = 7;
+        } else {
+            $colnumber = 4;
+            $colnumberend = 7;
+        }
+        $colspan = $totalarray['nbfield'] - $colnumber;
+        $colspanend = $totalarray['nbfield'] - $colnumberend;
 		// Show a subtotal by accounting account
 		if (isset($displayed_account_number)) {
 			print '<tr class="liste_total">';
@@ -676,11 +683,11 @@ while ($i < min($num, $limit))
 			// Other type
 		}
 
-		print '<td class="nowrap">';
+		print '<td class="maxwidth400">';
 
 		print '<table class="nobordernopadding"><tr class="nocellnopadd">';
 		// Picto + Ref
-		print '<td class="nobordernopadding nowrap">';
+		print '<td class="nobordernopadding">';
 
 		if ($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice' || $line->doc_type == 'expense_report')
 		{
@@ -755,8 +762,15 @@ while ($i < min($num, $limit))
 }
 
 // Show sub-total of last shown account
-$colspan = $totalarray['nbfield'] - 3;
-$colspanend = $totalarray['nbfield'] - 8;
+if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
+    $colnumber = 3;
+    $colnumberend = 7;
+} else {
+    $colnumber = 4;
+    $colnumberend = 7;
+}
+$colspan = $totalarray['nbfield'] - $colnumber;
+$colspanend = $totalarray['nbfield'] - $colnumberend;
 print '<tr class="liste_total">';
 print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.$accountg.':</td>';
 print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 8312b155b8b..72428762459 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -825,6 +825,10 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.credit' || $key == 't.debit') {
 					$sqlwhere[] = natural_search($key, $value, 1, 1);
+                } elseif ($key == 't.reconciled_option') {
+                    $sqlwhere[] = 't.lettering_code IS NULL';
+                } elseif ($key == 't.code_journal' && !empty($value)) {
+                    $sqlwhere[] = natural_search("t.code_journal", join(',', $value), 3, 1);
 				} else {
 					$sqlwhere[] = natural_search($key, $value, 0, 1);
 				}

From c5ee976c7ea63ec1c7ea7b430fba788187eac600 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 16 Dec 2020 06:38:17 +0100
Subject: [PATCH 458/888] NEW: Accountancy - In ledger & journals, show link on
 bank transaction

---
 htdocs/accountancy/bookkeeping/list.php             | 9 +++++++++
 htdocs/accountancy/bookkeeping/listbyaccount.php    | 9 +++++++++
 htdocs/accountancy/bookkeeping/listbysubaccount.php | 9 +++++++++
 3 files changed, 27 insertions(+)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index b3cec7710a4..ebd768de1dc 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -937,6 +937,11 @@ while ($i < min($num, $limit))
 			$filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
 			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
 			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
+		} elseif ($line->doc_type == 'bank')
+		{
+			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+			$objectstatic = new AccountLine($db);
+			$objectstatic->fetch($line->fk_doc);
 		} else {
 			// Other type
 		}
@@ -951,6 +956,10 @@ while ($i < min($num, $limit))
 		{
 			print $objectstatic->getNomUrl(1, '', 0, 0, '', 0, -1, 1);
 			print $documentlink;
+		} elseif ($line->doc_type == 'bank') {
+			print $objectstatic->getNomUrl(1);
+			$bank_ref = strstr($line->doc_ref, '-');
+			print " " . $bank_ref;
 		} else {
 			print $line->doc_ref;
 		}
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 7b8467f60bd..21ae4d9a22f 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -661,6 +661,11 @@ while ($i < min($num, $limit))
 			$filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
 			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
 			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
+		} elseif ($line->doc_type == 'bank')
+		{
+			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+			$objectstatic = new AccountLine($db);
+			$objectstatic->fetch($line->fk_doc);
 		} else {
 			// Other type
 		}
@@ -675,6 +680,10 @@ while ($i < min($num, $limit))
 		{
 			print $objectstatic->getNomUrl(1, '', 0, 0, '', 0, -1, 1);
 			print $documentlink;
+		} elseif ($line->doc_type == 'bank') {
+			print $objectstatic->getNomUrl(1);
+			$bank_ref = strstr($line->doc_ref, '-');
+			print " " . $bank_ref;
 		} else {
 			print $line->doc_ref;
 		}
diff --git a/htdocs/accountancy/bookkeeping/listbysubaccount.php b/htdocs/accountancy/bookkeeping/listbysubaccount.php
index 48c449df43e..535f1e94937 100644
--- a/htdocs/accountancy/bookkeeping/listbysubaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbysubaccount.php
@@ -672,6 +672,11 @@ while ($i < min($num, $limit))
 			$filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
 			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
 			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
+		} elseif ($line->doc_type == 'bank')
+		{
+			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+			$objectstatic = new AccountLine($db);
+			$objectstatic->fetch($line->fk_doc);
 		} else {
 			// Other type
 		}
@@ -686,6 +691,10 @@ while ($i < min($num, $limit))
 		{
 			print $objectstatic->getNomUrl(1, '', 0, 0, '', 0, -1, 1);
 			print $documentlink;
+		} elseif ($line->doc_type == 'bank') {
+			print $objectstatic->getNomUrl(1);
+			$bank_ref = strstr($line->doc_ref, '-');
+			print " " . $bank_ref;
 		} else {
 			print $line->doc_ref;
 		}

From 02a15e03f7f3501bc3cc48786b95f8874a86ddf3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Dec 2020 10:37:34 +0100
Subject: [PATCH 459/888] Fix phpunit

---
 test/phpunit/RestAPIDocumentTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/phpunit/RestAPIDocumentTest.php b/test/phpunit/RestAPIDocumentTest.php
index f45e0437ce5..e38f1fbae12 100644
--- a/test/phpunit/RestAPIDocumentTest.php
+++ b/test/phpunit/RestAPIDocumentTest.php
@@ -173,7 +173,7 @@ class RestAPIDocumentTest extends PHPUnit\Framework\TestCase
         );
 
         $param = '';
-        foreach($data as $key => $val) {
+        foreach ($data as $key => $val) {
         	$param .= '&'.$key.'='.urlencode($val);
         }
 
@@ -203,7 +203,7 @@ class RestAPIDocumentTest extends PHPUnit\Framework\TestCase
         );
 
         $param = '';
-        foreach($data as $key => $val) {
+        foreach ($data as $key => $val) {
         	$param .= '&'.$key.'='.urlencode($val);
         }
 
@@ -231,7 +231,7 @@ class RestAPIDocumentTest extends PHPUnit\Framework\TestCase
         );
 
         $param = '';
-        foreach($data as $key => $val) {
+        foreach ($data as $key => $val) {
         	$param .= '&'.$key.'='.urlencode($val);
         }
 

From 1b69b1c2fed2a347794a3ae0781dfead7cbb2ffa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Dec 2020 10:39:10 +0100
Subject: [PATCH 460/888] Fix phpcs

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

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 00cba2055f7..4ededdeacaf 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -624,7 +624,7 @@ class Commande extends CommonOrder
 			}
 
 			// If stock is decremented on validate order, we must reincrement it
-			if (!empty($conf->stock->enabled) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
+			if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
 			{
 				$result = 0;
 
@@ -810,7 +810,7 @@ class Commande extends CommonOrder
 		if ($this->db->query($sql))
 		{
 			// If stock is decremented on validate order, we must reincrement it
-			if (!empty($conf->stock->enabled) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
+			if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
 			{
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 				$langs->load("agenda");

From cb2c1f3ecef1537f40617b4c2796b2a5a7c5f923 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Wed, 16 Dec 2020 10:54:32 +0100
Subject: [PATCH 461/888] FIX Facture Situation Out : status condition

---
 htdocs/compta/facture/card.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index fb5f7a6ac98..aa07de4867e 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2534,7 +2534,7 @@ if (empty($reshook))
 	{
 	    $object->fetch($id, '', '', '', true);
 
-	    if ($object->statut == Facture::STATUS_VALIDATED
+	    if (in_array($object->statut, array(Facture::STATUS_CLOSED, Facture::STATUS_VALIDATED))
 	        && $object->type == Facture::TYPE_SITUATION
 	        && $usercancreate
 	        && !$objectidnext
@@ -3872,7 +3872,7 @@ elseif ($id > 0 || !empty($ref))
 	    $label = $langs->trans("ConfirmOuting");
 	    $formquestion = array();
 	    // remove situation from cycle
-	    if ($object->statut == Facture::STATUS_VALIDATED
+	    if (in_array($object->statut, array(Facture::STATUS_CLOSED, Facture::STATUS_VALIDATED))
 	        && $usercancreate
 	        && !$objectidnext
 	        && $object->is_last_in_cycle()
@@ -5387,7 +5387,7 @@ elseif ($id > 0 || !empty($ref))
 			}
 
 			// Remove situation from cycle
-			if ($object->statut > Facture::STATUS_DRAFT
+			if (in_array($object->statut, array(Facture::STATUS_CLOSED, Facture::STATUS_VALIDATED))
 			    && $object->type == Facture::TYPE_SITUATION
 			    && $usercancreate
 			    && !$objectidnext

From bf01ad8790237fb28c39c12e6798b3c3567eaeb7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Dec 2020 10:55:33 +0100
Subject: [PATCH 462/888] Fix warning

---
 htdocs/compta/facture/class/facture.class.php    |  6 +++---
 htdocs/fourn/class/fournisseur.facture.class.php | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 5f7bf4fcf77..ec55810e2da 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -868,7 +868,7 @@ class Facture extends CommonInvoice
 							$line->situation_percent,
 							$line->fk_prev_id,
 							$line->fk_unit,
-							$line->pu_ht_devise,
+							$line->multicurrency_subprice,
 							$line->ref_ext
 						);
 						if ($result < 0)
@@ -968,7 +968,7 @@ class Facture extends CommonInvoice
 						$_facrec->lines[$i]->situation_percent,
 						'',
 						$_facrec->lines[$i]->fk_unit,
-						$_facrec->lines[$i]->pu_ht_devise
+						$_facrec->lines[$i]->multicurrency_subprice
 					);
 
 					if ($result_insert < 0)
@@ -2971,7 +2971,7 @@ class Facture extends CommonInvoice
 	 *  @param      int         $situation_percent  Situation advance percentage
 	 *  @param      int         $fk_prev_id         Previous situation line id reference
 	 *  @param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
-	 *  @param		double		$pu_ht_devise		Unit price in currency
+	 *  @param		double		$pu_ht_devise		Unit price in foreign currency
 	 *  @param		string		$ref_ext		    External reference of the line
 	 *  @return    	int             				<0 if KO, Id of line if OK
 	 */
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index e3b65d8a8de..43075ba6760 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -398,7 +398,7 @@ class FactureFournisseur extends CommonInvoice
 		$sql .= ", '".$this->db->escape($this->ref_supplier)."'";
 		$sql .= ", ".$conf->entity;
 		$sql .= ", '".$this->db->escape($this->type)."'";
-		$sql .= ", '".$this->db->escape($this->label ? $this->label : $this->libelle)."'";
+		$sql .= ", '".$this->db->escape(isset($this->label) ? $this->label : (isset($this->libelle) ? $this->libelle : ''))."'";
 		$sql .= ", ".$this->socid;
 		$sql .= ", '".$this->db->idate($now)."'";
 		$sql .= ", '".$this->db->idate($this->date)."'";
@@ -497,7 +497,7 @@ class FactureFournisseur extends CommonInvoice
 							$this->lines[$i]->date_end,
 							$this->lines[$i]->array_options,
 							$this->lines[$i]->fk_unit,
-							$this->lines[$i]->pu_ht_devise
+							$this->lines[$i]->multicurrency_subprice
 						);
 					} else {
 						$this->error = $this->db->lasterror();
@@ -2467,7 +2467,7 @@ class FactureFournisseur extends CommonInvoice
 			$xnbp = 0;
 			while ($xnbp < $nbp)
 			{
-				$line = new FactureLigne($this->db);
+				$line = new SupplierInvoiceLine($this->db);
 				$line->desc = $langs->trans("Description")." ".$xnbp;
 				$line->qty = 1;
 				$line->subprice = 100;
@@ -2807,8 +2807,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 	public $fk_facture_fourn;
 
 	/**
-	 * Product label
-	 * This field may contains label of product (when invoice create from order)
+	 * This field may contains label of line (when invoice create from order)
 	 * @var string
 	 */
 	public $label;
@@ -2961,6 +2960,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 	public $multicurrency_total_tva;
 	public $multicurrency_total_ttc;
 
+
 	/**
 	 *	Constructor
 	 *

From 2c7d8723202d988cd984d019525f950ea513fed4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Dec 2020 11:07:34 +0100
Subject: [PATCH 463/888] Fix warning

---
 htdocs/compta/facture/class/facture-rec.class.php | 10 +++++-----
 htdocs/core/lib/functions.lib.php                 |  2 +-
 htdocs/fourn/class/fournisseur.facture.class.php  | 14 ++++++++------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 48e2ad574ed..c9157f7b43d 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -215,7 +215,7 @@ class FactureRec extends CommonInvoice
 		$now = dol_now();
 
 		// Clean parameters
-		$this->titre = trim($this->titre); // deprecated
+		$this->titre = trim(isset($this->titre) ? $this->titre : $this->title); // deprecated
 		$this->title = trim($this->title);
 		$this->usenewprice = empty($this->usenewprice) ? 0 : $this->usenewprice;
 		if (empty($this->suspended)) $this->suspended = 0;
@@ -366,7 +366,7 @@ class FactureRec extends CommonInvoice
 				}
 
 				// Add object linked
-				if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects))
+				if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects))
 				{
 					foreach ($this->linked_objects as $origin => $tmp_origin_id)
 					{
@@ -702,7 +702,7 @@ class FactureRec extends CommonInvoice
 				$line->total_ht         = $objp->total_ht;
 				$line->total_tva        = $objp->total_tva;
 				$line->total_ttc        = $objp->total_ttc;
-				$line->code_ventilation = $objp->fk_code_ventilation;
+				//$line->code_ventilation = $objp->fk_code_ventilation;
 				$line->fk_fournprice = $objp->fk_fournprice;
 				$marginInfos = getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $line->fk_fournprice, $objp->pa_ht);
 				$line->pa_ht = $marginInfos[0];
@@ -1996,7 +1996,7 @@ class FactureLigneRec extends CommonInvoiceLine
 			$this->localtax1_type   = $objp->localtax1_type;
 			$this->localtax2_type   = $objp->localtax2_type;
 			$this->remise_percent   = $objp->remise_percent;
-			$this->fk_remise_except = $objp->fk_remise_except;
+			//$this->fk_remise_except = $objp->fk_remise_except;
 			$this->fk_product       = $objp->fk_product;
 			$this->date_start_fill  = $objp->date_start_fill;
 			$this->date_end_fill    = $objp->date_end_fill;
@@ -2004,7 +2004,7 @@ class FactureLigneRec extends CommonInvoiceLine
 			$this->total_ht         = $objp->total_ht;
 			$this->total_tva        = $objp->total_tva;
 			$this->total_ttc        = $objp->total_ttc;
-			$this->code_ventilation = $objp->fk_code_ventilation;
+			//$this->code_ventilation = $objp->fk_code_ventilation;
 			$this->rang = $objp->rang;
 			$this->special_code = $objp->special_code;
 			$this->fk_unit          = $objp->fk_unit;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4fd44ee6ba3..998cddea0f9 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5191,7 +5191,7 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 
 		$sql .= ", ".MAIN_DB_PREFIX."c_country as c";
 		if ($mysoc->country_code == 'ES') $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($buyer->country_code)."'"; // local tax in spain use the buyer country ??
-		else $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($seller->country_code)."'";
+		else $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape(empty($seller->country_code) ? $mysoc->country_code : $seller->country_code)."'";
 		$sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
 		if ($vatratecode) $sql .= " AND t.code = '".$db->escape($vatratecode)."'";
 	}
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 43075ba6760..40ffb9024c5 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1856,6 +1856,7 @@ class FactureFournisseur extends CommonInvoice
 	public function updateline($id, $desc, $pu, $vatrate, $txlocaltax1 = 0, $txlocaltax2 = 0, $qty = 1, $idproduct = 0, $price_base_type = 'HT', $info_bits = 0, $type = 0, $remise_percent = 0, $notrigger = false, $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $pu_ht_devise = 0, $ref_supplier = '')
 	{
 		global $mysoc, $langs;
+
 		dol_syslog(get_class($this)."::updateline $id,$desc,$pu,$vatrate,$qty,$idproduct,$price_base_type,$info_bits,$type,$remise_percent,$notrigger,$date_start,$date_end,$fk_unit,$pu_ht_devise,$ref_supplier", LOG_DEBUG);
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
@@ -2809,6 +2810,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 	/**
 	 * This field may contains label of line (when invoice create from order)
 	 * @var string
+	 * @deprecated
 	 */
 	public $label;
 
@@ -3010,17 +3012,17 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$this->date_end = $obj->date_end;
 		$this->product_ref		= $obj->product_ref;
 		$this->ref_supplier		= $obj->ref_supplier;
-		$this->libelle			= $obj->label;
-		$this->label  			= $obj->label;
 		$this->product_desc		= $obj->product_desc;
-		$this->subprice = $obj->pu_ht;
-		$this->pu_ht				= $obj->pu_ht;
+
+		$this->subprice 		= $obj->pu_ht;
+		$this->pu_ht			= $obj->pu_ht;
 		$this->pu_ttc			= $obj->pu_ttc;
 		$this->tva_tx			= $obj->tva_tx;
 		$this->localtax1_tx		= $obj->localtax1_tx;
 		$this->localtax2_tx		= $obj->localtax2_tx;
-		$this->localtax1_type		= $obj->localtax1_type;
-		$this->localtax2_type		= $obj->localtax2_type;
+		$this->localtax1_type	= $obj->localtax1_type;
+		$this->localtax2_type	= $obj->localtax2_type;
+
 		$this->qty				= $obj->qty;
 		$this->remise_percent = $obj->remise_percent;
 		$this->tva				= $obj->total_tva; // deprecated

From c6f83aaed72a25228047b9f2afb452ac3f86d8ad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Dec 2020 11:21:48 +0100
Subject: [PATCH 464/888] Fix warning

---
 htdocs/compta/bank/class/account.class.php | 36 ++++++++++++++--------
 test/phpunit/BankAccountTest.php           |  4 ++-
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index e93491ceee4..b2d499c5f34 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1741,13 +1741,6 @@ class AccountLine extends CommonObject
 
 	public $amount;
 
-	/**
-	 * @var string bank transaction lines label
-	 */
-	public $label;
-
-	public $note;
-
 	/**
 	 * @var int ID
 	 */
@@ -1763,11 +1756,6 @@ class AccountLine extends CommonObject
 	 */
 	public $fk_type;
 
-	public $rappro; // Is it conciliated
-	public $num_releve; // If conciliated, what is bank statement
-	public $num_chq; // Num of cheque
-	public $bank_chq; // Bank of cheque
-
 	/**
 	 * @var int ID of cheque receipt
 	 */
@@ -1778,16 +1766,40 @@ class AccountLine extends CommonObject
 	 */
 	public $fk_account;
 
+	/**
+	 * @var string		Ref of bank account
+	 */
+	public $bank_account_ref;
+
 	/**
 	 * @var string		Label of bank account
 	 */
 	public $bank_account_label;
 
+	/**
+	 * @var string		Bank account numero
+	 */
+	public $numero_compte;
+
 	/**
 	 * @var string		Name of check issuer
 	 */
 	public $emetteur;
 
+	public $rappro; // Is it conciliated
+	public $num_releve; // If conciliated, what is bank statement
+	public $num_chq; // Num of cheque
+	public $bank_chq; // Bank of cheque
+
+	/**
+	 * @var string bank transaction lines label
+	 */
+	public $label;
+
+	public $note;
+
+
+
 	/**
 	 *  Constructor
 	 *
diff --git a/test/phpunit/BankAccountTest.php b/test/phpunit/BankAccountTest.php
index 1007db02dad..fd92d242b31 100644
--- a/test/phpunit/BankAccountTest.php
+++ b/test/phpunit/BankAccountTest.php
@@ -200,8 +200,10 @@ class BankAccountTest extends PHPUnit\Framework\TestCase
         */
 
         $localobject->info($localobject->id);
+
+        $result = $localobject->needIBAN();
         //print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
-        //$this->assertNotEquals($localobject->date_creation, '');
+        $this->assertEquals(1, $result);
 
         return $localobject->id;
     }

From 5facd49a6c2ee4370783cffc8f37c10c25b71b61 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Dec 2020 11:33:31 +0100
Subject: [PATCH 465/888] Fix warnings

---
 htdocs/compta/sociales/class/chargesociales.class.php | 6 +++---
 htdocs/product/stock/class/entrepot.class.php         | 3 +--
 test/phpunit/EntrepotTest.php                         | 3 ++-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 2ea2497efbb..ffb2d04e155 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -512,13 +512,13 @@ class ChargeSociales extends CommonObject
 	 *  Return a link to the object card (with optionaly the picto)
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-	 * 	@param	int		$maxlen						Max length of label
+	 *  @param  string  $option                     On what the link point to ('nolink', ...)
 	 *  @param	int  	$notooltip					1=Disable tooltip
 	 *  @param  int		$short           			1=Return just URL
 	 *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string								String with link
 	 */
-	public function getNomUrl($withpicto = 0, $maxlen = 0, $notooltip = 0, $short = 0, $save_lastsearch_value = -1)
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $short = 0, $save_lastsearch_value = -1)
 	{
 		global $langs, $conf, $user, $form;
 
@@ -569,7 +569,7 @@ class ChargeSociales extends CommonObject
 
 		$result .= $linkstart;
 		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= ($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref);
+		if ($withpicto != 2) $result .= $this->ref;
 		$result .= $linkend;
 
 		return $result;
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 14e25bad513..d7a52cd1910 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -166,8 +166,7 @@ class Entrepot extends CommonObject
 		$this->db = $db;
 
 		$this->statuts[self::STATUS_CLOSED] = 'Closed2';
-		if ($conf->global->ENTREPOT_EXTRA_STATUS)
-		{
+		if (!empty($conf->global->ENTREPOT_EXTRA_STATUS)) {
 			$this->statuts[self::STATUS_OPEN_ALL] = 'OpenAll';
 			$this->statuts[self::STATUS_OPEN_INTERNAL] = 'OpenInternal';
 		} else {
diff --git a/test/phpunit/EntrepotTest.php b/test/phpunit/EntrepotTest.php
index 27fd3dabbf3..8cad99243cc 100644
--- a/test/phpunit/EntrepotTest.php
+++ b/test/phpunit/EntrepotTest.php
@@ -219,7 +219,8 @@ class EntrepotTest extends PHPUnit\Framework\TestCase
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
-		//$this->assertLessThan(1, 0);
+		$result = $localobject->get_full_arbo();
+		$this->assertEquals('WAREHOUSE SPECIMEN', $result);
 
         return $localobject->id;
     }

From 371a4609055ef3661620ebba9ef69d6ecf9e8012 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Dec 2020 12:26:01 +0100
Subject: [PATCH 466/888] More PHPUnit for movements

---
 htdocs/product/class/product.class.php        |  2 +-
 htdocs/product/class/productbatch.class.php   |  9 ++-
 .../stock/class/mouvementstock.class.php      | 43 +++++++-------
 test/phpunit/MouvementStockTest.php           | 56 ++++++++++++++-----
 4 files changed, 70 insertions(+), 40 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index e1b25b9e3b7..a6d676a0f7b 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4893,7 +4893,7 @@ class Product extends CommonObject
 		$sql .= " WHERE w.entity IN (".getEntity('stock').")";
 		$sql .= " AND w.rowid = ps.fk_entrepot";
 		$sql .= " AND ps.fk_product = ".$this->id;
-		if ($conf->global->ENTREPOT_EXTRA_STATUS && count($warehouseStatus)) {
+		if (!empty($conf->global->ENTREPOT_EXTRA_STATUS) && count($warehouseStatus)) {
 			$sql .= " AND w.statut IN (".$this->db->sanitize($this->db->escape(implode(',', $warehouseStatus))).")";
 		}
 
diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php
index f5a91ff2839..a97437f6a45 100644
--- a/htdocs/product/class/productbatch.class.php
+++ b/htdocs/product/class/productbatch.class.php
@@ -89,19 +89,18 @@ class Productbatch extends CommonObject
 		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_batch (";
 		$sql .= "fk_product_stock,";
-		$sql .= "sellby,";
-		$sql .= "eatby,";
+		$sql .= "sellby,";				// no more used
+		$sql .= "eatby,";				// no more used
 		$sql .= "batch,";
 		$sql .= "qty,";
 		$sql .= "import_key";
 		$sql .= ") VALUES (";
 		$sql .= " ".(!isset($this->fk_product_stock) ? 'NULL' : $this->fk_product_stock).",";
-		$sql .= " ".(!isset($this->sellby) || dol_strlen($this->sellby) == 0 ? 'NULL' : "'".$this->db->idate($this->sellby)."'").",";
-		$sql .= " ".(!isset($this->eatby) || dol_strlen($this->eatby) == 0 ? 'NULL' : "'".$this->db->idate($this->eatby)."'").",";
+		$sql .= " ".(!isset($this->sellby) || dol_strlen($this->sellby) == 0 ? 'NULL' : "'".$this->db->idate($this->sellby)."'").",";		// no more used
+		$sql .= " ".(!isset($this->eatby) || dol_strlen($this->eatby) == 0 ? 'NULL' : "'".$this->db->idate($this->eatby)."'").",";			// no more used
 		$sql .= " ".(!isset($this->batch) ? 'NULL' : "'".$this->db->escape($this->batch)."'").",";
 		$sql .= " ".(!isset($this->qty) ? 'NULL' : $this->qty).",";
 		$sql .= " ".(!isset($this->import_key) ? 'NULL' : "'".$this->db->escape($this->import_key)."'")."";
-
 		$sql .= ")";
 
 		$this->db->begin();
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 631cedd0a25..a23846c3e08 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -140,8 +140,8 @@ class MouvementStock extends CommonObject
 	 *	@param		string	$label				Label of stock movement
 	 *	@param		string	$inventorycode		Inventory code
 	 *	@param		string	$datem				Force date of movement
-	 *	@param		integer	$eatby				eat-by date. Will be used if lot does not exists yet and will be created.
-	 *	@param		integer	$sellby				sell-by date. Will be used if lot does not exists yet and will be created.
+	 *	@param		integer|string	$eatby				eat-by date. Will be used if lot does not exists yet and will be created.
+	 *	@param		integer|string	$sellby				sell-by date. Will be used if lot does not exists yet and will be created.
 	 *	@param		string	$batch				batch number
 	 *	@param		boolean	$skip_batch			If set to true, stock movement is done without impacting batch record
 	 * 	@param		int		$id_product_batch	Id product_batch (when skip_batch is false and we already know which record of product_batch to use)
@@ -166,13 +166,14 @@ class MouvementStock extends CommonObject
 
 		// Check parameters
 		if (empty($fk_product)) return 0;
-		if ($eatby < 0)
-		{
+
+		if (is_numeric($eatby) && $eatby < 0) {
+			dol_syslog(get_class($this)."::_create start ErrorBadValueForParameterEatBy eatby = ".$eatby);
 			$this->errors[] = 'ErrorBadValueForParameterEatBy';
 			return -1;
 		}
-		if ($sellby < 0)
-		{
+		if (is_numeric($sellby) && $sellby < 0) {
+			dol_syslog(get_class($this)."::_create start ErrorBadValueForParameterSellBy sellby = ".$sellby);
 			$this->errors[] = 'ErrorBadValueForParameterSellBy';
 			return -1;
 		}
@@ -786,19 +787,19 @@ class MouvementStock extends CommonObject
 	/**
 	 *	Increase stock for product and subproducts
 	 *
-	 * 	@param 		User	$user			     Object user
-	 * 	@param		int		$fk_product		     Id product
-	 * 	@param		int		$entrepot_id	     Warehouse id
-	 * 	@param		int		$qty			     Quantity
-	 * 	@param		int		$price			     Price
-	 * 	@param		string	$label			     Label of stock movement
-	 *	@param		integer	$eatby			     eat-by date
-	 *	@param		integer	$sellby			     sell-by date
-	 *	@param		string	$batch			     batch number
-	 * 	@param		string	$datem			     Force date of movement
-	 * 	@param		int		$id_product_batch    Id product_batch
-	 *  @param      string  $inventorycode       Inventory code
-	 *	@return		int						     <0 if KO, >0 if OK
+	 * 	@param 		User			$user			     Object user
+	 * 	@param		int				$fk_product		     Id product
+	 * 	@param		int				$entrepot_id	     Warehouse id
+	 * 	@param		int				$qty			     Quantity
+	 * 	@param		int				$price			     Price
+	 * 	@param		string			$label			     Label of stock movement
+	 *	@param		integer|string	$eatby			     eat-by date
+	 *	@param		integer|string	$sellby			     sell-by date
+	 *	@param		string			$batch			     batch number
+	 * 	@param		string			$datem			     Force date of movement
+	 * 	@param		int				$id_product_batch    Id product_batch
+	 *  @param      string			$inventorycode       Inventory code
+	 *	@return		int								     <0 if KO, >0 if OK
 	 */
 	public function reception($user, $fk_product, $entrepot_id, $qty, $price = 0, $label = '', $eatby = '', $sellby = '', $batch = '', $datem = '', $id_product_batch = 0, $inventorycode = '')
 	{
@@ -918,8 +919,8 @@ class MouvementStock extends CommonObject
 			} else {					// product_batch record not found
 				$pdluo->fk_product_stock = $vfk_product_stock;
 				$pdluo->qty = $qty;
-				$pdluo->eatby = $veatby;
-				$pdluo->sellby = $vsellby;
+				$pdluo->eatby = empty($dluo['eatby']) ? '' : $dluo['eatby'];		// No more used. Now eatby date is store in table of lot, no more into prouct_batch table.
+				$pdluo->sellby = empty($dluo['sellby']) ? '' : $dluo['sellby'];		// No more used. Now sellby date is store in table of lot, no more into prouct_batch table.
 				$pdluo->batch = $vbatchnumber;
 
 				$result = $pdluo->create($user, 1);
diff --git a/test/phpunit/MouvementStockTest.php b/test/phpunit/MouvementStockTest.php
index 23b6b2b0111..4570db5a1d5 100644
--- a/test/phpunit/MouvementStockTest.php
+++ b/test/phpunit/MouvementStockTest.php
@@ -130,7 +130,7 @@ class MouvementStockTest extends PHPUnit\Framework\TestCase
     /**
      * testMouvementCreate
      *
-     * @return	int
+     * @return	MouvementStock
      */
     public function testMouvementCreate()
     {
@@ -141,6 +141,13 @@ class MouvementStockTest extends PHPUnit\Framework\TestCase
 		$db=$this->savdb;
 
 		// We create a product for tests
+		$product0=new Product($db);
+		$product0->initAsSpecimen();
+		$product0->ref.=' 0';
+		$product0->label.=' 0';
+		$product0->status_batch = 1;
+		$product0id=$product0->create($user);
+
 		$product1=new Product($db);
 		$product1->initAsSpecimen();
 		$product1->ref.=' 1';
@@ -154,6 +161,13 @@ class MouvementStockTest extends PHPUnit\Framework\TestCase
 		$product2id=$product2->create($user);
 
 		// We create a product for tests
+		$warehouse0=new Entrepot($db);
+		$warehouse0->initAsSpecimen();
+		$warehouse0->label.=' 0';
+		$warehouse0->description.=' 0';
+		$warehouse0->statut = 0;
+		$warehouse0id=$warehouse0->create($user);
+
 		$warehouse1=new Entrepot($db);
 		$warehouse1->initAsSpecimen();
 		$warehouse1->label.=' 1';
@@ -168,32 +182,49 @@ class MouvementStockTest extends PHPUnit\Framework\TestCase
 
 		$localobject=new MouvementStock($this->savdb);
 
+		$datetest1 = dol_mktime(0, 0, 0, 1, 1, 2000);
+		$datetest2 = dol_mktime(0, 0, 0, 1, 2, 2000);
+
+		// Create an input movement movement (type = 3) with value for eatby date and a lot
+		$result=$localobject->reception($user, $product0id, $warehouse0id, 5, 999, 'Movement for unit test with batch', $datetest1, $datetest1, 'anotyetuselotnumberA', '', 0, 'Inventory Code Test with batch');
+		print __METHOD__." result=".$result."\n";
+		$this->assertGreaterThan(0, $result, 'Failed to create a movement with a lot number of product with status_batch=1');
+
+		$result=$localobject->reception($user, $product0id, $warehouse0id, 5, 999, 'Movement for unit test with batch', $datetest1, $datetest1, 'anotyetuselotnumberB', '', 0, 'Inventory Code Test with batch');
+		print __METHOD__." result=".$result."\n";
+		$this->assertGreaterThan(0, $result, 'Test to check we can create a movement a eatby dare different when lot number is different');
+
+		// Create same input movement movement (type = 3) with same lot but a different value of eatby date
+		$result=$localobject->reception($user, $product0id, $warehouse0id, 5, 999, 'Movement for unit test with batch', $datetest2, $datetest1, 'anotyetuselotnumberA', '', 0, 'Inventory Code Test with batch');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(-3, $result, 'Test to check we can t create a movement for a lot with a different eatby date');
+
     	// Do a list of movement into warehouse 1
 
     	// Create an input movement (type = 3) of price 9.9 -> should update PMP to 9.9
 		$result=$localobject->reception($user, $product1id, $warehouse1id, 10, 9.9, 'Movement for unit test 1', '', '', '', '', 0, 'Inventory Code Test');
     	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+    	$this->assertGreaterThan(0, $result, 'Return code of 0 was expected for the reception test 1');
 
     	// Create an input movement (type = 3) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
     	$result=$localobject->reception($user, $product1id, $warehouse1id, 10, 9.7, 'Movement for unit test 2', '', '', '', '', 0, 'Inventory Code Test');
     	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+    	$this->assertGreaterThan(0, $result);
 
     	// Create an output movement (type = 2) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
     	$result=$localobject->livraison($user, $product1id, $warehouse1id, 5, 999, 'Movement for unit test 3', '', '', '', '', 0, 'Inventory Code Test');
     	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+    	$this->assertGreaterThan(0, $result);
 
     	// Create an output movement (type = 1) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
     	$result=$localobject->_create($user, $product1id, $warehouse1id, 1, 0, 0, 'Input from transfer', 'Transfert X');
     	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+    	$this->assertGreaterThan(0, $result);
 
     	// Create an output movement (type = 1) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
     	$result=$localobject->_create($user, $product1id, $warehouse1id, -2, 1, 0, 'Output from transfer', 'Transfert Y');
     	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+    	$this->assertGreaterThan(0, $result);
 
 
     	// Do same but into warehouse 2
@@ -201,28 +232,27 @@ class MouvementStockTest extends PHPUnit\Framework\TestCase
     	// Create an input movement (type = 3) of price 9.9 -> should update PMP to 9.9
     	$result=$localobject->reception($user, $product1id, $warehouse2id, 10, 9.9, 'Movement for unit test 1 wh 2', '', '', '', '', 0, 'Inventory Code Test 2');
     	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+    	$this->assertGreaterThan(0, $result);
 
     	// Create an input movement (type = 3) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
     	$result=$localobject->reception($user, $product1id, $warehouse2id, 10, 9.7, 'Movement for unit test 2 wh 2', '', '', '', '', 0, 'Inventory Code Test 2');
     	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+    	$this->assertGreaterThan(0, $result);
 
     	// Create an output movement (type = 2) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
     	$result=$localobject->livraison($user, $product1id, $warehouse2id, 5, 999, 'Movement for unit test 3 wh 2', '', '', '', '', 0, 'Inventory Code Test 2');
     	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+    	$this->assertGreaterThan(0, $result);
 
     	// Create an output movement (type = 1) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
     	$result=$localobject->_create($user, $product1id, $warehouse2id, 1, 0, 0, 'Input from transfer wh 2', 'Transfert X 2');
     	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+    	$this->assertGreaterThan(0, $result);
 
     	// Create an output movement (type = 1) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
     	$result=$localobject->_create($user, $product1id, $warehouse2id, -2, 1, 0, 'Output from transfer wh 2', 'Transfert Y 2');
     	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-
+    	$this->assertGreaterThan(0, $result);
 
     	return $localobject;
     }
@@ -231,7 +261,7 @@ class MouvementStockTest extends PHPUnit\Framework\TestCase
      * testMouvementCheck
      *
      * @param	MouvementStock		$localobject	Movement object we created
-     * @return	int
+     * @return	MouvementStock
      *
      * @depends	testMouvementCreate
      * The depends says test is run only if previous is ok

From d781d78c4e960cea252fcdfe91a9289283ecdad7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Dec 2020 12:53:31 +0100
Subject: [PATCH 467/888] Fix warning

---
 htdocs/categories/class/categorie.class.php | 4 ++--
 test/phpunit/CategorieTest.php              | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index f55b3403546..63400aec45c 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -312,7 +312,7 @@ class Categorie extends CommonObject
 
 		// Check parameters
 		if (empty($id) && empty($label) && empty($ref_ext)) return -1;
-		if (!is_numeric($type)) $type = $this->MAP_ID[$type];
+		if (!is_null($type) && !is_numeric($type)) $type = $this->MAP_ID[$type];
 
 		$sql = "SELECT rowid, fk_parent, entity, label, description, color, fk_soc, visible, type, ref_ext";
 		$sql .= ", date_creation, tms, fk_user_creat, fk_user_modif";
@@ -1058,7 +1058,7 @@ class Categorie extends CommonObject
 		$current_lang = $langs->getDefaultLang();
 
 		// Init $this->cats array
-		$sql = "SELECT DISTINCT c.rowid, c.label, c.description, c.color, c.fk_parent, c.visible"; // Distinct reduce pb with old tables with duplicates
+		$sql = "SELECT DISTINCT c.rowid, c.label, c.ref_ext, c.description, c.color, c.fk_parent, c.visible"; // Distinct reduce pb with old tables with duplicates
 		if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= ", t.label as label_trans, t.description as description_trans";
 		$sql .= " FROM ".MAIN_DB_PREFIX."categorie as c";
 		if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= " LEFT  JOIN ".MAIN_DB_PREFIX."categorie_lang as t ON t.fk_category=c.rowid AND t.lang='".$this->db->escape($current_lang)."'";
diff --git a/test/phpunit/CategorieTest.php b/test/phpunit/CategorieTest.php
index 189ef10ecdc..11aff6b1a79 100644
--- a/test/phpunit/CategorieTest.php
+++ b/test/phpunit/CategorieTest.php
@@ -203,6 +203,7 @@ class CategorieTest extends PHPUnit\Framework\TestCase
         $result=$localobject2->create($user);
         $cat = new Categorie($this->savdb);
         $cat->id = $catid;
+        $cat->type = 0;
         $result=$cat->add_type($localobject2, "product");
 
         print __METHOD__." result=".$result."\n";

From 4df0efa43d20cf4ed9470a10b50b2e02517078b7 Mon Sep 17 00:00:00 2001
From: Corentin Giroud-Argoud <corentin.giroud.argoud@ecomail.fr>
Date: Wed, 16 Dec 2020 10:47:28 +0100
Subject: [PATCH 468/888] [New] Add sendMail hook in subscription

Added sendMail hook in subscription, before a mail is sent to confirm a
subscription. It makes it more flexible for modules to interact with it.
---
 htdocs/adherents/subscription.php | 108 +++++++++++++++++-------------
 1 file changed, 63 insertions(+), 45 deletions(-)

diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 1c4e42da1fe..a00c52b88e5 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -300,57 +300,75 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
 		if (!$error) {
 			// Send confirmation Email
 			if ($object->email && $sendalsoemail) {   // $object is 'Adherent'
-				$subject = '';
-				$msg = '';
-
-				// Send subscription email
-				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-				$formmail = new FormMail($db);
-				// Set output language
-				$outputlangs = new Translate('', $conf);
-				$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
-				// Load traductions files required by page
-				$outputlangs->loadLangs(array("main", "members"));
-
-				// Get email content from template
-				$arraydefaultmessage = null;
-				$labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION;
-
-				if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
-
-				if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
-					$subject = $arraydefaultmessage->topic;
-					$msg     = $arraydefaultmessage->content;
+				$parameters = array(
+					'datesubscription' => $datesubscription,
+					'amount' => $amount,
+					'ccountid' => $accountid,
+					'operation' => $operation,
+					'label' => $label,
+					'num_chq' => $num_chq,
+					'emetteur_nom' => $emetteur_nom,
+					'emetteur_banque' => $emetteur_banque,
+					'datesubend' => $datesubend
+				);
+				$reshook = $hookmanager->executeHooks('sendMail', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+				if ($reshook < 0) {
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 				}
 
-				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
-				complete_substitutions_array($substitutionarray, $outputlangs, $object);
-				$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
-				$texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnSubscription()), $substitutionarray, $outputlangs);
+				if (empty($reshook)) {
+					$subject = '';
+					$msg = '';
 
-				// Attach a file ?
-				$file = '';
-				$listofpaths = array();
-				$listofnames = array();
-				$listofmimes = array();
-				if (is_object($object->invoice) && (!is_object($arraydefaultmessage) || intval($arraydefaultmessage->joinfiles))) {
-					$invoicediroutput = $conf->facture->dir_output;
-					$fileparams = dol_most_recent_file($invoicediroutput.'/'.$object->invoice->ref, preg_quote($object->invoice->ref, '/').'[^\-]+');
-					$file = $fileparams['fullname'];
+					// Send subscription email
+					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+					$formmail = new FormMail($db);
+					// Set output language
+					$outputlangs = new Translate('', $conf);
+					$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
+					// Load traductions files required by page
+					$outputlangs->loadLangs(array("main", "members"));
 
-					$listofpaths = array($file);
-					$listofnames = array(basename($file));
-					$listofmimes = array(dol_mimetype($file));
-				}
+					// Get email content from template
+					$arraydefaultmessage = null;
+					$labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION;
 
-				$moreinheader = 'X-Dolibarr-Info: send_an_email by adherents/subscription.php'."\r\n";
+					if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-				$result = $object->send_an_email($texttosend, $subjecttosend, $listofpaths, $listofmimes, $listofnames, "", "", 0, -1, '', $moreinheader);
-				if ($result < 0) {
-					$errmsg = $object->error;
-					setEventMessages($object->error, $object->errors, 'errors');
-				} else {
-					setEventMessages($langs->trans("EmailSentToMember", $object->email), null, 'mesgs');
+					if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+						$subject = $arraydefaultmessage->topic;
+						$msg     = $arraydefaultmessage->content;
+					}
+
+					$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+					complete_substitutions_array($substitutionarray, $outputlangs, $object);
+					$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+					$texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnSubscription()), $substitutionarray, $outputlangs);
+
+					// Attach a file ?
+					$file = '';
+					$listofpaths = array();
+					$listofnames = array();
+					$listofmimes = array();
+					if (is_object($object->invoice) && (!is_object($arraydefaultmessage) || intval($arraydefaultmessage->joinfiles))) {
+						$invoicediroutput = $conf->facture->dir_output;
+						$fileparams = dol_most_recent_file($invoicediroutput.'/'.$object->invoice->ref, preg_quote($object->invoice->ref, '/').'[^\-]+');
+						$file = $fileparams['fullname'];
+
+						$listofpaths = array($file);
+						$listofnames = array(basename($file));
+						$listofmimes = array(dol_mimetype($file));
+					}
+
+					$moreinheader = 'X-Dolibarr-Info: send_an_email by adherents/subscription.php'."\r\n";
+
+					$result = $object->send_an_email($texttosend, $subjecttosend, $listofpaths, $listofmimes, $listofnames, "", "", 0, -1, '', $moreinheader);
+					if ($result < 0) {
+						$errmsg = $object->error;
+						setEventMessages($object->error, $object->errors, 'errors');
+					} else {
+						setEventMessages($langs->trans("EmailSentToMember", $object->email), null, 'mesgs');
+					}
 				}
 			} else {
 				setEventMessages($langs->trans("NoEmailSentToMember"), null, 'mesgs');

From a5a070705b91f67ad7b647aabe03c97f474de5b0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Dec 2020 14:53:04 +0100
Subject: [PATCH 469/888] Add test for phpunit env

---
 test/phpunit/MouvementStockTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/phpunit/MouvementStockTest.php b/test/phpunit/MouvementStockTest.php
index 4570db5a1d5..1f27b4c71de 100644
--- a/test/phpunit/MouvementStockTest.php
+++ b/test/phpunit/MouvementStockTest.php
@@ -115,6 +115,8 @@ class MouvementStockTest extends PHPUnit\Framework\TestCase
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
+		if (empty($conf->productbatch->enabled)) { print "\n".__METHOD__." module Lot/Serial must be enabled.\n"; die(); }
+
 		print __METHOD__."\n";
     }
 	/**

From 6f75e24fd704210a707731b81b32517816d50980 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Dec 2020 15:10:11 +0100
Subject: [PATCH 470/888] Fix better error management in migration

---
 .travis.yml                 |  3 ++-
 htdocs/install/upgrade2.php | 19 ++++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a3e35dcfdab..bda2a9e9634 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -400,7 +400,8 @@ script:
   php step5.php 12.0.0 13.0.0 > $TRAVIS_BUILD_DIR/upgrade12001300-3.log
 
   # Enable modules not enabled into original dump
-  php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKET,MAIN_MODULE_ACCOUNTING,MAIN_MODULE_MRP,MAIN_MODULE_RECRUITMENT > $TRAVIS_BUILD_DIR/enablemodule.log
+  php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKET,MAIN_MODULE_ACCOUNTING,MAIN_MODULE_MRP > $TRAVIS_BUILD_DIR/enablemodule.log
+  php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_RECEPTION,MAIN_MODULE_RECRUITMENT > $TRAVIS_BUILD_DIR/enablemodule.log
   echo $?
   cd -
   set +e
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 2d84e234cf2..babb47de91a 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -509,7 +509,11 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 		{
 			$listofmodules[$value] = 'forceactivate';
 		}
-		migrate_reload_modules($db, $langs, $conf, $listofmodules, 1);
+
+		$resultreloadmodules = migrate_reload_modules($db, $langs, $conf, $listofmodules, 1);
+		if ($resultreloadmodules < 0) {
+			$error++;
+		}
 	}
 
 
@@ -4283,7 +4287,7 @@ function migrate_delete_old_dir($db, $langs, $conf)
  * @param	Conf		$conf			Object conf
  * @param	array		$listofmodule	List of modules
  * @param   int         $force          1=Reload module even if not already loaded
- * @return	void
+ * @return	int							<0 if KO, >0 if OK
  */
 function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $force = 0)
 {
@@ -4497,12 +4501,15 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 						//$mod->remove('noboxes');
 						$mod->init($reloadmode);
 					} else {
-						dolibarr_install_syslog('Failed to include '.strtolower($moduletoreloadshort).'/core/modules/mod'.$moduletoreloadshort.'.class.php');
+						dolibarr_install_syslog('Failed to include '.strtolower($moduletoreloadshort).'/core/modules/mod'.$moduletoreloadshort.'.class.php', LOG_ERR);
+						print "Error, can't find module with name ".$moduletoreload."\n";
+						return -1;
 					}
 				}
 			} else {
-				dolibarr_install_syslog("Error, can't find module with name ".$moduletoreload, LOG_WARNING);
-				print "Error, can't find module with name ".$moduletoreload;
+				dolibarr_install_syslog("Error, can't find module with name ".$moduletoreload, LOG_ERR);
+				print "Error, can't find module with name ".$moduletoreload."\n";
+				return -1;
 			}
 		}
 
@@ -4516,6 +4523,8 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 			print '</td></tr>';
 		}
 	}
+
+	return 1;
 }
 
 

From 0a38f9e8aac7676d4e052660e541dccd3a65942f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Dec 2020 15:16:23 +0100
Subject: [PATCH 471/888] Fix add missing token

---
 htdocs/multicurrency/multicurrency_rate.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index ffab711e1cd..eae788b0587 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -241,6 +241,8 @@ if ($action != "updateRate") {
 
 	$form = new Form($db);
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+
 	print '<table><tr>';
 
 	print ' <td>'.$langs->trans('Date').'</td>';
@@ -286,6 +288,8 @@ if ($action == "updateRate") {
 
 		$form = new Form($db);
 		print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formtoupdaterate">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+
 		print '<table><tr>';
 		print ' <td>'.$langs->trans('Date').'</td>';
 		print '<td>';

From e7dda7bb4f0f06c851adf512c787b706b97ff24d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Dec 2020 15:46:54 +0100
Subject: [PATCH 472/888] Move help into tooltip help section

---
 htdocs/core/modules/modCategorie.class.php | 27 +++++++++++-----------
 htdocs/langs/en_US/categories.lang         |  1 +
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index d2218d33483..7dae96253bb 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -121,28 +121,29 @@ class modCategorie extends DolibarrModules
 		// All Categories List
 		$r++;
 		$this->export_code[$r] = $this->rights_class.'_list';
-		$this->export_label[$r] = 'CatList';
+		$this->export_label[$r] = 'CatListAll';
 		$this->export_icon[$r] = $this->picto;
         $this->export_enabled[$r] = 'true';
 		$this->export_permission[$r] = array(array("categorie", "lire"));
 
 		$typeexample = "";
-		if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) { $typeexample .= ($typeexample ? "/" : "")."0=Product-Service"; }
+		if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) { $typeexample .= ($typeexample ? " / " : "")."0=Product-Service"; }
 		if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) { $typeexample .= ($typeexample ? "/" : "")."1=Supplier"; }
-		if (!empty($conf->societe->enabled)) { $typeexample .= ($typeexample ? "/" : "")."2=Customer-Prospect"; }
-		if (!empty($conf->adherent->enabled)) { $typeexample .= ($typeexample ? "/" : "")."3=Member"; }
-		if (!empty($conf->societe->enabled)) { $typeexample .= ($typeexample ? "/" : "")."4=Contact"; }
-		if (!empty($conf->bank->enabled)) { $typeexample .= ($typeexample ? "/" : "")."5=Bank account"; }
-		if (!empty($conf->projet->enabled)) { $typeexample .= ($typeexample ? "/" : "")."6=Project"; }
-		if (!empty($conf->user->enabled)) { $typeexample .= ($typeexample ? "/" : "")."7=User"; }
-		if (!empty($conf->bank->enabled)) { $typeexample .= ($typeexample ? "/" : "")."8=Bank line"; }
-		if (!empty($conf->stock->enabled)) { $typeexample .= ($typeexample ? "/" : "")."9=Warehouse"; }
-		if (!empty($conf->agenda->enabled)) { $typeexample .= ($typeexample ? "/" : "")."10=Agenda event"; }
-		if (!empty($conf->website->enabled)) { $typeexample .= ($typeexample ? "/" : "")."11=Website page"; }
+		if (!empty($conf->societe->enabled)) { $typeexample .= ($typeexample ? " / " : "")."2=Customer-Prospect"; }
+		if (!empty($conf->adherent->enabled)) { $typeexample .= ($typeexample ? " / " : "")."3=Member"; }
+		if (!empty($conf->societe->enabled)) { $typeexample .= ($typeexample ? " / " : "")."4=Contact"; }
+		if (!empty($conf->bank->enabled)) { $typeexample .= ($typeexample ? " / " : "")."5=Bank account"; }
+		if (!empty($conf->projet->enabled)) { $typeexample .= ($typeexample ? " / " : "")."6=Project"; }
+		if (!empty($conf->user->enabled)) { $typeexample .= ($typeexample ? " / " : "")."7=User"; }
+		if (!empty($conf->bank->enabled)) { $typeexample .= ($typeexample ? " / " : "")."8=Bank line"; }
+		if (!empty($conf->stock->enabled)) { $typeexample .= ($typeexample ? " / " : "")."9=Warehouse"; }
+		if (!empty($conf->agenda->enabled)) { $typeexample .= ($typeexample ? " / " : "")."10=Agenda event"; }
+		if (!empty($conf->website->enabled)) { $typeexample .= ($typeexample ? " / " : "")."11=Website page"; }
 
-		$this->export_fields_array[$r] = array('cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.type'=>"Type ".$typeexample, 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategory", 'pcat.label'=>"ParentCategoryLabel" );
+		$this->export_fields_array[$r] = array('cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.type'=>"Type", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategory", 'pcat.label'=>"ParentCategoryLabel" );
 		$this->export_TypeFields_array[$r] = array('cat.label'=>"Text", 'cat.type'=>"Numeric", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid', 'pcat.label'=>'Text' );
 		$this->export_entities_array[$r] = array(); // We define here only fields that use another picto
+		$this->export_help_array[$r] = array('cat.type'=>$typeexample);
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as cat';
diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang
index 36d1d3e545a..4ddf0d6093f 100644
--- a/htdocs/langs/en_US/categories.lang
+++ b/htdocs/langs/en_US/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created

From 1f9c597f269fef235e4404429cccc50ead6b0611 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Dec 2020 15:57:52 +0100
Subject: [PATCH 473/888] Fix default fields in list

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

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 71f0f08cc9d..2e24f355b37 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -187,8 +187,8 @@ $arrayfields = array(
 	's.code_fournisseur'=>array('label'=>"SupplierCodeShort", 'position'=>11, 'checked'=>$checkedsuppliercode, 'enabled'=>(!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))),
 	's.code_compta'=>array('label'=>"CustomerAccountancyCodeShort", 'position'=>13, 'checked'=>$checkedcustomeraccountcode),
 	's.code_compta_fournisseur'=>array('label'=>"SupplierAccountancyCodeShort", 'position'=>14, 'checked'=>$checkedsupplieraccountcode, 'enabled'=>(!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))),
-	's.address'=>array('label'=>"Address", 'position'=>19, 'checked'=>1),
-	's.town'=>array('label'=>"Town", 'position'=>20, 'checked'=>1),
+	's.address'=>array('label'=>"Address", 'position'=>19, 'checked'=>0),
+	's.town'=>array('label'=>"Town", 'position'=>20, 'checked'=>0),
 	's.zip'=>array('label'=>"Zip", 'position'=>21, 'checked'=>1),
 	'state.nom'=>array('label'=>"State", 'position'=>22, 'checked'=>0),
 	'region.nom'=>array('label'=>"Region", 'position'=>23, 'checked'=>0),

From 40ae1808de3e502f0bff5209e53b066901610565 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Dec 2020 16:06:33 +0100
Subject: [PATCH 474/888] Look and fell v13

---
 htdocs/exports/export.php | 11 +++++------
 htdocs/imports/import.php | 13 ++++++-------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index b02ca2e10de..c9db970cd0b 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -429,8 +429,7 @@ if ($step == 1 || !$datatoexport)
 	$hselected = $h;
 	$h++;
 
-	print dol_get_fiche_head($head, $hselected, $langs->trans("NewExport"), -1);
-
+	print dol_get_fiche_head($head, $hselected, '', -1);
 
 	print '<div class="opacitymedium">'.$langs->trans("SelectExportDataSet").'</div><br>';
 
@@ -492,7 +491,7 @@ if ($step == 2 && $datatoexport)
 	$hselected = $h;
 	$h++;
 
-	print dol_get_fiche_head($head, $hselected, $langs->trans("NewExport"), -2);
+	print dol_get_fiche_head($head, $hselected, '', -2);
 
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
@@ -688,7 +687,7 @@ if ($step == 3 && $datatoexport)
 	$hselected = $h;
 	$h++;
 
-	print dol_get_fiche_head($head, $hselected, $langs->trans("NewExport"), -2);
+	print dol_get_fiche_head($head, $hselected, '', -2);
 
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
@@ -875,7 +874,7 @@ if ($step == 4 && $datatoexport)
 	$hselected = $h;
 	$h++;
 
-	print dol_get_fiche_head($head, $hselected, $langs->trans("NewExport"), -2);
+	print dol_get_fiche_head($head, $hselected, '', -2);
 
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
@@ -1134,7 +1133,7 @@ if ($step == 5 && $datatoexport)
 	$hselected = $h;
 	$h++;
 
-	print dol_get_fiche_head($head, $hselected, $langs->trans("NewExport"), -2);
+	print dol_get_fiche_head($head, $hselected, '', -2);
 
 	/*
      * Confirmation suppression fichier
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 60134ab9b95..fbb17e15280 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -392,8 +392,7 @@ if ($step == 1 || !$datatoimport)
 
 	$head = import_prepare_head($param, 1);
 
-	print dol_get_fiche_head($head, 'step1', $langs->trans("NewImport"), -1);
-
+	print dol_get_fiche_head($head, 'step1', '', -1);
 
 	print '<div class="opacitymedium">'.$langs->trans("SelectImportDataSet").'</div><br>';
 
@@ -454,7 +453,7 @@ if ($step == 2 && $datatoimport)
 
 	$head = import_prepare_head($param, 2);
 
-	print dol_get_fiche_head($head, 'step2', $langs->trans("NewImport"), -2);
+	print dol_get_fiche_head($head, 'step2', '', -2);
 
 	print '<div class="underbanner clearboth"></div>';
 	print '<div class="fichecenter">';
@@ -540,7 +539,7 @@ if ($step == 3 && $datatoimport)
 
 	$head = import_prepare_head($param, 3);
 
-	print dol_get_fiche_head($head, 'step3', $langs->trans("NewImport"), -2);
+	print dol_get_fiche_head($head, 'step3', '', -2);
 
 	/*
 	 * Confirm delete file
@@ -835,7 +834,7 @@ if ($step == 4 && $datatoimport)
 
 	$head = import_prepare_head($param, 4);
 
-	print dol_get_fiche_head($head, 'step4', $langs->trans("NewImport"), -2);
+	print dol_get_fiche_head($head, 'step4', '', -2);
 
 	print '<div class="underbanner clearboth"></div>';
 	print '<div class="fichecenter">';
@@ -1306,7 +1305,7 @@ if ($step == 5 && $datatoimport)
 	print '<input type="hidden" name="step" value="5">'; // step 5
 	print '<input type="hidden" name="action" value="launchsimu">'; // step 5
 
-	print dol_get_fiche_head($head, 'step5', $langs->trans("NewImport"), -2);
+	print dol_get_fiche_head($head, 'step5', '', -2);
 
 	print '<div class="underbanner clearboth"></div>';
 	print '<div class="fichecenter">';
@@ -1730,7 +1729,7 @@ if ($step == 6 && $datatoimport)
 
 	$head = import_prepare_head($param, 6);
 
-	print dol_get_fiche_head($head, 'step6', $langs->trans("NewImport"), -1);
+	print dol_get_fiche_head($head, 'step6', '', -1);
 
 	print '<div class="underbanner clearboth"></div>';
 	print '<div class="fichecenter">';

From 1f29d4f5e8c47144db678abd0bf835e513f3964a Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Wed, 16 Dec 2020 16:25:30 +0100
Subject: [PATCH 475/888] Add missing hooks

---
 htdocs/projet/element.php | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index c513123c9bf..975b8fcdbed 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -652,9 +652,29 @@ print '<td class="right" width="100">'.$langs->trans("AmountTTC").'</td>';
 print '</tr>';
 
 $total_revenue_ht = 0;
+$balance_ht = 0;
+$balance_ttc = 0;
 
 foreach ($listofreferent as $key => $value)
 {
+	$parameters = array(
+		'total_revenue_ht' =>& $total_revenue_ht,
+		'balance_ht' =>& $balance_ht,
+		'balance_ttc' =>& $balance_ttc,
+		'key' => $key,
+		'value' =>& $value,
+		'dates' => $dates,
+		'datee' => $datee
+	);
+	$reshook = $hookmanager->executeHooks('printOverviewProfit', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	if ($reshook < 0) {
+		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	}
+	elseif ($reshook > 0){
+		print $hookmanager->resPrint;
+		continue;
+	}
+
 	$name = $langs->trans($value['name']);
 	$title = $value['title'];
 	$classname = $value['class'];
@@ -849,6 +869,22 @@ print '<br>';
 // Detail
 foreach ($listofreferent as $key => $value)
 {
+
+	$parameters = array(
+		'key' => $key,
+		'value' =>& $value,
+		'dates' => $dates,
+		'datee' => $datee
+	);
+	$reshook = $hookmanager->executeHooks('printOverviewDetail', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	if ($reshook < 0) {
+		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	}
+	elseif ($reshook > 0){
+		print $hookmanager->resPrint;
+		continue;
+	}
+
 	$title = $value['title'];
 	$classname = $value['class'];
 	$tablename = $value['table'];

From e61b71bc93801a8771d4c0eead1f37838c201fa1 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 16 Dec 2020 15:40:38 +0000
Subject: [PATCH 476/888] Fixing style errors.

---
 htdocs/projet/element.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 975b8fcdbed..b334688558b 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -869,7 +869,6 @@ print '<br>';
 // Detail
 foreach ($listofreferent as $key => $value)
 {
-
 	$parameters = array(
 		'key' => $key,
 		'value' =>& $value,

From e4c853b162002338a4076a354f030301ff2288a3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Dec 2020 17:00:14 +0100
Subject: [PATCH 477/888] Enable module product batch

---
 htdocs/install/upgrade2.php | 68 +++++++++++++++----------------------
 1 file changed, 28 insertions(+), 40 deletions(-)

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index babb47de91a..ba24cf3a496 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -4295,14 +4295,12 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 
 	dolibarr_install_syslog("upgrade2::migrate_reload_modules force=".$force.", listofmodule=".join(',', array_keys($listofmodule)));
 
-	foreach ($listofmodule as $moduletoreload => $reloadmode)	// reloadmodule can be 'noboxes', 'newboxdefonly', 'forceactivate'
-	{
+	foreach ($listofmodule as $moduletoreload => $reloadmode) {	// reloadmodule can be 'noboxes', 'newboxdefonly', 'forceactivate'
 		if (empty($moduletoreload) || (empty($conf->global->$moduletoreload) && !$force)) continue; // Discard reload if module not enabled
 
 		$mod = null;
 
-		if ($moduletoreload == 'MAIN_MODULE_AGENDA')
-		{
+		if ($moduletoreload == 'MAIN_MODULE_AGENDA') {
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Agenda module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modAgenda.class.php';
 			if ($res) {
@@ -4310,8 +4308,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		} elseif ($moduletoreload == 'MAIN_MODULE_API')
-		{
+		} elseif ($moduletoreload == 'MAIN_MODULE_API') {
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Rest API module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modApi.class.php';
 			if ($res) {
@@ -4319,8 +4316,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		} elseif ($moduletoreload == 'MAIN_MODULE_BARCODE')
-		{
+		} elseif ($moduletoreload == 'MAIN_MODULE_BARCODE') {
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Barcode module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modBarcode.class.php';
 			if ($res) {
@@ -4328,8 +4324,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		} elseif ($moduletoreload == 'MAIN_MODULE_CRON')
-		{
+		} elseif ($moduletoreload == 'MAIN_MODULE_CRON') {
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Cron module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modCron.class.php';
 			if ($res) {
@@ -4337,8 +4332,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		} elseif ($moduletoreload == 'MAIN_MODULE_SOCIETE')
-		{
+		} elseif ($moduletoreload == 'MAIN_MODULE_SOCIETE') {
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Societe module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modSociete.class.php';
 			if ($res) {
@@ -4346,8 +4340,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		} elseif ($moduletoreload == 'MAIN_MODULE_PRODUIT')    // Permission has changed into 2.7
-		{
+		} elseif ($moduletoreload == 'MAIN_MODULE_PRODUIT') {    // Permission has changed into 2.7
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Produit module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modProduct.class.php';
 			if ($res) {
@@ -4355,8 +4348,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		} elseif ($moduletoreload == 'MAIN_MODULE_SERVICE')    // Permission has changed into 2.7
-		{
+		} elseif ($moduletoreload == 'MAIN_MODULE_SERVICE') {   // Permission has changed into 2.7
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Service module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modService.class.php';
 			if ($res) {
@@ -4364,8 +4356,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		} elseif ($moduletoreload == 'MAIN_MODULE_COMMANDE')   // Permission has changed into 2.9
-		{
+		} elseif ($moduletoreload == 'MAIN_MODULE_COMMANDE') {   // Permission has changed into 2.9
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Commande module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modCommande.class.php';
 			if ($res) {
@@ -4373,8 +4364,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		} elseif ($moduletoreload == 'MAIN_MODULE_FACTURE')    // Permission has changed into 2.9
-		{
+		} elseif ($moduletoreload == 'MAIN_MODULE_FACTURE') {    // Permission has changed into 2.9
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Facture module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modFacture.class.php';
 			if ($res) {
@@ -4382,8 +4372,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		} elseif ($moduletoreload == 'MAIN_MODULE_FOURNISSEUR')    // Permission has changed into 2.9
-		{
+		} elseif ($moduletoreload == 'MAIN_MODULE_FOURNISSEUR') {    // Permission has changed into 2.9
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Fournisseur module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php';
 			if ($res) {
@@ -4391,8 +4380,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		} elseif ($moduletoreload == 'MAIN_MODULE_HOLIDAY')    // Permission and tabs has changed into 3.8
-		{
+		} elseif ($moduletoreload == 'MAIN_MODULE_HOLIDAY') {   // Permission and tabs has changed into 3.8
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Leave Request module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modHoliday.class.php';
 			if ($res) {
@@ -4400,8 +4388,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		} elseif ($moduletoreload == 'MAIN_MODULE_DEPLACEMENT')    // Permission has changed into 3.0
-		{
+		} elseif ($moduletoreload == 'MAIN_MODULE_DEPLACEMENT') {   // Permission has changed into 3.0
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Deplacement module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modDeplacement.class.php';
 			if ($res) {
@@ -4409,8 +4396,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		} elseif ($moduletoreload == 'MAIN_MODULE_EXPENSEREPORT')
-		{
+		} elseif ($moduletoreload == 'MAIN_MODULE_EXPENSEREPORT') {
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Expense Report module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modExpenseReport.class.php';
 			if ($res) {
@@ -4418,8 +4404,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		} elseif ($moduletoreload == 'MAIN_MODULE_DON')    // Permission has changed into 3.0
-		{
+		} elseif ($moduletoreload == 'MAIN_MODULE_DON') {   // Permission has changed into 3.0
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Don module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modDon.class.php';
 			if ($res) {
@@ -4427,8 +4412,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		} elseif ($moduletoreload == 'MAIN_MODULE_ECM')    // Permission has changed into 3.0 and 3.1
-		{
+		} elseif ($moduletoreload == 'MAIN_MODULE_ECM') {    // Permission has changed into 3.0 and 3.1
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate ECM module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modECM.class.php';
 			if ($res) {
@@ -4436,8 +4420,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes'); // We need to remove because a permission id has been removed
 				$mod->init($reloadmode);
 			}
-		} elseif ($moduletoreload == 'MAIN_MODULE_PAYBOX')    // Permission has changed into 3.0
-		{
+		} elseif ($moduletoreload == 'MAIN_MODULE_PAYBOX') {    // Permission has changed into 3.0
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Paybox module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modPaybox.class.php';
 			if ($res) {
@@ -4445,8 +4428,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes'); // We need to remove because id of module has changed
 				$mod->init($reloadmode);
 			}
-		} elseif ($moduletoreload == 'MAIN_MODULE_SUPPLIERPROPOSAL')		// Module after 3.5
-		{
+		} elseif ($moduletoreload == 'MAIN_MODULE_SUPPLIERPROPOSAL') {		// Module after 3.5
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Supplier Proposal module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modSupplierProposal.class.php';
 			if ($res) {
@@ -4454,8 +4436,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes'); // We need to remove because id of module has changed
 				$mod->init($reloadmode);
 			}
-		} elseif ($moduletoreload == 'MAIN_MODULE_OPENSURVEY')    // Permission has changed into 3.0
-		{
+		} elseif ($moduletoreload == 'MAIN_MODULE_OPENSURVEY') {   // Permission has changed into 3.0
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Opensurvey module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modOpenSurvey.class.php';
 			if ($res) {
@@ -4463,8 +4444,15 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes'); // We need to remove because menu entries has changed
 				$mod->init($reloadmode);
 			}
-		} elseif ($moduletoreload == 'MAIN_MODULE_TAKEPOS')    // Permission has changed into 10.0
-		{
+		} elseif ($moduletoreload == 'MAIN_MODULE_PRODUCTBATCH') {   // Permission has changed into 10.0
+			dolibarr_install_syslog("upgrade2::migrate_reload_modules ProductBatch module");
+			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modProductBatch.class.php';
+			if ($res) {
+				$mod = new modProductBatch($db);
+				$mod->remove('noboxes'); // We need to remove because menu entries has changed
+				$mod->init($reloadmode);
+			}
+		} elseif ($moduletoreload == 'MAIN_MODULE_TAKEPOS') {   // Permission has changed into 10.0
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Takepos module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modTakePos.class.php';
 			if ($res) {

From ec8fd130f4e7d0ce0d8bff990e5de3176c1283c8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Dec 2020 17:33:40 +0100
Subject: [PATCH 478/888] Update doc

---
 nightwatch.conf.js        |  2 +-
 package.json              |  2 +-
 test/acceptance/README.md | 32 +++++++++++++++++++++-----------
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/nightwatch.conf.js b/nightwatch.conf.js
index e72febea918..38178aadf92 100644
--- a/nightwatch.conf.js
+++ b/nightwatch.conf.js
@@ -1,5 +1,5 @@
 const admin_username = process.env.ADMIN_USERNAME || 'admin';
-const admin_password = process.env.ADMIN_PASSWORD || 'password';
+const admin_password = process.env.ADMIN_PASSWORD || 'admin';
 const launch_url = process.env.LAUNCH_URL || 'http://localhost/dolibarr/htdocs/';
 module.exports = {
 	page_objects_path : './test/acceptance/pageObjects/', // jshint ignore:line
diff --git a/package.json b/package.json
index 56f8ced1d4b..02c9b2abcb9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "devDependencies": {
     "cucumber": "^6.0.5",
-    "nightwatch": "^1.4.3",
+    "nightwatch": "^1.5.1",
     "nightwatch-api": "^3.0.1"
   },
   "scripts": {
diff --git a/test/acceptance/README.md b/test/acceptance/README.md
index ada096c0b69..141370208d0 100644
--- a/test/acceptance/README.md
+++ b/test/acceptance/README.md
@@ -2,14 +2,21 @@
 
 ### Run Selenium
 
-Selenium has been used for automating the browser.
+Create a working directory
 
+  `mkdir selenium; cd selenium;`
+  
+Selenium has been used for automating the browser.
+  
 [Download](https://www.selenium.dev/downloads/) the `latest stable version` of the `Selenium standalone server JAR file`.
 
+  `wget https://selenium-release.storage.googleapis.com/3.141/selenium-server-standalone-3.141.59.jar`
+  
 Also [download](https://chromedriver.chromium.org/downloads) the `latest stable version` of `Chrome Driver`.
 
 Once you have downloaded Chrome Driver, you need to unzip it by running the following command:
 
+  `wget https://chromedriver.storage.googleapis.com/86.0.4240.22/chromedriver_linux64.zip`
   `unzip chromedriver_linux64.zip`
     
 Once you have unzipped it, you need to move the *chromedriver* file (shared library) and place it inside the same folder where you have placed the Selenium standalone server file.
@@ -18,10 +25,9 @@ Now we can run selenium by two ways:
 
 * Start selenium server with a command which usually looks like:
 
-   `java -jar selenium-server-standalone-<selenium version>.jar -port 4444`
+   `java -jar selenium-server-standalone-*.jar -port 4444`
 
-
-* Run selenium in docker with
+* Or run selenium in docker with
 
    `docker run -d -p 4444:4444 -p 5900:5900 -v /dev/shm:/dev/shm selenium/standalone-chrome-debug`
    
@@ -34,16 +40,20 @@ Now we can run selenium by two ways:
 * Install *yarn*. For example on Ubuntu:
 
    ```
-   apt install yarnpkg
+   sudo apt install yarnpkg
    ```
 
-* Install *nodejs* libraries. For example on Ubuntu:
+* Install *npm* tools to manage *nodejs* libraries. For example on Ubuntu:
 
    ```
    apt install npm
-   npm install cucumber
-   npm install nightwatch-api
-   npm install nightwatch
+   ```
+   
+* Go into the git local repository of the Dolibarr version to test.
+
+   ```
+   cd ~/git/dolibarr
+   npm install cucumber nightwatch-api nightwatch
    npm update
    ```
 
@@ -61,9 +71,9 @@ Now we can run selenium by two ways:
 
   `LAUNCH_URL='<launch_url>'; ADMIN_USERNAME='<admin_username>'; ADMIN_PASSWORD='<admin_password>';`
   
-  `yarn run test:e2e test/acceptance/features/<feature_file>`
+  `yarnpkg run test:e2e test/acceptance/features/<feature_file>`
    
-  For example: `yarn run test:e2e test/acceptance/features/WebUI/addUsers.feature`
+  For example: `yarnpkg run test:e2e test/acceptance/features/WebUI/addUsers.feature`
  
   Note: The script to run all the acceptance tests is specified in `scripts` object of `package.json` file inside the project's root directory as :
  

From 21c2fae00cc37b446dd156c52272d29b7eee1ecb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Dec 2020 17:41:18 +0100
Subject: [PATCH 479/888] Fix setup of antivirus

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

diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php
index 2669e741c6e..ea5ea2983fd 100644
--- a/htdocs/admin/security_file.php
+++ b/htdocs/admin/security_file.php
@@ -153,7 +153,7 @@ if (ini_get('safe_mode') && !empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
 		dol_syslog("safe_mode is on, basedir is ".$basedir.", safe_mode_exec_dir is ".ini_get('safe_mode_exec_dir'), LOG_WARNING);
 	}
 }
-print '<input type="text" '.(defined('MAIN_ANTIVIRUS_COMMAND') ? 'disabled' : '').' name="MAIN_ANTIVIRUS_COMMAND" class="minwidth500imp" value="'.(!empty($conf->global->MAIN_ANTIVIRUS_COMMAND) ?dol_escape_htmltag($conf->global->MAIN_ANTIVIRUS_COMMAND) : '').'">';
+print '<input type="text" '.(defined('MAIN_ANTIVIRUS_COMMAND') ? 'disabled ' : '').'name="MAIN_ANTIVIRUS_COMMAND" class="minwidth500imp" value="'.(!empty($conf->global->MAIN_ANTIVIRUS_COMMAND) ?dol_escape_htmltag($conf->global->MAIN_ANTIVIRUS_COMMAND) : '').'">';
 if (defined('MAIN_ANTIVIRUS_COMMAND')) {
 	print '<br><span class="opacitymedium">'.$langs->trans("ValueIsForcedBySystem").'</span>';
 }
@@ -167,7 +167,7 @@ print '<td colspan="2">'.$langs->trans("AntiVirusParam").'<br>';
 print '<span class="opacitymedium">'.$langs->trans("AntiVirusParamExample").'</span>';
 print '</td>';
 print '<td>';
-print '<input type="text" name="MAIN_ANTIVIRUS_PARAM" class="minwidth500imp" value="'.(!empty($conf->global->MAIN_ANTIVIRUS_PARAM) ?dol_escape_htmltag($conf->global->MAIN_ANTIVIRUS_PARAM) : '').'">';
+print '<input type="text" '.(defined('MAIN_ANTIVIRUS_PARAM') ? 'disabled ' : '').'name="MAIN_ANTIVIRUS_PARAM" class="minwidth500imp" value="'.(!empty($conf->global->MAIN_ANTIVIRUS_PARAM) ?dol_escape_htmltag($conf->global->MAIN_ANTIVIRUS_PARAM) : '').'">';
 if (defined('MAIN_ANTIVIRUS_PARAM')) {
 	print '<br><span class="opacitymedium">'.$langs->trans("ValueIsForcedBySystem").'</span>';
 }

From 82710e54a87a86aad87367c5fbdc2c647d02fe58 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Dec 2020 18:10:40 +0100
Subject: [PATCH 480/888] Fix get custom odt templates

---
 htdocs/core/lib/files.lib.php                             | 5 +++++
 htdocs/core/lib/functions.lib.php                         | 2 +-
 .../commande/doc/doc_generic_order_odt.modules.php        | 8 ++++++--
 .../facture/doc/doc_generic_invoice_odt.modules.php       | 5 +++--
 .../propale/doc/doc_generic_proposal_odt.modules.php      | 6 ++++--
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 22545b78cf8..c43a7eb890c 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2260,6 +2260,11 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$accessallowed = ($user->admin && basename($original_file) == $original_file && preg_match('/^dolibarr.*\.log$/', basename($original_file)));
 		$original_file = $dolibarr_main_data_root.'/'.$original_file;
 	} // Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log
+	elseif ($modulepart == 'doctemplates' && !empty($dolibarr_main_data_root))
+	{
+		$accessallowed = $user->admin;
+		$original_file = $dolibarr_main_data_root.'/doctemplates/'.$original_file;
+	} // Wrapping for *.zip files, like when used with url http://.../document.php?modulepart=packages&file=module_myfile.zip
 	elseif ($modulepart == 'doctemplateswebsite' && !empty($dolibarr_main_data_root))
 	{
 		$accessallowed = ($fuser->rights->website->write && preg_match('/\.jpg$/i', basename($original_file)));
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 998cddea0f9..04e096c4e3f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3210,7 +3210,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
 				'accountancy', 'account', 'accountline', 'action', 'add', 'address', 'bank_account', 'barcode', 'bank', 'bill', 'billa', 'billr', 'billd', 'bookmark', 'bom', 'building',
 				'cash-register', 'category', 'check', 'clock', 'close_title', 'company', 'contact', 'contract', 'cron', 'cubes',
-				'delete', 'dolly', 'dollyrevert', 'donation', 'edit', 'ellipsis-h', 'email', 'eraser', 'external-link-alt', 'external-link-square-alt',
+				'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'edit', 'ellipsis-h', 'email', 'eraser', 'external-link-alt', 'external-link-square-alt',
 				'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'globe', 'globe-americas', 'grip', 'grip_title', 'group',
 				'help', 'holiday',
 				'intervention', 'label', 'language', 'list', 'listlight', 'lot',
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index 3165760b541..2b71f6896f5 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -169,10 +169,14 @@ class doc_generic_order_odt extends ModelePDFCommandes
 
 		if ($nbofiles)
 		{
-   			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
+   			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
    			foreach ($listoffiles as $file)
    			{
-				$texte .= $file['name'].'<br>';
+   				// Show list of found files
+   				foreach ($listoffiles as $file)
+   				{
+   					$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=orders/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+   				}
    			}
    			$texte .= '</div>';
 		}
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index f2f4ee31823..08c69fed93f 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -168,10 +168,11 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 		}
 		if ($nbofiles)
 		{
-   			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
+   			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+   			// Show list of found files
    			foreach ($listoffiles as $file)
    			{
-				$texte .= $file['name'].'<br>';
+   				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=invoices/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
    			}
    			$texte .= '</div>';
 		}
diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index b27e94b46b7..7ca3ef79546 100644
--- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
+++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
@@ -172,13 +172,15 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 
 		if ($nbofiles)
 		{
-   			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
+   			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+   			// Show list of found files
    			foreach ($listoffiles as $file)
    			{
-				$texte .= $file['name'].'<br>';
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=proposals/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
    			}
    			$texte .= '</div>';
 
+   			// Set default template for different status of proposal
 			if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
 			{
 				// Model for creation

From 9c759e91f034ee248a6fe4ea0ef07c88e75d70c3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Dec 2020 19:01:26 +0100
Subject: [PATCH 481/888] Fix debug management of docs in ticket module

---
 htdocs/admin/commande.php                     |  17 +-
 htdocs/admin/ticket.php                       | 193 +++++++-
 .../bom/doc/doc_generic_bom_odt.modules.php   |   8 +-
 .../doc/doc_generic_order_odt.modules.php     |  10 +-
 .../doc/doc_generic_shipment_odt.modules.php  |   8 +-
 .../doc/doc_generic_invoice_odt.modules.php   |   3 +-
 .../doc/doc_generic_member_odt.class.php      |   6 +-
 htdocs/core/modules/modTicket.class.php       |  28 +-
 .../mrp/doc/doc_generic_mo_odt.modules.php    |   8 +-
 .../doc/doc_generic_project_odt.modules.php   |   8 +-
 .../task/doc/doc_generic_task_odt.modules.php |   8 +-
 .../doc/doc_generic_proposal_odt.modules.php  |   3 +-
 .../doc/doc_generic_reception_odt.modules.php |  10 +-
 .../societe/doc/doc_generic_odt.modules.php   |   8 +-
 .../doc/doc_generic_stock_odt.modules.php     |   8 +-
 ...doc_generic_supplier_order_odt.modules.php |   8 +-
 ..._generic_supplier_proposal_odt.modules.php |   8 +-
 .../doc/doc_generic_ticket_odt.modules.php    | 429 ++++++++++++++++++
 htdocs/core/modules/ticket/doc/index.html     |   0
 htdocs/core/modules/ticket/modules_ticket.php |   4 +-
 .../user/doc/doc_generic_user_odt.modules.php |   5 +-
 .../doctemplates/tickets/template_ticket.odt  | Bin 0 -> 19240 bytes
 22 files changed, 710 insertions(+), 70 deletions(-)
 create mode 100644 htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
 create mode 100644 htdocs/core/modules/ticket/doc/index.html
 create mode 100644 htdocs/install/doctemplates/tickets/template_ticket.odt

diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 25a220e8e2d..cde0253f99a 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -111,11 +111,9 @@ if ($action == 'updateMask')
 }
 
 // Activate a model
-elseif ($action == 'set')
-{
+elseif ($action == 'set') {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-} elseif ($action == 'del')
-{
+} elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
@@ -124,8 +122,7 @@ elseif ($action == 'set')
 }
 
 // Set default model
-elseif ($action == 'setdoc')
-{
+elseif ($action == 'setdoc') {
 	if (dolibarr_set_const($db, "COMMANDE_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
 	{
 		// The constant that was read before the new set
@@ -139,8 +136,7 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-} elseif ($action == 'setmod')
-{
+} elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated
 	// by calling method canBeActivated
 
@@ -254,6 +250,7 @@ print dol_get_fiche_head($head, 'general', $langs->trans("Orders"), -1, 'order')
 
 print load_fiche_titre($langs->trans("OrdersNumberingModules"), '', '');
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td>';
@@ -346,7 +343,7 @@ foreach ($dirmodels as $reldir)
 		}
 	}
 }
-print "</table><br>\n";
+print "</table></div><br>\n";
 
 
 /*
@@ -377,6 +374,7 @@ if ($resql)
 }
 
 
+print '<div class="div-table-responsive-no-min">';
 print "<table class=\"noborder\" width=\"100%\">\n";
 print "<tr class=\"liste_titre\">\n";
 print '<td>'.$langs->trans("Name").'</td>';
@@ -501,6 +499,7 @@ foreach ($dirmodels as $reldir)
 }
 
 print '</table>';
+print '</div>';
 
 
 /*
diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index c1546f1da2c..f7e72f53e7e 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -44,10 +44,13 @@ $type = 'ticket';
 
 $error = 0;
 
+
 /*
  * Actions
  */
 
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if ($action == 'updateMask') {
 	$maskconstticket = GETPOST('maskconstticket', 'alpha');
 	$maskticket = GETPOST('maskticket', 'alpha');
@@ -66,7 +69,37 @@ if ($action == 'updateMask') {
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} elseif ($action == 'setmod') {
+}
+
+// Activate a model
+elseif ($action == 'set') {
+	$ret = addDocumentModel($value, $type, $label, $scandir);
+} elseif ($action == 'del') {
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		if ($conf->global->TICKET_ADDON_PDF == "$value") dolibarr_del_const($db, 'TICKET_ADDON_PDF', $conf->entity);
+	}
+}
+
+// Set default model
+elseif ($action == 'setdoc') {
+	if (dolibarr_set_const($db, "TICKET_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
+	{
+		// The constant that was read before the new set
+		// We therefore requires a variable to have a coherent view
+		$conf->global->TICKET_ADDON_PDF = $value;
+	}
+
+	// On active le modele
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		$ret = addDocumentModel($value, $type, $label, $scandir);
+	}
+}
+
+elseif ($action == 'setmod') {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
@@ -190,7 +223,7 @@ print dol_get_fiche_end();
 
 
 /*
- * Projects Numbering model
+ * Tickets numbering model
  */
 
 print load_fiche_titre($langs->trans("TicketNumberingModules"), '', '');
@@ -291,6 +324,162 @@ print '</table>';
 print '</div>';
 print '<br>';
 
+
+
+/*
+ * Document templates generators
+ */
+
+print load_fiche_titre($langs->trans("TicketsModelModule"), '', '');
+
+// Load array def with activated templates
+$def = array();
+$sql = "SELECT nom";
+$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
+$sql .= " WHERE type = '".$db->escape($type)."'";
+$sql .= " AND entity = ".$conf->entity;
+$resql = $db->query($sql);
+if ($resql)
+{
+	$i = 0;
+	$num_rows = $db->num_rows($resql);
+	while ($i < $num_rows)
+	{
+		$array = $db->fetch_array($resql);
+		array_push($def, $array[0]);
+		$i++;
+	}
+} else {
+	dol_print_error($db);
+}
+
+
+print '<div class="div-table-responsive-no-min">';
+print "<table class=\"noborder\" width=\"100%\">\n";
+print "<tr class=\"liste_titre\">\n";
+print '<td>'.$langs->trans("Name").'</td>';
+print '<td>'.$langs->trans("Description").'</td>';
+print '<td class="center" width="60">'.$langs->trans("Status")."</td>\n";
+print '<td class="center" width="60">'.$langs->trans("Default")."</td>\n";
+print '<td class="center" width="38">'.$langs->trans("ShortInfo").'</td>';
+print '<td class="center" width="38">'.$langs->trans("Preview").'</td>';
+print "</tr>\n";
+
+clearstatcache();
+
+foreach ($dirmodels as $reldir)
+{
+	foreach (array('', '/doc') as $valdir)
+	{
+		$realpath = $reldir."core/modules/ticket".$valdir;
+		$dir = dol_buildpath($realpath);
+
+		if (is_dir($dir))
+		{
+			$handle = opendir($dir);
+			if (is_resource($handle))
+			{
+				while (($file = readdir($handle)) !== false)
+				{
+					$filelist[] = $file;
+				}
+				closedir($handle);
+				arsort($filelist);
+
+				foreach ($filelist as $file)
+				{
+					if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
+					{
+						if (file_exists($dir.'/'.$file))
+						{
+							$name = substr($file, 4, dol_strlen($file) - 16);
+							$classname = substr($file, 0, dol_strlen($file) - 12);
+
+							require_once $dir.'/'.$file;
+							$module = new $classname($db);
+
+							$modulequalified = 1;
+							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
+							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+
+							if ($modulequalified)
+							{
+								print '<tr class="oddeven"><td width="100">';
+								print (empty($module->name) ? $name : $module->name);
+								print "</td><td>\n";
+								if (method_exists($module, 'info')) print $module->info($langs);
+								else print $module->description;
+								print '</td>';
+
+								// Active
+								if (in_array($name, $def))
+								{
+									print '<td class="center">'."\n";
+									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'">';
+									print img_picto($langs->trans("Enabled"), 'switch_on');
+									print '</a>';
+									print '</td>';
+								} else {
+									print '<td class="center">'."\n";
+									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print "</td>";
+								}
+
+								// Default
+								print '<td class="center">';
+								if ($conf->global->TICKET_ADDON_PDF == $name)
+								{
+									print img_picto($langs->trans("Default"), 'on');
+								} else {
+									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+								}
+								print '</td>';
+
+								// Info
+								$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+								$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+								if ($module->type == 'pdf')
+								{
+									$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+								}
+								$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
+
+								$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+								$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+								$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
+								//$htmltooltip .= '<br>'.$langs->trans("Discounts").': '.yn($module->option_escompte,1,1);
+								//$htmltooltip .= '<br>'.$langs->trans("CreditNote").': '.yn($module->option_credit_note,1,1);
+								//$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
+
+
+								print '<td class="center">';
+								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print '</td>';
+
+								// Preview
+								print '<td class="center">';
+								if ($module->type == 'pdf')
+								{
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
+								} else {
+									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+								}
+								print '</td>';
+
+								print "</tr>\n";
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+print '</table>';
+print '</div><br>';
+
+
 if (!$conf->use_javascript_ajax) {
 	print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" enctype="multipart/form-data" >';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
diff --git a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
index b5e1fc80a1d..18f2d405acf 100644
--- a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
+++ b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
@@ -162,10 +162,10 @@ class doc_generic_bom_odt extends ModelePDFBom
 
 		if ($nbofiles)
 		{
-   			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
-   			foreach ($listoffiles as $file)
-   			{
-				$texte .= $file['name'].'<br>';
+   			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+   			// Show list of found files
+   			foreach ($listoffiles as $file) {
+   				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=boms&file=invoices/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
    			}
    			$texte .= '</div>';
 		}
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index 2b71f6896f5..45ea3dc6816 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -170,13 +170,9 @@ class doc_generic_order_odt extends ModelePDFCommandes
 		if ($nbofiles)
 		{
    			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
-   			foreach ($listoffiles as $file)
-   			{
-   				// Show list of found files
-   				foreach ($listoffiles as $file)
-   				{
-   					$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=orders/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
-   				}
+			// Show list of found files
+			foreach ($listoffiles as $file)    				{
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=orders/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
    			}
    			$texte .= '</div>';
 		}
diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
index b5ce775bcdc..ecfe7268564 100644
--- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
+++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
@@ -169,10 +169,10 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 		}
 		if ($nbofiles)
 		{
-   			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
-   			foreach ($listoffiles as $file)
-   			{
-				$texte .= $file['name'].'<br>';
+   			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+   			// Show list of found files
+   			foreach ($listoffiles as $file) {
+   				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=shipments/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
    			}
    			$texte .= '</div>';
 		}
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index 08c69fed93f..792587f6205 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -170,8 +170,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 		{
    			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
    			// Show list of found files
-   			foreach ($listoffiles as $file)
-   			{
+   			foreach ($listoffiles as $file) {
    				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=invoices/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
    			}
    			$texte .= '</div>';
diff --git a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
index be91acd7a3f..e0fccd309ab 100644
--- a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
+++ b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
@@ -156,9 +156,11 @@ class doc_generic_member_odt extends ModelePDFMember
 		if (count($listofdir))
 		{
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
-			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
+
+			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+			// Show list of found files
 			foreach ($listoffiles as $file) {
-				$texte .= $file['name'].'<br>';
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=members/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
 			}
 			$texte .= '</div>';
 		}
diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index def2a7f7e69..448d1eb694b 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -105,9 +105,11 @@ class modTicket extends DolibarrModules
 		// Example:
 		$this->const = array(
 			1 => array('TICKET_ENABLE_PUBLIC_INTERFACE', 'chaine', '0', 'Enable ticket public interface', 0),
-			2 => array('TICKET_ADDON', 'chaine', 'mod_ticket_simple', 'Ticket ref module', 0)
+			2 => array('TICKET_ADDON', 'chaine', 'mod_ticket_simple', 'Ticket ref module', 0),
+			3 => array('TICKET_ADDON_PDF_ODT_PATH', 'chaine', 'DOL_DATA_ROOT/doctemplates/tickets', 'Ticket templates ODT/ODS directory for templates', 0)
 		);
 
+
 		$this->tabs = array(
 			'thirdparty:+ticket:Tickets:@ticket:$user->rights->ticket->read:/ticket/list.php?socid=__ID__',
 			'project:+ticket:Tickets:@ticket:$user->rights->ticket->read:/ticket/list.php?projectid=__ID__',
@@ -280,12 +282,36 @@ class modTicket extends DolibarrModules
 	 */
 	public function init($options = '')
 	{
+		global $conf, $langs;
+
+		// Permissions
+		$this->remove($options);
+
+		//ODT template
+		$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/tickets/template_ticket.odt';
+		$dirodt = DOL_DATA_ROOT.'/doctemplates/tickets';
+		$dest = $dirodt.'/template_order.odt';
+
+		if (file_exists($src) && !file_exists($dest))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			dol_mkdir($dirodt);
+			$result = dol_copy($src, $dest, 0, 0);
+			if ($result < 0)
+			{
+				$langs->load("errors");
+				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
+				return 0;
+			}
+		}
 
 		$sql = array(
 			array("sql" => "insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (110120, 'ticket',  'internal', 'SUPPORTTEC', 'Utilisateur assigné au ticket', 1);", "ignoreerror" => 1),
 			array("sql" => "insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (110121, 'ticket',  'internal', 'CONTRIBUTOR', 'Intervenant', 1);", "ignoreerror" => 1),
 			array("sql" => "insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (110122, 'ticket',  'external', 'SUPPORTCLI', 'Contact client suivi incident', 1);", "ignoreerror" => 1),
 			array("sql" => "insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (110123, 'ticket',  'external', 'CONTRIBUTOR', 'Intervenant', 1);", "ignoreerror" => 1),
+			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'TICKET_ADDON_PDF_ODT_PATH' AND type = 'ticket' AND entity = ".$conf->entity,
+			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('TICKET_ADDON_PDF_ODT_PATH','ticket',".$conf->entity.")"
 		);
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
index eeaeb2c8e54..06e52390451 100644
--- a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
+++ b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
@@ -169,10 +169,10 @@ class doc_generic_mo_odt extends ModelePDFMo
 
 		if ($nbofiles)
 		{
-   			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
-   			foreach ($listoffiles as $file)
-   			{
-				$texte .= $file['name'].'<br>';
+   			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+   			// Show list of found files
+   			foreach ($listoffiles as $file) {
+   				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=mrps&file=invoices/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
    			}
    			$texte .= '</div>';
 		}
diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index c6e07911ff7..bfd35e70095 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -440,10 +440,10 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 		if ($nbofiles)
 		{
-   			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
-   			foreach ($listoffiles as $file)
-   			{
-				$texte .= $file['name'].'<br>';
+   			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+   			// Show list of found files
+   			foreach ($listoffiles as $file) {
+   				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=projects/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
    			}
    			$texte .= '</div>';
 		}
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index edd777901ec..4ff95328029 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -409,10 +409,10 @@ class doc_generic_task_odt extends ModelePDFTask
 
 		if ($nbofiles)
 		{
-   			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
-   			foreach ($listoffiles as $file)
-   			{
-				$texte .= $file['name'].'<br>';
+   			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+   			// Show list of found files
+   			foreach ($listoffiles as $file) {
+   				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=tasks/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
    			}
    			$texte .= '</div>';
 		}
diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index 7ca3ef79546..7b2ac19a016 100644
--- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
+++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
@@ -174,8 +174,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 		{
    			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
    			// Show list of found files
-   			foreach ($listoffiles as $file)
-   			{
+   			foreach ($listoffiles as $file) {
 				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=proposals/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
    			}
    			$texte .= '</div>';
diff --git a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
index 1105a5f6d4c..22ef687d13b 100644
--- a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
+++ b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
@@ -163,11 +163,11 @@ class doc_generic_reception_odt extends ModelePdfReception
 		}
 		if ($nbofiles)
 		{
-   			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
-   			foreach ($listoffiles as $file)
-   			{
-				$texte .= $file['name'].'<br>';
-   			}
+			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+			// Show list of found files
+			foreach ($listoffiles as $file) {
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=receptions/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+			}
    			$texte .= '</div>';
 		}
 
diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
index 66064cc4946..7b6ec019683 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -152,10 +152,10 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 
 		if ($nbofiles)
 		{
-   			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
-   			foreach ($listoffiles as $file)
-   			{
-				$texte .= $file['name'].'<br>';
+   			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+   			// Show list of found files
+   			foreach ($listoffiles as $file) {
+   				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=thirdparties/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
    			}
    			$texte .= '</div>';
 		}
diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
index 1b3053aaaaf..c0614bd811e 100644
--- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
+++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
@@ -166,10 +166,10 @@ class doc_generic_stock_odt extends ModelePDFStock
 
 		if ($nbofiles)
 		{
-			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
-			foreach ($listoffiles as $file)
-			{
-				$texte .= $file['name'].'<br>';
+			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+			// Show list of found files
+			foreach ($listoffiles as $file) {
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=stocks/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
 			}
 			$texte .= '</div>';
 		}
diff --git a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
index 18c3a9a3574..1b58934b611 100644
--- a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
@@ -170,10 +170,10 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 
 		if ($nbofiles)
 		{
-   			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
-   			foreach ($listoffiles as $file)
-   			{
-				$texte .= $file['name'].'<br>';
+   			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+   			// Show list of found files
+   			foreach ($listoffiles as $file) {
+   				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=supplier_orders/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
    			}
    			$texte .= '</div>';
 		}
diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
index 918f5fd9215..8c42681e986 100644
--- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
@@ -174,10 +174,10 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 
 		if ($nbofiles)
 		{
-   			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
-   			foreach ($listoffiles as $file)
-   			{
-				$texte .= $file['name'].'<br>';
+   			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+   			// Show list of found files
+   			foreach ($listoffiles as $file) {
+   				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=supplier_proposal/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
    			}
    			$texte .= '</div>';
 
diff --git a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
new file mode 100644
index 00000000000..35afdcf7192
--- /dev/null
+++ b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
@@ -0,0 +1,429 @@
+<?php
+/* Copyright (C) 2010-2012 	Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2018-2020  Frédéric 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
+* the Free Software Foundation; either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <https://www.gnu.org/licenses/>.
+* or see https://www.gnu.org/
+*/
+
+/**
+ *	\file       htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
+ *	\ingroup    ticket
+ *	\brief      File of class to build ODT documents for tickets
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/modules/ticket/modules_ticket.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
+
+
+/**
+ *	Class to build documents using ODF templates generator
+ */
+class doc_generic_ticket_odt extends ModelePDFTicket
+{
+	/**
+	 * @var Societe Issuer
+	 */
+	public $emetteur;
+
+	/**
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
+	public $phpmin = array(5, 6);
+
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr';
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf, $langs, $mysoc;
+
+		// Load translation files required by the page
+		$langs->loadLangs(array("main", "companies"));
+
+		$this->db = $db;
+		$this->name = "ODT templates";
+		$this->description = $langs->trans("DocumentModelOdt");
+		$this->scandir = 'TICKET_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
+
+		// Page size for A4 format
+		$this->type = 'odt';
+		$this->page_largeur = 0;
+		$this->page_hauteur = 0;
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = 0;
+		$this->marge_droite = 0;
+		$this->marge_haute = 0;
+		$this->marge_basse = 0;
+
+		$this->option_logo = 1; // Affiche logo
+		$this->option_tva = 0; // Gere option tva USER_TVAOPTION
+		$this->option_multilang = 1; // Dispo en plusieurs langues
+		$this->option_freetext = 0; // Support add of a personalised text
+		$this->option_draft_watermark = 0; // Support add of a watermark on drafts
+
+		// Recupere emetteur
+		$this->emetteur = $mysoc;
+		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+	}
+
+
+	/**
+	 *	Return description of a module
+	 *
+	 *	@param	Translate	$langs      Lang object to use for output
+	 *	@return string       			Description
+	 */
+	public function info($langs)
+	{
+		global $conf, $langs;
+
+		// Load translation files required by the page
+		$langs->loadLangs(array('companies', 'errors'));
+
+		$form = new Form($this->db);
+
+		$texte = $this->description.".<br>\n";
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" enctype="multipart/form-data">';
+		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
+		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
+		$texte .= '<input type="hidden" name="param1" value="TICKET_ADDON_PDF_ODT_PATH">';
+
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		// List of directories area
+		$texte .= '<tr><td>';
+		$texttitle = $langs->trans("ListOfDirectories");
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->TICKET_ADDON_PDF_ODT_PATH)));
+		$listoffiles = array();
+		foreach ($listofdir as $key=>$tmpdir)
+		{
+			$tmpdir = trim($tmpdir);
+			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
+			if (!$tmpdir) {
+				unset($listofdir[$key]); continue;
+			}
+			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			else {
+				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
+				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+			}
+		}
+		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
+		// Add list of substitution keys
+		$texthelp .= '<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
+		$texthelp .= $langs->transnoentitiesnoconv("FullListOnOnlineDocumentation"); // This contains an url, we don't modify it
+
+		$texte .= $form->textwithpicto($texttitle, $texthelp, 1, 'help', '', 1);
+		$texte .= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
+		$texte .= '<textarea class="flat" cols="60" name="value1">';
+		$texte .= $conf->global->TICKET_ADDON_PDF_ODT_PATH;
+		$texte .= '</textarea>';
+		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
+		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<br></div></div>';
+
+		// Scan directories
+		if (count($listofdir))
+		{
+			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
+
+			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+			// Show list of found files
+			foreach ($listoffiles as $file) {
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=tickets/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+			}
+			$texte .= '</div>';
+		}
+		// Add input to upload a new template file.
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte .= '<input type="hidden" value="TICKET_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
+		$texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '</div>';
+
+		$texte .= '</td>';
+
+		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
+		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</td>';
+		$texte .= '</tr>';
+
+		$texte .= '</table>';
+		$texte .= '</form>';
+
+		return $texte;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Function to build a document on disk using the generic odt module.
+	 *
+	 *	@param		User		$object				Object source to build document
+	 *	@param		Translate	$outputlangs		Lang output object
+	 * 	@param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *	@return		int         					1 if OK, <=0 if KO
+	 */
+	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		// phpcs:enable
+		global $user, $langs, $conf, $mysoc, $hookmanager;
+
+		if (empty($srctemplatepath))
+		{
+			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
+			return -1;
+		}
+
+		// Add odtgeneration hook
+		if (!is_object($hookmanager))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+			$hookmanager = new HookManager($this->db);
+		}
+		$hookmanager->initHooks(array('odtgeneration'));
+		global $action;
+
+		if (!is_object($outputlangs)) $outputlangs = $langs;
+		$sav_charset_output = $outputlangs->charset_output;
+		$outputlangs->charset_output = 'UTF-8';
+
+		// Load translation files required by the page
+		$outputlangs->loadLangs(array("main", "companies", "bills", "dict"));
+
+		if ($conf->user->dir_output)
+		{
+			// If $object is id instead of object
+			if (!is_object($object))
+			{
+				$id = $object;
+				$object = new User($this->db);
+				$result = $object->fetch($id);
+				if ($result < 0)
+				{
+					dol_print_error($this->db, $object->error);
+					return -1;
+				}
+			}
+
+			$object->fetch_thirdparty();
+
+			$dir = $conf->user->dir_output;
+			$objectref = dol_sanitizeFileName($object->ref);
+			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			$file = $dir."/".$objectref.".odt";
+
+			if (!file_exists($dir))
+			{
+				if (dol_mkdir($dir) < 0)
+				{
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+					return -1;
+				}
+			}
+
+			if (file_exists($dir))
+			{
+				//print "srctemplatepath=".$srctemplatepath;	// Src filename
+				$newfile = basename($srctemplatepath);
+				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
+				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
+
+				$newfiletmp = $objectref.'_'.$newfiletmp;
+
+				// Get extension (ods or odt)
+				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
+				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
+				{
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
+				} else {
+					$filename = $newfiletmp.'.'.$newfileformat;
+				}
+				$file = $dir.'/'.$filename;
+				//print "newdir=".$dir;
+				//print "newfile=".$newfile;
+				//print "file=".$file;
+				//print "conf->user->dir_temp=".$conf->user->dir_temp;
+
+				dol_mkdir($conf->user->dir_temp);
+
+
+				// If CUSTOMER contact defined on user, we use it
+				$usecontact = false;
+				$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
+				if (count($arrayidcontact) > 0)
+				{
+					$usecontact = true;
+					$result = $object->fetch_contact($arrayidcontact[0]);
+				}
+
+				// Recipient name
+				if (!empty($usecontact))
+				{
+					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+						$socobject = $object->contact;
+					} else {
+						$socobject = $object->thirdparty;
+						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+						$contactobject = $object->contact;
+					}
+				} else {
+					$socobject = $object->thirdparty;
+				}
+
+				// Open and load template
+				require_once ODTPHP_PATH.'odf.php';
+				try {
+					$odfHandler = new odf(
+						$srctemplatepath,
+						array(
+							'PATH_TO_TMP'	  => $conf->user->dir_temp,
+							'ZIP_PROXY'		  => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
+							'DELIMITER_LEFT'  => '{',
+							'DELIMITER_RIGHT' => '}'
+						)
+					);
+				} catch (Exception $e)
+				{
+					$this->error = $e->getMessage();
+					dol_syslog($e->getMessage(), LOG_WARNING);
+					return -1;
+				}
+
+				// Make substitutions into odt
+				$array_user = $this->get_substitutionarray_user($object, $outputlangs);
+				$array_soc = $this->get_substitutionarray_mysoc($mysoc, $outputlangs);
+				$array_thirdparty = $this->get_substitutionarray_thirdparty($socobject, $outputlangs);
+				$array_other = $this->get_substitutionarray_other($outputlangs);
+				// retrieve contact information for use in object as contact_xxx tags
+				$array_thirdparty_contact = array();
+				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+
+				$tmparray = array_merge($array_user, $array_soc, $array_thirdparty, $array_other, $array_thirdparty_contact);
+				complete_substitutions_array($tmparray, $outputlangs, $object);
+				$object->fetch_optionals();
+				// Call the ODTSubstitution hook
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+				foreach ($tmparray as $key=>$value)
+				{
+					try {
+						if (preg_match('/logo$/', $key)) // Image
+						{
+							if (file_exists($value)) $odfHandler->setImage($key, $value);
+							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						} else // Text
+						{
+							$odfHandler->setVars($key, $value, true, 'UTF-8');
+						}
+					} catch (OdfException $e)
+					{
+						dol_syslog($e->getMessage(), LOG_WARNING);
+					}
+				}
+
+				// Replace labels translated
+				$tmparray = $outputlangs->get_translations_for_substitutions();
+				foreach ($tmparray as $key=>$value)
+				{
+					try {
+						$odfHandler->setVars($key, $value, true, 'UTF-8');
+					} catch (OdfException $e)
+					{
+						dol_syslog($e->getMessage(), LOG_WARNING);
+					}
+				}
+
+				// Call the beforeODTSave hook
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$reshook = $hookmanager->executeHooks('beforeODTSave', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+
+				// Write new file
+				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
+					try {
+						$odfHandler->exportAsAttachedPDF($file);
+					} catch (Exception $e) {
+						$this->error = $e->getMessage();
+						dol_syslog($e->getMessage(), LOG_WARNING);
+						return -1;
+					}
+				} else {
+					try {
+						$odfHandler->saveToDisk($file);
+					} catch (Exception $e) {
+						$this->error = $e->getMessage();
+						dol_syslog($e->getMessage(), LOG_WARNING);
+						return -1;
+					}
+				}
+
+				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+
+				if (!empty($conf->global->MAIN_UMASK))
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
+
+				$odfHandler = null; // Destroy object
+
+				$this->result = array('fullpath'=>$file);
+
+				return 1; // Success
+			} else {
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+				return -1;
+			}
+		}
+
+		return -1;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * get substitution array for object
+	 *
+	 * @param User          $object         user
+	 * @param Translate     $outputlangs    translation object
+	 * @param string        $array_key      key for array
+	 * @return array                        array of substitutions
+	 */
+	public function get_substitutionarray_object($object, $outputlangs, $array_key = 'object')
+	{
+		// phpcs:enable
+		$array_other = array();
+		foreach ($object as $key => $value) {
+			if (!is_array($value) && !is_object($value)) {
+				$array_other[$array_key.'_'.$key] = $value;
+			}
+		}
+		return $array_other;
+	}
+}
diff --git a/htdocs/core/modules/ticket/doc/index.html b/htdocs/core/modules/ticket/doc/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/ticket/modules_ticket.php b/htdocs/core/modules/ticket/modules_ticket.php
index f1d67cf5025..1d2bc944022 100644
--- a/htdocs/core/modules/ticket/modules_ticket.php
+++ b/htdocs/core/modules/ticket/modules_ticket.php
@@ -19,8 +19,8 @@
  */
 
 /**
- *        \file       htdocs/core/modules/ticket/modules_ticket.php
- *      \ingroup    project
+ *      \file       htdocs/core/modules/ticket/modules_ticket.php
+ *      \ingroup    ticket
  *      \brief      File that contain parent class for projects models
  *                  and parent class for projects numbering models
  */
diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
index 2a326282fa0..2e39bf53ea2 100644
--- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
+++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
@@ -187,9 +187,10 @@ class doc_generic_user_odt extends ModelePDFUser
 				$texte .= "</td></tr>";
 				$texte .= '</table>';
 			}
-			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
+			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+			// Show list of found files
 			foreach ($listoffiles as $file) {
-				$texte .= $file['name'].'<br>';
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=users/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
 			}
 			$texte .= '</div>';
 		}
diff --git a/htdocs/install/doctemplates/tickets/template_ticket.odt b/htdocs/install/doctemplates/tickets/template_ticket.odt
new file mode 100644
index 0000000000000000000000000000000000000000..09ea9d52c59d0a8837ca8d7e0ee7c2f38bc7b94d
GIT binary patch
literal 19240
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
PgCGzV0L!06ZXg~2_mk|Y

literal 0
HcmV?d00001


From edb02ef05ae532e86c809c031a2e4edf51bf744a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Dec 2020 19:03:19 +0100
Subject: [PATCH 482/888] Fix ticket

---
 htdocs/langs/en_US/ticket.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index 68a8f708741..a7726032558 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -124,6 +124,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets 
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added

From 5681aeee0f9698273dcc9bd31dd4b75974af8cc3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Dec 2020 19:05:27 +0100
Subject: [PATCH 483/888] Fix look and feel v13

---
 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 c67476f8c00..9618ab128ec 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -1058,7 +1058,7 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
 		print '<input type="hidden" name="track_id" value="'.$track_id.'">';
 
 		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-		print '<table class="noborder centpercent margintable">';
+		print '<table class="noborder tableforfield centpercent margintable">';
 		print '<tr class="liste_titre">';
 		print '<td>';
 		print $langs->trans('Properties');

From b7876f54cfd260650024c61b026ae2c880b7c22d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 Dec 2020 19:10:37 +0100
Subject: [PATCH 484/888] Fix warning

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

diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 67343e549b2..d9737fa0a94 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -132,6 +132,8 @@ class ProductFournisseur extends Product
 	 */
 	public $supplier_fk_barcode_type;
 
+	public $packaging;
+
 
 	/**
 	 *	Constructor
@@ -299,7 +301,7 @@ class ProductFournisseur extends Product
 		$charges = price2num($charges, 'MU');
 		$qty = price2num($qty, 'MS');
 		$unitBuyPrice = price2num($buyprice / $qty, 'MU');
-		$packaging = price2num((($this->packaging < $qty) ? $qty : $this->packaging), 'MS');
+		$packaging = price2num(((empty($this->packaging) || $this->packaging < $qty) ? $qty : $this->packaging), 'MS');
 
 		$error = 0;
 		$now = dol_now();

From 2cc51c1aef20b25eee544ef17ceb3bc27ff00df1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 16 Dec 2020 20:13:11 +0100
Subject: [PATCH 485/888] bookmark class doxygen

---
 htdocs/bookmarks/class/bookmark.class.php | 75 ++++++++++++++---------
 1 file changed, 46 insertions(+), 29 deletions(-)

diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php
index f7098f1d780..f5bbefae3d3 100644
--- a/htdocs/bookmarks/class/bookmark.class.php
+++ b/htdocs/bookmarks/class/bookmark.class.php
@@ -83,8 +83,14 @@ class Bookmark extends CommonObject
 	 */
 	public $title;
 
+	/**
+	 * @var int position of bookmark
+	 */
 	public $position;
 
+	/**
+	 * @var string favicon
+	 */
 	public $favicon;
 
 
@@ -116,8 +122,7 @@ class Bookmark extends CommonObject
 
 		dol_syslog("Bookmark::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 
 			$this->id = $obj->rowid;
@@ -151,7 +156,9 @@ class Bookmark extends CommonObject
 		// Clean parameters
 		$this->url = trim($this->url);
 		$this->title = trim($this->title);
-		if (empty($this->position)) $this->position = 0;
+		if (empty($this->position)) {
+			$this->position = 0;
+		}
 
 		$now = dol_now();
 
@@ -164,17 +171,15 @@ class Bookmark extends CommonObject
 		$sql .= ($this->fk_user > 0 ? $this->fk_user : "0").",";
 		$sql .= " '".$this->db->idate($now)."',";
 		$sql .= " '".$this->db->escape($this->url)."', '".$this->db->escape($this->target)."',";
-		$sql .= " '".$this->db->escape($this->title)."', '".$this->db->escape($this->favicon)."', '".$this->db->escape($this->position)."'";
-		$sql .= ", ".$this->db->escape($conf->entity);
+		$sql .= " '".$this->db->escape($this->title)."', '".$this->db->escape($this->favicon)."', ".(int) $this->position;
+		$sql .= ", ".(int) $conf->entity;
 		$sql .= ")";
 
 		dol_syslog("Bookmark::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$id = $this->db->last_insert_id(MAIN_DB_PREFIX."bookmark");
-			if ($id > 0)
-			{
+			if ($id > 0) {
 				$this->id = $id;
 				$this->db->commit();
 				return $id;
@@ -202,7 +207,9 @@ class Bookmark extends CommonObject
 		// Clean parameters
 		$this->url = trim($this->url);
 		$this->title = trim($this->title);
-		if (empty($this->position)) $this->position = 0;
+		if (empty($this->position)) {
+			$this->position = 0;
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."bookmark";
 		$sql .= " SET fk_user = ".($this->fk_user > 0 ? $this->fk_user : "0");
@@ -211,12 +218,11 @@ class Bookmark extends CommonObject
 		$sql .= " ,target = '".$this->db->escape($this->target)."'";
 		$sql .= " ,title = '".$this->db->escape($this->title)."'";
 		$sql .= " ,favicon = '".$this->db->escape($this->favicon)."'";
-		$sql .= " ,position = '".$this->db->escape($this->position)."'";
+		$sql .= " ,position = ".(int) $this->position;
 		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog("Bookmark::update", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
+		if ($this->db->query($sql)) {
 			return 1;
 		} else {
 			$this->error = $this->db->lasterror();
@@ -237,8 +243,7 @@ class Bookmark extends CommonObject
 
 		dol_syslog("Bookmark::remove", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			return 1;
 		} else {
 			$this->error = $this->db->lasterror();
@@ -288,7 +293,9 @@ class Bookmark extends CommonObject
 	{
 		global $conf, $langs, $hookmanager;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 
@@ -298,33 +305,40 @@ class Bookmark extends CommonObject
 
 		$url = DOL_URL_ROOT.'/bookmarks/card.php?id='.$this->id;
 
-		if ($option != 'nolink')
-		{
+		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowBookmark");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
@@ -332,8 +346,11 @@ class Bookmark extends CommonObject
 		$hookmanager->initHooks(array('mybookmarkdao'));
 		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}

From 3b19151c18639d5cb426f9e2552a5d6298a97e04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 16 Dec 2020 20:15:48 +0100
Subject: [PATCH 486/888] bookmark

---
 htdocs/bookmarks/admin/bookmark.php |  15 ++--
 htdocs/bookmarks/bookmarks.lib.php  | 132 ++++++++++++++--------------
 2 files changed, 73 insertions(+), 74 deletions(-)

diff --git a/htdocs/bookmarks/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php
index 9aa1989fa2e..c049d4af16f 100644
--- a/htdocs/bookmarks/admin/bookmark.php
+++ b/htdocs/bookmarks/admin/bookmark.php
@@ -28,20 +28,21 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 // Load translation files required by the page
 $langs->load("admin");
 
-if (!$user->admin)
-accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 $action = GETPOST('action', 'aZ09');
 
-if ($action == 'setvalue')
-{
+if ($action == 'setvalue') {
 	$showmenu = GETPOST('BOOKMARKS_SHOW_IN_MENU', 'alpha');
 	$res = dolibarr_set_const($db, "BOOKMARKS_SHOW_IN_MENU", $showmenu, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!$res > 0) {
+		$error++;
+	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 63a95fed4c0..ffd1673ac63 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -38,20 +38,23 @@ function printDropdownBookmarksList()
 
 	$url = $_SERVER["PHP_SELF"];
 
-	if (!empty($_SERVER["QUERY_STRING"]))
-	{
+	if (!empty($_SERVER["QUERY_STRING"])) {
 		$url .= (dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '');
 	} else {
 		global $sortfield, $sortorder;
 		$tmpurl = '';
 		// No urlencode, all param $url will be urlencoded later
-		if ($sortfield) $tmpurl .= ($tmpurl ? '&' : '').'sortfield='.$sortfield;
-		if ($sortorder) $tmpurl .= ($tmpurl ? '&' : '').'sortorder='.$sortorder;
-		if (is_array($_POST))
-		{
-			foreach ($_POST as $key => $val)
-			{
-				if (preg_match('/^search_/', $key) && $val != '') $tmpurl .= ($tmpurl ? '&' : '').$key.'='.$val;
+		if ($sortfield) {
+			$tmpurl .= ($tmpurl ? '&' : '').'sortfield='.$sortfield;
+		}
+		if ($sortorder) {
+			$tmpurl .= ($tmpurl ? '&' : '').'sortorder='.$sortorder;
+		}
+		if (is_array($_POST)) {
+			foreach ($_POST as $key => $val) {
+				if (preg_match('/^search_/', $key) && $val != '') {
+					$tmpurl .= ($tmpurl ? '&' : '').$key.'='.$val;
+				}
 			}
 		}
 		$url .= ($tmpurl ? '?'.$tmpurl : '');
@@ -68,8 +71,7 @@ function printDropdownBookmarksList()
 
 	// Url to go on create new bookmark page
 	$newbtn = '';
-	if (!empty($user->rights->bookmark->creer))
-	{
+	if (!empty($user->rights->bookmark->creer)) {
 		//$urltoadd=DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;urlsource='.urlencode($url).'&amp;url='.urlencode($url);
 		$urltoadd = DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;url='.urlencode($url);
 		$newbtn .= '<a class="top-menu-dropdown-link" title="'.$langs->trans('AddThisPageToBookmarks').'" href="'.dol_escape_htmltag($urltoadd).'" >';
@@ -81,13 +83,11 @@ function printDropdownBookmarksList()
 	$sql .= " WHERE (fk_user = ".$user->id." OR fk_user is NULL OR fk_user = 0)";
 	$sql .= " AND entity IN (".getEntity('bookmarks').")";
 	$sql .= " ORDER BY position";
-	if ($resql = $db->query($sql))
-	{
+	if ($resql = $db->query($sql)) {
 		if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 			$bookmarkList = '<div id="dropdown-bookmarks-list" >';
 			$i = 0;
-			while ((empty($conf->global->BOOKMARKS_SHOW_IN_MENU) || $i < $conf->global->BOOKMARKS_SHOW_IN_MENU) && $obj = $db->fetch_object($resql))
-			{
+			while ((empty($conf->global->BOOKMARKS_SHOW_IN_MENU) || $i < $conf->global->BOOKMARKS_SHOW_IN_MENU) && $obj = $db->fetch_object($resql)) {
 				$bookmarkList .= '<a class="dropdown-item bookmark-item'.(strpos($obj->url, 'http') === 0 ? ' bookmark-item-external' : '').'" id="bookmark-item-'.$obj->rowid.'" data-id="'.$obj->rowid.'" '.($obj->target == 1 ? ' target="_blank"' : '').' href="'.dol_escape_htmltag($obj->url).'" >';
 				$bookmarkList .= dol_escape_htmltag($obj->title);
 				$bookmarkList .= '</a>';
@@ -104,15 +104,13 @@ function printDropdownBookmarksList()
 			$searchForm .= ' data-html="'.dol_escape_htmltag(img_picto('', 'bookmark').' '.($user->rights->bookmark->creer ? $langs->trans('EditBookmarks') : $langs->trans('ListOfBookmarks')).'...').'">';
 			$searchForm .= dol_escape_htmltag($user->rights->bookmark->creer ? $langs->trans('EditBookmarks') : $langs->trans('ListOfBookmarks')).'...</option>';
 			// Url to go on create new bookmark page
-			if (!empty($user->rights->bookmark->creer))
-			{
+			if (!empty($user->rights->bookmark->creer)) {
 				$urltoadd = DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;url='.urlencode($url);
 				$searchForm .= '<option value="newbookmark" class="optionblue" rel="'.dol_escape_htmltag($urltoadd).'"';
 				$searchForm .= ' data-html="'.dol_escape_htmltag(img_picto('', 'bookmark').' '.$langs->trans('AddThisPageToBookmarks').'...').'">'.dol_escape_htmltag($langs->trans('AddThisPageToBookmarks').'...').'</option>';
 			}
 			$i = 0;
-			while ((empty($conf->global->BOOKMARKS_SHOW_IN_MENU) || $i < $conf->global->BOOKMARKS_SHOW_IN_MENU) && $obj = $db->fetch_object($resql))
-			{
+			while ((empty($conf->global->BOOKMARKS_SHOW_IN_MENU) || $i < $conf->global->BOOKMARKS_SHOW_IN_MENU) && $obj = $db->fetch_object($resql)) {
 				$searchForm .= '<option name="bookmark'.$obj->rowid.'" value="'.$obj->rowid.'" '.($obj->target == 1 ? ' target="_blank"' : '').' rel="'.dol_escape_htmltag($obj->url).'" >';
 				$searchForm .= dol_escape_htmltag($obj->title);
 				$searchForm .= '</option>';
@@ -132,74 +130,74 @@ function printDropdownBookmarksList()
 
 		$html .= '<!-- script to open selected choice -->
 				<script>
-	        	$(document).ready(function () {
-    			    jQuery("#boxbookmark").change(function() {
-			            var urlselected = jQuery("#boxbookmark option:selected").attr("rel");
+				$(document).ready(function () {
+					jQuery("#boxbookmark").change(function() {
+						var urlselected = jQuery("#boxbookmark option:selected").attr("rel");
 						if (! urlselected) console.log("Error, failed to get the URL to jump to from the rel attribute");
-			            var urltarget = jQuery("#boxbookmark option:selected").attr("target");
-			            if (! urltarget) { urltarget=""; }
-		                jQuery("form#top-menu-action-bookmark").attr("target",urltarget);
-			            jQuery("form#top-menu-action-bookmark").attr("action",urlselected);
+						var urltarget = jQuery("#boxbookmark option:selected").attr("target");
+						if (! urltarget) { urltarget=""; }
+						jQuery("form#top-menu-action-bookmark").attr("target",urltarget);
+						jQuery("form#top-menu-action-bookmark").attr("action",urlselected);
 
-			            console.log("We change select bookmark. We choose urlselected="+urlselected+" with target="+urltarget);
+						console.log("We change select bookmark. We choose urlselected="+urlselected+" with target="+urltarget);
 
-			            // Method is POST for internal link, GET for external
-			            if (urlselected.startsWith(\'http\'))
-			            {
-			                var newmethod=\'GET\';
-			                jQuery("form#top-menu-action-bookmark").attr("method", newmethod);
-			                console.log("We change method to newmethod="+newmethod);
-				            jQuery("form#top-menu-action-bookmark").submit();
-			                console.log("We restore method to POST");
+						// Method is POST for internal link, GET for external
+						if (urlselected.startsWith(\'http\'))
+						{
+							var newmethod=\'GET\';
+							jQuery("form#top-menu-action-bookmark").attr("method", newmethod);
+							console.log("We change method to newmethod="+newmethod);
+							jQuery("form#top-menu-action-bookmark").submit();
+							console.log("We restore method to POST");
 							jQuery("form#top-menu-action-bookmark").attr("method", \'POST\');
 						}
 						else
 						{
-			            	jQuery("form#top-menu-action-bookmark").submit();
+							jQuery("form#top-menu-action-bookmark").submit();
 						}
-		       		});
-    			})
+			   		});
+				})
 				</script>';
 	} else {
 		$html = '
-	        <!-- search input -->
-	        <div class="dropdown-header bookmark-header">
-	            ' . $searchForm.'
-	        </div>
-	        ';
+			<!-- search input -->
+			<div class="dropdown-header bookmark-header">
+				' . $searchForm.'
+			</div>
+			';
 
 		$html .= '
-	        <!-- Menu Body -->
-	        <div class="bookmark-body dropdown-body">
-	        '.$bookmarkList.'
-	        </div>
-	        ';
+			<!-- Menu Body -->
+			<div class="bookmark-body dropdown-body">
+			'.$bookmarkList.'
+			</div>
+			';
 
 		$html .= '
-	        <!-- Menu Footer-->
-	        <div class="bookmark-footer">
-	                '.$newbtn.$listbtn.'
-	            <div style="clear:both;"></div>
-	        </div>
-	    ';
+			<!-- Menu Footer-->
+			<div class="bookmark-footer">
+					'.$newbtn.$listbtn.'
+				<div style="clear:both;"></div>
+			</div>
+		';
 
 		$html .= '<!-- script to open/close the popup -->
 				<script>
-	            $( document ).on("keyup", "#top-bookmark-search-input", function () {
+				$( document ).on("keyup", "#top-bookmark-search-input", function () {
 
-	                var filter = $(this).val(), count = 0;
-	                $("#dropdown-bookmarks-list .bookmark-item").each(function () {
+					var filter = $(this).val(), count = 0;
+					$("#dropdown-bookmarks-list .bookmark-item").each(function () {
 
-	                    if ($(this).text().search(new RegExp(filter, "i")) < 0) {
-	                        $(this).addClass("hidden-search-result");
-	                    } else {
-	                        $(this).removeClass("hidden-search-result");
-	                        count++;
-	                    }
-	                });
-	                $("#top-bookmark-search-filter-count").text(count);
-	            });
-			    </script>';
+						if ($(this).text().search(new RegExp(filter, "i")) < 0) {
+							$(this).addClass("hidden-search-result");
+						} else {
+							$(this).removeClass("hidden-search-result");
+							count++;
+						}
+					});
+					$("#top-bookmark-search-filter-count").text(count);
+				});
+				</script>';
 	}
 
 	return $html;

From 440c9e48404dd38330235c2670967a8cb6591b19 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 17 Dec 2020 06:02:28 +0100
Subject: [PATCH 487/888] Fix module Intracomm

---
 .../core/modules/modIntracommreport.class.php |  4 ++--
 .../intracommreport/admin/intracommreport.php |  9 +++------
 .../class/intracommreport.class.php           | 19 ++++++++++---------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/htdocs/core/modules/modIntracommreport.class.php b/htdocs/core/modules/modIntracommreport.class.php
index 668cf7af875..da1bda58c48 100644
--- a/htdocs/core/modules/modIntracommreport.class.php
+++ b/htdocs/core/modules/modIntracommreport.class.php
@@ -62,10 +62,10 @@ class modIntracommreport extends DolibarrModules
 		$this->config_page_url = array("intracommreport.php@intracommreport");
 
 		// Dependencies
-		$this->depends = array("modFacture", "modTax"); // List of modules id that must be enabled if this module is enabled
+		$this->depends = array("modFacture", "modTax", "modCategorie"); // List of modules id that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of modules id to disable if this one is disabled
 		$this->conflictwith = array(); // List of modules id this module is in conflict with
-		$this->phpmin = array(5, 5); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(13, 0, -5); // Minimum version of Dolibarr required by module
 		$this->langfiles = array("intracommreport");
 
diff --git a/htdocs/intracommreport/admin/intracommreport.php b/htdocs/intracommreport/admin/intracommreport.php
index 9947e844e40..16e24503959 100644
--- a/htdocs/intracommreport/admin/intracommreport.php
+++ b/htdocs/intracommreport/admin/intracommreport.php
@@ -159,9 +159,8 @@ print "</tr>\n";
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("INTRACOMMREPORT_CATEG_FRAISDEPORT").'</td>';
-$arraychoices = array(3=>'Seuil de 460 000 €', 4=>'En dessous de 460 000 €');
 print '<td>';
-print $formother->select_categories(0, $conf->global->INTRACOMMREPORT_CATEG_FRAISDEPORT, 'INTRACOMMREPORT_CATEG_FRAISDEPORT');
+print $formother->select_categories('product', $conf->global->INTRACOMMREPORT_CATEG_FRAISDEPORT, 'INTRACOMMREPORT_CATEG_FRAISDEPORT');
 print '</td>';
 print "</tr>\n";
 
@@ -193,10 +192,8 @@ foreach ($list_DES as $key)
 
 print '</table>';
 
-print '<div class="tabsAction">';
-print '<div class="inline-block divButAction">';
-print '<input type="submit" name="bt_save" class="butAction button-save" value="'.$langs->trans("Save").'" />';
-print '</div>';
+print '<div class="center">';
+print '<input type="submit" name="bt_save" class="butAction button-save" value="'.$langs->trans("Update").'" />';
 print '</div>';
 
 print '</form>';
diff --git a/htdocs/intracommreport/class/intracommreport.class.php b/htdocs/intracommreport/class/intracommreport.class.php
index 0cf5a71c27a..1c5cf3d0a29 100644
--- a/htdocs/intracommreport/class/intracommreport.class.php
+++ b/htdocs/intracommreport/class/intracommreport.class.php
@@ -286,13 +286,13 @@ class IntracommReport extends CommonObject
 		global $mysoc, $conf;
 
 		if ($type == 'expedition' || $exporttype == 'des') {
-			$sql = 'SELECT f.facnumber, f.total as total_ht';
+			$sql = 'SELECT f.ref as refinvoice, f.total as total_ht';
 			$table = 'facture';
 			$table_extraf = 'facture_extrafields';
 			$tabledet = 'facturedet';
 			$field_link = 'fk_facture';
 		} else { // Introduction
-			$sql = 'SELECT f.ref_supplier as facnumber, f.total_ht';
+			$sql = 'SELECT f.ref_supplier as refinvoice, f.total_ht';
 			$table = 'facture_fourn';
 			$table_extraf = 'facture_fourn_extrafields';
 			$tabledet = 'facture_fourn_det';
@@ -338,14 +338,15 @@ class IntracommReport extends CommonObject
 			$code_douane = $code_douane_spe;
 		}
 		$cn8->addChild('CN8Code', $code_douane);
-		if (!empty($res->tva_intra)) {
-			$item->addChild('partnerId', $res->tva_intra);
-		}
 		$item->addChild('MSConsDestCode', $res->code); // code iso pays client
+		$item->addChild('countryOfOriginCode', substr($res->zip, 0, 2)); // code iso pays d'origine
 		$item->addChild('netMass', $res->weight * $res->qty); // Poids du produit
 		$item->addChild('quantityInSU', $res->qty); // Quantité de produit dans la ligne
 		$item->addChild('invoicedAmount', round($res->total_ht)); // Montant total ht de la facture (entier attendu)
-		$item->addChild('invoicedNumber', $res->facnumber); // Numéro facture
+		// $item->addChild('invoicedNumber', $res->refinvoice); // Numéro facture
+		if (!empty($res->tva_intra)) {
+			$item->addChild('partnerId', $res->tva_intra);
+		}
 		$item->addChild('statisticalProcedureCode', '11');
 		$nature_of_transaction = $item->addChild('NatureOfTransaction');
 		$nature_of_transaction->addChild('natureOfTransactionACode', 1);
@@ -389,7 +390,7 @@ class IntracommReport extends CommonObject
 			$table = 'facture';
 			$tabledet = 'facturedet';
 			$field_link = 'fk_facture';
-			$more_sql = 'f.facnumber';
+			$more_sql = 'f.ref';
 		} else { // Introduction
 			$table = 'facture_fourn';
 			$tabledet = 'facture_fourn_det';
@@ -404,14 +405,14 @@ class IntracommReport extends CommonObject
 					INNER JOIN '.MAIN_DB_PREFIX.'product p ON (p.rowid = d.fk_product)
 					WHERE d.fk_product IS NOT NULL
 					AND f.entity = '.$conf->entity.'
-					AND '.$more_sql.' = "'.$res->facnumber.'"
+					AND '.$more_sql.' = "'.$res->refinvoice.'"
 					AND d.total_ht =
 					(
 						SELECT MAX(d.total_ht)
 						FROM '.MAIN_DB_PREFIX.$tabledet.' d
 						INNER JOIN '.MAIN_DB_PREFIX.$table.' f ON (f.rowid = d.'.$field_link.')
 						WHERE d.fk_product IS NOT NULL
-						AND '.$more_sql.' = "'.$res->facnumber.'"
+						AND '.$more_sql.' = "'.$res->refinvoice.'"
 						AND d.fk_product NOT IN
 						(
 							SELECT fk_product

From da439ca0c1d54431c9d968adab335a05191d9f46 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 17 Dec 2020 06:09:42 +0100
Subject: [PATCH 488/888] Fix module Intracomm - Structure XML

---
 htdocs/intracommreport/class/intracommreport.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/intracommreport/class/intracommreport.class.php b/htdocs/intracommreport/class/intracommreport.class.php
index 1c5cf3d0a29..cd4765161e9 100644
--- a/htdocs/intracommreport/class/intracommreport.class.php
+++ b/htdocs/intracommreport/class/intracommreport.class.php
@@ -142,7 +142,7 @@ class IntracommReport extends CommonObject
 		$date_time->addChild('date', date('Y-m-d'));
 		$date_time->addChild('time', date('H:i:s'));
 		$party = $enveloppe->addChild('Party');
-		$party->addAttribute('partType', $conf->global->INTRACOMMREPORT_TYPE_ACTEUR);
+		$party->addAttribute('partyType', $conf->global->INTRACOMMREPORT_TYPE_ACTEUR);
 		$party->addAttribute('partyRole', $conf->global->INTRACOMMREPORT_ROLE_ACTEUR);
 		$party->addChild('partyId', $party_id);
 		$party->addChild('partyName', $declarant);
@@ -330,7 +330,7 @@ class IntracommReport extends CommonObject
 	public function addItemXMl(&$declaration, &$res, $i, $code_douane_spe = '')
 	{
 		$item = $declaration->addChild('Item');
-		$item->addChild('ItemNumber', $i);
+		$item->addChild('itemNumber', $i);
 		$cn8 = $item->addChild('CN8');
 		if (empty($code_douane_spe)) {
 			$code_douane = $res->customcode;
@@ -340,7 +340,7 @@ class IntracommReport extends CommonObject
 		$cn8->addChild('CN8Code', $code_douane);
 		$item->addChild('MSConsDestCode', $res->code); // code iso pays client
 		$item->addChild('countryOfOriginCode', substr($res->zip, 0, 2)); // code iso pays d'origine
-		$item->addChild('netMass', $res->weight * $res->qty); // Poids du produit
+		$item->addChild('netMass', round($res->weight * $res->qty)); // Poids du produit
 		$item->addChild('quantityInSU', $res->qty); // Quantité de produit dans la ligne
 		$item->addChild('invoicedAmount', round($res->total_ht)); // Montant total ht de la facture (entier attendu)
 		// $item->addChild('invoicedNumber', $res->refinvoice); // Numéro facture

From 86de12d4d3f62beacb5db8e2c0f3c3d95eeee003 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 17 Dec 2020 06:13:33 +0100
Subject: [PATCH 489/888] Module Intracommreport - Add schema xsd

---
 dev/resources/intracommreport/schema_deb.xsd | 139 +++++++++++++++++++
 1 file changed, 139 insertions(+)
 create mode 100644 dev/resources/intracommreport/schema_deb.xsd

diff --git a/dev/resources/intracommreport/schema_deb.xsd b/dev/resources/intracommreport/schema_deb.xsd
new file mode 100644
index 00000000000..5379932fa29
--- /dev/null
+++ b/dev/resources/intracommreport/schema_deb.xsd
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<xsd:element name="INSTAT">
+<xsd:complexType>
+<xsd:sequence>
+<xsd:element ref="Envelope"/>
+</xsd:sequence>
+</xsd:complexType>
+</xsd:element>
+<xsd:element name="Envelope">
+<xsd:complexType>
+<xsd:sequence>
+<xsd:element ref="envelopeId"/>
+<xsd:element ref="DateTime"/>
+<xsd:element ref="Party"/>
+<xsd:element ref="softwareUsed" minOccurs="0"/>
+<xsd:element ref="Declaration" maxOccurs="unbounded"/>
+</xsd:sequence>
+</xsd:complexType>
+</xsd:element>
+<xsd:element name="envelopeId" type="xsd:string"/>
+<xsd:element name="DateTime">
+<xsd:complexType>
+<xsd:sequence>
+<xsd:element ref="date"/>
+<xsd:element ref="time" minOccurs="0"/>
+</xsd:sequence>
+</xsd:complexType>
+</xsd:element>
+<xsd:element name="Party">
+<xsd:complexType>
+<xsd:sequence>
+<xsd:element ref="partyId"/>
+<xsd:element ref="partyName"/>
+</xsd:sequence>
+<xsd:attribute name="partyType" use="required">
+<xsd:simpleType>
+<xsd:restriction base="xsd:NMTOKEN">
+<xsd:enumeration value="PSI"/>
+<xsd:enumeration value="TDP"/>
+</xsd:restriction>
+</xsd:simpleType>
+</xsd:attribute>
+<xsd:attribute name="partyRole" use="required">
+<xsd:simpleType>
+<xsd:restriction base="xsd:NMTOKEN">
+<xsd:enumeration value="sender"/>
+<xsd:enumeration value="PSI"/>
+</xsd:restriction>
+</xsd:simpleType>
+</xsd:attribute>
+</xsd:complexType>
+</xsd:element>
+<xsd:element name="partyId" type="xsd:string"/>
+<xsd:element name="partyName" type="xsd:string"/>
+<xsd:element name="softwareUsed" type="xsd:string"/>
+<xsd:element name="Declaration">
+<xsd:complexType>
+<xsd:sequence>
+<xsd:element ref="declarationId"/>
+<xsd:element ref="referencePeriod"/>
+<xsd:element ref="PSIId"/>
+<xsd:element ref="Function"/>
+<xsd:element ref="declarationTypeCode"/>
+<xsd:element ref="flowCode"/>
+<xsd:element ref="currencyCode"/>
+<xsd:element ref="Item" maxOccurs="unbounded"/>
+</xsd:sequence>
+</xsd:complexType>
+</xsd:element>
+<xsd:element name="declarationId" type="xsd:string"/>
+<xsd:element name="referencePeriod" type="xsd:string"/>
+<xsd:element name="PSIId" type="xsd:string"/>
+<xsd:element name="Function">
+<xsd:complexType>
+<xsd:sequence>
+<xsd:element ref="functionCode"/>
+</xsd:sequence>
+</xsd:complexType>
+</xsd:element>
+<xsd:element name="functionCode" type="xsd:string"/>
+<xsd:element name="declarationTypeCode" type="xsd:string"/>
+<xsd:element name="flowCode" type="xsd:string"/>
+<xsd:element name="currencyCode" type="xsd:string"/>
+<xsd:element name="Item">
+<xsd:complexType>
+<xsd:sequence>
+<xsd:element ref="itemNumber"/>
+<xsd:element ref="CN8" minOccurs="0"/>
+<xsd:element ref="MSConsDestCode" minOccurs="0"/>
+<xsd:element ref="countryOfOriginCode" minOccurs="0"/>
+<xsd:element ref="netMass" minOccurs="0"/>
+<xsd:element ref="quantityInSU" minOccurs="0"/>
+<xsd:element ref="invoicedAmount"/>
+<xsd:element ref="partnerId" minOccurs="0"/>
+<xsd:element ref="invoicedNumber" minOccurs="0"/>
+<xsd:element ref="statisticalProcedureCode" />
+<xsd:element ref="NatureOfTransaction" minOccurs="0"/>
+<xsd:element ref="modeOfTransportCode" minOccurs="0"/>
+<xsd:element ref="regionCode" minOccurs="0"/>
+</xsd:sequence>
+</xsd:complexType>
+</xsd:element>
+<xsd:element name="itemNumber" type="xsd:integer"/>
+<xsd:element name="CN8">
+<xsd:complexType>
+<xsd:sequence>
+<xsd:element ref="CN8Code" minOccurs="0"/>
+<xsd:element ref="SUCode" minOccurs="0"/>
+<xsd:element ref="additionalGoodsCode" minOccurs="0"/>
+</xsd:sequence>
+</xsd:complexType>
+</xsd:element>
+<xsd:element name="CN8Code" type="xsd:string"/>
+<xsd:element name="SUCode" type="xsd:string"/>
+<xsd:element name="additionalGoodsCode" type="xsd:string"/>
+<xsd:element name="MSConsDestCode" type="xsd:string"/>
+<xsd:element name="countryOfOriginCode" type="xsd:string"/>
+<xsd:element name="netMass" type="xsd:integer"/>
+<xsd:element name="quantityInSU" type="xsd:integer"/>
+<xsd:element name="invoicedAmount" type="xsd:integer"/>
+<xsd:element name="partnerId" type="xsd:string"/>
+<xsd:element name="invoicedNumber" type="xsd:string"/>
+<xsd:element name="statisticalProcedureCode" type="xsd:integer"/>
+<xsd:element name="NatureOfTransaction">
+<xsd:complexType>
+<xsd:sequence>
+<xsd:element ref="natureOfTransactionACode"/>
+<xsd:element ref="natureOfTransactionBCode" minOccurs="0"/>
+</xsd:sequence>
+</xsd:complexType>
+</xsd:element>
+<xsd:element name="natureOfTransactionACode" type="xsd:string"/>
+<xsd:element name="natureOfTransactionBCode" type="xsd:string"/>
+<xsd:element name="modeOfTransportCode" type="xsd:string"/>
+<xsd:element name="regionCode" type="xsd:string"/>
+<xsd:element name="date" type="xsd:date"/>
+<xsd:element name="time" type="xsd:time"/>
+</xsd:schema>
\ No newline at end of file

From 38df864b985732d23f971fca53fcb8f310c8ee08 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 17 Dec 2020 06:14:41 +0100
Subject: [PATCH 490/888] Module Intracommreport - Add manual

---
 .../intracommreport/manuelDebXml1.2.pdf        | Bin 0 -> 320342 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 dev/resources/intracommreport/manuelDebXml1.2.pdf

diff --git a/dev/resources/intracommreport/manuelDebXml1.2.pdf b/dev/resources/intracommreport/manuelDebXml1.2.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..50544632a0fcb988af414514fd049f539bf0dff5
GIT binary patch
literal 320342
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
ac>tN>L&iI@FhL-4EKH)Jnucf=rvCvMLi!T`

literal 0
HcmV?d00001


From 36e0f0709008cfe59701b4279543ea69f29460da Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 17 Dec 2020 08:52:39 +0100
Subject: [PATCH 491/888] Remove warning

---
 htdocs/core/lib/functions.lib.php | 83 +++++++++++++++----------------
 1 file changed, 41 insertions(+), 42 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 04e096c4e3f..f5e4472eaf3 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4946,8 +4946,7 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
 
 	$vatratecleaned = $vatrate;
 	$reg = array();
-	if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "xx (yy)"
-	{
+	if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {     // If vat is "xx (yy)"
 		$vatratecleaned = trim($reg[1]);
 		$vatratecode = $reg[2];
 	}
@@ -4958,25 +4957,20 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
 	}*/
 
 	// Some test to guess with no need to make database access
-	if ($mysoc->country_code == 'ES') // For spain localtaxes 1 and 2, tax is qualified if buyer use local tax
-	{
-		if ($local == 1)
-		{
+	if ($mysoc->country_code == 'ES') { // For spain localtaxes 1 and 2, tax is qualified if buyer use local tax
+		if ($local == 1) {
 			if (!$mysoc->localtax1_assuj || (string) $vatratecleaned == "0") return 0;
-			if ($thirdparty_seller->id == $mysoc->id)
-			{
+			if ($thirdparty_seller->id == $mysoc->id) {
 				if (!$thirdparty_buyer->localtax1_assuj) return 0;
 			} else {
 				if (!$thirdparty_seller->localtax1_assuj) return 0;
 			}
 		}
 
-		if ($local == 2)
-		{
+		if ($local == 2) {
 			//if (! $mysoc->localtax2_assuj || (string) $vatratecleaned == "0") return 0;
 			if (!$mysoc->localtax2_assuj) return 0; // If main vat is 0, IRPF may be different than 0.
-			if ($thirdparty_seller->id == $mysoc->id)
-			{
+			if ($thirdparty_seller->id == $mysoc->id) {
 				if (!$thirdparty_buyer->localtax2_assuj) return 0;
 			} else {
 				if (!$thirdparty_seller->localtax2_assuj) return 0;
@@ -4988,43 +4982,34 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
 	}
 
 	// For some country MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY is forced to on.
-	if (in_array($mysoc->country_code, array('ES')))
-	{
+	if (in_array($mysoc->country_code, array('ES'))) {
 		$conf->global->MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY = 1;
 	}
 
 	// Search local taxes
 	if (!empty($conf->global->MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY))
 	{
-		if ($local == 1)
-		{
-			if ($thirdparty_seller != $mysoc)
-			{
+		if ($local == 1) {
+			if ($thirdparty_seller != $mysoc) {
 				if (!isOnlyOneLocalTax($local))  // TODO We should provide $vatrate to search on correct line and not always on line with highest vat rate
 				{
 					return $thirdparty_seller->localtax1_value;
 				}
-			} else // i am the seller
-			{
-				if (!isOnlyOneLocalTax($local))  // TODO If seller is me, why not always returning this, even if there is only one locatax vat.
-				{
+			} else { // i am the seller
+				if (!isOnlyOneLocalTax($local)) { // TODO If seller is me, why not always returning this, even if there is only one locatax vat.
 					return $conf->global->MAIN_INFO_VALUE_LOCALTAX1;
 				}
 			}
 		}
-		if ($local == 2)
-		{
-			if ($thirdparty_seller != $mysoc)
-			{
+		if ($local == 2) {
+			if ($thirdparty_seller != $mysoc) {
 				if (!isOnlyOneLocalTax($local))  // TODO We should provide $vatrate to search on correct line and not always on line with highest vat rate
 				// TODO We should also return value defined on thirdparty only if defined
 				{
 					return $thirdparty_seller->localtax2_value;
 				}
-			} else // i am the seller
-			{
-				if (in_array($mysoc->country_code, array('ES')))
-				{
+			} else { // i am the seller
+				if (in_array($mysoc->country_code, array('ES'))) {
 					return $thirdparty_buyer->localtax2_value;
 				} else {
 					return $conf->global->MAIN_INFO_VALUE_LOCALTAX2;
@@ -5046,8 +5031,10 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
    	if ($resql)
    	{
    		$obj = $db->fetch_object($resql);
-   		if ($local == 1) return $obj->localtax1;
-   		elseif ($local == 2) return $obj->localtax2;
+   		if ($obj) {
+	   		if ($local == 1) return $obj->localtax1;
+   			elseif ($local == 2) return $obj->localtax2;
+   		}
 	}
 
 	return 0;
@@ -5068,8 +5055,7 @@ function isOnlyOneLocalTax($local)
 
 	$valors = explode(":", $tax);
 
-	if (count($valors) > 1)
-	{
+	if (count($valors) > 1) {
 		return false;
 	} else {
 		return true;
@@ -5105,8 +5091,8 @@ function get_localtax_by_third($local)
 
 
 /**
- *  Get vat main information from Id.
- *  You can call getLocalTaxesFromRate after to get other fields.
+ *  Get tax (VAT) main information from Id.
+ *  You can also call getLocalTaxesFromRate() after to get only localtax fields.
  *
  *  @param	int|string  $vatrate		    VAT ID or Rate. Value can be value or the string with code into parenthesis or rowid if $firstparamisid is 1. Example: '8.5' or '8.5 (8.5NPR)' or 123.
  *  @param	Societe	    $buyer         		Company object
@@ -5122,12 +5108,15 @@ function getTaxesFromId($vatrate, $buyer = null, $seller = null, $firstparamisid
 	dol_syslog("getTaxesFromId vat id or rate = ".$vatrate);
 
 	// Search local taxes
-	$sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr, t.accountancy_code_sell, t.accountancy_code_buy";
+	$sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr, t.accountancy_code_sell, t.accountancy_code_buy,";
+	$sql .= " t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type";
 	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";
-	if ($firstparamisid) $sql .= " WHERE t.rowid = ".(int) $vatrate;
-	else {
+	if ($firstparamisid) {
+		$sql .= " WHERE t.rowid = ".(int) $vatrate;
+	} else {
 		$vatratecleaned = $vatrate;
 		$vatratecode = '';
+		$reg = array();
 		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "xx (yy)"
 		{
 			$vatratecleaned = $reg[1];
@@ -5143,10 +5132,20 @@ function getTaxesFromId($vatrate, $buyer = null, $seller = null, $firstparamisid
 	}
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$obj = $db->fetch_object($resql);
-		if ($obj) return array('rowid'=>$obj->rowid, 'code'=>$obj->code, 'rate'=>$obj->rate, 'npr'=>$obj->npr, 'accountancy_code_sell'=>$obj->accountancy_code_sell, 'accountancy_code_buy'=>$obj->accountancy_code_buy);
+		if ($obj) return array(
+			'rowid'=>$obj->rowid,
+			'code'=>$obj->code,
+			'rate'=>$obj->rate,
+			'localtax1'=>$obj->localtax1,
+			'localtax1_type'=>$obj->localtax1_type,
+			'localtax2'=>$obj->localtax2,
+			'localtax2_type'=>$obj->localtax2_type,
+			'npr'=>$obj->npr,
+			'accountancy_code_sell'=>$obj->accountancy_code_sell,
+			'accountancy_code_buy'=>$obj->accountancy_code_buy
+		);
 		else return array();
 	} else dol_print_error($db);
 

From 10ac74162e71e9463883feb46293e74c18ad4e17 Mon Sep 17 00:00:00 2001
From: Haldarys <49756127+Haldarys@users.noreply.github.com>
Date: Thu, 17 Dec 2020 10:19:21 +0100
Subject: [PATCH 492/888] Fix PRELEVEMENT_ADDDAYS check

If we used a positive value in PRELEVEMENT_ADDDAYS it couldn't submit the changes to database
---
 htdocs/admin/prelevement.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index 144ec744d41..2f942410787 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -92,11 +92,10 @@ if ($action == "set")
         if (! $res > 0) $error++;
     }
 
-    if (GETPOST("PRELEVEMENT_ADDDAYS") || GETPOST("PRELEVEMENT_ADDDAYS")=="")
-    {
-        $res = dolibarr_set_const($db, "PRELEVEMENT_ADDDAYS", GETPOST("PRELEVEMENT_ADDDAYS"), 'chaine', 0, '', $conf->entity);
-        if (! $res > 0) $error++;
-    } elseif (! $error)
+    $res = dolibarr_set_const($db, "PRELEVEMENT_ADDDAYS", GETPOST("PRELEVEMENT_ADDDAYS"), 'chaine', 0, '', $conf->entity);
+    if (! $res > 0) $error++;
+    
+    if (! $error)
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');

From b0d524beed9c811d362999104efb37089cdeb278 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 17 Dec 2020 11:57:12 +0100
Subject: [PATCH 493/888] Debug v13

---
 htdocs/core/class/commonobject.class.php     | 42 ++++++++------------
 htdocs/core/class/html.formfile.class.php    | 11 ++---
 htdocs/core/lib/functions.lib.php            | 20 +++++-----
 htdocs/langs/en_US/main.lang                 |  5 ++-
 htdocs/langs/en_US/ticket.lang               |  1 -
 htdocs/langs/fr_FR/main.lang                 |  1 +
 htdocs/langs/fr_FR/ticket.lang               |  2 -
 htdocs/product/class/product.class.php       |  2 +-
 htdocs/product/document.php                  |  4 +-
 htdocs/theme/eldy/global.inc.php             | 13 +++---
 htdocs/theme/eldy/theme_vars.inc.php         |  2 +-
 htdocs/theme/md/style.css.php                |  8 +++-
 htdocs/theme/md/theme_vars.inc.php           |  2 +-
 htdocs/ticket/card.php                       | 21 ++++------
 htdocs/ticket/class/actions_ticket.class.php | 11 ++---
 htdocs/ticket/class/ticket.class.php         | 26 +++++++-----
 htdocs/ticket/index.php                      | 20 +++++-----
 htdocs/user/document.php                     |  4 +-
 18 files changed, 98 insertions(+), 97 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index b095712d972..6df0e2f006d 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7154,20 +7154,20 @@ abstract class CommonObject
 		$dir = $sdir.'/';
 		$pdir = '/';
 
-		$dir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';
-		$pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';
+		$dir .= get_exdir(0, 0, 0, 0, $this, $modulepart);
+		$pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart);
 
 		// For backward compatibility
-		if ($modulepart == 'product' && !empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-		{
-			$dir = $sdir.'/'.get_exdir($this->id, 2, 0, 0, $this, $modulepart).$this->id."/photos/";
-			$pdir = '/'.get_exdir($this->id, 2, 0, 0, $this, $modulepart).$this->id."/photos/";
+		if ($modulepart == 'product') {
+			if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+				$dir = $sdir.'/'.get_exdir($this->id, 2, 0, 0, $this, $modulepart).$this->id."/photos/";
+				$pdir = '/'.get_exdir($this->id, 2, 0, 0, $this, $modulepart).$this->id."/photos/";
+			}
 		}
 
 		// Defined relative dir to DOL_DATA_ROOT
 		$relativedir = '';
-		if ($dir)
-		{
+		if ($dir) {
 			$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $dir);
 			$relativedir = preg_replace('/^[\\/]/', '', $relativedir);
 			$relativedir = preg_replace('/[\\/]$/', '', $relativedir);
@@ -7189,23 +7189,19 @@ abstract class CommonObject
 
 		completeFileArrayWithDatabaseInfo($filearray, $relativedir);
 
-		if (count($filearray))
-		{
-			if ($sortfield && $sortorder)
-			{
+		if (count($filearray)) {
+			if ($sortfield && $sortorder) {
 				$filearray = dol_sort_array($filearray, $sortfield, $sortorder);
 			}
 
-			foreach ($filearray as $key => $val)
-			{
+			foreach ($filearray as $key => $val) {
 				$photo = '';
 				$file = $val['name'];
 
 				//if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure file is stored in UTF8 in memory
 
 				//if (dol_is_file($dir.$file) && image_format_supported($file) >= 0)
-				if (image_format_supported($file) >= 0)
-				{
+				if (image_format_supported($file) >= 0) {
 					$nbphoto++;
 					$photo = $file;
 					$viewfilename = $file;
@@ -7242,12 +7238,9 @@ abstract class CommonObject
 						$alt .= ' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];
 						if ($notitle) $alt = '';
 
-						if ($usesharelink)
-						{
-							if ($val['share'])
-							{
-								if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
-								{
+						if ($usesharelink) {
+							if ($val['share']) {
+								if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight) {
 									$return .= '<!-- Show original file (thumb not yet available with shared links) -->';
 									$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
 								} else {
@@ -7259,10 +7252,9 @@ abstract class CommonObject
 								$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';
 							}
 						} else {
-							if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
-							{
+							if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight) {
 								$return .= '<!-- Show thumb -->';
-								$return .= '<img class="photo photowithmargin"  height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
+								$return .= '<img class="photo photowithmargin maxwidth150onsmartphone" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
 							} else {
 								$return .= '<!-- Show original file -->';
 								$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 437cef27afc..6836b70fe2d 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1254,7 +1254,7 @@ class FormFile
 							} else {
 								print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
 							}
-							print '<img class="photo maxwidth200 shadow" 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 '<img class="photo maxwidth200 shadow valignmiddle" 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;';
 						print '</td>';
@@ -1779,7 +1779,7 @@ class FormFile
 		print '<!-- listOfLinks -->'."\n";
 
 		// Show list of associated links
-		print load_fiche_titre($langs->trans("LinkedFiles"), '', 'external-link-square-alt', 0, '', 'table-list-of-links');
+		print load_fiche_titre($langs->trans("LinkedFiles"), '', 'link', 0, '', 'table-list-of-links');
 
 		print '<form action="'.$_SERVER['PHP_SELF'].($param ? '?'.$param : '').'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -1913,11 +1913,12 @@ class FormFile
 			{
 				$out .= '<a class="pictopreview '.$urladvancedpreview['css'].'" href="'.$urladvancedpreview['url'].'"'.(empty($urladvancedpreview['mime']) ? '' : ' mime="'.$urladvancedpreview['mime'].'"').' '.(empty($urladvancedpreview['target']) ? '' : ' target="'.$urladvancedpreview['target'].'"').'>';
 				//$out.= '<a class="pictopreview">';
-				if (empty($ruleforpicto))
-				{
+				if (empty($ruleforpicto)) {
 					//$out.= img_picto($langs->trans('Preview').' '.$file['name'], 'detail');
 					$out .= '<span class="fa fa-search-plus" style="color: gray"></span>';
-				} else $out .= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
+				} else {
+					$out .= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
+				}
 				$out .= '</a>';
 			}
 		}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f5e4472eaf3..a7533df3fb9 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1620,6 +1620,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 		$showimage = $object->is_photo_available($conf->ticket->multidir_output[$entity].'/'.$object->ref);
 		$maxvisiblephotos = (isset($conf->global->TICKET_MAX_VISIBLE_PHOTO) ? $conf->global->TICKET_MAX_VISIBLE_PHOTO : 2);
 		if ($conf->browser->layout == 'phone') $maxvisiblephotos = 1;
+
 		if ($showimage)
 		{
 			$showphoto = $object->show_photos('ticket', $conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0);
@@ -1636,8 +1637,11 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 				$nophoto = '';
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';
 			} else {    // Show no photo link
-				$nophoto = '/public/theme/common/nophoto.png';
-				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" border="0"'.($width ? ' style="width: '.$width.'px"' : '').' src="'.DOL_URL_ROOT.$nophoto.'"></div>';
+				$nophoto = img_picto('No photo', 'object_ticket');
+				$morehtmlleft .= '<!-- No photo to show -->';
+				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';
+				$morehtmlleft .= $nophoto;
+				$morehtmlleft .= '</div></div>';
 			}
 		}
 	} else {
@@ -3213,7 +3217,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'edit', 'ellipsis-h', 'email', 'eraser', 'external-link-alt', 'external-link-square-alt',
 				'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'globe', 'globe-americas', 'grip', 'grip_title', 'group',
 				'help', 'holiday',
-				'intervention', 'label', 'language', 'list', 'listlight', 'lot',
+				'intervention', 'label', 'language', 'link', 'list', 'listlight', 'lot',
 				'map-marker-alt', 'member', 'money-bill-alt', 'mrp', 'note', 'next',
 				'object_accounting', 'object_account', 'object_accountline', 'object_action', 'object_barcode', 'object_bill', 'object_billa', 'object_billd', 'object_bom',
 				'object_category', 'object_conversation', 'object_bookmark', 'object_bug', 'object_dolly', 'object_dollyrevert', 'object_generic', 'object_folder',
@@ -5590,12 +5594,10 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart = '
 		if ($level == 3) $path = substr($num, 2, 1).'/'.substr($num, 1, 1).'/'.substr($num, 0, 1);
 	} else {
 		// We will enhance here a common way of forging path for document storage.
-		// In a future, we may distribut directories on several levels depending on setup and object.
+		// In a future, we may distribute directories on several levels depending on setup and object.
 		// Here, $object->id, $object->ref and $modulepart are required.
 		//var_dump($modulepart);
-		if (!in_array($modulepart, array('product'))) {	// Test to remove
-			$path = dol_sanitizeFileName(empty($object->ref) ? (string) $object->id : $object->ref);
-		}
+		$path = dol_sanitizeFileName(empty($object->ref) ? (string) $object->id : $object->ref);
 	}
 
 	if (empty($withoutslash) && !empty($path)) $path .= '/';
@@ -8533,7 +8535,7 @@ function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = '
  * @param   string  $statusType        status0 status1 status2 status3 status4 status5 status6 status7 status8 status9 : image name or badge name
  * @param   int	    $displayMode       0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
  * @param   string  $url               The url for link
- * @param   array   $params            Various params. Example: array('tooltip'=>'...', 'badgeParams'=>...)
+ * @param   array   $params            Various params. Example: array('tooltip'=>'no|...', 'badgeParams'=>...)
  * @return  string                     Html status string
  */
 function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $statusType = 'status0', $displayMode = 0, $url = '', $params = array())
@@ -8602,7 +8604,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
 		$statusLabelShort = (empty($statusLabelShort) ? $statusLabel : $statusLabelShort);
 
 		$dolGetBadgeParams['attr']['class'] = 'badge-status';
-		$dolGetBadgeParams['attr']['title'] = empty($params['tooltip']) ? $statusLabel : $params['tooltip'];
+		$dolGetBadgeParams['attr']['title'] = empty($params['tooltip']) ? $statusLabel : ($params['tooltip'] != 'no' ? $params['tooltip'] : '');
 
 		if ($displayMode == 3) {
 			$return = dolGetBadge((empty($conf->dol_optimize_smallscreen) ? $statusLabel : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort)), '', $statusType, 'dot', $url, $dolGetBadgeParams);
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 73c9964000e..07c463b7371 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -674,7 +674,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1109,4 +1109,5 @@ SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has exp
 UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
-UpdateForAllLines=Update for all lines
\ No newline at end of file
+UpdateForAllLines=Update for all lines
+OnHold=On hold
\ No newline at end of file
diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index a7726032558..3ca908e86d8 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -58,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 4756a52b6a2..3f1076eb335 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -672,6 +672,7 @@ Email=Email
 NoEMail=Pas d'email
 AlreadyRead=Déjà lu
 NotRead=Non lu
+Unread=Non lu
 NoMobilePhone=Pas de téléphone portable
 Owner=Propriétaire
 FollowingConstantsWillBeSubstituted=Les constantes suivantes seront substituées par leur valeur correspondante.
diff --git a/htdocs/langs/fr_FR/ticket.lang b/htdocs/langs/fr_FR/ticket.lang
index 54e7ec0be33..926ca24d3da 100644
--- a/htdocs/langs/fr_FR/ticket.lang
+++ b/htdocs/langs/fr_FR/ticket.lang
@@ -60,7 +60,6 @@ OriginEmail=E-mail source
 Notify_TICKET_SENTBYMAIL=Envoi d'un message du ticket par e-mail
 
 # Status
-NotRead=Non lu
 Read=Lu
 Assigned=Assigné
 InProgress=En cours
@@ -231,7 +230,6 @@ TicketChangeStatus=Changer l'état
 TicketConfirmChangeStatus=Confirmez le changement d'état: %s?
 TicketLogStatusChanged=Statut modifié: %s à %s
 TicketNotNotifyTiersAtCreate=Ne pas notifier l'entreprise à la création
-Unread=Non lu
 TicketNotCreatedFromPublicInterface=Non disponible. Le ticket n’a pas été créé à partir de l'interface publique.
 PublicInterfaceNotEnabled=L’interface publique n’a pas été activée
 ErrorTicketRefRequired=La référence du ticket est requise
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index a6d676a0f7b..3201dd652aa 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -5136,7 +5136,7 @@ class Product extends CommonObject
 		if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
 			$dir .= '/'.get_exdir($this->id, 2, 0, 0, $this, 'product').$this->id."/photos/";
 		} else {
-			$dir .= '/'.get_exdir(0, 0, 0, 0, $this, 'product').dol_sanitizeFileName($this->ref).'/';
+			$dir .= '/'.get_exdir(0, 0, 0, 0, $this, 'product');
 		}
 
 		$nbphoto = 0;
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 0e3d3c662b0..f8f5322f2f8 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -72,8 +72,8 @@ if ($id > 0 || !empty($ref))
 {
 	$result = $object->fetch($id, $ref);
 
-	if (!empty($conf->product->enabled)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
-	elseif (!empty($conf->service->enabled)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
+	if (!empty($conf->product->enabled)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'product');
+	elseif (!empty($conf->service->enabled)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'product');
 
 	if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
 	{
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 1dc8f27b644..cfab5312073 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -319,10 +319,13 @@ input.buttonpaymentstripe {
 	max-width: 320px;
 }
 
-a.buttonticket {
+a.butStatus {
 	padding-left: 5px;
 	padding-right: 5px;
-    /* height: 40px; */
+    background-color: transparent;
+    color: var(--colortext) !important;
+    border: 2px solid var( --butactionbg);
+    margin: 0 0.45em !important;
 }
 
 /* Used by timesheets */
@@ -1498,7 +1501,7 @@ select.widthcentpercentminusxx, input.widthcentpercentminusxx {
 }
 .linkobject { cursor: pointer; }
 
-table.tableforfield tr>td:first-of-type, div.tableforfield div.tagtr>div.tagtd:first-of-type {
+table.tableforfield tr>td:first-of-type, tr.trforfield>td:first-of-type, div.tableforfield div.tagtr>div.tagtd:first-of-type {
 	color: var(--tableforfieldcolor);
 }
 
@@ -3695,8 +3698,8 @@ table.noborder.paymenttable {
 	box-shadow: 0px 0px 0px #DDD !important;
 }
 .shadow {
-	-webkit-box-shadow: 2px 2px 5px #CCC !important;
-	box-shadow: 2px 2px 5px #CCC !important;
+	-webkit-box-shadow: 1px 1px 7px #CCC !important;
+	box-shadow: 1px 1px 7px #CCC !important;
 }
 
 div.tabBar .noborder {
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index 572404f3eea..cc73803f452 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -114,7 +114,7 @@ $badgeStatus4 = '#25a580'; // Color ok
 $badgeStatus4b = '#25a580'; // Color ok
 $badgeStatus5 = '#cad2d2';
 $badgeStatus6 = '#cad2d2';
-$badgeStatus7 = '#baa32b';
+$badgeStatus7 = '#25a580';
 $badgeStatus8 = '#993013';
 $badgeStatus9 = '#e7f0f0';
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 7b4ecf08e8e..01cace5a5e8 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -459,9 +459,13 @@ input.buttonpaymentstripe {
 .logopublicpayment #dolpaymentlogo {
 	max-height: 100px;
 }
-a.buttonticket {
+a.butStatus {
 	padding-left: 5px;
 	padding-right: 5px;
+	background-color: transparent;
+    color: var(--colortext) !important;
+    border: 2px solid var( --butactionbg);
+    margin: 0 0.45em !important;
 }
 
 /* Used by timesheets */
@@ -1453,7 +1457,7 @@ table[summary="list_of_modules"] .fa-cog {
 }
 .linkobject { cursor: pointer; }
 
-table.tableforfield tr>td:first-of-type, div.tableforfield div.tagtr>div.tagtd:first-of-type {
+table.tableforfield tr>td:first-of-type, tr.trforfield>td:first-of-type, div.tableforfield div.tagtr>div.tagtd:first-of-type {
 	color: #666;
 }
 
diff --git a/htdocs/theme/md/theme_vars.inc.php b/htdocs/theme/md/theme_vars.inc.php
index fdf62ffb1bf..e74c206ad20 100644
--- a/htdocs/theme/md/theme_vars.inc.php
+++ b/htdocs/theme/md/theme_vars.inc.php
@@ -97,6 +97,6 @@ $badgeStatus3 = '#bca52b';
 $badgeStatus4 = '#277d1e';
 $badgeStatus5 = '#cad2d2';
 $badgeStatus6 = '#cad2d2';
-$badgeStatus7 = '#baa32b';
+$badgeStatus7 = '#277d1e';
 $badgeStatus8 = '#993013';
 $badgeStatus9 = '#e7f0f0';
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 9618ab128ec..2cd8fe7f697 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -667,9 +667,6 @@ if ($action == 'create' || $action == 'presend')
 	$formticket->withfile = 2;
 	$formticket->withextrafields = 1;
 	$formticket->param = array('origin' => GETPOST('origin'), 'originid' => GETPOST('originid'));
-	if (empty($defaultref)) {
-		$defaultref = '';
-	}
 
 	$formticket->showForm(1, 'create');
 } elseif ($action == 'edit' && $user->rights->ticket->write && $object->fk_statut < Ticket::STATUS_CLOSED) {
@@ -863,8 +860,7 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
 		}
 
 		// Thirdparty
-		if (!empty($conf->societe->enabled))
-		{
+		if (!empty($conf->societe->enabled)) {
 			$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' ';
 			if ($action != 'editcustomer' && $object->fk_statut < 8 && !$user->socid && $user->rights->ticket->write) {
 				$morehtmlref .= '<a class="editfielda" href="'.$url_page_current.'?action=editcustomer&track_id='.$object->track_id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 0).'</a> : ';
@@ -877,12 +873,10 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
 		}
 
 		// Project
-		if (!empty($conf->projet->enabled))
-		{
+		if (!empty($conf->projet->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-			if ($user->rights->ticket->write)
-			{
+			if ($user->rights->ticket->write) {
 				if ($action != 'classify')
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a>';
 	   			$morehtmlref .= ' : ';
@@ -967,7 +961,7 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
 		print '<tr><td>';
 		print '<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';
 		print $langs->trans("AssignedTo");
-		if ($object->fk_statut < 8 && GETPOST('set', 'alpha') != "assign_ticket" && $user->rights->ticket->manage) {
+		if ($object->fk_statut < $object::STATUS_CLOSED && GETPOST('set', 'alpha') != "assign_ticket" && $user->rights->ticket->manage) {
 			print '<td class="right"><a class="editfielda" href="'.$url_page_current.'?track_id='.$object->track_id.'&action=view&set=assign_ticket">'.img_edit($langs->trans('Modify'), '').'</a></td>';
 		}
 		print '</tr></table>';
@@ -995,7 +989,7 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
 		print '<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';
 		print $langs->trans('Progression').'</td><td class="left">';
 		print '</td>';
-		if ($action != 'progression' && $object->fk_statut < 8 && !$user->socid) {
+		if ($action != 'progression' && $object->fk_statut < $object::STATUS_CLOSED && !$user->socid) {
 			print '<td class="right"><a class="editfielda" href="'.$url_page_current.'?action=progression&amp;track_id='.$object->track_id.'">'.img_edit($langs->trans('Modify')).'</a></td>';
 		}
 		print '</tr></table>';
@@ -1054,7 +1048,6 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
 		print '<form method="post" name="formticketproperties" action="'.$url_page_current.'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="change_property">';
-		print '<input type="hidden" name="property" value="'.$property['dict'].'">';
 		print '<input type="hidden" name="track_id" value="'.$track_id.'">';
 
 		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
@@ -1068,7 +1061,7 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
 			print '<input class="button" type="submit" name="btn_update_ticket_prop" value="'.$langs->trans("Modify").'" />';
 		} else {
 			//    Button to edit Properties
-			if ($object->fk_statut < 5 && $user->rights->ticket->write) {
+			if ($object->fk_statut < $object::STATUS_NEED_MORE_INFO && $user->rights->ticket->write) {
 				print '<a class="editfielda" href="card.php?track_id='.$object->track_id.'&action=view&set=properties">'.img_edit($langs->trans('Modify')).'</a>';
 			}
 		}
@@ -1121,7 +1114,7 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
 
 		// Display navbar with links to change ticket status
 		print '<!-- navbar with status -->';
-		if (!$user->socid && $user->rights->ticket->write && $object->fk_statut < 8 && GETPOST('set') !== 'properties') {
+		if (!$user->socid && $user->rights->ticket->write && $object->fk_statut < $object::STATUS_CLOSED && GETPOST('set') !== 'properties') {
 			$actionobject->viewStatusActions($object);
 		}
 
diff --git a/htdocs/ticket/class/actions_ticket.class.php b/htdocs/ticket/class/actions_ticket.class.php
index 895cacdb4ed..40fc22e1347 100644
--- a/htdocs/ticket/class/actions_ticket.class.php
+++ b/htdocs/ticket/class/actions_ticket.class.php
@@ -193,7 +193,7 @@ class ActionsTicket
 		print '<div class="underbanner clearboth"></div>';
 		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 		print '<table class="noborder centpercent margintable">';
-		print '<tr class="liste_titre"><td class="nowrap titlefield">';
+		print '<tr class="liste_titre trforfield"><td class="nowrap titlefield">';
 		print $langs->trans("InitialMessage");
 		print '</td><td>';
 		if ($user->rights->ticket->manage) {
@@ -404,15 +404,16 @@ class ActionsTicket
 			if (!in_array($status, $exclude_status)) {
 				print '<div class="inline-block center marginbottomonly">';
 
-				if ($status == 1)
-				{
+				if ($status == 1) {
 					$urlforbutton = $_SERVER['PHP_SELF'].'?track_id='.$object->track_id.'&action=mark_ticket_read'; // To set as read, we use a dedicated action
 				} else {
 					$urlforbutton = $_SERVER['PHP_SELF'].'?track_id='.$object->track_id.'&action=set_status&token='.newToken().'&new_status='.$status;
 				}
 
-				print '<a class="butAction buttonticket marginbottomonly" href="'.$urlforbutton.'">';
-				print img_picto($langs->trans($object->statuts_short[$status]), 'statut'.$status.'.png@ticket').' '.$langs->trans($object->statuts_short[$status]);
+				print '<a class="butAction butStatus marginbottomonly" href="'.$urlforbutton.'">';
+				print $object->LibStatut($status, 3, 1).' ';
+				//print img_picto($langs->trans($object->statuts_short[$status]), 'statut'.$status.'.png@ticket', '', false, 0, 0, '', 'valignmiddle').' ';
+				print $langs->trans($object->statuts_short[$status]);
 				print '</a>';
 				print '</div>';
 			}
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index e5818fa7762..03e87067d10 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -217,7 +217,7 @@ class Ticket extends CommonObject
 	const STATUS_ASSIGNED = 2;
 	const STATUS_IN_PROGRESS = 3;
 	const STATUS_NEED_MORE_INFO = 5;
-	const STATUS_WAITING = 7;
+	const STATUS_WAITING = 7;			// on hold
 	const STATUS_CLOSED = 8;
 	const STATUS_CANCELED = 9;
 
@@ -292,8 +292,8 @@ class Ticket extends CommonObject
 			self::STATUS_READ => 'Read',
 			self::STATUS_ASSIGNED => 'Assigned',
 			self::STATUS_IN_PROGRESS => 'InProgress',
+			self::STATUS_WAITING => 'OnHold',
 			self::STATUS_NEED_MORE_INFO => 'NeedMoreInformation',
-			self::STATUS_WAITING => 'Suspended',
 			self::STATUS_CLOSED => 'Closed',
 			self::STATUS_CANCELED => 'Canceled'
 		);
@@ -302,8 +302,8 @@ class Ticket extends CommonObject
 			self::STATUS_READ => 'Read',
 			self::STATUS_ASSIGNED => 'Assigned',
 			self::STATUS_IN_PROGRESS => 'InProgress',
+			self::STATUS_WAITING => 'OnHold',
 			self::STATUS_NEED_MORE_INFO => 'NeedMoreInformation',
-			self::STATUS_WAITING => 'Suspended',
 			self::STATUS_CLOSED => 'Closed',
 			self::STATUS_CANCELED => 'Canceled'
 		);
@@ -1244,8 +1244,8 @@ class Ticket extends CommonObject
 	/**
 	 * Return status label of object
 	 *
-	 * @param      int		$mode     0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
-	 * @return     string    			  Label
+	 * @param      int		$mode     	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 * @return     string    			Label
 	 */
 	public function getLibStatut($mode = 0)
 	{
@@ -1259,9 +1259,10 @@ class Ticket extends CommonObject
 	 *
 	 *    @param      string 	$status      Id status
 	 *    @param      int		$mode        0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *    @param	  int		$notooltip	 1=No tooltip
 	 *    @return     string     			 Label
 	 */
-	public function LibStatut($status, $mode = 0)
+	public function LibStatut($status, $mode = 0, $notooltip = 0)
 	{
 		// phpcs:enable
 		global $langs;
@@ -1274,13 +1275,13 @@ class Ticket extends CommonObject
 		} elseif ($status == self::STATUS_READ) {
 			$statusType = 'status1';
 		} elseif ($status == self::STATUS_ASSIGNED) {
-			$statusType = 'status3';
+			$statusType = 'status2';
 		} elseif ($status == self::STATUS_IN_PROGRESS) {
 			$statusType = 'status4';
 		} elseif ($status == self::STATUS_WAITING) {
-			$statusType = 'status3';
+			$statusType = 'status7';
 		} elseif ($status == self::STATUS_NEED_MORE_INFO) {
-			$statusType = 'status9';
+			$statusType = 'status3';
 		} elseif ($status == self::STATUS_CANCELED) {
 			$statusType = 'status9';
 		} elseif ($status == self::STATUS_CLOSED) {
@@ -1292,7 +1293,12 @@ class Ticket extends CommonObject
 			$mode = 0;
 		}
 
-		return dolGetStatus($langs->trans($labelStatus), $langs->trans($labelStatusShort), '', $statusType, $mode);
+		$params = array();
+		if ($notooltip) {
+			$params = array('tooltip' => 'no');
+		}
+
+		return dolGetStatus($langs->trans($labelStatus), $langs->trans($labelStatusShort), '', $statusType, $mode, '', $params);
 	}
 
 
diff --git a/htdocs/ticket/index.php b/htdocs/ticket/index.php
index 52e10f78454..f871fafa893 100644
--- a/htdocs/ticket/index.php
+++ b/htdocs/ticket/index.php
@@ -186,21 +186,21 @@ if ($result) {
 	$dataseries = array();
 	$colorseries = array();
 
-	$dataseries[] = array('label' => $langs->trans("Unread"), 'data' => round($tick['unread']));
+	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($tickesupstatic->statuts_short[Ticket::STATUS_NOT_READ]), 'data' => round($tick['unread']));
 	$colorseries[Ticket::STATUS_NOT_READ] = '-'.$badgeStatus0;
-	$dataseries[] = array('label' => $langs->trans("Read"), 'data' => round($tick['read']));
+	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($tickesupstatic->statuts_short[Ticket::STATUS_READ]), 'data' => round($tick['read']));
 	$colorseries[Ticket::STATUS_READ] = $badgeStatus1;
-	$dataseries[] = array('label' => $langs->trans("Assigned"), 'data' => round($tick['assigned']));
+	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($tickesupstatic->statuts_short[Ticket::STATUS_ASSIGNED]), 'data' => round($tick['assigned']));
 	$colorseries[Ticket::STATUS_ASSIGNED] = $badgeStatus3;
-	$dataseries[] = array('label' => $langs->trans("InProgress"), 'data' => round($tick['inprogress']));
+	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($tickesupstatic->statuts_short[Ticket::STATUS_IN_PROGRESS]), 'data' => round($tick['inprogress']));
 	$colorseries[Ticket::STATUS_IN_PROGRESS] = $badgeStatus4;
-	$dataseries[] = array('label' => $langs->trans("Suspended"), 'data' => round($tick['waiting']));
-	$colorseries[Ticket::STATUS_WAITING] = '-'.$badgeStatus3;
-	$dataseries[] = array('label' => $langs->trans("NeedMoreInformation"), 'data' => round($tick['needmoreinfo']));
-	$colorseries[Ticket::STATUS_NEED_MORE_INFO] = $badgeStatus9;
-	$dataseries[] = array('label' => $langs->trans("Canceled"), 'data' => round($tick['canceled']));
+	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($tickesupstatic->statuts_short[Ticket::STATUS_WAITING]), 'data' => round($tick['waiting']));
+	$colorseries[Ticket::STATUS_WAITING] = '-'.$badgeStatus4;
+	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($tickesupstatic->statuts_short[Ticket::STATUS_NEED_MORE_INFO]), 'data' => round($tick['needmoreinfo']));
+	$colorseries[Ticket::STATUS_NEED_MORE_INFO] = '-'.$badgeStatus3;
+	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($tickesupstatic->statuts_short[Ticket::STATUS_CANCELED]), 'data' => round($tick['canceled']));
 	$colorseries[Ticket::STATUS_CANCELED] = $badgeStatus9;
-	$dataseries[] = array('label' => $langs->trans("Closed"), 'data' => round($tick['closed']));
+	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($tickesupstatic->statuts_short[Ticket::STATUS_CLOSED]), 'data' => round($tick['closed']));
 	$colorseries[Ticket::STATUS_CLOSED] = $badgeStatus6;
 } else {
 	dol_print_error($db);
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 950742305fb..5440ceeb725 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -154,10 +154,10 @@ if ($object->id)
 	// Login
 	print '<tr><td class="titlefield">'.$langs->trans("Login").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
 
-	// Nbre files
+	// Nunber of files
 	print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td>'.count($filearray).'</td></tr>';
 
-	//Total taille
+	// Total size
 	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>'.dol_print_size($totalsize, 1, 1).'</td></tr>';
 
 	print '</table>';

From d0cc93c60859b6a05578a34bd2641e0b4898eb68 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 17 Dec 2020 12:09:12 +0100
Subject: [PATCH 494/888] Fix look and feel v13

---
 htdocs/core/lib/functions.lib.php | 2 +-
 htdocs/core/lib/ticket.lib.php    | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a7533df3fb9..67dcc5f44f9 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8714,7 +8714,7 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
 	}
 
 	$class = 'btnTitle';
-	if ($iconClass == 'fa fa-plus-circle') $class .= ' btnTitlePlus';
+	if (in_array($iconClass, array('fa fa-plus-circle', 'fa fa-comment-dots'))) $class .= ' btnTitlePlus';
 	$useclassfortooltip = 1;
 
 	if (!empty($params['morecss'])) $class .= ' '.$params['morecss'];
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index dc7766dbdfa..f2d38512b2d 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -562,16 +562,15 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 		$out .= getTitleFieldOfList('Date', 0, $_SERVER["PHP_SELF"], 'a.datep', '', $param, '', $sortfield, $sortorder, '')."\n";
 		//$out.='</td>';
 
-		$out .= '<th class="liste_titre"><strong>'.$langs->trans("Search").' : </strong></th>';
+		$out .= '<th class="liste_titre"><strong class="hideonsmartphone">'.$langs->trans("Search").' : </strong></th>';
 		if ($donetodo) {
 			$out .= '<th class="liste_titre"></th>';
 		}
 		$out .= '<th class="liste_titre">'.$langs->trans("Type").' ';
-		$out .= $formactions->select_type_actions($actioncode, "actioncode", '', empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1, 0, 0, 1);
+		$out .= $formactions->select_type_actions($actioncode, "actioncode", '', empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1, 0, 0, 1, 'minwidth200imp');
 		$out .= '</th>';
 		$out .= '<th class="liste_titre maxwidth100onsmartphone">';
-		$out .= $langs->trans("Label").' ';
-		$out .= '<input type="text" class="maxwidth100onsmartphone" name="search_agenda_label" value="'.$filters['search_agenda_label'].'">';
+		$out .= '<input type="text" class="maxwidth100onsmartphone" name="search_agenda_label" value="'.$filters['search_agenda_label'].'" placeholder="'.$langs->trans("Label").'">';
 		$out .= '</th>';
 
 		$out .= '<th class="liste_titre width50 middle">';

From 075181a8d5f4bc6e24e66040b253e375794dbcc9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 17 Dec 2020 12:15:34 +0100
Subject: [PATCH 495/888] Look and feel v13

---
 htdocs/core/lib/ticket.lib.php   |  2 +-
 htdocs/theme/eldy/badges.inc.php | 10 ++++++++++
 htdocs/ticket/card.php           |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index f2d38512b2d..92fdfa21aff 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -856,7 +856,7 @@ function getTicketTimelineIcon($actionstatic, &$histo, $key)
 	if ($actionstatic->code == 'AC_TICKET_CREATE') {
 		$iconClass = 'fa fa-ticket';
 	} elseif ($actionstatic->code == 'AC_TICKET_MODIFY') {
-		$iconClass = 'fa fa-pencil';
+		$iconClass = 'fa fa-pencilxxx';
 	} elseif ($actionstatic->code == 'TICKET_MSG') {
 		$iconClass = 'fa fa-comments';
 	} elseif ($actionstatic->code == 'TICKET_MSG_PRIVATE') {
diff --git a/htdocs/theme/eldy/badges.inc.php b/htdocs/theme/eldy/badges.inc.php
index 86f5971891e..00c2a91a29c 100644
--- a/htdocs/theme/eldy/badges.inc.php
+++ b/htdocs/theme/eldy/badges.inc.php
@@ -191,6 +191,16 @@ a.badge-dark:focus, a.badge-dark:hover {
 }
 
 
+@media only screen and (max-width: 570px)
+{
+	span.badge.badge-status {
+	    overflow: hidden;
+	    max-width: 130px;
+	    text-overflow: ellipsis;
+	}
+}
+
+
 /* STATUS BADGES */
 <?php
 for ($i = 0; $i <= 9; $i++) {
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 2cd8fe7f697..84bec78bf30 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -695,7 +695,7 @@ if ($action == 'create' || $action == 'presend')
 	print '</td></tr>';
 
 	// Group
-	print '<tr><td><span class="fieldrequired"><label for="selectcategory_code">'.$langs->trans("TicketGroup").'</span></label></td><td>';
+	print '<tr><td><span class="fieldrequired"><label for="selectcategory_code">'.$langs->trans("TicketCategory").'</span></label></td><td>';
 	$formticket->selectGroupTickets((GETPOST('category_code') ? GETPOST('category_code') : $object->category_code), 'category_code', '', '2');
 	print '</td></tr>';
 

From 2e02f509934da53c5908752b10ec25e5f8abebd7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 17 Dec 2020 12:29:52 +0100
Subject: [PATCH 496/888] css

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

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 72a5e179f25..5fa4a3adfaa 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -675,7 +675,7 @@ if ($resql)
 	if (!empty($arrayfields['s.nom']['checked']))
 	{
 		print '<td class="liste_titre" align="left">';
-		print '<input class="flat" type="text" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
+		print '<input class="flat maxwidth100" type="text" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
 		print '</td>';
 	}
 	// Town

From 663d52fef120d66e62e8da9e3cf2cbb85a462c5c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 17 Dec 2020 12:31:53 +0100
Subject: [PATCH 497/888] Fix warning

---
 htdocs/fourn/class/fournisseur.product.class.php | 4 ++--
 htdocs/product/inventory/inventory.php           | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index d9737fa0a94..da301f7e4f6 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -569,7 +569,7 @@ class ProductFournisseur extends Product
 				$this->fourn_multicurrency_tx          = $obj->multicurrency_tx;
 				$this->fourn_multicurrency_id          = $obj->fk_multicurrency;
 				$this->fourn_multicurrency_code        = $obj->multicurrency_code;
-				if ($conf->barcode->enabled) {
+				if (!empty($conf->barcode->enabled)) {
 					$this->fourn_barcode = $obj->barcode; // deprecated
 					$this->fourn_fk_barcode_type = $obj->fk_barcode_type; // deprecated
 					$this->supplier_barcode = $obj->barcode;
@@ -686,7 +686,7 @@ class ProductFournisseur extends Product
 					if ($prodfourn->packaging < $prodfourn->fourn_qty) $prodfourn->packaging = $prodfourn->fourn_qty;
 				}
 
-				if ($conf->barcode->enabled) {
+				if (!empty($conf->barcode->enabled)) {
 					$prodfourn->supplier_barcode = $record["barcode"];
 					$prodfourn->supplier_fk_barcode_type = $record["fk_barcode_type"];
 				}
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 875f55b6fe4..d5c9ec4966b 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -342,13 +342,13 @@ if ($object->id > 0)
 				if ($permissiontoadd)
 				{
 					/*
-    				if ($conf->barcode->enabled) {
+    				if (!empty($conf->barcode->enabled)) {
     					print '<a href="#" class="butAction">'.$langs->trans("UpdateByScaningProductBarcode").'</a>';
     				}
-    				if ($conf->productbatch->enabled) {
+    				if (!empty($conf->productbatch->enabled)) {
     					print '<a href="#" class="butAction">'.$langs->trans('UpdateByScaningLot').'</a>';
     				}*/
-					if ($conf->barcode->enabled || $conf->productbatch->enabled) {
+					if (!empty($conf->barcode->enabled) || !empty($conf->productbatch->enabled)) {
 						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=updatebyscaning" class="butAction">'.$langs->trans("UpdateByScaning").'</a>';
 					}
 				} else {

From 4dbdcd147541288fa69ba715703a855983b6c3ad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 17 Dec 2020 13:42:20 +0100
Subject: [PATCH 498/888] Fix missing the section with last event on a holiday
 record

---
 htdocs/holiday/card.php | 48 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 4c88cdf53b3..09165ee89d1 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -1110,8 +1110,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 		print '</from>'."\n";
 	}
 } else {
-	if ($error)
-	{
+	if ($error) {
 		print '<div class="tabBar">';
 		print $error;
 		print '<br><br><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
@@ -1510,6 +1509,51 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 			print '<br><br><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
 			print '</div>';
 		}
+
+
+		// Select mail models is same action as presend
+		if (GETPOST('modelselected')) {
+			$action = 'presend';
+		}
+
+		if ($action != 'presend')
+		{
+			print '<div class="fichecenter"><div class="fichehalfleft">';
+			print '<a name="builddoc"></a>'; // ancre
+
+			$includedocgeneration = 0;
+
+			// Documents
+			if ($includedocgeneration) {
+				$objref = dol_sanitizeFileName($object->ref);
+				$relativepath = $objref.'/'.$objref.'.pdf';
+				$filedir = $conf->holiday->dir_output.'/'.$object->element.'/'.$objref;
+				$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+				$genallowed = ($user->rights->holiday->read && $object->fk_user == $user->id) || !empty($user->rights->holiday->readall); // If you can read, you can build the PDF to read content
+				$delallowed = ($user->rights->holiday->write && $object->fk_user == $user->id) || !empty($user->rights->holiday->writeall_advance); // If you can create/edit, you can remove a file on card
+				print $formfile->showdocuments('holiday:Holiday', $object->element.'/'.$objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
+			}
+
+			// Show links to link elements
+			//$linktoelem = $form->showLinkToObjectBlock($object, null, array('myobject'));
+			//$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+
+
+			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+			$MAXEVENT = 10;
+
+			/*$morehtmlright = '<a href="'.dol_buildpath('/holiday/myobject_agenda.php', 1).'?id='.$object->id.'">';
+			$morehtmlright .= $langs->trans("SeeAll");
+			$morehtmlright .= '</a>';*/
+
+			// List of actions on element
+			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+			$formactions = new FormActions($db);
+			$somethingshown = $formactions->showactions($object, $object->element, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlright);
+
+			print '</div></div></div>';
+		}
 	}
 }
 

From c092c88dd79b06d4aa6fc2409fba2ef03c29c212 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 17 Dec 2020 13:48:28 +0100
Subject: [PATCH 499/888] Fix warning

---
 htdocs/fourn/class/fournisseur.product.class.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index da301f7e4f6..91a9f53de18 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -280,6 +280,8 @@ class ProductFournisseur extends Product
 		}
 
 		// Multicurrency
+		$multicurrency_buyprice = null;
+		$multicurrency_unitBuyPrice = null;
 		if (!empty($conf->multicurrency->enabled)) {
 			if (empty($multicurrency_tx)) $multicurrency_tx = 1;
 			if (empty($multicurrency_buyprice)) $multicurrency_buyprice = 0;
@@ -301,6 +303,7 @@ class ProductFournisseur extends Product
 		$charges = price2num($charges, 'MU');
 		$qty = price2num($qty, 'MS');
 		$unitBuyPrice = price2num($buyprice / $qty, 'MU');
+
 		$packaging = price2num(((empty($this->packaging) || $this->packaging < $qty) ? $qty : $this->packaging), 'MS');
 
 		$error = 0;
@@ -314,8 +317,7 @@ class ProductFournisseur extends Product
 			$localtax1 = $localtaxes_array['1'];
 			$localtaxtype2 = $localtaxes_array['2'];
 			$localtax2 = $localtaxes_array['3'];
-		} else // old method. deprecated because ot can't retrieve type
-		{
+		} else { // old method. deprecated because ot can't retrieve type
 			$localtaxtype1 = '0';
 			$localtax1 = get_localtax($newvat, 1);
 			$localtaxtype2 = '0';

From 36d6b472ce90480130bcece86d3ba7448c9fb855 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 17 Dec 2020 13:52:03 +0100
Subject: [PATCH 500/888] Update prelevement.php

---
 htdocs/admin/prelevement.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index 2f942410787..4fba501b305 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -250,9 +250,10 @@ print '</td></tr>';
 //ADDDAYS
 print '<tr class="pair"><td>'.$langs->trans("ADDDAYS").'</td>';
 print '<td class="left">';
-if (! $conf->global->PRELEVEMENT_ADDDAYS) $conf->global->PRELEVEMENT_ADDDAYS=0;
+if (empty($conf->global->PRELEVEMENT_ADDDAYS)) $conf->global->PRELEVEMENT_ADDDAYS=0;
 print '<input type="text" name="PRELEVEMENT_ADDDAYS" value="'.$conf->global->PRELEVEMENT_ADDDAYS.'" size="15" ></td>';
 print '</td></tr>';
+
 print '</table>';
 print '<br>';
 

From 27542ed8ed6f19924106e01789a67ec37738c6a0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 17 Dec 2020 13:53:09 +0100
Subject: [PATCH 501/888] Update prelevement.php

---
 htdocs/admin/prelevement.php | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index 4fba501b305..122ec26f1c6 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -74,34 +74,31 @@ if ($action == "set")
     else $error++;
 
     $res = dolibarr_set_const($db, "PRELEVEMENT_ICS", GETPOST("PRELEVEMENT_ICS"), 'chaine', 0, '', $conf->entity);
-    if (! $res > 0) $error++;
+    if (! ($res > 0)) $error++;
 
     if (GETPOST("PRELEVEMENT_USER") > 0)
     {
         $res = dolibarr_set_const($db, "PRELEVEMENT_USER", GETPOST("PRELEVEMENT_USER"), 'chaine', 0, '', $conf->entity);
-        if (! $res > 0) $error++;
+        if (! ($res > 0)) $error++;
     }
     if (GETPOST("PRELEVEMENT_END_TO_END") || GETPOST("PRELEVEMENT_END_TO_END")=="")
     {
         $res = dolibarr_set_const($db, "PRELEVEMENT_END_TO_END", GETPOST("PRELEVEMENT_END_TO_END"), 'chaine', 0, '', $conf->entity);
-        if (! $res > 0) $error++;
+        if (! ($res > 0)) $error++;
     }
     if (GETPOST("PRELEVEMENT_USTRD") || GETPOST("PRELEVEMENT_USTRD")=="")
     {
         $res = dolibarr_set_const($db, "PRELEVEMENT_USTRD", GETPOST("PRELEVEMENT_USTRD"), 'chaine', 0, '', $conf->entity);
-        if (! $res > 0) $error++;
+        if (! ($res > 0)) $error++;
     }
 
     $res = dolibarr_set_const($db, "PRELEVEMENT_ADDDAYS", GETPOST("PRELEVEMENT_ADDDAYS"), 'chaine', 0, '', $conf->entity);
-    if (! $res > 0) $error++;
+    if (! ($res > 0)) $error++;
     
-    if (! $error)
-	{
+    if (! $error) {
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}

From f6b280c9df27b29e9ad9954ee7a7f39d28222c36 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 17 Dec 2020 13:57:12 +0100
Subject: [PATCH 502/888] Update project.class.php

---
 htdocs/projet/class/project.class.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 335b06a0456..76e3d8888cb 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -634,7 +634,6 @@ class Project extends CommonObject
 			$sql .= " AND (".$datefieldname." <= '".$this->db->idate($datee)."' OR ".$datefieldname." IS NULL)";
 		}
 
-		$hookmanager->initHooks(array('projectdao'));
 		$parameters = array(
 			'sql'=>$sql,
 			'type' => $type,

From 842d6f695f31cabd0974c5841fb337b87cf7ac74 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 17 Dec 2020 14:01:42 +0100
Subject: [PATCH 503/888] Update element.php

---
 htdocs/projet/element.php | 61 +++++++++++++--------------------------
 1 file changed, 20 insertions(+), 41 deletions(-)

diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index b334688558b..6a9c1ec9911 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -669,8 +669,7 @@ foreach ($listofreferent as $key => $value)
 	$reshook = $hookmanager->executeHooks('printOverviewProfit', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	if ($reshook < 0) {
 		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	}
-	elseif ($reshook > 0){
+	} elseif ($reshook > 0) {
 		print $hookmanager->resPrint;
 		continue;
 	}
@@ -683,20 +682,17 @@ foreach ($listofreferent as $key => $value)
 	$qualified = $value['test'];
 	$margin = $value['margin'];
 	$project_field = $value['project_field'];
-	if ($qualified && isset($margin))		// If this element must be included into profit calculation ($margin is 'minus' or 'add')
-	{
+	if ($qualified && isset($margin)) {		// If this element must be included into profit calculation ($margin is 'minus' or 'add')
 		$element = new $classname($db);
 
 		$elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee, !empty($project_field) ? $project_field : 'fk_projet');
 
-		if (is_array($elementarray) && count($elementarray) > 0)
-		{
+		if (is_array($elementarray) && count($elementarray) > 0) {
 			$total_ht = 0;
 			$total_ttc = 0;
 
 			$num = count($elementarray);
-			for ($i = 0; $i < $num; $i++)
-			{
+			for ($i = 0; $i < $num; $i++) {
 				$tmp = explode('_', $elementarray[$i]);
 				$idofelement = $tmp[0];
 				$idofelementuser = $tmp[1];
@@ -706,13 +702,11 @@ foreach ($listofreferent as $key => $value)
 
 				// Define if record must be used for total or not
 				$qualifiedfortotal = true;
-				if ($key == 'invoice')
-				{
+				if ($key == 'invoice') {
 				    if (!empty($element->close_code) && $element->close_code == 'replaced') $qualifiedfortotal = false; // Replacement invoice, do not include into total
 				    if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS) && $element->type == Facture::TYPE_DEPOSIT) $qualifiedfortotal = false; // If hidden option to use deposits as payment (deprecated, not recommended to use this), deposits are not included
 				}
-				if ($key == 'propal')
-				{
+				if ($key == 'propal') {
 					if ($element->status != Propal::STATUS_SIGNED && $element->status != Propal::STATUS_BILLED) $qualifiedfortotal = false; // Only signed proposal must not be included in total
 				}
 
@@ -722,15 +716,11 @@ foreach ($listofreferent as $key => $value)
 				if ($tablename == 'don' || $tablename == 'chargesociales' || $tablename == 'payment_various' || $tablename == 'payment_salary') $total_ht_by_line = $element->amount;
 				elseif ($tablename == 'fichinter') $total_ht_by_line = $element->getAmount();
 				elseif ($tablename == 'stock_mouvement') $total_ht_by_line = $element->price * abs($element->qty);
-				elseif ($tablename == 'projet_task')
-				{
-					if ($idofelementuser)
-					{
+				elseif ($tablename == 'projet_task') {
+					if ($idofelementuser) {
 						$tmp = $element->getSumOfAmount($elementuser, $dates, $datee);
 						$total_ht_by_line = price2num($tmp['amount'], 'MT');
-					}
-					else
-					{
+					} else {
 						$tmp = $element->getSumOfAmount('', $dates, $datee);
 						$total_ht_by_line = price2num($tmp['amount'], 'MT');
 					}
@@ -739,8 +729,7 @@ foreach ($listofreferent as $key => $value)
                     if ((empty($dates) && empty($datee)) || (intval($dates) <= $element->datestart && intval($datee) >= $element->dateend)) {
                         // Get total loan
                         $total_ht_by_line = -$element->capital;
-                    }
-				    else {
+                    } else {
                         // Get loan schedule according to date filter
                         $total_ht_by_line = 0;
                         $loanScheduleStatic = new LoanSchedule($element->db);
@@ -766,29 +755,23 @@ foreach ($listofreferent as $key => $value)
 				if ($tablename == 'don' || $tablename == 'chargesociales' || $tablename == 'payment_various' || $tablename == 'payment_salary') $total_ttc_by_line = $element->amount;
 				elseif ($tablename == 'fichinter') $total_ttc_by_line = $element->getAmount();
 				elseif ($tablename == 'stock_mouvement') $total_ttc_by_line = $element->price * abs($element->qty);
-				elseif ($tablename == 'projet_task')
-				{
+				elseif ($tablename == 'projet_task') {
 					$defaultvat = get_default_tva($mysoc, $mysoc);
 					$total_ttc_by_line = price2num($total_ht_by_line * (1 + ($defaultvat / 100)), 'MT');
-				}
-                elseif ($key == 'loan') {
+				} elseif ($key == 'loan') {
                         $total_ttc_by_line = $total_ht_by_line; // For loan there is actually no taxe managed in Dolibarr
-                }
-				else $total_ttc_by_line = $element->total_ttc;
+                } else $total_ttc_by_line = $element->total_ttc;
 
 				// Change sign of $total_ht_by_line and $total_ttc_by_line for some cases
-				if ($tablename == 'payment_various')
-				{
-			        if ($element->sens == 1)
-			        {
+				if ($tablename == 'payment_various') {
+			        if ($element->sens == 1) {
 			            $total_ht_by_line = -$total_ht_by_line;
 			            $total_ttc_by_line = -$total_ttc_by_line;
 			        }
 				}
 
 				// Add total if we have to
-				if ($qualifiedfortotal)
-				{
+				if ($qualifiedfortotal) {
 				    $total_ht = $total_ht + $total_ht_by_line;
 				    $total_ttc = $total_ttc + $total_ttc_by_line;
 				}
@@ -801,14 +784,12 @@ foreach ($listofreferent as $key => $value)
 			//var_dump($key.' '.$qualifiedforfinalprofit);
 
 			// Calculate margin
-			if ($qualifiedforfinalprofit)
-			{
+			if ($qualifiedforfinalprofit) {
 				if ($margin == 'add') {
 					$total_revenue_ht += $total_ht;
 				}
 
-			    if ($margin != "add")	// Revert sign
-				{
+			    if ($margin != "add") {	// Revert sign
 					$total_ht = -$total_ht;
 					$total_ttc = -$total_ttc;
 				}
@@ -878,8 +859,7 @@ foreach ($listofreferent as $key => $value)
 	$reshook = $hookmanager->executeHooks('printOverviewDetail', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	if ($reshook < 0) {
 		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	}
-	elseif ($reshook > 0){
+	} elseif ($reshook > 0) {
 		print $hookmanager->resPrint;
 		continue;
 	}
@@ -898,8 +878,7 @@ foreach ($listofreferent as $key => $value)
 	$exclude_select_element = array('payment_various');
 	if (!empty($value['exclude_select_element'])) $exclude_select_element[] = $value['exclude_select_element'];
 
-	if ($qualified)
-	{
+	if ($qualified) {
 		// If we want the project task array to have details of users
 		//if ($key == 'project_task') $key = 'project_task_time';
 

From 9cd211a79b917d8f441b4380905fb585ee815c18 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 17 Dec 2020 14:06:54 +0100
Subject: [PATCH 504/888] Fix syntax error

---
 htdocs/projet/element.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 7e1ffacae90..aa01ef5d3ef 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -784,7 +784,6 @@ foreach ($listofreferent as $key => $value)
 				}
 
 				if ($margin != "add")	{ // Revert sign
-				{
 					$total_ht = -$total_ht;
 					$total_ttc = -$total_ttc;
 				}

From 73dfa7d44a115b153b4b421e23ba6ae5da2c769d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 17 Dec 2020 14:37:02 +0100
Subject: [PATCH 505/888] Try a better fix for #15770

---
 htdocs/product/price.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 12029ea7cdc..dd56aa42318 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1457,11 +1457,11 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
 
     		// Il doit au moins y avoir la ligne de prix initial.
     		// On l'ajoute donc pour remettre a niveau (pb vieilles versions)
-    		//$object->updatePrice($object->price, $object->price_base_type, $user, $object->tva_tx, $object->price_min);
+    		// We emulate the change of the price from interface with the same value than the one into table llx_product
             if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
-            	$object->updatePrice($object->multiprices[1], $object->multiprices_base_type[1], $user, (empty($object->multiprices_tva_tx[1]) ? 0 : $object->multiprices_tva_tx[1]), $object->multiprices_min[1], 1);
+            	$object->updatePrice(($object->multiprices_base_type[1] == 'TTC' ? $object->multiprices_ttc[1] : $object->multiprices[1]), $object->multiprices_base_type[1], $user, (empty($object->multiprices_tva_tx[1]) ? 0 : $object->multiprices_tva_tx[1]), ($object->multiprices_base_type[1] == 'TTC' ? $object->multiprices_min_ttc[1] : $object->multiprices_min[1]), 1);
             } else {
-                $object->updatePrice($object->price, $object->price_base_type, $user, $object->tva_tx, $object->price_min);
+            	$object->updatePrice(($object->price_base_type == 'TTC' ? $object->price_ttc : $object->price), $object->price_base_type, $user, $object->tva_tx, ($object->price_base_type == 'TTC' ? $object->price_min_ttc : $object->price_min));
             }
 
     		$result = $db->query($sql);

From f79dec80e61704026eada93a76b566c602b1777c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 17 Dec 2020 16:45:56 +0100
Subject: [PATCH 506/888] Fix phpcs

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

diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index f3f0bc8f430..16384e9599f 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -94,7 +94,7 @@ if ($action == "set")
 
     $res = dolibarr_set_const($db, "PRELEVEMENT_ADDDAYS", GETPOST("PRELEVEMENT_ADDDAYS"), 'chaine', 0, '', $conf->entity);
     if (! ($res > 0)) $error++;
-    
+
     if (! $error) {
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');

From eed14bd9af81f9f399f3cb74504b57f0d6b7a165 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 17 Dec 2020 17:04:42 +0100
Subject: [PATCH 507/888] Fix warnings

---
 htdocs/fourn/class/fournisseur.commande.class.php |  3 ++-
 htdocs/fourn/class/fournisseur.product.class.php  |  1 +
 htdocs/stripe/class/stripe.class.php              |  4 +++-
 test/phpunit/AdherentTest.php                     | 14 +++++++-------
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index e2c061269d5..563ba097b19 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1621,7 +1621,8 @@ class CommandeFournisseur extends CommonOrder
 
 						// We use 'none' instead of $ref_supplier, because fourn_ref may not exists anymore. So we will take the first supplier price ok.
 						// If we want a dedicated supplier price, we must provide $fk_prod_fourn_price.
-						$result = $prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', ($this->fk_soc ? $this->fk_soc : $this->socid)); // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$ref_supplier/$this->fk_soc
+						$result = $prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', (isset($this->fk_soc) ? $this->fk_soc : $this->socid)); // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$ref_supplier/$this->fk_soc
+
 						// If supplier order created from customer order, we take best supplier price
 						// If $pu (defined previously from pu_ht or pu_ttc) is not defined at all, we also take the best supplier price
 						if ($result > 0 && ($origin == 'commande' || $pu === ''))
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 91a9f53de18..927e7e33b09 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -282,6 +282,7 @@ class ProductFournisseur extends Product
 		// Multicurrency
 		$multicurrency_buyprice = null;
 		$multicurrency_unitBuyPrice = null;
+		$fk_multicurrency = null;
 		if (!empty($conf->multicurrency->enabled)) {
 			if (empty($multicurrency_tx)) $multicurrency_tx = 1;
 			if (empty($multicurrency_buyprice)) $multicurrency_buyprice = 0;
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 93f1ed066af..e7856a82899 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -90,6 +90,7 @@ class Stripe extends CommonObject
 	{
 		global $conf;
 
+		$key = '';
 		if ($entity < 0) $entity = $conf->entity;
 
 		$sql = "SELECT tokenstring";
@@ -103,7 +104,8 @@ class Stripe extends CommonObject
 		}
 		$sql .= " AND fk_user IS NULL AND fk_adherent IS NULL";
 
-		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		dol_syslog(get_class($this)."::getStripeAccount", LOG_DEBUG);
+
 		$result = $this->db->query($sql);
 		if ($result) {
 			if ($this->db->num_rows($result)) {
diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php
index f19e88c36a6..5b242a362c5 100644
--- a/test/phpunit/AdherentTest.php
+++ b/test/phpunit/AdherentTest.php
@@ -411,30 +411,30 @@ class AdherentTest extends PHPUnit\Framework\TestCase
         $thirdparty = new Societe($db);
         $thirdparty->initAsSpecimen();
         $result = $thirdparty->create($user);
-        print __METHOD__." id=".$localobject->id." third party id=".$thirdparty->id." result=".$result."\n";
-        $this->assertTrue($result > 0);
+        print __METHOD__." third party id=".$thirdparty->id." result=".$result."\n";
+        $this->assertTrue($result > 0, 'Test to create a thirdparty specimen to use it to set as thirdparty of a member');
 
         //Set Third Party ID
         $result = $localobject->setThirdPartyId($thirdparty->id);
-        $this->assertEquals($result, 1);
+        $this->assertEquals($result, 1, 'Set thirdparty');
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
         //Adherent is updated with new data
         $localobject->fetch($localobject->id);
-        $this->assertEquals($localobject->fk_soc, $thirdparty->id);
+        $this->assertEquals($localobject->fk_soc, $thirdparty->id, 'Fetch member');
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
         //We remove the third party association
         $result = $localobject->setThirdPartyId(0);
-        $this->assertEquals($result, 1);
+        $this->assertEquals($result, 1, 'Removed the link with thirdparty');
 
         //And check if it has been updated
         $localobject->fetch($localobject->id);
-        $this->assertNull($localobject->fk_soc);
+        $this->assertNull($localobject->fk_soc, 'Check field is null');
 
         //Now we remove the third party
         $result = $thirdparty->delete($thirdparty->id, $user);
-        $this->assertEquals($result, 1);
+        $this->assertEquals($result, 1, 'Delete thirdparty');
 
         return $localobject;
     }

From c040002d6e18485fac159b6ff73ab6caa204f5e2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 17 Dec 2020 17:11:25 +0100
Subject: [PATCH 508/888] Fix warning

---
 test/phpunit/WebservicesInvoicesTest.php   |  3 +--
 test/phpunit/WebservicesProductsTest.php   |  2 +-
 test/phpunit/WebservicesThirdpartyTest.php | 15 +++++++--------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/test/phpunit/WebservicesInvoicesTest.php b/test/phpunit/WebservicesInvoicesTest.php
index 428db9e8ef5..650e391587b 100644
--- a/test/phpunit/WebservicesInvoicesTest.php
+++ b/test/phpunit/WebservicesInvoicesTest.php
@@ -255,8 +255,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
     		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
-    	} catch (SoapFault $exception)
-    	{
+    	} catch (SoapFault $exception) {
     		echo $exception;
     		$result=0;
     	}
diff --git a/test/phpunit/WebservicesProductsTest.php b/test/phpunit/WebservicesProductsTest.php
index 132f3363608..7b90fcbbd88 100644
--- a/test/phpunit/WebservicesProductsTest.php
+++ b/test/phpunit/WebservicesProductsTest.php
@@ -202,7 +202,7 @@ class WebservicesProductsTest extends PHPUnit\Framework\TestCase
             print "\n";
         }
 
-        print __METHOD__." count(result)=".count($result)."\n";
+        print __METHOD__." count(result)=".(is_array($result) ? count($result) : '')."\n";
         $this->assertEquals('OK', $result['result']['result_code']);
 
         return $result['id'];
diff --git a/test/phpunit/WebservicesThirdpartyTest.php b/test/phpunit/WebservicesThirdpartyTest.php
index 285fc6d5ddb..cf56066ba6a 100644
--- a/test/phpunit/WebservicesThirdpartyTest.php
+++ b/test/phpunit/WebservicesThirdpartyTest.php
@@ -56,8 +56,7 @@ class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
     protected $savdb;
     protected $soapclient;
 
-    private $_WS_DOL_URL;
-    private $_ns='http://www.dolibarr.org/ns/';
+    private $ns='http://www.dolibarr.org/ns/';
 
 
 
@@ -79,11 +78,11 @@ class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
         $this->savlangs=$langs;
         $this->savdb=$db;
 
-        $this->_WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_thirdparty.php';
+        $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_thirdparty.php';
 
         // Set the WebService URL
-        print __METHOD__." create nusoap_client for URL=".$this->_WS_DOL_URL."\n";
-        $this->soapclient = new nusoap_client($this->_WS_DOL_URL);
+        print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
+        $this->soapclient = new nusoap_client($WS_DOL_URL);
         if ($this->soapclient) {
         	$this->soapclient->soap_defencoding='UTF-8';
         	$this->soapclient->decodeUTF8(false);
@@ -267,7 +266,7 @@ class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
         $parameters = array('authentication'=>$authentication, 'id'=>$id);
         print __METHOD__." call method ".$WS_METHOD."\n";
         try {
-            $result = $this->soapclient->call($WS_METHOD, $parameters, $this->_ns, '');
+            $result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
         } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
@@ -329,7 +328,7 @@ class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
     	$parameters = array('authentication'=>$authentication, 'id'=>'', 'ref'=>'', 'ref_ext'=>'12');
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
-    		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->_ns, '');
+    		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
     	} catch (SoapFault $exception) {
     		echo $exception;
     		$result=0;
@@ -389,7 +388,7 @@ class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
     	$parameters = array('authentication'=>$authentication, 'id'=>$id, 'ref'=>'', 'ref_ext'=>'');
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
-    		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->_ns, '');
+    		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
     	} catch (SoapFault $exception) {
     		echo $exception;
     		$result=0;

From a67068ab7b351b690b57cd82d7e095ba73c2187a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 17 Dec 2020 18:08:56 +0100
Subject: [PATCH 509/888] Fix warnings

---
 htdocs/core/class/commonobject.class.php      |  5 +++
 .../class/fournisseur.commande.class.php      | 25 +++++-------
 htdocs/fourn/commande/card.php                |  7 +---
 htdocs/product/class/product.class.php        | 29 +++++++-------
 test/phpunit/CommandeFournisseurTest.php      | 40 ++++++++++---------
 5 files changed, 52 insertions(+), 54 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 6df0e2f006d..760b9632cb6 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -210,6 +210,11 @@ abstract class CommonObject
 	 */
 	public $ref_next;
 
+	/**
+	 * @var string Ref to store on object to save the new ref to use for example when making a validate() of an object
+	 */
+	public $newref;
+
 	/**
 	 * @var int The object's status
 	 * @see setStatut()
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 563ba097b19..557bc2a0456 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1607,15 +1607,15 @@ class CommandeFournisseur extends CommonOrder
 
 			$this->db->begin();
 
-			if ($fk_product > 0)
-			{
-				if (!empty($conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY))
-				{
+			$product_type = $type;
+			$label = '';	// deprecated
+
+			if ($fk_product > 0) {
+				if (!empty($conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY)) {
 					// Check quantity is enough
 					dol_syslog(get_class($this)."::addline we check supplier prices fk_product=".$fk_product." fk_prod_fourn_price=".$fk_prod_fourn_price." qty=".$qty." ref_supplier=".$ref_supplier);
 					$prod = new Product($this->db);
-					if ($prod->fetch($fk_product) > 0)
-					{
+					if ($prod->fetch($fk_product) > 0) {
 						$product_type = $prod->type;
 						$label = $prod->label;
 
@@ -1664,25 +1664,20 @@ class CommandeFournisseur extends CommonOrder
 					}
 				}
 
-				// redefine quantity according to packaging
-				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING))
-				{
+				// Predefine quantity according to packaging
+				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
 					$prod = new Product($this->db, $fk_product);
 					$prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', ($this->fk_soc ? $this->fk_soc : $this->socid));
-					if ($qty < $prod->packaging)
-					{
+					if ($qty < $prod->packaging) {
 						$qty = $prod->packaging;
 					} else {
-						if (!empty($prod->packaging) && ($qty % $prod->packaging) > 0)
-						{
+						if (!empty($prod->packaging) && ($qty % $prod->packaging) > 0) {
 							$coeff = intval($qty / $prod->packaging) + 1;
 							$qty = $prod->packaging * $coeff;
 						}
 					}
 					setEventMessage($langs->trans('QtyRecalculatedWithPackaging'), 'mesgs');
 				}
-			} else {
-				$product_type = $type;
 			}
 
 			if (!empty($conf->multicurrency->enabled) && $pu_ht_devise > 0) {
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index abb6245fa22..987b80aa3ea 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -664,10 +664,8 @@ if (empty($reshook))
 		}
 
 		$productsupplier = new ProductFournisseur($db);
-		if (!empty($conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY))
-		{
-			if ($line->fk_product > 0 && $productsupplier->get_buyprice(0, price2num(GETPOST('qty', 'int')), $line->fk_product, 'none', GETPOST('socid', 'int')) < 0)
-			{
+		if (!empty($conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY)) {
+			if ($line->fk_product > 0 && $productsupplier->get_buyprice(0, price2num(GETPOST('qty', 'int')), $line->fk_product, 'none', GETPOST('socid', 'int')) < 0) {
 				setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'warnings');
 			}
 		}
@@ -2317,7 +2315,6 @@ if ($action == 'create')
 	global $forceall, $senderissupplier, $dateSelector, $inputalsopricewithtax;
 	$forceall = 1; $dateSelector = 0; $inputalsopricewithtax = 1;
 	$senderissupplier = 2; // $senderissupplier=2 is same than 1 but disable test on minimum qty and disable autofill qty with minimum.
-	//if (! empty($conf->global->SUPPLIER_ORDER_WITH_NOPRICEDEFINED)) $senderissupplier=2;
 	if (!empty($conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY)) $senderissupplier = 1;
 
 	// Show object lines
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 3201dd652aa..25051baa9c3 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1720,9 +1720,9 @@ class Product extends CommonObject
 
 		// We do a first seach with a select by searching with couple prodfournprice and qty only (later we will search on triplet qty/product_id/fourn_ref)
 		$sql = "SELECT pfp.rowid, pfp.price as price, pfp.quantity as quantity, pfp.remise_percent,";
-		$sql .= " pfp.fk_product, pfp.ref_fourn, pfp.desc_fourn, pfp.fk_soc, pfp.tva_tx, pfp.fk_supplier_price_expression";
-		$sql .= " ,pfp.default_vat_code";
-		$sql .= " ,pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code";
+		$sql .= " pfp.fk_product, pfp.ref_fourn, pfp.desc_fourn, pfp.fk_soc, pfp.tva_tx, pfp.fk_supplier_price_expression,";
+		$sql .= " pfp.default_vat_code,";
+		$sql .= " pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code";
 		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) $sql .= ", pfp.packaging";
 		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
 		$sql .= " WHERE pfp.rowid = ".$prodfournprice;
@@ -1769,14 +1769,13 @@ class Product extends CommonObject
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) $this->packaging = $obj->packaging;
 				$result = $obj->fk_product;
 				return $result;
-			} else // If not found
-			{
+			} else { // If not found
 				// We do a second search by doing a select again but searching with less reliable criteria: couple qty/id product, and if set fourn_ref or fk_soc.
-				$sql = "SELECT pfp.rowid, pfp.price as price, pfp.quantity as quantity, pfp.fk_soc,";
-				$sql .= " pfp.fk_product, pfp.ref_fourn as ref_supplier, pfp.desc_fourn as desc_supplier, pfp.tva_tx, pfp.fk_supplier_price_expression";
-				$sql .= " ,pfp.default_vat_code";
-				$sql .= " ,pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code";
-				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) $sql .= ", pfp.packaging";
+				$sql = "SELECT pfp.rowid, pfp.price as price, pfp.quantity as quantity, pfp.remise_percent, pfp.fk_soc,";
+				$sql .= " pfp.fk_product, pfp.ref_fourn as ref_supplier, pfp.desc_fourn as desc_supplier, pfp.tva_tx, pfp.fk_supplier_price_expression,";
+				$sql .= " pfp.default_vat_code,";
+				$sql .= " pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code,";
+				$sql .= " pfp.packaging";
 				$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
 				$sql .= " WHERE pfp.fk_product = ".$product_id;
 				if ($fourn_ref != 'none') { $sql .= " AND pfp.ref_fourn = '".$this->db->escape($fourn_ref)."'";
@@ -3886,9 +3885,9 @@ class Product extends CommonObject
 		if ($ref_fourn) {
 			$sql = "SELECT rowid, fk_product";
 			$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
-			$sql .= " WHERE fk_soc = ".$id_fourn;
+			$sql .= " WHERE fk_soc = ".((int) $id_fourn);
 			$sql .= " AND ref_fourn = '".$this->db->escape($ref_fourn)."'";
-			$sql .= " AND fk_product != ".$this->id;
+			$sql .= " AND fk_product <> ".((int) $this->id);
 			$sql .= " AND entity IN (".getEntity('productsupplierprice').")";
 
 			$resql = $this->db->query($sql);
@@ -3918,7 +3917,7 @@ class Product extends CommonObject
 			$obj = $this->db->fetch_object($resql);
 
 			// The reference supplier does not exist, we create it for this product.
-			if (!$obj) {
+			if (empty($obj)) {
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price(";
 				$sql .= "datec";
 				$sql .= ", entity";
@@ -3960,9 +3959,9 @@ class Product extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Renvoie la liste des fournisseurs du produit/service
+	 * Return list of suppliers providing the product or service
 	 *
-	 * @return array        Tableau des id de fournisseur
+	 * @return array        Array of vendor ids
 	 */
 	public function list_suppliers()
 	{
diff --git a/test/phpunit/CommandeFournisseurTest.php b/test/phpunit/CommandeFournisseurTest.php
index bebd65634bf..0ee65e3383e 100644
--- a/test/phpunit/CommandeFournisseurTest.php
+++ b/test/phpunit/CommandeFournisseurTest.php
@@ -130,7 +130,7 @@ class CommandeFournisseurTest extends PHPUnit\Framework\TestCase
     /**
      * testCommandeFournisseurCreate
      *
-     * @return	void
+     * @return	int		ID of purchase order
      */
     public function testCommandeFournisseurCreate()
     {
@@ -157,11 +157,13 @@ class CommandeFournisseurTest extends PHPUnit\Framework\TestCase
 
         // Create 1 supplier price with min qty = 10;
         $result=$product->add_fournisseur($user, $societe->id, $ref_fourn, $quantity);    // This insert record with no value for price. Values are update later with update_buyprice
-        $this->assertGreaterThanOrEqual(1, $result);
+        print __METHOD__." add_fournisseur result=".$result."\n";
+        $this->assertGreaterThanOrEqual(0, $result, 'Create 1 supplier price with min qty = 10 if not exists');
         $result=$product->update_buyprice($quantity, 20, $user, 'HT', $societe, '', $ref_fourn, $tva_tx, 0, 0);
-        $this->assertGreaterThanOrEqual(0, $result);
+        print __METHOD__." update_buyprice result=".$result."\n";
+        $this->assertGreaterThanOrEqual(0, $result, 'Update buyprice');
 
-        // Create supplier order with a too low quantity and option SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY is on
+        // Create purchase order with a too low quantity and option SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY is on
         $conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY = 1;
 
         $localobject=new CommandeFournisseur($db);
@@ -182,7 +184,7 @@ class CommandeFournisseurTest extends PHPUnit\Framework\TestCase
         $sql="DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur where ref=''";
         $db->query($sql);
 
-        // Create supplier order
+        // Create purchase order
         $localobject2=new CommandeFournisseur($db);
         $localobject2->initAsSpecimen();    // This create 5 lines of first product found for socid 1
         $localobject2->lines=array();       // Overwrite lines of order
@@ -199,7 +201,7 @@ class CommandeFournisseurTest extends PHPUnit\Framework\TestCase
         $this->assertGreaterThan(0, $result);
 
 
-        // Create supplier order with a too low quantity but option SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY is off
+        // Create purchase order with a too low quantity but option SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY is off
         $conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY = 0;
 
         $localobject3=new CommandeFournisseur($db);
@@ -220,7 +222,7 @@ class CommandeFournisseurTest extends PHPUnit\Framework\TestCase
         $sql="DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur where ref=''";
         $db->query($sql);
 
-        // Create supplier order
+        // Create purchase order
         $localobject4=new CommandeFournisseur($db);
         $localobject4->initAsSpecimen();    // This create 5 lines of first product found for socid 1
         $localobject4->lines=array();       // Overwrite lines of order
@@ -233,9 +235,8 @@ class CommandeFournisseurTest extends PHPUnit\Framework\TestCase
         $localobject4->lines[]=$line;
 
         $result=$localobject4->create($user);
-        print __METHOD__." result=".$result."\n";
-        $this->assertGreaterThan(0, $result);
-
+        print __METHOD__." id for purchase order created by testCommandeFournisseurCreate = ".$result."\n";
+        $this->assertGreaterThan(0, $result, 'Test to create a purchase order by testCommandeFournisseurCreate');
 
         return $result;
     }
@@ -244,8 +245,8 @@ class CommandeFournisseurTest extends PHPUnit\Framework\TestCase
     /**
      * testCommandeFournisseurFetch
      *
-     * @param   int $id     Id of supplier order
-     * @return  void
+     * @param   int 		$id     			Id of purchase order
+     * @return  CommandeFournisseur				Purchase order
      *
      * @depends testCommandeFournisseurCreate
      * The depends says test is run only if previous is ok
@@ -270,7 +271,7 @@ class CommandeFournisseurTest extends PHPUnit\Framework\TestCase
      * testCommandeFournisseurValid
      *
      * @param   Object $localobject     Supplier order
-     * @return  void
+     * @return  CommandeFournisseur		Supplier order
      *
      * @depends testCommandeFournisseurFetch
      * The depends says test is run only if previous is ok
@@ -293,8 +294,8 @@ class CommandeFournisseurTest extends PHPUnit\Framework\TestCase
     /**
      * testCommandeFournisseurApprove
      *
-     * @param   Object $localobject Supplier order
-     * @return  void
+     * @param   Object $localobject 	Supplier order
+     * @return  CommandeFournisseur		Supplier order
      *
      * @depends testCommandeFournisseurValid
      * The depends says test is run only if previous is ok
@@ -317,8 +318,8 @@ class CommandeFournisseurTest extends PHPUnit\Framework\TestCase
     /**
      * testCommandeFournisseurCancel
      *
-     * @param   Object  $localobject        Supplier order
-     * @return  void
+     * @param   Object  $localobject    Supplier order
+     * @return  CommandeFournisseur		Supplier order
      *
      * @depends testCommandeFournisseurApprove
      * The depends says test is run only if previous is ok
@@ -342,7 +343,7 @@ class CommandeFournisseurTest extends PHPUnit\Framework\TestCase
      * testCommandeFournisseurOther
      *
      * @param   Object $localobject     Supplier order
-     * @return  void
+     * @return  int						Id of purchase order
      *
      * @depends testCommandeFournisseurCancel
      * The depends says test is run only if previous is ok
@@ -364,6 +365,7 @@ class CommandeFournisseurTest extends PHPUnit\Framework\TestCase
         print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
         $this->assertNotEquals($localobject->date_creation, '');
         */
+        $this->assertEquals(1, 1);
 
         return $localobject->id;
     }
@@ -372,7 +374,7 @@ class CommandeFournisseurTest extends PHPUnit\Framework\TestCase
      * testCommandeFournisseurDelete
      *
      * @param   int $id     Id of order
-     * @return  void
+     * @return  int			Result of delete
      *
      * @depends testCommandeFournisseurOther
      * The depends says test is run only if previous is ok

From b5db5f7474fc8f7fff3e044236cf05beb28f747f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 17 Dec 2020 21:11:44 +0100
Subject: [PATCH 510/888] Better responsive

---
 htdocs/theme/eldy/global.inc.php | 18 ++++++++++++++++++
 htdocs/theme/md/dropdown.inc.php | 19 +++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 3bd0e560ce5..e5db84f9719 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -6471,6 +6471,24 @@ div.tabsElem a.tab {
 	}
 }
 
+@media only screen and (max-width: 320px)
+{
+	.dropdown dd ul {
+		max-width: 270px;	/* must always be 50 slower than width */
+	}
+}
+@media only screen and (max-width: 300px)
+{
+	.dropdown dd ul {
+		max-width: 250px;
+	}
+}
+@media only screen and (max-width: 280px)
+{
+	.dropdown dd ul {
+		max-width: 230px;
+	}
+}
 
 
 <?php
diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php
index b86b935c5d1..da012b45a96 100644
--- a/htdocs/theme/md/dropdown.inc.php
+++ b/htdocs/theme/md/dropdown.inc.php
@@ -427,6 +427,25 @@ a.top-menu-dropdown-link {
 	}
 }
 
+@media only screen and (max-width: 320px)
+{
+	.dropdown dd ul {
+		max-width: 270px;	/* must always be 50 slower than width */
+	}
+}
+@media only screen and (max-width: 300px)
+{
+	.dropdown dd ul {
+		max-width: 250px;
+	}
+}
+@media only screen and (max-width: 280px)
+{
+	.dropdown dd ul {
+		max-width: 230px;
+	}
+}
+
 
 .dropdown-search-input::placeholder {
     color: color(#575756 a(0.8));

From c97fcaec87bf396a5197016654dfa0ba81646416 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 17 Dec 2020 21:41:39 +0100
Subject: [PATCH 511/888] Better fix select2 bug
 https://github.com/select2/select2/issues/5832

---
 dev/dolibarr_changes.txt                                    | 2 +-
 htdocs/includes/jquery/plugins/select2/dist/css/select2.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
index cdb0999e53f..ecd25ce692b 100644
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -320,7 +320,7 @@ SELECT2
 Edit CSS to restore line removed between 4.0.5 and 4.0.6. It generates this bug: https://github.com/select2/select2/issues/5832
 
 .select2-hidden-accessible {
-  margin: -1px !important;                /* line to restore */
+  margin: -10000px !important;                /* line to restore */
 }
 
 
diff --git a/htdocs/includes/jquery/plugins/select2/dist/css/select2.css b/htdocs/includes/jquery/plugins/select2/dist/css/select2.css
index c4c42ea3cc6..eb341de9d83 100644
--- a/htdocs/includes/jquery/plugins/select2/dist/css/select2.css
+++ b/htdocs/includes/jquery/plugins/select2/dist/css/select2.css
@@ -121,7 +121,7 @@
   -webkit-clip-path: inset(50%) !important;
   clip-path: inset(50%) !important;
   height: 1px !important;
-  margin: -1px !important;
+  margin: -10000px !important;
   overflow: hidden !important;
   padding: 0 !important;
   position: absolute !important;

From f10c69680c370f4ff6c580074188d8f045e4872a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 17 Dec 2020 21:42:10 +0100
Subject: [PATCH 512/888] Ajax combo at a better place (after select)

---
 htdocs/core/class/html.form.class.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 450ed7364ca..cd808157045 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6191,12 +6191,6 @@ class Form
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			if (!$forcecombo)
-			{
-				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-				$out .= ajax_combobox($htmlname, null, $conf->global->$confkeyforautocompletemode);
-			}
-
 			// Construct $out and $outarray
 			$out .= '<select id="'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled="disabled"' : '').($moreparams ? ' '.$moreparams : '').' name="'.$htmlname.'">'."\n";
 
@@ -6247,6 +6241,12 @@ class Form
 			}
 
 			$out .= '</select>'."\n";
+
+			if (!$forcecombo)
+			{
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+				$out .= ajax_combobox($htmlname, null, $conf->global->$confkeyforautocompletemode);
+			}
 		}
 		else
 		{

From b740d79f8e07ad9f54969e27f746aaec97c955db Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 17 Dec 2020 22:52:42 +0100
Subject: [PATCH 513/888] Fix v13

---
 .../modulebuilder/template/myobject_list.php  |   6 +-
 htdocs/projet/class/project.class.php         |  44 +++----
 htdocs/projet/list.php                        | 109 +++++++++---------
 3 files changed, 83 insertions(+), 76 deletions(-)

diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index a4cb238d83e..2ed8e4577fa 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -126,8 +126,7 @@ foreach ($object->fields as $key => $val)
 
 // Definition of array of fields for columns
 $arrayfields = array();
-foreach ($object->fields as $key => $val)
-{
+foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
 		$visible = dol_eval($val['visible'], 1);
@@ -182,8 +181,7 @@ if (empty($reshook))
 	// Purge search criteria
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 	{
-		foreach ($object->fields as $key => $val)
-		{
+		foreach ($object->fields as $key => $val) {
 			$search[$key] = '';
 		}
 		$toselect = '';
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 964eb610b29..f58886c9a3b 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -180,33 +180,33 @@ class Project extends CommonObject
 	 */
 	public $fields = array(
 		'rowid' =>array('type'=>'integer', 'label'=>'ID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-		'fk_soc' =>array('type'=>'integer', 'label'=>'Fk soc', 'enabled'=>1, 'visible'=>3, 'position'=>15),
-		'datec' =>array('type'=>'datetime', 'label'=>'DateCreationShort', 'enabled'=>1, 'visible'=>1, 'position'=>20),
-		'tms' =>array('type'=>'timestamp', 'label'=>'DateModificationShort', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>25),
+		'ref' =>array('type'=>'varchar(50)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'showoncombobox'=>1, 'position'=>15, 'searchall'=>1),
+		'title' =>array('type'=>'varchar(255)', 'label'=>'ProjectLabel', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>17, 'showoncombobox'=>1, 'searchall'=>1),
+		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>3, 'notnull'=>1, 'position'=>19),
+		'fk_soc' =>array('type'=>'integer', 'label'=>'Thirdparty', 'enabled'=>1, 'visible'=>0, 'position'=>20),
 		'dateo' =>array('type'=>'date', 'label'=>'DateStart', 'enabled'=>1, 'visible'=>1, 'position'=>30),
 		'datee' =>array('type'=>'date', 'label'=>'DateEnd', 'enabled'=>1, 'visible'=>1, 'position'=>35),
-		'ref' =>array('type'=>'varchar(50)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'showoncombobox'=>1, 'position'=>40, 'searchall'=>1),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>3, 'notnull'=>1, 'position'=>45),
-		'title' =>array('type'=>'varchar(255)', 'label'=>'ProjectLabel', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>50, 'showoncombobox'=>1, 'searchall'=>1),
 		'description' =>array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>3, 'position'=>55, 'searchall'=>1),
-		'fk_user_creat' =>array('type'=>'integer', 'label'=>'Fk user creat', 'enabled'=>1, 'visible'=>3, 'notnull'=>1, 'position'=>60),
 		'public' =>array('type'=>'integer', 'label'=>'Visibility', 'enabled'=>1, 'visible'=>1, 'position'=>65),
-		'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>500),
 		'fk_opp_status' =>array('type'=>'integer', 'label'=>'OpportunityStatusShort', 'enabled'=>1, 'visible'=>1, 'position'=>75),
 		'opp_percent' =>array('type'=>'double(5,2)', 'label'=>'OpportunityProbabilityShort', 'enabled'=>1, 'visible'=>1, 'position'=>80),
-		'note_private' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>3, 'position'=>85, 'searchall'=>1),
-		'note_public' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>3, 'position'=>90, 'searchall'=>1),
-		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>3, 'position'=>95),
-		'budget_amount' =>array('type'=>'double(24,8)', 'label'=>'Budget', 'enabled'=>1, 'visible'=>1, 'position'=>100),
-		'date_close' =>array('type'=>'datetime', 'label'=>'Date close', 'enabled'=>1, 'visible'=>3, 'position'=>105),
-		'fk_user_close' =>array('type'=>'integer', 'label'=>'Fk user close', 'enabled'=>1, 'visible'=>3, 'position'=>110),
+		'note_private' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>85, 'searchall'=>1),
+		'note_public' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>90, 'searchall'=>1),
+		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'ModelPdf', 'enabled'=>1, 'visible'=>0, 'position'=>95),
+		'date_close' =>array('type'=>'datetime', 'label'=>'DateClosing', 'enabled'=>1, 'visible'=>0, 'position'=>105),
+		'fk_user_close' =>array('type'=>'integer', 'label'=>'UserClosing', 'enabled'=>1, 'visible'=>0, 'position'=>110),
 		'opp_amount' =>array('type'=>'double(24,8)', 'label'=>'OpportunityAmountShort', 'enabled'=>1, 'visible'=>1, 'position'=>115),
-		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>3, 'position'=>120),
-		'fk_user_modif' =>array('type'=>'integer', 'label'=>'Fk user modif', 'enabled'=>1, 'visible'=>3, 'position'=>125),
-		'usage_bill_time' =>array('type'=>'integer', 'label'=>'UsageBillTimeShort', 'enabled'=>1, 'visible'=>1, 'position'=>130),
-		'usage_opportunity' =>array('type'=>'integer', 'label'=>'UsageOpportunity', 'enabled'=>1, 'visible'=>1, 'position'=>135),
-		'usage_task' =>array('type'=>'integer', 'label'=>'UsageTasks', 'enabled'=>1, 'visible'=>1, 'position'=>140),
-		'usage_organize_event' =>array('type'=>'integer', 'label'=>'Usage organize event', 'enabled'=>1, 'visible'=>3, 'position'=>145),
+		'budget_amount' =>array('type'=>'double(24,8)', 'label'=>'Budget', 'enabled'=>1, 'visible'=>1, 'position'=>119),
+		'usage_bill_time' =>array('type'=>'integer', 'label'=>'UsageBillTimeShort', 'enabled'=>1, 'visible'=>-1, 'position'=>130),
+		'usage_opportunity' =>array('type'=>'integer', 'label'=>'UsageOpportunity', 'enabled'=>1, 'visible'=>-1, 'position'=>135),
+		'usage_task' =>array('type'=>'integer', 'label'=>'UsageTasks', 'enabled'=>1, 'visible'=>-1, 'position'=>140),
+		'usage_organize_event' =>array('type'=>'integer', 'label'=>'Usage organize event', 'enabled'=>1, 'visible'=>-1, 'position'=>145),
+		'datec' =>array('type'=>'datetime', 'label'=>'DateCreationShort', 'enabled'=>1, 'visible'=>-2, 'position'=>200),
+		'tms' =>array('type'=>'timestamp', 'label'=>'DateModificationShort', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>205),
+		'fk_user_creat' =>array('type'=>'integer', 'label'=>'UserCreation', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>210),
+		'fk_user_modif' =>array('type'=>'integer', 'label'=>'UserModification', 'enabled'=>1, 'visible'=>0, 'position'=>215),
+		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>0, 'position'=>220),
+		'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>500)
 	);
 	// END MODULEBUILDER PROPERTIES
 
@@ -252,6 +252,10 @@ class Project extends CommonObject
 			$this->fields['usage_bill_time']['visible'] = 0;
 			$this->fields['usage_task']['visible'] = 0;
 		}
+
+		if (empty($conf->global->PROJECT_ORGANIZE_EVENTS)) {
+			$this->fields['usage_organize_event']['visible'] = 0;
+		}
 	}
 
 	/**
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 5635fafa7bb..988f16a962a 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -70,8 +70,7 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", "aZ09comma");
 $sortorder = GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-$page = is_numeric($page) ? $page : 0;
-$page = $page == -1 ? 0 : $page;
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters
 if (!$sortfield) $sortfield = "p.ref";
 if (!$sortorder) $sortorder = "ASC";
 $offset = $limit * $page;
@@ -137,37 +136,33 @@ foreach ($object->fields as $key => $val) {
 	$fieldstosearchall['p.'.$key] = $val['label'];
 }
 
-// Add none object fields to "search in all"
+// Add name object fields to "search in all"
 $fieldstosearchall['s.nom'] = "ThirdPartyName";
 
-// Definition of fields for list
+// Definition of array of fields for columns
 $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
-	if (!empty($val['visible'])) $arrayfields['p.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>($val['enabled'] && ($val['visible'] != 3)), 'position'=>$val['position']);
-}
-
-// Add none object fields to fields for list
-$arrayfields['s.nom'] = array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'enabled'=>(empty($conf->societe->enabled) ? 0 : 1));
-$arrayfields['commercial'] = array('label'=>$langs->trans("SaleRepresentativesOfThirdParty"), 'checked'=>0);
-$arrayfields['opp_weighted_amount'] = array('label'=>$langs->trans('OpportunityWeightedAmountShort'), 'checked'=>0, 'enabled'=>(empty($conf->global->PROJECT_USE_OPPORTUNITIES) ? 0 : 1), 'position'=>106);
-
-// Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
-			$arrayfields["ef.".$key] = array(
-				'label'=>$extrafields->attributes[$object->table_element]['label'][$key],
-				'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1),
-				'position'=>$extrafields->attributes[$object->table_element]['pos'][$key],
-				'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key])
-			);
-		}
+	if (!empty($val['visible'])) {
+		$visible = dol_eval($val['visible'], 1);
+		$arrayfields['p.'.$key] = array(
+			'label'=>$val['label'],
+			'checked'=>(($visible < 0) ? 0 : 1),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'position'=>$val['position'],
+			'help'=>$val['help']
+		);
 	}
 }
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
+// Add none object fields to fields for list
+$arrayfields['s.nom'] = array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'position'=>21, 'enabled'=>(empty($conf->societe->enabled) ? 0 : 1));
+$arrayfields['commercial'] = array('label'=>$langs->trans("SaleRepresentativesOfThirdParty"), 'checked'=>0, 'position'=>23);
+$arrayfields['opp_weighted_amount'] = array('label'=>$langs->trans('OpportunityWeightedAmountShort'), 'checked'=>0, 'position'=> 116, 'enabled'=>(empty($conf->global->PROJECT_USE_OPPORTUNITIES) ? 0 : 1), 'position'=>106);
+
+$object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
 
@@ -279,6 +274,7 @@ $form = new Form($db);
 $formother = new FormOther($db);
 $formproject = new FormProjets($db);
 
+$help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
 $title = $langs->trans("Projects");
 
 
@@ -312,9 +308,10 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 }
 // Add fields from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
-$sql .= $hookmanager->resPrint;
-$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
+$sql = preg_replace('/,\s*$/', '', $sql);
+$sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as p";
 if (!empty($conf->categorie->enabled))
 {
 	$sql .= Categorie::getFilterJoinQuery(Categorie::TYPE_PROJECT, "p.rowid");
@@ -375,37 +372,36 @@ if ($search_usage_bill_time != '' && $search_usage_bill_time >= 0)     $sql .= n
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= $db->order($sortfield, $sortorder);
 
+// Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller than paging size (filtering), goto and load page 0
-	{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+	$resql = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($resql);
+	if (($page * $limit) > $nbtotalofrecords) {	// if total of record found is smaller than page * limit, goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
 }
+// if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
+if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) {
+	$num = $nbtotalofrecords;
+} else {
+	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
-$sql .= $db->plimit($limit + 1, $offset);
+	$resql = $db->query($sql);
+	if (!$resql) {
+		dol_print_error($db);
+		exit;
+	}
 
-dol_syslog("list allowed project", LOG_DEBUG);
-
-$resql = $db->query($sql);
-if (!$resql)
-{
-	dol_print_error($db);
-	exit;
+	$num = $db->num_rows($resql);
 }
 
-$num = $db->num_rows($resql);
-
-$arrayofselected = is_array($toselect) ? $toselect : array();
-
+// Direct jump if only one record found
 if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
 {
 	$obj = $db->fetch_object($resql);
@@ -413,8 +409,15 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 	exit;
 }
 
-$help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
-llxHeader("", $title, $help_url);
+
+// Output page
+// --------------------------------------------------------------------
+
+dol_syslog("list allowed project", LOG_DEBUG);
+
+llxHeader('', $title, $help_url);
+
+$arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
@@ -532,11 +535,13 @@ if (!empty($moreforfilter))
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
-if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
+// Fields title search
+// --------------------------------------------------------------------
 print '<tr class="liste_titre_filter">';
 // Project ref
 if (!empty($arrayfields['p.ref']['checked']))
@@ -669,7 +674,7 @@ if (!empty($arrayfields['p.fk_statut']['checked']))
 	$arrayofstatus = array();
 	foreach ($object->statuts_short as $key => $val) $arrayofstatus[$key] = $langs->trans($val);
 	$arrayofstatus['99'] = $langs->trans("NotClosed").' ('.$langs->trans('Draft').' + '.$langs->trans('Opened').')';
-	print $form->selectarray('search_status', $arrayofstatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100 selectarrowonleft');
+	print $form->selectarray('search_status', $arrayofstatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'minwidth75imp maxwidth150 selectarrowonleft');
 	print ajax_combobox('search_status');
 	print '</td>';
 }
@@ -741,7 +746,7 @@ while ($i < min($num, $limit))
 		// Project url
 		if (!empty($arrayfields['p.ref']['checked']))
 		{
-			print '<td class="nowrap">';
+			print '<td class="nowraponall">';
 			print $object->getNomUrl(1);
 			if ($object->hasDelay()) print img_warning($langs->trans('Late'));
 			print '</td>';

From 90d8299c92087187dfe4badfab1a2932c0dcb032 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 18 Dec 2020 13:24:02 +0100
Subject: [PATCH 514/888] Fix purge tool

---
 htdocs/admin/tools/purge.php      |  12 +-
 htdocs/core/class/utils.class.php | 177 +++++++++++++++---------------
 htdocs/langs/en_US/admin.lang     |   4 +-
 3 files changed, 99 insertions(+), 94 deletions(-)

diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php
index e9d0f5a8ac1..f3266a8c5d0 100644
--- a/htdocs/admin/tools/purge.php
+++ b/htdocs/admin/tools/purge.php
@@ -91,7 +91,7 @@ print '<table class="border centpercent">';
 print '<tr class="border"><td style="padding: 4px">';
 
 if (!empty($conf->syslog->enabled)) {
-	print '<input type="radio" name="choice" value="logfile"';
+	print '<input type="radio" name="choice" id="choicelogfile" value="logfile"';
 	print ($choice && $choice == 'logfile') ? ' checked' : '';
 	$filelogparam = $filelog;
 	if ($user->admin && preg_match('/^dolibarr.*\.log$/', basename($filelog))) {
@@ -101,17 +101,17 @@ if (!empty($conf->syslog->enabled)) {
 	}
 	$desc = $langs->trans("PurgeDeleteLogFile", '{filelogparam}');
 	$desc = str_replace('{filelogparam}', $filelogparam, $desc);
-	print '> '.$desc;
+	print '> <label for="choicelogfile">'.$desc.'</label>';
 	print '<br><br>';
 }
 
-print '<input type="radio" name="choice" value="tempfiles"';
+print '<input type="radio" name="choice" id="choicetempfiles" value="tempfiles"';
 print (!$choice || $choice == 'tempfiles' || $choice == 'allfiles') ? ' checked' : '';
-print '> '.$langs->trans("PurgeDeleteTemporaryFiles").'<br><br>';
+print '> <label for="choicetempfiles">'.$langs->trans("PurgeDeleteTemporaryFiles").'</label><br><br>';
 
-print '<input type="radio" name="choice" value="confirm_allfiles"';
+print '<input type="radio" name="choice" id="choiceallfiles" value="confirm_allfiles"';
 print ($choice && $choice == 'confirm_allfiles') ? ' checked' : '';
-print '> '.$langs->trans("PurgeDeleteAllFilesInDocumentsDir", $dolibarr_main_data_root).'<br>';
+print '> <label for="choiceallfiles">'.$langs->trans("PurgeDeleteAllFilesInDocumentsDir", $dolibarr_main_data_root).'</label><br>';
 
 print '</td></tr></table>';
 
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 3436a6d3c4f..93eaeb6d4f2 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -50,11 +50,11 @@ class Utils
 	 *  Purge files into directory of data files.
 	 *  CAN BE A CRON TASK
 	 *
-	 *  @param	string      $choice		   Choice of purge mode ('tempfiles', '' or 'tempfilesold' to purge temp older than $nbsecondsold seconds, 'allfiles', 'logfile')
+	 *  @param	string      $choices	   Choice of purge mode ('tempfiles', '' or 'tempfilesold' to purge temp older than $nbsecondsold seconds, 'allfiles', 'logfile')
 	 *  @param  int         $nbsecondsold  Nb of seconds old to accept deletion of a directory if $choice is 'tempfilesold'
 	 *  @return	int						   0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK)
 	 */
-	public function purgeFiles($choice = 'tempfilesold', $nbsecondsold = 86400)
+	public function purgeFiles($choices = 'tempfilesold,logfile', $nbsecondsold = 86400)
 	{
 		global $conf, $langs, $dolibarr_main_data_root;
 
@@ -62,112 +62,117 @@ class Utils
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		$filesarray = array();
-		if (empty($choice)) $choice = 'tempfilesold';
+		if (empty($choices)) $choices = 'tempfilesold,logfile';
 
-		dol_syslog("Utils::purgeFiles choice=".$choice, LOG_DEBUG);
-
-		if ($choice == 'tempfiles' || $choice == 'tempfilesold')
-		{
-			// Delete temporary files
-			if ($dolibarr_main_data_root)
-			{
-				$filesarray = dol_dir_list($dolibarr_main_data_root, "directories", 1, '^temp$', '', 'name', SORT_ASC, 2, 0, '', 1); // Do not follow symlinks
-
-				if ($choice == 'tempfilesold')
-				{
-					$now = dol_now();
-					foreach ($filesarray as $key => $val)
-					{
-						if ($val['date'] > ($now - ($nbsecondsold))) unset($filesarray[$key]); // Discard temp dir not older than $nbsecondsold
-					}
-				}
-			}
-		}
-
-		if ($choice == 'allfiles')
-		{
-			// Delete all files (except install.lock, do not follow symbolic links)
-			if ($dolibarr_main_data_root)
-			{
-				$filesarray = dol_dir_list($dolibarr_main_data_root, "all", 0, '', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);
-			}
-		}
-
-		if ($choice == 'logfile')
-		{
-			// Define files log
-			if ($dolibarr_main_data_root)
-			{
-				$filesarray = dol_dir_list($dolibarr_main_data_root, "files", 0, '.*\.log[\.0-9]*(\.gz)?$', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);
-			}
-
-			$filelog = '';
-			if (!empty($conf->syslog->enabled))
-			{
-				$filelog = $conf->global->SYSLOG_FILE;
-				$filelog = preg_replace('/DOL_DATA_ROOT/i', DOL_DATA_ROOT, $filelog);
-
-				$alreadyincluded = false;
-				foreach ($filesarray as $tmpcursor)
-				{
-					if ($tmpcursor['fullname'] == $filelog) { $alreadyincluded = true; }
-				}
-				if (!$alreadyincluded) $filesarray[] = array('fullname'=>$filelog, 'type'=>'file');
-			}
-		}
+		dol_syslog("Utils::purgeFiles choice=".$choices, LOG_DEBUG);
 
 		$count = 0;
 		$countdeleted = 0;
 		$counterror = 0;
-		if (count($filesarray))
-		{
-			foreach ($filesarray as $key => $value)
-			{
-				//print "x ".$filesarray[$key]['fullname']."-".$filesarray[$key]['type']."<br>\n";
-				if ($filesarray[$key]['type'] == 'dir')
-				{
-					$startcount = 0;
-					$tmpcountdeleted = 0;
 
-					$result = dol_delete_dir_recursive($filesarray[$key]['fullname'], $startcount, 1, 0, $tmpcountdeleted);
-					$count += $result;
-					$countdeleted += $tmpcountdeleted;
-				} elseif ($filesarray[$key]['type'] == 'file')
+		$choicesarray = explode(',', $choices);
+		foreach ($choicesarray as $choice) {
+			$filesarray = array();
+
+			if ($choice == 'tempfiles' || $choice == 'tempfilesold')
+			{
+				// Delete temporary files
+				if ($dolibarr_main_data_root)
 				{
-					// If (file that is not logfile) or (if mode is logfile)
-					if ($filesarray[$key]['fullname'] != $filelog || $choice == 'logfile')
+					$filesarray = dol_dir_list($dolibarr_main_data_root, "directories", 1, '^temp$', '', 'name', SORT_ASC, 2, 0, '', 1); // Do not follow symlinks
+
+					if ($choice == 'tempfilesold')
 					{
-						$result = dol_delete_file($filesarray[$key]['fullname'], 1, 1);
-						if ($result)
+						$now = dol_now();
+						foreach ($filesarray as $key => $val)
 						{
-							$count++;
-							$countdeleted++;
-						} else {
-							$counterror++;
+							if ($val['date'] > ($now - ($nbsecondsold))) unset($filesarray[$key]); // Discard temp dir not older than $nbsecondsold
 						}
 					}
 				}
 			}
 
-			// Update cachenbofdoc
-			if (!empty($conf->ecm->enabled) && $choice == 'allfiles')
+			if ($choice == 'allfiles')
 			{
-				require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
-				$ecmdirstatic = new EcmDirectory($this->db);
-				$result = $ecmdirstatic->refreshcachenboffile(1);
+				// Delete all files (except install.lock, do not follow symbolic links)
+				if ($dolibarr_main_data_root)
+				{
+					$filesarray = dol_dir_list($dolibarr_main_data_root, "all", 0, '', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);
+				}
+			}
+
+			if ($choice == 'logfile')
+			{
+				// Define files log
+				if ($dolibarr_main_data_root)
+				{
+					$filesarray = dol_dir_list($dolibarr_main_data_root, "files", 0, '.*\.log[\.0-9]*(\.gz)?$', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);
+				}
+
+				$filelog = '';
+				if (!empty($conf->syslog->enabled))
+				{
+					$filelog = $conf->global->SYSLOG_FILE;
+					$filelog = preg_replace('/DOL_DATA_ROOT/i', DOL_DATA_ROOT, $filelog);
+
+					$alreadyincluded = false;
+					foreach ($filesarray as $tmpcursor)
+					{
+						if ($tmpcursor['fullname'] == $filelog) { $alreadyincluded = true; }
+					}
+					if (!$alreadyincluded) $filesarray[] = array('fullname'=>$filelog, 'type'=>'file');
+				}
+			}
+
+			if (is_array($filesarray) && count($filesarray)) {
+				foreach ($filesarray as $key => $value)
+				{
+					//print "x ".$filesarray[$key]['fullname']."-".$filesarray[$key]['type']."<br>\n";
+					if ($filesarray[$key]['type'] == 'dir') {
+						$startcount = 0;
+						$tmpcountdeleted = 0;
+
+						$result = dol_delete_dir_recursive($filesarray[$key]['fullname'], $startcount, 1, 0, $tmpcountdeleted);
+
+						if (!in_array($filesarray[$key]['fullname'], array($conf->api->dir_temp, $conf->user->dir_temp))) {		// The 2 directories $conf->api->dir_temp and $conf->user->dir_temp are recreated at end, so we do not count them
+							$count += $result;
+							$countdeleted += $tmpcountdeleted;
+						}
+					} elseif ($filesarray[$key]['type'] == 'file') {
+						// If (file that is not logfile) or (if mode is logfile)
+						if ($filesarray[$key]['fullname'] != $filelog || $choice == 'logfile')
+						{
+							$result = dol_delete_file($filesarray[$key]['fullname'], 1, 1);
+							if ($result)
+							{
+								$count++;
+								$countdeleted++;
+							} else {
+								$counterror++;
+							}
+						}
+					}
+				}
+
+				// Update cachenbofdoc
+				if (!empty($conf->ecm->enabled) && $choice == 'allfiles')
+				{
+					require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
+					$ecmdirstatic = new EcmDirectory($this->db);
+					$result = $ecmdirstatic->refreshcachenboffile(1);
+				}
 			}
 		}
 
-		if ($count > 0)
-		{
+		if ($count > 0) {
 			$this->output = $langs->trans("PurgeNDirectoriesDeleted", $countdeleted);
 			if ($count > $countdeleted) $this->output .= '<br>'.$langs->trans("PurgeNDirectoriesFailed", ($count - $countdeleted));
-		} else $this->output = $langs->trans("PurgeNothingToDelete").($choice == 'tempfilesold' ? ' (older than 24h)' : '');
+		} else {
+			$this->output = $langs->trans("PurgeNothingToDelete").($choice == 'tempfilesold' ? ' (older than 24h)' : '');
+		}
 
 		// Recreate temp dir that are not automatically recreated by core code for performance purpose, we need them
-		if (!empty($conf->api->enabled))
-		{
+		if (!empty($conf->api->enabled)) {
 			dol_mkdir($conf->api->dir_temp);
 		}
 		dol_mkdir($conf->user->dir_temp);
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 8e087ae6110..d74201b2f17 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -155,8 +155,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or files to delete.

From 25e4791497d5afda11d4222a5b0b5492cb76d097 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 18 Dec 2020 14:27:22 +0100
Subject: [PATCH 515/888] Fix missing creation of master.inc.php file in
 website import

---
 htdocs/website/index.php | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 9cada0bc506..f36225b2407 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -598,16 +598,13 @@ if ($action == 'addcontainer')
 	$db->begin();
 
 	$objectpage->fk_website = $object->id;
-	if (GETPOSTISSET('fetchexternalurl'))
+
+	if (GETPOSTISSET('fetchexternalurl'))	// Fetch from external url
 	{
 		$urltograb = GETPOST('externalurl', 'alpha');
 		$grabimages = GETPOST('grabimages', 'alpha');
 		$grabimagesinto = GETPOST('grabimagesinto', 'alpha');
-		//var_dump($grabimages);exit;
-	}
 
-	if (GETPOSTISSET('fetchexternalurl'))
-	{
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 
 		if (empty($urltograb))
@@ -749,6 +746,7 @@ if ($action == 'addcontainer')
 				// Now loop to fetch JS
 				$tmp = $objectpage->htmlheader;
 
+				// We grab files found into <script> tags
 				preg_match_all('/<script([^\.>]+)src=["\']([^"\'>]+)["\']([^>]*)><\/script>/i', $objectpage->htmlheader, $regs);
 				$errorforsubresource = 0;
 				foreach ($regs[0] as $key => $val)
@@ -814,7 +812,7 @@ if ($action == 'addcontainer')
 				$objectpage->htmlheader = trim($tmp)."\n";
 
 
-				// Now loop to fetch CSS
+				// Now we grab CSS found into <link> tags
 				$pagecsscontent = "\n".'<style>'."\n";
 
 				preg_match_all('/<link([^\.>]+)href=["\']([^"\'>]+\.css[^"\'>]*)["\']([^>]*)>/i', $objectpage->htmlheader, $regs);
@@ -914,7 +912,7 @@ if ($action == 'addcontainer')
 				$objectpage->htmlheader .= trim($pagecsscontent)."\n";
 
 
-				// Now loop to fetch all images into page
+				// Now we have to fetch all images into page
 				$tmp = $objectpage->content;
 
 				getAllImages($object, $objectpage, $urltograb, $tmp, $action, 1, $grabimages, $grabimagesinto);
@@ -1049,6 +1047,7 @@ if ($action == 'addcontainer')
 			}
 		}
 	}
+
 	if (!$error)
 	{
 		$db->commit();
@@ -1075,6 +1074,17 @@ if ($action == 'addcontainer')
 			$result = symlink($pathtomedias, $pathtomediasinwebsite);
 		}
 
+		// Now generate the master.inc.php page if it does not exists yet
+		if (!dol_is_file($filemaster))
+		{
+			$result = dolSaveMasterFile($filemaster);
+			if (!$result)
+			{
+				$error++;
+				setEventMessages('Failed to write file '.$filemaster, null, 'errors');
+			}
+		}
+
 		if (!dol_is_file($filehtmlheader))
 		{
 			$htmlheadercontent = "<html>\n";

From 832db82fcece9f9c44c7aec286fcec9cf75239a7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 18 Dec 2020 14:40:45 +0100
Subject: [PATCH 516/888] Fix warnings

---
 htdocs/compta/facture/class/facture-rec.class.php  |  4 ++--
 htdocs/core/lib/functions.lib.php                  |  2 +-
 htdocs/core/lib/price.lib.php                      |  2 +-
 .../modules/commande/doc/pdf_einstein.modules.php  |  4 ++--
 .../commande/doc/pdf_eratosthene.modules.php       |  4 ++--
 .../core/modules/facture/doc/pdf_crabe.modules.php |  4 ++--
 .../modules/facture/doc/pdf_sponge.modules.php     |  4 ++--
 .../modules/product/doc/pdf_standard.modules.php   |  4 ++--
 .../core/modules/propale/doc/pdf_azur.modules.php  |  4 ++--
 .../core/modules/propale/doc/pdf_cyan.modules.php  |  4 ++--
 .../supplier_order/doc/pdf_cornas.modules.php      |  4 ++--
 .../supplier_order/doc/pdf_muscadet.modules.php    |  4 ++--
 .../supplier_proposal/doc/pdf_aurore.modules.php   |  4 ++--
 .../mymodule/doc/pdf_standard_myobject.modules.php |  4 ++--
 .../class/supplier_proposal.class.php              | 14 +++++++++++++-
 15 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index c9157f7b43d..9c0d191f0cf 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -935,9 +935,9 @@ class FactureRec extends CommonInvoice
 			$sql .= ", ".price2num($txtva);
 			$sql .= ", '".$this->db->escape($vat_src_code)."'";
 			$sql .= ", ".price2num($txlocaltax1);
-			$sql .= ", '".$this->db->escape($localtaxes_type[0])."'";
+			$sql .= ", '".$this->db->escape(isset($localtaxes_type[0]) ? $localtaxes_type[0] : '')."'";
 			$sql .= ", ".price2num($txlocaltax2);
-			$sql .= ", '".$this->db->escape($localtaxes_type[2])."'";
+			$sql .= ", '".$this->db->escape(isset($localtaxes_type[2]) ? $localtaxes_type[2] : '')."'";
 			$sql .= ", ".(!empty($fk_product) ? "'".$this->db->escape($fk_product)."'" : "null");
 			$sql .= ", ".$product_type;
 			$sql .= ", ".price2num($remise_percent);
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 67dcc5f44f9..db05f29fe5a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5216,7 +5216,7 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 		}
 	}
 
-	return 0;
+	return array();
 }
 
 /**
diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index ce14295b4b2..4e3ce29f69e 100644
--- a/htdocs/core/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -104,7 +104,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 		//var_dump($seller->country_id);exit;
 	}
 	if (empty($localtaxes_array) || !is_array($localtaxes_array)) {
-		dol_syslog("Price.lib::calcul_price_total Warning: function is called with parameter localtaxes_array that is missing", LOG_WARNING);
+		dol_syslog("Price.lib::calcul_price_total Warning: function is called with parameter localtaxes_array that is missing or empty", LOG_WARNING);
 	}
 	if (!is_numeric($txtva)) {
 		dol_syslog("Price.lib::calcul_price_total Warning: function was called with a parameter vat rate that is not a real numeric value. There is surely a bug.", LOG_ERR);
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 5a0bbc30327..0b99583e08e 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -534,8 +534,8 @@ class pdf_einstein extends ModelePDFCommandes
 					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
 					{
 						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
-						$localtax1_type = $localtaxtmp_array[0];
-						$localtax2_type = $localtaxtmp_array[2];
+						$localtax1_type = isset($localtaxtmp_array[0]) ? $localtaxtmp_array[0] : '';
+						$localtax2_type = isset($localtaxtmp_array[2]) ? $localtaxtmp_array[2] : '';
 					}
 
 					// retrieve global local tax
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 97354c5c266..d1492dbc5eb 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -758,8 +758,8 @@ class pdf_eratosthene extends ModelePDFCommandes
 					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
 					{
 						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
-						$localtax1_type = $localtaxtmp_array[0];
-						$localtax2_type = $localtaxtmp_array[2];
+						$localtax1_type = isset($localtaxtmp_array[0]) ? $localtaxtmp_array[0] : '';
+						$localtax2_type = isset($localtaxtmp_array[2]) ? $localtaxtmp_array[2] : '';
 					}
 
 					// retrieve global local tax
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index ca3144ad9a3..ce44aac0319 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -658,8 +658,8 @@ class pdf_crabe extends ModelePDFFactures
 					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
 					{
 						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
-						$localtax1_type = $localtaxtmp_array[0];
-						$localtax2_type = $localtaxtmp_array[2];
+						$localtax1_type = isset($localtaxtmp_array[0]) ? $localtaxtmp_array[0] : '';
+						$localtax2_type = isset($localtaxtmp_array[2]) ? $localtaxtmp_array[2] : '';
 					}
 
 					// retrieve global local tax
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 4087e3db098..423aa5b79d1 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -816,8 +816,8 @@ class pdf_sponge extends ModelePDFFactures
 						&& (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
 					{
 						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
-						$localtax1_type = $localtaxtmp_array[0];
-						$localtax2_type = $localtaxtmp_array[2];
+						$localtax1_type = isset($localtaxtmp_array[0]) ? $localtaxtmp_array[0] : '';
+						$localtax2_type = isset($localtaxtmp_array[2]) ? $localtaxtmp_array[2] : '';
 					}
 
 					// retrieve global local tax
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index dcd8419bca6..ceb1819df37 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -470,8 +470,8 @@ class pdf_standard extends ModelePDFProduct
 					&& (! empty($localtax1_rate) || ! empty($localtax2_rate))) // and there is local tax
 					{
 						$localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$object->thirdparty,$mysoc);
-						$localtax1_type = $localtaxtmp_array[0];
-						$localtax2_type = $localtaxtmp_array[2];
+						$localtax1_type = isset($localtaxtmp_array[0]) ? $localtaxtmp_array[0] : '';
+						$localtax2_type = isset($localtaxtmp_array[2]) ? $localtaxtmp_array[2] : '';
 					}
 
 				    // retrieve global local tax
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index a889dec7815..3b09d639bf0 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -626,8 +626,8 @@ class pdf_azur extends ModelePDFPropales
 					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
 					{
 						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
-						$localtax1_type = $localtaxtmp_array[0];
-						$localtax2_type = $localtaxtmp_array[2];
+						$localtax1_type = isset($localtaxtmp_array[0]) ? $localtaxtmp_array[0] : '';
+						$localtax2_type = isset($localtaxtmp_array[2]) ? $localtaxtmp_array[2] : '';
 					}
 
 					// retrieve global local tax
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 119932949b2..80433eb2201 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -773,8 +773,8 @@ class pdf_cyan extends ModelePDFPropales
 					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
 					{
 						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
-						$localtax1_type = $localtaxtmp_array[0];
-						$localtax2_type = $localtaxtmp_array[2];
+						$localtax1_type = isset($localtaxtmp_array[0]) ? $localtaxtmp_array[0] : '';
+						$localtax2_type = isset($localtaxtmp_array[2]) ? $localtaxtmp_array[2] : '';
 					}
 
 					// retrieve global local tax
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index 3a4bc56f64a..22bc80e161d 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -688,8 +688,8 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
 					{
 						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $mysoc, $object->thirdparty);
-						$localtax1_type = $localtaxtmp_array[0];
-						$localtax2_type = $localtaxtmp_array[2];
+						$localtax1_type = isset($localtaxtmp_array[0]) ? $localtaxtmp_array[0] : '';
+						$localtax2_type = isset($localtaxtmp_array[2]) ? $localtaxtmp_array[2] : '';
 					}
 
 					// retrieve global local tax
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
index c8edef0679c..b48cb60df45 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -570,8 +570,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
 					{
 						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $mysoc, $object->thirdparty);
-						$localtax1_type = $localtaxtmp_array[0];
-						$localtax2_type = $localtaxtmp_array[2];
+						$localtax1_type = isset($localtaxtmp_array[0]) ? $localtaxtmp_array[0] : '';
+						$localtax2_type = isset($localtaxtmp_array[2]) ? $localtaxtmp_array[2] : '';
 					}
 
 					// retrieve global local tax
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index 27cfd949ca6..d8307226e41 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -582,8 +582,8 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					if ((!isset($localtax1_type) || $localtax1_type == '' || !isset($localtax2_type) || $localtax2_type == '') // if tax type not defined
 					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) { // and there is local tax
 						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
-						$localtax1_type = $localtaxtmp_array[0];
-						$localtax2_type = $localtaxtmp_array[2];
+						$localtax1_type = isset($localtaxtmp_array[0]) ? $localtaxtmp_array[0] : '';
+						$localtax2_type = isset($localtaxtmp_array[2]) ? $localtaxtmp_array[2] : '';
 					}
 
 					// retrieve global local tax
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
index fbab4d53b0f..cb9e4f0a6dd 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
@@ -686,8 +686,8 @@ class pdf_standard_myobject extends ModelePDFMyObject
 						&& (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
 					{
 						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
-						$localtax1_type = $localtaxtmp_array[0];
-						$localtax2_type = $localtaxtmp_array[2];
+						$localtax1_type = isset($localtaxtmp_array[0]) ? $localtaxtmp_array[0] : '';
+						$localtax2_type = isset($localtaxtmp_array[2]) ? $localtaxtmp_array[2] : '';
 					}
 
 					// retrieve global local tax
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 022c5a13354..8a74b14095b 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -499,7 +499,15 @@ class SupplierProposal extends CommonObject
 			// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 
 			$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
-			$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
+
+			// Clean vat code
+			$reg = array();
+			$vat_src_code = '';
+			if (preg_match('/\((.*)\)/', $txtva, $reg))
+			{
+				$vat_src_code = $reg[1];
+				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
+			}
 
 			if (!empty($conf->multicurrency->enabled) && $pu_ht_devise > 0) {
 				$pu = 0;
@@ -544,6 +552,8 @@ class SupplierProposal extends CommonObject
 			$this->line->label = $label;
 			$this->line->desc = $desc;
 			$this->line->qty = $qty;
+
+			$this->line->vat_src_code = $vat_src_code;
 			$this->line->tva_tx = $txtva;
 			$this->line->localtax1_tx = ($total_localtax1 ? $localtaxes_type[1] : 0);
 			$this->line->localtax2_tx = ($total_localtax2 ? $localtaxes_type[3] : 0);
@@ -2736,6 +2746,8 @@ class SupplierProposalLine extends CommonObjectLine
 
 	public $qty;
 	public $tva_tx;
+	public $vat_src_code;
+
 	public $subprice;
 	public $remise_percent;
 

From 0eaf924d3b936b1cf0b81834b05ebb54e43eafb0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 18 Dec 2020 15:08:00 +0100
Subject: [PATCH 517/888] Add warning on non https website to axplain why
 features is broken

---
 htdocs/admin/agenda_reminder.php  | 12 ++++++++++--
 htdocs/core/lib/functions.lib.php | 20 ++++++++++++++++++++
 htdocs/langs/en_US/errors.lang    |  1 +
 htdocs/theme/eldy/global.inc.php  |  3 ++-
 htdocs/theme/md/style.css.php     |  3 ++-
 5 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php
index 9da8f89310a..27c6bbeed73 100644
--- a/htdocs/admin/agenda_reminder.php
+++ b/htdocs/admin/agenda_reminder.php
@@ -187,10 +187,18 @@ print '<td class="center">&nbsp;</td>'."\n";
 print '<td class="right">'."\n";
 
 if (empty($conf->global->AGENDA_REMINDER_BROWSER)) {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_BROWSER&amp;token='.newToken().'">'.img_picto($langs->trans('Disabled'), 'switch_off').'</a>';
+	if (! getIsHTTPS()) {
+		$langs->load("errors");
+		print img_warning($langs->trans("WarningAvailableOnlyForHTTPSServers"), '', 'valignmiddle size15x').' ';
+	}
+	print '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_BROWSER&amp;token='.newToken().'">'.img_picto($langs->trans('Disabled'), 'switch_off').'</a>';
 	print '</td></tr>'."\n";
 } else {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_BROWSER&amp;token='.newToken().'">'.img_picto($langs->trans('Enabled'), 'switch_on').'</a>';
+	if (! getIsHTTPS()) {
+		$langs->load("errors");
+		print img_warning($langs->trans("WarningAvailableOnlyForHTTPSServers"), '', 'valignmiddle size15x').' ';
+	}
+	print '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_BROWSER&amp;token='.newToken().'">'.img_picto($langs->trans('Enabled'), 'switch_on').'</a>';
 	print '</td></tr>'."\n";
 
 	print '<tr class="oddeven">'."\n";
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index db05f29fe5a..56103e2dc11 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2897,6 +2897,26 @@ function getUserRemoteIP()
 	return $ip;
 }
 
+/**
+ * Return if we are using a HTTPS connexion
+ * Check HTTPS (no way to be modified by user but may be empty or wrong if user is using a proxy)
+ * Take HTTP_X_FORWARDED_PROTO (defined when using proxy)
+ * Then HTTP_X_FORWARDED_SSL
+ *
+ * @return	boolean		True if user is using HTTPS
+ */
+function getIsHTTPS()
+{
+	$isSecure = false;
+	if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
+		$isSecure = true;
+	}
+	elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') {
+		$isSecure = true;
+	}
+	return $isSecure;
+}
+
 /**
  * 	Return a country code from IP. Empty string if not found.
  *
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 501a3005860..9a20094a7aa 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -283,3 +283,4 @@ WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were re
 WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
\ No newline at end of file
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 2b29bbfd229..6a9cbf112df 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -769,7 +769,8 @@ span.fa.fa-plus-circle.paddingleft {
     padding-bottom: 2px;
 }
 
-.fa-toggle-on, .fa-toggle-off { font-size: 2em; }
+.size15x { font-size: 1.5em; }
+.fa-toggle-on, .fa-toggle-off, .size2x { font-size: 2em; }
 .websiteselectionsection .fa-toggle-on, .websiteselectionsection .fa-toggle-off,
 .asetresetmodule .fa-toggle-on, .asetresetmodule .fa-toggle-off,
 .tdwebsitesearchresult .fa-toggle-on, .tdwebsitesearchresult .fa-toggle-off
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 01cace5a5e8..550f80216d2 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -840,7 +840,8 @@ body[class*="colorblind-"] .text-success{
     color: rgb(<?php echo $colortexttitle; ?>) !important;
 }
 
-.fa-toggle-on, .fa-toggle-off { font-size: 2em; }
+.size15x { font-size: 1.5em; }
+.fa-toggle-on, .fa-toggle-off, .size2x { font-size: 2em; }
 .websiteselectionsection .fa-toggle-on, .websiteselectionsection .fa-toggle-off,
 .asetresetmodule .fa-toggle-on, .asetresetmodule .fa-toggle-off {
 	font-size: 1.5em; vertical-align: text-bottom;

From dc9ac9d298033ad7a29fd0f558f382590ed7df5f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 18 Dec 2020 16:31:32 +0100
Subject: [PATCH 518/888] Fix missing error message

---
 htdocs/public/payment/paymentok.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 5a49cec5bbe..a4600c57c22 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -489,13 +489,15 @@ if ($ispaymentok)
 								if (!$resql)
 								{
 									$error++;
-									$errmsg = 'Failed to save customer stripe id in database ; '.$db->lasterror();
+									$errmsg = 'Failed to insert customer stripe id in database : '.$db->lasterror();
+									dol_syslog($errmsg, LOG_ERR, 0, '_payment');
 									$postactionmessages[] = $errmsg;
 									$ispostactionok = -1;
 								}
 							} catch (Exception $e) {
 								$error++;
-								$errmsg = 'Failed to save customer stripe id in database ; '.$e->getMessage();
+								$errmsg = 'Failed to get or save customer stripe id in database : '.$e->getMessage();
+								dol_syslog($errmsg, LOG_ERR, 0, '_payment');
 								$postactionmessages[] = $errmsg;
 								$ispostactionok = -1;
 							}

From c112c807ac747011789f01878611f675a86fb979 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 18 Dec 2020 19:02:36 +0100
Subject: [PATCH 519/888] Fix action after payment on member registration

---
 htdocs/public/payment/newpayment.php |  8 ++---
 htdocs/public/payment/paymentok.php  | 52 +++++++++++++++++++++-------
 htdocs/stripe/class/stripe.class.php |  8 ++---
 htdocs/theme/eldy/global.inc.php     |  2 +-
 htdocs/theme/md/style.css.php        |  2 +-
 5 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index d90f8684673..1a643323dce 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -1660,19 +1660,19 @@ if ($action != 'dopayment')
 		$reshook = $hookmanager->executeHooks('doCheckStatus', $parameters, $object, $action);
 		if ($source == 'order' && $object->billed)
 		{
-			print '<br><br><span class="amountpaymentcomplete">'.$langs->trans("OrderBilled").'</span>';
+			print '<br><br><span class="amountpaymentcomplete size15x">'.$langs->trans("OrderBilled").'</span>';
 		} elseif ($source == 'invoice' && $object->paye)
 		{
-			print '<br><br><span class="amountpaymentcomplete">'.$langs->trans("InvoicePaid").'</span>';
+			print '<br><br><span class="amountpaymentcomplete size15x">'.$langs->trans("InvoicePaid").'</span>';
 		} elseif ($source == 'donation' && $object->paid)
 		{
-			print '<br><br><span class="amountpaymentcomplete">'.$langs->trans("DonationPaid").'</span>';
+			print '<br><br><span class="amountpaymentcomplete size15x">'.$langs->trans("DonationPaid").'</span>';
 		} else {
 			// Membership can be paid and we still allow to make renewal
 			if ($source == 'membersubscription' && $object->datefin > dol_now())
 			{
 				$langs->load("members");
-				print '<br><span class="amountpaymentcomplete">'.$langs->trans("MembershipPaid", dol_print_date($object->datefin, 'day')).'</span><br>';
+				print '<br><span class="amountpaymentcomplete size15x">'.$langs->trans("MembershipPaid", dol_print_date($object->datefin, 'day')).'</span><br>';
 				print '<div class="opacitymedium margintoponly">'.$langs->trans("PaymentWillBeRecordedForNextPeriod").'</div>';
 			}
 
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index a4600c57c22..ef4931c4b4a 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -471,8 +471,10 @@ if ($ispaymentok)
 						$thirdparty = new Societe($db);
 						$thirdparty->fetch($thirdparty_id);
 
-						include_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
+						include_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';	// This also set $stripearrayofkeysbyenv
 						$stripe = new Stripe($db);
+						//$stripeacc = $stripe->getStripeAccount($service);		Already defined previously
+
 						$customer = $stripe->customerStripe($thirdparty, $stripeacc, $servicestatus, 0);
 
 						if (!$customer && $TRANSACTIONID)	// Not linked to a stripe customer, we make the link
@@ -480,21 +482,48 @@ if ($ispaymentok)
 							dol_syslog("No stripe profile found, so we add it for TRANSACTIONID = ".$TRANSACTIONID, LOG_DEBUG, 0, '_payment');
 
 							try {
-								$ch = \Stripe\Charge::retrieve($TRANSACTIONID); // contains the charge id
-								$stripecu = $ch->customer; // value 'cus_....'
+								global $stripearrayofkeysbyenv;
+								\Stripe\Stripe::setApiKey($stripearrayofkeysbyenv[$servicestatus]['secret_key']);
 
-								$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_account (fk_soc, login, key_account, site, status, entity, date_creation, fk_user_creat)";
-								$sql .= " VALUES (".$object->fk_soc.", '', '".$db->escape($stripecu)."', 'stripe', ".$servicestatus.", ".$conf->entity.", '".$db->idate(dol_now())."', 0)";
-								$resql = $db->query($sql);
-								if (!$resql)
-								{
+								if (preg_match('/^pi_/', $TRANSACTIONID)) {
+									// This may throw an error if not found.
+									$chpi = \Stripe\PaymentIntent::retrieve($TRANSACTIONID);	// payment_intent (pi_...)
+								} else {
+									// This throw an error if not found
+									$chpi = \Stripe\Charge::retrieve($TRANSACTIONID); // old method, contains the charge id (ch_...)
+								}
+
+								if ($chpi) {
+									$stripecu = $chpi->customer; // value 'cus_....'. WARNING: This property may be empty if first payment was recorded before the stripe customer was created.
+
+									if (empty($stripecu)) {
+										// This include the INSERT
+										$customer = $stripe->customerStripe($thirdparty, $stripeacc, $servicestatus, 1);
+
+										// Link this customer to the payment intent
+										if (preg_match('/^pi_/', $TRANSACTIONID) && $customer) {
+											\Stripe\PaymentIntent::update($chpi->id, array('customer' => $customer->id));
+										}
+									} else {
+										$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_account (fk_soc, login, key_account, site, site_account, status, entity, date_creation, fk_user_creat)";
+										$sql .= " VALUES (".$object->fk_soc.", '', '".$db->escape($stripecu)."', 'stripe', '".$db->escape($stripearrayofkeysbyenv[$servicestatus]['publishable_key'])."', ".$servicestatus.", ".$conf->entity.", '".$db->idate(dol_now())."', 0)";
+										$resql = $db->query($sql);
+										if (!$resql) {	// should not happen
+											$error++;
+											$errmsg = 'Failed to insert customer stripe id in database : '.$db->lasterror();
+											dol_syslog($errmsg, LOG_ERR, 0, '_payment');
+											$postactionmessages[] = $errmsg;
+											$ispostactionok = -1;
+										}
+									}
+								} else {	// should not happen
 									$error++;
-									$errmsg = 'Failed to insert customer stripe id in database : '.$db->lasterror();
+									$errmsg = 'Failed to retreive paymentintent or charge from id';
 									dol_syslog($errmsg, LOG_ERR, 0, '_payment');
 									$postactionmessages[] = $errmsg;
 									$ispostactionok = -1;
 								}
-							} catch (Exception $e) {
+							} catch (Exception $e) {	// should not happen
 								$error++;
 								$errmsg = 'Failed to get or save customer stripe id in database : '.$e->getMessage();
 								dol_syslog($errmsg, LOG_ERR, 0, '_payment');
@@ -505,8 +534,7 @@ if ($ispaymentok)
 					}
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					$db->commit();
 				} else {
 					$db->rollback();
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index e7856a82899..db225196ea7 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -142,7 +142,7 @@ class Stripe extends CommonObject
 
 
 	/**
-	 * Get the Stripe customer of a thirdparty (with option to create it if not linked yet).
+	 * Get the Stripe customer of a thirdparty (with option to create it in Stripe if not linked yet).
 	 * Search on site_account = 0 or = $stripearrayofkeysbyenv[$status]['publishable_key']
 	 *
 	 * @param	Societe	$object							Object thirdparty to check, or create on stripe (create on stripe also update the stripe_account table for current entity)
@@ -179,8 +179,7 @@ class Stripe extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
-			if ($num)
-			{
+			if ($num) {
 				$obj = $this->db->fetch_object($resql);
 				$tiers = $obj->key_account;
 
@@ -199,8 +198,7 @@ class Stripe extends CommonObject
 					// For exemple, we may have error: 'No such customer: cus_XXXXX; a similar object exists in live mode, but a test mode key was used to make this request.'
 					$this->error = $e->getMessage();
 				}
-			} elseif ($createifnotlinkedtostripe)
-			{
+			} elseif ($createifnotlinkedtostripe) {
 				$ipaddress = getUserRemoteIP();
 
 				$dataforcustomer = array(
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 6a9cbf112df..337c72ec0d9 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -769,7 +769,7 @@ span.fa.fa-plus-circle.paddingleft {
     padding-bottom: 2px;
 }
 
-.size15x { font-size: 1.5em; }
+.size15x { font-size: 1.5em !important; }
 .fa-toggle-on, .fa-toggle-off, .size2x { font-size: 2em; }
 .websiteselectionsection .fa-toggle-on, .websiteselectionsection .fa-toggle-off,
 .asetresetmodule .fa-toggle-on, .asetresetmodule .fa-toggle-off,
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 550f80216d2..0f251bb3067 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -840,7 +840,7 @@ body[class*="colorblind-"] .text-success{
     color: rgb(<?php echo $colortexttitle; ?>) !important;
 }
 
-.size15x { font-size: 1.5em; }
+.size15x { font-size: 1.5em !important; }
 .fa-toggle-on, .fa-toggle-off, .size2x { font-size: 2em; }
 .websiteselectionsection .fa-toggle-on, .websiteselectionsection .fa-toggle-off,
 .asetresetmodule .fa-toggle-on, .asetresetmodule .fa-toggle-off {

From fe93ee4d083c8de81439920dcac229529a6f9009 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 19 Dec 2020 13:03:40 +0100
Subject: [PATCH 520/888] Debug website module for multilanguage

---
 htdocs/core/class/html.formwebsite.class.php | 18 +++++++---
 htdocs/langs/en_US/errors.lang               |  4 ++-
 htdocs/langs/en_US/website.lang              |  2 +-
 htdocs/website/index.php                     | 38 +++++++++++++++-----
 4 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/class/html.formwebsite.class.php b/htdocs/core/class/html.formwebsite.class.php
index 0f3e9a357b8..8cbb7967415 100644
--- a/htdocs/core/class/html.formwebsite.class.php
+++ b/htdocs/core/class/html.formwebsite.class.php
@@ -107,9 +107,10 @@ class FormWebsite
 	 *  @param	string	$selected			Selected value
 	 *  @param  int		$useempty          	1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
 	 *  @param  string  $moreattrib         More attributes on HTML select tag
+	 *  @param	int		$addjscombo			Add js combo
 	 * 	@return	void
 	 */
-	public function selectTypeOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '')
+	public function selectTypeOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '', $addjscombo = 0)
 	{
 		global $langs, $conf, $user;
 
@@ -128,7 +129,7 @@ class FormWebsite
 			$i = 0;
 			if ($num)
 			{
-				print '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
+				print '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer minwidth200" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
 				if ($useempty == 1 || ($useempty == 2 && $num > 1))
 				{
 					print '<option value="-1">&nbsp;</option>';
@@ -149,6 +150,10 @@ class FormWebsite
 				}
 				print "</select>";
 				if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+
+				if ($addjscombo) {
+					print ajax_combobox('select'.$htmlname);
+				}
 			} else {
 				print $langs->trans("NoTypeOfPagePleaseEditDictionary");
 			}
@@ -165,9 +170,10 @@ class FormWebsite
 	 *  @param	string	$selected			Selected value
 	 *  @param  int		$useempty          	1=Add an empty value in list
 	 *  @param  string  $moreattrib         More attributes on HTML select tag
+	 *  @param	int		$addjscombo			Add js combo
 	 * 	@return	string						HTML select component with list of type of containers
 	 */
-	public function selectSampleOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '')
+	public function selectSampleOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '', $addjscombo = 0)
 	{
 		global $langs, $conf, $user;
 
@@ -190,7 +196,7 @@ class FormWebsite
 		}
 
 		$out = '';
-		$out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
+		$out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer minwidth200" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
 
 		if ($useempty == 1 || $useempty == 2)
 		{
@@ -210,6 +216,10 @@ class FormWebsite
 		}
 		$out .= "</select>";
 
+		if ($addjscombo) {
+			$out .= ajax_combobox('select'.$htmlname);
+		}
+
 		return $out;
 	}
 
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 9a20094a7aa..056bec48fe9 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -252,7 +252,9 @@ ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
 ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
 ErrorNotAvailableWithThisDistribution=Not available with this distribution
 ErrorPublicInterfaceNotEnabled=Public interface was not enabled
-
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index b6dbee28994..7793fa5dead 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -100,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index f36225b2407..c1fe6f84c77 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -940,6 +940,7 @@ if ($action == 'addcontainer')
 		$objectpage->keywords = str_replace(array('<', '>'), '', GETPOST('WEBSITE_KEYWORDS', 'alphanohtml'));
 		$objectpage->allowed_in_frames = GETPOST('WEBSITE_ALLOWED_IN_FRAMES', 'aZ09');
 		$objectpage->htmlheader = GETPOST('htmlheader', 'none');
+		$objectpage->fk_page = (GETPOST('pageidfortranslation', 'int') > 0 ? GETPOST('pageidfortranslation', 'int') : 0);
 		$objectpage->author_alias = GETPOST('WEBSITE_AUTHORALIAS', 'alphanohtml');
 		$objectpage->object_type = GETPOST('WEBSITE_OBJECTCLASS');
 		$objectpage->fk_object = GETPOST('WEBSITE_OBJECTID');
@@ -949,7 +950,7 @@ if ($action == 'addcontainer')
 		$sample = GETPOST('sample', 'alpha');
 		if (empty($sample)) $sample = 'empty';
 
-		$pathtosample = DOL_DOCUMENT_ROOT.'/website/samples/page-sample-'.$sample.'.html';
+		$pathtosample = DOL_DOCUMENT_ROOT.'/website/samples/page-sample-'.dol_sanitizeFileName($sample).'.html';
 
 		// Init content with content into pagetemplate.html, blogposttempltate.html, ...
 		$objectpage->content = make_substitutions(@file_get_contents($pathtosample), $substitutionarray);
@@ -978,6 +979,22 @@ if ($action == 'addcontainer')
 			$error++;
 			$action = 'createcontainer';
 		}
+		if ($objectpage->fk_page > 0 && empty($objectpage->lang))
+		{
+			$langs->load("errors");
+			setEventMessages($langs->trans("ErrorLanguageRequiredIfPageIsTranslationOfAnother"), null, 'errors');
+			$error++;
+			$action = 'createcontainer';
+		}
+		if ($objectpage->fk_page > 0 && !empty($objectpage->lang))
+		{
+			if ($objectpage->lang == $website->lang) {
+				$langs->load("errors");
+				setEventMessages($langs->trans("ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother"), null, 'errors');
+				$error++;
+				$action = 'createcontainer';
+			}
+		}
 	}
 
 	if (!$error)
@@ -3231,14 +3248,16 @@ if ($action == 'createsite')
 	print '</td></tr>';
 
 	print '<tr><td>';
-	print $langs->trans('OtherLanguages');
+	$htmltext = $langs->trans("Example").': fr,de,sv,it,pt';
+	print $form->textwithpicto($langs->trans('OtherLanguages'), $htmltext, 1, 'help', '', 0, 2);
 	print '</td><td>';
 	print '<input type="text" class="flat minwidth300" name="WEBSITE_OTHERLANG" value="'.dol_escape_htmltag($siteotherlang).'">';
 	print '</td></tr>';
 
 	print '<tr><td>';
 
-	$htmltext = $langs->trans("SetHereVirtualHost", DOL_DATA_ROOT.'/website/<i>websiteref</i>');
+	$htmltext = $langs->trans("SetHereVirtualHost", '{s1}');
+	$htmltext = str_replace('{s1}', DOL_DATA_ROOT.'/website/<i>websiteref</i>', $htmltext);
 	$htmltext .= '<br>';
 	$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
 	$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), '{s1}');
@@ -3351,7 +3370,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')	// Edit properties of
 		print ' ';
 		print $langs->trans("ImagesShouldBeSavedInto").' ';
 		$arraygrabimagesinto = array('root'=>$langs->trans("WebsiteRootOfImages"), 'subpage'=>$langs->trans("SubdirOfPage"));
-		print $form->selectarray('grabimagesinto', $arraygrabimagesinto, GETPOSTISSET('grabimagesinto') ?GETPOST('grabimagesinto') : 'root');
+		print $form->selectarray('grabimagesinto', $arraygrabimagesinto, GETPOSTISSET('grabimagesinto') ? GETPOST('grabimagesinto') : 'root', 0, 0, 0, '', 0, 0, 0, '', '', 1);
 		print '<br>';
 		print '<input class="button" style="margin-top: 5px" type="submit" name="fetchexternalurl" value="'.dol_escape_htmltag($langs->trans("FetchAndCreate")).'">';
 		print '</td></tr>';
@@ -3433,7 +3452,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')	// Edit properties of
 	print $langs->trans('WEBSITE_TYPE_CONTAINER');
 	print '</td><td>';
 	print img_picto('', 'object_technic', 'class="paddingrightonly"').' ';
-	$formwebsite->selectTypeOfContainer('WEBSITE_TYPE_CONTAINER', (GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha') ?GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha') : $type_container));
+	$formwebsite->selectTypeOfContainer('WEBSITE_TYPE_CONTAINER', (GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha') ? GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha') : $type_container), 0, '', 1);
 	print '</td></tr>';
 
 	if ($action == 'createcontainer')
@@ -3441,7 +3460,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')	// Edit properties of
 		print '<tr><td class="titlefield fieldrequired">';
 		print $langs->trans('WEBSITE_PAGE_EXAMPLE');
 		print '</td><td>';
-		print $formwebsite->selectSampleOfContainer('sample', (GETPOSTISSET('sample') ?GETPOST('sample', 'alpha') : 'empty'));
+		print $formwebsite->selectSampleOfContainer('sample', (GETPOSTISSET('sample') ? GETPOST('sample', 'alpha') : 'empty'), 0, '', 1);
 		print '</td></tr>';
 	}
 
@@ -3561,7 +3580,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')	// Edit properties of
 			$translationof = $objectpage->fk_page;
 			print '<span class="opacitymedium">'.$langs->trans('ThisPageIsTranslationOf').'</span> ';
 			print $formwebsite->selectContainer($website, 'pageidfortranslation', ($translationof ? $translationof : -1), 1, $action, 'minwidth300', array($objectpage->id));
-			if ($translationof > 0) {
+			if ($translationof > 0 && $sourcepage->lang) {
 				print $sourcepage->getNomUrl(2).' ('.$sourcepage->lang.')';
 			}
 		}
@@ -3596,8 +3615,9 @@ if ($action == 'editmeta' || $action == 'createcontainer')	// Edit properties of
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_WEBSITE_PAGE, '', 'parent', null, null, 1);
 		}
 
-		print '<tr class="visibleifsupplier"><td class="toptd">'.$form->editfieldkey('Categories', 'categories', '', $objectpage, 0).'</td><td colspan="3">';
-		print img_picto('', 'category', 'class="paddingright"').$form->multiselectarray('categories', $cate_arbo, (GETPOSTISSET('categories') ? GETPOST('categories', 'array') : $arrayselected), null, null, 'quatrevingtpercent widthcentpercentminusx');
+		print '<tr><td class="toptd">'.$form->editfieldkey('Categories', 'categories', '', $objectpage, 0).'</td><td>';
+		print img_picto('', 'category', 'class="paddingright"');
+		print $form->multiselectarray('categories', $cate_arbo, (GETPOSTISSET('categories') ? GETPOST('categories', 'array') : $arrayselected), null, null, 'quatrevingtpercent widthcentpercentminusx');
 		print "</td></tr>";
 	}
 

From 22b224744282b23bffdf2c7f1ec3006fbcd74d36 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sat, 19 Dec 2020 13:41:49 +0100
Subject: [PATCH 521/888] Update sms.php

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

diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index 09cc0debfd5..d06b99691f5 100644
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -310,7 +310,7 @@ else
 		$formsms->withfromreadonly = 0;
 		$formsms->withsubstit = 0;
 		$formsms->withfrom = 1;
-		$formsms->withto = (isset($_POST['sendto']) ? $_POST['sendto'] : $user->user_mobile ? $user->user_mobile : 1);
+		$formsms->withto = (isset($_POST['sendto']) ? $_POST['sendto'] : ($user->user_mobile ? $user->user_mobile : 1));
 		$formsms->withbody = (isset($_POST['message']) ? (empty($_POST['message']) ? 1 : $_POST['message']) : $langs->trans("ThisIsATestMessage"));
 		$formsms->withbodyreadonly = 0;
 		$formsms->withcancel = 1;

From b6bb08ec2e490665dd27e52ee320a4107df69ece Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 19 Dec 2020 13:44:15 +0100
Subject: [PATCH 522/888] Fix management of hreflang

---
 htdocs/core/lib/website2.lib.php |  2 ++
 htdocs/website/index.php         | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 1ed80ece372..3462212ee25 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -129,6 +129,7 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage)
 
 	$shortlangcode = '';
 	if ($objectpage->lang) $shortlangcode = substr($objectpage->lang, 0, 2); // en_US or en-US -> en
+	if (empty($shortlangcode)) $shortlangcode = substr($object->lang, 0, 2); // en_US or en-US -> en
 
 	$tplcontent = '';
 	$tplcontent .= "<?php // BEGIN PHP\n";
@@ -175,6 +176,7 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage)
 			if ($tmppage->id > 0) {
 				$tmpshortlangcode = '';
 				if ($tmppage->lang) $tmpshortlangcode = preg_replace('/[_-].*$/', '', $tmppage->lang); // en_US or en-US -> en
+				if (empty($tmpshortlangcode)) $tmpshortlangcode = preg_replace('/[_-].*$/', '', $object->lang); // en_US or en-US -> en
 				if ($tmpshortlangcode != $shortlangcode) {
 					$tplcontent .= '<link rel="alternate" hreflang="'.$tmpshortlangcode.'" href="'.($object->fk_default_home == $tmppage->id ? '/' : (($tmpshortlangcode != substr($object->lang, 0, 2)) ? '/'.$tmpshortlangcode : '').'/'.$tmppage->pageurl.'.php').'" />'."\n";
 				}
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index c1fe6f84c77..1b477a0272b 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -940,13 +940,24 @@ if ($action == 'addcontainer')
 		$objectpage->keywords = str_replace(array('<', '>'), '', GETPOST('WEBSITE_KEYWORDS', 'alphanohtml'));
 		$objectpage->allowed_in_frames = GETPOST('WEBSITE_ALLOWED_IN_FRAMES', 'aZ09');
 		$objectpage->htmlheader = GETPOST('htmlheader', 'none');
-		$objectpage->fk_page = (GETPOST('pageidfortranslation', 'int') > 0 ? GETPOST('pageidfortranslation', 'int') : 0);
 		$objectpage->author_alias = GETPOST('WEBSITE_AUTHORALIAS', 'alphanohtml');
 		$objectpage->object_type = GETPOST('WEBSITE_OBJECTCLASS');
 		$objectpage->fk_object = GETPOST('WEBSITE_OBJECTID');
 		$substitutionarray = array();
 		$substitutionarray['__WEBSITE_CREATE_BY__'] = $user->getFullName($langs);
 
+		// Define id of page the new page is translation of
+		$pageidfortranslation = (GETPOST('pageidfortranslation', 'int') > 0 ? GETPOST('pageidfortranslation', 'int') : 0);
+		if ($pageidfortranslation > 0) {
+			// Check if the page we are translation of is alreayd a translation of a source page. if yes, we will use source id instead
+			$objectpagetmp = new WebsitePage($db);
+			$objectpagetmp->fetch($pageidfortranslation);
+			if ($objectpagetmp->fk_page > 0) {
+				$pageidfortranslation = $objectpagetmp->fk_page;
+			}
+		}
+		$objectpage->fk_page = $pageidfortranslation;
+
 		$sample = GETPOST('sample', 'alpha');
 		if (empty($sample)) $sample = 'empty';
 

From ef4a816c56a12b375712fa0730ff7c0650562f55 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 19 Dec 2020 15:56:21 +0100
Subject: [PATCH 523/888] CSS

---
 htdocs/core/lib/functions.lib.php | 13 ++++++++-----
 htdocs/product/fournisseurs.php   |  4 ++--
 htdocs/product/price.php          | 10 +++++-----
 htdocs/theme/eldy/global.inc.php  |  2 +-
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 56103e2dc11..00fa4b8f0b7 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4219,11 +4219,12 @@ function dol_print_error_email($prefixcode, $errormessage = '', $errormessages =
  *	@param  string	$sortorder   Current sort order
  *  @param	string	$prefix		 Prefix for css. Use space after prefix to add your own CSS tag.
  *  @param	string	$tooltip	 Tooltip
+ *  @param	string	$forcenowrapcolumntitle		No need for use 'wrapcolumntitle' css style
  *	@return	void
  */
-function print_liste_field_titre($name, $file = "", $field = "", $begin = "", $moreparam = "", $moreattrib = "", $sortfield = "", $sortorder = "", $prefix = "", $tooltip = "")
+function print_liste_field_titre($name, $file = "", $field = "", $begin = "", $moreparam = "", $moreattrib = "", $sortfield = "", $sortorder = "", $prefix = "", $tooltip = "", $forcenowrapcolumntitle = 0)
 {
-	print getTitleFieldOfList($name, 0, $file, $field, $begin, $moreparam, $moreattrib, $sortfield, $sortorder, $prefix, 0, $tooltip);
+	print getTitleFieldOfList($name, 0, $file, $field, $begin, $moreparam, $moreattrib, $sortfield, $sortorder, $prefix, 0, $tooltip, $forcenowrapcolumntitle);
 }
 
 /**
@@ -4241,9 +4242,10 @@ function print_liste_field_titre($name, $file = "", $field = "", $begin = "", $m
  *  @param	string	$prefix		 		Prefix for css. Use space after prefix to add your own CSS tag, for example 'mycss '.
  *  @param	string	$disablesortlink	1=Disable sort link
  *  @param	string	$tooltip	 		Tooltip
+ *  @param	string	$forcenowrapcolumntitle		No need for use 'wrapcolumntitle' css style
  *	@return	string
  */
-function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin = "", $moreparam = "", $moreattrib = "", $sortfield = "", $sortorder = "", $prefix = "", $disablesortlink = 0, $tooltip = '')
+function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin = "", $moreparam = "", $moreattrib = "", $sortfield = "", $sortorder = "", $prefix = "", $disablesortlink = 0, $tooltip = '', $forcenowrapcolumntitle = 0)
 {
 	global $conf, $langs, $form;
 	//print "$name, $file, $field, $begin, $options, $moreattrib, $sortfield, $sortorder<br>\n";
@@ -4262,9 +4264,10 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 	$tmpfield = explode(',', $field);
 	$field1 = trim($tmpfield[0]); // If $field is 'd.datep,d.id', it becomes 'd.datep'
 
-	if (empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE)) {
+	if (empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && empty($forcenowrapcolumntitle)) {
 		$prefix = 'wrapcolumntitle '.$prefix;
 	}
+
 	//var_dump('field='.$field.' field1='.$field1.' sortfield='.$sortfield.' sortfield1='.$sortfield1);
 	// If field is used as sort criteria we use a specific css class liste_titre_sel
 	// Example if (sortfield,field)=("nom","xxx.nom") or (sortfield,field)=("nom","nom")
@@ -4274,7 +4277,7 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 	}
 	$out .= '<'.$tag.' class="'.$prefix.$liste_titre.'" '.$moreattrib;
 	//$out .= (($field && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && preg_match('/^[a-zA-Z_0-9\s\.\-:&;]*$/', $name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '');
-	$out .= (($field && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '');
+	$out .= ($name && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '';
 	$out .= '>';
 
 	if (empty($thead) && $field && empty($disablesortlink))    // If this is a sort field
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 324fbe36b9f..cf21c95dde2 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -915,7 +915,7 @@ END;
 
 				// Suppliers list title
 				print '<div class="div-table-responsive">';
-				print '<table class="noborder centpercent">';
+				print '<table class="liste centpercent">';
 
 				$param = "&id=".$object->id;
 
@@ -937,7 +937,7 @@ END;
 				if (!empty($arrayfields['pfp.barcode']['checked']))					print_liste_field_titre("BarcodeValue", $_SERVER["PHP_SELF"], "pfp.barcode", "", $param, '', $sortfield, $sortorder, 'center ');
 				if (!empty($arrayfields['pfp.fk_barcode_type']['checked']))			print_liste_field_titre("BarcodeType", $_SERVER["PHP_SELF"], "pfp.fk_barcode_type", "", $param, '', $sortfield, $sortorder, 'center ');
 				if (!empty($arrayfields['pfp.packaging']['checked']))				print_liste_field_titre("PackagingForThisProduct", $_SERVER["PHP_SELF"], "pfp.packaging", "", $param, 'align="center"', $sortfield, $sortorder);
-				if (!empty($arrayfields['pfp.tms']['checked']))						print_liste_field_titre("DateModification", $_SERVER["PHP_SELF"], "pfp.tms", "", $param, '', $sortfield, $sortorder, 'right ');
+				if (!empty($arrayfields['pfp.tms']['checked']))						print_liste_field_titre("DateModification", $_SERVER["PHP_SELF"], "pfp.tms", "", $param, '', $sortfield, $sortorder, 'right ', '', 1);
 
 				// fetch optionals attributes and labels
 				$extrafields->fetch_name_optionals_label("product_fournisseur_price");
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 16d9fedd078..844f83479c8 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1460,7 +1460,7 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
 			else print_barre_liste($langs->trans("PriceByCustomerLog"), 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, $num, 'title_accountancy.png');
 
 			print '<div class="div-table-responsive">';
-			print '<table class="noborder centpercent">';
+			print '<table class="liste centpercent">';
 
 			print '<tr class="liste_titre">';
 			print '<td>'.$langs->trans("AppliedPricesFrom").'</td>';
@@ -1659,7 +1659,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 		print dol_get_fiche_head();
 
-		print '<table class="border centpercent">';
+		print '<table class="liste centpercent">';
 		print '<tr>';
 		print '<td class="fieldrequired">'.$langs->trans('ThirdParty').'</td>';
 		print '<td>';
@@ -1745,7 +1745,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 		print dol_get_fiche_head();
 
-		print '<table class="border centpercent">';
+		print '<table class="liste centpercent">';
 		print '<tr>';
 		print '<td class="titlefield">'.$langs->trans('ThirdParty').'</td>';
 		$staticsoc = new Societe($db);
@@ -1855,7 +1855,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-			print '<table class="noborder centpercent">';
+			print '<table class="liste centpercent">';
 
 			print '<tr class="liste_titre">';
 			print '<td>'.$langs->trans("ThirdParty").'</td>';
@@ -1970,7 +1970,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-		print '<table class="noborder centpercent">';
+		print '<table class="liste centpercent">';
 
 		if (count($prodcustprice->lines) > 0 || $search_soc)
 		{
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 337c72ec0d9..e6991388ad0 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -136,7 +136,7 @@ select.vmenusearchselectcombo {
 table.liste th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), table.liste td.wrapcolumntitle.liste_titre:not(.maxwidthsearch) {
     overflow: hidden;
     white-space: nowrap;
-    max-width: 120px;
+    max-width: 100px;
     text-overflow: ellipsis;
 }
 .liste_titre input[name=month_date_when], .liste_titre input[name=monthvalid], .liste_titre input[name=search_ordermonth], .liste_titre input[name=search_deliverymonth],

From 7871a41c5c9f2545365c723f58ecacb1350a29cb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 19 Dec 2020 16:24:32 +0100
Subject: [PATCH 524/888] Fix css

---
 htdocs/product/fournisseurs.php | 2 +-
 htdocs/product/price.php        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index cf21c95dde2..3111334c785 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -976,7 +976,7 @@ END;
 
 						// Supplier
 						if (!empty($arrayfields['s.nom']['checked'])) {
-							print '<td>'.$productfourn->getSocNomUrl(1, 'supplier').'</td>';
+							print '<td class="tdoverflowmax200">'.$productfourn->getSocNomUrl(1, 'supplier').'</td>';
 						}
 
 						// Supplier ref
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 844f83479c8..f1259b3268f 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -847,8 +847,8 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 				print '<input type="hidden" name="action" value="setlabelsellingprice">';
 				print '<input type="hidden" name="pricelevel" value="'.$i.'">';
 				print $langs->trans("SellingPrice").' '.$i.' - ';
-				print '<input size="10" class="maxwidthonsmartphone" type="text" name="labelsellingprice" value="'.$conf->global->$keyforlabel.'">';
-				print '&nbsp;<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+				print '<input class="maxwidthonsmartphone" type="text" name="labelsellingprice" value="'.$conf->global->$keyforlabel.'">';
+				print '&nbsp;<input type="submit" class="button smallpaddingimp" value="'.$langs->trans("Modify").'">';
 				print '</form>';
 			} else {
 				print $langs->trans("SellingPrice").' '.$i;

From 30b55ef0384753c680739cf9710535b222ccf932 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 19 Dec 2020 16:29:46 +0100
Subject: [PATCH 525/888] Move files

---
 dev/{ => tools/test}/namespacemig/README.md     | 0
 dev/{ => tools/test}/namespacemig/aaa.class.php | 0
 dev/{ => tools/test}/namespacemig/bbb.class.php | 0
 dev/{ => tools/test}/namespacemig/bbb.php       | 0
 dev/{ => tools/test}/namespacemig/main.inc.php  | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename dev/{ => tools/test}/namespacemig/README.md (100%)
 rename dev/{ => tools/test}/namespacemig/aaa.class.php (100%)
 rename dev/{ => tools/test}/namespacemig/bbb.class.php (100%)
 rename dev/{ => tools/test}/namespacemig/bbb.php (100%)
 rename dev/{ => tools/test}/namespacemig/main.inc.php (100%)

diff --git a/dev/namespacemig/README.md b/dev/tools/test/namespacemig/README.md
similarity index 100%
rename from dev/namespacemig/README.md
rename to dev/tools/test/namespacemig/README.md
diff --git a/dev/namespacemig/aaa.class.php b/dev/tools/test/namespacemig/aaa.class.php
similarity index 100%
rename from dev/namespacemig/aaa.class.php
rename to dev/tools/test/namespacemig/aaa.class.php
diff --git a/dev/namespacemig/bbb.class.php b/dev/tools/test/namespacemig/bbb.class.php
similarity index 100%
rename from dev/namespacemig/bbb.class.php
rename to dev/tools/test/namespacemig/bbb.class.php
diff --git a/dev/namespacemig/bbb.php b/dev/tools/test/namespacemig/bbb.php
similarity index 100%
rename from dev/namespacemig/bbb.php
rename to dev/tools/test/namespacemig/bbb.php
diff --git a/dev/namespacemig/main.inc.php b/dev/tools/test/namespacemig/main.inc.php
similarity index 100%
rename from dev/namespacemig/main.inc.php
rename to dev/tools/test/namespacemig/main.inc.php

From 5cbdad7fa704d6a285e6ae32ce8624b9fd254a25 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 19 Dec 2020 16:33:58 +0100
Subject: [PATCH 526/888] Fix autofill pass

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

diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index ec626a79903..713f3132eaf 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -407,8 +407,7 @@ if (!empty($force_install_noedit)) {
 			<input type="password"
                    id="db_pass" autocomplete="off"
 			       name="db_pass"
-			       value="
-				<?php
+			       value="<?php
 				// If $force_install_databasepass is on, we don't want to set password, we just show '***'. Real value will be extracted from the forced install file at step1.
 				$autofill = ((!empty($_SESSION['dol_save_pass'])) ? $_SESSION['dol_save_pass'] : str_pad('', strlen($force_install_databasepass), '*'));
 				if (!empty($dolibarr_main_prod)) {

From 157e94a664aeb52519a1b2b88ec567d47ace7740 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 19 Dec 2020 16:50:31 +0100
Subject: [PATCH 527/888] Fix trans

---
 htdocs/langs/en_US/main.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 07c463b7371..c2eae911053 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -86,7 +86,7 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
-DedicatedPageAvailable=This is a dedicated help page related to your current screen
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted

From 4ed14d49035656f2f7046e057bc0a20aeeff4adf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 19 Dec 2020 18:52:05 +0100
Subject: [PATCH 528/888] Fix title not saved

---
 htdocs/compta/facture/card-rec.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 11dec142a17..b978de677a9 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -156,7 +156,7 @@ if (empty($reshook))
 	// Create predefined invoice
 	if ($action == 'add')
 	{
-		if (!GETPOST('titre', 'nohtml'))
+		if (!GETPOST('title', 'alphanohtml'))
 		{
 			setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->trans("Title")), null, 'errors');
 			$action = "create";
@@ -289,7 +289,7 @@ if (empty($reshook))
 	elseif ($action == 'setref' && $user->rights->facture->creer)
 	{
 		//var_dump(GETPOST('ref', 'alpha'));exit;
-		$result = $object->setValueFrom('titre', $ref, '', null, 'text', '', $user, 'BILLREC_MODIFY');
+		$result = $object->setValueFrom('title', $ref, '', null, 'text', '', $user, 'BILLREC_MODIFY');
 		if ($result > 0)
 		{
 			$object->titre = GETPOST('ref', 'alpha'); // deprecated
@@ -967,7 +967,7 @@ if ($action == 'create')
 
 		// Title
 		print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Title").'</td><td>';
-		print '<input class="flat quatrevingtpercent" type="text" name="titre" value="'.dol_escape_htmltag(GETPOST("titre", 'alphanohtml')).'">';
+		print '<input class="flat quatrevingtpercent" type="text" name="title" value="'.dol_escape_htmltag(GETPOST("titre", 'alphanohtml')).'">';
 		print '</td></tr>';
 
 		// Third party
@@ -1237,7 +1237,7 @@ if ($action == 'create')
 		}
 		$morehtmlref .= '</div>';
 
-		dol_banner_tab($object, 'ref', $linkback, 1, 'titre', 'none', $morehtmlref, '', 0, '', $morehtmlright);
+		dol_banner_tab($object, 'ref', $linkback, 1, 'title', 'none', $morehtmlref, '', 0, '', $morehtmlright);
 
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';

From 70d1cc79e03458bd813863166d795b1be54a8e4f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 19 Dec 2020 21:30:56 +0100
Subject: [PATCH 529/888] Fix link

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

diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 76cae0443b3..5da91db0171 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -493,10 +493,8 @@ if ($mode == 'searchkey')
 		print '<tr class="oddeven"><td>'.$langcode.'</td><td>'.$key.'</td><td>';
 		print dol_escape_htmltag($val);
 		print '</td><td class="right nowraponall">';
-		if (!empty($newlangfileonly->tab_translate[$key]))
-		{
-			if ($val != $newlangfileonly->tab_translate[$key])
-			{
+		if (!empty($newlangfileonly->tab_translate[$key])) {
+			if ($val != $newlangfileonly->tab_translate[$key]) {
 				// retrieve rowid
 				$sql = "SELECT rowid";
 				$sql .= " FROM ".MAIN_DB_PREFIX."overwrite_trans";
@@ -508,16 +506,15 @@ if ($mode == 'searchkey')
 				{
 					$obj = $db->fetch_object($result);
 				}
-				print '<a class="editfielda reposition paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&action=edit">'.img_edit().'</a>';
+				print '<a class="editfielda reposition paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&action=edit&mode='.urlencode($mode).'">'.img_edit().'</a>';
 				print ' ';
-				print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&action=delete&token='.newToken().'">'.img_delete().'</a>';
+				print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&action=delete&mode='.urlencode($mode).'&token='.newToken().'">'.img_delete().'</a>';
 				print '&nbsp;&nbsp;';
 				$htmltext = $langs->trans("OriginalValueWas", '<i>'.$newlangfileonly->tab_translate[$key].'</i>');
 				print $form->textwithpicto('', $htmltext, 1, 'info');
-			} elseif (!empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
-			{
+			} elseif (!empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION)) {
 				//print $key.'-'.$val;
-				print '<a class="reposition paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=overwrite&amp;langcode='.$langcode.'&amp;transkey='.$key.'">'.img_edit_add($langs->trans("Overwrite")).'</a>';
+				print '<a class="reposition paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=overwrite&langcode='.urlencode($langcode).'&transkey='.urlencode($key).'">'.img_edit_add($langs->trans("Overwrite")).'</a>';
 			}
 
 			if (!empty($conf->global->MAIN_FEATURES_LEVEL))

From fcfd657240a9ed64c67706b771fd310095d4b443 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 19 Dec 2020 21:41:15 +0100
Subject: [PATCH 530/888] Fix links

---
 htdocs/admin/translation.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 5da91db0171..f82087ba30e 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -190,7 +190,7 @@ $formadmin = new FormAdmin($db);
 $wikihelp = 'EN:Setup Translation|FR:Paramétrage traduction|ES:Configuración';
 llxHeader('', $langs->trans("Setup"), $wikihelp);
 
-$param = '&mode='.$mode;
+$param = '&mode='.urlencode($mode);
 
 $enabledisablehtml = '';
 $enabledisablehtml .= $langs->trans("EnableOverwriteTranslation").' ';
@@ -246,7 +246,7 @@ if ($mode == 'overwrite')
 	print '<div class="justify"><span class="opacitymedium">';
 	print img_info().' '.$langs->trans("SomeTranslationAreUncomplete");
 	$urlwikitranslatordoc = 'https://wiki.dolibarr.org/index.php/Translator_documentation';
-	print ' ('.$langs->trans("SeeAlso", '<a href="'.$urlwikitranslatordoc.'" target="_blank">'.$langs->trans("Here").'</a>').')<br>';
+	print ' ('.str_replace('{s1}', '<a href="'.$urlwikitranslatordoc.'" target="_blank">'.$langs->trans("Here").'</a>', $langs->trans("SeeAlso", '{s1}')).')<br>';
 	print $langs->trans("TranslationOverwriteDesc", $langs->transnoentitiesnoconv("Language"), $langs->transnoentitiesnoconv("Key"), $langs->transnoentitiesnoconv("NewTranslationStringToShow"))."\n";
 	print ' ('.$langs->trans("TranslationOverwriteDesc2").').'."<br>\n";
 	print '</span></div>';
@@ -338,14 +338,13 @@ if ($mode == 'overwrite')
 			print '</td>';
 
 			print '<td class="center">';
-			if ($action == 'edit' && $obj->rowid == GETPOST('rowid', 'int'))
-			{
+			if ($action == 'edit' && $obj->rowid == GETPOST('rowid', 'int')) {
 				print '<input type="hidden" class="button" name="rowid" value="'.$obj->rowid.'">';
 				print '<input type="submit" class="button buttongen button-save" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 				print ' &nbsp; ';
 				print '<input type="submit" class="button buttongen button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 			} else {
-				print '<a class="reposition editfielda paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=edit'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
+				print '<a class="reposition editfielda paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.urlencode($mode).'&action=edit'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
 				print ' &nbsp; ';
 				print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=delete&token='.newToken().((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
 			}
@@ -498,7 +497,7 @@ if ($mode == 'searchkey')
 				// retrieve rowid
 				$sql = "SELECT rowid";
 				$sql .= " FROM ".MAIN_DB_PREFIX."overwrite_trans";
-				$sql .= " WHERE transkey = '".$key."'";
+				$sql .= " WHERE transkey = '".$db->escape($key)."'";
 				$sql .= " AND entity IN (".getEntity('overwrite_trans').")";
 				dol_syslog("translation::select from table", LOG_DEBUG);
 				$result = $db->query($sql);
@@ -506,9 +505,9 @@ if ($mode == 'searchkey')
 				{
 					$obj = $db->fetch_object($result);
 				}
-				print '<a class="editfielda reposition paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&action=edit&mode='.urlencode($mode).'">'.img_edit().'</a>';
+				print '<a class="editfielda reposition paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&action=edit">'.img_edit().'</a>';
 				print ' ';
-				print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&action=delete&mode='.urlencode($mode).'&token='.newToken().'">'.img_delete().'</a>';
+				print '<a class="paddingleftonly paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&action=delete&mode='.urlencode($mode).'&token='.newToken().'">'.img_delete().'</a>';
 				print '&nbsp;&nbsp;';
 				$htmltext = $langs->trans("OriginalValueWas", '<i>'.$newlangfileonly->tab_translate[$key].'</i>');
 				print $form->textwithpicto('', $htmltext, 1, 'info');

From 0c6ccb64e038fcff366b5289bc9186aa226ea244 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 19 Dec 2020 21:48:29 +0100
Subject: [PATCH 531/888] Fix links

---
 htdocs/admin/translation.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index f82087ba30e..c31f1c07093 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -346,7 +346,7 @@ if ($mode == 'overwrite')
 			} else {
 				print '<a class="reposition editfielda paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.urlencode($mode).'&action=edit'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
 				print ' &nbsp; ';
-				print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=delete&token='.newToken().((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
+				print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.urlencode($mode).'&action=delete&token='.newToken().((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
 			}
 			print '</td>';
 
@@ -505,9 +505,9 @@ if ($mode == 'searchkey')
 				{
 					$obj = $db->fetch_object($result);
 				}
-				print '<a class="editfielda reposition paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&action=edit">'.img_edit().'</a>';
+				print '<a class="editfielda reposition marginrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&mode=overwrite&action=edit">'.img_edit().'</a>';
 				print ' ';
-				print '<a class="paddingleftonly paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&action=delete&mode='.urlencode($mode).'&token='.newToken().'">'.img_delete().'</a>';
+				print '<a class="marginleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&mode='.urlencode($mode).'&action=delete&mode='.urlencode($mode).'&token='.newToken().'">'.img_delete().'</a>';
 				print '&nbsp;&nbsp;';
 				$htmltext = $langs->trans("OriginalValueWas", '<i>'.$newlangfileonly->tab_translate[$key].'</i>');
 				print $form->textwithpicto('', $htmltext, 1, 'info');

From e4b1a0bdb0e461095c4cd80e7c102026f2f9983d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 19 Dec 2020 21:59:41 +0100
Subject: [PATCH 532/888] API to get list of enabled modules

---
 htdocs/api/class/api_setup.class.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 5e6abbeeb6e..0d23c00b751 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -27,6 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/cstate.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/ccountry.class.php';
 
+
 /**
  * API class for dictionaries
  *
@@ -1620,6 +1621,24 @@ class Setup extends DolibarrApi
 	}
 
 
+	/**
+	 * Get list of enabled modules
+	 *
+	 * @url	GET /modules
+	 *
+	 * @return  array|mixed Data without useless information
+	 *
+	 */
+	public function getModules()
+	{
+		global $conf;
+
+		sort($conf->modules);
+
+		return $this->_cleanObjectDatas($conf->modules);
+	}
+
+
 	/**
 	 * Get value of a setup variables
 	 *

From a27f8bd349ada601f7f0efc7778cb32ac06c411b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 19 Dec 2020 22:08:29 +0100
Subject: [PATCH 533/888] Fix security for some APIs

---
 htdocs/api/class/api_setup.class.php | 64 ++++++++++++++--------------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 0d23c00b751..7cdfc8bf64c 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -1306,6 +1306,7 @@ class Setup extends DolibarrApi
 	public function getListOfMeasuringUnits($sortfield = "rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
 	{
 		$list = array();
+
 		//TODO link with multicurrency module
 		$sql = "SELECT t.rowid, t.code, t.label,t.short_label, t.active, t.scale, t.unit_type";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_units as t";
@@ -1621,24 +1622,6 @@ class Setup extends DolibarrApi
 	}
 
 
-	/**
-	 * Get list of enabled modules
-	 *
-	 * @url	GET /modules
-	 *
-	 * @return  array|mixed Data without useless information
-	 *
-	 */
-	public function getModules()
-	{
-		global $conf;
-
-		sort($conf->modules);
-
-		return $this->_cleanObjectDatas($conf->modules);
-	}
-
-
 	/**
 	 * Get value of a setup variables
 	 *
@@ -1679,6 +1662,7 @@ class Setup extends DolibarrApi
 	 *
 	 * @url     GET checkintegrity
 	 *
+	 * @throws RestException 403 Access refused
 	 * @throws RestException 404 Signature file not found
 	 * @throws RestException 500 Technical error
 	 * @throws RestException 503 Forbidden
@@ -1690,7 +1674,7 @@ class Setup extends DolibarrApi
 		if (!DolibarrApiAccess::$user->admin
 			&& (empty($conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK) || DolibarrApiAccess::$user->login != $conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK))
 		{
-			throw new RestException(503, 'Error API open to admin users only or to the users with logins defined into constant API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK');
+			throw new RestException(403, 'Error API open to admin users only or to the users with logins defined into constant API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK');
 		}
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -1714,10 +1698,8 @@ class Setup extends DolibarrApi
 		if (empty($xmlremote) && !empty($conf->global->$param)) $xmlremote = $conf->global->$param;
 		if (empty($xmlremote)) $xmlremote = 'https://www.dolibarr.org/files/stable/signatures/filelist-'.DOL_VERSION.'.xml';
 
-		if ($target == 'local')
-		{
-			if (dol_is_file($xmlfile))
-			{
+		if ($target == 'local') {
+			if (dol_is_file($xmlfile)) {
 				$xml = simplexml_load_file($xmlfile);
 			} else {
 				throw new RestException(500, $langs->trans('XmlNotFound').': '.$xmlfile);
@@ -1726,8 +1708,7 @@ class Setup extends DolibarrApi
 			$xmlarray = getURLContent($xmlremote);
 
 			// Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
-			if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '400' && $xmlarray['http_code'] != '404')
-			{
+			if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '400' && $xmlarray['http_code'] != '404') {
 				$xmlfile = $xmlarray['content'];
 				//print "xmlfilestart".$xmlfile."endxmlfile";
 				$xml = simplexml_load_string($xmlfile);
@@ -1737,8 +1718,6 @@ class Setup extends DolibarrApi
 			}
 		}
 
-
-
 		if ($xml)
 		{
 			$checksumconcat = array();
@@ -1746,8 +1725,7 @@ class Setup extends DolibarrApi
 			$out = '';
 
 			// Forced constants
-			if (is_object($xml->dolibarr_constants[0]))
-			{
+			if (is_object($xml->dolibarr_constants[0])) {
 				$out .= load_fiche_titre($langs->trans("ForcedConstants"));
 
 				$out .= '<div class="div-table-responsive-no-min">';
@@ -1962,8 +1940,7 @@ class Setup extends DolibarrApi
 			$checksumtoget = trim((string) $xml->dolibarr_htdocs_dir_checksum);
 
 			$outexpectedchecksum = ($checksumtoget ? $checksumtoget : $langs->trans("Unknown"));
-			if ($checksumget == $checksumtoget)
-			{
+			if ($checksumget == $checksumtoget) {
 				if (count($file_list['added']))
 				{
 					$resultcode = 'warning';
@@ -1988,4 +1965,29 @@ class Setup extends DolibarrApi
 
 		return array('resultcode'=>$resultcode, 'resultcomment'=>$resultcomment, 'expectedchecksum'=> $outexpectedchecksum, 'currentchecksum'=> $outcurrentchecksum, 'out'=>$out);
 	}
+
+
+	/**
+	 * Get list of enabled modules
+	 *
+	 * @url	GET /modules
+	 *
+	 * @return  array|mixed Data without useless information
+	 *
+	 * @throws RestException 403 Access refused
+	 */
+	public function getModules()
+	{
+		global $conf;
+
+		if (!DolibarrApiAccess::$user->admin
+			&& (empty($conf->global->API_LOGIN_ALLOWED_FOR_GET_MODULES) || DolibarrApiAccess::$user->login != $conf->global->API_LOGIN_ALLOWED_FOR_GET_MODULES))
+		{
+			throw new RestException(403, 'Error API open to admin users only or to the users with logins defined into constant API_LOGIN_ALLOWED_FOR_GET_MODULES');
+		}
+
+		sort($conf->modules);
+
+		return $this->_cleanObjectDatas($conf->modules);
+	}
 }

From 98cf15ba0f671222e5f6bda42f5154e55d793a9a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 19 Dec 2020 22:24:58 +0100
Subject: [PATCH 534/888] Clean APIs

---
 htdocs/api/class/api.class.php       |  6 ++++
 htdocs/api/class/api_setup.class.php | 41 ++++++++++++++++++++++++++--
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index c8ff1078977..e101fb89602 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -167,6 +167,12 @@ class DolibarrApi
 		unset($object->libelle_statut);
 		unset($object->libelle_paiement);
 
+		unset($object->prefix_comm);
+
+		unset($object->sendtoid);
+		unset($object->name_bis);
+		unset($object->newref);
+
 		if ($object->table_element != 'ticket') {
 			unset($object->comments);
 		}
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 7cdfc8bf64c..0f3549d443e 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -1605,19 +1605,56 @@ class Setup extends DolibarrApi
 	 *
 	 * @return  array|mixed Data without useless information
 	 *
+	 * @throws RestException 403 Forbidden
 	 */
 	public function getCompany()
 	{
 		global $mysoc;
 
+		if (!DolibarrApiAccess::$user->admin
+			&& (empty($conf->global->API_LOGINS_ALLOWED_FOR_GET_COMPANY) || DolibarrApiAccess::$user->login != $conf->global->API_LOGINS_ALLOWED_FOR_GET_COMPANY)) {
+				throw new RestException(403, 'Error API open to admin users only or to the users with logins defined into constant API_LOGINS_ALLOWED_FOR_GET_COMPANY');
+		}
+
 		unset($mysoc->skype);
 		unset($mysoc->twitter);
 		unset($mysoc->facebook);
 		unset($mysoc->linkedin);
 
+		unset($mysoc->pays);
 		unset($mysoc->note);
+		unset($mysoc->nom);
+
 		unset($mysoc->lines);
 
+		unset($mysoc->effectif);
+		unset($mysoc->effectif_id);
+		unset($mysoc->forme_juridique_code);
+		unset($mysoc->forme_juridique);
+		unset($mysoc->mode_reglement_supplier_id);
+		unset($mysoc->cond_reglement_supplier_id);
+		unset($mysoc->transport_mode_supplier_id);
+		unset($mysoc->fk_prospectlevel);
+
+		unset($mysoc->total_ht);
+		unset($mysoc->total_tva);
+		unset($mysoc->total_localtax1);
+		unset($mysoc->total_localtax2);
+		unset($mysoc->total_ttc);
+
+		unset($mysoc->lastname);
+		unset($mysoc->firstname);
+		unset($mysoc->civility_id);
+
+		unset($mysoc->client);
+		unset($mysoc->prospect);
+		unset($mysoc->fournisseur);
+		unset($mysoc->contact_id);
+
+		unset($mysoc->fk_incoterms);
+		unset($mysoc->label_incoterms);
+		unset($mysoc->location_incoterms);
+
 		return $this->_cleanObjectDatas($mysoc);
 	}
 
@@ -1662,7 +1699,7 @@ class Setup extends DolibarrApi
 	 *
 	 * @url     GET checkintegrity
 	 *
-	 * @throws RestException 403 Access refused
+	 * @throws RestException 403 Forbidden
 	 * @throws RestException 404 Signature file not found
 	 * @throws RestException 500 Technical error
 	 * @throws RestException 503 Forbidden
@@ -1974,7 +2011,7 @@ class Setup extends DolibarrApi
 	 *
 	 * @return  array|mixed Data without useless information
 	 *
-	 * @throws RestException 403 Access refused
+	 * @throws RestException 403 Forbidden
 	 */
 	public function getModules()
 	{

From ba4f6c5a6b06c5a9d02b0488c64d5d149707aabe Mon Sep 17 00:00:00 2001
From: "jove@bisquerra.com" <jove@bisquerra.com>
Date: Sat, 19 Dec 2020 22:28:16 +0100
Subject: [PATCH 535/888] FIX Open Drawer with new TakePOS connector

---
 htdocs/takepos/index.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index a2293786924..961168221f6 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -686,7 +686,10 @@ function OpenDrawer(){
 	console.log("OpenDrawer call ajax url http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print");
 	$.ajax({
 		type: "POST",
-		url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print',
+		<?php
+		if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) echo "url: '".$conf->global->TAKEPOS_PRINT_SERVER."/printer/drawer.php',";
+		else echo "url: 'http://".$conf->global->TAKEPOS_PRINT_SERVER.":8111/print',";
+		?>
 		data: "opendrawer"
 	});
 }

From 6066a92b9de7319f991e21db02c7daf8ef16ad37 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 19 Dec 2020 22:34:33 +0100
Subject: [PATCH 536/888] Fix API to get country

---
 htdocs/api/class/api_setup.class.php | 11 ++++++-----
 htdocs/core/class/ccountry.class.php | 18 ++++++++++--------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 0f3549d443e..47ab4686a1d 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -440,7 +440,7 @@ class Setup extends DolibarrApi
 	/**
 	 * Get country by Code.
 	 *
-	 * @param string    $code      Code of country
+	 * @param string    $code      Code of country (2 characters)
 	 * @param string    $lang      Code of the language the name of the
 	 *                             country must be translated to
 	 * @return array 			   Array of cleaned object properties
@@ -457,7 +457,7 @@ class Setup extends DolibarrApi
 	/**
 	 * Get country by Iso.
 	 *
-	 * @param string    $iso       ISO of country
+	 * @param string    $iso       ISO of country (3 characters)
 	 * @param string    $lang      Code of the language the name of the
 	 *                             country must be translated to
 	 * @return array 			   Array of cleaned object properties
@@ -498,8 +498,8 @@ class Setup extends DolibarrApi
 	 * Get country.
 	 *
 	 * @param int       $id        ID of country
-	 * @param string    $code      Code of country
-	 * @param string    $iso       ISO of country
+	 * @param string    $code      Code of country (2 characters)
+	 * @param string    $iso       ISO of country (3 characters)
 	 * @param string    $lang      Code of the language the name of the
 	 *                             country must be translated to
 	 * @return array 			   Array of cleaned object properties
@@ -511,10 +511,11 @@ class Setup extends DolibarrApi
 		$country = new Ccountry($this->db);
 
 		$result = $country->fetch($id, $code, $iso);
+
 		if ($result < 0) {
 			throw new RestException(503, 'Error when retrieving country : '.$country->error);
 		} elseif ($result == 0) {
-			throw new RestException(404, 'country not found');
+			throw new RestException(404, 'Country not found');
 		}
 
 		$this->translateLabel($country, $lang, 'Country');
diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php
index d19e6d00a36..561d0527796 100644
--- a/htdocs/core/class/ccountry.class.php
+++ b/htdocs/core/class/ccountry.class.php
@@ -162,9 +162,9 @@ class Ccountry // extends CommonObject
   		$sql .= " t.label,";
   		$sql .= " t.active";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_country as t";
-		if ($id) $sql .= " WHERE t.rowid = ".$id;
-		elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape($code)."'";
-		elseif ($code_iso) $sql .= " WHERE t.code_iso = '".$this->db->escape($code_iso)."'";
+		if ($id) $sql .= " WHERE t.rowid = ".((int) $id);
+		elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape(strtoupper($code))."'";
+		elseif ($code_iso) $sql .= " WHERE t.code_iso = '".$this->db->escape(strtoupper($code_iso))."'";
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -174,11 +174,13 @@ class Ccountry // extends CommonObject
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				$this->id = $obj->rowid;
-				$this->code = $obj->code;
-				$this->code_iso = $obj->code_iso;
-				$this->label = $obj->label;
-				$this->active = $obj->active;
+				if ($obj) {
+					$this->id = $obj->rowid;
+					$this->code = $obj->code;
+					$this->code_iso = $obj->code_iso;
+					$this->label = $obj->label;
+					$this->active = $obj->active;
+				}
 
 				$this->db->free($resql);
 				return 1;

From 8d21eab6ab85657990c190d48f7f53bdf868d588 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 20 Dec 2020 06:06:24 +0100
Subject: [PATCH 537/888] Fix buttond not working

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 84eb96c27ab..14bbf007542 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4709,7 +4709,7 @@ class Form
 			$ret .= '<tr><td>';
 			$ret .= $this->selectDate($selected, $htmlname, $displayhour, $displaymin, 1, 'form'.$htmlname, 1, 0);
 			$ret .= '</td>';
-			$ret .= '<td class="left"><input type="submit smallpaddingimp" class="button" value="'.$langs->trans("Modify").'"></td>';
+			$ret .= '<td class="left"><input type="submit" class="button smallpaddingimp" value="'.$langs->trans("Modify").'"></td>';
 			$ret .= '</tr></table></form>';
 		} else {
 			if ($displayhour) $ret .= dol_print_date($selected, 'dayhour');

From 16d1bf9b007494f38a2957cc664dc45809e22a60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sun, 20 Dec 2020 10:17:28 +0100
Subject: [PATCH 538/888] fix unknown variable

---
 htdocs/api/class/api_setup.class.php | 360 ++++++++++++---------------
 1 file changed, 163 insertions(+), 197 deletions(-)

diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 47ab4686a1d..fbeb2cc931b 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -75,10 +75,8 @@ class Setup extends DolibarrApi
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_input_method as t";
 		$sql .= " WHERE t.active = ".$active;
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -112,70 +110,68 @@ class Setup extends DolibarrApi
 		return $list;
 	}
 
-    /**
-     * Get the list of ordering origins.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number {@min 0}
-     * @param int       $active     Payment type is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters SQL criteria to filter with. Syntax example "(t.code:=:'OrderByWWW')"
-     *
-     * @url     GET dictionary/ordering_origins
-     *
-     * @return array [List of ordering reasons]
-     *
-     * @throws RestException 400
-     */
-    public function getOrderingOrigins($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        $list = array();
+	/**
+	 * Get the list of ordering origins.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number {@min 0}
+	 * @param int       $active     Payment type is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters SQL criteria to filter with. Syntax example "(t.code:=:'OrderByWWW')"
+	 *
+	 * @url     GET dictionary/ordering_origins
+	 *
+	 * @return array [List of ordering reasons]
+	 *
+	 * @throws RestException 400
+	 */
+	public function getOrderingOrigins($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
 
-        if (!DolibarrApiAccess::$user->rights->commande->lire) {
-            throw new RestException(401);
-        }
+		if (!DolibarrApiAccess::$user->rights->commande->lire) {
+			throw new RestException(401);
+		}
 
-        $sql = "SELECT rowid, code, label, module";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_input_reason as t";
-        $sql .= " WHERE t.active = ".$active;
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		$sql = "SELECT rowid, code, label, module";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_input_reason as t";
+		$sql .= " WHERE t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
 
-        $sql .= $this->db->order($sortfield, $sortorder);
+		$sql .= $this->db->order($sortfield, $sortorder);
 
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit, $offset);
-        }
+			$sql .= $this->db->plimit($limit, $offset);
+		}
 
-        $result = $this->db->query($sql);
+		$result = $this->db->query($sql);
 
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(400, $this->db->lasterror());
-        }
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(400, $this->db->lasterror());
+		}
 
-        return $list;
-    }
+		return $list;
+	}
 
 	/**
 	 * Get the list of payments types.
@@ -206,10 +202,8 @@ class Setup extends DolibarrApi
 		$sql .= " WHERE t.entity IN (".getEntity('c_paiement').")";
 		$sql .= " AND t.active = ".$active;
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			  $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -272,10 +266,8 @@ class Setup extends DolibarrApi
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."c_departements as t";
 		$sql .= " WHERE 1 = 1";
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -374,10 +366,8 @@ class Setup extends DolibarrApi
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."c_country as t";
 		$sql .= " WHERE 1 = 1";
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -551,10 +541,8 @@ class Setup extends DolibarrApi
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_availability as t";
 		$sql .= " WHERE t.active = ".$active;
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
 			}
 				  $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -659,10 +647,8 @@ class Setup extends DolibarrApi
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as t";
 		$sql .= " WHERE t.active = ".$active;
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -720,13 +706,15 @@ class Setup extends DolibarrApi
 		$sql = "SELECT id, code, type, libelle as label, module";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm as t";
 		$sql .= " WHERE t.active = ".$active;
-		if ($type) $sql .= " AND t.type LIKE '%".$this->db->escape($type)."%'";
-		if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		if ($type) {
+			$sql .= " AND t.type LIKE '%".$this->db->escape($type)."%'";
+		}
+		if ($module) {
+			$sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		}
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -784,12 +772,12 @@ class Setup extends DolibarrApi
 		$sql = "SELECT id, code, label, accountancy_code, active, module, position";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_fees as t";
 		$sql .= " WHERE t.active = ".$active;
-		if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		if ($module) {
+			$sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		}
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -848,13 +836,15 @@ class Setup extends DolibarrApi
 		$sql = "SELECT rowid, code, element as type, libelle as label, source, module, position";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as t";
 		$sql .= " WHERE t.active = ".$active;
-		if ($type) $sql .= " AND type LIKE '%".$this->db->escape($type)."%'";
-		if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		if ($type) {
+			$sql .= " AND type LIKE '%".$this->db->escape($type)."%'";
+		}
+		if ($module) {
+			$sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		}
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -911,12 +901,12 @@ class Setup extends DolibarrApi
 		$sql = "SELECT rowid, code, label, module";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_civility as t";
 		$sql .= " WHERE t.active = ".$active;
-		if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		if ($module) {
+			$sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		}
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -970,7 +960,9 @@ class Setup extends DolibarrApi
 	{
 		$list = array();
 		$sql = "SELECT t.code_iso, t.label, t.unicode";
-		if (!empty($multicurrency)) $sql .= " , cr.date_sync, cr.rate ";
+		if (!empty($multicurrency)) {
+			$sql .= " , cr.date_sync, cr.rate ";
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_currencies as t";
 		if (!empty($multicurrency)) {
 			$sql .= " JOIN ".MAIN_DB_PREFIX."multicurrency as m ON m.code=t.code_iso";
@@ -985,10 +977,8 @@ class Setup extends DolibarrApi
 		}
 
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -1043,18 +1033,22 @@ class Setup extends DolibarrApi
 			throw new RestException(401, 'Only an admin user can get list of extrafields');
 		}
 
-		if ($type == 'thirdparty') $type = 'societe';
-		if ($type == 'contact') $type = 'socpeople';
+		if ($type == 'thirdparty') {
+			$type = 'societe';
+		}
+		if ($type == 'contact') {
+			$type = 'socpeople';
+		}
 
 		$sql = "SELECT t.rowid, t.name, t.label, t.type, t.size, t.elementtype, t.fieldunique, t.fieldrequired, t.param, t.pos, t.alwayseditable, t.perms, t.list, t.fielddefault, t.fieldcomputed";
 		$sql .= " FROM ".MAIN_DB_PREFIX."extrafields as t";
 		$sql .= " WHERE t.entity IN (".getEntity('extrafields').")";
-		if (!empty($type)) $sql .= " AND t.elementtype = '".$this->db->escape($type)."'";
+		if (!empty($type)) {
+			$sql .= " AND t.elementtype = '".$this->db->escape($type)."'";
+		}
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -1064,12 +1058,9 @@ class Setup extends DolibarrApi
 		$sql .= $this->db->order($sortfield, $sortorder);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
-				while ($tab = $this->db->fetch_object($resql))
-				{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
+				while ($tab = $this->db->fetch_object($resql)) {
 					// New usage
 					$list[$tab->elementtype][$tab->name]['type'] = $tab->type;
 					$list[$tab->elementtype][$tab->name]['label'] = $tab->label;
@@ -1090,8 +1081,7 @@ class Setup extends DolibarrApi
 			throw new RestException(503, 'Error when retrieving list of extra fields : '.$this->db->lasterror());
 		}
 
-		if (!count($list))
-		{
+		if (!count($list)) {
 			throw new RestException(404, 'No extrafield found');
 		}
 
@@ -1123,13 +1113,15 @@ class Setup extends DolibarrApi
 		$sql = "SELECT rowid AS id, zip, town, fk_county, fk_pays AS fk_country";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_ziptown as t";
 		$sql .= " AND t.active = ".$active;
-		if ($zipcode) $sql .= " AND t.zip LIKE '%".$this->db->escape($zipcode)."%'";
-		if ($town)    $sql .= " AND t.town LIKE '%".$this->db->escape($town)."%'";
+		if ($zipcode) {
+			$sql .= " AND t.zip LIKE '%".$this->db->escape($zipcode)."%'";
+		}
+		if ($town) {
+			$sql .= " AND t.town LIKE '%".$this->db->escape($town)."%'";
+		}
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -1192,10 +1184,8 @@ class Setup extends DolibarrApi
 		$sql .= " WHERE t.entity IN (".getEntity('c_payment_term').")";
 		$sql .= " AND t.active = ".$active;
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(400, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 				$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -1252,10 +1242,8 @@ class Setup extends DolibarrApi
 		$sql .= " WHERE t.entity IN (".getEntity('c_shipment_mode').")";
 		$sql .= " AND t.active = ".$active;
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(400, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 				$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -1313,10 +1301,8 @@ class Setup extends DolibarrApi
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_units as t";
 		$sql .= " WHERE t.active = ".$active;
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -1380,10 +1366,8 @@ class Setup extends DolibarrApi
 		$sql .= " WHERE t.entity IN (".getEntity('c_socialnetworks').")";
 		$sql .= " AND t.active = ".$active;
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -1440,10 +1424,8 @@ class Setup extends DolibarrApi
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_category as t";
 		$sql .= " WHERE t.active = ".$active;
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -1500,10 +1482,8 @@ class Setup extends DolibarrApi
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_severity as t";
 		$sql .= " WHERE t.active = ".$active;
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -1562,10 +1542,8 @@ class Setup extends DolibarrApi
 		// if ($type) $sql .= " AND t.type LIKE '%".$this->db->escape($type)."%'";
 		// if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -1604,13 +1582,13 @@ class Setup extends DolibarrApi
 	 *
 	 * @url	GET /company
 	 *
-	 * @return  array|mixed Data without useless information
+	 * @return  Object Mysoc object
 	 *
 	 * @throws RestException 403 Forbidden
 	 */
 	public function getCompany()
 	{
-		global $mysoc;
+		global $conf, $mysoc;
 
 		if (!DolibarrApiAccess::$user->admin
 			&& (empty($conf->global->API_LOGINS_ALLOWED_FOR_GET_COMPANY) || DolibarrApiAccess::$user->login != $conf->global->API_LOGINS_ALLOWED_FOR_GET_COMPANY)) {
@@ -1710,8 +1688,7 @@ class Setup extends DolibarrApi
 		global $langs, $conf;
 
 		if (!DolibarrApiAccess::$user->admin
-			&& (empty($conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK) || DolibarrApiAccess::$user->login != $conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK))
-		{
+			&& (empty($conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK) || DolibarrApiAccess::$user->login != $conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK)) {
 			throw new RestException(403, 'Error API open to admin users only or to the users with logins defined into constant API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK');
 		}
 
@@ -1731,10 +1708,16 @@ class Setup extends DolibarrApi
 		$xmlfile = DOL_DOCUMENT_ROOT.$xmlshortfile;
 		// Remote file to compare to
 		$xmlremote = ($target == 'default' ? '' : $target);
-		if (empty($xmlremote) && !empty($conf->global->MAIN_FILECHECK_URL)) $xmlremote = $conf->global->MAIN_FILECHECK_URL;
+		if (empty($xmlremote) && !empty($conf->global->MAIN_FILECHECK_URL)) {
+			$xmlremote = $conf->global->MAIN_FILECHECK_URL;
+		}
 		$param = 'MAIN_FILECHECK_URL_'.DOL_VERSION;
-		if (empty($xmlremote) && !empty($conf->global->$param)) $xmlremote = $conf->global->$param;
-		if (empty($xmlremote)) $xmlremote = 'https://www.dolibarr.org/files/stable/signatures/filelist-'.DOL_VERSION.'.xml';
+		if (empty($xmlremote) && !empty($conf->global->$param)) {
+			$xmlremote = $conf->global->$param;
+		}
+		if (empty($xmlremote)) {
+			$xmlremote = 'https://www.dolibarr.org/files/stable/signatures/filelist-'.DOL_VERSION.'.xml';
+		}
 
 		if ($target == 'local') {
 			if (dol_is_file($xmlfile)) {
@@ -1756,8 +1739,7 @@ class Setup extends DolibarrApi
 			}
 		}
 
-		if ($xml)
-		{
+		if ($xml) {
 			$checksumconcat = array();
 			$file_list = array();
 			$out = '';
@@ -1776,14 +1758,15 @@ class Setup extends DolibarrApi
 				$out .= '</tr>'."\n";
 
 				$i = 0;
-				foreach ($xml->dolibarr_constants[0]->constant as $constant)    // $constant is a simpleXMLElement
-				{
+				foreach ($xml->dolibarr_constants[0]->constant as $constant) {    // $constant is a simpleXMLElement
 					$constname = $constant['name'];
 					$constvalue = (string) $constant;
 					$constvalue = (empty($constvalue) ? '0' : $constvalue);
 					// Value found
 					$value = '';
-					if ($constname && $conf->global->$constname != '') $value = $conf->global->$constname;
+					if ($constname && $conf->global->$constname != '') {
+						$value = $conf->global->$constname;
+					}
 					$valueforchecksum = (empty($value) ? '0' : $value);
 
 					$checksumconcat[] = $valueforchecksum;
@@ -1797,8 +1780,7 @@ class Setup extends DolibarrApi
 					$out .= "</tr>\n";
 				}
 
-				if ($i == 0)
-				{
+				if ($i == 0) {
 					$out .= '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 				}
 				$out .= '</table>';
@@ -1808,9 +1790,7 @@ class Setup extends DolibarrApi
 			}
 
 			// Scan htdocs
-			if (is_object($xml->dolibarr_htdocs_dir[0]))
-			{
-				//var_dump($xml->dolibarr_htdocs_dir[0]['includecustom']);exit;
+			if (is_object($xml->dolibarr_htdocs_dir[0])) {
 				$includecustom = (empty($xml->dolibarr_htdocs_dir[0]['includecustom']) ? 0 : $xml->dolibarr_htdocs_dir[0]['includecustom']);
 
 				// Defined qualified files (must be same than into generate_filelist_xml.php)
@@ -1821,11 +1801,9 @@ class Setup extends DolibarrApi
 				// Fill file_list with files in signature, new files, modified files
 				$ret = getFilesUpdated($file_list, $xml->dolibarr_htdocs_dir[0], '', DOL_DOCUMENT_ROOT, $checksumconcat); // Fill array $file_list
 				// Complete with list of new files
-				foreach ($scanfiles as $keyfile => $valfile)
-				{
+				foreach ($scanfiles as $keyfile => $valfile) {
 					$tmprelativefilename = preg_replace('/^'.preg_quote(DOL_DOCUMENT_ROOT, '/').'/', '', $valfile['fullname']);
-					if (!in_array($tmprelativefilename, $file_list['insignature']))
-					{
+					if (!in_array($tmprelativefilename, $file_list['insignature'])) {
 						$md5newfile = @md5_file($valfile['fullname']); // Can fails if we don't have permission to open/read file
 						$file_list['added'][] = array('filename'=>$tmprelativefilename, 'md5'=>$md5newfile);
 					}
@@ -1842,11 +1820,9 @@ class Setup extends DolibarrApi
 				$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
 				$out .= '</tr>'."\n";
 				$tmpfilelist = dol_sort_array($file_list['missing'], 'filename');
-				if (is_array($tmpfilelist) && count($tmpfilelist))
-				{
+				if (is_array($tmpfilelist) && count($tmpfilelist)) {
 					$i = 0;
-					foreach ($tmpfilelist as $file)
-					{
+					foreach ($tmpfilelist as $file) {
 						$i++;
 						$out .= '<tr class="oddeven">';
 						$out .= '<td>'.$i.'</td>'."\n";
@@ -1877,11 +1853,9 @@ class Setup extends DolibarrApi
 				$out .= '<td class="right">'.$langs->trans("DateModification").'</td>';
 				$out .= '</tr>'."\n";
 				$tmpfilelist2 = dol_sort_array($file_list['updated'], 'filename');
-				if (is_array($tmpfilelist2) && count($tmpfilelist2))
-				{
+				if (is_array($tmpfilelist2) && count($tmpfilelist2)) {
 					$i = 0;
-					foreach ($tmpfilelist2 as $file)
-					{
+					foreach ($tmpfilelist2 as $file) {
 						$i++;
 						$out .= '<tr class="oddeven">';
 						$out .= '<td>'.$i.'</td>'."\n";
@@ -1925,11 +1899,9 @@ class Setup extends DolibarrApi
 				$out .= '<td class="right">'.$langs->trans("DateModification").'</td>';
 				$out .= '</tr>'."\n";
 				$tmpfilelist3 = dol_sort_array($file_list['added'], 'filename');
-				if (is_array($tmpfilelist3) && count($tmpfilelist3))
-				{
+				if (is_array($tmpfilelist3) && count($tmpfilelist3)) {
 					$i = 0;
-					foreach ($tmpfilelist3 as $file)
-					{
+					foreach ($tmpfilelist3 as $file) {
 						$i++;
 						$out .= '<tr class="oddeven">';
 						$out .= '<td>'.$i.'</td>'."\n";
@@ -1958,8 +1930,7 @@ class Setup extends DolibarrApi
 
 
 				// Show warning
-				if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3))
-				{
+				if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3)) {
 					//setEventMessages($langs->trans("FileIntegrityIsStrictlyConformedWithReference"), null, 'mesgs');
 				} else {
 					//setEventMessages($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), null, 'warnings');
@@ -1970,17 +1941,13 @@ class Setup extends DolibarrApi
 
 
 			// Scan scripts
-
-
 			asort($checksumconcat); // Sort list of checksum
-			//var_dump($checksumconcat);
 			$checksumget = md5(join(',', $checksumconcat));
 			$checksumtoget = trim((string) $xml->dolibarr_htdocs_dir_checksum);
 
 			$outexpectedchecksum = ($checksumtoget ? $checksumtoget : $langs->trans("Unknown"));
 			if ($checksumget == $checksumtoget) {
-				if (count($file_list['added']))
-				{
+				if (count($file_list['added'])) {
 					$resultcode = 'warning';
 					$resultcomment = 'FileIntegrityIsOkButFilesWereAdded';
 					//$outcurrentchecksum =  $checksumget.' - <span class="'.$resultcode.'">'.$langs->trans("FileIntegrityIsOkButFilesWereAdded").'</span>';
@@ -2019,8 +1986,7 @@ class Setup extends DolibarrApi
 		global $conf;
 
 		if (!DolibarrApiAccess::$user->admin
-			&& (empty($conf->global->API_LOGIN_ALLOWED_FOR_GET_MODULES) || DolibarrApiAccess::$user->login != $conf->global->API_LOGIN_ALLOWED_FOR_GET_MODULES))
-		{
+			&& (empty($conf->global->API_LOGIN_ALLOWED_FOR_GET_MODULES) || DolibarrApiAccess::$user->login != $conf->global->API_LOGIN_ALLOWED_FOR_GET_MODULES)) {
 			throw new RestException(403, 'Error API open to admin users only or to the users with logins defined into constant API_LOGIN_ALLOWED_FOR_GET_MODULES');
 		}
 

From f9ea75df3d3383fb32fafd6f4fcdbbdce4160246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sun, 20 Dec 2020 10:28:06 +0100
Subject: [PATCH 539/888] fix phpcs

---
 dev/tools/test/namespacemig/aaa.class.php |   3 +
 dev/tools/test/namespacemig/bbb.class.php |   3 +
 htdocs/admin/sms.php                      |   1 -
 htdocs/install/fileconf.php               | 342 ++++++++++++++--------
 4 files changed, 219 insertions(+), 130 deletions(-)

diff --git a/dev/tools/test/namespacemig/aaa.class.php b/dev/tools/test/namespacemig/aaa.class.php
index d7578b78e40..84d936479f2 100644
--- a/dev/tools/test/namespacemig/aaa.class.php
+++ b/dev/tools/test/namespacemig/aaa.class.php
@@ -15,6 +15,9 @@ function faaa()
 	return 'faaa';
 }
 
+/**
+ * Class Aaa
+ */
 class Aaa
 {
 	const AAA='aaa';
diff --git a/dev/tools/test/namespacemig/bbb.class.php b/dev/tools/test/namespacemig/bbb.class.php
index f68b3b2f36c..ea3c1b18d61 100644
--- a/dev/tools/test/namespacemig/bbb.class.php
+++ b/dev/tools/test/namespacemig/bbb.class.php
@@ -12,6 +12,9 @@ function fbbb()
 	return 'fbbb';
 }
 
+/**
+ * Class Bbb
+ */
 class Bbb
 {
 	const BBB='bbb';
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index 9b333d7b4f1..d2cf26a0c9a 100644
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -161,7 +161,6 @@ if (!count($listofmethods)) {
 }
 
 if ($action == 'edit') {
-
 	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 713f3132eaf..cfe42adc79f 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -44,21 +44,45 @@ dolibarr_install_syslog("- fileconf: entering fileconf.php page");
 // install.forced.php into directory htdocs/install (This is the case with some wizard
 // installer like DoliWamp, DoliMamp or DoliBuntu).
 // We first init "forced values" to nothing.
-if (!isset($force_install_noedit))			    $force_install_noedit = ''; // 1=To block vars specific to distrib, 2 to block all technical parameters
-if (!isset($force_install_type))				$force_install_type = '';
-if (!isset($force_install_dbserver))			$force_install_dbserver = '';
-if (!isset($force_install_port))				$force_install_port = '';
-if (!isset($force_install_database))			$force_install_database = '';
-if (!isset($force_install_prefix))			    $force_install_prefix = '';
-if (!isset($force_install_createdatabase))	    $force_install_createdatabase = '';
-if (!isset($force_install_databaselogin))		$force_install_databaselogin = '';
-if (!isset($force_install_databasepass))		$force_install_databasepass = '';
-if (!isset($force_install_databaserootlogin))	$force_install_databaserootlogin = '';
-if (!isset($force_install_databaserootpass))	$force_install_databaserootpass = '';
+if (!isset($force_install_noedit)) {
+	$force_install_noedit = ''; // 1=To block vars specific to distrib, 2 to block all technical parameters
+}
+if (!isset($force_install_type)) {
+	$force_install_type = '';
+}
+if (!isset($force_install_dbserver)) {
+	$force_install_dbserver = '';
+}
+if (!isset($force_install_port)) {
+	$force_install_port = '';
+}
+if (!isset($force_install_database)) {
+	$force_install_database = '';
+}
+if (!isset($force_install_prefix)) {
+	$force_install_prefix = '';
+}
+if (!isset($force_install_createdatabase)) {
+	$force_install_createdatabase = '';
+}
+if (!isset($force_install_databaselogin)) {
+	$force_install_databaselogin = '';
+}
+if (!isset($force_install_databasepass)) {
+	$force_install_databasepass = '';
+}
+if (!isset($force_install_databaserootlogin)) {
+	$force_install_databaserootlogin = '';
+}
+if (!isset($force_install_databaserootpass)) {
+	$force_install_databaserootpass = '';
+}
 // Now we load forced values from install.forced.php file.
 $useforcedwizard = false;
 $forcedfile = "./install.forced.php";
-if ($conffile == "/etc/dolibarr/conf.php") $forcedfile = "/etc/dolibarr/install.forced.php"; // Must be after inc.php
+if ($conffile == "/etc/dolibarr/conf.php") {
+	$forcedfile = "/etc/dolibarr/install.forced.php"; // Must be after inc.php
+}
 if (@file_exists($forcedfile)) {
 	$useforcedwizard = true;
 	include_once $forcedfile;
@@ -75,8 +99,7 @@ session_start(); // To be able to keep info into session (used for not losing pa
 pHeader($langs->trans("ConfigurationFile"), "step1", "set", "", (empty($force_dolibarr_js_JQUERY) ? '' : $force_dolibarr_js_JQUERY.'/'), 'main-inside-bis');
 
 // Test if we can run a first install process
-if (!is_writable($conffile))
-{
+if (!is_writable($conffile)) {
 	print $langs->trans("ConfFileIsNotWritable", $conffiletoshow);
 	dolibarr_install_syslog("fileconf: config file is not writable", LOG_WARNING);
 	dolibarr_install_syslog("- fileconf: end");
@@ -84,29 +107,30 @@ if (!is_writable($conffile))
 	exit;
 }
 
-if (!empty($force_install_message))
-{
+if (!empty($force_install_message)) {
 	print '<div><br>'.$langs->trans($force_install_message).'</div>';
 
 	/*print '<script type="text/javascript">';
-    print '	jQuery(document).ready(function() {
+	print '	jQuery(document).ready(function() {
 				jQuery("#linktoshowtechnicalparam").click(function() {
 					jQuery(".hidewhenedit").hide();
 					jQuery(".hidewhennoedit").show();
 				});';
-    			if ($force_install_noedit) print 'jQuery(".hidewhennoedit").hide();';
+				if ($force_install_noedit) print 'jQuery(".hidewhennoedit").hide();';
 	print '});';
-    print '</script>';
+	print '</script>';
 
-    print '<br><a href="#" id="linktoshowtechnicalparam" class="hidewhenedit">'.$langs->trans("ShowEditTechnicalParameters").'</a><br>';
-    */
+	print '<br><a href="#" id="linktoshowtechnicalparam" class="hidewhenedit">'.$langs->trans("ShowEditTechnicalParameters").'</a><br>';
+	*/
 }
 
 ?>
 <div>
 
 
-<table class="nobordernopadding<?php if ($force_install_noedit) print ' hidewhennoedit'; ?>">
+<table class="nobordernopadding<?php if ($force_install_noedit) {
+	print ' hidewhennoedit';
+							   } ?>">
 
 	<tr>
 		<td colspan="3" class="label">
@@ -116,7 +140,7 @@ if (!empty($force_install_message))
 
 	<!-- Documents root $dolibarr_main_document_root -->
 	<tr>
-        <td class="label"><label for="main_dir"><b><?php print $langs->trans("WebPagesDirectory"); ?></b></label></td>
+		<td class="label"><label for="main_dir"><b><?php print $langs->trans("WebPagesDirectory"); ?></b></label></td>
 <?php
 if (empty($dolibarr_main_url_root)) {
 	$dolibarr_main_document_root = detect_dolibarr_main_document_root();
@@ -124,10 +148,10 @@ if (empty($dolibarr_main_url_root)) {
 ?>
 		<td class="label">
 			<input type="text"
-			       class="minwidth300"
-                   id="main_dir"
-                   name="main_dir"
-                   value="<?php print $dolibarr_main_document_root ?>"
+				   class="minwidth300"
+				   id="main_dir"
+				   name="main_dir"
+				   value="<?php print $dolibarr_main_document_root ?>"
 <?php
 if (!empty($force_install_noedit)) {
 	print ' disabled';
@@ -157,10 +181,10 @@ if (!empty($force_install_noedit)) {
 		?>
 		<td class="label">
 			<input type="text"
-			       class="minwidth300"
-                   id="main_data_dir"
-                   name="main_data_dir"
-                   value="<?php print $dolibarr_main_data_root ?>"
+				   class="minwidth300"
+				   id="main_data_dir"
+				   name="main_data_dir"
+				   value="<?php print $dolibarr_main_data_root ?>"
 <?php if (!empty($force_install_noedit)) {
 	print ' disabled';
 } ?>
@@ -185,14 +209,14 @@ if (!empty($force_install_noedit)) {
 	}
 	?>
 	<tr>
-        <td class="label"><label for="main_url"><b><?php echo $langs->trans("URLRoot"); ?></b></label>
+		<td class="label"><label for="main_url"><b><?php echo $langs->trans("URLRoot"); ?></b></label>
 		</td>
 		<td class="label">
 			<input type="text"
-			       class="minwidth300"
-			       id="main_url"
-                   name="main_url"
-			       value="<?php print $dolibarr_main_url_root; ?> "
+				   class="minwidth300"
+				   id="main_url"
+				   name="main_url"
+				   value="<?php print $dolibarr_main_url_root; ?> "
 <?php if (!empty($force_install_noedit)) {
 	print ' disabled';
 }
@@ -212,13 +236,17 @@ if (!empty($force_install_noedit)) {
 	if (!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') {   // Enabled if the installation process is "https://"
 		?>
 	<tr>
-                    <td class="label"><label for="main_force_https"><?php echo $langs->trans("ForceHttps"); ?></label></td>
-                    <td class="label">
-                        <input type="checkbox"
-                               id="main_force_https"
-                               name="main_force_https"
-				<?php if (!empty($force_install_mainforcehttps)) { print ' checked'; } ?>
-				<?php if ($force_install_noedit == 2 && $force_install_mainforcehttps !== null) { print ' disabled'; } ?>
+					<td class="label"><label for="main_force_https"><?php echo $langs->trans("ForceHttps"); ?></label></td>
+					<td class="label">
+						<input type="checkbox"
+							   id="main_force_https"
+							   name="main_force_https"
+				<?php if (!empty($force_install_mainforcehttps)) {
+					print ' checked';
+				} ?>
+				<?php if ($force_install_noedit == 2 && $force_install_mainforcehttps !== null) {
+					print ' disabled';
+				} ?>
 			>
 		</td>
 		<td class="comment"><?php echo $langs->trans("CheckToForceHttps"); ?>
@@ -238,13 +266,15 @@ if (!empty($force_install_noedit)) {
 	</tr>
 
 	<tr>
-        <td class="label"><label for="db_name"><b><?php echo $langs->trans("DatabaseName"); ?></b></label></td>
+		<td class="label"><label for="db_name"><b><?php echo $langs->trans("DatabaseName"); ?></b></label></td>
 		<td class="label">
 			<input type="text"
-			       id="db_name"
-                   name="db_name"
-			       value="<?php echo (!empty($dolibarr_main_db_name)) ? $dolibarr_main_db_name : ($force_install_database ? $force_install_database : 'dolibarr'); ?>"
-				<?php if ($force_install_noedit == 2 && $force_install_database !== null) { print ' disabled'; } ?>
+				   id="db_name"
+				   name="db_name"
+				   value="<?php echo (!empty($dolibarr_main_db_name)) ? $dolibarr_main_db_name : ($force_install_database ? $force_install_database : 'dolibarr'); ?>"
+				<?php if ($force_install_noedit == 2 && $force_install_database !== null) {
+					print ' disabled';
+				} ?>
 			>
 		</td>
 		<td class="comment"><?php echo $langs->trans("DatabaseName"); ?></td>
@@ -252,8 +282,7 @@ if (!empty($force_install_noedit)) {
 
 
 	<?php
-	if (!isset($dolibarr_main_db_host))
-	{
+	if (!isset($dolibarr_main_db_host)) {
 		$dolibarr_main_db_host = "localhost";
 	}
 	?>
@@ -273,55 +302,86 @@ if (!empty($force_install_noedit)) {
 		// Scan les drivers
 		$dir = DOL_DOCUMENT_ROOT.'/core/db';
 		$handle = opendir($dir);
-		if (is_resource($handle))
-		{
-			while (($file = readdir($handle)) !== false)
-			{
-				if (is_readable($dir."/".$file) && preg_match('/^(.*)\.class\.php$/i', $file, $reg))
-				{
+		if (is_resource($handle)) {
+			while (($file = readdir($handle)) !== false) {
+				if (is_readable($dir."/".$file) && preg_match('/^(.*)\.class\.php$/i', $file, $reg)) {
 					$type = $reg[1];
-					if ($type === 'DoliDB') continue; // Skip abstract class
+					if ($type === 'DoliDB') {
+						continue; // Skip abstract class
+					}
 					$class = 'DoliDB'.ucfirst($type);
 					include_once $dir."/".$file;
 
-					if ($type == 'sqlite') continue; // We hide sqlite because support can't be complete until sqlite does not manage foreign key creation after table creation (ALTER TABLE child ADD CONSTRAINT not supported)
-					if ($type == 'sqlite3') continue; // We hide sqlite3 because support can't be complete until sqlite does not manage foreign key creation after table creation (ALTER TABLE child ADD CONSTRAINT not supported)
+					if ($type == 'sqlite') {
+						continue; // We hide sqlite because support can't be complete until sqlite does not manage foreign key creation after table creation (ALTER TABLE child ADD CONSTRAINT not supported)
+					}
+					if ($type == 'sqlite3') {
+						continue; // We hide sqlite3 because support can't be complete until sqlite does not manage foreign key creation after table creation (ALTER TABLE child ADD CONSTRAINT not supported)
+					}
 
 					// Version min of database
 					$versionbasemin = explode('.', $class::VERSIONMIN);
 					$note = '('.$class::LABEL.' >= '.$class::VERSIONMIN.')';
 
 					// Switch to mysql if mysqli is not present
-					if ($defaultype == 'mysqli' && !function_exists('mysqli_connect')) $defaultype = 'mysql';
+					if ($defaultype == 'mysqli' && !function_exists('mysqli_connect')) {
+						$defaultype = 'mysql';
+					}
 
 					// Show line into list
-					if ($type == 'mysql') { $testfunction = 'mysql_connect'; $testclass = ''; }
-					if ($type == 'mysqli') { $testfunction = 'mysqli_connect'; $testclass = ''; }
-					if ($type == 'pgsql') { $testfunction = 'pg_connect'; $testclass = ''; }
-					if ($type == 'mssql') { $testfunction = 'mssql_connect'; $testclass = ''; }
-					if ($type == 'sqlite') { $testfunction = ''; $testclass = 'PDO'; }
-					if ($type == 'sqlite3') { $testfunction = ''; $testclass = 'SQLite3'; }
+					if ($type == 'mysql') {
+						$testfunction = 'mysql_connect'; $testclass = '';
+					}
+					if ($type == 'mysqli') {
+						$testfunction = 'mysqli_connect'; $testclass = '';
+					}
+					if ($type == 'pgsql') {
+						$testfunction = 'pg_connect'; $testclass = '';
+					}
+					if ($type == 'mssql') {
+						$testfunction = 'mssql_connect'; $testclass = '';
+					}
+					if ($type == 'sqlite') {
+						$testfunction = ''; $testclass = 'PDO';
+					}
+					if ($type == 'sqlite3') {
+						$testfunction = ''; $testclass = 'SQLite3';
+					}
 					$option .= '<option value="'.$type.'"'.($defaultype == $type ? ' selected' : '');
-					if ($testfunction && !function_exists($testfunction)) $option .= ' disabled';
-					if ($testclass && !class_exists($testclass)) $option .= ' disabled';
+					if ($testfunction && !function_exists($testfunction)) {
+						$option .= ' disabled';
+					}
+					if ($testclass && !class_exists($testclass)) {
+						$option .= ' disabled';
+					}
 					$option .= '>';
 					$option .= $type.'&nbsp; &nbsp;';
-					if ($note) $option .= ' '.$note;
+					if ($note) {
+						$option .= ' '.$note;
+					}
 					// Deprecated and experimental
-					if ($type == 'mysql') $option .= ' '.$langs->trans("Deprecated");
-					elseif ($type == 'mssql')  $option .= ' '.$langs->trans("VersionExperimental");
-					elseif ($type == 'sqlite') $option .= ' '.$langs->trans("VersionExperimental");
-					elseif ($type == 'sqlite3') $option .= ' '.$langs->trans("VersionExperimental");
-					// No available
-					elseif (!function_exists($testfunction)) $option .= ' - '.$langs->trans("FunctionNotAvailableInThisPHP");
+					if ($type == 'mysql') {
+						$option .= ' '.$langs->trans("Deprecated");
+					} elseif ($type == 'mssql') {
+						$option .= ' '.$langs->trans("VersionExperimental");
+					} elseif ($type == 'sqlite') {
+						$option .= ' '.$langs->trans("VersionExperimental");
+					} elseif ($type == 'sqlite3') {
+						$option .= ' '.$langs->trans("VersionExperimental");
+					} elseif (!function_exists($testfunction)) {
+						// No available
+						$option .= ' - '.$langs->trans("FunctionNotAvailableInThisPHP");
+					}
 					$option .= '</option>';
 				}
 			}
 		}
 		?>
 			<select id="db_type"
-			        name="db_type"
-				<?php if ($force_install_noedit == 2 && $force_install_type !== null) { print ' disabled'; } ?>
+					name="db_type"
+				<?php if ($force_install_noedit == 2 && $force_install_type !== null) {
+					print ' disabled';
+				} ?>
 			>
 				<?php print $option; ?>
 			</select>
@@ -335,10 +395,12 @@ if (!empty($force_install_noedit)) {
 		<td class="label"><label for="db_host"><b><?php echo $langs->trans("DatabaseServer"); ?></b></label></td>
 		<td class="label">
 			<input type="text"
-                   id="db_host"
-			       name="db_host"
-			       value="<?php print (!empty($force_install_dbserver) ? $force_install_dbserver : (!empty($dolibarr_main_db_host) ? $dolibarr_main_db_host : 'localhost')); ?>"
-				<?php if ($force_install_noedit == 2 && $force_install_dbserver !== null) { print ' disabled'; } ?>
+				   id="db_host"
+				   name="db_host"
+				   value="<?php print (!empty($force_install_dbserver) ? $force_install_dbserver : (!empty($dolibarr_main_db_host) ? $dolibarr_main_db_host : 'localhost')); ?>"
+				<?php if ($force_install_noedit == 2 && $force_install_dbserver !== null) {
+					print ' disabled';
+				} ?>
 			>
 		</td>
 		<td class="comment"><?php echo $langs->trans("ServerAddressDescription"); ?>
@@ -347,13 +409,15 @@ if (!empty($force_install_noedit)) {
 	</tr>
 
 	<tr class="hidesqlite">
-        <td class="label"><label for="db_port"><?php echo $langs->trans("Port"); ?></label></td>
+		<td class="label"><label for="db_port"><?php echo $langs->trans("Port"); ?></label></td>
 		<td class="label">
 			<input type="text"
-			       name="db_port"
-			       id="db_port"
-			       value="<?php print (!empty($force_install_port)) ? $force_install_port : $dolibarr_main_db_port; ?>"
-				<?php if ($force_install_noedit == 2 && $force_install_port !== null) { print ' disabled'; } ?>
+				   name="db_port"
+				   id="db_port"
+				   value="<?php print (!empty($force_install_port)) ? $force_install_port : $dolibarr_main_db_port; ?>"
+				<?php if ($force_install_noedit == 2 && $force_install_port !== null) {
+					print ' disabled';
+				} ?>
 			>
 		</td>
 		<td class="comment"><?php echo $langs->trans("ServerPortDescription"); ?>
@@ -362,26 +426,32 @@ if (!empty($force_install_noedit)) {
 	</tr>
 
 	<tr class="hidesqlite">
-        <td class="label"><label for="db_prefix"><?php echo $langs->trans("DatabasePrefix"); ?></label></td>
+		<td class="label"><label for="db_prefix"><?php echo $langs->trans("DatabasePrefix"); ?></label></td>
 		<td class="label">
 			<input type="text"
-                   id="db_prefix"
-			       name="db_prefix"
-			       value="<?php echo(!empty($force_install_prefix) ? $force_install_prefix : (!empty($dolibarr_main_db_prefix) ? $dolibarr_main_db_prefix : 'llx_')); ?>"
-				<?php if ($force_install_noedit == 2 && $force_install_prefix !== null) { print ' disabled'; } ?>
+				   id="db_prefix"
+				   name="db_prefix"
+				   value="<?php echo(!empty($force_install_prefix) ? $force_install_prefix : (!empty($dolibarr_main_db_prefix) ? $dolibarr_main_db_prefix : 'llx_')); ?>"
+				<?php if ($force_install_noedit == 2 && $force_install_prefix !== null) {
+					print ' disabled';
+				} ?>
 			>
 		</td>
 		<td class="comment"><?php echo $langs->trans("DatabasePrefixDescription"); ?></td>
 	</tr>
 
 	<tr class="hidesqlite">
-        <td class="label"><label for="db_create_database"><?php echo $langs->trans("CreateDatabase"); ?></label></td>
+		<td class="label"><label for="db_create_database"><?php echo $langs->trans("CreateDatabase"); ?></label></td>
 		<td class="label">
 			<input type="checkbox"
-			       id="db_create_database"
-			       name="db_create_database"
-				<?php if ($force_install_createdatabase) { print ' checked'; } ?>
-				<?php if ($force_install_noedit == 2 && $force_install_createdatabase !== null) { print ' disabled'; } ?>
+				   id="db_create_database"
+				   name="db_create_database"
+				<?php if ($force_install_createdatabase) {
+					print ' checked';
+				} ?>
+				<?php if ($force_install_noedit == 2 && $force_install_createdatabase !== null) {
+					print ' disabled';
+				} ?>
 			>
 		</td>
 		<td class="comment"><?php echo $langs->trans("CheckToCreateDatabase"); ?>
@@ -392,10 +462,12 @@ if (!empty($force_install_noedit)) {
 		<td class="label"><label for="db_user"><b><?php echo $langs->trans("Login"); ?></b></label></td>
 		<td class="label">
 			<input type="text"
-                   id="db_user"
-			       name="db_user"
-			       value="<?php print (!empty($force_install_databaselogin)) ? $force_install_databaselogin : $dolibarr_main_db_user; ?>"
-				<?php if ($force_install_noedit == 2 && $force_install_databaselogin !== null) { print ' disabled'; } ?>
+				   id="db_user"
+				   name="db_user"
+				   value="<?php print (!empty($force_install_databaselogin)) ? $force_install_databaselogin : $dolibarr_main_db_user; ?>"
+				<?php if ($force_install_noedit == 2 && $force_install_databaselogin !== null) {
+					print ' disabled';
+				} ?>
 			>
 		</td>
 		<td class="comment"><?php echo $langs->trans("AdminLogin"); ?></td>
@@ -405,17 +477,19 @@ if (!empty($force_install_noedit)) {
 		<td class="label"><label for="db_pass"><b><?php echo $langs->trans("Password"); ?></b></label></td>
 		<td class="label">
 			<input type="password"
-                   id="db_pass" autocomplete="off"
-			       name="db_pass"
-			       value="<?php
-				// If $force_install_databasepass is on, we don't want to set password, we just show '***'. Real value will be extracted from the forced install file at step1.
-				$autofill = ((!empty($_SESSION['dol_save_pass'])) ? $_SESSION['dol_save_pass'] : str_pad('', strlen($force_install_databasepass), '*'));
-				if (!empty($dolibarr_main_prod)) {
-					$autofill = '';
-				}
-				print dol_escape_htmltag($autofill);
-				?>"
-				<?php if ($force_install_noedit == 2 && $force_install_databasepass !== null) { print ' disabled'; } ?>
+				   id="db_pass" autocomplete="off"
+				   name="db_pass"
+				   value="<?php
+					// If $force_install_databasepass is on, we don't want to set password, we just show '***'. Real value will be extracted from the forced install file at step1.
+					$autofill = ((!empty($_SESSION['dol_save_pass'])) ? $_SESSION['dol_save_pass'] : str_pad('', strlen($force_install_databasepass), '*'));
+					if (!empty($dolibarr_main_prod)) {
+						$autofill = '';
+					}
+					print dol_escape_htmltag($autofill);
+					?>"
+				<?php if ($force_install_noedit == 2 && $force_install_databasepass !== null) {
+					print ' disabled';
+				} ?>
 			>
 		</td>
 		<td class="comment"><?php echo $langs->trans("AdminPassword"); ?></td>
@@ -425,10 +499,14 @@ if (!empty($force_install_noedit)) {
 		<td class="label"><label for="db_create_user"><?php echo $langs->trans("CreateUser"); ?></label></td>
 		<td class="label">
 			<input type="checkbox"
-			       id="db_create_user"
-                   name="db_create_user"
-				<?php if (!empty($force_install_createuser)) { print ' checked'; } ?>
-				<?php if ($force_install_noedit == 2 && $force_install_createuser !== null) { print ' disabled'; } ?>
+				   id="db_create_user"
+				   name="db_create_user"
+				<?php if (!empty($force_install_createuser)) {
+					print ' checked';
+				} ?>
+				<?php if ($force_install_noedit == 2 && $force_install_createuser !== null) {
+					print ' disabled';
+				} ?>
 			>
 		</td>
 		<td class="comment"><?php echo $langs->trans("CheckToCreateUser"); ?>
@@ -451,11 +529,13 @@ if (!empty($force_install_noedit)) {
 		<td class="label"><label for="db_user_root"><b><?php echo $langs->trans("Login"); ?></b></label></td>
 		<td class="label">
 			<input type="text"
-			       id="db_user_root"
-			       name="db_user_root"
-			       class="needroot"
-			       value="<?php print (!empty($force_install_databaserootlogin)) ? $force_install_databaserootlogin : @$db_user_root; ?>"
-				<?php if ($force_install_noedit > 0 && !empty($force_install_databaserootlogin)) { print ' disabled'; } ?>
+				   id="db_user_root"
+				   name="db_user_root"
+				   class="needroot"
+				   value="<?php print (!empty($force_install_databaserootlogin)) ? $force_install_databaserootlogin : @$db_user_root; ?>"
+				<?php if ($force_install_noedit > 0 && !empty($force_install_databaserootlogin)) {
+					print ' disabled';
+				} ?>
 			>
 		</td>
 		<td class="comment"><?php echo $langs->trans("DatabaseRootLoginDescription"); ?>
@@ -473,25 +553,29 @@ if (!empty($force_install_noedit)) {
 		<td class="label"><label for="db_pass_root"><b><?php echo $langs->trans("Password"); ?></b></label></td>
 		<td class="label">
 			<input type="password"
-			       autocomplete="off"
-			       id="db_pass_root"
-			       name="db_pass_root"
-			       class="needroot"
-			       value="<?php
+				   autocomplete="off"
+				   id="db_pass_root"
+				   name="db_pass_root"
+				   class="needroot"
+				   value="<?php
 					// If $force_install_databaserootpass is on, we don't want to set password here, we just show '***'. Real value will be extracted from the forced install file at step1.
 					$autofill = ((!empty($force_install_databaserootpass)) ? str_pad('', strlen($force_install_databaserootpass), '*') : @$db_pass_root);
 					if (!empty($dolibarr_main_prod)) {
 						$autofill = '';
 					}
 					// Do not autofill password if instance is a production instance
-					if (!empty($_SERVER["SERVER_NAME"]) && !in_array($_SERVER["SERVER_NAME"],
-						array('127.0.0.1', 'localhost', 'localhostgit'))
+					if (!empty($_SERVER["SERVER_NAME"]) && !in_array(
+						$_SERVER["SERVER_NAME"],
+						array('127.0.0.1', 'localhost', 'localhostgit')
+					)
 					) {
 						$autofill = '';
 					}    // Do not autofill password for remote access
 					print dol_escape_htmltag($autofill);
 					?>"
-				<?php if ($force_install_noedit > 0 && !empty($force_install_databaserootpass)) { print ' disabled'; /* May be removed by javascript*/ } ?>
+				<?php if ($force_install_noedit > 0 && !empty($force_install_databaserootpass)) {
+					print ' disabled'; /* May be removed by javascript*/
+				} ?>
 			>
 		</td>
 		<td class="comment"><?php echo $langs->trans("KeepEmptyIfNoPassword"); ?>
@@ -535,7 +619,7 @@ jQuery(document).ready(function() {
 			jQuery(".hideroot").show();
 			<?php
 			if ($force_install_noedit == 0) { ?>
-                jQuery(".needroot").removeAttr('disabled');
+				jQuery(".needroot").removeAttr('disabled');
 			<?php } ?>
 		}
 		else

From 92f38f664a10ecc27a28677e0dd3e132846f1dc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 20 Dec 2020 10:44:55 +0100
Subject: [PATCH 540/888] Remove no more needed file

---
 htdocs/admin/socialnetworks.php | 118 --------------------------------
 1 file changed, 118 deletions(-)
 delete mode 100644 htdocs/admin/socialnetworks.php

diff --git a/htdocs/admin/socialnetworks.php b/htdocs/admin/socialnetworks.php
deleted file mode 100644
index 0ab3a91432b..00000000000
--- a/htdocs/admin/socialnetworks.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/* Copyright (C) 2018 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2019 Alexandre Spangaro   <aspangaro@open-dsi.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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *   	\file       htdocs/admin/socialnetworks.php
- *		\ingroup    socialnetworks
- *		\brief      Page to setup the module Social Networks
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/mailmanspip.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array("admin", "errors"));
-
-if (!$user->admin) accessforbidden();
-
-$type = array('yesno', 'texte', 'chaine');
-
-$action = GETPOST('action', 'aZ09');
-
-
-
-/*
- * Action
- */
-if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
-{
-	$code = $reg[1];
-	if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
-	{
-		header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
-	} else {
-		dol_print_error($db);
-	}
-}
-
-if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
-{
-	$code = $reg[1];
-	if (dolibarr_del_const($db, $code, $conf->entity) > 0)
-	{
-		header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
-	} else {
-		dol_print_error($db);
-	}
-}
-
-
-/*
- * View
- */
-
-$help_url = '';
-
-llxHeader('', $langs->trans("SocialNetworkSetup"), $help_url);
-
-
-$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("SocialNetworkSetup"), $linkback, 'title_setup');
-
-//$head = socialnetworks_admin_prepare_head();
-$h = 0;
-$head = array();
-$head[$h][0] = DOL_URL_ROOT.'/admin/socialnetworks.php';
-$head[$h][1] = $langs->trans("Setup");
-$head[$h][2] = 'setup';
-$h++;
-
-
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-
-print dol_get_fiche_head($head, 'setup', '', 0, 'user');
-
-print '<br>';
-
-$arrayofsocialnetworks = array('jabber'=>'Jabber', 'skype'=>'Skype', 'twitter'=>'Twitter', 'facebook'=>'Facebook', 'linkedin'=>'LinkedIn');
-
-foreach ($arrayofsocialnetworks as $snkey => $snlabel) {
-	$consttocheck = 'SOCIALNETWORKS_'.strtoupper($snkey);
-	if ($conf->use_javascript_ajax) {
-		$link = ajax_constantonoff($consttocheck);
-	} else {
-		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-		$link = $form->selectarray($consttocheck, $arrval, $conf->global->$consttocheck);
-	}
-
-	print $langs->trans('EnableFeatureFor', $snlabel).' '.$link.'<br><br>';
-}
-
-
-print dol_get_fiche_end();
-
-print '</form>';
-
-
-// End of page
-llxFooter();
-$db->close();

From b7b35f4cd408ef2f7824fbc0bc5af1dcc69ade9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sun, 20 Dec 2020 11:04:21 +0100
Subject: [PATCH 541/888] simplify notications class

---
 htdocs/core/class/notify.class.php | 308 ++++++++++++++++-------------
 1 file changed, 169 insertions(+), 139 deletions(-)

diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 7cc51bfecb9..6f60f6cdca6 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -113,25 +113,38 @@ class Notify
 		$listofnotiftodo = $this->getNotificationsArray($action, $socid, $object, 0);
 
 		$nb = -1;
-		if (is_array($listofnotiftodo)) $nb = count($listofnotiftodo);
-		if ($nb < 0)  $texte = img_object($langs->trans("Notifications"), 'email').' '.$langs->trans("ErrorFailedToGetListOfNotificationsToSend");
-		if ($nb == 0) $texte = img_object($langs->trans("Notifications"), 'email').' '.$langs->trans("NoNotificationsWillBeSent");
-   		if ($nb == 1) $texte = img_object($langs->trans("Notifications"), 'email').' '.$langs->trans("ANotificationsWillBeSent");
-   		if ($nb >= 2) $texte = img_object($langs->trans("Notifications"), 'email').' '.$langs->trans("SomeNotificationsWillBeSent", $nb);
+		if (is_array($listofnotiftodo)) {
+			$nb = count($listofnotiftodo);
+		}
+		if ($nb < 0) {
+			$texte = img_object($langs->trans("Notifications"), 'email').' '.$langs->trans("ErrorFailedToGetListOfNotificationsToSend");
+		} elseif ($nb == 0) {
+			$texte = img_object($langs->trans("Notifications"), 'email').' '.$langs->trans("NoNotificationsWillBeSent");
+		} elseif ($nb == 1) {
+			$texte = img_object($langs->trans("Notifications"), 'email').' '.$langs->trans("ANotificationsWillBeSent");
+		} elseif ($nb >= 2) {
+			$texte = img_object($langs->trans("Notifications"), 'email').' '.$langs->trans("SomeNotificationsWillBeSent", $nb);
+		}
 
-   		if (is_array($listofnotiftodo))
-   		{
+		if (is_array($listofnotiftodo)) {
 			$i = 0;
-			foreach ($listofnotiftodo as $key => $val)
-			{
-				if ($i) $texte .= ', ';
-				else $texte .= ' (';
-				if ($val['isemailvalid']) $texte .= $val['email'];
-				else $texte .= $val['emaildesc'];
+			foreach ($listofnotiftodo as $key => $val) {
+				if ($i) {
+					$texte .= ', ';
+				} else {
+					$texte .= ' (';
+				}
+				if ($val['isemailvalid']) {
+					$texte .= $val['email'];
+				} else {
+					$texte .= $val['emaildesc'];
+				}
 				$i++;
 			}
-			if ($i) $texte .= ')';
-   		}
+			if ($i) {
+				$texte .= ')';
+			}
+		}
 
 		return $texte;
 	}
@@ -154,12 +167,19 @@ class Notify
 		$resarray = array();
 
 		$valueforthreshold = 0;
-		if (is_object($object)) $valueforthreshold = $object->total_ht;
+		if (is_object($object)) {
+			$valueforthreshold = $object->total_ht;
+		}
+		if ($notifcode) {
+			if (is_numeric($notifcode)) {
+				$sqlnotifcode = " AND n.fk_action = ".$notifcode; // Old usage
+			} else {
+				$sqlnotifcode = " AND a.code = '".$this->db->escape($notifcode)."'"; // New usage
+			}
+		}
 
-		if (!$error)
-		{
-			if ($socid >= 0 && in_array('thirdparty', $scope))
-			{
+		if (!$error) {
+			if ($socid >= 0 && in_array('thirdparty', $scope)) {
 				$sql = "SELECT a.code, c.email, c.rowid";
 				$sql .= " FROM ".MAIN_DB_PREFIX."notify_def as n,";
 				$sql .= " ".MAIN_DB_PREFIX."socpeople as c,";
@@ -168,29 +188,26 @@ class Notify
 				$sql .= " WHERE n.fk_contact = c.rowid";
 				$sql .= " AND a.rowid = n.fk_action";
 				$sql .= " AND n.fk_soc = s.rowid";
-				if ($notifcode)
-				{
-					if (is_numeric($notifcode)) $sql .= " AND n.fk_action = ".$notifcode; // Old usage
-					else $sql .= " AND a.code = '".$this->db->escape($notifcode)."'"; // New usage
-				}
+				$sql .= $sqlnotifcode;
 				$sql .= " AND s.entity IN (".getEntity('societe').")";
-				if ($socid > 0) $sql .= " AND s.rowid = ".$socid;
+				if ($socid > 0) {
+					$sql .= " AND s.rowid = ".$socid;
+				}
 
 				dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);
 
 				$resql = $this->db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$num = $this->db->num_rows($resql);
 					$i = 0;
-					while ($i < $num)
-					{
+					while ($i < $num) {
 						$obj = $this->db->fetch_object($resql);
-						if ($obj)
-						{
+						if ($obj) {
 							$newval2 = trim($obj->email);
 							$isvalid = isValidEmail($newval2);
-							if (empty($resarray[$newval2])) $resarray[$newval2] = array('type'=> 'tocontact', 'code'=>trim($obj->code), 'emaildesc'=>'Contact id '.$obj->rowid, 'email'=>$newval2, 'contactid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
+							if (empty($resarray[$newval2])) {
+								$resarray[$newval2] = array('type'=> 'tocontact', 'code'=>trim($obj->code), 'emaildesc'=>'Contact id '.$obj->rowid, 'email'=>$newval2, 'contactid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
+							}
 						}
 						$i++;
 					}
@@ -201,39 +218,34 @@ class Notify
 			}
 		}
 
-		if (!$error)
-		{
-			if ($userid >= 0 && in_array('user', $scope))
-			{
+		if (!$error) {
+			if ($userid >= 0 && in_array('user', $scope)) {
 				$sql = "SELECT a.code, c.email, c.rowid";
 				$sql .= " FROM ".MAIN_DB_PREFIX."notify_def as n,";
 				$sql .= " ".MAIN_DB_PREFIX."user as c,";
 				$sql .= " ".MAIN_DB_PREFIX."c_action_trigger as a";
 				$sql .= " WHERE n.fk_user = c.rowid";
 				$sql .= " AND a.rowid = n.fk_action";
-				if ($notifcode)
-				{
-					if (is_numeric($notifcode)) $sql .= " AND n.fk_action = ".$notifcode; // Old usage
-					else $sql .= " AND a.code = '".$this->db->escape($notifcode)."'"; // New usage
-				}
+				$sql .= $sqlnotifcode;
 				$sql .= " AND c.entity IN (".getEntity('user').")";
-				if ($userid > 0) $sql .= " AND c.rowid = ".$userid;
+				if ($userid > 0) {
+					$sql .= " AND c.rowid = ".$userid;
+				}
 
 				dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);
 
 				$resql = $this->db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$num = $this->db->num_rows($resql);
 					$i = 0;
-					while ($i < $num)
-					{
+					while ($i < $num) {
 						$obj = $this->db->fetch_object($resql);
-						if ($obj)
-						{
+						if ($obj) {
 							$newval2 = trim($obj->email);
 							$isvalid = isValidEmail($newval2);
-							if (empty($resarray[$newval2])) $resarray[$newval2] = array('type'=> 'touser', 'code'=>trim($obj->code), 'emaildesc'=>'User id '.$obj->rowid, 'email'=>$newval2, 'userid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
+							if (empty($resarray[$newval2])) {
+								$resarray[$newval2] = array('type'=> 'touser', 'code'=>trim($obj->code), 'emaildesc'=>'User id '.$obj->rowid, 'email'=>$newval2, 'userid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
+							}
 						}
 						$i++;
 					}
@@ -244,48 +256,55 @@ class Notify
 			}
 		}
 
-		if (!$error)
-		{
-			if (in_array('global', $scope))
-			{
+		if (!$error) {
+			if (in_array('global', $scope)) {
 				// List of notifications enabled for fixed email
-				foreach ($conf->global as $key => $val)
-				{
-					if ($notifcode)
-					{
-						if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
+				foreach ($conf->global as $key => $val) {
+					if ($notifcode) {
+						if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) {
+							continue;
+						}
 					} else {
-						if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_.*_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
+						if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_.*_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) {
+							continue;
+						}
 					}
 
 					$threshold = (float) $reg[1];
-					if ($valueforthreshold < $threshold) continue;
+					if ($valueforthreshold < $threshold) {
+						continue;
+					}
 
 					$tmpemail = explode(',', $val);
-					foreach ($tmpemail as $key2 => $val2)
-					{
+					foreach ($tmpemail as $key2 => $val2) {
 						$newval2 = trim($val2);
-						if ($newval2 == '__SUPERVISOREMAIL__')
-						{
-							if ($user->fk_user > 0)
-							{
+						if ($newval2 == '__SUPERVISOREMAIL__') {
+							if ($user->fk_user > 0) {
 								$tmpuser = new User($this->db);
 								$tmpuser->fetch($user->fk_user);
-								if ($tmpuser->email) $newval2 = trim($tmpuser->email);
-								else $newval2 = '';
-							} else $newval2 = '';
+								if ($tmpuser->email) {
+									$newval2 = trim($tmpuser->email);
+								} else {
+									$newval2 = '';
+								}
+							} else {
+								$newval2 = '';
+							}
 						}
-						if ($newval2)
-						{
+						if ($newval2) {
 							$isvalid = isValidEmail($newval2, 0);
-							if (empty($resarray[$newval2])) $resarray[$newval2] = array('type'=> 'tofixedemail', 'code'=>trim($key), 'emaildesc'=>trim($val2), 'email'=>$newval2, 'isemailvalid'=>$isvalid);
+							if (empty($resarray[$newval2])) {
+								$resarray[$newval2] = array('type'=> 'tofixedemail', 'code'=>trim($key), 'emaildesc'=>trim($val2), 'email'=>$newval2, 'isemailvalid'=>$isvalid);
+							}
 						}
 					}
 				}
 			}
 		}
 
-		if ($error) return -1;
+		if ($error) {
+			return -1;
+		}
 
 		//var_dump($resarray);
 		return $resarray;
@@ -309,11 +328,12 @@ class Notify
 		global $dolibarr_main_url_root;
 		global $action;
 
-		if (!in_array($notifcode, $this->arrayofnotifsupported)) return 0;
+		if (!in_array($notifcode, $this->arrayofnotifsupported)) {
+			return 0;
+		}
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		if (!is_object($hookmanager))
-		{
+		if (!is_object($hookmanager)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($this->db);
 		}
@@ -330,7 +350,9 @@ class Notify
 
 		// Define some vars
 		$application = 'Dolibarr';
-		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $application = $conf->global->MAIN_APPLICATION_TITLE;
+		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+			$application = $conf->global->MAIN_APPLICATION_TITLE;
+		}
 		$replyto = $conf->notification->email_from;
 		$object_type = '';
 		$link = '';
@@ -343,8 +365,7 @@ class Notify
 		$sql = '';
 
 		// Check notification per third party
-		if (!empty($object->socid) && $object->socid > 0)
-		{
+		if (!empty($object->socid) && $object->socid > 0) {
 			$sql .= "SELECT 'tocontactid' as type_target, c.email, c.rowid as cid, c.lastname, c.firstname, c.default_lang,";
 			$sql .= " a.rowid as adid, a.label, a.code, n.rowid, n.type";
 			$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c,";
@@ -354,8 +375,11 @@ class Notify
 			$sql .= " WHERE n.fk_contact = c.rowid AND a.rowid = n.fk_action";
 			$sql .= " AND n.fk_soc = s.rowid";
 			$sql .= " AND c.statut = 1";
-			if (is_numeric($notifcode)) $sql .= " AND n.fk_action = ".$notifcode; // Old usage
-			else $sql .= " AND a.code = '".$this->db->escape($notifcode)."'"; // New usage
+			if (is_numeric($notifcode)) {
+				$sql .= " AND n.fk_action = ".$notifcode; // Old usage
+			} else {
+				$sql .= " AND a.code = '".$this->db->escape($notifcode)."'"; // New usage
+			}
 			$sql .= " AND s.rowid = ".$object->socid;
 
 			$sql .= "\nUNION\n";
@@ -369,41 +393,42 @@ class Notify
 		$sql .= " ".MAIN_DB_PREFIX."notify_def as n";
 		$sql .= " WHERE n.fk_user = c.rowid AND a.rowid = n.fk_action";
 		$sql .= " AND c.statut = 1";
-		if (is_numeric($notifcode)) $sql .= " AND n.fk_action = ".$notifcode; // Old usage
-		else $sql .= " AND a.code = '".$this->db->escape($notifcode)."'"; // New usage
+		if (is_numeric($notifcode)) {
+			$sql .= " AND n.fk_action = ".$notifcode; // Old usage
+		} else {
+			$sql .= " AND a.code = '".$this->db->escape($notifcode)."'"; // New usage
+		}
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$projtitle = '';
-			if (!empty($object->fk_project))
-			{
+			if (!empty($object->fk_project)) {
 				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 				$proj = new Project($this->db);
 				$proj->fetch($object->fk_project);
 				$projtitle = '('.$proj->title.')';
 			}
 
-			if ($num > 0)
-			{
+			if ($num > 0) {
 				$i = 0;
-				while ($i < $num && !$error)	// For each notification couple defined (third party/actioncode)
-				{
+				while ($i < $num && !$error) {	// For each notification couple defined (third party/actioncode)
 					$obj = $this->db->fetch_object($result);
 
 					$sendto = dolGetFirstLastname($obj->firstname, $obj->lastname)." <".$obj->email.">";
 					$notifcodedefid = $obj->adid;
 					$trackid = '';
-					if ($obj->type_target == 'tocontactid') $trackid = 'con'.$obj->id;
-					if ($obj->type_target == 'touserid') $trackid = 'use'.$obj->id;
+					if ($obj->type_target == 'tocontactid') {
+						$trackid = 'con'.$obj->id;
+					}
+					if ($obj->type_target == 'touserid') {
+						$trackid = 'use'.$obj->id;
+					}
 
-					if (dol_strlen($obj->email))
-					{
+					if (dol_strlen($obj->email)) {
 						// Set output language
 						$outputlangs = $langs;
-						if ($obj->default_lang && $obj->default_lang != $langs->defaultlang)
-						{
+						if ($obj->default_lang && $obj->default_lang != $langs->defaultlang) {
 							$outputlangs = new Translate('', $conf);
 							$outputlangs->setDefaultLang($obj->default_lang);
 							$outputlangs->loadLangs(array("main", "other"));
@@ -511,8 +536,7 @@ class Notify
 						}
 						$ref = dol_sanitizeFileName($newref);
 						$pdf_path = $dir_output."/".$ref."/".$ref.".pdf";
-						if (!dol_is_file($pdf_path))
-						{
+						if (!dol_is_file($pdf_path)) {
 							// We can't add PDF as it is not generated yet.
 							$filepdf = '';
 						} else {
@@ -525,13 +549,18 @@ class Notify
 						$message .= $mesg;
 
 						$parameters = array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$filename_list, 'mimefile'=>$mimetype_list, 'filename'=>$mimefilename_list);
-						if (!isset($action)) $action = '';
+						if (!isset($action)) {
+							$action = '';
+						}
 
 						$reshook = $hookmanager->executeHooks('formatNotificationMessage', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-						if (empty($reshook))
-						{
-							if (!empty($hookmanager->resArray['subject'])) $subject .= $hookmanager->resArray['subject'];
-							if (!empty($hookmanager->resArray['message'])) $message .= $hookmanager->resArray['message'];
+						if (empty($reshook)) {
+							if (!empty($hookmanager->resArray['subject'])) {
+								$subject .= $hookmanager->resArray['subject'];
+							}
+							if (!empty($hookmanager->resArray['message'])) {
+								$message .= $hookmanager->resArray['message'];
+							}
 						}
 
 						$mailfile = new CMailFile(
@@ -553,17 +582,15 @@ class Notify
 							'notification'
 						);
 
-						if ($mailfile->sendfile())
-						{
+						if ($mailfile->sendfile()) {
 							if ($obj->type_target == 'touserid') {
-	 							$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_user, type, objet_type, type_target, objet_id, email)";
+								$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_user, type, objet_type, type_target, objet_id, email)";
 								$sql .= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid ? $object->socid : 'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
 							} else {
 								$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, objet_type, type_target, objet_id, email)";
 								$sql .= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid ? $object->socid : 'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
 							}
-							if (!$this->db->query($sql))
-							{
+							if (!$this->db->query($sql)) {
 								dol_print_error($this->db);
 							}
 						} else {
@@ -579,23 +606,22 @@ class Notify
 				dol_syslog("No notification to thirdparty sent, nothing into notification setup for the thirdparty socid = ".(empty($object->socid) ? '' : $object->socid));
 			}
 		} else {
-	   		$error++;
+			$error++;
 			$this->errors[] = $this->db->lasterror();
 			dol_syslog("Failed to get list of notification to send ".$this->db->lasterror(), LOG_ERR);
-	   		return -1;
+			return -1;
 		}
 
 		// Check notification using fixed email
-		if (!$error)
-		{
-			foreach ($conf->global as $key => $val)
-			{
+		if (!$error) {
+			foreach ($conf->global as $key => $val) {
 				$reg = array();
-				if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
+				if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) {
+					continue;
+				}
 
 				$threshold = (float) $reg[1];
-				if (!empty($object->total_ht) && $object->total_ht <= $threshold)
-				{
+				if (!empty($object->total_ht) && $object->total_ht <= $threshold) {
 					dol_syslog("A notification is requested for notifcode = ".$notifcode." but amount = ".$object->total_ht." so lower than threshold = ".$threshold.". We discard this notification");
 					continue;
 				}
@@ -604,7 +630,9 @@ class Notify
 
 				$sendto = $conf->global->$param;
 				$notifcodedefid = dol_getIdFromCode($this->db, $notifcode, 'c_action_trigger', 'code', 'rowid');
-				if ($notifcodedefid <= 0) dol_print_error($this->db, 'Failed to get id from code');
+				if ($notifcodedefid <= 0) {
+					dol_print_error($this->db, 'Failed to get id from code');
+				}
 				$trackid = '';
 
 				$object_type = '';
@@ -721,8 +749,7 @@ class Notify
 				}
 				$ref = dol_sanitizeFileName($newref);
 				$pdf_path = $dir_output."/".$ref."/".$ref.".pdf";
-				if (!dol_is_file($pdf_path))
-				{
+				if (!dol_is_file($pdf_path)) {
 					// We can't add PDF as it is not generated yet.
 					$filepdf = '';
 				} else {
@@ -736,14 +763,14 @@ class Notify
 				$message = nl2br($message);
 
 				// Replace keyword __SUPERVISOREMAIL__
-				if (preg_match('/__SUPERVISOREMAIL__/', $sendto))
-				{
+				if (preg_match('/__SUPERVISOREMAIL__/', $sendto)) {
 					$newval = '';
-					if ($user->fk_user > 0)
-					{
+					if ($user->fk_user > 0) {
 						$supervisoruser = new User($this->db);
 						$supervisoruser->fetch($user->fk_user);
-						if ($supervisoruser->email) $newval = trim(dolGetFirstLastname($supervisoruser->firstname, $supervisoruser->lastname).' <'.$supervisoruser->email.'>');
+						if ($supervisoruser->email) {
+							$newval = trim(dolGetFirstLastname($supervisoruser->firstname, $supervisoruser->lastname).' <'.$supervisoruser->email.'>');
+						}
 					}
 					dol_syslog("Replace the __SUPERVISOREMAIL__ key into recipient email string with ".$newval);
 					$sendto = preg_replace('/__SUPERVISOREMAIL__/', $newval, $sendto);
@@ -752,14 +779,16 @@ class Notify
 					$sendto = preg_replace('/[\s,]+$/', '', $sendto); // Clean end of string
 				}
 
-				if ($sendto)
-				{
+				if ($sendto) {
 					$parameters = array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$filename_list, 'mimefile'=>$mimetype_list, 'filename'=>$mimefilename_list);
 					$reshook = $hookmanager->executeHooks('formatNotificationMessage', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-					if (empty($reshook))
-					{
-						if (!empty($hookmanager->resArray['subject'])) $subject .= $hookmanager->resArray['subject'];
-						if (!empty($hookmanager->resArray['message'])) $message .= $hookmanager->resArray['message'];
+					if (empty($reshook)) {
+						if (!empty($hookmanager->resArray['subject'])) {
+							$subject .= $hookmanager->resArray['subject'];
+						}
+						if (!empty($hookmanager->resArray['message'])) {
+							$message .= $hookmanager->resArray['message'];
+						}
 					}
 					$mailfile = new CMailFile(
 						$subject,
@@ -780,12 +809,10 @@ class Notify
 						'notification'
 					);
 
-					if ($mailfile->sendfile())
-					{
+					if ($mailfile->sendfile()) {
 						$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, type_target, objet_type, objet_id, email)";
 						$sql .= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid ? $object->socid : 'null').", null, 'email', 'tofixedemail', '".$object_type."', ".$object->id.", '".$this->db->escape($conf->global->$param)."')";
-						if (!$this->db->query($sql))
-						{
+						if (!$this->db->query($sql)) {
 							dol_print_error($this->db);
 						}
 					} else {
@@ -796,7 +823,10 @@ class Notify
 			}
 		}
 
-		if (!$error) return $num;
-		else return -1 * $error;
+		if (!$error) {
+			return $num;
+		} else {
+			return -1 * $error;
+		}
 	}
 }

From 8c87050703903b8fe6577e75cddc43bc6c259735 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 20 Dec 2020 13:54:02 +0100
Subject: [PATCH 542/888] FIX Check of customer/vendor code fails in some cases

---
 htdocs/comm/card.php                          |  5 ++-
 htdocs/core/lib/functions2.lib.php            | 39 ++++++++-----------
 .../societe/mod_codeclient_elephant.php       |  6 +--
 htdocs/fourn/card.php                         |  6 ++-
 htdocs/margin/tabs/thirdpartyMargins.php      | 10 ++++-
 htdocs/societe/card.php                       | 10 ++++-
 htdocs/societe/class/societe.class.php        |  2 +
 htdocs/societe/consumption.php                | 10 ++++-
 htdocs/societe/document.php                   | 10 ++++-
 htdocs/societe/note.php                       | 10 ++++-
 htdocs/societe/notify/card.php                | 10 ++++-
 htdocs/societe/paymentmodes.php               | 10 ++++-
 htdocs/societe/price.php                      |  8 +++-
 htdocs/societe/project.php                    | 10 ++++-
 htdocs/societe/societecontact.php             | 10 ++++-
 htdocs/societe/website.php                    |  8 +++-
 htdocs/ticket/list.php                        | 10 ++---
 17 files changed, 120 insertions(+), 54 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index d48c897d6bb..8b1ab0f4ac8 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -269,7 +269,10 @@ if ($object->id > 0)
 		print '<tr><td>';
 		print $langs->trans('CustomerCode').'</td><td>';
 		print $object->code_client;
-		if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		$tmpcheck = $object->check_codeclient();
+		if ($tmpcheck != 0 && $tmpcheck != -5) {
+			print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		}
 		print '</td></tr>';
 
 		print '<tr>';
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 1ccc4a2d1fb..c00e0f7f825 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -773,6 +773,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
     if (dol_strlen($maskcounter) < 3 && empty($conf->global->MAIN_COUNTER_WITH_LESS_3_DIGITS)) return 'ErrorCounterMustHaveMoreThan3Digits';
 
     // Extract value for third party mask counter
+    $regClientRef = array();
     if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef))
     {
         $maskrefclient = $regClientRef[1].$regClientRef[2];
@@ -806,6 +807,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
     }
 
     // Extract value for user
+    $regType = array();
     if (preg_match('/\{(u+)\}/i', $mask, $regType))
     {
     	$lastname = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';
@@ -970,12 +972,10 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
     //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";
 
     // Define $sqlstring
-    if (function_exists('mb_strrpos'))
-    	{
+    if (function_exists('mb_strrpos')) {
     	$posnumstart = mb_strrpos($maskwithnocode, $maskcounter, 'UTF-8');
 	}
-	else
-	{
+	else {
     	$posnumstart = strrpos($maskwithnocode, $maskcounter);
 	}	// Pos of counter in final string (from 0 to ...)
     if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence';
@@ -1218,6 +1218,7 @@ function check_value($mask, $value)
 
     $hasglobalcounter = false;
     // Extract value for mask counter, mask raz and mask offset
+    $reg = array();
     if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $mask, $reg))
     {
         $masktri = $reg[1].(isset($reg[2]) ? $reg[2] : '').(isset($reg[3]) ? $reg[3] : '');
@@ -1236,6 +1237,7 @@ function check_value($mask, $value)
     if (dol_strlen($maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
 
     // Extract value for third party mask counter
+    $regClientRef = array();
     if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef))
     {
         $maskrefclient = $regClientRef[1].$regClientRef[2];
@@ -1288,31 +1290,24 @@ function check_value($mask, $value)
         // Define reg
         if ($maskraz > 1 && !preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
         if ($maskraz <= 1 && !preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazIfNoYearInMask';
-        //print "x".$maskwithonlyymcode." ".$maskraz;
     }
-    //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";
+    //print "masktri=".$masktri." maskcounter=".$maskcounter." maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";
 
-    // Check we have a number in ($posnumstart+1).', '.dol_strlen($maskcounter)
-    //
+	if (function_exists('mb_strrpos')) {
+		$posnumstart = mb_strrpos($maskwithnocode, $maskcounter, 'UTF-8');
+	}
+	else {
+		$posnumstart = strrpos($maskwithnocode, $maskcounter);
+	}	// Pos of counter in final string (from 0 to ...)
+	if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence';
+
+	// Check we have a number in $value at position ($posnumstart+1).', '.dol_strlen($maskcounter)
+	// TODO
 
     // Check length
     $len = dol_strlen($maskwithnocode);
     if (dol_strlen($value) != $len) $result = -1;
 
-    // Define $maskLike
-    /* seems not used
-    $maskLike = dol_string_nospecial($mask);
-    $maskLike = str_replace("%","_",$maskLike);
-    // Replace protected special codes with matching number of _ as wild card caracter
-    $maskLike = str_replace(dol_string_nospecial('{yyyy}'),'____',$maskLike);
-    $maskLike = str_replace(dol_string_nospecial('{yy}'),'__',$maskLike);
-    $maskLike = str_replace(dol_string_nospecial('{y}'),'_',$maskLike);
-    $maskLike = str_replace(dol_string_nospecial('{mm}'),'__',$maskLike);
-    $maskLike = str_replace(dol_string_nospecial('{dd}'),'__',$maskLike);
-    $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),str_pad("",dol_strlen($maskcounter),"_"),$maskLike);
-    if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",strlen($maskrefclient),"_"),$maskLike);
-	*/
-
     dol_syslog("functions2::check_value result=".$result, LOG_DEBUG);
     return $result;
 }
diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
index 22ec06c8aa6..c7a2d600ede 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -267,7 +267,8 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 	 * 								-2 ErrorCustomerCodeRequired
 	 * 								-3 ErrorCustomerCodeAlreadyUsed
 	 * 								-4 ErrorPrefixRequired
-	 * 								-5 Other (see this->error)
+	 * 								-5 NotConfigured - Setup empty so any value may be ok or not
+	 * 								-6 Other (see this->error)
 	 */
 	public function verif($db, &$code, $soc, $type)
 	{
@@ -297,12 +298,11 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 				$this->error = 'NotConfigured';
 				return -5;
 			}
-
 			$result = check_value($mask, $code);
 			if (is_string($result))
 			{
 				$this->error = $result;
-				return -5;
+				return -6;
 			}
 		}
 
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index b467fdbd366..9d94c6847b7 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -180,7 +180,11 @@ if ($object->id > 0)
 		print '<tr>';
         print '<td class="titlefield">'.$langs->trans("SupplierCode").'</td><td>';
         print $object->code_fournisseur;
-        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+        $tmpcheck = $object->check_codefournisseur();
+        var_dump($tmpcheck);
+        if ($tmpcheck != 0 && $tmpcheck != -5) {
+        	print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+        }
         print '</td>';
         print '</tr>';
 
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index ecb8a3ce764..047edc8cfe2 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -101,7 +101,10 @@ if ($socid > 0)
         print '<tr><td class="titlefield">';
         print $langs->trans('CustomerCode').'</td><td colspan="3">';
         print $object->code_client;
-        if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+        $tmpcheck = $object->check_codeclient();
+        if ($tmpcheck != 0 && $tmpcheck != -5) {
+        	print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+        }
         print '</td></tr>';
     }
 
@@ -110,7 +113,10 @@ if ($socid > 0)
         print '<tr><td class="titlefield">';
         print $langs->trans('SupplierCode').'</td><td colspan="3">';
         print $object->code_fournisseur;
-        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+        $tmpcheck = $object->check_codefournisseur();
+        if ($tmpcheck != 0 && $tmpcheck != -5) {
+        	print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+        }
         print '</td></tr>';
     }
 
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index d79a5c1a9e0..ea121acc4c7 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -2330,7 +2330,10 @@ else
             print '<tr><td>';
             print $langs->trans('CustomerCode').'</td><td>';
             print $object->code_client;
-            if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+            $tmpcheck = $object->check_codeclient();
+            if ($tmpcheck != 0 && $tmpcheck != -5) {
+            	print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+            }
             print '</td>';
             print '</tr>';
         }
@@ -2341,7 +2344,10 @@ else
             print '<tr><td>';
             print $langs->trans('SupplierCode').'</td><td>';
             print $object->code_fournisseur;
-            if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+            $tmpcheck = $object->check_codefournisseur();
+            if ($tmpcheck != 0 && $tmpcheck != -5) {
+            	print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+            }
             print '</td>';
             print '</tr>';
         }
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index ee91363dba1..35b52243804 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3018,6 +3018,8 @@ class Societe extends CommonObject
 	 * 								-2 ErrorCustomerCodeRequired
 	 * 								-3 ErrorCustomerCodeAlreadyUsed
 	 * 								-4 ErrorPrefixRequired
+	 * 								-5 NotConfigured - Setup empty so any value may be ok or not
+	 * 								-6 Other (see this->error)
 	 */
     public function check_codeclient()
 	{
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 0ce28356d90..e9514365c0f 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -130,7 +130,10 @@ if ($object->client)
 	print '<tr><td class="titlefield">';
 	print $langs->trans('CustomerCode').'</td><td colspan="3">';
 	print $object->code_client;
-	if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+	$tmpcheck = $object->check_codeclient();
+	if ($tmpcheck != 0 && $tmpcheck != -5) {
+		print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+	}
 	print '</td></tr>';
 	$sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."facture where fk_soc = ".$socid;
 	$resql = $db->query($sql);
@@ -153,7 +156,10 @@ if ($object->fournisseur)
 	print '<tr><td class="titlefield">';
 	print $langs->trans('SupplierCode').'</td><td colspan="3">';
 	print $object->code_fournisseur;
-	if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+	$tmpcheck = $object->check_codefournisseur();
+	if ($tmpcheck != 0 && $tmpcheck != -5) {
+		print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+	}
 	print '</td></tr>';
 	$sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."commande_fournisseur where fk_soc = ".$socid;
 	$resql = $db->query($sql);
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index d082ae6baa5..05c6cbd2378 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -136,7 +136,10 @@ if ($object->id)
 		print '<tr><td class="titlefield">';
 		print $langs->trans('CustomerCode').'</td><td colspan="3">';
 		print $object->code_client;
-		if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		$tmpcheck = $object->check_codeclient();
+		if ($tmpcheck != 0 && $tmpcheck != -5) {
+			print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		}
 		print '</td></tr>';
 	}
 
@@ -145,7 +148,10 @@ if ($object->id)
 		print '<tr><td class="titlefield">';
 		print $langs->trans('SupplierCode').'</td><td colspan="3">';
 		print $object->code_fournisseur;
-		if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		$tmpcheck = $object->check_codefournisseur();
+		if ($tmpcheck != 0 && $tmpcheck != -5) {
+			print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		}
 		print '</td></tr>';
 	}
 
diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php
index 2e3e3ec4532..63f9ab3b1c6 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -99,7 +99,10 @@ if ($object->id > 0)
         print '<tr><td class="'.$cssclass.'">';
         print $langs->trans('CustomerCode').'</td><td colspan="3">';
         print $object->code_client;
-        if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+        $tmpcheck = $object->check_codeclient();
+        if ($tmpcheck != 0 && $tmpcheck != -5) {
+        	print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+        }
         print '</td></tr>';
     }
 
@@ -108,7 +111,10 @@ if ($object->id > 0)
         print '<tr><td class="'.$cssclass.'">';
         print $langs->trans('SupplierCode').'</td><td colspan="3">';
         print $object->code_fournisseur;
-        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+        $tmpcheck = $object->check_codefournisseur();
+        if ($tmpcheck != 0 && $tmpcheck != -5) {
+        	print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+        }
         print '</td></tr>';
     }
 
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 191f9c4bb2c..52969ef4008 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -174,7 +174,10 @@ if ($result > 0)
         print '<tr><td class="titlefield">';
         print $langs->trans('CustomerCode').'</td><td colspan="3">';
         print $object->code_client;
-        if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+        $tmpcheck = $object->check_codeclient();
+        if ($tmpcheck != 0 && $tmpcheck != -5) {
+        	print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+        }
         print '</td></tr>';
     }
 
@@ -183,7 +186,10 @@ if ($result > 0)
         print '<tr><td class="titlefield">';
         print $langs->trans('SupplierCode').'</td><td colspan="3">';
         print $object->code_fournisseur;
-        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+        $tmpcheck = $object->check_codefournisseur();
+        if ($tmpcheck != 0 && $tmpcheck != -5) {
+        	print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+        }
         print '</td></tr>';
     }
 
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 5894c3245a9..a215b254a55 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -847,7 +847,10 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		print '<tr><td class="titlefield">';
 		print $langs->trans('CustomerCode').'</td><td colspan="2">';
 		print $object->code_client;
-		if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		$tmpcheck = $object->check_codeclient();
+		if ($tmpcheck != 0 && $tmpcheck != -5) {
+			print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		}
 		print '</td></tr>';
 		$sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."facture where fk_soc = ".$socid;
 		$resql = $db->query($sql);
@@ -899,7 +902,10 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		print '<tr><td class="titlefield">';
 		print $langs->trans('SupplierCode').'</td><td colspan="2">';
 		print $object->code_fournisseur;
-		if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		$tmpcheck = $object->check_codefournisseur();
+		if ($tmpcheck != 0 && $tmpcheck != -5) {
+			print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		}
 		print '</td></tr>';
 		$sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."facture where fk_soc = ".$socid;
 		$resql = $db->query($sql);
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index df8e966d0ce..7571ae314ef 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -212,8 +212,10 @@ if ($object->client) {
 	print '<tr><td class="titlefield">';
 	print $langs->trans('CustomerCode').'</td><td colspan="3">';
 	print $object->code_client;
-	if ($object->check_codeclient() != 0)
+	$tmpcheck = $object->check_codeclient();
+	if ($tmpcheck != 0 && $tmpcheck != -5) {
 		print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+	}
 	print '</td></tr>';
 }
 
@@ -221,8 +223,10 @@ if ($object->fournisseur) {
 	print '<tr><td class="titlefield">';
 	print $langs->trans('SupplierCode').'</td><td colspan="3">';
 	print $object->code_fournisseur;
-	if ($object->check_codefournisseur() != 0)
+	$tmpcheck = $object->check_codefournisseur();
+	if ($tmpcheck != 0 && $tmpcheck != -5) {
 		print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+	}
 	print '</td></tr>';
 }
 
diff --git a/htdocs/societe/project.php b/htdocs/societe/project.php
index 1c2604e0e44..94b453e87d9 100644
--- a/htdocs/societe/project.php
+++ b/htdocs/societe/project.php
@@ -99,7 +99,10 @@ if ($socid)
 		print '<tr><td class="titlefield">';
 		print $langs->trans('CustomerCode').'</td><td colspan="3">';
 		print $object->code_client;
-		if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		$tmpcheck = $object->check_codeclient();
+		if ($tmpcheck != 0 && $tmpcheck != -5) {
+			print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		}
 		print '</td></tr>';
 	}
 
@@ -108,7 +111,10 @@ if ($socid)
 		print '<tr><td class="titlefield">';
 		print $langs->trans('SupplierCode').'</td><td colspan="3">';
 		print $object->code_fournisseur;
-		if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		$tmpcheck = $object->check_codefournisseur();
+		if ($tmpcheck != 0 && $tmpcheck != -5) {
+			print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		}
 		print '</td></tr>';
 	}
 
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index 5ff86ff0064..fdba8d6a461 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -193,7 +193,10 @@ if ($id > 0 || !empty($ref))
 		    print '<tr><td class="titlefield">';
 		    print $langs->trans('CustomerCode').'</td><td colspan="3">';
 		    print $object->code_client;
-		    if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		    $tmpcheck = $object->check_codeclient();
+		    if ($tmpcheck != 0 && $tmpcheck != -5) {
+		    	print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		    }
 		    print '</td></tr>';
 		}
 
@@ -202,7 +205,10 @@ if ($id > 0 || !empty($ref))
 		    print '<tr><td class="titlefield">';
 		    print $langs->trans('SupplierCode').'</td><td colspan="3">';
 		    print $object->code_fournisseur;
-		    if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		    $tmpcheck = $object->check_codefournisseur();
+		    if ($tmpcheck != 0 && $tmpcheck != -5) {
+		    	print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		    }
 		    print '</td></tr>';
 		}
 		print '</table>';
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index e7ebae374e2..109e65c5b04 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -213,8 +213,10 @@ if ($object->client) {
 	print '<tr><td class="titlefield">';
 	print $langs->trans('CustomerCode').'</td><td colspan="3">';
 	print $object->code_client;
-	if ($object->check_codeclient() != 0)
+	$tmpcheck = $object->check_codeclient();
+	if ($tmpcheck != 0 && $tmpcheck != -5) {
 		print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+	}
 	print '</td></tr>';
 }
 
@@ -222,8 +224,10 @@ if ($object->fournisseur) {
 	print '<tr><td class="titlefield">';
 	print $langs->trans('SupplierCode').'</td><td colspan="3">';
 	print $object->code_fournisseur;
-	if ($object->check_codefournisseur() != 0)
+	$tmpcheck = $object->check_codefournisseur();
+	if ($tmpcheck != 0 && $tmpcheck != -5) {
 		print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+	}
 	print '</td></tr>';
 }
 
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 40beb75b5e9..8e3b73346b7 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -441,10 +441,10 @@ if ($socid && !$projectid && !$project_ref && $user->rights->societe->lire) {
             print '<tr><td class="titlefield">';
             print $langs->trans('CustomerCode').'</td><td>';
             print $socstat->code_client;
-            if ($socstat->check_codeclient() != 0) {
-                print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+            $tmpcheck = $socstat->check_codeclient();
+            if ($tmpcheck != 0 && $tmpcheck != -5) {
+            	print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
             }
-
             print '</td>';
             print '</tr>';
         }
@@ -453,10 +453,10 @@ if ($socid && !$projectid && !$project_ref && $user->rights->societe->lire) {
         	print '<tr><td class="titlefield">';
         	print $langs->trans('SupplierCode').'</td><td>';
         	print $socstat->code_fournisseur;
-        	if ($socstat->check_codefournisseur() != 0) {
+        	$tmpcheck = $socstat->check_codefournisseur();
+        	if ($tmpcheck != 0 && $tmpcheck != -5) {
         		print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
         	}
-
         	print '</td>';
         	print '</tr>';
         }

From 33f8c53ccabccfb0b549c22e3102cc7e93d97653 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 20 Dec 2020 14:03:10 +0100
Subject: [PATCH 543/888] Fix var_dump

---
 htdocs/fourn/card.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 9d94c6847b7..8b07fea2204 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -181,7 +181,6 @@ if ($object->id > 0)
         print '<td class="titlefield">'.$langs->trans("SupplierCode").'</td><td>';
         print $object->code_fournisseur;
         $tmpcheck = $object->check_codefournisseur();
-        var_dump($tmpcheck);
         if ($tmpcheck != 0 && $tmpcheck != -5) {
         	print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
         }

From 42c4b65f168454013fe9688d260899f9dbbde1e6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 20 Dec 2020 14:34:31 +0100
Subject: [PATCH 544/888] Fix travis

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index bda2a9e9634..af37fe08a8d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -268,7 +268,7 @@ script:
   # Ensure we catch errors
   set -e
   #parallel-lint --exclude htdocs/includes --blame .
-  parallel-lint --exclude dev/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
+  parallel-lint --exclude dev/tools/test/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
   	--exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian \
   	--exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/php-parallel-lint --exclude htdocs/includes/symfony \
   	--exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/maximebf \

From 7fae5ea800403bec1f108ebe2934b60175bbbfb8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 20 Dec 2020 18:21:34 +0100
Subject: [PATCH 545/888] Code clean

---
 htdocs/contrat/list.php                  | 36 ++++++++++++++++++------
 htdocs/core/class/commonobject.class.php |  3 +-
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index bd5b39f717b..ca8ccb9bd7d 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -208,7 +208,7 @@ $contracttmp = new Contrat($db);
 
 $sql = 'SELECT';
 $sql .= " c.rowid, c.ref, c.datec as date_creation, c.tms as date_update, c.date_contrat, c.statut, c.ref_customer, c.ref_supplier, c.note_private, c.note_public,";
-$sql .= ' s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
+$sql .= ' s.rowid as socid, s.nom as name, s.name_alias, s.email, s.town, s.zip, s.fk_pays as country_id, s.client, s.code_client, s.status as company_status, s.logo as company_logo,';
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
 $sql .= " MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") as lower_planned_end_date,";
@@ -263,7 +263,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= " GROUP BY c.rowid, c.ref, c.datec, c.tms, c.date_contrat, c.statut, c.ref_customer, c.ref_supplier, c.note_private, c.note_public,";
-$sql .= ' s.rowid, s.nom, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
+$sql .= ' s.rowid, s.nom, s.name_alias, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client, s.status, s.logo,';
 $sql .= " typent.code,";
 $sql .= " state.code_departement, state.nom";
 // Add fields from extrafields
@@ -341,7 +341,7 @@ if ($socid > 0)
 
 $param = '';
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 if ($sall != '')                $param .= '&sall='.urlencode($sall);
 if ($search_contract != '')     $param .= '&search_contract='.urlencode($search_contract);
 if ($search_name != '')         $param .= '&search_name='.urlencode($search_name);
@@ -596,6 +596,10 @@ if (!empty($arrayfields['status']['checked'])) {
 print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 print "</tr>\n";
 
+$totalarray = array();
+$typenArray = array();
+$cacheCountryIDCode = array();
+
 while ($i < min($num, $limit))
 {
 	$obj = $db->fetch_object($resql);
@@ -608,6 +612,24 @@ while ($i < min($num, $limit))
 	if ($obj->socid > 0) {
 		$result = $socstatic->fetch($obj->socid);
 	}
+	/*$socstatic->id = $obj->socid;
+	$socstatic->name = $obj->name;
+	$socstatic->name_alias = $obj->name_alias;
+	$socstatic->email = $obj->email;
+	$socstatic->status = $obj->company_status;
+	$socstatic->logo = $obj->logo;
+	$socstatic->country_id = $obj->country_id;
+	$socstatic->country_code = '';
+	$socstatic->country_label = '';*/
+	if ($obj->country_id > 0) {
+		if (!isset($cacheCountryIDCode[$obj->country_id]['code'])) {
+			$tmparray = getCountry($obj->country_id, 'all');
+			$cacheCountryIDCode[$obj->country_id] = array('code'=> empty($tmparray['code']) ? '' : $tmparray['code'], 'label' => empty($tmparray['label']) ? '' : $tmparray['label']);
+		}
+		$socstatic->country_code = $cacheCountryIDCode[$obj->country_id]['code'];
+		$socstatic->country_label = $cacheCountryIDCode[$obj->country_id]['label'];
+	}
+
 
 	print '<tr class="oddeven">';
 
@@ -643,9 +665,8 @@ while ($i < min($num, $limit))
 	if (!empty($arrayfields['s.nom']['checked']))
 	{
 		print '<td>';
-		//print '<a href="../comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a>';
-		if ($obj->socid > 0)
-		{
+		if ($obj->socid > 0) {
+			// TODO Use a cache for this string
 			print $socstatic->getNomUrl(1, '');
 		}
 		print '</td>';
@@ -680,8 +701,7 @@ while ($i < min($num, $limit))
 	if (!empty($arrayfields['country.code_iso']['checked']))
 	{
 		print '<td class="center">';
-		$tmparray = getCountry($obj->fk_pays, 'all');
-		print $tmparray['label'];
+		print $socstatic->country_label;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 760b9632cb6..bfdea016ea6 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3292,7 +3292,7 @@ abstract class CommonObject
 
 	/**
 	 *	Fetch array of objects linked to current object (object of enabled modules only). Links are loaded into
-	 *		this->linkedObjectsIds array and
+	 *		this->linkedObjectsIds array +
 	 *		this->linkedObjects array if $loadalsoobjects = 1
 	 *  Possible usage for parameters:
 	 *  - all parameters empty -> we look all link to current object (current object can be source or target)
@@ -3405,6 +3405,7 @@ abstract class CommonObject
 				{
 					// Parse element/subelement (ex: project_task, cabinetmed_consultation, ...)
 					$module = $element = $subelement = $objecttype;
+					$regs = array();
 					if ($objecttype != 'supplier_proposal' && $objecttype != 'order_supplier' && $objecttype != 'invoice_supplier'
 						&& preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs))
 					{

From 0a1387e673a1fad738923bb975c6d6593c85baca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 20 Dec 2020 18:41:54 +0100
Subject: [PATCH 546/888] Debug v13

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 00fa4b8f0b7..713da28996e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4230,7 +4230,7 @@ function print_liste_field_titre($name, $file = "", $field = "", $begin = "", $m
 /**
  *	Get title line of an array
  *
- *	@param	string	$name        		Translation key of field
+ *	@param	string	$name        		Translation key of field to show or complete HTML string to show
  *	@param	int		$thead		 		0=To use with standard table format, 1=To use inside <thead><tr>, 2=To use with <div>
  *	@param	string	$file        		Url used when we click on sort picto
  *	@param	string	$field       		Field to use for new sorting. Empty if this field is not sortable. Example "t.abc" or "t.abc,t.def"
@@ -4277,7 +4277,7 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 	}
 	$out .= '<'.$tag.' class="'.$prefix.$liste_titre.'" '.$moreattrib;
 	//$out .= (($field && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && preg_match('/^[a-zA-Z_0-9\s\.\-:&;]*$/', $name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '');
-	$out .= ($name && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '';
+	$out .= ($name && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && empty($forcenowrapcolumntitle) && !dol_textishtml($name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '';
 	$out .= '>';
 
 	if (empty($thead) && $field && empty($disablesortlink))    // If this is a sort field

From d3bd709ad6fe1e559526633f92d8104e13443357 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 20 Dec 2020 18:51:17 +0100
Subject: [PATCH 547/888] Fix phpcs

---
 dev/setup/codesniffer/ruleset.xml |  2 +-
 htdocs/admin/sms.php              |  1 -
 htdocs/install/fileconf.php       | 14 +++++++-------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml
index bf283993628..db4945a654c 100644
--- a/dev/setup/codesniffer/ruleset.xml
+++ b/dev/setup/codesniffer/ruleset.xml
@@ -6,7 +6,7 @@
 
 	<exclude-pattern type="relative">build/html</exclude-pattern>
 	<exclude-pattern type="relative">build/aps</exclude-pattern>
-	<exclude-pattern type="relative">dev/namespacemig</exclude-pattern>
+	<exclude-pattern type="relative">dev/tools/test/namespacemig</exclude-pattern>
 	<exclude-pattern type="relative">dev/initdata/dbf/includes</exclude-pattern>
 	<exclude-pattern type="relative">documents</exclude-pattern>
 	<exclude-pattern type="relative">htdocs/core/class/lessc.class.php</exclude-pattern>
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index 9b333d7b4f1..d2cf26a0c9a 100644
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -161,7 +161,6 @@ if (!count($listofmethods)) {
 }
 
 if ($action == 'edit') {
-
 	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 713f3132eaf..eccc22de899 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -408,13 +408,13 @@ if (!empty($force_install_noedit)) {
                    id="db_pass" autocomplete="off"
 			       name="db_pass"
 			       value="<?php
-				// If $force_install_databasepass is on, we don't want to set password, we just show '***'. Real value will be extracted from the forced install file at step1.
-				$autofill = ((!empty($_SESSION['dol_save_pass'])) ? $_SESSION['dol_save_pass'] : str_pad('', strlen($force_install_databasepass), '*'));
-				if (!empty($dolibarr_main_prod)) {
-					$autofill = '';
-				}
-				print dol_escape_htmltag($autofill);
-				?>"
+					// If $force_install_databasepass is on, we don't want to set password, we just show '***'. Real value will be extracted from the forced install file at step1.
+					$autofill = ((!empty($_SESSION['dol_save_pass'])) ? $_SESSION['dol_save_pass'] : str_pad('', strlen($force_install_databasepass), '*'));
+					if (!empty($dolibarr_main_prod)) {
+						$autofill = '';
+					}
+					print dol_escape_htmltag($autofill);
+					?>"
 				<?php if ($force_install_noedit == 2 && $force_install_databasepass !== null) { print ' disabled'; } ?>
 			>
 		</td>

From 5dc6f5b89f670d7b6f4e15987f09563befdc3fd0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Dec 2020 01:33:06 +0100
Subject: [PATCH 548/888] Prepare 13.0

---
 htdocs/core/boxes/box_scheduled_jobs.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/boxes/box_scheduled_jobs.php b/htdocs/core/boxes/box_scheduled_jobs.php
index 23d520e9a8a..d981432b4d2 100644
--- a/htdocs/core/boxes/box_scheduled_jobs.php
+++ b/htdocs/core/boxes/box_scheduled_jobs.php
@@ -117,7 +117,7 @@ class box_scheduled_jobs extends ModeleBoxes
 								$cronstatic->getNomUrl(1),
 								$cronstatic->datelastrun,
 								$cronstatic->status,
-								$cronstatic->getLibStatut(2)
+								$cronstatic->getLibStatut(3)
 							);
 							$line++;
 						}
@@ -135,18 +135,18 @@ class box_scheduled_jobs extends ModeleBoxes
 						$cronstatic->getNomUrl(1),
 						$cronstatic->datenextrun,
 						$cronstatic->status,
-						$cronstatic->getLibStatut(2)
+						$cronstatic->getLibStatut(3)
 					);
 				}
 
 				foreach ($resultarray as $line => $value) {
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="left"',
+						'td' => 'class="tdoverflowmax100"',
 						'text' => $resultarray[$line][0]
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="left"',
+						'td' => 'class="nowraponall"',
 						'textnoformat' => $resultarray[$line][1]
 					);
 					$this->info_box_contents[$line][] = array(
@@ -160,12 +160,12 @@ class box_scheduled_jobs extends ModeleBoxes
 					$line++;
 				}
 				$this->info_box_contents[$line][] = array(
-					'td' => 'class="left" colspan="2"',
+					'td' => 'class="tdoverflowmax200" colspan="2"',
 					'text' => $langs->trans("NumberScheduledJobError")
 				);
 				$this->info_box_contents[$line][] = array(
 					'td' => 'class="right" colspan="2"',
-					'textnoformat' => ($nbjobsinerror ? '<span class="error"><a href="'.DOL_URL_ROOT.'/cron/list.php?search_lastresult='.urlencode('<>0').'">'.$nbjobsinerror.'</a></span>'.img_error() : '<span class="opacitymedium">'.$langs->trans("None").'<span>')
+					'textnoformat' => ($nbjobsinerror ? '<span class="error"><a href="'.DOL_URL_ROOT.'/cron/list.php?search_lastresult='.urlencode('<>0').'">'.$nbjobsinerror.img_error() : '<span class="opacitymedium">'.$langs->trans("None").'</span></a></span>')
 				);
 			} else {
 				$this->info_box_contents[0][0] = array(

From 67de45b8d725ede8e90c869f787bea2291a8642c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Dec 2020 01:40:15 +0100
Subject: [PATCH 549/888] Fix responsive

---
 htdocs/admin/system/database.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index 8681efa08ef..3b712b489f5 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -45,15 +45,15 @@ print load_fiche_titre($langs->trans("InfoDatabase"), '', 'title_setup');
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Database").'</td></tr>'."\n";
-print '<tr '.$bc[0].'><td width="300">'.$langs->trans("Version").'</td><td>'.$db::LABEL.' '.$db->getVersion().'</td></tr>'."\n";
-print '<tr '.$bc[1].'><td width="300">'.$langs->trans("DatabaseServer").'</td><td>'.$conf->db->host.'</td></tr>'."\n";
-print '<tr '.$bc[0].'><td width="300">'.$langs->trans("DatabasePort").'</td><td>'.(empty($conf->db->port) ? $langs->trans("Default") : $conf->db->port).'</td></tr>'."\n";
-print '<tr '.$bc[1].'><td width="300">'.$langs->trans("DatabaseName").'</td><td>'.$conf->db->name.'</td></tr>'."\n";
-print '<tr '.$bc[0].'><td width="300">'.$langs->trans("DriverType").'</td><td>'.$conf->db->type.($db->getDriverInfo() ? ' ('.$db->getDriverInfo().')' : '').'</td></tr>'."\n";
-print '<tr '.$bc[1].'><td width="300">'.$langs->trans("User").'</td><td>'.$conf->db->user.'</td></tr>'."\n";
-print '<tr '.$bc[0].'><td width="300">'.$langs->trans("Password").'</td><td>'.preg_replace('/./i', '*', $dolibarr_main_db_pass).'</td></tr>'."\n";
-print '<tr '.$bc[1].'><td width="300">'.$langs->trans("DBStoringCharset").'</td><td>'.$db->getDefaultCharacterSetDatabase().'</td></tr>'."\n";
-print '<tr '.$bc[0].'><td width="300">'.$langs->trans("DBSortingCharset").'</td><td>'.$db->getDefaultCollationDatabase().'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("Version").'</td><td>'.$db::LABEL.' '.$db->getVersion().'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("DatabaseServer").'</td><td>'.$conf->db->host.'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("DatabasePort").'</td><td>'.(empty($conf->db->port) ? $langs->trans("Default") : $conf->db->port).'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("DatabaseName").'</td><td>'.$conf->db->name.'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("DriverType").'</td><td>'.$conf->db->type.($db->getDriverInfo() ? ' ('.$db->getDriverInfo().')' : '').'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("User").'</td><td>'.$conf->db->user.'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("Password").'</td><td>'.preg_replace('/./i', '*', $dolibarr_main_db_pass).'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("DBStoringCharset").'</td><td>'.$db->getDefaultCharacterSetDatabase().'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("DBSortingCharset").'</td><td>'.$db->getDefaultCollationDatabase().'</td></tr>'."\n";
 print '</table>';
 print '</div>';
 
@@ -62,7 +62,7 @@ print '<br>';
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Tables").'</td></tr>'."\n";
-print '<tr '.$bc[0].'><td width="300"><a href="'.DOL_URL_ROOT.'/admin/system/database-tables.php?mainmenu=home">'.$langs->trans("List").'</a></td></tr>'."\n";
+print '<tr class="oddeven"><td width="300"><a href="'.DOL_URL_ROOT.'/admin/system/database-tables.php?mainmenu=home">'.$langs->trans("List").'</a></td></tr>'."\n";
 print '</table>';
 print '</div>';
 
@@ -104,7 +104,7 @@ if (!count($listofvars) && !count($listofstatus))
 			print '<td>';
 			print $param;
 			print '</td>';
-			print '<td>';
+			print '<td class="wordbreak">';
 			$show = 0; $text = '';
 			foreach ($arraytest as $key => $val)
 			{

From f8ff8c63b6f3df6ef1989f5b5f5743778da86487 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Dec 2020 01:50:16 +0100
Subject: [PATCH 550/888] Update init demo

---
 dev/initdemo/README              | 5 +++++
 dev/initdemo/initdemopassword.sh | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dev/initdemo/README b/dev/initdemo/README
index 89e21b9337a..5e0f610d82e 100644
--- a/dev/initdemo/README
+++ b/dev/initdemo/README
@@ -12,6 +12,11 @@ The script initdemo.sh will erase current database with data into mysqldump_doli
 Do a chmod 700 initdemo.sh
 then run ./initdemo.sh to launch Graphic User Interface.
 
+After loading the demo files, admin login may be:
+- admin / admin
+or
+- admin / adminadmin
+
 
 *** Save demo
 
diff --git a/dev/initdemo/initdemopassword.sh b/dev/initdemo/initdemopassword.sh
index d5aa9c1ef0e..84d50f0dcc3 100755
--- a/dev/initdemo/initdemopassword.sh
+++ b/dev/initdemo/initdemopassword.sh
@@ -53,7 +53,7 @@ then
 	DIALOG="$DIALOG --ascii-lines"
 	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
 	trap "rm -f $fichtemp" 0 1 2 5 15
-	$DIALOG --title "Init Dolibarr with demo values" --clear \
+	$DIALOG --title "Reset login password" --clear \
 	        --inputbox "Mysql database name :" 16 55 dolibarrdemo 2> $fichtemp
 	valret=$?
 	case $valret in
@@ -70,7 +70,7 @@ then
 	DIALOG=${DIALOG=dialog}
 	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
 	trap "rm -f $fichtemp" 0 1 2 5 15
-	$DIALOG --title "Init Dolibarr with demo values" --clear \
+	$DIALOG --title "Reset login password" --clear \
 	        --inputbox "Mysql port (ex: 3306):" 16 55 3306 2> $fichtemp
 	
 	valret=$?
@@ -128,7 +128,7 @@ then
 
 	# ---------------------------- confirmation
 	DIALOG=${DIALOG=dialog}
-	$DIALOG --title "Init demo login with demo values" --clear \
+	$DIALOG --title "Reset login password" --clear \
 	        --yesno "Do you confirm ? \n Mysql database : '$base' \n Mysql port : '$port' \n Demo login: '$demologin' \n Demo password : '$demopass'" 15 55
 	
 	case $? in

From 0a19f3cf5bfa63f51a3f6ee575ea66426f1dd6dd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Dec 2020 02:27:05 +0100
Subject: [PATCH 551/888] css

---
 htdocs/core/boxes/box_scheduled_jobs.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/boxes/box_scheduled_jobs.php b/htdocs/core/boxes/box_scheduled_jobs.php
index d981432b4d2..0fc63126ec9 100644
--- a/htdocs/core/boxes/box_scheduled_jobs.php
+++ b/htdocs/core/boxes/box_scheduled_jobs.php
@@ -141,7 +141,7 @@ class box_scheduled_jobs extends ModeleBoxes
 
 				foreach ($resultarray as $line => $value) {
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="tdoverflowmax100"',
+						'td' => 'class="tdoverflowmax200"',
 						'text' => $resultarray[$line][0]
 					);
 
@@ -154,18 +154,18 @@ class box_scheduled_jobs extends ModeleBoxes
 						'textnoformat' => (empty($resultarray[$line][2]) ? '' : $form->textwithpicto(dol_print_date($resultarray[$line][2], "dayhoursec"), $langs->trans("CurrentTimeZone")))
 					);
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right" ',
+						'td' => 'class="center" ',
 						'textnoformat' => $resultarray[$line][4]
 					);
 					$line++;
 				}
 				$this->info_box_contents[$line][] = array(
-					'td' => 'class="tdoverflowmax200" colspan="2"',
+					'td' => 'class="tdoverflowmax300" colspan="3"',
 					'text' => $langs->trans("NumberScheduledJobError")
 				);
 				$this->info_box_contents[$line][] = array(
-					'td' => 'class="right" colspan="2"',
-					'textnoformat' => ($nbjobsinerror ? '<span class="error"><a href="'.DOL_URL_ROOT.'/cron/list.php?search_lastresult='.urlencode('<>0').'">'.$nbjobsinerror.img_error() : '<span class="opacitymedium">'.$langs->trans("None").'</span></a></span>')
+					'td' => 'class="center"',
+					'textnoformat' => (!$nbjobsinerror ? '<span class="error"><a href="'.DOL_URL_ROOT.'/cron/list.php?search_lastresult='.urlencode('<>0').'">'.$nbjobsinerror.img_error() : '<div class="center badge-status4">0</div></a></span>')
 				);
 			} else {
 				$this->info_box_contents[0][0] = array(

From 6937ab75fa5b696530f73009774cb9e6a2c0fe6b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Dec 2020 02:31:19 +0100
Subject: [PATCH 552/888] Fix test

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

diff --git a/htdocs/core/boxes/box_scheduled_jobs.php b/htdocs/core/boxes/box_scheduled_jobs.php
index 0fc63126ec9..01dd86a999d 100644
--- a/htdocs/core/boxes/box_scheduled_jobs.php
+++ b/htdocs/core/boxes/box_scheduled_jobs.php
@@ -165,7 +165,7 @@ class box_scheduled_jobs extends ModeleBoxes
 				);
 				$this->info_box_contents[$line][] = array(
 					'td' => 'class="center"',
-					'textnoformat' => (!$nbjobsinerror ? '<span class="error"><a href="'.DOL_URL_ROOT.'/cron/list.php?search_lastresult='.urlencode('<>0').'">'.$nbjobsinerror.img_error() : '<div class="center badge-status4">0</div></a></span>')
+					'textnoformat' => ($nbjobsinerror ? '<span class="error"><a href="'.DOL_URL_ROOT.'/cron/list.php?search_lastresult='.urlencode('<>0').'">'.$nbjobsinerror.img_error() : '<div class="center badge-status4">0</div></a></span>')
 				);
 			} else {
 				$this->info_box_contents[0][0] = array(

From abbe340723409edde7ffebb3ff02876e85a1ba2b Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Mon, 21 Dec 2020 12:24:45 +0100
Subject: [PATCH 553/888] FIX missing reception link in stock movement list.

---
 htdocs/product/stock/class/mouvementstock.class.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index a23846c3e08..2429a4c09c5 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -981,6 +981,10 @@ class MouvementStock extends CommonObject
 				require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 				$origin = new User($this->db);
 				break;
+			case 'reception':
+				require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php';
+				$origin = new Reception($this->db);
+				break;
 
 			default:
 				if ($origintype)

From 0195c11437293088131a9e475a760b06ede8ba22 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Dec 2020 12:58:03 +0100
Subject: [PATCH 554/888] Add missing field required for real funnel of
 prospection.

---
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 3 +++
 htdocs/install/mysql/tables/llx_projet.sql       | 1 +
 2 files changed, 4 insertions(+)

diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index e391787479d..309d4d4b170 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -552,3 +552,6 @@ INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES
 -- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT  'box_scheduled_jobs.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_scheduled_jobs.php' AND entity = 1);
 
 ALTER TABLE llx_product_fournisseur_price ADD COLUMN packaging varchar(64);
+
+ALTER TABLE llx_projet ADD COLUMN fk_opp_status_end integer DEFAULT NULL;
+
diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql
index a36adb3a672..1b95444b3a1 100644
--- a/htdocs/install/mysql/tables/llx_projet.sql
+++ b/htdocs/install/mysql/tables/llx_projet.sql
@@ -35,6 +35,7 @@ create table llx_projet
   fk_statut        integer DEFAULT 0 NOT NULL,	-- open or close
   fk_opp_status    integer DEFAULT NULL,	        -- if project is used to manage opportunities
   opp_percent	   double(5,2),
+  fk_opp_status_end   integer DEFAULT NULL,	        -- if project is used to manage opportunities (the opportunity status the project has when set to lose)
   date_close       datetime DEFAULT NULL,    
   fk_user_close    integer DEFAULT NULL,
   note_private     text,

From 7d0e71165a47f4748d4b70cd30975b71f4f42126 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Dec 2020 14:40:27 +0100
Subject: [PATCH 555/888] Clean code

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

diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 4495c5ae50d..5fcc7b00c91 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -891,7 +891,6 @@ class DolGraph
 			$color1 = sprintf("%02x%02x%02x", $this->bgcolorgrid[0], $this->bgcolorgrid[0], $this->bgcolorgrid[2]);
 			$color2 = sprintf("%02x%02x%02x", $this->bgcolorgrid[0], $this->bgcolorgrid[1], $this->bgcolorgrid[2]);
 			$this->stringtoshow .= ', grid: { hoverable: true, backgroundColor: { colors: ["#' . $color1 . '", "#' . $color2 . '"] }, borderWidth: 1, borderColor: \'#e6e6e6\', tickColor  : \'#e6e6e6\' }' . "\n";
-			//$this->stringtoshow.=', shadowSize: 20'."\n";    TODO Uncommet this
 			$this->stringtoshow .= '});' . "\n";
 			$this->stringtoshow .= '}' . "\n";
 		}

From d05f9c42f5317df9a44b6c83896df8ecba09c526 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Dec 2020 14:43:23 +0100
Subject: [PATCH 556/888] Fix bad dir

---
 htdocs/salaries/list.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 26477900be2..3e2694cf445 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -154,9 +154,7 @@ if (empty($reshook))
 	// Mass actions
 	$objectclass = 'PaymentSalary';
 	$objectlabel = 'SalariesPayments';
-	$permissiontoread = $user->rights->salaries->read;
-	$permissiontodelete = $user->rights->salaries->delete;
-	$uploaddir = $conf->bom->dir_output;
+	$uploaddir = $conf->salaries->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
 	// Validate records

From eebdd0bd7a13e160de4de89015a220b8ba400b96 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Dec 2020 14:54:20 +0100
Subject: [PATCH 557/888] Fix missing date value

---
 htdocs/salaries/list.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 3e2694cf445..b8a0ba69ef7 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -306,7 +306,7 @@ print '<input class="flat" type="text" size="6" name="search_user" value="'.$db-
 print '</td>';
 // Label
 print '<td class="liste_titre"><input type="text" class="flat width150" name="search_label" value="'.$db->escape($search_label).'"></td>';
-// Date
+// Date payment
 print '<td class="liste_titre center">';
 print '<div class="nowrap">';
 print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
@@ -315,6 +315,9 @@ print '<div class="nowrap">';
 print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 print '</div>';
 print '</td>';
+// Date value
+print '<td class="liste_titre center">';
+print '</td>';
 // Type
 print '<td class="liste_titre left">';
 $form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16);
@@ -350,7 +353,8 @@ print '<tr class="liste_titre">';
 print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "s.rowid", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "u.rowid", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "s.label", "", $param, 'class="left"', $sortfield, $sortorder);
-print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "s.datep,s.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "s.datep,s.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
+print_liste_field_titre("DateValue", $_SERVER["PHP_SELF"], "s.datev,s.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
 print_liste_field_titre("PaymentMode", $_SERVER["PHP_SELF"], "type", "", $param, 'class="left"', $sortfield, $sortorder);
 if (!empty($conf->banque->enabled)) print_liste_field_titre("BankAccount", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "s.amount", "", $param, 'class="right"', $sortfield, $sortorder);
@@ -419,6 +423,10 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
 	if (!$i) $totalarray['nbfield']++;
 
+	// Date value
+	print '<td class="center">'.dol_print_date($db->jdate($obj->datev), 'day')."</td>\n";
+	if (!$i) $totalarray['nbfield']++;
+
 	// Type
 	print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
 	if (!$i) $totalarray['nbfield']++;

From 14223d74bd9a26042d5ff512b66305594222f4a8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Dec 2020 15:00:29 +0100
Subject: [PATCH 558/888] Fix css

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

diff --git a/htdocs/core/lib/salaries.lib.php b/htdocs/core/lib/salaries.lib.php
index c11e37b7aaa..f4662f43991 100644
--- a/htdocs/core/lib/salaries.lib.php
+++ b/htdocs/core/lib/salaries.lib.php
@@ -50,7 +50,7 @@ function salaries_prepare_head($object)
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/salaries/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge ">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 

From cba10bbd4d17e704345b0743c1d6818d4837f42d Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Mon, 21 Dec 2020 15:18:55 +0100
Subject: [PATCH 559/888] FIX: create form variant

https://github.com/Dolibarr/dolibarr/issues/15759
---
 htdocs/variants/create.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/variants/create.php b/htdocs/variants/create.php
index 84530e01cb5..ff1ed1be127 100644
--- a/htdocs/variants/create.php
+++ b/htdocs/variants/create.php
@@ -70,7 +70,7 @@ print dol_get_fiche_head();
 
 print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="add">';
+print '<input type="hidden" name="action" value="create">';
 print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
 ?>

From 3deed4678ce69e6a9035f6ec91861b3588ea8346 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 21 Dec 2020 15:23:04 +0100
Subject: [PATCH 560/888] fix: reslter API need to have correct params as
 comment

---
 .../societe/class/api_thirdparties.class.php  | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 7a793b04a8c..b4ae02cd532 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -20,6 +20,7 @@
 
 use Luracast\Restler\RestException;
 
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
 /**
  * API class for thirdparties
@@ -51,7 +52,6 @@ class Thirdparties extends DolibarrApi
 		global $db, $conf;
 		$this->db = $db;
 
-		require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 		require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
@@ -69,7 +69,7 @@ class Thirdparties extends DolibarrApi
 	 * Return an array with thirdparty informations
 	 *
 	 * @param 	int 	$id Id of third party to load
-	 * @return 	Object Cleaned Societe object
+	 * @return 	array|mixed Cleaned Societe object
 	 *
 	 * @throws 	RestException
 	 */
@@ -84,7 +84,7 @@ class Thirdparties extends DolibarrApi
 	 * Return an array with thirdparty informations
 	 *
 	 * @param string    $email  Email of third party to load
-	 * @return Object Cleaned Societe object
+	 * @return array|mixed Cleaned Societe object
 	 *
 	 * @url     GET email/{email}
 	 *
@@ -101,7 +101,7 @@ class Thirdparties extends DolibarrApi
 	 * Return an array with thirdparty informations
 	 *
 	 * @param string    $barcode  Barcode of third party to load
-	 * @return Object Cleaned Societe object
+	 * @return array|mixed Cleaned Societe object
 	 *
 	 * @url     GET barcode/{barcode}
 	 *
@@ -247,7 +247,7 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @param int   $id             Id of thirdparty to update
 	 * @param array $request_data   Datas
-	 * @return Object|boolean
+	 * @return array|mixed|boolean
 	 */
 	public function put($id, $request_data = null)
 	{
@@ -1190,7 +1190,7 @@ class Thirdparties extends DolibarrApi
 	 * @param int  $id ID of thirdparty
 	 * @param array $request_data Request data
 	 *
-	 * @return object  BankAccount of thirdparty
+	 * @return array|mixed  BankAccount of thirdparty
 	 *
 	 * @url POST {id}/bankaccounts
 	 */
@@ -1233,7 +1233,7 @@ class Thirdparties extends DolibarrApi
 	 * @param int  $bankaccount_id ID of CompanyBankAccount
 	 * @param array $request_data Request data
 	 *
-	 * @return object  BankAccount of thirdparty
+	 * @return array|mixed  BankAccount of thirdparty
 	 *
 	 * @url PUT {id}/bankaccounts/{bankaccount_id}
 	 */
@@ -1389,7 +1389,7 @@ class Thirdparties extends DolibarrApi
 	 * @param int $id ID of thirdparty
 	 * @param string $site Site key
 	 *
-	 * @return SocieteAccount[]
+	 * @return array|mixed
 	 * @throws RestException 401 Unauthorized: User does not have permission to read thirdparties
 	 * @throws RestException 404 Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
 	 *
@@ -1461,7 +1461,7 @@ class Thirdparties extends DolibarrApi
 	 * @param int $id ID of thirdparty
 	 * @param array $request_data Request data
 	 *
-	 * @return SocieteAccount
+	 * @return array|mixed
 	 *
 	 * @throws RestException 401 Unauthorized: User does not have permission to read thirdparties
 	 * @throws RestException 409 Conflict: A SocieteAccount entity (gateway) already exists for this company and site.
@@ -1519,7 +1519,7 @@ class Thirdparties extends DolibarrApi
 	 * @param string $site Site key
 	 * @param array $request_data Request data
 	 *
-	 * @return SocieteAccount
+	 * @return array|mixed
 	 *
 	 * @throws RestException 401 Unauthorized: User does not have permission to read thirdparties
 	 * @throws RestException 422 Unprocessable Entity: You must pass the site attribute in your request data !
@@ -1599,7 +1599,7 @@ class Thirdparties extends DolibarrApi
 	 * @param string  $site Site key
 	 * @param array $request_data Request data
 	 *
-	 * @return SocieteAccount
+	 * @return array|mixed
 	 *
 	 * @throws RestException 401 Unauthorized: User does not have permission to read thirdparties
 	 * @throws RestException 404 Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
@@ -1733,7 +1733,7 @@ class Thirdparties extends DolibarrApi
 	 * Clean sensible object datas
 	 *
 	 * @param   Object  $object     Object to clean
-	 * @return  Object              Object with cleaned properties
+	 * @return  array|mixed         Object with cleaned properties
 	 */
 	protected function _cleanObjectDatas($object)
 	{
@@ -1806,7 +1806,7 @@ class Thirdparties extends DolibarrApi
 	 * @param    string	$idprof6		Prof id 6 of third party (Warning, this can return several records)
 	 * @param    string	$email   		Email of third party (Warning, this can return several records)
 	 * @param    string	$ref_alias  Name_alias of third party (Warning, this can return several records)
-	 * @return Object cleaned Societe object
+	 * @return array|mixed cleaned Societe object
 	 *
 	 * @throws RestException
 	 */

From 4d32529e66352f88f59e5bd90a9ff4f2431cd499 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 21 Dec 2020 15:25:15 +0100
Subject: [PATCH 561/888] include

---
 htdocs/societe/class/api_thirdparties.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index b4ae02cd532..81a1c167a02 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -20,8 +20,6 @@
 
 use Luracast\Restler\RestException;
 
-require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-
 /**
  * API class for thirdparties
  *
@@ -52,6 +50,7 @@ class Thirdparties extends DolibarrApi
 		global $db, $conf;
 		$this->db = $db;
 
+		require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 		require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';

From 94cf393f7f4a68acf676d44fb620d600f942f055 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Mon, 21 Dec 2020 15:43:45 +0100
Subject: [PATCH 562/888] Update combinations.php

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

diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 3a2936d0df5..24da596f3c2 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -227,7 +227,7 @@ if (($action == 'add' || $action == 'create') && empty($massaction) && !GETPOST(
 		$db->commit();
 		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 	}
-} elseif ($valueid > 0) {
+} elseif ($action === 'update' && $valueid > 0) {
 	if ($prodcomb->fetch($valueid) < 0) {
 		dol_print_error($db, $langs->trans('ErrorRecordNotFound'));
 		exit();

From 8d901d03fd8bbf3243944883de81c43a299b3b84 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Dec 2020 16:01:47 +0100
Subject: [PATCH 563/888] Fix link

---
 htdocs/compta/accounting-files.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index cc9abb8d594..734d21b1c87 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -529,7 +529,7 @@ print '<span class="opacitymedium">'.$langs->trans("ExportAccountingSourceDocHel
 print '<br>';
 
 print $langs->trans("ReportPeriod").': '.$form->selectDate($date_start, 'date_start', 0, 0, 0, "", 1, 1, 0);
-print ' - '.$form->selectDate($date_stop, 'date_stop', 0, 0, 0, "", 1, 1, 0)."\n</a>";
+print ' - '.$form->selectDate($date_stop, 'date_stop', 0, 0, 0, "", 1, 1, 0)."\n";
 
 // Export is for current company only
 if (!empty($conf->multicompany->enabled) && is_object($mc))
@@ -560,7 +560,7 @@ $listofchoices = array(
 );
 foreach ($listofchoices as $choice => $val) {
 	$checked = (((!GETPOSTISSET('search') && $action != 'searchfiles') || GETPOST($choice)) ? ' checked="checked"' : '');
-	print '<div class="paddingleft inline-block marginrightonly"><input type="checkbox" name="'.$choice.'" value="1"'.$checked.'> '.$langs->trans($val['label']).'</div>';
+	print '<div class="paddingleft inline-block marginrightonly"><input type="checkbox" id="'.$choice.'" name="'.$choice.'" value="1"'.$checked.'> <label for="'.$choice.'">'.$langs->trans($val['label']).'</label></div>';
 }
 
 print '<input class="button" type="submit" name="search" value="'.$langs->trans("Search").'">';

From 4ca6e38f5f08e4ceea6a5ec564b1e09c5524c699 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Mon, 21 Dec 2020 16:07:46 +0100
Subject: [PATCH 564/888] FIX variant api code v13+

Better clean code
---
 htdocs/product/class/api_products.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index f7406692f8d..189161712d5 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -1514,6 +1514,7 @@ class Products extends DolibarrApi
 		foreach ($combinations as $key => $combination) {
 			$prodc2vp = new ProductCombination2ValuePair($this->db);
 			$combinations[$key]->attributes = $prodc2vp->fetchByFkCombination((int) $combination->id);
+			$combinations[$key] = $this->_cleanObjectDatas($combinations[$key]);
 		}
 
 		return $combinations;
@@ -1547,6 +1548,7 @@ class Products extends DolibarrApi
 		foreach ($combinations as $key => $combination) {
 			$prodc2vp = new ProductCombination2ValuePair($this->db);
 			$combinations[$key]->attributes = $prodc2vp->fetchByFkCombination((int) $combination->id);
+			$combinations[$key] = $this->_cleanObjectDatas($combinations[$key]);
 		}
 
 		return $combinations;
@@ -1754,7 +1756,7 @@ class Products extends DolibarrApi
 		unset($object->libelle);
 		unset($object->product_id_already_linked);
 		unset($object->reputations);
-
+		unset($object->db);
 		unset($object->name);
 		unset($object->firstname);
 		unset($object->lastname);

From 4bc0b46556ec2385982c78bc7bdc0a195fb8b47b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Dec 2020 17:33:57 +0100
Subject: [PATCH 565/888] css

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

diff --git a/htdocs/core/boxes/box_scheduled_jobs.php b/htdocs/core/boxes/box_scheduled_jobs.php
index 01dd86a999d..2ac81c80d16 100644
--- a/htdocs/core/boxes/box_scheduled_jobs.php
+++ b/htdocs/core/boxes/box_scheduled_jobs.php
@@ -165,7 +165,7 @@ class box_scheduled_jobs extends ModeleBoxes
 				);
 				$this->info_box_contents[$line][] = array(
 					'td' => 'class="center"',
-					'textnoformat' => ($nbjobsinerror ? '<span class="error"><a href="'.DOL_URL_ROOT.'/cron/list.php?search_lastresult='.urlencode('<>0').'">'.$nbjobsinerror.img_error() : '<div class="center badge-status4">0</div></a></span>')
+					'textnoformat' => ($nbjobsinerror ? '<a href="'.DOL_URL_ROOT.'/cron/list.php?search_lastresult='.urlencode('<>0').'"><div class="badge badge-danger"><i class="fa fa-exclamation-triangle"></i> '.$nbjobsinerror.'</div></a>' : '<div class="center badge-status4">0</div>')
 				);
 			} else {
 				$this->info_box_contents[0][0] = array(

From dfb632f2d535b0ef088d4716dfc35776009df624 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Dec 2020 17:56:31 +0100
Subject: [PATCH 566/888] Fix phpunit

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

diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index 4e3ce29f69e..98311d093cd 100644
--- a/htdocs/core/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -129,7 +129,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 	$localtax1_type = 0;
 	$localtax2_type = 0;
 
-	if (is_array($localtaxes_array)) {
+	if (is_array($localtaxes_array) && count($localtaxes_array)) {
 		$localtax1_type = $localtaxes_array[0];
 		$localtax1_rate = $localtaxes_array[1];
 		$localtax2_type = $localtaxes_array[2];

From 48dfc90c8b6620b01427112a76eb42a5ed0b9d36 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Dec 2020 18:06:02 +0100
Subject: [PATCH 567/888] Update create.php

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

diff --git a/htdocs/variants/create.php b/htdocs/variants/create.php
index ff1ed1be127..e37548f39f3 100644
--- a/htdocs/variants/create.php
+++ b/htdocs/variants/create.php
@@ -29,7 +29,7 @@ $action = GETPOST('action', 'alpha');
  * Actions
  */
 
-if ($action == 'create') {
+if ($action == 'add') {
 	if (empty($ref) || empty($label)) {
 		setEventMessages($langs->trans('ErrorFieldsRequired'), null, 'errors');
 	} else {
@@ -70,7 +70,7 @@ print dol_get_fiche_head();
 
 print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="create">';
+print '<input type="hidden" name="action" value="add">';
 print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
 ?>

From 48ce5c549961b53bead7b4fdc4d2da5812dd13ce Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Dec 2020 18:16:16 +0100
Subject: [PATCH 568/888] Update api_setup.class.php

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

diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index fbeb2cc931b..84d4ddc3679 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -1582,7 +1582,7 @@ class Setup extends DolibarrApi
 	 *
 	 * @url	GET /company
 	 *
-	 * @return  Object Mysoc object
+	 * @return  array|mixed Mysoc object
 	 *
 	 * @throws RestException 403 Forbidden
 	 */

From 5252aa42b26a35565d9348f2bd3e740a92e55a92 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Dec 2020 18:20:13 +0100
Subject: [PATCH 569/888] Trans

---
 htdocs/langs/en_US/admin.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index d74201b2f17..537da1102e8 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -258,6 +258,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.

From 196fb07830e154f017639a45c35a9e10705549f7 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Mon, 21 Dec 2020 18:47:43 +0100
Subject: [PATCH 570/888] Fix edit variant v13+

after add, edit have same mistakes
---
 htdocs/variants/card.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php
index 6cda745056a..9355b62f83b 100644
--- a/htdocs/variants/card.php
+++ b/htdocs/variants/card.php
@@ -44,7 +44,7 @@ if ($object->fetch($id) < 1) {
 if ($cancel) $action = '';
 
 if ($action) {
-	if ($action == 'edit') {
+	if ($action == 'update') {
 		$object->ref = $ref;
 		$object->label = $label;
 
@@ -55,7 +55,7 @@ if ($action) {
 			header('Location: '.dol_buildpath('/variants/card.php?id='.$id, 2));
 			exit();
 		}
-	} elseif ($action == 'update') {
+	} elseif ($action == 'update_value') {
 		if ($objectval->fetch($valueid) > 0) {
 			$objectval->ref = $ref;
 			$objectval->value = GETPOST('value', 'alpha');
@@ -139,8 +139,13 @@ $h++;
 print dol_get_fiche_head($head, 'variant', $langs->trans('ProductAttributeName'), -1, 'generic');
 
 if ($action == 'edit') {
-	print '<form method="POST">';
-}
+		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="action" value="update">';
+		print '<input type="hidden" name="id" value="'.$id.'">';
+		print '<input type="hidden" name="valueid" value="'.$valueid.'">';
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	}
 
 
 if ($action != 'edit') {
@@ -232,7 +237,7 @@ if ($action == 'edit') {
 	if ($action == 'edit_value') {
 		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="action" value="update">';
+		print '<input type="hidden" name="action" value="update_value">';
 		print '<input type="hidden" name="id" value="'.$id.'">';
 		print '<input type="hidden" name="valueid" value="'.$valueid.'">';
 		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';

From 0e629204f29397125f0b76773921066c06a370e3 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 21 Dec 2020 17:49:49 +0000
Subject: [PATCH 571/888] Fixing style errors.

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

diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php
index 9355b62f83b..986db1b14bc 100644
--- a/htdocs/variants/card.php
+++ b/htdocs/variants/card.php
@@ -145,7 +145,7 @@ if ($action == 'edit') {
 		print '<input type="hidden" name="id" value="'.$id.'">';
 		print '<input type="hidden" name="valueid" value="'.$valueid.'">';
 		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	}
+}
 
 
 if ($action != 'edit') {

From 58b4de8bc33c79869d4d4f96586a1858fc4e0cb6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 21 Dec 2020 19:27:42 +0100
Subject: [PATCH 572/888] More complete fix for #15712

---
 htdocs/compta/bank/bankentries_list.php | 43 ++++++++++++++-----------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 902a96ec16c..d57e2cf5591 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -496,7 +496,7 @@ if (dol_strlen($search_dv_end) > 0) $sql .= " AND b.datev <= '".$db->idate($sear
 if ($search_ref) $sql .= natural_search("b.rowid", $search_ref, 1);
 if ($search_req_nb) $sql .= natural_search("b.num_chq", $search_req_nb);
 if ($search_num_releve) $sql .= natural_search("b.num_releve", $search_num_releve);
-if ($search_conciliated != '' && $search_conciliated != '-1') $sql .= " AND b.rappro = ".$search_conciliated;
+if ($search_conciliated != '' && $search_conciliated != '-1') $sql .= " AND b.rappro = ".urlencode($search_conciliated);
 if ($search_thirdparty) $sql .= natural_search("s.nom", $search_thirdparty);
 if ($search_description)
 {
@@ -861,6 +861,10 @@ if ($resql)
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	// When action is 'reconcile', we force to have the column num_releve always enabled (otherwise we can't make reconciliation).
+	if ($action == 'reconcile') {
+		$arrayfields['b.num_releve']['checked'] = 1;
+	}
 
 	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
@@ -993,9 +997,8 @@ if ($resql)
 	while ($i < min($num, $limit))
 	{
 		$objp = $db->fetch_object($resql);
-
 		// If we are in a situation where we need/can show balance, we calculate the start of balance
-		if (!$balancecalculated && (!empty($arrayfields['balancebefore']['checked']) || !empty($arrayfields['balance']['checked'])) && $mode_balance_ok)
+		if (!$balancecalculated && (!empty($arrayfields['balancebefore']['checked']) || !empty($arrayfields['balance']['checked'])) && ($mode_balance_ok || $search_conciliated === '0'))
 		{
 			if (!$search_account)
 			{
@@ -1016,11 +1019,9 @@ if ($resql)
 			$sqlforbalance .= " AND (b.datev < '".$db->idate($db->jdate($objp->dv))."' OR (b.datev = '".$db->idate($db->jdate($objp->dv))."' AND (b.dateo < '".$db->idate($db->jdate($objp->do))."' OR (b.dateo = '".$db->idate($db->jdate($objp->do))."' AND b.rowid < ".$objp->rowid."))))";
 			$resqlforbalance = $db->query($sqlforbalance);
 			//print $sqlforbalance;
-			if ($resqlforbalance)
-			{
+			if ($resqlforbalance) {
 				$objforbalance = $db->fetch_object($resqlforbalance);
-				if ($objforbalance)
-				{
+				if ($objforbalance) {
 					// If sort is desc,desc,desc then total of previous date + amount is the balancebefore of the previous line before the line to show
 					if ($sortfield == 'b.datev,b.dateo,b.rowid' && $sortorder == 'desc,desc,desc')
 					{
@@ -1081,24 +1082,30 @@ if ($resql)
 				if (!empty($arrayfields['balancebefore']['checked']))
 				{
 					print '<td class="right">';
-					print price(price2num($balance, 'MT'), 1, $langs);
+					if ($search_conciliated !== '0') {
+						print price(price2num($balance, 'MT'), 1, $langs);
+					}
 					print '</td>';
 				}
 				if (!empty($arrayfields['balance']['checked']))
 				{
 					print '<td class="right">';
-					print price(price2num($balance, 'MT'), 1, $langs);
+					if ($search_conciliated !== '0') {
+						print price(price2num($balance, 'MT'), 1, $langs);
+					}
+					print '</td>';
+				}
+				if (!empty($arrayfields['b.num_releve']['checked']))
+				{
+					print '<td class="center">';
+					print '<input type="checkbox" id="selectAll" title="'.dol_escape_htmltag($langs->trans("SelectAll")).'" />';
+					print ' <script type="text/javascript">
+							$("input#selectAll").change(function() {
+								$("input[type=checkbox][name^=rowid]").prop("checked", $(this).is(":checked"));
+							});
+							</script>';
 					print '</td>';
 				}
-
-				print '<td class="center">';
-				print '<input type="checkbox" id="selectAll" title="'.dol_escape_htmltag($langs->trans("SelectAll")).'" />';
-				print ' <script type="text/javascript">
-						$("input#selectAll").change(function() {
-							$("input[type=checkbox][name^=rowid]").prop("checked", $(this).is(":checked"));
-						});
-						</script>';
-				print '</td>';
 				print '<td colspan="'.($tmpnbfieldafterbalance + 2).'">';
 				print '&nbsp;';
 				print '</td>';

From f273273129526bb0ecaccf2a42932a96166fa449 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 22 Dec 2020 06:57:55 +0100
Subject: [PATCH 573/888] FIX: Accountancy - Retire entire opening balance
 feature

---
 htdocs/accountancy/bookkeeping/balance.php | 46 +++++++++++++++-------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 29e56cd4233..961a012f396 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -77,7 +77,7 @@ $form = new Form($db);
 if (empty($search_date_start) && !GETPOSTISSET('formfilteraction'))
 {
 	$sql = "SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear ";
-	$sql .= " where date_start < '".$db->idate(dol_now())."' and date_end > '".$db->idate(dol_now())."'";
+	$sql .= " WHERE date_start < '".$db->idate(dol_now())."' AND date_end > '".$db->idate(dol_now())."'";
 	$sql .= $db->plimit(1);
 	$res = $db->query($sql);
 	if ($res->num_rows > 0) {
@@ -237,7 +237,7 @@ if ($action != 'export_csv')
 	print '<table class="liste '.($moreforfilter ? "listwithfilterbefore" : "").'">';
 
 	print '<tr class="liste_titre_filter">';
-	print '<td class="liste_titre" colspan="6">';
+	print '<td class="liste_titre" colspan="5">';
 	print $langs->trans('From');
 	print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, '');
 	print ' ';
@@ -254,7 +254,7 @@ if ($action != 'export_csv')
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("AccountAccounting", $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
 	print_liste_field_titre("Label", $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("OpeningBalance", $_SERVER['PHP_SELF'], "", $param, "", 'class="right"', $sortfield, $sortorder);
+	// print_liste_field_titre("OpeningBalance", $_SERVER['PHP_SELF'], "", $param, "", 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre("Debit", $_SERVER['PHP_SELF'], "t.debit", "", $param, 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $param, 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre("Balance", $_SERVER["PHP_SELF"], "", $param, "", 'class="right"', $sortfield, $sortorder);
@@ -265,10 +265,13 @@ if ($action != 'export_csv')
 	$total_credit = 0;
 	$sous_total_debit = 0;
 	$sous_total_credit = 0;
-	$total_opening_balance = 0;
-	$sous_total_opening_balance = 0;
+	// $total_opening_balance = 0;
+	// $sous_total_opening_balance = 0;
 	$displayed_account = "";
 
+	// TODO Debug - In French accounting, this functionality is dangerous, it takes all the entries and adds all the accounts
+	// without time and class limits (Class 6 and 7 accounts ???) and does not take into account the "a-nouveau" journal.
+	/*
 	$sql = "SELECT t.numero_compte, (SUM(t.debit) - SUM(t.credit)) as opening_balance";
 	$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as t";
 	$sql .= " WHERE t.entity = ".$conf->entity;		// Never do sharing into accounting features
@@ -282,6 +285,7 @@ if ($action != 'export_csv')
 		$arr = $resql->fetch_array();
 		$opening_balances["'".$arr['numero_compte']."'"] = $arr['opening_balance'];
 	}
+	*/
 
 	foreach ($object->lines as $line)
 	{
@@ -290,8 +294,8 @@ if ($action != 'export_csv')
 		$total_credit += $line->credit;
 		$description = $object->get_compte_desc($line->numero_compte); // Search description of the account
 		$root_account_description = $object->get_compte_racine($line->numero_compte);
-		$opening_balance = isset($opening_balances["'".$line->numero_compte."'"]) ? $opening_balances["'".$line->numero_compte."'"] : 0;
-		$total_opening_balance += $opening_balance;
+		// $opening_balance = isset($opening_balances["'".$line->numero_compte."'"]) ? $opening_balances["'".$line->numero_compte."'"] : 0;
+		// $total_opening_balance += $opening_balance;
 		if (empty($description)) {
 			$link = '<a href="'.DOL_URL_ROOT.'/accountancy/admin/card.php?action=create&accountingaccount='.length_accountg($line->numero_compte).'">'.img_edit_add().'</a>';
 		}
@@ -302,30 +306,34 @@ if ($action != 'export_csv')
 		{
 			// Display a sub-total per account
 			if ($displayed_account != "") {
-				print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("SubTotal").':</td><td class="nowrap right">'.price($sous_total_opening_balance).'</td><td class="nowrap right">'.price($sous_total_debit).'</td><td class="nowrap right">'.price($sous_total_credit).'</td><td class="nowrap right">'.price(price2num($sous_total_credit - $sous_total_debit)).'</td>';
+				print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("SubTotal").':</td>';
+				// print '<td class="nowrap right">'.price($sous_total_opening_balance).'</td>';
+				print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
+				print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
+				print '<td class="nowrap right">'.price(price2num($sous_total_credit - $sous_total_debit)).'</td>';
 				print "<td>&nbsp;</td>\n";
 				print '</tr>';
 			}
 
 			// Show first line of a break
 			print '<tr class="trforbreak">';
-			print '<td colspan="7" style="font-weight:bold; border-bottom: 1pt solid black;">'.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').'</td>';
+			print '<td colspan="6" style="font-weight:bold; border-bottom: 1pt solid black;">'.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').'</td>';
 			print '</tr>';
 
 			$displayed_account = $root_account_description;
 			$sous_total_debit = 0;
 			$sous_total_credit = 0;
-			$sous_total_opening_balance = 0;
+			// $sous_total_opening_balance = 0;
 		}
 
 		// $object->get_compte_racine($line->numero_compte);
 
 		print '<td>'.length_accountg($line->numero_compte).'</td>';
 		print '<td>'.$description.'</td>';
-		print '<td class="nowraponall right">'.price($opening_balance).'</td>';
+		// print '<td class="nowraponall right">'.price($opening_balance).'</td>';
 		print '<td class="nowraponall right">'.price($line->debit).'</td>';
 		print '<td class="nowraponall right">'.price($line->credit).'</td>';
-		print '<td class="nowraponall right">'.price($opening_balance + $line->debit - $line->credit).'</td>';
+		print '<td class="nowraponall right">'.price(/*$opening_balance +*/ $line->debit - $line->credit).'</td>';
 		print '<td class="center">'.$link;
 		print '</td>';
 		print "</tr>\n";
@@ -333,14 +341,22 @@ if ($action != 'export_csv')
 		// Records the sub-total
 		$sous_total_debit += $line->debit;
 		$sous_total_credit += $line->credit;
-		$sous_total_opening_balance += $opening_balance;
+		// $sous_total_opening_balance += $opening_balance;
 	}
 
-	print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("SubTotal").':</td><td class="nowrap right">'.price($sous_total_opening_balance).'</td><td class="nowrap right">'.price($sous_total_debit).'</td><td class="nowrap right">'.price($sous_total_credit).'</td><td class="nowrap right">'.price(price2num($sous_total_opening_balance + $sous_total_debit - $sous_total_credit, 'MT')).'</td>';
+	print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("SubTotal").':</td>';
+	// print '<td class="nowrap right">'.price($sous_total_opening_balance).'</td>';
+	print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
+	print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
+	print '<td class="nowrap right">'.price(price2num(/*$sous_total_opening_balance +*/ $sous_total_debit - $sous_total_credit, 'MT')).'</td>';
 	print "<td>&nbsp;</td>\n";
 	print '</tr>';
 
-	print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("AccountBalance").':</td><td class="nowrap right">'.price($total_opening_balance).'</td><td class="nowrap right">'.price($total_debit).'</td><td class="nowrap right">'.price($total_credit).'</td><td class="nowrap right">'.price(price2num($total_opening_balance + $total_debit - $total_credit, 'MT')).'</td>';
+	print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("AccountBalance").':</td>';
+	// print '<td class="nowrap right">'.price($total_opening_balance).'</td>';
+	print '<td class="nowrap right">'.price($total_debit).'</td>';
+	print '<td class="nowrap right">'.price($total_credit).'</td>';
+	print '<td class="nowrap right">'.price(price2num(/*$total_opening_balance +*/ $total_debit - $total_credit, 'MT')).'</td>';
 	print "<td>&nbsp;</td>\n";
 	print '</tr>';
 

From 7b15197ded678aa68189430580b7d49ea342aa5f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Dec 2020 10:56:27 +0100
Subject: [PATCH 574/888] Trans

---
 htdocs/langs/en_US/admin.lang | 1 -
 htdocs/langs/en_US/main.lang  | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 537da1102e8..e3512280644 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -87,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index c2eae911053..c6ce8ca9be0 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criterias
 EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found

From 1017fad75406340c08cae59dbc835d9d62034640 Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Tue, 22 Dec 2020 16:07:07 +0100
Subject: [PATCH 575/888] NEW add form confirm hook on company card

---
 htdocs/societe/card.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 0fc33232c5d..486e68f4d83 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -2222,10 +2222,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		print dol_get_fiche_head($head, 'card', $langs->trans("ThirdParty"), -1, 'company');
 
+		$formconfirm = '';
+
 		// Confirm delete third party
 		if ($action == 'delete' || ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile)))
 		{
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("DeleteACompany"), $langs->trans("ConfirmDeleteCompany"), "confirm_delete", '', 0, "action-delete");
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("DeleteACompany"), $langs->trans("ConfirmDeleteCompany"), "confirm_delete", '', 0, "action-delete");
 		}
 
 		if ($action == 'merge')
@@ -2239,9 +2241,18 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				)
 			);
 
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("MergeThirdparties"), $langs->trans("ConfirmMergeThirdparties"), "confirm_merge", $formquestion, 'no', 1, 250);
+			$formconfirm .= $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("MergeThirdparties"), $langs->trans("ConfirmMergeThirdparties"), "confirm_merge", $formquestion, 'no', 1, 250);
 		}
 
+		// Call Hook formConfirm
+		$parameters = array('formConfirm' => $formconfirm);
+		$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
+		elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
+
+		// Print form confirm
+		print $formconfirm;
+
 		dol_htmloutput_mesg(is_numeric($error) ? '' : $error, $errors, 'error');
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';

From 193d231d4cda6c5359ec97e9393b1943923683a6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Dec 2020 16:29:21 +0100
Subject: [PATCH 576/888] Fix edition of operation into email collector

---
 htdocs/admin/emailcollector_card.php          | 57 ++++++++++++-------
 .../class/emailcollector.class.php            |  5 +-
 htdocs/langs/en_US/admin.lang                 |  3 +-
 htdocs/langs/en_US/errors.lang                |  3 +-
 htdocs/langs/en_US/mails.lang                 |  1 +
 htdocs/langs/en_US/main.lang                  |  1 +
 6 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index adfaaf4f816..6525013c6bc 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -153,13 +153,21 @@ if (GETPOST('addoperation', 'alpha'))
 	$emailcollectoroperation->status = 1;
 	$emailcollectoroperation->position = 50;
 
-	$result = $emailcollectoroperation->create($user);
+	if (in_array($emailcollectoroperation->type, array('loadthirdparty', 'loadandcreatethirdparty'))
+		&& empty($emailcollectoroperation->actionparam)) {
+		$error++;
+		setEventMessages($langs->trans("ErrorAParameterIsRequiredForThisOperation"), null, 'errors');
+	}
 
-	if ($result > 0)
-	{
-		$object->fetchActions();
-	} else {
-		setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors');
+	if (!$error) {
+		$result = $emailcollectoroperation->create($user);
+
+		if ($result > 0) {
+			$object->fetchActions();
+		} else {
+			$error++;
+			setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors');
+		}
 	}
 }
 
@@ -170,13 +178,22 @@ if ($action == 'updateoperation')
 
 	$emailcollectoroperation->actionparam = GETPOST('operationparam2', 'restricthtml');
 
-	$result = $emailcollectoroperation->update($user);
+	if (in_array($emailcollectoroperation->type, array('loadthirdparty', 'loadandcreatethirdparty'))
+		&& empty($emailcollectoroperation->actionparam)) {
+		$error++;
+		setEventMessages($langs->trans("ErrorAParameterIsRequiredForThisOperation"), null, 'errors');
+	}
 
-	if ($result > 0)
-	{
-		$object->fetchActions();
-	} else {
-		setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors');
+	if (!$error) {
+		$result = $emailcollectoroperation->update($user);
+
+		if ($result > 0)
+		{
+			$object->fetchActions();
+		} else {
+			$error++;
+			setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors');
+		}
 	}
 }
 if ($action == 'deleteoperation')
@@ -458,7 +475,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<div class="div-table-responsive">';
 	print '<table class="border centpercent tableforfield">';
 	print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("Filters").'</td><td></td><td></td>';
+	print '<td>'.$form->textwithpicto($langs->trans("Filters"), $langs->trans("EmailCollectorFilterDesc")).'</td><td></td><td></td>';
 	print '</tr>';
 	// Add filter
 	print '<tr class="oddeven">';
@@ -491,7 +508,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		'isnotanswer'=>array('label'=>'IsNotAnAnswer', 'data-noparam'=>1),
 		'isanswer'=>array('label'=>'IsAnAnswer', 'data-noparam'=>1)
 	);
-	print $form->selectarray('filtertype', $arrayoftypes, '', 1, 0, 0, '', 1, 0, 0, '', 'maxwidth500', 0, '', 2);
+	print $form->selectarray('filtertype', $arrayoftypes, '', 1, 0, 0, '', 1, 0, 0, '', 'maxwidth500', 1, '', 2);
 
 	print "\n";
 	print '<script>';
@@ -544,7 +561,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<div class="div-table-responsive">';
 	print '<table id="tablelines" class="noborder noshadow tableforfield">';
 	print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("EmailcollectorOperations").'</td><td></td><td></td><td></td>';
+	print '<td>'.$form->textwithpicto($langs->trans("EmailcollectorOperations"), $langs->trans("EmailcollectorOperationsDesc")).'</td><td></td><td></td><td></td>';
 	print '</tr>';
 	// Add operation
 	print '<tr class="oddeven">';
@@ -561,13 +578,15 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$parameters = array('arrayoftypes' => $arrayoftypes);
 	$res = $hookmanager->executeHooks('addMoreActionsEmailCollector', $parameters, $object, $action);
 
-	if ($res)
+	if ($res) {
 		$arrayoftypes = $hookmanager->resArray;
-	else foreach ($hookmanager->resArray as $k=>$desc)
+	} else {
+		foreach ($hookmanager->resArray as $k=>$desc) {
 			$arrayoftypes[$k] = $desc;
+		}
+	}
 
-
-	print $form->selectarray('operationtype', $arrayoftypes, '', 1, 0, 0, '', 1, 0, 0, '', 'maxwidth300');
+	print $form->selectarray('operationtype', $arrayoftypes, '', 1, 0, 0, '', 1, 0, 0, '', 'maxwidth300', 1);
 	print '</td><td>';
 	print '<input type="text" name="operationparam">';
 	print '</td>';
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 2c55b11f8d2..8f078633c52 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -1555,10 +1555,9 @@ class EmailCollector extends CommonObject
 					// Search and create thirdparty
 					if ($operation['type'] == 'loadthirdparty' || $operation['type'] == 'loadandcreatethirdparty')
 					{
-						if (empty($operation['actionparam']))
-						{
+						if (empty($operation['actionparam'])) {
 							$errorforactions++;
-							$this->error = "Action loadthirdparty or loadandcreatethirdparty has empty parameter. Must be 'SET:xxx' or 'EXTRACT:(body|subject):regex' to define how to extract data";
+							$this->error = "Action loadthirdparty or loadandcreatethirdparty has empty parameter. Must be a rule like 'SET:xxx' or 'EXTRACT:(body|subject):regex' to define how to set or extract data";
 							$this->errors[] = $this->error;
 						} else {
 							$actionparam = $operation['actionparam'];
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index e3512280644..6b05b594711 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1985,6 +1985,7 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
@@ -2007,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 056bec48fe9..5634905da6e 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -254,7 +254,8 @@ ErrorNotAvailableWithThisDistribution=Not available with this distribution
 ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
- 
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 906394eb9c1..a7cfde68ae7 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected 
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index c6ce8ca9be0..7075df90783 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -437,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation

From 0068c1fb78138fdad96dea92911ac36aed3f2636 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Dec 2020 10:56:27 +0100
Subject: [PATCH 577/888] Trans

---
 htdocs/langs/en_US/admin.lang | 1 -
 htdocs/langs/en_US/main.lang  | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 537da1102e8..e3512280644 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -87,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index c2eae911053..c6ce8ca9be0 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criterias
 EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found

From ef2bd563e281a629ea5325f42ef12b39290d4090 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Dec 2020 16:55:51 +0100
Subject: [PATCH 578/888] trans

---
 htdocs/langs/en_US/admin.lang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index e3512280644..6fb096be175 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1988,8 +1988,8 @@ EmailcollectorOperations=Operations to do by collector
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?

From 6fad9c2d3bb633d503f2274149ce4e7375ad5750 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Dec 2020 16:29:21 +0100
Subject: [PATCH 579/888] Fix edition of operation into email collector

---
 htdocs/admin/emailcollector_card.php          | 57 ++++++++++++-------
 .../class/emailcollector.class.php            |  5 +-
 htdocs/langs/en_US/admin.lang                 |  3 +-
 htdocs/langs/en_US/errors.lang                |  3 +-
 htdocs/langs/en_US/mails.lang                 |  1 +
 htdocs/langs/en_US/main.lang                  |  1 +
 6 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index adfaaf4f816..6525013c6bc 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -153,13 +153,21 @@ if (GETPOST('addoperation', 'alpha'))
 	$emailcollectoroperation->status = 1;
 	$emailcollectoroperation->position = 50;
 
-	$result = $emailcollectoroperation->create($user);
+	if (in_array($emailcollectoroperation->type, array('loadthirdparty', 'loadandcreatethirdparty'))
+		&& empty($emailcollectoroperation->actionparam)) {
+		$error++;
+		setEventMessages($langs->trans("ErrorAParameterIsRequiredForThisOperation"), null, 'errors');
+	}
 
-	if ($result > 0)
-	{
-		$object->fetchActions();
-	} else {
-		setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors');
+	if (!$error) {
+		$result = $emailcollectoroperation->create($user);
+
+		if ($result > 0) {
+			$object->fetchActions();
+		} else {
+			$error++;
+			setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors');
+		}
 	}
 }
 
@@ -170,13 +178,22 @@ if ($action == 'updateoperation')
 
 	$emailcollectoroperation->actionparam = GETPOST('operationparam2', 'restricthtml');
 
-	$result = $emailcollectoroperation->update($user);
+	if (in_array($emailcollectoroperation->type, array('loadthirdparty', 'loadandcreatethirdparty'))
+		&& empty($emailcollectoroperation->actionparam)) {
+		$error++;
+		setEventMessages($langs->trans("ErrorAParameterIsRequiredForThisOperation"), null, 'errors');
+	}
 
-	if ($result > 0)
-	{
-		$object->fetchActions();
-	} else {
-		setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors');
+	if (!$error) {
+		$result = $emailcollectoroperation->update($user);
+
+		if ($result > 0)
+		{
+			$object->fetchActions();
+		} else {
+			$error++;
+			setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors');
+		}
 	}
 }
 if ($action == 'deleteoperation')
@@ -458,7 +475,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<div class="div-table-responsive">';
 	print '<table class="border centpercent tableforfield">';
 	print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("Filters").'</td><td></td><td></td>';
+	print '<td>'.$form->textwithpicto($langs->trans("Filters"), $langs->trans("EmailCollectorFilterDesc")).'</td><td></td><td></td>';
 	print '</tr>';
 	// Add filter
 	print '<tr class="oddeven">';
@@ -491,7 +508,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		'isnotanswer'=>array('label'=>'IsNotAnAnswer', 'data-noparam'=>1),
 		'isanswer'=>array('label'=>'IsAnAnswer', 'data-noparam'=>1)
 	);
-	print $form->selectarray('filtertype', $arrayoftypes, '', 1, 0, 0, '', 1, 0, 0, '', 'maxwidth500', 0, '', 2);
+	print $form->selectarray('filtertype', $arrayoftypes, '', 1, 0, 0, '', 1, 0, 0, '', 'maxwidth500', 1, '', 2);
 
 	print "\n";
 	print '<script>';
@@ -544,7 +561,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<div class="div-table-responsive">';
 	print '<table id="tablelines" class="noborder noshadow tableforfield">';
 	print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("EmailcollectorOperations").'</td><td></td><td></td><td></td>';
+	print '<td>'.$form->textwithpicto($langs->trans("EmailcollectorOperations"), $langs->trans("EmailcollectorOperationsDesc")).'</td><td></td><td></td><td></td>';
 	print '</tr>';
 	// Add operation
 	print '<tr class="oddeven">';
@@ -561,13 +578,15 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$parameters = array('arrayoftypes' => $arrayoftypes);
 	$res = $hookmanager->executeHooks('addMoreActionsEmailCollector', $parameters, $object, $action);
 
-	if ($res)
+	if ($res) {
 		$arrayoftypes = $hookmanager->resArray;
-	else foreach ($hookmanager->resArray as $k=>$desc)
+	} else {
+		foreach ($hookmanager->resArray as $k=>$desc) {
 			$arrayoftypes[$k] = $desc;
+		}
+	}
 
-
-	print $form->selectarray('operationtype', $arrayoftypes, '', 1, 0, 0, '', 1, 0, 0, '', 'maxwidth300');
+	print $form->selectarray('operationtype', $arrayoftypes, '', 1, 0, 0, '', 1, 0, 0, '', 'maxwidth300', 1);
 	print '</td><td>';
 	print '<input type="text" name="operationparam">';
 	print '</td>';
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 2c55b11f8d2..8f078633c52 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -1555,10 +1555,9 @@ class EmailCollector extends CommonObject
 					// Search and create thirdparty
 					if ($operation['type'] == 'loadthirdparty' || $operation['type'] == 'loadandcreatethirdparty')
 					{
-						if (empty($operation['actionparam']))
-						{
+						if (empty($operation['actionparam'])) {
 							$errorforactions++;
-							$this->error = "Action loadthirdparty or loadandcreatethirdparty has empty parameter. Must be 'SET:xxx' or 'EXTRACT:(body|subject):regex' to define how to extract data";
+							$this->error = "Action loadthirdparty or loadandcreatethirdparty has empty parameter. Must be a rule like 'SET:xxx' or 'EXTRACT:(body|subject):regex' to define how to set or extract data";
 							$this->errors[] = $this->error;
 						} else {
 							$actionparam = $operation['actionparam'];
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 6fb096be175..bd83272a3e7 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1985,6 +1985,7 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
@@ -2007,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 056bec48fe9..5634905da6e 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -254,7 +254,8 @@ ErrorNotAvailableWithThisDistribution=Not available with this distribution
 ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
- 
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 906394eb9c1..a7cfde68ae7 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected 
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index c6ce8ca9be0..7075df90783 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -437,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation

From 083b6a8c874210603a2a79f3006db7d00ac3a0e7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Dec 2020 17:03:57 +0100
Subject: [PATCH 580/888] Fix emailcollector edition

---
 htdocs/admin/emailcollector_card.php                 | 4 ++++
 htdocs/emailcollector/class/emailcollector.class.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index 6525013c6bc..ae3a4232e18 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -153,6 +153,10 @@ if (GETPOST('addoperation', 'alpha'))
 	$emailcollectoroperation->status = 1;
 	$emailcollectoroperation->position = 50;
 
+	if ($emailcollectoroperation->type == '-1') {
+		$error++;
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Operation")), null, 'errors');
+	}
 	if (in_array($emailcollectoroperation->type, array('loadthirdparty', 'loadandcreatethirdparty'))
 		&& empty($emailcollectoroperation->actionparam)) {
 		$error++;
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 8f078633c52..1a05017c1d3 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -56,7 +56,7 @@ class EmailCollector extends CommonObject
 	/**
 	 * @var string String with name of icon for emailcollector. Must be the part after the 'object_' into object_emailcollector.png
 	 */
-	public $picto = 'generic';
+	public $picto = 'email';
 
 	/**
 	 * @var string    Field with ID of parent key if this field has a parent

From 4fcf606d04baa4e98a7c499aab9ba8e170b14788 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Dec 2020 17:22:24 +0100
Subject: [PATCH 581/888] Error management on emailcollector edition

---
 htdocs/admin/emailcollector_card.php | 26 ++++++++++++++------------
 htdocs/main.inc.php                  |  2 +-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index ae3a4232e18..5b037e70a73 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -135,12 +135,13 @@ if ($action == 'deletefilter')
 {
 	$emailcollectorfilter = new EmailCollectorFilter($db);
 	$emailcollectorfilter->fetch(GETPOST('filterid', 'int'));
-	$result = $emailcollectorfilter->delete($user);
-	if ($result > 0)
-	{
-		$object->fetchFilters();
-	} else {
-		setEventMessages($emailcollectorfilter->errors, $emailcollectorfilter->error, 'errors');
+	if ($emailcollectorfilter->id > 0) {
+		$result = $emailcollectorfilter->delete($user);
+		if ($result > 0) {
+			$object->fetchFilters();
+		} else {
+			setEventMessages($emailcollectorfilter->errors, $emailcollectorfilter->error, 'errors');
+		}
 	}
 }
 
@@ -204,12 +205,13 @@ if ($action == 'deleteoperation')
 {
 	$emailcollectoroperation = new EmailCollectorAction($db);
 	$emailcollectoroperation->fetch(GETPOST('operationid', 'int'));
-	$result = $emailcollectoroperation->delete($user);
-	if ($result > 0)
-	{
-		$object->fetchActions();
-	} else {
-		setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors');
+	if ($emailcollectoroperation->id > 0) {
+		$result = $emailcollectoroperation->delete($user);
+		if ($result > 0) {
+			$object->fetchActions();
+		} else {
+			setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors');
+		}
 	}
 }
 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 82be9955e0f..14944619d6e 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -417,7 +417,7 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->gl
 	// Check all cases that need a token (all POST actions, all actions and mass actions on pages with CSRFCHECK_WITH_TOKEN set, all sensitive GET actions)
 	if ($_SERVER['REQUEST_METHOD'] == 'POST' ||
 		((GETPOSTISSET('action') || GETPOSTISSET('massaction')) && defined('CSRFCHECK_WITH_TOKEN')) ||
-		in_array(GETPOST('action', 'aZ09'), array('add', 'addtimespent', 'update', 'install', 'delete', 'deleteprof', 'deletepayment', 'confirm_create_user', 'confirm_create_thirdparty', 'confirm_reject_check')))
+		in_array(GETPOST('action', 'aZ09'), array('add', 'addtimespent', 'update', 'install', 'delete', 'deletefilter', 'deleteoperation', 'deleteprof', 'deletepayment', 'confirm_create_user', 'confirm_create_thirdparty', 'confirm_reject_check')))
 	{
 		if (!GETPOSTISSET('token')) {
 			if (GETPOST('uploadform', 'int')) {

From 093817833f17a84890b124b29116f53ab157fbbf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Dec 2020 17:24:36 +0100
Subject: [PATCH 582/888] Add travis on 13.0 for test on php8

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index af37fe08a8d..e9bf08af57b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,6 +50,9 @@ jobs:
     - if: type = push AND branch = develop
       php: nightly 
       env: DB=mysql
+    - if: type = push AND branch = 13.0
+      php: nightly 
+      env: DB=mysql
 
 notifications:
   email:

From bac2ae0d5f9937bad53f45b833e4b2d11f90e92d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Dec 2020 17:33:17 +0100
Subject: [PATCH 583/888] Fix warnings

---
 htdocs/commande/class/commande.class.php         |  4 ++--
 htdocs/compta/facture/class/facture.class.php    |  8 ++++----
 .../fourn/class/fournisseur.commande.class.php   | 16 ++++++++--------
 htdocs/fourn/class/fournisseur.facture.class.php |  8 ++++----
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 4ededdeacaf..d8fdb51141e 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3159,8 +3159,8 @@ class Commande extends CommonOrder
 			$this->line->tva_tx         = $txtva;
 			$this->line->localtax1_tx   = $txlocaltax1;
 			$this->line->localtax2_tx   = $txlocaltax2;
-			$this->line->localtax1_type = $localtaxes_type[0];
-			$this->line->localtax2_type = $localtaxes_type[2];
+			$this->line->localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
+			$this->line->localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
 			$this->line->remise_percent = $remise_percent;
 			$this->line->subprice       = $subprice;
 			$this->line->info_bits      = $info_bits;
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index ec55810e2da..ac1270ed550 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3136,8 +3136,8 @@ class Facture extends CommonInvoice
 			$this->line->tva_tx = $txtva;
 			$this->line->localtax1_tx = ($total_localtax1 ? $localtaxes_type[1] : 0);
 			$this->line->localtax2_tx = ($total_localtax2 ? $localtaxes_type[3] : 0);
-			$this->line->localtax1_type = isset($localtaxes_type[0]) ? $localtaxes_type[0] : '';
-			$this->line->localtax2_type = isset($localtaxes_type[2]) ? $localtaxes_type[2] : '';
+			$this->line->localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
+			$this->line->localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
 
 			$this->line->total_ht = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_ht) : $total_ht); // For credit note and if qty is negative, total is negative
 			$this->line->total_ttc = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_ttc) : $total_ttc); // For credit note and if qty is negative, total is negative
@@ -3375,8 +3375,8 @@ class Facture extends CommonInvoice
 			$this->line->tva_tx = $txtva;
 			$this->line->localtax1_tx		= $txlocaltax1;
 			$this->line->localtax2_tx		= $txlocaltax2;
-			$this->line->localtax1_type		= $localtaxes_type[0];
-			$this->line->localtax2_type		= $localtaxes_type[2];
+			$this->line->localtax1_type		= empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
+			$this->line->localtax2_type		= empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
 
 			$this->line->remise_percent		= $remise_percent;
 			$this->line->subprice			= ($this->type == self::TYPE_CREDIT_NOTE ?-abs($pu_ht) : $pu_ht); // For credit note, unit price always negative, always positive otherwise
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 557bc2a0456..6c6347f67f7 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1714,8 +1714,8 @@ class CommandeFournisseur extends CommonOrder
 			$multicurrency_total_ttc = $tabprice[18];
 			$pu_ht_devise = $tabprice[19];
 
-			$localtax1_type = $localtaxes_type[0];
-			$localtax2_type = $localtaxes_type[2];
+			$localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
+			$localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
 
 			$rangmax = $this->line_max();
 			$rang = $rangmax + 1;
@@ -1734,8 +1734,8 @@ class CommandeFournisseur extends CommonOrder
 			$this->line->tva_tx = $txtva;
 			$this->line->localtax1_tx = ($total_localtax1 ? $localtaxes_type[1] : 0);
 			$this->line->localtax2_tx = ($total_localtax2 ? $localtaxes_type[3] : 0);
-			$this->line->localtax1_type = $localtaxes_type[0];
-			$this->line->localtax2_type = $localtaxes_type[2];
+			$this->line->localtax1_type = $localtax1_type;
+			$this->line->localtax2_type = $localtax2_type;
 			$this->line->fk_product = $fk_product;
 			$this->line->product_type = $product_type;
 			$this->line->remise_percent = $remise_percent;
@@ -2594,8 +2594,8 @@ class CommandeFournisseur extends CommonOrder
 			$multicurrency_total_ttc = $tabprice[18];
 			$pu_ht_devise = $tabprice[19];
 
-			$localtax1_type = $localtaxes_type[0];
-			$localtax2_type = $localtaxes_type[2];
+			$localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
+			$localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
 
 			//Fetch current line from the database and then clone the object and set it in $oldline property
 			$this->line = new CommandeFournisseurLigne($this->db);
@@ -2633,8 +2633,8 @@ class CommandeFournisseur extends CommonOrder
 			$this->line->tva_tx         = $txtva;
 			$this->line->localtax1_tx   = $txlocaltax1;
 			$this->line->localtax2_tx   = $txlocaltax2;
-			$this->line->localtax1_type = $localtaxes_type[0];
-			$this->line->localtax2_type = $localtaxes_type[2];
+			$this->line->localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
+			$this->line->localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
 			$this->line->remise_percent = $remise_percent;
 			$this->line->subprice       = $pu_ht;
 			$this->line->rang           = $this->rang;
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 40ffb9024c5..c8ae31398c0 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1765,8 +1765,8 @@ class FactureFournisseur extends CommonInvoice
 			$this->line->tva_tx = $txtva;
 			$this->line->localtax1_tx = ($total_localtax1 ? $localtaxes_type[1] : 0);
 			$this->line->localtax2_tx = ($total_localtax2 ? $localtaxes_type[3] : 0);
-			$this->line->localtax1_type = $localtaxes_type[0];
-			$this->line->localtax2_type = $localtaxes_type[2];
+			$this->line->localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
+			$this->line->localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
 
 			$this->line->total_ht = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_ht) : $total_ht); // For credit note and if qty is negative, total is negative
 			$this->line->total_tva = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_tva) : $total_tva);
@@ -1952,8 +1952,8 @@ class FactureFournisseur extends CommonInvoice
 		$line->tva_tx = $vatrate;
 		$line->localtax1_tx = $txlocaltax1;
 		$line->localtax2_tx = $txlocaltax2;
-		$line->localtax1_type = $localtaxes_type[0];
-		$line->localtax2_type = $localtaxes_type[2];
+		$line->localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
+		$line->localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
 		$line->total_ht = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_ht) : $total_ht);
 		$line->total_tva = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_tva) : $total_tva);
 		$line->total_localtax1 = $total_localtax1;

From 77c335c5f36a45fb6343c9b38d2cacb4ca3e6e23 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 23 Dec 2020 09:19:56 +0100
Subject: [PATCH 584/888] fix colspan balance accountanty

---
 htdocs/accountancy/bookkeeping/balance.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 29e56cd4233..94a927d676c 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -302,7 +302,7 @@ if ($action != 'export_csv')
 		{
 			// Display a sub-total per account
 			if ($displayed_account != "") {
-				print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("SubTotal").':</td><td class="nowrap right">'.price($sous_total_opening_balance).'</td><td class="nowrap right">'.price($sous_total_debit).'</td><td class="nowrap right">'.price($sous_total_credit).'</td><td class="nowrap right">'.price(price2num($sous_total_credit - $sous_total_debit)).'</td>';
+				print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("SubTotal").':</td><td class="nowrap right">'.price($sous_total_opening_balance).'</td><td class="nowrap right">'.price($sous_total_debit).'</td><td class="nowrap right">'.price($sous_total_credit).'</td><td class="nowrap right">'.price(price2num($sous_total_credit - $sous_total_debit)).'</td>';
 				print "<td>&nbsp;</td>\n";
 				print '</tr>';
 			}

From ec5a81e9166abfbcded5c95a68aa49416b1c6f96 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Dec 2020 12:04:42 +0100
Subject: [PATCH 585/888] Enable missing module

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e9bf08af57b..dfeb209bfc3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -403,7 +403,7 @@ script:
   php step5.php 12.0.0 13.0.0 > $TRAVIS_BUILD_DIR/upgrade12001300-3.log
 
   # Enable modules not enabled into original dump
-  php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKET,MAIN_MODULE_ACCOUNTING,MAIN_MODULE_MRP > $TRAVIS_BUILD_DIR/enablemodule.log
+  php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_PRODUCTBATCH,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKET,MAIN_MODULE_ACCOUNTING,MAIN_MODULE_MRP > $TRAVIS_BUILD_DIR/enablemodule.log
   php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_RECEPTION,MAIN_MODULE_RECRUITMENT > $TRAVIS_BUILD_DIR/enablemodule.log
   echo $?
   cd -

From 53c6d92b0b22f3c2661b810fc817fa787a4ef9a4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Dec 2020 13:17:40 +0100
Subject: [PATCH 586/888] Enhance remote ip detection

---
 htdocs/core/lib/functions.lib.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 713da28996e..92114b7c094 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2887,12 +2887,16 @@ function getUserRemoteIP()
 {
 	if (empty($_SERVER['HTTP_X_FORWARDED_FOR']) || preg_match('/[^0-9\.\:,\[\]]/', $_SERVER['HTTP_X_FORWARDED_FOR'])) {
 		if (empty($_SERVER['HTTP_CLIENT_IP']) || preg_match('/[^0-9\.\:,\[\]]/', $_SERVER['HTTP_CLIENT_IP'])) {
-			$ip = (empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']);
+			if (empty($_SERVER["HTTP_CF_CONNECTING_IP"])) {
+				$ip = (empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']);	// value may have been forged by client
+			} else {
+				$ip = $_SERVER["HTTP_CF_CONNECTING_IP"];	// value here may have been forged by client
+			}
 		} else {
-			$ip = $_SERVER['HTTP_CLIENT_IP']; // value is clean here
+			$ip = $_SERVER['HTTP_CLIENT_IP']; // value is clean here but may have been forged by proxy
 		}
 	} else {
-		$ip = $_SERVER['HTTP_X_FORWARDED_FOR']; // value is clean here
+		$ip = $_SERVER['HTTP_X_FORWARDED_FOR']; // value is clean here but may have been forged by proxy
 	}
 	return $ip;
 }

From 335eefe6207885483ff7452efe3cc7a101fdd0c5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Dec 2020 13:26:39 +0100
Subject: [PATCH 587/888] Fix link

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

diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index 7dae96253bb..0f9d12c1a5d 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -332,7 +332,7 @@ class modCategorie extends DolibarrModules
 		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'categorie_contact as cc ON cc.fk_categorie = cat.rowid';
 		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'socpeople as p ON p.rowid = cc.fk_socpeople';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra ON extra.fk_object = p.rowid';
-		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_civility as civ ON civ.rowid = p.civility';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_civility as civ ON civ.code = p.civility';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON c.rowid = p.fk_pays';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc';
 		$this->export_sql_end[$r] .= ' WHERE cat.entity IN ('.getEntity('category').')';

From bf606ede126f150c78b8c0415c9615d9369e2326 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Dec 2020 13:17:40 +0100
Subject: [PATCH 588/888] Enhance remote ip detection

---
 htdocs/core/lib/functions.lib.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 713da28996e..92114b7c094 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2887,12 +2887,16 @@ function getUserRemoteIP()
 {
 	if (empty($_SERVER['HTTP_X_FORWARDED_FOR']) || preg_match('/[^0-9\.\:,\[\]]/', $_SERVER['HTTP_X_FORWARDED_FOR'])) {
 		if (empty($_SERVER['HTTP_CLIENT_IP']) || preg_match('/[^0-9\.\:,\[\]]/', $_SERVER['HTTP_CLIENT_IP'])) {
-			$ip = (empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']);
+			if (empty($_SERVER["HTTP_CF_CONNECTING_IP"])) {
+				$ip = (empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']);	// value may have been forged by client
+			} else {
+				$ip = $_SERVER["HTTP_CF_CONNECTING_IP"];	// value here may have been forged by client
+			}
 		} else {
-			$ip = $_SERVER['HTTP_CLIENT_IP']; // value is clean here
+			$ip = $_SERVER['HTTP_CLIENT_IP']; // value is clean here but may have been forged by proxy
 		}
 	} else {
-		$ip = $_SERVER['HTTP_X_FORWARDED_FOR']; // value is clean here
+		$ip = $_SERVER['HTTP_X_FORWARDED_FOR']; // value is clean here but may have been forged by proxy
 	}
 	return $ip;
 }

From b5731290c77e7815341b8e094ba6f906b2bc8f21 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Dec 2020 13:32:44 +0100
Subject: [PATCH 589/888] Fix scope

---
 SECURITY.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index bcc1bd7d9e0..6dc6e0f33b5 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -60,18 +60,19 @@ ONLY vulnerabilities discovered, when the following setup on test platform is us
 * ONLY security reports on modules provided by default and with the "stable" status are valid (troubles into "experimental", "developement" or external modules are not valid vulnerabilities).
 * The root of web server must link to htdocs and the documents directory must be outside of the web server root (this is the default when using the default installer but may differs with external installer).
 * The web server setup must be done so only the documents directory is in write mode. The root directory called htdocs must be readonly.
-* CSRF attacks are accepted for all when using a POST URL, but when using GET URL, they are validated only for creating or updating data resctricted to the admin user.
+* CSRF attacks are accepted when using a POST URL, but when using GET URL, they are validated only for creating, updating or deleting data resctricted from pages restricted to admin users.
 * Ability for a high level user to edit web site pages into the CMS by including HTML or Javascript is an expected feature. Vulnerabilities into the website module are validated only if HTML or Javascript injection can be done by a non allowed user.
 
 Scope is the web application (back office) and the APIs.
 
 
 ## Qualifying vulnerabilities for Bug bounty programs
+
 * Remote code execution (RCE)
 * Local files access and manipulation (LFI, RFI, XXE, SSRF, XSPA)
 * Code injections (HTML, JS, SQL, PHP, ...)
 * Cross-Site Scripting (XSS)
-* Cross-Site Requests Forgery (CSRF) with real security impact
+* Cross-Site Requests Forgery (CSRF) with real security impact (when using GET URLs, CSRF are qualified only for creating, updating or deleting data from pages restricted to admin users)
 * Open redirect
 * Broken authentication & session management
 * Insecure direct object references
@@ -83,6 +84,7 @@ Scope is the web application (back office) and the APIs.
 
 
 ## Non-qualifying vulnerabilities for Bug bounty programs, but qualified for reporting
+
 * "Self" XSS
 * SSL/TLS best practices
 * Denial of Service attacks

From 8658f903fa633174050e80efcdd49c06ef476493 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Dec 2020 15:00:25 +0100
Subject: [PATCH 590/888] FIX Must delete extrafields before main table on
 product deletion.

---
 htdocs/product/class/product.class.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index ccca1a85f47..0ec669afad8 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1241,6 +1241,16 @@ class Product extends CommonObject
                 }
             }
 
+            // Remove extrafields
+            if (!$error)
+            {
+            	$result = $this->deleteExtraFields();
+            	if ($result < 0) {
+            		$error++;
+            		dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
+            	}
+            }
+
             // Delete product
             if (!$error) {
                 $sqlz = "DELETE FROM ".MAIN_DB_PREFIX."product";
@@ -1268,16 +1278,6 @@ class Product extends CommonObject
                 }
             }
 
-            // Remove extrafields
-            if (!$error)
-            {
-                $result = $this->deleteExtraFields();
-                if ($result < 0) {
-                    $error++;
-                    dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
-                }
-            }
-
             if (!$error) {
                 $this->db->commit();
                 return 1;

From d3f352fe10beadaa6fdf5b8f383445c3cf372895 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Dec 2020 15:52:00 +0100
Subject: [PATCH 591/888] Fix log

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

diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php
index cb2fdd54d66..75fa4b60b89 100644
--- a/htdocs/api/class/api_login.class.php
+++ b/htdocs/api/class/api_login.class.php
@@ -132,7 +132,7 @@ class Login
 				'code' => 200,
 				'token' => $token,
 				'entity' => $tmpuser->entity,
-				'message' => 'Welcome '.$login.($reset ? ' - Token is new' : ' - This is your token (generated by a previous call). You can use it to make any REST API call, or enter it into the DOLAPIKEY field to use the Dolibarr API explorer.')
+				'message' => 'Welcome '.$login.($reset ? ' - Token is new' : ' - This is your token (recorded for your user). You can use it to make any REST API call, or enter it into the DOLAPIKEY field to use the Dolibarr API explorer.')
 			)
 		);
 	}

From 9007e7be2a52e3e4661e123c4e3637ddc0584897 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Dec 2020 16:13:45 +0100
Subject: [PATCH 592/888] Fix sql for postgresql

---
 htdocs/core/modules/modStock.class.php | 9 ++++++---
 test/phpunit/RestAPIUserTest.php       | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index da18f2faf11..c15f041d21d 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -294,12 +294,15 @@ class modStock extends DolibarrModules
 			include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 
 			$this->export_sql_start[$r] = 'SELECT DISTINCT ';
-			$this->export_sql_end[$r]  = ' FROM ('.MAIN_DB_PREFIX.'product as p, '.MAIN_DB_PREFIX.'product_stock as ps, '.MAIN_DB_PREFIX.'product_batch as pb)';
+			$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product_batch as pb';
+			$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'product_stock as ps ON ps.rowid = pb.fk_product_stock';
+			$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'product as p ON p.rowid = ps.fk_product';
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_lot as pl ON pl.fk_product = p.rowid AND pl.batch = pb.batch';
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_lot_extrafields as extra ON extra.fk_object = pl.rowid,';
 			$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'entrepot as e';
-			$this->export_sql_end[$r] .= ' WHERE p.rowid = ps.fk_product AND ps.fk_entrepot = e.rowid AND ps.rowid = pb.fk_product_stock';
-			$this->export_sql_end[$r] .= ' AND e.entity IN ('.getEntity('stock').')';		}
+			$this->export_sql_end[$r] .= ' WHERE ps.fk_entrepot = e.rowid';
+			$this->export_sql_end[$r] .= ' AND e.entity IN ('.getEntity('stock').')';
+		}
 
 		// Export of stock movements
 		$r++;
diff --git a/test/phpunit/RestAPIUserTest.php b/test/phpunit/RestAPIUserTest.php
index a937bdbd9f8..2bce51e2a05 100644
--- a/test/phpunit/RestAPIUserTest.php
+++ b/test/phpunit/RestAPIUserTest.php
@@ -130,7 +130,7 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
         print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
         $this->assertEquals($result['curl_error_no'], '');
         $object=json_decode($result['content'], true);
-        $this->assertNotNull($object, "Parsing of json result must no be null");
+        $this->assertNotNull($object, "Parsing of json result must not be null");
         $this->assertEquals('200', $object['success']['code']);
 
         $this->api_key = $object['success']['token'];

From 9bd6cf8bbbb00e54c162e7e3bd8657c066190d51 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 23 Dec 2020 16:22:49 +0100
Subject: [PATCH 593/888] Update ChangeLog

---
 ChangeLog | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8b3b3c97157..4877363e6be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -182,8 +182,8 @@ NEW: Add option "If the feature to manage kits of module Stock is used, show det
 
 For developers:
 ---------------
-NEW: add __MEMBER_TYPE__ substitution key
-NEW: add __TYPE__ substitution key
+NEW: add substitution key  __MEMBER_TYPE__ 
+NEW: add substitution key  __TYPE__ 
 NEW: add function dolButtonToOpenUrlInDialogPopup() to be able to open page into a popup
 NEW: show line number on intervention card (via MAIN_VIEW_LINE_NUMBER)
 NEW: Add some fields to link website page to an other object
@@ -193,14 +193,9 @@ NEW: can use THEME_DARKMODEENABLED=2 for a preview of theme in dark mode
 NEW: can force the antivirus from conf file or autoprepend ini setup
 NEW: can add event to log into blockedlog module with a constant
 NEW: add property cssview when declaring fields of an object
-NEW: Can use dynamic code into the 'enabled' property of DAO fields
-NEW: allow to edit "demand reason" field though API
-NEW: fetch contact by email with REST API
+NEW: can use dynamic code into the 'enabled' property of DAO fields
 NEW: field ref_ext in llx_commandedet
-NEW: fields ref_ext for Attributes and Combinations
-NEW: get state by REST API
-NEW: get state dictionnary by REST API
-NEW: improve Product API for variant products
+NEW: field ref_ext for Attributes and Combinations
 NEW: OAuth SCOPE for Admin SDK
 NEW: retrieve discount from invoice from API
 NEW: standardizes API thirdparties by email like other object
@@ -221,6 +216,11 @@ NEW: API can update a payment
 NEW: API get member by thirdparty
 NEW: API get thirdparty by barcode
 NEW: API get users by email / login
+NEW: allow to edit field "demand reason" through API
+NEW: fetch contact by email with REST API
+NEW: get state by REST API
+NEW: get state dictionary by REST API
+NEW: improve Product API for product variants
 
 HOOKs
 NEW: Hook on propal card

From fd8bfcfd3b98c8f5c427a1e759f0017a6da1d698 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Dec 2020 17:25:38 +0100
Subject: [PATCH 594/888] FIX Update Restler API to 3.1.1 to fix error with
 php8

---
 dev/dolibarr_changes.txt                      |  16 +-
 htdocs/api/class/api_documents.class.php      |   2 +-
 htdocs/api/class/api_login.class.php          |   2 +-
 .../framework/Luracast/Restler/ApcCache.php   |   2 +-
 .../framework/Luracast/Restler/AutoLoader.php |   2 +-
 .../Luracast/Restler/CommentParser.php        |  56 +++---
 .../framework/Luracast/Restler/Compose.php    |   2 +-
 .../Luracast/Restler/Data/ApiMethodInfo.php   |   2 +-
 .../framework/Luracast/Restler/Data/Arr.php   |   2 +-
 .../Luracast/Restler/Data/Invalid.php         |   2 +-
 .../framework/Luracast/Restler/Data/Obj.php   |   2 +-
 .../framework/Luracast/Restler/Data/Text.php  | 164 +++++++++---------
 .../Luracast/Restler/Data/ValidationInfo.php  |   2 +-
 .../Luracast/Restler/Data/Validator.php       |   2 +-
 .../Luracast/Restler/Data/ValueObject.php     |   2 +-
 .../Luracast/Restler/Data/iValidate.php       |   2 +-
 .../Luracast/Restler/Data/iValueObject.php    |   2 +-
 .../framework/Luracast/Restler/Defaults.php   |   2 +-
 .../Luracast/Restler/EventDispatcher.php      |   2 +-
 .../Luracast/Restler/Filter/RateLimit.php     |   2 +-
 .../framework/Luracast/Restler/Flash.php      |   2 +-
 .../Luracast/Restler/Format/AmfFormat.php     |   2 +-
 .../Luracast/Restler/Format/CsvFormat.php     |   2 +-
 .../Luracast/Restler/Format/Format.php        |   2 +-
 .../Luracast/Restler/Format/HtmlFormat.php    | 144 ++++++++++-----
 .../Luracast/Restler/Format/JsFormat.php      |   2 +-
 .../Luracast/Restler/Format/JsonFormat.php    |   2 +-
 .../Luracast/Restler/Format/MultiFormat.php   |   2 +-
 .../Luracast/Restler/Format/PlistFormat.php   |   2 +-
 .../Luracast/Restler/Format/TsvFormat.php     |   2 +-
 .../Luracast/Restler/Format/UploadFormat.php  |   2 +-
 .../Restler/Format/UrlEncodedFormat.php       |   2 +-
 .../Luracast/Restler/Format/XmlFormat.php     |   2 +-
 .../Luracast/Restler/Format/YamlFormat.php    |   2 +-
 .../Luracast/Restler/Format/iDecodeStream.php |   2 +-
 .../Luracast/Restler/Format/iFormat.php       |   2 +-
 .../Luracast/Restler/HumanReadableCache.php   |   2 +-
 .../Restler/InvalidAuthCredentials.php        |   2 +-
 .../Luracast/Restler/PassThrough.php          |   2 +-
 .../framework/Luracast/Restler/Redirect.php   |   2 +-
 .../framework/Luracast/Restler/Resources.php  |   2 +-
 .../Luracast/Restler/RestException.php        |   2 +-
 .../framework/Luracast/Restler/Restler.php    |  10 +-
 .../framework/Luracast/Restler/Routes.php     |   2 +-
 .../framework/Luracast/Restler/Scope.php      |  27 +--
 .../framework/Luracast/Restler/UI/Emmet.php   |   2 +-
 .../framework/Luracast/Restler/UI/Forms.php   | 160 ++++++++++-------
 .../framework/Luracast/Restler/UI/Nav.php     |   5 +-
 .../framework/Luracast/Restler/UI/Tags.php    |   2 +-
 .../framework/Luracast/Restler/User.php       |   2 +-
 .../framework/Luracast/Restler/Util.php       |  55 +++---
 .../Luracast/Restler/iAuthenticate.php        |   2 +-
 .../framework/Luracast/Restler/iCache.php     |   2 +-
 .../framework/Luracast/Restler/iCompose.php   |   2 +-
 .../framework/Luracast/Restler/iFilter.php    |   2 +-
 .../Luracast/Restler/iIdentifyUser.php        |   2 +-
 .../Restler/iProvideMultiVersionApi.php       |   2 +-
 .../Luracast/Restler/iUseAuthentication.php   |   2 +-
 58 files changed, 437 insertions(+), 298 deletions(-)

diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
index 98a6d2176aa..5648381ff49 100644
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -229,11 +229,21 @@ Change content of file htdocs/includes/restler/framework/Luracast/Restler/explor
     public static function getShortName($className)
     {
     	// @CHANGE LDR
-    	if (! is_string($className)) return;
+    	if (!is_string($className)) return;
     	//var_dump($className);
 
-    	
-    	
+* Add line into Data/Text.php to complete function
+
+    public static function endsWith($haystack, $needle)
+    {
+        $length = strlen($needle);
+        if ($length == 0) {
+            return true;
+        }
+    	// @CHANGE LDR
+        if (!is_string($haystack)) return false;
+
+
 PARSEDOWN
 ---------
 
diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index bdf86a5c2c9..2d6a598398c 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -707,7 +707,7 @@ class Documents extends DolibarrApi
 
 		if (!empty($createdirifnotexists)) {
 			if (dol_mkdir($upload_dir) < 0) { // needed by products
-				throw new RestException(500, 'Error while trying to create directory.');
+				throw new RestException(500, 'Error while trying to create directory '.$upload_dir);
 			}
 		}
 
diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php
index cb2fdd54d66..08439214b8e 100644
--- a/htdocs/api/class/api_login.class.php
+++ b/htdocs/api/class/api_login.class.php
@@ -109,7 +109,7 @@ class Login
 			}
 
 			// Generate token for user
-			$token = dol_hash($login.uniqid().$conf->global->MAIN_API_KEY, 1);
+			$token = dol_hash($login.uniqid().(empty($conf->global->MAIN_API_KEY)?'':$conf->global->MAIN_API_KEY), 1);
 
 			// We store API token into database
 			$sql = "UPDATE ".MAIN_DB_PREFIX."user";
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/ApcCache.php b/htdocs/includes/restler/framework/Luracast/Restler/ApcCache.php
index b8cdd95b373..a2ddc83c44f 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/ApcCache.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/ApcCache.php
@@ -13,7 +13,7 @@ use Luracast\Restler\iCache;
  * @copyright  2013 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class ApcCache implements iCache
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php b/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
index d8445fdc70c..5ed160a070a 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
@@ -12,7 +12,7 @@ namespace Luracast\Restler {
  * @subpackage helper
  * @author     Nick Lombard <github@jigsoft.co.za>
  * @copyright  2012 Luracast
- * @version    3.0.0rc6
+ *
  */
 class AutoLoader
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php b/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php
index 2815f1f6c70..6b8b9178f6b 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Luracast\Restler;
 
 use Exception;
@@ -14,7 +15,7 @@ use Luracast\Restler\Data\Text;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class CommentParser
 {
@@ -55,8 +56,8 @@ class CommentParser
      * @var array annotations that support array value
      */
     public static $allowsArrayValue = array(
-        'choice' => true,
-        'select' => true,
+        'choice'     => true,
+        'select'     => true,
         'properties' => true,
     );
 
@@ -220,7 +221,7 @@ class CommentParser
      */
     private function parseParam($param, array $value, array $embedded)
     {
-        $data = & $this->_data;
+        $data = &$this->_data;
         $allowMultiple = false;
         switch ($param) {
             case 'param' :
@@ -237,7 +238,7 @@ class CommentParser
                 $value = $this->formatReturn($value);
                 break;
             case 'class' :
-                $data = & $data[$param];
+                $data = &$data[$param];
                 list ($param, $value) = $this->formatClass($value);
                 break;
             case 'access' :
@@ -294,7 +295,7 @@ class CommentParser
                     += $data[$param][self::$embeddedDataName];
             }
             if (!is_array($data[$param])) {
-                $data[$param] = array('description' => (string) $data[$param]);
+                $data[$param] = array('description' => (string)$data[$param]);
             }
             if (is_array($value)) {
                 $data[$param] = $value + $data[$param];
@@ -320,19 +321,24 @@ class CommentParser
             $data['pattern'] = $matches[2];
         }
         while (preg_match('/{@(\w+)\s?([^}]*)}/ms', $subject, $matches)) {
+            $name = $matches[1];
+            $value = $matches[2];
             $subject = str_replace($matches[0], '', $subject);
-            if ($matches[1] == 'pattern') {
+            if ($name == 'pattern') {
                 throw new Exception('Inline pattern tag should follow {@pattern /REGEX_PATTERN_HERE/} format and can optionally include PCRE modifiers following the ending `/`');
-            } elseif (isset(static::$allowsArrayValue[$matches[1]])) {
-                $matches[2] = explode(static::$arrayDelimiter, $matches[2]);
-            } elseif ($matches[2] == 'true' || $matches[2] == 'false') {
-                $matches[2] = $matches[2] == 'true';
-            } elseif ($matches[2] == '') {
-                $matches[2] = true;
-            } elseif ($matches[1] == 'required') {
-                $matches[2] = explode(static::$arrayDelimiter, $matches[2]);
+            } elseif (isset(static::$allowsArrayValue[$name])) {
+                $value = explode(static::$arrayDelimiter, $value);
+            } elseif ($value == 'true' || $value == 'false') {
+                $value = $value == 'true';
+            } elseif ($value == '') {
+                $value = true;
+            } elseif ($name == 'required') {
+                $value = explode(static::$arrayDelimiter, $value);
             }
-            $data[$matches[1]] = $matches[2];
+            if (defined('Luracast\\Restler\\UI\\HtmlForm::'.$name)) {
+                $value = constant($value);
+            }
+            $data[$name] = $value;
         }
 
         while (preg_match(self::$embeddedDataPattern, $subject, $matches)) {
@@ -340,9 +346,9 @@ class CommentParser
             $str = $matches[self::$embeddedDataIndex];
             if (isset ($this->restler)
                 && self::$embeddedDataIndex > 1
-                && !empty ($matches[1])
+                && !empty ($name)
             ) {
-                $extension = $matches[1];
+                $extension = $name;
                 $formatMap = $this->restler->getFormatMap();
                 if (isset ($formatMap[$extension])) {
                     /**
@@ -397,15 +403,15 @@ class CommentParser
     {
         $code = 500;
         $exception = 'Exception';
-        if(count($value)>1){
+        if (count($value) > 1) {
             $v1 = $value[0];
             $v2 = $value[1];
-            if(is_numeric($v1)){
+            if (is_numeric($v1)) {
                 $code = $v1;
                 $exception = $v2;
                 array_shift($value);
                 array_shift($value);
-            } elseif(is_numeric($v2)){
+            } elseif (is_numeric($v2)) {
                 $code = $v2;
                 $exception = $v1;
                 array_shift($value);
@@ -414,17 +420,17 @@ class CommentParser
                 $exception = $v1;
                 array_shift($value);
             }
-        } elseif(count($value) && is_numeric($value[0])) {
+        } elseif (count($value) && is_numeric($value[0])) {
             $code = $value[0];
             array_shift($value);
         }
         $message = implode(' ', $value);
-        if(!isset(RestException::$codes[$code])){
+        if (!isset(RestException::$codes[$code])) {
             $code = 500;
-        } elseif(empty($message)){
+        } elseif (empty($message)) {
             $message = RestException::$codes[$code];
         }
-        return compact('code','message','exception');
+        return compact('code', 'message', 'exception');
     }
 
     private function formatClass(array $value)
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Compose.php b/htdocs/includes/restler/framework/Luracast/Restler/Compose.php
index 594e5902004..141aa8bcb2f 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Compose.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Compose.php
@@ -11,7 +11,7 @@ namespace Luracast\Restler;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Compose implements iCompose
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/ApiMethodInfo.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/ApiMethodInfo.php
index 4d0fa4bfd48..f4dea84df97 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Data/ApiMethodInfo.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Data/ApiMethodInfo.php
@@ -11,7 +11,7 @@ namespace Luracast\Restler\Data;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class ApiMethodInfo extends ValueObject
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/Arr.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/Arr.php
index 6e98a4132ea..8ae18c7003d 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Data/Arr.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Data/Arr.php
@@ -10,7 +10,7 @@ namespace Luracast\Restler\Data;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Arr
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/Invalid.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/Invalid.php
index 6b06d266f13..832dd30850e 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Data/Invalid.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Data/Invalid.php
@@ -12,7 +12,7 @@ use Exception;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Invalid extends Exception
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/Obj.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/Obj.php
index 003f1df8794..8fe2a79ab63 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Data/Obj.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Data/Obj.php
@@ -11,7 +11,7 @@ namespace Luracast\Restler\Data;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Obj
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/Text.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/Text.php
index 506ea25fb20..d0b39896c8e 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Data/Text.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Data/Text.php
@@ -10,87 +10,91 @@ namespace Luracast\Restler\Data;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Text
 {
-    /**
-     * Given haystack contains the needle or not?
-     *
-     * @param string $haystack
-     * @param string $needle
-     * @param bool $caseSensitive
-     *
-     * @return bool
-     */
-    public static function contains($haystack, $needle, $caseSensitive = true)
-    {
-        if (empty($needle))
-            return true;
-        return $caseSensitive
-            ? strpos($haystack, $needle) !== false
-            : stripos($haystack, $needle) !== false;
-    }
-
-    /**
-     * Given haystack begins with the needle or not?
-     *
-     * @param string $haystack
-     * @param string $needle
-     *
-     * @return bool
-     */
-    public static function beginsWith($haystack, $needle)
-    {
-        $length = strlen($needle);
-        return (substr($haystack, 0, $length) === $needle);
-    }
-
-    /**
-     * Given haystack ends with the needle or not?
-     *
-     * @param string $haystack
-     * @param string $needle
-     *
-     * @return bool
-     */
-    public static function endsWith($haystack, $needle)
-    {
-        $length = strlen($needle);
-        if ($length == 0) {
-            return true;
-        }
-        return (substr($haystack, -$length) === $needle);
-    }
-
-
-    /**
-     * Convert camelCased or underscored string in to a title
-     *
-     * @param string $name
-     *
-     * @return string
-     */
-    public static function title($name)
-    {
-        return
-            ucwords(
-                preg_replace(
-                    array('/(?<=[^A-Z])([A-Z])/', '/(?<=[^0-9])([0-9])/', '/([_-])/', '/[^a-zA-Z0-9\s]|\s\s+/'),
-                    array(' $0', ' $0', ' ', ' '),
-                    $name
-                )
-            );
-    }
-
-    /**
-     * Convert given string to be used as a slug or css class
-     *
-     * @param string $name
-     * @return string
-     */
-    public static function slug($name)
-    {
-        return preg_replace('/[^a-zA-Z]+/', '-', strtolower(strip_tags($name)));
-    }
+	/**
+	 * Given haystack contains the needle or not?
+	 *
+	 * @param string $haystack
+	 * @param string $needle
+	 * @param bool $caseSensitive
+	 *
+	 * @return bool
+	 */
+	public static function contains($haystack, $needle, $caseSensitive = true)
+	{
+		if (empty($needle))
+			return true;
+			return $caseSensitive
+			? strpos($haystack, $needle) !== false
+			: stripos($haystack, $needle) !== false;
+	}
+	
+	/**
+	 * Given haystack begins with the needle or not?
+	 *
+	 * @param string $haystack
+	 * @param string $needle
+	 *
+	 * @return bool
+	 */
+	public static function beginsWith($haystack, $needle)
+	{
+		$length = strlen($needle);
+		return (substr($haystack, 0, $length) === $needle);
+	}
+	
+	/**
+	 * Given haystack ends with the needle or not?
+	 *
+	 * @param string $haystack
+	 * @param string $needle
+	 *
+	 * @return bool
+	 */
+	public static function endsWith($haystack, $needle)
+	{
+		$length = strlen($needle);
+		if ($length == 0) {
+			return true;
+		}
+		
+		// @CHANGE LDR
+		if (!is_string($haystack)) return false;
+		
+		return (substr($haystack, -$length) === $needle);
+	}
+	
+	
+	/**
+	 * Convert camelCased or underscored string in to a title
+	 *
+	 * @param string $name
+	 *
+	 * @return string
+	 */
+	public static function title($name)
+	{
+		return
+		ucwords(
+			preg_replace(
+				array('/(?<=[^A-Z])([A-Z])/', '/(?<=[^0-9])([0-9])/', '/([_-])/', '/[^a-zA-Z0-9\s]|\s\s+/'),
+				array(' $0', ' $0', ' ', ' '),
+				$name
+				)
+			);
+	}
+	
+	/**
+	 * Convert given string to be used as a slug or css class
+	 *
+	 * @param string $name
+	 * @return string
+	 */
+	public static function slug($name)
+	{
+		return preg_replace('/[^a-zA-Z]+/', '-', strtolower(strip_tags($name)));
+	}
 } 
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/ValidationInfo.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/ValidationInfo.php
index 298b72ec125..fc05c5386df 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Data/ValidationInfo.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Data/ValidationInfo.php
@@ -15,7 +15,7 @@ use Luracast\Restler\Util;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class ValidationInfo implements iValueObject
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/Validator.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/Validator.php
index c98a17a62d6..023fc7c4d1e 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Data/Validator.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Data/Validator.php
@@ -18,7 +18,7 @@ use Luracast\Restler\Util;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Validator implements iValidate
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/ValueObject.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/ValueObject.php
index 46857b45329..5a2b001e841 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Data/ValueObject.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Data/ValueObject.php
@@ -11,7 +11,7 @@ namespace Luracast\Restler\Data;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class ValueObject implements iValueObject
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/iValidate.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/iValidate.php
index 66688b066ba..923fc79b1ce 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Data/iValidate.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Data/iValidate.php
@@ -10,7 +10,7 @@ namespace Luracast\Restler\Data;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 interface iValidate {
 
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/iValueObject.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/iValueObject.php
index dbf36cb744c..dcce824a655 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Data/iValueObject.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Data/iValueObject.php
@@ -11,7 +11,7 @@ namespace Luracast\Restler\Data;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 interface iValueObject
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Defaults.php b/htdocs/includes/restler/framework/Luracast/Restler/Defaults.php
index 8913db316b5..803c8b3177a 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Defaults.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Defaults.php
@@ -15,7 +15,7 @@ use Luracast\Restler\Data\Validator;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Defaults
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/EventDispatcher.php b/htdocs/includes/restler/framework/Luracast/Restler/EventDispatcher.php
index f8cd883af46..0c5d0fa676c 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/EventDispatcher.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/EventDispatcher.php
@@ -9,7 +9,7 @@ namespace Luracast\Restler;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 use Closure;
 
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Filter/RateLimit.php b/htdocs/includes/restler/framework/Luracast/Restler/Filter/RateLimit.php
index 5dce8591bba..e5705136fce 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Filter/RateLimit.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Filter/RateLimit.php
@@ -15,7 +15,7 @@ use Luracast\Restler\RestException;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class RateLimit implements iFilter, iUseAuthentication
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Flash.php b/htdocs/includes/restler/framework/Luracast/Restler/Flash.php
index 3ab04aa745e..41d097f312d 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Flash.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Flash.php
@@ -15,7 +15,7 @@ use ArrayAccess;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Flash implements ArrayAccess
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/AmfFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/AmfFormat.php
index 3d146fbcfac..181d95bea46 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/AmfFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/AmfFormat.php
@@ -17,7 +17,7 @@ use ZendAmf\Parser\OutputStream;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class AmfFormat extends DependentFormat
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/CsvFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/CsvFormat.php
index 4bed88251c8..c33557f8463 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/CsvFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/CsvFormat.php
@@ -15,7 +15,7 @@ use Luracast\Restler\RestException;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class CsvFormat extends Format implements iDecodeStream
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/Format.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/Format.php
index 10b2c5834e6..edc2cbde719 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/Format.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/Format.php
@@ -10,7 +10,7 @@ namespace Luracast\Restler\Format;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 abstract class Format implements iFormat
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/HtmlFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/HtmlFormat.php
index e871186c446..493e3e44061 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/HtmlFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/HtmlFormat.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Luracast\Restler\Format;
 
 use Exception;
@@ -6,8 +7,8 @@ use Illuminate\Events\Dispatcher;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\View\Compilers\BladeCompiler;
 use Illuminate\View\Engines\CompilerEngine;
-use Illuminate\View\Engines\PhpEngine;
 use Illuminate\View\Engines\EngineResolver;
+use Illuminate\View\Engines\PhpEngine;
 use Illuminate\View\Factory;
 use Illuminate\View\FileViewFinder;
 use Illuminate\View\View;
@@ -18,6 +19,10 @@ use Luracast\Restler\Restler;
 use Luracast\Restler\Scope;
 use Luracast\Restler\UI\Nav;
 use Luracast\Restler\Util;
+use Twig\Environment;
+use Twig\Extension\DebugExtension;
+use Twig\Loader\FilesystemLoader;
+use Twig\TwigFunction;
 
 /**
  * Html template format
@@ -29,10 +34,14 @@ use Luracast\Restler\Util;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class HtmlFormat extends DependentFormat
 {
+    const BLADE = 'Illuminate\View\View';
+    const TWIG = 'Twig\Environment';
+    const MUSTACHE = 'Mustache_Engine';
+
     public static $mime = 'text/html';
     public static $extension = 'html';
     public static $view;
@@ -84,11 +93,12 @@ class HtmlFormat extends DependentFormat
         }
     }
 
-    public function getDependencyMap(){
+    public function getDependencyMap()
+    {
         return array(
-            'Illuminate\View\View' => 'illuminate/view:4.2.*',
-            'Twig_Environment' => 'twig/twig:v1.13.*',
-            'Mustache_Engine' => 'mustache/mustache:dev-master',
+            self::BLADE    => 'illuminate/view:^8',
+            self::TWIG     => 'twig/twig:^3',
+            self::MUSTACHE => 'mustache/mustache:dev-master',
         );
     }
 
@@ -101,7 +111,7 @@ class HtmlFormat extends DependentFormat
         $resolver->register('blade', function () use ($engine) {
             return $engine;
         });
-        $phpEngine = new PhpEngine();
+        $phpEngine = new PhpEngine($files);
         $resolver->register('php', function () use ($phpEngine) {
             return $phpEngine;
         });
@@ -128,32 +138,43 @@ class HtmlFormat extends DependentFormat
         return $view->render();
     }
 
-    public static function twig(array $data, $debug = true)
+    /**
+     * @param array|object $data
+     * @param bool         $debug
+     *
+     * @return string
+     * @throws \Twig\Error\LoaderError
+     * @throws \Twig\Error\RuntimeError
+     * @throws \Twig\Error\SyntaxError
+     */
+    public static function twig($data, $debug = true)
     {
-        $loader = new \Twig_Loader_Filesystem(static::$viewPath);
-        $twig = new \Twig_Environment($loader, array(
-            'cache' => static::$cacheDirectory,
-            'debug' => $debug,
+        $loader = new FilesystemLoader(static::$viewPath);
+        $twig = new Environment($loader, array(
+            'cache'                => is_string(static::$cacheDirectory)
+                ? static::$cacheDirectory : false,
+            'debug'                => $debug,
             'use_strict_variables' => $debug,
         ));
-        if ($debug)
-            $twig->addExtension(new \Twig_Extension_Debug());
+        if ($debug) {
+            $twig->addExtension(new DebugExtension());
+        }
 
         $twig->addFunction(
-            new \Twig_SimpleFunction(
+            new TwigFunction(
                 'form',
                 'Luracast\Restler\UI\Forms::get',
                 array('is_safe' => array('html'))
             )
         );
         $twig->addFunction(
-            new \Twig_SimpleFunction(
+            new TwigFunction(
                 'form_key',
                 'Luracast\Restler\UI\Forms::key'
             )
         );
         $twig->addFunction(
-            new \Twig_SimpleFunction(
+            new TwigFunction(
                 'nav',
                 'Luracast\Restler\UI\Nav::get'
             )
@@ -164,7 +185,7 @@ class HtmlFormat extends DependentFormat
                 isset(HtmlFormat::$data[$name]) &&
                 is_callable(HtmlFormat::$data[$name])
             ) {
-                return new \Twig_SimpleFunction(
+                return new TwigFunction(
                     $name,
                     HtmlFormat::$data[$name]
                 );
@@ -172,21 +193,35 @@ class HtmlFormat extends DependentFormat
             return false;
         });
 
-        $template = $twig->loadTemplate(static::getViewFile());
-        return $template->render($data);
+        $template = $twig->load(static::getViewFile());
+        return $template->render((array)$data);
     }
 
-    public static function handlebar(array $data, $debug = true)
+    /**
+     * @param array|object $data
+     * @param bool         $debug
+     *
+     * @return string
+     */
+    public static function handlebar($data, $debug = true)
     {
         return static::mustache($data, $debug);
     }
 
-    public static function mustache(array $data, $debug = true)
+    /**
+     * @param array|object $data
+     * @param bool         $debug
+     *
+     * @return string
+     */
+    public static function mustache($data, $debug = true)
     {
-        if (!isset($data['nav']))
+        $data = (array)$data;
+        if (!isset($data['nav'])) {
             $data['nav'] = array_values(Nav::get());
+        }
         $options = array(
-            'loader' => new \Mustache_Loader_FilesystemLoader(
+            'loader'  => new \Mustache_Loader_FilesystemLoader(
                 static::$viewPath,
                 array('extension' => static::getViewExtension())
             ),
@@ -200,16 +235,25 @@ class HtmlFormat extends DependentFormat
                 },
             )
         );
-        if (!$debug)
+        if (!$debug) {
             $options['cache'] = static::$cacheDirectory;
+        }
         $m = new \Mustache_Engine($options);
         return $m->render(static::getViewFile(), $data);
     }
 
-    public static function php(array $data, $debug = true)
+    /**
+     * @param array|object $data
+     * @param bool         $debug
+     *
+     * @return string
+     * @throws RestException
+     */
+    public static function php($data, $debug = true)
     {
-        if (static::$view == 'debug')
+        if (static::$view == 'debug') {
             static::$viewPath = dirname(__DIR__) . '/views';
+        }
         $view = static::getViewFile(true);
 
         if (!is_readable($view)) {
@@ -222,22 +266,26 @@ class HtmlFormat extends DependentFormat
 
         $path = static::$viewPath . DIRECTORY_SEPARATOR;
         $template = function ($view) use ($data, $path) {
+            $data = (array)$data;
             $form = function () {
                 return call_user_func_array(
                     'Luracast\Restler\UI\Forms::get',
                     func_get_args()
                 );
             };
-            if (!isset($data['form']))
+            if (!isset($data['form'])) {
                 $data['form'] = $form;
+            }
             $nav = function () {
                 return call_user_func_array(
                     'Luracast\Restler\UI\Nav::get',
                     func_get_args()
                 );
             };
-            if (!isset($data['nav']))
+            if (!isset($data['nav'])) {
                 $data['nav'] = $nav;
+            }
+
 
             $_ = function () use ($data, $path) {
                 extract($data);
@@ -254,7 +302,7 @@ class HtmlFormat extends DependentFormat
                             ) {
                                 $str = '';
                                 foreach ($arrays as $arr) {
-                                    extract($arr);
+                                    extract((array)$arr);
                                     $str .= include $file;
                                 }
                                 return $str;
@@ -264,15 +312,18 @@ class HtmlFormat extends DependentFormat
                         }
                         break;
                     case 'if':
-                        if (count($args) < 2)
+                        if (count($args) < 2) {
                             $args[1] = '';
-                        if (count($args) < 3)
+                        }
+                        if (count($args) < 3) {
                             $args[2] = '';
+                        }
                         return $args[0] ? $args[1] : $args[2];
                         break;
                     default:
-                        if (isset($data[$task]) && is_callable($data[$task]))
+                        if (isset($data[$task]) && is_callable($data[$task])) {
                             return call_user_func_array($data[$task], $args);
+                        }
                 }
                 return '';
             };
@@ -280,8 +331,9 @@ class HtmlFormat extends DependentFormat
             return @include $view;
         };
         $value = $template($view);
-        if (is_string($value))
+        if (is_string($value)) {
             return $value;
+        }
     }
 
     /**
@@ -294,8 +346,8 @@ class HtmlFormat extends DependentFormat
      *                                     Formatter has to make the encoded
      *                                     output more human readable
      *
-     * @throws \Exception
      * @return string encoded string
+     * @throws \Exception
      */
     public function encode($data, $humanReadable = false)
     {
@@ -317,9 +369,9 @@ class HtmlFormat extends DependentFormat
                 'response' => static::$convertResponseToArray
                     ? Obj::toArray($data)
                     : $data,
-                'stages' => $this->restler->getEvents(),
-                'success' => $success,
-                'error' => $error
+                'stages'   => $this->restler->getEvents(),
+                'success'  => $success,
+                'error'    => $error
             );
             $info = $data['api'] = $this->restler->apiMethodInfo;
             $metadata = Util::nestedValue(
@@ -358,7 +410,9 @@ class HtmlFormat extends DependentFormat
             if ($value) {
                 $data = Util::nestedValue($data, explode('.', $value));
             }
-            $data += static::$data;
+            if (is_array($data)) {
+                $data += static::$data;
+            }
             if (false === ($i = strrpos(self::$view, '.'))) {
                 $template = self::$template;
             } else {
@@ -369,17 +423,18 @@ class HtmlFormat extends DependentFormat
                 static::$cacheDirectory = Defaults::$cacheDirectory . DIRECTORY_SEPARATOR . $template;
                 if (!file_exists(static::$cacheDirectory)) {
                     if (!mkdir(static::$cacheDirectory, 0770, true)) {
-                        throw new RestException(500, 'Unable to create cache directory `' . static::$cacheDirectory . '`');
+                        throw new RestException(500,
+                            'Unable to create cache directory `' . static::$cacheDirectory . '`');
                     }
                 }
             }
             if (method_exists($class = get_called_class(), $template)) {
                 if ($template == 'blade') {
-                    $this->checkDependency('Illuminate\View\View');
+                    $this->checkDependency(self::BLADE);
                 } elseif ($template == 'twig') {
-                    $this->checkDependency('Twig_Environment');
+                    $this->checkDependency(self::TWIG);
                 } elseif ($template == 'mustache' || $template == 'handlebar') {
-                    $this->checkDependency('Mustache_Engine');
+                    $this->checkDependency(self::MUSTACHE);
                 }
                 return call_user_func("$class::$template", $data, $humanReadable);
             }
@@ -416,8 +471,9 @@ class HtmlFormat extends DependentFormat
     {
         $v = $fullPath ? static::$viewPath . '/' : '';
         $v .= static::$view;
-        if ($includeExtension)
+        if ($includeExtension) {
             $v .= '.' . static::getViewExtension();
+        }
         return $v;
     }
 
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/JsFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/JsFormat.php
index 0f04b7f0ee5..913dc272e19 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/JsFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/JsFormat.php
@@ -11,7 +11,7 @@ namespace Luracast\Restler\Format;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class JsFormat extends JsonFormat
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/JsonFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/JsonFormat.php
index 00c763e8ff5..170676c071b 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/JsonFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/JsonFormat.php
@@ -15,7 +15,7 @@ use Luracast\Restler\RestException;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class JsonFormat extends Format
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/MultiFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/MultiFormat.php
index 18fdd54b842..64afa3b3ea4 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/MultiFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/MultiFormat.php
@@ -9,7 +9,7 @@ namespace Luracast\Restler\Format;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 abstract class MultiFormat implements iFormat
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/PlistFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/PlistFormat.php
index cc07066a33c..f1eca01933d 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/PlistFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/PlistFormat.php
@@ -18,7 +18,7 @@ use CFPropertyList\CFPropertyList;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class PlistFormat extends DependentMultiFormat
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/TsvFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/TsvFormat.php
index 502b02d2758..4eb3006f363 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/TsvFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/TsvFormat.php
@@ -11,7 +11,7 @@ namespace Luracast\Restler\Format;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class TsvFormat extends CsvFormat
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/UploadFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/UploadFormat.php
index de41bf98c71..b58b0f02b49 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/UploadFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/UploadFormat.php
@@ -13,7 +13,7 @@ use Luracast\Restler\RestException;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class UploadFormat extends Format
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/UrlEncodedFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/UrlEncodedFormat.php
index 12d5a410333..6d141230d82 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/UrlEncodedFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/UrlEncodedFormat.php
@@ -11,7 +11,7 @@ namespace Luracast\Restler\Format;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class UrlEncodedFormat extends Format
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php
index ceec32e4cb5..6f8606eb111 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php
@@ -16,7 +16,7 @@ use XMLWriter;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class XmlFormat extends Format
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/YamlFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/YamlFormat.php
index 07baae88b6f..4ff643de65f 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/YamlFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/YamlFormat.php
@@ -14,7 +14,7 @@ use Luracast\Restler\Data\Obj;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class YamlFormat extends DependentFormat
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/iDecodeStream.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/iDecodeStream.php
index 080e3da506c..ec29330ed1f 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/iDecodeStream.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/iDecodeStream.php
@@ -11,7 +11,7 @@ namespace Luracast\Restler\Format;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 interface iDecodeStream
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/iFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/iFormat.php
index d70d2019a94..0f4173d5b74 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/iFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/iFormat.php
@@ -11,7 +11,7 @@ namespace Luracast\Restler\Format;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 interface iFormat
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/HumanReadableCache.php b/htdocs/includes/restler/framework/Luracast/Restler/HumanReadableCache.php
index 6e1c22b432c..2546e30a4ee 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/HumanReadableCache.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/HumanReadableCache.php
@@ -10,7 +10,7 @@ namespace Luracast\Restler;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class HumanReadableCache implements iCache
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/InvalidAuthCredentials.php b/htdocs/includes/restler/framework/Luracast/Restler/InvalidAuthCredentials.php
index 233e543e0aa..1b402238bf3 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/InvalidAuthCredentials.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/InvalidAuthCredentials.php
@@ -12,7 +12,7 @@ namespace Luracast\Restler;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 
 
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/PassThrough.php b/htdocs/includes/restler/framework/Luracast/Restler/PassThrough.php
index a77e533b722..2d265fb0fba 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/PassThrough.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/PassThrough.php
@@ -10,7 +10,7 @@ namespace Luracast\Restler;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class PassThrough
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Redirect.php b/htdocs/includes/restler/framework/Luracast/Restler/Redirect.php
index 63319106759..8203b8eb18d 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Redirect.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Redirect.php
@@ -12,7 +12,7 @@ use Luracast\Restler\Format\JsonFormat;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Redirect
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Resources.php b/htdocs/includes/restler/framework/Luracast/Restler/Resources.php
index 2986968a990..dfb547d287b 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Resources.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Resources.php
@@ -15,7 +15,7 @@ use stdClass;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Resources implements iUseAuthentication, iProvideMultiVersionApi
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/RestException.php b/htdocs/includes/restler/framework/Luracast/Restler/RestException.php
index b2e51f8b122..4291381661c 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/RestException.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/RestException.php
@@ -14,7 +14,7 @@ use Exception;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 
 class RestException extends Exception
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Restler.php b/htdocs/includes/restler/framework/Luracast/Restler/Restler.php
index fcb5388726c..0c8f44a3864 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Restler.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Restler.php
@@ -15,13 +15,14 @@ use Luracast\Restler\Format\UrlEncodedFormat;
  * inspired by the RestServer code from
  * <http://jacwright.com/blog/resources/RestServer.txt>
  *
+ *
  * @category   Framework
  * @package    Restler
  * @author     R.Arul Kumaran <arul@luracast.com>
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  *
  * @method static void onGet() onGet(Callable $function) fired before reading the request details
  * @method static void onRoute() onRoute(Callable $function) fired before finding the api method
@@ -48,10 +49,13 @@ use Luracast\Restler\Format\UrlEncodedFormat;
  * @method void onRespond() onRespond(Callable $function) fired before sending response
  * @method void onComplete() onComplete(Callable $function) fired after sending response
  * @method void onMessage() onMessage(Callable $function) fired before composing error response
+ *
+ * @property bool|null  _authenticated
+ * @property bool _authVerified
  */
 class Restler extends EventDispatcher
 {
-    const VERSION = '3.0.0rc6';
+    const VERSION = '3.1.0';
 
     // ==================================================================
     //
@@ -693,6 +697,8 @@ class Restler extends EventDispatcher
      *  - media type
      *  - charset
      *  - language
+     *
+     * @throws RestException
      */
     protected function negotiate()
     {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Routes.php b/htdocs/includes/restler/framework/Luracast/Restler/Routes.php
index 999094dec4c..d59b27d4418 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Routes.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Routes.php
@@ -17,7 +17,7 @@ use Exception;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Routes
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Scope.php b/htdocs/includes/restler/framework/Luracast/Restler/Scope.php
index 16ccdd33561..6f7b49daf40 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Scope.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Scope.php
@@ -1,4 +1,6 @@
 <?php
+
+
 namespace Luracast\Restler;
 
 /**
@@ -11,7 +13,7 @@ namespace Luracast\Restler;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Scope
 {
@@ -45,8 +47,8 @@ class Scope
         //API classes
         'Resources'          => 'Luracast\Restler\Resources',
         'Explorer'           => 'Luracast\Restler\Explorer\v2\Explorer',
-        'Explorer1'           => 'Luracast\Restler\Explorer\v1\Explorer',
-        'Explorer2'           => 'Luracast\Restler\Explorer\v2\Explorer',
+        'Explorer1'          => 'Luracast\Restler\Explorer\v1\Explorer',
+        'Explorer2'          => 'Luracast\Restler\Explorer\v2\Explorer',
 
         //Cache classes
         'HumanReadableCache' => 'Luracast\Restler\HumanReadableCache',
@@ -120,6 +122,7 @@ class Scope
                 $r = new $fullName();
                 static::$instances[$name] = (object)array('instance' => $r);
                 if ($name != 'Restler') {
+                    /** @var Restler restler */
                     $r->restler = static::get('Restler');
                     $m = Util::nestedValue($r->restler, 'apiMethodInfo', 'metadata');
                     if ($m) {
@@ -138,15 +141,14 @@ class Scope
         }
         if (
             $r instanceof iUseAuthentication &&
-            static::get('Restler')->_authVerified &&
+            $r->restler && $r->restler->_authVerified &&
             !isset(static::$instances[$name]->authVerified)
         ) {
             static::$instances[$name]->authVerified = true;
-            $r->__setAuthenticationStatus
-            (static::get('Restler')->_authenticated);
+            $r->__setAuthenticationStatus($r->restler->_authenticated);
         }
         if (isset(static::$instances[$name]->initPending)) {
-            $m = Util::nestedValue(static::get('Restler'), 'apiMethodInfo', 'metadata');
+            $m = Util::nestedValue($r->restler, 'apiMethodInfo', 'metadata');
             $fullName = $name;
             if (class_exists($name)) {
                 $shortName = Util::getShortName($name);
@@ -194,15 +196,15 @@ class Scope
      */
     public static function resolve($className, array $scope)
     {
-        if (empty($className) || !is_string($className))
+        if (empty($className) || !is_string($className)) {
             return false;
+        }
 
         if (self::isPrimitiveDataType($className)) {
             return false;
         }
 
         $divider = '\\';
-        $qualified = false;
         if ($className[0] == $divider) {
             $qualified = trim($className, $divider);
         } elseif (array_key_exists($className, $scope)) {
@@ -210,18 +212,21 @@ class Scope
         } else {
             $qualified = $scope['*'] . $className;
         }
-        if (class_exists($qualified))
+        if (class_exists($qualified)) {
             return $qualified;
+        }
         if (isset(static::$classAliases[$className])) {
             $qualified = static::$classAliases[$className];
-            if (class_exists($qualified))
+            if (class_exists($qualified)) {
                 return $qualified;
+            }
         }
         return false;
     }
 
     /**
      * @param string $stringName
+     *
      * @return boolean
      */
     private static function isPrimitiveDataType($stringName)
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php b/htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php
index 435804b4469..66090568a47 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php
@@ -8,7 +8,7 @@ use Luracast\Restler\Util;
  * Class Emmet
  * @package Luracast\Restler\UI
  *
- * @version 3.0.0rc6
+ * @version 3.1.0
  */
 class Emmet
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/UI/Forms.php b/htdocs/includes/restler/framework/Luracast/Restler/UI/Forms.php
index 7073bfcf837..20749a2e691 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/UI/Forms.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/UI/Forms.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Luracast\Restler\UI;
 
 use Luracast\Restler\CommentParser;
@@ -29,7 +30,7 @@ use Luracast\Restler\Util;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Forms implements iFilter
 {
@@ -38,7 +39,7 @@ class Forms implements iFilter
 
     public static $excludedPaths = array();
 
-    public static $style;
+    private static $style;
     /**
      * @var bool should we fill up the form using given data?
      */
@@ -81,6 +82,11 @@ class Forms implements iFilter
      */
     private static $info;
 
+    public static function setStyles(HtmlForm $style)
+    {
+        static::$style = get_class($style);
+    }
+
     /**
      * Get the form
      *
@@ -95,18 +101,20 @@ class Forms implements iFilter
      *
      * @return array|T
      *
-     * @throws \Luracast\Restler\RestException
+     * @throws RestException
      */
     public static function get($method = 'POST', $action = null, $dataOnly = false, $prefix = '', $indent = '    ')
     {
-        if (!static::$style)
-            static::$style = FormStyles::$html;
+        if (!static::$style) {
+            static::$style = 'Luracast\\Restler\\UI\HtmlForm';
+        }
 
         try {
             /** @var Restler $restler */
             $restler = Scope::get('Restler');
-            if (is_null($action))
+            if (is_null($action)) {
                 $action = $restler->url;
+            }
 
             $info = $restler->url == $action
             && Util::getRequestMethod() == $method
@@ -126,23 +134,25 @@ class Forms implements iFilter
             //echo $e->getErrorMessage();
             $info = false;
         }
-        if (!$info)
+        if (!$info) {
             throw new RestException(500, 'invalid action path for form `' . $method . ' ' . $action . '`');
+        }
         static::$info = $info;
         $m = $info->metadata;
         $r = static::fields($dataOnly);
         if ($method != 'GET' && $method != 'POST') {
-            if (empty(Defaults::$httpMethodOverrideProperty))
+            if (empty(Defaults::$httpMethodOverrideProperty)) {
                 throw new RestException(
                     500,
                     'Forms require `Defaults::\$httpMethodOverrideProperty`' .
                     "for supporting HTTP $method"
                 );
+            }
             if ($dataOnly) {
                 $r[] = array(
-                    'tag' => 'input',
-                    'name' => Defaults::$httpMethodOverrideProperty,
-                    'type' => 'hidden',
+                    'tag'   => 'input',
+                    'name'  => Defaults::$httpMethodOverrideProperty,
+                    'type'  => 'hidden',
                     'value' => 'method',
                 );
             } else {
@@ -158,9 +168,9 @@ class Forms implements iFilter
             $form_key = static::key($method, $action);
             if ($dataOnly) {
                 $r[] = array(
-                    'tag' => 'input',
-                    'name' => static::FORM_KEY,
-                    'type' => 'hidden',
+                    'tag'   => 'input',
+                    'name'  => static::FORM_KEY,
+                    'type'  => 'hidden',
                     'value' => 'hidden',
                 );
             } else {
@@ -173,15 +183,16 @@ class Forms implements iFilter
         }
 
         $s = array(
-            'tag' => 'button',
-            'type' => 'submit',
+            'tag'   => 'button',
+            'type'  => 'submit',
             'label' =>
                 Util::nestedValue($m, 'return', CommentParser::$embeddedDataName, 'label')
-                    ? : 'Submit'
+                    ?: 'Submit'
         );
 
-        if (!$dataOnly)
+        if (!$dataOnly) {
             $s = Emmet::make(static::style('submit', $m), $s);
+        }
         $r[] = $s;
         $t = array(
             'action' => $restler->getBaseUrl() . '/' . rtrim($action, '/'),
@@ -207,15 +218,18 @@ class Forms implements iFilter
 
     public static function style($name, array $metadata, $type = '')
     {
-        return isset($metadata[CommentParser::$embeddedDataName][$name])
-            ? $metadata[CommentParser::$embeddedDataName][$name]
-            : (!empty($type) && isset(static::$style["$name-$type"])
-                ? static::$style["$name-$type"]
-                : (isset(static::$style[$name])
-                    ? static::$style[$name]
-                    : null
-                )
-            );
+        if (isset($metadata[CommentParser::$embeddedDataName][$name])) {
+            return $metadata[CommentParser::$embeddedDataName][$name];
+        }
+        $style = static::$style . '::' . $name;
+        $typedStyle = $style . '_' . $type;
+        if (defined($typedStyle)) {
+            return constant($typedStyle);
+        }
+        if (defined($style)) {
+            return constant($style);
+        }
+        return null;
     }
 
     public static function fields($dataOnly = false)
@@ -230,11 +244,13 @@ class Forms implements iFilter
                 is_scalar($value) ||
                 ($p['type'] == 'array' && is_array($value) && $value == array_values($value)) ||
                 is_object($value) && $p['type'] == get_class($value)
-            )
+            ) {
                 $p['value'] = $value;
+            }
             static::$validationInfo = $v = new ValidationInfo($p);
-            if ($v->from == 'path')
+            if ($v->from == 'path') {
                 continue;
+            }
             if (!empty($v->children)) {
                 $t = Emmet::make(static::style('fieldset', $m), array('label' => $v->label));
                 foreach ($v->children as $n => $c) {
@@ -243,11 +259,13 @@ class Forms implements iFilter
                         is_scalar($value) ||
                         ($c['type'] == 'array' && is_array($value) && $value == array_values($value)) ||
                         is_object($value) && $c['type'] == get_class($value)
-                    )
+                    ) {
                         $c['value'] = $value;
+                    }
                     static::$validationInfo = $vc = new ValidationInfo($c);
-                    if ($vc->from == 'path')
+                    if ($vc->from == 'path') {
                         continue;
+                    }
                     $vc->name = $v->name . '[' . $vc->name . ']';
                     $t [] = static::field($vc, $dataOnly);
                 }
@@ -275,7 +293,7 @@ class Forms implements iFilter
             //prevent XSS attacks
             $p->value = htmlspecialchars($p->value, ENT_QUOTES | ENT_HTML401, 'UTF-8');
         }
-        $type = $p->field ? : static::guessFieldType($p);
+        $type = $p->field ?: static::guessFieldType($p);
         $tag = in_array($type, static::$inputTypes)
             ? 'input' : $type;
         $options = array();
@@ -291,25 +309,33 @@ class Forms implements iFilter
                 $option['text'] = isset($p->rules['select'][$i])
                     ? $p->rules['select'][$i]
                     : $choice;
-                if ($choice == $p->value)
+                if ($choice == $p->value) {
                     $option['selected'] = true;
+                }
                 $options[] = $option;
             }
         } elseif ($p->type == 'boolean' || $p->type == 'bool') {
             if (Text::beginsWith($type, 'radio') || Text::beginsWith($type, 'select')) {
-                $options[] = array('name' => $p->name, 'text' => ' Yes ',
-                    'value' => 'true');
-                $options[] = array('name' => $p->name, 'text' => ' No ',
-                    'value' => 'false');
-                if ($p->value || $p->default)
+                $options[] = array(
+                    'name'  => $p->name,
+                    'text'  => ' Yes ',
+                    'value' => 'true'
+                );
+                $options[] = array(
+                    'name'  => $p->name,
+                    'text'  => ' No ',
+                    'value' => 'false'
+                );
+                if ($p->value || $p->default) {
                     $options[0]['selected'] = true;
+                }
             } else { //checkbox
                 $r = array(
-                    'tag' => $tag,
-                    'name' => $name,
-                    'type' => $type,
-                    'label' => $p->label,
-                    'value' => 'true',
+                    'tag'     => $tag,
+                    'name'    => $name,
+                    'type'    => $type,
+                    'label'   => $p->label,
+                    'value'   => 'true',
                     'default' => $p->default,
                 );
                 $r['text'] = 'Yes';
@@ -323,13 +349,13 @@ class Forms implements iFilter
         }
         if (empty($r)) {
             $r = array(
-                'tag' => $tag,
-                'name' => $name,
-                'type' => $type,
-                'label' => $p->label,
-                'value' => $p->value,
-                'default' => $p->default,
-                'options' => & $options,
+                'tag'      => $tag,
+                'name'     => $name,
+                'type'     => $type,
+                'label'    => $p->label,
+                'value'    => $p->value,
+                'default'  => $p->default,
+                'options'  => & $options,
                 'multiple' => $multiple,
             );
             if (isset($p->rules)) {
@@ -347,30 +373,36 @@ class Forms implements iFilter
             $r['message'] = Validator::$exceptions[$p->name]->getMessage();
         }
 
-        if (true === $p->required)
+        if (true === $p->required) {
             $r['required'] = 'required';
-        if (isset($p->rules['autofocus']))
+        }
+        if (isset($p->rules['autofocus'])) {
             $r['autofocus'] = 'autofocus';
+        }
         /*
         echo "<pre>";
         print_r($r);
         echo "</pre>";
         */
-        if ($dataOnly)
+        if ($dataOnly) {
             return $r;
-        if (isset($p->rules['form']))
+        }
+        if (isset($p->rules['form'])) {
             return Emmet::make($p->rules['form'], $r);
+        }
         $m = static::$info->metadata;
-        $t = Emmet::make(static::style($type, $m, $p->type) ? : static::style($tag, $m, $p->type), $r);
+        $t = Emmet::make(static::style($type, $m, $p->type) ?: static::style($tag, $m, $p->type), $r);
         return $t;
     }
 
     protected static function guessFieldType(ValidationInfo $p, $type = 'type')
     {
-        if (in_array($p->$type, static::$inputTypes))
+        if (in_array($p->$type, static::$inputTypes)) {
             return $p->$type;
-        if ($p->choice)
+        }
+        if ($p->choice) {
             return $p->type == 'array' ? 'checkbox' : 'select';
+        }
         switch ($p->$type) {
             case 'boolean':
                 return 'radio';
@@ -381,8 +413,9 @@ class Forms implements iFilter
             case 'array':
                 return static::guessFieldType($p, 'contentType');
         }
-        if ($p->name == 'password')
+        if ($p->name == 'password') {
             return 'password';
+        }
         return 'text';
     }
 
@@ -397,11 +430,13 @@ class Forms implements iFilter
      */
     public static function key($method = 'POST', $action = null)
     {
-        if (is_null($action))
+        if (is_null($action)) {
             $action = Scope::get('Restler')->url;
+        }
         $target = "$method $action";
-        if (empty(static::$key[$target]))
+        if (empty(static::$key[$target])) {
             static::$key[$target] = md5($target . User::getIpAddress() . uniqid(mt_rand()));
+        }
         $_SESSION[static::FORM_KEY] = static::$key;
         return static::$key[$target];
     }
@@ -425,8 +460,9 @@ class Forms implements iFilter
         $url = $restler->url;
         foreach (static::$excludedPaths as $exclude) {
             if (empty($exclude)) {
-                if ($url == $exclude)
+                if ($url == $exclude) {
                     return true;
+                }
             } elseif (Text::beginsWith($url, $exclude)) {
                 return true;
             }
@@ -447,4 +483,4 @@ class Forms implements iFilter
         }
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/UI/Nav.php b/htdocs/includes/restler/framework/Luracast/Restler/UI/Nav.php
index b74054a99c5..4a7445ccbe6 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/UI/Nav.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/UI/Nav.php
@@ -19,7 +19,7 @@ use Luracast\Restler\Util;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Nav
 {
@@ -130,7 +130,8 @@ class Nav
         } else {
             return $tree;
         }
-        return null;
+        $value = null;
+        return $value;
     }
 
     public static function addUrls(array $urls)
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/UI/Tags.php b/htdocs/includes/restler/framework/Luracast/Restler/UI/Tags.php
index 2c194cdbd1b..27e90bc89b5 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/UI/Tags.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/UI/Tags.php
@@ -14,7 +14,7 @@ use Luracast\Restler\Util;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  *
  * ============================ magic  properties ==============================
  * @property Tags parent parent tag
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/User.php b/htdocs/includes/restler/framework/Luracast/Restler/User.php
index 57465e26e46..463fd46867c 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/User.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/User.php
@@ -11,7 +11,7 @@ namespace Luracast\Restler;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class User implements iIdentifyUser
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Util.php b/htdocs/includes/restler/framework/Luracast/Restler/Util.php
index 9674550814f..a181a0e0da9 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Util.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Util.php
@@ -1,5 +1,7 @@
 <?php
+
 namespace Luracast\Restler;
+
 /**
  * Describe the purpose of this class/interface/trait
  *
@@ -9,7 +11,7 @@ namespace Luracast\Restler;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Util
 {
@@ -50,8 +52,8 @@ class Util
      * When the deeply nested property is found its value is returned, otherwise
      * false is returned.
      *
-     * @param array $from array to extract the value from
-     * @param string|array $key ... pass more to go deeply inside the array
+     * @param array|object $from    array to extract the value from
+     * @param string|array $key     ... pass more to go deeply inside the array
      *                              alternatively you can pass a single array
      *
      * @return null|mixed null when not found, value otherwise
@@ -77,24 +79,29 @@ class Util
         return $from;
     }
 
-    public static function getResourcePath($className,
-                                           $resourcePath = null,
-                                           $prefix = '')
-    {
+    public static function getResourcePath(
+        $className,
+        $resourcePath = null,
+        $prefix = ''
+    ) {
         if (is_null($resourcePath)) {
             if (Defaults::$autoRoutingEnabled) {
                 $resourcePath = strtolower($className);
-                if (false !== ($index = strrpos($className, '\\')))
+                if (false !== ($index = strrpos($className, '\\'))) {
                     $resourcePath = substr($resourcePath, $index + 1);
-                if (false !== ($index = strrpos($resourcePath, '_')))
+                }
+                if (false !== ($index = strrpos($resourcePath, '_'))) {
                     $resourcePath = substr($resourcePath, $index + 1);
+                }
             } else {
                 $resourcePath = '';
             }
-        } else
+        } else {
             $resourcePath = trim($resourcePath, '/');
-        if (strlen($resourcePath) > 0)
+        }
+        if (strlen($resourcePath) > 0) {
             $resourcePath .= '/';
+        }
         return $prefix . $resourcePath;
     }
 
@@ -114,8 +121,9 @@ class Util
      */
     public static function removeCommonPath($fromPath, $usingPath, $char = '/')
     {
-        if (empty($fromPath))
+        if (empty($fromPath)) {
             return '';
+        }
         $fromPath = explode($char, $fromPath);
         $usingPath = explode($char, $usingPath);
         while (count($usingPath)) {
@@ -145,8 +153,9 @@ class Util
      */
     public static function splitCommonPath($fromPath, $usingPath, $char = '/')
     {
-        if (empty($fromPath))
+        if (empty($fromPath)) {
             return array('', '');
+        }
         $fromPath = explode($char, $fromPath);
         $usingPath = explode($char, $usingPath);
         $commonPath = array();
@@ -213,11 +222,18 @@ class Util
             $accepts = array($accepts);
         }
         foreach ($accepts as $pos => $accept) {
-            $parts = explode(';q=', trim($accept));
-            $type = array_shift($parts);
-            $quality = count($parts) ?
-                floatval(array_shift($parts)) :
-                (1000 - $pos) / 1000;
+            $parts = explode(';', $accept);
+            $type = trim(array_shift($parts));
+            $parameters = [];
+            foreach ($parts as $part) {
+                $part = explode('=', $part);
+                if (2 !== count($part)) {
+                    continue;
+                }
+                $key = strtolower(trim($part[0]));
+                $parameters[$key] = trim($part[1], ' "');
+            }
+            $quality = isset($parameters['q']) ? (float)$parameters['q'] : (1000 - $pos) / 1000;
             $acceptList[$type] = $quality;
         }
         arsort($acceptList);
@@ -227,8 +243,7 @@ class Util
     public static function getShortName($className)
     {
     	// @CHANGE LDR
-    	if (! is_string($className)) return '';
-    	//var_dump($className);
+    	if (!is_string($className)) return;
     	
     	$className = explode('\\', $className);
         return end($className);
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/iAuthenticate.php b/htdocs/includes/restler/framework/Luracast/Restler/iAuthenticate.php
index 6bacb8cec09..954055343e4 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/iAuthenticate.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/iAuthenticate.php
@@ -11,7 +11,7 @@ namespace Luracast\Restler;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 interface iAuthenticate extends iFilter
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/iCache.php b/htdocs/includes/restler/framework/Luracast/Restler/iCache.php
index 37d6aaea261..3b6504340b6 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/iCache.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/iCache.php
@@ -9,7 +9,7 @@ namespace Luracast\Restler;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 interface iCache
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/iCompose.php b/htdocs/includes/restler/framework/Luracast/Restler/iCompose.php
index b06b2c3bc6c..2bc0579befe 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/iCompose.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/iCompose.php
@@ -13,7 +13,7 @@ use Exception;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 interface iCompose {
     /**
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/iFilter.php b/htdocs/includes/restler/framework/Luracast/Restler/iFilter.php
index 89b50ce9812..dc1b355db0f 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/iFilter.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/iFilter.php
@@ -12,7 +12,7 @@ namespace Luracast\Restler;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 interface iFilter
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/iIdentifyUser.php b/htdocs/includes/restler/framework/Luracast/Restler/iIdentifyUser.php
index d3dd4a5d8c5..834897668db 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/iIdentifyUser.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/iIdentifyUser.php
@@ -12,7 +12,7 @@ namespace Luracast\Restler;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 interface iIdentifyUser
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/iProvideMultiVersionApi.php b/htdocs/includes/restler/framework/Luracast/Restler/iProvideMultiVersionApi.php
index c7afe11fcb7..b57fc876f41 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/iProvideMultiVersionApi.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/iProvideMultiVersionApi.php
@@ -5,7 +5,7 @@ namespace Luracast\Restler;
  * Interface iProvideMultiVersionApi
  * @package Luracast\Restler
  *
- * @version    3.0.0rc6
+ *
  */
 interface iProvideMultiVersionApi
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/iUseAuthentication.php b/htdocs/includes/restler/framework/Luracast/Restler/iUseAuthentication.php
index 611d909b305..ee3a9e0bcca 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/iUseAuthentication.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/iUseAuthentication.php
@@ -11,7 +11,7 @@ namespace Luracast\Restler;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 interface iUseAuthentication
 {

From abf8bc2b92d5a0bf53ddb5309f6c5c7abf2a00e0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Dec 2020 17:26:25 +0100
Subject: [PATCH 595/888] Update doc

---
 COPYRIGHT | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/COPYRIGHT b/COPYRIGHT
index 10b06b86811..4f4bc3dff6d 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -29,7 +29,7 @@ PHPoAuthLib            0.8.2         MIT License                 Yes
 PHPPrintIPP            1.3           GPL-2+                      Yes             Library to send print IPP requests
 PSR/Logs			   1.0										                 Library for logs (used by DebugBar)
 PSR/simple-cache	   ?										                 Library for cache (used by PHPSpreadSheet)
-Restler                3.0.0RC6      LGPL-3+                     Yes             Library to develop REST Web services (+ swagger-ui js lib into dir explorer)
+Restler                3.1.1         LGPL-3+                     Yes             Library to develop REST Web services (+ swagger-ui js lib into dir explorer)
 Sabre                  3.2.2         BSD                         Yes             DAV support
 Swift Mailer           5.4.2-DEV     MIT license                 Yes             Comprehensive mailing tools for PHP
 Stripe                 6.43.1        MIT licence                 Yes             Library for Stripe module

From 9f2c6f3f33f635469850ce35efdca45062dec361 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Dec 2020 17:36:03 +0100
Subject: [PATCH 596/888] Fix api to download for shipments

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

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index c43a7eb890c..6a590b44368 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2647,7 +2647,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->accounting->dir_output.'/'.$original_file;
 	} // Wrapping pour les expedition
-	elseif ($modulepart == 'expedition' && !empty($conf->expedition->dir_output))
+	elseif (($modulepart == 'expedition' || $modulepart == 'shipment') && !empty($conf->expedition->dir_output))
 	{
 		if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
@@ -2655,7 +2655,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->expedition->dir_output."/sending/".$original_file;
 	} // Delivery Note Wrapping
-	elseif ($modulepart == 'delivery' && !empty($conf->expedition->dir_output))
+	elseif (($modulepart == 'livraison' || $modulepart == 'delivery') && !empty($conf->expedition->dir_output))
 	{
 		if ($fuser->rights->expedition->delivery->{$lire} || preg_match('/^specimen/i', $original_file))
 		{

From 8e839a34e2666db7c417bf361c3033d6c5f74bc3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Dec 2020 19:14:47 +0100
Subject: [PATCH 597/888] FIX for php 8

---
 htdocs/adherents/list.php                     |  7 +----
 htdocs/comm/action/list.php                   | 10 ++-----
 htdocs/compta/bank/bankentries_list.php       | 10 ++-----
 htdocs/compta/bank/list.php                   | 10 ++-----
 .../compta/cashcontrol/cashcontrol_list.php   | 10 ++-----
 .../compta/facture/invoicetemplate_list.php   | 10 ++-----
 htdocs/contrat/list.php                       | 10 ++-----
 htdocs/contrat/services_list.php              | 10 ++-----
 htdocs/core/class/extrafields.class.php       | 30 +++++++------------
 .../tpl/extrafields_list_array_fields.tpl.php |  2 +-
 htdocs/expensereport/list.php                 |  9 +-----
 htdocs/fichinter/list.php                     | 10 ++-----
 htdocs/fourn/commande/list.php                | 10 ++-----
 htdocs/fourn/facture/list.php                 | 10 ++-----
 htdocs/holiday/list.php                       |  9 +-----
 htdocs/intracommreport/list.php               |  2 +-
 .../modulebuilder/template/myobject_list.php  |  2 +-
 htdocs/projet/activity/perday.php             |  2 +-
 htdocs/projet/activity/perweek.php            |  2 +-
 htdocs/projet/tasks.php                       | 10 ++-----
 htdocs/projet/tasks/list.php                  | 10 ++-----
 htdocs/projet/tasks/time.php                  | 10 ++-----
 htdocs/reception/list.php                     | 11 ++-----
 htdocs/resource/list.php                      | 10 ++-----
 htdocs/societe/website.php                    | 10 ++-----
 htdocs/supplier_proposal/list.php             | 10 ++-----
 htdocs/zapier/hook_list.php                   |  8 ++---
 27 files changed, 55 insertions(+), 189 deletions(-)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index c9aaa856d22..9c9df8e25b5 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -146,12 +146,7 @@ $arrayfields = array(
 	'd.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000)
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
 
 /*
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 510fa67dcdb..2fe47ab39f1 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -141,14 +141,8 @@ $arrayfields = array(
 	'a.tms'=>array('label'=>'DateModification', 'checked'=>0)
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index d57e2cf5591..63021eb3b07 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -155,14 +155,8 @@ $arrayfields = array(
 	'b.conciliated'=>array('label'=>$langs->trans("Conciliated"), 'enabled'=> $object->rappro, 'checked'=>($action == 'reconcile' ? 1 : 0), 'position'=>1020),
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 87c8380ebda..f3efea15235 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -106,14 +106,8 @@ $arrayfields = array(
 	'balance'=>array('label'=>$langs->trans("Balance"), 'checked'=>1, 'position'=>1010),
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index fdc3e57bdba..c6431143a98 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -120,14 +120,8 @@ foreach ($object->fields as $key => $val)
 	if (!empty($val['visible'])) $arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
 }
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index c0abc5a6028..6beb5caa1e2 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -135,14 +135,8 @@ $arrayfields = array(
 	'f.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index ca8ccb9bd7d..d273dd7cdf7 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -131,14 +131,8 @@ $arrayfields = array(
 	'status'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 67b605d657f..4de651a24f9 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -130,14 +130,8 @@ $arrayfields = array(
 	'cd.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500)
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index d041aba45f4..2daf4c835e9 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -991,32 +991,23 @@ class ExtraFields
 			else return '';
 		}
 
-		if (empty($morecss))
-		{
-			if ($type == 'date')
-			{
+		if (empty($morecss)) {
+			if ($type == 'date') {
 				$morecss = 'minwidth100imp';
-			} elseif ($type == 'datetime' || $type == 'link')
-			{
+			} elseif ($type == 'datetime' || $type == 'link') {
 				$morecss = 'minwidth200imp';
-			} elseif (in_array($type, array('int', 'integer', 'double', 'price')))
-			{
+			} elseif (in_array($type, array('int', 'integer', 'double', 'price'))) {
 				$morecss = 'maxwidth75';
-			} elseif ($type == 'password')
-			{
+			} elseif ($type == 'password') {
 				$morecss = 'maxwidth100';
-			} elseif ($type == 'url')
-			{
+			} elseif ($type == 'url') {
 				$morecss = 'minwidth400';
-			} elseif ($type == 'boolean')
-			{
+			} elseif ($type == 'boolean') {
 				$morecss = '';
 			} else {
-				if (round($size) < 12)
-				{
+				if (empty($size) || round($size) < 12) {
 					$morecss = 'minwidth100';
-				} elseif (round($size) <= 48)
-				{
+				} elseif (round($size) <= 48) {
 					$morecss = 'minwidth200';
 				} else {
 					$morecss = 'minwidth400';
@@ -1024,8 +1015,7 @@ class ExtraFields
 			}
 		}
 
-		if (in_array($type, array('date', 'datetime')))
-		{
+		if (in_array($type, array('date', 'datetime'))) {
 			$tmp = explode(',', $size);
 			$newsize = $tmp[0];
 
diff --git a/htdocs/core/tpl/extrafields_list_array_fields.tpl.php b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
index 6e68dd94bea..d2d77cf3b5c 100644
--- a/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
@@ -23,7 +23,7 @@ if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_e
 					'label'    => $extrafields->attributes[$extrafieldsobjectkey]['label'][$key],
 					'checked'  => (($extrafields->attributes[$extrafieldsobjectkey]['list'][$key] < 0) ? 0 : 1),
 					'position' => $extrafields->attributes[$extrafieldsobjectkey]['pos'][$key],
-					'enabled'  => (abs($extrafields->attributes[$extrafieldsobjectkey]['list'][$key]) != 3 && $extrafields->attributes[$extrafieldsobjectkey]['perms'][$key]),
+					'enabled'  => (abs((int) $extrafields->attributes[$extrafieldsobjectkey]['list'][$key]) != 3 && $extrafields->attributes[$extrafieldsobjectkey]['perms'][$key]),
 					'langfile' => $extrafields->attributes[$extrafieldsobjectkey]['langfile'][$key],
 					'help'     => $extrafields->attributes[$extrafieldsobjectkey]['help'][$key],
 				);
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 440fc4524a6..7afb464e4f4 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -140,14 +140,7 @@ $arrayfields = array(
 	'd.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
 $canedituser = (!empty($user->admin) || $user->rights->user->user->creer);
 
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index bdf60e121e7..d054f5e5bcc 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -117,14 +117,8 @@ $arrayfields = array(
 	'fd.duree'=>array('label'=>'DurationOfLine', 'checked'=>1, 'enabled'=>empty($conf->global->FICHINTER_DISABLE_DETAILS) ? 1 : 0),
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 12d3352205b..e680e55868a 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -168,14 +168,8 @@ $arrayfields = array(
 	'cf.billed'=>array('label'=>$langs->trans("Billed"), 'checked'=>1, 'position'=>1000, 'enabled'=>1)
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index d0dce03c87f..b0c58572955 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -189,14 +189,8 @@ $arrayfields = array(
 	'f.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 41ae8a6956f..cbd9b76e45e 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -143,14 +143,7 @@ $arrayfields = array(
 	'cp.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
 if (empty($conf->holiday->enabled))
 {
diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php
index d3346e344f4..e43dc33e700 100644
--- a/htdocs/intracommreport/list.php
+++ b/htdocs/intracommreport/list.php
@@ -132,7 +132,7 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 	foreach($extrafields->attributes[$object->table_element]['label'] as $key => $val)
 	{
 		if (! empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key]=array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key]<0)?0:1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key])!=3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
+			$arrayfields["ef.".$key]=array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key]<0)?0:1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs((int) $extrafields->attributes[$object->table_element]['list'][$key])!=3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
 	}
 }
 */
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 2ed8e4577fa..7d09667bd22 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -129,7 +129,7 @@ $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$visible = dol_eval($val['visible'], 1);
+		$visible = (int) dol_eval($val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 9e15a580358..24ac982896e 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -129,7 +129,7 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
 	{
 		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["efpt.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
+			$arrayfields["efpt.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs((int) $extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
 	}
 }
 $arrayfields = dol_sort_array($arrayfields, 'position');
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 8b49aa2e0c2..4f8fbb8d865 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -143,7 +143,7 @@ if (is_array($extrafields->attributes['projet_task']['label']) && count($extrafi
 	foreach ($extrafields->attributes['projet_task']['label'] as $key => $val)
 	{
 		if (!empty($extrafields->attributes['projet_task']['list'][$key]))
-			$arrayfields["efpt.".$key] = array('label'=>$extrafields->attributes['projet_task']['label'][$key], 'checked'=>(($extrafields->attributes['projet_task']['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes['projet_task']['pos'][$key], 'enabled'=>(abs($extrafields->attributes['projet_task']['list'][$key]) != 3 && $extrafields->attributes['projet_task']['perms'][$key]));
+			$arrayfields["efpt.".$key] = array('label'=>$extrafields->attributes['projet_task']['label'][$key], 'checked'=>(($extrafields->attributes['projet_task']['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes['projet_task']['pos'][$key], 'enabled'=>(abs((int) $extrafields->attributes['projet_task']['list'][$key]) != 3 && $extrafields->attributes['projet_task']['perms'][$key]));
 	}
 }
 $arrayfields = dol_sort_array($arrayfields, 'position');
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index ba1840c4101..52e105c1443 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -119,14 +119,8 @@ if ($object->usage_bill_time) {
 }
 
 // Extra fields
-if (is_array($extrafields->attributes[$taskstatic->table_element]['label']) && count($extrafields->attributes[$taskstatic->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$taskstatic->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$taskstatic->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$taskstatic->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$taskstatic->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$taskstatic->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$taskstatic->table_element]['list'][$key]) != 3 && $extrafields->attributes[$taskstatic->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index b9d1a19c629..1951df8c0e1 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -136,14 +136,8 @@ $arrayfields = array(
 	//'t.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index c18ec6e4434..cb92be401c1 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -869,14 +869,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		$arrayfields['value'] = array('label'=>$langs->trans("Value"), 'checked'=>1, 'enabled'=>(empty($conf->salaries->enabled) ? 0 : 1));
 		$arrayfields['valuebilled'] = array('label'=>$langs->trans("Billed"), 'checked'=>1, 'enabled'=>(((!empty($conf->global->PROJECT_HIDE_TASKS) || empty($conf->global->PROJECT_BILL_TIME_SPENT)) ? 0 : 1) && $projectstatic->usage_bill_time));
 		// Extra fields
-		if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-		{
-			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-			{
-				if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-					$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-			}
-		}
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 		$arrayfields = dol_sort_array($arrayfields, 'position');
 
 		$param = '';
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index e175437c0cc..ec08c7ba94a 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -110,15 +110,10 @@ $arrayfields = array(
 	'e.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
 	'e.billed'=>array('label'=>$langs->trans("Billed"), 'checked'=>1, 'position'=>1000, 'enabled'=>(!empty($conf->global->WORKFLOW_BILL_ON_RECEPTION)))
 );
+
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index ccf061b50b7..c1b67edaa0e 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -121,14 +121,8 @@ $arrayfields = array(
 		),
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index 69e8efd02e1..ff3108d2427 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -99,14 +99,8 @@ foreach ($objectwebsiteaccount->fields as $key => $val)
 }
 
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 5fc27d63a8c..d74f2fbdec3 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -165,14 +165,8 @@ $arrayfields = array(
 	'sp.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/zapier/hook_list.php b/htdocs/zapier/hook_list.php
index 59432aea44b..93461517107 100644
--- a/htdocs/zapier/hook_list.php
+++ b/htdocs/zapier/hook_list.php
@@ -112,12 +112,8 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($val['visible'])) $arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
 }
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 

From 93d309cdbcc9876112b56d34ce58abce8cd49b72 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Dec 2020 17:25:38 +0100
Subject: [PATCH 598/888] FIX Update Restler API to 3.1.1 to fix error with
 php8

---
 dev/dolibarr_changes.txt                      |  16 +-
 htdocs/api/class/api_documents.class.php      |   2 +-
 htdocs/api/class/api_login.class.php          |   2 +-
 .../framework/Luracast/Restler/ApcCache.php   |   2 +-
 .../framework/Luracast/Restler/AutoLoader.php |   2 +-
 .../Luracast/Restler/CommentParser.php        |  56 +++---
 .../framework/Luracast/Restler/Compose.php    |   2 +-
 .../Luracast/Restler/Data/ApiMethodInfo.php   |   2 +-
 .../framework/Luracast/Restler/Data/Arr.php   |   2 +-
 .../Luracast/Restler/Data/Invalid.php         |   2 +-
 .../framework/Luracast/Restler/Data/Obj.php   |   2 +-
 .../framework/Luracast/Restler/Data/Text.php  | 164 +++++++++---------
 .../Luracast/Restler/Data/ValidationInfo.php  |   2 +-
 .../Luracast/Restler/Data/Validator.php       |   2 +-
 .../Luracast/Restler/Data/ValueObject.php     |   2 +-
 .../Luracast/Restler/Data/iValidate.php       |   2 +-
 .../Luracast/Restler/Data/iValueObject.php    |   2 +-
 .../framework/Luracast/Restler/Defaults.php   |   2 +-
 .../Luracast/Restler/EventDispatcher.php      |   2 +-
 .../Luracast/Restler/Filter/RateLimit.php     |   2 +-
 .../framework/Luracast/Restler/Flash.php      |   2 +-
 .../Luracast/Restler/Format/AmfFormat.php     |   2 +-
 .../Luracast/Restler/Format/CsvFormat.php     |   2 +-
 .../Luracast/Restler/Format/Format.php        |   2 +-
 .../Luracast/Restler/Format/HtmlFormat.php    | 144 ++++++++++-----
 .../Luracast/Restler/Format/JsFormat.php      |   2 +-
 .../Luracast/Restler/Format/JsonFormat.php    |   2 +-
 .../Luracast/Restler/Format/MultiFormat.php   |   2 +-
 .../Luracast/Restler/Format/PlistFormat.php   |   2 +-
 .../Luracast/Restler/Format/TsvFormat.php     |   2 +-
 .../Luracast/Restler/Format/UploadFormat.php  |   2 +-
 .../Restler/Format/UrlEncodedFormat.php       |   2 +-
 .../Luracast/Restler/Format/XmlFormat.php     |   2 +-
 .../Luracast/Restler/Format/YamlFormat.php    |   2 +-
 .../Luracast/Restler/Format/iDecodeStream.php |   2 +-
 .../Luracast/Restler/Format/iFormat.php       |   2 +-
 .../Luracast/Restler/HumanReadableCache.php   |   2 +-
 .../Restler/InvalidAuthCredentials.php        |   2 +-
 .../Luracast/Restler/PassThrough.php          |   2 +-
 .../framework/Luracast/Restler/Redirect.php   |   2 +-
 .../framework/Luracast/Restler/Resources.php  |   2 +-
 .../Luracast/Restler/RestException.php        |   2 +-
 .../framework/Luracast/Restler/Restler.php    |  10 +-
 .../framework/Luracast/Restler/Routes.php     |   2 +-
 .../framework/Luracast/Restler/Scope.php      |  27 +--
 .../framework/Luracast/Restler/UI/Emmet.php   |   2 +-
 .../framework/Luracast/Restler/UI/Forms.php   | 160 ++++++++++-------
 .../framework/Luracast/Restler/UI/Nav.php     |   5 +-
 .../framework/Luracast/Restler/UI/Tags.php    |   2 +-
 .../framework/Luracast/Restler/User.php       |   2 +-
 .../framework/Luracast/Restler/Util.php       |  55 +++---
 .../Luracast/Restler/iAuthenticate.php        |   2 +-
 .../framework/Luracast/Restler/iCache.php     |   2 +-
 .../framework/Luracast/Restler/iCompose.php   |   2 +-
 .../framework/Luracast/Restler/iFilter.php    |   2 +-
 .../Luracast/Restler/iIdentifyUser.php        |   2 +-
 .../Restler/iProvideMultiVersionApi.php       |   2 +-
 .../Luracast/Restler/iUseAuthentication.php   |   2 +-
 58 files changed, 437 insertions(+), 298 deletions(-)

diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
index 98a6d2176aa..5648381ff49 100644
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -229,11 +229,21 @@ Change content of file htdocs/includes/restler/framework/Luracast/Restler/explor
     public static function getShortName($className)
     {
     	// @CHANGE LDR
-    	if (! is_string($className)) return;
+    	if (!is_string($className)) return;
     	//var_dump($className);
 
-    	
-    	
+* Add line into Data/Text.php to complete function
+
+    public static function endsWith($haystack, $needle)
+    {
+        $length = strlen($needle);
+        if ($length == 0) {
+            return true;
+        }
+    	// @CHANGE LDR
+        if (!is_string($haystack)) return false;
+
+
 PARSEDOWN
 ---------
 
diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index bdf86a5c2c9..2d6a598398c 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -707,7 +707,7 @@ class Documents extends DolibarrApi
 
 		if (!empty($createdirifnotexists)) {
 			if (dol_mkdir($upload_dir) < 0) { // needed by products
-				throw new RestException(500, 'Error while trying to create directory.');
+				throw new RestException(500, 'Error while trying to create directory '.$upload_dir);
 			}
 		}
 
diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php
index 75fa4b60b89..25765e7f7e5 100644
--- a/htdocs/api/class/api_login.class.php
+++ b/htdocs/api/class/api_login.class.php
@@ -109,7 +109,7 @@ class Login
 			}
 
 			// Generate token for user
-			$token = dol_hash($login.uniqid().$conf->global->MAIN_API_KEY, 1);
+			$token = dol_hash($login.uniqid().(empty($conf->global->MAIN_API_KEY)?'':$conf->global->MAIN_API_KEY), 1);
 
 			// We store API token into database
 			$sql = "UPDATE ".MAIN_DB_PREFIX."user";
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/ApcCache.php b/htdocs/includes/restler/framework/Luracast/Restler/ApcCache.php
index b8cdd95b373..a2ddc83c44f 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/ApcCache.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/ApcCache.php
@@ -13,7 +13,7 @@ use Luracast\Restler\iCache;
  * @copyright  2013 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class ApcCache implements iCache
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php b/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
index d8445fdc70c..5ed160a070a 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
@@ -12,7 +12,7 @@ namespace Luracast\Restler {
  * @subpackage helper
  * @author     Nick Lombard <github@jigsoft.co.za>
  * @copyright  2012 Luracast
- * @version    3.0.0rc6
+ *
  */
 class AutoLoader
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php b/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php
index 2815f1f6c70..6b8b9178f6b 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Luracast\Restler;
 
 use Exception;
@@ -14,7 +15,7 @@ use Luracast\Restler\Data\Text;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class CommentParser
 {
@@ -55,8 +56,8 @@ class CommentParser
      * @var array annotations that support array value
      */
     public static $allowsArrayValue = array(
-        'choice' => true,
-        'select' => true,
+        'choice'     => true,
+        'select'     => true,
         'properties' => true,
     );
 
@@ -220,7 +221,7 @@ class CommentParser
      */
     private function parseParam($param, array $value, array $embedded)
     {
-        $data = & $this->_data;
+        $data = &$this->_data;
         $allowMultiple = false;
         switch ($param) {
             case 'param' :
@@ -237,7 +238,7 @@ class CommentParser
                 $value = $this->formatReturn($value);
                 break;
             case 'class' :
-                $data = & $data[$param];
+                $data = &$data[$param];
                 list ($param, $value) = $this->formatClass($value);
                 break;
             case 'access' :
@@ -294,7 +295,7 @@ class CommentParser
                     += $data[$param][self::$embeddedDataName];
             }
             if (!is_array($data[$param])) {
-                $data[$param] = array('description' => (string) $data[$param]);
+                $data[$param] = array('description' => (string)$data[$param]);
             }
             if (is_array($value)) {
                 $data[$param] = $value + $data[$param];
@@ -320,19 +321,24 @@ class CommentParser
             $data['pattern'] = $matches[2];
         }
         while (preg_match('/{@(\w+)\s?([^}]*)}/ms', $subject, $matches)) {
+            $name = $matches[1];
+            $value = $matches[2];
             $subject = str_replace($matches[0], '', $subject);
-            if ($matches[1] == 'pattern') {
+            if ($name == 'pattern') {
                 throw new Exception('Inline pattern tag should follow {@pattern /REGEX_PATTERN_HERE/} format and can optionally include PCRE modifiers following the ending `/`');
-            } elseif (isset(static::$allowsArrayValue[$matches[1]])) {
-                $matches[2] = explode(static::$arrayDelimiter, $matches[2]);
-            } elseif ($matches[2] == 'true' || $matches[2] == 'false') {
-                $matches[2] = $matches[2] == 'true';
-            } elseif ($matches[2] == '') {
-                $matches[2] = true;
-            } elseif ($matches[1] == 'required') {
-                $matches[2] = explode(static::$arrayDelimiter, $matches[2]);
+            } elseif (isset(static::$allowsArrayValue[$name])) {
+                $value = explode(static::$arrayDelimiter, $value);
+            } elseif ($value == 'true' || $value == 'false') {
+                $value = $value == 'true';
+            } elseif ($value == '') {
+                $value = true;
+            } elseif ($name == 'required') {
+                $value = explode(static::$arrayDelimiter, $value);
             }
-            $data[$matches[1]] = $matches[2];
+            if (defined('Luracast\\Restler\\UI\\HtmlForm::'.$name)) {
+                $value = constant($value);
+            }
+            $data[$name] = $value;
         }
 
         while (preg_match(self::$embeddedDataPattern, $subject, $matches)) {
@@ -340,9 +346,9 @@ class CommentParser
             $str = $matches[self::$embeddedDataIndex];
             if (isset ($this->restler)
                 && self::$embeddedDataIndex > 1
-                && !empty ($matches[1])
+                && !empty ($name)
             ) {
-                $extension = $matches[1];
+                $extension = $name;
                 $formatMap = $this->restler->getFormatMap();
                 if (isset ($formatMap[$extension])) {
                     /**
@@ -397,15 +403,15 @@ class CommentParser
     {
         $code = 500;
         $exception = 'Exception';
-        if(count($value)>1){
+        if (count($value) > 1) {
             $v1 = $value[0];
             $v2 = $value[1];
-            if(is_numeric($v1)){
+            if (is_numeric($v1)) {
                 $code = $v1;
                 $exception = $v2;
                 array_shift($value);
                 array_shift($value);
-            } elseif(is_numeric($v2)){
+            } elseif (is_numeric($v2)) {
                 $code = $v2;
                 $exception = $v1;
                 array_shift($value);
@@ -414,17 +420,17 @@ class CommentParser
                 $exception = $v1;
                 array_shift($value);
             }
-        } elseif(count($value) && is_numeric($value[0])) {
+        } elseif (count($value) && is_numeric($value[0])) {
             $code = $value[0];
             array_shift($value);
         }
         $message = implode(' ', $value);
-        if(!isset(RestException::$codes[$code])){
+        if (!isset(RestException::$codes[$code])) {
             $code = 500;
-        } elseif(empty($message)){
+        } elseif (empty($message)) {
             $message = RestException::$codes[$code];
         }
-        return compact('code','message','exception');
+        return compact('code', 'message', 'exception');
     }
 
     private function formatClass(array $value)
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Compose.php b/htdocs/includes/restler/framework/Luracast/Restler/Compose.php
index 594e5902004..141aa8bcb2f 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Compose.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Compose.php
@@ -11,7 +11,7 @@ namespace Luracast\Restler;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Compose implements iCompose
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/ApiMethodInfo.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/ApiMethodInfo.php
index 4d0fa4bfd48..f4dea84df97 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Data/ApiMethodInfo.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Data/ApiMethodInfo.php
@@ -11,7 +11,7 @@ namespace Luracast\Restler\Data;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class ApiMethodInfo extends ValueObject
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/Arr.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/Arr.php
index 6e98a4132ea..8ae18c7003d 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Data/Arr.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Data/Arr.php
@@ -10,7 +10,7 @@ namespace Luracast\Restler\Data;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Arr
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/Invalid.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/Invalid.php
index 6b06d266f13..832dd30850e 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Data/Invalid.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Data/Invalid.php
@@ -12,7 +12,7 @@ use Exception;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Invalid extends Exception
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/Obj.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/Obj.php
index 003f1df8794..8fe2a79ab63 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Data/Obj.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Data/Obj.php
@@ -11,7 +11,7 @@ namespace Luracast\Restler\Data;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Obj
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/Text.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/Text.php
index 506ea25fb20..d0b39896c8e 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Data/Text.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Data/Text.php
@@ -10,87 +10,91 @@ namespace Luracast\Restler\Data;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Text
 {
-    /**
-     * Given haystack contains the needle or not?
-     *
-     * @param string $haystack
-     * @param string $needle
-     * @param bool $caseSensitive
-     *
-     * @return bool
-     */
-    public static function contains($haystack, $needle, $caseSensitive = true)
-    {
-        if (empty($needle))
-            return true;
-        return $caseSensitive
-            ? strpos($haystack, $needle) !== false
-            : stripos($haystack, $needle) !== false;
-    }
-
-    /**
-     * Given haystack begins with the needle or not?
-     *
-     * @param string $haystack
-     * @param string $needle
-     *
-     * @return bool
-     */
-    public static function beginsWith($haystack, $needle)
-    {
-        $length = strlen($needle);
-        return (substr($haystack, 0, $length) === $needle);
-    }
-
-    /**
-     * Given haystack ends with the needle or not?
-     *
-     * @param string $haystack
-     * @param string $needle
-     *
-     * @return bool
-     */
-    public static function endsWith($haystack, $needle)
-    {
-        $length = strlen($needle);
-        if ($length == 0) {
-            return true;
-        }
-        return (substr($haystack, -$length) === $needle);
-    }
-
-
-    /**
-     * Convert camelCased or underscored string in to a title
-     *
-     * @param string $name
-     *
-     * @return string
-     */
-    public static function title($name)
-    {
-        return
-            ucwords(
-                preg_replace(
-                    array('/(?<=[^A-Z])([A-Z])/', '/(?<=[^0-9])([0-9])/', '/([_-])/', '/[^a-zA-Z0-9\s]|\s\s+/'),
-                    array(' $0', ' $0', ' ', ' '),
-                    $name
-                )
-            );
-    }
-
-    /**
-     * Convert given string to be used as a slug or css class
-     *
-     * @param string $name
-     * @return string
-     */
-    public static function slug($name)
-    {
-        return preg_replace('/[^a-zA-Z]+/', '-', strtolower(strip_tags($name)));
-    }
+	/**
+	 * Given haystack contains the needle or not?
+	 *
+	 * @param string $haystack
+	 * @param string $needle
+	 * @param bool $caseSensitive
+	 *
+	 * @return bool
+	 */
+	public static function contains($haystack, $needle, $caseSensitive = true)
+	{
+		if (empty($needle))
+			return true;
+			return $caseSensitive
+			? strpos($haystack, $needle) !== false
+			: stripos($haystack, $needle) !== false;
+	}
+	
+	/**
+	 * Given haystack begins with the needle or not?
+	 *
+	 * @param string $haystack
+	 * @param string $needle
+	 *
+	 * @return bool
+	 */
+	public static function beginsWith($haystack, $needle)
+	{
+		$length = strlen($needle);
+		return (substr($haystack, 0, $length) === $needle);
+	}
+	
+	/**
+	 * Given haystack ends with the needle or not?
+	 *
+	 * @param string $haystack
+	 * @param string $needle
+	 *
+	 * @return bool
+	 */
+	public static function endsWith($haystack, $needle)
+	{
+		$length = strlen($needle);
+		if ($length == 0) {
+			return true;
+		}
+		
+		// @CHANGE LDR
+		if (!is_string($haystack)) return false;
+		
+		return (substr($haystack, -$length) === $needle);
+	}
+	
+	
+	/**
+	 * Convert camelCased or underscored string in to a title
+	 *
+	 * @param string $name
+	 *
+	 * @return string
+	 */
+	public static function title($name)
+	{
+		return
+		ucwords(
+			preg_replace(
+				array('/(?<=[^A-Z])([A-Z])/', '/(?<=[^0-9])([0-9])/', '/([_-])/', '/[^a-zA-Z0-9\s]|\s\s+/'),
+				array(' $0', ' $0', ' ', ' '),
+				$name
+				)
+			);
+	}
+	
+	/**
+	 * Convert given string to be used as a slug or css class
+	 *
+	 * @param string $name
+	 * @return string
+	 */
+	public static function slug($name)
+	{
+		return preg_replace('/[^a-zA-Z]+/', '-', strtolower(strip_tags($name)));
+	}
 } 
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/ValidationInfo.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/ValidationInfo.php
index 298b72ec125..fc05c5386df 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Data/ValidationInfo.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Data/ValidationInfo.php
@@ -15,7 +15,7 @@ use Luracast\Restler\Util;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class ValidationInfo implements iValueObject
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/Validator.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/Validator.php
index c98a17a62d6..023fc7c4d1e 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Data/Validator.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Data/Validator.php
@@ -18,7 +18,7 @@ use Luracast\Restler\Util;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Validator implements iValidate
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/ValueObject.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/ValueObject.php
index 46857b45329..5a2b001e841 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Data/ValueObject.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Data/ValueObject.php
@@ -11,7 +11,7 @@ namespace Luracast\Restler\Data;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class ValueObject implements iValueObject
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/iValidate.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/iValidate.php
index 66688b066ba..923fc79b1ce 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Data/iValidate.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Data/iValidate.php
@@ -10,7 +10,7 @@ namespace Luracast\Restler\Data;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 interface iValidate {
 
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/iValueObject.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/iValueObject.php
index dbf36cb744c..dcce824a655 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Data/iValueObject.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Data/iValueObject.php
@@ -11,7 +11,7 @@ namespace Luracast\Restler\Data;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 interface iValueObject
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Defaults.php b/htdocs/includes/restler/framework/Luracast/Restler/Defaults.php
index 8913db316b5..803c8b3177a 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Defaults.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Defaults.php
@@ -15,7 +15,7 @@ use Luracast\Restler\Data\Validator;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Defaults
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/EventDispatcher.php b/htdocs/includes/restler/framework/Luracast/Restler/EventDispatcher.php
index f8cd883af46..0c5d0fa676c 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/EventDispatcher.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/EventDispatcher.php
@@ -9,7 +9,7 @@ namespace Luracast\Restler;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 use Closure;
 
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Filter/RateLimit.php b/htdocs/includes/restler/framework/Luracast/Restler/Filter/RateLimit.php
index 5dce8591bba..e5705136fce 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Filter/RateLimit.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Filter/RateLimit.php
@@ -15,7 +15,7 @@ use Luracast\Restler\RestException;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class RateLimit implements iFilter, iUseAuthentication
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Flash.php b/htdocs/includes/restler/framework/Luracast/Restler/Flash.php
index 3ab04aa745e..41d097f312d 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Flash.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Flash.php
@@ -15,7 +15,7 @@ use ArrayAccess;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Flash implements ArrayAccess
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/AmfFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/AmfFormat.php
index 3d146fbcfac..181d95bea46 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/AmfFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/AmfFormat.php
@@ -17,7 +17,7 @@ use ZendAmf\Parser\OutputStream;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class AmfFormat extends DependentFormat
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/CsvFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/CsvFormat.php
index 4bed88251c8..c33557f8463 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/CsvFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/CsvFormat.php
@@ -15,7 +15,7 @@ use Luracast\Restler\RestException;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class CsvFormat extends Format implements iDecodeStream
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/Format.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/Format.php
index 10b2c5834e6..edc2cbde719 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/Format.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/Format.php
@@ -10,7 +10,7 @@ namespace Luracast\Restler\Format;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 abstract class Format implements iFormat
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/HtmlFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/HtmlFormat.php
index e871186c446..493e3e44061 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/HtmlFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/HtmlFormat.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Luracast\Restler\Format;
 
 use Exception;
@@ -6,8 +7,8 @@ use Illuminate\Events\Dispatcher;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\View\Compilers\BladeCompiler;
 use Illuminate\View\Engines\CompilerEngine;
-use Illuminate\View\Engines\PhpEngine;
 use Illuminate\View\Engines\EngineResolver;
+use Illuminate\View\Engines\PhpEngine;
 use Illuminate\View\Factory;
 use Illuminate\View\FileViewFinder;
 use Illuminate\View\View;
@@ -18,6 +19,10 @@ use Luracast\Restler\Restler;
 use Luracast\Restler\Scope;
 use Luracast\Restler\UI\Nav;
 use Luracast\Restler\Util;
+use Twig\Environment;
+use Twig\Extension\DebugExtension;
+use Twig\Loader\FilesystemLoader;
+use Twig\TwigFunction;
 
 /**
  * Html template format
@@ -29,10 +34,14 @@ use Luracast\Restler\Util;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class HtmlFormat extends DependentFormat
 {
+    const BLADE = 'Illuminate\View\View';
+    const TWIG = 'Twig\Environment';
+    const MUSTACHE = 'Mustache_Engine';
+
     public static $mime = 'text/html';
     public static $extension = 'html';
     public static $view;
@@ -84,11 +93,12 @@ class HtmlFormat extends DependentFormat
         }
     }
 
-    public function getDependencyMap(){
+    public function getDependencyMap()
+    {
         return array(
-            'Illuminate\View\View' => 'illuminate/view:4.2.*',
-            'Twig_Environment' => 'twig/twig:v1.13.*',
-            'Mustache_Engine' => 'mustache/mustache:dev-master',
+            self::BLADE    => 'illuminate/view:^8',
+            self::TWIG     => 'twig/twig:^3',
+            self::MUSTACHE => 'mustache/mustache:dev-master',
         );
     }
 
@@ -101,7 +111,7 @@ class HtmlFormat extends DependentFormat
         $resolver->register('blade', function () use ($engine) {
             return $engine;
         });
-        $phpEngine = new PhpEngine();
+        $phpEngine = new PhpEngine($files);
         $resolver->register('php', function () use ($phpEngine) {
             return $phpEngine;
         });
@@ -128,32 +138,43 @@ class HtmlFormat extends DependentFormat
         return $view->render();
     }
 
-    public static function twig(array $data, $debug = true)
+    /**
+     * @param array|object $data
+     * @param bool         $debug
+     *
+     * @return string
+     * @throws \Twig\Error\LoaderError
+     * @throws \Twig\Error\RuntimeError
+     * @throws \Twig\Error\SyntaxError
+     */
+    public static function twig($data, $debug = true)
     {
-        $loader = new \Twig_Loader_Filesystem(static::$viewPath);
-        $twig = new \Twig_Environment($loader, array(
-            'cache' => static::$cacheDirectory,
-            'debug' => $debug,
+        $loader = new FilesystemLoader(static::$viewPath);
+        $twig = new Environment($loader, array(
+            'cache'                => is_string(static::$cacheDirectory)
+                ? static::$cacheDirectory : false,
+            'debug'                => $debug,
             'use_strict_variables' => $debug,
         ));
-        if ($debug)
-            $twig->addExtension(new \Twig_Extension_Debug());
+        if ($debug) {
+            $twig->addExtension(new DebugExtension());
+        }
 
         $twig->addFunction(
-            new \Twig_SimpleFunction(
+            new TwigFunction(
                 'form',
                 'Luracast\Restler\UI\Forms::get',
                 array('is_safe' => array('html'))
             )
         );
         $twig->addFunction(
-            new \Twig_SimpleFunction(
+            new TwigFunction(
                 'form_key',
                 'Luracast\Restler\UI\Forms::key'
             )
         );
         $twig->addFunction(
-            new \Twig_SimpleFunction(
+            new TwigFunction(
                 'nav',
                 'Luracast\Restler\UI\Nav::get'
             )
@@ -164,7 +185,7 @@ class HtmlFormat extends DependentFormat
                 isset(HtmlFormat::$data[$name]) &&
                 is_callable(HtmlFormat::$data[$name])
             ) {
-                return new \Twig_SimpleFunction(
+                return new TwigFunction(
                     $name,
                     HtmlFormat::$data[$name]
                 );
@@ -172,21 +193,35 @@ class HtmlFormat extends DependentFormat
             return false;
         });
 
-        $template = $twig->loadTemplate(static::getViewFile());
-        return $template->render($data);
+        $template = $twig->load(static::getViewFile());
+        return $template->render((array)$data);
     }
 
-    public static function handlebar(array $data, $debug = true)
+    /**
+     * @param array|object $data
+     * @param bool         $debug
+     *
+     * @return string
+     */
+    public static function handlebar($data, $debug = true)
     {
         return static::mustache($data, $debug);
     }
 
-    public static function mustache(array $data, $debug = true)
+    /**
+     * @param array|object $data
+     * @param bool         $debug
+     *
+     * @return string
+     */
+    public static function mustache($data, $debug = true)
     {
-        if (!isset($data['nav']))
+        $data = (array)$data;
+        if (!isset($data['nav'])) {
             $data['nav'] = array_values(Nav::get());
+        }
         $options = array(
-            'loader' => new \Mustache_Loader_FilesystemLoader(
+            'loader'  => new \Mustache_Loader_FilesystemLoader(
                 static::$viewPath,
                 array('extension' => static::getViewExtension())
             ),
@@ -200,16 +235,25 @@ class HtmlFormat extends DependentFormat
                 },
             )
         );
-        if (!$debug)
+        if (!$debug) {
             $options['cache'] = static::$cacheDirectory;
+        }
         $m = new \Mustache_Engine($options);
         return $m->render(static::getViewFile(), $data);
     }
 
-    public static function php(array $data, $debug = true)
+    /**
+     * @param array|object $data
+     * @param bool         $debug
+     *
+     * @return string
+     * @throws RestException
+     */
+    public static function php($data, $debug = true)
     {
-        if (static::$view == 'debug')
+        if (static::$view == 'debug') {
             static::$viewPath = dirname(__DIR__) . '/views';
+        }
         $view = static::getViewFile(true);
 
         if (!is_readable($view)) {
@@ -222,22 +266,26 @@ class HtmlFormat extends DependentFormat
 
         $path = static::$viewPath . DIRECTORY_SEPARATOR;
         $template = function ($view) use ($data, $path) {
+            $data = (array)$data;
             $form = function () {
                 return call_user_func_array(
                     'Luracast\Restler\UI\Forms::get',
                     func_get_args()
                 );
             };
-            if (!isset($data['form']))
+            if (!isset($data['form'])) {
                 $data['form'] = $form;
+            }
             $nav = function () {
                 return call_user_func_array(
                     'Luracast\Restler\UI\Nav::get',
                     func_get_args()
                 );
             };
-            if (!isset($data['nav']))
+            if (!isset($data['nav'])) {
                 $data['nav'] = $nav;
+            }
+
 
             $_ = function () use ($data, $path) {
                 extract($data);
@@ -254,7 +302,7 @@ class HtmlFormat extends DependentFormat
                             ) {
                                 $str = '';
                                 foreach ($arrays as $arr) {
-                                    extract($arr);
+                                    extract((array)$arr);
                                     $str .= include $file;
                                 }
                                 return $str;
@@ -264,15 +312,18 @@ class HtmlFormat extends DependentFormat
                         }
                         break;
                     case 'if':
-                        if (count($args) < 2)
+                        if (count($args) < 2) {
                             $args[1] = '';
-                        if (count($args) < 3)
+                        }
+                        if (count($args) < 3) {
                             $args[2] = '';
+                        }
                         return $args[0] ? $args[1] : $args[2];
                         break;
                     default:
-                        if (isset($data[$task]) && is_callable($data[$task]))
+                        if (isset($data[$task]) && is_callable($data[$task])) {
                             return call_user_func_array($data[$task], $args);
+                        }
                 }
                 return '';
             };
@@ -280,8 +331,9 @@ class HtmlFormat extends DependentFormat
             return @include $view;
         };
         $value = $template($view);
-        if (is_string($value))
+        if (is_string($value)) {
             return $value;
+        }
     }
 
     /**
@@ -294,8 +346,8 @@ class HtmlFormat extends DependentFormat
      *                                     Formatter has to make the encoded
      *                                     output more human readable
      *
-     * @throws \Exception
      * @return string encoded string
+     * @throws \Exception
      */
     public function encode($data, $humanReadable = false)
     {
@@ -317,9 +369,9 @@ class HtmlFormat extends DependentFormat
                 'response' => static::$convertResponseToArray
                     ? Obj::toArray($data)
                     : $data,
-                'stages' => $this->restler->getEvents(),
-                'success' => $success,
-                'error' => $error
+                'stages'   => $this->restler->getEvents(),
+                'success'  => $success,
+                'error'    => $error
             );
             $info = $data['api'] = $this->restler->apiMethodInfo;
             $metadata = Util::nestedValue(
@@ -358,7 +410,9 @@ class HtmlFormat extends DependentFormat
             if ($value) {
                 $data = Util::nestedValue($data, explode('.', $value));
             }
-            $data += static::$data;
+            if (is_array($data)) {
+                $data += static::$data;
+            }
             if (false === ($i = strrpos(self::$view, '.'))) {
                 $template = self::$template;
             } else {
@@ -369,17 +423,18 @@ class HtmlFormat extends DependentFormat
                 static::$cacheDirectory = Defaults::$cacheDirectory . DIRECTORY_SEPARATOR . $template;
                 if (!file_exists(static::$cacheDirectory)) {
                     if (!mkdir(static::$cacheDirectory, 0770, true)) {
-                        throw new RestException(500, 'Unable to create cache directory `' . static::$cacheDirectory . '`');
+                        throw new RestException(500,
+                            'Unable to create cache directory `' . static::$cacheDirectory . '`');
                     }
                 }
             }
             if (method_exists($class = get_called_class(), $template)) {
                 if ($template == 'blade') {
-                    $this->checkDependency('Illuminate\View\View');
+                    $this->checkDependency(self::BLADE);
                 } elseif ($template == 'twig') {
-                    $this->checkDependency('Twig_Environment');
+                    $this->checkDependency(self::TWIG);
                 } elseif ($template == 'mustache' || $template == 'handlebar') {
-                    $this->checkDependency('Mustache_Engine');
+                    $this->checkDependency(self::MUSTACHE);
                 }
                 return call_user_func("$class::$template", $data, $humanReadable);
             }
@@ -416,8 +471,9 @@ class HtmlFormat extends DependentFormat
     {
         $v = $fullPath ? static::$viewPath . '/' : '';
         $v .= static::$view;
-        if ($includeExtension)
+        if ($includeExtension) {
             $v .= '.' . static::getViewExtension();
+        }
         return $v;
     }
 
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/JsFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/JsFormat.php
index 0f04b7f0ee5..913dc272e19 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/JsFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/JsFormat.php
@@ -11,7 +11,7 @@ namespace Luracast\Restler\Format;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class JsFormat extends JsonFormat
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/JsonFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/JsonFormat.php
index 00c763e8ff5..170676c071b 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/JsonFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/JsonFormat.php
@@ -15,7 +15,7 @@ use Luracast\Restler\RestException;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class JsonFormat extends Format
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/MultiFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/MultiFormat.php
index 18fdd54b842..64afa3b3ea4 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/MultiFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/MultiFormat.php
@@ -9,7 +9,7 @@ namespace Luracast\Restler\Format;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 abstract class MultiFormat implements iFormat
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/PlistFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/PlistFormat.php
index cc07066a33c..f1eca01933d 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/PlistFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/PlistFormat.php
@@ -18,7 +18,7 @@ use CFPropertyList\CFPropertyList;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class PlistFormat extends DependentMultiFormat
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/TsvFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/TsvFormat.php
index 502b02d2758..4eb3006f363 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/TsvFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/TsvFormat.php
@@ -11,7 +11,7 @@ namespace Luracast\Restler\Format;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class TsvFormat extends CsvFormat
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/UploadFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/UploadFormat.php
index de41bf98c71..b58b0f02b49 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/UploadFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/UploadFormat.php
@@ -13,7 +13,7 @@ use Luracast\Restler\RestException;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class UploadFormat extends Format
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/UrlEncodedFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/UrlEncodedFormat.php
index 12d5a410333..6d141230d82 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/UrlEncodedFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/UrlEncodedFormat.php
@@ -11,7 +11,7 @@ namespace Luracast\Restler\Format;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class UrlEncodedFormat extends Format
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php
index ceec32e4cb5..6f8606eb111 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php
@@ -16,7 +16,7 @@ use XMLWriter;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class XmlFormat extends Format
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/YamlFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/YamlFormat.php
index 07baae88b6f..4ff643de65f 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/YamlFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/YamlFormat.php
@@ -14,7 +14,7 @@ use Luracast\Restler\Data\Obj;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class YamlFormat extends DependentFormat
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/iDecodeStream.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/iDecodeStream.php
index 080e3da506c..ec29330ed1f 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/iDecodeStream.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/iDecodeStream.php
@@ -11,7 +11,7 @@ namespace Luracast\Restler\Format;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 interface iDecodeStream
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/iFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/iFormat.php
index d70d2019a94..0f4173d5b74 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Format/iFormat.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/iFormat.php
@@ -11,7 +11,7 @@ namespace Luracast\Restler\Format;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 interface iFormat
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/HumanReadableCache.php b/htdocs/includes/restler/framework/Luracast/Restler/HumanReadableCache.php
index 6e1c22b432c..2546e30a4ee 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/HumanReadableCache.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/HumanReadableCache.php
@@ -10,7 +10,7 @@ namespace Luracast\Restler;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class HumanReadableCache implements iCache
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/InvalidAuthCredentials.php b/htdocs/includes/restler/framework/Luracast/Restler/InvalidAuthCredentials.php
index 233e543e0aa..1b402238bf3 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/InvalidAuthCredentials.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/InvalidAuthCredentials.php
@@ -12,7 +12,7 @@ namespace Luracast\Restler;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 
 
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/PassThrough.php b/htdocs/includes/restler/framework/Luracast/Restler/PassThrough.php
index a77e533b722..2d265fb0fba 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/PassThrough.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/PassThrough.php
@@ -10,7 +10,7 @@ namespace Luracast\Restler;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class PassThrough
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Redirect.php b/htdocs/includes/restler/framework/Luracast/Restler/Redirect.php
index 63319106759..8203b8eb18d 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Redirect.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Redirect.php
@@ -12,7 +12,7 @@ use Luracast\Restler\Format\JsonFormat;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Redirect
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Resources.php b/htdocs/includes/restler/framework/Luracast/Restler/Resources.php
index 2986968a990..dfb547d287b 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Resources.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Resources.php
@@ -15,7 +15,7 @@ use stdClass;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Resources implements iUseAuthentication, iProvideMultiVersionApi
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/RestException.php b/htdocs/includes/restler/framework/Luracast/Restler/RestException.php
index b2e51f8b122..4291381661c 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/RestException.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/RestException.php
@@ -14,7 +14,7 @@ use Exception;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 
 class RestException extends Exception
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Restler.php b/htdocs/includes/restler/framework/Luracast/Restler/Restler.php
index fcb5388726c..0c8f44a3864 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Restler.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Restler.php
@@ -15,13 +15,14 @@ use Luracast\Restler\Format\UrlEncodedFormat;
  * inspired by the RestServer code from
  * <http://jacwright.com/blog/resources/RestServer.txt>
  *
+ *
  * @category   Framework
  * @package    Restler
  * @author     R.Arul Kumaran <arul@luracast.com>
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  *
  * @method static void onGet() onGet(Callable $function) fired before reading the request details
  * @method static void onRoute() onRoute(Callable $function) fired before finding the api method
@@ -48,10 +49,13 @@ use Luracast\Restler\Format\UrlEncodedFormat;
  * @method void onRespond() onRespond(Callable $function) fired before sending response
  * @method void onComplete() onComplete(Callable $function) fired after sending response
  * @method void onMessage() onMessage(Callable $function) fired before composing error response
+ *
+ * @property bool|null  _authenticated
+ * @property bool _authVerified
  */
 class Restler extends EventDispatcher
 {
-    const VERSION = '3.0.0rc6';
+    const VERSION = '3.1.0';
 
     // ==================================================================
     //
@@ -693,6 +697,8 @@ class Restler extends EventDispatcher
      *  - media type
      *  - charset
      *  - language
+     *
+     * @throws RestException
      */
     protected function negotiate()
     {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Routes.php b/htdocs/includes/restler/framework/Luracast/Restler/Routes.php
index 999094dec4c..d59b27d4418 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Routes.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Routes.php
@@ -17,7 +17,7 @@ use Exception;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Routes
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Scope.php b/htdocs/includes/restler/framework/Luracast/Restler/Scope.php
index 16ccdd33561..6f7b49daf40 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Scope.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Scope.php
@@ -1,4 +1,6 @@
 <?php
+
+
 namespace Luracast\Restler;
 
 /**
@@ -11,7 +13,7 @@ namespace Luracast\Restler;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Scope
 {
@@ -45,8 +47,8 @@ class Scope
         //API classes
         'Resources'          => 'Luracast\Restler\Resources',
         'Explorer'           => 'Luracast\Restler\Explorer\v2\Explorer',
-        'Explorer1'           => 'Luracast\Restler\Explorer\v1\Explorer',
-        'Explorer2'           => 'Luracast\Restler\Explorer\v2\Explorer',
+        'Explorer1'          => 'Luracast\Restler\Explorer\v1\Explorer',
+        'Explorer2'          => 'Luracast\Restler\Explorer\v2\Explorer',
 
         //Cache classes
         'HumanReadableCache' => 'Luracast\Restler\HumanReadableCache',
@@ -120,6 +122,7 @@ class Scope
                 $r = new $fullName();
                 static::$instances[$name] = (object)array('instance' => $r);
                 if ($name != 'Restler') {
+                    /** @var Restler restler */
                     $r->restler = static::get('Restler');
                     $m = Util::nestedValue($r->restler, 'apiMethodInfo', 'metadata');
                     if ($m) {
@@ -138,15 +141,14 @@ class Scope
         }
         if (
             $r instanceof iUseAuthentication &&
-            static::get('Restler')->_authVerified &&
+            $r->restler && $r->restler->_authVerified &&
             !isset(static::$instances[$name]->authVerified)
         ) {
             static::$instances[$name]->authVerified = true;
-            $r->__setAuthenticationStatus
-            (static::get('Restler')->_authenticated);
+            $r->__setAuthenticationStatus($r->restler->_authenticated);
         }
         if (isset(static::$instances[$name]->initPending)) {
-            $m = Util::nestedValue(static::get('Restler'), 'apiMethodInfo', 'metadata');
+            $m = Util::nestedValue($r->restler, 'apiMethodInfo', 'metadata');
             $fullName = $name;
             if (class_exists($name)) {
                 $shortName = Util::getShortName($name);
@@ -194,15 +196,15 @@ class Scope
      */
     public static function resolve($className, array $scope)
     {
-        if (empty($className) || !is_string($className))
+        if (empty($className) || !is_string($className)) {
             return false;
+        }
 
         if (self::isPrimitiveDataType($className)) {
             return false;
         }
 
         $divider = '\\';
-        $qualified = false;
         if ($className[0] == $divider) {
             $qualified = trim($className, $divider);
         } elseif (array_key_exists($className, $scope)) {
@@ -210,18 +212,21 @@ class Scope
         } else {
             $qualified = $scope['*'] . $className;
         }
-        if (class_exists($qualified))
+        if (class_exists($qualified)) {
             return $qualified;
+        }
         if (isset(static::$classAliases[$className])) {
             $qualified = static::$classAliases[$className];
-            if (class_exists($qualified))
+            if (class_exists($qualified)) {
                 return $qualified;
+            }
         }
         return false;
     }
 
     /**
      * @param string $stringName
+     *
      * @return boolean
      */
     private static function isPrimitiveDataType($stringName)
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php b/htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php
index 435804b4469..66090568a47 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php
@@ -8,7 +8,7 @@ use Luracast\Restler\Util;
  * Class Emmet
  * @package Luracast\Restler\UI
  *
- * @version 3.0.0rc6
+ * @version 3.1.0
  */
 class Emmet
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/UI/Forms.php b/htdocs/includes/restler/framework/Luracast/Restler/UI/Forms.php
index 7073bfcf837..20749a2e691 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/UI/Forms.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/UI/Forms.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Luracast\Restler\UI;
 
 use Luracast\Restler\CommentParser;
@@ -29,7 +30,7 @@ use Luracast\Restler\Util;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Forms implements iFilter
 {
@@ -38,7 +39,7 @@ class Forms implements iFilter
 
     public static $excludedPaths = array();
 
-    public static $style;
+    private static $style;
     /**
      * @var bool should we fill up the form using given data?
      */
@@ -81,6 +82,11 @@ class Forms implements iFilter
      */
     private static $info;
 
+    public static function setStyles(HtmlForm $style)
+    {
+        static::$style = get_class($style);
+    }
+
     /**
      * Get the form
      *
@@ -95,18 +101,20 @@ class Forms implements iFilter
      *
      * @return array|T
      *
-     * @throws \Luracast\Restler\RestException
+     * @throws RestException
      */
     public static function get($method = 'POST', $action = null, $dataOnly = false, $prefix = '', $indent = '    ')
     {
-        if (!static::$style)
-            static::$style = FormStyles::$html;
+        if (!static::$style) {
+            static::$style = 'Luracast\\Restler\\UI\HtmlForm';
+        }
 
         try {
             /** @var Restler $restler */
             $restler = Scope::get('Restler');
-            if (is_null($action))
+            if (is_null($action)) {
                 $action = $restler->url;
+            }
 
             $info = $restler->url == $action
             && Util::getRequestMethod() == $method
@@ -126,23 +134,25 @@ class Forms implements iFilter
             //echo $e->getErrorMessage();
             $info = false;
         }
-        if (!$info)
+        if (!$info) {
             throw new RestException(500, 'invalid action path for form `' . $method . ' ' . $action . '`');
+        }
         static::$info = $info;
         $m = $info->metadata;
         $r = static::fields($dataOnly);
         if ($method != 'GET' && $method != 'POST') {
-            if (empty(Defaults::$httpMethodOverrideProperty))
+            if (empty(Defaults::$httpMethodOverrideProperty)) {
                 throw new RestException(
                     500,
                     'Forms require `Defaults::\$httpMethodOverrideProperty`' .
                     "for supporting HTTP $method"
                 );
+            }
             if ($dataOnly) {
                 $r[] = array(
-                    'tag' => 'input',
-                    'name' => Defaults::$httpMethodOverrideProperty,
-                    'type' => 'hidden',
+                    'tag'   => 'input',
+                    'name'  => Defaults::$httpMethodOverrideProperty,
+                    'type'  => 'hidden',
                     'value' => 'method',
                 );
             } else {
@@ -158,9 +168,9 @@ class Forms implements iFilter
             $form_key = static::key($method, $action);
             if ($dataOnly) {
                 $r[] = array(
-                    'tag' => 'input',
-                    'name' => static::FORM_KEY,
-                    'type' => 'hidden',
+                    'tag'   => 'input',
+                    'name'  => static::FORM_KEY,
+                    'type'  => 'hidden',
                     'value' => 'hidden',
                 );
             } else {
@@ -173,15 +183,16 @@ class Forms implements iFilter
         }
 
         $s = array(
-            'tag' => 'button',
-            'type' => 'submit',
+            'tag'   => 'button',
+            'type'  => 'submit',
             'label' =>
                 Util::nestedValue($m, 'return', CommentParser::$embeddedDataName, 'label')
-                    ? : 'Submit'
+                    ?: 'Submit'
         );
 
-        if (!$dataOnly)
+        if (!$dataOnly) {
             $s = Emmet::make(static::style('submit', $m), $s);
+        }
         $r[] = $s;
         $t = array(
             'action' => $restler->getBaseUrl() . '/' . rtrim($action, '/'),
@@ -207,15 +218,18 @@ class Forms implements iFilter
 
     public static function style($name, array $metadata, $type = '')
     {
-        return isset($metadata[CommentParser::$embeddedDataName][$name])
-            ? $metadata[CommentParser::$embeddedDataName][$name]
-            : (!empty($type) && isset(static::$style["$name-$type"])
-                ? static::$style["$name-$type"]
-                : (isset(static::$style[$name])
-                    ? static::$style[$name]
-                    : null
-                )
-            );
+        if (isset($metadata[CommentParser::$embeddedDataName][$name])) {
+            return $metadata[CommentParser::$embeddedDataName][$name];
+        }
+        $style = static::$style . '::' . $name;
+        $typedStyle = $style . '_' . $type;
+        if (defined($typedStyle)) {
+            return constant($typedStyle);
+        }
+        if (defined($style)) {
+            return constant($style);
+        }
+        return null;
     }
 
     public static function fields($dataOnly = false)
@@ -230,11 +244,13 @@ class Forms implements iFilter
                 is_scalar($value) ||
                 ($p['type'] == 'array' && is_array($value) && $value == array_values($value)) ||
                 is_object($value) && $p['type'] == get_class($value)
-            )
+            ) {
                 $p['value'] = $value;
+            }
             static::$validationInfo = $v = new ValidationInfo($p);
-            if ($v->from == 'path')
+            if ($v->from == 'path') {
                 continue;
+            }
             if (!empty($v->children)) {
                 $t = Emmet::make(static::style('fieldset', $m), array('label' => $v->label));
                 foreach ($v->children as $n => $c) {
@@ -243,11 +259,13 @@ class Forms implements iFilter
                         is_scalar($value) ||
                         ($c['type'] == 'array' && is_array($value) && $value == array_values($value)) ||
                         is_object($value) && $c['type'] == get_class($value)
-                    )
+                    ) {
                         $c['value'] = $value;
+                    }
                     static::$validationInfo = $vc = new ValidationInfo($c);
-                    if ($vc->from == 'path')
+                    if ($vc->from == 'path') {
                         continue;
+                    }
                     $vc->name = $v->name . '[' . $vc->name . ']';
                     $t [] = static::field($vc, $dataOnly);
                 }
@@ -275,7 +293,7 @@ class Forms implements iFilter
             //prevent XSS attacks
             $p->value = htmlspecialchars($p->value, ENT_QUOTES | ENT_HTML401, 'UTF-8');
         }
-        $type = $p->field ? : static::guessFieldType($p);
+        $type = $p->field ?: static::guessFieldType($p);
         $tag = in_array($type, static::$inputTypes)
             ? 'input' : $type;
         $options = array();
@@ -291,25 +309,33 @@ class Forms implements iFilter
                 $option['text'] = isset($p->rules['select'][$i])
                     ? $p->rules['select'][$i]
                     : $choice;
-                if ($choice == $p->value)
+                if ($choice == $p->value) {
                     $option['selected'] = true;
+                }
                 $options[] = $option;
             }
         } elseif ($p->type == 'boolean' || $p->type == 'bool') {
             if (Text::beginsWith($type, 'radio') || Text::beginsWith($type, 'select')) {
-                $options[] = array('name' => $p->name, 'text' => ' Yes ',
-                    'value' => 'true');
-                $options[] = array('name' => $p->name, 'text' => ' No ',
-                    'value' => 'false');
-                if ($p->value || $p->default)
+                $options[] = array(
+                    'name'  => $p->name,
+                    'text'  => ' Yes ',
+                    'value' => 'true'
+                );
+                $options[] = array(
+                    'name'  => $p->name,
+                    'text'  => ' No ',
+                    'value' => 'false'
+                );
+                if ($p->value || $p->default) {
                     $options[0]['selected'] = true;
+                }
             } else { //checkbox
                 $r = array(
-                    'tag' => $tag,
-                    'name' => $name,
-                    'type' => $type,
-                    'label' => $p->label,
-                    'value' => 'true',
+                    'tag'     => $tag,
+                    'name'    => $name,
+                    'type'    => $type,
+                    'label'   => $p->label,
+                    'value'   => 'true',
                     'default' => $p->default,
                 );
                 $r['text'] = 'Yes';
@@ -323,13 +349,13 @@ class Forms implements iFilter
         }
         if (empty($r)) {
             $r = array(
-                'tag' => $tag,
-                'name' => $name,
-                'type' => $type,
-                'label' => $p->label,
-                'value' => $p->value,
-                'default' => $p->default,
-                'options' => & $options,
+                'tag'      => $tag,
+                'name'     => $name,
+                'type'     => $type,
+                'label'    => $p->label,
+                'value'    => $p->value,
+                'default'  => $p->default,
+                'options'  => & $options,
                 'multiple' => $multiple,
             );
             if (isset($p->rules)) {
@@ -347,30 +373,36 @@ class Forms implements iFilter
             $r['message'] = Validator::$exceptions[$p->name]->getMessage();
         }
 
-        if (true === $p->required)
+        if (true === $p->required) {
             $r['required'] = 'required';
-        if (isset($p->rules['autofocus']))
+        }
+        if (isset($p->rules['autofocus'])) {
             $r['autofocus'] = 'autofocus';
+        }
         /*
         echo "<pre>";
         print_r($r);
         echo "</pre>";
         */
-        if ($dataOnly)
+        if ($dataOnly) {
             return $r;
-        if (isset($p->rules['form']))
+        }
+        if (isset($p->rules['form'])) {
             return Emmet::make($p->rules['form'], $r);
+        }
         $m = static::$info->metadata;
-        $t = Emmet::make(static::style($type, $m, $p->type) ? : static::style($tag, $m, $p->type), $r);
+        $t = Emmet::make(static::style($type, $m, $p->type) ?: static::style($tag, $m, $p->type), $r);
         return $t;
     }
 
     protected static function guessFieldType(ValidationInfo $p, $type = 'type')
     {
-        if (in_array($p->$type, static::$inputTypes))
+        if (in_array($p->$type, static::$inputTypes)) {
             return $p->$type;
-        if ($p->choice)
+        }
+        if ($p->choice) {
             return $p->type == 'array' ? 'checkbox' : 'select';
+        }
         switch ($p->$type) {
             case 'boolean':
                 return 'radio';
@@ -381,8 +413,9 @@ class Forms implements iFilter
             case 'array':
                 return static::guessFieldType($p, 'contentType');
         }
-        if ($p->name == 'password')
+        if ($p->name == 'password') {
             return 'password';
+        }
         return 'text';
     }
 
@@ -397,11 +430,13 @@ class Forms implements iFilter
      */
     public static function key($method = 'POST', $action = null)
     {
-        if (is_null($action))
+        if (is_null($action)) {
             $action = Scope::get('Restler')->url;
+        }
         $target = "$method $action";
-        if (empty(static::$key[$target]))
+        if (empty(static::$key[$target])) {
             static::$key[$target] = md5($target . User::getIpAddress() . uniqid(mt_rand()));
+        }
         $_SESSION[static::FORM_KEY] = static::$key;
         return static::$key[$target];
     }
@@ -425,8 +460,9 @@ class Forms implements iFilter
         $url = $restler->url;
         foreach (static::$excludedPaths as $exclude) {
             if (empty($exclude)) {
-                if ($url == $exclude)
+                if ($url == $exclude) {
                     return true;
+                }
             } elseif (Text::beginsWith($url, $exclude)) {
                 return true;
             }
@@ -447,4 +483,4 @@ class Forms implements iFilter
         }
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/UI/Nav.php b/htdocs/includes/restler/framework/Luracast/Restler/UI/Nav.php
index b74054a99c5..4a7445ccbe6 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/UI/Nav.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/UI/Nav.php
@@ -19,7 +19,7 @@ use Luracast\Restler\Util;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Nav
 {
@@ -130,7 +130,8 @@ class Nav
         } else {
             return $tree;
         }
-        return null;
+        $value = null;
+        return $value;
     }
 
     public static function addUrls(array $urls)
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/UI/Tags.php b/htdocs/includes/restler/framework/Luracast/Restler/UI/Tags.php
index 2c194cdbd1b..27e90bc89b5 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/UI/Tags.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/UI/Tags.php
@@ -14,7 +14,7 @@ use Luracast\Restler\Util;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  *
  * ============================ magic  properties ==============================
  * @property Tags parent parent tag
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/User.php b/htdocs/includes/restler/framework/Luracast/Restler/User.php
index 57465e26e46..463fd46867c 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/User.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/User.php
@@ -11,7 +11,7 @@ namespace Luracast\Restler;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class User implements iIdentifyUser
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Util.php b/htdocs/includes/restler/framework/Luracast/Restler/Util.php
index 9674550814f..a181a0e0da9 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/Util.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/Util.php
@@ -1,5 +1,7 @@
 <?php
+
 namespace Luracast\Restler;
+
 /**
  * Describe the purpose of this class/interface/trait
  *
@@ -9,7 +11,7 @@ namespace Luracast\Restler;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 class Util
 {
@@ -50,8 +52,8 @@ class Util
      * When the deeply nested property is found its value is returned, otherwise
      * false is returned.
      *
-     * @param array $from array to extract the value from
-     * @param string|array $key ... pass more to go deeply inside the array
+     * @param array|object $from    array to extract the value from
+     * @param string|array $key     ... pass more to go deeply inside the array
      *                              alternatively you can pass a single array
      *
      * @return null|mixed null when not found, value otherwise
@@ -77,24 +79,29 @@ class Util
         return $from;
     }
 
-    public static function getResourcePath($className,
-                                           $resourcePath = null,
-                                           $prefix = '')
-    {
+    public static function getResourcePath(
+        $className,
+        $resourcePath = null,
+        $prefix = ''
+    ) {
         if (is_null($resourcePath)) {
             if (Defaults::$autoRoutingEnabled) {
                 $resourcePath = strtolower($className);
-                if (false !== ($index = strrpos($className, '\\')))
+                if (false !== ($index = strrpos($className, '\\'))) {
                     $resourcePath = substr($resourcePath, $index + 1);
-                if (false !== ($index = strrpos($resourcePath, '_')))
+                }
+                if (false !== ($index = strrpos($resourcePath, '_'))) {
                     $resourcePath = substr($resourcePath, $index + 1);
+                }
             } else {
                 $resourcePath = '';
             }
-        } else
+        } else {
             $resourcePath = trim($resourcePath, '/');
-        if (strlen($resourcePath) > 0)
+        }
+        if (strlen($resourcePath) > 0) {
             $resourcePath .= '/';
+        }
         return $prefix . $resourcePath;
     }
 
@@ -114,8 +121,9 @@ class Util
      */
     public static function removeCommonPath($fromPath, $usingPath, $char = '/')
     {
-        if (empty($fromPath))
+        if (empty($fromPath)) {
             return '';
+        }
         $fromPath = explode($char, $fromPath);
         $usingPath = explode($char, $usingPath);
         while (count($usingPath)) {
@@ -145,8 +153,9 @@ class Util
      */
     public static function splitCommonPath($fromPath, $usingPath, $char = '/')
     {
-        if (empty($fromPath))
+        if (empty($fromPath)) {
             return array('', '');
+        }
         $fromPath = explode($char, $fromPath);
         $usingPath = explode($char, $usingPath);
         $commonPath = array();
@@ -213,11 +222,18 @@ class Util
             $accepts = array($accepts);
         }
         foreach ($accepts as $pos => $accept) {
-            $parts = explode(';q=', trim($accept));
-            $type = array_shift($parts);
-            $quality = count($parts) ?
-                floatval(array_shift($parts)) :
-                (1000 - $pos) / 1000;
+            $parts = explode(';', $accept);
+            $type = trim(array_shift($parts));
+            $parameters = [];
+            foreach ($parts as $part) {
+                $part = explode('=', $part);
+                if (2 !== count($part)) {
+                    continue;
+                }
+                $key = strtolower(trim($part[0]));
+                $parameters[$key] = trim($part[1], ' "');
+            }
+            $quality = isset($parameters['q']) ? (float)$parameters['q'] : (1000 - $pos) / 1000;
             $acceptList[$type] = $quality;
         }
         arsort($acceptList);
@@ -227,8 +243,7 @@ class Util
     public static function getShortName($className)
     {
     	// @CHANGE LDR
-    	if (! is_string($className)) return '';
-    	//var_dump($className);
+    	if (!is_string($className)) return;
     	
     	$className = explode('\\', $className);
         return end($className);
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/iAuthenticate.php b/htdocs/includes/restler/framework/Luracast/Restler/iAuthenticate.php
index 6bacb8cec09..954055343e4 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/iAuthenticate.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/iAuthenticate.php
@@ -11,7 +11,7 @@ namespace Luracast\Restler;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 interface iAuthenticate extends iFilter
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/iCache.php b/htdocs/includes/restler/framework/Luracast/Restler/iCache.php
index 37d6aaea261..3b6504340b6 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/iCache.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/iCache.php
@@ -9,7 +9,7 @@ namespace Luracast\Restler;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 interface iCache
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/iCompose.php b/htdocs/includes/restler/framework/Luracast/Restler/iCompose.php
index b06b2c3bc6c..2bc0579befe 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/iCompose.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/iCompose.php
@@ -13,7 +13,7 @@ use Exception;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 interface iCompose {
     /**
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/iFilter.php b/htdocs/includes/restler/framework/Luracast/Restler/iFilter.php
index 89b50ce9812..dc1b355db0f 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/iFilter.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/iFilter.php
@@ -12,7 +12,7 @@ namespace Luracast\Restler;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 interface iFilter
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/iIdentifyUser.php b/htdocs/includes/restler/framework/Luracast/Restler/iIdentifyUser.php
index d3dd4a5d8c5..834897668db 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/iIdentifyUser.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/iIdentifyUser.php
@@ -12,7 +12,7 @@ namespace Luracast\Restler;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 interface iIdentifyUser
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/iProvideMultiVersionApi.php b/htdocs/includes/restler/framework/Luracast/Restler/iProvideMultiVersionApi.php
index c7afe11fcb7..b57fc876f41 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/iProvideMultiVersionApi.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/iProvideMultiVersionApi.php
@@ -5,7 +5,7 @@ namespace Luracast\Restler;
  * Interface iProvideMultiVersionApi
  * @package Luracast\Restler
  *
- * @version    3.0.0rc6
+ *
  */
 interface iProvideMultiVersionApi
 {
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/iUseAuthentication.php b/htdocs/includes/restler/framework/Luracast/Restler/iUseAuthentication.php
index 611d909b305..ee3a9e0bcca 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/iUseAuthentication.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/iUseAuthentication.php
@@ -11,7 +11,7 @@ namespace Luracast\Restler;
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    3.0.0rc6
+ *
  */
 interface iUseAuthentication
 {

From 5da9719681eef20da594ee1fb8f1a973e0d17853 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Dec 2020 17:26:25 +0100
Subject: [PATCH 599/888] Update doc

---
 COPYRIGHT | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/COPYRIGHT b/COPYRIGHT
index 10b06b86811..4f4bc3dff6d 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -29,7 +29,7 @@ PHPoAuthLib            0.8.2         MIT License                 Yes
 PHPPrintIPP            1.3           GPL-2+                      Yes             Library to send print IPP requests
 PSR/Logs			   1.0										                 Library for logs (used by DebugBar)
 PSR/simple-cache	   ?										                 Library for cache (used by PHPSpreadSheet)
-Restler                3.0.0RC6      LGPL-3+                     Yes             Library to develop REST Web services (+ swagger-ui js lib into dir explorer)
+Restler                3.1.1         LGPL-3+                     Yes             Library to develop REST Web services (+ swagger-ui js lib into dir explorer)
 Sabre                  3.2.2         BSD                         Yes             DAV support
 Swift Mailer           5.4.2-DEV     MIT license                 Yes             Comprehensive mailing tools for PHP
 Stripe                 6.43.1        MIT licence                 Yes             Library for Stripe module

From 1c73d3809337c304c6993efe400d9bf7e9bedafa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Dec 2020 17:36:03 +0100
Subject: [PATCH 600/888] Fix api to download for shipments

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

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index c43a7eb890c..6a590b44368 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2647,7 +2647,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->accounting->dir_output.'/'.$original_file;
 	} // Wrapping pour les expedition
-	elseif ($modulepart == 'expedition' && !empty($conf->expedition->dir_output))
+	elseif (($modulepart == 'expedition' || $modulepart == 'shipment') && !empty($conf->expedition->dir_output))
 	{
 		if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
@@ -2655,7 +2655,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->expedition->dir_output."/sending/".$original_file;
 	} // Delivery Note Wrapping
-	elseif ($modulepart == 'delivery' && !empty($conf->expedition->dir_output))
+	elseif (($modulepart == 'livraison' || $modulepart == 'delivery') && !empty($conf->expedition->dir_output))
 	{
 		if ($fuser->rights->expedition->delivery->{$lire} || preg_match('/^specimen/i', $original_file))
 		{

From d65dc85a105a748c0de87ad5c78085bb96d38c58 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Dec 2020 19:14:47 +0100
Subject: [PATCH 601/888] FIX for php 8

---
 htdocs/adherents/list.php                     |  7 +----
 htdocs/comm/action/list.php                   | 10 ++-----
 htdocs/compta/bank/bankentries_list.php       | 10 ++-----
 htdocs/compta/bank/list.php                   | 10 ++-----
 .../compta/cashcontrol/cashcontrol_list.php   | 10 ++-----
 .../compta/facture/invoicetemplate_list.php   | 10 ++-----
 htdocs/contrat/list.php                       | 10 ++-----
 htdocs/contrat/services_list.php              | 10 ++-----
 htdocs/core/class/extrafields.class.php       | 30 +++++++------------
 .../tpl/extrafields_list_array_fields.tpl.php |  2 +-
 htdocs/expensereport/list.php                 |  9 +-----
 htdocs/fichinter/list.php                     | 10 ++-----
 htdocs/fourn/commande/list.php                | 10 ++-----
 htdocs/fourn/facture/list.php                 | 10 ++-----
 htdocs/holiday/list.php                       |  9 +-----
 htdocs/intracommreport/list.php               |  2 +-
 .../modulebuilder/template/myobject_list.php  |  2 +-
 htdocs/projet/activity/perday.php             |  2 +-
 htdocs/projet/activity/perweek.php            |  2 +-
 htdocs/projet/tasks.php                       | 10 ++-----
 htdocs/projet/tasks/list.php                  | 10 ++-----
 htdocs/projet/tasks/time.php                  | 10 ++-----
 htdocs/reception/list.php                     | 11 ++-----
 htdocs/resource/list.php                      | 10 ++-----
 htdocs/societe/website.php                    | 10 ++-----
 htdocs/supplier_proposal/list.php             | 10 ++-----
 htdocs/zapier/hook_list.php                   |  8 ++---
 27 files changed, 55 insertions(+), 189 deletions(-)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index c9aaa856d22..9c9df8e25b5 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -146,12 +146,7 @@ $arrayfields = array(
 	'd.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000)
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
 
 /*
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 510fa67dcdb..2fe47ab39f1 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -141,14 +141,8 @@ $arrayfields = array(
 	'a.tms'=>array('label'=>'DateModification', 'checked'=>0)
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index d57e2cf5591..63021eb3b07 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -155,14 +155,8 @@ $arrayfields = array(
 	'b.conciliated'=>array('label'=>$langs->trans("Conciliated"), 'enabled'=> $object->rappro, 'checked'=>($action == 'reconcile' ? 1 : 0), 'position'=>1020),
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 87c8380ebda..f3efea15235 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -106,14 +106,8 @@ $arrayfields = array(
 	'balance'=>array('label'=>$langs->trans("Balance"), 'checked'=>1, 'position'=>1010),
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index fdc3e57bdba..c6431143a98 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -120,14 +120,8 @@ foreach ($object->fields as $key => $val)
 	if (!empty($val['visible'])) $arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
 }
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index c0abc5a6028..6beb5caa1e2 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -135,14 +135,8 @@ $arrayfields = array(
 	'f.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index ca8ccb9bd7d..d273dd7cdf7 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -131,14 +131,8 @@ $arrayfields = array(
 	'status'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 67b605d657f..4de651a24f9 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -130,14 +130,8 @@ $arrayfields = array(
 	'cd.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500)
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index d041aba45f4..2daf4c835e9 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -991,32 +991,23 @@ class ExtraFields
 			else return '';
 		}
 
-		if (empty($morecss))
-		{
-			if ($type == 'date')
-			{
+		if (empty($morecss)) {
+			if ($type == 'date') {
 				$morecss = 'minwidth100imp';
-			} elseif ($type == 'datetime' || $type == 'link')
-			{
+			} elseif ($type == 'datetime' || $type == 'link') {
 				$morecss = 'minwidth200imp';
-			} elseif (in_array($type, array('int', 'integer', 'double', 'price')))
-			{
+			} elseif (in_array($type, array('int', 'integer', 'double', 'price'))) {
 				$morecss = 'maxwidth75';
-			} elseif ($type == 'password')
-			{
+			} elseif ($type == 'password') {
 				$morecss = 'maxwidth100';
-			} elseif ($type == 'url')
-			{
+			} elseif ($type == 'url') {
 				$morecss = 'minwidth400';
-			} elseif ($type == 'boolean')
-			{
+			} elseif ($type == 'boolean') {
 				$morecss = '';
 			} else {
-				if (round($size) < 12)
-				{
+				if (empty($size) || round($size) < 12) {
 					$morecss = 'minwidth100';
-				} elseif (round($size) <= 48)
-				{
+				} elseif (round($size) <= 48) {
 					$morecss = 'minwidth200';
 				} else {
 					$morecss = 'minwidth400';
@@ -1024,8 +1015,7 @@ class ExtraFields
 			}
 		}
 
-		if (in_array($type, array('date', 'datetime')))
-		{
+		if (in_array($type, array('date', 'datetime'))) {
 			$tmp = explode(',', $size);
 			$newsize = $tmp[0];
 
diff --git a/htdocs/core/tpl/extrafields_list_array_fields.tpl.php b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
index 6e68dd94bea..d2d77cf3b5c 100644
--- a/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
@@ -23,7 +23,7 @@ if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_e
 					'label'    => $extrafields->attributes[$extrafieldsobjectkey]['label'][$key],
 					'checked'  => (($extrafields->attributes[$extrafieldsobjectkey]['list'][$key] < 0) ? 0 : 1),
 					'position' => $extrafields->attributes[$extrafieldsobjectkey]['pos'][$key],
-					'enabled'  => (abs($extrafields->attributes[$extrafieldsobjectkey]['list'][$key]) != 3 && $extrafields->attributes[$extrafieldsobjectkey]['perms'][$key]),
+					'enabled'  => (abs((int) $extrafields->attributes[$extrafieldsobjectkey]['list'][$key]) != 3 && $extrafields->attributes[$extrafieldsobjectkey]['perms'][$key]),
 					'langfile' => $extrafields->attributes[$extrafieldsobjectkey]['langfile'][$key],
 					'help'     => $extrafields->attributes[$extrafieldsobjectkey]['help'][$key],
 				);
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 440fc4524a6..7afb464e4f4 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -140,14 +140,7 @@ $arrayfields = array(
 	'd.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
 $canedituser = (!empty($user->admin) || $user->rights->user->user->creer);
 
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index bdf60e121e7..d054f5e5bcc 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -117,14 +117,8 @@ $arrayfields = array(
 	'fd.duree'=>array('label'=>'DurationOfLine', 'checked'=>1, 'enabled'=>empty($conf->global->FICHINTER_DISABLE_DETAILS) ? 1 : 0),
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 12d3352205b..e680e55868a 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -168,14 +168,8 @@ $arrayfields = array(
 	'cf.billed'=>array('label'=>$langs->trans("Billed"), 'checked'=>1, 'position'=>1000, 'enabled'=>1)
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index d0dce03c87f..b0c58572955 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -189,14 +189,8 @@ $arrayfields = array(
 	'f.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 41ae8a6956f..cbd9b76e45e 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -143,14 +143,7 @@ $arrayfields = array(
 	'cp.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
 if (empty($conf->holiday->enabled))
 {
diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php
index d3346e344f4..e43dc33e700 100644
--- a/htdocs/intracommreport/list.php
+++ b/htdocs/intracommreport/list.php
@@ -132,7 +132,7 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 	foreach($extrafields->attributes[$object->table_element]['label'] as $key => $val)
 	{
 		if (! empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key]=array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key]<0)?0:1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key])!=3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
+			$arrayfields["ef.".$key]=array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key]<0)?0:1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs((int) $extrafields->attributes[$object->table_element]['list'][$key])!=3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
 	}
 }
 */
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 2ed8e4577fa..7d09667bd22 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -129,7 +129,7 @@ $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$visible = dol_eval($val['visible'], 1);
+		$visible = (int) dol_eval($val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 9e15a580358..24ac982896e 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -129,7 +129,7 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
 	{
 		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["efpt.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
+			$arrayfields["efpt.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs((int) $extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
 	}
 }
 $arrayfields = dol_sort_array($arrayfields, 'position');
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 8b49aa2e0c2..4f8fbb8d865 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -143,7 +143,7 @@ if (is_array($extrafields->attributes['projet_task']['label']) && count($extrafi
 	foreach ($extrafields->attributes['projet_task']['label'] as $key => $val)
 	{
 		if (!empty($extrafields->attributes['projet_task']['list'][$key]))
-			$arrayfields["efpt.".$key] = array('label'=>$extrafields->attributes['projet_task']['label'][$key], 'checked'=>(($extrafields->attributes['projet_task']['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes['projet_task']['pos'][$key], 'enabled'=>(abs($extrafields->attributes['projet_task']['list'][$key]) != 3 && $extrafields->attributes['projet_task']['perms'][$key]));
+			$arrayfields["efpt.".$key] = array('label'=>$extrafields->attributes['projet_task']['label'][$key], 'checked'=>(($extrafields->attributes['projet_task']['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes['projet_task']['pos'][$key], 'enabled'=>(abs((int) $extrafields->attributes['projet_task']['list'][$key]) != 3 && $extrafields->attributes['projet_task']['perms'][$key]));
 	}
 }
 $arrayfields = dol_sort_array($arrayfields, 'position');
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index ba1840c4101..52e105c1443 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -119,14 +119,8 @@ if ($object->usage_bill_time) {
 }
 
 // Extra fields
-if (is_array($extrafields->attributes[$taskstatic->table_element]['label']) && count($extrafields->attributes[$taskstatic->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$taskstatic->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$taskstatic->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$taskstatic->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$taskstatic->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$taskstatic->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$taskstatic->table_element]['list'][$key]) != 3 && $extrafields->attributes[$taskstatic->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index b9d1a19c629..1951df8c0e1 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -136,14 +136,8 @@ $arrayfields = array(
 	//'t.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index c18ec6e4434..cb92be401c1 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -869,14 +869,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		$arrayfields['value'] = array('label'=>$langs->trans("Value"), 'checked'=>1, 'enabled'=>(empty($conf->salaries->enabled) ? 0 : 1));
 		$arrayfields['valuebilled'] = array('label'=>$langs->trans("Billed"), 'checked'=>1, 'enabled'=>(((!empty($conf->global->PROJECT_HIDE_TASKS) || empty($conf->global->PROJECT_BILL_TIME_SPENT)) ? 0 : 1) && $projectstatic->usage_bill_time));
 		// Extra fields
-		if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-		{
-			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-			{
-				if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-					$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-			}
-		}
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 		$arrayfields = dol_sort_array($arrayfields, 'position');
 
 		$param = '';
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index e175437c0cc..ec08c7ba94a 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -110,15 +110,10 @@ $arrayfields = array(
 	'e.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
 	'e.billed'=>array('label'=>$langs->trans("Billed"), 'checked'=>1, 'position'=>1000, 'enabled'=>(!empty($conf->global->WORKFLOW_BILL_ON_RECEPTION)))
 );
+
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index ccf061b50b7..c1b67edaa0e 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -121,14 +121,8 @@ $arrayfields = array(
 		),
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index 69e8efd02e1..ff3108d2427 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -99,14 +99,8 @@ foreach ($objectwebsiteaccount->fields as $key => $val)
 }
 
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 5fc27d63a8c..d74f2fbdec3 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -165,14 +165,8 @@ $arrayfields = array(
 	'sp.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/zapier/hook_list.php b/htdocs/zapier/hook_list.php
index 59432aea44b..93461517107 100644
--- a/htdocs/zapier/hook_list.php
+++ b/htdocs/zapier/hook_list.php
@@ -112,12 +112,8 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($val['visible'])) $arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
 }
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 

From 940f0484eef2378727d27a1d21b656dcc0a78372 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Dec 2020 22:17:05 +0100
Subject: [PATCH 602/888] FIX debug report expense/income

---
 .../bank/class/paymentvarious.class.php       |  32 ++-
 htdocs/compta/bank/various_payment/card.php   |   2 +-
 htdocs/compta/resultat/clientfourn.php        | 267 ++++++++++--------
 htdocs/core/class/commonobject.class.php      |   2 +-
 htdocs/core/class/html.form.class.php         |  33 ++-
 5 files changed, 189 insertions(+), 147 deletions(-)

diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index 5c8031f2702..6c2e12ba500 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -93,7 +93,18 @@ class PaymentVarious extends CommonObject
 	public $fk_project;
 
 	/**
-	 * @var int ID
+	 * @var int Bank account ID
+	 */
+	public $fk_account;
+
+	/**
+	 * @var int Bank account ID
+	 * @deprecated See fk_account
+	 */
+	public $accountid;
+
+	/**
+	 * @var int ID record into llx_bank
 	 */
 	public $fk_bank;
 
@@ -102,11 +113,6 @@ class PaymentVarious extends CommonObject
 	 */
 	public $categorie_transaction;
 
-	/**
-	 * @var int Account ID
-	 */
-	public $accountid;
-
 	/**
 	 * @var int ID
 	 */
@@ -397,6 +403,10 @@ class PaymentVarious extends CommonObject
 		$this->fk_bank = (int) $this->fk_bank;
 		$this->fk_user_author = (int) $this->fk_user_author;
 		$this->fk_user_modif = (int) $this->fk_user_modif;
+		$this->fk_account = (int) $this->fk_account;
+		if (empty($this->fk_account) && isset($this->accountid)) {	// For compatibility
+			$this->fk_account = $this->accountid;
+		}
 
 		// Check parameters
 		if (!$this->label)
@@ -409,9 +419,9 @@ class PaymentVarious extends CommonObject
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
 			return -5;
 		}
-		if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
+		if (!empty($conf->banque->enabled) && (empty($this->fk_account) || $this->fk_account <= 0))
 		{
-			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("BankAccount"));
 			return -6;
 		}
 		if (!empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0))
@@ -454,7 +464,7 @@ class PaymentVarious extends CommonObject
 		$sql .= ", ".($this->fk_project > 0 ? $this->fk_project : 0);
 		$sql .= ", ".$user->id;
 		$sql .= ", '".$this->db->idate($now)."'";
-		$sql .= ", NULL";
+		$sql .= ", NULL";	// Filled later
 		$sql .= ", ".$conf->entity;
 		$sql .= ")";
 
@@ -473,7 +483,7 @@ class PaymentVarious extends CommonObject
 					require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 					$acc = new Account($this->db);
-					$result = $acc->fetch($this->accountid);
+					$result = $acc->fetch($this->fk_account);
 					if ($result <= 0) dol_print_error($this->db);
 
 					// Insert payment into llx_bank
@@ -495,7 +505,7 @@ class PaymentVarious extends CommonObject
 						$this->datev
 					);
 
-					// Update fk_bank into llx_paiement.
+					// Update fk_bank into llx_payment_various
 					// So we know the payment which has generate the banking ecriture
 					if ($bank_line_id > 0) {
 						$this->update_fk_bank($bank_line_id);
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index db539e060d2..dfdad0b589b 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -491,7 +491,7 @@ if ($id)
 		);
 		$formquestion[] = array('type' => 'date', 'tdclass'=>'fieldrequired', 'name' => 'clone_date_payment', 'label' => $langs->trans("DatePayment"), 'value' => -1);
 		$formquestion[] = array('type' => 'date', 'name' => 'clone_date_value', 'label' => $langs->trans("DateValue"), 'value' => -1);
-		$formquestion[] = array('type' => 'other', 'tdclass'=>'fieldrequired', 'name' => 'accountid', 'label' => $langs->trans("BankAccount"), 'value' => $form->select_comptes($accountid, "accountid", 0, '', 1));
+		$formquestion[] = array('type' => 'other', 'tdclass'=>'fieldrequired', 'name' => 'accountid', 'label' => $langs->trans("BankAccount"), 'value' => $form->select_comptes($accountid, "accountid", 0, '', 1, '', 0, 'minwidth200', 1));
 
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneVariousPayment', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 300);
 	}
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 8a1655cdefb..3072dcdee2b 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -229,6 +229,8 @@ if ($modecompta == 'BOOKKEEPING')
 print "</tr>\n";
 
 
+$total_ht_outcome = $total_ttc_outcome = $total_ht_income = $total_ttc_income = 0;
+
 
 if ($modecompta == 'BOOKKEEPING')
 {
@@ -438,16 +440,97 @@ if ($modecompta == 'BOOKKEEPING')
 	if ($total_ttc == 0)
 	{
 		print '<tr class="oddeven"><td>&nbsp;</td>';
-		print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
+		print '<td colspan="3"><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
 		print '</tr>';
 	}
 
+	$total_ht_income += $total_ht;
+	$total_ttc_income += $total_ttc;
 	print '<tr class="liste_total">';
 	if ($modecompta == 'CREANCES-DETTES')
 		print '<td colspan="3" class="right">'.price($total_ht).'</td>';
 	print '<td colspan="3" class="right">'.price($total_ttc).'</td>';
 	print '</tr>';
 
+	/*
+	 * Donations
+	 */
+
+	if (!empty($conf->don->enabled))
+	{
+		print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("Donations").'</td></tr>';
+
+		if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES')
+		{
+			if ($modecompta == 'CREANCES-DETTES')
+			{
+				$sql = "SELECT p.societe as name, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
+				$sql .= " FROM ".MAIN_DB_PREFIX."don as p";
+				$sql .= " WHERE p.entity IN (".getEntity('donation').")";
+				$sql .= " AND fk_statut in (1,2)";
+			} else {
+				$sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
+				$sql .= " FROM ".MAIN_DB_PREFIX."don as p";
+				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."payment_donation as pe ON pe.fk_donation = p.rowid";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
+				$sql .= " WHERE p.entity IN (".getEntity('donation').")";
+				$sql .= " AND fk_statut >= 2";
+			}
+			if (!empty($date_start) && !empty($date_end))
+				$sql .= " AND p.datedon >= '".$db->idate($date_start)."' AND p.datedon <= '".$db->idate($date_end)."'";
+		}
+		$sql .= " GROUP BY p.societe, p.firstname, p.lastname, dm";
+		$newsortfield = $sortfield;
+		if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'p.societe, p.firstname, p.lastname, dm';
+		if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
+		if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
+		$sql .= $db->order($newsortfield, $sortorder);
+
+		dol_syslog("get dunning");
+		$result = $db->query($sql);
+		$subtotal_ht = 0;
+		$subtotal_ttc = 0;
+		if ($result)
+		{
+			$num = $db->num_rows($result);
+			$i = 0;
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($result);
+
+					$total_ht += $obj->amount;
+					$total_ttc += $obj->amount;
+					$subtotal_ht += $obj->amount;
+					$subtotal_ttc += $obj->amount;
+
+					print '<tr class="oddeven"><td>&nbsp;</td>';
+
+					print "<td>".$langs->trans("Donation")." <a href=\"".DOL_URL_ROOT."/don/list.php?search_company=".$obj->name."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->name." ".$obj->firstname." ".$obj->lastname."</a></td>\n";
+
+					if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price($obj->amount).'</td>';
+					print '<td class="right">'.price($obj->amount).'</td>';
+					print '</tr>';
+					$i++;
+				}
+			} else {
+				print '<tr class="oddeven"><td>&nbsp;</td>';
+				print '<td colspan="3"><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
+				print '</tr>';
+			}
+		} else {
+			dol_print_error($db);
+		}
+
+		$total_ht_income += $subtotal_ht;
+		$total_ttc_income += $subtotal_ttc;
+		print '<tr class="liste_total">';
+		if ($modecompta == 'CREANCES-DETTES')
+			print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
+			print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
+			print '</tr>';
+	}
 
 	/*
 	 * Suppliers invoices
@@ -515,7 +598,7 @@ if ($modecompta == 'BOOKKEEPING')
 			}
 		} else {
 			print '<tr class="oddeven"><td>&nbsp;</td>';
-			print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
+			print '<td colspan="3"><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
 			print '</tr>';
 		}
 
@@ -523,6 +606,9 @@ if ($modecompta == 'BOOKKEEPING')
 	} else {
 		dol_print_error($db);
 	}
+
+	$total_ht_outcome += $subtotal_ht;
+	$total_ttc_outcome += $subtotal_ttc;
 	print '<tr class="liste_total">';
 	if ($modecompta == 'CREANCES-DETTES')
 		print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
@@ -530,7 +616,6 @@ if ($modecompta == 'BOOKKEEPING')
 	print '</tr>';
 
 
-
 	/*
 	 * Charges sociales non deductibles
 	 */
@@ -592,12 +677,15 @@ if ($modecompta == 'BOOKKEEPING')
 			}
 		} else {
 			print '<tr class="oddeven"><td>&nbsp;</td>';
-			print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
+			print '<td colspan="3"><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
 			print '</tr>';
 		}
 	} else {
 		dol_print_error($db);
 	}
+
+	$total_ht_outcome += $subtotal_ht;
+	$total_ttc_outcome += $subtotal_ttc;
 	print '<tr class="liste_total">';
 	if ($modecompta == 'CREANCES-DETTES')
 		print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
@@ -667,36 +755,21 @@ if ($modecompta == 'BOOKKEEPING')
 			}
 		} else {
 			print '<tr class="oddeven"><td>&nbsp;</td>';
-			print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
+			print '<td colspan="3"><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
 			print '</tr>';
 		}
 	} else {
 		dol_print_error($db);
 	}
+
+	$total_ht_outcome += $subtotal_ht;
+	$total_ttc_outcome += $subtotal_ttc;
 	print '<tr class="liste_total">';
 	if ($modecompta == 'CREANCES-DETTES')
 		print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
 	print '<td colspan="3" class="right">'.price(-$subtotal_ttc).'</td>';
 	print '</tr>';
 
-	if ($mysoc->tva_assuj == 'franchise')	// Non assujetti
-	{
-		// Total
-		print '<tr>';
-		print '<td colspan="4">&nbsp;</td>';
-		print '</tr>';
-
-		print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Profit").'</td>';
-		if ($modecompta == 'CREANCES-DETTES')
-			print '<td class="border right">'.price($total_ht).'</td>';
-		print '<td class="right">'.price($total_ttc).'</td>';
-		print '</tr>';
-
-		print '<tr>';
-		print '<td colspan="4">&nbsp;</td>';
-		print '</tr>';
-	}
-
 
 	/*
 	 * Salaries
@@ -759,12 +832,15 @@ if ($modecompta == 'BOOKKEEPING')
 				}
 			} else {
 				print '<tr class="oddeven"><td>&nbsp;</td>';
-				print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
+				print '<td colspan="3"><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
 				print '</tr>';
 			}
 		} else {
 			dol_print_error($db);
 		}
+
+		$total_ht_outcome += $subtotal_ht;
+		$total_ttc_outcome += $subtotal_ttc;
 		print '<tr class="liste_total">';
 		if ($modecompta == 'CREANCES-DETTES')
 			print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
@@ -841,98 +917,26 @@ if ($modecompta == 'BOOKKEEPING')
 				}
 			} else {
 				print '<tr class="oddeven"><td>&nbsp;</td>';
-				print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
+				print '<td colspan="3"><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
 				print '</tr>';
 			}
 		} else {
 			dol_print_error($db);
 		}
+
+		$total_ht_outcome += $subtotal_ht;
+		$total_ttc_outcome += $subtotal_ttc;
 		print '<tr class="liste_total">';
 		if ($modecompta == 'CREANCES-DETTES') print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
 		print '<td colspan="3" class="right">'.price(-$subtotal_ttc).'</td>';
 		print '</tr>';
 	}
 
-	/*
-	 * Donations
-	 */
-
-	if (!empty($conf->don->enabled))
-	{
-		print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("Donations").'</td></tr>';
-
-		if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES')
-		{
-			if ($modecompta == 'CREANCES-DETTES')
-			{
-				$sql = "SELECT p.societe as name, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
-				$sql .= " FROM ".MAIN_DB_PREFIX."don as p";
-				$sql .= " WHERE p.entity IN (".getEntity('donation').")";
-				$sql .= " AND fk_statut in (1,2)";
-			} else {
-				$sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
-				$sql .= " FROM ".MAIN_DB_PREFIX."don as p";
-				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."payment_donation as pe ON pe.fk_donation = p.rowid";
-				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
-				$sql .= " WHERE p.entity IN (".getEntity('donation').")";
-				$sql .= " AND fk_statut >= 2";
-			}
-			if (!empty($date_start) && !empty($date_end))
-				$sql .= " AND p.datedon >= '".$db->idate($date_start)."' AND p.datedon <= '".$db->idate($date_end)."'";
-		}
-		$sql .= " GROUP BY p.societe, p.firstname, p.lastname, dm";
-		$newsortfield = $sortfield;
-		if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'p.societe, p.firstname, p.lastname, dm';
-		if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
-		if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
-		$sql .= $db->order($newsortfield, $sortorder);
-
-		dol_syslog("get dunning");
-		$result = $db->query($sql);
-		$subtotal_ht = 0;
-		$subtotal_ttc = 0;
-		if ($result)
-		{
-			$num = $db->num_rows($result);
-			$i = 0;
-			if ($num)
-			{
-				while ($i < $num)
-				{
-					$obj = $db->fetch_object($result);
-
-					$total_ht += $obj->amount;
-					$total_ttc += $obj->amount;
-					$subtotal_ht += $obj->amount;
-					$subtotal_ttc += $obj->amount;
-
-					print '<tr class="oddeven"><td>&nbsp;</td>';
-
-					print "<td>".$langs->trans("Donation")." <a href=\"".DOL_URL_ROOT."/don/list.php?search_company=".$obj->name."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->name." ".$obj->firstname." ".$obj->lastname."</a></td>\n";
-
-					if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price($obj->amount).'</td>';
-					print '<td class="right">'.price($obj->amount).'</td>';
-					print '</tr>';
-					$i++;
-				}
-			} else {
-				print '<tr class="oddeven"><td>&nbsp;</td>';
-				print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
-				print '</tr>';
-			}
-		} else {
-			dol_print_error($db);
-		}
-		print '<tr class="liste_total">';
-		if ($modecompta == 'CREANCES-DETTES')
-			print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
-		print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
-		print '</tr>';
-	}
 
 	/*
      * Various Payments
      */
+	//$conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY = 1;
 
 	if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->banque->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
 	{
@@ -953,12 +957,14 @@ if ($modecompta == 'BOOKKEEPING')
 		$result = $db->query($sql);
 		if ($result)
 		{
-			// Debit
+			// Debit (payment of suppliers for example)
 			$obj = $db->fetch_object($result);
 			if (isset($obj->amount))
 			{
 				$subtotal_ht += -$obj->amount;
 				$subtotal_ttc += -$obj->amount;
+				$total_ht_outcome += $obj->amount;
+				$total_ttc_outcome += $obj->amount;
 			}
 			print '<tr class="oddeven"><td>&nbsp;</td>';
 			print "<td>".$langs->trans("Debit")."</td>\n";
@@ -966,12 +972,14 @@ if ($modecompta == 'BOOKKEEPING')
 			print '<td class="right">'.price(-$obj->amount)."</td>\n";
 			print "</tr>\n";
 
-			// Credit
+			// Credit (payment received from customer for example)
 			$obj = $db->fetch_object($result);
 			if (isset($obj->amount))
 			{
 				$subtotal_ht += $obj->amount;
 				$subtotal_ttc += $obj->amount;
+				$total_ht_income += $obj->amount;
+				$total_ttc_income += $obj->amount;
 			}
 			print '<tr class="oddeven"><td>&nbsp;</td>';
 			print "<td>".$langs->trans("Credit")."</td>\n";
@@ -1030,6 +1038,8 @@ if ($modecompta == 'BOOKKEEPING')
 			}
 			$total_ht += $subtotal_ht;
 			$total_ttc += $subtotal_ttc;
+			$total_ht_income += $subtotal_ht;
+			$total_ttc_income += $subtotal_ttc;
 			print '<tr class="liste_total">';
 			if ($modecompta == 'CREANCES-DETTES')
 				print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
@@ -1050,7 +1060,7 @@ if ($modecompta == 'BOOKKEEPING')
 	{
 		if ($modecompta == 'CREANCES-DETTES')
 		{
-			// TVA a payer
+			// VAT to pay
 			$amount = 0;
 			$sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.tva) as amount";
 			$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
@@ -1091,13 +1101,15 @@ if ($modecompta == 'BOOKKEEPING')
 			} else {
 				dol_print_error($db);
 			}
+			$total_ht_outcome -= 0;
+			$total_ttc_outcome -= $amount;
 			print '<tr class="oddeven"><td>&nbsp;</td>';
 			print "<td>".$langs->trans("VATToPay")."</td>\n";
 			print '<td class="right">&nbsp;</td>'."\n";
 			print '<td class="right">'.price($amount)."</td>\n";
 			print "</tr>\n";
 
-			// TVA a recuperer
+			// VAT to retreive
 			$amount = 0;
 			$sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.total_tva) as amount";
 			$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
@@ -1139,6 +1151,9 @@ if ($modecompta == 'BOOKKEEPING')
 			} else {
 				dol_print_error($db);
 			}
+			$total_ht_income += 0;
+			$total_ttc_income += $amount;
+
 			print '<tr class="oddeven"><td>&nbsp;</td>';
 			print '<td>'.$langs->trans("VATToCollect")."</td>\n";
 			print '<td class="right">&nbsp;</td>'."\n";
@@ -1182,10 +1197,12 @@ if ($modecompta == 'BOOKKEEPING')
 			} else {
 				dol_print_error($db);
 			}
+			$total_ht_outcome -= 0;
+			$total_ttc_outcome -= $amount;
 			print '<tr class="oddeven"><td>&nbsp;</td>';
 			print "<td>".$langs->trans("VATPaid")."</td>\n";
 			if ($modecompta == 'CREANCES-DETTES')
-				print '<td <class="right">'.price($amount)."</td>\n";
+				print '<td <class="right"></td>'."\n";
 			print '<td class="right">'.price($amount)."</td>\n";
 			print "</tr>\n";
 
@@ -1226,16 +1243,18 @@ if ($modecompta == 'BOOKKEEPING')
 			} else {
 				dol_print_error($db);
 			}
+			$total_ht_income += 0;
+			$total_ttc_income += $amount;
 			print '<tr class="oddeven"><td>&nbsp;</td>';
 			print "<td>".$langs->trans("VATCollected")."</td>\n";
 			if ($modecompta == 'CREANCES-DETTES')
-				print '<td class="right">'.price($amount)."</td>\n";
+				print '<td class="right"></td>'."\n";
 			print '<td class="right">'.price($amount)."</td>\n";
 			print "</tr>\n";
 		}
 	}
 
-	if ($mysoc->tva_assuj != 'franchise')	// Assujetti
+	if ($mysoc->tva_assuj != '0')	// Assujetti
 	{
 		print '<tr class="liste_total">';
 		if ($modecompta == 'CREANCES-DETTES')
@@ -1250,25 +1269,31 @@ $object = array(&$total_ht, &$total_ttc);
 $parameters["mode"] = $modecompta;
 $parameters["date_start"] = $date_start;
 $parameters["date_end"] = $date_end;
-$parameters["bc"] = $bc;
 // Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('externalbalance'));
 $reshook = $hookmanager->executeHooks('addBalanceLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 print $hookmanager->resPrint;
 
-if ($mysoc->tva_assuj != 'franchise')	// Assujetti
-{
-	// Total
-	print '<tr>';
-	print '<td colspan="4">&nbsp;</td>';
-	print '</tr>';
+// Total
+print '<tr>';
+print '<td colspan="4">&nbsp;</td>';
+print '</tr>';
 
-	print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Profit").'</td>';
-	if ($modecompta == 'CREANCES-DETTES')
-		print '<td class="liste_total right">'.price(price2num($total_ht, 'MT')).'</td>';
-	print '<td class="liste_total right">'.price(price2num($total_ttc, 'MT')).'</td>';
-	print '</tr>';
-}
+print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Outcome").'</td>';
+if ($modecompta == 'CREANCES-DETTES')
+	print '<td class="liste_total right">'.price(price2num(-$total_ht_outcome, 'MT')).'</td>';
+print '<td class="liste_total right">'.price(price2num(-$total_ttc_outcome, 'MT')).'</td>';
+print '</tr>';
+print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Income").'</td>';
+if ($modecompta == 'CREANCES-DETTES')
+	print '<td class="liste_total right">'.price(price2num($total_ht_income, 'MT')).'</td>';
+print '<td class="liste_total right">'.price(price2num($total_ttc_income, 'MT')).'</td>';
+print '</tr>';
+print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Profit").'</td>';
+if ($modecompta == 'CREANCES-DETTES')
+	print '<td class="liste_total right">'.price(price2num($total_ht, 'MT')).'</td>';
+print '<td class="liste_total right">'.price(price2num($total_ttc, 'MT')).'</td>';
+print '</tr>';
 
 print "</table>";
 print '<br>';
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index bfdea016ea6..47c025b0c0a 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -355,7 +355,7 @@ abstract class CommonObject
 	public $last_main_doc;
 
 	/**
-	 * @var int Bank account ID
+	 * @var int Bank account ID sometimes, ID of record into llx_bank sometimes
 	 * @deprecated
 	 * @see $fk_account
 	 */
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 14bbf007542..492a4899376 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3939,13 +3939,16 @@ class Form
 	 *  @param  string	$moreattrib         To add more attribute on select
 	 *  @param	int		$showcurrency		Show currency in label
 	 *  @param	string	$morecss			More CSS
+	 *  @param	int		$nooutput			1=Return string, do not send to output
 	 * 	@return	int							<0 if error, Num of bank account found if OK (0, 1, 2, ...)
 	 */
-	public function select_comptes($selected = '', $htmlname = 'accountid', $status = 0, $filtre = '', $useempty = 0, $moreattrib = '', $showcurrency = 0, $morecss = '')
+	public function select_comptes($selected = '', $htmlname = 'accountid', $status = 0, $filtre = '', $useempty = 0, $moreattrib = '', $showcurrency = 0, $morecss = '', $nooutput = 0)
 	{
 		// phpcs:enable
 		global $langs, $conf;
 
+		$out = '';
+
 		$langs->load("admin");
 		$num = 0;
 
@@ -3964,10 +3967,10 @@ class Form
 			$i = 0;
 			if ($num)
 			{
-				print '<select id="select'.$htmlname.'" class="flat selectbankaccount'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
+				$out .= '<select id="select'.$htmlname.'" class="flat selectbankaccount'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
 				if ($useempty == 1 || ($useempty == 2 && $num > 1))
 				{
-					print '<option value="-1">&nbsp;</option>';
+					$out .= '<option value="-1">&nbsp;</option>';
 				}
 
 				while ($i < $num)
@@ -3975,26 +3978,30 @@ class Form
 					$obj = $this->db->fetch_object($result);
 					if ($selected == $obj->rowid || ($useempty == 2 && $num == 1 && empty($selected)))
 					{
-						print '<option value="'.$obj->rowid.'" selected>';
+						$out .= '<option value="'.$obj->rowid.'" selected>';
 					} else {
-						print '<option value="'.$obj->rowid.'">';
+						$out .= '<option value="'.$obj->rowid.'">';
 					}
-					print trim($obj->label);
-					if ($showcurrency) print ' ('.$obj->currency_code.')';
-					if ($status == 2 && $obj->status == 1) print ' ('.$langs->trans("Closed").')';
-					print '</option>';
+					$out .= trim($obj->label);
+					if ($showcurrency) $out .= ' ('.$obj->currency_code.')';
+					if ($status == 2 && $obj->status == 1) $out .= ' ('.$langs->trans("Closed").')';
+					$out .= '</option>';
 					$i++;
 				}
-				print "</select>";
-				print ajax_combobox('select'.$htmlname);
+				$out .= "</select>";
+				$out .= ajax_combobox('select'.$htmlname);
 			} else {
-				if ($status == 0) print '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';
-				else print '<span class="opacitymedium">'.$langs->trans("NoBankAccountFound").'</span>';
+				if ($status == 0) $out .= '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';
+				else $out .= '<span class="opacitymedium">'.$langs->trans("NoBankAccountFound").'</span>';
 			}
 		} else {
 			dol_print_error($this->db);
 		}
 
+		// Output or return
+		if (empty($nooutput)) print $out;
+		else return $out;
+
 		return $num;
 	}
 

From 4471d7d1da98bd7b756960ac4d4c3f7f3988b56b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Dec 2020 22:17:05 +0100
Subject: [PATCH 603/888] FIX debug report expense/income

---
 .../bank/class/paymentvarious.class.php       |  32 ++-
 htdocs/compta/bank/various_payment/card.php   |   2 +-
 htdocs/compta/resultat/clientfourn.php        | 267 ++++++++++--------
 htdocs/core/class/commonobject.class.php      |   2 +-
 htdocs/core/class/html.form.class.php         |  33 ++-
 5 files changed, 189 insertions(+), 147 deletions(-)

diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index 5c8031f2702..6c2e12ba500 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -93,7 +93,18 @@ class PaymentVarious extends CommonObject
 	public $fk_project;
 
 	/**
-	 * @var int ID
+	 * @var int Bank account ID
+	 */
+	public $fk_account;
+
+	/**
+	 * @var int Bank account ID
+	 * @deprecated See fk_account
+	 */
+	public $accountid;
+
+	/**
+	 * @var int ID record into llx_bank
 	 */
 	public $fk_bank;
 
@@ -102,11 +113,6 @@ class PaymentVarious extends CommonObject
 	 */
 	public $categorie_transaction;
 
-	/**
-	 * @var int Account ID
-	 */
-	public $accountid;
-
 	/**
 	 * @var int ID
 	 */
@@ -397,6 +403,10 @@ class PaymentVarious extends CommonObject
 		$this->fk_bank = (int) $this->fk_bank;
 		$this->fk_user_author = (int) $this->fk_user_author;
 		$this->fk_user_modif = (int) $this->fk_user_modif;
+		$this->fk_account = (int) $this->fk_account;
+		if (empty($this->fk_account) && isset($this->accountid)) {	// For compatibility
+			$this->fk_account = $this->accountid;
+		}
 
 		// Check parameters
 		if (!$this->label)
@@ -409,9 +419,9 @@ class PaymentVarious extends CommonObject
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
 			return -5;
 		}
-		if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
+		if (!empty($conf->banque->enabled) && (empty($this->fk_account) || $this->fk_account <= 0))
 		{
-			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("BankAccount"));
 			return -6;
 		}
 		if (!empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0))
@@ -454,7 +464,7 @@ class PaymentVarious extends CommonObject
 		$sql .= ", ".($this->fk_project > 0 ? $this->fk_project : 0);
 		$sql .= ", ".$user->id;
 		$sql .= ", '".$this->db->idate($now)."'";
-		$sql .= ", NULL";
+		$sql .= ", NULL";	// Filled later
 		$sql .= ", ".$conf->entity;
 		$sql .= ")";
 
@@ -473,7 +483,7 @@ class PaymentVarious extends CommonObject
 					require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 					$acc = new Account($this->db);
-					$result = $acc->fetch($this->accountid);
+					$result = $acc->fetch($this->fk_account);
 					if ($result <= 0) dol_print_error($this->db);
 
 					// Insert payment into llx_bank
@@ -495,7 +505,7 @@ class PaymentVarious extends CommonObject
 						$this->datev
 					);
 
-					// Update fk_bank into llx_paiement.
+					// Update fk_bank into llx_payment_various
 					// So we know the payment which has generate the banking ecriture
 					if ($bank_line_id > 0) {
 						$this->update_fk_bank($bank_line_id);
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index db539e060d2..dfdad0b589b 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -491,7 +491,7 @@ if ($id)
 		);
 		$formquestion[] = array('type' => 'date', 'tdclass'=>'fieldrequired', 'name' => 'clone_date_payment', 'label' => $langs->trans("DatePayment"), 'value' => -1);
 		$formquestion[] = array('type' => 'date', 'name' => 'clone_date_value', 'label' => $langs->trans("DateValue"), 'value' => -1);
-		$formquestion[] = array('type' => 'other', 'tdclass'=>'fieldrequired', 'name' => 'accountid', 'label' => $langs->trans("BankAccount"), 'value' => $form->select_comptes($accountid, "accountid", 0, '', 1));
+		$formquestion[] = array('type' => 'other', 'tdclass'=>'fieldrequired', 'name' => 'accountid', 'label' => $langs->trans("BankAccount"), 'value' => $form->select_comptes($accountid, "accountid", 0, '', 1, '', 0, 'minwidth200', 1));
 
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneVariousPayment', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 300);
 	}
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 8a1655cdefb..3072dcdee2b 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -229,6 +229,8 @@ if ($modecompta == 'BOOKKEEPING')
 print "</tr>\n";
 
 
+$total_ht_outcome = $total_ttc_outcome = $total_ht_income = $total_ttc_income = 0;
+
 
 if ($modecompta == 'BOOKKEEPING')
 {
@@ -438,16 +440,97 @@ if ($modecompta == 'BOOKKEEPING')
 	if ($total_ttc == 0)
 	{
 		print '<tr class="oddeven"><td>&nbsp;</td>';
-		print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
+		print '<td colspan="3"><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
 		print '</tr>';
 	}
 
+	$total_ht_income += $total_ht;
+	$total_ttc_income += $total_ttc;
 	print '<tr class="liste_total">';
 	if ($modecompta == 'CREANCES-DETTES')
 		print '<td colspan="3" class="right">'.price($total_ht).'</td>';
 	print '<td colspan="3" class="right">'.price($total_ttc).'</td>';
 	print '</tr>';
 
+	/*
+	 * Donations
+	 */
+
+	if (!empty($conf->don->enabled))
+	{
+		print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("Donations").'</td></tr>';
+
+		if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES')
+		{
+			if ($modecompta == 'CREANCES-DETTES')
+			{
+				$sql = "SELECT p.societe as name, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
+				$sql .= " FROM ".MAIN_DB_PREFIX."don as p";
+				$sql .= " WHERE p.entity IN (".getEntity('donation').")";
+				$sql .= " AND fk_statut in (1,2)";
+			} else {
+				$sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
+				$sql .= " FROM ".MAIN_DB_PREFIX."don as p";
+				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."payment_donation as pe ON pe.fk_donation = p.rowid";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
+				$sql .= " WHERE p.entity IN (".getEntity('donation').")";
+				$sql .= " AND fk_statut >= 2";
+			}
+			if (!empty($date_start) && !empty($date_end))
+				$sql .= " AND p.datedon >= '".$db->idate($date_start)."' AND p.datedon <= '".$db->idate($date_end)."'";
+		}
+		$sql .= " GROUP BY p.societe, p.firstname, p.lastname, dm";
+		$newsortfield = $sortfield;
+		if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'p.societe, p.firstname, p.lastname, dm';
+		if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
+		if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
+		$sql .= $db->order($newsortfield, $sortorder);
+
+		dol_syslog("get dunning");
+		$result = $db->query($sql);
+		$subtotal_ht = 0;
+		$subtotal_ttc = 0;
+		if ($result)
+		{
+			$num = $db->num_rows($result);
+			$i = 0;
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($result);
+
+					$total_ht += $obj->amount;
+					$total_ttc += $obj->amount;
+					$subtotal_ht += $obj->amount;
+					$subtotal_ttc += $obj->amount;
+
+					print '<tr class="oddeven"><td>&nbsp;</td>';
+
+					print "<td>".$langs->trans("Donation")." <a href=\"".DOL_URL_ROOT."/don/list.php?search_company=".$obj->name."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->name." ".$obj->firstname." ".$obj->lastname."</a></td>\n";
+
+					if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price($obj->amount).'</td>';
+					print '<td class="right">'.price($obj->amount).'</td>';
+					print '</tr>';
+					$i++;
+				}
+			} else {
+				print '<tr class="oddeven"><td>&nbsp;</td>';
+				print '<td colspan="3"><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
+				print '</tr>';
+			}
+		} else {
+			dol_print_error($db);
+		}
+
+		$total_ht_income += $subtotal_ht;
+		$total_ttc_income += $subtotal_ttc;
+		print '<tr class="liste_total">';
+		if ($modecompta == 'CREANCES-DETTES')
+			print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
+			print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
+			print '</tr>';
+	}
 
 	/*
 	 * Suppliers invoices
@@ -515,7 +598,7 @@ if ($modecompta == 'BOOKKEEPING')
 			}
 		} else {
 			print '<tr class="oddeven"><td>&nbsp;</td>';
-			print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
+			print '<td colspan="3"><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
 			print '</tr>';
 		}
 
@@ -523,6 +606,9 @@ if ($modecompta == 'BOOKKEEPING')
 	} else {
 		dol_print_error($db);
 	}
+
+	$total_ht_outcome += $subtotal_ht;
+	$total_ttc_outcome += $subtotal_ttc;
 	print '<tr class="liste_total">';
 	if ($modecompta == 'CREANCES-DETTES')
 		print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
@@ -530,7 +616,6 @@ if ($modecompta == 'BOOKKEEPING')
 	print '</tr>';
 
 
-
 	/*
 	 * Charges sociales non deductibles
 	 */
@@ -592,12 +677,15 @@ if ($modecompta == 'BOOKKEEPING')
 			}
 		} else {
 			print '<tr class="oddeven"><td>&nbsp;</td>';
-			print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
+			print '<td colspan="3"><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
 			print '</tr>';
 		}
 	} else {
 		dol_print_error($db);
 	}
+
+	$total_ht_outcome += $subtotal_ht;
+	$total_ttc_outcome += $subtotal_ttc;
 	print '<tr class="liste_total">';
 	if ($modecompta == 'CREANCES-DETTES')
 		print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
@@ -667,36 +755,21 @@ if ($modecompta == 'BOOKKEEPING')
 			}
 		} else {
 			print '<tr class="oddeven"><td>&nbsp;</td>';
-			print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
+			print '<td colspan="3"><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
 			print '</tr>';
 		}
 	} else {
 		dol_print_error($db);
 	}
+
+	$total_ht_outcome += $subtotal_ht;
+	$total_ttc_outcome += $subtotal_ttc;
 	print '<tr class="liste_total">';
 	if ($modecompta == 'CREANCES-DETTES')
 		print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
 	print '<td colspan="3" class="right">'.price(-$subtotal_ttc).'</td>';
 	print '</tr>';
 
-	if ($mysoc->tva_assuj == 'franchise')	// Non assujetti
-	{
-		// Total
-		print '<tr>';
-		print '<td colspan="4">&nbsp;</td>';
-		print '</tr>';
-
-		print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Profit").'</td>';
-		if ($modecompta == 'CREANCES-DETTES')
-			print '<td class="border right">'.price($total_ht).'</td>';
-		print '<td class="right">'.price($total_ttc).'</td>';
-		print '</tr>';
-
-		print '<tr>';
-		print '<td colspan="4">&nbsp;</td>';
-		print '</tr>';
-	}
-
 
 	/*
 	 * Salaries
@@ -759,12 +832,15 @@ if ($modecompta == 'BOOKKEEPING')
 				}
 			} else {
 				print '<tr class="oddeven"><td>&nbsp;</td>';
-				print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
+				print '<td colspan="3"><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
 				print '</tr>';
 			}
 		} else {
 			dol_print_error($db);
 		}
+
+		$total_ht_outcome += $subtotal_ht;
+		$total_ttc_outcome += $subtotal_ttc;
 		print '<tr class="liste_total">';
 		if ($modecompta == 'CREANCES-DETTES')
 			print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
@@ -841,98 +917,26 @@ if ($modecompta == 'BOOKKEEPING')
 				}
 			} else {
 				print '<tr class="oddeven"><td>&nbsp;</td>';
-				print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
+				print '<td colspan="3"><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
 				print '</tr>';
 			}
 		} else {
 			dol_print_error($db);
 		}
+
+		$total_ht_outcome += $subtotal_ht;
+		$total_ttc_outcome += $subtotal_ttc;
 		print '<tr class="liste_total">';
 		if ($modecompta == 'CREANCES-DETTES') print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
 		print '<td colspan="3" class="right">'.price(-$subtotal_ttc).'</td>';
 		print '</tr>';
 	}
 
-	/*
-	 * Donations
-	 */
-
-	if (!empty($conf->don->enabled))
-	{
-		print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("Donations").'</td></tr>';
-
-		if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES')
-		{
-			if ($modecompta == 'CREANCES-DETTES')
-			{
-				$sql = "SELECT p.societe as name, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
-				$sql .= " FROM ".MAIN_DB_PREFIX."don as p";
-				$sql .= " WHERE p.entity IN (".getEntity('donation').")";
-				$sql .= " AND fk_statut in (1,2)";
-			} else {
-				$sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
-				$sql .= " FROM ".MAIN_DB_PREFIX."don as p";
-				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."payment_donation as pe ON pe.fk_donation = p.rowid";
-				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
-				$sql .= " WHERE p.entity IN (".getEntity('donation').")";
-				$sql .= " AND fk_statut >= 2";
-			}
-			if (!empty($date_start) && !empty($date_end))
-				$sql .= " AND p.datedon >= '".$db->idate($date_start)."' AND p.datedon <= '".$db->idate($date_end)."'";
-		}
-		$sql .= " GROUP BY p.societe, p.firstname, p.lastname, dm";
-		$newsortfield = $sortfield;
-		if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'p.societe, p.firstname, p.lastname, dm';
-		if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
-		if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
-		$sql .= $db->order($newsortfield, $sortorder);
-
-		dol_syslog("get dunning");
-		$result = $db->query($sql);
-		$subtotal_ht = 0;
-		$subtotal_ttc = 0;
-		if ($result)
-		{
-			$num = $db->num_rows($result);
-			$i = 0;
-			if ($num)
-			{
-				while ($i < $num)
-				{
-					$obj = $db->fetch_object($result);
-
-					$total_ht += $obj->amount;
-					$total_ttc += $obj->amount;
-					$subtotal_ht += $obj->amount;
-					$subtotal_ttc += $obj->amount;
-
-					print '<tr class="oddeven"><td>&nbsp;</td>';
-
-					print "<td>".$langs->trans("Donation")." <a href=\"".DOL_URL_ROOT."/don/list.php?search_company=".$obj->name."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->name." ".$obj->firstname." ".$obj->lastname."</a></td>\n";
-
-					if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price($obj->amount).'</td>';
-					print '<td class="right">'.price($obj->amount).'</td>';
-					print '</tr>';
-					$i++;
-				}
-			} else {
-				print '<tr class="oddeven"><td>&nbsp;</td>';
-				print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
-				print '</tr>';
-			}
-		} else {
-			dol_print_error($db);
-		}
-		print '<tr class="liste_total">';
-		if ($modecompta == 'CREANCES-DETTES')
-			print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
-		print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
-		print '</tr>';
-	}
 
 	/*
      * Various Payments
      */
+	//$conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY = 1;
 
 	if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->banque->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
 	{
@@ -953,12 +957,14 @@ if ($modecompta == 'BOOKKEEPING')
 		$result = $db->query($sql);
 		if ($result)
 		{
-			// Debit
+			// Debit (payment of suppliers for example)
 			$obj = $db->fetch_object($result);
 			if (isset($obj->amount))
 			{
 				$subtotal_ht += -$obj->amount;
 				$subtotal_ttc += -$obj->amount;
+				$total_ht_outcome += $obj->amount;
+				$total_ttc_outcome += $obj->amount;
 			}
 			print '<tr class="oddeven"><td>&nbsp;</td>';
 			print "<td>".$langs->trans("Debit")."</td>\n";
@@ -966,12 +972,14 @@ if ($modecompta == 'BOOKKEEPING')
 			print '<td class="right">'.price(-$obj->amount)."</td>\n";
 			print "</tr>\n";
 
-			// Credit
+			// Credit (payment received from customer for example)
 			$obj = $db->fetch_object($result);
 			if (isset($obj->amount))
 			{
 				$subtotal_ht += $obj->amount;
 				$subtotal_ttc += $obj->amount;
+				$total_ht_income += $obj->amount;
+				$total_ttc_income += $obj->amount;
 			}
 			print '<tr class="oddeven"><td>&nbsp;</td>';
 			print "<td>".$langs->trans("Credit")."</td>\n";
@@ -1030,6 +1038,8 @@ if ($modecompta == 'BOOKKEEPING')
 			}
 			$total_ht += $subtotal_ht;
 			$total_ttc += $subtotal_ttc;
+			$total_ht_income += $subtotal_ht;
+			$total_ttc_income += $subtotal_ttc;
 			print '<tr class="liste_total">';
 			if ($modecompta == 'CREANCES-DETTES')
 				print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
@@ -1050,7 +1060,7 @@ if ($modecompta == 'BOOKKEEPING')
 	{
 		if ($modecompta == 'CREANCES-DETTES')
 		{
-			// TVA a payer
+			// VAT to pay
 			$amount = 0;
 			$sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.tva) as amount";
 			$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
@@ -1091,13 +1101,15 @@ if ($modecompta == 'BOOKKEEPING')
 			} else {
 				dol_print_error($db);
 			}
+			$total_ht_outcome -= 0;
+			$total_ttc_outcome -= $amount;
 			print '<tr class="oddeven"><td>&nbsp;</td>';
 			print "<td>".$langs->trans("VATToPay")."</td>\n";
 			print '<td class="right">&nbsp;</td>'."\n";
 			print '<td class="right">'.price($amount)."</td>\n";
 			print "</tr>\n";
 
-			// TVA a recuperer
+			// VAT to retreive
 			$amount = 0;
 			$sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.total_tva) as amount";
 			$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
@@ -1139,6 +1151,9 @@ if ($modecompta == 'BOOKKEEPING')
 			} else {
 				dol_print_error($db);
 			}
+			$total_ht_income += 0;
+			$total_ttc_income += $amount;
+
 			print '<tr class="oddeven"><td>&nbsp;</td>';
 			print '<td>'.$langs->trans("VATToCollect")."</td>\n";
 			print '<td class="right">&nbsp;</td>'."\n";
@@ -1182,10 +1197,12 @@ if ($modecompta == 'BOOKKEEPING')
 			} else {
 				dol_print_error($db);
 			}
+			$total_ht_outcome -= 0;
+			$total_ttc_outcome -= $amount;
 			print '<tr class="oddeven"><td>&nbsp;</td>';
 			print "<td>".$langs->trans("VATPaid")."</td>\n";
 			if ($modecompta == 'CREANCES-DETTES')
-				print '<td <class="right">'.price($amount)."</td>\n";
+				print '<td <class="right"></td>'."\n";
 			print '<td class="right">'.price($amount)."</td>\n";
 			print "</tr>\n";
 
@@ -1226,16 +1243,18 @@ if ($modecompta == 'BOOKKEEPING')
 			} else {
 				dol_print_error($db);
 			}
+			$total_ht_income += 0;
+			$total_ttc_income += $amount;
 			print '<tr class="oddeven"><td>&nbsp;</td>';
 			print "<td>".$langs->trans("VATCollected")."</td>\n";
 			if ($modecompta == 'CREANCES-DETTES')
-				print '<td class="right">'.price($amount)."</td>\n";
+				print '<td class="right"></td>'."\n";
 			print '<td class="right">'.price($amount)."</td>\n";
 			print "</tr>\n";
 		}
 	}
 
-	if ($mysoc->tva_assuj != 'franchise')	// Assujetti
+	if ($mysoc->tva_assuj != '0')	// Assujetti
 	{
 		print '<tr class="liste_total">';
 		if ($modecompta == 'CREANCES-DETTES')
@@ -1250,25 +1269,31 @@ $object = array(&$total_ht, &$total_ttc);
 $parameters["mode"] = $modecompta;
 $parameters["date_start"] = $date_start;
 $parameters["date_end"] = $date_end;
-$parameters["bc"] = $bc;
 // Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('externalbalance'));
 $reshook = $hookmanager->executeHooks('addBalanceLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 print $hookmanager->resPrint;
 
-if ($mysoc->tva_assuj != 'franchise')	// Assujetti
-{
-	// Total
-	print '<tr>';
-	print '<td colspan="4">&nbsp;</td>';
-	print '</tr>';
+// Total
+print '<tr>';
+print '<td colspan="4">&nbsp;</td>';
+print '</tr>';
 
-	print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Profit").'</td>';
-	if ($modecompta == 'CREANCES-DETTES')
-		print '<td class="liste_total right">'.price(price2num($total_ht, 'MT')).'</td>';
-	print '<td class="liste_total right">'.price(price2num($total_ttc, 'MT')).'</td>';
-	print '</tr>';
-}
+print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Outcome").'</td>';
+if ($modecompta == 'CREANCES-DETTES')
+	print '<td class="liste_total right">'.price(price2num(-$total_ht_outcome, 'MT')).'</td>';
+print '<td class="liste_total right">'.price(price2num(-$total_ttc_outcome, 'MT')).'</td>';
+print '</tr>';
+print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Income").'</td>';
+if ($modecompta == 'CREANCES-DETTES')
+	print '<td class="liste_total right">'.price(price2num($total_ht_income, 'MT')).'</td>';
+print '<td class="liste_total right">'.price(price2num($total_ttc_income, 'MT')).'</td>';
+print '</tr>';
+print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Profit").'</td>';
+if ($modecompta == 'CREANCES-DETTES')
+	print '<td class="liste_total right">'.price(price2num($total_ht, 'MT')).'</td>';
+print '<td class="liste_total right">'.price(price2num($total_ttc, 'MT')).'</td>';
+print '</tr>';
 
 print "</table>";
 print '<br>';
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index bfdea016ea6..47c025b0c0a 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -355,7 +355,7 @@ abstract class CommonObject
 	public $last_main_doc;
 
 	/**
-	 * @var int Bank account ID
+	 * @var int Bank account ID sometimes, ID of record into llx_bank sometimes
 	 * @deprecated
 	 * @see $fk_account
 	 */
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 14bbf007542..492a4899376 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3939,13 +3939,16 @@ class Form
 	 *  @param  string	$moreattrib         To add more attribute on select
 	 *  @param	int		$showcurrency		Show currency in label
 	 *  @param	string	$morecss			More CSS
+	 *  @param	int		$nooutput			1=Return string, do not send to output
 	 * 	@return	int							<0 if error, Num of bank account found if OK (0, 1, 2, ...)
 	 */
-	public function select_comptes($selected = '', $htmlname = 'accountid', $status = 0, $filtre = '', $useempty = 0, $moreattrib = '', $showcurrency = 0, $morecss = '')
+	public function select_comptes($selected = '', $htmlname = 'accountid', $status = 0, $filtre = '', $useempty = 0, $moreattrib = '', $showcurrency = 0, $morecss = '', $nooutput = 0)
 	{
 		// phpcs:enable
 		global $langs, $conf;
 
+		$out = '';
+
 		$langs->load("admin");
 		$num = 0;
 
@@ -3964,10 +3967,10 @@ class Form
 			$i = 0;
 			if ($num)
 			{
-				print '<select id="select'.$htmlname.'" class="flat selectbankaccount'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
+				$out .= '<select id="select'.$htmlname.'" class="flat selectbankaccount'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
 				if ($useempty == 1 || ($useempty == 2 && $num > 1))
 				{
-					print '<option value="-1">&nbsp;</option>';
+					$out .= '<option value="-1">&nbsp;</option>';
 				}
 
 				while ($i < $num)
@@ -3975,26 +3978,30 @@ class Form
 					$obj = $this->db->fetch_object($result);
 					if ($selected == $obj->rowid || ($useempty == 2 && $num == 1 && empty($selected)))
 					{
-						print '<option value="'.$obj->rowid.'" selected>';
+						$out .= '<option value="'.$obj->rowid.'" selected>';
 					} else {
-						print '<option value="'.$obj->rowid.'">';
+						$out .= '<option value="'.$obj->rowid.'">';
 					}
-					print trim($obj->label);
-					if ($showcurrency) print ' ('.$obj->currency_code.')';
-					if ($status == 2 && $obj->status == 1) print ' ('.$langs->trans("Closed").')';
-					print '</option>';
+					$out .= trim($obj->label);
+					if ($showcurrency) $out .= ' ('.$obj->currency_code.')';
+					if ($status == 2 && $obj->status == 1) $out .= ' ('.$langs->trans("Closed").')';
+					$out .= '</option>';
 					$i++;
 				}
-				print "</select>";
-				print ajax_combobox('select'.$htmlname);
+				$out .= "</select>";
+				$out .= ajax_combobox('select'.$htmlname);
 			} else {
-				if ($status == 0) print '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';
-				else print '<span class="opacitymedium">'.$langs->trans("NoBankAccountFound").'</span>';
+				if ($status == 0) $out .= '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';
+				else $out .= '<span class="opacitymedium">'.$langs->trans("NoBankAccountFound").'</span>';
 			}
 		} else {
 			dol_print_error($this->db);
 		}
 
+		// Output or return
+		if (empty($nooutput)) print $out;
+		else return $out;
+
 		return $num;
 	}
 

From f8e4985de16e08ec87e3eca371885115f0589f41 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Dec 2020 22:30:29 +0100
Subject: [PATCH 604/888] Trans

---
 htdocs/langs/en_US/compta.lang | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 18ee01eb3bb..1afeb6e3727 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.

From 02daf099284897a8020a4712b15dce316057869c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Dec 2020 23:06:34 +0100
Subject: [PATCH 605/888] Fix for php8

---
 htdocs/core/class/conf.class.php  | 4 ++++
 htdocs/core/lib/functions.lib.php | 2 +-
 htdocs/main.inc.php               | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 09f2b0a44ae..a1800e03980 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -52,9 +52,11 @@ class Conf
 	public $disable_compute;
 	//! Used to store current currency (ISO code like 'USD', 'EUR', ...)
 	public $currency;
+
 	//! Used to store current css (from theme)
 	public $theme; // Contains current theme ("eldy", "auguria", ...)
 	public $css; // Contains full path of css page ("/theme/eldy/style.css.php", ...)
+
 	//! Used to store current menu handler
 	public $standard_menu;
 	// List of activated modules
@@ -98,6 +100,8 @@ class Conf
 	public $dol_no_mouse_hover; // Set if we force param dol_no_mouse_hover into login url or if browser is smartphone
 	public $dol_use_jmobile; // Set if we force param dol_use_jmobile into login url
 
+	public $liste_limit;
+
 
 	/**
 	 * Constructor
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 92114b7c094..dd80c660e71 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4877,7 +4877,7 @@ function price2num($amount, $rounding = '', $option = 0)
 		elseif ($rounding == 'CR') $nbofdectoround = 8;
 		elseif (is_numeric($rounding))  $nbofdectoround = $rounding;
 		//print "RR".$amount.' - '.$nbofdectoround.'<br>';
-		if (dol_strlen($nbofdectoround)) $amount = round($amount, $nbofdectoround); // $nbofdectoround can be 0.
+		if (dol_strlen($nbofdectoround)) $amount = round(is_string($amount) ? (float) $amount : $amount, $nbofdectoround); // $nbofdectoround can be 0.
 		else return 'ErrorBadParameterProvidedToFunction';
 		//print 'SS'.$amount.' - '.$nbofdec.' - '.$dec.' - '.$thousand.' - '.$nbofdectoround.'<br>';
 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 14944619d6e..01e51e5e96f 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2802,7 +2802,7 @@ if (!function_exists("llxFooter"))
 
 			if (!empty($contextpage))                     $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring] = $contextpage;
 			if (!empty($page) && $page > 0)               $_SESSION['lastsearch_page_tmp_'.$relativepathstring] = $page;
-			if (!empty($limit) && $limit != $conf->limit) $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] = $limit;
+			if (!empty($limit) && $limit != $conf->liste_limit) $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] = $limit;
 
 			unset($_SESSION['lastsearch_contextpage_'.$relativepathstring]);
 			unset($_SESSION['lastsearch_page_'.$relativepathstring]);

From b66ec5bc64809795ae38ad95ecbe14a3e0b2384c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Dec 2020 23:16:27 +0100
Subject: [PATCH 606/888] Fix css

---
 htdocs/compta/facture/prelevement.php |  2 +-
 htdocs/fourn/facture/card.php         | 40 ++++++++++-----------------
 htdocs/fourn/facture/contact.php      |  2 +-
 htdocs/fourn/facture/document.php     |  2 +-
 htdocs/fourn/facture/index.php        |  2 +-
 htdocs/fourn/facture/info.php         |  2 +-
 htdocs/fourn/facture/note.php         |  2 +-
 7 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 7e852846d5c..d50813cbea4 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -213,7 +213,7 @@ if ($object->id > 0)
 		$head = facture_prepare_head($object);
 	}
 
-	print dol_get_fiche_head($head, 'standingorders', $title, -1, 'bill');
+	print dol_get_fiche_head($head, 'standingorders', $title, -1, ($type == 'bank-transfer' ? 'supplier_invoice' : 'bill'));
 
 	// Invoice content
 	if ($type == 'bank-transfer') {
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index b439e5cad45..c615817e36f 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -115,6 +115,8 @@ $permissiondellink = $usercancreate; // Used by the include of actions_dellink.i
 $permissiontoedit = $usercancreate; // Used by the include of actions_lineupdown.inc.php
 $permissiontoadd	= $usercancreate; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 
+$error = 0;
+
 
 /*
  * Actions
@@ -183,8 +185,7 @@ if (empty($reshook))
 		}
 
 		// Check parameters
-		if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
-		{
+		if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change) {
 			$langs->load("stocks");
 			if (!$idwarehouse || $idwarehouse == -1)
 			{
@@ -194,11 +195,9 @@ if (empty($reshook))
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$result = $object->validate($user, '', $idwarehouse);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 			} else {
 				// Define output language
@@ -220,8 +219,7 @@ if (empty($reshook))
 				}
 			}
 		}
-	} elseif ($action == 'confirm_delete' && $confirm == 'yes')
-	{
+	} elseif ($action == 'confirm_delete' && $confirm == 'yes') {
 		$object->fetch($id);
 		$object->fetch_thirdparty();
 
@@ -280,15 +278,13 @@ if (empty($reshook))
 	} elseif ($action == 'confirm_paid' && $confirm == 'yes' && $usercancreate) {
 		$object->fetch($id);
 		$result = $object->set_paid($user);
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 
 	// Set supplier ref
-	if ($action == 'setref_supplier' && $usercancreate)
-	{
+	if ($action == 'setref_supplier' && $usercancreate) {
 		$object->ref_supplier = GETPOST('ref_supplier', 'alpha');
 
 		if ($object->update($user) < 0) {
@@ -315,8 +311,7 @@ if (empty($reshook))
 	}
 
 	// payments conditions
-	if ($action == 'setconditions' && $usercancreate)
-	{
+	if ($action == 'setconditions' && $usercancreate) {
 		$object->fetch($id);
 		$object->cond_reglement_code = 0; // To clean property
 		$object->cond_reglement_id = 0; // To clean property
@@ -1680,20 +1675,17 @@ if ($action == 'create')
 	$currency_code = $conf->currency;
 
 	$societe = '';
-	if (GETPOST('socid') > 0)
-	{
+	if (GETPOST('socid') > 0) {
 		$societe = new Societe($db);
 		$societe->fetch(GETPOST('socid', 'int'));
 		if (!empty($conf->multicurrency->enabled) && !empty($societe->multicurrency_code)) $currency_code = $societe->multicurrency_code;
 	}
 
-	if (!empty($origin) && !empty($originid))
-	{
+	if (!empty($origin) && !empty($originid)) {
 		// Parse element/subelement (ex: project_task)
 		$element = $subelement = $origin;
 
-		if ($element == 'project')
-		{
+		if ($element == 'project') {
 			$projectid = $originid;
 			$element = 'projet';
 		}
@@ -2204,8 +2196,7 @@ if ($action == 'create')
 
 
 	// Show origin lines
-	if (is_object($objectsrc))
-	{
+	if (is_object($objectsrc)) {
 		print '<br>';
 
 		$title = $langs->trans('ProductsAndServices');
@@ -2218,8 +2209,7 @@ if ($action == 'create')
 		print '</table>';
 	}
 } else {
-	if ($id > 0 || !empty($ref))
-	{
+	if ($id > 0 || !empty($ref)) {
 		/* *************************************************************************** */
 		/*                                                                             */
 		/* Fiche en mode visu ou edition                                               */
@@ -2275,7 +2265,7 @@ if ($action == 'create')
 		$head = facturefourn_prepare_head($object);
 		$titre = $langs->trans('SupplierInvoice');
 
-		print dol_get_fiche_head($head, 'card', $titre, -1, 'bill');
+		print dol_get_fiche_head($head, 'card', $titre, -1, 'supplier_invoice');
 
 		$formconfirm = '';
 
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index 99010c977dc..357abd029fa 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -134,7 +134,7 @@ if ($id > 0 || !empty($ref))
 
 		$head = facturefourn_prepare_head($object);
 
-		print dol_get_fiche_head($head, 'contact', $langs->trans('SupplierInvoice'), -1, 'bill');
+		print dol_get_fiche_head($head, 'contact', $langs->trans('SupplierInvoice'), -1, 'supplier_invoice');
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index d57abc67644..36f5a45b25e 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -90,7 +90,7 @@ llxHeader('', $title, $helpurl);
 if ($object->id > 0)
 {
 	$head = facturefourn_prepare_head($object);
-	print dol_get_fiche_head($head, 'documents', $langs->trans('SupplierInvoice'), -1, 'bill');
+	print dol_get_fiche_head($head, 'documents', $langs->trans('SupplierInvoice'), -1, 'supplier_invoice');
 
 	$totalpaye = $object->getSommePaiement();
 
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index 494f5d2aa03..131b34bbe39 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -51,7 +51,7 @@ $maxOpenCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->globa
 
 llxHeader("", $langs->trans("SupplierInvoicesArea"), 'EN:Suppliers_Invoices|FR:FactureFournisseur|ES:Facturas_de_proveedores');
 
-print load_fiche_titre($langs->trans("SupplierInvoicesArea"), '', 'bill');
+print load_fiche_titre($langs->trans("SupplierInvoicesArea"), '', 'supplier_invoice');
 
 print '<div class="fichecenter">';
 
diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php
index f8522722e64..656cd3c5553 100644
--- a/htdocs/fourn/facture/info.php
+++ b/htdocs/fourn/facture/info.php
@@ -65,7 +65,7 @@ $alreadypaid = $object->getSommePaiement();
 
 $head = facturefourn_prepare_head($object);
 $titre = $langs->trans('SupplierInvoice');
-print dol_get_fiche_head($head, 'info', $langs->trans('SupplierInvoice'), -1, 'bill');
+print dol_get_fiche_head($head, 'info', $langs->trans('SupplierInvoice'), -1, 'supplier_invoice');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index c72e7b72710..c98ad3ba1d8 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -82,7 +82,7 @@ if ($object->id > 0)
 
 	$head = facturefourn_prepare_head($object);
 	$titre = $langs->trans('SupplierInvoice');
-	print dol_get_fiche_head($head, 'note', $titre, -1, 'bill');
+	print dol_get_fiche_head($head, 'note', $titre, -1, 'supplier_invoice');
 
 
 	// Supplier invoice card

From 26d3ea222799159229fbd022e633b81a49a444e2 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 23 Dec 2020 23:32:50 +0100
Subject: [PATCH 607/888] on going

---
 htdocs/adherents/class/adherent.class.php | 32 +-----------
 htdocs/contact/class/contact.class.php    | 32 +-----------
 htdocs/contact/list.php                   |  2 +
 htdocs/core/actions_massactions.inc.php   | 62 +++++++++++++++++++++++
 htdocs/core/class/commonobject.class.php  | 48 +++++++++++++-----
 htdocs/core/tpl/massactions_pre.tpl.php   | 36 +++++++++++++
 htdocs/langs/en_US/main.lang              |  5 +-
 htdocs/product/class/product.class.php    | 33 +-----------
 htdocs/societe/class/societe.class.php    | 42 +--------------
 htdocs/societe/list.php                   |  2 +
 htdocs/user/class/user.class.php          | 35 +------------
 htdocs/user/list.php                      |  1 +
 12 files changed, 149 insertions(+), 181 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 5df6db52f3d..b26d45c34e2 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -2585,38 +2585,8 @@ class Adherent extends CommonObject
 	 */
 	public function setCategories($categories)
 	{
-		// Handle single category
-		if (!is_array($categories)) {
-			$categories = array($categories);
-		}
-
-		// Get current categories
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		$c = new Categorie($this->db);
-		$existing = $c->containing($this->id, Categorie::TYPE_MEMBER, 'id');
-
-		// Diff
-		if (is_array($existing)) {
-			$to_del = array_diff($existing, $categories);
-			$to_add = array_diff($categories, $existing);
-		} else {
-			$to_del = array(); // Nothing to delete
-			$to_add = $categories;
-		}
-
-		// Process
-		foreach ($to_del as $del) {
-			if ($c->fetch($del) > 0) {
-				$c->del_type($this, Categorie::TYPE_MEMBER);
-			}
-		}
-		foreach ($to_add as $add) {
-			if ($c->fetch($add) > 0) {
-				$c->add_type($this, Categorie::TYPE_MEMBER);
-			}
-		}
-
-		return;
+		return parent::setCategoriesCommon($categories, Categorie::TYPE_MEMBER);
 	}
 
 	/**
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 367a2e7cd62..8fe4943d267 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -1579,38 +1579,8 @@ class Contact extends CommonObject
 	 */
 	public function setCategories($categories)
 	{
-		// Handle single category
-		if (!is_array($categories)) {
-			$categories = array($categories);
-		}
-
-		// Get current categories
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		$c = new Categorie($this->db);
-		$existing = $c->containing($this->id, Categorie::TYPE_CONTACT, 'id');
-
-		// Diff
-		if (is_array($existing)) {
-			$to_del = array_diff($existing, $categories);
-			$to_add = array_diff($categories, $existing);
-		} else {
-			$to_del = array(); // Nothing to delete
-			$to_add = $categories;
-		}
-
-		// Process
-		foreach ($to_del as $del) {
-			if ($c->fetch($del) > 0) {
-				$c->del_type($this, Categorie::TYPE_CONTACT);
-			}
-		}
-		foreach ($to_add as $add) {
-			if ($c->fetch($add) > 0) {
-				$c->add_type($this, Categorie::TYPE_CONTACT);
-			}
-		}
-
-		return;
+		return parent::setCategoriesCommon($categories, Categorie::TYPE_CONTACT);
 	}
 
 	/**
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 00c74544d17..ecde0faf245 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -277,6 +277,7 @@ if (empty($reshook))
 	$objectlabel = 'Contact';
 	$permissiontoread = $user->rights->societe->lire;
 	$permissiontodelete = $user->rights->societe->supprimer;
+	$permissiontoadd = $user->rights->societe->creer;
 	$uploaddir = $conf->societe->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
@@ -525,6 +526,7 @@ $arrayofmassactions = array(
 );
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
 if ($user->rights->societe->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+if ($user->rights->societe->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
 if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 356eb36a04b..7331a9f40a5 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1291,6 +1291,68 @@ if (!$error && $massaction == 'generate_doc' && $permissiontoread)
 	}
 }
 
+if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd) {
+
+	$db->begin();
+
+	$affecttag_type=GETPOST('affecttag_type','alpha');
+	if (!empty($affecttag_type)) {
+		$affecttag_type_array=explode(',',$affecttag_type);
+	} else {
+		setEventMessage('CategTypeNotFound','errors');
+	}
+	if (!empty($affecttag_type_array)) {
+		//check if tag type submited exists into Tag Map categorie class
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+		$categ = new Categorie($db);
+		$to_affecttag_type_array=array();
+		$categ_type_array=$categ->getMapList();
+		foreach($categ_type_array as $categdef) {
+
+			if (in_array($categdef['code'],  $affecttag_type_array)) {
+				$to_affecttag_type_array[] = $categdef['code'];
+			}
+		}
+
+		//For each valid categ type set common categ
+		$nbok = 0;
+		if (!empty($to_affecttag_type_array)) {
+			foreach ($to_affecttag_type_array as $categ_type) {
+				$contcats = GETPOST('contcats_' . $categ_type, 'array');
+var_dump($toselect);exit;
+				foreach ($toselect as $toselectid) {
+					$result = $object->fetch($toselectid);
+					var_dump($contcats);exit;
+					if ($result > 0) {
+
+						$result = $object->setCategoriesCommon($contcats, $categ_type, false);
+						if ($result > 0) {
+							$nbok++;
+						} else {
+							setEventMessages($object->error, $object->errors, 'errors');
+						}
+
+					} else {
+						setEventMessages($object->error, $object->errors, 'errors');
+						$error++;
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	if (!$error)
+	{
+		if ($nbok > 1) setEventMessages($langs->trans("RecordsModified", $nbok), null);
+		else setEventMessages($langs->trans("RecordsModified", $nbok), null);
+		$db->commit();
+		$toselect=array();
+	} else {
+		$db->rollback();
+	}
+}
+
 $parameters['toselect'] = $toselect;
 $parameters['uploaddir'] = $uploaddir;
 $parameters['massaction'] = $massaction;
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index bfdea016ea6..f97f583fc87 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -8377,18 +8377,26 @@ abstract class CommonObject
 	/**
 	 * Sets object to given categories.
 	 *
-	 * Deletes object from existing categories not supplied.
 	 * Adds it to non existing supplied categories.
+	 * Deletes object from existing categories not supplied (if remove_existing==true).
 	 * Existing categories are left untouch.
 	 *
-	 * @param 	int[]|int 	$categories 	Category ID or array of Categories IDs
-	 * @param 	string 		$type_categ 	Category type ('customer', 'supplier', 'website_page', ...)
+	 * @param 	int[]|int 	$categories 		Category ID or array of Categories IDs
+	 * @param 	string 		$type_categ 		Category type ('customer', 'supplier', 'website_page', ...) definied into const class Categorie type
+	 * @param 	boolean		$remove_existing 	True: Remove existings categories from Object if not supplies by $categories, False: let them
 	 * @return	int							<0 if KO, >0 if OK
 	 */
-	public function setCategoriesCommon($categories, $type_categ)
+	public function setCategoriesCommon($categories, $type_categ='', $remove_existing=true)
 	{
+		dol_syslog(get_class($this)."::setCategoriesCommon Oject Id:".$this->id.' type_categ:'.$type_categ.' nb tag add:'.count($categories), LOG_DEBUG);
+
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
+		if (empty($type_categ)) {
+			dol_syslog(__METHOD__.': Type '.$type_categ.'is an unknown category type. Done nothing.', LOG_ERR);
+			return -1;
+		}
+
 		// Handle single category
 		if (!is_array($categories)) {
 			$categories = array($categories);
@@ -8397,22 +8405,36 @@ abstract class CommonObject
 		// Get current categories
 		$c = new Categorie($this->db);
 		$existing = $c->containing($this->id, $type_categ, 'id');
-
-		// Diff
-		if (is_array($existing)) {
-			$to_del = array_diff($existing, $categories);
-			$to_add = array_diff($categories, $existing);
+		if ($remove_existing) {
+			// Diff
+			if (is_array($existing)) {
+				$to_del = array_diff($existing, $categories);
+				$to_add = array_diff($categories, $existing);
+			} else {
+				$to_del = array(); // Nothing to delete
+				$to_add = $categories;
+			}
 		} else {
 			$to_del = array(); // Nothing to delete
-			$to_add = $categories;
+			$to_add = array_diff($categories, $existing);
 		}
 
 		$error = 0;
+		$ok=0;
 
 		// Process
 		foreach ($to_del as $del) {
 			if ($c->fetch($del) > 0) {
-				$c->del_type($this, $type_categ);
+				$result=$c->del_type($this, $type_categ);
+				if ($result < 0)
+				{
+					$error++;
+					$this->error = $c->error;
+					$this->errors = $c->errors;
+					break;
+				} else {
+					$ok+=$result;
+				}
 			}
 		}
 		foreach ($to_add as $add) {
@@ -8425,11 +8447,13 @@ abstract class CommonObject
 					$this->error = $c->error;
 					$this->errors = $c->errors;
 					break;
+				} else {
+					$ok+=$result;
 				}
 			}
 		}
 
-		return $error ? -1 : 1;
+		return $error ? -1 * $error : $ok;
 	}
 
 	/**
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index 21070467f57..a5ce87ae932 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -37,6 +37,42 @@ if ($massaction == 'predelete')
 	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassDeletion"), $langs->trans("ConfirmMassDeletionQuestion", count($toselect)), "delete", null, '', 0, 200, 500, 1);
 }
 
+if ($massaction == 'preaffecttag')
+{
+	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+	$categ = new Categorie($db);
+	$categ_types=array();
+	$categ_type_array=$categ->getMapList();
+	foreach($categ_type_array as $categdef) {
+		if (isset($object) && $categdef['obj_table']==$object->table_element) {
+			if (!array_key_exists($categdef['code'],$categ_types)) $categ_types[$categdef['code']] = array('code'=>$categdef['code'],'label'=>$langs->trans($categdef['obj_class']));
+		}
+		if (isset($objecttmp) && $categdef['obj_table']==$objecttmp->table_element) {
+			if (!array_key_exists($categdef['code'],$categ_types)) $categ_types[$categdef['code']] = array('code'=>$categdef['code'],'label'=>$langs->trans($categdef['obj_class']));
+		}
+	}
+
+	$formquestion = array();
+	if (!empty($categ_types)) {
+		foreach($categ_types as $categ_type) {
+			$cate_arbo = $form->select_all_categories($categ_type['code'], null, 'parent', null, null, 1);
+			$formquestion[]=
+				array('type' => 'other',
+					'name' => 'affecttag_'.$categ_type['code'],
+					'label' => $langs->trans("Tag").' '.$categ_type['label'],
+					'value' => $form->multiselectarray('contcats_'.$categ_type['code'], $cate_arbo, GETPOST('contcats_'.$categ_type['code'], 'array'), null, null, null, null, '60%'));
+		}
+		$formquestion[]=
+			array('type' => 'other',
+				'name' => 'affecttag_type',
+				'label' => '',
+				'value' => '<input type="hidden" name="affecttag_type"  id="affecttag_type" value="'.implode(",",array_keys($categ_types)).'"/>');
+		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmAffectTag"), $langs->trans("ConfirmAffectTagQuestion", count($toselect)), "affecttag", $formquestion, 1, 0, 200, 500, 1);
+	} else {
+		setEventMessage('CategTypeNotFound');
+	}
+}
+
 if ($massaction == 'presend')
 {
 	$langs->load("mails");
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 7075df90783..07aafadd636 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1112,4 +1112,7 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
-OnHold=On hold
\ No newline at end of file
+OnHold=On hold
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index c40ffd4e0a9..4e94380a54f 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -5497,38 +5497,9 @@ class Product extends CommonObject
 	 */
 	public function setCategories($categories)
 	{
-		// Handle single category
-		if (!is_array($categories)) {
-			$categories = array($categories);
-		}
 
-		// Get current categories
-		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		$c = new Categorie($this->db);
-		$existing = $c->containing($this->id, Categorie::TYPE_PRODUCT, 'id');
-
-		// Diff
-		if (is_array($existing)) {
-			$to_del = array_diff($existing, $categories);
-			$to_add = array_diff($categories, $existing);
-		} else {
-			$to_del = array(); // Nothing to delete
-			$to_add = $categories;
-		}
-
-		// Process
-		foreach ($to_del as $del) {
-			if ($c->fetch($del) > 0) {
-				$c->del_type($this, Categorie::TYPE_PRODUCT);
-			}
-		}
-		foreach ($to_add as $add) {
-			if ($c->fetch($add) > 0) {
-				$c->add_type($this, Categorie::TYPE_PRODUCT);
-			}
-		}
-
-		return;
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+		return parent::setCategoriesCommon($categories, Categorie::TYPE_PRODUCT);
 	}
 
 	/**
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 0aeb64aa427..70f561acf2a 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -4266,47 +4266,7 @@ class Societe extends CommonObject
 			return -1;
 		}
 
-		// Handle single category
-		if (!is_array($categories)) {
-			$categories = array($categories);
-		}
-
-		// Get current categories
-		$c = new Categorie($this->db);
-		$existing = $c->containing($this->id, $type_categ, 'id');
-
-		// Diff
-		if (is_array($existing)) {
-			$to_del = array_diff($existing, $categories);
-			$to_add = array_diff($categories, $existing);
-		} else {
-			$to_del = array(); // Nothing to delete
-			$to_add = $categories;
-		}
-
-		$error = 0;
-
-		// Process
-		foreach ($to_del as $del) {
-			if ($c->fetch($del) > 0) {
-				$c->del_type($this, $type_categ);
-			}
-		}
-		foreach ($to_add as $add) {
-			if ($c->fetch($add) > 0)
-			{
-				$result = $c->add_type($this, $type_categ);
-				if ($result < 0)
-				{
-					$error++;
-					$this->error = $c->error;
-					$this->errors = $c->errors;
-					break;
-				}
-			}
-		}
-
-		return $error ? -1 : 1;
+		return parent::setCategoriesCommon($categories, $type_categ);
 	}
 
 	/**
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 2e24f355b37..ffdba17d24d 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -324,6 +324,7 @@ if (empty($reshook))
 	$objectlabel = 'ThirdParty';
 	$permissiontoread = $user->rights->societe->lire;
 	$permissiontodelete = $user->rights->societe->supprimer;
+	$permissiontoadd = $user->rights->societe->creer;
 	$uploaddir = $conf->societe->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
@@ -595,6 +596,7 @@ $arrayofmassactions = array(
 );
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
 if ($user->rights->societe->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+if ($user->rights->societe->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index eb92bd51eb9..7e0c4628250 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1159,40 +1159,7 @@ class User extends CommonObject
 	public function setCategories($categories)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-
-		$type_categ = Categorie::TYPE_USER;
-
-		// Handle single category
-		if (!is_array($categories)) {
-			$categories = array($categories);
-		}
-
-		// Get current categories
-		$c = new Categorie($this->db);
-		$existing = $c->containing($this->id, $type_categ, 'id');
-
-		// Diff
-		if (is_array($existing)) {
-			$to_del = array_diff($existing, $categories);
-			$to_add = array_diff($categories, $existing);
-		} else {
-			$to_del = array(); // Nothing to delete
-			$to_add = $categories;
-		}
-
-		// Process
-		foreach ($to_del as $del) {
-			if ($c->fetch($del) > 0) {
-				$c->del_type($this, $type_categ);
-			}
-		}
-		foreach ($to_add as $add) {
-			if ($c->fetch($add) > 0) {
-				$c->add_type($this, $type_categ);
-			}
-		}
-
-		return;
+		return parent::setCategoriesCommon($categories, Categorie::TYPE_USER);
 	}
 
 	/**
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index e7a8a31af4e..3e486fb0c70 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -422,6 +422,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 $arrayofmassactions = array();
 if ($permissiontoadd) $arrayofmassactions['disable'] = $langs->trans("DisableUser");
 if ($permissiontoadd) $arrayofmassactions['reactivate'] = $langs->trans("Reactivate");
+if ($permissiontoadd) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
 //if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();

From 055a2b6fec88e201a10b56c67ad27526f85d4506 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 23 Dec 2020 23:44:38 +0100
Subject: [PATCH 608/888] on goung

---
 htdocs/contact/list.php                 | 2 +-
 htdocs/core/actions_massactions.inc.php | 5 ++---
 htdocs/product/list.php                 | 2 ++
 htdocs/user/list.php                    | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index ecde0faf245..7ca0e431c5a 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -267,7 +267,7 @@ if (empty($reshook))
 		$search_categ_thirdparty = '';
 		$search_categ_supplier = '';
 		$search_import_key = '';
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 		$search_roles = array();
 	}
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 7331a9f40a5..abc244ba255 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1308,7 +1308,6 @@ if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd
 		$to_affecttag_type_array=array();
 		$categ_type_array=$categ->getMapList();
 		foreach($categ_type_array as $categdef) {
-
 			if (in_array($categdef['code'],  $affecttag_type_array)) {
 				$to_affecttag_type_array[] = $categdef['code'];
 			}
@@ -1319,10 +1318,10 @@ if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd
 		if (!empty($to_affecttag_type_array)) {
 			foreach ($to_affecttag_type_array as $categ_type) {
 				$contcats = GETPOST('contcats_' . $categ_type, 'array');
-var_dump($toselect);exit;
+				//var_dump($toselect);exit;
 				foreach ($toselect as $toselectid) {
 					$result = $object->fetch($toselectid);
-					var_dump($contcats);exit;
+					//var_dump($contcats);exit;
 					if ($result > 0) {
 
 						$result = $object->setCategoriesCommon($contcats, $categ_type, false);
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 86b8b62fc81..a6b164772ba 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -301,6 +301,7 @@ if (empty($reshook))
 
 	$permissiontoread = $user->rights->produit->lire;
 	$permissiontodelete = $user->rights->produit->supprimer;
+	$permissiontoadd = $user->rights->{$rightskey}->creer;
 	$uploaddir = $conf->product->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
@@ -533,6 +534,7 @@ if ($resql)
 	$rightskey = 'produit';
 	if ($type == Product::TYPE_SERVICE) $rightskey = 'service';
 	if ($user->rights->{$rightskey}->supprimer) $arrayofmassactions['predelete'] = "<span class='fa fa-trash paddingrightonly'></span>".$langs->trans("Delete");
+	if ($user->rights->{$rightskey}->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
 	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 3e486fb0c70..6c43f7e7c6e 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -648,7 +648,7 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
-$arrayofselected = array();
+$arrayofselected = is_array($toselect) ? $toselect : array();
 while ($i < ($limit ? min($num, $limit) : $num))
 {
 	$obj = $db->fetch_object($resql);

From 7d1d58822589fde6947531260c1e850c08c08e3f Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 23 Dec 2020 23:48:45 +0100
Subject: [PATCH 609/888] fix service right problem for mass action

---
 htdocs/product/list.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index d2f212df8da..50001d25026 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -240,6 +240,9 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
+$rightskey = 'produit';
+if ($type == Product::TYPE_SERVICE) $rightskey = 'service';
+
 if (empty($reshook))
 {
 	// Selection of new fields
@@ -275,8 +278,8 @@ if (empty($reshook))
 	if ((string) $search_type == '1') { $objectlabel = 'Services'; }
 	if ((string) $search_type == '0') { $objectlabel = 'Products'; }
 
-	$permissiontoread = $user->rights->produit->lire;
-	$permissiontodelete = $user->rights->produit->supprimer;
+	$permissiontoread = $user->rights->{$rightskey}->lire;
+	$permissiontodelete = $user->rights->{$rightskey}->supprimer;
 	$uploaddir = $conf->product->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
@@ -507,8 +510,6 @@ if ($resql)
 	    //'builddoc'=>$langs->trans("PDFMerge"),
 	    //'presend'=>$langs->trans("SendByMail"),
 	);
-    $rightskey = 'produit';
-	if ($type == Product::TYPE_SERVICE) $rightskey = 'service';
 	if ($user->rights->{$rightskey}->supprimer) $arrayofmassactions['predelete'] = "<span class='fa fa-trash paddingrightonly'></span>".$langs->trans("Delete");
 	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);

From 5ae5f3e7ac6fd072f411205d0987666cfb85003e Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 24 Dec 2020 00:32:54 +0100
Subject: [PATCH 610/888] let societe project acctioncomme website accounr

---
 htdocs/adherents/list.php                        | 2 ++
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 2 +-
 htdocs/langs/en_US/main.lang                     | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 9c9df8e25b5..ed4bf7bdb8b 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -230,6 +230,7 @@ if (empty($reshook)) {
 	$objectlabel = 'Members';
 	$permissiontoread = $user->rights->adherent->lire;
 	$permissiontodelete = $user->rights->adherent->supprimer;
+	$permissiontoadd = $user->rights->adherent->creer;
 	$uploaddir = $conf->adherent->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
@@ -399,6 +400,7 @@ $arrayofmassactions = array(
 );
 if ($user->rights->adherent->creer) $arrayofmassactions['close'] = $langs->trans("Resiliate");
 if ($user->rights->adherent->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+if ($user->rights->societe->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
 if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index 309d4d4b170..b5d20b96434 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -543,7 +543,7 @@ CREATE TABLE llx_session(
   fk_user integer NOT NULL,
   remote_ip varchar(64) NULL,
   user_agent varchar(128) NULL
-)ENGINE=innodb;
+) ENGINE=innodb;
 
 INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'github', 'Github', 'https://github.com/{socialid}', 'fa-github', 1);
 
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 07aafadd636..e196120c27d 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1113,6 +1113,7 @@ OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
 OnHold=On hold
+AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records

From 1978e23c5e63e9af73bd78a109136bf2bb57d51b Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 24 Dec 2020 00:48:22 +0100
Subject: [PATCH 611/888] ongoing

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

diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 988f16a962a..f9190a3404c 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -218,6 +218,7 @@ if (empty($reshook))
 	$objectlabel = 'Project';
 	$permissiontoread = $user->rights->projet->lire;
 	$permissiontodelete = $user->rights->projet->supprimer;
+	$permissiontoadd = $user->rights->projet->creer;
 	$uploaddir = $conf->projet->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
@@ -454,7 +455,8 @@ $arrayofmassactions = array(
 );
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
 if ($user->rights->projet->creer) $arrayofmassactions['close'] = $langs->trans("Close");
-if ($user->rights->societe->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+if ($user->rights->projet->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+if ($user->rights->projet->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
 if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);

From 60d8fb47199261c92c3ab416674bd70fdcc2157d Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 24 Dec 2020 00:48:48 +0100
Subject: [PATCH 612/888] fic porject mass action right

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

diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 5c36044dcd1..9bb383e9803 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -436,7 +436,7 @@ $arrayofmassactions = array(
 );
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
 if ($user->rights->projet->creer) $arrayofmassactions['close'] = $langs->trans("Close");
-if ($user->rights->societe->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+if ($user->rights->projet->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);

From d0b646659591145afdf68f85898d4f0e45a468f4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Dec 2020 00:51:44 +0100
Subject: [PATCH 613/888] Prepare v13 packaging

---
 build/rpm/dolibarr_generic.spec  | 1 +
 build/rpm/dolibarr_mandriva.spec | 1 +
 build/rpm/dolibarr_opensuse.spec | 1 +
 3 files changed, 3 insertions(+)

diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index f3c86419f8e..4541868a04f 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -292,6 +292,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/product
 %_datadir/dolibarr/htdocs/projet
 %_datadir/dolibarr/htdocs/public
+%_datadir/dolibarr/htdocs/recruitment
 %_datadir/dolibarr/htdocs/reception
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/salaries
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index 3c2b8adeb5b..d618b5729d5 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -209,6 +209,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/product
 %_datadir/dolibarr/htdocs/projet
 %_datadir/dolibarr/htdocs/public
+%_datadir/dolibarr/htdocs/recruitment
 %_datadir/dolibarr/htdocs/reception
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/salaries
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index 71db3f43445..230a8946e99 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -220,6 +220,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/product
 %_datadir/dolibarr/htdocs/projet
 %_datadir/dolibarr/htdocs/public
+%_datadir/dolibarr/htdocs/recruitment
 %_datadir/dolibarr/htdocs/reception
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/salaries

From 268618d0456ab9b4a31aa1cd314f8580cd1ee3eb Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 24 Dec 2020 00:53:10 +0100
Subject: [PATCH 614/888] project done

---
 htdocs/projet/class/project.class.php | 44 +--------------------------
 1 file changed, 1 insertion(+), 43 deletions(-)

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index f58886c9a3b..4fff4297854 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -2135,50 +2135,8 @@ class Project extends CommonObject
 	 */
 	public function setCategories($categories)
 	{
-		$type_categ = Categorie::TYPE_PROJECT;
-
-		// Handle single category
-		if (!is_array($categories)) {
-			$categories = array($categories);
-		}
-
-		// Get current categories
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		$c = new Categorie($this->db);
-		$existing = $c->containing($this->id, $type_categ, 'id');
-
-		// Diff
-		if (is_array($existing)) {
-			$to_del = array_diff($existing, $categories);
-			$to_add = array_diff($categories, $existing);
-		} else {
-			$to_del = array(); // Nothing to delete
-			$to_add = $categories;
-		}
-
-		// Process
-		foreach ($to_del as $del) {
-			if ($c->fetch($del) > 0) {
-				$result = $c->del_type($this, $type_categ);
-				if ($result < 0) {
-					$this->errors = $c->errors;
-					$this->error = $c->error;
-					return -1;
-				}
-			}
-		}
-		foreach ($to_add as $add) {
-			if ($c->fetch($add) > 0) {
-				$result = $c->add_type($this, $type_categ);
-				if ($result < 0) {
-					$this->errors = $c->errors;
-					$this->error = $c->error;
-					return -1;
-				}
-			}
-		}
-
-		return 1;
+		return parent::setCategoriesCommon($categories, Categorie::TYPE_PROJECT);
 	}
 
 

From e4bd4ce78e8a1d1b1e86e893063629f7c68af3c0 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 24 Dec 2020 00:58:21 +0100
Subject: [PATCH 615/888] stock done

---
 htdocs/product/stock/class/entrepot.class.php | 34 +------------------
 htdocs/product/stock/list.php                 |  6 +++-
 2 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index d7a52cd1910..f975eaabc67 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -890,39 +890,7 @@ class Entrepot extends CommonObject
 	 */
 	public function setCategories($categories)
 	{
-		$type_categ = Categorie::TYPE_WAREHOUSE;
-
-		// Handle single category
-		if (!is_array($categories)) {
-			$categories = array($categories);
-		}
-
-		// Get current categories
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		$c = new Categorie($this->db);
-		$existing = $c->containing($this->id, $type_categ, 'id');
-
-		// Diff
-		if (is_array($existing)) {
-			$to_del = array_diff($existing, $categories);
-			$to_add = array_diff($categories, $existing);
-		} else {
-			$to_del = array(); // Nothing to delete
-			$to_add = $categories;
-		}
-
-		// Process
-		foreach ($to_del as $del) {
-			if ($c->fetch($del) > 0) {
-				$c->del_type($this, $type_categ);
-			}
-		}
-		foreach ($to_add as $add) {
-			if ($c->fetch($add) > 0) {
-				$c->add_type($this, $type_categ);
-			}
-		}
-
-		return;
+		return parent::setCategoriesCommon($categories, Categorie::TYPE_WAREHOUSE);
 	}
 }
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index f2c7133618b..0ff7cf029c7 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -46,6 +46,8 @@ $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'stocklist'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$toselect = GETPOST('toselect', 'array');
+
 
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_ref = GETPOST("sref", "alpha") ?GETPOST("sref", "alpha") : GETPOST("search_ref", "alpha");
@@ -160,7 +162,7 @@ if (empty($reshook))
 		{
 			$search[$key] = '';
 		}
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
@@ -174,6 +176,7 @@ if (empty($reshook))
 	$objectlabel = 'Warehouse';
 	$permissiontoread = $user->rights->stock->lire;
 	$permissiontodelete = $user->rights->stock->supprimer;
+	$permissiontoadd = $user->rights->stock->creer;
 	$uploaddir = $conf->stock->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
@@ -344,6 +347,7 @@ $arrayofmassactions = array(
 );
 //if ($user->rights->stock->supprimer) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if ($user->rights->stock->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 print '<form action="'.$_SERVER["PHP_SELF"].'" id="searchFormList" method="POST" name="formulaire">';

From 88e441412c23e1efeb8208220d4f4c10ae9104b2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Dec 2020 01:35:59 +0100
Subject: [PATCH 616/888] CSS

---
 htdocs/compta/bank/various_payment/list.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 48da6483152..9c936c1d943 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -466,14 +466,18 @@ if ($result)
 
 		// Project
 		if ($arrayfields['project']['checked']) {
-			$proj->fetch($obj->fk_project);
-			print '<td class="nowraponall">'.$proj->getNomUrl(1).'</td>';
+			print '<td class="nowraponall">';
+			if ($obj->fk_project > 0) {
+				$proj->fetch($obj->fk_project);
+				print $proj->getNomUrl(1);
+			}
+			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Bank account
 		if ($arrayfields['bank']['checked']) {
-			print '<td>';
+			print '<td class="nowraponall">';
 			if ($obj->bid > 0)
 			{
 				$accountstatic->id = $obj->bid;

From e590fb36adeb3338b8a3f50d7e85d07edb846b43 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Dec 2020 01:53:36 +0100
Subject: [PATCH 617/888] Log for debug

---
 test/phpunit/RestAPIUserTest.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/phpunit/RestAPIUserTest.php b/test/phpunit/RestAPIUserTest.php
index 2bce51e2a05..979daa521b9 100644
--- a/test/phpunit/RestAPIUserTest.php
+++ b/test/phpunit/RestAPIUserTest.php
@@ -164,11 +164,11 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
 
         print __METHOD__." Request GET url=".$url."\n";
         $result=getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
-        //print __METHOD__." Result for unexisting user: ".var_export($result, true)."\n";
+        print __METHOD__." result for get on unexisting user: ".var_export($result, true)."\n";
         print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
         $this->assertEquals($result['curl_error_no'], '');
         $object=json_decode($result['content'], true);
-        $this->assertNotNull($object, "Parsing of json result must no be null");
+        $this->assertNotNull($object, "Parsing of json result must not be null");
         $this->assertEquals(404, $object['error']['code']);
 
         $url = $this->api_url.'/users/1?api_key='.$this->api_key;
@@ -179,7 +179,7 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
         print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
         $this->assertEquals($result['curl_error_no'], '');
         $object=json_decode($result['content'], true);
-        $this->assertNotNull($object, "Parsing of json result must no be null");
+        $this->assertNotNull($object, "Parsing of json result must not be null");
         $this->assertEquals(1, $object['statut']);
     }
 
@@ -222,7 +222,7 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
         $body = json_encode($bodyobj);
         print __METHOD__." Request POST url=".$url."\n";
         $result=getURLContent($url, 'POST', $body, 1, $addheaders, array('http', 'https'), 2);
-        print __METHOD__." Result code for creating user ".var_export($result, true)."\n";
+        print __METHOD__." rclsesult code for creating user ".var_export($result, true)."\n";
         print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
         $this->assertEquals($result['curl_error_no'], '');
         $resid=json_decode($result['content'], true);

From 11b15557ebcf0625e9645b61ad97176949fd3840 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Dec 2020 02:09:11 +0100
Subject: [PATCH 618/888] Clean code

---
 htdocs/user/class/api_users.class.php | 10 ++++++----
 test/phpunit/RestAPIUserTest.php      |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index e68ecb8bc1d..eb377b7685e 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -314,11 +314,13 @@ class Users extends DolibarrApi
 	/**
 	 * Update account
 	 *
-	 * @param int   $id             Id of account to update
-	 * @param array $request_data   Datas
-	 * @return array
+	 * @param 	int   		$id             	Id of account to update
+	 * @param	array 		$request_data   	Datas
+	 * @return 	array|mixed						Record after update
 	 *
-	 * @throws 	RestException
+	 * @throws RestException 401 Not allowed
+	 * @throws RestException 404 Not found
+	 * @throws RestException 500 System error
 	 */
 	public function put($id, $request_data = null)
 	{
diff --git a/test/phpunit/RestAPIUserTest.php b/test/phpunit/RestAPIUserTest.php
index 979daa521b9..d74ecb5534f 100644
--- a/test/phpunit/RestAPIUserTest.php
+++ b/test/phpunit/RestAPIUserTest.php
@@ -169,7 +169,7 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
         $this->assertEquals($result['curl_error_no'], '');
         $object=json_decode($result['content'], true);
         $this->assertNotNull($object, "Parsing of json result must not be null");
-        $this->assertEquals(404, $object['error']['code']);
+        $this->assertEquals(404, $object['error']['code'], 'Error code is not 404');
 
         $url = $this->api_url.'/users/1?api_key='.$this->api_key;
 

From 65dc7667651a41c5b50d0481e95022b19c4a7d2c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Dec 2020 02:12:13 +0100
Subject: [PATCH 619/888] Code comment

---
 htdocs/api/class/api_login.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php
index 25765e7f7e5..17d8916b9aa 100644
--- a/htdocs/api/class/api_login.class.php
+++ b/htdocs/api/class/api_login.class.php
@@ -48,8 +48,8 @@ class Login
 	 * @param   int     $reset          Reset token (0=get current token, 1=ask a new token and canceled old token. This means access using current existing API token of user will fails: new token will be required for new access)
 	 * @return  array                   Response status and user token
 	 *
-	 * @throws RestException 403
-	 * @throws RestException 500
+	 * @throws RestException 403 Access denied
+	 * @throws RestException 500 System error
 	 *
 	 * @url GET /
 	 * @url POST /

From e9129154e448392e115b3540d5d4485802016aa4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Dec 2020 02:16:22 +0100
Subject: [PATCH 620/888] Log

---
 test/phpunit/RestAPIUserTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/phpunit/RestAPIUserTest.php b/test/phpunit/RestAPIUserTest.php
index d74ecb5534f..d2dd8660922 100644
--- a/test/phpunit/RestAPIUserTest.php
+++ b/test/phpunit/RestAPIUserTest.php
@@ -164,7 +164,7 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
 
         print __METHOD__." Request GET url=".$url."\n";
         $result=getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
-        print __METHOD__." result for get on unexisting user: ".var_export($result, true)."\n";
+        //print __METHOD__." result for get on unexisting user: ".var_export($result, true)."\n";
         print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
         $this->assertEquals($result['curl_error_no'], '');
         $object=json_decode($result['content'], true);
@@ -175,7 +175,7 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
 
         print __METHOD__." Request GET url=".$url."\n";
         $result=getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
-        //print __METHOD__." Result for existing user user: ".var_export($result, true)."\n";
+        print __METHOD__." result for get on an existing user: ".var_export($result, true)."\n";
         print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
         $this->assertEquals($result['curl_error_no'], '');
         $object=json_decode($result['content'], true);

From 11a122176d2587faeab5eeb86819a789ba11e3b3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Dec 2020 02:33:11 +0100
Subject: [PATCH 621/888] Clean code

---
 htdocs/api/class/api.class.php        |  2 +-
 htdocs/user/class/api_users.class.php | 20 ++++++++++----------
 test/phpunit/RestAPIUserTest.php      |  1 -
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index e101fb89602..89d170feb60 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -173,7 +173,7 @@ class DolibarrApi
 		unset($object->name_bis);
 		unset($object->newref);
 
-		if ($object->table_element != 'ticket') {
+		if (!isset($object->table_element) || $object->table_element != 'ticket') {
 			unset($object->comments);
 		}
 
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index eb377b7685e..d50fec76353 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -142,11 +142,11 @@ class Users extends DolibarrApi
 	 * Get properties of an user object
 	 *
 	 * @param 	int 	$id 					ID of user
-	 * @param	int		$includepermissions	Set this to 1 to have the array of permissions loaded (not done by default for performance purpose)
-	 * @return 	array|mixed data without useless information
+	 * @param	int		$includepermissions		Set this to 1 to have the array of permissions loaded (not done by default for performance purpose)
+	 * @return 	array|mixed 					data without useless information
 	 *
-	 * @throws RestException 401     Insufficient rights
-	 * @throws RestException 404     User or group not found
+	 * @throws RestException 401 Insufficient rights
+	 * @throws RestException 404 User or group not found
 	 */
 	public function get($id, $includepermissions = 0)
 	{
@@ -177,13 +177,13 @@ class Users extends DolibarrApi
 	 * Get properties of an user object by login
 	 *
 	 * @param 	string 	$login 					Login of user
-	 * @param	int		$includepermissions	Set this to 1 to have the array of permissions loaded (not done by default for performance purpose)
-	 * @return 	array|mixed data without useless information
+	 * @param	int		$includepermissions		Set this to 1 to have the array of permissions loaded (not done by default for performance purpose)
+	 * @return 	array|mixed 					Data without useless information
 	 *
 	 * @url GET login/{login}
 	 *
-	 * @throws RestException 401     Insufficient rights
-	 * @throws RestException 404     User or group not found
+	 * @throws RestException 401 Insufficient rights
+	 * @throws RestException 404 User or group not found
 	 */
 	public function getByLogin($login, $includepermissions = 0)
 	{
@@ -211,8 +211,8 @@ class Users extends DolibarrApi
 	 * Get properties of an user object by Email
 	 *
 	 * @param 	string 	$email 					Email of user
-	 * @param	int		$includepermissions	Set this to 1 to have the array of permissions loaded (not done by default for performance purpose)
-	 * @return 	array|mixed data without useless information
+	 * @param	int		$includepermissions		Set this to 1 to have the array of permissions loaded (not done by default for performance purpose)
+	 * @return 	array|mixed 					Data without useless information
 	 *
 	 * @url GET email/{email}
 	 *
diff --git a/test/phpunit/RestAPIUserTest.php b/test/phpunit/RestAPIUserTest.php
index d2dd8660922..6222f7fcaf7 100644
--- a/test/phpunit/RestAPIUserTest.php
+++ b/test/phpunit/RestAPIUserTest.php
@@ -190,7 +190,6 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
      */
     public function testRestCreateUser()
     {
-
         // attemp to create without mandatory fields :
         $url = $this->api_url.'/users?api_key='.$this->api_key;
         $addheaders=array('Content-Type: application/json');

From ea0ae758a35cabf4715bb1f1c781cc3a8334678d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Dec 2020 02:48:32 +0100
Subject: [PATCH 622/888] Fix warnings

---
 htdocs/webservices/server_actioncomm.php       |  8 ++++----
 htdocs/webservices/server_contact.php          |  8 ++++----
 htdocs/webservices/server_order.php            | 10 +++++-----
 htdocs/webservices/server_productorservice.php | 10 +++++-----
 htdocs/webservices/server_project.php          |  6 +++---
 htdocs/webservices/server_thirdparty.php       | 10 +++++-----
 htdocs/webservices/server_user.php             |  4 ++--
 7 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/htdocs/webservices/server_actioncomm.php b/htdocs/webservices/server_actioncomm.php
index 7864c93243f..140351e7d21 100644
--- a/htdocs/webservices/server_actioncomm.php
+++ b/htdocs/webservices/server_actioncomm.php
@@ -122,7 +122,7 @@ $extrafield_array = null;
 if (is_array($extrafields) && count($extrafields) > 0) {
 	$extrafield_array = array();
 }
-if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 {
 	foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 	{
@@ -315,7 +315,7 @@ function getActionComm($authentication, $id)
 				//Get extrafield values
 				$actioncomm->fetch_optionals();
 
-				if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+				if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 				{
 					foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 					{
@@ -454,7 +454,7 @@ function createActionComm($authentication, $actioncomm)
 		// fetch optionals attributes and labels
 		$extrafields = new ExtraFields($db);
 		$extrafields->fetch_name_optionals_label($elementtype, true);
-		if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+		if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 		{
 			foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 			{
@@ -551,7 +551,7 @@ function updateActionComm($authentication, $actioncomm)
 			// fetch optionals attributes and labels
 			$extrafields = new ExtraFields($db);
 			$extrafields->fetch_name_optionals_label($elementtype, true);
-			if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+			if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 			{
 				foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 				{
diff --git a/htdocs/webservices/server_contact.php b/htdocs/webservices/server_contact.php
index 9abc7b6088f..6fc521a43c7 100644
--- a/htdocs/webservices/server_contact.php
+++ b/htdocs/webservices/server_contact.php
@@ -127,7 +127,7 @@ $extrafield_array = null;
 if (is_array($extrafields) && count($extrafields) > 0) {
 	$extrafield_array = array();
 }
-if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 {
 	foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 	{
@@ -319,7 +319,7 @@ function getContact($authentication, $id, $ref_ext)
 				//Get extrafield values
 				$contact->fetch_optionals();
 
-				if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+				if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 				{
 					foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 					{
@@ -424,7 +424,7 @@ function createContact($authentication, $contact)
 		// fetch optionals attributes and labels
 		$extrafields = new ExtraFields($db);
 		$extrafields->fetch_name_optionals_label($elementtype, true);
-		if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+		if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 		{
 			foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 			{
@@ -671,7 +671,7 @@ function updateContact($authentication, $contact)
 			// fetch optionals attributes and labels
 			$extrafields = new ExtraFields($db);
 			$extrafields->fetch_name_optionals_label($elementtype, true);
-			if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+			if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 			{
 				foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 				{
diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php
index 62e8dc99d72..30c105d7192 100644
--- a/htdocs/webservices/server_order.php
+++ b/htdocs/webservices/server_order.php
@@ -120,7 +120,7 @@ $extrafield_line_array = null;
 if (is_array($extrafields) && count($extrafields) > 0) {
 	$extrafield_line_array = array();
 }
-if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 {
 	foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 	{
@@ -224,7 +224,7 @@ $extrafield_array = null;
 if (is_array($extrafields) && count($extrafields) > 0) {
 	$extrafield_array = array();
 }
-if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 {
 	foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 	{
@@ -705,7 +705,7 @@ function createOrder($authentication, $order)
 		// fetch optionals attributes and labels
 		$extrafields = new ExtraFields($db);
 		$extrafields->fetch_name_optionals_label($elementtype, true);
-		if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+		if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 		{
 			foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 			{
@@ -743,7 +743,7 @@ function createOrder($authentication, $order)
 			// fetch optionals attributes and labels
 			$extrafields = new ExtraFields($db);
 			$extrafields->fetch_name_optionals_label($elementtype, true);
-			if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+			if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 			{
 				foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 				{
@@ -948,7 +948,7 @@ function updateOrder($authentication, $order)
 			// fetch optionals attributes and labels
 			$extrafields = new ExtraFields($db);
 			$extrafields->fetch_name_optionals_label($elementtype, true);
-			if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+			if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 			{
 				foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 				{
diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index f723dcfd054..f285d245030 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -142,7 +142,7 @@ $extrafield_array = null;
 if (is_array($extrafields) && count($extrafields) > 0) {
 	$extrafield_array = array();
 }
-if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 {
 	foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 	{
@@ -436,7 +436,7 @@ function getProductOrService($authentication, $id = '', $ref = '', $ref_ext = ''
 				//Get extrafield values
 				$product->fetch_optionals();
 
-				if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+				if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 				{
 					foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 					{
@@ -563,7 +563,7 @@ function createProductOrService($authentication, $product)
 
 		$extrafields = new ExtraFields($db);
 		$extrafields->fetch_name_optionals_label($elementtype, true);
-		if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+		if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 		{
 			foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 			{
@@ -719,7 +719,7 @@ function updateProductOrService($authentication, $product)
 
 		$extrafields = new ExtraFields($db);
 		$extrafields->fetch_name_optionals_label($elementtype, true);
-		if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+		if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 		{
 			foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 			{
@@ -1090,7 +1090,7 @@ function getProductsForCategory($authentication, $id, $lang = '')
 							//Get extrafield values
 							$tmpproduct->fetch_optionals();
 
-							if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+							if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 							{
 								foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 								{
diff --git a/htdocs/webservices/server_project.php b/htdocs/webservices/server_project.php
index 9d4c93c9ce9..0817332c09f 100644
--- a/htdocs/webservices/server_project.php
+++ b/htdocs/webservices/server_project.php
@@ -169,7 +169,7 @@ $extrafield_array = null;
 if (is_array($extrafields) && count($extrafields) > 0) {
 	$extrafield_array = array();
 }
-if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 {
 	foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 	{
@@ -277,7 +277,7 @@ function createProject($authentication, $project)
 			// fetch optionals attributes and labels
 			$extrafields = new ExtraFields($db);
 			$extrafields->fetch_name_optionals_label($elementtype, true);
-			if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+			if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 			{
 				foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 				{
@@ -386,7 +386,7 @@ function getProject($authentication, $id = '', $ref = '')
 				$extrafields->fetch_name_optionals_label($elementtype, true);
 
 				//Get extrafield values
-				if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+				if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 				{
 					$project->fetch_optionals();
 					foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index 3a1e911f510..5bde94cc0d5 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -130,7 +130,7 @@ $extrafield_array = null;
 if (is_array($extrafields) && count($extrafields) > 0) {
 	$extrafield_array = array();
 }
-if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 {
 	foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 	{
@@ -365,7 +365,7 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 				//Get extrafield values
 				$thirdparty->fetch_optionals();
 
-				if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+				if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 				{
 					foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 					{
@@ -481,7 +481,7 @@ function createThirdParty($authentication, $thirdparty)
 		// fetch optionals attributes and labels
 		$extrafields = new ExtraFields($db);
 		$extrafields->fetch_name_optionals_label($elementtype, true);
-		if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+		if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 		{
 			foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 			{
@@ -615,7 +615,7 @@ function updateThirdParty($authentication, $thirdparty)
 			// fetch optionals attributes and labels
 			$extrafields = new ExtraFields($db);
 			$extrafields->fetch_name_optionals_label($elementtype, true);
-			if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+			if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 			{
 				foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 				{
@@ -723,7 +723,7 @@ function getListOfThirdParties($authentication, $filterthirdparty)
 				$extrafieldsOptions = array();
 				$obj = $db->fetch_object($resql);
 
-				if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+				if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 				{
 					foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 					{
diff --git a/htdocs/webservices/server_user.php b/htdocs/webservices/server_user.php
index 6f7ed5c10aa..25cb2324412 100644
--- a/htdocs/webservices/server_user.php
+++ b/htdocs/webservices/server_user.php
@@ -193,7 +193,7 @@ $extrafield_array = null;
 if (is_array($extrafields) && count($extrafields) > 0) {
 	$extrafield_array = array();
 }
-if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 {
 	foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 	{
@@ -599,7 +599,7 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 						// fetch optionals attributes and labels
 						$extrafields = new ExtraFields($db);
 						$extrafields->fetch_name_optionals_label($elementtype, true);
-						if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+						if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 						{
 							foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 							{

From 3586da75a2c38d5ed74a551b6d02994d3019d786 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Dec 2020 02:52:49 +0100
Subject: [PATCH 623/888] Fix warning

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index dd80c660e71..884d8eac496 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4461,7 +4461,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
 
 	$savlimit = $limit;
 	$savtotalnboflines = $totalnboflines;
-	$totalnboflines = abs($totalnboflines);
+	$totalnboflines = abs((int) $totalnboflines);
 
 	if ($picto == 'setup') $picto = 'title_setup.png';
 	if (($conf->browser->name == 'ie') && $picto == 'generic') $picto = 'title.gif';

From 6c2a17b29ad629bc7922c1ee1891d8cda44026aa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Dec 2020 02:59:00 +0100
Subject: [PATCH 624/888] Fix warning

---
 htdocs/contrat/list.php            | 6 +++---
 htdocs/core/class/notify.class.php | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index d273dd7cdf7..72a8ec2974d 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -614,14 +614,14 @@ while ($i < min($num, $limit))
 	$socstatic->logo = $obj->logo;
 	$socstatic->country_id = $obj->country_id;
 	$socstatic->country_code = '';
-	$socstatic->country_label = '';*/
+	$socstatic->country = '';*/
 	if ($obj->country_id > 0) {
 		if (!isset($cacheCountryIDCode[$obj->country_id]['code'])) {
 			$tmparray = getCountry($obj->country_id, 'all');
 			$cacheCountryIDCode[$obj->country_id] = array('code'=> empty($tmparray['code']) ? '' : $tmparray['code'], 'label' => empty($tmparray['label']) ? '' : $tmparray['label']);
 		}
 		$socstatic->country_code = $cacheCountryIDCode[$obj->country_id]['code'];
-		$socstatic->country_label = $cacheCountryIDCode[$obj->country_id]['label'];
+		$socstatic->country = $cacheCountryIDCode[$obj->country_id]['label'];
 	}
 
 
@@ -695,7 +695,7 @@ while ($i < min($num, $limit))
 	if (!empty($arrayfields['country.code_iso']['checked']))
 	{
 		print '<td class="center">';
-		print $socstatic->country_label;
+		print $socstatic->country;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 6f60f6cdca6..f9f1c3b99ef 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -112,6 +112,7 @@ class Notify
 
 		$listofnotiftodo = $this->getNotificationsArray($action, $socid, $object, 0);
 
+		$texte = '';
 		$nb = -1;
 		if (is_array($listofnotiftodo)) {
 			$nb = count($listofnotiftodo);
@@ -170,6 +171,8 @@ class Notify
 		if (is_object($object)) {
 			$valueforthreshold = $object->total_ht;
 		}
+
+		$sqlnotifcode = '';
 		if ($notifcode) {
 			if (is_numeric($notifcode)) {
 				$sqlnotifcode = " AND n.fk_action = ".$notifcode; // Old usage

From 5ef3ffbdc63e7fdeaab4e203f110c535c5cd99e0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Dec 2020 03:03:38 +0100
Subject: [PATCH 625/888] Fix warning

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

diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 93eaeb6d4f2..07b67e30062 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -168,7 +168,7 @@ class Utils
 			$this->output = $langs->trans("PurgeNDirectoriesDeleted", $countdeleted);
 			if ($count > $countdeleted) $this->output .= '<br>'.$langs->trans("PurgeNDirectoriesFailed", ($count - $countdeleted));
 		} else {
-			$this->output = $langs->trans("PurgeNothingToDelete").($choice == 'tempfilesold' ? ' (older than 24h)' : '');
+			$this->output = $langs->trans("PurgeNothingToDelete").(in_array('tempfilesold', $choicesarray) ? ' (older than 24h for temp files)' : '');
 		}
 
 		// Recreate temp dir that are not automatically recreated by core code for performance purpose, we need them

From a0440fbe8841a8a6b2582f2e10cab928bb85ba8a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Dec 2020 03:06:52 +0100
Subject: [PATCH 626/888] Removed warnings

---
 htdocs/core/boxes/box_funnel_of_prospection.php | 4 ++--
 htdocs/core/boxes/modules_boxes.php             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/boxes/box_funnel_of_prospection.php b/htdocs/core/boxes/box_funnel_of_prospection.php
index 6ffce6d781b..5b6130d8eb2 100644
--- a/htdocs/core/boxes/box_funnel_of_prospection.php
+++ b/htdocs/core/boxes/box_funnel_of_prospection.php
@@ -61,9 +61,9 @@ class box_funnel_of_prospection extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->enabled = ($conf->global->MAIN_FEATURES_LEVEL >= 1); // Not enabled by default, still need some work
+		$this->enabled = ($conf->global->MAIN_FEATURES_LEVEL >= 1 ? 1 : 0); // Not enabled by default, still need some work
 
-		$this->hidden = !($user->rights->projet->lire);
+		$this->hidden = empty($user->rights->projet->lire);
 	}
 
 	/**
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 1e32a28f25c..9faf45932e2 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -56,7 +56,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 	/**
 	 * @var boolean Condition to have widget visible (in most cases, permissions)
 	 */
-	public $hidden = 0;
+	public $hidden = false;
 
 	/**
 	 * @var int Box definition database ID

From 360a85cbbc76b26634578081254f68ea02150e0b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Dec 2020 12:32:34 +0100
Subject: [PATCH 627/888] FIX add autofix of count of email target when data is
 corrupted

---
 htdocs/comm/mailing/cibles.php              | 38 ++++++++++++++++++---
 htdocs/comm/mailing/class/mailing.class.php | 34 ++++++++++++++++++
 2 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index d8d9873b88b..8bfa82260b9 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -481,11 +481,27 @@ if ($object->fetch($id) >= 0)
 	$sql .= " mc.source_url, mc.source_id, mc.source_type, mc.error_text";
 	$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
 	$sql .= " WHERE mc.fk_mailing=".$object->id;
-	if ($search_lastname)  $sql .= natural_search("mc.lastname", $search_lastname);
-	if ($search_firstname) $sql .= natural_search("mc.firstname", $search_firstname);
-	if ($search_email)     $sql .= natural_search("mc.email", $search_email);
-	if ($search_other)     $sql .= natural_search("mc.other", $search_other);
-	if ($search_dest_status != '' && $search_dest_status >= -1) $sql .= " AND mc.statut=".$db->escape($search_dest_status)." ";
+	$asearchcriteriahasbeenset = 0;
+	if ($search_lastname)  {
+		$sql .= natural_search("mc.lastname", $search_lastname);
+		$asearchcriteriahasbeenset++;
+	}
+	if ($search_firstname) {
+		$sql .= natural_search("mc.firstname", $search_firstname);
+		$asearchcriteriahasbeenset++;
+	}
+	if ($search_email)     {
+		$sql .= natural_search("mc.email", $search_email);
+		$asearchcriteriahasbeenset++;
+	}
+	if ($search_other)     {
+		$sql .= natural_search("mc.other", $search_other);
+		$asearchcriteriahasbeenset++;
+	}
+	if ($search_dest_status != '' && $search_dest_status >= -1) {
+		$sql .= " AND mc.statut=".$db->escape($search_dest_status)." ";
+		$asearchcriteriahasbeenset++;
+	}
 	$sql .= $db->order($sortfield, $sortorder);
 
 	// Count total nb of records
@@ -499,6 +515,18 @@ if ($object->fetch($id) >= 0)
 	    	$page = 0;
 	    	$offset = 0;
 	    }
+
+	    // Fix/update nbemail on emailing record if it differs (may happen if user edit lines from database directly)
+	    if (empty($asearchcriteriahasbeenset)) {
+	    	if ($nbtotalofrecords != $object->email) {
+	    		dol_syslog("We found a difference in nb of record in target table and the property ->nbemail, we fix ->nbemail");
+	    		//print "nbemail=".$object->nbemail." nbtotalofrecords=".$nbtotalofrecords;
+	    		$resultrefresh = $object->refreshNbOfTargets();
+	    		if ($resultrefresh < 0) {
+	    			dol_print_error($db, $object->error, $object->errors);
+	    		}
+	    	}
+	    }
 	}
 
 	//$nbtotalofrecords=$object->nbemail;     // nbemail is a denormalized field storing nb of targets
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 56a115a2fea..75efe1f07b2 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -461,6 +461,8 @@ class Mailing extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
+			$this->refreshNbOfTargets();
+
 			return 1;
 		}
 		else
@@ -532,6 +534,38 @@ class Mailing extends CommonObject
 	    return 0;
 	}
 
+	/**
+	 *  Refresh denormalized value ->nbemail into emailing record
+	 *  Note: There is also the method update_nb into modules_mailings that is used for this.
+	 *
+	 *  @return int        		<0 if KO, >0 if OK
+	 */
+	public function refreshNbOfTargets()
+	{
+		$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."mailing_cibles";
+		$sql .= " WHERE fk_mailing = ".$this->id;
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$obj = $this->db->fetch_object($resql);
+			if ($obj) {
+				$nbforupdate = $obj->nb;
+
+				$sql = 'UPDATE '.MAIN_DB_PREFIX.'mailing SET nbemail = '.((int) $nbforupdate);
+				$sql .= ' WHERE rowid = '.$this->id;
+
+				$resqlupdate = $this->db->query($sql);
+				if (! $resqlupdate) {
+					$this->error = $this->db->lasterror();
+					return -1;
+				}
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+		return 1;
+	}
 
 	/**
 	 *  Return a link to the object card (with optionally the picto)

From 739695c442e40960dc5435c7033853419d7de3f0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Dec 2020 12:49:17 +0100
Subject: [PATCH 628/888] Fix delay to wait between email for emailing refused
 float.

---
 htdocs/admin/mailing.php           | 2 +-
 htdocs/comm/mailing/card.php       | 2 +-
 scripts/emailings/mailing-send.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index 921a4a6338c..6e3341dcd8f 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -125,7 +125,7 @@ print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("MailingDelay").'</td><td>';
-print '<input size="32" type="text" name="MAILING_DELAY" value="'.$conf->global->MAILING_DELAY.'">';
+print '<input class="width75" type="text" name="MAILING_DELAY" value="'.$conf->global->MAILING_DELAY.'">';
 print '</td></tr>';
 
 
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index e3cb5a9ad97..80692c1384d 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -346,7 +346,7 @@ if (empty($reshook))
 						    if (!empty($conf->global->MAILING_DELAY))
 						    {
 						    	dol_syslog("Wait a delay of MAILING_DELAY=".$conf->global->MAILING_DELAY);
-                            	sleep($conf->global->MAILING_DELAY);
+                            	usleep((float) $conf->global->MAILING_DELAY * 1000000);
                         	}
 
                         	//test if CHECK READ change statut prospect contact
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index bc7efec7dba..0118697e5ec 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -318,7 +318,7 @@ if ($resql) {
 								}
 
 								if (!empty($conf->global->MAILING_DELAY)) {
-									sleep($conf->global->MAILING_DELAY);
+									usleep((float) $conf->global->MAILING_DELAY * 1000000);
 								}
 							}
 						} else {

From 3abceadb86445c021bac43139d5295f8f74adaf6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Dec 2020 13:02:45 +0100
Subject: [PATCH 629/888] Add info

---
 scripts/emailings/mailing-send.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index 0118697e5ec..5f93600f1be 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -60,6 +60,10 @@ $error = 0;
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 
+if (!empty($conf->global->MAILING_DELAY)) {
+	print 'A delay of '.((float) $conf->global->MAILING_DELAY * 1000000).' millisecond has been set between each email'."\n";
+}
+
 if ($conf->global->MAILING_LIMIT_SENDBYCLI == '-1') {}
 
 $user = new User($db);

From 79fe5ee34ce6085cc70ffd94a199c25e3522465a Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 24 Dec 2020 14:35:40 +0100
Subject: [PATCH 630/888] actioncomm ok

---
 htdocs/comm/action/list.php    | 3 +++
 htdocs/core/lib/agenda.lib.php | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 2fe47ab39f1..ee0a041aed8 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -233,6 +233,7 @@ if (empty($reshook))
 	$uploaddir = true;
 	// Only users that can delete any event can remove records.
 	$permissiontodelete = $user->rights->agenda->allactions->delete;
+	$permissiontoadd = $user->rights->agenda->myactions->create;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
@@ -297,6 +298,7 @@ if ($user->rights->agenda->allactions->delete)
 	$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 }
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if ($user->rights->agenda->myactions->create) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $sql = "SELECT";
@@ -532,6 +534,7 @@ if ($resql)
 
 	print $s;
 
+	$objecttmp = new ActionComm($db);
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 	$moreforfilter = '';
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index fd3ba8c6fb2..8e25deb21cb 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -64,7 +64,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 	print '<input type="hidden" name="year" value="'.$year.'">';
 	print '<input type="hidden" name="month" value="'.$month.'">';
 	print '<input type="hidden" name="day" value="'.$day.'">';
-	if ($massaction != 'predelete') {		// When $massaction == 'predelete', action may be already output to 'delete' by the mass action system.
+	if ($massaction != 'predelete' && $massaction != 'preaffecttag') {		// When $massaction == 'predelete', action may be already output to 'delete' by the mass action system.
 		print '<input type="hidden" name="action" value="'.$action.'">';
 	}
 	print '<input type="hidden" name="search_showbirthday" value="'.$showbirthday.'">';

From f03574d06119f13debaff0a42bc7108ef7c6d417 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 24 Dec 2020 14:56:26 +0100
Subject: [PATCH 631/888] bank ok

---
 htdocs/adherents/list.php                  |  2 +-
 htdocs/comm/action/list.php                |  2 +-
 htdocs/compta/bank/class/account.class.php | 32 +---------------------
 htdocs/compta/bank/list.php                | 31 +++++++++++++--------
 htdocs/contact/list.php                    |  2 +-
 htdocs/product/list.php                    |  2 +-
 htdocs/product/stock/list.php              |  2 +-
 7 files changed, 26 insertions(+), 47 deletions(-)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index ed4bf7bdb8b..ac9260d091e 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -401,7 +401,7 @@ $arrayofmassactions = array(
 if ($user->rights->adherent->creer) $arrayofmassactions['close'] = $langs->trans("Resiliate");
 if ($user->rights->adherent->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if ($user->rights->societe->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
-if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if (in_array($massaction, array('presend', 'predelete','preaffecttag'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton = '';
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index ee0a041aed8..4d863a655b4 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -297,7 +297,7 @@ if ($user->rights->agenda->allactions->delete)
 {
 	$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) $arrayofmassactions = array();
 if ($user->rights->agenda->myactions->create) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index b2d499c5f34..db6c950af4a 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1011,38 +1011,8 @@ class Account extends CommonObject
 	 */
 	public function setCategories($categories)
 	{
-		// Handle single category
-		if (!is_array($categories)) {
-			$categories = array($categories);
-		}
-
-		// Get current categories
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		$c = new Categorie($this->db);
-		$existing = $c->containing($this->id, Categorie::TYPE_ACCOUNT, 'id');
-
-		// Diff
-		if (is_array($existing)) {
-			$to_del = array_diff($existing, $categories);
-			$to_add = array_diff($categories, $existing);
-		} else {
-			$to_del = array(); // Nothing to delete
-			$to_add = $categories;
-		}
-
-		// Process
-		foreach ($to_del as $del) {
-			if ($c->fetch($del) > 0) {
-				$c->del_type($this, Categorie::TYPE_ACCOUNT);
-			}
-		}
-		foreach ($to_add as $add) {
-			if ($c->fetch($add) > 0) {
-				$c->add_type($this, Categorie::TYPE_ACCOUNT);
-			}
-		}
-
-		return;
+		return parent::setCategoriesCommon($categories, Categorie::TYPE_ACCOUNT);
 	}
 
 	/**
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index f3efea15235..1184da6d7ac 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -123,18 +123,26 @@ $parameters = array('socid'=>$socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+if (empty($reshook)) {
+	include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php';
 
-// Purge search criteria
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-{
-	$search_ref = '';
-	$search_label = '';
-	$search_number = '';
-	$search_status = '';
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$search_ref = '';
+		$search_label = '';
+		$search_number = '';
+		$search_status = '';
+	}
+
+	// Mass actions
+	$objectclass = 'Account';
+	$objectlabel = 'FinancialAccount';
+	$permissiontoadd = $user->rights->banque->modifier;
+	$uploaddir = $conf->banque->dir_output;
+	include DOL_DOCUMENT_ROOT . '/core/actions_massactions.inc.php';
 }
 
-
 /*
  * View
  */
@@ -235,7 +243,8 @@ $arrayofmassactions = array(
 //    'builddoc'=>$langs->trans("PDFMerge"),
 );
 if ($user->rights->banque->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if ($user->rights->banque->modifier) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
+if (in_array($massaction, array('presend', 'predelete','preaffecttag'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton = dolGetButtonTitle($langs->trans('NewFinancialAccount'), '', 'fa fa-plus-circle', 'card.php?action=create', '', $user->rights->banque->configurer);
@@ -251,7 +260,7 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="search_status" value="'.$search_status.'">';
 
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'bank_account', 0, $newcardbutton, '', $limit, 1);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'bank_account', 0, $newcardbutton, '', $limit, 1);
 
 $topicmail = "Information";
 //$modelmail="subscription";
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 7ca0e431c5a..8d6b11e19f0 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -527,7 +527,7 @@ $arrayofmassactions = array(
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
 if ($user->rights->societe->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if ($user->rights->societe->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
-if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if (in_array($massaction, array('presend', 'predelete','preaffecttag'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton = dolGetButtonTitle($langs->trans('NewContactAddress'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/contact/card.php?action=create', '', $user->rights->societe->contact->creer);
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 3830f0bdafb..b0507a83c19 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -536,7 +536,7 @@ if ($resql)
 	);
 	if ($user->rights->{$rightskey}->supprimer) $arrayofmassactions['predelete'] = "<span class='fa fa-trash paddingrightonly'></span>".$langs->trans("Delete");
 	if ($user->rights->{$rightskey}->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
-	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+	if (in_array($massaction, array('presend', 'predelete','preaffecttag'))) $arrayofmassactions = array();
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 	$newcardbutton = '';
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 0ff7cf029c7..1470bdc2aa0 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -346,7 +346,7 @@ $arrayofmassactions = array(
 	//'builddoc'=>$langs->trans("PDFMerge"),
 );
 //if ($user->rights->stock->supprimer) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) $arrayofmassactions = array();
 if ($user->rights->stock->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 

From c7b4f20f6ed6227cfc88b0b5b93e755d5a6e39d3 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 24 Dec 2020 15:00:26 +0100
Subject: [PATCH 632/888] merge

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

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index ffdba17d24d..f4ddb7e571f 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -597,7 +597,7 @@ $arrayofmassactions = array(
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
 if ($user->rights->societe->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if ($user->rights->societe->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $typefilter = '';

From d3bdb72cc863a035cb80b2e21ff38c0a34113ded Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 24 Dec 2020 15:03:12 +0100
Subject: [PATCH 633/888] finish

---
 htdocs/comm/action/list.php | 2 +-
 htdocs/projet/list.php      | 2 +-
 htdocs/user/list.php        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 4d863a655b4..7fc58b73c9f 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -297,8 +297,8 @@ if ($user->rights->agenda->allactions->delete)
 {
 	$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) $arrayofmassactions = array();
 if ($user->rights->agenda->myactions->create) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $sql = "SELECT";
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index f9190a3404c..b246d88de93 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -457,7 +457,7 @@ $arrayofmassactions = array(
 if ($user->rights->projet->creer) $arrayofmassactions['close'] = $langs->trans("Close");
 if ($user->rights->projet->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if ($user->rights->projet->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
-if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if (in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) $arrayofmassactions = array();
 
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 6c43f7e7c6e..acf0f93a1b3 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -425,7 +425,7 @@ if ($permissiontoadd) $arrayofmassactions['reactivate'] = $langs->trans("Reactiv
 if ($permissiontoadd) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
 //if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";

From 7f1d0b9dc29710019351c048dfdf42babf59a2eb Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 24 Dec 2020 14:06:55 +0000
Subject: [PATCH 634/888] Fixing style errors.

---
 htdocs/core/actions_massactions.inc.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index abc244ba255..81cc4d81bd4 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1292,14 +1292,13 @@ if (!$error && $massaction == 'generate_doc' && $permissiontoread)
 }
 
 if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd) {
-
 	$db->begin();
 
-	$affecttag_type=GETPOST('affecttag_type','alpha');
+	$affecttag_type=GETPOST('affecttag_type', 'alpha');
 	if (!empty($affecttag_type)) {
-		$affecttag_type_array=explode(',',$affecttag_type);
+		$affecttag_type_array=explode(',', $affecttag_type);
 	} else {
-		setEventMessage('CategTypeNotFound','errors');
+		setEventMessage('CategTypeNotFound', 'errors');
 	}
 	if (!empty($affecttag_type_array)) {
 		//check if tag type submited exists into Tag Map categorie class
@@ -1307,7 +1306,7 @@ if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd
 		$categ = new Categorie($db);
 		$to_affecttag_type_array=array();
 		$categ_type_array=$categ->getMapList();
-		foreach($categ_type_array as $categdef) {
+		foreach ($categ_type_array as $categdef) {
 			if (in_array($categdef['code'],  $affecttag_type_array)) {
 				$to_affecttag_type_array[] = $categdef['code'];
 			}
@@ -1323,14 +1322,12 @@ if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd
 					$result = $object->fetch($toselectid);
 					//var_dump($contcats);exit;
 					if ($result > 0) {
-
 						$result = $object->setCategoriesCommon($contcats, $categ_type, false);
 						if ($result > 0) {
 							$nbok++;
 						} else {
 							setEventMessages($object->error, $object->errors, 'errors');
 						}
-
 					} else {
 						setEventMessages($object->error, $object->errors, 'errors');
 						$error++;

From 11146a0b66a1d4986b18c0765aa8314a75ffa7c8 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Fri, 25 Dec 2020 11:01:19 +0100
Subject: [PATCH 635/888] Add contact tab in default generated php files

---
 htdocs/langs/en_US/modulebuilder.lang         |   3 +-
 htdocs/modulebuilder/index.php                |  11 +
 .../template/myobject_contact.php             | 203 ++++++++++++++++++
 3 files changed, 216 insertions(+), 1 deletion(-)
 create mode 100644 htdocs/modulebuilder/template/myobject_contact.php

diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 6f8fdcad996..f2090de11c0 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -138,4 +139,4 @@ ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
-TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
\ No newline at end of file
+TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index fba9b0d4855..2b7453c904a 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -902,6 +902,7 @@ if ($dirins && $action == 'initobject' && $module && $objectname)
 		$filetogenerate = array(
 			'myobject_card.php'=>strtolower($objectname).'_card.php',
 			'myobject_note.php'=>strtolower($objectname).'_note.php',
+			'myobject_contact.php'=>strtolower($objectname).'_contact.php',
 			'myobject_document.php'=>strtolower($objectname).'_document.php',
 			'myobject_agenda.php'=>strtolower($objectname).'_agenda.php',
 			'myobject_list.php'=>strtolower($objectname).'_list.php',
@@ -2336,6 +2337,7 @@ if ($module == 'initmodule')
 						$pathtodocument = strtolower($module).'/'.strtolower($tabobj).'_document.php';
 						$pathtolist     = strtolower($module).'/'.strtolower($tabobj).'_list.php';
 						$pathtonote     = strtolower($module).'/'.strtolower($tabobj).'_note.php';
+						$pathtocontact  = strtolower($module).'/'.strtolower($tabobj).'_contact.php';
 						$pathtophpunit  = strtolower($module).'/test/phpunit/'.strtolower($tabobj).'Test.php';
 						$pathtosql      = strtolower($module).'/sql/llx_'.strtolower($module).'_'.strtolower($tabobj).'.sql';
 						$pathtosqlextra = strtolower($module).'/sql/llx_'.strtolower($module).'_'.strtolower($tabobj).'_extrafields.sql';
@@ -2354,6 +2356,7 @@ if ($module == 'initmodule')
 						$realpathtodocument = $dirread.'/'.$pathtodocument;
 						$realpathtolist     = $dirread.'/'.$pathtolist;
 						$realpathtonote     = $dirread.'/'.$pathtonote;
+						$realpathtocontact  = $dirread.'/'.$pathtocontact;
 						$realpathtophpunit  = $dirread.'/'.$pathtophpunit;
 						$realpathtosql      = $dirread.'/'.$pathtosql;
 						$realpathtosqlextra = $dirread.'/'.$pathtosqlextra;
@@ -2487,6 +2490,14 @@ if ($module == 'initmodule')
 							print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&file='.urlencode($pathtonote).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
 						}
 						print '<br>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForContactTab").' : <strong>'.($realpathtocontact ? '' : '<strike>').$pathtocontact.($realpathtocontact ? '' : '</strike>').'</strong>';
+						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtocontact).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+						if ($realpathtocontact)
+						{
+							print ' ';
+							print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&file='.urlencode($pathtocontact).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
+						}
+						print '<br>';
 
 						/* This is already on Tab CLI
 						print '<br>';
diff --git a/htdocs/modulebuilder/template/myobject_contact.php b/htdocs/modulebuilder/template/myobject_contact.php
new file mode 100644
index 00000000000..c48a997aba4
--- /dev/null
+++ b/htdocs/modulebuilder/template/myobject_contact.php
@@ -0,0 +1,203 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/modulebuilder/template/myobject_contact.php
+ *  \ingroup    mymodule
+ *  \brief      Tab for contacts linked to MyObject
+ */
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
+if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
+if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
+if (!$res) die("Include of main fails");
+
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+dol_include_once('/mymodule/class/myobject.class.php');
+dol_include_once('/mymodule/lib/mymodule_myobject.lib.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("mymodule@mymodule", "companies", "other", "mails"));
+
+$id     = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$ref    = GETPOST('ref', 'alpha');
+$lineid = GETPOST('lineid', 'int');
+$socid  = GETPOST('socid', 'int');
+$action = GETPOST('action', 'aZ09');
+
+// Initialize technical objects
+$object = new MyObject($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->mymodule->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('myobjectcontact', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$result = restrictedArea($user, 'mymodule', $object->id);
+
+$permission = $user->rights->mymodule->myobject->write;
+
+/*
+ * Add a new contact
+ */
+
+if ($action == 'addcontact' && $permission)
+{
+	$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+	$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+	$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
+
+	if ($result >= 0)
+	{
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+		exit;
+	} else {
+		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+		{
+			$langs->load("errors");
+			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+} // Toggle the status of a contact
+elseif ($action == 'swapstatut' && $permission)
+{
+	$result = $object->swapContactStatus(GETPOST('ligne'));
+} // Deletes a contact
+elseif ($action == 'deletecontact' && $permission)
+{
+	$result = $object->delete_contact($lineid);
+
+	if ($result >= 0)
+	{
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+		exit;
+	} else {
+		dol_print_error($db);
+	}
+}
+
+
+/*
+ * View
+ */
+
+$title = $langs->trans('MyObject')." - ".$langs->trans('ContactsAddresses');
+$help_url = '';
+//$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $title, $help_url);
+
+$form = new Form($db);
+$formcompany = new FormCompany($db);
+$contactstatic = new Contact($db);
+$userstatic = new User($db);
+
+
+/* *************************************************************************** */
+/*                                                                             */
+/* View and edit mode                                                         */
+/*                                                                             */
+/* *************************************************************************** */
+
+if ($object->id)
+{
+	/*
+	 * Show tabs
+	 */
+	$head = myobjectPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'contact', $langs->trans("MyObject"), -1, $object->picto);
+
+	$linkback = '<a href="'.dol_buildpath('/mymodule/myobject_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	 // Ref customer
+	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	 // Thirdparty
+	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 // Project
+	 if (! empty($conf->projet->enabled))
+	 {
+	 $langs->load("projects");
+	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	 if ($permissiontoadd)
+	 {
+	 if ($action != 'classify')
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 $morehtmlref.=' : ';
+	 if ($action == 'classify') {
+	 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+	 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	 $morehtmlref.='<input type="hidden" name="action" value="classin">';
+	 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+	 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	 $morehtmlref.='</form>';
+	 } else {
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	 }
+	 } else {
+	 if (! empty($object->fk_project)) {
+	 $proj = new Project($db);
+	 $proj->fetch($object->fk_project);
+	 $morehtmlref .= ': '.$proj->getNomUrl();
+	 } else {
+	 $morehtmlref .= '';
+	 }
+	 }
+	 }*/
+	$morehtmlref .= '</div>';
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
+
+	print dol_get_fiche_end();
+
+	print '<br>';
+
+	// Contacts lines (modules that overwrite templates must declare this into descriptor)
+	$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
+	foreach ($dirtpls as $reldir)
+	{
+		$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
+		if ($res) break;
+	}
+}
+
+// End of page
+llxFooter();
+$db->close();

From 214167b55270f3269a2fa085c20e001db64de3b9 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Fri, 25 Dec 2020 11:13:53 +0100
Subject: [PATCH 636/888] Add generation of admin/xxx_extrafields page

---
 htdocs/modulebuilder/index.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 2b7453c904a..5c8739977d6 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -906,6 +906,7 @@ if ($dirins && $action == 'initobject' && $module && $objectname)
 			'myobject_document.php'=>strtolower($objectname).'_document.php',
 			'myobject_agenda.php'=>strtolower($objectname).'_agenda.php',
 			'myobject_list.php'=>strtolower($objectname).'_list.php',
+			'admin/myobject_extrafields.php'=>'admin/'.strtolower($objectname).'_extrafields.php',
 			'lib/mymodule_myobject.lib.php'=>'lib/'.strtolower($module).'_'.strtolower($objectname).'.lib.php',
 			//'test/phpunit/MyObjectTest.php'=>'test/phpunit/'.strtolower($objectname).'Test.php',
 			'sql/llx_mymodule_myobject.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql',
@@ -1336,6 +1337,7 @@ if ($dirins && $action == 'confirm_deleteobject' && $objectname)
 			'myobject_document.php'=>strtolower($objectname).'_document.php',
 			'myobject_agenda.php'=>strtolower($objectname).'_agenda.php',
 			'myobject_list.php'=>strtolower($objectname).'_list.php',
+			'admin/myobject_extrafields.php'=>'admin/'.strtolower($objectname).'_extrafields.php',
 			'lib/mymodule_myobject.lib.php'=>'lib/'.strtolower($module).'_'.strtolower($objectname).'.lib.php',
 			'test/phpunit/MyObjectTest.php'=>'test/phpunit/'.strtolower($objectname).'Test.php',
 			'sql/llx_mymodule_myobject.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql',

From 4cee1e8d792ffa1388da01b03c4f64c94a605aa1 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Fri, 25 Dec 2020 11:18:01 +0100
Subject: [PATCH 637/888] Fix admin/myobject_extrafields page

---
 .../template/admin/myobject_extrafields.php     | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/htdocs/modulebuilder/template/admin/myobject_extrafields.php b/htdocs/modulebuilder/template/admin/myobject_extrafields.php
index c844f80e4cc..0e42b75da0b 100644
--- a/htdocs/modulebuilder/template/admin/myobject_extrafields.php
+++ b/htdocs/modulebuilder/template/admin/myobject_extrafields.php
@@ -26,9 +26,22 @@
  *		\brief      Page to setup extra fields of myobject
  */
 
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/bom.lib.php';
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
+if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
+if (!$res) die("Include of main fails");
+
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once '../lib/mymodule.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('mymodule@mymodule', 'admin'));

From 22e036057521fb17575f2c281323acf899401639 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Fri, 25 Dec 2020 11:46:29 +0100
Subject: [PATCH 638/888] Fix missing delete files in module builder

---
 htdocs/modulebuilder/index.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 5c8739977d6..294ad4563b5 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -226,12 +226,15 @@ if ($dirins && $action == 'initmodule' && $modulename)
 		// Delete dir and files that can be generated in sub tabs later if we need them (we want a minimal module first)
 		dol_delete_dir_recursive($destdir.'/build/doxygen');
 		dol_delete_dir_recursive($destdir.'/core/modules/mailings');
+		dol_delete_dir_recursive($destdir.'/core/modules/'.strtolower($modulename).'');
 		dol_delete_dir_recursive($destdir.'/core/tpl');
 		dol_delete_dir_recursive($destdir.'/core/triggers');
 		dol_delete_dir_recursive($destdir.'/doc');
 		dol_delete_dir_recursive($destdir.'/.tx');
 		dol_delete_dir_recursive($destdir.'/core/boxes');
 
+		dol_delete_file($destdir.'/admin/myobject_extrafields');
+
 		dol_delete_file($destdir.'/sql/data.sql');
 		dol_delete_file($destdir.'/sql/update_x.x.x-y.y.y.sql');
 
@@ -1334,6 +1337,7 @@ if ($dirins && $action == 'confirm_deleteobject' && $objectname)
 		$filetodelete = array(
 			'myobject_card.php'=>strtolower($objectname).'_card.php',
 			'myobject_note.php'=>strtolower($objectname).'_note.php',
+			'myobject_contact.php'=>strtolower($objectname).'_contact.php',
 			'myobject_document.php'=>strtolower($objectname).'_document.php',
 			'myobject_agenda.php'=>strtolower($objectname).'_agenda.php',
 			'myobject_list.php'=>strtolower($objectname).'_list.php',

From f20f4cc5990b65caf28c2577a653602003fd9281 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 26 Dec 2020 19:23:25 +0100
Subject: [PATCH 639/888] Fix warnings

---
 .../webservices/server_productorservice.php   | 38 +++++++++----------
 test/phpunit/WebservicesProductsTest.php      |  5 ++-
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index f285d245030..2b3a76f5f7f 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -493,42 +493,42 @@ function createProductOrService($authentication, $product)
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	// Check parameters
-	if ($product['price_net'] > 0) $product['price_base_type'] = 'HT';
-	if ($product['price'] > 0)     $product['price_base_type'] = 'TTC';
+	if (empty($product['price_base_type'])) {
+		if (isset($product['price_net']) && $product['price_net'] > 0) $product['price_base_type'] = 'HT';
+		if (isset($product['price']) && $product['price'] > 0)     $product['price_base_type'] = 'TTC';
+	}
 
-	if ($product['price_net'] > 0 && $product['price'] > 0)
+	if (isset($product['price_net']) && $product['price_net'] > 0 && isset($product['price']) && $product['price'] > 0)
 	{
 		$error++; $errorcode = 'KO'; $errorlabel = "You must choose between price or price_net to provide price.";
 	}
 
-	if ($product['barcode'] && !$product['barcode_type'])
+	if (!empty($product['barcode']) && empty($product['barcode_type']))
 	{
 		$error++; $errorcode = 'KO'; $errorlabel = "You must set a barcode type when setting a barcode.";
 	}
 
-
-
 	if (!$error)
 	{
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 		$newobject = new Product($db);
 		$newobject->ref = $product['ref'];
-		$newobject->ref_ext = $product['ref_ext'];
-		$newobject->type = $product['type'];
-		$newobject->label = $product['label'];
-		$newobject->description = $product['description'];
-		$newobject->note_public = $product['note_public'];
-		$newobject->note_private = $product['note_private'];
-		$newobject->status = $product['status_tosell'];
-		$newobject->status_buy = $product['status_tobuy'];
-		$newobject->price = $product['price_net'];
-		$newobject->price_ttc = $product['price'];
-		$newobject->tva_tx = $product['vat_rate'];
+		$newobject->ref_ext = empty($product['ref_ext']) ? '' : $product['ref_ext'];
+		$newobject->type = empty($product['type']) ? 0 : $product['type'];
+		$newobject->label = empty($product['label']) ? '' : $product['label'];
+		$newobject->description = empty($product['description']) ? '' : $product['description'];
+		$newobject->note_public = empty($product['note_public']) ? '' : $product['note_public'];
+		$newobject->note_private = empty($product['note_private']) ? '' :$product['note_private'];
+		$newobject->status = empty($product['status_tosell']) ? 0 : $product['status_tosell'];
+		$newobject->status_buy = empty($product['status_tobuy']) ? 0 : $product['status_tobuy'];
+		$newobject->price = isset($product['price_net']) ? $product['price_net'] : 0;
+		$newobject->price_ttc = isset($product['price']) ? $product['price'] : 0;
+		$newobject->tva_tx = empty($product['vat_rate']) ? 0 : $product['vat_rate'];
 		$newobject->price_base_type = $product['price_base_type'];
 		$newobject->date_creation = $now;
 
-		if ($product['barcode'])
+		if (!empty($product['barcode']))
 		{
 			$newobject->barcode = $product['barcode'];
 			$newobject->barcode_type = $product['barcode_type'];
@@ -539,7 +539,7 @@ function createProductOrService($authentication, $product)
 		$newobject->seuil_stock_alert = $product['stock_alert'];
 
 		$newobject->country_id = $product['country_id'];
-		if ($product['country_code']) $newobject->country_id = getCountry($product['country_code'], 3);
+		if (!empty($product['country_code'])) $newobject->country_id = getCountry($product['country_code'], 3);
 		$newobject->customcode = $product['customcode'];
 
 		$newobject->canvas = $product['canvas'];
diff --git a/test/phpunit/WebservicesProductsTest.php b/test/phpunit/WebservicesProductsTest.php
index 7b90fcbbd88..479fe5854de 100644
--- a/test/phpunit/WebservicesProductsTest.php
+++ b/test/phpunit/WebservicesProductsTest.php
@@ -182,7 +182,10 @@ class WebservicesProductsTest extends PHPUnit\Framework\TestCase
                 'type'=>1,
                 'description'=>'This is a new product created from WS PHPUnit test case',
                 'barcode'=>'123456789012',
-                'barcode_type'=>2
+                'barcode_type'=>2,
+            	'price_net'=>10,
+            	'status_tosell'=>1,
+            	'status_tobuy'=>1
             )
         );
         print __METHOD__." call method ".$WS_METHOD."\n";

From 28642238deb62e25277ad8f78c21ba01b0e251c7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 27 Dec 2020 15:09:27 +0100
Subject: [PATCH 640/888] Fix error message

---
 htdocs/langs/en_US/modulebuilder.lang | 3 ++-
 htdocs/modulebuilder/index.php        | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 6f8fdcad996..4a91bf60c6c 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -138,4 +138,5 @@ ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
-TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
\ No newline at end of file
+TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is enabled but not allowed to your user.
\ No newline at end of file
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index fba9b0d4855..0631725a22c 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -57,8 +57,8 @@ $modulename = dol_sanitizeFileName(GETPOST('modulename', 'alpha'));
 $objectname = dol_sanitizeFileName(GETPOST('objectname', 'alpha'));
 
 // Security check
-if (empty($conf->modulebuilder->enabled)) accessforbidden('ModuleBuilderNotAllowed');
-if (!$user->admin && empty($conf->global->MODULEBUILDER_FOREVERYONE)) accessforbidden('ModuleBuilderNotAllowed');
+if (empty($conf->modulebuilder->enabled)) accessforbidden();
+if (!$user->admin && empty($conf->global->MODULEBUILDER_FOREVERYONE)) accessforbidden($langs->trans('ModuleBuilderNotAllowed'));
 
 
 // Dir for custom dirs

From 4c9a597c8afd5a112044a7e4dd05130fa15f240a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 27 Dec 2020 15:13:20 +0100
Subject: [PATCH 641/888] Update 12.0.0-13.0.0.sql

---
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index be0e25db693..c6ca487de43 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -60,12 +60,6 @@ ALTER TABLE llx_mrp_mo_extrafields ADD INDEX idx_mrp_mo_fk_object(fk_object);
 
 
 -- For v13
--- members
-ALTER TABLE llx_adherent ADD COLUMN ref varchar(30) AFTER rowid;
-UPDATE llx_adherent SET ref = rowid WHERE ref = '';
-ALTER TABLE llx_adherent MODIFY COLUMN ref varchar(30) NOT NULL;
-ALTER TABLE llx_adherent ADD UNIQUE INDEX uk_adherent_ref (ref, entity);
-
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (111,11,     '0','0','No Sales Tax',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (112,11,     '4','0','Sales Tax 4%',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (113,11,     '6','0','Sales Tax 6%',1);

From e4d7ce371e7a30adb5016275d16118dd771fb1c5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 27 Dec 2020 15:16:21 +0100
Subject: [PATCH 642/888] Add file for #15351

---
 .../install/mysql/migration/13.0.0-14.0.0.sql | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 htdocs/install/mysql/migration/13.0.0-14.0.0.sql

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
new file mode 100644
index 00000000000..0c3ee8549da
--- /dev/null
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -0,0 +1,41 @@
+--
+-- Be carefull to requests order.
+-- This file must be loaded by calling /install/index.php page
+-- when current version is 13.0.0 or higher.
+--
+-- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y
+-- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y
+-- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
+-- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
+-- To rename a column:      ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);
+-- To drop a column:        ALTER TABLE llx_table DROP COLUMN oldname;
+-- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
+-- To drop a foreign key:   ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
+-- To create a unique index ALTER TABLE llx_table ADD UNIQUE INDEX uk_table_field (field);
+-- To drop an index:        -- VMYSQL4.1 DROP INDEX nomindex on llx_table
+-- To drop an index:        -- VPGSQL8.2 DROP INDEX nomindex
+-- To make pk to be auto increment (mysql):    -- VMYSQL4.3 ALTER TABLE llx_table CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (postgres):
+-- -- VPGSQL8.2 CREATE SEQUENCE llx_table_rowid_seq OWNED BY llx_table.rowid;
+-- -- VPGSQL8.2 ALTER TABLE llx_table ADD PRIMARY KEY (rowid);
+-- -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN rowid SET DEFAULT nextval('llx_table_rowid_seq');
+-- -- VPGSQL8.2 SELECT setval('llx_table_rowid_seq', MAX(rowid)) FROM llx_table;
+-- To set a field as NULL:                     -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NULL;
+-- To set a field as NULL:                     -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
+-- To set a field as NOT NULL:                 -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NOT NULL;
+-- To set a field as NOT NULL:                 -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET NOT NULL;
+-- To set a field as default NULL:             -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
+-- Note: fields with type BLOB/TEXT can't have default value.
+
+
+-- Missing in v13 or lower
+
+
+
+-- For v14
+
+ALTER TABLE llx_adherent ADD COLUMN ref varchar(30) AFTER rowid;
+UPDATE llx_adherent SET ref = rowid WHERE ref = '' or ref IS NULL;
+ALTER TABLE llx_adherent MODIFY COLUMN ref varchar(30) NOT NULL;
+ALTER TABLE llx_adherent ADD UNIQUE INDEX uk_adherent_ref (ref, entity);
+

From 5fc3a9ce7dc8d431278e9503372261882b11f25f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 27 Dec 2020 15:39:10 +0100
Subject: [PATCH 643/888] Debug v13

---
 htdocs/langs/en_US/modulebuilder.lang         |  2 +-
 htdocs/modulebuilder/index.php                |  4 ++--
 .../core/modules/modMyModule.class.php        | 20 +++++++++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 4a91bf60c6c..8e406d34c0f 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -105,7 +105,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 0631725a22c..ce5cadf9c35 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -2385,7 +2385,7 @@ if ($module == 'initmodule')
 		   					print ' &nbsp; ';
 		   					if (empty($conf->global->$const_name))	// If module is not activated
 		   					{
-		   						print '<a href="#" target="apiexplorer" title="'.$langs->trans("ModuleMustBeEnabled", $module).'"><strike>'.$langs->trans("GoToApiExplorer").'</strike></a>';
+		   						print '<a href="#" class="classfortooltip" target="apiexplorer" title="'.$langs->trans("ModuleMustBeEnabled", $module).'"><strike>'.$langs->trans("GoToApiExplorer").'</strike></a>';
 		   					} else {
 		   						print '<a href="'.DOL_URL_ROOT.'/api/index.php/explorer/" target="apiexplorer">'.$langs->trans("GoToApiExplorer").'</a>';
 		   					}
@@ -3412,7 +3412,7 @@ if ($module == 'initmodule')
 
 			if ($action != 'editfile' || empty($file))
 			{
-				print '<span class="opacitymedium">'.$langs->trans("CronJobDefDesc", '<a href="'.DOL_URL_ROOT.'/cron/list.php">'.$langs->transnoentities('CronList').'</a>').'</span><br>';
+				print '<span class="opacitymedium">'.str_replace('{s1}', '<a href="'.DOL_URL_ROOT.'/cron/list.php">'.$langs->transnoentities('CronList').'</a>', $langs->trans("CronJobDefDesc", '{s1}')).'</span><br>';
 				print '<br>';
 
 				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong>'.$pathtofile.'</strong>';
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 4917074dad0..2a5853a1e60 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -46,23 +46,31 @@ class modMyModule extends DolibarrModules
 		// Id for module (must be unique).
 		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
 		$this->numero = 500000; // TODO Go on page https://wiki.dolibarr.org/index.php/List_of_modules_id to reserve an id number for your module
+
 		// Key text used to identify module (for permissions, menus, etc...)
 		$this->rights_class = 'mymodule';
+
 		// Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
 		// It is used to group modules by family in module setup page
 		$this->family = "other";
+
 		// Module position in the family on 2 digits ('01', '10', '20', ...)
 		$this->module_position = '90';
+
 		// Gives the possibility for the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
 		//$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
 		// Module label (no space allowed), used if translation string 'ModuleMyModuleName' not found (MyModule is name of module).
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
+
 		// Module description, used if translation string 'ModuleMyModuleDesc' not found (MyModule is name of module).
 		$this->description = "MyModuleDescription";
 		// Used only if file README.md and README-LL.md not found.
 		$this->descriptionlong = "MyModule description (Long)";
+
+		// Author
 		$this->editor_name = 'Editor name';
 		$this->editor_url = 'https://www.example.com';
+
 		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
 		$this->version = '1.0';
 		// Url to the file with your last numberversion of this module
@@ -70,10 +78,13 @@ class modMyModule extends DolibarrModules
 
 		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+
 		// Name of image file used for this module.
 		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
 		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+		// To use a supported fa-xxx css style of font awesome, use this->picto='xxx'
 		$this->picto = 'generic';
+
 		// Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
 		$this->module_parts = array(
 			// Set this to 1 if module has its own trigger directory (core/triggers)
@@ -113,11 +124,14 @@ class modMyModule extends DolibarrModules
 			// Set this to 1 if features of module are opened to external users
 			'moduleforexternal' => 0,
 		);
+
 		// Data directories to create when module is enabled.
 		// Example: this->dirs = array("/mymodule/temp","/mymodule/subdir");
 		$this->dirs = array("/mymodule/temp");
+
 		// Config pages. Put here list of php page, stored into mymodule/admin directory, to use to setup module.
 		$this->config_page_url = array("setup.php@mymodule");
+
 		// Dependencies
 		// A condition to hide module
 		$this->hidden = false;
@@ -125,9 +139,15 @@ class modMyModule extends DolibarrModules
 		$this->depends = array();
 		$this->requiredby = array(); // List of module class names as string to disable if this one is disabled. Example: array('modModuleToDisable1', ...)
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...)
+
+		// The language file dedicated to your module
 		$this->langfiles = array("mymodule@mymodule");
+
+		// Prerequisites
 		$this->phpmin = array(5, 5); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(11, -3); // Minimum version of Dolibarr required by module
+
+		// Messages at activation
 		$this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
 		$this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
 		//$this->automatic_activation = array('FR'=>'MyModuleWasAutomaticallyActivatedBecauseOfYourCountryChoice');

From 00c847b743cfef058a61a10789cfe51d6faf255a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 27 Dec 2020 16:56:44 +0100
Subject: [PATCH 644/888] Fix warning

---
 htdocs/webservices/server_productorservice.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index 2b3a76f5f7f..bb068167b74 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -534,15 +534,15 @@ function createProductOrService($authentication, $product)
 			$newobject->barcode_type = $product['barcode_type'];
 		}
 
-		$newobject->stock_reel = $product['stock_real'];
-		$newobject->pmp = $product['pmp'];
-		$newobject->seuil_stock_alert = $product['stock_alert'];
+		$newobject->stock_reel = isset($product['stock_real']) ? $product['stock_real'] : null;
+		$newobject->pmp = isset($product['pmp']) ? $product['pmp'] : null;
+		$newobject->seuil_stock_alert = isset($product['stock_alert']) ? $product['stock_alert'] : null;
 
-		$newobject->country_id = $product['country_id'];
+		$newobject->country_id = isset($product['country_id']) ? $product['country_id'] : 0;
 		if (!empty($product['country_code'])) $newobject->country_id = getCountry($product['country_code'], 3);
-		$newobject->customcode = $product['customcode'];
+		$newobject->customcode = isset($product['customcode']) ? $product['customcode'] : '';
 
-		$newobject->canvas = $product['canvas'];
+		$newobject->canvas = isset($product['canvas']) ? $product['canvas'] : '';
 		/*foreach($product['lines'] as $line)
         {
             $newline=new FactureLigne($db);
@@ -565,7 +565,7 @@ function createProductOrService($authentication, $product)
 		$extrafields->fetch_name_optionals_label($elementtype, true);
 		if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 		{
-			foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+			foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label)
 			{
 				$key = 'options_'.$key;
 				$newobject->array_options[$key] = $product[$key];

From a3cac7f5e5da8ef928e86820e0f6b4d7f000ad7b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 27 Dec 2020 19:03:13 +0100
Subject: [PATCH 645/888] Prepare v14

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

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 48c1d448097..8d9778b177e 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -31,7 +31,7 @@
  */
 
 if (!defined('DOL_APPLICATION_TITLE')) define('DOL_APPLICATION_TITLE', 'Dolibarr');
-if (!defined('DOL_VERSION')) define('DOL_VERSION', '13.0.0-beta'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+if (!defined('DOL_VERSION')) define('DOL_VERSION', '14.0.0-alpha'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 
 if (!defined('EURO')) define('EURO', chr(128));
 

From 12d8685b68abff77288d4f98ddf48d292e2b1cb6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 27 Dec 2020 19:05:48 +0100
Subject: [PATCH 646/888] Prepare v14

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index dfeb209bfc3..3009ff69c01 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,7 +50,7 @@ jobs:
     - if: type = push AND branch = develop
       php: nightly 
       env: DB=mysql
-    - if: type = push AND branch = 13.0
+    - if: type = push AND branch = 14.0
       php: nightly 
       env: DB=mysql
 
@@ -401,6 +401,9 @@ script:
   php upgrade.php 12.0.0 13.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade12001300.log
   php upgrade2.php 12.0.0 13.0.0 > $TRAVIS_BUILD_DIR/upgrade12001300-2.log
   php step5.php 12.0.0 13.0.0 > $TRAVIS_BUILD_DIR/upgrade12001300-3.log
+  php upgrade.php 13.0.0 14.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade13001400.log
+  php upgrade2.php 13.0.0 14.0.0 > $TRAVIS_BUILD_DIR/upgrade13001400-2.log
+  php step5.php 13.0.0 14.0.0 > $TRAVIS_BUILD_DIR/upgrade13001400-3.log
 
   # Enable modules not enabled into original dump
   php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_PRODUCTBATCH,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKET,MAIN_MODULE_ACCOUNTING,MAIN_MODULE_MRP > $TRAVIS_BUILD_DIR/enablemodule.log

From 96040980d78ee9f9ca1c60eb49b68ff1349dbd3f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 27 Dec 2020 19:06:56 +0100
Subject: [PATCH 647/888] Fix upgrade

---
 htdocs/install/check.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 93b99680b92..eacc58e6620 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -439,7 +439,8 @@ if (!file_exists($conffile))
 								array('from'=>'9.0.0', 'to'=>'10.0.0'),
 								array('from'=>'10.0.0', 'to'=>'11.0.0'),
 								array('from'=>'11.0.0', 'to'=>'12.0.0'),
-								array('from'=>'12.0.0', 'to'=>'13.0.0')
+								array('from'=>'12.0.0', 'to'=>'13.0.0'),
+								array('from'=>'13.0.0', 'to'=>'14.0.0')
 		);
 
 		$count = 0;

From 5ff53691a5028927b25829728d90d8734f5a89a2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 27 Dec 2020 19:13:09 +0100
Subject: [PATCH 648/888] Fix migration

---
 htdocs/install/upgrade2.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index ba24cf3a496..3a2b8889d96 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -4332,6 +4332,14 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
+		} elseif ($moduletoreload == 'MAIN_MODULE_EXTERNALSITE') {
+			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate ExternalSite module");
+			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modExternalSite.class.php';
+			if ($res) {
+				$mod = new modExternalSite($db);
+				$mod->remove('noboxes');
+				$mod->init($reloadmode);
+			}
 		} elseif ($moduletoreload == 'MAIN_MODULE_SOCIETE') {
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Societe module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modSociete.class.php';

From 4ec78d029b24655c2e9d3eab4fb484f83a1e9df6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 27 Dec 2020 19:21:37 +0100
Subject: [PATCH 649/888] Fix warning

---
 htdocs/core/modules/modCommande.class.php   | 1 +
 htdocs/core/modules/modExpedition.class.php | 2 +-
 htdocs/core/modules/modFacture.class.php    | 4 ++--
 htdocs/core/modules/modPropale.class.php    | 2 +-
 htdocs/core/modules/modReception.class.php  | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index 84a46c49d63..ac4d26725bc 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -263,6 +263,7 @@ class modCommande extends DolibarrModules
 		$this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_commande';
 		$this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('commande').')';
 		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.(empty($user) ? 0 : $user->id);
+
 		// Imports
 		//--------
 		$r = 0;
diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index 54fecd1a5af..c42cbeb0f8c 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -306,7 +306,7 @@ class modExpedition extends DolibarrModules
 		}
 		$this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = ed.fk_expedition AND ed.fk_origin_line = cd.rowid';
 		$this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('expedition').')';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.(empty($user) ? 0 : $user->id);
 	}
 
 
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 8f4172112b5..9212fa1f7ce 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -291,7 +291,7 @@ class modFacture extends DolibarrModules
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
 		$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
 		$this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('invoice').')';
-		if (isset($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.(empty($user) ? 0 : $user->id);
 		$r++;
 
 
@@ -371,7 +371,7 @@ class modFacture extends DolibarrModules
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON ba.rowid = b.fk_account';
 		$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('invoice').')';
-		if (isset($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.(empty($user) ? 0 : $user->id);
 		$r++;
 	}
 
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index f1de32bd1a9..c0ffa6f0811 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -254,7 +254,7 @@ class modPropale extends DolibarrModules
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
 		$this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_propal';
 		$this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('propal').')';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.(empty($user) ? 0 : $user->id);
 
 		// Imports
 		//--------
diff --git a/htdocs/core/modules/modReception.class.php b/htdocs/core/modules/modReception.class.php
index f784d88a3da..8bebf949b6f 100644
--- a/htdocs/core/modules/modReception.class.php
+++ b/htdocs/core/modules/modReception.class.php
@@ -231,7 +231,7 @@ class modReception extends DolibarrModules
 		}
 		$this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = ed.fk_reception AND ed.fk_commandefourndet = cd.rowid';
 		$this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('reception').')';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.(empty($user) ? 0 : $user->id);
 	}
 
 

From 5aae018a0bfd302f87c59d3f077b9c16a6b7b3d6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 27 Dec 2020 19:33:07 +0100
Subject: [PATCH 650/888] Fix for php8

---
 dev/dolibarr_changes.txt                 | 7 +++++++
 htdocs/includes/nusoap/lib/nusoap.php    | 6 ++++--
 test/phpunit/WebservicesProductsTest.php | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
index 5648381ff49..f3374c43234 100644
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -50,6 +50,13 @@ Replace call to serialize_val with no bugged value
 
 * In all files, replace constructor names into __construct. Replace also parent::constructor_name with parent::__construct
 
+* Line 4222 of file nusoap.php
+
+		$rev = array();
+		preg_match('/\$Revision: ([^ ]+)/', $this->revision, $rev);
+		$this->outgoing_headers[] = "X-SOAP-Server: $this->title/$this->version (".(isset($rev[1]) ? $rev[1] : '').")";
+
+
 
 
 TCPDF:
diff --git a/htdocs/includes/nusoap/lib/nusoap.php b/htdocs/includes/nusoap/lib/nusoap.php
index a1fbd00051d..459f4aeb7b6 100644
--- a/htdocs/includes/nusoap/lib/nusoap.php
+++ b/htdocs/includes/nusoap/lib/nusoap.php
@@ -4219,8 +4219,10 @@ class nusoap_server extends nusoap_base {
         	$payload .= $this->getDebugAsXMLComment();
         }
 		$this->outgoing_headers[] = "Server: $this->title Server v$this->version";
-		preg_match('/\$Revisio' . 'n: ([^ ]+)/', $this->revision, $rev);
-		$this->outgoing_headers[] = "X-SOAP-Server: $this->title/$this->version (".$rev[1].")";
+		// @CHANGE Fix for php8
+		$rev = array();
+		preg_match('/\$Revision: ([^ ]+)/', $this->revision, $rev);
+		$this->outgoing_headers[] = "X-SOAP-Server: $this->title/$this->version (".(isset($rev[1]) ? $rev[1] : '').")";
 		// Let the Web server decide about this
 		//$this->outgoing_headers[] = "Connection: Close\r\n";
 		$payload = $this->getHTTPBody($payload);
diff --git a/test/phpunit/WebservicesProductsTest.php b/test/phpunit/WebservicesProductsTest.php
index 479fe5854de..b78650cc480 100644
--- a/test/phpunit/WebservicesProductsTest.php
+++ b/test/phpunit/WebservicesProductsTest.php
@@ -204,7 +204,7 @@ class WebservicesProductsTest extends PHPUnit\Framework\TestCase
             print $soapclient->response;
             print "\n";
         }
-
+        print var_export($result, true);
         print __METHOD__." count(result)=".(is_array($result) ? count($result) : '')."\n";
         $this->assertEquals('OK', $result['result']['result_code']);
 

From e89a410e59b8378bc6b0f76fe2fc00886e1e8e41 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 27 Dec 2020 20:33:07 +0100
Subject: [PATCH 651/888] Fix warning

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index c40ffd4e0a9..1c2eb2327d2 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2651,14 +2651,14 @@ class Product extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd";
 		$sql .= ", ".MAIN_DB_PREFIX."commande as c";
 		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
+		if (empty($user->rights->societe->client->voir) && !$socid && !$forVirtualStock) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE c.rowid = cd.fk_commande";
 		$sql .= " AND c.fk_soc = s.rowid";
 		$sql .= " AND c.entity IN (".getEntity($forVirtualStock && !empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'commande').")";
 		$sql .= " AND cd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
+		if (empty($user->rights->societe->client->voir) && !$socid && !$forVirtualStock) {
 			$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		if ($socid > 0) {

From a6cd34739ea2a45550aa4190971071a2a3256924 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 27 Dec 2020 20:43:18 +0100
Subject: [PATCH 652/888] Doxygen

---
 htdocs/ecm/class/ecmfiles.class.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 8701e6ed7d6..6392d6f162e 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -150,6 +150,12 @@ class EcmFiles extends CommonObject
 	 */
 	public $src_object_id;
 
+	/**
+	 * @var int section_id		ID of section = ID of EcmDirectory, directory of manual ECM (not stored into database)
+	 */
+	public $section_id;
+
+
 
 	/**
 	 * Constructor

From 6b03a2d26440c424b943fd9bd1de49c0a38d9ec8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 27 Dec 2020 20:49:40 +0100
Subject: [PATCH 653/888] Sanitize data

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

diff --git a/htdocs/ecm/file_note.php b/htdocs/ecm/file_note.php
index dba96710f60..d2f3f7b4792 100644
--- a/htdocs/ecm/file_note.php
+++ b/htdocs/ecm/file_note.php
@@ -73,7 +73,7 @@ if (!$section) {
 	dol_print_error('', 'Error, section parameter missing');
 	exit;
 }
-$urlfile = GETPOST("urlfile");
+$urlfile = (string) dol_sanitizePathName(GETPOST("urlfile"));
 if (!$urlfile) {
 	dol_print_error('', "ErrorParamNotDefined");
 	exit;

From d1d4914684dfc4fbd1c2677ceaca17d1ba2aed97 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 27 Dec 2020 20:49:54 +0100
Subject: [PATCH 654/888] Sanitize data

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

diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index 496afbf8568..abd6209ac7a 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -65,7 +65,7 @@ if (!$section)
 	dol_print_error('', 'Error, section parameter missing');
 	exit;
 }
-$urlfile = GETPOST("urlfile");
+$urlfile = (string) dol_sanitizePathName(GETPOST("urlfile"));
 if (!$urlfile)
 {
 	dol_print_error('', "ErrorParamNotDefined");

From 6421f757dc592a3747482ae8781275b8cfd39cb5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 27 Dec 2020 21:21:13 +0100
Subject: [PATCH 655/888] FIX Can delete a directory created manually that can
 not be indexed

---
 htdocs/ecm/class/ecmdirectory.class.php |  2 +-
 htdocs/ecm/dir_card.php                 | 86 ++++++++++++-------------
 2 files changed, 42 insertions(+), 46 deletions(-)

diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index ca2b9fec473..4c4a3fc3412 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -345,7 +345,7 @@ class EcmDirectory extends CommonObject
 		$sql .= " t.date_c as date_c,";
 		$sql .= " t.tms as date_m";
 		$sql .= " FROM ".MAIN_DB_PREFIX."ecm_directories as t";
-		$sql .= " WHERE t.rowid = ".$id;
+		$sql .= " WHERE t.rowid = ".((int) $id);
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index 9dc6977f1e4..8b86f99d2c7 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -54,7 +54,7 @@ $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
 if (!$sortfield) $sortfield = "name";
 
-$section = GETPOST("section", 'alpha') ?GETPOST("section", 'alpha') : GETPOST("relativedir", 'alpha');
+$section = GETPOST("section", 'alpha') ? GETPOST("section", 'alpha') : GETPOST("relativedir", 'alpha');
 if (!$section)
 {
 	dol_print_error('', "ErrorSectionParamNotDefined");
@@ -66,15 +66,15 @@ $ecmdir = new EcmDirectory($db);
 
 if ($module == 'ecm')
 {
+	// $section should be an int except if it is dir not yet created into EcmDirectory
 	$result = $ecmdir->fetch($section);
-	if (!$result > 0)
-	{
-		dol_print_error($db, $ecmdir->error);
-		exit;
+	if ($result > 0) {
+		$relativepath = $ecmdir->getRelativePath();
+		$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
+	} else {
+		$relativepath = $section;
+		$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
 	}
-
-	$relativepath = $ecmdir->getRelativePath();
-	$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
 } else // For example $module == 'medias'
 {
 	$relativepath = $section;
@@ -143,28 +143,23 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
 }
 
 // Remove dir
-if ($action == 'confirm_deletedir' && $confirm == 'yes')
-{
+if ($action == 'confirm_deletedir' && $confirm == 'yes') {
 	$backtourl = DOL_URL_ROOT."/ecm/index.php";
-	if ($module == 'medias')
-	{
+	if ($module == 'medias') {
 		$backtourl = DOL_URL_ROOT."/website/index.php?file_manager=1";
 	}
 
 	$deletedirrecursive = (GETPOST('deletedirrecursive', 'alpha') == 'on' ? 1 : 0);
 
-	if ($module == 'ecm')
-	{
+	if ($module == 'ecm' && $ecmdir->id > 0) {	// If manual ECM and directory is indexed into database
 		// Fetch was already done
 		$result = $ecmdir->delete($user, 'all', $deletedirrecursive);
-		if ($result <= 0)
-		{
+		if ($result <= 0) {
 			$langs->load('errors');
 			setEventMessages($langs->trans($ecmdir->error, $ecmdir->label), null, 'errors');
 		}
 	} else {
-		if ($deletedirrecursive)
-		{
+		if ($deletedirrecursive) {
 			$resbool = dol_delete_dir_recursive($upload_dir, 0, 1);
 		} else {
 			$resbool = dol_delete_dir($upload_dir, 1);
@@ -176,8 +171,7 @@ if ($action == 'confirm_deletedir' && $confirm == 'yes')
 			$result = 0;
 		}
 	}
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		header("Location: ".$backtourl);
 		exit;
 	}
@@ -269,10 +263,9 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha'))
 }
 
 
-
-/*******************************************************************
-* View
-********************************************************************/
+/*
+ * View
+ */
 
 $form = new Form($db);
 
@@ -281,9 +274,7 @@ $extrafields = new ExtraFields($db);
 // fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 
-
-if ($module == 'ecm')
-{
+if ($module == 'ecm' && $ecmdir->id > 0) {
 	$object->fetch($ecmdir->id);
 }
 
@@ -323,24 +314,27 @@ if ($module == 'ecm')
 	$result = 1;
 	$i = 0;
 	$tmpecmdir = new EcmDirectory($db); // Need to create a new one
-	$tmpecmdir->fetch($ecmdir->id);
-	while ($tmpecmdir && $result > 0)
-	{
-		$tmpecmdir->ref = $tmpecmdir->label;
-		if ($i == 0 && $action == 'edit')
+	if ($ecmdir->id > 0) {
+		$tmpecmdir->fetch($ecmdir->id);
+		while ($tmpecmdir && $result > 0)
 		{
-			$s = '<input type="text" name="label" class="minwidth300" maxlength="32" value="'.$tmpecmdir->label.'">';
-		} else $s = $tmpecmdir->getNomUrl(1).$s;
-		if ($tmpecmdir->fk_parent)
-		{
-			$s = ' -> '.$s;
-			$result = $tmpecmdir->fetch($tmpecmdir->fk_parent);
-		} else {
-			$tmpecmdir = 0;
+			$tmpecmdir->ref = $tmpecmdir->label;
+			if ($i == 0 && $action == 'edit')
+			{
+				$s = '<input type="text" name="label" class="minwidth300" maxlength="32" value="'.$tmpecmdir->label.'">';
+			} else $s = $tmpecmdir->getNomUrl(1).$s;
+			if ($tmpecmdir->fk_parent)
+			{
+				$s = ' -> '.$s;
+				$result = $tmpecmdir->fetch($tmpecmdir->fk_parent);
+			} else {
+				$tmpecmdir = 0;
+			}
+			$i++;
 		}
-		$i++;
+	} else {
+		$s .= join(' -> ', explode('/', $section));
 	}
-
 	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/ecm/index.php">'.$langs->trans("ECMRoot").'</a> -> '.$s;
 }
 if ($module == 'medias')
@@ -393,9 +387,11 @@ if ($module == 'ecm')
 	print '</td></tr>';
 
 	print '<tr><td class="titlefield">'.$langs->trans("ECMCreationUser").'</td><td>';
-	$userecm = new User($db);
-	$userecm->fetch($ecmdir->fk_user_c);
-	print $userecm->getNomUrl(1);
+	if ($ecmdir->fk_user_c > 0) {
+		$userecm = new User($db);
+		$userecm->fetch($ecmdir->fk_user_c);
+		print $userecm->getNomUrl(1);
+	}
 	print '</td></tr>';
 }
 print '<tr><td class="titlefield">'.$langs->trans("ECMCreationDate").'</td><td>';

From eac711f96c83ff2f505abfedbb3eb3ae1ca91d87 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 27 Dec 2020 21:41:39 +0100
Subject: [PATCH 656/888] Debug v13

---
 htdocs/product/class/product.class.php | 119 +++++++++++++------------
 1 file changed, 63 insertions(+), 56 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 1c2eb2327d2..63e0fea2b36 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2395,7 +2395,7 @@ class Product extends CommonObject
 	public function load_stats_mo($socid = 0)
 	{
 		// phpcs:enable
-		global $user, $hookmanager;
+		global $user, $hookmanager, $action;
 
 		$error = 0;
 
@@ -2408,7 +2408,7 @@ class Product extends CommonObject
 			$sql .= " SUM(mp.qty) as qty";
 			$sql .= " FROM ".MAIN_DB_PREFIX."mrp_mo as c";
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."mrp_production as mp ON mp.fk_mo=c.rowid";
-			if (!$user->rights->societe->client->voir && !$socid) {
+			if (empty($user->rights->societe->client->voir) && !$socid) {
 				$sql .= "INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc=c.fk_soc AND sc.fk_user = ".$user->id;
 			}
 			$sql .= " WHERE ";
@@ -2527,14 +2527,14 @@ class Product extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."propaldet as pd";
 		$sql .= ", ".MAIN_DB_PREFIX."propal as p";
 		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE p.rowid = pd.fk_propal";
 		$sql .= " AND p.fk_soc = s.rowid";
 		$sql .= " AND p.entity IN (".getEntity('propal').")";
 		$sql .= " AND pd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		//$sql.= " AND pr.fk_statut != 0";
@@ -2593,23 +2593,26 @@ class Product extends CommonObject
 	public function load_stats_proposal_supplier($socid = 0)
 	{
 		// phpcs:enable
-		global $conf, $user, $hookmanager;
+		global $conf, $user, $hookmanager, $action;
 
 		$sql = "SELECT COUNT(DISTINCT p.fk_soc) as nb_suppliers, COUNT(DISTINCT p.rowid) as nb,";
 		$sql .= " COUNT(pd.rowid) as nb_rows, SUM(pd.qty) as qty";
 		$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as pd";
 		$sql .= ", ".MAIN_DB_PREFIX."supplier_proposal as p";
 		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$socid) { $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (empty($user->rights->societe->client->voir) && !$socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE p.rowid = pd.fk_supplier_proposal";
 		$sql .= " AND p.fk_soc = s.rowid";
 		$sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
 		$sql .= " AND pd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid) { $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		if (empty($user->rights->societe->client->voir) && !$socid) {
+			$sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		//$sql.= " AND pr.fk_statut != 0";
-		if ($socid > 0) {    $sql .= " AND p.fk_soc = ".$socid;
+		if ($socid > 0) {
+			$sql .= " AND p.fk_soc = ".$socid;
 		}
 
 		$result = $this->db->query($sql);
@@ -2665,7 +2668,7 @@ class Product extends CommonObject
 			$sql .= " AND c.fk_soc = ".$socid;
 		}
 		if ($filtrestatut <> '') {
-			$sql .= " AND c.fk_statut in (".$filtrestatut.")";
+			$sql .= " AND c.fk_statut in (".$this->db->sanitize($filtrestatut).")";
 		}
 
 		$result = $this->db->query($sql);
@@ -2744,28 +2747,28 @@ class Product extends CommonObject
 	public function load_stats_commande_fournisseur($socid = 0, $filtrestatut = '', $forVirtualStock = 0)
 	{
 		// phpcs:enable
-		global $conf, $user, $hookmanager;
+		global $conf, $user, $hookmanager, $action;
 
 		$sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_suppliers, COUNT(DISTINCT c.rowid) as nb,";
 		$sql .= " COUNT(cd.rowid) as nb_rows, SUM(cd.qty) as qty";
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd";
 		$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
 		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
+		if (empty($user->rights->societe->client->voir) && !$socid && !$forVirtualStock) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE c.rowid = cd.fk_commande";
 		$sql .= " AND c.fk_soc = s.rowid";
 		$sql .= " AND c.entity IN (".getEntity($forVirtualStock && !empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'supplier_order').")";
 		$sql .= " AND cd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
+		if (empty($user->rights->societe->client->voir) && !$socid && !$forVirtualStock) {
 			$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		if ($socid > 0) {
 			$sql .= " AND c.fk_soc = ".$socid;
 		}
 		if ($filtrestatut != '') {
-			$sql .= " AND c.fk_statut in (".$filtrestatut.")"; // Peut valoir 0
+			$sql .= " AND c.fk_statut in (".$this->db->sanitize($filtrestatut).")"; // Peut valoir 0
 		}
 
 		$result = $this->db->query($sql);
@@ -2809,7 +2812,7 @@ class Product extends CommonObject
 		$sql .= ", ".MAIN_DB_PREFIX."commande as c";
 		$sql .= ", ".MAIN_DB_PREFIX."expedition as e";
 		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
+		if (empty($user->rights->societe->client->voir) && !$socid && !$forVirtualStock) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE e.rowid = ed.fk_expedition";
@@ -2818,16 +2821,16 @@ class Product extends CommonObject
 		$sql .= " AND e.entity IN (".getEntity($forVirtualStock && !empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'expedition').")";
 		$sql .= " AND ed.fk_origin_line = cd.rowid";
 		$sql .= " AND cd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
+		if (empty($user->rights->societe->client->voir) && !$socid && !$forVirtualStock) {
 			$sql .= " AND e.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		if ($socid > 0) {
 			$sql .= " AND e.fk_soc = ".$socid;
 		}
 		if ($filtrestatut <> '') {
-			$sql .= " AND c.fk_statut in (".$filtrestatut.")";
+			$sql .= " AND c.fk_statut IN (".$this->db->sanitize($filtrestatut).")";
 		}
-		if (!empty($filterShipmentStatus)) $sql .= " AND e.fk_statut IN (".$filterShipmentStatus.")";
+		if (!empty($filterShipmentStatus)) $sql .= " AND e.fk_statut IN (".$this->db->sanitize($filterShipmentStatus).")";
 
 		$result = $this->db->query($sql);
 		if ($result) {
@@ -2881,24 +2884,28 @@ class Product extends CommonObject
 	public function load_stats_reception($socid = 0, $filtrestatut = '', $forVirtualStock = 0)
 	{
 		// phpcs:enable
-		global $conf, $user, $hookmanager;
+		global $conf, $user, $hookmanager, $action;
 
 		$sql = "SELECT COUNT(DISTINCT cf.fk_soc) as nb_suppliers, COUNT(DISTINCT cf.rowid) as nb,";
 		$sql .= " COUNT(fd.rowid) as nb_rows, SUM(fd.qty) as qty";
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as fd";
 		$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as cf";
 		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) { $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (empty($user->rights->societe->client->voir) && !$socid && !$forVirtualStock) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE cf.rowid = fd.fk_commande";
 		$sql .= " AND cf.fk_soc = s.rowid";
 		$sql .= " AND cf.entity IN (".getEntity($forVirtualStock && !empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'supplier_order').")";
 		$sql .= " AND fd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) { $sql .= " AND cf.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		if (empty($user->rights->societe->client->voir) && !$socid && !$forVirtualStock) {
+			$sql .= " AND cf.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
-		if ($socid > 0) {    $sql .= " AND cf.fk_soc = ".$socid;
+		if ($socid > 0) {
+			$sql .= " AND cf.fk_soc = ".$socid;
 		}
-		if ($filtrestatut <> '') { $sql .= " AND cf.fk_statut in (".$filtrestatut.")";
+		if ($filtrestatut <> '') {
+			$sql .= " AND cf.fk_statut IN (".$this->db->sanitize($filtrestatut).")";
 		}
 
 		$result = $this->db->query($sql);
@@ -2939,20 +2946,20 @@ class Product extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."mrp_production as mp";
 		$sql .= ", ".MAIN_DB_PREFIX."mrp_mo as m";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = m.fk_soc";
-		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
+		if (empty($user->rights->societe->client->voir) && !$socid && !$forVirtualStock) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE m.rowid = mp.fk_mo";
 		$sql .= " AND m.entity IN (".getEntity($forVirtualStock && !empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'mrp').")";
 		$sql .= " AND mp.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
+		if (empty($user->rights->societe->client->voir) && !$socid && !$forVirtualStock) {
 			$sql .= " AND m.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		if ($socid > 0) {
 			$sql .= " AND m.fk_soc = ".$socid;
 		}
 		if ($filtrestatut <> '') {
-			$sql .= " AND m.status in (".$filtrestatut.")";
+			$sql .= " AND m.status IN (".$this->db->sanitize($filtrestatut).")";
 		}
 		$sql .= " GROUP BY role";
 
@@ -3026,14 +3033,14 @@ class Product extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
 		$sql .= ", ".MAIN_DB_PREFIX."contrat as c";
 		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE c.rowid = cd.fk_contrat";
 		$sql .= " AND c.fk_soc = s.rowid";
 		$sql .= " AND c.entity IN (".getEntity('contract').")";
 		$sql .= " AND cd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		//$sql.= " AND c.statut != 0";
@@ -3098,14 +3105,14 @@ class Product extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
 		$sql .= ", ".MAIN_DB_PREFIX."facture as f";
 		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE f.rowid = fd.fk_facture";
 		$sql .= " AND f.fk_soc = s.rowid";
 		$sql .= " AND f.entity IN (".getEntity('invoice').")";
 		$sql .= " AND fd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		//$sql.= " AND f.fk_statut != 0";
@@ -3163,21 +3170,21 @@ class Product extends CommonObject
 	public function load_stats_facture_fournisseur($socid = 0)
 	{
 		// phpcs:enable
-		global $conf, $user, $hookmanager;
+		global $conf, $user, $hookmanager, $action;
 
 		$sql = "SELECT COUNT(DISTINCT f.fk_soc) as nb_suppliers, COUNT(DISTINCT f.rowid) as nb,";
 		$sql .= " COUNT(fd.rowid) as nb_rows, SUM(fd.qty) as qty";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as fd";
 		$sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
 		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE f.rowid = fd.fk_facture_fourn";
 		$sql .= " AND f.fk_soc = s.rowid";
 		$sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
 		$sql .= " AND fd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		//$sql.= " AND f.fk_statut != 0";
@@ -3302,7 +3309,7 @@ class Product extends CommonObject
 		if ($filteronproducttype >= 0) {
 			$sql .= ", ".MAIN_DB_PREFIX."product as p";
 		}
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE f.rowid = d.fk_facture";
@@ -3312,11 +3319,11 @@ class Product extends CommonObject
 			$sql .= " AND d.fk_product > 0";
 		}
 		if ($filteronproducttype >= 0) {
-			$sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
+			$sql .= " AND p.rowid = d.fk_product AND p.fk_product_type = ".((int) $filteronproducttype);
 		}
 		$sql .= " AND f.fk_soc = s.rowid";
 		$sql .= " AND f.entity IN (".getEntity('invoice').")";
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		if ($socid > 0) {
@@ -3355,7 +3362,7 @@ class Product extends CommonObject
 		if ($filteronproducttype >= 0) {
 			$sql .= ", ".MAIN_DB_PREFIX."product as p";
 		}
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE f.rowid = d.fk_facture_fourn";
@@ -3365,11 +3372,11 @@ class Product extends CommonObject
 			$sql .= " AND d.fk_product > 0";
 		}
 		if ($filteronproducttype >= 0) {
-			$sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
+			$sql .= " AND p.rowid = d.fk_product AND p.fk_product_type = ".((int) $filteronproducttype);
 		}
 		$sql .= " AND f.fk_soc = s.rowid";
 		$sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		if ($socid > 0) {
@@ -3406,7 +3413,7 @@ class Product extends CommonObject
 		if ($filteronproducttype >= 0) {
 			$sql .= ", ".MAIN_DB_PREFIX."product as prod";
 		}
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE p.rowid = d.fk_propal";
@@ -3416,11 +3423,11 @@ class Product extends CommonObject
 			$sql .= " AND d.fk_product > 0";
 		}
 		if ($filteronproducttype >= 0) {
-			$sql .= " AND prod.rowid = d.fk_product AND prod.fk_product_type =".$filteronproducttype;
+			$sql .= " AND prod.rowid = d.fk_product AND prod.fk_product_type = ".((int) $filteronproducttype);
 		}
 		$sql .= " AND p.fk_soc = s.rowid";
 		$sql .= " AND p.entity IN (".getEntity('propal').")";
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		if ($socid > 0) {
@@ -3458,7 +3465,7 @@ class Product extends CommonObject
 		if ($filteronproducttype >= 0) {
 			$sql .= ", ".MAIN_DB_PREFIX."product as prod";
 		}
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE p.rowid = d.fk_supplier_proposal";
@@ -3468,11 +3475,11 @@ class Product extends CommonObject
 			$sql .= " AND d.fk_product > 0";
 		}
 		if ($filteronproducttype >= 0) {
-			$sql .= " AND prod.rowid = d.fk_product AND prod.fk_product_type =".$filteronproducttype;
+			$sql .= " AND prod.rowid = d.fk_product AND prod.fk_product_type = ".((int) $filteronproducttype);
 		}
 		$sql .= " AND p.fk_soc = s.rowid";
 		$sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		if ($socid > 0) {
@@ -3509,7 +3516,7 @@ class Product extends CommonObject
 		if ($filteronproducttype >= 0) {
 			$sql .= ", ".MAIN_DB_PREFIX."product as p";
 		}
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE c.rowid = d.fk_commande";
@@ -3519,11 +3526,11 @@ class Product extends CommonObject
 			$sql .= " AND d.fk_product > 0";
 		}
 		if ($filteronproducttype >= 0) {
-			$sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
+			$sql .= " AND p.rowid = d.fk_product AND p.fk_product_type = ".((int) $filteronproducttype);
 		}
 		$sql .= " AND c.fk_soc = s.rowid";
 		$sql .= " AND c.entity IN (".getEntity('commande').")";
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		if ($socid > 0) {
@@ -3560,7 +3567,7 @@ class Product extends CommonObject
 		if ($filteronproducttype >= 0) {
 			$sql .= ", ".MAIN_DB_PREFIX."product as p";
 		}
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE c.rowid = d.fk_commande";
@@ -3570,11 +3577,11 @@ class Product extends CommonObject
 			$sql .= " AND d.fk_product > 0";
 		}
 		if ($filteronproducttype >= 0) {
-			$sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
+			$sql .= " AND p.rowid = d.fk_product AND p.fk_product_type = ".((int) $filteronproducttype);
 		}
 		$sql .= " AND c.fk_soc = s.rowid";
 		$sql .= " AND c.entity IN (".getEntity('supplier_order').")";
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		if ($socid > 0) {
@@ -3611,7 +3618,7 @@ class Product extends CommonObject
 		if ($filteronproducttype >= 0) {
 			$sql .= ", ".MAIN_DB_PREFIX."product as p";
 		}
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 
@@ -3624,11 +3631,11 @@ class Product extends CommonObject
 			$sql .= " AND d.fk_product > 0";
 		}
 		if ($filteronproducttype >= 0) {
-			$sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
+			$sql .= " AND p.rowid = d.fk_product AND p.fk_product_type = ".((int) $filteronproducttype);
 		}
 		$sql .= " AND c.fk_soc = s.rowid";
 
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		if ($socid > 0) {
@@ -3665,7 +3672,7 @@ class Product extends CommonObject
 		if ($filteronproducttype >= 0) {
 			$sql .= ", ".MAIN_DB_PREFIX."product as p";
 		}
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 
@@ -3678,10 +3685,10 @@ class Product extends CommonObject
 			$sql .= " AND d.fk_product > 0";
 		}
 		if ($filteronproducttype >= 0) {
-			$sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
+			$sql .= " AND p.rowid = d.fk_product AND p.fk_product_type = ".((int) $filteronproducttype);
 		}
 
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= " AND d.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		if ($socid > 0) {

From 26791714cee70a00bc05243c49645c0d47ee4cff Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 28 Dec 2020 03:07:33 +0100
Subject: [PATCH 657/888] Fix : Introduce constant
 ACCOUNTANCY_SHOW_OPENING_BALANCE

---
 htdocs/accountancy/bookkeeping/balance.php | 76 +++++++++++++---------
 1 file changed, 47 insertions(+), 29 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 961a012f396..b71c633b1e5 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -237,7 +237,8 @@ if ($action != 'export_csv')
 	print '<table class="liste '.($moreforfilter ? "listwithfilterbefore" : "").'">';
 
 	print '<tr class="liste_titre_filter">';
-	print '<td class="liste_titre" colspan="5">';
+	$colspan = (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE) ? 6 : 5);
+	print '<td class="liste_titre" colspan="'.$colspan.'">';
 	print $langs->trans('From');
 	print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, '');
 	print ' ';
@@ -254,7 +255,7 @@ if ($action != 'export_csv')
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("AccountAccounting", $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
 	print_liste_field_titre("Label", $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
-	// print_liste_field_titre("OpeningBalance", $_SERVER['PHP_SELF'], "", $param, "", 'class="right"', $sortfield, $sortorder);
+	if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) print_liste_field_titre("OpeningBalance", $_SERVER['PHP_SELF'], "", $param, "", 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre("Debit", $_SERVER['PHP_SELF'], "t.debit", "", $param, 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $param, 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre("Balance", $_SERVER["PHP_SELF"], "", $param, "", 'class="right"', $sortfield, $sortorder);
@@ -265,27 +266,29 @@ if ($action != 'export_csv')
 	$total_credit = 0;
 	$sous_total_debit = 0;
 	$sous_total_credit = 0;
-	// $total_opening_balance = 0;
-	// $sous_total_opening_balance = 0;
+	if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
+		$total_opening_balance = 0;
+		$sous_total_opening_balance = 0;
+	}
 	$displayed_account = "";
 
 	// TODO Debug - In French accounting, this functionality is dangerous, it takes all the entries and adds all the accounts
 	// without time and class limits (Class 6 and 7 accounts ???) and does not take into account the "a-nouveau" journal.
-	/*
-	$sql = "SELECT t.numero_compte, (SUM(t.debit) - SUM(t.credit)) as opening_balance";
-	$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as t";
-	$sql .= " WHERE t.entity = ".$conf->entity;		// Never do sharing into accounting features
-	$sql .= " AND t.doc_date < '".$db->idate($search_date_start)."'";
-	$sql .= " GROUP BY t.numero_compte";
+	if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
+		$sql = "SELECT t.numero_compte, (SUM(t.debit) - SUM(t.credit)) as opening_balance";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as t";
+		$sql .= " WHERE t.entity = " . $conf->entity;        // Never do sharing into accounting features
+		$sql .= " AND t.doc_date < '" . $db->idate($search_date_start) . "'";
+		$sql .= " GROUP BY t.numero_compte";
 
-	$resql = $db->query($sql);
-	$nrows = $resql->num_rows;
-	$opening_balances = array();
-	for ($i = 0; $i < $nrows; $i++) {
-		$arr = $resql->fetch_array();
-		$opening_balances["'".$arr['numero_compte']."'"] = $arr['opening_balance'];
+		$resql = $db->query($sql);
+		$nrows = $resql->num_rows;
+		$opening_balances = array();
+		for ($i = 0; $i < $nrows; $i++) {
+			$arr = $resql->fetch_array();
+			$opening_balances["'" . $arr['numero_compte'] . "'"] = $arr['opening_balance'];
+		}
 	}
-	*/
 
 	foreach ($object->lines as $line)
 	{
@@ -294,8 +297,10 @@ if ($action != 'export_csv')
 		$total_credit += $line->credit;
 		$description = $object->get_compte_desc($line->numero_compte); // Search description of the account
 		$root_account_description = $object->get_compte_racine($line->numero_compte);
-		// $opening_balance = isset($opening_balances["'".$line->numero_compte."'"]) ? $opening_balances["'".$line->numero_compte."'"] : 0;
-		// $total_opening_balance += $opening_balance;
+		if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
+			$opening_balance = isset($opening_balances["'".$line->numero_compte."'"]) ? $opening_balances["'".$line->numero_compte."'"] : 0;
+			$total_opening_balance += $opening_balance;
+		}
 		if (empty($description)) {
 			$link = '<a href="'.DOL_URL_ROOT.'/accountancy/admin/card.php?action=create&accountingaccount='.length_accountg($line->numero_compte).'">'.img_edit_add().'</a>';
 		}
@@ -307,7 +312,7 @@ if ($action != 'export_csv')
 			// Display a sub-total per account
 			if ($displayed_account != "") {
 				print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("SubTotal").':</td>';
-				// print '<td class="nowrap right">'.price($sous_total_opening_balance).'</td>';
+				if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) print '<td class="nowrap right">'.price($sous_total_opening_balance).'</td>';
 				print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
 				print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
 				print '<td class="nowrap right">'.price(price2num($sous_total_credit - $sous_total_debit)).'</td>';
@@ -317,23 +322,28 @@ if ($action != 'export_csv')
 
 			// Show first line of a break
 			print '<tr class="trforbreak">';
-			print '<td colspan="6" style="font-weight:bold; border-bottom: 1pt solid black;">'.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').'</td>';
+			$colspan = (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE) ? 7 : 6);
+			print '<td colspan="'.$colspan.'" style="font-weight:bold; border-bottom: 1pt solid black;">'.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').'</td>';
 			print '</tr>';
 
 			$displayed_account = $root_account_description;
 			$sous_total_debit = 0;
 			$sous_total_credit = 0;
-			// $sous_total_opening_balance = 0;
+			if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) $sous_total_opening_balance = 0;
 		}
 
 		// $object->get_compte_racine($line->numero_compte);
 
 		print '<td>'.length_accountg($line->numero_compte).'</td>';
 		print '<td>'.$description.'</td>';
-		// print '<td class="nowraponall right">'.price($opening_balance).'</td>';
+		if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) print '<td class="nowraponall right">'.price($opening_balance).'</td>';
 		print '<td class="nowraponall right">'.price($line->debit).'</td>';
 		print '<td class="nowraponall right">'.price($line->credit).'</td>';
-		print '<td class="nowraponall right">'.price(/*$opening_balance +*/ $line->debit - $line->credit).'</td>';
+		if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
+			print '<td class="nowraponall right">'.price($opening_balance + $line->debit - $line->credit).'</td>';
+		} else {
+			print '<td class="nowraponall right">'.price($line->debit - $line->credit).'</td>';
+		}
 		print '<td class="center">'.$link;
 		print '</td>';
 		print "</tr>\n";
@@ -341,22 +351,30 @@ if ($action != 'export_csv')
 		// Records the sub-total
 		$sous_total_debit += $line->debit;
 		$sous_total_credit += $line->credit;
-		// $sous_total_opening_balance += $opening_balance;
+		if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) $sous_total_opening_balance += $opening_balance;
 	}
 
 	print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("SubTotal").':</td>';
-	// print '<td class="nowrap right">'.price($sous_total_opening_balance).'</td>';
+	if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) print '<td class="nowrap right">'.price($sous_total_opening_balance).'</td>';
 	print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
 	print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
-	print '<td class="nowrap right">'.price(price2num(/*$sous_total_opening_balance +*/ $sous_total_debit - $sous_total_credit, 'MT')).'</td>';
+	if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
+		print '<td class="nowrap right">' . price(price2num($sous_total_opening_balance + $sous_total_debit - $sous_total_credit, 'MT')) . '</td>';
+	} else {
+		print '<td class="nowrap right">' . price(price2num($sous_total_debit - $sous_total_credit, 'MT')) . '</td>';
+	}
 	print "<td>&nbsp;</td>\n";
 	print '</tr>';
 
 	print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("AccountBalance").':</td>';
-	// print '<td class="nowrap right">'.price($total_opening_balance).'</td>';
+	if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) print '<td class="nowrap right">'.price($total_opening_balance).'</td>';
 	print '<td class="nowrap right">'.price($total_debit).'</td>';
 	print '<td class="nowrap right">'.price($total_credit).'</td>';
-	print '<td class="nowrap right">'.price(price2num(/*$total_opening_balance +*/ $total_debit - $total_credit, 'MT')).'</td>';
+	if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
+		print '<td class="nowrap right">' . price(price2num($total_opening_balance + $total_debit - $total_credit, 'MT')) . '</td>';
+	} else {
+		print '<td class="nowrap right">' . price(price2num($total_debit - $total_credit, 'MT')) . '</td>';
+	}
 	print "<td>&nbsp;</td>\n";
 	print '</tr>';
 

From 5001cfce71cb5c6036c6df4ca8bce8974caf0cb1 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 28 Dec 2020 04:12:23 +0100
Subject: [PATCH 658/888] NEW: Accountancy - Format FEC - Add new field
 DateLimitReglmt

---
 .../class/accountancyexport.class.php         | 38 ++++++++++++-------
 .../tables/llx_accounting_bookkeeping.sql     |  2 +-
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 1bcc4129821..201e3cac95a 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -840,17 +840,19 @@ class AccountancyExport
 		print "DateLet".$separator;
 		print "ValidDate".$separator;
 		print "Montantdevise".$separator;
-		print "Idevise";
+		print "Idevise".$separator;
+		print "DateLimitReglmt";
 		print $end_line;
 
 		foreach ($objectLines as $line) {
-			if ($line->debit == 0 && $line->credit == 0) {
+            if ($line->debit == 0 && $line->credit == 0) {
                 unset($array[$line]);
             } else {
-				$date_creation = dol_print_date($line->date_creation, '%Y%m%d');
-				$date_document = dol_print_date($line->doc_date, '%Y%m%d');
-				$date_lettering = dol_print_date($line->date_lettering, '%Y%m%d');
-				$date_validation = dol_print_date($line->date_validated, '%Y%m%d');
+                $date_creation = dol_print_date($line->date_creation, '%Y%m%d');
+                $date_document = dol_print_date($line->doc_date, '%Y%m%d');
+                $date_lettering = dol_print_date($line->date_lettering, '%Y%m%d');
+                $date_validation = dol_print_date($line->date_validated, '%Y%m%d');
+                $date_limit_payment = dol_print_date($line->date_lim_reglement, '%Y%m%d');
 
 				// FEC:JournalCode
 				print $line->code_journal.$separator;
@@ -865,13 +867,13 @@ class AccountancyExport
 				print $date_document.$separator;
 
 				// FEC:CompteNum
-				print $line->numero_compte.$separator;
+				print length_accountg($line->numero_compte).$separator;
 
 				// FEC:CompteLib
 				print dol_string_unaccent($line->label_compte).$separator;
 
 				// FEC:CompAuxNum
-				print $line->subledger_account.$separator;
+				print length_accounta($line->subledger_account).$separator;
 
 				// FEC:CompAuxLib
 				print dol_string_unaccent($line->subledger_label).$separator;
@@ -880,7 +882,7 @@ class AccountancyExport
 				print $line->doc_ref.$separator;
 
 				// FEC:PieceDate
-				print dol_string_unaccent($date_creation).$separator;
+				print $date_creation.$separator;
 
 				// FEC:EcritureLib
 				print dol_string_unaccent($line->label_operation).$separator;
@@ -904,7 +906,10 @@ class AccountancyExport
 				print $line->multicurrency_amount.$separator;
 
 				// FEC:Idevise
-				print $line->multicurrency_code;
+				print $line->multicurrency_code.$separator;
+
+				// FEC_suppl:DateLimitReglmt
+				print $date_limit_payment;
 
 				print $end_line;
 			}
@@ -939,7 +944,8 @@ class AccountancyExport
 		print "DateLet".$separator;
 		print "ValidDate".$separator;
 		print "Montantdevise".$separator;
-		print "Idevise";
+		print "Idevise".$separator;
+		print "DateLimitReglmt";
 		print $end_line;
 
 		foreach ($objectLines as $line) {
@@ -950,6 +956,7 @@ class AccountancyExport
 				$date_document = dol_print_date($line->doc_date, '%Y%m%d');
 				$date_lettering = dol_print_date($line->date_lettering, '%Y%m%d');
 				$date_validation = dol_print_date($line->date_validated, '%Y%m%d');
+				$date_limit_payment = dol_print_date($line->date_lim_reglement, '%Y%m%d');
 
 				// FEC:JournalCode
 				print $line->code_journal . $separator;
@@ -964,13 +971,13 @@ class AccountancyExport
 				print $date_creation . $separator;
 
 				// FEC:CompteNum
-				print $line->numero_compte . $separator;
+				print length_accountg($line->numero_compte) . $separator;
 
 				// FEC:CompteLib
 				print dol_string_unaccent($line->label_compte) . $separator;
 
 				// FEC:CompAuxNum
-				print $line->subledger_account . $separator;
+				print length_accounta($line->subledger_account) . $separator;
 
 				// FEC:CompAuxLib
 				print dol_string_unaccent($line->subledger_label) . $separator;
@@ -1003,7 +1010,10 @@ class AccountancyExport
 				print $line->multicurrency_amount . $separator;
 
 				// FEC:Idevise
-				print $line->multicurrency_code;
+				print $line->multicurrency_code . $separator;
+
+				// FEC_suppl:DateLimitReglmt
+				print $date_limit_payment;
 
 				print $end_line;
 			}
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
index 23e7d489e09..3a612623298 100644
--- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
@@ -41,7 +41,7 @@ CREATE TABLE llx_accounting_bookkeeping
   multicurrency_code    varchar(255),				-- FEC:Idevise
   lettering_code        varchar(255),				-- FEC:EcritureLet
   date_lettering        datetime,					-- FEC:DateLet
-  date_lim_reglement    datetime DEFAULT NULL,		-- 					| date limite de reglement
+  date_lim_reglement    datetime DEFAULT NULL,		-- FEC_suppl:DateLimitReglmt    | payment deadline
   fk_user_author        integer NOT NULL,			-- 					| user creating
   fk_user_modif         integer,					-- 					| user making last change
   date_creation         datetime,					-- FEC:EcritureDate	| creation date

From cec96b33aeb4bc21e2118048aac3ee2fa804166b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 28 Dec 2020 12:30:59 +0100
Subject: [PATCH 659/888] Fix warning

---
 htdocs/core/lib/ws.lib.php                    |  2 +-
 htdocs/webservices/server_invoice.php         | 24 ++++++++-----------
 htdocs/webservices/server_order.php           | 14 +++++------
 htdocs/webservices/server_other.php           |  9 +++----
 htdocs/webservices/server_payment.php         |  5 ++--
 .../webservices/server_productorservice.php   | 16 ++++++-------
 htdocs/webservices/server_project.php         |  8 +++----
 .../webservices/server_supplier_invoice.php   |  5 ++--
 htdocs/webservices/server_thirdparty.php      | 22 ++++++++---------
 htdocs/webservices/server_user.php            | 21 +++++++---------
 test/phpunit/WebservicesInvoicesTest.php      |  2 ++
 11 files changed, 59 insertions(+), 69 deletions(-)

diff --git a/htdocs/core/lib/ws.lib.php b/htdocs/core/lib/ws.lib.php
index faf1b5bc871..2545c8e5973 100644
--- a/htdocs/core/lib/ws.lib.php
+++ b/htdocs/core/lib/ws.lib.php
@@ -29,7 +29,7 @@
  *  @param	array	$authentication     Array with authentication informations ('login'=>,'password'=>,'entity'=>,'dolibarrkey'=>)
  *  @param 	int		$error				Number of errors
  *  @param  string	$errorcode			Error string code
- *  @param  string	$errorlabel		Error string label
+ *  @param  string	$errorlabel			Error string label
  *  @return User						Return user object identified by login/pass/entity into authentication array
  */
 function check_authentication($authentication, &$error, &$errorcode, &$errorlabel)
diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index 5a8e6fb241c..e1f08cbb1ca 100644
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -288,7 +288,7 @@ $server->register(
  */
 function getInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
 {
-	global $db, $conf, $langs;
+	global $db, $conf;
 
 	dol_syslog("Function: getInvoice login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
@@ -363,7 +363,7 @@ function getInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
 						'note_private' => $invoice->note_private ? $invoice->note_private : '',
 						'note_public' => $invoice->note_public ? $invoice->note_public : '',
 						'status' => $invoice->statut,
-					'project_id' => $invoic->fk_project,
+						'project_id' => $invoice->fk_project,
 						'close_code' => $invoice->close_code ? $invoice->close_code : '',
 						'close_note' => $invoice->close_note ? $invoice->close_note : '',
 						'payment_mode_id' => $invoice->mode_reglement_id ? $invoice->mode_reglement_id : '',
@@ -399,7 +399,7 @@ function getInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
  */
 function getInvoicesForThirdParty($authentication, $idthirdparty)
 {
-	global $db, $conf, $langs;
+	global $db, $conf;
 
 	dol_syslog("Function: getInvoicesForThirdParty login=".$authentication['login']." idthirdparty=".$idthirdparty);
 
@@ -482,7 +482,7 @@ function getInvoicesForThirdParty($authentication, $idthirdparty)
 						'fk_user_valid' => $invoice->user_valid ? $invoice->user_valid : '',
 						'date' => $invoice->date ?dol_print_date($invoice->date, 'dayrfc') : '',
 						'date_due' => $invoice->date_lim_reglement ?dol_print_date($invoice->date_lim_reglement, 'dayrfc') : '',
-										'date_creation' => $invoice->date_creation ?dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
+						'date_creation' => $invoice->date_creation ?dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
 						'date_validation' => $invoice->date_validation ?dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
 						'date_modification' => $invoice->datem ?dol_print_date($invoice->datem, 'dayhourrfc') : '',
 						'type' => $invoice->type,
@@ -492,7 +492,7 @@ function getInvoicesForThirdParty($authentication, $idthirdparty)
 						'note_private' => $invoice->note_private ? $invoice->note_private : '',
 						'note_public' => $invoice->note_public ? $invoice->note_public : '',
 						'status'=> $invoice->statut,
-										'project_id' => $invoic->fk_project,
+						'project_id' => $invoice->fk_project,
 						'close_code' => $invoice->close_code ? $invoice->close_code : '',
 						'close_note' => $invoice->close_note ? $invoice->close_note : '',
 						'payment_mode_id' => $invoice->mode_reglement_id ? $invoice->mode_reglement_id : '',
@@ -528,17 +528,16 @@ function getInvoicesForThirdParty($authentication, $idthirdparty)
  * Create an invoice
  *
  * @param	array		$authentication		Array of authentication information
- * @param	Facture		$invoice			Invoice
+ * @param	array		$invoice			Invoice
  * @return	array							Array result
  */
 function createInvoice($authentication, $invoice)
 {
-	global $db, $conf, $langs;
+	global $db, $conf;
 
 	$now = dol_now();
 
-	dol_syslog("Function: createInvoice login=".$authentication['login']." id=".$invoice->id.
-			", ref=".$invoice->ref.", ref_ext=".$invoice->ref_ext);
+	dol_syslog("Function: createInvoice login=".$authentication['login']." id=".$invoice['id'].", ref=".$invoice['ref'].", ref_ext=".$invoice['ref_ext']);
 
 	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
@@ -580,7 +579,7 @@ function createInvoice($authentication, $invoice)
 		if (isset($invoice['lines']['line'][0])) $arrayoflines = $invoice['lines']['line'];
 		else $arrayoflines = $invoice['lines'];
 
-		foreach ($arrayoflines as $key => $line)
+		foreach ($arrayoflines as $line)
 		{
 			// $key can be 'line' or '0','1',...
 			$newline = new FactureLigne($db);
@@ -654,10 +653,7 @@ function createInvoiceFromOrder($authentication, $id_order = '', $ref_order = ''
 {
 	global $db, $conf;
 
-	$now = dol_now();
-
-	dol_syslog("Function: createInvoiceFromOrder login=".$authentication['login']." id=".$id_order.
-			", ref=".$ref_order.", ref_ext=".$ref_ext_order);
+	dol_syslog("Function: createInvoiceFromOrder login=".$authentication['login']." id=".$id_order.", ref=".$ref_order.", ref_ext=".$ref_ext_order);
 
 	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php
index 30c105d7192..361b2a08f4a 100644
--- a/htdocs/webservices/server_order.php
+++ b/htdocs/webservices/server_order.php
@@ -354,7 +354,7 @@ $server->register(
  */
 function getOrder($authentication, $id = '', $ref = '', $ref_ext = '')
 {
-	global $db, $conf, $langs;
+	global $db, $conf;
 
 	dol_syslog("Function: getOrder login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
@@ -504,7 +504,7 @@ function getOrder($authentication, $id = '', $ref = '', $ref_ext = '')
  */
 function getOrdersForThirdParty($authentication, $idthirdparty)
 {
-	global $db, $conf, $langs;
+	global $db, $conf;
 
 	dol_syslog("Function: getOrdersForThirdParty login=".$authentication['login']." idthirdparty=".$idthirdparty);
 
@@ -707,7 +707,7 @@ function createOrder($authentication, $order)
 		$extrafields->fetch_name_optionals_label($elementtype, true);
 		if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 		{
-			foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+			foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label)
 			{
 				$key = 'options_'.$key;
 				$newobject->array_options[$key] = $order[$key];
@@ -813,7 +813,7 @@ function validOrder($authentication, $id = '', $id_warehouse = 0)
 {
 	global $db, $conf, $langs;
 
-	dol_syslog("Function: validOrder login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
+	dol_syslog("Function: validOrder login=".$authentication['login']." id=".$id." id_warehouse=".$id_warehouse);
 
 	// Init and check authentication
 	$objectresp = array();
@@ -830,7 +830,7 @@ function validOrder($authentication, $id = '', $id_warehouse = 0)
 		if ($fuser->rights->commande->lire)
 		{
 			$order = new Commande($db);
-			$result = $order->fetch($id, $ref, $ref_ext);
+			$result = $order->fetch($id);
 
 			$order->fetch_thirdparty();
 			$db->begin();
@@ -889,8 +889,6 @@ function updateOrder($authentication, $order)
 {
 	global $db, $conf, $langs;
 
-	$now = dol_now();
-
 	dol_syslog("Function: updateOrder login=".$authentication['login']);
 
 	if ($authentication['entity']) $conf->entity = $authentication['entity'];
@@ -950,7 +948,7 @@ function updateOrder($authentication, $order)
 			$extrafields->fetch_name_optionals_label($elementtype, true);
 			if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 			{
-				foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+				foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label)
 				{
 					$key = 'options_'.$key;
 					if (isset($order[$key]))
diff --git a/htdocs/webservices/server_other.php b/htdocs/webservices/server_other.php
index 71ee78d3c4d..61f53f7e275 100644
--- a/htdocs/webservices/server_other.php
+++ b/htdocs/webservices/server_other.php
@@ -145,7 +145,7 @@ $server->register(
  */
 function getVersions($authentication)
 {
-	global $db, $conf, $langs;
+	global $conf;
 
 	dol_syslog("Function: getVersions login=".$authentication['login']);
 
@@ -188,7 +188,7 @@ function getVersions($authentication)
  */
 function getDocument($authentication, $modulepart, $file, $refname = '')
 {
-	global $db, $conf, $langs, $mysoc;
+	global $db, $conf;
 
 	dol_syslog("Function: getDocument login=".$authentication['login'].' - modulepart='.$modulepart.' - file='.$file);
 
@@ -283,10 +283,7 @@ function getDocument($authentication, $modulepart, $file, $refname = '')
 		{
 			if (file_exists($original_file))
 			{
-				dol_syslog("Function: getDocument $original_file $filename content-type=$type");
-
-				$file = $fileparams['fullname'];
-				$filename = basename($file);
+				dol_syslog("Function: getDocument $original_file  content-type=$type");
 
 				$f = fopen($original_file, 'r');
 				$content_file = fread($f, filesize($original_file));
diff --git a/htdocs/webservices/server_payment.php b/htdocs/webservices/server_payment.php
index 8a9b19d76d6..3fd3868a36a 100644
--- a/htdocs/webservices/server_payment.php
+++ b/htdocs/webservices/server_payment.php
@@ -45,6 +45,7 @@ $langs->load("main");
 if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
 {
 	   $langs->load("admin");
+
 	   dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
 	   print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
 	   print $langs->trans("ToActivateModule");
@@ -139,7 +140,7 @@ $server->register(
  */
 function createPayment($authentication, $payment)
 {
-	global $db, $conf, $langs;
+	global $db, $conf;
 
 	$now = dol_now();
 
@@ -165,7 +166,7 @@ function createPayment($authentication, $payment)
 	if (!$error)
 	{
 		$soc = new Societe($db);
-		$res = $soc->fetch($payment['thirdparty_id']);
+		$soc->fetch($payment['thirdparty_id']);
 
 		$new_payment              = new Paiement($db);
 		$new_payment->amount      = doubleval($payment['amount']);
diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index bb068167b74..473a720f46a 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -438,7 +438,7 @@ function getProductOrService($authentication, $id = '', $ref = '', $ref_ext = ''
 
 				if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 				{
-					foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+					foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label)
 					{
 						$productorservice_result_fields = array_merge($productorservice_result_fields, array('options_'.$key => $product->array_options['options_'.$key]));
 					}
@@ -479,7 +479,7 @@ function getProductOrService($authentication, $id = '', $ref = '', $ref_ext = ''
  */
 function createProductOrService($authentication, $product)
 {
-	global $db, $conf, $langs;
+	global $db, $conf;
 
 	$now = dol_now();
 
@@ -650,7 +650,7 @@ function createProductOrService($authentication, $product)
  */
 function updateProductOrService($authentication, $product)
 {
-	global $db, $conf, $langs;
+	global $db, $conf;
 
 	$now = dol_now();
 
@@ -721,7 +721,7 @@ function updateProductOrService($authentication, $product)
 		$extrafields->fetch_name_optionals_label($elementtype, true);
 		if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 		{
-			foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+			foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label)
 			{
 				$key = 'options_'.$key;
 				$newobject->array_options[$key] = $product[$key];
@@ -824,7 +824,7 @@ function updateProductOrService($authentication, $product)
  */
 function deleteProductOrService($authentication, $listofidstring)
 {
-	global $db, $conf, $langs;
+	global $db, $conf;
 
 	dol_syslog("Function: deleteProductOrService login=".$authentication['login']);
 
@@ -855,7 +855,7 @@ function deleteProductOrService($authentication, $listofidstring)
 
 		$db->begin();
 
-		foreach ($listofid as $key => $id)
+		foreach ($listofid as $id)
 		{
 			$newobject = new Product($db);
 			$result = $newobject->fetch($id);
@@ -917,7 +917,7 @@ function deleteProductOrService($authentication, $listofidstring)
  */
 function getListOfProductsOrServices($authentication, $filterproduct)
 {
-	global $db, $conf, $langs;
+	global $db, $conf;
 
 	dol_syslog("Function: getListOfProductsOrServices login=".$authentication['login']);
 
@@ -1092,7 +1092,7 @@ function getProductsForCategory($authentication, $id, $lang = '')
 
 							if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 							{
-								foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+								foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label)
 								{
 									$products[$iProduct] = array_merge($products[$iProduct], array('options_'.$key => $tmpproduct->array_options['options_'.$key]));
 								}
diff --git a/htdocs/webservices/server_project.php b/htdocs/webservices/server_project.php
index 0817332c09f..8d76786df71 100644
--- a/htdocs/webservices/server_project.php
+++ b/htdocs/webservices/server_project.php
@@ -131,7 +131,7 @@ $server->wsdl->addComplexType(
 );
 
 $project_elements = array();
-foreach ($listofreferent as $key => $_)
+foreach ($listofreferent as $key => $label)
 {
 	$project_elements[$key] = array('name'=>$key, 'type'=>'tns:elementsArray');
 }
@@ -279,7 +279,7 @@ function createProject($authentication, $project)
 			$extrafields->fetch_name_optionals_label($elementtype, true);
 			if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 			{
-				foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+				foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label)
 				{
 					$key = 'options_'.$key;
 					$newobject->array_options[$key] = $project[$key];
@@ -338,7 +338,7 @@ function createProject($authentication, $project)
  */
 function getProject($authentication, $id = '', $ref = '')
 {
-	global $db, $conf, $langs;
+	global $db, $conf;
 
 	dol_syslog("Function: getProject login=".$authentication['login']." id=".$id." ref=".$ref);
 
@@ -389,7 +389,7 @@ function getProject($authentication, $id = '', $ref = '')
 				if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 				{
 					$project->fetch_optionals();
-					foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+					foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label)
 					{
 						$project_result_fields = array_merge($project_result_fields, array('options_'.$key => $project->array_options['options_'.$key]));
 					}
diff --git a/htdocs/webservices/server_supplier_invoice.php b/htdocs/webservices/server_supplier_invoice.php
index be90b60c36f..507095ac78b 100644
--- a/htdocs/webservices/server_supplier_invoice.php
+++ b/htdocs/webservices/server_supplier_invoice.php
@@ -225,7 +225,7 @@ $server->register(
  */
 function getSupplierInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
 {
-	global $db, $conf, $langs;
+	global $db, $conf;
 
 	dol_syslog("Function: getSupplierInvoice login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
@@ -333,7 +333,7 @@ function getSupplierInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
  */
 function getSupplierInvoicesForThirdParty($authentication, $idthirdparty)
 {
-	global $db, $conf, $langs;
+	global $db, $conf;
 
 	dol_syslog("Function: getSupplierInvoicesForThirdParty login=".$authentication['login']." idthirdparty=".$idthirdparty);
 
@@ -344,6 +344,7 @@ function getSupplierInvoicesForThirdParty($authentication, $idthirdparty)
 	$errorcode = ''; $errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+
 	// Check parameters
 	if (!$error && empty($idthirdparty))
 	{
diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index 5bde94cc0d5..12b2d3315c8 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -132,7 +132,7 @@ if (is_array($extrafields) && count($extrafields) > 0) {
 }
 if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 {
-	foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+	foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label)
 	{
 		//$value=$object->array_options["options_".$key];
 		$type = $extrafields->attributes[$elementtype]['type'][$key];
@@ -290,7 +290,7 @@ $server->register(
  */
 function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 {
-	global $db, $conf, $langs;
+	global $db, $conf;
 
 	dol_syslog("Function: getThirdParty login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
@@ -367,7 +367,7 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 
 				if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 				{
-					foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+					foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label)
 					{
 						$thirdparty_result_fields = array_merge($thirdparty_result_fields, array('options_'.$key => $thirdparty->array_options['options_'.$key]));
 					}
@@ -408,7 +408,7 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
  */
 function createThirdParty($authentication, $thirdparty)
 {
-	global $db, $conf, $langs;
+	global $db, $conf;
 
 	$now = dol_now();
 
@@ -483,7 +483,7 @@ function createThirdParty($authentication, $thirdparty)
 		$extrafields->fetch_name_optionals_label($elementtype, true);
 		if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 		{
-			foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+			foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label)
 			{
 				$key = 'options_'.$key;
 				$newobject->array_options[$key] = $thirdparty[$key];
@@ -538,7 +538,7 @@ function createThirdParty($authentication, $thirdparty)
  */
 function updateThirdParty($authentication, $thirdparty)
 {
-	global $db, $conf, $langs;
+	global $db, $conf;
 
 	$now = dol_now();
 
@@ -617,7 +617,7 @@ function updateThirdParty($authentication, $thirdparty)
 			$extrafields->fetch_name_optionals_label($elementtype, true);
 			if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 			{
-				foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+				foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label)
 				{
 					$key = 'options_'.$key;
 					$object->array_options[$key] = $thirdparty[$key];
@@ -672,9 +672,7 @@ function updateThirdParty($authentication, $thirdparty)
  */
 function getListOfThirdParties($authentication, $filterthirdparty)
 {
-	global $db, $conf, $langs;
-
-	$now = dol_now();
+	global $db, $conf;
 
 	dol_syslog("Function: getListOfThirdParties login=".$authentication['login']);
 
@@ -725,7 +723,7 @@ function getListOfThirdParties($authentication, $filterthirdparty)
 
 				if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 				{
-					foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+					foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label)
 					{
 						$extrafieldsOptions['options_'.$key] = $obj->{$key};
 					}
@@ -782,7 +780,7 @@ function getListOfThirdParties($authentication, $filterthirdparty)
  */
 function deleteThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 {
-	global $db, $conf, $langs;
+	global $db, $conf;
 
 	dol_syslog("Function: deleteThirdParty login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
diff --git a/htdocs/webservices/server_user.php b/htdocs/webservices/server_user.php
index 25cb2324412..8619a952ea1 100644
--- a/htdocs/webservices/server_user.php
+++ b/htdocs/webservices/server_user.php
@@ -195,7 +195,7 @@ if (is_array($extrafields) && count($extrafields) > 0) {
 }
 if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 {
-	foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+	foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label)
 	{
 		$type = $extrafields->attributes[$elementtype]['type'][$key];
 		if ($type == 'date' || $type == 'datetime') {$type = 'xsd:dateTime'; }
@@ -308,7 +308,7 @@ $server->register(
  */
 function getUser($authentication, $id, $ref = '', $ref_ext = '')
 {
-	global $db, $conf, $langs;
+	global $db, $conf;
 
 	dol_syslog("Function: getUser login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
@@ -399,9 +399,7 @@ function getUser($authentication, $id, $ref = '', $ref_ext = '')
  */
 function getListOfGroups($authentication)
 {
-	global $db, $conf, $langs;
-
-	$now = dol_now();
+	global $db, $conf;
 
 	dol_syslog("Function: getListOfGroups login=".$authentication['login']);
 
@@ -477,7 +475,7 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 {
 	global $db, $conf, $langs;
 
-	dol_syslog("Function: createUserFromThirdparty login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
+	dol_syslog("Function: createUserFromThirdparty login=".$authentication['login']);
 
 	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
@@ -601,7 +599,7 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 						$extrafields->fetch_name_optionals_label($elementtype, true);
 						if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 						{
-							foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+							foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label)
 							{
 								$key = 'contact_options_'.$key;
 								$key = substr($key, 8); // Remove 'contact_' prefix
@@ -644,7 +642,7 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 						}
 					} else {
 						$error++;
-						$errors = ($thirdparty->error ? array($thirdparty->error) : $thirdparty->errors);
+						$errorcode = join(', ', ($thirdparty->error ? array($thirdparty->error) : $thirdparty->errors));
 					}
 				}
 			} else {
@@ -662,7 +660,7 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 	{
 		$db->rollback();
 		$objectresp = array(
-		'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel)
+			'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel)
 		);
 	}
 
@@ -680,9 +678,9 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 function setUserPassword($authentication, $shortuser)
 {
 
-	global $db, $conf, $langs;
+	global $db, $conf;
 
-	dol_syslog("Function: setUserPassword login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
+	dol_syslog("Function: setUserPassword login=".$authentication['login']);
 
 	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
@@ -715,7 +713,6 @@ function setUserPassword($authentication, $shortuser)
 				{
 					$objectresp = array(
 						'result'=>array('result_code' => 'OK', 'result_label' => ''),
-						'groups'=>$arraygroups
 					);
 				}
 				else {
diff --git a/test/phpunit/WebservicesInvoicesTest.php b/test/phpunit/WebservicesInvoicesTest.php
index 650e391587b..beb3e844809 100644
--- a/test/phpunit/WebservicesInvoicesTest.php
+++ b/test/phpunit/WebservicesInvoicesTest.php
@@ -102,6 +102,8 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
     {
         global $conf,$user,$langs,$db;
 
+        $now = dol_now();
+
 		// create a third_party, needed to create an invoice
 		//
 		// The third party is created in setUpBeforeClass() and not in the

From 4b3cd947f2432d7893d1f6527d47fa9dc8b4d8e2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 28 Dec 2020 12:33:00 +0100
Subject: [PATCH 660/888] Fix name of function

---
 htdocs/admin/agenda_reminder.php  | 4 ++--
 htdocs/core/lib/functions.lib.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php
index 27c6bbeed73..36f0c572de4 100644
--- a/htdocs/admin/agenda_reminder.php
+++ b/htdocs/admin/agenda_reminder.php
@@ -187,14 +187,14 @@ print '<td class="center">&nbsp;</td>'."\n";
 print '<td class="right">'."\n";
 
 if (empty($conf->global->AGENDA_REMINDER_BROWSER)) {
-	if (! getIsHTTPS()) {
+	if (!isHTTPS()) {
 		$langs->load("errors");
 		print img_warning($langs->trans("WarningAvailableOnlyForHTTPSServers"), '', 'valignmiddle size15x').' ';
 	}
 	print '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_BROWSER&amp;token='.newToken().'">'.img_picto($langs->trans('Disabled'), 'switch_off').'</a>';
 	print '</td></tr>'."\n";
 } else {
-	if (! getIsHTTPS()) {
+	if (!isHTTPS()) {
 		$langs->load("errors");
 		print img_warning($langs->trans("WarningAvailableOnlyForHTTPSServers"), '', 'valignmiddle size15x').' ';
 	}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 884d8eac496..33a09f541c6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2909,7 +2909,7 @@ function getUserRemoteIP()
  *
  * @return	boolean		True if user is using HTTPS
  */
-function getIsHTTPS()
+function isHTTPS()
 {
 	$isSecure = false;
 	if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {

From 7c3688c66f67e46802ad47adaf5da4b91c73c431 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 28 Dec 2020 12:36:36 +0100
Subject: [PATCH 661/888] Fix var not defined

---
 htdocs/comm/mailing/cibles.php              | 2 +-
 htdocs/comm/mailing/class/mailing.class.php | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 81f64ef6016..6d9587961c6 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -499,7 +499,7 @@ if ($object->fetch($id) >= 0)
 
 	    // Fix/update nbemail on emailing record if it differs (may happen if user edit lines from database directly)
 	    if (empty($asearchcriteriahasbeenset)) {
-	    	if ($nbtotalofrecords != $object->email) {
+	    	if ($nbtotalofrecords != $object->nbemail) {
 	    		dol_syslog("We found a difference in nb of record in target table and the property ->nbemail, we fix ->nbemail");
 	    		//print "nbemail=".$object->nbemail." nbtotalofrecords=".$nbtotalofrecords;
 	    		$resultrefresh = $object->refreshNbOfTargets();
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 17b5a779617..873dae1464a 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -603,12 +603,15 @@ class Mailing extends CommonObject
 				if (! $resqlupdate) {
 					$this->error = $this->db->lasterror();
 					return -1;
+				} else {
+					$this->nbemail = (int) $nbforupdate;
 				}
 			}
 		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
+
 		return 1;
 	}
 

From 8b696ced3bf5474c7f927e33054a9543e790b78b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 28 Dec 2020 12:38:33 +0100
Subject: [PATCH 662/888] Clean code

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

diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index f9f1c3b99ef..7cd38233eb3 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -129,7 +129,7 @@ class Notify
 
 		if (is_array($listofnotiftodo)) {
 			$i = 0;
-			foreach ($listofnotiftodo as $key => $val) {
+			foreach ($listofnotiftodo as $val) {
 				if ($i) {
 					$texte .= ', ';
 				} else {

From b7cd27e76a5d03be44fece88d7f91ba99660d328 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 28 Dec 2020 12:42:55 +0100
Subject: [PATCH 663/888] Fix warning

---
 htdocs/webservices/server_invoice.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index e1f08cbb1ca..15db912ff47 100644
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -585,16 +585,16 @@ function createInvoice($authentication, $invoice)
 			$newline = new FactureLigne($db);
 			$newline->product_type = $line['type'];
 			$newline->desc = $line['desc'];
-			$newline->fk_product = $line['fk_product'];
-			$newline->tva_tx = $line['vat_rate'];
+			$newline->fk_product = $line['product_id'];
+			$newline->tva_tx = isset($line['vat_rate']) ? $line['vat_rate'] : 0;
 			$newline->qty = $line['qty'];
-			$newline->subprice = $line['unitprice'];
+			$newline->subprice = isset($line['unitprice']) ? $line['unitprice'] : null;
 			$newline->total_ht = $line['total_net'];
 			$newline->total_tva = $line['total_vat'];
 			$newline->total_ttc = $line['total'];
 			$newline->date_start = dol_stringtotime($line['date_start']);
 			$newline->date_end = dol_stringtotime($line['date_end']);
-			$newline->fk_product = $line['product_id'];
+
 			$new_invoice->lines[] = $newline;
 		}
 		//var_dump($newobject->date_lim_reglement); exit;

From d4a19e5968427457a0f1132da545da422e1e7e81 Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Mon, 28 Dec 2020 16:20:59 +0100
Subject: [PATCH 664/888] NEW add total margin in invoice list

---
 htdocs/compta/facture/list.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index c61bfdf6819..a1bde7e4f3d 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -1584,6 +1584,8 @@ if ($resql)
 			{
 				print '<td class="right nowrap">'.price($marginInfo['total_margin']).'</td>';
 				if (!$i) $totalarray['nbfield']++;
+				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'total_margin';
+				$totalarray['val']['total_margin'] += $marginInfo['total_margin'];
 			}
 			// Total margin rate
 			if (!empty($arrayfields['total_margin_rate']['checked']))

From 9b3bbb723db84615e93fefe0decf51ea09679b95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Mon, 28 Dec 2020 20:37:33 +0100
Subject: [PATCH 665/888] remove warnings

---
 .../webservices/server_productorservice.php   | 410 ++++++++----------
 1 file changed, 189 insertions(+), 221 deletions(-)

diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index bb068167b74..ddd52b9ded3 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2006-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2012      JF FERRY             <jfefe@aternatik.fr>
+ * Copyright (C) 2020		Frédéric 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
@@ -23,7 +24,9 @@
  *       \brief      File that is entry point to call Dolibarr WebServices
  */
 
-if (!defined("NOCSRFCHECK"))    define("NOCSRFCHECK", '1');
+if (!defined("NOCSRFCHECK")) {
+	define("NOCSRFCHECK", '1');
+}
 
 require '../master.inc.php';
 require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP
@@ -42,8 +45,7 @@ dol_syslog("Call Dolibarr webservices interfaces");
 $langs->load("main");
 
 // Enable and test if module web services is enabled
-if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
-{
+if (empty($conf->global->MAIN_MODULE_WEBSERVICES)) {
 	$langs->load("admin");
 	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
 	print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
@@ -142,19 +144,22 @@ $extrafield_array = null;
 if (is_array($extrafields) && count($extrafields) > 0) {
 	$extrafield_array = array();
 }
-if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
-{
-	foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
-	{
+if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label'])) {
+	foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label) {
 		$type = $extrafields->attributes[$elementtype]['type'][$key];
-		if ($type == 'date' || $type == 'datetime') {$type = 'xsd:dateTime'; }
-		else {$type = 'xsd:string'; }
+		if ($type == 'date' || $type == 'datetime') {
+			$type = 'xsd:dateTime';
+		} else {
+			$type = 'xsd:string';
+		}
 
 		$extrafield_array['options_'.$key] = array('name'=>'options_'.$key, 'type'=>$type);
 	}
 }
 
-if (is_array($extrafield_array)) $productorservice_fields = array_merge($productorservice_fields, $extrafield_array);
+if (is_array($extrafield_array)) {
+	$productorservice_fields = array_merge($productorservice_fields, $extrafield_array);
+}
 
 // Define other specific objects
 $server->wsdl->addComplexType(
@@ -236,7 +241,6 @@ $server->wsdl->addComplexType(
 );
 
 
-
 // 5 styles: RPC/encoded, RPC/literal, Document/encoded (not WS-I compliant), Document/literal, Document/literal wrapped
 // Style merely dictates how to translate a WSDL binding to a SOAP message. Nothing more. You can use either style with any programming model.
 // http://www.ibm.com/developerworks/webservices/library/ws-whichwsdl/
@@ -349,44 +353,49 @@ function getProductOrService($authentication, $id = '', $ref = '', $ref_ext = ''
 	$langcode = ($lang ? $lang : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
 	$langs->setDefaultLang($langcode);
 
-	if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity = $authentication['entity'];
+	}
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	// Check parameters
-	if (!$error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
-	{
+	if (!$error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext))) {
 		$error++;
 		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$langcode = ($lang ? $lang : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
 		$langs->setDefaultLang($langcode);
 
 		$fuser->getrights();
 
 		$nbmax = 10;
-		if ($fuser->rights->produit->lire || $fuser->rights->service->lire)
-		{
+		if ($fuser->rights->produit->lire || $fuser->rights->service->lire) {
 			$product = new Product($db);
 			$result = $product->fetch($id, $ref, $ref_ext);
 
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$product->load_stock();
 
 				$dir = (!empty($conf->product->dir_output) ? $conf->product->dir_output : $conf->service->dir_output);
 				$pdir = get_exdir($product->id, 2, 0, 0, $product, 'product').$product->ref."/";
 				$dir = $dir.'/'.$pdir;
 
-				if (!empty($product->multilangs[$langs->defaultlang]["label"]))     		$product->label = $product->multilangs[$langs->defaultlang]["label"];
-				if (!empty($product->multilangs[$langs->defaultlang]["description"]))     	$product->description = $product->multilangs[$langs->defaultlang]["description"];
-				if (!empty($product->multilangs[$langs->defaultlang]["note"]))     		$product->note = $product->multilangs[$langs->defaultlang]["note"];
+				if (!empty($product->multilangs[$langs->defaultlang]["label"])) {
+					$product->label = $product->multilangs[$langs->defaultlang]["label"];
+				}
+				if (!empty($product->multilangs[$langs->defaultlang]["description"])) {
+					$product->description = $product->multilangs[$langs->defaultlang]["description"];
+				}
+				if (!empty($product->multilangs[$langs->defaultlang]["note"])) {
+					$product->note = $product->multilangs[$langs->defaultlang]["note"];
+				}
 
 				$productorservice_result_fields = array(
 					'id' => $product->id,
@@ -436,10 +445,8 @@ function getProductOrService($authentication, $id = '', $ref = '', $ref_ext = ''
 				//Get extrafield values
 				$product->fetch_optionals();
 
-				if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
-				{
-					foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
-					{
+				if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label'])) {
+					foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label) {
 						$productorservice_result_fields = array_merge($productorservice_result_fields, array('options_'.$key => $product->array_options['options_'.$key]));
 					}
 				}
@@ -449,20 +456,17 @@ function getProductOrService($authentication, $id = '', $ref = '', $ref_ext = ''
 					'result'=>array('result_code'=>'OK', 'result_label'=>''),
 					'product'=>$productorservice_result_fields
 				);
-			}
-			else {
+			} else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
-		}
-		else {
+		} else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
 	}
 
-	if ($error)
-	{
+	if ($error) {
 		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
 	//var_dump($objectresp);exit;
@@ -485,31 +489,35 @@ function createProductOrService($authentication, $product)
 
 	dol_syslog("Function: createProductOrService login=".$authentication['login']);
 
-	if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity = $authentication['entity'];
+	}
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	// Check parameters
 	if (empty($product['price_base_type'])) {
-		if (isset($product['price_net']) && $product['price_net'] > 0) $product['price_base_type'] = 'HT';
-		if (isset($product['price']) && $product['price'] > 0)     $product['price_base_type'] = 'TTC';
+		if (isset($product['price_net']) && $product['price_net'] > 0) {
+			$product['price_base_type'] = 'HT';
+		}
+		if (isset($product['price']) && $product['price'] > 0) {
+			$product['price_base_type'] = 'TTC';
+		}
 	}
 
-	if (isset($product['price_net']) && $product['price_net'] > 0 && isset($product['price']) && $product['price'] > 0)
-	{
+	if (isset($product['price_net']) && $product['price_net'] > 0 && isset($product['price']) && $product['price'] > 0) {
 		$error++; $errorcode = 'KO'; $errorlabel = "You must choose between price or price_net to provide price.";
 	}
 
-	if (!empty($product['barcode']) && empty($product['barcode_type']))
-	{
+	if (!empty($product['barcode']) && empty($product['barcode_type'])) {
 		$error++; $errorcode = 'KO'; $errorlabel = "You must set a barcode type when setting a barcode.";
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 		$newobject = new Product($db);
@@ -528,34 +536,35 @@ function createProductOrService($authentication, $product)
 		$newobject->price_base_type = $product['price_base_type'];
 		$newobject->date_creation = $now;
 
-		if (!empty($product['barcode']))
-		{
+		if (!empty($product['barcode'])) {
 			$newobject->barcode = $product['barcode'];
 			$newobject->barcode_type = $product['barcode_type'];
 		}
 
 		$newobject->stock_reel = isset($product['stock_real']) ? $product['stock_real'] : null;
 		$newobject->pmp = isset($product['pmp']) ? $product['pmp'] : null;
-		$newobject->seuil_stock_alert = isset($product['stock_alert']) ? $product['stock_alert'] : null;
+		$newobject->seuil_stock_alerte = isset($product['stock_alert']) ? $product['stock_alert'] : null;
 
 		$newobject->country_id = isset($product['country_id']) ? $product['country_id'] : 0;
-		if (!empty($product['country_code'])) $newobject->country_id = getCountry($product['country_code'], 3);
+		if (!empty($product['country_code'])) {
+			$newobject->country_id = getCountry($product['country_code'], 3);
+		}
 		$newobject->customcode = isset($product['customcode']) ? $product['customcode'] : '';
 
 		$newobject->canvas = isset($product['canvas']) ? $product['canvas'] : '';
 		/*foreach($product['lines'] as $line)
-        {
-            $newline=new FactureLigne($db);
-            $newline->type=$line['type'];
-            $newline->desc=$line['desc'];
-            $newline->fk_product=$line['fk_product'];
-            $newline->total_ht=$line['total_net'];
-            $newline->total_vat=$line['total_vat'];
-            $newline->total_ttc=$line['total'];
-            $newline->vat=$line['vat_rate'];
-            $newline->qty=$line['qty'];
-            $newline->fk_product=$line['product_id'];
-        }*/
+		{
+			$newline=new FactureLigne($db);
+			$newline->type=$line['type'];
+			$newline->desc=$line['desc'];
+			$newline->fk_product=$line['fk_product'];
+			$newline->total_ht=$line['total_net'];
+			$newline->total_vat=$line['total_vat'];
+			$newline->total_ttc=$line['total'];
+			$newline->vat=$line['vat_rate'];
+			$newline->qty=$line['qty'];
+			$newline->fk_product=$line['product_id'];
+		}*/
 		//var_dump($product['ref_ext']);
 		//var_dump($product['lines'][0]['type']);
 
@@ -563,10 +572,8 @@ function createProductOrService($authentication, $product)
 
 		$extrafields = new ExtraFields($db);
 		$extrafields->fetch_name_optionals_label($elementtype, true);
-		if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
-		{
-			foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label)
-			{
+		if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label'])) {
+			foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label) {
 				$key = 'options_'.$key;
 				$newobject->array_options[$key] = $product[$key];
 			}
@@ -575,43 +582,34 @@ function createProductOrService($authentication, $product)
 		$db->begin();
 
 		$result = $newobject->create($fuser, 0);
-		if ($result <= 0)
-		{
+		if ($result <= 0) {
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Update stock if stock count is provided and differs from database after creation or update
-			if (isset($product['stock_real']) && $product['stock_real'] != '' && !empty($conf->global->stock->enabled))
-			{
+			if (isset($product['stock_real']) && $product['stock_real'] != '' && !empty($conf->global->stock->enabled)) {
 				include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 
 				$savstockreal = $newobject->stock_reel;
 				$newobject->load_stock('novirtual,nobatch'); // This overwrite ->stock_reel, surely 0 because we have just created product
 				$getstockreal = $newobject->stock_reel;
 
-				if ($savstockreal != $getstockreal)
-				{
+				if ($savstockreal != $getstockreal) {
 					$warehouse = new Entrepot($db);
 					$warehouse->fetch(0, $product['warehouse_ref']);
-					if ($warehouse->id > 0)
-					{
-						if (($savstockreal - $getstockreal) > 0)
-						{
+					if ($warehouse->id > 0) {
+						if (($savstockreal - $getstockreal) > 0) {
 							$result = $newobject->correct_stock($fuser, $warehouse->id, ($savstockreal - $getstockreal), 0, 'Correction from external call (Web Service)', 0, 'WS'.dol_print_date($now, 'dayhourlog'));
 						}
-						if (($savstockreal - $getstockreal) > 0)
-						{
+						if (($savstockreal - $getstockreal) > 0) {
 							$result = $newobject->correct_stock($fuser, $warehouse->id, ($savstockreal - $getstockreal), 1, 'Correction from external call (Web Service)', 0, 'WS'.dol_print_date($now, 'dayhourlog'));
 						}
-						if ($result <= 0)
-						{
+						if ($result <= 0) {
 							$error++;
 							$newobject->error = 'You set a different value for stock, but correction of stock count (before='.$getstockreal.', after='.$savstockreal.') fails with error '.$newobject->error;
 						}
-					}
-					else {
+					} else {
 						$error++;
 						$newobject->error = 'You set a different value for stock but we failed to find warehouse '.$product['warehouse_ref'].' to make correction.';
 					}
@@ -619,12 +617,10 @@ function createProductOrService($authentication, $product)
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->commit();
 			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
-		}
-		else {
+		} else {
 			$db->rollback();
 			$error++;
 			$errorcode = 'KO';
@@ -632,8 +628,7 @@ function createProductOrService($authentication, $product)
 		}
 	}
 
-	if ($error)
-	{
+	if ($error) {
 		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
 
@@ -656,37 +651,45 @@ function updateProductOrService($authentication, $product)
 
 	dol_syslog("Function: updateProductOrService login=".$authentication['login']);
 
-	if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity = $authentication['entity'];
+	}
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	// Check parameters
-	if ($product['price_net'] > 0) $product['price_base_type'] = 'HT';
-	if ($product['price'] > 0)     $product['price_base_type'] = 'TTC';
+	if ($product['price_net'] > 0) {
+		$product['price_base_type'] = 'HT';
+	}
+	if ($product['price'] > 0) {
+		$product['price_base_type'] = 'TTC';
+	}
 
-	if ($product['price_net'] > 0 && $product['price'] > 0)
-	{
+	if ($product['price_net'] > 0 && $product['price'] > 0) {
 		$error++; $errorcode = 'KO'; $errorlabel = "You must choose between price or price_net to provide price.";
 	}
 
 
-	if ($product['barcode'] && !$product['barcode_type'])
-	{
+	if ($product['barcode'] && !$product['barcode_type']) {
 		$error++; $errorcode = 'KO'; $errorlabel = "You must set a barcode type when setting a barcode.";
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 		$newobject = new Product($db);
 		$newobject->fetch($product['id']);
 
-		if (isset($product['ref']))     $newobject->ref = $product['ref'];
-		if (isset($product['ref_ext'])) $newobject->ref_ext = $product['ref_ext'];
+		if (isset($product['ref'])) {
+			$newobject->ref = $product['ref'];
+		}
+		if (isset($product['ref_ext'])) {
+			$newobject->ref_ext = $product['ref_ext'];
+		}
 		$newobject->type = $product['type'];
 		$newobject->label = $product['label'];
 		$newobject->description = $product['description'];
@@ -699,18 +702,19 @@ function updateProductOrService($authentication, $product)
 		$newobject->price_base_type = $product['price_base_type'];
 		$newobject->date_creation = $now;
 
-		if ($product['barcode'])
-		{
+		if ($product['barcode']) {
 				$newobject->barcode = $product['barcode'];
 				$newobject->barcode_type = $product['barcode_type'];
 		}
 
 		$newobject->stock_reel = $product['stock_real'];
 		$newobject->pmp = $product['pmp'];
-		$newobject->seuil_stock_alert = $product['stock_alert'];
+		$newobject->seuil_stock_alerte = $product['stock_alert'];
 
 		$newobject->country_id = $product['country_id'];
-		if ($product['country_code']) $newobject->country_id = getCountry($product['country_code'], 3);
+		if ($product['country_code']) {
+			$newobject->country_id = getCountry($product['country_code'], 3);
+		}
 		$newobject->customcode = $product['customcode'];
 
 		$newobject->canvas = $product['canvas'];
@@ -719,10 +723,8 @@ function updateProductOrService($authentication, $product)
 
 		$extrafields = new ExtraFields($db);
 		$extrafields->fetch_name_optionals_label($elementtype, true);
-		if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
-		{
-			foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
-			{
+		if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label'])) {
+			foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label) {
 				$key = 'options_'.$key;
 				$newobject->array_options[$key] = $product[$key];
 			}
@@ -731,41 +733,32 @@ function updateProductOrService($authentication, $product)
 		$db->begin();
 
 		$result = $newobject->update($newobject->id, $fuser);
-		if ($result <= 0)
-		{
+		if ($result <= 0) {
 			$error++;
-		}
-		else {
+		} else {
 			// Update stock if stock count is provided and differs from database after creation or update
-			if (isset($product['stock_real']) && $product['stock_real'] != '' && !empty($conf->global->stock->enabled))
-			{
+			if (isset($product['stock_real']) && $product['stock_real'] != '' && !empty($conf->global->stock->enabled)) {
 				include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 
 				$savstockreal = $newobject->stock_reel;
 				$newobject->load_stock('novirtual,nobatch'); // This overwrite ->stock_reel
 				$getstockreal = $newobject->stock_reel;
 
-				if ($savstockreal != $getstockreal)
-				{
+				if ($savstockreal != $getstockreal) {
 					$warehouse = new Entrepot($db);
 					$warehouse->fetch(0, $product['warehouse_ref']);
-					if ($warehouse->id > 0)
-					{
-						if (($savstockreal - $getstockreal) > 0)
-						{
+					if ($warehouse->id > 0) {
+						if (($savstockreal - $getstockreal) > 0) {
 							$result = $newobject->correct_stock($fuser, $warehouse->id, ($savstockreal - $getstockreal), 0, 'Correction from external call (Web Service)', 0, 'WS'.dol_print_date($now, 'dayhourlog'));
 						}
-						if (($savstockreal - $getstockreal) > 0)
-						{
+						if (($savstockreal - $getstockreal) > 0) {
 							$result = $newobject->correct_stock($fuser, $warehouse->id, ($savstockreal - $getstockreal), 1, 'Correction from external call (Web Service)', 0, 'WS'.dol_print_date($now, 'dayhourlog'));
 						}
-						if ($result <= 0)
-						{
+						if ($result <= 0) {
 							$error++;
 							$newobject->error = 'You set a different value for stock, but correction of stock count (before='.$getstockreal.', after='.$savstockreal.') fails with error '.$newobject->error;
 						}
-					}
-					else {
+					} else {
 						$error++;
 						$newobject->error = 'You set a different value for stock but we failed to find warehouse '.$product['warehouse_ref'].' to make correction.';
 					}
@@ -773,32 +766,24 @@ function updateProductOrService($authentication, $product)
 			}
 		}
 
-		if (!$error)
-		{
-			if ($newobject->price_base_type == 'HT')
-			{
+		if (!$error) {
+			if ($newobject->price_base_type == 'HT') {
 				$result = $newobject->updatePrice($newobject->price, $newobject->price_base_type, $fuser);
-				if ($result <= 0)
-				{
+				if ($result <= 0) {
 					$error++;
 				}
-			}
-			elseif ($newobject->price_base_type == 'TTC')
-			{
-				$result = $newobject->updatePrice($newobject->price_ttc, $newobject->price_base_type);
-				if ($result <= 0)
-				{
+			} elseif ($newobject->price_base_type == 'TTC') {
+				$result = $newobject->updatePrice($newobject->price_ttc, $newobject->price_base_type, $fuser);
+				if ($result <= 0) {
 					$error++;
 				}
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->commit();
 			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
-		}
-		else {
+		} else {
 			$db->rollback();
 			$error++;
 			$errorcode = 'KO';
@@ -806,8 +791,7 @@ function updateProductOrService($authentication, $product)
 		}
 	}
 
-	if ($error)
-	{
+	if ($error) {
 		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
 
@@ -828,11 +812,14 @@ function deleteProductOrService($authentication, $listofidstring)
 
 	dol_syslog("Function: deleteProductOrService login=".$authentication['login']);
 
-	if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity = $authentication['entity'];
+	}
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
@@ -844,32 +831,26 @@ function deleteProductOrService($authentication, $listofidstring)
 	$listofiddeleted = array();
 
 	// Check parameters
-	if (count($listofid) == 0 || empty($listofid[0]))
-	{
+	if (count($listofid) == 0 || empty($listofid[0])) {
 		$error++; $errorcode = 'KO'; $errorlabel = "List of Id of products or services to delete are required.";
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$firsterror = '';
 
 		$db->begin();
 
-		foreach ($listofid as $key => $id)
-		{
+		foreach ($listofid as $key => $id) {
 			$newobject = new Product($db);
 			$result = $newobject->fetch($id);
 
-			if ($result == 0)
-			{
+			if ($result == 0) {
 				$error++;
 				$firsterror = 'Product or service with id '.$id.' not found';
 				break;
-			}
-			else {
+			} else {
 				$result = $newobject->delete($user);
-				if ($result <= 0)
-				{
+				if ($result <= 0) {
 					$error++;
 					$firsterror = $newobject->error;
 					break;
@@ -879,13 +860,11 @@ function deleteProductOrService($authentication, $listofidstring)
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->commit();
 			//$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'listofid'=>$listofiddeleted);
 			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'nbdeleted'=>count($listofiddeleted));
-		}
-		else {
+		} else {
 			$db->rollback();
 			$error++;
 			$errorcode = 'KO';
@@ -893,15 +872,12 @@ function deleteProductOrService($authentication, $listofidstring)
 		}
 	}
 
-	if ($error)
-	{
+	if ($error) {
 		//$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel), 'listofid'=>$listofiddeleted);
 		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel), 'nbdeleted'=>0);
-	}
-	elseif (count($listofiddeleted) == 0)
-	{
-   		//$objectresp=array('result'=>array('result_code'=>'NOT_FOUND', 'result_label'=>'No product or service with id '.join(',',$listofid).' found'), 'listofid'=>$listofiddeleted);
-   		$objectresp = array('result'=>array('result_code'=>'NOT_FOUND', 'result_label'=>'No product or service with id '.join(',', $listofid).' found'), 'nbdeleted'=>0);
+	} elseif (count($listofiddeleted) == 0) {
+		//$objectresp=array('result'=>array('result_code'=>'NOT_FOUND', 'result_label'=>'No product or service with id '.join(',',$listofid).' found'), 'listofid'=>$listofiddeleted);
+		$objectresp = array('result'=>array('result_code'=>'NOT_FOUND', 'result_label'=>'No product or service with id '.join(',', $listofid).' found'), 'nbdeleted'=>0);
 	}
 
 	return $objectresp;
@@ -921,49 +897,52 @@ function getListOfProductsOrServices($authentication, $filterproduct)
 
 	dol_syslog("Function: getListOfProductsOrServices login=".$authentication['login']);
 
-	if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity = $authentication['entity'];
+	}
 
 	// Init and check authentication
 	$objectresp = array();
 	$arrayproducts = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	// Check parameters
 
-	if (!$error)
-	{
+	if (!$error) {
 		$sql = "SELECT rowid, ref, ref_ext";
 		$sql .= " FROM ".MAIN_DB_PREFIX."product";
 		$sql .= " WHERE entity=".$conf->entity;
-		foreach ($filterproduct as $key => $val)
-		{
-			if ($key == 'type' && $val >= 0) $sql .= " AND fk_product_type = ".$db->escape($val);
-			if ($key == 'status_tosell') $sql .= " AND tosell = ".$db->escape($val);
-			if ($key == 'status_tobuy') $sql .= " AND tobuy = ".$db->escape($val);
+		foreach ($filterproduct as $key => $val) {
+			if ($key == 'type' && $val >= 0) {
+				$sql .= " AND fk_product_type = ".$db->escape($val);
+			}
+			if ($key == 'status_tosell') {
+				$sql .= " AND tosell = ".$db->escape($val);
+			}
+			if ($key == 'status_tobuy') {
+				$sql .= " AND tobuy = ".$db->escape($val);
+			}
 		}
 		$resql = $db->query($sql);
-		if ($resql)
-		{
-		 	$num = $db->num_rows($resql);
+		if ($resql) {
+			$num = $db->num_rows($resql);
 
-		 	$i = 0;
-		 	while ($i < $num)
-		 	{
-		 		$obj = $db->fetch_object($resql);
-		 		$arrayproducts[] = array('id'=>$obj->rowid, 'ref'=>$obj->ref, 'ref_ext'=>$obj->ref_ext);
-		 		$i++;
-		 	}
-		}
-		else {
+			$i = 0;
+			while ($i < $num) {
+				$obj = $db->fetch_object($resql);
+				$arrayproducts[] = array('id'=>$obj->rowid, 'ref'=>$obj->ref, 'ref_ext'=>$obj->ref_ext);
+				$i++;
+			}
+		} else {
 			$error++;
 			$errorcode = $db->lasterrno();
 			$errorlabel = $db->lasterror();
 		}
 	}
 
-	if ($error)
-	{
+	if ($error) {
 		$objectresp = array(
 			'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel),
 			'products'=>$arrayproducts
@@ -996,7 +975,9 @@ function getProductsForCategory($authentication, $id, $lang = '')
 
 	dol_syslog("Function: getProductsForCategory login=".$authentication['login']." id=".$id);
 
-	if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity = $authentication['entity'];
+	}
 
 	$objectresp = array();
 	$errorcode = ''; $errorlabel = '';
@@ -1005,27 +986,23 @@ function getProductsForCategory($authentication, $id, $lang = '')
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
 
-	if (!$error && !$id)
-	{
+	if (!$error && !$id) {
 		$error++;
 		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id must be provided.";
 	}
 
 
-	if (!$error)
-	{
+	if (!$error) {
 		$langcode = ($lang ? $lang : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
 		$langs->setDefaultLang($langcode);
 
 		$fuser->getrights();
 
 		$nbmax = 10;
-		if ($fuser->rights->produit->lire)
-		{
+		if ($fuser->rights->produit->lire) {
 			$categorie = new Categorie($db);
 			$result = $categorie->fetch($id);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$table = "product";
 				$field = "product";
 				$sql  = "SELECT fk_".$field." FROM ".MAIN_DB_PREFIX."categorie_".$table;
@@ -1035,24 +1012,21 @@ function getProductsForCategory($authentication, $id, $lang = '')
 
 				dol_syslog("getProductsForCategory get id of product into category", LOG_DEBUG);
 				$res = $db->query($sql);
-				if ($res)
-				{
+				if ($res) {
 					$iProduct = 0;
 					$tmpproduct = new Product($db);
 					$products = array();
-					while ($rec = $db->fetch_array($res))
-					{
+					while ($rec = $db->fetch_array($res)) {
 						$tmpproduct->fetch($rec['fk_'.$field]);
-						if ($tmpproduct->status > 0)
-						{
+						if ($tmpproduct->status > 0) {
 							$dir = (!empty($conf->product->dir_output) ? $conf->product->dir_output : $conf->service->dir_output);
 							$pdir = get_exdir($tmpproduct->id, 2, 0, 0, $tmpproduct, 'product').$tmpproduct->id."/photos/";
 							$dir = $dir.'/'.$pdir;
 
 							$products[] = array(
 								'id' => $tmpproduct->id,
-					   			'ref' => $tmpproduct->ref,
-					   			'ref_ext' => $tmpproduct->ref_ext,
+								'ref' => $tmpproduct->ref,
+								'ref_ext' => $tmpproduct->ref_ext,
 								'label' => !empty($tmpproduct->multilangs[$langs->defaultlang]["label"]) ? $tmpproduct->multilangs[$langs->defaultlang]["label"] : $tmpproduct->label,
 								'description' => !empty($tmpproduct->multilangs[$langs->defaultlang]["description"]) ? $tmpproduct->multilangs[$langs->defaultlang]["description"] : $tmpproduct->description,
 								'date_creation' => dol_print_date($tmpproduct->date_creation, 'dayhourrfc'),
@@ -1090,10 +1064,8 @@ function getProductsForCategory($authentication, $id, $lang = '')
 							//Get extrafield values
 							$tmpproduct->fetch_optionals();
 
-							if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
-							{
-								foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
-								{
+							if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label'])) {
+								foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label) {
 									$products[$iProduct] = array_merge($products[$iProduct], array('options_'.$key => $tmpproduct->array_options['options_'.$key]));
 								}
 							}
@@ -1107,26 +1079,22 @@ function getProductsForCategory($authentication, $id, $lang = '')
 					'result'=>array('result_code'=>'OK', 'result_label'=>''),
 					'products'=> $products
 					);
-				}
-				else {
+				} else {
 					$errorcode = 'NORECORDS_FOR_ASSOCIATION'; $errorlabel = 'No products associated'.$sql;
 					$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
 					dol_syslog("getProductsForCategory:: ".$errorcode, LOG_DEBUG);
 				}
-			}
-			else {
+			} else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id;
 			}
-		}
-		else {
+		} else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
 	}
 
-	if ($error)
-	{
+	if ($error) {
 		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
 

From 08bad6fc302c512e2985b36e73043c5b6db861e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Mon, 28 Dec 2020 20:54:29 +0100
Subject: [PATCH 666/888] remove warnings

---
 htdocs/core/boxes/box_scheduled_jobs.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/boxes/box_scheduled_jobs.php b/htdocs/core/boxes/box_scheduled_jobs.php
index 2ac81c80d16..04ba2944c75 100644
--- a/htdocs/core/boxes/box_scheduled_jobs.php
+++ b/htdocs/core/boxes/box_scheduled_jobs.php
@@ -42,6 +42,9 @@ class box_scheduled_jobs extends ModeleBoxes
 	 */
 	public $db;
 
+	/**
+	 * @var string params
+	 */
 	public $param;
 
 	public $info_box_head = array();
@@ -101,9 +104,11 @@ class box_scheduled_jobs extends ModeleBoxes
 
 					if (dol_eval($objp->test, 1, 1)) {
 						$nextrun = $this->db->jdate($objp->datenextrun);
-						if (empty($nextrun)) $nextrun = $this->db->jdate($objp->datestart);
+						if (empty($nextrun)) {
+							$nextrun = $this->db->jdate($objp->datestart);
+						}
 
-						if ($line == 0 || ($nextrun < $cronstatic->datenextrun && (empty($objp->nbrun) || empty($objp->maxrun) || $objp->nbrun < $obj->maxrun))) {
+						if ($line == 0 || ($nextrun < $cronstatic->datenextrun && (empty($objp->nbrun) || empty($objp->maxrun) || $objp->nbrun < $objp->maxrun))) {
 							$cronstatic->id = $objp->rowid;
 							$cronstatic->ref = $objp->rowid;
 							$cronstatic->label = $langs->trans($objp->label);

From fb5f4379daf865390449f7366a7ffdba168db3a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Mon, 28 Dec 2020 21:08:56 +0100
Subject: [PATCH 667/888] remove warnings

---
 htdocs/societe/class/societe.class.php | 1339 +++++++++++++-----------
 1 file changed, 709 insertions(+), 630 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 0aeb64aa427..3193535e45e 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -784,17 +784,24 @@ class Societe extends CommonObject
 		$error = 0;
 
 		// Clean parameters
-		if (empty($this->status)) $this->status = 0;
+		if (empty($this->status)) {
+			$this->status = 0;
+		}
 		$this->name = $this->name ?trim($this->name) : trim($this->nom);
 		$this->setUpperOrLowerCase();
 		$this->nom = $this->name; // For backward compatibility
-		if (empty($this->client))      $this->client = 0;
-		if (empty($this->fournisseur)) $this->fournisseur = 0;
+		if (empty($this->client)) {
+			$this->client = 0;
+		}
+		if (empty($this->fournisseur)) {
+			$this->fournisseur = 0;
+		}
 		$this->import_key = trim($this->import_key);
 
-		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
-		if (empty($this->fk_multicurrency))
-		{
+		if (!empty($this->multicurrency_code)) {
+			$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		}
+		if (empty($this->fk_multicurrency)) {
 			$this->multicurrency_code = '';
 			$this->fk_multicurrency = 0;
 		}
@@ -806,15 +813,18 @@ class Societe extends CommonObject
 		$this->db->begin();
 
 		// For automatic creation during create action (not used by Dolibarr GUI, can be used by scripts)
-		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this, 0);
-		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this, 1);
+		if ($this->code_client == -1 || $this->code_client === 'auto') {
+			$this->get_codeclient($this, 0);
+		}
+		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') {
+			$this->get_codefournisseur($this, 1);
+		}
 
 		// Check more parameters (including mandatory setup
 		// If error, this->errors[] is filled
 		$result = $this->verify();
 
-		if ($result >= 0)
-		{
+		if ($result >= 0) {
 			$this->entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, name_alias, entity, datec, fk_user_creat, canvas, status, ref_ext, fk_stcomm, fk_incoterms, location_incoterms ,import_key, fk_multicurrency, multicurrency_code)";
@@ -832,33 +842,32 @@ class Societe extends CommonObject
 
 			dol_syslog(get_class($this)."::create", LOG_DEBUG);
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe");
 
 				$ret = $this->update($this->id, $user, 0, 1, 1, 'add');
 
 				// Ajout du commercial affecte
-				if ($this->commercial_id != '' && $this->commercial_id != -1)
-				{
+				if ($this->commercial_id != '' && $this->commercial_id != -1) {
 					$this->add_commercial($user, $this->commercial_id);
 				}
 				// si un commercial cree un client il lui est affecte automatiquement
-				elseif (empty($user->rights->societe->client->voir))
-				{
+				elseif (empty($user->rights->societe->client->voir)) {
 					$this->add_commercial($user, $user->id);
 				}
 
-				if ($ret >= 0)
-				{
+				if ($ret >= 0) {
 					// Call trigger
 					$result = $this->call_trigger('COMPANY_CREATE', $user);
-					if ($result < 0) $error++;
+					if ($result < 0) {
+						$error++;
+					}
 					// End call triggers
-				} else $error++;
+				} else {
+					$error++;
+				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					dol_syslog(get_class($this)."::Create success id=".$this->id);
 					$this->db->commit();
 					return $this->id;
@@ -868,8 +877,7 @@ class Societe extends CommonObject
 					return -4;
 				}
 			} else {
-				if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-				{
+				if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 					$this->error = $langs->trans("ErrorCompanyNameAlreadyExists", $this->name); // duplicate on a field (code or profid or ...)
 					$result = -1;
 				} else {
@@ -916,8 +924,7 @@ class Societe extends CommonObject
 		$contact->phone_pro         = $this->phone;
 
 		$result = $contact->create($user);
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$this->error = $contact->error;
 			$this->errors = $contact->errors;
 			dol_syslog(get_class($this)."::create_individual ERROR:".$this->error, LOG_ERR);
@@ -943,28 +950,21 @@ class Societe extends CommonObject
 		$this->name = trim($this->name);
 		$this->nom = $this->name; // For backward compatibility
 
-		if (!$this->name)
-		{
+		if (!$this->name) {
 			$this->errors[] = 'ErrorBadThirdPartyName';
 			$result = -2;
 		}
 
-		if ($this->client)
-		{
+		if ($this->client) {
 			$rescode = $this->check_codeclient();
-			if ($rescode <> 0)
-			{
-				if ($rescode == -1)
-				{
+			if ($rescode <> 0) {
+				if ($rescode == -1) {
 					$this->errors[] = 'ErrorBadCustomerCodeSyntax';
-				} elseif ($rescode == -2)
-				{
+				} elseif ($rescode == -2) {
 					$this->errors[] = 'ErrorCustomerCodeRequired';
-				} elseif ($rescode == -3)
-				{
+				} elseif ($rescode == -3) {
 					$this->errors[] = 'ErrorCustomerCodeAlreadyUsed';
-				} elseif ($rescode == -4)
-				{
+				} elseif ($rescode == -4) {
 					$this->errors[] = 'ErrorPrefixRequired';
 				} else {
 					$this->errors[] = 'ErrorUnknownOnCustomerCodeCheck';
@@ -974,22 +974,16 @@ class Societe extends CommonObject
 			}
 		}
 
-		if ($this->fournisseur)
-		{
+		if ($this->fournisseur) {
 			$rescode = $this->check_codefournisseur();
-			if ($rescode <> 0)
-			{
-				if ($rescode == -1)
-				{
+			if ($rescode <> 0) {
+				if ($rescode == -1) {
 					$this->errors[] = 'ErrorBadSupplierCodeSyntax';
-				} elseif ($rescode == -2)
-				{
+				} elseif ($rescode == -2) {
 					$this->errors[] = 'ErrorSupplierCodeRequired';
-				} elseif ($rescode == -3)
-				{
+				} elseif ($rescode == -3) {
 					$this->errors[] = 'ErrorSupplierCodeAlreadyUsed';
-				} elseif ($rescode == -4)
-				{
+				} elseif ($rescode == -4) {
 					$this->errors[] = 'ErrorPrefixRequired';
 				} else {
 					$this->errors[] = 'ErrorUnknownOnSupplierCodeCheck';
@@ -1000,22 +994,17 @@ class Societe extends CommonObject
 
 		// Check for duplicate or mandatory fields defined into setup
 		$array_to_check = array('IDPROF1', 'IDPROF2', 'IDPROF3', 'IDPROF4', 'IDPROF5', 'IDPROF6', 'EMAIL');
-		foreach ($array_to_check as $key)
-		{
+		foreach ($array_to_check as $key) {
 			$keymin = strtolower($key);
 			$i = (int) preg_replace('/[^0-9]/', '', $key);
 			$vallabel = $this->$keymin;
 
-			if ($i > 0)
-			{
-				if ($this->isACompany())
-				{
+			if ($i > 0) {
+				if ($this->isACompany()) {
 					// Check for mandatory prof id (but only if country is same than ours)
-					if ($mysoc->country_id > 0 && $this->country_id == $mysoc->country_id)
-					{
+					if ($mysoc->country_id > 0 && $this->country_id == $mysoc->country_id) {
 						$idprof_mandatory = 'SOCIETE_'.$key.'_MANDATORY';
-						if (!$vallabel && !empty($conf->global->$idprof_mandatory))
-						{
+						if (!$vallabel && !empty($conf->global->$idprof_mandatory)) {
 							$langs->load("errors");
 							$error++;
 							$this->errors[] = $langs->trans("ErrorProdIdIsMandatory", $langs->transcountry('ProfId'.$i, $this->country_code)).' ('.$langs->trans("ForbiddenBySetupRules").')';
@@ -1024,10 +1013,8 @@ class Societe extends CommonObject
 				}
 
 				// Check for unicity on profid
-				if (!$error && $vallabel && $this->id_prof_verifiable($i))
-				{
-					if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0)))
-					{
+				if (!$error && $vallabel && $this->id_prof_verifiable($i)) {
+					if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0))) {
 						$langs->load("errors");
 						$error++;
 						$this->errors[] = $langs->transcountry('ProfId'.$i, $this->country_code)." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
@@ -1036,21 +1023,17 @@ class Societe extends CommonObject
 			} else {
 				//var_dump($conf->global->SOCIETE_EMAIL_UNIQUE);
 				//var_dump($conf->global->SOCIETE_EMAIL_MANDATORY);
-				if ($key == 'EMAIL')
-				{
+				if ($key == 'EMAIL') {
 					// Check for mandatory
-					if (!empty($conf->global->SOCIETE_EMAIL_MANDATORY) && !isValidEMail($this->email))
-					{
+					if (!empty($conf->global->SOCIETE_EMAIL_MANDATORY) && !isValidEMail($this->email)) {
 						$langs->load("errors");
 						$error++;
 						$this->errors[] = $langs->trans("ErrorBadEMail", $this->email).' ('.$langs->trans("ForbiddenBySetupRules").')';
 					}
 
 					// Check for unicity
-					if (!$error && $vallabel && !empty($conf->global->SOCIETE_EMAIL_UNIQUE))
-					{
-						if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0)))
-						{
+					if (!$error && $vallabel && !empty($conf->global->SOCIETE_EMAIL_UNIQUE)) {
+						if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0))) {
 							$langs->load("errors");
 							$error++; $this->errors[] = $langs->trans('Email')." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
 						}
@@ -1059,7 +1042,9 @@ class Societe extends CommonObject
 			}
 		}
 
-		if ($error) $result = -4;
+		if ($error) {
+			$result = -4;
+		}
 
 		return $result;
 	}
@@ -1082,7 +1067,9 @@ class Societe extends CommonObject
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-		if (empty($id)) $id = $this->id;
+		if (empty($id)) {
+			$id = $this->id;
+		}
 
 		$error = 0;
 
@@ -1126,11 +1113,14 @@ class Societe extends CommonObject
 
 		$this->tva_assuj	= trim($this->tva_assuj);
 		$this->tva_intra	= dol_sanitizeFileName($this->tva_intra, '');
-		if (empty($this->status)) $this->status = 0;
+		if (empty($this->status)) {
+			$this->status = 0;
+		}
 
-		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
-		if (empty($this->fk_multicurrency))
-		{
+		if (!empty($this->multicurrency_code)) {
+			$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		}
+		if (empty($this->fk_multicurrency)) {
 			$this->multicurrency_code = '';
 			$this->fk_multicurrency = 0;
 		}
@@ -1142,8 +1132,12 @@ class Societe extends CommonObject
 		$this->localtax1_value = trim($this->localtax1_value);
 		$this->localtax2_value = trim($this->localtax2_value);
 
-		if ($this->capital != '') $this->capital = price2num(trim($this->capital));
-		if (!is_numeric($this->capital)) $this->capital = ''; // '' = undef
+		if ($this->capital != '') {
+			$this->capital = price2num(trim($this->capital));
+		}
+		if (!is_numeric($this->capital)) {
+			$this->capital = ''; // '' = undef
+		}
 
 		$this->effectif_id = trim($this->effectif_id);
 		$this->forme_juridique_code = trim($this->forme_juridique_code);
@@ -1152,41 +1146,44 @@ class Societe extends CommonObject
 		$this->barcode = trim($this->barcode);
 
 		// For automatic creation
-		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this, 0);
-		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this, 1);
+		if ($this->code_client == -1 || $this->code_client === 'auto') {
+			$this->get_codeclient($this, 0);
+		}
+		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') {
+			$this->get_codefournisseur($this, 1);
+		}
 
 		$this->code_compta = trim($this->code_compta);
 		$this->code_compta_fournisseur = trim($this->code_compta_fournisseur);
 
 		// Check parameters. More tests are done later in the ->verify()
-		if (!is_numeric($this->client) && !is_numeric($this->fournisseur))
-		{
+		if (!is_numeric($this->client) && !is_numeric($this->fournisseur)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("BadValueForParameterClientOrSupplier");
 			return -1;
 		}
 
 		$customer = false;
-		if (!empty($allowmodcodeclient) && !empty($this->client))
-		{
+		if (!empty($allowmodcodeclient) && !empty($this->client)) {
 			// Attention get_codecompta peut modifier le code suivant le module utilise
-			if (empty($this->code_compta))
-			{
+			if (empty($this->code_compta)) {
 				$ret = $this->get_codecompta('customer');
-				if ($ret < 0) return -1;
+				if ($ret < 0) {
+					return -1;
+				}
 			}
 
 			$customer = true;
 		}
 
 		$supplier = false;
-		if (!empty($allowmodcodefournisseur) && !empty($this->fournisseur))
-		{
+		if (!empty($allowmodcodefournisseur) && !empty($this->fournisseur)) {
 			// Attention get_codecompta peut modifier le code suivant le module utilise
-			if ($this->code_compta_fournisseur == "")
-			{
+			if ($this->code_compta_fournisseur == "") {
 				$ret = $this->get_codecompta('supplier');
-				if ($ret < 0) return -1;
+				if ($ret < 0) {
+					return -1;
+				}
 			}
 
 			$supplier = true;
@@ -1205,33 +1202,31 @@ class Societe extends CommonObject
 		// Check name is required and codes are ok or unique.
 		// If error, this->errors[] is filled
 		$result = 0;
-		if ($action != 'add' && $action != 'merge')
-		{
+		if ($action != 'add' && $action != 'merge') {
 			// We don't check when update called during a create because verify was already done.
 			// For a merge, we suppose source data is clean and a customer code of a deleted thirdparty must be accepted into a target thirdparty with empty code without duplicate error
 			$result = $this->verify();
 
 			// If there is only one error and error is ErrorBadCustomerCodeSyntax and we don't change customer code, we allow the update
 			// So we can update record that were using and old numbering rule.
-			if (is_array($this->errors))
-			{
-				if (in_array('ErrorBadCustomerCodeSyntax', $this->errors) && is_object($this->oldcopy) && $this->oldcopy->code_client == $this->code_client)
-				{
-					if (($key = array_search('ErrorBadCustomerCodeSyntax', $this->errors)) !== false) unset($this->errors[$key]); // Remove error message
+			if (is_array($this->errors)) {
+				if (in_array('ErrorBadCustomerCodeSyntax', $this->errors) && is_object($this->oldcopy) && $this->oldcopy->code_client == $this->code_client) {
+					if (($key = array_search('ErrorBadCustomerCodeSyntax', $this->errors)) !== false) {
+						unset($this->errors[$key]); // Remove error message
+					}
 				}
-				if (in_array('ErrorBadSupplierCodeSyntax', $this->errors) && is_object($this->oldcopy) && $this->oldcopy->code_fournisseur == $this->code_fournisseur)
-				{
-					if (($key = array_search('ErrorBadSupplierCodeSyntax', $this->errors)) !== false) unset($this->errors[$key]); // Remove error message
+				if (in_array('ErrorBadSupplierCodeSyntax', $this->errors) && is_object($this->oldcopy) && $this->oldcopy->code_fournisseur == $this->code_fournisseur) {
+					if (($key = array_search('ErrorBadSupplierCodeSyntax', $this->errors)) !== false) {
+						unset($this->errors[$key]); // Remove error message
+					}
 				}
-				if (empty($this->errors))	// If there is no more error, we can make like if there is no error at all
-				{
+				if (empty($this->errors)) {	// If there is no more error, we can make like if there is no error at all
 					$result = 0;
 				}
 			}
 		}
 
-		if ($result >= 0)
-		{
+		if ($result >= 0) {
 			dol_syslog(get_class($this)."::update verify ok or not done");
 
 			$sql  = "UPDATE ".MAIN_DB_PREFIX."societe SET ";
@@ -1272,29 +1267,32 @@ class Societe extends CommonObject
 			// Local taxes
 			$sql .= ",localtax1_assuj = ".($this->localtax1_assuj != '' ? "'".$this->db->escape($this->localtax1_assuj)."'" : "null");
 			$sql .= ",localtax2_assuj = ".($this->localtax2_assuj != '' ? "'".$this->db->escape($this->localtax2_assuj)."'" : "null");
-			if ($this->localtax1_assuj == 1)
-			{
-				if ($this->localtax1_value != '')
-				{
+			if ($this->localtax1_assuj == 1) {
+				if ($this->localtax1_value != '') {
 					$sql .= ",localtax1_value =".$this->localtax1_value;
-				} else $sql .= ",localtax1_value =0.000";
-			} else $sql .= ",localtax1_value =0.000";
+				} else {
+					$sql .= ",localtax1_value =0.000";
+				}
+			} else {
+				$sql .= ",localtax1_value =0.000";
+			}
 
-			if ($this->localtax2_assuj == 1)
-			{
-				if ($this->localtax2_value != '')
-				{
+			if ($this->localtax2_assuj == 1) {
+				if ($this->localtax2_value != '') {
 					$sql .= ",localtax2_value =".$this->localtax2_value;
-				} else $sql .= ",localtax2_value =0.000";
-			} else $sql .= ",localtax2_value =0.000";
+				} else {
+					$sql .= ",localtax2_value =0.000";
+				}
+			} else {
+				$sql .= ",localtax2_value =0.000";
+			}
 
 			$sql .= ",capital = ".($this->capital == '' ? "null" : $this->capital);
 
 			$sql .= ",prefix_comm = ".(!empty($this->prefix_comm) ? "'".$this->db->escape($this->prefix_comm)."'" : "null");
 
 			$sql .= ",fk_effectif = ".(!empty($this->effectif_id) ? "'".$this->db->escape($this->effectif_id)."'" : "null");
-			if (isset($this->stcomm_id))
-			{
+			if (isset($this->stcomm_id)) {
 				$sql .= ",fk_stcomm=".(!empty($this->stcomm_id) ? $this->stcomm_id : "0");
 			}
 			$sql .= ",fk_typent = ".(!empty($this->typent_id) ? "'".$this->db->escape($this->typent_id)."'" : "0");
@@ -1327,14 +1325,12 @@ class Societe extends CommonObject
 			$sql .= ", fk_incoterms = ".$this->fk_incoterms;
 			$sql .= ", location_incoterms = ".(!empty($this->location_incoterms) ? "'".$this->db->escape($this->location_incoterms)."'" : "null");
 
-			if ($customer)
-			{
+			if ($customer) {
 				$sql .= ", code_client = ".(!empty($this->code_client) ? "'".$this->db->escape($this->code_client)."'" : "null");
 				$sql .= ", code_compta = ".(!empty($this->code_compta) ? "'".$this->db->escape($this->code_compta)."'" : "null");
 			}
 
-			if ($supplier)
-			{
+			if ($supplier) {
 				$sql .= ", code_fournisseur = ".(!empty($this->code_fournisseur) ? "'".$this->db->escape($this->code_fournisseur)."'" : "null");
 				$sql .= ", code_compta_fournisseur = ".(($this->code_compta_fournisseur != "") ? "'".$this->db->escape($this->code_compta_fournisseur)."'" : "null");
 			}
@@ -1345,17 +1341,13 @@ class Societe extends CommonObject
 			$sql .= " WHERE rowid = ".(int) $id;
 
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
-				if (is_object($this->oldcopy))	// If we have information on old values
-				{
-					if ($this->oldcopy->country_id != $this->country_id)
-					{
+			if ($resql) {
+				if (is_object($this->oldcopy)) {	// If we have information on old values
+					if ($this->oldcopy->country_id != $this->country_id) {
 						unset($this->country_code);
 						unset($this->country);
 					}
-					if ($this->oldcopy->state_id != $this->state_id)
-					{
+					if ($this->oldcopy->state_id != $this->state_id) {
 						unset($this->state_code);
 						unset($this->state);
 					}
@@ -1368,11 +1360,9 @@ class Societe extends CommonObject
 
 				$nbrowsaffected = $this->db->affected_rows($resql);
 
-				if (!$error && $nbrowsaffected)
-				{
+				if (!$error && $nbrowsaffected) {
 					// Update information on linked member if it is an update
-					if (!$nosyncmember && !empty($conf->adherent->enabled))
-					{
+					if (!$nosyncmember && !empty($conf->adherent->enabled)) {
 						require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 
 						dol_syslog(get_class($this)."::update update linked member");
@@ -1380,8 +1370,7 @@ class Societe extends CommonObject
 						$lmember = new Adherent($this->db);
 						$result = $lmember->fetch(0, 0, $this->id);
 
-						if ($result > 0)
-						{
+						if ($result > 0) {
 							$lmember->company = $this->name;
 							//$lmember->firstname=$this->firstname?$this->firstname:$lmember->firstname;	// We keep firstname and lastname of member unchanged
 							//$lmember->lastname=$this->lastname?$this->lastname:$lmember->lastname;		// We keep firstname and lastname of member unchanged
@@ -1395,15 +1384,13 @@ class Societe extends CommonObject
 							$lmember->country_id = $this->country_id;
 
 							$result = $lmember->update($user, 0, 1, 1, 1); // Use nosync to 1 to avoid cyclic updates
-							if ($result < 0)
-							{
+							if ($result < 0) {
 								$this->error = $lmember->error;
 								$this->errors = array_merge($this->errors, $lmember->errors);
 								dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 								$error++;
 							}
-						} elseif ($result < 0)
-						{
+						} elseif ($result < 0) {
 							$this->error = $lmember->error;
 							$error++;
 						}
@@ -1413,34 +1400,30 @@ class Societe extends CommonObject
 				$action = 'update';
 
 				// Actions on extra fields
-				if (!$error)
-				{
+				if (!$error) {
 					$result = $this->insertExtraFields();
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$error++;
 					}
 				}
 				// Actions on extra languages
-				if (!$error && empty($conf->global->MAIN_EXTRALANGUAGES_DISABLED)) // For avoid conflicts if trigger used
-				{
+				if (!$error && empty($conf->global->MAIN_EXTRALANGUAGES_DISABLED)) { // For avoid conflicts if trigger used
 					$result = $this->insertExtraLanguages();
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$error++;
 					}
 				}
 
-				if (!$error && $call_trigger)
-				{
+				if (!$error && $call_trigger) {
 					// Call trigger
 					$result = $this->call_trigger('COMPANY_MODIFY', $user);
-					if ($result < 0) $error++;
+					if ($result < 0) {
+						$error++;
+					}
 					// End call triggers
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					dol_syslog(get_class($this)."::Update success");
 					$this->db->commit();
 					return 1;
@@ -1449,8 +1432,7 @@ class Societe extends CommonObject
 					return -1;
 				}
 			} else {
-				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-				{
+				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 					// Doublon
 					$this->error = $langs->trans("ErrorDuplicateField");
 					$result = -1;
@@ -1490,7 +1472,9 @@ class Societe extends CommonObject
 		global $langs;
 		global $conf;
 
-		if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($barcode) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6) && empty($email)) return -1;
+		if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($barcode) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6) && empty($email)) {
+			return -1;
+		}
 
 		$sql = 'SELECT s.rowid, s.nom as name, s.name_alias, s.entity, s.ref_ext, s.address, s.datec as date_creation, s.prefix_comm';
 		$sql .= ', s.status';
@@ -1533,30 +1517,51 @@ class Societe extends CommonObject
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_remise as sr ON sr.rowid = (SELECT MAX(rowid) FROM '.MAIN_DB_PREFIX.'societe_remise WHERE fk_soc = s.rowid AND entity IN ('.getEntity('discount').'))';
 
 		$sql .= ' WHERE s.entity IN ('.getEntity($this->element).')';
-		if ($rowid)     $sql .= ' AND s.rowid = '.$rowid;
-		if ($ref)       $sql .= " AND s.nom = '".$this->db->escape($ref)."'";
-		if ($ref_alias) $sql .= " AND s.name_alias = '".$this->db->escape($ref_alias)."'";
-		if ($ref_ext)   $sql .= " AND s.ref_ext = '".$this->db->escape($ref_ext)."'";
-		if ($barcode)   $sql .= " AND s.barcode = '".$this->db->escape($barcode)."'";
-		if ($idprof1)   $sql .= " AND s.siren = '".$this->db->escape($idprof1)."'";
-		if ($idprof2)   $sql .= " AND s.siret = '".$this->db->escape($idprof2)."'";
-		if ($idprof3)   $sql .= " AND s.ape = '".$this->db->escape($idprof3)."'";
-		if ($idprof4)   $sql .= " AND s.idprof4 = '".$this->db->escape($idprof4)."'";
-		if ($idprof5)   $sql .= " AND s.idprof5 = '".$this->db->escape($idprof5)."'";
-		if ($idprof6)   $sql .= " AND s.idprof6 = '".$this->db->escape($idprof6)."'";
-		if ($email)     $sql .= " AND s.email = '".$this->db->escape($email)."'";
+		if ($rowid) {
+			$sql .= ' AND s.rowid = '.$rowid;
+		}
+		if ($ref) {
+			$sql .= " AND s.nom = '".$this->db->escape($ref)."'";
+		}
+		if ($ref_alias) {
+			$sql .= " AND s.name_alias = '".$this->db->escape($ref_alias)."'";
+		}
+		if ($ref_ext) {
+			$sql .= " AND s.ref_ext = '".$this->db->escape($ref_ext)."'";
+		}
+		if ($barcode) {
+			$sql .= " AND s.barcode = '".$this->db->escape($barcode)."'";
+		}
+		if ($idprof1) {
+			$sql .= " AND s.siren = '".$this->db->escape($idprof1)."'";
+		}
+		if ($idprof2) {
+			$sql .= " AND s.siret = '".$this->db->escape($idprof2)."'";
+		}
+		if ($idprof3) {
+			$sql .= " AND s.ape = '".$this->db->escape($idprof3)."'";
+		}
+		if ($idprof4) {
+			$sql .= " AND s.idprof4 = '".$this->db->escape($idprof4)."'";
+		}
+		if ($idprof5) {
+			$sql .= " AND s.idprof5 = '".$this->db->escape($idprof5)."'";
+		}
+		if ($idprof6) {
+			$sql .= " AND s.idprof6 = '".$this->db->escape($idprof6)."'";
+		}
+		if ($email) {
+			$sql .= " AND s.email = '".$this->db->escape($email)."'";
+		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
-			if ($num > 1)
-			{
+			if ($num > 1) {
 				$this->error = 'Fetch found several records. Rename one of thirdparties to avoid duplicate.';
 				dol_syslog($this->error, LOG_ERR);
 				$result = -2;
-			} elseif ($num)   // $num = 1
-			{
+			} elseif ($num) {   // $num = 1
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id           = $obj->rowid;
@@ -1702,7 +1707,9 @@ class Societe extends CommonObject
 		}
 
 		// Use first price level if level not defined for third party
-		if ((!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && empty($this->price_level)) $this->price_level = 1;
+		if ((!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && empty($this->price_level)) {
+			$this->price_level = 1;
+		}
 
 		return $result;
 	}
@@ -1719,7 +1726,9 @@ class Societe extends CommonObject
 	{
 		global $langs, $conf, $user;
 
-		if (empty($fuser)) $fuser = $user;
+		if (empty($fuser)) {
+			$fuser = $user;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -1730,49 +1739,42 @@ class Societe extends CommonObject
 
 		// Test if child exists
 		$objectisused = $this->isObjectUsed($id);
-		if (empty($objectisused))
-		{
+		if (empty($objectisused)) {
 			$this->db->begin();
 
 			// User is mandatory for trigger call
-			if (!$error && $call_trigger)
-			{
+			if (!$error && $call_trigger) {
 				// Call trigger
 				$result = $this->call_trigger('COMPANY_DELETE', $fuser);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 				$static_cat = new Categorie($this->db);
 				$toute_categs = array();
 
 				// Fill $toute_categs array with an array of (type => array of ("Categorie" instance))
-				if ($this->client || $this->prospect)
-				{
+				if ($this->client || $this->prospect) {
 					$toute_categs['customer'] = $static_cat->containing($this->id, Categorie::TYPE_CUSTOMER);
 				}
-				if ($this->fournisseur)
-				{
+				if ($this->fournisseur) {
 					$toute_categs['supplier'] = $static_cat->containing($this->id, Categorie::TYPE_SUPPLIER);
 				}
 
 				// Remove each "Categorie"
-				foreach ($toute_categs as $type => $categs_type)
-				{
-					foreach ($categs_type as $cat)
-					{
+				foreach ($toute_categs as $type => $categs_type) {
+					foreach ($categs_type as $cat) {
 						$cat->del_type($this, $type);
 					}
 				}
 			}
 
-			if (!$error)
-			{
-				foreach ($this->childtablesoncascade as $tabletodelete)
-				{
+			if (!$error) {
+				foreach ($this->childtablesoncascade as $tabletodelete) {
 					$deleteFromObject = explode(':', $tabletodelete);
 					if (count($deleteFromObject) >= 2) {
 						$className = str_replace('@', '', $deleteFromObject[0]);
@@ -1804,51 +1806,42 @@ class Societe extends CommonObject
 			}
 
 			// Removed extrafields
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->deleteExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 					dol_syslog(get_class($this)."::delete error -3 ".$this->error, LOG_ERR);
 				}
 			}
 
 			// Remove links to subsidiaries companies
-			if (!$error)
-			{
+			if (!$error) {
 				$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
 				$sql .= " SET parent = NULL";
 				$sql .= " WHERE parent = ".$id;
-				if (!$this->db->query($sql))
-				{
+				if (!$this->db->query($sql)) {
 					$error++;
 					$this->errors[] = $this->db->lasterror();
 				}
 			}
 
 			// Remove third party
-			if (!$error)
-			{
+			if (!$error) {
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe";
 				$sql .= " WHERE rowid = ".$id;
-				if (!$this->db->query($sql))
-				{
+				if (!$this->db->query($sql)) {
 					$error++;
 					$this->errors[] = $this->db->lasterror();
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 
 				// Delete directory
-				if (!empty($conf->societe->multidir_output[$entity]))
-				{
+				if (!empty($conf->societe->multidir_output[$entity])) {
 					$docdir = $conf->societe->multidir_output[$entity]."/".$id;
-					if (dol_is_dir($docdir))
-					{
+					if (dol_is_dir($docdir)) {
 						dol_delete_dir_recursive($docdir);
 					}
 				}
@@ -1859,7 +1852,9 @@ class Societe extends CommonObject
 				$this->db->rollback();
 				return -1;
 			}
-		} else dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
+		} else {
+			dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
+		}
 		return 0;
 	}
 
@@ -1872,20 +1867,22 @@ class Societe extends CommonObject
 	public function set_as_client()
 	{
 		// phpcs:enable
-		if ($this->id)
-		{
+		if ($this->id) {
 			$newclient = 1;
-			if ($this->client == 2 || $this->client == 3) $newclient = 3; //If prospect, we keep prospect tag
+			if ($this->client == 2 || $this->client == 3) {
+				$newclient = 3; //If prospect, we keep prospect tag
+			}
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
 			$sql .= " SET client = ".$newclient;
 			$sql .= " WHERE rowid = ".$this->id;
 
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$this->client = $newclient;
 				return 1;
-			} else return -1;
+			} else {
+				return -1;
+			}
 		}
 		return 0;
 	}
@@ -1906,16 +1903,14 @@ class Societe extends CommonObject
 
 		// Parameter cleaning
 		$note = trim($note);
-		if (!$note)
-		{
+		if (!$note) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NoteReason"));
 			return -2;
 		}
 
 		dol_syslog(get_class($this)."::set_remise_client ".$remise.", ".$note.", ".$user->id);
 
-		if ($this->id)
-		{
+		if ($this->id) {
 			$this->db->begin();
 
 			$now = dol_now();
@@ -1925,8 +1920,7 @@ class Societe extends CommonObject
 			$sql .= " SET remise_client = '".$this->db->escape($remise)."'";
 			$sql .= " WHERE rowid = ".$this->id;
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->db->rollback();
 				$this->error = $this->db->error();
 				return -1;
@@ -1941,8 +1935,7 @@ class Societe extends CommonObject
 			$sql .= ")";
 
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->db->rollback();
 				$this->error = $this->db->lasterror();
 				return -1;
@@ -1969,16 +1962,14 @@ class Societe extends CommonObject
 
 		// Parameter cleaning
 		$note = trim($note);
-		if (!$note)
-		{
+		if (!$note) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NoteReason"));
 			return -2;
 		}
 
 		dol_syslog(get_class($this)."::set_remise_supplier ".$remise.", ".$note.", ".$user->id);
 
-		if ($this->id)
-		{
+		if ($this->id) {
 			$this->db->begin();
 
 			$now = dol_now();
@@ -1988,8 +1979,7 @@ class Societe extends CommonObject
 			$sql .= " SET remise_supplier = '".$this->db->escape($remise)."'";
 			$sql .= " WHERE rowid = ".$this->id;
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->db->rollback();
 				$this->error = $this->db->error();
 				return -1;
@@ -2004,8 +1994,7 @@ class Societe extends CommonObject
 			$sql .= ")";
 
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->db->rollback();
 				$this->error = $this->db->lasterror();
 				return -1;
@@ -2037,24 +2026,20 @@ class Societe extends CommonObject
 		$desc = trim($desc);
 
 		// Check parameters
-		if (!$remise > 0)
-		{
+		if (!$remise > 0) {
 			$this->error = $langs->trans("ErrorWrongValueForParameter", "1");
 			return -1;
 		}
-		if (!$desc)
-		{
+		if (!$desc) {
 			$this->error = $langs->trans("ErrorWrongValueForParameter", "3");
 			return -2;
 		}
 
-		if ($this->id > 0)
-		{
+		if ($this->id > 0) {
 			// Clean vat code
 			$reg = array();
 			$vat_src_code = '';
-			if (preg_match('/\((.*)\)/', $vatrate, $reg))
-			{
+			if (preg_match('/\((.*)\)/', $vatrate, $reg)) {
 				$vat_src_code = $reg[1];
 				$vatrate = preg_replace('/\s*\(.*\)/', '', $vatrate); // Remove code into vatrate.
 			}
@@ -2076,14 +2061,15 @@ class Societe extends CommonObject
 			$discount->description = $desc;
 
 			$result = $discount->create($user);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				return $result;
 			} else {
 				$this->error = $discount->error;
 				return -3;
 			}
-		} else return 0;
+		} else {
+			return 0;
+		}
 	}
 
 	/**
@@ -2101,8 +2087,7 @@ class Societe extends CommonObject
 
 		$discountstatic = new DiscountAbsolute($this->db);
 		$result = $discountstatic->getAvailableDiscounts($this, $user, $filter, $maxvalue, $discount_type);
-		if ($result >= 0)
-		{
+		if ($result >= 0) {
 			return $result;
 		} else {
 			$this->error = $discountstatic->error;
@@ -2127,13 +2112,14 @@ class Societe extends CommonObject
 
 		$sql = "SELECT DISTINCT u.rowid, u.login, u.lastname, u.firstname, u.office_phone, u.job, u.email, u.statut as status, u.entity, u.photo";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
-		if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
-		{
+		if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 			$sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
 			$sql .= " WHERE ((ug.fk_user = sc.fk_user";
 			$sql .= " AND ug.entity = ".$conf->entity.")";
 			$sql .= " OR u.admin = 1)";
-		} else $sql .= " WHERE entity in (0, ".$conf->entity.")";
+		} else {
+			$sql .= " WHERE entity in (0, ".$conf->entity.")";
+		}
 
 		$sql .= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id;
 		if (empty($sortfield) && empty($sortorder)) {
@@ -2143,16 +2129,13 @@ class Societe extends CommonObject
 		$sql .= $this->db->order($sortfield, $sortorder);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
-				if (empty($mode))
-				{
+				if (empty($mode)) {
 					$reparray[$i]['id'] = $obj->rowid;
 					$reparray[$i]['lastname'] = $obj->lastname;
 					$reparray[$i]['firstname'] = $obj->firstname;
@@ -2187,16 +2170,14 @@ class Societe extends CommonObject
 	public function set_price_level($price_level, User $user)
 	{
 		// phpcs:enable
-		if ($this->id)
-		{
+		if ($this->id) {
 			$now = dol_now();
 
 			$sql  = "UPDATE ".MAIN_DB_PREFIX."societe";
 			$sql .= " SET price_level = '".$this->db->escape($price_level)."'";
 			$sql .= " WHERE rowid = ".$this->id;
 
-			if (!$this->db->query($sql))
-			{
+			if (!$this->db->query($sql)) {
 				dol_print_error($this->db);
 				return -1;
 			}
@@ -2205,8 +2186,7 @@ class Societe extends CommonObject
 			$sql .= " (datec, fk_soc, price_level, fk_user_author)";
 			$sql .= " VALUES ('".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($price_level)."', ".$user->id.")";
 
-			if (!$this->db->query($sql))
-			{
+			if (!$this->db->query($sql)) {
 				dol_print_error($this->db);
 				return -1;
 			}
@@ -2228,50 +2208,42 @@ class Societe extends CommonObject
 		// phpcs:enable
 		$error = 0;
 
-		if ($this->id > 0 && $commid > 0)
-		{
+		if ($this->id > 0 && $commid > 0) {
 			$this->db->begin();
 
-			if (!$error)
-			{
+			if (!$error) {
 				$sql = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux";
 				$sql .= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
 
 				$resql = $this->db->query($sql);
-				if (!$resql)
-				{
+				if (!$resql) {
 					dol_syslog(get_class($this)."::add_commercial Error ".$this->db->lasterror());
 					$error++;
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_commerciaux";
 				$sql .= " (fk_soc, fk_user)";
 				$sql .= " VALUES (".$this->id.", ".$commid.")";
 
 				$resql = $this->db->query($sql);
-				if (!$resql)
-				{
+				if (!$resql) {
 					dol_syslog(get_class($this)."::add_commercial Error ".$this->db->lasterror());
 					$error++;
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->context = array('commercial_modified'=>$commid);
 
 				$result = $this->call_trigger('COMPANY_LINK_SALE_REPRESENTATIVE', $user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -2298,15 +2270,15 @@ class Societe extends CommonObject
 		$this->context = array('commercial_modified'=>$commid);
 
 		$result = $this->call_trigger('COMPANY_UNLINK_SALE_REPRESENTATIVE', $user);
-		if ($result < 0) $error++;
+		if ($result < 0) {
+			$error++;
+		}
 
-		if ($this->id > 0 && $commid > 0)
-		{
+		if ($this->id > 0 && $commid > 0) {
 			$sql  = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux ";
 			$sql .= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
 
-			if (!$this->db->query($sql))
-			{
+			if (!$this->db->query($sql)) {
 				dol_syslog(get_class($this)."::del_commercial Erreur");
 			}
 		}
@@ -2327,17 +2299,22 @@ class Societe extends CommonObject
 	{
 		global $conf, $langs, $hookmanager;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$name = $this->name ? $this->name : $this->nom;
 
 		if (!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)) {
-			if (empty($option) && $this->client > 0) $option = 'customer';
-			if (empty($option) && $this->fournisseur > 0) $option = 'supplier';
+			if (empty($option) && $this->client > 0) {
+				$option = 'customer';
+			}
+			if (empty($option) && $this->fournisseur > 0) {
+				$option = 'supplier';
+			}
 		}
 
-		if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
-		{
+		if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto))) {
 			$code = '';
 			if (($this->client) && (!empty($this->code_client)) && ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1 || $conf->global->SOCIETE_ADD_REF_IN_LIST == 2)) {
 				$code = $this->code_client.' - ';
@@ -2356,18 +2333,18 @@ class Societe extends CommonObject
 			}
 		}
 
-		if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';
+		if (!empty($this->name_alias)) {
+			$name .= ' ('.$this->name_alias.')';
+		}
 
 		$result = ''; $label = '';
 		$linkstart = ''; $linkend = '';
 
-		if (!empty($this->logo) && class_exists('Form'))
-		{
+		if (!empty($this->logo) && class_exists('Form')) {
 			$label .= '<div class="photointooltip">';
 			$label .= Form::showphoto('societe', $this, 0, 40, 0, '', 'mini', 0); // Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
 			$label .= '</div><div style="clear: both;"></div>';
-		} elseif (!empty($this->logo_squarred) && class_exists('Form'))
-		{
+		} elseif (!empty($this->logo_squarred) && class_exists('Form')) {
 			/*$label.= '<div class="photointooltip">';
 			$label.= Form::showphoto('societe', $this, 0, 40, 0, 'photowithmargin', 'mini', 0);	// Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
 			$label.= '</div><div style="clear: both;"></div>';*/
@@ -2375,43 +2352,34 @@ class Societe extends CommonObject
 
 		$label .= '<div class="centpercent">';
 
-		if ($option == 'customer' || $option == 'compta' || $option == 'category')
-		{
+		if ($option == 'customer' || $option == 'compta' || $option == 'category') {
 			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Customer").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
-		} elseif ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
-		{
+		} elseif ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
 			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Prospect").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
-		} elseif ($option == 'supplier' || $option == 'category_supplier')
-		{
+		} elseif ($option == 'supplier' || $option == 'category_supplier') {
 			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Supplier").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id;
-		} elseif ($option == 'agenda')
-		{
+		} elseif ($option == 'agenda') {
 			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$this->id;
-		} elseif ($option == 'project')
-		{
+		} elseif ($option == 'project') {
 			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/project.php?socid='.$this->id;
-		} elseif ($option == 'margin')
-		{
+		} elseif ($option == 'margin') {
 			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$this->id.'&type=1';
-		} elseif ($option == 'contact')
-		{
+		} elseif ($option == 'contact') {
 			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/contact.php?socid='.$this->id;
-		} elseif ($option == 'ban')
-		{
+		} elseif ($option == 'ban') {
 			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$this->id;
 		}
 
 		// By default
-		if (empty($linkstart))
-		{
+		if (empty($linkstart)) {
 			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$this->id;
 		}
@@ -2419,55 +2387,75 @@ class Societe extends CommonObject
 			$label .= ' '.$this->getLibStatut(5);
 		}
 
-		if (!empty($this->name))
-		{
+		if (!empty($this->name)) {
 			$label .= '<br><b>'.$langs->trans('Name').':</b> '.dol_escape_htmltag($this->name);
-			if (!empty($this->name_alias)) $label .= ' ('.dol_escape_htmltag($this->name_alias).')';
+			if (!empty($this->name_alias)) {
+				$label .= ' ('.dol_escape_htmltag($this->name_alias).')';
+			}
 		}
 		$label .= '<br><b>'.$langs->trans('Email').':</b> '.$this->email;
-		if (!empty($this->country_code))
+		if (!empty($this->country_code)) {
 			$label .= '<br><b>'.$langs->trans('Country').':</b> '.$this->country_code;
-		if (!empty($this->tva_intra) || (!empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP) && strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'vatnumber') !== false))
-			$label .= '<br><b>'.$langs->trans('VATIntra').':</b> '.dol_escape_htmltag($this->tva_intra);
-		if (!empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP))
-		{
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid1') !== false) $label .= '<br><b>'.$langs->trans('ProfId1'.$this->country_code).':</b> '.$this->idprof1;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid2') !== false) $label .= '<br><b>'.$langs->trans('ProfId2'.$this->country_code).':</b> '.$this->idprof2;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid3') !== false) $label .= '<br><b>'.$langs->trans('ProfId3'.$this->country_code).':</b> '.$this->idprof3;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid4') !== false) $label .= '<br><b>'.$langs->trans('ProfId4'.$this->country_code).':</b> '.$this->idprof4;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid5') !== false) $label .= '<br><b>'.$langs->trans('ProfId5'.$this->country_code).':</b> '.$this->idprof5;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid6') !== false) $label .= '<br><b>'.$langs->trans('ProfId6'.$this->country_code).':</b> '.$this->idprof6;
 		}
-		if (!empty($this->code_client) && ($this->client == 1 || $this->client == 3))
+		if (!empty($this->tva_intra) || (!empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP) && strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'vatnumber') !== false)) {
+			$label .= '<br><b>'.$langs->trans('VATIntra').':</b> '.dol_escape_htmltag($this->tva_intra);
+		}
+		if (!empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP)) {
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid1') !== false) {
+				$label .= '<br><b>'.$langs->trans('ProfId1'.$this->country_code).':</b> '.$this->idprof1;
+			}
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid2') !== false) {
+				$label .= '<br><b>'.$langs->trans('ProfId2'.$this->country_code).':</b> '.$this->idprof2;
+			}
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid3') !== false) {
+				$label .= '<br><b>'.$langs->trans('ProfId3'.$this->country_code).':</b> '.$this->idprof3;
+			}
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid4') !== false) {
+				$label .= '<br><b>'.$langs->trans('ProfId4'.$this->country_code).':</b> '.$this->idprof4;
+			}
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid5') !== false) {
+				$label .= '<br><b>'.$langs->trans('ProfId5'.$this->country_code).':</b> '.$this->idprof5;
+			}
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid6') !== false) {
+				$label .= '<br><b>'.$langs->trans('ProfId6'.$this->country_code).':</b> '.$this->idprof6;
+			}
+		}
+		if (!empty($this->code_client) && ($this->client == 1 || $this->client == 3)) {
 			$label .= '<br><b>'.$langs->trans('CustomerCode').':</b> '.$this->code_client;
-		if (!empty($this->code_fournisseur) && $this->fournisseur)
+		}
+		if (!empty($this->code_fournisseur) && $this->fournisseur) {
 			$label .= '<br><b>'.$langs->trans('SupplierCode').':</b> '.$this->code_fournisseur;
-		if (!empty($conf->accounting->enabled) && ($this->client == 1 || $this->client == 3))
+		}
+		if (!empty($conf->accounting->enabled) && ($this->client == 1 || $this->client == 3)) {
 			$label .= '<br><b>'.$langs->trans('CustomerAccountancyCode').':</b> '.($this->code_compta ? $this->code_compta : $this->code_compta_client);
-		if (!empty($conf->accounting->enabled) && $this->fournisseur)
+		}
+		if (!empty($conf->accounting->enabled) && $this->fournisseur) {
 			$label .= '<br><b>'.$langs->trans('SupplierAccountancyCode').':</b> '.$this->code_compta_fournisseur;
+		}
 		$label .= '</div>';
 
 		// Add type of canvas
 		$linkstart .= (!empty($this->canvas) ? '&canvas='.$this->canvas : '');
 		// Add param to save lastsearch_values or not
 		$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-		if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-		if ($add_save_lastsearch_values) $linkstart .= '&save_lastsearch_values=1';
+		if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+			$add_save_lastsearch_values = 1;
+		}
+		if ($add_save_lastsearch_values) {
+			$linkstart .= '&save_lastsearch_values=1';
+		}
 		$linkstart .= '"';
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowCompany");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip refurl"';
 
-		 	/*
+			/*
 			$hookmanager->initHooks(array('thirdpartydao'));
 			$parameters=array('id'=>$this->id);
 			$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
@@ -2478,15 +2466,18 @@ class Societe extends CommonObject
 		$linkend = '</a>';
 
 		global $user;
-		if (!$user->rights->societe->client->voir && $user->socid > 0 && $this->id != $user->socid)
-		{
+		if (!$user->rights->societe->client->voir && $user->socid > 0 && $this->id != $user->socid) {
 			$linkstart = '';
 			$linkend = '';
 		}
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= dol_escape_htmltag($maxlen ? dol_trunc($name, $maxlen) : $name);
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= dol_escape_htmltag($maxlen ? dol_trunc($name, $maxlen) : $name);
+		}
 		$result .= $linkend;
 
 		global $action;
@@ -2501,8 +2492,11 @@ class Societe extends CommonObject
 			'save_lastsearch_value'=> $save_lastsearch_value
 		);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -2533,10 +2527,11 @@ class Societe extends CommonObject
 		$langs->load('companies');
 
 		$statusType = 'status4';
-		if ($status == 0) $statusType = 'status6';
+		if ($status == 0) {
+			$statusType = 'status6';
+		}
 
-		if (empty($this->labelStatus) || empty($this->labelStatusShort))
-		{
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			$this->labelStatus[0] = $langs->trans("ActivityCeased");
 			$this->labelStatus[1] = $langs->trans("InActivity");
 			$this->labelStatusShort[0] = $langs->trans("ActivityCeased");
@@ -2559,9 +2554,10 @@ class Societe extends CommonObject
 		global $langs;
 
 		$contact_emails = $this->contact_property_array('email', 1);
-		if ($this->email && $addthirdparty)
-		{
-			if (empty($this->name)) $this->name = $this->nom;
+		if ($this->email && $addthirdparty) {
+			if (empty($this->name)) {
+				$this->name = $this->nom;
+			}
 			$contact_emails['thirdparty'] = $langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name, 16)." <".$this->email.">";
 		}
 		//var_dump($contact_emails)
@@ -2581,9 +2577,10 @@ class Societe extends CommonObject
 
 		$contact_phone = $this->contact_property_array('mobile');
 
-		if (!empty($this->phone))	// If a phone of thirdparty is defined, we add it ot mobile of contacts
-		{
-			if (empty($this->name)) $this->name = $this->nom;
+		if (!empty($this->phone)) {	// If a phone of thirdparty is defined, we add it ot mobile of contacts
+			if (empty($this->name)) {
+				$this->name = $this->nom;
+			}
 			// TODO: Tester si tel non deja present dans tableau contact
 			$contact_phone['thirdparty'] = $langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name, 16)." <".$this->phone.">";
 		}
@@ -2612,36 +2609,36 @@ class Societe extends CommonObject
 		$sql .= " ORDER BY lastname, firstname";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$nump = $this->db->num_rows($resql);
-			if ($nump)
-			{
+			if ($nump) {
 				$sepa = "("; $sepb = ")";
-				if ($mode == 'email')
-				{
+				if ($mode == 'email') {
 					//$sepa="&lt;"; $sepb="&gt;";
 					$sepa = "<"; $sepb = ">";
 				}
 				$i = 0;
-				while ($i < $nump)
-				{
+				while ($i < $nump) {
 					$obj = $this->db->fetch_object($resql);
-					if ($mode == 'email') $property = $obj->email;
-					elseif ($mode == 'mobile') $property = $obj->phone_mobile;
-					else $property = $obj->$mode;
+					if ($mode == 'email') {
+						$property = $obj->email;
+					} elseif ($mode == 'mobile') {
+						$property = $obj->phone_mobile;
+					} else {
+						$property = $obj->$mode;
+					}
 
 					// Show all contact. If hidedisabled is 1, showonly contacts with status = 1
-					if ($obj->status == 1 || empty($hidedisabled))
-					{
-						if (empty($property))
-						{
-							if ($mode == 'email') $property = $langs->transnoentitiesnoconv("NoEMail");
-							elseif ($mode == 'mobile') $property = $langs->transnoentitiesnoconv("NoMobilePhone");
+					if ($obj->status == 1 || empty($hidedisabled)) {
+						if (empty($property)) {
+							if ($mode == 'email') {
+								$property = $langs->transnoentitiesnoconv("NoEMail");
+							} elseif ($mode == 'mobile') {
+								$property = $langs->transnoentitiesnoconv("NoMobilePhone");
+							}
 						}
 
-						if (!empty($obj->poste))
-						{
+						if (!empty($obj->poste)) {
 							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname, $obj->lastname)).($obj->poste ? " - ".$obj->poste : "").(($mode != 'poste' && $property) ? " ".$sepa.$property.$sepb : '');
 						} else {
 							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname, $obj->lastname)).(($mode != 'poste' && $property) ? " ".$sepa.$property.$sepb : '');
@@ -2670,14 +2667,11 @@ class Societe extends CommonObject
 
 		$sql = "SELECT rowid, lastname, firstname FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$nump = $this->db->num_rows($resql);
-			if ($nump)
-			{
+			if ($nump) {
 				$i = 0;
-				while ($i < $nump)
-				{
+				while ($i < $nump) {
 					$obj = $this->db->fetch_object($resql);
 					$contacts[$obj->rowid] = dolGetFirstLastname($obj->firstname, $obj->lastname);
 					$i++;
@@ -2703,14 +2697,11 @@ class Societe extends CommonObject
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$nump = $this->db->num_rows($resql);
-			if ($nump)
-			{
+			if ($nump) {
 				$i = 0;
-				while ($i < $nump)
-				{
+				while ($i < $nump) {
 					$obj = $this->db->fetch_object($resql);
 					$contact = new Contact($this->db);
 					$contact->fetch($obj->rowid);
@@ -2737,23 +2728,26 @@ class Societe extends CommonObject
 		// phpcs:enable
 		$contact_property = '';
 
-		if (empty($rowid)) return '';
+		if (empty($rowid)) {
+			return '';
+		}
 
 		$sql = "SELECT rowid, email, phone_mobile, lastname, firstname";
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople";
 		$sql .= " WHERE rowid = ".((int) $rowid);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$nump = $this->db->num_rows($resql);
 
-			if ($nump)
-			{
+			if ($nump) {
 				$obj = $this->db->fetch_object($resql);
 
-				if ($mode == 'email') $contact_property = dol_string_nospecial(dolGetFirstLastname($obj->firstname, $obj->lastname), ' ', array(","))." <".$obj->email.">";
-				elseif ($mode == 'mobile') $contact_property = $obj->phone_mobile;
+				if ($mode == 'email') {
+					$contact_property = dol_string_nospecial(dolGetFirstLastname($obj->firstname, $obj->lastname), ' ', array(","))." <".$obj->email.">";
+				} elseif ($mode == 'mobile') {
+					$contact_property = $obj->phone_mobile;
+				}
 			}
 			return $contact_property;
 		} else {
@@ -2841,15 +2835,15 @@ class Societe extends CommonObject
 	{
 		// phpcs:enable
 		global $conf;
-		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-		{
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON)) {
 			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
 			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
+			foreach ($dirsociete as $dirroot) {
 				$res = dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 			$mod = new $module();
 
@@ -2873,15 +2867,15 @@ class Societe extends CommonObject
 	{
 		// phpcs:enable
 		global $conf;
-		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-		{
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON)) {
 			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
 			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
+			foreach ($dirsociete as $dirroot) {
 				$res = dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 			$mod = new $module();
 
@@ -2902,23 +2896,29 @@ class Societe extends CommonObject
 	{
 		// phpcs:enable
 		global $conf;
-		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-		{
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON)) {
 			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
 			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
+			foreach ($dirsociete as $dirroot) {
 				$res = dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 
 			$mod = new $module();
 
 			dol_syslog(get_class($this)."::codeclient_modifiable code_client=".$this->code_client." module=".$module);
-			if ($mod->code_modifiable_null && !$this->code_client) return 1;
-			if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) return 1;
-			if ($mod->code_modifiable) return 1; // A mettre en dernier
+			if ($mod->code_modifiable_null && !$this->code_client) {
+				return 1;
+			}
+			if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) {
+				return 1;
+			}
+			if ($mod->code_modifiable) {
+				return 1; // A mettre en dernier
+			}
 			return 0;
 		} else {
 			return 0;
@@ -2936,23 +2936,29 @@ class Societe extends CommonObject
 	{
 		// phpcs:enable
 		global $conf;
-		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-		{
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON)) {
 			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
 			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
+			foreach ($dirsociete as $dirroot) {
 				$res = dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 
 			$mod = new $module();
 
 			dol_syslog(get_class($this)."::codefournisseur_modifiable code_founisseur=".$this->code_fournisseur." module=".$module);
-			if ($mod->code_modifiable_null && !$this->code_fournisseur) return 1;
-			if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) return 1;
-			if ($mod->code_modifiable) return 1; // A mettre en dernier
+			if ($mod->code_modifiable_null && !$this->code_fournisseur) {
+				return 1;
+			}
+			if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) {
+				return 1;
+			}
+			if ($mod->code_modifiable) {
+				return 1; // A mettre en dernier
+			}
 			return 0;
 		} else {
 			return 0;
@@ -2976,25 +2982,25 @@ class Societe extends CommonObject
 	{
 		// phpcs:enable
 		global $conf;
-		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-		{
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON)) {
 			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
 			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
+			foreach ($dirsociete as $dirroot) {
 				$res = dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 
 			$mod = new $module();
 
-		   	dol_syslog(get_class($this)."::check_codeclient code_client=".$this->code_client." module=".$module);
-		   	$result = $mod->verif($this->db, $this->code_client, $this, 0);
-		   	if ($result) {	// If error
-		   		$this->error = $mod->error;
-		   		$this->errors = $mod->errors;
-		   	}
+			dol_syslog(get_class($this)."::check_codeclient code_client=".$this->code_client." module=".$module);
+			$result = $mod->verif($this->db, $this->code_client, $this, 0);
+			if ($result) {	// If error
+				$this->error = $mod->error;
+				$this->errors = $mod->errors;
+			}
 			return $result;
 		} else {
 			return 0;
@@ -3015,15 +3021,15 @@ class Societe extends CommonObject
 	{
 		// phpcs:enable
 		global $conf;
-		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-		{
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON)) {
 			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
 			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
+			foreach ($dirsociete as $dirroot) {
 				$res = dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 
 			$mod = new $module();
@@ -3054,26 +3060,28 @@ class Societe extends CommonObject
 		// phpcs:enable
 		global $conf;
 
-		if (!empty($conf->global->SOCIETE_CODECOMPTA_ADDON))
-		{
+		if (!empty($conf->global->SOCIETE_CODECOMPTA_ADDON)) {
 			$res = false;
 			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
+			foreach ($dirsociete as $dirroot) {
 				$res = dol_include_once($dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 
-			if ($res)
-			{
+			if ($res) {
 				$classname = $conf->global->SOCIETE_CODECOMPTA_ADDON;
 				$mod = new $classname;
 
 				// Set code count in $mod->code
 				$result = $mod->get_code($this->db, $this, $type);
 
-				if ($type == 'customer') $this->code_compta = $mod->code;
-				elseif ($type == 'supplier') $this->code_compta_fournisseur = $mod->code;
+				if ($type == 'customer') {
+					$this->code_compta = $mod->code;
+				} elseif ($type == 'supplier') {
+					$this->code_compta_fournisseur = $mod->code;
+				}
 
 				return $result;
 			} else {
@@ -3081,8 +3089,11 @@ class Societe extends CommonObject
 				return -1;
 			}
 		} else {
-			if ($type == 'customer') $this->code_compta = '';
-			elseif ($type == 'supplier') $this->code_compta_fournisseur = '';
+			if ($type == 'customer') {
+				$this->code_compta = '';
+			} elseif ($type == 'supplier') {
+				$this->code_compta_fournisseur = '';
+			}
 
 			return 0;
 		}
@@ -3098,21 +3109,21 @@ class Societe extends CommonObject
 	public function set_parent($id)
 	{
 		// phpcs:enable
-		if ($this->id)
-		{
+		if ($this->id) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
 			$sql .= " SET parent = ".($id > 0 ? $id : "null");
 			$sql .= " WHERE rowid = ".$this->id;
 			dol_syslog(get_class($this).'::set_parent', LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$this->parent = $id;
 				return 1;
 			} else {
 				return -1;
 			}
-		} else return -1;
+		} else {
+			return -1;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -3127,8 +3138,7 @@ class Societe extends CommonObject
 		// phpcs:enable
 		global $conf;
 
-	 	switch ($idprof)
-		{
+		switch ($idprof) {
 			case 1:
 				$ret = (empty($conf->global->SOCIETE_IDPROF1_UNIQUE) ? false : true);
 				break;
@@ -3168,8 +3178,7 @@ class Societe extends CommonObject
 		// phpcs:enable
 		$field = $idprof;
 
-	 	switch ($idprof)	// For backward compatibility
-		{
+		switch ($idprof) {	// For backward compatibility
 			case '1':
 			case 'idprof1':
 				$field = "siren";
@@ -3192,14 +3201,15 @@ class Societe extends CommonObject
 			case '6':
 				$field = "idprof6";
 				break;
-	 	}
+		}
 
 		 //Verify duplicate entries
 		$sql = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$this->db->escape($value)."' AND entity IN (".getEntity('societe').")";
-		if ($socid) $sql .= " AND rowid <> ".$socid;
+		if ($socid) {
+			$sql .= " AND rowid <> ".$socid;
+		}
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			$count = $obj->idprof;
 		} else {
@@ -3208,8 +3218,11 @@ class Societe extends CommonObject
 		}
 		$this->db->free($resql);
 
-		if ($count > 0) return true;
-		else return false;
+		if ($count > 0) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -3228,111 +3241,144 @@ class Societe extends CommonObject
 
 		$ok = 1;
 
-		if (!empty($conf->global->MAIN_DISABLEPROFIDRULES)) return 1;
+		if (!empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
+			return 1;
+		}
 
 		// Check SIREN if country FR
-		if ($idprof == 1 && $soc->country_code == 'FR')
-		{
+		if ($idprof == 1 && $soc->country_code == 'FR') {
 			$chaine = trim($this->idprof1);
 			$chaine = preg_replace('/(\s)/', '', $chaine);
 
-			if (!is_numeric($chaine)) return -1;
-			if (dol_strlen($chaine) != 9) return -1;
+			if (!is_numeric($chaine)) {
+				return -1;
+			}
+			if (dol_strlen($chaine) != 9) {
+				return -1;
+			}
 
 			// on prend chaque chiffre un par un
 			// si son index (position dans la chaîne en commence à 0 au premier caractère) est impair
 			// on double sa valeur et si cette dernière est supérieure à 9, on lui retranche 9
 			// on ajoute cette valeur à la somme totale
 			$sum = 0;
-			for ($index = 0; $index < 9; $index++)
-			{
+			for ($index = 0; $index < 9; $index++) {
 				$number = (int) $chaine[$index];
-				if (($index % 2) != 0) { if (($number *= 2) > 9) $number -= 9; }
+				if (($index % 2) != 0) {
+					if (($number *= 2) > 9) {
+						$number -= 9;
+					}
+				}
 				$sum += $number;
 			}
 
 			// le numéro est valide si la somme des chiffres est multiple de 10
-			if (($sum % 10) != 0) return -1;
+			if (($sum % 10) != 0) {
+				return -1;
+			}
 		}
 
 		// Verifie SIRET si pays FR
-		if ($idprof == 2 && $soc->country_code == 'FR')
-		{
+		if ($idprof == 2 && $soc->country_code == 'FR') {
 			$chaine = trim($this->idprof2);
 			$chaine = preg_replace('/(\s)/', '', $chaine);
 
-			if (!is_numeric($chaine)) return -1;
-			if (dol_strlen($chaine) != 14) return -1;
+			if (!is_numeric($chaine)) {
+				return -1;
+			}
+			if (dol_strlen($chaine) != 14) {
+				return -1;
+			}
 
 			// on prend chaque chiffre un par un
 			// si son index (position dans la chaîne en commence à 0 au premier caractère) est pair
 			// on double sa valeur et si cette dernière est supérieure à 9, on lui retranche 9
 			// on ajoute cette valeur à la somme totale
 			$sum = 0;
-			for ($index = 0; $index < 14; $index++)
-			{
+			for ($index = 0; $index < 14; $index++) {
 				$number = (int) $chaine[$index];
-				if (($index % 2) == 0) { if (($number *= 2) > 9) $number -= 9; }
+				if (($index % 2) == 0) {
+					if (($number *= 2) > 9) {
+						$number -= 9;
+					}
+				}
 				$sum += $number;
 			}
 
 			// le numéro est valide si la somme des chiffres est multiple de 10
-			if (($sum % 10) != 0) return -1;
+			if (($sum % 10) != 0) {
+				return -1;
+			}
 		}
 
 		//Verify CIF/NIF/NIE if pays ES
 		//Returns: 1 if NIF ok, 2 if CIF ok, 3 if NIE ok, -1 if NIF bad, -2 if CIF bad, -3 if NIE bad, 0 if unexpected bad
-		if ($idprof == 1 && $soc->country_code == 'ES')
-		{
+		if ($idprof == 1 && $soc->country_code == 'ES') {
 			$string = trim($this->idprof1);
 			$string = preg_replace('/(\s)/', '', $string);
 			$string = strtoupper($string);
 
 			//Check format
-			if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $string))
-			return 0;
+			if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $string)) {
+				return 0;
+			}
 
 			$num = array();
-			for ($i = 0; $i < 9; $i++)
-			{
+			for ($i = 0; $i < 9; $i++) {
 				$num[$i] = substr($string, $i, 1);
 			}
 
 			//Check NIF
-			if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string))
-				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1))
+			if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string)) {
+				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1)) {
 					return 1;
-			else return -1;
+				} else {
+					return -1;
+				}
+			}
 
 			//algorithm checking type code CIF
 			$sum = $num[2] + $num[4] + $num[6];
-			for ($i = 1; $i < 8; $i += 2)
-			$sum += intval(substr((2 * $num[$i]), 0, 1)) + intval(substr((2 * $num[$i]), 1, 1));
+			for ($i = 1; $i < 8; $i += 2) {
+				$sum += intval(substr((2 * $num[$i]), 0, 1)) + intval(substr((2 * $num[$i]), 1, 1));
+			}
 			$n = 10 - substr($sum, strlen($sum) - 1, 1);
 
 			//Chek special NIF
-			if (preg_match('/^[KLM]{1}/', $string))
-				if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1))
+			if (preg_match('/^[KLM]{1}/', $string)) {
+				if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1)) {
 					return 1;
-			else return -1;
+				} else {
+					return -1;
+				}
+			}
 
 			//Check CIF
-			if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string))
-				if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1))
+			if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string)) {
+				if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1)) {
 					return 2;
-			else return -2;
+				} else {
+					return -2;
+				}
+			}
 
 			//Check NIE T
-			if (preg_match('/^[T]{1}/', $string))
-				if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string))
+			if (preg_match('/^[T]{1}/', $string)) {
+				if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string)) {
 					return 3;
-			else return -3;
+				} else {
+					return -3;
+				}
+			}
 
 			//Check NIE XYZ
-			if (preg_match('/^[XYZ]{1}/', $string))
-				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X', 'Y', 'Z'), array('0', '1', '2'), $string), 0, 8) % 23, 1))
+			if (preg_match('/^[XYZ]{1}/', $string)) {
+				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X', 'Y', 'Z'), array('0', '1', '2'), $string), 0, 8) % 23, 1)) {
 					return 3;
-			else return -3;
+				} else {
+					return -3;
+				}
+			}
 
 			//Can not be verified
 			return -4;
@@ -3340,8 +3386,7 @@ class Societe extends CommonObject
 
 		//Verify NIF if country is PT
 		//Returns: 1 if NIF ok, -1 if NIF bad, 0 if unexpected bad
-		if ($idprof == 1 && $soc->country_code == 'PT')
-		{
+		if ($idprof == 1 && $soc->country_code == 'PT') {
 			$string = trim($this->idprof1);
 			$string = preg_replace('/(\s)/', '', $string);
 
@@ -3420,8 +3465,7 @@ class Societe extends CommonObject
 		// phpcs:enable
 		$sql = 'SELECT COUNT(*) as numproj FROM '.MAIN_DB_PREFIX.'projet WHERE fk_soc = '.$this->id;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			$count = $obj->numproj;
 		} else {
@@ -3447,10 +3491,8 @@ class Societe extends CommonObject
 		$sql .= " WHERE s.rowid = ".$id;
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 
 				$this->id = $obj->rowid;
@@ -3493,11 +3535,13 @@ class Societe extends CommonObject
 			$isacompany = 1;
 		} elseif (!empty($this->idprof1) || !empty($this->idprof2) || !empty($this->idprof3) || !empty($this->idprof4) || !empty($this->idprof5) || !empty($this->idprof6)) {
 			$isacompany = 1;
-		} elseif (!empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN')
-		{
+		} elseif (!empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN') {
 			// TODO Add a field is_a_company into dictionary
-			if (preg_match('/^TE_PRIVATE/', $this->typent_code)) $isacompany = 0;
-			else $isacompany = 1;
+			if (preg_match('/^TE_PRIVATE/', $this->typent_code)) {
+				$isacompany = 0;
+			} else {
+				$isacompany = 1;
+			}
 		}
 
 		return $isacompany;
@@ -3529,10 +3573,8 @@ class Societe extends CommonObject
 		$sql .= " WHERE type = ".Categorie::TYPE_SUPPLIER;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$this->SupplierCategories[$obj->rowid] = $obj->label;
 			}
 			return 0;
@@ -3551,12 +3593,13 @@ class Societe extends CommonObject
 	public function AddFournisseurInCategory($categorie_id)
 	{
 		// phpcs:enable
-		if ($categorie_id > 0 && $this->id > 0)
-		{
+		if ($categorie_id > 0 && $this->id > 0) {
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_fournisseur (fk_categorie, fk_soc) ";
 			$sql .= " VALUES (".$categorie_id.", ".$this->id.")";
 
-			if ($resql = $this->db->query($sql)) return 0;
+			if ($resql = $this->db->query($sql)) {
+				return 0;
+			}
 		} else {
 			return 0;
 		}
@@ -3582,7 +3625,9 @@ class Societe extends CommonObject
 		dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
 
 		$name = $socname ? $socname : $member->societe;
-		if (empty($name)) $name = $member->getFullName($langs);
+		if (empty($name)) {
+			$name = $member->getFullName($langs);
+		}
 
 		$alias = $socalias ? $socalias : '';
 
@@ -3608,15 +3653,13 @@ class Societe extends CommonObject
 
 		// Cree et positionne $this->id
 		$result = $this->create($user);
-		if ($result >= 0)
-		{
+		if ($result >= 0) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
 			$sql .= " SET fk_soc=".$this->id;
 			$sql .= " WHERE rowid=".$member->id;
 
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$this->db->commit();
 				return $this->id;
 			} else {
@@ -3658,12 +3701,10 @@ class Societe extends CommonObject
 
 		// We define country_id, country_code and country
 		$country_id = $country_code = $country_label = '';
-		if (!empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY))
-		{
+		if (!empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY)) {
 			$tmp = explode(':', $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
 			$country_id = $tmp[0];
-			if (!empty($tmp[1]))   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
-			{
+			if (!empty($tmp[1])) {   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
 				$country_code = $tmp[1];
 				$country_label = $tmp[2];
 			} else // For backward compatibility
@@ -3677,17 +3718,17 @@ class Societe extends CommonObject
 		$this->country_id = $country_id;
 		$this->country_code = $country_code;
 		$this->country = $country_label;
-		if (is_object($langs)) $this->country = ($langs->trans('Country'.$country_code) != 'Country'.$country_code) ? $langs->trans('Country'.$country_code) : $country_label;
+		if (is_object($langs)) {
+			$this->country = ($langs->trans('Country'.$country_code) != 'Country'.$country_code) ? $langs->trans('Country'.$country_code) : $country_label;
+		}
 
 		//TODO This could be replicated for region but function `getRegion` didn't exist, so I didn't added it.
 		// We define state_id, state_code and state
 		$state_id = 0; $state_code = $state_label = '';
-		if (!empty($conf->global->MAIN_INFO_SOCIETE_STATE))
-		{
+		if (!empty($conf->global->MAIN_INFO_SOCIETE_STATE)) {
 			$tmp = explode(':', $conf->global->MAIN_INFO_SOCIETE_STATE);
 			$state_id = $tmp[0];
-			if (!empty($tmp[1]))   // If $conf->global->MAIN_INFO_SOCIETE_STATE is "id:code:label"
-			{
+			if (!empty($tmp[1])) {   // If $conf->global->MAIN_INFO_SOCIETE_STATE is "id:code:label"
 				$state_code = $tmp[1];
 				$state_label = $tmp[2];
 			} else // For backward compatibility
@@ -3701,7 +3742,9 @@ class Societe extends CommonObject
 		$this->state_id = $state_id;
 		$this->state_code = $state_code;
 		$this->state = $state_label;
-		if (is_object($langs)) $this->state = ($langs->trans('State'.$state_code) != 'State'.$state_code) ? $langs->trans('State'.$state_code) : $state_label;
+		if (is_object($langs)) {
+			$this->state = ($langs->trans('State'.$state_code) != 'State'.$state_code) ? $langs->trans('State'.$state_code) : $state_label;
+		}
 
 		$this->phone = empty($conf->global->MAIN_INFO_SOCIETE_TEL) ? '' : $conf->global->MAIN_INFO_SOCIETE_TEL;
 		$this->fax = empty($conf->global->MAIN_INFO_SOCIETE_FAX) ? '' : $conf->global->MAIN_INFO_SOCIETE_FAX;
@@ -3715,12 +3758,24 @@ class Societe extends CommonObject
 		$this->youtube_url = empty($conf->global->MAIN_INFO_SOCIETE_YOUTUBE_URL) ? '' : $conf->global->MAIN_INFO_SOCIETE_YOUTUBE_URL;
 		$this->github_url = empty($conf->global->MAIN_INFO_SOCIETE_GITHUB_URL) ? '' : $conf->global->MAIN_INFO_SOCIETE_GITHUB_URL;
 		$this->socialnetworks = array();
-		if (!empty($this->facebook_url)) $this->socialnetworks['facebook'] = $this->facebook_url;
-		if (!empty($this->twitter_url)) $this->socialnetworks['twitter'] = $this->twitter_url;
-		if (!empty($this->linkedin_url)) $this->socialnetworks['linkedin'] = $this->linkedin_url;
-		if (!empty($this->instagram_url)) $this->socialnetworks['instagram'] = $this->instagram_url;
-		if (!empty($this->youtube_url)) $this->socialnetworks['youtube'] = $this->youtube_url;
-		if (!empty($this->github_url)) $this->socialnetworks['github'] = $this->github_url;
+		if (!empty($this->facebook_url)) {
+			$this->socialnetworks['facebook'] = $this->facebook_url;
+		}
+		if (!empty($this->twitter_url)) {
+			$this->socialnetworks['twitter'] = $this->twitter_url;
+		}
+		if (!empty($this->linkedin_url)) {
+			$this->socialnetworks['linkedin'] = $this->linkedin_url;
+		}
+		if (!empty($this->instagram_url)) {
+			$this->socialnetworks['instagram'] = $this->instagram_url;
+		}
+		if (!empty($this->youtube_url)) {
+			$this->socialnetworks['youtube'] = $this->youtube_url;
+		}
+		if (!empty($this->github_url)) {
+			$this->socialnetworks['github'] = $this->github_url;
+		}
 
 		// Id prof generiques
 		$this->idprof1 = empty($conf->global->MAIN_INFO_SIREN) ? '' : $conf->global->MAIN_INFO_SIREN;
@@ -3820,15 +3875,20 @@ class Societe extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
 		$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
 		$sql .= " AND t.active = 1";
-		if (empty($localTaxNum))   $sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
-		elseif ($localTaxNum == 1) $sql .= " AND t.localtax1_type <> '0'";
-		elseif ($localTaxNum == 2) $sql .= " AND t.localtax2_type <> '0'";
+		if (empty($localTaxNum)) {
+			$sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
+		} elseif ($localTaxNum == 1) {
+			$sql .= " AND t.localtax1_type <> '0'";
+		} elseif ($localTaxNum == 2) {
+			$sql .= " AND t.localtax2_type <> '0'";
+		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-   			return ($this->db->num_rows($resql) > 0);
-		} else return false;
+		if ($resql) {
+			return ($this->db->num_rows($resql) > 0);
+		} else {
+			return false;
+		}
 	}
 
 	/**
@@ -3845,10 +3905,11 @@ class Societe extends CommonObject
 
 		dol_syslog("useNPR", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			return ($this->db->num_rows($resql) > 0);
-		} else return false;
+		} else {
+			return false;
+		}
 	}
 
 	/**
@@ -3866,10 +3927,9 @@ class Societe extends CommonObject
 
 		dol_syslog("useRevenueStamp", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
-   			return (($obj->nb > 0) ?true:false);
+			return (($obj->nb > 0) ?true:false);
 		} else {
 			$this->error = $this->db->lasterror();
 			return false;
@@ -3900,8 +3960,7 @@ class Societe extends CommonObject
 
 		$lib = $langs->trans("ProspectLevel".$fk_prospectlevel);
 		// If lib not found in language file, we get label from cache/databse
-		if ($lib == $langs->trans("ProspectLevel".$fk_prospectlevel))
-		{
+		if ($lib == $langs->trans("ProspectLevel".$fk_prospectlevel)) {
 			$lib = $langs->getLabelFromKey($this->db, $fk_prospectlevel, 'c_prospectlevel', 'code', 'label');
 		}
 		return $lib;
@@ -3955,30 +4014,45 @@ class Societe extends CommonObject
 		$langs->load('customers');
 
 		if ($mode == 2) {
-			if ($status == '-1' || $status == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"), -1, $picto).' '.$langs->trans("StatusProspect-1");
-			elseif ($status == '0' || $status == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0, $picto).' '.$langs->trans("StatusProspect0");
-			elseif ($status == '1' || $status == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1, $picto).' '.$langs->trans("StatusProspect1");
-			elseif ($status == '2' || $status == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2, $picto).' '.$langs->trans("StatusProspect2");
-			elseif ($status == '3' || $status == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3, $picto).' '.$langs->trans("StatusProspect3");
-			else {
+			if ($status == '-1' || $status == 'ST_NO') {
+				return img_action($langs->trans("StatusProspect-1"), -1, $picto).' '.$langs->trans("StatusProspect-1");
+			} elseif ($status == '0' || $status == 'ST_NEVER') {
+				return img_action($langs->trans("StatusProspect0"), 0, $picto).' '.$langs->trans("StatusProspect0");
+			} elseif ($status == '1' || $status == 'ST_TODO') {
+				return img_action($langs->trans("StatusProspect1"), 1, $picto).' '.$langs->trans("StatusProspect1");
+			} elseif ($status == '2' || $status == 'ST_PEND') {
+				return img_action($langs->trans("StatusProspect2"), 2, $picto).' '.$langs->trans("StatusProspect2");
+			} elseif ($status == '3' || $status == 'ST_DONE') {
+				return img_action($langs->trans("StatusProspect3"), 3, $picto).' '.$langs->trans("StatusProspect3");
+			} else {
 				return img_action(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label, 0, $picto).' '.(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label);
 			}
 		} elseif ($mode == 3) {
-			if ($status == '-1' || $status == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"), -1, $picto);
-			elseif ($status == '0' || $status == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0, $picto);
-			elseif ($status == '1' || $status == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1, $picto);
-			elseif ($status == '2' || $status == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2, $picto);
-			elseif ($status == '3' || $status == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3, $picto);
-			else {
+			if ($status == '-1' || $status == 'ST_NO') {
+				return img_action($langs->trans("StatusProspect-1"), -1, $picto);
+			} elseif ($status == '0' || $status == 'ST_NEVER') {
+				return img_action($langs->trans("StatusProspect0"), 0, $picto);
+			} elseif ($status == '1' || $status == 'ST_TODO') {
+				return img_action($langs->trans("StatusProspect1"), 1, $picto);
+			} elseif ($status == '2' || $status == 'ST_PEND') {
+				return img_action($langs->trans("StatusProspect2"), 2, $picto);
+			} elseif ($status == '3' || $status == 'ST_DONE') {
+				return img_action($langs->trans("StatusProspect3"), 3, $picto);
+			} else {
 				return img_action(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label, 0, $picto);
 			}
 		} elseif ($mode == 4) {
-			if ($status == '-1' || $status == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"), -1, $picto).' '.$langs->trans("StatusProspect-1");
-			elseif ($status == '0' || $status == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0, $picto).' '.$langs->trans("StatusProspect0");
-			elseif ($status == '1' || $status == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1, $picto).' '.$langs->trans("StatusProspect1");
-			elseif ($status == '2' || $status == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2, $picto).' '.$langs->trans("StatusProspect2");
-			elseif ($status == '3' || $status == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3, $picto).' '.$langs->trans("StatusProspect3");
-			else {
+			if ($status == '-1' || $status == 'ST_NO') {
+				return img_action($langs->trans("StatusProspect-1"), -1, $picto).' '.$langs->trans("StatusProspect-1");
+			} elseif ($status == '0' || $status == 'ST_NEVER') {
+				return img_action($langs->trans("StatusProspect0"), 0, $picto).' '.$langs->trans("StatusProspect0");
+			} elseif ($status == '1' || $status == 'ST_TODO') {
+				return img_action($langs->trans("StatusProspect1"), 1, $picto).' '.$langs->trans("StatusProspect1");
+			} elseif ($status == '2' || $status == 'ST_PEND') {
+				return img_action($langs->trans("StatusProspect2"), 2, $picto).' '.$langs->trans("StatusProspect2");
+			} elseif ($status == '3' || $status == 'ST_DONE') {
+				return img_action($langs->trans("StatusProspect3"), 3, $picto).' '.$langs->trans("StatusProspect3");
+			} else {
 				return img_action(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label, 0, $picto).' '.(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label);
 			}
 		}
@@ -4009,7 +4083,9 @@ class Societe extends CommonObject
 	public function getOutstandingProposals($mode = 'customer')
 	{
 		$table = 'propal';
-		if ($mode == 'supplier') $table = 'supplier_proposal';
+		if ($mode == 'supplier') {
+			$table = 'supplier_proposal';
+		}
 
 		$sql  = "SELECT rowid, total_ht, total as total_ttc, fk_statut as status FROM ".MAIN_DB_PREFIX.$table." as f";
 		$sql .= " WHERE fk_soc = ".$this->id;
@@ -4021,21 +4097,22 @@ class Societe extends CommonObject
 
 		dol_syslog("getOutstandingProposals", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$outstandingOpened = 0;
 			$outstandingTotal = 0;
 			$outstandingTotalIncTax = 0;
 			while ($obj = $this->db->fetch_object($resql)) {
 				$outstandingTotal += $obj->total_ht;
 				$outstandingTotalIncTax += $obj->total_ttc;
-				if ($obj->status != 0)    // Not a draft
-				{
+				if ($obj->status != 0) {
+					// Not a draft
 					$outstandingOpened += $obj->total_ttc;
 				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -4047,7 +4124,9 @@ class Societe extends CommonObject
 	public function getOutstandingOrders($mode = 'customer')
 	{
 		$table = 'commande';
-		if ($mode == 'supplier') $table = 'commande_fournisseur';
+		if ($mode == 'supplier') {
+			$table = 'commande_fournisseur';
+		}
 
 		$sql  = "SELECT rowid, total_ht, total_ttc, fk_statut as status FROM ".MAIN_DB_PREFIX.$table." as f";
 		$sql .= " WHERE fk_soc = ".$this->id;
@@ -4059,21 +4138,22 @@ class Societe extends CommonObject
 
 		dol_syslog("getOutstandingOrders", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$outstandingOpened = 0;
 			$outstandingTotal = 0;
 			$outstandingTotalIncTax = 0;
 			while ($obj = $this->db->fetch_object($resql)) {
 				$outstandingTotal += $obj->total_ht;
 				$outstandingTotalIncTax += $obj->total_ttc;
-				if ($obj->status != 0)    // Not a draft
-				{
+				if ($obj->status != 0) {
+					// Not a draft
 					$outstandingOpened += $obj->total_ttc;
 				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -4086,7 +4166,9 @@ class Societe extends CommonObject
 	public function getOutstandingBills($mode = 'customer', $late = 0)
 	{
 		$table = 'facture';
-		if ($mode == 'supplier') $table = 'facture_fourn';
+		if ($mode == 'supplier') {
+			$table = 'facture_fourn';
+		}
 
 		/* Accurate value of remain to pay is to sum remaintopay for each invoice
 		 $paiement = $invoice->getSommePaiement();
@@ -4095,8 +4177,11 @@ class Societe extends CommonObject
 		 $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
 		 $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
 		 */
-		if ($mode == 'supplier') $sql = "SELECT rowid, total_ht as total_ht, total_ttc, paye, type, fk_statut as status, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
-		else $sql = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut as status, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		if ($mode == 'supplier') {
+			$sql = "SELECT rowid, total_ht as total_ht, total_ttc, paye, type, fk_statut as status, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		} else {
+			$sql = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut as status, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		}
 		$sql .= " WHERE fk_soc = ".$this->id;
 		if (!empty($late)) {
 			$sql .= " AND date_lim_reglement < '".$this->db->idate(dol_now())."'";
@@ -4109,13 +4194,11 @@ class Societe extends CommonObject
 
 		dol_syslog("getOutstandingBills", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$outstandingOpened = 0;
 			$outstandingTotal = 0;
 			$outstandingTotalIncTax = 0;
-			if ($mode == 'supplier')
-			{
+			if ($mode == 'supplier') {
 				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 				$tmpobject = new FactureFournisseur($this->db);
 			} else {
@@ -4127,17 +4210,15 @@ class Societe extends CommonObject
 
 				if ($obj->status != $tmpobject::STATUS_DRAFT                                           // Not a draft
 					&& !($obj->status == $tmpobject::STATUS_ABANDONED && $obj->close_code == 'replaced')  // Not a replaced invoice
-					)
-				{
+					) {
 					$outstandingTotal += $obj->total_ht;
 					$outstandingTotalIncTax += $obj->total_ttc;
 				}
 				if ($obj->paye == 0
 					&& $obj->status != $tmpobject::STATUS_DRAFT    		// Not a draft
 					&& $obj->status != $tmpobject::STATUS_ABANDONED	    // Not abandonned
-					&& $obj->status != $tmpobject::STATUS_CLOSED)   		// Not classified as paid
-				//$sql .= " AND (status <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
-				{
+					&& $obj->status != $tmpobject::STATUS_CLOSED) {		// Not classified as paid
+					//$sql .= " AND (status <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
 					$paiement = $tmpobject->getSommePaiement();
 					$creditnotes = $tmpobject->getSumCreditNotesUsed();
 					$deposits = $tmpobject->getSumDepositsUsed();
@@ -4147,8 +4228,7 @@ class Societe extends CommonObject
 
 				//if credit note is converted but not used
 				// TODO Do this also for customer ?
-				if ($mode == 'supplier' && $obj->type == FactureFournisseur::TYPE_CREDIT_NOTE && $tmpobject->isCreditNoteUsed())
-				{
+				if ($mode == 'supplier' && $obj->type == FactureFournisseur::TYPE_CREDIT_NOTE && $tmpobject->isCreditNoteUsed()) {
 					$outstandingOpened -= $tmpobject->getSumFromThisCreditNotesNotUsed();
 				}
 			}
@@ -4181,10 +4261,15 @@ class Societe extends CommonObject
 		global $langs;
 		$langs->load('companies');
 
-		if ($status == 0) return $langs->trans("NorProspectNorCustomer");
-		elseif ($status == 1) return $langs->trans("Customer");
-		elseif ($status == 2) return $langs->trans("Prospect");
-		elseif ($status == 3) return $langs->trans("ProspectCustomer");
+		if ($status == 0) {
+			return $langs->trans("NorProspectNorCustomer");
+		} elseif ($status == 1) {
+			return $langs->trans("Customer");
+		} elseif ($status == 2) {
+			return $langs->trans("Prospect");
+		} elseif ($status == 3) {
+			return $langs->trans("ProspectCustomer");
+		}
 	}
 
 
@@ -4203,21 +4288,20 @@ class Societe extends CommonObject
 	{
 		global $conf, $user, $langs;
 
-		if (!empty($moreparams) && !empty($moreparams['use_companybankid']))
-		{
+		if (!empty($moreparams) && !empty($moreparams['use_companybankid'])) {
 			$modelpath = "core/modules/bank/doc/";
 
 			include_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 			$companybankaccount = new CompanyBankAccount($this->db);
 			$result = $companybankaccount->fetch($moreparams['use_companybankid']);
-			if (!$result) dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
+			if (!$result) {
+				dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
+			}
 			$result = $companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 		} else {
 			// Positionne le modele sur le nom du modele a utiliser
-			if (!dol_strlen($modele))
-			{
-				if (!empty($conf->global->COMPANY_ADDON_PDF))
-				{
+			if (!dol_strlen($modele)) {
+				if (!empty($conf->global->COMPANY_ADDON_PDF)) {
 					$modele = $conf->global->COMPANY_ADDON_PDF;
 				} else {
 					print $langs->trans("Error")." ".$langs->trans("Error_COMPANY_ADDON_PDF_NotDefined");
@@ -4293,11 +4377,9 @@ class Societe extends CommonObject
 			}
 		}
 		foreach ($to_add as $add) {
-			if ($c->fetch($add) > 0)
-			{
+			if ($c->fetch($add) > 0) {
 				$result = $c->add_type($this, $type_categ);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 					$this->error = $c->error;
 					$this->errors = $c->errors;
@@ -4325,7 +4407,6 @@ class Societe extends CommonObject
 			$salesrep = array($salesrep);
 		}
 
-
 		$to_del = array(); // Nothing to delete
 		$to_add = $salesrep;
 		if ($onlyAdd === false) {
@@ -4347,8 +4428,7 @@ class Societe extends CommonObject
 		}
 		foreach ($to_add as $add) {
 			$result = $this->add_commercial($user, $add);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$error++;
 				break;
 			}
@@ -4365,22 +4445,22 @@ class Societe extends CommonObject
 	 */
 	public function setThirdpartyType($typent_id)
 	{
-		if ($this->id)
-		{
+		if ($this->id) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
 			$sql .= " SET fk_typent = ".($typent_id > 0 ? $typent_id : "null");
 			$sql .= " WHERE rowid = ".$this->id;
 			dol_syslog(get_class($this).'::setThirdpartyType', LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$this->typent_id = $typent_id;
-				$this->typent_code = dol_getIdFromCode($db, $this->$typent_id, 'c_typent', 'id', 'code');
+				$this->typent_code = dol_getIdFromCode($this->db, $this->$typent_id, 'c_typent', 'id', 'code');
 				return 1;
 			} else {
 				return -1;
 			}
-		} else return -1;
+		} else {
+			return -1;
+		}
 	}
 
 	/**
@@ -4394,8 +4474,7 @@ class Societe extends CommonObject
 	 */
 	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
 	{
-		if ($origin_id == $dest_id)
-		{
+		if ($origin_id == $dest_id) {
 			dol_syslog('Error: Try to merge a thirdparty into itself');
 			return false;
 		}

From 1e438b686ecf87ee4baa74f5314a94bdae0bb633 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 28 Dec 2020 21:32:46 +0100
Subject: [PATCH 668/888] fix stickler

---
 htdocs/core/class/commonobject.class.php |  2 +-
 htdocs/core/tpl/massactions_pre.tpl.php  | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 95af26992cb..0a9b7838e97 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -8393,7 +8393,7 @@ abstract class CommonObject
 	 * @param 	boolean		$remove_existing 	True: Remove existings categories from Object if not supplies by $categories, False: let them
 	 * @return	int							<0 if KO, >0 if OK
 	 */
-	public function setCategoriesCommon($categories, $type_categ='', $remove_existing=true)
+	public function setCategoriesCommon($categories, $type_categ = '', $remove_existing = true)
 	{
 		dol_syslog(get_class($this)."::setCategoriesCommon Oject Id:".$this->id.' type_categ:'.$type_categ.' nb tag add:'.count($categories), LOG_DEBUG);
 
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index a5ce87ae932..f79abfe9c42 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -43,18 +43,18 @@ if ($massaction == 'preaffecttag')
 	$categ = new Categorie($db);
 	$categ_types=array();
 	$categ_type_array=$categ->getMapList();
-	foreach($categ_type_array as $categdef) {
+	foreach ($categ_type_array as $categdef) {
 		if (isset($object) && $categdef['obj_table']==$object->table_element) {
-			if (!array_key_exists($categdef['code'],$categ_types)) $categ_types[$categdef['code']] = array('code'=>$categdef['code'],'label'=>$langs->trans($categdef['obj_class']));
+			if (!array_key_exists($categdef['code'], $categ_types)) $categ_types[$categdef['code']] = array('code'=>$categdef['code'],'label'=>$langs->trans($categdef['obj_class']));
 		}
 		if (isset($objecttmp) && $categdef['obj_table']==$objecttmp->table_element) {
-			if (!array_key_exists($categdef['code'],$categ_types)) $categ_types[$categdef['code']] = array('code'=>$categdef['code'],'label'=>$langs->trans($categdef['obj_class']));
+			if (!array_key_exists($categdef['code'], $categ_types)) $categ_types[$categdef['code']] = array('code'=>$categdef['code'],'label'=>$langs->trans($categdef['obj_class']));
 		}
 	}
 
 	$formquestion = array();
 	if (!empty($categ_types)) {
-		foreach($categ_types as $categ_type) {
+		foreach ($categ_types as $categ_type) {
 			$cate_arbo = $form->select_all_categories($categ_type['code'], null, 'parent', null, null, 1);
 			$formquestion[]=
 				array('type' => 'other',
@@ -66,7 +66,7 @@ if ($massaction == 'preaffecttag')
 			array('type' => 'other',
 				'name' => 'affecttag_type',
 				'label' => '',
-				'value' => '<input type="hidden" name="affecttag_type"  id="affecttag_type" value="'.implode(",",array_keys($categ_types)).'"/>');
+				'value' => '<input type="hidden" name="affecttag_type"  id="affecttag_type" value="'.implode(",", array_keys($categ_types)).'"/>');
 		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmAffectTag"), $langs->trans("ConfirmAffectTagQuestion", count($toselect)), "affecttag", $formquestion, 1, 0, 200, 500, 1);
 	} else {
 		setEventMessage('CategTypeNotFound');
@@ -83,8 +83,7 @@ if ($massaction == 'presend')
 
 	if (!GETPOST('cancel', 'alpha'))
 	{
-		foreach ($arrayofselected as $toselectid)
-		{
+		foreach ($arrayofselected as $toselectid) {
 			$result = $objecttmp->fetch($toselectid);
 			if ($result > 0)
 			{

From b3dae016afd4fc8ef32aad7262b0101398ee27a0 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 28 Dec 2020 21:38:17 +0100
Subject: [PATCH 669/888] fix sticker

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

diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index f79abfe9c42..7c6ab6deaa5 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -56,14 +56,12 @@ if ($massaction == 'preaffecttag')
 	if (!empty($categ_types)) {
 		foreach ($categ_types as $categ_type) {
 			$cate_arbo = $form->select_all_categories($categ_type['code'], null, 'parent', null, null, 1);
-			$formquestion[]=
-				array('type' => 'other',
+			$formquestion[]=array('type' => 'other',
 					'name' => 'affecttag_'.$categ_type['code'],
 					'label' => $langs->trans("Tag").' '.$categ_type['label'],
 					'value' => $form->multiselectarray('contcats_'.$categ_type['code'], $cate_arbo, GETPOST('contcats_'.$categ_type['code'], 'array'), null, null, null, null, '60%'));
 		}
-		$formquestion[]=
-			array('type' => 'other',
+		$formquestion[]=array('type' => 'other',
 				'name' => 'affecttag_type',
 				'label' => '',
 				'value' => '<input type="hidden" name="affecttag_type"  id="affecttag_type" value="'.implode(",", array_keys($categ_types)).'"/>');

From d9a2e2e402edfac75175e6c1e00e68980286620e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Dec 2020 02:06:42 +0100
Subject: [PATCH 670/888] Responsive

---
 htdocs/admin/modules.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index e9984316394..4316130e739 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -475,24 +475,22 @@ print load_fiche_titre($langs->trans("ModulesSetup"), '', 'title_setup');
 if ($mode == 'common' || $mode == 'commonkanban') {
 	$desc = $langs->trans("ModulesDesc", '{picto}');
 	$desc = str_replace('{picto}', img_picto('', 'switch_off'), $desc);
-	print '<span class="opacitymedium hideonsmartphone">'.$desc."<br></span>\n";
+	print '<span class="opacitymedium hideonsmartphone">'.$desc."<br><br></span>\n";
 }
 if ($mode == 'marketplace') {
-	print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesMarketPlaceDesc")."<br></span>\n";
+	print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesMarketPlaceDesc")."<br><br></span>\n";
 }
 if ($mode == 'deploy') {
-	print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules"))."<br></span>\n";
+	print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules"))."<br><br></span>\n";
 }
 if ($mode == 'develop') {
-	print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDevelopDesc")."<br></span>\n";
+	print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDevelopDesc")."<br><br></span>\n";
 }
 
+
 $head = modules_prepare_head();
 
 
-print "<br>\n";
-
-
 if ($mode == 'common' || $mode == 'commonkanban') {
 	dol_set_focus('#search_keyword');
 

From e07486b6265423d0bb59cdd1450312b81e22f64c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Dec 2020 02:20:10 +0100
Subject: [PATCH 671/888] Fix columns of download of list of targets of
 emailing

---
 htdocs/comm/mailing/cibles.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 6d9587961c6..bcf1e9c1e3b 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -131,8 +131,8 @@ if (GETPOST('exportcsv', 'int'))
 	header('Content-Disposition: attachment;filename='.$completefilename);
 
 	// List of selected targets
-	$sql  = "SELECT mc.rowid, mc.lastname, mc.firstname, mc.email, mc.other, mc.statut, mc.date_envoi, mc.tms,";
-	$sql .= " mc.source_url, mc.source_id, mc.source_type, mc.error_text";
+	$sql  = "SELECT mc.rowid, mc.lastname, mc.firstname, mc.email, mc.other, mc.statut as status, mc.date_envoi, mc.tms,";
+	$sql .= " mc.source_id, mc.source_type, mc.error_text";
 	$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
 	$sql .= " WHERE mc.fk_mailing=".$object->id;
 	$sql .= $db->order($sortfield, $sortorder);
@@ -146,16 +146,16 @@ if (GETPOST('exportcsv', 'int'))
 		while ($obj = $db->fetch_object($resql))
 		{
 			print $obj->rowid.$sep;
-			print $obj->lastname.$sep;
-			print $obj->firstname.$sep;
+			print '"'.$obj->lastname.'"'.$sep;
+			print '"'.$obj->firstname.'"'.$sep;
 			print $obj->email.$sep;
 			print $obj->other.$sep;
-			print $obj->date_envoi.$sep;
 			print $obj->tms.$sep;
-			print $obj->source_url.$sep;
-			print $obj->source_id.$sep;
 			print $obj->source_type.$sep;
-			print $obj->error_text.$sep;
+			print $obj->source_id.$sep;
+			print $obj->date_envoi.$sep;
+			print $obj->status.$sep;
+			print '"'.$obj->error_text.'"'.$sep;
 			print "\n";
 		}
 

From 7b93c34c0f22e1a3a679a6e846b812ce87a3b3e5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Dec 2020 03:48:11 +0100
Subject: [PATCH 672/888] Fix phpunits

---
 htdocs/core/lib/functions.lib.php             |  2 +-
 .../modules/mailings/xinputfile.modules.php   |  1 -
 htdocs/includes/nusoap/lib/nusoap.php         |  2 +-
 test/phpunit/FunctionsLibTest.php             | 29 +++++++++++++++++++
 test/phpunit/WebservicesInvoicesTest.php      |  9 ++++--
 5 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 33a09f541c6..909f786beec 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3032,7 +3032,7 @@ function dol_print_address($address, $htmlid, $element, $id, $noprint = 0, $char
 /**
  *	Return true if email syntax is ok.
  *
- *	@param	    string		$address    			email (Ex: "toto@examle.com", "John Do <johndo@example.com>")
+ *	@param	    string		$address    			email (Ex: "toto@examle.com". Long form "John Do <johndo@example.com>" will be false)
  *  @param		int			$acceptsupervisorkey	If 1, the special string '__SUPERVISOREMAIL__' is also accepted as valid
  *	@return     boolean     						true if email syntax is OK, false if KO or empty string
  *  @see isValidMXRecord()
diff --git a/htdocs/core/modules/mailings/xinputfile.modules.php b/htdocs/core/modules/mailings/xinputfile.modules.php
index afc691f3e2e..a31d1c41483 100644
--- a/htdocs/core/modules/mailings/xinputfile.modules.php
+++ b/htdocs/core/modules/mailings/xinputfile.modules.php
@@ -162,7 +162,6 @@ class mailing_xinputfile extends MailingTargets
 						if (!empty($buffer))
 						{
 							//print 'xx'.dol_strlen($buffer).empty($buffer)."<br>\n";
-							$id = $cpt;
 							if (isValidEMail($email))
 							{
 		   						if ($old <> $email)
diff --git a/htdocs/includes/nusoap/lib/nusoap.php b/htdocs/includes/nusoap/lib/nusoap.php
index 459f4aeb7b6..7e0ebd94da4 100644
--- a/htdocs/includes/nusoap/lib/nusoap.php
+++ b/htdocs/includes/nusoap/lib/nusoap.php
@@ -6125,7 +6125,7 @@ class wsdl extends nusoap_base {
 				$rows = sizeof($value);
 				$contents = '';
 				foreach($value as $k => $v) {
-					$this->debug("serializing array element: $k, $v of type: $typeDef[arrayType]");
+					$this->debug("serializing array element: $k of type: ".$typeDef['arrayType']);
 					//if (strpos($typeDef['arrayType'], ':') ) {
 					if (!in_array($typeDef['arrayType'],$this->typemap['http://www.w3.org/2001/XMLSchema'])) {
 					    $contents .= $this->serializeType('item', $typeDef['arrayType'], $v, $use);
diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index 7cbb6af5955..8dc903642e0 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -131,6 +131,35 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
         print __METHOD__."\n";
     }
 
+    /**
+     * testIsValidEmail
+     *
+     * @return void
+     */
+    public function testIsValidEmail()
+    {
+    	// Nb of line is same than entry text
+
+    	$input="bidon@bademail";
+    	$result=isValidEmail($input);
+    	print __METHOD__." result=".$result."\n";
+    	$this->assertFalse($result, 'Check isValidEmail '.$input);
+
+    	$input="test@yahoo.com";
+    	$result=isValidEmail($input);
+    	print __METHOD__." result=".$result."\n";
+    	$this->assertTrue($result, 'Check isValidEmail '.$input);
+
+    	$input="The name of sender <test@yahoo.com>";
+    	$result=isValidEmail($input);
+    	print __METHOD__." result=".$result."\n";
+    	$this->assertFalse($result, 'Check isValidEmail '.$input);
+
+    	$input="1234.abcdefg@domainame.com.br";
+    	$result=isValidEmail($input);
+    	print __METHOD__." result=".$result."\n";
+    	$this->assertTrue($result, 'Check isValidEmail '.$input);
+    }
 
     /**
      * testIsValidMXRecord
diff --git a/test/phpunit/WebservicesInvoicesTest.php b/test/phpunit/WebservicesInvoicesTest.php
index beb3e844809..ca9d827f2b8 100644
--- a/test/phpunit/WebservicesInvoicesTest.php
+++ b/test/phpunit/WebservicesInvoicesTest.php
@@ -61,6 +61,9 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
 
 	protected $ns = 'http://www.dolibarr.org/ns/';
 
+	protected $pass = 'admin';
+
+
 	/**
 	 * Constructor
 	 * We save global variables into local variables
@@ -248,7 +251,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
     	'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
     	'sourceapplication'=>'DEMO',
     	'login'=>'admin',
-    	'password'=>'admin',
+    	'password'=>$this->pass,
     	'entity'=>'');
 
     	// Test URL
@@ -304,7 +307,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
     	'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
     	'sourceapplication'=>'DEMO',
     	'login'=>'admin',
-    	'password'=>'admin',
+    	'password'=>$this->pass,
     	'entity'=>'');
 
     	// Test URL
@@ -403,7 +406,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
     	'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
     	'sourceapplication'=>'DEMO',
     	'login'=>'admin',
-    	'password'=>'admin',
+    	'password'=>$this->pass,
     	'entity'=>'');
 
     	// Test URL

From af41c068222099e6576c75e847951603487c212e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Dec 2020 04:27:16 +0100
Subject: [PATCH 673/888] Fix warnings

---
 htdocs/categories/class/categorie.class.php              | 2 ++
 htdocs/core/lib/functions.lib.php                        | 4 ++--
 htdocs/core/lib/functions2.lib.php                       | 2 +-
 htdocs/core/modules/societe/mod_codeclient_elephant.php  | 4 ++--
 htdocs/core/modules/societe/mod_codecompta_digitaria.php | 5 +++--
 htdocs/societe/card.php                                  | 6 +++---
 htdocs/user/class/user.class.php                         | 1 +
 7 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 8e2f07ec4fc..7f8e415e4b1 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1146,6 +1146,8 @@ class Categorie extends CommonObject
 		// First build full array $motherof
 		//$this->load_motherof();	// Disabled because already done by caller of build_path_from_id_categ
 
+		// $this->cats[$id_categ] is supposed to be already an array. We just want to complete it with property fullpath and fulllabel
+
 		// Define fullpath and fulllabel
 		$this->cats[$id_categ]['fullpath'] = '_'.$id_categ;
 		$this->cats[$id_categ]['fulllabel'] = $this->cats[$id_categ]['label'];
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 909f786beec..a156f35292e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7123,9 +7123,9 @@ function dol_sort_array(&$array, $index, $order = 'asc', $natsort = 0, $case_sen
 			foreach (array_keys($array) as $key)
 			{
 				if (is_object($array[$key])) {
-					$temp[$key] = $array[$key]->$index;
+					$temp[$key] = empty($array[$key]->$index) ? 0 : $array[$key]->$index;
 				} else {
-					$temp[$key] = $array[$key][$index];
+					$temp[$key] = empty($array[$key][$index]) ? 0 : $array[$key][$index];
 				}
 			}
 
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 8391c6aab06..a77f38f8f66 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1252,7 +1252,7 @@ function check_value($mask, $value)
 	//print "masktri=".$masktri." maskcounter=".$maskcounter." maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";
 
 	if (function_exists('mb_strrpos')) {
-		$posnumstart = mb_strrpos($maskwithnocode, $maskcounter, 'UTF-8');
+		$posnumstart = mb_strrpos($maskwithnocode, $maskcounter, 0, 'UTF-8');
 	}
 	else {
 		$posnumstart = strrpos($maskwithnocode, $maskcounter);
diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
index 9b870bd5dd2..18947732b16 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -212,8 +212,8 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 
 		// Get Mask value
 		$mask = '';
-		if ($type == 0) $mask = $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
-		if ($type == 1) $mask = $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
+		if ($type == 0) $mask = empty($conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER) ? '' : $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
+		if ($type == 1) $mask = empty($conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER) ? '' : $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
 		if (!$mask)
 		{
 			$this->error = 'NotConfigured';
diff --git a/htdocs/core/modules/societe/mod_codecompta_digitaria.php b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
index 961fa1a4e73..ea25a480d45 100644
--- a/htdocs/core/modules/societe/mod_codecompta_digitaria.php
+++ b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
@@ -157,6 +157,8 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 		$i = 0;
 		$this->code = '';
 
+		$disponibility = 0;
+
 		if (is_object($societe))
 		{
 			dol_syslog("mod_codecompta_digitaria::get_code search code for type=".$type." & company=".(!empty($societe->name) ? $societe->name : ''));
@@ -216,8 +218,7 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 			}
 		}
 
-		if ($disponibility == 0)
-		{
+		if ($disponibility == 0) {
 			return 0; // return ok
 		} else {
 			return -1; // return ko
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 0fc33232c5d..7fccdf994b9 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -109,7 +109,7 @@ if ($object->id > 0) {
 
 $permissiontoread = $user->rights->societe->lire;
 $permissiontoadd = $user->rights->societe->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
-$permissiontodelete = $user->rights->societe->delete || ($permissiontoadd && isset($object->status) && $object->status == 0);
+$permissiontodelete = $user->rights->societe->supprimer || ($permissiontoadd && isset($object->status) && $object->status == 0);
 $permissionnote = $user->rights->societe->creer; // Used by the include of actions_setnotes.inc.php
 $permissiondellink = $user->rights->societe->creer; // Used by the include of actions_dellink.inc.php
 $upload_dir = $conf->societe->multidir_output[isset($object->entity) ? $object->entity : 1];
@@ -1355,7 +1355,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning_fax').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ?GETPOST('fax', 'alpha') : $object->fax).'"></td></tr>';
 
 		// Email / Web
-		print '<tr><td>'.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '', $conf->global->SOCIETE_EMAIL_MANDATORY).'</td>';
+		print '<tr><td>'.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '', empty($conf->global->SOCIETE_EMAIL_MANDATORY) ? '' : $conf->global->SOCIETE_EMAIL_MANDATORY).'</td>';
 		print '<td colspan="3">'.img_picto('', 'object_email').' <input type="text" class="maxwidth500 widthcentpercentminusx" name="email" id="email" value="'.$object->email.'"></td></tr>';
 		print '<tr><td>'.$form->editfieldkey('Web', 'url', '', $object, 0).'</td>';
 		print '<td colspan="3">'.img_picto('', 'globe').' <input type="text" class="maxwidth500 widthcentpercentminusx" name="url" id="url" value="'.$object->url.'"></td></tr>';
@@ -1366,7 +1366,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 					print '<tr>';
 					print '<td><label for="'.$value['label'].'">'.$form->editfieldkey($value['label'], $key, '', $object, 0).'</label></td>';
 					print '<td colspan="3">';
-					print '<input type="text" name="'.$key.'" id="'.$key.'" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET($key) ?GETPOST($key, 'alphanohtml') : $object->socialnetworks[$key]).'">';
+					print '<input type="text" name="'.$key.'" id="'.$key.'" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET($key) ? GETPOST($key, 'alphanohtml') : (empty($object->socialnetworks[$key]) ? '' : $object->socialnetworks[$key])).'">';
 					print '</td>';
 					print '</tr>';
 				} elseif (!empty($object->socialnetworks[$key])) {
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index eb92bd51eb9..98e70cf66b7 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2418,6 +2418,7 @@ class User extends CommonObject
 		}
 
 		$result = ''; $label = '';
+		$companylink = '';
 
 		if (!empty($this->photo)) {
 			$label .= '<div class="photointooltip">';

From c3326a0963dccb3224d30c841ca4509d1483fc2c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Dec 2020 04:30:37 +0100
Subject: [PATCH 674/888] FIX Creation of thirdparty when setup is empty

---
 htdocs/societe/class/societe.class.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 35b52243804..3842a8cd2a9 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -940,7 +940,7 @@ class Societe extends CommonObject
 		if ($this->client)
 		{
 			$rescode = $this->check_codeclient();
-			if ($rescode <> 0)
+			if ($rescode != 0 && $rescode != -5)
 			{
 				if ($rescode == -1)
 				{
@@ -965,7 +965,7 @@ class Societe extends CommonObject
 		if ($this->fournisseur)
 		{
 			$rescode = $this->check_codefournisseur();
-			if ($rescode <> 0)
+			if ($rescode != 0 && $rescode != -5)
 			{
 				if ($rescode == -1)
 				{
@@ -979,7 +979,7 @@ class Societe extends CommonObject
 				{
 					$this->errors[] = 'ErrorSupplierCodeAlreadyUsed';
 				}
-				elseif ($rescode == -5)
+				elseif ($rescode == -4)
 				{
 					$this->errors[] = 'ErrorPrefixRequired';
 				}
@@ -3057,6 +3057,8 @@ class Societe extends CommonObject
 	 * 							-2 ErrorCustomerCodeRequired
 	 * 							-3 ErrorCustomerCodeAlreadyUsed
 	 * 							-4 ErrorPrefixRequired
+	 * 							-5 NotConfigured - Setup empty so any value may be ok or not
+	 * 							-6 Other (see this->error)
 	 */
     public function check_codefournisseur()
 	{

From 2932e2f8048da8f64592004d09836c3194152e9e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 29 Dec 2020 04:33:47 +0100
Subject: [PATCH 675/888] NEW: Accountancy - Add formconfirm with options on
 export

---
 htdocs/accountancy/bookkeeping/list.php | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index ebd768de1dc..54d6b66dd56 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -467,7 +467,7 @@ if (!empty($sortfield)) {
 
 // Export into a file with format defined into setup (FEC, CSV, ...)
 // Must be after definition of $sql
-if ($action == 'export_file' && $user->rights->accounting->mouvements->export) {
+if ($action == 'export_fileconfirm' && $user->rights->accounting->mouvements->export) {
 	// TODO Replace the fetchAll + ->export later that consume too much memory on large export with the query($sql) and loop on each line to export them.
 	$result = $object->fetchAll($sortorder, $sortfield, 0, 0, $filter, 'AND', $conf->global->ACCOUNTING_REEXPORT);
 
@@ -495,6 +495,7 @@ if ($action == 'export_file' && $user->rights->accounting->mouvements->export) {
 
 					$sql = " UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping";
 					$sql .= " SET date_export = '".$db->idate($now)."'";
+					$sql .= " , date_validated = '".$db->idate($now)."'";
 					$sql .= " WHERE rowid = ".$movement->id;
 
 					dol_syslog("/accountancy/bookeeping/list.php Function export_file Specify movements as exported sql=".$sql, LOG_DEBUG);
@@ -566,7 +567,25 @@ if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 
 llxHeader('', $title_page);
 
+if ($action == 'export_file') {
+	$form_question = array();
 
+	$form_question['notifiedexportdate'] = array(
+		'name' => 'notifiedexportdate',
+		'type' => 'checkbox',
+		'label' => $langs->trans('NotifiedExportDate'),
+		'value' => (!empty($conf->global->ACCOUNTING_DEFAULT_NOT_NOTIFIED_EXPORT_DATE) ? 'false' : 'true'),
+	);
+	$form_question['notifiedvalidationdate'] = array(
+		'name' => 'notifiedvalidationdate',
+		'type' => 'checkbox', // We don't use select here, the journal_array is already a select html component
+		'label' => $langs->trans('NotifiedValidationDate'),
+		'value' => (!empty($conf->global->ACCOUNTING_DEFAULT_NOT_NOTIFIED_VALIDATION_DATE) ? 'false' : 'true'),
+	);
+
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans("ExportFilteredList").' ('.$listofformat[$formatexportset].')', $langs->trans('ConfirmExportFile'), 'export_fileconfirm', $form_question, '', 1, 300);
+	print $formconfirm;
+}
 if ($action == 'delmouv') {
 	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?mvt_num='.GETPOST('mvt_num').$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvtPartial'), 'delmouvconfirm', '', 0, 1);
 	print $formconfirm;

From f4986570716bb6e43ab7489483810263c62f7c01 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Dec 2020 04:44:48 +0100
Subject: [PATCH 676/888] Fix warning

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

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 993dd900a27..69b934aeeff 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -863,7 +863,7 @@ class Societe extends CommonObject
 					$this->db->commit();
 					return $this->id;
 				} else {
-					dol_syslog(get_class($this)."::Create echec update ".$this->error." ".join(',', $this->errors), LOG_ERR);
+					dol_syslog(get_class($this)."::Create echec update ".$this->error.(empty($this->errors) ? '' : ' '.join(',', $this->errors)), LOG_ERR);
 					$this->db->rollback();
 					return -4;
 				}

From abca44be0d94c1096d80663120a535b80e3fea10 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Dec 2020 04:52:47 +0100
Subject: [PATCH 677/888] More logs

---
 test/phpunit/WebservicesInvoicesTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/phpunit/WebservicesInvoicesTest.php b/test/phpunit/WebservicesInvoicesTest.php
index ca9d827f2b8..6bedda43fa4 100644
--- a/test/phpunit/WebservicesInvoicesTest.php
+++ b/test/phpunit/WebservicesInvoicesTest.php
@@ -275,7 +275,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
     		print "\n";
     	}
 
-    	print __METHOD__." result=".$result['result']['result_code']."\n";
+    	print __METHOD__." result=".$result['result']['result_code']." ".$result['result']['result_label']."\n";
     	$this->assertEquals('OK', $result['result']['result_code']);
     	$this->assertEquals('ref-phpunit-2', $result['ref_ext']);
 

From ae7d3abdc54031f31683ef3a8c2e1ca1d789c3b0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Dec 2020 05:00:51 +0100
Subject: [PATCH 678/888] css

---
 htdocs/theme/eldy/global.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index e6991388ad0..1c807b7b2b1 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -35,7 +35,7 @@
 	--oddevencolor: #202020;
 	--colorboxstatsborder: #e0e0e0;
 	--dolgraphbg: rgba(255,255,255,0);
-	--fieldrequiredcolor: #804000;
+	--fieldrequiredcolor: #700040;
 	--colortextbacktab: #<?php print $colortextbacktab; ?>;
 	--colorboxiconbg: #eee;
 	--refidnocolor:#444;

From 4267828ee6f1c80a46a190fcf892b6ab0ee44c1b Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Tue, 29 Dec 2020 14:47:16 +0100
Subject: [PATCH 679/888] FIX add line php warning when no customer relative
 discount history.

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

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 69b934aeeff..13290850da3 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1634,7 +1634,7 @@ class Societe extends CommonObject
 
 				$this->prefix_comm = $obj->prefix_comm;
 
-				$this->remise_percent = price2num($obj->remise_client); // 0.000000 must be 0
+				$this->remise_percent = $obj->remise_client ? price2num($obj->remise_client) : 0; // 0.000000 must be 0
 				$this->remise_supplier_percent = $obj->remise_supplier;
 				$this->mode_reglement_id 	= $obj->mode_reglement;
 				$this->cond_reglement_id 	= $obj->cond_reglement;

From 6e0832fb3893aa5874951ea744dcc4f9f2d62f9e Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 29 Dec 2020 15:59:39 +0100
Subject: [PATCH 680/888] FIX WIP avoid warning with php 8.0

---
 htdocs/core/boxes/box_commandes.php                |  4 ++--
 htdocs/core/boxes/box_contracts.php                |  2 +-
 htdocs/core/boxes/box_factures.php                 |  4 ++--
 htdocs/core/boxes/box_factures_fourn.php           |  4 ++--
 htdocs/core/boxes/box_graph_invoices_permonth.php  |  8 ++++----
 .../boxes/box_graph_invoices_supplier_permonth.php |  9 +++++----
 htdocs/core/boxes/box_graph_orders_permonth.php    |  8 ++++----
 .../boxes/box_graph_orders_supplier_permonth.php   |  8 ++++----
 .../core/boxes/box_graph_product_distribution.php  | 10 +++++-----
 htdocs/core/boxes/box_graph_propales_permonth.php  | 14 ++++++++------
 htdocs/core/boxes/box_produits_alerte_stock.php    |  2 +-
 htdocs/core/boxes/box_propales.php                 |  4 ++--
 htdocs/core/boxes/box_supplier_orders.php          |  4 ++--
 htdocs/core/class/dolgraph.class.php               |  8 ++++----
 htdocs/core/menus/standard/eldy.lib.php            |  8 +++-----
 htdocs/index.php                                   | 10 +++++-----
 16 files changed, 54 insertions(+), 53 deletions(-)

diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index 3f7875ce7d4..9b020a05711 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -83,7 +83,7 @@ class box_commandes extends ModeleBoxes
 		$societestatic = new Societe($this->db);
 		$userstatic = new User($this->db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."CustomerOrders", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLast".(!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) ? "" : "Modified")."CustomerOrders", $max));
 
 		if ($user->rights->commande->lire)
 		{
@@ -108,7 +108,7 @@ class box_commandes extends ModeleBoxes
 			if (!empty($conf->global->ORDER_BOX_LAST_ORDERS_VALIDATED_ONLY)) $sql .= " AND c.fk_statut = 1";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
+			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
 			else $sql .= " ORDER BY c.tms DESC, c.ref DESC ";
 			$sql .= $this->db->plimit($max, 0);
 
diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php
index 9350bae2da9..0fa10b43fd8 100644
--- a/htdocs/core/boxes/box_contracts.php
+++ b/htdocs/core/boxes/box_contracts.php
@@ -92,7 +92,7 @@ class box_contracts extends ModeleBoxes
 			$sql .= " AND c.entity = ".$conf->entity;
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_contrat DESC, c.ref DESC ";
+			if (! empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) $sql .= " ORDER BY c.date_contrat DESC, c.ref DESC ";
 			else $sql .= " ORDER BY c.tms DESC, c.ref DESC ";
 			$sql .= $this->db->plimit($max, 0);
 
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index 011342d8a30..20e83fb442c 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -81,7 +81,7 @@ class box_factures extends ModeleBoxes
 
 		$langs->load("bills");
 
-		$text = $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."CustomerBills", $max);
+		$text = $langs->trans("BoxTitleLast".(!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) ? "" : "Modified")."CustomerBills", $max);
 		$this->info_box_head = array(
 			'text' => $text,
 			'limit'=> dol_strlen($text)
@@ -106,7 +106,7 @@ class box_factures extends ModeleBoxes
 			$sql .= " AND f.entity IN (".getEntity('invoice').")";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 			if ($user->socid)	$sql .= " AND s.rowid = ".$user->socid;
-			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY f.datef DESC, f.ref DESC ";
+			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) $sql .= " ORDER BY f.datef DESC, f.ref DESC ";
 			else $sql .= " ORDER BY f.tms DESC, f.ref DESC ";
 			$sql .= $this->db->plimit($max, 0);
 
diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index d3c1ccd9017..0be9d7bbd6f 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -81,7 +81,7 @@ class box_factures_fourn extends ModeleBoxes
 		$thirdpartystatic = new Fournisseur($this->db);
 
 		$this->info_box_head = array(
-			'text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."SupplierBills", $max)
+			'text' => $langs->trans("BoxTitleLast".(!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) ? "" : "Modified")."SupplierBills", $max)
 		);
 
 		if ($user->rights->fournisseur->facture->lire)
@@ -104,7 +104,7 @@ class box_factures_fourn extends ModeleBoxes
 			$sql .= " AND f.entity = ".$conf->entity;
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY f.datef DESC, f.ref DESC ";
+			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) $sql .= " ORDER BY f.datef DESC, f.ref DESC ";
 			else $sql .= " ORDER BY f.tms DESC, f.ref DESC ";
 			$sql .= $this->db->plimit($max, 0);
 
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index 983bb75cbc3..4ef11019cd3 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -112,10 +112,10 @@ class box_graph_invoices_permonth extends ModeleBoxes
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
 			} else {
-				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
-				$endyear = $tmparray['year'];
-				$shownb = $tmparray['shownb'];
-				$showtot = $tmparray['showtot'];
+			    $tmparray = (!empty($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode]) ? json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true) : array());
+			    $endyear = (!empty($tmparray['year']) ? $tmparray['year'] : '');
+			    $shownb = (!empty($tmparray['shownb']) ? $tmparray['shownb'] : '');
+			    $showtot = (!empty($tmparray['showtot']) ? $tmparray['showtot'] : '');
 			}
 			if (empty($shownb) && empty($showtot)) { $shownb = 1; $showtot = 1; }
 			$nowarray = dol_getdate(dol_now(), true);
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index 1490f5ea6e9..d346bae36d9 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -109,13 +109,14 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
 			} else {
-				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
-				$endyear = $tmparray['year'];
-				$shownb = $tmparray['shownb'];
-				$showtot = $tmparray['showtot'];
+			    $tmparray = (!empty($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode]) ? json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true) : array());
+			    $endyear = (!empty($tmparray['year']) ? $tmparray['year'] : '');
+			    $shownb = (!empty($tmparray['shownb']) ? $tmparray['shownb'] : '');
+			    $showtot = (!empty($tmparray['showtot']) ? $tmparray['showtot'] : '');
 			}
 			if (empty($shownb) && empty($showtot)) { $shownb = 1; $showtot = 1; }
 			$nowarray = dol_getdate(dol_now(), true);
+			if (empty($year)) $year = $nowarray['year'];
 			if (empty($endyear)) $endyear = $nowarray['year'];
 			$startyear = $endyear - 1;
 			$mode = 'supplier';
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index d9c26620553..b1059dc02ff 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -112,10 +112,10 @@ class box_graph_orders_permonth extends ModeleBoxes
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
 			} else {
-				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
-				$endyear = $tmparray['year'];
-				$shownb = $tmparray['shownb'];
-				$showtot = $tmparray['showtot'];
+			    $tmparray = (!empty($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode]) ? json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true) : array());
+			    $endyear = (!empty($tmparray['year']) ? $tmparray['year'] : '');
+			    $shownb = (!empty($tmparray['shownb']) ? $tmparray['shownb'] : '');
+			    $showtot = (!empty($tmparray['showtot']) ? $tmparray['showtot'] : '');
 			}
 			if (empty($shownb) && empty($showtot)) { $shownb = 1; $showtot = 1; }
 			$nowarray = dol_getdate(dol_now(), true);
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index 765c6324516..354aa071946 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -111,10 +111,10 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
 			} else {
-				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
-				$endyear = $tmparray['year'];
-				$shownb = $tmparray['shownb'];
-				$showtot = $tmparray['showtot'];
+			    $tmparray = (!empty($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode]) ? json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true) : array());
+				$endyear = (!empty($tmparray['year']) ? $tmparray['year'] : '');
+				$shownb = (!empty($tmparray['shownb']) ? $tmparray['shownb'] : '');
+				$showtot = (!empty($tmparray['showtot']) ? $tmparray['showtot'] : '');
 			}
 			if (empty($shownb) && empty($showtot)) { $shownb = 1; $showtot = 1; }
 			$nowarray = dol_getdate(dol_now(), true);
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index 407c66177b5..8c6049c720b 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -95,11 +95,11 @@ class box_graph_product_distribution extends ModeleBoxes
 			$showpropalnb = GETPOST($param_showpropalnb, 'alpha');
 			$showordernb = GETPOST($param_showordernb, 'alpha');
 		} else {
-			$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
-			$year = $tmparray['year'];
-			$showinvoicenb = $tmparray['showinvoicenb'];
-			$showpropalnb = $tmparray['showpropalnb'];
-			$showordernb = $tmparray['showordernb'];
+		    $tmparray = (!empty($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode]) ? json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true) : array());
+		    $year = (!empty($tmparray['year']) ? $tmparray['year'] : '');
+		    $showinvoicenb = (!empty($tmparray['showinvoicenb']) ? $tmparray['showinvoicenb'] : '');
+		    $showpropalnb = (!empty($tmparray['showpropalnb']) ? $tmparray['showpropalnb'] : '');
+		    $showordernb = (!empty($tmparray['showordernb']) ? $tmparray['showordernb'] : '');
 		}
 		if (empty($showinvoicenb) && empty($showpropalnb) && empty($showordernb)) { $showpropalnb = 1; $showinvoicenb = 1; $showordernb = 1; }
 		if (empty($conf->facture->enabled) || empty($user->rights->facture->lire)) $showinvoicenb = 0;
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index de1a1f8de83..5014c4b3817 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -112,10 +112,10 @@ class box_graph_propales_permonth extends ModeleBoxes
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
 			} else {
-				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
-				$endyear = $tmparray['year'];
-				$shownb = $tmparray['shownb'];
-				$showtot = $tmparray['showtot'];
+			    $tmparray = (!empty($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode]) ? json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true) : array());
+			    $endyear = (!empty($tmparray['year']) ? $tmparray['year'] : '');
+			    $shownb = (!empty($tmparray['shownb']) ? $tmparray['shownb'] : '');
+			    $showtot = (!empty($tmparray['showtot']) ? $tmparray['showtot'] : '');
 			}
 			if (empty($shownb) && empty($showtot)) { $shownb = 1; $showtot = 1; }
 			$nowarray = dol_getdate(dol_now(), true);
@@ -176,8 +176,10 @@ class box_graph_propales_permonth extends ModeleBoxes
 				//$datatype2 = array('lines','bars');
 
 				$filenamenb = $dir."/".$prefix."propalsamountinyear-".$endyear.".png";
-				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&amp;file=propalsamountinyear-'.$endyear.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstatssupplier&amp;file=propalsamountinyear-'.$endyear.'.png';
+				if (!empty($mode)) {
+				    if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&amp;file=propalsamountinyear-'.$endyear.'.png';
+				    if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstatssupplier&amp;file=propalsamountinyear-'.$endyear.'.png';
+				}
 
 				$px2 = new DolGraph();
 				$mesg = $px2->isGraphKo();
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index 893bb2273ab..5d1e944d805 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -64,7 +64,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 		$this->db = $db;
 
 		$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
-		$tmpentry = array('enabled'=>((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && !empty($conf->stock->enabled)), 'perms'=>($user->rights->stock->lire), 'module'=>'product|service|stock');
+		$tmpentry = array('enabled'=>((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && !empty($conf->stock->enabled)), 'perms'=>!empty($user->rights->stock->lire), 'module'=>'product|service|stock');
 		$showmode = isVisibleToUserType(($user->socid > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
 		$this->hidden = ($showmode != 1);
 	}
diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php
index f98e0f1e347..6efd56c01db 100644
--- a/htdocs/core/boxes/box_propales.php
+++ b/htdocs/core/boxes/box_propales.php
@@ -81,7 +81,7 @@ class box_propales extends ModeleBoxes
 		$propalstatic = new Propal($this->db);
 		$societestatic = new Societe($this->db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."Propals", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLast".(!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) ? "" : "Modified")."Propals", $max));
 
 		if ($user->rights->propale->lire)
 		{
@@ -96,7 +96,7 @@ class box_propales extends ModeleBoxes
 			$sql .= " AND p.entity IN (".getEntity('propal').")";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY p.datep DESC, p.ref DESC ";
+			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) $sql .= " ORDER BY p.datep DESC, p.ref DESC ";
 			else $sql .= " ORDER BY p.tms DESC, p.ref DESC ";
 			$sql .= $this->db->plimit($max, 0);
 
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index 151c1df6bcb..5074d403231 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -79,7 +79,7 @@ class box_supplier_orders extends ModeleBoxes
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 		$thirdpartystatic = new Fournisseur($this->db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLatest".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."SupplierOrders", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLatest".(!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) ? "" : "Modified")."SupplierOrders", $max));
 
 		if ($user->rights->fournisseur->commande->lire)
 		{
@@ -98,7 +98,7 @@ class box_supplier_orders extends ModeleBoxes
 			$sql .= " AND c.entity IN (".getEntity('supplier_order').")";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
+			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
 			else $sql .= " ORDER BY c.tms DESC, c.ref DESC ";
 			$sql .= $this->db->plimit($max, 0);
 
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 5fcc7b00c91..e880e186e5b 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -964,7 +964,7 @@ class DolGraph
 				$array_of_ykeys = array_keys($valarray);
 				$alabelexists = 1;
 				$tmpykey = explode('_', ($array_of_ykeys[$i + ($alabelexists ? 1 : 0)]), 3);
-				if (!empty($tmpykey[2]) || $tmpykey[2] == '0') {		// This is a 'Group by' array
+				if (isset($tmpykey[2]) && (!empty($tmpykey[2]) || $tmpykey[2] == '0')) {		// This is a 'Group by' array
 					$tmpvalue = (array_key_exists('y_' . $tmpykey[1] . '_' . $tmpykey[2], $valarray) ? $valarray['y_' . $tmpykey[1] . '_' . $tmpykey[2]] : $valarray[$i + 1]);
 					$values[$x] = (is_numeric($tmpvalue) ? $tmpvalue : null);
 					$arrayofgroupslegend[$i] = array(
@@ -1203,7 +1203,7 @@ class DolGraph
 				$foundnegativecolor = 0;
 				$usecolorvariantforgroupby = 0;
 				// We used a 'group by' and we have too many colors so we generated color variants per
-				if (is_array($arrayofgroupslegend[$i]) && count($arrayofgroupslegend[$i]) > 0) {	// If we used a group by.
+				if (!empty($arrayofgroupslegend) && is_array($arrayofgroupslegend[$i]) && count($arrayofgroupslegend[$i]) > 0) {	// If we used a group by.
 					$nbofcolorneeds = count($arrayofgroupslegend);
 					$nbofcolorsavailable = count($theme_datacolor);
 					if ($nbofcolorneeds > $nbofcolorsavailable) {
@@ -1278,7 +1278,7 @@ class DolGraph
 				$this->stringtoshow .= '{';
 				$this->stringtoshow .= 'dolibarrinfo: \'y_' . $i . '\', ';
 				$this->stringtoshow .= 'label: \'' . dol_escape_js(dol_string_nohtmltag($textoflegend)) . '\', ';
-				$this->stringtoshow .= 'pointStyle: \'' . ($this->type[$i] == 'linesnopoint' ? 'line' : 'circle') . '\', ';
+				$this->stringtoshow .= 'pointStyle: \'' . ((!empty($this->type[$i]) && $this->type[$i] == 'linesnopoint') ? 'line' : 'circle') . '\', ';
 				$this->stringtoshow .= 'fill: ' . ($type == 'bar' ? 'true' : 'false') . ', ';
 				if ($isfunnel) {
 					$this->stringtoshow .= 'borderWidth: \'2\', ';
@@ -1287,7 +1287,7 @@ class DolGraph
 				}
 				$this->stringtoshow .= 'borderColor: \'' . $bordercolor . '\', ';
 				$this->stringtoshow .= 'backgroundColor: \'' . $color . '\', ';
-				if ($arrayofgroupslegend[$i]) $this->stringtoshow .= 'stack: \'' . $arrayofgroupslegend[$i]['stacknum'] . '\', ';
+				if (!empty($arrayofgroupslegend) && !empty($arrayofgroupslegend[$i])) $this->stringtoshow .= 'stack: \'' . $arrayofgroupslegend[$i]['stacknum'] . '\', ';
 				$this->stringtoshow .='data: [';
 				if ($isfunnel) {
 					$this->stringtoshow .= '['.-$serie[$i].','.$serie[$i].']';
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 85b63a6f4e3..810f2087430 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -206,9 +206,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	$menu_arr[] = array(
 		'name' => 'Projet',
 		'link' => '/projet/index.php?mainmenu=project&amp;leftmenu=',
-		'title' => (empty($conf->global->PROJECT_USE_OPPORTUNITIES) || $conf->global->PROJECT_USE_OPPORTUNITIES == 2)
-					? (($conf->global->PROJECT_USE_OPPORTUNITIES == 2) ? "Leads" : "Projects")
-					: "Projects",
+		'title' => (! empty($conf->global->PROJECT_USE_OPPORTUNITIES) && $conf->global->PROJECT_USE_OPPORTUNITIES == 2 ? "Leads" : "Projects"),
 		'level' => 0,
 		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
 		'target' => $atarget,
@@ -743,11 +741,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"), 1);
 
 				$warnpicto = '';
-				if ($conf->global->MAIN_MAIL_SENDMODE == 'mail' && empty($conf->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP)) {
+				if (!empty($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail' && empty($conf->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP)) {
 					$langs->load("errors");
 					$warnpicto = img_warning($langs->trans("WarningPHPMailD"));
 				}
-				if (in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmail')) && empty($conf->global->MAIN_MAIL_SMTP_SERVER)) {
+				if (!empty($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmail')) && empty($conf->global->MAIN_MAIL_SMTP_SERVER)) {
 					$langs->load("errors");
 					$warnpicto = img_warning($langs->trans("ErrorSetupOfEmailsNotComplete"));
 				}
diff --git a/htdocs/index.php b/htdocs/index.php
index a4060278c50..399c9cfa035 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -312,7 +312,7 @@ if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS))
 				$boxstatItem .= '<a href="'.$links[$val].'" class="boxstatsindicator thumbstat nobold nounderline">';
 				$boxstatItem .= '<div class="boxstats">';
 				$boxstatItem .= '<span class="boxstatstext" title="'.dol_escape_htmltag($text).'">'.$text.'</span><br>';
-				$boxstatItem .= '<span class="boxstatsindicator">'.img_object("", $board->picto, 'class="inline-block"').' '.($board->nb[$val] ? $board->nb[$val] : 0).'</span>';
+				$boxstatItem .= '<span class="boxstatsindicator">'.img_object("", $board->picto, 'class="inline-block"').' '.(!empty($board->nb[$val]) ? $board->nb[$val] : 0).'</span>';
 				$boxstatItem .= '</div>';
 				$boxstatItem .= '</a>';
 
@@ -675,7 +675,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 						// get key index of stats used in $includes, $classes, $keys, $icons, $titres, $links
 						$keyIndex = array_search($globalStatsKey, $keys);
 
-						$classe = $classes[$keyIndex];
+						$classe = (!empty($classes[$keyIndex]) ? $classes[$keyIndex] : '');
 						if (isset($boardloaded[$classe]) && is_object($boardloaded[$classe]))
 						{
 							$groupElement['globalStats']['total'] = $boardloaded[$classe]->nb[$globalStatsKey] ? $boardloaded[$classe]->nb[$globalStatsKey] : 0;
@@ -762,7 +762,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 		}
 
 		if ($showweather && !empty($isIntopOpenedDashBoard)) {
-			$appendClass = $conf->global->MAIN_DISABLE_METEO == 2 ? ' hideonsmartphone' : '';
+		    $appendClass = (!empty($conf->global->MAIN_DISABLE_METEO) && $conf->global->MAIN_DISABLE_METEO == 2 ? ' hideonsmartphone' : '');
 			$weather = getWeatherStatus($totallate);
 
 			$text = '';
@@ -889,7 +889,7 @@ print '<div class="fichecenter fichecenterbis">';
  * Show widgets (boxes)
  */
 
-$boxlist .= '<div class="twocolumns">';
+$boxlist = '<div class="twocolumns">';
 
 $boxlist .= '<div class="firstcolumn fichehalfleft boxhalfleft" id="boxhalfleft">';
 if (!empty($nbworkboardcount))
@@ -914,7 +914,7 @@ if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS))
 	}
 
 	if (!empty($boxstatFromHook) || !empty($boxstatItems)) {
-		$boxstat .= '<!-- Database statistics -->'."\n";
+		$boxstat = '<!-- Database statistics -->'."\n";
 		$boxstat .= '<div class="box">';
 		$boxstat .= '<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable boxtablenobottom nohover widgetstats" width="100%">';
 		$boxstat .= '<tr class="liste_titre box_titre">';

From 87da0a276d236529052b071aed3bd0d5eb9ef279 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Dec 2020 16:13:03 +0100
Subject: [PATCH 681/888] Doc

---
 SECURITY.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index 6dc6e0f33b5..08ca64e4a4c 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -55,8 +55,7 @@ ONLY vulnerabilities discovered, when the following setup on test platform is us
 * $dolibarr_nocsrfcheck must be kept to the value 0 into conf.php (this is the default value)
 * $dolibarr_main_force_https must be set to something else than 0.
 * The constant MAIN_SECURITY_CSRF_WITH_TOKEN must be set to 1 into backoffice menu Home - Setup - Other (this protection should be set to 1 soon by default)
-* The module DebugBar must NOT be enabled (by default, this module is not enabled. This is a developer tool)
-* The module ModuleBuilder must NOT be enabled (by default, this module is not enabled. This is a developer tool)
+* The module DebugBar and ModuleBuilder must NOT be enabled (by default, this module is not enabled. This is a developer tool)
 * ONLY security reports on modules provided by default and with the "stable" status are valid (troubles into "experimental", "developement" or external modules are not valid vulnerabilities).
 * The root of web server must link to htdocs and the documents directory must be outside of the web server root (this is the default when using the default installer but may differs with external installer).
 * The web server setup must be done so only the documents directory is in write mode. The root directory called htdocs must be readonly.

From 20cd9cbbc7ca4dcd52dc5f001a0409a6bb650b0b Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 29 Dec 2020 16:25:29 +0100
Subject: [PATCH 682/888] FIX avoid warning php 8.0

---
 htdocs/admin/company.php                  | 26 +++++++++++------------
 htdocs/core/class/translate.class.php     |  2 +-
 htdocs/core/modules/modStock.class.php    |  2 +-
 htdocs/core/tpl/passwordforgotten.tpl.php |  8 +++----
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index b82f0fcd765..cac436955f5 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -393,18 +393,18 @@ print '<tr class="liste_titre"><th class="titlefield wordbreak">'.$langs->trans(
 
 // Name
 print '<tr class="oddeven"><td class="fieldrequired wordbreak"><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
-print '<input name="nom" id="name" class="minwidth200" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM ? $conf->global->MAIN_INFO_SOCIETE_NOM : GETPOST("nom", 'nohtml')).'"'.(empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? ' autofocus="autofocus"' : '').'></td></tr>'."\n";
+print '<input name="nom" id="name" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? $conf->global->MAIN_INFO_SOCIETE_NOM : GETPOST("nom", 'nohtml')).'"'.(empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? ' autofocus="autofocus"' : '').'></td></tr>'."\n";
 
 // Address
 print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_ADDRESS">'.$langs->trans("CompanyAddress").'</label></td><td>';
-print '<textarea name="MAIN_INFO_SOCIETE_ADDRESS" id="MAIN_INFO_SOCIETE_ADDRESS" class="quatrevingtpercent" rows="'.ROWS_3.'">'.($conf->global->MAIN_INFO_SOCIETE_ADDRESS ? $conf->global->MAIN_INFO_SOCIETE_ADDRESS : GETPOST("MAIN_INFO_SOCIETE_ADDRESS", 'nohtml')).'</textarea></td></tr>'."\n";
+print '<textarea name="MAIN_INFO_SOCIETE_ADDRESS" id="MAIN_INFO_SOCIETE_ADDRESS" class="quatrevingtpercent" rows="'.ROWS_3.'">'.(!empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS) ? $conf->global->MAIN_INFO_SOCIETE_ADDRESS : GETPOST("MAIN_INFO_SOCIETE_ADDRESS", 'nohtml')).'</textarea></td></tr>'."\n";
 
 // Zip
 print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_ZIP">'.$langs->trans("CompanyZip").'</label></td><td>';
-print '<input class="width100" name="MAIN_INFO_SOCIETE_ZIP" id="MAIN_INFO_SOCIETE_ZIP" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ZIP ? $conf->global->MAIN_INFO_SOCIETE_ZIP : GETPOST("MAIN_INFO_SOCIETE_ZIP", 'alpha')).'"></td></tr>'."\n";
+print '<input class="width100" name="MAIN_INFO_SOCIETE_ZIP" id="MAIN_INFO_SOCIETE_ZIP" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SOCIETE_ZIP) ? $conf->global->MAIN_INFO_SOCIETE_ZIP : GETPOST("MAIN_INFO_SOCIETE_ZIP", 'alpha')).'"></td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_TOWN">'.$langs->trans("CompanyTown").'</label></td><td>';
-print '<input name="MAIN_INFO_SOCIETE_TOWN" class="minwidth200" id="MAIN_INFO_SOCIETE_TOWN" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TOWN ? $conf->global->MAIN_INFO_SOCIETE_TOWN : GETPOST("MAIN_INFO_SOCIETE_TOWN", 'nohtml')).'"></td></tr>'."\n";
+print '<input name="MAIN_INFO_SOCIETE_TOWN" class="minwidth200" id="MAIN_INFO_SOCIETE_TOWN" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SOCIETE_TOWN) ? $conf->global->MAIN_INFO_SOCIETE_TOWN : GETPOST("MAIN_INFO_SOCIETE_TOWN", 'nohtml')).'"></td></tr>'."\n";
 
 // Country
 print '<tr class="oddeven"><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
@@ -431,25 +431,25 @@ print '</td></tr>'."\n";
 // Phone
 print '<tr class="oddeven"><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
 print img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright');
-print '<input name="tel" id="phone" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TEL).'"></td></tr>';
+print '<input name="tel" id="phone" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SOCIETE_TEL) ? $conf->global->MAIN_INFO_SOCIETE_TEL : GETPOST("MAIN_INFO_SOCIETE_TEL", 'alphanohtml')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Fax
 print '<tr class="oddeven"><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
 print img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright');
-print '<input name="fax" id="fax" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_FAX).'"></td></tr>';
+print '<input name="fax" id="fax" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SOCIETE_FAX) ? $conf->global->MAIN_INFO_SOCIETE_FAX : GETPOST("MAIN_INFO_SOCIETE_FAX", 'alphanohtml')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Email
 print '<tr class="oddeven"><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
 print img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright');
-print '<input name="mail" id="email" class="minwidth200" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MAIL).'"></td></tr>';
+print '<input name="mail" id="email" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SOCIETE_MAIL) ? $conf->global->MAIN_INFO_SOCIETE_MAIL : GETPOST("MAIN_INFO_SOCIETE_MAIL", 'alphanohtml')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Web
 print '<tr class="oddeven"><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
 print img_picto('', 'globe', '', false, 0, 0, '', 'paddingright');
-print '<input name="web" id="web" class="minwidth300" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_WEB).'"></td></tr>';
+print '<input name="web" id="web" class="minwidth300" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SOCIETE_WEB) ? $conf->global->MAIN_INFO_SOCIETE_WEB : GETPOST("MAIN_INFO_SOCIETE_WEB", 'alphanohtml')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Barcode
@@ -457,7 +457,7 @@ if (!empty($conf->barcode->enabled)) {
 	print '<tr class="oddeven"><td>';
 	print '<label for="barcode">'.$langs->trans("Gencod").'</label></td><td>';
 	print '<span class="fa paddingright fa-barcode"></span>';
-	print '<input name="barcode" id="barcode" class="minwidth150" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_GENCOD).'"></td></tr>';
+	print '<input name="barcode" id="barcode" class="minwidth150" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SOCIETE_GENCOD) ? $conf->global->MAIN_INFO_SOCIETE_GENCOD : GETPOST("MAIN_INFO_SOCIETE_GENCOD", 'alphanohtml')).'"></td></tr>';
 	print '</td></tr>';
 }
 
@@ -534,7 +534,7 @@ print '</td></tr>';
 
 // Note
 print '<tr class="oddeven"><td class="tdtop"><label for="note">'.$langs->trans("Note").'</label></td><td>';
-print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(GETPOSTISSET('note') ? GETPOST('note', 'restricthtml') : $conf->global->MAIN_INFO_SOCIETE_NOTE).'</textarea></td></tr>';
+print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(!empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? $conf->global->MAIN_INFO_SOCIETE_NOTE : GETPOST("MAIN_INFO_SOCIETE_NOTE", 'restricthtml')).'</textarea></td></tr>';
 print '</td></tr>';
 
 print '</table>';
@@ -549,17 +549,17 @@ $langs->load("companies");
 
 // Managing Director(s)
 print '<tr class="oddeven"><td><label for="director">'.$langs->trans("ManagingDirectors").'</label></td><td>';
-print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="directors" class="minwidth200" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MANAGERS).'"></td></tr>';
+print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="directors" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SOCIETE_MANAGERS) ? $conf->global->MAIN_INFO_SOCIETE_MANAGERS : GETPOST("MAIN_INFO_SOCIETE_MANAGERS", 'nohtml')).'"></td></tr>';
 
 // GDPR contact
 print '<tr class="oddeven"><td>';
 print $form->textwithpicto($langs->trans("GDPRContact"), $langs->trans("GDPRContactDesc"));
 print '</td><td>';
-print '<input name="MAIN_INFO_GDPR" id="infodirector" class="minwidth500" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_GDPR).'"></td></tr>';
+print '<input name="MAIN_INFO_GDPR" id="infodirector" class="minwidth500" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_GDPR) ? $conf->global->MAIN_INFO_GDPR : GETPOST("MAIN_INFO_GDPR", 'nohtml')).'"></td></tr>';
 
 // Capital
 print '<tr class="oddeven"><td><label for="capital">'.$langs->trans("Capital").'</label></td><td>';
-print '<input name="capital" id="capital" class="maxwidth100" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_CAPITAL).'"></td></tr>';
+print '<input name="capital" id="capital" class="maxwidth100" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_CAPITAL) ? $conf->global->MAIN_INFO_CAPITAL : GETPOST("MAIN_INFO_CAPITAL", 'nohtml')).'"></td></tr>';
 
 // Juridical Status
 print '<tr class="oddeven"><td><label for="forme_juridique_code">'.$langs->trans("JuridicalStatus").'</label></td><td>';
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 11e67104f9a..ac9285363d7 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -731,7 +731,7 @@ class Translate
 	 */
 	public function transcountry($str, $countrycode)
 	{
-		if ($this->tab_translate["$str$countrycode"]) return $this->trans("$str$countrycode");
+		if (!empty($this->tab_translate["$str$countrycode"])) return $this->trans("$str$countrycode");
 		else return $this->trans($str);
 	}
 
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index c15f041d21d..1e36bcb66ff 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -254,7 +254,7 @@ class modStock extends DolibarrModules
 		$this->export_sql_end[$r] .= ' AND e.entity IN ('.getEntity('stock').')';
 
 		// Export stock including batch number
-		if ($conf->productbatch->enabled)
+		if (!empty($conf->productbatch->enabled))
 		{
 			$langs->load("productbatch");
 
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 937ee63a68c..44d3c0199ac 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -81,9 +81,9 @@ $(document).ready(function () {
 <!-- Title with version -->
 <div class="login_table_title center" title="<?php echo dol_escape_htmltag($title); ?>">
 <?php
-if ($disablenofollow) echo '<a class="login_table_title" href="https://www.dolibarr.org" target="_blank">';
+if (!empty($disablenofollow)) echo '<a class="login_table_title" href="https://www.dolibarr.org" target="_blank">';
 echo dol_escape_htmltag($title);
-if ($disablenofollow) echo '</a>';
+if (!empty($disablenofollow)) echo '</a>';
 ?>
 </div>
 
@@ -113,7 +113,7 @@ if ($disablenofollow) echo '</a>';
 </div>
 
 <?php
-if ($captcha) {
+if (!empty($captcha)) {
 	// Add a variable param to force not using cache (jmobile)
 	$php_self = preg_replace('/[&\?]time=(\d+)/', '', $php_self); // Remove param time
 	if (preg_match('/\?/', $php_self)) $php_self .= '&time='.dol_print_date(dol_now(), 'dayhourlog');
@@ -200,7 +200,7 @@ if (!empty($morelogincontent)) {
 
 <br>
 
-<?php if ($message) { ?>
+<?php if (!empty($message)) { ?>
 	<div class="center login_main_message">
 	<?php echo dol_htmloutput_mesg($message, '', '', 1); ?>
 	</div>

From 620a088827324709301b50d4b42d13c48eedfd3e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Dec 2020 16:33:58 +0100
Subject: [PATCH 683/888] Fix warning

---
 htdocs/webservices/server_invoice.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index 15db912ff47..7397b8ca2a6 100644
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -777,12 +777,11 @@ function updateInvoice($authentication, $invoice)
 						$object->generateDocument($object->model_pdf, $outputlangs);
 					}
 				}
-				if ($invoice['status'] == Facture::STATUS_CLOSED)
-				{
-					$result = $object->set_paid($fuser, $invoice->close_code, $invoice->close_note);
+				if ($invoice['status'] == Facture::STATUS_CLOSED) {
+					$result = $object->set_paid($fuser, $invoice['close_code'], $invoice['close_note']);
 				}
 				if ($invoice['status'] == Facture::STATUS_ABANDONED)
-					$result = $object->set_canceled($fuser, $invoice->close_code, $invoice->close_note);
+					$result = $object->set_canceled($fuser, $invoice['close_code'], $invoice['close_note']);
 			}
 		}
 

From e4c3499cad6b8f9133bc3ef2969a1421f9c92baf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Mon, 28 Dec 2020 21:08:56 +0100
Subject: [PATCH 684/888] remove warnings

Conflicts:
	htdocs/societe/class/societe.class.php
---
 htdocs/societe/class/societe.class.php | 1315 +++++++++++++-----------
 1 file changed, 701 insertions(+), 614 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 69b934aeeff..95edf32f082 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -784,17 +784,24 @@ class Societe extends CommonObject
 		$error = 0;
 
 		// Clean parameters
-		if (empty($this->status)) $this->status = 0;
+		if (empty($this->status)) {
+			$this->status = 0;
+		}
 		$this->name = $this->name ?trim($this->name) : trim($this->nom);
 		$this->setUpperOrLowerCase();
 		$this->nom = $this->name; // For backward compatibility
-		if (empty($this->client))      $this->client = 0;
-		if (empty($this->fournisseur)) $this->fournisseur = 0;
+		if (empty($this->client)) {
+			$this->client = 0;
+		}
+		if (empty($this->fournisseur)) {
+			$this->fournisseur = 0;
+		}
 		$this->import_key = trim($this->import_key);
 
-		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
-		if (empty($this->fk_multicurrency))
-		{
+		if (!empty($this->multicurrency_code)) {
+			$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		}
+		if (empty($this->fk_multicurrency)) {
 			$this->multicurrency_code = '';
 			$this->fk_multicurrency = 0;
 		}
@@ -806,15 +813,18 @@ class Societe extends CommonObject
 		$this->db->begin();
 
 		// For automatic creation during create action (not used by Dolibarr GUI, can be used by scripts)
-		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this, 0);
-		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this, 1);
+		if ($this->code_client == -1 || $this->code_client === 'auto') {
+			$this->get_codeclient($this, 0);
+		}
+		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') {
+			$this->get_codefournisseur($this, 1);
+		}
 
 		// Check more parameters (including mandatory setup
 		// If error, this->errors[] is filled
 		$result = $this->verify();
 
-		if ($result >= 0)
-		{
+		if ($result >= 0) {
 			$this->entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, name_alias, entity, datec, fk_user_creat, canvas, status, ref_ext, fk_stcomm, fk_incoterms, location_incoterms ,import_key, fk_multicurrency, multicurrency_code)";
@@ -832,33 +842,32 @@ class Societe extends CommonObject
 
 			dol_syslog(get_class($this)."::create", LOG_DEBUG);
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe");
 
 				$ret = $this->update($this->id, $user, 0, 1, 1, 'add');
 
 				// Ajout du commercial affecte
-				if ($this->commercial_id != '' && $this->commercial_id != -1)
-				{
+				if ($this->commercial_id != '' && $this->commercial_id != -1) {
 					$this->add_commercial($user, $this->commercial_id);
 				}
 				// si un commercial cree un client il lui est affecte automatiquement
-				elseif (empty($user->rights->societe->client->voir))
-				{
+				elseif (empty($user->rights->societe->client->voir)) {
 					$this->add_commercial($user, $user->id);
 				}
 
-				if ($ret >= 0)
-				{
+				if ($ret >= 0) {
 					// Call trigger
 					$result = $this->call_trigger('COMPANY_CREATE', $user);
-					if ($result < 0) $error++;
+					if ($result < 0) {
+						$error++;
+					}
 					// End call triggers
-				} else $error++;
+				} else {
+					$error++;
+				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					dol_syslog(get_class($this)."::Create success id=".$this->id);
 					$this->db->commit();
 					return $this->id;
@@ -868,8 +877,7 @@ class Societe extends CommonObject
 					return -4;
 				}
 			} else {
-				if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-				{
+				if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 					$this->error = $langs->trans("ErrorCompanyNameAlreadyExists", $this->name); // duplicate on a field (code or profid or ...)
 					$result = -1;
 				} else {
@@ -916,8 +924,7 @@ class Societe extends CommonObject
 		$contact->phone_pro         = $this->phone;
 
 		$result = $contact->create($user);
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$this->error = $contact->error;
 			$this->errors = $contact->errors;
 			dol_syslog(get_class($this)."::create_individual ERROR:".$this->error, LOG_ERR);
@@ -943,17 +950,14 @@ class Societe extends CommonObject
 		$this->name = trim($this->name);
 		$this->nom = $this->name; // For backward compatibility
 
-		if (!$this->name)
-		{
+		if (!$this->name) {
 			$this->errors[] = 'ErrorBadThirdPartyName';
 			$result = -2;
 		}
 
-		if ($this->client)
-		{
+		if ($this->client) {
 			$rescode = $this->check_codeclient();
-			if ($rescode != 0 && $rescode != -5)
-			{
+			if ($rescode != 0 && $rescode != -5) {
 				if ($rescode == -1) {
 					$this->errors[] = 'ErrorBadCustomerCodeSyntax';
 				} elseif ($rescode == -2) {
@@ -970,11 +974,9 @@ class Societe extends CommonObject
 			}
 		}
 
-		if ($this->fournisseur)
-		{
+		if ($this->fournisseur) {
 			$rescode = $this->check_codefournisseur();
-			if ($rescode != 0 && $rescode != -5)
-			{
+			if ($rescode != 0 && $rescode != -5) {
 				if ($rescode == -1) {
 					$this->errors[] = 'ErrorBadSupplierCodeSyntax';
 				} elseif ($rescode == -2) {
@@ -992,22 +994,17 @@ class Societe extends CommonObject
 
 		// Check for duplicate or mandatory fields defined into setup
 		$array_to_check = array('IDPROF1', 'IDPROF2', 'IDPROF3', 'IDPROF4', 'IDPROF5', 'IDPROF6', 'EMAIL');
-		foreach ($array_to_check as $key)
-		{
+		foreach ($array_to_check as $key) {
 			$keymin = strtolower($key);
 			$i = (int) preg_replace('/[^0-9]/', '', $key);
 			$vallabel = $this->$keymin;
 
-			if ($i > 0)
-			{
-				if ($this->isACompany())
-				{
+			if ($i > 0) {
+				if ($this->isACompany()) {
 					// Check for mandatory prof id (but only if country is same than ours)
-					if ($mysoc->country_id > 0 && $this->country_id == $mysoc->country_id)
-					{
+					if ($mysoc->country_id > 0 && $this->country_id == $mysoc->country_id) {
 						$idprof_mandatory = 'SOCIETE_'.$key.'_MANDATORY';
-						if (!$vallabel && !empty($conf->global->$idprof_mandatory))
-						{
+						if (!$vallabel && !empty($conf->global->$idprof_mandatory)) {
 							$langs->load("errors");
 							$error++;
 							$this->errors[] = $langs->trans("ErrorProdIdIsMandatory", $langs->transcountry('ProfId'.$i, $this->country_code)).' ('.$langs->trans("ForbiddenBySetupRules").')';
@@ -1016,10 +1013,8 @@ class Societe extends CommonObject
 				}
 
 				// Check for unicity on profid
-				if (!$error && $vallabel && $this->id_prof_verifiable($i))
-				{
-					if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0)))
-					{
+				if (!$error && $vallabel && $this->id_prof_verifiable($i)) {
+					if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0))) {
 						$langs->load("errors");
 						$error++;
 						$this->errors[] = $langs->transcountry('ProfId'.$i, $this->country_code)." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
@@ -1028,21 +1023,17 @@ class Societe extends CommonObject
 			} else {
 				//var_dump($conf->global->SOCIETE_EMAIL_UNIQUE);
 				//var_dump($conf->global->SOCIETE_EMAIL_MANDATORY);
-				if ($key == 'EMAIL')
-				{
+				if ($key == 'EMAIL') {
 					// Check for mandatory
-					if (!empty($conf->global->SOCIETE_EMAIL_MANDATORY) && !isValidEMail($this->email))
-					{
+					if (!empty($conf->global->SOCIETE_EMAIL_MANDATORY) && !isValidEMail($this->email)) {
 						$langs->load("errors");
 						$error++;
 						$this->errors[] = $langs->trans("ErrorBadEMail", $this->email).' ('.$langs->trans("ForbiddenBySetupRules").')';
 					}
 
 					// Check for unicity
-					if (!$error && $vallabel && !empty($conf->global->SOCIETE_EMAIL_UNIQUE))
-					{
-						if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0)))
-						{
+					if (!$error && $vallabel && !empty($conf->global->SOCIETE_EMAIL_UNIQUE)) {
+						if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0))) {
 							$langs->load("errors");
 							$error++; $this->errors[] = $langs->trans('Email')." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
 						}
@@ -1051,7 +1042,9 @@ class Societe extends CommonObject
 			}
 		}
 
-		if ($error) $result = -4;
+		if ($error) {
+			$result = -4;
+		}
 
 		return $result;
 	}
@@ -1074,7 +1067,9 @@ class Societe extends CommonObject
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-		if (empty($id)) $id = $this->id;
+		if (empty($id)) {
+			$id = $this->id;
+		}
 
 		$error = 0;
 
@@ -1118,11 +1113,14 @@ class Societe extends CommonObject
 
 		$this->tva_assuj	= trim($this->tva_assuj);
 		$this->tva_intra	= dol_sanitizeFileName($this->tva_intra, '');
-		if (empty($this->status)) $this->status = 0;
+		if (empty($this->status)) {
+			$this->status = 0;
+		}
 
-		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
-		if (empty($this->fk_multicurrency))
-		{
+		if (!empty($this->multicurrency_code)) {
+			$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		}
+		if (empty($this->fk_multicurrency)) {
 			$this->multicurrency_code = '';
 			$this->fk_multicurrency = 0;
 		}
@@ -1134,8 +1132,12 @@ class Societe extends CommonObject
 		$this->localtax1_value = trim($this->localtax1_value);
 		$this->localtax2_value = trim($this->localtax2_value);
 
-		if ($this->capital != '') $this->capital = price2num(trim($this->capital));
-		if (!is_numeric($this->capital)) $this->capital = ''; // '' = undef
+		if ($this->capital != '') {
+			$this->capital = price2num(trim($this->capital));
+		}
+		if (!is_numeric($this->capital)) {
+			$this->capital = ''; // '' = undef
+		}
 
 		$this->effectif_id = trim($this->effectif_id);
 		$this->forme_juridique_code = trim($this->forme_juridique_code);
@@ -1144,41 +1146,44 @@ class Societe extends CommonObject
 		$this->barcode = trim($this->barcode);
 
 		// For automatic creation
-		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this, 0);
-		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this, 1);
+		if ($this->code_client == -1 || $this->code_client === 'auto') {
+			$this->get_codeclient($this, 0);
+		}
+		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') {
+			$this->get_codefournisseur($this, 1);
+		}
 
 		$this->code_compta = trim($this->code_compta);
 		$this->code_compta_fournisseur = trim($this->code_compta_fournisseur);
 
 		// Check parameters. More tests are done later in the ->verify()
-		if (!is_numeric($this->client) && !is_numeric($this->fournisseur))
-		{
+		if (!is_numeric($this->client) && !is_numeric($this->fournisseur)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("BadValueForParameterClientOrSupplier");
 			return -1;
 		}
 
 		$customer = false;
-		if (!empty($allowmodcodeclient) && !empty($this->client))
-		{
+		if (!empty($allowmodcodeclient) && !empty($this->client)) {
 			// Attention get_codecompta peut modifier le code suivant le module utilise
-			if (empty($this->code_compta))
-			{
+			if (empty($this->code_compta)) {
 				$ret = $this->get_codecompta('customer');
-				if ($ret < 0) return -1;
+				if ($ret < 0) {
+					return -1;
+				}
 			}
 
 			$customer = true;
 		}
 
 		$supplier = false;
-		if (!empty($allowmodcodefournisseur) && !empty($this->fournisseur))
-		{
+		if (!empty($allowmodcodefournisseur) && !empty($this->fournisseur)) {
 			// Attention get_codecompta peut modifier le code suivant le module utilise
-			if ($this->code_compta_fournisseur == "")
-			{
+			if ($this->code_compta_fournisseur == "") {
 				$ret = $this->get_codecompta('supplier');
-				if ($ret < 0) return -1;
+				if ($ret < 0) {
+					return -1;
+				}
 			}
 
 			$supplier = true;
@@ -1197,33 +1202,31 @@ class Societe extends CommonObject
 		// Check name is required and codes are ok or unique.
 		// If error, this->errors[] is filled
 		$result = 0;
-		if ($action != 'add' && $action != 'merge')
-		{
+		if ($action != 'add' && $action != 'merge') {
 			// We don't check when update called during a create because verify was already done.
 			// For a merge, we suppose source data is clean and a customer code of a deleted thirdparty must be accepted into a target thirdparty with empty code without duplicate error
 			$result = $this->verify();
 
 			// If there is only one error and error is ErrorBadCustomerCodeSyntax and we don't change customer code, we allow the update
 			// So we can update record that were using and old numbering rule.
-			if (is_array($this->errors))
-			{
-				if (in_array('ErrorBadCustomerCodeSyntax', $this->errors) && is_object($this->oldcopy) && $this->oldcopy->code_client == $this->code_client)
-				{
-					if (($key = array_search('ErrorBadCustomerCodeSyntax', $this->errors)) !== false) unset($this->errors[$key]); // Remove error message
+			if (is_array($this->errors)) {
+				if (in_array('ErrorBadCustomerCodeSyntax', $this->errors) && is_object($this->oldcopy) && $this->oldcopy->code_client == $this->code_client) {
+					if (($key = array_search('ErrorBadCustomerCodeSyntax', $this->errors)) !== false) {
+						unset($this->errors[$key]); // Remove error message
+					}
 				}
-				if (in_array('ErrorBadSupplierCodeSyntax', $this->errors) && is_object($this->oldcopy) && $this->oldcopy->code_fournisseur == $this->code_fournisseur)
-				{
-					if (($key = array_search('ErrorBadSupplierCodeSyntax', $this->errors)) !== false) unset($this->errors[$key]); // Remove error message
+				if (in_array('ErrorBadSupplierCodeSyntax', $this->errors) && is_object($this->oldcopy) && $this->oldcopy->code_fournisseur == $this->code_fournisseur) {
+					if (($key = array_search('ErrorBadSupplierCodeSyntax', $this->errors)) !== false) {
+						unset($this->errors[$key]); // Remove error message
+					}
 				}
-				if (empty($this->errors))	// If there is no more error, we can make like if there is no error at all
-				{
+				if (empty($this->errors)) {	// If there is no more error, we can make like if there is no error at all
 					$result = 0;
 				}
 			}
 		}
 
-		if ($result >= 0)
-		{
+		if ($result >= 0) {
 			dol_syslog(get_class($this)."::update verify ok or not done");
 
 			$sql  = "UPDATE ".MAIN_DB_PREFIX."societe SET ";
@@ -1264,29 +1267,32 @@ class Societe extends CommonObject
 			// Local taxes
 			$sql .= ",localtax1_assuj = ".($this->localtax1_assuj != '' ? "'".$this->db->escape($this->localtax1_assuj)."'" : "null");
 			$sql .= ",localtax2_assuj = ".($this->localtax2_assuj != '' ? "'".$this->db->escape($this->localtax2_assuj)."'" : "null");
-			if ($this->localtax1_assuj == 1)
-			{
-				if ($this->localtax1_value != '')
-				{
+			if ($this->localtax1_assuj == 1) {
+				if ($this->localtax1_value != '') {
 					$sql .= ",localtax1_value =".$this->localtax1_value;
-				} else $sql .= ",localtax1_value =0.000";
-			} else $sql .= ",localtax1_value =0.000";
+				} else {
+					$sql .= ",localtax1_value =0.000";
+				}
+			} else {
+				$sql .= ",localtax1_value =0.000";
+			}
 
-			if ($this->localtax2_assuj == 1)
-			{
-				if ($this->localtax2_value != '')
-				{
+			if ($this->localtax2_assuj == 1) {
+				if ($this->localtax2_value != '') {
 					$sql .= ",localtax2_value =".$this->localtax2_value;
-				} else $sql .= ",localtax2_value =0.000";
-			} else $sql .= ",localtax2_value =0.000";
+				} else {
+					$sql .= ",localtax2_value =0.000";
+				}
+			} else {
+				$sql .= ",localtax2_value =0.000";
+			}
 
 			$sql .= ",capital = ".($this->capital == '' ? "null" : $this->capital);
 
 			$sql .= ",prefix_comm = ".(!empty($this->prefix_comm) ? "'".$this->db->escape($this->prefix_comm)."'" : "null");
 
 			$sql .= ",fk_effectif = ".(!empty($this->effectif_id) ? "'".$this->db->escape($this->effectif_id)."'" : "null");
-			if (isset($this->stcomm_id))
-			{
+			if (isset($this->stcomm_id)) {
 				$sql .= ",fk_stcomm=".(!empty($this->stcomm_id) ? $this->stcomm_id : "0");
 			}
 			$sql .= ",fk_typent = ".(!empty($this->typent_id) ? "'".$this->db->escape($this->typent_id)."'" : "0");
@@ -1319,14 +1325,12 @@ class Societe extends CommonObject
 			$sql .= ", fk_incoterms = ".$this->fk_incoterms;
 			$sql .= ", location_incoterms = ".(!empty($this->location_incoterms) ? "'".$this->db->escape($this->location_incoterms)."'" : "null");
 
-			if ($customer)
-			{
+			if ($customer) {
 				$sql .= ", code_client = ".(!empty($this->code_client) ? "'".$this->db->escape($this->code_client)."'" : "null");
 				$sql .= ", code_compta = ".(!empty($this->code_compta) ? "'".$this->db->escape($this->code_compta)."'" : "null");
 			}
 
-			if ($supplier)
-			{
+			if ($supplier) {
 				$sql .= ", code_fournisseur = ".(!empty($this->code_fournisseur) ? "'".$this->db->escape($this->code_fournisseur)."'" : "null");
 				$sql .= ", code_compta_fournisseur = ".(($this->code_compta_fournisseur != "") ? "'".$this->db->escape($this->code_compta_fournisseur)."'" : "null");
 			}
@@ -1337,17 +1341,13 @@ class Societe extends CommonObject
 			$sql .= " WHERE rowid = ".(int) $id;
 
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
-				if (is_object($this->oldcopy))	// If we have information on old values
-				{
-					if ($this->oldcopy->country_id != $this->country_id)
-					{
+			if ($resql) {
+				if (is_object($this->oldcopy)) {	// If we have information on old values
+					if ($this->oldcopy->country_id != $this->country_id) {
 						unset($this->country_code);
 						unset($this->country);
 					}
-					if ($this->oldcopy->state_id != $this->state_id)
-					{
+					if ($this->oldcopy->state_id != $this->state_id) {
 						unset($this->state_code);
 						unset($this->state);
 					}
@@ -1360,11 +1360,9 @@ class Societe extends CommonObject
 
 				$nbrowsaffected = $this->db->affected_rows($resql);
 
-				if (!$error && $nbrowsaffected)
-				{
+				if (!$error && $nbrowsaffected) {
 					// Update information on linked member if it is an update
-					if (!$nosyncmember && !empty($conf->adherent->enabled))
-					{
+					if (!$nosyncmember && !empty($conf->adherent->enabled)) {
 						require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 
 						dol_syslog(get_class($this)."::update update linked member");
@@ -1372,8 +1370,7 @@ class Societe extends CommonObject
 						$lmember = new Adherent($this->db);
 						$result = $lmember->fetch(0, 0, $this->id);
 
-						if ($result > 0)
-						{
+						if ($result > 0) {
 							$lmember->company = $this->name;
 							//$lmember->firstname=$this->firstname?$this->firstname:$lmember->firstname;	// We keep firstname and lastname of member unchanged
 							//$lmember->lastname=$this->lastname?$this->lastname:$lmember->lastname;		// We keep firstname and lastname of member unchanged
@@ -1387,15 +1384,13 @@ class Societe extends CommonObject
 							$lmember->country_id = $this->country_id;
 
 							$result = $lmember->update($user, 0, 1, 1, 1); // Use nosync to 1 to avoid cyclic updates
-							if ($result < 0)
-							{
+							if ($result < 0) {
 								$this->error = $lmember->error;
 								$this->errors = array_merge($this->errors, $lmember->errors);
 								dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 								$error++;
 							}
-						} elseif ($result < 0)
-						{
+						} elseif ($result < 0) {
 							$this->error = $lmember->error;
 							$error++;
 						}
@@ -1405,34 +1400,30 @@ class Societe extends CommonObject
 				$action = 'update';
 
 				// Actions on extra fields
-				if (!$error)
-				{
+				if (!$error) {
 					$result = $this->insertExtraFields();
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$error++;
 					}
 				}
 				// Actions on extra languages
-				if (!$error && empty($conf->global->MAIN_EXTRALANGUAGES_DISABLED)) // For avoid conflicts if trigger used
-				{
+				if (!$error && empty($conf->global->MAIN_EXTRALANGUAGES_DISABLED)) { // For avoid conflicts if trigger used
 					$result = $this->insertExtraLanguages();
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$error++;
 					}
 				}
 
-				if (!$error && $call_trigger)
-				{
+				if (!$error && $call_trigger) {
 					// Call trigger
 					$result = $this->call_trigger('COMPANY_MODIFY', $user);
-					if ($result < 0) $error++;
+					if ($result < 0) {
+						$error++;
+					}
 					// End call triggers
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					dol_syslog(get_class($this)."::Update success");
 					$this->db->commit();
 					return 1;
@@ -1441,8 +1432,7 @@ class Societe extends CommonObject
 					return -1;
 				}
 			} else {
-				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-				{
+				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 					// Doublon
 					$this->error = $langs->trans("ErrorDuplicateField");
 					$result = -1;
@@ -1482,7 +1472,9 @@ class Societe extends CommonObject
 		global $langs;
 		global $conf;
 
-		if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($barcode) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6) && empty($email)) return -1;
+		if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($barcode) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6) && empty($email)) {
+			return -1;
+		}
 
 		$sql = 'SELECT s.rowid, s.nom as name, s.name_alias, s.entity, s.ref_ext, s.address, s.datec as date_creation, s.prefix_comm';
 		$sql .= ', s.status';
@@ -1525,30 +1517,51 @@ class Societe extends CommonObject
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_remise as sr ON sr.rowid = (SELECT MAX(rowid) FROM '.MAIN_DB_PREFIX.'societe_remise WHERE fk_soc = s.rowid AND entity IN ('.getEntity('discount').'))';
 
 		$sql .= ' WHERE s.entity IN ('.getEntity($this->element).')';
-		if ($rowid)     $sql .= ' AND s.rowid = '.$rowid;
-		if ($ref)       $sql .= " AND s.nom = '".$this->db->escape($ref)."'";
-		if ($ref_alias) $sql .= " AND s.name_alias = '".$this->db->escape($ref_alias)."'";
-		if ($ref_ext)   $sql .= " AND s.ref_ext = '".$this->db->escape($ref_ext)."'";
-		if ($barcode)   $sql .= " AND s.barcode = '".$this->db->escape($barcode)."'";
-		if ($idprof1)   $sql .= " AND s.siren = '".$this->db->escape($idprof1)."'";
-		if ($idprof2)   $sql .= " AND s.siret = '".$this->db->escape($idprof2)."'";
-		if ($idprof3)   $sql .= " AND s.ape = '".$this->db->escape($idprof3)."'";
-		if ($idprof4)   $sql .= " AND s.idprof4 = '".$this->db->escape($idprof4)."'";
-		if ($idprof5)   $sql .= " AND s.idprof5 = '".$this->db->escape($idprof5)."'";
-		if ($idprof6)   $sql .= " AND s.idprof6 = '".$this->db->escape($idprof6)."'";
-		if ($email)     $sql .= " AND s.email = '".$this->db->escape($email)."'";
+		if ($rowid) {
+			$sql .= ' AND s.rowid = '.$rowid;
+		}
+		if ($ref) {
+			$sql .= " AND s.nom = '".$this->db->escape($ref)."'";
+		}
+		if ($ref_alias) {
+			$sql .= " AND s.name_alias = '".$this->db->escape($ref_alias)."'";
+		}
+		if ($ref_ext) {
+			$sql .= " AND s.ref_ext = '".$this->db->escape($ref_ext)."'";
+		}
+		if ($barcode) {
+			$sql .= " AND s.barcode = '".$this->db->escape($barcode)."'";
+		}
+		if ($idprof1) {
+			$sql .= " AND s.siren = '".$this->db->escape($idprof1)."'";
+		}
+		if ($idprof2) {
+			$sql .= " AND s.siret = '".$this->db->escape($idprof2)."'";
+		}
+		if ($idprof3) {
+			$sql .= " AND s.ape = '".$this->db->escape($idprof3)."'";
+		}
+		if ($idprof4) {
+			$sql .= " AND s.idprof4 = '".$this->db->escape($idprof4)."'";
+		}
+		if ($idprof5) {
+			$sql .= " AND s.idprof5 = '".$this->db->escape($idprof5)."'";
+		}
+		if ($idprof6) {
+			$sql .= " AND s.idprof6 = '".$this->db->escape($idprof6)."'";
+		}
+		if ($email) {
+			$sql .= " AND s.email = '".$this->db->escape($email)."'";
+		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
-			if ($num > 1)
-			{
+			if ($num > 1) {
 				$this->error = 'Fetch found several records. Rename one of thirdparties to avoid duplicate.';
 				dol_syslog($this->error, LOG_ERR);
 				$result = -2;
-			} elseif ($num)   // $num = 1
-			{
+			} elseif ($num) {   // $num = 1
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id           = $obj->rowid;
@@ -1694,7 +1707,9 @@ class Societe extends CommonObject
 		}
 
 		// Use first price level if level not defined for third party
-		if ((!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && empty($this->price_level)) $this->price_level = 1;
+		if ((!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && empty($this->price_level)) {
+			$this->price_level = 1;
+		}
 
 		return $result;
 	}
@@ -1711,7 +1726,9 @@ class Societe extends CommonObject
 	{
 		global $langs, $conf, $user;
 
-		if (empty($fuser)) $fuser = $user;
+		if (empty($fuser)) {
+			$fuser = $user;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -1722,49 +1739,42 @@ class Societe extends CommonObject
 
 		// Test if child exists
 		$objectisused = $this->isObjectUsed($id);
-		if (empty($objectisused))
-		{
+		if (empty($objectisused)) {
 			$this->db->begin();
 
 			// User is mandatory for trigger call
-			if (!$error && $call_trigger)
-			{
+			if (!$error && $call_trigger) {
 				// Call trigger
 				$result = $this->call_trigger('COMPANY_DELETE', $fuser);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 				$static_cat = new Categorie($this->db);
 				$toute_categs = array();
 
 				// Fill $toute_categs array with an array of (type => array of ("Categorie" instance))
-				if ($this->client || $this->prospect)
-				{
+				if ($this->client || $this->prospect) {
 					$toute_categs['customer'] = $static_cat->containing($this->id, Categorie::TYPE_CUSTOMER);
 				}
-				if ($this->fournisseur)
-				{
+				if ($this->fournisseur) {
 					$toute_categs['supplier'] = $static_cat->containing($this->id, Categorie::TYPE_SUPPLIER);
 				}
 
 				// Remove each "Categorie"
-				foreach ($toute_categs as $type => $categs_type)
-				{
-					foreach ($categs_type as $cat)
-					{
+				foreach ($toute_categs as $type => $categs_type) {
+					foreach ($categs_type as $cat) {
 						$cat->del_type($this, $type);
 					}
 				}
 			}
 
-			if (!$error)
-			{
-				foreach ($this->childtablesoncascade as $tabletodelete)
-				{
+			if (!$error) {
+				foreach ($this->childtablesoncascade as $tabletodelete) {
 					$deleteFromObject = explode(':', $tabletodelete);
 					if (count($deleteFromObject) >= 2) {
 						$className = str_replace('@', '', $deleteFromObject[0]);
@@ -1796,51 +1806,42 @@ class Societe extends CommonObject
 			}
 
 			// Removed extrafields
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->deleteExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 					dol_syslog(get_class($this)."::delete error -3 ".$this->error, LOG_ERR);
 				}
 			}
 
 			// Remove links to subsidiaries companies
-			if (!$error)
-			{
+			if (!$error) {
 				$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
 				$sql .= " SET parent = NULL";
 				$sql .= " WHERE parent = ".$id;
-				if (!$this->db->query($sql))
-				{
+				if (!$this->db->query($sql)) {
 					$error++;
 					$this->errors[] = $this->db->lasterror();
 				}
 			}
 
 			// Remove third party
-			if (!$error)
-			{
+			if (!$error) {
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe";
 				$sql .= " WHERE rowid = ".$id;
-				if (!$this->db->query($sql))
-				{
+				if (!$this->db->query($sql)) {
 					$error++;
 					$this->errors[] = $this->db->lasterror();
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 
 				// Delete directory
-				if (!empty($conf->societe->multidir_output[$entity]))
-				{
+				if (!empty($conf->societe->multidir_output[$entity])) {
 					$docdir = $conf->societe->multidir_output[$entity]."/".$id;
-					if (dol_is_dir($docdir))
-					{
+					if (dol_is_dir($docdir)) {
 						dol_delete_dir_recursive($docdir);
 					}
 				}
@@ -1851,7 +1852,9 @@ class Societe extends CommonObject
 				$this->db->rollback();
 				return -1;
 			}
-		} else dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
+		} else {
+			dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
+		}
 		return 0;
 	}
 
@@ -1864,20 +1867,22 @@ class Societe extends CommonObject
 	public function set_as_client()
 	{
 		// phpcs:enable
-		if ($this->id)
-		{
+		if ($this->id) {
 			$newclient = 1;
-			if ($this->client == 2 || $this->client == 3) $newclient = 3; //If prospect, we keep prospect tag
+			if ($this->client == 2 || $this->client == 3) {
+				$newclient = 3; //If prospect, we keep prospect tag
+			}
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
 			$sql .= " SET client = ".$newclient;
 			$sql .= " WHERE rowid = ".$this->id;
 
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$this->client = $newclient;
 				return 1;
-			} else return -1;
+			} else {
+				return -1;
+			}
 		}
 		return 0;
 	}
@@ -1898,16 +1903,14 @@ class Societe extends CommonObject
 
 		// Parameter cleaning
 		$note = trim($note);
-		if (!$note)
-		{
+		if (!$note) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NoteReason"));
 			return -2;
 		}
 
 		dol_syslog(get_class($this)."::set_remise_client ".$remise.", ".$note.", ".$user->id);
 
-		if ($this->id)
-		{
+		if ($this->id) {
 			$this->db->begin();
 
 			$now = dol_now();
@@ -1917,8 +1920,7 @@ class Societe extends CommonObject
 			$sql .= " SET remise_client = '".$this->db->escape($remise)."'";
 			$sql .= " WHERE rowid = ".$this->id;
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->db->rollback();
 				$this->error = $this->db->error();
 				return -1;
@@ -1933,8 +1935,7 @@ class Societe extends CommonObject
 			$sql .= ")";
 
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->db->rollback();
 				$this->error = $this->db->lasterror();
 				return -1;
@@ -1961,16 +1962,14 @@ class Societe extends CommonObject
 
 		// Parameter cleaning
 		$note = trim($note);
-		if (!$note)
-		{
+		if (!$note) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NoteReason"));
 			return -2;
 		}
 
 		dol_syslog(get_class($this)."::set_remise_supplier ".$remise.", ".$note.", ".$user->id);
 
-		if ($this->id)
-		{
+		if ($this->id) {
 			$this->db->begin();
 
 			$now = dol_now();
@@ -1980,8 +1979,7 @@ class Societe extends CommonObject
 			$sql .= " SET remise_supplier = '".$this->db->escape($remise)."'";
 			$sql .= " WHERE rowid = ".$this->id;
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->db->rollback();
 				$this->error = $this->db->error();
 				return -1;
@@ -1996,8 +1994,7 @@ class Societe extends CommonObject
 			$sql .= ")";
 
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->db->rollback();
 				$this->error = $this->db->lasterror();
 				return -1;
@@ -2029,24 +2026,20 @@ class Societe extends CommonObject
 		$desc = trim($desc);
 
 		// Check parameters
-		if (!$remise > 0)
-		{
+		if (!$remise > 0) {
 			$this->error = $langs->trans("ErrorWrongValueForParameter", "1");
 			return -1;
 		}
-		if (!$desc)
-		{
+		if (!$desc) {
 			$this->error = $langs->trans("ErrorWrongValueForParameter", "3");
 			return -2;
 		}
 
-		if ($this->id > 0)
-		{
+		if ($this->id > 0) {
 			// Clean vat code
 			$reg = array();
 			$vat_src_code = '';
-			if (preg_match('/\((.*)\)/', $vatrate, $reg))
-			{
+			if (preg_match('/\((.*)\)/', $vatrate, $reg)) {
 				$vat_src_code = $reg[1];
 				$vatrate = preg_replace('/\s*\(.*\)/', '', $vatrate); // Remove code into vatrate.
 			}
@@ -2068,14 +2061,15 @@ class Societe extends CommonObject
 			$discount->description = $desc;
 
 			$result = $discount->create($user);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				return $result;
 			} else {
 				$this->error = $discount->error;
 				return -3;
 			}
-		} else return 0;
+		} else {
+			return 0;
+		}
 	}
 
 	/**
@@ -2093,8 +2087,7 @@ class Societe extends CommonObject
 
 		$discountstatic = new DiscountAbsolute($this->db);
 		$result = $discountstatic->getAvailableDiscounts($this, $user, $filter, $maxvalue, $discount_type);
-		if ($result >= 0)
-		{
+		if ($result >= 0) {
 			return $result;
 		} else {
 			$this->error = $discountstatic->error;
@@ -2119,13 +2112,14 @@ class Societe extends CommonObject
 
 		$sql = "SELECT DISTINCT u.rowid, u.login, u.lastname, u.firstname, u.office_phone, u.job, u.email, u.statut as status, u.entity, u.photo";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
-		if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
-		{
+		if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 			$sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
 			$sql .= " WHERE ((ug.fk_user = sc.fk_user";
 			$sql .= " AND ug.entity = ".$conf->entity.")";
 			$sql .= " OR u.admin = 1)";
-		} else $sql .= " WHERE entity in (0, ".$conf->entity.")";
+		} else {
+			$sql .= " WHERE entity in (0, ".$conf->entity.")";
+		}
 
 		$sql .= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id;
 		if (empty($sortfield) && empty($sortorder)) {
@@ -2135,16 +2129,13 @@ class Societe extends CommonObject
 		$sql .= $this->db->order($sortfield, $sortorder);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
-				if (empty($mode))
-				{
+				if (empty($mode)) {
 					$reparray[$i]['id'] = $obj->rowid;
 					$reparray[$i]['lastname'] = $obj->lastname;
 					$reparray[$i]['firstname'] = $obj->firstname;
@@ -2179,16 +2170,14 @@ class Societe extends CommonObject
 	public function set_price_level($price_level, User $user)
 	{
 		// phpcs:enable
-		if ($this->id)
-		{
+		if ($this->id) {
 			$now = dol_now();
 
 			$sql  = "UPDATE ".MAIN_DB_PREFIX."societe";
 			$sql .= " SET price_level = '".$this->db->escape($price_level)."'";
 			$sql .= " WHERE rowid = ".$this->id;
 
-			if (!$this->db->query($sql))
-			{
+			if (!$this->db->query($sql)) {
 				dol_print_error($this->db);
 				return -1;
 			}
@@ -2197,8 +2186,7 @@ class Societe extends CommonObject
 			$sql .= " (datec, fk_soc, price_level, fk_user_author)";
 			$sql .= " VALUES ('".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($price_level)."', ".$user->id.")";
 
-			if (!$this->db->query($sql))
-			{
+			if (!$this->db->query($sql)) {
 				dol_print_error($this->db);
 				return -1;
 			}
@@ -2220,50 +2208,42 @@ class Societe extends CommonObject
 		// phpcs:enable
 		$error = 0;
 
-		if ($this->id > 0 && $commid > 0)
-		{
+		if ($this->id > 0 && $commid > 0) {
 			$this->db->begin();
 
-			if (!$error)
-			{
+			if (!$error) {
 				$sql = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux";
 				$sql .= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
 
 				$resql = $this->db->query($sql);
-				if (!$resql)
-				{
+				if (!$resql) {
 					dol_syslog(get_class($this)."::add_commercial Error ".$this->db->lasterror());
 					$error++;
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_commerciaux";
 				$sql .= " (fk_soc, fk_user)";
 				$sql .= " VALUES (".$this->id.", ".$commid.")";
 
 				$resql = $this->db->query($sql);
-				if (!$resql)
-				{
+				if (!$resql) {
 					dol_syslog(get_class($this)."::add_commercial Error ".$this->db->lasterror());
 					$error++;
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->context = array('commercial_modified'=>$commid);
 
 				$result = $this->call_trigger('COMPANY_LINK_SALE_REPRESENTATIVE', $user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -2290,15 +2270,15 @@ class Societe extends CommonObject
 		$this->context = array('commercial_modified'=>$commid);
 
 		$result = $this->call_trigger('COMPANY_UNLINK_SALE_REPRESENTATIVE', $user);
-		if ($result < 0) $error++;
+		if ($result < 0) {
+			$error++;
+		}
 
-		if ($this->id > 0 && $commid > 0)
-		{
+		if ($this->id > 0 && $commid > 0) {
 			$sql  = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux ";
 			$sql .= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
 
-			if (!$this->db->query($sql))
-			{
+			if (!$this->db->query($sql)) {
 				dol_syslog(get_class($this)."::del_commercial Erreur");
 			}
 		}
@@ -2319,17 +2299,22 @@ class Societe extends CommonObject
 	{
 		global $conf, $langs, $hookmanager;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$name = $this->name ? $this->name : $this->nom;
 
 		if (!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)) {
-			if (empty($option) && $this->client > 0) $option = 'customer';
-			if (empty($option) && $this->fournisseur > 0) $option = 'supplier';
+			if (empty($option) && $this->client > 0) {
+				$option = 'customer';
+			}
+			if (empty($option) && $this->fournisseur > 0) {
+				$option = 'supplier';
+			}
 		}
 
-		if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
-		{
+		if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto))) {
 			$code = '';
 			if (($this->client) && (!empty($this->code_client)) && ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1 || $conf->global->SOCIETE_ADD_REF_IN_LIST == 2)) {
 				$code = $this->code_client.' - ';
@@ -2348,18 +2333,18 @@ class Societe extends CommonObject
 			}
 		}
 
-		if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';
+		if (!empty($this->name_alias)) {
+			$name .= ' ('.$this->name_alias.')';
+		}
 
 		$result = ''; $label = '';
 		$linkstart = ''; $linkend = '';
 
-		if (!empty($this->logo) && class_exists('Form'))
-		{
+		if (!empty($this->logo) && class_exists('Form')) {
 			$label .= '<div class="photointooltip">';
 			$label .= Form::showphoto('societe', $this, 0, 40, 0, '', 'mini', 0); // Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
 			$label .= '</div><div style="clear: both;"></div>';
-		} elseif (!empty($this->logo_squarred) && class_exists('Form'))
-		{
+		} elseif (!empty($this->logo_squarred) && class_exists('Form')) {
 			/*$label.= '<div class="photointooltip">';
 			$label.= Form::showphoto('societe', $this, 0, 40, 0, 'photowithmargin', 'mini', 0);	// Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
 			$label.= '</div><div style="clear: both;"></div>';*/
@@ -2367,43 +2352,34 @@ class Societe extends CommonObject
 
 		$label .= '<div class="centpercent">';
 
-		if ($option == 'customer' || $option == 'compta' || $option == 'category')
-		{
+		if ($option == 'customer' || $option == 'compta' || $option == 'category') {
 			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Customer").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
-		} elseif ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
-		{
+		} elseif ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
 			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Prospect").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
-		} elseif ($option == 'supplier' || $option == 'category_supplier')
-		{
+		} elseif ($option == 'supplier' || $option == 'category_supplier') {
 			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Supplier").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id;
-		} elseif ($option == 'agenda')
-		{
+		} elseif ($option == 'agenda') {
 			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$this->id;
-		} elseif ($option == 'project')
-		{
+		} elseif ($option == 'project') {
 			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/project.php?socid='.$this->id;
-		} elseif ($option == 'margin')
-		{
+		} elseif ($option == 'margin') {
 			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$this->id.'&type=1';
-		} elseif ($option == 'contact')
-		{
+		} elseif ($option == 'contact') {
 			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/contact.php?socid='.$this->id;
-		} elseif ($option == 'ban')
-		{
+		} elseif ($option == 'ban') {
 			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$this->id;
 		}
 
 		// By default
-		if (empty($linkstart))
-		{
+		if (empty($linkstart)) {
 			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$this->id;
 		}
@@ -2411,55 +2387,75 @@ class Societe extends CommonObject
 			$label .= ' '.$this->getLibStatut(5);
 		}
 
-		if (!empty($this->name))
-		{
+		if (!empty($this->name)) {
 			$label .= '<br><b>'.$langs->trans('Name').':</b> '.dol_escape_htmltag($this->name);
-			if (!empty($this->name_alias)) $label .= ' ('.dol_escape_htmltag($this->name_alias).')';
+			if (!empty($this->name_alias)) {
+				$label .= ' ('.dol_escape_htmltag($this->name_alias).')';
+			}
 		}
 		$label .= '<br><b>'.$langs->trans('Email').':</b> '.$this->email;
-		if (!empty($this->country_code))
+		if (!empty($this->country_code)) {
 			$label .= '<br><b>'.$langs->trans('Country').':</b> '.$this->country_code;
-		if (!empty($this->tva_intra) || (!empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP) && strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'vatnumber') !== false))
-			$label .= '<br><b>'.$langs->trans('VATIntra').':</b> '.dol_escape_htmltag($this->tva_intra);
-		if (!empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP))
-		{
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid1') !== false) $label .= '<br><b>'.$langs->trans('ProfId1'.$this->country_code).':</b> '.$this->idprof1;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid2') !== false) $label .= '<br><b>'.$langs->trans('ProfId2'.$this->country_code).':</b> '.$this->idprof2;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid3') !== false) $label .= '<br><b>'.$langs->trans('ProfId3'.$this->country_code).':</b> '.$this->idprof3;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid4') !== false) $label .= '<br><b>'.$langs->trans('ProfId4'.$this->country_code).':</b> '.$this->idprof4;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid5') !== false) $label .= '<br><b>'.$langs->trans('ProfId5'.$this->country_code).':</b> '.$this->idprof5;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid6') !== false) $label .= '<br><b>'.$langs->trans('ProfId6'.$this->country_code).':</b> '.$this->idprof6;
 		}
-		if (!empty($this->code_client) && ($this->client == 1 || $this->client == 3))
+		if (!empty($this->tva_intra) || (!empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP) && strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'vatnumber') !== false)) {
+			$label .= '<br><b>'.$langs->trans('VATIntra').':</b> '.dol_escape_htmltag($this->tva_intra);
+		}
+		if (!empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP)) {
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid1') !== false) {
+				$label .= '<br><b>'.$langs->trans('ProfId1'.$this->country_code).':</b> '.$this->idprof1;
+			}
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid2') !== false) {
+				$label .= '<br><b>'.$langs->trans('ProfId2'.$this->country_code).':</b> '.$this->idprof2;
+			}
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid3') !== false) {
+				$label .= '<br><b>'.$langs->trans('ProfId3'.$this->country_code).':</b> '.$this->idprof3;
+			}
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid4') !== false) {
+				$label .= '<br><b>'.$langs->trans('ProfId4'.$this->country_code).':</b> '.$this->idprof4;
+			}
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid5') !== false) {
+				$label .= '<br><b>'.$langs->trans('ProfId5'.$this->country_code).':</b> '.$this->idprof5;
+			}
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid6') !== false) {
+				$label .= '<br><b>'.$langs->trans('ProfId6'.$this->country_code).':</b> '.$this->idprof6;
+			}
+		}
+		if (!empty($this->code_client) && ($this->client == 1 || $this->client == 3)) {
 			$label .= '<br><b>'.$langs->trans('CustomerCode').':</b> '.$this->code_client;
-		if (!empty($this->code_fournisseur) && $this->fournisseur)
+		}
+		if (!empty($this->code_fournisseur) && $this->fournisseur) {
 			$label .= '<br><b>'.$langs->trans('SupplierCode').':</b> '.$this->code_fournisseur;
-		if (!empty($conf->accounting->enabled) && ($this->client == 1 || $this->client == 3))
+		}
+		if (!empty($conf->accounting->enabled) && ($this->client == 1 || $this->client == 3)) {
 			$label .= '<br><b>'.$langs->trans('CustomerAccountancyCode').':</b> '.($this->code_compta ? $this->code_compta : $this->code_compta_client);
-		if (!empty($conf->accounting->enabled) && $this->fournisseur)
+		}
+		if (!empty($conf->accounting->enabled) && $this->fournisseur) {
 			$label .= '<br><b>'.$langs->trans('SupplierAccountancyCode').':</b> '.$this->code_compta_fournisseur;
+		}
 		$label .= '</div>';
 
 		// Add type of canvas
 		$linkstart .= (!empty($this->canvas) ? '&canvas='.$this->canvas : '');
 		// Add param to save lastsearch_values or not
 		$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-		if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-		if ($add_save_lastsearch_values) $linkstart .= '&save_lastsearch_values=1';
+		if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+			$add_save_lastsearch_values = 1;
+		}
+		if ($add_save_lastsearch_values) {
+			$linkstart .= '&save_lastsearch_values=1';
+		}
 		$linkstart .= '"';
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowCompany");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip refurl"';
 
-		 	/*
+			/*
 			$hookmanager->initHooks(array('thirdpartydao'));
 			$parameters=array('id'=>$this->id);
 			$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
@@ -2470,15 +2466,18 @@ class Societe extends CommonObject
 		$linkend = '</a>';
 
 		global $user;
-		if (!$user->rights->societe->client->voir && $user->socid > 0 && $this->id != $user->socid)
-		{
+		if (!$user->rights->societe->client->voir && $user->socid > 0 && $this->id != $user->socid) {
 			$linkstart = '';
 			$linkend = '';
 		}
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= dol_escape_htmltag($maxlen ? dol_trunc($name, $maxlen) : $name);
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= dol_escape_htmltag($maxlen ? dol_trunc($name, $maxlen) : $name);
+		}
 		$result .= $linkend;
 
 		global $action;
@@ -2493,8 +2492,11 @@ class Societe extends CommonObject
 			'save_lastsearch_value'=> $save_lastsearch_value
 		);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -2525,10 +2527,11 @@ class Societe extends CommonObject
 		$langs->load('companies');
 
 		$statusType = 'status4';
-		if ($status == 0) $statusType = 'status6';
+		if ($status == 0) {
+			$statusType = 'status6';
+		}
 
-		if (empty($this->labelStatus) || empty($this->labelStatusShort))
-		{
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			$this->labelStatus[0] = $langs->trans("ActivityCeased");
 			$this->labelStatus[1] = $langs->trans("InActivity");
 			$this->labelStatusShort[0] = $langs->trans("ActivityCeased");
@@ -2551,9 +2554,10 @@ class Societe extends CommonObject
 		global $langs;
 
 		$contact_emails = $this->contact_property_array('email', 1);
-		if ($this->email && $addthirdparty)
-		{
-			if (empty($this->name)) $this->name = $this->nom;
+		if ($this->email && $addthirdparty) {
+			if (empty($this->name)) {
+				$this->name = $this->nom;
+			}
 			$contact_emails['thirdparty'] = $langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name, 16)." <".$this->email.">";
 		}
 		//var_dump($contact_emails)
@@ -2573,9 +2577,10 @@ class Societe extends CommonObject
 
 		$contact_phone = $this->contact_property_array('mobile');
 
-		if (!empty($this->phone))	// If a phone of thirdparty is defined, we add it ot mobile of contacts
-		{
-			if (empty($this->name)) $this->name = $this->nom;
+		if (!empty($this->phone)) {	// If a phone of thirdparty is defined, we add it ot mobile of contacts
+			if (empty($this->name)) {
+				$this->name = $this->nom;
+			}
 			// TODO: Tester si tel non deja present dans tableau contact
 			$contact_phone['thirdparty'] = $langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name, 16)." <".$this->phone.">";
 		}
@@ -2604,36 +2609,36 @@ class Societe extends CommonObject
 		$sql .= " ORDER BY lastname, firstname";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$nump = $this->db->num_rows($resql);
-			if ($nump)
-			{
+			if ($nump) {
 				$sepa = "("; $sepb = ")";
-				if ($mode == 'email')
-				{
+				if ($mode == 'email') {
 					//$sepa="&lt;"; $sepb="&gt;";
 					$sepa = "<"; $sepb = ">";
 				}
 				$i = 0;
-				while ($i < $nump)
-				{
+				while ($i < $nump) {
 					$obj = $this->db->fetch_object($resql);
-					if ($mode == 'email') $property = $obj->email;
-					elseif ($mode == 'mobile') $property = $obj->phone_mobile;
-					else $property = $obj->$mode;
+					if ($mode == 'email') {
+						$property = $obj->email;
+					} elseif ($mode == 'mobile') {
+						$property = $obj->phone_mobile;
+					} else {
+						$property = $obj->$mode;
+					}
 
 					// Show all contact. If hidedisabled is 1, showonly contacts with status = 1
-					if ($obj->status == 1 || empty($hidedisabled))
-					{
-						if (empty($property))
-						{
-							if ($mode == 'email') $property = $langs->transnoentitiesnoconv("NoEMail");
-							elseif ($mode == 'mobile') $property = $langs->transnoentitiesnoconv("NoMobilePhone");
+					if ($obj->status == 1 || empty($hidedisabled)) {
+						if (empty($property)) {
+							if ($mode == 'email') {
+								$property = $langs->transnoentitiesnoconv("NoEMail");
+							} elseif ($mode == 'mobile') {
+								$property = $langs->transnoentitiesnoconv("NoMobilePhone");
+							}
 						}
 
-						if (!empty($obj->poste))
-						{
+						if (!empty($obj->poste)) {
 							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname, $obj->lastname)).($obj->poste ? " - ".$obj->poste : "").(($mode != 'poste' && $property) ? " ".$sepa.$property.$sepb : '');
 						} else {
 							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname, $obj->lastname)).(($mode != 'poste' && $property) ? " ".$sepa.$property.$sepb : '');
@@ -2662,14 +2667,11 @@ class Societe extends CommonObject
 
 		$sql = "SELECT rowid, lastname, firstname FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$nump = $this->db->num_rows($resql);
-			if ($nump)
-			{
+			if ($nump) {
 				$i = 0;
-				while ($i < $nump)
-				{
+				while ($i < $nump) {
 					$obj = $this->db->fetch_object($resql);
 					$contacts[$obj->rowid] = dolGetFirstLastname($obj->firstname, $obj->lastname);
 					$i++;
@@ -2695,14 +2697,11 @@ class Societe extends CommonObject
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$nump = $this->db->num_rows($resql);
-			if ($nump)
-			{
+			if ($nump) {
 				$i = 0;
-				while ($i < $nump)
-				{
+				while ($i < $nump) {
 					$obj = $this->db->fetch_object($resql);
 					$contact = new Contact($this->db);
 					$contact->fetch($obj->rowid);
@@ -2729,23 +2728,26 @@ class Societe extends CommonObject
 		// phpcs:enable
 		$contact_property = '';
 
-		if (empty($rowid)) return '';
+		if (empty($rowid)) {
+			return '';
+		}
 
 		$sql = "SELECT rowid, email, phone_mobile, lastname, firstname";
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople";
 		$sql .= " WHERE rowid = ".((int) $rowid);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$nump = $this->db->num_rows($resql);
 
-			if ($nump)
-			{
+			if ($nump) {
 				$obj = $this->db->fetch_object($resql);
 
-				if ($mode == 'email') $contact_property = dol_string_nospecial(dolGetFirstLastname($obj->firstname, $obj->lastname), ' ', array(","))." <".$obj->email.">";
-				elseif ($mode == 'mobile') $contact_property = $obj->phone_mobile;
+				if ($mode == 'email') {
+					$contact_property = dol_string_nospecial(dolGetFirstLastname($obj->firstname, $obj->lastname), ' ', array(","))." <".$obj->email.">";
+				} elseif ($mode == 'mobile') {
+					$contact_property = $obj->phone_mobile;
+				}
 			}
 			return $contact_property;
 		} else {
@@ -2833,15 +2835,15 @@ class Societe extends CommonObject
 	{
 		// phpcs:enable
 		global $conf;
-		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-		{
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON)) {
 			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
 			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
+			foreach ($dirsociete as $dirroot) {
 				$res = dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 			$mod = new $module();
 
@@ -2865,15 +2867,15 @@ class Societe extends CommonObject
 	{
 		// phpcs:enable
 		global $conf;
-		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-		{
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON)) {
 			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
 			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
+			foreach ($dirsociete as $dirroot) {
 				$res = dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 			$mod = new $module();
 
@@ -2894,23 +2896,29 @@ class Societe extends CommonObject
 	{
 		// phpcs:enable
 		global $conf;
-		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-		{
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON)) {
 			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
 			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
+			foreach ($dirsociete as $dirroot) {
 				$res = dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 
 			$mod = new $module();
 
 			dol_syslog(get_class($this)."::codeclient_modifiable code_client=".$this->code_client." module=".$module);
-			if ($mod->code_modifiable_null && !$this->code_client) return 1;
-			if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) return 1;
-			if ($mod->code_modifiable) return 1; // A mettre en dernier
+			if ($mod->code_modifiable_null && !$this->code_client) {
+				return 1;
+			}
+			if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) {
+				return 1;
+			}
+			if ($mod->code_modifiable) {
+				return 1; // A mettre en dernier
+			}
 			return 0;
 		} else {
 			return 0;
@@ -2928,23 +2936,29 @@ class Societe extends CommonObject
 	{
 		// phpcs:enable
 		global $conf;
-		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-		{
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON)) {
 			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
 			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
+			foreach ($dirsociete as $dirroot) {
 				$res = dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 
 			$mod = new $module();
 
 			dol_syslog(get_class($this)."::codefournisseur_modifiable code_founisseur=".$this->code_fournisseur." module=".$module);
-			if ($mod->code_modifiable_null && !$this->code_fournisseur) return 1;
-			if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) return 1;
-			if ($mod->code_modifiable) return 1; // A mettre en dernier
+			if ($mod->code_modifiable_null && !$this->code_fournisseur) {
+				return 1;
+			}
+			if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) {
+				return 1;
+			}
+			if ($mod->code_modifiable) {
+				return 1; // A mettre en dernier
+			}
 			return 0;
 		} else {
 			return 0;
@@ -2968,25 +2982,25 @@ class Societe extends CommonObject
 	{
 		// phpcs:enable
 		global $conf;
-		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-		{
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON)) {
 			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
 			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
+			foreach ($dirsociete as $dirroot) {
 				$res = dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 
 			$mod = new $module();
 
-		   	dol_syslog(get_class($this)."::check_codeclient code_client=".$this->code_client." module=".$module);
-		   	$result = $mod->verif($this->db, $this->code_client, $this, 0);
-		   	if ($result) {	// If error
-		   		$this->error = $mod->error;
-		   		$this->errors = $mod->errors;
-		   	}
+			dol_syslog(get_class($this)."::check_codeclient code_client=".$this->code_client." module=".$module);
+			$result = $mod->verif($this->db, $this->code_client, $this, 0);
+			if ($result) {	// If error
+				$this->error = $mod->error;
+				$this->errors = $mod->errors;
+			}
 			return $result;
 		} else {
 			return 0;
@@ -3009,15 +3023,15 @@ class Societe extends CommonObject
 	{
 		// phpcs:enable
 		global $conf;
-		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-		{
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON)) {
 			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
 			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
+			foreach ($dirsociete as $dirroot) {
 				$res = dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 
 			$mod = new $module();
@@ -3048,26 +3062,28 @@ class Societe extends CommonObject
 		// phpcs:enable
 		global $conf;
 
-		if (!empty($conf->global->SOCIETE_CODECOMPTA_ADDON))
-		{
+		if (!empty($conf->global->SOCIETE_CODECOMPTA_ADDON)) {
 			$res = false;
 			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
+			foreach ($dirsociete as $dirroot) {
 				$res = dol_include_once($dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 
-			if ($res)
-			{
+			if ($res) {
 				$classname = $conf->global->SOCIETE_CODECOMPTA_ADDON;
 				$mod = new $classname;
 
 				// Set code count in $mod->code
 				$result = $mod->get_code($this->db, $this, $type);
 
-				if ($type == 'customer') $this->code_compta = $mod->code;
-				elseif ($type == 'supplier') $this->code_compta_fournisseur = $mod->code;
+				if ($type == 'customer') {
+					$this->code_compta = $mod->code;
+				} elseif ($type == 'supplier') {
+					$this->code_compta_fournisseur = $mod->code;
+				}
 
 				return $result;
 			} else {
@@ -3075,8 +3091,11 @@ class Societe extends CommonObject
 				return -1;
 			}
 		} else {
-			if ($type == 'customer') $this->code_compta = '';
-			elseif ($type == 'supplier') $this->code_compta_fournisseur = '';
+			if ($type == 'customer') {
+				$this->code_compta = '';
+			} elseif ($type == 'supplier') {
+				$this->code_compta_fournisseur = '';
+			}
 
 			return 0;
 		}
@@ -3092,21 +3111,21 @@ class Societe extends CommonObject
 	public function set_parent($id)
 	{
 		// phpcs:enable
-		if ($this->id)
-		{
+		if ($this->id) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
 			$sql .= " SET parent = ".($id > 0 ? $id : "null");
 			$sql .= " WHERE rowid = ".$this->id;
 			dol_syslog(get_class($this).'::set_parent', LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$this->parent = $id;
 				return 1;
 			} else {
 				return -1;
 			}
-		} else return -1;
+		} else {
+			return -1;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -3121,8 +3140,7 @@ class Societe extends CommonObject
 		// phpcs:enable
 		global $conf;
 
-	 	switch ($idprof)
-		{
+		switch ($idprof) {
 			case 1:
 				$ret = (empty($conf->global->SOCIETE_IDPROF1_UNIQUE) ? false : true);
 				break;
@@ -3162,8 +3180,7 @@ class Societe extends CommonObject
 		// phpcs:enable
 		$field = $idprof;
 
-	 	switch ($idprof)	// For backward compatibility
-		{
+		switch ($idprof) {	// For backward compatibility
 			case '1':
 			case 'idprof1':
 				$field = "siren";
@@ -3186,14 +3203,15 @@ class Societe extends CommonObject
 			case '6':
 				$field = "idprof6";
 				break;
-	 	}
+		}
 
 		 //Verify duplicate entries
 		$sql = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$this->db->escape($value)."' AND entity IN (".getEntity('societe').")";
-		if ($socid) $sql .= " AND rowid <> ".$socid;
+		if ($socid) {
+			$sql .= " AND rowid <> ".$socid;
+		}
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			$count = $obj->idprof;
 		} else {
@@ -3202,8 +3220,11 @@ class Societe extends CommonObject
 		}
 		$this->db->free($resql);
 
-		if ($count > 0) return true;
-		else return false;
+		if ($count > 0) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -3222,111 +3243,144 @@ class Societe extends CommonObject
 
 		$ok = 1;
 
-		if (!empty($conf->global->MAIN_DISABLEPROFIDRULES)) return 1;
+		if (!empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
+			return 1;
+		}
 
 		// Check SIREN if country FR
-		if ($idprof == 1 && $soc->country_code == 'FR')
-		{
+		if ($idprof == 1 && $soc->country_code == 'FR') {
 			$chaine = trim($this->idprof1);
 			$chaine = preg_replace('/(\s)/', '', $chaine);
 
-			if (!is_numeric($chaine)) return -1;
-			if (dol_strlen($chaine) != 9) return -1;
+			if (!is_numeric($chaine)) {
+				return -1;
+			}
+			if (dol_strlen($chaine) != 9) {
+				return -1;
+			}
 
 			// on prend chaque chiffre un par un
 			// si son index (position dans la chaîne en commence à 0 au premier caractère) est impair
 			// on double sa valeur et si cette dernière est supérieure à 9, on lui retranche 9
 			// on ajoute cette valeur à la somme totale
 			$sum = 0;
-			for ($index = 0; $index < 9; $index++)
-			{
+			for ($index = 0; $index < 9; $index++) {
 				$number = (int) $chaine[$index];
-				if (($index % 2) != 0) { if (($number *= 2) > 9) $number -= 9; }
+				if (($index % 2) != 0) {
+					if (($number *= 2) > 9) {
+						$number -= 9;
+					}
+				}
 				$sum += $number;
 			}
 
 			// le numéro est valide si la somme des chiffres est multiple de 10
-			if (($sum % 10) != 0) return -1;
+			if (($sum % 10) != 0) {
+				return -1;
+			}
 		}
 
 		// Verifie SIRET si pays FR
-		if ($idprof == 2 && $soc->country_code == 'FR')
-		{
+		if ($idprof == 2 && $soc->country_code == 'FR') {
 			$chaine = trim($this->idprof2);
 			$chaine = preg_replace('/(\s)/', '', $chaine);
 
-			if (!is_numeric($chaine)) return -1;
-			if (dol_strlen($chaine) != 14) return -1;
+			if (!is_numeric($chaine)) {
+				return -1;
+			}
+			if (dol_strlen($chaine) != 14) {
+				return -1;
+			}
 
 			// on prend chaque chiffre un par un
 			// si son index (position dans la chaîne en commence à 0 au premier caractère) est pair
 			// on double sa valeur et si cette dernière est supérieure à 9, on lui retranche 9
 			// on ajoute cette valeur à la somme totale
 			$sum = 0;
-			for ($index = 0; $index < 14; $index++)
-			{
+			for ($index = 0; $index < 14; $index++) {
 				$number = (int) $chaine[$index];
-				if (($index % 2) == 0) { if (($number *= 2) > 9) $number -= 9; }
+				if (($index % 2) == 0) {
+					if (($number *= 2) > 9) {
+						$number -= 9;
+					}
+				}
 				$sum += $number;
 			}
 
 			// le numéro est valide si la somme des chiffres est multiple de 10
-			if (($sum % 10) != 0) return -1;
+			if (($sum % 10) != 0) {
+				return -1;
+			}
 		}
 
 		//Verify CIF/NIF/NIE if pays ES
 		//Returns: 1 if NIF ok, 2 if CIF ok, 3 if NIE ok, -1 if NIF bad, -2 if CIF bad, -3 if NIE bad, 0 if unexpected bad
-		if ($idprof == 1 && $soc->country_code == 'ES')
-		{
+		if ($idprof == 1 && $soc->country_code == 'ES') {
 			$string = trim($this->idprof1);
 			$string = preg_replace('/(\s)/', '', $string);
 			$string = strtoupper($string);
 
 			//Check format
-			if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $string))
-			return 0;
+			if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $string)) {
+				return 0;
+			}
 
 			$num = array();
-			for ($i = 0; $i < 9; $i++)
-			{
+			for ($i = 0; $i < 9; $i++) {
 				$num[$i] = substr($string, $i, 1);
 			}
 
 			//Check NIF
-			if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string))
-				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1))
+			if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string)) {
+				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1)) {
 					return 1;
-			else return -1;
+				} else {
+					return -1;
+				}
+			}
 
 			//algorithm checking type code CIF
 			$sum = $num[2] + $num[4] + $num[6];
-			for ($i = 1; $i < 8; $i += 2)
-			$sum += intval(substr((2 * $num[$i]), 0, 1)) + intval(substr((2 * $num[$i]), 1, 1));
+			for ($i = 1; $i < 8; $i += 2) {
+				$sum += intval(substr((2 * $num[$i]), 0, 1)) + intval(substr((2 * $num[$i]), 1, 1));
+			}
 			$n = 10 - substr($sum, strlen($sum) - 1, 1);
 
 			//Chek special NIF
-			if (preg_match('/^[KLM]{1}/', $string))
-				if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1))
+			if (preg_match('/^[KLM]{1}/', $string)) {
+				if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1)) {
 					return 1;
-			else return -1;
+				} else {
+					return -1;
+				}
+			}
 
 			//Check CIF
-			if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string))
-				if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1))
+			if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string)) {
+				if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1)) {
 					return 2;
-			else return -2;
+				} else {
+					return -2;
+				}
+			}
 
 			//Check NIE T
-			if (preg_match('/^[T]{1}/', $string))
-				if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string))
+			if (preg_match('/^[T]{1}/', $string)) {
+				if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string)) {
 					return 3;
-			else return -3;
+				} else {
+					return -3;
+				}
+			}
 
 			//Check NIE XYZ
-			if (preg_match('/^[XYZ]{1}/', $string))
-				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X', 'Y', 'Z'), array('0', '1', '2'), $string), 0, 8) % 23, 1))
+			if (preg_match('/^[XYZ]{1}/', $string)) {
+				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X', 'Y', 'Z'), array('0', '1', '2'), $string), 0, 8) % 23, 1)) {
 					return 3;
-			else return -3;
+				} else {
+					return -3;
+				}
+			}
 
 			//Can not be verified
 			return -4;
@@ -3334,8 +3388,7 @@ class Societe extends CommonObject
 
 		//Verify NIF if country is PT
 		//Returns: 1 if NIF ok, -1 if NIF bad, 0 if unexpected bad
-		if ($idprof == 1 && $soc->country_code == 'PT')
-		{
+		if ($idprof == 1 && $soc->country_code == 'PT') {
 			$string = trim($this->idprof1);
 			$string = preg_replace('/(\s)/', '', $string);
 
@@ -3414,8 +3467,7 @@ class Societe extends CommonObject
 		// phpcs:enable
 		$sql = 'SELECT COUNT(*) as numproj FROM '.MAIN_DB_PREFIX.'projet WHERE fk_soc = '.$this->id;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			$count = $obj->numproj;
 		} else {
@@ -3441,10 +3493,8 @@ class Societe extends CommonObject
 		$sql .= " WHERE s.rowid = ".$id;
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 
 				$this->id = $obj->rowid;
@@ -3487,11 +3537,13 @@ class Societe extends CommonObject
 			$isacompany = 1;
 		} elseif (!empty($this->idprof1) || !empty($this->idprof2) || !empty($this->idprof3) || !empty($this->idprof4) || !empty($this->idprof5) || !empty($this->idprof6)) {
 			$isacompany = 1;
-		} elseif (!empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN')
-		{
+		} elseif (!empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN') {
 			// TODO Add a field is_a_company into dictionary
-			if (preg_match('/^TE_PRIVATE/', $this->typent_code)) $isacompany = 0;
-			else $isacompany = 1;
+			if (preg_match('/^TE_PRIVATE/', $this->typent_code)) {
+				$isacompany = 0;
+			} else {
+				$isacompany = 1;
+			}
 		}
 
 		return $isacompany;
@@ -3523,10 +3575,8 @@ class Societe extends CommonObject
 		$sql .= " WHERE type = ".Categorie::TYPE_SUPPLIER;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$this->SupplierCategories[$obj->rowid] = $obj->label;
 			}
 			return 0;
@@ -3545,12 +3595,13 @@ class Societe extends CommonObject
 	public function AddFournisseurInCategory($categorie_id)
 	{
 		// phpcs:enable
-		if ($categorie_id > 0 && $this->id > 0)
-		{
+		if ($categorie_id > 0 && $this->id > 0) {
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_fournisseur (fk_categorie, fk_soc) ";
 			$sql .= " VALUES (".$categorie_id.", ".$this->id.")";
 
-			if ($resql = $this->db->query($sql)) return 0;
+			if ($resql = $this->db->query($sql)) {
+				return 0;
+			}
 		} else {
 			return 0;
 		}
@@ -3576,7 +3627,9 @@ class Societe extends CommonObject
 		dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
 
 		$name = $socname ? $socname : $member->societe;
-		if (empty($name)) $name = $member->getFullName($langs);
+		if (empty($name)) {
+			$name = $member->getFullName($langs);
+		}
 
 		$alias = $socalias ? $socalias : '';
 
@@ -3602,15 +3655,13 @@ class Societe extends CommonObject
 
 		// Cree et positionne $this->id
 		$result = $this->create($user);
-		if ($result >= 0)
-		{
+		if ($result >= 0) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
 			$sql .= " SET fk_soc=".$this->id;
 			$sql .= " WHERE rowid=".$member->id;
 
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$this->db->commit();
 				return $this->id;
 			} else {
@@ -3652,12 +3703,10 @@ class Societe extends CommonObject
 
 		// We define country_id, country_code and country
 		$country_id = $country_code = $country_label = '';
-		if (!empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY))
-		{
+		if (!empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY)) {
 			$tmp = explode(':', $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
 			$country_id = $tmp[0];
-			if (!empty($tmp[1]))   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
-			{
+			if (!empty($tmp[1])) {   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
 				$country_code = $tmp[1];
 				$country_label = $tmp[2];
 			} else // For backward compatibility
@@ -3671,17 +3720,17 @@ class Societe extends CommonObject
 		$this->country_id = $country_id;
 		$this->country_code = $country_code;
 		$this->country = $country_label;
-		if (is_object($langs)) $this->country = ($langs->trans('Country'.$country_code) != 'Country'.$country_code) ? $langs->trans('Country'.$country_code) : $country_label;
+		if (is_object($langs)) {
+			$this->country = ($langs->trans('Country'.$country_code) != 'Country'.$country_code) ? $langs->trans('Country'.$country_code) : $country_label;
+		}
 
 		//TODO This could be replicated for region but function `getRegion` didn't exist, so I didn't added it.
 		// We define state_id, state_code and state
 		$state_id = 0; $state_code = $state_label = '';
-		if (!empty($conf->global->MAIN_INFO_SOCIETE_STATE))
-		{
+		if (!empty($conf->global->MAIN_INFO_SOCIETE_STATE)) {
 			$tmp = explode(':', $conf->global->MAIN_INFO_SOCIETE_STATE);
 			$state_id = $tmp[0];
-			if (!empty($tmp[1]))   // If $conf->global->MAIN_INFO_SOCIETE_STATE is "id:code:label"
-			{
+			if (!empty($tmp[1])) {   // If $conf->global->MAIN_INFO_SOCIETE_STATE is "id:code:label"
 				$state_code = $tmp[1];
 				$state_label = $tmp[2];
 			} else // For backward compatibility
@@ -3695,7 +3744,9 @@ class Societe extends CommonObject
 		$this->state_id = $state_id;
 		$this->state_code = $state_code;
 		$this->state = $state_label;
-		if (is_object($langs)) $this->state = ($langs->trans('State'.$state_code) != 'State'.$state_code) ? $langs->trans('State'.$state_code) : $state_label;
+		if (is_object($langs)) {
+			$this->state = ($langs->trans('State'.$state_code) != 'State'.$state_code) ? $langs->trans('State'.$state_code) : $state_label;
+		}
 
 		$this->phone = empty($conf->global->MAIN_INFO_SOCIETE_TEL) ? '' : $conf->global->MAIN_INFO_SOCIETE_TEL;
 		$this->fax = empty($conf->global->MAIN_INFO_SOCIETE_FAX) ? '' : $conf->global->MAIN_INFO_SOCIETE_FAX;
@@ -3709,12 +3760,24 @@ class Societe extends CommonObject
 		$this->youtube_url = empty($conf->global->MAIN_INFO_SOCIETE_YOUTUBE_URL) ? '' : $conf->global->MAIN_INFO_SOCIETE_YOUTUBE_URL;
 		$this->github_url = empty($conf->global->MAIN_INFO_SOCIETE_GITHUB_URL) ? '' : $conf->global->MAIN_INFO_SOCIETE_GITHUB_URL;
 		$this->socialnetworks = array();
-		if (!empty($this->facebook_url)) $this->socialnetworks['facebook'] = $this->facebook_url;
-		if (!empty($this->twitter_url)) $this->socialnetworks['twitter'] = $this->twitter_url;
-		if (!empty($this->linkedin_url)) $this->socialnetworks['linkedin'] = $this->linkedin_url;
-		if (!empty($this->instagram_url)) $this->socialnetworks['instagram'] = $this->instagram_url;
-		if (!empty($this->youtube_url)) $this->socialnetworks['youtube'] = $this->youtube_url;
-		if (!empty($this->github_url)) $this->socialnetworks['github'] = $this->github_url;
+		if (!empty($this->facebook_url)) {
+			$this->socialnetworks['facebook'] = $this->facebook_url;
+		}
+		if (!empty($this->twitter_url)) {
+			$this->socialnetworks['twitter'] = $this->twitter_url;
+		}
+		if (!empty($this->linkedin_url)) {
+			$this->socialnetworks['linkedin'] = $this->linkedin_url;
+		}
+		if (!empty($this->instagram_url)) {
+			$this->socialnetworks['instagram'] = $this->instagram_url;
+		}
+		if (!empty($this->youtube_url)) {
+			$this->socialnetworks['youtube'] = $this->youtube_url;
+		}
+		if (!empty($this->github_url)) {
+			$this->socialnetworks['github'] = $this->github_url;
+		}
 
 		// Id prof generiques
 		$this->idprof1 = empty($conf->global->MAIN_INFO_SIREN) ? '' : $conf->global->MAIN_INFO_SIREN;
@@ -3814,15 +3877,20 @@ class Societe extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
 		$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
 		$sql .= " AND t.active = 1";
-		if (empty($localTaxNum))   $sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
-		elseif ($localTaxNum == 1) $sql .= " AND t.localtax1_type <> '0'";
-		elseif ($localTaxNum == 2) $sql .= " AND t.localtax2_type <> '0'";
+		if (empty($localTaxNum)) {
+			$sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
+		} elseif ($localTaxNum == 1) {
+			$sql .= " AND t.localtax1_type <> '0'";
+		} elseif ($localTaxNum == 2) {
+			$sql .= " AND t.localtax2_type <> '0'";
+		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-   			return ($this->db->num_rows($resql) > 0);
-		} else return false;
+		if ($resql) {
+			return ($this->db->num_rows($resql) > 0);
+		} else {
+			return false;
+		}
 	}
 
 	/**
@@ -3839,10 +3907,11 @@ class Societe extends CommonObject
 
 		dol_syslog("useNPR", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			return ($this->db->num_rows($resql) > 0);
-		} else return false;
+		} else {
+			return false;
+		}
 	}
 
 	/**
@@ -3860,10 +3929,9 @@ class Societe extends CommonObject
 
 		dol_syslog("useRevenueStamp", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
-   			return (($obj->nb > 0) ?true:false);
+			return (($obj->nb > 0) ?true:false);
 		} else {
 			$this->error = $this->db->lasterror();
 			return false;
@@ -3894,8 +3962,7 @@ class Societe extends CommonObject
 
 		$lib = $langs->trans("ProspectLevel".$fk_prospectlevel);
 		// If lib not found in language file, we get label from cache/databse
-		if ($lib == $langs->trans("ProspectLevel".$fk_prospectlevel))
-		{
+		if ($lib == $langs->trans("ProspectLevel".$fk_prospectlevel)) {
 			$lib = $langs->getLabelFromKey($this->db, $fk_prospectlevel, 'c_prospectlevel', 'code', 'label');
 		}
 		return $lib;
@@ -3949,30 +4016,45 @@ class Societe extends CommonObject
 		$langs->load('customers');
 
 		if ($mode == 2) {
-			if ($status == '-1' || $status == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"), -1, $picto).' '.$langs->trans("StatusProspect-1");
-			elseif ($status == '0' || $status == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0, $picto).' '.$langs->trans("StatusProspect0");
-			elseif ($status == '1' || $status == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1, $picto).' '.$langs->trans("StatusProspect1");
-			elseif ($status == '2' || $status == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2, $picto).' '.$langs->trans("StatusProspect2");
-			elseif ($status == '3' || $status == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3, $picto).' '.$langs->trans("StatusProspect3");
-			else {
+			if ($status == '-1' || $status == 'ST_NO') {
+				return img_action($langs->trans("StatusProspect-1"), -1, $picto).' '.$langs->trans("StatusProspect-1");
+			} elseif ($status == '0' || $status == 'ST_NEVER') {
+				return img_action($langs->trans("StatusProspect0"), 0, $picto).' '.$langs->trans("StatusProspect0");
+			} elseif ($status == '1' || $status == 'ST_TODO') {
+				return img_action($langs->trans("StatusProspect1"), 1, $picto).' '.$langs->trans("StatusProspect1");
+			} elseif ($status == '2' || $status == 'ST_PEND') {
+				return img_action($langs->trans("StatusProspect2"), 2, $picto).' '.$langs->trans("StatusProspect2");
+			} elseif ($status == '3' || $status == 'ST_DONE') {
+				return img_action($langs->trans("StatusProspect3"), 3, $picto).' '.$langs->trans("StatusProspect3");
+			} else {
 				return img_action(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label, 0, $picto).' '.(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label);
 			}
 		} elseif ($mode == 3) {
-			if ($status == '-1' || $status == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"), -1, $picto);
-			elseif ($status == '0' || $status == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0, $picto);
-			elseif ($status == '1' || $status == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1, $picto);
-			elseif ($status == '2' || $status == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2, $picto);
-			elseif ($status == '3' || $status == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3, $picto);
-			else {
+			if ($status == '-1' || $status == 'ST_NO') {
+				return img_action($langs->trans("StatusProspect-1"), -1, $picto);
+			} elseif ($status == '0' || $status == 'ST_NEVER') {
+				return img_action($langs->trans("StatusProspect0"), 0, $picto);
+			} elseif ($status == '1' || $status == 'ST_TODO') {
+				return img_action($langs->trans("StatusProspect1"), 1, $picto);
+			} elseif ($status == '2' || $status == 'ST_PEND') {
+				return img_action($langs->trans("StatusProspect2"), 2, $picto);
+			} elseif ($status == '3' || $status == 'ST_DONE') {
+				return img_action($langs->trans("StatusProspect3"), 3, $picto);
+			} else {
 				return img_action(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label, 0, $picto);
 			}
 		} elseif ($mode == 4) {
-			if ($status == '-1' || $status == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"), -1, $picto).' '.$langs->trans("StatusProspect-1");
-			elseif ($status == '0' || $status == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0, $picto).' '.$langs->trans("StatusProspect0");
-			elseif ($status == '1' || $status == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1, $picto).' '.$langs->trans("StatusProspect1");
-			elseif ($status == '2' || $status == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2, $picto).' '.$langs->trans("StatusProspect2");
-			elseif ($status == '3' || $status == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3, $picto).' '.$langs->trans("StatusProspect3");
-			else {
+			if ($status == '-1' || $status == 'ST_NO') {
+				return img_action($langs->trans("StatusProspect-1"), -1, $picto).' '.$langs->trans("StatusProspect-1");
+			} elseif ($status == '0' || $status == 'ST_NEVER') {
+				return img_action($langs->trans("StatusProspect0"), 0, $picto).' '.$langs->trans("StatusProspect0");
+			} elseif ($status == '1' || $status == 'ST_TODO') {
+				return img_action($langs->trans("StatusProspect1"), 1, $picto).' '.$langs->trans("StatusProspect1");
+			} elseif ($status == '2' || $status == 'ST_PEND') {
+				return img_action($langs->trans("StatusProspect2"), 2, $picto).' '.$langs->trans("StatusProspect2");
+			} elseif ($status == '3' || $status == 'ST_DONE') {
+				return img_action($langs->trans("StatusProspect3"), 3, $picto).' '.$langs->trans("StatusProspect3");
+			} else {
 				return img_action(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label, 0, $picto).' '.(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label);
 			}
 		}
@@ -4003,7 +4085,9 @@ class Societe extends CommonObject
 	public function getOutstandingProposals($mode = 'customer')
 	{
 		$table = 'propal';
-		if ($mode == 'supplier') $table = 'supplier_proposal';
+		if ($mode == 'supplier') {
+			$table = 'supplier_proposal';
+		}
 
 		$sql  = "SELECT rowid, total_ht, total as total_ttc, fk_statut as status FROM ".MAIN_DB_PREFIX.$table." as f";
 		$sql .= " WHERE fk_soc = ".$this->id;
@@ -4015,21 +4099,22 @@ class Societe extends CommonObject
 
 		dol_syslog("getOutstandingProposals", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$outstandingOpened = 0;
 			$outstandingTotal = 0;
 			$outstandingTotalIncTax = 0;
 			while ($obj = $this->db->fetch_object($resql)) {
 				$outstandingTotal += $obj->total_ht;
 				$outstandingTotalIncTax += $obj->total_ttc;
-				if ($obj->status != 0)    // Not a draft
-				{
+				if ($obj->status != 0) {
+					// Not a draft
 					$outstandingOpened += $obj->total_ttc;
 				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -4041,7 +4126,9 @@ class Societe extends CommonObject
 	public function getOutstandingOrders($mode = 'customer')
 	{
 		$table = 'commande';
-		if ($mode == 'supplier') $table = 'commande_fournisseur';
+		if ($mode == 'supplier') {
+			$table = 'commande_fournisseur';
+		}
 
 		$sql  = "SELECT rowid, total_ht, total_ttc, fk_statut as status FROM ".MAIN_DB_PREFIX.$table." as f";
 		$sql .= " WHERE fk_soc = ".$this->id;
@@ -4053,21 +4140,22 @@ class Societe extends CommonObject
 
 		dol_syslog("getOutstandingOrders", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$outstandingOpened = 0;
 			$outstandingTotal = 0;
 			$outstandingTotalIncTax = 0;
 			while ($obj = $this->db->fetch_object($resql)) {
 				$outstandingTotal += $obj->total_ht;
 				$outstandingTotalIncTax += $obj->total_ttc;
-				if ($obj->status != 0)    // Not a draft
-				{
+				if ($obj->status != 0) {
+					// Not a draft
 					$outstandingOpened += $obj->total_ttc;
 				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -4080,7 +4168,9 @@ class Societe extends CommonObject
 	public function getOutstandingBills($mode = 'customer', $late = 0)
 	{
 		$table = 'facture';
-		if ($mode == 'supplier') $table = 'facture_fourn';
+		if ($mode == 'supplier') {
+			$table = 'facture_fourn';
+		}
 
 		/* Accurate value of remain to pay is to sum remaintopay for each invoice
 		 $paiement = $invoice->getSommePaiement();
@@ -4089,8 +4179,11 @@ class Societe extends CommonObject
 		 $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
 		 $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
 		 */
-		if ($mode == 'supplier') $sql = "SELECT rowid, total_ht as total_ht, total_ttc, paye, type, fk_statut as status, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
-		else $sql = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut as status, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		if ($mode == 'supplier') {
+			$sql = "SELECT rowid, total_ht as total_ht, total_ttc, paye, type, fk_statut as status, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		} else {
+			$sql = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut as status, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		}
 		$sql .= " WHERE fk_soc = ".$this->id;
 		if (!empty($late)) {
 			$sql .= " AND date_lim_reglement < '".$this->db->idate(dol_now())."'";
@@ -4103,13 +4196,11 @@ class Societe extends CommonObject
 
 		dol_syslog("getOutstandingBills", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$outstandingOpened = 0;
 			$outstandingTotal = 0;
 			$outstandingTotalIncTax = 0;
-			if ($mode == 'supplier')
-			{
+			if ($mode == 'supplier') {
 				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 				$tmpobject = new FactureFournisseur($this->db);
 			} else {
@@ -4121,17 +4212,15 @@ class Societe extends CommonObject
 
 				if ($obj->status != $tmpobject::STATUS_DRAFT                                           // Not a draft
 					&& !($obj->status == $tmpobject::STATUS_ABANDONED && $obj->close_code == 'replaced')  // Not a replaced invoice
-					)
-				{
+					) {
 					$outstandingTotal += $obj->total_ht;
 					$outstandingTotalIncTax += $obj->total_ttc;
 				}
 				if ($obj->paye == 0
 					&& $obj->status != $tmpobject::STATUS_DRAFT    		// Not a draft
 					&& $obj->status != $tmpobject::STATUS_ABANDONED	    // Not abandonned
-					&& $obj->status != $tmpobject::STATUS_CLOSED)   		// Not classified as paid
-				//$sql .= " AND (status <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
-				{
+					&& $obj->status != $tmpobject::STATUS_CLOSED) {		// Not classified as paid
+					//$sql .= " AND (status <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
 					$paiement = $tmpobject->getSommePaiement();
 					$creditnotes = $tmpobject->getSumCreditNotesUsed();
 					$deposits = $tmpobject->getSumDepositsUsed();
@@ -4141,8 +4230,7 @@ class Societe extends CommonObject
 
 				//if credit note is converted but not used
 				// TODO Do this also for customer ?
-				if ($mode == 'supplier' && $obj->type == FactureFournisseur::TYPE_CREDIT_NOTE && $tmpobject->isCreditNoteUsed())
-				{
+				if ($mode == 'supplier' && $obj->type == FactureFournisseur::TYPE_CREDIT_NOTE && $tmpobject->isCreditNoteUsed()) {
 					$outstandingOpened -= $tmpobject->getSumFromThisCreditNotesNotUsed();
 				}
 			}
@@ -4175,10 +4263,15 @@ class Societe extends CommonObject
 		global $langs;
 		$langs->load('companies');
 
-		if ($status == 0) return $langs->trans("NorProspectNorCustomer");
-		elseif ($status == 1) return $langs->trans("Customer");
-		elseif ($status == 2) return $langs->trans("Prospect");
-		elseif ($status == 3) return $langs->trans("ProspectCustomer");
+		if ($status == 0) {
+			return $langs->trans("NorProspectNorCustomer");
+		} elseif ($status == 1) {
+			return $langs->trans("Customer");
+		} elseif ($status == 2) {
+			return $langs->trans("Prospect");
+		} elseif ($status == 3) {
+			return $langs->trans("ProspectCustomer");
+		}
 	}
 
 
@@ -4197,21 +4290,20 @@ class Societe extends CommonObject
 	{
 		global $conf, $user, $langs;
 
-		if (!empty($moreparams) && !empty($moreparams['use_companybankid']))
-		{
+		if (!empty($moreparams) && !empty($moreparams['use_companybankid'])) {
 			$modelpath = "core/modules/bank/doc/";
 
 			include_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 			$companybankaccount = new CompanyBankAccount($this->db);
 			$result = $companybankaccount->fetch($moreparams['use_companybankid']);
-			if (!$result) dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
+			if (!$result) {
+				dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
+			}
 			$result = $companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 		} else {
 			// Positionne le modele sur le nom du modele a utiliser
-			if (!dol_strlen($modele))
-			{
-				if (!empty($conf->global->COMPANY_ADDON_PDF))
-				{
+			if (!dol_strlen($modele)) {
+				if (!empty($conf->global->COMPANY_ADDON_PDF)) {
 					$modele = $conf->global->COMPANY_ADDON_PDF;
 				} else {
 					print $langs->trans("Error")." ".$langs->trans("Error_COMPANY_ADDON_PDF_NotDefined");
@@ -4287,11 +4379,9 @@ class Societe extends CommonObject
 			}
 		}
 		foreach ($to_add as $add) {
-			if ($c->fetch($add) > 0)
-			{
+			if ($c->fetch($add) > 0) {
 				$result = $c->add_type($this, $type_categ);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 					$this->error = $c->error;
 					$this->errors = $c->errors;
@@ -4319,7 +4409,6 @@ class Societe extends CommonObject
 			$salesrep = array($salesrep);
 		}
 
-
 		$to_del = array(); // Nothing to delete
 		$to_add = $salesrep;
 		if ($onlyAdd === false) {
@@ -4341,8 +4430,7 @@ class Societe extends CommonObject
 		}
 		foreach ($to_add as $add) {
 			$result = $this->add_commercial($user, $add);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$error++;
 				break;
 			}
@@ -4359,22 +4447,22 @@ class Societe extends CommonObject
 	 */
 	public function setThirdpartyType($typent_id)
 	{
-		if ($this->id)
-		{
+		if ($this->id) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
 			$sql .= " SET fk_typent = ".($typent_id > 0 ? $typent_id : "null");
 			$sql .= " WHERE rowid = ".$this->id;
 			dol_syslog(get_class($this).'::setThirdpartyType', LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$this->typent_id = $typent_id;
-				$this->typent_code = dol_getIdFromCode($db, $this->$typent_id, 'c_typent', 'id', 'code');
+				$this->typent_code = dol_getIdFromCode($this->db, $this->$typent_id, 'c_typent', 'id', 'code');
 				return 1;
 			} else {
 				return -1;
 			}
-		} else return -1;
+		} else {
+			return -1;
+		}
 	}
 
 	/**
@@ -4388,8 +4476,7 @@ class Societe extends CommonObject
 	 */
 	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
 	{
-		if ($origin_id == $dest_id)
-		{
+		if ($origin_id == $dest_id) {
 			dol_syslog('Error: Try to merge a thirdparty into itself');
 			return false;
 		}

From 483ea559f52c63bd12054a6ea8b4a435c4777403 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Dec 2020 16:54:28 +0100
Subject: [PATCH 685/888] Fix warning #15823

---
 htdocs/webservices/server_productorservice.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index 473a720f46a..d35dc705b6f 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -536,7 +536,7 @@ function createProductOrService($authentication, $product)
 
 		$newobject->stock_reel = isset($product['stock_real']) ? $product['stock_real'] : null;
 		$newobject->pmp = isset($product['pmp']) ? $product['pmp'] : null;
-		$newobject->seuil_stock_alert = isset($product['stock_alert']) ? $product['stock_alert'] : null;
+		$newobject->seuil_stock_alerte = isset($product['stock_alert']) ? $product['stock_alert'] : null;
 
 		$newobject->country_id = isset($product['country_id']) ? $product['country_id'] : 0;
 		if (!empty($product['country_code'])) $newobject->country_id = getCountry($product['country_code'], 3);
@@ -705,15 +705,15 @@ function updateProductOrService($authentication, $product)
 				$newobject->barcode_type = $product['barcode_type'];
 		}
 
-		$newobject->stock_reel = $product['stock_real'];
-		$newobject->pmp = $product['pmp'];
-		$newobject->seuil_stock_alert = $product['stock_alert'];
+		$newobject->stock_reel = isset($product['stock_real']) ? $product['stock_real'] : null;
+		$newobject->pmp = isset($product['pmp']) ? $product['pmp'] : null;
+		$newobject->seuil_stock_alerte = isset($product['stock_alert']) ? $product['stock_alert'] : null;
 
-		$newobject->country_id = $product['country_id'];
-		if ($product['country_code']) $newobject->country_id = getCountry($product['country_code'], 3);
-		$newobject->customcode = $product['customcode'];
+		$newobject->country_id = isset($product['country_id']) ? $product['country_id'] : 0;
+		if (!empty($product['country_code'])) $newobject->country_id = getCountry($product['country_code'], 3);
+		$newobject->customcode = isset($product['customcode']) ? $product['customcode'] : '';
 
-		$newobject->canvas = $product['canvas'];
+		$newobject->canvas = isset($product['canvas']) ? $product['canvas'] : '';
 
 		$elementtype = 'product';
 

From 325c2b03f839044b27fd185193e481b9ce5b0329 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 29 Dec 2020 16:43:41 +0100
Subject: [PATCH 686/888] FIX step by step

---
 htdocs/admin/accountant.php                   | 24 ++++++++---------
 htdocs/admin/company_socialnetworks.php       |  6 ++---
 htdocs/admin/modules.php                      | 26 ++++++++++++++-----
 htdocs/admin/openinghours.php                 | 14 +++++-----
 htdocs/core/modules/DolibarrModules.class.php |  1 +
 htdocs/core/modules/modStock.class.php        |  2 +-
 htdocs/includes/parsedown/Parsedown.php       |  2 +-
 7 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php
index 7a1d5b66ece..c8fccb6073d 100644
--- a/htdocs/admin/accountant.php
+++ b/htdocs/admin/accountant.php
@@ -114,57 +114,57 @@ print '<tr class="liste_titre"><th class="titlefield wordbreak">'.$langs->trans(
 
 // Name
 print '<tr class="oddeven"><td><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
-print '<input name="nom" id="name" class="minwidth200" value="'.($conf->global->MAIN_INFO_ACCOUNTANT_NAME ? $conf->global->MAIN_INFO_ACCOUNTANT_NAME : GETPOST("nom", 'nohtml')).'"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"').'></td></tr>'."\n";
+print '<input name="nom" id="name" class="minwidth200" value="'.(!empty($conf->global->MAIN_INFO_ACCOUNTANT_NAME) ? $conf->global->MAIN_INFO_ACCOUNTANT_NAME : GETPOST("nom", 'nohtml')).'"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"').'></td></tr>'."\n";
 
 // Address
 print '<tr class="oddeven"><td><label for="address">'.$langs->trans("CompanyAddress").'</label></td><td>';
-print '<textarea name="address" id="address" class="quatrevingtpercent" rows="'.ROWS_3.'">'.($conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS ? $conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS : GETPOST("address", 'nohtml')).'</textarea></td></tr>'."\n";
+print '<textarea name="address" id="address" class="quatrevingtpercent" rows="'.ROWS_3.'">'.(!empty($conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS) ? $conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS : GETPOST("address", 'nohtml')).'</textarea></td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="zipcode">'.$langs->trans("CompanyZip").'</label></td><td>';
-print '<input class="minwidth100" name="zipcode" id="zipcode" value="'.($conf->global->MAIN_INFO_ACCOUNTANT_ZIP ? $conf->global->MAIN_INFO_ACCOUNTANT_ZIP : GETPOST("zipcode", 'alpha')).'"></td></tr>'."\n";
+print '<input class="minwidth100" name="zipcode" id="zipcode" value="'.(!empty($conf->global->MAIN_INFO_ACCOUNTANT_ZIP) ? $conf->global->MAIN_INFO_ACCOUNTANT_ZIP : GETPOST("zipcode", 'alpha')).'"></td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="town">'.$langs->trans("CompanyTown").'</label></td><td>';
-print '<input name="town" class="minwidth100" id="town" value="'.($conf->global->MAIN_INFO_ACCOUNTANT_TOWN ? $conf->global->MAIN_INFO_ACCOUNTANT_TOWN : GETPOST("town", 'nohtml')).'"></td></tr>'."\n";
+print '<input name="town" class="minwidth100" id="town" value="'.(!empty($conf->global->MAIN_INFO_ACCOUNTANT_TOWN) ? $conf->global->MAIN_INFO_ACCOUNTANT_TOWN : GETPOST("town", 'nohtml')).'"></td></tr>'."\n";
 
 // Country
 print '<tr class="oddeven"><td><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
 print img_picto('', 'globe-americas', 'class="paddingrightonly"');
-print $form->select_country($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 'country_id');
+print $form->select_country((!empty($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY) ? $conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY : GETPOST('country_id', 'int')), 'country_id');
 if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 print '</td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="state_id">'.$langs->trans("State").'</label></td><td class="maxwidthonsmartphone">';
-$formcompany->select_departement($conf->global->MAIN_INFO_ACCOUNTANT_STATE, $conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 'state_id');
+$formcompany->select_departement((!empty($conf->global->MAIN_INFO_ACCOUNTANT_STATE) ? $conf->global->MAIN_INFO_ACCOUNTANT_STATE : GETPOST('state_id', 'alpha')), (!empty($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY) ? $conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY : GETPOST('country_id', 'int')), 'state_id');
 print '</td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
 print img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright');
-print '<input name="tel" id="phone" value="'.$conf->global->MAIN_INFO_ACCOUNTANT_PHONE.'"></td></tr>';
+print '<input name="tel" id="phone" value="'.(!empty($conf->global->MAIN_INFO_ACCOUNTANT_PHONE) ? $conf->global->MAIN_INFO_ACCOUNTANT_PHONE : GETPOST('tel', 'alpha')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
 print img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright');
-print '<input name="fax" id="fax" value="'.$conf->global->MAIN_INFO_ACCOUNTANT_FAX.'"></td></tr>';
+print '<input name="fax" id="fax" value="'.(!empty($conf->global->MAIN_INFO_ACCOUNTANT_FAX) ? $conf->global->MAIN_INFO_ACCOUNTANT_FAX : GETPOST('fax', 'alpha')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
 print img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright');
-print '<input name="mail" id="email" class="minwidth200" value="'.$conf->global->MAIN_INFO_ACCOUNTANT_MAIL.'"></td></tr>';
+print '<input name="mail" id="email" class="minwidth200" value="'.(!empty($conf->global->MAIN_INFO_ACCOUNTANT_MAIL) ? $conf->global->MAIN_INFO_ACCOUNTANT_MAIL : GETPOST('mail', 'alpha')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Web
 print '<tr class="oddeven"><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
 print img_picto('', 'globe', '', false, 0, 0, '', 'paddingright');
-print '<input name="web" id="web" class="minwidth300" value="'.$conf->global->MAIN_INFO_ACCOUNTANT_WEB.'"></td></tr>';
+print '<input name="web" id="web" class="minwidth300" value="'.(!empty($conf->global->MAIN_INFO_ACCOUNTANT_WEB) ? $conf->global->MAIN_INFO_ACCOUNTANT_WEB : GETPOST('web', 'alpha')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Code
 print '<tr class="oddeven"><td><label for="code">'.$langs->trans("AccountantFileNumber").'</label></td><td>';
-print '<input name="code" id="code" class="minwidth100" value="'.($conf->global->MAIN_INFO_ACCOUNTANT_CODE ? $conf->global->MAIN_INFO_ACCOUNTANT_CODE : GETPOST("code", 'nohtml')).'"></td></tr>'."\n";
+print '<input name="code" id="code" class="minwidth100" value="'.(!empty($conf->global->MAIN_INFO_ACCOUNTANT_CODE) ? $conf->global->MAIN_INFO_ACCOUNTANT_CODE : GETPOST("code", 'nohtml')).'"></td></tr>'."\n";
 
 // Note
 print '<tr class="oddeven"><td class="tdtop"><label for="note">'.$langs->trans("Note").'</label></td><td>';
-print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(GETPOSTISSET('note') ? GETPOST('note', 'restricthtml') : $conf->global->MAIN_INFO_ACCOUNTANT_NOTE).'</textarea></td></tr>';
+print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(!empty($conf->global->MAIN_INFO_ACCOUNTANT_NOTE) ? $conf->global->MAIN_INFO_ACCOUNTANT_NOTE : GETPOST("note", 'restricthtml')).'</textarea></td></tr>';
 print '</td></tr>';
 
 print '</table>';
diff --git a/htdocs/admin/company_socialnetworks.php b/htdocs/admin/company_socialnetworks.php
index 5cbdb948b4a..93c6739d37d 100644
--- a/htdocs/admin/company_socialnetworks.php
+++ b/htdocs/admin/company_socialnetworks.php
@@ -117,11 +117,11 @@ foreach ($listofnetworks as $key => $value) {
 		$networkconstname = 'MAIN_INFO_SOCIETE_'.strtoupper($key).'_URL';
 		$networkconstid = 'MAIN_INFO_SOCIETE_'.strtoupper($key);
 		print '<td><span class="fa paddingright '.($value['icon'] ? $value['icon'] : 'fa-link').'"></span>';
-		print '<input name="'.$key.'url" id="'.$key.'url" class="minwidth300" value="'.dol_escape_htmltag($conf->global->$networkconstname).'">';
+		print '<input name="'.$key.'url" id="'.$key.'url" class="minwidth300" value="'.(!empty($conf->global->$networkconstname) ? dol_escape_htmltag($conf->global->$networkconstname) : '').'">';
 		print '</td><td>';
-		print '<input name="'.$key.'" id="'.$key.'" class="minwidth300" value="'.dol_escape_htmltag($conf->global->$networkconstid).'">';
+		print '<input name="'.$key.'" id="'.$key.'" class="minwidth300" value="'.(!empty($conf->global->$networkconstid) ? dol_escape_htmltag($conf->global->$networkconstid) : '').'">';
 		print '</td>';
-		print '<td>'.dol_print_socialnetworks($conf->global->$networkconstid, 0, 0, $key, $listofnetworks).'</td>';
+		print '<td>'.dol_print_socialnetworks((!empty($conf->global->$networkconstid) ? dol_escape_htmltag($conf->global->$networkconstid) : ''), 0, 0, $key, $listofnetworks).'</td>';
 		print '</tr>'."\n";
 	}
 }
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index e9984316394..4fc07fa1172 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -497,13 +497,19 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 	dol_set_focus('#search_keyword');
 
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-	if ($optioncss != '') {
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	if (isset($optioncss) && $optioncss != '') {
 		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	}
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	print '<input type="hidden" name="page" value="'.$page.'">';
+	if (isset($sortfield) && $sortfield != '') {
+	    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	}
+	if (isset($sortorder) && $sortorder != '') {
+	    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	}
+	if (isset($page) && $page != '') {
+	    print '<input type="hidden" name="page" value="'.$page.'">';
+	}
 	print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 	print dol_get_fiche_head($head, 'modules', '', -1);
@@ -1001,7 +1007,7 @@ if ($mode == 'marketplace') {
 			<div id="listing-content">
 				<table summary="list_of_modules" id="list_of_modules" class="productlist centpercent">
 					<tbody id="listOfModules">
-						<?php echo $dolistore->get_products($categorie); ?>
+						<?php echo $dolistore->get_products(!empty($categorie) ? $categorie: ''); ?>
 					</tbody>
 				</table>
 			</div>
@@ -1082,28 +1088,36 @@ if ($mode == 'deploy') {
 			$max = $conf->global->MAIN_UPLOAD_DOC; // In Kb
 			$maxphp = @ini_get('upload_max_filesize'); // In unknown
 			if (preg_match('/k$/i', $maxphp)) {
+			    $maxphp = preg_replace('/k$/i', '', $maxphp);
 				$maxphp = $maxphp * 1;
 			}
 			if (preg_match('/m$/i', $maxphp)) {
+			    $maxphp = preg_replace('/m$/i', '', $maxphp);
 				$maxphp = $maxphp * 1024;
 			}
 			if (preg_match('/g$/i', $maxphp)) {
+			    $maxphp = preg_replace('/g$/i', '', $maxphp);
 				$maxphp = $maxphp * 1024 * 1024;
 			}
 			if (preg_match('/t$/i', $maxphp)) {
+			    $maxphp = preg_replace('/t$/i', '', $maxphp);
 				$maxphp = $maxphp * 1024 * 1024 * 1024;
 			}
 			$maxphp2 = @ini_get('post_max_size'); // In unknown
 			if (preg_match('/k$/i', $maxphp2)) {
+			    $maxphp2 = preg_replace('/k$/i', '', $maxphp2);
 				$maxphp2 = $maxphp2 * 1;
 			}
 			if (preg_match('/m$/i', $maxphp2)) {
+			    $maxphp2 = preg_replace('/m$/i', '', $maxphp2);
 				$maxphp2 = $maxphp2 * 1024;
 			}
 			if (preg_match('/g$/i', $maxphp2)) {
+			    $maxphp2 = preg_replace('/g$/i', '', $maxphp2);
 				$maxphp2 = $maxphp2 * 1024 * 1024;
 			}
 			if (preg_match('/t$/i', $maxphp2)) {
+			    $maxphp2 = preg_replace('/t$/i', '', $maxphp2);
 				$maxphp2 = $maxphp2 * 1024 * 1024 * 1024;
 			}
 			// Now $max and $maxphp and $maxphp2 are in Kb
diff --git a/htdocs/admin/openinghours.php b/htdocs/admin/openinghours.php
index c3cbcb3d0ae..d50be27e97b 100644
--- a/htdocs/admin/openinghours.php
+++ b/htdocs/admin/openinghours.php
@@ -95,37 +95,37 @@ if (empty($action) || $action == 'edit' || $action == 'updateedit')
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("Monday"), $langs->trans("OpeningHoursFormatDesc"));
 	print '</td><td>';
-	print '<input name="monday" id="monday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_MONDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_MONDAY : GETPOST("monday", 'alpha')).'"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"').'></td></tr>'."\n";
+	print '<input name="monday" id="monday" class="minwidth100" value="'.(!empty($conf->global->MAIN_INFO_OPENINGHOURS_MONDAY) ? $conf->global->MAIN_INFO_OPENINGHOURS_MONDAY : GETPOST("monday", 'alpha')).'"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"').'></td></tr>'."\n";
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("Tuesday"), $langs->trans("OpeningHoursFormatDesc"));
 	print '</td><td>';
-	print '<input name="tuesday" id="tuesday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_TUESDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_TUESDAY : GETPOST("tuesday", 'alpha')).'"></td></tr>'."\n";
+	print '<input name="tuesday" id="tuesday" class="minwidth100" value="'.(!empty($conf->global->MAIN_INFO_OPENINGHOURS_TUESDAY) ? $conf->global->MAIN_INFO_OPENINGHOURS_TUESDAY : GETPOST("tuesday", 'alpha')).'"></td></tr>'."\n";
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("Wednesday"), $langs->trans("OpeningHoursFormatDesc"));
 	print '</td><td>';
-	print '<input name="wednesday" id="wednesday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_WEDNESDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_WEDNESDAY : GETPOST("wednesday", 'alpha')).'"></td></tr>'."\n";
+	print '<input name="wednesday" id="wednesday" class="minwidth100" value="'.(!empty($conf->global->MAIN_INFO_OPENINGHOURS_WEDNESDAY) ? $conf->global->MAIN_INFO_OPENINGHOURS_WEDNESDAY : GETPOST("wednesday", 'alpha')).'"></td></tr>'."\n";
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("Thursday"), $langs->trans("OpeningHoursFormatDesc"));
 	print '</td><td>';
-	print '<input name="thursday" id="thursday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_THURSDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_THURSDAY : GETPOST("thursday", 'alpha')).'"></td></tr>'."\n";
+	print '<input name="thursday" id="thursday" class="minwidth100" value="'.(!empty($conf->global->MAIN_INFO_OPENINGHOURS_THURSDAY) ? $conf->global->MAIN_INFO_OPENINGHOURS_THURSDAY : GETPOST("thursday", 'alpha')).'"></td></tr>'."\n";
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("Friday"), $langs->trans("OpeningHoursFormatDesc"));
 	print '</td><td>';
-	print '<input name="friday" id="friday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_FRIDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_FRIDAY : GETPOST("friday", 'alpha')).'"></td></tr>'."\n";
+	print '<input name="friday" id="friday" class="minwidth100" value="'.(!empty($conf->global->MAIN_INFO_OPENINGHOURS_FRIDAY) ? $conf->global->MAIN_INFO_OPENINGHOURS_FRIDAY : GETPOST("friday", 'alpha')).'"></td></tr>'."\n";
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("Saturday"), $langs->trans("OpeningHoursFormatDesc"));
 	print '</td><td>';
-	print '<input name="saturday" id="saturday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_SATURDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_SATURDAY : GETPOST("saturday", 'alpha')).'"></td></tr>'."\n";
+	print '<input name="saturday" id="saturday" class="minwidth100" value="'.(!empty($conf->global->MAIN_INFO_OPENINGHOURS_SATURDAY) ? $conf->global->MAIN_INFO_OPENINGHOURS_SATURDAY : GETPOST("saturday", 'alpha')).'"></td></tr>'."\n";
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("Sunday"), $langs->trans("OpeningHoursFormatDesc"));
 	print '</td><td>';
-	print '<input name="sunday" id="sunday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_SUNDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_SUNDAY : GETPOST("sunday", 'alpha')).'"></td></tr>'."\n";
+	print '<input name="sunday" id="sunday" class="minwidth100" value="'.(!empty($conf->global->MAIN_INFO_OPENINGHOURS_SUNDAY) ? $conf->global->MAIN_INFO_OPENINGHOURS_SUNDAY : GETPOST("sunday", 'alpha')).'"></td></tr>'."\n";
 
 	print '</table>';
 
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 510ec8ef55a..cfcb85054d2 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -622,6 +622,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 
+		$content='';
 		$pathoffile = $this->getDescLongReadmeFound();
 
 		if ($pathoffile)     // Mostly for external modules
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index 1e36bcb66ff..5ae6688a31f 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -327,7 +327,7 @@ class modStock extends DolibarrModules
 			'p.rowid'=>"product", 'p.ref'=>"product", 'p.fk_product_type'=>"product", 'p.label'=>"product", 'p.description'=>"product", 'p.note'=>"product",
 			'p.price'=>"product", 'p.tva_tx'=>'product', 'p.tosell'=>"product", 'p.tobuy'=>"product", 'p.duration'=>"product", 'p.datec'=>'product', 'p.tms'=>'product'
 		);	// We define here only fields that use another icon that the one defined into export_icon
-		if ($conf->productbatch->enabled)
+		if (!empty($conf->productbatch->enabled))
 		{
 			$this->export_fields_array[$r]['sm.batch'] = 'Batch';
 			$this->export_TypeFields_array[$r]['sm.batch'] = 'Text';
diff --git a/htdocs/includes/parsedown/Parsedown.php b/htdocs/includes/parsedown/Parsedown.php
index df718bce111..cc110c318c8 100644
--- a/htdocs/includes/parsedown/Parsedown.php
+++ b/htdocs/includes/parsedown/Parsedown.php
@@ -1182,7 +1182,7 @@ class Parsedown
                     'src' => $Link['element']['attributes']['href'],
                 	'alt' => $Link['element']['text'],
                 	// @CHANGE LDR
-                	'class' => $Link['element']['attributes']['class']
+                    'class' => (!empty($Link['element']['attributes']['class']) ? $Link['element']['attributes']['class'] : '')
                 ),
             ),
         );

From 057945f6934c7f3946ce51f9016a237b0c261277 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Dec 2020 17:04:39 +0100
Subject: [PATCH 687/888] Fix bad var

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

diff --git a/htdocs/core/boxes/box_scheduled_jobs.php b/htdocs/core/boxes/box_scheduled_jobs.php
index 2ac81c80d16..804c9a0fa96 100644
--- a/htdocs/core/boxes/box_scheduled_jobs.php
+++ b/htdocs/core/boxes/box_scheduled_jobs.php
@@ -103,7 +103,7 @@ class box_scheduled_jobs extends ModeleBoxes
 						$nextrun = $this->db->jdate($objp->datenextrun);
 						if (empty($nextrun)) $nextrun = $this->db->jdate($objp->datestart);
 
-						if ($line == 0 || ($nextrun < $cronstatic->datenextrun && (empty($objp->nbrun) || empty($objp->maxrun) || $objp->nbrun < $obj->maxrun))) {
+						if ($line == 0 || ($nextrun < $cronstatic->datenextrun && (empty($objp->nbrun) || empty($objp->maxrun) || $objp->nbrun < $objp->maxrun))) {
 							$cronstatic->id = $objp->rowid;
 							$cronstatic->ref = $objp->rowid;
 							$cronstatic->label = $langs->trans($objp->label);

From aec01a95fc328610d118cd092f90b2be346d24fd Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 29 Dec 2020 17:48:52 +0100
Subject: [PATCH 688/888] FIX again and again

---
 htdocs/admin/system/phpinfo.php               | 40 +++++++++++++++----
 htdocs/comm/card.php                          |  2 +-
 htdocs/core/class/commonobject.class.php      |  8 ++--
 htdocs/core/class/extrafields.class.php       |  9 ++++-
 htdocs/core/class/html.formactions.class.php  |  4 +-
 htdocs/core/class/html.formfile.class.php     | 40 +++++++++++++++----
 htdocs/core/lib/company.lib.php               | 15 ++++---
 .../tpl/extrafields_list_search_input.tpl.php |  2 +-
 .../tpl/extrafields_list_search_title.tpl.php |  2 +-
 htdocs/core/tpl/extrafields_view.tpl.php      |  4 +-
 htdocs/societe/consumption.php                |  7 ++--
 htdocs/societe/paymentmodes.php               |  4 +-
 12 files changed, 97 insertions(+), 40 deletions(-)

diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index cf38687f66f..388b61c75cf 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -51,15 +51,39 @@ if (isset($title))
 
 // Check PHP setup is OK
 $maxphp = @ini_get('upload_max_filesize'); // In unknown
-if (preg_match('/k$/i', $maxphp)) $maxphp = $maxphp * 1;
-if (preg_match('/m$/i', $maxphp)) $maxphp = $maxphp * 1024;
-if (preg_match('/g$/i', $maxphp)) $maxphp = $maxphp * 1024 * 1024;
-if (preg_match('/t$/i', $maxphp)) $maxphp = $maxphp * 1024 * 1024 * 1024;
+if (preg_match('/k$/i', $maxphp)) {
+    $maxphp = preg_replace('/k$/i', '', $maxphp);
+    $maxphp = $maxphp * 1;
+}
+if (preg_match('/m$/i', $maxphp)) {
+    $maxphp = preg_replace('/m$/i', '', $maxphp);
+    $maxphp = $maxphp * 1024;
+}
+if (preg_match('/g$/i', $maxphp)) {
+    $maxphp = preg_replace('/g$/i', '', $maxphp);
+    $maxphp = $maxphp * 1024 * 1024;
+}
+if (preg_match('/t$/i', $maxphp)) {
+    $maxphp = preg_replace('/t$/i', '', $maxphp);
+    $maxphp = $maxphp * 1024 * 1024 * 1024;
+}
 $maxphp2 = @ini_get('post_max_size'); // In unknown
-if (preg_match('/k$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1;
-if (preg_match('/m$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1024;
-if (preg_match('/g$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1024 * 1024;
-if (preg_match('/t$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1024 * 1024 * 1024;
+if (preg_match('/k$/i', $maxphp2)) {
+    $maxphp2 = preg_replace('/k$/i', '', $maxphp2);
+    $maxphp2 = $maxphp2 * 1;
+}
+if (preg_match('/m$/i', $maxphp2)) {
+    $maxphp2 = preg_replace('/m$/i', '', $maxphp2);
+    $maxphp2 = $maxphp2 * 1024;
+}
+if (preg_match('/g$/i', $maxphp2)) {
+    $maxphp2 = preg_replace('/g$/i', '', $maxphp2);
+    $maxphp2 = $maxphp2 * 1024 * 1024;
+}
+if (preg_match('/t$/i', $maxphp2)) {
+    $maxphp2 = preg_replace('/t$/i', '', $maxphp2);
+    $maxphp2 = $maxphp2 * 1024 * 1024 * 1024;
+}
 if ($maxphp > 0 && $maxphp2 > 0 && $maxphp > $maxphp2)
 {
 	$langs->load("errors");
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 93316384c2a..53e498fe303 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -87,7 +87,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $hookmanager->initHooks(array('thirdpartycomm', 'globalcard'));
 
 // Security check
-$result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', 0);
+$result = restrictedArea($user, 'societe', $id, '&societe', '', 'fk_soc', 'rowid', 0);
 
 if ($object->id > 0) {
 	if (!($object->client > 0) || empty($user->rights->societe->lire)) {
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index de4f2bc367c..3336dbda078 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -601,7 +601,7 @@ abstract class CommonObject
 		if (empty($lastname))  $lastname = (isset($this->lastname) ? $this->lastname : (isset($this->name) ? $this->name : (isset($this->nom) ? $this->nom : (isset($this->societe) ? $this->societe : (isset($this->company) ? $this->company : '')))));
 
 		$ret = '';
-		if ($option && $this->civility_code)
+		if (!empty($option) && !empty($this->civility_code))
 		{
 			if ($langs->transnoentitiesnoconv("Civility".$this->civility_code) != "Civility".$this->civility_code) $ret .= $langs->transnoentitiesnoconv("Civility".$this->civility_code).' ';
 			else $ret .= $this->civility_code.' ';
@@ -720,7 +720,7 @@ abstract class CommonObject
 		$out = '';
 
 		$outdone = 0;
-		$coords = $this->getFullAddress(1, ', ', $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);
+		$coords = $this->getFullAddress(1, ', ', (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) ? $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT : 0));
 		if ($coords)
 		{
 			if (!empty($conf->use_javascript_ajax))
@@ -1407,7 +1407,7 @@ abstract class CommonObject
 					} elseif (strpos($obj->element, 'supplier') !== false && $obj->element != 'supplier_proposal') {
 						$modulename = 'fournisseur';
 					}
-					if ($conf->{$modulename}->enabled) {
+					if (!empty($conf->{$modulename}->enabled)) {
 						$libelle_element = $langs->trans('ContactDefault_'.$obj->element);
 						$transkey = "TypeContact_".$obj->element."_".$source."_".$obj->code;
 						$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle);
@@ -6846,7 +6846,7 @@ abstract class CommonObject
 									$value = $getposttemp;
 								}
 							} else {
-								$value = $this->array_options["options_".$key]; // No GET, no POST, no default value, so we take value of object.
+							    $value = (!empty($this->array_options["options_".$key]) ? $this->array_options["options_".$key] : ''); // No GET, no POST, no default value, so we take value of object.
 							}
 							//var_dump($keyprefix.' - '.$key.' - '.$keysuffix.' - '.$keyprefix.'options_'.$key.$keysuffix.' - '.$this->array_options["options_".$key.$keysuffix].' - '.$getposttemp.' - '.$value);
 							break;
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 2daf4c835e9..cf499bbde5d 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1097,7 +1097,12 @@ class ExtraFields
 			foreach ($param['options'] as $key => $val)
 			{
 				if ((string) $key == '') continue;
-				list($val, $parent) = explode('|', $val);
+				$valarray = explode('|', $val);
+				$val = $valarray[0];
+				$parent = '';
+				if (!empty($valarray[1])) {
+				    $parent = $valarray[1];
+				}
 				$out .= '<option value="'.$key.'"';
 				$out .= (((string) $value == (string) $key) ? ' selected' : '');
 				$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
@@ -2063,7 +2068,7 @@ class ExtraFields
 	{
 		global $_POST;
 
-		if (is_string($extrafieldsobjectkey) && is_array($this->attributes[$extrafieldsobjectkey]['label']))
+		if (is_string($extrafieldsobjectkey) && !empty($this->attributes[$extrafieldsobjectkey]['label']) && is_array($this->attributes[$extrafieldsobjectkey]['label']))
 		{
 			$extralabels = $this->attributes[$extrafieldsobjectkey]['label'];
 		} else {
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 843c9ec759f..fe70c482d21 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -202,7 +202,7 @@ class FormActions
 			$newcardbutton = '';
 			if (!empty($conf->agenda->enabled) && !empty($user->rights->agenda->myactions->create))
 			{
-				$newcardbutton .= dolGetButtonTitle($langs->trans("AddEvent"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;datep='.urlencode(dol_print_date(dol_now(), 'dayhourlog')).'&amp;origin='.urlencode($typeelement).'&amp;originid='.$object->id.($object->socid > 0 ? '&amp;socid='.$object->socid : ($socid > 0 ? '&amp;socid='.$socid : '')).($projectid > 0 ? '&amp;projectid='.$projectid : '').'&amp;backtopage='.urlencode($urlbacktopage));
+			    $newcardbutton .= dolGetButtonTitle($langs->trans("AddEvent"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;datep='.urlencode(dol_print_date(dol_now(), 'dayhourlog')).'&amp;origin='.urlencode($typeelement).'&amp;originid='.$object->id.((!empty($object->socid) && $object->socid > 0) ? '&amp;socid='.$object->socid : ((!empty($socid) && $socid > 0) ? '&amp;socid='.$socid : '')).($projectid > 0 ? '&amp;projectid='.$projectid : '').'&amp;backtopage='.urlencode($urlbacktopage));
 			}
 
 
@@ -244,7 +244,7 @@ class FormActions
 					print '<td class="nowraponall tdoverflowmax125">';
 					if (!empty($actioncomm->userownerid))
 					{
-						if (is_object($cacheusers[$actioncomm->userownerid]))
+					    if (isset($cacheusers[$actioncomm->userownerid]) && is_object($cacheusers[$actioncomm->userownerid]))
 						{
 							$tmpuser = $cacheusers[$actioncomm->userownerid];
 						} else {
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 6836b70fe2d..0710416f1fe 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -135,15 +135,39 @@ class FormFile
 
 			$max = $conf->global->MAIN_UPLOAD_DOC; // In Kb
 			$maxphp = @ini_get('upload_max_filesize'); // In unknown
-			if (preg_match('/k$/i', $maxphp)) $maxphp = $maxphp * 1;
-			if (preg_match('/m$/i', $maxphp)) $maxphp = $maxphp * 1024;
-			if (preg_match('/g$/i', $maxphp)) $maxphp = $maxphp * 1024 * 1024;
-			if (preg_match('/t$/i', $maxphp)) $maxphp = $maxphp * 1024 * 1024 * 1024;
+			if (preg_match('/k$/i', $maxphp)) {
+			    $maxphp = preg_replace('/k$/i', '', $maxphp);
+			    $maxphp = $maxphp * 1;
+			}
+			if (preg_match('/m$/i', $maxphp)) {
+			    $maxphp = preg_replace('/m$/i', '', $maxphp);
+			    $maxphp = $maxphp * 1024;
+			}
+			if (preg_match('/g$/i', $maxphp)) {
+			    $maxphp = preg_replace('/g$/i', '', $maxphp);
+			    $maxphp = $maxphp * 1024 * 1024;
+			}
+			if (preg_match('/t$/i', $maxphp)) {
+			    $maxphp = preg_replace('/t$/i', '', $maxphp);
+			    $maxphp = $maxphp * 1024 * 1024 * 1024;
+			}
 			$maxphp2 = @ini_get('post_max_size'); // In unknown
-			if (preg_match('/k$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1;
-			if (preg_match('/m$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1024;
-			if (preg_match('/g$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1024 * 1024;
-			if (preg_match('/t$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1024 * 1024 * 1024;
+			if (preg_match('/k$/i', $maxphp2)) {
+			    $maxphp2 = preg_replace('/k$/i', '', $maxphp2);
+			    $maxphp2 = $maxphp2 * 1;
+			}
+			if (preg_match('/m$/i', $maxphp2)) {
+			    $maxphp2 = preg_replace('/m$/i', '', $maxphp2);
+			    $maxphp2 = $maxphp2 * 1024;
+			}
+			if (preg_match('/g$/i', $maxphp2)) {
+			    $maxphp2 = preg_replace('/g$/i', '', $maxphp2);
+			    $maxphp2 = $maxphp2 * 1024 * 1024;
+			}
+			if (preg_match('/t$/i', $maxphp2)) {
+			    $maxphp2 = preg_replace('/t$/i', '', $maxphp2);
+			    $maxphp2 = $maxphp2 * 1024 * 1024 * 1024;
+			}
 			// Now $max and $maxphp and $maxphp2 are in Kb
 			$maxmin = $max;
 			$maxphptoshow = $maxphptoshowparam = '';
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 1e2be9e856d..133a8fb86cd 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -302,7 +302,7 @@ function societe_prepare_head(Societe $object)
 	}
 
 	$head[$h][0] = DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id;
-	$head[$h][1] .= $langs->trans("Events");
+	$head[$h][1] = $langs->trans("Events");
 	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$head[$h][1] .= '/';
 		$head[$h][1] .= $langs->trans("Agenda");
@@ -862,7 +862,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 
 	// Definition of fields for list
 	$arrayfields = array(
-		't.rowid'=>array('label'=>"TechnicalID", 'checked'=>($conf->global->MAIN_SHOW_TECHNICAL_ID ? 1 : 0), 'enabled'=>($conf->global->MAIN_SHOW_TECHNICAL_ID ? 1 : 0), 'position'=>1),
+		't.rowid'=>array('label'=>"TechnicalID", 'checked'=>(!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) ? 1 : 0), 'enabled'=>(!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) ? 1 : 0), 'position'=>1),
 		't.name'=>array('label'=>"Name", 'checked'=>1, 'position'=>10),
 		't.poste'=>array('label'=>"PostOrFunction", 'checked'=>1, 'position'=>20),
 		't.address'=>array('label'=>(empty($conf->dol_optimize_smallscreen) ? $langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email") : $langs->trans("Address")), 'checked'=>1, 'position'=>30),
@@ -870,7 +870,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 		't.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>50, 'class'=>'center'),
 	);
 	// Extra fields
-	if (is_array($extrafields->attributes[$contactstatic->table_element]['label']) && count($extrafields->attributes[$contactstatic->table_element]['label'])) {
+	if (!empty($extrafields->attributes[$contactstatic->table_element]['label']) && is_array($extrafields->attributes[$contactstatic->table_element]['label']) && count($extrafields->attributes[$contactstatic->table_element]['label'])) {
 		foreach ($extrafields->attributes[$contactstatic->table_element]['label'] as $key => $val) {
 			if (!empty($extrafields->attributes[$contactstatic->table_element]['list'][$key])) {
 				$arrayfields["ef.".$key] = array(
@@ -989,7 +989,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 			} elseif (in_array($key, array('role'))) {
 				print $formcompany->showRoles("search_roles", $contactstatic, 'edit', $search_roles);
 			} else {
-				print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+			    print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.(!empty($search[$key]) ? dol_escape_htmltag($search[$key]) : '').'">';
 			}
 			print '</td>';
 		}
@@ -1204,14 +1204,17 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 {
 	global $user, $conf;
 	global $form;
-
 	global $param, $massactionbutton;
+
 	$start_year = GETPOST('dateevent_startyear');
 	$start_month = GETPOST('dateevent_startmonth');
 	$start_day = GETPOST('dateevent_startday');
 	$end_year = GETPOST('dateevent_endyear');
 	$end_month = GETPOST('dateevent_endmonth');
 	$end_day = GETPOST('dateevent_endday');
+	$tms_start = '';
+	$tms_end = '';
+
 	if (!empty($start_year) && !empty($start_month) && !empty($start_day)) {
 		$search_start = $start_year.'-'.$start_month.'-'.$start_day;
 		$tms_start = strtotime($search_start);
@@ -1391,7 +1394,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 					//if ($donetodo == 'todo') $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";
 					//elseif ($donetodo == 'done') $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";
 					$tododone = '';
-					if (($obj->percent >= 0 and $obj->percent < 100) || ($obj->percent == -1 && $obj->datep > $now)) $tododone = 'todo';
+					if (($obj->percent >= 0 and $obj->percent < 100) || ($obj->percent == -1 && (!empty($obj->datep) && $obj->datep > $now))) $tododone = 'todo';
 
 					$histo[$numaction] = array(
 						'type'=>$obj->type,
diff --git a/htdocs/core/tpl/extrafields_list_search_input.tpl.php b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
index bf31ff34ad7..edd73873101 100644
--- a/htdocs/core/tpl/extrafields_list_search_input.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
@@ -14,7 +14,7 @@ if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey =
 // Loop to show all columns of extrafields for the search title line
 if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 {
-	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
+    if (!empty($extrafields->attributes[$extrafieldsobjectkey]['label']) && is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
 	{
 		if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';
 		if (empty($search_options_pattern)) $search_options_pattern = 'search_options_';
diff --git a/htdocs/core/tpl/extrafields_list_search_title.tpl.php b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
index 1c071ac64c1..f1ea80871b8 100644
--- a/htdocs/core/tpl/extrafields_list_search_title.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
@@ -13,7 +13,7 @@ if (!isset($disablesortlink)) $disablesortlink = 0;
 // Loop to show all columns of extrafields for the title line
 if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 {
-	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
+    if (!empty($extrafields->attributes[$extrafieldsobjectkey]['label']) && is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
 	{
 		if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';
 
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 9db0ae13824..ed775c21e6c 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -87,7 +87,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 		{
 			$value = (GETPOSTISSET("options_".$tmpkeyextra) ? GETPOST("options_".$tmpkeyextra) : $object->array_options["options_".$tmpkeyextra]);
 		} else {
-			$value = $object->array_options["options_".$tmpkeyextra];
+		    $value = (!empty($object->array_options["options_".$tmpkeyextra]) ? $object->array_options["options_".$tmpkeyextra] : '');
 			//var_dump($tmpkeyextra.' - '.$value);
 		}
 
@@ -165,7 +165,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 
 			$html_id = !empty($object->id) ? $object->element.'_extras_'.$tmpkeyextra.'_'.$object->id : '';
 
-			print '<td id="'.$html_id.'" class="'.$object->element.'_extras_'.$tmpkeyextra.' wordbreak"'.($cols ? ' colspan="'.$cols.'"' : '').'>';
+			print '<td id="'.$html_id.'" class="'.$object->element.'_extras_'.$tmpkeyextra.' wordbreak"'.(!empty($cols) ? ' colspan="'.$cols.'"' : '').'>';
 
 			// Convert date into timestamp format
 			if (in_array($extrafields->attributes[$object->table_element]['type'][$tmpkeyextra], array('date', 'datetime')))
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 779bf573341..62301015418 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -148,7 +148,7 @@ if ($object->client)
 	if ($conf->contrat->enabled && $user->rights->contrat->lire) $elementTypeArray['contract'] = $langs->transnoentitiesnoconv('Contracts');
 }
 
-if ($conf->ficheinter->enabled && $user->rights->ficheinter->lire) $elementTypeArray['fichinter'] = $langs->transnoentitiesnoconv('Interventions');
+if (!empty($conf->ficheinter->enabled) && !empty($user->rights->ficheinter->lire)) $elementTypeArray['fichinter'] = $langs->transnoentitiesnoconv('Interventions');
 
 if ($object->fournisseur)
 {
@@ -606,9 +606,10 @@ if ($sql_select)
 		print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num);
 	}
 	$db->free($resql);
-} elseif (empty($type_element) || $type_element == -1)
+}
+elseif (empty($type_element) || $type_element == -1)
 {
-	print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
+	print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', (!empty($num) ? $num : 0), '', '');
 
 	print '<table class="liste centpercent">'."\n";
 	// Titles with sort buttons
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index ee4ca01e7ee..deca82df81a 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -99,7 +99,7 @@ if ($cancel)
 	$action = '';
 }
 
-$parameters = array('id'=>$socid, 'objcanvas'=>$objcanvas);
+$parameters = array('id'=>$socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
@@ -937,7 +937,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		{
 			try {
 				$customerstripe = $stripe->customerStripe($object, $stripeacc, $servicestatus);
-				if ($customerstripe->id) {
+				if (!empty($customerstripe->id)) {
 					// When using the Charge API architecture
 					if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
 					{

From 3fe495756be00966aa18de72a0afd963f0df4833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 29 Dec 2020 21:44:41 +0100
Subject: [PATCH 689/888] add $fields in paymentsalary class

---
 htdocs/salaries/class/paymentsalary.class.php | 296 +++++++++---------
 htdocs/salaries/list.php                      | 270 ++++++++++------
 2 files changed, 323 insertions(+), 243 deletions(-)

diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index 6aee986396b..83371cd6f24 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -88,6 +88,10 @@ class PaymentSalary extends CommonObject
 	 */
 	public $fk_user_modif;
 
+	/**
+	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 */
+	public $fields = array();
 
 	/**
 	 *	Constructor
@@ -120,8 +124,7 @@ class PaymentSalary extends CommonObject
 		$this->note = trim($this->note);
 
 		// Check parameters
-		if (empty($this->fk_user) || $this->fk_user < 0)
-		{
+		if (empty($this->fk_user) || $this->fk_user < 0) {
 			$this->error = 'ErrorBadParameter';
 			return -1;
 		}
@@ -151,35 +154,29 @@ class PaymentSalary extends CommonObject
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 
 		// Update extrafield
-		if (!$error)
-		{
-			if (!$error)
-			{
-				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
-					$error++;
-				}
+		if (!$error) {
+			$result = $this->insertExtraFields();
+			if ($result < 0) {
+				$error++;
 			}
 		}
 
-		if (!$notrigger)
-		{
+		if (!$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('PAYMENT_SALARY_MODIFY', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -227,26 +224,24 @@ class PaymentSalary extends CommonObject
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
-				$this->ref				= $obj->rowid;
-				$this->tms				= $this->db->jdate($obj->tms);
+				$this->ref = $obj->rowid;
+				$this->tms = $this->db->jdate($obj->tms);
 				$this->fk_user = $obj->fk_user;
-				$this->datep			= $this->db->jdate($obj->datep);
-				$this->datev			= $this->db->jdate($obj->datev);
+				$this->datep = $this->db->jdate($obj->datep);
+				$this->datev = $this->db->jdate($obj->datev);
 				$this->amount = $obj->amount;
 				$this->fk_project = $obj->fk_project;
 				$this->type_payement = $obj->fk_typepayment;
 				$this->num_payment = $obj->num_payment;
-				$this->label			= $obj->label;
-				$this->datesp			= $this->db->jdate($obj->datesp);
-				$this->dateep			= $this->db->jdate($obj->dateep);
-				$this->note				= $obj->note;
+				$this->label = $obj->label;
+				$this->datesp = $this->db->jdate($obj->datesp);
+				$this->dateep = $this->db->jdate($obj->dateep);
+				$this->note = $obj->note;
 				$this->fk_bank = $obj->fk_bank;
 				$this->fk_user_author = $obj->fk_user_author;
 				$this->fk_user_modif = $obj->fk_user_modif;
@@ -282,18 +277,18 @@ class PaymentSalary extends CommonObject
 
 		// Call trigger
 		$result = $this->call_trigger('PAYMENT_SALARY_DELETE', $user);
-		if ($result < 0) return -1;
+		if ($result < 0) {
+			return -1;
+		}
 		// End call triggers
 
 		// Delete donation
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_salary_extrafields";
 			$sql .= " WHERE fk_object=".$this->id;
 
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $this->db->lasterror();
 				$error++;
 			}
@@ -304,8 +299,7 @@ class PaymentSalary extends CommonObject
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -326,7 +320,7 @@ class PaymentSalary extends CommonObject
 		$this->id = 0;
 
 		$this->tms = '';
-		$this->fk_user = '';
+		$this->fk_user = 1;
 		$this->datep = '';
 		$this->datev = '';
 		$this->amount = '';
@@ -335,8 +329,8 @@ class PaymentSalary extends CommonObject
 		$this->dateep = '';
 		$this->note = '';
 		$this->fk_bank = '';
-		$this->fk_user_author = '';
-		$this->fk_user_modif = '';
+		$this->fk_user_author = 1;
+		$this->fk_user_modif = 1;
 	}
 
 	/**
@@ -356,34 +350,29 @@ class PaymentSalary extends CommonObject
 		$this->amount = price2num(trim($this->amount));
 		$this->label = trim($this->label);
 		$this->note = trim($this->note);
-		$this->fk_bank = trim($this->fk_bank);
-		$this->fk_user_author = trim($this->fk_user_author);
-		$this->fk_user_modif = trim($this->fk_user_modif);
+		$this->fk_bank = (int) $this->fk_bank;
+		$this->fk_user_author = (int) $this->fk_user_author;
+		$this->fk_user_modif = (int) $this->fk_user_modif;
 
 		// Check parameters
-		if (!$this->label)
-		{
-			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
+		if (!$this->label) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
 			return -3;
 		}
-		if ($this->fk_user < 0 || $this->fk_user == '')
-		{
-			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Employee"));
+		if ($this->fk_user <= 0 || $this->fk_user == '') {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Employee"));
 			return -4;
 		}
-		if ($this->amount < 0 || $this->amount == '')
-		{
-			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
+		if ($this->amount < 0 || $this->amount == '') {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
 			return -5;
 		}
-		if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
-		{
-			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
+		if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
 			return -6;
 		}
-		if (!empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0))
-		{
-			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
+		if (!empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
 			return -7;
 		}
 
@@ -398,7 +387,9 @@ class PaymentSalary extends CommonObject
 		$sql .= ", salary";
 		$sql .= ", fk_typepayment";
 		$sql .= ", num_payment";
-		if ($this->note) $sql .= ", note";
+		if ($this->note) {
+			$sql .= ", note";
+		}
 		$sql .= ", label";
 		$sql .= ", datesp";
 		$sql .= ", dateep";
@@ -416,7 +407,9 @@ class PaymentSalary extends CommonObject
 		$sql .= ", ".($this->salary > 0 ? $this->salary : "null");
 		$sql .= ", ".$this->db->escape($this->type_payment);
 		$sql .= ", '".$this->db->escape($this->num_payment)."'";
-		if ($this->note) $sql .= ", '".$this->db->escape($this->note)."'";
+		if ($this->note) {
+			$sql .= ", '".$this->db->escape($this->note)."'";
+		}
 		$sql .= ", '".$this->db->escape($this->label)."'";
 		$sql .= ", '".$this->db->idate($this->datesp)."'";
 		$sql .= ", '".$this->db->idate($this->dateep)."'";
@@ -428,30 +421,25 @@ class PaymentSalary extends CommonObject
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_salary");
 
-			if ($this->id > 0)
-			{
-				if (!empty($conf->banque->enabled) && !empty($this->amount))
-				{
+			if ($this->id > 0) {
+				if (!empty($conf->banque->enabled) && !empty($this->amount)) {
 					// Insert into llx_bank
 					require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 					$acc = new Account($this->db);
 					$result = $acc->fetch($this->accountid);
-					if ($result <= 0) dol_print_error($this->db);
+					if ($result <= 0) {
+						dol_print_error($this->db);
+					}
 
 					// Update extrafield
 					if (!$error) {
-						if (!$error)
-						{
-							$result = $this->insertExtraFields();
-							if ($result < 0)
-							{
-								$error++;
-							}
+						$result = $this->insertExtraFields();
+						if ($result < 0) {
+							$error++;
 						}
 					}
 
@@ -473,22 +461,19 @@ class PaymentSalary extends CommonObject
 
 					// Update fk_bank into llx_paiement.
 					// So we know the payment which has generate the banking ecriture
-					if ($bank_line_id > 0)
-					{
+					if ($bank_line_id > 0) {
 						$this->update_fk_bank($bank_line_id);
 					} else {
 						$this->error = $acc->error;
 						$error++;
 					}
 
-					if (!$error)
-					{
+					if (!$error) {
 						// Add link 'payment_salary' in bank_url between payment and bank transaction
 						$url = DOL_URL_ROOT.'/salaries/card.php?id=';
 
 						$result = $acc->add_url_line($bank_line_id, $this->id, $url, "(SalaryPayment)", "payment_salary");
-						if ($result <= 0)
-						{
+						if ($result <= 0) {
 							$this->error = $acc->error;
 							$error++;
 						}
@@ -507,8 +492,7 @@ class PaymentSalary extends CommonObject
 						'user'
 					);
 
-					if ($result <= 0)
-					{
+					if ($result <= 0) {
 						$this->error = $acc->error;
 						$error++;
 					}
@@ -516,12 +500,15 @@ class PaymentSalary extends CommonObject
 
 				// Call trigger
 				$result = $this->call_trigger('PAYMENT_SALARY_CREATE', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
-			} else $error++;
+			} else {
+				$error++;
+			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return $this->id;
 			} else {
@@ -548,8 +535,7 @@ class PaymentSalary extends CommonObject
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'payment_salary SET fk_bank = '.$id_bank;
 		$sql .= ' WHERE rowid = '.$this->id;
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			return 1;
 		} else {
 			dol_print_error($this->db);
@@ -574,7 +560,9 @@ class PaymentSalary extends CommonObject
 		global $dolibarr_main_authentication, $dolibarr_main_demo;
 		global $menumanager;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 
@@ -583,10 +571,11 @@ class PaymentSalary extends CommonObject
 		if (!empty($this->label)) {
 			$labeltoshow = $this->label;
 			$reg = array();
-			if (preg_match('/^\((.*)\)$/i', $this->label, $reg))
-			{
+			if (preg_match('/^\((.*)\)$/i', $this->label, $reg)) {
 				// Label generique car entre parentheses. On l'affiche en le traduisant
-				if ($reg[1] == 'paiement') $reg[1] = 'Payment';
+				if ($reg[1] == 'paiement') {
+					$reg[1] = 'Payment';
+				}
 				$labeltoshow = $langs->trans($reg[1]);
 			}
 			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$labeltoshow;
@@ -594,19 +583,20 @@ class PaymentSalary extends CommonObject
 
 		$url = DOL_URL_ROOT.'/salaries/card.php?id='.$this->id;
 
-		if ($option != 'nolink')
-		{
+		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowMyObject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -614,20 +604,26 @@ class PaymentSalary extends CommonObject
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 
 			/*
-             $hookmanager->initHooks(array('myobjectdao'));
-             $parameters=array('id'=>$this->id);
-             $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-             if ($reshook > 0) $linkclose = $hookmanager->resPrint;
-             */
-		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+			 $hookmanager->initHooks(array('myobjectdao'));
+			 $parameters=array('id'=>$this->id);
+			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
+			 */
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
@@ -635,8 +631,11 @@ class PaymentSalary extends CommonObject
 		$hookmanager->initHooks(array('salarypayment'));
 		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -656,14 +655,11 @@ class PaymentSalary extends CommonObject
 		dol_syslog(get_class($this).'::info', LOG_DEBUG);
 		$result = $this->db->query($sql);
 
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)
-				{
+				if ($obj->fk_user_author) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
 					$this->user_creation = $cuser;
@@ -703,40 +699,40 @@ class PaymentSalary extends CommonObject
 
 		$langs->load('compta');
 		/*if ($mode == 0)
-        {
-            if ($status == 0) return $langs->trans('ToValidate');
-            if ($status == 1) return $langs->trans('Validated');
-        }
-        if ($mode == 1)
-        {
-            if ($status == 0) return $langs->trans('ToValidate');
-            if ($status == 1) return $langs->trans('Validated');
-        }
-        if ($mode == 2)
-        {
-            if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1').' '.$langs->trans('ToValidate');
-            if ($status == 1) return img_picto($langs->trans('Validated'),'statut4').' '.$langs->trans('Validated');
-        }
-        if ($mode == 3)
-        {
-            if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1');
-            if ($status == 1) return img_picto($langs->trans('Validated'),'statut4');
-        }
-        if ($mode == 4)
-        {
-            if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1').' '.$langs->trans('ToValidate');
-            if ($status == 1) return img_picto($langs->trans('Validated'),'statut4').' '.$langs->trans('Validated');
-        }
-        if ($mode == 5)
-        {
-            if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1');
-            if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
-        }
-        if ($mode == 6)
-        {
-            if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1');
-            if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
-        }*/
+		{
+			if ($status == 0) return $langs->trans('ToValidate');
+			if ($status == 1) return $langs->trans('Validated');
+		}
+		if ($mode == 1)
+		{
+			if ($status == 0) return $langs->trans('ToValidate');
+			if ($status == 1) return $langs->trans('Validated');
+		}
+		if ($mode == 2)
+		{
+			if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1').' '.$langs->trans('ToValidate');
+			if ($status == 1) return img_picto($langs->trans('Validated'),'statut4').' '.$langs->trans('Validated');
+		}
+		if ($mode == 3)
+		{
+			if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1');
+			if ($status == 1) return img_picto($langs->trans('Validated'),'statut4');
+		}
+		if ($mode == 4)
+		{
+			if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1').' '.$langs->trans('ToValidate');
+			if ($status == 1) return img_picto($langs->trans('Validated'),'statut4').' '.$langs->trans('Validated');
+		}
+		if ($mode == 5)
+		{
+			if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1');
+			if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
+		}
+		if ($mode == 6)
+		{
+			if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1');
+			if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
+		}*/
 		return '';
 	}
 }
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index b8a0ba69ef7..8d253e6799a 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -26,7 +26,9 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+if (!empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "salaries", "bills", "hrm"));
@@ -46,12 +48,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
+if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = "s.datep,s.rowid";
-if (!$sortorder) $sortorder = "DESC,DESC";
+if (!$sortfield) {
+	$sortfield = "s.datep,s.rowid";
+}
+if (!$sortorder) {
+	$sortorder = "DESC,DESC";
+}
 
 // Initialize technical objects
 $object = new PaymentSalary($db);
@@ -64,8 +72,12 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-if (!$sortfield) $sortfield = "s.datep,s.rowid";
-if (!$sortorder) $sortorder = "DESC,DESC";
+if (!$sortfield) {
+	$sortfield = "s.datep,s.rowid";
+}
+if (!$sortorder) {
+	$sortorder = "DESC,DESC";
+}
 
 $search_ref = GETPOST('search_ref', 'int');
 $search_user = GETPOST('search_user', 'alpha');
@@ -77,14 +89,14 @@ $search_account = GETPOST('search_account', 'int');
 
 $filtre = GETPOST("filtre", 'restricthtml');
 
-if (!GETPOST('search_type_id', 'int'))
-{
+if (!GETPOST('search_type_id', 'int')) {
 	$newfiltre = str_replace('filtre=', '', $filtre);
 	$filterarray = explode('-', $newfiltre);
-	foreach ($filterarray as $val)
-	{
+	foreach ($filterarray as $val) {
 		$part = explode(':', $val);
-		if ($part[0] == 's.fk_typepayment') $search_type_id = $part[1];
+		if ($part[0] == 's.fk_typepayment') {
+			$search_type_id = $part[1];
+		}
 	}
 } else {
 	$search_type_id = GETPOST('search_type_id', 'int');
@@ -94,22 +106,27 @@ $childids = $user->getAllChildIds(1);
 
 // Security check
 $socid = GETPOST("socid", "int");
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'salaries', '', '', '');
 
 // Initialize array of search criterias
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
-foreach ($object->fields as $key => $val)
-{
-	if (GETPOST('search_'.$key, 'alpha') !== '') $search[$key] = GETPOST('search_'.$key, 'alpha');
+var_dump($object->fields);
+foreach ($object->fields as $key => $val) {
+	if (GETPOST('search_'.$key, 'alpha') !== '') {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
+	}
 }
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
-foreach ($object->fields as $key => $val)
-{
-	if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
+foreach ($object->fields as $key => $val) {
+	if ($val['searchall']) {
+		$fieldstosearchall['t.'.$key] = $val['label'];
+	}
 }
 
 $permissiontoread = $user->rights->salaries->read;
@@ -121,21 +138,25 @@ $permissiontodelete = $user->rights->salaries->delete;
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	// Selection of new fields
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
 		$search_ref = "";
 		$search_user = "";
 		$search_label = "";
@@ -146,8 +167,7 @@ if (empty($reshook))
 		$search_type_id = "";
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
-		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
-	{
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
 		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
 	}
 
@@ -158,8 +178,7 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
 	// Validate records
-	if (!$error && $massaction == 'buildsepa' && $permissiontoadd)
-	{
+	if (!$error && $massaction == 'buildsepa' && $permissiontoadd) {
 		$objecttmp = new $objectclass($db);
 
 		// TODO
@@ -192,16 +211,32 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.ro
 $sql .= " ".MAIN_DB_PREFIX."user as u";
 $sql .= " WHERE u.rowid = s.fk_user";
 $sql .= " AND s.entity IN (".getEntity('payment_salaries').")";
-if (empty($user->rights->salaries->readall)) $sql .= " AND s.fk_user IN (".join(',', $childids).")";
+if (empty($user->rights->salaries->readall)) {
+	$sql .= " AND s.fk_user IN (".join(',', $childids).")";
+}
 
 // Search criteria
-if ($search_ref)			$sql .= " AND s.rowid=".((int) $search_ref);
-if ($search_user)			$sql .= natural_search(array('u.login', 'u.lastname', 'u.firstname', 'u.email'), $search_user);
-if ($search_label)			$sql .= natural_search(array('s.label'), $search_label);
-if ($search_date_start)     $sql .= " AND s.datep >= '".$db->idate($search_date_start)."'";
-if ($search_date_end)		$sql .= " AND s.datep <= '".$db->idate($search_date_end)."'";
-if ($search_amount)			$sql .= natural_search("s.amount", $search_amount, 1);
-if ($search_account > 0)	$sql .= " AND b.fk_account=".((int) $search_account);
+if ($search_ref) {
+	$sql .= " AND s.rowid=".((int) $search_ref);
+}
+if ($search_user) {
+	$sql .= natural_search(array('u.login', 'u.lastname', 'u.firstname', 'u.email'), $search_user);
+}
+if ($search_label) {
+	$sql .= natural_search(array('s.label'), $search_label);
+}
+if ($search_date_start) {
+	$sql .= " AND s.datep >= '".$db->idate($search_date_start)."'";
+}
+if ($search_date_end) {
+	$sql .= " AND s.datep <= '".$db->idate($search_date_end)."'";
+}
+if ($search_amount) {
+	$sql .= natural_search("s.amount", $search_amount, 1);
+}
+if ($search_account > 0) {
+	$sql .= " AND b.fk_account=".((int) $search_account);
+}
 if ($filtre) {
 	$filtre = str_replace(":", "=", $filtre);
 	$sql .= " AND ".$filtre;
@@ -213,26 +248,24 @@ $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$resql = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($resql);
-	if (($page * $limit) > $nbtotalofrecords)	// if total of record found is smaller than page * limit, goto and load page 0
-	{
+	if (($page * $limit) > $nbtotalofrecords) {	// if total of record found is smaller than page * limit, goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
 }
 // if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
-if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
-{
+if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) {
 	$num = $nbtotalofrecords;
 } else {
-	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
+	if ($limit) {
+		$sql .= $db->plimit($limit + 1, $offset);
+	}
 
 	$resql = $db->query($sql);
-	if (!$resql)
-	{
+	if (!$resql) {
 		dol_print_error($db);
 		exit;
 	}
@@ -248,16 +281,36 @@ llxHeader('', $title, $help_url);
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-if ($search_type_id) $param .= '&search_type_id='.urlencode($search_type_id);
-if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
-if ($search_ref) $param .= '&search_ref='.urlencode($search_ref);
-if ($search_user > 0) $param .= '&search_user='.urlencode($search_user);
-if ($search_label) $param .= '&search_label='.urlencode($search_label);
-if ($search_account) $param .= '&search_account='.urlencode($search_account);
-if ($search_date_start) $param .= '&search_date_startday='.urlencode(GETPOST('search_date_startday', 'int')).'&search_date_startmonth='.urlencode(GETPOST('search_date_startmonth', 'int')).'&search_date_startyear='.urlencode(GETPOST('search_date_startyear', 'int'));
-if ($search_date_end) $param .= '&search_date_endday='.urlencode(GETPOST('search_date_endday', 'int')).'&search_date_endmonth='.urlencode(GETPOST('search_date_endmonth', 'int')).'&search_date_endyear='.urlencode(GETPOST('search_date_endyear', 'int'));
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
+if ($search_type_id) {
+	$param .= '&search_type_id='.urlencode($search_type_id);
+}
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
+if ($search_ref) {
+	$param .= '&search_ref='.urlencode($search_ref);
+}
+if ($search_user > 0) {
+	$param .= '&search_user='.urlencode($search_user);
+}
+if ($search_label) {
+	$param .= '&search_label='.urlencode($search_label);
+}
+if ($search_account) {
+	$param .= '&search_account='.urlencode($search_account);
+}
+if ($search_date_start) {
+	$param .= '&search_date_startday='.urlencode(GETPOST('search_date_startday', 'int')).'&search_date_startmonth='.urlencode(GETPOST('search_date_startmonth', 'int')).'&search_date_startyear='.urlencode(GETPOST('search_date_startyear', 'int'));
+}
+if ($search_date_end) {
+	$param .= '&search_date_endday='.urlencode(GETPOST('search_date_endday', 'int')).'&search_date_endmonth='.urlencode(GETPOST('search_date_endmonth', 'int')).'&search_date_endyear='.urlencode(GETPOST('search_date_endyear', 'int'));
+}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -267,11 +320,15 @@ $arrayofmassactions = array(
 	//'buildsepa'=>$langs->trans("BuildSepa"),	// TODO
 );
 //if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+	$arrayofmassactions = array();
+}
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="action" value="list">';
@@ -280,7 +337,9 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $url = DOL_URL_ROOT.'/salaries/card.php?action=create';
-if (!empty($socid)) $url .= '&socid='.$socid;
+if (!empty($socid)) {
+	$url .= '&socid='.$socid;
+}
 $newcardbutton = dolGetButtonTitle($langs->trans('NewSalaryPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->salaries->write);
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $totalnboflines, 'object_payment', 0, $newcardbutton, '', $limit, 0, 0, 1);
@@ -323,8 +382,7 @@ print '<td class="liste_titre left">';
 $form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16);
 print '</td>';
 // Account
-if (!empty($conf->banque->enabled))
-{
+if (!empty($conf->banque->enabled)) {
 	print '<td class="liste_titre">';
 	$form->select_comptes($search_account, 'search_account', 0, '', 1);
 	print '</td>';
@@ -356,7 +414,9 @@ print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "s.label", "", $param, 'c
 print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "s.datep,s.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
 print_liste_field_titre("DateValue", $_SERVER["PHP_SELF"], "s.datev,s.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
 print_liste_field_titre("PaymentMode", $_SERVER["PHP_SELF"], "type", "", $param, 'class="left"', $sortfield, $sortorder);
-if (!empty($conf->banque->enabled)) print_liste_field_titre("BankAccount", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
+if (!empty($conf->banque->enabled)) {
+	print_liste_field_titre("BankAccount", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
+}
 print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "s.amount", "", $param, 'class="right"', $sortfield, $sortorder);
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -371,11 +431,11 @@ print '</tr>'."\n";
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val)
-	{
-		if (preg_match('/\$object/', $val)) $needToFetchEachLine++; // There is at least one compute field that use $object
+if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val) {
+		if (preg_match('/\$object/', $val)) {
+			$needToFetchEachLine++; // There is at least one compute field that use $object
+		}
 	}
 }
 
@@ -384,10 +444,11 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 $i = 0;
 $total = 0;
 $totalarray = array();
-while ($i < ($limit ? min($num, $limit) : $num))
-{
+while ($i < ($limit ? min($num, $limit) : $num)) {
 	$obj = $db->fetch_object($resql);
-	if (empty($obj)) break; // Should not happen
+	if (empty($obj)) {
+		break; // Should not happen
+	}
 
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
@@ -409,41 +470,50 @@ while ($i < ($limit ? min($num, $limit) : $num))
 
 	// Ref
 	print "<td>".$salstatic->getNomUrl(1)."</td>\n";
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	// Employee
 	print "<td>".$userstatic->getNomUrl(1)."</td>\n";
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	// Label payment
 	print "<td>".dol_trunc($obj->label, 40)."</td>\n";
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	// Date payment
 	print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	// Date value
 	print '<td class="center">'.dol_print_date($db->jdate($obj->datev), 'day')."</td>\n";
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	// Type
 	print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	// Account
-	if (!empty($conf->banque->enabled))
-	{
+	if (!empty($conf->banque->enabled)) {
 		print '<td>';
-		if ($obj->fk_bank > 0)
-		{
+		if ($obj->fk_bank > 0) {
 			//$accountstatic->fetch($obj->fk_bank);
 			$accountstatic->id = $obj->bid;
 			$accountstatic->ref = $obj->bref;
 			$accountstatic->number = $obj->bnumber;
 
-			if (!empty($conf->accounting->enabled))
-			{
+			if (!empty($conf->accounting->enabled)) {
 				$accountstatic->account_number = $obj->account_number;
 
 				$accountingjournal = new AccountingJournal($db);
@@ -453,15 +523,23 @@ while ($i < ($limit ? min($num, $limit) : $num))
 			}
 			$accountstatic->label = $obj->blabel;
 			print $accountstatic->getNomUrl(1);
-		} else print '&nbsp;';
+		} else {
+			print '&nbsp;';
+		}
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Amount
 	print '<td class="nowrap right">'.price($obj->amount).'</td>';
-	if (!$i) $totalarray['nbfield']++;
-	if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+	if (!$i) {
+		$totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
+	}
 	$totalarray['val']['totalttcfield'] += $obj->amount;
 
 	// Extra fields
@@ -472,14 +550,17 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	print $hookmanager->resPrint;
 	// Action column
 	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-	{
+	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 		$selected = 0;
-		if (in_array($object->id, $arrayofselected)) $selected = 1;
+		if (in_array($object->id, $arrayofselected)) {
+			$selected = 1;
+		}
 		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
 	print '</td>';
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	print '</tr>'."\n";
 
@@ -491,10 +572,13 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
 
 // If no record found
-if ($num == 0)
-{
+if ($num == 0) {
 	$colspan = 1;
-	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
+	foreach ($arrayfields as $key => $val) {
+		if (!empty($val['checked'])) {
+			$colspan++;
+		}
+	}
 	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 

From 8d526f8f79003def92face3bbd296d2143d788d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 29 Dec 2020 21:48:53 +0100
Subject: [PATCH 690/888] remove debug

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

diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 8d253e6799a..2b700108d10 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -114,7 +114,6 @@ $result = restrictedArea($user, 'salaries', '', '', '');
 // Initialize array of search criterias
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
-var_dump($object->fields);
 foreach ($object->fields as $key => $val) {
 	if (GETPOST('search_'.$key, 'alpha') !== '') {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
@@ -139,7 +138,8 @@ $permissiontodelete = $user->rights->salaries->delete;
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';

From 0e2b7d8b3c9fc50d01239cdd01929e5e2ed141d9 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 30 Dec 2020 07:23:26 +0100
Subject: [PATCH 691/888] Remove typo

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

diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index ddad89e22fc..0e3c80a6ef8 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -392,7 +392,7 @@ if ($action == 'create')
     // Subledger account
     if (!empty($conf->accounting->enabled))
     {
-        print '<tr><td>'.$langs->trans("SubledgerAccount").'aaaa</td>';
+        print '<tr><td>'.$langs->trans("SubledgerAccount").'</td>';
         print '<td>';
         if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
         {

From a336e4509802386f15c50afa977b5bd521ca475a Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 30 Dec 2020 08:11:20 +0100
Subject: [PATCH 692/888] FIX: #15751 Miscellaneous payment type change to 0
 after updating subledger

---
 htdocs/compta/bank/class/paymentvarious.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index aec104028c0..348c24acd83 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -137,7 +137,7 @@ class PaymentVarious extends CommonObject
 		$sql .= " datev='".$this->db->idate($this->datev)."',";
 		$sql .= " sens=".(int) $this->sens.",";
 		$sql .= " amount=".price2num($this->amount).",";
-		$sql .= " fk_typepayment=".(int) $this->fk_typepayment.",";
+		$sql .= " fk_typepayment=".(int) $this->type_payment.",";
 		$sql .= " num_payment='".$this->db->escape($this->num_payment)."',";
 		$sql .= " label='".$this->db->escape($this->label)."',";
 		$sql .= " note='".$this->db->escape($this->note)."',";

From 7c5248d105cefffc20784cacdd97748c94ed83bb Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 30 Dec 2020 11:27:03 +0100
Subject: [PATCH 693/888] FIX and the world turn again

---
 htdocs/admin/boxes.php                        |  4 +--
 htdocs/admin/defaultvalues.php                |  8 ++---
 htdocs/admin/delais.php                       | 30 ++++++++++-------
 htdocs/admin/limits.php                       |  4 +--
 htdocs/admin/menus/edit.php                   | 13 +++++---
 htdocs/admin/menus/index.php                  |  2 +-
 htdocs/admin/pdf.php                          |  6 ++--
 htdocs/admin/perms.php                        |  4 +--
 htdocs/admin/proxy.php                        | 10 +++---
 htdocs/admin/security.php                     |  4 +--
 htdocs/admin/security_file.php                |  2 +-
 htdocs/admin/translation.php                  | 16 +++++-----
 ...box_supplier_orders_awaiting_reception.php |  2 +-
 htdocs/core/class/html.formfile.class.php     |  4 +--
 htdocs/core/class/infobox.class.php           |  5 +--
 htdocs/core/lib/treeview.lib.php              |  4 +--
 htdocs/core/lib/usergroups.lib.php            | 32 +++++++++----------
 htdocs/core/menus/standard/eldy.lib.php       |  4 +--
 18 files changed, 84 insertions(+), 70 deletions(-)

diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 63c3350fd9d..404ed12c235 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -446,14 +446,14 @@ print '<td>';
 print $langs->trans("MaxNbOfLinesForBoxes");
 print '</td>'."\n";
 print '<td>';
-print '<input type="text" class="flat" size="6" name="MAIN_BOXES_MAXLINES" value="'.$conf->global->MAIN_BOXES_MAXLINES.'">';
+print '<input type="text" class="flat" size="6" name="MAIN_BOXES_MAXLINES" value="'.(!empty($conf->global->MAIN_BOXES_MAXLINES) ? $conf->global->MAIN_BOXES_MAXLINES : '').'">';
 print '</td>';
 print '</tr>';
 
 // Activate FileCache - Developement
 if ($conf->global->MAIN_FEATURES_LEVEL == 2 || !empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
 	print '<tr class="oddeven"><td width="35%">'.$langs->trans("EnableFileCache").'</td><td>';
-	print $form->selectyesno('MAIN_ACTIVATE_FILECACHE', $conf->global->MAIN_ACTIVATE_FILECACHE, 1);
+	print $form->selectyesno('MAIN_ACTIVATE_FILECACHE', (!empty($conf->global->MAIN_ACTIVATE_FILECACHE) ? $conf->global->MAIN_ACTIVATE_FILECACHE : 0), 1);
 	print '</td>';
 	print '</tr>';
 }
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 789762830e3..ae9427d70e0 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -72,9 +72,9 @@ $hookmanager->initHooks(array('admindefaultvalues', 'globaladmin'));
  */
 
 if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && !empty($massaction) && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
 
-$parameters = array('socid'=>$socid);
+$parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
@@ -186,7 +186,7 @@ llxHeader('', $langs->trans("Setup"), $wikihelp);
 
 $param = '&mode='.$mode;
 
-$enabledisablehtml .= $langs->trans("EnableDefaultValues").' ';
+$enabledisablehtml = $langs->trans("EnableDefaultValues").' ';
 if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))
 {
 	// Button off, click to enable
@@ -213,7 +213,7 @@ if ($defaultkey)      $param .= '&defaultkey='.urlencode($defaultkey);
 if ($defaultvalue)    $param .= '&defaultvalue='.urlencode($defaultvalue);
 
 
-print '<form action="'.$_SERVER["PHP_SELF"].((empty($user->entity) && $debug) ? '?debug=1' : '').'" method="POST">';
+print '<form action="'.$_SERVER["PHP_SELF"].((empty($user->entity) && !empty($debug)) ? '?debug=1' : '').'" method="POST">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index d605f75c511..62b0c6ec53d 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -278,6 +278,7 @@ if ($action == 'edit')
 
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("MAIN_DISABLE_METEO").'</td><td class="center">';
+	if (!isset($conf->global->MAIN_DISABLE_METEO)) $conf->global->MAIN_DISABLE_METEO = 0;
 	print $labelmeteo[$conf->global->MAIN_DISABLE_METEO];
 	print '</td></tr>';
 
@@ -287,7 +288,7 @@ if ($action == 'edit')
 print '<br>';
 
 
-if ($conf->global->MAIN_DISABLE_METEO != 1) {
+if (empty($conf->global->MAIN_DISABLE_METEO) || $conf->global->MAIN_DISABLE_METEO != 1) {
 	// Show logo for weather
 	print '<span class="opacitymedium">'.$langs->trans("DescWeather").'</span> ';
 
@@ -314,6 +315,7 @@ if ($conf->global->MAIN_DISABLE_METEO != 1) {
 	$level1 = $offset + 1 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL1)) $level1 = $conf->global->MAIN_METEO_LEVEL1;
 	$level2 = $offset + 2 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL2)) $level2 = $conf->global->MAIN_METEO_LEVEL2;
 	$level3 = $offset + 3 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL3)) $level3 = $conf->global->MAIN_METEO_LEVEL3;
+	$level4 = $offset + 4 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL4)) $level4 = $conf->global->MAIN_METEO_LEVEL4;
 	$text = ''; $options = 'class="valignmiddle" height="60px"';
 
 
@@ -333,6 +335,9 @@ if ($conf->global->MAIN_DISABLE_METEO != 1) {
 		print '</div><div class="inline-block" style="padding-right: 20px">';
 		print img_weather($text, 3, $options);
 		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL3" value="'.$level3.'"/></td>';
+		print '</div><div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text, 4, $options);
+		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL4" value="'.$level4.'"/></td>';
 		print '</div>';
 		print '</div>';
 
@@ -343,16 +348,19 @@ if ($conf->global->MAIN_DISABLE_METEO != 1) {
 		print '<div>';
 		print '<div class="inline-block" style="padding-right: 20px">';
 		print img_weather($text, 0, $options);
-		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL0" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL0.'"/>&nbsp;%</td>';
+		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL0" value="'.(isset($conf->global->MAIN_METEO_PERCENTAGE_LEVEL0) ? $conf->global->MAIN_METEO_PERCENTAGE_LEVEL0 : '0').'"/>&nbsp;%</td>';
 		print '</div><div class="inline-block" style="padding-right: 20px">';
 		print img_weather($text, 1, $options);
-		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL1" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL1.'"/>&nbsp;%</td>';
+		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL1" value="'.(isset($conf->global->MAIN_METEO_PERCENTAGE_LEVEL1) ? $conf->global->MAIN_METEO_PERCENTAGE_LEVEL1 : '10').'"/>&nbsp;%</td>';
 		print '</div><div class="inline-block" style="padding-right: 20px">';
 		print img_weather($text, 2, $options);
-		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL2" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL2.'"/>&nbsp;%</td>';
+		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL2" value="'.(isset($conf->global->MAIN_METEO_PERCENTAGE_LEVEL2) ? $conf->global->MAIN_METEO_PERCENTAGE_LEVEL2 : '20').'"/>&nbsp;%</td>';
 		print '</div><div class="inline-block" style="padding-right: 20px">';
 		print img_weather($text, 3, $options);
-		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL3" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'"/>&nbsp;%</td>';
+		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL3" value="'.(isset($conf->global->MAIN_METEO_PERCENTAGE_LEVEL3) ? $conf->global->MAIN_METEO_PERCENTAGE_LEVEL3 : '30').'"/>&nbsp;%</td>';
+		print '</div><div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text, 4, $options);
+		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL4" value="'.(isset($conf->global->MAIN_METEO_PERCENTAGE_LEVEL4) ? $conf->global->MAIN_METEO_PERCENTAGE_LEVEL4 : '40').'"/>&nbsp;%</td>';
 		print '</div>';
 		print '</div>';
 
@@ -392,19 +400,19 @@ if ($conf->global->MAIN_DISABLE_METEO != 1) {
 			print '<div>';
 			print '<div class="inline-block" style="padding-right: 20px">';
 			print img_weather($text, 0, $options);
-			print ' &lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL0.'&nbsp;%</td>';
+			print ' &lt;= '.(isset($conf->global->MAIN_METEO_PERCENTAGE_LEVEL0) ? $conf->global->MAIN_METEO_PERCENTAGE_LEVEL0 : '0').'&nbsp;%</td>';
 			print '</div><div class="inline-block" style="padding-right: 20px">';
 			print img_weather($text, 1, $options);
-			print ' &lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL1.'&nbsp;%</td>';
+			print ' &lt;= '.(isset($conf->global->MAIN_METEO_PERCENTAGE_LEVEL1) ? $conf->global->MAIN_METEO_PERCENTAGE_LEVEL1 : '10').'&nbsp;%</td>';
 			print '</div><div class="inline-block" style="padding-right: 20px">';
 			print img_weather($text, 2, $options);
-			print ' &lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL2.'&nbsp;%</td>';
+			print ' &lt;= '.(isset($conf->global->MAIN_METEO_PERCENTAGE_LEVEL2) ? $conf->global->MAIN_METEO_PERCENTAGE_LEVEL2 : '20').'&nbsp;%</td>';
 			print '</div><div class="inline-block" style="padding-right: 20px">';
 			print img_weather($text, 3, $options);
-			print ' &lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'&nbsp;%</td>';
+			print ' &lt;= '.(isset($conf->global->MAIN_METEO_PERCENTAGE_LEVEL3) ? $conf->global->MAIN_METEO_PERCENTAGE_LEVEL3 : '30').'&nbsp;%</td>';
 			print '</div><div class="inline-block" style="padding-right: 20px">';
 			print img_weather($text, 4, $options);
-			print ' &gt; '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'&nbsp;%</td>';
+			print ' &gt; '.(isset($conf->global->MAIN_METEO_PERCENTAGE_LEVEL4) ? $conf->global->MAIN_METEO_PERCENTAGE_LEVEL4 : '40').'&nbsp;%</td>';
 			print '</div>';
 			print '</div>';
 		} else {
@@ -423,7 +431,7 @@ if ($conf->global->MAIN_DISABLE_METEO != 1) {
 			print ' &lt;= '.$level3;
 			print '</div><div class="inline-block" style="padding-right: 20px">';
 			print img_weather($text, 4, $options);
-			print ' &gt; '.$level3;
+			print ' &gt; '.$level4;
 			print '</div>';
 			print '</div>';
 		}
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index 34da6f7d34e..6726e53eef1 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -163,7 +163,7 @@ if ($action == 'edit')
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"), $langs->trans("ParameterActiveForNextInputOnly"));
-	print '</td><td><input class="flat" name="'.$mainroundingruletot.'" size="3" value="'.(isset($conf->global->$mainroundingruletot) ? $conf->global->$mainroundingruletot : $conf->global->MAIN_ROUNDING_RULE_TOT).'"></td></tr>';
+	print '</td><td><input class="flat" name="'.$mainroundingruletot.'" size="3" value="'.(isset($conf->global->$mainroundingruletot) ? $conf->global->$mainroundingruletot : (!empty($conf->global->MAIN_ROUNDING_RULE_TOT) ? $conf->global->MAIN_ROUNDING_RULE_TOT : '')).'"></td></tr>';
 
 	print '</table>';
 
@@ -193,7 +193,7 @@ if ($action == 'edit')
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"), $langs->trans("ParameterActiveForNextInputOnly"));
-	print '</td><td align="right">'.(isset($conf->global->$mainroundingruletot) ? $conf->global->$mainroundingruletot : $conf->global->MAIN_ROUNDING_RULE_TOT).'</td></tr>';
+	print '</td><td align="right">'.(isset($conf->global->$mainroundingruletot) ? $conf->global->$mainroundingruletot : (!empty($conf->global->MAIN_ROUNDING_RULE_TOT) ? $conf->global->MAIN_ROUNDING_RULE_TOT : '')).'</td></tr>';
 
 	print '</table>';
 	print '</div>';
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index f182fb39cbd..8945daa23f8 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -290,6 +290,11 @@ if ($action == 'create') {
 
 	// Id
 	$parent_rowid = GETPOST('menuId', 'int');
+	$parent_mainmenu = '';
+	$parent_leftmenu = '';
+	$parent_langs = '';
+	$parent_level = '';
+
 	if (GETPOST('menuId', 'int')) {
 		$sql = "SELECT m.rowid, m.mainmenu, m.leftmenu, m.level, m.langs FROM ".MAIN_DB_PREFIX."menu as m WHERE m.rowid = ".GETPOST('menuId', 'int');
 		$res = $db->query($sql);
@@ -328,8 +333,8 @@ if ($action == 'create') {
 	} else {
 		print '<select name="type" class="flat" id="topleft">';
 		print '<option value="">&nbsp;</option>';
-		print '<option value="top"'.($_POST["type"] && $_POST["type"] == 'top' ? ' selected' : '').'>'.$langs->trans('Top').'</option>';
-		print '<option value="left"'.($_POST["type"] && $_POST["type"] == 'left' ? ' selected' : '').'>'.$langs->trans('Left').'</option>';
+		print '<option value="top"'.(!empty($_POST["type"]) && $_POST["type"] == 'top' ? ' selected' : '').'>'.$langs->trans('Top').'</option>';
+		print '<option value="left"'.(!empty($_POST["type"]) && $_POST["type"] == 'left' ? ' selected' : '').'>'.$langs->trans('Left').'</option>';
 		print '</select>';
 	}
 	print '</td><td>'.$langs->trans('DetailType').'</td></tr>';
@@ -370,8 +375,8 @@ if ($action == 'create') {
 
 	// Target
 	print '<tr><td>'.$langs->trans('Target').'</td><td><select class="flat" name="target">';
-	print '<option value=""'.($menu->target == "" ? ' selected' : '').'>&nbsp;</option>';
-	print '<option value="_blank"'.($menu->target == "_blank" ? ' selected' : '').'>'.$langs->trans('_blank').'</option>';
+	print '<option value=""'.(isset($menu->target) && $menu->target == "" ? ' selected' : '').'>&nbsp;</option>';
+	print '<option value="_blank"'.(isset($menu->target) && $menu->target == "_blank" ? ' selected' : '').'>'.$langs->trans('_blank').'</option>';
 	print '</select></td></td><td>'.$langs->trans('DetailTarget').'</td></tr>';
 
 	// Enabled
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index a1ebb21838b..045332bb2d9 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -367,7 +367,7 @@ if ($conf->use_javascript_ajax)
 	$remainingdata = array();
 	foreach ($data as $datar)
 	{
-		if (empty($datar['rowid']) || $tree_recur_alreadyadded[$datar['rowid']]) continue;
+		if (empty($datar['rowid']) || !empty($tree_recur_alreadyadded[$datar['rowid']])) continue;
 		$remainingdata[] = $datar;
 	}
 
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 16a1c42ddaa..008e5277bc3 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -161,7 +161,7 @@ print '<div class="div-table-responsive-no-min">';
 print '<table summary="more" class="noborder centpercent">';
 print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
 
-$selected = $conf->global->MAIN_PDF_FORMAT;
+$selected = (isset($conf->global->MAIN_PDF_FORMAT) ? $conf->global->MAIN_PDF_FORMAT : '');
 if (empty($selected)) $selected = dol_getDefaultFormat();
 
 // Show pdf format
@@ -320,13 +320,13 @@ print '</td></tr>';
 
 
 print '<tr class="oddeven"><td>'.$langs->trans("ShowDetailsInPDFPageFoot").'</td><td>';
-print $form->selectarray('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS', $arraydetailsforpdffoot, $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS);
+print $form->selectarray('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS', $arraydetailsforpdffoot, (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS : 0));
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>'.$langs->trans("PDF_USE_ALSO_LANGUAGE_CODE").'</td><td>';
 //if (! empty($conf->global->MAIN_MULTILANGS))
 //{
-print $formadmin->select_language(GETPOSTISSET('PDF_USE_ALSO_LANGUAGE_CODE') ? GETPOST('PDF_USE_ALSO_LANGUAGE_CODE') : $conf->global->PDF_USE_ALSO_LANGUAGE_CODE, 'PDF_USE_ALSO_LANGUAGE_CODE', 0, null, 1);
+print $formadmin->select_language(GETPOSTISSET('PDF_USE_ALSO_LANGUAGE_CODE') ? GETPOST('PDF_USE_ALSO_LANGUAGE_CODE') : (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) ? $conf->global->PDF_USE_ALSO_LANGUAGE_CODE : 0), 'PDF_USE_ALSO_LANGUAGE_CODE', 0, null, 1);
 //} else {
 //	print '<span class="opacitymedium">'.$langs->trans("MultiLangNotEnabled").'</span>';
 //}
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 4905f4f2497..3d37b2a7c8a 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -166,7 +166,7 @@ if ($result)
 			if (is_object($modules[$obj->module]) && ($modules[$obj->module]->module_position > 0))
 			{
 				// TODO Define familyposition
-				$family = $modules[$obj->module]->family_position;
+			    $family = (!empty($modules[$obj->module]->family_position) ? $modules[$obj->module]->family_position : '');
 				$familyposition = 0;
 				$sqlupdate = 'UPDATE '.MAIN_DB_PREFIX."rights_def SET module_position = ".$modules[$obj->module]->module_position.",";
 				$sqlupdate .= " family_position = ".$familyposition;
@@ -214,7 +214,7 @@ if ($result)
 			print '</tr>'."\n";
 		}
 
-		$perm_libelle = ($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id) != ("PermissionAdvanced".$obj->id)) ? $langs->trans("PermissionAdvanced".$obj->id) : (($langs->trans("Permission".$obj->id) != ("Permission".$obj->id)) ? $langs->trans("Permission".$obj->id) : $obj->label));
+		$perm_libelle = (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ($langs->trans("PermissionAdvanced".$obj->id) != ("PermissionAdvanced".$obj->id)) ? $langs->trans("PermissionAdvanced".$obj->id) : (($langs->trans("Permission".$obj->id) != ("Permission".$obj->id)) ? $langs->trans("Permission".$obj->id) : $obj->label));
 
 		print '<tr class="oddeven">';
 
diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php
index 0349f8a3435..9290a0459d0 100644
--- a/htdocs/admin/proxy.php
+++ b/htdocs/admin/proxy.php
@@ -155,7 +155,7 @@ print '<tr class="oddeven">';
 print '<td>'.$langs->trans("MAIN_PROXY_USE").'</td><td class="right">';
 print '</td>';
 print '<td class="nowrap">';
-print $form->selectyesno('MAIN_PROXY_USE', $conf->global->MAIN_PROXY_USE, 1);
+print $form->selectyesno('MAIN_PROXY_USE', (!empty($conf->global->MAIN_PROXY_USE) ? $conf->global->MAIN_PROXY_USE : 0), 1);
 print '</td>';
 print '</tr>';
 
@@ -164,7 +164,7 @@ print '<tr class="oddeven">';
 print '<td>'.$langs->trans("MAIN_PROXY_HOST").'</td><td class="right">';
 print '</td>';
 print '<td class="nowrap">';
-print '<input class="flat" name="MAIN_PROXY_HOST" type="text" size="16" value="'.$conf->global->MAIN_PROXY_HOST.'">';
+print '<input class="flat" name="MAIN_PROXY_HOST" type="text" size="16" value="'.(!empty($conf->global->MAIN_PROXY_HOST) ? $conf->global->MAIN_PROXY_HOST : '').'">';
 print '</td>';
 print '</tr>';
 
@@ -173,7 +173,7 @@ print '<tr class="oddeven">';
 print '<td>'.$langs->trans("MAIN_PROXY_PORT").'</td><td class="right">';
 print '</td>';
 print '<td class="nowrap">';
-print '<input class="flat" name="MAIN_PROXY_PORT" type="text" size="4" value="'.$conf->global->MAIN_PROXY_PORT.'">';
+print '<input class="flat" name="MAIN_PROXY_PORT" type="text" size="4" value="'.(!empty($conf->global->MAIN_PROXY_PORT) ? $conf->global->MAIN_PROXY_PORT : '').'">';
 print '</td>';
 print '</tr>';
 
@@ -182,7 +182,7 @@ print '<tr class="oddeven">';
 print '<td>'.$langs->trans("MAIN_PROXY_USER").'</td><td class="right">';
 print '</td>';
 print '<td class="nowrap">';
-print '<input class="flat" name="MAIN_PROXY_USER" type="text" size="16" value="'.$conf->global->MAIN_PROXY_USER.'">';
+print '<input class="flat" name="MAIN_PROXY_USER" type="text" size="16" value="'.(!empty($conf->global->MAIN_PROXY_USER) ? $conf->global->MAIN_PROXY_USER : '').'">';
 print '</td>';
 print '</tr>';
 
@@ -191,7 +191,7 @@ print '<tr class="oddeven">';
 print '<td>'.$langs->trans("MAIN_PROXY_PASS").'</td><td class="right">';
 print '</td>';
 print '<td class="nowrap">';
-print '<input class="flat" name="MAIN_PROXY_PASS" type="text" size="16" value="'.$conf->global->MAIN_PROXY_PASS.'">';
+print '<input class="flat" name="MAIN_PROXY_PASS" type="text" size="16" value="'.(!empty($conf->global->MAIN_PROXY_PASS) ? $conf->global->MAIN_PROXY_PASS : '').'">';
 print '</td>';
 print '</tr>';
 
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 30085d3f1f1..86db4fab6e2 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -241,8 +241,8 @@ print '</tr>';
 foreach ($arrayhandler as $key => $module)
 {
 	// Show modules according to features level
-	if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-	if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+    if (!empty($module->version) && $module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+    if (!empty($module->version) && $module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
 	if ($module->isEnabled())
 	{
diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php
index ea5ea2983fd..d51ff3ae558 100644
--- a/htdocs/admin/security_file.php
+++ b/htdocs/admin/security_file.php
@@ -116,7 +116,7 @@ print '</tr>';
 print '<tr class="oddeven">';
 print '<td colspan="2">'.$langs->trans("MaxSizeForUploadedFiles").'.';
 $max = @ini_get('upload_max_filesize');
-if ($max) print ' '.$langs->trans("MustBeLowerThanPHPLimit", $max * 1024, $langs->trans("Kb")).'.';
+if (isset($max)) print ' '.$langs->trans("MustBeLowerThanPHPLimit", ((int) $max) * 1024, $langs->trans("Kb")).'.';
 else print ' '.$langs->trans("NoMaxSizeByPHPLimit").'.';
 print '</td>';
 print '<td class="nowrap">';
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index c31f1c07093..dfaa8e576de 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -40,9 +40,9 @@ $transkey = GETPOST('transkey', 'alphanohtml');
 $transvalue = GETPOST('transvalue', 'restricthtml');
 
 
-$mode = GETPOST('mode', 'aZ09') ?GETPOST('mode', 'aZ09') : 'searchkey';
+$mode = GETPOST('mode', 'aZ09') ? GETPOST('mode', 'aZ09') : 'searchkey';
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -62,9 +62,9 @@ $hookmanager->initHooks(array('admintranslation', 'globaladmin'));
  */
 
 if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && !empty($massaction) && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
 
-$parameters = array('socid'=>$socid);
+$parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
@@ -217,14 +217,14 @@ print '<br>';
 
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
 if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
+if (isset($optioncss) && $optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
 if ($langcode)        $param .= '&langcode='.urlencode($langcode);
 if ($transkey)        $param .= '&transkey='.urlencode($transkey);
 if ($transvalue)      $param .= '&transvalue='.urlencode($transvalue);
 
 
-print '<form action="'.$_SERVER["PHP_SELF"].((empty($user->entity) && $debug) ? '?debug=1' : '').'" method="POST">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<form action="'.$_SERVER["PHP_SELF"].((empty($user->entity) && !empty($debug)) ? '?debug=1' : '').'" method="POST">';
+if (isset($optioncss) && $optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
@@ -472,7 +472,7 @@ if ($mode == 'searchkey')
 	print '</td>';
 	// Action column
 	print '<td class="nowrap right">';
-	$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
+	$searchpicto = $form->showFilterAndCheckAddButtons(!empty($massactionbutton) ? 1 : 0, 'checkforselect', 1);
 	print $searchpicto;
 	print '</td>';
 	print '</tr>';
diff --git a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
index 80fdbc2f4a2..22f669966f3 100644
--- a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
+++ b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
@@ -99,7 +99,7 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
 			$sql .= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.")";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC";
+			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC";
 			else $sql .= " ORDER BY c.date_livraison ASC, c.fk_statut ASC";
 			$sql .= $this->db->plimit($max, 0);
 
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 0710416f1fe..f523e2a40a2 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1073,8 +1073,8 @@ class FormFile
 		if (empty($relativepath))
 		{
 			$relativepath = (!empty($object->ref) ?dol_sanitizeFileName($object->ref) : '').'/';
-			if ($object->element == 'invoice_supplier') $relativepath = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$relativepath; // TODO Call using a defined value for $relativepath
-			if ($object->element == 'project_task') $relativepath = 'Call_not_supported_._Call_function_using_a_defined_relative_path_.';
+			if (!empty($object->element) && $object->element == 'invoice_supplier') $relativepath = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$relativepath; // TODO Call using a defined value for $relativepath
+			if (!empty($object->element) && $object->element == 'project_task') $relativepath = 'Call_not_supported_._Call_function_using_a_defined_relative_path_.';
 		}
 		// For backward compatiblity, we detect file stored into an old path
 		if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO) && $filearray[0]['level1name'] == 'photos')
diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index a4cb7a603dd..91691cbec54 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -106,7 +106,8 @@ class InfoBox
 			if (is_object($user)) $sql .= " AND b.fk_user IN (0,".$user->id.")";
 			else $sql .= " AND b.fk_user = 0";
 			$sql .= " ORDER BY b.box_order";
-		} else // available
+		}
+		else // available
 		{
 			$sql = "SELECT d.rowid as box_id, d.file, d.note, d.tms";
 			$sql .= " FROM ".MAIN_DB_PREFIX."boxes_def as d";
@@ -150,7 +151,7 @@ class InfoBox
 						// box properties
 						$box->rowid = (empty($obj->rowid) ? '' : $obj->rowid);
 						$box->id = (empty($obj->box_id) ? '' : $obj->box_id);
-						$box->position = ($obj->position == '' ? '' : $obj->position); // '0' must stay '0'
+						$box->position = ((isset($obj->position) && $obj->position == '') ? '' : (isset($obj->position) ? $obj->position : '')); // '0' must stay '0'
 						$box->box_order	= (empty($obj->box_order) ? '' : $obj->box_order);
 						$box->fk_user = (empty($obj->fk_user) ? 0 : $obj->fk_user);
 						$box->sourcefile = $relsourcefile;
diff --git a/htdocs/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php
index e4de8b0c833..9df0f8d9ddf 100644
--- a/htdocs/core/lib/treeview.lib.php
+++ b/htdocs/core/lib/treeview.lib.php
@@ -163,7 +163,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 
 				print '<ul'.(empty($pere['rowid']) ? ' id="treeData"' : '').'>'; $ulprinted++;
 			}
-			print "\n".'<li '.($tab[$x]['statut'] ? ' class="liuseractive"' : 'class="liuserdisabled"').'>';
+			print "\n".'<li '.(!empty($tab[$x]['statut']) ? ' class="liuseractive"' : 'class="liuserdisabled"').'>';
 			if ($showfk)
 			{
 				print '<table class="nobordernopadding centpercent"><tr><td>';
@@ -194,7 +194,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 
 				print '<ul'.(empty($pere['rowid']) ? ' id="treeData"' : '').'>'; $ulprinted++;
 			}
-			print "\n".'<li '.($tab[$x]['statut'] ? ' class="liuseractive"' : 'class="liuserdisabled"').'>';
+			print "\n".'<li '.(!empty($tab[$x]['statut']) ? ' class="liuseractive"' : 'class="liuserdisabled"').'>';
 			if ($showfk)
 			{
 				print '<table class="nobordernopadding centpercent"><tr><td>';
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 913112e04e6..0cf23e0593f 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -498,7 +498,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td colspan="'.($colspan - 1).'">';
 		//var_dump($conf->global->THEME_ELDY_BACKBODY);
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), ''), 'THEME_ELDY_BACKBODY', '', 1, '', '', 'colorbackbody').' ';
+		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_BACKBODY) ? $conf->global->THEME_ELDY_BACKBODY : ''), array()), ''), 'THEME_ELDY_BACKBODY', '', 1, '', '', 'colorbackbody').' ';
 		} else {
 	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -539,7 +539,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), ''), 'THEME_ELDY_TOPMENU_BACK1', '', 1, '', '', 'colorbackhmenu1').' ';
+		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TOPMENU_BACK1) ? $conf->global->THEME_ELDY_TOPMENU_BACK1 : ''), array()), ''), 'THEME_ELDY_TOPMENU_BACK1', '', 1, '', '', 'colorbackhmenu1').' ';
 		} else {
 	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -580,7 +580,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("LeftMenuBackgroundColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), ''), 'THEME_ELDY_VERMENU_BACK1', '', 1, '', '', 'colorbackvmenu1').' ';
+		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_VERMENU_BACK1) ? $conf->global->THEME_ELDY_VERMENU_BACK1 : ''), array()), ''), 'THEME_ELDY_VERMENU_BACK1', '', 1, '', '', 'colorbackvmenu1').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -601,7 +601,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("TextTitleColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLENOTAB, array()), ''), 'THEME_ELDY_TEXTTITLENOTAB', '', 1, '', '', 'colortexttitlenotab').' ';
+		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TEXTTITLENOTAB) ? $conf->global->THEME_ELDY_TEXTTITLENOTAB : ''), array()), ''), 'THEME_ELDY_TEXTTITLENOTAB', '', 1, '', '', 'colortexttitlenotab').' ';
 		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLENOTAB, $langs->trans("Default"));
 		}
@@ -621,7 +621,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("BackgroundTableTitleColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKTITLE1, array()), ''), 'THEME_ELDY_BACKTITLE1', '', 1, '', '', 'colorbacktitle1').' ';
+		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_BACKTITLE1) ? $conf->global->THEME_ELDY_BACKTITLE1 : ''), array()), ''), 'THEME_ELDY_BACKTITLE1', '', 1, '', '', 'colorbacktitle1').' ';
 		} else {
 	   		print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
 	   	}
@@ -641,7 +641,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("BackgroundTableTitleTextColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLE, array()), ''), 'THEME_ELDY_TEXTTITLE', '', 1, '', '', 'colortexttitle').' ';
+		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TEXTTITLE) ? $conf->global->THEME_ELDY_TEXTTITLE : ''), array()), ''), 'THEME_ELDY_TEXTTITLE', '', 1, '', '', 'colortexttitle').' ';
 		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLE, $langs->trans("Default"));
 		}
@@ -661,7 +661,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("BackgroundTableTitleTextlinkColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLELINK, array()), ''), 'THEME_ELDY_TEXTTITLELINK', '', 1, '', '', 'colortexttitlelink').' ';
+		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TEXTTITLELINK) ? $conf->global->THEME_ELDY_TEXTTITLELINK : ''), array()), ''), 'THEME_ELDY_TEXTTITLELINK', '', 1, '', '', 'colortexttitlelink').' ';
 		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLELINK, $langs->trans("Default"));
 		}
@@ -682,7 +682,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("BackgroundTableLineOddColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), ''), 'THEME_ELDY_LINEIMPAIR1', '', 1, '', '', 'colorbacklinepair2').' ';
+		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_LINEIMPAIR1) ? $conf->global->THEME_ELDY_LINEIMPAIR1 : ''), array()), ''), 'THEME_ELDY_LINEIMPAIR1', '', 1, '', '', 'colorbacklinepair2').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -703,7 +703,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("BackgroundTableLineEvenColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), ''), 'THEME_ELDY_LINEPAIR1', '', 1, '', '', 'colorbacklineimpair2').' ';
+		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_LINEPAIR1) ? $conf->global->THEME_ELDY_LINEPAIR1 : ''), array()), ''), 'THEME_ELDY_LINEPAIR1', '', 1, '', '', 'colorbacklineimpair2').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -744,7 +744,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("LinkColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), ''), 'THEME_ELDY_TEXTLINK', '', 1, '', '', 'colortextlink').' ';
+		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TEXTLINK) ? $conf->global->THEME_ELDY_TEXTLINK : ''), array()), ''), 'THEME_ELDY_TEXTLINK', '', 1, '', '', 'colortextlink').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -781,12 +781,12 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		//print '<input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
 		//print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 		if ($edit) {
-			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));
-			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');
+		    if (!empty($conf->global->THEME_ELDY_USE_HOVER) && $conf->global->THEME_ELDY_USE_HOVER == '1') $color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));
+			else $color = colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_USE_HOVER) ? $conf->global->THEME_ELDY_USE_HOVER : ''), array()), '');
 			print $formother->selectColor($color, 'THEME_ELDY_USE_HOVER', '', 1, '', '', 'colorbacklinepairhover').' ';
 		} else {
 			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));
-			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');
+			else $color = colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_USE_HOVER) ? $conf->global->THEME_ELDY_USE_HOVER : ''), array()), '');
 			if ($color) {
 				if ($color != colorArrayToHex(colorStringToArray($colorbacklinepairhover))) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 				else print $langs->trans("Default");
@@ -818,12 +818,12 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		//print '<input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
 		//print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 		if ($edit) {
-			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color = 'e6edf0';
-			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED, array()), '');
+		    if (!empty($conf->global->THEME_ELDY_USE_CHECKED) && $conf->global->THEME_ELDY_USE_CHECKED == '1') $color = 'e6edf0';
+			else $color = colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_USE_CHECKED) ? $conf->global->THEME_ELDY_USE_CHECKED : ''), array()), '');
 			print $formother->selectColor($color, 'THEME_ELDY_USE_CHECKED', '', 1, '', '', 'colorbacklinepairchecked').' ';
 		} else {
 			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color = 'e6edf0';
-			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED, array()), '');
+			else $color = colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_USE_CHECKED) ? $conf->global->THEME_ELDY_USE_CHECKED : ''), array()), '');
 			if ($color) {
 				if ($color != 'e6edf0') print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 				else print $langs->trans("Default");
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 810f2087430..06320794a64 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -803,8 +803,8 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 						$newmenu->add("/categories/index.php?leftmenu=users&type=7", $langs->trans("UsersCategoriesShort"), 2, $user->rights->categorie->lire, '', $mainmenu, 'cat');
 					}
 					$newmenu->add("", $langs->trans("Groups"), 1, ($user->rights->user->user->lire || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));
-					$newmenu->add("/user/group/card.php?leftmenu=users&action=create", $langs->trans("NewGroup"), 2, (($conf->global->MAIN_USE_ADVANCED_PERMS ? $user->rights->user->group_advance->write : $user->rights->user->user->creer) || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));
-					$newmenu->add("/user/group/list.php?leftmenu=users", $langs->trans("ListOfGroups"), 2, (($conf->global->MAIN_USE_ADVANCED_PERMS ? $user->rights->user->group_advance->read : $user->rights->user->user->lire) || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));
+					$newmenu->add("/user/group/card.php?leftmenu=users&action=create", $langs->trans("NewGroup"), 2, ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) ? $user->rights->user->group_advance->write : $user->rights->user->user->creer) || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));
+					$newmenu->add("/user/group/list.php?leftmenu=users", $langs->trans("ListOfGroups"), 2, ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) ? $user->rights->user->group_advance->read : $user->rights->user->user->lire) || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));
 				}
 			}
 		}

From 7832fa213f4da99a5c6bdae77809fd17a1009168 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 30 Dec 2020 11:34:59 +0100
Subject: [PATCH 694/888] FIX Stickler line exceeds 500 characters; contains
 527 characters

---
 htdocs/core/class/html.formactions.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index fe70c482d21..cbd17b30568 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -202,7 +202,8 @@ class FormActions
 			$newcardbutton = '';
 			if (!empty($conf->agenda->enabled) && !empty($user->rights->agenda->myactions->create))
 			{
-			    $newcardbutton .= dolGetButtonTitle($langs->trans("AddEvent"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;datep='.urlencode(dol_print_date(dol_now(), 'dayhourlog')).'&amp;origin='.urlencode($typeelement).'&amp;originid='.$object->id.((!empty($object->socid) && $object->socid > 0) ? '&amp;socid='.$object->socid : ((!empty($socid) && $socid > 0) ? '&amp;socid='.$socid : '')).($projectid > 0 ? '&amp;projectid='.$projectid : '').'&amp;backtopage='.urlencode($urlbacktopage));
+			    $url = DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;datep='.urlencode(dol_print_date(dol_now(), 'dayhourlog')).'&amp;origin='.urlencode($typeelement).'&amp;originid='.$object->id.((!empty($object->socid) && $object->socid > 0) ? '&amp;socid='.$object->socid : ((!empty($socid) && $socid > 0) ? '&amp;socid='.$socid : '')).($projectid > 0 ? '&amp;projectid='.$projectid : '').'&amp;backtopage='.urlencode($urlbacktopage);
+			    $newcardbutton .= dolGetButtonTitle($langs->trans("AddEvent"), '', 'fa fa-plus-circle', $url);
 			}
 
 

From 87a452c6f401eb63e8161fb4740948a9d8f990a4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 12:16:01 +0100
Subject: [PATCH 695/888] Fix warning

---
 htdocs/user/class/user.class.php      | 2 +-
 htdocs/webservices/server_contact.php | 6 +++---
 htdocs/webservices/server_order.php   | 4 ++--
 htdocs/webservices/server_other.php   | 6 +++---
 htdocs/webservices/server_user.php    | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 98e70cf66b7..7f9c87ab7a7 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1806,7 +1806,7 @@ class User extends CommonObject
 
 						$adh->pass = $this->pass;
 
-						$adh->societe = (empty($adh->societe) && $this->societe_id ? $this->societe_id : $adh->societe);
+						//$adh->societe = (empty($adh->societe) && $this->societe_id ? $this->societe_id : $adh->societe);
 
 						$adh->address = $this->address;
 						$adh->town = $this->town;
diff --git a/htdocs/webservices/server_contact.php b/htdocs/webservices/server_contact.php
index 6fc521a43c7..97b219c7aba 100644
--- a/htdocs/webservices/server_contact.php
+++ b/htdocs/webservices/server_contact.php
@@ -270,10 +270,10 @@ function getContact($authentication, $id, $ref_ext)
 		if ($result > 0)
 		{
 			// Only internal user who have contact read permission
-			// Or for external user who have contact read permission, with restrict on societe_id
+			// Or for external user who have contact read permission, with restrict on socid
 			if (
-				$fuser->rights->societe->contact->lire && !$fuser->societe_id
-				|| ($fuser->rights->societe->contact->lire && ($fuser->societe_id == $contact->socid))
+				$fuser->rights->societe->contact->lire && !$fuser->socid
+				|| ($fuser->rights->societe->contact->lire && ($fuser->socid == $contact->socid))
 			) {
 				$contact_result_fields = array(
 					'id' => $contact->id,
diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php
index 361b2a08f4a..5cc964dde4e 100644
--- a/htdocs/webservices/server_order.php
+++ b/htdocs/webservices/server_order.php
@@ -367,7 +367,7 @@ function getOrder($authentication, $id = '', $ref = '', $ref_ext = '')
 
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
-	if ($fuser->societe_id) $socid = $fuser->societe_id;
+	if ($fuser->socid) $socid = $fuser->socid;
 
 	// Check parameters
 	if (!$error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
@@ -516,7 +516,7 @@ function getOrdersForThirdParty($authentication, $idthirdparty)
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
-	if ($fuser->societe_id) $socid = $fuser->societe_id;
+	if ($fuser->socid) $socid = $fuser->socid;
 
 	// Check parameters
 	if (!$error && empty($idthirdparty))
diff --git a/htdocs/webservices/server_other.php b/htdocs/webservices/server_other.php
index 61f53f7e275..3494f928cde 100644
--- a/htdocs/webservices/server_other.php
+++ b/htdocs/webservices/server_other.php
@@ -208,7 +208,7 @@ function getDocument($authentication, $modulepart, $file, $refname = '')
 
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
-	if ($fuser->societe_id) $socid = $fuser->societe_id;
+	if ($fuser->socid) $socid = $fuser->socid;
 
 	// Check parameters
 	if (!$error && (!$file || !$modulepart))
@@ -234,7 +234,7 @@ function getDocument($authentication, $modulepart, $file, $refname = '')
 		$original_file              = $check_access['original_file'];
 
 		// Basic protection (against external users only)
-		if ($fuser->societe_id > 0)
+		if ($fuser->socid > 0)
 		{
 			if ($sqlprotectagainstexternals)
 			{
@@ -246,7 +246,7 @@ function getDocument($authentication, $modulepart, $file, $refname = '')
 					while ($i < $num)
 					{
 						$obj = $db->fetch_object($resql);
-						if ($fuser->societe_id != $obj->fk_soc)
+						if ($fuser->socid != $obj->fk_soc)
 						{
 							$accessallowed = 0;
 							break;
diff --git a/htdocs/webservices/server_user.php b/htdocs/webservices/server_user.php
index 8619a952ea1..6c4e472d1c7 100644
--- a/htdocs/webservices/server_user.php
+++ b/htdocs/webservices/server_user.php
@@ -485,7 +485,7 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
-	if ($fuser->societe_id) $socid = $fuser->societe_id;
+	if ($fuser->socid) $socid = $fuser->socid;
 
 	if (!$error && !$thirdpartywithuser)
 	{
@@ -502,7 +502,7 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 			$thirdparty = new Societe($db);
 
 			// If a contact / company already exists with the email, return the corresponding socid
-			$sql = "SELECT s.rowid as societe_id FROM ".MAIN_DB_PREFIX."societe as s";
+			$sql = "SELECT s.rowid as socid FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON sp.fk_soc = s.rowid";
 			$sql .= " WHERE s.entity=".$conf->entity;
 			$sql .= " AND s.email='".$db->escape($thirdpartywithuser['email'])."'";
@@ -690,7 +690,7 @@ function setUserPassword($authentication, $shortuser)
 
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
-	if ($fuser->societe_id) $socid = $fuser->societe_id;
+	if ($fuser->socid) $socid = $fuser->socid;
 
 	if (!$error && !$shortuser)
 	{

From 7e9fcfe6649b681aa1e98c100c9c776c211db54c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 12:31:33 +0100
Subject: [PATCH 696/888] Fix warning

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

diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php
index 5cc964dde4e..7f2f2ebd43f 100644
--- a/htdocs/webservices/server_order.php
+++ b/htdocs/webservices/server_order.php
@@ -387,10 +387,10 @@ function getOrder($authentication, $id = '', $ref = '', $ref_ext = '')
 			if ($result > 0)
 			{
 				// Security for external user
-				if ($socid && ($socid != $order->socid))
+				if ($socid && (empty($order->socid) || $socid != $order->socid))
 				{
 					$error++;
-					$errorcode = 'PERMISSION_DENIED'; $errorlabel = $order->socid.'User does not have permission for this request';
+					$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 				}
 
 				if (!$error)

From e34fb394a0078ac8e19a14d6059b796166c3d8fc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 12:38:45 +0100
Subject: [PATCH 697/888] Fix warning

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

diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index d35dc705b6f..f04ade49f05 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -154,7 +154,7 @@ if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafie
 	}
 }
 
-if (is_array($extrafield_array)) $productorservice_fields = array_merge($productorservice_fields, $extrafield_array);
+if (!empty($extrafield_array) && is_array($extrafield_array)) $productorservice_fields = array_merge($productorservice_fields, $extrafield_array);
 
 // Define other specific objects
 $server->wsdl->addComplexType(

From a77d0d90ffca061f2106f78e105af6750cf4d645 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 30 Dec 2020 11:46:33 +0000
Subject: [PATCH 698/888] Fixing style errors.

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

diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index c8475089212..3b2110b9602 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -158,7 +158,7 @@ if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafie
 }
 
 if (!empty($extrafield_array) && is_array($extrafield_array)) {
-  $productorservice_fields = array_merge($productorservice_fields, $extrafield_array);
+	$productorservice_fields = array_merge($productorservice_fields, $extrafield_array);
 }
 
 // Define other specific objects

From 6a63fea184d0d0c2dfe8378acb4d6dc61968cadb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 13:00:10 +0100
Subject: [PATCH 699/888] FIX #15817

---
 htdocs/salaries/class/paymentsalary.class.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index 6aee986396b..807d3537775 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -88,6 +88,11 @@ class PaymentSalary extends CommonObject
 	 */
 	public $fk_user_modif;
 
+	/**
+	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 */
+	public $fields = array();
+
 
 	/**
 	 *	Constructor

From e5da047134964ecb8c2d1d2b5f9f27abe1887663 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 13:16:38 +0100
Subject: [PATCH 700/888] Update index.php

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

diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 6a33d009765..7eae1eb6536 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -48,7 +48,7 @@ $action = GETPOST('action', 'aZ09');
 $list = array(
 	'ACCOUNTING_LENGTH_GACCOUNT',
 	'ACCOUNTING_LENGTH_AACCOUNT',
-	'ACCOUNTING_LIMIT_LIST_VENTILATION'
+//	'ACCOUNTING_LIMIT_LIST_VENTILATION'		   // there is already a global parameter to define the nb of records in lists, we must use it in priority. Having one parameter for nb of record for each page is deprecated.	
 //    'ACCOUNTING_LENGTH_DESCRIPTION',         // adjust size displayed for lines description for dol_trunc
 //    'ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT', // adjust size displayed for select account description for dol_trunc
 );

From 7165bd43d999cb170b6f484b9ffa03385081d62b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 13:17:57 +0100
Subject: [PATCH 701/888] Update modAccounting.class.php

---
 htdocs/core/modules/modAccounting.class.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 7eff70422ee..811dd57544e 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -154,12 +154,6 @@ class modAccounting extends DolibarrModules
 				"csv",
 				"", 0, 'current', 0
 		);
-		$this->const[14] = array(
-			"ACCOUNTING_LIMIT_LIST_VENTILATION",
-			"chaine",
-			"50",
-			"", 0, 'current', 0
-		);
 
 		// Tabs
 		$this->tabs = array();

From b6e33771be7bc98dc44ce462f2f85d4f2da9b55c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 13:19:15 +0100
Subject: [PATCH 702/888] Update accountancy.lang

---
 htdocs/langs/en_US/accountancy.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index c35d85e7bcb..7d1e9bf4fbc 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -144,7 +144,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to on list and bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 

From c647c78ee0d2366b14af8bea763c601c6a3ed7dd Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 30 Dec 2020 14:02:53 +0100
Subject: [PATCH 703/888] FIX restore GETPOSTISSET

---
 htdocs/admin/accountant.php | 2 +-
 htdocs/admin/company.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php
index c8fccb6073d..3647c10f5ea 100644
--- a/htdocs/admin/accountant.php
+++ b/htdocs/admin/accountant.php
@@ -164,7 +164,7 @@ print '<input name="code" id="code" class="minwidth100" value="'.(!empty($conf->
 
 // Note
 print '<tr class="oddeven"><td class="tdtop"><label for="note">'.$langs->trans("Note").'</label></td><td>';
-print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(!empty($conf->global->MAIN_INFO_ACCOUNTANT_NOTE) ? $conf->global->MAIN_INFO_ACCOUNTANT_NOTE : GETPOST("note", 'restricthtml')).'</textarea></td></tr>';
+print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(GETPOSTISSET('note') ? GETPOST('note', 'restricthtml') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_NOTE) ? $conf->global->MAIN_INFO_ACCOUNTANT_NOTE : '')).'</textarea></td></tr>';
 print '</td></tr>';
 
 print '</table>';
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index cac436955f5..fd3f7505778 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -534,7 +534,7 @@ print '</td></tr>';
 
 // Note
 print '<tr class="oddeven"><td class="tdtop"><label for="note">'.$langs->trans("Note").'</label></td><td>';
-print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(!empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? $conf->global->MAIN_INFO_SOCIETE_NOTE : GETPOST("MAIN_INFO_SOCIETE_NOTE", 'restricthtml')).'</textarea></td></tr>';
+print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(GETPOSTISSET('note') ? GETPOST('note', 'restricthtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? $conf->global->MAIN_INFO_SOCIETE_NOTE : '')).'</textarea></td></tr>';
 print '</td></tr>';
 
 print '</table>';

From 39ff3d3190f94840068b85d9ac2f7bf491db3565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 30 Dec 2020 19:07:46 +0100
Subject: [PATCH 704/888] phpcs

---
 htdocs/fourn/facture/list.php | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 08bab0b4c76..eef93849c8b 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2015-2016 Ferran Marcet        <fmarcet@2byte.es>
  * Copyright (C) 2017      Josep Lluís Amador   <joseplluis@lliuretic.cat>
  * Copyright (C) 2018      Charlene Benke       <charlie@patas-monkey.com>
- * Copyright (C) 2018-2019 Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020 Frédéric 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
@@ -60,8 +60,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'sup
 $socid = GETPOST('socid', 'int');
 
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$_GET["action"] = '';
 	$socid = $user->socid;
@@ -363,13 +362,10 @@ if ($massaction == 'transfer_request')
 {
 	$langs->load("withdrawals");
 
-	if (!$user->rights->paymentbybanktransfer->create)
-	{
+	if (!$user->rights->paymentbybanktransfer->create) {
 		$error++;
 		setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
-	}
-	else
-	{
+	} else {
 		//Checking error
 		$error = 0;
 
@@ -421,34 +417,27 @@ if ($massaction == 'transfer_request')
 				elseif (!empty($objecttmp->mode_reglement_code) && $objecttmp->mode_reglement_code != 'VIR') {
 					$error++;
 					setEventMessages($objecttmp->ref.' '.$langs->trans("BadPaymentMethod"), $objecttmp->errors, 'errors');
-				}
-				else {
+				} else {
 					$listofbills[] = $objecttmp; // $listofbills will only contains invoices with good payment method and no request already done
 				}
 			}
 		}
 
 		//Massive withdraw request for request with no errors
-		if (!empty($listofbills))
-		{
+		if (!empty($listofbills)) {
 			$nbwithdrawrequestok = 0;
-			foreach ($listofbills as $aBill)
-			{
+			foreach ($listofbills as $aBill) {
 				$db->begin();
 				$result = $aBill->demande_prelevement($user, $aBill->resteapayer, 'bank-transfer', 'supplier_invoice');
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$db->commit();
 					$nbwithdrawrequestok++;
-				}
-				else
-				{
+				} else {
 					$db->rollback();
 					setEventMessages($aBill->error, $aBill->errors, 'errors');
 				}
 			}
-			if ($nbwithdrawrequestok > 0)
-			{
+			if ($nbwithdrawrequestok > 0) {
 				setEventMessages($langs->trans("BankTransferRequestsDone", $nbwithdrawrequestok), null, 'mesgs');
 			}
 		}

From 123101542b3f044f280ee88a552960a7546534d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 30 Dec 2020 19:13:20 +0100
Subject: [PATCH 705/888] Update paiement.php

---
 htdocs/fourn/facture/paiement.php | 53 +++++++++++++++++--------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 8a7e0cc8054..f88e6dfd834 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2015       Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2017       Alexandre Spangaro      <aspangaro@open-dsi.fr>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric 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
@@ -42,15 +42,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'bills', 'banks', 'compta'));
 
-$action		= GETPOST('action', 'alpha');
-$confirm	= GETPOST('confirm', 'alpha');
+$action = GETPOST('action', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
 
-$facid		= GETPOST('facid', 'int');
-$socid		= GETPOST('socid', 'int');
+$facid = GETPOST('facid', 'int');
+$socid = GETPOST('socid', 'int');
 $accountid = GETPOST('accountid', 'int');
 $day = GETPOST('day', 'int');
-$month		= GETPOST('month', 'int');
+$month = GETPOST('month', 'int');
 $year = GETPOST('year', 'int');
 
 $search_ref = GETPOST("search_ref", "alpha");
@@ -562,15 +562,19 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 						print '<td>'.$langs->trans('RefSupplier').'</td>';
 						print '<td class="center">'.$langs->trans('Date').'</td>';
 						print '<td class="center">'.$langs->trans('DateMaxPayment').'</td>';
-						if (!empty($conf->multicurrency->enabled)) print '<td>'.$langs->trans('Currency').'</td>';
-						if (!empty($conf->multicurrency->enabled)) print '<td class="right">'.$langs->trans('MulticurrencyAmountTTC').'</td>';
-						if (!empty($conf->multicurrency->enabled)) print '<td class="right">'.$langs->trans('MulticurrencyAlreadyPaid').'</td>';
-						if (!empty($conf->multicurrency->enabled)) print '<td class="right">'.$langs->trans('MulticurrencyRemainderToPay').'</td>';
+						if (!empty($conf->multicurrency->enabled)) {
+							print '<td>'.$langs->trans('Currency').'</td>';
+							print '<td class="right">'.$langs->trans('MulticurrencyAmountTTC').'</td>';
+							print '<td class="right">'.$langs->trans('MulticurrencyAlreadyPaid').'</td>';
+							print '<td class="right">'.$langs->trans('MulticurrencyRemainderToPay').'</td>';
+						}
 						print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
 						print '<td class="right">'.$langs->trans('AlreadyPaid').'</td>';
 						print '<td class="right">'.$langs->trans('RemainderToPay').'</td>';
 						print '<td class="center">'.$langs->trans('PaymentAmount').'</td>';
-						if (!empty($conf->multicurrency->enabled)) print '<td class="center">'.$langs->trans('MulticurrencyPaymentAmount').'</td>';
+						if (!empty($conf->multicurrency->enabled)) {
+							print '<td class="center">'.$langs->trans('MulticurrencyPaymentAmount').'</td>';
+						}
 						print '</tr>';
 
 						$total = 0;
@@ -596,8 +600,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							$remaintopay = price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits, 'MT');
 
 							// Multicurrency Price
-							if (!empty($conf->multicurrency->enabled))
-							{
+							if (!empty($conf->multicurrency->enabled)) {
 								$multicurrency_payment = $invoice->getSommePaiement(1);
 								$multicurrency_creditnotes = $invoice->getSumCreditNotesUsed(1);
 								$multicurrency_deposits = $invoice->getSumDepositsUsed(1);
@@ -616,8 +619,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							print '<td>'.$objp->ref_supplier.'</td>';
 
 							// Date
-							if ($objp->df > 0)
-							{
+							if ($objp->df > 0) {
 								print '<td class="center nowraponall">';
 								print dol_print_date($db->jdate($objp->df), 'day').'</td>';
 							} else {
@@ -728,15 +730,16 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							$totalrecudeposits += $deposits;
 							$i++;
 						}
-						if ($i > 1)
-						{
+						if ($i > 1) {
 							// Print total
 							print '<tr class="liste_total">';
 							print '<td colspan="4" class="left">'.$langs->trans('TotalTTC').':</td>';
-							if (!empty($conf->multicurrency->enabled)) print '<td>&nbsp;</td>';
-							if (!empty($conf->multicurrency->enabled)) print '<td>&nbsp;</td>';
-							if (!empty($conf->multicurrency->enabled)) print '<td>&nbsp;</td>';
-							if (!empty($conf->multicurrency->enabled)) print '<td>&nbsp;</td>';
+							if (!empty($conf->multicurrency->enabled)) {
+								print '<td>&nbsp;</td>';
+								print '<td>&nbsp;</td>';
+								print '<td>&nbsp;</td>';
+								print '<td>&nbsp;</td>';
+							}
 							print '<td class="right"><b>'.price($sign * $total_ttc).'</b></td>';
 							print '<td class="right"><b>'.price($sign * $totalrecu);
 							if ($totalrecucreditnote) print '+'.price($totalrecucreditnote);
@@ -744,7 +747,9 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							print	'</b></td>';
 							print '<td class="right"><b>'.price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT')).'</b></td>';
 							print '<td class="center" id="result" style="font-weight: bold;"></td>'; // Autofilled
-							if (!empty($conf->multicurrency->enabled)) print '<td class="right" id="multicurrency_result" style="font-weight: bold;"></td>';
+							if (!empty($conf->multicurrency->enabled)) {
+								print '<td class="right" id="multicurrency_result" style="font-weight: bold;"></td>';
+							}
 							print "</tr>\n";
 						}
 						print "</table>\n";
@@ -785,7 +790,9 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
 			print '</form>';
 		}
-	} else dol_print_error($db);
+	} else {
+		dol_print_error($db);
+	}
 }
 
 // End of page

From 9916335d932f88dbaeca617cca3434c42fcd7e2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 30 Dec 2020 19:17:28 +0100
Subject: [PATCH 706/888] remove whitespace

---
 htdocs/accountancy/admin/index.php | 55 ++++++++++++++++--------------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 7eae1eb6536..ae36f0f7fa6 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -37,8 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 $langs->loadLangs(array("compta", "bills", "admin", "accountancy", "other"));
 
 // Security access
-if (empty($user->rights->accounting->chartofaccount))
-{
+if (empty($user->rights->accounting->chartofaccount)) {
 	accessforbidden();
 }
 
@@ -48,9 +47,9 @@ $action = GETPOST('action', 'aZ09');
 $list = array(
 	'ACCOUNTING_LENGTH_GACCOUNT',
 	'ACCOUNTING_LENGTH_AACCOUNT',
-//	'ACCOUNTING_LIMIT_LIST_VENTILATION'		   // there is already a global parameter to define the nb of records in lists, we must use it in priority. Having one parameter for nb of record for each page is deprecated.	
-//    'ACCOUNTING_LENGTH_DESCRIPTION',         // adjust size displayed for lines description for dol_trunc
-//    'ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT', // adjust size displayed for select account description for dol_trunc
+//	'ACCOUNTING_LIMIT_LIST_VENTILATION'		   // there is already a global parameter to define the nb of records in lists, we must use it in priority. Having one parameter for nb of record for each page is deprecated.
+//	'ACCOUNTING_LENGTH_DESCRIPTION',         // adjust size displayed for lines description for dol_trunc
+//	'ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT', // adjust size displayed for select account description for dol_trunc
 );
 
 $list_binding = array(
@@ -65,10 +64,8 @@ $list_binding = array(
 if ($action == 'update') {
 	$error = 0;
 
-	if (!$error)
-	{
-		foreach ($list as $constname)
-		{
+	if (!$error) {
+		foreach ($list as $constname) {
 			$constvalue = GETPOST($constname, 'alpha');
 
 			if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
@@ -79,8 +76,7 @@ if ($action == 'update') {
 			setEventMessages($langs->trans("Error"), null, 'errors');
 		}
 
-		foreach ($list_binding as $constname)
-		{
+		foreach ($list_binding as $constname) {
 			$constvalue = GETPOST($constname, 'alpha');
 
 			if ($constname == 'ACCOUNTING_DATE_START_BINDING') {
@@ -104,8 +100,9 @@ if ($action == 'update') {
 if ($action == 'setlistsorttodo') {
 	$setlistsorttodo = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_LIST_SORT_VENTILATION_TODO", $setlistsorttodo, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0)
+	if (!$res > 0) {
 		$error++;
+	}
 
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -117,8 +114,9 @@ if ($action == 'setlistsorttodo') {
 if ($action == 'setlistsortdone') {
 	$setlistsortdone = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_LIST_SORT_VENTILATION_DONE", $setlistsortdone, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0)
+	if (!$res > 0) {
 		$error++;
+	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -129,8 +127,9 @@ if ($action == 'setlistsortdone') {
 if ($action == 'setmanagezero') {
 	$setmanagezero = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_MANAGE_ZERO", $setmanagezero, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0)
+	if (!$res > 0) {
 		$error++;
+	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -141,8 +140,9 @@ if ($action == 'setmanagezero') {
 if ($action == 'setdisabledirectinput') {
 	$setdisabledirectinput = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "BANK_DISABLE_DIRECT_INPUT", $setdisabledirectinput, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0)
+	if (!$res > 0) {
 		$error++;
+	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -153,8 +153,9 @@ if ($action == 'setdisabledirectinput') {
 if ($action == 'setenabledraftexport') {
 	$setenabledraftexport = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL", $setenabledraftexport, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0)
+	if (!$res > 0) {
 		$error++;
+	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -165,8 +166,9 @@ if ($action == 'setenabledraftexport') {
 if ($action == 'setenablesubsidiarylist') {
 	$setenablesubsidiarylist = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTANCY_COMBO_FOR_AUX", $setenablesubsidiarylist, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0)
+	if (!$res > 0) {
 		$error++;
+	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -177,8 +179,9 @@ if ($action == 'setenablesubsidiarylist') {
 if ($action == 'setdisablebindingonsales') {
 	$setdisablebindingonsales = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_DISABLE_BINDING_ON_SALES", $setdisablebindingonsales, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0)
+	if (!$res > 0) {
 		$error++;
+	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -189,8 +192,9 @@ if ($action == 'setdisablebindingonsales') {
 if ($action == 'setdisablebindingonpurchases') {
 	$setdisablebindingonpurchases = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_DISABLE_BINDING_ON_PURCHASES", $setdisablebindingonpurchases, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0)
+	if (!$res > 0) {
 		$error++;
+	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -201,8 +205,9 @@ if ($action == 'setdisablebindingonpurchases') {
 if ($action == 'setdisablebindingonexpensereports') {
 	$setdisablebindingonexpensereports = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS", $setdisablebindingonexpensereports, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0)
+	if (!$res > 0) {
 		$error++;
+	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -289,11 +294,12 @@ if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO)) {
 print '</tr>';
 
 // Param a user $user->rights->accounting->chartofaccount can access
-foreach ($list as $key)
-{
+foreach ($list as $key) {
 	print '<tr class="oddeven value">';
 
-	if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO) && ($key == 'ACCOUNTING_LENGTH_GACCOUNT' || $key == 'ACCOUNTING_LENGTH_AACCOUNT')) continue;
+	if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO) && ($key == 'ACCOUNTING_LENGTH_GACCOUNT' || $key == 'ACCOUNTING_LENGTH_AACCOUNT')) {
+		continue;
+	}
 
 	// Param
 	$label = $langs->trans($key);
@@ -342,8 +348,7 @@ if (!empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE)) {
 print '</tr>';
 
 // Param a user $user->rights->accounting->chartofaccount can access
-foreach ($list_binding as $key)
-{
+foreach ($list_binding as $key) {
 	print '<tr class="oddeven value">';
 
 	// Param

From 1620ab31185dc7f83b7ca22dbc7a74dc5d066ad5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 30 Dec 2020 20:47:57 +0100
Subject: [PATCH 707/888] societe_id to socid

---
 scripts/user/migrate_picture_path.php     |  6 ++-
 scripts/user/sync_users_ldap2dolibarr.php | 49 +++++++++++++++++------
 2 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/scripts/user/migrate_picture_path.php b/scripts/user/migrate_picture_path.php
index 795d03b710d..dd395dc0629 100755
--- a/scripts/user/migrate_picture_path.php
+++ b/scripts/user/migrate_picture_path.php
@@ -19,12 +19,14 @@
  */
 
 /**
- * \file scripts/product/migrate_picture_path.php
+ * \file scripts/user/migrate_picture_path.php
  * \ingroup scripts
  * \brief Migrate pictures from old system prior to 3.7 to new path for 3.7+
  */
 
-if (!defined('NOSESSION')) define('NOSESSION', '1');
+if (!defined('NOSESSION')) {
+	define('NOSESSION', '1');
+}
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
diff --git a/scripts/user/sync_users_ldap2dolibarr.php b/scripts/user/sync_users_ldap2dolibarr.php
index 375cb2f43ba..a040599bfc2 100755
--- a/scripts/user/sync_users_ldap2dolibarr.php
+++ b/scripts/user/sync_users_ldap2dolibarr.php
@@ -24,7 +24,9 @@
  * \brief Script to update users into Dolibarr from LDAP
  */
 
-if (!defined('NOSESSION')) define('NOSESSION', '1');
+if (!defined('NOSESSION')) {
+	define('NOSESSION', '1');
+}
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
@@ -59,12 +61,27 @@ print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 dol_syslog($script_file." launched with arg ".join(',', $argv));
 
 // List of fields to get from LDAP
-$required_fields = array($conf->global->LDAP_KEY_USERS, $conf->global->LDAP_FIELD_FULLNAME, $conf->global->LDAP_FIELD_NAME, $conf->global->LDAP_FIELD_FIRSTNAME, $conf->global->LDAP_FIELD_LOGIN, $conf->global->LDAP_FIELD_LOGIN_SAMBA, $conf->global->LDAP_FIELD_PASSWORD, $conf->global->LDAP_FIELD_PASSWORD_CRYPTED, $conf->global->LDAP_FIELD_PHONE, $conf->global->LDAP_FIELD_FAX, $conf->global->LDAP_FIELD_MOBILE,
+$required_fields = array(
+	$conf->global->LDAP_KEY_USERS,
+	$conf->global->LDAP_FIELD_FULLNAME,
+	$conf->global->LDAP_FIELD_NAME,
+	$conf->global->LDAP_FIELD_FIRSTNAME,
+	$conf->global->LDAP_FIELD_LOGIN,
+	$conf->global->LDAP_FIELD_LOGIN_SAMBA,
+	$conf->global->LDAP_FIELD_PASSWORD,
+	$conf->global->LDAP_FIELD_PASSWORD_CRYPTED,
+	$conf->global->LDAP_FIELD_PHONE,
+	$conf->global->LDAP_FIELD_FAX,
+	$conf->global->LDAP_FIELD_MOBILE,
 	// $conf->global->LDAP_FIELD_ADDRESS,
 	// $conf->global->LDAP_FIELD_ZIP,
 	// $conf->global->LDAP_FIELD_TOWN,
 	// $conf->global->LDAP_FIELD_COUNTRY,
-	$conf->global->LDAP_FIELD_MAIL, $conf->global->LDAP_FIELD_TITLE, $conf->global->LDAP_FIELD_DESCRIPTION, $conf->global->LDAP_FIELD_SID);
+	$conf->global->LDAP_FIELD_MAIL,
+	$conf->global->LDAP_FIELD_TITLE,
+	$conf->global->LDAP_FIELD_DESCRIPTION,
+	$conf->global->LDAP_FIELD_SID
+);
 
 // Remove from required_fields all entries not configured in LDAP (empty) and duplicated
 $required_fields = array_unique(array_values(array_filter($required_fields, "dolValidElement")));
@@ -75,14 +92,18 @@ if (!isset($argv[1])) {
 }
 
 foreach ($argv as $key => $val) {
-	if ($val == 'commitiferror')
+	if ($val == 'commitiferror') {
 		$forcecommit = 1;
-	if (preg_match('/--server=([^\s]+)$/', $val, $reg))
+	}
+	if (preg_match('/--server=([^\s]+)$/', $val, $reg)) {
 		$conf->global->LDAP_SERVER_HOST = $reg[1];
-	if (preg_match('/--excludeuser=([^\s]+)$/', $val, $reg))
+	}
+	if (preg_match('/--excludeuser=([^\s]+)$/', $val, $reg)) {
 		$excludeuser = explode(',', $reg[1]);
-	if (preg_match('/-y$/', $val, $reg))
+	}
+	if (preg_match('/-y$/', $val, $reg)) {
 		$confirmed = 1;
+	}
 }
 
 print "Mails sending disabled (useless in batch mode)\n";
@@ -94,9 +115,11 @@ print "port=".$conf->global->LDAP_SERVER_PORT."\n";
 print "login=".$conf->global->LDAP_ADMIN_DN."\n";
 print "pass=".preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)."\n";
 print "DN to extract=".$conf->global->LDAP_USER_DN."\n";
-if (!empty($conf->global->LDAP_FILTER_CONNECTION))
+if (!empty($conf->global->LDAP_FILTER_CONNECTION)) {
 	print 'Filter=('.$conf->global->LDAP_FILTER_CONNECTION.')'."\n"; // Note: filter is defined into function getRecords
-else print 'Filter=('.$conf->global->LDAP_KEY_USERS.'=*)'."\n";
+} else {
+	print 'Filter=('.$conf->global->LDAP_KEY_USERS.'=*)'."\n";
+}
 print "----- To Dolibarr database:\n";
 print "type=".$conf->db->type."\n";
 print "host=".$conf->db->host."\n";
@@ -200,7 +223,7 @@ if ($result >= 0) {
 			$fuser->job = $ldapuser[$conf->global->LDAP_FIELD_TITLE];
 			$fuser->note = $ldapuser[$conf->global->LDAP_FIELD_DESCRIPTION];
 			$fuser->admin = 0;
-			$fuser->societe_id = 0;
+			$fuser->socid = 0;
 			$fuser->contact_id = 0;
 			$fuser->fk_member = 0;
 
@@ -254,9 +277,11 @@ if ($result >= 0) {
 		}
 
 		if (!$error || $forcecommit) {
-			if (!$error)
+			if (!$error) {
 				print $langs->transnoentities("NoErrorCommitIsDone")."\n";
-			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			} else {
+				print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			}
 			$db->commit();
 		} else {
 			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone", $error)."\n";

From a5e0352031781fb95e15dcd8b6eaff7bda608b88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 30 Dec 2020 21:18:12 +0100
Subject: [PATCH 708/888] modify animation speed of tooltips

---
 htdocs/core/js/lib_foot.js.php | 50 ++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/js/lib_foot.js.php b/htdocs/core/js/lib_foot.js.php
index d04379210a6..de19f674659 100644
--- a/htdocs/core/js/lib_foot.js.php
+++ b/htdocs/core/js/lib_foot.js.php
@@ -21,13 +21,27 @@
  * \brief      File that include javascript functions (included if option use_javascript activated)
  */
 
-if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
-if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
-if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
-if (!defined('NOLOGIN'))         define('NOLOGIN', 1);
-if (!defined('NOREQUIREMENU'))   define('NOREQUIREMENU', 1);
-if (!defined('NOREQUIREHTML'))   define('NOREQUIREHTML', 1);
-if (!defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', 1);
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1);
+}
+if (!defined('NOLOGIN')) {
+	define('NOLOGIN', 1);
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', 1);
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', 1);
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 session_cache_limiter('public');
 
@@ -36,8 +50,11 @@ require_once '../../main.inc.php';
 // Define javascript type
 top_httphead('text/javascript; charset=UTF-8');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
-if (empty($dolibarr_nocache)) header('Cache-Control: max-age=10800, public, must-revalidate');
-else header('Cache-Control: no-cache');
+if (empty($dolibarr_nocache)) {
+	header('Cache-Control: max-age=10800, public, must-revalidate');
+} else {
+	header('Cache-Control: no-cache');
+}
 
 //var_dump($conf);
 
@@ -46,15 +63,14 @@ else header('Cache-Control: no-cache');
 print "\n/* JS CODE TO ENABLE Tooltips on all object with class classfortooltip */\n";
 print "jQuery(document).ready(function () {\n";
 
-if (empty($conf->dol_no_mouse_hover))
-{
+if (empty($conf->dol_no_mouse_hover)) {
 	print 'jQuery(".classfortooltip").tooltip({
-				show: { collision: "flipfit", effect:\'toggle\', delay:50 },
-				hide: { delay: 250 },
+				show: { collision: "flipfit", effect:"toggle", delay:75, duration:150 },
+				hide: { delay: 250, duration: 20 },
 				tooltipClass: "mytooltip",
 				content: function () {
                     console.log("Return title for popup");
-            		return $(this).prop(\'title\');		/* To force to get title as is */
+            		return $(this).prop("title");		/* To force to get title as is */
           		}
 			});'."\n";
 }
@@ -79,8 +95,7 @@ print "});\n";
 
 
 // Wrapper to manage dropdown
-if (!defined('JS_JQUERY_DISABLE_DROPDOWN'))
-{
+if (!defined('JS_JQUERY_DISABLE_DROPDOWN')) {
 	print "\n/* JS CODE TO ENABLE dropdown (hamburger, linkto, ...) */\n";
 	print '
               jQuery(document).ready(function () {
@@ -149,8 +164,7 @@ if (!defined('JS_JQUERY_DISABLE_DROPDOWN'))
 }
 
 // Wrapper to manage document_preview
-if ($conf->browser->layout != 'phone')
-{
+if ($conf->browser->layout != 'phone') {
 	print "\n/* JS CODE TO ENABLE document_preview */\n"; // Function document_preview is into header
 	print '
                 jQuery(document).ready(function () {

From 1ec763fc14f324ea1301fafefd00d3d72bf7b667 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 21:22:54 +0100
Subject: [PATCH 709/888] FIX When creating a new POS sell, the creation date
 must be modified.

---
 htdocs/takepos/index.php   |  7 ++++---
 htdocs/takepos/invoice.php | 13 ++++---------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index d3fc6b7416a..4eeb9dcf9a7 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -448,7 +448,7 @@ function TakeposOrderNotes() {
 }
 
 function Refresh() {
-	console.log("Refresh");
+	console.log("Refresh by reloading place="+place);
 	$("#poslines").load("invoice.php?place="+place, function() {
 		//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
 	});
@@ -456,9 +456,10 @@ function Refresh() {
 
 function New() {
 	// If we go here,it means $conf->global->TAKEPOS_BAR_RESTAURANT is not defined
-	console.log("New with place = <?php echo $place; ?>, js place="+place);
-
 	invoiceid = $("#invoiceid").val();
+
+	console.log("New with place = <?php echo $place; ?>, js place="+place+", invoiceid="+invoiceid);
+
 	$.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=getInvoice&id='+invoiceid, function(data) {
 		var r;
 
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 493202376a9..0bc6087409d 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -395,16 +395,9 @@ if ($action == "deleteline") {
     }
 }
 
+// Action to delete or discard an invoice
 if ($action == "delete") {
 	// $placeid is the invoice id (it differs from place) and is defined if the place is set and the ref of invoice is '(PROV-POS'.$_SESSION["takeposterminal"].'-'.$place.')', so the fetch at begining of page works.
-
-	/*$reg = array();
-	if (preg_match('/^(\d+)-(\d+)$/', $place, $reg)) {
-
-		$place = $reg[1];
-		var_dump($place);
-	}*/
-
 	if ($placeid > 0) {
         $result = $invoice->fetch($placeid);
 
@@ -422,7 +415,9 @@ if ($action == "delete") {
 				}
 			}
 
-			$sql = "UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".$conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]};
+			$sql = "UPDATE ".MAIN_DB_PREFIX."facture";
+			$sql .= " SET fk_soc=".$conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]}.", ";
+			$sql .= " datec = '".$db->idate(dol_now())."'";
 			$sql .= " WHERE ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
 			$resql1 = $db->query($sql);
 

From 94e859bf6ae2aadf27f8497ac16f4a0164ec1c7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 30 Dec 2020 21:41:44 +0100
Subject: [PATCH 710/888] doxygen

---
 .../class/api_subscriptions.class.php         |  9 +++--
 htdocs/adherents/class/subscription.class.php | 39 +++++++++++++++----
 2 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/htdocs/adherents/class/api_subscriptions.class.php b/htdocs/adherents/class/api_subscriptions.class.php
index 370de13c3a2..04b9f750a88 100644
--- a/htdocs/adherents/class/api_subscriptions.class.php
+++ b/htdocs/adherents/class/api_subscriptions.class.php
@@ -87,7 +87,7 @@ class Subscriptions extends DolibarrApi
 	 */
 	public function index($sortfield = "dateadh", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
 	{
-		global $db, $conf;
+		global $conf;
 
 		$obj_ret = array();
 
@@ -183,7 +183,9 @@ class Subscriptions extends DolibarrApi
 		}
 
 		foreach ($request_data as $field => $value) {
-			if ($field == 'id') continue;
+			if ($field == 'id') {
+				continue;
+			}
 			$subscription->$field = $value;
 		}
 
@@ -236,8 +238,9 @@ class Subscriptions extends DolibarrApi
 	{
 		$subscription = array();
 		foreach (Subscriptions::$FIELDS as $field) {
-			if (!isset($data[$field]))
+			if (!isset($data[$field])) {
 				throw new RestException(400, "$field field missing");
+			}
 			$subscription[$field] = $data[$field];
 		}
 		return $subscription;
diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index b6349bf9dc2..dff127d6d2b 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -84,8 +84,15 @@ class Subscription extends CommonObject
 	 * @var int ID
 	 */
 	public $fk_type;
+
+	/**
+	 * @var int Member ID
+	 */
 	public $fk_adherent;
 
+	/**
+	 * @var double amount subscription
+	 */
 	public $amount;
 
 	/**
@@ -140,7 +147,9 @@ class Subscription extends CommonObject
 			$this->error = $langs->trans("ErrorBadValueForDate");
 			return -1;
 		}
-		if (empty($this->datec)) $this->datec = $now;
+		if (empty($this->datec)) {
+			$this->datec = $now;
+		}
 
 
 		$this->db->begin();
@@ -177,7 +186,9 @@ class Subscription extends CommonObject
 			$this->context = array('member' => $member);
 			// Call triggers
 			$result = $this->call_trigger('MEMBER_SUBSCRIPTION_CREATE', $user);
-			if ($result < 0) { $error++; }
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
@@ -278,7 +289,9 @@ class Subscription extends CommonObject
 				$this->context = array('member'=>$member);
 				// Call triggers
 				$result = $this->call_trigger('MEMBER_SUBSCRIPTION_MODIFY', $user);
-				if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail
+				if ($result < 0) {
+					$error++;
+				} //Do also here what you must do to rollback action if trigger fail
 				// End call triggers
 			}
 		} else {
@@ -320,7 +333,9 @@ class Subscription extends CommonObject
 			if (!$notrigger) {
 				// Call triggers
 				$result = $this->call_trigger('MEMBER_SUBSCRIPTION_DELETE', $user);
-				if ($result < 0) { $error++; } // Do also here what you must do to rollback action if trigger fail
+				if ($result < 0) {
+					$error++;
+				} // Do also here what you must do to rollback action if trigger fail
 				// End call triggers
 			}
 		}
@@ -407,16 +422,24 @@ class Subscription extends CommonObject
 		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkstart = '<a href="'.$url.'" class="classfortooltip" title="'.dol_escape_htmltag($label, 1).'">';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 
 		return $result;

From 6ef7d3db79b3eda90d89cedb980c6cc50e374750 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 21:43:04 +0100
Subject: [PATCH 711/888] FIX Dates of sales start in TakePOS

---
 htdocs/langs/en_US/cashdesk.lang | 1 +
 htdocs/takepos/index.php         | 2 +-
 htdocs/takepos/invoice.php       | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index 8e529fe92f2..bb433583797 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -99,6 +99,7 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
+SaleStartedAt=Sale started at %s
 ControlCashOpening=Control cash desk at opening POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index ef6ca77722a..5e75749dc00 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -832,7 +832,7 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 			</div>
 			<div class="topnav-right">
 				<div class="login_block_other">
-				<input type="text" id="search" name="search" onkeyup="Search2(<?php echo $keyCodeForEnter; ?>);"  placeholder="<?php echo $langs->trans("Search"); ?>" autofocus>
+				<input type="text" id="search" name="search" onkeyup="Search2(<?php echo $keyCodeForEnter; ?>);" placeholder="<?php echo $langs->trans("Search"); ?>" autofocus>
 				<a onclick="ClearSearch();"><span class="fa fa-backspace"></span></a>
 				<a onclick="window.location.href='<?php echo DOL_URL_ROOT.'/'; ?>';"><span class="fas fa-home"></span></a>
 				<?php if (empty($conf->dol_use_jmobile)) { ?>
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 55b576a040d..409ca6b2ce4 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -1019,13 +1019,13 @@ $( document ).ready(function() {
 	if ($resql) {
 		while ($obj = $db->fetch_object($resql)) {
 			echo '$("#customerandsales").append(\'';
-			echo '<a class="valignmiddle" onclick="place=\\\'';
+			echo '<a class="valignmiddle" title="'.dol_escape_js($langs->trans("SaleStartedAt", dol_print_date($db->jdate($obj->datec), '%H:%M'))).'" onclick="place=\\\'';
 			$num_sale = str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $obj->ref));
 			echo $num_sale;
 			if (str_replace("-", "", $num_sale) > $max_sale) $max_sale = str_replace("-", "", $num_sale);
 			echo '\\\';Refresh();">';
 			if ($placeid == $obj->rowid) echo "<b>";
-			echo date('H:i', strtotime($obj->datec));
+			echo dol_print_date($db->jdate($obj->datec), '%H:%M');
 			if ($placeid == $obj->rowid) echo "</b>";
 			echo '</a>\');';
 		}

From 79da04780248280be09cb0e5ed19d345db4efca1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 21:43:04 +0100
Subject: [PATCH 712/888] FIX Dates of sales start in TakePOS

Conflicts:
	htdocs/langs/en_US/cashdesk.lang
---
 htdocs/langs/en_US/cashdesk.lang | 5 +++--
 htdocs/takepos/index.php         | 2 +-
 htdocs/takepos/invoice.php       | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index ce5cdaf4ba6..a93571d4768 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 4eeb9dcf9a7..4bfeaa57b75 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -778,7 +778,7 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 			</div>
 			<div class="topnav-right">
 				<div class="login_block_other">
-				<input type="text" id="search" name="search" onkeyup="Search2(<?php echo $keyCodeForEnter; ?>);"  placeholder="<?php echo $langs->trans("Search"); ?>" autofocus>
+				<input type="text" id="search" name="search" onkeyup="Search2(<?php echo $keyCodeForEnter; ?>);" placeholder="<?php echo $langs->trans("Search"); ?>" autofocus>
 				<a onclick="ClearSearch();"><span class="fa fa-backspace"></span></a>
 				<a onclick="window.location.href='<?php echo DOL_URL_ROOT; ?>';"><span class="fas fa-home"></span></a>
 				<?php if (empty($conf->dol_use_jmobile)) { ?>
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 0bc6087409d..1022308c308 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -763,13 +763,13 @@ $( document ).ready(function() {
 	if ($resql) {
 		while ($obj = $db->fetch_object($resql)) {
 			echo '$("#customerandsales").append(\'';
-			echo '<a class="valignmiddle" onclick="place=\\\'';
+			echo '<a class="valignmiddle" title="'.dol_escape_js($langs->trans("SaleStartedAt", dol_print_date($db->jdate($obj->datec), '%H:%M'))).'" onclick="place=\\\'';
 			$num_sale = str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $obj->ref));
 			echo $num_sale;
 			if (str_replace("-", "", $num_sale) > $max_sale) $max_sale = str_replace("-", "", $num_sale);
 			echo '\\\';Refresh();">';
 			if ($placeid == $obj->rowid) echo "<b>";
-			echo date('H:i', strtotime($obj->datec));
+			echo dol_print_date($db->jdate($obj->datec), '%H:%M');
 			if ($placeid == $obj->rowid) echo "</b>";
 			echo '</a>\');';
 		}

From 02d92d3538bae102bed4afb074e33da874b09c72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 30 Dec 2020 21:53:17 +0100
Subject: [PATCH 713/888] remove deprecated

---
 htdocs/admin/expensereport_rules.php | 117 +++++++++++++++------------
 1 file changed, 64 insertions(+), 53 deletions(-)

diff --git a/htdocs/admin/expensereport_rules.php b/htdocs/admin/expensereport_rules.php
index 9b56ac5901b..050c2b9455c 100644
--- a/htdocs/admin/expensereport_rules.php
+++ b/htdocs/admin/expensereport_rules.php
@@ -20,7 +20,7 @@
 
 
 /**
- *      \file       htdocs/admin/expensereport_ik.php
+ *      \file       htdocs/admin/expensereport_rules.php
  *		\ingroup    expensereport
  *		\brief      Page to display expense tax ik
  */
@@ -34,7 +34,9 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_rule.class.ph
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "other", "trips", "errors", "dict"));
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 //Init error
 $error = false;
@@ -55,15 +57,15 @@ $amount = GETPOST('amount');
 $restrictive = GETPOST('restrictive');
 
 $object = new ExpenseReportRule($db);
-if (!empty($id))
-{
+if (!empty($id)) {
 	$result = $object->fetch($id);
-	if ($result < 0) dol_print_error('', $object->error, $object->errors);
+	if ($result < 0) {
+		dol_print_error('', $object->error, $object->errors);
+	}
 }
 
 // TODO do action
-if ($action == 'save')
-{
+if ($action == 'save') {
 	$error = 0;
 
 	// check parameters
@@ -92,8 +94,7 @@ if ($action == 'save')
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpenseReportLimitAmount")), null, 'errors');
 	}
 
-	if (empty($error))
-	{
+	if (empty($error)) {
 		$object->setValues($_POST);
 
 		if ($apply_to == 'U') {
@@ -116,18 +117,22 @@ if ($action == 'save')
 		$object->entity = $conf->entity;
 
 		$res = $object->create($user);
-		if ($res > 0) setEventMessages($langs->trans('ExpenseReportRuleSave'), null);
-		else dol_print_error($object->db);
+		if ($res > 0) {
+			setEventMessages($langs->trans('ExpenseReportRuleSave'), null);
+		} else {
+			dol_print_error($object->db);
+		}
 
 		header('Location: '.$_SERVER['PHP_SELF']);
 		exit;
 	}
-} elseif ($action == 'delete')
-{
+} elseif ($action == 'delete') {
 	// TODO add confirm
 	$res = $object->delete($user);
 
-	if ($res < 0) dol_print_error($object->db);
+	if ($res < 0) {
+		dol_print_error($object->db);
+	}
 
 	header('Location: '.$_SERVER['PHP_SELF']);
 	exit;
@@ -135,8 +140,17 @@ if ($action == 'save')
 
 $rules = ExpenseReportRule::getAllRule();
 
-$tab_apply = array('A' => $langs->trans('All'), 'G' => $langs->trans('Group'), 'U' => $langs->trans('User'));
-$tab_rules_type = array('EX_DAY' => $langs->trans('Day'), 'EX_MON' => $langs->trans('Month'), 'EX_YEA' => $langs->trans('Year'), 'EX_EXP' => $langs->trans('OnExpense'));
+$tab_apply = array(
+	'A' => $langs->trans('All'),
+	'G' => $langs->trans('Group'),
+	'U' => $langs->trans('User')
+);
+$tab_rules_type = array(
+	'EX_DAY' => $langs->trans('Day'),
+	'EX_MON' => $langs->trans('Month'),
+	'EX_YEA' => $langs->trans('Year'),
+	'EX_EXP' => $langs->trans('OnExpense')
+);
 
 
 /*
@@ -156,8 +170,7 @@ print dol_get_fiche_head($head, 'expenserules', $langs->trans("ExpenseReportsRul
 echo '<span class="opacitymedium">'.$langs->trans('ExpenseReportRulesDesc').'</span>';
 print '<br><br>';
 
-if ($action != 'edit')
-{
+if ($action != 'edit') {
 	echo '<form action="'.$_SERVER['PHP_SELF'].'" method="post">';
 	echo '<input type="hidden" name="token" value="'.newToken().'" />';
 	echo '<input type="hidden" name="action" value="save" />';
@@ -199,8 +212,7 @@ if ($action != 'edit')
 echo '<form action="'.$_SERVER['PHP_SELF'].'" method="post">';
 echo '<input type="hidden" name="token" value="'.newToken().'" />';
 
-if ($action == 'edit')
-{
+if ($action == 'edit') {
 	echo '<input type="hidden" name="id" value="'.$object->id.'" />';
 	echo '<input type="hidden" name="action" value="save" />';
 }
@@ -218,43 +230,47 @@ echo '<th>'.$langs->trans('ExpenseReportRestrictive').'</th>';
 echo '<th>&nbsp;</th>';
 echo '</tr>';
 
-foreach ($rules as $rule)
-{
+foreach ($rules as $rule) {
 	echo '<tr class="oddeven">';
 
 	echo '<td>';
-	if ($action == 'edit' && $object->id == $rule->id)
-	{
+	if ($action == 'edit' && $object->id == $rule->id) {
 		$selected = ($object->is_for_all > 0) ? 'A' : ($object->fk_usergroup > 0 ? 'G' : 'U');
 		echo '<div class="float">'.$form->selectarray('apply_to', $tab_apply, $selected, 0).'</div>';
 		echo '<div id="user" class="float">'.$form->select_dolusers($object->fk_user, 'fk_user').'</div>';
 		echo '<div id="group" class="float">'.$form->select_dolgroups($object->fk_usergroup, 'fk_usergroup').'</div>';
 	} else {
-		if ($rule->is_for_all > 0) echo $tab_apply['A'];
-		elseif ($rule->fk_usergroup > 0) echo $tab_apply['G'].' ('.$rule->getGroupLabel().')';
-		elseif ($rule->fk_user > 0) echo $tab_apply['U'].' ('.$rule->getUserName().')';
-	}
-	echo '</td>';
-
-
-	echo '<td>';
-	if ($action == 'edit' && $object->id == $rule->id)
-	{
-		echo $form->selectExpense($object->fk_c_type_fees, 'fk_c_type_fees', 0, 1, 1);
-	} else {
-		if ($rule->fk_c_type_fees == -1) echo $langs->trans('AllExpenseReport');
-		else {
-			$key = getDictvalue(MAIN_DB_PREFIX.'c_type_fees', 'code', $rule->fk_c_type_fees, false, 'id');
-			if ($key != $langs->trans($key)) echo $langs->trans($key);
-			else echo $langs->trans(getDictvalue(MAIN_DB_PREFIX.'c_type_fees', 'label', $rule->fk_c_type_fees, false, 'id')); // TODO check to return trans of 'code'
+		if ($rule->is_for_all > 0) {
+			echo $tab_apply['A'];
+		} elseif ($rule->fk_usergroup > 0) {
+			echo $tab_apply['G'].' ('.$rule->getGroupLabel().')';
+		} elseif ($rule->fk_user > 0) {
+			echo $tab_apply['U'].' ('.$rule->getUserName().')';
 		}
 	}
 	echo '</td>';
 
 
 	echo '<td>';
-	if ($action == 'edit' && $object->id == $rule->id)
-	{
+	if ($action == 'edit' && $object->id == $rule->id) {
+		echo $form->selectExpense($object->fk_c_type_fees, 'fk_c_type_fees', 0, 1, 1);
+	} else {
+		if ($rule->fk_c_type_fees == -1) {
+			echo $langs->trans('AllExpenseReport');
+		} else {
+			$key = getDictvalue(MAIN_DB_PREFIX.'c_type_fees', 'code', $rule->fk_c_type_fees, false, 'id');
+			if ($key != $langs->trans($key)) {
+				echo $langs->trans($key);
+			} else {
+				echo $langs->trans(getDictvalue(MAIN_DB_PREFIX.'c_type_fees', 'label', $rule->fk_c_type_fees, false, 'id')); // TODO check to return trans of 'code'
+			}
+		}
+	}
+	echo '</td>';
+
+
+	echo '<td>';
+	if ($action == 'edit' && $object->id == $rule->id) {
 		echo $form->selectarray('code_expense_rules_type', $tab_rules_type, $object->code_expense_rules_type, 0);
 	} else {
 		echo $tab_rules_type[$rule->code_expense_rules_type];
@@ -263,8 +279,7 @@ foreach ($rules as $rule)
 
 
 	echo '<td>';
-	if ($action == 'edit' && $object->id == $rule->id)
-	{
+	if ($action == 'edit' && $object->id == $rule->id) {
 		print $form->selectDate(strtotime(date('Y-m-d', $object->dates)), 'start', '', '', 0, '', 1, 0);
 	} else {
 		echo dol_print_date($rule->dates, 'day');
@@ -273,8 +288,7 @@ foreach ($rules as $rule)
 
 
 	echo '<td>';
-	if ($action == 'edit' && $object->id == $rule->id)
-	{
+	if ($action == 'edit' && $object->id == $rule->id) {
 		print $form->selectDate(strtotime(date('Y-m-d', $object->datee)), 'end', '', '', 0, '', 1, 0);
 	} else {
 		echo dol_print_date($rule->datee, 'day');
@@ -283,8 +297,7 @@ foreach ($rules as $rule)
 
 
 	echo '<td>';
-	if ($action == 'edit' && $object->id == $rule->id)
-	{
+	if ($action == 'edit' && $object->id == $rule->id) {
 		echo '<input type="text" value="'.price2num($object->amount).'" name="amount" class="amount" />'.$conf->currency;
 	} else {
 		echo price($rule->amount, 0, $langs, 1, -1, -1, $conf->currency);
@@ -293,8 +306,7 @@ foreach ($rules as $rule)
 
 
 	echo '<td>';
-	if ($action == 'edit' && $object->id == $rule->id)
-	{
+	if ($action == 'edit' && $object->id == $rule->id) {
 		echo $form->selectyesno('restrictive', $object->restrictive, 1);
 	} else {
 		echo yn($rule->restrictive, 1, 1);
@@ -303,8 +315,7 @@ foreach ($rules as $rule)
 
 
 	echo '<td class="center">';
-	if ($object->id != $rule->id)
-	{
+	if ($object->id != $rule->id) {
 		echo '<a class="editfielda paddingright paddingleft" href="'.$_SERVER['PHP_SELF'].'?action=edit&token='.newToken().'&id='.$rule->id.'">'.img_edit().'</a>&nbsp;';
 		echo '<a class="paddingright paddingleft" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&id='.$rule->id.'">'.img_delete().'</a>';
 	} else {

From 40d19e6c36f0f15c897c1bd92b5d470d177c8292 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 22:01:26 +0100
Subject: [PATCH 714/888] Fix tooltip on timezone

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

diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index a2dcc434723..725ee66656b 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -225,7 +225,7 @@ if (($thousand != ',' && $thousand != '.') || ($thousand != ' '))
 print '<tr class="oddeven"><td>&nbsp; => price(1234.56)</td><td>'.price(1234.56).'</td></tr>'."\n";
 // Timezone
 $txt = $langs->trans("OSTZ").' (variable system TZ): '.(!empty($_ENV["TZ"]) ? $_ENV["TZ"] : $langs->trans("NotDefined")).'<br>'."\n";
-$txt .= $langs->trans("PHPTZ").' (php.ini date.timezone): '.(ini_get("date.timezone") ?ini_get("date.timezone") : $langs->trans("NotDefined")).''."<br>\n"; // date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
+$txt .= $langs->trans("PHPTZ").' (date_default_timezone_get() / php.ini date.timezone): '.(getServerTimeZoneString()." / ".(ini_get("date.timezone") ? ini_get("date.timezone") : $langs->trans("NotDefined")))."<br>\n"; // date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
 $txt .= $langs->trans("Dolibarr constant MAIN_SERVER_TZ").': '.(empty($conf->global->MAIN_SERVER_TZ) ? $langs->trans("NotDefined") : $conf->global->MAIN_SERVER_TZ);
 print '<tr class="oddeven"><td>'.$langs->trans("CurrentTimeZone").'</td><td>'; // Timezone server PHP
 $a = getServerTimeZoneInt('now');

From 786e2519612532a07fc4a2c396617c526fa2d1d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 30 Dec 2020 22:13:43 +0100
Subject: [PATCH 715/888] remove deprecated

---
 htdocs/admin/expensereport.php | 180 +++++++++++++++------------------
 1 file changed, 82 insertions(+), 98 deletions(-)

diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index a93f5c3c608..389766a47ae 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -37,7 +37,9 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'errors', 'trips', 'other'));
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
@@ -52,51 +54,47 @@ $type = 'expensereport';
 
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
-if ($action == 'updateMask')
-{
+if ($action == 'updateMask') {
 	$maskconst = GETPOST('maskconst', 'alpha');
 	$maskvalue = GETPOST('maskvalue', 'alpha');
-	if ($maskconst) $res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
+	if ($maskconst) {
+		$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
+	}
 
-	if (!$res > 0) $error++;
+	if (!$res > 0) {
+		$error++;
+	}
 
- 	if (!$error)
-	{
+	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} elseif ($action == 'specimen') // For fiche inter
-{
+} elseif ($action == 'specimen') { // For fiche inter
 	$modele = GETPOST('module', 'alpha');
 
 	$inter = new ExpenseReport($db);
 	$inter->initAsSpecimen();
 	$inter->status = 0; // Force statut draft to show watermark
-	$inter->fk_statut = 0; // Force statut draft to show watermark
 
 	// Search template files
 	$file = ''; $classname = ''; $filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-	foreach ($dirmodels as $reldir)
-	{
+	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/expensereport/doc/pdf_".$modele.".modules.php", 0);
-		if (file_exists($file))
-		{
+		if (file_exists($file)) {
 			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound)
-	{
+	if ($filefound) {
 		require_once $file;
 
 		$module = new $classname($db);
 
-		if ($module->write_file($inter, $langs) > 0)
-		{
+		if ($module->write_file($inter, $langs) > 0) {
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=expensereport&file=SPECIMEN.pdf");
 			return;
 		} else {
@@ -107,30 +105,22 @@ if ($action == 'updateMask')
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
-}
-
-// Activate a model
-elseif ($action == 'set')
-{
+} elseif ($action == 'set') {
+	// Activate a model
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-	if ($ret > 0 && empty($conf->global->EXPENSEREPORT_ADDON_PDF))
-	{
+	if ($ret > 0 && empty($conf->global->EXPENSEREPORT_ADDON_PDF)) {
 		dolibarr_set_const($db, 'EXPENSEREPORT_ADDON_PDF', $value, 'chaine', 0, '', $conf->entity);
 	}
-} elseif ($action == 'del')
-{
+} elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
-		if ($conf->global->EXPENSEREPORT_ADDON_PDF == "$value") dolibarr_del_const($db, 'EXPENSEREPORT_ADDON_PDF', $conf->entity);
+	if ($ret > 0) {
+		if ($conf->global->EXPENSEREPORT_ADDON_PDF == "$value") {
+			dolibarr_del_const($db, 'EXPENSEREPORT_ADDON_PDF', $conf->entity);
+		}
 	}
-}
-
-// Set default model
-elseif ($action == 'setdoc')
-{
-	if (dolibarr_set_const($db, "EXPENSEREPORT_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
-	{
+} elseif ($action == 'setdoc') {
+	// Set default model
+	if (dolibarr_set_const($db, "EXPENSEREPORT_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity)) {
 		// La constante qui a ete lue en avant du nouveau set
 		// on passe donc par une variable pour avoir un affichage coherent
 		$conf->global->EXPENSEREPORT_ADDON_PDF = $value;
@@ -138,18 +128,15 @@ elseif ($action == 'setdoc')
 
 	// On active le modele
 	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
+	if ($ret > 0) {
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-} elseif ($action == 'setmod')
-{
+} elseif ($action == 'setmod') {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
 	dolibarr_set_const($db, "EXPENSEREPORT_ADDON", $value, 'chaine', 0, '', $conf->entity);
-} elseif ($action == 'setoptions')
-{
+} elseif ($action == 'setoptions') {
 	$db->begin();
 
 	$freetext = GETPOST('EXPENSEREPORT_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
@@ -158,10 +145,11 @@ elseif ($action == 'setdoc')
 	$draft = GETPOST('EXPENSEREPORT_DRAFT_WATERMARK', 'alpha');
 	$res2 = dolibarr_set_const($db, "EXPENSEREPORT_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
 
-	if (!$res1 > 0 || !$res2 > 0) $error++;
+	if (!$res1 > 0 || !$res2 > 0) {
+		$error++;
+	}
 
- 	if (!$error)
-	{
+	if (!$error) {
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -206,19 +194,14 @@ print '</tr>'."\n";
 
 clearstatcache();
 
-foreach ($dirmodels as $reldir)
-{
+foreach ($dirmodels as $reldir) {
 	$dir = dol_buildpath($reldir."core/modules/expensereport/");
 
-	if (is_dir($dir))
-	{
+	if (is_dir($dir)) {
 		$handle = opendir($dir);
-		if (is_resource($handle))
-		{
-			while (($file = readdir($handle)) !== false)
-			{
-				if (substr($file, 0, 18) == 'mod_expensereport_' && substr($file, dol_strlen($file) - 3, 3) == 'php')
-				{
+		if (is_resource($handle)) {
+			while (($file = readdir($handle)) !== false) {
+				if (substr($file, 0, 18) == 'mod_expensereport_' && substr($file, dol_strlen($file) - 3, 3) == 'php') {
 					$file = substr($file, 0, dol_strlen($file) - 4);
 
 					require_once $dir.$file.'.php';
@@ -226,11 +209,14 @@ foreach ($dirmodels as $reldir)
 					$module = new $file($db);
 
 					// Show modules according to features level
-					if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+					if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+						continue;
+					}
+					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+						continue;
+					}
 
-					if ($module->isEnabled())
-					{
+					if ($module->isEnabled()) {
 						print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
 						print $module->info();
 						print '</td>';
@@ -241,13 +227,15 @@ foreach ($dirmodels as $reldir)
 						if (preg_match('/^Error/', $tmp)) {
 							$langs->load("errors");
 							print '<div class="error">'.$langs->trans($tmp).'</div>';
-						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-						else print $tmp;
+						} elseif ($tmp == 'NotConfigured') {
+							print $langs->trans($tmp);
+						} else {
+							print $tmp;
+						}
 						print '</td>'."\n";
 
 						print '<td class="center">';
-						if ($conf->global->EXPENSEREPORT_ADDON == $file)
-						{
+						if ($conf->global->EXPENSEREPORT_ADDON == $file) {
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						} else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
@@ -266,8 +254,9 @@ foreach ($dirmodels as $reldir)
 						if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
 							$htmltooltip .= ''.$langs->trans("NextValue").': ';
 							if ($nextval) {
-								if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+								if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured') {
 									$nextval = $langs->trans($nextval);
+								}
 								$htmltooltip .= $nextval.'<br>';
 							} else {
 								$htmltooltip .= $langs->trans($module->error).'<br>';
@@ -302,12 +291,10 @@ $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
 $sql .= " WHERE type = '".$db->escape($type)."'";
 $sql .= " AND entity = ".$conf->entity;
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$i = 0;
 	$num_rows = $db->num_rows($resql);
-	while ($i < $num_rows)
-	{
+	while ($i < $num_rows) {
 		$array = $db->fetch_array($resql);
 		array_push($def, $array[0]);
 		$i++;
@@ -328,28 +315,21 @@ print "</tr>\n";
 
 clearstatcache();
 
-foreach ($dirmodels as $reldir)
-{
+foreach ($dirmodels as $reldir) {
 	$dir = dol_buildpath($reldir."core/modules/expensereport/doc");
 
-	if (is_dir($dir))
-	{
+	if (is_dir($dir)) {
 		$handle = opendir($dir);
-		if (is_resource($handle))
-		{
-			while (($file = readdir($handle)) !== false)
-			{
+		if (is_resource($handle)) {
+			while (($file = readdir($handle)) !== false) {
 				$filelist[] = $file;
 			}
 			closedir($handle);
 			arsort($filelist);
 
-			foreach ($filelist as $file)
-			{
-				if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-				{
-					if (file_exists($dir.'/'.$file))
-					{
+			foreach ($filelist as $file) {
+				if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file)) {
+					if (file_exists($dir.'/'.$file)) {
 						$name = substr($file, 4, dol_strlen($file) - 16);
 						$classname = substr($file, 0, dol_strlen($file) - 12);
 
@@ -357,21 +337,26 @@ foreach ($dirmodels as $reldir)
 						$module = new $classname($db);
 
 						$modulequalified = 1;
-						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
-						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							$modulequalified = 0;
+						}
+						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							$modulequalified = 0;
+						}
 
-						if ($modulequalified)
-						{
+						if ($modulequalified) {
 							print '<tr class="oddeven"><td width="100">';
 							print (empty($module->name) ? $name : $module->name);
 							print "</td><td>\n";
-							if (method_exists($module, 'info')) print $module->info($langs);
-							else print $module->description;
+							if (method_exists($module, 'info')) {
+								print $module->info($langs);
+							} else {
+								print $module->description;
+							}
 							print '</td>';
 
 							// Active
-							if (in_array($name, $def))
-							{
+							if (in_array($name, $def)) {
 								print '<td class="center">'."\n";
 								print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
 								print img_picto($langs->trans("Enabled"), 'switch_on');
@@ -385,8 +370,7 @@ foreach ($dirmodels as $reldir)
 
 							// Default
 							print '<td class="center">';
-							if ($conf->global->EXPENSEREPORT_ADDON_PDF == "$name")
-							{
+							if ($conf->global->EXPENSEREPORT_ADDON_PDF == "$name") {
 								print img_picto($langs->trans("Default"), 'on');
 							} else {
 								print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
@@ -409,8 +393,7 @@ foreach ($dirmodels as $reldir)
 
 							// Preview
 							print '<td class="center">';
-							if ($module->type == 'pdf')
-							{
+							if ($module->type == 'pdf') {
 								print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 							} else {
 								print img_object($langs->trans("PreviewNotAvailable"), 'generic');
@@ -451,14 +434,15 @@ print "</tr>\n";
 $substitutionarray = pdf_getSubstitutionArray($langs, null, null, 2);
 $substitutionarray['__(AnyTranslationKey)__'] = $langs->trans("Translation");
 $htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
-foreach ($substitutionarray as $key => $val)	$htmltext .= $key.'<br>';
+foreach ($substitutionarray as $key => $val) {
+	$htmltext .= $key.'<br>';
+}
 $htmltext .= '</i>';
 
 print '<tr class="oddeven"><td colspan="2">';
 print $form->textwithpicto($langs->trans("FreeLegalTextOnExpenseReports"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename = 'EXPENSEREPORT_FREE_TEXT';
-if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
-{
+if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
 	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 } else {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

From f5641f8068d1a9f594d0e71926c61b437a32c0c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 30 Dec 2020 22:15:34 +0100
Subject: [PATCH 716/888] remove deprecated

---
 htdocs/admin/expensereport.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index 389766a47ae..61688e18515 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -70,12 +70,12 @@ if ($action == 'updateMask') {
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} elseif ($action == 'specimen') { // For fiche inter
+} elseif ($action == 'specimen') { // For fiche expensereport
 	$modele = GETPOST('module', 'alpha');
 
-	$inter = new ExpenseReport($db);
-	$inter->initAsSpecimen();
-	$inter->status = 0; // Force statut draft to show watermark
+	$expensespecimen = new ExpenseReport($db);
+	$expensespecimen->initAsSpecimen();
+	$expensespecimen->status = 0; // Force statut draft to show watermark
 
 	// Search template files
 	$file = ''; $classname = ''; $filefound = 0;
@@ -94,7 +94,7 @@ if ($action == 'updateMask') {
 
 		$module = new $classname($db);
 
-		if ($module->write_file($inter, $langs) > 0) {
+		if ($module->write_file($expensespecimen, $langs) > 0) {
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=expensereport&file=SPECIMEN.pdf");
 			return;
 		} else {
@@ -278,7 +278,7 @@ foreach ($dirmodels as $reldir) {
 print "</table><br>\n";
 
 /*
- *  Documents models for Interventions
+ *  Documents models for ExpenseReport
  */
 
 print load_fiche_titre($langs->trans("TemplatePDFExpenseReports"), '', '');

From 65edc377c3515cbea7a40d27e4d69d9e8773e39e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 22:53:21 +0100
Subject: [PATCH 717/888] FIX Visible date of payment

---
 htdocs/compta/facture/card.php                  | 10 +++++++++-
 htdocs/compta/paiement/class/paiement.class.php | 11 ++++++++++-
 htdocs/takepos/invoice.php                      |  6 +++---
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index aa07de4867e..0970aff1b45 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4848,7 +4848,15 @@ elseif ($id > 0 || !empty($ref))
 				print '<tr class="oddeven"><td>';
 				print $paymentstatic->getNomUrl(1);
 				print '</td>';
-				print '<td>'.dol_print_date($db->jdate($objp->dp), 'dayhour').'</td>';
+				print '<td>';
+				$dateofpayment = $db->jdate($objp->dp);
+				$tmparray = dol_getdate($dateofpayment);
+				if ($tmparray['seconds'] == 0 && $tmparray['minutes'] == 0 && ($tmparray['hours'] == 0 || $tmparray['hours'] == 12)) {	// We set hours to 0:00 or 12:00 because we don't know it
+					print dol_print_date($dateofpayment, 'day');
+				} else {	// Hours was set to real date of payment (special case for POS for example)
+					print dol_print_date($dateofpayment, 'dayhour', 'tzuser');
+				}
+				print '</td>';
 				$label = ($langs->trans("PaymentType".$objp->payment_code) != ("PaymentType".$objp->payment_code)) ? $langs->trans("PaymentType".$objp->payment_code) : $objp->payment_label;
 				print '<td>'.$label.' '.$objp->num_payment.'</td>';
 				if (!empty($conf->banque->enabled))
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 7a759dde543..4583f0376ae 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -1201,7 +1201,16 @@ class Paiement extends CommonObject
 		$result = '';
         $label = '<u>'.$langs->trans("ShowPayment").'</u><br>';
         $label .= '<strong>'.$langs->trans("Ref").':</strong> '.$this->ref;
-        if ($this->datepaye ? $this->datepaye : $this->date) $label .= '<br><strong>'.$langs->trans("Date").':</strong> '.dol_print_date($this->datepaye ? $this->datepaye : $this->date, 'dayhour');
+        $dateofpayment = ($this->datepaye ? $this->datepaye : $this->date);
+        if ($dateofpayment) {
+        	$label .= '<br><strong>'.$langs->trans("Date").':</strong> ';
+        	$tmparray = dol_getdate($dateofpayment);
+        	if ($tmparray['seconds'] == 0 && $tmparray['minutes'] == 0 && ($tmparray['hours'] == 0 || $tmparray['hours'] == 12)) {	// We set hours to 0:00 or 12:00 because we don't know it
+        		$label .= dol_print_date($dateofpayment, 'day');
+        	} else {	// Hours was set to real date of payment (special case for POS for example)
+        		$label .= dol_print_date($dateofpayment, 'dayhour', 'tzuser');
+        	}
+        }
         if ($mode == 'withlistofinvoices')
         {
             $arraybill = $this->getBillsArray();
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 1022308c308..0909f1b3cca 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -158,7 +158,7 @@ if ($action == 'valid' && $user->rights->facture->creer)
 	if ($invoice->total_ttc < 0) {
 		$invoice->type = $invoice::TYPE_CREDIT_NOTE;
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture WHERE ";
-		$sql .= "fk_soc = '".$invoice->socid."' ";
+		$sql .= "fk_soc = ".((int) $invoice->socid)." ";
 		$sql .= "AND type <> ".Facture::TYPE_CREDIT_NOTE." ";
 		$sql .= "AND fk_statut >= ".$invoice::STATUS_VALIDATED." ";
 		$sql .= "ORDER BY rowid DESC";
@@ -763,13 +763,13 @@ $( document ).ready(function() {
 	if ($resql) {
 		while ($obj = $db->fetch_object($resql)) {
 			echo '$("#customerandsales").append(\'';
-			echo '<a class="valignmiddle" title="'.dol_escape_js($langs->trans("SaleStartedAt", dol_print_date($db->jdate($obj->datec), '%H:%M'))).'" onclick="place=\\\'';
+			echo '<a class="valignmiddle" title="'.dol_escape_js($langs->trans("SaleStartedAt", dol_print_date($db->jdate($obj->datec), '%H:%M', 'tzuser'))).'" onclick="place=\\\'';
 			$num_sale = str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $obj->ref));
 			echo $num_sale;
 			if (str_replace("-", "", $num_sale) > $max_sale) $max_sale = str_replace("-", "", $num_sale);
 			echo '\\\';Refresh();">';
 			if ($placeid == $obj->rowid) echo "<b>";
-			echo dol_print_date($db->jdate($obj->datec), '%H:%M');
+			echo dol_print_date($db->jdate($obj->datec), '%H:%M', 'tzuser');
 			if ($placeid == $obj->rowid) echo "</b>";
 			echo '</a>\');';
 		}

From 1eb88333569da70e46f160ab68a9e80a2b1f2124 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 23:39:51 +0100
Subject: [PATCH 718/888] Fix total when no data

---
 .../accountancy/bookkeeping/listbyaccount.php | 68 ++++++++++---------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 0b063adb1ff..4847dfd2e9a 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -749,40 +749,42 @@ while ($i < min($num, $limit))
 	$i++;
 }
 
-// Show sub-total of last shown account
-if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
-    $colnumber = 3;
-    $colnumberend = 7;
-} else {
-    $colnumber = 4;
-    $colnumberend = 7;
+if ($num > 0) {
+	// Show sub-total of last shown account
+	if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
+	    $colnumber = 3;
+	    $colnumberend = 7;
+	} else {
+	    $colnumber = 4;
+	    $colnumberend = 7;
+	}
+	$colspan = $totalarray['nbfield'] - $colnumber;
+	$colspanend = $totalarray['nbfield'] - $colnumberend;
+	print '<tr class="liste_total">';
+	print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.$accountg.':</td>';
+	print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
+	print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
+	print '<td colspan="'.$colspanend.'"></td>';
+	print '</tr>';
+	// Show balance of last shown account
+	$balance = $sous_total_debit - $sous_total_credit;
+	print '<tr class="liste_total">';
+	print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
+	if ($balance > 0)
+	{
+		print '<td class="nowraponall right">';
+		print price($sous_total_debit - $sous_total_credit);
+		print '</td>';
+		print '<td></td>';
+	} else {
+		print '<td></td>';
+		print '<td class="nowraponall right">';
+		print price($sous_total_credit - $sous_total_debit);
+		print '</td>';
+	}
+	print '<td colspan="'.$colspanend.'"></td>';
+	print '</tr>';
 }
-$colspan = $totalarray['nbfield'] - $colnumber;
-$colspanend = $totalarray['nbfield'] - $colnumberend;
-print '<tr class="liste_total">';
-print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.$accountg.':</td>';
-print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
-print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
-print '<td colspan="'.$colspanend.'"></td>';
-print '</tr>';
-// Show balance of last shown account
-$balance = $sous_total_debit - $sous_total_credit;
-print '<tr class="liste_total">';
-print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
-if ($balance > 0)
-{
-	print '<td class="nowraponall right">';
-	print price($sous_total_debit - $sous_total_credit);
-	print '</td>';
-	print '<td></td>';
-} else {
-	print '<td></td>';
-	print '<td class="nowraponall right">';
-	print price($sous_total_credit - $sous_total_debit);
-	print '</td>';
-}
-print '<td colspan="'.$colspanend.'"></td>';
-print '</tr>';
 
 // Show total line
 include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';

From e17d4b8220e2e9e5f1aa27cc4421f9d9cad31706 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 23:51:55 +0100
Subject: [PATCH 719/888] Fix total when no data

---
 .../bookkeeping/listbysubaccount.php          | 68 ++++++++++---------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/listbysubaccount.php b/htdocs/accountancy/bookkeeping/listbysubaccount.php
index 2bdf5e11d09..abbf5df60e7 100644
--- a/htdocs/accountancy/bookkeeping/listbysubaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbysubaccount.php
@@ -761,40 +761,42 @@ while ($i < min($num, $limit))
 	$i++;
 }
 
-// Show sub-total of last shown account
-if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
-    $colnumber = 3;
-    $colnumberend = 7;
-} else {
-    $colnumber = 4;
-    $colnumberend = 7;
+if ($num > 0) {
+	// Show sub-total of last shown account
+	if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
+	    $colnumber = 3;
+	    $colnumberend = 7;
+	} else {
+	    $colnumber = 4;
+	    $colnumberend = 7;
+	}
+	$colspan = $totalarray['nbfield'] - $colnumber;
+	$colspanend = $totalarray['nbfield'] - $colnumberend;
+	print '<tr class="liste_total">';
+	print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.$accountg.':</td>';
+	print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
+	print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
+	print '<td colspan="'.$colspanend.'"></td>';
+	print '</tr>';
+	// Show balance of last shown account
+	$balance = $sous_total_debit - $sous_total_credit;
+	print '<tr class="liste_total">';
+	print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
+	if ($balance > 0)
+	{
+		print '<td class="nowraponall right">';
+		print price($sous_total_debit - $sous_total_credit);
+		print '</td>';
+		print '<td></td>';
+	} else {
+		print '<td></td>';
+		print '<td class="nowraponall right">';
+		print price($sous_total_credit - $sous_total_debit);
+		print '</td>';
+	}
+	print '<td colspan="'.$colspanend.'"></td>';
+	print '</tr>';
 }
-$colspan = $totalarray['nbfield'] - $colnumber;
-$colspanend = $totalarray['nbfield'] - $colnumberend;
-print '<tr class="liste_total">';
-print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.$accountg.':</td>';
-print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
-print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
-print '<td colspan="'.$colspanend.'"></td>';
-print '</tr>';
-// Show balance of last shown account
-$balance = $sous_total_debit - $sous_total_credit;
-print '<tr class="liste_total">';
-print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
-if ($balance > 0)
-{
-	print '<td class="nowraponall right">';
-	print price($sous_total_debit - $sous_total_credit);
-	print '</td>';
-	print '<td></td>';
-} else {
-	print '<td></td>';
-	print '<td class="nowraponall right">';
-	print price($sous_total_credit - $sous_total_debit);
-	print '</td>';
-}
-print '<td colspan="'.$colspanend.'"></td>';
-print '</tr>';
 
 // Show total line
 include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';

From 46160614b84861e3a62b2f17e4f21f8f84c2f35a Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 31 Dec 2020 03:30:18 +0100
Subject: [PATCH 720/888] Typo

---
 htdocs/adherents/card.php | 2 +-
 htdocs/admin/modules.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 418c5cc5674..94904d877e7 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1761,7 +1761,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			 if ($linktoelem) print ($somethingshown?'':'<br>').$linktoelem;
 			 */
 
-			// Shon online payment link
+			// Show online payment link
 			$useonlinepayment = (!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled));
 
 			if ($useonlinepayment) {
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 4316130e739..472777ee898 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -1137,7 +1137,7 @@ if ($mode == 'deploy') {
 
 			print '<input class="flat minwidth400" type="file" name="fileinstall" id="fileinstall"> ';
 
-			print '<input type="submit" name="send" value="'.dol_escape_htmltag($langs->trans("Send")).'" class="button">';
+			print '<input type="submit" name="send" value="'.dol_escape_htmltag($langs->trans("Upload")).'" class="button">';
 
 			if (!empty($conf->global->MAIN_UPLOAD_DOC)) {
 				if ($user->admin) {

From e187e77acbc0697a5ca27fa8cc6875b083d6bacb Mon Sep 17 00:00:00 2001
From: jcp <jcprieto@virtual20.com>
Date: Thu, 31 Dec 2020 10:12:03 +0100
Subject: [PATCH 721/888] ICS and ICS_transfer hide if module not enabled

---
 htdocs/compta/bank/card.php | 38 ++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 469165b4b6e..da02a19129f 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -95,8 +95,8 @@ if ($action == 'add')
 	$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
 	$object->owner_address   = trim(GETPOST("owner_address", 'nohtml'));
 	
-	$object->ics             = trim(GETPOST("ics", 'alpha');
-	$object->ics_transfer    = trim(GETPOST("ics_transfer", 'alpha');
+	$object->ics             = trim(GETPOST("ics", 'alpha'));
+	$object->ics_transfer    = trim(GETPOST("ics_transfer", 'alpha'));
 
 	$account_number = GETPOST('account_number', 'alphanohtml');
 	if (empty($account_number) || $account_number == '-1')
@@ -199,8 +199,8 @@ if ($action == 'update')
 	$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
 	$object->owner_address   = trim(GETPOST("owner_address", 'nohtml'));
 	
-	$object->ics             = trim(GETPOST("ics", 'alpha');
-	$object->ics_transfer    = trim(GETPOST("ics_transfer", 'alpha');
+	$object->ics             = trim(GETPOST("ics", 'alpha'));
+	$object->ics_transfer    = trim(GETPOST("ics_transfer", 'alpha'));
 
 	$account_number = GETPOST('account_number', 'alpha');
 	if (empty($account_number) || $account_number == '-1')
@@ -737,13 +737,17 @@ if ($action == 'create')
 			}
 			print '</td></tr>';
 			
-			print '<tr><td>'.$langs->trans("ICS").'</td>';
-			print '<td>'.$object->ics.'</td>';
-			print '</tr>';
+			if($conf->prelevement->enabled){
+				print '<tr><td>'.$langs->trans("ICS").'</td>';
+				print '<td>'.$object->ics.'</td>';
+				print '</tr>';
+			}
 			
-			print '<tr><td>'.$langs->trans("ICSTransfer").'</td>';
-			print '<td>'.$object->ics_transfer.'</td>';
-			print '</tr>';
+			if($conf->paymentbybanktransfer->enabled){
+				print '<tr><td>'.$langs->trans("ICSTransfer").'</td>';
+				print '<td>'.$object->ics_transfer.'</td>';
+				print '</tr>';
+			}
 
 			print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
 			print nl2br($object->domiciliation);
@@ -1025,12 +1029,16 @@ if ($action == 'create')
 			print '<tr><td>'.$langs->trans($bickey).'</td>';
 			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="bic" value="'.$object->bic.'"></td></tr>';
 			
-			print '<tr><td>'.$langs->trans("ICS").'</td>';
-			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="32" type="text" class="flat" name="ics" value="'.$object->ics.'"></td></tr>';
-			
-			print '<tr><td>'.$langs->trans("ICSTransfer").'</td>';
-			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="32" type="text" class="flat" name="ics_transfer" value="'.$object->ics_transfer.'"></td></tr>';
+			if($conf->prelevement->enabled){
+				print '<tr><td>'.$langs->trans("ICS").'</td>';
+				print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="32" type="text" class="flat" name="ics" value="'.$object->ics.'"></td></tr>';
+			}
 			
+			if($conf->paymentbybanktransfer->enabled){
+				print '<tr><td>'.$langs->trans("ICSTransfer").'</td>';
+				print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="32" type="text" class="flat" name="ics_transfer" value="'.$object->ics_transfer.'"></td></tr>';
+			}
+				
 			print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
 			print '<textarea class="flat quatrevingtpercent" name="domiciliation" rows="'.ROWS_2.'">';
 			print $object->domiciliation;

From af82bf2fee5aa96e7d822d11c1b0292a8829c4b2 Mon Sep 17 00:00:00 2001
From: JC Prieto <jcprieto@virtual20.com>
Date: Thu, 31 Dec 2020 10:47:30 +0100
Subject: [PATCH 722/888] Update create.php

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

diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 0d29c578a8e..9b80017186a 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -49,7 +49,7 @@ $type = GETPOST('type', 'aZ09');
 $action = GETPOST('action', 'aZ09');
 $mode = GETPOST('mode', 'alpha') ?GETPOST('mode', 'alpha') : 'real';
 $format = GETPOST('format', 'aZ09');
-$id_bankaccount = GETPOST ( 'id_bankaccount','int' );
+$id_bankaccount = GETPOST ('id_bankaccount','int');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1

From 327ec211c4e08fddb5df9a45e477275572689a58 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 31 Dec 2020 09:49:27 +0000
Subject: [PATCH 723/888] Fixing style errors.

---
 htdocs/admin/paymentbybanktransfer.php        |  4 ++--
 htdocs/admin/prelevement.php                  |  5 ++---
 htdocs/compta/bank/card.php                   | 22 +++++++++----------
 htdocs/compta/bank/class/account.class.php    |  8 +++----
 .../class/bonprelevement.class.php            |  2 +-
 htdocs/compta/prelevement/create.php          | 14 +++++-------
 htdocs/core/lib/prelevement.lib.php           |  4 ++--
 .../bank/doc/pdf_sepamandate.modules.php      |  2 +-
 8 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/htdocs/admin/paymentbybanktransfer.php b/htdocs/admin/paymentbybanktransfer.php
index 5449e927a4f..7bbf72e83af 100644
--- a/htdocs/admin/paymentbybanktransfer.php
+++ b/htdocs/admin/paymentbybanktransfer.php
@@ -71,10 +71,10 @@ if ($action == "set")
         if (! $res > 0) $error++;
         */
 	} else $error++;
-/* Moved to account
+	/* Moved to account
 	$res = dolibarr_set_const($db, "PAYMENTBYBANKTRANSFER_ICS", GETPOST("PAYMENTBYBANKTRANSFER_ICS"), 'chaine', 0, '', $conf->entity);
 	if (!$res > 0) $error++;
-*/
+	*/
 	if (GETPOST("PAYMENTBYBANKTRANSFER_USER") > 0)
 	{
 		$res = dolibarr_set_const($db, "PAYMENTBYBANKTRANSFER_USER", GETPOST("PAYMENTBYBANKTRANSFER_USER"), 'chaine', 0, '', $conf->entity);
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index 601cefc1dd2..8c713385892 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -70,14 +70,13 @@ if ($action == "set")
         $res = dolibarr_set_const($db, "PRELEVEMENT_RAISON_SOCIALE", $account->proprio,'chaine',0,'',$conf->entity);
         if (! $res > 0) $error++;
         */
-
 	} else $error++;
 
-/* Moved to account
+	/* Moved to account
 
 	$res = dolibarr_set_const($db, "PRELEVEMENT_ICS", GETPOST("PRELEVEMENT_ICS"), 'chaine', 0, '', $conf->entity);
 	if (!$res > 0) $error++;
-*/
+	*/
 	if (GETPOST("PRELEVEMENT_USER") > 0)
 	{
 		$res = dolibarr_set_const($db, "PRELEVEMENT_USER", GETPOST("PRELEVEMENT_USER"), 'chaine', 0, '', $conf->entity);
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index da02a19129f..aa17ad3620e 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -94,7 +94,7 @@ if ($action == 'add')
 
 	$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
 	$object->owner_address   = trim(GETPOST("owner_address", 'nohtml'));
-	
+
 	$object->ics             = trim(GETPOST("ics", 'alpha'));
 	$object->ics_transfer    = trim(GETPOST("ics_transfer", 'alpha'));
 
@@ -198,7 +198,7 @@ if ($action == 'update')
 
 	$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
 	$object->owner_address   = trim(GETPOST("owner_address", 'nohtml'));
-	
+
 	$object->ics             = trim(GETPOST("ics", 'alpha'));
 	$object->ics_transfer    = trim(GETPOST("ics_transfer", 'alpha'));
 
@@ -736,14 +736,14 @@ if ($action == 'create')
 				}
 			}
 			print '</td></tr>';
-			
-			if($conf->prelevement->enabled){
+
+			if ($conf->prelevement->enabled){
 				print '<tr><td>'.$langs->trans("ICS").'</td>';
 				print '<td>'.$object->ics.'</td>';
 				print '</tr>';
 			}
-			
-			if($conf->paymentbybanktransfer->enabled){
+
+			if ($conf->paymentbybanktransfer->enabled){
 				print '<tr><td>'.$langs->trans("ICSTransfer").'</td>';
 				print '<td>'.$object->ics_transfer.'</td>';
 				print '</tr>';
@@ -1028,17 +1028,17 @@ if ($action == 'create')
 
 			print '<tr><td>'.$langs->trans($bickey).'</td>';
 			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="bic" value="'.$object->bic.'"></td></tr>';
-			
-			if($conf->prelevement->enabled){
+
+			if ($conf->prelevement->enabled){
 				print '<tr><td>'.$langs->trans("ICS").'</td>';
 				print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="32" type="text" class="flat" name="ics" value="'.$object->ics.'"></td></tr>';
 			}
-			
-			if($conf->paymentbybanktransfer->enabled){
+
+			if ($conf->paymentbybanktransfer->enabled){
 				print '<tr><td>'.$langs->trans("ICSTransfer").'</td>';
 				print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="32" type="text" class="flat" name="ics_transfer" value="'.$object->ics_transfer.'"></td></tr>';
 			}
-				
+
 			print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
 			print '<textarea class="flat quatrevingtpercent" name="domiciliation" rows="'.ROWS_2.'">';
 			print $object->domiciliation;
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index ea6491c7636..bb7daa81a35 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -214,19 +214,19 @@ class Account extends CommonObject
 	 * @var int
 	 */
 	public $date_solde;
-	
+
 	/**
 	 * Creditor Identifier CI. Some banks use different ICS for direct debit and bank tranfer
 	 * @var string
 	 */
 	public $ics;
-	
+
 	/**
 	 * Creditor Identifier for Bank Transfer.
 	 * @var string
 	 */
 	public $ics_transfer;
-	
+
 
 
 	/**
@@ -1003,7 +1003,7 @@ class Account extends CommonObject
 
 				$this->date_creation  = $this->db->jdate($obj->date_creation);
 				$this->date_update    = $this->db->jdate($obj->date_update);
-				
+
 				$this->ics           = $obj->ics;
 				$this->ics_transfer  = $obj->ics_transfer;
 
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 2fff6336985..877e055972e 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1155,7 +1155,7 @@ class BonPrelevement extends CommonObject
 						$this->emetteur_iban               = $account->iban;
 						$this->emetteur_bic                = $account->bic;
 
-						$this->emetteur_ics                = ($type == 'bank-transfer' ? $account->ics_transfer : $account->ics); 
+						$this->emetteur_ics                = ($type == 'bank-transfer' ? $account->ics_transfer : $account->ics);
 
 						$this->raison_sociale              = $account->proprio;
 					}
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 9b80017186a..26b91a1e100 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -49,7 +49,7 @@ $type = GETPOST('type', 'aZ09');
 $action = GETPOST('action', 'aZ09');
 $mode = GETPOST('mode', 'alpha') ?GETPOST('mode', 'alpha') : 'real';
 $format = GETPOST('format', 'aZ09');
-$id_bankaccount = GETPOST ('id_bankaccount','int');
+$id_bankaccount = GETPOST('id_bankaccount', 'int');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
@@ -79,12 +79,11 @@ if (empty($reshook))
 	if ($action == 'create')
 	{
 		$default_account=($type == 'bank-transfer' ? 'PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT' : 'PRELEVEMENT_ID_BANKACCOUNT');
-		
-		if($id_bankaccount != $conf->global->{$default_account}){
+
+		if ($id_bankaccount != $conf->global->{$default_account}){
 			$res = dolibarr_set_const($db, $default_account, $id_bankaccount, 'chaine', 0, '', $conf->entity);	//Set as default
-			
 		}
-		
+
 		require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 		$bank = new Account($db);
 		$bank->fetch($conf->global->{$default_account});
@@ -93,7 +92,7 @@ if (empty($reshook))
 			header("Location: ".DOL_URL_ROOT.'/compta/prelevement/create.php');
 			exit;
 		}
-			
+
 
 		$delayindays = 0;
 		if ($type != 'bank-transfer') {
@@ -207,12 +206,11 @@ print '<form action="'.$_SERVER['PHP_SELF'].'?action=create" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="type" value="'.$type.'">';
 if ($nb) {
-
     if ($pricetowithdraw) {
     	print $langs->trans('BankToReceiveWithdraw').': ';
     	$form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT, 'id_bankaccount', 0, "courant=1");
     	print ' - ';
-    	
+
         print $langs->trans('ExecutionDate').' ';
         $datere = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
         print $form->selectDate($datere, 're');
diff --git a/htdocs/core/lib/prelevement.lib.php b/htdocs/core/lib/prelevement.lib.php
index ac3c7b8b0fd..75bf914b964 100644
--- a/htdocs/core/lib/prelevement.lib.php
+++ b/htdocs/core/lib/prelevement.lib.php
@@ -82,14 +82,14 @@ function prelevement_prepare_head(BonPrelevement $object)
  *
  *	@return    	int		-1 if ko 0 if ok
  */
-function prelevement_check_config($type='direct-debit')
+function prelevement_check_config($type = 'direct-debit')
 {
 	global $conf, $db;
 	if ($type == 'bank-transfer'){
 		if (empty($conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT)) return -1;
 		//if (empty($conf->global->PRELEVEMENT_ICS)) return -1;
 		if (empty($conf->global->PAYMENTBYBANKTRANSFER_USER)) return -1;
-	}else{
+	}else {
 		if (empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) return -1;
 		//if (empty($conf->global->PRELEVEMENT_ICS)) return -1;
 		if (empty($conf->global->PRELEVEMENT_USER)) return -1;
diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index 17f1252925a..2b8987958f4 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -229,7 +229,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$posY += 2;
 				$pdf->SetXY($this->marge_gauche, $posY);
 				$ics = '';
-				if (!empty($conf->global->PRELEVEMENT_ICS)) $ics = $conf->global->PRELEVEMENT_ICS;	
+				if (!empty($conf->global->PRELEVEMENT_ICS)) $ics = $conf->global->PRELEVEMENT_ICS;
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("CreditorIdentifier").' ('.$outputlangs->transnoentitiesnoconv("ICS").') : '.$ics, 0, 'L');
 
 				$posY = $pdf->GetY();

From 9e8c6eb0a107da911083bdce8f25b68da4e5fc0b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Dec 2020 15:05:17 +0100
Subject: [PATCH 724/888] FIX #15849

---
 htdocs/core/tpl/objectline_create.tpl.php | 4 ++--
 htdocs/product/fournisseurs.php           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index f028c00d704..1c526f225aa 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -386,10 +386,10 @@ if ($nolinesbefore) {
 			<td class="nobottom margininfos linecolmargin right">
 				<!-- For predef product -->
 				<?php if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) { ?>
-					<select id="fournprice_predef" name="fournprice_predef" class="flat minwidth75imp" style="display: none;"></select>
+					<select id="fournprice_predef" name="fournprice_predef" class="flat minwidth75imp maxwidth150" style="display: none;"></select>
 				<?php } ?>
 				<!-- For free product -->
-				<input type="text" id="buying_price" name="buying_price" class="flat maxwidth75 right" value="<?php echo (GETPOSTISSET("buying_price") ? GETPOST("buying_price", 'alpha', 2) : ''); ?>">
+				<input type="text" id="buying_price" name="buying_price" class="flat maxwidth75 maxwidth150 right" value="<?php echo (GETPOSTISSET("buying_price") ? GETPOST("buying_price", 'alpha', 2) : ''); ?>">
 			</td>
 			<?php
 			if (!empty($conf->global->DISPLAY_MARGIN_RATES))
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index cf5e4fa5b53..2aadd4b3813 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -490,9 +490,9 @@ if ($id > 0 || $ref)
 				if ($rowid)
 				{
 					print '<input type="hidden" name="ref_fourn_old" value="'.$object->ref_supplier.'">';
-					print '<input class="flat" name="ref_fourn" size="12" value="'.$object->ref_supplier.'">';
+					print '<input class="flat width150" maxlength="30" name="ref_fourn" value="'.$object->ref_supplier.'">';
 				} else {
-					print '<input class="flat" name="ref_fourn" size="12" value="'.(GETPOST("ref_fourn") ?GETPOST("ref_fourn") : '').'">';
+					print '<input class="flat width150" maxlength="30" name="ref_fourn" value="'.(GETPOST("ref_fourn") ? GETPOST("ref_fourn") : '').'">';
 				}
 				print '</td>';
 				print '</tr>';

From c5b419ecb5200c74d8cf24585ca49235f90b17bb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Dec 2020 15:45:59 +0100
Subject: [PATCH 725/888] Removed useless file

---
 build.xml | 102 ------------------------------------------------------
 1 file changed, 102 deletions(-)
 delete mode 100644 build.xml

diff --git a/build.xml b/build.xml
deleted file mode 100644
index c6995ce95f3..00000000000
--- a/build.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Script build for hudson CI -->
-<project name="dolibarr" default="hudson" basedir=".">
-<!-- Exclude/ignore paths -->
- <property name="ignorepaths" value="${basedir}/htdocs/conf,${basedir}/htdocs/core/filemanagerdol,${basedir}/htdocs/includes" />
- <property name="ignoreregexp" value="**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*" />
- 
- <target name="clean">
-  <!-- Clean up -->
-  <delete dir="${basedir}/hudson"/>
-  <delete dir="${basedir}/generatedJUnitFiles"/>
-
-  <!-- Create build directories -->
-  <mkdir dir="${basedir}/hudson/doxygen"/>
-  <mkdir dir="${basedir}/hudson/logs"/>
-  <mkdir dir="${basedir}/hudson/coverage"/>
- </target>
-
- <!-- Run phpmd, phpcpd, phpcs, doxygen and phploc in parallel -->
- <target name="parallelTasks">
-  <parallel>
-   <!-- <antcall target="phpmd"/> -->
-   <antcall target="phpcpd"/>
-   <!-- <antcall target="phpcs"/> -->
-   <antcall target="doxygen"/>
-   <antcall target="phploc"/>
-  </parallel>
- </target>
-
- <!-- Generate pmd.xml -->
-<!--
-<target name="phpmd">
-  <exec executable="phpmd">
-   <arg line="htdocs xml codesize,unusedcode
-              -\-reportfile '${basedir}/hudson/logs/pmd.xml'
-              -\-ignore=${ignorepaths}
-              " />
-  </exec>
- </target>
--->
-
- <!-- Generate pmd-cpd.xml -->
- <target name="phpcpd">
-  <exec executable="phpcpd">
-   <arg line="	--log-pmd '${basedir}/hudson/logs/pmd-cpd.xml'
-   				--exclude '${basedir}/htdocs/conf'
-   				--exclude '${basedir}/htdocs/core/filemanagerdol'
-   				--exclude '${basedir}/htdocs/includes'
-   				--exclude '**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*'
-   				--min-tokens 70
-   				--min-lines 20 
-   				htdocs
-   				" />
-  </exec>
- </target>
- 
- <!-- Generate phploc.csv -->
- <target name="phploc">
-  <exec executable="phploc">
-   <arg line="	--log-csv '${basedir}/hudson/logs/phploc.csv'
-   				--exclude '${basedir}/htdocs/conf'
-   				--exclude '${basedir}/htdocs/core/filemanagerdol'
-   				--exclude '${basedir}/htdocs/includes'
-   				--exclude '**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*'
-   				htdocs
-   				" />
-  </exec>
- </target>
-   
- <!-- Generate checkstyle.xml -->
- <target name="phpcs">
-  <exec executable="phpcs" dir="${basedir}">
-    <arg line=" --standard=${basedir}/dev/codesniffer/jenkins_ruleset.xml
-    			--report=checkstyle
-    			--report-file=${basedir}/hudson/logs/checkstyle.xml
-                --ignore=${ignorepaths},${ignoreregexp}
-                htdocs
-                "/>
-  </exec>
- </target>
- 
- <!-- Run unit tests and generate junit.xml and clover.xml -->
- <target name="phpunit">
-  <exec executable="phpunit" dir="${basedir}" failonerror="true">
-   <arg line="	--configuration ${basedir}/test/phpunit/phpunittest.xml
-				--log-junit ${basedir}/hudson/logs/junit.xml
-				--coverage-clover ${basedir}/hudson/coverage/clover.xml
-  				--coverage-html ${basedir}/hudson/coverage/
-  				test/phpunit/AllTests.php
-  				"/>
-  </exec>
- </target>
-
- <!-- Generate Doxygen documentation -->
- <target name="doxygen" description="Dolibarr documentation" >
-  <exec executable="doxygen" dir="${basedir}" failonerror="false">
-   <arg value="${basedir}/build/doxygen/jenkins_doxygen.doxyfile"/>
-  </exec>
- </target>
-
- <target name="hudson" depends="clean,phpunit,phpcs,parallelTasks"/>
-</project>
\ No newline at end of file

From 37437901601df5e4ba2d08ba883b3ea8be6c0747 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Dec 2020 15:49:25 +0100
Subject: [PATCH 726/888] Fix warning

---
 htdocs/webservices/server_order.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php
index 7f2f2ebd43f..8c278768990 100644
--- a/htdocs/webservices/server_order.php
+++ b/htdocs/webservices/server_order.php
@@ -364,6 +364,7 @@ function getOrder($authentication, $id = '', $ref = '', $ref_ext = '')
 	$objectresp = array();
 	$errorcode = ''; $errorlabel = '';
 	$error = 0;
+	$socid = 0;
 
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
@@ -387,7 +388,7 @@ function getOrder($authentication, $id = '', $ref = '', $ref_ext = '')
 			if ($result > 0)
 			{
 				// Security for external user
-				if ($socid && (empty($order->socid) || $socid != $order->socid))
+				if ($socid && $socid != $order->socid)
 				{
 					$error++;
 					$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';

From d834f6023dcce665043983e61cf0694d270da258 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Dec 2020 16:06:54 +0100
Subject: [PATCH 727/888] Fix rounding

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 492a4899376..4ed39694720 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2652,14 +2652,14 @@ class Form
 		if (!empty($conf->stock->enabled) && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)))
 		{
 			if (!empty($user->rights->stock->lire)) {
-				$opt .= ' - '.$langs->trans("Stock").':'.$objp->stock;
+				$opt .= ' - '.$langs->trans("Stock").': '.price(price2num($objp->stock, 'MS'));
 
 				if ($objp->stock > 0) {
 					$outval .= ' - <span class="product_line_stock_ok">';
 				} elseif ($objp->stock <= 0) {
 					$outval .= ' - <span class="product_line_stock_too_low">';
 				}
-				$outval .= $langs->transnoentities("Stock").':'.$objp->stock;
+				$outval .= $langs->transnoentities("Stock").': '.price(price2num($objp->stock, 'MS'));
 				$outval .= '</span>';
 				if (empty($novirtualstock) && !empty($conf->global->STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO))  // Warning, this option may slow down combo list generation
 				{
@@ -2989,14 +2989,14 @@ class Form
 					$novirtualstock = ($showstockinlist == 2);
 
 					if (!empty($user->rights->stock->lire)) {
-						$outvallabel .= ' - '.$langs->trans("Stock").':'.$objp->stock;
+						$outvallabel .= ' - '.$langs->trans("Stock").': '.price(price2num($objp->stock, 'MS'));
 
 						if ($objp->stock > 0) {
 							$optlabel .= ' - <span class="product_line_stock_ok">';
 						} elseif ($objp->stock <= 0) {
 							$optlabel .= ' - <span class="product_line_stock_too_low">';
 						}
-						$optlabel .= $langs->transnoentities("Stock").':'.$objp->stock;
+						$optlabel .= $langs->transnoentities("Stock").':'.price(price2num($objp->stock, 'MS'));
 						$optlabel .= '</span>';
 						if (empty($novirtualstock) && !empty($conf->global->STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO))  // Warning, this option may slow down combo list generation
 						{

From d2345ea96c977077d757951545c41ba7aafd63c1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Dec 2020 16:55:29 +0100
Subject: [PATCH 728/888] Fix warning

---
 htdocs/webservices/server_thirdparty.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index 12b2d3315c8..cd930f47ad3 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -468,12 +468,12 @@ function createThirdParty($authentication, $thirdparty)
 
 		$newobject->capital = $thirdparty['capital'];
 
-		$newobject->barcode = $thirdparty['barcode'];
-		$newobject->tva_assuj = $thirdparty['vat_used'];
-		$newobject->tva_intra = $thirdparty['vat_number'];
+		$newobject->barcode = empty($thirdparty['barcode']) ? '' : $thirdparty['barcode'];
+		$newobject->tva_assuj = empty($thirdparty['vat_used']) ? 0 : $thirdparty['vat_used'];
+		$newobject->tva_intra = empty($thirdparty['vat_number']) ? '' : $thirdparty['vat_number'];
 
-		$newobject->canvas = $thirdparty['canvas'];
-		$newobject->particulier = $thirdparty['individual'];
+		$newobject->canvas = empty($thirdparty['canvas']) ? '' : $thirdparty['canvas'];
+		$newobject->particulier = empty($thirdparty['individual']) ? 0 : $thirdparty['individual'];
 
 		$elementtype = 'societe';
 

From 9b115def15d7c3eb4f29391d8c078a4636aa9e78 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Fri, 1 Jan 2021 06:14:05 +0100
Subject: [PATCH 729/888] NEW: Add total in agent margin & uniformize code

---
 htdocs/margin/agentMargins.php    | 45 ++++++++++++++++++++++++-------
 htdocs/margin/customerMargins.php | 38 +++++++++++++-------------
 htdocs/margin/productMargins.php  | 26 +++++++++---------
 3 files changed, 68 insertions(+), 41 deletions(-)

diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index 9c8ff72681b..6d119ac0280 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -291,17 +291,40 @@ if ($result)
 
 			print '<tr class="oddeven">';
 			print "<td>".$group_array['htmlname']."</td>\n";
-			print "<td class=\"right\">".price(price2num($pv, 'MT'))."</td>\n";
-			print "<td class=\"right\">".price(price2num($pa, 'MT'))."</td>\n";
-			print "<td class=\"right\">".price(price2num($marge, 'MT'))."</td>\n";
+			print '<td class="nowrap right">'.price(price2num($pv, 'MT')).'</td>';
+			print '<td class="nowrap right">'.price(price2num($pa, 'MT')).'</td>';
+			print '<td class="nowrap right">'.price(price2num($marge, 'MT')).'</td>';
 			if (!empty($conf->global->DISPLAY_MARGIN_RATES))
-				print "<td class=\"right\">".(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")."</td>\n";
+				print '<td class="nowrap right">'.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%").'</td>';
 			if (!empty($conf->global->DISPLAY_MARK_RATES))
-				print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
+				print '<td class="nowrap right">'.(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%").'</td>';
 			print "</tr>\n";
+
+			$i++;
+			$cumul_achat += $pa;
+			$cumul_vente += $pv;
 		}
 	}
-	print "</table>";
+
+	// Show total margin
+	$totalMargin = $cumul_vente - $cumul_achat;
+
+	$marginRate = ($cumul_achat != 0) ? (100 * $totalMargin / $cumul_achat) : '';
+	$markRate = ($cumul_vente != 0) ? (100 * $totalMargin / $cumul_vente) : '';
+
+	print '<tr class="liste_total">';
+	print '<td>';
+	print $langs->trans('TotalMargin')."</td>";
+	print '<td class="nowrap right">'.price(price2num($cumul_vente, 'MT')).'</td>';
+	print '<td class="nowrap right">'.price(price2num($cumul_achat, 'MT')).'</td>';
+	print '<td class="nowrap right">'.price(price2num($totalMargin, 'MT')).'</td>';
+	if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+		print '<td class="nowrap right">'.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%").'</td>';
+	if (!empty($conf->global->DISPLAY_MARK_RATES))
+		print '<td class="nowrap right">'.(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%").'</td>';
+	print '</tr>';
+
+	print '</table>';
 	print '</div>';
 } else {
 	dol_print_error($db);
@@ -310,9 +333,13 @@ $db->free($result);
 
 print "\n".'<script type="text/javascript">
 $(document).ready(function() {
-  $("#agentid").change(function() {
-     $("div.fiche form").submit();
-  });
+  	$("#agentid").change(function() {
+    	$("div.fiche form").submit();
+  	});
+
+  	$("#totalMargin").html("'.price(price2num($totalMargin, 'MT')).'");
+	$("#marginRate").html("'.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%").'");
+	$("#markRate").html("'.(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%").'");
 });
 </script>'."\n";
 
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 0a015f0f73d..5f35b4e4936 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -303,23 +303,23 @@ if ($result)
 				$invoicestatic->id = $objp->facid;
 				$invoicestatic->ref = $objp->ref;
 				print $invoicestatic->getNomUrl(1);
-				print "</td>\n";
-				print "<td class=\"center\">";
-				print dol_print_date($db->jdate($objp->datef), 'day')."</td>";
+				print '</td>';
+				print '<td class="center">';
+				print dol_print_date($db->jdate($objp->datef), 'day').'</td>';
 		  	} else {
 				$companystatic->id = $objp->socid;
 				$companystatic->name = $objp->name;
 				$companystatic->client = $objp->client;
-		   		print "<td>".$companystatic->getNomUrl(1, 'margin')."</td>\n";
+		   		print '<td>'.$companystatic->getNomUrl(1, 'margin').'</td>';
 		  	}
 
-			print "<td class=\"right\">".price(price2num($pv, 'MT'))."</td>\n";
-			print "<td class=\"right\">".price(price2num($pa, 'MT'))."</td>\n";
-			print "<td class=\"right\">".price(price2num($marge, 'MT'))."</td>\n";
+			print '<td class="nowrap right">'.price(price2num($pv, 'MT')).'</td>';
+			print '<td class="nowrap right">'.price(price2num($pa, 'MT')).'</td>';
+			print '<td class="nowrap right">'.price(price2num($marge, 'MT')).'</td>';
 			if (!empty($conf->global->DISPLAY_MARGIN_RATES))
-				print "<td class=\"right\">".(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")."</td>\n";
+				print '<td class="nowrap right">'.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%").'</td>';
 			if (!empty($conf->global->DISPLAY_MARK_RATES))
-				print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
+				print '<td class="nowrap right">'.(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%").'</td>';
 			print "</tr>\n";
 
 			$i++;
@@ -347,16 +347,16 @@ if ($result)
 		print '<td colspan=2>';
   	else print '<td>';
   	print $langs->trans('TotalMargin')."</td>";
-	print "<td class=\"right\">".price($cumul_vente, null, null, null, null, $rounding)."</td>\n";
-	print "<td class=\"right\">".price($cumul_achat, null, null, null, null, $rounding)."</td>\n";
-	print "<td class=\"right\">".price($totalMargin, null, null, null, null, $rounding)."</td>\n";
+	print '<td class="nowrap right">'.price(price2num($cumul_vente, 'MT')).'</td>';
+	print '<td class="nowrap right">'.price(price2num($cumul_achat, 'MT')).'</td>';
+	print '<td class="nowrap right">'.price(price2num($totalMargin, 'MT')).'</td>';
 	if (!empty($conf->global->DISPLAY_MARGIN_RATES))
-		print "<td class=\"right\">".(($marginRate === '') ? 'n/a' : price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
+		print '<td class="nowrap right">'.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%").'</td>';
 	if (!empty($conf->global->DISPLAY_MARK_RATES))
-		print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
-	print "</tr>\n";
+		print '<td class="nowrap right">'.(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%").'</td>';
+	print '</tr>';
 
-	print "</table>";
+	print '</table>';
 	print '</div>';
 } else {
 	dol_print_error($db);
@@ -370,9 +370,9 @@ $(document).ready(function() {
     	$("div.fiche form").submit();
 	});*/
 
-	$("#totalMargin").html("'.price($totalMargin, null, null, null, null, $rounding).'");
-	$("#marginRate").html("'.(($marginRate === '') ? 'n/a' : price($marginRate, null, null, null, null, $rounding)."%").'");
-	$("#markRate").html("'.(($markRate === '') ? 'n/a' : price($markRate, null, null, null, null, $rounding)."%").'");
+	$("#totalMargin").html("'.price(price2num($totalMargin, 'MT')).'");
+	$("#marginRate").html("'.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%").'");
+	$("#markRate").html("'.(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%").'");
 });
 </script>
 ';
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index 46f128b2f36..9fa7389a153 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -300,14 +300,14 @@ if ($result)
 				print "</td>\n";
 				//print "<td>".$product_static->getNomUrl(1)."</td>\n";
 			}
-			print "<td class=\"center\">".$qty."</td>\n";
-			print "<td class=\"nowrap right\">".price(price2num($pv, 'MT'))."</td>\n";
-			print "<td class=\"nowrap right\">".price(price2num($pa, 'MT'))."</td>\n";
-			print "<td class=\"nowrap right\">".price(price2num($marge, 'MT'))."</td>\n";
+			print '<td class="center">'.$qty.'</td>';
+			print '<td class="nowrap right">'.price(price2num($pv, 'MT')).'</td>';
+			print '<td class="nowrap right">'.price(price2num($pa, 'MT')).'</td>';
+			print '<td class="nowrap right">'.price(price2num($marge, 'MT')).'</td>';
 			if (!empty($conf->global->DISPLAY_MARGIN_RATES))
-				print "<td class=\"right\">".(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")."</td>\n";
+				print '<td class="nowrap right">'.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%").'</td>';
 			if (!empty($conf->global->DISPLAY_MARK_RATES))
-				print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
+				print '<td class="nowrap right">'.(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%").'</td>';
 			print "</tr>\n";
 
 			$i++;
@@ -328,15 +328,15 @@ if ($result)
 	if ($id > 0)
 		print '<td colspan=2>';
 	else print '<td>';
-	print $langs->trans('TotalMargin')."</td>";
-	print "<td class=\"center\">".$cumul_qty."</td>";
-	print "<td class=\"nowrap right\">".price(price2num($cumul_vente, 'MT'))."</td>\n";
-	print "<td class=\"nowrap right\">".price(price2num($cumul_achat, 'MT'))."</td>\n";
-	print "<td class=\"nowrap right\">".price(price2num($totalMargin, 'MT'))."</td>\n";
+	print $langs->trans('TotalMargin').'</td>';
+	print '<td class="center">'.$cumul_qty.'</td>';
+	print '<td class="nowrap right">'.price(price2num($cumul_vente, 'MT')).'</td>';
+	print '<td class="nowrap right">'.price(price2num($cumul_achat, 'MT')).'</td>';
+	print '<td class="nowrap right">'.price(price2num($totalMargin, 'MT')).'</td>';
 	if (!empty($conf->global->DISPLAY_MARGIN_RATES))
-		print "<td class=\"right\">".(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")."</td>\n";
+		print '<td class="nowrap right">'.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%").'</td>';
 	if (!empty($conf->global->DISPLAY_MARK_RATES))
-		print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
+		print '<td class="nowrap right">'.(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%").'</td>';
 	print "</tr>\n";
 
 	print "</table>";

From 48e9c28420144ff02ddf63eda702fe3714c7d942 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Jan 2021 20:56:34 +0100
Subject: [PATCH 730/888] Fix warning

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

diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index 12b2d3315c8..1b501cf4327 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -486,7 +486,9 @@ function createThirdParty($authentication, $thirdparty)
 			foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label)
 			{
 				$key = 'options_'.$key;
-				$newobject->array_options[$key] = $thirdparty[$key];
+				if (isset($thirdparty[$key])) {
+					$newobject->array_options[$key] = $thirdparty[$key];
+				}
 			}
 		}
 

From 7c74a713055437e76e21ae7c62a9c3cecd3e42f6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Jan 2021 21:03:44 +0100
Subject: [PATCH 731/888] Fix regression

---
 htdocs/compta/bank/class/account.class.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 1299c9f1fee..99fc7c77076 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -686,14 +686,14 @@ class Account extends CommonObject
 		$sql .= ", '".$this->db->escape($this->proprio)."'";
 		$sql .= ", '".$this->db->escape($this->owner_address)."'";
 		$sql .= ", '".$this->db->escape($this->currency_code)."'";
-		$sql .= ", ".$this->rappro;
+		$sql .= ", ".((int) $this->rappro);
 		$sql .= ", ".price2num($this->min_allowed);
 		$sql .= ", ".price2num($this->min_desired);
 		$sql .= ", '".$this->db->escape($this->comment)."'";
 		$sql .= ", ".($this->state_id > 0 ? $this->state_id : "null");
-		$sql .= ", ".$this->country_id;
-		$sql .= ", ".$this->db->escape($this->ics);
-		$sql .= ", ".$this->db->escape($this->ics_transfer);
+		$sql .= ", ".($this->country_id > 0 ? $this->country_id : 0);
+		$sql .= ", '".$this->db->escape($this->ics)."'";
+		$sql .= ", '".$this->db->escape($this->ics_transfer)."'";
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -822,8 +822,8 @@ class Account extends CommonObject
 
 		$sql .= ",state_id = ".($this->state_id > 0 ? $this->state_id : "null");
 		$sql .= ",fk_pays = ".$this->country_id;
-		$sql .= ",ics='".$this->db->escape($this->ics)."'";
-		$sql .= ",ics_transfer='".$this->db->escape($this->ics_transfer)."'";
+		$sql .= ",ics = '".$this->db->escape($this->ics)."'";
+		$sql .= ",ics_transfer = '".$this->db->escape($this->ics_transfer)."'";
 
 		$sql .= " WHERE rowid = ".$this->id;
 

From 715d3499ff5fca125d65f433b3a2d830cedb031f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Jan 2021 21:06:47 +0100
Subject: [PATCH 732/888] Clean code

---
 htdocs/compta/bank/class/account.class.php | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 99fc7c77076..f4a4f0f0480 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -612,8 +612,6 @@ class Account extends CommonObject
 		// Clean parameters
 		if (!$this->min_allowed) $this->min_allowed = 0;
 		if (!$this->min_desired) $this->min_desired = 0;
-		$this->state_id = ($this->state_id ? $this->state_id : $this->state_id);
-		$this->country_id = ($this->country_id ? $this->country_id : $this->country_id);
 
 		// Check parameters
 		if (empty($this->country_id))
@@ -691,7 +689,7 @@ class Account extends CommonObject
 		$sql .= ", ".price2num($this->min_desired);
 		$sql .= ", '".$this->db->escape($this->comment)."'";
 		$sql .= ", ".($this->state_id > 0 ? $this->state_id : "null");
-		$sql .= ", ".($this->country_id > 0 ? $this->country_id : 0);
+		$sql .= ", ".($this->country_id > 0 ? $this->country_id : "null");
 		$sql .= ", '".$this->db->escape($this->ics)."'";
 		$sql .= ", '".$this->db->escape($this->ics_transfer)."'";
 		$sql .= ")";
@@ -773,10 +771,6 @@ class Account extends CommonObject
 
 		$this->db->begin();
 
-		// Clean parameters
-		$this->state_id = ($this->state_id ? $this->state_id : $this->state_id);
-		$this->country_id = ($this->country_id ? $this->country_id : $this->country_id);
-
 		// Check parameters
 		if (empty($this->country_id))
 		{
@@ -821,7 +815,7 @@ class Account extends CommonObject
 		$sql .= ",comment     = '".$this->db->escape($this->comment)."'";
 
 		$sql .= ",state_id = ".($this->state_id > 0 ? $this->state_id : "null");
-		$sql .= ",fk_pays = ".$this->country_id;
+		$sql .= ",fk_pays = ".($this->country_id > 0 ? $this->country_id : "null");
 		$sql .= ",ics = '".$this->db->escape($this->ics)."'";
 		$sql .= ",ics_transfer = '".$this->db->escape($this->ics_transfer)."'";
 
@@ -874,11 +868,7 @@ class Account extends CommonObject
 		// phpcs:enable
 		global $conf, $langs;
 
-		// Clean parameters
-		$this->state_id = ($this->state_id ? $this->state_id : $this->state_id);
-		$this->country_id = ($this->country_id ? $this->country_id : $this->country_id);
-
-		// Chargement librairie pour acces fonction controle RIB
+		// Load library to get BAN control function
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 
 		dol_syslog(get_class($this)."::update_bban $this->code_banque,$this->code_guichet,$this->number,$this->cle_rib,$this->iban");
@@ -902,7 +892,7 @@ class Account extends CommonObject
 		$sql .= ",proprio = '".$this->db->escape($this->proprio)."'";
 		$sql .= ",owner_address = '".$this->db->escape($this->owner_address)."'";
 		$sql .= ",state_id = ".($this->state_id > 0 ? $this->state_id : "null");
-		$sql .= ",fk_pays = ".$this->country_id;
+		$sql .= ",fk_pays = ".($this->country_id > 0 ? $this->country_id : "null");
 		$sql .= " WHERE rowid = ".$this->id;
 		$sql .= " AND entity = ".$conf->entity;
 

From ede38dec3052509c49fddd00da282429319c77d4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Jan 2021 20:56:34 +0100
Subject: [PATCH 733/888] Fix warning

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

diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index cd930f47ad3..4bed0e1be3b 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -486,7 +486,9 @@ function createThirdParty($authentication, $thirdparty)
 			foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label)
 			{
 				$key = 'options_'.$key;
-				$newobject->array_options[$key] = $thirdparty[$key];
+				if (isset($thirdparty[$key])) {
+					$newobject->array_options[$key] = $thirdparty[$key];
+				}
 			}
 		}
 

From 37e9d139827b1167db475938b4de53dab57a7b86 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Jan 2021 21:25:37 +0100
Subject: [PATCH 734/888] Fix warning

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

diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index 4bed0e1be3b..7c97159d0bb 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -510,7 +510,7 @@ function createThirdParty($authentication, $thirdparty)
 			$db->commit();
 
 			// Patch to add capability to associate (one) sale representative
-			if ($thirdparty['commid'] && $thirdparty['commid'] > 0)
+			if (!empty($thirdparty['commid']) && $thirdparty['commid'] > 0)
 				$newobject->add_commercial($fuser, $thirdparty["commid"]);
 
 			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);

From a8cd62c44e87c8c2c007f50400eaa5394ee9f837 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Jan 2021 22:00:00 +0100
Subject: [PATCH 735/888] Add AUDIT_ENABLE_PREFIX_SESSION

---
 htdocs/admin/tools/listevents.php | 10 +++++++++-
 htdocs/langs/en_US/other.lang     |  3 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index 00c4bdc36dd..78a3f8948d4 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -92,7 +92,15 @@ $date_endday = $tmp['mday'];
 $date_endmonth = $tmp['mon'];
 $date_endyear = $tmp['year'];
 
-$arrayfields = array();
+// Add prefix session
+$arrayfields = array(
+	'e.prefix_session' => array(
+		'label'=>'UserAgent',
+		'checked'=>(empty($conf->global->AUDIT_ENABLE_PREFIX_SESSION) ? 0 : 1),
+		'enabled'=>(empty($conf->global->AUDIT_ENABLE_PREFIX_SESSION) ? 0 : 1),
+		'position'=>110
+	)
+);
 
 
 /*
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 011352f1dcd..0a7b3723ab1 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -259,7 +259,8 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
- 
+PrefixSession=Prefix for session ID
+
 ##### Export #####
 ExportsArea=Exports area
 AvailableFormats=Available formats

From f328bdc3f998f7b6122cd506dec180de4d9fa03d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Jan 2021 22:05:12 +0100
Subject: [PATCH 736/888] Fix var name

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

diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index 00c4bdc36dd..57fc2d07011 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -211,7 +211,7 @@ if ($result)
 	if ($search_user) $param .= '&search_user='.urlencode($search_user);
 	if ($search_desc) $param .= '&search_desc='.urlencode($search_desc);
 	if ($search_ua)   $param .= '&search_ua='.urlencode($search_ua);
-	if ($search_prefix_sessiona)   $param .= '&search_prefix_session='.urlencode($search_prefix_session);
+	if ($search_prefix_session)   $param .= '&search_prefix_session='.urlencode($search_prefix_session);
 	if ($date_startmonth) $param .= "&date_startmonth=".urlencode($date_startmonth);
 	if ($date_startday)   $param .= "&date_startday=".urlencode($date_startday);
 	if ($date_startyear)  $param .= "&date_startyear=".urlencode($date_startyear);

From 0c95540ff0dc15ad0b8366ba3a9ec9ef350df0e3 Mon Sep 17 00:00:00 2001
From: Aisuko <17001223+AisukoWasTaken@users.noreply.github.com>
Date: Fri, 1 Jan 2021 22:53:01 +0100
Subject: [PATCH 737/888] Fix wrong cast for pos_change

The variable pos_change was cast in "int" where it should be cast in "float". It results in rounded value making the receipt showing wrong cash exchange.
---
 htdocs/compta/paiement/class/paiement.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 28635a2df60..6b7f1612836 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -294,7 +294,7 @@ class Paiement extends CommonObject
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement (entity, ref, ref_ext, datec, datep, amount, multicurrency_amount, fk_paiement, num_paiement, note, ext_payment_id, ext_payment_site, fk_user_creat, pos_change)";
 		$sql .= " VALUES (".$conf->entity.", '".$this->db->escape($this->ref)."', '".$this->db->escape($this->ref_ext)."', '".$this->db->idate($now)."', '".$this->db->idate($this->datepaye)."', ".$total.", ".$mtotal.", ".$this->paiementid.", ";
-		$sql .= "'".$this->db->escape($num_payment)."', '".$this->db->escape($note)."', ".($this->ext_payment_id ? "'".$this->db->escape($this->ext_payment_id)."'" : "null").", ".($this->ext_payment_site ? "'".$this->db->escape($this->ext_payment_site)."'" : "null").", ".$user->id.", ".((int) $this->pos_change).")";
+		$sql .= "'".$this->db->escape($num_payment)."', '".$this->db->escape($note)."', ".($this->ext_payment_id ? "'".$this->db->escape($this->ext_payment_id)."'" : "null").", ".($this->ext_payment_site ? "'".$this->db->escape($this->ext_payment_site)."'" : "null").", ".$user->id.", ".((float) $this->pos_change).")";
 
 		$resql = $this->db->query($sql);
 		if ($resql)

From 3cb71ef53e6cbf775fbf920d314be8db8c4d65d8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Jan 2021 22:55:22 +0100
Subject: [PATCH 738/888] Code comment

---
 htdocs/install/mysql/migration/repair.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 033db4620d1..6d662e64893 100644
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -475,7 +475,7 @@ UPDATE llx_chargesociales SET date_creation = tms WHERE date_creation IS NULL;
 -- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
 -- VMYSQL4.1 update llx_inventory set date_cre = null where DATE(STR_TO_DATE(date_cre, '%Y-%m-%d')) IS NULL;
 
--- Note that you can manually set the default value of a date to CURRENT_TIMESTAMP with:
+-- Note that you can manually set the default value of a date or datetime to CURRENT_TIMESTAMP with:
 --ALTER TABLE llx_table modify column columnname datetime DEFAULT CURRENT_TIMESTAMP;
 
 

From 8ad9c3dbe9f556d771651281d22f429b6cabb4ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 2 Jan 2021 09:07:16 +0100
Subject: [PATCH 739/888] fix migration for icstransfert

---
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 3 ---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index 6c94c4299d3..26ec6377cc3 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -387,9 +387,6 @@ ALTER TABLE llx_bank ADD COLUMN origin_id integer;
 ALTER TABLE llx_bank ADD COLUMN origin_type varchar(64) NULL;
 ALTER TABLE llx_bank ADD COLUMN import_key varchar(14);
 
-ALTER TABLE llx_bank_account ADD COLUMN ics varchar(32) NULL;
-ALTER TABLE llx_bank_account ADD COLUMN ics_transfer varchar(32) NULL;
-
 ALTER TABLE llx_menu MODIFY COLUMN enabled text;
 
 CREATE TABLE llx_ecm_files_extrafields
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 104670ce160..780568ba41b 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -39,3 +39,5 @@ UPDATE llx_adherent SET ref = rowid WHERE ref = '' or ref IS NULL;
 ALTER TABLE llx_adherent MODIFY COLUMN ref varchar(30) NOT NULL;
 ALTER TABLE llx_adherent ADD UNIQUE INDEX uk_adherent_ref (ref, entity);
 
+ALTER TABLE llx_bank_account ADD COLUMN ics varchar(32) NULL;
+ALTER TABLE llx_bank_account ADD COLUMN ics_transfer varchar(32) NULL;

From 4643e412821040d1cd31fe267dbc3f09190e9cce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 2 Jan 2021 09:35:57 +0100
Subject: [PATCH 740/888] remove unused code

---
 htdocs/core/actions_sendmails.inc.php | 262 +++++++++++---------------
 1 file changed, 105 insertions(+), 157 deletions(-)

diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index 0be919de0dd..929d35d9730 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -33,8 +33,7 @@
 /*
  * Add file in email form
  */
-if (GETPOST('addfile', 'alpha'))
-{
+if (GETPOST('addfile', 'alpha')) {
 	$trackid = GETPOST('trackid', 'aZ09');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -50,8 +49,7 @@ if (GETPOST('addfile', 'alpha'))
 /*
  * Remove file in email form
  */
-if (!empty($_POST['removedfile']) && empty($_POST['removAll']))
-{
+if (!empty($_POST['removedfile']) && empty($_POST['removAll'])) {
 	$trackid = GETPOST('trackid', 'aZ09');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -69,24 +67,28 @@ if (!empty($_POST['removedfile']) && empty($_POST['removAll']))
 /*
  * Remove all files in email form
  */
-if (GETPOST('removAll', 'alpha'))
-{
+if (GETPOST('removAll', 'alpha')) {
 	$trackid = GETPOST('trackid', 'aZ09');
 
 	$listofpaths = array();
 	$listofnames = array();
 	$listofmimes = array();
 	$keytoavoidconflict = empty($trackid) ? '' : '-'.$trackid;
-	if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
-	if (!empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
-	if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
+	if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+		$listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
+	}
+	if (!empty($_SESSION["listofnames".$keytoavoidconflict])) {
+		$listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
+	}
+	if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+		$listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
+	}
 
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	$formmail = new FormMail($db);
 	$formmail->trackid = $trackid;
 
-	foreach ($listofpaths as $key => $value)
-	{
+	foreach ($listofpaths as $key => $value) {
 		$pathtodelete = $value;
 		$filetodelete = $listofnames[$key];
 		$result = dol_delete_file($pathtodelete, 1); // Delete uploded Files
@@ -101,50 +103,56 @@ if (GETPOST('removAll', 'alpha'))
 /*
  * Send mail
  */
-if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST['removAll'] && !$_POST['removedfile'] && !$_POST['cancel'] && !$_POST['modelselected'])
-{
-	if (empty($trackid)) $trackid = GETPOST('trackid', 'aZ09');
+if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST['removAll'] && !$_POST['removedfile'] && !$_POST['cancel'] && !$_POST['modelselected']) {
+	if (empty($trackid)) {
+		$trackid = GETPOST('trackid', 'aZ09');
+	}
 
 	$subject = ''; $actionmsg = ''; $actionmsg2 = '';
 
 	$langs->load('mails');
 
-	if (is_object($object))
-	{
+	if (is_object($object)) {
 		$result = $object->fetch($id);
 
 		$sendtosocid = 0; // Id of related thirdparty
-		if (method_exists($object, "fetch_thirdparty") && !in_array($object->element, array('member', 'user', 'expensereport', 'societe', 'contact')))
-		{
+		if (method_exists($object, "fetch_thirdparty") && !in_array($object->element, array('member', 'user', 'expensereport', 'societe', 'contact'))) {
 			$resultthirdparty = $object->fetch_thirdparty();
 			$thirdparty = $object->thirdparty;
-			if (is_object($thirdparty)) $sendtosocid = $thirdparty->id;
-		} elseif ($object->element == 'member' || $object->element == 'user')
-		{
+			if (is_object($thirdparty)) {
+				$sendtosocid = $thirdparty->id;
+			}
+		} elseif ($object->element == 'member' || $object->element == 'user') {
 			$thirdparty = $object;
-			if ($object->socid > 0) $sendtosocid = $object->socid;
-		} elseif ($object->element == 'expensereport')
-		{
+			if ($object->socid > 0) {
+				$sendtosocid = $object->socid;
+			}
+		} elseif ($object->element == 'expensereport') {
 			$tmpuser = new User($db);
 			$tmpuser->fetch($object->fk_user_author);
 			$thirdparty = $tmpuser;
-			if ($object->socid > 0) $sendtosocid = $object->socid;
-		} elseif ($object->element == 'societe')
-		{
+			if ($object->socid > 0) {
+				$sendtosocid = $object->socid;
+			}
+		} elseif ($object->element == 'societe') {
 			$thirdparty = $object;
-			if (is_object($thirdparty) && $thirdparty->id > 0) $sendtosocid = $thirdparty->id;
-		} elseif ($object->element == 'contact')
-		{
+			if (is_object($thirdparty) && $thirdparty->id > 0) {
+				$sendtosocid = $thirdparty->id;
+			}
+		} elseif ($object->element == 'contact') {
 			$contact = $object;
 			if ($contact->id > 0) {
 				$contact->fetch_thirdparty();
 				$thirdparty = $contact->thirdparty;
-				if (is_object($thirdparty) && $thirdparty->id > 0) $sendtosocid = $thirdparty->id;
+				if (is_object($thirdparty) && $thirdparty->id > 0) {
+					$sendtosocid = $thirdparty->id;
+				}
 			}
-		} else dol_print_error('', "Use actions_sendmails.in.php for an element/object '".$object->element."' that is not supported");
+		} else {
+			dol_print_error('', "Use actions_sendmails.in.php for an element/object '".$object->element."' that is not supported");
+		}
 
-		if (is_object($hookmanager))
-		{
+		if (is_object($hookmanager)) {
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('initSendToSocid', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 		}
@@ -152,8 +160,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 		$thirdparty = $mysoc;
 	}
 
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$sendto = '';
 		$sendtocc = '';
 		$sendtobcc = '';
@@ -163,48 +170,40 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 
 		// Define $sendto
 		$receiver = $_POST['receiver'];
-		if (!is_array($receiver))
-		{
-			if ($receiver == '-1') $receiver = array();
-			else $receiver = array($receiver);
+		if (!is_array($receiver)) {
+			if ($receiver == '-1') {
+				$receiver = array();
+			} else {
+				$receiver = array($receiver);
+			}
 		}
 
 		$tmparray = array();
-		if (trim($_POST['sendto']))
-		{
+		if (trim($_POST['sendto'])) {
 			// Recipients are provided into free text
 			$tmparray[] = trim($_POST['sendto']);
 		}
 
-		if (count($receiver) > 0)
-		{
+		if (count($receiver) > 0) {
 			// Recipient was provided from combo list
-			foreach ($receiver as $key=>$val)
-			{
-				if ($val == 'thirdparty') // Key selected means current third party ('thirdparty' may be used for current member or current user too)
-				{
+			foreach ($receiver as $key => $val) {
+				if ($val == 'thirdparty') { // Key selected means current third party ('thirdparty' may be used for current member or current user too)
 					$tmparray[] = dol_string_nospecial($thirdparty->getFullName($langs), ' ', array(",")).' <'.$thirdparty->email.'>';
-				}
-				elseif ($val == 'contact') // Key selected means current contact
-				{
+				} elseif ($val == 'contact') { // Key selected means current contact
 					$tmparray[] = dol_string_nospecial($contact->getFullName($langs), ' ', array(",")).' <'.$contact->email.'>';
 					$sendtoid[] = $contact->id;
-				} elseif ($val)	// $val is the Id of a contact
-				{
+				} elseif ($val) {	// $val is the Id of a contact
 					$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 					$sendtoid[] = ((int) $val);
 				}
 			}
 		}
 
-		if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT))
-		{
+		if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
 			$receiveruser = $_POST['receiveruser'];
-			if (is_array($receiveruser) && count($receiveruser) > 0)
-			{
+			if (is_array($receiveruser) && count($receiveruser) > 0) {
 				$fuserdest = new User($db);
-				foreach ($receiveruser as $key=>$val)
-				{
+				foreach ($receiveruser as $key => $val) {
 					$tmparray[] = $fuserdest->user_get_property($val, 'email');
 					$sendtouserid[] = $val;
 				}
@@ -215,32 +214,27 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 
 		// Define $sendtocc
 		$receivercc = $_POST['receivercc'];
-		if (!is_array($receivercc))
-		{
-			if ($receivercc == '-1') $receivercc = array();
-			else $receivercc = array($receivercc);
+		if (!is_array($receivercc)) {
+			if ($receivercc == '-1') {
+				$receivercc = array();
+			} else {
+				$receivercc = array($receivercc);
+			}
 		}
 		$tmparray = array();
-		if (trim($_POST['sendtocc']))
-		{
+		if (trim($_POST['sendtocc'])) {
 			$tmparray[] = trim($_POST['sendtocc']);
 		}
-		if (count($receivercc) > 0)
-		{
-			foreach ($receivercc as $key=>$val)
-			{
-				// Recipient was provided from combo list
-				if ($val == 'thirdparty')	// Key selected means currentthird party (may be usd for current member or current user too)
-				{
+		if (count($receivercc) > 0) {
+			foreach ($receivercc as $key => $val) {
+				if ($val == 'thirdparty') {	// Key selected means currentthird party (may be usd for current member or current user too)
+					// Recipient was provided from combo list
 					$tmparray[] = dol_string_nospecial($thirdparty->name, ' ', array(",")).' <'.$thirdparty->email.'>';
-				}
-				// Recipient was provided from combo list
-				elseif ($val == 'contact')	// Key selected means current contact
-				{
+				} elseif ($val == 'contact') {	// Key selected means current contact
+					// Recipient was provided from combo list
 					$tmparray[] = dol_string_nospecial($contact->name, ' ', array(",")).' <'.$contact->email.'>';
 					//$sendtoid[] = $contact->id;  TODO Add also id of contact in CC ?
-				} elseif ($val)				// $val is the Id of a contact
-				{
+				} elseif ($val) {				// $val is the Id of a contact
 					$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 					//$sendtoid[] = ((int) $val);  TODO Add also id of contact in CC ?
 				}
@@ -249,11 +243,9 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 		if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
 			$receiverccuser = $_POST['receiverccuser'];
 
-			if (is_array($receiverccuser) && count($receiverccuser) > 0)
-			{
+			if (is_array($receiverccuser) && count($receiverccuser) > 0) {
 				$fuserdest = new User($db);
-				foreach ($receiverccuser as $key=>$val)
-				{
+				foreach ($receiverccuser as $key => $val) {
 					$tmparray[] = $fuserdest->user_get_property($val, 'email');
 					$sendtoccuserid[] = $val;
 				}
@@ -261,8 +253,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 		}
 		$sendtocc = implode(',', $tmparray);
 
-		if (dol_strlen($sendto))
-		{
+		if (dol_strlen($sendto)) {
 			// Define $urlwithroot
 			$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
 			$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
@@ -291,8 +282,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 				$sql .= ' WHERE rowid = '.(int) $reg[1];
 				$resql = $db->query($sql);
 				$obj = $db->fetch_object($resql);
-				if ($obj)
-				{
+				if ($obj) {
 					$from = dol_string_nospecial($obj->label, ' ', array(",")).' <'.$obj->email.'>';
 				}
 			} else {
@@ -312,21 +302,20 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 			$sendtobcc = GETPOST('sendtoccc');
 			// Autocomplete the $sendtobcc
 			// $autocopy can be MAIN_MAIL_AUTOCOPY_PROPOSAL_TO, MAIN_MAIL_AUTOCOPY_ORDER_TO, MAIN_MAIL_AUTOCOPY_INVOICE_TO, MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO...
-			if (!empty($autocopy))
-			{
+			if (!empty($autocopy)) {
 				$sendtobcc .= (empty($conf->global->$autocopy) ? '' : (($sendtobcc ? ", " : "").$conf->global->$autocopy));
 			}
 
 			$deliveryreceipt = $_POST['deliveryreceipt'];
 
-			if ($action == 'send' || $action == 'relance')
-			{
+			if ($action == 'send' || $action == 'relance') {
 				$actionmsg2 = $langs->transnoentities('MailSentBy').' '.CMailFile::getValidAddress($from, 4, 0, 1).' '.$langs->transnoentities('at').' '.CMailFile::getValidAddress($sendto, 4, 0, 1);
-				if ($message)
-				{
+				if ($message) {
 					$actionmsg = $langs->transnoentities('MailFrom').': '.dol_escape_htmltag($from);
 					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTo').': '.dol_escape_htmltag($sendto));
-					if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".dol_escape_htmltag($sendtocc));
+					if ($sendtocc) {
+						$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".dol_escape_htmltag($sendtocc));
+					}
 					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
 					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
 					$actionmsg = dol_concatdesc($actionmsg, $message);
@@ -343,50 +332,6 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 			$filename = $attachedfiles['names'];
 			$mimetype = $attachedfiles['mimes'];
 
-			// Feature to push mail sent into Sent folder
-			/* This code must be now included into the hook mail, method sendMailAfter
-			if (! empty($conf->dolimail->enabled))
-			{
-				$mailfromid = explode("#", $_POST['frommail'],3);	// $_POST['frommail'] = 'aaa#Sent# <aaa@aaa.com>'	// TODO Use a better way to define Sent dir.
-				if (count($mailfromid)==0) $from = $_POST['fromname'] . ' <' . $_POST['frommail'] .'>';
-				else
-				{
-					$mbid = $mailfromid[1];
-
-					// IMAP Postbox
-					$mailboxconfig = new IMAP($db);
-					$mailboxconfig->fetch($mbid);
-					if ($mailboxconfig->mailbox_imap_host) $ref=$mailboxconfig->get_ref();
-
-					$mailboxconfig->folder_id=$mailboxconfig->mailbox_imap_outbox;
-					$mailboxconfig->userfolder_fetch();
-
-					if ($mailboxconfig->mailbox_save_sent_mails == 1)
-					{
-
-						$folder=str_replace($ref, '', $mailboxconfig->folder_cache_key);
-						if (!$folder) $folder = "Sent";	// Default Sent folder
-
-						$mailboxconfig->mbox = imap_open($mailboxconfig->get_connector_url().$folder, $mailboxconfig->mailbox_imap_login, $mailboxconfig->mailbox_imap_password);
-						if (false === $mailboxconfig->mbox)
-						{
-							$info = false;
-							$err = $langs->trans('Error3_Imap_Connection_Error');
-							setEventMessages($err,$mailboxconfig->element, null, 'errors');
-						}
-						else
-						{
-							$mailboxconfig->mailboxid=$_POST['frommail'];
-							$mailboxconfig->foldername=$folder;
-							$from = $mailfromid[0] . $mailfromid[2];
-							$imap=1;
-						}
-
-					}
-				}
-			}
-			*/
-
 			// Make substitution in email content
 			$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $object);
 			$substitutionarray['__EMAIL__'] = $sendto;
@@ -398,38 +343,38 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 			$subject = make_substitutions($subject, $substitutionarray);
 			$message = make_substitutions($message, $substitutionarray);
 
-			if (method_exists($object, 'makeSubstitution'))
-			{
+			if (method_exists($object, 'makeSubstitution')) {
 				$subject = $object->makeSubstitution($subject);
 				$message = $object->makeSubstitution($message);
 			}
 
 			// Send mail (substitutionarray must be done just before this)
-			if (empty($sendcontext)) $sendcontext = 'standard';
+			if (empty($sendcontext)) {
+				$sendcontext = 'standard';
+			}
 			$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1, '', '', $trackid, '', $sendcontext);
 
-			if ($mailfile->error)
-			{
+			if ($mailfile->error) {
 				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
 				$action = 'presend';
 			} else {
 				$result = $mailfile->sendfile();
-				if ($result)
-				{
+				if ($result) {
 					// Initialisation of datas of object to call trigger
-					if (is_object($object))
-					{
-						if (empty($actiontypecode)) $actiontypecode = 'AC_OTH_AUTO'; // Event insert into agenda automatically
+					if (is_object($object)) {
+						if (empty($actiontypecode)) {
+							$actiontypecode = 'AC_OTH_AUTO'; // Event insert into agenda automatically
+						}
 
 						$object->socid = $sendtosocid; // To link to a company
 						$object->sendtoid = $sendtoid; // To link to contact-addresses. This is an array.
 						$object->actiontypecode = $actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
 						$object->actionmsg = $actionmsg; // Long text (@todo Replace this with $message, we already have details of email in dedicated properties)
-						$object->actionmsg2		= $actionmsg2; // Short text ($langs->transnoentities('MailSentBy')...);
+						$object->actionmsg2 = $actionmsg2; // Short text ($langs->transnoentities('MailSentBy')...);
 
 						$object->trackid = $trackid;
-						$object->fk_element		= $object->id;
-						$object->elementtype	= $object->element;
+						$object->fk_element = $object->id;
+						$object->elementtype = $object->element;
 						if (is_array($attachedfiles) && count($attachedfiles) > 0) {
 							$object->attachedfiles = $attachedfiles;
 						}
@@ -447,11 +392,12 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 						$object->email_msgid = $mailfile->msgid;
 
 						// Call of triggers (you should have set $triggersendname to execute trigger. $trigger_name is deprecated)
-						if (!empty($triggersendname) || !empty($trigger_name))
-						{
+						if (!empty($triggersendname) || !empty($trigger_name)) {
 							// Call trigger
 							$result = $object->call_trigger(empty($triggersendname) ? $trigger_name : $triggersendname, $user);
-							if ($result < 0) $error++;
+							if ($result < 0) {
+								$error++;
+							}
 							// End call triggers
 
 							if ($error) {
@@ -466,10 +412,12 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 					$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($from, 2), $mailfile->getValidAddress($sendto, 2));
 					setEventMessages($mesg, null, 'mesgs');
 
-  					$moreparam = '';
-	  				if (isset($paramname2) || isset($paramval2)) $moreparam .= '&'.($paramname2 ? $paramname2 : 'mid').'='.$paramval2;
-		  			header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname ? $paramname : 'id').'='.(is_object($object) ? $object->id : '').$moreparam);
-			  		exit;
+					$moreparam = '';
+					if (isset($paramname2) || isset($paramval2)) {
+						$moreparam .= '&'.($paramname2 ? $paramname2 : 'mid').'='.$paramval2;
+					}
+					header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname ? $paramname : 'id').'='.(is_object($object) ? $object->id : '').$moreparam);
+					exit;
 				} else {
 					$langs->load("other");
 					$mesg = '<div class="error">';

From 5e692fa9db771f334afb13b6265f32a150fc0eb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 2 Jan 2021 09:47:29 +0100
Subject: [PATCH 741/888] doxygen

---
 htdocs/core/class/html.formmail.class.php | 66 ++++++++++++++++-------
 1 file changed, 48 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index a4f936cfca0..fceaedffb98 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -120,8 +120,16 @@ class FormMail extends Form
 	public $withtocc;
 	public $withtoccc;
 	public $withtopic;
-	public $withfile; // 0=No attaches files, 1=Show attached files, 2=Can add new attached files
-	public $withmaindocfile; // 1=Add a checkbox "Attach also main document" for mass actions (checked by default), -1=Add checkbox (not checked by default)
+
+	/**
+	 * @var int 0=No attaches files, 1=Show attached files, 2=Can add new attached files
+	 */
+	public $withfile;
+
+	/**
+	 * @var int 1=Add a checkbox "Attach also main document" for mass actions (checked by default), -1=Add checkbox (not checked by default)
+	 */
+	public $withmaindocfile;
 	public $withbody;
 
 	public $withfromreadonly;
@@ -195,7 +203,9 @@ class FormMail extends Form
 		// Set tmp user directory
 		$vardir = $conf->user->dir_output."/".$user->id;
 		$upload_dir = $vardir.'/temp/'; // TODO Add $keytoavoidconflict in upload_dir path
-		if (is_dir($upload_dir)) dol_delete_dir_recursive($upload_dir);
+		if (is_dir($upload_dir)) {
+			dol_delete_dir_recursive($upload_dir);
+		}
 
 		$keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined
 		unset($_SESSION["listofpaths".$keytoavoidconflict]);
@@ -219,15 +229,24 @@ class FormMail extends Form
 		$listofnames = array();
 		$listofmimes = array();
 
-		if (empty($file)) $file = basename($path);
-		if (empty($type)) $type = dol_mimetype($file);
+		if (empty($file)) {
+			$file = basename($path);
+		}
+		if (empty($type)) {
+			$type = dol_mimetype($file);
+		}
 
 		$keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined
-		if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
-		if (!empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
-		if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
-		if (!in_array($file, $listofnames))
-		{
+		if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+			$listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
+		}
+		if (!empty($_SESSION["listofnames".$keytoavoidconflict])) {
+			$listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
+		}
+		if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+			$listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
+		}
+		if (!in_array($file, $listofnames)) {
 			$listofpaths[] = $path;
 			$listofnames[] = $file;
 			$listofmimes[] = $type;
@@ -252,11 +271,16 @@ class FormMail extends Form
 		$listofmimes = array();
 
 		$keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined
-		if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
-		if (!empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
-		if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
-		if ($keytodelete >= 0)
-		{
+		if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+			$listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
+		}
+		if (!empty($_SESSION["listofnames".$keytoavoidconflict])) {
+			$listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
+		}
+		if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+			$listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
+		}
+		if ($keytodelete >= 0) {
 			unset($listofpaths[$keytodelete]);
 			unset($listofnames[$keytodelete]);
 			unset($listofmimes[$keytodelete]);
@@ -281,9 +305,15 @@ class FormMail extends Form
 		$listofmimes = array();
 
 		$keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined
-		if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
-		if (!empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
-		if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
+		if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+			$listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
+		}
+		if (!empty($_SESSION["listofnames".$keytoavoidconflict])) {
+			$listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
+		}
+		if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+			$listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
+		}
 		return array('paths'=>$listofpaths, 'names'=>$listofnames, 'mimes'=>$listofmimes);
 	}
 

From 2894dac22142ad4249dc18866e0bb9bd0fbd4d0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 2 Jan 2021 10:17:11 +0100
Subject: [PATCH 742/888] clean code

---
 htdocs/core/class/html.form.class.php | 57 ++++++++++++---------------
 htdocs/langs/en_US/mails.lang         |  5 ++-
 2 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 7be97293938..240c94860a5 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6707,24 +6707,20 @@ class Form
 		}
 
 		// Add code for jquery to use multiselect
-		if (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))
-		{
+		if (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')) {
 			$out .= "\n".'<!-- JS CODE TO ENABLE select for id '.$htmlname.' -->
 						<script>'."\n";
-			if ($addjscombo == 1)
-			{
+			if ($addjscombo == 1) {
 				$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
 				$out .= 'function formatResult(record) {'."\n";
-				if ($elemtype == 'category')
-				{
+				if ($elemtype == 'category') {
 					$out .= 'return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png"> \'+record.text+\'</span>\';';
 				} else {
 					$out .= 'return record.text;';
 				}
 				$out .= '};'."\n";
 				$out .= 'function formatSelection(record) {'."\n";
-				if ($elemtype == 'category')
-				{
+				if ($elemtype == 'category') {
 					$out .= 'return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png"> \'+record.text+\'</span>\';';
 				} else {
 					$out .= 'return record.text;';
@@ -6741,8 +6737,7 @@ class Form
 							 	templateSelection: formatSelection		/* For 4.0 */
 							});
 						});'."\n";
-			} elseif ($addjscombo == 2 && !defined('DISABLE_MULTISELECT'))
-			{
+			} elseif ($addjscombo == 2 && !defined('DISABLE_MULTISELECT')) {
 				// Add other js lib
 				// TODO external lib multiselect/jquery.multi-select.js must have been loaded to use this multiselect plugin
 				// ...
@@ -6763,20 +6758,18 @@ class Form
 
 		// Try also magic suggest
 		$out .= '<select id="'.$htmlname.'" class="multiselect'.($morecss ? ' '.$morecss : '').'" multiple name="'.$htmlname.'[]"'.($moreattrib ? ' '.$moreattrib : '').($width ? ' style="width: '.(preg_match('/%/', $width) ? $width : $width.'px').'"' : '').'>'."\n";
-		if (is_array($array) && !empty($array))
-		{
-			if ($value_as_key) $array = array_combine($array, $array);
+		if (is_array($array) && !empty($array)) {
+			if ($value_as_key) {
+				$array = array_combine($array, $array);
+			}
 
-			if (!empty($array))
-			{
-				foreach ($array as $key => $value)
-				{
+			if (!empty($array)) {
+				foreach ($array as $key => $value) {
 					$newval = ($translate ? $langs->trans($value) : $value);
 					$newval = ($key_in_label ? $key.' - '.$newval : $newval);
 
 					$out .= '<option value="'.$key.'"';
-					if (is_array($selected) && !empty($selected) && in_array((string) $key, $selected) && ((string) $key != ''))
-					{
+					if (is_array($selected) && !empty($selected) && in_array((string) $key, $selected) && ((string) $key != '')) {
 						$out .= ' selected';
 					}
 					$out .= ' data-html="'.dol_escape_htmltag($newval).'"';
@@ -6805,36 +6798,36 @@ class Form
 	{
 		global $conf, $langs, $user, $extrafields;
 
-		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) return '';
+		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			return '';
+		}
 
 		$tmpvar = "MAIN_SELECTEDFIELDS_".$varpage; // To get list of saved seleteced properties
-		if (!empty($user->conf->$tmpvar))
-		{
+		if (!empty($user->conf->$tmpvar)) {
 			$tmparray = explode(',', $user->conf->$tmpvar);
-			foreach ($array as $key => $val)
-			{
+			foreach ($array as $key => $val) {
 				//var_dump($key);
 				//var_dump($tmparray);
-				if (in_array($key, $tmparray)) $array[$key]['checked'] = 1;
-				else $array[$key]['checked'] = 0;
+				if (in_array($key, $tmparray)) {
+					$array[$key]['checked'] = 1;
+				} else {
+					$array[$key]['checked'] = 0;
+				}
 			}
 		}
 
 		$lis = '';
 		$listcheckedstring = '';
 
-		foreach ($array as $key => $val)
-		{
+		foreach ($array as $key => $val) {
 			/* var_dump($val);
             var_dump(array_key_exists('enabled', $val));
             var_dump(!$val['enabled']);*/
-			if (array_key_exists('enabled', $val) && isset($val['enabled']) && !$val['enabled'])
-			{
+			if (array_key_exists('enabled', $val) && isset($val['enabled']) && !$val['enabled']) {
 				unset($array[$key]); // We don't want this field
 				continue;
 			}
-			if ($val['label'])
-			{
+			if ($val['label']) {
 				if (!empty($val['langfile']) && is_object($langs)) {
 					$langs->load($val['langfile']);
 				}
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index a7cfde68ae7..230c9a6b3bf 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -92,7 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
-EmailCollectorFilterDesc=All filters must match to have an email being collected 
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
@@ -174,4 +174,5 @@ Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
-RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
\ No newline at end of file
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from
+email %s

From b71e837dddcf42c5f2090e64b64bfd86047322c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 2 Jan 2021 10:18:58 +0100
Subject: [PATCH 743/888] clean code

---
 htdocs/core/class/html.form.class.php | 3 +--
 htdocs/langs/en_US/mails.lang         | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 240c94860a5..20721b8ea05 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6668,8 +6668,7 @@ class Form
 			});
 			</script>';
 
-		if ($acceptdelayedhtml)
-		{
+		if ($acceptdelayedhtml) {
 			$delayedhtmlcontent .= $outdelayed;
 		} else {
 			$out .= $outdelayed;
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 230c9a6b3bf..7fd93be7b71 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -174,5 +174,4 @@ Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
-RecordCreatedByEmailCollector=Record created by the Email Collector %s from
-email %s
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s

From eb3b0ad6729abf46f078489fe3acee2049351e82 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Jan 2021 13:24:06 +0100
Subject: [PATCH 744/888] Fix warning

---
 htdocs/webservices/server_thirdparty.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index 7c97159d0bb..a4f7e21221d 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -329,8 +329,9 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 						'supplier_code' => $thirdparty->code_fournisseur,
 						'customer_code_accountancy' => $thirdparty->code_compta,
 						'supplier_code_accountancy' => $thirdparty->code_compta_fournisseur,
-						'fk_user_author' => $thirdparty->fk_user_author,
+						'user_creation' => $thirdparty->fk_user_creat,
 						'date_creation' => dol_print_date($thirdparty->date_creation, 'dayhourrfc'),
+						'user_modification' => $thirdparty->fk_user_modif,
 						'date_modification' => dol_print_date($thirdparty->date_modification, 'dayhourrfc'),
 						'address' => $thirdparty->address,
 						'zip' => $thirdparty->zip,

From 791a509c6c0c7dd9e1aa6d9b9a7be5d9fac01401 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Jan 2021 13:26:50 +0100
Subject: [PATCH 745/888] Fix warning

---
 htdocs/webservices/server_thirdparty.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index a4f7e21221d..6d44fe41ff6 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -370,7 +370,9 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 				{
 					foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label)
 					{
-						$thirdparty_result_fields = array_merge($thirdparty_result_fields, array('options_'.$key => $thirdparty->array_options['options_'.$key]));
+						if (isset($thirdparty->array_options['options_'.$key])) {
+							$thirdparty_result_fields = array_merge($thirdparty_result_fields, array('options_'.$key => $thirdparty->array_options['options_'.$key]));
+						}
 					}
 				}
 
@@ -623,7 +625,9 @@ function updateThirdParty($authentication, $thirdparty)
 				foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label)
 				{
 					$key = 'options_'.$key;
-					$object->array_options[$key] = $thirdparty[$key];
+					if (isset($thirdparty[$key])) {
+						$object->array_options[$key] = $thirdparty[$key];
+					}
 				}
 			}
 
@@ -728,7 +732,9 @@ function getListOfThirdParties($authentication, $filterthirdparty)
 				{
 					foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label)
 					{
-						$extrafieldsOptions['options_'.$key] = $obj->{$key};
+						if (isset($obj->{$key})) {
+							$extrafieldsOptions['options_'.$key] = $obj->{$key};
+						}
 					}
 				}
 

From 2727fd70b7167025154922ae1b1094d802c34951 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 2 Jan 2021 14:00:24 +0100
Subject: [PATCH 746/888] FIX: Accountancy - Debug experimental function to
 validate movements

---
 htdocs/accountancy/closure/index.php    |  88 ++++++++++++-
 htdocs/accountancy/closure/validate.php | 156 ------------------------
 htdocs/core/menus/standard/eldy.lib.php |   4 -
 htdocs/langs/en_US/accountancy.lang     |   4 +-
 4 files changed, 89 insertions(+), 163 deletions(-)
 delete mode 100644 htdocs/accountancy/closure/validate.php

diff --git a/htdocs/accountancy/closure/index.php b/htdocs/accountancy/closure/index.php
index ed8fc8ecc7e..a8531ca0887 100644
--- a/htdocs/accountancy/closure/index.php
+++ b/htdocs/accountancy/closure/index.php
@@ -25,11 +25,16 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "bills", "other", "main", "accountancy"));
 
+$socid = GETPOST('socid', 'int');
+
+$action = GETPOST('action', 'aZ09');
+
 // Security check
 if (empty($conf->accounting->enabled)) {
 	accessforbidden();
@@ -39,6 +44,7 @@ if ($user->socid > 0)
 if (!$user->rights->accounting->fiscalyear->write)
 	accessforbidden();
 
+$object = new BookKeeping($db);
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
@@ -60,14 +66,91 @@ $year_current = $year_start;
 /*
  * Actions
  */
+if ($action == 'validate_movements_confirm' && $user->rights->accounting->fiscalyear->write) {
+	$result = $object->fetchAll();
 
+	if ($result < 0)
+	{
+		setEventMessages($object->error, $object->errors, 'errors');
+	} else {
+		// Specify as export : update field date_validated on selected month/year
+		$error = 0;
+		$db->begin();
+
+		$date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
+		$date_end = dol_mktime(23, 59, 59, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
+
+		if (is_array($object->lines))
+		{
+			foreach ($object->lines as $movement)
+			{
+				$now = dol_now();
+
+				$sql = " UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping";
+				$sql .= " SET date_validated = '".$db->idate($now)."'";
+				$sql .= " WHERE rowid = ".$movement->id;
+				$sql .= " AND doc_date >= '" . dol_print_date($date_start, 'dayrfc') . "'";
+                $sql .= " AND doc_date <= '" . dol_print_date($date_end, 'dayrfc') . "'";
+
+				dol_syslog("/accountancy/closure/index.php :: Function validate_movement_confirm Specify movements as validated sql=".$sql, LOG_DEBUG);
+				$result = $db->query($sql);
+				if (!$result)
+				{
+					$error++;
+					break;
+				}
+			}
+		}
+
+		if (!$error)
+		{
+			$db->commit();
+			setEventMessages($langs->trans("AllMovementsWereRecordedAsValidated"), null, 'mesgs');
+		} else {
+			$error++;
+			$db->rollback();
+			setEventMessages($langs->trans("NotAllMovementsCouldBeRecordedAsValidated"), null, 'errors');
+		}
+		header("Location: ".$_SERVER['PHP_SELF']."?year=".$year_start);
+		exit;
+	}
+}
 
 /*
  * View
  */
 
+$form = new Form($db);
+$formaccounting = new FormAccounting($db);
+
 llxHeader('', $langs->trans("Closure"));
 
+if ($action == 'validate_movements') {
+	$form_question = array();
+
+	$month = isset($conf->global->SOCIETE_FISCAL_MONTH_START) ? intval($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
+	$date_start = new DateTime(sprintf('%04d-%02d-%02d', $year_start, $month, 1));
+	$date_end = new DateTime(sprintf('%04d-%02d-%02d', $year_start, $month, 1));
+	$date_end->add(new DateInterval('P1Y'));
+	$date_end->sub(new DateInterval('P1D'));
+
+	$form_question['date_start'] = array(
+		'name' => 'date_start',
+		'type' => 'date',
+		'label' => $langs->trans('DateStart'),
+		'value' => $date_start->format('Y-m-d')
+	);
+	$form_question['date_end'] = array(
+		'name' => 'date_end',
+		'type' => 'date',
+		'label' => $langs->trans('DateEnd'),
+		'value' => $date_end->format('Y-m-d')
+	);
+
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?year='.$year_start, $langs->trans('ValidateMovements'), $langs->trans('DescValidateMovements', $langs->transnoentitiesnoconv("RegistrationInAccounting")), 'validate_movements_confirm', $form_question, '', 1, 300);
+	print $formconfirm;
+}
+
 $textprevyear = '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_current - 1).'">'.img_previous().'</a>';
 $textnextyear = '&nbsp;<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_current + 1).'">'.img_next().'</a>';
 
@@ -80,9 +163,9 @@ print '<br>';
 
 $y = $year_current;
 
-$buttonbind = '<a class="butAction" href="./validate.php">'.$langs->trans("ValidateMovements").'</a>';
+$buttonvalidate = '<a class="butAction" name="button_validate_movements" href="'.$_SERVER["PHP_SELF"].'?action=validate_movements&year='.$year_start.'">'.$langs->trans("ValidateMovements").'</a>';
 
-print_barre_liste($langs->trans("OverviewOfMovementsNotValidated"), '', '', '', '', '', '', -1, '', '', 0, $buttonbind, '', 0, 1, 1);
+print_barre_liste($langs->trans("OverviewOfMovementsNotValidated"), '', '', '', '', '', '', -1, '', '', 0, $buttonvalidate, '', 0, 1, 1);
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
@@ -104,6 +187,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b";
 $sql .= " WHERE b.doc_date >= '".$db->idate($search_date_start)."'";
 $sql .= " AND b.doc_date <= '".$db->idate($search_date_end)."'";
 $sql .= " AND b.entity IN (".getEntity('bookkeeping', 0).")"; // We don't share object for accountancy
+$sql .= " AND date_validated IS NULL";
 
 dol_syslog('htdocs/accountancy/closure/index.php sql='.$sql, LOG_DEBUG);
 $resql = $db->query($sql);
diff --git a/htdocs/accountancy/closure/validate.php b/htdocs/accountancy/closure/validate.php
deleted file mode 100644
index 1013ad1b6ce..00000000000
--- a/htdocs/accountancy/closure/validate.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/* Copyright (C) 2019       Open-DSI    	    <support@open-dsi.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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * \file 	    htdocs/accountancy/closure/validate.php
- * \ingroup     Accountancy
- * \brief 	    Validate entries page
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array("compta", "bills", "other", "main", "accountancy"));
-
-// Security check
-if (empty($conf->accounting->enabled)) {
-	accessforbidden();
-}
-if ($user->socid > 0)
-	accessforbidden();
-	if (!$user->rights->accounting->fiscalyear->write)
-	accessforbidden();
-
-
-$month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
-if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
-else {
-	$year_start = dol_print_date(dol_now(), '%Y');
-	if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
-}
-$year_end = $year_start + 1;
-$month_end = $month_start - 1;
-if ($month_end < 1)
-{
-	$month_end = 12;
-	$year_end--;
-}
-$search_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start);
-$search_date_end = dol_get_last_day($year_end, $month_end);
-$year_current = $year_start;
-
-/*
- * Actions
- */
-
-if ($action == 'validate')
-{
-	$now = dol_now();
-
-	// Update database
-	$db->begin();
-	$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping as b";
-	$sql .= " SET b.date_validated = '".$db->idate($now)."'";
-	$sql .= ' WHERE b.date_validated IS NULL';
-
-	dol_syslog("htdocs/accountancy/closure/validate.php validate", LOG_DEBUG);
-	$resql = $db->query($sql);
-	if (!$resql1) {
-		$error++;
-		$db->rollback();
-		setEventMessages($db->lasterror(), null, 'errors');
-	} else {
-		$db->commit();
-	}
-	// End clean database
-}
-
-
-/*
- * View
- */
-
-llxHeader('', $langs->trans("ValidateMovements"));
-
-$textprevyear = '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_current - 1).'">'.img_previous().'</a>';
-$textnextyear = '&nbsp;<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_current + 1).'">'.img_next().'</a>';
-
-
-print load_fiche_titre($langs->trans("ValidateMovements")." ".$textprevyear." ".$langs->trans("Year")." ".$year_start." ".$textnextyear, '', 'title_accountancy');
-
-print $langs->trans("DescValidateMovements").'<br>';
-print '<br>';
-
-
-$y = $year_current;
-
-print_barre_liste($langs->trans("SelectMonthAndValidate"), '', '', '', '', '', '', -1, '', '', 0, '', 'class="right"', 0, 1, 1);
-
-print '<div class="div-table-responsive-no-min">';
-print '<table class="noborder centpercent">';
-print '<tr class="oddeven">';
-for ($i = 1; $i <= 12; $i++) {
-	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
-	print '<td class="center">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
-}
-print '<td><b>'.$langs->trans("Total").'</b></td></tr>';
-
-print '<tr class="oddeven">';
-$sql = "SELECT COUNT(b.rowid) as detail,";
-for ($i = 1; $i <= 12; $i++) {
-	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
-	$sql .= "  SUM(".$db->ifsql('MONTH(b.doc_date)='.$j, '1', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
-}
-$sql .= " COUNT(b.rowid) as total";
-$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b";
-$sql .= " WHERE b.doc_date >= '".$db->idate($search_date_start)."'";
-$sql .= " AND b.doc_date <= '".$db->idate($search_date_end)."'";
-$sql .= " AND b.entity IN (".getEntity('bookkeeping', 0).")"; // We don't share object for accountancy
-
-dol_syslog('htdocs/accountancy/closure/index.php sql='.$sql, LOG_DEBUG);
-$resql = $db->query($sql);
-if ($resql) {
-	$num = $db->num_rows($resql);
-
-	while ($row = $db->fetch_row($resql)) {
-		for ($i = 1; $i <= 12; $i++) {
-			print '<td class="nowrap center">'.$row[$i].'<br><br>';
-			print '<input id="cb'.$row[$i].'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$row[$i].'"'.($selected ? ' checked="checked"' : '').'>';
-			print '</td>';
-		}
-		print '<td class="valigntop"><b>'.$row[13].'</b></td>';
-	}
-
-	$db->free($resql);
-} else {
-	print $db->lasterror(); // Show last sql error
-}
-print '</tr>';
-print "</table>\n";
-
-print '<br><div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?month='.$year_current.'&action=validate"">'.$langs->trans("ValidateMovements").'</a></div>';
-print '</div>';
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 85b63a6f4e3..46950bdc50c 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1334,10 +1334,6 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				// Closure
 				if (!empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2) {
 					$newmenu->add("/accountancy/closure/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_closure", $langs->trans("MenuAccountancyClosure"), 1, $user->rights->accounting->fiscalyear->write, '', $mainmenu, 'closure');
-
-					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_closure/', $leftmenu)) {
-						$newmenu->add("/accountancy/closure/validate.php?leftmenu=accountancy_closure", $langs->trans("MenuAccountancyValidationMovements"), 2, $user->rights->accounting->fiscalyear->write);
-					}
 				}
 
 				// Reports
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index c7ce4ac6b0b..bda6502aeed 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -274,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done

From a8d15fafd22707600afb54339ca1b6aef03914ad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Jan 2021 14:17:54 +0100
Subject: [PATCH 747/888] Fix missing span

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

diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index caf2192a9a3..ed3578522d4 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -293,7 +293,7 @@ if (empty($mysoc->country_code))
 	    print '<span class="opacitymedium">'.$langs->trans("UnitPriceOfProduct").":</span> ".price2num($s, 'MU');
 	    print " x ".$langs->trans("Quantity").": ".$qty;
 	    print " - ".$langs->trans("VAT").": ".$vat.'%';
-	    print ' &nbsp; -> &nbsp; <span class="opacitymedium">'.$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
+	    print ' &nbsp; -> &nbsp; <span class="opacitymedium">'.$langs->trans("TotalPriceAfterRounding").":</span> ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
 
 	    $s = 10 / 3; $qty = 2; $vat = 10;
 	    $tmparray = calcul_price_total($qty, price2num($s, 'MU'), 0, $vat, -1, -1, 0, 'HT', 0, 0, $mysoc, $localtax_array);

From 601d4618d4c7bd50ab2e287df8f8ba1a3161cb76 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Jan 2021 14:52:37 +0100
Subject: [PATCH 748/888] Missing vat rates

---
 htdocs/install/mysql/data/llx_c_tva.sql | 27 ++++++++++++++++---------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index 793b29ab640..7156812fb01 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -35,6 +35,16 @@
 
 delete from llx_c_tva;
 
+-- ALGERIA (id country=13)
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 131, 13,     '0','0','TVA 0%',   1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 132, 13,  '9','0','TVA 9%',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 133, 13,     '19','0','TVA 19%',   1);
+
+-- ANGOLA (id country=35)
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 351,  35,   '0','0','VAT Rate 0', 1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 352,  35,   '7','0','VAT reduced rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 353,  35,  '14','0','VAT standard rate',1);
+
 -- ARGENTINA (id country=23)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (231, 23,   '0','0','IVA Rate 0', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (232, 23,'10.5','0','IVA reduced rate',1);
@@ -202,6 +212,13 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 1
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 173,  17,  '19','0','Algemeen BTW tarief',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 174,  17,  '21','0','Algemeen BTW tarief (vanaf 1 oktober 2012)',0);
 
+-- NEW CALEDONIA (id country=165)
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1651, 165,   '0','0','VAT Rate 0', 1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1652, 165,   '3','0','VAT standard 3', 1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1653, 165,   '6','0','VAT standard 6', 1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1654, 165,  '11','0','VAT standard rate', 1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1655, 165,  '22','0','VAT standard high', 1);
+
 -- NEW ZEALAND (id country=166)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1661, 166,   '0','0','VAT Rate 0', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1662, 166,  '15','0','VAT standard rate', 1);
@@ -361,16 +378,6 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (23
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2322,232,    '12','0','VAT 12%',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2323,232,     '8','0','VAT 8%',1);
 
--- ALGERIA(id country=13)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 131, 13,     '0','0','TVA 0%',   1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 132, 13,  '9','0','TVA 9%',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 133, 13,     '19','0','TVA 19%',   1);
-
--- ANGOLA (id country=35)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 351,  35,   '0','0','VAT Rate 0', 1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 352,  35,   '7','0','VAT reduced rate',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 353,  35,  '14','0','VAT standard rate',1);
-
 -- Example of code to insert a vat rate 0 for each country
 --delete from llx_c_tva where rowid = 1181;		-- to delete a record that does not follow rules for rowid (fk_pays+'1')
 --insert into llx_c_tva(rowid, fk_pays, taux, recuperableonly, note, active) SELECT CONCAT(c.rowid, '1'), c.rowid, 0, 0, 'No VAT', 1 from llx_c_country as c where c.rowid not in (select fk_pays from llx_c_tva);

From d46eb08083a5239a0e9196d968e3b2b4bb556363 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Jan 2021 15:36:19 +0100
Subject: [PATCH 749/888] More log and use id to refresh/reload an invoice.

---
 htdocs/takepos/index.php   |  5 +++--
 htdocs/takepos/invoice.php | 17 +++++++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 4bfeaa57b75..51b6334a2c9 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -155,6 +155,7 @@ var pageactions=0;
 var place="<?php echo $place; ?>";
 var editaction="qty";
 var editnumber="";
+var invoiceid=0;
 
 /*
 var app = this;
@@ -448,8 +449,8 @@ function TakeposOrderNotes() {
 }
 
 function Refresh() {
-	console.log("Refresh by reloading place="+place);
-	$("#poslines").load("invoice.php?place="+place, function() {
+	console.log("Refresh by reloading place="+place+" invoiceid="+invoiceid);
+	$("#poslines").load("invoice.php?place="+place+"&invoiceid="+invoiceid, function() {
 		//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
 	});
 }
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 0909f1b3cca..f31bb90bfcd 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -742,7 +742,7 @@ function DolibarrTakeposPrinting(id) {
 
 
 $( document ).ready(function() {
-	console.log("Set customer info and sales in header");
+	console.log("Set customer info and sales in header placeid=<?php echo $placeid; ?> status=<?php echo $invoice->statut; ?>");
 
     <?php
     $s = $langs->trans("Customer");
@@ -757,7 +757,14 @@ $( document ).ready(function() {
 
 	<?php
 	$sql = "SELECT rowid, datec, ref FROM ".MAIN_DB_PREFIX."facture";
-	$sql .= " WHERE ref LIKE '(PROV-POS".$_SESSION["takeposterminal"]."-0%'";
+	if (empty($conf->global->TAKEPOS_CAN_EDIT_IF_ALREADY_VALIDATED)) {
+		// By default, only invoices with a ref not already defined can in list of open invoice we can edit.
+		$sql .= " WHERE ref LIKE '(PROV-POS".$_SESSION["takeposterminal"]."-0%'";
+	} else {
+		// If TAKEPOS_CAN_EDIT_IF_ALREADY_VALIDATED set, we show also draft invoice that already has a reference defined
+		$sql .= " WHERE pos_source = ".$_SESSION["takeposterminal"];
+		$sql .= " AND module_source = 'takepos'";
+	}
 	$sql .= $db->order('datec', 'ASC');
 	$resql = $db->query($sql);
 	if ($resql) {
@@ -767,7 +774,9 @@ $( document ).ready(function() {
 			$num_sale = str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $obj->ref));
 			echo $num_sale;
 			if (str_replace("-", "", $num_sale) > $max_sale) $max_sale = str_replace("-", "", $num_sale);
-			echo '\\\';Refresh();">';
+			echo '\\\'; invoiceid=\\\'';
+			echo $obj->rowid;
+			echo '\\\'; Refresh();">';
 			if ($placeid == $obj->rowid) echo "<b>";
 			echo dol_print_date($db->jdate($obj->datec), '%H:%M', 'tzuser');
 			if ($placeid == $obj->rowid) echo "</b>";
@@ -775,7 +784,7 @@ $( document ).ready(function() {
 		}
 		echo '$("#customerandsales").append(\'<a onclick="place=\\\'0-';
 		echo $max_sale + 1;
-		echo '\\\';Refresh();"><span class="fa fa-plus-square" title="'.dol_escape_htmltag($langs->trans("StartAParallelSale")).'"></a>\');';
+		echo '\\\'; invoiceid=0; Refresh();"><span class="fa fa-plus-square" title="'.dol_escape_htmltag($langs->trans("StartAParallelSale")).'"></a>\');';
 	} else {
 		dol_print_error($db);
 	}

From 02ae06f24abdd2e7c45f704568c61e3778ef03a8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Jan 2021 15:52:12 +0100
Subject: [PATCH 750/888] Fix warning

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

diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index 6d44fe41ff6..d7ded82cc3f 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -329,9 +329,9 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 						'supplier_code' => $thirdparty->code_fournisseur,
 						'customer_code_accountancy' => $thirdparty->code_compta,
 						'supplier_code_accountancy' => $thirdparty->code_compta_fournisseur,
-						'user_creation' => $thirdparty->fk_user_creat,
+						'user_creation' => $thirdparty->user_creation,
 						'date_creation' => dol_print_date($thirdparty->date_creation, 'dayhourrfc'),
-						'user_modification' => $thirdparty->fk_user_modif,
+						'user_modification' => $thirdparty->user_modification,
 						'date_modification' => dol_print_date($thirdparty->date_modification, 'dayhourrfc'),
 						'address' => $thirdparty->address,
 						'zip' => $thirdparty->zip,

From 2d22c1d5d167622b46f97765cfd7b31dd5bfdc80 Mon Sep 17 00:00:00 2001
From: Aisuko <17001223+AisukoWasTaken@users.noreply.github.com>
Date: Fri, 1 Jan 2021 22:53:01 +0100
Subject: [PATCH 751/888] Fix wrong cast for pos_change

The variable pos_change was cast in "int" where it should be cast in "float". It results in rounded value making the receipt showing wrong cash exchange.
---
 htdocs/compta/paiement/class/paiement.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 28635a2df60..6b7f1612836 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -294,7 +294,7 @@ class Paiement extends CommonObject
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement (entity, ref, ref_ext, datec, datep, amount, multicurrency_amount, fk_paiement, num_paiement, note, ext_payment_id, ext_payment_site, fk_user_creat, pos_change)";
 		$sql .= " VALUES (".$conf->entity.", '".$this->db->escape($this->ref)."', '".$this->db->escape($this->ref_ext)."', '".$this->db->idate($now)."', '".$this->db->idate($this->datepaye)."', ".$total.", ".$mtotal.", ".$this->paiementid.", ";
-		$sql .= "'".$this->db->escape($num_payment)."', '".$this->db->escape($note)."', ".($this->ext_payment_id ? "'".$this->db->escape($this->ext_payment_id)."'" : "null").", ".($this->ext_payment_site ? "'".$this->db->escape($this->ext_payment_site)."'" : "null").", ".$user->id.", ".((int) $this->pos_change).")";
+		$sql .= "'".$this->db->escape($num_payment)."', '".$this->db->escape($note)."', ".($this->ext_payment_id ? "'".$this->db->escape($this->ext_payment_id)."'" : "null").", ".($this->ext_payment_site ? "'".$this->db->escape($this->ext_payment_site)."'" : "null").", ".$user->id.", ".((float) $this->pos_change).")";
 
 		$resql = $this->db->query($sql);
 		if ($resql)

From ce0abd17fe543c12606f585ca9085925072deb5a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Jan 2021 16:18:16 +0100
Subject: [PATCH 752/888] Debug v13

---
 htdocs/commande/card.php           |  6 +++---
 htdocs/compta/facture/card-rec.php |  8 ++++----
 htdocs/contrat/card.php            |  8 ++++----
 htdocs/core/lib/functions.lib.php  | 18 +++++++++++++-----
 htdocs/fourn/commande/card.php     | 10 +++++-----
 htdocs/fourn/facture/card.php      | 10 +++++-----
 htdocs/supplier_proposal/card.php  | 10 +++++-----
 7 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 213819b0915..2ea5c37bf39 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -631,9 +631,9 @@ if (empty($reshook))
 
 		// Set if we used free entry or predefined product
 		$predef = '';
-		$product_desc = (GETPOST('dp_desc') ?GETPOST('dp_desc') : '');
-		$price_ht = GETPOST('price_ht');
-		$price_ht_devise = GETPOST('multicurrency_price_ht');
+		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
+		$price_ht = price2num(GETPOST('price_ht'), 'MU');
+		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CR');
 		$prod_entry_mode = GETPOST('prod_entry_mode');
 		if ($prod_entry_mode == 'free')
 		{
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index b978de677a9..097585dbea0 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -437,9 +437,9 @@ if (empty($reshook))
 
 		// Set if we used free entry or predefined product
 		$predef = '';
-		$product_desc = (GETPOST('dp_desc') ?GETPOST('dp_desc') : '');
-		$price_ht = GETPOST('price_ht');
-		$price_ht_devise = GETPOST('multicurrency_price_ht');
+		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
+		$price_ht = price2num(GETPOST('price_ht'), 'MU');
+		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CR');
 		$prod_entry_mode = GETPOST('prod_entry_mode', 'alpha');
 		if ($prod_entry_mode == 'free')
 		{
@@ -450,7 +450,7 @@ if (empty($reshook))
 			$tva_tx = '';
 		}
 
-		$qty = GETPOST('qty'.$predef);
+		$qty = price2num(GETPOST('qty'.$predef), 'alpha');
 		$remise_percent = GETPOST('remise_percent'.$predef);
 
 		// Extrafields
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 2e692dc25c4..d07b8dcc60e 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -383,9 +383,9 @@ if (empty($reshook))
 	{
 		// Set if we used free entry or predefined product
 		$predef = '';
-		$product_desc = (GETPOST('dp_desc') ?GETPOST('dp_desc') : '');
-		$price_ht = price2num(GETPOST('price_ht'));
-		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'));
+		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
+		$price_ht = price2num(GETPOST('price_ht'), 'MU');
+		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht', 'CR');
 		if (GETPOST('prod_entry_mode', 'alpha') == 'free')
 		{
 			$idprod = 0;
@@ -395,7 +395,7 @@ if (empty($reshook))
 			$tva_tx = '';
 		}
 
-		$qty = price2num(GETPOST('qty'.$predef));
+		$qty = price2num(GETPOST('qty'.$predef), 'alpha');
 		$remise_percent = ((GETPOST('remise_percent'.$predef) != '') ? GETPOST('remise_percent'.$predef) : 0);
 
 		if ($qty == '')
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a156f35292e..8c1765620ec 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4810,7 +4810,7 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
  * 											'MU'=Round to Max unit price (MAIN_MAX_DECIMALS_UNIT)
  *											'MT'=Round to Max for totals with Tax (MAIN_MAX_DECIMALS_TOT)
  *											'MS'=Round to Max for stock quantity (MAIN_MAX_DECIMALS_STOCK)
- *      		                            'CR'=Currency rate
+ *      		                            'CR'=Foreign currency accurancy
  *											Numeric = Nb of digits for rounding
  * 	@param	int				$option			Put 1 if you know that content is already universal format number (so no correction on decimal will be done)
  * 											Put 2 if you know that number is a user input (so we know we don't have to fix decimal separator).
@@ -4871,10 +4871,18 @@ function price2num($amount, $rounding = '', $option = 0)
 	if ($rounding)
 	{
 		$nbofdectoround = '';
-		if ($rounding == 'MU')     $nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_UNIT;
-		elseif ($rounding == 'MT') $nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_TOT;
-		elseif ($rounding == 'MS') $nbofdectoround = empty($conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : $conf->global->MAIN_MAX_DECIMALS_STOCK;
-		elseif ($rounding == 'CR') $nbofdectoround = 8;
+		if ($rounding == 'MU') {
+			$nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_UNIT;
+		}
+		elseif ($rounding == 'MT') {
+			$nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_TOT;
+		}
+		elseif ($rounding == 'MS') {
+			$nbofdectoround = empty($conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : $conf->global->MAIN_MAX_DECIMALS_STOCK;
+		}
+		elseif ($rounding == 'CR') {
+			$nbofdectoround = max($conf->global->MAIN_MAX_DECIMALS_TOT, 8);
+		}
 		elseif (is_numeric($rounding))  $nbofdectoround = $rounding;
 		//print "RR".$amount.' - '.$nbofdectoround.'<br>';
 		if (dol_strlen($nbofdectoround)) $amount = round(is_string($amount) ? (float) $amount : $amount, $nbofdectoround); // $nbofdectoround can be 0.
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 987b80aa3ea..710657e1c16 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -356,24 +356,24 @@ if (empty($reshook))
 
 		// Set if we used free entry or predefined product
 		$predef = '';
-		$product_desc = (GETPOST('dp_desc') ?GETPOST('dp_desc') : '');
+		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
 		$date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
 		$date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
 		$prod_entry_mode = GETPOST('prod_entry_mode');
 		if ($prod_entry_mode == 'free')
 		{
 			$idprod = 0;
-			$price_ht = GETPOST('price_ht');
+			$price_ht = price2num(GETPOST('price_ht'), 'MU');
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 		} else {
 			$idprod = GETPOST('idprod', 'int');
-			$price_ht = GETPOST('price_ht');
+			$price_ht = price2num(GETPOST('price_ht'), 'MU');
 			$tva_tx = '';
 		}
 
-		$qty = GETPOST('qty'.$predef);
+		$qty = price2num(GETPOST('qty'.$predef), 'alpha');
 		$remise_percent = GETPOST('remise_percent'.$predef);
-		$price_ht_devise = GETPOST('multicurrency_price_ht');
+		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CR');
 
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index c615817e36f..998ef884766 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1175,7 +1175,7 @@ if (empty($reshook))
 
 		// Set if we used free entry or predefined product
 		$predef = '';
-		$product_desc = (GETPOST('dp_desc') ?GETPOST('dp_desc') : '');
+		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
 		$date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
 		$date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
 
@@ -1183,17 +1183,17 @@ if (empty($reshook))
 		if ($prod_entry_mode == 'free')
 		{
 			$idprod = 0;
-			$price_ht = GETPOST('price_ht');
+			$price_ht = price2num(GETPOST('price_ht'), 'MU');
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 		} else {
 			$idprod = GETPOST('idprod', 'int');
-			$price_ht = GETPOST('price_ht');
+			$price_ht = price2num(GETPOST('price_ht'), 'MU');
 			$tva_tx = '';
 		}
 
-		$qty = GETPOST('qty'.$predef);
+		$qty = price2num(GETPOST('qty'.$predef), 'alpha');
 		$remise_percent = GETPOST('remise_percent'.$predef);
-		$price_ht_devise = GETPOST('multicurrency_price_ht');
+		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CR');
 
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index ae40784aa68..a571a207bc5 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -540,24 +540,24 @@ if (empty($reshook))
 
 		// Set if we used free entry or predefined product
 		$predef = '';
-		$product_desc = (GETPOST('dp_desc') ?GETPOST('dp_desc') : '');
+		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
 		$date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
 		$date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
 		$ref_supplier = GETPOST('fourn_ref', 'alpha');
 		$prod_entry_mode = GETPOST('prod_entry_mode');
 		if ($prod_entry_mode == 'free')	{
 			$idprod = 0;
-			$price_ht = GETPOST('price_ht');
+			$price_ht = price2num(GETPOST('price_ht'), 'MU');
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 		} else {
 			$idprod = GETPOST('idprod', 'int');
-			$price_ht = GETPOST('price_ht');
+			$price_ht = price2num(GETPOST('price_ht'), 'MU');
 			$tva_tx = '';
 		}
 
-		$qty = GETPOST('qty'.$predef);
+		$qty = price2num(GETPOST('qty'.$predef), 'alpha');
 		$remise_percent = GETPOST('remise_percent'.$predef);
-		$price_ht_devise = GETPOST('multicurrency_price_ht');
+		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CR');
 
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);

From ad3bc649afa7f6443a15f20519b64dd8f4957663 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 2 Jan 2021 16:23:09 +0100
Subject: [PATCH 753/888] doxygen

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

diff --git a/htdocs/index.php b/htdocs/index.php
index a4060278c50..7bfab28a0f2 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -1028,7 +1028,7 @@ function showWeather($totallate, $text, $options, $morecss = '')
  *  $conf->global->MAIN_METEO_LEVELx
  *
  *  @param      int     $totallate      Nb of element late
- *  @return     string                  Return img tag of weather
+ *  @return     stdClass                Return img tag of weather
  */
 function getWeatherStatus($totallate)
 {
@@ -1063,20 +1063,16 @@ function getWeatherStatus($totallate)
 	if ($totallate <= $level0) {
 		$weather->picto = 'weather-clear.png';
 		$weather->level = 0;
-	}
-	elseif ($totallate <= $level1) {
+	} elseif ($totallate <= $level1) {
 		$weather->picto = 'weather-few-clouds.png';
 		$weather->level = 1;
-	}
-	elseif ($totallate <= $level2) {
+	} elseif ($totallate <= $level2) {
 		$weather->picto = 'weather-clouds.png';
 		$weather->level = 2;
-	}
-	elseif ($totallate <= $level3) {
+	} elseif ($totallate <= $level3) {
 		$weather->picto = 'weather-many-clouds.png';
 		$weather->level = 3;
-	}
-	else {
+	} else {
 		$weather->picto = 'weather-storm.png';
 		$weather->level = 4;
 	}

From e4b5ec122eee2f6a9f1017c92b5d226466af0a2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 2 Jan 2021 16:38:19 +0100
Subject: [PATCH 754/888] syntax error

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

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index d07b8dcc60e..74d3436c453 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -373,8 +373,7 @@ if (empty($reshook))
 				$action = 'create';
 			}
 		}
-	} elseif ($action == 'classin' && $user->rights->contrat->creer)
-	{
+	} elseif ($action == 'classin' && $user->rights->contrat->creer) {
 		$object->setProject(GETPOST('projectid'));
 	}
 
@@ -385,7 +384,7 @@ if (empty($reshook))
 		$predef = '';
 		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
 		$price_ht = price2num(GETPOST('price_ht'), 'MU');
-		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht', 'CR');
+		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht', 'CR'));
 		if (GETPOST('prod_entry_mode', 'alpha') == 'free')
 		{
 			$idprod = 0;

From fd4dab495f010fc170c94ab3e6d5a47be7e7f605 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Jan 2021 16:51:34 +0100
Subject: [PATCH 755/888] FIX Bad cleaning of VAT rate when numbers are into
 code

---
 htdocs/comm/propal/class/propal.class.php             |  5 ++++-
 htdocs/commande/class/commande.class.php              |  4 +++-
 htdocs/compta/facture/class/facture-rec.class.php     | 11 ++++++++---
 htdocs/compta/facture/class/facture.class.php         |  4 +++-
 htdocs/contrat/class/contrat.class.php                |  1 -
 htdocs/fichinter/class/fichinterrec.class.php         |  4 +++-
 htdocs/fourn/class/fournisseur.commande.class.php     |  4 +++-
 .../class/supplier_proposal.class.php                 | 11 ++++++++---
 8 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 144374ab47c..9d6b6c201c5 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -602,6 +602,7 @@ class Propal extends CommonObject
 
 			// Clean vat code
 			$vat_src_code = '';
+			$reg = array();
 			if (preg_match('/\((.*)\)/', $txtva, $reg))
 			{
 				$vat_src_code = $reg[1];
@@ -779,7 +780,9 @@ class Propal extends CommonObject
 		$qty = price2num($qty);
 		$pu = price2num($pu);
 		$pu_ht_devise = price2num($pu_ht_devise);
-		$txtva = price2num($txtva);
+		if (!preg_match('/\((.*)\)/', $txtva)) {
+			$txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+		}
 		$txlocaltax1 = price2num($txlocaltax1);
 		$txlocaltax2 = price2num($txlocaltax2);
 		$pa_ht = price2num($pa_ht);
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 5402d31ba7d..49f8005980f 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3120,7 +3120,9 @@ class Commande extends CommonOrder
 			$pu = price2num($pu);
 			$pa_ht = price2num($pa_ht);
 			$pu_ht_devise = price2num($pu_ht_devise);
-			$txtva = price2num($txtva);
+			if (!preg_match('/\((.*)\)/', $txtva)) {
+				$txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+			}
 			$txlocaltax1 = price2num($txlocaltax1);
 			$txlocaltax2 = price2num($txlocaltax2);
 
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index c5bd8a987ac..85ecb3f969d 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -849,7 +849,9 @@ class FactureRec extends CommonInvoice
 			$qty = price2num($qty);
 			$pu_ht = price2num($pu_ht);
 			$pu_ttc = price2num($pu_ttc);
-			$txtva = price2num($txtva);
+			if (!preg_match('/\((.*)\)/', $txtva)) {
+				$txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+			}
 			$txlocaltax1 = price2num($txlocaltax1);
 			$txlocaltax2 = price2num($txlocaltax2);
 			if (empty($txtva)) $txtva = 0;
@@ -1031,8 +1033,10 @@ class FactureRec extends CommonInvoice
 	        $pu_ht          = price2num($pu_ht);
 	        $pu_ttc         = price2num($pu_ttc);
 	        $pu_ht_devise = price2num($pu_ht_devise);
-	        $txtva = price2num($txtva);
-		    $txlocaltax1	= price2num($txlocaltax1);
+	        if (!preg_match('/\((.*)\)/', $txtva)) {
+	        	$txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+	        }
+	        $txlocaltax1	= price2num($txlocaltax1);
 		    $txlocaltax2	= price2num($txlocaltax2);
 		    if (empty($txlocaltax1)) $txlocaltax1 = 0;
 		    if (empty($txlocaltax2)) $txlocaltax2 = 0;
@@ -1059,6 +1063,7 @@ class FactureRec extends CommonInvoice
 
 	        // Clean vat code
 	        $vat_src_code = '';
+	        $reg = array();
 	        if (preg_match('/\((.*)\)/', $txtva, $reg))
 	        {
 	        	$vat_src_code = $reg[1];
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 4bfc36a3e78..392817b0368 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3311,7 +3311,9 @@ class Facture extends CommonInvoice
 			$pu 			= price2num($pu);
         	$pu_ht_devise = price2num($pu_ht_devise);
 			$pa_ht			= price2num($pa_ht);
-			$txtva			= price2num($txtva);
+			if (!preg_match('/\((.*)\)/', $txtva)) {
+				$txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+			}
 			$txlocaltax1	= price2num($txlocaltax1);
 			$txlocaltax2	= price2num($txlocaltax2);
 
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index e38c24565dd..13f0ba644d0 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -1502,7 +1502,6 @@ class Contrat extends CommonObject
 				$vat_src_code = $reg[1];
 				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 			}
-
 			$txtva = price2num($txtva);
 			$txlocaltax1 = price2num($txlocaltax1);
 			$txlocaltax2 = price2num($txlocaltax2);
diff --git a/htdocs/fichinter/class/fichinterrec.class.php b/htdocs/fichinter/class/fichinterrec.class.php
index 5b3dfb3a2fc..2d678514182 100644
--- a/htdocs/fichinter/class/fichinterrec.class.php
+++ b/htdocs/fichinter/class/fichinterrec.class.php
@@ -473,7 +473,9 @@ class FichinterRec extends Fichinter
             if (!$info_bits) $info_bits = 0;
             $pu_ht = price2num($pu_ht);
             $pu_ttc = price2num($pu_ttc);
-            $txtva = price2num($txtva);
+            if (!preg_match('/\((.*)\)/', $txtva)) {
+            	$txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+            }
 
             if ($price_base_type == 'HT') {
                 $pu = $pu_ht;
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index af283d8cdf0..123b1eb0046 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2633,7 +2633,9 @@ class CommandeFournisseur extends CommonOrder
             if (!$qty) $qty = 1;
             $pu = price2num($pu);
         	$pu_ht_devise = price2num($pu_ht_devise);
-        	$txtva = price2num($txtva);
+        	if (!preg_match('/\((.*)\)/', $txtva)) {
+        		$txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+        	}
         	$txlocaltax1 = price2num($txlocaltax1);
         	$txlocaltax2 = price2num($txlocaltax2);
 
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 33c80f9b6b1..9822c171cd8 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -423,10 +423,13 @@ class SupplierProposal extends CommonObject
         $qty = price2num($qty);
         $pu_ht = price2num($pu_ht);
         $pu_ttc = price2num($pu_ttc);
-        $txtva = price2num($txtva);
+        if (!preg_match('/\((.*)\)/', $txtva)) {
+        	$txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+        }
         $txlocaltax1 = price2num($txlocaltax1);
         $txlocaltax2 = price2num($txlocaltax2);
-            $pa_ht = price2num($pa_ht);
+
+        $pa_ht = price2num($pa_ht);
         if ($price_base_type == 'HT')
         {
             $pu = $pu_ht;
@@ -682,7 +685,9 @@ class SupplierProposal extends CommonObject
         $remise_percent = price2num($remise_percent);
         $qty = price2num($qty);
         $pu = price2num($pu);
-        $txtva = price2num($txtva);
+        if (!preg_match('/\((.*)\)/', $txtva)) {
+        	$txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+        }
         $txlocaltax1 = price2num($txlocaltax1);
         $txlocaltax2 = price2num($txlocaltax2);
         $pa_ht = price2num($pa_ht);

From eb937f82c8a8358c8ebb6f4b36aca92c4013ea63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 2 Jan 2021 16:58:05 +0100
Subject: [PATCH 756/888] doxygen

---
 htdocs/core/class/html.formmail.class.php | 102 ++++++++++++----------
 1 file changed, 56 insertions(+), 46 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index fceaedffb98..096418597da 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1110,14 +1110,30 @@ class FormMail extends Form
 		}
 
 		$showinfobcc = '';
-		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) && !empty($this->param['models']) && $this->param['models'] == 'propal_send') $showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO;
-		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) && !empty($this->param['models']) && $this->param['models'] == 'order_send') $showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO;
-		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) && !empty($this->param['models']) && $this->param['models'] == 'facture_send') $showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO;
-		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO) && !empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') $showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO;
-		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO) && !empty($this->param['models']) && $this->param['models'] == 'order_supplier_send') $showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO;
-		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO) && !empty($this->param['models']) && $this->param['models'] == 'invoice_supplier_send') $showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO;
-		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_PROJECT_TO) && !empty($this->param['models']) && $this->param['models'] == 'project') $showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_PROJECT_TO;
-		if ($showinfobcc) $out .= ' + '.$showinfobcc;
+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) && !empty($this->param['models']) && $this->param['models'] == 'propal_send') {
+			$showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO;
+		}
+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) && !empty($this->param['models']) && $this->param['models'] == 'order_send') {
+			$showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO;
+		}
+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) && !empty($this->param['models']) && $this->param['models'] == 'facture_send') {
+			$showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO;
+		}
+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO) && !empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') {
+			$showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO;
+		}
+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO) && !empty($this->param['models']) && $this->param['models'] == 'order_supplier_send') {
+			$showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO;
+		}
+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO) && !empty($this->param['models']) && $this->param['models'] == 'invoice_supplier_send') {
+			$showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO;
+		}
+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_PROJECT_TO) && !empty($this->param['models']) && $this->param['models'] == 'project') {
+			$showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_PROJECT_TO;
+		}
+		if ($showinfobcc) {
+			$out .= ' + '.$showinfobcc;
+		}
 		$out .= "</td></tr>\n";
 		return $out;
 	}
@@ -1212,7 +1228,7 @@ class FormMail extends Form
 	 *
 	 *  @param	DoliDB		$db				Database handler
 	 *  @param	string		$type_template	Get message for model/type=$type_template, type='all' also included.
-	 *  @param	string		$user			Get template public or limited to this user
+	 *  @param	User		$user			Get template public or limited to this user
 	 *  @param	Translate	$outputlangs	Output lang object
 	 *  @param	int			$id				Id of template to find, or -1 for first found with position 0, or 0 for first found whatever is position (priority order depends on lang provided or not) or -2 for exact match with label (no answer if not found)
 	 *  @param  int         $active         1=Only active template, 0=Only disabled, -1=All
@@ -1232,7 +1248,9 @@ class FormMail extends Form
 		// Define $languagetosearchmain to fall back on main language (for example to get 'es_ES' for 'es_MX')
 		$tmparray = explode('_', $languagetosearch);
 		$languagetosearchmain = $tmparray[0].'_'.strtoupper($tmparray[0]);
-		if ($languagetosearchmain == $languagetosearch) $languagetosearchmain = '';
+		if ($languagetosearchmain == $languagetosearch) {
+			$languagetosearchmain = '';
+		}
 
 		$sql = "SELECT rowid, label, topic, joinfiles, content, content_lines, lang";
 		$sql .= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
@@ -1244,14 +1262,16 @@ class FormMail extends Form
 		if (!($id > 0) && $languagetosearch) $sql .= " AND (lang = '".$db->escape($languagetosearch)."'".($languagetosearchmain ? " OR lang = '".$db->escape($languagetosearchmain)."'" : "")." OR lang IS NULL OR lang = '')";
 		if ($id > 0)   $sql .= " AND rowid=".$id;
 		if ($id == -1) $sql .= " AND position=0";
-		if ($languagetosearch) $sql .= $db->order("position,lang,label", "ASC,DESC,ASC"); // We want line with lang set first, then with lang null or ''
-		else $sql .= $db->order("position,lang,label", "ASC,ASC,ASC"); // If no language provided, we give priority to lang not defined
+		if ($languagetosearch) {
+			$sql .= $db->order("position,lang,label", "ASC,DESC,ASC"); // We want line with lang set first, then with lang null or ''
+		} else {
+			$sql .= $db->order("position,lang,label", "ASC,ASC,ASC"); // If no language provided, we give priority to lang not defined
+		}
 		$sql .= $db->plimit(1);
 		//print $sql;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			// Get first found
 			$obj = $db->fetch_object($resql);
 
@@ -1321,7 +1341,7 @@ class FormMail extends Form
 	 *      Search into table c_email_templates
 	 *
 	 * 		@param	string		$type_template	Get message for key module
-	 *      @param	string		$user			Use template public or limited to this user
+	 *      @param	User		$user			Use template public or limited to this user
 	 *      @param	Translate	$outputlangs	Output lang object
 	 *      @return	int		<0 if KO,
 	 */
@@ -1332,13 +1352,14 @@ class FormMail extends Form
 		$sql .= " WHERE type_template='".$this->db->escape($type_template)."'";
 		$sql .= " AND entity IN (".getEntity('c_email_templates').")";
 		$sql .= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
-		if (is_object($outputlangs)) $sql .= " AND (lang = '".$this->db->escape($outputlangs->defaultlang)."' OR lang IS NULL OR lang = '')";
+		if (is_object($outputlangs)) {
+			$sql .= " AND (lang = '".$this->db->escape($outputlangs->defaultlang)."' OR lang IS NULL OR lang = '')";
+		}
 		$sql .= $this->db->order("lang,label", "ASC");
 		//print $sql;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$this->db->free($resql);
 			return $num;
@@ -1353,7 +1374,7 @@ class FormMail extends Form
 	 *      Search into table c_email_templates
 	 *
 	 * 		@param	string		$type_template	Get message for key module
-	 *      @param	string		$user			Use template public or limited to this user
+	 *      @param	User		$user			Use template public or limited to this user
 	 *      @param	Translate	$outputlangs	Output lang object
 	 *      @param  int         $active         1=Only active template, 0=Only disabled, -1=All
 	 *      @return	int		                    <0 if KO, nb of records found if OK
@@ -1365,18 +1386,18 @@ class FormMail extends Form
 		$sql .= " WHERE type_template IN ('".$this->db->escape($type_template)."', 'all')";
 		$sql .= " AND entity IN (".getEntity('c_email_templates').")";
 		$sql .= " AND (private = 0 OR fk_user = ".$user->id.")"; // See all public templates or templates I own.
-		if ($active >= 0) $sql .= " AND active = ".$active;
+		if ($active >= 0) {
+			$sql .= " AND active = ".$active;
+		}
 		//if (is_object($outputlangs)) $sql.= " AND (lang = '".$this->db->escape($outputlangs->defaultlang)."' OR lang IS NULL OR lang = '')";	// Return all languages
 		$sql .= $this->db->order("position,lang,label", "ASC");
 		//print $sql;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$this->lines_model = array();
-			while ($obj = $this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				$line = new ModelMail();
 				$line->id = $obj->rowid;
 				$line->label = $obj->label;
@@ -1419,10 +1440,8 @@ class FormMail extends Form
 		$this->substit = $tmparray;
 
 		// Fill substit_lines with each object lines content
-		if (is_array($object->lines))
-		{
-			foreach ($object->lines as $line)
-			{
+		if (is_array($object->lines)) {
+			foreach ($object->lines as $line) {
 				$substit_line = array(
 					'__PRODUCT_REF__' => isset($line->product_ref) ? $line->product_ref : '',
 					'__PRODUCT_LABEL__' => isset($line->product_label) ? $line->product_label : '',
@@ -1438,15 +1457,13 @@ class FormMail extends Form
 				);
 
 				// Create dynamic tags for __PRODUCT_EXTRAFIELD_FIELD__
-				if (!empty($line->fk_product))
-				{
+				if (!empty($line->fk_product)) {
 					if (!is_object($extrafields)) $extrafields = new ExtraFields($this->db);
 					$extrafields->fetch_name_optionals_label('product', true);
 					$product = new Product($this->db);
 					$product->fetch($line->fk_product, '', '', 1);
 					$product->fetch_optionals();
-					if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-					{
+					if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
 						foreach ($extrafields->attributes[$product->table_element]['label'] as $key => $label) {
 							$substit_line['__PRODUCT_EXTRAFIELD_'.strtoupper($key).'__'] = $product->array_options['options_'.$key];
 						}
@@ -1470,24 +1487,20 @@ class FormMail extends Form
 		global $conf, $langs;
 
 		$tmparray = array();
-		if ($mode == 'formemail' || $mode == 'formemailwithlines' || $mode == 'formemailforlines')
-		{
+		if ($mode == 'formemail' || $mode == 'formemailwithlines' || $mode == 'formemailforlines') {
 			$parameters = array('mode'=>$mode);
 			$tmparray = getCommonSubstitutionArray($langs, 2, null, $object); // Note: On email templated edition, this is null because it is related to all type of objects
 			complete_substitutions_array($tmparray, $langs, null, $parameters);
 
-			if ($mode == 'formwithlines')
-			{
+			if ($mode == 'formwithlines') {
 				$tmparray['__LINES__'] = '__LINES__'; // Will be set by the get_form function
 			}
-			if ($mode == 'formforlines')
-			{
+			if ($mode == 'formforlines') {
 				$tmparray['__QUANTITY__'] = '__QUANTITY__'; // Will be set by the get_form function
 			}
 		}
 
-		if ($mode == 'emailing')
-		{
+		if ($mode == 'emailing') {
 			$parameters = array('mode'=>$mode);
 			$tmparray = getCommonSubstitutionArray($langs, 2, array('object', 'objectamount'), $object); // Note: On email templated edition, this is null because it is related to all type of objects
 			complete_substitutions_array($tmparray, $langs, null, $parameters);
@@ -1512,11 +1525,9 @@ class FormMail extends Form
 			if (!empty($conf->paypal->enabled)) $onlinepaymentenabled++;
 			if (!empty($conf->paybox->enabled)) $onlinepaymentenabled++;
 			if (!empty($conf->stripe->enabled)) $onlinepaymentenabled++;
-			if ($onlinepaymentenabled && !empty($conf->global->PAYMENT_SECURITY_TOKEN))
-			{
+			if ($onlinepaymentenabled && !empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 				$tmparray['__SECUREKEYPAYMENT__'] = $conf->global->PAYMENT_SECURITY_TOKEN;
-				if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
-				{
+				if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 					if ($conf->adherent->enabled) $tmparray['__SECUREKEYPAYMENT_MEMBER__'] = 'SecureKeyPAYMENTUniquePerMember';
 					if ($conf->facture->enabled)  $tmparray['__SECUREKEYPAYMENT_INVOICE__'] = 'SecureKeyPAYMENTUniquePerInvoice';
 					if ($conf->commande->enabled) $tmparray['__SECUREKEYPAYMENT_ORDER__'] = 'SecureKeyPAYMENTUniquePerOrder';
@@ -1533,8 +1544,7 @@ class FormMail extends Form
 			}
 		}
 
-		foreach ($tmparray as $key => $val)
-		{
+		foreach ($tmparray as $key => $val) {
 			if (empty($val)) $tmparray[$key] = $key;
 		}
 

From 982f8eb95d2be6300cbcdc2400a8bdf016a76335 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Jan 2021 17:03:26 +0100
Subject: [PATCH 757/888] Fix syntax error

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

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index d07b8dcc60e..9b1a3b34808 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -385,7 +385,7 @@ if (empty($reshook))
 		$predef = '';
 		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
 		$price_ht = price2num(GETPOST('price_ht'), 'MU');
-		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht', 'CR');
+		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht', 'CR'));
 		if (GETPOST('prod_entry_mode', 'alpha') == 'free')
 		{
 			$idprod = 0;

From 2d1121031a886398a31594684785ed8040bc8558 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Jan 2021 17:04:08 +0100
Subject: [PATCH 758/888] var not defined

---
 htdocs/contrat/card.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 9b1a3b34808..64f8fd92477 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -89,6 +89,7 @@ $extralabelslines = $extrafields->fetch_name_optionals_label($object->table_elem
 $permissionnote = $user->rights->contrat->creer; // Used by the include of actions_setnotes.inc.php
 $permissiondellink = $user->rights->contrat->creer; // Used by the include of actions_dellink.inc.php
 
+$error = 0;
 
 
 /*

From d0d94276669bc0bbc04bd9db6e645917eee5e37f Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Sat, 2 Jan 2021 17:23:25 +0100
Subject: [PATCH 759/888] FIX regression

---
 htdocs/admin/delais.php | 552 ++++++++++++++++++++--------------------
 1 file changed, 272 insertions(+), 280 deletions(-)

diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 62b0c6ec53d..0b8c639622f 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -35,127 +35,127 @@ if (!$user->admin) accessforbidden();
 $action = GETPOST('action', 'aZ09');
 
 $modules = array(
-		'agenda' => array(
-				array(
-						'code' => 'MAIN_DELAY_ACTIONS_TODO',
-						'img' => 'action'
-				)
-		),
-		'projet' => array(
-				array(
-						'code' => 'MAIN_DELAY_PROJECT_TO_CLOSE',
-						'img' => 'project'
-				),
-				array(
-						'code' => 'MAIN_DELAY_TASKS_TODO',
-						'img' => 'projecttask'
-				)
-		),
-		'propal' => array(
-				array(
-						'code' => 'MAIN_DELAY_PROPALS_TO_CLOSE',
-						'img' => 'propal'
-				),
-				array(
-						'code' => 'MAIN_DELAY_PROPALS_TO_BILL',
-						'img' => 'propal'
-				)
-		),
-		'commande' => array(
-				array(
-						'code' => 'MAIN_DELAY_ORDERS_TO_PROCESS',
-						'img' => 'order'
-				)
-		),
-		'facture' => array(
-				array(
-						'code' => 'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',
-						'img' => 'bill'
-				)
-		),
-		'fournisseur' => array(
-				array(
-						'code' => 'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',
-						'img' => 'order'
-				),
-				array(
-						'code' => 'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',
-						'img' => 'bill'
-				)
-		),
-		'service' => array(
-				array(
-						'code' => 'MAIN_DELAY_NOT_ACTIVATED_SERVICES',
-						'img' => 'service'
-				),
-				array(
-						'code' => 'MAIN_DELAY_RUNNING_SERVICES',
-						'img' => 'service'
-				)
-		),
-		'banque' => array(
-				array(
-						'code' => 'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',
-						'img' => 'account'
-				),
-				array(
-						'code' => 'MAIN_DELAY_CHEQUES_TO_DEPOSIT',
-						'img' => 'account'
-				)
-		),
-		'adherent' => array(
-				array(
-						'code' => 'MAIN_DELAY_MEMBERS',
-						'img' => 'user'
-				)
-		),
-		'expensereport' => array(
-				array(
-						'code' => 'MAIN_DELAY_EXPENSEREPORTS',
-						'img' => 'trip'
-				),
-				/* TODO Enable this
-		        array(
-    		        'code' => 'MAIN_DELAY_EXPENSEREPORTS_TO_PAY',
-    		        'img' => 'trip'
-    		    )*/
-		),
-		'holiday' => array(
-			array(
-				'code' => 'MAIN_DELAY_HOLIDAYS',
-				'img' => 'holiday'
-			),
-		),
+    'agenda' => array(
+        array(
+            'code' => 'MAIN_DELAY_ACTIONS_TODO',
+            'img' => 'action'
+        )
+    ),
+    'projet' => array(
+        array(
+            'code' => 'MAIN_DELAY_PROJECT_TO_CLOSE',
+            'img' => 'project'
+        ),
+        array(
+            'code' => 'MAIN_DELAY_TASKS_TODO',
+            'img' => 'projecttask'
+        )
+    ),
+    'propal' => array(
+        array(
+            'code' => 'MAIN_DELAY_PROPALS_TO_CLOSE',
+            'img' => 'propal'
+        ),
+        array(
+            'code' => 'MAIN_DELAY_PROPALS_TO_BILL',
+            'img' => 'propal'
+        )
+    ),
+    'commande' => array(
+        array(
+            'code' => 'MAIN_DELAY_ORDERS_TO_PROCESS',
+            'img' => 'order'
+        )
+    ),
+    'facture' => array(
+        array(
+            'code' => 'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',
+            'img' => 'bill'
+        )
+    ),
+    'fournisseur' => array(
+        array(
+            'code' => 'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',
+            'img' => 'order'
+        ),
+        array(
+            'code' => 'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',
+            'img' => 'bill'
+        )
+    ),
+    'service' => array(
+        array(
+            'code' => 'MAIN_DELAY_NOT_ACTIVATED_SERVICES',
+            'img' => 'service'
+        ),
+        array(
+            'code' => 'MAIN_DELAY_RUNNING_SERVICES',
+            'img' => 'service'
+        )
+    ),
+    'banque' => array(
+        array(
+            'code' => 'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',
+            'img' => 'account'
+        ),
+        array(
+            'code' => 'MAIN_DELAY_CHEQUES_TO_DEPOSIT',
+            'img' => 'account'
+        )
+    ),
+    'adherent' => array(
+        array(
+            'code' => 'MAIN_DELAY_MEMBERS',
+            'img' => 'user'
+        )
+    ),
+    'expensereport' => array(
+        array(
+            'code' => 'MAIN_DELAY_EXPENSEREPORTS',
+            'img' => 'trip'
+        ),
+        /* TODO Enable this
+         array(
+         'code' => 'MAIN_DELAY_EXPENSEREPORTS_TO_PAY',
+         'img' => 'trip'
+         )*/
+    ),
+    'holiday' => array(
+        array(
+            'code' => 'MAIN_DELAY_HOLIDAYS',
+            'img' => 'holiday'
+        ),
+    ),
 );
 
 $labelmeteo = array(0=>$langs->trans("No"), 1=>$langs->trans("Yes"), 2=>$langs->trans("OnMobileOnly"));
 
 if (!isset($conf->global->MAIN_DELAY_PROJECT_TO_CLOSE)) {
-	$conf->global->MAIN_DELAY_PROJECT_TO_CLOSE = 7; // Must be same value than into conf.class.php
+    $conf->global->MAIN_DELAY_PROJECT_TO_CLOSE = 7; // Must be same value than into conf.class.php
 }
 if (!isset($conf->global->MAIN_DELAY_TASKS_TODO)) {
-	$conf->global->MAIN_DELAY_TASKS_TODO = 7; // Must be same value than into conf.class.php
+    $conf->global->MAIN_DELAY_TASKS_TODO = 7; // Must be same value than into conf.class.php
 }
 if (!isset($conf->global->MAIN_DELAY_MEMBERS)) {
-	$conf->global->MAIN_DELAY_MEMBERS = 0; // Must be same value than into conf.class.php
+    $conf->global->MAIN_DELAY_MEMBERS = 0; // Must be same value than into conf.class.php
 }
 if (!isset($conf->global->MAIN_DELAY_ACTIONS_TODO)) {
-	$conf->global->MAIN_DELAY_ACTIONS_TODO = 7; // Must be same value than into conf.class.php
+    $conf->global->MAIN_DELAY_ACTIONS_TODO = 7; // Must be same value than into conf.class.php
 }
 if (!isset($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS)) {
-	$conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2;
+    $conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2;
 }
 if (!isset($conf->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS)) {
-	$conf->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS = 7;
+    $conf->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS = 7;
 }
 if (!isset($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS)) {
-	$conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2;
+    $conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2;
 }
 if (!isset($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS)) {
-	$conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2;
+    $conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2;
 }
 if (!isset($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS)) {
-	$conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2;
+    $conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2;
 }
 
 
@@ -166,30 +166,30 @@ if (!isset($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS)) {
 
 if ($action == 'update')
 {
-	foreach ($modules as $module => $delays)
-	{
-		if (!empty($conf->$module->enabled))
-		{
-			foreach ($delays as $delay)
-			{
-				if (GETPOST($delay['code']) != '')
-				{
-					dolibarr_set_const($db, $delay['code'], GETPOST($delay['code']), 'chaine', 0, '', $conf->entity);
-				}
-			}
-		}
-	}
-
-	dolibarr_set_const($db, "MAIN_DISABLE_METEO", $_POST["MAIN_DISABLE_METEO"], 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_USE_METEO_WITH_PERCENTAGE", GETPOST("MAIN_USE_METEO_WITH_PERCENTAGE"), 'chaine', 0, '', $conf->entity);
-
-	// For update value with percentage
-	$plus = '';
-	if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $plus = '_PERCENTAGE';
-	// Update values
-	for ($i = 0; $i < 4; $i++) {
-		if (GETPOSTISSET('MAIN_METEO'.$plus.'_LEVEL'.$i)) dolibarr_set_const($db, 'MAIN_METEO'.$plus.'_LEVEL'.$i, GETPOST('MAIN_METEO'.$plus.'_LEVEL'.$i, 'int'), 'chaine', 0, '', $conf->entity);
-	}
+    foreach ($modules as $module => $delays)
+    {
+        if (!empty($conf->$module->enabled))
+        {
+            foreach ($delays as $delay)
+            {
+                if (GETPOST($delay['code']) != '')
+                {
+                    dolibarr_set_const($db, $delay['code'], GETPOST($delay['code']), 'chaine', 0, '', $conf->entity);
+                }
+            }
+        }
+    }
+    
+    dolibarr_set_const($db, "MAIN_DISABLE_METEO", $_POST["MAIN_DISABLE_METEO"], 'chaine', 0, '', $conf->entity);
+    dolibarr_set_const($db, "MAIN_USE_METEO_WITH_PERCENTAGE", GETPOST("MAIN_USE_METEO_WITH_PERCENTAGE"), 'chaine', 0, '', $conf->entity);
+    
+    // For update value with percentage
+    $plus = '';
+    if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $plus = '_PERCENTAGE';
+    // Update values
+    for ($i = 0; $i < 4; $i++) {
+        if (GETPOSTISSET('MAIN_METEO'.$plus.'_LEVEL'.$i)) dolibarr_set_const($db, 'MAIN_METEO'.$plus.'_LEVEL'.$i, GETPOST('MAIN_METEO'.$plus.'_LEVEL'.$i, 'int'), 'chaine', 0, '', $conf->entity);
+    }
 }
 
 
@@ -209,164 +209,156 @@ print "<br>\n";
 
 if ($action == 'edit')
 {
-	print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" name="form_index">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="action" value="update">';
-
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
-
-	foreach ($modules as $module => $delays)
-	{
-		if (!empty($conf->$module->enabled))
-		{
-			foreach ($delays as $delay)
-			{
-				$value = (!empty($conf->global->{$delay['code']}) ? $conf->global->{$delay['code']}:0);
-				print '<tr class="oddeven">';
-				print '<td width="20px">'.img_object('', $delay['img']).'</td>';
-				print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td><td class="nowraponall">';
-				print '<input class="right maxwidth75" type="number" name="'.$delay['code'].'" value="'.$value.'"> '.$langs->trans("days").'</td></tr>';
-			}
-		}
-	}
-
-	print '</table>';
-
-	print '<br>';
-
-	// Show if meteo is enabled
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
-
-	print '<tr class="oddeven">';
-	print '<td>'.$langs->trans("MAIN_DISABLE_METEO").'</td><td class="center">';
-	print $form->selectarray('MAIN_DISABLE_METEO', $labelmeteo, (empty($conf->global->MAIN_DISABLE_METEO) ? 0 : $conf->global->MAIN_DISABLE_METEO));
-	print '</td></tr>';
-
-	print '</table>';
+    print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" name="form_index">';
+    print '<input type="hidden" name="token" value="'.newToken().'">';
+    print '<input type="hidden" name="action" value="update">';
+    
+    print '<table class="noborder centpercent">';
+    print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
+    
+    foreach ($modules as $module => $delays)
+    {
+        if (!empty($conf->$module->enabled))
+        {
+            foreach ($delays as $delay)
+            {
+                $value = (!empty($conf->global->{$delay['code']}) ? $conf->global->{$delay['code']}:0);
+                print '<tr class="oddeven">';
+                print '<td width="20px">'.img_object('', $delay['img']).'</td>';
+                print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td><td class="nowraponall">';
+                print '<input class="right maxwidth75" type="number" name="'.$delay['code'].'" value="'.$value.'"> '.$langs->trans("days").'</td></tr>';
+            }
+        }
+    }
+    
+    print '</table>';
+    
+    print '<br>';
+    
+    // Show if meteo is enabled
+    print '<table class="noborder centpercent">';
+    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
+    
+    print '<tr class="oddeven">';
+    print '<td>'.$langs->trans("MAIN_DISABLE_METEO").'</td><td class="center">';
+    print $form->selectarray('MAIN_DISABLE_METEO', $labelmeteo, (empty($conf->global->MAIN_DISABLE_METEO) ? 0 : $conf->global->MAIN_DISABLE_METEO));
+    print '</td></tr>';
+    
+    print '</table>';
 } else {
-	/*
+    /*
      * Show parameters
      */
-
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
-
-	foreach ($modules as $module => $delays)
-	{
-		if (!empty($conf->$module->enabled))
-		{
-			foreach ($delays as $delay)
-			{
-				$value = (!empty($conf->global->{$delay['code']}) ? $conf->global->{$delay['code']}:0);
-				print '<tr class="oddeven">';
-				print '<td width="20px">'.img_object('', $delay['img']).'</td>';
-				print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td>';
-				print '<td class="right">'.$value.' '.$langs->trans("days").'</td></tr>';
-			}
-		}
-	}
-
-	print '</table>';
-
-	print '<br>';
-
-	// Show if meteo is enabled
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
-
-	print '<tr class="oddeven">';
-	print '<td>'.$langs->trans("MAIN_DISABLE_METEO").'</td><td class="center">';
-	if (!isset($conf->global->MAIN_DISABLE_METEO)) $conf->global->MAIN_DISABLE_METEO = 0;
-	print $labelmeteo[$conf->global->MAIN_DISABLE_METEO];
-	print '</td></tr>';
-
-	print '</table>';
+    
+    print '<table class="noborder centpercent">';
+    print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
+    
+    foreach ($modules as $module => $delays)
+    {
+        if (!empty($conf->$module->enabled))
+        {
+            foreach ($delays as $delay)
+            {
+                $value = (!empty($conf->global->{$delay['code']}) ? $conf->global->{$delay['code']}:0);
+                print '<tr class="oddeven">';
+                print '<td width="20px">'.img_object('', $delay['img']).'</td>';
+                print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td>';
+                print '<td class="right">'.$value.' '.$langs->trans("days").'</td></tr>';
+            }
+        }
+    }
+    
+    print '</table>';
+    
+    print '<br>';
+    
+    // Show if meteo is enabled
+    print '<table class="noborder centpercent">';
+    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
+    
+    print '<tr class="oddeven">';
+    print '<td>'.$langs->trans("MAIN_DISABLE_METEO").'</td><td class="center">';
+    print $labelmeteo[$conf->global->MAIN_DISABLE_METEO];
+    print '</td></tr>';
+    
+    print '</table>';
 }
 
 print '<br>';
 
 
-if (empty($conf->global->MAIN_DISABLE_METEO) || $conf->global->MAIN_DISABLE_METEO != 1) {
-	// Show logo for weather
-	print '<span class="opacitymedium">'.$langs->trans("DescWeather").'</span> ';
-
-	if ($action == 'edit') {
-		$str_mode_std = $langs->trans('MeteoStdModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->transnoentitiesnoconv('MeteoPercentageMod'));
-		$str_mode_percentage = $langs->trans('MeteoPercentageModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->transnoentitiesnoconv('MeteoStdMod'));
-		if (empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $str_mode_enabled = $str_mode_std;
-		else $str_mode_enabled = $str_mode_percentage;
-		print '<a href="#" onclick="return false;" id="change_mode">'.$str_mode_enabled.'</a>';
-		print '<input type="hidden" id="MAIN_USE_METEO_WITH_PERCENTAGE" name="MAIN_USE_METEO_WITH_PERCENTAGE" value="'.$conf->global->MAIN_USE_METEO_WITH_PERCENTAGE.'" />';
-
-		print '<br><br>';
-	} else {
-		if (empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) print $langs->trans('MeteoStdModEnabled');
-		else print $langs->trans('MeteoPercentageModEnabled');
-		print '<br><br>';
-	}
-
-	$offset = 0;
-	$cursor = 10; // By default
-	//if (! empty($conf->global->MAIN_METEO_OFFSET)) $offset=$conf->global->MAIN_METEO_OFFSET;
-	//if (! empty($conf->global->MAIN_METEO_GAP)) $cursor=$conf->global->MAIN_METEO_GAP;
-	$level0 = $offset; if (!empty($conf->global->MAIN_METEO_LEVEL0)) $level0 = $conf->global->MAIN_METEO_LEVEL0;
-	$level1 = $offset + 1 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL1)) $level1 = $conf->global->MAIN_METEO_LEVEL1;
-	$level2 = $offset + 2 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL2)) $level2 = $conf->global->MAIN_METEO_LEVEL2;
-	$level3 = $offset + 3 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL3)) $level3 = $conf->global->MAIN_METEO_LEVEL3;
-	$level4 = $offset + 4 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL4)) $level4 = $conf->global->MAIN_METEO_LEVEL4;
-	$text = ''; $options = 'class="valignmiddle" height="60px"';
-
-
-	if ($action == 'edit') {
-		print '<div id="standard" '.(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '' : 'style="display:none;"').'>';
-
-		print '<div>';
-		print '<div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 0, $options);
-		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL0" value="'.$level0.'"/></td>';
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 1, $options);
-		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL1" value="'.$level1.'"/></td>';
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 2, $options);
-		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL2" value="'.$level2.'"/></td>';
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 3, $options);
-		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL3" value="'.$level3.'"/></td>';
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 4, $options);
-		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL4" value="'.$level4.'"/></td>';
-		print '</div>';
-		print '</div>';
-
-		print '</div>';
-
-		print '<div id="percentage" '.(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? 'style="display:none;"' : '').'>';
-
-		print '<div>';
-		print '<div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 0, $options);
-		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL0" value="'.(isset($conf->global->MAIN_METEO_PERCENTAGE_LEVEL0) ? $conf->global->MAIN_METEO_PERCENTAGE_LEVEL0 : '0').'"/>&nbsp;%</td>';
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 1, $options);
-		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL1" value="'.(isset($conf->global->MAIN_METEO_PERCENTAGE_LEVEL1) ? $conf->global->MAIN_METEO_PERCENTAGE_LEVEL1 : '10').'"/>&nbsp;%</td>';
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 2, $options);
-		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL2" value="'.(isset($conf->global->MAIN_METEO_PERCENTAGE_LEVEL2) ? $conf->global->MAIN_METEO_PERCENTAGE_LEVEL2 : '20').'"/>&nbsp;%</td>';
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 3, $options);
-		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL3" value="'.(isset($conf->global->MAIN_METEO_PERCENTAGE_LEVEL3) ? $conf->global->MAIN_METEO_PERCENTAGE_LEVEL3 : '30').'"/>&nbsp;%</td>';
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 4, $options);
-		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL4" value="'.(isset($conf->global->MAIN_METEO_PERCENTAGE_LEVEL4) ? $conf->global->MAIN_METEO_PERCENTAGE_LEVEL4 : '40').'"/>&nbsp;%</td>';
-		print '</div>';
-		print '</div>';
-
-		print '</div>';
-
-		?>
+if ($conf->global->MAIN_DISABLE_METEO != 1) {
+    // Show logo for weather
+    print '<span class="opacitymedium">'.$langs->trans("DescWeather").'</span> ';
+    
+    if ($action == 'edit') {
+        $str_mode_std = $langs->trans('MeteoStdModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->transnoentitiesnoconv('MeteoPercentageMod'));
+        $str_mode_percentage = $langs->trans('MeteoPercentageModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->transnoentitiesnoconv('MeteoStdMod'));
+        if (empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $str_mode_enabled = $str_mode_std;
+        else $str_mode_enabled = $str_mode_percentage;
+        print '<a href="#" onclick="return false;" id="change_mode">'.$str_mode_enabled.'</a>';
+        print '<input type="hidden" id="MAIN_USE_METEO_WITH_PERCENTAGE" name="MAIN_USE_METEO_WITH_PERCENTAGE" value="'.$conf->global->MAIN_USE_METEO_WITH_PERCENTAGE.'" />';
+        
+        print '<br><br>';
+    } else {
+        if (empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) print $langs->trans('MeteoStdModEnabled');
+        else print $langs->trans('MeteoPercentageModEnabled');
+        print '<br><br>';
+    }
+    
+    $offset = 0;
+    $cursor = 10; // By default
+    //if (! empty($conf->global->MAIN_METEO_OFFSET)) $offset=$conf->global->MAIN_METEO_OFFSET;
+    //if (! empty($conf->global->MAIN_METEO_GAP)) $cursor=$conf->global->MAIN_METEO_GAP;
+    $level0 = $offset; if (!empty($conf->global->MAIN_METEO_LEVEL0)) $level0 = $conf->global->MAIN_METEO_LEVEL0;
+    $level1 = $offset + 1 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL1)) $level1 = $conf->global->MAIN_METEO_LEVEL1;
+    $level2 = $offset + 2 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL2)) $level2 = $conf->global->MAIN_METEO_LEVEL2;
+    $level3 = $offset + 3 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL3)) $level3 = $conf->global->MAIN_METEO_LEVEL3;
+    $text = ''; $options = 'class="valignmiddle" height="60px"';
+    
+    
+    if ($action == 'edit') {
+        print '<div id="standard" '.(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '' : 'style="display:none;"').'>';
+        
+        print '<div>';
+        print '<div class="inline-block" style="padding-right: 20px">';
+        print img_weather($text, 0, $options);
+        print ' &lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL0" value="'.$level0.'"/></td>';
+        print '</div><div class="inline-block" style="padding-right: 20px">';
+        print img_weather($text, 1, $options);
+        print ' &lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL1" value="'.$level1.'"/></td>';
+        print '</div><div class="inline-block" style="padding-right: 20px">';
+        print img_weather($text, 2, $options);
+        print ' &lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL2" value="'.$level2.'"/></td>';
+        print '</div><div class="inline-block" style="padding-right: 20px">';
+        print img_weather($text, 3, $options);
+        print ' &lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL3" value="'.$level3.'"/></td>';
+        print '</div>';
+        print '</div>';
+        
+        print '</div>';
+        
+        print '<div id="percentage" '.(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? 'style="display:none;"' : '').'>';
+        
+        print '<div>';
+        print '<div class="inline-block" style="padding-right: 20px">';
+        print img_weather($text, 0, $options);
+        print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL0" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL0.'"/>&nbsp;%</td>';
+        print '</div><div class="inline-block" style="padding-right: 20px">';
+        print img_weather($text, 1, $options);
+        print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL1" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL1.'"/>&nbsp;%</td>';
+        print '</div><div class="inline-block" style="padding-right: 20px">';
+        print img_weather($text, 2, $options);
+        print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL2" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL2.'"/>&nbsp;%</td>';
+        print '</div><div class="inline-block" style="padding-right: 20px">';
+        print img_weather($text, 3, $options);
+        print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL3" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'"/>&nbsp;%</td>';
+        print '</div>';
+        print '</div>';
+        
+        print '</div>';
+        
+        ?>
 
 		<script type="text/javascript">
 
@@ -400,19 +392,19 @@ if (empty($conf->global->MAIN_DISABLE_METEO) || $conf->global->MAIN_DISABLE_METE
 			print '<div>';
 			print '<div class="inline-block" style="padding-right: 20px">';
 			print img_weather($text, 0, $options);
-			print ' &lt;= '.(isset($conf->global->MAIN_METEO_PERCENTAGE_LEVEL0) ? $conf->global->MAIN_METEO_PERCENTAGE_LEVEL0 : '0').'&nbsp;%</td>';
+			print ' &lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL0.'&nbsp;%</td>';
 			print '</div><div class="inline-block" style="padding-right: 20px">';
 			print img_weather($text, 1, $options);
-			print ' &lt;= '.(isset($conf->global->MAIN_METEO_PERCENTAGE_LEVEL1) ? $conf->global->MAIN_METEO_PERCENTAGE_LEVEL1 : '10').'&nbsp;%</td>';
+			print ' &lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL1.'&nbsp;%</td>';
 			print '</div><div class="inline-block" style="padding-right: 20px">';
 			print img_weather($text, 2, $options);
-			print ' &lt;= '.(isset($conf->global->MAIN_METEO_PERCENTAGE_LEVEL2) ? $conf->global->MAIN_METEO_PERCENTAGE_LEVEL2 : '20').'&nbsp;%</td>';
+			print ' &lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL2.'&nbsp;%</td>';
 			print '</div><div class="inline-block" style="padding-right: 20px">';
 			print img_weather($text, 3, $options);
-			print ' &lt;= '.(isset($conf->global->MAIN_METEO_PERCENTAGE_LEVEL3) ? $conf->global->MAIN_METEO_PERCENTAGE_LEVEL3 : '30').'&nbsp;%</td>';
+			print ' &lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'&nbsp;%</td>';
 			print '</div><div class="inline-block" style="padding-right: 20px">';
 			print img_weather($text, 4, $options);
-			print ' &gt; '.(isset($conf->global->MAIN_METEO_PERCENTAGE_LEVEL4) ? $conf->global->MAIN_METEO_PERCENTAGE_LEVEL4 : '40').'&nbsp;%</td>';
+			print ' &gt; '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'&nbsp;%</td>';
 			print '</div>';
 			print '</div>';
 		} else {
@@ -431,7 +423,7 @@ if (empty($conf->global->MAIN_DISABLE_METEO) || $conf->global->MAIN_DISABLE_METE
 			print ' &lt;= '.$level3;
 			print '</div><div class="inline-block" style="padding-right: 20px">';
 			print img_weather($text, 4, $options);
-			print ' &gt; '.$level4;
+			print ' &gt; '.$level3;
 			print '</div>';
 			print '</div>';
 		}

From ade0e008e9c8c80c2db310eb6c0c82bb489dd5e1 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Sat, 2 Jan 2021 17:42:33 +0100
Subject: [PATCH 760/888] Some debug on Shipments. Wrong object status on list
 paging. Parameter error on link contact. nbr Linked files not shown in tab
 badge.

---
 htdocs/core/lib/sendings.lib.php | 2 +-
 htdocs/expedition/contact.php    | 2 +-
 htdocs/expedition/list.php       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index cf1d1793a88..0bb0db6afd1 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -81,7 +81,7 @@ function shipping_prepare_head($object)
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->commande->dir_output."/".dol_sanitizeFileName($object->ref);
+	$upload_dir = $conf->expedition->dir_output."/sending/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/expedition/document.php?id='.$object->id;
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index c6b10bd6967..ffdd395cffc 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -80,7 +80,7 @@ if ($action == 'addcontact' && $user->rights->expedition->creer)
 {
 	if ($result > 0 && $id > 0)
 	{
-  		$result = $objectsrc->add_contact(GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'), $_POST["type"], $_POST["source"]);
+  		$result = $objectsrc->add_contact(GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'), $_POST["typecontact"], $_POST["source"]);
 	}
 
 	if ($result >= 0)
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index eaae2438b55..4494db8c21d 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -340,7 +340,7 @@ if ($resql)
 
 	if ($search_product_category != '') $param .= '&search_product_category='.urlencode($search_product_category);
 	if ($search_categ_cus > 0)      $param .= '&search_categ_cus='.urlencode($search_categ_cus);
-	if ($search_status != '') $param .= '&viewstatut='.urlencode($search_status);
+	if ($search_status != '') $param .= '&search_status='.urlencode($search_status);
 	if ($optioncss != '')  $param .= '&optioncss='.urlencode($optioncss);
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';

From 821ef72d482c4669d2d3c3e286551cb9d8a9063b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Jan 2021 17:43:02 +0100
Subject: [PATCH 761/888] Fix warnings

---
 .../email_expire_services_to_customers.php    | 24 +++++++++-----
 ...ail_expire_services_to_representatives.php | 23 ++++++++-----
 .../email_unpaid_invoices_to_customers.php    | 32 ++++++++++++-------
 ...ail_unpaid_invoices_to_representatives.php | 11 ++++---
 4 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/scripts/contracts/email_expire_services_to_customers.php b/scripts/contracts/email_expire_services_to_customers.php
index 5c98dc2913b..596a5794d70 100755
--- a/scripts/contracts/email_expire_services_to_customers.php
+++ b/scripts/contracts/email_expire_services_to_customers.php
@@ -74,8 +74,9 @@ $duration_value2 = isset($argv[4]) ? $argv[4] : 'none';
 $error = 0;
 print $script_file." launched with mode ".$mode." default lang=".$langs->defaultlang.(is_numeric($duration_value) ? " delay=".$duration_value : "").(is_numeric($duration_value2) ? " after=".$duration_value2 : "")."\n";
 
-if ($mode != 'confirm')
+if ($mode != 'confirm') {
 	$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
+}
 
 $sql = "SELECT c.ref, cd.date_fin_validite, cd.total_ttc, cd.description as description, p.label as plabel,";
 $sql .= " s.rowid as sid, s.nom as name, s.email, s.default_lang";
@@ -115,6 +116,7 @@ if ($resql) {
 	print "We found ".$num." couples (services to expire-".$targettype.") qualified\n";
 	dol_syslog("We found ".$num." couples (services to expire-".$targettype.") qualified");
 	$message = '';
+	$oldtarget = '';
 
 	if ($num) {
 		while ($i < $num) {
@@ -124,12 +126,17 @@ if ($resql) {
 
 			// Check if this record is a break after previous one
 			$startbreak = false;
-			if ($newemail != $oldemail || $oldemail == 'none')
+			if ($newemail != $oldemail || $oldemail == 'none') {
 				$startbreak = true;
-			if ($obj->sid && $obj->sid != $oldsid)
-				$startbreak = true;
-			if ($obj->cid && $obj->cid != $oldcid)
+			}
+			if ($obj->sid && $obj->sid != $oldsid) {
 				$startbreak = true;
+			}
+			if ($targettype == 'contacts') {
+				if ($obj->cid && $obj->cid != $oldcid) {
+					$startbreak = true;
+				}
+			}
 
 			if ($startbreak) {
 				// Break onto sales representative (new email or cid)
@@ -145,13 +152,14 @@ if ($resql) {
 				}
 				$oldemail = $newemail;
 				$oldsid = $obj->sid;
-				$oldcid = $obj->cid;
+				if ($targettype == 'contacts') {
+					$oldcid = $obj->cid;
+				}
 				$oldlang = $obj->lang;
 				$oldtarget = (empty($obj->cfirstname) && empty($obj->clastname)) ? $obj->name : ($obj->clastname." ".$obj->cfirstname);
 				$message = '';
 				$total = 0;
 				$foundtoprocess = 0;
-				$target = (empty($obj->cfirstname) && empty($obj->clastname)) ? $obj->name : ($obj->clastname." ".$obj->cfirstname);
 				// if (empty($newemail)) print "Warning: Customer ".$target." has no email. Notice disabled.\n";
 			}
 
@@ -167,7 +175,7 @@ if ($resql) {
 				dol_syslog("email_expire_services_to_customers.php: ".$newemail." ".$message);
 				$foundtoprocess++;
 			}
-			print "Service to expire ".$obj->ref.", label ".dol_concatdesc($obj->plabel, $obj->description).", due date ".dol_print_date($db->jdate($obj->date_fin_validite), 'day').", customer id ".$obj->sid." ".$obj->name.", ".($obj->cid ? "contact id ".$obj->cid." ".$obj->clastname." ".$obj->cfirstname.", " : "")."email ".$newemail.", lang ".$outputlangs->defaultlang.": ";
+			print "Service to expire ".$obj->ref.", label ".dol_concatdesc($obj->plabel, $obj->description).", due date ".dol_print_date($db->jdate($obj->date_fin_validite), 'day').", customer id ".$obj->sid." ".$obj->name.", ".(isset($obj->cid) ? "contact id ".$obj->cid." ".$obj->clastname." ".$obj->cfirstname.", " : "")."email ".$newemail.", lang ".$outputlangs->defaultlang.": ";
 			if (dol_strlen($newemail))
 				print "qualified.";
 			else print "disqualified (no email).";
diff --git a/scripts/contracts/email_expire_services_to_representatives.php b/scripts/contracts/email_expire_services_to_representatives.php
index eec151376ee..2c8429b6256 100755
--- a/scripts/contracts/email_expire_services_to_representatives.php
+++ b/scripts/contracts/email_expire_services_to_representatives.php
@@ -70,8 +70,9 @@ $duration_value = isset($argv[2]) ? $argv[2] : 'none';
 
 print $script_file." launched with mode ".$mode." default lang=".$langs->defaultlang.(is_numeric($duration_value) ? " delay=".$duration_value : "")."\n";
 
-if ($mode != 'confirm')
+if ($mode != 'confirm') {
 	$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
+}
 
 $sql = "SELECT DISTINCT c.ref, c.fk_soc, cd.date_fin_validite, cd.total_ttc, cd.description as description, p.label as plabel, s.rowid, s.nom as name, s.email, s.default_lang,";
 $sql .= " u.rowid as uid, u.lastname, u.firstname, u.email, u.lang";
@@ -192,25 +193,31 @@ function envoi_mail($mode, $oldemail, $message, $total, $userlang, $oldsalerepre
 	$newlangs->load("contracts");
 
 	if ($duration_value) {
-		if ($duration_value > 0)
+		if ($duration_value > 0) {
 			$title = $newlangs->transnoentities("ListOfServicesToExpireWithDuration", $duration_value);
-		else $title = $newlangs->transnoentities("ListOfServicesToExpireWithDurationNeg", $duration_value);
-	} else $title = $newlangs->transnoentities("ListOfServicesToExpire");
+		} else {
+			$title = $newlangs->transnoentities("ListOfServicesToExpireWithDurationNeg", $duration_value);
+		}
+	} else {
+		$title = $newlangs->transnoentities("ListOfServicesToExpire");
+	}
 
 	$subject = (empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_SUBJECT) ? $title : $conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_SUBJECT);
 	$sendto = $oldemail;
-	$from = $conf->global->MAIN_MAIL_EMAIL_FROM;
-	$errorsto = $conf->global->MAIN_MAIL_ERRORS_TO;
+	$from = empty($conf->global->MAIN_MAIL_EMAIL_FROM) ? '' : $conf->global->MAIN_MAIL_EMAIL_FROM;
+	$errorsto = empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '' : $conf->global->MAIN_MAIL_ERRORS_TO;
 	$msgishtml = - 1;
 
 	print "- Send email for ".$oldsalerepresentative." (".$oldemail."), total: ".$total."\n";
 	dol_syslog("email_expire_services_to_representatives.php: send mail to ".$oldemail);
 
 	$usehtml = 0;
-	if (dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER))
+	if (!empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER) && dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER)) {
 		$usehtml += 1;
-	if (dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER))
+	}
+	if (!empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER) && dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER)) {
 		$usehtml += 1;
+	}
 
 	$allmessage = '';
 	if (!empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER)) {
diff --git a/scripts/invoices/email_unpaid_invoices_to_customers.php b/scripts/invoices/email_unpaid_invoices_to_customers.php
index 9b59fcab6f7..a569a34d0fa 100755
--- a/scripts/invoices/email_unpaid_invoices_to_customers.php
+++ b/scripts/invoices/email_unpaid_invoices_to_customers.php
@@ -74,8 +74,9 @@ $duration_value2 = isset($argv[4]) ? $argv[4] : 'none';
 $error = 0;
 print $script_file." launched with mode ".$mode." default lang=".$langs->defaultlang.(is_numeric($duration_value) ? " delay=".$duration_value : "").(is_numeric($duration_value2) ? " after=".$duration_value2 : "")."\n";
 
-if ($mode != 'confirm')
+if ($mode != 'confirm') {
 	$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
+}
 
 $sql = "SELECT f.ref, f.total_ttc, f.date_lim_reglement as due_date,";
 $sql .= " s.rowid as sid, s.nom as name, s.email, s.default_lang";
@@ -113,6 +114,7 @@ if ($resql) {
 	print "We found ".$num." couples (unpayed validated invoices-".$targettype.") qualified\n";
 	dol_syslog("We found ".$num." couples (unpayed validated invoices-".$targettype.") qualified");
 	$message = '';
+	$oldtarget = '';
 
 	if ($num) {
 		while ($i < $num) {
@@ -122,12 +124,17 @@ if ($resql) {
 
 			// Check if this record is a break after previous one
 			$startbreak = false;
-			if ($newemail != $oldemail || $oldemail == 'none')
+			if ($newemail != $oldemail || $oldemail == 'none') {
 				$startbreak = true;
-			if ($obj->sid && $obj->sid != $oldsid)
-				$startbreak = true;
-			if ($obj->cid && $obj->cid != $oldcid)
+			}
+			if ($obj->sid && $obj->sid != $oldsid) {
 				$startbreak = true;
+			}
+			if ($targettype == 'contacts') {
+				if ($obj->cid && $obj->cid != $oldcid) {
+					$startbreak = true;
+				}
+			}
 
 			if ($startbreak) {
 				// Break onto sales representative (new email or cid)
@@ -143,13 +150,14 @@ if ($resql) {
 				}
 				$oldemail = $newemail;
 				$oldsid = $obj->sid;
-				$oldcid = $obj->cid;
+				if ($targettype == 'contacts') {
+					$oldcid = $obj->cid;
+				}
 				$oldlang = $obj->lang;
 				$oldtarget = (empty($obj->cfirstname) && empty($obj->clastname)) ? $obj->name : ($obj->clastname." ".$obj->cfirstname);
 				$message = '';
 				$total = 0;
 				$foundtoprocess = 0;
-				$target = (empty($obj->cfirstname) && empty($obj->clastname)) ? $obj->name : ($obj->clastname." ".$obj->cfirstname);
 				// if (empty($newemail)) print "Warning: Customer ".$target." has no email. Notice disabled.\n";
 			}
 
@@ -165,7 +173,7 @@ if ($resql) {
 				dol_syslog("email_unpaid_invoices_to_customers.php: ".$newemail." ".$message);
 				$foundtoprocess++;
 			}
-			print "Unpaid invoice ".$obj->ref.", price ".price2num($obj->total_ttc).", due date ".dol_print_date($db->jdate($obj->due_date), 'day').", customer id ".$obj->sid." ".$obj->name.", ".($obj->cid ? "contact id ".$obj->cid." ".$obj->clastname." ".$obj->cfirstname.", " : "")."email ".$newemail.", lang ".$outputlangs->defaultlang.": ";
+			print "Unpaid invoice ".$obj->ref.", price ".price2num($obj->total_ttc).", due date ".dol_print_date($db->jdate($obj->due_date), 'day').", customer id ".$obj->sid." ".$obj->name.", ".(isset($obj->cid) ? "contact id ".$obj->cid." ".$obj->clastname." ".$obj->cfirstname.", " : "")."email ".$newemail.", lang ".$outputlangs->defaultlang.": ";
 			if (dol_strlen($newemail))
 				print "qualified.";
 			else print "disqualified (no email).";
@@ -229,17 +237,17 @@ function envoi_mail($mode, $oldemail, $message, $total, $userlang, $oldtarget)
 
 	$subject = (empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_SUBJECT) ? $newlangs->trans("ListOfYourUnpaidInvoices") : $conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_SUBJECT);
 	$sendto = $oldemail;
-	$from = $conf->global->MAIN_MAIL_EMAIL_FROM;
-	$errorsto = $conf->global->MAIN_MAIL_ERRORS_TO;
+	$from = empty($conf->global->MAIN_MAIL_EMAIL_FROM) ? '' : $conf->global->MAIN_MAIL_EMAIL_FROM;
+	$errorsto = empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '' : $conf->global->MAIN_MAIL_ERRORS_TO;
 	$msgishtml = - 1;
 
 	print "- Send email to '".$oldtarget."' (".$oldemail."), total: ".$total."\n";
 	dol_syslog("email_unpaid_invoices_to_customers.php: send mail to ".$oldemail);
 
 	$usehtml = 0;
-	if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER))
+	if (!empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER) && dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER))
 		$usehtml += 1;
-	if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER))
+	if (!empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER) && dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER))
 		$usehtml += 1;
 
 	$allmessage = '';
diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php
index d401894363d..d5c71c70565 100755
--- a/scripts/invoices/email_unpaid_invoices_to_representatives.php
+++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php
@@ -70,8 +70,9 @@ $duration_value = isset($argv[2]) ? $argv[2] : 'none';
 
 print $script_file." launched with mode ".$mode." default lang=".$langs->defaultlang.(is_numeric($duration_value) ? " delay=".$duration_value : "")."\n";
 
-if ($mode != 'confirm')
+if ($mode != 'confirm') {
 	$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
+}
 
 $sql = "SELECT f.ref, f.total_ttc, f.date_lim_reglement as due_date, s.nom as name, s.email, s.default_lang,";
 $sql .= " u.rowid as uid, u.lastname, u.firstname, u.email, u.lang";
@@ -196,17 +197,17 @@ function envoi_mail($mode, $oldemail, $message, $total, $userlang, $oldsalerepre
 
 	$subject = (empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_SUBJECT) ? $newlangs->trans("ListOfYourUnpaidInvoices") : $conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_SUBJECT);
 	$sendto = $oldemail;
-	$from = $conf->global->MAIN_MAIL_EMAIL_FROM;
-	$errorsto = $conf->global->MAIN_MAIL_ERRORS_TO;
+	$from = empty($conf->global->MAIN_MAIL_EMAIL_FROM) ? '' : $conf->global->MAIN_MAIL_EMAIL_FROM;
+	$errorsto = empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '' : $conf->global->MAIN_MAIL_ERRORS_TO;
 	$msgishtml = - 1;
 
 	print "- Send email for ".$oldsalerepresentative." (".$oldemail."), total: ".$total."\n";
 	dol_syslog("email_unpaid_invoices_to_representatives.php: send mail to ".$oldemail);
 
 	$usehtml = 0;
-	if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER))
+	if (!empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER) && dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER))
 		$usehtml += 1;
-	if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER))
+	if (!empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER) && dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER))
 		$usehtml += 1;
 
 	$allmessage = '';

From 96411ed49126c77c141a525efc614a2ee7cdc83e Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sat, 2 Jan 2021 18:05:18 +0100
Subject: [PATCH 762/888] Fix use dolGetButton in templates

---
 .../template/class/myobject.class.php         |  2 +-
 .../modulebuilder/template/myobject_card.php  | 30 ++++---------------
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index a15f0f67fe9..e33aa866b8e 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -697,7 +697,7 @@ class MyObject extends CommonObject
 		 return -1;
 		 }*/
 
-		return $this->setStatusCommon($user, self::STATUS_CANCELED, $notrigger, 'MYOBJECT_CLOSE');
+		return $this->setStatusCommon($user, self::STATUS_CANCELED, $notrigger, 'MYOBJECT_CANCEL');
 	}
 
 	/**
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index cc6630c5a01..84fa7594e11 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -466,7 +466,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		{
 			// Send
 			if (empty($user->socid)) {
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>'."\n";
+				print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle');
 			}
 
 			// Back to draft
@@ -476,30 +476,15 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				}
 			}
 
-			// Modify
-			if ($permissiontoadd) {
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit">'.$langs->trans("Modify").'</a>'."\n";
-			} else {
-				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
-			}
+			print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit', $permissiontoadd);
 
 			// Validate
 			if ($object->status == $object::STATUS_DRAFT) {
-				if ($permissiontoadd) {
-					if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0))
-					{
-						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes">'.$langs->trans("Validate").'</a>';
-					} else {
-						$langs->load("errors");
-						print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
-					}
-				}
+				print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes', $permissiontoadd);
 			}
 
 			// Clone
-			if ($permissiontoadd) {
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=myobject">'.$langs->trans("ToClone").'</a>'."\n";
-			}
+			print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=scrumsprint', $permissiontoadd);
 
 			/*
 			if ($permissiontoadd)
@@ -521,12 +506,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			*/
 
 			// Delete (need delete permission, or if draft, just need create/modify permission)
-			if ($permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd))
-			{
-				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
-			} else {
-				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
-			}
+			print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
 		}
 		print '</div>'."\n";
 	}

From 1ebb018903f974fc77c684cd9b4a300b5cd6a405 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 3 Jan 2021 04:11:25 +0100
Subject: [PATCH 763/888] Add language file

---
 htdocs/accountancy/bookkeeping/balance.php | 2 +-
 htdocs/accountancy/bookkeeping/list.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 1547983da0c..d23d826bf42 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("accountancy"));
+$langs->loadLangs(array("accountancy", "compta"));
 
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $sortorder = GETPOST("sortorder", 'alpha');
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index b3cec7710a4..b66e10c0f71 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("accountancy"));
+$langs->loadLangs(array("accountancy", "compta"));
 
 $socid = GETPOST('socid', 'int');
 

From 1d5089e95e2af58ef8c93832dba98a8e263f0846 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 3 Jan 2021 04:42:21 +0100
Subject: [PATCH 764/888] Repare link to create unknown account

---
 htdocs/accountancy/bookkeeping/balance.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index d23d826bf42..7ac795b784b 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -321,8 +321,8 @@ if ($action != 'export_csv')
 		$root_account_description = $tmparrayforrootaccount['label'];
 		$root_account_number = $tmparrayforrootaccount['account_number'];
 
-		if (empty($accountingaccountstatic->label) && $accountingaccountstatic->id > 0) {
-			$link = '<a href="'.DOL_URL_ROOT.'/accountancy/admin/card.php?action=update&token='.newToken().'&id='.$accountingaccountstatic->id.'">'.img_edit().'</a>';
+		if (empty($tmparrayforrootaccount['label'])) {
+			$link = '<a href="'.DOL_URL_ROOT.'/accountancy/admin/card.php?action=create&accountingaccount='.length_accountg($line->numero_compte).'">'.img_edit_add().'</a>';
 		}
 
 		if (!empty($show_subgroup))

From 691e8580cd732d91610b5373c62555780f3d721b Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 3 Jan 2021 05:44:07 +0100
Subject: [PATCH 765/888] Add date_export on new ledger & subledger to show
 edit or delete link when is not export yet

---
 .../accountancy/bookkeeping/listbyaccount.php | 67 +++++++++++++----
 .../bookkeeping/listbysubaccount.php          | 73 ++++++++++++++-----
 .../accountancy/class/bookkeeping.class.php   | 18 +++--
 3 files changed, 117 insertions(+), 41 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 4847dfd2e9a..6bab55f0f52 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -48,6 +48,14 @@ $search_date_endday =  GETPOST('search_date_endday', 'int');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);
 $search_date_end = dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
+$search_date_export_startyear =  GETPOST('search_date_export_startyear', 'int');
+$search_date_export_startmonth =  GETPOST('search_date_export_startmonth', 'int');
+$search_date_export_startday =  GETPOST('search_date_export_startday', 'int');
+$search_date_export_endyear =  GETPOST('search_date_export_endyear', 'int');
+$search_date_export_endmonth =  GETPOST('search_date_export_endmonth', 'int');
+$search_date_export_endday =  GETPOST('search_date_export_endday', 'int');
+$search_date_export_start = dol_mktime(0, 0, 0, $search_date_export_startmonth, $search_date_export_startday, $search_date_export_startyear);
+$search_date_export_end = dol_mktime(0, 0, 0, $search_date_export_endmonth, $search_date_export_endday, $search_date_export_endyear);
 
 $search_accountancy_code = GETPOST("search_accountancy_code");
 $search_accountancy_code_start = GETPOST('search_accountancy_code_start', 'alpha');
@@ -128,6 +136,7 @@ $arrayfields = array(
 	't.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1),
 	't.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1),
 	't.lettering_code'=>array('label'=>$langs->trans("LetteringCode"), 'checked'=>1),
+	't.date_export'=>array('label'=>$langs->trans("DateExport"), 'checked'=>1),
 );
 
 if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) unset($arrayfields['t.lettering_code']);
@@ -181,6 +190,14 @@ if (empty($reshook))
 		$search_date_endyear = '';
 		$search_date_endmonth = '';
 		$search_date_endday = '';
+		$search_date_export_start = '';
+		$search_date_export_end = '';
+		$search_date_export_startyear = '';
+		$search_date_export_startmonth = '';
+		$search_date_export_startday = '';
+		$search_date_export_endyear = '';
+		$search_date_export_endmonth = '';
+		$search_date_export_endday = '';
 		$search_debit = '';
 		$search_credit = '';
 		$search_lettering_code = '';
@@ -251,6 +268,14 @@ if (empty($reshook))
 		$filter['t.reconciled_option'] = $search_not_reconciled;
 		$param .= '&search_not_reconciled='.urlencode($search_not_reconciled);
 	}
+	if (!empty($search_date_export_start)) {
+		$filter['t.date_export>='] = $search_date_export_start;
+		$param .= '&search_date_export_startmonth='.$search_date_export_startmonth.'&search_date_export_startday='.$search_date_export_startday.'&search_date_export_startyear='.$search_date_export_startyear;
+	}
+	if (!empty($search_date_export_end)) {
+		$filter['t.date_export<='] = $search_date_export_end;
+		$param .= '&search_date_export_endmonth='.$search_date_export_endmonth.'&search_date_export_endday='.$search_date_export_endday.'&search_date_export_endyear='.$search_date_export_endyear;
+	}
 }
 
 if ($action == 'delbookkeeping' && $user->rights->accounting->mouvements->supprimer) {
@@ -490,6 +515,17 @@ if (!empty($arrayfields['t.lettering_code']['checked']))
 	print '<br><span class="nowrap"><input type="checkbox" name="search_reconciled_option" value="notreconciled"'.($search_not_reconciled == 'notreconciled' ? ' checked' : '').'>'.$langs->trans("NotReconciled").'</span>';
 	print '</td>';
 }
+// Date export
+if (!empty($arrayfields['t.date_export']['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_export_start, 'search_date_export_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
+	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_export_end, 'search_date_export_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
+	print '</div>';
+	print '</td>';
+}
 
 // Fields from hook
 $parameters = array('arrayfields'=>$arrayfields);
@@ -512,6 +548,7 @@ if (!empty($arrayfields['t.label_operation']['checked']))		print_liste_field_tit
 if (!empty($arrayfields['t.debit']['checked']))					print_liste_field_titre($arrayfields['t.debit']['label'], $_SERVER['PHP_SELF'], "t.debit", "", $param, '', $sortfield, $sortorder, 'right ');
 if (!empty($arrayfields['t.credit']['checked']))				print_liste_field_titre($arrayfields['t.credit']['label'], $_SERVER['PHP_SELF'], "t.credit", "", $param, '', $sortfield, $sortorder, 'right ');
 if (!empty($arrayfields['t.lettering_code']['checked']))		print_liste_field_titre($arrayfields['t.lettering_code']['label'], $_SERVER['PHP_SELF'], "t.lettering_code", "", $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['t.date_export']['checked']))			print_liste_field_titre($arrayfields['t.date_export']['label'], $_SERVER['PHP_SELF'], "t.date_export", "", $param, '', $sortfield, $sortorder, 'center ');
 // Hook fields
 $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
@@ -542,13 +579,12 @@ while ($i < min($num, $limit))
 
 	// Is it a break ?
 	if ($accountg != $displayed_account_number || !isset($displayed_account_number)) {
-        if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
-            $colnumber = 3;
-            $colnumberend = 7;
-        } else {
-            $colnumber = 4;
-            $colnumberend = 7;
-        }
+		$colnumber = 5;
+		$colnumberend = 7;
+
+		if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) $colnumber--;
+		if (empty($arrayfields['t.date_export']['checked'])) $colnumber--;
+
         $colspan = $totalarray['nbfield'] - $colnumber;
         $colspanend = $totalarray['nbfield'] - $colnumberend;
 		// Show a subtotal by accounting account
@@ -581,7 +617,7 @@ while ($i < min($num, $limit))
 
 		// Show the break account
 		print "<tr>";
-		print '<td colspan="'.($totalarray['nbfield'] ? $totalarray['nbfield'] : 9).'" style="font-weight:bold; border-bottom: 1pt solid black;">';
+		print '<td colspan="'.($totalarray['nbfield'] ? $totalarray['nbfield'] : 10).'" style="font-weight:bold; border-bottom: 1pt solid black;">';
 		if ($line->numero_compte != "" && $line->numero_compte != '-1') print length_accountg($line->numero_compte).' : '.$object->get_compte_desc($line->numero_compte);
 		else print '<span class="error">'.$langs->trans("Unknown").'</span>';
 		print '</td>';
@@ -722,6 +758,13 @@ while ($i < min($num, $limit))
 		if (!$i) $totalarray['nbfield']++;
 	}
 
+	// Exported operation date
+	if (!empty($arrayfields['t.date_export']['checked']))
+	{
+		print '<td class="center">'.dol_print_date($line->date_export, 'dayhour').'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
 	// Fields from hook
 	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
@@ -750,14 +793,6 @@ while ($i < min($num, $limit))
 }
 
 if ($num > 0) {
-	// Show sub-total of last shown account
-	if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
-	    $colnumber = 3;
-	    $colnumberend = 7;
-	} else {
-	    $colnumber = 4;
-	    $colnumberend = 7;
-	}
 	$colspan = $totalarray['nbfield'] - $colnumber;
 	$colspanend = $totalarray['nbfield'] - $colnumberend;
 	print '<tr class="liste_total">';
diff --git a/htdocs/accountancy/bookkeeping/listbysubaccount.php b/htdocs/accountancy/bookkeeping/listbysubaccount.php
index abbf5df60e7..f010e9efbcf 100644
--- a/htdocs/accountancy/bookkeeping/listbysubaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbysubaccount.php
@@ -48,6 +48,14 @@ $search_date_endday =  GETPOST('search_date_endday', 'int');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);
 $search_date_end = dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
+$search_date_export_startyear =  GETPOST('search_date_export_startyear', 'int');
+$search_date_export_startmonth =  GETPOST('search_date_export_startmonth', 'int');
+$search_date_export_startday =  GETPOST('search_date_export_startday', 'int');
+$search_date_export_endyear =  GETPOST('search_date_export_endyear', 'int');
+$search_date_export_endmonth =  GETPOST('search_date_export_endmonth', 'int');
+$search_date_export_endday =  GETPOST('search_date_export_endday', 'int');
+$search_date_export_start = dol_mktime(0, 0, 0, $search_date_export_startmonth, $search_date_export_startday, $search_date_export_startyear);
+$search_date_export_end = dol_mktime(0, 0, 0, $search_date_export_endmonth, $search_date_export_endday, $search_date_export_endyear);
 
 $search_accountancy_code = GETPOST("search_accountancy_code");
 $search_accountancy_code_start = GETPOST('search_accountancy_code_start', 'alpha');
@@ -128,6 +136,7 @@ $arrayfields = array(
 	't.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1),
 	't.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1),
 	't.lettering_code'=>array('label'=>$langs->trans("LetteringCode"), 'checked'=>1),
+	't.date_export'=>array('label'=>$langs->trans("DateExport"), 'checked'=>1),
 );
 
 if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) unset($arrayfields['t.lettering_code']);
@@ -149,6 +158,7 @@ if ($search_date_end && empty($search_date_endyear)) {
 /*
  * Action
  */
+
 if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
 
@@ -180,6 +190,14 @@ if (empty($reshook))
 		$search_date_endyear = '';
 		$search_date_endmonth = '';
 		$search_date_endday = '';
+		$search_date_export_start = '';
+		$search_date_export_end = '';
+		$search_date_export_startyear = '';
+		$search_date_export_startmonth = '';
+		$search_date_export_startday = '';
+		$search_date_export_endyear = '';
+		$search_date_export_endmonth = '';
+		$search_date_export_endday = '';
 		$search_debit = '';
 		$search_credit = '';
 		$search_lettering_code = '';
@@ -250,6 +268,14 @@ if (empty($reshook))
 		$filter['t.reconciled_option'] = $search_not_reconciled;
 		$param .= '&search_not_reconciled='.urlencode($search_not_reconciled);
 	}
+	if (!empty($search_date_export_start)) {
+		$filter['t.date_export>='] = $search_date_export_start;
+		$param .= '&search_date_export_startmonth='.$search_date_export_startmonth.'&search_date_export_startday='.$search_date_export_startday.'&search_date_export_startyear='.$search_date_export_startyear;
+	}
+	if (!empty($search_date_export_end)) {
+		$filter['t.date_export<='] = $search_date_export_end;
+		$param .= '&search_date_export_endmonth='.$search_date_export_endmonth.'&search_date_export_endday='.$search_date_export_endday.'&search_date_export_endyear='.$search_date_export_endyear;
+	}
 }
 
 if ($action == 'delbookkeeping' && $user->rights->accounting->mouvements->supprimer) {
@@ -287,7 +313,7 @@ if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouveme
 		}
 
 		// Make a redirect to avoid to launch the delete later after a back button
-		header("Location: listbysubaccount.php".($param ? '?'.$param : ''));
+		header("Location: ".$_SERVER["PHP_SELF"].($param ? '?'.$param : ''));
 		exit;
 	} else {
 		setEventMessages("NoRecordDeleted", null, 'warnings');
@@ -304,7 +330,7 @@ if ($action == 'delmouvconfirm' && $user->rights->accounting->mouvements->suppri
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 		}
 
-		header("Location: listbysubaccount.php?noreset=1".($param ? '&'.$param : ''));
+		header("Location: ".$_SERVER["PHP_SELF"]."?noreset=1".($param ? '&'.$param : ''));
 		exit;
 	}
 }
@@ -403,7 +429,6 @@ if (empty($reshook)) {
 	$newcardbutton = dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param);
 	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php', '', 1, array('morecss' => 'marginleftonly'));
 	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbysubaccount.php', '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
-
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=create');
 }
 
@@ -494,6 +519,17 @@ if (!empty($arrayfields['t.lettering_code']['checked']))
 	print '<br><span class="nowrap"><input type="checkbox" name="search_reconciled_option" value="notreconciled"'.($search_not_reconciled == 'notreconciled' ? ' checked' : '').'>'.$langs->trans("NotReconciled").'</span>';
 	print '</td>';
 }
+// Date export
+if (!empty($arrayfields['t.date_export']['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_export_start, 'search_date_export_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
+	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_export_end, 'search_date_export_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
+	print '</div>';
+	print '</td>';
+}
 
 // Fields from hook
 $parameters = array('arrayfields'=>$arrayfields);
@@ -516,6 +552,7 @@ if (!empty($arrayfields['t.label_operation']['checked']))		print_liste_field_tit
 if (!empty($arrayfields['t.debit']['checked']))					print_liste_field_titre($arrayfields['t.debit']['label'], $_SERVER['PHP_SELF'], "t.debit", "", $param, '', $sortfield, $sortorder, 'right ');
 if (!empty($arrayfields['t.credit']['checked']))				print_liste_field_titre($arrayfields['t.credit']['label'], $_SERVER['PHP_SELF'], "t.credit", "", $param, '', $sortfield, $sortorder, 'right ');
 if (!empty($arrayfields['t.lettering_code']['checked']))		print_liste_field_titre($arrayfields['t.lettering_code']['label'], $_SERVER['PHP_SELF'], "t.lettering_code", "", $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['t.date_export']['checked']))			print_liste_field_titre($arrayfields['t.date_export']['label'], $_SERVER['PHP_SELF'], "t.date_export", "", $param, '', $sortfield, $sortorder, 'center ');
 // Hook fields
 $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
@@ -546,13 +583,12 @@ while ($i < min($num, $limit))
 
 	// Is it a break ?
 	if ($accountg != $displayed_account_number || !isset($displayed_account_number)) {
-        if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
-            $colnumber = 3;
-            $colnumberend = 7;
-        } else {
-            $colnumber = 4;
-            $colnumberend = 7;
-        }
+		$colnumber = 5;
+		$colnumberend = 7;
+
+		if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) $colnumber--;
+		if (empty($arrayfields['t.date_export']['checked'])) $colnumber--;
+
         $colspan = $totalarray['nbfield'] - $colnumber;
         $colspanend = $totalarray['nbfield'] - $colnumberend;
 		// Show a subtotal by accounting account
@@ -585,7 +621,7 @@ while ($i < min($num, $limit))
 
 		// Show the break account
 		print "<tr>";
-		print '<td colspan="'.($totalarray['nbfield'] ? $totalarray['nbfield'] : 9).'" style="font-weight:bold; border-bottom: 1pt solid black;">';
+		print '<td colspan="'.($totalarray['nbfield'] ? $totalarray['nbfield'] : 10).'" style="font-weight:bold; border-bottom: 1pt solid black;">';
 		if ($line->subledger_account != "" && $line->subledger_account != '-1') {
 			print $object->get_compte_desc($line->numero_compte).' : '.length_accounta($line->subledger_account);
 		} else {
@@ -734,6 +770,13 @@ while ($i < min($num, $limit))
 		if (!$i) $totalarray['nbfield']++;
 	}
 
+	// Exported operation date
+	if (!empty($arrayfields['t.date_export']['checked']))
+	{
+		print '<td class="center">'.dol_print_date($line->date_export, 'dayhour').'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
 	// Fields from hook
 	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
@@ -762,14 +805,6 @@ while ($i < min($num, $limit))
 }
 
 if ($num > 0) {
-	// Show sub-total of last shown account
-	if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
-	    $colnumber = 3;
-	    $colnumberend = 7;
-	} else {
-	    $colnumber = 4;
-	    $colnumberend = 7;
-	}
 	$colspan = $totalarray['nbfield'] - $colnumber;
 	$colspanend = $totalarray['nbfield'] - $colnumberend;
 	print '<tr class="liste_total">';
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 72428762459..8261a5f4173 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -795,7 +795,7 @@ class BookKeeping extends CommonObject
 		$sql .= " t.label_operation,";
 		$sql .= " t.debit,";
 		$sql .= " t.credit,";
-		$sql .= " t.montant,";
+		$sql .= " t.montant as amount,";
 		$sql .= " t.sens,";
 		$sql .= " t.multicurrency_amount,";
 		$sql .= " t.multicurrency_code,";
@@ -806,7 +806,8 @@ class BookKeeping extends CommonObject
 		$sql .= " t.code_journal,";
 		$sql .= " t.journal_label,";
 		$sql .= " t.piece_num,";
-		$sql .= " t.date_creation";
+		$sql .= " t.date_creation,";
+		$sql .= " t.date_export";
 		// Manage filter
 		$sqlwhere = array();
 		if (count($filter) > 0) {
@@ -823,6 +824,8 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key.' LIKE \''.$this->db->escape($value).'%\'';
 				} elseif ($key == 't.date_creation>=' || $key == 't.date_creation<=') {
 					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
+				} elseif ($key == 't.date_export>=' || $key == 't.date_export<=') {
+					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.credit' || $key == 't.debit') {
 					$sqlwhere[] = natural_search($key, $value, 1, 1);
                 } elseif ($key == 't.reconciled_option') {
@@ -878,7 +881,8 @@ class BookKeeping extends CommonObject
 				$line->label_operation = $obj->label_operation;
 				$line->debit = $obj->debit;
 				$line->credit = $obj->credit;
-				$line->montant = $obj->montant;
+				$line->montant = $obj->amount; // deprecated
+				$line->amount = $obj->amount;
 				$line->sens = $obj->sens;
 				$line->multicurrency_amount = $obj->multicurrency_amount;
 				$line->multicurrency_code = $obj->multicurrency_code;
@@ -889,7 +893,8 @@ class BookKeeping extends CommonObject
 				$line->code_journal = $obj->code_journal;
 				$line->journal_label = $obj->journal_label;
 				$line->piece_num = $obj->piece_num;
-				$line->date_creation = $obj->date_creation;
+				$line->date_creation = $this->db->jdate($obj->date_creation);
+				$line->date_export = $this->db->jdate($obj->date_export);
 
 				$this->lines[] = $line;
 
@@ -941,7 +946,7 @@ class BookKeeping extends CommonObject
 		$sql .= " t.credit,";
 		$sql .= " t.lettering_code,";
 		$sql .= " t.date_lettering,";
-		$sql .= " t.montant,";
+		$sql .= " t.montant as amount,";
 		$sql .= " t.sens,";
 		$sql .= " t.fk_user_author,";
 		$sql .= " t.import_key,";
@@ -1019,7 +1024,8 @@ class BookKeeping extends CommonObject
 				$line->label_operation = $obj->label_operation;
 				$line->debit = $obj->debit;
 				$line->credit = $obj->credit;
-				$line->montant = $obj->montant;
+				$line->montant = $obj->amount;	// deprecated
+				$line->amount = $obj->amount;
 				$line->sens = $obj->sens;
 				$line->lettering_code = $obj->lettering_code;
 				$line->date_lettering = $obj->date_lettering;

From 799927432c349653c566f45164c5fe9d347fb587 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Sun, 3 Jan 2021 10:53:48 +0100
Subject: [PATCH 766/888] regression for user type on shipment contact

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

diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index ffdd395cffc..09559a64a2c 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -80,7 +80,7 @@ if ($action == 'addcontact' && $user->rights->expedition->creer)
 {
 	if ($result > 0 && $id > 0)
 	{
-  		$result = $objectsrc->add_contact(GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'), $_POST["typecontact"], $_POST["source"]);
+  		$result = $objectsrc->add_contact(GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'), GETPOST('type') ? GETPOST('type') : GETPOST('typecontact'), GETPOST('source'));
 	}
 
 	if ($result >= 0)

From cbf6fe1f6282e69fe04dd550cae646af3cade65c Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Sun, 3 Jan 2021 11:42:11 +0100
Subject: [PATCH 767/888] Clean code

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

diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index 09559a64a2c..c5d74a2f39d 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -80,7 +80,9 @@ if ($action == 'addcontact' && $user->rights->expedition->creer)
 {
 	if ($result > 0 && $id > 0)
 	{
-  		$result = $objectsrc->add_contact(GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'), GETPOST('type') ? GETPOST('type') : GETPOST('typecontact'), GETPOST('source'));
+  		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+		$result = $objectsrc->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 	}
 
 	if ($result >= 0)

From a8ecea1a8931b03a1f94568859115ec8987e4851 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 3 Jan 2021 11:54:50 +0100
Subject: [PATCH 768/888] NEW: Accountancy - Add closure menu in stable version

---
 htdocs/core/menus/standard/eldy.lib.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 46950bdc50c..5082f230b0c 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1332,9 +1332,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				}
 
 				// Closure
-				if (!empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2) {
-					$newmenu->add("/accountancy/closure/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_closure", $langs->trans("MenuAccountancyClosure"), 1, $user->rights->accounting->fiscalyear->write, '', $mainmenu, 'closure');
-				}
+				$newmenu->add("/accountancy/closure/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_closure", $langs->trans("MenuAccountancyClosure"), 1, $user->rights->accounting->fiscalyear->write, '', $mainmenu, 'closure');
 
 				// Reports
 				$newmenu->add("/accountancy/index.php?leftmenu=accountancy_report", $langs->trans("Reportings"), 1, $user->rights->accounting->comptarapport->lire, '', $mainmenu, 'ca');

From 43423650cde23b693d03ceb1b6561ab80bf4038e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 3 Jan 2021 11:57:40 +0100
Subject: [PATCH 769/888] NEW: Accountancy - Add closure menu in auguria menu

---
 htdocs/core/menus/init_menu_auguria.sql | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 27eed001188..efa0c44a4ff 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -296,7 +296,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 -- Journals
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2434__+MAX_llx_menu__, 'accountancy', 'bookkeeping', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/list.php?mainmenu=accountancy&leftmenu=accountancy_bookeeping', 'Journals', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 15, __ENTITY__);
 -- Export accounting documents
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2436__+MAX_llx_menu__, 'accountancy', 'accountancy_files', 2400__+MAX_llx_menu__, '/compta/accounting-files.php?mainmenu=accountancy&leftmenu=accountancy_files', 'AccountantFiles', 1, 'accountancy', '$user->rights->compta->resultat->lire || $user->rights->accounting->mouvements->lire', '', 0, 17, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2436__+MAX_llx_menu__, 'accountancy', 'accountancy_files', 2400__+MAX_llx_menu__, '/compta/accounting-files.php?mainmenu=accountancy&leftmenu=accountancy_files', 'AccountantFiles', 1, 'accountancy', '$user->rights->compta->resultat->lire || $user->rights->accounting->mouvements->lire', '', 0, 16, __ENTITY__);
+-- Closure
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2437__+MAX_llx_menu__, 'accountancy', 'accountancy_closure', 2400__+MAX_llx_menu__, '/accountancy/closure/index.php?mainmenu=accountancy&leftmenu=accountancy_closure', 'MenuAccountancyClosure', 1, 'accountancy', '$user->rights->accounting->fiscalyear->write', '', 0, 17, __ENTITY__);
 -- Reports
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2440__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2400__+MAX_llx_menu__, '/compta/resultat/index.php?mainmenu=accountancy&leftmenu=accountancy_report', 'Reportings', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 17, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2441__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2440__+MAX_llx_menu__, '/compta/resultat/index.php?mainmenu=accountancy&leftmenu=accountancy_report', 'MenuReportInOut', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 18, __ENTITY__);

From 50d2e2d16153345ac88e21892be2b50f0f1a7eb1 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Sun, 3 Jan 2021 12:21:20 +0100
Subject: [PATCH 770/888] Debug reception contacts and list

---
 htdocs/reception/contact.php | 9 +++------
 htdocs/reception/list.php    | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/htdocs/reception/contact.php b/htdocs/reception/contact.php
index 908f7a441be..ad8811a4e1f 100644
--- a/htdocs/reception/contact.php
+++ b/htdocs/reception/contact.php
@@ -67,11 +67,6 @@ if ($id > 0 || !empty($ref))
 		$objectsrc = new CommandeFournisseur($db);
 		$objectsrc->fetch($object->$typeobject->id);
 	}
-	if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
-	{
-		$objectsrc = new Propal($db);
-		$objectsrc->fetch($object->$typeobject->id);
-	}
 }
 
 
@@ -83,7 +78,9 @@ if ($action == 'addcontact' && $user->rights->reception->creer)
 {
 	if ($result > 0 && $id > 0)
 	{
-  		$result = $objectsrc->add_contact(GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'), $_POST["type"], $_POST["source"]);
+		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+		$result = $objectsrc->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 	}
 
 	if ($result >= 0)
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index ec08c7ba94a..30d31291a74 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -505,7 +505,7 @@ if ($resql)
 	if ($search_town)  $param .= "&amp;search_town=".urlencode($search_town);
 	if ($search_zip)  $param .= "&amp;search_zip=".urlencode($search_zip);
 	if ($search_state) $param .= "&amp;search_state=".urlencode($search_state);
-	if ($search_status) $param .= "&amp;search_status=".urlencode($search_status);
+	if ($search_status != '') $param .= "&amp;search_status=".urlencode($search_status);
 	if ($search_country) $param .= "&amp;search_country=".urlencode($search_country);
 	if ($search_type_thirdparty) $param .= "&amp;search_type_thirdparty=".urlencode($search_type_thirdparty);
 	if ($search_ref_supplier) $param .= "&amp;search_ref_supplier=".urlencode($search_ref_supplier);

From 236ff2d4e47ceb37c683031caabb0eb5769f8839 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Sun, 3 Jan 2021 12:26:10 +0100
Subject: [PATCH 771/888] indent

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

diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index c5d74a2f39d..d15e267b285 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -80,7 +80,7 @@ if ($action == 'addcontact' && $user->rights->expedition->creer)
 {
 	if ($result > 0 && $id > 0)
 	{
-  		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
 		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 		$result = $objectsrc->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 	}

From 3cdcaa70d833d53285c6f762c79cbd55f0ee7986 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 3 Jan 2021 14:29:22 +0100
Subject: [PATCH 772/888] Fix warning

---
 scripts/contracts/email_expire_services_to_customers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/contracts/email_expire_services_to_customers.php b/scripts/contracts/email_expire_services_to_customers.php
index 596a5794d70..802f0b14434 100755
--- a/scripts/contracts/email_expire_services_to_customers.php
+++ b/scripts/contracts/email_expire_services_to_customers.php
@@ -155,7 +155,7 @@ if ($resql) {
 				if ($targettype == 'contacts') {
 					$oldcid = $obj->cid;
 				}
-				$oldlang = $obj->lang;
+				$oldlang = $obj->default_lang;
 				$oldtarget = (empty($obj->cfirstname) && empty($obj->clastname)) ? $obj->name : ($obj->clastname." ".$obj->cfirstname);
 				$message = '';
 				$total = 0;

From 156e08894b2a8576f1519a26e89203812bd2dc89 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 3 Jan 2021 14:32:10 +0100
Subject: [PATCH 773/888] Missing module

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dfeb209bfc3..7b8fa4546b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -403,8 +403,9 @@ script:
   php step5.php 12.0.0 13.0.0 > $TRAVIS_BUILD_DIR/upgrade12001300-3.log
 
   # Enable modules not enabled into original dump
-  php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_PRODUCTBATCH,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKET,MAIN_MODULE_ACCOUNTING,MAIN_MODULE_MRP > $TRAVIS_BUILD_DIR/enablemodule.log
-  php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_RECEPTION,MAIN_MODULE_RECRUITMENT > $TRAVIS_BUILD_DIR/enablemodule.log
+  php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_PRODUCTBATCH,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_STRIPE > $TRAVIS_BUILD_DIR/enablemodule.log
+  php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKET,MAIN_MODULE_ACCOUNTING,MAIN_MODULE_MRP >> $TRAVIS_BUILD_DIR/enablemodule.log
+  php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_RECEPTION,MAIN_MODULE_RECRUITMENT >> $TRAVIS_BUILD_DIR/enablemodule.log
   echo $?
   cd -
   set +e

From 9300951c6ed847c4b08d57a21a08069cadbbcc5d Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 3 Jan 2021 14:54:35 +0100
Subject: [PATCH 774/888] Add language file

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

diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index e7a8a31af4e..06910c3da0c 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -36,7 +36,7 @@ if (!$user->rights->user->user->lire && !$user->admin) {
 }
 
 // Load translation files required by page
-$langs->loadLangs(array('users', 'companies', 'hrm'));
+$langs->loadLangs(array('users', 'companies', 'hrm', 'salaries'));
 
 $action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)

From e18bdfd9f060c5ead73b669f0a06b71c7ba9143c Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 3 Jan 2021 15:01:15 +0100
Subject: [PATCH 775/888] Add missing language key

---
 htdocs/langs/en_US/main.lang | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 7075df90783..e18d0671662 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1112,4 +1112,5 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
-OnHold=On hold
\ No newline at end of file
+OnHold=On hold
+Civility=Civility

From f462f68056dcc1dd443244854e8f15bdd3f24a88 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 3 Jan 2021 15:10:33 +0100
Subject: [PATCH 776/888] Code comment

---
 htdocs/core/db/DoliDB.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index 837946ce706..8f2a9dc315e 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -89,7 +89,7 @@ abstract class DoliDB implements Database
 	 */
     public function idate($param)
 	{
-		// TODO GMT $param should be gmt, so we should add tzouptut to 'gmt'
+		// TODO $param should be gmt, so we should add tzouptut to 'gmt' instead of default 'tzserver'
 		return dol_print_date($param, "%Y-%m-%d %H:%M:%S");
 	}
 
@@ -285,7 +285,7 @@ abstract class DoliDB implements Database
 	 */
     public function jdate($string, $gm = false)
 	{
-		// TODO GMT must set param gm to true by default
+		// TODO $string should be converted into a GMT timestamp, so param gm should be set to true by default instead of false
 		if ($string == 0 || $string == "0000-00-00 00:00:00") return '';
 		$string = preg_replace('/([^0-9])/i', '', $string);
 		$tmp = $string.'000000';

From 8ad5dc81de8268eea6ed4e299a5fe4088712abc4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 3 Jan 2021 15:13:29 +0100
Subject: [PATCH 777/888] GETPOST

---
 htdocs/comm/action/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 0709a2571ad..fcb33bd544a 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -445,8 +445,8 @@ if (empty($reshook) && $action == 'update')
 		$object->fetch_userassigned();
 		$object->oldcopy = clone $object;
 
-		$datep = dol_mktime($fulldayevent ? '00' : $aphour, $fulldayevent ? '00' : $apmin, 0, $_POST["apmonth"], $_POST["apday"], $_POST["apyear"]);
-		$datef = dol_mktime($fulldayevent ? '23' : $p2hour, $fulldayevent ? '59' : $p2min, $fulldayevent ? '59' : '0', $_POST["p2month"], $_POST["p2day"], $_POST["p2year"]);
+		$datep = dol_mktime($fulldayevent ? '00' : $aphour, $fulldayevent ? '00' : $apmin, 0, GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'));
+		$datef = dol_mktime($fulldayevent ? '23' : $p2hour, $fulldayevent ? '59' : $p2min, $fulldayevent ? '59' : '0', GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'));
 
 		$object->type_id     = dol_getIdFromCode($db, GETPOST("actioncode", 'aZ09'), 'c_actioncomm');
 		$object->label       = GETPOST("label", "alphanohtml");

From e190b010d3aae2aa6c501d37003f6a921a36a924 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sun, 3 Jan 2021 16:05:04 +0100
Subject: [PATCH 778/888] Fix dict contact type element list

---
 htdocs/core/lib/admin.lib.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 7b3d66f9003..1bae8d0224f 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1382,7 +1382,14 @@ function complete_elementList_with_modules(&$elementList)
 
                             if (!empty($objMod->module_parts['contactelement']))
                             {
-                            	$elementList[$objMod->name] = $langs->trans($objMod->name);
+                            	if(is_array($objMod->module_parts['contactelement'])) {
+									foreach ($objMod->module_parts['contactelement'] as $elem => $title) {
+										$elementList[$elem] = $langs->trans($title);
+									}
+								}
+                            	else {
+									$elementList[$objMod->name] = $langs->trans($objMod->name);
+								}
                             }
 
                             $j++;

From b0738643fbfccdeede96fbc620fd524e78950398 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 3 Jan 2021 18:42:45 +0100
Subject: [PATCH 779/888] FIX Solve problem with TZ

---
 htdocs/comm/action/card.php           | 14 ++++----
 htdocs/comm/action/document.php       |  2 +-
 htdocs/comm/action/index.php          | 50 ++++++++++++++++-----------
 htdocs/comm/action/pertype.php        | 38 ++++++++------------
 htdocs/comm/action/peruser.php        | 42 +++++++++-------------
 htdocs/contact/card.php               | 41 +++-------------------
 htdocs/core/class/conf.class.php      |  4 +++
 htdocs/core/class/html.form.class.php | 25 +++++++++-----
 htdocs/core/lib/date.lib.php          | 13 ++++---
 htdocs/core/lib/functions.lib.php     | 33 +++++++++++++-----
 htdocs/core/lib/functions2.lib.php    | 32 ++++++++---------
 htdocs/theme/eldy/global.inc.php      |  2 +-
 12 files changed, 141 insertions(+), 155 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index b1fb2d0b014..6499db671cb 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -462,10 +462,10 @@ if (empty($reshook) && $action == 'update')
 	if (empty($cancel))
 	{
 		$fulldayevent = GETPOST('fullday');
-		$aphour = GETPOST('aphour');
-		$apmin = GETPOST('apmin');
-		$p2hour = GETPOST('p2hour');
-		$p2min = GETPOST('p2min');
+		$aphour = GETPOST('aphour', 'int');
+		$apmin = GETPOST('apmin', 'int');
+		$p2hour = GETPOST('p2hour', 'int');
+		$p2min = GETPOST('p2min', 'int');
 		$percentage = in_array(GETPOST('status'), array(-1, 100)) ?GETPOST('status') : (in_array(GETPOST('complete'), array(-1, 100)) ?GETPOST('complete') : GETPOST("percentage")); // If status is -1 or 100, percentage is not defined and we must use status
 
 		// Clean parameters
@@ -1324,8 +1324,8 @@ if ($id > 0)
 	{
 		$percentage = in_array(GETPOST('status'), array(-1, 100)) ?GETPOST('status') : (in_array(GETPOST('complete'), array(-1, 100)) ?GETPOST('complete') : GETPOST("percentage")); // If status is -1 or 100, percentage is not defined and we must use status
 
-		$datep = dol_mktime($fulldayevent ? '00' : $aphour, $fulldayevent ? '00' : $apmin, 0, $_POST["apmonth"], $_POST["apday"], $_POST["apyear"]);
-		$datef = dol_mktime($fulldayevent ? '23' : $p2hour, $fulldayevent ? '59' : $p2min, $fulldayevent ? '59' : '0', $_POST["p2month"], $_POST["p2day"], $_POST["p2year"]);
+		$datep = dol_mktime($fulldayevent ? '00' : $aphour, $fulldayevent ? '00' : $apmin, 0, GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'));
+		$datef = dol_mktime($fulldayevent ? '23' : $p2hour, $fulldayevent ? '59' : $p2min, $fulldayevent ? '59' : '0', GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'));
 
 		$object->type_id     = dol_getIdFromCode($db, GETPOST("actioncode", 'aZ09'), 'c_actioncomm');
 		$object->label       = GETPOST("label", "alphanohtml");
@@ -1431,7 +1431,7 @@ if ($id > 0)
 		// Full day event
 		print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td colspan="3"><input type="checkbox" id="fullday" name="fullday" '.($object->fulldayevent ? ' checked' : '').'></td></tr>';
 
-		// Date start
+		// Date start - end
 		print '<tr><td class="nowrap"><span class="fieldrequired">'.$langs->trans("DateActionStart").' - '.$langs->trans("DateActionEnd").'</span></td><td colspan="3">';
 		if (GETPOST("afaire") == 1) {
 			print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 0, "action", 1, 1, 0, 'fulldaystart');
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 613ac76380e..5b4cc58bb08 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -208,7 +208,7 @@ if ($object->id > 0)
 		if (!empty($object->userassigned))	// Now concat assigned users
 		{
 			// Restore array with key with same value than param 'id'
-			$tmplist1 = $object->userassigned; $tmplist2 = array();
+			$tmplist1 = $object->userassigned;
 			foreach ($tmplist1 as $key => $val)
 			{
 				if ($val['id'] && $val['id'] != $object->userownerid) $listofuserid[$val['id']] = $val;
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index f5822669bba..b37762a644a 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -272,17 +272,17 @@ if (empty($action) || $action == 'show_month')
 	$next_year  = $next['year'];
 	$next_month = $next['month'];
 
-	$max_day_in_prev_month = date("t", dol_mktime(0, 0, 0, $prev_month, 1, $prev_year)); // Nb of days in previous month
+	$max_day_in_prev_month = date("t", dol_mktime(0, 0, 0, $prev_month, 1, $prev_year, 'gmt')); // Nb of days in previous month
 	$max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year)); // Nb of days in next month
 	// tmpday is a negative or null cursor to know how many days before the 1st to show on month view (if tmpday=0, 1st is monday)
-	$tmpday = -date("w", dol_mktime(12, 0, 0, $month, 1, $year, true)) + 2; // date('w') is 0 fo sunday
+	$tmpday = -date("w", dol_mktime(12, 0, 0, $month, 1, $year, 'gmt')) + 2; // date('w') is 0 fo sunday
 	$tmpday += ((isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1) - 1);
 	if ($tmpday >= 1) $tmpday -= 7; // If tmpday is 0 we start with sunday, if -6, we start with monday of previous week.
 	// Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
-	$firstdaytoshow = dol_mktime(0, 0, 0, $prev_month, $max_day_in_prev_month + $tmpday, $prev_year);
+	$firstdaytoshow = dol_mktime(0, 0, 0, $prev_month, $max_day_in_prev_month + $tmpday, $prev_year, 'gmt');
 	$next_day = 7 - ($max_day_in_month + 1 - $tmpday) % 7;
 	if ($next_day < 6) $next_day += 7;
-	$lastdaytoshow = dol_mktime(0, 0, 0, $next_month, $next_day, $next_year);
+	$lastdaytoshow = dol_mktime(0, 0, 0, $next_month, $next_day, $next_year, 'gmt');
 }
 if ($action == 'show_week')
 {
@@ -303,7 +303,7 @@ if ($action == 'show_week')
 	$next_day   = $next['day'];
 
 	// Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
-	$firstdaytoshow = dol_mktime(0, 0, 0, $first_month, $first_day, $first_year);
+	$firstdaytoshow = dol_mktime(0, 0, 0, $first_month, $first_day, $first_year, 'gmt');
 	$lastdaytoshow = dol_time_plus_duree($firstdaytoshow, 7, 'd');
 
 	$max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year));
@@ -322,8 +322,8 @@ if ($action == 'show_day')
 	$next_day   = $next['day'];
 
 	// Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
-	$firstdaytoshow = dol_mktime(0, 0, 0, $prev_month, $prev_day, $prev_year);
-	$lastdaytoshow = dol_mktime(0, 0, 0, $next_month, $next_day, $next_year);
+	$firstdaytoshow = dol_mktime(0, 0, 0, $prev_month, $prev_day, $prev_year, 'gmt');
+	$lastdaytoshow = dol_mktime(0, 0, 0, $next_month, $next_day, $next_year, 'gmt');
 }
 //print 'xx'.$prev_year.'-'.$prev_month.'-'.$prev_day;
 //print 'xx'.$next_year.'-'.$next_month.'-'.$next_day;
@@ -399,13 +399,14 @@ $param .= '&year='.$year.'&month='.$month.($day ? '&day='.$day : '');
 
 
 
-$tabactive = '';
+/*$tabactive = '';
 if ($action == 'show_month') $tabactive = 'cardmonth';
 if ($action == 'show_week') $tabactive = 'cardweek';
 if ($action == 'show_day')  $tabactive = 'cardday';
 if ($action == 'show_list') $tabactive = 'cardlist';
 if ($action == 'show_pertuser') $tabactive = 'cardperuser';
 if ($action == 'show_pertype') $tabactive = 'cardpertype';
+*/
 
 $paramnoaction = preg_replace('/action=[a-z_]+/', '', $param);
 
@@ -704,9 +705,7 @@ if ($resql)
 		}
 
 		// Check values
-		if ($event->date_end_in_calendar < $firstdaytoshow ||
-		$event->date_start_in_calendar >= $lastdaytoshow)
-		{
+		if ($event->date_end_in_calendar < $firstdaytoshow || $event->date_start_in_calendar >= $lastdaytoshow)	{
 			// This record is out of visible range
 		} else {
 			if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar = $firstdaytoshow;
@@ -714,13 +713,15 @@ if ($resql)
 
 			// Add an entry in actionarray for each day
 			$daycursor = $event->date_start_in_calendar;
-			$annee = date('Y', $daycursor);
-			$mois = date('m', $daycursor);
-			$jour = date('d', $daycursor);
+			$annee = dol_print_date($daycursor, '%Y');
+			$mois = dol_print_date($daycursor, '%m');
+			$jour = dol_print_date($daycursor, '%d');
+			//var_dump(dol_print_date($event->date_start_in_calendar, 'dayhour', 'gmt'));
+			//var_dump($annee.'-'.$mois.'-'.$jour);
 
 			// Loop on each day covered by action to prepare an index to show on calendar
 			$loop = true; $j = 0;
-			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
+			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');
 			do {
 				//if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
 
@@ -787,9 +788,9 @@ if ($showbirthday)
 
 			// Add an entry in actionarray for each day
 			$daycursor = $event->date_start_in_calendar;
-			$annee = date('Y', $daycursor);
-			$mois = date('m', $daycursor);
-			$jour = date('d', $daycursor);
+			$annee = dol_print_date($daycursor, '%Y');
+			$mois = dol_print_date($daycursor, '%m');
+			$jour = dol_print_date($daycursor, '%d');
 
 			$loop = true;
 			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
@@ -870,9 +871,11 @@ if ($conf->global->AGENDA_SHOW_HOLIDAYS)
 				$event->label = $obj->lastname;
 			}
 
-			$annee  = date('Y', $event->date_start_in_calendar);
-			$mois   = date('m', $event->date_start_in_calendar);
-			$jour   = date('d', $event->date_start_in_calendar);
+			$daycursor = $event->date_start_in_calendar;
+			$annee = dol_print_date($daycursor, '%Y');
+			$mois = dol_print_date($daycursor, '%m');
+			$jour = dol_print_date($daycursor, '%d');
+
 			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
 
 			do {
@@ -1530,6 +1533,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 		$annee = date('Y', $daykey);
 		$mois = date('m', $daykey);
 		$jour = date('d', $daykey);
+
 		if ($day == $jour && $month == $mois && $year == $annee)
 		{
 			foreach ($eventarray[$daykey] as $index => $event)
@@ -1696,6 +1700,10 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 							$tmpyearend    = date('Y', $event->date_end_in_calendar);
 							$tmpmonthend   = date('m', $event->date_end_in_calendar);
 							$tmpdayend     = date('d', $event->date_end_in_calendar);
+							/*var_dump($tmpyearstart.' '.$tmpmonthstart.' '.$tmpdaystart);
+							var_dump($tmpyearend.' '.$tmpmonthend.' '.$tmpdayend);
+							var_dump($annee.' '.$mois.' '.$jour);*/
+
 							// Hour start
 							if ($tmpyearstart == $annee && $tmpmonthstart == $mois && $tmpdaystart == $jour)
 							{
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index c5f81e358cc..29b86b96868 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -265,13 +265,13 @@ $next_month = $month;
 $next_day   = $day;
 
 // Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
-$firstdaytoshow = dol_mktime(0, 0, 0, $first_month, $first_day, $first_year);
+$firstdaytoshow = dol_mktime(0, 0, 0, $first_month, $first_day, $first_year, 'gmt');
 $lastdaytoshow = dol_time_plus_duree($firstdaytoshow, 7, 'd');
 //print $firstday.'-'.$first_month.'-'.$first_year;
 //print dol_print_date($firstdaytoshow,'dayhour');
 //print dol_print_date($lastdaytoshow,'dayhour');
 
-$max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year));
+$max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year, 'gmt'));
 
 $tmpday = $first_day;
 $picto = 'calendarweek';
@@ -291,14 +291,6 @@ $param .= '&year='.urlencode($year).'&month='.urlencode($month).($day ? '&day='.
 //print 'x'.$param;
 
 
-$tabactive = '';
-if ($action == 'show_month') $tabactive = 'cardmonth';
-if ($action == 'show_week') $tabactive = 'cardweek';
-if ($action == 'show_day')  $tabactive = 'cardday';
-if ($action == 'show_list') $tabactive = 'cardlist';
-if ($action == 'show_peruser') $tabactive = 'cardperuser';
-if ($action == 'show_pertype') $tabactive = 'cardpertype';
-
 $paramnoaction = preg_replace('/action=[a-z_]+/', '', $param);
 
 $head = calendars_prepare_head($paramnoaction);
@@ -598,13 +590,13 @@ if ($resql)
 
 			// Add an entry in actionarray for each day
 			$daycursor = $event->date_start_in_calendar;
-			$annee = date('Y', $daycursor);
-			$mois = date('m', $daycursor);
-			$jour = date('d', $daycursor);
+			$annee = dol_print_date($daycursor, '%Y');
+			$mois = dol_print_date($daycursor, '%m');
+			$jour = dol_print_date($daycursor, '%d');
 
 			// Loop on each day covered by action to prepare an index to show on calendar
 			$loop = true; $j = 0;
-			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
+			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');
 			do {
 				//if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
 
@@ -735,7 +727,7 @@ foreach ($typeofevents as $typeofevent)
 		if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $tmpmonth && $todayarray['year'] == $tmpyear) $today = 1;
 		if ($today) $style = 'cal_today_peruser';
 
-		show_day_events_pertype($typeofevent, $tmpday, $tmpmonth, $tmpyear, $mont, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader, $colorsbytype, $var);
+		show_day_events_pertype($typeofevent, $tmpday, $tmpmonth, $tmpyear, 0, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader, $colorsbytype, $var);
 
 		$i++;
 	}
@@ -848,8 +840,6 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 	$cases1 = array(); // Color first half hour
 	$cases2 = array(); // Color second half hour
 
-	$curtime = dol_mktime(0, 0, 0, $month, $day, $year, false, 0);
-
 	$i = 0; $nummytasks = 0; $numother = 0; $numbirthday = 0; $numical = 0; $numicals = array();
 	$ymd = sprintf("%04d", $year).sprintf("%02d", $month).sprintf("%02d", $day);
 
@@ -859,16 +849,16 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 	// We are in a particular day for $username, now we scan all events
 	foreach ($eventarray as $daykey => $notused)
 	{
-		$annee = date('Y', $daykey);
-		$mois = date('m', $daykey);
-		$jour = date('d', $daykey);
-		//print $annee.'-'.$mois.'-'.$jour.' '.$year.'-'.$month.'-'.$day."<br>\n";
+		$annee = dol_print_date($daykey, '%Y', 'gmt');
+		$mois =  dol_print_date($daykey, '%m', 'gmt');
+		$jour =  dol_print_date($daykey, '%d', 'gmt');
 
 		if ($day == $jour && $month == $mois && $year == $annee)	// Is it the day we are looking for when calling function ?
 		{
 			// Scan all event for this date
 			foreach ($eventarray[$daykey] as $index => $event)
 			{
+				//print $daykey.' '.$year.'-'.$month.'-'.$day.' -> '.$event->id.' '.$index.' '.$annee.'-'.$mois.'-'.$jour."<br>\n";
 				//var_dump($event);
 
 				$keysofuserassigned = array_keys($event->userassigned);
@@ -932,9 +922,9 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 					$newcolor = ''; //init
 					if (empty($event->fulldayevent))
 					{
-						$a = dol_mktime((int) $h, 0, 0, $month, $day, $year, false, 0);
-						$b = dol_mktime((int) $h, 30, 0, $month, $day, $year, false, 0);
-						$c = dol_mktime((int) $h + 1, 0, 0, $month, $day, $year, false, 0);
+						$a = dol_mktime((int) $h, 0, 0, $month, $day, $year, 'auto', 0);
+						$b = dol_mktime((int) $h, 30, 0, $month, $day, $year, 'auto', 0);
+						$c = dol_mktime((int) $h + 1, 0, 0, $month, $day, $year, 'auto', 0);
 
 						$dateendtouse = $event->date_end_in_calendar;
 						if ($dateendtouse == $event->date_start_in_calendar) $dateendtouse++;
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 3ddea1c0cbf..55e6725ba8d 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -268,7 +268,7 @@ $next_month = $next['month'];
 $next_day   = $next['day'];
 
 // Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
-$firstdaytoshow = dol_mktime(0, 0, 0, $first_month, $first_day, $first_year);
+$firstdaytoshow = dol_mktime(0, 0, 0, $first_month, $first_day, $first_year, 'gmt');
 
 $nb_weeks_to_show = (!empty($conf->global->AGENDA_NB_WEEKS_IN_VIEW_PER_USER)) ? ((int) $conf->global->AGENDA_NB_WEEKS_IN_VIEW_PER_USER * 7) : 7;
 $lastdaytoshow = dol_time_plus_duree($firstdaytoshow, $nb_weeks_to_show, 'd');
@@ -276,7 +276,7 @@ $lastdaytoshow = dol_time_plus_duree($firstdaytoshow, $nb_weeks_to_show, 'd');
 //print dol_print_date($firstdaytoshow,'dayhour');
 //print dol_print_date($lastdaytoshow,'dayhour');
 
-$max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year));
+$max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year, 'gmt'));
 
 $tmpday = $first_day;
 $picto = 'calendarweek';
@@ -296,15 +296,6 @@ $param .= '&year='.urlencode($year).'&month='.urlencode($month).($day ? '&day='.
 //print 'x'.$param;
 
 
-
-$tabactive = '';
-if ($action == 'show_month') $tabactive = 'cardmonth';
-if ($action == 'show_week') $tabactive = 'cardweek';
-if ($action == 'show_day')  $tabactive = 'cardday';
-if ($action == 'show_list') $tabactive = 'cardlist';
-if ($action == 'show_peruser') $tabactive = 'cardperuser';
-if ($action == 'show_pertype') $tabactive = 'cardpertype';
-
 $paramnoaction = preg_replace('/action=[a-z_]+/', '', $param);
 
 $head = calendars_prepare_head($paramnoaction);
@@ -605,13 +596,13 @@ if ($resql)
 
 			// Add an entry in actionarray for each day
 			$daycursor = $event->date_start_in_calendar;
-			$annee = date('Y', $daycursor);
-			$mois = date('m', $daycursor);
-			$jour = date('d', $daycursor);
+			$annee = dol_print_date($daycursor, '%Y');
+			$mois = dol_print_date($daycursor, '%m');
+			$jour = dol_print_date($daycursor, '%d');
 
 			// Loop on each day covered by action to prepare an index to show on calendar
 			$loop = true; $j = 0;
-			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
+			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');
 			do {
 				//if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
 
@@ -680,7 +671,7 @@ while ($currentdaytoshow < $lastdaytoshow) {
 		// Filter on hours
 		print img_picto('', 'clock', 'class="fawidth30 inline-block paddingleft"');
 		print '<span class="hideonsmartphone" title="'.$langs->trans("VisibleTimeRange").'">'.$langs->trans("Hours").'</span>';
-		print "\n".'<div class="ui-grid-a inline-block"><div class="ui-block-a">';
+		print "\n".'<div class="ui-grid-a inline-block"><div class="ui-block-a nowraponall">';
 		print '<input type="number" class="short" name="begin_h" value="'.$begin_h.'" min="0" max="23">';
 		if (empty($conf->dol_use_jmobile)) print ' - ';
 		else print '</div><div class="ui-block-b">';
@@ -852,6 +843,7 @@ while ($currentdaytoshow < $lastdaytoshow) {
 			$tmpday = $tmparray['mday'];
 			$tmpmonth = $tmparray['mon'];
 			$tmpyear = $tmparray['year'];
+			//var_dump($curtime.' '.$tmpday.' '.$tmpmonth.' '.$tmpyear);
 
 			$style = 'cal_current_month';
 			if ($iter_day == 6) $style .= ' cal_other_month';
@@ -859,7 +851,7 @@ while ($currentdaytoshow < $lastdaytoshow) {
 			if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $tmpmonth && $todayarray['year'] == $tmpyear) $today = 1;
 			if ($today) $style = 'cal_today_peruser';
 
-			show_day_events2($username, $tmpday, $tmpmonth, $tmpyear, $monthshown, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader, $colorsbytype, $var);
+			show_day_events2($username, $tmpday, $tmpmonth, $tmpyear, 0, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader, $colorsbytype, $var);
 
 			$i++;
 		}
@@ -977,8 +969,6 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 	$cases1 = array(); // Color first half hour
 	$cases2 = array(); // Color second half hour
 
-	$curtime = dol_mktime(0, 0, 0, $month, $day, $year, false, 0);
-
 	$i = 0; $numother = 0; $numbirthday = 0; $numical = 0; $numicals = array();
 	$ymd = sprintf("%04d", $year).sprintf("%02d", $month).sprintf("%02d", $day);
 
@@ -989,16 +979,16 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 	// We are in a particular day for $username, now we scan all events
 	foreach ($eventarray as $daykey => $notused)
 	{
-		$annee = date('Y', $daykey);
-		$mois = date('m', $daykey);
-		$jour = date('d', $daykey);
-		//print $annee.'-'.$mois.'-'.$jour.' '.$year.'-'.$month.'-'.$day."<br>\n";
+		$annee = dol_print_date($daykey, '%Y', 'gmt');
+		$mois =  dol_print_date($daykey, '%m', 'gmt');
+		$jour =  dol_print_date($daykey, '%d', 'gmt');
 
 		if ($day == $jour && $month == $mois && $year == $annee)	// Is it the day we are looking for when calling function ?
 		{
 			// Scan all event for this date
 			foreach ($eventarray[$daykey] as $index => $event)
 			{
+				//print $daykey.' '.$year.'-'.$month.'-'.$day.' -> '.$event->id.' '.$index.' '.$annee.'-'.$mois.'-'.$jour."<br>\n";
 				//var_dump($event);
 
 				$keysofuserassigned = array_keys($event->userassigned);
@@ -1088,9 +1078,9 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 					$newcolor = ''; //init
 					if (empty($event->fulldayevent))
 					{
-						$a = dol_mktime((int) $h, 0, 0, $month, $day, $year, false, 0);
-						$b = dol_mktime((int) $h, 30, 0, $month, $day, $year, false, 0);
-						$c = dol_mktime((int) $h + 1, 0, 0, $month, $day, $year, false, 0);
+						$a = dol_mktime((int) $h, 0, 0, $month, $day, $year, 'auto', 0);
+						$b = dol_mktime((int) $h, 30, 0, $month, $day, $year, 'auto', 0);
+						$c = dol_mktime((int) $h + 1, 0, 0, $month, $day, $year, 'auto', 0);
 
 						$dateendtouse = $event->date_end_in_calendar;
 						if ($dateendtouse == $event->date_start_in_calendar) $dateendtouse++;
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 752bdc4d642..0726e2c33e2 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -638,7 +638,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 					print '</td></tr>';
 				} else {
 					print '<tr><td><label for="socid">'.$langs->trans("ThirdParty").'</label></td><td colspan="3" class="maxwidthonsmartphone">';
-					print $form->select_company($socid, 'socid', '', 'SelectThirdParty');
+					print img_picto('', 'company').$form->select_company($socid, 'socid', '', 'SelectThirdParty');
 					print '</td></tr>';
 				}
 			}
@@ -818,7 +818,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 				print '<tr><td>'.$form->editfieldkey('Categories', 'contcats', '', $object, 0).'</td><td colspan="3">';
 				$cate_arbo = $form->select_all_categories(Categorie::TYPE_CONTACT, null, 'parent', null, null, 1);
-				print $form->multiselectarray('contcats', $cate_arbo, GETPOST('contcats', 'array'), null, null, null, null, '90%');
+				print img_picto('', 'category').$form->multiselectarray('contcats', $cate_arbo, GETPOST('contcats', 'array'), null, null, null, null, '90%');
 				print "</td></tr>";
 			}
 
@@ -965,7 +965,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			{
 				print '<tr><td><label for="socid">'.$langs->trans("ThirdParty").'</label></td>';
 				print '<td colspan="3" class="maxwidthonsmartphone">';
-				print $form->select_company(GETPOST('socid', 'int') ?GETPOST('socid', 'int') : ($object->socid ? $object->socid : -1), 'socid', '', $langs->trans("SelectThirdParty"));
+				print img_picto('', 'company').$form->select_company(GETPOST('socid', 'int') ?GETPOST('socid', 'int') : ($object->socid ? $object->socid : -1), 'socid', '', $langs->trans("SelectThirdParty"));
 				print '</td>';
 				print '</tr>';
 			}
@@ -1087,39 +1087,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 					}
 				}
 			}
-			// if (! empty($conf->socialnetworks->enabled))
-			// {
-			// 	// Jabber ID
-			// 	if (! empty($conf->global->SOCIALNETWORKS_JABBER))
-			// 	{
-			// 		print '<tr><td><label for="jabberid">'.$form->editfieldkey('Jabber', 'jabberid', '', $object, 0).'</label></td>';
-			// 		print '<td><input type="text" name="jabberid" id="jabberid" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET("jabberid")?GETPOST("jabberid", 'alpha'):$object->jabberid).'"></td></tr>';
-			// 	}
-			// 	// Skype
-			// 	if (! empty($conf->global->SOCIALNETWORKS_SKYPE))
-			// 	{
-			// 		print '<tr><td><label for="skype">'.$form->editfieldkey('Skype', 'skype', '', $object, 0).'</label></td>';
-			// 		print '<td><input type="text" name="skype" id="skype" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET("skype")?GETPOST("skype", 'alpha'):$object->skype).'"></td></tr>';
-			// 	}
-			// 	// Twitter
-			// 	if (! empty($conf->global->SOCIALNETWORKS_TWITTER))
-			// 	{
-			// 		print '<tr><td><label for="twitter">'.$form->editfieldkey('Twitter', 'twitter', '', $object, 0).'</label></td>';
-			// 		print '<td><input type="text" name="twitter" id="twitter" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET("twitter")?GETPOST("twitter", 'alpha'):$object->twitter).'"></td></tr>';
-			// 	}
-			// 	// Facebook
-			//     if (! empty($conf->global->SOCIALNETWORKS_FACEBOOK))
-			//     {
-			//         print '<tr><td><label for="facebook">'.$form->editfieldkey('Facebook', 'facebook', '', $object, 0).'</label></td>';
-			//         print '<td><input type="text" name="facebook" id="facebook" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOST("facebook")?GETPOST("facebook", 'alpha'):$object->facebook).'"></td></tr>';
-			//     }
-			//     // LinkedIn
-			//     if (! empty($conf->global->SOCIALNETWORKS_LINKEDIN))
-			//     {
-			//         print '<tr><td><label for="linkedin">'.$form->editfieldkey('LinkedIn', 'linkedin', '', $object, 0).'</label></td>';
-			//         print '<td><input type="text" name="linkedin" id="linkedin" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOST("linkedin")?GETPOST("linkedin", 'alpha'):$object->linkedin).'"></td></tr>';
-			//     }
-			// }
 
 			// Visibility
 			print '<tr><td><label for="priv">'.$langs->trans("ContactVisibility").'</label></td><td colspan="3">';
@@ -1155,7 +1122,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				foreach ($cats as $cat) {
 					$arrayselected[] = $cat->id;
 				}
-				print $form->multiselectarray('contcats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%');
+				print img_picto('', 'category').$form->multiselectarray('contcats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%');
 				print "</td></tr>";
 			}
 
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index a1800e03980..3191e5edd47 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -102,6 +102,8 @@ class Conf
 
 	public $liste_limit;
 
+	public $tzuserinputkey = 'tzserver';		// Use 'tzuserrel' to always store date in GMT and show date in time zone of user.
+
 
 	/**
 	 * Constructor
@@ -693,6 +695,8 @@ class Conf
 		if (defined('MAIN_ANTIVIRUS_COMMAND')) $this->global->MAIN_ANTIVIRUS_COMMAND = constant('MAIN_ANTIVIRUS_COMMAND');
 		if (defined('MAIN_ANTIVIRUS_PARAM')) $this->global->MAIN_ANTIVIRUS_PARAM = constant('MAIN_ANTIVIRUS_PARAM');
 
+		if (!empty($this->global->MAIN_TZUSERINPUTKEY)) $this->tzuserinputkey = $this->global->MAIN_TZUSERINPUTKEY;	// 'tzserver' or 'tzuserrel'
+
 		// For backward compatibility
 		if (isset($this->product))   $this->produit = $this->product;
 		if (isset($this->facture))   $this->invoice = $this->facture;
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 4ed39694720..ed0511a8e1d 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5531,13 +5531,18 @@ class Form
 	 *  @param  int         $stepminutes    Specify step for minutes between 1 and 30
 	 *  @param	string		$labeladddateof Label to use for the $adddateof parameter.
 	 *  @param	string 		$placeholder    Placeholder
+	 *  @param	mixed		$gm				'auto', 'gmt' or 'tzserver' or 'tzuserrel'
 	 * 	@return string                      Html for selectDate
 	 *  @see    form_date(), select_month(), select_year(), select_dayofweek()
 	 */
-	public function selectDate($set_time = '', $prefix = 're', $h = 0, $m = 0, $empty = 0, $form_name = "", $d = 1, $addnowlink = 0, $disabled = 0, $fullday = '', $addplusone = '', $adddateof = '', $openinghours = '', $stepminutes = 1, $labeladddateof = '', $placeholder = '')
+	public function selectDate($set_time = '', $prefix = 're', $h = 0, $m = 0, $empty = 0, $form_name = "", $d = 1, $addnowlink = 0, $disabled = 0, $fullday = '', $addplusone = '', $adddateof = '', $openinghours = '', $stepminutes = 1, $labeladddateof = '', $placeholder = '', $gm = 'auto')
 	{
 		global $conf, $langs;
 
+		if ($gm == 'auto') {
+			$gm = $conf->tzuserinputkey;
+		}
+
 		$retstring = '';
 
 		if ($prefix == '') $prefix = 're';
@@ -5553,7 +5558,11 @@ class Form
 		if ($set_time === '' && $emptydate == 0)
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-			$set_time = dol_now('tzuser') - (getServerTimeZoneInt('now') * 3600); // set_time must be relative to PHP server timezone
+			if ($gm == 'tzuser' || $gm == 'tzuserrel') {
+				$set_time = dol_now($gm);
+			} else {
+				$set_time = dol_now('tzuser') - (getServerTimeZoneInt('now') * 3600); // set_time must be relative to PHP server timezone
+			}
 		}
 
 		// Analysis of the pre-selection date
@@ -5569,14 +5578,14 @@ class Form
 		} elseif (strval($set_time) != '' && $set_time != -1)
 		{
 			// set_time est un timestamps (0 possible)
-			$syear = dol_print_date($set_time, "%Y");
-			$smonth = dol_print_date($set_time, "%m");
-			$sday = dol_print_date($set_time, "%d");
+			$syear = dol_print_date($set_time, "%Y", $gm);
+			$smonth = dol_print_date($set_time, "%m", $gm);
+			$sday = dol_print_date($set_time, "%d", $gm);
 			if ($orig_set_time != '')
 			{
-				$shour = dol_print_date($set_time, "%H");
-				$smin = dol_print_date($set_time, "%M");
-				$ssec = dol_print_date($set_time, "%S");
+				$shour = dol_print_date($set_time, "%H", $gm);
+				$smin = dol_print_date($set_time, "%M", $gm);
+				$ssec = dol_print_date($set_time, "%S", $gm);
 			} else {
 				$shour = '';
 				$smin = '';
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 163f6d85b6d..3a889367dc1 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -465,9 +465,10 @@ function dol_get_next_week($day, $week, $month, $year)
  *
  *	@param		int			$year		Year
  * 	@param		int			$month		Month
- * 	@param		mixed		$gm			False or 0 or 'server' = Return date to compare with server TZ, True or 1 to compare with GM date.
- *                          			Exemple: dol_get_first_day(1970,1,false) will return -3600 with TZ+1, a dol_print_date on it will return 1970-01-01 00:00:00
- *                          			Exemple: dol_get_first_day(1970,1,true) will return 0 whatever is TZ, a dol_print_date on it will return 1970-01-01 00:00:00
+ * 	@param		mixed		$gm			False or 0 or 'tzserver' = Return date to compare with server TZ,
+ * 										True or 1 or 'gmt' to compare with GMT date.
+ *                          			Example: dol_get_first_day(1970,1,false) will return -3600 with TZ+1, a dol_print_date on it will return 1970-01-01 00:00:00
+ *                          			Example: dol_get_first_day(1970,1,true) will return 0 whatever is TZ, a dol_print_date on it will return 1970-01-01 00:00:00
  *  @return		int						Date for first day, '' if error
  */
 function dol_get_first_day($year, $month = 1, $gm = false)
@@ -481,7 +482,8 @@ function dol_get_first_day($year, $month = 1, $gm = false)
  *
  *	@param		int			$year		Year
  * 	@param		int			$month		Month
- * 	@param		boolean		$gm			False or 0 or 'server' = Return date to compare with server TZ, True or 1 to compare with GM date.
+ * 	@param		mixed		$gm			False or 0 or 'tzserver' = Return date to compare with server TZ,
+ * 										True or 1 or 'gmt' to compare with GMT date.
  *	@return		int						Date for first day, '' if error
  */
 function dol_get_last_day($year, $month = 12, $gm = false)
@@ -529,7 +531,8 @@ function dol_get_first_hour($date)
  *	@param		int		$day		Day
  * 	@param		int		$month		Month
  *  @param		int		$year		Year
- * 	@param		int		$gm			False or 0 or 'server' = Return date to compare with server TZ, True or 1 to compare with GM date.
+ * 	@param		mixed	$gm			False or 0 or 'tzserver' = Return date to compare with server TZ,
+ * 									True or 1 or 'gmt' to compare with GMT date.
  *	@return		array				year,month,week,first_day,first_month,first_year,prev_day,prev_month,prev_year
  */
 function dol_get_first_day_week($day, $month, $year, $gm = false)
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ecfb46dc589..e1d64da77f1 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1971,10 +1971,14 @@ function dol_strftime($fmt, $ts = false, $is_gmt = false)
  *
  *  @see        dol_mktime(), dol_stringtotime(), dol_getdate()
  */
-function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlangs = '', $encodetooutput = false)
+function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs = '', $encodetooutput = false)
 {
 	global $conf, $langs;
 
+	if ($tzoutput == 'auto') {
+		$tzoutput = $conf->tzuserinputkey;
+	}
+
 	// Clean parameters
 	$to_gmt = false;
 	$offsettz = $offsetdst = 0;
@@ -2184,17 +2188,23 @@ function dol_getdate($timestamp, $fast = false, $forcetimezone = '')
  *	@param	int			$year			Year
  *	@param	mixed		$gm				True or 1 or 'gmt'=Input informations are GMT values
  *										False or 0 or 'tzserver' = local to server TZ
- *										'tzuser' = local to user TZ
+ *										'auto'
+ *										'tzuser' = local to user TZ taking dst into account at the current date. Not yet implemented.
+ *										'tzuserrel' = local to user TZ taking dst into account at the given date. Use this one to convert date input from user.
  *										'tz,TimeZone' = use specified timezone
  *	@param	int			$check			0=No check on parameters (Can use day 32, etc...)
  *	@return	int|string					Date as a timestamp, '' or false if error
  * 	@see 								dol_print_date(), dol_stringtotime(), dol_getdate()
  */
-function dol_mktime($hour, $minute, $second, $month, $day, $year, $gm = 'tzserver', $check = 1)
+function dol_mktime($hour, $minute, $second, $month, $day, $year, $gm = 'auto', $check = 1)
 {
 	global $conf;
 	//print "- ".$hour.",".$minute.",".$second.",".$month.",".$day.",".$year.",".$_SERVER["WINDIR"]." -";
 
+	if ($gm == 'auto') {
+		$gm = $conf->tzuserinputkey;
+	}
+
 	// Clean parameters
 	if ($hour == -1 || empty($hour)) $hour = 0;
 	if ($minute == -1 || empty($minute)) $minute = 0;
@@ -2215,7 +2225,7 @@ function dol_mktime($hour, $minute, $second, $month, $day, $year, $gm = 'tzserve
 	{
 		$default_timezone = @date_default_timezone_get(); // Example 'Europe/Berlin'
 		$localtz = new DateTimeZone($default_timezone);
-	} elseif ($gm === 'user' || $gm === 'tzuser')
+	} elseif ($gm === 'user' || $gm === 'tzuser' || $gm === 'tzuserrel')
 	{
 		// We use dol_tz_string first because it is more reliable.
 		$default_timezone = (empty($_SESSION["dol_tz_string"]) ? @date_default_timezone_get() : $_SESSION["dol_tz_string"]); // Example 'Europe/Berlin'
@@ -2254,16 +2264,21 @@ function dol_mktime($hour, $minute, $second, $month, $day, $year, $gm = 'tzserve
 /**
  *  Return date for now. In most cases, we use this function without parameters (that means GMT time).
  *
- *  @param	string		$mode	'gmt' => we return GMT timestamp,
+ *  @param	string		$mode	'auto'
+ *  							'gmt' => we return GMT timestamp,
  * 								'tzserver' => we add the PHP server timezone
- *  							'tzref' => we add the company timezone
- * 								'tzuser' => we add the user timezone
+ *  							'tzref' => we add the company timezone. Not implemented.
+ * 								'tzuser' or 'tzuserrel' => we add the user timezone
  *	@return int   $date	Timestamp
  */
-function dol_now($mode = 'gmt')
+function dol_now($mode = 'auto')
 {
 	$ret = 0;
 
+	if ($mode == 'auto') {
+		$mode = 'tzserver';
+	}
+
 	if ($mode == 'gmt') $ret = time(); // Time for now at greenwich.
 	elseif ($mode == 'tzserver')		// Time for now with PHP server timezone added
 	{
@@ -2276,7 +2291,7 @@ function dol_now($mode = 'gmt')
 		$tzsecond=getParentCompanyTimeZoneInt();    // Contains tz+dayling saving time
 		$ret=dol_now('gmt')+($tzsecond*3600);
 	}*/
-	elseif ($mode == 'tzuser')				// Time for now with user timezone added
+	elseif ($mode == 'tzuser' || $mode == 'tzuserrel')				// Time for now with user timezone added
 	{
 		//print 'time: '.time();
 		$offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60;
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index a77f38f8f66..ffc79b8f4b4 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -246,8 +246,8 @@ function dol_print_object_info($object, $usetable = 0)
 		print $langs->trans("DateCreation");
 		if ($usetable) print '</td><td>';
 		else print ': ';
-		print dol_print_date($object->date_creation, 'dayhour');
-		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
+		print dol_print_date($object->date_creation, 'dayhour', 'tzserver');
+		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation, "dayhour", "tzuserrel").' &nbsp;'.$langs->trans("ClientHour");
 		if ($usetable) print '</td></tr>';
 		else print '<br>';
 	}
@@ -280,8 +280,8 @@ function dol_print_object_info($object, $usetable = 0)
 		print $langs->trans("DateLastModification");
 		if ($usetable) print '</td><td>';
 		else print ': ';
-		print dol_print_date($object->date_modification, 'dayhour');
-		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
+		print dol_print_date($object->date_modification, 'dayhour', 'tzserver');
+		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification, "dayhour", "tzuserrel").' &nbsp;'.$langs->trans("ClientHour");
 		if ($usetable) print '</td></tr>';
 		else print '<br>';
 	}
@@ -314,8 +314,8 @@ function dol_print_object_info($object, $usetable = 0)
 		print $langs->trans("DateValidation");
 		if ($usetable) print '</td><td>';
 		else print ': ';
-		print dol_print_date($object->date_validation, 'dayhour');
-		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
+		print dol_print_date($object->date_validation, 'dayhour', 'tzserver');
+		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation, "dayhour", 'tzserver').' &nbsp;'.$langs->trans("ClientHour");
 		if ($usetable) print '</td></tr>';
 		else print '<br>';
 	}
@@ -348,8 +348,8 @@ function dol_print_object_info($object, $usetable = 0)
 		print $langs->trans("DateApprove");
 		if ($usetable) print '</td><td>';
 		else print ': ';
-		print dol_print_date($object->date_approve, 'dayhour');
-		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
+		print dol_print_date($object->date_approve, 'dayhour', 'tzserver');
+		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve, "dayhour", 'tzserver').' &nbsp;'.$langs->trans("ClientHour");
 		if ($usetable) print '</td></tr>';
 		else print '<br>';
 	}
@@ -376,8 +376,8 @@ function dol_print_object_info($object, $usetable = 0)
 		print $langs->trans("DateApprove2");
 		if ($usetable) print '</td><td>';
 		else print ': ';
-		print dol_print_date($object->date_approve2, 'dayhour');
-		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2 + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
+		print dol_print_date($object->date_approve2, 'dayhour', 'tzserver');
+		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2, "dayhour", 'tzserver').' &nbsp;'.$langs->trans("ClientHour");
 		if ($usetable) print '</td></tr>';
 		else print '<br>';
 	}
@@ -412,8 +412,8 @@ function dol_print_object_info($object, $usetable = 0)
 		print $langs->trans("DateClosing");
 		if ($usetable) print '</td><td>';
 		else print ': ';
-		print dol_print_date($object->date_closing, 'dayhour');
-		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_closing + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
+		print dol_print_date($object->date_closing, 'dayhour', 'tzserver');
+		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_closing, "dayhour", 'tzserver').' &nbsp;'.$langs->trans("ClientHour");
 		if ($usetable) print '</td></tr>';
 		else print '<br>';
 	}
@@ -446,8 +446,8 @@ function dol_print_object_info($object, $usetable = 0)
 		print $langs->trans("DateConciliating");
 		if ($usetable) print '</td><td>';
 		else print ': ';
-		print dol_print_date($object->date_rappro, 'dayhour');
-		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
+		print dol_print_date($object->date_rappro, 'dayhour', 'tzserver');
+		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro, "dayhour", 'tzserver').' &nbsp;'.$langs->trans("ClientHour");
 		if ($usetable) print '</td></tr>';
 		else print '<br>';
 	}
@@ -459,8 +459,8 @@ function dol_print_object_info($object, $usetable = 0)
 		print $langs->trans("DateLastSend");
 		if ($usetable) print '</td><td>';
 		else print ': ';
-		print dol_print_date($object->date_envoi, 'dayhour');
-		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
+		print dol_print_date($object->date_envoi, 'dayhour', 'tzserver');
+		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi, "dayhour", 'tzserver').' &nbsp;'.$langs->trans("ClientHour");
 		if ($usetable) print '</td></tr>';
 		else print '<br>';
 	}
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 1c807b7b2b1..79e327dd818 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -35,7 +35,7 @@
 	--oddevencolor: #202020;
 	--colorboxstatsborder: #e0e0e0;
 	--dolgraphbg: rgba(255,255,255,0);
-	--fieldrequiredcolor: #700040;
+	--fieldrequiredcolor: #400030;
 	--colortextbacktab: #<?php print $colortextbacktab; ?>;
 	--colorboxiconbg: #eee;
 	--refidnocolor:#444;

From 9be1ce7d206102a37c30fde37da234fcab16aef5 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sun, 3 Jan 2021 20:25:35 +0100
Subject: [PATCH 780/888] NEW better date_valid on invoice

need hour minutes and secondes for better order and search
---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 780568ba41b..7b9cb8c9ef8 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -41,3 +41,5 @@ ALTER TABLE llx_adherent ADD UNIQUE INDEX uk_adherent_ref (ref, entity);
 
 ALTER TABLE llx_bank_account ADD COLUMN ics varchar(32) NULL;
 ALTER TABLE llx_bank_account ADD COLUMN ics_transfer varchar(32) NULL;
+
+ALTER TABLE llx_facture MODIFY COLUMN date_valid DATETIME NULL DEFAULT NULL;

From 5792995b1fc67b3c00116af7057c9da77c60171c Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sun, 3 Jan 2021 22:52:36 +0100
Subject: [PATCH 781/888] Fix function call

---
 htdocs/modulebuilder/template/myobject_card.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 84fa7594e11..8f482d5f6f2 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -471,20 +471,18 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 			// Back to draft
 			if ($object->status == $object::STATUS_VALIDATED) {
-				if ($permissiontoadd) {
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes">'.$langs->trans("SetToDraft").'</a>';
-				}
+				print dolGetButtonAction($langs->trans('SetToDraft'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes', '', $permissiontoadd);
 			}
 
-			print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit', $permissiontoadd);
+			print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit', '', $permissiontoadd);
 
 			// Validate
 			if ($object->status == $object::STATUS_DRAFT) {
-				print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes', $permissiontoadd);
+				print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes', '', $permissiontoadd);
 			}
 
 			// Clone
-			print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=scrumsprint', $permissiontoadd);
+			print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=scrumsprint', '', $permissiontoadd);
 
 			/*
 			if ($permissiontoadd)
@@ -506,7 +504,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			*/
 
 			// Delete (need delete permission, or if draft, just need create/modify permission)
-			print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
+			print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete', '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
 		}
 		print '</div>'."\n";
 	}

From e5fbb963a397cf1a2c0accd15ed1565cb1fa6008 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sun, 3 Jan 2021 22:53:04 +0100
Subject: [PATCH 782/888] Fix picto in template

---
 htdocs/modulebuilder/template/myobject_agenda.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index 8db58b7ad4e..541d971013f 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -158,7 +158,7 @@ if ($object->id > 0)
 	$head = myobjectPrepareHead($object);
 
 
-	print dol_get_fiche_head($head, 'agenda', $langs->trans("MyObject"), -1, 'object_'.$object->picto);
+	print dol_get_fiche_head($head, 'agenda', $langs->trans("MyObject"), -1, $object->picto);
 
 	// Object card
 	// ------------------------------------------------------------

From 984c355f39701a1ec060c031037874686d20bdbf Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sun, 3 Jan 2021 23:37:44 +0100
Subject: [PATCH 783/888] update stripe-php 7.67.0

---
 .../stripe-php/.coveralls.github-actions.yml  |    3 +
 .../includes/stripe/stripe-php/.editorconfig  |    6 +
 htdocs/includes/stripe/stripe-php/.gitignore  |   14 +
 .../includes/stripe/stripe-php/.php_cs.dist   |   45 +
 .../includes/stripe/stripe-php/CHANGELOG.md   | 1174 +++++++++++----
 .../stripe/stripe-php/CODE_OF_CONDUCT.md      |   77 +
 htdocs/includes/stripe/stripe-php/Makefile    |   36 +
 htdocs/includes/stripe/stripe-php/README.md   |   59 +-
 htdocs/includes/stripe/stripe-php/VERSION     |    2 +-
 htdocs/includes/stripe/stripe-php/build.php   |   31 +-
 .../includes/stripe/stripe-php/composer.json  |   23 +-
 .../stripe-php/data/ca-certificates.crt       | 1262 +++++++----------
 htdocs/includes/stripe/stripe-php/init.php    |  344 +++--
 .../stripe/stripe-php/lib/Account.php         |  665 +++++----
 .../stripe/stripe-php/lib/AccountLink.php     |   20 +-
 .../stripe/stripe-php/lib/AlipayAccount.php   |   50 +-
 .../stripe-php/lib/ApiOperations/All.php      |   17 +-
 .../stripe-php/lib/ApiOperations/Create.php   |    9 +-
 .../stripe-php/lib/ApiOperations/Delete.php   |    9 +-
 .../lib/ApiOperations/NestedResource.php      |   53 +-
 .../stripe-php/lib/ApiOperations/Request.php  |   23 +-
 .../stripe-php/lib/ApiOperations/Retrieve.php |    9 +-
 .../stripe-php/lib/ApiOperations/Update.php   |   20 +-
 .../stripe/stripe-php/lib/ApiRequestor.php    |  326 +++--
 .../stripe/stripe-php/lib/ApiResource.php     |   54 +-
 .../stripe/stripe-php/lib/ApiResponse.php     |   27 +-
 .../stripe/stripe-php/lib/ApplePayDomain.php  |   12 +-
 .../stripe/stripe-php/lib/ApplicationFee.php  |   97 +-
 .../stripe-php/lib/ApplicationFeeRefund.php   |   47 +-
 .../stripe/stripe-php/lib/Balance.php         |   36 +-
 .../stripe-php/lib/BalanceTransaction.php     |  104 +-
 .../stripe/stripe-php/lib/BankAccount.php     |  120 +-
 .../stripe-php/lib/BaseStripeClient.php       |  269 ++++
 .../stripe-php/lib/BillingPortal/Session.php  |   32 +
 .../stripe/stripe-php/lib/BitcoinReceiver.php |   51 +-
 .../stripe-php/lib/BitcoinTransaction.php     |   14 +-
 .../stripe/stripe-php/lib/Capability.php      |   75 +-
 .../includes/stripe/stripe-php/lib/Card.php   |  133 +-
 .../includes/stripe/stripe-php/lib/Charge.php |  286 ++--
 .../stripe-php/lib/Checkout/Session.php       |   93 +-
 .../stripe/stripe-php/lib/Collection.php      |  224 ++-
 .../stripe/stripe-php/lib/CountrySpec.php     |   27 +-
 .../includes/stripe/stripe-php/lib/Coupon.php |   44 +-
 .../stripe/stripe-php/lib/CreditNote.php      |  118 +-
 .../stripe-php/lib/CreditNoteLineItem.php     |   26 +
 .../stripe/stripe-php/lib/Customer.php        |  443 +++---
 .../lib/CustomerBalanceTransaction.php        |  101 +-
 .../stripe/stripe-php/lib/Discount.php        |   22 +-
 .../stripe/stripe-php/lib/Dispute.php         |  103 +-
 .../stripe/stripe-php/lib/EphemeralKey.php    |   35 +-
 .../stripe/stripe-php/lib/ErrorObject.php     |  164 +++
 .../includes/stripe/stripe-php/lib/Event.php  |  370 +++--
 .../lib/Exception/ApiConnectionException.php  |   12 +
 .../lib/Exception/ApiErrorException.php       |  219 +++
 .../lib/Exception/AuthenticationException.php |   11 +
 .../lib/Exception/BadMethodCallException.php  |    7 +
 .../lib/Exception/CardException.php           |   84 ++
 .../lib/Exception/ExceptionInterface.php      |   22 +
 .../lib/Exception/IdempotencyException.php    |   11 +
 .../Exception/InvalidArgumentException.php    |    7 +
 .../lib/Exception/InvalidRequestException.php |   60 +
 .../Exception/OAuth/ExceptionInterface.php    |   10 +
 .../OAuth/InvalidClientException.php          |   12 +
 .../Exception/OAuth/InvalidGrantException.php |   13 +
 .../OAuth/InvalidRequestException.php         |   11 +
 .../Exception/OAuth/InvalidScopeException.php |   10 +
 .../Exception/OAuth/OAuthErrorException.php   |   19 +
 .../OAuth/UnknownOAuthErrorException.php      |   12 +
 .../OAuth/UnsupportedGrantTypeException.php   |   11 +
 .../UnsupportedResponseTypeException.php      |   11 +
 .../lib/Exception/PermissionException.php     |   11 +
 .../lib/Exception/RateLimitException.php      |   12 +
 .../SignatureVerificationException.php        |   74 +
 .../Exception/UnexpectedValueException.php    |    7 +
 .../Exception/UnknownApiErrorException.php    |   12 +
 .../stripe/stripe-php/lib/ExchangeRate.php    |   20 +-
 .../includes/stripe/stripe-php/lib/File.php   |   73 +-
 .../stripe/stripe-php/lib/FileLink.php        |   28 +-
 .../lib/HttpClient/ClientInterface.php        |   13 +-
 .../stripe-php/lib/HttpClient/CurlClient.php  |  347 +++--
 .../stripe/stripe-php/lib/Invoice.php         |  375 ++---
 .../stripe/stripe-php/lib/InvoiceItem.php     |   54 +-
 .../stripe/stripe-php/lib/InvoiceLineItem.php |   47 +-
 .../stripe-php/lib/Issuing/Authorization.php  |   83 +-
 .../stripe/stripe-php/lib/Issuing/Card.php    |   60 +-
 .../stripe-php/lib/Issuing/CardDetails.php    |    6 +-
 .../stripe-php/lib/Issuing/Cardholder.php     |   37 +-
 .../stripe/stripe-php/lib/Issuing/Dispute.php |   51 +-
 .../stripe-php/lib/Issuing/Transaction.php    |   48 +-
 .../stripe/stripe-php/lib/LineItem.php        |   26 +
 .../stripe/stripe-php/lib/LoginLink.php       |   14 +-
 .../stripe/stripe-php/lib/Mandate.php         |   27 +
 .../includes/stripe/stripe-php/lib/OAuth.php  |   42 +-
 .../stripe-php/lib/OAuthErrorObject.php       |   31 +
 .../includes/stripe/stripe-php/lib/Order.php  |   92 +-
 .../stripe/stripe-php/lib/OrderItem.php       |    6 +-
 .../stripe/stripe-php/lib/OrderReturn.php     |   30 +-
 .../stripe/stripe-php/lib/PaymentIntent.php   |  141 +-
 .../stripe/stripe-php/lib/PaymentMethod.php   |   69 +-
 .../includes/stripe/stripe-php/lib/Payout.php |  136 +-
 .../includes/stripe/stripe-php/lib/Person.php |  118 +-
 .../includes/stripe/stripe-php/lib/Plan.php   |   62 +-
 .../includes/stripe/stripe-php/lib/Price.php  |   62 +
 .../stripe/stripe-php/lib/Product.php         |   61 +-
 .../stripe/stripe-php/lib/PromotionCode.php   |   33 +
 .../lib/Radar/EarlyFraudWarning.php           |   41 +-
 .../stripe/stripe-php/lib/Radar/ValueList.php |   33 +-
 .../stripe-php/lib/Radar/ValueListItem.php    |   25 +-
 .../stripe/stripe-php/lib/Recipient.php       |   57 +-
 .../stripe-php/lib/RecipientTransfer.php      |   10 +-
 .../includes/stripe/stripe-php/lib/Refund.php |   74 +-
 .../stripe-php/lib/Reporting/ReportRun.php    |   35 +-
 .../stripe-php/lib/Reporting/ReportType.php   |   30 +-
 .../stripe-php/lib/RequestTelemetry.php       |    7 +-
 .../includes/stripe/stripe-php/lib/Review.php |   63 +-
 htdocs/includes/stripe/stripe-php/lib/SKU.php |   44 +-
 .../lib/Service/AbstractService.php           |   79 ++
 .../lib/Service/AbstractServiceFactory.php    |   59 +
 .../lib/Service/AccountLinkService.php        |   25 +
 .../stripe-php/lib/Service/AccountService.php |  381 +++++
 .../lib/Service/ApplePayDomainService.php     |   70 +
 .../lib/Service/ApplicationFeeService.php     |  125 ++
 .../stripe-php/lib/Service/BalanceService.php |   26 +
 .../lib/Service/BalanceTransactionService.php |   47 +
 .../BillingPortalServiceFactory.php           |   25 +
 .../Service/BillingPortal/SessionService.php  |   23 +
 .../stripe-php/lib/Service/ChargeService.php  |  101 ++
 .../Checkout/CheckoutServiceFactory.php       |   25 +
 .../lib/Service/Checkout/SessionService.php   |   73 +
 .../lib/Service/CoreServiceFactory.php        |  125 ++
 .../lib/Service/CountrySpecService.php        |   39 +
 .../stripe-php/lib/Service/CouponService.php  |  104 ++
 .../lib/Service/CreditNoteService.php         |  156 ++
 .../lib/Service/CustomerService.php           |  353 +++++
 .../stripe-php/lib/Service/DisputeService.php |   83 ++
 .../lib/Service/EphemeralKeyService.php       |   43 +
 .../stripe-php/lib/Service/EventService.php   |   44 +
 .../lib/Service/ExchangeRateService.php       |   41 +
 .../lib/Service/FileLinkService.php           |   70 +
 .../stripe-php/lib/Service/FileService.php    |   66 +
 .../lib/Service/InvoiceItemService.php        |   93 ++
 .../stripe-php/lib/Service/InvoiceService.php |  272 ++++
 .../Service/Issuing/AuthorizationService.php  |   97 ++
 .../lib/Service/Issuing/CardService.php       |   73 +
 .../lib/Service/Issuing/CardholderService.php |   74 +
 .../lib/Service/Issuing/DisputeService.php    |   99 ++
 .../Service/Issuing/IssuingServiceFactory.php |   33 +
 .../Service/Issuing/TransactionService.php    |   59 +
 .../stripe-php/lib/Service/MandateService.php |   24 +
 .../stripe-php/lib/Service/OAuthService.php   |  150 ++
 .../lib/Service/OrderReturnService.php        |   42 +
 .../stripe-php/lib/Service/OrderService.php   |  109 ++
 .../lib/Service/PaymentIntentService.php      |  181 +++
 .../lib/Service/PaymentMethodService.php      |  121 ++
 .../stripe-php/lib/Service/PayoutService.php  |  127 ++
 .../stripe-php/lib/Service/PlanService.php    |   91 ++
 .../stripe-php/lib/Service/PriceService.php   |   72 +
 .../stripe-php/lib/Service/ProductService.php |   92 ++
 .../lib/Service/PromotionCodeService.php      |   72 +
 .../Radar/EarlyFraudWarningService.php        |   43 +
 .../lib/Service/Radar/RadarServiceFactory.php |   29 +
 .../Service/Radar/ValueListItemService.php    |   74 +
 .../lib/Service/Radar/ValueListService.php    |   93 ++
 .../stripe-php/lib/Service/RefundService.php  |   76 +
 .../Service/Reporting/ReportRunService.php    |   57 +
 .../Service/Reporting/ReportTypeService.php   |   41 +
 .../Reporting/ReportingServiceFactory.php     |   27 +
 .../stripe-php/lib/Service/ReviewService.php  |   58 +
 .../lib/Service/SetupAttemptService.php       |   23 +
 .../lib/Service/SetupIntentService.php        |  127 ++
 .../Sigma/ScheduledQueryRunService.php        |   39 +
 .../lib/Service/Sigma/SigmaServiceFactory.php |   25 +
 .../stripe-php/lib/Service/SkuService.php     |   95 ++
 .../stripe-php/lib/Service/SourceService.php  |  110 ++
 .../lib/Service/SubscriptionItemService.php   |  151 ++
 .../Service/SubscriptionScheduleService.php   |  113 ++
 .../lib/Service/SubscriptionService.php       |  124 ++
 .../stripe-php/lib/Service/TaxRateService.php |   71 +
 .../Terminal/ConnectionTokenService.php       |   25 +
 .../lib/Service/Terminal/LocationService.php  |   87 ++
 .../lib/Service/Terminal/ReaderService.php    |   87 ++
 .../Terminal/TerminalServiceFactory.php       |   29 +
 .../stripe-php/lib/Service/TokenService.php   |   42 +
 .../stripe-php/lib/Service/TopupService.php   |   89 ++
 .../lib/Service/TransferService.php           |  175 +++
 .../lib/Service/WebhookEndpointService.php    |   97 ++
 .../stripe/stripe-php/lib/SetupAttempt.php    |   32 +
 .../stripe/stripe-php/lib/SetupIntent.php     |  116 +-
 .../lib/Sigma/ScheduledQueryRun.php           |   36 +-
 .../stripe-php/lib/SingletonApiResource.php   |   14 +-
 .../includes/stripe/stripe-php/lib/Source.php |  207 +--
 .../stripe-php/lib/SourceTransaction.php      |    8 +-
 .../includes/stripe/stripe-php/lib/Stripe.php |   85 +-
 .../stripe/stripe-php/lib/StripeClient.php    |   77 +
 .../stripe-php/lib/StripeClientInterface.php  |   56 +
 .../stripe/stripe-php/lib/StripeObject.php    |  243 ++--
 .../stripe/stripe-php/lib/Subscription.php    |  129 +-
 .../stripe-php/lib/SubscriptionItem.php       |   75 +-
 .../stripe-php/lib/SubscriptionSchedule.php   |   66 +-
 .../includes/stripe/stripe-php/lib/TaxId.php  |  106 +-
 .../stripe/stripe-php/lib/TaxRate.php         |   36 +-
 .../lib/Terminal/ConnectionToken.php          |   14 +-
 .../stripe-php/lib/Terminal/Location.php      |   21 +-
 .../stripe/stripe-php/lib/Terminal/Reader.php |   31 +-
 .../stripe/stripe-php/lib/ThreeDSecure.php    |   24 +-
 .../includes/stripe/stripe-php/lib/Token.php  |   60 +-
 .../includes/stripe/stripe-php/lib/Topup.php  |   68 +-
 .../stripe/stripe-php/lib/Transfer.php        |  164 ++-
 .../stripe-php/lib/TransferReversal.php       |   62 +-
 .../stripe/stripe-php/lib/UsageRecord.php     |   46 +-
 .../stripe-php/lib/UsageRecordSummary.php     |   22 +-
 .../lib/Util/CaseInsensitiveArray.php         |   32 +-
 .../stripe-php/lib/Util/DefaultLogger.php     |   17 +-
 .../stripe-php/lib/Util/LoggerInterface.php   |    2 -
 .../stripe-php/lib/Util/ObjectTypes.php       |   99 ++
 .../stripe-php/lib/Util/RandomGenerator.php   |    8 +-
 .../stripe-php/lib/Util/RequestOptions.php    |  104 +-
 .../stripe/stripe-php/lib/Util/Set.php        |    4 +-
 .../stripe/stripe-php/lib/Util/Util.php       |  259 ++--
 .../stripe/stripe-php/lib/Webhook.php         |   40 +-
 .../stripe/stripe-php/lib/WebhookEndpoint.php |   35 +-
 .../stripe-php/lib/WebhookSignature.php       |   91 +-
 .../stripe/stripe-php/phpdoc.dist.xml         |   31 +
 .../stripe/stripe-php/phpstan-baseline.neon   |   12 +
 .../stripe/stripe-php/phpstan.neon.dist       |   11 +
 .../stripe/stripe-php/update_certs.php        |   26 +-
 226 files changed, 14453 insertions(+), 4860 deletions(-)
 create mode 100644 htdocs/includes/stripe/stripe-php/.coveralls.github-actions.yml
 create mode 100644 htdocs/includes/stripe/stripe-php/.php_cs.dist
 create mode 100644 htdocs/includes/stripe/stripe-php/CODE_OF_CONDUCT.md
 create mode 100644 htdocs/includes/stripe/stripe-php/Makefile
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/BaseStripeClient.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/BillingPortal/Session.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/CreditNoteLineItem.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/ErrorObject.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Exception/ApiConnectionException.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Exception/ApiErrorException.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Exception/AuthenticationException.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Exception/BadMethodCallException.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Exception/CardException.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Exception/ExceptionInterface.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Exception/IdempotencyException.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Exception/InvalidArgumentException.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Exception/InvalidRequestException.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/ExceptionInterface.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/InvalidClientException.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/InvalidGrantException.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/InvalidRequestException.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/InvalidScopeException.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/OAuthErrorException.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/UnknownOAuthErrorException.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/UnsupportedGrantTypeException.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/UnsupportedResponseTypeException.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Exception/PermissionException.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Exception/RateLimitException.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Exception/SignatureVerificationException.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Exception/UnexpectedValueException.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Exception/UnknownApiErrorException.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/LineItem.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Mandate.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/OAuthErrorObject.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Price.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/PromotionCode.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/AbstractService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/AbstractServiceFactory.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/AccountLinkService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/AccountService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/ApplePayDomainService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/ApplicationFeeService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/BalanceService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/BalanceTransactionService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/BillingPortal/BillingPortalServiceFactory.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/BillingPortal/SessionService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/ChargeService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/Checkout/CheckoutServiceFactory.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/Checkout/SessionService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/CoreServiceFactory.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/CountrySpecService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/CouponService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/CreditNoteService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/CustomerService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/DisputeService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/EphemeralKeyService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/EventService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/ExchangeRateService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/FileLinkService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/FileService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/InvoiceItemService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/InvoiceService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/Issuing/AuthorizationService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/Issuing/CardService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/Issuing/CardholderService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/Issuing/DisputeService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/Issuing/IssuingServiceFactory.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/Issuing/TransactionService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/MandateService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/OAuthService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/OrderReturnService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/OrderService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/PaymentIntentService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/PaymentMethodService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/PayoutService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/PlanService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/PriceService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/ProductService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/PromotionCodeService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/Radar/EarlyFraudWarningService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/Radar/RadarServiceFactory.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/Radar/ValueListItemService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/Radar/ValueListService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/RefundService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/Reporting/ReportRunService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/Reporting/ReportTypeService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/Reporting/ReportingServiceFactory.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/ReviewService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/SetupAttemptService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/SetupIntentService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/Sigma/ScheduledQueryRunService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/Sigma/SigmaServiceFactory.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/SkuService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/SourceService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/SubscriptionItemService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/SubscriptionScheduleService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/SubscriptionService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/TaxRateService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/Terminal/ConnectionTokenService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/Terminal/LocationService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/Terminal/ReaderService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/Terminal/TerminalServiceFactory.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/TokenService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/TopupService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/TransferService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Service/WebhookEndpointService.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/SetupAttempt.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/StripeClient.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/StripeClientInterface.php
 create mode 100644 htdocs/includes/stripe/stripe-php/lib/Util/ObjectTypes.php
 create mode 100644 htdocs/includes/stripe/stripe-php/phpdoc.dist.xml
 create mode 100644 htdocs/includes/stripe/stripe-php/phpstan-baseline.neon
 create mode 100644 htdocs/includes/stripe/stripe-php/phpstan.neon.dist

diff --git a/htdocs/includes/stripe/stripe-php/.coveralls.github-actions.yml b/htdocs/includes/stripe/stripe-php/.coveralls.github-actions.yml
new file mode 100644
index 00000000000..40ff9a76b32
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/.coveralls.github-actions.yml
@@ -0,0 +1,3 @@
+service_name: github-actions
+coverage_clover: clover.xml
+json_path: coveralls-upload.json
diff --git a/htdocs/includes/stripe/stripe-php/.editorconfig b/htdocs/includes/stripe/stripe-php/.editorconfig
index 9e93e0c4c3e..174e9120bf8 100644
--- a/htdocs/includes/stripe/stripe-php/.editorconfig
+++ b/htdocs/includes/stripe/stripe-php/.editorconfig
@@ -12,3 +12,9 @@ charset = utf-8
 
 [*.{json,yml}]
 indent_size = 2
+
+[*.neon]
+indent_style = tab
+
+[Makefile]
+indent_style = tab
diff --git a/htdocs/includes/stripe/stripe-php/.gitignore b/htdocs/includes/stripe/stripe-php/.gitignore
index 17b94183baf..db88f6676d7 100644
--- a/htdocs/includes/stripe/stripe-php/.gitignore
+++ b/htdocs/includes/stripe/stripe-php/.gitignore
@@ -1,3 +1,6 @@
+# Ignore build files
+build/*
+
 # Mac OS X dumps these all over the place.
 .DS_Store
 
@@ -15,3 +18,14 @@ clover.xml
 
 # Ignore IDE's configuration files
 .idea
+
+# Ignore PHP CS Fixer local config and cache
+.php_cs
+.php_cs.cache
+
+# Ignore PHPStan local config
+.phpstan.neon
+
+# Ignore phpDocumentor's local config and artifacts
+.phpdoc/*
+phpdoc.xml
diff --git a/htdocs/includes/stripe/stripe-php/.php_cs.dist b/htdocs/includes/stripe/stripe-php/.php_cs.dist
new file mode 100644
index 00000000000..2ebf9f3d8c4
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/.php_cs.dist
@@ -0,0 +1,45 @@
+<?php
+
+return PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
+    ->setRules([
+        // Rulesets
+        '@PSR2' => true,
+        '@PhpCsFixer' => true,
+        '@PhpCsFixer:risky' => true,
+        '@PHP56Migration:risky' => true,
+        '@PHPUnit57Migration:risky' => true,
+
+        // Additional rules
+        'fopen_flags' => true,
+        'linebreak_after_opening_tag' => true,
+        'native_constant_invocation' => true,
+        'native_function_invocation' => true,
+
+        // --- Diffs from @PhpCsFixer / @PhpCsFixer:risky ---
+
+        // This is the same as the default for the @PhpCsFixer ruleset, minus
+        // the following values: ['include', 'include_once', 'require',
+        // 'require_once']. We could enable them and remove this line after
+        // updating codegen for the `init.php` file to be compliant.
+        'blank_line_before_statement' => ['statements' => ['break', 'case', 'continue', 'declare', 'default', 'exit', 'goto', 'return', 'switch', 'throw', 'try']],
+
+        // This is just prettier / easier to read.
+        'concat_space' => ['spacing' => 'one'],
+
+        // This causes strange ordering with codegen'd classes. We might be
+        // able to enable this if we update codegen to output class elements
+        // in the correct order.
+        'ordered_class_elements' => false,
+
+        // Keep this disabled to avoid unnecessary diffs in PHPDoc comments of
+        // codegen'd classes.
+        'phpdoc_align' => false,
+
+        // This is a "risky" rule that causes a bug in our codebase.
+        // Specifically, in `StripeObject.updateAttributes` we construct new
+        // `StripeObject`s for metadata. We can't use `self` there because it
+        // needs to be a raw `StripeObject`.
+        'self_accessor' => false,
+    ])
+;
diff --git a/htdocs/includes/stripe/stripe-php/CHANGELOG.md b/htdocs/includes/stripe/stripe-php/CHANGELOG.md
index 5554f4ceb1f..4e867c82b14 100644
--- a/htdocs/includes/stripe/stripe-php/CHANGELOG.md
+++ b/htdocs/includes/stripe/stripe-php/CHANGELOG.md
@@ -1,732 +1,1316 @@
 # Changelog
 
+## 7.67.0 - 2020-12-09
+* [#1060](https://github.com/stripe/stripe-php/pull/1060) Improve PHPDocs for `Discount`
+* [#1059](https://github.com/stripe/stripe-php/pull/1059) Upgrade PHPStan to 0.12.59
+* [#1057](https://github.com/stripe/stripe-php/pull/1057) Bump PHP-CS-Fixer and update code
+
+## 7.66.1 - 2020-12-01
+* [#1054](https://github.com/stripe/stripe-php/pull/1054) Improve error message for invalid keys in StripeClient
+
+## 7.66.0 - 2020-11-24
+* [#1053](https://github.com/stripe/stripe-php/pull/1053) Update PHPDocs
+
+## 7.65.0 - 2020-11-19
+* [#1050](https://github.com/stripe/stripe-php/pull/1050) Added constants for `proration_behavior` on `Subscription`
+
+## 7.64.0 - 2020-11-18
+* [#1049](https://github.com/stripe/stripe-php/pull/1049) Update PHPDocs
+
+## 7.63.0 - 2020-11-17
+* [#1048](https://github.com/stripe/stripe-php/pull/1048) Update PHPDocs
+* [#1046](https://github.com/stripe/stripe-php/pull/1046) Force IPv4 resolving
+
+## 7.62.0 - 2020-11-09
+* [#1041](https://github.com/stripe/stripe-php/pull/1041) Add missing constants on `Event`
+* [#1038](https://github.com/stripe/stripe-php/pull/1038) Update PHPDocs
+
+## 7.61.0 - 2020-10-20
+* [#1030](https://github.com/stripe/stripe-php/pull/1030) Add support for `jp_rn` and `ru_kpp` as a `type` on `TaxId`
+
+## 7.60.0 - 2020-10-15
+* [#1027](https://github.com/stripe/stripe-php/pull/1027) Warn if opts are in params
+
+## 7.58.0 - 2020-10-14
+* [#1026](https://github.com/stripe/stripe-php/pull/1026) Add support for the Payout Reverse API
+
+## 7.57.0 - 2020-09-29
+* [#1020](https://github.com/stripe/stripe-php/pull/1020) Add support for the `SetupAttempt` resource and List API
+
+## 7.56.0 - 2020-09-25
+* [#1019](https://github.com/stripe/stripe-php/pull/1019) Update PHPDocs
+
+## 7.55.0 - 2020-09-24
+* [#1018](https://github.com/stripe/stripe-php/pull/1018) Multiple API changes
+  * Updated PHPDocs
+  * Added `TYPE_CONTRIBUTION` as a constant on `BalanceTransaction`
+
+## 7.54.0 - 2020-09-23
+* [#1017](https://github.com/stripe/stripe-php/pull/1017) Updated PHPDoc
+
+## 7.53.1 - 2020-09-22
+* [#1015](https://github.com/stripe/stripe-php/pull/1015) Bugfix: don't error on systems with php_uname in disablefunctions with whitespace
+
+## 7.53.0 - 2020-09-21
+* [#1016](https://github.com/stripe/stripe-php/pull/1016) Updated PHPDocs
+
+## 7.52.0 - 2020-09-08
+* [#1010](https://github.com/stripe/stripe-php/pull/1010) Update PHPDocs
+
+## 7.51.0 - 2020-09-02
+* [#1007](https://github.com/stripe/stripe-php/pull/1007) Multiple API changes
+  * Add support for the Issuing Dispute Submit API
+  * Add constants for `payment_status` on Checkout `Session`
+* [#1003](https://github.com/stripe/stripe-php/pull/1003) Add trim to getSignatures to allow for leading whitespace.
+
+## 7.50.0 - 2020-08-28
+* [#1005](https://github.com/stripe/stripe-php/pull/1005) Updated PHPDocs
+
+## 7.49.0 - 2020-08-19
+* [#998](https://github.com/stripe/stripe-php/pull/998) PHPDocs updated
+
+## 7.48.0 - 2020-08-17
+* [#997](https://github.com/stripe/stripe-php/pull/997) PHPDocs updated
+* [#996](https://github.com/stripe/stripe-php/pull/996) Fixing telemetry
+
+## 7.47.0 - 2020-08-13
+* [#994](https://github.com/stripe/stripe-php/pull/994) Nullable balance_transactions on issuing disputes
+* [#991](https://github.com/stripe/stripe-php/pull/991) Fix invalid return types in OAuthService
+
+## 7.46.1 - 2020-08-07
+* [#990](https://github.com/stripe/stripe-php/pull/990) PHPdoc changes
+
+## 7.46.0 - 2020-08-05
+* [#989](https://github.com/stripe/stripe-php/pull/989) Add support for the `PromotionCode` resource and APIs
+
+## 7.45.0 - 2020-07-28
+* [#981](https://github.com/stripe/stripe-php/pull/981) PHPdoc updates
+
+## 7.44.0 - 2020-07-20
+* [#948](https://github.com/stripe/stripe-php/pull/948) Add `first()` and `last()` functions to `Collection`
+
+## 7.43.0 - 2020-07-17
+* [#975](https://github.com/stripe/stripe-php/pull/975) Add support for `political_exposure` on `Person`
+
+## 7.42.0 - 2020-07-15
+* [#974](https://github.com/stripe/stripe-php/pull/974) Add new constants for `purpose` on `File`
+
+## 7.41.1 - 2020-07-15
+* [#973](https://github.com/stripe/stripe-php/pull/973) Multiple PHPDoc fixes
+
+## 7.41.0 - 2020-07-14
+* [#971](https://github.com/stripe/stripe-php/pull/971) Adds enum values for `billing_address_collection` on Checkout `Session`
+
+## 7.40.0 - 2020-07-06
+* [#964](https://github.com/stripe/stripe-php/pull/964) Add OAuthService
+
+## 7.39.0 - 2020-06-25
+* [#960](https://github.com/stripe/stripe-php/pull/960) Add constants for `payment_behavior` on `Subscription`
+
+## 7.38.0 - 2020-06-24
+* [#959](https://github.com/stripe/stripe-php/pull/959) Add multiple constants missing for `Event`
+
+## 7.37.2 - 2020-06-23
+* [#957](https://github.com/stripe/stripe-php/pull/957) Updated PHPDocs
+
+## 7.37.1 - 2020-06-11
+* [#952](https://github.com/stripe/stripe-php/pull/952) Improve PHPDoc
+
+## 7.37.0 - 2020-06-09
+* [#950](https://github.com/stripe/stripe-php/pull/950) Add support for `id_npwp` and `my_frp` as `type` on `TaxId`
+
+## 7.36.2 - 2020-06-03
+* [#946](https://github.com/stripe/stripe-php/pull/946) Update PHPDoc
+
+## 7.36.1 - 2020-05-28
+* [#938](https://github.com/stripe/stripe-php/pull/938) Remove extra array_keys() call.
+* [#942](https://github.com/stripe/stripe-php/pull/942) fix autopagination for service methods
+
+## 7.36.0 - 2020-05-21
+* [#937](https://github.com/stripe/stripe-php/pull/937) Add support for `ae_trn`, `cl_tin` and `sa_vat` as `type` on `TaxId`
+
+## 7.35.0 - 2020-05-20
+* [#936](https://github.com/stripe/stripe-php/pull/936) Add `anticipation_repayment` as a `type` on `BalanceTransaction`
+
+## 7.34.0 - 2020-05-18
+* [#934](https://github.com/stripe/stripe-php/pull/934) Add support for `issuing_dispute` as a `type` on `BalanceTransaction`
+
+## 7.33.1 - 2020-05-15
+* [#933](https://github.com/stripe/stripe-php/pull/933) Services bugfix: convert nested null params to empty strings
+
+## 7.33.0 - 2020-05-14
+* [#771](https://github.com/stripe/stripe-php/pull/771) Introduce client/services API. The [migration guide](https://github.com/stripe/stripe-php/wiki/Migration-to-StripeClient-and-services-in-7.33.0) contains before & after examples of the backwards-compatible changes.
+
+## 7.32.1 - 2020-05-13
+* [#932](https://github.com/stripe/stripe-php/pull/932) Fix multiple PHPDoc
+
+## 7.32.0 - 2020-05-11
+* [#931](https://github.com/stripe/stripe-php/pull/931) Add support for the `LineItem` resource and APIs
+
+## 7.31.0 - 2020-05-01
+* [#927](https://github.com/stripe/stripe-php/pull/927) Add support for new tax IDs
+
+## 7.30.0 - 2020-04-29
+* [#924](https://github.com/stripe/stripe-php/pull/924) Add support for the `Price` resource and APIs
+
+## 7.29.0 - 2020-04-22
+* [#920](https://github.com/stripe/stripe-php/pull/920) Add support for the `Session` resource and APIs on the `BillingPortal` namespace
+
+## 7.28.1 - 2020-04-10
+* [#915](https://github.com/stripe/stripe-php/pull/915) Improve PHPdocs for many classes
+
+## 7.28.0 - 2020-04-03
+* [#912](https://github.com/stripe/stripe-php/pull/912) Preserve backwards compatibility for typoed `TYPE_ADJUSTEMENT` enum.
+* [#911](https://github.com/stripe/stripe-php/pull/911) Codegenerated PHPDoc for nested resources
+* [#902](https://github.com/stripe/stripe-php/pull/902) Update docstrings for nested resources
+
+## 7.27.3 - 2020-03-18
+* [#899](https://github.com/stripe/stripe-php/pull/899) Convert keys to strings in `StripeObject::toArray()`
+
+## 7.27.2 - 2020-03-13
+* [#894](https://github.com/stripe/stripe-php/pull/894) Multiple PHPDocs changes
+
+## 7.27.1 - 2020-03-03
+* [#890](https://github.com/stripe/stripe-php/pull/890) Update PHPdoc
+
+## 7.27.0 - 2020-02-28
+* [#889](https://github.com/stripe/stripe-php/pull/889) Add new constants for `type` on `TaxId`
+
+## 7.26.0 - 2020-02-26
+* [#886](https://github.com/stripe/stripe-php/pull/886) Add support for listing Checkout `Session`
+* [#883](https://github.com/stripe/stripe-php/pull/883) Add PHPDoc class descriptions
+
+## 7.25.0 - 2020-02-14
+* [#879](https://github.com/stripe/stripe-php/pull/879) Make `\Stripe\Collection` implement `\Countable`
+* [#875](https://github.com/stripe/stripe-php/pull/875) Last set of PHP-CS-Fixer updates
+* [#874](https://github.com/stripe/stripe-php/pull/874) Enable php_unit_internal_class rule
+* [#873](https://github.com/stripe/stripe-php/pull/873) Add support for phpDocumentor in Makefile
+* [#872](https://github.com/stripe/stripe-php/pull/872) Another batch of PHP-CS-Fixer rule updates
+* [#871](https://github.com/stripe/stripe-php/pull/871) Fix a few PHPDoc comments
+* [#870](https://github.com/stripe/stripe-php/pull/870) More PHP-CS-Fixer tweaks
+
+## 7.24.0 - 2020-02-10
+* [#862](https://github.com/stripe/stripe-php/pull/862) Better PHPDoc
+* [#865](https://github.com/stripe/stripe-php/pull/865) Get closer to `@PhpCsFixer` standard ruleset
+
+## 7.23.0 - 2020-02-05
+* [#860](https://github.com/stripe/stripe-php/pull/860) Add PHPDoc types for expandable fields
+* [#858](https://github.com/stripe/stripe-php/pull/858) Use `native_function_invocation` PHPStan rule
+* [#857](https://github.com/stripe/stripe-php/pull/857) Update PHPDoc on nested resources
+* [#855](https://github.com/stripe/stripe-php/pull/855) PHPDoc: `StripeObject` -> `ErrorObject` where appropriate
+* [#837](https://github.com/stripe/stripe-php/pull/837) Autogen diff
+* [#854](https://github.com/stripe/stripe-php/pull/854) Upgrade PHPStan and fix settings
+* [#850](https://github.com/stripe/stripe-php/pull/850) Yet more PHPDoc updates
+
+## 7.22.0 - 2020-01-31
+* [#849](https://github.com/stripe/stripe-php/pull/849) Add new constants for `type` on `TaxId`
+* [#843](https://github.com/stripe/stripe-php/pull/843) Even more PHPDoc fixes
+* [#841](https://github.com/stripe/stripe-php/pull/841) More PHPDoc fixes
+
+## 7.21.1 - 2020-01-29
+* [#840](https://github.com/stripe/stripe-php/pull/840) Update phpdocs across multiple resources.
+
+## 7.21.0 - 2020-01-28
+* [#839](https://github.com/stripe/stripe-php/pull/839) Add support for `TYPE_ES_CIF` on `TaxId`
+
+## 7.20.0 - 2020-01-23
+* [#836](https://github.com/stripe/stripe-php/pull/836) Add new type values for `TaxId`
+
+## 7.19.1 - 2020-01-14
+* [#831](https://github.com/stripe/stripe-php/pull/831) Fix incorrect `UnexpectedValueException` instantiation
+
+## 7.19.0 - 2020-01-14
+* [#830](https://github.com/stripe/stripe-php/pull/830) Add support for `CreditNoteLineItem`
+
+## 7.18.0 - 2020-01-13
+* [#829](https://github.com/stripe/stripe-php/pull/829) Don't call php_uname function if disabled by php.ini
+
+## 7.17.0 - 2020-01-08
+* [#821](https://github.com/stripe/stripe-php/pull/821) Improve PHPDoc types for `ApiErrorException.get/setJsonBody()` methods
+
+## 7.16.0 - 2020-01-06
+* [#826](https://github.com/stripe/stripe-php/pull/826) Rename remaining `$options` to `$opts`
+* [#825](https://github.com/stripe/stripe-php/pull/825) Update PHPDoc
+
+## 7.15.0 - 2020-01-06
+* [#824](https://github.com/stripe/stripe-php/pull/824) Add constant `TYPE_SG_UEN` to `TaxId`
+
+## 7.14.2 - 2019-12-04
+* [#816](https://github.com/stripe/stripe-php/pull/816) Disable autoloader when checking for `Throwable`
+
+## 7.14.1 - 2019-11-26
+* [#812](https://github.com/stripe/stripe-php/pull/812) Fix invalid PHPdoc on `Subscription`
+
+## 7.14.0 - 2019-11-26
+* [#811](https://github.com/stripe/stripe-php/pull/811) Add support for `CreditNote` preview.
+
+## 7.13.0 - 2019-11-19
+* [#808](https://github.com/stripe/stripe-php/pull/808) Add support for listing lines on an Invoice directly via `Invoice::allLines()`
+
+## 7.12.0 - 2019-11-08
+
+-   [#805](https://github.com/stripe/stripe-php/pull/805) Add Source::allSourceTransactions and SubscriptionItem::allUsageRecordSummaries
+-   [#798](https://github.com/stripe/stripe-php/pull/798) The argument of `array_key_exists` cannot be `null`
+-   [#803](https://github.com/stripe/stripe-php/pull/803) Removed unwanted got
+
+## 7.11.0 - 2019-11-06
+
+-   [#797](https://github.com/stripe/stripe-php/pull/797) Add support for reverse pagination
+
+## 7.10.0 - 2019-11-05
+
+-   [#795](https://github.com/stripe/stripe-php/pull/795) Add support for `Mandate`
+
+## 7.9.0 - 2019-11-05
+
+-   [#794](https://github.com/stripe/stripe-php/pull/794) Add PHPDoc to `ApiResponse`
+-   [#792](https://github.com/stripe/stripe-php/pull/792) Use single quotes for `OBJECT_NAME` constants
+
+## 7.8.0 - 2019-11-05
+
+-   [#790](https://github.com/stripe/stripe-php/pull/790) Mark nullable fields in PHPDoc
+-   [#788](https://github.com/stripe/stripe-php/pull/788) Early codegen fixes
+-   [#787](https://github.com/stripe/stripe-php/pull/787) Use PHPStan in Travis CI
+
+## 7.7.1 - 2019-10-25
+
+-   [#781](https://github.com/stripe/stripe-php/pull/781) Fix telemetry header
+-   [#780](https://github.com/stripe/stripe-php/pull/780) Contributor Convenant
+
+## 7.7.0 - 2019-10-23
+
+-   [#776](https://github.com/stripe/stripe-php/pull/776) Add `CAPABILITY_TRANSFERS` to `Account`
+-   [#778](https://github.com/stripe/stripe-php/pull/778) Add support for `TYPE_MX_RFC` type on `TaxId`
+
+## 7.6.0 - 2019-10-22
+
+-   [#770](https://github.com/stripe/stripe-php/pull/770) Add missing constants for Customer's `TaxId`
+
+## 7.5.0 - 2019-10-18
+
+-   [#768](https://github.com/stripe/stripe-php/pull/768) Redact API key in `RequestOptions` debug info
+
+## 7.4.0 - 2019-10-15
+
+-   [#764](https://github.com/stripe/stripe-php/pull/764) Add support for HTTP request monitoring callback
+
+## 7.3.1 - 2019-10-07
+
+-   [#755](https://github.com/stripe/stripe-php/pull/755) Respect Stripe-Should-Retry and Retry-After headers
+
+## 7.3.0 - 2019-10-02
+
+-   [#752](https://github.com/stripe/stripe-php/pull/752) Add `payment_intent.canceled` and `setup_intent.canceled` events
+-   [#749](https://github.com/stripe/stripe-php/pull/749) Call `toArray()` on objects only
+
+## 7.2.2 - 2019-09-24
+
+-   [#746](https://github.com/stripe/stripe-php/pull/746) Add missing decline codes
+
+## 7.2.1 - 2019-09-23
+
+-   [#744](https://github.com/stripe/stripe-php/pull/744) Added new PHPDoc
+
+## 7.2.0 - 2019-09-17
+
+-   [#738](https://github.com/stripe/stripe-php/pull/738) Added missing constants for `SetupIntent` events
+
+## 7.1.1 - 2019-09-16
+
+-   [#737](https://github.com/stripe/stripe-php/pull/737) Added new PHPDoc
+
+## 7.1.0 - 2019-09-13
+
+-   [#736](https://github.com/stripe/stripe-php/pull/736) Make `CaseInsensitiveArray` countable and traversable
+
+## 7.0.2 - 2019-09-06
+
+-   [#729](https://github.com/stripe/stripe-php/pull/729) Fix usage of `SignatureVerificationException` in PHPDoc blocks
+
+## 7.0.1 - 2019-09-05
+
+-   [#728](https://github.com/stripe/stripe-php/pull/728) Clean up Collection
+
+## 7.0.0 - 2019-09-03
+
+Major version release. The [migration guide](https://github.com/stripe/stripe-php/wiki/Migration-guide-for-v7) contains a detailed list of backwards-incompatible changes with upgrade instructions.
+
+Pull requests included in this release (cf. [#552](https://github.com/stripe/stripe-php/pull/552)) (⚠️ = breaking changes):
+
+-   ⚠️ Drop support for PHP 5.4 ([#551](https://github.com/stripe/stripe-php/pull/551))
+-   ⚠️ Drop support for PHP 5.5 ([#554](https://github.com/stripe/stripe-php/pull/554))
+-   Bump dependencies ([#553](https://github.com/stripe/stripe-php/pull/553))
+-   Remove `CURLFile` check ([#555](https://github.com/stripe/stripe-php/pull/555))
+-   Update constant definitions for PHP >= 5.6 ([#556](https://github.com/stripe/stripe-php/pull/556))
+-   ⚠️ Remove `FileUpload` alias ([#557](https://github.com/stripe/stripe-php/pull/557))
+-   Remove `curl_reset` check ([#570](https://github.com/stripe/stripe-php/pull/570))
+-   Use `\Stripe\<class>::class` constant instead of strings ([#643](https://github.com/stripe/stripe-php/pull/643))
+-   Use `array_column` to flatten params ([#686](https://github.com/stripe/stripe-php/pull/686))
+-   ⚠️ Remove deprecated methods ([#692](https://github.com/stripe/stripe-php/pull/692))
+-   ⚠️ Remove `IssuerFraudRecord` ([#696](https://github.com/stripe/stripe-php/pull/696))
+-   Update constructors of Stripe exception classes ([#559](https://github.com/stripe/stripe-php/pull/559))
+-   Fix remaining TODOs ([#700](https://github.com/stripe/stripe-php/pull/700))
+-   Use yield for autopagination ([#703](https://github.com/stripe/stripe-php/pull/703))
+-   ⚠️ Rename fake magic methods and rewrite array conversion ([#704](https://github.com/stripe/stripe-php/pull/704))
+-   Add `ErrorObject` to Stripe exceptions ([#705](https://github.com/stripe/stripe-php/pull/705))
+-   Start using PHP CS Fixer ([#706](https://github.com/stripe/stripe-php/pull/706))
+-   Update error messages for nested resource operations ([#708](https://github.com/stripe/stripe-php/pull/708))
+-   Upgrade retry logic ([#707](https://github.com/stripe/stripe-php/pull/707))
+-   ⚠️ `Collection` improvements / fixes ([#715](https://github.com/stripe/stripe-php/pull/715))
+-   ⚠️ Modernize exceptions ([#709](https://github.com/stripe/stripe-php/pull/709))
+-   Add constants for error codes ([#716](https://github.com/stripe/stripe-php/pull/716))
+-   Update certificate bundle ([#717](https://github.com/stripe/stripe-php/pull/717))
+-   Retry requests on a 429 that's a lock timeout ([#718](https://github.com/stripe/stripe-php/pull/718))
+-   Fix `toArray()` calls ([#719](https://github.com/stripe/stripe-php/pull/719))
+-   Couple of fixes for PHP 7.4 ([#725](https://github.com/stripe/stripe-php/pull/725))
+
 ## 6.43.1 - 2019-08-29
-* [#722](https://github.com/stripe/stripe-php/pull/722) Make `LoggerInterface::error` compatible with its PSR-3 counterpart
-* [#714](https://github.com/stripe/stripe-php/pull/714) Add `pending_setup_intent` property in `Subscription`
-* [#713](https://github.com/stripe/stripe-php/pull/713) Add typehint to `ApiResponse`
-* [#712](https://github.com/stripe/stripe-php/pull/712) Fix comment
-* [#701](https://github.com/stripe/stripe-php/pull/701) Start testing PHP 7.3
+
+-   [#722](https://github.com/stripe/stripe-php/pull/722) Make `LoggerInterface::error` compatible with its PSR-3 counterpart
+-   [#714](https://github.com/stripe/stripe-php/pull/714) Add `pending_setup_intent` property in `Subscription`
+-   [#713](https://github.com/stripe/stripe-php/pull/713) Add typehint to `ApiResponse`
+-   [#712](https://github.com/stripe/stripe-php/pull/712) Fix comment
+-   [#701](https://github.com/stripe/stripe-php/pull/701) Start testing PHP 7.3
 
 ## 6.43.0 - 2019-08-09
-* [#694](https://github.com/stripe/stripe-php/pull/694) Add `SubscriptionItem::createUsageRecord` method
+
+-   [#694](https://github.com/stripe/stripe-php/pull/694) Add `SubscriptionItem::createUsageRecord` method
 
 ## 6.42.0 - 2019-08-09
-* [#688](https://github.com/stripe/stripe-php/pull/688) Remove `SubscriptionScheduleRevision`
-  * Note that this is technically a breaking change, however we've chosen to release it as a minor version in light of the fact that this resource and its API methods were virtually unused.
+
+-   [#688](https://github.com/stripe/stripe-php/pull/688) Remove `SubscriptionScheduleRevision`
+    -   Note that this is technically a breaking change, however we've chosen to release it as a minor version in light of the fact that this resource and its API methods were virtually unused.
 
 ## 6.41.0 - 2019-07-31
-* [#683](https://github.com/stripe/stripe-php/pull/683) Move the List Balance History API to `/v1/balance_transactions`
+
+-   [#683](https://github.com/stripe/stripe-php/pull/683) Move the List Balance History API to `/v1/balance_transactions`
 
 ## 6.40.0 - 2019-06-27
-* [#675](https://github.com/stripe/stripe-php/pull/675) Add support for `SetupIntent` resource and APIs
+
+-   [#675](https://github.com/stripe/stripe-php/pull/675) Add support for `SetupIntent` resource and APIs
 
 ## 6.39.2 - 2019-06-26
-* [#676](https://github.com/stripe/stripe-php/pull/676) Fix exception message in `CustomerBalanceTransaction::update()`
+
+-   [#676](https://github.com/stripe/stripe-php/pull/676) Fix exception message in `CustomerBalanceTransaction::update()`
 
 ## 6.39.1 - 2019-06-25
-* [#674](https://github.com/stripe/stripe-php/pull/674) Add new constants for `collection_method` on `Invoice`
+
+-   [#674](https://github.com/stripe/stripe-php/pull/674) Add new constants for `collection_method` on `Invoice`
 
 ## 6.39.0 - 2019-06-24
-* [#673](https://github.com/stripe/stripe-php/pull/673) Enable request latency telemetry by default
+
+-   [#673](https://github.com/stripe/stripe-php/pull/673) Enable request latency telemetry by default
 
 ## 6.38.0 - 2019-06-17
-* [#649](https://github.com/stripe/stripe-php/pull/649) Add support for `CustomerBalanceTransaction` resource and APIs
+
+-   [#649](https://github.com/stripe/stripe-php/pull/649) Add support for `CustomerBalanceTransaction` resource and APIs
 
 ## 6.37.2 - 2019-06-17
-* [#671](https://github.com/stripe/stripe-php/pull/671) Add new PHPDoc
-* [#672](https://github.com/stripe/stripe-php/pull/672) Add constants for `submit_type` on Checkout `Session`
+
+-   [#671](https://github.com/stripe/stripe-php/pull/671) Add new PHPDoc
+-   [#672](https://github.com/stripe/stripe-php/pull/672) Add constants for `submit_type` on Checkout `Session`
 
 ## 6.37.1 - 2019-06-14
-* [#670](https://github.com/stripe/stripe-php/pull/670) Add new PHPDoc
+
+-   [#670](https://github.com/stripe/stripe-php/pull/670) Add new PHPDoc
 
 ## 6.37.0 - 2019-05-23
-* [#663](https://github.com/stripe/stripe-php/pull/663) Add support for `radar.early_fraud_warning` resource
+
+-   [#663](https://github.com/stripe/stripe-php/pull/663) Add support for `radar.early_fraud_warning` resource
 
 ## 6.36.0 - 2019-05-22
-* [#661](https://github.com/stripe/stripe-php/pull/661) Add constants for new TaxId types
-* [#662](https://github.com/stripe/stripe-php/pull/662) Add constants for BalanceTransaction types
+
+-   [#661](https://github.com/stripe/stripe-php/pull/661) Add constants for new TaxId types
+-   [#662](https://github.com/stripe/stripe-php/pull/662) Add constants for BalanceTransaction types
 
 ## 6.35.2 - 2019-05-20
-* [#655](https://github.com/stripe/stripe-php/pull/655) Add constants for payment intent statuses
-* [#659](https://github.com/stripe/stripe-php/pull/659) Fix PHPDoc for various nested Account actions
-* [#660](https://github.com/stripe/stripe-php/pull/660) Fix various PHPDoc
+
+-   [#655](https://github.com/stripe/stripe-php/pull/655) Add constants for payment intent statuses
+-   [#659](https://github.com/stripe/stripe-php/pull/659) Fix PHPDoc for various nested Account actions
+-   [#660](https://github.com/stripe/stripe-php/pull/660) Fix various PHPDoc
 
 ## 6.35.1 - 2019-05-20
-* [#658](https://github.com/stripe/stripe-php/pull/658) Use absolute value when checking timestamp tolerance
+
+-   [#658](https://github.com/stripe/stripe-php/pull/658) Use absolute value when checking timestamp tolerance
 
 ## 6.35.0 - 2019-05-14
-* [#651](https://github.com/stripe/stripe-php/pull/651) Add support for the Capability resource and APIs
+
+-   [#651](https://github.com/stripe/stripe-php/pull/651) Add support for the Capability resource and APIs
 
 ## 6.34.6 - 2019-05-13
-* [#654](https://github.com/stripe/stripe-php/pull/654) Fix typo in definition of `Event::PAYMENT_METHOD_ATTACHED` constant
+
+-   [#654](https://github.com/stripe/stripe-php/pull/654) Fix typo in definition of `Event::PAYMENT_METHOD_ATTACHED` constant
 
 ## 6.34.5 - 2019-05-06
-* [#647](https://github.com/stripe/stripe-php/pull/647) Set the return type to static for more operations
+
+-   [#647](https://github.com/stripe/stripe-php/pull/647) Set the return type to static for more operations
 
 ## 6.34.4 - 2019-05-06
-* [#650](https://github.com/stripe/stripe-php/pull/650) Add missing constants for Event types
+
+-   [#650](https://github.com/stripe/stripe-php/pull/650) Add missing constants for Event types
 
 ## 6.34.3 - 2019-05-01
-* [#644](https://github.com/stripe/stripe-php/pull/644) Update return type to `static` to improve static analysis
-* [#645](https://github.com/stripe/stripe-php/pull/645) Fix constant for `payment_intent.payment_failed`
+
+-   [#644](https://github.com/stripe/stripe-php/pull/644) Update return type to `static` to improve static analysis
+-   [#645](https://github.com/stripe/stripe-php/pull/645) Fix constant for `payment_intent.payment_failed`
 
 ## 6.34.2 - 2019-04-26
-* [#642](https://github.com/stripe/stripe-php/pull/642) Fix an issue where existing idempotency keys would be overwritten when using automatic retries
+
+-   [#642](https://github.com/stripe/stripe-php/pull/642) Fix an issue where existing idempotency keys would be overwritten when using automatic retries
 
 ## 6.34.1 - 2019-04-25
-* [#640](https://github.com/stripe/stripe-php/pull/640) Add missing phpdocs
+
+-   [#640](https://github.com/stripe/stripe-php/pull/640) Add missing phpdocs
 
 ## 6.34.0 - 2019-04-24
-* [#626](https://github.com/stripe/stripe-php/pull/626) Add support for the `TaxRate` resource and APIs
-* [#639](https://github.com/stripe/stripe-php/pull/639) Fix multiple phpdoc issues
+
+-   [#626](https://github.com/stripe/stripe-php/pull/626) Add support for the `TaxRate` resource and APIs
+-   [#639](https://github.com/stripe/stripe-php/pull/639) Fix multiple phpdoc issues
 
 ## 6.33.0 - 2019-04-22
-* [#630](https://github.com/stripe/stripe-php/pull/630) Add support for the `TaxId` resource and APIs
+
+-   [#630](https://github.com/stripe/stripe-php/pull/630) Add support for the `TaxId` resource and APIs
 
 ## 6.32.1 - 2019-04-19
-* [#636](https://github.com/stripe/stripe-php/pull/636) Correct type of `$personId` in PHPDoc
+
+-   [#636](https://github.com/stripe/stripe-php/pull/636) Correct type of `$personId` in PHPDoc
 
 ## 6.32.0 - 2019-04-18
-* [#621](https://github.com/stripe/stripe-php/pull/621) Add support for `CreditNote`
+
+-   [#621](https://github.com/stripe/stripe-php/pull/621) Add support for `CreditNote`
 
 ## 6.31.5 - 2019-04-12
-* [#628](https://github.com/stripe/stripe-php/pull/628) Add constants for `person.*` event types
-* [#628](https://github.com/stripe/stripe-php/pull/628) Add missing constants for `Account` and `Person`
+
+-   [#628](https://github.com/stripe/stripe-php/pull/628) Add constants for `person.*` event types
+-   [#628](https://github.com/stripe/stripe-php/pull/628) Add missing constants for `Account` and `Person`
 
 ## 6.31.4 - 2019-04-05
-* [#624](https://github.com/stripe/stripe-php/pull/624) Fix encoding of nested parameters in multipart requests
+
+-   [#624](https://github.com/stripe/stripe-php/pull/624) Fix encoding of nested parameters in multipart requests
 
 ## 6.31.3 - 2019-04-02
-* [#623](https://github.com/stripe/stripe-php/pull/623) Only use HTTP/2 with curl >= 7.60.0
+
+-   [#623](https://github.com/stripe/stripe-php/pull/623) Only use HTTP/2 with curl >= 7.60.0
 
 ## 6.31.2 - 2019-03-25
-* [#619](https://github.com/stripe/stripe-php/pull/619) Fix PHPDoc return types for list methods for nested resources
+
+-   [#619](https://github.com/stripe/stripe-php/pull/619) Fix PHPDoc return types for list methods for nested resources
 
 ## 6.31.1 - 2019-03-22
-* [#612](https://github.com/stripe/stripe-php/pull/612) Add a lot of constants
-* [#614](https://github.com/stripe/stripe-php/pull/614) Add missing subscription status constants
+
+-   [#612](https://github.com/stripe/stripe-php/pull/612) Add a lot of constants
+-   [#614](https://github.com/stripe/stripe-php/pull/614) Add missing subscription status constants
 
 ## 6.31.0 - 2019-03-18
-* [#600](https://github.com/stripe/stripe-php/pull/600) Add support for the `PaymentMethod` resource and APIs
-* [#606](https://github.com/stripe/stripe-php/pull/606) Add support for retrieving a Checkout `Session`
-* [#611](https://github.com/stripe/stripe-php/pull/611) Add support for deleting a Terminal `Location` and `Reader`
+
+-   [#600](https://github.com/stripe/stripe-php/pull/600) Add support for the `PaymentMethod` resource and APIs
+-   [#606](https://github.com/stripe/stripe-php/pull/606) Add support for retrieving a Checkout `Session`
+-   [#611](https://github.com/stripe/stripe-php/pull/611) Add support for deleting a Terminal `Location` and `Reader`
 
 ## 6.30.5 - 2019-03-11
-* [#607](https://github.com/stripe/stripe-php/pull/607) Correctly handle case where a metadata key is called `metadata`
+
+-   [#607](https://github.com/stripe/stripe-php/pull/607) Correctly handle case where a metadata key is called `metadata`
 
 ## 6.30.4 - 2019-02-27
-* [#602](https://github.com/stripe/stripe-php/pull/602) Add `subscription_schedule` to `Subscription` for PHPDoc.
+
+-   [#602](https://github.com/stripe/stripe-php/pull/602) Add `subscription_schedule` to `Subscription` for PHPDoc.
 
 ## 6.30.3 - 2019-02-26
-* [#603](https://github.com/stripe/stripe-php/pull/603) Improve PHPDoc on the `Source` object to cover all types of Sources currently supported.
+
+-   [#603](https://github.com/stripe/stripe-php/pull/603) Improve PHPDoc on the `Source` object to cover all types of Sources currently supported.
 
 ## 6.30.2 - 2019-02-25
-* [#601](https://github.com/stripe/stripe-php/pull/601) Fix PHPDoc across multiple resources and add support for new events.
+
+-   [#601](https://github.com/stripe/stripe-php/pull/601) Fix PHPDoc across multiple resources and add support for new events.
 
 ## 6.30.1 - 2019-02-16
-* [#599](https://github.com/stripe/stripe-php/pull/599) Fix PHPDoc for `SubscriptionSchedule` and `SubscriptionScheduleRevision`
+
+-   [#599](https://github.com/stripe/stripe-php/pull/599) Fix PHPDoc for `SubscriptionSchedule` and `SubscriptionScheduleRevision`
 
 ## 6.30.0 - 2019-02-12
-* [#590](https://github.com/stripe/stripe-php/pull/590) Add support for `SubscriptionSchedule` and `SubscriptionScheduleRevision`
+
+-   [#590](https://github.com/stripe/stripe-php/pull/590) Add support for `SubscriptionSchedule` and `SubscriptionScheduleRevision`
 
 ## 6.29.3 - 2019-01-31
-* [#592](https://github.com/stripe/stripe-php/pull/592) Some more PHPDoc fixes
+
+-   [#592](https://github.com/stripe/stripe-php/pull/592) Some more PHPDoc fixes
 
 ## 6.29.2 - 2019-01-31
-* [#591](https://github.com/stripe/stripe-php/pull/591) Fix PHPDoc for nested resources
+
+-   [#591](https://github.com/stripe/stripe-php/pull/591) Fix PHPDoc for nested resources
 
 ## 6.29.1 - 2019-01-25
-* [#566](https://github.com/stripe/stripe-php/pull/566) Fix dangling message contents
-* [#586](https://github.com/stripe/stripe-php/pull/586) Don't overwrite `CURLOPT_HTTP_VERSION` option
+
+-   [#566](https://github.com/stripe/stripe-php/pull/566) Fix dangling message contents
+-   [#586](https://github.com/stripe/stripe-php/pull/586) Don't overwrite `CURLOPT_HTTP_VERSION` option
 
 ## 6.29.0 - 2019-01-23
-* [#579](https://github.com/stripe/stripe-php/pull/579) Rename `CheckoutSession` to `Session` and move it under the `Checkout` namespace. This is a breaking change, but we've reached out to affected merchants and all new merchants would use the new approach.
+
+-   [#579](https://github.com/stripe/stripe-php/pull/579) Rename `CheckoutSession` to `Session` and move it under the `Checkout` namespace. This is a breaking change, but we've reached out to affected merchants and all new merchants would use the new approach.
 
 ## 6.28.1 - 2019-01-21
-* [#580](https://github.com/stripe/stripe-php/pull/580) Properly serialize `individual` on `Account` objects
+
+-   [#580](https://github.com/stripe/stripe-php/pull/580) Properly serialize `individual` on `Account` objects
 
 ## 6.28.0 - 2019-01-03
-* [#576](https://github.com/stripe/stripe-php/pull/576) Add support for iterating directly over `Collection` instances
+
+-   [#576](https://github.com/stripe/stripe-php/pull/576) Add support for iterating directly over `Collection` instances
 
 ## 6.27.0 - 2018-12-21
-* [#571](https://github.com/stripe/stripe-php/pull/571) Add support for the `CheckoutSession` resource
+
+-   [#571](https://github.com/stripe/stripe-php/pull/571) Add support for the `CheckoutSession` resource
 
 ## 6.26.0 - 2018-12-11
-* [#568](https://github.com/stripe/stripe-php/pull/568) Enable persistent connections
+
+-   [#568](https://github.com/stripe/stripe-php/pull/568) Enable persistent connections
 
 ## 6.25.0 - 2018-12-10
-* [#567](https://github.com/stripe/stripe-php/pull/567) Add support for account links
+
+-   [#567](https://github.com/stripe/stripe-php/pull/567) Add support for account links
 
 ## 6.24.0 - 2018-11-28
-* [#562](https://github.com/stripe/stripe-php/pull/562) Add support for the Review resource
-* [#564](https://github.com/stripe/stripe-php/pull/564) Add event name constants for subscription schedule aborted/expiring
+
+-   [#562](https://github.com/stripe/stripe-php/pull/562) Add support for the Review resource
+-   [#564](https://github.com/stripe/stripe-php/pull/564) Add event name constants for subscription schedule aborted/expiring
 
 ## 6.23.0 - 2018-11-27
-* [#542](https://github.com/stripe/stripe-php/pull/542) Add support for `ValueList` and `ValueListItem` for Radar
+
+-   [#542](https://github.com/stripe/stripe-php/pull/542) Add support for `ValueList` and `ValueListItem` for Radar
 
 ## 6.22.1 - 2018-11-20
-* [#561](https://github.com/stripe/stripe-php/pull/561) Add cast and some docs to telemetry introduced in 6.22.0/#549
+
+-   [#561](https://github.com/stripe/stripe-php/pull/561) Add cast and some docs to telemetry introduced in 6.22.0/549
 
 ## 6.22.0 - 2018-11-15
-* [#549](https://github.com/stripe/stripe-php/pull/549) Add support for client telemetry
+
+-   [#549](https://github.com/stripe/stripe-php/pull/549) Add support for client telemetry
 
 ## 6.21.1 - 2018-11-12
-* [#548](https://github.com/stripe/stripe-php/pull/548) Don't mutate `Exception` class properties from `OAuthBase` error
+
+-   [#548](https://github.com/stripe/stripe-php/pull/548) Don't mutate `Exception` class properties from `OAuthBase` error
 
 ## 6.21.0 - 2018-11-08
-* [#537](https://github.com/stripe/stripe-php/pull/537) Add new API endpoints for the `Invoice` resource.
+
+-   [#537](https://github.com/stripe/stripe-php/pull/537) Add new API endpoints for the `Invoice` resource.
 
 ## 6.20.1 - 2018-11-07
-* [#546](https://github.com/stripe/stripe-php/pull/546) Drop files from the Composer package that aren't needed in the release
+
+-   [#546](https://github.com/stripe/stripe-php/pull/546) Drop files from the Composer package that aren't needed in the release
 
 ## 6.20.0 - 2018-10-30
-* [#536](https://github.com/stripe/stripe-php/pull/536) Add support for the `Person` resource
-* [#541](https://github.com/stripe/stripe-php/pull/541) Add support for the `WebhookEndpoint` resource
+
+-   [#536](https://github.com/stripe/stripe-php/pull/536) Add support for the `Person` resource
+-   [#541](https://github.com/stripe/stripe-php/pull/541) Add support for the `WebhookEndpoint` resource
 
 ## 6.19.5 - 2018-10-17
-* [#539](https://github.com/stripe/stripe-php/pull/539) Fix methods on `\Stripe\PaymentIntent` to properly pass arguments to the API.
+
+-   [#539](https://github.com/stripe/stripe-php/pull/539) Fix methods on `\Stripe\PaymentIntent` to properly pass arguments to the API.
 
 ## 6.19.4 - 2018-10-11
-* [#534](https://github.com/stripe/stripe-php/pull/534) Fix PSR-4 autoloading for `\Stripe\FileUpload` class alias
+
+-   [#534](https://github.com/stripe/stripe-php/pull/534) Fix PSR-4 autoloading for `\Stripe\FileUpload` class alias
 
 ## 6.19.3 - 2018-10-09
-* [#530](https://github.com/stripe/stripe-php/pull/530) Add constants for `flow` (`FLOW_*`), `status` (`STATUS_*`) and `usage` (`USAGE_*`) on `\Stripe\Source`
+
+-   [#530](https://github.com/stripe/stripe-php/pull/530) Add constants for `flow` (`FLOW_*`), `status` (`STATUS_*`) and `usage` (`USAGE_*`) on `\Stripe\Source`
 
 ## 6.19.2 - 2018-10-08
-* [#531](https://github.com/stripe/stripe-php/pull/531) Store HTTP response headers in case-insensitive array
+
+-   [#531](https://github.com/stripe/stripe-php/pull/531) Store HTTP response headers in case-insensitive array
 
 ## 6.19.1 - 2018-09-25
-* [#526](https://github.com/stripe/stripe-php/pull/526) Ignore null values in request parameters
+
+-   [#526](https://github.com/stripe/stripe-php/pull/526) Ignore null values in request parameters
 
 ## 6.19.0 - 2018-09-24
-* [#523](https://github.com/stripe/stripe-php/pull/523) Add support for Stripe Terminal
+
+-   [#523](https://github.com/stripe/stripe-php/pull/523) Add support for Stripe Terminal
 
 ## 6.18.0 - 2018-09-24
-* [#520](https://github.com/stripe/stripe-php/pull/520) Rename `\Stripe\FileUpload` to `\Stripe\File`
+
+-   [#520](https://github.com/stripe/stripe-php/pull/520) Rename `\Stripe\FileUpload` to `\Stripe\File`
 
 ## 6.17.2 - 2018-09-18
-* [#522](https://github.com/stripe/stripe-php/pull/522) Fix warning when adding a new additional owner to an existing array
+
+-   [#522](https://github.com/stripe/stripe-php/pull/522) Fix warning when adding a new additional owner to an existing array
 
 ## 6.17.1 - 2018-09-14
-* [#517](https://github.com/stripe/stripe-php/pull/517) Integer-index encode all sequential arrays
+
+-   [#517](https://github.com/stripe/stripe-php/pull/517) Integer-index encode all sequential arrays
 
 ## 6.17.0 - 2018-09-05
-* [#514](https://github.com/stripe/stripe-php/pull/514) Add support for reporting resources
+
+-   [#514](https://github.com/stripe/stripe-php/pull/514) Add support for reporting resources
 
 ## 6.16.0 - 2018-08-23
-* [#509](https://github.com/stripe/stripe-php/pull/509) Add support for usage record summaries
+
+-   [#509](https://github.com/stripe/stripe-php/pull/509) Add support for usage record summaries
 
 ## 6.15.0 - 2018-08-03
-* [#504](https://github.com/stripe/stripe-php/pull/504) Add cancel support for topups
+
+-   [#504](https://github.com/stripe/stripe-php/pull/504) Add cancel support for topups
 
 ## 6.14.0 - 2018-08-02
-* [#505](https://github.com/stripe/stripe-php/pull/505) Add support for file links
+
+-   [#505](https://github.com/stripe/stripe-php/pull/505) Add support for file links
 
 ## 6.13.0 - 2018-07-31
-* [#502](https://github.com/stripe/stripe-php/pull/502) Add `isDeleted()` method to `\Stripe\StripeObject`
+
+-   [#502](https://github.com/stripe/stripe-php/pull/502) Add `isDeleted()` method to `\Stripe\StripeObject`
 
 ## 6.12.0 - 2018-07-28
-* [#501](https://github.com/stripe/stripe-php/pull/501) Add support for scheduled query runs (`\Stripe\Sigma\ScheduledQueryRun`) for Sigma
+
+-   [#501](https://github.com/stripe/stripe-php/pull/501) Add support for scheduled query runs (`\Stripe\Sigma\ScheduledQueryRun`) for Sigma
 
 ## 6.11.0 - 2018-07-26
-* [#500](https://github.com/stripe/stripe-php/pull/500) Add support for Stripe Issuing
+
+-   [#500](https://github.com/stripe/stripe-php/pull/500) Add support for Stripe Issuing
 
 ## 6.10.4 - 2018-07-19
-* [#498](https://github.com/stripe/stripe-php/pull/498) Internal improvements to the `\Stripe\ApiResource.classUrl()` method
+
+-   [#498](https://github.com/stripe/stripe-php/pull/498) Internal improvements to the `\Stripe\ApiResource.classUrl()` method
 
 ## 6.10.3 - 2018-07-16
-* [#497](https://github.com/stripe/stripe-php/pull/497) Use HTTP/2 only for HTTPS requests
+
+-   [#497](https://github.com/stripe/stripe-php/pull/497) Use HTTP/2 only for HTTPS requests
 
 ## 6.10.2 - 2018-07-11
-* [#494](https://github.com/stripe/stripe-php/pull/494) Enable HTTP/2 support
+
+-   [#494](https://github.com/stripe/stripe-php/pull/494) Enable HTTP/2 support
 
 ## 6.10.1 - 2018-07-10
-* [#493](https://github.com/stripe/stripe-php/pull/493) Add PHPDoc for `auto_advance` on `\Stripe\Invoice`
+
+-   [#493](https://github.com/stripe/stripe-php/pull/493) Add PHPDoc for `auto_advance` on `\Stripe\Invoice`
 
 ## 6.10.0 - 2018-06-28
-* [#488](https://github.com/stripe/stripe-php/pull/488) Add support for `$appPartnerId` to `Stripe::setAppInfo()`
+
+-   [#488](https://github.com/stripe/stripe-php/pull/488) Add support for `$appPartnerId` to `Stripe::setAppInfo()`
 
 ## 6.9.0 - 2018-06-28
-* [#487](https://github.com/stripe/stripe-php/pull/487) Add support for payment intents
+
+-   [#487](https://github.com/stripe/stripe-php/pull/487) Add support for payment intents
 
 ## 6.8.2 - 2018-06-24
-* [#486](https://github.com/stripe/stripe-php/pull/486) Make `Account.deauthorize()` return the `StripeObject` from the API
+
+-   [#486](https://github.com/stripe/stripe-php/pull/486) Make `Account.deauthorize()` return the `StripeObject` from the API
 
 ## 6.8.1 - 2018-06-13
-* [#472](https://github.com/stripe/stripe-php/pull/472) Added phpDoc for `ApiRequestor` and others, especially regarding thrown errors
+
+-   [#472](https://github.com/stripe/stripe-php/pull/472) Added phpDoc for `ApiRequestor` and others, especially regarding thrown errors
 
 ## 6.8.0 - 2018-06-13
-* [#481](https://github.com/stripe/stripe-php/pull/481) Add new `\Stripe\Discount` and `\Stripe\OrderItem` classes, add more PHPDoc describing object attributes
+
+-   [#481](https://github.com/stripe/stripe-php/pull/481) Add new `\Stripe\Discount` and `\Stripe\OrderItem` classes, add more PHPDoc describing object attributes
 
 ## 6.7.4 - 2018-05-29
-* [#480](https://github.com/stripe/stripe-php/pull/480) PHPDoc changes for API version 2018-05-21 and the addition of the new `CHARGE_EXPIRED` event type
+
+-   [#480](https://github.com/stripe/stripe-php/pull/480) PHPDoc changes for API version 2018-05-21 and the addition of the new `CHARGE_EXPIRED` event type
 
 ## 6.7.3 - 2018-05-28
-* [#479](https://github.com/stripe/stripe-php/pull/479) Fix unnecessary traits on `\Stripe\InvoiceLineItem`
+
+-   [#479](https://github.com/stripe/stripe-php/pull/479) Fix unnecessary traits on `\Stripe\InvoiceLineItem`
 
 ## 6.7.2 - 2018-05-28
-* [#471](https://github.com/stripe/stripe-php/pull/471) Add `OBJECT_NAME` constant to all API resource classes, add `\Stripe\InvoiceLineItem` class
+
+-   [#471](https://github.com/stripe/stripe-php/pull/471) Add `OBJECT_NAME` constant to all API resource classes, add `\Stripe\InvoiceLineItem` class
 
 ## 6.7.1 - 2018-05-13
-* [#468](https://github.com/stripe/stripe-php/pull/468) Update fields in PHP docs for accuracy
+
+-   [#468](https://github.com/stripe/stripe-php/pull/468) Update fields in PHP docs for accuracy
 
 ## 6.7.0 - 2018-05-09
-* [#466](https://github.com/stripe/stripe-php/pull/466) Add support for issuer fraud records
+
+-   [#466](https://github.com/stripe/stripe-php/pull/466) Add support for issuer fraud records
 
 ## 6.6.0 - 2018-04-11
-* [#460](https://github.com/stripe/stripe-php/pull/460) Add support for flexible billing primitives
+
+-   [#460](https://github.com/stripe/stripe-php/pull/460) Add support for flexible billing primitives
 
 ## 6.5.0 - 2018-04-05
-* [#461](https://github.com/stripe/stripe-php/pull/461) Don't zero keys on non-`metadata` subobjects
+
+-   [#461](https://github.com/stripe/stripe-php/pull/461) Don't zero keys on non-`metadata` subobjects
 
 ## 6.4.2 - 2018-03-17
-* [#458](https://github.com/stripe/stripe-php/pull/458) Add PHPDoc for `account` on `\Stripe\Event`
+
+-   [#458](https://github.com/stripe/stripe-php/pull/458) Add PHPDoc for `account` on `\Stripe\Event`
 
 ## 6.4.1 - 2018-03-02
-* [#455](https://github.com/stripe/stripe-php/pull/455) Fix namespaces in PHPDoc
-* [#456](https://github.com/stripe/stripe-php/pull/456) Fix namespaces for some exceptions
+
+-   [#455](https://github.com/stripe/stripe-php/pull/455) Fix namespaces in PHPDoc
+-   [#456](https://github.com/stripe/stripe-php/pull/456) Fix namespaces for some exceptions
 
 ## 6.4.0 - 2018-02-28
-* [#453](https://github.com/stripe/stripe-php/pull/453) Add constants for `reason` (`REASON_*`) and `status` (`STATUS_*`) on `\Stripe\Dispute`
+
+-   [#453](https://github.com/stripe/stripe-php/pull/453) Add constants for `reason` (`REASON_*`) and `status` (`STATUS_*`) on `\Stripe\Dispute`
 
 ## 6.3.2 - 2018-02-27
-* [#452](https://github.com/stripe/stripe-php/pull/452) Add PHPDoc for `amount_paid` and `amount_remaining` on `\Stripe\Invoice`
+
+-   [#452](https://github.com/stripe/stripe-php/pull/452) Add PHPDoc for `amount_paid` and `amount_remaining` on `\Stripe\Invoice`
 
 ## 6.3.1 - 2018-02-26
-* [#443](https://github.com/stripe/stripe-php/pull/443) Add event types as constants to `\Stripe\Event` class
+
+-   [#443](https://github.com/stripe/stripe-php/pull/443) Add event types as constants to `\Stripe\Event` class
 
 ## 6.3.0 - 2018-02-23
-* [#450](https://github.com/stripe/stripe-php/pull/450) Add support for `code` attribute on all Stripe exceptions
+
+-   [#450](https://github.com/stripe/stripe-php/pull/450) Add support for `code` attribute on all Stripe exceptions
 
 ## 6.2.0 - 2018-02-21
-* [#440](https://github.com/stripe/stripe-php/pull/440) Add support for topups
-* [#442](https://github.com/stripe/stripe-php/pull/442) Fix PHPDoc for `\Stripe\Error\SignatureVerification`
+
+-   [#440](https://github.com/stripe/stripe-php/pull/440) Add support for topups
+-   [#442](https://github.com/stripe/stripe-php/pull/442) Fix PHPDoc for `\Stripe\Error\SignatureVerification`
 
 ## 6.1.0 - 2018-02-12
-* [#435](https://github.com/stripe/stripe-php/pull/435) Fix header persistence on `Collection` objects
-* [#436](https://github.com/stripe/stripe-php/pull/436) Introduce new `Idempotency` error class
+
+-   [#435](https://github.com/stripe/stripe-php/pull/435) Fix header persistence on `Collection` objects
+-   [#436](https://github.com/stripe/stripe-php/pull/436) Introduce new `Idempotency` error class
 
 ## 6.0.0 - 2018-02-07
+
 Major version release. List of backwards incompatible changes to watch out for:
-+ The minimum PHP version is now 5.4.0. If you're using PHP 5.3 or older, consider upgrading to a more recent version.
-* `\Stripe\AttachedObject` no longer exists. Attributes that used to be instances of `\Stripe\AttachedObject` (such as `metadata`) are now instances of `\Stripe\StripeObject`.
-+ Attributes that used to be PHP arrays (such as `legal_entity->additional_owners` on `\Stripe\Account` instances) are now instances of `\Stripe\StripeObject`, except when they are empty. `\Stripe\StripeObject` has array semantics so this should not be an issue unless you are actively checking types.
-* `\Stripe\Collection` now derives from `\Stripe\StripeObject` rather than from `\Stripe\ApiResource`.
+
+-   The minimum PHP version is now 5.4.0. If you're using PHP 5.3 or older, consider upgrading to a more recent version.
+
+*   `\Stripe\AttachedObject` no longer exists. Attributes that used to be instances of `\Stripe\AttachedObject` (such as `metadata`) are now instances of `\Stripe\StripeObject`.
+
+-   Attributes that used to be PHP arrays (such as `legal_entity->additional_owners` on `\Stripe\Account` instances) are now instances of `\Stripe\StripeObject`, except when they are empty. `\Stripe\StripeObject` has array semantics so this should not be an issue unless you are actively checking types.
+
+*   `\Stripe\Collection` now derives from `\Stripe\StripeObject` rather than from `\Stripe\ApiResource`.
 
 Pull requests included in this release:
-* [#410](https://github.com/stripe/stripe-php/pull/410) Drop support for PHP 5.3
-* [#411](https://github.com/stripe/stripe-php/pull/411) Use traits for common API operations
-* [#414](https://github.com/stripe/stripe-php/pull/414) Use short array syntax
-* [#404](https://github.com/stripe/stripe-php/pull/404) Fix serialization logic
-* [#417](https://github.com/stripe/stripe-php/pull/417) Remove `ExternalAccount` class
-* [#418](https://github.com/stripe/stripe-php/pull/418) Increase test coverage
-* [#421](https://github.com/stripe/stripe-php/pull/421) Update CA bundle and add script for future updates
-* [#422](https://github.com/stripe/stripe-php/pull/422) Use vendored CA bundle for all requests
-* [#428](https://github.com/stripe/stripe-php/pull/428) Support for automatic request retries
+
+-   [#410](https://github.com/stripe/stripe-php/pull/410) Drop support for PHP 5.3
+-   [#411](https://github.com/stripe/stripe-php/pull/411) Use traits for common API operations
+-   [#414](https://github.com/stripe/stripe-php/pull/414) Use short array syntax
+-   [#404](https://github.com/stripe/stripe-php/pull/404) Fix serialization logic
+-   [#417](https://github.com/stripe/stripe-php/pull/417) Remove `ExternalAccount` class
+-   [#418](https://github.com/stripe/stripe-php/pull/418) Increase test coverage
+-   [#421](https://github.com/stripe/stripe-php/pull/421) Update CA bundle and add script for future updates
+-   [#422](https://github.com/stripe/stripe-php/pull/422) Use vendored CA bundle for all requests
+-   [#428](https://github.com/stripe/stripe-php/pull/428) Support for automatic request retries
 
 ## 5.9.2 - 2018-02-07
-* [#431](https://github.com/stripe/stripe-php/pull/431) Update PHPDoc @property tags for latest API version
+
+-   [#431](https://github.com/stripe/stripe-php/pull/431) Update PHPDoc @property tags for latest API version
 
 ## 5.9.1 - 2018-02-06
-* [#427](https://github.com/stripe/stripe-php/pull/427) Add and update PHPDoc @property tags on all API resources
+
+-   [#427](https://github.com/stripe/stripe-php/pull/427) Add and update PHPDoc @property tags on all API resources
 
 ## 5.9.0 - 2018-01-17
-* [#421](https://github.com/stripe/stripe-php/pull/421) Updated bundled CA certificates
-* [#423](https://github.com/stripe/stripe-php/pull/423) Escape unsanitized input in OAuth example
+
+-   [#421](https://github.com/stripe/stripe-php/pull/421) Updated bundled CA certificates
+-   [#423](https://github.com/stripe/stripe-php/pull/423) Escape unsanitized input in OAuth example
 
 ## 5.8.0 - 2017-12-20
-* [#403](https://github.com/stripe/stripe-php/pull/403) Add `__debugInfo()` magic method to `StripeObject`
+
+-   [#403](https://github.com/stripe/stripe-php/pull/403) Add `__debugInfo()` magic method to `StripeObject`
 
 ## 5.7.0 - 2017-11-28
-* [#390](https://github.com/stripe/stripe-php/pull/390) Remove some unsupported API methods
-* [#391](https://github.com/stripe/stripe-php/pull/391) Alphabetize the list of API resources in `Util::convertToStripeObject()` and add missing resources
-* [#393](https://github.com/stripe/stripe-php/pull/393) Fix expiry date update for card sources
+
+-   [#390](https://github.com/stripe/stripe-php/pull/390) Remove some unsupported API methods
+-   [#391](https://github.com/stripe/stripe-php/pull/391) Alphabetize the list of API resources in `Util::convertToStripeObject()` and add missing resources
+-   [#393](https://github.com/stripe/stripe-php/pull/393) Fix expiry date update for card sources
 
 ## 5.6.0 - 2017-10-31
-* [#386](https://github.com/stripe/stripe-php/pull/386) Support for exchange rates APIs
+
+-   [#386](https://github.com/stripe/stripe-php/pull/386) Support for exchange rates APIs
 
 ## 5.5.1 - 2017-10-30
-* [#387](https://github.com/stripe/stripe-php/pull/387) Allow `personal_address_kana` and `personal_address_kanji` to be updated on an account
+
+-   [#387](https://github.com/stripe/stripe-php/pull/387) Allow `personal_address_kana` and `personal_address_kanji` to be updated on an account
 
 ## 5.5.0 - 2017-10-27
-* [#385](https://github.com/stripe/stripe-php/pull/385) Support for listing source transactions
+
+-   [#385](https://github.com/stripe/stripe-php/pull/385) Support for listing source transactions
 
 ## 5.4.0 - 2017-10-24
-* [#383](https://github.com/stripe/stripe-php/pull/383) Add static methods to manipulate resources from parent
-    * `Account` gains methods for external accounts and login links (e.g. `createExternalAccount`, `createLoginLink`)
-    * `ApplicationFee` gains methods for refunds
-    * `Customer` gains methods for sources
-    * `Transfer` gains methods for reversals
+
+-   [#383](https://github.com/stripe/stripe-php/pull/383) Add static methods to manipulate resources from parent
+    -   `Account` gains methods for external accounts and login links (e.g. `createExternalAccount`, `createLoginLink`)
+    -   `ApplicationFee` gains methods for refunds
+    -   `Customer` gains methods for sources
+    -   `Transfer` gains methods for reversals
 
 ## 5.3.0 - 2017-10-11
-* [#378](https://github.com/stripe/stripe-php/pull/378) Rename source `delete` to `detach` (and deprecate the former)
+
+-   [#378](https://github.com/stripe/stripe-php/pull/378) Rename source `delete` to `detach` (and deprecate the former)
 
 ## 5.2.3 - 2017-09-27
-* Add PHPDoc for `Card`
+
+-   Add PHPDoc for `Card`
 
 ## 5.2.2 - 2017-09-20
-* Fix deserialization mapping of `FileUpload` objects
+
+-   Fix deserialization mapping of `FileUpload` objects
 
 ## 5.2.1 - 2017-09-14
-* Serialized `shipping` nested attribute
+
+-   Serialized `shipping` nested attribute
 
 ## 5.2.0 - 2017-08-29
-* Add support for `InvalidClient` OAuth error
+
+-   Add support for `InvalidClient` OAuth error
 
 ## 5.1.3 - 2017-08-14
-* Allow `address_kana` and `address_kanji` to be updated for custom accounts
+
+-   Allow `address_kana` and `address_kanji` to be updated for custom accounts
 
 ## 5.1.2 - 2017-08-01
-* Fix documented return type of `autoPagingIterator()` (was missing namespace)
+
+-   Fix documented return type of `autoPagingIterator()` (was missing namespace)
 
 ## 5.1.1 - 2017-07-03
-* Fix order returns to use the right URL `/v1/order_returns`
+
+-   Fix order returns to use the right URL `/v1/order_returns`
 
 ## 5.1.0 - 2017-06-30
-* Add support for OAuth
+
+-   Add support for OAuth
 
 ## 5.0.0 - 2017-06-27
-* `pay` on invoice now takes params as well as opts
+
+-   `pay` on invoice now takes params as well as opts
 
 ## 4.13.0 - 2017-06-19
-* Add support for ephemeral keys
+
+-   Add support for ephemeral keys
 
 ## 4.12.0 - 2017-06-05
-* Clients can implement `getUserAgentInfo()` to add additional user agent information
+
+-   Clients can implement `getUserAgentInfo()` to add additional user agent information
 
 ## 4.11.0 - 2017-06-05
-* Implement `Countable` for `AttachedObject` (`metadata` and `additional_owners`)
+
+-   Implement `Countable` for `AttachedObject` (`metadata` and `additional_owners`)
 
 ## 4.10.0 - 2017-05-25
-* Add support for login links
+
+-   Add support for login links
 
 ## 4.9.1 - 2017-05-10
-* Fix docs to include arrays on `$id` parameter for retrieve methods
+
+-   Fix docs to include arrays on `$id` parameter for retrieve methods
 
 ## 4.9.0 - 2017-04-28
-* Support for checking webhook signatures
+
+-   Support for checking webhook signatures
 
 ## 4.8.1 - 2017-04-24
-* Allow nested field `payout_schedule` to be updated
+
+-   Allow nested field `payout_schedule` to be updated
 
 ## 4.8.0 - 2017-04-20
-* Add `\Stripe\Stripe::setLogger()` to support an external PSR-3 compatible logger
+
+-   Add `\Stripe\Stripe::setLogger()` to support an external PSR-3 compatible logger
 
 ## 4.7.0 - 2017-04-10
-* Add support for payouts and recipient transfers
+
+-   Add support for payouts and recipient transfers
 
 ## 4.6.0 - 2017-04-06
-* Please see 4.7.0 instead (no-op release)
+
+-   Please see 4.7.0 instead (no-op release)
 
 ## 4.5.1 - 2017-03-22
-* Remove hard dependency on cURL
+
+-   Remove hard dependency on cURL
 
 ## 4.5.0 - 2017-03-20
-* Support for detaching sources from customers
+
+-   Support for detaching sources from customers
 
 ## 4.4.2 - 2017-02-27
-* Correct handling of `owner` parameter when updating sources
+
+-   Correct handling of `owner` parameter when updating sources
 
 ## 4.4.1 - 2017-02-24
-* Correct the error check on a bad JSON decoding
+
+-   Correct the error check on a bad JSON decoding
 
 ## 4.4.0 - 2017-01-18
-* Add support for updating sources
+
+-   Add support for updating sources
 
 ## 4.3.0 - 2016-11-30
-* Add support for verifying sources
+
+-   Add support for verifying sources
 
 ## 4.2.0 - 2016-11-21
-* Add retrieve method for 3-D Secure resources
+
+-   Add retrieve method for 3-D Secure resources
 
 ## 4.1.1 - 2016-10-21
-* Add docblock with model properties for `Plan`
+
+-   Add docblock with model properties for `Plan`
 
 ## 4.1.0 - 2016-10-18
-* Support for 403 status codes (permission denied)
+
+-   Support for 403 status codes (permission denied)
 
 ## 4.0.1 - 2016-10-17
-* Fix transfer reversal materialization
-* Fixes for some property definitions in docblocks
+
+-   Fix transfer reversal materialization
+-   Fixes for some property definitions in docblocks
 
 ## 4.0.0 - 2016-09-28
-* Support for subscription items
-* Drop attempt to force TLS 1.2: please note that this could be breaking if you're using old OS distributions or packages and upgraded recently (so please make sure to test your integration!)
+
+-   Support for subscription items
+-   Drop attempt to force TLS 1.2: please note that this could be breaking if you're using old OS distributions or packages and upgraded recently (so please make sure to test your integration!)
 
 ## 3.23.0 - 2016-09-15
-* Add support for Apple Pay domains
+
+-   Add support for Apple Pay domains
 
 ## 3.22.0 - 2016-09-13
-* Add `Stripe::setAppInfo` to allow plugins to register user agent information
+
+-   Add `Stripe::setAppInfo` to allow plugins to register user agent information
 
 ## 3.21.0 - 2016-08-25
-* Add `Source` model for generic payment sources
+
+-   Add `Source` model for generic payment sources
 
 ## 3.20.0 - 2016-08-08
-* Add `getDeclineCode` to card errors
+
+-   Add `getDeclineCode` to card errors
 
 ## 3.19.0 - 2016-07-29
-* Opt requests directly into TLS 1.2 where OpenSSL >= 1.0.1 (see #277 for context)
+
+-   Opt requests directly into TLS 1.2 where OpenSSL >= 1.0.1 (see #277 for context)
 
 ## 3.18.0 - 2016-07-28
-* Add new `STATUS_` constants for subscriptions
+
+-   Add new `STATUS_` constants for subscriptions
 
 ## 3.17.1 - 2016-07-28
-* Fix auto-paging iterator so that it plays nicely with `iterator_to_array`
+
+-   Fix auto-paging iterator so that it plays nicely with `iterator_to_array`
 
 ## 3.17.0 - 2016-07-14
-* Add field annotations to model classes for better editor hinting
+
+-   Add field annotations to model classes for better editor hinting
 
 ## 3.16.0 - 2016-07-12
-* Add `ThreeDSecure` model for 3-D secure payments
+
+-   Add `ThreeDSecure` model for 3-D secure payments
 
 ## 3.15.0 - 2016-06-29
-* Add static `update` method to all resources that can be changed.
+
+-   Add static `update` method to all resources that can be changed.
 
 ## 3.14.3 - 2016-06-20
-* Make sure that cURL never sends `Expects: 100-continue`, even on large request bodies
+
+-   Make sure that cURL never sends `Expects: 100-continue`, even on large request bodies
 
 ## 3.14.2 - 2016-06-03
-* Add `inventory` under `SKU` to list of keys that have nested data and can be updated
+
+-   Add `inventory` under `SKU` to list of keys that have nested data and can be updated
 
 ## 3.14.1 - 2016-05-27
-* Fix some inconsistencies in PHPDoc
+
+-   Fix some inconsistencies in PHPDoc
 
 ## 3.14.0 - 2016-05-25
-* Add support for returning Relay orders
+
+-   Add support for returning Relay orders
 
 ## 3.13.0 - 2016-05-04
-* Add `list`, `create`, `update`, `retrieve`, and `delete` methods to the Subscription class
+
+-   Add `list`, `create`, `update`, `retrieve`, and `delete` methods to the Subscription class
 
 ## 3.12.1 - 2016-04-07
-* Additional check on value arrays for some extra safety
+
+-   Additional check on value arrays for some extra safety
 
 ## 3.12.0 - 2016-03-31
-* Fix bug `refreshFrom` on `StripeObject` would not take an `$opts` array
-* Fix bug where `$opts` not passed to parent `save` method in `Account`
-* Fix bug where non-existent variable was referenced in `reverse` in `Transfer`
-* Update CA cert bundle for compatibility with OpenSSL versions below 1.0.1
+
+-   Fix bug `refreshFrom` on `StripeObject` would not take an `$opts` array
+-   Fix bug where `$opts` not passed to parent `save` method in `Account`
+-   Fix bug where non-existent variable was referenced in `reverse` in `Transfer`
+-   Update CA cert bundle for compatibility with OpenSSL versions below 1.0.1
 
 ## 3.11.0 - 2016-03-22
-* Allow `CurlClient` to be initialized with default `CURLOPT_*` options
+
+-   Allow `CurlClient` to be initialized with default `CURLOPT_*` options
 
 ## 3.10.1 - 2016-03-22
-* Fix bug where request params and options were ignored in `ApplicationFee`'s `refund.`
+
+-   Fix bug where request params and options were ignored in `ApplicationFee`'s `refund.`
 
 ## 3.10.0 - 2016-03-15
-* Add `reject` on `Account` to support the new API feature
+
+-   Add `reject` on `Account` to support the new API feature
 
 ## 3.9.2 - 2016-03-04
-* Fix error when an object's metadata is set more than once
+
+-   Fix error when an object's metadata is set more than once
 
 ## 3.9.1 - 2016-02-24
-* Fix encoding behavior of nested arrays for requests (see #227)
+
+-   Fix encoding behavior of nested arrays for requests (see #227)
 
 ## 3.9.0 - 2016-02-09
-* Add automatic pagination mechanism with `autoPagingIterator()`
-* Allow global account ID to be set with `Stripe::setAccountId()`
+
+-   Add automatic pagination mechanism with `autoPagingIterator()`
+-   Allow global account ID to be set with `Stripe::setAccountId()`
 
 ## 3.8.0 - 2016-02-08
-* Add `CountrySpec` model for looking up country payment information
+
+-   Add `CountrySpec` model for looking up country payment information
 
 ## 3.7.1 - 2016-02-01
-* Update bundled CA certs
+
+-   Update bundled CA certs
 
 ## 3.7.0 - 2016-01-27
-* Support deleting Relay products and SKUs
+
+-   Support deleting Relay products and SKUs
 
 ## 3.6.0 - 2016-01-05
-* Allow configuration of HTTP client timeouts
+
+-   Allow configuration of HTTP client timeouts
 
 ## 3.5.0 - 2015-12-01
-* Add a verification routine for external accounts
+
+-   Add a verification routine for external accounts
 
 ## 3.4.0 - 2015-09-14
-* Products, SKUs, and Orders -- https://stripe.com/relay
+
+-   Products, SKUs, and Orders -- https://stripe.com/relay
 
 ## 3.3.0 - 2015-09-11
-* Add support for 429 Rate Limit response
+
+-   Add support for 429 Rate Limit response
 
 ## 3.2.0 - 2015-08-17
-* Add refund listing and retrieval without an associated charge
+
+-   Add refund listing and retrieval without an associated charge
 
 ## 3.1.0 - 2015-08-03
-* Add dispute listing and retrieval
-* Add support for manage account deletion
+
+-   Add dispute listing and retrieval
+-   Add support for manage account deletion
 
 ## 3.0.0 - 2015-07-28
-* Rename `\Stripe\Object` to `\Stripe\StripeObject` (PHP 7 compatibility)
-* Rename `getCode` and `getParam` in exceptions to `getStripeCode` and `getStripeParam`
-* Add support for calling `json_encode` on Stripe objects in PHP 5.4+
-* Start supporting/testing PHP 7
+
+-   Rename `\Stripe\Object` to `\Stripe\StripeObject` (PHP 7 compatibility)
+-   Rename `getCode` and `getParam` in exceptions to `getStripeCode` and `getStripeParam`
+-   Add support for calling `json_encode` on Stripe objects in PHP 5.4+
+-   Start supporting/testing PHP 7
 
 ## 2.3.0 - 2015-07-06
-* Add request ID to all Stripe exceptions
+
+-   Add request ID to all Stripe exceptions
 
 ## 2.2.0 - 2015-06-01
-* Add support for Alipay accounts as sources
-* Add support for bank accounts as sources (private beta)
-* Add support for bank accounts and cards as external_accounts on Account objects
+
+-   Add support for Alipay accounts as sources
+-   Add support for bank accounts as sources (private beta)
+-   Add support for bank accounts and cards as external_accounts on Account objects
 
 ## 2.1.4 - 2015-05-13
-* Fix CA certificate file path (thanks @lphilps & @matthewarkin)
+
+-   Fix CA certificate file path (thanks @lphilps & @matthewarkin)
 
 ## 2.1.3 - 2015-05-12
-* Fix to account updating to permit `tos_acceptance` and `personal_address` to be set properly
-* Fix to Transfer reversal creation (thanks @neatness!)
-* Network requests are now done through a swappable class for easier mocking
+
+-   Fix to account updating to permit `tos_acceptance` and `personal_address` to be set properly
+-   Fix to Transfer reversal creation (thanks @neatness!)
+-   Network requests are now done through a swappable class for easier mocking
 
 ## 2.1.2 - 2015-04-10
-* Remove SSL cert revokation checking (all pre-Heartbleed certs have expired)
-* Bug fixes to account updating
+
+-   Remove SSL cert revokation checking (all pre-Heartbleed certs have expired)
+-   Bug fixes to account updating
 
 ## 2.1.1 - 2015-02-27
-* Support transfer reversals
+
+-   Support transfer reversals
 
 ## 2.1.0 - 2015-02-19
-* Support new API version (2015-02-18)
-* Added Bitcoin Receiever update and delete actions
-* Edited tests to prefer "source" over "card" as per new API version
+
+-   Support new API version (2015-02-18)
+-   Added Bitcoin Receiever update and delete actions
+-   Edited tests to prefer "source" over "card" as per new API version
 
 ## 2.0.1 - 2015-02-16
-* Fix to fetching endpoints that use a non-default baseUrl (`FileUpload`)
+
+-   Fix to fetching endpoints that use a non-default baseUrl (`FileUpload`)
 
 ## 2.0.0 - 2015-02-14
-* Bumped minimum version to 5.3.3
-* Switched to Stripe namespace instead of Stripe_ class name prefiexes (thanks @chadicus!)
-* Switched tests to PHPUnit (thanks @chadicus!)
-* Switched style guide to PSR2 (thanks @chadicus!)
-* Added $opts hash to the end of most methods: this permits passing 'idempotency_key', 'stripe_account', or 'stripe_version'. The last 2 will persist across multiple object loads.
-* Added support for retrieving Account by ID
+
+-   Bumped minimum version to 5.3.3
+-   Switched to Stripe namespace instead of Stripe\_ class name prefiexes (thanks @chadicus!)
+-   Switched tests to PHPUnit (thanks @chadicus!)
+-   Switched style guide to PSR2 (thanks @chadicus!)
+-   Added \$opts hash to the end of most methods: this permits passing 'idempotency_key', 'stripe_account', or 'stripe_version'. The last 2 will persist across multiple object loads.
+-   Added support for retrieving Account by ID
 
 ## 1.18.0 - 2015-01-21
-* Support making bitcoin charges through BitcoinReceiver source object
+
+-   Support making bitcoin charges through BitcoinReceiver source object
 
 ## 1.17.5 - 2014-12-23
-* Adding support for creating file uploads.
+
+-   Adding support for creating file uploads.
 
 ## 1.17.4 - 2014-12-15
-* Saving objects fetched with a custom key now works (thanks @JustinHook & @jpasilan)
-* Added methods for reporting charges as safe or fraudulent and for specifying the reason for refunds
+
+-   Saving objects fetched with a custom key now works (thanks @JustinHook & @jpasilan)
+-   Added methods for reporting charges as safe or fraudulent and for specifying the reason for refunds
 
 ## 1.17.3 - 2014-11-06
-* Better handling of HHVM support for SSL certificate blacklist checking.
+
+-   Better handling of HHVM support for SSL certificate blacklist checking.
 
 ## 1.17.2 - 2014-09-23
-* Coupons now are backed by a `Stripe_Coupon` instead of `Stripe_Object`, and support updating metadata
-* Running operations (`create`, `retrieve`, `all`) on upcoming invoice items now works
+
+-   Coupons now are backed by a `Stripe_Coupon` instead of `Stripe_Object`, and support updating metadata
+-   Running operations (`create`, `retrieve`, `all`) on upcoming invoice items now works
 
 ## 1.17.1 - 2014-07-31
-* Requests now send Content-Type header
+
+-   Requests now send Content-Type header
 
 ## 1.17.0 - 2014-07-29
-* Application Fee refunds now a list instead of array
-* HHVM now works
-* Small bug fixes (thanks @bencromwell & @fastest963)
-* `__toString` now returns the name of the object in addition to its JSON representation
+
+-   Application Fee refunds now a list instead of array
+-   HHVM now works
+-   Small bug fixes (thanks @bencromwell & @fastest963)
+-   `__toString` now returns the name of the object in addition to its JSON representation
 
 ## 1.16.0 - 2014-06-17
-* Add metadata for refunds and disputes
+
+-   Add metadata for refunds and disputes
 
 ## 1.15.0 - 2014-05-28
-* Support canceling transfers
+
+-   Support canceling transfers
 
 ## 1.14.1 - 2014-05-21
-* Support cards for recipients.
+
+-   Support cards for recipients.
 
 ## 1.13.1 - 2014-05-15
-* Fix bug in account resource where `id` wasn't in the result
+
+-   Fix bug in account resource where `id` wasn't in the result
 
 ## 1.13.0 - 2014-04-10
-* Add support for certificate blacklisting
-* Update ca bundle
-* Drop support for HHVM (Temporarily)
+
+-   Add support for certificate blacklisting
+-   Update ca bundle
+-   Drop support for HHVM (Temporarily)
 
 ## 1.12.0 - 2014-04-01
-* Add Stripe_RateLimitError for catching rate limit errors.
-* Update to Zend coding style (thanks,  @jpiasetz)
+
+-   Add Stripe_RateLimitError for catching rate limit errors.
+-   Update to Zend coding style (thanks, @jpiasetz)
 
 ## 1.11.0 - 2014-01-29
-* Add support for multiple subscriptions per customer
+
+-   Add support for multiple subscriptions per customer
 
 ## 1.10.1 - 2013-12-02
-* Add new ApplicationFee
+
+-   Add new ApplicationFee
 
 ## 1.9.1 - 2013-11-08
-* Fix a bug where a null nestable object causes warnings to fire.
+
+-   Fix a bug where a null nestable object causes warnings to fire.
 
 ## 1.9.0 - 2013-10-16
-* Add support for metadata API.
+
+-   Add support for metadata API.
 
 ## 1.8.4 - 2013-09-18
-* Add support for closing disputes.
+
+-   Add support for closing disputes.
 
 ## 1.8.3 - 2013-08-13
-* Add new Balance and BalanceTransaction
+
+-   Add new Balance and BalanceTransaction
 
 ## 1.8.2 - 2013-08-12
-* Add support for unsetting attributes by updating to NULL. Setting properties to a blank string is now an error.
+
+-   Add support for unsetting attributes by updating to NULL. Setting properties to a blank string is now an error.
 
 ## 1.8.1 - 2013-07-12
-* Add support for multiple cards API (Stripe API version 2013-07-12: https://stripe.com/docs/upgrades#2013-07-05)
+
+-   Add support for multiple cards API (Stripe API version 2013-07-12: https://stripe.com/docs/upgrades#2013-07-05)
 
 ## 1.8.0 - 2013-04-11
-* Allow Transfers to be creatable
-* Add new Recipient resource
+
+-   Allow Transfers to be creatable
+-   Add new Recipient resource
 
 ## 1.7.15 - 2013-02-21
-* Add 'id' to the list of permanent object attributes
+
+-   Add 'id' to the list of permanent object attributes
 
 ## 1.7.14 - 2013-02-20
 
-* Don't re-encode strings that are already encoded in UTF-8. If you were previously using plan or coupon objects with UTF-8 IDs, they may have been treated as ISO-8859-1 (Latin-1) and encoded to UTF-8 a 2nd time. You may now need to pass the IDs to utf8_encode before passing them to Stripe_Plan::retrieve or Stripe_Coupon::retrieve.
-* Ensure that all input is encoded in UTF-8 before submitting it to Stripe's servers. (github issue #27)
+-   Don't re-encode strings that are already encoded in UTF-8. If you were previously using plan or coupon objects with UTF-8 IDs, they may have been treated as ISO-8859-1 (Latin-1) and encoded to UTF-8 a 2nd time. You may now need to pass the IDs to utf8_encode before passing them to Stripe_Plan::retrieve or Stripe_Coupon::retrieve.
+-   Ensure that all input is encoded in UTF-8 before submitting it to Stripe's servers. (github issue #27)
 
 ## 1.7.13 - 2013-02-01
-* Add support for passing options when retrieving Stripe objects e.g., Stripe_Charge::retrieve(array("id"=>"foo", "expand" => array("customer"))); Stripe_Charge::retrieve("foo") will continue to work
+
+-   Add support for passing options when retrieving Stripe objects e.g., Stripe_Charge::retrieve(array("id"=>"foo", "expand" => array("customer"))); Stripe_Charge::retrieve("foo") will continue to work
 
 ## 1.7.12 - 2013-01-15
-* Add support for setting a Stripe API version override
+
+-   Add support for setting a Stripe API version override
 
 ## 1.7.11 - 2012-12-30
-* Version bump to cleanup constants and such (fix issue #26)
+
+-   Version bump to cleanup constants and such (fix issue #26)
 
 ## 1.7.10 - 2012-11-08
-* Add support for updating charge disputes.
-* Fix bug preventing retrieval of null attributes
+
+-   Add support for updating charge disputes.
+-   Fix bug preventing retrieval of null attributes
 
 ## 1.7.9 - 2012-11-08
-* Fix usage under autoloaders such as the one generated by composer (fix issue #22)
+
+-   Fix usage under autoloaders such as the one generated by composer (fix issue #22)
 
 ## 1.7.8 - 2012-10-30
-* Add support for creating invoices.
-* Add support for new invoice lines return format
-* Add support for new list objects
+
+-   Add support for creating invoices.
+-   Add support for new invoice lines return format
+-   Add support for new list objects
 
 ## 1.7.7 - 2012-09-14
-* Get all of the various version numbers in the repo in sync (no other changes)
+
+-   Get all of the various version numbers in the repo in sync (no other changes)
 
 ## 1.7.6 - 2012-08-31
-* Add update and pay methods to Invoice resource
+
+-   Add update and pay methods to Invoice resource
 
 ## 1.7.5 - 2012-08-23
-* Change internal function names so that Stripe_SingletonApiRequest is E_STRICT-clean (github issue #16)
+
+-   Change internal function names so that Stripe_SingletonApiRequest is E_STRICT-clean (github issue #16)
 
 ## 1.7.4 - 2012-08-21
-* Bugfix so that Stripe objects (e.g. Customer, Charge objects) used in API calls are transparently converted to their object IDs
+
+-   Bugfix so that Stripe objects (e.g. Customer, Charge objects) used in API calls are transparently converted to their object IDs
 
 ## 1.7.3 - 2012-08-15
-* Add new Account resource
+
+-   Add new Account resource
 
 ## 1.7.2 - 2012-06-26
-* Make clearer that you should be including lib/Stripe.php, not test/Stripe.php (github issue #14)
+
+-   Make clearer that you should be including lib/Stripe.php, not test/Stripe.php (github issue #14)
 
 ## 1.7.1 - 2012-05-24
-* Add missing argument to Stripe_InvalidRequestError constructor in Stripe_ApiResource::instanceUrl. Fixes a warning when Stripe_ApiResource::instanceUrl is called on a resource with no ID (fix issue #12)
+
+-   Add missing argument to Stripe_InvalidRequestError constructor in Stripe_ApiResource::instanceUrl. Fixes a warning when Stripe_ApiResource::instanceUrl is called on a resource with no ID (fix issue #12)
 
 ## 1.7.0 - 2012-05-17
-* Support Composer and Packagist (github issue #9)
-* Add new deleteDiscount method to Stripe_Customer
-* Add new Transfer resource
-* Switch from using HTTP Basic auth to Bearer auth. (Note: Stripe will support Basic auth for the indefinite future, but recommends Bearer auth when possible going forward)
-* Numerous test suite improvements
+
+-   Support Composer and Packagist (github issue #9)
+-   Add new deleteDiscount method to Stripe_Customer
+-   Add new Transfer resource
+-   Switch from using HTTP Basic auth to Bearer auth. (Note: Stripe will support Basic auth for the indefinite future, but recommends Bearer auth when possible going forward)
+-   Numerous test suite improvements
diff --git a/htdocs/includes/stripe/stripe-php/CODE_OF_CONDUCT.md b/htdocs/includes/stripe/stripe-php/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000000..349f5a0bfd7
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/CODE_OF_CONDUCT.md
@@ -0,0 +1,77 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to make participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies within all project spaces, and it also applies when
+an individual is representing the project or its community in public spaces.
+Examples of representing a project or community include using an official
+project e-mail address, posting via an official social media account, or acting
+as an appointed representative at an online or offline event. Representation of
+a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at conduct@stripe.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq
+
diff --git a/htdocs/includes/stripe/stripe-php/Makefile b/htdocs/includes/stripe/stripe-php/Makefile
new file mode 100644
index 00000000000..8de55c18222
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/Makefile
@@ -0,0 +1,36 @@
+export PHPDOCUMENTOR_VERSION := v3.0.0-rc
+export PHPSTAN_VERSION := 0.12.59
+
+vendor: composer.json
+	composer install
+
+vendor/bin/phpstan: vendor
+	curl -sfL https://github.com/phpstan/phpstan/releases/download/$(PHPSTAN_VERSION)/phpstan.phar -o vendor/bin/phpstan
+	chmod +x vendor/bin/phpstan
+
+vendor/bin/phpdoc: vendor
+	curl -sfL https://github.com/phpDocumentor/phpDocumentor/releases/download/$(PHPDOCUMENTOR_VERSION)/phpDocumentor.phar -o vendor/bin/phpdoc
+	chmod +x vendor/bin/phpdoc
+
+test: vendor
+	vendor/bin/phpunit
+.PHONY: test
+
+fmt: vendor
+	vendor/bin/php-cs-fixer fix -v --using-cache=no .
+.PHONY: fmt
+
+fmtcheck: vendor
+	vendor/bin/php-cs-fixer fix -v --dry-run --using-cache=no .
+.PHONY: fmtcheck
+
+phpdoc: vendor/bin/phpdoc
+	vendor/bin/phpdoc
+
+phpstan: vendor/bin/phpstan
+	php -d memory_limit=512M vendor/bin/phpstan analyse lib tests
+.PHONY: phpstan
+
+phpstan-baseline: vendor/bin/phpstan
+	php -d memory_limit=512M vendor/bin/phpstan analyse lib tests --generate-baseline
+.PHONY: phpstan-baseline
diff --git a/htdocs/includes/stripe/stripe-php/README.md b/htdocs/includes/stripe/stripe-php/README.md
index 7d1b681c087..1be6aa1beff 100644
--- a/htdocs/includes/stripe/stripe-php/README.md
+++ b/htdocs/includes/stripe/stripe-php/README.md
@@ -14,7 +14,7 @@ API.
 
 ## Requirements
 
-PHP 5.4.0 and later.
+PHP 5.6.0 and later.
 
 ## Composer
 
@@ -42,9 +42,9 @@ require_once('/path/to/stripe-php/init.php');
 
 The bindings require the following extensions in order to work properly:
 
-- [`curl`](https://secure.php.net/manual/en/book.curl.php), although you can use your own non-cURL client if you prefer
-- [`json`](https://secure.php.net/manual/en/book.json.php)
-- [`mbstring`](https://secure.php.net/manual/en/book.mbstring.php) (Multibyte String)
+-   [`curl`](https://secure.php.net/manual/en/book.curl.php), although you can use your own non-cURL client if you prefer
+-   [`json`](https://secure.php.net/manual/en/book.json.php)
+-   [`mbstring`](https://secure.php.net/manual/en/book.mbstring.php) (Multibyte String)
 
 If you use Composer, these dependencies should be handled automatically. If you install manually, you'll want to make sure that these extensions are available.
 
@@ -53,36 +53,36 @@ If you use Composer, these dependencies should be handled automatically. If you
 Simple usage looks like:
 
 ```php
-\Stripe\Stripe::setApiKey('sk_test_BQokikJOvBiI2HlWgH4olfQ2');
-$charge = \Stripe\Charge::create(['amount' => 2000, 'currency' => 'usd', 'source' => 'tok_189fqt2eZvKYlo2CTGBeg6Uq']);
-echo $charge;
+$stripe = new \Stripe\StripeClient('sk_test_BQokikJOvBiI2HlWgH4olfQ2');
+$customer = $stripe->customers->create([
+    'description' => 'example customer',
+    'email' => 'email@example.com',
+    'payment_method' => 'pm_card_visa',
+]);
+echo $customer;
 ```
 
+### Client/service patterns vs legacy patterns
+
+You can continue to use the legacy integration patterns used prior to version [7.33.0](https://github.com/stripe/stripe-php/blob/master/CHANGELOG.md#7330---2020-05-14). Review the [migration guide](https://github.com/stripe/stripe-php/wiki/Migration-to-StripeClient-and-services-in-7.33.0) for the backwards-compatible client/services pattern changes.
+
 ## Documentation
 
 See the [PHP API docs](https://stripe.com/docs/api/php#intro).
 
 ## Legacy Version Support
 
+### PHP 5.4 & 5.5
+
+If you are using PHP 5.4 or 5.5, you can download v6.21.1 ([zip](https://github.com/stripe/stripe-php/archive/v6.21.1.zip), [tar.gz](https://github.com/stripe/stripe-php/archive/v6.21.1.tar.gz)) from our [releases page](https://github.com/stripe/stripe-php/releases). This version will continue to work with new versions of the Stripe API for all common uses.
+
 ### PHP 5.3
 
 If you are using PHP 5.3, you can download v5.9.2 ([zip](https://github.com/stripe/stripe-php/archive/v5.9.2.zip), [tar.gz](https://github.com/stripe/stripe-php/archive/v5.9.2.tar.gz)) from our [releases page](https://github.com/stripe/stripe-php/releases). This version will continue to work with new versions of the Stripe API for all common uses.
 
-### PHP 5.2
-
-If you are using PHP 5.2, you can download v1.18.0 ([zip](https://github.com/stripe/stripe-php/archive/v1.18.0.zip), [tar.gz](https://github.com/stripe/stripe-php/archive/v1.18.0.tar.gz)) from our [releases page](https://github.com/stripe/stripe-php/releases). This version will continue to work with new versions of the Stripe API for all common uses.
-
-This legacy version may be included via `require_once("/path/to/stripe-php/lib/Stripe.php");`, and used like:
-
-```php
-Stripe::setApiKey('d8e8fca2dc0f896fd7cb4cb0031ba249');
-$charge = Stripe_Charge::create(array('source' => 'tok_XXXXXXXX', 'amount' => 2000, 'currency' => 'usd'));
-echo $charge;
-```
-
 ## Custom Request Timeouts
 
-*NOTE:* We do not recommend decreasing the timeout for non-read-only calls (e.g. charge creation), since even if you locally timeout, the request on Stripe's side can still complete. If you are decreasing timeouts on these calls, make sure to use [idempotency tokens](https://stripe.com/docs/api/php#idempotent_requests) to avoid executing the same transaction twice as a result of timeout retry logic.
+_NOTE:_ We do not recommend decreasing the timeout for non-read-only calls (e.g. charge creation), since even if you locally timeout, the request on Stripe's side can still complete. If you are decreasing timeouts on these calls, make sure to use [idempotency tokens](https://stripe.com/docs/api/php#idempotent_requests) to avoid executing the same transaction twice as a result of timeout retry logic.
 
 To modify request timeouts (connect or total, in seconds) you'll need to tell the API client to use a CurlClient other than its default. You'll set the timeouts in that CurlClient.
 
@@ -129,8 +129,10 @@ end up there instead of `error_log`:
 You can access the data from the last API response on any object via `getLastResponse()`.
 
 ```php
-$charge = \Stripe\Charge::create(['amount' => 2000, 'currency' => 'usd', 'source' => 'tok_visa']);
-echo $charge->getLastResponse()->headers['Request-Id'];
+$customer = $stripe->customers->create([
+    'description' => 'example customer',
+]);
+echo $customer->getLastResponse()->headers['Request-Id'];
 ```
 
 ### SSL / TLS compatibility issues
@@ -151,12 +153,12 @@ one that uses [Stripe Connect][connect], it's also possible to set a
 per-request key and/or account:
 
 ```php
-\Stripe\Charge::all([], [
+$customers = $stripe->customers->all([],[
     'api_key' => 'sk_test_...',
     'stripe_account' => 'acct_...'
 ]);
 
-\Stripe\Charge::retrieve("ch_18atAXCdGbJFKhCuBAa4532Z", [
+$stripe->customers->retrieve('cus_123456789', [], [
     'api_key' => 'sk_test_...',
     'stripe_account' => 'acct_...'
 ]);
@@ -235,6 +237,12 @@ Update bundled CA certificates from the [Mozilla cURL release][curl]:
 ./update_certs.php
 ```
 
+The library uses [PHP CS Fixer][php-cs-fixer] for code formatting. Code must be formatted before PRs are submitted, otherwise CI will fail. Run the formatter with:
+
+```bash
+./vendor/bin/php-cs-fixer fix -v .
+```
+
 ## Attention plugin developers
 
 Are you writing a plugin that integrates Stripe and embeds our library? Then please use the `setAppInfo` function to identify your plugin. For example:
@@ -252,6 +260,7 @@ See the "SSL / TLS compatibility issues" paragraph above for full context. If yo
 [composer]: https://getcomposer.org/
 [connect]: https://stripe.com/connect
 [curl]: http://curl.haxx.se/docs/caextract.html
-[psr3]: http://www.php-fig.org/psr/psr-3/
 [idempotency-keys]: https://stripe.com/docs/api/php#idempotent_requests
+[php-cs-fixer]: https://github.com/FriendsOfPHP/PHP-CS-Fixer
+[psr3]: http://www.php-fig.org/psr/psr-3/
 [stripe-mock]: https://github.com/stripe/stripe-mock
diff --git a/htdocs/includes/stripe/stripe-php/VERSION b/htdocs/includes/stripe/stripe-php/VERSION
index eb34ef6cbc3..6a09420b3d9 100644
--- a/htdocs/includes/stripe/stripe-php/VERSION
+++ b/htdocs/includes/stripe/stripe-php/VERSION
@@ -1 +1 @@
-6.43.1
+7.67.0
diff --git a/htdocs/includes/stripe/stripe-php/build.php b/htdocs/includes/stripe/stripe-php/build.php
index 6ce0ca38d11..37360ffef92 100755
--- a/htdocs/includes/stripe/stripe-php/build.php
+++ b/htdocs/includes/stripe/stripe-php/build.php
@@ -1,36 +1,25 @@
 #!/usr/bin/env php
 <?php
-chdir(dirname(__FILE__));
+\chdir(__DIR__);
 
-$autoload = (int)$argv[1];
+$autoload = (int) $argv[1];
 $returnStatus = null;
 
 if (!$autoload) {
     // Modify composer to not autoload Stripe
-    $composer = json_decode(file_get_contents('composer.json'), true);
-    unset($composer['autoload']);
-    unset($composer['require-dev']['squizlabs/php_codesniffer']);
-    file_put_contents('composer.json', json_encode($composer, JSON_PRETTY_PRINT));
+    $composer = \json_decode(\file_get_contents('composer.json'), true);
+    unset($composer['autoload'], $composer['autoload-dev']);
+
+    \file_put_contents('composer.json', \json_encode($composer, \JSON_PRETTY_PRINT));
 }
 
-passthru('composer update', $returnStatus);
-if ($returnStatus !== 0) {
+\passthru('composer update', $returnStatus);
+if (0 !== $returnStatus) {
     exit(1);
 }
 
-if ($autoload) {
-    // Only run CS on 1 of the 2 environments
-    passthru(
-        './vendor/bin/phpcs --standard=PSR2 -n lib tests *.php',
-        $returnStatus
-    );
-    if ($returnStatus !== 0) {
-        exit(1);
-    }
-}
-
 $config = $autoload ? 'phpunit.xml' : 'phpunit.no_autoload.xml';
-passthru("./vendor/bin/phpunit -c $config", $returnStatus);
-if ($returnStatus !== 0) {
+\passthru("./vendor/bin/phpunit -c {$config}", $returnStatus);
+if (0 !== $returnStatus) {
     exit(1);
 }
diff --git a/htdocs/includes/stripe/stripe-php/composer.json b/htdocs/includes/stripe/stripe-php/composer.json
index eb92b76fb31..17bde01c373 100644
--- a/htdocs/includes/stripe/stripe-php/composer.json
+++ b/htdocs/includes/stripe/stripe-php/composer.json
@@ -15,19 +15,30 @@
     }
   ],
   "require": {
-    "php": ">=5.4.0",
+    "php": ">=5.6.0",
     "ext-curl": "*",
     "ext-json": "*",
     "ext-mbstring": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "~4.0",
-    "php-coveralls/php-coveralls": "1.*",
-    "squizlabs/php_codesniffer": "~2.0",
-    "symfony/process": "~2.8"
+    "phpunit/phpunit": "^5.7",
+    "php-coveralls/php-coveralls": "^2.1",
+    "squizlabs/php_codesniffer": "^3.3",
+    "symfony/process": "~3.4",
+    "friendsofphp/php-cs-fixer": "2.17.1"
   },
   "autoload": {
-    "psr-4": { "Stripe\\" : "lib/" }
+    "psr-4": {
+      "Stripe\\": "lib/"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Stripe\\": [
+        "tests/",
+        "tests/Stripe/"
+      ]
+    }
   },
   "extra": {
     "branch-alias": {
diff --git a/htdocs/includes/stripe/stripe-php/data/ca-certificates.crt b/htdocs/includes/stripe/stripe-php/data/ca-certificates.crt
index 39ba33683c5..65be2181db5 100644
--- a/htdocs/includes/stripe/stripe-php/data/ca-certificates.crt
+++ b/htdocs/includes/stripe/stripe-php/data/ca-certificates.crt
@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Wed Sep 20 03:12:05 2017 GMT
+## Certificate data from Mozilla as of: Wed Aug 28 03:12:10 2019 GMT
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
@@ -14,7 +14,7 @@
 ## Just configure this file as the SSLCACertificateFile.
 ##
 ## Conversion done with mk-ca-bundle.pl version 1.27.
-## SHA256: 2b2dbe5244e0047e088c597998883a913f6c5fffd1cb5c0fe5a368c8466cb2ec
+## SHA256: fffa309937c3be940649293f749b8207fabc6eb224e50e4bb3f2c5e44e0d6a6b
 ##
 
 
@@ -261,47 +261,6 @@ gn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwXQMAJKOSLakhT2+zNVVXxxvjpoixMptEm
 X36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
 -----END CERTIFICATE-----
 
-Visa eCommerce Root
-===================
------BEGIN CERTIFICATE-----
-MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQG
-EwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2Ug
-QXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNvbW1lcmNlIFJvb3QwHhcNMDIwNjI2MDIxODM2
-WhcNMjIwNjI0MDAxNjEyWjBrMQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMm
-VmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv
-bW1lcmNlIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvV95WHm6h2mCxlCfL
-F9sHP4CFT8icttD0b0/Pmdjh28JIXDqsOTPHH2qLJj0rNfVIsZHBAk4ElpF7sDPwsRROEW+1QK8b
-RaVK7362rPKgH1g/EkZgPI2h4H3PVz4zHvtH8aoVlwdVZqW1LS7YgFmypw23RuwhY/81q6UCzyr0
-TP579ZRdhE2o8mCP2w4lPJ9zcc+U30rq299yOIzzlr3xF7zSujtFWsan9sYXiwGd/BmoKoMWuDpI
-/k4+oKsGGelT84ATB+0tvz8KPFUgOSwsAGl0lUq8ILKpeeUYiZGo3BxN77t+Nwtd/jmliFKMAGzs
-GHxBvfaLdXe6YJ2E5/4tAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEG
-MB0GA1UdDgQWBBQVOIMPPyw/cDMezUb+B4wg4NfDtzANBgkqhkiG9w0BAQUFAAOCAQEAX/FBfXxc
-CLkr4NWSR/pnXKUTwwMhmytMiUbPWU3J/qVAtmPN3XEolWcRzCSs00Rsca4BIGsDoo8Ytyk6feUW
-YFN4PMCvFYP3j1IzJL1kk5fui/fbGKhtcbP3LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pz
-zkWKsKZJ/0x9nXGIxHYdkFsd7v3M9+79YKWxehZx0RbQfBI8bGmX265fOZpwLwU8GUYEmSA20GBu
-YQa7FkKMcPcw++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt
-398znM/jra6O1I7mT1GvFpLgXPYHDw==
------END CERTIFICATE-----
-
-Certum Root CA
-==============
------BEGIN CERTIFICATE-----
-MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQK
-ExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBDQTAeFw0wMjA2MTExMDQ2Mzla
-Fw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8u
-by4xEjAQBgNVBAMTCUNlcnR1bSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6x
-wS7TT3zNJc4YPk/EjG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdL
-kKWoePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GIULdtlkIJ
-89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapuOb7kky/ZR6By6/qmW6/K
-Uz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUgAKpoC6EahQGcxEZjgoi2IrHu/qpGWX7P
-NSzVttpd90gzFFS269lvzs2I1qsb2pY7HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkq
-hkiG9w0BAQUFAAOCAQEAuI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+
-GXYkHAQaTOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTgxSvg
-GrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1qCjqTE5s7FCMTY5w/
-0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5xO/fIR/RpbxXyEV6DHpx8Uq79AtoS
-qFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs6GAqm4VKQPNriiTsBhYscw==
------END CERTIFICATE-----
-
 Comodo AAA Services root
 ========================
 -----BEGIN CERTIFICATE-----
@@ -465,60 +424,6 @@ EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH
 llpwrN9M
 -----END CERTIFICATE-----
 
-Camerfirma Chambers of Commerce Root
-====================================
------BEGIN CERTIFICATE-----
-MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEnMCUGA1UEChMe
-QUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1i
-ZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAx
-NjEzNDNaFw0zNzA5MzAxNjEzNDRaMH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZp
-cm1hIFNBIENJRiBBODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3Jn
-MSIwIAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0BAQEFAAOC
-AQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtbunXF/KGIJPov7coISjlU
-xFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0dBmpAPrMMhe5cG3nCYsS4No41XQEMIwRH
-NaqbYE6gZj3LJgqcQKH0XZi/caulAGgq7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jW
-DA+wWFjbw2Y3npuRVDM30pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFV
-d9oKDMyXroDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIGA1Ud
-EwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5jaGFtYmVyc2lnbi5v
-cmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p26EpW1eLTXYGduHRooowDgYDVR0P
-AQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hh
-bWJlcnNpZ24ub3JnMCcGA1UdEgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYD
-VR0gBFEwTzBNBgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz
-aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEBAAxBl8IahsAi
-fJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZdp0AJPaxJRUXcLo0waLIJuvvD
-L8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wN
-UPf6s+xCX6ndbcj0dc97wXImsQEcXCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/n
-ADydb47kMgkdTXg0eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1
-erfutGWaIZDgqtCYvDi1czyL+Nw=
------END CERTIFICATE-----
-
-Camerfirma Global Chambersign Root
-==================================
------BEGIN CERTIFICATE-----
-MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEnMCUGA1UEChMe
-QUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1i
-ZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYx
-NDE4WhcNMzcwOTMwMTYxNDE4WjB9MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJt
-YSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEg
-MB4GA1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUAA4IBDQAw
-ggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0Mi+ITaFgCPS3CU6gSS9J
-1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/sQJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8O
-by4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpVeAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl
-6DJWk0aJqCWKZQbua795B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c
-8lCrEqWhz0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0TAQH/
-BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1iZXJzaWduLm9yZy9j
-aGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4wTcbOX60Qq+UDpfqpFDAOBgNVHQ8B
-Af8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAHMCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBj
-aGFtYmVyc2lnbi5vcmcwKgYDVR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9y
-ZzBbBgNVHSAEVDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh
-bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0BAQUFAAOCAQEA
-PDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUMbKGKfKX0j//U2K0X1S0E0T9Y
-gOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXiryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJ
-PJ7oKXqJ1/6v/2j1pReQvayZzKWGVwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4
-IBHNfTIzSJRUTN3cecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREes
-t2d/AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A==
------END CERTIFICATE-----
-
 XRamp Global CA Root
 ====================
 -----BEGIN CERTIFICATE-----
@@ -591,47 +496,6 @@ KVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3
 QBFGmh95DmK/D5fs4C8fF5Q=
 -----END CERTIFICATE-----
 
-StartCom Certification Authority
-================================
------BEGIN CERTIFICATE-----
-MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
-U3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmlu
-ZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0
-NjM2WhcNMzYwOTE3MTk0NjM2WjB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRk
-LjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMg
-U3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-ggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZkpMyONvg45iPwbm2xPN1y
-o4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rfOQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/
-Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/CJi/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/d
-eMotHweXMAEtcnn6RtYTKqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt
-2PZE4XNiHzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMMAv+Z
-6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w+2OqqGwaVLRcJXrJ
-osmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/
-untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVc
-UjyJthkqcwEKDwOzEmDyei+B26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT
-37uMdBNSSwIDAQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
-FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9jZXJ0LnN0YXJ0
-Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3JsLnN0YXJ0Y29tLm9yZy9zZnNj
-YS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFMBgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUH
-AgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRw
-Oi8vY2VydC5zdGFydGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYg
-U3RhcnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlhYmlsaXR5
-LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2YgdGhlIFN0YXJ0Q29tIENl
-cnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFpbGFibGUgYXQgaHR0cDovL2NlcnQuc3Rh
-cnRjb20ub3JnL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilT
-dGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOC
-AgEAFmyZ9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8jhvh
-3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUWFjgKXlf2Ysd6AgXm
-vB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJzewT4F+irsfMuXGRuczE6Eri8sxHk
-fY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3
-fsNrarnDy0RLrHiQi+fHLB5LEUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZ
-EoalHmdkrQYuL6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
-yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuCO3NJo2pXh5Tl
-1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6Vum0ABj6y6koQOdjQK/W/7HW/
-lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkyShNOsF/5oirpt9P/FlUQqmMGqz9IgcgA38coro
-g14=
------END CERTIFICATE-----
-
 Taiwan GRCA
 ===========
 -----BEGIN CERTIFICATE-----
@@ -770,30 +634,6 @@ RLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubS
 fZGL+T0yjWW06XyxV3bqxbYoOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
 -----END CERTIFICATE-----
 
-DST ACES CA X6
-==============
------BEGIN CERTIFICATE-----
-MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBbMQswCQYDVQQG
-EwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QxETAPBgNVBAsTCERTVCBBQ0VT
-MRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0wMzExMjAyMTE5NThaFw0xNzExMjAyMTE5NTha
-MFsxCzAJBgNVBAYTAlVTMSAwHgYDVQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UE
-CxMIRFNUIEFDRVMxFzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPuktKe1jzI
-DZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7gLFViYsx+tC3dr5BPTCa
-pCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZHfAjIgrrep4c9oW24MFbCswKBXy314pow
-GCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4aahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPy
-MjwmR/onJALJfh1biEITajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1Ud
-EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rkc3Qu
-Y29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjtodHRwOi8vd3d3LnRy
-dXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMtaW5kZXguaHRtbDAdBgNVHQ4EFgQU
-CXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZIhvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V2
-5FYrnJmQ6AgwbN99Pe7lv7UkQIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6t
-Fr8hlxCBPeP/h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq
-nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpRrscL9yuwNwXs
-vFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf29w4LTJxoeHtxMcfrHuBnQfO3
-oKfN5XozNmr6mis=
------END CERTIFICATE-----
-
 SwissSign Gold CA - G2
 ======================
 -----BEGIN CERTIFICATE-----
@@ -1036,27 +876,6 @@ FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA
 U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
 -----END CERTIFICATE-----
 
-Security Communication EV RootCA1
-=================================
------BEGIN CERTIFICATE-----
-MIIDfTCCAmWgAwIBAgIBADANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
-U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU2VjdXJpdHkgQ29tbXVuaWNh
-dGlvbiBFViBSb290Q0ExMB4XDTA3MDYwNjAyMTIzMloXDTM3MDYwNjAyMTIzMlowYDELMAkGA1UE
-BhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xKjAoBgNVBAsTIVNl
-Y3VyaXR5IENvbW11bmljYXRpb24gRVYgUm9vdENBMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALx/7FebJOD+nLpCeamIivqA4PUHKUPqjgo0No0c+qe1OXj/l3X3L+SqawSERMqm4miO
-/VVQYg+kcQ7OBzgtQoVQrTyWb4vVog7P3kmJPdZkLjjlHmy1V4qe70gOzXppFodEtZDkBp2uoQSX
-WHnvIEqCa4wiv+wfD+mEce3xDuS4GBPMVjZd0ZoeUWs5bmB2iDQL87PRsJ3KYeJkHcFGB7hj3R4z
-ZbOOCVVSPbW9/wfrrWFVGCypaZhKqkDFMxRldAD5kd6vA0jFQFTcD4SQaCDFkpbcLuUCRarAX1T4
-bepJz11sS6/vmsJWXMY1VkJqMF/Cq/biPT+zyRGPMUzXn0kCAwEAAaNCMEAwHQYDVR0OBBYEFDVK
-9U2vP9eCOKyrcWUXdYydVZPmMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqG
-SIb3DQEBBQUAA4IBAQCoh+ns+EBnXcPBZsdAS5f8hxOQWsTvoMpfi7ent/HWtWS3irO4G8za+6xm
-iEHO6Pzk2x6Ipu0nUBsCMCRGef4Eh3CXQHPRwMFXGZpppSeZq51ihPZRwSzJIxXYKLerJRO1RuGG
-Av8mjMSIkh1W/hln8lXkgKNrnKt34VFxDSDbEJrbvXZ5B3eZKK2aXtqxT0QsNY6llsf9g/BYxnnW
-mHyojf6GPgcWkuF75x3sM3Z+Qi5KhfmRiWiEA4Glm5q+4zfFVKtWOxgtQaQM+ELbmaDgcm+7XeEW
-T1MKZPlO9L9OVL14bIjqv5wTJMJwaaJ/D8g8rQjJsJhAoyrniIPtd490
------END CERTIFICATE-----
-
 OISTE WISeKey Global Root GA CA
 ===============================
 -----BEGIN CERTIFICATE-----
@@ -1177,34 +996,6 @@ sP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTEW9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmOD
 BCEIZ43ygknQW/2xzQ+DhNQ+IIX3Sj0rnP0qCglN6oH4EZw=
 -----END CERTIFICATE-----
 
-T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3
-=============================================================================================================================
------BEGIN CERTIFICATE-----
-MIIFFzCCA/+gAwIBAgIBETANBgkqhkiG9w0BAQUFADCCASsxCzAJBgNVBAYTAlRSMRgwFgYDVQQH
-DA9HZWJ6ZSAtIEtvY2FlbGkxRzBFBgNVBAoMPlTDvHJraXllIEJpbGltc2VsIHZlIFRla25vbG9q
-aWsgQXJhxZ90xLFybWEgS3VydW11IC0gVMOcQsSwVEFLMUgwRgYDVQQLDD9VbHVzYWwgRWxla3Ry
-b25payB2ZSBLcmlwdG9sb2ppIEFyYcWfdMSxcm1hIEVuc3RpdMO8c8O8IC0gVUVLQUUxIzAhBgNV
-BAsMGkthbXUgU2VydGlmaWthc3lvbiBNZXJrZXppMUowSAYDVQQDDEFUw5xCxLBUQUsgVUVLQUUg
-S8O2ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSAtIFPDvHLDvG0gMzAeFw0wNzA4
-MjQxMTM3MDdaFw0xNzA4MjExMTM3MDdaMIIBKzELMAkGA1UEBhMCVFIxGDAWBgNVBAcMD0dlYnpl
-IC0gS29jYWVsaTFHMEUGA1UECgw+VMO8cmtpeWUgQmlsaW1zZWwgdmUgVGVrbm9sb2ppayBBcmHF
-n3TEsXJtYSBLdXJ1bXUgLSBUw5xCxLBUQUsxSDBGBgNVBAsMP1VsdXNhbCBFbGVrdHJvbmlrIHZl
-IEtyaXB0b2xvamkgQXJhxZ90xLFybWEgRW5zdGl0w7xzw7wgLSBVRUtBRTEjMCEGA1UECwwaS2Ft
-dSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQVTDnELEsFRBSyBVRUtBRSBLw7ZrIFNl
-cnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIC0gU8O8csO8bSAzMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAim1L/xCIOsP2fpTo6iBkcK4hgb46ezzb8R1Sf1n68yJMlaCQvEhO
-Eav7t7WNeoMojCZG2E6VQIdhn8WebYGHV2yKO7Rm6sxA/OOqbLLLAdsyv9Lrhc+hDVXDWzhXcLh1
-xnnRFDDtG1hba+818qEhTsXOfJlfbLm4IpNQp81McGq+agV/E5wrHur+R84EpW+sky58K5+eeROR
-6Oqeyjh1jmKwlZMq5d/pXpduIF9fhHpEORlAHLpVK/swsoHvhOPc7Jg4OQOFCKlUAwUp8MmPi+oL
-hmUZEdPpCSPeaJMDyTYcIW7OjGbxmTDY17PDHfiBLqi9ggtm/oLL4eAagsNAgQIDAQABo0IwQDAd
-BgNVHQ4EFgQUvYiHyY/2pAoLquvF/pEjnatKijIwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
-MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB18+kmPNOm3JpIWmgV050vQbTlswyb2zrgxvMTfvCr4
-N5EY3ATIZJkrGG2AA1nJrvhY0D7twyOfaTyGOBye79oneNGEN3GKPEs5z35FBtYt2IpNeBLWrcLT
-y9LQQfMmNkqblWwM7uXRQydmwYj3erMgbOqwaSvHIOgMA8RBBZniP+Rr+KCGgceExh/VS4ESshYh
-LBOhgLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5noN+J1q2M
-dqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUsyZyQ2uypQjyttgI=
------END CERTIFICATE-----
-
 certSIGN ROOT CA
 ================
 -----BEGIN CERTIFICATE-----
@@ -1452,37 +1243,6 @@ y8hSyn+B/tlr0/cR7SXf+Of5pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061
 lgeLKBObjBmNQSdJQO7e5iNEOdyhIta6A/I=
 -----END CERTIFICATE-----
 
-ACEDICOM Root
-=============
------BEGIN CERTIFICATE-----
-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
------END CERTIFICATE-----
-
 Microsec e-Szigno Root CA 2009
 ==============================
 -----BEGIN CERTIFICATE-----
@@ -1843,37 +1603,6 @@ Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
 03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
 -----END CERTIFICATE-----
 
-Certinomis - Autorité Racine
-============================
------BEGIN CERTIFICATE-----
-MIIFnDCCA4SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
-Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxJjAkBgNVBAMMHUNlcnRpbm9taXMg
-LSBBdXRvcml0w6kgUmFjaW5lMB4XDTA4MDkxNzA4Mjg1OVoXDTI4MDkxNzA4Mjg1OVowYzELMAkG
-A1UEBhMCRlIxEzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMSYw
-JAYDVQQDDB1DZXJ0aW5vbWlzIC0gQXV0b3JpdMOpIFJhY2luZTCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAJ2Fn4bT46/HsmtuM+Cet0I0VZ35gb5j2CN2DpdUzZlMGvE5x4jYF1AMnmHa
-wE5V3udauHpOd4cN5bjr+p5eex7Ezyh0x5P1FMYiKAT5kcOrJ3NqDi5N8y4oH3DfVS9O7cdxbwly
-Lu3VMpfQ8Vh30WC8Tl7bmoT2R2FFK/ZQpn9qcSdIhDWerP5pqZ56XjUl+rSnSTV3lqc2W+HN3yNw
-2F1MpQiD8aYkOBOo7C+ooWfHpi2GR+6K/OybDnT0K0kCe5B1jPyZOQE51kqJ5Z52qz6WKDgmi92N
-jMD2AR5vpTESOH2VwnHu7XSu5DaiQ3XV8QCb4uTXzEIDS3h65X27uK4uIJPT5GHfceF2Z5c/tt9q
-c1pkIuVC28+BA5PY9OMQ4HL2AHCs8MF6DwV/zzRpRbWT5BnbUhYjBYkOjUjkJW+zeL9i9Qf6lSTC
-lrLooyPCXQP8w9PlfMl1I9f09bze5N/NgL+RiH2nE7Q5uiy6vdFrzPOlKO1Enn1So2+WLhl+HPNb
-xxaOu2B9d2ZHVIIAEWBsMsGoOBvrbpgT1u449fCfDu/+MYHB0iSVL1N6aaLwD4ZFjliCK0wi1F6g
-530mJ0jfJUaNSih8hp75mxpZuWW/Bd22Ql095gBIgl4g9xGC3srYn+Y3RyYe63j3YcNBZFgCQfna
-4NH4+ej9Uji29YnfAgMBAAGjWzBZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
-A1UdDgQWBBQNjLZh2kS40RR9w759XkjwzspqsDAXBgNVHSAEEDAOMAwGCiqBegFWAgIAAQEwDQYJ
-KoZIhvcNAQEFBQADggIBACQ+YAZ+He86PtvqrxyaLAEL9MW12Ukx9F1BjYkMTv9sov3/4gbIOZ/x
-WqndIlgVqIrTseYyCYIDbNc/CMf4uboAbbnW/FIyXaR/pDGUu7ZMOH8oMDX/nyNTt7buFHAAQCva
-R6s0fl6nVjBhK4tDrP22iCj1a7Y+YEq6QpA0Z43q619FVDsXrIvkxmUP7tCMXWY5zjKn2BCXwH40
-nJ+U8/aGH88bc62UeYdocMMzpXDn2NU4lG9jeeu/Cg4I58UvD0KgKxRA/yHgBcUn4YQRE7rWhh1B
-CxMjidPJC+iKunqjo3M3NYB9Ergzd0A4wPpeMNLytqOx1qKVl4GbUu1pTP+A5FPbVFsDbVRfsbjv
-JL1vnxHDx2TCDyhihWZeGnuyt++uNckZM6i4J9szVb9o4XVIRFb7zdNIu0eJOqxp9YDG5ERQL1TE
-qkPFMTFYvZbF6nVsmnWxTfj3l/+WFvKXTej28xH5On2KOG4Ey+HTRRWqpdEdnV1j6CTmNhTih60b
-WfVEm/vXd3wfAXBioSAaosUaKPQhA+4u2cGA6rnZgtZbdsLLO7XSAPCjDuGtbkD326C00EauFddE
-wk01+dIL8hf2rGbVJLJP0RyZwG71fet0BLj5TXcJ17TPBzAJ8bgAVtkXFhYKK4bfjwEZGuW7gmP/
-vgt2Fl43N+bYdJeimUV5
------END CERTIFICATE-----
-
 TWCA Root Certification Authority
 =================================
 -----BEGIN CERTIFICATE-----
@@ -2022,75 +1751,6 @@ l/9D7S3B2l0pKoU/rGXuhg8FjZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYl
 iB6XzCGcKQENZetX2fNXlrtIzYE=
 -----END CERTIFICATE-----
 
-StartCom Certification Authority
-================================
------BEGIN CERTIFICATE-----
-MIIHhzCCBW+gAwIBAgIBLTANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
-U3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmlu
-ZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0
-NjM3WhcNMzYwOTE3MTk0NjM2WjB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRk
-LjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMg
-U3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-ggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZkpMyONvg45iPwbm2xPN1y
-o4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rfOQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/
-Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/CJi/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/d
-eMotHweXMAEtcnn6RtYTKqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt
-2PZE4XNiHzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMMAv+Z
-6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w+2OqqGwaVLRcJXrJ
-osmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/
-untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVc
-UjyJthkqcwEKDwOzEmDyei+B26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT
-37uMdBNSSwIDAQABo4ICEDCCAgwwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
-VR0OBBYEFE4L7xqkQFulF2mHMMo0aEPQQa7yMB8GA1UdIwQYMBaAFE4L7xqkQFulF2mHMMo0aEPQ
-Qa7yMIIBWgYDVR0gBIIBUTCCAU0wggFJBgsrBgEEAYG1NwEBATCCATgwLgYIKwYBBQUHAgEWImh0
-dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cu
-c3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYwgc8GCCsGAQUFBwICMIHCMCcWIFN0YXJ0IENv
-bW1lcmNpYWwgKFN0YXJ0Q29tKSBMdGQuMAMCAQEagZZMaW1pdGVkIExpYWJpbGl0eSwgcmVhZCB0
-aGUgc2VjdGlvbiAqTGVnYWwgTGltaXRhdGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0aWZpY2F0
-aW9uIEF1dGhvcml0eSBQb2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuc3RhcnRzc2wuY29t
-L3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBG
-cmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQsFAAOCAgEAjo/n3JR5
-fPGFf59Jb2vKXfuM/gTFwWLRfUKKvFO3lANmMD+x5wqnUCBVJX92ehQN6wQOQOY+2IirByeDqXWm
-N3PH/UvSTa0XQMhGvjt/UfzDtgUx3M2FIk5xt/JxXrAaxrqTi3iSSoX4eA+D/i+tLPfkpLst0OcN
-Org+zvZ49q5HJMqjNTbOx8aHmNrs++myziebiMMEofYLWWivydsQD032ZGNcpRJvkrKTlMeIFw6T
-tn5ii5B/q06f/ON1FE8qMt9bDeD1e5MNq6HPh+GlBEXoPBKlCcWw0bdT82AUuoVpaiF8H3VhFyAX
-e2w7QSlc4axa0c2Mm+tgHRns9+Ww2vl5GKVFP0lDV9LdJNUso/2RjSe15esUBppMeyG7Oq0wBhjA
-2MFrLH9ZXF2RsXAiV+uKa0hK1Q8p7MZAwC+ITGgBF3f0JBlPvfrhsiAhS90a2Cl9qrjeVOwhVYBs
-HvUwyKMQ5bLmKhQxw4UtjJixhlpPiVktucf3HMiKf8CdBUrmQk9io20ppB+Fq9vlgcitKj1MXVuE
-JnHEhV5xJMqlG2zYYdMa4FTbzrqpMrUi9nNBCV24F10OD5mQ1kfabwo6YigUZ4LZ8dCAWZvLMdib
-D4x3TrVoivJs9iQOLWxwxXPR3hTQcY+203sC9uO41Alua551hDnmfyWl8kgAwKQB2j8=
------END CERTIFICATE-----
-
-StartCom Certification Authority G2
-===================================
------BEGIN CERTIFICATE-----
-MIIFYzCCA0ugAwIBAgIBOzANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
-U3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
-RzIwHhcNMTAwMTAxMDEwMDAxWhcNMzkxMjMxMjM1OTAxWjBTMQswCQYDVQQGEwJJTDEWMBQGA1UE
-ChMNU3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkgRzIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2iTZbB7cgNr2Cu+EWIAOVeq8O
-o1XJJZlKxdBWQYeQTSFgpBSHO839sj60ZwNq7eEPS8CRhXBF4EKe3ikj1AENoBB5uNsDvfOpL9HG
-4A/LnooUCri99lZi8cVytjIl2bLzvWXFDSxu1ZJvGIsAQRSCb0AgJnooD/Uefyf3lLE3PbfHkffi
-Aez9lInhzG7TNtYKGXmu1zSCZf98Qru23QumNK9LYP5/Q0kGi4xDuFby2X8hQxfqp0iVAXV16iul
-Q5XqFYSdCI0mblWbq9zSOdIxHWDirMxWRST1HFSr7obdljKF+ExP6JV2tgXdNiNnvP8V4so75qbs
-O+wmETRIjfaAKxojAuuKHDp2KntWFhxyKrOq42ClAJ8Em+JvHhRYW6Vsi1g8w7pOOlz34ZYrPu8H
-vKTlXcxNnw3h3Kq74W4a7I/htkxNeXJdFzULHdfBR9qWJODQcqhaX2YtENwvKhOuJv4KHBnM0D4L
-nMgJLvlblnpHnOl68wVQdJVznjAJ85eCXuaPOQgeWeU1FEIT/wCc976qUM/iUUjXuG+v+E5+M5iS
-FGI6dWPPe/regjupuznixL0sAA7IF6wT700ljtizkC+p2il9Ha90OrInwMEePnWjFqmveiJdnxMa
-z6eg6+OGCtP95paV1yPIN93EfKo2rJgaErHgTuixO/XWb/Ew1wIDAQABo0IwQDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUS8W0QGutHLOlHGVuRjaJhwUMDrYwDQYJ
-KoZIhvcNAQELBQADggIBAHNXPyzVlTJ+N9uWkusZXn5T50HsEbZH77Xe7XRcxfGOSeD8bpkTzZ+K
-2s06Ctg6Wgk/XzTQLwPSZh0avZyQN8gMjgdalEVGKua+etqhqaRpEpKwfTbURIfXUfEpY9Z1zRbk
-J4kd+MIySP3bmdCPX1R0zKxnNBFi2QwKN4fRoxdIjtIXHfbX/dtl6/2o1PXWT6RbdejF0mCy2wl+
-JYt7ulKSnj7oxXehPOBKc2thz4bcQ///If4jXSRK9dNtD2IEBVeC2m6kMyV5Sy5UGYvMLD0w6dEG
-/+gyRr61M3Z3qAFdlsHB1b6uJcDJHgoJIIihDsnzb02CVAAgp9KP5DlUFy6NHrgbuxu9mk47EDTc
-nIhT76IxW1hPkWLIwpqazRVdOKnWvvgTtZ8SafJQYqz7Fzf07rh1Z2AQ+4NQ+US1dZxAF7L+/Xld
-blhYXzD8AK6vM8EOTmy6p6ahfzLbOOCxchcKK5HsamMm7YnUeMx0HgX4a/6ManY5Ka5lIxKVCCIc
-l85bBu4M4ru8H0ST9tg4RQUh7eStqxK2A6RCLi3ECToDZ2mEmuFZkIoohdVddLHRDiBYmxOlsGOm
-7XtH/UVVMKTumtTm4ofvmMkyghEpIrwACjFeLQ/Ajulrso8uBtjRkcfGEvRM/TAXw8HaOFvjqerm
-obp573PYtlNXLfbQ4ddI
------END CERTIFICATE-----
-
 Buypass Class 2 Root CA
 =======================
 -----BEGIN CERTIFICATE-----
@@ -2197,31 +1857,6 @@ uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIWiAYLtqZLICjU
 dcGWxZ0=
 -----END CERTIFICATE-----
 
-TURKTRUST Certificate Services Provider Root 2007
-=================================================
------BEGIN CERTIFICATE-----
-MIIEPTCCAyWgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvzE/MD0GA1UEAww2VMOcUktUUlVTVCBF
-bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEP
-MA0GA1UEBwwGQW5rYXJhMV4wXAYDVQQKDFVUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUg
-QmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgQXJhbMSxayAyMDA3MB4X
-DTA3MTIyNTE4MzcxOVoXDTE3MTIyMjE4MzcxOVowgb8xPzA9BgNVBAMMNlTDnFJLVFJVU1QgRWxl
-a3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTELMAkGA1UEBhMCVFIxDzAN
-BgNVBAcMBkFua2FyYTFeMFwGA1UECgxVVMOcUktUUlVTVCBCaWxnaSDEsGxldGnFn2ltIHZlIEJp
-bGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkgQS7Fni4gKGMpIEFyYWzEsWsgMjAwNzCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKu3PgqMyKVYFeaK7yc9SrToJdPNM8Ig3BnuiD9N
-YvDdE3ePYakqtdTyuTFYKTsvP2qcb3N2Je40IIDu6rfwxArNK4aUyeNgsURSsloptJGXg9i3phQv
-KUmi8wUG+7RP2qFsmmaf8EMJyupyj+sA1zU511YXRxcw9L6/P8JorzZAwan0qafoEGsIiveGHtya
-KhUG9qPw9ODHFNRRf8+0222vR5YXm3dx2KdxnSQM9pQ/hTEST7ruToK4uT6PIzdezKKqdfcYbwnT
-rqdUKDT74eA7YH2gvnmJhsifLfkKS8RQouf9eRbHegsYz85M733WB2+Y8a+xwXrXgTW4qhe04MsC
-AwEAAaNCMEAwHQYDVR0OBBYEFCnFkKslrxHkYb+j/4hhkeYO/pyBMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAQDdr4Ouwo0RSVgrESLFF6QSU2TJ/s
-Px+EnWVUXKgWAkD6bho3hO9ynYYKVZ1WKKxmLNA6VpM0ByWtCLCPyA8JWcqdmBzlVPi5RX9ql2+I
-aE1KBiY3iAIOtsbWcpnOa3faYjGkVh+uX4132l32iPwa2Z61gfAyuOOI0JzzaqC5mxRZNTZPz/OO
-Xl0XrRWV2N2y1RVuAE6zS89mlOTgzbUF2mNXi+WzqtvALhyQRNsaXRik7r4EW5nVcV9VZWRi1aKb
-BFmGyGJ353yCRWo9F7/snXUMrqNvWtMvmDb08PUZqxFdyKbjKlhqQgnDvZImZjINXQhVdP+MmNAK
-poRq0Tl9
------END CERTIFICATE-----
-
 D-TRUST Root Class 3 CA 2 2009
 ==============================
 -----BEGIN CERTIFICATE-----
@@ -2271,84 +1906,6 @@ NCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqXKVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVv
 w9y4AyHqnxbxLFS1
 -----END CERTIFICATE-----
 
-PSCProcert
-==========
------BEGIN CERTIFICATE-----
-MIIJhjCCB26gAwIBAgIBCzANBgkqhkiG9w0BAQsFADCCAR4xPjA8BgNVBAMTNUF1dG9yaWRhZCBk
-ZSBDZXJ0aWZpY2FjaW9uIFJhaXogZGVsIEVzdGFkbyBWZW5lem9sYW5vMQswCQYDVQQGEwJWRTEQ
-MA4GA1UEBxMHQ2FyYWNhczEZMBcGA1UECBMQRGlzdHJpdG8gQ2FwaXRhbDE2MDQGA1UEChMtU2lz
-dGVtYSBOYWNpb25hbCBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9uaWNhMUMwQQYDVQQLEzpTdXBl
-cmludGVuZGVuY2lhIGRlIFNlcnZpY2lvcyBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9uaWNhMSUw
-IwYJKoZIhvcNAQkBFhZhY3JhaXpAc3VzY2VydGUuZ29iLnZlMB4XDTEwMTIyODE2NTEwMFoXDTIw
-MTIyNTIzNTk1OVowgdExJjAkBgkqhkiG9w0BCQEWF2NvbnRhY3RvQHByb2NlcnQubmV0LnZlMQ8w
-DQYDVQQHEwZDaGFjYW8xEDAOBgNVBAgTB01pcmFuZGExKjAoBgNVBAsTIVByb3ZlZWRvciBkZSBD
-ZXJ0aWZpY2Fkb3MgUFJPQ0VSVDE2MDQGA1UEChMtU2lzdGVtYSBOYWNpb25hbCBkZSBDZXJ0aWZp
-Y2FjaW9uIEVsZWN0cm9uaWNhMQswCQYDVQQGEwJWRTETMBEGA1UEAxMKUFNDUHJvY2VydDCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANW39KOUM6FGqVVhSQ2oh3NekS1wwQYalNo97BVC
-wfWMrmoX8Yqt/ICV6oNEolt6Vc5Pp6XVurgfoCfAUFM+jbnADrgV3NZs+J74BCXfgI8Qhd19L3uA
-3VcAZCP4bsm+lU/hdezgfl6VzbHvvnpC2Mks0+saGiKLt38GieU89RLAu9MLmV+QfI4tL3czkkoh
-RqipCKzx9hEC2ZUWno0vluYC3XXCFCpa1sl9JcLB/KpnheLsvtF8PPqv1W7/U0HU9TI4seJfxPmO
-EO8GqQKJ/+MMbpfg353bIdD0PghpbNjU5Db4g7ayNo+c7zo3Fn2/omnXO1ty0K+qP1xmk6wKImG2
-0qCZyFSTXai20b1dCl53lKItwIKOvMoDKjSuc/HUtQy9vmebVOvh+qBa7Dh+PsHMosdEMXXqP+UH
-0quhJZb25uSgXTcYOWEAM11G1ADEtMo88aKjPvM6/2kwLkDd9p+cJsmWN63nOaK/6mnbVSKVUyqU
-td+tFjiBdWbjxywbk5yqjKPK2Ww8F22c3HxT4CAnQzb5EuE8XL1mv6JpIzi4mWCZDlZTOpx+FIyw
-Bm/xhnaQr/2v/pDGj59/i5IjnOcVdo/Vi5QTcmn7K2FjiO/mpF7moxdqWEfLcU8UC17IAggmosvp
-r2uKGcfLFFb14dq12fy/czja+eevbqQ34gcnAgMBAAGjggMXMIIDEzASBgNVHRMBAf8ECDAGAQH/
-AgEBMDcGA1UdEgQwMC6CD3N1c2NlcnRlLmdvYi52ZaAbBgVghl4CAqASDBBSSUYtRy0yMDAwNDAz
-Ni0wMB0GA1UdDgQWBBRBDxk4qpl/Qguk1yeYVKIXTC1RVDCCAVAGA1UdIwSCAUcwggFDgBStuyId
-xuDSAaj9dlBSk+2YwU2u06GCASakggEiMIIBHjE+MDwGA1UEAxM1QXV0b3JpZGFkIGRlIENlcnRp
-ZmljYWNpb24gUmFpeiBkZWwgRXN0YWRvIFZlbmV6b2xhbm8xCzAJBgNVBAYTAlZFMRAwDgYDVQQH
-EwdDYXJhY2FzMRkwFwYDVQQIExBEaXN0cml0byBDYXBpdGFsMTYwNAYDVQQKEy1TaXN0ZW1hIE5h
-Y2lvbmFsIGRlIENlcnRpZmljYWNpb24gRWxlY3Ryb25pY2ExQzBBBgNVBAsTOlN1cGVyaW50ZW5k
-ZW5jaWEgZGUgU2VydmljaW9zIGRlIENlcnRpZmljYWNpb24gRWxlY3Ryb25pY2ExJTAjBgkqhkiG
-9w0BCQEWFmFjcmFpekBzdXNjZXJ0ZS5nb2IudmWCAQowDgYDVR0PAQH/BAQDAgEGME0GA1UdEQRG
-MESCDnByb2NlcnQubmV0LnZloBUGBWCGXgIBoAwMClBTQy0wMDAwMDKgGwYFYIZeAgKgEgwQUklG
-LUotMzE2MzUzNzMtNzB2BgNVHR8EbzBtMEagRKBChkBodHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52
-ZS9sY3IvQ0VSVElGSUNBRE8tUkFJWi1TSEEzODRDUkxERVIuY3JsMCOgIaAfhh1sZGFwOi8vYWNy
-YWl6LnN1c2NlcnRlLmdvYi52ZTA3BggrBgEFBQcBAQQrMCkwJwYIKwYBBQUHMAGGG2h0dHA6Ly9v
-Y3NwLnN1c2NlcnRlLmdvYi52ZTBBBgNVHSAEOjA4MDYGBmCGXgMBAjAsMCoGCCsGAQUFBwIBFh5o
-dHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52ZS9kcGMwDQYJKoZIhvcNAQELBQADggIBACtZ6yKZu4Sq
-T96QxtGGcSOeSwORR3C7wJJg7ODU523G0+1ng3dS1fLld6c2suNUvtm7CpsR72H0xpkzmfWvADmN
-g7+mvTV+LFwxNG9s2/NkAZiqlCxB3RWGymspThbASfzXg0gTB1GEMVKIu4YXx2sviiCtxQuPcD4q
-uxtxj7mkoP3YldmvWb8lK5jpY5MvYB7Eqvh39YtsL+1+LrVPQA3uvFd359m21D+VJzog1eWuq2w1
-n8GhHVnchIHuTQfiSLaeS5UtQbHh6N5+LwUeaO6/u5BlOsju6rEYNxxik6SgMexxbJHmpHmJWhSn
-FFAFTKQAVzAswbVhltw+HoSvOULP5dAssSS830DD7X9jSr3hTxJkhpXzsOfIt+FTvZLm8wyWuevo
-5pLtp4EJFAv8lXrPj9Y0TzYS3F7RNHXGRoAvlQSMx4bEqCaJqD8Zm4G7UaRKhqsLEQ+xrmNTbSjq
-3TNWOByyrYDT13K9mmyZY+gAu0F2BbdbmRiKw7gSXFbPVgx96OLP7bx0R/vu0xdOIk9W/1DzLuY5
-poLWccret9W6aAjtmcz9opLLabid+Qqkpj5PkygqYWwHJgD/ll9ohri4zspV4KuxPX+Y1zMOWj3Y
-eMLEYC/HYvBhkdI4sPaeVdtAgAUSM84dkpvRabP/v/GSCmE1P93+hvS84Bpxs2Km
------END CERTIFICATE-----
-
-CA Disig Root R1
-================
------BEGIN CERTIFICATE-----
-MIIFaTCCA1GgAwIBAgIJAMMDmu5QkG4oMA0GCSqGSIb3DQEBBQUAMFIxCzAJBgNVBAYTAlNLMRMw
-EQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMuMRkwFwYDVQQDExBDQSBEaXNp
-ZyBSb290IFIxMB4XDTEyMDcxOTA5MDY1NloXDTQyMDcxOTA5MDY1NlowUjELMAkGA1UEBhMCU0sx
-EzARBgNVBAcTCkJyYXRpc2xhdmExEzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERp
-c2lnIFJvb3QgUjEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCqw3j33Jijp1pedxiy
-3QRkD2P9m5YJgNXoqqXinCaUOuiZc4yd39ffg/N4T0Dhf9Kn0uXKE5Pn7cZ3Xza1lK/oOI7bm+V8
-u8yN63Vz4STN5qctGS7Y1oprFOsIYgrY3LMATcMjfF9DCCMyEtztDK3AfQ+lekLZWnDZv6fXARz2
-m6uOt0qGeKAeVjGu74IKgEH3G8muqzIm1Cxr7X1r5OJeIgpFy4QxTaz+29FHuvlglzmxZcfe+5nk
-CiKxLU3lSCZpq+Kq8/v8kiky6bM+TR8noc2OuRf7JT7JbvN32g0S9l3HuzYQ1VTW8+DiR0jm3hTa
-YVKvJrT1cU/J19IG32PK/yHoWQbgCNWEFVP3Q+V8xaCJmGtzxmjOZd69fwX3se72V6FglcXM6pM6
-vpmumwKjrckWtc7dXpl4fho5frLABaTAgqWjR56M6ly2vGfb5ipN0gTco65F97yLnByn1tUD3AjL
-LhbKXEAz6GfDLuemROoRRRw1ZS0eRWEkG4IupZ0zXWX4Qfkuy5Q/H6MMMSRE7cderVC6xkGbrPAX
-ZcD4XW9boAo0PO7X6oifmPmvTiT6l7Jkdtqr9O3jw2Dv1fkCyC2fg69naQanMVXVz0tv/wQFx1is
-XxYb5dKj6zHbHzMVTdDypVP1y+E9Tmgt2BLdqvLmTZtJ5cUoobqwWsagtQIDAQABo0IwQDAPBgNV
-HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUiQq0OJMa5qvum5EY+fU8PjXQ
-04IwDQYJKoZIhvcNAQEFBQADggIBADKL9p1Kyb4U5YysOMo6CdQbzoaz3evUuii+Eq5FLAR0rBNR
-xVgYZk2C2tXck8An4b58n1KeElb21Zyp9HWc+jcSjxyT7Ff+Bw+r1RL3D65hXlaASfX8MPWbTx9B
-LxyE04nH4toCdu0Jz2zBuByDHBb6lM19oMgY0sidbvW9adRtPTXoHqJPYNcHKfyyo6SdbhWSVhlM
-CrDpfNIZTUJG7L399ldb3Zh+pE3McgODWF3vkzpBemOqfDqo9ayk0d2iLbYq/J8BjuIQscTK5Gfb
-VSUZP/3oNn6z4eGBrxEWi1CXYBmCAMBrTXO40RMHPuq2MU/wQppt4hF05ZSsjYSVPCGvxdpHyN85
-YmLLW1AL14FABZyb7bq2ix4Eb5YgOe2kfSnbSM6C3NQCjR0EMVrHS/BsYVLXtFHCgWzN4funodKS
-ds+xDzdYpPJScWc/DIh4gInByLUfkmO+p3qKViwaqKactV2zY9ATIKHrkWzQjX2v3wvkF7mGnjix
-lAxYjOBVqjtjbZqJYLhkKpLGN/R+Q0O3c+gB53+XD9fyexn9GtePyfqFa3qdnom2piiZk4hA9z7N
-UaPK6u95RyG1/jLix8NRb76AdPCkwzryT+lf3xkK8jsTQ6wxpLPn6/wY1gGp8yqPNg7rtLG8t0zJ
-a7+h89n07eLw4+1knj0vllJPgFOL
------END CERTIFICATE-----
-
 CA Disig Root R2
 ================
 -----BEGIN CERTIFICATE-----
@@ -2752,66 +2309,6 @@ G48BtieVU+i2iW1bvGjUI+iLUaJW+fCmgKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP
 82Z+
 -----END CERTIFICATE-----
 
-WoSign
-======
------BEGIN CERTIFICATE-----
-MIIFdjCCA16gAwIBAgIQXmjWEXGUY1BWAGjzPsnFkTANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQG
-EwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxKjAoBgNVBAMTIUNlcnRpZmljYXRpb24g
-QXV0aG9yaXR5IG9mIFdvU2lnbjAeFw0wOTA4MDgwMTAwMDFaFw0zOTA4MDgwMTAwMDFaMFUxCzAJ
-BgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEqMCgGA1UEAxMhQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgb2YgV29TaWduMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA
-vcqNrLiRFVaXe2tcesLea9mhsMMQI/qnobLMMfo+2aYpbxY94Gv4uEBf2zmoAHqLoE1UfcIiePyO
-CbiohdfMlZdLdNiefvAA5A6JrkkoRBoQmTIPJYhTpA2zDxIIFgsDcSccf+Hb0v1naMQFXQoOXXDX
-2JegvFNBmpGN9J42Znp+VsGQX+axaCA2pIwkLCxHC1l2ZjC1vt7tj/id07sBMOby8w7gLJKA84X5
-KIq0VC6a7fd2/BVoFutKbOsuEo/Uz/4Mx1wdC34FMr5esAkqQtXJTpCzWQ27en7N1QhatH/YHGkR
-+ScPewavVIMYe+HdVHpRaG53/Ma/UkpmRqGyZxq7o093oL5d//xWC0Nyd5DKnvnyOfUNqfTq1+ez
-EC8wQjchzDBwyYaYD8xYTYO7feUapTeNtqwylwA6Y3EkHp43xP901DfA4v6IRmAR3Qg/UDaruHqk
-lWJqbrDKaiFaafPz+x1wOZXzp26mgYmhiMU7ccqjUu6Du/2gd/Tkb+dC221KmYo0SLwX3OSACCK2
-8jHAPwQ+658geda4BmRkAjHXqc1S+4RFaQkAKtxVi8QGRkvASh0JWzko/amrzgD5LkhLJuYwTKVY
-yrREgk/nkR4zw7CT/xH8gdLKH3Ep3XZPkiWvHYG3Dy+MwwbMLyejSuQOmbp8HkUff6oZRZb9/D0C
-AwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFOFmzw7R
-8bNLtwYgFP6HEtX2/vs+MA0GCSqGSIb3DQEBBQUAA4ICAQCoy3JAsnbBfnv8rWTjMnvMPLZdRtP1
-LOJwXcgu2AZ9mNELIaCJWSQBnfmvCX0KI4I01fx8cpm5o9dU9OpScA7F9dY74ToJMuYhOZO9sxXq
-T2r09Ys/L3yNWC7F4TmgPsc9SnOeQHrAK2GpZ8nzJLmzbVUsWh2eJXLOC62qx1ViC777Y7NhRCOj
-y+EaDveaBk3e1CNOIZZbOVtXHS9dCF4Jef98l7VNg64N1uajeeAz0JmWAjCnPv/So0M/BVoG6kQC
-2nz4SNAzqfkHx5Xh9T71XXG68pWpdIhhWeO/yloTunK0jF02h+mmxTwTv97QRCbut+wucPrXnbes
-5cVAWubXbHssw1abR80LzvobtCHXt2a49CUwi1wNuepnsvRtrtWhnk/Yn+knArAdBtaP4/tIEp9/
-EaEQPkxROpaw0RPxx9gmrjrKkcRpnd8BKWRRb2jaFOwIQZeQjdCygPLPwj2/kWjFgGcexGATVdVh
-mVd8upUPYUk6ynW8yQqTP2cOEvIo4jEbwFcW3wh8GcF+Dx+FHgo2fFt+J7x6v+Db9NpSvd4MVHAx
-kUOVyLzwPt0JfjBkUO1/AaQzZ01oT74V77D2AhGiGxMlOtzCWfHjXEa7ZywCRuoeSKbmW9m1vFGi
-kpbbqsY3Iqb+zCB0oy2pLmvLwIIRIbWTee5Ehr7XHuQe+w==
------END CERTIFICATE-----
-
-WoSign China
-============
------BEGIN CERTIFICATE-----
-MIIFWDCCA0CgAwIBAgIQUHBrzdgT/BtOOzNy0hFIjTANBgkqhkiG9w0BAQsFADBGMQswCQYDVQQG
-EwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxGzAZBgNVBAMMEkNBIOayg+mAmuagueiv
-geS5pjAeFw0wOTA4MDgwMTAwMDFaFw0zOTA4MDgwMTAwMDFaMEYxCzAJBgNVBAYTAkNOMRowGAYD
-VQQKExFXb1NpZ24gQ0EgTGltaXRlZDEbMBkGA1UEAwwSQ0Eg5rKD6YCa5qC56K+B5LmmMIICIjAN
-BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0EkhHiX8h8EqwqzbdoYGTufQdDTc7WU1/FDWiD+k
-8H/rD195L4mx/bxjWDeTmzj4t1up+thxx7S8gJeNbEvxUNUqKaqoGXqW5pWOdO2XCld19AXbbQs5
-uQF/qvbW2mzmBeCkTVL829B0txGMe41P/4eDrv8FAxNXUDf+jJZSEExfv5RxadmWPgxDT74wwJ85
-dE8GRV2j1lY5aAfMh09Qd5Nx2UQIsYo06Yms25tO4dnkUkWMLhQfkWsZHWgpLFbE4h4TV2TwYeO5
-Ed+w4VegG63XX9Gv2ystP9Bojg/qnw+LNVgbExz03jWhCl3W6t8Sb8D7aQdGctyB9gQjF+BNdeFy
-b7Ao65vh4YOhn0pdr8yb+gIgthhid5E7o9Vlrdx8kHccREGkSovrlXLp9glk3Kgtn3R46MGiCWOc
-76DbT52VqyBPt7D3h1ymoOQ3OMdc4zUPLK2jgKLsLl3Az+2LBcLmc272idX10kaO6m1jGx6KyX2m
-+Jzr5dVjhU1zZmkR/sgO9MHHZklTfuQZa/HpelmjbX7FF+Ynxu8b22/8DU0GAbQOXDBGVWCvOGU6
-yke6rCzMRh+yRpY/8+0mBe53oWprfi1tWFxK1I5nuPHa1UaKJ/kR8slC/k7e3x9cxKSGhxYzoacX
-GKUN5AXlK8IrC6KVkLn9YDxOiT7nnO4fuwECAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1Ud
-EwEB/wQFMAMBAf8wHQYDVR0OBBYEFOBNv9ybQV0T6GTwp+kVpOGBwboxMA0GCSqGSIb3DQEBCwUA
-A4ICAQBqinA4WbbaixjIvirTthnVZil6Xc1bL3McJk6jfW+rtylNpumlEYOnOXOvEESS5iVdT2H6
-yAa+Tkvv/vMx/sZ8cApBWNromUuWyXi8mHwCKe0JgOYKOoICKuLJL8hWGSbueBwj/feTZU7n85iY
-r83d2Z5AiDEoOqsuC7CsDCT6eiaY8xJhEPRdF/d+4niXVOKM6Cm6jBAyvd0zaziGfjk9DgNyp115
-j0WKWa5bIW4xRtVZjc8VX90xJc/bYNaBRHIpAlf2ltTW/+op2znFuCyKGo3Oy+dCMYYFaA6eFN0A
-kLppRQjbbpCBhqcqBT/mhDn4t/lXX0ykeVoQDF7Va/81XwVRHmyjdanPUIPTfPRm94KNPQx96N97
-qA4bLJyuQHCH2u2nFoJavjVsIE4iYdm8UXrNemHcSxH5/mc0zy4EZmFcV5cjjPOGG0jfKq+nwf/Y
-jj4Du9gqsPoUJbJRa4ZDhS4HIxaAjUz7tGM7zMN07RujHv41D198HRaG9Q7DlfEvr10lO1Hm13ZB
-ONFLAzkopR6RctR9q5czxNM+4Gm2KHmgCY0c0f9BckgG/Jou5yD5m6Leie2uPAmvylezkolwQOQv
-T8Jwg0DXJCxr5wkf09XHwQj02w47HAcLQxGEIYbpgNR12KvxAmLBsX5VYc8T1yaw15zLKYs4SgsO
-kI26oQ==
------END CERTIFICATE-----
-
 COMODO RSA Certification Authority
 ==================================
 -----BEGIN CERTIFICATE-----
@@ -3116,61 +2613,6 @@ kbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+ZAAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3C
 ekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su
 -----END CERTIFICATE-----
 
-TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H5
-====================================================
------BEGIN CERTIFICATE-----
-MIIEJzCCAw+gAwIBAgIHAI4X/iQggTANBgkqhkiG9w0BAQsFADCBsTELMAkGA1UEBhMCVFIxDzAN
-BgNVBAcMBkFua2FyYTFNMEsGA1UECgxEVMOcUktUUlVTVCBCaWxnaSDEsGxldGnFn2ltIHZlIEJp
-bGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkgQS7Fni4xQjBABgNVBAMMOVTDnFJLVFJVU1Qg
-RWxla3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSBINTAeFw0xMzA0MzAw
-ODA3MDFaFw0yMzA0MjgwODA3MDFaMIGxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMU0w
-SwYDVQQKDERUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnE
-n2kgSGl6bWV0bGVyaSBBLsWeLjFCMEAGA1UEAww5VMOcUktUUlVTVCBFbGVrdHJvbmlrIFNlcnRp
-ZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIEg1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEApCUZ4WWe60ghUEoI5RHwWrom/4NZzkQqL/7hzmAD/I0Dpe3/a6i6zDQGn1k19uwsu537
-jVJp45wnEFPzpALFp/kRGml1bsMdi9GYjZOHp3GXDSHHmflS0yxjXVW86B8BSLlg/kJK9siArs1m
-ep5Fimh34khon6La8eHBEJ/rPCmBp+EyCNSgBbGM+42WAA4+Jd9ThiI7/PS98wl+d+yG6w8z5UNP
-9FR1bSmZLmZaQ9/LXMrI5Tjxfjs1nQ/0xVqhzPMggCTTV+wVunUlm+hkS7M0hO8EuPbJbKoCPrZV
-4jI3X/xml1/N1p7HIL9Nxqw/dV8c7TKcfGkAaZHjIxhT6QIDAQABo0IwQDAdBgNVHQ4EFgQUVpkH
-HtOsDGlktAxQR95DLL4gwPswDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
-hvcNAQELBQADggEBAJ5FdnsXSDLyOIspve6WSk6BGLFRRyDN0GSxDsnZAdkJzsiZ3GglE9Rc8qPo
-BP5yCccLqh0lVX6Wmle3usURehnmp349hQ71+S4pL+f5bFgWV1Al9j4uPqrtd3GqqpmWRgqujuwq
-URawXs3qZwQcWDD1YIq9pr1N5Za0/EKJAWv2cMhQOQwt1WbZyNKzMrcbGW3LM/nfpeYVhDfwwvJl
-lpKQd/Ct9JDpEXjXk4nAPQu6KfTomZ1yju2dL+6SfaHx/126M2CFYv4HAqGEVka+lgqaE9chTLd8
-B59OTj+RdPsnnRHM3eaxynFNExc5JsUpISuTKWqW+qtB4Uu2NQvAmxU=
------END CERTIFICATE-----
-
-Certinomis - Root CA
-====================
------BEGIN CERTIFICATE-----
-MIIFkjCCA3qgAwIBAgIBATANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
-Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxHTAbBgNVBAMTFENlcnRpbm9taXMg
-LSBSb290IENBMB4XDTEzMTAyMTA5MTcxOFoXDTMzMTAyMTA5MTcxOFowWjELMAkGA1UEBhMCRlIx
-EzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMR0wGwYDVQQDExRD
-ZXJ0aW5vbWlzIC0gUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANTMCQos
-P5L2fxSeC5yaah1AMGT9qt8OHgZbn1CF6s2Nq0Nn3rD6foCWnoR4kkjW4znuzuRZWJflLieY6pOo
-d5tK8O90gC3rMB+12ceAnGInkYjwSond3IjmFPnVAy//ldu9n+ws+hQVWZUKxkd8aRi5pwP5ynap
-z8dvtF4F/u7BUrJ1Mofs7SlmO/NKFoL21prbcpjp3vDFTKWrteoB4owuZH9kb/2jJZOLyKIOSY00
-8B/sWEUuNKqEUL3nskoTuLAPrjhdsKkb5nPJWqHZZkCqqU2mNAKthH6yI8H7KsZn9DS2sJVqM09x
-RLWtwHkziOC/7aOgFLScCbAK42C++PhmiM1b8XcF4LVzbsF9Ri6OSyemzTUK/eVNfaoqoynHWmgE
-6OXWk6RiwsXm9E/G+Z8ajYJJGYrKWUM66A0ywfRMEwNvbqY/kXPLynNvEiCL7sCCeN5LLsJJwx3t
-FvYk9CcbXFcx3FXuqB5vbKziRcxXV4p1VxngtViZSTYxPDMBbRZKzbgqg4SGm/lg0h9tkQPTYKbV
-PZrdd5A9NaSfD171UkRpucC63M9933zZxKyGIjK8e2uR73r4F2iw4lNVYC2vPsKD2NkJK/DAZNuH
-i5HMkesE/Xa0lZrmFAYb1TQdvtj/dBxThZngWVJKYe2InmtJiUZ+IFrZ50rlau7SZRFDAgMBAAGj
-YzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTvkUz1pcMw6C8I
-6tNxIqSSaHh02TAfBgNVHSMEGDAWgBTvkUz1pcMw6C8I6tNxIqSSaHh02TANBgkqhkiG9w0BAQsF
-AAOCAgEAfj1U2iJdGlg+O1QnurrMyOMaauo++RLrVl89UM7g6kgmJs95Vn6RHJk/0KGRHCwPT5iV
-WVO90CLYiF2cN/z7ZMF4jIuaYAnq1fohX9B0ZedQxb8uuQsLrbWwF6YSjNRieOpWauwK0kDDPAUw
-Pk2Ut59KA9N9J0u2/kTO+hkzGm2kQtHdzMjI1xZSg081lLMSVX3l4kLr5JyTCcBMWwerx20RoFAX
-lCOotQqSD7J6wWAsOMwaplv/8gzjqh8c3LigkyfeY+N/IZ865Z764BNqdeuWXGKRlI5nU7aJ+BIJ
-y29SWwNyhlCVCNSNh4YVH5Uk2KRvms6knZtt0rJ2BobGVgjF6wnaNsIbW0G+YSrjcOa4pvi2WsS9
-Iff/ql+hbHY5ZtbqTFXhADObE5hjyW/QASAJN1LnDE8+zbz1X5YnpyACleAu6AdBBR8Vbtaw5Bng
-DwKTACdyxYvRVB9dSsNAl35VpnzBMwQUAR1JIGkLGZOdblgi90AMRgwjY/M50n92Uaf0yKHxDHYi
-I0ZSKS3io0EHVmmY0gUJvGnHWmHNj4FgFU2A3ZDifcRQ8ow7bkrHxuaAKzyBvBGAFhAn1/DNP3nM
-cyrDflOR1m749fPH0FFNjkulW+YZFzvWgQncItzujrnEj1PhZ7szuIgVRs/taTX/dQ1G885x4cVr
-hkIGuUE=
------END CERTIFICATE-----
-
 OISTE WISeKey Global Root GB CA
 ===============================
 -----BEGIN CERTIFICATE-----
@@ -3193,42 +2635,6 @@ HZeeevJuQHHfaPFlTc58Bd9TZaml8LGXBHAVRgOY1NK/VLSgWH1Sb9pWJmLU2NuJMW8c8CLC02Ic
 Nc1MaRVUGpCY3useX8p3x8uOPUNpnJpY0CQ73xtAln41rYHHTnG6iBM=
 -----END CERTIFICATE-----
 
-Certification Authority of WoSign G2
-====================================
------BEGIN CERTIFICATE-----
-MIIDfDCCAmSgAwIBAgIQayXaioidfLwPBbOxemFFRDANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQG
-EwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxLTArBgNVBAMTJENlcnRpZmljYXRpb24g
-QXV0aG9yaXR5IG9mIFdvU2lnbiBHMjAeFw0xNDExMDgwMDU4NThaFw00NDExMDgwMDU4NThaMFgx
-CzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEtMCsGA1UEAxMkQ2VydGlm
-aWNhdGlvbiBBdXRob3JpdHkgb2YgV29TaWduIEcyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAvsXEoCKASU+/2YcRxlPhuw+9YH+v9oIOH9ywjj2X4FA8jzrvZjtFB5sg+OPXJYY1kBai
-XW8wGQiHC38Gsp1ij96vkqVg1CuAmlI/9ZqD6TRay9nVYlzmDuDfBpgOgHzKtB0TiGsOqCR3A9Du
-W/PKaZE1OVbFbeP3PU9ekzgkyhjpJMuSA93MHD0JcOQg5PGurLtzaaNjOg9FD6FKmsLRY6zLEPg9
-5k4ot+vElbGs/V6r+kHLXZ1L3PR8du9nfwB6jdKgGlxNIuG12t12s9R23164i5jIFFTMaxeSt+BK
-v0mUYQs4kI9dJGwlezt52eJ+na2fmKEG/HgUYFf47oB3sQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMC
-AQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU+mCp62XF3RYUCE4MD42b4Pdkr2cwDQYJKoZI
-hvcNAQELBQADggEBAFfDejaCnI2Y4qtAqkePx6db7XznPWZaOzG73/MWM5H8fHulwqZm46qwtyeY
-P0nXYGdnPzZPSsvxFPpahygc7Y9BMsaV+X3avXtbwrAh449G3CE4Q3RM+zD4F3LBMvzIkRfEzFg3
-TgvMWvchNSiDbGAtROtSjFA9tWwS1/oJu2yySrHFieT801LYYRf+epSEj3m2M1m6D8QL4nCgS3gu
-+sif/a+RZQp4OBXllxcU3fngLDT4ONCEIgDAFFEYKwLcMFrw6AF8NTojrwjkr6qOKEJJLvD1mTS+
-7Q9LGOHSJDy7XUe3IfKN0QqZjuNuPq1w4I+5ysxugTH2e5x6eeRncRg=
------END CERTIFICATE-----
-
-CA WoSign ECC Root
-==================
------BEGIN CERTIFICATE-----
-MIICCTCCAY+gAwIBAgIQaEpYcIBr8I8C+vbe6LCQkDAKBggqhkjOPQQDAzBGMQswCQYDVQQGEwJD
-TjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxGzAZBgNVBAMTEkNBIFdvU2lnbiBFQ0MgUm9v
-dDAeFw0xNDExMDgwMDU4NThaFw00NDExMDgwMDU4NThaMEYxCzAJBgNVBAYTAkNOMRowGAYDVQQK
-ExFXb1NpZ24gQ0EgTGltaXRlZDEbMBkGA1UEAxMSQ0EgV29TaWduIEVDQyBSb290MHYwEAYHKoZI
-zj0CAQYFK4EEACIDYgAE4f2OuEMkq5Z7hcK6C62N4DrjJLnSsb6IOsq/Srj57ywvr1FQPEd1bPiU
-t5v8KB7FVMxjnRZLU8HnIKvNrCXSf4/CwVqCXjCLelTOA7WRf6qU0NGKSMyCBSah1VES1ns2o0Iw
-QDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUqv3VWqP2h4syhf3R
-MluARZPzA7gwCgYIKoZIzj0EAwMDaAAwZQIxAOSkhLCB1T2wdKyUpOgOPQB0TKGXa/kNUTyh2Tv0
-Daupn75OcsqF1NnstTJFGG+rrQIwfcf3aWMvoeGY7xMQ0Xk/0f7qO3/eVvSQsRUR2LIiFdAvwyYu
-a/GRspBl9JrmkO5K
------END CERTIFICATE-----
-
 SZAFIR ROOT CA2
 ===============
 -----BEGIN CERTIFICATE-----
@@ -3333,126 +2739,6 @@ GiecMjvAwNW6qef4BENThe5SId6d9SWDPp5YSy/XZxMOIQIwBeF1Ad5o7SofTUwJCA3sS61kFyjn
 dc5FZXIhF8siQQ6ME5g4mlRtm8rifOoCWCKR
 -----END CERTIFICATE-----
 
-Certplus Root CA G1
-===================
------BEGIN CERTIFICATE-----
-MIIFazCCA1OgAwIBAgISESBVg+QtPlRWhS2DN7cs3EYRMA0GCSqGSIb3DQEBDQUAMD4xCzAJBgNV
-BAYTAkZSMREwDwYDVQQKDAhDZXJ0cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMTAe
-Fw0xNDA1MjYwMDAwMDBaFw0zODAxMTUwMDAwMDBaMD4xCzAJBgNVBAYTAkZSMREwDwYDVQQKDAhD
-ZXJ0cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMTCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBANpQh7bauKk+nWT6VjOaVj0W5QOVsjQcmm1iBdTYj+eJZJ+622SLZOZ5KmHN
-r49aiZFluVj8tANfkT8tEBXgfs+8/H9DZ6itXjYj2JizTfNDnjl8KvzsiNWI7nC9hRYt6kuJPKNx
-Qv4c/dMcLRC4hlTqQ7jbxofaqK6AJc96Jh2qkbBIb6613p7Y1/oA/caP0FG7Yn2ksYyy/yARujVj
-BYZHYEMzkPZHogNPlk2dT8Hq6pyi/jQu3rfKG3akt62f6ajUeD94/vI4CTYd0hYCyOwqaK/1jpTv
-LRN6HkJKHRUxrgwEV/xhc/MxVoYxgKDEEW4wduOU8F8ExKyHcomYxZ3MVwia9Az8fXoFOvpHgDm2
-z4QTd28n6v+WZxcIbekN1iNQMLAVdBM+5S//Ds3EC0pd8NgAM0lm66EYfFkuPSi5YXHLtaW6uOrc
-4nBvCGrch2c0798wct3zyT8j/zXhviEpIDCB5BmlIOklynMxdCm+4kLV87ImZsdo/Rmz5yCTmehd
-4F6H50boJZwKKSTUzViGUkAksnsPmBIgJPaQbEfIDbsYIC7Z/fyL8inqh3SV4EJQeIQEQWGw9CEj
-jy3LKCHyamz0GqbFFLQ3ZU+V/YDI+HLlJWvEYLF7bY5KinPOWftwenMGE9nTdDckQQoRb5fc5+R+
-ob0V8rqHDz1oihYHAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0G
-A1UdDgQWBBSowcCbkahDFXxdBie0KlHYlwuBsTAfBgNVHSMEGDAWgBSowcCbkahDFXxdBie0KlHY
-lwuBsTANBgkqhkiG9w0BAQ0FAAOCAgEAnFZvAX7RvUz1isbwJh/k4DgYzDLDKTudQSk0YcbX8ACh
-66Ryj5QXvBMsdbRX7gp8CXrc1cqh0DQT+Hern+X+2B50ioUHj3/MeXrKls3N/U/7/SMNkPX0XtPG
-YX2eEeAC7gkE2Qfdpoq3DIMku4NQkv5gdRE+2J2winq14J2by5BSS7CTKtQ+FjPlnsZlFT5kOwQ/
-2wyPX1wdaR+v8+khjPPvl/aatxm2hHSco1S1cE5j2FddUyGbQJJD+tZ3VTNPZNX70Cxqjm0lpu+F
-6ALEUz65noe8zDUa3qHpimOHZR4RKttjd5cUvpoUmRGywO6wT/gUITJDT5+rosuoD6o7BlXGEilX
-CNQ314cnrUlZp5GrRHpejXDbl85IULFzk/bwg2D5zfHhMf1bfHEhYxQUqq/F3pN+aLHsIqKqkHWe
-tUNy6mSjhEv9DKgma3GX7lZjZuhCVPnHHd/Qj1vfyDBviP4NxDMcU6ij/UgQ8uQKTuEVV/xuZDDC
-VRHc6qnNSlSsKWNEz0pAoNZoWRsz+e86i9sgktxChL8Bq4fA1SCC28a5g4VCXA9DO2pJNdWY9BW/
-+mGBDAkgGNLQFwzLSABQ6XaCjGTXOqAHVcweMcDvOrRl++O/QmueD6i9a5jc2NvLi6Td11n0bt3+
-qsOR0C5CB8AMTVPNJLFMWx5R9N/pkvo=
------END CERTIFICATE-----
-
-Certplus Root CA G2
-===================
------BEGIN CERTIFICATE-----
-MIICHDCCAaKgAwIBAgISESDZkc6uo+jF5//pAq/Pc7xVMAoGCCqGSM49BAMDMD4xCzAJBgNVBAYT
-AkZSMREwDwYDVQQKDAhDZXJ0cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMjAeFw0x
-NDA1MjYwMDAwMDBaFw0zODAxMTUwMDAwMDBaMD4xCzAJBgNVBAYTAkZSMREwDwYDVQQKDAhDZXJ0
-cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMjB2MBAGByqGSM49AgEGBSuBBAAiA2IA
-BM0PW1aC3/BFGtat93nwHcmsltaeTpwftEIRyoa/bfuFo8XlGVzX7qY/aWfYeOKmycTbLXku54uN
-Am8xIk0G42ByRZ0OQneezs/lf4WbGOT8zC5y0xaTTsqZY1yhBSpsBqNjMGEwDgYDVR0PAQH/BAQD
-AgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNqDYwJ5jtpMxjwjFNiPwyCrKGBZMB8GA1Ud
-IwQYMBaAFNqDYwJ5jtpMxjwjFNiPwyCrKGBZMAoGCCqGSM49BAMDA2gAMGUCMHD+sAvZ94OX7PNV
-HdTcswYO/jOYnYs5kGuUIe22113WTNchp+e/IQ8rzfcq3IUHnQIxAIYUFuXcsGXCwI4Un78kFmjl
-vPl5adytRSv3tjFzzAalU5ORGpOucGpnutee5WEaXw==
------END CERTIFICATE-----
-
-OpenTrust Root CA G1
-====================
------BEGIN CERTIFICATE-----
-MIIFbzCCA1egAwIBAgISESCzkFU5fX82bWTCp59rY45nMA0GCSqGSIb3DQEBCwUAMEAxCzAJBgNV
-BAYTAkZSMRIwEAYDVQQKDAlPcGVuVHJ1c3QxHTAbBgNVBAMMFE9wZW5UcnVzdCBSb290IENBIEcx
-MB4XDTE0MDUyNjA4NDU1MFoXDTM4MDExNTAwMDAwMFowQDELMAkGA1UEBhMCRlIxEjAQBgNVBAoM
-CU9wZW5UcnVzdDEdMBsGA1UEAwwUT3BlblRydXN0IFJvb3QgQ0EgRzEwggIiMA0GCSqGSIb3DQEB
-AQUAA4ICDwAwggIKAoICAQD4eUbalsUwXopxAy1wpLuwxQjczeY1wICkES3d5oeuXT2R0odsN7fa
-Yp6bwiTXj/HbpqbfRm9RpnHLPhsxZ2L3EVs0J9V5ToybWL0iEA1cJwzdMOWo010hOHQX/uMftk87
-ay3bfWAfjH1MBcLrARYVmBSO0ZB3Ij/swjm4eTrwSSTilZHcYTSSjFR077F9jAHiOH3BX2pfJLKO
-YheteSCtqx234LSWSE9mQxAGFiQD4eCcjsZGT44ameGPuY4zbGneWK2gDqdkVBFpRGZPTBKnjix9
-xNRbxQA0MMHZmf4yzgeEtE7NCv82TWLxp2NX5Ntqp66/K7nJ5rInieV+mhxNaMbBGN4zK1FGSxyO
-9z0M+Yo0FMT7MzUj8czxKselu7Cizv5Ta01BG2Yospb6p64KTrk5M0ScdMGTHPjgniQlQ/GbI4Kq
-3ywgsNw2TgOzfALU5nsaqocTvz6hdLubDuHAk5/XpGbKuxs74zD0M1mKB3IDVedzagMxbm+WG+Oi
-n6+Sx+31QrclTDsTBM8clq8cIqPQqwWyTBIjUtz9GVsnnB47ev1CI9sjgBPwvFEVVJSmdz7QdFG9
-URQIOTfLHzSpMJ1ShC5VkLG631UAC9hWLbFJSXKAqWLXwPYYEQRVzXR7z2FwefR7LFxckvzluFqr
-TJOVoSfupb7PcSNCupt2LQIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
-/zAdBgNVHQ4EFgQUl0YhVyE12jZVx/PxN3DlCPaTKbYwHwYDVR0jBBgwFoAUl0YhVyE12jZVx/Px
-N3DlCPaTKbYwDQYJKoZIhvcNAQELBQADggIBAB3dAmB84DWn5ph76kTOZ0BP8pNuZtQ5iSas000E
-PLuHIT839HEl2ku6q5aCgZG27dmxpGWX4m9kWaSW7mDKHyP7Rbr/jyTwyqkxf3kfgLMtMrpkZ2Cv
-uVnN35pJ06iCsfmYlIrM4LvgBBuZYLFGZdwIorJGnkSI6pN+VxbSFXJfLkur1J1juONI5f6ELlgK
-n0Md/rcYkoZDSw6cMoYsYPXpSOqV7XAp8dUv/TW0V8/bhUiZucJvbI/NeJWsZCj9VrDDb8O+WVLh
-X4SPgPL0DTatdrOjteFkdjpY3H1PXlZs5VVZV6Xf8YpmMIzUUmI4d7S+KNfKNsSbBfD4Fdvb8e80
-nR14SohWZ25g/4/Ii+GOvUKpMwpZQhISKvqxnUOOBZuZ2mKtVzazHbYNeS2WuOvyDEsMpZTGMKcm
-GS3tTAZQMPH9WD25SxdfGbRqhFS0OE85og2WaMMolP3tLR9Ka0OWLpABEPs4poEL0L9109S5zvE/
-bw4cHjdx5RiHdRk/ULlepEU0rbDK5uUTdg8xFKmOLZTW1YVNcxVPS/KyPu1svf0OnWZzsD2097+o
-4BGkxK51CUpjAEggpsadCwmKtODmzj7HPiY46SvepghJAwSQiumPv+i2tCqjI40cHLI5kqiPAlxA
-OXXUc0ECd97N4EOH1uS6SsNsEn/+KuYj1oxx
------END CERTIFICATE-----
-
-OpenTrust Root CA G2
-====================
------BEGIN CERTIFICATE-----
-MIIFbzCCA1egAwIBAgISESChaRu/vbm9UpaPI+hIvyYRMA0GCSqGSIb3DQEBDQUAMEAxCzAJBgNV
-BAYTAkZSMRIwEAYDVQQKDAlPcGVuVHJ1c3QxHTAbBgNVBAMMFE9wZW5UcnVzdCBSb290IENBIEcy
-MB4XDTE0MDUyNjAwMDAwMFoXDTM4MDExNTAwMDAwMFowQDELMAkGA1UEBhMCRlIxEjAQBgNVBAoM
-CU9wZW5UcnVzdDEdMBsGA1UEAwwUT3BlblRydXN0IFJvb3QgQ0EgRzIwggIiMA0GCSqGSIb3DQEB
-AQUAA4ICDwAwggIKAoICAQDMtlelM5QQgTJT32F+D3Y5z1zCU3UdSXqWON2ic2rxb95eolq5cSG+
-Ntmh/LzubKh8NBpxGuga2F8ORAbtp+Dz0mEL4DKiltE48MLaARf85KxP6O6JHnSrT78eCbY2albz
-4e6WiWYkBuTNQjpK3eCasMSCRbP+yatcfD7J6xcvDH1urqWPyKwlCm/61UWY0jUJ9gNDlP7ZvyCV
-eYCYitmJNbtRG6Q3ffyZO6v/v6wNj0OxmXsWEH4db0fEFY8ElggGQgT4hNYdvJGmQr5J1WqIP7wt
-UdGejeBSzFfdNTVY27SPJIjki9/ca1TSgSuyzpJLHB9G+h3Ykst2Z7UJmQnlrBcUVXDGPKBWCgOz
-3GIZ38i1MH/1PCZ1Eb3XG7OHngevZXHloM8apwkQHZOJZlvoPGIytbU6bumFAYueQ4xncyhZW+vj
-3CzMpSZyYhK05pyDRPZRpOLAeiRXyg6lPzq1O4vldu5w5pLeFlwoW5cZJ5L+epJUzpM5ChaHvGOz
-9bGTXOBut9Dq+WIyiET7vycotjCVXRIouZW+j1MY5aIYFuJWpLIsEPUdN6b4t/bQWVyJ98LVtZR0
-0dX+G7bw5tYee9I8y6jj9RjzIR9u701oBnstXW5DiabA+aC/gh7PU3+06yzbXfZqfUAkBXKJOAGT
-y3HCOV0GEfZvePg3DTmEJwIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
-/zAdBgNVHQ4EFgQUajn6QiL35okATV59M4PLuG53hq8wHwYDVR0jBBgwFoAUajn6QiL35okATV59
-M4PLuG53hq8wDQYJKoZIhvcNAQENBQADggIBAJjLq0A85TMCl38th6aP1F5Kr7ge57tx+4BkJamz
-Gj5oXScmp7oq4fBXgwpkTx4idBvpkF/wrM//T2h6OKQQbA2xx6R3gBi2oihEdqc0nXGEL8pZ0keI
-mUEiyTCYYW49qKgFbdEfwFFEVn8nNQLdXpgKQuswv42hm1GqO+qTRmTFAHneIWv2V6CG1wZy7HBG
-S4tz3aAhdT7cHcCP009zHIXZ/n9iyJVvttN7jLpTwm+bREx50B1ws9efAvSyB7DH5fitIw6mVskp
-EndI2S9G/Tvw/HRwkqWOOAgfZDC2t0v7NqwQjqBSM2OdAzVWxWm9xiNaJ5T2pBL4LTM8oValX9YZ
-6e18CL13zSdkzJTaTkZQh+D5wVOAHrut+0dSixv9ovneDiK3PTNZbNTe9ZUGMg1RGUFcPk8G97kr
-gCf2o6p6fAbhQ8MTOWIaNr3gKC6UAuQpLmBVrkA9sHSSXvAgZJY/X0VdiLWK2gKgW0VU3jg9CcCo
-SmVGFvyqv1ROTVu+OEO3KMqLM6oaJbolXCkvW0pujOotnCr2BXbgd5eAiN1nE28daCSLT7d0geX0
-YJ96Vdc+N9oWaz53rK4YcJUIeSkDiv7BO7M/Gg+kO14fWKGVyasvc0rQLW6aWQ9VGHgtPFGml4vm
-u7JwqkwR3v98KzfUetF3NI/n+UL3PIEMS1IK
------END CERTIFICATE-----
-
-OpenTrust Root CA G3
-====================
------BEGIN CERTIFICATE-----
-MIICITCCAaagAwIBAgISESDm+Ez8JLC+BUCs2oMbNGA/MAoGCCqGSM49BAMDMEAxCzAJBgNVBAYT
-AkZSMRIwEAYDVQQKDAlPcGVuVHJ1c3QxHTAbBgNVBAMMFE9wZW5UcnVzdCBSb290IENBIEczMB4X
-DTE0MDUyNjAwMDAwMFoXDTM4MDExNTAwMDAwMFowQDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCU9w
-ZW5UcnVzdDEdMBsGA1UEAwwUT3BlblRydXN0IFJvb3QgQ0EgRzMwdjAQBgcqhkjOPQIBBgUrgQQA
-IgNiAARK7liuTcpm3gY6oxH84Bjwbhy6LTAMidnW7ptzg6kjFYwvWYpa3RTqnVkrQ7cG7DK2uu5B
-ta1doYXM6h0UZqNnfkbilPPntlahFVmhTzeXuSIevRHr9LIfXsMUmuXZl5mjYzBhMA4GA1UdDwEB
-/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRHd8MUi2I5DMlv4VBN0BBY3JWIbTAf
-BgNVHSMEGDAWgBRHd8MUi2I5DMlv4VBN0BBY3JWIbTAKBggqhkjOPQQDAwNpADBmAjEAj6jcnboM
-BBf6Fek9LykBl7+BFjNAk2z8+e2AcG+qj9uEwov1NcoG3GRvaBbhj5G5AjEA2Euly8LQCGzpGPta
-3U1fJAuwACEl74+nBCZx4nxp5V2a+EEfOzmTk51V6s2N8fvB
------END CERTIFICATE-----
-
 ISRG Root X1
 ============
 -----BEGIN CERTIFICATE-----
@@ -3644,3 +2930,547 @@ lNhOT8NrF7f3cuitZjO1JVOr4PhMqZ398g26rrnZqsZr+ZO7rqu4lzwDGrpDxpa5RXI4s6ehlj2R
 e37AIVNMh+3yC1SVUZPVIqUNivGTDj5UDrDYyU7c8jEyVupk+eq1nRZmQnLzf9OxMUP8pI4X8W0j
 q5Rm+K37DwhuJi1/FwcJsoz7UMCflo3Ptv0AnVoUmr8CRPXBwp8iXqIPoeM=
 -----END CERTIFICATE-----
+
+GDCA TrustAUTH R5 ROOT
+======================
+-----BEGIN CERTIFICATE-----
+MIIFiDCCA3CgAwIBAgIIfQmX/vBH6nowDQYJKoZIhvcNAQELBQAwYjELMAkGA1UEBhMCQ04xMjAw
+BgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZIENPLixMVEQuMR8wHQYDVQQD
+DBZHRENBIFRydXN0QVVUSCBSNSBST09UMB4XDTE0MTEyNjA1MTMxNVoXDTQwMTIzMTE1NTk1OVow
+YjELMAkGA1UEBhMCQ04xMjAwBgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZ
+IENPLixMVEQuMR8wHQYDVQQDDBZHRENBIFRydXN0QVVUSCBSNSBST09UMIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEA2aMW8Mh0dHeb7zMNOwZ+Vfy1YI92hhJCfVZmPoiC7XJjDp6L3TQs
+AlFRwxn9WVSEyfFrs0yw6ehGXTjGoqcuEVe6ghWinI9tsJlKCvLriXBjTnnEt1u9ol2x8kECK62p
+OqPseQrsXzrj/e+APK00mxqriCZ7VqKChh/rNYmDf1+uKU49tm7srsHwJ5uu4/Ts765/94Y9cnrr
+pftZTqfrlYwiOXnhLQiPzLyRuEH3FMEjqcOtmkVEs7LXLM3GKeJQEK5cy4KOFxg2fZfmiJqwTTQJ
+9Cy5WmYqsBebnh52nUpmMUHfP/vFBu8btn4aRjb3ZGM74zkYI+dndRTVdVeSN72+ahsmUPI2JgaQ
+xXABZG12ZuGR224HwGGALrIuL4xwp9E7PLOR5G62xDtw8mySlwnNR30YwPO7ng/Wi64HtloPzgsM
+R6flPri9fcebNaBhlzpBdRfMK5Z3KpIhHtmVdiBnaM8Nvd/WHwlqmuLMc3GkL30SgLdTMEZeS1SZ
+D2fJpcjyIMGC7J0R38IC+xo70e0gmu9lZJIQDSri3nDxGGeCjGHeuLzRL5z7D9Ar7Rt2ueQ5Vfj4
+oR24qoAATILnsn8JuLwwoC8N9VKejveSswoAHQBUlwbgsQfZxw9cZX08bVlX5O2ljelAU58VS6Bx
+9hoh49pwBiFYFIeFd3mqgnkCAwEAAaNCMEAwHQYDVR0OBBYEFOLJQJ9NzuiaoXzPDj9lxSmIahlR
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQDRSVfg
+p8xoWLoBDysZzY2wYUWsEe1jUGn4H3++Fo/9nesLqjJHdtJnJO29fDMylyrHBYZmDRd9FBUb1Ov9
+H5r2XpdptxolpAqzkT9fNqyL7FeoPueBihhXOYV0GkLH6VsTX4/5COmSdI31R9KrO9b7eGZONn35
+6ZLpBN79SWP8bfsUcZNnL0dKt7n/HipzcEYwv1ryL3ml4Y0M2fmyYzeMN2WFcGpcWwlyua1jPLHd
++PwyvzeG5LuOmCd+uh8W4XAR8gPfJWIyJyYYMoSf/wA6E7qaTfRPuBRwIrHKK5DOKcFw9C+df/KQ
+HtZa37dG/OaG+svgIHZ6uqbL9XzeYqWxi+7egmaKTjowHz+Ay60nugxe19CxVsp3cbK1daFQqUBD
+F8Io2c9Si1vIY9RCPqAzekYu9wogRlR+ak8x8YF+QnQ4ZXMn7sZ8uI7XpTrXmKGcjBBV09tL7ECQ
+8s1uV9JiDnxXk7Gnbc2dg7sq5+W2O3FYrf3RRbxake5TFW/TRQl1brqQXR4EzzffHqhmsYzmIGrv
+/EhOdJhCrylvLmrH+33RZjEizIYAfmaDDEL0vTSSwxrqT8p+ck0LcIymSLumoRT2+1hEmRSuqguT
+aaApJUqlyyvdimYHFngVV3Eb7PVHhPOeMTd61X8kreS8/f3MboPoDKi3QWwH3b08hpcv0g==
+-----END CERTIFICATE-----
+
+TrustCor RootCert CA-1
+======================
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIJANqb7HHzA7AZMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYDVQQGEwJQQTEP
+MA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3Ig
+U3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+dHkxHzAdBgNVBAMMFlRydXN0Q29yIFJvb3RDZXJ0IENBLTEwHhcNMTYwMjA0MTIzMjE2WhcNMjkx
+MjMxMTcyMzE2WjCBpDELMAkGA1UEBhMCUEExDzANBgNVBAgMBlBhbmFtYTEUMBIGA1UEBwwLUGFu
+YW1hIENpdHkxJDAiBgNVBAoMG1RydXN0Q29yIFN5c3RlbXMgUy4gZGUgUi5MLjEnMCUGA1UECwwe
+VHJ1c3RDb3IgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MR8wHQYDVQQDDBZUcnVzdENvciBSb290Q2Vy
+dCBDQS0xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv463leLCJhJrMxnHQFgKq1mq
+jQCj/IDHUHuO1CAmujIS2CNUSSUQIpidRtLByZ5OGy4sDjjzGiVoHKZaBeYei0i/mJZ0PmnK6bV4
+pQa81QBeCQryJ3pS/C3Vseq0iWEk8xoT26nPUu0MJLq5nux+AHT6k61sKZKuUbS701e/s/OojZz0
+JEsq1pme9J7+wH5COucLlVPat2gOkEz7cD+PSiyU8ybdY2mplNgQTsVHCJCZGxdNuWxu72CVEY4h
+gLW9oHPY0LJ3xEXqWib7ZnZ2+AYfYW0PVcWDtxBWcgYHpfOxGgMFZA6dWorWhnAbJN7+KIor0Gqw
+/Hqi3LJ5DotlDwIDAQABo2MwYTAdBgNVHQ4EFgQU7mtJPHo/DeOxCbeKyKsZn3MzUOcwHwYDVR0j
+BBgwFoAU7mtJPHo/DeOxCbeKyKsZn3MzUOcwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AYYwDQYJKoZIhvcNAQELBQADggEBACUY1JGPE+6PHh0RU9otRCkZoB5rMZ5NDp6tPVxBb5UrJKF5
+mDo4Nvu7Zp5I/5CQ7z3UuJu0h3U/IJvOcs+hVcFNZKIZBqEHMwwLKeXx6quj7LUKdJDHfXLy11yf
+ke+Ri7fc7Waiz45mO7yfOgLgJ90WmMCV1Aqk5IGadZQ1nJBfiDcGrVmVCrDRZ9MZyonnMlo2HD6C
+qFqTvsbQZJG2z9m2GM/bftJlo6bEjhcxwft+dtvTheNYsnd6djtsL1Ac59v2Z3kf9YKVmgenFK+P
+3CghZwnS1k1aHBkcjndcw5QkPTJrS37UeJSDvjdNzl/HHk484IkzlQsPpTLWPFp5LBk=
+-----END CERTIFICATE-----
+
+TrustCor RootCert CA-2
+======================
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+TrustCor ECA-1
+==============
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIJAISCLF8cYtBAMA0GCSqGSIb3DQEBCwUAMIGcMQswCQYDVQQGEwJQQTEP
+MA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3Ig
+U3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+dHkxFzAVBgNVBAMMDlRydXN0Q29yIEVDQS0xMB4XDTE2MDIwNDEyMzIzM1oXDTI5MTIzMTE3Mjgw
+N1owgZwxCzAJBgNVBAYTAlBBMQ8wDQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5
+MSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRydXN0Q29y
+IENlcnRpZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOVHJ1c3RDb3IgRUNBLTEwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPj+ARtZ+odnbb3w9U73NjKYKtR8aja+3+XzP4Q1HpGjOR
+MRegdMTUpwHmspI+ap3tDvl0mEDTPwOABoJA6LHip1GnHYMma6ve+heRK9jGrB6xnhkB1Zem6g23
+xFUfJ3zSCNV2HykVh0A53ThFEXXQmqc04L/NyFIduUd+Dbi7xgz2c1cWWn5DkR9VOsZtRASqnKmc
+p0yJF4OuowReUoCLHhIlERnXDH19MURB6tuvsBzvgdAsxZohmz3tQjtQJvLsznFhBmIhVE5/wZ0+
+fyCMgMsq2JdiyIMzkX2woloPV+g7zPIlstR8L+xNxqE6FXrntl019fZISjZFZtS6mFjBAgMBAAGj
+YzBhMB0GA1UdDgQWBBREnkj1zG1I1KBLf/5ZJC+Dl5mahjAfBgNVHSMEGDAWgBREnkj1zG1I1KBL
+f/5ZJC+Dl5mahjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsF
+AAOCAQEABT41XBVwm8nHc2FvcivUwo/yQ10CzsSUuZQRg2dd4mdsdXa/uwyqNsatR5Nj3B5+1t4u
+/ukZMjgDfxT2AHMsWbEhBuH7rBiVDKP/mZb3Kyeb1STMHd3BOuCYRLDE5D53sXOpZCz2HAF8P11F
+hcCF5yWPldwX8zyfGm6wyuMdKulMY/okYWLW2n62HGz1Ah3UKt1VkOsqEUc8Ll50soIipX1TH0Xs
+J5F95yIW6MBoNtjG8U+ARDL54dHRHareqKucBK+tIA5kmE2la8BIWJZpTdwHjFGTot+fDz2LYLSC
+jaoITmJF4PkL0uDgPFveXHEnJcLmA4GLEFPjx1WitJ/X5g==
+-----END CERTIFICATE-----
+
+SSL.com Root Certification Authority RSA
+========================================
+-----BEGIN CERTIFICATE-----
+MIIF3TCCA8WgAwIBAgIIeyyb0xaAMpkwDQYJKoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVVMxDjAM
+BgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24x
+MTAvBgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBSU0EwHhcNMTYw
+MjEyMTczOTM5WhcNNDEwMjEyMTczOTM5WjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMx
+EDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NM
+LmNvbSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFJTQTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAPkP3aMrfcvQKv7sZ4Wm5y4bunfh4/WvpOz6Sl2RxFdHaxh3a3by/ZPkPQ/C
+Fp4LZsNWlJ4Xg4XOVu/yFv0AYvUiCVToZRdOQbngT0aXqhvIuG5iXmmxX9sqAn78bMrzQdjt0Oj8
+P2FI7bADFB0QDksZ4LtO7IZl/zbzXmcCC52GVWH9ejjt/uIZALdvoVBidXQ8oPrIJZK0bnoix/ge
+oeOy3ZExqysdBP+lSgQ36YWkMyv94tZVNHwZpEpox7Ko07fKoZOI68GXvIz5HdkihCR0xwQ9aqkp
+k8zruFvh/l8lqjRYyMEjVJ0bmBHDOJx+PYZspQ9AhnwC9FwCTyjLrnGfDzrIM/4RJTXq/LrFYD3Z
+fBjVsqnTdXgDciLKOsMf7yzlLqn6niy2UUb9rwPW6mBo6oUWNmuF6R7As93EJNyAKoFBbZQ+yODJ
+gUEAnl6/f8UImKIYLEJAs/lvOCdLToD0PYFH4Ih86hzOtXVcUS4cK38acijnALXRdMbX5J+tB5O2
+UzU1/Dfkw/ZdFr4hc96SCvigY2q8lpJqPvi8ZVWb3vUNiSYE/CUapiVpy8JtynziWV+XrOvvLsi8
+1xtZPCvM8hnIk2snYxnP/Okm+Mpxm3+T/jRnhE6Z6/yzeAkzcLpmpnbtG3PrGqUNxCITIJRWCk4s
+bE6x/c+cCbqiM+2HAgMBAAGjYzBhMB0GA1UdDgQWBBTdBAkHovV6fVJTEpKV7jiAJQ2mWTAPBgNV
+HRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFN0ECQei9Xp9UlMSkpXuOIAlDaZZMA4GA1UdDwEB/wQE
+AwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAIBgRlCn7Jp0cHh5wYfGVcpNxJK1ok1iOMq8bs3AD/CUr
+dIWQPXhq9LmLpZc7tRiRux6n+UBbkflVma8eEdBcHadm47GUBwwyOabqG7B52B2ccETjit3E+ZUf
+ijhDPwGFpUenPUayvOUiaPd7nNgsPgohyC0zrL/FgZkxdMF1ccW+sfAjRfSda/wZY52jvATGGAsl
+u1OJD7OAUN5F7kR/q5R4ZJjT9ijdh9hwZXT7DrkT66cPYakylszeu+1jTBi7qUD3oFRuIIhxdRjq
+erQ0cuAjJ3dctpDqhiVAq+8zD8ufgr6iIPv2tS0a5sKFsXQP+8hlAqRSAUfdSSLBv9jra6x+3uxj
+MxW3IwiPxg+NQVrdjsW5j+VFP3jbutIbQLH+cU0/4IGiul607BXgk90IH37hVZkLId6Tngr75qNJ
+vTYw/ud3sqB1l7UtgYgXZSD32pAAn8lSzDLKNXz1PQ/YK9f1JmzJBjSWFupwWRoyeXkLtoh/D1JI
+Pb9s2KJELtFOt3JY04kTlf5Eq/jXixtunLwsoFvVagCvXzfh1foQC5ichucmj87w7G6KVwuA406y
+wKBjYZC6VWg3dGq2ktufoYYitmUnDuy2n0Jg5GfCtdpBC8TTi2EbvPofkSvXRAdeuims2cXp71NI
+WuuA8ShYIc2wBlX7Jz9TkHCpBB5XJ7k=
+-----END CERTIFICATE-----
+
+SSL.com Root Certification Authority ECC
+========================================
+-----BEGIN CERTIFICATE-----
+MIICjTCCAhSgAwIBAgIIdebfy8FoW6gwCgYIKoZIzj0EAwIwfDELMAkGA1UEBhMCVVMxDjAMBgNV
+BAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xMTAv
+BgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYwMjEy
+MTgxNDAzWhcNNDEwMjEyMTgxNDAzWjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAO
+BgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NMLmNv
+bSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuBBAAiA2IA
+BEVuqVDEpiM2nl8ojRfLliJkP9x6jh3MCLOicSS6jkm5BBtHllirLZXI7Z4INcgn64mMU1jrYor+
+8FsPazFSY0E7ic3s7LaNGdM0B9y7xgZ/wkWV7Mt/qCPgCemB+vNH06NjMGEwHQYDVR0OBBYEFILR
+hXMw5zUE044CkvvlpNHEIejNMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUgtGFczDnNQTT
+jgKS++Wk0cQh6M0wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2cAMGQCMG/n61kRpGDPYbCW
+e+0F+S8Tkdzt5fxQaxFGRrMcIQBiu77D5+jNB5n5DQtdcj7EqgIwH7y6C+IwJPt8bYBVCpk+gA0z
+5Wajs6O7pdWLjwkspl1+4vAHCGht0nxpbl/f5Wpl
+-----END CERTIFICATE-----
+
+SSL.com EV Root Certification Authority RSA R2
+==============================================
+-----BEGIN CERTIFICATE-----
+MIIF6zCCA9OgAwIBAgIIVrYpzTS8ePYwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNVBAYTAlVTMQ4w
+DAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9u
+MTcwNQYDVQQDDC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIy
+MB4XDTE3MDUzMTE4MTQzN1oXDTQyMDUzMDE4MTQzN1owgYIxCzAJBgNVBAYTAlVTMQ4wDAYDVQQI
+DAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMTcwNQYD
+VQQDDC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIyMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjzZlQOHWTcDXtOlG2mvqM0fNTPl9fb69LT3w23jh
+hqXZuglXaO1XPqDQCEGD5yhBJB/jchXQARr7XnAjssufOePPxU7Gkm0mxnu7s9onnQqG6YE3Bf7w
+cXHswxzpY6IXFJ3vG2fThVUCAtZJycxa4bH3bzKfydQ7iEGonL3Lq9ttewkfokxykNorCPzPPFTO
+Zw+oz12WGQvE43LrrdF9HSfvkusQv1vrO6/PgN3B0pYEW3p+pKk8OHakYo6gOV7qd89dAFmPZiw+
+B6KjBSYRaZfqhbcPlgtLyEDhULouisv3D5oi53+aNxPN8k0TayHRwMwi8qFG9kRpnMphNQcAb9Zh
+CBHqurj26bNg5U257J8UZslXWNvNh2n4ioYSA0e/ZhN2rHd9NCSFg83XqpyQGp8hLH94t2S42Oim
+9HizVcuE0jLEeK6jj2HdzghTreyI/BXkmg3mnxp3zkyPuBQVPWKchjgGAGYS5Fl2WlPAApiiECto
+RHuOec4zSnaqW4EWG7WK2NAAe15itAnWhmMOpgWVSbooi4iTsjQc2KRVbrcc0N6ZVTsj9CLg+Slm
+JuwgUHfbSguPvuUCYHBBXtSuUDkiFCbLsjtzdFVHB3mBOagwE0TlBIqulhMlQg+5U8Sb/M3kHN48
++qvWBkofZ6aYMBzdLNvcGJVXZsb/XItW9XcCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNV
+HSMEGDAWgBT5YLvU49U09rj1BoAlp3PbRmmonjAdBgNVHQ4EFgQU+WC71OPVNPa49QaAJadz20Zp
+qJ4wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQBWs47LCp1Jjr+kxJG7ZhcFUZh1
+++VQLHqe8RT6q9OKPv+RKY9ji9i0qVQBDb6Thi/5Sm3HXvVX+cpVHBK+Rw82xd9qt9t1wkclf7nx
+Y/hoLVUE0fKNsKTPvDxeH3jnpaAgcLAExbf3cqfeIg29MyVGjGSSJuM+LmOW2puMPfgYCdcDzH2G
+guDKBAdRUNf/ktUM79qGn5nX67evaOI5JpS6aLe/g9Pqemc9YmeuJeVy6OLk7K4S9ksrPJ/psEDz
+OFSz/bdoyNrGj1E8svuR3Bznm53htw1yj+KkxKl4+esUrMZDBcJlOSgYAsOCsp0FvmXtll9ldDz7
+CTUue5wT/RsPXcdtgTpWD8w74a8CLyKsRspGPKAcTNZEtF4uXBVmCeEmKf7GUmG6sXP/wwyc5Wxq
+lD8UykAWlYTzWamsX0xhk23RO8yilQwipmdnRC652dKKQbNmC1r7fSOl8hqw/96bg5Qu0T/fkreR
+rwU7ZcegbLHNYhLDkBvjJc40vG93drEQw/cFGsDWr3RiSBd3kmmQYRzelYB0VI8YHMPzA9C/pEN1
+hlMYegouCRw2n5H9gooiS9EOUCXdywMMF8mDAAhONU2Ki+3wApRmLER/y5UnlhetCTCstnEXbosX
+9hwJ1C07mKVx01QT2WDz9UtmT/rx7iASjbSsV7FFY6GsdqnC+w==
+-----END CERTIFICATE-----
+
+SSL.com EV Root Certification Authority ECC
+===========================================
+-----BEGIN CERTIFICATE-----
+MIIClDCCAhqgAwIBAgIILCmcWxbtBZUwCgYIKoZIzj0EAwIwfzELMAkGA1UEBhMCVVMxDjAMBgNV
+BAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xNDAy
+BgNVBAMMK1NTTC5jb20gRVYgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYw
+MjEyMTgxNTIzWhcNNDEwMjEyMTgxNTIzWjB/MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMx
+EDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjE0MDIGA1UEAwwrU1NM
+LmNvbSBFViBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuB
+BAAiA2IABKoSR5CYG/vvw0AHgyBO8TCCogbR8pKGYfL2IWjKAMTH6kMAVIbc/R/fALhBYlzccBYy
+3h+Z1MzFB8gIH2EWB1E9fVwHU+M1OIzfzZ/ZLg1KthkuWnBaBu2+8KGwytAJKaNjMGEwHQYDVR0O
+BBYEFFvKXuXe0oGqzagtZFG22XKbl+ZPMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUW8pe
+5d7SgarNqC1kUbbZcpuX5k8wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2gAMGUCMQCK5kCJ
+N+vp1RPZytRrJPOwPYdGWBrssd9v+1a6cGvHOMzosYxPD/fxZ3YOg9AeUY8CMD32IygmTMZgh5Mm
+m7I1HrrW9zzRHM76JTymGoEVW/MSD2zuZYrJh6j5B+BimoxcSg==
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R6
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFgzCCA2ugAwIBAgIORea7A4Mzw4VlSOb/RVEwDQYJKoZIhvcNAQEMBQAwTDEgMB4GA1UECxMX
+R2xvYmFsU2lnbiBSb290IENBIC0gUjYxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkds
+b2JhbFNpZ24wHhcNMTQxMjEwMDAwMDAwWhcNMzQxMjEwMDAwMDAwWjBMMSAwHgYDVQQLExdHbG9i
+YWxTaWduIFJvb3QgQ0EgLSBSNjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFs
+U2lnbjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJUH6HPKZvnsFMp7PPcNCPG0RQss
+grRIxutbPK6DuEGSMxSkb3/pKszGsIhrxbaJ0cay/xTOURQh7ErdG1rG1ofuTToVBu1kZguSgMpE
+3nOUTvOniX9PeGMIyBJQbUJmL025eShNUhqKGoC3GYEOfsSKvGRMIRxDaNc9PIrFsmbVkJq3MQbF
+vuJtMgamHvm566qjuL++gmNQ0PAYid/kD3n16qIfKtJwLnvnvJO7bVPiSHyMEAc4/2ayd2F+4OqM
+PKq0pPbzlUoSB239jLKJz9CgYXfIWHSw1CM69106yqLbnQneXUQtkPGBzVeS+n68UARjNN9rkxi+
+azayOeSsJDa38O+2HBNXk7besvjihbdzorg1qkXy4J02oW9UivFyVm4uiMVRQkQVlO6jxTiWm05O
+WgtH8wY2SXcwvHE35absIQh1/OZhFj931dmRl4QKbNQCTXTAFO39OfuD8l4UoQSwC+n+7o/hbguy
+CLNhZglqsQY6ZZZZwPA1/cnaKI0aEYdwgQqomnUdnjqGBQCe24DWJfncBZ4nWUx2OVvq+aWh2IMP
+0f/fMBH5hc8zSPXKbWQULHpYT9NLCEnFlWQaYw55PfWzjMpYrZxCRXluDocZXFSxZba/jJvcE+kN
+b7gu3GduyYsRtYQUigAZcIN5kZeR1BonvzceMgfYFGM8KEyvAgMBAAGjYzBhMA4GA1UdDwEB/wQE
+AwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSubAWjkxPioufi1xzWx/B/yGdToDAfBgNV
+HSMEGDAWgBSubAWjkxPioufi1xzWx/B/yGdToDANBgkqhkiG9w0BAQwFAAOCAgEAgyXt6NH9lVLN
+nsAEoJFp5lzQhN7craJP6Ed41mWYqVuoPId8AorRbrcWc+ZfwFSY1XS+wc3iEZGtIxg93eFyRJa0
+lV7Ae46ZeBZDE1ZXs6KzO7V33EByrKPrmzU+sQghoefEQzd5Mr6155wsTLxDKZmOMNOsIeDjHfrY
+BzN2VAAiKrlNIC5waNrlU/yDXNOd8v9EDERm8tLjvUYAGm0CuiVdjaExUd1URhxN25mW7xocBFym
+Fe944Hn+Xds+qkxV/ZoVqW/hpvvfcDDpw+5CRu3CkwWJ+n1jez/QcYF8AOiYrg54NMMl+68KnyBr
+3TsTjxKM4kEaSHpzoHdpx7Zcf4LIHv5YGygrqGytXm3ABdJ7t+uA/iU3/gKbaKxCXcPu9czc8FB1
+0jZpnOZ7BN9uBmm23goJSFmH63sUYHpkqmlD75HHTOwY3WzvUy2MmeFe8nI+z1TIvWfspA9MRf/T
+uTAjB0yPEL+GltmZWrSZVxykzLsViVO6LAUP5MSeGbEYNNVMnbrt9x+vJJUEeKgDu+6B5dpffItK
+oZB0JaezPkvILFa9x8jvOOJckvB595yEunQtYQEgfn7R8k8HWV+LLUNS60YMlOH1Zkd5d9VUWx+t
+JDfLRVpOoERIyNiwmcUVhAn21klJwGW45hpxbqCo8YLoRT5s1gLXCmeDBVrJpBA=
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GC CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIICaTCCAe+gAwIBAgIQISpWDK7aDKtARb8roi066jAKBggqhkjOPQQDAzBtMQswCQYDVQQGEwJD
+SDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEo
+MCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQyBDQTAeFw0xNzA1MDkwOTQ4MzRa
+Fw00MjA1MDkwOTU4MzNaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYDVQQL
+ExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEdsb2Jh
+bCBSb290IEdDIENBMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAETOlQwMYPchi82PG6s4nieUqjFqdr
+VCTbUf/q9Akkwwsin8tqJ4KBDdLArzHkdIJuyiXZjHWd8dvQmqJLIX4Wp2OQ0jnUsYd4XxiWD1Ab
+NTcPasbc2RNNpI6QN+a9WzGRo1QwUjAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
+BgNVHQ4EFgQUSIcUrOPDnpBgOtfKie7TrYy0UGYwEAYJKwYBBAGCNxUBBAMCAQAwCgYIKoZIzj0E
+AwMDaAAwZQIwJsdpW9zV57LnyAyMjMPdeYwbY9XJUpROTYJKcx6ygISpJcBMWm1JKWB4E+J+SOtk
+AjEA2zQgMgj/mkkCtojeFK9dbJlxjRo/i9fgojaGHAeCOnZT/cKi7e97sIBPWA9LUzm9
+-----END CERTIFICATE-----
+
+GTS Root R1
+===========
+-----BEGIN CERTIFICATE-----
+MIIFWjCCA0KgAwIBAgIQbkepxUtHDA3sM9CJuRz04TANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQG
+EwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJv
+b3QgUjEwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAG
+A1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjEwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2EQKLHuOhd5s73L+UPreVp0A8of2C+X0yBoJx
+9vaMf/vo27xqLpeXo4xL+Sv2sfnOhB2x+cWX3u+58qPpvBKJXqeqUqv4IyfLpLGcY9vXmX7wCl7r
+aKb0xlpHDU0QM+NOsROjyBhsS+z8CZDfnWQpJSMHobTSPS5g4M/SCYe7zUjwTcLCeoiKu7rPWRnW
+r4+wB7CeMfGCwcDfLqZtbBkOtdh+JhpFAz2weaSUKK0PfyblqAj+lug8aJRT7oM6iCsVlgmy4HqM
+LnXWnOunVmSPlk9orj2XwoSPwLxAwAtcvfaHszVsrBhQf4TgTM2S0yDpM7xSma8ytSmzJSq0SPly
+4cpk9+aCEI3oncKKiPo4Zor8Y/kB+Xj9e1x3+naH+uzfsQ55lVe0vSbv1gHR6xYKu44LtcXFilWr
+06zqkUspzBmkMiVOKvFlRNACzqrOSbTqn3yDsEB750Orp2yjj32JgfpMpf/VjsPOS+C12LOORc92
+wO1AK/1TD7Cn1TsNsYqiA94xrcx36m97PtbfkSIS5r762DL8EGMUUXLeXdYWk70paDPvOmbsB4om
+3xPXV2V4J95eSRQAogB/mqghtqmxlbCluQ0WEdrHbEg8QOB+DVrNVjzRlwW5y0vtOUucxD/SVRNu
+JLDWcfr0wbrM7Rv1/oFB2ACYPTrIrnqYNxgFlQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU5K8rJnEaK0gnhS9SZizv8IkTcT4wDQYJKoZIhvcNAQEM
+BQADggIBADiWCu49tJYeX++dnAsznyvgyv3SjgofQXSlfKqE1OXyHuY3UjKcC9FhHb8owbZEKTV1
+d5iyfNm9dKyKaOOpMQkpAWBz40d8U6iQSifvS9efk+eCNs6aaAyC58/UEBZvXw6ZXPYfcX3v73sv
+fuo21pdwCxXu11xWajOl40k4DLh9+42FpLFZXvRq4d2h9mREruZRgyFmxhE+885H7pwoHyXa/6xm
+ld01D1zvICxi/ZG6qcz8WpyTgYMpl0p8WnK0OdC3d8t5/Wk6kjftbjhlRn7pYL15iJdfOBL07q9b
+gsiG1eGZbYwE8na6SfZu6W0eX6DvJ4J2QPim01hcDyxC2kLGe4g0x8HYRZvBPsVhHdljUEn2NIVq
+4BjFbkerQUIpm/ZgDdIx02OYI5NaAIFItO/Nis3Jz5nu2Z6qNuFoS3FJFDYoOj0dzpqPJeaAcWEr
+tXvM+SUWgeExX6GjfhaknBZqlxi9dnKlC54dNuYvoS++cJEPqOba+MSSQGwlfnuzCdyyF62ARPBo
+pY+Udf90WuioAnwMCeKpSwughQtiue+hMZL77/ZRBIls6Kl0obsXs7X9SQ98POyDGCBDTtWTurQ0
+sR8WNh8M5mQ5Fkzc4P4dyKliPUDqysU0ArSuiYgzNdwsE3PYJ/HQcu51OyLemGhmW/HGY0dVHLql
+CFF1pkgl
+-----END CERTIFICATE-----
+
+GTS Root R2
+===========
+-----BEGIN CERTIFICATE-----
+MIIFWjCCA0KgAwIBAgIQbkepxlqz5yDFMJo/aFLybzANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQG
+EwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJv
+b3QgUjIwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAG
+A1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjIwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDO3v2m++zsFDQ8BwZabFn3GTXd98GdVarTzTuk
+k3LvCvptnfbwhYBboUhSnznFt+4orO/LdmgUud+tAWyZH8QiHZ/+cnfgLFuv5AS/T3KgGjSY6Dlo
+7JUle3ah5mm5hRm9iYz+re026nO8/4Piy33B0s5Ks40FnotJk9/BW9BuXvAuMC6C/Pq8tBcKSOWI
+m8Wba96wyrQD8Nr0kLhlZPdcTK3ofmZemde4wj7I0BOdre7kRXuJVfeKH2JShBKzwkCX44ofR5Gm
+dFrS+LFjKBC4swm4VndAoiaYecb+3yXuPuWgf9RhD1FLPD+M2uFwdNjCaKH5wQzpoeJ/u1U8dgbu
+ak7MkogwTZq9TwtImoS1mKPV+3PBV2HdKFZ1E66HjucMUQkQdYhMvI35ezzUIkgfKtzra7tEscsz
+cTJGr61K8YzodDqs5xoic4DSMPclQsciOzsSrZYuxsN2B6ogtzVJV+mSSeh2FnIxZyuWfoqjx5RW
+Ir9qS34BIbIjMt/kmkRtWVtd9QCgHJvGeJeNkP+byKq0rxFROV7Z+2et1VsRnTKaG73Vululycsl
+aVNVJ1zgyjbLiGH7HrfQy+4W+9OmTN6SpdTi3/UGVN4unUu0kzCqgc7dGtxRcw1PcOnlthYhGXmy
+5okLdWTK1au8CcEYof/UVKGFPP0UJAOyh9OktwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUu//KjiOfT5nK2+JopqUVJxce2Q4wDQYJKoZIhvcNAQEM
+BQADggIBALZp8KZ3/p7uC4Gt4cCpx/k1HUCCq+YEtN/L9x0Pg/B+E02NjO7jMyLDOfxA325BS0JT
+vhaI8dI4XsRomRyYUpOM52jtG2pzegVATX9lO9ZY8c6DR2Dj/5epnGB3GFW1fgiTz9D2PGcDFWEJ
++YF59exTpJ/JjwGLc8R3dtyDovUMSRqodt6Sm2T4syzFJ9MHwAiApJiS4wGWAqoC7o87xdFtCjMw
+c3i5T1QWvwsHoaRc5svJXISPD+AVdyx+Jn7axEvbpxZ3B7DNdehyQtaVhJ2Gg/LkkM0JR9SLA3Da
+WsYDQvTtN6LwG1BUSw7YhN4ZKJmBR64JGz9I0cNv4rBgF/XuIwKl2gBbbZCr7qLpGzvpx0QnRY5r
+n/WkhLx3+WuXrD5RRaIRpsyF7gpo8j5QOHokYh4XIDdtak23CZvJ/KRY9bb7nE4Yu5UC56Gtmwfu
+Nmsk0jmGwZODUNKBRqhfYlcsu2xkiAhu7xNUX90txGdj08+JN7+dIPT7eoOboB6BAFDC5AwiWVIQ
+7UNWhwD4FFKnHYuTjKJNRn8nxnGbJN7k2oaLDX5rIMHAnuFl2GqjpuiFizoHCBy69Y9Vmhh1fuXs
+gWbRIXOhNUQLgD1bnF5vKheW0YMjiGZt5obicDIvUiLnyOd/xCxgXS/Dr55FBcOEArf9LAhST4Ld
+o/DUhgkC
+-----END CERTIFICATE-----
+
+GTS Root R3
+===========
+-----BEGIN CERTIFICATE-----
+MIICDDCCAZGgAwIBAgIQbkepx2ypcyRAiQ8DVd2NHTAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJV
+UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
+UjMwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
+ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjMwdjAQBgcq
+hkjOPQIBBgUrgQQAIgNiAAQfTzOHMymKoYTey8chWEGJ6ladK0uFxh1MJ7x/JlFyb+Kf1qPKzEUU
+Rout736GjOyxfi//qXGdGIRFBEFVbivqJn+7kAHjSxm65FSWRQmx1WyRRK2EE46ajA2ADDL24Cej
+QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTB8Sa6oC2uhYHP
+0/EqEr24Cmf9vDAKBggqhkjOPQQDAwNpADBmAjEAgFukfCPAlaUs3L6JbyO5o91lAFJekazInXJ0
+glMLfalAvWhgxeG4VDvBNhcl2MG9AjEAnjWSdIUlUfUk7GRSJFClH9voy8l27OyCbvWFGFPouOOa
+KaqW04MjyaR7YbPMAuhd
+-----END CERTIFICATE-----
+
+GTS Root R4
+===========
+-----BEGIN CERTIFICATE-----
+MIICCjCCAZGgAwIBAgIQbkepyIuUtui7OyrYorLBmTAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJV
+UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
+UjQwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
+ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjQwdjAQBgcq
+hkjOPQIBBgUrgQQAIgNiAATzdHOnaItgrkO4NcWBMHtLSZ37wWHO5t5GvWvVYRg1rkDdc/eJkTBa
+6zzuhXyiQHY7qca4R9gq55KRanPpsXI5nymfopjTX15YhmUPoYRlBtHci8nHc8iMai/lxKvRHYqj
+QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSATNbrdP9JNqPV
+2Py1PsVq8JQdjDAKBggqhkjOPQQDAwNnADBkAjBqUFJ0CMRw3J5QdCHojXohw0+WbhXRIjVhLfoI
+N+4Zba3bssx9BzT1YBkstTTZbyACMANxsbqjYAuG7ZoIapVon+Kz4ZNkfF6Tpt95LY2F45TPI11x
+zPKwTdb+mciUqXWi4w==
+-----END CERTIFICATE-----
+
+UCA Global G2 Root
+==================
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIQXd+x2lqj7V2+WmUgZQOQ7zANBgkqhkiG9w0BAQsFADA9MQswCQYDVQQG
+EwJDTjERMA8GA1UECgwIVW5pVHJ1c3QxGzAZBgNVBAMMElVDQSBHbG9iYWwgRzIgUm9vdDAeFw0x
+NjAzMTEwMDAwMDBaFw00MDEyMzEwMDAwMDBaMD0xCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlU
+cnVzdDEbMBkGA1UEAwwSVUNBIEdsb2JhbCBHMiBSb290MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAxeYrb3zvJgUno4Ek2m/LAfmZmqkywiKHYUGRO8vDaBsGxUypK8FnFyIdK+35KYmT
+oni9kmugow2ifsqTs6bRjDXVdfkX9s9FxeV67HeToI8jrg4aA3++1NDtLnurRiNb/yzmVHqUwCoV
+8MmNsHo7JOHXaOIxPAYzRrZUEaalLyJUKlgNAQLx+hVRZ2zA+te2G3/RVogvGjqNO7uCEeBHANBS
+h6v7hn4PJGtAnTRnvI3HLYZveT6OqTwXS3+wmeOwcWDcC/Vkw85DvG1xudLeJ1uK6NjGruFZfc8o
+LTW4lVYa8bJYS7cSN8h8s+1LgOGN+jIjtm+3SJUIsUROhYw6AlQgL9+/V087OpAh18EmNVQg7Mc/
+R+zvWr9LesGtOxdQXGLYD0tK3Cv6brxzks3sx1DoQZbXqX5t2Okdj4q1uViSukqSKwxW/YDrCPBe
+KW4bHAyvj5OJrdu9o54hyokZ7N+1wxrrFv54NkzWbtA+FxyQF2smuvt6L78RHBgOLXMDj6DlNaBa
+4kx1HXHhOThTeEDMg5PXCp6dW4+K5OXgSORIskfNTip1KnvyIvbJvgmRlld6iIis7nCs+dwp4wwc
+OxJORNanTrAmyPPZGpeRaOrvjUYG0lZFWJo8DA+DuAUlwznPO6Q0ibd5Ei9Hxeepl2n8pndntd97
+8XplFeRhVmUCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
+BBYEFIHEjMz15DD/pQwIX4wVZyF0Ad/fMA0GCSqGSIb3DQEBCwUAA4ICAQATZSL1jiutROTL/7lo
+5sOASD0Ee/ojL3rtNtqyzm325p7lX1iPyzcyochltq44PTUbPrw7tgTQvPlJ9Zv3hcU2tsu8+Mg5
+1eRfB70VVJd0ysrtT7q6ZHafgbiERUlMjW+i67HM0cOU2kTC5uLqGOiiHycFutfl1qnN3e92mI0A
+Ds0b+gO3joBYDic/UvuUospeZcnWhNq5NXHzJsBPd+aBJ9J3O5oUb3n09tDh05S60FdRvScFDcH9
+yBIw7m+NESsIndTUv4BFFJqIRNow6rSn4+7vW4LVPtateJLbXDzz2K36uGt/xDYotgIVilQsnLAX
+c47QN6MUPJiVAAwpBVueSUmxX8fjy88nZY41F7dXyDDZQVu5FLbowg+UMaeUmMxq67XhJ/UQqAHo
+jhJi6IjMtX9Gl8CbEGY4GjZGXyJoPd/JxhMnq1MGrKI8hgZlb7F+sSlEmqO6SWkoaY/X5V+tBIZk
+bxqgDMUIYs6Ao9Dz7GjevjPHF1t/gMRMTLGmhIrDO7gJzRSBuhjjVFc2/tsvfEehOjPI+Vg7RE+x
+ygKJBJYoaMVLuCaJu9YzL1DV/pqJuhgyklTGW+Cd+V7lDSKb9triyCGyYiGqhkCyLmTTX8jjfhFn
+RR8F/uOi77Oos/N9j/gMHyIfLXC0uAE0djAA5SN4p1bXUB+K+wb1whnw0A==
+-----END CERTIFICATE-----
+
+UCA Extended Validation Root
+============================
+-----BEGIN CERTIFICATE-----
+MIIFWjCCA0KgAwIBAgIQT9Irj/VkyDOeTzRYZiNwYDANBgkqhkiG9w0BAQsFADBHMQswCQYDVQQG
+EwJDTjERMA8GA1UECgwIVW5pVHJ1c3QxJTAjBgNVBAMMHFVDQSBFeHRlbmRlZCBWYWxpZGF0aW9u
+IFJvb3QwHhcNMTUwMzEzMDAwMDAwWhcNMzgxMjMxMDAwMDAwWjBHMQswCQYDVQQGEwJDTjERMA8G
+A1UECgwIVW5pVHJ1c3QxJTAjBgNVBAMMHFVDQSBFeHRlbmRlZCBWYWxpZGF0aW9uIFJvb3QwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCpCQcoEwKwmeBkqh5DFnpzsZGgdT6o+uM4AHrs
+iWogD4vFsJszA1qGxliG1cGFu0/GnEBNyr7uaZa4rYEwmnySBesFK5pI0Lh2PpbIILvSsPGP2KxF
+Rv+qZ2C0d35qHzwaUnoEPQc8hQ2E0B92CvdqFN9y4zR8V05WAT558aopO2z6+I9tTcg1367r3CTu
+eUWnhbYFiN6IXSV8l2RnCdm/WhUFhvMJHuxYMjMR83dksHYf5BA1FxvyDrFspCqjc/wJHx4yGVMR
+59mzLC52LqGj3n5qiAno8geK+LLNEOfic0CTuwjRP+H8C5SzJe98ptfRr5//lpr1kXuYC3fUfugH
+0mK1lTnj8/FtDw5lhIpjVMWAtuCeS31HJqcBCF3RiJ7XwzJE+oJKCmhUfzhTA8ykADNkUVkLo4KR
+el7sFsLzKuZi2irbWWIQJUoqgQtHB0MGcIfS+pMRKXpITeuUx3BNr2fVUbGAIAEBtHoIppB/TuDv
+B0GHr2qlXov7z1CymlSvw4m6WC31MJixNnI5fkkE/SmnTHnkBVfblLkWU41Gsx2VYVdWf6/wFlth
+WG82UBEL2KwrlRYaDh8IzTY0ZRBiZtWAXxQgXy0MoHgKaNYs1+lvK9JKBZP8nm9rZ/+I8U6laUpS
+NwXqxhaN0sSZ0YIrO7o1dfdRUVjzyAfd5LQDfwIDAQABo0IwQDAdBgNVHQ4EFgQU2XQ65DA9DfcS
+3H5aBZ8eNJr34RQwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQEL
+BQADggIBADaNl8xCFWQpN5smLNb7rhVpLGsaGvdftvkHTFnq88nIua7Mui563MD1sC3AO6+fcAUR
+ap8lTwEpcOPlDOHqWnzcSbvBHiqB9RZLcpHIojG5qtr8nR/zXUACE/xOHAbKsxSQVBcZEhrxH9cM
+aVr2cXj0lH2RC47skFSOvG+hTKv8dGT9cZr4QQehzZHkPJrgmzI5c6sq1WnIeJEmMX3ixzDx/BR4
+dxIOE/TdFpS/S2d7cFOFyrC78zhNLJA5wA3CXWvp4uXViI3WLL+rG761KIcSF3Ru/H38j9CHJrAb
++7lsq+KePRXBOy5nAliRn+/4Qh8st2j1da3Ptfb/EX3C8CSlrdP6oDyp+l3cpaDvRKS+1ujl5BOW
+F3sGPjLtx7dCvHaj2GU4Kzg1USEODm8uNBNA4StnDG1KQTAYI1oyVZnJF+A83vbsea0rWBmirSwi
+GpWOvpaQXUJXxPkUAzUrHC1RVwinOt4/5Mi0A3PCwSaAuwtCH60NryZy2sy+s6ODWA2CxR9GUeOc
+GMyNm43sSet1UNWMKFnKdDTajAshqx7qG+XH/RU+wBeq+yNuJkbL+vmxcmtpzyKEC2IPrNkZAJSi
+djzULZrtBJ4tBmIQN1IchXIbJ+XMxjHsN+xjWZsLHXbMfjKaiJUINlK73nZfdklJrX+9ZSCyycEr
+dhh2n1ax
+-----END CERTIFICATE-----
+
+Certigna Root CA
+================
+-----BEGIN CERTIFICATE-----
+MIIGWzCCBEOgAwIBAgIRAMrpG4nxVQMNo+ZBbcTjpuEwDQYJKoZIhvcNAQELBQAwWjELMAkGA1UE
+BhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczEcMBoGA1UECwwTMDAwMiA0ODE0NjMwODEwMDAzNjEZ
+MBcGA1UEAwwQQ2VydGlnbmEgUm9vdCBDQTAeFw0xMzEwMDEwODMyMjdaFw0zMzEwMDEwODMyMjda
+MFoxCzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxHDAaBgNVBAsMEzAwMDIgNDgxNDYz
+MDgxMDAwMzYxGTAXBgNVBAMMEENlcnRpZ25hIFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQDNGDllGlmx6mQWDoyUJJV8g9PFOSbcDO8WV43X2KyjQn+Cyu3NW9sOty3tRQgX
+stmzy9YXUnIo245Onoq2C/mehJpNdt4iKVzSs9IGPjA5qXSjklYcoW9MCiBtnyN6tMbaLOQdLNyz
+KNAT8kxOAkmhVECe5uUFoC2EyP+YbNDrihqECB63aCPuI9Vwzm1RaRDuoXrC0SIxwoKF0vJVdlB8
+JXrJhFwLrN1CTivngqIkicuQstDuI7pmTLtipPlTWmR7fJj6o0ieD5Wupxj0auwuA0Wv8HT4Ks16
+XdG+RCYyKfHx9WzMfgIhC59vpD++nVPiz32pLHxYGpfhPTc3GGYo0kDFUYqMwy3OU4gkWGQwFsWq
+4NYKpkDfePb1BHxpE4S80dGnBs8B92jAqFe7OmGtBIyT46388NtEbVncSVmurJqZNjBBe3YzIoej
+wpKGbvlw7q6Hh5UbxHq9MfPU0uWZ/75I7HX1eBYdpnDBfzwboZL7z8g81sWTCo/1VTp2lc5ZmIoJ
+lXcymoO6LAQ6l73UL77XbJuiyn1tJslV1c/DeVIICZkHJC1kJWumIWmbat10TWuXekG9qxf5kBdI
+jzb5LdXF2+6qhUVB+s06RbFo5jZMm5BX7CO5hwjCxAnxl4YqKE3idMDaxIzb3+KhF1nOJFl0Mdp/
+/TBt2dzhauH8XwIDAQABo4IBGjCCARYwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
+HQYDVR0OBBYEFBiHVuBud+4kNTxOc5of1uHieX4rMB8GA1UdIwQYMBaAFBiHVuBud+4kNTxOc5of
+1uHieX4rMEQGA1UdIAQ9MDswOQYEVR0gADAxMC8GCCsGAQUFBwIBFiNodHRwczovL3d3d3cuY2Vy
+dGlnbmEuZnIvYXV0b3JpdGVzLzBtBgNVHR8EZjBkMC+gLaArhilodHRwOi8vY3JsLmNlcnRpZ25h
+LmZyL2NlcnRpZ25hcm9vdGNhLmNybDAxoC+gLYYraHR0cDovL2NybC5kaGlteW90aXMuY29tL2Nl
+cnRpZ25hcm9vdGNhLmNybDANBgkqhkiG9w0BAQsFAAOCAgEAlLieT/DjlQgi581oQfccVdV8AOIt
+OoldaDgvUSILSo3L6btdPrtcPbEo/uRTVRPPoZAbAh1fZkYJMyjhDSSXcNMQH+pkV5a7XdrnxIxP
+TGRGHVyH41neQtGbqH6mid2PHMkwgu07nM3A6RngatgCdTer9zQoKJHyBApPNeNgJgH60BGM+RFq
+7q89w1DTj18zeTyGqHNFkIwgtnJzFyO+B2XleJINugHA64wcZr+shncBlA2c5uk5jR+mUYyZDDl3
+4bSb+hxnV29qao6pK0xXeXpXIs/NX2NGjVxZOob4Mkdio2cNGJHc+6Zr9UhhcyNZjgKnvETq9Emd
+8VRY+WCv2hikLyhF3HqgiIZd8zvn/yk1gPxkQ5Tm4xxvvq0OKmOZK8l+hfZx6AYDlf7ej0gcWtSS
+6Cvu5zHbugRqh5jnxV/vfaci9wHYTfmJ0A6aBVmknpjZbyvKcL5kwlWj9Omvw5Ip3IgWJJk8jSaY
+tlu3zM63Nwf9JtmYhST/WSMDmu2dnajkXjjO11INb9I/bbEFa0nOipFGc/T2L/Coc3cOZayhjWZS
+aX5LaAzHHjcng6WMxwLkFM1JAbBzs/3GkDpv0mztO+7skb6iQ12LAEpmJURw3kAP+HwV96LOPNde
+E4yBFxgX0b3xdxA61GU5wSesVywlVP+i2k+KYTlerj1KjL0=
+-----END CERTIFICATE-----
+
+emSign Root CA - G1
+===================
+-----BEGIN CERTIFICATE-----
+MIIDlDCCAnygAwIBAgIKMfXkYgxsWO3W2DANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQGEwJJTjET
+MBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRl
+ZDEcMBoGA1UEAxMTZW1TaWduIFJvb3QgQ0EgLSBHMTAeFw0xODAyMTgxODMwMDBaFw00MzAyMTgx
+ODMwMDBaMGcxCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVk
+aHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMRwwGgYDVQQDExNlbVNpZ24gUm9vdCBDQSAtIEcxMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk0u76WaK7p1b1TST0Bsew+eeuGQzf2N4aLTN
+LnF115sgxk0pvLZoYIr3IZpWNVrzdr3YzZr/k1ZLpVkGoZM0Kd0WNHVO8oG0x5ZOrRkVUkr+PHB1
+cM2vK6sVmjM8qrOLqs1D/fXqcP/tzxE7lM5OMhbTI0Aqd7OvPAEsbO2ZLIvZTmmYsvePQbAyeGHW
+DV/D+qJAkh1cF+ZwPjXnorfCYuKrpDhMtTk1b+oDafo6VGiFbdbyL0NVHpENDtjVaqSW0RM8LHhQ
+6DqS0hdW5TUaQBw+jSztOd9C4INBdN+jzcKGYEho42kLVACL5HZpIQ15TjQIXhTCzLG3rdd8cIrH
+hQIDAQABo0IwQDAdBgNVHQ4EFgQU++8Nhp6w492pufEhF38+/PB3KxowDgYDVR0PAQH/BAQDAgEG
+MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAFn/8oz1h31xPaOfG1vR2vjTnGs2
+vZupYeveFix0PZ7mddrXuqe8QhfnPZHr5X3dPpzxz5KsbEjMwiI/aTvFthUvozXGaCocV685743Q
+NcMYDHsAVhzNixl03r4PEuDQqqE/AjSxcM6dGNYIAwlG7mDgfrbESQRRfXBgvKqy/3lyeqYdPV8q
++Mri/Tm3R7nrft8EI6/6nAYH6ftjk4BAtcZsCjEozgyfz7MjNYBBjWzEN3uBL4ChQEKF6dk4jeih
+U80Bv2noWgbyRQuQ+q7hv53yrlc8pa6yVvSLZUDp/TGBLPQ5Cdjua6e0ph0VpZj3AYHYhX3zUVxx
+iN66zB+Afko=
+-----END CERTIFICATE-----
+
+emSign ECC Root CA - G3
+=======================
+-----BEGIN CERTIFICATE-----
+MIICTjCCAdOgAwIBAgIKPPYHqWhwDtqLhDAKBggqhkjOPQQDAzBrMQswCQYDVQQGEwJJTjETMBEG
+A1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRlZDEg
+MB4GA1UEAxMXZW1TaWduIEVDQyBSb290IENBIC0gRzMwHhcNMTgwMjE4MTgzMDAwWhcNNDMwMjE4
+MTgzMDAwWjBrMQswCQYDVQQGEwJJTjETMBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11
+ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRlZDEgMB4GA1UEAxMXZW1TaWduIEVDQyBSb290IENBIC0g
+RzMwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQjpQy4LRL1KPOxst3iAhKAnjlfSU2fySU0WXTsuwYc
+58Byr+iuL+FBVIcUqEqy6HyC5ltqtdyzdc6LBtCGI79G1Y4PPwT01xySfvalY8L1X44uT6EYGQIr
+MgqCZH0Wk9GjQjBAMB0GA1UdDgQWBBR8XQKEE9TMipuBzhccLikenEhjQjAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNpADBmAjEAvvNhzwIQHWSVB7gYboiFBS+D
+CBeQyh+KTOgNG3qxrdWBCUfvO6wIBHxcmbHtRwfSAjEAnbpV/KlK6O3t5nYBQnvI+GDZjVGLVTv7
+jHvrZQnD+JbNR6iC8hZVdyR+EhCVBCyj
+-----END CERTIFICATE-----
+
+emSign Root CA - C1
+===================
+-----BEGIN CERTIFICATE-----
+MIIDczCCAlugAwIBAgILAK7PALrEzzL4Q7IwDQYJKoZIhvcNAQELBQAwVjELMAkGA1UEBhMCVVMx
+EzARBgNVBAsTCmVtU2lnbiBQS0kxFDASBgNVBAoTC2VNdWRocmEgSW5jMRwwGgYDVQQDExNlbVNp
+Z24gUm9vdCBDQSAtIEMxMB4XDTE4MDIxODE4MzAwMFoXDTQzMDIxODE4MzAwMFowVjELMAkGA1UE
+BhMCVVMxEzARBgNVBAsTCmVtU2lnbiBQS0kxFDASBgNVBAoTC2VNdWRocmEgSW5jMRwwGgYDVQQD
+ExNlbVNpZ24gUm9vdCBDQSAtIEMxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz+up
+ufGZBczYKCFK83M0UYRWEPWgTywS4/oTmifQz/l5GnRfHXk5/Fv4cI7gklL35CX5VIPZHdPIWoU/
+Xse2B+4+wM6ar6xWQio5JXDWv7V7Nq2s9nPczdcdioOl+yuQFTdrHCZH3DspVpNqs8FqOp099cGX
+OFgFixwR4+S0uF2FHYP+eF8LRWgYSKVGczQ7/g/IdrvHGPMF0Ybzhe3nudkyrVWIzqa2kbBPrH4V
+I5b2P/AgNBbeCsbEBEV5f6f9vtKppa+cxSMq9zwhbL2vj07FOrLzNBL834AaSaTUqZX3noleooms
+lMuoaJuvimUnzYnu3Yy1aylwQ6BpC+S5DwIDAQABo0IwQDAdBgNVHQ4EFgQU/qHgcB4qAzlSWkK+
+XJGFehiqTbUwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQAD
+ggEBAMJKVvoVIXsoounlHfv4LcQ5lkFMOycsxGwYFYDGrK9HWS8mC+M2sO87/kOXSTKZEhVb3xEp
+/6tT+LvBeA+snFOvV71ojD1pM/CjoCNjO2RnIkSt1XHLVip4kqNPEjE2NuLe/gDEo2APJ62gsIq1
+NnpSob0n9CAnYuhNlCQT5AoE6TyrLshDCUrGYQTlSTR+08TI9Q/Aqum6VF7zYytPT1DU/rl7mYw9
+wC68AivTxEDkigcxHpvOJpkT+xHqmiIMERnHXhuBUDDIlhJu58tBf5E7oke3VIAb3ADMmpDqw8NQ
+BmIMMMAVSKeoWXzhriKi4gp6D/piq1JM4fHfyr6DDUI=
+-----END CERTIFICATE-----
+
+emSign ECC Root CA - C3
+=======================
+-----BEGIN CERTIFICATE-----
+MIICKzCCAbGgAwIBAgIKe3G2gla4EnycqDAKBggqhkjOPQQDAzBaMQswCQYDVQQGEwJVUzETMBEG
+A1UECxMKZW1TaWduIFBLSTEUMBIGA1UEChMLZU11ZGhyYSBJbmMxIDAeBgNVBAMTF2VtU2lnbiBF
+Q0MgUm9vdCBDQSAtIEMzMB4XDTE4MDIxODE4MzAwMFoXDTQzMDIxODE4MzAwMFowWjELMAkGA1UE
+BhMCVVMxEzARBgNVBAsTCmVtU2lnbiBQS0kxFDASBgNVBAoTC2VNdWRocmEgSW5jMSAwHgYDVQQD
+ExdlbVNpZ24gRUNDIFJvb3QgQ0EgLSBDMzB2MBAGByqGSM49AgEGBSuBBAAiA2IABP2lYa57JhAd
+6bciMK4G9IGzsUJxlTm801Ljr6/58pc1kjZGDoeVjbk5Wum739D+yAdBPLtVb4OjavtisIGJAnB9
+SMVK4+kiVCJNk7tCDK93nCOmfddhEc5lx/h//vXyqaNCMEAwHQYDVR0OBBYEFPtaSNCAIEDyqOkA
+B2kZd6fmw/TPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMDA2gA
+MGUCMQC02C8Cif22TGK6Q04ThHK1rt0c3ta13FaPWEBaLd4gTCKDypOofu4SQMfWh0/434UCMBwU
+ZOR8loMRnLDRWmFLpg9J0wD8ofzkpf9/rdcw0Md3f76BB1UwUCAU9Vc4CqgxUQ==
+-----END CERTIFICATE-----
+
+Hongkong Post Root CA 3
+=======================
+-----BEGIN CERTIFICATE-----
+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
+dBb9HxEGmpv0
+-----END CERTIFICATE-----
diff --git a/htdocs/includes/stripe/stripe-php/init.php b/htdocs/includes/stripe/stripe-php/init.php
index 05243999637..11ac713da53 100644
--- a/htdocs/includes/stripe/stripe-php/init.php
+++ b/htdocs/includes/stripe/stripe-php/init.php
@@ -1,144 +1,238 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 // Stripe singleton
-require(dirname(__FILE__) . '/lib/Stripe.php');
+require __DIR__ . '/lib/Stripe.php';
 
 // Utilities
-require(dirname(__FILE__) . '/lib/Util/AutoPagingIterator.php');
-require(dirname(__FILE__) . '/lib/Util/CaseInsensitiveArray.php');
-require(dirname(__FILE__) . '/lib/Util/LoggerInterface.php');
-require(dirname(__FILE__) . '/lib/Util/DefaultLogger.php');
-require(dirname(__FILE__) . '/lib/Util/RandomGenerator.php');
-require(dirname(__FILE__) . '/lib/Util/RequestOptions.php');
-require(dirname(__FILE__) . '/lib/Util/Set.php');
-require(dirname(__FILE__) . '/lib/Util/Util.php');
+require __DIR__ . '/lib/Util/CaseInsensitiveArray.php';
+require __DIR__ . '/lib/Util/LoggerInterface.php';
+require __DIR__ . '/lib/Util/DefaultLogger.php';
+require __DIR__ . '/lib/Util/RandomGenerator.php';
+require __DIR__ . '/lib/Util/RequestOptions.php';
+require __DIR__ . '/lib/Util/Set.php';
+require __DIR__ . '/lib/Util/Util.php';
+require __DIR__ . '/lib/Util/ObjectTypes.php';
 
 // HttpClient
-require(dirname(__FILE__) . '/lib/HttpClient/ClientInterface.php');
-require(dirname(__FILE__) . '/lib/HttpClient/CurlClient.php');
+require __DIR__ . '/lib/HttpClient/ClientInterface.php';
+require __DIR__ . '/lib/HttpClient/CurlClient.php';
 
-// Errors
-require(dirname(__FILE__) . '/lib/Error/Base.php');
-require(dirname(__FILE__) . '/lib/Error/Api.php');
-require(dirname(__FILE__) . '/lib/Error/ApiConnection.php');
-require(dirname(__FILE__) . '/lib/Error/Authentication.php');
-require(dirname(__FILE__) . '/lib/Error/Card.php');
-require(dirname(__FILE__) . '/lib/Error/Idempotency.php');
-require(dirname(__FILE__) . '/lib/Error/InvalidRequest.php');
-require(dirname(__FILE__) . '/lib/Error/Permission.php');
-require(dirname(__FILE__) . '/lib/Error/RateLimit.php');
-require(dirname(__FILE__) . '/lib/Error/SignatureVerification.php');
+// Exceptions
+require __DIR__ . '/lib/Exception/ExceptionInterface.php';
+require __DIR__ . '/lib/Exception/ApiErrorException.php';
+require __DIR__ . '/lib/Exception/ApiConnectionException.php';
+require __DIR__ . '/lib/Exception/AuthenticationException.php';
+require __DIR__ . '/lib/Exception/BadMethodCallException.php';
+require __DIR__ . '/lib/Exception/CardException.php';
+require __DIR__ . '/lib/Exception/IdempotencyException.php';
+require __DIR__ . '/lib/Exception/InvalidArgumentException.php';
+require __DIR__ . '/lib/Exception/InvalidRequestException.php';
+require __DIR__ . '/lib/Exception/PermissionException.php';
+require __DIR__ . '/lib/Exception/RateLimitException.php';
+require __DIR__ . '/lib/Exception/SignatureVerificationException.php';
+require __DIR__ . '/lib/Exception/UnexpectedValueException.php';
+require __DIR__ . '/lib/Exception/UnknownApiErrorException.php';
 
-// OAuth errors
-require(dirname(__FILE__) . '/lib/Error/OAuth/OAuthBase.php');
-require(dirname(__FILE__) . '/lib/Error/OAuth/InvalidClient.php');
-require(dirname(__FILE__) . '/lib/Error/OAuth/InvalidGrant.php');
-require(dirname(__FILE__) . '/lib/Error/OAuth/InvalidRequest.php');
-require(dirname(__FILE__) . '/lib/Error/OAuth/InvalidScope.php');
-require(dirname(__FILE__) . '/lib/Error/OAuth/UnsupportedGrantType.php');
-require(dirname(__FILE__) . '/lib/Error/OAuth/UnsupportedResponseType.php');
+// OAuth exceptions
+require __DIR__ . '/lib/Exception/OAuth/ExceptionInterface.php';
+require __DIR__ . '/lib/Exception/OAuth/OAuthErrorException.php';
+require __DIR__ . '/lib/Exception/OAuth/InvalidClientException.php';
+require __DIR__ . '/lib/Exception/OAuth/InvalidGrantException.php';
+require __DIR__ . '/lib/Exception/OAuth/InvalidRequestException.php';
+require __DIR__ . '/lib/Exception/OAuth/InvalidScopeException.php';
+require __DIR__ . '/lib/Exception/OAuth/UnknownOAuthErrorException.php';
+require __DIR__ . '/lib/Exception/OAuth/UnsupportedGrantTypeException.php';
+require __DIR__ . '/lib/Exception/OAuth/UnsupportedResponseTypeException.php';
 
 // API operations
-require(dirname(__FILE__) . '/lib/ApiOperations/All.php');
-require(dirname(__FILE__) . '/lib/ApiOperations/Create.php');
-require(dirname(__FILE__) . '/lib/ApiOperations/Delete.php');
-require(dirname(__FILE__) . '/lib/ApiOperations/NestedResource.php');
-require(dirname(__FILE__) . '/lib/ApiOperations/Request.php');
-require(dirname(__FILE__) . '/lib/ApiOperations/Retrieve.php');
-require(dirname(__FILE__) . '/lib/ApiOperations/Update.php');
+require __DIR__ . '/lib/ApiOperations/All.php';
+require __DIR__ . '/lib/ApiOperations/Create.php';
+require __DIR__ . '/lib/ApiOperations/Delete.php';
+require __DIR__ . '/lib/ApiOperations/NestedResource.php';
+require __DIR__ . '/lib/ApiOperations/Request.php';
+require __DIR__ . '/lib/ApiOperations/Retrieve.php';
+require __DIR__ . '/lib/ApiOperations/Update.php';
 
 // Plumbing
-require(dirname(__FILE__) . '/lib/ApiResponse.php');
-require(dirname(__FILE__) . '/lib/RequestTelemetry.php');
-require(dirname(__FILE__) . '/lib/StripeObject.php');
-require(dirname(__FILE__) . '/lib/ApiRequestor.php');
-require(dirname(__FILE__) . '/lib/ApiResource.php');
-require(dirname(__FILE__) . '/lib/SingletonApiResource.php');
+require __DIR__ . '/lib/ApiResponse.php';
+require __DIR__ . '/lib/RequestTelemetry.php';
+require __DIR__ . '/lib/StripeObject.php';
+require __DIR__ . '/lib/ApiRequestor.php';
+require __DIR__ . '/lib/ApiResource.php';
+require __DIR__ . '/lib/SingletonApiResource.php';
+require __DIR__ . '/lib/Service/AbstractService.php';
+require __DIR__ . '/lib/Service/AbstractServiceFactory.php';
+
+// StripeClient
+require __DIR__ . '/lib/StripeClientInterface.php';
+require __DIR__ . '/lib/BaseStripeClient.php';
+require __DIR__ . '/lib/StripeClient.php';
 
 // Stripe API Resources
-require(dirname(__FILE__) . '/lib/Account.php');
-require(dirname(__FILE__) . '/lib/AccountLink.php');
-require(dirname(__FILE__) . '/lib/AlipayAccount.php');
-require(dirname(__FILE__) . '/lib/ApplePayDomain.php');
-require(dirname(__FILE__) . '/lib/ApplicationFee.php');
-require(dirname(__FILE__) . '/lib/ApplicationFeeRefund.php');
-require(dirname(__FILE__) . '/lib/Balance.php');
-require(dirname(__FILE__) . '/lib/BalanceTransaction.php');
-require(dirname(__FILE__) . '/lib/BankAccount.php');
-require(dirname(__FILE__) . '/lib/BitcoinReceiver.php');
-require(dirname(__FILE__) . '/lib/BitcoinTransaction.php');
-require(dirname(__FILE__) . '/lib/Capability.php');
-require(dirname(__FILE__) . '/lib/Card.php');
-require(dirname(__FILE__) . '/lib/Charge.php');
-require(dirname(__FILE__) . '/lib/Checkout/Session.php');
-require(dirname(__FILE__) . '/lib/Collection.php');
-require(dirname(__FILE__) . '/lib/CountrySpec.php');
-require(dirname(__FILE__) . '/lib/Coupon.php');
-require(dirname(__FILE__) . '/lib/CreditNote.php');
-require(dirname(__FILE__) . '/lib/Customer.php');
-require(dirname(__FILE__) . '/lib/CustomerBalanceTransaction.php');
-require(dirname(__FILE__) . '/lib/Discount.php');
-require(dirname(__FILE__) . '/lib/Dispute.php');
-require(dirname(__FILE__) . '/lib/EphemeralKey.php');
-require(dirname(__FILE__) . '/lib/Event.php');
-require(dirname(__FILE__) . '/lib/ExchangeRate.php');
-require(dirname(__FILE__) . '/lib/File.php');
-require(dirname(__FILE__) . '/lib/FileLink.php');
-require(dirname(__FILE__) . '/lib/FileUpload.php');
-require(dirname(__FILE__) . '/lib/Invoice.php');
-require(dirname(__FILE__) . '/lib/InvoiceItem.php');
-require(dirname(__FILE__) . '/lib/InvoiceLineItem.php');
-require(dirname(__FILE__) . '/lib/IssuerFraudRecord.php');
-require(dirname(__FILE__) . '/lib/Issuing/Authorization.php');
-require(dirname(__FILE__) . '/lib/Issuing/Card.php');
-require(dirname(__FILE__) . '/lib/Issuing/CardDetails.php');
-require(dirname(__FILE__) . '/lib/Issuing/Cardholder.php');
-require(dirname(__FILE__) . '/lib/Issuing/Dispute.php');
-require(dirname(__FILE__) . '/lib/Issuing/Transaction.php');
-require(dirname(__FILE__) . '/lib/LoginLink.php');
-require(dirname(__FILE__) . '/lib/Order.php');
-require(dirname(__FILE__) . '/lib/OrderItem.php');
-require(dirname(__FILE__) . '/lib/OrderReturn.php');
-require(dirname(__FILE__) . '/lib/PaymentIntent.php');
-require(dirname(__FILE__) . '/lib/PaymentMethod.php');
-require(dirname(__FILE__) . '/lib/Payout.php');
-require(dirname(__FILE__) . '/lib/Person.php');
-require(dirname(__FILE__) . '/lib/Plan.php');
-require(dirname(__FILE__) . '/lib/Product.php');
-require(dirname(__FILE__) . '/lib/Radar/EarlyFraudWarning.php');
-require(dirname(__FILE__) . '/lib/Radar/ValueList.php');
-require(dirname(__FILE__) . '/lib/Radar/ValueListItem.php');
-require(dirname(__FILE__) . '/lib/Recipient.php');
-require(dirname(__FILE__) . '/lib/RecipientTransfer.php');
-require(dirname(__FILE__) . '/lib/Refund.php');
-require(dirname(__FILE__) . '/lib/Reporting/ReportRun.php');
-require(dirname(__FILE__) . '/lib/Reporting/ReportType.php');
-require(dirname(__FILE__) . '/lib/Review.php');
-require(dirname(__FILE__) . '/lib/SetupIntent.php');
-require(dirname(__FILE__) . '/lib/SKU.php');
-require(dirname(__FILE__) . '/lib/Sigma/ScheduledQueryRun.php');
-require(dirname(__FILE__) . '/lib/Source.php');
-require(dirname(__FILE__) . '/lib/SourceTransaction.php');
-require(dirname(__FILE__) . '/lib/Subscription.php');
-require(dirname(__FILE__) . '/lib/SubscriptionItem.php');
-require(dirname(__FILE__) . '/lib/SubscriptionSchedule.php');
-require(dirname(__FILE__) . '/lib/TaxId.php');
-require(dirname(__FILE__) . '/lib/TaxRate.php');
-require(dirname(__FILE__) . '/lib/Terminal/ConnectionToken.php');
-require(dirname(__FILE__) . '/lib/Terminal/Location.php');
-require(dirname(__FILE__) . '/lib/Terminal/Reader.php');
-require(dirname(__FILE__) . '/lib/ThreeDSecure.php');
-require(dirname(__FILE__) . '/lib/Token.php');
-require(dirname(__FILE__) . '/lib/Topup.php');
-require(dirname(__FILE__) . '/lib/Transfer.php');
-require(dirname(__FILE__) . '/lib/TransferReversal.php');
-require(dirname(__FILE__) . '/lib/UsageRecord.php');
-require(dirname(__FILE__) . '/lib/UsageRecordSummary.php');
+require __DIR__ . '/lib/Account.php';
+require __DIR__ . '/lib/AccountLink.php';
+require __DIR__ . '/lib/AlipayAccount.php';
+require __DIR__ . '/lib/ApplePayDomain.php';
+require __DIR__ . '/lib/ApplicationFee.php';
+require __DIR__ . '/lib/ApplicationFeeRefund.php';
+require __DIR__ . '/lib/Balance.php';
+require __DIR__ . '/lib/BalanceTransaction.php';
+require __DIR__ . '/lib/BankAccount.php';
+require __DIR__ . '/lib/BillingPortal/Session.php';
+require __DIR__ . '/lib/BitcoinReceiver.php';
+require __DIR__ . '/lib/BitcoinTransaction.php';
+require __DIR__ . '/lib/Capability.php';
+require __DIR__ . '/lib/Card.php';
+require __DIR__ . '/lib/Charge.php';
+require __DIR__ . '/lib/Checkout/Session.php';
+require __DIR__ . '/lib/Collection.php';
+require __DIR__ . '/lib/CountrySpec.php';
+require __DIR__ . '/lib/Coupon.php';
+require __DIR__ . '/lib/CreditNote.php';
+require __DIR__ . '/lib/CreditNoteLineItem.php';
+require __DIR__ . '/lib/Customer.php';
+require __DIR__ . '/lib/CustomerBalanceTransaction.php';
+require __DIR__ . '/lib/Discount.php';
+require __DIR__ . '/lib/Dispute.php';
+require __DIR__ . '/lib/EphemeralKey.php';
+require __DIR__ . '/lib/ErrorObject.php';
+require __DIR__ . '/lib/Event.php';
+require __DIR__ . '/lib/ExchangeRate.php';
+require __DIR__ . '/lib/File.php';
+require __DIR__ . '/lib/FileLink.php';
+require __DIR__ . '/lib/Invoice.php';
+require __DIR__ . '/lib/InvoiceItem.php';
+require __DIR__ . '/lib/InvoiceLineItem.php';
+require __DIR__ . '/lib/Issuing/Authorization.php';
+require __DIR__ . '/lib/Issuing/Card.php';
+require __DIR__ . '/lib/Issuing/CardDetails.php';
+require __DIR__ . '/lib/Issuing/Cardholder.php';
+require __DIR__ . '/lib/Issuing/Dispute.php';
+require __DIR__ . '/lib/Issuing/Transaction.php';
+require __DIR__ . '/lib/LineItem.php';
+require __DIR__ . '/lib/LoginLink.php';
+require __DIR__ . '/lib/Mandate.php';
+require __DIR__ . '/lib/Order.php';
+require __DIR__ . '/lib/OrderItem.php';
+require __DIR__ . '/lib/OrderReturn.php';
+require __DIR__ . '/lib/PaymentIntent.php';
+require __DIR__ . '/lib/PaymentMethod.php';
+require __DIR__ . '/lib/Payout.php';
+require __DIR__ . '/lib/Person.php';
+require __DIR__ . '/lib/Plan.php';
+require __DIR__ . '/lib/Price.php';
+require __DIR__ . '/lib/Product.php';
+require __DIR__ . '/lib/PromotionCode.php';
+require __DIR__ . '/lib/Radar/EarlyFraudWarning.php';
+require __DIR__ . '/lib/Radar/ValueList.php';
+require __DIR__ . '/lib/Radar/ValueListItem.php';
+require __DIR__ . '/lib/Recipient.php';
+require __DIR__ . '/lib/RecipientTransfer.php';
+require __DIR__ . '/lib/Refund.php';
+require __DIR__ . '/lib/Reporting/ReportRun.php';
+require __DIR__ . '/lib/Reporting/ReportType.php';
+require __DIR__ . '/lib/Review.php';
+require __DIR__ . '/lib/SetupAttempt.php';
+require __DIR__ . '/lib/SetupIntent.php';
+require __DIR__ . '/lib/Sigma/ScheduledQueryRun.php';
+require __DIR__ . '/lib/SKU.php';
+require __DIR__ . '/lib/Source.php';
+require __DIR__ . '/lib/SourceTransaction.php';
+require __DIR__ . '/lib/Subscription.php';
+require __DIR__ . '/lib/SubscriptionItem.php';
+require __DIR__ . '/lib/SubscriptionSchedule.php';
+require __DIR__ . '/lib/TaxId.php';
+require __DIR__ . '/lib/TaxRate.php';
+require __DIR__ . '/lib/Terminal/ConnectionToken.php';
+require __DIR__ . '/lib/Terminal/Location.php';
+require __DIR__ . '/lib/Terminal/Reader.php';
+require __DIR__ . '/lib/ThreeDSecure.php';
+require __DIR__ . '/lib/Token.php';
+require __DIR__ . '/lib/Topup.php';
+require __DIR__ . '/lib/Transfer.php';
+require __DIR__ . '/lib/TransferReversal.php';
+require __DIR__ . '/lib/UsageRecord.php';
+require __DIR__ . '/lib/UsageRecordSummary.php';
+require __DIR__ . '/lib/WebhookEndpoint.php';
+
+// Services
+require __DIR__ . '/lib/Service/AccountService.php';
+require __DIR__ . '/lib/Service/AccountLinkService.php';
+require __DIR__ . '/lib/Service/ApplePayDomainService.php';
+require __DIR__ . '/lib/Service/ApplicationFeeService.php';
+require __DIR__ . '/lib/Service/BalanceService.php';
+require __DIR__ . '/lib/Service/BalanceTransactionService.php';
+require __DIR__ . '/lib/Service/BillingPortal/SessionService.php';
+require __DIR__ . '/lib/Service/ChargeService.php';
+require __DIR__ . '/lib/Service/Checkout/SessionService.php';
+require __DIR__ . '/lib/Service/CountrySpecService.php';
+require __DIR__ . '/lib/Service/CouponService.php';
+require __DIR__ . '/lib/Service/CreditNoteService.php';
+require __DIR__ . '/lib/Service/CustomerService.php';
+require __DIR__ . '/lib/Service/DisputeService.php';
+require __DIR__ . '/lib/Service/EphemeralKeyService.php';
+require __DIR__ . '/lib/Service/EventService.php';
+require __DIR__ . '/lib/Service/ExchangeRateService.php';
+require __DIR__ . '/lib/Service/FileService.php';
+require __DIR__ . '/lib/Service/FileLinkService.php';
+require __DIR__ . '/lib/Service/InvoiceService.php';
+require __DIR__ . '/lib/Service/InvoiceItemService.php';
+require __DIR__ . '/lib/Service/Issuing/AuthorizationService.php';
+require __DIR__ . '/lib/Service/Issuing/CardService.php';
+require __DIR__ . '/lib/Service/Issuing/CardholderService.php';
+require __DIR__ . '/lib/Service/Issuing/DisputeService.php';
+require __DIR__ . '/lib/Service/Issuing/TransactionService.php';
+require __DIR__ . '/lib/Service/MandateService.php';
+require __DIR__ . '/lib/Service/OrderService.php';
+require __DIR__ . '/lib/Service/OrderReturnService.php';
+require __DIR__ . '/lib/Service/PaymentIntentService.php';
+require __DIR__ . '/lib/Service/PaymentMethodService.php';
+require __DIR__ . '/lib/Service/PayoutService.php';
+require __DIR__ . '/lib/Service/PlanService.php';
+require __DIR__ . '/lib/Service/PriceService.php';
+require __DIR__ . '/lib/Service/ProductService.php';
+require __DIR__ . '/lib/Service/PromotionCodeService.php';
+require __DIR__ . '/lib/Service/Radar/EarlyFraudWarningService.php';
+require __DIR__ . '/lib/Service/Radar/ValueListService.php';
+require __DIR__ . '/lib/Service/Radar/ValueListItemService.php';
+require __DIR__ . '/lib/Service/RefundService.php';
+require __DIR__ . '/lib/Service/Reporting/ReportRunService.php';
+require __DIR__ . '/lib/Service/Reporting/ReportTypeService.php';
+require __DIR__ . '/lib/Service/ReviewService.php';
+require __DIR__ . '/lib/Service/SetupAttemptService.php';
+require __DIR__ . '/lib/Service/SetupIntentService.php';
+require __DIR__ . '/lib/Service/Sigma/ScheduledQueryRunService.php';
+require __DIR__ . '/lib/Service/SkuService.php';
+require __DIR__ . '/lib/Service/SourceService.php';
+require __DIR__ . '/lib/Service/SubscriptionService.php';
+require __DIR__ . '/lib/Service/SubscriptionItemService.php';
+require __DIR__ . '/lib/Service/SubscriptionScheduleService.php';
+require __DIR__ . '/lib/Service/TaxRateService.php';
+require __DIR__ . '/lib/Service/Terminal/ConnectionTokenService.php';
+require __DIR__ . '/lib/Service/Terminal/LocationService.php';
+require __DIR__ . '/lib/Service/Terminal/ReaderService.php';
+require __DIR__ . '/lib/Service/TokenService.php';
+require __DIR__ . '/lib/Service/TopupService.php';
+require __DIR__ . '/lib/Service/TransferService.php';
+require __DIR__ . '/lib/Service/WebhookEndpointService.php';
+
+// Service factories
+require __DIR__ . '/lib/Service/CoreServiceFactory.php';
+require __DIR__ . '/lib/Service/BillingPortal/BillingPortalServiceFactory.php';
+require __DIR__ . '/lib/Service/Checkout/CheckoutServiceFactory.php';
+require __DIR__ . '/lib/Service/Issuing/IssuingServiceFactory.php';
+require __DIR__ . '/lib/Service/Radar/RadarServiceFactory.php';
+require __DIR__ . '/lib/Service/Reporting/ReportingServiceFactory.php';
+require __DIR__ . '/lib/Service/Sigma/SigmaServiceFactory.php';
+require __DIR__ . '/lib/Service/Terminal/TerminalServiceFactory.php';
 
 // OAuth
-require(dirname(__FILE__) . '/lib/OAuth.php');
+require __DIR__ . '/lib/OAuth.php';
+require __DIR__ . '/lib/OAuthErrorObject.php';
+require __DIR__ . '/lib/Service/OAuthService.php';
 
 // Webhooks
-require(dirname(__FILE__) . '/lib/Webhook.php');
-require(dirname(__FILE__) . '/lib/WebhookEndpoint.php');
-require(dirname(__FILE__) . '/lib/WebhookSignature.php');
+require __DIR__ . '/lib/Webhook.php';
+require __DIR__ . '/lib/WebhookSignature.php';
diff --git a/htdocs/includes/stripe/stripe-php/lib/Account.php b/htdocs/includes/stripe/stripe-php/lib/Account.php
index 4993ca35414..4fa789f21c7 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Account.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Account.php
@@ -1,344 +1,91 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class Account
+ * This is an object representing a Stripe account. You can retrieve it to see
+ * properties on the account like its current e-mail address or if the account is
+ * enabled yet to make live charges.
  *
- * @property string $id
- * @property string $object
- * @property mixed $business_profile
- * @property string $business_type
- * @property mixed $capabilities
- * @property bool $charges_enabled
- * @property mixed $company
- * @property string $country
- * @property int $created
- * @property string $default_currency
- * @property bool $details_submitted
- * @property string $email
- * @property Collection $external_accounts
- * @property mixed $individual
- * @property StripeObject $metadata
- * @property bool $payouts_enabled
- * @property mixed $requirements
- * @property mixed $settings
- * @property mixed $tos_acceptance
- * @property string $type
+ * Some properties, marked below, are available only to platforms that want to <a
+ * href="https://stripe.com/docs/connect/accounts">create and manage Express or
+ * Custom accounts</a>.
  *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|\Stripe\StripeObject $business_profile Business information about the account.
+ * @property null|string $business_type The business type.
+ * @property \Stripe\StripeObject $capabilities
+ * @property bool $charges_enabled Whether the account can create live charges.
+ * @property \Stripe\StripeObject $company
+ * @property string $country The account's country.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $default_currency Three-letter ISO currency code representing the default currency for the account. This must be a currency that <a href="https://stripe.com/docs/payouts">Stripe supports in the account's country</a>.
+ * @property bool $details_submitted Whether account details have been submitted. Standard accounts cannot receive payouts before this is true.
+ * @property null|string $email The primary user's email address.
+ * @property \Stripe\Collection $external_accounts External accounts (bank accounts and debit cards) currently attached to this account
+ * @property \Stripe\Person $individual <p>This is an object representing a person associated with a Stripe account.</p><p>Related guide: <a href="https://stripe.com/docs/connect/identity-verification-api#person-information">Handling Identity Verification with the API</a>.</p>
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property bool $payouts_enabled Whether Stripe can send payouts to this account.
+ * @property \Stripe\StripeObject $requirements
+ * @property null|\Stripe\StripeObject $settings Options for customizing how the account functions within Stripe.
+ * @property \Stripe\StripeObject $tos_acceptance
+ * @property string $type The Stripe account type. Can be <code>standard</code>, <code>express</code>, or <code>custom</code>.
  */
 class Account extends ApiResource
 {
-    const OBJECT_NAME = "account";
+    const OBJECT_NAME = 'account';
 
     use ApiOperations\All;
     use ApiOperations\Create;
     use ApiOperations\Delete;
     use ApiOperations\NestedResource;
+    use ApiOperations\Update;
+
+    const BUSINESS_TYPE_COMPANY = 'company';
+    const BUSINESS_TYPE_GOVERNMENT_ENTITY = 'government_entity';
+    const BUSINESS_TYPE_INDIVIDUAL = 'individual';
+    const BUSINESS_TYPE_NON_PROFIT = 'non_profit';
+
+    const CAPABILITY_CARD_PAYMENTS = 'card_payments';
+    const CAPABILITY_LEGACY_PAYMENTS = 'legacy_payments';
+    const CAPABILITY_PLATFORM_PAYMENTS = 'platform_payments';
+    const CAPABILITY_TRANSFERS = 'transfers';
+
+    const CAPABILITY_STATUS_ACTIVE = 'active';
+    const CAPABILITY_STATUS_INACTIVE = 'inactive';
+    const CAPABILITY_STATUS_PENDING = 'pending';
+
+    const TYPE_CUSTOM = 'custom';
+    const TYPE_EXPRESS = 'express';
+    const TYPE_STANDARD = 'standard';
+
     use ApiOperations\Retrieve {
         retrieve as protected _retrieve;
     }
-    use ApiOperations\Update;
-
-    /**
-     * Possible string representations of an account's business type.
-     * @link https://stripe.com/docs/api/accounts/object#account_object-business_type
-     */
-    const BUSINESS_TYPE_COMPANY    = 'company';
-    const BUSINESS_TYPE_INDIVIDUAL = 'individual';
-
-    /**
-     * Possible string representations of an account's capabilities.
-     * @link https://stripe.com/docs/api/accounts/object#account_object-capabilities
-     */
-    const CAPABILITY_CARD_PAYMENTS     = 'card_payments';
-    const CAPABILITY_LEGACY_PAYMENTS   = 'legacy_payments';
-    const CAPABILITY_PLATFORM_PAYMENTS = 'platform_payments';
-
-    /**
-     * Possible string representations of an account's capability status.
-     * @link https://stripe.com/docs/api/accounts/object#account_object-capabilities
-     */
-    const CAPABILITY_STATUS_ACTIVE   = 'active';
-    const CAPABILITY_STATUS_INACTIVE = 'inactive';
-    const CAPABILITY_STATUS_PENDING  = 'pending';
-
-    /**
-     * Possible string representations of an account's type.
-     * @link https://stripe.com/docs/api/accounts/object#account_object-type
-     */
-    const TYPE_CUSTOM   = 'custom';
-    const TYPE_EXPRESS  = 'express';
-    const TYPE_STANDARD = 'standard';
 
     public static function getSavedNestedResources()
     {
         static $savedNestedResources = null;
-        if ($savedNestedResources === null) {
+        if (null === $savedNestedResources) {
             $savedNestedResources = new Util\Set([
                 'external_account',
                 'bank_account',
             ]);
         }
+
         return $savedNestedResources;
     }
 
-    const PATH_CAPABILITIES = '/capabilities';
-    const PATH_EXTERNAL_ACCOUNTS = '/external_accounts';
-    const PATH_LOGIN_LINKS = '/login_links';
-    const PATH_PERSONS = '/persons';
-
     public function instanceUrl()
     {
-        if ($this['id'] === null) {
+        if (null === $this['id']) {
             return '/v1/account';
-        } else {
-            return parent::instanceUrl();
         }
-    }
 
-    /**
-     * @param array|string|null $id The ID of the account to retrieve, or an
-     *     options array containing an `id` key.
-     * @param array|string|null $opts
-     *
-     * @return Account
-     */
-    public static function retrieve($id = null, $opts = null)
-    {
-        if (!$opts && is_string($id) && substr($id, 0, 3) === 'sk_') {
-            $opts = $id;
-            $id = null;
-        }
-        return self::_retrieve($id, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Account The rejected account.
-     */
-    public function reject($params = null, $opts = null)
-    {
-        $url = $this->instanceUrl() . '/reject';
-        list($response, $opts) = $this->_request('post', $url, $params, $opts);
-        $this->refreshFrom($response, $opts);
-        return $this;
-    }
-
-    /**
-     * @param array|null $clientId
-     * @param array|string|null $opts
-     *
-     * @return StripeObject Object containing the response from the API.
-     */
-    public function deauthorize($clientId = null, $opts = null)
-    {
-        $params = [
-            'client_id' => $clientId,
-            'stripe_user_id' => $this->id,
-        ];
-        return OAuth::deauthorize($params, $opts);
-    }
-
-    /*
-     * Capabilities methods
-     * We can not add the capabilities() method today as the Account object already has a
-     * capabilities property which is a hash and not the sub-list of capabilities.
-     */
-
-
-    /**
-     * @param string $id The ID of the account to which the capability belongs.
-     * @param string $capabilityId The ID of the capability to retrieve.
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Capability
-     */
-    public static function retrieveCapability($id, $capabilityId, $params = null, $opts = null)
-    {
-        return self::_retrieveNestedResource($id, static::PATH_CAPABILITIES, $capabilityId, $params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the account to which the capability belongs.
-     * @param string $capabilityId The ID of the capability to update.
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Capability
-     */
-    public static function updateCapability($id, $capabilityId, $params = null, $opts = null)
-    {
-        return self::_updateNestedResource($id, static::PATH_CAPABILITIES, $capabilityId, $params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the account on which to retrieve the capabilities.
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection The list of capabilities.
-     */
-    public static function allCapabilities($id, $params = null, $opts = null)
-    {
-        return self::_allNestedResources($id, static::PATH_CAPABILITIES, $params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the account on which to create the external account.
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return BankAccount|Card
-     */
-    public static function createExternalAccount($id, $params = null, $opts = null)
-    {
-        return self::_createNestedResource($id, static::PATH_EXTERNAL_ACCOUNTS, $params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the account to which the external account belongs.
-     * @param string $externalAccountId The ID of the external account to retrieve.
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return BankAccount|Card
-     */
-    public static function retrieveExternalAccount($id, $externalAccountId, $params = null, $opts = null)
-    {
-        return self::_retrieveNestedResource($id, static::PATH_EXTERNAL_ACCOUNTS, $externalAccountId, $params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the account to which the external account belongs.
-     * @param string $externalAccountId The ID of the external account to update.
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return BankAccount|Card
-     */
-    public static function updateExternalAccount($id, $externalAccountId, $params = null, $opts = null)
-    {
-        return self::_updateNestedResource($id, static::PATH_EXTERNAL_ACCOUNTS, $externalAccountId, $params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the account to which the external account belongs.
-     * @param string $externalAccountId The ID of the external account to delete.
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return BankAccount|Card
-     */
-    public static function deleteExternalAccount($id, $externalAccountId, $params = null, $opts = null)
-    {
-        return self::_deleteNestedResource($id, static::PATH_EXTERNAL_ACCOUNTS, $externalAccountId, $params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the account on which to retrieve the external accounts.
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection The list of external accounts (BankAccount or Card).
-     */
-    public static function allExternalAccounts($id, $params = null, $opts = null)
-    {
-        return self::_allNestedResources($id, static::PATH_EXTERNAL_ACCOUNTS, $params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the account on which to create the login link.
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return LoginLink
-     */
-    public static function createLoginLink($id, $params = null, $opts = null)
-    {
-        return self::_createNestedResource($id, static::PATH_LOGIN_LINKS, $params, $opts);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return Collection The list of persons.
-     */
-    public function persons($params = null, $options = null)
-    {
-        $url = $this->instanceUrl() . '/persons';
-        list($response, $opts) = $this->_request('get', $url, $params, $options);
-        $obj = Util\Util::convertToStripeObject($response, $opts);
-        $obj->setLastResponse($response);
-        return $obj;
-    }
-
-    /**
-     * @param string $id The ID of the account on which to create the person.
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Person
-     */
-    public static function createPerson($id, $params = null, $opts = null)
-    {
-        return self::_createNestedResource($id, static::PATH_PERSONS, $params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the account to which the person belongs.
-     * @param string $personId The ID of the person to retrieve.
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Person
-     */
-    public static function retrievePerson($id, $personId, $params = null, $opts = null)
-    {
-        return self::_retrieveNestedResource($id, static::PATH_PERSONS, $personId, $params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the account to which the person belongs.
-     * @param string $personId The ID of the person to update.
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Person
-     */
-    public static function updatePerson($id, $personId, $params = null, $opts = null)
-    {
-        return self::_updateNestedResource($id, static::PATH_PERSONS, $personId, $params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the account to which the person belongs.
-     * @param string $personId The ID of the person to delete.
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Person
-     */
-    public static function deletePerson($id, $personId, $params = null, $opts = null)
-    {
-        return self::_deleteNestedResource($id, static::PATH_PERSONS, $personId, $params, $opts);
-    }
-
-    /**
-     * @param string $id The ID of the account on which to retrieve the persons.
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection The list of persons.
-     */
-    public static function allPersons($id, $params = null, $opts = null)
-    {
-        return self::_allNestedResources($id, static::PATH_PERSONS, $params, $opts);
+        return parent::instanceUrl();
     }
 
     public function serializeParameters($force = false)
@@ -359,6 +106,7 @@ class Account extends ApiResource
                 $update['individual'] = $individual->serializeParameters($force);
             }
         }
+
         return $update;
     }
 
@@ -369,9 +117,9 @@ class Account extends ApiResource
         } else {
             $originalValue = [];
         }
-        if (($originalValue) && (count($originalValue) > count($additionalOwners))) {
-            throw new \InvalidArgumentException(
-                "You cannot delete an item from an array, you must instead set a new array"
+        if (($originalValue) && (\count($originalValue) > \count($additionalOwners))) {
+            throw new Exception\InvalidArgumentException(
+                'You cannot delete an item from an array, you must instead set a new array'
             );
         }
 
@@ -379,14 +127,305 @@ class Account extends ApiResource
         foreach ($additionalOwners as $i => $v) {
             $update = ($v instanceof StripeObject) ? $v->serializeParameters() : $v;
 
-            if ($update !== []) {
-                if (!$originalValue ||
-                    !array_key_exists($i, $originalValue) ||
-                    ($update != $legalEntity->serializeParamsValue($originalValue[$i], null, false, true))) {
+            if ([] !== $update) {
+                if (!$originalValue
+                    || !\array_key_exists($i, $originalValue)
+                    || ($update !== $legalEntity->serializeParamsValue($originalValue[$i], null, false, true))) {
                     $updateArr[$i] = $update;
                 }
             }
         }
+
         return $updateArr;
     }
+
+    /**
+     * @param null|array|string $id the ID of the account to retrieve, or an
+     *     options array containing an `id` key
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Account
+     */
+    public static function retrieve($id = null, $opts = null)
+    {
+        if (!$opts && \is_string($id) && 'sk_' === \substr($id, 0, 3)) {
+            $opts = $id;
+            $id = null;
+        }
+
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param null|array $clientId
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\StripeObject object containing the response from the API
+     */
+    public function deauthorize($clientId = null, $opts = null)
+    {
+        $params = [
+            'client_id' => $clientId,
+            'stripe_user_id' => $this->id,
+        ];
+
+        return OAuth::deauthorize($params, $opts);
+    }
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection the list of persons
+     */
+    public function persons($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/persons';
+        list($response, $opts) = $this->_request('get', $url, $params, $opts);
+        $obj = Util\Util::convertToStripeObject($response, $opts);
+        $obj->setLastResponse($response);
+
+        return $obj;
+    }
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return Account the rejected account
+     */
+    public function reject($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/reject';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+
+        return $this;
+    }
+
+    /*
+     * Capabilities methods
+     * We can not add the capabilities() method today as the Account object already has a
+     * capabilities property which is a hash and not the sub-list of capabilities.
+     */
+
+    const PATH_CAPABILITIES = '/capabilities';
+
+    /**
+     * @param string $id the ID of the account on which to retrieve the capabilities
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection the list of capabilities
+     */
+    public static function allCapabilities($id, $params = null, $opts = null)
+    {
+        return self::_allNestedResources($id, static::PATH_CAPABILITIES, $params, $opts);
+    }
+
+    /**
+     * @param string $id the ID of the account to which the capability belongs
+     * @param string $capabilityId the ID of the capability to retrieve
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Capability
+     */
+    public static function retrieveCapability($id, $capabilityId, $params = null, $opts = null)
+    {
+        return self::_retrieveNestedResource($id, static::PATH_CAPABILITIES, $capabilityId, $params, $opts);
+    }
+
+    /**
+     * @param string $id the ID of the account to which the capability belongs
+     * @param string $capabilityId the ID of the capability to update
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Capability
+     */
+    public static function updateCapability($id, $capabilityId, $params = null, $opts = null)
+    {
+        return self::_updateNestedResource($id, static::PATH_CAPABILITIES, $capabilityId, $params, $opts);
+    }
+
+    const PATH_EXTERNAL_ACCOUNTS = '/external_accounts';
+
+    /**
+     * @param string $id the ID of the account on which to retrieve the external accounts
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection the list of external accounts (BankAccount or Card)
+     */
+    public static function allExternalAccounts($id, $params = null, $opts = null)
+    {
+        return self::_allNestedResources($id, static::PATH_EXTERNAL_ACCOUNTS, $params, $opts);
+    }
+
+    /**
+     * @param string $id the ID of the account on which to create the external account
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\BankAccount|\Stripe\Card
+     */
+    public static function createExternalAccount($id, $params = null, $opts = null)
+    {
+        return self::_createNestedResource($id, static::PATH_EXTERNAL_ACCOUNTS, $params, $opts);
+    }
+
+    /**
+     * @param string $id the ID of the account to which the external account belongs
+     * @param string $externalAccountId the ID of the external account to delete
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\BankAccount|\Stripe\Card
+     */
+    public static function deleteExternalAccount($id, $externalAccountId, $params = null, $opts = null)
+    {
+        return self::_deleteNestedResource($id, static::PATH_EXTERNAL_ACCOUNTS, $externalAccountId, $params, $opts);
+    }
+
+    /**
+     * @param string $id the ID of the account to which the external account belongs
+     * @param string $externalAccountId the ID of the external account to retrieve
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\BankAccount|\Stripe\Card
+     */
+    public static function retrieveExternalAccount($id, $externalAccountId, $params = null, $opts = null)
+    {
+        return self::_retrieveNestedResource($id, static::PATH_EXTERNAL_ACCOUNTS, $externalAccountId, $params, $opts);
+    }
+
+    /**
+     * @param string $id the ID of the account to which the external account belongs
+     * @param string $externalAccountId the ID of the external account to update
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\BankAccount|\Stripe\Card
+     */
+    public static function updateExternalAccount($id, $externalAccountId, $params = null, $opts = null)
+    {
+        return self::_updateNestedResource($id, static::PATH_EXTERNAL_ACCOUNTS, $externalAccountId, $params, $opts);
+    }
+
+    const PATH_LOGIN_LINKS = '/login_links';
+
+    /**
+     * @param string $id the ID of the account on which to create the login link
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\LoginLink
+     */
+    public static function createLoginLink($id, $params = null, $opts = null)
+    {
+        return self::_createNestedResource($id, static::PATH_LOGIN_LINKS, $params, $opts);
+    }
+
+    const PATH_PERSONS = '/persons';
+
+    /**
+     * @param string $id the ID of the account on which to retrieve the persons
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection the list of persons
+     */
+    public static function allPersons($id, $params = null, $opts = null)
+    {
+        return self::_allNestedResources($id, static::PATH_PERSONS, $params, $opts);
+    }
+
+    /**
+     * @param string $id the ID of the account on which to create the person
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Person
+     */
+    public static function createPerson($id, $params = null, $opts = null)
+    {
+        return self::_createNestedResource($id, static::PATH_PERSONS, $params, $opts);
+    }
+
+    /**
+     * @param string $id the ID of the account to which the person belongs
+     * @param string $personId the ID of the person to delete
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Person
+     */
+    public static function deletePerson($id, $personId, $params = null, $opts = null)
+    {
+        return self::_deleteNestedResource($id, static::PATH_PERSONS, $personId, $params, $opts);
+    }
+
+    /**
+     * @param string $id the ID of the account to which the person belongs
+     * @param string $personId the ID of the person to retrieve
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Person
+     */
+    public static function retrievePerson($id, $personId, $params = null, $opts = null)
+    {
+        return self::_retrieveNestedResource($id, static::PATH_PERSONS, $personId, $params, $opts);
+    }
+
+    /**
+     * @param string $id the ID of the account to which the person belongs
+     * @param string $personId the ID of the person to update
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Person
+     */
+    public static function updatePerson($id, $personId, $params = null, $opts = null)
+    {
+        return self::_updateNestedResource($id, static::PATH_PERSONS, $personId, $params, $opts);
+    }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/AccountLink.php b/htdocs/includes/stripe/stripe-php/lib/AccountLink.php
index 692447dbf69..24a9e68aa52 100644
--- a/htdocs/includes/stripe/stripe-php/lib/AccountLink.php
+++ b/htdocs/includes/stripe/stripe-php/lib/AccountLink.php
@@ -1,20 +1,26 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class AccountLink
+ * Account Links are the means by which a Connect platform grants a connected
+ * account permission to access Stripe-hosted applications, such as Connect
+ * Onboarding.
  *
- * @property string $object
- * @property int $created
- * @property int $expires_at
- * @property string $url
+ * Related guide: <a
+ * href="https://stripe.com/docs/connect/connect-onboarding">Connect
+ * Onboarding</a>.
  *
- * @package Stripe
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property int $expires_at The timestamp at which this account link will expire.
+ * @property string $url The URL for the account link.
  */
 class AccountLink extends ApiResource
 {
-    const OBJECT_NAME = "account_link";
+    const OBJECT_NAME = 'account_link';
 
     use ApiOperations\Create;
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/AlipayAccount.php b/htdocs/includes/stripe/stripe-php/lib/AlipayAccount.php
index a79705fa4eb..1d6a5096fff 100644
--- a/htdocs/includes/stripe/stripe-php/lib/AlipayAccount.php
+++ b/htdocs/includes/stripe/stripe-php/lib/AlipayAccount.php
@@ -3,16 +3,14 @@
 namespace Stripe;
 
 /**
- * Class AlipayAccount
- *
- * @package Stripe
+ * Class AlipayAccount.
  *
  * @deprecated Alipay accounts are deprecated. Please use the sources API instead.
- * @link https://stripe.com/docs/sources/alipay
+ * @see https://stripe.com/docs/sources/alipay
  */
 class AlipayAccount extends ApiResource
 {
-    const OBJECT_NAME = "alipay_account";
+    const OBJECT_NAME = 'alipay_account';
 
     use ApiOperations\Delete;
     use ApiOperations\Update;
@@ -28,44 +26,50 @@ class AlipayAccount extends ApiResource
             $parent = $this['customer'];
             $path = 'sources';
         } else {
-            $msg = "Alipay accounts cannot be accessed without a customer ID.";
-            throw new Error\InvalidRequest($msg, null);
+            $msg = 'Alipay accounts cannot be accessed without a customer ID.';
+
+            throw new Exception\UnexpectedValueException($msg);
         }
-        $parentExtn = urlencode(Util\Util::utf8($parent));
-        $extn = urlencode(Util\Util::utf8($this['id']));
-        return "$base/$parentExtn/$path/$extn";
+        $parentExtn = \urlencode(Util\Util::utf8($parent));
+        $extn = \urlencode(Util\Util::utf8($this['id']));
+
+        return "{$base}/{$parentExtn}/{$path}/{$extn}";
     }
 
     /**
      * @param array|string $_id
-     * @param array|string|null $_opts
+     * @param null|array|string $_opts
      *
-     * @throws \Stripe\Error\InvalidRequest
+     * @throws \Stripe\Exception\BadMethodCallException
      *
      * @deprecated Alipay accounts are deprecated. Please use the sources API instead.
-     * @link https://stripe.com/docs/sources/alipay
+     * @see https://stripe.com/docs/sources/alipay
      */
     public static function retrieve($_id, $_opts = null)
     {
-        $msg = "Alipay accounts cannot be accessed without a customer ID. " .
-               "Retrieve an Alipay account using \$customer->sources->retrieve('alipay_account_id') instead.";
-        throw new Error\InvalidRequest($msg, null);
+        $msg = 'Alipay accounts cannot be retrieved without a customer ID. ' .
+               'Retrieve an Alipay account using `Customer::retrieveSource(' .
+               "'customer_id', 'alipay_account_id')`.";
+
+        throw new Exception\BadMethodCallException($msg);
     }
 
     /**
      * @param string $_id
-     * @param array|null $_params
-     * @param array|string|null $_options
+     * @param null|array $_params
+     * @param null|array|string $_options
      *
-     * @throws \Stripe\Error\InvalidRequest
+     * @throws \Stripe\Exception\BadMethodCallException
      *
      * @deprecated Alipay accounts are deprecated. Please use the sources API instead.
-     * @link https://stripe.com/docs/sources/alipay
+     * @see https://stripe.com/docs/sources/alipay
      */
     public static function update($_id, $_params = null, $_options = null)
     {
-        $msg = "Alipay accounts cannot be accessed without a customer ID. " .
-               "Call save() on \$customer->sources->retrieve('alipay_account_id') instead.";
-        throw new Error\InvalidRequest($msg, null);
+        $msg = 'Alipay accounts cannot be updated without a customer ID. ' .
+               'Update an Alipay account using `Customer::updateSource(' .
+               "'customer_id', 'alipay_account_id', \$updateParams)`.";
+
+        throw new Exception\BadMethodCallException($msg);
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/ApiOperations/All.php b/htdocs/includes/stripe/stripe-php/lib/ApiOperations/All.php
index 2762748f95f..ff2955d186f 100644
--- a/htdocs/includes/stripe/stripe-php/lib/ApiOperations/All.php
+++ b/htdocs/includes/stripe/stripe-php/lib/ApiOperations/All.php
@@ -10,8 +10,10 @@ namespace Stripe\ApiOperations;
 trait All
 {
     /**
-     * @param array|null $params
-     * @param array|string|null $opts
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
      *
      * @return \Stripe\Collection of ApiResources
      */
@@ -22,13 +24,14 @@ trait All
 
         list($response, $opts) = static::_staticRequest('get', $url, $params, $opts);
         $obj = \Stripe\Util\Util::convertToStripeObject($response->json, $opts);
-        if (!is_a($obj, 'Stripe\\Collection')) {
-            $class = get_class($obj);
-            $message = "Expected type \"Stripe\\Collection\", got \"$class\" instead";
-            throw new \Stripe\Error\Api($message);
+        if (!($obj instanceof \Stripe\Collection)) {
+            throw new \Stripe\Exception\UnexpectedValueException(
+                'Expected type ' . \Stripe\Collection::class . ', got "' . \get_class($obj) . '" instead.'
+            );
         }
         $obj->setLastResponse($response);
-        $obj->setRequestParams($params);
+        $obj->setFilters($params);
+
         return $obj;
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/ApiOperations/Create.php b/htdocs/includes/stripe/stripe-php/lib/ApiOperations/Create.php
index 4ec66703f56..c4351321d4b 100644
--- a/htdocs/includes/stripe/stripe-php/lib/ApiOperations/Create.php
+++ b/htdocs/includes/stripe/stripe-php/lib/ApiOperations/Create.php
@@ -10,10 +10,12 @@ namespace Stripe\ApiOperations;
 trait Create
 {
     /**
-     * @param array|null $params
-     * @param array|string|null $options
+     * @param null|array $params
+     * @param null|array|string $options
      *
-     * @return static The created resource.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return static the created resource
      */
     public static function create($params = null, $options = null)
     {
@@ -23,6 +25,7 @@ trait Create
         list($response, $opts) = static::_staticRequest('post', $url, $params, $options);
         $obj = \Stripe\Util\Util::convertToStripeObject($response->json, $opts);
         $obj->setLastResponse($response);
+
         return $obj;
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/ApiOperations/Delete.php b/htdocs/includes/stripe/stripe-php/lib/ApiOperations/Delete.php
index 9581765b8af..c6082ff9f4d 100644
--- a/htdocs/includes/stripe/stripe-php/lib/ApiOperations/Delete.php
+++ b/htdocs/includes/stripe/stripe-php/lib/ApiOperations/Delete.php
@@ -10,10 +10,12 @@ namespace Stripe\ApiOperations;
 trait Delete
 {
     /**
-     * @param array|null $params
-     * @param array|string|null $opts
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return static The deleted resource.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return static the deleted resource
      */
     public function delete($params = null, $opts = null)
     {
@@ -22,6 +24,7 @@ trait Delete
         $url = $this->instanceUrl();
         list($response, $opts) = $this->_request('delete', $url, $params, $opts);
         $this->refreshFrom($response, $opts);
+
         return $this;
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/ApiOperations/NestedResource.php b/htdocs/includes/stripe/stripe-php/lib/ApiOperations/NestedResource.php
index 2122354362f..180cacd2ccc 100644
--- a/htdocs/includes/stripe/stripe-php/lib/ApiOperations/NestedResource.php
+++ b/htdocs/includes/stripe/stripe-php/lib/ApiOperations/NestedResource.php
@@ -12,8 +12,8 @@ trait NestedResource
     /**
      * @param string $method
      * @param string $url
-     * @param array|null $params
-     * @param array|string|null $options
+     * @param null|array $params
+     * @param null|array|string $options
      *
      * @return \Stripe\StripeObject
      */
@@ -24,95 +24,112 @@ trait NestedResource
         list($response, $opts) = static::_staticRequest($method, $url, $params, $options);
         $obj = \Stripe\Util\Util::convertToStripeObject($response->json, $opts);
         $obj->setLastResponse($response);
+
         return $obj;
     }
 
     /**
      * @param string $id
      * @param string $nestedPath
-     * @param string|null $nestedId
+     * @param null|string $nestedId
      *
      * @return string
      */
     protected static function _nestedResourceUrl($id, $nestedPath, $nestedId = null)
     {
         $url = static::resourceUrl($id) . $nestedPath;
-        if ($nestedId !== null) {
-            $url .= "/$nestedId";
+        if (null !== $nestedId) {
+            $url .= "/{$nestedId}";
         }
+
         return $url;
     }
 
     /**
      * @param string $id
      * @param string $nestedPath
-     * @param array|null $params
-     * @param array|string|null $options
+     * @param null|array $params
+     * @param null|array|string $options
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
      *
      * @return \Stripe\StripeObject
      */
     protected static function _createNestedResource($id, $nestedPath, $params = null, $options = null)
     {
         $url = static::_nestedResourceUrl($id, $nestedPath);
+
         return self::_nestedResourceOperation('post', $url, $params, $options);
     }
 
     /**
      * @param string $id
      * @param string $nestedPath
-     * @param string|null $nestedId
-     * @param array|null $params
-     * @param array|string|null $options
+     * @param null|string $nestedId
+     * @param null|array $params
+     * @param null|array|string $options
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
      *
      * @return \Stripe\StripeObject
      */
     protected static function _retrieveNestedResource($id, $nestedPath, $nestedId, $params = null, $options = null)
     {
         $url = static::_nestedResourceUrl($id, $nestedPath, $nestedId);
+
         return self::_nestedResourceOperation('get', $url, $params, $options);
     }
 
     /**
      * @param string $id
      * @param string $nestedPath
-     * @param string|null $nestedId
-     * @param array|null $params
-     * @param array|string|null $options
+     * @param null|string $nestedId
+     * @param null|array $params
+     * @param null|array|string $options
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
      *
      * @return \Stripe\StripeObject
      */
     protected static function _updateNestedResource($id, $nestedPath, $nestedId, $params = null, $options = null)
     {
         $url = static::_nestedResourceUrl($id, $nestedPath, $nestedId);
+
         return self::_nestedResourceOperation('post', $url, $params, $options);
     }
 
     /**
      * @param string $id
      * @param string $nestedPath
-     * @param string|null $nestedId
-     * @param array|null $params
-     * @param array|string|null $options
+     * @param null|string $nestedId
+     * @param null|array $params
+     * @param null|array|string $options
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
      *
      * @return \Stripe\StripeObject
      */
     protected static function _deleteNestedResource($id, $nestedPath, $nestedId, $params = null, $options = null)
     {
         $url = static::_nestedResourceUrl($id, $nestedPath, $nestedId);
+
         return self::_nestedResourceOperation('delete', $url, $params, $options);
     }
 
     /**
      * @param string $id
      * @param string $nestedPath
-     * @param array|null $params
-     * @param array|string|null $options
+     * @param null|array $params
+     * @param null|array|string $options
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
      *
      * @return \Stripe\StripeObject
      */
     protected static function _allNestedResources($id, $nestedPath, $params = null, $options = null)
     {
         $url = static::_nestedResourceUrl($id, $nestedPath);
+
         return self::_nestedResourceOperation('get', $url, $params, $options);
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/ApiOperations/Request.php b/htdocs/includes/stripe/stripe-php/lib/ApiOperations/Request.php
index dd048dc5f5c..e300dc13fbb 100644
--- a/htdocs/includes/stripe/stripe-php/lib/ApiOperations/Request.php
+++ b/htdocs/includes/stripe/stripe-php/lib/ApiOperations/Request.php
@@ -10,18 +10,19 @@ namespace Stripe\ApiOperations;
 trait Request
 {
     /**
-     * @param array|null|mixed $params The list of parameters to validate
+     * @param null|array|mixed $params The list of parameters to validate
      *
-     * @throws \Stripe\Error\Api if $params exists and is not an array
+     * @throws \Stripe\Exception\InvalidArgumentException if $params exists and is not an array
      */
     protected static function _validateParams($params = null)
     {
-        if ($params && !is_array($params)) {
-            $message = "You must pass an array as the first argument to Stripe API "
-               . "method calls.  (HINT: an example call to create a charge "
+        if ($params && !\is_array($params)) {
+            $message = 'You must pass an array as the first argument to Stripe API '
+               . 'method calls.  (HINT: an example call to create a charge '
                . "would be: \"Stripe\\Charge::create(['amount' => 100, "
                . "'currency' => 'usd', 'source' => 'tok_1234'])\")";
-            throw new \Stripe\Error\Api($message);
+
+            throw new \Stripe\Exception\InvalidArgumentException($message);
         }
     }
 
@@ -29,7 +30,9 @@ trait Request
      * @param string $method HTTP method ('get', 'post', etc.)
      * @param string $url URL for the request
      * @param array $params list of parameters for the request
-     * @param array|string|null $options
+     * @param null|array|string $options
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
      *
      * @return array tuple containing (the JSON response, $options)
      */
@@ -38,6 +41,7 @@ trait Request
         $opts = $this->_opts->merge($options);
         list($resp, $options) = static::_staticRequest($method, $url, $params, $opts);
         $this->setLastResponse($resp);
+
         return [$resp->json, $options];
     }
 
@@ -45,7 +49,9 @@ trait Request
      * @param string $method HTTP method ('get', 'post', etc.)
      * @param string $url URL for the request
      * @param array $params list of parameters for the request
-     * @param array|string|null $options
+     * @param null|array|string $options
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
      *
      * @return array tuple containing (the JSON response, $options)
      */
@@ -56,6 +62,7 @@ trait Request
         $requestor = new \Stripe\ApiRequestor($opts->apiKey, $baseUrl);
         list($response, $opts->apiKey) = $requestor->request($method, $url, $params, $opts->headers);
         $opts->discardNonPersistentHeaders();
+
         return [$response, $opts];
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/ApiOperations/Retrieve.php b/htdocs/includes/stripe/stripe-php/lib/ApiOperations/Retrieve.php
index ed52296b75b..5170afb327c 100644
--- a/htdocs/includes/stripe/stripe-php/lib/ApiOperations/Retrieve.php
+++ b/htdocs/includes/stripe/stripe-php/lib/ApiOperations/Retrieve.php
@@ -11,9 +11,11 @@ namespace Stripe\ApiOperations;
 trait Retrieve
 {
     /**
-     * @param array|string $id The ID of the API resource to retrieve,
-     *     or an options array containing an `id` key.
-     * @param array|string|null $opts
+     * @param array|string $id the ID of the API resource to retrieve,
+     *     or an options array containing an `id` key
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
      *
      * @return static
      */
@@ -22,6 +24,7 @@ trait Retrieve
         $opts = \Stripe\Util\RequestOptions::parse($opts);
         $instance = new static($id, $opts);
         $instance->refresh();
+
         return $instance;
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/ApiOperations/Update.php b/htdocs/includes/stripe/stripe-php/lib/ApiOperations/Update.php
index e17db280faa..688f0808a79 100644
--- a/htdocs/includes/stripe/stripe-php/lib/ApiOperations/Update.php
+++ b/htdocs/includes/stripe/stripe-php/lib/ApiOperations/Update.php
@@ -11,11 +11,13 @@ namespace Stripe\ApiOperations;
 trait Update
 {
     /**
-     * @param string $id The ID of the resource to update.
-     * @param array|null $params
-     * @param array|string|null $opts
+     * @param string $id the ID of the resource to update
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return static The updated resource.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return static the updated resource
      */
     public static function update($id, $params = null, $opts = null)
     {
@@ -25,22 +27,26 @@ trait Update
         list($response, $opts) = static::_staticRequest('post', $url, $params, $opts);
         $obj = \Stripe\Util\Util::convertToStripeObject($response->json, $opts);
         $obj->setLastResponse($response);
+
         return $obj;
     }
 
     /**
-     * @param array|string|null $opts
+     * @param null|array|string $opts
      *
-     * @return static The saved resource.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return static the saved resource
      */
     public function save($opts = null)
     {
         $params = $this->serializeParameters();
-        if (count($params) > 0) {
+        if (\count($params) > 0) {
             $url = $this->instanceUrl();
             list($response, $opts) = $this->_request('post', $url, $params, $opts);
             $this->refreshFrom($response, $opts);
         }
+
         return $this;
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/ApiRequestor.php b/htdocs/includes/stripe/stripe-php/lib/ApiRequestor.php
index 1f75a007b32..048c462c066 100644
--- a/htdocs/includes/stripe/stripe-php/lib/ApiRequestor.php
+++ b/htdocs/includes/stripe/stripe-php/lib/ApiRequestor.php
@@ -3,14 +3,12 @@
 namespace Stripe;
 
 /**
- * Class ApiRequestor
- *
- * @package Stripe
+ * Class ApiRequestor.
  */
 class ApiRequestor
 {
     /**
-     * @var string|null
+     * @var null|string
      */
     private $_apiKey;
 
@@ -29,11 +27,13 @@ class ApiRequestor
      */
     private static $requestTelemetry;
 
+    private static $OPTIONS_KEYS = ['api_key', 'idempotency_key', 'stripe_account', 'stripe_version', 'api_base'];
+
     /**
      * ApiRequestor constructor.
      *
-     * @param string|null $apiKey
-     * @param string|null $apiBase
+     * @param null|string $apiKey
+     * @param null|string $apiBase
      */
     public function __construct($apiKey = null, $apiBase = null)
     {
@@ -45,77 +45,71 @@ class ApiRequestor
     }
 
     /**
-     * Creates a telemetry json blob for use in 'X-Stripe-Client-Telemetry' headers
+     * Creates a telemetry json blob for use in 'X-Stripe-Client-Telemetry' headers.
+     *
      * @static
      *
      * @param RequestTelemetry $requestTelemetry
+     *
      * @return string
      */
     private static function _telemetryJson($requestTelemetry)
     {
-        $payload = array(
-            'last_request_metrics' => array(
+        $payload = [
+            'last_request_metrics' => [
                 'request_id' => $requestTelemetry->requestId,
                 'request_duration_ms' => $requestTelemetry->requestDuration,
-        ));
+            ],
+        ];
 
-        $result = json_encode($payload);
-        if ($result != false) {
+        $result = \json_encode($payload);
+        if (false !== $result) {
             return $result;
-        } else {
-            Stripe::getLogger()->error("Serializing telemetry payload failed!");
-            return "{}";
         }
+        Stripe::getLogger()->error('Serializing telemetry payload failed!');
+
+        return '{}';
     }
 
     /**
      * @static
      *
-     * @param ApiResource|bool|array|mixed $d
+     * @param ApiResource|array|bool|mixed $d
      *
-     * @return ApiResource|array|string|mixed
+     * @return ApiResource|array|mixed|string
      */
     private static function _encodeObjects($d)
     {
         if ($d instanceof ApiResource) {
             return Util\Util::utf8($d->id);
-        } elseif ($d === true) {
+        }
+        if (true === $d) {
             return 'true';
-        } elseif ($d === false) {
+        }
+        if (false === $d) {
             return 'false';
-        } elseif (is_array($d)) {
+        }
+        if (\is_array($d)) {
             $res = [];
             foreach ($d as $k => $v) {
                 $res[$k] = self::_encodeObjects($v);
             }
+
             return $res;
-        } else {
-            return Util\Util::utf8($d);
         }
+
+        return Util\Util::utf8($d);
     }
 
     /**
      * @param string     $method
      * @param string     $url
-     * @param array|null $params
-     * @param array|null $headers
+     * @param null|array $params
+     * @param null|array $headers
      *
-     * @return array An array whose first element is an API response and second
-     *    element is the API key used to make the request.
-     * @throws Error\Api
-     * @throws Error\Authentication
-     * @throws Error\Card
-     * @throws Error\InvalidRequest
-     * @throws Error\OAuth\InvalidClient
-     * @throws Error\OAuth\InvalidGrant
-     * @throws Error\OAuth\InvalidRequest
-     * @throws Error\OAuth\InvalidScope
-     * @throws Error\OAuth\UnsupportedGrantType
-     * @throws Error\OAuth\UnsupportedResponseType
-     * @throws Error\Permission
-     * @throws Error\RateLimit
-     * @throws Error\Idempotency
-     * @throws Error\ApiConnection
+     * @throws Exception\ApiErrorException
+     *
+     * @return array tuple containing (ApiReponse, API key)
      */
     public function request($method, $url, $params = null, $headers = null)
     {
@@ -125,48 +119,32 @@ class ApiRequestor
         $this->_requestRaw($method, $url, $params, $headers);
         $json = $this->_interpretResponse($rbody, $rcode, $rheaders);
         $resp = new ApiResponse($rbody, $rcode, $rheaders, $json);
+
         return [$resp, $myApiKey];
     }
 
     /**
-     * @param string $rbody A JSON string.
+     * @param string $rbody a JSON string
      * @param int $rcode
      * @param array $rheaders
      * @param array $resp
      *
-     * @throws Error\InvalidRequest if the error is caused by the user.
-     * @throws Error\Authentication if the error is caused by a lack of
-     *    permissions.
-     * @throws Error\Permission if the error is caused by insufficient
-     *    permissions.
-     * @throws Error\Card if the error is the error code is 402 (payment
-     *    required)
-     * @throws Error\InvalidRequest if the error is caused by the user.
-     * @throws Error\Idempotency if the error is caused by an idempotency key.
-     * @throws Error\OAuth\InvalidClient
-     * @throws Error\OAuth\InvalidGrant
-     * @throws Error\OAuth\InvalidRequest
-     * @throws Error\OAuth\InvalidScope
-     * @throws Error\OAuth\UnsupportedGrantType
-     * @throws Error\OAuth\UnsupportedResponseType
-     * @throws Error\Permission if the error is caused by insufficient
-     *    permissions.
-     * @throws Error\RateLimit if the error is caused by too many requests
-     *    hitting the API.
-     * @throws Error\Api otherwise.
+     * @throws Exception\UnexpectedValueException
+     * @throws Exception\ApiErrorException
      */
     public function handleErrorResponse($rbody, $rcode, $rheaders, $resp)
     {
-        if (!is_array($resp) || !isset($resp['error'])) {
-            $msg = "Invalid response object from API: $rbody "
-              . "(HTTP response code was $rcode)";
-            throw new Error\Api($msg, $rcode, $rbody, $resp, $rheaders);
+        if (!\is_array($resp) || !isset($resp['error'])) {
+            $msg = "Invalid response object from API: {$rbody} "
+              . "(HTTP response code was {$rcode})";
+
+            throw new Exception\UnexpectedValueException($msg);
         }
 
         $errorData = $resp['error'];
 
         $error = null;
-        if (is_string($errorData)) {
+        if (\is_string($errorData)) {
             $error = self::_specificOAuthError($rbody, $rcode, $rheaders, $resp, $errorData);
         }
         if (!$error) {
@@ -185,7 +163,7 @@ class ApiRequestor
      * @param array  $resp
      * @param array  $errorData
      *
-     * @return Error\RateLimit|Error\Idempotency|Error\InvalidRequest|Error\Authentication|Error\Card|Error\Permission|Error\Api
+     * @return Exception\ApiErrorException
      */
     private static function _specificAPIError($rbody, $rcode, $rheaders, $resp, $errorData)
     {
@@ -193,44 +171,50 @@ class ApiRequestor
         $param = isset($errorData['param']) ? $errorData['param'] : null;
         $code = isset($errorData['code']) ? $errorData['code'] : null;
         $type = isset($errorData['type']) ? $errorData['type'] : null;
+        $declineCode = isset($errorData['decline_code']) ? $errorData['decline_code'] : null;
 
         switch ($rcode) {
             case 400:
                 // 'rate_limit' code is deprecated, but left here for backwards compatibility
                 // for API versions earlier than 2015-09-08
-                if ($code == 'rate_limit') {
-                    return new Error\RateLimit($msg, $param, $rcode, $rbody, $resp, $rheaders);
+                if ('rate_limit' === $code) {
+                    return Exception\RateLimitException::factory($msg, $rcode, $rbody, $resp, $rheaders, $code, $param);
                 }
-                if ($type == 'idempotency_error') {
-                    return new Error\Idempotency($msg, $rcode, $rbody, $resp, $rheaders);
+                if ('idempotency_error' === $type) {
+                    return Exception\IdempotencyException::factory($msg, $rcode, $rbody, $resp, $rheaders, $code);
                 }
 
                 // no break
             case 404:
-                return new Error\InvalidRequest($msg, $param, $rcode, $rbody, $resp, $rheaders);
+                return Exception\InvalidRequestException::factory($msg, $rcode, $rbody, $resp, $rheaders, $code, $param);
+
             case 401:
-                return new Error\Authentication($msg, $rcode, $rbody, $resp, $rheaders);
+                return Exception\AuthenticationException::factory($msg, $rcode, $rbody, $resp, $rheaders, $code);
+
             case 402:
-                return new Error\Card($msg, $param, $code, $rcode, $rbody, $resp, $rheaders);
+                return Exception\CardException::factory($msg, $rcode, $rbody, $resp, $rheaders, $code, $declineCode, $param);
+
             case 403:
-                return new Error\Permission($msg, $rcode, $rbody, $resp, $rheaders);
+                return Exception\PermissionException::factory($msg, $rcode, $rbody, $resp, $rheaders, $code);
+
             case 429:
-                return new Error\RateLimit($msg, $param, $rcode, $rbody, $resp, $rheaders);
+                return Exception\RateLimitException::factory($msg, $rcode, $rbody, $resp, $rheaders, $code, $param);
+
             default:
-                return new Error\Api($msg, $rcode, $rbody, $resp, $rheaders);
+                return Exception\UnknownApiErrorException::factory($msg, $rcode, $rbody, $resp, $rheaders, $code);
         }
     }
 
     /**
      * @static
      *
-     * @param string|bool $rbody
+     * @param bool|string $rbody
      * @param int         $rcode
      * @param array       $rheaders
      * @param array       $resp
      * @param string      $errorCode
      *
-     * @return null|Error\OAuth\InvalidClient|Error\OAuth\InvalidGrant|Error\OAuth\InvalidRequest|Error\OAuth\InvalidScope|Error\OAuth\UnsupportedGrantType|Error\OAuth\UnsupportedResponseType
+     * @return Exception\OAuth\OAuthErrorException
      */
     private static function _specificOAuthError($rbody, $rcode, $rheaders, $resp, $errorCode)
     {
@@ -238,20 +222,26 @@ class ApiRequestor
 
         switch ($errorCode) {
             case 'invalid_client':
-                return new Error\OAuth\InvalidClient($errorCode, $description, $rcode, $rbody, $resp, $rheaders);
-            case 'invalid_grant':
-                return new Error\OAuth\InvalidGrant($errorCode, $description, $rcode, $rbody, $resp, $rheaders);
-            case 'invalid_request':
-                return new Error\OAuth\InvalidRequest($errorCode, $description, $rcode, $rbody, $resp, $rheaders);
-            case 'invalid_scope':
-                return new Error\OAuth\InvalidScope($errorCode, $description, $rcode, $rbody, $resp, $rheaders);
-            case 'unsupported_grant_type':
-                return new Error\OAuth\UnsupportedGrantType($errorCode, $description, $rcode, $rbody, $resp, $rheaders);
-            case 'unsupported_response_type':
-                return new Error\OAuth\UnsupportedResponseType($errorCode, $description, $rcode, $rbody, $resp, $rheaders);
-        }
+                return Exception\OAuth\InvalidClientException::factory($description, $rcode, $rbody, $resp, $rheaders, $errorCode);
 
-        return null;
+            case 'invalid_grant':
+                return Exception\OAuth\InvalidGrantException::factory($description, $rcode, $rbody, $resp, $rheaders, $errorCode);
+
+            case 'invalid_request':
+                return Exception\OAuth\InvalidRequestException::factory($description, $rcode, $rbody, $resp, $rheaders, $errorCode);
+
+            case 'invalid_scope':
+                return Exception\OAuth\InvalidScopeException::factory($description, $rcode, $rbody, $resp, $rheaders, $errorCode);
+
+            case 'unsupported_grant_type':
+                return Exception\OAuth\UnsupportedGrantTypeException::factory($description, $rcode, $rbody, $resp, $rheaders, $errorCode);
+
+            case 'unsupported_response_type':
+                return Exception\OAuth\UnsupportedResponseTypeException::factory($description, $rcode, $rbody, $resp, $rheaders, $errorCode);
+
+            default:
+                return Exception\OAuth\UnknownOAuthErrorException::factory($description, $rcode, $rbody, $resp, $rheaders, $errorCode);
+        }
     }
 
     /**
@@ -263,18 +253,40 @@ class ApiRequestor
      */
     private static function _formatAppInfo($appInfo)
     {
-        if ($appInfo !== null) {
+        if (null !== $appInfo) {
             $string = $appInfo['name'];
-            if ($appInfo['version'] !== null) {
+            if (null !== $appInfo['version']) {
                 $string .= '/' . $appInfo['version'];
             }
-            if ($appInfo['url'] !== null) {
+            if (null !== $appInfo['url']) {
                 $string .= ' (' . $appInfo['url'] . ')';
             }
+
             return $string;
-        } else {
-            return null;
         }
+
+        return null;
+    }
+
+    /**
+     * @static
+     *
+     * @param string $disabledFunctionsOutput - String value of the 'disable_function' setting, as output by \ini_get('disable_functions')
+     * @param string $functionName - Name of the function we are interesting in seeing whether or not it is disabled
+     * @param mixed $disableFunctionsOutput
+     *
+     * @return bool
+     */
+    private static function _isDisabled($disableFunctionsOutput, $functionName)
+    {
+        $disabledFunctions = \explode(',', $disableFunctionsOutput);
+        foreach ($disabledFunctions as $disabledFunction) {
+            if (\trim($disabledFunction) === $functionName) {
+                return true;
+            }
+        }
+
+        return false;
     }
 
     /**
@@ -289,8 +301,9 @@ class ApiRequestor
     {
         $uaString = 'Stripe/v1 PhpBindings/' . Stripe::VERSION;
 
-        $langVersion = phpversion();
-        $uname = php_uname();
+        $langVersion = \PHP_VERSION;
+        $uname_disabled = static::_isDisabled(\ini_get('disable_functions'), 'php_uname');
+        $uname = $uname_disabled ? '(disabled)' : \php_uname();
 
         $appInfo = Stripe::getAppInfo();
         $ua = [
@@ -301,31 +314,30 @@ class ApiRequestor
             'uname' => $uname,
         ];
         if ($clientInfo) {
-            $ua = array_merge($clientInfo, $ua);
+            $ua = \array_merge($clientInfo, $ua);
         }
-        if ($appInfo !== null) {
+        if (null !== $appInfo) {
             $uaString .= ' ' . self::_formatAppInfo($appInfo);
             $ua['application'] = $appInfo;
         }
 
-        $defaultHeaders = [
-            'X-Stripe-Client-User-Agent' => json_encode($ua),
+        return [
+            'X-Stripe-Client-User-Agent' => \json_encode($ua),
             'User-Agent' => $uaString,
             'Authorization' => 'Bearer ' . $apiKey,
         ];
-        return $defaultHeaders;
     }
 
     /**
      * @param string $method
      * @param string $url
-     * @param array  $params
-     * @param array  $headers
+     * @param array $params
+     * @param array $headers
+     *
+     * @throws Exception\AuthenticationException
+     * @throws Exception\ApiConnectionException
      *
      * @return array
-     * @throws Error\Api
-     * @throws Error\ApiConnection
-     * @throws Error\Authentication
      */
     private function _requestRaw($method, $url, $params, $headers)
     {
@@ -339,18 +351,34 @@ class ApiRequestor
               . '"Stripe::setApiKey(<API-KEY>)".  You can generate API keys from '
               . 'the Stripe web interface.  See https://stripe.com/api for '
               . 'details, or email support@stripe.com if you have any questions.';
-            throw new Error\Authentication($msg);
+
+            throw new Exception\AuthenticationException($msg);
         }
 
         // Clients can supply arbitrary additional keys to be included in the
         // X-Stripe-Client-User-Agent header via the optional getUserAgentInfo()
         // method
         $clientUAInfo = null;
-        if (method_exists($this->httpClient(), 'getUserAgentInfo')) {
+        if (\method_exists($this->httpClient(), 'getUserAgentInfo')) {
             $clientUAInfo = $this->httpClient()->getUserAgentInfo();
         }
 
-        $absUrl = $this->_apiBase.$url;
+        if ($params && \is_array($params)) {
+            $optionKeysInParams = \array_filter(
+                static::$OPTIONS_KEYS,
+                function ($key) use ($params) {
+                    return \array_key_exists($key, $params);
+                }
+            );
+            if (\count($optionKeysInParams) > 0) {
+                $message = \sprintf('Options found in $params: %s. Options should '
+                  . 'be passed in their own array after $params. (HINT: pass an '
+                  . 'empty array to $params if you do not have any.)', \implode(', ', $optionKeysInParams));
+                \trigger_error($message, \E_USER_WARNING);
+            }
+        }
+
+        $absUrl = $this->_apiBase . $url;
         $params = self::_encodeObjects($params);
         $defaultHeaders = $this->_defaultHeaders($myApiKey, $clientUAInfo);
         if (Stripe::$apiVersion) {
@@ -361,17 +389,16 @@ class ApiRequestor
             $defaultHeaders['Stripe-Account'] = Stripe::$accountId;
         }
 
-        if (Stripe::$enableTelemetry && self::$requestTelemetry != null) {
-            $defaultHeaders["X-Stripe-Client-Telemetry"] = self::_telemetryJson(self::$requestTelemetry);
+        if (Stripe::$enableTelemetry && null !== self::$requestTelemetry) {
+            $defaultHeaders['X-Stripe-Client-Telemetry'] = self::_telemetryJson(self::$requestTelemetry);
         }
 
         $hasFile = false;
-        $hasCurlFile = class_exists('\CURLFile', false);
         foreach ($params as $k => $v) {
-            if (is_resource($v)) {
+            if (\is_resource($v)) {
                 $hasFile = true;
-                $params[$k] = self::_processResourceParam($v, $hasCurlFile);
-            } elseif ($hasCurlFile && $v instanceof \CURLFile) {
+                $params[$k] = self::_processResourceParam($v);
+            } elseif ($v instanceof \CURLFile) {
                 $hasFile = true;
             }
         }
@@ -382,7 +409,7 @@ class ApiRequestor
             $defaultHeaders['Content-Type'] = 'application/x-www-form-urlencoded';
         }
 
-        $combinedHeaders = array_merge($defaultHeaders, $headers);
+        $combinedHeaders = \array_merge($defaultHeaders, $headers);
         $rawHeaders = [];
 
         foreach ($combinedHeaders as $header => $value) {
@@ -399,7 +426,9 @@ class ApiRequestor
             $hasFile
         );
 
-        if (array_key_exists('request-id', $rheaders)) {
+        if (isset($rheaders['request-id'])
+        && \is_string($rheaders['request-id'])
+        && \strlen($rheaders['request-id']) > 0) {
             self::$requestTelemetry = new RequestTelemetry(
                 $rheaders['request-id'],
                 Util\Util::currentTimeMillis() - $requestStartMs
@@ -411,32 +440,28 @@ class ApiRequestor
 
     /**
      * @param resource $resource
-     * @param bool     $hasCurlFile
+     *
+     * @throws Exception\InvalidArgumentException
      *
      * @return \CURLFile|string
-     * @throws Error\Api
      */
-    private function _processResourceParam($resource, $hasCurlFile)
+    private function _processResourceParam($resource)
     {
-        if (get_resource_type($resource) !== 'stream') {
-            throw new Error\Api(
+        if ('stream' !== \get_resource_type($resource)) {
+            throw new Exception\InvalidArgumentException(
                 'Attempted to upload a resource that is not a stream'
             );
         }
 
-        $metaData = stream_get_meta_data($resource);
-        if ($metaData['wrapper_type'] !== 'plainfile') {
-            throw new Error\Api(
+        $metaData = \stream_get_meta_data($resource);
+        if ('plainfile' !== $metaData['wrapper_type']) {
+            throw new Exception\InvalidArgumentException(
                 'Only plainfile resource streams are supported'
             );
         }
 
-        if ($hasCurlFile) {
-            // We don't have the filename or mimetype, but the API doesn't care
-            return new \CURLFile($metaData['uri']);
-        } else {
-            return '@'.$metaData['uri'];
-        }
+        // We don't have the filename or mimetype, but the API doesn't care
+        return new \CURLFile($metaData['uri']);
     }
 
     /**
@@ -444,34 +469,26 @@ class ApiRequestor
      * @param int    $rcode
      * @param array  $rheaders
      *
-     * @return mixed
-     * @throws Error\Api
-     * @throws Error\Authentication
-     * @throws Error\Card
-     * @throws Error\InvalidRequest
-     * @throws Error\OAuth\InvalidClient
-     * @throws Error\OAuth\InvalidGrant
-     * @throws Error\OAuth\InvalidRequest
-     * @throws Error\OAuth\InvalidScope
-     * @throws Error\OAuth\UnsupportedGrantType
-     * @throws Error\OAuth\UnsupportedResponseType
-     * @throws Error\Permission
-     * @throws Error\RateLimit
-     * @throws Error\Idempotency
+     * @throws Exception\UnexpectedValueException
+     * @throws Exception\ApiErrorException
+     *
+     * @return array
      */
     private function _interpretResponse($rbody, $rcode, $rheaders)
     {
-        $resp = json_decode($rbody, true);
-        $jsonError = json_last_error();
-        if ($resp === null && $jsonError !== JSON_ERROR_NONE) {
-            $msg = "Invalid response body from API: $rbody "
-              . "(HTTP response code was $rcode, json_last_error() was $jsonError)";
-            throw new Error\Api($msg, $rcode, $rbody);
+        $resp = \json_decode($rbody, true);
+        $jsonError = \json_last_error();
+        if (null === $resp && \JSON_ERROR_NONE !== $jsonError) {
+            $msg = "Invalid response body from API: {$rbody} "
+              . "(HTTP response code was {$rcode}, json_last_error() was {$jsonError})";
+
+            throw new Exception\UnexpectedValueException($msg, $rcode);
         }
 
         if ($rcode < 200 || $rcode >= 300) {
             $this->handleErrorResponse($rbody, $rcode, $rheaders, $resp);
         }
+
         return $resp;
     }
 
@@ -503,6 +520,7 @@ class ApiRequestor
         if (!self::$_httpClient) {
             self::$_httpClient = HttpClient\CurlClient::instance();
         }
+
         return self::$_httpClient;
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/ApiResource.php b/htdocs/includes/stripe/stripe-php/lib/ApiResource.php
index fe594321687..521010b3f7c 100644
--- a/htdocs/includes/stripe/stripe-php/lib/ApiResource.php
+++ b/htdocs/includes/stripe/stripe-php/lib/ApiResource.php
@@ -3,9 +3,7 @@
 namespace Stripe;
 
 /**
- * Class ApiResource
- *
- * @package Stripe
+ * Class ApiResource.
  */
 abstract class ApiResource extends StripeObject
 {
@@ -21,14 +19,15 @@ abstract class ApiResource extends StripeObject
     public static function getSavedNestedResources()
     {
         static $savedNestedResources = null;
-        if ($savedNestedResources === null) {
+        if (null === $savedNestedResources) {
             $savedNestedResources = new Util\Set();
         }
+
         return $savedNestedResources;
     }
 
     /**
-     * @var boolean A flag that can be set a behavior that will cause this
+     * @var bool A flag that can be set a behavior that will cause this
      * resource to be encoded and sent up along with an update of its parent
      * resource. This is usually not desirable because resources are updated
      * individually on their own endpoints, but there are certain cases,
@@ -39,16 +38,17 @@ abstract class ApiResource extends StripeObject
     public function __set($k, $v)
     {
         parent::__set($k, $v);
-        $v = $this->$k;
-        if ((static::getSavedNestedResources()->includes($k)) &&
-            ($v instanceof ApiResource)) {
+        $v = $this->{$k};
+        if ((static::getSavedNestedResources()->includes($k))
+            && ($v instanceof ApiResource)) {
             $v->saveWithParent = true;
         }
-        return $v;
     }
 
     /**
-     * @return ApiResource The refreshed resource.
+     * @throws Exception\ApiErrorException
+     *
+     * @return ApiResource the refreshed resource
      */
     public function refresh()
     {
@@ -63,11 +63,12 @@ abstract class ApiResource extends StripeObject
         );
         $this->setLastResponse($response);
         $this->refreshFrom($response->json, $this->_opts);
+
         return $this;
     }
 
     /**
-     * @return string The base URL for the given class.
+     * @return string the base URL for the given class
      */
     public static function baseUrl()
     {
@@ -75,35 +76,42 @@ abstract class ApiResource extends StripeObject
     }
 
     /**
-     * @return string The endpoint URL for the given class.
+     * @return string the endpoint URL for the given class
      */
     public static function classUrl()
     {
         // Replace dots with slashes for namespaced resources, e.g. if the object's name is
         // "foo.bar", then its URL will be "/v1/foo/bars".
-        $base = str_replace('.', '/', static::OBJECT_NAME);
-        return "/v1/${base}s";
+        $base = \str_replace('.', '/', static::OBJECT_NAME);
+
+        return "/v1/{$base}s";
     }
 
     /**
-     * @return string The instance endpoint URL for the given class.
+     * @param null|string $id the ID of the resource
+     *
+     * @throws Exception\UnexpectedValueException if $id is null
+     *
+     * @return string the instance endpoint URL for the given class
      */
     public static function resourceUrl($id)
     {
-        if ($id === null) {
-            $class = get_called_class();
-            $message = "Could not determine which URL to request: "
-               . "$class instance has invalid ID: $id";
-            throw new Error\InvalidRequest($message, null);
+        if (null === $id) {
+            $class = static::class;
+            $message = 'Could not determine which URL to request: '
+               . "{$class} instance has invalid ID: {$id}";
+
+            throw new Exception\UnexpectedValueException($message);
         }
         $id = Util\Util::utf8($id);
         $base = static::classUrl();
-        $extn = urlencode($id);
-        return "$base/$extn";
+        $extn = \urlencode($id);
+
+        return "{$base}/{$extn}";
     }
 
     /**
-     * @return string The full API URL for this API resource.
+     * @return string the full API URL for this API resource
      */
     public function instanceUrl()
     {
diff --git a/htdocs/includes/stripe/stripe-php/lib/ApiResponse.php b/htdocs/includes/stripe/stripe-php/lib/ApiResponse.php
index acca75123e6..e7ee2e9a903 100644
--- a/htdocs/includes/stripe/stripe-php/lib/ApiResponse.php
+++ b/htdocs/includes/stripe/stripe-php/lib/ApiResponse.php
@@ -5,24 +5,35 @@ namespace Stripe;
 use Stripe\Util\CaseInsensitiveArray;
 
 /**
- * Class ApiResponse
- *
- * @package Stripe
+ * Class ApiResponse.
  */
 class ApiResponse
 {
+    /**
+     * @var null|array|CaseInsensitiveArray
+     */
     public $headers;
+
+    /**
+     * @var string
+     */
     public $body;
+
+    /**
+     * @var null|array
+     */
     public $json;
+
+    /**
+     * @var int
+     */
     public $code;
 
     /**
      * @param string $body
-     * @param integer $code
-     * @param array|CaseInsensitiveArray|null $headers
-     * @param array|null $json
-     *
-     * @return obj An APIResponse
+     * @param int $code
+     * @param null|array|CaseInsensitiveArray $headers
+     * @param null|array $json
      */
     public function __construct($body, $code, $headers, $json)
     {
diff --git a/htdocs/includes/stripe/stripe-php/lib/ApplePayDomain.php b/htdocs/includes/stripe/stripe-php/lib/ApplePayDomain.php
index 57687c4f2e4..5f9489d47d4 100644
--- a/htdocs/includes/stripe/stripe-php/lib/ApplePayDomain.php
+++ b/htdocs/includes/stripe/stripe-php/lib/ApplePayDomain.php
@@ -1,15 +1,19 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class ApplePayDomain
- *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $domain_name
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
  */
 class ApplePayDomain extends ApiResource
 {
-    const OBJECT_NAME = "apple_pay_domain";
+    const OBJECT_NAME = 'apple_pay_domain';
 
     use ApiOperations\All;
     use ApiOperations\Create;
diff --git a/htdocs/includes/stripe/stripe-php/lib/ApplicationFee.php b/htdocs/includes/stripe/stripe-php/lib/ApplicationFee.php
index 4b83071ade4..88aeed64553 100644
--- a/htdocs/includes/stripe/stripe-php/lib/ApplicationFee.php
+++ b/htdocs/includes/stripe/stripe-php/lib/ApplicationFee.php
@@ -1,30 +1,28 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class ApplicationFee
- *
- * @property string $id
- * @property string $object
- * @property string $account
- * @property int $amount
- * @property int $amount_refunded
- * @property string $application
- * @property string $balance_transaction
- * @property string $charge
- * @property int $created
- * @property string $currency
- * @property bool $livemode
- * @property string $originating_transaction
- * @property bool $refunded
- * @property Collection $refunds
- *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property string|\Stripe\Account $account ID of the Stripe account this fee was taken from.
+ * @property int $amount Amount earned, in %s.
+ * @property int $amount_refunded Amount in %s refunded (can be less than the amount attribute on the fee if a partial refund was issued)
+ * @property string|\Stripe\StripeObject $application ID of the Connect application that earned the fee.
+ * @property null|string|\Stripe\BalanceTransaction $balance_transaction Balance transaction that describes the impact of this collected application fee on your account balance (not including refunds).
+ * @property string|\Stripe\Charge $charge ID of the charge that the application fee was taken from.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|string|\Stripe\Charge $originating_transaction ID of the corresponding charge on the platform account, if this fee was the result of a charge using the <code>destination</code> parameter.
+ * @property bool $refunded Whether the fee has been fully refunded. If the fee is only partially refunded, this attribute will still be false.
+ * @property \Stripe\Collection $refunds A list of refunds that have been applied to the fee.
  */
 class ApplicationFee extends ApiResource
 {
-    const OBJECT_NAME = "application_fee";
+    const OBJECT_NAME = 'application_fee';
 
     use ApiOperations\All;
     use ApiOperations\NestedResource;
@@ -33,24 +31,27 @@ class ApplicationFee extends ApiResource
     const PATH_REFUNDS = '/refunds';
 
     /**
-     * @param array|null $params
-     * @param array|string|null $opts
+     * @param string $id the ID of the application fee on which to retrieve the fee refunds
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return ApplicationFee The refunded application fee.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection the list of fee refunds
      */
-    public function refund($params = null, $opts = null)
+    public static function allRefunds($id, $params = null, $opts = null)
     {
-        $this->refunds->create($params, $opts);
-        $this->refresh();
-        return $this;
+        return self::_allNestedResources($id, static::PATH_REFUNDS, $params, $opts);
     }
 
     /**
-     * @param string|null $id The ID of the application fee on which to create the refund.
-     * @param array|null $params
-     * @param array|string|null $opts
+     * @param string $id the ID of the application fee on which to create the fee refund
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return ApplicationFeeRefund
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\ApplicationFeeRefund
      */
     public static function createRefund($id, $params = null, $opts = null)
     {
@@ -58,12 +59,14 @@ class ApplicationFee extends ApiResource
     }
 
     /**
-     * @param string|null $id The ID of the application fee to which the refund belongs.
-     * @param array|null $refundId The ID of the refund to retrieve.
-     * @param array|null $params
-     * @param array|string|null $opts
+     * @param string $id the ID of the application fee to which the fee refund belongs
+     * @param string $refundId the ID of the fee refund to retrieve
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return ApplicationFeeRefund
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\ApplicationFeeRefund
      */
     public static function retrieveRefund($id, $refundId, $params = null, $opts = null)
     {
@@ -71,27 +74,17 @@ class ApplicationFee extends ApiResource
     }
 
     /**
-     * @param string|null $id The ID of the application fee to which the refund belongs.
-     * @param array|null $refundId The ID of the refund to update.
-     * @param array|null $params
-     * @param array|string|null $opts
+     * @param string $id the ID of the application fee to which the fee refund belongs
+     * @param string $refundId the ID of the fee refund to update
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return ApplicationFeeRefund
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\ApplicationFeeRefund
      */
     public static function updateRefund($id, $refundId, $params = null, $opts = null)
     {
         return self::_updateNestedResource($id, static::PATH_REFUNDS, $refundId, $params, $opts);
     }
-
-    /**
-     * @param string|null $id The ID of the application fee on which to retrieve the refunds.
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection The list of refunds.
-     */
-    public static function allRefunds($id, $params = null, $opts = null)
-    {
-        return self::_allNestedResources($id, static::PATH_REFUNDS, $params, $opts);
-    }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/ApplicationFeeRefund.php b/htdocs/includes/stripe/stripe-php/lib/ApplicationFeeRefund.php
index b242f2024b4..dc7c34bac20 100644
--- a/htdocs/includes/stripe/stripe-php/lib/ApplicationFeeRefund.php
+++ b/htdocs/includes/stripe/stripe-php/lib/ApplicationFeeRefund.php
@@ -1,40 +1,46 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class ApplicationFeeRefund
+ * <code>Application Fee Refund</code> objects allow you to refund an application
+ * fee that has previously been created but not yet refunded. Funds will be
+ * refunded to the Stripe account from which the fee was originally collected.
  *
- * @property string $id
- * @property string $object
- * @property int $amount
- * @property string $balance_transaction
- * @property int $created
- * @property string $currency
- * @property string $fee
- * @property StripeObject $metadata
+ * Related guide: <a
+ * href="https://stripe.com/docs/connect/destination-charges#refunding-app-fee">Refunding
+ * Application Fees</a>.
  *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Amount, in %s.
+ * @property null|string|\Stripe\BalanceTransaction $balance_transaction Balance transaction that describes the impact on your account balance.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property string|\Stripe\ApplicationFee $fee ID of the application fee that was refunded.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
  */
 class ApplicationFeeRefund extends ApiResource
 {
-    const OBJECT_NAME = "fee_refund";
+    const OBJECT_NAME = 'fee_refund';
 
     use ApiOperations\Update {
         save as protected _save;
     }
 
     /**
-     * @return string The API URL for this Stripe refund.
+     * @return string the API URL for this Stripe refund
      */
     public function instanceUrl()
     {
         $id = $this['id'];
         $fee = $this['fee'];
         if (!$id) {
-            throw new Error\InvalidRequest(
-                "Could not determine which URL to request: " .
-                "class instance has invalid ID: $id",
+            throw new Exception\UnexpectedValueException(
+                'Could not determine which URL to request: ' .
+                "class instance has invalid ID: {$id}",
                 null
             );
         }
@@ -42,15 +48,16 @@ class ApplicationFeeRefund extends ApiResource
         $fee = Util\Util::utf8($fee);
 
         $base = ApplicationFee::classUrl();
-        $feeExtn = urlencode($fee);
-        $extn = urlencode($id);
-        return "$base/$feeExtn/refunds/$extn";
+        $feeExtn = \urlencode($fee);
+        $extn = \urlencode($id);
+
+        return "{$base}/{$feeExtn}/refunds/{$extn}";
     }
 
     /**
-     * @param array|string|null $opts
+     * @param null|array|string $opts
      *
-     * @return ApplicationFeeRefund The saved refund.
+     * @return ApplicationFeeRefund the saved refund
      */
     public function save($opts = null)
     {
diff --git a/htdocs/includes/stripe/stripe-php/lib/Balance.php b/htdocs/includes/stripe/stripe-php/lib/Balance.php
index b99871adb85..0fdc2850c41 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Balance.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Balance.php
@@ -1,26 +1,42 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class Balance
+ * This is an object representing your Stripe balance. You can retrieve it to see
+ * the balance currently on your Stripe account.
  *
- * @property string $object
- * @property array $available
- * @property array $connect_reserved
- * @property bool $livemode
- * @property array $pending
+ * You can also retrieve the balance history, which contains a list of <a
+ * href="https://stripe.com/docs/reporting/balance-transaction-types">transactions</a>
+ * that contributed to the balance (charges, payouts, and so forth).
  *
- * @package Stripe
+ * The available and pending amounts for each currency are broken down further by
+ * payment source types.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/connect/account-balances">Understanding Connect
+ * Account Balances</a>.
+ *
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property \Stripe\StripeObject[] $available Funds that are available to be transferred or paid out, whether automatically by Stripe or explicitly via the <a href="https://stripe.com/docs/api#transfers">Transfers API</a> or <a href="https://stripe.com/docs/api#payouts">Payouts API</a>. The available balance for each currency and payment type can be found in the <code>source_types</code> property.
+ * @property \Stripe\StripeObject[] $connect_reserved Funds held due to negative balances on connected Custom accounts. The connect reserve balance for each currency and payment type can be found in the <code>source_types</code> property.
+ * @property \Stripe\StripeObject[] $instant_available Funds that can be paid out using Instant Payouts.
+ * @property \Stripe\StripeObject $issuing
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject[] $pending Funds that are not yet available in the balance, due to the 7-day rolling pay cycle. The pending balance for each currency, and for each payment type, can be found in the <code>source_types</code> property.
  */
 class Balance extends SingletonApiResource
 {
-    const OBJECT_NAME = "balance";
+    const OBJECT_NAME = 'balance';
 
     /**
-     * @param array|string|null $opts
+     * @param null|array|string $opts
      *
-     * @return Balance
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Balance
      */
     public static function retrieve($opts = null)
     {
diff --git a/htdocs/includes/stripe/stripe-php/lib/BalanceTransaction.php b/htdocs/includes/stripe/stripe-php/lib/BalanceTransaction.php
index 78805d4d448..d7ddea4303d 100644
--- a/htdocs/includes/stripe/stripe-php/lib/BalanceTransaction.php
+++ b/htdocs/includes/stripe/stripe-php/lib/BalanceTransaction.php
@@ -1,65 +1,71 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class BalanceTransaction
+ * Balance transactions represent funds moving through your Stripe account. They're
+ * created for every type of transaction that comes into or flows out of your
+ * Stripe account balance.
  *
- * @property string $id
- * @property string $object
- * @property int $amount
- * @property int $available_on
- * @property int $created
- * @property string $currency
- * @property string $description
- * @property float $exchange_rate
- * @property int $fee
- * @property mixed $fee_details
- * @property int $net
- * @property string $source
- * @property string $status
- * @property string $type
+ * Related guide: <a
+ * href="https://stripe.com/docs/reports/balance-transaction-types">Balance
+ * Transaction Types</a>.
  *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Gross amount of the transaction, in %s.
+ * @property int $available_on The date the transaction's net funds will become available in the Stripe balance.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property null|float $exchange_rate The exchange rate used, if applicable, for this transaction. Specifically, if money was converted from currency A to currency B, then the <code>amount</code> in currency A, times <code>exchange_rate</code>, would be the <code>amount</code> in currency B. For example, suppose you charged a customer 10.00 EUR. Then the PaymentIntent's <code>amount</code> would be <code>1000</code> and <code>currency</code> would be <code>eur</code>. Suppose this was converted into 12.34 USD in your Stripe account. Then the BalanceTransaction's <code>amount</code> would be <code>1234</code>, <code>currency</code> would be <code>usd</code>, and <code>exchange_rate</code> would be <code>1.234</code>.
+ * @property int $fee Fees (in %s) paid for this transaction.
+ * @property \Stripe\StripeObject[] $fee_details Detailed breakdown of fees (in %s) paid for this transaction.
+ * @property int $net Net amount of the transaction, in %s.
+ * @property string $reporting_category <a href="https://stripe.com/docs/reports/reporting-categories">Learn more</a> about how reporting categories can help you understand balance transactions from an accounting perspective.
+ * @property null|string|\Stripe\StripeObject $source The Stripe object to which this transaction is related.
+ * @property string $status If the transaction's net funds are available in the Stripe balance yet. Either <code>available</code> or <code>pending</code>.
+ * @property string $type Transaction type: <code>adjustment</code>, <code>advance</code>, <code>advance_funding</code>, <code>anticipation_repayment</code>, <code>application_fee</code>, <code>application_fee_refund</code>, <code>charge</code>, <code>connect_collection_transfer</code>, <code>contribution</code>, <code>issuing_authorization_hold</code>, <code>issuing_authorization_release</code>, <code>issuing_dispute</code>, <code>issuing_transaction</code>, <code>payment</code>, <code>payment_failure_refund</code>, <code>payment_refund</code>, <code>payout</code>, <code>payout_cancel</code>, <code>payout_failure</code>, <code>refund</code>, <code>refund_failure</code>, <code>reserve_transaction</code>, <code>reserved_funds</code>, <code>stripe_fee</code>, <code>stripe_fx_fee</code>, <code>tax_fee</code>, <code>topup</code>, <code>topup_reversal</code>, <code>transfer</code>, <code>transfer_cancel</code>, <code>transfer_failure</code>, or <code>transfer_refund</code>. <a href="https://stripe.com/docs/reports/balance-transaction-types">Learn more</a> about balance transaction types and what they represent. If you are looking to classify transactions for accounting purposes, you might want to consider <code>reporting_category</code> instead.
  */
 class BalanceTransaction extends ApiResource
 {
-    const OBJECT_NAME = "balance_transaction";
+    const OBJECT_NAME = 'balance_transaction';
 
     use ApiOperations\All;
     use ApiOperations\Retrieve;
 
-    /**
-     * Possible string representations of the type of balance transaction.
-     * @link https://stripe.com/docs/api/balance/balance_transaction#balance_transaction_object-type
-     */
-    const TYPE_ADJUSTMENT                    = 'adjustment';
-    const TYPE_ADVANCE                       = 'advance';
-    const TYPE_ADVANCE_FUNDING               = 'advance_funding';
-    const TYPE_APPLICATION_FEE               = 'application_fee';
-    const TYPE_APPLICATION_FEE_REFUND        = 'application_fee_refund';
-    const TYPE_CHARGE                        = 'charge';
-    const TYPE_CONNECT_COLLECTION_TRANSFER   = 'connect_collection_transfer';
-    const TYPE_ISSUING_AUTHORIZATION_HOLD    = 'issuing_authorization_hold';
+    const TYPE_ADJUSTMENT = 'adjustment';
+    const TYPE_ADVANCE = 'advance';
+    const TYPE_ADVANCE_FUNDING = 'advance_funding';
+    const TYPE_ANTICIPATION_REPAYMENT = 'anticipation_repayment';
+    const TYPE_APPLICATION_FEE = 'application_fee';
+    const TYPE_APPLICATION_FEE_REFUND = 'application_fee_refund';
+    const TYPE_CHARGE = 'charge';
+    const TYPE_CONNECT_COLLECTION_TRANSFER = 'connect_collection_transfer';
+    const TYPE_CONTRIBUTION = 'contribution';
+    const TYPE_ISSUING_AUTHORIZATION_HOLD = 'issuing_authorization_hold';
     const TYPE_ISSUING_AUTHORIZATION_RELEASE = 'issuing_authorization_release';
-    const TYPE_ISSUING_TRANSACTION           = 'issuing_transaction';
-    const TYPE_PAYMENT                       = 'payment';
-    const TYPE_PAYMENT_FAILURE_REFUND        = 'payment_failure_refund';
-    const TYPE_PAYMENT_REFUND                = 'payment_refund';
-    const TYPE_PAYOUT                        = 'payout';
-    const TYPE_PAYOUT_CANCEL                 = 'payout_cancel';
-    const TYPE_PAYOUT_FAILURE                = 'payout_failure';
-    const TYPE_REFUND                        = 'refund';
-    const TYPE_REFUND_FAILURE                = 'refund_failure';
-    const TYPE_RESERVE_TRANSACTION           = 'reserve_transaction';
-    const TYPE_RESERVED_FUNDS                = 'reserved_funds';
-    const TYPE_STRIPE_FEE                    = 'stripe_fee';
-    const TYPE_STRIPE_FX_FEE                 = 'stripe_fx_fee';
-    const TYPE_TAX_FEE                       = 'tax_fee';
-    const TYPE_TOPUP                         = 'topup';
-    const TYPE_TOPUP_REVERSAL                = 'topup_reversal';
-    const TYPE_TRANSFER                      = 'transfer';
-    const TYPE_TRANSFER_CANCEL               = 'transfer_cancel';
-    const TYPE_TRANSFER_FAILURE              = 'transfer_failure';
-    const TYPE_TRANSFER_REFUND               = 'transfer_refund';
+    const TYPE_ISSUING_DISPUTE = 'issuing_dispute';
+    const TYPE_ISSUING_TRANSACTION = 'issuing_transaction';
+    const TYPE_PAYMENT = 'payment';
+    const TYPE_PAYMENT_FAILURE_REFUND = 'payment_failure_refund';
+    const TYPE_PAYMENT_REFUND = 'payment_refund';
+    const TYPE_PAYOUT = 'payout';
+    const TYPE_PAYOUT_CANCEL = 'payout_cancel';
+    const TYPE_PAYOUT_FAILURE = 'payout_failure';
+    const TYPE_REFUND = 'refund';
+    const TYPE_REFUND_FAILURE = 'refund_failure';
+    const TYPE_RESERVE_TRANSACTION = 'reserve_transaction';
+    const TYPE_RESERVED_FUNDS = 'reserved_funds';
+    const TYPE_STRIPE_FEE = 'stripe_fee';
+    const TYPE_STRIPE_FX_FEE = 'stripe_fx_fee';
+    const TYPE_TAX_FEE = 'tax_fee';
+    const TYPE_TOPUP = 'topup';
+    const TYPE_TOPUP_REVERSAL = 'topup_reversal';
+    const TYPE_TRANSFER = 'transfer';
+    const TYPE_TRANSFER_CANCEL = 'transfer_cancel';
+    const TYPE_TRANSFER_FAILURE = 'transfer_failure';
+    const TYPE_TRANSFER_REFUND = 'transfer_refund';
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/BankAccount.php b/htdocs/includes/stripe/stripe-php/lib/BankAccount.php
index a77f3054ba5..40eca41c5f5 100644
--- a/htdocs/includes/stripe/stripe-php/lib/BankAccount.php
+++ b/htdocs/includes/stripe/stripe-php/lib/BankAccount.php
@@ -1,44 +1,57 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class BankAccount
+ * These bank accounts are payment methods on <code>Customer</code> objects.
  *
- * @property string $id
- * @property string $object
- * @property string $account
- * @property string $account_holder_name
- * @property string $account_holder_type
- * @property string $bank_name
- * @property string $country
- * @property string $currency
- * @property string $customer
- * @property bool $default_for_currency
- * @property string $fingerprint
- * @property string $last4
- * @property StripeObject $metadata
- * @property string $routing_number
- * @property string $status
+ * On the other hand <a
+ * href="https://stripe.com/docs/api#external_accounts">External Accounts</a> are
+ * transfer destinations on <code>Account</code> objects for <a
+ * href="https://stripe.com/docs/connect/custom-accounts">Custom accounts</a>. They
+ * can be bank accounts or debit cards as well, and are documented in the links
+ * above.
  *
- * @package Stripe
+ * Related guide: <a
+ * href="https://stripe.com/docs/payments/bank-debits-transfers">Bank Debits and
+ * Transfers</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string|\Stripe\Account $account The ID of the account that the bank account is associated with.
+ * @property null|string $account_holder_name The name of the person or business that owns the bank account.
+ * @property null|string $account_holder_type The type of entity that holds the account. This can be either <code>individual</code> or <code>company</code>.
+ * @property null|string[] $available_payout_methods A set of available payout methods for this bank account. Only values from this set should be passed as the <code>method</code> when creating a payout.
+ * @property null|string $bank_name Name of the bank associated with the routing number (e.g., <code>WELLS FARGO</code>).
+ * @property string $country Two-letter ISO code representing the country the bank account is located in.
+ * @property string $currency Three-letter <a href="https://stripe.com/docs/payouts">ISO code for the currency</a> paid out to the bank account.
+ * @property null|string|\Stripe\Customer $customer The ID of the customer that the bank account is associated with.
+ * @property null|bool $default_for_currency Whether this bank account is the default external account for its currency.
+ * @property null|string $fingerprint Uniquely identifies this particular bank account. You can use this attribute to check whether two bank accounts are the same.
+ * @property string $last4 The last four digits of the bank account number.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string $routing_number The routing transit number for the bank account.
+ * @property string $status <p>For bank accounts, possible values are <code>new</code>, <code>validated</code>, <code>verified</code>, <code>verification_failed</code>, or <code>errored</code>. A bank account that hasn't had any activity or validation performed is <code>new</code>. If Stripe can determine that the bank account exists, its status will be <code>validated</code>. Note that there often isn’t enough information to know (e.g., for smaller credit unions), and the validation is not always run. If customer bank account verification has succeeded, the bank account status will be <code>verified</code>. If the verification failed for any reason, such as microdeposit failure, the status will be <code>verification_failed</code>. If a transfer sent to this bank account fails, we'll set the status to <code>errored</code> and will not continue to send transfers until the bank details are updated.</p><p>For external accounts, possible values are <code>new</code> and <code>errored</code>. Validations aren't run against external accounts because they're only used for payouts. This means the other statuses don't apply. If a transfer fails, the status is set to <code>errored</code> and transfers are stopped until account details are updated.</p>
  */
 class BankAccount extends ApiResource
 {
-    const OBJECT_NAME = "bank_account";
+    const OBJECT_NAME = 'bank_account';
 
     use ApiOperations\Delete;
     use ApiOperations\Update;
 
     /**
      * Possible string representations of the bank verification status.
-     * @link https://stripe.com/docs/api/external_account_bank_accounts/object#account_bank_account_object-status
+     *
+     * @see https://stripe.com/docs/api/external_account_bank_accounts/object#account_bank_account_object-status
      */
-    const STATUS_NEW                 = 'new';
-    const STATUS_VALIDATED           = 'validated';
-    const STATUS_VERIFIED            = 'verified';
+    const STATUS_NEW = 'new';
+    const STATUS_VALIDATED = 'validated';
+    const STATUS_VERIFIED = 'verified';
     const STATUS_VERIFICATION_FAILED = 'verification_failed';
-    const STATUS_ERRORED             = 'errored';
+    const STATUS_ERRORED = 'errored';
 
     /**
      * @return string The instance URL for this resource. It needs to be special
@@ -55,54 +68,65 @@ class BankAccount extends ApiResource
             $parent = $this['account'];
             $path = 'external_accounts';
         } else {
-            $msg = "Bank accounts cannot be accessed without a customer ID or account ID.";
-            throw new Error\InvalidRequest($msg, null);
+            $msg = 'Bank accounts cannot be accessed without a customer ID or account ID.';
+
+            throw new Exception\UnexpectedValueException($msg, null);
         }
-        $parentExtn = urlencode(Util\Util::utf8($parent));
-        $extn = urlencode(Util\Util::utf8($this['id']));
-        return "$base/$parentExtn/$path/$extn";
+        $parentExtn = \urlencode(Util\Util::utf8($parent));
+        $extn = \urlencode(Util\Util::utf8($this['id']));
+
+        return "{$base}/{$parentExtn}/{$path}/{$extn}";
     }
 
     /**
      * @param array|string $_id
-     * @param array|string|null $_opts
+     * @param null|array|string $_opts
      *
-     * @throws \Stripe\Error\InvalidRequest
+     * @throws \Stripe\Exception\BadMethodCallException
      */
     public static function retrieve($_id, $_opts = null)
     {
-        $msg = "Bank accounts cannot be accessed without a customer ID or account ID. " .
-               "Retrieve a bank account using \$customer->sources->retrieve('bank_account_id') or " .
-               "\$account->external_accounts->retrieve('bank_account_id') instead.";
-        throw new Error\InvalidRequest($msg, null);
+        $msg = 'Bank accounts cannot be retrieved without a customer ID or ' .
+               'an account ID. Retrieve a bank account using ' .
+               "`Customer::retrieveSource('customer_id', " .
+               "'bank_account_id')` or `Account::retrieveExternalAccount(" .
+               "'account_id', 'bank_account_id')`.";
+
+        throw new Exception\BadMethodCallException($msg);
     }
 
     /**
      * @param string $_id
-     * @param array|null $_params
-     * @param array|string|null $_options
+     * @param null|array $_params
+     * @param null|array|string $_options
      *
-     * @throws \Stripe\Error\InvalidRequest
+     * @throws \Stripe\Exception\BadMethodCallException
      */
     public static function update($_id, $_params = null, $_options = null)
     {
-        $msg = "Bank accounts cannot be accessed without a customer ID or account ID. " .
-               "Call save() on \$customer->sources->retrieve('bank_account_id') or " .
-               "\$account->external_accounts->retrieve('bank_account_id') instead.";
-        throw new Error\InvalidRequest($msg, null);
+        $msg = 'Bank accounts cannot be updated without a customer ID or an ' .
+               'account ID. Update a bank account using ' .
+               "`Customer::updateSource('customer_id', 'bank_account_id', " .
+               '$updateParams)` or `Account::updateExternalAccount(' .
+               "'account_id', 'bank_account_id', \$updateParams)`.";
+
+        throw new Exception\BadMethodCallException($msg);
     }
 
     /**
-      * @param array|null $params
-      * @param array|string|null $options
-      *
-      * @return BankAccount The verified bank account.
-      */
-    public function verify($params = null, $options = null)
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return BankAccount the verified bank account
+     */
+    public function verify($params = null, $opts = null)
     {
         $url = $this->instanceUrl() . '/verify';
-        list($response, $opts) = $this->_request('post', $url, $params, $options);
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
         $this->refreshFrom($response, $opts);
+
         return $this;
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/BaseStripeClient.php b/htdocs/includes/stripe/stripe-php/lib/BaseStripeClient.php
new file mode 100644
index 00000000000..5499fe3a847
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/BaseStripeClient.php
@@ -0,0 +1,269 @@
+<?php
+
+namespace Stripe;
+
+class BaseStripeClient implements StripeClientInterface
+{
+    /** @var string default base URL for Stripe's API */
+    const DEFAULT_API_BASE = 'https://api.stripe.com';
+
+    /** @var string default base URL for Stripe's OAuth API */
+    const DEFAULT_CONNECT_BASE = 'https://connect.stripe.com';
+
+    /** @var string default base URL for Stripe's Files API */
+    const DEFAULT_FILES_BASE = 'https://files.stripe.com';
+
+    /** @var array<string, mixed> */
+    private $config;
+
+    /** @var \Stripe\Util\RequestOptions */
+    private $defaultOpts;
+
+    /**
+     * Initializes a new instance of the {@link BaseStripeClient} class.
+     *
+     * The constructor takes a single argument. The argument can be a string, in which case it
+     * should be the API key. It can also be an array with various configuration settings.
+     *
+     * Configuration settings include the following options:
+     *
+     * - api_key (null|string): the Stripe API key, to be used in regular API requests.
+     * - client_id (null|string): the Stripe client ID, to be used in OAuth requests.
+     * - stripe_account (null|string): a Stripe account ID. If set, all requests sent by the client
+     *   will automatically use the {@code Stripe-Account} header with that account ID.
+     * - stripe_version (null|string): a Stripe API verion. If set, all requests sent by the client
+     *   will include the {@code Stripe-Version} header with that API version.
+     *
+     * The following configuration settings are also available, though setting these should rarely be necessary
+     * (only useful if you want to send requests to a mock server like stripe-mock):
+     *
+     * - api_base (string): the base URL for regular API requests. Defaults to
+     *   {@link DEFAULT_API_BASE}.
+     * - connect_base (string): the base URL for OAuth requests. Defaults to
+     *   {@link DEFAULT_CONNECT_BASE}.
+     * - files_base (string): the base URL for file creation requests. Defaults to
+     *   {@link DEFAULT_FILES_BASE}.
+     *
+     * @param array<string, mixed>|string $config the API key as a string, or an array containing
+     *   the client configuration settings
+     */
+    public function __construct($config = [])
+    {
+        if (\is_string($config)) {
+            $config = ['api_key' => $config];
+        } elseif (!\is_array($config)) {
+            throw new \Stripe\Exception\InvalidArgumentException('$config must be a string or an array');
+        }
+
+        $config = \array_merge($this->getDefaultConfig(), $config);
+        $this->validateConfig($config);
+
+        $this->config = $config;
+
+        $this->defaultOpts = \Stripe\Util\RequestOptions::parse([
+            'stripe_account' => $config['stripe_account'],
+            'stripe_version' => $config['stripe_version'],
+        ]);
+    }
+
+    /**
+     * Gets the API key used by the client to send requests.
+     *
+     * @return null|string the API key used by the client to send requests
+     */
+    public function getApiKey()
+    {
+        return $this->config['api_key'];
+    }
+
+    /**
+     * Gets the client ID used by the client in OAuth requests.
+     *
+     * @return null|string the client ID used by the client in OAuth requests
+     */
+    public function getClientId()
+    {
+        return $this->config['client_id'];
+    }
+
+    /**
+     * Gets the base URL for Stripe's API.
+     *
+     * @return string the base URL for Stripe's API
+     */
+    public function getApiBase()
+    {
+        return $this->config['api_base'];
+    }
+
+    /**
+     * Gets the base URL for Stripe's OAuth API.
+     *
+     * @return string the base URL for Stripe's OAuth API
+     */
+    public function getConnectBase()
+    {
+        return $this->config['connect_base'];
+    }
+
+    /**
+     * Gets the base URL for Stripe's Files API.
+     *
+     * @return string the base URL for Stripe's Files API
+     */
+    public function getFilesBase()
+    {
+        return $this->config['files_base'];
+    }
+
+    /**
+     * Sends a request to Stripe's API.
+     *
+     * @param string $method the HTTP method
+     * @param string $path the path of the request
+     * @param array $params the parameters of the request
+     * @param array|\Stripe\Util\RequestOptions $opts the special modifiers of the request
+     *
+     * @return \Stripe\StripeObject the object returned by Stripe's API
+     */
+    public function request($method, $path, $params, $opts)
+    {
+        $opts = $this->defaultOpts->merge($opts, true);
+        $baseUrl = $opts->apiBase ?: $this->getApiBase();
+        $requestor = new \Stripe\ApiRequestor($this->apiKeyForRequest($opts), $baseUrl);
+        list($response, $opts->apiKey) = $requestor->request($method, $path, $params, $opts->headers);
+        $opts->discardNonPersistentHeaders();
+        $obj = \Stripe\Util\Util::convertToStripeObject($response->json, $opts);
+        $obj->setLastResponse($response);
+
+        return $obj;
+    }
+
+    /**
+     * Sends a request to Stripe's API.
+     *
+     * @param string $method the HTTP method
+     * @param string $path the path of the request
+     * @param array $params the parameters of the request
+     * @param array|\Stripe\Util\RequestOptions $opts the special modifiers of the request
+     *
+     * @return \Stripe\Collection of ApiResources
+     */
+    public function requestCollection($method, $path, $params, $opts)
+    {
+        $obj = $this->request($method, $path, $params, $opts);
+        if (!($obj instanceof \Stripe\Collection)) {
+            $received_class = \get_class($obj);
+            $msg = "Expected to receive `Stripe\\Collection` object from Stripe API. Instead received `{$received_class}`.";
+
+            throw new \Stripe\Exception\UnexpectedValueException($msg);
+        }
+        $obj->setFilters($params);
+
+        return $obj;
+    }
+
+    /**
+     * @param \Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\AuthenticationException
+     *
+     * @return string
+     */
+    private function apiKeyForRequest($opts)
+    {
+        $apiKey = $opts->apiKey ?: $this->getApiKey();
+
+        if (null === $apiKey) {
+            $msg = 'No API key provided. Set your API key when constructing the '
+                . 'StripeClient instance, or provide it on a per-request basis '
+                . 'using the `api_key` key in the $opts argument.';
+
+            throw new \Stripe\Exception\AuthenticationException($msg);
+        }
+
+        return $apiKey;
+    }
+
+    /**
+     * TODO: replace this with a private constant when we drop support for PHP < 5.
+     *
+     * @return array<string, mixed>
+     */
+    private function getDefaultConfig()
+    {
+        return [
+            'api_key' => null,
+            'client_id' => null,
+            'stripe_account' => null,
+            'stripe_version' => null,
+            'api_base' => self::DEFAULT_API_BASE,
+            'connect_base' => self::DEFAULT_CONNECT_BASE,
+            'files_base' => self::DEFAULT_FILES_BASE,
+        ];
+    }
+
+    /**
+     * @param array<string, mixed> $config
+     *
+     * @throws \Stripe\Exception\InvalidArgumentException
+     */
+    private function validateConfig($config)
+    {
+        // api_key
+        if (null !== $config['api_key'] && !\is_string($config['api_key'])) {
+            throw new \Stripe\Exception\InvalidArgumentException('api_key must be null or a string');
+        }
+
+        if (null !== $config['api_key'] && ('' === $config['api_key'])) {
+            $msg = 'api_key cannot be the empty string';
+
+            throw new \Stripe\Exception\InvalidArgumentException($msg);
+        }
+
+        if (null !== $config['api_key'] && (\preg_match('/\s/', $config['api_key']))) {
+            $msg = 'api_key cannot contain whitespace';
+
+            throw new \Stripe\Exception\InvalidArgumentException($msg);
+        }
+
+        // client_id
+        if (null !== $config['client_id'] && !\is_string($config['client_id'])) {
+            throw new \Stripe\Exception\InvalidArgumentException('client_id must be null or a string');
+        }
+
+        // stripe_account
+        if (null !== $config['stripe_account'] && !\is_string($config['stripe_account'])) {
+            throw new \Stripe\Exception\InvalidArgumentException('stripe_account must be null or a string');
+        }
+
+        // stripe_version
+        if (null !== $config['stripe_version'] && !\is_string($config['stripe_version'])) {
+            throw new \Stripe\Exception\InvalidArgumentException('stripe_version must be null or a string');
+        }
+
+        // api_base
+        if (!\is_string($config['api_base'])) {
+            throw new \Stripe\Exception\InvalidArgumentException('api_base must be a string');
+        }
+
+        // connect_base
+        if (!\is_string($config['connect_base'])) {
+            throw new \Stripe\Exception\InvalidArgumentException('connect_base must be a string');
+        }
+
+        // files_base
+        if (!\is_string($config['files_base'])) {
+            throw new \Stripe\Exception\InvalidArgumentException('files_base must be a string');
+        }
+
+        // check absence of extra keys
+        $extraConfigKeys = \array_diff(\array_keys($config), \array_keys($this->getDefaultConfig()));
+        if (!empty($extraConfigKeys)) {
+            // Wrap in single quote to more easily catch trailing spaces errors
+            $invalidKeys = "'" . \implode("', '", $extraConfigKeys) . "'";
+
+            throw new \Stripe\Exception\InvalidArgumentException('Found unknown key(s) in configuration array: ' . $invalidKeys);
+        }
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/BillingPortal/Session.php b/htdocs/includes/stripe/stripe-php/lib/BillingPortal/Session.php
new file mode 100644
index 00000000000..ec01275ac4f
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/BillingPortal/Session.php
@@ -0,0 +1,32 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\BillingPortal;
+
+/**
+ * A session describes the instantiation of the customer portal for a particular
+ * customer. By visiting the session's URL, the customer can manage their
+ * subscriptions and billing details. For security reasons, sessions are
+ * short-lived and will expire if the customer does not visit the URL. Create
+ * sessions on-demand when customers intend to manage their subscriptions and
+ * billing details.
+ *
+ * Integration guide: <a
+ * href="https://stripe.com/docs/billing/subscriptions/integrating-customer-portal">Billing
+ * customer portal</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $customer The ID of the customer for this session.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property string $return_url The URL to which Stripe should send customers when they click on the link to return to your website.
+ * @property string $url The short-lived URL of the session giving customers access to the customer portal.
+ */
+class Session extends \Stripe\ApiResource
+{
+    const OBJECT_NAME = 'billing_portal.session';
+
+    use \Stripe\ApiOperations\Create;
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/BitcoinReceiver.php b/htdocs/includes/stripe/stripe-php/lib/BitcoinReceiver.php
index a9272dfa288..208610a0f12 100644
--- a/htdocs/includes/stripe/stripe-php/lib/BitcoinReceiver.php
+++ b/htdocs/includes/stripe/stripe-php/lib/BitcoinReceiver.php
@@ -1,18 +1,39 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class BitcoinReceiver
- *
- * @package Stripe
- *
  * @deprecated Bitcoin receivers are deprecated. Please use the sources API instead.
- * @link https://stripe.com/docs/sources/bitcoin
+ * @see https://stripe.com/docs/sources/bitcoin
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property bool $active True when this bitcoin receiver has received a non-zero amount of bitcoin.
+ * @property int $amount The amount of <code>currency</code> that you are collecting as payment.
+ * @property int $amount_received The amount of <code>currency</code> to which <code>bitcoin_amount_received</code> has been converted.
+ * @property int $bitcoin_amount The amount of bitcoin that the customer should send to fill the receiver. The <code>bitcoin_amount</code> is denominated in Satoshi: there are 10^8 Satoshi in one bitcoin.
+ * @property int $bitcoin_amount_received The amount of bitcoin that has been sent by the customer to this receiver.
+ * @property string $bitcoin_uri This URI can be displayed to the customer as a clickable link (to activate their bitcoin client) or as a QR code (for mobile wallets).
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://stripe.com/docs/currencies">ISO code for the currency</a> to which the bitcoin will be converted.
+ * @property null|string $customer The customer ID of the bitcoin receiver.
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property null|string $email The customer's email address, set by the API call that creates the receiver.
+ * @property bool $filled This flag is initially false and updates to true when the customer sends the <code>bitcoin_amount</code> to this receiver.
+ * @property string $inbound_address A bitcoin address that is specific to this receiver. The customer can send bitcoin to this address to fill the receiver.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string $payment The ID of the payment created from the receiver, if any. Hidden when viewing the receiver with a publishable key.
+ * @property null|string $refund_address The refund address of this bitcoin receiver.
+ * @property \Stripe\Collection $transactions A list with one entry for each time that the customer sent bitcoin to the receiver. Hidden when viewing the receiver with a publishable key.
+ * @property bool $uncaptured_funds This receiver contains uncaptured funds that can be used for a payment or refunded.
+ * @property null|bool $used_for_payment Indicate if this source is used for payment.
  */
 class BitcoinReceiver extends ApiResource
 {
-    const OBJECT_NAME = "bitcoin_receiver";
+    const OBJECT_NAME = 'bitcoin_receiver';
 
     use ApiOperations\All;
     use ApiOperations\Retrieve;
@@ -23,7 +44,7 @@ class BitcoinReceiver extends ApiResource
      */
     public static function classUrl()
     {
-        return "/v1/bitcoin/receivers";
+        return '/v1/bitcoin/receivers';
     }
 
     /**
@@ -36,13 +57,15 @@ class BitcoinReceiver extends ApiResource
             $base = Customer::classUrl();
             $parent = $this['customer'];
             $path = 'sources';
-            $parentExtn = urlencode(Util\Util::utf8($parent));
-            $extn = urlencode(Util\Util::utf8($this['id']));
-            return "$base/$parentExtn/$path/$extn";
-        } else {
-            $base = BitcoinReceiver::classUrl();
-            $extn = urlencode(Util\Util::utf8($this['id']));
-            return "$base/$extn";
+            $parentExtn = \urlencode(Util\Util::utf8($parent));
+            $extn = \urlencode(Util\Util::utf8($this['id']));
+
+            return "{$base}/{$parentExtn}/{$path}/{$extn}";
         }
+
+        $base = BitcoinReceiver::classUrl();
+        $extn = \urlencode(Util\Util::utf8($this['id']));
+
+        return "{$base}/{$extn}";
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/BitcoinTransaction.php b/htdocs/includes/stripe/stripe-php/lib/BitcoinTransaction.php
index 122be42314f..3aa7118504a 100644
--- a/htdocs/includes/stripe/stripe-php/lib/BitcoinTransaction.php
+++ b/htdocs/includes/stripe/stripe-php/lib/BitcoinTransaction.php
@@ -1,13 +1,19 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class BitcoinTransaction
- *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount The amount of <code>currency</code> that the transaction was converted to in real-time.
+ * @property int $bitcoin_amount The amount of bitcoin contained in the transaction.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://stripe.com/docs/currencies">ISO code for the currency</a> to which this transaction was converted.
+ * @property string $receiver The receiver to which this transaction was sent.
  */
 class BitcoinTransaction extends ApiResource
 {
-    const OBJECT_NAME = "bitcoin_transaction";
+    const OBJECT_NAME = 'bitcoin_transaction';
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Capability.php b/htdocs/includes/stripe/stripe-php/lib/Capability.php
index aabf54b1f1b..3580df60b7f 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Capability.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Capability.php
@@ -1,46 +1,46 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class Capability
+ * This is an object representing a capability for a Stripe account.
  *
- * @package Stripe
+ * Related guide: <a
+ * href="https://stripe.com/docs/connect/account-capabilities">Account
+ * capabilities</a>.
  *
- * @property string $id
- * @property string $object
- * @property string $account
- * @property bool $requested
- * @property int $requested_at
- * @property mixed $requirements
- * @property string $status
+ * @property string $id The identifier for the capability.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property string|\Stripe\Account $account The account for which the capability enables functionality.
+ * @property bool $requested Whether the capability has been requested.
+ * @property null|int $requested_at Time at which the capability was requested. Measured in seconds since the Unix epoch.
+ * @property \Stripe\StripeObject $requirements
+ * @property string $status The status of the capability. Can be <code>active</code>, <code>inactive</code>, <code>pending</code>, or <code>unrequested</code>.
  */
 class Capability extends ApiResource
 {
-    const OBJECT_NAME = "capability";
+    const OBJECT_NAME = 'capability';
 
     use ApiOperations\Update;
 
-    /**
-     * Possible string representations of a capability's status.
-     * @link https://stripe.com/docs/api/capabilities/object#capability_object-status
-     */
-    const STATUS_ACTIVE      = 'active';
-    const STATUS_INACTIVE    = 'inactive';
-    const STATUS_PENDING     = 'pending';
+    const STATUS_ACTIVE = 'active';
+    const STATUS_INACTIVE = 'inactive';
+    const STATUS_PENDING = 'pending';
     const STATUS_UNREQUESTED = 'unrequested';
 
     /**
-     * @return string The API URL for this Stripe account reversal.
+     * @return string the API URL for this Stripe account reversal
      */
     public function instanceUrl()
     {
         $id = $this['id'];
         $account = $this['account'];
         if (!$id) {
-            throw new Error\InvalidRequest(
-                "Could not determine which URL to request: " .
-                "class instance has invalid ID: $id",
+            throw new Exception\UnexpectedValueException(
+                'Could not determine which URL to request: ' .
+                "class instance has invalid ID: {$id}",
                 null
             );
         }
@@ -48,35 +48,40 @@ class Capability extends ApiResource
         $account = Util\Util::utf8($account);
 
         $base = Account::classUrl();
-        $accountExtn = urlencode($account);
-        $extn = urlencode($id);
-        return "$base/$accountExtn/capabilities/$extn";
+        $accountExtn = \urlencode($account);
+        $extn = \urlencode($id);
+
+        return "{$base}/{$accountExtn}/capabilities/{$extn}";
     }
 
     /**
      * @param array|string $_id
-     * @param array|string|null $_opts
+     * @param null|array|string $_opts
      *
-     * @throws \Stripe\Error\InvalidRequest
+     * @throws \Stripe\Exception\BadMethodCallException
      */
     public static function retrieve($_id, $_opts = null)
     {
-        $msg = "Capabilities cannot be accessed without an account ID. " .
-               "Retrieve a Capability using \$account->retrieveCapability('acap_123') instead.";
-        throw new Error\InvalidRequest($msg, null);
+        $msg = 'Capabilities cannot be retrieved without an account ID. ' .
+               'Retrieve a capability using `Account::retrieveCapability(' .
+               "'account_id', 'capability_id')`.";
+
+        throw new Exception\BadMethodCallException($msg);
     }
 
     /**
      * @param string $_id
-     * @param array|null $_params
-     * @param array|string|null $_options
+     * @param null|array $_params
+     * @param null|array|string $_options
      *
-     * @throws \Stripe\Error\InvalidRequest
+     * @throws \Stripe\Exception\BadMethodCallException
      */
     public static function update($_id, $_params = null, $_options = null)
     {
-        $msg = "Capabilities cannot be accessed without an account ID. " .
-               "Update a Capability using \$account->updateCapability('acap_123') instead.";
-        throw new Error\InvalidRequest($msg, null);
+        $msg = 'Capabilities cannot be updated without an account ID. ' .
+               'Update a capability using `Account::updateCapability(' .
+               "'account_id', 'capability_id', \$updateParams)`.";
+
+        throw new Exception\BadMethodCallException($msg);
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Card.php b/htdocs/includes/stripe/stripe-php/lib/Card.php
index 51eb5add1c9..106cd1811a8 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Card.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Card.php
@@ -1,71 +1,79 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class Card
+ * You can store multiple cards on a customer in order to charge the customer
+ * later. You can also store multiple debit cards on a recipient in order to
+ * transfer to those cards later.
  *
- * @property string $id
- * @property string $object
- * @property string $account
- * @property string $address_city
- * @property string $address_country
- * @property string $address_line1
- * @property string $address_line1_check
- * @property string $address_line2
- * @property string $address_state
- * @property string $address_zip
- * @property string $address_zip_check
- * @property string[] $available_payout_methods
- * @property string $brand
- * @property string $country
- * @property string $currency
- * @property string $customer
- * @property string $cvc_check
- * @property bool $default_for_currency
- * @property string $dynamic_last4
- * @property int $exp_month
- * @property int $exp_year
- * @property string $fingerprint
- * @property string $funding
- * @property string $last4
- * @property StripeObject $metadata
- * @property string $name
- * @property string $recipient
- * @property string $tokenization_method
+ * Related guide: <a href="https://stripe.com/docs/sources/cards">Card Payments
+ * with Sources</a>.
  *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string|\Stripe\Account $account The account this card belongs to. This attribute will not be in the card object if the card belongs to a customer or recipient instead.
+ * @property null|string $address_city City/District/Suburb/Town/Village.
+ * @property null|string $address_country Billing address country, if provided when creating card.
+ * @property null|string $address_line1 Address line 1 (Street address/PO Box/Company name).
+ * @property null|string $address_line1_check If <code>address_line1</code> was provided, results of the check: <code>pass</code>, <code>fail</code>, <code>unavailable</code>, or <code>unchecked</code>.
+ * @property null|string $address_line2 Address line 2 (Apartment/Suite/Unit/Building).
+ * @property null|string $address_state State/County/Province/Region.
+ * @property null|string $address_zip ZIP or postal code.
+ * @property null|string $address_zip_check If <code>address_zip</code> was provided, results of the check: <code>pass</code>, <code>fail</code>, <code>unavailable</code>, or <code>unchecked</code>.
+ * @property null|string[] $available_payout_methods A set of available payout methods for this card. Only values from this set should be passed as the <code>method</code> when creating a payout.
+ * @property string $brand Card brand. Can be <code>American Express</code>, <code>Diners Club</code>, <code>Discover</code>, <code>JCB</code>, <code>MasterCard</code>, <code>UnionPay</code>, <code>Visa</code>, or <code>Unknown</code>.
+ * @property null|string $country Two-letter ISO code representing the country of the card. You could use this attribute to get a sense of the international breakdown of cards you've collected.
+ * @property null|string $currency Three-letter <a href="https://stripe.com/docs/payouts">ISO code for currency</a>. Only applicable on accounts (not customers or recipients). The card can be used as a transfer destination for funds in this currency.
+ * @property null|string|\Stripe\Customer $customer The customer that this card belongs to. This attribute will not be in the card object if the card belongs to an account or recipient instead.
+ * @property null|string $cvc_check If a CVC was provided, results of the check: <code>pass</code>, <code>fail</code>, <code>unavailable</code>, or <code>unchecked</code>. A result of unchecked indicates that CVC was provided but hasn't been checked yet. Checks are typically performed when attaching a card to a Customer object, or when creating a charge. For more details, see <a href="https://support.stripe.com/questions/check-if-a-card-is-valid-without-a-charge">Check if a card is valid without a charge</a>.
+ * @property null|bool $default_for_currency Whether this card is the default external account for its currency.
+ * @property null|string $dynamic_last4 (For tokenized numbers only.) The last four digits of the device account number.
+ * @property int $exp_month Two-digit number representing the card's expiration month.
+ * @property int $exp_year Four-digit number representing the card's expiration year.
+ * @property null|string $fingerprint Uniquely identifies this particular card number. You can use this attribute to check whether two customers who’ve signed up with you are using the same card number, for example. For payment methods that tokenize card information (Apple Pay, Google Pay), the tokenized number might be provided instead of the underlying card number.
+ * @property string $funding Card funding type. Can be <code>credit</code>, <code>debit</code>, <code>prepaid</code>, or <code>unknown</code>.
+ * @property string $last4 The last four digits of the card.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string $name Cardholder name.
+ * @property null|string|\Stripe\Recipient $recipient The recipient that this card belongs to. This attribute will not be in the card object if the card belongs to a customer or account instead.
+ * @property null|string $tokenization_method If the card number is tokenized, this is the method that was used. Can be <code>android_pay</code> (includes Google Pay), <code>apple_pay</code>, <code>masterpass</code>, <code>visa_checkout</code>, or null.
  */
 class Card extends ApiResource
 {
-    const OBJECT_NAME = "card";
+    const OBJECT_NAME = 'card';
 
     use ApiOperations\Delete;
     use ApiOperations\Update;
 
     /**
      * Possible string representations of the CVC check status.
-     * @link https://stripe.com/docs/api/cards/object#card_object-cvc_check
+     *
+     * @see https://stripe.com/docs/api/cards/object#card_object-cvc_check
      */
-    const CVC_CHECK_FAIL        = 'fail';
-    const CVC_CHECK_PASS        = 'pass';
+    const CVC_CHECK_FAIL = 'fail';
+    const CVC_CHECK_PASS = 'pass';
     const CVC_CHECK_UNAVAILABLE = 'unavailable';
-    const CVC_CHECK_UNCHECKED   = 'unchecked';
+    const CVC_CHECK_UNCHECKED = 'unchecked';
 
     /**
      * Possible string representations of the funding of the card.
-     * @link https://stripe.com/docs/api/cards/object#card_object-funding
+     *
+     * @see https://stripe.com/docs/api/cards/object#card_object-funding
      */
-    const FUNDING_CREDIT  = 'credit';
-    const FUNDING_DEBIT   = 'debit';
+    const FUNDING_CREDIT = 'credit';
+    const FUNDING_DEBIT = 'debit';
     const FUNDING_PREPAID = 'prepaid';
     const FUNDING_UNKNOWN = 'unknown';
 
     /**
      * Possible string representations of the tokenization method when using Apple Pay or Google Pay.
-     * @link https://stripe.com/docs/api/cards/object#card_object-tokenization_method
+     *
+     * @see https://stripe.com/docs/api/cards/object#card_object-tokenization_method
      */
-    const TOKENIZATION_METHOD_APPLE_PAY  = 'apple_pay';
+    const TOKENIZATION_METHOD_APPLE_PAY = 'apple_pay';
     const TOKENIZATION_METHOD_GOOGLE_PAY = 'google_pay';
 
     /**
@@ -88,42 +96,47 @@ class Card extends ApiResource
             $parent = $this['recipient'];
             $path = 'cards';
         } else {
-            $msg = "Cards cannot be accessed without a customer ID, account ID or recipient ID.";
-            throw new Error\InvalidRequest($msg, null);
+            $msg = 'Cards cannot be accessed without a customer ID, account ID or recipient ID.';
+
+            throw new Exception\UnexpectedValueException($msg);
         }
-        $parentExtn = urlencode(Util\Util::utf8($parent));
-        $extn = urlencode(Util\Util::utf8($this['id']));
-        return "$base/$parentExtn/$path/$extn";
+        $parentExtn = \urlencode(Util\Util::utf8($parent));
+        $extn = \urlencode(Util\Util::utf8($this['id']));
+
+        return "{$base}/{$parentExtn}/{$path}/{$extn}";
     }
 
     /**
      * @param array|string $_id
-     * @param array|string|null $_opts
+     * @param null|array|string $_opts
      *
-     * @throws \Stripe\Error\InvalidRequest
+     * @throws \Stripe\Exception\BadMethodCallException
      */
     public static function retrieve($_id, $_opts = null)
     {
-        $msg = "Cards cannot be accessed without a customer, recipient or account ID. " .
-               "Retrieve a card using \$customer->sources->retrieve('card_id'), " .
-               "\$recipient->cards->retrieve('card_id'), or " .
-               "\$account->external_accounts->retrieve('card_id') instead.";
-        throw new Error\InvalidRequest($msg, null);
+        $msg = 'Cards cannot be retrieved without a customer ID or an ' .
+               'account ID. Retrieve a card using ' .
+               "`Customer::retrieveSource('customer_id', 'card_id')` or " .
+               "`Account::retrieveExternalAccount('account_id', 'card_id')`.";
+
+        throw new Exception\BadMethodCallException($msg);
     }
 
     /**
      * @param string $_id
-     * @param array|null $_params
-     * @param array|string|null $_options
+     * @param null|array $_params
+     * @param null|array|string $_options
      *
-     * @throws \Stripe\Error\InvalidRequest
+     * @throws \Stripe\Exception\BadMethodCallException
      */
     public static function update($_id, $_params = null, $_options = null)
     {
-        $msg = "Cards cannot be accessed without a customer, recipient or account ID. " .
-               "Call save() on \$customer->sources->retrieve('card_id'), " .
-               "\$recipient->cards->retrieve('card_id'), or " .
-               "\$account->external_accounts->retrieve('card_id') instead.";
-        throw new Error\InvalidRequest($msg, null);
+        $msg = 'Cards cannot be updated without a customer ID or an ' .
+               'account ID. Update a card using ' .
+               "`Customer::updateSource('customer_id', 'card_id', " .
+               '$updateParams)` or `Account::updateExternalAccount(' .
+               "'account_id', 'card_id', \$updateParams)`.";
+
+        throw new Exception\BadMethodCallException($msg);
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Charge.php b/htdocs/includes/stripe/stripe-php/lib/Charge.php
index 0c3853c9678..799bede85cf 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Charge.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Charge.php
@@ -1,206 +1,146 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class Charge
+ * To charge a credit or a debit card, you create a <code>Charge</code> object. You
+ * can retrieve and refund individual charges as well as list all charges. Charges
+ * are identified by a unique, random ID.
  *
- * @property string $id
- * @property string $object
- * @property int $amount
- * @property int $amount_refunded
- * @property string $application
- * @property string $application_fee
- * @property int $application_fee_amount
- * @property string $balance_transaction
- * @property mixed $billing_details
- * @property bool $captured
- * @property int $created
- * @property string $currency
- * @property string $customer
- * @property string $description
- * @property string $destination
- * @property string $dispute
- * @property string $failure_code
- * @property string $failure_message
- * @property mixed $fraud_details
- * @property string $invoice
- * @property bool $livemode
- * @property StripeObject $metadata
- * @property string $on_behalf_of
- * @property string $order
- * @property mixed $outcome
- * @property bool $paid
- * @property string $payment_intent
- * @property string $payment_method
- * @property mixed $payment_method_details
- * @property string $receipt_email
- * @property string $receipt_number
- * @property string $receipt_url
- * @property bool $refunded
- * @property Collection $refunds
- * @property string $review
- * @property mixed $shipping
- * @property mixed $source
- * @property string $source_transfer
- * @property string $statement_descriptor
- * @property string $status
- * @property string $transfer
- * @property mixed $transfer_data
- * @property string $transfer_group
+ * Related guide: <a
+ * href="https://stripe.com/docs/payments/accept-a-payment-charges">Accept a
+ * payment with the Charges API</a>.
  *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Amount intended to be collected by this payment. A positive integer representing how much to charge in the <a href="https://stripe.com/docs/currencies#zero-decimal">smallest currency unit</a> (e.g., 100 cents to charge $1.00 or 100 to charge ¥100, a zero-decimal currency). The minimum amount is $0.50 US or <a href="https://stripe.com/docs/currencies#minimum-and-maximum-charge-amounts">equivalent in charge currency</a>. The amount value supports up to eight digits (e.g., a value of 99999999 for a USD charge of $999,999.99).
+ * @property int $amount_captured Amount in %s captured (can be less than the amount attribute on the charge if a partial capture was made).
+ * @property int $amount_refunded Amount in %s refunded (can be less than the amount attribute on the charge if a partial refund was issued).
+ * @property null|string|\Stripe\StripeObject $application ID of the Connect application that created the charge.
+ * @property null|string|\Stripe\ApplicationFee $application_fee The application fee (if any) for the charge. <a href="https://stripe.com/docs/connect/direct-charges#collecting-fees">See the Connect documentation</a> for details.
+ * @property null|int $application_fee_amount The amount of the application fee (if any) requested for the charge. <a href="https://stripe.com/docs/connect/direct-charges#collecting-fees">See the Connect documentation</a> for details.
+ * @property null|string|\Stripe\BalanceTransaction $balance_transaction ID of the balance transaction that describes the impact of this charge on your account balance (not including refunds or disputes).
+ * @property \Stripe\StripeObject $billing_details
+ * @property null|string $calculated_statement_descriptor The full statement descriptor that is passed to card networks, and that is displayed on your customers' credit card and bank statements. Allows you to see what the statement descriptor looks like after the static and dynamic portions are combined.
+ * @property bool $captured If the charge was created without capturing, this Boolean represents whether it is still uncaptured or has since been captured.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|string|\Stripe\Customer $customer ID of the customer this charge is for if one exists.
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property null|string|\Stripe\Account $destination ID of an existing, connected Stripe account to transfer funds to if <code>transfer_data</code> was specified in the charge request.
+ * @property null|string|\Stripe\Dispute $dispute Details about the dispute if the charge has been disputed.
+ * @property bool $disputed Whether the charge has been disputed.
+ * @property null|string $failure_code Error code explaining reason for charge failure if available (see <a href="https://stripe.com/docs/api#errors">the errors section</a> for a list of codes).
+ * @property null|string $failure_message Message to user further explaining reason for charge failure if available.
+ * @property null|\Stripe\StripeObject $fraud_details Information on fraud assessments for the charge.
+ * @property null|string|\Stripe\Invoice $invoice ID of the invoice this charge is for if one exists.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string|\Stripe\Account $on_behalf_of The account (if any) the charge was made on behalf of without triggering an automatic transfer. See the <a href="https://stripe.com/docs/connect/charges-transfers">Connect documentation</a> for details.
+ * @property null|string|\Stripe\Order $order ID of the order this charge is for if one exists.
+ * @property null|\Stripe\StripeObject $outcome Details about whether the payment was accepted, and why. See <a href="https://stripe.com/docs/declines">understanding declines</a> for details.
+ * @property bool $paid <code>true</code> if the charge succeeded, or was successfully authorized for later capture.
+ * @property null|string|\Stripe\PaymentIntent $payment_intent ID of the PaymentIntent associated with this charge, if one exists.
+ * @property null|string $payment_method ID of the payment method used in this charge.
+ * @property null|\Stripe\StripeObject $payment_method_details Details about the payment method at the time of the transaction.
+ * @property null|string $receipt_email This is the email address that the receipt for this charge was sent to.
+ * @property null|string $receipt_number This is the transaction number that appears on email receipts sent for this charge. This attribute will be <code>null</code> until a receipt has been sent.
+ * @property null|string $receipt_url This is the URL to view the receipt for this charge. The receipt is kept up-to-date to the latest state of the charge, including any refunds. If the charge is for an Invoice, the receipt will be stylized as an Invoice receipt.
+ * @property bool $refunded Whether the charge has been fully refunded. If the charge is only partially refunded, this attribute will still be false.
+ * @property \Stripe\Collection $refunds A list of refunds that have been applied to the charge.
+ * @property null|string|\Stripe\Review $review ID of the review associated with this charge if one exists.
+ * @property null|\Stripe\StripeObject $shipping Shipping information for the charge.
+ * @property null|\Stripe\Account|\Stripe\AlipayAccount|\Stripe\BankAccount|\Stripe\BitcoinReceiver|\Stripe\Card|\Stripe\Source $source This is a legacy field that will be removed in the future. It contains the Source, Card, or BankAccount object used for the charge. For details about the payment method used for this charge, refer to <code>payment_method</code> or <code>payment_method_details</code> instead.
+ * @property null|string|\Stripe\Transfer $source_transfer The transfer ID which created this charge. Only present if the charge came from another Stripe account. <a href="https://stripe.com/docs/connect/destination-charges">See the Connect documentation</a> for details.
+ * @property null|string $statement_descriptor For card charges, use <code>statement_descriptor_suffix</code> instead. Otherwise, you can use this value as the complete description of a charge on your customers’ statements. Must contain at least one letter, maximum 22 characters.
+ * @property null|string $statement_descriptor_suffix Provides information about the charge that customers see on their statements. Concatenated with the prefix (shortened descriptor) or statement descriptor that’s set on the account to form the complete statement descriptor. Maximum 22 characters for the concatenated descriptor.
+ * @property string $status The status of the payment is either <code>succeeded</code>, <code>pending</code>, or <code>failed</code>.
+ * @property string|\Stripe\Transfer $transfer ID of the transfer to the <code>destination</code> account (only applicable if the charge was created using the <code>destination</code> parameter).
+ * @property null|\Stripe\StripeObject $transfer_data An optional dictionary including the account to automatically transfer to as part of a destination charge. <a href="https://stripe.com/docs/connect/destination-charges">See the Connect documentation</a> for details.
+ * @property null|string $transfer_group A string that identifies this transaction as part of a group. See the <a href="https://stripe.com/docs/connect/charges-transfers#transfer-options">Connect documentation</a> for details.
  */
 class Charge extends ApiResource
 {
-    const OBJECT_NAME = "charge";
+    const OBJECT_NAME = 'charge';
 
     use ApiOperations\All;
     use ApiOperations\Create;
     use ApiOperations\Retrieve;
     use ApiOperations\Update;
 
-    /**
-     * Possible string representations of decline codes.
-     * These strings are applicable to the decline_code property of the \Stripe\Error\Card exception.
-     * @link https://stripe.com/docs/declines/codes
-     */
-    const DECLINED_APPROVE_WITH_ID                   = 'approve_with_id';
-    const DECLINED_CALL_ISSUER                       = 'call_issuer';
-    const DECLINED_CARD_NOT_SUPPORTED                = 'card_not_supported';
-    const DECLINED_CARD_VELOCITY_EXCEEDED            = 'card_velocity_exceeded';
-    const DECLINED_CURRENCY_NOT_SUPPORTED            = 'currency_not_supported';
-    const DECLINED_DO_NOT_HONOR                      = 'do_not_honor';
-    const DECLINED_DO_NOT_TRY_AGAIN                  = 'do_not_try_again';
-    const DECLINED_DUPLICATED_TRANSACTION            = 'duplicate_transaction';
-    const DECLINED_EXPIRED_CARD                      = 'expired_card';
-    const DECLINED_FRAUDULENT                        = 'fraudulent';
-    const DECLINED_GENERIC_DECLINE                   = 'generic_decline';
-    const DECLINED_INCORRECT_NUMBER                  = 'incorrect_number';
-    const DECLINED_INCORRECT_CVC                     = 'incorrect_cvc';
-    const DECLINED_INCORRECT_PIN                     = 'incorrect_pin';
-    const DECLINED_INCORRECT_ZIP                     = 'incorrect_zip';
-    const DECLINED_INSUFFICIENT_FUNDS                = 'insufficient_funds';
-    const DECLINED_INVALID_ACCOUNT                   = 'invalid_account';
-    const DECLINED_INVALID_AMOUNT                    = 'invalid_amount';
-    const DECLINED_INVALID_CVC                       = 'invalid_cvc';
-    const DECLINED_INVALID_EXPIRY_YEAR               = 'invalid_expiry_year';
-    const DECLINED_INVALID_NUMBER                    = 'invalid_number';
-    const DECLINED_INVALID_PIN                       = 'invalid_pin';
-    const DECLINED_ISSUER_NOT_AVAILABLE              = 'issuer_not_available';
-    const DECLINED_LOST_CARD                         = 'lost_card';
-    const DECLINED_MERCHANT_BLACKLIST                = 'merchant_blacklist';
-    const DECLINED_NEW_ACCOUNT_INFORMATION_AVAILABLE = 'new_account_information_available';
-    const DECLINED_NO_ACTION_TAKEN                   = 'no_action_taken';
-    const DECLINED_NOT_PERMITTED                     = 'not_permitted';
-    const DECLINED_PICKUP_CARD                       = 'pickup_card';
-    const DECLINED_PIN_TRY_EXCEEDED                  = 'pin_try_exceeded';
-    const DECLINED_PROCESSING_ERROR                  = 'processing_error';
-    const DECLINED_REENTER_TRANSACTION               = 'reenter_transaction';
-    const DECLINED_RESTRICTED_CARD                   = 'restricted_card';
-    const DECLINED_REVOCATION_OF_ALL_AUTHORIZATIONS  = 'revocation_of_all_authorizations';
-    const DECLINED_REVOCATION_OF_AUTHORIZATION       = 'revocation_of_authorization';
-    const DECLINED_SECURITY_VIOLATION                = 'security_violation';
-    const DECLINED_SERVICE_NOT_ALLOWED               = 'service_not_allowed';
-    const DECLINED_STOLEN_CARD                       = 'stolen_card';
-    const DECLINED_STOP_PAYMENT_ORDER                = 'stop_payment_order';
-    const DECLINED_TESTMODE_DECLINE                  = 'testmode_decline';
-    const DECLINED_TRANSACTION_NOT_ALLOWED           = 'transaction_not_allowed';
-    const DECLINED_TRY_AGAIN_LATER                   = 'try_again_later';
-    const DECLINED_WITHDRAWAL_COUNT_LIMIT_EXCEEDED   = 'withdrawal_count_limit_exceeded';
-
-    /**
-     * Possible string representations of the status of the charge.
-     * @link https://stripe.com/docs/api/charges/object#charge_object-status
-     */
-    const STATUS_FAILED    = 'failed';
-    const STATUS_PENDING   = 'pending';
+    const STATUS_FAILED = 'failed';
+    const STATUS_PENDING = 'pending';
     const STATUS_SUCCEEDED = 'succeeded';
 
     /**
-     * @param array|null $params
-     * @param array|string|null $options
+     * Possible string representations of decline codes.
+     * These strings are applicable to the decline_code property of the \Stripe\Exception\CardException exception.
      *
-     * @return Charge The refunded charge.
+     * @see https://stripe.com/docs/declines/codes
      */
-    public function refund($params = null, $options = null)
-    {
-        $url = $this->instanceUrl() . '/refund';
-        list($response, $opts) = $this->_request('post', $url, $params, $options);
-        $this->refreshFrom($response, $opts);
-        return $this;
-    }
+    const DECLINED_AUTHENTICATION_REQUIRED = 'authentication_required';
+    const DECLINED_APPROVE_WITH_ID = 'approve_with_id';
+    const DECLINED_CALL_ISSUER = 'call_issuer';
+    const DECLINED_CARD_NOT_SUPPORTED = 'card_not_supported';
+    const DECLINED_CARD_VELOCITY_EXCEEDED = 'card_velocity_exceeded';
+    const DECLINED_CURRENCY_NOT_SUPPORTED = 'currency_not_supported';
+    const DECLINED_DO_NOT_HONOR = 'do_not_honor';
+    const DECLINED_DO_NOT_TRY_AGAIN = 'do_not_try_again';
+    const DECLINED_DUPLICATED_TRANSACTION = 'duplicate_transaction';
+    const DECLINED_EXPIRED_CARD = 'expired_card';
+    const DECLINED_FRAUDULENT = 'fraudulent';
+    const DECLINED_GENERIC_DECLINE = 'generic_decline';
+    const DECLINED_INCORRECT_NUMBER = 'incorrect_number';
+    const DECLINED_INCORRECT_CVC = 'incorrect_cvc';
+    const DECLINED_INCORRECT_PIN = 'incorrect_pin';
+    const DECLINED_INCORRECT_ZIP = 'incorrect_zip';
+    const DECLINED_INSUFFICIENT_FUNDS = 'insufficient_funds';
+    const DECLINED_INVALID_ACCOUNT = 'invalid_account';
+    const DECLINED_INVALID_AMOUNT = 'invalid_amount';
+    const DECLINED_INVALID_CVC = 'invalid_cvc';
+    const DECLINED_INVALID_EXPIRY_YEAR = 'invalid_expiry_year';
+    const DECLINED_INVALID_NUMBER = 'invalid_number';
+    const DECLINED_INVALID_PIN = 'invalid_pin';
+    const DECLINED_ISSUER_NOT_AVAILABLE = 'issuer_not_available';
+    const DECLINED_LOST_CARD = 'lost_card';
+    const DECLINED_MERCHANT_BLACKLIST = 'merchant_blacklist';
+    const DECLINED_NEW_ACCOUNT_INFORMATION_AVAILABLE = 'new_account_information_available';
+    const DECLINED_NO_ACTION_TAKEN = 'no_action_taken';
+    const DECLINED_NOT_PERMITTED = 'not_permitted';
+    const DECLINED_OFFLINE_PIN_REQUIRED = 'offline_pin_required';
+    const DECLINED_ONLINE_OR_OFFLINE_PIN_REQUIRED = 'online_or_offline_pin_required';
+    const DECLINED_PICKUP_CARD = 'pickup_card';
+    const DECLINED_PIN_TRY_EXCEEDED = 'pin_try_exceeded';
+    const DECLINED_PROCESSING_ERROR = 'processing_error';
+    const DECLINED_REENTER_TRANSACTION = 'reenter_transaction';
+    const DECLINED_RESTRICTED_CARD = 'restricted_card';
+    const DECLINED_REVOCATION_OF_ALL_AUTHORIZATIONS = 'revocation_of_all_authorizations';
+    const DECLINED_REVOCATION_OF_AUTHORIZATION = 'revocation_of_authorization';
+    const DECLINED_SECURITY_VIOLATION = 'security_violation';
+    const DECLINED_SERVICE_NOT_ALLOWED = 'service_not_allowed';
+    const DECLINED_STOLEN_CARD = 'stolen_card';
+    const DECLINED_STOP_PAYMENT_ORDER = 'stop_payment_order';
+    const DECLINED_TESTMODE_DECLINE = 'testmode_decline';
+    const DECLINED_TRANSACTION_NOT_ALLOWED = 'transaction_not_allowed';
+    const DECLINED_TRY_AGAIN_LATER = 'try_again_later';
+    const DECLINED_WITHDRAWAL_COUNT_LIMIT_EXCEEDED = 'withdrawal_count_limit_exceeded';
 
     /**
-     * @param array|null $params
-     * @param array|string|null $options
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return Charge The captured charge.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return Charge the captured charge
      */
-    public function capture($params = null, $options = null)
+    public function capture($params = null, $opts = null)
     {
         $url = $this->instanceUrl() . '/capture';
-        list($response, $opts) = $this->_request('post', $url, $params, $options);
-        $this->refreshFrom($response, $opts);
-        return $this;
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @deprecated Use the `save` method on the Dispute object
-     *
-     * @return array The updated dispute.
-     */
-    public function updateDispute($params = null, $options = null)
-    {
-        $url = $this->instanceUrl() . '/dispute';
-        list($response, $opts) = $this->_request('post', $url, $params, $options);
-        $this->refreshFrom(['dispute' => $response], $opts, true);
-        return $this->dispute;
-    }
-
-    /**
-     * @param array|string|null $options
-     *
-     * @deprecated Use the `close` method on the Dispute object
-     *
-     * @return Charge The updated charge.
-     */
-    public function closeDispute($options = null)
-    {
-        $url = $this->instanceUrl() . '/dispute/close';
-        list($response, $opts) = $this->_request('post', $url, null, $options);
-        $this->refreshFrom($response, $opts);
-        return $this;
-    }
-
-    /**
-     * @param array|string|null $opts
-     *
-     * @return Charge The updated charge.
-     */
-    public function markAsFraudulent($opts = null)
-    {
-        $params = ['fraud_details' => ['user_report' => 'fraudulent']];
-        $url = $this->instanceUrl();
         list($response, $opts) = $this->_request('post', $url, $params, $opts);
         $this->refreshFrom($response, $opts);
-        return $this;
-    }
 
-    /**
-     * @param array|string|null $opts
-     *
-     * @return Charge The updated charge.
-     */
-    public function markAsSafe($opts = null)
-    {
-        $params = ['fraud_details' => ['user_report' => 'safe']];
-        $url = $this->instanceUrl();
-        list($response, $opts) = $this->_request('post', $url, $params, $opts);
-        $this->refreshFrom($response, $opts);
         return $this;
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Checkout/Session.php b/htdocs/includes/stripe/stripe-php/lib/Checkout/Session.php
index 227dd7b6816..464a2b9a5cc 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Checkout/Session.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Checkout/Session.php
@@ -1,39 +1,88 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe\Checkout;
 
 /**
- * Class Session
+ * A Checkout Session represents your customer's session as they pay for one-time
+ * purchases or subscriptions through <a
+ * href="https://stripe.com/docs/payments/checkout">Checkout</a>. We recommend
+ * creating a new Session each time your customer attempts to pay.
  *
- * @property string $id
- * @property string $object
- * @property string $cancel_url
- * @property string $client_reference_id
- * @property string $customer
- * @property string $customer_email
- * @property mixed $display_items
- * @property bool $livemode
- * @property string $payment_intent
- * @property string[] $payment_method_types
- * @property string $submit_type
- * @property string $subscription
- * @property string $success_url
+ * Once payment is successful, the Checkout Session will contain a reference to the
+ * <a href="https://stripe.com/docs/api/customers">Customer</a>, and either the
+ * successful <a
+ * href="https://stripe.com/docs/api/payment_intents">PaymentIntent</a> or an
+ * active <a href="https://stripe.com/docs/api/subscriptions">Subscription</a>.
  *
- * @package Stripe
+ * You can create a Checkout Session on your server and pass its ID to the client
+ * to begin Checkout.
+ *
+ * Related guide: <a href="https://stripe.com/docs/payments/checkout/api">Checkout
+ * Server Quickstart</a>.
+ *
+ * @property string $id Unique identifier for the object. Used to pass to <code>redirectToCheckout</code> in Stripe.js.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|bool $allow_promotion_codes Enables user redeemable promotion codes.
+ * @property null|int $amount_subtotal Total of all items before discounts or taxes are applied.
+ * @property null|int $amount_total Total of all items after discounts and taxes are applied.
+ * @property null|string $billing_address_collection Describes whether Checkout should collect the customer's billing address.
+ * @property string $cancel_url The URL the customer will be directed to if they decide to cancel payment and return to your website.
+ * @property null|string $client_reference_id A unique string to reference the Checkout Session. This can be a customer ID, a cart ID, or similar, and can be used to reconcile the session with your internal systems.
+ * @property null|string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|string|\Stripe\Customer $customer The ID of the customer for this session. For Checkout Sessions in <code>payment</code> or <code>subscription</code> mode, Checkout will create a new customer object based on information provided during the session unless an existing customer was provided when the session was created.
+ * @property null|string $customer_email If provided, this value will be used when the Customer object is created. If not provided, customers will be asked to enter their email address. Use this parameter to prefill customer data if you already have an email on file. To access information about the customer once a session is complete, use the <code>customer</code> attribute.
+ * @property \Stripe\Collection $line_items The line items purchased by the customer.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|string $locale The IETF language tag of the locale Checkout is displayed in. If blank or <code>auto</code>, the browser's locale is used.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property string $mode The mode of the Checkout Session.
+ * @property null|string|\Stripe\PaymentIntent $payment_intent The ID of the PaymentIntent for Checkout Sessions in <code>payment</code> mode.
+ * @property string[] $payment_method_types A list of the types of payment methods (e.g. card) this Checkout Session is allowed to accept.
+ * @property string $payment_status The payment status of the Checkout Session, one of <code>paid</code>, <code>unpaid</code>, or <code>no_payment_required</code>. You can use this value to decide when to fulfill your customer's order.
+ * @property null|string|\Stripe\SetupIntent $setup_intent The ID of the SetupIntent for Checkout Sessions in <code>setup</code> mode.
+ * @property null|\Stripe\StripeObject $shipping Shipping information for this Checkout Session.
+ * @property null|\Stripe\StripeObject $shipping_address_collection When set, provides configuration for Checkout to collect a shipping address from a customer.
+ * @property null|string $submit_type Describes the type of transaction being performed by Checkout in order to customize relevant text on the page, such as the submit button. <code>submit_type</code> can only be specified on Checkout Sessions in <code>payment</code> mode, but not Checkout Sessions in <code>subscription</code> or <code>setup</code> mode.
+ * @property null|string|\Stripe\Subscription $subscription The ID of the subscription for Checkout Sessions in <code>subscription</code> mode.
+ * @property string $success_url The URL the customer will be directed to after the payment or subscription creation is successful.
+ * @property null|\Stripe\StripeObject $total_details Tax and discount details for the computed total amount.
  */
 class Session extends \Stripe\ApiResource
 {
-    const OBJECT_NAME = "checkout.session";
+    const OBJECT_NAME = 'checkout.session';
 
+    use \Stripe\ApiOperations\All;
     use \Stripe\ApiOperations\Create;
+    use \Stripe\ApiOperations\NestedResource;
     use \Stripe\ApiOperations\Retrieve;
 
+    const BILLING_ADDRESS_COLLECTION_AUTO = 'auto';
+    const BILLING_ADDRESS_COLLECTION_REQUIRED = 'required';
+
+    const PAYMENT_STATUS_NO_PAYMENT_REQUIRED = 'no_payment_required';
+    const PAYMENT_STATUS_PAID = 'paid';
+    const PAYMENT_STATUS_UNPAID = 'unpaid';
+
+    const SUBMIT_TYPE_AUTO = 'auto';
+    const SUBMIT_TYPE_BOOK = 'book';
+    const SUBMIT_TYPE_DONATE = 'donate';
+    const SUBMIT_TYPE_PAY = 'pay';
+
+    const PATH_LINE_ITEMS = '/line_items';
+
     /**
-     * Possible string representations of submit type.
-     * @link https://stripe.com/docs/api/checkout/sessions/create#create_checkout_session-submit_type
+     * @param string $id the ID of the session on which to retrieve the items
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection the list of items
      */
-    const SUBMIT_TYPE_AUTO    = 'auto';
-    const SUBMIT_TYPE_BOOK    = 'book';
-    const SUBMIT_TYPE_DONATE  = 'donate';
-    const SUBMIT_TYPE_PAY     = 'pay';
+    public static function allLineItems($id, $params = null, $opts = null)
+    {
+        return self::_allNestedResources($id, static::PATH_LINE_ITEMS, $params, $opts);
+    }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Collection.php b/htdocs/includes/stripe/stripe-php/lib/Collection.php
index 38d3835ff03..899299d3dad 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Collection.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Collection.php
@@ -3,73 +3,118 @@
 namespace Stripe;
 
 /**
- * Class Collection
+ * Class Collection.
  *
  * @property string $object
  * @property string $url
  * @property bool $has_more
- * @property mixed $data
- *
- * @package Stripe
+ * @property \Stripe\StripeObject[] $data
  */
-class Collection extends StripeObject implements \IteratorAggregate
+class Collection extends StripeObject implements \Countable, \IteratorAggregate
 {
-    const OBJECT_NAME = "list";
+    const OBJECT_NAME = 'list';
 
     use ApiOperations\Request;
 
-    protected $_requestParams = [];
+    /** @var array */
+    protected $filters = [];
 
     /**
-     * @return string The base URL for the given class.
+     * @return string the base URL for the given class
      */
     public static function baseUrl()
     {
         return Stripe::$apiBase;
     }
 
-    public function setRequestParams($params)
+    /**
+     * Returns the filters.
+     *
+     * @return array the filters
+     */
+    public function getFilters()
     {
-        $this->_requestParams = $params;
+        return $this->filters;
+    }
+
+    /**
+     * Sets the filters, removing paging options.
+     *
+     * @param array $filters the filters
+     */
+    public function setFilters($filters)
+    {
+        $this->filters = $filters;
+    }
+
+    public function offsetGet($k)
+    {
+        if (\is_string($k)) {
+            return parent::offsetGet($k);
+        }
+        $msg = "You tried to access the {$k} index, but Collection " .
+                   'types only support string keys. (HINT: List calls ' .
+                   'return an object with a `data` (which is the data ' .
+                   "array). You likely want to call ->data[{$k}])";
+
+        throw new Exception\InvalidArgumentException($msg);
     }
 
     public function all($params = null, $opts = null)
     {
+        self::_validateParams($params);
         list($url, $params) = $this->extractPathAndUpdateParams($params);
 
         list($response, $opts) = $this->_request('get', $url, $params, $opts);
-        $this->_requestParams = $params;
-        return Util\Util::convertToStripeObject($response, $opts);
+        $obj = Util\Util::convertToStripeObject($response, $opts);
+        if (!($obj instanceof \Stripe\Collection)) {
+            throw new \Stripe\Exception\UnexpectedValueException(
+                'Expected type ' . \Stripe\Collection::class . ', got "' . \get_class($obj) . '" instead.'
+            );
+        }
+        $obj->setFilters($params);
+
+        return $obj;
     }
 
     public function create($params = null, $opts = null)
     {
+        self::_validateParams($params);
         list($url, $params) = $this->extractPathAndUpdateParams($params);
 
         list($response, $opts) = $this->_request('post', $url, $params, $opts);
-        $this->_requestParams = $params;
+
         return Util\Util::convertToStripeObject($response, $opts);
     }
 
     public function retrieve($id, $params = null, $opts = null)
     {
+        self::_validateParams($params);
         list($url, $params) = $this->extractPathAndUpdateParams($params);
 
         $id = Util\Util::utf8($id);
-        $extn = urlencode($id);
+        $extn = \urlencode($id);
         list($response, $opts) = $this->_request(
             'get',
-            "$url/$extn",
+            "{$url}/{$extn}",
             $params,
             $opts
         );
-        $this->_requestParams = $params;
+
         return Util\Util::convertToStripeObject($response, $opts);
     }
 
     /**
-     * @return \ArrayIterator An iterator that can be used to iterate
-     *    across objects in the current page.
+     * @return int the number of objects in the current page
+     */
+    public function count()
+    {
+        return \count($this->data);
+    }
+
+    /**
+     * @return \ArrayIterator an iterator that can be used to iterate
+     *    across objects in the current page
      */
     public function getIterator()
     {
@@ -77,29 +122,158 @@ class Collection extends StripeObject implements \IteratorAggregate
     }
 
     /**
-     * @return Util\AutoPagingIterator An iterator that can be used to iterate
-     *    across all objects across all pages. As page boundaries are
+     * @return \ArrayIterator an iterator that can be used to iterate
+     *    backwards across objects in the current page
+     */
+    public function getReverseIterator()
+    {
+        return new \ArrayIterator(\array_reverse($this->data));
+    }
+
+    /**
+     * @return \Generator|StripeObject[] A generator that can be used to
+     *    iterate across all objects across all pages. As page boundaries are
      *    encountered, the next page will be fetched automatically for
      *    continued iteration.
      */
     public function autoPagingIterator()
     {
-        return new Util\AutoPagingIterator($this, $this->_requestParams);
+        $page = $this;
+
+        while (true) {
+            $filters = $this->filters ?: [];
+            if (\array_key_exists('ending_before', $filters)
+                && !\array_key_exists('starting_after', $filters)) {
+                foreach ($page->getReverseIterator() as $item) {
+                    yield $item;
+                }
+                $page = $page->previousPage();
+            } else {
+                foreach ($page as $item) {
+                    yield $item;
+                }
+                $page = $page->nextPage();
+            }
+
+            if ($page->isEmpty()) {
+                break;
+            }
+        }
+    }
+
+    /**
+     * Returns an empty collection. This is returned from {@see nextPage()}
+     * when we know that there isn't a next page in order to replicate the
+     * behavior of the API when it attempts to return a page beyond the last.
+     *
+     * @param null|array|string $opts
+     *
+     * @return Collection
+     */
+    public static function emptyCollection($opts = null)
+    {
+        return Collection::constructFrom(['data' => []], $opts);
+    }
+
+    /**
+     * Returns true if the page object contains no element.
+     *
+     * @return bool
+     */
+    public function isEmpty()
+    {
+        return empty($this->data);
+    }
+
+    /**
+     * Fetches the next page in the resource list (if there is one).
+     *
+     * This method will try to respect the limit of the current page. If none
+     * was given, the default limit will be fetched again.
+     *
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @return Collection
+     */
+    public function nextPage($params = null, $opts = null)
+    {
+        if (!$this->has_more) {
+            return static::emptyCollection($opts);
+        }
+
+        $lastId = \end($this->data)->id;
+
+        $params = \array_merge(
+            $this->filters ?: [],
+            ['starting_after' => $lastId],
+            $params ?: []
+        );
+
+        return $this->all($params, $opts);
+    }
+
+    /**
+     * Fetches the previous page in the resource list (if there is one).
+     *
+     * This method will try to respect the limit of the current page. If none
+     * was given, the default limit will be fetched again.
+     *
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @return Collection
+     */
+    public function previousPage($params = null, $opts = null)
+    {
+        if (!$this->has_more) {
+            return static::emptyCollection($opts);
+        }
+
+        $firstId = $this->data[0]->id;
+
+        $params = \array_merge(
+            $this->filters ?: [],
+            ['ending_before' => $firstId],
+            $params ?: []
+        );
+
+        return $this->all($params, $opts);
+    }
+
+    /**
+     * Gets the first item from the current page. Returns `null` if the current page is empty.
+     *
+     * @return null|\Stripe\StripeObject
+     */
+    public function first()
+    {
+        return \count($this->data) > 0 ? $this->data[0] : null;
+    }
+
+    /**
+     * Gets the last item from the current page. Returns `null` if the current page is empty.
+     *
+     * @return null|\Stripe\StripeObject
+     */
+    public function last()
+    {
+        return \count($this->data) > 0 ? $this->data[\count($this->data) - 1] : null;
     }
 
     private function extractPathAndUpdateParams($params)
     {
-        $url = parse_url($this->url);
+        $url = \parse_url($this->url);
         if (!isset($url['path'])) {
-            throw new Error\Api("Could not parse list url into parts: $url");
+            throw new Exception\UnexpectedValueException("Could not parse list url into parts: {$url}");
         }
 
         if (isset($url['query'])) {
             // If the URL contains a query param, parse it out into $params so they
             // don't interact weirdly with each other.
             $query = [];
-            parse_str($url['query'], $query);
-            $params = array_merge($params ?: [], $query);
+            \parse_str($url['query'], $query);
+            $params = \array_merge($params ?: [], $query);
         }
 
         return [$url['path'], $params];
diff --git a/htdocs/includes/stripe/stripe-php/lib/CountrySpec.php b/htdocs/includes/stripe/stripe-php/lib/CountrySpec.php
index ef02c340b5e..223afb316a5 100644
--- a/htdocs/includes/stripe/stripe-php/lib/CountrySpec.php
+++ b/htdocs/includes/stripe/stripe-php/lib/CountrySpec.php
@@ -1,24 +1,29 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class CountrySpec
+ * Stripe needs to collect certain pieces of information about each account
+ * created. These requirements can differ depending on the account's country. The
+ * Country Specs API makes these rules available to your integration.
  *
- * @property string $id
- * @property string $object
- * @property string $default_currency
- * @property mixed $supported_bank_account_currencies
- * @property string[] $supported_payment_currencies
- * @property string[] $supported_payment_methods
- * @property string[] $supported_transfer_countries
- * @property mixed $verification_fields
+ * You can also view the information from this API call as <a
+ * href="/docs/connect/required-verification-information">an online guide</a>.
  *
- * @package Stripe
+ * @property string $id Unique identifier for the object. Represented as the ISO country code for this country.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property string $default_currency The default currency for this country. This applies to both payment methods and bank accounts.
+ * @property \Stripe\StripeObject $supported_bank_account_currencies Currencies that can be accepted in the specific country (for transfers).
+ * @property string[] $supported_payment_currencies Currencies that can be accepted in the specified country (for payments).
+ * @property string[] $supported_payment_methods Payment methods available in the specified country. You may need to enable some payment methods (e.g., <a href="https://stripe.com/docs/ach">ACH</a>) on your account before they appear in this list. The <code>stripe</code> payment method refers to <a href="https://stripe.com/docs/connect/destination-charges">charging through your platform</a>.
+ * @property string[] $supported_transfer_countries Countries that can accept transfers from the specified country.
+ * @property \Stripe\StripeObject $verification_fields
  */
 class CountrySpec extends ApiResource
 {
-    const OBJECT_NAME = "country_spec";
+    const OBJECT_NAME = 'country_spec';
 
     use ApiOperations\All;
     use ApiOperations\Retrieve;
diff --git a/htdocs/includes/stripe/stripe-php/lib/Coupon.php b/htdocs/includes/stripe/stripe-php/lib/Coupon.php
index 76d549ad90d..41afdcfc9b7 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Coupon.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Coupon.php
@@ -1,31 +1,37 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class Coupon
+ * A coupon contains information about a percent-off or amount-off discount you
+ * might want to apply to a customer. Coupons may be applied to <a
+ * href="https://stripe.com/docs/api#invoices">invoices</a> or <a
+ * href="https://stripe.com/docs/api#create_order-coupon">orders</a>. Coupons do
+ * not work with conventional one-off <a
+ * href="https://stripe.com/docs/api#create_charge">charges</a>.
  *
- * @property string $id
- * @property string $object
- * @property int $amount_off
- * @property int $created
- * @property string $currency
- * @property string $duration
- * @property int $duration_in_months
- * @property bool $livemode
- * @property int $max_redemptions
- * @property StripeObject $metadata
- * @property string $name
- * @property float $percent_off
- * @property int $redeem_by
- * @property int $times_redeemed
- * @property bool $valid
- *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|int $amount_off Amount (in the <code>currency</code> specified) that will be taken off the subtotal of any invoices for this customer.
+ * @property \Stripe\StripeObject $applies_to
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string $currency If <code>amount_off</code> has been set, the three-letter <a href="https://stripe.com/docs/currencies">ISO code for the currency</a> of the amount to take off.
+ * @property string $duration One of <code>forever</code>, <code>once</code>, and <code>repeating</code>. Describes how long a customer who applies this coupon will get the discount.
+ * @property null|int $duration_in_months If <code>duration</code> is <code>repeating</code>, the number of months the coupon applies. Null if coupon <code>duration</code> is <code>forever</code> or <code>once</code>.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|int $max_redemptions Maximum number of times this coupon can be redeemed, in total, across all customers, before it is no longer valid.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string $name Name of the coupon displayed to customers on for instance invoices or receipts.
+ * @property null|float $percent_off Percent that will be taken off the subtotal of any invoices for this customer for the duration of the coupon. For example, a coupon with percent_off of 50 will make a %s100 invoice %s50 instead.
+ * @property null|int $redeem_by Date after which the coupon can no longer be redeemed.
+ * @property int $times_redeemed Number of times this coupon has been applied to a customer.
+ * @property bool $valid Taking account of the above properties, whether this coupon can still be applied to a customer.
  */
 class Coupon extends ApiResource
 {
-    const OBJECT_NAME = "coupon";
+    const OBJECT_NAME = 'coupon';
 
     use ApiOperations\All;
     use ApiOperations\Create;
diff --git a/htdocs/includes/stripe/stripe-php/lib/CreditNote.php b/htdocs/includes/stripe/stripe-php/lib/CreditNote.php
index c81d86ee66d..cc523a9f7a6 100644
--- a/htdocs/includes/stripe/stripe-php/lib/CreditNote.php
+++ b/htdocs/includes/stripe/stripe-php/lib/CreditNote.php
@@ -1,73 +1,111 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class CreditNote
+ * Issue a credit note to adjust an invoice's amount after the invoice is
+ * finalized.
  *
- * @property string $id
- * @property string $object
- * @property int $amount
- * @property string $customer_balance_transaction
- * @property int $created
- * @property string $currency
- * @property string $customer
- * @property string $invoice
- * @property bool $livemode
- * @property string $memo
- * @property StripeObject $metadata
- * @property string $number
- * @property string $pdf
- * @property string $reason
- * @property string $refund
- * @property string $status
- * @property string $type
+ * Related guide: <a
+ * href="https://stripe.com/docs/billing/invoices/credit-notes">Credit Notes</a>.
  *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount The integer amount in %s representing the total amount of the credit note, including tax.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property string|\Stripe\Customer $customer ID of the customer.
+ * @property null|string|\Stripe\CustomerBalanceTransaction $customer_balance_transaction Customer balance transaction related to this credit note.
+ * @property int $discount_amount The integer amount in %s representing the total amount of discount that was credited.
+ * @property \Stripe\StripeObject[] $discount_amounts The aggregate amounts calculated per discount for all line items.
+ * @property string|\Stripe\Invoice $invoice ID of the invoice.
+ * @property \Stripe\Collection $lines Line items that make up the credit note
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|string $memo Customer-facing text that appears on the credit note PDF.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property string $number A unique number that identifies this particular credit note and appears on the PDF of the credit note and its associated invoice.
+ * @property null|int $out_of_band_amount Amount that was credited outside of Stripe.
+ * @property string $pdf The link to download the PDF of the credit note.
+ * @property null|string $reason Reason for issuing this credit note, one of <code>duplicate</code>, <code>fraudulent</code>, <code>order_change</code>, or <code>product_unsatisfactory</code>
+ * @property null|string|\Stripe\Refund $refund Refund related to this credit note.
+ * @property string $status Status of this credit note, one of <code>issued</code> or <code>void</code>. Learn more about <a href="https://stripe.com/docs/billing/invoices/credit-notes#voiding">voiding credit notes</a>.
+ * @property int $subtotal The integer amount in %s representing the amount of the credit note, excluding tax and invoice level discounts.
+ * @property \Stripe\StripeObject[] $tax_amounts The aggregate amounts calculated per tax rate for all line items.
+ * @property int $total The integer amount in %s representing the total amount of the credit note, including tax and all discount.
+ * @property string $type Type of this credit note, one of <code>pre_payment</code> or <code>post_payment</code>. A <code>pre_payment</code> credit note means it was issued when the invoice was open. A <code>post_payment</code> credit note means it was issued when the invoice was paid.
+ * @property null|int $voided_at The time that the credit note was voided.
  */
 class CreditNote extends ApiResource
 {
-    const OBJECT_NAME = "credit_note";
+    const OBJECT_NAME = 'credit_note';
 
     use ApiOperations\All;
     use ApiOperations\Create;
+    use ApiOperations\NestedResource;
     use ApiOperations\Retrieve;
     use ApiOperations\Update;
 
-    /**
-     * Possible string representations of the credit note reason.
-     * @link https://stripe.com/docs/api/credit_notes/object#credit_note_object-reason
-     */
-    const REASON_DUPLICATE              = 'duplicate';
-    const REASON_FRAUDULENT             = 'fraudulent';
-    const REASON_ORDER_CHANGE           = 'order_change';
+    const REASON_DUPLICATE = 'duplicate';
+    const REASON_FRAUDULENT = 'fraudulent';
+    const REASON_ORDER_CHANGE = 'order_change';
     const REASON_PRODUCT_UNSATISFACTORY = 'product_unsatisfactory';
 
-    /**
-     * Possible string representations of the credit note status.
-     * @link https://stripe.com/docs/api/credit_notes/object#credit_note_object-status
-     */
     const STATUS_ISSUED = 'issued';
-    const STATUS_VOID   = 'void';
+    const STATUS_VOID = 'void';
 
-    /**
-     * Possible string representations of the credit note type.
-     * @link https://stripe.com/docs/api/credit_notes/object#credit_note_object-status
-     */
     const TYPE_POST_PAYMENT = 'post_payment';
-    const TYPE_PRE_PAYMENT  = 'pre_payment';
+    const TYPE_PRE_PAYMENT = 'pre_payment';
 
     /**
-     * @param array|null $params
-     * @param array|string|null $opts
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return CreditNote The voided credit note.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\CreditNote the previewed credit note
+     */
+    public static function preview($params = null, $opts = null)
+    {
+        $url = static::classUrl() . '/preview';
+        list($response, $opts) = static::_staticRequest('get', $url, $params, $opts);
+        $obj = Util\Util::convertToStripeObject($response->json, $opts);
+        $obj->setLastResponse($response);
+
+        return $obj;
+    }
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return CreditNote the voided credit note
      */
     public function voidCreditNote($params = null, $opts = null)
     {
         $url = $this->instanceUrl() . '/void';
         list($response, $opts) = $this->_request('post', $url, $params, $opts);
         $this->refreshFrom($response, $opts);
+
         return $this;
     }
+
+    const PATH_LINES = '/lines';
+
+    /**
+     * @param string $id the ID of the credit note on which to retrieve the credit note line items
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection the list of credit note line items
+     */
+    public static function allLines($id, $params = null, $opts = null)
+    {
+        return self::_allNestedResources($id, static::PATH_LINES, $params, $opts);
+    }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/CreditNoteLineItem.php b/htdocs/includes/stripe/stripe-php/lib/CreditNoteLineItem.php
new file mode 100644
index 00000000000..254886b75d7
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/CreditNoteLineItem.php
@@ -0,0 +1,26 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe;
+
+/**
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount The integer amount in %s representing the gross amount being credited for this line item, excluding (exclusive) tax and discounts.
+ * @property null|string $description Description of the item being credited.
+ * @property int $discount_amount The integer amount in %s representing the discount being credited for this line item.
+ * @property \Stripe\StripeObject[] $discount_amounts The amount of discount calculated per discount for this line item
+ * @property string $invoice_line_item ID of the invoice line item being credited
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|int $quantity The number of units of product being credited.
+ * @property \Stripe\StripeObject[] $tax_amounts The amount of tax calculated per tax rate for this line item
+ * @property \Stripe\TaxRate[] $tax_rates The tax rates which apply to the line item.
+ * @property string $type The type of the credit note line item, one of <code>invoice_line_item</code> or <code>custom_line_item</code>. When the type is <code>invoice_line_item</code> there is an additional <code>invoice_line_item</code> property on the resource the value of which is the id of the credited line item on the invoice.
+ * @property null|int $unit_amount The cost of each unit of product being credited.
+ * @property null|string $unit_amount_decimal Same as <code>unit_amount</code>, but contains a decimal value with at most 12 decimal places.
+ */
+class CreditNoteLineItem extends ApiResource
+{
+    const OBJECT_NAME = 'credit_note_line_item';
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Customer.php b/htdocs/includes/stripe/stripe-php/lib/Customer.php
index a3f7f6311da..c3a42cd8aa1 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Customer.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Customer.php
@@ -1,39 +1,47 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class Customer
+ * <code>Customer</code> objects allow you to perform recurring charges, and to
+ * track multiple charges, that are associated with the same customer. The API
+ * allows you to create, delete, and update your customers. You can retrieve
+ * individual customers as well as a list of all your customers.
  *
- * @property string $id
- * @property string $object
- * @property mixed $address
- * @property int $balance
- * @property string $created
- * @property string $currency
- * @property string $default_source
- * @property bool $delinquent
- * @property string $description
- * @property Discount $discount
- * @property string $email
- * @property string $invoice_prefix
- * @property mixed $invoice_settings
- * @property bool $livemode
- * @property StripeObject $metadata
- * @property string $name
- * @property string $phone
- * @property string[] preferred_locales
- * @property mixed $shipping
- * @property Collection $sources
- * @property Collection $subscriptions
- * @property string $tax_exempt
- * @property Collection $tax_ids
+ * Related guide: <a
+ * href="https://stripe.com/docs/payments/save-during-payment">Save a card during
+ * payment</a>.
  *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|\Stripe\StripeObject $address The customer's address.
+ * @property int $balance Current balance, if any, being stored on the customer. If negative, the customer has credit to apply to their next invoice. If positive, the customer has an amount owed that will be added to their next invoice. The balance does not refer to any unpaid invoices; it solely takes into account amounts that have yet to be successfully applied to any invoice. This balance is only taken into account as invoices are finalized.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string $currency Three-letter <a href="https://stripe.com/docs/currencies">ISO code for the currency</a> the customer can be charged in for recurring billing purposes.
+ * @property null|string|\Stripe\Account|\Stripe\AlipayAccount|\Stripe\BankAccount|\Stripe\BitcoinReceiver|\Stripe\Card|\Stripe\Source $default_source <p>ID of the default payment source for the customer.</p><p>If you are using payment methods created via the PaymentMethods API, see the <a href="https://stripe.com/docs/api/customers/object#customer_object-invoice_settings-default_payment_method">invoice_settings.default_payment_method</a> field instead.</p>
+ * @property null|bool $delinquent <p>When the customer's latest invoice is billed by charging automatically, <code>delinquent</code> is <code>true</code> if the invoice's latest charge failed. When the customer's latest invoice is billed by sending an invoice, <code>delinquent</code> is <code>true</code> if the invoice isn't paid by its due date.</p><p>If an invoice is marked uncollectible by <a href="https://stripe.com/docs/billing/automatic-collection">dunning</a>, <code>delinquent</code> doesn't get reset to <code>false</code>.</p>
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property null|\Stripe\Discount $discount Describes the current discount active on the customer, if there is one.
+ * @property null|string $email The customer's email address.
+ * @property null|string $invoice_prefix The prefix for the customer used to generate unique invoice numbers.
+ * @property \Stripe\StripeObject $invoice_settings
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string $name The customer's full name or business name.
+ * @property int $next_invoice_sequence The suffix of the customer's next invoice number, e.g., 0001.
+ * @property null|string $phone The customer's phone number.
+ * @property null|string[] $preferred_locales The customer's preferred locales (languages), ordered by preference.
+ * @property null|\Stripe\StripeObject $shipping Mailing and shipping address for the customer. Appears on invoices emailed to this customer.
+ * @property \Stripe\Collection $sources The customer's payment sources, if any.
+ * @property \Stripe\Collection $subscriptions The customer's current subscriptions, if any.
+ * @property null|string $tax_exempt Describes the customer's tax exemption status. One of <code>none</code>, <code>exempt</code>, or <code>reverse</code>. When set to <code>reverse</code>, invoice and receipt PDFs include the text <strong>&quot;Reverse charge&quot;</strong>.
+ * @property \Stripe\Collection $tax_ids The customer's tax IDs.
  */
 class Customer extends ApiResource
 {
-    const OBJECT_NAME = "customer";
+    const OBJECT_NAME = 'customer';
 
     use ApiOperations\All;
     use ApiOperations\Create;
@@ -42,236 +50,59 @@ class Customer extends ApiResource
     use ApiOperations\Retrieve;
     use ApiOperations\Update;
 
-    /**
-     * Possible string representations of the customer's type of tax exemption.
-     * @link https://stripe.com/docs/api/customers/object#customer_object-tax_exempt
-     */
-    const TAX_EXEMPT_NONE    = 'none';
-    const TAX_EXEMPT_EXEMPT  = 'exempt';
+    const TAX_EXEMPT_EXEMPT = 'exempt';
+    const TAX_EXEMPT_NONE = 'none';
     const TAX_EXEMPT_REVERSE = 'reverse';
 
     public static function getSavedNestedResources()
     {
         static $savedNestedResources = null;
-        if ($savedNestedResources === null) {
+        if (null === $savedNestedResources) {
             $savedNestedResources = new Util\Set([
                 'source',
             ]);
         }
+
         return $savedNestedResources;
     }
 
-    const PATH_BALANCE_TRANSACTIONS = '/balance_transactions';
-    const PATH_SOURCES = '/sources';
-    const PATH_TAX_IDS = '/tax_ids';
-
     /**
-     * @param array|null $params
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return InvoiceItem The resulting invoice item.
+     * @return \Stripe\Customer the updated customer
      */
-    public function addInvoiceItem($params = null)
-    {
-        $params = $params ?: [];
-        $params['customer'] = $this->id;
-        $ii = InvoiceItem::create($params, $this->_opts);
-        return $ii;
-    }
-
-    /**
-     * @param array|null $params
-     *
-     * @return array An array of the customer's Invoices.
-     */
-    public function invoices($params = null)
-    {
-        $params = $params ?: [];
-        $params['customer'] = $this->id;
-        $invoices = Invoice::all($params, $this->_opts);
-        return $invoices;
-    }
-
-    /**
-     * @param array|null $params
-     *
-     * @return array An array of the customer's InvoiceItems.
-     */
-    public function invoiceItems($params = null)
-    {
-        $params = $params ?: [];
-        $params['customer'] = $this->id;
-        $iis = InvoiceItem::all($params, $this->_opts);
-        return $iis;
-    }
-
-    /**
-     * @param array|null $params
-     *
-     * @return array An array of the customer's Charges.
-     */
-    public function charges($params = null)
-    {
-        $params = $params ?: [];
-        $params['customer'] = $this->id;
-        $charges = Charge::all($params, $this->_opts);
-        return $charges;
-    }
-
-    /**
-     * @param array|null $params
-     *
-     * @return Subscription The updated subscription.
-     */
-    public function updateSubscription($params = null)
-    {
-        $url = $this->instanceUrl() . '/subscription';
-        list($response, $opts) = $this->_request('post', $url, $params);
-        $this->refreshFrom(['subscription' => $response], $opts, true);
-        return $this->subscription;
-    }
-
-    /**
-     * @param array|null $params
-     *
-     * @return Subscription The cancelled subscription.
-     */
-    public function cancelSubscription($params = null)
-    {
-        $url = $this->instanceUrl() . '/subscription';
-        list($response, $opts) = $this->_request('delete', $url, $params);
-        $this->refreshFrom(['subscription' => $response], $opts, true);
-        return $this->subscription;
-    }
-
-    /**
-     * @return Customer The updated customer.
-     */
-    public function deleteDiscount()
+    public function deleteDiscount($params = null, $opts = null)
     {
         $url = $this->instanceUrl() . '/discount';
-        list($response, $opts) = $this->_request('delete', $url);
+        list($response, $opts) = $this->_request('delete', $url, $params, $opts);
         $this->refreshFrom(['discount' => null], $opts, true);
     }
 
+    const PATH_BALANCE_TRANSACTIONS = '/balance_transactions';
+
     /**
-     * @param string|null $id The ID of the customer on which to create the source.
-     * @param array|null $params
-     * @param array|string|null $opts
+     * @param string $id the ID of the customer on which to retrieve the customer balance transactions
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return ApiResource
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection the list of customer balance transactions
      */
-    public static function createSource($id, $params = null, $opts = null)
+    public static function allBalanceTransactions($id, $params = null, $opts = null)
     {
-        return self::_createNestedResource($id, static::PATH_SOURCES, $params, $opts);
+        return self::_allNestedResources($id, static::PATH_BALANCE_TRANSACTIONS, $params, $opts);
     }
 
     /**
-     * @param string|null $id The ID of the customer to which the source belongs.
-     * @param string|null $sourceId The ID of the source to retrieve.
-     * @param array|null $params
-     * @param array|string|null $opts
+     * @param string $id the ID of the customer on which to create the customer balance transaction
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return ApiResource
-     */
-    public static function retrieveSource($id, $sourceId, $params = null, $opts = null)
-    {
-        return self::_retrieveNestedResource($id, static::PATH_SOURCES, $sourceId, $params, $opts);
-    }
-
-    /**
-     * @param string|null $id The ID of the customer to which the source belongs.
-     * @param string|null $sourceId The ID of the source to update.
-     * @param array|null $params
-     * @param array|string|null $opts
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
      *
-     * @return ApiResource
-     */
-    public static function updateSource($id, $sourceId, $params = null, $opts = null)
-    {
-        return self::_updateNestedResource($id, static::PATH_SOURCES, $sourceId, $params, $opts);
-    }
-
-    /**
-     * @param string|null $id The ID of the customer to which the source belongs.
-     * @param string|null $sourceId The ID of the source to delete.
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return ApiResource
-     */
-    public static function deleteSource($id, $sourceId, $params = null, $opts = null)
-    {
-        return self::_deleteNestedResource($id, static::PATH_SOURCES, $sourceId, $params, $opts);
-    }
-
-    /**
-     * @param string|null $id The ID of the customer on which to retrieve the sources.
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection The list of sources.
-     */
-    public static function allSources($id, $params = null, $opts = null)
-    {
-        return self::_allNestedResources($id, static::PATH_SOURCES, $params, $opts);
-    }
-
-    /**
-     * @param string|null $id The ID of the customer on which to create the tax id.
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return ApiResource
-     */
-    public static function createTaxId($id, $params = null, $opts = null)
-    {
-        return self::_createNestedResource($id, static::PATH_TAX_IDS, $params, $opts);
-    }
-
-    /**
-     * @param string|null $id The ID of the customer to which the tax id belongs.
-     * @param string|null $taxIdId The ID of the tax id to retrieve.
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return ApiResource
-     */
-    public static function retrieveTaxId($id, $taxIdId, $params = null, $opts = null)
-    {
-        return self::_retrieveNestedResource($id, static::PATH_TAX_IDS, $taxIdId, $params, $opts);
-    }
-
-    /**
-     * @param string|null $id The ID of the customer to which the tax id belongs.
-     * @param string|null $taxIdId The ID of the tax id to delete.
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return ApiResource
-     */
-    public static function deleteTaxId($id, $taxIdId, $params = null, $opts = null)
-    {
-        return self::_deleteNestedResource($id, static::PATH_TAX_IDS, $taxIdId, $params, $opts);
-    }
-
-    /**
-     * @param string|null $id The ID of the customer on which to retrieve the tax ids.
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection The list of tax ids.
-     */
-    public static function allTaxIds($id, $params = null, $opts = null)
-    {
-        return self::_allNestedResources($id, static::PATH_TAX_IDS, $params, $opts);
-    }
-
-    /**
-     * @param string|null $id The ID of the customer on which to create the balance transaction.
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return ApiResource
+     * @return \Stripe\CustomerBalanceTransaction
      */
     public static function createBalanceTransaction($id, $params = null, $opts = null)
     {
@@ -279,12 +110,14 @@ class Customer extends ApiResource
     }
 
     /**
-     * @param string|null $id The ID of the customer to which the balance transaction belongs.
-     * @param string|null $balanceTransactionId The ID of the balance transaction to retrieve.
-     * @param array|null $params
-     * @param array|string|null $opts
+     * @param string $id the ID of the customer to which the customer balance transaction belongs
+     * @param string $balanceTransactionId the ID of the customer balance transaction to retrieve
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return ApiResource
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\CustomerBalanceTransaction
      */
     public static function retrieveBalanceTransaction($id, $balanceTransactionId, $params = null, $opts = null)
     {
@@ -292,28 +125,152 @@ class Customer extends ApiResource
     }
 
     /**
-     * @param string|null $id The ID of the customer on which to update the balance transaction.
-     * @param string|null $balanceTransactionId The ID of the balance transaction to update.
-     * @param array|null $params
-     * @param array|string|null $opts
+     * @param string $id the ID of the customer to which the customer balance transaction belongs
+     * @param string $balanceTransactionId the ID of the customer balance transaction to update
+     * @param null|array $params
+     * @param null|array|string $opts
      *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
      *
-     * @return ApiResource
+     * @return \Stripe\CustomerBalanceTransaction
      */
     public static function updateBalanceTransaction($id, $balanceTransactionId, $params = null, $opts = null)
     {
         return self::_updateNestedResource($id, static::PATH_BALANCE_TRANSACTIONS, $balanceTransactionId, $params, $opts);
     }
 
+    const PATH_SOURCES = '/sources';
+
     /**
-     * @param string|null $id The ID of the customer on which to retrieve the customer balance transactions.
-     * @param array|null $params
-     * @param array|string|null $opts
+     * @param string $id the ID of the customer on which to retrieve the payment sources
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return Collection The list of customer balance transactions.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection the list of payment sources (AlipayAccount, BankAccount, BitcoinReceiver, Card or Source)
      */
-    public static function allBalanceTransactions($id, $params = null, $opts = null)
+    public static function allSources($id, $params = null, $opts = null)
     {
-        return self::_allNestedResources($id, static::PATH_BALANCE_TRANSACTIONS, $params, $opts);
+        return self::_allNestedResources($id, static::PATH_SOURCES, $params, $opts);
+    }
+
+    /**
+     * @param string $id the ID of the customer on which to create the payment source
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\AlipayAccount|\Stripe\BankAccount|\Stripe\BitcoinReceiver|\Stripe\Card|\Stripe\Source
+     */
+    public static function createSource($id, $params = null, $opts = null)
+    {
+        return self::_createNestedResource($id, static::PATH_SOURCES, $params, $opts);
+    }
+
+    /**
+     * @param string $id the ID of the customer to which the payment source belongs
+     * @param string $sourceId the ID of the payment source to delete
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\AlipayAccount|\Stripe\BankAccount|\Stripe\BitcoinReceiver|\Stripe\Card|\Stripe\Source
+     */
+    public static function deleteSource($id, $sourceId, $params = null, $opts = null)
+    {
+        return self::_deleteNestedResource($id, static::PATH_SOURCES, $sourceId, $params, $opts);
+    }
+
+    /**
+     * @param string $id the ID of the customer to which the payment source belongs
+     * @param string $sourceId the ID of the payment source to retrieve
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\AlipayAccount|\Stripe\BankAccount|\Stripe\BitcoinReceiver|\Stripe\Card|\Stripe\Source
+     */
+    public static function retrieveSource($id, $sourceId, $params = null, $opts = null)
+    {
+        return self::_retrieveNestedResource($id, static::PATH_SOURCES, $sourceId, $params, $opts);
+    }
+
+    /**
+     * @param string $id the ID of the customer to which the payment source belongs
+     * @param string $sourceId the ID of the payment source to update
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\AlipayAccount|\Stripe\BankAccount|\Stripe\BitcoinReceiver|\Stripe\Card|\Stripe\Source
+     */
+    public static function updateSource($id, $sourceId, $params = null, $opts = null)
+    {
+        return self::_updateNestedResource($id, static::PATH_SOURCES, $sourceId, $params, $opts);
+    }
+
+    const PATH_TAX_IDS = '/tax_ids';
+
+    /**
+     * @param string $id the ID of the customer on which to retrieve the tax ids
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection the list of tax ids
+     */
+    public static function allTaxIds($id, $params = null, $opts = null)
+    {
+        return self::_allNestedResources($id, static::PATH_TAX_IDS, $params, $opts);
+    }
+
+    /**
+     * @param string $id the ID of the customer on which to create the tax id
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\TaxId
+     */
+    public static function createTaxId($id, $params = null, $opts = null)
+    {
+        return self::_createNestedResource($id, static::PATH_TAX_IDS, $params, $opts);
+    }
+
+    /**
+     * @param string $id the ID of the customer to which the tax id belongs
+     * @param string $taxIdId the ID of the tax id to delete
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\TaxId
+     */
+    public static function deleteTaxId($id, $taxIdId, $params = null, $opts = null)
+    {
+        return self::_deleteNestedResource($id, static::PATH_TAX_IDS, $taxIdId, $params, $opts);
+    }
+
+    /**
+     * @param string $id the ID of the customer to which the tax id belongs
+     * @param string $taxIdId the ID of the tax id to retrieve
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\TaxId
+     */
+    public static function retrieveTaxId($id, $taxIdId, $params = null, $opts = null)
+    {
+        return self::_retrieveNestedResource($id, static::PATH_TAX_IDS, $taxIdId, $params, $opts);
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/CustomerBalanceTransaction.php b/htdocs/includes/stripe/stripe-php/lib/CustomerBalanceTransaction.php
index 06cafcd45c6..8c306760dbc 100644
--- a/htdocs/includes/stripe/stripe-php/lib/CustomerBalanceTransaction.php
+++ b/htdocs/includes/stripe/stripe-php/lib/CustomerBalanceTransaction.php
@@ -1,52 +1,60 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class CustomerBalanceTransaction
+ * Each customer has a <a
+ * href="https://stripe.com/docs/api/customers/object#customer_object-balance"><code>balance</code></a>
+ * value, which denotes a debit or credit that's automatically applied to their
+ * next invoice upon finalization. You may modify the value directly by using the
+ * <a href="https://stripe.com/docs/api/customers/update">update customer API</a>,
+ * or by creating a Customer Balance Transaction, which increments or decrements
+ * the customer's <code>balance</code> by the specified <code>amount</code>.
  *
- * @package Stripe
+ * Related guide: <a
+ * href="https://stripe.com/docs/billing/customer/balance">Customer Balance</a> to
+ * learn more.
  *
- * @property string $id
- * @property string $object
- * @property int $amount
- * @property string $credit_note
- * @property int $created
- * @property string $currency
- * @property string $customer
- * @property string $description
- * @property int $ending_balance
- * @property string $invoice
- * @property bool $livemode
- * @property StripeObject $metadata
- * @property string $type
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount The amount of the transaction. A negative value is a credit for the customer's balance, and a positive value is a debit to the customer's <code>balance</code>.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string|\Stripe\CreditNote $credit_note The ID of the credit note (if any) related to the transaction.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property string|\Stripe\Customer $customer The ID of the customer the transaction belongs to.
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property int $ending_balance The customer's <code>balance</code> after the transaction was applied. A negative value decreases the amount due on the customer's next invoice. A positive value increases the amount due on the customer's next invoice.
+ * @property null|string|\Stripe\Invoice $invoice The ID of the invoice (if any) related to the transaction.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property string $type Transaction type: <code>adjustment</code>, <code>applied_to_invoice</code>, <code>credit_note</code>, <code>initial</code>, <code>invoice_too_large</code>, <code>invoice_too_small</code>, <code>unspent_receiver_credit</code>, or <code>unapplied_from_invoice</code>. See the <a href="https://stripe.com/docs/billing/customer/balance#types">Customer Balance page</a> to learn more about transaction types.
  */
 class CustomerBalanceTransaction extends ApiResource
 {
-    const OBJECT_NAME = "customer_balance_transaction";
+    const OBJECT_NAME = 'customer_balance_transaction';
 
-    /**
-     * Possible string representations of a balance transaction's type.
-     * @link https://stripe.com/docs/api/customers/customer_balance_transaction_object#customer_balance_transaction_object-type
-     */
-    const TYPE_ADJUSTEMENT             = 'adjustment';
-    const TYPE_APPLIED_TO_INVOICE      = 'applied_to_invoice';
-    const TYPE_CREDIT_NOTE             = 'credit_note';
-    const TYPE_INITIAL                 = 'initial';
-    const TYPE_INVOICE_TOO_LARGE       = 'invoice_too_large';
-    const TYPE_INVOICE_TOO_SMALL       = 'invoice_too_small';
+    const TYPE_ADJUSTMENT = 'adjustment';
+    const TYPE_APPLIED_TO_INVOICE = 'applied_to_invoice';
+    const TYPE_CREDIT_NOTE = 'credit_note';
+    const TYPE_INITIAL = 'initial';
+    const TYPE_INVOICE_TOO_LARGE = 'invoice_too_large';
+    const TYPE_INVOICE_TOO_SMALL = 'invoice_too_small';
     const TYPE_UNSPENT_RECEIVER_CREDIT = 'unspent_receiver_credit';
 
+    const TYPE_ADJUSTEMENT = 'adjustment';
+
     /**
-     * @return string The API URL for this balance transaction.
+     * @return string the API URL for this balance transaction
      */
     public function instanceUrl()
     {
         $id = $this['id'];
         $customer = $this['customer'];
         if (!$id) {
-            throw new Error\InvalidRequest(
-                "Could not determine which URL to request: class instance has invalid ID: $id",
+            throw new Exception\UnexpectedValueException(
+                "Could not determine which URL to request: class instance has invalid ID: {$id}",
                 null
             );
         }
@@ -54,35 +62,42 @@ class CustomerBalanceTransaction extends ApiResource
         $customer = Util\Util::utf8($customer);
 
         $base = Customer::classUrl();
-        $customerExtn = urlencode($customer);
-        $extn = urlencode($id);
-        return "$base/$customerExtn/balance_transactions/$extn";
+        $customerExtn = \urlencode($customer);
+        $extn = \urlencode($id);
+
+        return "{$base}/{$customerExtn}/balance_transactions/{$extn}";
     }
 
     /**
      * @param array|string $_id
-     * @param array|string|null $_opts
+     * @param null|array|string $_opts
      *
-     * @throws \Stripe\Error\InvalidRequest
+     * @throws \Stripe\Exception\BadMethodCallException
      */
     public static function retrieve($_id, $_opts = null)
     {
-        $msg = "Customer Balance Transactions cannot be accessed without a customer ID. " .
-               "Retrieve a balance transaction using Customer::retrieveBalanceTransaction('cus_123', 'cbtxn_123') instead.";
-        throw new Error\InvalidRequest($msg, null);
+        $msg = 'Customer Balance Transactions cannot be retrieved without a ' .
+               'customer ID. Retrieve a Customer Balance Transaction using ' .
+               "`Customer::retrieveBalanceTransaction('customer_id', " .
+               "'balance_transaction_id')`.";
+
+        throw new Exception\BadMethodCallException($msg);
     }
 
     /**
      * @param string $_id
-     * @param array|null $_params
-     * @param array|string|null $_options
+     * @param null|array $_params
+     * @param null|array|string $_options
      *
-     * @throws \Stripe\Error\InvalidRequest
+     * @throws \Stripe\Exception\BadMethodCallException
      */
     public static function update($_id, $_params = null, $_options = null)
     {
-        $msg = "Customer Balance Transactions cannot be accessed without a customer ID. " .
-               "Update a balance transaction using Customer::updateBalanceTransaction('cus_123', 'cbtxn_123', \$params) instead.";
-        throw new Error\InvalidRequest($msg, null);
+        $msg = 'Customer Balance Transactions cannot be updated without a ' .
+               'customer ID. Update a Customer Balance Transaction using ' .
+               "`Customer::updateBalanceTransaction('customer_id', " .
+               "'balance_transaction_id', \$updateParams)`.";
+
+        throw new Exception\BadMethodCallException($msg);
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Discount.php b/htdocs/includes/stripe/stripe-php/lib/Discount.php
index 68bfc0fd74a..18a7470d447 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Discount.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Discount.php
@@ -3,18 +3,22 @@
 namespace Stripe;
 
 /**
- * Class Discount
+ * Class Discount.
  *
  * @property string $object
- * @property Coupon $coupon
- * @property string $customer
- * @property int $end
- * @property int $start
- * @property string $subscription
- *
- * @package Stripe
+ * @property string $checkout_session The Checkout session that this coupon is applied to, if it is applied to a particular session in payment mode. Will not be present for subscription mode.
+ * @property \Stripe\Coupon $coupon Hash describing the coupon applied to create this discount.
+ * @property string|\Stripe\Customer $customer The ID of the customer associated with this discount.
+ * @property int $end If the coupon has a duration of repeating, the date that this discount will end. If the coupon has a duration of once or forever, this attribute will be null.
+ * @property string $id The ID of the discount object.
+ * @property string $invoice The invoice that the discount’s coupon was applied to, if it was applied directly to a particular invoice.
+ * @property string $invoice_item The invoice item id (or invoice line item id for invoice line items of type=‘subscription’) that the discount’s coupon was applied to, if it was applied directly to a particular invoice item or invoice line item.
+ * @property string $object String representing the object’s type. Objects of the same type share the same value.
+ * @property string $promotion_code The promotion code applied to create this discount.
+ * @property int $start Date that the coupon was applied.
+ * @property string $subscription The subscription that this coupon is applied to, if it is applied to a particular subscription.
  */
 class Discount extends StripeObject
 {
-    const OBJECT_NAME = "discount";
+    const OBJECT_NAME = 'discount';
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Dispute.php b/htdocs/includes/stripe/stripe-php/lib/Dispute.php
index 8ffc2d4cc73..5772accc531 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Dispute.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Dispute.php
@@ -1,77 +1,82 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class Dispute
+ * A dispute occurs when a customer questions your charge with their card issuer.
+ * When this happens, you're given the opportunity to respond to the dispute with
+ * evidence that shows that the charge is legitimate. You can find more information
+ * about the dispute process in our <a href="/docs/disputes">Disputes and Fraud</a>
+ * documentation.
  *
- * @property string $id
- * @property string $object
- * @property int $amount
- * @property BalanceTransaction[] $balance_transactions
- * @property string $charge
- * @property int $created
- * @property string $currency
- * @property mixed $evidence
- * @property mixed $evidence_details
- * @property bool $is_charge_refundable
- * @property bool $livemode
- * @property StripeObject $metadata
- * @property string $reason
- * @property string $status
+ * Related guide: <a href="https://stripe.com/docs/disputes">Disputes and
+ * Fraud</a>.
  *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Disputed amount. Usually the amount of the charge, but can differ (usually because of currency fluctuation or because only part of the order is disputed).
+ * @property \Stripe\BalanceTransaction[] $balance_transactions List of zero, one, or two balance transactions that show funds withdrawn and reinstated to your Stripe account as a result of this dispute.
+ * @property string|\Stripe\Charge $charge ID of the charge that was disputed.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property \Stripe\StripeObject $evidence
+ * @property \Stripe\StripeObject $evidence_details
+ * @property bool $is_charge_refundable If true, it is still possible to refund the disputed payment. Once the payment has been fully refunded, no further funds will be withdrawn from your Stripe account as a result of this dispute.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string $network_reason_code Network-dependent reason code for the dispute.
+ * @property null|string|\Stripe\PaymentIntent $payment_intent ID of the PaymentIntent that was disputed.
+ * @property string $reason Reason given by cardholder for dispute. Possible values are <code>bank_cannot_process</code>, <code>check_returned</code>, <code>credit_not_processed</code>, <code>customer_initiated</code>, <code>debit_not_authorized</code>, <code>duplicate</code>, <code>fraudulent</code>, <code>general</code>, <code>incorrect_account_details</code>, <code>insufficient_funds</code>, <code>product_not_received</code>, <code>product_unacceptable</code>, <code>subscription_canceled</code>, or <code>unrecognized</code>. Read more about <a href="https://stripe.com/docs/disputes/categories">dispute reasons</a>.
+ * @property string $status Current status of dispute. Possible values are <code>warning_needs_response</code>, <code>warning_under_review</code>, <code>warning_closed</code>, <code>needs_response</code>, <code>under_review</code>, <code>charge_refunded</code>, <code>won</code>, or <code>lost</code>.
  */
 class Dispute extends ApiResource
 {
-    const OBJECT_NAME = "dispute";
+    const OBJECT_NAME = 'dispute';
 
     use ApiOperations\All;
     use ApiOperations\Retrieve;
     use ApiOperations\Update;
 
-    /**
-     * Possible string representations of dispute reasons.
-     * @link https://stripe.com/docs/api#dispute_object
-     */
-    const REASON_BANK_CANNOT_PROCESS       = 'bank_cannot_process';
-    const REASON_CHECK_RETURNED            = 'check_returned';
-    const REASON_CREDIT_NOT_PROCESSED      = 'credit_not_processed';
-    const REASON_CUSTOMER_INITIATED        = 'customer_initiated';
-    const REASON_DEBIT_NOT_AUTHORIZED      = 'debit_not_authorized';
-    const REASON_DUPLICATE                 = 'duplicate';
-    const REASON_FRAUDULENT                = 'fraudulent';
-    const REASON_GENERAL                   = 'general';
+    const REASON_BANK_CANNOT_PROCESS = 'bank_cannot_process';
+    const REASON_CHECK_RETURNED = 'check_returned';
+    const REASON_CREDIT_NOT_PROCESSED = 'credit_not_processed';
+    const REASON_CUSTOMER_INITIATED = 'customer_initiated';
+    const REASON_DEBIT_NOT_AUTHORIZED = 'debit_not_authorized';
+    const REASON_DUPLICATE = 'duplicate';
+    const REASON_FRAUDULENT = 'fraudulent';
+    const REASON_GENERAL = 'general';
     const REASON_INCORRECT_ACCOUNT_DETAILS = 'incorrect_account_details';
-    const REASON_INSUFFICIENT_FUNDS        = 'insufficient_funds';
-    const REASON_PRODUCT_NOT_RECEIVED      = 'product_not_received';
-    const REASON_PRODUCT_UNACCEPTABLE      = 'product_unacceptable';
-    const REASON_SUBSCRIPTION_CANCELED     = 'subscription_canceled';
-    const REASON_UNRECOGNIZED              = 'unrecognized';
+    const REASON_INSUFFICIENT_FUNDS = 'insufficient_funds';
+    const REASON_PRODUCT_NOT_RECEIVED = 'product_not_received';
+    const REASON_PRODUCT_UNACCEPTABLE = 'product_unacceptable';
+    const REASON_SUBSCRIPTION_CANCELED = 'subscription_canceled';
+    const REASON_UNRECOGNIZED = 'unrecognized';
 
-    /**
-     * Possible string representations of dispute statuses.
-     * @link https://stripe.com/docs/api#dispute_object
-     */
-    const STATUS_CHARGE_REFUNDED        = 'charge_refunded';
-    const STATUS_LOST                   = 'lost';
-    const STATUS_NEEDS_RESPONSE         = 'needs_response';
-    const STATUS_UNDER_REVIEW           = 'under_review';
-    const STATUS_WARNING_CLOSED         = 'warning_closed';
+    const STATUS_CHARGE_REFUNDED = 'charge_refunded';
+    const STATUS_LOST = 'lost';
+    const STATUS_NEEDS_RESPONSE = 'needs_response';
+    const STATUS_UNDER_REVIEW = 'under_review';
+    const STATUS_WARNING_CLOSED = 'warning_closed';
     const STATUS_WARNING_NEEDS_RESPONSE = 'warning_needs_response';
-    const STATUS_WARNING_UNDER_REVIEW   = 'warning_under_review';
-    const STATUS_WON                    = 'won';
+    const STATUS_WARNING_UNDER_REVIEW = 'warning_under_review';
+    const STATUS_WON = 'won';
 
     /**
-     * @param array|string|null $options
+     * @param null|array|string $opts
      *
-     * @return Dispute The closed dispute.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Dispute the closed dispute
      */
-    public function close($options = null)
+    // TODO: add $params to standardize signature
+    public function close($opts = null)
     {
         $url = $this->instanceUrl() . '/close';
-        list($response, $opts) = $this->_request('post', $url, null, $options);
+        list($response, $opts) = $this->_request('post', $url, null, $opts);
         $this->refreshFrom($response, $opts);
+
         return $this;
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/EphemeralKey.php b/htdocs/includes/stripe/stripe-php/lib/EphemeralKey.php
index ea4cc756ccd..253256cfd39 100644
--- a/htdocs/includes/stripe/stripe-php/lib/EphemeralKey.php
+++ b/htdocs/includes/stripe/stripe-php/lib/EphemeralKey.php
@@ -1,40 +1,43 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class EphemeralKey
- *
- * @property string $id
- * @property string $object
- * @property int $created
- * @property int $expires
- * @property bool $livemode
- * @property string $secret
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property int $expires Time at which the key will expire. Measured in seconds since the Unix epoch.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property string $secret The key's secret. You can use this value to make authorized requests to the Stripe API.
  * @property array $associated_objects
- *
- * @package Stripe
  */
 class EphemeralKey extends ApiResource
 {
-    const OBJECT_NAME = "ephemeral_key";
+    const OBJECT_NAME = 'ephemeral_key';
 
     use ApiOperations\Create {
         create as protected _create;
     }
+
     use ApiOperations\Delete;
 
     /**
-     * @param array|null $params
-     * @param array|string|null $opts
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return EphemeralKey The created key.
+     * @throws \Stripe\Exception\InvalidArgumentException if stripe_version is missing
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\EphemeralKey the created key
      */
     public static function create($params = null, $opts = null)
     {
-        if (!$opts['stripe_version']) {
-            throw new \InvalidArgumentException('stripe_version must be specified to create an ephemeral key');
+        if (!$opts || !isset($opts['stripe_version'])) {
+            throw new Exception\InvalidArgumentException('stripe_version must be specified to create an ephemeral key');
         }
+
         return self::_create($params, $opts);
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/ErrorObject.php b/htdocs/includes/stripe/stripe-php/lib/ErrorObject.php
new file mode 100644
index 00000000000..a9fe1a3b279
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/ErrorObject.php
@@ -0,0 +1,164 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class ErrorObject.
+ *
+ * @property string $charge For card errors, the ID of the failed charge.
+ * @property string $code For some errors that could be handled
+ *    programmatically, a short string indicating the error code reported.
+ * @property string $decline_code For card errors resulting from a card issuer
+ *    decline, a short string indicating the card issuer's reason for the
+ *    decline if they provide one.
+ * @property string $doc_url A URL to more information about the error code
+ *    reported.
+ * @property string $message A human-readable message providing more details
+ *    about the error. For card errors, these messages can be shown to your
+ *    users.
+ * @property string $param If the error is parameter-specific, the parameter
+ *    related to the error. For example, you can use this to display a message
+ *    near the correct form field.
+ * @property PaymentIntent $payment_intent The PaymentIntent object for errors
+ *    returned on a request involving a PaymentIntent.
+ * @property PaymentMethod $payment_method The PaymentMethod object for errors
+ *    returned on a request involving a PaymentMethod.
+ * @property string $payment_method_type If the error is specific to the type
+ *    of payment method, the payment method type that had a problem. This
+ *    field is only populated for invoice-related errors.
+ * @property SetupIntent $setup_intent The SetupIntent object for errors
+ *    returned on a request involving a SetupIntent.
+ * @property StripeObject $source The source object for errors returned on a
+ *    request involving a source.
+ * @property string $type The type of error returned. One of
+ *    `api_connection_error`, `api_error`, `authentication_error`,
+ *    `card_error`, `idempotency_error`, `invalid_request_error`, or
+ *    `rate_limit_error`.
+ */
+class ErrorObject extends StripeObject
+{
+    /**
+     * Possible string representations of an error's code.
+     *
+     * @see https://stripe.com/docs/error-codes
+     */
+    const CODE_ACCOUNT_ALREADY_EXISTS = 'account_already_exists';
+    const CODE_ACCOUNT_COUNTRY_INVALID_ADDRESS = 'account_country_invalid_address';
+    const CODE_ACCOUNT_INVALID = 'account_invalid';
+    const CODE_ACCOUNT_NUMBER_INVALID = 'account_number_invalid';
+    const CODE_ALIPAY_UPGRADE_REQUIRED = 'alipay_upgrade_required';
+    const CODE_AMOUNT_TOO_LARGE = 'amount_too_large';
+    const CODE_AMOUNT_TOO_SMALL = 'amount_too_small';
+    const CODE_API_KEY_EXPIRED = 'api_key_expired';
+    const CODE_BALANCE_INSUFFICIENT = 'balance_insufficient';
+    const CODE_BANK_ACCOUNT_EXISTS = 'bank_account_exists';
+    const CODE_BANK_ACCOUNT_UNUSABLE = 'bank_account_unusable';
+    const CODE_BANK_ACCOUNT_UNVERIFIED = 'bank_account_unverified';
+    const CODE_BITCOIN_UPGRADE_REQUIRED = 'bitcoin_upgrade_required';
+    const CODE_CARD_DECLINED = 'card_declined';
+    const CODE_CHARGE_ALREADY_CAPTURED = 'charge_already_captured';
+    const CODE_CHARGE_ALREADY_REFUNDED = 'charge_already_refunded';
+    const CODE_CHARGE_DISPUTED = 'charge_disputed';
+    const CODE_CHARGE_EXCEEDS_SOURCE_LIMIT = 'charge_exceeds_source_limit';
+    const CODE_CHARGE_EXPIRED_FOR_CAPTURE = 'charge_expired_for_capture';
+    const CODE_COUNTRY_UNSUPPORTED = 'country_unsupported';
+    const CODE_COUPON_EXPIRED = 'coupon_expired';
+    const CODE_CUSTOMER_MAX_SUBSCRIPTIONS = 'customer_max_subscriptions';
+    const CODE_EMAIL_INVALID = 'email_invalid';
+    const CODE_EXPIRED_CARD = 'expired_card';
+    const CODE_IDEMPOTENCY_KEY_IN_USE = 'idempotency_key_in_use';
+    const CODE_INCORRECT_ADDRESS = 'incorrect_address';
+    const CODE_INCORRECT_CVC = 'incorrect_cvc';
+    const CODE_INCORRECT_NUMBER = 'incorrect_number';
+    const CODE_INCORRECT_ZIP = 'incorrect_zip';
+    const CODE_INSTANT_PAYOUTS_UNSUPPORTED = 'instant_payouts_unsupported';
+    const CODE_INVALID_CARD_TYPE = 'invalid_card_type';
+    const CODE_INVALID_CHARGE_AMOUNT = 'invalid_charge_amount';
+    const CODE_INVALID_CVC = 'invalid_cvc';
+    const CODE_INVALID_EXPIRY_MONTH = 'invalid_expiry_month';
+    const CODE_INVALID_EXPIRY_YEAR = 'invalid_expiry_year';
+    const CODE_INVALID_NUMBER = 'invalid_number';
+    const CODE_INVALID_SOURCE_USAGE = 'invalid_source_usage';
+    const CODE_INVOICE_NO_CUSTOMER_LINE_ITEMS = 'invoice_no_customer_line_items';
+    const CODE_INVOICE_NO_SUBSCRIPTION_LINE_ITEMS = 'invoice_no_subscription_line_items';
+    const CODE_INVOICE_NOT_EDITABLE = 'invoice_not_editable';
+    const CODE_INVOICE_PAYMENT_INTENT_REQUIRES_ACTION = 'invoice_payment_intent_requires_action';
+    const CODE_INVOICE_UPCOMING_NONE = 'invoice_upcoming_none';
+    const CODE_LIVEMODE_MISMATCH = 'livemode_mismatch';
+    const CODE_LOCK_TIMEOUT = 'lock_timeout';
+    const CODE_MISSING = 'missing';
+    const CODE_NOT_ALLOWED_ON_STANDARD_ACCOUNT = 'not_allowed_on_standard_account';
+    const CODE_ORDER_CREATION_FAILED = 'order_creation_failed';
+    const CODE_ORDER_REQUIRED_SETTINGS = 'order_required_settings';
+    const CODE_ORDER_STATUS_INVALID = 'order_status_invalid';
+    const CODE_ORDER_UPSTREAM_TIMEOUT = 'order_upstream_timeout';
+    const CODE_OUT_OF_INVENTORY = 'out_of_inventory';
+    const CODE_PARAMETER_INVALID_EMPTY = 'parameter_invalid_empty';
+    const CODE_PARAMETER_INVALID_INTEGER = 'parameter_invalid_integer';
+    const CODE_PARAMETER_INVALID_STRING_BLANK = 'parameter_invalid_string_blank';
+    const CODE_PARAMETER_INVALID_STRING_EMPTY = 'parameter_invalid_string_empty';
+    const CODE_PARAMETER_MISSING = 'parameter_missing';
+    const CODE_PARAMETER_UNKNOWN = 'parameter_unknown';
+    const CODE_PARAMETERS_EXCLUSIVE = 'parameters_exclusive';
+    const CODE_PAYMENT_INTENT_AUTHENTICATION_FAILURE = 'payment_intent_authentication_failure';
+    const CODE_PAYMENT_INTENT_INCOMPATIBLE_PAYMENT_METHOD = 'payment_intent_incompatible_payment_method';
+    const CODE_PAYMENT_INTENT_INVALID_PARAMETER = 'payment_intent_invalid_parameter';
+    const CODE_PAYMENT_INTENT_PAYMENT_ATTEMPT_FAILED = 'payment_intent_payment_attempt_failed';
+    const CODE_PAYMENT_INTENT_UNEXPECTED_STATE = 'payment_intent_unexpected_state';
+    const CODE_PAYMENT_METHOD_UNACTIVATED = 'payment_method_unactivated';
+    const CODE_PAYMENT_METHOD_UNEXPECTED_STATE = 'payment_method_unexpected_state';
+    const CODE_PAYOUTS_NOT_ALLOWED = 'payouts_not_allowed';
+    const CODE_PLATFORM_API_KEY_EXPIRED = 'platform_api_key_expired';
+    const CODE_POSTAL_CODE_INVALID = 'postal_code_invalid';
+    const CODE_PROCESSING_ERROR = 'processing_error';
+    const CODE_PRODUCT_INACTIVE = 'product_inactive';
+    const CODE_RATE_LIMIT = 'rate_limit';
+    const CODE_RESOURCE_ALREADY_EXISTS = 'resource_already_exists';
+    const CODE_RESOURCE_MISSING = 'resource_missing';
+    const CODE_ROUTING_NUMBER_INVALID = 'routing_number_invalid';
+    const CODE_SECRET_KEY_REQUIRED = 'secret_key_required';
+    const CODE_SEPA_UNSUPPORTED_ACCOUNT = 'sepa_unsupported_account';
+    const CODE_SETUP_ATTEMPT_FAILED = 'setup_attempt_failed';
+    const CODE_SETUP_INTENT_AUTHENTICATION_FAILURE = 'setup_intent_authentication_failure';
+    const CODE_SETUP_INTENT_UNEXPECTED_STATE = 'setup_intent_unexpected_state';
+    const CODE_SHIPPING_CALCULATION_FAILED = 'shipping_calculation_failed';
+    const CODE_SKU_INACTIVE = 'sku_inactive';
+    const CODE_STATE_UNSUPPORTED = 'state_unsupported';
+    const CODE_TAX_ID_INVALID = 'tax_id_invalid';
+    const CODE_TAXES_CALCULATION_FAILED = 'taxes_calculation_failed';
+    const CODE_TESTMODE_CHARGES_ONLY = 'testmode_charges_only';
+    const CODE_TLS_VERSION_UNSUPPORTED = 'tls_version_unsupported';
+    const CODE_TOKEN_ALREADY_USED = 'token_already_used';
+    const CODE_TOKEN_IN_USE = 'token_in_use';
+    const CODE_TRANSFERS_NOT_ALLOWED = 'transfers_not_allowed';
+    const CODE_UPSTREAM_ORDER_CREATION_FAILED = 'upstream_order_creation_failed';
+    const CODE_URL_INVALID = 'url_invalid';
+
+    /**
+     * Refreshes this object using the provided values.
+     *
+     * @param array $values
+     * @param null|array|string|Util\RequestOptions $opts
+     * @param bool $partial defaults to false
+     */
+    public function refreshFrom($values, $opts, $partial = false)
+    {
+        // Unlike most other API resources, the API will omit attributes in
+        // error objects when they have a null value. We manually set default
+        // values here to facilitate generic error handling.
+        $values = \array_merge([
+            'charge' => null,
+            'code' => null,
+            'decline_code' => null,
+            'doc_url' => null,
+            'message' => null,
+            'param' => null,
+            'payment_intent' => null,
+            'payment_method' => null,
+            'setup_intent' => null,
+            'source' => null,
+            'type' => null,
+        ], $values);
+        parent::refreshFrom($values, $opts, $partial);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Event.php b/htdocs/includes/stripe/stripe-php/lib/Event.php
index f9a004aa6a9..518c5d41344 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Event.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Event.php
@@ -1,167 +1,231 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class Event
+ * Events are our way of letting you know when something interesting happens in
+ * your account. When an interesting event occurs, we create a new
+ * <code>Event</code> object. For example, when a charge succeeds, we create a
+ * <code>charge.succeeded</code> event; and when an invoice payment attempt fails,
+ * we create an <code>invoice.payment_failed</code> event. Note that many API
+ * requests may cause multiple events to be created. For example, if you create a
+ * new subscription for a customer, you will receive both a
+ * <code>customer.subscription.created</code> event and a
+ * <code>charge.succeeded</code> event.
  *
- * @property string $id
- * @property string $object
- * @property string $account
- * @property string $api_version
- * @property int    $created
- * @property mixed  $data
- * @property bool   $livemode
- * @property int    $pending_webhooks
- * @property mixed  $request
- * @property string $type
+ * Events occur when the state of another API resource changes. The state of that
+ * resource at the time of the change is embedded in the event's data field. For
+ * example, a <code>charge.succeeded</code> event will contain a charge, and an
+ * <code>invoice.payment_failed</code> event will contain an invoice.
  *
- * @package Stripe
+ * As with other API resources, you can use endpoints to retrieve an <a
+ * href="https://stripe.com/docs/api#retrieve_event">individual event</a> or a <a
+ * href="https://stripe.com/docs/api#list_events">list of events</a> from the API.
+ * We also have a separate <a
+ * href="http://en.wikipedia.org/wiki/Webhook">webhooks</a> system for sending the
+ * <code>Event</code> objects directly to an endpoint on your server. Webhooks are
+ * managed in your <a href="https://dashboard.stripe.com/account/webhooks">account
+ * settings</a>, and our <a href="https://stripe.com/docs/webhooks">Using
+ * Webhooks</a> guide will help you get set up.
+ *
+ * When using <a href="https://stripe.com/docs/connect">Connect</a>, you can also
+ * receive notifications of events that occur in connected accounts. For these
+ * events, there will be an additional <code>account</code> attribute in the
+ * received <code>Event</code> object.
+ *
+ * <strong>NOTE:</strong> Right now, access to events through the <a
+ * href="https://stripe.com/docs/api#retrieve_event">Retrieve Event API</a> is
+ * guaranteed only for 30 days.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property string $account The connected account that originated the event.
+ * @property null|string $api_version The Stripe API version used to render <code>data</code>. <em>Note: This property is populated only for events on or after October 31, 2014</em>.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property \Stripe\StripeObject $data
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property int $pending_webhooks Number of webhooks that have yet to be successfully delivered (i.e., to return a 20x response) to the URLs you've specified.
+ * @property null|\Stripe\StripeObject $request Information on the API request that instigated the event.
+ * @property string $type Description of the event (e.g., <code>invoice.created</code> or <code>charge.refunded</code>).
  */
 class Event extends ApiResource
 {
-    const OBJECT_NAME = "event";
-
-    /**
-     * Possible string representations of event types.
-     * @link https://stripe.com/docs/api#event_types
-     */
-    const ACCOUNT_UPDATED                           = 'account.updated';
-    const ACCOUNT_APPLICATION_AUTHORIZED            = 'account.application.authorized';
-    const ACCOUNT_APPLICATION_DEAUTHORIZED          = 'account.application.deauthorized';
-    const ACCOUNT_EXTERNAL_ACCOUNT_CREATED          = 'account.external_account.created';
-    const ACCOUNT_EXTERNAL_ACCOUNT_DELETED          = 'account.external_account.deleted';
-    const ACCOUNT_EXTERNAL_ACCOUNT_UPDATED          = 'account.external_account.updated';
-    const APPLICATION_FEE_CREATED                   = 'application_fee.created';
-    const APPLICATION_FEE_REFUNDED                  = 'application_fee.refunded';
-    const APPLICATION_FEE_REFUND_UPDATED            = 'application_fee.refund.updated';
-    const BALANCE_AVAILABLE                         = 'balance.available';
-    const CHARGE_CAPTURED                           = 'charge.captured';
-    const CHARGE_EXPIRED                            = 'charge.expired';
-    const CHARGE_FAILED                             = 'charge.failed';
-    const CHARGE_PENDING                            = 'charge.pending';
-    const CHARGE_REFUNDED                           = 'charge.refunded';
-    const CHARGE_SUCCEEDED                          = 'charge.succeeded';
-    const CHARGE_UPDATED                            = 'charge.updated';
-    const CHARGE_DISPUTE_CLOSED                     = 'charge.dispute.closed';
-    const CHARGE_DISPUTE_CREATED                    = 'charge.dispute.created';
-    const CHARGE_DISPUTE_FUNDS_REINSTATED           = 'charge.dispute.funds_reinstated';
-    const CHARGE_DISPUTE_FUNDS_WITHDRAWN            = 'charge.dispute.funds_withdrawn';
-    const CHARGE_DISPUTE_UPDATED                    = 'charge.dispute.updated';
-    const CHARGE_REFUND_UPDATED                     = 'charge.refund.updated';
-    const CHECKOUT_SESSION_COMPLETED                = 'checkout.session.completed';
-    const COUPON_CREATED                            = 'coupon.created';
-    const COUPON_DELETED                            = 'coupon.deleted';
-    const COUPON_UPDATED                            = 'coupon.updated';
-    const CREDIT_NOTE_CREATED                       = 'credit_note.created';
-    const CREDIT_NOTE_UPDATED                       = 'credit_note.updated';
-    const CREDIT_NOTE_VOIDED                        = 'credit_note.voided';
-    const CUSTOMER_CREATED                          = 'customer.created';
-    const CUSTOMER_DELETED                          = 'customer.deleted';
-    const CUSTOMER_UPDATED                          = 'customer.updated';
-    const CUSTOMER_DISCOUNT_CREATED                 = 'customer.discount.created';
-    const CUSTOMER_DISCOUNT_DELETED                 = 'customer.discount.deleted';
-    const CUSTOMER_DISCOUNT_UPDATED                 = 'customer.discount.updated';
-    const CUSTOMER_SOURCE_CREATED                   = 'customer.source.created';
-    const CUSTOMER_SOURCE_DELETED                   = 'customer.source.deleted';
-    const CUSTOMER_SOURCE_EXPIRING                  = 'customer.source.expiring';
-    const CUSTOMER_SOURCE_UPDATED                   = 'customer.source.updated';
-    const CUSTOMER_SUBSCRIPTION_CREATED             = 'customer.subscription.created';
-    const CUSTOMER_SUBSCRIPTION_DELETED             = 'customer.subscription.deleted';
-    const CUSTOMER_SUBSCRIPTION_TRIAL_WILL_END      = 'customer.subscription.trial_will_end';
-    const CUSTOMER_SUBSCRIPTION_UPDATED             = 'customer.subscription.updated';
-    const FILE_CREATED                              = 'file.created';
-    const INVOICE_CREATED                           = 'invoice.created';
-    const INVOICE_DELETED                           = 'invoice.deleted';
-    const INVOICE_FINALIZED                         = 'invoice.finalized';
-    const INVOICE_MARKED_UNCOLLECTIBLE              = 'invoice.marked_uncollectible';
-    const INVOICE_PAYMENT_ACTION_REQUIRED           = 'invoice.payment_action_required';
-    const INVOICE_PAYMENT_FAILED                    = 'invoice.payment_failed';
-    const INVOICE_PAYMENT_SUCCEEDED                 = 'invoice.payment_succeeded';
-    const INVOICE_SENT                              = 'invoice.sent';
-    const INVOICE_UPCOMING                          = 'invoice.upcoming';
-    const INVOICE_UPDATED                           = 'invoice.updated';
-    const INVOICE_VOIDED                            = 'invoice.voided';
-    const INVOICEITEM_CREATED                       = 'invoiceitem.created';
-    const INVOICEITEM_DELETED                       = 'invoiceitem.deleted';
-    const INVOICEITEM_UPDATED                       = 'invoiceitem.updated';
-    const ISSUER_FRAUD_RECORD_CREATED               = 'issuer_fraud_record.created';
-    const ISSUING_AUTHORIZATION_CREATED             = 'issuing_authorization.created';
-    const ISSUING_AUTHORIZATION_REQUEST             = 'issuing_authorization.request';
-    const ISSUING_AUTHORIZATION_UPDATED             = 'issuing_authorization.updated';
-    const ISSUING_CARD_CREATED                      = 'issuing_card.created';
-    const ISSUING_CARD_UPDATED                      = 'issuing_card.updated';
-    const ISSUING_CARDHOLDER_CREATED                = 'issuing_cardholder.created';
-    const ISSUING_CARDHOLDER_UPDATED                = 'issuing_cardholder.updated';
-    const ISSUING_DISPUTE_CREATED                   = 'issuing_dispute.created';
-    const ISSUING_DISPUTE_UPDATED                   = 'issuing_dispute.updated';
-    const ISSUING_TRANSACTION_CREATED               = 'issuing_transaction.created';
-    const ISSUING_TRANSACTION_UPDATED               = 'issuing_transaction.updated';
-    const ORDER_CREATED                             = 'order.created';
-    const ORDER_PAYMENT_FAILED                      = 'order.payment_failed';
-    const ORDER_PAYMENT_SUCCEEDED                   = 'order.payment_succeeded';
-    const ORDER_UPDATED                             = 'order.updated';
-    const ORDER_RETURN_CREATED                      = 'order_return.created';
-    const PAYMENT_INTENT_AMOUNT_CAPTURABLE_UPDATED  = 'payment_intent.amount_capturable_updated';
-    const PAYMENT_INTENT_CREATED                    = 'payment_intent.created';
-    const PAYMENT_INTENT_PAYMENT_FAILED             = 'payment_intent.payment_failed';
-    const PAYMENT_INTENT_SUCCEEDED                  = 'payment_intent.succeeded';
-    const PAYMENT_METHOD_ATTACHED                   = 'payment_method.attached';
-    const PAYMENT_METHOD_CARD_AUTOMATICALLY_UPDATED = 'payment_method.card_automatically_updated';
-    const PAYMENT_METHOD_DETACHED                   = 'payment_method.detached';
-    const PAYMENT_METHOD_UPDATED                    = 'payment_method.updated';
-    const PAYOUT_CANCELED                           = 'payout.canceled';
-    const PAYOUT_CREATED                            = 'payout.created';
-    const PAYOUT_FAILED                             = 'payout.failed';
-    const PAYOUT_PAID                               = 'payout.paid';
-    const PAYOUT_UPDATED                            = 'payout.updated';
-    const PERSON_CREATED                            = 'person.created';
-    const PERSON_DELETED                            = 'person.deleted';
-    const PERSON_UPDATED                            = 'person.updated';
-    const PING                                      = 'ping';
-    const PLAN_CREATED                              = 'plan.created';
-    const PLAN_DELETED                              = 'plan.deleted';
-    const PLAN_UPDATED                              = 'plan.updated';
-    const PRODUCT_CREATED                           = 'product.created';
-    const PRODUCT_DELETED                           = 'product.deleted';
-    const PRODUCT_UPDATED                           = 'product.updated';
-    const RECIPIENT_CREATED                         = 'recipient.created';
-    const RECIPIENT_DELETED                         = 'recipient.deleted';
-    const RECIPIENT_UPDATED                         = 'recipient.updated';
-    const REPORTING_REPORT_RUN_FAILED               = 'reporting.report_run.failed';
-    const REPORTING_REPORT_RUN_SUCCEEDED            = 'reporting.report_run.succeeded';
-    const REPORTING_REPORT_TYPE_UPDATED             = 'reporting.report_type.updated';
-    const REVIEW_CLOSED                             = 'review.closed';
-    const REVIEW_OPENED                             = 'review.opened';
-    const SIGMA_SCHEDULED_QUERY_RUN_CREATED         = 'sigma.scheduled_query_run.created';
-    const SKU_CREATED                               = 'sku.created';
-    const SKU_DELETED                               = 'sku.deleted';
-    const SKU_UPDATED                               = 'sku.updated';
-    const SOURCE_CANCELED                           = 'source.canceled';
-    const SOURCE_CHARGEABLE                         = 'source.chargeable';
-    const SOURCE_FAILED                             = 'source.failed';
-    const SOURCE_MANDATE_NOTIFICATION               = 'source.mandate_notification';
-    const SOURCE_REFUND_ATTRIBUTES_REQUIRED         = 'source.refund_attributes_required';
-    const SOURCE_TRANSACTION_CREATED                = 'source.transaction.created';
-    const SOURCE_TRANSACTION_UPDATED                = 'source.transaction.updated';
-    const SUBSCRIPTION_SCHEDULE_ABORTED             = 'subscription_schedule.aborted';
-    const SUBSCRIPTION_SCHEDULE_CANCELED            = 'subscription_schedule.canceled';
-    const SUBSCRIPTION_SCHEDULE_COMPLETED           = 'subscription_schedule.completed';
-    const SUBSCRIPTION_SCHEDULE_CREATED             = 'subscription_schedule.created';
-    const SUBSCRIPTION_SCHEDULE_EXPIRING            = 'subscription_schedule.expiring';
-    const SUBSCRIPTION_SCHEDULE_RELEASED            = 'subscription_schedule.released';
-    const SUBSCRIPTION_SCHEDULE_UPDATED             = 'subscription_schedule.updated';
-    const TAX_RATE_CREATED                          = 'tax_rate.created';
-    const TAX_RATE_UPDATED                          = 'tax_rate.updated';
-    const TOPUP_CANCELED                            = 'topup.canceled';
-    const TOPUP_CREATED                             = 'topup.created';
-    const TOPUP_FAILED                              = 'topup.failed';
-    const TOPUP_REVERSED                            = 'topup.reversed';
-    const TOPUP_SUCCEEDED                           = 'topup.succeeded';
-    const TRANSFER_CREATED                          = 'transfer.created';
-    const TRANSFER_REVERSED                         = 'transfer.reversed';
-    const TRANSFER_UPDATED                          = 'transfer.updated';
+    const OBJECT_NAME = 'event';
 
     use ApiOperations\All;
     use ApiOperations\Retrieve;
+
+    /**
+     * Possible string representations of event types.
+     *
+     * @see https://stripe.com/docs/api#event_types
+     */
+    const ACCOUNT_UPDATED = 'account.updated';
+    const ACCOUNT_APPLICATION_AUTHORIZED = 'account.application.authorized';
+    const ACCOUNT_APPLICATION_DEAUTHORIZED = 'account.application.deauthorized';
+    const ACCOUNT_EXTERNAL_ACCOUNT_CREATED = 'account.external_account.created';
+    const ACCOUNT_EXTERNAL_ACCOUNT_DELETED = 'account.external_account.deleted';
+    const ACCOUNT_EXTERNAL_ACCOUNT_UPDATED = 'account.external_account.updated';
+    const APPLICATION_FEE_CREATED = 'application_fee.created';
+    const APPLICATION_FEE_REFUNDED = 'application_fee.refunded';
+    const APPLICATION_FEE_REFUND_UPDATED = 'application_fee.refund.updated';
+    const BALANCE_AVAILABLE = 'balance.available';
+    const CAPABILITY_UPDATED = 'capability.updated';
+    const CHARGE_CAPTURED = 'charge.captured';
+    const CHARGE_EXPIRED = 'charge.expired';
+    const CHARGE_FAILED = 'charge.failed';
+    const CHARGE_PENDING = 'charge.pending';
+    const CHARGE_REFUNDED = 'charge.refunded';
+    const CHARGE_SUCCEEDED = 'charge.succeeded';
+    const CHARGE_UPDATED = 'charge.updated';
+    const CHARGE_DISPUTE_CLOSED = 'charge.dispute.closed';
+    const CHARGE_DISPUTE_CREATED = 'charge.dispute.created';
+    const CHARGE_DISPUTE_FUNDS_REINSTATED = 'charge.dispute.funds_reinstated';
+    const CHARGE_DISPUTE_FUNDS_WITHDRAWN = 'charge.dispute.funds_withdrawn';
+    const CHARGE_DISPUTE_UPDATED = 'charge.dispute.updated';
+    const CHARGE_REFUND_UPDATED = 'charge.refund.updated';
+    const CHECKOUT_SESSION_ASYNC_PAYMENT_FAILED = 'checkout.session.async_payment_failed';
+    const CHECKOUT_SESSION_ASYNC_PAYMENT_SUCCEEDED = 'checkout.session.async_payment_succeeded';
+    const CHECKOUT_SESSION_COMPLETED = 'checkout.session.completed';
+    const COUPON_CREATED = 'coupon.created';
+    const COUPON_DELETED = 'coupon.deleted';
+    const COUPON_UPDATED = 'coupon.updated';
+    const CREDIT_NOTE_CREATED = 'credit_note.created';
+    const CREDIT_NOTE_UPDATED = 'credit_note.updated';
+    const CREDIT_NOTE_VOIDED = 'credit_note.voided';
+    const CUSTOMER_CREATED = 'customer.created';
+    const CUSTOMER_DELETED = 'customer.deleted';
+    const CUSTOMER_UPDATED = 'customer.updated';
+    const CUSTOMER_DISCOUNT_CREATED = 'customer.discount.created';
+    const CUSTOMER_DISCOUNT_DELETED = 'customer.discount.deleted';
+    const CUSTOMER_DISCOUNT_UPDATED = 'customer.discount.updated';
+    const CUSTOMER_SOURCE_CREATED = 'customer.source.created';
+    const CUSTOMER_SOURCE_DELETED = 'customer.source.deleted';
+    const CUSTOMER_SOURCE_EXPIRING = 'customer.source.expiring';
+    const CUSTOMER_SOURCE_UPDATED = 'customer.source.updated';
+    const CUSTOMER_SUBSCRIPTION_CREATED = 'customer.subscription.created';
+    const CUSTOMER_SUBSCRIPTION_DELETED = 'customer.subscription.deleted';
+    const CUSTOMER_SUBSCRIPTION_PENDING_UPDATE_APPLIED = 'customer.subscription.pending_update_applied';
+    const CUSTOMER_SUBSCRIPTION_PENDING_UPDATE_EXPIRED = 'customer.subscription.pending_update_expired';
+    const CUSTOMER_SUBSCRIPTION_TRIAL_WILL_END = 'customer.subscription.trial_will_end';
+    const CUSTOMER_SUBSCRIPTION_UPDATED = 'customer.subscription.updated';
+    const CUSTOMER_TAX_ID_CREATED = 'customer.tax_id.created';
+    const CUSTOMER_TAX_ID_DELETED = 'customer.tax_id.deleted';
+    const CUSTOMER_TAX_ID_UPDATED = 'customer.tax_id.updated';
+    const FILE_CREATED = 'file.created';
+    const INVOICE_CREATED = 'invoice.created';
+    const INVOICE_DELETED = 'invoice.deleted';
+    const INVOICE_FINALIZATION_FAILED = 'invoice.finalization_failed';
+    const INVOICE_FINALIZED = 'invoice.finalized';
+    const INVOICE_MARKED_UNCOLLECTIBLE = 'invoice.marked_uncollectible';
+    const INVOICE_PAID = 'invoice.paid';
+    const INVOICE_PAYMENT_ACTION_REQUIRED = 'invoice.payment_action_required';
+    const INVOICE_PAYMENT_FAILED = 'invoice.payment_failed';
+    const INVOICE_PAYMENT_SUCCEEDED = 'invoice.payment_succeeded';
+    const INVOICE_SENT = 'invoice.sent';
+    const INVOICE_UPCOMING = 'invoice.upcoming';
+    const INVOICE_UPDATED = 'invoice.updated';
+    const INVOICE_VOIDED = 'invoice.voided';
+    const INVOICEITEM_CREATED = 'invoiceitem.created';
+    const INVOICEITEM_DELETED = 'invoiceitem.deleted';
+    const INVOICEITEM_UPDATED = 'invoiceitem.updated';
+    const ISSUER_FRAUD_RECORD_CREATED = 'issuer_fraud_record.created';
+    const ISSUING_AUTHORIZATION_CREATED = 'issuing_authorization.created';
+    const ISSUING_AUTHORIZATION_REQUEST = 'issuing_authorization.request';
+    const ISSUING_AUTHORIZATION_UPDATED = 'issuing_authorization.updated';
+    const ISSUING_CARD_CREATED = 'issuing_card.created';
+    const ISSUING_CARD_UPDATED = 'issuing_card.updated';
+    const ISSUING_CARDHOLDER_CREATED = 'issuing_cardholder.created';
+    const ISSUING_CARDHOLDER_UPDATED = 'issuing_cardholder.updated';
+    const ISSUING_DISPUTE_CLOSED = 'issuing_dispute.closed';
+    const ISSUING_DISPUTE_CREATED = 'issuing_dispute.created';
+    const ISSUING_DISPUTE_FUNDS_REINSTATED = 'issuing_dispute.funds_reinstated';
+    const ISSUING_DISPUTE_SUBMITTED = 'issuing_dispute.submitted';
+    const ISSUING_DISPUTE_UPDATED = 'issuing_dispute.updated';
+    const ISSUING_TRANSACTION_CREATED = 'issuing_transaction.created';
+    const ISSUING_TRANSACTION_UPDATED = 'issuing_transaction.updated';
+    const MANDATE_UPDATED = 'mandate.updated';
+    const ORDER_CREATED = 'order.created';
+    const ORDER_PAYMENT_FAILED = 'order.payment_failed';
+    const ORDER_PAYMENT_SUCCEEDED = 'order.payment_succeeded';
+    const ORDER_UPDATED = 'order.updated';
+    const ORDER_RETURN_CREATED = 'order_return.created';
+    const PAYMENT_INTENT_AMOUNT_CAPTURABLE_UPDATED = 'payment_intent.amount_capturable_updated';
+    const PAYMENT_INTENT_CANCELED = 'payment_intent.canceled';
+    const PAYMENT_INTENT_CREATED = 'payment_intent.created';
+    const PAYMENT_INTENT_PAYMENT_FAILED = 'payment_intent.payment_failed';
+    const PAYMENT_INTENT_PROCESSING = 'payment_intent.processing';
+    const PAYMENT_INTENT_REQUIRES_ACTION = 'payment_intent.requires_action';
+    const PAYMENT_INTENT_SUCCEEDED = 'payment_intent.succeeded';
+    const PAYMENT_METHOD_ATTACHED = 'payment_method.attached';
+    const PAYMENT_METHOD_AUTOMATICALLY_UPDATED = 'payment_method.automatically_updated';
+    const PAYMENT_METHOD_CARD_AUTOMATICALLY_UPDATED = 'payment_method.card_automatically_updated';
+    const PAYMENT_METHOD_DETACHED = 'payment_method.detached';
+    const PAYMENT_METHOD_UPDATED = 'payment_method.updated';
+    const PAYOUT_CANCELED = 'payout.canceled';
+    const PAYOUT_CREATED = 'payout.created';
+    const PAYOUT_FAILED = 'payout.failed';
+    const PAYOUT_PAID = 'payout.paid';
+    const PAYOUT_UPDATED = 'payout.updated';
+    const PERSON_CREATED = 'person.created';
+    const PERSON_DELETED = 'person.deleted';
+    const PERSON_UPDATED = 'person.updated';
+    const PING = 'ping';
+    const PLAN_CREATED = 'plan.created';
+    const PLAN_DELETED = 'plan.deleted';
+    const PLAN_UPDATED = 'plan.updated';
+    const PRICE_CREATED = 'price.created';
+    const PRICE_DELETED = 'price.deleted';
+    const PRICE_UPDATED = 'price.updated';
+    const PRODUCT_CREATED = 'product.created';
+    const PRODUCT_DELETED = 'product.deleted';
+    const PRODUCT_UPDATED = 'product.updated';
+    const PROMOTION_CODE_CREATED = 'promotion_code.created';
+    const PROMOTION_CODE_DELETED = 'promotion_code.deleted';
+    const PROMOTION_CODE_UPDATED = 'promotion_code.updated';
+    const RADAR_EARLY_FRAUD_WARNING_CREATED = 'radar.early_fraud_warning.created';
+    const RADAR_EARLY_FRAUD_WARNING_UPDATED = 'radar.early_fraud_warning.updated';
+    const RECIPIENT_CREATED = 'recipient.created';
+    const RECIPIENT_DELETED = 'recipient.deleted';
+    const RECIPIENT_UPDATED = 'recipient.updated';
+    const REPORTING_REPORT_RUN_FAILED = 'reporting.report_run.failed';
+    const REPORTING_REPORT_RUN_SUCCEEDED = 'reporting.report_run.succeeded';
+    const REPORTING_REPORT_TYPE_UPDATED = 'reporting.report_type.updated';
+    const REVIEW_CLOSED = 'review.closed';
+    const REVIEW_OPENED = 'review.opened';
+    const SETUP_INTENT_CANCELED = 'setup_intent.canceled';
+    const SETUP_INTENT_CREATED = 'setup_intent.created';
+    const SETUP_INTENT_REQUIRES_ACTION = 'setup_intent.requires_action';
+    const SETUP_INTENT_SETUP_FAILED = 'setup_intent.setup_failed';
+    const SETUP_INTENT_SUCCEEDED = 'setup_intent.succeeded';
+    const SIGMA_SCHEDULED_QUERY_RUN_CREATED = 'sigma.scheduled_query_run.created';
+    const SKU_CREATED = 'sku.created';
+    const SKU_DELETED = 'sku.deleted';
+    const SKU_UPDATED = 'sku.updated';
+    const SOURCE_CANCELED = 'source.canceled';
+    const SOURCE_CHARGEABLE = 'source.chargeable';
+    const SOURCE_FAILED = 'source.failed';
+    const SOURCE_MANDATE_NOTIFICATION = 'source.mandate_notification';
+    const SOURCE_REFUND_ATTRIBUTES_REQUIRED = 'source.refund_attributes_required';
+    const SOURCE_TRANSACTION_CREATED = 'source.transaction.created';
+    const SOURCE_TRANSACTION_UPDATED = 'source.transaction.updated';
+    const SUBSCRIPTION_SCHEDULE_ABORTED = 'subscription_schedule.aborted';
+    const SUBSCRIPTION_SCHEDULE_CANCELED = 'subscription_schedule.canceled';
+    const SUBSCRIPTION_SCHEDULE_COMPLETED = 'subscription_schedule.completed';
+    const SUBSCRIPTION_SCHEDULE_CREATED = 'subscription_schedule.created';
+    const SUBSCRIPTION_SCHEDULE_EXPIRING = 'subscription_schedule.expiring';
+    const SUBSCRIPTION_SCHEDULE_RELEASED = 'subscription_schedule.released';
+    const SUBSCRIPTION_SCHEDULE_UPDATED = 'subscription_schedule.updated';
+    const TAX_RATE_CREATED = 'tax_rate.created';
+    const TAX_RATE_UPDATED = 'tax_rate.updated';
+    const TOPUP_CANCELED = 'topup.canceled';
+    const TOPUP_CREATED = 'topup.created';
+    const TOPUP_FAILED = 'topup.failed';
+    const TOPUP_REVERSED = 'topup.reversed';
+    const TOPUP_SUCCEEDED = 'topup.succeeded';
+    const TRANSFER_CREATED = 'transfer.created';
+    const TRANSFER_REVERSED = 'transfer.reversed';
+    const TRANSFER_UPDATED = 'transfer.updated';
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Exception/ApiConnectionException.php b/htdocs/includes/stripe/stripe-php/lib/Exception/ApiConnectionException.php
new file mode 100644
index 00000000000..33f2ede9efc
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Exception/ApiConnectionException.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Stripe\Exception;
+
+/**
+ * ApiConnection is thrown in the event that the SDK can't connect to Stripe's
+ * servers. That can be for a variety of different reasons from a downed
+ * network to a bad TLS certificate.
+ */
+class ApiConnectionException extends ApiErrorException
+{
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Exception/ApiErrorException.php b/htdocs/includes/stripe/stripe-php/lib/Exception/ApiErrorException.php
new file mode 100644
index 00000000000..995a42e69b7
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Exception/ApiErrorException.php
@@ -0,0 +1,219 @@
+<?php
+
+namespace Stripe\Exception;
+
+/**
+ * Implements properties and methods common to all (non-SPL) Stripe exceptions.
+ */
+abstract class ApiErrorException extends \Exception implements ExceptionInterface
+{
+    protected $error;
+    protected $httpBody;
+    protected $httpHeaders;
+    protected $httpStatus;
+    protected $jsonBody;
+    protected $requestId;
+    protected $stripeCode;
+
+    /**
+     * Creates a new API error exception.
+     *
+     * @param string $message the exception message
+     * @param null|int $httpStatus the HTTP status code
+     * @param null|string $httpBody the HTTP body as a string
+     * @param null|array $jsonBody the JSON deserialized body
+     * @param null|array|\Stripe\Util\CaseInsensitiveArray $httpHeaders the HTTP headers array
+     * @param null|string $stripeCode the Stripe error code
+     *
+     * @return static
+     */
+    public static function factory(
+        $message,
+        $httpStatus = null,
+        $httpBody = null,
+        $jsonBody = null,
+        $httpHeaders = null,
+        $stripeCode = null
+    ) {
+        $instance = new static($message);
+        $instance->setHttpStatus($httpStatus);
+        $instance->setHttpBody($httpBody);
+        $instance->setJsonBody($jsonBody);
+        $instance->setHttpHeaders($httpHeaders);
+        $instance->setStripeCode($stripeCode);
+
+        $instance->setRequestId(null);
+        if ($httpHeaders && isset($httpHeaders['Request-Id'])) {
+            $instance->setRequestId($httpHeaders['Request-Id']);
+        }
+
+        $instance->setError($instance->constructErrorObject());
+
+        return $instance;
+    }
+
+    /**
+     * Gets the Stripe error object.
+     *
+     * @return null|\Stripe\ErrorObject
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    /**
+     * Sets the Stripe error object.
+     *
+     * @param null|\Stripe\ErrorObject $error
+     */
+    public function setError($error)
+    {
+        $this->error = $error;
+    }
+
+    /**
+     * Gets the HTTP body as a string.
+     *
+     * @return null|string
+     */
+    public function getHttpBody()
+    {
+        return $this->httpBody;
+    }
+
+    /**
+     * Sets the HTTP body as a string.
+     *
+     * @param null|string $httpBody
+     */
+    public function setHttpBody($httpBody)
+    {
+        $this->httpBody = $httpBody;
+    }
+
+    /**
+     * Gets the HTTP headers array.
+     *
+     * @return null|array|\Stripe\Util\CaseInsensitiveArray
+     */
+    public function getHttpHeaders()
+    {
+        return $this->httpHeaders;
+    }
+
+    /**
+     * Sets the HTTP headers array.
+     *
+     * @param null|array|\Stripe\Util\CaseInsensitiveArray $httpHeaders
+     */
+    public function setHttpHeaders($httpHeaders)
+    {
+        $this->httpHeaders = $httpHeaders;
+    }
+
+    /**
+     * Gets the HTTP status code.
+     *
+     * @return null|int
+     */
+    public function getHttpStatus()
+    {
+        return $this->httpStatus;
+    }
+
+    /**
+     * Sets the HTTP status code.
+     *
+     * @param null|int $httpStatus
+     */
+    public function setHttpStatus($httpStatus)
+    {
+        $this->httpStatus = $httpStatus;
+    }
+
+    /**
+     * Gets the JSON deserialized body.
+     *
+     * @return null|array<string, mixed>
+     */
+    public function getJsonBody()
+    {
+        return $this->jsonBody;
+    }
+
+    /**
+     * Sets the JSON deserialized body.
+     *
+     * @param null|array<string, mixed> $jsonBody
+     */
+    public function setJsonBody($jsonBody)
+    {
+        $this->jsonBody = $jsonBody;
+    }
+
+    /**
+     * Gets the Stripe request ID.
+     *
+     * @return null|string
+     */
+    public function getRequestId()
+    {
+        return $this->requestId;
+    }
+
+    /**
+     * Sets the Stripe request ID.
+     *
+     * @param null|string $requestId
+     */
+    public function setRequestId($requestId)
+    {
+        $this->requestId = $requestId;
+    }
+
+    /**
+     * Gets the Stripe error code.
+     *
+     * Cf. the `CODE_*` constants on {@see \Stripe\ErrorObject} for possible
+     * values.
+     *
+     * @return null|string
+     */
+    public function getStripeCode()
+    {
+        return $this->stripeCode;
+    }
+
+    /**
+     * Sets the Stripe error code.
+     *
+     * @param null|string $stripeCode
+     */
+    public function setStripeCode($stripeCode)
+    {
+        $this->stripeCode = $stripeCode;
+    }
+
+    /**
+     * Returns the string representation of the exception.
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        $statusStr = (null === $this->getHttpStatus()) ? '' : "(Status {$this->getHttpStatus()}) ";
+        $idStr = (null === $this->getRequestId()) ? '' : "(Request {$this->getRequestId()}) ";
+
+        return "{$statusStr}{$idStr}{$this->getMessage()}";
+    }
+
+    protected function constructErrorObject()
+    {
+        if (null === $this->jsonBody || !\array_key_exists('error', $this->jsonBody)) {
+            return null;
+        }
+
+        return \Stripe\ErrorObject::constructFrom($this->jsonBody['error']);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Exception/AuthenticationException.php b/htdocs/includes/stripe/stripe-php/lib/Exception/AuthenticationException.php
new file mode 100644
index 00000000000..9e5c718b117
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Exception/AuthenticationException.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Stripe\Exception;
+
+/**
+ * AuthenticationException is thrown when invalid credentials are used to
+ * connect to Stripe's servers.
+ */
+class AuthenticationException extends ApiErrorException
+{
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Exception/BadMethodCallException.php b/htdocs/includes/stripe/stripe-php/lib/Exception/BadMethodCallException.php
new file mode 100644
index 00000000000..96bdf66952e
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Exception/BadMethodCallException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Stripe\Exception;
+
+class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
+{
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Exception/CardException.php b/htdocs/includes/stripe/stripe-php/lib/Exception/CardException.php
new file mode 100644
index 00000000000..43df9c7b028
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Exception/CardException.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace Stripe\Exception;
+
+/**
+ * CardException is thrown when a user enters a card that can't be charged for
+ * some reason.
+ */
+class CardException extends ApiErrorException
+{
+    protected $declineCode;
+    protected $stripeParam;
+
+    /**
+     * Creates a new CardException exception.
+     *
+     * @param string $message the exception message
+     * @param null|int $httpStatus the HTTP status code
+     * @param null|string $httpBody the HTTP body as a string
+     * @param null|array $jsonBody the JSON deserialized body
+     * @param null|array|\Stripe\Util\CaseInsensitiveArray $httpHeaders the HTTP headers array
+     * @param null|string $stripeCode the Stripe error code
+     * @param null|string $declineCode the decline code
+     * @param null|string $stripeParam the parameter related to the error
+     *
+     * @return CardException
+     */
+    public static function factory(
+        $message,
+        $httpStatus = null,
+        $httpBody = null,
+        $jsonBody = null,
+        $httpHeaders = null,
+        $stripeCode = null,
+        $declineCode = null,
+        $stripeParam = null
+    ) {
+        $instance = parent::factory($message, $httpStatus, $httpBody, $jsonBody, $httpHeaders, $stripeCode);
+        $instance->setDeclineCode($declineCode);
+        $instance->setStripeParam($stripeParam);
+
+        return $instance;
+    }
+
+    /**
+     * Gets the decline code.
+     *
+     * @return null|string
+     */
+    public function getDeclineCode()
+    {
+        return $this->declineCode;
+    }
+
+    /**
+     * Sets the decline code.
+     *
+     * @param null|string $declineCode
+     */
+    public function setDeclineCode($declineCode)
+    {
+        $this->declineCode = $declineCode;
+    }
+
+    /**
+     * Gets the parameter related to the error.
+     *
+     * @return null|string
+     */
+    public function getStripeParam()
+    {
+        return $this->stripeParam;
+    }
+
+    /**
+     * Sets the parameter related to the error.
+     *
+     * @param null|string $stripeParam
+     */
+    public function setStripeParam($stripeParam)
+    {
+        $this->stripeParam = $stripeParam;
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Exception/ExceptionInterface.php b/htdocs/includes/stripe/stripe-php/lib/Exception/ExceptionInterface.php
new file mode 100644
index 00000000000..c84f37de7fd
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Exception/ExceptionInterface.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Stripe\Exception;
+
+// TODO: remove this check once we drop support for PHP 5
+if (\interface_exists(\Throwable::class, false)) {
+    /**
+     * The base interface for all Stripe exceptions.
+     */
+    interface ExceptionInterface extends \Throwable
+    {
+    }
+} else {
+    /**
+     * The base interface for all Stripe exceptions.
+     */
+    // phpcs:disable PSR1.Classes.ClassDeclaration.MultipleClasses
+    interface ExceptionInterface
+    {
+    }
+    // phpcs:enable
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Exception/IdempotencyException.php b/htdocs/includes/stripe/stripe-php/lib/Exception/IdempotencyException.php
new file mode 100644
index 00000000000..09dbf07f768
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Exception/IdempotencyException.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Stripe\Exception;
+
+/**
+ * IdempotencyException is thrown in cases where an idempotency key was used
+ * improperly.
+ */
+class IdempotencyException extends ApiErrorException
+{
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Exception/InvalidArgumentException.php b/htdocs/includes/stripe/stripe-php/lib/Exception/InvalidArgumentException.php
new file mode 100644
index 00000000000..7aa3ca3d7ad
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Exception/InvalidArgumentException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Stripe\Exception;
+
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Exception/InvalidRequestException.php b/htdocs/includes/stripe/stripe-php/lib/Exception/InvalidRequestException.php
new file mode 100644
index 00000000000..ed4f8d0d498
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Exception/InvalidRequestException.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Stripe\Exception;
+
+/**
+ * InvalidRequestException is thrown when a request is initiated with invalid
+ * parameters.
+ */
+class InvalidRequestException extends ApiErrorException
+{
+    protected $stripeParam;
+
+    /**
+     * Creates a new InvalidRequestException exception.
+     *
+     * @param string $message the exception message
+     * @param null|int $httpStatus the HTTP status code
+     * @param null|string $httpBody the HTTP body as a string
+     * @param null|array $jsonBody the JSON deserialized body
+     * @param null|array|\Stripe\Util\CaseInsensitiveArray $httpHeaders the HTTP headers array
+     * @param null|string $stripeCode the Stripe error code
+     * @param null|string $stripeParam the parameter related to the error
+     *
+     * @return InvalidRequestException
+     */
+    public static function factory(
+        $message,
+        $httpStatus = null,
+        $httpBody = null,
+        $jsonBody = null,
+        $httpHeaders = null,
+        $stripeCode = null,
+        $stripeParam = null
+    ) {
+        $instance = parent::factory($message, $httpStatus, $httpBody, $jsonBody, $httpHeaders, $stripeCode);
+        $instance->setStripeParam($stripeParam);
+
+        return $instance;
+    }
+
+    /**
+     * Gets the parameter related to the error.
+     *
+     * @return null|string
+     */
+    public function getStripeParam()
+    {
+        return $this->stripeParam;
+    }
+
+    /**
+     * Sets the parameter related to the error.
+     *
+     * @param null|string $stripeParam
+     */
+    public function setStripeParam($stripeParam)
+    {
+        $this->stripeParam = $stripeParam;
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/ExceptionInterface.php b/htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/ExceptionInterface.php
new file mode 100644
index 00000000000..dd42662018c
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/ExceptionInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Stripe\Exception\OAuth;
+
+/**
+ * The base interface for all Stripe OAuth exceptions.
+ */
+interface ExceptionInterface extends \Stripe\Exception\ExceptionInterface
+{
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/InvalidClientException.php b/htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/InvalidClientException.php
new file mode 100644
index 00000000000..13934519773
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/InvalidClientException.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Stripe\Exception\OAuth;
+
+/**
+ * InvalidClientException is thrown when the client_id does not belong to you,
+ * the stripe_user_id does not exist or is not connected to your application,
+ * or the API key mode (live or test mode) does not match the client_id mode.
+ */
+class InvalidClientException extends OAuthErrorException
+{
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/InvalidGrantException.php b/htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/InvalidGrantException.php
new file mode 100644
index 00000000000..898b3a77618
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/InvalidGrantException.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Stripe\Exception\OAuth;
+
+/**
+ * InvalidGrantException is thrown when a specified code doesn't exist, is
+ * expired, has been used, or doesn't belong to you; a refresh token doesn't
+ * exist, or doesn't belong to you; or if an API key's mode (live or test)
+ * doesn't match the mode of a code or refresh token.
+ */
+class InvalidGrantException extends OAuthErrorException
+{
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/InvalidRequestException.php b/htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/InvalidRequestException.php
new file mode 100644
index 00000000000..59dac7c0f40
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/InvalidRequestException.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Stripe\Exception\OAuth;
+
+/**
+ * InvalidRequestException is thrown when a code, refresh token, or grant
+ * type parameter is not provided, but was required.
+ */
+class InvalidRequestException extends OAuthErrorException
+{
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/InvalidScopeException.php b/htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/InvalidScopeException.php
new file mode 100644
index 00000000000..091729d933c
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/InvalidScopeException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Stripe\Exception\OAuth;
+
+/**
+ * InvalidScopeException is thrown when an invalid scope parameter is provided.
+ */
+class InvalidScopeException extends OAuthErrorException
+{
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/OAuthErrorException.php b/htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/OAuthErrorException.php
new file mode 100644
index 00000000000..bded3c8893b
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/OAuthErrorException.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Stripe\Exception\OAuth;
+
+/**
+ * Implements properties and methods common to all (non-SPL) Stripe OAuth
+ * exceptions.
+ */
+abstract class OAuthErrorException extends \Stripe\Exception\ApiErrorException
+{
+    protected function constructErrorObject()
+    {
+        if (null === $this->jsonBody) {
+            return null;
+        }
+
+        return \Stripe\OAuthErrorObject::constructFrom($this->jsonBody);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/UnknownOAuthErrorException.php b/htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/UnknownOAuthErrorException.php
new file mode 100644
index 00000000000..c8dba29bf0b
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/UnknownOAuthErrorException.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Stripe\Exception\OAuth;
+
+/**
+ * UnknownApiErrorException is thrown when the client library receives an
+ * error from the OAuth API it doesn't know about. Receiving this error usually
+ * means that your client library is outdated and should be upgraded.
+ */
+class UnknownOAuthErrorException extends OAuthErrorException
+{
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/UnsupportedGrantTypeException.php b/htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/UnsupportedGrantTypeException.php
new file mode 100644
index 00000000000..418635d44c8
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/UnsupportedGrantTypeException.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Stripe\Exception\OAuth;
+
+/**
+ * UnsupportedGrantTypeException is thrown when an unuspported grant type
+ * parameter is specified.
+ */
+class UnsupportedGrantTypeException extends OAuthErrorException
+{
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/UnsupportedResponseTypeException.php b/htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/UnsupportedResponseTypeException.php
new file mode 100644
index 00000000000..26742a8067d
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Exception/OAuth/UnsupportedResponseTypeException.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Stripe\Exception\OAuth;
+
+/**
+ * UnsupportedResponseTypeException is thrown when an unsupported response type
+ * parameter is specified.
+ */
+class UnsupportedResponseTypeException extends OAuthErrorException
+{
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Exception/PermissionException.php b/htdocs/includes/stripe/stripe-php/lib/Exception/PermissionException.php
new file mode 100644
index 00000000000..5cf5154bf55
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Exception/PermissionException.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Stripe\Exception;
+
+/**
+ * PermissionException is thrown in cases where access was attempted on a
+ * resource that wasn't allowed.
+ */
+class PermissionException extends ApiErrorException
+{
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Exception/RateLimitException.php b/htdocs/includes/stripe/stripe-php/lib/Exception/RateLimitException.php
new file mode 100644
index 00000000000..f28f450fdb8
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Exception/RateLimitException.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Stripe\Exception;
+
+/**
+ * RateLimitException is thrown in cases where an account is putting too much
+ * load on Stripe's API servers (usually by performing too many requests).
+ * Please back off on request rate.
+ */
+class RateLimitException extends InvalidRequestException
+{
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Exception/SignatureVerificationException.php b/htdocs/includes/stripe/stripe-php/lib/Exception/SignatureVerificationException.php
new file mode 100644
index 00000000000..b08534a8fff
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Exception/SignatureVerificationException.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace Stripe\Exception;
+
+/**
+ * SignatureVerificationException is thrown when the signature verification for
+ * a webhook fails.
+ */
+class SignatureVerificationException extends \Exception implements ExceptionInterface
+{
+    protected $httpBody;
+    protected $sigHeader;
+
+    /**
+     * Creates a new SignatureVerificationException exception.
+     *
+     * @param string $message the exception message
+     * @param null|string $httpBody the HTTP body as a string
+     * @param null|string $sigHeader the `Stripe-Signature` HTTP header
+     *
+     * @return SignatureVerificationException
+     */
+    public static function factory(
+        $message,
+        $httpBody = null,
+        $sigHeader = null
+    ) {
+        $instance = new static($message);
+        $instance->setHttpBody($httpBody);
+        $instance->setSigHeader($sigHeader);
+
+        return $instance;
+    }
+
+    /**
+     * Gets the HTTP body as a string.
+     *
+     * @return null|string
+     */
+    public function getHttpBody()
+    {
+        return $this->httpBody;
+    }
+
+    /**
+     * Sets the HTTP body as a string.
+     *
+     * @param null|string $httpBody
+     */
+    public function setHttpBody($httpBody)
+    {
+        $this->httpBody = $httpBody;
+    }
+
+    /**
+     * Gets the `Stripe-Signature` HTTP header.
+     *
+     * @return null|string
+     */
+    public function getSigHeader()
+    {
+        return $this->sigHeader;
+    }
+
+    /**
+     * Sets the `Stripe-Signature` HTTP header.
+     *
+     * @param null|string $sigHeader
+     */
+    public function setSigHeader($sigHeader)
+    {
+        $this->sigHeader = $sigHeader;
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Exception/UnexpectedValueException.php b/htdocs/includes/stripe/stripe-php/lib/Exception/UnexpectedValueException.php
new file mode 100644
index 00000000000..0a629edf74d
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Exception/UnexpectedValueException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Stripe\Exception;
+
+class UnexpectedValueException extends \UnexpectedValueException implements ExceptionInterface
+{
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Exception/UnknownApiErrorException.php b/htdocs/includes/stripe/stripe-php/lib/Exception/UnknownApiErrorException.php
new file mode 100644
index 00000000000..7873bf8b64a
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Exception/UnknownApiErrorException.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Stripe\Exception;
+
+/**
+ * UnknownApiErrorException is thrown when the client library receives an
+ * error from the API it doesn't know about. Receiving this error usually
+ * means that your client library is outdated and should be upgraded.
+ */
+class UnknownApiErrorException extends ApiErrorException
+{
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/ExchangeRate.php b/htdocs/includes/stripe/stripe-php/lib/ExchangeRate.php
index 6a7e7a36a38..382253c1bee 100644
--- a/htdocs/includes/stripe/stripe-php/lib/ExchangeRate.php
+++ b/htdocs/includes/stripe/stripe-php/lib/ExchangeRate.php
@@ -1,15 +1,29 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class ExchangeRate
+ * <code>Exchange Rate</code> objects allow you to determine the rates that Stripe
+ * is currently using to convert from one currency to another. Since this number is
+ * variable throughout the day, there are various reasons why you might want to
+ * know the current rate (for example, to dynamically price an item for a user with
+ * a default payment in a foreign currency).
  *
- * @package Stripe
+ * If you want a guarantee that the charge is made with a certain exchange rate you
+ * expect is current, you can pass in <code>exchange_rate</code> to charges
+ * endpoints. If the value is no longer up to date, the charge won't go through.
+ * Please refer to our <a href="https://stripe.com/docs/exchange-rates">Exchange
+ * Rates API</a> guide for more details.
+ *
+ * @property string $id Unique identifier for the object. Represented as the three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a> in lowercase.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property \Stripe\StripeObject $rates Hash where the keys are supported currencies and the values are the exchange rate at which the base id currency converts to the key currency.
  */
 class ExchangeRate extends ApiResource
 {
-    const OBJECT_NAME = "exchange_rate";
+    const OBJECT_NAME = 'exchange_rate';
 
     use ApiOperations\All;
     use ApiOperations\Retrieve;
diff --git a/htdocs/includes/stripe/stripe-php/lib/File.php b/htdocs/includes/stripe/stripe-php/lib/File.php
index 76109ad38cf..d73bed84218 100644
--- a/htdocs/includes/stripe/stripe-php/lib/File.php
+++ b/htdocs/includes/stripe/stripe-php/lib/File.php
@@ -1,37 +1,57 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class File
+ * This is an object representing a file hosted on Stripe's servers. The file may
+ * have been uploaded by yourself using the <a
+ * href="https://stripe.com/docs/api#create_file">create file</a> request (for
+ * example, when uploading dispute evidence) or it may have been created by Stripe
+ * (for example, the results of a <a href="#scheduled_queries">Sigma scheduled
+ * query</a>).
  *
- * @property string $id
- * @property string $object
- * @property int $created
- * @property string $filename
- * @property Collection $links
- * @property string $purpose
- * @property int $size
- * @property string $title
- * @property string $type
- * @property string $url
+ * Related guide: <a href="https://stripe.com/docs/file-upload">File Upload
+ * Guide</a>.
  *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|int $expires_at The time at which the file expires and is no longer available in epoch seconds.
+ * @property null|string $filename A filename for the file, suitable for saving to a filesystem.
+ * @property null|\Stripe\Collection $links A list of <a href="https://stripe.com/docs/api#file_links">file links</a> that point at this file.
+ * @property string $purpose The <a href="https://stripe.com/docs/file-upload#uploading-a-file">purpose</a> of the uploaded file.
+ * @property int $size The size in bytes of the file object.
+ * @property null|string $title A user friendly title for the document.
+ * @property null|string $type The type of the file returned (e.g., <code>csv</code>, <code>pdf</code>, <code>jpg</code>, or <code>png</code>).
+ * @property null|string $url The URL from which the file can be downloaded using your live secret API key.
  */
 class File extends ApiResource
 {
+    const OBJECT_NAME = 'file';
+
+    use ApiOperations\All;
+    use ApiOperations\Retrieve;
+
+    const PURPOSE_ADDITIONAL_VERIFICATION = 'additional_verification';
+    const PURPOSE_BUSINESS_ICON = 'business_icon';
+    const PURPOSE_BUSINESS_LOGO = 'business_logo';
+    const PURPOSE_CUSTOMER_SIGNATURE = 'customer_signature';
+    const PURPOSE_DISPUTE_EVIDENCE = 'dispute_evidence';
+    const PURPOSE_IDENTITY_DOCUMENT = 'identity_document';
+    const PURPOSE_PCI_DOCUMENT = 'pci_document';
+    const PURPOSE_TAX_DOCUMENT_USER_UPLOAD = 'tax_document_user_upload';
+
     // This resource can have two different object names. In latter API
     // versions, only `file` is used, but since stripe-php may be used with
     // any API version, we need to support deserializing the older
     // `file_upload` object into the same class.
-    const OBJECT_NAME = "file";
-    const OBJECT_NAME_ALT = "file_upload";
+    const OBJECT_NAME_ALT = 'file_upload';
 
-    use ApiOperations\All;
     use ApiOperations\Create {
         create as protected _create;
     }
-    use ApiOperations\Retrieve;
 
     public static function classUrl()
     {
@@ -39,24 +59,23 @@ class File extends ApiResource
     }
 
     /**
-     * @param array|null $params
-     * @param array|string|null $options
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return \Stripe\File The created resource.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\File the created file
      */
-    public static function create($params = null, $options = null)
+    public static function create($params = null, $opts = null)
     {
-        $opts = \Stripe\Util\RequestOptions::parse($options);
-        if (is_null($opts->apiBase)) {
+        $opts = \Stripe\Util\RequestOptions::parse($opts);
+        if (null === $opts->apiBase) {
             $opts->apiBase = Stripe::$apiUploadBase;
         }
         // Manually flatten params, otherwise curl's multipart encoder will
         // choke on nested arrays.
-        // TODO: use array_column() once we drop support for PHP 5.4
-        $flatParams = [];
-        foreach (\Stripe\Util\Util::flattenParams($params) as $pair) {
-            $flatParams[$pair[0]] = $pair[1];
-        }
+        $flatParams = \array_column(\Stripe\Util\Util::flattenParams($params), 1, 0);
+
         return static::_create($flatParams, $opts);
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/FileLink.php b/htdocs/includes/stripe/stripe-php/lib/FileLink.php
index 385971f7d82..ce3b10bde67 100644
--- a/htdocs/includes/stripe/stripe-php/lib/FileLink.php
+++ b/htdocs/includes/stripe/stripe-php/lib/FileLink.php
@@ -1,25 +1,27 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class FileLink
+ * To share the contents of a <code>File</code> object with non-Stripe users, you
+ * can create a <code>FileLink</code>. <code>FileLink</code>s contain a URL that
+ * can be used to retrieve the contents of the file without authentication.
  *
- * @property string $id
- * @property string $object
- * @property int $created
- * @property bool $expired
- * @property int $expires_at
- * @property string $file
- * @property bool $livemode
- * @property StripeObject $metadata
- * @property string $url
- *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property bool $expired Whether this link is already expired.
+ * @property null|int $expires_at Time at which the link expires.
+ * @property string|\Stripe\File $file The file object this link points to.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string $url The publicly accessible URL to download the file.
  */
 class FileLink extends ApiResource
 {
-    const OBJECT_NAME = "file_link";
+    const OBJECT_NAME = 'file_link';
 
     use ApiOperations\All;
     use ApiOperations\Create;
diff --git a/htdocs/includes/stripe/stripe-php/lib/HttpClient/ClientInterface.php b/htdocs/includes/stripe/stripe-php/lib/HttpClient/ClientInterface.php
index c8d4e50fc1d..3c7861e5974 100644
--- a/htdocs/includes/stripe/stripe-php/lib/HttpClient/ClientInterface.php
+++ b/htdocs/includes/stripe/stripe-php/lib/HttpClient/ClientInterface.php
@@ -9,13 +9,14 @@ interface ClientInterface
      * @param string $absUrl The URL being requested, including domain and protocol
      * @param array $headers Headers to be used in the request (full strings, not KV pairs)
      * @param array $params KV pairs for parameters. Can be nested for arrays and hashes
-     * @param boolean $hasFile Whether or not $params references a file (via an @ prefix or
-     *                         CurlFile)
+     * @param bool $hasFile Whether or not $params references a file (via an @ prefix or
+     *                         CURLFile)
      *
-     * @throws \Stripe\Error\Api
-     * @throws \Stripe\Error\ApiConnection
-     * @return array An array whose first element is raw request body, second
-     *    element is HTTP status code and third array of HTTP headers.
+     * @throws \Stripe\Exception\ApiConnectionException
+     * @throws \Stripe\Exception\UnexpectedValueException
+     *
+     * @return array an array whose first element is raw request body, second
+     *    element is HTTP status code and third array of HTTP headers
      */
     public function request($method, $absUrl, $headers, $params, $hasFile);
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/HttpClient/CurlClient.php b/htdocs/includes/stripe/stripe-php/lib/HttpClient/CurlClient.php
index 32a651795e7..b824518570a 100644
--- a/htdocs/includes/stripe/stripe-php/lib/HttpClient/CurlClient.php
+++ b/htdocs/includes/stripe/stripe-php/lib/HttpClient/CurlClient.php
@@ -2,28 +2,26 @@
 
 namespace Stripe\HttpClient;
 
+use Stripe\Exception;
 use Stripe\Stripe;
-use Stripe\Error;
 use Stripe\Util;
 
-// cURL constants are not defined in PHP < 5.5
-
 // @codingStandardsIgnoreStart
 // PSR2 requires all constants be upper case. Sadly, the CURL_SSLVERSION
 // constants do not abide by those rules.
 
-// Note the values 1 and 6 come from their position in the enum that
+// Note the values come from their position in the enums that
 // defines them in cURL's source code.
-if (!defined('CURL_SSLVERSION_TLSv1')) {
-    define('CURL_SSLVERSION_TLSv1', 1);
-}
-if (!defined('CURL_SSLVERSION_TLSv1_2')) {
-    define('CURL_SSLVERSION_TLSv1_2', 6);
+
+// Available since PHP 5.5.19 and 5.6.3
+if (!\defined('CURL_SSLVERSION_TLSv1_2')) {
+    \define('CURL_SSLVERSION_TLSv1_2', 6);
 }
 // @codingStandardsIgnoreEnd
 
-if (!defined('CURL_HTTP_VERSION_2TLS')) {
-    define('CURL_HTTP_VERSION_2TLS', 4);
+// Available since PHP 7.0.7 and cURL 7.47.0
+if (!\defined('CURL_HTTP_VERSION_2TLS')) {
+    \define('CURL_HTTP_VERSION_2TLS', 4);
 }
 
 class CurlClient implements ClientInterface
@@ -35,18 +33,24 @@ class CurlClient implements ClientInterface
         if (!self::$instance) {
             self::$instance = new self();
         }
+
         return self::$instance;
     }
 
     protected $defaultOptions;
 
+    /** @var \Stripe\Util\RandomGenerator */
+    protected $randomGenerator;
+
     protected $userAgentInfo;
 
-    protected $enablePersistentConnections = null;
+    protected $enablePersistentConnections = true;
 
-    protected $enableHttp2 = null;
+    protected $enableHttp2;
 
-    protected $curlHandle = null;
+    protected $curlHandle;
+
+    protected $requestStatusCallback;
 
     /**
      * CurlClient constructor.
@@ -59,7 +63,8 @@ class CurlClient implements ClientInterface
      * Note that request() will silently ignore a non-callable, non-array $defaultOptions, and will
      * throw an exception if $defaultOptions returns a non-array value.
      *
-     * @param array|callable|null $defaultOptions
+     * @param null|array|callable $defaultOptions
+     * @param null|\Stripe\Util\RandomGenerator $randomGenerator
      */
     public function __construct($defaultOptions = null, $randomGenerator = null)
     {
@@ -67,10 +72,6 @@ class CurlClient implements ClientInterface
         $this->randomGenerator = $randomGenerator ?: new Util\RandomGenerator();
         $this->initUserAgentInfo();
 
-        // TODO: curl_reset requires PHP >= 5.5.0. Once we drop support for PHP 5.4, we can simply
-        // initialize this to true.
-        $this->enablePersistentConnections = function_exists('curl_reset');
-
         $this->enableHttp2 = $this->canSafelyUseHttp2();
     }
 
@@ -81,9 +82,9 @@ class CurlClient implements ClientInterface
 
     public function initUserAgentInfo()
     {
-        $curlVersion = curl_version();
+        $curlVersion = \curl_version();
         $this->userAgentInfo = [
-            'httplib' =>  'curl ' . $curlVersion['version'],
+            'httplib' => 'curl ' . $curlVersion['version'],
             'ssllib' => $curlVersion['ssl_version'],
         ];
     }
@@ -99,7 +100,7 @@ class CurlClient implements ClientInterface
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function getEnablePersistentConnections()
     {
@@ -107,7 +108,7 @@ class CurlClient implements ClientInterface
     }
 
     /**
-     * @param boolean $enable
+     * @param bool $enable
      */
     public function setEnablePersistentConnections($enable)
     {
@@ -115,7 +116,7 @@ class CurlClient implements ClientInterface
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function getEnableHttp2()
     {
@@ -123,13 +124,41 @@ class CurlClient implements ClientInterface
     }
 
     /**
-     * @param boolean $enable
+     * @param bool $enable
      */
     public function setEnableHttp2($enable)
     {
         $this->enableHttp2 = $enable;
     }
 
+    /**
+     * @return null|callable
+     */
+    public function getRequestStatusCallback()
+    {
+        return $this->requestStatusCallback;
+    }
+
+    /**
+     * Sets a callback that is called after each request. The callback will
+     * receive the following parameters:
+     * <ol>
+     *   <li>string $rbody The response body</li>
+     *   <li>integer $rcode The response status code</li>
+     *   <li>\Stripe\Util\CaseInsensitiveArray $rheaders The response headers</li>
+     *   <li>integer $errno The curl error number</li>
+     *   <li>string|null $message The curl error message</li>
+     *   <li>boolean $shouldRetry Whether the request will be retried</li>
+     *   <li>integer $numRetries The number of the retry attempt</li>
+     * </ol>.
+     *
+     * @param null|callable $requestStatusCallback
+     */
+    public function setRequestStatusCallback($requestStatusCallback)
+    {
+        $this->requestStatusCallback = $requestStatusCallback;
+    }
+
     // USER DEFINED TIMEOUTS
 
     const DEFAULT_TIMEOUT = 80;
@@ -140,13 +169,15 @@ class CurlClient implements ClientInterface
 
     public function setTimeout($seconds)
     {
-        $this->timeout = (int) max($seconds, 0);
+        $this->timeout = (int) \max($seconds, 0);
+
         return $this;
     }
 
     public function setConnectTimeout($seconds)
     {
-        $this->connectTimeout = (int) max($seconds, 0);
+        $this->connectTimeout = (int) \max($seconds, 0);
+
         return $this;
     }
 
@@ -164,64 +195,52 @@ class CurlClient implements ClientInterface
 
     public function request($method, $absUrl, $headers, $params, $hasFile)
     {
-        $method = strtolower($method);
+        $method = \strtolower($method);
 
         $opts = [];
-        if (is_callable($this->defaultOptions)) { // call defaultOptions callback, set options to return value
-            $opts = call_user_func_array($this->defaultOptions, func_get_args());
-            if (!is_array($opts)) {
-                throw new Error\Api("Non-array value returned by defaultOptions CurlClient callback");
+        if (\is_callable($this->defaultOptions)) { // call defaultOptions callback, set options to return value
+            $opts = \call_user_func_array($this->defaultOptions, \func_get_args());
+            if (!\is_array($opts)) {
+                throw new Exception\UnexpectedValueException('Non-array value returned by defaultOptions CurlClient callback');
             }
-        } elseif (is_array($this->defaultOptions)) { // set default curlopts from array
+        } elseif (\is_array($this->defaultOptions)) { // set default curlopts from array
             $opts = $this->defaultOptions;
         }
 
         $params = Util\Util::objectsToIds($params);
 
-        if ($method == 'get') {
+        if ('get' === $method) {
             if ($hasFile) {
-                throw new Error\Api(
-                    "Issuing a GET request with a file parameter"
+                throw new Exception\UnexpectedValueException(
+                    'Issuing a GET request with a file parameter'
                 );
             }
-            $opts[CURLOPT_HTTPGET] = 1;
-            if (count($params) > 0) {
+            $opts[\CURLOPT_HTTPGET] = 1;
+            if (\count($params) > 0) {
                 $encoded = Util\Util::encodeParameters($params);
-                $absUrl = "$absUrl?$encoded";
+                $absUrl = "{$absUrl}?{$encoded}";
             }
-        } elseif ($method == 'post') {
-            $opts[CURLOPT_POST] = 1;
-            $opts[CURLOPT_POSTFIELDS] = $hasFile ? $params : Util\Util::encodeParameters($params);
-        } elseif ($method == 'delete') {
-            $opts[CURLOPT_CUSTOMREQUEST] = 'DELETE';
-            if (count($params) > 0) {
+        } elseif ('post' === $method) {
+            $opts[\CURLOPT_POST] = 1;
+            $opts[\CURLOPT_POSTFIELDS] = $hasFile ? $params : Util\Util::encodeParameters($params);
+        } elseif ('delete' === $method) {
+            $opts[\CURLOPT_CUSTOMREQUEST] = 'DELETE';
+            if (\count($params) > 0) {
                 $encoded = Util\Util::encodeParameters($params);
-                $absUrl = "$absUrl?$encoded";
+                $absUrl = "{$absUrl}?{$encoded}";
             }
         } else {
-            throw new Error\Api("Unrecognized method $method");
+            throw new Exception\UnexpectedValueException("Unrecognized method {$method}");
         }
 
         // It is only safe to retry network failures on POST requests if we
         // add an Idempotency-Key header
-        if (($method == 'post') && (Stripe::$maxNetworkRetries > 0)) {
-            if (!$this->hasHeader($headers, "Idempotency-Key")) {
-                array_push($headers, 'Idempotency-Key: ' . $this->randomGenerator->uuid());
+        if (('post' === $method) && (Stripe::$maxNetworkRetries > 0)) {
+            if (!$this->hasHeader($headers, 'Idempotency-Key')) {
+                $headers[] = 'Idempotency-Key: ' . $this->randomGenerator->uuid();
             }
         }
 
-        // Create a callback to capture HTTP headers for the response
-        $rheaders = new Util\CaseInsensitiveArray();
-        $headerCallback = function ($curl, $header_line) use (&$rheaders) {
-            // Ignore the HTTP request line (HTTP/1.1 200 OK)
-            if (strpos($header_line, ":") === false) {
-                return strlen($header_line);
-            }
-            list($key, $value) = explode(":", trim($header_line), 2);
-            $rheaders[trim($key)] = trim($value);
-            return strlen($header_line);
-        };
-
         // By default for large request body sizes (> 1024 bytes), cURL will
         // send a request without a body and with a `Expect: 100-continue`
         // header, which gives the server a chance to respond with an error
@@ -234,32 +253,36 @@ class CurlClient implements ClientInterface
         // we'll error under that condition. To compensate for that problem
         // for the time being, override cURL's behavior by simply always
         // sending an empty `Expect:` header.
-        array_push($headers, 'Expect: ');
+        $headers[] = 'Expect: ';
 
         $absUrl = Util\Util::utf8($absUrl);
-        $opts[CURLOPT_URL] = $absUrl;
-        $opts[CURLOPT_RETURNTRANSFER] = true;
-        $opts[CURLOPT_CONNECTTIMEOUT] = $this->connectTimeout;
-        $opts[CURLOPT_TIMEOUT] = $this->timeout;
-        $opts[CURLOPT_HEADERFUNCTION] = $headerCallback;
-        $opts[CURLOPT_HTTPHEADER] = $headers;
-        $opts[CURLOPT_CAINFO] = Stripe::getCABundlePath();
+        $opts[\CURLOPT_URL] = $absUrl;
+        $opts[\CURLOPT_RETURNTRANSFER] = true;
+        $opts[\CURLOPT_CONNECTTIMEOUT] = $this->connectTimeout;
+        $opts[\CURLOPT_TIMEOUT] = $this->timeout;
+        $opts[\CURLOPT_HTTPHEADER] = $headers;
+        $opts[\CURLOPT_CAINFO] = Stripe::getCABundlePath();
         if (!Stripe::getVerifySslCerts()) {
-            $opts[CURLOPT_SSL_VERIFYPEER] = false;
+            $opts[\CURLOPT_SSL_VERIFYPEER] = false;
         }
 
-        if (!isset($opts[CURLOPT_HTTP_VERSION]) && $this->getEnableHttp2()) {
+        if (!isset($opts[\CURLOPT_HTTP_VERSION]) && $this->getEnableHttp2()) {
             // For HTTPS requests, enable HTTP/2, if supported
-            $opts[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_2TLS;
+            $opts[\CURLOPT_HTTP_VERSION] = \CURL_HTTP_VERSION_2TLS;
         }
 
-        list($rbody, $rcode) = $this->executeRequestWithRetries($opts, $absUrl);
+        // Stripe's API servers are only accessible over IPv4. Force IPv4 resolving to avoid
+        // potential issues (cf. https://github.com/stripe/stripe-php/issues/1045).
+        $opts[\CURLOPT_IPRESOLVE] = \CURL_IPRESOLVE_V4;
+
+        list($rbody, $rcode, $rheaders) = $this->executeRequestWithRetries($opts, $absUrl);
 
         return [$rbody, $rcode, $rheaders];
     }
 
     /**
      * @param array $opts cURL options
+     * @param string $absUrl
      */
     private function executeRequestWithRetries($opts, $absUrl)
     {
@@ -268,35 +291,59 @@ class CurlClient implements ClientInterface
         while (true) {
             $rcode = 0;
             $errno = 0;
+            $message = null;
+
+            // Create a callback to capture HTTP headers for the response
+            $rheaders = new Util\CaseInsensitiveArray();
+            $headerCallback = function ($curl, $header_line) use (&$rheaders) {
+                // Ignore the HTTP request line (HTTP/1.1 200 OK)
+                if (false === \strpos($header_line, ':')) {
+                    return \strlen($header_line);
+                }
+                list($key, $value) = \explode(':', \trim($header_line), 2);
+                $rheaders[\trim($key)] = \trim($value);
+
+                return \strlen($header_line);
+            };
+            $opts[\CURLOPT_HEADERFUNCTION] = $headerCallback;
 
             $this->resetCurlHandle();
-            curl_setopt_array($this->curlHandle, $opts);
-            $rbody = curl_exec($this->curlHandle);
+            \curl_setopt_array($this->curlHandle, $opts);
+            $rbody = \curl_exec($this->curlHandle);
 
-            if ($rbody === false) {
-                $errno = curl_errno($this->curlHandle);
-                $message = curl_error($this->curlHandle);
+            if (false === $rbody) {
+                $errno = \curl_errno($this->curlHandle);
+                $message = \curl_error($this->curlHandle);
             } else {
-                $rcode = curl_getinfo($this->curlHandle, CURLINFO_HTTP_CODE);
+                $rcode = \curl_getinfo($this->curlHandle, \CURLINFO_HTTP_CODE);
             }
             if (!$this->getEnablePersistentConnections()) {
                 $this->closeCurlHandle();
             }
 
-            if ($this->shouldRetry($errno, $rcode, $numRetries)) {
-                $numRetries += 1;
-                $sleepSeconds = $this->sleepTime($numRetries);
-                usleep(intval($sleepSeconds * 1000000));
+            $shouldRetry = $this->shouldRetry($errno, $rcode, $rheaders, $numRetries);
+
+            if (\is_callable($this->getRequestStatusCallback())) {
+                \call_user_func_array(
+                    $this->getRequestStatusCallback(),
+                    [$rbody, $rcode, $rheaders, $errno, $message, $shouldRetry, $numRetries]
+                );
+            }
+
+            if ($shouldRetry) {
+                ++$numRetries;
+                $sleepSeconds = $this->sleepTime($numRetries, $rheaders);
+                \usleep((int) ($sleepSeconds * 1000000));
             } else {
                 break;
             }
         }
 
-        if ($rbody === false) {
+        if (false === $rbody) {
             $this->handleCurlError($absUrl, $errno, $message, $numRetries);
         }
 
-        return [$rbody, $rcode];
+        return [$rbody, $rcode, $rheaders];
     }
 
     /**
@@ -304,83 +351,119 @@ class CurlClient implements ClientInterface
      * @param int $errno
      * @param string $message
      * @param int $numRetries
-     * @throws Error\ApiConnection
+     *
+     * @throws Exception\ApiConnectionException
      */
     private function handleCurlError($url, $errno, $message, $numRetries)
     {
         switch ($errno) {
-            case CURLE_COULDNT_CONNECT:
-            case CURLE_COULDNT_RESOLVE_HOST:
-            case CURLE_OPERATION_TIMEOUTED:
-                $msg = "Could not connect to Stripe ($url).  Please check your "
-                 . "internet connection and try again.  If this problem persists, "
+            case \CURLE_COULDNT_CONNECT:
+            case \CURLE_COULDNT_RESOLVE_HOST:
+            case \CURLE_OPERATION_TIMEOUTED:
+                $msg = "Could not connect to Stripe ({$url}).  Please check your "
+                 . 'internet connection and try again.  If this problem persists, '
                  . "you should check Stripe's service status at "
-                 . "https://twitter.com/stripestatus, or";
-                break;
-            case CURLE_SSL_CACERT:
-            case CURLE_SSL_PEER_CERTIFICATE:
-                $msg = "Could not verify Stripe's SSL certificate.  Please make sure "
-                 . "that your network is not intercepting certificates.  "
-                 . "(Try going to $url in your browser.)  "
-                 . "If this problem persists,";
-                break;
-            default:
-                $msg = "Unexpected error communicating with Stripe.  "
-                 . "If this problem persists,";
-        }
-        $msg .= " let us know at support@stripe.com.";
+                 . 'https://twitter.com/stripestatus, or';
 
-        $msg .= "\n\n(Network error [errno $errno]: $message)";
+                break;
+
+            case \CURLE_SSL_CACERT:
+            case \CURLE_SSL_PEER_CERTIFICATE:
+                $msg = "Could not verify Stripe's SSL certificate.  Please make sure "
+                 . 'that your network is not intercepting certificates.  '
+                 . "(Try going to {$url} in your browser.)  "
+                 . 'If this problem persists,';
+
+                break;
+
+            default:
+                $msg = 'Unexpected error communicating with Stripe.  '
+                 . 'If this problem persists,';
+        }
+        $msg .= ' let us know at support@stripe.com.';
+
+        $msg .= "\n\n(Network error [errno {$errno}]: {$message})";
 
         if ($numRetries > 0) {
-            $msg .= "\n\nRequest was retried $numRetries times.";
+            $msg .= "\n\nRequest was retried {$numRetries} times.";
         }
 
-        throw new Error\ApiConnection($msg);
+        throw new Exception\ApiConnectionException($msg);
     }
 
     /**
      * Checks if an error is a problem that we should retry on. This includes both
      * socket errors that may represent an intermittent problem and some special
      * HTTP statuses.
+     *
      * @param int $errno
      * @param int $rcode
+     * @param array|\Stripe\Util\CaseInsensitiveArray $rheaders
      * @param int $numRetries
+     *
      * @return bool
      */
-    private function shouldRetry($errno, $rcode, $numRetries)
+    private function shouldRetry($errno, $rcode, $rheaders, $numRetries)
     {
         if ($numRetries >= Stripe::getMaxNetworkRetries()) {
             return false;
         }
 
         // Retry on timeout-related problems (either on open or read).
-        if ($errno === CURLE_OPERATION_TIMEOUTED) {
+        if (\CURLE_OPERATION_TIMEOUTED === $errno) {
             return true;
         }
 
         // Destination refused the connection, the connection was reset, or a
         // variety of other connection failures. This could occur from a single
         // saturated server, so retry in case it's intermittent.
-        if ($errno === CURLE_COULDNT_CONNECT) {
+        if (\CURLE_COULDNT_CONNECT === $errno) {
             return true;
         }
 
-        // 409 conflict
-        if ($rcode === 409) {
+        // The API may ask us not to retry (eg; if doing so would be a no-op)
+        // or advise us to retry (eg; in cases of lock timeouts); we defer to that.
+        if (isset($rheaders['stripe-should-retry'])) {
+            if ('false' === $rheaders['stripe-should-retry']) {
+                return false;
+            }
+            if ('true' === $rheaders['stripe-should-retry']) {
+                return true;
+            }
+        }
+
+        // 409 Conflict
+        if (409 === $rcode) {
+            return true;
+        }
+
+        // Retry on 500, 503, and other internal errors.
+        //
+        // Note that we expect the stripe-should-retry header to be false
+        // in most cases when a 500 is returned, since our idempotency framework
+        // would typically replay it anyway.
+        if ($rcode >= 500) {
             return true;
         }
 
         return false;
     }
 
-    private function sleepTime($numRetries)
+    /**
+     * Provides the number of seconds to wait before retrying a request.
+     *
+     * @param int $numRetries
+     * @param array|\Stripe\Util\CaseInsensitiveArray $rheaders
+     *
+     * @return int
+     */
+    private function sleepTime($numRetries, $rheaders)
     {
         // Apply exponential backoff with $initialNetworkRetryDelay on the
         // number of $numRetries so far as inputs. Do not allow the number to exceed
         // $maxNetworkRetryDelay.
-        $sleepSeconds = min(
-            Stripe::getInitialNetworkRetryDelay() * 1.0 * pow(2, $numRetries - 1),
+        $sleepSeconds = \min(
+            Stripe::getInitialNetworkRetryDelay() * 1.0 * 2 ** ($numRetries - 1),
             Stripe::getMaxNetworkRetryDelay()
         );
 
@@ -389,7 +472,13 @@ class CurlClient implements ClientInterface
         $sleepSeconds *= 0.5 * (1 + $this->randomGenerator->randFloat());
 
         // But never sleep less than the base sleep seconds.
-        $sleepSeconds = max(Stripe::getInitialNetworkRetryDelay(), $sleepSeconds);
+        $sleepSeconds = \max(Stripe::getInitialNetworkRetryDelay(), $sleepSeconds);
+
+        // And never sleep less than the time the API asks us to wait, assuming it's a reasonable ask.
+        $retryAfter = isset($rheaders['retry-after']) ? (float) ($rheaders['retry-after']) : 0.0;
+        if (\floor($retryAfter) === $retryAfter && $retryAfter <= Stripe::getMaxRetryAfter()) {
+            $sleepSeconds = \max($sleepSeconds, $retryAfter);
+        }
 
         return $sleepSeconds;
     }
@@ -400,7 +489,7 @@ class CurlClient implements ClientInterface
     private function initCurlHandle()
     {
         $this->closeCurlHandle();
-        $this->curlHandle = curl_init();
+        $this->curlHandle = \curl_init();
     }
 
     /**
@@ -408,8 +497,8 @@ class CurlClient implements ClientInterface
      */
     private function closeCurlHandle()
     {
-        if (!is_null($this->curlHandle)) {
-            curl_close($this->curlHandle);
+        if (null !== $this->curlHandle) {
+            \curl_close($this->curlHandle);
             $this->curlHandle = null;
         }
     }
@@ -420,8 +509,8 @@ class CurlClient implements ClientInterface
      */
     private function resetCurlHandle()
     {
-        if (!is_null($this->curlHandle) && $this->getEnablePersistentConnections()) {
-            curl_reset($this->curlHandle);
+        if (null !== $this->curlHandle && $this->getEnablePersistentConnections()) {
+            \curl_reset($this->curlHandle);
         } else {
             $this->initCurlHandle();
         }
@@ -430,14 +519,15 @@ class CurlClient implements ClientInterface
     /**
      * Indicates whether it is safe to use HTTP/2 or not.
      *
-     * @return boolean
+     * @return bool
      */
     private function canSafelyUseHttp2()
     {
         // Versions of curl older than 7.60.0 don't respect GOAWAY frames
         // (cf. https://github.com/curl/curl/issues/2416), which Stripe use.
-        $curlVersion = curl_version()['version'];
-        return (version_compare($curlVersion, '7.60.0') >= 0);
+        $curlVersion = \curl_version()['version'];
+
+        return \version_compare($curlVersion, '7.60.0') >= 0;
     }
 
     /**
@@ -445,12 +535,13 @@ class CurlClient implements ClientInterface
      *
      * @param string[] $headers
      * @param string $name
-     * @return boolean
+     *
+     * @return bool
      */
     private function hasHeader($headers, $name)
     {
         foreach ($headers as $header) {
-            if (strncasecmp($header, "{$name}: ", strlen($name) + 2) === 0) {
+            if (0 === \strncasecmp($header, "{$name}: ", \strlen($name) + 2)) {
                 return true;
             }
         }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Invoice.php b/htdocs/includes/stripe/stripe-php/lib/Invoice.php
index a309dd9e477..706da0a632a 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Invoice.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Invoice.php
@@ -1,76 +1,113 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class Invoice
+ * Invoices are statements of amounts owed by a customer, and are either generated
+ * one-off, or generated periodically from a subscription.
  *
- * @property string $id
- * @property string $object
- * @property string $account_country
- * @property string $account_name
- * @property int $amount_due
- * @property int $amount_paid
- * @property int $amount_remaining
- * @property int $application_fee_amount
- * @property int $attempt_count
- * @property bool $attempted
- * @property bool $auto_advance
- * @property string $billing
- * @property string $billing_reason
- * @property string $charge
- * @property string $collection_method
- * @property int $created
- * @property string $currency
- * @property array $custom_fields
- * @property string $customer
- * @property mixed $customer_address
- * @property string $customer_email
- * @property string $customer_name
- * @property string $customer_phone
- * @property mixed $customer_shipping
- * @property string $customer_tax_exempt
- * @property array $customer_tax_ids
- * @property string $default_payment_method
- * @property string $default_source
- * @property array $default_tax_rates
- * @property string $description
- * @property Discount $discount
- * @property int $due_date
- * @property int $ending_balance
- * @property string $footer
- * @property string $hosted_invoice_url
- * @property string $invoice_pdf
- * @property Collection $lines
- * @property bool $livemode
- * @property StripeObject $metadata
- * @property int $next_payment_attempt
- * @property string $number
- * @property bool $paid
- * @property string $payment_intent
- * @property int $period_end
- * @property int $period_start
- * @property int $post_payment_credit_notes_amount
- * @property int $pre_payment_credit_notes_amount
- * @property string $receipt_number
- * @property int $starting_balance
- * @property string $statement_descriptor
- * @property string $status
- * @property mixed $status_transitions
- * @property string $subscription
- * @property int $subscription_proration_date
- * @property int $subtotal
- * @property int $tax
- * @property mixed $threshold_reason
- * @property int $total
- * @property array $total_tax_amounts
- * @property int $webhooks_delivered_at
+ * They contain <a href="https://stripe.com/docs/api#invoiceitems">invoice
+ * items</a>, and proration adjustments that may be caused by subscription
+ * upgrades/downgrades (if necessary).
  *
- * @package Stripe
+ * If your invoice is configured to be billed through automatic charges, Stripe
+ * automatically finalizes your invoice and attempts payment. Note that finalizing
+ * the invoice, <a
+ * href="https://stripe.com/docs/billing/invoices/workflow/#auto_advance">when
+ * automatic</a>, does not happen immediately as the invoice is created. Stripe
+ * waits until one hour after the last webhook was successfully sent (or the last
+ * webhook timed out after failing). If you (and the platforms you may have
+ * connected to) have no webhooks configured, Stripe waits one hour after creation
+ * to finalize the invoice.
+ *
+ * If your invoice is configured to be billed by sending an email, then based on
+ * your <a href="https://dashboard.stripe.com/account/billing/automatic'">email
+ * settings</a>, Stripe will email the invoice to your customer and await payment.
+ * These emails can contain a link to a hosted page to pay the invoice.
+ *
+ * Stripe applies any customer credit on the account before determining the amount
+ * due for the invoice (i.e., the amount that will be actually charged). If the
+ * amount due for the invoice is less than Stripe's <a
+ * href="/docs/currencies#minimum-and-maximum-charge-amounts">minimum allowed
+ * charge per currency</a>, the invoice is automatically marked paid, and we add
+ * the amount due to the customer's running account balance which is applied to the
+ * next invoice.
+ *
+ * More details on the customer's account balance are <a
+ * href="https://stripe.com/docs/api/customers/object#customer_object-account_balance">here</a>.
+ *
+ * Related guide: <a href="https://stripe.com/docs/billing/invoices/sending">Send
+ * Invoices to Customers</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string $account_country The country of the business associated with this invoice, most often the business creating the invoice.
+ * @property null|string $account_name The public name of the business associated with this invoice, most often the business creating the invoice.
+ * @property null|(string|\Stripe\TaxId)[] $account_tax_ids The account tax IDs associated with the invoice. Only editable when the invoice is a draft.
+ * @property int $amount_due Final amount due at this time for this invoice. If the invoice's total is smaller than the minimum charge amount, for example, or if there is account credit that can be applied to the invoice, the <code>amount_due</code> may be 0. If there is a positive <code>starting_balance</code> for the invoice (the customer owes money), the <code>amount_due</code> will also take that into account. The charge that gets generated for the invoice will be for the amount specified in <code>amount_due</code>.
+ * @property int $amount_paid The amount, in %s, that was paid.
+ * @property int $amount_remaining The amount remaining, in %s, that is due.
+ * @property null|int $application_fee_amount The fee in %s that will be applied to the invoice and transferred to the application owner's Stripe account when the invoice is paid.
+ * @property int $attempt_count Number of payment attempts made for this invoice, from the perspective of the payment retry schedule. Any payment attempt counts as the first attempt, and subsequently only automatic retries increment the attempt count. In other words, manual payment attempts after the first attempt do not affect the retry schedule.
+ * @property bool $attempted Whether an attempt has been made to pay the invoice. An invoice is not attempted until 1 hour after the <code>invoice.created</code> webhook, for example, so you might not want to display that invoice as unpaid to your users.
+ * @property bool $auto_advance Controls whether Stripe will perform <a href="https://stripe.com/docs/billing/invoices/workflow/#auto_advance">automatic collection</a> of the invoice. When <code>false</code>, the invoice's state will not automatically advance without an explicit action.
+ * @property null|string $billing_reason Indicates the reason why the invoice was created. <code>subscription_cycle</code> indicates an invoice created by a subscription advancing into a new period. <code>subscription_create</code> indicates an invoice created due to creating a subscription. <code>subscription_update</code> indicates an invoice created due to updating a subscription. <code>subscription</code> is set for all old invoices to indicate either a change to a subscription or a period advancement. <code>manual</code> is set for all invoices unrelated to a subscription (for example: created via the invoice editor). The <code>upcoming</code> value is reserved for simulated invoices per the upcoming invoice endpoint. <code>subscription_threshold</code> indicates an invoice created due to a billing threshold being reached.
+ * @property null|string|\Stripe\Charge $charge ID of the latest charge generated for this invoice, if any.
+ * @property null|string $collection_method Either <code>charge_automatically</code>, or <code>send_invoice</code>. When charging automatically, Stripe will attempt to pay this invoice using the default source attached to the customer. When sending an invoice, Stripe will email this invoice to the customer with payment instructions.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|\Stripe\StripeObject[] $custom_fields Custom fields displayed on the invoice.
+ * @property string|\Stripe\Customer $customer The ID of the customer who will be billed.
+ * @property null|\Stripe\StripeObject $customer_address The customer's address. Until the invoice is finalized, this field will equal <code>customer.address</code>. Once the invoice is finalized, this field will no longer be updated.
+ * @property null|string $customer_email The customer's email. Until the invoice is finalized, this field will equal <code>customer.email</code>. Once the invoice is finalized, this field will no longer be updated.
+ * @property null|string $customer_name The customer's name. Until the invoice is finalized, this field will equal <code>customer.name</code>. Once the invoice is finalized, this field will no longer be updated.
+ * @property null|string $customer_phone The customer's phone number. Until the invoice is finalized, this field will equal <code>customer.phone</code>. Once the invoice is finalized, this field will no longer be updated.
+ * @property null|\Stripe\StripeObject $customer_shipping The customer's shipping information. Until the invoice is finalized, this field will equal <code>customer.shipping</code>. Once the invoice is finalized, this field will no longer be updated.
+ * @property null|string $customer_tax_exempt The customer's tax exempt status. Until the invoice is finalized, this field will equal <code>customer.tax_exempt</code>. Once the invoice is finalized, this field will no longer be updated.
+ * @property null|\Stripe\StripeObject[] $customer_tax_ids The customer's tax IDs. Until the invoice is finalized, this field will contain the same tax IDs as <code>customer.tax_ids</code>. Once the invoice is finalized, this field will no longer be updated.
+ * @property null|string|\Stripe\PaymentMethod $default_payment_method ID of the default payment method for the invoice. It must belong to the customer associated with the invoice. If not set, defaults to the subscription's default payment method, if any, or to the default payment method in the customer's invoice settings.
+ * @property null|string|\Stripe\Account|\Stripe\AlipayAccount|\Stripe\BankAccount|\Stripe\BitcoinReceiver|\Stripe\Card|\Stripe\Source $default_source ID of the default payment source for the invoice. It must belong to the customer associated with the invoice and be in a chargeable state. If not set, defaults to the subscription's default source, if any, or to the customer's default source.
+ * @property \Stripe\TaxRate[] $default_tax_rates The tax rates applied to this invoice, if any.
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users. Referenced as 'memo' in the Dashboard.
+ * @property null|\Stripe\Discount $discount Describes the current discount applied to this invoice, if there is one. Not populated if there are multiple discounts.
+ * @property null|(string|\Stripe\Discount)[] $discounts The discounts applied to the invoice. Line item discounts are applied before invoice discounts. Use <code>expand[]=discounts</code> to expand each discount.
+ * @property null|int $due_date The date on which payment for this invoice is due. This value will be <code>null</code> for invoices where <code>collection_method=charge_automatically</code>.
+ * @property null|int $ending_balance Ending customer balance after the invoice is finalized. Invoices are finalized approximately an hour after successful webhook delivery or when payment collection is attempted for the invoice. If the invoice has not been finalized yet, this will be null.
+ * @property null|string $footer Footer displayed on the invoice.
+ * @property null|string $hosted_invoice_url The URL for the hosted invoice page, which allows customers to view and pay an invoice. If the invoice has not been finalized yet, this will be null.
+ * @property null|string $invoice_pdf The link to download the PDF for the invoice. If the invoice has not been finalized yet, this will be null.
+ * @property null|\Stripe\ErrorObject $last_finalization_error The error encountered during the previous attempt to finalize the invoice. This field is cleared when the invoice is successfully finalized.
+ * @property \Stripe\Collection $lines The individual line items that make up the invoice. <code>lines</code> is sorted as follows: invoice items in reverse chronological order, followed by the subscription, if any.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|int $next_payment_attempt The time at which payment will next be attempted. This value will be <code>null</code> for invoices where <code>collection_method=send_invoice</code>.
+ * @property null|string $number A unique, identifying string that appears on emails sent to the customer for this invoice. This starts with the customer's unique invoice_prefix if it is specified.
+ * @property bool $paid Whether payment was successfully collected for this invoice. An invoice can be paid (most commonly) with a charge or with credit from the customer's account balance.
+ * @property null|string|\Stripe\PaymentIntent $payment_intent The PaymentIntent associated with this invoice. The PaymentIntent is generated when the invoice is finalized, and can then be used to pay the invoice. Note that voiding an invoice will cancel the PaymentIntent.
+ * @property int $period_end End of the usage period during which invoice items were added to this invoice.
+ * @property int $period_start Start of the usage period during which invoice items were added to this invoice.
+ * @property int $post_payment_credit_notes_amount Total amount of all post-payment credit notes issued for this invoice.
+ * @property int $pre_payment_credit_notes_amount Total amount of all pre-payment credit notes issued for this invoice.
+ * @property null|string $receipt_number This is the transaction number that appears on email receipts sent for this invoice.
+ * @property int $starting_balance Starting customer balance before the invoice is finalized. If the invoice has not been finalized yet, this will be the current customer balance.
+ * @property null|string $statement_descriptor Extra information about an invoice for the customer's credit card statement.
+ * @property null|string $status The status of the invoice, one of <code>draft</code>, <code>open</code>, <code>paid</code>, <code>uncollectible</code>, or <code>void</code>. <a href="https://stripe.com/docs/billing/invoices/workflow#workflow-overview">Learn more</a>
+ * @property \Stripe\StripeObject $status_transitions
+ * @property null|string|\Stripe\Subscription $subscription The subscription that this invoice was prepared for, if any.
+ * @property int $subscription_proration_date Only set for upcoming invoices that preview prorations. The time used to calculate prorations.
+ * @property int $subtotal Total of all subscriptions, invoice items, and prorations on the invoice before any invoice level discount or tax is applied. Item discounts are already incorporated
+ * @property null|int $tax The amount of tax on this invoice. This is the sum of all the tax amounts on this invoice.
+ * @property \Stripe\StripeObject $threshold_reason
+ * @property int $total Total after discounts and taxes.
+ * @property null|\Stripe\StripeObject[] $total_discount_amounts The aggregate amounts calculated per discount across all line items.
+ * @property \Stripe\StripeObject[] $total_tax_amounts The aggregate amounts calculated per tax rate for all line items.
+ * @property null|int $webhooks_delivered_at Invoices are automatically paid or sent 1 hour after webhooks are delivered, or until all webhook delivery attempts have <a href="https://stripe.com/docs/billing/webhooks#understand">been exhausted</a>. This field tracks the time when webhooks for this invoice were successfully delivered. If the invoice had no webhooks to deliver, this will be set while the invoice is being created.
  */
 class Invoice extends ApiResource
 {
-    const OBJECT_NAME = "invoice";
+    const OBJECT_NAME = 'invoice';
 
     use ApiOperations\All;
     use ApiOperations\Create;
@@ -78,104 +115,38 @@ class Invoice extends ApiResource
     use ApiOperations\Retrieve;
     use ApiOperations\Update;
 
-    /**
-     * Possible string representations of the billing reason.
-     * @link https://stripe.com/docs/api/invoices/object#invoice_object-billing_reason
-     */
-    const BILLING_REASON_MANUAL                 = 'manual';
-    const BILLING_REASON_SUBSCRIPTION           = 'subscription';
-    const BILLING_REASON_SUBSCRIPTION_CREATE    = 'subscription_create';
-    const BILLING_REASON_SUBSCRIPTION_CYCLE     = 'subscription_cycle';
-    const BILLING_REASON_SUBSCRIPTION_THRESHOLD = 'subscription_threshold';
-    const BILLING_REASON_SUBSCRIPTION_UPDATE    = 'subscription_update';
-    const BILLING_REASON_UPCOMING               = 'upcoming';
-
-    /**
-     * Possible string representations of the `collection_method` property.
-     * @link https://stripe.com/docs/api/invoices/object#invoice_object-collection_method
-     */
-    const COLLECTION_METHOD_CHARGE_AUTOMATICALLY = 'charge_automatically';
-    const COLLECTION_METHOD_SEND_INVOICE         = 'send_invoice';
-
-    /**
-     * Possible string representations of the invoice status.
-     * @link https://stripe.com/docs/api/invoices/object#invoice_object-status
-     */
-    const STATUS_DRAFT         = 'draft';
-    const STATUS_OPEN          = 'open';
-    const STATUS_PAID          = 'paid';
-    const STATUS_UNCOLLECTIBLE = 'uncollectible';
-    const STATUS_VOID          = 'void';
-
-    /**
-     * Possible string representations of the `billing` property.
-     * @deprecated Use `collection_method` instead.
-     * @link https://stripe.com/docs/api/invoices/object#invoice_object-billing
-     */
     const BILLING_CHARGE_AUTOMATICALLY = 'charge_automatically';
-    const BILLING_SEND_INVOICE         = 'send_invoice';
+    const BILLING_SEND_INVOICE = 'send_invoice';
+
+    const BILLING_REASON_MANUAL = 'manual';
+    const BILLING_REASON_SUBSCRIPTION = 'subscription';
+    const BILLING_REASON_SUBSCRIPTION_CREATE = 'subscription_create';
+    const BILLING_REASON_SUBSCRIPTION_CYCLE = 'subscription_cycle';
+    const BILLING_REASON_SUBSCRIPTION_THRESHOLD = 'subscription_threshold';
+    const BILLING_REASON_SUBSCRIPTION_UPDATE = 'subscription_update';
+    const BILLING_REASON_UPCOMING = 'upcoming';
+
+    const COLLECTION_METHOD_CHARGE_AUTOMATICALLY = 'charge_automatically';
+    const COLLECTION_METHOD_SEND_INVOICE = 'send_invoice';
+
+    const STATUS_DELETED = 'deleted';
+    const STATUS_DRAFT = 'draft';
+    const STATUS_OPEN = 'open';
+    const STATUS_PAID = 'paid';
+    const STATUS_UNCOLLECTIBLE = 'uncollectible';
+    const STATUS_VOID = 'void';
+
+    use ApiOperations\NestedResource;
+
+    const PATH_LINES = '/lines';
 
     /**
-     * @param array|null $params
-     * @param array|string|null $opts
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return Invoice The finalized invoice.
-     */
-    public function finalizeInvoice($params = null, $opts = null)
-    {
-        $url = $this->instanceUrl() . '/finalize';
-        list($response, $opts) = $this->_request('post', $url, $params, $opts);
-        $this->refreshFrom($response, $opts);
-        return $this;
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
      *
-     * @return Invoice The uncollectible invoice.
-     */
-    public function markUncollectible($params = null, $opts = null)
-    {
-        $url = $this->instanceUrl() . '/mark_uncollectible';
-        list($response, $opts) = $this->_request('post', $url, $params, $opts);
-        $this->refreshFrom($response, $opts);
-        return $this;
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Invoice The paid invoice.
-     */
-    public function pay($params = null, $opts = null)
-    {
-        $url = $this->instanceUrl() . '/pay';
-        list($response, $opts) = $this->_request('post', $url, $params, $opts);
-        $this->refreshFrom($response, $opts);
-        return $this;
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Invoice The sent invoice.
-     */
-    public function sendInvoice($params = null, $opts = null)
-    {
-        $url = $this->instanceUrl() . '/send';
-        list($response, $opts) = $this->_request('post', $url, $params, $opts);
-        $this->refreshFrom($response, $opts);
-        return $this;
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Invoice The upcoming invoice.
+     * @return \Stripe\Invoice the upcoming invoice
      */
     public static function upcoming($params = null, $opts = null)
     {
@@ -183,20 +154,106 @@ class Invoice extends ApiResource
         list($response, $opts) = static::_staticRequest('get', $url, $params, $opts);
         $obj = Util\Util::convertToStripeObject($response->json, $opts);
         $obj->setLastResponse($response);
+
         return $obj;
     }
 
     /**
-     * @param array|null $params
-     * @param array|string|null $opts
+     * @param string $id the ID of the invoice on which to retrieve the lines
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return Invoice The voided invoice.
+     * @throws StripeExceptionApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection the list of lines (InvoiceLineItem)
+     */
+    public static function allLines($id, $params = null, $opts = null)
+    {
+        return self::_allNestedResources($id, static::PATH_LINES, $params, $opts);
+    }
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return Invoice the finalized invoice
+     */
+    public function finalizeInvoice($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/finalize';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+
+        return $this;
+    }
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return Invoice the uncollectible invoice
+     */
+    public function markUncollectible($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/mark_uncollectible';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+
+        return $this;
+    }
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return Invoice the paid invoice
+     */
+    public function pay($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/pay';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+
+        return $this;
+    }
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return Invoice the sent invoice
+     */
+    public function sendInvoice($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/send';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+
+        return $this;
+    }
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return Invoice the voided invoice
      */
     public function voidInvoice($params = null, $opts = null)
     {
         $url = $this->instanceUrl() . '/void';
         list($response, $opts) = $this->_request('post', $url, $params, $opts);
         $this->refreshFrom($response, $opts);
+
         return $this;
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/InvoiceItem.php b/htdocs/includes/stripe/stripe-php/lib/InvoiceItem.php
index 2f74dabec5c..6153bbf98b7 100644
--- a/htdocs/includes/stripe/stripe-php/lib/InvoiceItem.php
+++ b/htdocs/includes/stripe/stripe-php/lib/InvoiceItem.php
@@ -1,35 +1,45 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class InvoiceItem
+ * Sometimes you want to add a charge or credit to a customer, but actually charge
+ * or credit the customer's card only at the end of a regular billing cycle. This
+ * is useful for combining several charges (to minimize per-transaction fees), or
+ * for having Stripe tabulate your usage-based billing totals.
  *
- * @property string $id
- * @property string $object
- * @property int $amount
- * @property string $currency
- * @property string $customer
- * @property int $date
- * @property string $description
- * @property bool $discountable
- * @property string $invoice
- * @property bool $livemode
- * @property StripeObject $metadata
- * @property mixed $period
- * @property Plan $plan
- * @property bool $proration
- * @property int $quantity
- * @property string $subscription
- * @property string $subscription_item
- * @property array $tax_rates
- * @property int $unit_amount
+ * Related guide: <a
+ * href="https://stripe.com/docs/billing/invoices/subscription#adding-upcoming-invoice-items">Subscription
+ * Invoices</a>.
  *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Amount (in the <code>currency</code> specified) of the invoice item. This should always be equal to <code>unit_amount * quantity</code>.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property string|\Stripe\Customer $customer The ID of the customer who will be billed when this invoice item is billed.
+ * @property int $date Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property bool $discountable If true, discounts will apply to this invoice item. Always false for prorations.
+ * @property null|(string|\Stripe\Discount)[] $discounts The discounts which apply to the invoice item. Item discounts are applied before invoice discounts. Use <code>expand[]=discounts</code> to expand each discount.
+ * @property null|string|\Stripe\Invoice $invoice The ID of the invoice this invoice item belongs to.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property \Stripe\StripeObject $period
+ * @property null|\Stripe\Plan $plan If the invoice item is a proration, the plan of the subscription that the proration was computed for.
+ * @property null|\Stripe\Price $price The price of the invoice item.
+ * @property bool $proration Whether the invoice item was created automatically as a proration adjustment when the customer switched plans.
+ * @property int $quantity Quantity of units for the invoice item. If the invoice item is a proration, the quantity of the subscription that the proration was computed for.
+ * @property null|string|\Stripe\Subscription $subscription The subscription that this invoice item has been created for, if any.
+ * @property string $subscription_item The subscription item that this invoice item has been created for, if any.
+ * @property null|\Stripe\TaxRate[] $tax_rates The tax rates which apply to the invoice item. When set, the <code>default_tax_rates</code> on the invoice do not apply to this invoice item.
+ * @property null|int $unit_amount Unit amount (in the <code>currency</code> specified) of the invoice item.
+ * @property null|string $unit_amount_decimal Same as <code>unit_amount</code>, but contains a decimal value with at most 12 decimal places.
  */
 class InvoiceItem extends ApiResource
 {
-    const OBJECT_NAME = "invoiceitem";
+    const OBJECT_NAME = 'invoiceitem';
 
     use ApiOperations\All;
     use ApiOperations\Create;
diff --git a/htdocs/includes/stripe/stripe-php/lib/InvoiceLineItem.php b/htdocs/includes/stripe/stripe-php/lib/InvoiceLineItem.php
index e8e8c881d5a..e579afb6a8d 100644
--- a/htdocs/includes/stripe/stripe-php/lib/InvoiceLineItem.php
+++ b/htdocs/includes/stripe/stripe-php/lib/InvoiceLineItem.php
@@ -1,32 +1,33 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class InvoiceLineItem
- *
- * @property string $id
- * @property string $object
- * @property int $amount
- * @property string $currency
- * @property string $description
- * @property bool $discountable
- * @property string $invoice_item
- * @property bool $livemode
- * @property StripeObject $metadata
- * @property mixed $period
- * @property Plan $plan
- * @property bool $proration
- * @property int $quantity
- * @property string $subscription
- * @property string $subscription_item
- * @property array $tax_amounts
- * @property array $tax_rates
- * @property string $type
- *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount The amount, in %s.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property null|\Stripe\StripeObject[] $discount_amounts The amount of discount calculated per discount for this line item.
+ * @property bool $discountable If true, discounts will apply to this line item. Always false for prorations.
+ * @property null|(string|\Stripe\Discount)[] $discounts The discounts applied to the invoice line item. Line item discounts are applied before invoice discounts. Use <code>expand[]=discounts</code> to expand each discount.
+ * @property string $invoice_item The ID of the <a href="https://stripe.com/docs/api/invoiceitems">invoice item</a> associated with this line item if any.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format. Note that for line items with <code>type=subscription</code> this will reflect the metadata of the subscription that caused the line item to be created.
+ * @property \Stripe\StripeObject $period
+ * @property null|\Stripe\Plan $plan The plan of the subscription, if the line item is a subscription or a proration.
+ * @property null|\Stripe\Price $price The price of the line item.
+ * @property bool $proration Whether this is a proration.
+ * @property null|int $quantity The quantity of the subscription, if the line item is a subscription or a proration.
+ * @property null|string $subscription The subscription that the invoice item pertains to, if any.
+ * @property string $subscription_item The subscription item that generated this invoice item. Left empty if the line item is not an explicit result of a subscription.
+ * @property \Stripe\StripeObject[] $tax_amounts The amount of tax calculated per tax rate for this line item
+ * @property \Stripe\TaxRate[] $tax_rates The tax rates which apply to the line item.
+ * @property string $type A string identifying the type of the source of this line item, either an <code>invoiceitem</code> or a <code>subscription</code>.
  */
 class InvoiceLineItem extends ApiResource
 {
-    const OBJECT_NAME = "line_item";
+    const OBJECT_NAME = 'line_item';
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Issuing/Authorization.php b/htdocs/includes/stripe/stripe-php/lib/Issuing/Authorization.php
index 9a04063d37c..22e8127553e 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Issuing/Authorization.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Issuing/Authorization.php
@@ -1,68 +1,81 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe\Issuing;
 
 /**
- * Class Authorization
+ * When an <a href="https://stripe.com/docs/issuing">issued card</a> is used to
+ * make a purchase, an Issuing <code>Authorization</code> object is created. <a
+ * href="https://stripe.com/docs/issuing/purchases/authorizations">Authorizations</a>
+ * must be approved for the purchase to be completed successfully.
  *
- * @property string $id
- * @property string $object
- * @property bool $approved
- * @property string $authorization_method
- * @property int $authorized_amount
- * @property string $authorized_currency
- * @property \Stripe\Collection $balance_transactions
- * @property Card $card
- * @property Cardholder $cardholder
- * @property int $created
- * @property int $held_amount
- * @property string $held_currency
- * @property bool $is_held_amount_controllable
- * @property bool $livemode
- * @property mixed $merchant_data
- * @property \Stripe\StripeObject $metadata
- * @property int $pending_authorized_amount
- * @property int $pending_held_amount
- * @property mixed $request_history
- * @property string $status
- * @property \Stripe\Collection $transactions
- * @property mixed $verification_data
+ * Related guide: <a
+ * href="https://stripe.com/docs/issuing/purchases/authorizations">Issued Card
+ * Authorizations</a>.
  *
- * @package Stripe\Issuing
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount The total amount that was authorized or rejected. This amount is in the card's currency and in the <a href="https://stripe.com/docs/currencies#zero-decimal">smallest currency unit</a>.
+ * @property null|\Stripe\StripeObject $amount_details Detailed breakdown of amount components. These amounts are denominated in <code>currency</code> and in the <a href="https://stripe.com/docs/currencies#zero-decimal">smallest currency unit</a>.
+ * @property bool $approved Whether the authorization has been approved.
+ * @property string $authorization_method How the card details were provided.
+ * @property \Stripe\BalanceTransaction[] $balance_transactions List of balance transactions associated with this authorization.
+ * @property \Stripe\Issuing\Card $card You can <a href="https://stripe.com/docs/issuing/cards">create physical or virtual cards</a> that are issued to cardholders.
+ * @property null|string|\Stripe\Issuing\Cardholder $cardholder The cardholder to whom this authorization belongs.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property int $merchant_amount The total amount that was authorized or rejected. This amount is in the <code>merchant_currency</code> and in the <a href="https://stripe.com/docs/currencies#zero-decimal">smallest currency unit</a>.
+ * @property string $merchant_currency The currency that was presented to the cardholder for the authorization. Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property \Stripe\StripeObject $merchant_data
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|\Stripe\StripeObject $pending_request The pending authorization request. This field will only be non-null during an <code>issuing_authorization.request</code> webhook.
+ * @property \Stripe\StripeObject[] $request_history History of every time the authorization was approved/denied (whether approved/denied by you directly or by Stripe based on your <code>spending_controls</code>). If the merchant changes the authorization by performing an <a href="https://stripe.com/docs/issuing/purchases/authorizations">incremental authorization or partial capture</a>, you can look at this field to see the previous states of the authorization.
+ * @property string $status The current status of the authorization in its lifecycle.
+ * @property \Stripe\Issuing\Transaction[] $transactions List of <a href="https://stripe.com/docs/api/issuing/transactions">transactions</a> associated with this authorization.
+ * @property \Stripe\StripeObject $verification_data
+ * @property null|string $wallet What, if any, digital wallet was used for this authorization. One of <code>apple_pay</code>, <code>google_pay</code>, or <code>samsung_pay</code>.
  */
 class Authorization extends \Stripe\ApiResource
 {
-    const OBJECT_NAME = "issuing.authorization";
+    const OBJECT_NAME = 'issuing.authorization';
 
     use \Stripe\ApiOperations\All;
     use \Stripe\ApiOperations\Retrieve;
     use \Stripe\ApiOperations\Update;
 
     /**
-     * @param array|null $params
-     * @param array|string|null $options
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return Authorization The approved authorization.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return Authorization the approved authorization
      */
-    public function approve($params = null, $options = null)
+    public function approve($params = null, $opts = null)
     {
         $url = $this->instanceUrl() . '/approve';
-        list($response, $opts) = $this->_request('post', $url, $params, $options);
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
         $this->refreshFrom($response, $opts);
+
         return $this;
     }
 
     /**
-     * @param array|null $params
-     * @param array|string|null $options
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return Authorization The declined authorization.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return Authorization the declined authorization
      */
-    public function decline($params = null, $options = null)
+    public function decline($params = null, $opts = null)
     {
         $url = $this->instanceUrl() . '/decline';
-        list($response, $opts) = $this->_request('post', $url, $params, $options);
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
         $this->refreshFrom($response, $opts);
+
         return $this;
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Issuing/Card.php b/htdocs/includes/stripe/stripe-php/lib/Issuing/Card.php
index 60cc5b4e1bf..e0ac774e75d 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Issuing/Card.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Issuing/Card.php
@@ -1,33 +1,38 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe\Issuing;
 
 /**
- * Class Card
+ * You can <a href="https://stripe.com/docs/issuing/cards">create physical or
+ * virtual cards</a> that are issued to cardholders.
  *
- * @property string $id
- * @property string $object
- * @property mixed $authorization_controls
- * @property mixed $billing
- * @property string $brand
- * @property Cardholder $cardholder
- * @property int $created
- * @property string $currency
- * @property int $exp_month
- * @property int $exp_year
- * @property string $last4
- * @property bool $livemode
- * @property \Stripe\StripeObject $metadata
- * @property string $name
- * @property mixed $shipping
- * @property string $status
- * @property string $type
- *
- * @package Stripe\Issuing
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property string $brand The brand of the card.
+ * @property null|string $cancellation_reason The reason why the card was canceled.
+ * @property \Stripe\Issuing\Cardholder $cardholder <p>An Issuing <code>Cardholder</code> object represents an individual or business entity who is <a href="https://stripe.com/docs/issuing">issued</a> cards.</p><p>Related guide: <a href="https://stripe.com/docs/issuing/cards#create-cardholder">How to create a Cardholder</a></p>
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property string $cvc The card's CVC. For security reasons, this is only available for virtual cards, and will be omitted unless you explicitly request it with <a href="https://stripe.com/docs/api/expanding_objects">the <code>expand</code> parameter</a>. Additionally, it's only available via the <a href="https://stripe.com/docs/api/issuing/cards/retrieve">&quot;Retrieve a card&quot; endpoint</a>, not via &quot;List all cards&quot; or any other endpoint.
+ * @property int $exp_month The expiration month of the card.
+ * @property int $exp_year The expiration year of the card.
+ * @property string $last4 The last 4 digits of the card number.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property string $number The full unredacted card number. For security reasons, this is only available for virtual cards, and will be omitted unless you explicitly request it with <a href="https://stripe.com/docs/api/expanding_objects">the <code>expand</code> parameter</a>. Additionally, it's only available via the <a href="https://stripe.com/docs/api/issuing/cards/retrieve">&quot;Retrieve a card&quot; endpoint</a>, not via &quot;List all cards&quot; or any other endpoint.
+ * @property null|string|\Stripe\Issuing\Card $replaced_by The latest card that replaces this card, if any.
+ * @property null|string|\Stripe\Issuing\Card $replacement_for The card this card replaces, if any.
+ * @property null|string $replacement_reason The reason why the previous card needed to be replaced.
+ * @property null|\Stripe\StripeObject $shipping Where and how the card will be shipped.
+ * @property \Stripe\StripeObject $spending_controls
+ * @property string $status Whether authorizations can be approved on this card.
+ * @property string $type The type of the card.
  */
 class Card extends \Stripe\ApiResource
 {
-    const OBJECT_NAME = "issuing.card";
+    const OBJECT_NAME = 'issuing.card';
 
     use \Stripe\ApiOperations\All;
     use \Stripe\ApiOperations\Create;
@@ -35,17 +40,20 @@ class Card extends \Stripe\ApiResource
     use \Stripe\ApiOperations\Update;
 
     /**
-     * @param array|null $params
-     * @param array|string|null $options
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return CardDetails The card details associated with that issuing card.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Issuing\CardDetails the card details associated with that issuing card
      */
-    public function details($params = null, $options = null)
+    public function details($params = null, $opts = null)
     {
         $url = $this->instanceUrl() . '/details';
-        list($response, $opts) = $this->_request('get', $url, $params, $options);
+        list($response, $opts) = $this->_request('get', $url, $params, $opts);
         $obj = \Stripe\Util\Util::convertToStripeObject($response, $opts);
         $obj->setLastResponse($response);
+
         return $obj;
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Issuing/CardDetails.php b/htdocs/includes/stripe/stripe-php/lib/Issuing/CardDetails.php
index 65d3919caa4..98f4e0b87e5 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Issuing/CardDetails.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Issuing/CardDetails.php
@@ -3,7 +3,7 @@
 namespace Stripe\Issuing;
 
 /**
- * Class CardDetails
+ * Class CardDetails.
  *
  * @property string $id
  * @property string $object
@@ -12,10 +12,8 @@ namespace Stripe\Issuing;
  * @property int $exp_month
  * @property int $exp_year
  * @property string $number
- *
- * @package Stripe\Issuing
  */
 class CardDetails extends \Stripe\ApiResource
 {
-    const OBJECT_NAME = "issuing.card_details";
+    const OBJECT_NAME = 'issuing.card_details';
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Issuing/Cardholder.php b/htdocs/includes/stripe/stripe-php/lib/Issuing/Cardholder.php
index ed6c2920a5c..931b7ce8e30 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Issuing/Cardholder.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Issuing/Cardholder.php
@@ -1,27 +1,36 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe\Issuing;
 
 /**
- * Class Cardholder
+ * An Issuing <code>Cardholder</code> object represents an individual or business
+ * entity who is <a href="https://stripe.com/docs/issuing">issued</a> cards.
  *
- * @property string $id
- * @property string $object
- * @property mixed $billing
- * @property int $created
- * @property string $email
- * @property bool $livemode
- * @property \Stripe\StripeObject $metadata
- * @property string $name
- * @property string $phone_number
- * @property string $status
- * @property string $type
+ * Related guide: <a
+ * href="https://stripe.com/docs/issuing/cards#create-cardholder">How to create a
+ * Cardholder</a>
  *
- * @package Stripe\Issuing
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property \Stripe\StripeObject $billing
+ * @property null|\Stripe\StripeObject $company Additional information about a <code>company</code> cardholder.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string $email The cardholder's email address.
+ * @property null|\Stripe\StripeObject $individual Additional information about an <code>individual</code> cardholder.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property string $name The cardholder's name. This will be printed on cards issued to them.
+ * @property null|string $phone_number The cardholder's phone number.
+ * @property \Stripe\StripeObject $requirements
+ * @property null|\Stripe\StripeObject $spending_controls Rules that control spending across this cardholder's cards. Refer to our <a href="https://stripe.com/docs/issuing/controls/spending-controls">documentation</a> for more details.
+ * @property string $status Specifies whether to permit authorizations on this cardholder's cards.
+ * @property string $type One of <code>individual</code> or <code>company</code>.
  */
 class Cardholder extends \Stripe\ApiResource
 {
-    const OBJECT_NAME = "issuing.cardholder";
+    const OBJECT_NAME = 'issuing.cardholder';
 
     use \Stripe\ApiOperations\All;
     use \Stripe\ApiOperations\Create;
diff --git a/htdocs/includes/stripe/stripe-php/lib/Issuing/Dispute.php b/htdocs/includes/stripe/stripe-php/lib/Issuing/Dispute.php
index d0ae0d2e98f..5f24864b453 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Issuing/Dispute.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Issuing/Dispute.php
@@ -1,30 +1,53 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe\Issuing;
 
 /**
- * Class Dispute
+ * As a <a href="https://stripe.com/docs/issuing">card issuer</a>, you can dispute
+ * transactions that the cardholder does not recognize, suspects to be fraudulent,
+ * or has other issues with.
  *
- * @property string $id
- * @property string $object
- * @property int $amount
- * @property int $created
- * @property string $currency
- * @property mixed $evidence
- * @property bool $livemode
- * @property \Stripe\StripeObject $metadata
- * @property string $reason
- * @property string $status
- * @property Transaction $transaction
+ * Related guide: <a
+ * href="https://stripe.com/docs/issuing/purchases/disputes">Disputing
+ * Transactions</a>
  *
- * @package Stripe\Issuing
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Disputed amount. Usually the amount of the <code>disputed_transaction</code>, but can differ (usually because of currency fluctuation).
+ * @property null|\Stripe\BalanceTransaction[] $balance_transactions List of balance transactions associated with the dispute.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency The currency the <code>disputed_transaction</code> was made in.
+ * @property \Stripe\StripeObject $evidence
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property string $status Current status of the dispute.
+ * @property string|\Stripe\Issuing\Transaction $transaction The transaction being disputed.
  */
 class Dispute extends \Stripe\ApiResource
 {
-    const OBJECT_NAME = "issuing.dispute";
+    const OBJECT_NAME = 'issuing.dispute';
 
     use \Stripe\ApiOperations\All;
     use \Stripe\ApiOperations\Create;
     use \Stripe\ApiOperations\Retrieve;
     use \Stripe\ApiOperations\Update;
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return Dispute the submited dispute
+     */
+    public function submit($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/submit';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+
+        return $this;
+    }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Issuing/Transaction.php b/htdocs/includes/stripe/stripe-php/lib/Issuing/Transaction.php
index ea90818fd25..3c44d7ec17a 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Issuing/Transaction.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Issuing/Transaction.php
@@ -1,35 +1,43 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe\Issuing;
 
 /**
- * Class Transaction
+ * Any use of an <a href="https://stripe.com/docs/issuing">issued card</a> that
+ * results in funds entering or leaving your Stripe account, such as a completed
+ * purchase or refund, is represented by an Issuing <code>Transaction</code>
+ * object.
  *
- * @property string $id
- * @property string $object
- * @property int $amount
- * @property string $authorization
- * @property string $balance_transaction
- * @property string $card
- * @property string $cardholder
- * @property int $created
- * @property string $currency
- * @property string $dispute
- * @property bool $livemode
- * @property mixed $merchant_data
- * @property int $merchant_amount
- * @property string $merchant_currency
- * @property \Stripe\StripeObject $metadata
- * @property string $type
+ * Related guide: <a
+ * href="https://stripe.com/docs/issuing/purchases/transactions">Issued Card
+ * Transactions</a>.
  *
- * @package Stripe\Issuing
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount The transaction amount, which will be reflected in your balance. This amount is in your currency and in the <a href="https://stripe.com/docs/currencies#zero-decimal">smallest currency unit</a>.
+ * @property null|\Stripe\StripeObject $amount_details Detailed breakdown of amount components. These amounts are denominated in <code>currency</code> and in the <a href="https://stripe.com/docs/currencies#zero-decimal">smallest currency unit</a>.
+ * @property null|string|\Stripe\Issuing\Authorization $authorization The <code>Authorization</code> object that led to this transaction.
+ * @property null|string|\Stripe\BalanceTransaction $balance_transaction ID of the <a href="https://stripe.com/docs/api/balance_transactions">balance transaction</a> associated with this transaction.
+ * @property string|\Stripe\Issuing\Card $card The card used to make this transaction.
+ * @property null|string|\Stripe\Issuing\Cardholder $cardholder The cardholder to whom this transaction belongs.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|string|\Stripe\Issuing\Dispute $dispute If you've disputed the transaction, the ID of the dispute.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property int $merchant_amount The amount that the merchant will receive, denominated in <code>merchant_currency</code> and in the <a href="https://stripe.com/docs/currencies#zero-decimal">smallest currency unit</a>. It will be different from <code>amount</code> if the merchant is taking payment in a different currency.
+ * @property string $merchant_currency The currency with which the merchant is taking payment.
+ * @property \Stripe\StripeObject $merchant_data
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|\Stripe\StripeObject $purchase_details Additional purchase information that is optionally provided by the merchant.
+ * @property string $type The nature of the transaction.
  */
 class Transaction extends \Stripe\ApiResource
 {
-    const OBJECT_NAME = "issuing.transaction";
+    const OBJECT_NAME = 'issuing.transaction';
 
     use \Stripe\ApiOperations\All;
-    use \Stripe\ApiOperations\Create;
     use \Stripe\ApiOperations\Retrieve;
     use \Stripe\ApiOperations\Update;
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/LineItem.php b/htdocs/includes/stripe/stripe-php/lib/LineItem.php
new file mode 100644
index 00000000000..d3e55af2022
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/LineItem.php
@@ -0,0 +1,26 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe;
+
+/**
+ * A line item.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|int $amount_subtotal Total before any discounts or taxes is applied.
+ * @property null|int $amount_total Total after discounts and taxes.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property string $description An arbitrary string attached to the object. Often useful for displaying to users. Defaults to product name.
+ * @property \Stripe\StripeObject[] $discounts The discounts applied to the line item.
+ * @property \Stripe\Price $price <p>Prices define the unit cost, currency, and (optional) billing cycle for both recurring and one-time purchases of products. <a href="https://stripe.com/docs/api#products">Products</a> help you track inventory or provisioning, and prices help you track payment terms. Different physical goods or levels of service should be represented by products, and pricing options should be represented by prices. This approach lets you change prices without having to change your provisioning scheme.</p><p>For example, you might have a single &quot;gold&quot; product that has prices for $10/month, $100/year, and €9 once.</p><p>Related guides: <a href="https://stripe.com/docs/billing/subscriptions/set-up-subscription">Set up a subscription</a>, <a href="https://stripe.com/docs/billing/invoices/create">create an invoice</a>, and more about <a href="https://stripe.com/docs/billing/prices-guide">products and prices</a>.</p>
+ * @property null|int $quantity The quantity of products being purchased.
+ * @property \Stripe\StripeObject[] $taxes The taxes applied to the line item.
+ */
+class LineItem extends ApiResource
+{
+    const OBJECT_NAME = 'item';
+
+    use ApiOperations\All;
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/LoginLink.php b/htdocs/includes/stripe/stripe-php/lib/LoginLink.php
index 9f677364b17..3351356b8da 100644
--- a/htdocs/includes/stripe/stripe-php/lib/LoginLink.php
+++ b/htdocs/includes/stripe/stripe-php/lib/LoginLink.php
@@ -1,17 +1,15 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class LoginLink
- *
- * @property string $object
- * @property int $created
- * @property string $url
- *
- * @package Stripe
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $url The URL for the login link.
  */
 class LoginLink extends ApiResource
 {
-    const OBJECT_NAME = "login_link";
+    const OBJECT_NAME = 'login_link';
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Mandate.php b/htdocs/includes/stripe/stripe-php/lib/Mandate.php
new file mode 100644
index 00000000000..3452a014216
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Mandate.php
@@ -0,0 +1,27 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe;
+
+/**
+ * A Mandate is a record of the permission a customer has given you to debit their
+ * payment method.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property \Stripe\StripeObject $customer_acceptance
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $multi_use
+ * @property string|\Stripe\PaymentMethod $payment_method ID of the payment method associated with this mandate.
+ * @property \Stripe\StripeObject $payment_method_details
+ * @property \Stripe\StripeObject $single_use
+ * @property string $status The status of the mandate, which indicates whether it can be used to initiate a payment.
+ * @property string $type The type of the mandate.
+ */
+class Mandate extends ApiResource
+{
+    const OBJECT_NAME = 'mandate';
+
+    use ApiOperations\Retrieve;
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/OAuth.php b/htdocs/includes/stripe/stripe-php/lib/OAuth.php
index e9a82e62a0d..7b0886e3046 100644
--- a/htdocs/includes/stripe/stripe-php/lib/OAuth.php
+++ b/htdocs/includes/stripe/stripe-php/lib/OAuth.php
@@ -7,19 +7,19 @@ abstract class OAuth
     /**
      * Generates a URL to Stripe's OAuth form.
      *
-     * @param array|null $params
-     * @param array|null $opts
+     * @param null|array $params
+     * @param null|array $opts
      *
-     * @return string The URL to Stripe's OAuth form.
+     * @return string the URL to Stripe's OAuth form
      */
     public static function authorizeUrl($params = null, $opts = null)
     {
         $params = $params ?: [];
 
-        $base = ($opts && array_key_exists('connect_base', $opts)) ? $opts['connect_base'] : Stripe::$connectBase;
+        $base = ($opts && \array_key_exists('connect_base', $opts)) ? $opts['connect_base'] : Stripe::$connectBase;
 
         $params['client_id'] = self::_getClientId($params);
-        if (!array_key_exists('response_type', $params)) {
+        if (!\array_key_exists('response_type', $params)) {
             $params['response_type'] = 'code';
         }
         $query = Util\Util::encodeParameters($params);
@@ -31,14 +31,16 @@ abstract class OAuth
      * Use an authoriztion code to connect an account to your platform and
      * fetch the user's credentials.
      *
-     * @param array|null $params
-     * @param array|null $opts
+     * @param null|array $params
+     * @param null|array $opts
      *
-     * @return StripeObject Object containing the response from the API.
+     * @throws \Stripe\Exception\OAuth\OAuthErrorException if the request fails
+     *
+     * @return StripeObject object containing the response from the API
      */
     public static function token($params = null, $opts = null)
     {
-        $base = ($opts && array_key_exists('connect_base', $opts)) ? $opts['connect_base'] : Stripe::$connectBase;
+        $base = ($opts && \array_key_exists('connect_base', $opts)) ? $opts['connect_base'] : Stripe::$connectBase;
         $requestor = new ApiRequestor(null, $base);
         list($response, $apiKey) = $requestor->request(
             'post',
@@ -46,21 +48,24 @@ abstract class OAuth
             $params,
             null
         );
+
         return Util\Util::convertToStripeObject($response->json, $opts);
     }
 
     /**
      * Disconnects an account from your platform.
      *
-     * @param array|null $params
-     * @param array|null $opts
+     * @param null|array $params
+     * @param null|array $opts
      *
-     * @return StripeObject Object containing the response from the API.
+     * @throws \Stripe\Exception\OAuth\OAuthErrorException if the request fails
+     *
+     * @return StripeObject object containing the response from the API
      */
     public static function deauthorize($params = null, $opts = null)
     {
         $params = $params ?: [];
-        $base = ($opts && array_key_exists('connect_base', $opts)) ? $opts['connect_base'] : Stripe::$connectBase;
+        $base = ($opts && \array_key_exists('connect_base', $opts)) ? $opts['connect_base'] : Stripe::$connectBase;
         $requestor = new ApiRequestor(null, $base);
         $params['client_id'] = self::_getClientId($params);
         list($response, $apiKey) = $requestor->request(
@@ -69,16 +74,17 @@ abstract class OAuth
             $params,
             null
         );
+
         return Util\Util::convertToStripeObject($response->json, $opts);
     }
 
     private static function _getClientId($params = null)
     {
-        $clientId = ($params && array_key_exists('client_id', $params)) ? $params['client_id'] : null;
-        if ($clientId === null) {
+        $clientId = ($params && \array_key_exists('client_id', $params)) ? $params['client_id'] : null;
+        if (null === $clientId) {
             $clientId = Stripe::getClientId();
         }
-        if ($clientId === null) {
+        if (null === $clientId) {
             $msg = 'No client_id provided.  (HINT: set your client_id using '
               . '"Stripe::setClientId(<CLIENT-ID>)".  You can find your client_ids '
               . 'in your Stripe dashboard at '
@@ -86,8 +92,10 @@ abstract class OAuth
               . 'after registering your account as a platform. See '
               . 'https://stripe.com/docs/connect/standard-accounts for details, '
               . 'or email support@stripe.com if you have any questions.';
-            throw new Error\Authentication($msg);
+
+            throw new Exception\AuthenticationException($msg);
         }
+
         return $clientId;
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/OAuthErrorObject.php b/htdocs/includes/stripe/stripe-php/lib/OAuthErrorObject.php
new file mode 100644
index 00000000000..620c5bb27d4
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/OAuthErrorObject.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class OAuthErrorObject.
+ *
+ * @property string $error
+ * @property string $error_description
+ */
+class OAuthErrorObject extends StripeObject
+{
+    /**
+     * Refreshes this object using the provided values.
+     *
+     * @param array $values
+     * @param null|array|string|Util\RequestOptions $opts
+     * @param bool $partial defaults to false
+     */
+    public function refreshFrom($values, $opts, $partial = false)
+    {
+        // Unlike most other API resources, the API will omit attributes in
+        // error objects when they have a null value. We manually set default
+        // values here to facilitate generic error handling.
+        $values = \array_merge([
+            'error' => null,
+            'error_description' => null,
+        ], $values);
+        parent::refreshFrom($values, $opts, $partial);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Order.php b/htdocs/includes/stripe/stripe-php/lib/Order.php
index 1f2ce2563ac..fd3630edb8c 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Order.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Order.php
@@ -1,39 +1,45 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class Order
+ * Order objects are created to handle end customers' purchases of previously
+ * defined <a href="https://stripe.com/docs/api#products">products</a>. You can
+ * create, retrieve, and pay individual orders, as well as list all orders. Orders
+ * are identified by a unique, random ID.
  *
- * @property string $id
- * @property string $object
- * @property int $amount
- * @property int $amount_returned
- * @property string $application
- * @property int $application_fee
- * @property string $charge
- * @property int $created
- * @property string $currency
- * @property string $customer
- * @property string $email
- * @property string $external_coupon_code
- * @property OrderItem[] $items
- * @property bool $livemode
- * @property StripeObject $metadata
- * @property Collection $returns
- * @property string $selected_shipping_method
- * @property mixed $shipping
- * @property array $shipping_methods
- * @property string $status
- * @property mixed $status_transitions
- * @property int $updated
- * @property string $upstream_id
+ * Related guide: <a href="https://stripe.com/docs/orders">Tax, Shipping, and
+ * Inventory</a>.
  *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount A positive integer in the smallest currency unit (that is, 100 cents for $1.00, or 1 for ¥1, Japanese Yen being a zero-decimal currency) representing the total amount for the order.
+ * @property null|int $amount_returned The total amount that was returned to the customer.
+ * @property null|string $application ID of the Connect Application that created the order.
+ * @property null|int $application_fee A fee in cents that will be applied to the order and transferred to the application owner’s Stripe account. The request must be made with an OAuth key or the Stripe-Account header in order to take an application fee. For more information, see the application fees documentation.
+ * @property null|string|\Stripe\Charge $charge The ID of the payment used to pay for the order. Present if the order status is <code>paid</code>, <code>fulfilled</code>, or <code>refunded</code>.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|string|\Stripe\Customer $customer The customer used for the order.
+ * @property null|string $email The email address of the customer placing the order.
+ * @property string $external_coupon_code External coupon code to load for this order.
+ * @property \Stripe\OrderItem[] $items List of items constituting the order. An order can have up to 25 items.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|\Stripe\Collection $returns A list of returns that have taken place for this order.
+ * @property null|string $selected_shipping_method The shipping method that is currently selected for this order, if any. If present, it is equal to one of the <code>id</code>s of shipping methods in the <code>shipping_methods</code> array. At order creation time, if there are multiple shipping methods, Stripe will automatically selected the first method.
+ * @property null|\Stripe\StripeObject $shipping The shipping address for the order. Present if the order is for goods to be shipped.
+ * @property null|\Stripe\StripeObject[] $shipping_methods A list of supported shipping methods for this order. The desired shipping method can be specified either by updating the order, or when paying it.
+ * @property string $status Current order status. One of <code>created</code>, <code>paid</code>, <code>canceled</code>, <code>fulfilled</code>, or <code>returned</code>. More details in the <a href="https://stripe.com/docs/orders/guide#understanding-order-statuses">Orders Guide</a>.
+ * @property null|\Stripe\StripeObject $status_transitions The timestamps at which the order status was updated.
+ * @property null|int $updated Time at which the object was last updated. Measured in seconds since the Unix epoch.
+ * @property string $upstream_id The user's order ID if it is different from the Stripe order ID.
  */
 class Order extends ApiResource
 {
-    const OBJECT_NAME = "order";
+    const OBJECT_NAME = 'order';
 
     use ApiOperations\All;
     use ApiOperations\Create;
@@ -41,23 +47,35 @@ class Order extends ApiResource
     use ApiOperations\Update;
 
     /**
-     * @return Order The paid order.
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\OrderReturn the newly created return
+     */
+    public function returnOrder($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/returns';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+
+        return Util\Util::convertToStripeObject($response, $opts);
+    }
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return Order the paid order
      */
     public function pay($params = null, $opts = null)
     {
         $url = $this->instanceUrl() . '/pay';
         list($response, $opts) = $this->_request('post', $url, $params, $opts);
         $this->refreshFrom($response, $opts);
+
         return $this;
     }
-
-    /**
-     * @return OrderReturn The newly created return.
-     */
-    public function returnOrder($params = null, $opts = null)
-    {
-        $url = $this->instanceUrl() . '/returns';
-        list($response, $opts) = $this->_request('post', $url, $params, $opts);
-        return Util\Util::convertToStripeObject($response, $opts);
-    }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/OrderItem.php b/htdocs/includes/stripe/stripe-php/lib/OrderItem.php
index 6ef1242fc34..e2e6e39a287 100644
--- a/htdocs/includes/stripe/stripe-php/lib/OrderItem.php
+++ b/htdocs/includes/stripe/stripe-php/lib/OrderItem.php
@@ -3,7 +3,7 @@
 namespace Stripe;
 
 /**
- * Class OrderItem
+ * Class OrderItem.
  *
  * @property string $object
  * @property int $amount
@@ -12,10 +12,8 @@ namespace Stripe;
  * @property string $parent
  * @property int $quantity
  * @property string $type
- *
- * @package Stripe
  */
 class OrderItem extends StripeObject
 {
-    const OBJECT_NAME = "order_item";
+    const OBJECT_NAME = 'order_item';
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/OrderReturn.php b/htdocs/includes/stripe/stripe-php/lib/OrderReturn.php
index 3b1ca8efa12..3774482d0dd 100644
--- a/htdocs/includes/stripe/stripe-php/lib/OrderReturn.php
+++ b/htdocs/includes/stripe/stripe-php/lib/OrderReturn.php
@@ -1,25 +1,31 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class OrderReturn
+ * A return represents the full or partial return of a number of <a
+ * href="https://stripe.com/docs/api#order_items">order items</a>. Returns always
+ * belong to an order, and may optionally contain a refund.
  *
- * @property string $id
- * @property string $object
- * @property int $amount
- * @property int $created
- * @property string $currency
- * @property OrderItem[] $items
- * @property bool $livemode
- * @property string $order
- * @property string $refund
+ * Related guide: <a
+ * href="https://stripe.com/docs/orders/guide#handling-returns">Handling
+ * Returns</a>.
  *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount A positive integer in the smallest currency unit (that is, 100 cents for $1.00, or 1 for ¥1, Japanese Yen being a zero-decimal currency) representing the total amount for the returned line item.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property \Stripe\OrderItem[] $items The items included in this order return.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|string|\Stripe\Order $order The order that this return includes items from.
+ * @property null|string|\Stripe\Refund $refund The ID of the refund issued for this return.
  */
 class OrderReturn extends ApiResource
 {
-    const OBJECT_NAME = "order_return";
+    const OBJECT_NAME = 'order_return';
 
     use ApiOperations\All;
     use ApiOperations\Retrieve;
diff --git a/htdocs/includes/stripe/stripe-php/lib/PaymentIntent.php b/htdocs/includes/stripe/stripe-php/lib/PaymentIntent.php
index b70b1577899..2d204e9da4a 100644
--- a/htdocs/includes/stripe/stripe-php/lib/PaymentIntent.php
+++ b/htdocs/includes/stripe/stripe-php/lib/PaymentIntent.php
@@ -1,106 +1,125 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class PaymentIntent
+ * A PaymentIntent guides you through the process of collecting a payment from your
+ * customer. We recommend that you create exactly one PaymentIntent for each order
+ * or customer session in your system. You can reference the PaymentIntent later to
+ * see the history of payment attempts for a particular session.
  *
- * @property string $id
- * @property string $object
- * @property int $amount
- * @property int $amount_capturable
- * @property int $amount_received
- * @property string $application
- * @property int $application_fee_amount
- * @property int $canceled_at
- * @property string $cancellation_reason
- * @property string $capture_method
- * @property Collection $charges
- * @property string $client_secret
+ * A PaymentIntent transitions through <a
+ * href="https://stripe.com/docs/payments/intents#intent-statuses">multiple
+ * statuses</a> throughout its lifetime as it interfaces with Stripe.js to perform
+ * authentication flows and ultimately creates at most one successful charge.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/payments/payment-intents">Payment Intents API</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Amount intended to be collected by this PaymentIntent. A positive integer representing how much to charge in the <a href="https://stripe.com/docs/currencies#zero-decimal">smallest currency unit</a> (e.g., 100 cents to charge $1.00 or 100 to charge ¥100, a zero-decimal currency). The minimum amount is $0.50 US or <a href="https://stripe.com/docs/currencies#minimum-and-maximum-charge-amounts">equivalent in charge currency</a>. The amount value supports up to eight digits (e.g., a value of 99999999 for a USD charge of $999,999.99).
+ * @property int $amount_capturable Amount that can be captured from this PaymentIntent.
+ * @property int $amount_received Amount that was collected by this PaymentIntent.
+ * @property null|string|\Stripe\StripeObject $application ID of the Connect application that created the PaymentIntent.
+ * @property null|int $application_fee_amount The amount of the application fee (if any) that will be requested to be applied to the payment and transferred to the application owner's Stripe account. The amount of the application fee collected will be capped at the total payment amount. For more information, see the PaymentIntents <a href="https://stripe.com/docs/payments/connected-accounts">use case for connected accounts</a>.
+ * @property null|int $canceled_at Populated when <code>status</code> is <code>canceled</code>, this is the time at which the PaymentIntent was canceled. Measured in seconds since the Unix epoch.
+ * @property null|string $cancellation_reason Reason for cancellation of this PaymentIntent, either user-provided (<code>duplicate</code>, <code>fraudulent</code>, <code>requested_by_customer</code>, or <code>abandoned</code>) or generated by Stripe internally (<code>failed_invoice</code>, <code>void_invoice</code>, or <code>automatic</code>).
+ * @property string $capture_method Controls when the funds will be captured from the customer's account.
+ * @property \Stripe\Collection $charges Charges that were created by this PaymentIntent, if any.
+ * @property null|string $client_secret <p>The client secret of this PaymentIntent. Used for client-side retrieval using a publishable key.</p><p>The client secret can be used to complete a payment from your frontend. It should not be stored, logged, embedded in URLs, or exposed to anyone other than the customer. Make sure that you have TLS enabled on any page that includes the client secret.</p><p>Refer to our docs to <a href="https://stripe.com/docs/payments/accept-a-payment?integration=elements">accept a payment</a> and learn about how <code>client_secret</code> should be handled.</p>
  * @property string $confirmation_method
- * @property int $created
- * @property string $currency
- * @property string $customer
- * @property string $description
- * @property mixed $last_payment_error
- * @property bool $livemode
- * @property StripeObject $metadata
- * @property mixed $next_action
- * @property string $on_behalf_of
- * @property string $payment_method
- * @property string[] $payment_method_types
- * @property string $receipt_email
- * @property string $review
- * @property mixed $shipping
- * @property string $source
- * @property string $statement_descriptor
- * @property string $status
- * @property mixed $transfer_data
- * @property string $transfer_group
- *
- * @package Stripe
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|string|\Stripe\Customer $customer <p>ID of the Customer this PaymentIntent belongs to, if one exists.</p><p>Payment methods attached to other Customers cannot be used with this PaymentIntent.</p><p>If present in combination with <a href="https://stripe.com/docs/api#payment_intent_object-setup_future_usage">setup_future_usage</a>, this PaymentIntent's payment method will be attached to the Customer after the PaymentIntent has been confirmed and any required actions from the user are complete.</p>
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property null|string|\Stripe\Invoice $invoice ID of the invoice that created this PaymentIntent, if it exists.
+ * @property null|\Stripe\ErrorObject $last_payment_error The payment error encountered in the previous PaymentIntent confirmation. It will be cleared if the PaymentIntent is later updated for any reason.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format. For more information, see the <a href="https://stripe.com/docs/payments/payment-intents/creating-payment-intents#storing-information-in-metadata">documentation</a>.
+ * @property null|\Stripe\StripeObject $next_action If present, this property tells you what actions you need to take in order for your customer to fulfill a payment using the provided source.
+ * @property null|string|\Stripe\Account $on_behalf_of The account (if any) for which the funds of the PaymentIntent are intended. See the PaymentIntents <a href="https://stripe.com/docs/payments/connected-accounts">use case for connected accounts</a> for details.
+ * @property null|string|\Stripe\PaymentMethod $payment_method ID of the payment method used in this PaymentIntent.
+ * @property null|\Stripe\StripeObject $payment_method_options Payment-method-specific configuration for this PaymentIntent.
+ * @property string[] $payment_method_types The list of payment method types (e.g. card) that this PaymentIntent is allowed to use.
+ * @property null|string $receipt_email Email address that the receipt for the resulting payment will be sent to. If <code>receipt_email</code> is specified for a payment in live mode, a receipt will be sent regardless of your <a href="https://dashboard.stripe.com/account/emails">email settings</a>.
+ * @property null|string|\Stripe\Review $review ID of the review associated with this PaymentIntent, if any.
+ * @property null|string $setup_future_usage <p>Indicates that you intend to make future payments with this PaymentIntent's payment method.</p><p>Providing this parameter will <a href="https://stripe.com/docs/payments/save-during-payment">attach the payment method</a> to the PaymentIntent's Customer, if present, after the PaymentIntent is confirmed and any required actions from the user are complete. If no Customer was provided, the payment method can still be <a href="https://stripe.com/docs/api/payment_methods/attach">attached</a> to a Customer after the transaction completes.</p><p>When processing card payments, Stripe also uses <code>setup_future_usage</code> to dynamically optimize your payment flow and comply with regional legislation and network rules, such as <a href="https://stripe.com/docs/strong-customer-authentication">SCA</a>.</p>
+ * @property null|\Stripe\StripeObject $shipping Shipping information for this PaymentIntent.
+ * @property null|string|\Stripe\Account|\Stripe\AlipayAccount|\Stripe\BankAccount|\Stripe\BitcoinReceiver|\Stripe\Card|\Stripe\Source $source This is a legacy field that will be removed in the future. It is the ID of the Source object that is associated with this PaymentIntent, if one was supplied.
+ * @property null|string $statement_descriptor For non-card charges, you can use this value as the complete description that appears on your customers’ statements. Must contain at least one letter, maximum 22 characters.
+ * @property null|string $statement_descriptor_suffix Provides information about a card payment that customers see on their statements. Concatenated with the prefix (shortened descriptor) or statement descriptor that’s set on the account to form the complete statement descriptor. Maximum 22 characters for the concatenated descriptor.
+ * @property string $status Status of this PaymentIntent, one of <code>requires_payment_method</code>, <code>requires_confirmation</code>, <code>requires_action</code>, <code>processing</code>, <code>requires_capture</code>, <code>canceled</code>, or <code>succeeded</code>. Read more about each PaymentIntent <a href="https://stripe.com/docs/payments/intents#intent-statuses">status</a>.
+ * @property null|\Stripe\StripeObject $transfer_data The data with which to automatically create a Transfer when the payment is finalized. See the PaymentIntents <a href="https://stripe.com/docs/payments/connected-accounts">use case for connected accounts</a> for details.
+ * @property null|string $transfer_group A string that identifies the resulting payment as part of a group. See the PaymentIntents <a href="https://stripe.com/docs/payments/connected-accounts">use case for connected accounts</a> for details.
  */
 class PaymentIntent extends ApiResource
 {
-    const OBJECT_NAME = "payment_intent";
+    const OBJECT_NAME = 'payment_intent';
 
     use ApiOperations\All;
     use ApiOperations\Create;
     use ApiOperations\Retrieve;
     use ApiOperations\Update;
 
-    /**
-     * These constants are possible representations of the status field.
-     *
-     * @link https://stripe.com/docs/api/payment_intents/object#payment_intent_object-status
-     */
-    const STATUS_CANCELED                = 'canceled';
-    const STATUS_PROCESSING              = 'processing';
-    const STATUS_REQUIRES_ACTION         = 'requires_action';
-    const STATUS_REQUIRES_CAPTURE        = 'requires_capture';
-    const STATUS_REQUIRES_CONFIRMATION   = 'requires_confirmation';
+    const STATUS_CANCELED = 'canceled';
+    const STATUS_PROCESSING = 'processing';
+    const STATUS_REQUIRES_ACTION = 'requires_action';
+    const STATUS_REQUIRES_CAPTURE = 'requires_capture';
+    const STATUS_REQUIRES_CONFIRMATION = 'requires_confirmation';
     const STATUS_REQUIRES_PAYMENT_METHOD = 'requires_payment_method';
-    const STATUS_SUCCEEDED               = 'succeeded';
+    const STATUS_SUCCEEDED = 'succeeded';
 
     /**
-     * @param array|null $params
-     * @param array|string|null $options
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return PaymentIntent The canceled payment intent.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return PaymentIntent the canceled payment intent
      */
-    public function cancel($params = null, $options = null)
+    public function cancel($params = null, $opts = null)
     {
         $url = $this->instanceUrl() . '/cancel';
-        list($response, $opts) = $this->_request('post', $url, $params, $options);
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
         $this->refreshFrom($response, $opts);
+
         return $this;
     }
 
     /**
-     * @param array|null $params
-     * @param array|string|null $options
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return PaymentIntent The captured payment intent.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return PaymentIntent the captured payment intent
      */
-    public function capture($params = null, $options = null)
+    public function capture($params = null, $opts = null)
     {
         $url = $this->instanceUrl() . '/capture';
-        list($response, $opts) = $this->_request('post', $url, $params, $options);
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
         $this->refreshFrom($response, $opts);
+
         return $this;
     }
 
     /**
-     * @param array|null $params
-     * @param array|string|null $options
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return PaymentIntent The confirmed payment intent.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return PaymentIntent the confirmed payment intent
      */
-    public function confirm($params = null, $options = null)
+    public function confirm($params = null, $opts = null)
     {
         $url = $this->instanceUrl() . '/confirm';
-        list($response, $opts) = $this->_request('post', $url, $params, $options);
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
         $this->refreshFrom($response, $opts);
+
         return $this;
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/PaymentMethod.php b/htdocs/includes/stripe/stripe-php/lib/PaymentMethod.php
index c0557e8c394..d9c9e2b52cc 100644
--- a/htdocs/includes/stripe/stripe-php/lib/PaymentMethod.php
+++ b/htdocs/includes/stripe/stripe-php/lib/PaymentMethod.php
@@ -1,28 +1,49 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class PaymentMethod
+ * PaymentMethod objects represent your customer's payment instruments. They can be
+ * used with <a
+ * href="https://stripe.com/docs/payments/payment-intents">PaymentIntents</a> to
+ * collect payments or saved to Customer objects to store instrument details for
+ * future payments.
  *
- * @property string $id
- * @property string $object
- * @property mixed $billing_details
- * @property mixed $card
- * @property mixed $card_present
- * @property int $created
- * @property string $customer
- * @property mixed $ideal
- * @property bool $livemode
- * @property StripeObject $metadata
- * @property mixed $sepa_debit
- * @property string $type
+ * Related guides: <a
+ * href="https://stripe.com/docs/payments/payment-methods">Payment Methods</a> and
+ * <a href="https://stripe.com/docs/payments/more-payment-scenarios">More Payment
+ * Scenarios</a>.
  *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property \Stripe\StripeObject $alipay
+ * @property \Stripe\StripeObject $au_becs_debit
+ * @property \Stripe\StripeObject $bacs_debit
+ * @property \Stripe\StripeObject $bancontact
+ * @property \Stripe\StripeObject $billing_details
+ * @property \Stripe\StripeObject $card
+ * @property \Stripe\StripeObject $card_present
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string|\Stripe\Customer $customer The ID of the Customer to which this PaymentMethod is saved. This will not be set when the PaymentMethod has not been saved to a Customer.
+ * @property \Stripe\StripeObject $eps
+ * @property \Stripe\StripeObject $fpx
+ * @property \Stripe\StripeObject $giropay
+ * @property \Stripe\StripeObject $grabpay
+ * @property \Stripe\StripeObject $ideal
+ * @property \Stripe\StripeObject $interac_present
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property \Stripe\StripeObject $oxxo
+ * @property \Stripe\StripeObject $p24
+ * @property \Stripe\StripeObject $sepa_debit
+ * @property \Stripe\StripeObject $sofort
+ * @property string $type The type of the PaymentMethod. An additional hash is included on the PaymentMethod with a name matching this value. It contains additional information specific to the PaymentMethod type.
  */
 class PaymentMethod extends ApiResource
 {
-    const OBJECT_NAME = "payment_method";
+    const OBJECT_NAME = 'payment_method';
 
     use ApiOperations\All;
     use ApiOperations\Create;
@@ -30,30 +51,36 @@ class PaymentMethod extends ApiResource
     use ApiOperations\Update;
 
     /**
-     * @param array|null $params
-     * @param array|string|null $opts
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return PaymentMethod The attached payment method.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return PaymentMethod the attached payment method
      */
     public function attach($params = null, $opts = null)
     {
         $url = $this->instanceUrl() . '/attach';
         list($response, $opts) = $this->_request('post', $url, $params, $opts);
         $this->refreshFrom($response, $opts);
+
         return $this;
     }
 
     /**
-     * @param array|null $params
-     * @param array|string|null $opts
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return PaymentMethod The detached payment method.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return PaymentMethod the detached payment method
      */
     public function detach($params = null, $opts = null)
     {
         $url = $this->instanceUrl() . '/detach';
         list($response, $opts) = $this->_request('post', $url, $params, $opts);
         $this->refreshFrom($response, $opts);
+
         return $this;
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Payout.php b/htdocs/includes/stripe/stripe-php/lib/Payout.php
index 131bd4ae06d..46f86181e4b 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Payout.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Payout.php
@@ -1,92 +1,108 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class Payout
+ * A <code>Payout</code> object is created when you receive funds from Stripe, or
+ * when you initiate a payout to either a bank account or debit card of a <a
+ * href="/docs/connect/bank-debit-card-payouts">connected Stripe account</a>. You
+ * can retrieve individual payouts, as well as list all payouts. Payouts are made
+ * on <a href="/docs/connect/manage-payout-schedule">varying schedules</a>,
+ * depending on your country and industry.
  *
- * @property string $id
- * @property string $object
- * @property int $amount
- * @property int $arrival_date
- * @property bool $automatic
- * @property string $balance_transaction
- * @property int $created
- * @property string $currency
- * @property string $description
- * @property string $destination
- * @property string $failure_balance_transaction
- * @property string $failure_code
- * @property string $failure_message
- * @property bool $livemode
- * @property StripeObject $metadata
- * @property string $method
- * @property string $source_type
- * @property string $statement_descriptor
- * @property string $status
- * @property string $type
+ * Related guide: <a href="https://stripe.com/docs/payouts">Receiving Payouts</a>.
  *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Amount (in %s) to be transferred to your bank account or debit card.
+ * @property int $arrival_date Date the payout is expected to arrive in the bank. This factors in delays like weekends or bank holidays.
+ * @property bool $automatic Returns <code>true</code> if the payout was created by an <a href="https://stripe.com/docs/payouts#payout-schedule">automated payout schedule</a>, and <code>false</code> if it was <a href="https://stripe.com/docs/payouts#manual-payouts">requested manually</a>.
+ * @property null|string|\Stripe\BalanceTransaction $balance_transaction ID of the balance transaction that describes the impact of this payout on your account balance.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property null|string|\Stripe\BankAccount|\Stripe\Card $destination ID of the bank account or card the payout was sent to.
+ * @property null|string|\Stripe\BalanceTransaction $failure_balance_transaction If the payout failed or was canceled, this will be the ID of the balance transaction that reversed the initial balance transaction, and puts the funds from the failed payout back in your balance.
+ * @property null|string $failure_code Error code explaining reason for payout failure if available. See <a href="https://stripe.com/docs/api#payout_failures">Types of payout failures</a> for a list of failure codes.
+ * @property null|string $failure_message Message to user further explaining reason for payout failure if available.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property string $method The method used to send this payout, which can be <code>standard</code> or <code>instant</code>. <code>instant</code> is only supported for payouts to debit cards. (See <a href="https://stripe.com/blog/instant-payouts-for-marketplaces">Instant payouts for marketplaces</a> for more information.)
+ * @property null|string|\Stripe\Payout $original_payout If the payout reverses another, this is the ID of the original payout.
+ * @property null|string|\Stripe\Payout $reversed_by If the payout was reversed, this is the ID of the payout that reverses this payout.
+ * @property string $source_type The source balance this payout came from. One of <code>card</code>, <code>fpx</code>, or <code>bank_account</code>.
+ * @property null|string $statement_descriptor Extra information about a payout to be displayed on the user's bank statement.
+ * @property string $status Current status of the payout: <code>paid</code>, <code>pending</code>, <code>in_transit</code>, <code>canceled</code> or <code>failed</code>. A payout is <code>pending</code> until it is submitted to the bank, when it becomes <code>in_transit</code>. The status then changes to <code>paid</code> if the transaction goes through, or to <code>failed</code> or <code>canceled</code> (within 5 business days). Some failed payouts may initially show as <code>paid</code> but then change to <code>failed</code>.
+ * @property string $type Can be <code>bank_account</code> or <code>card</code>.
  */
 class Payout extends ApiResource
 {
-    const OBJECT_NAME = "payout";
+    const OBJECT_NAME = 'payout';
 
     use ApiOperations\All;
     use ApiOperations\Create;
     use ApiOperations\Retrieve;
     use ApiOperations\Update;
 
-    /**
-     * Types of payout failure codes.
-     * @link https://stripe.com/docs/api#payout_failures
-     */
-    const FAILURE_ACCOUNT_CLOSED                = 'account_closed';
-    const FAILURE_ACCOUNT_FROZEN                = 'account_frozen';
-    const FAILURE_BANK_ACCOUNT_RESTRICTED       = 'bank_account_restricted';
-    const FAILURE_BANK_OWNERSHIP_CHANGED        = 'bank_ownership_changed';
-    const FAILURE_COULD_NOT_PROCESS             = 'could_not_process';
-    const FAILURE_DEBIT_NOT_AUTHORIZED          = 'debit_not_authorized';
-    const FAILURE_DECLINED                      = 'declined';
+    const FAILURE_ACCOUNT_CLOSED = 'account_closed';
+    const FAILURE_ACCOUNT_FROZEN = 'account_frozen';
+    const FAILURE_BANK_ACCOUNT_RESTRICTED = 'bank_account_restricted';
+    const FAILURE_BANK_OWNERSHIP_CHANGED = 'bank_ownership_changed';
+    const FAILURE_COULD_NOT_PROCESS = 'could_not_process';
+    const FAILURE_DEBIT_NOT_AUTHORIZED = 'debit_not_authorized';
+    const FAILURE_DECLINED = 'declined';
     const FAILURE_INCORRECT_ACCOUNT_HOLDER_NAME = 'incorrect_account_holder_name';
-    const FAILURE_INSUFFICIENT_FUNDS            = 'insufficient_funds';
-    const FAILURE_INVALID_ACCOUNT_NUMBER        = 'invalid_account_number';
-    const FAILURE_INVALID_CURRENCY              = 'invalid_currency';
-    const FAILURE_NO_ACCOUNT                    = 'no_account';
-    const FAILURE_UNSUPPORTED_CARD              = 'unsupported_card';
+    const FAILURE_INSUFFICIENT_FUNDS = 'insufficient_funds';
+    const FAILURE_INVALID_ACCOUNT_NUMBER = 'invalid_account_number';
+    const FAILURE_INVALID_CURRENCY = 'invalid_currency';
+    const FAILURE_NO_ACCOUNT = 'no_account';
+    const FAILURE_UNSUPPORTED_CARD = 'unsupported_card';
 
-    /**
-     * Possible string representations of the payout methods.
-     * @link https://stripe.com/docs/api/payouts/object#payout_object-method
-     */
+    const METHOD_INSTANT = 'instant';
     const METHOD_STANDARD = 'standard';
-    const METHOD_INSTANT  = 'instant';
 
-    /**
-     * Possible string representations of the status of the payout.
-     * @link https://stripe.com/docs/api/payouts/object#payout_object-status
-     */
-    const STATUS_CANCELED   = 'canceled';
+    const STATUS_CANCELED = 'canceled';
+    const STATUS_FAILED = 'failed';
     const STATUS_IN_TRANSIT = 'in_transit';
-    const STATUS_FAILED     = 'failed';
-    const STATUS_PAID       = 'paid';
-    const STATUS_PENDING    = 'pending';
+    const STATUS_PAID = 'paid';
+    const STATUS_PENDING = 'pending';
 
-    /**
-     * Possible string representations of the type of payout.
-     * @link https://stripe.com/docs/api/payouts/object#payout_object-type
-     */
     const TYPE_BANK_ACCOUNT = 'bank_account';
-    const TYPE_CARD         = 'card';
+    const TYPE_CARD = 'card';
 
     /**
-     * @return Payout The canceled payout.
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return Payout the canceled payout
      */
-    public function cancel()
+    public function cancel($params = null, $opts = null)
     {
         $url = $this->instanceUrl() . '/cancel';
-        list($response, $opts) = $this->_request('post', $url);
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
         $this->refreshFrom($response, $opts);
+
+        return $this;
+    }
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return Payout the reversed payout
+     */
+    public function reverse($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/reverse';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+
         return $this;
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Person.php b/htdocs/includes/stripe/stripe-php/lib/Person.php
index 5540f7c5f28..151870a86f7 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Person.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Person.php
@@ -1,71 +1,70 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class Person
+ * This is an object representing a person associated with a Stripe account.
  *
- * @package Stripe
+ * Related guide: <a
+ * href="https://stripe.com/docs/connect/identity-verification-api#person-information">Handling
+ * Identity Verification with the API</a>.
  *
- * @property string $id
- * @property string $object
- * @property string $account
- * @property mixed $address
- * @property mixed $address_kana
- * @property mixed $address_kanji
- * @property int $created
- * @property bool $deleted
- * @property mixed $dob
- * @property string $email
- * @property string $first_name
- * @property string $first_name_kana
- * @property string $first_name_kanji
- * @property string $gender
- * @property bool $id_number_provided
- * @property string $last_name
- * @property string $last_name_kana
- * @property string $last_name_kanji
- * @property string $maiden_name
- * @property StripeObject $metadata
- * @property string $phone
- * @property mixed $relationship
- * @property mixed $requirements
- * @property bool $ssn_last_4_provided
- * @property mixed $verification
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property string $account The account the person is associated with.
+ * @property \Stripe\StripeObject $address
+ * @property null|\Stripe\StripeObject $address_kana The Kana variation of the person's address (Japan only).
+ * @property null|\Stripe\StripeObject $address_kanji The Kanji variation of the person's address (Japan only).
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property \Stripe\StripeObject $dob
+ * @property null|string $email The person's email address.
+ * @property null|string $first_name The person's first name.
+ * @property null|string $first_name_kana The Kana variation of the person's first name (Japan only).
+ * @property null|string $first_name_kanji The Kanji variation of the person's first name (Japan only).
+ * @property null|string $gender The person's gender (International regulations require either &quot;male&quot; or &quot;female&quot;).
+ * @property bool $id_number_provided Whether the person's <code>id_number</code> was provided.
+ * @property null|string $last_name The person's last name.
+ * @property null|string $last_name_kana The Kana variation of the person's last name (Japan only).
+ * @property null|string $last_name_kanji The Kanji variation of the person's last name (Japan only).
+ * @property null|string $maiden_name The person's maiden name.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string $phone The person's phone number.
+ * @property string $political_exposure Indicates if the person or any of their representatives, family members, or other closely related persons, declares that they hold or have held an important public job or function, in any jurisdiction.
+ * @property \Stripe\StripeObject $relationship
+ * @property null|\Stripe\StripeObject $requirements Information about the requirements for this person, including what information needs to be collected, and by when.
+ * @property bool $ssn_last_4_provided Whether the last four digits of the person's Social Security number have been provided (U.S. only).
+ * @property \Stripe\StripeObject $verification
  */
 class Person extends ApiResource
 {
-    const OBJECT_NAME = "person";
+    const OBJECT_NAME = 'person';
 
     use ApiOperations\Delete;
     use ApiOperations\Update;
 
-    /**
-     * Possible string representations of a person's gender.
-     * @link https://stripe.com/docs/api/persons/object#person_object-gender
-     */
-    const GENDER_MALE   = 'male';
     const GENDER_FEMALE = 'female';
+    const GENDER_MALE = 'male';
 
-    /**
-     * Possible string representations of a person's verification status.
-     * @link https://stripe.com/docs/api/persons/object#person_object-verification-status
-     */
-    const VERIFICATION_STATUS_PENDING    = 'pending';
+    const POLITICAL_EXPOSURE_EXISTING = 'existing';
+    const POLITICAL_EXPOSURE_NONE = 'none';
+
+    const VERIFICATION_STATUS_PENDING = 'pending';
     const VERIFICATION_STATUS_UNVERIFIED = 'unverified';
-    const VERIFICATION_STATUS_VERIFIED   = 'verified';
+    const VERIFICATION_STATUS_VERIFIED = 'verified';
 
     /**
-     * @return string The API URL for this Stripe account reversal.
+     * @return string the API URL for this Stripe account reversal
      */
     public function instanceUrl()
     {
         $id = $this['id'];
         $account = $this['account'];
         if (!$id) {
-            throw new Error\InvalidRequest(
-                "Could not determine which URL to request: " .
-                "class instance has invalid ID: $id",
+            throw new Exception\UnexpectedValueException(
+                'Could not determine which URL to request: ' .
+                "class instance has invalid ID: {$id}",
                 null
             );
         }
@@ -73,35 +72,40 @@ class Person extends ApiResource
         $account = Util\Util::utf8($account);
 
         $base = Account::classUrl();
-        $accountExtn = urlencode($account);
-        $extn = urlencode($id);
-        return "$base/$accountExtn/persons/$extn";
+        $accountExtn = \urlencode($account);
+        $extn = \urlencode($id);
+
+        return "{$base}/{$accountExtn}/persons/{$extn}";
     }
 
     /**
      * @param array|string $_id
-     * @param array|string|null $_opts
+     * @param null|array|string $_opts
      *
-     * @throws \Stripe\Error\InvalidRequest
+     * @throws \Stripe\Exception\BadMethodCallException
      */
     public static function retrieve($_id, $_opts = null)
     {
-        $msg = "Persons cannot be accessed without an account ID. " .
-               "Retrieve a Person using \$account->retrievePerson('person_id') instead.";
-        throw new Error\InvalidRequest($msg, null);
+        $msg = 'Persons cannot be retrieved without an account ID. Retrieve ' .
+               "a person using `Account::retrievePerson('account_id', " .
+               "'person_id')`.";
+
+        throw new Exception\BadMethodCallException($msg);
     }
 
     /**
      * @param string $_id
-     * @param array|null $_params
-     * @param array|string|null $_options
+     * @param null|array $_params
+     * @param null|array|string $_options
      *
-     * @throws \Stripe\Error\InvalidRequest
+     * @throws \Stripe\Exception\BadMethodCallException
      */
     public static function update($_id, $_params = null, $_options = null)
     {
-        $msg = "Persons cannot be accessed without an account ID. " .
-               "Retrieve a Person using \$account->retrievePerson('person_id') instead.";
-        throw new Error\InvalidRequest($msg, null);
+        $msg = 'Persons cannot be updated without an account ID. Update ' .
+               "a person using `Account::updatePerson('account_id', " .
+               "'person_id', \$updateParams)`.";
+
+        throw new Exception\BadMethodCallException($msg);
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Plan.php b/htdocs/includes/stripe/stripe-php/lib/Plan.php
index 1a7ae87dda8..bff735d78a5 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Plan.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Plan.php
@@ -1,35 +1,53 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class Plan
+ * You can now model subscriptions more flexibly using the <a
+ * href="https://stripe.com/docs/api#prices">Prices API</a>. It replaces the Plans
+ * API and is backwards compatible to simplify your migration.
  *
- * @package Stripe
+ * Plans define the base price, currency, and billing cycle for recurring purchases
+ * of products. <a href="https://stripe.com/docs/api#products">Products</a> help
+ * you track inventory or provisioning, and plans help you track pricing. Different
+ * physical goods or levels of service should be represented by products, and
+ * pricing options should be represented by plans. This approach lets you change
+ * prices without having to change your provisioning scheme.
  *
- * @property string $id
- * @property string $object
- * @property bool $active
- * @property string $aggregate_usage
- * @property int $amount
- * @property string $billing_scheme
- * @property int $created
- * @property string $currency
- * @property string $interval
- * @property int $interval_count
- * @property bool $livemode
- * @property StripeObject $metadata
- * @property string $nickname
- * @property string $product
- * @property mixed $tiers
- * @property string $tiers_mode
- * @property mixed $transform_usage
- * @property int $trial_period_days
- * @property string $usage_type
+ * For example, you might have a single &quot;gold&quot; product that has plans for
+ * $10/month, $100/year, €9/month, and €90/year.
+ *
+ * Related guides: <a
+ * href="https://stripe.com/docs/billing/subscriptions/set-up-subscription">Set up
+ * a subscription</a> and more about <a
+ * href="https://stripe.com/docs/billing/prices-guide">products and prices</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property bool $active Whether the plan can be used for new purchases.
+ * @property null|string $aggregate_usage Specifies a usage aggregation strategy for plans of <code>usage_type=metered</code>. Allowed values are <code>sum</code> for summing up all usage during a period, <code>last_during_period</code> for using the last usage record reported within a period, <code>last_ever</code> for using the last usage record ever (across period bounds) or <code>max</code> which uses the usage record with the maximum reported usage during a period. Defaults to <code>sum</code>.
+ * @property null|int $amount The unit amount in %s to be charged, represented as a whole integer if possible.
+ * @property null|string $amount_decimal The unit amount in %s to be charged, represented as a decimal string with at most 12 decimal places.
+ * @property string $billing_scheme Describes how to compute the price per period. Either <code>per_unit</code> or <code>tiered</code>. <code>per_unit</code> indicates that the fixed amount (specified in <code>amount</code>) will be charged per unit in <code>quantity</code> (for plans with <code>usage_type=licensed</code>), or per unit of total usage (for plans with <code>usage_type=metered</code>). <code>tiered</code> indicates that the unit pricing will be computed using a tiering strategy as defined using the <code>tiers</code> and <code>tiers_mode</code> attributes.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property string $interval The frequency at which a subscription is billed. One of <code>day</code>, <code>week</code>, <code>month</code> or <code>year</code>.
+ * @property int $interval_count The number of intervals (specified in the <code>interval</code> attribute) between subscription billings. For example, <code>interval=month</code> and <code>interval_count=3</code> bills every 3 months.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string $nickname A brief description of the plan, hidden from customers.
+ * @property null|string|\Stripe\Product $product The product whose pricing this plan determines.
+ * @property \Stripe\StripeObject[] $tiers Each element represents a pricing tier. This parameter requires <code>billing_scheme</code> to be set to <code>tiered</code>. See also the documentation for <code>billing_scheme</code>.
+ * @property null|string $tiers_mode Defines if the tiering price should be <code>graduated</code> or <code>volume</code> based. In <code>volume</code>-based tiering, the maximum quantity within a period determines the per unit price. In <code>graduated</code> tiering, pricing can change as the quantity grows.
+ * @property null|\Stripe\StripeObject $transform_usage Apply a transformation to the reported usage or set quantity before computing the amount billed. Cannot be combined with <code>tiers</code>.
+ * @property null|int $trial_period_days Default number of trial days when subscribing a customer to this plan using <a href="https://stripe.com/docs/api#create_subscription-trial_from_plan"><code>trial_from_plan=true</code></a>.
+ * @property string $usage_type Configures how the quantity per period should be determined. Can be either <code>metered</code> or <code>licensed</code>. <code>licensed</code> automatically bills the <code>quantity</code> set when adding it to a subscription. <code>metered</code> aggregates the total usage based on usage records. Defaults to <code>licensed</code>.
  */
 class Plan extends ApiResource
 {
-    const OBJECT_NAME = "plan";
+    const OBJECT_NAME = 'plan';
 
     use ApiOperations\All;
     use ApiOperations\Create;
diff --git a/htdocs/includes/stripe/stripe-php/lib/Price.php b/htdocs/includes/stripe/stripe-php/lib/Price.php
new file mode 100644
index 00000000000..9d3c5540e44
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Price.php
@@ -0,0 +1,62 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe;
+
+/**
+ * Prices define the unit cost, currency, and (optional) billing cycle for both
+ * recurring and one-time purchases of products. <a
+ * href="https://stripe.com/docs/api#products">Products</a> help you track
+ * inventory or provisioning, and prices help you track payment terms. Different
+ * physical goods or levels of service should be represented by products, and
+ * pricing options should be represented by prices. This approach lets you change
+ * prices without having to change your provisioning scheme.
+ *
+ * For example, you might have a single &quot;gold&quot; product that has prices
+ * for $10/month, $100/year, and €9 once.
+ *
+ * Related guides: <a
+ * href="https://stripe.com/docs/billing/subscriptions/set-up-subscription">Set up
+ * a subscription</a>, <a
+ * href="https://stripe.com/docs/billing/invoices/create">create an invoice</a>,
+ * and more about <a href="https://stripe.com/docs/billing/prices-guide">products
+ * and prices</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property bool $active Whether the price can be used for new purchases.
+ * @property string $billing_scheme Describes how to compute the price per period. Either <code>per_unit</code> or <code>tiered</code>. <code>per_unit</code> indicates that the fixed amount (specified in <code>unit_amount</code> or <code>unit_amount_decimal</code>) will be charged per unit in <code>quantity</code> (for prices with <code>usage_type=licensed</code>), or per unit of total usage (for prices with <code>usage_type=metered</code>). <code>tiered</code> indicates that the unit pricing will be computed using a tiering strategy as defined using the <code>tiers</code> and <code>tiers_mode</code> attributes.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|string $lookup_key A lookup key used to retrieve prices dynamically from a static string.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string $nickname A brief description of the plan, hidden from customers.
+ * @property string|\Stripe\Product $product The ID of the product this price is associated with.
+ * @property null|\Stripe\StripeObject $recurring The recurring components of a price such as <code>interval</code> and <code>usage_type</code>.
+ * @property \Stripe\StripeObject[] $tiers Each element represents a pricing tier. This parameter requires <code>billing_scheme</code> to be set to <code>tiered</code>. See also the documentation for <code>billing_scheme</code>.
+ * @property null|string $tiers_mode Defines if the tiering price should be <code>graduated</code> or <code>volume</code> based. In <code>volume</code>-based tiering, the maximum quantity within a period determines the per unit price. In <code>graduated</code> tiering, pricing can change as the quantity grows.
+ * @property null|\Stripe\StripeObject $transform_quantity Apply a transformation to the reported usage or set quantity before computing the amount billed. Cannot be combined with <code>tiers</code>.
+ * @property string $type One of <code>one_time</code> or <code>recurring</code> depending on whether the price is for a one-time purchase or a recurring (subscription) purchase.
+ * @property null|int $unit_amount The unit amount in %s to be charged, represented as a whole integer if possible.
+ * @property null|string $unit_amount_decimal The unit amount in %s to be charged, represented as a decimal string with at most 12 decimal places.
+ */
+class Price extends ApiResource
+{
+    const OBJECT_NAME = 'price';
+
+    use ApiOperations\All;
+    use ApiOperations\Create;
+    use ApiOperations\Retrieve;
+    use ApiOperations\Update;
+
+    const BILLING_SCHEME_PER_UNIT = 'per_unit';
+    const BILLING_SCHEME_TIERED = 'tiered';
+
+    const TIERS_MODE_GRADUATED = 'graduated';
+    const TIERS_MODE_VOLUME = 'volume';
+
+    const TYPE_ONE_TIME = 'one_time';
+    const TYPE_RECURRING = 'recurring';
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Product.php b/htdocs/includes/stripe/stripe-php/lib/Product.php
index 6c60d20c4a7..5afe1f1373e 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Product.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Product.php
@@ -1,35 +1,46 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class Product
+ * Products describe the specific goods or services you offer to your customers.
+ * For example, you might offer a Standard and Premium version of your goods or
+ * service; each version would be a separate Product. They can be used in
+ * conjunction with <a href="https://stripe.com/docs/api#prices">Prices</a> to
+ * configure pricing in Checkout and Subscriptions.
  *
- * @property string $id
- * @property string $object
- * @property bool $active
- * @property string[] $attributes
- * @property string $caption
- * @property int $created
- * @property string[] $deactivate_on
- * @property string $description
- * @property string[] $images
- * @property bool $livemode
- * @property StripeObject $metadata
- * @property string $name
- * @property mixed $package_dimensions
- * @property bool $shippable
- * @property string $statement_descriptor
- * @property string $type
- * @property string $unit_label
- * @property int $updated
- * @property string $url
+ * Related guides: <a
+ * href="https://stripe.com/docs/billing/subscriptions/set-up-subscription">Set up
+ * a subscription</a> or accept <a
+ * href="https://stripe.com/docs/payments/checkout/client#create-products">one-time
+ * payments with Checkout</a> and more about <a
+ * href="https://stripe.com/docs/billing/prices-guide">Products and Prices</a>
  *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property bool $active Whether the product is currently available for purchase.
+ * @property null|string[] $attributes A list of up to 5 attributes that each SKU can provide values for (e.g., <code>[&quot;color&quot;, &quot;size&quot;]</code>).
+ * @property null|string $caption A short one-line description of the product, meant to be displayable to the customer. Only applicable to products of <code>type=good</code>.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string[] $deactivate_on An array of connect application identifiers that cannot purchase this product. Only applicable to products of <code>type=good</code>.
+ * @property null|string $description The product's description, meant to be displayable to the customer. Use this field to optionally store a long form explanation of the product being sold for your own rendering purposes.
+ * @property string[] $images A list of up to 8 URLs of images for this product, meant to be displayable to the customer.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property string $name The product's name, meant to be displayable to the customer. Whenever this product is sold via a subscription, name will show up on associated invoice line item descriptions.
+ * @property null|\Stripe\StripeObject $package_dimensions The dimensions of this product for shipping purposes. A SKU associated with this product can override this value by having its own <code>package_dimensions</code>. Only applicable to products of <code>type=good</code>.
+ * @property null|bool $shippable Whether this product is a shipped good. Only applicable to products of <code>type=good</code>.
+ * @property null|string $statement_descriptor Extra information about a product which will appear on your customer's credit card statement. In the case that multiple products are billed at once, the first statement descriptor will be used.
+ * @property string $type The type of the product. The product is either of type <code>good</code>, which is eligible for use with Orders and SKUs, or <code>service</code>, which is eligible for use with Subscriptions and Plans.
+ * @property null|string $unit_label A label that represents units of this product in Stripe and on customers’ receipts and invoices. When set, this will be included in associated invoice line item descriptions.
+ * @property int $updated Time at which the object was last updated. Measured in seconds since the Unix epoch.
+ * @property null|string $url A URL of a publicly-accessible webpage for this product. Only applicable to products of <code>type=good</code>.
  */
 class Product extends ApiResource
 {
-    const OBJECT_NAME = "product";
+    const OBJECT_NAME = 'product';
 
     use ApiOperations\All;
     use ApiOperations\Create;
@@ -37,10 +48,6 @@ class Product extends ApiResource
     use ApiOperations\Retrieve;
     use ApiOperations\Update;
 
-    /**
-     * Possible string representations of the type of product.
-     * @link https://stripe.com/docs/api/service_products/object#service_product_object-type
-     */
-    const TYPE_GOOD    = 'good';
+    const TYPE_GOOD = 'good';
     const TYPE_SERVICE = 'service';
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/PromotionCode.php b/htdocs/includes/stripe/stripe-php/lib/PromotionCode.php
new file mode 100644
index 00000000000..f4bb0f4f106
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/PromotionCode.php
@@ -0,0 +1,33 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe;
+
+/**
+ * A Promotion Code represents a customer-redeemable code for a coupon. It can be
+ * used to create multiple codes for a single coupon.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property bool $active Whether the promotion code is currently active. A promotion code is only active if the coupon is also valid.
+ * @property string $code The customer-facing code. Regardless of case, this code must be unique across all active promotion codes for each customer.
+ * @property \Stripe\Coupon $coupon A coupon contains information about a percent-off or amount-off discount you might want to apply to a customer. Coupons may be applied to <a href="https://stripe.com/docs/api#invoices">invoices</a> or <a href="https://stripe.com/docs/api#create_order-coupon">orders</a>. Coupons do not work with conventional one-off <a href="https://stripe.com/docs/api#create_charge">charges</a>.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string|\Stripe\Customer $customer The customer that this promotion code can be used by.
+ * @property null|int $expires_at Date at which the promotion code can no longer be redeemed.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|int $max_redemptions Maximum number of times this promotion code can be redeemed.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property \Stripe\StripeObject $restrictions
+ * @property int $times_redeemed Number of times this promotion code has been used.
+ */
+class PromotionCode extends ApiResource
+{
+    const OBJECT_NAME = 'promotion_code';
+
+    use ApiOperations\All;
+    use ApiOperations\Create;
+    use ApiOperations\Retrieve;
+    use ApiOperations\Update;
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Radar/EarlyFraudWarning.php b/htdocs/includes/stripe/stripe-php/lib/Radar/EarlyFraudWarning.php
index 5131e52fc50..eb1b351c6be 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Radar/EarlyFraudWarning.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Radar/EarlyFraudWarning.php
@@ -1,36 +1,37 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe\Radar;
 
 /**
- * Class EarlyFraudWarning
+ * An early fraud warning indicates that the card issuer has notified us that a
+ * charge may be fraudulent.
  *
- * @property string $id
- * @property string $object
- * @property bool $actionable
- * @property string $charge
- * @property int $created
- * @property string $fraud_type
- * @property bool $livemode
+ * Related guide: <a
+ * href="https://stripe.com/docs/disputes/measuring#early-fraud-warnings">Early
+ * Fraud Warnings</a>.
  *
- * @package Stripe\Radar
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property bool $actionable An EFW is actionable if it has not received a dispute and has not been fully refunded. You may wish to proactively refund a charge that receives an EFW, in order to avoid receiving a dispute later.
+ * @property string|\Stripe\Charge $charge ID of the charge this early fraud warning is for, optionally expanded.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $fraud_type The type of fraud labelled by the issuer. One of <code>card_never_received</code>, <code>fraudulent_card_application</code>, <code>made_with_counterfeit_card</code>, <code>made_with_lost_card</code>, <code>made_with_stolen_card</code>, <code>misc</code>, <code>unauthorized_use_of_card</code>.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
  */
 class EarlyFraudWarning extends \Stripe\ApiResource
 {
-    const OBJECT_NAME = "radar.early_fraud_warning";
+    const OBJECT_NAME = 'radar.early_fraud_warning';
 
     use \Stripe\ApiOperations\All;
     use \Stripe\ApiOperations\Retrieve;
 
-    /**
-     * Possible string representations of an early fraud warning's fraud type.
-     * @link https://stripe.com/docs/api/early_fraud_warnings/object#early_fraud_warning_object-fraud_type
-     */
-    const FRAUD_TYPE_CARD_NEVER_RECEIVED         = 'card_never_received';
+    const FRAUD_TYPE_CARD_NEVER_RECEIVED = 'card_never_received';
     const FRAUD_TYPE_FRAUDULENT_CARD_APPLICATION = 'fraudulent_card_application';
-    const FRAUD_TYPE_MADE_WITH_COUNTERFEIT_CARD  = 'made_with_counterfeit_card';
-    const FRAUD_TYPE_MADE_WITH_LOST_CARD         = 'made_with_lost_card';
-    const FRAUD_TYPE_MADE_WITH_STOLEN_CARD       = 'made_with_stolen_card';
-    const FRAUD_TYPE_MISC                        = 'misc';
-    const FRAUD_TYPE_UNAUTHORIZED_USE_OF_CARD    = 'unauthorized_use_of_card';
+    const FRAUD_TYPE_MADE_WITH_COUNTERFEIT_CARD = 'made_with_counterfeit_card';
+    const FRAUD_TYPE_MADE_WITH_LOST_CARD = 'made_with_lost_card';
+    const FRAUD_TYPE_MADE_WITH_STOLEN_CARD = 'made_with_stolen_card';
+    const FRAUD_TYPE_MISC = 'misc';
+    const FRAUD_TYPE_UNAUTHORIZED_USE_OF_CARD = 'unauthorized_use_of_card';
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Radar/ValueList.php b/htdocs/includes/stripe/stripe-php/lib/Radar/ValueList.php
index d267429b272..bcbef74cd4a 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Radar/ValueList.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Radar/ValueList.php
@@ -1,28 +1,31 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe\Radar;
 
 /**
- * Class ValueList
+ * Value lists allow you to group values together which can then be referenced in
+ * rules.
  *
- * @property string $id
- * @property string $object
- * @property string $alias
- * @property int $created
- * @property string $created_by
- * @property string $item_type
- * @property Collection $list_items
- * @property bool $livemode
- * @property StripeObject $metadata
- * @property mixed $name
- * @property int $updated
- * @property string $updated_by
+ * Related guide: <a
+ * href="https://stripe.com/docs/radar/lists#managing-list-items">Default Stripe
+ * Lists</a>.
  *
- * @package Stripe\Radar
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property string $alias The name of the value list for use in rules.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $created_by The name or email address of the user who created this value list.
+ * @property string $item_type The type of items in the value list. One of <code>card_fingerprint</code>, <code>card_bin</code>, <code>email</code>, <code>ip_address</code>, <code>country</code>, <code>string</code>, or <code>case_sensitive_string</code>.
+ * @property \Stripe\Collection $list_items List of items contained within this value list.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property string $name The name of the value list.
  */
 class ValueList extends \Stripe\ApiResource
 {
-    const OBJECT_NAME = "radar.value_list";
+    const OBJECT_NAME = 'radar.value_list';
 
     use \Stripe\ApiOperations\All;
     use \Stripe\ApiOperations\Create;
diff --git a/htdocs/includes/stripe/stripe-php/lib/Radar/ValueListItem.php b/htdocs/includes/stripe/stripe-php/lib/Radar/ValueListItem.php
index 42b1f10fd5d..c4ab28194b8 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Radar/ValueListItem.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Radar/ValueListItem.php
@@ -1,23 +1,28 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe\Radar;
 
 /**
- * Class ValueListItem
+ * Value list items allow you to add specific values to a given Radar value list,
+ * which can then be used in rules.
  *
- * @property string $id
- * @property string $object
- * @property int $created
- * @property string $created_by
- * @property string $list
- * @property bool $livemode
- * @property string $value
+ * Related guide: <a
+ * href="https://stripe.com/docs/radar/lists#managing-list-items">Managing List
+ * Items</a>.
  *
- * @package Stripe\Radar
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $created_by The name or email address of the user who added this item to the value list.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property string $value The value of the item.
+ * @property string $value_list The identifier of the value list this item belongs to.
  */
 class ValueListItem extends \Stripe\ApiResource
 {
-    const OBJECT_NAME = "radar.value_list_item";
+    const OBJECT_NAME = 'radar.value_list_item';
 
     use \Stripe\ApiOperations\All;
     use \Stripe\ApiOperations\Create;
diff --git a/htdocs/includes/stripe/stripe-php/lib/Recipient.php b/htdocs/includes/stripe/stripe-php/lib/Recipient.php
index 35a695f5084..8d5ad4c0a71 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Recipient.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Recipient.php
@@ -1,47 +1,44 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class Recipient
+ * With <code>Recipient</code> objects, you can transfer money from your Stripe
+ * account to a third-party bank account or debit card. The API allows you to
+ * create, delete, and update your recipients. You can retrieve individual
+ * recipients as well as a list of all your recipients.
  *
- * @package Stripe
+ * <strong><code>Recipient</code> objects have been deprecated in favor of <a
+ * href="https://stripe.com/docs/connect">Connect</a>, specifically Connect's much
+ * more powerful <a href="https://stripe.com/docs/api#account">Account objects</a>.
+ * Stripe accounts that don't already use recipients can no longer begin doing so.
+ * Please use <code>Account</code> objects instead.</strong>
  *
- * @property string $id
- * @property string $object
- * @property mixed $active_account
- * @property Collection $cards
- * @property int $created
- * @property string $default_card
- * @property string $description
- * @property string $email
- * @property bool $livemode
- * @property StripeObject $metadata
- * @property string $migrated_to
- * @property string $name
- * @property string $rolled_back_from
- * @property string $type
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|\Stripe\BankAccount $active_account Hash describing the current account on the recipient, if there is one.
+ * @property null|\Stripe\Collection $cards
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string|\Stripe\Card $default_card The default card to use for creating transfers to this recipient.
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property null|string $email
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string|\Stripe\Account $migrated_to The ID of the <a href="https://stripe.com/docs/connect/custom-accounts">Custom account</a> this recipient was migrated to. If set, the recipient can no longer be updated, nor can transfers be made to it: use the Custom account instead.
+ * @property null|string $name Full, legal name of the recipient.
+ * @property string|\Stripe\Account $rolled_back_from
+ * @property string $type Type of the recipient, one of <code>individual</code> or <code>corporation</code>.
+ * @property bool $verified Whether the recipient has been verified. This field is non-standard, and maybe removed in the future
  */
 class Recipient extends ApiResource
 {
-    const OBJECT_NAME = "recipient";
+    const OBJECT_NAME = 'recipient';
 
     use ApiOperations\All;
     use ApiOperations\Create;
     use ApiOperations\Delete;
     use ApiOperations\Retrieve;
     use ApiOperations\Update;
-
-    /**
-     * @param array|null $params
-     *
-     * @return Collection of the Recipient's Transfers
-     */
-    public function transfers($params = null)
-    {
-        $params = $params ?: [];
-        $params['recipient'] = $this->id;
-        $transfers = Transfer::all($params, $this->_opts);
-        return $transfers;
-    }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/RecipientTransfer.php b/htdocs/includes/stripe/stripe-php/lib/RecipientTransfer.php
index 7a2ec1f3fb7..5e2d4365daa 100644
--- a/htdocs/includes/stripe/stripe-php/lib/RecipientTransfer.php
+++ b/htdocs/includes/stripe/stripe-php/lib/RecipientTransfer.php
@@ -3,7 +3,7 @@
 namespace Stripe;
 
 /**
- * Class RecipientTransfer
+ * Class RecipientTransfer.
  *
  * @property string $id
  * @property string $object
@@ -20,19 +20,17 @@ namespace Stripe;
  * @property string $failure_code
  * @property string $failure_message
  * @property bool $livemode
- * @property StripeObject $metadata
+ * @property \Stripe\StripeObject $metadata
  * @property string $method
  * @property string $recipient
- * @property mixed $reversals
+ * @property \Stripe\Collection $reversals
  * @property bool $reversed
  * @property string $source_type
  * @property string $statement_descriptor
  * @property string $status
  * @property string $type
- *
- * @package Stripe
  */
 class RecipientTransfer extends ApiResource
 {
-    const OBJECT_NAME = "recipient_transfer";
+    const OBJECT_NAME = 'recipient_transfer';
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Refund.php b/htdocs/includes/stripe/stripe-php/lib/Refund.php
index f8b4529b72e..f5e975fd83f 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Refund.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Refund.php
@@ -1,60 +1,58 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class Refund
+ * <code>Refund</code> objects allow you to refund a charge that has previously
+ * been created but not yet refunded. Funds will be refunded to the credit or debit
+ * card that was originally charged.
  *
- * @property string $id
- * @property string $object
- * @property int $amount
- * @property string $balance_transaction
- * @property string $charge
- * @property int $created
- * @property string $currency
- * @property string $description
- * @property string $failure_balance_transaction
- * @property string $failure_reason
- * @property StripeObject $metadata
- * @property string $reason
- * @property string $receipt_number
- * @property string $source_transfer_reversal
- * @property string $status
- * @property string $transfer_reversal
+ * Related guide: <a href="https://stripe.com/docs/refunds">Refunds</a>.
  *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Amount, in %s.
+ * @property null|string|\Stripe\BalanceTransaction $balance_transaction Balance transaction that describes the impact on your account balance.
+ * @property null|string|\Stripe\Charge $charge ID of the charge that was refunded.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property string $description An arbitrary string attached to the object. Often useful for displaying to users. (Available on non-card refunds only)
+ * @property string|\Stripe\BalanceTransaction $failure_balance_transaction If the refund failed, this balance transaction describes the adjustment made on your account balance that reverses the initial balance transaction.
+ * @property string $failure_reason If the refund failed, the reason for refund failure if known. Possible values are <code>lost_or_stolen_card</code>, <code>expired_or_canceled_card</code>, or <code>unknown</code>.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string|\Stripe\PaymentIntent $payment_intent ID of the PaymentIntent that was refunded.
+ * @property null|string $reason Reason for the refund, either user-provided (<code>duplicate</code>, <code>fraudulent</code>, or <code>requested_by_customer</code>) or generated by Stripe internally (<code>expired_uncaptured_charge</code>).
+ * @property null|string $receipt_number This is the transaction number that appears on email receipts sent for this refund.
+ * @property null|string|\Stripe\TransferReversal $source_transfer_reversal The transfer reversal that is associated with the refund. Only present if the charge came from another Stripe account. See the Connect documentation for details.
+ * @property null|string $status Status of the refund. For credit card refunds, this can be <code>pending</code>, <code>succeeded</code>, or <code>failed</code>. For other types of refunds, it can be <code>pending</code>, <code>succeeded</code>, <code>failed</code>, or <code>canceled</code>. Refer to our <a href="https://stripe.com/docs/refunds#failed-refunds">refunds</a> documentation for more details.
+ * @property null|string|\Stripe\TransferReversal $transfer_reversal If the accompanying transfer was reversed, the transfer reversal object. Only applicable if the charge was created using the destination parameter.
  */
 class Refund extends ApiResource
 {
-    const OBJECT_NAME = "refund";
+    const OBJECT_NAME = 'refund';
 
     use ApiOperations\All;
     use ApiOperations\Create;
     use ApiOperations\Retrieve;
     use ApiOperations\Update;
 
-    /**
-     * Possible string representations of the failure reason.
-     * @link https://stripe.com/docs/api/refunds/object#refund_object-failure_reason
-     */
-    const FAILURE_REASON                     = 'expired_or_canceled_card';
+    const FAILURE_REASON_EXPIRED_OR_CANCELED_CARD = 'expired_or_canceled_card';
     const FAILURE_REASON_LOST_OR_STOLEN_CARD = 'lost_or_stolen_card';
-    const FAILURE_REASON_UNKNOWN             = 'unknown';
+    const FAILURE_REASON_UNKNOWN = 'unknown';
 
-    /**
-     * Possible string representations of the refund reason.
-     * @link https://stripe.com/docs/api/refunds/object#refund_object-reason
-     */
-    const REASON_DUPLICATE             = 'duplicate';
-    const REASON_FRAUDULENT            = 'fraudulent';
+    const REASON_DUPLICATE = 'duplicate';
+    const REASON_FRAUDULENT = 'fraudulent';
     const REASON_REQUESTED_BY_CUSTOMER = 'requested_by_customer';
 
-    /**
-     * Possible string representations of the refund status.
-     * @link https://stripe.com/docs/api/refunds/object#refund_object-status
-     */
-    const STATUS_CANCELED  = 'canceled';
-    const STATUS_FAILED    = 'failed';
-    const STATUS_PENDING   = 'pending';
+    const STATUS_CANCELED = 'canceled';
+    const STATUS_FAILED = 'failed';
+    const STATUS_PENDING = 'pending';
     const STATUS_SUCCEEDED = 'succeeded';
+
+    /**
+     * @deprecated use FAILURE_REASON_EXPIRED_OR_CANCELED_CARD instead
+     */
+    const FAILURE_REASON = 'expired_or_canceled_card';
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Reporting/ReportRun.php b/htdocs/includes/stripe/stripe-php/lib/Reporting/ReportRun.php
index f79c94e34ea..458cbed6cd8 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Reporting/ReportRun.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Reporting/ReportRun.php
@@ -1,26 +1,35 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe\Reporting;
 
 /**
- * Class ReportRun
+ * The Report Run object represents an instance of a report type generated with
+ * specific run parameters. Once the object is created, Stripe begins processing
+ * the report. When the report has finished running, it will give you a reference
+ * to a file where you can retrieve your results. For an overview, see <a
+ * href="https://stripe.com/docs/reporting/statements/api">API Access to
+ * Reports</a>.
  *
- * @property string $id
- * @property string $object
- * @property int $created
- * @property string $error
- * @property bool $livemode
- * @property mixed $parameters
- * @property string $report_type
- * @property mixed $result
- * @property string $status
- * @property int $succeeded_at
+ * Note that reports can only be run based on your live-mode data (not test-mode
+ * data), and thus related requests must be made with a <a
+ * href="https://stripe.com/docs/keys#test-live-modes">live-mode API key</a>.
  *
- * @package Stripe\Reporting
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string $error If something should go wrong during the run, a message about the failure (populated when <code>status=failed</code>).
+ * @property bool $livemode Always <code>true</code>: reports can only be run on live-mode data.
+ * @property \Stripe\StripeObject $parameters
+ * @property string $report_type The ID of the <a href="https://stripe.com/docs/reports/report-types">report type</a> to run, such as <code>&quot;balance.summary.1&quot;</code>.
+ * @property null|\Stripe\File $result The file object representing the result of the report run (populated when <code>status=succeeded</code>).
+ * @property string $status Status of this report run. This will be <code>pending</code> when the run is initially created. When the run finishes, this will be set to <code>succeeded</code> and the <code>result</code> field will be populated. Rarely, we may encounter an error, at which point this will be set to <code>failed</code> and the <code>error</code> field will be populated.
+ * @property null|int $succeeded_at Timestamp at which this run successfully finished (populated when <code>status=succeeded</code>). Measured in seconds since the Unix epoch.
  */
 class ReportRun extends \Stripe\ApiResource
 {
-    const OBJECT_NAME = "reporting.report_run";
+    const OBJECT_NAME = 'reporting.report_run';
 
     use \Stripe\ApiOperations\All;
     use \Stripe\ApiOperations\Create;
diff --git a/htdocs/includes/stripe/stripe-php/lib/Reporting/ReportType.php b/htdocs/includes/stripe/stripe-php/lib/Reporting/ReportType.php
index 157b51048c9..cf753012a45 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Reporting/ReportType.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Reporting/ReportType.php
@@ -1,23 +1,33 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe\Reporting;
 
 /**
- * Class ReportType
+ * The Report Type resource corresponds to a particular type of report, such as the
+ * &quot;Activity summary&quot; or &quot;Itemized payouts&quot; reports. These
+ * objects are identified by an ID belonging to a set of enumerated values. See <a
+ * href="https://stripe.com/docs/reporting/statements/api">API Access to Reports
+ * documentation</a> for those Report Type IDs, along with required and optional
+ * parameters.
  *
- * @property string $id
- * @property string $object
- * @property int $data_available_end
- * @property int $data_available_start
- * @property string $name
- * @property int $updated
- * @property string $version
+ * Note that reports can only be run based on your live-mode data (not test-mode
+ * data), and thus related requests must be made with a <a
+ * href="https://stripe.com/docs/keys#test-live-modes">live-mode API key</a>.
  *
- * @package Stripe\Reporting
+ * @property string $id The <a href="https://stripe.com/docs/reporting/statements/api#available-report-types">ID of the Report Type</a>, such as <code>balance.summary.1</code>.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $data_available_end Most recent time for which this Report Type is available. Measured in seconds since the Unix epoch.
+ * @property int $data_available_start Earliest time for which this Report Type is available. Measured in seconds since the Unix epoch.
+ * @property null|string[] $default_columns List of column names that are included by default when this Report Type gets run. (If the Report Type doesn't support the <code>columns</code> parameter, this will be null.)
+ * @property string $name Human-readable name of the Report Type
+ * @property int $updated When this Report Type was latest updated. Measured in seconds since the Unix epoch.
+ * @property int $version Version of the Report Type. Different versions report with the same ID will have the same purpose, but may take different run parameters or have different result schemas.
  */
 class ReportType extends \Stripe\ApiResource
 {
-    const OBJECT_NAME = "reporting.report_type";
+    const OBJECT_NAME = 'reporting.report_type';
 
     use \Stripe\ApiOperations\All;
     use \Stripe\ApiOperations\Retrieve;
diff --git a/htdocs/includes/stripe/stripe-php/lib/RequestTelemetry.php b/htdocs/includes/stripe/stripe-php/lib/RequestTelemetry.php
index f677a7f76e8..bf9074acb2a 100644
--- a/htdocs/includes/stripe/stripe-php/lib/RequestTelemetry.php
+++ b/htdocs/includes/stripe/stripe-php/lib/RequestTelemetry.php
@@ -3,10 +3,9 @@
 namespace Stripe;
 
 /**
- * Class RequestTelemetry
+ * Class RequestTelemetry.
  *
  * Tracks client request telemetry
- * @package Stripe
  */
 class RequestTelemetry
 {
@@ -16,8 +15,8 @@ class RequestTelemetry
     /**
      * Initialize a new telemetry object.
      *
-     * @param string $requestId The request's request ID.
-     * @param int $requestDuration The request's duration in milliseconds.
+     * @param string $requestId the request's request ID
+     * @param int $requestDuration the request's duration in milliseconds
      */
     public function __construct($requestId, $requestDuration)
     {
diff --git a/htdocs/includes/stripe/stripe-php/lib/Review.php b/htdocs/includes/stripe/stripe-php/lib/Review.php
index a2fd5d06db3..606b41054d4 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Review.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Review.php
@@ -1,30 +1,34 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class Review
+ * Reviews can be used to supplement automated fraud detection with human
+ * expertise.
  *
- * @property string $id
- * @property string $object
- * @property string $billing_zip
- * @property string $charge
- * @property string $closed_reason
- * @property int $created
- * @property string $ip_address
- * @property mixed $ip_address_location
- * @property bool $livemode
- * @property bool $open
- * @property string $opened_reason
- * @property string $payment_intent
- * @property string $reason
- * @property mixed $session
+ * Learn more about <a href="/radar">Radar</a> and reviewing payments <a
+ * href="https://stripe.com/docs/radar/reviews">here</a>.
  *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string $billing_zip The ZIP or postal code of the card used, if applicable.
+ * @property null|string|\Stripe\Charge $charge The charge associated with this review.
+ * @property null|string $closed_reason The reason the review was closed, or null if it has not yet been closed. One of <code>approved</code>, <code>refunded</code>, <code>refunded_as_fraud</code>, or <code>disputed</code>.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string $ip_address The IP address where the payment originated.
+ * @property null|\Stripe\StripeObject $ip_address_location Information related to the location of the payment. Note that this information is an approximation and attempts to locate the nearest population center - it should not be used to determine a specific address.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property bool $open If <code>true</code>, the review needs action.
+ * @property string $opened_reason The reason the review was opened. One of <code>rule</code> or <code>manual</code>.
+ * @property string|\Stripe\PaymentIntent $payment_intent The PaymentIntent ID associated with this review, if one exists.
+ * @property string $reason The reason the review is currently open or closed. One of <code>rule</code>, <code>manual</code>, <code>approved</code>, <code>refunded</code>, <code>refunded_as_fraud</code>, or <code>disputed</code>.
+ * @property null|\Stripe\StripeObject $session Information related to the browsing session of the user who initiated the payment.
  */
 class Review extends ApiResource
 {
-    const OBJECT_NAME = "review";
+    const OBJECT_NAME = 'review';
 
     use ApiOperations\All;
     use ApiOperations\Retrieve;
@@ -33,25 +37,30 @@ class Review extends ApiResource
      * Possible string representations of the current, the opening or the closure reason of the review.
      * Not all of these enumeration apply to all of the ´reason´ fields. Please consult the Review object to
      * determine where these are apply.
-     * @link https://stripe.com/docs/api/radar/reviews/object
+     *
+     * @see https://stripe.com/docs/api/radar/reviews/object
      */
-    const REASON_APPROVED          = 'approved';
-    const REASON_DISPUTED          = 'disputed';
-    const REASON_MANUAL            = 'manual';
-    const REASON_REFUNDED          = 'refunded';
+    const REASON_APPROVED = 'approved';
+    const REASON_DISPUTED = 'disputed';
+    const REASON_MANUAL = 'manual';
+    const REASON_REFUNDED = 'refunded';
     const REASON_REFUNDED_AS_FRAUD = 'refunded_as_fraud';
-    const REASON_RULE              = 'rule';
+    const REASON_RULE = 'rule';
 
     /**
-     * @param array|string|null $options
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return Review The approved review.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return Review the approved review
      */
-    public function approve($params = null, $options = null)
+    public function approve($params = null, $opts = null)
     {
         $url = $this->instanceUrl() . '/approve';
-        list($response, $opts) = $this->_request('post', $url, $params, $options);
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
         $this->refreshFrom($response, $opts);
+
         return $this;
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/SKU.php b/htdocs/includes/stripe/stripe-php/lib/SKU.php
index cb3aa6f73f1..b418c6c5df7 100644
--- a/htdocs/includes/stripe/stripe-php/lib/SKU.php
+++ b/htdocs/includes/stripe/stripe-php/lib/SKU.php
@@ -1,30 +1,40 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class SKU
+ * Stores representations of <a
+ * href="http://en.wikipedia.org/wiki/Stock_keeping_unit">stock keeping units</a>.
+ * SKUs describe specific product variations, taking into account any combination
+ * of: attributes, currency, and cost. For example, a product may be a T-shirt,
+ * whereas a specific SKU represents the <code>size: large</code>, <code>color:
+ * red</code> version of that shirt.
  *
- * @property string $id
- * @property string $object
- * @property bool $active
- * @property mixed $attributes
- * @property int $created
- * @property string $currency
- * @property string $image
- * @property mixed $inventory
- * @property bool $livemode
- * @property StripeObject $metadata
- * @property mixed $package_dimensions
- * @property int $price
- * @property string $product
- * @property int $updated
+ * Can also be used to manage inventory.
  *
- * @package Stripe
+ * Related guide: <a href="https://stripe.com/docs/orders">Tax, Shipping, and
+ * Inventory</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property bool $active Whether the SKU is available for purchase.
+ * @property \Stripe\StripeObject $attributes A dictionary of attributes and values for the attributes defined by the product. If, for example, a product's attributes are <code>[&quot;size&quot;, &quot;gender&quot;]</code>, a valid SKU has the following dictionary of attributes: <code>{&quot;size&quot;: &quot;Medium&quot;, &quot;gender&quot;: &quot;Unisex&quot;}</code>.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|string $image The URL of an image for this SKU, meant to be displayable to the customer.
+ * @property \Stripe\StripeObject $inventory
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|\Stripe\StripeObject $package_dimensions The dimensions of this SKU for shipping purposes.
+ * @property int $price The cost of the item as a positive integer in the smallest currency unit (that is, 100 cents to charge $1.00, or 100 to charge ¥100, Japanese Yen being a zero-decimal currency).
+ * @property string|\Stripe\Product $product The ID of the product this SKU is associated with. The product must be currently active.
+ * @property int $updated Time at which the object was last updated. Measured in seconds since the Unix epoch.
  */
 class SKU extends ApiResource
 {
-    const OBJECT_NAME = "sku";
+    const OBJECT_NAME = 'sku';
 
     use ApiOperations\All;
     use ApiOperations\Create;
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/AbstractService.php b/htdocs/includes/stripe/stripe-php/lib/Service/AbstractService.php
new file mode 100644
index 00000000000..ed092c8b84e
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/AbstractService.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace Stripe\Service;
+
+/**
+ * Abstract base class for all services.
+ */
+abstract class AbstractService
+{
+    /**
+     * @var \Stripe\StripeClientInterface
+     */
+    protected $client;
+
+    /**
+     * Initializes a new instance of the {@link AbstractService} class.
+     *
+     * @param \Stripe\StripeClientInterface $client
+     */
+    public function __construct($client)
+    {
+        $this->client = $client;
+    }
+
+    /**
+     * Gets the client used by this service to send requests.
+     *
+     * @return \Stripe\StripeClientInterface
+     */
+    public function getClient()
+    {
+        return $this->client;
+    }
+
+    /**
+     * Translate null values to empty strings. For service methods,
+     * we interpret null as a request to unset the field, which
+     * corresponds to sending an empty string for the field to the
+     * API.
+     *
+     * @param null|array $params
+     */
+    private static function formatParams($params)
+    {
+        if (null === $params) {
+            return null;
+        }
+        \array_walk_recursive($params, function (&$value, $key) {
+            if (null === $value) {
+                $value = '';
+            }
+        });
+
+        return $params;
+    }
+
+    protected function request($method, $path, $params, $opts)
+    {
+        return $this->getClient()->request($method, $path, static::formatParams($params), $opts);
+    }
+
+    protected function requestCollection($method, $path, $params, $opts)
+    {
+        return $this->getClient()->requestCollection($method, $path, static::formatParams($params), $opts);
+    }
+
+    protected function buildPath($basePath, ...$ids)
+    {
+        foreach ($ids as $id) {
+            if (null === $id || '' === \trim($id)) {
+                $msg = 'The resource ID cannot be null or whitespace.';
+
+                throw new \Stripe\Exception\InvalidArgumentException($msg);
+            }
+        }
+
+        return \sprintf($basePath, ...\array_map('\urlencode', $ids));
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/AbstractServiceFactory.php b/htdocs/includes/stripe/stripe-php/lib/Service/AbstractServiceFactory.php
new file mode 100644
index 00000000000..4aca6868693
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/AbstractServiceFactory.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Stripe\Service;
+
+/**
+ * Abstract base class for all service factories used to expose service
+ * instances through {@link \Stripe\StripeClient}.
+ *
+ * Service factories serve two purposes:
+ *
+ * 1. Expose properties for all services through the `__get()` magic method.
+ * 2. Lazily initialize each service instance the first time the property for
+ *    a given service is used.
+ */
+abstract class AbstractServiceFactory
+{
+    /** @var \Stripe\StripeClientInterface */
+    private $client;
+
+    /** @var array<string, AbstractService|AbstractServiceFactory> */
+    private $services;
+
+    /**
+     * @param \Stripe\StripeClientInterface $client
+     */
+    public function __construct($client)
+    {
+        $this->client = $client;
+        $this->services = [];
+    }
+
+    /**
+     * @param string $name
+     *
+     * @return null|string
+     */
+    abstract protected function getServiceClass($name);
+
+    /**
+     * @param string $name
+     *
+     * @return null|AbstractService|AbstractServiceFactory
+     */
+    public function __get($name)
+    {
+        $serviceClass = $this->getServiceClass($name);
+        if (null !== $serviceClass) {
+            if (!\array_key_exists($name, $this->services)) {
+                $this->services[$name] = new $serviceClass($this->client);
+            }
+
+            return $this->services[$name];
+        }
+
+        \trigger_error('Undefined property: ' . static::class . '::$' . $name);
+
+        return null;
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/AccountLinkService.php b/htdocs/includes/stripe/stripe-php/lib/Service/AccountLinkService.php
new file mode 100644
index 00000000000..2e904923970
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/AccountLinkService.php
@@ -0,0 +1,25 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class AccountLinkService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Creates an AccountLink object that includes a single-use Stripe URL that the
+     * platform can redirect their user to in order to take them through the Connect
+     * Onboarding flow.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\AccountLink
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/account_links', $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/AccountService.php b/htdocs/includes/stripe/stripe-php/lib/Service/AccountService.php
new file mode 100644
index 00000000000..c731e475e01
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/AccountService.php
@@ -0,0 +1,381 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class AccountService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of accounts connected to your platform via <a
+     * href="/docs/connect">Connect</a>. If you’re not a platform, the list is empty.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/accounts', $params, $opts);
+    }
+
+    /**
+     * Returns a list of capabilities associated with the account. The capabilities are
+     * returned sorted by creation date, with the most recent capability appearing
+     * first.
+     *
+     * @param string $parentId
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function allCapabilities($parentId, $params = null, $opts = null)
+    {
+        return $this->requestCollection('get', $this->buildPath('/v1/accounts/%s/capabilities', $parentId), $params, $opts);
+    }
+
+    /**
+     * List external accounts for an account.
+     *
+     * @param string $parentId
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function allExternalAccounts($parentId, $params = null, $opts = null)
+    {
+        return $this->requestCollection('get', $this->buildPath('/v1/accounts/%s/external_accounts', $parentId), $params, $opts);
+    }
+
+    /**
+     * Returns a list of people associated with the account’s legal entity. The people
+     * are returned sorted by creation date, with the most recent people appearing
+     * first.
+     *
+     * @param string $parentId
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function allPersons($parentId, $params = null, $opts = null)
+    {
+        return $this->requestCollection('get', $this->buildPath('/v1/accounts/%s/persons', $parentId), $params, $opts);
+    }
+
+    /**
+     * With <a href="/docs/connect">Connect</a>, you can create Stripe accounts for
+     * your users. To do this, you’ll first need to <a
+     * href="https://dashboard.stripe.com/account/applications/settings">register your
+     * platform</a>.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Account
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/accounts', $params, $opts);
+    }
+
+    /**
+     * Create an external account for a given account.
+     *
+     * @param string $parentId
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\BankAccount|\Stripe\Card
+     */
+    public function createExternalAccount($parentId, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/accounts/%s/external_accounts', $parentId), $params, $opts);
+    }
+
+    /**
+     * Creates a single-use login link for an Express account to access their Stripe
+     * dashboard.
+     *
+     * <strong>You may only create login links for <a
+     * href="/docs/connect/express-accounts">Express accounts</a> connected to your
+     * platform</strong>.
+     *
+     * @param string $parentId
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\LoginLink
+     */
+    public function createLoginLink($parentId, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/accounts/%s/login_links', $parentId), $params, $opts);
+    }
+
+    /**
+     * Creates a new person.
+     *
+     * @param string $parentId
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Person
+     */
+    public function createPerson($parentId, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/accounts/%s/persons', $parentId), $params, $opts);
+    }
+
+    /**
+     * With <a href="/docs/connect">Connect</a>, you can delete Custom or Express
+     * accounts you manage.
+     *
+     * Accounts created using test-mode keys can be deleted at any time. Accounts
+     * created using live-mode keys can only be deleted once all balances are zero.
+     *
+     * If you want to delete your own account, use the <a
+     * href="https://dashboard.stripe.com/account">account information tab in your
+     * account settings</a> instead.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Account
+     */
+    public function delete($id, $params = null, $opts = null)
+    {
+        return $this->request('delete', $this->buildPath('/v1/accounts/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Delete a specified external account for a given account.
+     *
+     * @param string $parentId
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\BankAccount|\Stripe\Card
+     */
+    public function deleteExternalAccount($parentId, $id, $params = null, $opts = null)
+    {
+        return $this->request('delete', $this->buildPath('/v1/accounts/%s/external_accounts/%s', $parentId, $id), $params, $opts);
+    }
+
+    /**
+     * Deletes an existing person’s relationship to the account’s legal entity. Any
+     * person with a relationship for an account can be deleted through the API, except
+     * if the person is the <code>account_opener</code>. If your integration is using
+     * the <code>executive</code> parameter, you cannot delete the only verified
+     * <code>executive</code> on file.
+     *
+     * @param string $parentId
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Person
+     */
+    public function deletePerson($parentId, $id, $params = null, $opts = null)
+    {
+        return $this->request('delete', $this->buildPath('/v1/accounts/%s/persons/%s', $parentId, $id), $params, $opts);
+    }
+
+    /**
+     * With <a href="/docs/connect">Connect</a>, you may flag accounts as suspicious.
+     *
+     * Test-mode Custom and Express accounts can be rejected at any time. Accounts
+     * created using live-mode keys may only be rejected once all balances are zero.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Account
+     */
+    public function reject($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/accounts/%s/reject', $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves information about the specified Account Capability.
+     *
+     * @param string $parentId
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Capability
+     */
+    public function retrieveCapability($parentId, $id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/accounts/%s/capabilities/%s', $parentId, $id), $params, $opts);
+    }
+
+    /**
+     * Retrieve a specified external account for a given account.
+     *
+     * @param string $parentId
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\BankAccount|\Stripe\Card
+     */
+    public function retrieveExternalAccount($parentId, $id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/accounts/%s/external_accounts/%s', $parentId, $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves an existing person.
+     *
+     * @param string $parentId
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Person
+     */
+    public function retrievePerson($parentId, $id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/accounts/%s/persons/%s', $parentId, $id), $params, $opts);
+    }
+
+    /**
+     * Updates a connected <a href="/docs/connect/accounts">Express or Custom
+     * account</a> by setting the values of the parameters passed. Any parameters not
+     * provided are left unchanged. Most parameters can be changed only for Custom
+     * accounts. (These are marked <strong>Custom Only</strong> below.) Parameters
+     * marked <strong>Custom and Express</strong> are supported by both account types.
+     *
+     * To update your own account, use the <a
+     * href="https://dashboard.stripe.com/account">Dashboard</a>. Refer to our <a
+     * href="/docs/connect/updating-accounts">Connect</a> documentation to learn more
+     * about updating accounts.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Account
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/accounts/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates an existing Account Capability.
+     *
+     * @param string $parentId
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Capability
+     */
+    public function updateCapability($parentId, $id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/accounts/%s/capabilities/%s', $parentId, $id), $params, $opts);
+    }
+
+    /**
+     * Updates the metadata, account holder name, and account holder type of a bank
+     * account belonging to a <a href="/docs/connect/custom-accounts">Custom
+     * account</a>, and optionally sets it as the default for its currency. Other bank
+     * account details are not editable by design.
+     *
+     * You can re-enable a disabled bank account by performing an update call without
+     * providing any arguments or changes.
+     *
+     * @param string $parentId
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\BankAccount|\Stripe\Card
+     */
+    public function updateExternalAccount($parentId, $id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/accounts/%s/external_accounts/%s', $parentId, $id), $params, $opts);
+    }
+
+    /**
+     * Updates an existing person.
+     *
+     * @param string $parentId
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Person
+     */
+    public function updatePerson($parentId, $id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/accounts/%s/persons/%s', $parentId, $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves the details of an account.
+     *
+     * @param null|string $id
+     * @param null|array $params
+     * @param null|array|StripeUtilRequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Account
+     */
+    public function retrieve($id = null, $params = null, $opts = null)
+    {
+        if (null === $id) {
+            return $this->request('get', '/v1/account', $params, $opts);
+        }
+
+        return $this->request('get', $this->buildPath('/v1/accounts/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/ApplePayDomainService.php b/htdocs/includes/stripe/stripe-php/lib/Service/ApplePayDomainService.php
new file mode 100644
index 00000000000..6577b6b62a5
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/ApplePayDomainService.php
@@ -0,0 +1,70 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class ApplePayDomainService extends \Stripe\Service\AbstractService
+{
+    /**
+     * List apple pay domains.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/apple_pay/domains', $params, $opts);
+    }
+
+    /**
+     * Create an apple pay domain.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\ApplePayDomain
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/apple_pay/domains', $params, $opts);
+    }
+
+    /**
+     * Delete an apple pay domain.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\ApplePayDomain
+     */
+    public function delete($id, $params = null, $opts = null)
+    {
+        return $this->request('delete', $this->buildPath('/v1/apple_pay/domains/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Retrieve an apple pay domain.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\ApplePayDomain
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/apple_pay/domains/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/ApplicationFeeService.php b/htdocs/includes/stripe/stripe-php/lib/Service/ApplicationFeeService.php
new file mode 100644
index 00000000000..c05c3cd5977
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/ApplicationFeeService.php
@@ -0,0 +1,125 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class ApplicationFeeService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of application fees you’ve previously collected. The application
+     * fees are returned in sorted order, with the most recent fees appearing first.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/application_fees', $params, $opts);
+    }
+
+    /**
+     * You can see a list of the refunds belonging to a specific application fee. Note
+     * that the 10 most recent refunds are always available by default on the
+     * application fee object. If you need more than those 10, you can use this API
+     * method and the <code>limit</code> and <code>starting_after</code> parameters to
+     * page through additional refunds.
+     *
+     * @param string $parentId
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function allRefunds($parentId, $params = null, $opts = null)
+    {
+        return $this->requestCollection('get', $this->buildPath('/v1/application_fees/%s/refunds', $parentId), $params, $opts);
+    }
+
+    /**
+     * Refunds an application fee that has previously been collected but not yet
+     * refunded. Funds will be refunded to the Stripe account from which the fee was
+     * originally collected.
+     *
+     * You can optionally refund only part of an application fee. You can do so
+     * multiple times, until the entire fee has been refunded.
+     *
+     * Once entirely refunded, an application fee can’t be refunded again. This method
+     * will raise an error when called on an already-refunded application fee, or when
+     * trying to refund more money than is left on an application fee.
+     *
+     * @param string $parentId
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\ApplicationFeeRefund
+     */
+    public function createRefund($parentId, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/application_fees/%s/refunds', $parentId), $params, $opts);
+    }
+
+    /**
+     * Retrieves the details of an application fee that your account has collected. The
+     * same information is returned when refunding the application fee.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\ApplicationFee
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/application_fees/%s', $id), $params, $opts);
+    }
+
+    /**
+     * By default, you can see the 10 most recent refunds stored directly on the
+     * application fee object, but you can also retrieve details about a specific
+     * refund stored on the application fee.
+     *
+     * @param string $parentId
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\ApplicationFeeRefund
+     */
+    public function retrieveRefund($parentId, $id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/application_fees/%s/refunds/%s', $parentId, $id), $params, $opts);
+    }
+
+    /**
+     * Updates the specified application fee refund by setting the values of the
+     * parameters passed. Any parameters not provided will be left unchanged.
+     *
+     * This request only accepts metadata as an argument.
+     *
+     * @param string $parentId
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\ApplicationFeeRefund
+     */
+    public function updateRefund($parentId, $id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/application_fees/%s/refunds/%s', $parentId, $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/BalanceService.php b/htdocs/includes/stripe/stripe-php/lib/Service/BalanceService.php
new file mode 100644
index 00000000000..0f55385f138
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/BalanceService.php
@@ -0,0 +1,26 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class BalanceService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Retrieves the current account balance, based on the authentication that was used
+     * to make the request.  For a sample request, see <a
+     * href="/docs/connect/account-balances#accounting-for-negative-balances">Accounting
+     * for negative balances</a>.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Balance
+     */
+    public function retrieve($params = null, $opts = null)
+    {
+        return $this->request('get', '/v1/balance', $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/BalanceTransactionService.php b/htdocs/includes/stripe/stripe-php/lib/Service/BalanceTransactionService.php
new file mode 100644
index 00000000000..fb1da501823
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/BalanceTransactionService.php
@@ -0,0 +1,47 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class BalanceTransactionService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of transactions that have contributed to the Stripe account
+     * balance (e.g., charges, transfers, and so forth). The transactions are returned
+     * in sorted order, with the most recent transactions appearing first.
+     *
+     * Note that this endpoint was previously called “Balance history” and used the
+     * path <code>/v1/balance/history</code>.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/balance_transactions', $params, $opts);
+    }
+
+    /**
+     * Retrieves the balance transaction with the given ID.
+     *
+     * Note that this endpoint previously used the path
+     * <code>/v1/balance/history/:id</code>.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\BalanceTransaction
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/balance_transactions/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/BillingPortal/BillingPortalServiceFactory.php b/htdocs/includes/stripe/stripe-php/lib/Service/BillingPortal/BillingPortalServiceFactory.php
new file mode 100644
index 00000000000..756ae176903
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/BillingPortal/BillingPortalServiceFactory.php
@@ -0,0 +1,25 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\BillingPortal;
+
+/**
+ * Service factory class for API resources in the BillingPortal namespace.
+ *
+ * @property SessionService $sessions
+ */
+class BillingPortalServiceFactory extends \Stripe\Service\AbstractServiceFactory
+{
+    /**
+     * @var array<string, string>
+     */
+    private static $classMap = [
+        'sessions' => SessionService::class,
+    ];
+
+    protected function getServiceClass($name)
+    {
+        return \array_key_exists($name, self::$classMap) ? self::$classMap[$name] : null;
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/BillingPortal/SessionService.php b/htdocs/includes/stripe/stripe-php/lib/Service/BillingPortal/SessionService.php
new file mode 100644
index 00000000000..6b3e6026393
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/BillingPortal/SessionService.php
@@ -0,0 +1,23 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\BillingPortal;
+
+class SessionService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Creates a session of the customer portal.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\BillingPortal\Session
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/billing_portal/sessions', $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/ChargeService.php b/htdocs/includes/stripe/stripe-php/lib/Service/ChargeService.php
new file mode 100644
index 00000000000..f5321b8ac9d
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/ChargeService.php
@@ -0,0 +1,101 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class ChargeService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of charges you’ve previously created. The charges are returned in
+     * sorted order, with the most recent charges appearing first.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/charges', $params, $opts);
+    }
+
+    /**
+     * Capture the payment of an existing, uncaptured, charge. This is the second half
+     * of the two-step payment flow, where first you <a href="#create_charge">created a
+     * charge</a> with the capture option set to false.
+     *
+     * Uncaptured payments expire exactly seven days after they are created. If they
+     * are not captured by that point in time, they will be marked as refunded and will
+     * no longer be capturable.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Charge
+     */
+    public function capture($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/charges/%s/capture', $id), $params, $opts);
+    }
+
+    /**
+     * To charge a credit card or other payment source, you create a
+     * <code>Charge</code> object. If your API key is in test mode, the supplied
+     * payment source (e.g., card) won’t actually be charged, although everything else
+     * will occur as if in live mode. (Stripe assumes that the charge would have
+     * completed successfully).
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Charge
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/charges', $params, $opts);
+    }
+
+    /**
+     * Retrieves the details of a charge that has previously been created. Supply the
+     * unique charge ID that was returned from your previous request, and Stripe will
+     * return the corresponding charge information. The same information is returned
+     * when creating or refunding the charge.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Charge
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/charges/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates the specified charge by setting the values of the parameters passed. Any
+     * parameters not provided will be left unchanged.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Charge
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/charges/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/Checkout/CheckoutServiceFactory.php b/htdocs/includes/stripe/stripe-php/lib/Service/Checkout/CheckoutServiceFactory.php
new file mode 100644
index 00000000000..bb26a837f6d
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/Checkout/CheckoutServiceFactory.php
@@ -0,0 +1,25 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\Checkout;
+
+/**
+ * Service factory class for API resources in the Checkout namespace.
+ *
+ * @property SessionService $sessions
+ */
+class CheckoutServiceFactory extends \Stripe\Service\AbstractServiceFactory
+{
+    /**
+     * @var array<string, string>
+     */
+    private static $classMap = [
+        'sessions' => SessionService::class,
+    ];
+
+    protected function getServiceClass($name)
+    {
+        return \array_key_exists($name, self::$classMap) ? self::$classMap[$name] : null;
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/Checkout/SessionService.php b/htdocs/includes/stripe/stripe-php/lib/Service/Checkout/SessionService.php
new file mode 100644
index 00000000000..9da37887844
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/Checkout/SessionService.php
@@ -0,0 +1,73 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\Checkout;
+
+class SessionService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of Checkout Sessions.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/checkout/sessions', $params, $opts);
+    }
+
+    /**
+     * When retrieving a Checkout Session, there is an includable
+     * <strong>line_items</strong> property containing the first handful of those
+     * items. There is also a URL where you can retrieve the full (paginated) list of
+     * line items.
+     *
+     * @param string $parentId
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function allLineItems($parentId, $params = null, $opts = null)
+    {
+        return $this->requestCollection('get', $this->buildPath('/v1/checkout/sessions/%s/line_items', $parentId), $params, $opts);
+    }
+
+    /**
+     * Creates a Session object.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Checkout\Session
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/checkout/sessions', $params, $opts);
+    }
+
+    /**
+     * Retrieves a Session object.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Checkout\Session
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/checkout/sessions/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/CoreServiceFactory.php b/htdocs/includes/stripe/stripe-php/lib/Service/CoreServiceFactory.php
new file mode 100644
index 00000000000..e0109591d3d
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/CoreServiceFactory.php
@@ -0,0 +1,125 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+/**
+ * Service factory class for API resources in the root namespace.
+ *
+ * @property AccountLinkService $accountLinks
+ * @property AccountService $accounts
+ * @property ApplePayDomainService $applePayDomains
+ * @property ApplicationFeeService $applicationFees
+ * @property BalanceService $balance
+ * @property BalanceTransactionService $balanceTransactions
+ * @property BillingPortal\BillingPortalServiceFactory $billingPortal
+ * @property ChargeService $charges
+ * @property Checkout\CheckoutServiceFactory $checkout
+ * @property CountrySpecService $countrySpecs
+ * @property CouponService $coupons
+ * @property CreditNoteService $creditNotes
+ * @property CustomerService $customers
+ * @property DisputeService $disputes
+ * @property EphemeralKeyService $ephemeralKeys
+ * @property EventService $events
+ * @property ExchangeRateService $exchangeRates
+ * @property FileLinkService $fileLinks
+ * @property FileService $files
+ * @property InvoiceItemService $invoiceItems
+ * @property InvoiceService $invoices
+ * @property Issuing\IssuingServiceFactory $issuing
+ * @property MandateService $mandates
+ * @property OAuthService $oauth
+ * @property OrderReturnService $orderReturns
+ * @property OrderService $orders
+ * @property PaymentIntentService $paymentIntents
+ * @property PaymentMethodService $paymentMethods
+ * @property PayoutService $payouts
+ * @property PlanService $plans
+ * @property PriceService $prices
+ * @property ProductService $products
+ * @property PromotionCodeService $promotionCodes
+ * @property Radar\RadarServiceFactory $radar
+ * @property RefundService $refunds
+ * @property Reporting\ReportingServiceFactory $reporting
+ * @property ReviewService $reviews
+ * @property SetupAttemptService $setupAttempts
+ * @property SetupIntentService $setupIntents
+ * @property Sigma\SigmaServiceFactory $sigma
+ * @property SkuService $skus
+ * @property SourceService $sources
+ * @property SubscriptionItemService $subscriptionItems
+ * @property SubscriptionService $subscriptions
+ * @property SubscriptionScheduleService $subscriptionSchedules
+ * @property TaxRateService $taxRates
+ * @property Terminal\TerminalServiceFactory $terminal
+ * @property TokenService $tokens
+ * @property TopupService $topups
+ * @property TransferService $transfers
+ * @property WebhookEndpointService $webhookEndpoints
+ */
+class CoreServiceFactory extends \Stripe\Service\AbstractServiceFactory
+{
+    /**
+     * @var array<string, string>
+     */
+    private static $classMap = [
+        'accountLinks' => AccountLinkService::class,
+        'accounts' => AccountService::class,
+        'applePayDomains' => ApplePayDomainService::class,
+        'applicationFees' => ApplicationFeeService::class,
+        'balance' => BalanceService::class,
+        'balanceTransactions' => BalanceTransactionService::class,
+        'billingPortal' => BillingPortal\BillingPortalServiceFactory::class,
+        'charges' => ChargeService::class,
+        'checkout' => Checkout\CheckoutServiceFactory::class,
+        'countrySpecs' => CountrySpecService::class,
+        'coupons' => CouponService::class,
+        'creditNotes' => CreditNoteService::class,
+        'customers' => CustomerService::class,
+        'disputes' => DisputeService::class,
+        'ephemeralKeys' => EphemeralKeyService::class,
+        'events' => EventService::class,
+        'exchangeRates' => ExchangeRateService::class,
+        'fileLinks' => FileLinkService::class,
+        'files' => FileService::class,
+        'invoiceItems' => InvoiceItemService::class,
+        'invoices' => InvoiceService::class,
+        'issuing' => Issuing\IssuingServiceFactory::class,
+        'mandates' => MandateService::class,
+        'oauth' => OAuthService::class,
+        'orderReturns' => OrderReturnService::class,
+        'orders' => OrderService::class,
+        'paymentIntents' => PaymentIntentService::class,
+        'paymentMethods' => PaymentMethodService::class,
+        'payouts' => PayoutService::class,
+        'plans' => PlanService::class,
+        'prices' => PriceService::class,
+        'products' => ProductService::class,
+        'promotionCodes' => PromotionCodeService::class,
+        'radar' => Radar\RadarServiceFactory::class,
+        'refunds' => RefundService::class,
+        'reporting' => Reporting\ReportingServiceFactory::class,
+        'reviews' => ReviewService::class,
+        'setupAttempts' => SetupAttemptService::class,
+        'setupIntents' => SetupIntentService::class,
+        'sigma' => Sigma\SigmaServiceFactory::class,
+        'skus' => SkuService::class,
+        'sources' => SourceService::class,
+        'subscriptionItems' => SubscriptionItemService::class,
+        'subscriptions' => SubscriptionService::class,
+        'subscriptionSchedules' => SubscriptionScheduleService::class,
+        'taxRates' => TaxRateService::class,
+        'terminal' => Terminal\TerminalServiceFactory::class,
+        'tokens' => TokenService::class,
+        'topups' => TopupService::class,
+        'transfers' => TransferService::class,
+        'webhookEndpoints' => WebhookEndpointService::class,
+    ];
+
+    protected function getServiceClass($name)
+    {
+        return \array_key_exists($name, self::$classMap) ? self::$classMap[$name] : null;
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/CountrySpecService.php b/htdocs/includes/stripe/stripe-php/lib/Service/CountrySpecService.php
new file mode 100644
index 00000000000..573444fd3f4
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/CountrySpecService.php
@@ -0,0 +1,39 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class CountrySpecService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Lists all Country Spec objects available in the API.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/country_specs', $params, $opts);
+    }
+
+    /**
+     * Returns a Country Spec for a given Country code.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\CountrySpec
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/country_specs/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/CouponService.php b/htdocs/includes/stripe/stripe-php/lib/Service/CouponService.php
new file mode 100644
index 00000000000..82a880f5361
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/CouponService.php
@@ -0,0 +1,104 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class CouponService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of your coupons.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/coupons', $params, $opts);
+    }
+
+    /**
+     * You can create coupons easily via the <a
+     * href="https://dashboard.stripe.com/coupons">coupon management</a> page of the
+     * Stripe dashboard. Coupon creation is also accessible via the API if you need to
+     * create coupons on the fly.
+     *
+     * A coupon has either a <code>percent_off</code> or an <code>amount_off</code> and
+     * <code>currency</code>. If you set an <code>amount_off</code>, that amount will
+     * be subtracted from any invoice’s subtotal. For example, an invoice with a
+     * subtotal of <currency>100</currency> will have a final total of
+     * <currency>0</currency> if a coupon with an <code>amount_off</code> of
+     * <amount>200</amount> is applied to it and an invoice with a subtotal of
+     * <currency>300</currency> will have a final total of <currency>100</currency> if
+     * a coupon with an <code>amount_off</code> of <amount>200</amount> is applied to
+     * it.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Coupon
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/coupons', $params, $opts);
+    }
+
+    /**
+     * You can delete coupons via the <a
+     * href="https://dashboard.stripe.com/coupons">coupon management</a> page of the
+     * Stripe dashboard. However, deleting a coupon does not affect any customers who
+     * have already applied the coupon; it means that new customers can’t redeem the
+     * coupon. You can also delete coupons via the API.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Coupon
+     */
+    public function delete($id, $params = null, $opts = null)
+    {
+        return $this->request('delete', $this->buildPath('/v1/coupons/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves the coupon with the given ID.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Coupon
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/coupons/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates the metadata of a coupon. Other coupon details (currency, duration,
+     * amount_off) are, by design, not editable.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Coupon
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/coupons/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/CreditNoteService.php b/htdocs/includes/stripe/stripe-php/lib/Service/CreditNoteService.php
new file mode 100644
index 00000000000..39807dc11a4
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/CreditNoteService.php
@@ -0,0 +1,156 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class CreditNoteService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of credit notes.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/credit_notes', $params, $opts);
+    }
+
+    /**
+     * When retrieving a credit note, you’ll get a <strong>lines</strong> property
+     * containing the the first handful of those items. There is also a URL where you
+     * can retrieve the full (paginated) list of line items.
+     *
+     * @param string $parentId
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function allLines($parentId, $params = null, $opts = null)
+    {
+        return $this->requestCollection('get', $this->buildPath('/v1/credit_notes/%s/lines', $parentId), $params, $opts);
+    }
+
+    /**
+     * Issue a credit note to adjust the amount of a finalized invoice. For a
+     * <code>status=open</code> invoice, a credit note reduces its
+     * <code>amount_due</code>. For a <code>status=paid</code> invoice, a credit note
+     * does not affect its <code>amount_due</code>. Instead, it can result in any
+     * combination of the following:.
+     *
+     * <ul> <li>Refund: create a new refund (using <code>refund_amount</code>) or link
+     * an existing refund (using <code>refund</code>).</li> <li>Customer balance
+     * credit: credit the customer’s balance (using <code>credit_amount</code>) which
+     * will be automatically applied to their next invoice when it’s finalized.</li>
+     * <li>Outside of Stripe credit: record the amount that is or will be credited
+     * outside of Stripe (using <code>out_of_band_amount</code>).</li> </ul>
+     *
+     * For post-payment credit notes the sum of the refund, credit and outside of
+     * Stripe amounts must equal the credit note total.
+     *
+     * You may issue multiple credit notes for an invoice. Each credit note will
+     * increment the invoice’s <code>pre_payment_credit_notes_amount</code> or
+     * <code>post_payment_credit_notes_amount</code> depending on its
+     * <code>status</code> at the time of credit note creation.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\CreditNote
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/credit_notes', $params, $opts);
+    }
+
+    /**
+     * Get a preview of a credit note without creating it.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\CreditNote
+     */
+    public function preview($params = null, $opts = null)
+    {
+        return $this->request('get', '/v1/credit_notes/preview', $params, $opts);
+    }
+
+    /**
+     * When retrieving a credit note preview, you’ll get a <strong>lines</strong>
+     * property containing the first handful of those items. This URL you can retrieve
+     * the full (paginated) list of line items.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\CreditNote
+     */
+    public function previewLines($params = null, $opts = null)
+    {
+        return $this->request('get', '/v1/credit_notes/preview/lines', $params, $opts);
+    }
+
+    /**
+     * Retrieves the credit note object with the given identifier.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\CreditNote
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/credit_notes/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates an existing credit note.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\CreditNote
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/credit_notes/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Marks a credit note as void. Learn more about <a
+     * href="/docs/billing/invoices/credit-notes#voiding">voiding credit notes</a>.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\CreditNote
+     */
+    public function voidCreditNote($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/credit_notes/%s/void', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/CustomerService.php b/htdocs/includes/stripe/stripe-php/lib/Service/CustomerService.php
new file mode 100644
index 00000000000..fdc6a596062
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/CustomerService.php
@@ -0,0 +1,353 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class CustomerService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of your customers. The customers are returned sorted by creation
+     * date, with the most recent customers appearing first.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/customers', $params, $opts);
+    }
+
+    /**
+     * Returns a list of transactions that updated the customer’s <a
+     * href="/docs/billing/customer/balance">balances</a>.
+     *
+     * @param string $parentId
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function allBalanceTransactions($parentId, $params = null, $opts = null)
+    {
+        return $this->requestCollection('get', $this->buildPath('/v1/customers/%s/balance_transactions', $parentId), $params, $opts);
+    }
+
+    /**
+     * List sources for a specified customer.
+     *
+     * @param string $parentId
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function allSources($parentId, $params = null, $opts = null)
+    {
+        return $this->requestCollection('get', $this->buildPath('/v1/customers/%s/sources', $parentId), $params, $opts);
+    }
+
+    /**
+     * Returns a list of tax IDs for a customer.
+     *
+     * @param string $parentId
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function allTaxIds($parentId, $params = null, $opts = null)
+    {
+        return $this->requestCollection('get', $this->buildPath('/v1/customers/%s/tax_ids', $parentId), $params, $opts);
+    }
+
+    /**
+     * Creates a new customer object.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Customer
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/customers', $params, $opts);
+    }
+
+    /**
+     * Creates an immutable transaction that updates the customer’s credit <a
+     * href="/docs/billing/customer/balance">balance</a>.
+     *
+     * @param string $parentId
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\CustomerBalanceTransaction
+     */
+    public function createBalanceTransaction($parentId, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/customers/%s/balance_transactions', $parentId), $params, $opts);
+    }
+
+    /**
+     * When you create a new credit card, you must specify a customer or recipient on
+     * which to create it.
+     *
+     * If the card’s owner has no default card, then the new card will become the
+     * default. However, if the owner already has a default, then it will not change.
+     * To change the default, you should <a href="/docs/api#update_customer">update the
+     * customer</a> to have a new <code>default_source</code>.
+     *
+     * @param string $parentId
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\AlipayAccount|\Stripe\BankAccount|\Stripe\BitcoinReceiver|\Stripe\Card|\Stripe\Source
+     */
+    public function createSource($parentId, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/customers/%s/sources', $parentId), $params, $opts);
+    }
+
+    /**
+     * Creates a new <code>TaxID</code> object for a customer.
+     *
+     * @param string $parentId
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\TaxId
+     */
+    public function createTaxId($parentId, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/customers/%s/tax_ids', $parentId), $params, $opts);
+    }
+
+    /**
+     * Permanently deletes a customer. It cannot be undone. Also immediately cancels
+     * any active subscriptions on the customer.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Customer
+     */
+    public function delete($id, $params = null, $opts = null)
+    {
+        return $this->request('delete', $this->buildPath('/v1/customers/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Removes the currently applied discount on a customer.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Customer
+     */
+    public function deleteDiscount($id, $params = null, $opts = null)
+    {
+        return $this->request('delete', $this->buildPath('/v1/customers/%s/discount', $id), $params, $opts);
+    }
+
+    /**
+     * @param string $parentId
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\AlipayAccount|\Stripe\BankAccount|\Stripe\BitcoinReceiver|\Stripe\Card|\Stripe\Source
+     */
+    public function deleteSource($parentId, $id, $params = null, $opts = null)
+    {
+        return $this->request('delete', $this->buildPath('/v1/customers/%s/sources/%s', $parentId, $id), $params, $opts);
+    }
+
+    /**
+     * Deletes an existing <code>TaxID</code> object.
+     *
+     * @param string $parentId
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\TaxId
+     */
+    public function deleteTaxId($parentId, $id, $params = null, $opts = null)
+    {
+        return $this->request('delete', $this->buildPath('/v1/customers/%s/tax_ids/%s', $parentId, $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves the details of an existing customer. You need only supply the unique
+     * customer identifier that was returned upon customer creation.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Customer
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/customers/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves a specific customer balance transaction that updated the customer’s <a
+     * href="/docs/billing/customer/balance">balances</a>.
+     *
+     * @param string $parentId
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\CustomerBalanceTransaction
+     */
+    public function retrieveBalanceTransaction($parentId, $id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/customers/%s/balance_transactions/%s', $parentId, $id), $params, $opts);
+    }
+
+    /**
+     * Retrieve a specified source for a given customer.
+     *
+     * @param string $parentId
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\AlipayAccount|\Stripe\BankAccount|\Stripe\BitcoinReceiver|\Stripe\Card|\Stripe\Source
+     */
+    public function retrieveSource($parentId, $id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/customers/%s/sources/%s', $parentId, $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves the <code>TaxID</code> object with the given identifier.
+     *
+     * @param string $parentId
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\TaxId
+     */
+    public function retrieveTaxId($parentId, $id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/customers/%s/tax_ids/%s', $parentId, $id), $params, $opts);
+    }
+
+    /**
+     * Updates the specified customer by setting the values of the parameters passed.
+     * Any parameters not provided will be left unchanged. For example, if you pass the
+     * <strong>source</strong> parameter, that becomes the customer’s active source
+     * (e.g., a card) to be used for all charges in the future. When you update a
+     * customer to a new valid card source by passing the <strong>source</strong>
+     * parameter: for each of the customer’s current subscriptions, if the subscription
+     * bills automatically and is in the <code>past_due</code> state, then the latest
+     * open invoice for the subscription with automatic collection enabled will be
+     * retried. This retry will not count as an automatic retry, and will not affect
+     * the next regularly scheduled payment for the invoice. Changing the
+     * <strong>default_source</strong> for a customer will not trigger this behavior.
+     *
+     * This request accepts mostly the same arguments as the customer creation call.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Customer
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/customers/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Most credit balance transaction fields are immutable, but you may update its
+     * <code>description</code> and <code>metadata</code>.
+     *
+     * @param string $parentId
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\CustomerBalanceTransaction
+     */
+    public function updateBalanceTransaction($parentId, $id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/customers/%s/balance_transactions/%s', $parentId, $id), $params, $opts);
+    }
+
+    /**
+     * @param string $parentId
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\AlipayAccount|\Stripe\BankAccount|\Stripe\BitcoinReceiver|\Stripe\Card|\Stripe\Source
+     */
+    public function updateSource($parentId, $id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/customers/%s/sources/%s', $parentId, $id), $params, $opts);
+    }
+
+    /**
+     * @param string $parentId
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\AlipayAccount|\Stripe\BankAccount|\Stripe\BitcoinReceiver|\Stripe\Card|\Stripe\Source
+     */
+    public function verifySource($parentId, $id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/customers/%s/sources/%s/verify', $parentId, $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/DisputeService.php b/htdocs/includes/stripe/stripe-php/lib/Service/DisputeService.php
new file mode 100644
index 00000000000..4eb1542bf44
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/DisputeService.php
@@ -0,0 +1,83 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class DisputeService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of your disputes.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/disputes', $params, $opts);
+    }
+
+    /**
+     * Closing the dispute for a charge indicates that you do not have any evidence to
+     * submit and are essentially dismissing the dispute, acknowledging it as lost.
+     *
+     * The status of the dispute will change from <code>needs_response</code> to
+     * <code>lost</code>. <em>Closing a dispute is irreversible</em>.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Dispute
+     */
+    public function close($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/disputes/%s/close', $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves the dispute with the given ID.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Dispute
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/disputes/%s', $id), $params, $opts);
+    }
+
+    /**
+     * When you get a dispute, contacting your customer is always the best first step.
+     * If that doesn’t work, you can submit evidence to help us resolve the dispute in
+     * your favor. You can do this in your <a
+     * href="https://dashboard.stripe.com/disputes">dashboard</a>, but if you prefer,
+     * you can use the API to submit evidence programmatically.
+     *
+     * Depending on your dispute type, different evidence fields will give you a better
+     * chance of winning your dispute. To figure out which evidence fields to provide,
+     * see our <a href="/docs/disputes/categories">guide to dispute types</a>.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Dispute
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/disputes/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/EphemeralKeyService.php b/htdocs/includes/stripe/stripe-php/lib/Service/EphemeralKeyService.php
new file mode 100644
index 00000000000..3ca14c90471
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/EphemeralKeyService.php
@@ -0,0 +1,43 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class EphemeralKeyService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Invalidates a short-lived API key for a given resource.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\EphemeralKey
+     */
+    public function delete($id, $params = null, $opts = null)
+    {
+        return $this->request('delete', $this->buildPath('/v1/ephemeral_keys/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Creates a short-lived API key for a given resource.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\EphemeralKey
+     */
+    public function create($params = null, $opts = null)
+    {
+        if (!$opts || !isset($opts['stripe_version'])) {
+            throw new \Stripe\Exception\InvalidArgumentException('stripe_version must be specified to create an ephemeral key');
+        }
+
+        return $this->request('post', '/v1/ephemeral_keys', $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/EventService.php b/htdocs/includes/stripe/stripe-php/lib/Service/EventService.php
new file mode 100644
index 00000000000..430b35abf7c
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/EventService.php
@@ -0,0 +1,44 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class EventService extends \Stripe\Service\AbstractService
+{
+    /**
+     * List events, going back up to 30 days. Each event data is rendered according to
+     * Stripe API version at its creation time, specified in <a
+     * href="/docs/api/events/object">event object</a> <code>api_version</code>
+     * attribute (not according to your current Stripe API version or
+     * <code>Stripe-Version</code> header).
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/events', $params, $opts);
+    }
+
+    /**
+     * Retrieves the details of an event. Supply the unique identifier of the event,
+     * which you might have received in a webhook.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Event
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/events/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/ExchangeRateService.php b/htdocs/includes/stripe/stripe-php/lib/Service/ExchangeRateService.php
new file mode 100644
index 00000000000..fc78410c78a
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/ExchangeRateService.php
@@ -0,0 +1,41 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class ExchangeRateService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of objects that contain the rates at which foreign currencies are
+     * converted to one another. Only shows the currencies for which Stripe supports.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/exchange_rates', $params, $opts);
+    }
+
+    /**
+     * Retrieves the exchange rates from the given currency to every supported
+     * currency.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\ExchangeRate
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/exchange_rates/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/FileLinkService.php b/htdocs/includes/stripe/stripe-php/lib/Service/FileLinkService.php
new file mode 100644
index 00000000000..7a3a435dd26
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/FileLinkService.php
@@ -0,0 +1,70 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class FileLinkService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of file links.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/file_links', $params, $opts);
+    }
+
+    /**
+     * Creates a new file link object.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\FileLink
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/file_links', $params, $opts);
+    }
+
+    /**
+     * Retrieves the file link with the given ID.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\FileLink
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/file_links/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates an existing file link object. Expired links can no longer be updated.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\FileLink
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/file_links/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/FileService.php b/htdocs/includes/stripe/stripe-php/lib/Service/FileService.php
new file mode 100644
index 00000000000..1484288496d
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/FileService.php
@@ -0,0 +1,66 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class FileService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of the files that your account has access to. The files are
+     * returned sorted by creation date, with the most recently created files appearing
+     * first.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/files', $params, $opts);
+    }
+
+    /**
+     * Retrieves the details of an existing file object. Supply the unique file ID from
+     * a file, and Stripe will return the corresponding file object. To access file
+     * contents, see the <a href="/docs/file-upload#download-file-contents">File Upload
+     * Guide</a>.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\File
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/files/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Create a file.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @return \Stripe\File
+     */
+    public function create($params = null, $opts = null)
+    {
+        $opts = \Stripe\Util\RequestOptions::parse($opts);
+        if (!isset($opts->apiBase)) {
+            $opts->apiBase = $this->getClient()->getFilesBase();
+        }
+
+        // Manually flatten params, otherwise curl's multipart encoder will
+        // choke on nested null|arrays.
+        $flatParams = \array_column(\Stripe\Util\Util::flattenParams($params), 1, 0);
+
+        return $this->request('post', '/v1/files', $flatParams, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/InvoiceItemService.php b/htdocs/includes/stripe/stripe-php/lib/Service/InvoiceItemService.php
new file mode 100644
index 00000000000..0f0b9e91f08
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/InvoiceItemService.php
@@ -0,0 +1,93 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class InvoiceItemService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of your invoice items. Invoice items are returned sorted by
+     * creation date, with the most recently created invoice items appearing first.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/invoiceitems', $params, $opts);
+    }
+
+    /**
+     * Creates an item to be added to a draft invoice (up to 250 items per invoice). If
+     * no invoice is specified, the item will be on the next invoice created for the
+     * customer specified.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\InvoiceItem
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/invoiceitems', $params, $opts);
+    }
+
+    /**
+     * Deletes an invoice item, removing it from an invoice. Deleting invoice items is
+     * only possible when they’re not attached to invoices, or if it’s attached to a
+     * draft invoice.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\InvoiceItem
+     */
+    public function delete($id, $params = null, $opts = null)
+    {
+        return $this->request('delete', $this->buildPath('/v1/invoiceitems/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves the invoice item with the given ID.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\InvoiceItem
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/invoiceitems/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates the amount or description of an invoice item on an upcoming invoice.
+     * Updating an invoice item is only possible before the invoice it’s attached to is
+     * closed.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\InvoiceItem
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/invoiceitems/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/InvoiceService.php b/htdocs/includes/stripe/stripe-php/lib/Service/InvoiceService.php
new file mode 100644
index 00000000000..f647b28f6cb
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/InvoiceService.php
@@ -0,0 +1,272 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class InvoiceService extends \Stripe\Service\AbstractService
+{
+    /**
+     * You can list all invoices, or list the invoices for a specific customer. The
+     * invoices are returned sorted by creation date, with the most recently created
+     * invoices appearing first.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/invoices', $params, $opts);
+    }
+
+    /**
+     * When retrieving an invoice, you’ll get a <strong>lines</strong> property
+     * containing the total count of line items and the first handful of those items.
+     * There is also a URL where you can retrieve the full (paginated) list of line
+     * items.
+     *
+     * @param string $parentId
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function allLines($parentId, $params = null, $opts = null)
+    {
+        return $this->requestCollection('get', $this->buildPath('/v1/invoices/%s/lines', $parentId), $params, $opts);
+    }
+
+    /**
+     * This endpoint creates a draft invoice for a given customer. The draft invoice
+     * created pulls in all pending invoice items on that customer, including
+     * prorations. The invoice remains a draft until you <a
+     * href="#finalize_invoice">finalize</a> the invoice, which allows you to <a
+     * href="#pay_invoice">pay</a> or <a href="#send_invoice">send</a> the invoice to
+     * your customers.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Invoice
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/invoices', $params, $opts);
+    }
+
+    /**
+     * Permanently deletes a one-off invoice draft. This cannot be undone. Attempts to
+     * delete invoices that are no longer in a draft state will fail; once an invoice
+     * has been finalized or if an invoice is for a subscription, it must be <a
+     * href="#void_invoice">voided</a>.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Invoice
+     */
+    public function delete($id, $params = null, $opts = null)
+    {
+        return $this->request('delete', $this->buildPath('/v1/invoices/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Stripe automatically finalizes drafts before sending and attempting payment on
+     * invoices. However, if you’d like to finalize a draft invoice manually, you can
+     * do so using this method.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Invoice
+     */
+    public function finalizeInvoice($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/invoices/%s/finalize', $id), $params, $opts);
+    }
+
+    /**
+     * Marking an invoice as uncollectible is useful for keeping track of bad debts
+     * that can be written off for accounting purposes.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Invoice
+     */
+    public function markUncollectible($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/invoices/%s/mark_uncollectible', $id), $params, $opts);
+    }
+
+    /**
+     * Stripe automatically creates and then attempts to collect payment on invoices
+     * for customers on subscriptions according to your <a
+     * href="https://dashboard.stripe.com/account/billing/automatic">subscriptions
+     * settings</a>. However, if you’d like to attempt payment on an invoice out of the
+     * normal collection schedule or for some other reason, you can do so.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Invoice
+     */
+    public function pay($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/invoices/%s/pay', $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves the invoice with the given ID.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Invoice
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/invoices/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Stripe will automatically send invoices to customers according to your <a
+     * href="https://dashboard.stripe.com/account/billing/automatic">subscriptions
+     * settings</a>. However, if you’d like to manually send an invoice to your
+     * customer out of the normal schedule, you can do so. When sending invoices that
+     * have already been paid, there will be no reference to the payment in the email.
+     *
+     * Requests made in test-mode result in no emails being sent, despite sending an
+     * <code>invoice.sent</code> event.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Invoice
+     */
+    public function sendInvoice($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/invoices/%s/send', $id), $params, $opts);
+    }
+
+    /**
+     * At any time, you can preview the upcoming invoice for a customer. This will show
+     * you all the charges that are pending, including subscription renewal charges,
+     * invoice item charges, etc. It will also show you any discounts that are
+     * applicable to the invoice.
+     *
+     * Note that when you are viewing an upcoming invoice, you are simply viewing a
+     * preview – the invoice has not yet been created. As such, the upcoming invoice
+     * will not show up in invoice listing calls, and you cannot use the API to pay or
+     * edit the invoice. If you want to change the amount that your customer will be
+     * billed, you can add, remove, or update pending invoice items, or update the
+     * customer’s discount.
+     *
+     * You can preview the effects of updating a subscription, including a preview of
+     * what proration will take place. To ensure that the actual proration is
+     * calculated exactly the same as the previewed proration, you should pass a
+     * <code>proration_date</code> parameter when doing the actual subscription update.
+     * The value passed in should be the same as the
+     * <code>subscription_proration_date</code> returned on the upcoming invoice
+     * resource. The recommended way to get only the prorations being previewed is to
+     * consider only proration line items where <code>period[start]</code> is equal to
+     * the <code>subscription_proration_date</code> on the upcoming invoice resource.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Invoice
+     */
+    public function upcoming($params = null, $opts = null)
+    {
+        return $this->request('get', '/v1/invoices/upcoming', $params, $opts);
+    }
+
+    /**
+     * When retrieving an upcoming invoice, you’ll get a <strong>lines</strong>
+     * property containing the total count of line items and the first handful of those
+     * items. There is also a URL where you can retrieve the full (paginated) list of
+     * line items.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Invoice
+     */
+    public function upcomingLines($params = null, $opts = null)
+    {
+        return $this->request('get', '/v1/invoices/upcoming/lines', $params, $opts);
+    }
+
+    /**
+     * Draft invoices are fully editable. Once an invoice is <a
+     * href="/docs/billing/invoices/workflow#finalized">finalized</a>, monetary values,
+     * as well as <code>collection_method</code>, become uneditable.
+     *
+     * If you would like to stop the Stripe Billing engine from automatically
+     * finalizing, reattempting payments on, sending reminders for, or <a
+     * href="/docs/billing/invoices/reconciliation">automatically reconciling</a>
+     * invoices, pass <code>auto_advance=false</code>.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Invoice
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/invoices/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Mark a finalized invoice as void. This cannot be undone. Voiding an invoice is
+     * similar to <a href="#delete_invoice">deletion</a>, however it only applies to
+     * finalized invoices and maintains a papertrail where the invoice can still be
+     * found.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Invoice
+     */
+    public function voidInvoice($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/invoices/%s/void', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/Issuing/AuthorizationService.php b/htdocs/includes/stripe/stripe-php/lib/Service/Issuing/AuthorizationService.php
new file mode 100644
index 00000000000..6fff70e7e92
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/Issuing/AuthorizationService.php
@@ -0,0 +1,97 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\Issuing;
+
+class AuthorizationService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of Issuing <code>Authorization</code> objects. The objects are
+     * sorted in descending order by creation date, with the most recently created
+     * object appearing first.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/issuing/authorizations', $params, $opts);
+    }
+
+    /**
+     * Approves a pending Issuing <code>Authorization</code> object. This request
+     * should be made within the timeout window of the <a
+     * href="/docs/issuing/controls/real-time-authorizations">real-time
+     * authorization</a> flow.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Issuing\Authorization
+     */
+    public function approve($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/issuing/authorizations/%s/approve', $id), $params, $opts);
+    }
+
+    /**
+     * Declines a pending Issuing <code>Authorization</code> object. This request
+     * should be made within the timeout window of the <a
+     * href="/docs/issuing/controls/real-time-authorizations">real time
+     * authorization</a> flow.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Issuing\Authorization
+     */
+    public function decline($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/issuing/authorizations/%s/decline', $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves an Issuing <code>Authorization</code> object.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Issuing\Authorization
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/issuing/authorizations/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates the specified Issuing <code>Authorization</code> object by setting the
+     * values of the parameters passed. Any parameters not provided will be left
+     * unchanged.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Issuing\Authorization
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/issuing/authorizations/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/Issuing/CardService.php b/htdocs/includes/stripe/stripe-php/lib/Service/Issuing/CardService.php
new file mode 100644
index 00000000000..346d54afae3
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/Issuing/CardService.php
@@ -0,0 +1,73 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\Issuing;
+
+class CardService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of Issuing <code>Card</code> objects. The objects are sorted in
+     * descending order by creation date, with the most recently created object
+     * appearing first.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/issuing/cards', $params, $opts);
+    }
+
+    /**
+     * Creates an Issuing <code>Card</code> object.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Issuing\Card
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/issuing/cards', $params, $opts);
+    }
+
+    /**
+     * Retrieves an Issuing <code>Card</code> object.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Issuing\Card
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/issuing/cards/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates the specified Issuing <code>Card</code> object by setting the values of
+     * the parameters passed. Any parameters not provided will be left unchanged.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Issuing\Card
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/issuing/cards/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/Issuing/CardholderService.php b/htdocs/includes/stripe/stripe-php/lib/Service/Issuing/CardholderService.php
new file mode 100644
index 00000000000..5731b1bf14c
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/Issuing/CardholderService.php
@@ -0,0 +1,74 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\Issuing;
+
+class CardholderService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of Issuing <code>Cardholder</code> objects. The objects are
+     * sorted in descending order by creation date, with the most recently created
+     * object appearing first.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/issuing/cardholders', $params, $opts);
+    }
+
+    /**
+     * Creates a new Issuing <code>Cardholder</code> object that can be issued cards.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Issuing\Cardholder
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/issuing/cardholders', $params, $opts);
+    }
+
+    /**
+     * Retrieves an Issuing <code>Cardholder</code> object.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Issuing\Cardholder
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/issuing/cardholders/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates the specified Issuing <code>Cardholder</code> object by setting the
+     * values of the parameters passed. Any parameters not provided will be left
+     * unchanged.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Issuing\Cardholder
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/issuing/cardholders/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/Issuing/DisputeService.php b/htdocs/includes/stripe/stripe-php/lib/Service/Issuing/DisputeService.php
new file mode 100644
index 00000000000..ab5df5f3e79
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/Issuing/DisputeService.php
@@ -0,0 +1,99 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\Issuing;
+
+class DisputeService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of Issuing <code>Dispute</code> objects. The objects are sorted
+     * in descending order by creation date, with the most recently created object
+     * appearing first.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/issuing/disputes', $params, $opts);
+    }
+
+    /**
+     * Creates an Issuing <code>Dispute</code> object. Individual pieces of evidence
+     * within the <code>evidence</code> object are optional at this point. Stripe only
+     * validates that required evidence is present during submission. Refer to <a
+     * href="/docs/issuing/purchases/disputes#dispute-reasons-and-evidence">Dispute
+     * reasons and evidence</a> for more details about evidence requirements.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Issuing\Dispute
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/issuing/disputes', $params, $opts);
+    }
+
+    /**
+     * Retrieves an Issuing <code>Dispute</code> object.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Issuing\Dispute
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/issuing/disputes/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Submits an Issuing <code>Dispute</code> to the card network. Stripe validates
+     * that all evidence fields required for the dispute’s reason are present. For more
+     * details, see <a
+     * href="/docs/issuing/purchases/disputes#dispute-reasons-and-evidence">Dispute
+     * reasons and evidence</a>.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Issuing\Dispute
+     */
+    public function submit($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/issuing/disputes/%s/submit', $id), $params, $opts);
+    }
+
+    /**
+     * Updates the specified Issuing <code>Dispute</code> object by setting the values
+     * of the parameters passed. Any parameters not provided will be left unchanged.
+     * Properties on the <code>evidence</code> object can be unset by passing in an
+     * empty string.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Issuing\Dispute
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/issuing/disputes/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/Issuing/IssuingServiceFactory.php b/htdocs/includes/stripe/stripe-php/lib/Service/Issuing/IssuingServiceFactory.php
new file mode 100644
index 00000000000..a8d5d0f8167
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/Issuing/IssuingServiceFactory.php
@@ -0,0 +1,33 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\Issuing;
+
+/**
+ * Service factory class for API resources in the Issuing namespace.
+ *
+ * @property AuthorizationService $authorizations
+ * @property CardholderService $cardholders
+ * @property CardService $cards
+ * @property DisputeService $disputes
+ * @property TransactionService $transactions
+ */
+class IssuingServiceFactory extends \Stripe\Service\AbstractServiceFactory
+{
+    /**
+     * @var array<string, string>
+     */
+    private static $classMap = [
+        'authorizations' => AuthorizationService::class,
+        'cardholders' => CardholderService::class,
+        'cards' => CardService::class,
+        'disputes' => DisputeService::class,
+        'transactions' => TransactionService::class,
+    ];
+
+    protected function getServiceClass($name)
+    {
+        return \array_key_exists($name, self::$classMap) ? self::$classMap[$name] : null;
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/Issuing/TransactionService.php b/htdocs/includes/stripe/stripe-php/lib/Service/Issuing/TransactionService.php
new file mode 100644
index 00000000000..8fb0ee2ac64
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/Issuing/TransactionService.php
@@ -0,0 +1,59 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\Issuing;
+
+class TransactionService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of Issuing <code>Transaction</code> objects. The objects are
+     * sorted in descending order by creation date, with the most recently created
+     * object appearing first.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/issuing/transactions', $params, $opts);
+    }
+
+    /**
+     * Retrieves an Issuing <code>Transaction</code> object.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Issuing\Transaction
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/issuing/transactions/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates the specified Issuing <code>Transaction</code> object by setting the
+     * values of the parameters passed. Any parameters not provided will be left
+     * unchanged.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Issuing\Transaction
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/issuing/transactions/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/MandateService.php b/htdocs/includes/stripe/stripe-php/lib/Service/MandateService.php
new file mode 100644
index 00000000000..156bff0a02b
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/MandateService.php
@@ -0,0 +1,24 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class MandateService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Retrieves a Mandate object.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Mandate
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/mandates/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/OAuthService.php b/htdocs/includes/stripe/stripe-php/lib/Service/OAuthService.php
new file mode 100644
index 00000000000..b745ad9876e
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/OAuthService.php
@@ -0,0 +1,150 @@
+<?php
+
+namespace Stripe\Service;
+
+class OAuthService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Sends a request to Stripe's Connect API.
+     *
+     * @param string $method the HTTP method
+     * @param string $path the path of the request
+     * @param array $params the parameters of the request
+     * @param array|\Stripe\Util\RequestOptions $opts the special modifiers of the request
+     *
+     * @return \Stripe\StripeObject the object returned by Stripe's Connect API
+     */
+    protected function requestConnect($method, $path, $params, $opts)
+    {
+        $opts = $this->_parseOpts($opts);
+        $opts->apiBase = $this->_getBase($opts);
+
+        return $this->request($method, $path, $params, $opts);
+    }
+
+    /**
+     * Generates a URL to Stripe's OAuth form.
+     *
+     * @param null|array $params
+     * @param null|array $opts
+     *
+     * @return string the URL to Stripe's OAuth form
+     */
+    public function authorizeUrl($params = null, $opts = null)
+    {
+        $params = $params ?: [];
+
+        $opts = $this->_parseOpts($opts);
+        $base = $this->_getBase($opts);
+
+        $params['client_id'] = $this->_getClientId($params);
+        if (!\array_key_exists('response_type', $params)) {
+            $params['response_type'] = 'code';
+        }
+        $query = \Stripe\Util\Util::encodeParameters($params);
+
+        return $base . '/oauth/authorize?' . $query;
+    }
+
+    /**
+     * Use an authoriztion code to connect an account to your platform and
+     * fetch the user's credentials.
+     *
+     * @param null|array $params
+     * @param null|array $opts
+     *
+     * @throws \Stripe\Exception\OAuth\OAuthErrorException if the request fails
+     *
+     * @return \Stripe\StripeObject object containing the response from the API
+     */
+    public function token($params = null, $opts = null)
+    {
+        $params = $params ?: [];
+        $params['client_secret'] = $this->_getClientSecret($params);
+
+        return $this->requestConnect('post', '/oauth/token', $params, $opts);
+    }
+
+    /**
+     * Disconnects an account from your platform.
+     *
+     * @param null|array $params
+     * @param null|array $opts
+     *
+     * @throws \Stripe\Exception\OAuth\OAuthErrorException if the request fails
+     *
+     * @return \Stripe\StripeObject object containing the response from the API
+     */
+    public function deauthorize($params = null, $opts = null)
+    {
+        $params = $params ?: [];
+        $params['client_id'] = $this->_getClientId($params);
+
+        return $this->requestConnect('post', '/oauth/deauthorize', $params, $opts);
+    }
+
+    private function _getClientId($params = null)
+    {
+        $clientId = ($params && \array_key_exists('client_id', $params)) ? $params['client_id'] : null;
+
+        if (null === $clientId) {
+            $clientId = $this->client->getClientId();
+        }
+        if (null === $clientId) {
+            $msg = 'No client_id provided. (HINT: set your client_id using '
+              . '`new \Stripe\StripeClient([clientId => <CLIENT-ID>
+                ])`)".  You can find your client_ids '
+              . 'in your Stripe dashboard at '
+              . 'https://dashboard.stripe.com/account/applications/settings, '
+              . 'after registering your account as a platform. See '
+              . 'https://stripe.com/docs/connect/standard-accounts for details, '
+              . 'or email support@stripe.com if you have any questions.';
+
+            throw new \Stripe\Exception\AuthenticationException($msg);
+        }
+
+        return $clientId;
+    }
+
+    private function _getClientSecret($params = null)
+    {
+        if (\array_key_exists('client_secret', $params)) {
+            return $params['client_secret'];
+        }
+
+        return $this->client->getApiKey();
+    }
+
+    /**
+     * @param array|\Stripe\Util\RequestOptions $opts the special modifiers of the request
+     *
+     * @throws \Stripe\Exception\InvalidArgumentException
+     *
+     * @return \Stripe\Util\RequestOptions
+     */
+    private function _parseOpts($opts)
+    {
+        if (\is_array($opts)) {
+            if (\array_key_exists('connect_base', $opts)) {
+                // Throw an exception for the convenience of anybody migrating to
+                // \Stripe\Service\OAuthService from \Stripe\OAuth, where `connect_base`
+                // was the name of the parameter that behaves as `api_base` does here.
+                throw new \Stripe\Exception\InvalidArgumentException('Use `api_base`, not `connect_base`');
+            }
+        }
+
+        return \Stripe\Util\RequestOptions::parse($opts);
+    }
+
+    /**
+     * @param \Stripe\Util\RequestOptions $opts
+     *
+     * @return string
+     */
+    private function _getBase($opts)
+    {
+        return isset($opts->apiBase) ?
+          $opts->apiBase :
+          $this->client->getConnectBase();
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/OrderReturnService.php b/htdocs/includes/stripe/stripe-php/lib/Service/OrderReturnService.php
new file mode 100644
index 00000000000..6183166c52e
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/OrderReturnService.php
@@ -0,0 +1,42 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class OrderReturnService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of your order returns. The returns are returned sorted by
+     * creation date, with the most recently created return appearing first.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/order_returns', $params, $opts);
+    }
+
+    /**
+     * Retrieves the details of an existing order return. Supply the unique order ID
+     * from either an order return creation request or the order return list, and
+     * Stripe will return the corresponding order information.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\OrderReturn
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/order_returns/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/OrderService.php b/htdocs/includes/stripe/stripe-php/lib/Service/OrderService.php
new file mode 100644
index 00000000000..fa658fa7ba5
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/OrderService.php
@@ -0,0 +1,109 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class OrderService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of your orders. The orders are returned sorted by creation date,
+     * with the most recently created orders appearing first.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/orders', $params, $opts);
+    }
+
+    /**
+     * Creates a new order object.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Order
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/orders', $params, $opts);
+    }
+
+    /**
+     * Pay an order by providing a <code>source</code> to create a payment.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Order
+     */
+    public function pay($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/orders/%s/pay', $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves the details of an existing order. Supply the unique order ID from
+     * either an order creation request or the order list, and Stripe will return the
+     * corresponding order information.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Order
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/orders/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Return all or part of an order. The order must have a status of
+     * <code>paid</code> or <code>fulfilled</code> before it can be returned. Once all
+     * items have been returned, the order will become <code>canceled</code> or
+     * <code>returned</code> depending on which status the order started in.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Order
+     */
+    public function returnOrder($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/orders/%s/returns', $id), $params, $opts);
+    }
+
+    /**
+     * Updates the specific order by setting the values of the parameters passed. Any
+     * parameters not provided will be left unchanged.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Order
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/orders/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/PaymentIntentService.php b/htdocs/includes/stripe/stripe-php/lib/Service/PaymentIntentService.php
new file mode 100644
index 00000000000..43aba46d858
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/PaymentIntentService.php
@@ -0,0 +1,181 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class PaymentIntentService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of PaymentIntents.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/payment_intents', $params, $opts);
+    }
+
+    /**
+     * A PaymentIntent object can be canceled when it is in one of these statuses:
+     * <code>requires_payment_method</code>, <code>requires_capture</code>,
+     * <code>requires_confirmation</code>, or <code>requires_action</code>.
+     *
+     * Once canceled, no additional charges will be made by the PaymentIntent and any
+     * operations on the PaymentIntent will fail with an error. For PaymentIntents with
+     * <code>status=’requires_capture’</code>, the remaining
+     * <code>amount_capturable</code> will automatically be refunded.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\PaymentIntent
+     */
+    public function cancel($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/payment_intents/%s/cancel', $id), $params, $opts);
+    }
+
+    /**
+     * Capture the funds of an existing uncaptured PaymentIntent when its status is
+     * <code>requires_capture</code>.
+     *
+     * Uncaptured PaymentIntents will be canceled exactly seven days after they are
+     * created.
+     *
+     * Learn more about <a href="/docs/payments/capture-later">separate authorization
+     * and capture</a>.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\PaymentIntent
+     */
+    public function capture($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/payment_intents/%s/capture', $id), $params, $opts);
+    }
+
+    /**
+     * Confirm that your customer intends to pay with current or provided payment
+     * method. Upon confirmation, the PaymentIntent will attempt to initiate a payment.
+     *
+     * If the selected payment method requires additional authentication steps, the
+     * PaymentIntent will transition to the <code>requires_action</code> status and
+     * suggest additional actions via <code>next_action</code>. If payment fails, the
+     * PaymentIntent will transition to the <code>requires_payment_method</code>
+     * status. If payment succeeds, the PaymentIntent will transition to the
+     * <code>succeeded</code> status (or <code>requires_capture</code>, if
+     * <code>capture_method</code> is set to <code>manual</code>).
+     *
+     * If the <code>confirmation_method</code> is <code>automatic</code>, payment may
+     * be attempted using our <a
+     * href="/docs/stripe-js/reference#stripe-handle-card-payment">client SDKs</a> and
+     * the PaymentIntent’s <a
+     * href="#payment_intent_object-client_secret">client_secret</a>. After
+     * <code>next_action</code>s are handled by the client, no additional confirmation
+     * is required to complete the payment.
+     *
+     * If the <code>confirmation_method</code> is <code>manual</code>, all payment
+     * attempts must be initiated using a secret key. If any actions are required for
+     * the payment, the PaymentIntent will return to the
+     * <code>requires_confirmation</code> state after those actions are completed. Your
+     * server needs to then explicitly re-confirm the PaymentIntent to initiate the
+     * next payment attempt. Read the <a
+     * href="/docs/payments/payment-intents/web-manual">expanded documentation</a> to
+     * learn more about manual confirmation.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\PaymentIntent
+     */
+    public function confirm($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/payment_intents/%s/confirm', $id), $params, $opts);
+    }
+
+    /**
+     * Creates a PaymentIntent object.
+     *
+     * After the PaymentIntent is created, attach a payment method and <a
+     * href="/docs/api/payment_intents/confirm">confirm</a> to continue the payment.
+     * You can read more about the different payment flows available via the Payment
+     * Intents API <a href="/docs/payments/payment-intents">here</a>.
+     *
+     * When <code>confirm=true</code> is used during creation, it is equivalent to
+     * creating and confirming the PaymentIntent in the same call. You may use any
+     * parameters available in the <a href="/docs/api/payment_intents/confirm">confirm
+     * API</a> when <code>confirm=true</code> is supplied.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\PaymentIntent
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/payment_intents', $params, $opts);
+    }
+
+    /**
+     * Retrieves the details of a PaymentIntent that has previously been created.
+     *
+     * Client-side retrieval using a publishable key is allowed when the
+     * <code>client_secret</code> is provided in the query string.
+     *
+     * When retrieved with a publishable key, only a subset of properties will be
+     * returned. Please refer to the <a href="#payment_intent_object">payment
+     * intent</a> object reference for more details.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\PaymentIntent
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/payment_intents/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates properties on a PaymentIntent object without confirming.
+     *
+     * Depending on which properties you update, you may need to confirm the
+     * PaymentIntent again. For example, updating the <code>payment_method</code> will
+     * always require you to confirm the PaymentIntent again. If you prefer to update
+     * and confirm at the same time, we recommend updating properties via the <a
+     * href="/docs/api/payment_intents/confirm">confirm API</a> instead.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\PaymentIntent
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/payment_intents/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/PaymentMethodService.php b/htdocs/includes/stripe/stripe-php/lib/Service/PaymentMethodService.php
new file mode 100644
index 00000000000..7111b9ebc46
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/PaymentMethodService.php
@@ -0,0 +1,121 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class PaymentMethodService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of PaymentMethods for a given Customer.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/payment_methods', $params, $opts);
+    }
+
+    /**
+     * Attaches a PaymentMethod object to a Customer.
+     *
+     * To attach a new PaymentMethod to a customer for future payments, we recommend
+     * you use a <a href="/docs/api/setup_intents">SetupIntent</a> or a PaymentIntent
+     * with <a
+     * href="/docs/api/payment_intents/create#create_payment_intent-setup_future_usage">setup_future_usage</a>.
+     * These approaches will perform any necessary steps to ensure that the
+     * PaymentMethod can be used in a future payment. Using the
+     * <code>/v1/payment_methods/:id/attach</code> endpoint does not ensure that future
+     * payments can be made with the attached PaymentMethod. See <a
+     * href="/docs/payments/payment-intents#future-usage">Optimizing cards for future
+     * payments</a> for more information about setting up future payments.
+     *
+     * To use this PaymentMethod as the default for invoice or subscription payments,
+     * set <a
+     * href="/docs/api/customers/update#update_customer-invoice_settings-default_payment_method"><code>invoice_settings.default_payment_method</code></a>,
+     * on the Customer to the PaymentMethod’s ID.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\PaymentMethod
+     */
+    public function attach($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/payment_methods/%s/attach', $id), $params, $opts);
+    }
+
+    /**
+     * Creates a PaymentMethod object. Read the <a
+     * href="/docs/stripe-js/reference#stripe-create-payment-method">Stripe.js
+     * reference</a> to learn how to create PaymentMethods via Stripe.js.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\PaymentMethod
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/payment_methods', $params, $opts);
+    }
+
+    /**
+     * Detaches a PaymentMethod object from a Customer.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\PaymentMethod
+     */
+    public function detach($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/payment_methods/%s/detach', $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves a PaymentMethod object.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\PaymentMethod
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/payment_methods/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates a PaymentMethod object. A PaymentMethod must be attached a customer to
+     * be updated.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\PaymentMethod
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/payment_methods/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/PayoutService.php b/htdocs/includes/stripe/stripe-php/lib/Service/PayoutService.php
new file mode 100644
index 00000000000..547e22da6ab
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/PayoutService.php
@@ -0,0 +1,127 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class PayoutService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of existing payouts sent to third-party bank accounts or that
+     * Stripe has sent you. The payouts are returned in sorted order, with the most
+     * recently created payouts appearing first.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/payouts', $params, $opts);
+    }
+
+    /**
+     * A previously created payout can be canceled if it has not yet been paid out.
+     * Funds will be refunded to your available balance. You may not cancel automatic
+     * Stripe payouts.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Payout
+     */
+    public function cancel($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/payouts/%s/cancel', $id), $params, $opts);
+    }
+
+    /**
+     * To send funds to your own bank account, you create a new payout object. Your <a
+     * href="#balance">Stripe balance</a> must be able to cover the payout amount, or
+     * you’ll receive an “Insufficient Funds” error.
+     *
+     * If your API key is in test mode, money won’t actually be sent, though everything
+     * else will occur as if in live mode.
+     *
+     * If you are creating a manual payout on a Stripe account that uses multiple
+     * payment source types, you’ll need to specify the source type balance that the
+     * payout should draw from. The <a href="#balance_object">balance object</a>
+     * details available and pending amounts by source type.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Payout
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/payouts', $params, $opts);
+    }
+
+    /**
+     * Retrieves the details of an existing payout. Supply the unique payout ID from
+     * either a payout creation request or the payout list, and Stripe will return the
+     * corresponding payout information.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Payout
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/payouts/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Reverses a payout by debiting the destination bank account. Only payouts for
+     * connected accounts to US bank accounts may be reversed at this time. If the
+     * payout is in the <code>pending</code> status,
+     * <code>/v1/payouts/:id/cancel</code> should be used instead.
+     *
+     * By requesting a reversal via <code>/v1/payouts/:id/reverse</code>, you confirm
+     * that the authorized signatory of the selected bank account has authorized the
+     * debit on the bank account and that no other authorization is required.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Payout
+     */
+    public function reverse($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/payouts/%s/reverse', $id), $params, $opts);
+    }
+
+    /**
+     * Updates the specified payout by setting the values of the parameters passed. Any
+     * parameters not provided will be left unchanged. This request accepts only the
+     * metadata as arguments.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Payout
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/payouts/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/PlanService.php b/htdocs/includes/stripe/stripe-php/lib/Service/PlanService.php
new file mode 100644
index 00000000000..16625d27a9a
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/PlanService.php
@@ -0,0 +1,91 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class PlanService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of your plans.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/plans', $params, $opts);
+    }
+
+    /**
+     * You can now model subscriptions more flexibly using the <a href="#prices">Prices
+     * API</a>. It replaces the Plans API and is backwards compatible to simplify your
+     * migration.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Plan
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/plans', $params, $opts);
+    }
+
+    /**
+     * Deleting plans means new subscribers can’t be added. Existing subscribers aren’t
+     * affected.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Plan
+     */
+    public function delete($id, $params = null, $opts = null)
+    {
+        return $this->request('delete', $this->buildPath('/v1/plans/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves the plan with the given ID.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Plan
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/plans/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates the specified plan by setting the values of the parameters passed. Any
+     * parameters not provided are left unchanged. By design, you cannot change a
+     * plan’s ID, amount, currency, or billing cycle.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Plan
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/plans/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/PriceService.php b/htdocs/includes/stripe/stripe-php/lib/Service/PriceService.php
new file mode 100644
index 00000000000..cc44f69c941
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/PriceService.php
@@ -0,0 +1,72 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class PriceService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of your prices.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/prices', $params, $opts);
+    }
+
+    /**
+     * Creates a new price for an existing product. The price can be recurring or
+     * one-time.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Price
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/prices', $params, $opts);
+    }
+
+    /**
+     * Retrieves the price with the given ID.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Price
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/prices/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates the specified price by setting the values of the parameters passed. Any
+     * parameters not provided are left unchanged.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Price
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/prices/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/ProductService.php b/htdocs/includes/stripe/stripe-php/lib/Service/ProductService.php
new file mode 100644
index 00000000000..850cea56f74
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/ProductService.php
@@ -0,0 +1,92 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class ProductService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of your products. The products are returned sorted by creation
+     * date, with the most recently created products appearing first.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/products', $params, $opts);
+    }
+
+    /**
+     * Creates a new product object.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Product
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/products', $params, $opts);
+    }
+
+    /**
+     * Delete a product. Deleting a product is only possible if it has no prices
+     * associated with it. Additionally, deleting a product with <code>type=good</code>
+     * is only possible if it has no SKUs associated with it.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Product
+     */
+    public function delete($id, $params = null, $opts = null)
+    {
+        return $this->request('delete', $this->buildPath('/v1/products/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves the details of an existing product. Supply the unique product ID from
+     * either a product creation request or the product list, and Stripe will return
+     * the corresponding product information.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Product
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/products/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates the specific product by setting the values of the parameters passed. Any
+     * parameters not provided will be left unchanged.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Product
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/products/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/PromotionCodeService.php b/htdocs/includes/stripe/stripe-php/lib/Service/PromotionCodeService.php
new file mode 100644
index 00000000000..1de5696da4f
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/PromotionCodeService.php
@@ -0,0 +1,72 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class PromotionCodeService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of your promotion codes.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/promotion_codes', $params, $opts);
+    }
+
+    /**
+     * A promotion code points to a coupon. You can optionally restrict the code to a
+     * specific customer, redemption limit, and expiration date.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\PromotionCode
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/promotion_codes', $params, $opts);
+    }
+
+    /**
+     * Retrieves the promotion code with the given ID.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\PromotionCode
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/promotion_codes/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates the specified promotion code by setting the values of the parameters
+     * passed. Most fields are, by design, not editable.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\PromotionCode
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/promotion_codes/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/Radar/EarlyFraudWarningService.php b/htdocs/includes/stripe/stripe-php/lib/Service/Radar/EarlyFraudWarningService.php
new file mode 100644
index 00000000000..7b097348389
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/Radar/EarlyFraudWarningService.php
@@ -0,0 +1,43 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\Radar;
+
+class EarlyFraudWarningService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of early fraud warnings.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/radar/early_fraud_warnings', $params, $opts);
+    }
+
+    /**
+     * Retrieves the details of an early fraud warning that has previously been
+     * created.
+     *
+     * Please refer to the <a href="#early_fraud_warning_object">early fraud
+     * warning</a> object reference for more details.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Radar\EarlyFraudWarning
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/radar/early_fraud_warnings/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/Radar/RadarServiceFactory.php b/htdocs/includes/stripe/stripe-php/lib/Service/Radar/RadarServiceFactory.php
new file mode 100644
index 00000000000..b093c671749
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/Radar/RadarServiceFactory.php
@@ -0,0 +1,29 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\Radar;
+
+/**
+ * Service factory class for API resources in the Radar namespace.
+ *
+ * @property EarlyFraudWarningService $earlyFraudWarnings
+ * @property ValueListItemService $valueListItems
+ * @property ValueListService $valueLists
+ */
+class RadarServiceFactory extends \Stripe\Service\AbstractServiceFactory
+{
+    /**
+     * @var array<string, string>
+     */
+    private static $classMap = [
+        'earlyFraudWarnings' => EarlyFraudWarningService::class,
+        'valueListItems' => ValueListItemService::class,
+        'valueLists' => ValueListService::class,
+    ];
+
+    protected function getServiceClass($name)
+    {
+        return \array_key_exists($name, self::$classMap) ? self::$classMap[$name] : null;
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/Radar/ValueListItemService.php b/htdocs/includes/stripe/stripe-php/lib/Service/Radar/ValueListItemService.php
new file mode 100644
index 00000000000..89eba2a7a88
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/Radar/ValueListItemService.php
@@ -0,0 +1,74 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\Radar;
+
+class ValueListItemService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of <code>ValueListItem</code> objects. The objects are sorted in
+     * descending order by creation date, with the most recently created object
+     * appearing first.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/radar/value_list_items', $params, $opts);
+    }
+
+    /**
+     * Creates a new <code>ValueListItem</code> object, which is added to the specified
+     * parent value list.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Radar\ValueListItem
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/radar/value_list_items', $params, $opts);
+    }
+
+    /**
+     * Deletes a <code>ValueListItem</code> object, removing it from its parent value
+     * list.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Radar\ValueListItem
+     */
+    public function delete($id, $params = null, $opts = null)
+    {
+        return $this->request('delete', $this->buildPath('/v1/radar/value_list_items/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves a <code>ValueListItem</code> object.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Radar\ValueListItem
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/radar/value_list_items/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/Radar/ValueListService.php b/htdocs/includes/stripe/stripe-php/lib/Service/Radar/ValueListService.php
new file mode 100644
index 00000000000..64ac2ee790c
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/Radar/ValueListService.php
@@ -0,0 +1,93 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\Radar;
+
+class ValueListService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of <code>ValueList</code> objects. The objects are sorted in
+     * descending order by creation date, with the most recently created object
+     * appearing first.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/radar/value_lists', $params, $opts);
+    }
+
+    /**
+     * Creates a new <code>ValueList</code> object, which can then be referenced in
+     * rules.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Radar\ValueList
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/radar/value_lists', $params, $opts);
+    }
+
+    /**
+     * Deletes a <code>ValueList</code> object, also deleting any items contained
+     * within the value list. To be deleted, a value list must not be referenced in any
+     * rules.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Radar\ValueList
+     */
+    public function delete($id, $params = null, $opts = null)
+    {
+        return $this->request('delete', $this->buildPath('/v1/radar/value_lists/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves a <code>ValueList</code> object.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Radar\ValueList
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/radar/value_lists/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates a <code>ValueList</code> object by setting the values of the parameters
+     * passed. Any parameters not provided will be left unchanged. Note that
+     * <code>item_type</code> is immutable.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Radar\ValueList
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/radar/value_lists/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/RefundService.php b/htdocs/includes/stripe/stripe-php/lib/Service/RefundService.php
new file mode 100644
index 00000000000..49b4267e40a
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/RefundService.php
@@ -0,0 +1,76 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class RefundService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of all refunds you’ve previously created. The refunds are
+     * returned in sorted order, with the most recent refunds appearing first. For
+     * convenience, the 10 most recent refunds are always available by default on the
+     * charge object.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/refunds', $params, $opts);
+    }
+
+    /**
+     * Create a refund.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Refund
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/refunds', $params, $opts);
+    }
+
+    /**
+     * Retrieves the details of an existing refund.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Refund
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/refunds/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates the specified refund by setting the values of the parameters passed. Any
+     * parameters not provided will be left unchanged.
+     *
+     * This request only accepts <code>metadata</code> as an argument.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Refund
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/refunds/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/Reporting/ReportRunService.php b/htdocs/includes/stripe/stripe-php/lib/Service/Reporting/ReportRunService.php
new file mode 100644
index 00000000000..46e2139a2bb
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/Reporting/ReportRunService.php
@@ -0,0 +1,57 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\Reporting;
+
+class ReportRunService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of Report Runs, with the most recent appearing first. (Requires a
+     * <a href="https://stripe.com/docs/keys#test-live-modes">live-mode API key</a>.).
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/reporting/report_runs', $params, $opts);
+    }
+
+    /**
+     * Creates a new object and begin running the report. (Requires a <a
+     * href="https://stripe.com/docs/keys#test-live-modes">live-mode API key</a>.).
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Reporting\ReportRun
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/reporting/report_runs', $params, $opts);
+    }
+
+    /**
+     * Retrieves the details of an existing Report Run. (Requires a <a
+     * href="https://stripe.com/docs/keys#test-live-modes">live-mode API key</a>.).
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Reporting\ReportRun
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/reporting/report_runs/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/Reporting/ReportTypeService.php b/htdocs/includes/stripe/stripe-php/lib/Service/Reporting/ReportTypeService.php
new file mode 100644
index 00000000000..46f6bf83e1f
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/Reporting/ReportTypeService.php
@@ -0,0 +1,41 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\Reporting;
+
+class ReportTypeService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a full list of Report Types. (Requires a <a
+     * href="https://stripe.com/docs/keys#test-live-modes">live-mode API key</a>.).
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/reporting/report_types', $params, $opts);
+    }
+
+    /**
+     * Retrieves the details of a Report Type. (Requires a <a
+     * href="https://stripe.com/docs/keys#test-live-modes">live-mode API key</a>.).
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Reporting\ReportType
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/reporting/report_types/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/Reporting/ReportingServiceFactory.php b/htdocs/includes/stripe/stripe-php/lib/Service/Reporting/ReportingServiceFactory.php
new file mode 100644
index 00000000000..7832e917521
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/Reporting/ReportingServiceFactory.php
@@ -0,0 +1,27 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\Reporting;
+
+/**
+ * Service factory class for API resources in the Reporting namespace.
+ *
+ * @property ReportRunService $reportRuns
+ * @property ReportTypeService $reportTypes
+ */
+class ReportingServiceFactory extends \Stripe\Service\AbstractServiceFactory
+{
+    /**
+     * @var array<string, string>
+     */
+    private static $classMap = [
+        'reportRuns' => ReportRunService::class,
+        'reportTypes' => ReportTypeService::class,
+    ];
+
+    protected function getServiceClass($name)
+    {
+        return \array_key_exists($name, self::$classMap) ? self::$classMap[$name] : null;
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/ReviewService.php b/htdocs/includes/stripe/stripe-php/lib/Service/ReviewService.php
new file mode 100644
index 00000000000..ea152f23e82
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/ReviewService.php
@@ -0,0 +1,58 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class ReviewService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of <code>Review</code> objects that have <code>open</code> set to
+     * <code>true</code>. The objects are sorted in descending order by creation date,
+     * with the most recently created object appearing first.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/reviews', $params, $opts);
+    }
+
+    /**
+     * Approves a <code>Review</code> object, closing it and removing it from the list
+     * of reviews.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Review
+     */
+    public function approve($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/reviews/%s/approve', $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves a <code>Review</code> object.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Review
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/reviews/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/SetupAttemptService.php b/htdocs/includes/stripe/stripe-php/lib/Service/SetupAttemptService.php
new file mode 100644
index 00000000000..7376ea13e72
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/SetupAttemptService.php
@@ -0,0 +1,23 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class SetupAttemptService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of SetupAttempts associated with a provided SetupIntent.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/setup_attempts', $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/SetupIntentService.php b/htdocs/includes/stripe/stripe-php/lib/Service/SetupIntentService.php
new file mode 100644
index 00000000000..3cbec506f69
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/SetupIntentService.php
@@ -0,0 +1,127 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class SetupIntentService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of SetupIntents.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/setup_intents', $params, $opts);
+    }
+
+    /**
+     * A SetupIntent object can be canceled when it is in one of these statuses:
+     * <code>requires_payment_method</code>, <code>requires_confirmation</code>, or
+     * <code>requires_action</code>.
+     *
+     * Once canceled, setup is abandoned and any operations on the SetupIntent will
+     * fail with an error.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SetupIntent
+     */
+    public function cancel($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/setup_intents/%s/cancel', $id), $params, $opts);
+    }
+
+    /**
+     * Confirm that your customer intends to set up the current or provided payment
+     * method. For example, you would confirm a SetupIntent when a customer hits the
+     * “Save” button on a payment method management page on your website.
+     *
+     * If the selected payment method does not require any additional steps from the
+     * customer, the SetupIntent will transition to the <code>succeeded</code> status.
+     *
+     * Otherwise, it will transition to the <code>requires_action</code> status and
+     * suggest additional actions via <code>next_action</code>. If setup fails, the
+     * SetupIntent will transition to the <code>requires_payment_method</code> status.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SetupIntent
+     */
+    public function confirm($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/setup_intents/%s/confirm', $id), $params, $opts);
+    }
+
+    /**
+     * Creates a SetupIntent object.
+     *
+     * After the SetupIntent is created, attach a payment method and <a
+     * href="/docs/api/setup_intents/confirm">confirm</a> to collect any required
+     * permissions to charge the payment method later.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SetupIntent
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/setup_intents', $params, $opts);
+    }
+
+    /**
+     * Retrieves the details of a SetupIntent that has previously been created.
+     *
+     * Client-side retrieval using a publishable key is allowed when the
+     * <code>client_secret</code> is provided in the query string.
+     *
+     * When retrieved with a publishable key, only a subset of properties will be
+     * returned. Please refer to the <a href="#setup_intent_object">SetupIntent</a>
+     * object reference for more details.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SetupIntent
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/setup_intents/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates a SetupIntent object.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SetupIntent
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/setup_intents/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/Sigma/ScheduledQueryRunService.php b/htdocs/includes/stripe/stripe-php/lib/Service/Sigma/ScheduledQueryRunService.php
new file mode 100644
index 00000000000..92641751bc7
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/Sigma/ScheduledQueryRunService.php
@@ -0,0 +1,39 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\Sigma;
+
+class ScheduledQueryRunService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of scheduled query runs.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/sigma/scheduled_query_runs', $params, $opts);
+    }
+
+    /**
+     * Retrieves the details of an scheduled query run.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Sigma\ScheduledQueryRun
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/sigma/scheduled_query_runs/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/Sigma/SigmaServiceFactory.php b/htdocs/includes/stripe/stripe-php/lib/Service/Sigma/SigmaServiceFactory.php
new file mode 100644
index 00000000000..356750f477c
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/Sigma/SigmaServiceFactory.php
@@ -0,0 +1,25 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\Sigma;
+
+/**
+ * Service factory class for API resources in the Sigma namespace.
+ *
+ * @property ScheduledQueryRunService $scheduledQueryRuns
+ */
+class SigmaServiceFactory extends \Stripe\Service\AbstractServiceFactory
+{
+    /**
+     * @var array<string, string>
+     */
+    private static $classMap = [
+        'scheduledQueryRuns' => ScheduledQueryRunService::class,
+    ];
+
+    protected function getServiceClass($name)
+    {
+        return \array_key_exists($name, self::$classMap) ? self::$classMap[$name] : null;
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/SkuService.php b/htdocs/includes/stripe/stripe-php/lib/Service/SkuService.php
new file mode 100644
index 00000000000..8934f206443
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/SkuService.php
@@ -0,0 +1,95 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class SkuService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of your SKUs. The SKUs are returned sorted by creation date, with
+     * the most recently created SKUs appearing first.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/skus', $params, $opts);
+    }
+
+    /**
+     * Creates a new SKU associated with a product.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SKU
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/skus', $params, $opts);
+    }
+
+    /**
+     * Delete a SKU. Deleting a SKU is only possible until it has been used in an
+     * order.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SKU
+     */
+    public function delete($id, $params = null, $opts = null)
+    {
+        return $this->request('delete', $this->buildPath('/v1/skus/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves the details of an existing SKU. Supply the unique SKU identifier from
+     * either a SKU creation request or from the product, and Stripe will return the
+     * corresponding SKU information.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SKU
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/skus/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates the specific SKU by setting the values of the parameters passed. Any
+     * parameters not provided will be left unchanged.
+     *
+     * Note that a SKU’s <code>attributes</code> are not editable. Instead, you would
+     * need to deactivate the existing SKU and create a new one with the new attribute
+     * values.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SKU
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/skus/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/SourceService.php b/htdocs/includes/stripe/stripe-php/lib/Service/SourceService.php
new file mode 100644
index 00000000000..c6cc0596467
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/SourceService.php
@@ -0,0 +1,110 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class SourceService extends \Stripe\Service\AbstractService
+{
+    /**
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Source
+     */
+    public function allTransactions($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/sources/%s/source_transactions', $id), $params, $opts);
+    }
+
+    /**
+     * Creates a new source object.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Source
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/sources', $params, $opts);
+    }
+
+    /**
+     * Delete a specified source for a given customer.
+     *
+     * @param string $parentId
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Source
+     */
+    public function detach($parentId, $id, $params = null, $opts = null)
+    {
+        return $this->request('delete', $this->buildPath('/v1/customers/%s/sources/%s', $parentId, $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves an existing source object. Supply the unique source ID from a source
+     * creation request and Stripe will return the corresponding up-to-date source
+     * object information.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Source
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/sources/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates the specified source by setting the values of the parameters passed. Any
+     * parameters not provided will be left unchanged.
+     *
+     * This request accepts the <code>metadata</code> and <code>owner</code> as
+     * arguments. It is also possible to update type specific information for selected
+     * payment methods. Please refer to our <a href="/docs/sources">payment method
+     * guides</a> for more detail.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Source
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/sources/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Verify a given source.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Source
+     */
+    public function verify($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/sources/%s/verify', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/SubscriptionItemService.php b/htdocs/includes/stripe/stripe-php/lib/Service/SubscriptionItemService.php
new file mode 100644
index 00000000000..3b2aa2b1268
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/SubscriptionItemService.php
@@ -0,0 +1,151 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class SubscriptionItemService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of your subscription items for a given subscription.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/subscription_items', $params, $opts);
+    }
+
+    /**
+     * For the specified subscription item, returns a list of summary objects. Each
+     * object in the list provides usage information that’s been summarized from
+     * multiple usage records and over a subscription billing period (e.g., 15 usage
+     * records in the month of September).
+     *
+     * The list is sorted in reverse-chronological order (newest first). The first list
+     * item represents the most current usage period that hasn’t ended yet. Since new
+     * usage records can still be added, the returned summary information for the
+     * subscription item’s ID should be seen as unstable until the subscription billing
+     * period ends.
+     *
+     * @param string $parentId
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function allUsageRecordSummaries($parentId, $params = null, $opts = null)
+    {
+        return $this->requestCollection('get', $this->buildPath('/v1/subscription_items/%s/usage_record_summaries', $parentId), $params, $opts);
+    }
+
+    /**
+     * Adds a new item to an existing subscription. No existing items will be changed
+     * or replaced.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SubscriptionItem
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/subscription_items', $params, $opts);
+    }
+
+    /**
+     * Creates a usage record for a specified subscription item and date, and fills it
+     * with a quantity.
+     *
+     * Usage records provide <code>quantity</code> information that Stripe uses to
+     * track how much a customer is using your service. With usage information and the
+     * pricing model set up by the <a
+     * href="https://stripe.com/docs/billing/subscriptions/metered-billing">metered
+     * billing</a> plan, Stripe helps you send accurate invoices to your customers.
+     *
+     * The default calculation for usage is to add up all the <code>quantity</code>
+     * values of the usage records within a billing period. You can change this default
+     * behavior with the billing plan’s <code>aggregate_usage</code> <a
+     * href="/docs/api/plans/create#create_plan-aggregate_usage">parameter</a>. When
+     * there is more than one usage record with the same timestamp, Stripe adds the
+     * <code>quantity</code> values together. In most cases, this is the desired
+     * resolution, however, you can change this behavior with the <code>action</code>
+     * parameter.
+     *
+     * The default pricing model for metered billing is <a
+     * href="/docs/api/plans/object#plan_object-billing_scheme">per-unit pricing</a>.
+     * For finer granularity, you can configure metered billing to have a <a
+     * href="https://stripe.com/docs/billing/subscriptions/tiers">tiered pricing</a>
+     * model.
+     *
+     * @param string $parentId
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\UsageRecord
+     */
+    public function createUsageRecord($parentId, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/subscription_items/%s/usage_records', $parentId), $params, $opts);
+    }
+
+    /**
+     * Deletes an item from the subscription. Removing a subscription item from a
+     * subscription will not cancel the subscription.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SubscriptionItem
+     */
+    public function delete($id, $params = null, $opts = null)
+    {
+        return $this->request('delete', $this->buildPath('/v1/subscription_items/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves the subscription item with the given ID.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SubscriptionItem
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/subscription_items/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates the plan or quantity of an item on a current subscription.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SubscriptionItem
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/subscription_items/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/SubscriptionScheduleService.php b/htdocs/includes/stripe/stripe-php/lib/Service/SubscriptionScheduleService.php
new file mode 100644
index 00000000000..9eed460604e
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/SubscriptionScheduleService.php
@@ -0,0 +1,113 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class SubscriptionScheduleService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Retrieves the list of your subscription schedules.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/subscription_schedules', $params, $opts);
+    }
+
+    /**
+     * Cancels a subscription schedule and its associated subscription immediately (if
+     * the subscription schedule has an active subscription). A subscription schedule
+     * can only be canceled if its status is <code>not_started</code> or
+     * <code>active</code>.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SubscriptionSchedule
+     */
+    public function cancel($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/subscription_schedules/%s/cancel', $id), $params, $opts);
+    }
+
+    /**
+     * Creates a new subscription schedule object. Each customer can have up to 500
+     * active or scheduled subscriptions.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SubscriptionSchedule
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/subscription_schedules', $params, $opts);
+    }
+
+    /**
+     * Releases the subscription schedule immediately, which will stop scheduling of
+     * its phases, but leave any existing subscription in place. A schedule can only be
+     * released if its status is <code>not_started</code> or <code>active</code>. If
+     * the subscription schedule is currently associated with a subscription, releasing
+     * it will remove its <code>subscription</code> property and set the subscription’s
+     * ID to the <code>released_subscription</code> property.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SubscriptionSchedule
+     */
+    public function release($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/subscription_schedules/%s/release', $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves the details of an existing subscription schedule. You only need to
+     * supply the unique subscription schedule identifier that was returned upon
+     * subscription schedule creation.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SubscriptionSchedule
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/subscription_schedules/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates an existing subscription schedule.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SubscriptionSchedule
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/subscription_schedules/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/SubscriptionService.php b/htdocs/includes/stripe/stripe-php/lib/Service/SubscriptionService.php
new file mode 100644
index 00000000000..f3ac768c891
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/SubscriptionService.php
@@ -0,0 +1,124 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class SubscriptionService extends \Stripe\Service\AbstractService
+{
+    /**
+     * By default, returns a list of subscriptions that have not been canceled. In
+     * order to list canceled subscriptions, specify <code>status=canceled</code>.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/subscriptions', $params, $opts);
+    }
+
+    /**
+     * Cancels a customer’s subscription immediately. The customer will not be charged
+     * again for the subscription.
+     *
+     * Note, however, that any pending invoice items that you’ve created will still be
+     * charged for at the end of the period, unless manually <a
+     * href="#delete_invoiceitem">deleted</a>. If you’ve set the subscription to cancel
+     * at the end of the period, any pending prorations will also be left in place and
+     * collected at the end of the period. But if the subscription is set to cancel
+     * immediately, pending prorations will be removed.
+     *
+     * By default, upon subscription cancellation, Stripe will stop automatic
+     * collection of all finalized invoices for the customer. This is intended to
+     * prevent unexpected payment attempts after the customer has canceled a
+     * subscription. However, you can resume automatic collection of the invoices
+     * manually after subscription cancellation to have us proceed. Or, you could check
+     * for unpaid invoices before allowing the customer to cancel the subscription at
+     * all.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Subscription
+     */
+    public function cancel($id, $params = null, $opts = null)
+    {
+        return $this->request('delete', $this->buildPath('/v1/subscriptions/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Creates a new subscription on an existing customer. Each customer can have up to
+     * 500 active or scheduled subscriptions.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Subscription
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/subscriptions', $params, $opts);
+    }
+
+    /**
+     * Removes the currently applied discount on a subscription.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Subscription
+     */
+    public function deleteDiscount($id, $params = null, $opts = null)
+    {
+        return $this->request('delete', $this->buildPath('/v1/subscriptions/%s/discount', $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves the subscription with the given ID.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Subscription
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/subscriptions/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates an existing subscription on a customer to match the specified
+     * parameters. When changing plans or quantities, we will optionally prorate the
+     * price we charge next month to make up for any price changes. To preview how the
+     * proration will be calculated, use the <a href="#upcoming_invoice">upcoming
+     * invoice</a> endpoint.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Subscription
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/subscriptions/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/TaxRateService.php b/htdocs/includes/stripe/stripe-php/lib/Service/TaxRateService.php
new file mode 100644
index 00000000000..7cee1fead7b
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/TaxRateService.php
@@ -0,0 +1,71 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class TaxRateService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of your tax rates. Tax rates are returned sorted by creation
+     * date, with the most recently created tax rates appearing first.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/tax_rates', $params, $opts);
+    }
+
+    /**
+     * Creates a new tax rate.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\TaxRate
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/tax_rates', $params, $opts);
+    }
+
+    /**
+     * Retrieves a tax rate with the given ID.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\TaxRate
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/tax_rates/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates an existing tax rate.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\TaxRate
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/tax_rates/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/Terminal/ConnectionTokenService.php b/htdocs/includes/stripe/stripe-php/lib/Service/Terminal/ConnectionTokenService.php
new file mode 100644
index 00000000000..7b25b2315a0
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/Terminal/ConnectionTokenService.php
@@ -0,0 +1,25 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\Terminal;
+
+class ConnectionTokenService extends \Stripe\Service\AbstractService
+{
+    /**
+     * To connect to a reader the Stripe Terminal SDK needs to retrieve a short-lived
+     * connection token from Stripe, proxied through your server. On your backend, add
+     * an endpoint that creates and returns a connection token.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Terminal\ConnectionToken
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/terminal/connection_tokens', $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/Terminal/LocationService.php b/htdocs/includes/stripe/stripe-php/lib/Service/Terminal/LocationService.php
new file mode 100644
index 00000000000..8adc7a520db
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/Terminal/LocationService.php
@@ -0,0 +1,87 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\Terminal;
+
+class LocationService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of <code>Location</code> objects.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/terminal/locations', $params, $opts);
+    }
+
+    /**
+     * Creates a new <code>Location</code> object.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Terminal\Location
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/terminal/locations', $params, $opts);
+    }
+
+    /**
+     * Deletes a <code>Location</code> object.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Terminal\Location
+     */
+    public function delete($id, $params = null, $opts = null)
+    {
+        return $this->request('delete', $this->buildPath('/v1/terminal/locations/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves a <code>Location</code> object.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Terminal\Location
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/terminal/locations/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates a <code>Location</code> object by setting the values of the parameters
+     * passed. Any parameters not provided will be left unchanged.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Terminal\Location
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/terminal/locations/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/Terminal/ReaderService.php b/htdocs/includes/stripe/stripe-php/lib/Service/Terminal/ReaderService.php
new file mode 100644
index 00000000000..765015c835f
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/Terminal/ReaderService.php
@@ -0,0 +1,87 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\Terminal;
+
+class ReaderService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of <code>Reader</code> objects.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/terminal/readers', $params, $opts);
+    }
+
+    /**
+     * Creates a new <code>Reader</code> object.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Terminal\Reader
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/terminal/readers', $params, $opts);
+    }
+
+    /**
+     * Deletes a <code>Reader</code> object.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Terminal\Reader
+     */
+    public function delete($id, $params = null, $opts = null)
+    {
+        return $this->request('delete', $this->buildPath('/v1/terminal/readers/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves a <code>Reader</code> object.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Terminal\Reader
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/terminal/readers/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates a <code>Reader</code> object by setting the values of the parameters
+     * passed. Any parameters not provided will be left unchanged.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Terminal\Reader
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/terminal/readers/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/Terminal/TerminalServiceFactory.php b/htdocs/includes/stripe/stripe-php/lib/Service/Terminal/TerminalServiceFactory.php
new file mode 100644
index 00000000000..c70ac873bc4
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/Terminal/TerminalServiceFactory.php
@@ -0,0 +1,29 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\Terminal;
+
+/**
+ * Service factory class for API resources in the Terminal namespace.
+ *
+ * @property ConnectionTokenService $connectionTokens
+ * @property LocationService $locations
+ * @property ReaderService $readers
+ */
+class TerminalServiceFactory extends \Stripe\Service\AbstractServiceFactory
+{
+    /**
+     * @var array<string, string>
+     */
+    private static $classMap = [
+        'connectionTokens' => ConnectionTokenService::class,
+        'locations' => LocationService::class,
+        'readers' => ReaderService::class,
+    ];
+
+    protected function getServiceClass($name)
+    {
+        return \array_key_exists($name, self::$classMap) ? self::$classMap[$name] : null;
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/TokenService.php b/htdocs/includes/stripe/stripe-php/lib/Service/TokenService.php
new file mode 100644
index 00000000000..1c72759f64f
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/TokenService.php
@@ -0,0 +1,42 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class TokenService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Creates a single-use token that represents a bank account’s details. This token
+     * can be used with any API method in place of a bank account dictionary. This
+     * token can be used only once, by attaching it to a <a href="#accounts">Custom
+     * account</a>.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Token
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/tokens', $params, $opts);
+    }
+
+    /**
+     * Retrieves the token with the given ID.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Token
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/tokens/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/TopupService.php b/htdocs/includes/stripe/stripe-php/lib/Service/TopupService.php
new file mode 100644
index 00000000000..059dc209064
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/TopupService.php
@@ -0,0 +1,89 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class TopupService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of top-ups.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/topups', $params, $opts);
+    }
+
+    /**
+     * Cancels a top-up. Only pending top-ups can be canceled.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Topup
+     */
+    public function cancel($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/topups/%s/cancel', $id), $params, $opts);
+    }
+
+    /**
+     * Top up the balance of an account.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Topup
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/topups', $params, $opts);
+    }
+
+    /**
+     * Retrieves the details of a top-up that has previously been created. Supply the
+     * unique top-up ID that was returned from your previous request, and Stripe will
+     * return the corresponding top-up information.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Topup
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/topups/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates the metadata of a top-up. Other top-up details are not editable by
+     * design.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Topup
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/topups/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/TransferService.php b/htdocs/includes/stripe/stripe-php/lib/Service/TransferService.php
new file mode 100644
index 00000000000..150bbf7313e
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/TransferService.php
@@ -0,0 +1,175 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class TransferService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of existing transfers sent to connected accounts. The transfers
+     * are returned in sorted order, with the most recently created transfers appearing
+     * first.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/transfers', $params, $opts);
+    }
+
+    /**
+     * You can see a list of the reversals belonging to a specific transfer. Note that
+     * the 10 most recent reversals are always available by default on the transfer
+     * object. If you need more than those 10, you can use this API method and the
+     * <code>limit</code> and <code>starting_after</code> parameters to page through
+     * additional reversals.
+     *
+     * @param string $parentId
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function allReversals($parentId, $params = null, $opts = null)
+    {
+        return $this->requestCollection('get', $this->buildPath('/v1/transfers/%s/reversals', $parentId), $params, $opts);
+    }
+
+    /**
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Transfer
+     */
+    public function cancel($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/transfers/%s/cancel', $id), $params, $opts);
+    }
+
+    /**
+     * To send funds from your Stripe account to a connected account, you create a new
+     * transfer object. Your <a href="#balance">Stripe balance</a> must be able to
+     * cover the transfer amount, or you’ll receive an “Insufficient Funds” error.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Transfer
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/transfers', $params, $opts);
+    }
+
+    /**
+     * When you create a new reversal, you must specify a transfer to create it on.
+     *
+     * When reversing transfers, you can optionally reverse part of the transfer. You
+     * can do so as many times as you wish until the entire transfer has been reversed.
+     *
+     * Once entirely reversed, a transfer can’t be reversed again. This method will
+     * return an error when called on an already-reversed transfer, or when trying to
+     * reverse more money than is left on a transfer.
+     *
+     * @param string $parentId
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\TransferReversal
+     */
+    public function createReversal($parentId, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/transfers/%s/reversals', $parentId), $params, $opts);
+    }
+
+    /**
+     * Retrieves the details of an existing transfer. Supply the unique transfer ID
+     * from either a transfer creation request or the transfer list, and Stripe will
+     * return the corresponding transfer information.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Transfer
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/transfers/%s', $id), $params, $opts);
+    }
+
+    /**
+     * By default, you can see the 10 most recent reversals stored directly on the
+     * transfer object, but you can also retrieve details about a specific reversal
+     * stored on the transfer.
+     *
+     * @param string $parentId
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\TransferReversal
+     */
+    public function retrieveReversal($parentId, $id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/transfers/%s/reversals/%s', $parentId, $id), $params, $opts);
+    }
+
+    /**
+     * Updates the specified transfer by setting the values of the parameters passed.
+     * Any parameters not provided will be left unchanged.
+     *
+     * This request accepts only metadata as an argument.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Transfer
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/transfers/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates the specified reversal by setting the values of the parameters passed.
+     * Any parameters not provided will be left unchanged.
+     *
+     * This request only accepts metadata and description as arguments.
+     *
+     * @param string $parentId
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\TransferReversal
+     */
+    public function updateReversal($parentId, $id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/transfers/%s/reversals/%s', $parentId, $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Service/WebhookEndpointService.php b/htdocs/includes/stripe/stripe-php/lib/Service/WebhookEndpointService.php
new file mode 100644
index 00000000000..01e642249b6
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Service/WebhookEndpointService.php
@@ -0,0 +1,97 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service;
+
+class WebhookEndpointService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of your webhook endpoints.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/webhook_endpoints', $params, $opts);
+    }
+
+    /**
+     * A webhook endpoint must have a <code>url</code> and a list of
+     * <code>enabled_events</code>. You may optionally specify the Boolean
+     * <code>connect</code> parameter. If set to true, then a Connect webhook endpoint
+     * that notifies the specified <code>url</code> about events from all connected
+     * accounts is created; otherwise an account webhook endpoint that notifies the
+     * specified <code>url</code> only about events from your account is created. You
+     * can also create webhook endpoints in the <a
+     * href="https://dashboard.stripe.com/account/webhooks">webhooks settings</a>
+     * section of the Dashboard.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\WebhookEndpoint
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/webhook_endpoints', $params, $opts);
+    }
+
+    /**
+     * You can also delete webhook endpoints via the <a
+     * href="https://dashboard.stripe.com/account/webhooks">webhook endpoint
+     * management</a> page of the Stripe dashboard.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\WebhookEndpoint
+     */
+    public function delete($id, $params = null, $opts = null)
+    {
+        return $this->request('delete', $this->buildPath('/v1/webhook_endpoints/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves the webhook endpoint with the given ID.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\WebhookEndpoint
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/webhook_endpoints/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates the webhook endpoint. You may edit the <code>url</code>, the list of
+     * <code>enabled_events</code>, and the status of your endpoint.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\WebhookEndpoint
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/webhook_endpoints/%s', $id), $params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/SetupAttempt.php b/htdocs/includes/stripe/stripe-php/lib/SetupAttempt.php
new file mode 100644
index 00000000000..6c83b686c6c
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/SetupAttempt.php
@@ -0,0 +1,32 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe;
+
+/**
+ * A SetupAttempt describes one attempted confirmation of a SetupIntent, whether
+ * that confirmation was successful or unsuccessful. You can use SetupAttempts to
+ * inspect details of a specific attempt at setting up a payment method using a
+ * SetupIntent.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string|\Stripe\StripeObject $application The value of <a href="https://stripe.com/docs/api/setup_intents/object#setup_intent_object-application">application</a> on the SetupIntent at the time of this confirmation.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string|\Stripe\Customer $customer The value of <a href="https://stripe.com/docs/api/setup_intents/object#setup_intent_object-customer">customer</a> on the SetupIntent at the time of this confirmation.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|string|\Stripe\Account $on_behalf_of The value of <a href="https://stripe.com/docs/api/setup_intents/object#setup_intent_object-on_behalf_of">on_behalf_of</a> on the SetupIntent at the time of this confirmation.
+ * @property string|\Stripe\PaymentMethod $payment_method ID of the payment method used with this SetupAttempt.
+ * @property \Stripe\StripeObject $payment_method_details
+ * @property null|\Stripe\ErrorObject $setup_error The error encountered during this attempt to confirm the SetupIntent, if any.
+ * @property string|\Stripe\SetupIntent $setup_intent ID of the SetupIntent that this attempt belongs to.
+ * @property string $status Status of this SetupAttempt, one of <code>requires_confirmation</code>, <code>requires_action</code>, <code>processing</code>, <code>succeeded</code>, <code>failed</code>, or <code>abandoned</code>.
+ * @property string $usage The value of <a href="https://stripe.com/docs/api/setup_intents/object#setup_intent_object-usage">usage</a> on the SetupIntent at the time of this confirmation, one of <code>off_session</code> or <code>on_session</code>.
+ */
+class SetupAttempt extends ApiResource
+{
+    const OBJECT_NAME = 'setup_attempt';
+
+    use ApiOperations\All;
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/SetupIntent.php b/htdocs/includes/stripe/stripe-php/lib/SetupIntent.php
index 176a411b67f..bf8da19cf6d 100644
--- a/htdocs/includes/stripe/stripe-php/lib/SetupIntent.php
+++ b/htdocs/includes/stripe/stripe-php/lib/SetupIntent.php
@@ -1,74 +1,114 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class SetupIntent
+ * A SetupIntent guides you through the process of setting up and saving a
+ * customer's payment credentials for future payments. For example, you could use a
+ * SetupIntent to set up and save your customer's card without immediately
+ * collecting a payment. Later, you can use <a
+ * href="https://stripe.com/docs/api#payment_intents">PaymentIntents</a> to drive
+ * the payment flow.
  *
- * @property string $id
- * @property string $object
- * @property string $application
- * @property string $client_secret
- * @property int $created
- * @property string $customer
- * @property string $description
- * @property mixed $last_setup_error
- * @property bool $livemode
- * @property StripeObject $metadata
- * @property mixed $next_action
- * @property string $on_behalf_of
- * @property string $payment_method
- * @property string[] $payment_method_types
- * @property string $status
+ * Create a SetupIntent as soon as you're ready to collect your customer's payment
+ * credentials. Do not maintain long-lived, unconfirmed SetupIntents as they may no
+ * longer be valid. The SetupIntent then transitions through multiple <a
+ * href="https://stripe.com/docs/payments/intents#intent-statuses">statuses</a> as
+ * it guides you through the setup process.
  *
- * @package Stripe
+ * Successful SetupIntents result in payment credentials that are optimized for
+ * future payments. For example, cardholders in <a
+ * href="/guides/strong-customer-authentication">certain regions</a> may need to be
+ * run through <a
+ * href="https://stripe.com/docs/strong-customer-authentication">Strong Customer
+ * Authentication</a> at the time of payment method collection in order to
+ * streamline later <a
+ * href="https://stripe.com/docs/payments/setup-intents">off-session payments</a>.
+ * If the SetupIntent is used with a <a
+ * href="https://stripe.com/docs/api#setup_intent_object-customer">Customer</a>,
+ * upon success, it will automatically attach the resulting payment method to that
+ * Customer. We recommend using SetupIntents or <a
+ * href="https://stripe.com/docs/api#payment_intent_object-setup_future_usage">setup_future_usage</a>
+ * on PaymentIntents to save payment methods in order to prevent saving invalid or
+ * unoptimized payment methods.
+ *
+ * By using SetupIntents, you ensure that your customers experience the minimum set
+ * of required friction, even as regulations change over time.
+ *
+ * Related guide: <a href="https://stripe.com/docs/payments/setup-intents">Setup
+ * Intents API</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string|\Stripe\StripeObject $application ID of the Connect application that created the SetupIntent.
+ * @property null|string $cancellation_reason Reason for cancellation of this SetupIntent, one of <code>abandoned</code>, <code>requested_by_customer</code>, or <code>duplicate</code>.
+ * @property null|string $client_secret <p>The client secret of this SetupIntent. Used for client-side retrieval using a publishable key.</p><p>The client secret can be used to complete payment setup from your frontend. It should not be stored, logged, embedded in URLs, or exposed to anyone other than the customer. Make sure that you have TLS enabled on any page that includes the client secret.</p>
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string|\Stripe\Customer $customer <p>ID of the Customer this SetupIntent belongs to, if one exists.</p><p>If present, the SetupIntent's payment method will be attached to the Customer on successful setup. Payment methods attached to other Customers cannot be used with this SetupIntent.</p>
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property null|\Stripe\ErrorObject $last_setup_error The error encountered in the previous SetupIntent confirmation.
+ * @property null|string|\Stripe\SetupAttempt $latest_attempt The most recent SetupAttempt for this SetupIntent.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|string|\Stripe\Mandate $mandate ID of the multi use Mandate generated by the SetupIntent.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|\Stripe\StripeObject $next_action If present, this property tells you what actions you need to take in order for your customer to continue payment setup.
+ * @property null|string|\Stripe\Account $on_behalf_of The account (if any) for which the setup is intended.
+ * @property null|string|\Stripe\PaymentMethod $payment_method ID of the payment method used with this SetupIntent.
+ * @property null|\Stripe\StripeObject $payment_method_options Payment-method-specific configuration for this SetupIntent.
+ * @property string[] $payment_method_types The list of payment method types (e.g. card) that this SetupIntent is allowed to set up.
+ * @property null|string|\Stripe\Mandate $single_use_mandate ID of the single_use Mandate generated by the SetupIntent.
+ * @property string $status <a href="https://stripe.com/docs/payments/intents#intent-statuses">Status</a> of this SetupIntent, one of <code>requires_payment_method</code>, <code>requires_confirmation</code>, <code>requires_action</code>, <code>processing</code>, <code>canceled</code>, or <code>succeeded</code>.
+ * @property string $usage <p>Indicates how the payment method is intended to be used in the future.</p><p>Use <code>on_session</code> if you intend to only reuse the payment method when the customer is in your checkout flow. Use <code>off_session</code> if your customer may or may not be in your checkout flow. If not provided, this value defaults to <code>off_session</code>.</p>
  */
 class SetupIntent extends ApiResource
 {
-    const OBJECT_NAME = "setup_intent";
+    const OBJECT_NAME = 'setup_intent';
 
     use ApiOperations\All;
     use ApiOperations\Create;
     use ApiOperations\Retrieve;
     use ApiOperations\Update;
 
-    /**
-     * These constants are possible representations of the status field.
-     *
-     * @link https://stripe.com/docs/api/setup_intents/object#setup_intent_object-status
-     */
-    const STATUS_CANCELED                = 'canceled';
-    const STATUS_PROCESSING              = 'processing';
-    const STATUS_REQUIRES_ACTION         = 'requires_action';
-    const STATUS_REQUIRES_CONFIRMATION   = 'requires_confirmation';
+    const STATUS_CANCELED = 'canceled';
+    const STATUS_PROCESSING = 'processing';
+    const STATUS_REQUIRES_ACTION = 'requires_action';
+    const STATUS_REQUIRES_CONFIRMATION = 'requires_confirmation';
     const STATUS_REQUIRES_PAYMENT_METHOD = 'requires_payment_method';
-    const STATUS_SUCCEEDED               = 'succeeded';
+    const STATUS_SUCCEEDED = 'succeeded';
 
     /**
-     * @param array|null $params
-     * @param array|string|null $options
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return SetupIntent The canceled setup intent.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return SetupIntent the canceled setup intent
      */
-    public function cancel($params = null, $options = null)
+    public function cancel($params = null, $opts = null)
     {
         $url = $this->instanceUrl() . '/cancel';
-        list($response, $opts) = $this->_request('post', $url, $params, $options);
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
         $this->refreshFrom($response, $opts);
+
         return $this;
     }
 
     /**
-     * @param array|null $params
-     * @param array|string|null $options
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return SetupIntent The confirmed setup intent.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return SetupIntent the confirmed setup intent
      */
-    public function confirm($params = null, $options = null)
+    public function confirm($params = null, $opts = null)
     {
         $url = $this->instanceUrl() . '/confirm';
-        list($response, $opts) = $this->_request('post', $url, $params, $options);
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
         $this->refreshFrom($response, $opts);
+
         return $this;
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Sigma/ScheduledQueryRun.php b/htdocs/includes/stripe/stripe-php/lib/Sigma/ScheduledQueryRun.php
index 4d97bf7ce28..b109dde70b7 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Sigma/ScheduledQueryRun.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Sigma/ScheduledQueryRun.php
@@ -1,33 +1,37 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe\Sigma;
 
 /**
- * Class Authorization
+ * If you have <a href="https://stripe.com/docs/sigma/scheduled-queries">scheduled
+ * a Sigma query</a>, you'll receive a
+ * <code>sigma.scheduled_query_run.created</code> webhook each time the query runs.
+ * The webhook contains a <code>ScheduledQueryRun</code> object, which you can use
+ * to retrieve the query results.
  *
- * @property string $id
- * @property string $object
- * @property int $created
- * @property int $data_load_time
- * @property string $error
- * @property \Stripe\FileUpload $file
- * @property bool $livemode
- * @property int $result_available_until
- * @property string $sql
- * @property string $status
- * @property string $title
- *
- * @package Stripe\Sigma
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property int $data_load_time When the query was run, Sigma contained a snapshot of your Stripe data at this time.
+ * @property \Stripe\StripeObject $error
+ * @property null|\Stripe\File $file The file object representing the results of the query.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property int $result_available_until Time at which the result expires and is no longer available for download.
+ * @property string $sql SQL for the query.
+ * @property string $status The query's execution status, which will be <code>completed</code> for successful runs, and <code>canceled</code>, <code>failed</code>, or <code>timed_out</code> otherwise.
+ * @property string $title Title of the query.
  */
 class ScheduledQueryRun extends \Stripe\ApiResource
 {
-    const OBJECT_NAME = "scheduled_query_run";
+    const OBJECT_NAME = 'scheduled_query_run';
 
     use \Stripe\ApiOperations\All;
     use \Stripe\ApiOperations\Retrieve;
 
     public static function classUrl()
     {
-        return "/v1/sigma/scheduled_query_runs";
+        return '/v1/sigma/scheduled_query_runs';
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/SingletonApiResource.php b/htdocs/includes/stripe/stripe-php/lib/SingletonApiResource.php
index 26a78bf3e22..704cff874bb 100644
--- a/htdocs/includes/stripe/stripe-php/lib/SingletonApiResource.php
+++ b/htdocs/includes/stripe/stripe-php/lib/SingletonApiResource.php
@@ -3,9 +3,7 @@
 namespace Stripe;
 
 /**
- * Class SingletonApiResource
- *
- * @package Stripe
+ * Class SingletonApiResource.
  */
 abstract class SingletonApiResource extends ApiResource
 {
@@ -14,22 +12,24 @@ abstract class SingletonApiResource extends ApiResource
         $opts = Util\RequestOptions::parse($options);
         $instance = new static(null, $opts);
         $instance->refresh();
+
         return $instance;
     }
 
     /**
-     * @return string The endpoint associated with this singleton class.
+     * @return string the endpoint associated with this singleton class
      */
     public static function classUrl()
     {
         // Replace dots with slashes for namespaced resources, e.g. if the object's name is
         // "foo.bar", then its URL will be "/v1/foo/bar".
-        $base = str_replace('.', '/', static::OBJECT_NAME);
-        return "/v1/${base}";
+        $base = \str_replace('.', '/', static::OBJECT_NAME);
+
+        return "/v1/{$base}";
     }
 
     /**
-     * @return string The endpoint associated with this singleton API resource.
+     * @return string the endpoint associated with this singleton API resource
      */
     public function instanceUrl()
     {
diff --git a/htdocs/includes/stripe/stripe-php/lib/Source.php b/htdocs/includes/stripe/stripe-php/lib/Source.php
index ec5cc42127e..2262e71d42f 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Source.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Source.php
@@ -1,153 +1,168 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class Source
+ * <code>Source</code> objects allow you to accept a variety of payment methods.
+ * They represent a customer's payment instrument, and can be used with the Stripe
+ * API just like a <code>Card</code> object: once chargeable, they can be charged,
+ * or can be attached to customers.
  *
- * @property string $id
- * @property string $object
- * @property mixed $ach_credit_transfer
- * @property mixed $ach_debit
- * @property mixed $alipay
- * @property int $amount
- * @property mixed $bancontact
- * @property mixed $card
- * @property mixed $card_present
- * @property string $client_secret
- * @property mixed $code_verification
- * @property int $created
- * @property string $currency
- * @property string $customer
- * @property mixed $eps
- * @property string $flow
- * @property mixed $giropay
- * @property mixed $ideal
- * @property bool $livemode
- * @property StripeObject $metadata
- * @property mixed $multibanco
- * @property mixed $owner
- * @property mixed $p24
- * @property mixed $receiver
- * @property mixed $redirect
- * @property mixed $sepa_debit
- * @property mixed $sofort
- * @property string $statement_descriptor
- * @property string $status
- * @property mixed $three_d_secure
- * @property string $type
- * @property string $usage
- * @property mixed $wechat
-
- * @package Stripe
+ * Related guides: <a href="https://stripe.com/docs/sources">Sources API</a> and <a
+ * href="https://stripe.com/docs/sources/customers">Sources &amp; Customers</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property \Stripe\StripeObject $ach_credit_transfer
+ * @property \Stripe\StripeObject $ach_debit
+ * @property \Stripe\StripeObject $acss_debit
+ * @property \Stripe\StripeObject $alipay
+ * @property null|int $amount A positive integer in the smallest currency unit (that is, 100 cents for $1.00, or 1 for ¥1, Japanese Yen being a zero-decimal currency) representing the total amount associated with the source. This is the amount for which the source will be chargeable once ready. Required for <code>single_use</code> sources.
+ * @property \Stripe\StripeObject $au_becs_debit
+ * @property \Stripe\StripeObject $bancontact
+ * @property \Stripe\StripeObject $card
+ * @property \Stripe\StripeObject $card_present
+ * @property string $client_secret The client secret of the source. Used for client-side retrieval using a publishable key.
+ * @property \Stripe\StripeObject $code_verification
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string $currency Three-letter <a href="https://stripe.com/docs/currencies">ISO code for the currency</a> associated with the source. This is the currency for which the source will be chargeable once ready. Required for <code>single_use</code> sources.
+ * @property string $customer The ID of the customer to which this source is attached. This will not be present when the source has not been attached to a customer.
+ * @property \Stripe\StripeObject $eps
+ * @property string $flow The authentication <code>flow</code> of the source. <code>flow</code> is one of <code>redirect</code>, <code>receiver</code>, <code>code_verification</code>, <code>none</code>.
+ * @property \Stripe\StripeObject $giropay
+ * @property \Stripe\StripeObject $ideal
+ * @property \Stripe\StripeObject $klarna
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property \Stripe\StripeObject $multibanco
+ * @property null|\Stripe\StripeObject $owner Information about the owner of the payment instrument that may be used or required by particular source types.
+ * @property \Stripe\StripeObject $p24
+ * @property \Stripe\StripeObject $receiver
+ * @property \Stripe\StripeObject $redirect
+ * @property \Stripe\StripeObject $sepa_credit_transfer
+ * @property \Stripe\StripeObject $sepa_debit
+ * @property \Stripe\StripeObject $sofort
+ * @property \Stripe\StripeObject $source_order
+ * @property null|string $statement_descriptor Extra information about a source. This will appear on your customer's statement every time you charge the source.
+ * @property string $status The status of the source, one of <code>canceled</code>, <code>chargeable</code>, <code>consumed</code>, <code>failed</code>, or <code>pending</code>. Only <code>chargeable</code> sources can be used to create a charge.
+ * @property \Stripe\StripeObject $three_d_secure
+ * @property string $type The <code>type</code> of the source. The <code>type</code> is a payment method, one of <code>ach_credit_transfer</code>, <code>ach_debit</code>, <code>alipay</code>, <code>bancontact</code>, <code>card</code>, <code>card_present</code>, <code>eps</code>, <code>giropay</code>, <code>ideal</code>, <code>multibanco</code>, <code>klarna</code>, <code>p24</code>, <code>sepa_debit</code>, <code>sofort</code>, <code>three_d_secure</code>, or <code>wechat</code>. An additional hash is included on the source with a name matching this value. It contains additional information specific to the <a href="https://stripe.com/docs/sources">payment method</a> used.
+ * @property null|string $usage Either <code>reusable</code> or <code>single_use</code>. Whether this source should be reusable or not. Some source types may or may not be reusable by construction, while others may leave the option at creation. If an incompatible value is passed, an error will be returned.
+ * @property \Stripe\StripeObject $wechat
  */
 class Source extends ApiResource
 {
-    const OBJECT_NAME = "source";
+    const OBJECT_NAME = 'source';
 
     use ApiOperations\Create;
     use ApiOperations\Retrieve;
     use ApiOperations\Update;
 
-    /**
-     * Possible string representations of source flows.
-     * @link https://stripe.com/docs/api#source_object-flow
-     */
-    const FLOW_REDIRECT          = 'redirect';
-    const FLOW_RECEIVER          = 'receiver';
     const FLOW_CODE_VERIFICATION = 'code_verification';
-    const FLOW_NONE              = 'none';
+    const FLOW_NONE = 'none';
+    const FLOW_RECEIVER = 'receiver';
+    const FLOW_REDIRECT = 'redirect';
 
-    /**
-     * Possible string representations of source statuses.
-     * @link https://stripe.com/docs/api#source_object-status
-     */
-    const STATUS_CANCELED   = 'canceled';
+    const STATUS_CANCELED = 'canceled';
     const STATUS_CHARGEABLE = 'chargeable';
-    const STATUS_CONSUMED   = 'consumed';
-    const STATUS_FAILED     = 'failed';
-    const STATUS_PENDING    = 'pending';
+    const STATUS_CONSUMED = 'consumed';
+    const STATUS_FAILED = 'failed';
+    const STATUS_PENDING = 'pending';
 
-    /**
-     * Possible string representations of source usage.
-     * @link https://stripe.com/docs/api#source_object-usage
-     */
-    const USAGE_REUSABLE   = 'reusable';
+    const USAGE_REUSABLE = 'reusable';
     const USAGE_SINGLE_USE = 'single_use';
 
+    use ApiOperations\NestedResource;
+
     /**
-     * @param array|null $params
-     * @param array|string|null $options
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return Source The detached source.
+     * @throws \Stripe\Exception\UnexpectedValueException if the source is not attached to a customer
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Source the detached source
      */
-    public function detach($params = null, $options = null)
+    public function detach($params = null, $opts = null)
     {
         self::_validateParams($params);
 
         $id = $this['id'];
         if (!$id) {
-            $class = get_class($this);
-            $msg = "Could not determine which URL to request: $class instance "
-             . "has invalid ID: $id";
-            throw new Error\InvalidRequest($msg, null);
+            $class = static::class;
+            $msg = "Could not determine which URL to request: {$class} instance "
+             . "has invalid ID: {$id}";
+
+            throw new Exception\UnexpectedValueException($msg, null);
         }
 
         if ($this['customer']) {
             $base = Customer::classUrl();
-            $parentExtn = urlencode(Util\Util::utf8($this['customer']));
-            $extn = urlencode(Util\Util::utf8($id));
-            $url = "$base/$parentExtn/sources/$extn";
+            $parentExtn = \urlencode(Util\Util::utf8($this['customer']));
+            $extn = \urlencode(Util\Util::utf8($id));
+            $url = "{$base}/{$parentExtn}/sources/{$extn}";
 
-            list($response, $opts) = $this->_request('delete', $url, $params, $options);
+            list($response, $opts) = $this->_request('delete', $url, $params, $opts);
             $this->refreshFrom($response, $opts);
+
             return $this;
-        } else {
-            $message = "This source object does not appear to be currently attached "
-               . "to a customer object.";
-            throw new Error\Api($message);
         }
+        $message = 'This source object does not appear to be currently attached '
+               . 'to a customer object.';
+
+        throw new Exception\UnexpectedValueException($message);
     }
 
     /**
-     * @param array|null $params
-     * @param array|string|null $options
+     * @deprecated sourceTransactions is deprecated. Please use Source::allSourceTransactions instead.
      *
-     * @return Source The detached source.
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @deprecated Use the `detach` method instead.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection the list of source transactions
      */
-    public function delete($params = null, $options = null)
-    {
-        $this->detach($params, $options);
-    }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return Collection The list of source transactions.
-     */
-    public function sourceTransactions($params = null, $options = null)
+    public function sourceTransactions($params = null, $opts = null)
     {
         $url = $this->instanceUrl() . '/source_transactions';
-        list($response, $opts) = $this->_request('get', $url, $params, $options);
-        $obj = Util\Util::convertToStripeObject($response, $opts);
+        list($response, $opts) = $this->_request('get', $url, $params, $opts);
+        $obj = \Stripe\Util\Util::convertToStripeObject($response, $opts);
         $obj->setLastResponse($response);
+
         return $obj;
     }
 
     /**
-     * @param array|null $params
-     * @param array|string|null $options
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return Source The verified source.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection the list of source transactions
      */
-    public function verify($params = null, $options = null)
+    public static function allSourceTransactions($id, $params = null, $opts = null)
+    {
+        return self::_allNestedResources($id, '/source_transactions', $params, $opts);
+    }
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return Source the verified source
+     */
+    public function verify($params = null, $opts = null)
     {
         $url = $this->instanceUrl() . '/verify';
-        list($response, $opts) = $this->_request('post', $url, $params, $options);
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
         $this->refreshFrom($response, $opts);
+
         return $this;
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/SourceTransaction.php b/htdocs/includes/stripe/stripe-php/lib/SourceTransaction.php
index d004032c569..281f2a710b2 100644
--- a/htdocs/includes/stripe/stripe-php/lib/SourceTransaction.php
+++ b/htdocs/includes/stripe/stripe-php/lib/SourceTransaction.php
@@ -3,20 +3,18 @@
 namespace Stripe;
 
 /**
- * Class SourceTransaction
+ * Class SourceTransaction.
  *
  * @property string $id
  * @property string $object
+ * @property \Stripe\StripeObject $ach_credit_transfer
  * @property int $amount
  * @property int $created
  * @property string $customer_data
  * @property string $currency
  * @property string $type
- * @property mixed $ach_credit_transfer
- *
- * @package Stripe
  */
 class SourceTransaction extends ApiResource
 {
-    const OBJECT_NAME = "source_transaction";
+    const OBJECT_NAME = 'source_transaction';
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Stripe.php b/htdocs/includes/stripe/stripe-php/lib/Stripe.php
index 0b533e0eb5c..22e5db49904 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Stripe.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Stripe.php
@@ -3,62 +3,65 @@
 namespace Stripe;
 
 /**
- * Class Stripe
- *
- * @package Stripe
+ * Class Stripe.
  */
 class Stripe
 {
-    // @var string The Stripe API key to be used for requests.
+    /** @var string The Stripe API key to be used for requests. */
     public static $apiKey;
 
-    // @var string The Stripe client_id to be used for Connect requests.
+    /** @var string The Stripe client_id to be used for Connect requests. */
     public static $clientId;
 
-    // @var string The base URL for the Stripe API.
+    /** @var string The base URL for the Stripe API. */
     public static $apiBase = 'https://api.stripe.com';
 
-    // @var string The base URL for the OAuth API.
+    /** @var string The base URL for the OAuth API. */
     public static $connectBase = 'https://connect.stripe.com';
 
-    // @var string The base URL for the Stripe API uploads endpoint.
+    /** @var string The base URL for the Stripe API uploads endpoint. */
     public static $apiUploadBase = 'https://files.stripe.com';
 
-    // @var string|null The version of the Stripe API to use for requests.
+    /** @var null|string The version of the Stripe API to use for requests. */
     public static $apiVersion = null;
 
-    // @var string|null The account ID for connected accounts requests.
+    /** @var null|string The account ID for connected accounts requests. */
     public static $accountId = null;
 
-    // @var string Path to the CA bundle used to verify SSL certificates
+    /** @var string Path to the CA bundle used to verify SSL certificates */
     public static $caBundlePath = null;
 
-    // @var boolean Defaults to true.
+    /** @var bool Defaults to true. */
     public static $verifySslCerts = true;
 
-    // @var array The application's information (name, version, URL)
+    /** @var array The application's information (name, version, URL) */
     public static $appInfo = null;
 
-    // @var Util\LoggerInterface|null The logger to which the library will
-    //   produce messages.
+    /**
+     * @var null|Util\LoggerInterface the logger to which the library will
+     *   produce messages
+     */
     public static $logger = null;
 
-    // @var int Maximum number of request retries
+    /** @var int Maximum number of request retries */
     public static $maxNetworkRetries = 0;
 
-    // @var boolean Whether client telemetry is enabled. Defaults to true.
+    /** @var bool Whether client telemetry is enabled. Defaults to true. */
     public static $enableTelemetry = true;
 
-    // @var float Maximum delay between retries, in seconds
+    /** @var float Maximum delay between retries, in seconds */
     private static $maxNetworkRetryDelay = 2.0;
 
-    // @var float Initial delay between retries, in seconds
+    /** @var float Maximum delay between retries, in seconds, that will be respected from the Stripe API */
+    private static $maxRetryAfter = 60.0;
+
+    /** @var float Initial delay between retries, in seconds */
     private static $initialNetworkRetryDelay = 0.5;
 
-    const VERSION = '6.43.1';
+    const VERSION = '7.67.0';
 
     /**
-     * @return string The API key used for requests.
+     * @return string the API key used for requests
      */
     public static function getApiKey()
     {
@@ -66,7 +69,7 @@ class Stripe
     }
 
     /**
-     * @return string The client_id used for Connect requests.
+     * @return string the client_id used for Connect requests
      */
     public static function getClientId()
     {
@@ -74,20 +77,21 @@ class Stripe
     }
 
     /**
-     * @return Util\LoggerInterface The logger to which the library will
-     *   produce messages.
+     * @return Util\LoggerInterface the logger to which the library will
+     *   produce messages
      */
     public static function getLogger()
     {
-        if (self::$logger == null) {
+        if (null === self::$logger) {
             return new Util\DefaultLogger();
         }
+
         return self::$logger;
     }
 
     /**
-     * @param Util\LoggerInterface $logger The logger to which the library
-     *   will produce messages.
+     * @param Util\LoggerInterface $logger the logger to which the library
+     *   will produce messages
      */
     public static function setLogger($logger)
     {
@@ -124,7 +128,7 @@ class Stripe
     }
 
     /**
-     * @param string $apiVersion The API version to use for requests.
+     * @param string $apiVersion the API version to use for requests
      */
     public static function setApiVersion($apiVersion)
     {
@@ -136,7 +140,7 @@ class Stripe
      */
     private static function getDefaultCABundlePath()
     {
-        return realpath(dirname(__FILE__) . '/../data/ca-certificates.crt');
+        return \realpath(__DIR__ . '/../data/ca-certificates.crt');
     }
 
     /**
@@ -156,7 +160,7 @@ class Stripe
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public static function getVerifySslCerts()
     {
@@ -164,7 +168,7 @@ class Stripe
     }
 
     /**
-     * @param boolean $verify
+     * @param bool $verify
      */
     public static function setVerifySslCerts($verify)
     {
@@ -173,7 +177,7 @@ class Stripe
 
     /**
      * @return string | null The Stripe account ID for connected account
-     *   requests.
+     *   requests
      */
     public static function getAccountId()
     {
@@ -181,8 +185,8 @@ class Stripe
     }
 
     /**
-     * @param string $accountId The Stripe account ID to set for connected
-     *   account requests.
+     * @param string $accountId the Stripe account ID to set for connected
+     *   account requests
      */
     public static function setAccountId($accountId)
     {
@@ -199,8 +203,9 @@ class Stripe
 
     /**
      * @param string $appName The application's name
-     * @param string $appVersion The application's version
-     * @param string $appUrl The application's URL
+     * @param null|string $appVersion The application's version
+     * @param null|string $appUrl The application's URL
+     * @param null|string $appPartnerId The application's partner ID
      */
     public static function setAppInfo($appName, $appVersion = null, $appUrl = null, $appPartnerId = null)
     {
@@ -235,6 +240,14 @@ class Stripe
         return self::$maxNetworkRetryDelay;
     }
 
+    /**
+     * @return float Maximum delay between retries, in seconds, that will be respected from the Stripe API
+     */
+    public static function getMaxRetryAfter()
+    {
+        return self::$maxRetryAfter;
+    }
+
     /**
      * @return float Initial delay between retries, in seconds
      */
diff --git a/htdocs/includes/stripe/stripe-php/lib/StripeClient.php b/htdocs/includes/stripe/stripe-php/lib/StripeClient.php
new file mode 100644
index 00000000000..661483c5b9d
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/StripeClient.php
@@ -0,0 +1,77 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe;
+
+/**
+ * Client used to send requests to Stripe's API.
+ *
+ * @property \Stripe\Service\AccountLinkService $accountLinks
+ * @property \Stripe\Service\AccountService $accounts
+ * @property \Stripe\Service\ApplePayDomainService $applePayDomains
+ * @property \Stripe\Service\ApplicationFeeService $applicationFees
+ * @property \Stripe\Service\BalanceService $balance
+ * @property \Stripe\Service\BalanceTransactionService $balanceTransactions
+ * @property \Stripe\Service\BillingPortal\BillingPortalServiceFactory $billingPortal
+ * @property \Stripe\Service\ChargeService $charges
+ * @property \Stripe\Service\Checkout\CheckoutServiceFactory $checkout
+ * @property \Stripe\Service\CountrySpecService $countrySpecs
+ * @property \Stripe\Service\CouponService $coupons
+ * @property \Stripe\Service\CreditNoteService $creditNotes
+ * @property \Stripe\Service\CustomerService $customers
+ * @property \Stripe\Service\DisputeService $disputes
+ * @property \Stripe\Service\EphemeralKeyService $ephemeralKeys
+ * @property \Stripe\Service\EventService $events
+ * @property \Stripe\Service\ExchangeRateService $exchangeRates
+ * @property \Stripe\Service\FileLinkService $fileLinks
+ * @property \Stripe\Service\FileService $files
+ * @property \Stripe\Service\InvoiceItemService $invoiceItems
+ * @property \Stripe\Service\InvoiceService $invoices
+ * @property \Stripe\Service\Issuing\IssuingServiceFactory $issuing
+ * @property \Stripe\Service\MandateService $mandates
+ * @property \Stripe\Service\OAuthService $oauth
+ * @property \Stripe\Service\OrderReturnService $orderReturns
+ * @property \Stripe\Service\OrderService $orders
+ * @property \Stripe\Service\PaymentIntentService $paymentIntents
+ * @property \Stripe\Service\PaymentMethodService $paymentMethods
+ * @property \Stripe\Service\PayoutService $payouts
+ * @property \Stripe\Service\PlanService $plans
+ * @property \Stripe\Service\PriceService $prices
+ * @property \Stripe\Service\ProductService $products
+ * @property \Stripe\Service\PromotionCodeService $promotionCodes
+ * @property \Stripe\Service\Radar\RadarServiceFactory $radar
+ * @property \Stripe\Service\RefundService $refunds
+ * @property \Stripe\Service\Reporting\ReportingServiceFactory $reporting
+ * @property \Stripe\Service\ReviewService $reviews
+ * @property \Stripe\Service\SetupAttemptService $setupAttempts
+ * @property \Stripe\Service\SetupIntentService $setupIntents
+ * @property \Stripe\Service\Sigma\SigmaServiceFactory $sigma
+ * @property \Stripe\Service\SkuService $skus
+ * @property \Stripe\Service\SourceService $sources
+ * @property \Stripe\Service\SubscriptionItemService $subscriptionItems
+ * @property \Stripe\Service\SubscriptionScheduleService $subscriptionSchedules
+ * @property \Stripe\Service\SubscriptionService $subscriptions
+ * @property \Stripe\Service\TaxRateService $taxRates
+ * @property \Stripe\Service\Terminal\TerminalServiceFactory $terminal
+ * @property \Stripe\Service\TokenService $tokens
+ * @property \Stripe\Service\TopupService $topups
+ * @property \Stripe\Service\TransferService $transfers
+ * @property \Stripe\Service\WebhookEndpointService $webhookEndpoints
+ */
+class StripeClient extends BaseStripeClient
+{
+    /**
+     * @var \Stripe\Service\CoreServiceFactory
+     */
+    private $coreServiceFactory;
+
+    public function __get($name)
+    {
+        if (null === $this->coreServiceFactory) {
+            $this->coreServiceFactory = new \Stripe\Service\CoreServiceFactory($this);
+        }
+
+        return $this->coreServiceFactory->__get($name);
+    }
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/StripeClientInterface.php b/htdocs/includes/stripe/stripe-php/lib/StripeClientInterface.php
new file mode 100644
index 00000000000..adcef3f9aa7
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/StripeClientInterface.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Interface for a Stripe client.
+ */
+interface StripeClientInterface
+{
+    /**
+     * Gets the API key used by the client to send requests.
+     *
+     * @return null|string the API key used by the client to send requests
+     */
+    public function getApiKey();
+
+    /**
+     * Gets the client ID used by the client in OAuth requests.
+     *
+     * @return null|string the client ID used by the client in OAuth requests
+     */
+    public function getClientId();
+
+    /**
+     * Gets the base URL for Stripe's API.
+     *
+     * @return string the base URL for Stripe's API
+     */
+    public function getApiBase();
+
+    /**
+     * Gets the base URL for Stripe's OAuth API.
+     *
+     * @return string the base URL for Stripe's OAuth API
+     */
+    public function getConnectBase();
+
+    /**
+     * Gets the base URL for Stripe's Files API.
+     *
+     * @return string the base URL for Stripe's Files API
+     */
+    public function getFilesBase();
+
+    /**
+     * Sends a request to Stripe's API.
+     *
+     * @param string $method the HTTP method
+     * @param string $path the path of the request
+     * @param array $params the parameters of the request
+     * @param array|\Stripe\Util\RequestOptions $opts the special modifiers of the request
+     *
+     * @return \Stripe\StripeObject the object returned by Stripe's API
+     */
+    public function request($method, $path, $params, $opts);
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/StripeObject.php b/htdocs/includes/stripe/stripe-php/lib/StripeObject.php
index 62e02c0e0cc..eca01a00e90 100644
--- a/htdocs/includes/stripe/stripe-php/lib/StripeObject.php
+++ b/htdocs/includes/stripe/stripe-php/lib/StripeObject.php
@@ -3,18 +3,29 @@
 namespace Stripe;
 
 /**
- * Class StripeObject
- *
- * @package Stripe
+ * Class StripeObject.
  */
 class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
 {
+    /** @var Util\RequestOptions */
     protected $_opts;
+
+    /** @var array */
     protected $_originalValues;
+
+    /** @var array */
     protected $_values;
+
+    /** @var Util\Set */
     protected $_unsavedValues;
+
+    /** @var Util\Set */
     protected $_transientValues;
+
+    /** @var null|array */
     protected $_retrieveOptions;
+
+    /** @var null|ApiResponse */
     protected $_lastResponse;
 
     /**
@@ -24,17 +35,19 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
     public static function getPermanentAttributes()
     {
         static $permanentAttributes = null;
-        if ($permanentAttributes === null) {
+        if (null === $permanentAttributes) {
             $permanentAttributes = new Util\Set([
                 'id',
             ]);
         }
+
         return $permanentAttributes;
     }
 
     /**
      * Additive objects are subobjects in the API that don't have the same
      * semantics as most subobjects, which are fully replaced when they're set.
+     *
      * This is best illustrated by example. The `source` parameter sent when
      * updating a subscription is *not* additive; if we set it:
      *
@@ -85,7 +98,7 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
     public static function getAdditiveParams()
     {
         static $additiveParams = null;
-        if ($additiveParams === null) {
+        if (null === $additiveParams) {
             // Set `metadata` as additive so that when it's set directly we remember
             // to clear keys that may have been previously set by sending empty
             // values for them.
@@ -96,6 +109,7 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
                 'metadata',
             ]);
         }
+
         return $additiveParams;
     }
 
@@ -107,7 +121,7 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
         $this->_values = [];
         $this->_unsavedValues = new Util\Set();
         $this->_transientValues = new Util\Set();
-        if ($id !== null) {
+        if (null !== $id) {
             $this->_values['id'] = $id;
         }
     }
@@ -116,17 +130,17 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
     public function __set($k, $v)
     {
         if (static::getPermanentAttributes()->includes($k)) {
-            throw new \InvalidArgumentException(
-                "Cannot set $k on this object. HINT: you can't set: " .
-                join(', ', static::getPermanentAttributes()->toArray())
+            throw new Exception\InvalidArgumentException(
+                "Cannot set {$k} on this object. HINT: you can't set: " .
+                \implode(', ', static::getPermanentAttributes()->toArray())
             );
         }
 
-        if ($v === "") {
-            throw new \InvalidArgumentException(
-                'You cannot set \''.$k.'\'to an empty string. '
-                .'We interpret empty strings as NULL in requests. '
-                .'You may set obj->'.$k.' = NULL to delete the property'
+        if ('' === $v) {
+            throw new Exception\InvalidArgumentException(
+                'You cannot set \'' . $k . '\'to an empty string. '
+                . 'We interpret empty strings as NULL in requests. '
+                . 'You may set obj->' . $k . ' = NULL to delete the property'
             );
         }
 
@@ -151,24 +165,26 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
     {
         // function should return a reference, using $nullval to return a reference to null
         $nullval = null;
-        if (!empty($this->_values) && array_key_exists($k, $this->_values)) {
+        if (!empty($this->_values) && \array_key_exists($k, $this->_values)) {
             return $this->_values[$k];
-        } elseif (!empty($this->_transientValues) && $this->_transientValues->includes($k)) {
-            $class = get_class($this);
-            $attrs = join(', ', array_keys($this->_values));
-            $message = "Stripe Notice: Undefined property of $class instance: $k. "
-                    . "HINT: The $k attribute was set in the past, however. "
-                    . "It was then wiped when refreshing the object "
+        }
+        if (!empty($this->_transientValues) && $this->_transientValues->includes($k)) {
+            $class = static::class;
+            $attrs = \implode(', ', \array_keys($this->_values));
+            $message = "Stripe Notice: Undefined property of {$class} instance: {$k}. "
+                    . "HINT: The {$k} attribute was set in the past, however. "
+                    . 'It was then wiped when refreshing the object '
                     . "with the result returned by Stripe's API, "
-                    . "probably as a result of a save(). The attributes currently "
-                    . "available on this object are: $attrs";
+                    . 'probably as a result of a save(). The attributes currently '
+                    . "available on this object are: {$attrs}";
             Stripe::getLogger()->error($message);
-            return $nullval;
-        } else {
-            $class = get_class($this);
-            Stripe::getLogger()->error("Stripe Notice: Undefined property of $class instance: $k");
+
             return $nullval;
         }
+        $class = static::class;
+        Stripe::getLogger()->error("Stripe Notice: Undefined property of {$class} instance: {$k}");
+
+        return $nullval;
     }
 
     // Magic method for var_dump output. Only works with PHP >= 5.6
@@ -180,52 +196,53 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
     // ArrayAccess methods
     public function offsetSet($k, $v)
     {
-        $this->$k = $v;
+        $this->{$k} = $v;
     }
 
     public function offsetExists($k)
     {
-        return array_key_exists($k, $this->_values);
+        return \array_key_exists($k, $this->_values);
     }
 
     public function offsetUnset($k)
     {
-        unset($this->$k);
+        unset($this->{$k});
     }
 
     public function offsetGet($k)
     {
-        return array_key_exists($k, $this->_values) ? $this->_values[$k] : null;
+        return \array_key_exists($k, $this->_values) ? $this->_values[$k] : null;
     }
 
     // Countable method
     public function count()
     {
-        return count($this->_values);
+        return \count($this->_values);
     }
 
     public function keys()
     {
-        return array_keys($this->_values);
+        return \array_keys($this->_values);
     }
 
     public function values()
     {
-        return array_values($this->_values);
+        return \array_values($this->_values);
     }
 
     /**
-     * This unfortunately needs to be public to be used in Util\Util
+     * This unfortunately needs to be public to be used in Util\Util.
      *
      * @param array $values
-     * @param null|string|array|Util\RequestOptions $opts
+     * @param null|array|string|Util\RequestOptions $opts
      *
-     * @return static The object constructed from the given values.
+     * @return static the object constructed from the given values
      */
     public static function constructFrom($values, $opts = null)
     {
         $obj = new static(isset($values['id']) ? $values['id'] : null);
         $obj->refreshFrom($values, $opts);
+
         return $obj;
     }
 
@@ -233,8 +250,8 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
      * Refreshes this object using the provided values.
      *
      * @param array $values
-     * @param null|string|array|Util\RequestOptions $opts
-     * @param boolean $partial Defaults to false.
+     * @param null|array|string|Util\RequestOptions $opts
+     * @param bool $partial defaults to false
      */
     public function refreshFrom($values, $opts, $partial = false)
     {
@@ -243,7 +260,7 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
         $this->_originalValues = self::deepCopy($values);
 
         if ($values instanceof StripeObject) {
-            $values = $values->__toArray(true);
+            $values = $values->toArray();
         }
 
         // Wipe old state before setting new.  This is useful for e.g. updating a
@@ -252,11 +269,11 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
         if ($partial) {
             $removed = new Util\Set();
         } else {
-            $removed = new Util\Set(array_diff(array_keys($this->_values), array_keys($values)));
+            $removed = new Util\Set(\array_diff(\array_keys($this->_values), \array_keys($values)));
         }
 
         foreach ($removed->toArray() as $k) {
-            unset($this->$k);
+            unset($this->{$k});
         }
 
         $this->updateAttributes($values, $opts, false);
@@ -270,8 +287,8 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
      * Mass assigns attributes on the model.
      *
      * @param array $values
-     * @param null|string|array|Util\RequestOptions $opts
-     * @param boolean $dirty Defaults to true.
+     * @param null|array|string|Util\RequestOptions $opts
+     * @param bool $dirty defaults to true
      */
     public function updateAttributes($values, $opts = null, $dirty = true)
     {
@@ -280,7 +297,7 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
             // This is necessary in case metadata is empty, as PHP arrays do
             // not differentiate between lists and hashes, and we consider
             // empty arrays to be lists.
-            if (($k === "metadata") && (is_array($v))) {
+            if (('metadata' === $k) && (\is_array($v))) {
                 $this->_values[$k] = StripeObject::constructFrom($v, $opts);
             } else {
                 $this->_values[$k] = Util\Util::convertToStripeObject($v, $opts);
@@ -293,8 +310,10 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
     }
 
     /**
-     * @return array A recursive mapping of attributes to values for this object,
-     *    including the proper value for deleted attributes.
+     * @param bool $force defaults to false
+     *
+     * @return array a recursive mapping of attributes to values for this object,
+     *    including the proper value for deleted attributes
      */
     public function serializeParameters($force = false)
     {
@@ -309,7 +328,7 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
             //   3. Its value is a StripeObject. A StripeObject may contain modified
             //      values within in that its parent StripeObject doesn't know about.
             //
-            $original = array_key_exists($k, $this->_originalValues) ? $this->_originalValues[$k] : null;
+            $original = \array_key_exists($k, $this->_originalValues) ? $this->_originalValues[$k] : null;
             $unsaved = $this->_unsavedValues->includes($k);
             if ($force || $unsaved || $v instanceof StripeObject) {
                 $updateParams[$k] = $this->serializeParamsValue(
@@ -324,17 +343,14 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
 
         // a `null` that makes it out of `serializeParamsValue` signals an empty
         // value that we shouldn't appear in the serialized form of the object
-        $updateParams = array_filter(
+        return \array_filter(
             $updateParams,
             function ($v) {
-                return $v !== null;
+                return null !== $v;
             }
         );
-
-        return $updateParams;
     }
 
-
     public function serializeParamsValue($value, $original, $unsaved, $force, $key = null)
     {
         // The logic here is that essentially any object embedded in another
@@ -359,26 +375,29 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
         // We throw an error if a property was set explicitly but we can't do
         // anything with it because the integration is probably not working as the
         // user intended it to.
-        if ($value === null) {
-            return "";
-        } elseif (($value instanceof APIResource) && (!$value->saveWithParent)) {
+        if (null === $value) {
+            return '';
+        }
+        if (($value instanceof ApiResource) && (!$value->saveWithParent)) {
             if (!$unsaved) {
                 return null;
-            } elseif (isset($value->id)) {
-                return $value;
-            } else {
-                throw new \InvalidArgumentException(
-                    "Cannot save property `$key` containing an API resource of type " .
-                    get_class($value) . ". It doesn't appear to be persisted and is " .
-                    "not marked as `saveWithParent`."
-                );
             }
-        } elseif (is_array($value)) {
+            if (isset($value->id)) {
+                return $value;
+            }
+
+            throw new Exception\InvalidArgumentException(
+                "Cannot save property `{$key}` containing an API resource of type " .
+                    \get_class($value) . ". It doesn't appear to be persisted and is " .
+                    'not marked as `saveWithParent`.'
+            );
+        }
+        if (\is_array($value)) {
             if (Util\Util::isList($value)) {
                 // Sequential array, i.e. a list
                 $update = [];
                 foreach ($value as $v) {
-                    array_push($update, $this->serializeParamsValue($v, null, true, $force));
+                    $update[] = $this->serializeParamsValue($v, null, true, $force);
                 }
                 // This prevents an array that's unchanged from being resent.
                 if ($update !== $this->serializeParamsValue($original, null, true, $force, $key)) {
@@ -391,8 +410,9 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
         } elseif ($value instanceof StripeObject) {
             $update = $value->serializeParameters($force);
             if ($original && $unsaved && $key && static::getAdditiveParams()->includes($key)) {
-                $update = array_merge(self::emptyValues($original), $update);
+                $update = \array_merge(self::emptyValues($original), $update);
             }
+
             return $update;
         } else {
             return $value;
@@ -401,27 +421,55 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
 
     public function jsonSerialize()
     {
-        return $this->__toArray(true);
+        return $this->toArray();
     }
 
-    public function __toJSON()
+    /**
+     * Returns an associative array with the key and values composing the
+     * Stripe object.
+     *
+     * @return array the associative array
+     */
+    public function toArray()
     {
-        return json_encode($this->__toArray(true), JSON_PRETTY_PRINT);
+        $maybeToArray = function ($value) {
+            if (null === $value) {
+                return null;
+            }
+
+            return \is_object($value) && \method_exists($value, 'toArray') ? $value->toArray() : $value;
+        };
+
+        return \array_reduce(\array_keys($this->_values), function ($acc, $k) use ($maybeToArray) {
+            if ('_' === \substr((string) $k, 0, 1)) {
+                return $acc;
+            }
+            $v = $this->_values[$k];
+            if (Util\Util::isList($v)) {
+                $acc[$k] = \array_map($maybeToArray, $v);
+            } else {
+                $acc[$k] = $maybeToArray($v);
+            }
+
+            return $acc;
+        }, []);
+    }
+
+    /**
+     * Returns a pretty JSON representation of the Stripe object.
+     *
+     * @return string the JSON representation of the Stripe object
+     */
+    public function toJSON()
+    {
+        return \json_encode($this->toArray(), \JSON_PRETTY_PRINT);
     }
 
     public function __toString()
     {
-        $class = get_class($this);
-        return $class . ' JSON: ' . $this->__toJSON();
-    }
+        $class = static::class;
 
-    public function __toArray($recursive = false)
-    {
-        if ($recursive) {
-            return Util\Util::convertStripeObjectToArray($this->_values);
-        } else {
-            return $this->_values;
-        }
+        return $class . ' JSON: ' . $this->toJSON();
     }
 
     /**
@@ -432,7 +480,7 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
      */
     public function dirty()
     {
-        $this->_unsavedValues = new Util\Set(array_keys($this->_values));
+        $this->_unsavedValues = new Util\Set(\array_keys($this->_values));
         foreach ($this->_values as $k => $v) {
             $this->dirtyValue($v);
         }
@@ -440,7 +488,7 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
 
     protected function dirtyValue($value)
     {
-        if (is_array($value)) {
+        if (\is_array($value)) {
             foreach ($value as $v) {
                 $this->dirtyValue($v);
             }
@@ -452,46 +500,52 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
     /**
      * Produces a deep copy of the given object including support for arrays
      * and StripeObjects.
+     *
+     * @param mixed $obj
      */
     protected static function deepCopy($obj)
     {
-        if (is_array($obj)) {
+        if (\is_array($obj)) {
             $copy = [];
             foreach ($obj as $k => $v) {
                 $copy[$k] = self::deepCopy($v);
             }
+
             return $copy;
-        } elseif ($obj instanceof StripeObject) {
+        }
+        if ($obj instanceof StripeObject) {
             return $obj::constructFrom(
                 self::deepCopy($obj->_values),
                 clone $obj->_opts
             );
-        } else {
-            return $obj;
         }
+
+        return $obj;
     }
 
     /**
      * Returns a hash of empty values for all the values that are in the given
      * StripeObject.
+     *
+     * @param mixed $obj
      */
     public static function emptyValues($obj)
     {
-        if (is_array($obj)) {
+        if (\is_array($obj)) {
             $values = $obj;
         } elseif ($obj instanceof StripeObject) {
             $values = $obj->_values;
         } else {
-            throw new \InvalidArgumentException(
-                "empty_values got got unexpected object type: " . get_class($obj)
+            throw new Exception\InvalidArgumentException(
+                'empty_values got unexpected object type: ' . \get_class($obj)
             );
         }
-        $update = array_fill_keys(array_keys($values), "");
-        return $update;
+
+        return \array_fill_keys(\array_keys($values), '');
     }
 
     /**
-     * @return object The last response from the Stripe API
+     * @return null|ApiResponse The last response from the Stripe API
      */
     public function getLastResponse()
     {
@@ -499,10 +553,9 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
     }
 
     /**
-     * Sets the last response from the Stripe API
+     * Sets the last response from the Stripe API.
      *
      * @param ApiResponse $resp
-     * @return void
      */
     public function setLastResponse($resp)
     {
@@ -514,7 +567,7 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
      * Note that some, but not all, resources can indicate whether they have
      * been deleted.
      *
-     * @return bool Whether the resource is deleted.
+     * @return bool whether the resource is deleted
      */
     public function isDeleted()
     {
diff --git a/htdocs/includes/stripe/stripe-php/lib/Subscription.php b/htdocs/includes/stripe/stripe-php/lib/Subscription.php
index a1087a56a4c..fcb55a31dee 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Subscription.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Subscription.php
@@ -1,86 +1,98 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class Subscription
+ * Subscriptions allow you to charge a customer on a recurring basis.
  *
- * @property string $id
- * @property string $object
- * @property float $application_fee_percent
- * @property string $billing
- * @property int $billing_cycle_anchor
- * @property mixed $billing_thresholds
- * @property bool $cancel_at_period_end
- * @property int $canceled_at
- * @property string $collection_method
- * @property int $created
- * @property int $current_period_end
- * @property int $current_period_start
- * @property string $customer
- * @property int $days_until_due
- * @property string $default_payment_method
- * @property string $default_source
- * @property array $default_tax_rates
- * @property Discount $discount
- * @property int $ended_at
- * @property Collection $items
- * @property string $latest_invoice
- * @property boolean $livemode
- * @property StripeObject $metadata
- * @property string $pending_setup_intent
- * @property Plan $plan
- * @property int $quantity
- * @property SubscriptionSchedule $schedule
- * @property int $start
- * @property int $start_date
- * @property string $status
- * @property float $tax_percent
- * @property int $trial_end
- * @property int $trial_start
+ * Related guide: <a
+ * href="https://stripe.com/docs/billing/subscriptions/creating">Creating
+ * Subscriptions</a>.
  *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|float $application_fee_percent A non-negative decimal between 0 and 100, with at most two decimal places. This represents the percentage of the subscription invoice subtotal that will be transferred to the application owner's Stripe account.
+ * @property int $billing_cycle_anchor Determines the date of the first full invoice, and, for plans with <code>month</code> or <code>year</code> intervals, the day of the month for subsequent invoices.
+ * @property null|\Stripe\StripeObject $billing_thresholds Define thresholds at which an invoice will be sent, and the subscription advanced to a new billing period
+ * @property null|int $cancel_at A date in the future at which the subscription will automatically get canceled
+ * @property bool $cancel_at_period_end If the subscription has been canceled with the <code>at_period_end</code> flag set to <code>true</code>, <code>cancel_at_period_end</code> on the subscription will be true. You can use this attribute to determine whether a subscription that has a status of active is scheduled to be canceled at the end of the current period.
+ * @property null|int $canceled_at If the subscription has been canceled, the date of that cancellation. If the subscription was canceled with <code>cancel_at_period_end</code>, <code>canceled_at</code> will reflect the time of the most recent update request, not the end of the subscription period when the subscription is automatically moved to a canceled state.
+ * @property null|string $collection_method Either <code>charge_automatically</code>, or <code>send_invoice</code>. When charging automatically, Stripe will attempt to pay this subscription at the end of the cycle using the default source attached to the customer. When sending an invoice, Stripe will email your customer an invoice with payment instructions.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property int $current_period_end End of the current period that the subscription has been invoiced for. At the end of this period, a new invoice will be created.
+ * @property int $current_period_start Start of the current period that the subscription has been invoiced for.
+ * @property string|\Stripe\Customer $customer ID of the customer who owns the subscription.
+ * @property null|int $days_until_due Number of days a customer has to pay invoices generated by this subscription. This value will be <code>null</code> for subscriptions where <code>collection_method=charge_automatically</code>.
+ * @property null|string|\Stripe\PaymentMethod $default_payment_method ID of the default payment method for the subscription. It must belong to the customer associated with the subscription. This takes precedence over <code>default_source</code>. If neither are set, invoices will use the customer's <a href="https://stripe.com/docs/api/customers/object#customer_object-invoice_settings-default_payment_method">invoice_settings.default_payment_method</a> or <a href="https://stripe.com/docs/api/customers/object#customer_object-default_source">default_source</a>.
+ * @property null|string|\Stripe\Account|\Stripe\AlipayAccount|\Stripe\BankAccount|\Stripe\BitcoinReceiver|\Stripe\Card|\Stripe\Source $default_source ID of the default payment source for the subscription. It must belong to the customer associated with the subscription and be in a chargeable state. If <code>default_payment_method</code> is also set, <code>default_payment_method</code> will take precedence. If neither are set, invoices will use the customer's <a href="https://stripe.com/docs/api/customers/object#customer_object-invoice_settings-default_payment_method">invoice_settings.default_payment_method</a> or <a href="https://stripe.com/docs/api/customers/object#customer_object-default_source">default_source</a>.
+ * @property null|\Stripe\TaxRate[] $default_tax_rates The tax rates that will apply to any subscription item that does not have <code>tax_rates</code> set. Invoices created will have their <code>default_tax_rates</code> populated from the subscription.
+ * @property null|\Stripe\Discount $discount Describes the current discount applied to this subscription, if there is one. When billing, a discount applied to a subscription overrides a discount applied on a customer-wide basis.
+ * @property null|int $ended_at If the subscription has ended, the date the subscription ended.
+ * @property \Stripe\Collection $items List of subscription items, each with an attached price.
+ * @property null|string|\Stripe\Invoice $latest_invoice The most recent invoice this subscription has generated.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|int $next_pending_invoice_item_invoice Specifies the approximate timestamp on which any pending invoice items will be billed according to the schedule provided at <code>pending_invoice_item_interval</code>.
+ * @property null|\Stripe\StripeObject $pause_collection If specified, payment collection for this subscription will be paused.
+ * @property null|\Stripe\StripeObject $pending_invoice_item_interval Specifies an interval for how often to bill for any pending invoice items. It is analogous to calling <a href="https://stripe.com/docs/api#create_invoice">Create an invoice</a> for the given subscription at the specified interval.
+ * @property null|string|\Stripe\SetupIntent $pending_setup_intent You can use this <a href="https://stripe.com/docs/api/setup_intents">SetupIntent</a> to collect user authentication when creating a subscription without immediate payment or updating a subscription's payment method, allowing you to optimize for off-session payments. Learn more in the <a href="https://stripe.com/docs/billing/migration/strong-customer-authentication#scenario-2">SCA Migration Guide</a>.
+ * @property null|\Stripe\StripeObject $pending_update If specified, <a href="https://stripe.com/docs/billing/subscriptions/pending-updates">pending updates</a> that will be applied to the subscription once the <code>latest_invoice</code> has been paid.
+ * @property null|string|\Stripe\SubscriptionSchedule $schedule The schedule attached to the subscription
+ * @property int $start_date Date when the subscription was first created. The date might differ from the <code>created</code> date due to backdating.
+ * @property string $status <p>Possible values are <code>incomplete</code>, <code>incomplete_expired</code>, <code>trialing</code>, <code>active</code>, <code>past_due</code>, <code>canceled</code>, or <code>unpaid</code>.</p><p>For <code>collection_method=charge_automatically</code> a subscription moves into <code>incomplete</code> if the initial payment attempt fails. A subscription in this state can only have metadata and default_source updated. Once the first invoice is paid, the subscription moves into an <code>active</code> state. If the first invoice is not paid within 23 hours, the subscription transitions to <code>incomplete_expired</code>. This is a terminal state, the open invoice will be voided and no further invoices will be generated.</p><p>A subscription that is currently in a trial period is <code>trialing</code> and moves to <code>active</code> when the trial period is over.</p><p>If subscription <code>collection_method=charge_automatically</code> it becomes <code>past_due</code> when payment to renew it fails and <code>canceled</code> or <code>unpaid</code> (depending on your subscriptions settings) when Stripe has exhausted all payment retry attempts.</p><p>If subscription <code>collection_method=send_invoice</code> it becomes <code>past_due</code> when its invoice is not paid by the due date, and <code>canceled</code> or <code>unpaid</code> if it is still not paid by an additional deadline after that. Note that when a subscription has a status of <code>unpaid</code>, no subsequent invoices will be attempted (invoices will be created, but then immediately automatically closed). After receiving updated payment information from a customer, you may choose to reopen and pay their closed invoices.</p>
+ * @property null|int $trial_end If the subscription has a trial, the end of that trial.
+ * @property null|int $trial_start If the subscription has a trial, the beginning of that trial.
  */
 class Subscription extends ApiResource
 {
-    const OBJECT_NAME = "subscription";
+    const OBJECT_NAME = 'subscription';
 
     use ApiOperations\All;
     use ApiOperations\Create;
-    use ApiOperations\Delete {
-        delete as protected _delete;
-    }
     use ApiOperations\Retrieve;
     use ApiOperations\Update;
 
-    /**
-     * These constants are possible representations of the status field.
-     *
-     * @link https://stripe.com/docs/api#subscription_object-status
-     */
-    const STATUS_ACTIVE             = 'active';
-    const STATUS_CANCELED           = 'canceled';
-    const STATUS_PAST_DUE           = 'past_due';
-    const STATUS_TRIALING           = 'trialing';
-    const STATUS_UNPAID             = 'unpaid';
-    const STATUS_INCOMPLETE         = 'incomplete';
+    const PAYMENT_BEHAVIOR_ALLOW_INCOMPLETE = 'allow_incomplete';
+    const PAYMENT_BEHAVIOR_ERROR_IF_INCOMPLETE = 'error_if_incomplete';
+    const PAYMENT_BEHAVIOR_PENDING_IF_INCOMPLETE = 'pending_if_incomplete';
+
+    const PRORATION_BEHAVIOR_ALWAYS_INVOICE = 'always_invoice';
+    const PRORATION_BEHAVIOR_CREATE_PRORATIONS = 'create_prorations';
+    const PRORATION_BEHAVIOR_NONE = 'none';
+
+    const STATUS_ACTIVE = 'active';
+    const STATUS_CANCELED = 'canceled';
+    const STATUS_INCOMPLETE = 'incomplete';
     const STATUS_INCOMPLETE_EXPIRED = 'incomplete_expired';
+    const STATUS_PAST_DUE = 'past_due';
+    const STATUS_TRIALING = 'trialing';
+    const STATUS_UNPAID = 'unpaid';
+
+    use ApiOperations\Delete {
+        delete as protected _delete;
+      }
 
     public static function getSavedNestedResources()
     {
         static $savedNestedResources = null;
-        if ($savedNestedResources === null) {
+        if (null === $savedNestedResources) {
             $savedNestedResources = new Util\Set([
                 'source',
             ]);
         }
+
         return $savedNestedResources;
     }
 
     /**
-     * @param array|null $params
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return Subscription The deleted subscription.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Subscription the deleted subscription
      */
     public function cancel($params = null, $opts = null)
     {
@@ -88,12 +100,17 @@ class Subscription extends ApiResource
     }
 
     /**
-     * @return Subscription The updated subscription.
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Subscription the updated subscription
      */
-    public function deleteDiscount()
+    public function deleteDiscount($params = null, $opts = null)
     {
         $url = $this->instanceUrl() . '/discount';
-        list($response, $opts) = $this->_request('delete', $url);
+        list($response, $opts) = $this->_request('delete', $url, $params, $opts);
         $this->refreshFrom(['discount' => null], $opts, true);
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/SubscriptionItem.php b/htdocs/includes/stripe/stripe-php/lib/SubscriptionItem.php
index d0d2dea8fcf..5bd25b25200 100644
--- a/htdocs/includes/stripe/stripe-php/lib/SubscriptionItem.php
+++ b/htdocs/includes/stripe/stripe-php/lib/SubscriptionItem.php
@@ -1,27 +1,27 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class SubscriptionItem
+ * Subscription items allow you to create customer subscriptions with more than one
+ * plan, making it easy to represent complex billing relationships.
  *
- * @property string $id
- * @property string $object
- * @property mixed $billing_thresholds
- * @property int $created
- * @property StripeObject $metadata
- * @property Plan $plan
- * @property int $quantity
- * @property string $subscription
- * @property array $tax_rates
- *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|\Stripe\StripeObject $billing_thresholds Define thresholds at which an invoice will be sent, and the related subscription advanced to a new billing period
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property \Stripe\Plan $plan <p>You can now model subscriptions more flexibly using the <a href="https://stripe.com/docs/api#prices">Prices API</a>. It replaces the Plans API and is backwards compatible to simplify your migration.</p><p>Plans define the base price, currency, and billing cycle for recurring purchases of products. <a href="https://stripe.com/docs/api#products">Products</a> help you track inventory or provisioning, and plans help you track pricing. Different physical goods or levels of service should be represented by products, and pricing options should be represented by plans. This approach lets you change prices without having to change your provisioning scheme.</p><p>For example, you might have a single &quot;gold&quot; product that has plans for $10/month, $100/year, €9/month, and €90/year.</p><p>Related guides: <a href="https://stripe.com/docs/billing/subscriptions/set-up-subscription">Set up a subscription</a> and more about <a href="https://stripe.com/docs/billing/prices-guide">products and prices</a>.</p>
+ * @property \Stripe\Price $price <p>Prices define the unit cost, currency, and (optional) billing cycle for both recurring and one-time purchases of products. <a href="https://stripe.com/docs/api#products">Products</a> help you track inventory or provisioning, and prices help you track payment terms. Different physical goods or levels of service should be represented by products, and pricing options should be represented by prices. This approach lets you change prices without having to change your provisioning scheme.</p><p>For example, you might have a single &quot;gold&quot; product that has prices for $10/month, $100/year, and €9 once.</p><p>Related guides: <a href="https://stripe.com/docs/billing/subscriptions/set-up-subscription">Set up a subscription</a>, <a href="https://stripe.com/docs/billing/invoices/create">create an invoice</a>, and more about <a href="https://stripe.com/docs/billing/prices-guide">products and prices</a>.</p>
+ * @property int $quantity The <a href="https://stripe.com/docs/subscriptions/quantities">quantity</a> of the plan to which the customer should be subscribed.
+ * @property string $subscription The <code>subscription</code> this <code>subscription_item</code> belongs to.
+ * @property null|\Stripe\TaxRate[] $tax_rates The tax rates which apply to this <code>subscription_item</code>. When set, the <code>default_tax_rates</code> on the subscription do not apply to this <code>subscription_item</code>.
  */
 class SubscriptionItem extends ApiResource
 {
-    const OBJECT_NAME = "subscription_item";
-
-    const PATH_USAGE_RECORDS = '/usage_records';
+    const OBJECT_NAME = 'subscription_item';
 
     use ApiOperations\All;
     use ApiOperations\Create;
@@ -30,12 +30,16 @@ class SubscriptionItem extends ApiResource
     use ApiOperations\Retrieve;
     use ApiOperations\Update;
 
+    const PATH_USAGE_RECORDS = '/usage_records';
+
     /**
-     * @param string|null $id The ID of the subscription item on which to create the usage record.
-     * @param array|null $params
-     * @param array|string|null $opts
+     * @param null|string $id the ID of the subscription item on which to create the usage record
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return ApiResource
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\UsageRecord
      */
     public static function createUsageRecord($id, $params = null, $opts = null)
     {
@@ -43,17 +47,38 @@ class SubscriptionItem extends ApiResource
     }
 
     /**
-     * @param array|null $params
-     * @param array|string|null $options
+     * @deprecated usageRecordSummaries is deprecated. Please use SubscriptionItem::allUsageRecordSummaries instead.
      *
-     * @return Collection The list of usage record summaries.
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection the list of usage record summaries
      */
-    public function usageRecordSummaries($params = null, $options = null)
+    public function usageRecordSummaries($params = null, $opts = null)
     {
         $url = $this->instanceUrl() . '/usage_record_summaries';
-        list($response, $opts) = $this->_request('get', $url, $params, $options);
-        $obj = Util\Util::convertToStripeObject($response, $opts);
+        list($response, $opts) = $this->_request('get', $url, $params, $opts);
+        $obj = \Stripe\Util\Util::convertToStripeObject($response, $opts);
         $obj->setLastResponse($response);
+
         return $obj;
     }
+
+    const PATH_USAGE_RECORD_SUMMARIES = '/usage_record_summaries';
+
+    /**
+     * @param string $id the ID of the subscription item on which to retrieve the usage record summaries
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection the list of usage record summaries
+     */
+    public static function allUsageRecordSummaries($id, $params = null, $opts = null)
+    {
+        return self::_allNestedResources($id, static::PATH_USAGE_RECORD_SUMMARIES, $params, $opts);
+    }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/SubscriptionSchedule.php b/htdocs/includes/stripe/stripe-php/lib/SubscriptionSchedule.php
index e41f279a036..0f1b1563024 100644
--- a/htdocs/includes/stripe/stripe-php/lib/SubscriptionSchedule.php
+++ b/htdocs/includes/stripe/stripe-php/lib/SubscriptionSchedule.php
@@ -1,68 +1,74 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class SubscriptionSchedule
+ * A subscription schedule allows you to create and manage the lifecycle of a
+ * subscription by predefining expected changes.
  *
- * @property string $id
- * @property string $object
- * @property string $billing
- * @property mixed $billing_thresholds
- * @property int $canceled_at
- * @property int $completed_at
- * @property int $created
- * @property mixed $current_phase
- * @property string $customer
- * @property mixed $invoice_settings
- * @property boolean $livemode
- * @property StripeObject $metadata
- * @property mixed $phases
- * @property int $released_at
- * @property string $released_subscription
- * @property string $renewal_behavior
- * @property mixed $renewal_interval
- * @property string $revision
- * @property string $status
- * @property string $subscription
+ * Related guide: <a
+ * href="https://stripe.com/docs/billing/subscriptions/subscription-schedules">Subscription
+ * Schedules</a>.
  *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|int $canceled_at Time at which the subscription schedule was canceled. Measured in seconds since the Unix epoch.
+ * @property null|int $completed_at Time at which the subscription schedule was completed. Measured in seconds since the Unix epoch.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|\Stripe\StripeObject $current_phase Object representing the start and end dates for the current phase of the subscription schedule, if it is <code>active</code>.
+ * @property string|\Stripe\Customer $customer ID of the customer who owns the subscription schedule.
+ * @property \Stripe\StripeObject $default_settings
+ * @property string $end_behavior Behavior of the subscription schedule and underlying subscription when it ends. Possible values are <code>release</code> and <code>cancel</code>.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property \Stripe\StripeObject[] $phases Configuration for the subscription schedule's phases.
+ * @property null|int $released_at Time at which the subscription schedule was released. Measured in seconds since the Unix epoch.
+ * @property null|string $released_subscription ID of the subscription once managed by the subscription schedule (if it is released).
+ * @property string $status The present status of the subscription schedule. Possible values are <code>not_started</code>, <code>active</code>, <code>completed</code>, <code>released</code>, and <code>canceled</code>. You can read more about the different states in our <a href="https://stripe.com/docs/billing/subscriptions/subscription-schedules">behavior guide</a>.
+ * @property null|string|\Stripe\Subscription $subscription ID of the subscription managed by the subscription schedule.
  */
 class SubscriptionSchedule extends ApiResource
 {
-    const OBJECT_NAME = "subscription_schedule";
+    const OBJECT_NAME = 'subscription_schedule';
 
     use ApiOperations\All;
     use ApiOperations\Create;
     use ApiOperations\Retrieve;
     use ApiOperations\Update;
-    use ApiOperations\NestedResource;
 
     /**
-     * @param array|null $params
-     * @param array|string|null $opts
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return SubscriptionSchedule The canceled subscription schedule.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return SubscriptionSchedule the canceled subscription schedule
      */
     public function cancel($params = null, $opts = null)
     {
         $url = $this->instanceUrl() . '/cancel';
         list($response, $opts) = $this->_request('post', $url, $params, $opts);
         $this->refreshFrom($response, $opts);
+
         return $this;
     }
 
     /**
-     * @param array|null $params
-     * @param array|string|null $opts
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return SubscriptionSchedule The released subscription schedule.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return SubscriptionSchedule the released subscription schedule
      */
     public function release($params = null, $opts = null)
     {
         $url = $this->instanceUrl() . '/release';
         list($response, $opts) = $this->_request('post', $url, $params, $opts);
         $this->refreshFrom($response, $opts);
+
         return $this;
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/TaxId.php b/htdocs/includes/stripe/stripe-php/lib/TaxId.php
index 8d607132e6e..d4188fe4045 100644
--- a/htdocs/includes/stripe/stripe-php/lib/TaxId.php
+++ b/htdocs/includes/stripe/stripe-php/lib/TaxId.php
@@ -1,80 +1,106 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class TaxId
+ * You can add one or multiple tax IDs to a <a
+ * href="https://stripe.com/docs/api/customers">customer</a>. A customer's tax IDs
+ * are displayed on invoices and credit notes issued for the customer.
  *
- * @package Stripe
+ * Related guide: <a href="https://stripe.com/docs/billing/taxes/tax-ids">Customer
+ * Tax Identification Numbers</a>.
  *
- * @property string $id
- * @property string $object
- * @property string $country
- * @property int $created
- * @property string $customer
- * @property bool $livemode
- * @property string $type
- * @property string $value
- * @property mixed $verification
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string $country Two-letter ISO code representing the country of the tax ID.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string|\Stripe\Customer $customer ID of the customer.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property string $type Type of the tax ID, one of <code>ae_trn</code>, <code>au_abn</code>, <code>br_cnpj</code>, <code>br_cpf</code>, <code>ca_bn</code>, <code>ca_qst</code>, <code>ch_vat</code>, <code>cl_tin</code>, <code>es_cif</code>, <code>eu_vat</code>, <code>hk_br</code>, <code>id_npwp</code>, <code>in_gst</code>, <code>jp_cn</code>, <code>jp_rn</code>, <code>kr_brn</code>, <code>li_uid</code>, <code>mx_rfc</code>, <code>my_frp</code>, <code>my_itn</code>, <code>my_sst</code>, <code>no_vat</code>, <code>nz_gst</code>, <code>ru_inn</code>, <code>ru_kpp</code>, <code>sa_vat</code>, <code>sg_gst</code>, <code>sg_uen</code>, <code>th_vat</code>, <code>tw_vat</code>, <code>us_ein</code>, or <code>za_vat</code>. Note that some legacy tax IDs have type <code>unknown</code>
+ * @property string $value Value of the tax ID.
+ * @property null|\Stripe\StripeObject $verification Tax ID verification information.
  */
 class TaxId extends ApiResource
 {
-    const OBJECT_NAME = "tax_id";
+    const OBJECT_NAME = 'tax_id';
 
     use ApiOperations\Delete;
 
-    /**
-     * Possible string representations of a tax id's type.
-     * @link https://stripe.com/docs/api/customer_tax_ids/object#tax_id_object-type
-     */
-    const TYPE_AU_ABN  = 'au_abn';
-    const TYPE_EU_VAT  = 'eu_vat';
-    const TYPE_IN_GST  = 'in_gst';
-    const TYPE_NO_VAT  = 'no_vat';
-    const TYPE_NZ_GST  = 'nz_gst';
+    const TYPE_AE_TRN = 'ae_trn';
+    const TYPE_AU_ABN = 'au_abn';
+    const TYPE_BR_CNPJ = 'br_cnpj';
+    const TYPE_BR_CPF = 'br_cpf';
+    const TYPE_CA_BN = 'ca_bn';
+    const TYPE_CA_QST = 'ca_qst';
+    const TYPE_CH_VAT = 'ch_vat';
+    const TYPE_CL_TIN = 'cl_tin';
+    const TYPE_ES_CIF = 'es_cif';
+    const TYPE_EU_VAT = 'eu_vat';
+    const TYPE_HK_BR = 'hk_br';
+    const TYPE_ID_NPWP = 'id_npwp';
+    const TYPE_IN_GST = 'in_gst';
+    const TYPE_JP_CN = 'jp_cn';
+    const TYPE_JP_RN = 'jp_rn';
+    const TYPE_KR_BRN = 'kr_brn';
+    const TYPE_LI_UID = 'li_uid';
+    const TYPE_MX_RFC = 'mx_rfc';
+    const TYPE_MY_FRP = 'my_frp';
+    const TYPE_MY_ITN = 'my_itn';
+    const TYPE_MY_SST = 'my_sst';
+    const TYPE_NO_VAT = 'no_vat';
+    const TYPE_NZ_GST = 'nz_gst';
+    const TYPE_RU_INN = 'ru_inn';
+    const TYPE_RU_KPP = 'ru_kpp';
+    const TYPE_SA_VAT = 'sa_vat';
+    const TYPE_SG_GST = 'sg_gst';
+    const TYPE_SG_UEN = 'sg_uen';
+    const TYPE_TH_VAT = 'th_vat';
+    const TYPE_TW_VAT = 'tw_vat';
     const TYPE_UNKNOWN = 'unknown';
+    const TYPE_US_EIN = 'us_ein';
+    const TYPE_ZA_VAT = 'za_vat';
 
-    /**
-     * Possible string representations of the verification status.
-     * @link https://stripe.com/docs/api/customer_tax_ids/object#tax_id_object-verification
-     */
-    const VERIFICATION_STATUS_PENDING     = 'pending';
+    const VERIFICATION_STATUS_PENDING = 'pending';
     const VERIFICATION_STATUS_UNAVAILABLE = 'unavailable';
-    const VERIFICATION_STATUS_UNVERIFIED  = 'unverified';
-    const VERIFICATION_STATUS_VERIFIED    = 'verified';
+    const VERIFICATION_STATUS_UNVERIFIED = 'unverified';
+    const VERIFICATION_STATUS_VERIFIED = 'verified';
 
     /**
-     * @return string The API URL for this tax id.
+     * @return string the API URL for this tax id
      */
     public function instanceUrl()
     {
         $id = $this['id'];
         $customer = $this['customer'];
         if (!$id) {
-            throw new Error\InvalidRequest(
-                "Could not determine which URL to request: class instance has invalid ID: $id",
-                null
+            throw new Exception\UnexpectedValueException(
+                "Could not determine which URL to request: class instance has invalid ID: {$id}"
             );
         }
         $id = Util\Util::utf8($id);
         $customer = Util\Util::utf8($customer);
 
         $base = Customer::classUrl();
-        $customerExtn = urlencode($customer);
-        $extn = urlencode($id);
-        return "$base/$customerExtn/tax_ids/$extn";
+        $customerExtn = \urlencode($customer);
+        $extn = \urlencode($id);
+
+        return "{$base}/{$customerExtn}/tax_ids/{$extn}";
     }
 
     /**
      * @param array|string $_id
-     * @param array|string|null $_opts
+     * @param null|array|string $_opts
      *
-     * @throws \Stripe\Error\InvalidRequest
+     * @throws \Stripe\Exception\BadMethodCallException
      */
     public static function retrieve($_id, $_opts = null)
     {
-        $msg = "Tax Ids cannot be accessed without a customer ID. " .
-               "Retrieve a Tax Id using Customer::retrieveTaxId('tax_id') instead.";
-        throw new Error\InvalidRequest($msg, null);
+        $msg = 'Tax IDs cannot be retrieved without a customer ID. Retrieve ' .
+               "a tax ID using `Customer::retrieveTaxId('customer_id', " .
+               "'tax_id_id')`.";
+
+        throw new Exception\BadMethodCallException($msg);
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/TaxRate.php b/htdocs/includes/stripe/stripe-php/lib/TaxRate.php
index 9f416507cf4..2974f8383f3 100644
--- a/htdocs/includes/stripe/stripe-php/lib/TaxRate.php
+++ b/htdocs/includes/stripe/stripe-php/lib/TaxRate.php
@@ -1,27 +1,35 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class TaxRate
+ * Tax rates can be applied to <a
+ * href="https://stripe.com/docs/billing/invoices/tax-rates">invoices</a>, <a
+ * href="https://stripe.com/docs/billing/subscriptions/taxes">subscriptions</a> and
+ * <a
+ * href="https://stripe.com/docs/payments/checkout/set-up-a-subscription#tax-rates">Checkout
+ * Sessions</a> to collect tax.
  *
- * @property string $id
- * @property string $object
- * @property bool $active
- * @property int $created
- * @property string $description
- * @property string $display_name
- * @property bool $inclusive
- * @property string $jurisdiction
- * @property bool $livemode
- * @property StripeObject $metadata
- * @property float $percentage
+ * Related guide: <a href="https://stripe.com/docs/billing/taxes/tax-rates">Tax
+ * Rates</a>.
  *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property bool $active Defaults to <code>true</code>. When set to <code>false</code>, this tax rate cannot be used with new applications or Checkout Sessions, but will still work for subscriptions and invoices that already have it set.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string $description An arbitrary string attached to the tax rate for your internal use only. It will not be visible to your customers.
+ * @property string $display_name The display name of the tax rates as it will appear to your customer on their receipt email, PDF, and the hosted invoice page.
+ * @property bool $inclusive This specifies if the tax rate is inclusive or exclusive.
+ * @property null|string $jurisdiction The jurisdiction for the tax rate. You can use this label field for tax reporting purposes. It also appears on your customer’s invoice.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property float $percentage This represents the tax rate percent out of 100.
  */
 class TaxRate extends ApiResource
 {
-    const OBJECT_NAME = "tax_rate";
+    const OBJECT_NAME = 'tax_rate';
 
     use ApiOperations\All;
     use ApiOperations\Create;
diff --git a/htdocs/includes/stripe/stripe-php/lib/Terminal/ConnectionToken.php b/htdocs/includes/stripe/stripe-php/lib/Terminal/ConnectionToken.php
index 92a5b997b9c..e688857b04c 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Terminal/ConnectionToken.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Terminal/ConnectionToken.php
@@ -1,17 +1,23 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe\Terminal;
 
 /**
- * Class ConnectionToken
+ * A Connection Token is used by the Stripe Terminal SDK to connect to a reader.
  *
- * @property string $secret
+ * Related guide: <a
+ * href="https://stripe.com/docs/terminal/readers/fleet-management#create">Fleet
+ * Management</a>.
  *
- * @package Stripe\Terminal
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property string $location The id of the location that this connection token is scoped to.
+ * @property string $secret Your application should pass this token to the Stripe Terminal SDK.
  */
 class ConnectionToken extends \Stripe\ApiResource
 {
-    const OBJECT_NAME = "terminal.connection_token";
+    const OBJECT_NAME = 'terminal.connection_token';
 
     use \Stripe\ApiOperations\Create;
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Terminal/Location.php b/htdocs/includes/stripe/stripe-php/lib/Terminal/Location.php
index 8628b060b6a..5769ef358e8 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Terminal/Location.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Terminal/Location.php
@@ -1,21 +1,26 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe\Terminal;
 
 /**
- * Class Location
+ * A Location represents a grouping of readers.
  *
- * @property string $id
- * @property string $object
- * @property mixed $address
- * @property bool $deleted
- * @property string $display_name
+ * Related guide: <a
+ * href="https://stripe.com/docs/terminal/readers/fleet-management#create">Fleet
+ * Management</a>.
  *
- * @package Stripe\Terminal
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property \Stripe\StripeObject $address
+ * @property string $display_name The display name of the location.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
  */
 class Location extends \Stripe\ApiResource
 {
-    const OBJECT_NAME = "terminal.location";
+    const OBJECT_NAME = 'terminal.location';
 
     use \Stripe\ApiOperations\All;
     use \Stripe\ApiOperations\Create;
diff --git a/htdocs/includes/stripe/stripe-php/lib/Terminal/Reader.php b/htdocs/includes/stripe/stripe-php/lib/Terminal/Reader.php
index f11ccd564df..513b130af69 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Terminal/Reader.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Terminal/Reader.php
@@ -1,26 +1,31 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe\Terminal;
 
 /**
- * Class Reader
+ * A Reader represents a physical device for accepting payment details.
  *
- * @property string $id
- * @property string $object
- * @property bool $deleted
- * @property string $device_sw_version
- * @property string $device_type
- * @property string $ip_address
- * @property string $label
- * @property string $location
- * @property string $serial_number
- * @property string $status
+ * Related guide: <a
+ * href="https://stripe.com/docs/terminal/readers/connecting">Connecting to a
+ * Reader</a>.
  *
- * @package Stripe\Terminal
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string $device_sw_version The current software version of the reader.
+ * @property string $device_type Type of reader, one of <code>bbpos_chipper2x</code> or <code>verifone_P400</code>.
+ * @property null|string $ip_address The local IP address of the reader.
+ * @property string $label Custom label given to the reader for easier identification.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|string $location The location identifier of the reader.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property string $serial_number Serial number of the reader.
+ * @property null|string $status The networking status of the reader.
  */
 class Reader extends \Stripe\ApiResource
 {
-    const OBJECT_NAME = "terminal.reader";
+    const OBJECT_NAME = 'terminal.reader';
 
     use \Stripe\ApiOperations\All;
     use \Stripe\ApiOperations\Create;
diff --git a/htdocs/includes/stripe/stripe-php/lib/ThreeDSecure.php b/htdocs/includes/stripe/stripe-php/lib/ThreeDSecure.php
index 3869eba85b3..51b5691d4e7 100644
--- a/htdocs/includes/stripe/stripe-php/lib/ThreeDSecure.php
+++ b/htdocs/includes/stripe/stripe-php/lib/ThreeDSecure.php
@@ -1,19 +1,37 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
+/**
+ * Cardholder authentication via 3D Secure is initiated by creating a <code>3D
+ * Secure</code> object. Once the object has been created, you can use it to
+ * authenticate the cardholder and create a charge.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Amount of the charge that you will create when authentication completes.
+ * @property bool $authenticated True if the cardholder went through the authentication flow and their bank indicated that authentication succeeded.
+ * @property \Stripe\Card $card <p>You can store multiple cards on a customer in order to charge the customer later. You can also store multiple debit cards on a recipient in order to transfer to those cards later.</p><p>Related guide: <a href="https://stripe.com/docs/sources/cards">Card Payments with Sources</a>.</p>
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|string $redirect_url If present, this is the URL that you should send the cardholder to for authentication. If you are going to use Stripe.js to display the authentication page in an iframe, you should use the value &quot;_callback&quot;.
+ * @property string $status Possible values are <code>redirect_pending</code>, <code>succeeded</code>, or <code>failed</code>. When the cardholder can be authenticated, the object starts with status <code>redirect_pending</code>. When liability will be shifted to the cardholder's bank (either because the cardholder was successfully authenticated, or because the bank has not implemented 3D Secure, the object wlil be in status <code>succeeded</code>. <code>failed</code> indicates that authentication was attempted unsuccessfully.
+ */
 class ThreeDSecure extends ApiResource
 {
-    const OBJECT_NAME = "three_d_secure";
+    const OBJECT_NAME = 'three_d_secure';
 
     use ApiOperations\Create;
     use ApiOperations\Retrieve;
 
     /**
-     * @return string The endpoint URL for the given class.
+     * @return string the endpoint URL for the given class
      */
     public static function classUrl()
     {
-        return "/v1/3d_secure";
+        return '/v1/3d_secure';
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Token.php b/htdocs/includes/stripe/stripe-php/lib/Token.php
index 629d51f6867..de7988cfb5a 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Token.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Token.php
@@ -1,35 +1,57 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class Token
+ * Tokenization is the process Stripe uses to collect sensitive card or bank
+ * account details, or personally identifiable information (PII), directly from
+ * your customers in a secure manner. A token representing this information is
+ * returned to your server to use. You should use our <a
+ * href="https://stripe.com/docs/payments">recommended payments integrations</a> to
+ * perform this process client-side. This ensures that no sensitive card data
+ * touches your server, and allows your integration to operate in a PCI-compliant
+ * way.
  *
- * @property string $id
- * @property string $object
- * @property BankAccount $bank_account
- * @property Card $card
- * @property string $client_ip
- * @property int $created
- * @property bool $livemode
- * @property string $type
- * @property bool $used
+ * If you cannot use client-side tokenization, you can also create tokens using the
+ * API with either your publishable or secret API key. Keep in mind that if your
+ * integration uses this method, you are responsible for any PCI compliance that
+ * may be required, and you must keep your secret API key safe. Unlike with
+ * client-side tokenization, your customer's information is not sent directly to
+ * Stripe, so we cannot determine how it is handled or stored.
  *
- * @package Stripe
+ * Tokens cannot be stored or used more than once. To store card or bank account
+ * information for later use, you can create <a
+ * href="https://stripe.com/docs/api#customers">Customer</a> objects or <a
+ * href="https://stripe.com/docs/api#external_accounts">Custom accounts</a>. Note
+ * that <a href="https://stripe.com/docs/radar">Radar</a>, our integrated solution
+ * for automatic fraud protection, supports only integrations that use client-side
+ * tokenization.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/payments/accept-a-payment-charges#web-create-token">Accept
+ * a payment</a>
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property \Stripe\BankAccount $bank_account <p>These bank accounts are payment methods on <code>Customer</code> objects.</p><p>On the other hand <a href="https://stripe.com/docs/api#external_accounts">External Accounts</a> are transfer destinations on <code>Account</code> objects for <a href="https://stripe.com/docs/connect/custom-accounts">Custom accounts</a>. They can be bank accounts or debit cards as well, and are documented in the links above.</p><p>Related guide: <a href="https://stripe.com/docs/payments/bank-debits-transfers">Bank Debits and Transfers</a>.</p>
+ * @property \Stripe\Card $card <p>You can store multiple cards on a customer in order to charge the customer later. You can also store multiple debit cards on a recipient in order to transfer to those cards later.</p><p>Related guide: <a href="https://stripe.com/docs/sources/cards">Card Payments with Sources</a>.</p>
+ * @property null|string $client_ip IP address of the client that generated the token.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property string $type Type of the token: <code>account</code>, <code>bank_account</code>, <code>card</code>, or <code>pii</code>.
+ * @property bool $used Whether this token has already been used (tokens can be used only once).
  */
 class Token extends ApiResource
 {
-    const OBJECT_NAME = "token";
+    const OBJECT_NAME = 'token';
 
     use ApiOperations\Create;
     use ApiOperations\Retrieve;
 
-    /**
-     * Possible string representations of the token type.
-     * @link https://stripe.com/docs/api/tokens/object#token_object-type
-     */
-    const TYPE_ACCOUNT      = 'account';
+    const TYPE_ACCOUNT = 'account';
     const TYPE_BANK_ACCOUNT = 'bank_account';
-    const TYPE_CARD         = 'card';
-    const TYPE_PII          = 'pii';
+    const TYPE_CARD = 'card';
+    const TYPE_PII = 'pii';
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Topup.php b/htdocs/includes/stripe/stripe-php/lib/Topup.php
index 37625a329ff..4a4c818b214 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Topup.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Topup.php
@@ -1,59 +1,63 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class Topup
+ * To top up your Stripe balance, you create a top-up object. You can retrieve
+ * individual top-ups, as well as list all top-ups. Top-ups are identified by a
+ * unique, random ID.
  *
- * @property string $id
- * @property string $object
- * @property int $amount
- * @property string $balance_transaction
- * @property int $created
- * @property string $currency
- * @property string $description
- * @property int $expected_availability_date
- * @property string $failure_code
- * @property string $failure_message
- * @property bool $livemode
- * @property StripeObject $metadata
- * @property mixed $source
- * @property string $statement_descriptor
- * @property string $status
- * @property string $transfer_group
+ * Related guide: <a href="https://stripe.com/docs/connect/top-ups">Topping Up your
+ * Platform Account</a>.
  *
- * @package Stripe
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Amount transferred.
+ * @property null|string|\Stripe\BalanceTransaction $balance_transaction ID of the balance transaction that describes the impact of this top-up on your account balance. May not be specified depending on status of top-up.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property null|int $expected_availability_date Date the funds are expected to arrive in your Stripe account for payouts. This factors in delays like weekends or bank holidays. May not be specified depending on status of top-up.
+ * @property null|string $failure_code Error code explaining reason for top-up failure if available (see <a href="https://stripe.com/docs/api#errors">the errors section</a> for a list of codes).
+ * @property null|string $failure_message Message to user further explaining reason for top-up failure if available.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property \Stripe\Source $source <p><code>Source</code> objects allow you to accept a variety of payment methods. They represent a customer's payment instrument, and can be used with the Stripe API just like a <code>Card</code> object: once chargeable, they can be charged, or can be attached to customers.</p><p>Related guides: <a href="https://stripe.com/docs/sources">Sources API</a> and <a href="https://stripe.com/docs/sources/customers">Sources &amp; Customers</a>.</p>
+ * @property null|string $statement_descriptor Extra information about a top-up. This will appear on your source's bank statement. It must contain at least one letter.
+ * @property string $status The status of the top-up is either <code>canceled</code>, <code>failed</code>, <code>pending</code>, <code>reversed</code>, or <code>succeeded</code>.
+ * @property null|string $transfer_group A string that identifies this top-up as part of a group.
  */
 class Topup extends ApiResource
 {
-    const OBJECT_NAME = "topup";
+    const OBJECT_NAME = 'topup';
 
     use ApiOperations\All;
     use ApiOperations\Create;
     use ApiOperations\Retrieve;
     use ApiOperations\Update;
 
-    /**
-     * Possible string representations of the status of the top-up.
-     * @link https://stripe.com/docs/api/topups/object#topup_object-status
-     */
-    const STATUS_CANCELED  = 'canceled';
-    const STATUS_FAILED    = 'failed';
-    const STATUS_PENDING   = 'pending';
-    const STATUS_REVERSED  = 'reversed';
+    const STATUS_CANCELED = 'canceled';
+    const STATUS_FAILED = 'failed';
+    const STATUS_PENDING = 'pending';
+    const STATUS_REVERSED = 'reversed';
     const STATUS_SUCCEEDED = 'succeeded';
 
     /**
-     * @param array|null $params
-     * @param array|string|null $options
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return Topup The canceled topup.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return Topup the canceled topup
      */
-    public function cancel($params = null, $options = null)
+    public function cancel($params = null, $opts = null)
     {
         $url = $this->instanceUrl() . '/cancel';
-        list($response, $opts) = $this->_request('post', $url, $params, $options);
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
         $this->refreshFrom($response, $opts);
+
         return $this;
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Transfer.php b/htdocs/includes/stripe/stripe-php/lib/Transfer.php
index bf9fa25ce37..6b8e4ac6afa 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Transfer.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Transfer.php
@@ -1,33 +1,44 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class Transfer
+ * A <code>Transfer</code> object is created when you move funds between Stripe
+ * accounts as part of Connect.
  *
- * @property string $id
- * @property string $object
- * @property int $amount
- * @property int $amount_reversed
- * @property string $balance_transaction
- * @property int $created
- * @property string $currency
- * @property string $description
- * @property string $destination
- * @property string $destination_payment
- * @property bool $livemode
- * @property StripeObject $metadata
- * @property Collection $reversals
- * @property bool $reversed
- * @property string $source_transaction
- * @property string $source_type
- * @property string $transfer_group
+ * Before April 6, 2017, transfers also represented movement of funds from a Stripe
+ * account to a card or bank account. This behavior has since been split out into a
+ * <a href="https://stripe.com/docs/api#payout_object">Payout</a> object, with
+ * corresponding payout endpoints. For more information, read about the <a
+ * href="https://stripe.com/docs/transfer-payout-split">transfer/payout split</a>.
  *
- * @package Stripe
+ * Related guide: <a
+ * href="https://stripe.com/docs/connect/charges-transfers">Creating Separate
+ * Charges and Transfers</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Amount in %s to be transferred.
+ * @property int $amount_reversed Amount in %s reversed (can be less than the amount attribute on the transfer if a partial reversal was issued).
+ * @property null|string|\Stripe\BalanceTransaction $balance_transaction Balance transaction that describes the impact of this transfer on your account balance.
+ * @property int $created Time that this record of the transfer was first created.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property null|string|\Stripe\Account $destination ID of the Stripe account the transfer was sent to.
+ * @property string|\Stripe\Charge $destination_payment If the destination is a Stripe account, this will be the ID of the payment that the destination account received for the transfer.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property \Stripe\Collection $reversals A list of reversals that have been applied to the transfer.
+ * @property bool $reversed Whether the transfer has been fully reversed. If the transfer is only partially reversed, this attribute will still be false.
+ * @property null|string|\Stripe\Charge $source_transaction ID of the charge or payment that was used to fund the transfer. If null, the transfer was funded from the available balance.
+ * @property null|string $source_type The source balance this transfer came from. One of <code>card</code>, <code>fpx</code>, or <code>bank_account</code>.
+ * @property null|string $transfer_group A string that identifies this transaction as part of a group. See the <a href="https://stripe.com/docs/connect/charges-transfers#transfer-options">Connect documentation</a> for details.
  */
 class Transfer extends ApiResource
 {
-    const OBJECT_NAME = "transfer";
+    const OBJECT_NAME = 'transfer';
 
     use ApiOperations\All;
     use ApiOperations\Create;
@@ -35,45 +46,52 @@ class Transfer extends ApiResource
     use ApiOperations\Retrieve;
     use ApiOperations\Update;
 
+    const SOURCE_TYPE_ALIPAY_ACCOUNT = 'alipay_account';
+    const SOURCE_TYPE_BANK_ACCOUNT = 'bank_account';
+    const SOURCE_TYPE_CARD = 'card';
+    const SOURCE_TYPE_FINANCING = 'financing';
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return Transfer the canceled transfer
+     */
+    public function cancel($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/cancel';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+
+        return $this;
+    }
+
     const PATH_REVERSALS = '/reversals';
 
     /**
-     * Possible string representations of the source type of the transfer.
-     * @link https://stripe.com/docs/api/transfers/object#transfer_object-source_type
-     */
-    const SOURCE_TYPE_ALIPAY_ACCOUNT = 'alipay_account';
-    const SOURCE_TYPE_BANK_ACCOUNT   = 'bank_account';
-    const SOURCE_TYPE_CARD           = 'card';
-    const SOURCE_TYPE_FINANCING      = 'financing';
-
-    /**
-     * @return TransferReversal The created transfer reversal.
-     */
-    public function reverse($params = null, $opts = null)
-    {
-        $url = $this->instanceUrl() . '/reversals';
-        list($response, $opts) = $this->_request('post', $url, $params, $opts);
-        $this->refreshFrom($response, $opts);
-        return $this;
-    }
-
-    /**
-     * @return Transfer The canceled transfer.
-     */
-    public function cancel()
-    {
-        $url = $this->instanceUrl() . '/cancel';
-        list($response, $opts) = $this->_request('post', $url);
-        $this->refreshFrom($response, $opts);
-        return $this;
-    }
-
-    /**
-     * @param string|null $id The ID of the transfer on which to create the reversal.
-     * @param array|null $params
-     * @param array|string|null $opts
+     * @param string $id the ID of the transfer on which to retrieve the transfer reversals
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return TransferReversal
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection the list of transfer reversals
+     */
+    public static function allReversals($id, $params = null, $opts = null)
+    {
+        return self::_allNestedResources($id, static::PATH_REVERSALS, $params, $opts);
+    }
+
+    /**
+     * @param string $id the ID of the transfer on which to create the transfer reversal
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\TransferReversal
      */
     public static function createReversal($id, $params = null, $opts = null)
     {
@@ -81,12 +99,14 @@ class Transfer extends ApiResource
     }
 
     /**
-     * @param string|null $id The ID of the transfer to which the reversal belongs.
-     * @param array|null $reversalId The ID of the reversal to retrieve.
-     * @param array|null $params
-     * @param array|string|null $opts
+     * @param string $id the ID of the transfer to which the transfer reversal belongs
+     * @param string $reversalId the ID of the transfer reversal to retrieve
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return TransferReversal
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\TransferReversal
      */
     public static function retrieveReversal($id, $reversalId, $params = null, $opts = null)
     {
@@ -94,27 +114,17 @@ class Transfer extends ApiResource
     }
 
     /**
-     * @param string|null $id The ID of the transfer to which the reversal belongs.
-     * @param array|null $reversalId The ID of the reversal to update.
-     * @param array|null $params
-     * @param array|string|null $opts
+     * @param string $id the ID of the transfer to which the transfer reversal belongs
+     * @param string $reversalId the ID of the transfer reversal to update
+     * @param null|array $params
+     * @param null|array|string $opts
      *
-     * @return TransferReversal
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\TransferReversal
      */
     public static function updateReversal($id, $reversalId, $params = null, $opts = null)
     {
         return self::_updateNestedResource($id, static::PATH_REVERSALS, $reversalId, $params, $opts);
     }
-
-    /**
-     * @param string|null $id The ID of the transfer on which to retrieve the reversals.
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection The list of reversals.
-     */
-    public static function allReversals($id, $params = null, $opts = null)
-    {
-        return self::_allNestedResources($id, static::PATH_REVERSALS, $params, $opts);
-    }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/TransferReversal.php b/htdocs/includes/stripe/stripe-php/lib/TransferReversal.php
index a4f94f2fb43..b6167dbb30a 100644
--- a/htdocs/includes/stripe/stripe-php/lib/TransferReversal.php
+++ b/htdocs/includes/stripe/stripe-php/lib/TransferReversal.php
@@ -1,42 +1,57 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class TransferReversal
+ * <a href="https://stripe.com/docs/connect">Stripe Connect</a> platforms can
+ * reverse transfers made to a connected account, either entirely or partially, and
+ * can also specify whether to refund any related application fees. Transfer
+ * reversals add to the platform's balance and subtract from the destination
+ * account's balance.
  *
- * @property string $id
- * @property string $object
- * @property int $amount
- * @property string $balance_transaction
- * @property int $created
- * @property string $currency
- * @property string $destination_payment_refund
- * @property StripeObject $metadata
- * @property string $source_refund
- * @property string $transfer
+ * Reversing a transfer that was made for a <a
+ * href="/docs/connect/destination-charges">destination charge</a> is allowed only
+ * up to the amount of the charge. It is possible to reverse a <a
+ * href="https://stripe.com/docs/connect/charges-transfers#transfer-options">transfer_group</a>
+ * transfer only if the destination account has enough balance to cover the
+ * reversal.
  *
- * @package Stripe
+ * Related guide: <a
+ * href="https://stripe.com/docs/connect/charges-transfers#reversing-transfers">Reversing
+ * Transfers</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Amount, in %s.
+ * @property null|string|\Stripe\BalanceTransaction $balance_transaction Balance transaction that describes the impact on your account balance.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|string|\Stripe\Refund $destination_payment_refund Linked payment refund for the transfer reversal.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string|\Stripe\Refund $source_refund ID of the refund responsible for the transfer reversal.
+ * @property string|\Stripe\Transfer $transfer ID of the transfer that was reversed.
  */
 class TransferReversal extends ApiResource
 {
-    const OBJECT_NAME = "transfer_reversal";
+    const OBJECT_NAME = 'transfer_reversal';
 
     use ApiOperations\Update {
         save as protected _save;
     }
 
     /**
-     * @return string The API URL for this Stripe transfer reversal.
+     * @return string the API URL for this Stripe transfer reversal
      */
     public function instanceUrl()
     {
         $id = $this['id'];
         $transfer = $this['transfer'];
         if (!$id) {
-            throw new Error\InvalidRequest(
-                "Could not determine which URL to request: " .
-                "class instance has invalid ID: $id",
+            throw new Exception\UnexpectedValueException(
+                'Could not determine which URL to request: ' .
+                "class instance has invalid ID: {$id}",
                 null
             );
         }
@@ -44,15 +59,18 @@ class TransferReversal extends ApiResource
         $transfer = Util\Util::utf8($transfer);
 
         $base = Transfer::classUrl();
-        $transferExtn = urlencode($transfer);
-        $extn = urlencode($id);
-        return "$base/$transferExtn/reversals/$extn";
+        $transferExtn = \urlencode($transfer);
+        $extn = \urlencode($id);
+
+        return "{$base}/{$transferExtn}/reversals/{$extn}";
     }
 
     /**
-     * @param array|string|null $opts
+     * @param null|array|string $opts
      *
-     * @return TransferReversal The saved reversal.
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return TransferReversal the saved reversal
      */
     public function save($opts = null)
     {
diff --git a/htdocs/includes/stripe/stripe-php/lib/UsageRecord.php b/htdocs/includes/stripe/stripe-php/lib/UsageRecord.php
index 1239222d49d..55229827695 100644
--- a/htdocs/includes/stripe/stripe-php/lib/UsageRecord.php
+++ b/htdocs/includes/stripe/stripe-php/lib/UsageRecord.php
@@ -1,43 +1,25 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class UsageRecord
+ * Usage records allow you to report customer usage and metrics to Stripe for
+ * metered billing of subscription prices.
  *
- * @package Stripe
+ * Related guide: <a
+ * href="https://stripe.com/docs/billing/subscriptions/metered-billing">Metered
+ * Billing</a>.
  *
- * @property string $id
- * @property string $object
- * @property bool $livemode
- * @property int $quantity
- * @property string $subscription_item
- * @property int $timestamp
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property int $quantity The usage quantity for the specified date.
+ * @property string $subscription_item The ID of the subscription item this usage record contains data for.
+ * @property int $timestamp The timestamp when this usage occurred.
  */
 class UsageRecord extends ApiResource
 {
-    const OBJECT_NAME = "usage_record";
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return \Stripe\ApiResource The created resource.
-     */
-    public static function create($params = null, $options = null)
-    {
-        self::_validateParams($params);
-        if (!array_key_exists('subscription_item', $params)) {
-            throw new Error\InvalidRequest("Missing subscription_item param in request", null);
-        }
-        $subscription_item = $params['subscription_item'];
-        $url = "/v1/subscription_items/$subscription_item/usage_records";
-        $request_params = $params;
-        unset($request_params['subscription_item']);
-
-        list($response, $opts) = static::_staticRequest('post', $url, $request_params, $options);
-        $obj = \Stripe\Util\Util::convertToStripeObject($response->json, $opts);
-        $obj->setLastResponse($response);
-        return $obj;
-    }
+    const OBJECT_NAME = 'usage_record';
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/UsageRecordSummary.php b/htdocs/includes/stripe/stripe-php/lib/UsageRecordSummary.php
index 9d3e7a396ed..174e14e0351 100644
--- a/htdocs/includes/stripe/stripe-php/lib/UsageRecordSummary.php
+++ b/htdocs/includes/stripe/stripe-php/lib/UsageRecordSummary.php
@@ -1,21 +1,19 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class UsageRecord
- *
- * @package Stripe
- *
- * @property string $id
- * @property string $object
- * @property string $invoice
- * @property bool $livemode
- * @property mixed $period
- * @property string $subscription_item
- * @property int $total_usage
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string $invoice The invoice in which this usage period has been billed for.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $period
+ * @property string $subscription_item The ID of the subscription item this summary is describing.
+ * @property int $total_usage The total usage within this usage period.
  */
 class UsageRecordSummary extends ApiResource
 {
-    const OBJECT_NAME = "usage_record_summary";
+    const OBJECT_NAME = 'usage_record_summary';
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Util/CaseInsensitiveArray.php b/htdocs/includes/stripe/stripe-php/lib/Util/CaseInsensitiveArray.php
index 02c6f26daf3..670ab0b6a7e 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Util/CaseInsensitiveArray.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Util/CaseInsensitiveArray.php
@@ -2,8 +2,6 @@
 
 namespace Stripe\Util;
 
-use ArrayAccess;
-
 /**
  * CaseInsensitiveArray is an array-like class that ignores case for keys.
  *
@@ -14,19 +12,29 @@ use ArrayAccess;
  * In the context of stripe-php, this is useful because the API will return headers with different
  * case depending on whether HTTP/2 is used or not (with HTTP/2, headers are always in lowercase).
  */
-class CaseInsensitiveArray implements ArrayAccess
+class CaseInsensitiveArray implements \ArrayAccess, \Countable, \IteratorAggregate
 {
-    private $container = array();
+    private $container = [];
 
-    public function __construct($initial_array = array())
+    public function __construct($initial_array = [])
     {
-        $this->container = array_map("strtolower", $initial_array);
+        $this->container = \array_change_key_case($initial_array, \CASE_LOWER);
+    }
+
+    public function count()
+    {
+        return \count($this->container);
+    }
+
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->container);
     }
 
     public function offsetSet($offset, $value)
     {
         $offset = static::maybeLowercase($offset);
-        if (is_null($offset)) {
+        if (null === $offset) {
             $this->container[] = $value;
         } else {
             $this->container[$offset] = $value;
@@ -36,6 +44,7 @@ class CaseInsensitiveArray implements ArrayAccess
     public function offsetExists($offset)
     {
         $offset = static::maybeLowercase($offset);
+
         return isset($this->container[$offset]);
     }
 
@@ -48,15 +57,16 @@ class CaseInsensitiveArray implements ArrayAccess
     public function offsetGet($offset)
     {
         $offset = static::maybeLowercase($offset);
+
         return isset($this->container[$offset]) ? $this->container[$offset] : null;
     }
 
     private static function maybeLowercase($v)
     {
-        if (is_string($v)) {
-            return strtolower($v);
-        } else {
-            return $v;
+        if (\is_string($v)) {
+            return \strtolower($v);
         }
+
+        return $v;
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Util/DefaultLogger.php b/htdocs/includes/stripe/stripe-php/lib/Util/DefaultLogger.php
index 1a8663699f5..016cbe85fb1 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Util/DefaultLogger.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Util/DefaultLogger.php
@@ -8,11 +8,22 @@ namespace Stripe\Util;
  */
 class DefaultLogger implements LoggerInterface
 {
+    /** @var int */
+    public $messageType = 0;
+
+    /** @var null|string */
+    public $destination;
+
     public function error($message, array $context = [])
     {
-        if (count($context) > 0) {
-            throw new \Exception('DefaultLogger does not currently implement context. Please implement if you need it.');
+        if (\count($context) > 0) {
+            throw new \Stripe\Exception\BadMethodCallException('DefaultLogger does not currently implement context. Please implement if you need it.');
+        }
+
+        if (null === $this->destination) {
+            \error_log($message, $this->messageType);
+        } else {
+            \error_log($message, $this->messageType, $this->destination);
         }
-        error_log($message);
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Util/LoggerInterface.php b/htdocs/includes/stripe/stripe-php/lib/Util/LoggerInterface.php
index cf04e1d2bad..5603c81b8f9 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Util/LoggerInterface.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Util/LoggerInterface.php
@@ -29,8 +29,6 @@ interface LoggerInterface
      * be logged and monitored.
      *
      * @param string $message
-     * @param array $context
-     * @return void
      */
     public function error($message, array $context = []);
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Util/ObjectTypes.php b/htdocs/includes/stripe/stripe-php/lib/Util/ObjectTypes.php
new file mode 100644
index 00000000000..5aad2bb407f
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/lib/Util/ObjectTypes.php
@@ -0,0 +1,99 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Util;
+
+class ObjectTypes
+{
+    /**
+     * @var array Mapping from object types to resource classes
+     */
+    const mapping = [
+        \Stripe\Account::OBJECT_NAME => \Stripe\Account::class,
+        \Stripe\AccountLink::OBJECT_NAME => \Stripe\AccountLink::class,
+        \Stripe\AlipayAccount::OBJECT_NAME => \Stripe\AlipayAccount::class,
+        \Stripe\ApplePayDomain::OBJECT_NAME => \Stripe\ApplePayDomain::class,
+        \Stripe\ApplicationFee::OBJECT_NAME => \Stripe\ApplicationFee::class,
+        \Stripe\ApplicationFeeRefund::OBJECT_NAME => \Stripe\ApplicationFeeRefund::class,
+        \Stripe\Balance::OBJECT_NAME => \Stripe\Balance::class,
+        \Stripe\BalanceTransaction::OBJECT_NAME => \Stripe\BalanceTransaction::class,
+        \Stripe\BankAccount::OBJECT_NAME => \Stripe\BankAccount::class,
+        \Stripe\BillingPortal\Session::OBJECT_NAME => \Stripe\BillingPortal\Session::class,
+        \Stripe\BitcoinReceiver::OBJECT_NAME => \Stripe\BitcoinReceiver::class,
+        \Stripe\BitcoinTransaction::OBJECT_NAME => \Stripe\BitcoinTransaction::class,
+        \Stripe\Capability::OBJECT_NAME => \Stripe\Capability::class,
+        \Stripe\Card::OBJECT_NAME => \Stripe\Card::class,
+        \Stripe\Charge::OBJECT_NAME => \Stripe\Charge::class,
+        \Stripe\Checkout\Session::OBJECT_NAME => \Stripe\Checkout\Session::class,
+        \Stripe\Collection::OBJECT_NAME => \Stripe\Collection::class,
+        \Stripe\CountrySpec::OBJECT_NAME => \Stripe\CountrySpec::class,
+        \Stripe\Coupon::OBJECT_NAME => \Stripe\Coupon::class,
+        \Stripe\CreditNote::OBJECT_NAME => \Stripe\CreditNote::class,
+        \Stripe\CreditNoteLineItem::OBJECT_NAME => \Stripe\CreditNoteLineItem::class,
+        \Stripe\Customer::OBJECT_NAME => \Stripe\Customer::class,
+        \Stripe\CustomerBalanceTransaction::OBJECT_NAME => \Stripe\CustomerBalanceTransaction::class,
+        \Stripe\Discount::OBJECT_NAME => \Stripe\Discount::class,
+        \Stripe\Dispute::OBJECT_NAME => \Stripe\Dispute::class,
+        \Stripe\EphemeralKey::OBJECT_NAME => \Stripe\EphemeralKey::class,
+        \Stripe\Event::OBJECT_NAME => \Stripe\Event::class,
+        \Stripe\ExchangeRate::OBJECT_NAME => \Stripe\ExchangeRate::class,
+        \Stripe\File::OBJECT_NAME => \Stripe\File::class,
+        \Stripe\File::OBJECT_NAME_ALT => \Stripe\File::class,
+        \Stripe\FileLink::OBJECT_NAME => \Stripe\FileLink::class,
+        \Stripe\Invoice::OBJECT_NAME => \Stripe\Invoice::class,
+        \Stripe\InvoiceItem::OBJECT_NAME => \Stripe\InvoiceItem::class,
+        \Stripe\InvoiceLineItem::OBJECT_NAME => \Stripe\InvoiceLineItem::class,
+        \Stripe\Issuing\Authorization::OBJECT_NAME => \Stripe\Issuing\Authorization::class,
+        \Stripe\Issuing\Card::OBJECT_NAME => \Stripe\Issuing\Card::class,
+        \Stripe\Issuing\CardDetails::OBJECT_NAME => \Stripe\Issuing\CardDetails::class,
+        \Stripe\Issuing\Cardholder::OBJECT_NAME => \Stripe\Issuing\Cardholder::class,
+        \Stripe\Issuing\Dispute::OBJECT_NAME => \Stripe\Issuing\Dispute::class,
+        \Stripe\Issuing\Transaction::OBJECT_NAME => \Stripe\Issuing\Transaction::class,
+        \Stripe\LineItem::OBJECT_NAME => \Stripe\LineItem::class,
+        \Stripe\LoginLink::OBJECT_NAME => \Stripe\LoginLink::class,
+        \Stripe\Mandate::OBJECT_NAME => \Stripe\Mandate::class,
+        \Stripe\Order::OBJECT_NAME => \Stripe\Order::class,
+        \Stripe\OrderItem::OBJECT_NAME => \Stripe\OrderItem::class,
+        \Stripe\OrderReturn::OBJECT_NAME => \Stripe\OrderReturn::class,
+        \Stripe\PaymentIntent::OBJECT_NAME => \Stripe\PaymentIntent::class,
+        \Stripe\PaymentMethod::OBJECT_NAME => \Stripe\PaymentMethod::class,
+        \Stripe\Payout::OBJECT_NAME => \Stripe\Payout::class,
+        \Stripe\Person::OBJECT_NAME => \Stripe\Person::class,
+        \Stripe\Plan::OBJECT_NAME => \Stripe\Plan::class,
+        \Stripe\Price::OBJECT_NAME => \Stripe\Price::class,
+        \Stripe\Product::OBJECT_NAME => \Stripe\Product::class,
+        \Stripe\PromotionCode::OBJECT_NAME => \Stripe\PromotionCode::class,
+        \Stripe\Radar\EarlyFraudWarning::OBJECT_NAME => \Stripe\Radar\EarlyFraudWarning::class,
+        \Stripe\Radar\ValueList::OBJECT_NAME => \Stripe\Radar\ValueList::class,
+        \Stripe\Radar\ValueListItem::OBJECT_NAME => \Stripe\Radar\ValueListItem::class,
+        \Stripe\Recipient::OBJECT_NAME => \Stripe\Recipient::class,
+        \Stripe\RecipientTransfer::OBJECT_NAME => \Stripe\RecipientTransfer::class,
+        \Stripe\Refund::OBJECT_NAME => \Stripe\Refund::class,
+        \Stripe\Reporting\ReportRun::OBJECT_NAME => \Stripe\Reporting\ReportRun::class,
+        \Stripe\Reporting\ReportType::OBJECT_NAME => \Stripe\Reporting\ReportType::class,
+        \Stripe\Review::OBJECT_NAME => \Stripe\Review::class,
+        \Stripe\SetupAttempt::OBJECT_NAME => \Stripe\SetupAttempt::class,
+        \Stripe\SetupIntent::OBJECT_NAME => \Stripe\SetupIntent::class,
+        \Stripe\Sigma\ScheduledQueryRun::OBJECT_NAME => \Stripe\Sigma\ScheduledQueryRun::class,
+        \Stripe\SKU::OBJECT_NAME => \Stripe\SKU::class,
+        \Stripe\Source::OBJECT_NAME => \Stripe\Source::class,
+        \Stripe\SourceTransaction::OBJECT_NAME => \Stripe\SourceTransaction::class,
+        \Stripe\Subscription::OBJECT_NAME => \Stripe\Subscription::class,
+        \Stripe\SubscriptionItem::OBJECT_NAME => \Stripe\SubscriptionItem::class,
+        \Stripe\SubscriptionSchedule::OBJECT_NAME => \Stripe\SubscriptionSchedule::class,
+        \Stripe\TaxId::OBJECT_NAME => \Stripe\TaxId::class,
+        \Stripe\TaxRate::OBJECT_NAME => \Stripe\TaxRate::class,
+        \Stripe\Terminal\ConnectionToken::OBJECT_NAME => \Stripe\Terminal\ConnectionToken::class,
+        \Stripe\Terminal\Location::OBJECT_NAME => \Stripe\Terminal\Location::class,
+        \Stripe\Terminal\Reader::OBJECT_NAME => \Stripe\Terminal\Reader::class,
+        \Stripe\ThreeDSecure::OBJECT_NAME => \Stripe\ThreeDSecure::class,
+        \Stripe\Token::OBJECT_NAME => \Stripe\Token::class,
+        \Stripe\Topup::OBJECT_NAME => \Stripe\Topup::class,
+        \Stripe\Transfer::OBJECT_NAME => \Stripe\Transfer::class,
+        \Stripe\TransferReversal::OBJECT_NAME => \Stripe\TransferReversal::class,
+        \Stripe\UsageRecord::OBJECT_NAME => \Stripe\UsageRecord::class,
+        \Stripe\UsageRecordSummary::OBJECT_NAME => \Stripe\UsageRecordSummary::class,
+        \Stripe\WebhookEndpoint::OBJECT_NAME => \Stripe\WebhookEndpoint::class,
+    ];
+}
diff --git a/htdocs/includes/stripe/stripe-php/lib/Util/RandomGenerator.php b/htdocs/includes/stripe/stripe-php/lib/Util/RandomGenerator.php
index 470f2bce8b3..b11e445d268 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Util/RandomGenerator.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Util/RandomGenerator.php
@@ -12,11 +12,12 @@ class RandomGenerator
      * Returns a random value between 0 and $max.
      *
      * @param float $max (optional)
+     *
      * @return float
      */
     public function randFloat($max = 1.0)
     {
-        return mt_rand() / mt_getrandmax() * $max;
+        return \mt_rand() / \mt_getrandmax() * $max;
     }
 
     /**
@@ -26,9 +27,10 @@ class RandomGenerator
      */
     public function uuid()
     {
-        $arr = array_values(unpack('N1a/n4b/N1c', openssl_random_pseudo_bytes(16)));
+        $arr = \array_values(\unpack('N1a/n4b/N1c', \openssl_random_pseudo_bytes(16)));
         $arr[2] = ($arr[2] & 0x0fff) | 0x4000;
         $arr[3] = ($arr[3] & 0x3fff) | 0x8000;
-        return vsprintf('%08x-%04x-%04x-%04x-%04x%08x', $arr);
+
+        return \vsprintf('%08x-%04x-%04x-%04x-%04x%08x', $arr);
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Util/RequestOptions.php b/htdocs/includes/stripe/stripe-php/lib/Util/RequestOptions.php
index 495236224d8..89924bb6c73 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Util/RequestOptions.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Util/RequestOptions.php
@@ -2,22 +2,30 @@
 
 namespace Stripe\Util;
 
-use Stripe\Error;
-
 class RequestOptions
 {
     /**
-     * @var array A list of headers that should be persisted across requests.
+     * @var array<string> a list of headers that should be persisted across requests
      */
     public static $HEADERS_TO_PERSIST = [
         'Stripe-Account',
         'Stripe-Version',
     ];
 
+    /** @var array<string, string> */
     public $headers;
+
+    /** @var null|string */
     public $apiKey;
+
+    /** @var null|string */
     public $apiBase;
 
+    /**
+     * @param null|string $key
+     * @param array<string, string> $headers
+     * @param null|string $base
+     */
     public function __construct($key = null, $headers = [], $base = null)
     {
         $this->apiKey = $key;
@@ -25,23 +33,38 @@ class RequestOptions
         $this->apiBase = $base;
     }
 
+    /**
+     * @return array<string, string>
+     */
+    public function __debugInfo()
+    {
+        return [
+            'apiKey' => $this->redactedApiKey(),
+            'headers' => $this->headers,
+            'apiBase' => $this->apiBase,
+        ];
+    }
+
     /**
      * Unpacks an options array and merges it into the existing RequestOptions
      * object.
-     * @param array|string|null $options a key => value array
+     *
+     * @param null|array|RequestOptions|string $options a key => value array
+     * @param bool $strict when true, forbid string form and arbitrary keys in array form
      *
      * @return RequestOptions
      */
-    public function merge($options)
+    public function merge($options, $strict = false)
     {
-        $other_options = self::parse($options);
-        if ($other_options->apiKey === null) {
+        $other_options = self::parse($options, $strict);
+        if (null === $other_options->apiKey) {
             $other_options->apiKey = $this->apiKey;
         }
-        if ($other_options->apiBase === null) {
+        if (null === $other_options->apiBase) {
             $other_options->apiBase = $this->apiBase;
         }
-        $other_options->headers = array_merge($this->headers, $other_options->headers);
+        $other_options->headers = \array_merge($this->headers, $other_options->headers);
+
         return $other_options;
     }
 
@@ -51,51 +74,75 @@ class RequestOptions
     public function discardNonPersistentHeaders()
     {
         foreach ($this->headers as $k => $v) {
-            if (!in_array($k, self::$HEADERS_TO_PERSIST)) {
+            if (!\in_array($k, self::$HEADERS_TO_PERSIST, true)) {
                 unset($this->headers[$k]);
             }
         }
     }
 
     /**
-     * Unpacks an options array into an RequestOptions object
-     * @param array|string|null $options a key => value array
+     * Unpacks an options array into an RequestOptions object.
+     *
+     * @param null|array|RequestOptions|string $options a key => value array
+     * @param bool $strict when true, forbid string form and arbitrary keys in array form
+     *
+     * @throws \Stripe\Exception\InvalidArgumentException
      *
      * @return RequestOptions
      */
-    public static function parse($options)
+    public static function parse($options, $strict = false)
     {
         if ($options instanceof self) {
             return $options;
         }
 
-        if (is_null($options)) {
+        if (null === $options) {
             return new RequestOptions(null, [], null);
         }
 
-        if (is_string($options)) {
+        if (\is_string($options)) {
+            if ($strict) {
+                $message = 'Do not pass a string for request options. If you want to set the '
+                    . 'API key, pass an array like ["api_key" => <apiKey>] instead.';
+
+                throw new \Stripe\Exception\InvalidArgumentException($message);
+            }
+
             return new RequestOptions($options, [], null);
         }
 
-        if (is_array($options)) {
+        if (\is_array($options)) {
             $headers = [];
             $key = null;
             $base = null;
-            if (array_key_exists('api_key', $options)) {
+
+            if (\array_key_exists('api_key', $options)) {
                 $key = $options['api_key'];
+                unset($options['api_key']);
             }
-            if (array_key_exists('idempotency_key', $options)) {
+            if (\array_key_exists('idempotency_key', $options)) {
                 $headers['Idempotency-Key'] = $options['idempotency_key'];
+                unset($options['idempotency_key']);
             }
-            if (array_key_exists('stripe_account', $options)) {
+            if (\array_key_exists('stripe_account', $options)) {
                 $headers['Stripe-Account'] = $options['stripe_account'];
+                unset($options['stripe_account']);
             }
-            if (array_key_exists('stripe_version', $options)) {
+            if (\array_key_exists('stripe_version', $options)) {
                 $headers['Stripe-Version'] = $options['stripe_version'];
+                unset($options['stripe_version']);
             }
-            if (array_key_exists('api_base', $options)) {
+            if (\array_key_exists('api_base', $options)) {
                 $base = $options['api_base'];
+                unset($options['api_base']);
             }
+
+            if ($strict && !empty($options)) {
+                $message = 'Got unexpected keys in options array: ' . \implode(', ', \array_keys($options));
+
+                throw new \Stripe\Exception\InvalidArgumentException($message);
+            }
+
             return new RequestOptions($key, $headers, $base);
         }
 
@@ -103,6 +150,19 @@ class RequestOptions
            . 'optional per-request apiKey, which must be a string, or '
            . 'per-request options, which must be an array. (HINT: you can set '
            . 'a global apiKey by "Stripe::setApiKey(<apiKey>)")';
-        throw new Error\Api($message);
+
+        throw new \Stripe\Exception\InvalidArgumentException($message);
+    }
+
+    private function redactedApiKey()
+    {
+        $pieces = \explode('_', $this->apiKey, 3);
+        $last = \array_pop($pieces);
+        $redactedLast = \strlen($last) > 4
+            ? (\str_repeat('*', \strlen($last) - 4) . \substr($last, -4))
+            : $last;
+        $pieces[] = $redactedLast;
+
+        return \implode('_', $pieces);
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Util/Set.php b/htdocs/includes/stripe/stripe-php/lib/Util/Set.php
index d8beb8b1a39..017f9297856 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Util/Set.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Util/Set.php
@@ -2,8 +2,8 @@
 
 namespace Stripe\Util;
 
-use IteratorAggregate;
 use ArrayIterator;
+use IteratorAggregate;
 
 class Set implements IteratorAggregate
 {
@@ -34,7 +34,7 @@ class Set implements IteratorAggregate
 
     public function toArray()
     {
-        return array_keys($this->_elts);
+        return \array_keys($this->_elts);
     }
 
     public function getIterator()
diff --git a/htdocs/includes/stripe/stripe-php/lib/Util/Util.php b/htdocs/includes/stripe/stripe-php/lib/Util/Util.php
index dd8677aa099..4f390500a8d 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Util/Util.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Util/Util.php
@@ -15,211 +15,110 @@ abstract class Util
      * integers starting at 0. Empty arrays are considered to be lists.
      *
      * @param array|mixed $array
-     * @return boolean true if the given object is a list.
+     *
+     * @return bool true if the given object is a list
      */
     public static function isList($array)
     {
-        if (!is_array($array)) {
+        if (!\is_array($array)) {
             return false;
         }
-        if ($array === []) {
+        if ([] === $array) {
             return true;
         }
-        if (array_keys($array) !== range(0, count($array) - 1)) {
+        if (\array_keys($array) !== \range(0, \count($array) - 1)) {
             return false;
         }
-        return true;
-    }
 
-    /**
-     * Recursively converts the PHP Stripe object to an array.
-     *
-     * @param array $values The PHP Stripe object to convert.
-     * @return array
-     */
-    public static function convertStripeObjectToArray($values)
-    {
-        $results = [];
-        foreach ($values as $k => $v) {
-            // FIXME: this is an encapsulation violation
-            if ($k[0] == '_') {
-                continue;
-            }
-            if ($v instanceof StripeObject) {
-                $results[$k] = $v->__toArray(true);
-            } elseif (is_array($v)) {
-                $results[$k] = self::convertStripeObjectToArray($v);
-            } else {
-                $results[$k] = $v;
-            }
-        }
-        return $results;
+        return true;
     }
 
     /**
      * Converts a response from the Stripe API to the corresponding PHP object.
      *
-     * @param array $resp The response from the Stripe API.
+     * @param array $resp the response from the Stripe API
      * @param array $opts
-     * @return StripeObject|array
+     *
+     * @return array|StripeObject
      */
     public static function convertToStripeObject($resp, $opts)
     {
-        $types = [
-            // data structures
-            \Stripe\Collection::OBJECT_NAME => 'Stripe\\Collection',
-
-            // business objects
-            \Stripe\Account::OBJECT_NAME => 'Stripe\\Account',
-            \Stripe\AccountLink::OBJECT_NAME => 'Stripe\\AccountLink',
-            \Stripe\AlipayAccount::OBJECT_NAME => 'Stripe\\AlipayAccount',
-            \Stripe\ApplePayDomain::OBJECT_NAME => 'Stripe\\ApplePayDomain',
-            \Stripe\ApplicationFee::OBJECT_NAME => 'Stripe\\ApplicationFee',
-            \Stripe\Balance::OBJECT_NAME => 'Stripe\\Balance',
-            \Stripe\BalanceTransaction::OBJECT_NAME => 'Stripe\\BalanceTransaction',
-            \Stripe\BankAccount::OBJECT_NAME => 'Stripe\\BankAccount',
-            \Stripe\BitcoinReceiver::OBJECT_NAME => 'Stripe\\BitcoinReceiver',
-            \Stripe\BitcoinTransaction::OBJECT_NAME => 'Stripe\\BitcoinTransaction',
-            \Stripe\Capability::OBJECT_NAME => 'Stripe\\Capability',
-            \Stripe\Card::OBJECT_NAME => 'Stripe\\Card',
-            \Stripe\Charge::OBJECT_NAME => 'Stripe\\Charge',
-            \Stripe\Checkout\Session::OBJECT_NAME => 'Stripe\\Checkout\\Session',
-            \Stripe\CountrySpec::OBJECT_NAME => 'Stripe\\CountrySpec',
-            \Stripe\Coupon::OBJECT_NAME => 'Stripe\\Coupon',
-            \Stripe\CreditNote::OBJECT_NAME => 'Stripe\\CreditNote',
-            \Stripe\Customer::OBJECT_NAME => 'Stripe\\Customer',
-            \Stripe\CustomerBalanceTransaction::OBJECT_NAME => 'Stripe\\CustomerBalanceTransaction',
-            \Stripe\Discount::OBJECT_NAME => 'Stripe\\Discount',
-            \Stripe\Dispute::OBJECT_NAME => 'Stripe\\Dispute',
-            \Stripe\EphemeralKey::OBJECT_NAME => 'Stripe\\EphemeralKey',
-            \Stripe\Event::OBJECT_NAME => 'Stripe\\Event',
-            \Stripe\ExchangeRate::OBJECT_NAME => 'Stripe\\ExchangeRate',
-            \Stripe\ApplicationFeeRefund::OBJECT_NAME => 'Stripe\\ApplicationFeeRefund',
-            \Stripe\File::OBJECT_NAME => 'Stripe\\File',
-            \Stripe\File::OBJECT_NAME_ALT => 'Stripe\\File',
-            \Stripe\FileLink::OBJECT_NAME => 'Stripe\\FileLink',
-            \Stripe\Invoice::OBJECT_NAME => 'Stripe\\Invoice',
-            \Stripe\InvoiceItem::OBJECT_NAME => 'Stripe\\InvoiceItem',
-            \Stripe\InvoiceLineItem::OBJECT_NAME => 'Stripe\\InvoiceLineItem',
-            \Stripe\IssuerFraudRecord::OBJECT_NAME => 'Stripe\\IssuerFraudRecord',
-            \Stripe\Issuing\Authorization::OBJECT_NAME => 'Stripe\\Issuing\\Authorization',
-            \Stripe\Issuing\Card::OBJECT_NAME => 'Stripe\\Issuing\\Card',
-            \Stripe\Issuing\CardDetails::OBJECT_NAME => 'Stripe\\Issuing\\CardDetails',
-            \Stripe\Issuing\Cardholder::OBJECT_NAME => 'Stripe\\Issuing\\Cardholder',
-            \Stripe\Issuing\Dispute::OBJECT_NAME => 'Stripe\\Issuing\\Dispute',
-            \Stripe\Issuing\Transaction::OBJECT_NAME => 'Stripe\\Issuing\\Transaction',
-            \Stripe\LoginLink::OBJECT_NAME => 'Stripe\\LoginLink',
-            \Stripe\Order::OBJECT_NAME => 'Stripe\\Order',
-            \Stripe\OrderItem::OBJECT_NAME => 'Stripe\\OrderItem',
-            \Stripe\OrderReturn::OBJECT_NAME => 'Stripe\\OrderReturn',
-            \Stripe\PaymentIntent::OBJECT_NAME => 'Stripe\\PaymentIntent',
-            \Stripe\PaymentMethod::OBJECT_NAME => 'Stripe\\PaymentMethod',
-            \Stripe\Payout::OBJECT_NAME => 'Stripe\\Payout',
-            \Stripe\Person::OBJECT_NAME => 'Stripe\\Person',
-            \Stripe\Plan::OBJECT_NAME => 'Stripe\\Plan',
-            \Stripe\Product::OBJECT_NAME => 'Stripe\\Product',
-            \Stripe\Radar\EarlyFraudWarning::OBJECT_NAME => 'Stripe\\Radar\\EarlyFraudWarning',
-            \Stripe\Radar\ValueList::OBJECT_NAME => 'Stripe\\Radar\\ValueList',
-            \Stripe\Radar\ValueListItem::OBJECT_NAME => 'Stripe\\Radar\\ValueListItem',
-            \Stripe\Recipient::OBJECT_NAME => 'Stripe\\Recipient',
-            \Stripe\RecipientTransfer::OBJECT_NAME => 'Stripe\\RecipientTransfer',
-            \Stripe\Refund::OBJECT_NAME => 'Stripe\\Refund',
-            \Stripe\Reporting\ReportRun::OBJECT_NAME => 'Stripe\\Reporting\\ReportRun',
-            \Stripe\Reporting\ReportType::OBJECT_NAME => 'Stripe\\Reporting\\ReportType',
-            \Stripe\Review::OBJECT_NAME => 'Stripe\\Review',
-            \Stripe\SetupIntent::OBJECT_NAME => 'Stripe\\SetupIntent',
-            \Stripe\SKU::OBJECT_NAME => 'Stripe\\SKU',
-            \Stripe\Sigma\ScheduledQueryRun::OBJECT_NAME => 'Stripe\\Sigma\\ScheduledQueryRun',
-            \Stripe\Source::OBJECT_NAME => 'Stripe\\Source',
-            \Stripe\SourceTransaction::OBJECT_NAME => 'Stripe\\SourceTransaction',
-            \Stripe\Subscription::OBJECT_NAME => 'Stripe\\Subscription',
-            \Stripe\SubscriptionItem::OBJECT_NAME => 'Stripe\\SubscriptionItem',
-            \Stripe\SubscriptionSchedule::OBJECT_NAME => 'Stripe\\SubscriptionSchedule',
-            \Stripe\TaxId::OBJECT_NAME => 'Stripe\\TaxId',
-            \Stripe\TaxRate::OBJECT_NAME => 'Stripe\\TaxRate',
-            \Stripe\ThreeDSecure::OBJECT_NAME => 'Stripe\\ThreeDSecure',
-            \Stripe\Terminal\ConnectionToken::OBJECT_NAME => 'Stripe\\Terminal\\ConnectionToken',
-            \Stripe\Terminal\Location::OBJECT_NAME => 'Stripe\\Terminal\\Location',
-            \Stripe\Terminal\Reader::OBJECT_NAME => 'Stripe\\Terminal\\Reader',
-            \Stripe\Token::OBJECT_NAME => 'Stripe\\Token',
-            \Stripe\Topup::OBJECT_NAME => 'Stripe\\Topup',
-            \Stripe\Transfer::OBJECT_NAME => 'Stripe\\Transfer',
-            \Stripe\TransferReversal::OBJECT_NAME => 'Stripe\\TransferReversal',
-            \Stripe\UsageRecord::OBJECT_NAME => 'Stripe\\UsageRecord',
-            \Stripe\UsageRecordSummary::OBJECT_NAME => 'Stripe\\UsageRecordSummary',
-            \Stripe\WebhookEndpoint::OBJECT_NAME => 'Stripe\\WebhookEndpoint',
-        ];
+        $types = \Stripe\Util\ObjectTypes::mapping;
         if (self::isList($resp)) {
             $mapped = [];
             foreach ($resp as $i) {
-                array_push($mapped, self::convertToStripeObject($i, $opts));
+                $mapped[] = self::convertToStripeObject($i, $opts);
             }
+
             return $mapped;
-        } elseif (is_array($resp)) {
-            if (isset($resp['object']) && is_string($resp['object']) && isset($types[$resp['object']])) {
+        }
+        if (\is_array($resp)) {
+            if (isset($resp['object']) && \is_string($resp['object']) && isset($types[$resp['object']])) {
                 $class = $types[$resp['object']];
             } else {
-                $class = 'Stripe\\StripeObject';
+                $class = \Stripe\StripeObject::class;
             }
+
             return $class::constructFrom($resp, $opts);
-        } else {
-            return $resp;
         }
+
+        return $resp;
     }
 
     /**
-     * @param string|mixed $value A string to UTF8-encode.
+     * @param mixed|string $value a string to UTF8-encode
      *
-     * @return string|mixed The UTF8-encoded string, or the object passed in if
-     *    it wasn't a string.
+     * @return mixed|string the UTF8-encoded string, or the object passed in if
+     *    it wasn't a string
      */
     public static function utf8($value)
     {
-        if (self::$isMbstringAvailable === null) {
-            self::$isMbstringAvailable = function_exists('mb_detect_encoding');
+        if (null === self::$isMbstringAvailable) {
+            self::$isMbstringAvailable = \function_exists('mb_detect_encoding');
 
             if (!self::$isMbstringAvailable) {
-                trigger_error("It looks like the mbstring extension is not enabled. " .
-                    "UTF-8 strings will not properly be encoded. Ask your system " .
-                    "administrator to enable the mbstring extension, or write to " .
-                    "support@stripe.com if you have any questions.", E_USER_WARNING);
+                \trigger_error('It looks like the mbstring extension is not enabled. ' .
+                    'UTF-8 strings will not properly be encoded. Ask your system ' .
+                    'administrator to enable the mbstring extension, or write to ' .
+                    'support@stripe.com if you have any questions.', \E_USER_WARNING);
             }
         }
 
-        if (is_string($value) && self::$isMbstringAvailable && mb_detect_encoding($value, "UTF-8", true) != "UTF-8") {
-            return utf8_encode($value);
-        } else {
-            return $value;
+        if (\is_string($value) && self::$isMbstringAvailable && 'UTF-8' !== \mb_detect_encoding($value, 'UTF-8', true)) {
+            return \utf8_encode($value);
         }
+
+        return $value;
     }
 
     /**
      * Compares two strings for equality. The time taken is independent of the
      * number of characters that match.
      *
-     * @param string $a one of the strings to compare.
-     * @param string $b the other string to compare.
-     * @return bool true if the strings are equal, false otherwise.
+     * @param string $a one of the strings to compare
+     * @param string $b the other string to compare
+     *
+     * @return bool true if the strings are equal, false otherwise
      */
     public static function secureCompare($a, $b)
     {
-        if (self::$isHashEqualsAvailable === null) {
-            self::$isHashEqualsAvailable = function_exists('hash_equals');
+        if (null === self::$isHashEqualsAvailable) {
+            self::$isHashEqualsAvailable = \function_exists('hash_equals');
         }
 
         if (self::$isHashEqualsAvailable) {
-            return hash_equals($a, $b);
-        } else {
-            if (strlen($a) != strlen($b)) {
-                return false;
-            }
-
-            $result = 0;
-            for ($i = 0; $i < strlen($a); $i++) {
-                $result |= ord($a[$i]) ^ ord($b[$i]);
-            }
-            return ($result == 0);
+            return \hash_equals($a, $b);
         }
+        if (\strlen($a) !== \strlen($b)) {
+            return false;
+        }
+
+        $result = 0;
+        for ($i = 0; $i < \strlen($a); ++$i) {
+            $result |= \ord($a[$i]) ^ \ord($b[$i]);
+        }
+
+        return 0 === $result;
     }
 
     /**
@@ -228,30 +127,35 @@ abstract class Util
      * Also clears out null values.
      *
      * @param mixed $h
+     *
      * @return mixed
      */
     public static function objectsToIds($h)
     {
         if ($h instanceof \Stripe\ApiResource) {
             return $h->id;
-        } elseif (static::isList($h)) {
+        }
+        if (static::isList($h)) {
             $results = [];
             foreach ($h as $v) {
-                array_push($results, static::objectsToIds($v));
+                $results[] = static::objectsToIds($v);
             }
+
             return $results;
-        } elseif (is_array($h)) {
+        }
+        if (\is_array($h)) {
             $results = [];
             foreach ($h as $k => $v) {
-                if (is_null($v)) {
+                if (null === $v) {
                     continue;
                 }
                 $results[$k] = static::objectsToIds($v);
             }
+
             return $results;
-        } else {
-            return $h;
         }
+
+        return $h;
     }
 
     /**
@@ -265,14 +169,15 @@ abstract class Util
         $pieces = [];
         foreach ($flattenedParams as $param) {
             list($k, $v) = $param;
-            array_push($pieces, self::urlEncode($k) . '=' . self::urlEncode($v));
+            $pieces[] = self::urlEncode($k) . '=' . self::urlEncode($v);
         }
-        return implode('&', $pieces);
+
+        return \implode('&', $pieces);
     }
 
     /**
      * @param array $params
-     * @param string|null $parentKey
+     * @param null|string $parentKey
      *
      * @return array
      */
@@ -284,11 +189,11 @@ abstract class Util
             $calculatedKey = $parentKey ? "{$parentKey}[{$key}]" : $key;
 
             if (self::isList($value)) {
-                $result = array_merge($result, self::flattenParamsList($value, $calculatedKey));
-            } elseif (is_array($value)) {
-                $result = array_merge($result, self::flattenParams($value, $calculatedKey));
+                $result = \array_merge($result, self::flattenParamsList($value, $calculatedKey));
+            } elseif (\is_array($value)) {
+                $result = \array_merge($result, self::flattenParams($value, $calculatedKey));
             } else {
-                array_push($result, [$calculatedKey, $value]);
+                \array_push($result, [$calculatedKey, $value]);
             }
         }
 
@@ -307,11 +212,11 @@ abstract class Util
 
         foreach ($value as $i => $elem) {
             if (self::isList($elem)) {
-                $result = array_merge($result, self::flattenParamsList($elem, $calculatedKey));
-            } elseif (is_array($elem)) {
-                $result = array_merge($result, self::flattenParams($elem, "{$calculatedKey}[{$i}]"));
+                $result = \array_merge($result, self::flattenParamsList($elem, $calculatedKey));
+            } elseif (\is_array($elem)) {
+                $result = \array_merge($result, self::flattenParams($elem, "{$calculatedKey}[{$i}]"));
             } else {
-                array_push($result, ["{$calculatedKey}[{$i}]", $elem]);
+                \array_push($result, ["{$calculatedKey}[{$i}]", $elem]);
             }
         }
 
@@ -319,42 +224,42 @@ abstract class Util
     }
 
     /**
-     * @param string $key A string to URL-encode.
+     * @param string $key a string to URL-encode
      *
-     * @return string The URL-encoded string.
+     * @return string the URL-encoded string
      */
     public static function urlEncode($key)
     {
-        $s = urlencode($key);
+        $s = \urlencode((string) $key);
 
         // Don't use strict form encoding by changing the square bracket control
         // characters back to their literals. This is fine by the server, and
         // makes these parameter strings easier to read.
-        $s = str_replace('%5B', '[', $s);
-        $s = str_replace('%5D', ']', $s);
+        $s = \str_replace('%5B', '[', $s);
 
-        return $s;
+        return \str_replace('%5D', ']', $s);
     }
 
     public static function normalizeId($id)
     {
-        if (is_array($id)) {
+        if (\is_array($id)) {
             $params = $id;
             $id = $params['id'];
             unset($params['id']);
         } else {
             $params = [];
         }
+
         return [$id, $params];
     }
 
     /**
-     * Returns UNIX timestamp in milliseconds
+     * Returns UNIX timestamp in milliseconds.
      *
-     * @return integer current time in millis
+     * @return int current time in millis
      */
     public static function currentTimeMillis()
     {
-        return (int) round(microtime(true) * 1000);
+        return (int) \round(\microtime(true) * 1000);
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/Webhook.php b/htdocs/includes/stripe/stripe-php/lib/Webhook.php
index 45c7dc0f30a..b9db2d6c056 100644
--- a/htdocs/includes/stripe/stripe-php/lib/Webhook.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Webhook.php
@@ -7,34 +7,36 @@ abstract class Webhook
     const DEFAULT_TOLERANCE = 300;
 
     /**
-     * Returns an Event instance using the provided JSON payload. Throws a
-     * \UnexpectedValueException if the payload is not valid JSON, and a
-     * \Stripe\SignatureVerificationException if the signature verification
-     * fails for any reason.
+     * Returns an Event instance using the provided JSON payload. Throws an
+     * Exception\UnexpectedValueException if the payload is not valid JSON, and
+     * an Exception\SignatureVerificationException if the signature
+     * verification fails for any reason.
      *
-     * @param string $payload the payload sent by Stripe.
+     * @param string $payload the payload sent by Stripe
      * @param string $sigHeader the contents of the signature header sent by
-     *  Stripe.
-     * @param string $secret secret used to generate the signature.
+     *  Stripe
+     * @param string $secret secret used to generate the signature
      * @param int $tolerance maximum difference allowed between the header's
      *  timestamp and the current time
-     * @return \Stripe\Event the Event instance
-     * @throws \UnexpectedValueException if the payload is not valid JSON,
-     * @throws \Stripe\Error\SignatureVerification if the verification fails.
+     *
+     * @throws Exception\UnexpectedValueException if the payload is not valid JSON,
+     * @throws Exception\SignatureVerificationException if the verification fails
+     *
+     * @return Event the Event instance
      */
     public static function constructEvent($payload, $sigHeader, $secret, $tolerance = self::DEFAULT_TOLERANCE)
     {
         WebhookSignature::verifyHeader($payload, $sigHeader, $secret, $tolerance);
 
-        $data = json_decode($payload, true);
-        $jsonError = json_last_error();
-        if ($data === null && $jsonError !== JSON_ERROR_NONE) {
-            $msg = "Invalid payload: $payload "
-              . "(json_last_error() was $jsonError)";
-            throw new \UnexpectedValueException($msg);
-        }
-        $event = Event::constructFrom($data);
+        $data = \json_decode($payload, true);
+        $jsonError = \json_last_error();
+        if (null === $data && \JSON_ERROR_NONE !== $jsonError) {
+            $msg = "Invalid payload: {$payload} "
+              . "(json_last_error() was {$jsonError})";
 
-        return $event;
+            throw new Exception\UnexpectedValueException($msg);
+        }
+
+        return Event::constructFrom($data);
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/lib/WebhookEndpoint.php b/htdocs/includes/stripe/stripe-php/lib/WebhookEndpoint.php
index 636c7e1927d..96333d1324f 100644
--- a/htdocs/includes/stripe/stripe-php/lib/WebhookEndpoint.php
+++ b/htdocs/includes/stripe/stripe-php/lib/WebhookEndpoint.php
@@ -1,24 +1,37 @@
 <?php
 
+// File generated from our OpenAPI spec
+
 namespace Stripe;
 
 /**
- * Class WebhookEndpoint
+ * You can configure <a href="https://stripe.com/docs/webhooks/">webhook
+ * endpoints</a> via the API to be notified about events that happen in your Stripe
+ * account or connected accounts.
  *
- * @property string $id
- * @property string $object
- * @property int $created
- * @property string[] $enabled_events
- * @property bool $livemode
- * @property string $secret
- * @property string $status
- * @property string $url
+ * Most users configure webhooks from <a
+ * href="https://dashboard.stripe.com/webhooks">the dashboard</a>, which provides a
+ * user interface for registering and testing your webhook endpoints.
  *
- * @package Stripe
+ * Related guide: <a href="https://stripe.com/docs/webhooks/configure">Setting up
+ * Webhooks</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string $api_version The API version events are rendered as for this webhook endpoint.
+ * @property null|string $application The ID of the associated Connect application.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string $description An optional description of what the webhook is used for.
+ * @property string[] $enabled_events The list of events to enable for this endpoint. <code>['*']</code> indicates that all events are enabled, except those that require explicit selection.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property string $secret The endpoint's secret, used to generate <a href="https://stripe.com/docs/webhooks/signatures">webhook signatures</a>. Only returned at creation.
+ * @property string $status The status of the webhook. It can be <code>enabled</code> or <code>disabled</code>.
+ * @property string $url The URL of the webhook endpoint.
  */
 class WebhookEndpoint extends ApiResource
 {
-    const OBJECT_NAME = "webhook_endpoint";
+    const OBJECT_NAME = 'webhook_endpoint';
 
     use ApiOperations\All;
     use ApiOperations\Create;
diff --git a/htdocs/includes/stripe/stripe-php/lib/WebhookSignature.php b/htdocs/includes/stripe/stripe-php/lib/WebhookSignature.php
index 9f8be8777b3..46cbb28b559 100644
--- a/htdocs/includes/stripe/stripe-php/lib/WebhookSignature.php
+++ b/htdocs/includes/stripe/stripe-php/lib/WebhookSignature.php
@@ -4,20 +4,22 @@ namespace Stripe;
 
 abstract class WebhookSignature
 {
-    const EXPECTED_SCHEME = "v1";
+    const EXPECTED_SCHEME = 'v1';
 
     /**
-     * Verifies the signature header sent by Stripe. Throws a
-     * SignatureVerification exception if the verification fails for any
-     * reason.
+     * Verifies the signature header sent by Stripe. Throws an
+     * Exception\SignatureVerificationException exception if the verification fails for
+     * any reason.
      *
-     * @param string $payload the payload sent by Stripe.
+     * @param string $payload the payload sent by Stripe
      * @param string $header the contents of the signature header sent by
-     *  Stripe.
-     * @param string $secret secret used to generate the signature.
+     *  Stripe
+     * @param string $secret secret used to generate the signature
      * @param int $tolerance maximum difference allowed between the header's
      *  timestamp and the current time
-     * @throws \Stripe\Error\SignatureVerification if the verification fails.
+     *
+     * @throws Exception\SignatureVerificationException if the verification fails
+     *
      * @return bool
      */
     public static function verifyHeader($payload, $header, $secret, $tolerance = null)
@@ -25,46 +27,47 @@ abstract class WebhookSignature
         // Extract timestamp and signatures from header
         $timestamp = self::getTimestamp($header);
         $signatures = self::getSignatures($header, self::EXPECTED_SCHEME);
-        if ($timestamp == -1) {
-            throw new Error\SignatureVerification(
-                "Unable to extract timestamp and signatures from header",
-                $header,
-                $payload
+        if (-1 === $timestamp) {
+            throw Exception\SignatureVerificationException::factory(
+                'Unable to extract timestamp and signatures from header',
+                $payload,
+                $header
             );
         }
         if (empty($signatures)) {
-            throw new Error\SignatureVerification(
-                "No signatures found with expected scheme",
-                $header,
-                $payload
+            throw Exception\SignatureVerificationException::factory(
+                'No signatures found with expected scheme',
+                $payload,
+                $header
             );
         }
 
         // Check if expected signature is found in list of signatures from
         // header
-        $signedPayload = "$timestamp.$payload";
+        $signedPayload = "{$timestamp}.{$payload}";
         $expectedSignature = self::computeSignature($signedPayload, $secret);
         $signatureFound = false;
         foreach ($signatures as $signature) {
             if (Util\Util::secureCompare($expectedSignature, $signature)) {
                 $signatureFound = true;
+
                 break;
             }
         }
         if (!$signatureFound) {
-            throw new Error\SignatureVerification(
-                "No signatures found matching the expected signature for payload",
-                $header,
-                $payload
+            throw Exception\SignatureVerificationException::factory(
+                'No signatures found matching the expected signature for payload',
+                $payload,
+                $header
             );
         }
 
         // Check if timestamp is within tolerance
-        if (($tolerance > 0) && (abs(time() - $timestamp) > $tolerance)) {
-            throw new Error\SignatureVerification(
-                "Timestamp outside the tolerance zone",
-                $header,
-                $payload
+        if (($tolerance > 0) && (\abs(\time() - $timestamp) > $tolerance)) {
+            throw Exception\SignatureVerificationException::factory(
+                'Timestamp outside the tolerance zone',
+                $payload,
+                $header
             );
         }
 
@@ -75,20 +78,22 @@ abstract class WebhookSignature
      * Extracts the timestamp in a signature header.
      *
      * @param string $header the signature header
+     *
      * @return int the timestamp contained in the header, or -1 if no valid
      *  timestamp is found
      */
     private static function getTimestamp($header)
     {
-        $items = explode(",", $header);
+        $items = \explode(',', $header);
 
         foreach ($items as $item) {
-            $itemParts = explode("=", $item, 2);
-            if ($itemParts[0] == "t") {
-                if (!is_numeric($itemParts[1])) {
+            $itemParts = \explode('=', $item, 2);
+            if ('t' === $itemParts[0]) {
+                if (!\is_numeric($itemParts[1])) {
                     return -1;
                 }
-                return intval($itemParts[1]);
+
+                return (int) ($itemParts[1]);
             }
         }
 
@@ -99,18 +104,19 @@ abstract class WebhookSignature
      * Extracts the signatures matching a given scheme in a signature header.
      *
      * @param string $header the signature header
-     * @param string $scheme the signature scheme to look for.
-     * @return array the list of signatures matching the provided scheme.
+     * @param string $scheme the signature scheme to look for
+     *
+     * @return array the list of signatures matching the provided scheme
      */
     private static function getSignatures($header, $scheme)
     {
         $signatures = [];
-        $items = explode(",", $header);
+        $items = \explode(',', $header);
 
         foreach ($items as $item) {
-            $itemParts = explode("=", $item, 2);
-            if ($itemParts[0] == $scheme) {
-                array_push($signatures, $itemParts[1]);
+            $itemParts = \explode('=', $item, 2);
+            if (\trim($itemParts[0]) === $scheme) {
+                $signatures[] = $itemParts[1];
             }
         }
 
@@ -122,12 +128,13 @@ abstract class WebhookSignature
      *
      * The current scheme used by Stripe ("v1") is HMAC/SHA-256.
      *
-     * @param string $payload the payload to sign.
-     * @param string $secret the secret used to generate the signature.
-     * @return string the signature as a string.
+     * @param string $payload the payload to sign
+     * @param string $secret the secret used to generate the signature
+     *
+     * @return string the signature as a string
      */
     private static function computeSignature($payload, $secret)
     {
-        return hash_hmac("sha256", $payload, $secret);
+        return \hash_hmac('sha256', $payload, $secret);
     }
 }
diff --git a/htdocs/includes/stripe/stripe-php/phpdoc.dist.xml b/htdocs/includes/stripe/stripe-php/phpdoc.dist.xml
new file mode 100644
index 00000000000..b1ea92fadc4
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/phpdoc.dist.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<phpdocumentor
+        configVersion="3"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns="http://www.phpdoc.org"
+        xsi:noNamespaceSchemaLocation="data/xsd/phpdoc.xsd"
+>
+    <paths>
+        <output>build/phpdoc</output>
+    </paths>
+    <version number="3.0.0">
+        <folder>latest</folder>
+        <api>
+            <source dsn=".">
+                <path>lib</path>
+            </source>
+            <output>api</output>
+            <ignore hidden="true" symlinks="true">
+                <path>build/**/*</path>
+                <path>examples/**/*</path>
+                <path>tests/**/*</path>
+                <path>vendor/**/*</path>
+            </ignore>
+            <extensions>
+                <extension>php</extension>
+            </extensions>
+            <default-package-name>stripe-php</default-package-name>
+        </api>
+    </version>
+    <template name="default"/>
+</phpdocumentor>
diff --git a/htdocs/includes/stripe/stripe-php/phpstan-baseline.neon b/htdocs/includes/stripe/stripe-php/phpstan-baseline.neon
new file mode 100644
index 00000000000..882318a7a54
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/phpstan-baseline.neon
@@ -0,0 +1,12 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Access to undefined constant Stripe\\\\ApiResource\\:\\:OBJECT_NAME\\.$#"
+			count: 1
+			path: lib/ApiResource.php
+
+		-
+			message: "#^Access to undefined constant Stripe\\\\SingletonApiResource\\:\\:OBJECT_NAME\\.$#"
+			count: 1
+			path: lib/SingletonApiResource.php
+
diff --git a/htdocs/includes/stripe/stripe-php/phpstan.neon.dist b/htdocs/includes/stripe/stripe-php/phpstan.neon.dist
new file mode 100644
index 00000000000..c99645a2bab
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/phpstan.neon.dist
@@ -0,0 +1,11 @@
+includes:
+	- phpstan-baseline.neon
+
+parameters:
+	level: 1
+
+	bootstrapFiles:
+		- tests/bootstrap.php
+
+	ignoreErrors:
+		- '#Unsafe usage of new static\(\).#'
diff --git a/htdocs/includes/stripe/stripe-php/update_certs.php b/htdocs/includes/stripe/stripe-php/update_certs.php
index daba4a05099..a73622cca77 100755
--- a/htdocs/includes/stripe/stripe-php/update_certs.php
+++ b/htdocs/includes/stripe/stripe-php/update_certs.php
@@ -1,19 +1,19 @@
 #!/usr/bin/env php
 <?php
-chdir(dirname(__FILE__));
+\chdir(__DIR__);
 
-set_time_limit(0); // unlimited max execution time
+\set_time_limit(0); // unlimited max execution time
 
-$fp = fopen(dirname(__FILE__) . '/data/ca-certificates.crt', 'w+');
+$fp = \fopen(__DIR__ . '/data/ca-certificates.crt', 'w+b');
 
-$options = array(
-  CURLOPT_FILE    => $fp,
-  CURLOPT_TIMEOUT =>  3600,
-  CURLOPT_URL     => 'https://curl.haxx.se/ca/cacert.pem',
-);
+$options = [
+    \CURLOPT_FILE => $fp,
+    \CURLOPT_TIMEOUT => 3600,
+    \CURLOPT_URL => 'https://curl.haxx.se/ca/cacert.pem',
+];
 
-$ch = curl_init();
-curl_setopt_array($ch, $options);
-curl_exec($ch);
-curl_close($ch);
-fclose($fp);
+$ch = \curl_init();
+\curl_setopt_array($ch, $options);
+\curl_exec($ch);
+\curl_close($ch);
+\fclose($fp);

From 433ddd61a7a02ca7c8cfdc389bdf4d0ce3093425 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 4 Jan 2021 06:57:10 +0100
Subject: [PATCH 784/888] FIX: Loan - Missing fk_bank when we add payment with
 schedule

---
 htdocs/loan/payment/payment.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index 1793854631e..8eb8f1b61fc 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -155,11 +155,12 @@ if ($action == 'add_payment')
 			$payment->chid = $chid;
 			$payment->datep             = $datepaid;
 			$payment->label             = $loan->label;
-			$payment->amount_capital = $pay_amount_capital;
-			$payment->amount_insurance = $pay_amount_interest;
-			$payment->amount_interest = $pay_amount_insurance;
+			$payment->amount_capital	= $pay_amount_capital;
+			$payment->amount_insurance	= $pay_amount_interest;
+			$payment->amount_interest	= $pay_amount_insurance;
+			$payment->fk_bank           = GETPOST('accountid', 'int');
 			$payment->paymenttype       = GETPOST('paymenttype', 'int');
-			$payment->num_payment = GETPOST('num_payment');
+			$payment->num_payment		= GETPOST('num_payment');
 			$payment->note_private      = GETPOST('note_private', 'restricthtml');
 			$payment->note_public       = GETPOST('note_public', 'restricthtml');
 

From 8f4fc046ec3d9221175e30cd80b899adc8e80da1 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 4 Jan 2021 06:57:56 +0100
Subject: [PATCH 785/888] FIX: Loan - amount insurance / interest is inverted

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

diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index 8eb8f1b61fc..8a6e1e9c9ba 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -156,8 +156,8 @@ if ($action == 'add_payment')
 			$payment->datep             = $datepaid;
 			$payment->label             = $loan->label;
 			$payment->amount_capital	= $pay_amount_capital;
-			$payment->amount_insurance	= $pay_amount_interest;
-			$payment->amount_interest	= $pay_amount_insurance;
+			$payment->amount_insurance	= $pay_amount_insurance;
+			$payment->amount_interest	= $pay_amount_interest;
 			$payment->fk_bank           = GETPOST('accountid', 'int');
 			$payment->paymenttype       = GETPOST('paymenttype', 'int');
 			$payment->num_payment		= GETPOST('num_payment');

From d892d8c3c792f1bc29db570b02f17c629b5d9ea4 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Mon, 4 Jan 2021 10:59:45 +0100
Subject: [PATCH 786/888] FIX: Bad dates filtering in the ticket list causes
 sql error

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

diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 8e3b73346b7..90cd1fd1ec9 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2013-2018	Jean-François FERRY	<hello@librethic.io>
  * Copyright (C) 2016		Christophe Battarel	<christophe@altairis.fr>
  * Copyright (C) 2018		Regis Houssin		<regis.houssin@inodbox.com>
- * Copyright (C) 2019		Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2019-2021	Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2019-2020  Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -57,6 +57,14 @@ $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');
+$search_date_start = dol_mktime(0, 0, 0, GETPOST('search_date_startmonth', 'int'), GETPOST('search_date_startday', 'int'), GETPOST('search_date_startyear', 'int'));
+$search_date_end = dol_mktime(23, 59, 59, GETPOST('search_date_endmonth', 'int'), GETPOST('search_date_endday', 'int'), GETPOST('search_date_endyear', 'int'));
+$search_dateread_start = dol_mktime(0, 0, 0, GETPOST('search_dateread_startmonth', 'int'), GETPOST('search_dateread_startday', 'int'), GETPOST('search_dateread_startyear', 'int'));
+$search_dateread_end = dol_mktime(23, 59, 59, GETPOST('search_dateread_endmonth', 'int'), GETPOST('search_dateread_endday', 'int'), GETPOST('search_dateread_endyear', 'int'));
+$search_dateclose_start = dol_mktime(0, 0, 0, GETPOST('search_dateclose_startmonth', 'int'), GETPOST('search_dateclose_startday', 'int'), GETPOST('search_dateclose_startyear', 'int'));
+$search_dateclose_end = dol_mktime(23, 59, 59, GETPOST('search_dateclose_endmonth', 'int'), GETPOST('search_dateclose_endday', 'int'), GETPOST('search_dateclose_endyear', 'int'));
+
+
 $mode = GETPOST('mode', 'alpha');
 
 // Load variable for pagination
@@ -178,6 +186,12 @@ if (empty($reshook))
 		}
 		$toselect = '';
 		$search_array_options = array();
+		$search_date_start = '';
+		$search_date_end = '';
+		$search_dateread_start = '';
+		$search_dateread_end = '';
+		$search_dateclose_start = '';
+		$search_dateclose_end = '';
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
 		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
@@ -356,6 +370,14 @@ foreach ($search as $key => $val)
 if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 if ($search_societe)     $sql .= natural_search('s.nom', $search_societe);
 if ($search_fk_project) $sql .= natural_search('fk_project', $search_fk_project, 2);
+if ($search_date_start)			$sql .= " AND t.datec >= '".$db->idate($search_date_start)."'";
+if ($search_date_end)			$sql .= " AND t.datec <= '".$db->idate($search_date_end)."'";
+if ($search_dateread_start)		$sql .= " AND t.date_read >= '".$db->idate($search_dateread_start)."'";
+if ($search_dateread_end)		$sql .= " AND t.date_read <= '".$db->idate($search_dateread_end)."'";
+if ($search_dateclose_start)	$sql .= " AND t.date_close >= '".$db->idate($search_dateclose_start)."'";
+if ($search_dateclose_end)		$sql .= " AND t.date_close <= '".$db->idate($search_dateclose_end)."'";
+
+
 if (!$user->socid && ($mode == "mine" || (!$user->admin && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY))) {
     $sql .= " AND (t.fk_user_assign = ".$user->id;
     if (empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY)) $sql .= " OR t.fk_user_create = ".$user->id;
@@ -549,6 +571,13 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 if ($socid)     $param .= '&socid='.urlencode($socid);
 if ($projectid) $param .= '&projectid='.urlencode($projectid);
 
+if ($search_date_start)			$param .= '&search_date_start='.urlencode($search_date_start);
+if ($search_date_end)			$param .= '&search_date_end='.urlencode($search_date_end);
+if ($search_dateread_start)		$param .= '&search_dateread_start='.urlencode($search_dateread_start);
+if ($search_dateread_end)		$param .= '&search_dateread_end='.urlencode($search_dateread_end);
+if ($search_dateclose_start)	$param .= '&search_dateclose_start='.urlencode($search_dateclose_start);
+if ($search_dateclose_end)		$param .= '&search_dateclose_end='.urlencode($search_dateclose_end);
+
 // List of mass actions available
 $arrayofmassactions = array(
 	//'presend'=>$langs->trans("SendByMail"),
@@ -667,6 +696,38 @@ foreach ($object->fields as $key => $val)
 		{
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'"><input type="text" class="flat maxwidth75" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
 		}
+		elseif ($key == "datec" || $key == 'date_read' || $key == 'date_close'){
+			print '<td class="liste_titre center">';
+			print '<div class="nowrap">';
+			print $langs->trans('From').' ';
+
+			switch ($key){
+				case 'datec':
+					print $form->selectDate($search_date_start ?: -1, 'search_date_start', 0, 0, 1);
+					break;
+				case 'date_read':
+					print $form->selectDate($search_dateread_start ?: -1, 'search_dateread_start', 0, 0, 1);
+					break;
+				case 'date_close':
+					print $form->selectDate($search_dateclose_start ?: -1, 'search_dateclose_start', 0, 0, 1);
+			}
+
+			print '</div>';
+			print '<div class="nowrap">';
+			print $langs->trans('to').' ';
+			switch ($key){
+				case 'datec':
+					print $form->selectDate($search_date_end ?: -1, 'search_date_end', 0, 0, 1);
+					break;
+				case 'date_read':
+					print $form->selectDate($search_dateread_end ?: -1, 'search_dateread_end', 0, 0, 1);
+					break;
+				case 'date_close':
+					print $form->selectDate($search_dateclose_end ?: -1, 'search_dateclose_end', 0, 0, 1);
+			}
+			print '</div>';
+			print '</td>';
+		}
 		else {
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
 		}

From 82395d578be2a305937a18bed883392b95900d16 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Jan 2021 11:56:56 +0100
Subject: [PATCH 787/888] Update myobject_card.php

---
 htdocs/modulebuilder/template/myobject_card.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 8f482d5f6f2..aab8f2609b5 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -478,7 +478,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 			// Validate
 			if ($object->status == $object::STATUS_DRAFT) {
-				print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes', '', $permissiontoadd);
+				if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0))	{	
+					print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes', '', $permissiontoadd);
+				} else {	
+					$langs->load("errors");	
+					//print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes', '', 0);
+					print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';	
+				}				
 			}
 
 			// Clone

From 30cd0412095c536ff70ca0af8ffe197e9318f40d Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 4 Jan 2021 10:57:18 +0000
Subject: [PATCH 788/888] Fixing style errors.

---
 htdocs/modulebuilder/template/myobject_card.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index aab8f2609b5..ef7a6da8d66 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -478,13 +478,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 			// Validate
 			if ($object->status == $object::STATUS_DRAFT) {
-				if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0))	{	
+				if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0))	{
 					print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes', '', $permissiontoadd);
-				} else {	
-					$langs->load("errors");	
+				} else {
+					$langs->load("errors");
 					//print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes', '', 0);
-					print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';	
-				}				
+					print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
+				}
 			}
 
 			// Clone

From bb22f2ccaf18b8f50abe25a9477ff1f8188a4320 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Jan 2021 12:02:41 +0100
Subject: [PATCH 789/888] Update admin.lib.php

---
 htdocs/core/lib/admin.lib.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 1bae8d0224f..8fddc46cca3 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1380,14 +1380,12 @@ function complete_elementList_with_modules(&$elementList)
                             $dirmod[$i] = $dir;
                             //print "x".$modName." ".$orders[$i]."\n<br>";
 
-                            if (!empty($objMod->module_parts['contactelement']))
-                            {
-                            	if(is_array($objMod->module_parts['contactelement'])) {
+                            if (!empty($objMod->module_parts['contactelement'])) {
+                            	if (is_array($objMod->module_parts['contactelement'])) {
 									foreach ($objMod->module_parts['contactelement'] as $elem => $title) {
 										$elementList[$elem] = $langs->trans($title);
 									}
-								}
-                            	else {
+								} else {
 									$elementList[$objMod->name] = $langs->trans($objMod->name);
 								}
                             }

From 66bd040d2cc02a2764705c910c02138d1d2d97a2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Jan 2021 12:08:14 +0100
Subject: [PATCH 790/888] Fix regression

---
 htdocs/core/db/DoliDB.class.php |  2 +-
 htdocs/core/db/pgsql.class.php  | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index 307864fcf81..e900af925f4 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -90,7 +90,7 @@ abstract class DoliDB implements Database
 	 */
 	public function idate($param, $gm = 'tzserver')
 	{
-		// TODO $param should be gmt, so we should add tzouptut to 'gmt' instead of default 'tzserver'
+		// TODO $param should be gmt, so we should add $gm to 'gmt' instead of default 'tzserver'
 		return dol_print_date($param, "%Y-%m-%d %H:%M:%S", $gm);
 	}
 
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index b393945eeb3..fe80f1ad28e 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -685,18 +685,6 @@ class DoliDBPgsql extends DoliDB
 		return pg_escape_string($stringtoencode);
 	}
 
-	/**
-	 *   Convert (by PHP) a GM Timestamp date into a GM string date to insert into a date field.
-	 *   Function to use to build INSERT, UPDATE or WHERE predica
-	 *
-	 *   @param	    string	$param      Date TMS to convert
-	 *   @return	string   			Date in a string YYYY-MM-DD HH:MM:SS
-	 */
-	public function idate($param)
-	{
-		return dol_print_date($param, "%Y-%m-%d %H:%M:%S");
-	}
-
 	/**
 	 *  Format a SQL IF
 	 *

From 8df5928e9c5b92e6574352ce847fe226c7b3e52d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Jan 2021 13:32:43 +0100
Subject: [PATCH 791/888] Fix selection must depends on enabled modules

---
 htdocs/compta/accounting-files.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 734d21b1c87..02098e986ba 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -549,16 +549,17 @@ if (!empty($conf->multicompany->enabled) && is_object($mc))
 print '<br>';
 
 $listofchoices = array(
-	'selectinvoices'=>array('label'=>'Invoices', 'lang'=>'bills'),
-	'selectsupplierinvoices'=>array('label'=>'BillsSuppliers', 'lang'=>'bills'),
-	'selectexpensereports'=>array('label'=>'ExpenseReports', 'lang'=>'trips'),
-	'selectdonations'=>array('label'=>'Donations', 'lang'=>'donation'),
-	'selectpaymentsofsalaries'=>array('label'=>'SalariesPayments', 'lang'=>'salaries'),
-	'selectsocialcontributions'=>array('label'=>'SocialContributions'),
-	'selectvariouspayment'=>array('label'=>'VariousPayment'),
-	'selectloanspayment'=>array('label'=>'PaymentLoan'),
+	'selectinvoices'=>array('label'=>'Invoices', 'lang'=>'bills', 'enabled' => !empty($conf->facture->enabled)),
+	'selectsupplierinvoices'=>array('label'=>'BillsSuppliers', 'lang'=>'bills', 'enabled' => !empty($conf->supplier_invoice->enabled)),
+	'selectexpensereports'=>array('label'=>'ExpenseReports', 'lang'=>'trips', 'enabled' => !empty($conf->expensereport->enabled)),
+	'selectdonations'=>array('label'=>'Donations', 'lang'=>'donation', 'enabled' => !empty($conf->don->enabled)),
+	'selectsocialcontributions'=>array('label'=>'SocialContributions', 'enabled' => !empty($conf->tax->enabled)),
+	'selectpaymentsofsalaries'=>array('label'=>'SalariesPayments', 'lang'=>'salaries', 'enabled' => !empty($conf->salaries->enabled)),
+	'selectvariouspayment'=>array('label'=>'VariousPayment', 'enabled' => !empty($conf->banque->enabled)),
+	'selectloanspayment'=>array('label'=>'PaymentLoan', 'enabled' => !empty($conf->loan->enabled)),
 );
 foreach ($listofchoices as $choice => $val) {
+	if (empty($val['enabled'])) continue;		// list not qualified
 	$checked = (((!GETPOSTISSET('search') && $action != 'searchfiles') || GETPOST($choice)) ? ' checked="checked"' : '');
 	print '<div class="paddingleft inline-block marginrightonly"><input type="checkbox" id="'.$choice.'" name="'.$choice.'" value="1"'.$checked.'> <label for="'.$choice.'">'.$langs->trans($val['label']).'</label></div>';
 }

From ef76c067e07334f746a1c727ea79c7270fe9b9ed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Jan 2021 13:37:21 +0100
Subject: [PATCH 792/888] Add limit to 25000

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e1d64da77f1..3bf47b7da7a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4615,7 +4615,7 @@ function print_fleche_navigation($page, $file, $options = '', $nextpage = 0, $be
 	}
 	if ((int) $limit > 0 && empty($hideselectlimit))
 	{
-		$pagesizechoices = '10:10,15:15,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000,5000:5000';
+		$pagesizechoices = '10:10,15:15,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000,5000:5000,25000:25000';
 		//$pagesizechoices.=',0:'.$langs->trans("All");     // Not yet supported
 		//$pagesizechoices.=',2:2';
 		if (!empty($conf->global->MAIN_PAGESIZE_CHOICES)) $pagesizechoices = $conf->global->MAIN_PAGESIZE_CHOICES;

From 0b240453e94d6bee2f237ba6938d64f95b819db0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Jan 2021 13:56:52 +0100
Subject: [PATCH 793/888] NEW Upgrade Stripe PHP lib to 7.67.0

---
 COPYRIGHT | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/COPYRIGHT b/COPYRIGHT
index 4f4bc3dff6d..21e37f39f1d 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -32,7 +32,7 @@ PSR/simple-cache	   ?										                 Library for cache (used by PHPSp
 Restler                3.1.1         LGPL-3+                     Yes             Library to develop REST Web services (+ swagger-ui js lib into dir explorer)
 Sabre                  3.2.2         BSD                         Yes             DAV support
 Swift Mailer           5.4.2-DEV     MIT license                 Yes             Comprehensive mailing tools for PHP
-Stripe                 6.43.1        MIT licence                 Yes             Library for Stripe module
+Stripe                 7.67.0        MIT licence                 Yes             Library for Stripe module
 TCPDF                  6.3.2         LGPL-3+                     Yes             PDF generation
 TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes             FPDI replacement
 

From 485d363d798fcc996ac38c262dfc0c264d9118a1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Jan 2021 14:03:00 +0100
Subject: [PATCH 794/888] Update doc

---
 dev/dolibarr_changes.txt | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
index f3374c43234..e207afa5658 100644
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -133,17 +133,15 @@ with
 			}
 		}
 		elseif (($imgsrc[0] === '/') AND !empty($_SERVER['DOCUMENT_ROOT']) AND ($_SERVER['DOCUMENT_ROOT'] != '/')) {
-					
 
 
-* In tecnickcom/tcpdf/include/tcpdf_static, in function fopenLocal, replace
+* In tecnickcom/tcpdf/include/tcpdf_static.php, in function fopenLocal, replace
 
 		if (strpos($filename, '://') === false) {
 
 with
 
-        if (strpos($filename, '//') === 0)
-        {
+        if (strpos($filename, '//') === 0) {
             // Share folder on a (windows) server
             // e.g.: "//[MyServerName]/[MySharedFolder]/"
             //
@@ -175,17 +173,17 @@ In htdocs/includes/tecnickcom/tcpdf/tcpdf.php
 
 TCPDI:
 ------
-Add fpdf_tpl.php 1.2
+Add file fpdf_tpl.php 1.2
 
-Add tcpdi.php
+Add file tcpdi.php
 
-Add tcpdi_parser.php and replace:
-require_once(dirname(__FILE__).'/include/tcpdf_filters.php');
+Add file tcpdi_parser.php and replace:
+    require_once(dirname(__FILE__).'/include/tcpdf_filters.php');
 with:
-require_once(dirname(__FILE__).'/../tecnickcom/tcpdf/include/tcpdf_filters.php');
+    require_once(dirname(__FILE__).'/../tecnickcom/tcpdf/include/tcpdf_filters.php');
 
 
-* Fix by replacing
+* Fix syntax error by replacing
 	} elseif (($key == '/Index') AND ($v[0] == PDF_TYPE_ARRAY AND count($v[1] >= 2))) {
 with
 	} elseif (($key == '/Index') AND ($v[0] == PDF_TYPE_ARRAY AND count($v[1]) >= 2)) {
@@ -195,23 +193,23 @@ with
 JSGANTT:
 --------
 * Replace in function JSGantt.taskLink
-var OpenWindow=window.open(pRef, "newwin", "height="+vHeight+",width="+vWidth);
+    var OpenWindow=window.open(pRef, "newwin", "height="+vHeight+",width="+vWidth);
 with
-// LDR To open in same window
-//var OpenWindow=window.open(pRef, "newwin", "height="+vHeight+",width="+vWidth);
-window.location.href=pRef
+    // LDR To open in same window
+    //var OpenWindow=window.open(pRef, "newwin", "height="+vHeight+",width="+vWidth);
+    window.location.href=pRef
 
 * Replace
-vTmpDiv=this.newNode(vTmpCell, 'div', null, null, vTaskList[i].getResource());
+    vTmpDiv=this.newNode(vTmpCell, 'div', null, null, vTaskList[i].getResource());
 with                       
-var vTmpNode=this.newNode(vTmpCell, 'div', null, '');
-vTmpNode=this.newNode(vTmpNode, 'a', null, '', vLangs[vLang]['moreinfo']);
-vTmpNode.setAttribute('href',vTaskList[i].getLink());
+    var vTmpNode=this.newNode(vTmpCell, 'div', null, '');
+    vTmpNode=this.newNode(vTmpNode, 'a', null, '', vLangs[vLang]['moreinfo']);
+    vTmpNode.setAttribute('href',vTaskList[i].getLink());
                         
 * Replace '% Comp.' to have a smaller text column header
-'comp':'% Comp.'
+    'comp':'% Comp.'
 with
-'comp':'%'
+    'comp':'%'
 
 
 

From 7141fa315ea7968e885bee55a4674435342bc192 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Jan 2021 15:32:18 +0100
Subject: [PATCH 795/888] Debug v13

---
 htdocs/compta/paiement.php               |  6 +++---
 htdocs/core/tpl/object_discounts.tpl.php | 12 ++++++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index a03fd03ffef..83393a52cb6 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -710,10 +710,10 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 					// Price
 					print '<td class="right">'.price($sign * $objp->total_ttc).'</td>';
 
-					// Received or paid back
+					// Received + already paid
 					print '<td class="right">'.price($sign * $paiement);
-					if ($creditnotes) print '+'.price($creditnotes);
-					if ($deposits) print '+'.price($deposits);
+					if ($creditnotes) print '<span class="opacitymedium">+'.price($creditnotes).'</span>';
+					if ($deposits) print '<span class="opacitymedium">+'.price($deposits).'</span>';
 					print '</td>';
 
 					// Remain to take or to pay back
diff --git a/htdocs/core/tpl/object_discounts.tpl.php b/htdocs/core/tpl/object_discounts.tpl.php
index 7bc98d12278..293ea333682 100644
--- a/htdocs/core/tpl/object_discounts.tpl.php
+++ b/htdocs/core/tpl/object_discounts.tpl.php
@@ -62,7 +62,11 @@ if ($absolute_discount > 0) {
 			$text .= ' ('.$addabsolutediscount.')';
 		}
 
-		print '<div class="inline-block clearboth">'.$text.'</div>';
+		if ($isNewObject) {
+			print '<br>'.$text;
+		} else {
+			print '<div class="inline-block clearboth">'.$text.'</div>';
+		}
 	} else {
 		// Discount available of type fixed amount (not credit note)
 		$more = '('.$addabsolutediscount.')';
@@ -85,7 +89,11 @@ if ($absolute_creditnote > 0) {
 			$text .= '('.$addabsolutediscount.')';
 		}
 
-		print '<div class="inline-block clearboth">'.$text.'</div>';
+		if ($isNewObject) {
+			print '<br>'.$text;
+		} else {
+			print '<div class="inline-block clearboth">'.$text.'</div>';
+		}
 	} else {  // We can add a credit note on a down payment or standard invoice or situation invoice
 		// There is credit notes discounts available
 		$more = $isInvoice && !$isNewObject ? ' ('.$viewabsolutediscount.')' : '';

From 62d91c3631ec209fac7d08587974f0e3defcb476 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 4 Jan 2021 16:07:47 +0100
Subject: [PATCH 796/888] FIX: Loan - Payment in not integrate in bank due to a
 problem with the type of payment

---
 htdocs/loan/class/paymentloan.class.php | 2 +-
 htdocs/loan/payment/payment.php         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index dc6d72094b2..34acb06f9ce 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -475,7 +475,7 @@ class PaymentLoan extends CommonObject
 			// Insert payment into llx_bank
 			$bank_line_id = $acc->addline(
 				$this->datep,
-				$this->fk_typepayment, // Payment mode ID or code ("CHQ or VIR for example")
+				$this->paymenttype, // Payment mode ID or code ("CHQ or VIR for example")
 				$label,
 				$total,
 				$this->num_payment,
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index 8a6e1e9c9ba..0c0574c15b4 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -152,7 +152,7 @@ if ($action == 'add_payment')
 
 			// Create a line of payments
 			$payment = new PaymentLoan($db);
-			$payment->chid = $chid;
+			$payment->chid				= $chid;
 			$payment->datep             = $datepaid;
 			$payment->label             = $loan->label;
 			$payment->amount_capital	= $pay_amount_capital;
@@ -176,7 +176,7 @@ if ($action == 'add_payment')
 
 			if (!$error)
 			{
-				$result = $payment->addPaymentToBank($user, $chid, 'payment_loan', '(LoanPayment)', GETPOST('accountid', 'int'), '', '');
+				$result = $payment->addPaymentToBank($user, $chid, 'payment_loan', '(LoanPayment)', $payment->fk_bank, '', '');
 				if (!$result > 0)
 				{
 					setEventMessages($payment->error, $payment->errors, 'errors');

From c58451dbb6aeaea9833d66365e475e2dec250a67 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Jan 2021 16:07:54 +0100
Subject: [PATCH 797/888] Code comment

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 47c025b0c0a..af0a625875f 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6845,6 +6845,7 @@ abstract class CommonObject
 							break;
 					}
 
+					// Output value of the current field
 					if ($extrafields->attributes[$this->table_element]['type'][$key] == 'separate')
 					{
 						$extrafields_collapse_num = '';

From f8fe7b5a0e2305060722fe2e377ffce465a3e3d5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Jan 2021 16:38:09 +0100
Subject: [PATCH 798/888] FIX #15851

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

diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index e7a8a31af4e..9a1a06f5a17 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -345,7 +345,7 @@ if ($catid > 0)     $sql .= " AND cu.fk_categorie = ".((int) $catid);
 if ($catid == -2)   $sql .= " AND cu.fk_categorie IS NULL";
 if ($search_categ > 0)   $sql .= " AND cu.fk_categorie = ".$db->escape($search_categ);
 if ($search_categ == -2) $sql .= " AND cu.fk_categorie IS NULL";
-if ($mode == 'employee' && empty($user->rights->salaries->readall)) $sql .= " AND s.fk_user IN (".join(',', $childids).")";
+if ($mode == 'employee' && empty($user->rights->salaries->readall)) $sql .= " AND u.fk_user IN (".join(',', $childids).")";
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks

From dd55f9ca9159de6e6b91f567c855414e8a471c21 Mon Sep 17 00:00:00 2001
From: zuiko <zuiko@free.fr>
Date: Mon, 4 Jan 2021 21:46:47 +0100
Subject: [PATCH 799/888]  update objectline_create.tpl.php

 FIX #15849
---
 htdocs/core/tpl/objectline_create.tpl.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 8da4d30af02..2404b05b74a 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -405,10 +405,10 @@ if ($nolinesbefore) {
 			<td class="nobottom margininfos linecolmargin right">
 				<!-- For predef product -->
 				<?php if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) { ?>
-					<select id="fournprice_predef" name="fournprice_predef" class="flat minwidth75imp" style="display: none;"></select>
+					<select id="fournprice_predef" name="fournprice_predef" class="flat minwidth75imp maxwidth150" style="display: none;"></select>
 				<?php } ?>
 				<!-- For free product -->
-				<input type="text" id="buying_price" name="buying_price" class="flat maxwidth75 right" value="<?php echo (isset($_POST["buying_price"]) ?GETPOST("buying_price", 'alpha', 2) : ''); ?>">
+				<input type="text" id="buying_price" name="buying_price" class="flat maxwidth75 maxwidth150 right" value="<?php echo (isset($_POST["buying_price"]) ?GETPOST("buying_price", 'alpha', 2) : ''); ?>">
 			</td>
 			<?php
 			if (!empty($conf->global->DISPLAY_MARGIN_RATES))

From 0efd5934f4e3a12867e8f8bede9bdff20539b6aa Mon Sep 17 00:00:00 2001
From: zuiko <zuiko@free.fr>
Date: Mon, 4 Jan 2021 21:56:47 +0100
Subject: [PATCH 800/888] Update fournisseurs.php

 FIX #15849
---
 htdocs/product/fournisseurs.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index b6f09346385..98700c90fb3 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -507,11 +507,11 @@ if ($id > 0 || $ref)
 				if ($rowid)
 				{
                     print '<input type="hidden" name="ref_fourn_old" value="'.$object->ref_supplier.'">';
-                    print '<input class="flat" name="ref_fourn" size="12" value="'.$object->ref_supplier.'">';
+                    print '<input class="flat width150" maxlength="30" name="ref_fourn" size="12" value="'.$object->ref_supplier.'">';
 				}
 				else
 				{
-					print '<input class="flat" name="ref_fourn" size="12" value="'.(GETPOST("ref_fourn") ?GETPOST("ref_fourn") : '').'">';
+					print '<input class="flat width150" maxlength="30" name="ref_fourn" size="12" value="'.(GETPOST("ref_fourn") ?GETPOST("ref_fourn") : '').'">';
 				}
 				print '</td>';
 				print '</tr>';

From c468db5a7c23b6d41c8ced9c2bbd429e4466ba03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 4 Jan 2021 23:41:20 +0100
Subject: [PATCH 801/888] doxygen

---
 htdocs/core/class/html.formmail.class.php | 301 +++++++++-------------
 1 file changed, 122 insertions(+), 179 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 096418597da..59c6b2af273 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -116,7 +116,12 @@ class FormMail extends Form
 	 */
 	public $withto; // Show recipient emails
 
-	public $withtofree; // Show free text for recipient emails
+	/**
+	 * @var int|string 0 = Do not Show free text for recipient emails
+	 *                 1 = Show free text for recipient emails
+	 *                 or a free email
+	 */
+	public $withtofree;
 	public $withtocc;
 	public $withtoccc;
 	public $withtopic;
@@ -354,14 +359,15 @@ class FormMail extends Form
 		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 		$formfile = new Formfile($this->db);
 
-		if (!is_object($form)) $form = new Form($this->db);
+		if (!is_object($form)) {
+			$form = new Form($this->db);
+		}
 
 		// Load translation files required by the page
 		$langs->loadLangs(array('other', 'mails'));
 
 		// Clear temp files. Must be done at beginning, before call of triggers
-		if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1'))
-		{
+		if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1')) {
 			$this->clear_attached_files();
 		}
 
@@ -375,8 +381,7 @@ class FormMail extends Form
 		);
 		$reshook = $hookmanager->executeHooks('getFormMail', $parameters, $this);
 
-		if (!empty($reshook))
-		{
+		if (!empty($reshook)) {
 			return $hookmanager->resPrint;
 		} else {
 			$out = '';
@@ -387,8 +392,7 @@ class FormMail extends Form
 			$outputlangs = $langs;
 			$newlang = '';
 			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $this->param['langsmodels'];
-			if (!empty($newlang))
-			{
+			if (!empty($newlang)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
 				$outputlangs->load('other');
@@ -396,11 +400,9 @@ class FormMail extends Form
 
 			// Get message template for $this->param["models"] into c_email_templates
 			$arraydefaultmessage = -1;
-			if ($this->param['models'] != 'none')
-			{
+			if ($this->param['models'] != 'none') {
 				$model_id = 0;
-				if (array_key_exists('models_id', $this->param))
-				{
+				if (array_key_exists('models_id', $this->param)) {
 					$model_id = $this->param["models_id"];
 				}
 
@@ -413,25 +415,27 @@ class FormMail extends Form
 			$listofmimes = array();
 			$keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined
 
-			if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1'))
-			{
-				if (!empty($arraydefaultmessage->joinfiles) && is_array($this->param['fileinit']))
-				{
-					foreach ($this->param['fileinit'] as $file)
-					{
+			if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1')) {
+				if (!empty($arraydefaultmessage->joinfiles) && is_array($this->param['fileinit'])) {
+					foreach ($this->param['fileinit'] as $file) {
 						$this->add_attached_files($file, basename($file), dol_mimetype($file));
 					}
 				}
 			}
 
-	   		if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
-	   		if (!empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
-	   		if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
+	   		if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+				$listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
+			}
+	   		if (!empty($_SESSION["listofnames".$keytoavoidconflict])) {
+				$listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
+			}
+	   		if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+				$listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
+			}
 
 
 			$out .= "\n".'<!-- Begin form mail type='.$this->param["models"].' --><div id="mailformdiv"></div>'."\n";
-			if ($this->withform == 1)
-			{
+			if ($this->withform == 1) {
 				$out .= '<form method="POST" name="mailform" id="mailform" enctype="multipart/form-data" action="'.$this->param["returnurl"].'#formmail">'."\n";
 
 				$out .= '<a id="formmail" name="formmail"></a>';
@@ -439,16 +443,13 @@ class FormMail extends Form
 				$out .= '<input type="hidden" name="token" value="'.newToken().'" />';
 				$out .= '<input type="hidden" name="trackid" value="'.$this->trackid.'" />';
 			}
-			if (!empty($this->withfrom))
-			{
-				if (!empty($this->withfromreadonly))
-				{
+			if (!empty($this->withfrom)) {
+				if (!empty($this->withfromreadonly)) {
 					$out .= '<input type="hidden" id="fromname" name="fromname" value="'.$this->fromname.'" />';
 					$out .= '<input type="hidden" id="frommail" name="frommail" value="'.$this->frommail.'" />';
 				}
 			}
-			foreach ($this->param as $key=>$value)
-			{
+			foreach ($this->param as $key=>$value) {
 				if (is_array($value)) {
 					$out .= "<!-- param key=".$key." is array, we do not output input filed for it -->\n";
 				} else {
@@ -457,17 +458,14 @@ class FormMail extends Form
 			}
 
 			$modelmail_array = array();
-			if ($this->param['models'] != 'none')
-			{
+			if ($this->param['models'] != 'none') {
 				$result = $this->fetchAllEMailTemplate($this->param["models"], $user, $outputlangs);
 
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					setEventMessages($this->error, $this->errors, 'errors');
 				}
 				$langs->trans("members");
-				foreach ($this->lines_model as $line)
-				{
+				foreach ($this->lines_model as $line) {
 					$reg = array();
 					if (preg_match('/\((.*)\)/', $line->label, $reg)) {
 						$labeltouse = $langs->trans($reg[1]); // langs->trans when label is __(xxx)__
@@ -483,8 +481,7 @@ class FormMail extends Form
 			}
 
 			// Zone to select email template
-			if (count($modelmail_array) > 0)
-			{
+			if (count($modelmail_array) > 0) {
 				// If list of template is filled
 				$out .= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
 				$out .= '<span class="opacitymedium">'.$langs->trans('SelectMailModel').':</span> ';
@@ -498,8 +495,7 @@ class FormMail extends Form
 					'propal_send', 'order_send', 'facture_send',
 					'shipping_send', 'fichinter_send', 'supplier_proposal_send', 'order_supplier_send',
 					'invoice_supplier_send', 'thirdparty', 'contract', 'user', 'recruitmentcandidature_send', 'all'
-				)))
-			{
+				))) {
 				// If list of template is empty
 				$out .= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
 				$out .= $langs->trans('SelectMailModel').': <select name="modelmailselected" disabled="disabled"><option value="none">'.$langs->trans("NoTemplateDefined").'</option></select>'; // Do not put 'disabled' on 'option' tag, it is already on 'select' and it makes chrome crazy.
@@ -518,12 +514,10 @@ class FormMail extends Form
 			// Substitution array/string
 			$helpforsubstitution = '';
 			if (is_array($this->substit) && count($this->substit)) $helpforsubstitution .= $langs->trans('AvailableVariables').' :<br>'."\n";
-			foreach ($this->substit as $key => $val)
-			{
+			foreach ($this->substit as $key => $val) {
 				$helpforsubstitution .= $key.' -> '.$langs->trans(dol_string_nohtmltag(dolGetFirstLineOfText($val))).'<br>';
 			}
-			if (!empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
-			{
+			if (!empty($this->withsubstit))	{	// Unset or set ->withsubstit=0 to disable this.
 				$out .= '<tr><td colspan="2" class="right">';
 				//$out.='<div class="floatright">';
 				if (is_numeric($this->withsubstit)) $out .= $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip'); // Old usage
@@ -538,10 +532,8 @@ class FormMail extends Form
 			var_dump($this->fromname);*/
 
 			// From
-			if (!empty($this->withfrom))
-			{
-				if (!empty($this->withfromreadonly))
-				{
+			if (!empty($this->withfrom)) {
+				if (!empty($this->withfromreadonly)) {
 					$out .= '<tr><td class="fieldrequired minwidth200">'.$langs->trans("MailFrom").'</td><td>';
 
 					// $this->fromtype is the default value to use to select sender
@@ -551,16 +543,13 @@ class FormMail extends Form
 						&& !preg_match('/user_aliases/', $this->fromtype)
 						&& !preg_match('/global_aliases/', $this->fromtype)
 						&& !preg_match('/senderprofile/', $this->fromtype)
-						)
-					{
+						) {
 						// Use this->fromname and this->frommail or error if not defined
 						$out .= $this->fromname;
-						if ($this->frommail)
-						{
+						if ($this->frommail) {
 							$out .= ' &lt;'.$this->frommail.'&gt;';
 						} else {
-							if ($this->fromtype)
-							{
+							if ($this->fromtype) {
 								$langs->load('errors');
 								$out .= '<span class="warning"> &lt;'.$langs->trans('ErrorNoMailDefinedForThisUser').'&gt; </span>';
 							}
@@ -569,8 +558,7 @@ class FormMail extends Form
 						$liste = array();
 
 						// Add user email
-						if (empty($user->email))
-						{
+						if (empty($user->email)) {
 							$langs->load('errors');
 							$liste['user'] = $user->getFullName($langs).' &lt;'.$langs->trans('ErrorNoMailDefinedForThisUser').'&gt;';
 						} else {
@@ -584,13 +572,10 @@ class FormMail extends Form
 						$listaliases = array('user_aliases'=>$user->email_aliases, 'global_aliases'=>$conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
 
 						// Also add robot email
-						if (!empty($this->fromalsorobot))
-						{
-							if (!empty($conf->global->MAIN_MAIL_EMAIL_FROM) && $conf->global->MAIN_MAIL_EMAIL_FROM != $conf->global->MAIN_INFO_SOCIETE_MAIL)
-							{
+						if (!empty($this->fromalsorobot)) {
+							if (!empty($conf->global->MAIN_MAIL_EMAIL_FROM) && $conf->global->MAIN_MAIL_EMAIL_FROM != $conf->global->MAIN_INFO_SOCIETE_MAIL) {
 								$liste['robot'] = $conf->global->MAIN_MAIL_EMAIL_FROM;
-								if ($this->frommail)
-								{
+								if ($this->frommail) {
 									$liste['robot'] .= ' &lt;'.$conf->global->MAIN_MAIL_EMAIL_FROM.'&gt;';
 								}
 							}
@@ -601,31 +586,27 @@ class FormMail extends Form
 						$sql .= ' WHERE active = 1 AND (private = 0 OR private = '.$user->id.')';
 						$sql .= ' ORDER BY position';
 						$resql = $this->db->query($sql);
-						if ($resql)
-						{
+						if ($resql) {
 							$num = $this->db->num_rows($resql);
 							$i = 0;
-							while ($i < $num)
-							{
+							while ($i < $num) {
 								$obj = $this->db->fetch_object($resql);
-								if ($obj)
-								{
+								if ($obj) {
 									$listaliases['senderprofile_'.$obj->rowid] = $obj->label.' <'.$obj->email.'>';
 								}
 								$i++;
 							}
-						} else dol_print_error($this->db);
+						} else {
+							dol_print_error($this->db);
+						}
 
-						foreach ($listaliases as $typealias => $listalias)
-						{
+						foreach ($listaliases as $typealias => $listalias) {
 							$posalias = 0;
 							$listaliasarray = explode(',', $listalias);
-							foreach ($listaliasarray as $listaliasval)
-							{
+							foreach ($listaliasarray as $listaliasval) {
 								$posalias++;
 								$listaliasval = trim($listaliasval);
-								if ($listaliasval)
-								{
+								if ($listaliasval) {
 									$listaliasval = preg_replace('/</', '&lt;', $listaliasval);
 									$listaliasval = preg_replace('/>/', '&gt;', $listaliasval);
 									if (!preg_match('/&lt;/', $listaliasval)) $listaliasval = '&lt;'.$listaliasval.'&gt;';
@@ -637,8 +618,7 @@ class FormMail extends Form
 						// Set the default "From"
 						$defaultfrom = '';
 						$reshook = $hookmanager->executeHooks('getDefaultFromEmail', $parameters, $this);
-						if (empty($reshook))
-						{
+						if (empty($reshook)) {
 							$defaultfrom = $this->fromtype;
 						}
 						if (!empty($hookmanager->resArray['defaultfrom'])) $defaultfrom = $hookmanager->resArray['defaultfrom'];
@@ -665,19 +645,15 @@ class FormMail extends Form
 				if ($this->withtofree) $out .= $form->textwithpicto($langs->trans("MailTo"), $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
 				else $out .= $langs->trans("MailTo");
 				$out .= '</td><td>';
-				if ($this->withtoreadonly)
-				{
-					if (!empty($this->toname) && !empty($this->tomail))
-					{
+				if ($this->withtoreadonly) {
+					if (!empty($this->toname) && !empty($this->tomail)) {
 						$out .= '<input type="hidden" id="toname" name="toname" value="'.$this->toname.'" />';
 						$out .= '<input type="hidden" id="tomail" name="tomail" value="'.$this->tomail.'" />';
-						if ($this->totype == 'thirdparty')
-						{
+						if ($this->totype == 'thirdparty') {
 							$soc = new Societe($this->db);
 							$soc->fetch($this->toid);
 							$out .= $soc->getNomUrl(1);
-						} elseif ($this->totype == 'contact')
-						{
+						} elseif ($this->totype == 'contact') {
 							$contact = new Contact($this->db);
 							$contact->fetch($this->toid);
 							$out .= $contact->getNomUrl(1);
@@ -685,8 +661,7 @@ class FormMail extends Form
 							$out .= $this->toname;
 						}
 						$out .= ' &lt;'.$this->tomail.'&gt;';
-						if ($this->withtofree)
-						{
+						if ($this->withtofree) {
 							$out .= '<br>'.$langs->trans("and").' <input class="minwidth200" id="sendto" name="sendto" value="'.(!is_array($this->withto) && !is_numeric($this->withto) ? (GETPOSTISSET("sendto") ? GETPOST("sendto") : $this->withto) : "").'" />';
 						}
 					} else {
@@ -695,25 +670,21 @@ class FormMail extends Form
 					}
 				} else {
 					// The free input of email
-					if (!empty($this->withtofree))
-					{
+					if (!empty($this->withtofree)) {
 						$out .= '<input class="minwidth200" id="sendto" name="sendto" value="'.(($this->withtofree && !is_numeric($this->withtofree)) ? $this->withtofree : (!is_array($this->withto) && !is_numeric($this->withto) ? (GETPOSTISSET("sendto") ? GETPOST("sendto") : $this->withto) : "")).'" />';
 					}
 					// The select combo
-					if (!empty($this->withto) && is_array($this->withto))
-					{
+					if (!empty($this->withto) && is_array($this->withto)) {
 						if (!empty($this->withtofree)) $out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
 						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 						$tmparray = $this->withto;
-						foreach ($tmparray as $key => $val)
-						{
+						foreach ($tmparray as $key => $val) {
 							$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
 						}
 
 						$withtoselected = GETPOST("receiver", 'array'); // Array of selected value
 
-						if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend')
-						{
+						if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend') {
 							$withtoselected = array_keys($tmparray);
 						}
 						$out .= $form->multiselectarray("receiver", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");
@@ -723,21 +694,18 @@ class FormMail extends Form
 			}
 
 			// To User
-			if (!empty($this->withtouser) && is_array($this->withtouser) && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT))
-			{
+			if (!empty($this->withtouser) && is_array($this->withtouser) && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
 				$out .= '<tr><td>';
 				$out .= $langs->trans("MailToUsers");
 				$out .= '</td><td>';
 
 				// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 				$tmparray = $this->withtouser;
-				foreach ($tmparray as $key => $val)
-				{
+				foreach ($tmparray as $key => $val) {
 					$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
 				}
 				$withtoselected = GETPOST("receiveruser", 'array'); // Array of selected value
-				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend')
-				{
+				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend') {
 					$withtoselected = array_keys($tmparray);
 				}
 				$out .= $form->multiselectarray("receiveruser", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");
@@ -745,8 +713,7 @@ class FormMail extends Form
 			}
 
 			// With option one email per recipient
-			if (!empty($this->withoptiononeemailperrecipient))
-			{
+			if (!empty($this->withoptiononeemailperrecipient)) {
 				$out .= '<tr><td class="minwidth200">';
 				$out .= $langs->trans("GroupEmails");
 				$out .= '</td><td>';
@@ -760,23 +727,19 @@ class FormMail extends Form
 			}
 
 			// CC
-			if (!empty($this->withtocc) || is_array($this->withtocc))
-			{
+			if (!empty($this->withtocc) || is_array($this->withtocc)) {
 				$out .= '<tr><td>';
 				$out .= $form->textwithpicto($langs->trans("MailCC"), $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
 				$out .= '</td><td>';
-				if ($this->withtoccreadonly)
-				{
+				if ($this->withtoccreadonly) {
 					$out .= (!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : "";
 				} else {
 					$out .= '<input class="minwidth200" id="sendtocc" name="sendtocc" value="'.(GETPOST("sendtocc", "alpha") ? GETPOST("sendtocc", "alpha") : ((!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : '')).'" />';
-					if (!empty($this->withtocc) && is_array($this->withtocc))
-					{
+					if (!empty($this->withtocc) && is_array($this->withtocc)) {
 						$out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
 						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 						$tmparray = $this->withtocc;
-						foreach ($tmparray as $key => $val)
-						{
+						foreach ($tmparray as $key => $val) {
 							$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
 						}
 						$withtoccselected = GETPOST("receivercc", 'array'); // Array of selected value
@@ -787,21 +750,18 @@ class FormMail extends Form
 			}
 
 			// To User cc
-			if (!empty($this->withtoccuser) && is_array($this->withtoccuser) && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT))
-			{
+			if (!empty($this->withtoccuser) && is_array($this->withtoccuser) && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
 				$out .= '<tr><td>';
 				$out .= $langs->trans("MailToCCUsers");
 				$out .= '</td><td>';
 
 				// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 				$tmparray = $this->withtoccuser;
-				foreach ($tmparray as $key => $val)
-				{
+				foreach ($tmparray as $key => $val) {
 					$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
 				}
 				$withtoselected = GETPOST("receiverccuser", 'array'); // Array of selected value
-				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend')
-				{
+				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend') {
 					$withtoselected = array_keys($tmparray);
 				}
 				$out .= $form->multiselectarray("receiverccuser", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");
@@ -814,10 +774,8 @@ class FormMail extends Form
 			}
 
 			// Replyto
-			if (!empty($this->withreplyto))
-			{
-				if ($this->withreplytoreadonly)
-				{
+			if (!empty($this->withreplyto)) {
+				if ($this->withreplytoreadonly) {
 					$out .= '<input type="hidden" id="replyname" name="replyname" value="'.$this->replytoname.'" />';
 					$out .= '<input type="hidden" id="replymail" name="replymail" value="'.$this->replytomail.'" />';
 					$out .= "<tr><td>".$langs->trans("MailReply")."</td><td>".$this->replytoname.($this->replytomail ? (" &lt;".$this->replytomail."&gt;") : "");
@@ -841,41 +799,32 @@ class FormMail extends Form
 			}
 
 			// Attached files
-			if (!empty($this->withfile))
-			{
+			if (!empty($this->withfile)) {
 				$out .= '<tr>';
 				$out .= '<td>'.$langs->trans("MailFile").'</td>';
 
 				$out .= '<td>';
 
-				if ($this->withmaindocfile)	// withmaindocfile is set to 1 or -1 to show the checkbox (-1 = checked or 1 = not checked)
-				{
-					if (GETPOSTISSET('sendmail'))
-					{
+				if ($this->withmaindocfile)	{ // withmaindocfile is set to 1 or -1 to show the checkbox (-1 = checked or 1 = not checked)
+					if (GETPOSTISSET('sendmail')) {
 						$this->withmaindocfile = (GETPOST('addmaindocfile', 'alpha') ? -1 : 1);
-					}
-					// If a template was selected, we use setup of template to define if join file checkbox is selected or not.
-					elseif (is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-					{
+					} elseif (is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+						// If a template was selected, we use setup of template to define if join file checkbox is selected or not.
 						$this->withmaindocfile = ($arraydefaultmessage->joinfiles ? -1 : 1);
 					}
 				}
 
-				if (!empty($this->withmaindocfile))
-				{
-					if ($this->withmaindocfile == 1)
-					{
+				if (!empty($this->withmaindocfile)) {
+					if ($this->withmaindocfile == 1) {
 						$out .= '<input type="checkbox" name="addmaindocfile" value="1" />';
 					}
-					if ($this->withmaindocfile == -1)
-					{
+					if ($this->withmaindocfile == -1) {
 						$out .= '<input type="checkbox" name="addmaindocfile" value="1" checked="checked" />';
 					}
 					$out .= ' '.$langs->trans("JoinMainDoc").'.<br>';
 				}
 
-				if (is_numeric($this->withfile))
-				{
+				if (is_numeric($this->withfile)) {
 					// TODO Trick to have param removedfile containing nb of file to delete. But this does not works without javascript
 					$out .= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
 					$out .= '<script type="text/javascript" language="javascript">';
@@ -885,28 +834,23 @@ class FormMail extends Form
 					$out .= '    });';
 					$out .= '})';
 					$out .= '</script>'."\n";
-					if (count($listofpaths))
-					{
-						foreach ($listofpaths as $key => $val)
-						{
+					if (count($listofpaths)) {
+						foreach ($listofpaths as $key => $val) {
 							$out .= '<div id="attachfile_'.$key.'">';
 							// Preview of attachment
 							preg_match('#^(/)(\w+)(/)(.+)$#', substr($val, (strlen(DOL_DATA_ROOT) - strlen($val))), $formfile_params);
 							$out .= img_mime($listofnames[$key]).' '.$listofnames[$key];
 							$out .= $formfile->showPreview(array(), $formfile_params[2], $formfile_params[4]);
-							if (!$this->withfilereadonly)
-							{
+							if (!$this->withfilereadonly) {
 								$out .= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key + 1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
 								//$out.= ' <a href="'.$_SERVER["PHP_SELF"].'?removedfile='.($key+1).' id="removedfile_'.$key.'">'.img_delete($langs->trans("Delete").'</a>';
 							}
 							$out .= '<br></div>';
 						}
-					} elseif (empty($this->withmaindocfile))		// Do not show message if we asked to show the checkbox
-					{
+					} elseif (empty($this->withmaindocfile)) { // Do not show message if we asked to show the checkbox
 						$out .= $langs->trans("NoAttachedFiles").'<br>';
 					}
-					if ($this->withfile == 2)	// Can add other files
-					{
+					if ($this->withfile == 2) {	// Can add other files
 						if (!empty($conf->global->FROM_MAIL_USE_INPUT_FILE_MULTIPLE)) $out .= '<input type="file" class="flat" id="addedfile" name="addedfile[]" value="'.$langs->trans("Upload").'" multiple />';
 						else $out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
 						$out .= ' ';
@@ -920,11 +864,9 @@ class FormMail extends Form
 			}
 
 			// Message
-			if (!empty($this->withbody))
-			{
+			if (!empty($this->withbody)) {
 				$defaultmessage = GETPOST('message', 'restricthtml');
-				if (!GETPOST('modelselected', 'alpha') || GETPOST('modelmailselected') != '-1')
-				{
+				if (!GETPOST('modelselected', 'alpha') || GETPOST('modelmailselected') != '-1') {
 					if ($arraydefaultmessage && $arraydefaultmessage->content) {
 						$defaultmessage = $arraydefaultmessage->content;
 					} elseif (!is_numeric($this->withbody)) {
@@ -934,25 +876,29 @@ class FormMail extends Form
 
 				// Complete substitution array with the url to make online payment
 				$paymenturl = ''; $validpaymentmethod = array();
-				if (empty($this->substit['__REF__']))
-				{
+				if (empty($this->substit['__REF__'])) {
 					$paymenturl = '';
 				} else {
 					// Set the online payment url link into __ONLINE_PAYMENT_URL__ key
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 					$langs->loadLangs(array('paypal', 'other'));
 					$typeforonlinepayment = 'free';
-					if ($this->param["models"] == 'order' || $this->param["models"] == 'order_send')   $typeforonlinepayment = 'order'; // TODO use detection on something else than template
-					if ($this->param["models"] == 'invoice' || $this->param["models"] == 'facture_send') $typeforonlinepayment = 'invoice'; // TODO use detection on something else than template
-					if ($this->param["models"] == 'member') $typeforonlinepayment = 'member'; // TODO use detection on something else than template
+					if ($this->param["models"] == 'order' || $this->param["models"] == 'order_send') {
+						$typeforonlinepayment = 'order'; // TODO use detection on something else than template
+					}
+					if ($this->param["models"] == 'invoice' || $this->param["models"] == 'facture_send') {
+						$typeforonlinepayment = 'invoice'; // TODO use detection on something else than template
+					}
+					if ($this->param["models"] == 'member') {
+						$typeforonlinepayment = 'member'; // TODO use detection on something else than template
+					}
 					$url = getOnlinePaymentUrl(0, $typeforonlinepayment, $this->substit['__REF__']);
 					$paymenturl = $url;
 
 					$validpaymentmethod = getValidOnlinePaymentMethods('');
 				}
 
-				if (count($validpaymentmethod) > 0 && $paymenturl)
-				{
+				if (count($validpaymentmethod) > 0 && $paymenturl) {
 					$langs->load('other');
 					$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = str_replace('\n', "\n", $langs->transnoentities("PredefinedMailContentLink", $paymenturl));
 					$this->substit['__ONLINE_PAYMENT_URL__'] = $paymenturl;
@@ -966,10 +912,8 @@ class FormMail extends Form
 				// Add lines substitution key from each line
 				$lines = '';
 				$defaultlines = $arraydefaultmessage->content_lines;
-				if (isset($defaultlines))
-				{
-					foreach ($this->substit_lines as $substit_line)
-					{
+				if (isset($defaultlines)) {
+					foreach ($this->substit_lines as $substit_line) {
 						$lines .= make_substitutions($defaultlines, $substit_line)."\n";
 					}
 				}
@@ -1003,8 +947,9 @@ class FormMail extends Form
 					}
 				}
 
-				if (GETPOSTISSET("message") && !$_POST['modelselected']) $defaultmessage = $_POST["message"];
-				else {
+				if (GETPOSTISSET("message") && !$_POST['modelselected']) {
+					$defaultmessage = $_POST["message"];
+				} else {
 					$defaultmessage = make_substitutions($defaultmessage, $this->substit);
 					// Clean first \n and br (to avoid empty line when CONTACTCIVNAME is empty)
 					$defaultmessage = preg_replace("/^(<br>)+/", "", $defaultmessage);
@@ -1016,17 +961,17 @@ class FormMail extends Form
 				$out .= $form->textwithpicto($langs->trans('MailText'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltipfrombody');
 				$out .= '</td>';
 				$out .= '<td>';
-				if ($this->withbodyreadonly)
-				{
+				if ($this->withbodyreadonly) {
 					$out .= nl2br($defaultmessage);
 					$out .= '<input type="hidden" id="message" name="message" value="'.$defaultmessage.'" />';
 				} else {
-					if (!isset($this->ckeditortoolbar)) $this->ckeditortoolbar = 'dolibarr_notes';
+					if (!isset($this->ckeditortoolbar)) {
+						$this->ckeditortoolbar = 'dolibarr_notes';
+					}
 
 					// Editor wysiwyg
 					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-					if ($this->withfckeditor == -1)
-					{
+					if ($this->withfckeditor == -1) {
 						if (!empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $this->withfckeditor = 1;
 						else $this->withfckeditor = 0;
 					}
@@ -1039,29 +984,27 @@ class FormMail extends Form
 
 			$out .= '</table>'."\n";
 
-			if ($this->withform == 1 || $this->withform == -1)
-			{
+			if ($this->withform == 1 || $this->withform == -1) {
 				$out .= '<br><div class="center">';
 				$out .= '<input class="button" type="submit" id="sendmail" name="sendmail" value="'.$langs->trans("SendMail").'"';
 				// Add a javascript test to avoid to forget to submit file before sending email
-				if ($this->withfile == 2 && $conf->use_javascript_ajax)
-				{
+				if ($this->withfile == 2 && $conf->use_javascript_ajax) {
 					$out .= ' onClick="if (document.mailform.addedfile.value != \'\') { alert(\''.dol_escape_js($langs->trans("FileWasNotUploaded")).'\'); return false; } else { return true; }"';
 				}
 				$out .= ' />';
-				if ($this->withcancel)
-				{
+				if ($this->withcancel) {
 					$out .= ' &nbsp; &nbsp; ';
 					$out .= '<input class="button button-cancel" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'" />';
 				}
 				$out .= '</div>'."\n";
 			}
 
-			if ($this->withform == 1) $out .= '</form>'."\n";
+			if ($this->withform == 1) {
+				$out .= '</form>'."\n";
+			}
 
 			// Disable enter key if option MAIN_MAILFORM_DISABLE_ENTERKEY is set
-			if (!empty($conf->global->MAIN_MAILFORM_DISABLE_ENTERKEY))
-			{
+			if (!empty($conf->global->MAIN_MAILFORM_DISABLE_ENTERKEY)) {
 				$out .= '<script type="text/javascript" language="javascript">';
 				$out .= 'jQuery(document).ready(function () {';
 				$out .= '	$(document).on("keypress", \'#mailform\', function (e) {		/* Note this is called at every key pressed ! */

From eeaac549e2ea99f834018a0624b156c4a3ed2914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 5 Jan 2021 00:11:19 +0100
Subject: [PATCH 802/888] doxygen

---
 htdocs/core/class/CMailFile.class.php | 34 ++++++++++-----------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index c942127aab3..e96adea7531 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2003       Jean-Louis Bergamo      <jlb@j1b.org>
  * Copyright (C) 2004-2015  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2020  Frédéric 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
@@ -950,15 +950,14 @@ class CMailFile
 	 * Read a file on disk and return encoded content for emails (mode = 'mail')
 	 *
 	 * @param	string	$sourcefile		Path to file to encode
-	 * @return 	int					    <0 if KO, encoded string if OK
+	 * @return 	int|string			    <0 if KO, encoded string if OK
 	 */
 	private function _encode_file($sourcefile)
 	{
 		// phpcs:enable
 		$newsourcefile = dol_osencode($sourcefile);
 
-		if (is_readable($newsourcefile))
-		{
+		if (is_readable($newsourcefile)) {
 			$contents = file_get_contents($newsourcefile); // Need PHP 4.3
 			$encoded = chunk_split(base64_encode($contents), 76, $this->eol); // 76 max is defined into http://tools.ietf.org/html/rfc2047
 			return $encoded;
@@ -983,27 +982,24 @@ class CMailFile
 		// phpcs:enable
 		global $conf, $dolibarr_main_data_root;
 
-		if (@is_writeable($dolibarr_main_data_root))	// Avoid fatal error on fopen with open_basedir
-		{
+		if (@is_writeable($dolibarr_main_data_root)) {	// Avoid fatal error on fopen with open_basedir
 			$outputfile = $dolibarr_main_data_root."/dolibarr_mail.log";
 			$fp = fopen($outputfile, "w");
 
-			if ($this->sendmode == 'mail')
-			{
+			if ($this->sendmode == 'mail') {
 				fputs($fp, $this->headers);
 				fputs($fp, $this->eol); // This eol is added by the mail function, so we add it in log
 				fputs($fp, $this->message);
-			} elseif ($this->sendmode == 'smtps')
-			{
+			} elseif ($this->sendmode == 'smtps') {
 				fputs($fp, $this->smtps->log); // this->smtps->log is filled only if MAIN_MAIL_DEBUG was set to on
-			} elseif ($this->sendmode == 'swiftmailer')
-			{
+			} elseif ($this->sendmode == 'swiftmailer') {
 				fputs($fp, $this->logger->dump()); // this->logger is filled only if MAIN_MAIL_DEBUG was set to on
 			}
 
 			fclose($fp);
-			if (!empty($conf->global->MAIN_UMASK))
+			if (!empty($conf->global->MAIN_UMASK)) {
 				@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			}
 		}
 	}
 
@@ -1016,8 +1012,7 @@ class CMailFile
 	 */
 	public function checkIfHTML($msg)
 	{
-		if (!preg_match('/^[\s\t]*<html/i', $msg))
-		{
+		if (!preg_match('/^[\s\t]*<html/i', $msg)) {
 			$out = "<html><head><title></title>";
 			if (!empty($this->styleCSS)) $out .= $this->styleCSS;
 			$out .= "</head><body";
@@ -1039,19 +1034,16 @@ class CMailFile
 	 */
 	public function buildCSS()
 	{
-		if (!empty($this->css))
-		{
+		if (!empty($this->css)) {
 			// Style CSS
 			$this->styleCSS = '<style type="text/css">';
 			$this->styleCSS .= 'body {';
 
-			if ($this->css['bgcolor'])
-			{
+			if ($this->css['bgcolor']) {
 				$this->styleCSS .= '  background-color: '.$this->css['bgcolor'].';';
 				$this->bodyCSS .= ' bgcolor="'.$this->css['bgcolor'].'"';
 			}
-			if ($this->css['bgimage'])
-			{
+			if ($this->css['bgimage']) {
 				// TODO recuperer cid
 				$this->styleCSS .= ' background-image: url("cid:'.$this->css['bgimage_cid'].'");';
 			}

From 9cea8b82440536c0c5ed548ef1ce2dca693bd711 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 4 Jan 2021 16:07:47 +0100
Subject: [PATCH 803/888] FIX: Loan - Payment in not integrate in bank due to a
 problem with the type of payment

---
 htdocs/loan/class/paymentloan.class.php | 2 +-
 htdocs/loan/payment/payment.php         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index dc6d72094b2..34acb06f9ce 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -475,7 +475,7 @@ class PaymentLoan extends CommonObject
 			// Insert payment into llx_bank
 			$bank_line_id = $acc->addline(
 				$this->datep,
-				$this->fk_typepayment, // Payment mode ID or code ("CHQ or VIR for example")
+				$this->paymenttype, // Payment mode ID or code ("CHQ or VIR for example")
 				$label,
 				$total,
 				$this->num_payment,
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index 8a6e1e9c9ba..0c0574c15b4 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -152,7 +152,7 @@ if ($action == 'add_payment')
 
 			// Create a line of payments
 			$payment = new PaymentLoan($db);
-			$payment->chid = $chid;
+			$payment->chid				= $chid;
 			$payment->datep             = $datepaid;
 			$payment->label             = $loan->label;
 			$payment->amount_capital	= $pay_amount_capital;
@@ -176,7 +176,7 @@ if ($action == 'add_payment')
 
 			if (!$error)
 			{
-				$result = $payment->addPaymentToBank($user, $chid, 'payment_loan', '(LoanPayment)', GETPOST('accountid', 'int'), '', '');
+				$result = $payment->addPaymentToBank($user, $chid, 'payment_loan', '(LoanPayment)', $payment->fk_bank, '', '');
 				if (!$result > 0)
 				{
 					setEventMessages($payment->error, $payment->errors, 'errors');

From 64b4f1079d0886c67feac51389f8584246fdaf15 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 5 Jan 2021 02:18:42 +0100
Subject: [PATCH 804/888] Close #15870 manually

---
 htdocs/compta/bank/class/account.class.php    |  6 ++++-
 .../bank/class/api_bankaccounts.class.php     | 26 +++++++++++--------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 76b22e29a96..e0f48e9498b 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -493,9 +493,10 @@ class Account extends CommonObject
 	 *  @param	string		$banque			Bank of cheque writer
 	 *  @param	string		$accountancycode	When we record a free bank entry, we must provide accounting account if accountancy module is on.
 	 *  @param	int			$datev			Date value
+     *  @param  string      $num_releve     Label of bank receipt for reconciliation
 	 *  @return	int							Rowid of added entry, <0 if KO
 	 */
-	public function addline($date, $oper, $label, $amount, $num_chq, $categorie, User $user, $emetteur = '', $banque = '', $accountancycode = '', $datev = null)
+	public function addline($date, $oper, $label, $amount, $num_chq, $categorie, User $user, $emetteur = '', $banque = '', $accountancycode = '', $datev = null, $num_releve = '')
 	{
 		// Deprecation warning
 		if (is_numeric($oper)) {
@@ -555,6 +556,7 @@ class Account extends CommonObject
 		$accline->fk_account = $this->rowid;
 		$accline->fk_type = $oper;
 		$accline->numero_compte = $accountancycode;
+		$accline->num_releve = $num_releve;
 
 		if ($num_chq) {
 			$accline->num_chq = $num_chq;
@@ -1886,6 +1888,7 @@ class AccountLine extends CommonObject
 		$sql .= ", emetteur,banque";
 		$sql .= ", rappro";
 		$sql .= ", numero_compte";
+		$sql .= ", num_releve";
 		$sql .= ") VALUES (";
 		$sql .= "'".$this->db->idate($this->datec)."'";
 		$sql .= ", '".$this->db->idate($this->dateo)."'";
@@ -1900,6 +1903,7 @@ class AccountLine extends CommonObject
 		$sql .= ", ".($this->bank_chq ? "'".$this->db->escape($this->bank_chq)."'" : "null");
 		$sql .= ", ".(int) $this->rappro;
 		$sql .= ", ".($this->numero_compte ? "'".$this->db->escape($this->numero_compte)."'" : "''");
+		$sql .= ", ".($this->num_releve ? "'".$this->db->escape($this->num_releve)."'" : "null");
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::insert", LOG_DEBUG);
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index 35104e5ed25..9ab02d8b18a 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -466,20 +466,23 @@ class BankAccounts extends DolibarrApi
 	/**
 	 * Add a line to an account
 	 *
-	 * @param int    $id            ID of account
-	 * @param int    $date          Payment date (timestamp) {@from body} {@type timestamp}
-	 * @param string $type          Payment mode (TYP,VIR,PRE,LIQ,VAD,CB,CHQ...) {@from body}
-	 * @param string $label         Label {@from body}
-	 * @param float  $amount        Amount (may be 0) {@from body}
-	 * @param int    $category      Category
-	 * @param string $cheque_number Cheque numberl {@from body}
-	 * @param string $cheque_writer Name of cheque writer {@from body}
-	 * @param string $cheque_bank   Bank of cheque writer {@from body}
+	 * @param int    $id               ID of account
+	 * @param int    $date             Payment date (timestamp) {@from body} {@type timestamp}
+	 * @param string $type             Payment mode (TYP,VIR,PRE,LIQ,VAD,CB,CHQ...) {@from body}
+	 * @param string $label            Label {@from body}
+	 * @param float  $amount           Amount (may be 0) {@from body}
+	 * @param int    $category         Category
+	 * @param string $cheque_number    Cheque numero {@from body}
+	 * @param string $cheque_writer    Name of cheque writer {@from body}
+	 * @param string $cheque_bank      Bank of cheque writer {@from body}
+	 * @param string $accountancycode  Accountancy code {@from body}
+     * @param int    $datev            Payment date value (timestamp) {@from body} {@type timestamp}
+     * @param string $num_releve       Bank statement numero {@from body}
 	 * @return int  ID of line
 	 *
 	 * @url POST {id}/lines
 	 */
-	public function addLine($id, $date, $type, $label, $amount, $category = 0, $cheque_number = '', $cheque_writer = '', $cheque_bank = '')
+	public function addLine($id, $date, $type, $label, $amount, $category = 0, $cheque_number = '', $cheque_writer = '', $cheque_bank = '', $accountancycode = '', $datev = null, $num_releve = '')
 	{
 		if (!DolibarrApiAccess::$user->rights->banque->modifier) {
 			throw new RestException(401);
@@ -499,7 +502,8 @@ class BankAccounts extends DolibarrApi
 			$cheque_number,
 			$category,
 			DolibarrApiAccess::$user,
-			$cheque_writer, $cheque_bank
+		    $cheque_writer, $cheque_bank, $accountancycode,
+		    $datev, $num_releve
 		);
 		if ($result < 0) {
 			throw new RestException(503, 'Error when adding line to account: '.$account->error);

From ff25003025626eaa74514c42ff52aea9bc3d22e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 5 Jan 2021 08:59:46 +0100
Subject: [PATCH 805/888] fix unknown variable

---
 .../bank/class/api_bankaccounts.class.php     | 50 +++++++++----------
 1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index 9ab02d8b18a..be37ec23403 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -81,10 +81,8 @@ class BankAccounts extends DolibarrApi
 			$sql .= " AND c.fk_categorie = ".$this->db->escape($category)." AND c.fk_account = t.rowid ";
 		}
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -93,8 +91,7 @@ class BankAccounts extends DolibarrApi
 
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
-			if ($page < 0)
-			{
+			if ($page < 0) {
 				$page = 0;
 			}
 			$offset = $limit * $page;
@@ -222,12 +219,10 @@ class BankAccounts extends DolibarrApi
 			throw new RestException(404, 'The BankAccount for bankaccount_to_id provided does not exist.');
 		}
 
-		if ($accountto->currency_code == $accountfrom->currency_code)
-		{
+		if ($accountto->currency_code == $accountfrom->currency_code) {
 			$amount_to = $amount;
 		} else {
-			if (!$amount_to || empty($amount_to))
-			{
+			if (!$amount_to || empty($amount_to)) {
 				throw new RestException(422, 'You must provide amount_to value since bankaccount_from and bankaccount_to does not share the same currency.');
 			}
 		}
@@ -244,8 +239,7 @@ class BankAccounts extends DolibarrApi
 		$typefrom = 'PRE';
 		$typeto = 'VIR';
 
-		if ($accountto->courant == Account::TYPE_CASH || $accountfrom->courant == Account::TYPE_CASH)
-		{
+		if ($accountto->courant == Account::TYPE_CASH || $accountfrom->courant == Account::TYPE_CASH) {
 			// This is transfer of change
 			$typefrom = 'LIQ';
 			$typeto = 'LIQ';
@@ -291,8 +285,7 @@ class BankAccounts extends DolibarrApi
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 
 			return array(
@@ -327,12 +320,13 @@ class BankAccounts extends DolibarrApi
 		}
 
 		foreach ($request_data as $field => $value) {
-			if ($field == 'id') continue;
+			if ($field == 'id') {
+				continue;
+			}
 			$account->$field = $value;
 		}
 
-		if ($account->update(DolibarrApiAccess::$user) > 0)
-		{
+		if ($account->update(DolibarrApiAccess::$user) > 0) {
 			return $this->get($id);
 		} else {
 			throw new RestException(500, $account->error);
@@ -380,8 +374,9 @@ class BankAccounts extends DolibarrApi
 	{
 		$account = array();
 		foreach (BankAccounts::$FIELDS as $field) {
-			if (!isset($data[$field]))
+			if (!isset($data[$field])) {
 				throw new RestException(400, "$field field missing");
+			}
 			$account[$field] = $data[$field];
 		}
 		return $account;
@@ -433,10 +428,8 @@ class BankAccounts extends DolibarrApi
 		$sql .= " WHERE fk_account = ".$id;
 
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -457,7 +450,7 @@ class BankAccounts extends DolibarrApi
 				}
 			}
 		} else {
-			throw new RestException(503, 'Error when retrieving list of account lines: '.$accountLine->error);
+			throw new RestException(503, 'Error when retrieving list of account lines: '.$this->db->lasterror());
 		}
 
 		return $list;
@@ -476,8 +469,8 @@ class BankAccounts extends DolibarrApi
 	 * @param string $cheque_writer    Name of cheque writer {@from body}
 	 * @param string $cheque_bank      Bank of cheque writer {@from body}
 	 * @param string $accountancycode  Accountancy code {@from body}
-     * @param int    $datev            Payment date value (timestamp) {@from body} {@type timestamp}
-     * @param string $num_releve       Bank statement numero {@from body}
+	 * @param int    $datev            Payment date value (timestamp) {@from body} {@type timestamp}
+	 * @param string $num_releve       Bank statement numero {@from body}
 	 * @return int  ID of line
 	 *
 	 * @url POST {id}/lines
@@ -502,8 +495,11 @@ class BankAccounts extends DolibarrApi
 			$cheque_number,
 			$category,
 			DolibarrApiAccess::$user,
-		    $cheque_writer, $cheque_bank, $accountancycode,
-		    $datev, $num_releve
+			$cheque_writer,
+			$cheque_bank,
+			$accountancycode,
+			$datev,
+			$num_releve
 		);
 		if ($result < 0) {
 			throw new RestException(503, 'Error when adding line to account: '.$account->error);

From f845adf3431cde836d9238bf1ce1c866451d9b7c Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 5 Jan 2021 09:57:35 +0100
Subject: [PATCH 806/888] FIX use GETPOST before

---
 htdocs/admin/accountant.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php
index 3647c10f5ea..8f20ab43c84 100644
--- a/htdocs/admin/accountant.php
+++ b/htdocs/admin/accountant.php
@@ -114,53 +114,53 @@ print '<tr class="liste_titre"><th class="titlefield wordbreak">'.$langs->trans(
 
 // Name
 print '<tr class="oddeven"><td><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
-print '<input name="nom" id="name" class="minwidth200" value="'.(!empty($conf->global->MAIN_INFO_ACCOUNTANT_NAME) ? $conf->global->MAIN_INFO_ACCOUNTANT_NAME : GETPOST("nom", 'nohtml')).'"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"').'></td></tr>'."\n";
+print '<input name="nom" id="name" class="minwidth200" value="'.(GETPOSTISSET('nom') ? GETPOST('nom', 'nohtml') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_NAME) ? $conf->global->MAIN_INFO_ACCOUNTANT_NAME : '')).'"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"').'></td></tr>'."\n";
 
 // Address
 print '<tr class="oddeven"><td><label for="address">'.$langs->trans("CompanyAddress").'</label></td><td>';
-print '<textarea name="address" id="address" class="quatrevingtpercent" rows="'.ROWS_3.'">'.(!empty($conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS) ? $conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS : GETPOST("address", 'nohtml')).'</textarea></td></tr>'."\n";
+print '<textarea name="address" id="address" class="quatrevingtpercent" rows="'.ROWS_3.'">'.(GETPOSTISSET('address') ? GETPOST('address', 'nohtml') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS) ? $conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS : '')).'</textarea></td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="zipcode">'.$langs->trans("CompanyZip").'</label></td><td>';
-print '<input class="minwidth100" name="zipcode" id="zipcode" value="'.(!empty($conf->global->MAIN_INFO_ACCOUNTANT_ZIP) ? $conf->global->MAIN_INFO_ACCOUNTANT_ZIP : GETPOST("zipcode", 'alpha')).'"></td></tr>'."\n";
+print '<input class="minwidth100" name="zipcode" id="zipcode" value="'.(GETPOSTISSET('zipcode') ? GETPOST('zipcode', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_ZIP) ? $conf->global->MAIN_INFO_ACCOUNTANT_ZIP : '')).'"></td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="town">'.$langs->trans("CompanyTown").'</label></td><td>';
-print '<input name="town" class="minwidth100" id="town" value="'.(!empty($conf->global->MAIN_INFO_ACCOUNTANT_TOWN) ? $conf->global->MAIN_INFO_ACCOUNTANT_TOWN : GETPOST("town", 'nohtml')).'"></td></tr>'."\n";
+print '<input name="town" class="minwidth100" id="town" value="'.(GETPOSTISSET('town') ? GETPOST('town', 'nohtml') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_TOWN) ? $conf->global->MAIN_INFO_ACCOUNTANT_TOWN : '')).'"></td></tr>'."\n";
 
 // Country
 print '<tr class="oddeven"><td><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
 print img_picto('', 'globe-americas', 'class="paddingrightonly"');
-print $form->select_country((!empty($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY) ? $conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY : GETPOST('country_id', 'int')), 'country_id');
+print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id', 'int') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY) ? $conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY : '')), 'country_id');
 if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 print '</td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="state_id">'.$langs->trans("State").'</label></td><td class="maxwidthonsmartphone">';
-$formcompany->select_departement((!empty($conf->global->MAIN_INFO_ACCOUNTANT_STATE) ? $conf->global->MAIN_INFO_ACCOUNTANT_STATE : GETPOST('state_id', 'alpha')), (!empty($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY) ? $conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY : GETPOST('country_id', 'int')), 'state_id');
+$formcompany->select_departement((GETPOSTISSET('state_id') ? GETPOST('state_id', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_STATE) ? $conf->global->MAIN_INFO_ACCOUNTANT_STATE : '')), (GETPOSTISSET('country_id') ? GETPOST('country_id', 'int') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY) ? $conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY : '')), 'state_id');
 print '</td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
 print img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright');
-print '<input name="tel" id="phone" value="'.(!empty($conf->global->MAIN_INFO_ACCOUNTANT_PHONE) ? $conf->global->MAIN_INFO_ACCOUNTANT_PHONE : GETPOST('tel', 'alpha')).'"></td></tr>';
+print '<input name="tel" id="phone" value="'.(GETPOSTISSET('tel') ? GETPOST('tel', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_PHONE) ? $conf->global->MAIN_INFO_ACCOUNTANT_PHONE : '')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
 print img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright');
-print '<input name="fax" id="fax" value="'.(!empty($conf->global->MAIN_INFO_ACCOUNTANT_FAX) ? $conf->global->MAIN_INFO_ACCOUNTANT_FAX : GETPOST('fax', 'alpha')).'"></td></tr>';
+print '<input name="fax" id="fax" value="'.(GETPOSTISSET('fax') ? GETPOST('fax', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_FAX) ? $conf->global->MAIN_INFO_ACCOUNTANT_FAX : '')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
 print img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright');
-print '<input name="mail" id="email" class="minwidth200" value="'.(!empty($conf->global->MAIN_INFO_ACCOUNTANT_MAIL) ? $conf->global->MAIN_INFO_ACCOUNTANT_MAIL : GETPOST('mail', 'alpha')).'"></td></tr>';
+print '<input name="mail" id="email" class="minwidth200" value="'.(GETPOSTISSET('mail') ? GETPOST('mail', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_MAIL) ? $conf->global->MAIN_INFO_ACCOUNTANT_MAIL : '')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Web
 print '<tr class="oddeven"><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
 print img_picto('', 'globe', '', false, 0, 0, '', 'paddingright');
-print '<input name="web" id="web" class="minwidth300" value="'.(!empty($conf->global->MAIN_INFO_ACCOUNTANT_WEB) ? $conf->global->MAIN_INFO_ACCOUNTANT_WEB : GETPOST('web', 'alpha')).'"></td></tr>';
+print '<input name="web" id="web" class="minwidth300" value="'.(GETPOSTISSET('web') ? GETPOST('web', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_WEB) ? $conf->global->MAIN_INFO_ACCOUNTANT_WEB : '')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Code
 print '<tr class="oddeven"><td><label for="code">'.$langs->trans("AccountantFileNumber").'</label></td><td>';
-print '<input name="code" id="code" class="minwidth100" value="'.(!empty($conf->global->MAIN_INFO_ACCOUNTANT_CODE) ? $conf->global->MAIN_INFO_ACCOUNTANT_CODE : GETPOST("code", 'nohtml')).'"></td></tr>'."\n";
+print '<input name="code" id="code" class="minwidth100" value="'.(GETPOSTISSET('code') ? GETPOST('code', 'nohtml') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_CODE) ? $conf->global->MAIN_INFO_ACCOUNTANT_CODE : '')).'"></td></tr>'."\n";
 
 // Note
 print '<tr class="oddeven"><td class="tdtop"><label for="note">'.$langs->trans("Note").'</label></td><td>';

From 889d73d8e3a8c5aeabb57754c60bb8b21e91ce93 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 5 Jan 2021 10:16:24 +0100
Subject: [PATCH 807/888] FIX avoid php8 warning

---
 htdocs/admin/company.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index fd3f7505778..2801951974e 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -393,18 +393,18 @@ print '<tr class="liste_titre"><th class="titlefield wordbreak">'.$langs->trans(
 
 // Name
 print '<tr class="oddeven"><td class="fieldrequired wordbreak"><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
-print '<input name="nom" id="name" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? $conf->global->MAIN_INFO_SOCIETE_NOM : GETPOST("nom", 'nohtml')).'"'.(empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? ' autofocus="autofocus"' : '').'></td></tr>'."\n";
+print '<input name="nom" id="name" class="minwidth200" value="'.dol_escape_htmltag((GETPOSTISSET('nom') ? GETPOST('nom', 'nohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? $conf->global->MAIN_INFO_SOCIETE_NOM : '')).'"'.(empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? ' autofocus="autofocus"' : '').'></td></tr>'."\n";
 
 // Address
 print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_ADDRESS">'.$langs->trans("CompanyAddress").'</label></td><td>';
-print '<textarea name="MAIN_INFO_SOCIETE_ADDRESS" id="MAIN_INFO_SOCIETE_ADDRESS" class="quatrevingtpercent" rows="'.ROWS_3.'">'.(!empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS) ? $conf->global->MAIN_INFO_SOCIETE_ADDRESS : GETPOST("MAIN_INFO_SOCIETE_ADDRESS", 'nohtml')).'</textarea></td></tr>'."\n";
+print '<textarea name="MAIN_INFO_SOCIETE_ADDRESS" id="MAIN_INFO_SOCIETE_ADDRESS" class="quatrevingtpercent" rows="'.ROWS_3.'">'.(GETPOSTISSET('MAIN_INFO_SOCIETE_ADDRESS') ? GETPOST('MAIN_INFO_SOCIETE_ADDRESS', 'nohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS) ? $conf->global->MAIN_INFO_SOCIETE_ADDRESS : '')).'</textarea></td></tr>'."\n";
 
 // Zip
 print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_ZIP">'.$langs->trans("CompanyZip").'</label></td><td>';
-print '<input class="width100" name="MAIN_INFO_SOCIETE_ZIP" id="MAIN_INFO_SOCIETE_ZIP" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SOCIETE_ZIP) ? $conf->global->MAIN_INFO_SOCIETE_ZIP : GETPOST("MAIN_INFO_SOCIETE_ZIP", 'alpha')).'"></td></tr>'."\n";
+print '<input class="width100" name="MAIN_INFO_SOCIETE_ZIP" id="MAIN_INFO_SOCIETE_ZIP" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_INFO_SOCIETE_ZIP') ? GETPOST('MAIN_INFO_SOCIETE_ZIP', 'alpha') : (!empty($conf->global->MAIN_INFO_SOCIETE_ZIP) ? $conf->global->MAIN_INFO_SOCIETE_ZIP : '')).'"></td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_TOWN">'.$langs->trans("CompanyTown").'</label></td><td>';
-print '<input name="MAIN_INFO_SOCIETE_TOWN" class="minwidth200" id="MAIN_INFO_SOCIETE_TOWN" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SOCIETE_TOWN) ? $conf->global->MAIN_INFO_SOCIETE_TOWN : GETPOST("MAIN_INFO_SOCIETE_TOWN", 'nohtml')).'"></td></tr>'."\n";
+print '<input name="MAIN_INFO_SOCIETE_TOWN" class="minwidth200" id="MAIN_INFO_SOCIETE_TOWN" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_INFO_SOCIETE_TOWN') ? GETPOST('MAIN_INFO_SOCIETE_TOWN', 'nohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_TOWN) ? $conf->global->MAIN_INFO_SOCIETE_TOWN : '')).'"></td></tr>'."\n";
 
 // Country
 print '<tr class="oddeven"><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
@@ -431,25 +431,25 @@ print '</td></tr>'."\n";
 // Phone
 print '<tr class="oddeven"><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
 print img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright');
-print '<input name="tel" id="phone" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SOCIETE_TEL) ? $conf->global->MAIN_INFO_SOCIETE_TEL : GETPOST("MAIN_INFO_SOCIETE_TEL", 'alphanohtml')).'"></td></tr>';
+print '<input name="tel" id="phone" value="'.dol_escape_htmltag((GETPOSTISSET('tel') ? GETPOST('tel', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_TEL) ? $conf->global->MAIN_INFO_SOCIETE_TEL : '')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Fax
 print '<tr class="oddeven"><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
 print img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright');
-print '<input name="fax" id="fax" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SOCIETE_FAX) ? $conf->global->MAIN_INFO_SOCIETE_FAX : GETPOST("MAIN_INFO_SOCIETE_FAX", 'alphanohtml')).'"></td></tr>';
+print '<input name="fax" id="fax" value="'.dol_escape_htmltag((GETPOSTISSET('fax') ? GETPOST('fax', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_FAX) ? $conf->global->MAIN_INFO_SOCIETE_FAX : '')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Email
 print '<tr class="oddeven"><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
 print img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright');
-print '<input name="mail" id="email" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SOCIETE_MAIL) ? $conf->global->MAIN_INFO_SOCIETE_MAIL : GETPOST("MAIN_INFO_SOCIETE_MAIL", 'alphanohtml')).'"></td></tr>';
+print '<input name="mail" id="email" class="minwidth200" value="'.dol_escape_htmltag((GETPOSTISSET('mail') ? GETPOST('mail', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL) ? $conf->global->MAIN_INFO_SOCIETE_MAIL : '')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Web
 print '<tr class="oddeven"><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
 print img_picto('', 'globe', '', false, 0, 0, '', 'paddingright');
-print '<input name="web" id="web" class="minwidth300" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SOCIETE_WEB) ? $conf->global->MAIN_INFO_SOCIETE_WEB : GETPOST("MAIN_INFO_SOCIETE_WEB", 'alphanohtml')).'"></td></tr>';
+print '<input name="web" id="web" class="minwidth300" value="'.dol_escape_htmltag((GETPOSTISSET('web') ? GETPOST('web', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_WEB) ? $conf->global->MAIN_INFO_SOCIETE_WEB : '')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Barcode
@@ -457,7 +457,7 @@ if (!empty($conf->barcode->enabled)) {
 	print '<tr class="oddeven"><td>';
 	print '<label for="barcode">'.$langs->trans("Gencod").'</label></td><td>';
 	print '<span class="fa paddingright fa-barcode"></span>';
-	print '<input name="barcode" id="barcode" class="minwidth150" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SOCIETE_GENCOD) ? $conf->global->MAIN_INFO_SOCIETE_GENCOD : GETPOST("MAIN_INFO_SOCIETE_GENCOD", 'alphanohtml')).'"></td></tr>';
+	print '<input name="barcode" id="barcode" class="minwidth150" value="'.dol_escape_htmltag((GETPOSTISSET('barcode') ? GETPOST('barcode', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_GENCODE) ? $conf->global->MAIN_INFO_SOCIETE_GENCODE : '')).'"></td></tr>';
 	print '</td></tr>';
 }
 
@@ -549,7 +549,7 @@ $langs->load("companies");
 
 // Managing Director(s)
 print '<tr class="oddeven"><td><label for="director">'.$langs->trans("ManagingDirectors").'</label></td><td>';
-print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="directors" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SOCIETE_MANAGERS) ? $conf->global->MAIN_INFO_SOCIETE_MANAGERS : GETPOST("MAIN_INFO_SOCIETE_MANAGERS", 'nohtml')).'"></td></tr>';
+print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="directors" class="minwidth200" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_INFO_SOCIETE_MANAGERS') ? GETPOST('MAIN_INFO_SOCIETE_MANAGERS', 'nohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_MANAGERS) ? $conf->global->MAIN_INFO_SOCIETE_MANAGERS : '')).'"></td></tr>';
 
 // GDPR contact
 print '<tr class="oddeven"><td>';
@@ -559,7 +559,7 @@ print '<input name="MAIN_INFO_GDPR" id="infodirector" class="minwidth500" value=
 
 // Capital
 print '<tr class="oddeven"><td><label for="capital">'.$langs->trans("Capital").'</label></td><td>';
-print '<input name="capital" id="capital" class="maxwidth100" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_CAPITAL) ? $conf->global->MAIN_INFO_CAPITAL : GETPOST("MAIN_INFO_CAPITAL", 'nohtml')).'"></td></tr>';
+print '<input name="capital" id="capital" class="maxwidth100" value="'.dol_escape_htmltag((GETPOSTISSET('capital') ? GETPOST('capital', 'nohtml') : (!empty($conf->global->MAIN_INFO_CAPITAL) ? $conf->global->MAIN_INFO_CAPITAL : '')).'"></td></tr>';
 
 // Juridical Status
 print '<tr class="oddeven"><td><label for="forme_juridique_code">'.$langs->trans("JuridicalStatus").'</label></td><td>';

From 40645ea24da8006409cad9246280d42b9a05b653 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 Jan 2021 10:39:53 +0100
Subject: [PATCH 808/888] Fix load lang

---
 htdocs/core/boxes/box_fournisseurs.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index 44e2682585e..7d1c72b3036 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -137,10 +137,13 @@ class box_fournisseurs extends ModeleBoxes
 					$line++;
 				}
 
-				if ($num == 0) $this->info_box_contents[$line][0] = array(
-					'td' => 'class="center opacitymedium"',
-					'text'=>$langs->trans("NoRecordedSuppliers"),
-				);
+				if ($num == 0) {
+					$langs->load("suppliers");
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center opacitymedium"',
+						'text'=>$langs->trans("NoRecordedSuppliers"),
+					);
+				}
 
 				$this->db->free($result);
 			} else {

From 5e92ed0dcdcc6d1002015e6acedf38ff6ea1a627 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 Jan 2021 10:44:28 +0100
Subject: [PATCH 809/888] Fix load lang

---
 htdocs/commande/list.php       | 2 +-
 htdocs/expedition/list.php     | 2 +-
 htdocs/fourn/commande/list.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 5fa4a3adfaa..885081e84a1 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -46,7 +46,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("orders", 'sendings', 'deliveries', 'companies', 'compta', 'bills', 'stocks'));
+$langs->loadLangs(array("orders", 'sendings', 'deliveries', 'companies', 'compta', 'bills', 'stocks', 'products'));
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 4494db8c21d..28c0673ef17 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("sendings", "deliveries", 'companies', 'bills'));
+$langs->loadLangs(array("sendings", "deliveries", 'companies', 'bills', 'products'));
 
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'shipmentlist'; // To manage different context of search
 
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index e680e55868a..2b77801fee3 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -43,7 +43,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-$langs->loadLangs(array("orders", "sendings", 'deliveries', 'companies', 'compta', 'bills', 'projects', 'suppliers'));
+$langs->loadLangs(array("orders", "sendings", 'deliveries', 'companies', 'compta', 'bills', 'projects', 'suppliers', 'products'));
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');

From 2e04aa4e0352a86901c28f969ce297d5ce6daacf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 Jan 2021 11:29:40 +0100
Subject: [PATCH 810/888] Fix warning

---
 scripts/invoices/email_unpaid_invoices_to_customers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/invoices/email_unpaid_invoices_to_customers.php b/scripts/invoices/email_unpaid_invoices_to_customers.php
index a569a34d0fa..5d4d3ff3e64 100755
--- a/scripts/invoices/email_unpaid_invoices_to_customers.php
+++ b/scripts/invoices/email_unpaid_invoices_to_customers.php
@@ -153,7 +153,7 @@ if ($resql) {
 				if ($targettype == 'contacts') {
 					$oldcid = $obj->cid;
 				}
-				$oldlang = $obj->lang;
+				$oldlang = $obj->default_lang;
 				$oldtarget = (empty($obj->cfirstname) && empty($obj->clastname)) ? $obj->name : ($obj->clastname." ".$obj->cfirstname);
 				$message = '';
 				$total = 0;

From 4b45c5e72365aa61eab5ab4487fd0df2d5f25bac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 Jan 2021 12:29:13 +0100
Subject: [PATCH 811/888] Trans

---
 htdocs/core/lib/project.lib.php  | 8 +++++---
 htdocs/langs/en_US/projects.lang | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 74e624ca7cb..3c8a79a9249 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -2526,13 +2526,15 @@ function getTaskProgressBadge($task, $label = '', $tooltip = '')
 
 			if (doubleval($progressCalculated) > doubleval($task->progress * $warningRatio)) {
 				$badgeClass .= 'badge-danger';
-				if (empty($tooltip)) $tooltip = $task->progress.'% < '.$langs->trans("Expected").' '.$progressCalculated.'%';
+				if (empty($tooltip)) {
+					$tooltip = $task->progress.'% < '.$langs->trans("TimeConsumed").' '.$progressCalculated.'%';
+				}
 			} elseif (doubleval($progressCalculated) > doubleval($task->progress)) { // warning if close at 10%
 				$badgeClass .= 'badge-warning';
-				if (empty($tooltip)) $tooltip = $task->progress.'% < '.$langs->trans("Expected").' '.$progressCalculated.'%';
+				if (empty($tooltip)) $tooltip = $task->progress.'% < '.$langs->trans("TimeConsumed").' '.$progressCalculated.'%';
 			} else {
 				$badgeClass .= 'badge-success';
-				if (empty($tooltip)) $tooltip = $task->progress.'% >= '.$langs->trans("Expected").' '.$progressCalculated.'%';
+				if (empty($tooltip)) $tooltip = $task->progress.'% >= '.$langs->trans("TimeConsumed").' '.$progressCalculated.'%';
 			}
 		}
 	}
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index f5f6bf3dd9d..2aedbd53377 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -85,6 +85,7 @@ ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Time
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View

From 8dc4e5929c694cf712aa4a0b215081d2b17464a0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 Jan 2021 12:43:57 +0100
Subject: [PATCH 812/888] Fix var not defined

---
 htdocs/comm/action/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index b37762a644a..dc0ada64eb3 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -214,6 +214,7 @@ llxHeader('', $langs->trans("Agenda"), $help_url);
 $form = new Form($db);
 $companystatic = new Societe($db);
 $contactstatic = new Contact($db);
+$userstatic = new User($db);
 
 $now = dol_now();
 $nowarray = dol_getdate($now);
@@ -1071,7 +1072,6 @@ if (count($listofextcals))
 				{
 					$event->id = $icalevent['UID'];
 					$event->ref = $event->id;
-
 					$userId = $userstatic->findUserIdByEmail($namecal);
 					if (!empty($userId) && $userId > 0)
 					{

From 9764f086d30c5cd29292ffe5a8ae3c16a56bedd4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 Jan 2021 14:27:42 +0100
Subject: [PATCH 813/888] Fix Field code is mandatory but not field note in tax
 dictionary

---
 htdocs/admin/dict.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index d06f8a2ce31..05149030f9e 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -692,7 +692,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
 		if ($value == 'sortorder') continue; // For a column name 'sortorder', we use the field name 'position'
 		if ((!GETPOSTISSET($value) || GETPOST($value) == '')
 			&& (!in_array($listfield[$f], array('decalage', 'module', 'accountancy_code', 'accountancy_code_sell', 'accountancy_code_buy', 'tracking', 'picto'))  // Fields that are not mandatory
-			&& (!($id == 10 && $listfield[$f] == 'code')) // Code is mandatory fir table 10
+			&& ($id != 10 || ($listfield[$f] != 'code' && $listfield[$f] != 'note')) // Field code and note is not mandatory for dictionary table 10
 			)
 		) {
 			$ok = 0;
@@ -757,9 +757,9 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
 	if ($_POST["accountancy_code"] <= 0) $_POST["accountancy_code"] = ''; // If empty, we force to null
 	if ($_POST["accountancy_code_sell"] <= 0) $_POST["accountancy_code_sell"] = ''; // If empty, we force to null
 	if ($_POST["accountancy_code_buy"] <= 0) $_POST["accountancy_code_buy"] = ''; // If empty, we force to null
-	if ($id == 10 && GETPOSTISSET("code"))  // Spaces are not allowed into code
+	if ($id == 10 && GETPOSTISSET("code"))  // Spaces are not allowed into code for tax dictionary
 	{
-		$_POST["code"] = preg_replace('/\s/', '', $_POST["code"]);
+		$_POST["code"] = preg_replace('/[^a-zA-Z0-9\-\+]/', '', $_POST["code"]);
 	}
 
 	// If check ok and action add, add the line
@@ -826,8 +826,13 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
 		$result = $db->query($sql);
 		if ($result)	// Add is ok
 		{
-			setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
-			$_POST = array('id'=>$id); // Clean $_POST array, we keep only
+			setEventMessages($langs->transnoentities("RecordCreatedSuccessfully"), null, 'mesgs');
+
+			// Clean $_POST array, we keep only id of dictionary
+			if ($id == 10 && GETPOST('country', 'int') > 0) {
+				$search_country_id = GETPOST('country', 'int');
+			}
+			$_POST = array('id'=>$id);
 		} else {
 			if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 				setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');

From ca6899c1386201c479fea276f44364e08d9e2d3b Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Tue, 5 Jan 2021 16:11:46 +0100
Subject: [PATCH 814/888] FIX right to show VAT rate in product list

---
 htdocs/product/list.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index cc12bc73349..2478e75057c 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -180,7 +180,7 @@ $arrayfields = array(
     'p.sellprice'=>array('label'=>$langs->trans("SellingPrice"), 'checked'=>1, 'enabled'=>empty($conf->global->PRODUIT_MULTIPRICES)),
 	'p.minbuyprice'=>array('label'=>$langs->trans("BuyingPriceMinShort"), 'checked'=>1, 'enabled'=>(!empty($user->rights->fournisseur->lire))),
 	'p.numbuyprice'=>array('label'=>$langs->trans("BuyingPriceNumShort"), 'checked'=>0, 'enabled'=>(!empty($user->rights->fournisseur->lire))),
-    'p.tva_tx'=>array('label'=>$langs->trans("VATRate"), 'checked'=>0, 'enabled'=>(!empty($user->rights->fournisseur->lire))),
+    'p.tva_tx'=>array('label'=>$langs->trans("VATRate"), 'checked'=>0, 'enabled'=>empty($conf->global->PRODUIT_MULTIPRICES)),
     'p.pmp'=>array('label'=>$langs->trans("PMPValueShort"), 'checked'=>0, 'enabled'=>(!empty($user->rights->fournisseur->lire))),
 	'p.seuil_stock_alerte'=>array('label'=>$langs->trans("StockLimit"), 'checked'=>0, 'enabled'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service')),
 	'p.desiredstock'=>array('label'=>$langs->trans("DesiredStock"), 'checked'=>1, 'enabled'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service')),
@@ -332,7 +332,7 @@ if ($search_label)   $sql .= natural_search('p.label', $search_label);
 if ($search_barcode) $sql .= natural_search('p.barcode', $search_barcode);
 if (isset($search_tosell) && dol_strlen($search_tosell) > 0 && $search_tosell != -1) $sql .= " AND p.tosell = ".$db->escape($search_tosell);
 if (isset($search_tobuy) && dol_strlen($search_tobuy) > 0 && $search_tobuy != -1)   $sql .= " AND p.tobuy = ".$db->escape($search_tobuy);
-if ($search_vatrate) $sql .= natural_search('p.tva_tx', $search_vatrate);
+if ($search_vatrate) $sql .= natural_search('p.tva_tx', $search_vatrate, 1);
 if (dol_strlen($canvas) > 0)                    $sql .= " AND p.canvas = '".$db->escape($canvas)."'";
 if ($catid > 0)     $sql .= " AND cp.fk_categorie = ".$catid;
 if ($catid == -2)   $sql .= " AND cp.fk_categorie IS NULL";
@@ -774,7 +774,7 @@ if ($resql)
         print_liste_field_titre($arrayfields['p.numbuyprice']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
     }
     if (!empty($arrayfields['p.tva_tx']['checked'])) {
-        print_liste_field_titre($arrayfields['p.tva_tx']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
+        print_liste_field_titre($arrayfields['p.tva_tx']['label'], $_SERVER["PHP_SELF"], 'p.tva_tx', "", $param, '', $sortfield, $sortorder, 'right ');
     }
     if (!empty($arrayfields['p.pmp']['checked'])) {
         print_liste_field_titre($arrayfields['p.pmp']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');

From 27b462782516fa65d5d89f093845f92ac5edc278 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 5 Jan 2021 17:41:24 +0100
Subject: [PATCH 815/888] Update ChangeLog

some minor changings
add info #15180
sorting
add info #14725
---
 ChangeLog | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ecf20be261f..8b9edc38f2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,7 +16,7 @@ NEW: Accountancy - add options to disable binding on sales, purchases & expense
 NEW: Accountancy balance - add a menu entry to show subtotal by group
 NEW: Accountancy - change menu disposition
 NEW: Accountancy - on transfers, select the periodicity by default
-NEW: Accountancy - Add export for Gestinum (v3 & v5)
+NEW: Accountancy - Add export for Gestinum (v3 & v5) #15180
 NEW: new currency rate editor
 NEW: Solve blocking feature. Can increase stock of a Kit without changing subproduct stock.
 NEW: add a widget to show the customers with outstanding limits reached
@@ -162,7 +162,7 @@ NEW: Support for Samba4 AD
 NEW: TakePOS connector compatibility with RECEIPT PRINTERS module
 NEW: TakePOS Gift Receipt
 NEW: TakePOS Multicurrency compatibility
-NEW: the global header of a website can also have dynamic content
+NEW: TakePOS Weighing Scale compatibility with TakePOS connector #14725
 NEW: Third-Party Import new fields: mother company,outstanding debt limit,bank account,incoterms
 NEW: Thirdparty module : box on customer/supplier tab for invoice outsantding amount late
 NEW: ticket classification on create from email collector
@@ -172,11 +172,11 @@ NEW: VAT rate for Angola #15606
 NEW: VAT and juridical status for Algeria
 NEW: VAT report - Invert constant to show by default zero VAT in reports
 NEW: website page fields selection
-NEW: Weighing Scale compatibility with TakePOS connector
+NEW: website - global header of a website can also have dynamic content
 NEW: when creating a user from a member linked to a thirdparty, you can choose to create it as external or internal user
-NEW: add clone button on miscellaneous payment
-NEW: #15065 Add option to put the product label in bold in the PDF templates if configured
-NEW: Add option "If the feature to manage kits of module Stock is used, show details of subproducts of a kit on PDF."
+NEW: add clone button on miscellaneous payment 
+NEW: add option to put the product label in bold in the PDF templates if configured #15065 
+NEW: add option "If the feature to manage kits of module Stock is used, show details of subproducts of a kit on PDF."
 
 
 For developers:

From 19b8123ddfdffd28eaa1abf28563f3cba18f2785 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 5 Jan 2021 18:09:59 +0100
Subject: [PATCH 816/888] Update check.php

$arrayphpminversionwarning = array(5, 6, 0);
---
 htdocs/install/check.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index eacc58e6620..daab7a7296a 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -77,7 +77,7 @@ if (!empty($useragent))
 
 // Check PHP version
 $arrayphpminversionerror = array(5, 5, 0);
-$arrayphpminversionwarning = array(5, 5, 0);
+$arrayphpminversionwarning = array(5, 6, 0);
 if (versioncompare(versionphparray(), $arrayphpminversionerror) < 0)        // Minimum to use (error if lower)
 {
 	print '<img src="../theme/eldy/img/error.png" alt="Error"> '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionerror));
@@ -105,7 +105,7 @@ if (!isset($_GET["testget"]) && !isset($_POST["testpost"]))	// We must keep $_GE
 }
 
 
-// Check if sessions enabled
+// Check if session_id is enabled
 if (!function_exists("session_id"))
 {
 	print '<img src="../theme/eldy/img/error.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportSessions")."<br>\n";
@@ -115,7 +115,7 @@ if (!function_exists("session_id"))
 }
 
 
-// Check if GD supported (we need GD for image conversion)
+// Check if GD is supported (we need GD for image conversion)
 if (!function_exists("imagecreate"))
 {
 	$langs->load("errors");
@@ -126,7 +126,7 @@ if (!function_exists("imagecreate"))
 }
 
 
-// Check if Curl supported
+// Check if Curl is supported
 if (!function_exists("curl_init"))
 {
 	$langs->load("errors");
@@ -145,7 +145,7 @@ if (!function_exists("easter_date"))
 }
 
 
-// Check if UTF8 supported
+// Check if UTF8 is supported
 if (!function_exists("utf8_encode"))
 {
 	$langs->load("errors");
@@ -201,7 +201,7 @@ if ($memmaxorig != '')
 }
 
 
-// If config file present and filled
+// If that config file is present and filled
 clearstatcache();
 if (is_readable($conffile) && filesize($conffile) > 8)
 {

From a370ba1bbc57d234c52cd8a9282e70ed75e94e65 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 5 Jan 2021 18:09:59 +0100
Subject: [PATCH 817/888] Update check.php

$arrayphpminversionwarning = array(5, 6, 0);
---
 htdocs/install/check.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 93b99680b92..06e9e5147e9 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -77,7 +77,7 @@ if (!empty($useragent))
 
 // Check PHP version
 $arrayphpminversionerror = array(5, 5, 0);
-$arrayphpminversionwarning = array(5, 5, 0);
+$arrayphpminversionwarning = array(5, 6, 0);
 if (versioncompare(versionphparray(), $arrayphpminversionerror) < 0)        // Minimum to use (error if lower)
 {
 	print '<img src="../theme/eldy/img/error.png" alt="Error"> '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionerror));
@@ -105,7 +105,7 @@ if (!isset($_GET["testget"]) && !isset($_POST["testpost"]))	// We must keep $_GE
 }
 
 
-// Check if sessions enabled
+// Check if session_id is enabled
 if (!function_exists("session_id"))
 {
 	print '<img src="../theme/eldy/img/error.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportSessions")."<br>\n";
@@ -115,7 +115,7 @@ if (!function_exists("session_id"))
 }
 
 
-// Check if GD supported (we need GD for image conversion)
+// Check if GD is supported (we need GD for image conversion)
 if (!function_exists("imagecreate"))
 {
 	$langs->load("errors");
@@ -126,7 +126,7 @@ if (!function_exists("imagecreate"))
 }
 
 
-// Check if Curl supported
+// Check if Curl is supported
 if (!function_exists("curl_init"))
 {
 	$langs->load("errors");
@@ -145,7 +145,7 @@ if (!function_exists("easter_date"))
 }
 
 
-// Check if UTF8 supported
+// Check if UTF8 is supported
 if (!function_exists("utf8_encode"))
 {
 	$langs->load("errors");
@@ -201,7 +201,7 @@ if ($memmaxorig != '')
 }
 
 
-// If config file present and filled
+// If that config file is present and filled
 clearstatcache();
 if (is_readable($conffile) && filesize($conffile) > 8)
 {

From 346bddf32f44fbb4e334ecb6c31f028340e75600 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 5 Jan 2021 17:41:24 +0100
Subject: [PATCH 818/888] Update ChangeLog

some minor changings
add info #15180
sorting
add info #14725
---
 ChangeLog | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8b3b3c97157..322372ab8a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,7 +16,7 @@ NEW: Accountancy - add options to disable binding on sales, purchases & expense
 NEW: Accountancy balance - add a menu entry to show subtotal by group
 NEW: Accountancy - change menu disposition
 NEW: Accountancy - on transfers, select the periodicity by default
-NEW: Accountancy - Add export for Gestinum (v3 & v5)
+NEW: Accountancy - Add export for Gestinum (v3 & v5) #15180
 NEW: new currency rate editor
 NEW: Solve blocking feature. Can increase stock of a Kit without changing subproduct stock.
 NEW: add a widget to show the customers with outstanding limits reached
@@ -163,7 +163,7 @@ NEW: Support for Samba4 AD
 NEW: TakePOS connector compatibility with RECEIPT PRINTERS module
 NEW: TakePOS Gift Receipt
 NEW: TakePOS Multicurrency compatibility
-NEW: the global header of a website can also have dynamic content
+NEW: TakePOS Weighing Scale compatibility with TakePOS connector #14725
 NEW: Third-Party Import new fields: mother company,outstanding debt limit,bank account,incoterms
 NEW: Thirdparty module : box on customer/supplier tab for invoice outsantding amount late
 NEW: ticket classification on create from email collector
@@ -173,11 +173,11 @@ NEW: VAT rate for Angola #15606
 NEW: VAT and juridical status for Algeria
 NEW: VAT report - Invert constant to show by default zero VAT in reports
 NEW: website page fields selection
-NEW: Weighing Scale compatibility with TakePOS connector
+NEW: website - global header of a website can also have dynamic content
 NEW: when creating a user from a member linked to a thirdparty, you can choose to create it as external or internal user
-NEW: add clone button on miscellaneous payment
-NEW: #15065 Add option to put the product label in bold in the PDF templates if configured
-NEW: Add option "If the feature to manage kits of module Stock is used, show details of subproducts of a kit on PDF."
+NEW: add clone button on miscellaneous payment 
+NEW: add option to put the product label in bold in the PDF templates if configured #15065 
+NEW: add option "If the feature to manage kits of module Stock is used, show details of subproducts of a kit on PDF."
 
 
 For developers:

From 76d46652b73bf00c0b968364d09ae30832e8ac84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 5 Jan 2021 20:17:26 +0100
Subject: [PATCH 819/888] doxygen

---
 .../thirdparty_lettering_customer.php         | 78 ++++++++++---------
 .../thirdparty_lettering_supplier.php         | 73 ++++++++---------
 2 files changed, 77 insertions(+), 74 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
index e831e21f814..2d90c9a7b14 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2013      Olivier Geffroy      <jeff@jeffinfo.com>
  * Copyright (C) 2013      Florian Henry	    <florian.henry@open-concept.pro>
  * Copyright (C) 2013-2019 Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2018-2019 Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020 Frédéric 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
@@ -37,14 +37,17 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "accountancy"));
 
-$action     = GETPOST('action', 'aZ09');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
-$confirm    = GETPOST('confirm', 'alpha');
-$toselect   = GETPOST('toselect', 'array');
-$socid      = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
+$confirm = GETPOST('confirm', 'alpha');
+$toselect = GETPOST('toselect', 'array');
+// $socid = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
+// Security check
+$socid = GETPOSTINT("socid");
+// if ($user->socid) $socid=$user->socid;
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTISSET('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -54,10 +57,12 @@ if (empty($page) || $page == - 1) {
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if ($sortorder == "")
+if ($sortorder == "") {
 	$sortorder = "ASC";
-if ($sortfield == "")
+}
+if ($sortfield == "") {
 	$sortfield = "bk.doc_date";
+}
 
 /*
 $search_date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
@@ -74,23 +79,18 @@ if (!empty($lettering)) {
 /*
 if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
 {
-    $search_date_start = '';
-    $search_date_end = '';
+	$search_date_start = '';
+	$search_date_end = '';
 	//$search_doc_type = '';
 	$search_doc_ref = '';
 }
 */
 
-// Security check
-$socid = GETPOST("socid", 'int');
-// if ($user->socid) $socid=$user->socid;
-
 $lettering = new Lettering($db);
 $object = new Societe($db);
 $object->id = $socid;
 $result = $object->fetch($socid);
-if ($result < 0)
-{
+if ($result < 0) {
 	setEventMessages($object->error, $object->errors, 'errors');
 }
 
@@ -208,30 +208,30 @@ if ($resql) {
 	print '<table class="liste centpercent">'."\n";
 
 	/*
-    print '<tr class="liste_titre">';
-    //print '<td><input type="text" name="search_doc_type" value="' . $search_doc_type . '"></td>';
+	print '<tr class="liste_titre">';
+	//print '<td><input type="text" name="search_doc_type" value="' . $search_doc_type . '"></td>';
 
-    // Date
-    print '<td class="liste_titre center">';
-    print '<div class="nowrap">';
-    print $langs->trans('From') . ' ';
-    print $form->selectDate($search_date_start, 'date_creation_start', 0, 0, 1);
-    print '</div>';
-    print '<div class="nowrap">';
-    print $langs->trans('to') . ' ';
-    print $form->selectDate($search_date_end, 'date_creation_end', 0, 0, 1);
-    print '</div>';
-    print '</td>';
+	// Date
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $langs->trans('From') . ' ';
+	print $form->selectDate($search_date_start, 'date_creation_start', 0, 0, 1);
+	print '</div>';
+	print '<div class="nowrap">';
+	print $langs->trans('to') . ' ';
+	print $form->selectDate($search_date_end, 'date_creation_end', 0, 0, 1);
+	print '</div>';
+	print '</td>';
 
-    // Piece
-    print '<td><input type="text" name="search_doc_ref" value="' . $search_doc_ref . '"></td>';
+	// Piece
+	print '<td><input type="text" name="search_doc_ref" value="' . $search_doc_ref . '"></td>';
 
-    print '<td colspan="6">&nbsp;</td>';
-    print '<td class="right">';
-    $searchpicto = $form->showFilterButtons();
-    print $searchpicto;
-    print '</td>';
-    print '</tr>';
+	print '<td colspan="6">&nbsp;</td>';
+	print '<td class="right">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+	print '</tr>';
 	*/
 
 	print '<tr class="liste_titre">';
@@ -251,7 +251,9 @@ if ($resql) {
 	$tmp = '';
 
 	while ($obj = $db->fetch_object($resql)) {
-		if ($tmp != $obj->lettering_code || empty($tmp))						$tmp = $obj->lettering_code;
+		if ($tmp != $obj->lettering_code || empty($tmp)) {
+			$tmp = $obj->lettering_code;
+		}
 		/*if ($tmp != $obj->lettering_code || empty($obj->lettering_code))*/	$solde += ($obj->credit - $obj->debit);
 
 		print '<tr class="oddeven">';
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
index b5620f3ec25..31acb9f0191 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
@@ -41,7 +41,11 @@ $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm    = GETPOST('confirm', 'alpha');
 $toselect   = GETPOST('toselect', 'array');
-$socid      = GETPOST('socid', 'int') ? ((int) GETPOST('socid', 'int')) : ((int) GETPOST('id', 'int'));
+// $socid = GETPOST('socid', 'int') ? ((int) GETPOST('socid', 'int')) : ((int) GETPOST('id', 'int'));
+// Security check
+$socid = GETPOSTINT("socid");
+// if ($user->socid) $socid=$user->socid;
+
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
@@ -53,10 +57,12 @@ if (empty($page) || $page == - 1) {
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if ($sortorder == "")
+if ($sortorder == "") {
 	$sortorder = "ASC";
-if ($sortfield == "")
+}
+if ($sortfield == "") {
 	$sortfield = "bk.doc_date";
+}
 
 /*
 $search_date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
@@ -73,24 +79,18 @@ if (!empty($lettering)) {
 /*
 if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
 {
-    $search_date_start = '';
-    $search_date_end = '';
+	$search_date_start = '';
+	$search_date_end = '';
 	//$search_doc_type='';
 	$search_doc_ref='';
 }
 */
 
-
-// Security check
-$socid = GETPOST("socid", 'int');
-// if ($user->socid) $socid=$user->socid;
-
 $lettering = new Lettering($db);
 $object = new Societe($db);
 $object->id = $socid;
 $result = $object->fetch($socid);
-if ($result < 0)
-{
+if ($result < 0) {
 	setEventMessages($object->error, $object->errors, 'errors');
 }
 
@@ -159,8 +159,7 @@ $solde = 0;
 // Count total nb of records and calc total sum
 $nbtotalofrecords = '';
 $resql = $db->query($sql);
-if (!$resql)
-{
+if (!$resql) {
 	dol_print_error($db);
 	exit;
 }
@@ -206,30 +205,30 @@ if ($resql) {
 	print '<table class="liste centpercent">'."\n";
 
 	/*
-    print '<tr class="liste_titre">';
-    //print '<td><input type="text" name="search_doc_type" value="' . $search_doc_type . '"></td>';
+	print '<tr class="liste_titre">';
+	//print '<td><input type="text" name="search_doc_type" value="' . $search_doc_type . '"></td>';
 
-    // Date
-    print '<td class="liste_titre center">';
-    print '<div class="nowrap">';
-    print $langs->trans('From') . ' ';
-    print $form->selectDate($search_date_start, 'date_creation_start', 0, 0, 1);
-    print '</div>';
-    print '<div class="nowrap">';
-    print $langs->trans('to') . ' ';
-    print $form->selectDate($search_date_end, 'date_creation_end', 0, 0, 1);
-    print '</div>';
-    print '</td>';
+	// Date
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $langs->trans('From') . ' ';
+	print $form->selectDate($search_date_start, 'date_creation_start', 0, 0, 1);
+	print '</div>';
+	print '<div class="nowrap">';
+	print $langs->trans('to') . ' ';
+	print $form->selectDate($search_date_end, 'date_creation_end', 0, 0, 1);
+	print '</div>';
+	print '</td>';
 
-    // Piece
-    print '<td><input type="text" name="search_doc_ref" value="' . $search_doc_ref . '"></td>';
+	// Piece
+	print '<td><input type="text" name="search_doc_ref" value="' . $search_doc_ref . '"></td>';
 
-    print '<td colspan="6">&nbsp;</td>';
-    print '<td class="right">';
-    $searchpicto = $form->showFilterButtons();
-    print $searchpicto;
-    print '</td>';
-    print '</tr>';
+	print '<td colspan="6">&nbsp;</td>';
+	print '<td class="right">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+	print '</tr>';
 	*/
 
 	print '<tr class="liste_titre">';
@@ -248,7 +247,9 @@ if ($resql) {
 	$solde = 0;
 	$tmp = '';
 	while ($obj = $db->fetch_object($resql)) {
-		if ($tmp != $obj->lettering_code || empty($tmp))						$tmp = $obj->lettering_code;
+		if ($tmp != $obj->lettering_code || empty($tmp)) {
+			$tmp = $obj->lettering_code;
+		}
 		/*if ($tmp != $obj->lettering_code || empty($obj->lettering_code))*/	$solde += ($obj->credit - $obj->debit);
 
 		print '<tr class="oddeven">';

From 58a424922227c1e6c3d1dc343b6257b7612fbe31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 5 Jan 2021 20:21:15 +0100
Subject: [PATCH 820/888] clean code

---
 .../bookkeeping/listbysubaccount.php          | 244 +++++++++++-------
 1 file changed, 147 insertions(+), 97 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/listbysubaccount.php b/htdocs/accountancy/bookkeeping/listbysubaccount.php
index e30a9984949..9f5f9d3ca93 100644
--- a/htdocs/accountancy/bookkeeping/listbysubaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbysubaccount.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2013-2016  Olivier Geffroy     <jeff@jeffinfo.com>
  * Copyright (C) 2013-2020  Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2013-2020  Alexandre Spangaro  <aspangaro@open-dsi.fr>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric 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
@@ -39,12 +39,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 $langs->loadLangs(array("accountancy", "compta"));
 
 $action = GETPOST('action', 'aZ09');
-$search_date_startyear =  GETPOST('search_date_startyear', 'int');
-$search_date_startmonth =  GETPOST('search_date_startmonth', 'int');
-$search_date_startday =  GETPOST('search_date_startday', 'int');
-$search_date_endyear =  GETPOST('search_date_endyear', 'int');
-$search_date_endmonth =  GETPOST('search_date_endmonth', 'int');
-$search_date_endday =  GETPOST('search_date_endday', 'int');
+$search_date_startyear = GETPOST('search_date_startyear', 'int');
+$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
+$search_date_startday = GETPOST('search_date_startday', 'int');
+$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
+$search_date_endday = GETPOST('search_date_endday', 'int');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);
 $search_date_end = dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
@@ -73,16 +73,22 @@ if (GETPOST("button_delmvt_x") || GETPOST("button_delmvt.x") || GETPOST("button_
 }
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page < 0) { $page = 0; }
+if (empty($page) || $page < 0) {
+	$page = 0;
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if ($sortorder == "") $sortorder = "ASC";
-if ($sortfield == "") $sortfield = "t.doc_date,t.rowid";
+if ($sortorder == "") {
+	$sortorder = "ASC";
+}
+if ($sortfield == "") {
+	$sortfield = "t.doc_date,t.rowid";
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new BookKeeping($db);
@@ -105,11 +111,12 @@ if (empty($search_date_start) && empty($search_date_end) && !GETPOSTISSET('searc
 	} else {
 		$month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 		$year_start = dol_print_date(dol_now(), '%Y');
-		if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
+		if (dol_print_date(dol_now(), '%m') < $month_start) {
+			$year_start--; // If current month is lower that starting fiscal month, we start last year
+		}
 		$year_end = $year_start + 1;
 		$month_end = $month_start - 1;
-		if ($month_end < 1)
-		{
+		if ($month_end < 1) {
 			$month_end = 12;
 			$year_end--;
 		}
@@ -130,7 +137,9 @@ $arrayfields = array(
 	't.lettering_code'=>array('label'=>$langs->trans("LetteringCode"), 'checked'=>1),
 );
 
-if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) unset($arrayfields['t.lettering_code']);
+if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) {
+	unset($arrayfields['t.lettering_code']);
+}
 
 if ($search_date_start && empty($search_date_startyear)) {
 	$tmparray = dol_getdate($search_date_start);
@@ -149,19 +158,23 @@ if ($search_date_end && empty($search_date_endyear)) {
 /*
  * Action
  */
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $parameters = array('socid'=>$socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 		$search_doc_date = '';
 		$search_accountancy_code = '';
 		$search_accountancy_code_start = '';
@@ -279,8 +292,7 @@ if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouveme
 		$deljournal = 0;
 	}
 
-	if (!empty($delmonth) || !empty($delyear) || !empty($deljournal))
-	{
+	if (!empty($delmonth) || !empty($delyear) || !empty($deljournal)) {
 		$result = $object->deleteByYearAndJournal($delyear, $deljournal, '', ($delmonth > 0 ? $delmonth : 0));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -393,7 +405,9 @@ if ($action == 'delbookkeepingyear') {
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="list">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
@@ -409,8 +423,12 @@ if (empty($reshook)) {
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=create');
 }
 
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
 
 print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -418,11 +436,16 @@ print info_admin($langs->trans("WarningRecordWithoutSubledgerAreExcluded"));
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
-if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+if ($massactionbutton) {
+	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+}
 
 // Reverse sort order
-if (preg_match('/^asc/i', $sortorder)) $sortorder = "asc";
-else $sortorder = "desc";
+if (preg_match('/^asc/i', $sortorder)) {
+	$sortorder = "asc";
+} else {
+	$sortorder = "desc";
+}
 
 $moreforfilter = '';
 
@@ -439,8 +462,11 @@ $moreforfilter .= '</div>';
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
-if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
-else $moreforfilter = $hookmanager->resPrint;
+if (empty($reshook)) {
+	$moreforfilter .= $hookmanager->resPrint;
+} else {
+	$moreforfilter = $hookmanager->resPrint;
+}
 
 print '<div class="liste_titre liste_titre_bydiv centpercent">';
 print $moreforfilter;
@@ -470,8 +496,7 @@ if (!empty($arrayfields['t.doc_date']['checked'])) {
 	print '</td>';
 }
 // Movement number
-if (!empty($arrayfields['t.piece_num']['checked']))
-{
+if (!empty($arrayfields['t.piece_num']['checked'])) {
 	print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="'.dol_escape_htmltag($search_mvt_num).'"></td>';
 }
 // Ref document
@@ -491,8 +516,7 @@ if (!empty($arrayfields['t.credit']['checked'])) {
 	print '<td class="liste_titre right"><input type="text" class="flat" name="search_credit" size="4" value="'.dol_escape_htmltag($search_credit).'"></td>';
 }
 // Lettering code
-if (!empty($arrayfields['t.lettering_code']['checked']))
-{
+if (!empty($arrayfields['t.lettering_code']['checked'])) {
 	print '<td class="liste_titre center">';
 	print '<input type="text" size="3" class="flat" name="search_lettering_code" value="'.$search_lettering_code.'"/>';
 	print '<br><span class="nowrap"><input type="checkbox" name="search_reconciled_option" value="notreconciled"'.($search_not_reconciled == 'notreconciled' ? ' checked' : '').'>'.$langs->trans("NotReconciled").'</span>';
@@ -512,14 +536,30 @@ print '</td>';
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
-if (!empty($arrayfields['t.code_journal']['checked']))			print_liste_field_titre($arrayfields['t.code_journal']['label'], $_SERVER['PHP_SELF'], "t.code_journal", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['t.doc_date']['checked']))				print_liste_field_titre($arrayfields['t.doc_date']['label'], $_SERVER['PHP_SELF'], "t.doc_date", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['t.piece_num']['checked']))				print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['t.doc_ref']['checked']))				print_liste_field_titre($arrayfields['t.doc_ref']['label'], $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
-if (!empty($arrayfields['t.label_operation']['checked']))		print_liste_field_titre($arrayfields['t.label_operation']['label'], $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
-if (!empty($arrayfields['t.debit']['checked']))					print_liste_field_titre($arrayfields['t.debit']['label'], $_SERVER['PHP_SELF'], "t.debit", "", $param, '', $sortfield, $sortorder, 'right ');
-if (!empty($arrayfields['t.credit']['checked']))				print_liste_field_titre($arrayfields['t.credit']['label'], $_SERVER['PHP_SELF'], "t.credit", "", $param, '', $sortfield, $sortorder, 'right ');
-if (!empty($arrayfields['t.lettering_code']['checked']))		print_liste_field_titre($arrayfields['t.lettering_code']['label'], $_SERVER['PHP_SELF'], "t.lettering_code", "", $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['t.code_journal']['checked'])) {
+	print_liste_field_titre($arrayfields['t.code_journal']['label'], $_SERVER['PHP_SELF'], "t.code_journal", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['t.doc_date']['checked'])) {
+	print_liste_field_titre($arrayfields['t.doc_date']['label'], $_SERVER['PHP_SELF'], "t.doc_date", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['t.piece_num']['checked'])) {
+	print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.doc_ref']['checked'])) {
+	print_liste_field_titre($arrayfields['t.doc_ref']['label'], $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.label_operation']['checked'])) {
+	print_liste_field_titre($arrayfields['t.label_operation']['label'], $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.debit']['checked'])) {
+	print_liste_field_titre($arrayfields['t.debit']['label'], $_SERVER['PHP_SELF'], "t.debit", "", $param, '', $sortfield, $sortorder, 'right ');
+}
+if (!empty($arrayfields['t.credit']['checked'])) {
+	print_liste_field_titre($arrayfields['t.credit']['label'], $_SERVER['PHP_SELF'], "t.credit", "", $param, '', $sortfield, $sortorder, 'right ');
+}
+if (!empty($arrayfields['t.lettering_code']['checked'])) {
+	print_liste_field_titre($arrayfields['t.lettering_code']['label'], $_SERVER['PHP_SELF'], "t.lettering_code", "", $param, '', $sortfield, $sortorder, 'center ');
+}
 // Hook fields
 $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
@@ -538,8 +578,7 @@ $displayed_account_number = null; // Start with undefined to be able to distingu
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
-while ($i < min($num, $limit))
-{
+while ($i < min($num, $limit)) {
 	$line = $object->lines[$i];
 
 	$total_debit += $line->debit;
@@ -550,15 +589,15 @@ while ($i < min($num, $limit))
 
 	// Is it a break ?
 	if ($accountg != $displayed_account_number || !isset($displayed_account_number)) {
-        if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
-            $colnumber = 3;
-            $colnumberend = 7;
-        } else {
-            $colnumber = 4;
-            $colnumberend = 7;
-        }
-        $colspan = $totalarray['nbfield'] - $colnumber;
-        $colspanend = $totalarray['nbfield'] - $colnumberend;
+		if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
+			$colnumber = 3;
+			$colnumberend = 7;
+		} else {
+			$colnumber = 4;
+			$colnumberend = 7;
+		}
+		$colspan = $totalarray['nbfield'] - $colnumber;
+		$colspanend = $totalarray['nbfield'] - $colnumberend;
 		// Show a subtotal by accounting account
 		if (isset($displayed_account_number)) {
 			print '<tr class="liste_total">';
@@ -571,8 +610,7 @@ while ($i < min($num, $limit))
 			$balance = $sous_total_debit - $sous_total_credit;
 			print '<tr class="liste_total">';
 			print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
-			if ($balance > 0)
-			{
+			if ($balance > 0) {
 				print '<td class="nowraponall right">';
 				print price($sous_total_debit - $sous_total_credit);
 				print '</td>';
@@ -595,7 +633,9 @@ while ($i < min($num, $limit))
 		} else {
 			// Should not happen: subledger account must be null or a non empty value
 			print '<span class="error">'.$langs->trans("Unknown");
-			if ($line->subledger_label) print ' ('.$line->subledger_label.')';
+			if ($line->subledger_label) {
+				print ' ('.$line->subledger_label.')';
+			}
 			$htmltext = 'EmptyStringForSubledgerAccountButSubledgerLabelDefined';
 			print $form->textwithpicto('', $htmltext);
 			print '</span>';
@@ -614,38 +654,39 @@ while ($i < min($num, $limit))
 	print '<tr class="oddeven">';
 
 	// Journal code
-	if (!empty($arrayfields['t.code_journal']['checked']))
-	{
+	if (!empty($arrayfields['t.code_journal']['checked'])) {
 		$accountingjournal = new AccountingJournal($db);
 		$result = $accountingjournal->fetch('', $line->code_journal);
 		$journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $line->code_journal);
 		print '<td class="center">'.$journaltoshow.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Document date
-	if (!empty($arrayfields['t.doc_date']['checked']))
-	{
+	if (!empty($arrayfields['t.doc_date']['checked'])) {
 		print '<td class="center">'.dol_print_date($line->doc_date, 'day').'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Piece number
-	if (!empty($arrayfields['t.piece_num']['checked']))
-	{
+	if (!empty($arrayfields['t.piece_num']['checked'])) {
 		print '<td>';
 		$object->id = $line->id;
 		$object->piece_num = $line->piece_num;
 		print $object->getNomUrl(1, '', 0, '', 1);
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Document ref
-	if (!empty($arrayfields['t.doc_ref']['checked']))
-	{
-		if ($line->doc_type == 'customer_invoice')
-		{
+	if (!empty($arrayfields['t.doc_ref']['checked'])) {
+		if ($line->doc_type == 'customer_invoice') {
 			$langs->loadLangs(array('bills'));
 
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -657,8 +698,7 @@ while ($i < min($num, $limit))
 			$filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
 			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
 			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-		} elseif ($line->doc_type == 'supplier_invoice')
-		{
+		} elseif ($line->doc_type == 'supplier_invoice') {
 			$langs->loadLangs(array('bills'));
 
 			require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
@@ -670,8 +710,7 @@ while ($i < min($num, $limit))
 			$filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($line->fk_doc, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
 			$subdir = get_exdir($objectstatic->id, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
 			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $subdir, $filedir);
-		} elseif ($line->doc_type == 'expense_report')
-		{
+		} elseif ($line->doc_type == 'expense_report') {
 			$langs->loadLangs(array('trips'));
 
 			require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
@@ -683,8 +722,7 @@ while ($i < min($num, $limit))
 			$filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
 			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
 			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-		} elseif ($line->doc_type == 'bank')
-		{
+		} elseif ($line->doc_type == 'bank') {
 			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 			$objectstatic = new AccountLine($db);
 			$objectstatic->fetch($line->fk_doc);
@@ -698,8 +736,7 @@ while ($i < min($num, $limit))
 		// Picto + Ref
 		print '<td class="nobordernopadding">';
 
-		if ($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice' || $line->doc_type == 'expense_report')
-		{
+		if ($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice' || $line->doc_type == 'expense_report') {
 			print $objectstatic->getNomUrl(1, '', 0, 0, '', 0, -1, 1);
 			print $documentlink;
 		} elseif ($line->doc_type == 'bank') {
@@ -712,7 +749,9 @@ while ($i < min($num, $limit))
 		print '</td></tr></table>';
 
 		print "</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Label operation
@@ -720,31 +759,41 @@ while ($i < min($num, $limit))
 		// Affiche un lien vers la facture client/fournisseur
 		$doc_ref = preg_replace('/\(.*\)/', '', $line->doc_ref);
 		print strlen(length_accounta($line->subledger_account)) == 0 ? '<td>'.$line->label_operation.'</td>' : '<td>'.$line->label_operation.'<br><span style="font-size:0.8em">('.length_accounta($line->subledger_account).')</span></td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Amount debit
-	if (!empty($arrayfields['t.debit']['checked']))
-	{
+	if (!empty($arrayfields['t.debit']['checked'])) {
 		print '<td class="nowrap right">'.($line->debit ? price($line->debit) : '').'</td>';
-		if (!$i) $totalarray['nbfield']++;
-		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totaldebit';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+		if (!$i) {
+			$totalarray['pos'][$totalarray['nbfield']] = 'totaldebit';
+		}
 		$totalarray['val']['totaldebit'] += $line->debit;
 	}
 
 	// Amount credit
 	if (!empty($arrayfields['t.credit']['checked'])) {
 		print '<td class="nowrap right">'.($line->credit ? price($line->credit) : '').'</td>';
-		if (!$i) $totalarray['nbfield']++;
-		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalcredit';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+		if (!$i) {
+			$totalarray['pos'][$totalarray['nbfield']] = 'totalcredit';
+		}
 		$totalarray['val']['totalcredit'] += $line->credit;
 	}
 
 	// Lettering code
-	if (!empty($arrayfields['t.lettering_code']['checked']))
-	{
+	if (!empty($arrayfields['t.lettering_code']['checked'])) {
 		print '<td class="center">'.$line->lettering_code.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Fields from hook
@@ -763,7 +812,9 @@ while ($i < min($num, $limit))
 		}
 	}
 	print '</td>';
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	// Comptabilise le sous-total
 	$sous_total_debit += $line->debit;
@@ -777,11 +828,11 @@ while ($i < min($num, $limit))
 if ($num > 0) {
 	// Show sub-total of last shown account
 	if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
-	    $colnumber = 3;
-	    $colnumberend = 7;
+		$colnumber = 3;
+		$colnumberend = 7;
 	} else {
-	    $colnumber = 4;
-	    $colnumberend = 7;
+		$colnumber = 4;
+		$colnumberend = 7;
 	}
 	$colspan = $totalarray['nbfield'] - $colnumber;
 	$colspanend = $totalarray['nbfield'] - $colnumberend;
@@ -795,8 +846,7 @@ if ($num > 0) {
 	$balance = $sous_total_debit - $sous_total_credit;
 	print '<tr class="liste_total">';
 	print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
-	if ($balance > 0)
-	{
+	if ($balance > 0) {
 		print '<td class="nowraponall right">';
 		print price($sous_total_debit - $sous_total_credit);
 		print '</td>';

From 253349ced2772b559fffbe152ac874ef176b7fb1 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 5 Jan 2021 20:23:45 +0100
Subject: [PATCH 821/888] add column payment mode terms shipping on propal list

---
 htdocs/comm/propal/list.php | 75 +++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index d8f523f16da..64b13680a70 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -47,6 +47,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'propal', 'compta', 'bills', 'orders', 'products', 'deliveries', 'categories'));
+if (!empty($conf->expedition->enabled)) $langs->loadLangs(array('sendings'));
 
 $socid = GETPOST('socid', 'int');
 
@@ -89,6 +90,9 @@ $search_datedelivery_start = dol_mktime(0, 0, 0, GETPOST('search_datedelivery_st
 $search_datedelivery_end = dol_mktime(23, 59, 59, GETPOST('search_datedelivery_endmonth', 'int'), GETPOST('search_datedelivery_endday', 'int'), GETPOST('search_datedelivery_endyear', 'int'));
 $search_availability = GETPOST('search_availability', 'int');
 $search_categ_cus = GETPOST("search_categ_cus", 'int');
+$search_fk_cond_reglement = GETPOST("search_fk_cond_reglement", 'int');
+$search_fk_shipping_method = GETPOST("search_fk_shipping_method", 'int');
+$search_fk_mode_reglement = GETPOST("search_fk_mode_reglement", 'int');
 $search_btn = GETPOST('button_search', 'alpha');
 $search_remove_btn = GETPOST('button_removefilter', 'alpha');
 
@@ -185,8 +189,14 @@ $arrayfields = array(
 	'p.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>500),
 	'p.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'position'=>510, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PUBLIC_NOTES))),
 	'p.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'position'=>511, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PRIVATE_NOTES))),
+	'p.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>0, 'position'=>512),
+	'p.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>0, 'position'=>514),
 	'p.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
+
 );
+if (!empty($conf->expedition->enabled)) {
+	$arrayfields['p.fk_shipping_method']=array('label'=>"SendingMethod", 'checked'=>0, 'position'=>513);
+}
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
@@ -243,6 +253,9 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$toselect = '';
 	$search_array_options = array();
 	$search_categ_cus = 0;
+	$search_cond_reglement_id = '';
+	$search_shipping_method_id = '';
+	$search_mode_reglement_id = '';
 }
 if ($object_statut != '') $search_status = $object_statut;
 
@@ -286,6 +299,7 @@ $sql .= ' p.rowid, p.entity, p.note_private, p.total_ht, p.tva as total_vat, p.t
 $sql .= ' p.fk_multicurrency, p.multicurrency_code, p.multicurrency_tx, p.multicurrency_total_ht, p.multicurrency_total_tva as multicurrency_total_vat, p.multicurrency_total_ttc,';
 $sql .= ' p.datec as date_creation, p.tms as date_update, p.date_cloture as date_cloture,';
 $sql .= ' p.note_public, p.note_private,';
+$sql .= ' p.fk_cond_reglement,p.fk_mode_reglement,p.fk_shipping_method,';
 $sql .= " pr.rowid as project_id, pr.ref as project_ref, pr.title as project_label,";
 $sql .= ' u.login';
 if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
@@ -352,6 +366,10 @@ if ($sall) {
 if ($search_categ_cus > 0)			$sql .= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
 if ($search_categ_cus == -2)		$sql .= " AND cc.fk_categorie IS NULL";
 
+if ($search_fk_cond_reglement > 0) $sql .= " AND p.fk_cond_reglement = ".$db->escape($search_fk_cond_reglement);
+if ($search_fk_shipping_method > 0) $sql .= " AND p.fk_shipping_method = ".$db->escape($search_fk_shipping_method);
+if ($search_fk_mode_reglement > 0) $sql .= " AND p.fk_mode_reglement = ".$db->escape($search_fk_mode_reglement);
+
 if ($search_product_category > 0)	$sql .= " AND cp.fk_categorie = ".$db->escape($search_product_category);
 if ($socid > 0) $sql .= ' AND s.rowid = '.$socid;
 if ($search_status != '' && $search_status != '-1')
@@ -458,6 +476,9 @@ if ($resql)
 	if ($optioncss != '')    			$param .= '&optioncss='.urlencode($optioncss);
 	if ($search_categ_cus > 0)          $param .= '&search_categ_cus='.urlencode($search_categ_cus);
 	if ($search_product_category != '') $param .= '&search_product_category='.$search_product_category;
+	if ($search_fk_cond_reglement > 0) $param .= '&search_fk_cond_reglement='.$search_fk_cond_reglement;
+	if ($search_fk_shipping_method > 0) $param .= '&search_fk_shipping_method='.$search_fk_shipping_method;
+	if ($search_fk_mode_reglement > 0) $param .= '&search_fk_mode_reglement='.$search_fk_mode_reglement;
 
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -798,6 +819,31 @@ if ($resql)
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
+
+	if (!empty($arrayfields['p.fk_cond_reglement']['checked']))
+	{
+		// Payment term
+		print '<td class="liste_titre">';
+		$form->select_conditions_paiements($search_fk_cond_reglement, 'search_fk_cond_reglement', -1, 1);
+		print '</td>';
+	}
+
+	if (!empty($conf->expedition->enabled) && !empty($arrayfields['p.fk_shipping_method']['checked']))
+	{
+		// Shipping Method
+		print '<td class="liste_titre">';
+		$form->selectShippingMethod($search_fk_shipping_method, 'search_fk_shipping_method', '', 1);
+		print '</td>';
+	}
+
+	if (!empty($arrayfields['p.fk_mode_reglement']['checked']))
+	{
+		// Payment mode
+		print '<td class="liste_titre">';
+		$form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 0, 0, -1);
+		print '</td>';
+	}
+
 	// Status
 	if (!empty($arrayfields['p.fk_statut']['checked']))
 	{
@@ -855,6 +901,9 @@ if ($resql)
 	if (!empty($arrayfields['p.date_cloture']['checked']))		print_liste_field_titre($arrayfields['p.date_cloture']['label'], $_SERVER["PHP_SELF"], "p.date_cloture", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
 	if (!empty($arrayfields['p.note_public']['checked']))       print_liste_field_titre($arrayfields['p.note_public']['label'], $_SERVER["PHP_SELF"], "p.note_public", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
 	if (!empty($arrayfields['p.note_private']['checked']))      print_liste_field_titre($arrayfields['p.note_private']['label'], $_SERVER["PHP_SELF"], "p.note_private", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	if (!empty($arrayfields['p.fk_cond_reglement']['checked']))			print_liste_field_titre($arrayfields['p.fk_cond_reglement']['label'], $_SERVER["PHP_SELF"], "p.fk_cond_reglement", "", $param, '', $sortfield, $sortorder);
+	if (!empty($conf->expedition->enabled) && !empty($arrayfields['p.fk_shipping_method']['checked']))	print_liste_field_titre($arrayfields['p.fk_shipping_method']['label'], $_SERVER["PHP_SELF"], "p.fk_shipping_method", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['p.fk_mode_reglement']['checked']))			print_liste_field_titre($arrayfields['p.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "p.fk_mode_reglement", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['p.fk_statut']['checked']))			print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 	print '</tr>'."\n";
@@ -1251,6 +1300,32 @@ if ($resql)
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
+		// Payment terms
+		if (!empty($arrayfields['p.fk_cond_reglement']['checked']))
+		{
+			print '<td>';
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none');
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+
+		if (!empty($conf->expedition->enabled) && !empty($arrayfields['p.fk_shipping_method']['checked']))
+		{
+			print '<td>';
+			$form->formSelectShippingMethod('', $obj->fk_shipping_method, 'none', 1);
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+
+		// Payment mode
+		if (!empty($arrayfields['p.fk_mode_reglement']['checked']))
+		{
+			print '<td>';
+			$form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1);
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+
 		// Status
 		if (!empty($arrayfields['p.fk_statut']['checked']))
 		{

From 939fecc611d78c1927f28322d0b607e424ab2d26 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 5 Jan 2021 20:32:29 +0100
Subject: [PATCH 822/888] add column payment mode terms shipping on order list

---
 htdocs/comm/propal/list.php |  9 ++---
 htdocs/commande/list.php    | 73 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 75 insertions(+), 7 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 64b13680a70..7ac673d7383 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -253,9 +253,9 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$toselect = '';
 	$search_array_options = array();
 	$search_categ_cus = 0;
-	$search_cond_reglement_id = '';
-	$search_shipping_method_id = '';
-	$search_mode_reglement_id = '';
+	$search_fk_cond_reglement = '';
+	$search_fk_shipping_method = '';
+	$search_fk_mode_reglement = '';
 }
 if ($object_statut != '') $search_status = $object_statut;
 
@@ -1308,7 +1308,7 @@ if ($resql)
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
-
+		//Shipping Method
 		if (!empty($conf->expedition->enabled) && !empty($arrayfields['p.fk_shipping_method']['checked']))
 		{
 			print '<td>';
@@ -1325,7 +1325,6 @@ if ($resql)
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
-
 		// Status
 		if (!empty($arrayfields['p.fk_statut']['checked']))
 		{
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 885081e84a1..b6cd0e6f755 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -95,7 +95,9 @@ $search_remove_btn = GETPOST('button_removefilter', 'alpha');
 $search_project_ref = GETPOST('search_project_ref', 'alpha');
 $search_project = GETPOST('search_project', 'alpha');
 $search_shippable = GETPOST('search_shippable', 'aZ09');
-
+$search_fk_cond_reglement = GETPOST("search_fk_cond_reglement", 'int');
+$search_fk_shipping_method = GETPOST("search_fk_shipping_method", 'int');
+$search_fk_mode_reglement = GETPOST("search_fk_mode_reglement", 'int');
 
 // Security check
 $id = (GETPOST('orderid') ?GETPOST('orderid', 'int') : GETPOST('id', 'int'));
@@ -170,8 +172,13 @@ $arrayfields = array(
 	'c.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'position'=>511, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PRIVATE_NOTES)), 'position'=>140),
 	'c.facture'=>array('label'=>"Billed", 'checked'=>1, 'position'=>990, 'enabled'=>(empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)), 'position'=>145),
 	'shippable'=>array('label'=>"Shippable", 'checked'=>1, 'position'=>995, 'enabled'=>(!empty($conf->expedition->enabled)), 'position'=>150),
+	'c.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>0, 'position'=>151),
+	'c.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>0, 'position'=>153),
 	'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000, 'position'=>155)
 );
+if (!empty($conf->expedition->enabled)) {
+	$arrayfields['c.fk_shipping_method']=array('label'=>"SendingMethod", 'checked'=>0, 'position'=>152);
+}
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
@@ -235,6 +242,9 @@ if (empty($reshook))
 		$search_categ_cus = 0;
 		$search_datecloture_start = '';
 		$search_datecloture_end = '';
+		$search_fk_cond_reglement = '';
+		$search_fk_shipping_method = '';
+		$search_fk_mode_reglement = '';
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
 	 || GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
@@ -280,7 +290,8 @@ $sql .= ' c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multic
 $sql .= ' c.date_valid, c.date_commande, c.note_public, c.note_private, c.date_livraison as date_delivery, c.fk_statut, c.facture as billed,';
 $sql .= ' c.date_creation as date_creation, c.tms as date_update, c.date_cloture as date_cloture,';
 $sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_label,";
-$sql .= " u.login";
+$sql .= " u.login,";
+$sql .= ' c.fk_cond_reglement,c.fk_mode_reglement,c.fk_shipping_method';
 if ($search_categ_cus) $sql .= ", cc.fk_categorie, cc.fk_soc";
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label']))
@@ -369,6 +380,9 @@ if ($search_project_ref != '')               $sql .= natural_search("p.ref", $se
 if ($search_project != '')                   $sql .= natural_search("p.title", $search_project);
 if ($search_categ_cus > 0)                   $sql .= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
 if ($search_categ_cus == -2)                 $sql .= " AND cc.fk_categorie IS NULL";
+if ($search_fk_cond_reglement > 0) $sql .= " AND c.fk_cond_reglement = ".$db->escape($search_fk_cond_reglement);
+if ($search_fk_shipping_method > 0) $sql .= " AND c.fk_shipping_method = ".$db->escape($search_fk_shipping_method);
+if ($search_fk_mode_reglement > 0) $sql .= " AND c.fk_mode_reglement = ".$db->escape($search_fk_mode_reglement);
 
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -478,6 +492,9 @@ if ($resql)
 	if ($show_files)            	$param .= '&show_files='.urlencode($show_files);
 	if ($optioncss != '')       	$param .= '&optioncss='.urlencode($optioncss);
 	if ($search_billed != '')		$param .= '&search_billed='.urlencode($search_billed);
+	if ($search_fk_cond_reglement > 0) $param .= '&search_fk_cond_reglement='.$search_fk_cond_reglement;
+	if ($search_fk_shipping_method > 0) $param .= '&search_fk_shipping_method='.$search_fk_shipping_method;
+	if ($search_fk_mode_reglement > 0) $param .= '&search_fk_mode_reglement='.$search_fk_mode_reglement;
 
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -851,6 +868,29 @@ if ($resql)
 		print $form->selectyesno('search_billed', $search_billed, 1, 0, 1, 1);
 		print '</td>';
 	}
+	if (!empty($arrayfields['c.fk_cond_reglement']['checked']))
+	{
+		// Payment term
+		print '<td class="liste_titre">';
+		$form->select_conditions_paiements($search_fk_cond_reglement, 'search_fk_cond_reglement', -1, 1);
+		print '</td>';
+	}
+
+	if (!empty($conf->expedition->enabled) && !empty($arrayfields['c.fk_shipping_method']['checked']))
+	{
+		// Shipping Method
+		print '<td class="liste_titre">';
+		$form->selectShippingMethod($search_fk_shipping_method, 'search_fk_shipping_method', '', 1);
+		print '</td>';
+	}
+
+	if (!empty($arrayfields['c.fk_mode_reglement']['checked']))
+	{
+		// Payment mode
+		print '<td class="liste_titre">';
+		$form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 0, 0, -1);
+		print '</td>';
+	}
 	// Status
 	if (!empty($arrayfields['c.fk_statut']['checked']))
 	{
@@ -911,6 +951,9 @@ if ($resql)
 	if (!empty($arrayfields['c.note_private']['checked'])) print_liste_field_titre($arrayfields['c.note_private']['label'], $_SERVER["PHP_SELF"], "c.note_private", "", $param, '', $sortfield, $sortorder, 'right ');
 	if (!empty($arrayfields['shippable']['checked']))   print_liste_field_titre($arrayfields['shippable']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($arrayfields['c.facture']['checked']))   print_liste_field_titre($arrayfields['c.facture']['label'], $_SERVER["PHP_SELF"], 'c.facture', '', $param, '', $sortfield, $sortorder, 'center ');
+	if (!empty($arrayfields['c.fk_cond_reglement']['checked']))			print_liste_field_titre($arrayfields['c.fk_cond_reglement']['label'], $_SERVER["PHP_SELF"], "c.fk_cond_reglement", "", $param, '', $sortfield, $sortorder);
+	if (!empty($conf->expedition->enabled) && !empty($arrayfields['c.fk_shipping_method']['checked']))	print_liste_field_titre($arrayfields['c.fk_shipping_method']['label'], $_SERVER["PHP_SELF"], "c.fk_shipping_method", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['c.fk_mode_reglement']['checked']))			print_liste_field_titre($arrayfields['c.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "c.fk_mode_reglement", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['c.fk_statut']['checked'])) print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, '', $sortfield, $sortorder, 'center ');
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ');
 	print '</tr>'."\n";
@@ -1327,6 +1370,32 @@ if ($resql)
 			if (!$i) $totalarray['nbfield']++;
 		}
 
+		// Payment terms
+		if (!empty($arrayfields['c.fk_cond_reglement']['checked']))
+		{
+			print '<td>';
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none');
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+		//Shipping Method
+		if (!empty($conf->expedition->enabled) && !empty($arrayfields['c.fk_shipping_method']['checked']))
+		{
+			print '<td>';
+			$form->formSelectShippingMethod('', $obj->fk_shipping_method, 'none', 1);
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+
+		// Payment mode
+		if (!empty($arrayfields['c.fk_mode_reglement']['checked']))
+		{
+			print '<td>';
+			$form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1);
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+
 		// Status
 		if (!empty($arrayfields['c.fk_statut']['checked']))
 		{

From b9bb48a01f083d42bf3a7fc7cef86e76bd327887 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 5 Jan 2021 22:50:54 +0100
Subject: [PATCH 823/888] better place and noadmininfo

---
 htdocs/comm/propal/list.php           | 112 ++++++++++++--------------
 htdocs/commande/list.php              | 109 ++++++++++++-------------
 htdocs/core/class/html.form.class.php |   5 +-
 3 files changed, 108 insertions(+), 118 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 7ac673d7383..9cf20dfee22 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -170,6 +170,9 @@ $arrayfields = array(
 	'p.fin_validite'=>array('label'=>"DateEnd", 'checked'=>1),
 	'p.date_livraison'=>array('label'=>"DeliveryDate", 'checked'=>0),
 	'ava.rowid'=>array('label'=>"AvailabilityPeriod", 'checked'=>0),
+	'p.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>0, 'enabled'=>!empty($conf->expedition->enabled)),
+	'p.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>0),
+	'p.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>0),
 	'p.total_ht'=>array('label'=>"AmountHT", 'checked'=>1),
 	'p.total_vat'=>array('label'=>"AmountVAT", 'checked'=>0),
 	'p.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0),
@@ -189,14 +192,9 @@ $arrayfields = array(
 	'p.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>500),
 	'p.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'position'=>510, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PUBLIC_NOTES))),
 	'p.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'position'=>511, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PRIVATE_NOTES))),
-	'p.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>0, 'position'=>512),
-	'p.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>0, 'position'=>514),
 	'p.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
-
 );
-if (!empty($conf->expedition->enabled)) {
-	$arrayfields['p.fk_shipping_method']=array('label'=>"SendingMethod", 'checked'=>0, 'position'=>513);
-}
+
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
@@ -691,6 +689,27 @@ if ($resql)
 		print ajax_combobox('search_availability');
 		print '</td>';
 	}
+	// Shipping Method
+	if (!empty($arrayfields['p.fk_shipping_method']['checked']))
+	{
+		print '<td class="liste_titre">';
+		$form->selectShippingMethod($search_fk_shipping_method, 'search_fk_shipping_method', '', 1, '', 1);
+		print '</td>';
+	}
+	// Payment term
+	if (!empty($arrayfields['p.fk_cond_reglement']['checked']))
+	{
+		print '<td class="liste_titre">';
+		$form->select_conditions_paiements($search_fk_cond_reglement, 'search_fk_cond_reglement', -1, 1, 1);
+		print '</td>';
+	}
+	// Payment mode
+	if (!empty($arrayfields['p.fk_mode_reglement']['checked']))
+	{
+		print '<td class="liste_titre">';
+		$form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 1, 0, -1);
+		print '</td>';
+	}
 	if (!empty($arrayfields['p.total_ht']['checked']))
 	{
 		// Amount
@@ -820,30 +839,6 @@ if ($resql)
 		print '</td>';
 	}
 
-	if (!empty($arrayfields['p.fk_cond_reglement']['checked']))
-	{
-		// Payment term
-		print '<td class="liste_titre">';
-		$form->select_conditions_paiements($search_fk_cond_reglement, 'search_fk_cond_reglement', -1, 1);
-		print '</td>';
-	}
-
-	if (!empty($conf->expedition->enabled) && !empty($arrayfields['p.fk_shipping_method']['checked']))
-	{
-		// Shipping Method
-		print '<td class="liste_titre">';
-		$form->selectShippingMethod($search_fk_shipping_method, 'search_fk_shipping_method', '', 1);
-		print '</td>';
-	}
-
-	if (!empty($arrayfields['p.fk_mode_reglement']['checked']))
-	{
-		// Payment mode
-		print '<td class="liste_titre">';
-		$form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 0, 0, -1);
-		print '</td>';
-	}
-
 	// Status
 	if (!empty($arrayfields['p.fk_statut']['checked']))
 	{
@@ -876,6 +871,9 @@ if ($resql)
 	if (!empty($arrayfields['p.fin_validite']['checked']))		print_liste_field_titre($arrayfields['p.fin_validite']['label'], $_SERVER["PHP_SELF"], 'dfv', '', $param, 'align="center"', $sortfield, $sortorder);
 	if (!empty($arrayfields['p.date_livraison']['checked']))	print_liste_field_titre($arrayfields['p.date_livraison']['label'], $_SERVER["PHP_SELF"], 'ddelivery', '', $param, 'align="center"', $sortfield, $sortorder);
 	if (!empty($arrayfields['ava.rowid']['checked']))			print_liste_field_titre($arrayfields['ava.rowid']['label'], $_SERVER["PHP_SELF"], 'availability', '', $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['p.fk_shipping_method']['checked']))	print_liste_field_titre($arrayfields['p.fk_shipping_method']['label'], $_SERVER["PHP_SELF"], "p.fk_shipping_method", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['p.fk_cond_reglement']['checked']))		print_liste_field_titre($arrayfields['p.fk_cond_reglement']['label'], $_SERVER["PHP_SELF"], "p.fk_cond_reglement", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['p.fk_mode_reglement']['checked']))		print_liste_field_titre($arrayfields['p.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "p.fk_mode_reglement", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['p.total_ht']['checked']))			print_liste_field_titre($arrayfields['p.total_ht']['label'], $_SERVER["PHP_SELF"], 'p.total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
 	if (!empty($arrayfields['p.total_vat']['checked']))			print_liste_field_titre($arrayfields['p.total_vat']['label'], $_SERVER["PHP_SELF"], 'p.tva', '', $param, 'class="right"', $sortfield, $sortorder);
 	if (!empty($arrayfields['p.total_ttc']['checked']))			print_liste_field_titre($arrayfields['p.total_ttc']['label'], $_SERVER["PHP_SELF"], 'p.total', '', $param, 'class="right"', $sortfield, $sortorder);
@@ -901,9 +899,6 @@ if ($resql)
 	if (!empty($arrayfields['p.date_cloture']['checked']))		print_liste_field_titre($arrayfields['p.date_cloture']['label'], $_SERVER["PHP_SELF"], "p.date_cloture", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
 	if (!empty($arrayfields['p.note_public']['checked']))       print_liste_field_titre($arrayfields['p.note_public']['label'], $_SERVER["PHP_SELF"], "p.note_public", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
 	if (!empty($arrayfields['p.note_private']['checked']))      print_liste_field_titre($arrayfields['p.note_private']['label'], $_SERVER["PHP_SELF"], "p.note_private", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-	if (!empty($arrayfields['p.fk_cond_reglement']['checked']))			print_liste_field_titre($arrayfields['p.fk_cond_reglement']['label'], $_SERVER["PHP_SELF"], "p.fk_cond_reglement", "", $param, '', $sortfield, $sortorder);
-	if (!empty($conf->expedition->enabled) && !empty($arrayfields['p.fk_shipping_method']['checked']))	print_liste_field_titre($arrayfields['p.fk_shipping_method']['label'], $_SERVER["PHP_SELF"], "p.fk_shipping_method", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.fk_mode_reglement']['checked']))			print_liste_field_titre($arrayfields['p.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "p.fk_mode_reglement", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['p.fk_statut']['checked']))			print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 	print '</tr>'."\n";
@@ -1113,7 +1108,30 @@ if ($resql)
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
-
+		//Shipping Method
+		if (!empty($arrayfields['p.fk_shipping_method']['checked']))
+		{
+			print '<td>';
+			$form->formSelectShippingMethod('', $obj->fk_shipping_method, 'none', 1);
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+		// Payment terms
+		if (!empty($arrayfields['p.fk_cond_reglement']['checked']))
+		{
+			print '<td>';
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none');
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+		// Payment mode
+		if (!empty($arrayfields['p.fk_mode_reglement']['checked']))
+		{
+			print '<td>';
+			$form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1);
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
 		// Amount HT
 		if (!empty($arrayfields['p.total_ht']['checked']))
 		{
@@ -1154,7 +1172,6 @@ if ($resql)
 			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'p.total_invoiced';
 			$totalarray['val']['p.total_invoiced'] += $totalInvoicedTTC;
 		}
-
 		// Currency
 		if (!empty($arrayfields['p.multicurrency_code']['checked']))
 		{
@@ -1300,31 +1317,6 @@ if ($resql)
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
-		// Payment terms
-		if (!empty($arrayfields['p.fk_cond_reglement']['checked']))
-		{
-			print '<td>';
-			$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none');
-			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
-		}
-		//Shipping Method
-		if (!empty($conf->expedition->enabled) && !empty($arrayfields['p.fk_shipping_method']['checked']))
-		{
-			print '<td>';
-			$form->formSelectShippingMethod('', $obj->fk_shipping_method, 'none', 1);
-			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
-		}
-
-		// Payment mode
-		if (!empty($arrayfields['p.fk_mode_reglement']['checked']))
-		{
-			print '<td>';
-			$form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1);
-			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
-		}
 		// Status
 		if (!empty($arrayfields['p.fk_statut']['checked']))
 		{
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index b6cd0e6f755..4d309f1062e 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -156,6 +156,9 @@ $arrayfields = array(
 	'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers, 'position'=>55),
 	'c.date_commande'=>array('label'=>"OrderDateShort", 'checked'=>1, 'position'=>60),
 	'c.date_delivery'=>array('label'=>"DateDeliveryPlanned", 'checked'=>1, 'enabled'=>empty($conf->global->ORDER_DISABLE_DELIVERY_DATE), 'position'=>65),
+	'c.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>0, 'position'=>66),
+	'c.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>0, 'position'=>67),
+	'c.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>0, 'position'=>68),
 	'c.total_ht'=>array('label'=>"AmountHT", 'checked'=>1, 'position'=>75),
 	'c.total_vat'=>array('label'=>"AmountVAT", 'checked'=>0, 'position'=>80),
 	'c.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0, 'position'=>85),
@@ -172,12 +175,10 @@ $arrayfields = array(
 	'c.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'position'=>511, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PRIVATE_NOTES)), 'position'=>140),
 	'c.facture'=>array('label'=>"Billed", 'checked'=>1, 'position'=>990, 'enabled'=>(empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)), 'position'=>145),
 	'shippable'=>array('label'=>"Shippable", 'checked'=>1, 'position'=>995, 'enabled'=>(!empty($conf->expedition->enabled)), 'position'=>150),
-	'c.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>0, 'position'=>151),
-	'c.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>0, 'position'=>153),
 	'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000, 'position'=>155)
 );
 if (!empty($conf->expedition->enabled)) {
-	$arrayfields['c.fk_shipping_method']=array('label'=>"SendingMethod", 'checked'=>0, 'position'=>152);
+
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -743,6 +744,27 @@ if ($resql)
 		print '</div>';
 		print '</td>';
 	}
+	// Shipping Method
+	if (!empty($arrayfields['c.fk_shipping_method']['checked']))
+	{
+		print '<td class="liste_titre">';
+		$form->selectShippingMethod($search_fk_shipping_method, 'search_fk_shipping_method', '', 1, '', 1);
+		print '</td>';
+	}
+	// Payment term
+	if (!empty($arrayfields['c.fk_cond_reglement']['checked']))
+	{
+		print '<td class="liste_titre">';
+		$form->select_conditions_paiements($search_fk_cond_reglement, 'search_fk_cond_reglement', -1, 1, 1);
+		print '</td>';
+	}
+	// Payment mode
+	if (!empty($arrayfields['c.fk_mode_reglement']['checked']))
+	{
+		print '<td class="liste_titre">';
+		$form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 1, 0, -1);
+		print '</td>';
+	}
 	if (!empty($arrayfields['c.total_ht']['checked']))
 	{
 		// Amount
@@ -868,29 +890,6 @@ if ($resql)
 		print $form->selectyesno('search_billed', $search_billed, 1, 0, 1, 1);
 		print '</td>';
 	}
-	if (!empty($arrayfields['c.fk_cond_reglement']['checked']))
-	{
-		// Payment term
-		print '<td class="liste_titre">';
-		$form->select_conditions_paiements($search_fk_cond_reglement, 'search_fk_cond_reglement', -1, 1);
-		print '</td>';
-	}
-
-	if (!empty($conf->expedition->enabled) && !empty($arrayfields['c.fk_shipping_method']['checked']))
-	{
-		// Shipping Method
-		print '<td class="liste_titre">';
-		$form->selectShippingMethod($search_fk_shipping_method, 'search_fk_shipping_method', '', 1);
-		print '</td>';
-	}
-
-	if (!empty($arrayfields['c.fk_mode_reglement']['checked']))
-	{
-		// Payment mode
-		print '<td class="liste_titre">';
-		$form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 0, 0, -1);
-		print '</td>';
-	}
 	// Status
 	if (!empty($arrayfields['c.fk_statut']['checked']))
 	{
@@ -928,6 +927,9 @@ if ($resql)
 	if (!empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($arrayfields['c.date_commande']['checked']))  print_liste_field_titre($arrayfields['c.date_commande']['label'], $_SERVER["PHP_SELF"], 'c.date_commande', '', $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($arrayfields['c.date_delivery']['checked']))  print_liste_field_titre($arrayfields['c.date_delivery']['label'], $_SERVER["PHP_SELF"], 'c.date_livraison', '', $param, '', $sortfield, $sortorder, 'center ');
+	if (!empty($arrayfields['c.fk_shipping_method']['checked']))	print_liste_field_titre($arrayfields['c.fk_shipping_method']['label'], $_SERVER["PHP_SELF"], "c.fk_shipping_method", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['c.fk_cond_reglement']['checked']))		print_liste_field_titre($arrayfields['c.fk_cond_reglement']['label'], $_SERVER["PHP_SELF"], "c.fk_cond_reglement", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['c.fk_mode_reglement']['checked']))		print_liste_field_titre($arrayfields['c.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "c.fk_mode_reglement", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['c.total_ht']['checked']))       print_liste_field_titre($arrayfields['c.total_ht']['label'], $_SERVER["PHP_SELF"], 'c.total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
 	if (!empty($arrayfields['c.total_vat']['checked']))      print_liste_field_titre($arrayfields['c.total_vat']['label'], $_SERVER["PHP_SELF"], 'c.tva', '', $param, '', $sortfield, $sortorder, 'right ');
 	if (!empty($arrayfields['c.total_ttc']['checked']))      print_liste_field_titre($arrayfields['c.total_ttc']['label'], $_SERVER["PHP_SELF"], 'c.total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
@@ -951,9 +953,6 @@ if ($resql)
 	if (!empty($arrayfields['c.note_private']['checked'])) print_liste_field_titre($arrayfields['c.note_private']['label'], $_SERVER["PHP_SELF"], "c.note_private", "", $param, '', $sortfield, $sortorder, 'right ');
 	if (!empty($arrayfields['shippable']['checked']))   print_liste_field_titre($arrayfields['shippable']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($arrayfields['c.facture']['checked']))   print_liste_field_titre($arrayfields['c.facture']['label'], $_SERVER["PHP_SELF"], 'c.facture', '', $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['c.fk_cond_reglement']['checked']))			print_liste_field_titre($arrayfields['c.fk_cond_reglement']['label'], $_SERVER["PHP_SELF"], "c.fk_cond_reglement", "", $param, '', $sortfield, $sortorder);
-	if (!empty($conf->expedition->enabled) && !empty($arrayfields['c.fk_shipping_method']['checked']))	print_liste_field_titre($arrayfields['c.fk_shipping_method']['label'], $_SERVER["PHP_SELF"], "c.fk_shipping_method", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['c.fk_mode_reglement']['checked']))			print_liste_field_titre($arrayfields['c.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "c.fk_mode_reglement", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['c.fk_statut']['checked'])) print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, '', $sortfield, $sortorder, 'center ');
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ');
 	print '</tr>'."\n";
@@ -1137,6 +1136,31 @@ if ($resql)
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
+		//Shipping Method
+		if (!empty($arrayfields['c.fk_shipping_method']['checked']))
+		{
+			print '<td>';
+			$form->formSelectShippingMethod('', $obj->fk_shipping_method, 'none', 1);
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+		// Payment terms
+		if (!empty($arrayfields['c.fk_cond_reglement']['checked']))
+		{
+			print '<td>';
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none');
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+		// Payment mode
+		if (!empty($arrayfields['c.fk_mode_reglement']['checked']))
+		{
+			print '<td>';
+			$form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1);
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+
 		// Amount HT
 		if (!empty($arrayfields['c.total_ht']['checked']))
 		{
@@ -1369,33 +1393,6 @@ if ($resql)
 			print '<td class="center">'.yn($obj->billed).'</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
-
-		// Payment terms
-		if (!empty($arrayfields['c.fk_cond_reglement']['checked']))
-		{
-			print '<td>';
-			$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none');
-			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
-		}
-		//Shipping Method
-		if (!empty($conf->expedition->enabled) && !empty($arrayfields['c.fk_shipping_method']['checked']))
-		{
-			print '<td>';
-			$form->formSelectShippingMethod('', $obj->fk_shipping_method, 'none', 1);
-			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
-		}
-
-		// Payment mode
-		if (!empty($arrayfields['c.fk_mode_reglement']['checked']))
-		{
-			print '<td>';
-			$form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1);
-			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
-		}
-
 		// Status
 		if (!empty($arrayfields['c.fk_statut']['checked']))
 		{
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index ed0511a8e1d..2b5b91dbf07 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3748,9 +3748,10 @@ class Form
 	 *  @param  string	$filtre            To filter list
 	 *  @param  int		$useempty          1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
 	 *  @param  string	$moreattrib        To add more attribute on select
+	 *	@param	int		$noinfoadmin		0=Add admin info, 1=Disable admin info
 	 * 	@return	void
 	 */
-	public function selectShippingMethod($selected = '', $htmlname = 'shipping_method_id', $filtre = '', $useempty = 0, $moreattrib = '')
+	public function selectShippingMethod($selected = '', $htmlname = 'shipping_method_id', $filtre = '', $useempty = 0, $moreattrib = '', $noinfoadmin = 0)
 	{
 		global $langs, $conf, $user;
 
@@ -3785,7 +3786,7 @@ class Form
 					$i++;
 				}
 				print "</select>";
-				if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+				if ($user->admin  && empty($noinfoadmin)) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 
 				print ajax_combobox('select'.$htmlname);
 			} else {

From 510c619c85372c7f55bf0e8b154d82d8fcf05347 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 5 Jan 2021 22:56:55 +0100
Subject: [PATCH 824/888] space

---
 htdocs/comm/propal/list.php | 1 -
 htdocs/commande/list.php    | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 9cf20dfee22..998e1e9e23e 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -838,7 +838,6 @@ if ($resql)
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
-
 	// Status
 	if (!empty($arrayfields['p.fk_statut']['checked']))
 	{
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 4d309f1062e..a17a1f43887 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -177,9 +177,6 @@ $arrayfields = array(
 	'shippable'=>array('label'=>"Shippable", 'checked'=>1, 'position'=>995, 'enabled'=>(!empty($conf->expedition->enabled)), 'position'=>150),
 	'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000, 'position'=>155)
 );
-if (!empty($conf->expedition->enabled)) {
-
-}
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
@@ -1160,7 +1157,6 @@ if ($resql)
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
-
 		// Amount HT
 		if (!empty($arrayfields['c.total_ht']['checked']))
 		{

From 296c998a36fd3891c7099dc93f88328e53a7ef55 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 5 Jan 2021 23:00:35 +0100
Subject: [PATCH 825/888] enabled

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

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index a17a1f43887..a3790528c8d 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -156,7 +156,7 @@ $arrayfields = array(
 	'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers, 'position'=>55),
 	'c.date_commande'=>array('label'=>"OrderDateShort", 'checked'=>1, 'position'=>60),
 	'c.date_delivery'=>array('label'=>"DateDeliveryPlanned", 'checked'=>1, 'enabled'=>empty($conf->global->ORDER_DISABLE_DELIVERY_DATE), 'position'=>65),
-	'c.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>0, 'position'=>66),
+	'c.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>0, 'position'=>66 , 'enabled'=>!empty($conf->expedition->enabled)),
 	'c.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>0, 'position'=>67),
 	'c.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>0, 'position'=>68),
 	'c.total_ht'=>array('label'=>"AmountHT", 'checked'=>1, 'position'=>75),

From 7161ca9e70d00dd4f55294df753f4b01892fb77f Mon Sep 17 00:00:00 2001
From: quentin <quentin.vial-gouteyron@atm-consulting.fr>
Date: Wed, 6 Jan 2021 09:54:02 +0100
Subject: [PATCH 826/888] FIX issue 15659 : Missing test if conf is enabled

---
 htdocs/societe/card.php | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index ea121acc4c7..052d681b0a0 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1542,12 +1542,12 @@ else
 			//}
 
 			// Supplier
-			//if ($object->fournisseur) {
-			print '<tr class="visibleifsupplier"><td class="toptd">'.$form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0).'</td><td colspan="3">';
-			$cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, 'parent', null, null, 1);
-			print $form->multiselectarray('suppcats', $cate_arbo, GETPOST('suppcats', 'array'), null, null, null, null, "90%");
-			print "</td></tr>";
-			//}
+			if (!empty($conf->fournisseur->enabled)) {
+				print '<tr class="visibleifsupplier"><td class="toptd">'.$form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0).'</td><td colspan="3">';
+				$cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, 'parent', null, null, 1);
+				print $form->multiselectarray('suppcats', $cate_arbo, GETPOST('suppcats', 'array'), null, null, null, null, "90%");
+				print "</td></tr>";
+			}
 		}
 
 		// Multicurrency
@@ -2180,17 +2180,19 @@ else
 				print "</td></tr>";
 
 				// Supplier
-				print '<tr class="visibleifsupplier"><td>'.$form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0).'</td>';
-				print '<td colspan="3">';
-				$cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, null, null, null, 1);
-				$c = new Categorie($db);
-				$cats = $c->containing($object->id, Categorie::TYPE_SUPPLIER);
-				$arrayselected = array();
-				foreach ($cats as $cat) {
-					$arrayselected[] = $cat->id;
+				if (!empty($conf->fournisseur->enabled)) {
+					print '<tr class="visibleifsupplier"><td>'.$form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0).'</td>';
+					print '<td colspan="3">';
+					$cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, null, null, null, 1);
+					$c = new Categorie($db);
+					$cats = $c->containing($object->id, Categorie::TYPE_SUPPLIER);
+					$arrayselected = array();
+					foreach($cats as $cat) {
+						$arrayselected[] = $cat->id;
+					}
+					print $form->multiselectarray('suppcats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%');
+					print "</td></tr>";
 				}
-				print $form->multiselectarray('suppcats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%');
-				print "</td></tr>";
 			}
 
 			// Multicurrency
@@ -2560,7 +2562,7 @@ else
 			}
 
 			// Supplier
-			if ($object->fournisseur) {
+			if (!empty($conf->fournisseur->enabled) && $object->fournisseur) {
 				print '<tr><td>'.$langs->trans("SuppliersCategoriesShort").'</td>';
 				print '<td>';
 				print $form->showCategories($object->id, Categorie::TYPE_SUPPLIER, 1);

From 2f932330d3d4ed6561385d089189de4bd4be5aa1 Mon Sep 17 00:00:00 2001
From: quentin <quentin.vial-gouteyron@atm-consulting.fr>
Date: Wed, 6 Jan 2021 10:10:39 +0100
Subject: [PATCH 827/888] FIX wrong name for search status param

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

diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 999bde3fb32..a7f44bf483e 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -340,7 +340,7 @@ if ($resql)
 
 	if ($search_product_category != '') $param .= '&search_product_category='.urlencode($search_product_category);
 	if ($search_categ_cus > 0)      $param .= '&search_categ_cus='.urlencode($search_categ_cus);
-	if ($search_status != '') $param .= '&viewstatut='.urlencode($search_status);
+	if ($search_status != '') $param .= '&search_status='.urlencode($search_status);
 	if ($optioncss != '')  $param .= '&optioncss='.urlencode($optioncss);
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';

From 6f15683709893d12fcc0e0a78259f91230534c9f Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Wed, 6 Jan 2021 10:42:48 +0100
Subject: [PATCH 828/888] FIX create ticket : thirdparty/contact notification
 #15629

---
 ...terface_50_modTicket_TicketEmail.class.php | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index 6bd33c5b2f9..22ad6415b40 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -251,11 +251,21 @@ class InterfaceTicketEmail extends DolibarrTriggers
 				if (empty($conf->global->TICKET_DISABLE_CUSTOMER_MAILS) && empty($object->context['disableticketemail']) && $object->notify_tiers_at_create)
 				{
 					$sendto = '';
-					if (empty($user->socid) && empty($user->email)) {
-							  $object->fetch_thirdparty();
-							  $sendto = $object->thirdparty->email;
-					} else {
-						$sendto = $user->email;
+
+					//if contact selected send to email's contact else send to email's thirdparty
+
+					$contactid = GETPOST('contactid', 'alpha');
+
+					if(!empty($contactid)) {
+						$contact = new Contact($this->db);
+						$res = $contact->fetch($contactid);
+					}
+
+					if($res > 0 && !empty($contact->email) && !empty($contact->statut)) {
+						$sendto = $contact->email;
+					} elseif (!empty($object->fk_soc)) {
+						$object->fetch_thirdparty();
+						$sendto = $object->thirdparty->email;
 					}
 
 					if ($sendto) {

From 92a4314779f7c33994779670820dfe33849b75ba Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Wed, 6 Jan 2021 10:45:54 +0100
Subject: [PATCH 829/888] Fix security mecanism generating data loss

---
 htdocs/core/lib/functions.lib.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c6fd80f72d0..fccb019a730 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -602,6 +602,7 @@ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $opti
 				$out = trim($out);
 				// '"' is dangerous because param in url can close the href= or src= and add javascript functions.
 				// '../' is dangerous because it allows dir transversals
+				$out = str_replace('"', "''", trim($out));
 				if (preg_match('/"/', $out)) $out = '';
 				elseif (preg_match('/\.\.\//', $out)) $out = '';
 				$out = dol_string_nohtmltag($out);

From c2489dd3137ca8fde76ede112c6e66d1460a4e28 Mon Sep 17 00:00:00 2001
From: kamel <kamel@kam>
Date: Wed, 6 Jan 2021 11:07:25 +0100
Subject: [PATCH 830/888] FIX : Fix the display on the 'contact by default' on
 the contact card

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

diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 1156e254e52..35c4bdc43e5 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -1382,7 +1382,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		if (!empty($object->socid)) {
 			print '<tr><td class="titlefield">'.$langs->trans("ContactByDefaultFor").'</td>';
 			print '<td colspan="3">';
-			print $formcompany->showRoles("roles", $object, 'view');
+			print $formcompany->showRoles("roles", $object, 'view', $object->roles);
 			print '</td></tr>';
 		}
 

From 32109de67bb6b9160775a982d52f44277c71f8f3 Mon Sep 17 00:00:00 2001
From: kamel <kamel@kam>
Date: Wed, 6 Jan 2021 11:14:13 +0100
Subject: [PATCH 831/888] NEW : Add triggers OBJECT_LINK_INSERT,
 OBJECT_LINK_UPDATE et OBJECT_LINK_DELETE in the function add_object_linked(),
 updateObjectLinked() and deleteObjectLinked()

---
 htdocs/core/class/commonobject.class.php | 168 ++++++++++++++++-------
 1 file changed, 117 insertions(+), 51 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 6afca0c8d35..6ad48db09d6 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3257,14 +3257,18 @@ abstract class CommonObject
 	 *
 	 *	@param		string	$origin		Linked element type
 	 *	@param		int		$origin_id	Linked element id
+	 * 	@param		User	$f_user		User that create
+	 * 	@param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return		int					<=0 if KO, >0 if OK
 	 *	@see		fetchObjectLinked(), updateObjectLinked(), deleteObjectLinked()
 	 */
-	public function add_object_linked($origin = null, $origin_id = null)
+	public function add_object_linked($origin = null, $origin_id = null, $f_user = null, $notrigger = 0)
 	{
 		// phpcs:enable
+		global $user;
 		$origin = (!empty($origin) ? $origin : $this->origin);
 		$origin_id = (!empty($origin_id) ? $origin_id : $this->origin_id);
+		$f_user = isset($f_user) ? $f_user : $user;
 
 		// Special case
 		if ($origin == 'order') $origin = 'commande';
@@ -3272,26 +3276,41 @@ abstract class CommonObject
 		if ($origin == 'invoice_template') $origin = 'facturerec';
 		if ($origin == 'supplierorder') $origin = 'order_supplier';
 		$this->db->begin();
+		$error = 0;
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
+		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "element_element (";
 		$sql .= "fk_source";
 		$sql .= ", sourcetype";
 		$sql .= ", fk_target";
 		$sql .= ", targettype";
 		$sql .= ") VALUES (";
 		$sql .= $origin_id;
-		$sql .= ", '".$this->db->escape($origin)."'";
-		$sql .= ", ".$this->id;
-		$sql .= ", '".$this->db->escape($this->element)."'";
+		$sql .= ", '" . $this->db->escape($origin) . "'";
+		$sql .= ", " . $this->id;
+		$sql .= ", '" . $this->db->escape($this->element) . "'";
 		$sql .= ")";
 
-		dol_syslog(get_class($this)."::add_object_linked", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
+		dol_syslog(get_class($this) . "::add_object_linked", LOG_DEBUG);
+		if ($this->db->query($sql)) {
+			if (!$notrigger) {
+				// Call trigger
+				$this->context['link_origin'] = $origin;
+				$this->context['link_origin_id'] = $origin_id;
+				$result = $this->call_trigger('OBJECT_LINK_INSERT', $f_user);
+				if ($result < 0) {
+					$error++;
+				}
+				// End call triggers
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			$error++;
+		}
+
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
-			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return 0;
 		}
@@ -3502,38 +3521,61 @@ abstract class CommonObject
 	 *	@param  string	$sourcetype		Object source type
 	 *	@param  int		$targetid		Object target id
 	 *	@param  string	$targettype		Object target type
+	 * 	@param	User	$f_user			User that create
+	 * 	@param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
 	 *	@return							int	>0 if OK, <0 if KO
 	 *	@see	add_object_linked(), fetObjectLinked(), deleteObjectLinked()
 	 */
-	public function updateObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '')
+	public function updateObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '', $f_user = null, $notrigger = 0)
 	{
+		global $user;
 		$updatesource = false;
 		$updatetarget = false;
+		$f_user = isset($f_user) ? $f_user : $user;
 
 		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) $updatesource = true;
 		elseif (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) $updatetarget = true;
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."element_element SET ";
-		if ($updatesource)
-		{
-			$sql .= "fk_source = ".$sourceid;
-			$sql .= ", sourcetype = '".$this->db->escape($sourcetype)."'";
-			$sql .= " WHERE fk_target = ".$this->id;
-			$sql .= " AND targettype = '".$this->db->escape($this->element)."'";
-		} elseif ($updatetarget)
-		{
-			$sql .= "fk_target = ".$targetid;
-			$sql .= ", targettype = '".$this->db->escape($targettype)."'";
-			$sql .= " WHERE fk_source = ".$this->id;
-			$sql .= " AND sourcetype = '".$this->db->escape($this->element)."'";
+		$this->db->begin();
+		$error = 0;
+
+		$sql = "UPDATE " . MAIN_DB_PREFIX . "element_element SET ";
+		if ($updatesource) {
+			$sql .= "fk_source = " . $sourceid;
+			$sql .= ", sourcetype = '" . $this->db->escape($sourcetype) . "'";
+			$sql .= " WHERE fk_target = " . $this->id;
+			$sql .= " AND targettype = '" . $this->db->escape($this->element) . "'";
+		} elseif ($updatetarget) {
+			$sql .= "fk_target = " . $targetid;
+			$sql .= ", targettype = '" . $this->db->escape($targettype) . "'";
+			$sql .= " WHERE fk_source = " . $this->id;
+			$sql .= " AND sourcetype = '" . $this->db->escape($this->element) . "'";
 		}
 
-		dol_syslog(get_class($this)."::updateObjectLinked", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
-			return 1;
+		dol_syslog(get_class($this) . "::updateObjectLinked", LOG_DEBUG);
+		if ($this->db->query($sql)) {
+			if (!$notrigger) {
+				// Call trigger
+				$this->context['link_source_id'] = $sourceid;
+				$this->context['link_source_type'] = $sourcetype;
+				$this->context['link_target_id'] = $targetid;
+				$this->context['link_target_type'] = $targettype;
+				$result = $this->call_trigger('OBJECT_LINK_UPDATE', $f_user);
+				if ($result < 0) {
+					$error++;
+				}
+				// End call triggers
+			}
 		} else {
 			$this->error = $this->db->lasterror();
+			$error++;
+		}
+
+		if (!$error) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
 			return -1;
 		}
 	}
@@ -3546,13 +3588,17 @@ abstract class CommonObject
 	 *	@param  int		$targetid		Object target id
 	 *	@param  string	$targettype		Object target type
 	 *  @param	int		$rowid			Row id of line to delete. If defined, other parameters are not used.
+	 * 	@param	User	$f_user			User that create
+	 * 	@param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
 	 *	@return     					int	>0 if OK, <0 if KO
 	 *	@see	add_object_linked(), updateObjectLinked(), fetchObjectLinked()
 	 */
-	public function deleteObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '', $rowid = '')
+	public function deleteObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '', $rowid = '', $f_user = null, $notrigger = 0)
 	{
+		global $user;
 		$deletesource = false;
 		$deletetarget = false;
+		$f_user = isset($f_user) ? $f_user : $user;
 
 		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) $deletesource = true;
 		elseif (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) $deletetarget = true;
@@ -3561,36 +3607,56 @@ abstract class CommonObject
 		$sourcetype = (!empty($sourcetype) ? $sourcetype : $this->element);
 		$targetid = (!empty($targetid) ? $targetid : $this->id);
 		$targettype = (!empty($targettype) ? $targettype : $this->element);
+		$this->db->begin();
+		$error = 0;
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_element";
-		$sql .= " WHERE";
-		if ($rowid > 0)
-		{
-			$sql .= " rowid = ".$rowid;
-		} else {
-			if ($deletesource)
-			{
-				$sql .= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";
-				$sql .= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";
-			} elseif ($deletetarget)
-			{
-				$sql .= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";
-				$sql .= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";
+		if (!$notrigger) {
+			// Call trigger
+			$this->context['link_id'] = $rowid;
+			$this->context['link_source_id'] = $sourceid;
+			$this->context['link_source_type'] = $sourcetype;
+			$this->context['link_target_id'] = $targetid;
+			$this->context['link_target_type'] = $targettype;
+			$result = $this->call_trigger('OBJECT_LINK_DELETE', $f_user);
+			if ($result < 0) {
+				$error++;
+			}
+			// End call triggers
+		}
+
+		if (!$error) {
+			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "element_element";
+			$sql .= " WHERE";
+			if ($rowid > 0) {
+				$sql .= " rowid = " . $rowid;
 			} else {
-				$sql .= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";
-				$sql .= " OR";
-				$sql .= " (fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."')";
+				if ($deletesource) {
+					$sql .= " fk_source = " . $sourceid . " AND sourcetype = '" . $this->db->escape($sourcetype) . "'";
+					$sql .= " AND fk_target = " . $this->id . " AND targettype = '" . $this->db->escape($this->element) . "'";
+				} elseif ($deletetarget) {
+					$sql .= " fk_target = " . $targetid . " AND targettype = '" . $this->db->escape($targettype) . "'";
+					$sql .= " AND fk_source = " . $this->id . " AND sourcetype = '" . $this->db->escape($this->element) . "'";
+				} else {
+					$sql .= " (fk_source = " . $this->id . " AND sourcetype = '" . $this->db->escape($this->element) . "')";
+					$sql .= " OR";
+					$sql .= " (fk_target = " . $this->id . " AND targettype = '" . $this->db->escape($this->element) . "')";
+				}
+			}
+
+			dol_syslog(get_class($this) . "::deleteObjectLinked", LOG_DEBUG);
+			if (!$this->db->query($sql)) {
+				$this->error = $this->db->lasterror();
+				$this->errors[] = $this->error;
+				$error++;
 			}
 		}
 
-		dol_syslog(get_class($this)."::deleteObjectLinked", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
+		if (!$error) {
+			$this->db->commit();
 			return 1;
 		} else {
-			$this->error = $this->db->lasterror();
-			$this->errors[] = $this->error;
-			return -1;
+			$this->db->rollback();
+			return 0;
 		}
 	}
 

From 4b9bb824d0bd9e8af3d857dc451d4770cf8fb7c4 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Wed, 6 Jan 2021 11:16:51 +0100
Subject: [PATCH 832/888] FIX balance starting and ending fiscal month #14197

---
 htdocs/accountancy/bookkeeping/balance.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 375b17e3b96..5550c837812 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -87,6 +87,7 @@ if (empty($search_date_start) && !GETPOSTISSET('formfilteraction'))
 	} else {
 		$month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 		$year_start = dol_print_date(dol_now(), '%Y');
+		if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
 		$year_end = $year_start + 1;
 		$month_end = $month_start - 1;
 		if ($month_end < 1)

From fadfe4a4bf7a9d9967dd71c0da305ea7beb1ead3 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 6 Jan 2021 11:39:12 +0100
Subject: [PATCH 833/888] FIX syntax error

---
 htdocs/admin/company.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 2801951974e..16f72ef6911 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -393,7 +393,7 @@ print '<tr class="liste_titre"><th class="titlefield wordbreak">'.$langs->trans(
 
 // Name
 print '<tr class="oddeven"><td class="fieldrequired wordbreak"><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
-print '<input name="nom" id="name" class="minwidth200" value="'.dol_escape_htmltag((GETPOSTISSET('nom') ? GETPOST('nom', 'nohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? $conf->global->MAIN_INFO_SOCIETE_NOM : '')).'"'.(empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? ' autofocus="autofocus"' : '').'></td></tr>'."\n";
+print '<input name="nom" id="name" class="minwidth200" value="'.dol_escape_htmltag((GETPOSTISSET('nom') ? GETPOST('nom', 'nohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? $conf->global->MAIN_INFO_SOCIETE_NOM : '')).'"'.(empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? ' autofocus="autofocus"' : '')).'></td></tr>'."\n";
 
 // Address
 print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_ADDRESS">'.$langs->trans("CompanyAddress").'</label></td><td>';
@@ -401,10 +401,10 @@ print '<textarea name="MAIN_INFO_SOCIETE_ADDRESS" id="MAIN_INFO_SOCIETE_ADDRESS"
 
 // Zip
 print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_ZIP">'.$langs->trans("CompanyZip").'</label></td><td>';
-print '<input class="width100" name="MAIN_INFO_SOCIETE_ZIP" id="MAIN_INFO_SOCIETE_ZIP" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_INFO_SOCIETE_ZIP') ? GETPOST('MAIN_INFO_SOCIETE_ZIP', 'alpha') : (!empty($conf->global->MAIN_INFO_SOCIETE_ZIP) ? $conf->global->MAIN_INFO_SOCIETE_ZIP : '')).'"></td></tr>'."\n";
+print '<input class="width100" name="MAIN_INFO_SOCIETE_ZIP" id="MAIN_INFO_SOCIETE_ZIP" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_INFO_SOCIETE_ZIP') ? GETPOST('MAIN_INFO_SOCIETE_ZIP', 'alpha') : (!empty($conf->global->MAIN_INFO_SOCIETE_ZIP) ? $conf->global->MAIN_INFO_SOCIETE_ZIP : ''))).'"></td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_TOWN">'.$langs->trans("CompanyTown").'</label></td><td>';
-print '<input name="MAIN_INFO_SOCIETE_TOWN" class="minwidth200" id="MAIN_INFO_SOCIETE_TOWN" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_INFO_SOCIETE_TOWN') ? GETPOST('MAIN_INFO_SOCIETE_TOWN', 'nohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_TOWN) ? $conf->global->MAIN_INFO_SOCIETE_TOWN : '')).'"></td></tr>'."\n";
+print '<input name="MAIN_INFO_SOCIETE_TOWN" class="minwidth200" id="MAIN_INFO_SOCIETE_TOWN" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_INFO_SOCIETE_TOWN') ? GETPOST('MAIN_INFO_SOCIETE_TOWN', 'nohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_TOWN) ? $conf->global->MAIN_INFO_SOCIETE_TOWN : ''))).'"></td></tr>'."\n";
 
 // Country
 print '<tr class="oddeven"><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
@@ -431,25 +431,25 @@ print '</td></tr>'."\n";
 // Phone
 print '<tr class="oddeven"><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
 print img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright');
-print '<input name="tel" id="phone" value="'.dol_escape_htmltag((GETPOSTISSET('tel') ? GETPOST('tel', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_TEL) ? $conf->global->MAIN_INFO_SOCIETE_TEL : '')).'"></td></tr>';
+print '<input name="tel" id="phone" value="'.dol_escape_htmltag((GETPOSTISSET('tel') ? GETPOST('tel', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_TEL) ? $conf->global->MAIN_INFO_SOCIETE_TEL : ''))).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Fax
 print '<tr class="oddeven"><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
 print img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright');
-print '<input name="fax" id="fax" value="'.dol_escape_htmltag((GETPOSTISSET('fax') ? GETPOST('fax', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_FAX) ? $conf->global->MAIN_INFO_SOCIETE_FAX : '')).'"></td></tr>';
+print '<input name="fax" id="fax" value="'.dol_escape_htmltag((GETPOSTISSET('fax') ? GETPOST('fax', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_FAX) ? $conf->global->MAIN_INFO_SOCIETE_FAX : ''))).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Email
 print '<tr class="oddeven"><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
 print img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright');
-print '<input name="mail" id="email" class="minwidth200" value="'.dol_escape_htmltag((GETPOSTISSET('mail') ? GETPOST('mail', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL) ? $conf->global->MAIN_INFO_SOCIETE_MAIL : '')).'"></td></tr>';
+print '<input name="mail" id="email" class="minwidth200" value="'.dol_escape_htmltag((GETPOSTISSET('mail') ? GETPOST('mail', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL) ? $conf->global->MAIN_INFO_SOCIETE_MAIL : ''))).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Web
 print '<tr class="oddeven"><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
 print img_picto('', 'globe', '', false, 0, 0, '', 'paddingright');
-print '<input name="web" id="web" class="minwidth300" value="'.dol_escape_htmltag((GETPOSTISSET('web') ? GETPOST('web', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_WEB) ? $conf->global->MAIN_INFO_SOCIETE_WEB : '')).'"></td></tr>';
+print '<input name="web" id="web" class="minwidth300" value="'.dol_escape_htmltag((GETPOSTISSET('web') ? GETPOST('web', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_WEB) ? $conf->global->MAIN_INFO_SOCIETE_WEB : ''))).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Barcode
@@ -457,7 +457,7 @@ if (!empty($conf->barcode->enabled)) {
 	print '<tr class="oddeven"><td>';
 	print '<label for="barcode">'.$langs->trans("Gencod").'</label></td><td>';
 	print '<span class="fa paddingright fa-barcode"></span>';
-	print '<input name="barcode" id="barcode" class="minwidth150" value="'.dol_escape_htmltag((GETPOSTISSET('barcode') ? GETPOST('barcode', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_GENCODE) ? $conf->global->MAIN_INFO_SOCIETE_GENCODE : '')).'"></td></tr>';
+	print '<input name="barcode" id="barcode" class="minwidth150" value="'.dol_escape_htmltag((GETPOSTISSET('barcode') ? GETPOST('barcode', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_GENCODE) ? $conf->global->MAIN_INFO_SOCIETE_GENCODE : ''))).'"></td></tr>';
 	print '</td></tr>';
 }
 
@@ -549,17 +549,17 @@ $langs->load("companies");
 
 // Managing Director(s)
 print '<tr class="oddeven"><td><label for="director">'.$langs->trans("ManagingDirectors").'</label></td><td>';
-print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="directors" class="minwidth200" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_INFO_SOCIETE_MANAGERS') ? GETPOST('MAIN_INFO_SOCIETE_MANAGERS', 'nohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_MANAGERS) ? $conf->global->MAIN_INFO_SOCIETE_MANAGERS : '')).'"></td></tr>';
+print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="directors" class="minwidth200" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_INFO_SOCIETE_MANAGERS') ? GETPOST('MAIN_INFO_SOCIETE_MANAGERS', 'nohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_MANAGERS) ? $conf->global->MAIN_INFO_SOCIETE_MANAGERS : ''))).'"></td></tr>';
 
 // GDPR contact
 print '<tr class="oddeven"><td>';
 print $form->textwithpicto($langs->trans("GDPRContact"), $langs->trans("GDPRContactDesc"));
 print '</td><td>';
-print '<input name="MAIN_INFO_GDPR" id="infodirector" class="minwidth500" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_GDPR) ? $conf->global->MAIN_INFO_GDPR : GETPOST("MAIN_INFO_GDPR", 'nohtml')).'"></td></tr>';
+print '<input name="MAIN_INFO_GDPR" id="infodirector" class="minwidth500" value="'.dol_escape_htmltag((GETPOSTISSET("MAIN_INFO_GDPR") ? GETPOST("MAIN_INFO_GDPR", 'nohtml') : (!empty($conf->global->MAIN_INFO_GDPR) ? $conf->global->MAIN_INFO_GDPR : ''))).'"></td></tr>';
 
 // Capital
 print '<tr class="oddeven"><td><label for="capital">'.$langs->trans("Capital").'</label></td><td>';
-print '<input name="capital" id="capital" class="maxwidth100" value="'.dol_escape_htmltag((GETPOSTISSET('capital') ? GETPOST('capital', 'nohtml') : (!empty($conf->global->MAIN_INFO_CAPITAL) ? $conf->global->MAIN_INFO_CAPITAL : '')).'"></td></tr>';
+print '<input name="capital" id="capital" class="maxwidth100" value="'.dol_escape_htmltag((GETPOSTISSET('capital') ? GETPOST('capital', 'nohtml') : (!empty($conf->global->MAIN_INFO_CAPITAL) ? $conf->global->MAIN_INFO_CAPITAL : ''))).'"></td></tr>';
 
 // Juridical Status
 print '<tr class="oddeven"><td><label for="forme_juridique_code">'.$langs->trans("JuridicalStatus").'</label></td><td>';

From 4691b5e4df6b8f9ffaf4741bf0c6974a742b8914 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 6 Jan 2021 10:41:49 +0000
Subject: [PATCH 834/888] Fixing style errors.

---
 htdocs/admin/delais.php | 54 ++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 0b8c639622f..2502a257ae7 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -179,10 +179,10 @@ if ($action == 'update')
             }
         }
     }
-    
+
     dolibarr_set_const($db, "MAIN_DISABLE_METEO", $_POST["MAIN_DISABLE_METEO"], 'chaine', 0, '', $conf->entity);
     dolibarr_set_const($db, "MAIN_USE_METEO_WITH_PERCENTAGE", GETPOST("MAIN_USE_METEO_WITH_PERCENTAGE"), 'chaine', 0, '', $conf->entity);
-    
+
     // For update value with percentage
     $plus = '';
     if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $plus = '_PERCENTAGE';
@@ -212,10 +212,10 @@ if ($action == 'edit')
     print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" name="form_index">';
     print '<input type="hidden" name="token" value="'.newToken().'">';
     print '<input type="hidden" name="action" value="update">';
-    
+
     print '<table class="noborder centpercent">';
     print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
-    
+
     foreach ($modules as $module => $delays)
     {
         if (!empty($conf->$module->enabled))
@@ -230,29 +230,29 @@ if ($action == 'edit')
             }
         }
     }
-    
+
     print '</table>';
-    
+
     print '<br>';
-    
+
     // Show if meteo is enabled
     print '<table class="noborder centpercent">';
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
-    
+
     print '<tr class="oddeven">';
     print '<td>'.$langs->trans("MAIN_DISABLE_METEO").'</td><td class="center">';
     print $form->selectarray('MAIN_DISABLE_METEO', $labelmeteo, (empty($conf->global->MAIN_DISABLE_METEO) ? 0 : $conf->global->MAIN_DISABLE_METEO));
     print '</td></tr>';
-    
+
     print '</table>';
 } else {
     /*
      * Show parameters
      */
-    
+
     print '<table class="noborder centpercent">';
     print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
-    
+
     foreach ($modules as $module => $delays)
     {
         if (!empty($conf->$module->enabled))
@@ -267,20 +267,20 @@ if ($action == 'edit')
             }
         }
     }
-    
+
     print '</table>';
-    
+
     print '<br>';
-    
+
     // Show if meteo is enabled
     print '<table class="noborder centpercent">';
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
-    
+
     print '<tr class="oddeven">';
     print '<td>'.$langs->trans("MAIN_DISABLE_METEO").'</td><td class="center">';
     print $labelmeteo[$conf->global->MAIN_DISABLE_METEO];
     print '</td></tr>';
-    
+
     print '</table>';
 }
 
@@ -290,7 +290,7 @@ print '<br>';
 if ($conf->global->MAIN_DISABLE_METEO != 1) {
     // Show logo for weather
     print '<span class="opacitymedium">'.$langs->trans("DescWeather").'</span> ';
-    
+
     if ($action == 'edit') {
         $str_mode_std = $langs->trans('MeteoStdModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->transnoentitiesnoconv('MeteoPercentageMod'));
         $str_mode_percentage = $langs->trans('MeteoPercentageModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->transnoentitiesnoconv('MeteoStdMod'));
@@ -298,14 +298,14 @@ if ($conf->global->MAIN_DISABLE_METEO != 1) {
         else $str_mode_enabled = $str_mode_percentage;
         print '<a href="#" onclick="return false;" id="change_mode">'.$str_mode_enabled.'</a>';
         print '<input type="hidden" id="MAIN_USE_METEO_WITH_PERCENTAGE" name="MAIN_USE_METEO_WITH_PERCENTAGE" value="'.$conf->global->MAIN_USE_METEO_WITH_PERCENTAGE.'" />';
-        
+
         print '<br><br>';
     } else {
         if (empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) print $langs->trans('MeteoStdModEnabled');
         else print $langs->trans('MeteoPercentageModEnabled');
         print '<br><br>';
     }
-    
+
     $offset = 0;
     $cursor = 10; // By default
     //if (! empty($conf->global->MAIN_METEO_OFFSET)) $offset=$conf->global->MAIN_METEO_OFFSET;
@@ -315,11 +315,11 @@ if ($conf->global->MAIN_DISABLE_METEO != 1) {
     $level2 = $offset + 2 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL2)) $level2 = $conf->global->MAIN_METEO_LEVEL2;
     $level3 = $offset + 3 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL3)) $level3 = $conf->global->MAIN_METEO_LEVEL3;
     $text = ''; $options = 'class="valignmiddle" height="60px"';
-    
-    
+
+
     if ($action == 'edit') {
         print '<div id="standard" '.(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '' : 'style="display:none;"').'>';
-        
+
         print '<div>';
         print '<div class="inline-block" style="padding-right: 20px">';
         print img_weather($text, 0, $options);
@@ -335,11 +335,11 @@ if ($conf->global->MAIN_DISABLE_METEO != 1) {
         print ' &lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL3" value="'.$level3.'"/></td>';
         print '</div>';
         print '</div>';
-        
+
         print '</div>';
-        
+
         print '<div id="percentage" '.(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? 'style="display:none;"' : '').'>';
-        
+
         print '<div>';
         print '<div class="inline-block" style="padding-right: 20px">';
         print img_weather($text, 0, $options);
@@ -355,9 +355,9 @@ if ($conf->global->MAIN_DISABLE_METEO != 1) {
         print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL3" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'"/>&nbsp;%</td>';
         print '</div>';
         print '</div>';
-        
+
         print '</div>';
-        
+
         ?>
 
 		<script type="text/javascript">

From 361d2352a5974583e6b059d95b2321bf993480e4 Mon Sep 17 00:00:00 2001
From: Norbert Penel <homer8173@gmail.com>
Date: Wed, 6 Jan 2021 12:12:14 +0100
Subject: [PATCH 835/888] German date format

fixed by my client, they use a dot in this case :
https://www.wikihow.com/Write-German-Dates
---
 htdocs/langs/de_DE/main.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index 3b75f3e7964..12b4dd65964 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -18,7 +18,7 @@ FormatHourShortJQuery=HH:MI
 FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d %b %Y
-FormatDateText=%d %B %Y
+FormatDateText=%d. %B %Y
 FormatDateHourShort=%d.%m.%Y %H:%M
 FormatDateHourSecShort=%d.%m.%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M

From 50b5226d10547030c0a2cb151935251bb6ec6937 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Wed, 6 Jan 2021 12:40:38 +0100
Subject: [PATCH 836/888] FIX #15465 External user sees last 5 shipments to
 other customers in the dashboard

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

diff --git a/htdocs/core/boxes/box_shipments.php b/htdocs/core/boxes/box_shipments.php
index 4603450b482..dfd726ade22 100644
--- a/htdocs/core/boxes/box_shipments.php
+++ b/htdocs/core/boxes/box_shipments.php
@@ -103,10 +103,11 @@ class box_shipments extends ModeleBoxes
             $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping' AND el.sourcetype IN ('commande')";
             $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid AND el.sourcetype IN ('commande') AND el.targettype = 'shipping'";
             $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
+            if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
             $sql .= " WHERE e.entity IN (".getEntity('expedition').")";
             if (!empty($conf->global->ORDER_BOX_LAST_SHIPMENTS_VALIDATED_ONLY)) $sql .= " AND e.fk_statut = 1";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND sc.fk_user = ".$user->id;
+			if($user->socid)	$sql.= " AND s.rowid = ".$user->socid;
+            if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND sc.fk_user = ".$user->id;
             else $sql .= " ORDER BY e.date_delivery, e.ref DESC ";
             $sql .= $this->db->plimit($max, 0);
 

From 40f2d884ddef99ed55ced3502b95e7e00a7bfa58 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 6 Jan 2021 13:09:42 +0100
Subject: [PATCH 837/888] Update ChangeLog

sorting TakePOS changelogs
minor edits
---
 ChangeLog | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8b9edc38f2c..c5cc42fd2f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -67,7 +67,6 @@ NEW: add search param for close date on order list
 NEW: add show preview for mail attachement on form mail
 NEW: add State/Province origin for products
 NEW: add the workflow interaction close intervention on closing ticket
-NEW: add third order printer to TakePOS
 NEW: add tracking number in list and search_all items
 NEW: add vcard for adherent and user
 NEW: add week number for month view in agenda
@@ -88,16 +87,14 @@ NEW: can edit the list of sending email profiles
 NEW: can enable/disable users in bulk actions
 NEW: can filter on accounting system ref in export of chart of account
 NEW: can filter on container type, language and tags in the list of web pages
-NEW: can hide eatby, sellby dates with option PRODUCT_DISABLE_SELLBY and PRODUCT_DISABLE_EATBY
+NEW: can hide eatby, sellby dates with option PRODUCT_DISABLE_EATBY and PRODUCT_DISABLE_SELLBY
 NEW: can import proposals, sales orders, supplier invoices
 NEW: can set a dedicated SMTP config for sending email from public ticket interface
 NEW: can set tags/categories to website pages
 NEW: can set type of price without tax per default for new sale price creation
 NEW: can use desired stock of a given warehouse for replenishment
-NEW: change thirdparty with barcode scan in TakePOS
 NEW: common behavior for monthly leave list view
 NEW: convert all subscription in datetime
-NEW: can create a thirdparty customer from TakePOS
 NEW: date shipment from order accepts hours
 NEW: price level compatibility for variant
 NEW: delayed payment in TakePOS
@@ -159,6 +156,9 @@ NEW: show tags and status in search list of website pages
 NEW: show user on external calender events (when found)
 NEW: subject title with company name instead of application title in ticket message
 NEW: Support for Samba4 AD
+NEW: TakePOS add third order printer
+NEW: TakePOS can change thirdparty with barcode scan
+NEW: TakePOS can create a thirdparty customer from TakePOS frontend
 NEW: TakePOS connector compatibility with RECEIPT PRINTERS module
 NEW: TakePOS Gift Receipt
 NEW: TakePOS Multicurrency compatibility
@@ -185,7 +185,7 @@ NEW: add substitution key  __MEMBER_TYPE__
 NEW: add substitution key  __TYPE__ 
 NEW: add function dolButtonToOpenUrlInDialogPopup() to be able to open page into a popup
 NEW: show line number on intervention card (via MAIN_VIEW_LINE_NUMBER)
-NEW: Add some fields to link website page to an other object
+NEW: add some fields to link website page to an other object
 NEW: fill ECM src object fields in dol_add_file_process
 NEW: conf to allow to show the full tree in warehouse popup
 NEW: can use parameter ?THEME_DARKMODEENABLED=2 for a preview of theme in dark mode
@@ -201,7 +201,7 @@ NEW: standardizes API thirdparties by email like other object
 NEW: Thirdparty REST API: endpoint to set price level
 NEW: use new category API for project list view
 NEW: Triggers Attributes and Attributes values
-NEW: added incoterms data into the substitution array
+NEW: add incoterms data into the substitution array
 NEW: add send context for ticket
 NEW: add a message in error_log after detection of SQL or script injection
 NEW: add validation of MX domain for emails
@@ -211,7 +211,7 @@ NEW: add param to not show links when output tags
 
 APIs
 NEW: API get contacts list of a given order
-NEW: API endpoint getContacts and Clean results
+NEW: API endpoint getContacts and clean results
 NEW: API can update a payment
 NEW: API get member by thirdparty
 NEW: API get thirdparty by barcode
@@ -223,7 +223,7 @@ NEW: get state dictionary by REST API
 NEW: improve Product API for product variants
 
 HOOKs
-NEW: Hook on propal card
+NEW: add hook on propal card
 NEW: add hooks on newpayment page to allow external payment modules
 NEW: add hooks on stats pages
 NEW: add formConfirm hook on product page

From 19ee163f31e29857e611b7c57268a968d2203ddd Mon Sep 17 00:00:00 2001
From: jpb <jean-pascal.boudet@atm-consulting.fr>
Date: Wed, 6 Jan 2021 13:54:51 +0100
Subject: [PATCH 838/888] Fix add ticket on elementList

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

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index cce441c4052..92675cbc883 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -577,6 +577,7 @@ if ($id == 11)
         // 'contract' => $langs->trans('Contract'),
         'project' => $langs->trans('Project'),
         'project_task' => $langs->trans('Task'),
+        'ticket' => $langs->trans('Ticket'),
         'agenda' => $langs->trans('Agenda'),
         'dolresource' => $langs->trans('Resource'),
         // old deprecated
@@ -1454,6 +1455,7 @@ if ($id)
                         foreach ($fieldlist as $field => $value)
                         {
                         	//var_dump($fieldlist);
+
                         	$class = '';
                         	$showfield = 1;
                         	$valuetoshow = $obj->{$fieldlist[$field]};

From e44b14364a30f116cdebec4bc2453b096c00163b Mon Sep 17 00:00:00 2001
From: quentin <quentin.vial-gouteyron@atm-consulting.fr>
Date: Wed, 6 Jan 2021 14:17:06 +0100
Subject: [PATCH 839/888] FIX useless tracking number displayed on pdf if empty

---
 htdocs/core/modules/expedition/doc/pdf_rouget.modules.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index 506e72ba1b0..7fc3d622254 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -373,14 +373,15 @@ class pdf_rouget extends ModelePdfExpedition
 					$tab_top_alt = $tab_top;
 
 					$pdf->SetFont('', 'B', $default_font_size - 2);
-					$pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 1, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, 0, 1, false, true, 'L');
 
-					$tab_top_alt = $pdf->GetY();
 					//$tab_top_alt += 1;
 
 					// Tracking number
 					if (!empty($object->tracking_number))
 					{
+						$pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 1, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, 0, 1, false, true, 'L');
+						$tab_top_alt = $pdf->GetY();
+						
 						$object->getUrlTrackingStatus($object->tracking_number);
 						if (!empty($object->tracking_url))
 						{

From ca557cfacd7ba5e4adad85c8ff9254de8020848d Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 6 Jan 2021 13:22:35 +0000
Subject: [PATCH 840/888] Fixing style errors.

---
 htdocs/core/modules/expedition/doc/pdf_rouget.modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index 7fc3d622254..af2cbbca8cc 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -381,7 +381,7 @@ class pdf_rouget extends ModelePdfExpedition
 					{
 						$pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 1, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, 0, 1, false, true, 'L');
 						$tab_top_alt = $pdf->GetY();
-						
+
 						$object->getUrlTrackingStatus($object->tracking_number);
 						if (!empty($object->tracking_url))
 						{

From 6f05ba4db9be54f88986b99f387e5748e4b39e55 Mon Sep 17 00:00:00 2001
From: Adrien Raze <adrien.raze@atm-consulting.fr>
Date: Wed, 6 Jan 2021 14:26:40 +0100
Subject: [PATCH 841/888] NEW : Added of doActions hooks in bank/line.php and
 bank/transfer.php

---
 htdocs/compta/bank/line.php     | 6 +++++-
 htdocs/compta/bank/transfer.php | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index 33f7f3a0352..467f6b7b78b 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -58,11 +58,15 @@ if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'banque', $fieldvalue, 'bank_account', '', '', $fieldtype);
 if (!$user->rights->banque->lire && !$user->rights->banque->consolidate) accessforbidden();
 
+$hookmanager->initHooks(array('bankline'));
+
 
 /*
  * Actions
  */
-
+$parameters = array('socid' => $socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 if ($cancel)
 {
 	if ($backtopage)
diff --git a/htdocs/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php
index 7e1b7fd0567..5aeec4f444c 100644
--- a/htdocs/compta/bank/transfer.php
+++ b/htdocs/compta/bank/transfer.php
@@ -40,11 +40,14 @@ if (!$user->rights->banque->transfer)
 $action = GETPOST('action', 'aZ09');
 $error = 0;
 
+$hookmanager->initHooks(array('banktransfer'));
 
 /*
  * Actions
  */
-
+$parameters = array('socid' => $socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 if ($action == 'add')
 {
 	$langs->load("errors");

From e8ba4de83248206d4f2fb6116d5e8c816ae360b9 Mon Sep 17 00:00:00 2001
From: kevin <kevin.giuga@atm-consulting.fr>
Date: Wed, 6 Jan 2021 14:46:56 +0100
Subject: [PATCH 842/888] Fix #14353

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

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index ef8bd79b519..c063e636a91 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1107,7 +1107,7 @@ if (empty($reshook))
 
         $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 
-		if (GETPOST('price_ht') != '')
+		if (GETPOST('price_ht') != '' || GETPOST('multicurrency_subprice') != '')
 		{
 			$up = price2num(GETPOST('price_ht'));
 			$price_base_type = 'HT';

From ae7b8e7f5e3fcfddfe53897b8aed462aeaf70429 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Wed, 6 Jan 2021 15:15:51 +0100
Subject: [PATCH 843/888] Fix unit selection on object edit line

---
 htdocs/core/class/html.form.class.php   |  5 ++++-
 htdocs/core/tpl/objectline_edit.tpl.php | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 6f2cbcd1955..97c26954bf7 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3892,7 +3892,7 @@ class Form
 	 *      @param	int		$showempty		Add a nempty line
 	 * 		@return	string                  HTML select
 	 */
-	public function selectUnits($selected = '', $htmlname = 'units', $showempty = 0)
+	public function selectUnits($selected = '', $htmlname = 'units', $showempty = 0, $unit_type = false)
 	{
 		global $langs;
 
@@ -3902,6 +3902,9 @@ class Form
 
 		$sql = 'SELECT rowid, label, code from '.MAIN_DB_PREFIX.'c_units';
 		$sql .= ' WHERE active > 0';
+		if(!empty($unit_type)){
+			$sql .= ' AND unit_type = "'.$this->db->escape($unit_type).'" ';
+		}
 
 		$resql = $this->db->query($sql);
 		if ($resql && $this->db->num_rows($resql) > 0)
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index bc6b87a3353..4546cb7d089 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -191,9 +191,20 @@ $coldisplay++;
 	<?php
 	if (!empty($conf->global->PRODUCT_USE_UNITS))
 	{
+		$unit_type = false;
+		// limit unit select to unit type
+		if(!empty($line->fk_unit) && empty($conf->global->MAIN_EDIT_LINE_ALLOW_ALL_UNIT_TYPE)){
+			if(!class_exists('CUnits')) include_once DOL_DOCUMENT_ROOT . '/core/class/cunits.class.php';
+			$cUnit = new CUnits($line->db);
+			if($cUnit->fetch($line->fk_unit) > 0){
+				if(!empty($cUnit->unit_type)){
+					$unit_type = $cUnit->unit_type;
+				}
+			}
+		}
 		$coldisplay++;
 		print '<td class="left">';
-		print $form->selectUnits($line->fk_unit, "units");
+		print $form->selectUnits($line->fk_unit, "units", 0, $unit_type);
 		print '</td>';
 	}
 	?>

From 5164a96aa0e52adaeeab3c8f414c8cba955b68da Mon Sep 17 00:00:00 2001
From: kevin <kevin.giuga@atm-consulting.fr>
Date: Wed, 6 Jan 2021 15:35:33 +0100
Subject: [PATCH 844/888] Fix #15829

---
 htdocs/societe/class/societe.class.php | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index ee91363dba1..bc808391562 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3650,7 +3650,7 @@ class Societe extends CommonObject
     public function create_from_member(Adherent $member, $socname = '', $socalias = '', $customercode = '')
 	{
         // phpcs:enable
-		global $user, $langs;
+		global $conf, $user, $langs;
 
 		dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
 
@@ -3683,6 +3683,22 @@ class Societe extends CommonObject
 		$result = $this->create($user);
 		if ($result >= 0)
 		{
+			// Auto-create contact on thirdparty creation
+			if (!empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT))
+			{
+				// Fill fields needed by contact
+				$this->name_bis = $member->lastname;
+				$this->firstname = $member->firstname;
+				$this->civility_id = $member->civility_id;
+				dol_syslog("We ask to create a contact/address too", LOG_DEBUG);
+				$result = $this->create_individual($user);
+				if ($result < 0)
+				{
+					setEventMessages($this->error, $this->errors, 'errors');
+					return -1;
+				}
+			}
+
 			$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
 			$sql .= " SET fk_soc=".$this->id;
 			$sql .= " WHERE rowid=".$member->id;

From 99b977a08e892e240f167837d8ff2a39538bc729 Mon Sep 17 00:00:00 2001
From: jpb <jean-pascal.boudet@atm-consulting.fr>
Date: Wed, 6 Jan 2021 15:38:30 +0100
Subject: [PATCH 845/888] add categories params  on llxHeader filter

---
 htdocs/product/list.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 5e50925fbbe..dc56f607841 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -466,7 +466,11 @@ if ($resql)
 		}
 	}
 
-	llxHeader('', $title, $helpurl, '');
+    foreach ($searchCategoryProductList as $searchCategoryProduct) {
+        $paramsCat .= "&search_category_product_list[]=".urlencode($searchCategoryProduct);
+    }
+    llxHeader('', $title, $helpurl, '',0,0,"","",$paramsCat);
+
 
 	// Displays product removal confirmation
 	if (GETPOST('delprod')) {

From f9ae8acbc76d11749d43d899181936aef4bbeba0 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 6 Jan 2021 14:47:54 +0000
Subject: [PATCH 846/888] Fixing style errors.

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

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index dc56f607841..b3b4e3be2dd 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -469,7 +469,7 @@ if ($resql)
     foreach ($searchCategoryProductList as $searchCategoryProduct) {
         $paramsCat .= "&search_category_product_list[]=".urlencode($searchCategoryProduct);
     }
-    llxHeader('', $title, $helpurl, '',0,0,"","",$paramsCat);
+    llxHeader('', $title, $helpurl, '', 0, 0, "", "", $paramsCat);
 
 
 	// Displays product removal confirmation

From cf324f75d734f8dc7a83e0d54e16902331656f1a Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Wed, 6 Jan 2021 16:01:19 +0100
Subject: [PATCH 847/888] Fix bom line unit display #13831

---
 htdocs/bom/tpl/objectline_create.tpl.php | 1 -
 htdocs/bom/tpl/objectline_edit.tpl.php   | 1 -
 htdocs/bom/tpl/objectline_view.tpl.php   | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index eeffb625381..20d523ff512 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -116,7 +116,6 @@ if ($conf->global->PRODUCT_USE_UNITS)
 {
     $coldisplay++;
 	print '<td class="nobottom linecoluseunit left">';
-	print $form->selectUnits($line->fk_unit, "units");
 	print '</td>';
 }
 
diff --git a/htdocs/bom/tpl/objectline_edit.tpl.php b/htdocs/bom/tpl/objectline_edit.tpl.php
index 3840f495dea..31a4b1ee008 100644
--- a/htdocs/bom/tpl/objectline_edit.tpl.php
+++ b/htdocs/bom/tpl/objectline_edit.tpl.php
@@ -112,7 +112,6 @@ if ($conf->global->PRODUCT_USE_UNITS)
 {
     $coldisplay++;
 	print '<td class="nobottom linecoluseunit left">';
-	print $form->selectUnits($line->fk_unit, "units");
 	print '</td>';
 }
 
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index e1e94dc2076..c9770465458 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -82,7 +82,7 @@ print '</td>';
 if ($conf->global->PRODUCT_USE_UNITS)
 {
 	print '<td class="linecoluseunit nowrap left">';
-	$label = $line->getLabelOfUnit('short');
+	$label = $tmpproduct->getLabelOfUnit('short');
 	if ($label !== '') {
 		print $langs->trans($label);
 	}

From 2be2cdaadf67bdebb3b09e40fdfbeace137dba98 Mon Sep 17 00:00:00 2001
From: jpb <jean-pascal.boudet@atm-consulting.fr>
Date: Wed, 6 Jan 2021 16:06:03 +0100
Subject: [PATCH 848/888] fix style errors

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

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index dc56f607841..b3b4e3be2dd 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -469,7 +469,7 @@ if ($resql)
     foreach ($searchCategoryProductList as $searchCategoryProduct) {
         $paramsCat .= "&search_category_product_list[]=".urlencode($searchCategoryProduct);
     }
-    llxHeader('', $title, $helpurl, '',0,0,"","",$paramsCat);
+    llxHeader('', $title, $helpurl, '', 0, 0, "", "", $paramsCat);
 
 
 	// Displays product removal confirmation

From dd19da66b27778a8612cf1192a404bf0e61c649d Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Wed, 6 Jan 2021 17:33:19 +0100
Subject: [PATCH 849/888] fix stickler

---
 htdocs/core/class/html.form.class.php   | 2 +-
 htdocs/core/tpl/objectline_edit.tpl.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 97c26954bf7..7d74276ce90 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3902,7 +3902,7 @@ class Form
 
 		$sql = 'SELECT rowid, label, code from '.MAIN_DB_PREFIX.'c_units';
 		$sql .= ' WHERE active > 0';
-		if(!empty($unit_type)){
+		if (!empty($unit_type)){
 			$sql .= ' AND unit_type = "'.$this->db->escape($unit_type).'" ';
 		}
 
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 4546cb7d089..a59ab4b881a 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -194,10 +194,10 @@ $coldisplay++;
 		$unit_type = false;
 		// limit unit select to unit type
 		if(!empty($line->fk_unit) && empty($conf->global->MAIN_EDIT_LINE_ALLOW_ALL_UNIT_TYPE)){
-			if(!class_exists('CUnits')) include_once DOL_DOCUMENT_ROOT . '/core/class/cunits.class.php';
+			if (!class_exists('CUnits')) include_once DOL_DOCUMENT_ROOT . '/core/class/cunits.class.php';
 			$cUnit = new CUnits($line->db);
-			if($cUnit->fetch($line->fk_unit) > 0){
-				if(!empty($cUnit->unit_type)){
+			if ($cUnit->fetch($line->fk_unit) > 0){
+				if (!empty($cUnit->unit_type)){
 					$unit_type = $cUnit->unit_type;
 				}
 			}

From 7fb0eb575689f6c32da85806c454b757cf15ac3d Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Wed, 6 Jan 2021 17:34:04 +0100
Subject: [PATCH 850/888] fix stickler

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

diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index a59ab4b881a..88dfa07e028 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -193,7 +193,7 @@ $coldisplay++;
 	{
 		$unit_type = false;
 		// limit unit select to unit type
-		if(!empty($line->fk_unit) && empty($conf->global->MAIN_EDIT_LINE_ALLOW_ALL_UNIT_TYPE)){
+		if (!empty($line->fk_unit) && empty($conf->global->MAIN_EDIT_LINE_ALLOW_ALL_UNIT_TYPE)){
 			if (!class_exists('CUnits')) include_once DOL_DOCUMENT_ROOT . '/core/class/cunits.class.php';
 			$cUnit = new CUnits($line->db);
 			if ($cUnit->fetch($line->fk_unit) > 0){

From 7372a1828325be5d0e3880a0fe3989f374349ecc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 Jan 2021 19:56:49 +0100
Subject: [PATCH 851/888] Update box_shipments.php

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

diff --git a/htdocs/core/boxes/box_shipments.php b/htdocs/core/boxes/box_shipments.php
index dfd726ade22..2621ab3637c 100644
--- a/htdocs/core/boxes/box_shipments.php
+++ b/htdocs/core/boxes/box_shipments.php
@@ -106,7 +106,7 @@ class box_shipments extends ModeleBoxes
             if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
             $sql .= " WHERE e.entity IN (".getEntity('expedition').")";
             if (!empty($conf->global->ORDER_BOX_LAST_SHIPMENTS_VALIDATED_ONLY)) $sql .= " AND e.fk_statut = 1";
-			if($user->socid)	$sql.= " AND s.rowid = ".$user->socid;
+			if ($user->socid > 0)	$sql.= " AND s.rowid = ".$user->socid;
             if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND sc.fk_user = ".$user->id;
             else $sql .= " ORDER BY e.date_delivery, e.ref DESC ";
             $sql .= $this->db->plimit($max, 0);

From 03ac5b76da1aa065d340dac75dff40e0fe30ad34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 6 Jan 2021 20:16:43 +0100
Subject: [PATCH 852/888] code syntax

---
 htdocs/modulebuilder/template/admin/about.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/template/admin/about.php b/htdocs/modulebuilder/template/admin/about.php
index 518920592f4..d527f1978a9 100644
--- a/htdocs/modulebuilder/template/admin/about.php
+++ b/htdocs/modulebuilder/template/admin/about.php
@@ -45,7 +45,9 @@ require_once '../lib/mymodule.lib.php';
 $langs->loadLangs(array("errors", "admin", "mymodule@mymodule"));
 
 // Access control
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 // Parameters
 $action = GETPOST('action', 'aZ09');

From d6d4d3ff91f00c8956f1a26984e1283668dbb6ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 6 Jan 2021 20:18:33 +0100
Subject: [PATCH 853/888] Update myobject_extrafields.php

---
 .../template/admin/myobject_extrafields.php     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/modulebuilder/template/admin/myobject_extrafields.php b/htdocs/modulebuilder/template/admin/myobject_extrafields.php
index 0e42b75da0b..41ca86a0ce2 100644
--- a/htdocs/modulebuilder/template/admin/myobject_extrafields.php
+++ b/htdocs/modulebuilder/template/admin/myobject_extrafields.php
@@ -52,13 +52,17 @@ $form = new Form($db);
 // List of supported format
 $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'mymodule_myobject'; //Must be the $table_element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*
@@ -91,8 +95,7 @@ print dol_get_fiche_end();
 
 
 // Buttons
-if ($action != 'create' && $action != 'edit')
-{
+if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
 	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
 	print "</div>";
@@ -102,8 +105,7 @@ if ($action != 'create' && $action != 'edit')
 /*
  * Creation of an optional field
  */
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print '<br><div id="newattrib"></div>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -113,8 +115,7 @@ if ($action == 'create')
 /*
  * Edition of an optional field
  */
-if ($action == 'edit' && !empty($attrname))
-{
+if ($action == 'edit' && !empty($attrname)) {
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 

From 170814c718cfdad0615753029853f72f6e0442e2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 Jan 2021 20:21:22 +0100
Subject: [PATCH 854/888] Fix missing rollback

---
 htdocs/societe/class/societe.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 2fcfaecb19e..8de2ab23baf 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3699,6 +3699,7 @@ class Societe extends CommonObject
 				if ($result < 0)
 				{
 					setEventMessages($this->error, $this->errors, 'errors');
+					$this->db->rollback();
 					return -1;
 				}
 			}

From 79b6a3ed40a9b25afe5df82121cb069d25736462 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 6 Jan 2021 20:24:45 +0100
Subject: [PATCH 855/888] Update setup.php

---
 htdocs/modulebuilder/template/admin/setup.php | 161 ++++++++----------
 1 file changed, 72 insertions(+), 89 deletions(-)

diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index c7cc61171a7..0db6b9b7648 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -47,7 +47,9 @@ require_once '../lib/mymodule.lib.php';
 $langs->loadLangs(array("admin", "mymodule@mymodule"));
 
 // Access control
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 // Parameters
 $action = GETPOST('action', 'aZ09');
@@ -71,28 +73,28 @@ $setupnotempty = 0;
  * Actions
  */
 
-if ((float) DOL_VERSION >= 6)
-{
+if ((float) DOL_VERSION >= 6) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 }
 
-if ($action == 'updateMask')
-{
+if ($action == 'updateMask') {
 	$maskconstorder = GETPOST('maskconstorder', 'alpha');
 	$maskorder = GETPOST('maskorder', 'alpha');
 
-	if ($maskconstorder) $res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
+	if ($maskconstorder) {
+		$res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
+	}
 
-	if (!$res > 0) $error++;
+	if (!$res > 0) {
+		$error++;
+	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} elseif ($action == 'specimen')
-{
+} elseif ($action == 'specimen') {
 	$modele = GETPOST('module', 'alpha');
 	$tmpobjectkey = GETPOST('object');
 
@@ -102,25 +104,21 @@ if ($action == 'updateMask')
 	// Search template files
 	$file = ''; $classname = ''; $filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-	foreach ($dirmodels as $reldir)
-	{
+	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/mymodule/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
-		if (file_exists($file))
-		{
+		if (file_exists($file)) {
 			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound)
-	{
+	if ($filefound) {
 		require_once $file;
 
 		$module = new $classname($db);
 
-		if ($module->write_file($tmpobject, $langs) > 0)
-		{
+		if ($module->write_file($tmpobject, $langs) > 0) {
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
 			return;
 		} else {
@@ -131,19 +129,15 @@ if ($action == 'updateMask')
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
-}
-
-elseif ($action == 'setmod') {
+} elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
 	$tmpobjectkey = GETPOST('object');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'MYMODULE_'.strtoupper($tmpobjectkey)."_ADDON";
 		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
 	}
-}
-
-// Activate a model
-elseif ($action == 'set') {
+} elseif ($action == 'set') {
+	// Activate a model
 	$ret = addDocumentModel($value, $type, $label, $scandir);
 } elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
@@ -154,10 +148,8 @@ elseif ($action == 'set') {
 			if ($conf->global->$constforval == "$value") dolibarr_del_const($db, $constforval, $conf->entity);
 		}
 	}
-}
-
-// Set or unset default model
-elseif ($action == 'setdoc') {
+} elseif ($action == 'setdoc') {
+	// Set or unset default model
 	$tmpobjectkey = GETPOST('object');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'MYMODULE_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
@@ -207,8 +199,7 @@ print dol_get_fiche_head($head, 'settings', '', -1, "mymodule@mymodule");
 echo '<span class="opacitymedium">'.$langs->trans("MyModuleSetupPage").'</span><br><br>';
 
 
-if ($action == 'edit')
-{
+if ($action == 'edit') {
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
@@ -216,8 +207,7 @@ if ($action == 'edit')
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-	foreach ($arrayofparameters as $key => $val)
-	{
+	foreach ($arrayofparameters as $key => $val) {
 		print '<tr class="oddeven"><td>';
 		$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
 		print $form->textwithpicto($langs->trans($key), $tooltiphelp);
@@ -232,13 +222,11 @@ if ($action == 'edit')
 	print '</form>';
 	print '<br>';
 } else {
-	if (!empty($arrayofparameters))
-	{
+	if (!empty($arrayofparameters)) {
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-		foreach ($arrayofparameters as $key => $val)
-		{
+		foreach ($arrayofparameters as $key => $val) {
 			$setupnotempty++;
 
 			print '<tr class="oddeven"><td>';
@@ -264,7 +252,9 @@ $myTmpObjects['MyObject'] = array('includerefgeneration'=>0, 'includedocgenerati
 
 
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
-	if ($myTmpObjectKey == 'MyObject') continue;
+	if ($myTmpObjectKey == 'MyObject') {
+		continue;
+	}
 	if ($myTmpObjectArray['includerefgeneration']) {
 		/*
 		 * Orders Numbering model
@@ -284,19 +274,14 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 
 		clearstatcache();
 
-		foreach ($dirmodels as $reldir)
-		{
+		foreach ($dirmodels as $reldir) {
 			$dir = dol_buildpath($reldir."core/modules/".$moduledir);
 
-			if (is_dir($dir))
-			{
+			if (is_dir($dir)) {
 				$handle = opendir($dir);
-				if (is_resource($handle))
-				{
-					while (($file = readdir($handle)) !== false)
-					{
-						if (strpos($file, 'mod_'.strtolower($myTmpObjectKey).'_') === 0 && substr($file, dol_strlen($file) - 3, 3) == 'php')
-						{
+				if (is_resource($handle)) {
+					while (($file = readdir($handle)) !== false) {
+						if (strpos($file, 'mod_'.strtolower($myTmpObjectKey).'_') === 0 && substr($file, dol_strlen($file) - 3, 3) == 'php') {
 							$file = substr($file, 0, dol_strlen($file) - 4);
 
 							require_once $dir.'/'.$file.'.php';
@@ -304,11 +289,14 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 							$module = new $file($db);
 
 							// Show modules according to features level
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+								continue;
+							}
+							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+								continue;
+							}
 
-							if ($module->isEnabled())
-							{
+							if ($module->isEnabled()) {
 								dol_include_once('/'.$moduledir.'/class/'.strtolower($myTmpObjectKey).'.class.php');
 
 								print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
@@ -321,14 +309,16 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 								if (preg_match('/^Error/', $tmp)) {
 									$langs->load("errors");
 									print '<div class="error">'.$langs->trans($tmp).'</div>';
-								} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-								else print $tmp;
+								} elseif ($tmp == 'NotConfigured') {
+									print $langs->trans($tmp);
+								} else {
+									print $tmp;
+								}
 								print '</td>'."\n";
 
 								print '<td class="center">';
 								$constforvar = 'MYMODULE_'.strtoupper($myTmpObjectKey).'_ADDON';
-								if ($conf->global->$constforvar == $file)
-								{
+								if ($conf->global->$constforvar == $file) {
 									print img_picto($langs->trans("Activated"), 'switch_on');
 								} else {
 									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&object='.strtolower($myTmpObjectKey).'&value='.urlencode($file).'">';
@@ -387,12 +377,10 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 		$sql .= " WHERE type = '".$db->escape($type)."'";
 		$sql .= " AND entity = ".$conf->entity;
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$i = 0;
 			$num_rows = $db->num_rows($resql);
-			while ($i < $num_rows)
-			{
+			while ($i < $num_rows) {
 				$array = $db->fetch_array($resql);
 				array_push($def, $array[0]);
 				$i++;
@@ -413,31 +401,23 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 
 		clearstatcache();
 
-		foreach ($dirmodels as $reldir)
-		{
-			foreach (array('', '/doc') as $valdir)
-			{
+		foreach ($dirmodels as $reldir) {
+			foreach (array('', '/doc') as $valdir) {
 				$realpath = $reldir."core/modules/".$moduledir.$valdir;
 				$dir = dol_buildpath($realpath);
 
-				if (is_dir($dir))
-				{
+				if (is_dir($dir)) {
 					$handle = opendir($dir);
-					if (is_resource($handle))
-					{
-						while (($file = readdir($handle)) !== false)
-						{
+					if (is_resource($handle)) {
+						while (($file = readdir($handle)) !== false) {
 							$filelist[] = $file;
 						}
 						closedir($handle);
 						arsort($filelist);
 
-						foreach ($filelist as $file)
-						{
-							if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-							{
-								if (file_exists($dir.'/'.$file))
-								{
+						foreach ($filelist as $file) {
+							if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file)) {
+								if (file_exists($dir.'/'.$file)) {
 									$name = substr($file, 4, dol_strlen($file) - 16);
 									$classname = substr($file, 0, dol_strlen($file) - 12);
 
@@ -445,21 +425,26 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 									$module = new $classname($db);
 
 									$modulequalified = 1;
-									if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
-									if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+									if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+										$modulequalified = 0;
+									}
+									if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+										$modulequalified = 0;
+									}
 
-									if ($modulequalified)
-									{
+									if ($modulequalified) {
 										print '<tr class="oddeven"><td width="100">';
 										print (empty($module->name) ? $name : $module->name);
 										print "</td><td>\n";
-										if (method_exists($module, 'info')) print $module->info($langs);
-										else print $module->description;
+										if (method_exists($module, 'info')) {
+											print $module->info($langs);
+										} else {
+											print $module->description;
+										}
 										print '</td>';
 
 										// Active
-										if (in_array($name, $def))
-										{
+										if (in_array($name, $def)) {
 											print '<td class="center">'."\n";
 											print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'">';
 											print img_picto($langs->trans("Enabled"), 'switch_on');
@@ -486,8 +471,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										// Info
 										$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
 										$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-										if ($module->type == 'pdf')
-										{
+										if ($module->type == 'pdf') {
 											$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
 										}
 										$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
@@ -502,8 +486,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 
 										// Preview
 										print '<td class="center">';
-										if ($module->type == 'pdf')
-										{
+										if ($module->type == 'pdf') {
 											print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&object='.$myTmpObjectKey.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 										} else {
 											print img_object($langs->trans("PreviewNotAvailable"), 'generic');

From 8117fb7cb2f2a51e7f9f288c5b4c0e9fce9e72cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 6 Jan 2021 20:27:45 +0100
Subject: [PATCH 856/888] Update modMyModule.class.php

---
 .../template/core/modules/modMyModule.class.php    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 2a5853a1e60..92be6f9fdc8 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -410,7 +410,9 @@ class modMyModule extends DolibarrModules
 		global $conf, $langs;
 
 		$result = $this->_load_tables('/mymodule/sql/');
-		if ($result < 0) return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
+		if ($result < 0) {
+			return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
+		}
 
 		// Create extrafields during init
 		//include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
@@ -432,19 +434,19 @@ class modMyModule extends DolibarrModules
 		$myTmpObjects['MyObject'] = array('includerefgeneration'=>0, 'includedocgeneration'=>0);
 
 		foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
-			if ($myTmpObjectKey == 'MyObject') continue;
+			if ($myTmpObjectKey == 'MyObject') {
+				continue;
+			}
 			if ($myTmpObjectArray['includerefgeneration']) {
 				$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/mymodule/template_myobjects.odt';
 				$dirodt = DOL_DATA_ROOT.'/doctemplates/mymodule';
 				$dest = $dirodt.'/template_myobjects.odt';
 
-				if (file_exists($src) && !file_exists($dest))
-				{
+				if (file_exists($src) && !file_exists($dest)) {
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 					dol_mkdir($dirodt);
 					$result = dol_copy($src, $dest, 0, 0);
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$langs->load("errors");
 						$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
 						return 0;

From 7a26a1212cbcc27fc61d4a96053d5a0c46a61ecf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 6 Jan 2021 20:28:50 +0100
Subject: [PATCH 857/888] Update mymodule.css.php

---
 htdocs/modulebuilder/template/css/mymodule.css.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/modulebuilder/template/css/mymodule.css.php b/htdocs/modulebuilder/template/css/mymodule.css.php
index af1566c0869..ecffe5dcf97 100644
--- a/htdocs/modulebuilder/template/css/mymodule.css.php
+++ b/htdocs/modulebuilder/template/css/mymodule.css.php
@@ -54,8 +54,7 @@ if (!$res) die("Include of main fails");
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 // Load user to have $user->conf loaded (not done by default here because of NOLOGIN constant defined) and load permission if we need to use them in CSS
-/*if (empty($user->id) && ! empty($_SESSION['dol_login']))
-{
+/*if (empty($user->id) && ! empty($_SESSION['dol_login'])) {
 	$user->fetch('',$_SESSION['dol_login']);
 	$user->getrights();
 }*/
@@ -65,8 +64,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 header('Content-type: text/css');
 // Important: Following code is to cache this file to avoid page request by browser at each Dolibarr page access.
 // You can use CTRL+F5 to refresh your browser cache.
-if (empty($dolibarr_nocache)) header('Cache-Control: max-age=10800, public, must-revalidate');
-else header('Cache-Control: no-cache');
+if (empty($dolibarr_nocache)) {
+	header('Cache-Control: max-age=10800, public, must-revalidate');
+} else {
+	header('Cache-Control: no-cache');
+}
 
 ?>
 

From ccfba6a9f2e140ef377e064dc1b8a917ac76af19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 6 Jan 2021 20:29:47 +0100
Subject: [PATCH 858/888] Update mymoduleindex.php

---
 htdocs/modulebuilder/template/mymoduleindex.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/modulebuilder/template/mymoduleindex.php b/htdocs/modulebuilder/template/mymoduleindex.php
index 3da38a7e02c..ee2fe6b28f0 100644
--- a/htdocs/modulebuilder/template/mymoduleindex.php
+++ b/htdocs/modulebuilder/template/mymoduleindex.php
@@ -48,10 +48,11 @@ $action = GETPOST('action', 'aZ09');
 
 
 // Security check
-//if (! $user->rights->mymodule->myobject->read) accessforbidden();
+// if (! $user->rights->mymodule->myobject->read) {
+// 	accessforbidden();
+// }
 $socid = GETPOST('socid', 'int');
-if (isset($user->socid) && $user->socid > 0)
-{
+if (isset($user->socid) && $user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }

From c3d970fce8ceb00e4a38676195195bba02d1b324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 6 Jan 2021 20:34:18 +0100
Subject: [PATCH 859/888] Update myobject_agenda.php

---
 .../template/myobject_agenda.php              | 77 +++++++++++--------
 1 file changed, 44 insertions(+), 33 deletions(-)

diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index 541d971013f..27c7e1de90b 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -70,14 +70,16 @@ $langs->loadLangs(array("mymodule@mymodule", "other"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
-$ref        = GETPOST('ref', 'alpha');
+$ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
-$cancel     = GETPOST('cancel', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
-	if (!count($actioncode)) $actioncode = '0';
+	if (!count($actioncode)) {
+		$actioncode = '0';
+	}
 } else {
 	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
@@ -87,12 +89,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = 'a.datep,a.id';
-if (!$sortorder) $sortorder = 'DESC,DESC';
+if (!$sortfield) {
+	$sortfield = 'a.datep,a.id';
+}
+if (!$sortorder) {
+	$sortorder = 'DESC,DESC';
+}
 
 // Initialize technical objects
 $object = new MyObject($db);
@@ -104,7 +112,9 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
-if ($id > 0 || !empty($ref)) $upload_dir = $conf->mymodule->multidir_output[$object->entity]."/".$object->id;
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->mymodule->multidir_output[$object->entity]."/".$object->id;
+}
 
 // Security check - Protection if external user
 //if ($user->socid > 0) accessforbidden();
@@ -120,20 +130,19 @@ $permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the incl
 
 $parameters = array('id'=>$id);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	// Cancel
-	if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-	{
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
 		header("Location: ".$backtopage);
 		exit;
 	}
 
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 		$actioncode = '';
 		$search_agenda_label = '';
 	}
@@ -147,14 +156,15 @@ if (empty($reshook))
 
 $form = new Form($db);
 
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	$title = $langs->trans("Agenda");
 	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = '';
 	llxHeader('', $title, $help_url);
 
-	if (!empty($conf->notification->enabled)) $langs->load("mails");
+	if (!empty($conf->notification->enabled)) {
+		$langs->load("mails");
+	}
 	$head = myobjectPrepareHead($object);
 
 
@@ -172,14 +182,13 @@ if ($object->id > 0)
 	// Thirdparty
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	// Project
-	if (! empty($conf->projet->enabled))
-	{
+	if (! empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-		if ($permissiontoadd)
-		{
-			if ($action != 'classify')
+		if ($permissiontoadd) {
+			if ($action != 'classify') {
 				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			}
 			$morehtmlref.=' : ';
 			if ($action == 'classify') {
 				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
@@ -228,10 +237,11 @@ if ($object->id > 0)
 	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
 	$out .= '&backtopage='.urlencode($urlbacktopage);
 	$permok = $user->rights->agenda->myactions->create;
-	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
-	{
+	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
 		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
-		if (get_class($objthirdparty) == 'Societe') $out .= '&socid='.urlencode($objthirdparty->id);
+		if (get_class($objthirdparty) == 'Societe') {
+			$out .= '&socid='.urlencode($objthirdparty->id);
+		}
 		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '').'&percentage=-1';
 		//$out.=$langs->trans("AddAnAction").' ';
 		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
@@ -241,10 +251,8 @@ if ($object->id > 0)
 
 	print '<div class="tabsAction">';
 
-	if (!empty($conf->agenda->enabled))
-	{
-		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
-		{
+	if (!empty($conf->agenda->enabled)) {
+		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
 			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
 		} else {
 			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
@@ -253,11 +261,14 @@ if ($object->id > 0)
 
 	print '</div>';
 
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-	{
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$param = '&id='.$object->id.'&socid='.$socid;
-		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+			$param .= '&contextpage='.urlencode($contextpage);
+		}
+		if ($limit > 0 && $limit != $conf->liste_limit) {
+			$param .= '&limit='.urlencode($limit);
+		}
 
 
 		//print load_fiche_titre($langs->trans("ActionsOnMyObject"), '', '');

From f4b2329b5d97a9442f4140b42047b83f2499dc35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 6 Jan 2021 20:38:41 +0100
Subject: [PATCH 860/888] Update myobject_card.php

---
 .../modulebuilder/template/myobject_card.php  | 103 +++++++++---------
 1 file changed, 50 insertions(+), 53 deletions(-)

diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index ef7a6da8d66..af0751f416c 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -69,11 +69,11 @@ $langs->loadLangs(array("mymodule@mymodule", "other"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
-$ref        = GETPOST('ref', 'alpha');
+$ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
-$confirm    = GETPOST('confirm', 'alpha');
-$cancel     = GETPOST('cancel', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'myobjectcard'; // To manage different context of search
+$confirm = GETPOST('confirm', 'alpha');
+$cancel = GETPOST('cancel', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'myobjectcard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 //$lineid   = GETPOST('lineid', 'int');
@@ -92,12 +92,15 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 // Initialize array of search criterias
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
-foreach ($object->fields as $key => $val)
-{
-	if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
+foreach ($object->fields as $key => $val) {
+	if (GETPOST('search_'.$key, 'alpha')) {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
+	}
 }
 
-if (empty($action) && empty($id) && empty($ref)) $action = 'view';
+if (empty($action) && empty($id) && empty($ref)) {
+	$action = 'view';
+}
 
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
@@ -127,8 +130,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	$error = 0;
 
 	$backurlforlist = dol_buildpath('/mymodule/myobject_list.php', 1);
@@ -157,12 +159,10 @@ if (empty($reshook))
 	// Action to build doc
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
-	if ($action == 'set_thirdparty' && $permissiontoadd)
-	{
+	if ($action == 'set_thirdparty' && $permissiontoadd) {
 		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
 	}
-	if ($action == 'classin' && $permissiontoadd)
-	{
+	if ($action == 'classin' && $permissiontoadd) {
 		$object->setProject(GETPOST('projectid', 'int'));
 	}
 
@@ -207,15 +207,18 @@ jQuery(document).ready(function() {
 
 
 // Part to create
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("MyObject")), '', 'object_'.$object->picto);
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
-	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	if ($backtopage) {
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	}
+	if ($backtopageforcancel) {
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	}
 
 	print dol_get_fiche_head(array(), '');
 
@@ -246,16 +249,19 @@ if ($action == 'create')
 }
 
 // Part to edit record
-if (($id || $ref) && $action == 'edit')
-{
+if (($id || $ref) && $action == 'edit') {
 	print load_fiche_titre($langs->trans("MyObject"), '', 'object_'.$object->picto);
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
-	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	if ($backtopage) {
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	}
+	if ($backtopageforcancel) {
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	}
 
 	print dol_get_fiche_head();
 
@@ -279,8 +285,7 @@ if (($id || $ref) && $action == 'edit')
 }
 
 // Part to show record
-if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
-{
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
 	$res = $object->fetch_optionals();
 
 	$head = myobjectPrepareHead($object);
@@ -304,8 +309,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	}
 
 	// Confirmation of action xxxx
-	if ($action == 'xxx')
-	{
+	if ($action == 'xxx') {
 		$formquestion = array();
 		/*
 		$forcecombo=0;
@@ -323,8 +327,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Call Hook formConfirm
 	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
 	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
-	elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
+	if (empty($reshook)) {
+		$formconfirm .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$formconfirm = $hookmanager->resPrint;
+	}
 
 	// Print form confirm
 	print $formconfirm;
@@ -342,12 +349,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled))
-	 {
+	 if (! empty($conf->projet->enabled)) {
 	 $langs->load("projects");
 	 $morehtmlref .= '<br>'.$langs->trans('Project') . ' ';
-	 if ($permissiontoadd)
-	 {
+	 if ($permissiontoadd) {
 	 //if ($action != 'classify') $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> ';
 	 $morehtmlref .= ' : ';
 	 if ($action == 'classify') {
@@ -404,8 +409,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 * Lines
 	 */
 
-	if (!empty($object->table_element_line))
-	{
+	if (!empty($object->table_element_line)) {
 		// Show object lines
 		$result = $object->getLinesArray();
 
@@ -421,21 +425,17 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		}
 
 		print '<div class="div-table-responsive-no-min">';
-		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
-		{
+		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
 			print '<table id="tablelines" class="noborder noshadow" width="100%">';
 		}
 
-		if (!empty($object->lines))
-		{
+		if (!empty($object->lines)) {
 			$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1);
 		}
 
 		// Form to add new line
-		if ($object->status == 0 && $permissiontoadd && $action != 'selectlines')
-		{
-			if ($action != 'editline')
-			{
+		if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
+			if ($action != 'editline') {
 				// Add products/services form
 				$object->formAddObjectLine(1, $mysoc, $soc);
 
@@ -444,8 +444,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			}
 		}
 
-		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
-		{
+		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
 			print '</table>';
 		}
 		print '</div>';
@@ -462,8 +461,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-		if (empty($reshook))
-		{
+		if (empty($reshook)) {
 			// Send
 			if (empty($user->socid)) {
 				print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle');
@@ -491,16 +489,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=scrumsprint', '', $permissiontoadd);
 
 			/*
-			if ($permissiontoadd)
-			{
+			if ($permissiontoadd) {
 				if ($object->status == $object::STATUS_ENABLED) {
 					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=disable">'.$langs->trans("Disable").'</a>'."\n";
 				} else {
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=enable">'.$langs->trans("Enable").'</a>'."\n";
 				}
 			}
-			if ($permissiontoadd)
-			{
+			if ($permissiontoadd) {
 				if ($object->status == $object::STATUS_VALIDATED) {
 					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close">'.$langs->trans("Cancel").'</a>'."\n";
 				} else {
@@ -521,8 +517,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$action = 'presend';
 	}
 
-	if ($action != 'presend')
-	{
+	if ($action != 'presend') {
 		print '<div class="fichecenter"><div class="fichehalfleft">';
 		print '<a name="builddoc"></a>'; // ancre
 
@@ -561,7 +556,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	}
 
 	//Select mail models is same action as presend
-	if (GETPOST('modelselected')) $action = 'presend';
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
+	}
 
 	// Presend form
 	$modelmail = 'myobject';

From 80d4bb428472d1f3aa10086d6e5b60e91a2bfef2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 6 Jan 2021 20:39:50 +0100
Subject: [PATCH 861/888] Update myobject_note.php

---
 htdocs/modulebuilder/template/myobject_note.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php
index f56585497ea..abe8daf7622 100644
--- a/htdocs/modulebuilder/template/myobject_note.php
+++ b/htdocs/modulebuilder/template/myobject_note.php
@@ -86,7 +86,9 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
-if ($id > 0 || !empty($ref)) $upload_dir = $conf->mymodule->multidir_output[$object->entity]."/".$object->id;
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->mymodule->multidir_output[$object->entity]."/".$object->id;
+}
 
 $permissionnote = $user->rights->mymodule->myobject->write; // Used by the include of actions_setnotes.inc.php
 $permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the include of actions_addupdatedelete.inc.php
@@ -110,8 +112,7 @@ $form = new Form($db);
 $help_url = '';
 llxHeader('', $langs->trans('MyObject'), $help_url);
 
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$object->fetch_thirdparty();
 
 	$head = myobjectPrepareHead($object);

From 241a738a2946c5a41167baa86cb2a936e0e459a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 6 Jan 2021 20:41:17 +0100
Subject: [PATCH 862/888] Update myobject_document.php

---
 .../template/myobject_document.php            | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index 7399fa6fb09..1cd3de2ebd9 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -79,12 +79,18 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 //if (! $sortfield) $sortfield="position_name";
 
 // Initialize technical objects
@@ -98,7 +104,9 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
-if ($id > 0 || !empty($ref)) $upload_dir = $conf->mymodule->multidir_output[$object->entity ? $object->entity : $conf->entity]."/myobject/".get_exdir(0, 0, 0, 1, $object);
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->mymodule->multidir_output[$object->entity ? $object->entity : $conf->entity]."/myobject/".get_exdir(0, 0, 0, 1, $object);
+}
 
 // Security check - Protection if external user
 //if ($user->socid > 0) accessforbidden();
@@ -127,8 +135,7 @@ $help_url = '';
 //$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $title, $help_url);
 
-if ($object->id)
-{
+if ($object->id) {
 	/*
 	 * Show tabs
 	 */
@@ -140,8 +147,7 @@ if ($object->id)
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 	$totalsize = 0;
-	foreach ($filearray as $key => $file)
-	{
+	foreach ($filearray as $key => $file) {
 		$totalsize += $file['size'];
 	}
 

From ef8021467b337bd0a117264c3f3c7b14a3ff4ff8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 Jan 2021 20:41:40 +0100
Subject: [PATCH 863/888] FIX #15892 #15017

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 3bf47b7da7a..054d932a1f1 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -680,7 +680,8 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 			if (!is_array($out)) {
 				// '"' is dangerous because param in url can close the href= or src= and add javascript functions.
 				// '../' is dangerous because it allows dir transversals
-				$out = str_replace(array('&quot;', '"', '../'), '', trim($out));
+				$out = str_replace(array('&quot;', '"'), "''", trim($out));
+				$out = str_replace(array('../'), '', trim($out));
 				// keep lines feed
 				$out = dol_string_nohtmltag($out, 0);
 			}

From 123bd8172192a6771374178525450c73f167919e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 Jan 2021 20:42:18 +0100
Subject: [PATCH 864/888] Trim no more required

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 054d932a1f1..4ded311f7ed 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -681,7 +681,7 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 				// '"' is dangerous because param in url can close the href= or src= and add javascript functions.
 				// '../' is dangerous because it allows dir transversals
 				$out = str_replace(array('&quot;', '"'), "''", trim($out));
-				$out = str_replace(array('../'), '', trim($out));
+				$out = str_replace(array('../'), '', $out);
 				// keep lines feed
 				$out = dol_string_nohtmltag($out, 0);
 			}

From ca11ea98399e74e564ab28ba9a9bbd69476be475 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 Jan 2021 20:47:57 +0100
Subject: [PATCH 865/888] Fix phpunit

Signed-off-by: Laurent Destailleur <eldy@destailleur.fr>
---
 test/phpunit/SecurityTest.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 3eda8354113..d2405e9609d 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -294,20 +294,20 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 
         $result=GETPOST("param1", 'int');
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, 222);
+        $this->assertEquals($result, 222, 'Test on param1 with no 3rd param');
 
         $result=GETPOST("param1", 'int', 2);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, 333);
+        $this->assertEquals($result, 333, 'Test on param1 with 3rd param = 2');
 
         // Test alpha
         $result=GETPOST("param2", 'alpha');
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, $_GET["param2"]);
+        $this->assertEquals($result, $_GET["param2"], 'Test on param2');
 
         $result=GETPOST("param3", 'alpha');  // Must return string sanitized from char "
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, 'na/b#e(pr)qq-rr\cc');
+        $this->assertEquals($result, '\'\'na/b#e(pr)qq-rr\cc', 'Test on param3');
 
         $result=GETPOST("param4", 'alpha');  // Must return string sanitized from ../
         print __METHOD__." result=".$result."\n";
@@ -346,7 +346,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
         // With alphanohtml, we must convert the html entities like &#110;
         $result=GETPOST("param8", 'alphanohtml');
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals("Hacker<svg onload='console.log(123)'", $result);
+        $this->assertEquals("Hacker<svg onload='console.log(''123'')'", $result);
 
         $result=GETPOST("param9", 'alphanohtml');
         print __METHOD__." result=".$result."\n";

From 2b3b1a7feaa6e43afa5112a1ebce40b11b56a85f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 6 Jan 2021 20:54:20 +0100
Subject: [PATCH 866/888] Update myobject_list.php

---
 .../modulebuilder/template/myobject_list.php  | 247 +++++++++++-------
 1 file changed, 150 insertions(+), 97 deletions(-)

diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 8c225e091ce..6ed5e2398bf 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -79,7 +79,7 @@ $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'myobjectlist'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
-$optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 $id = GETPOST('id', 'int');
 
@@ -88,7 +88,9 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1 or if we click on clear filters
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -106,15 +108,20 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // Default sort order (if not yet defined by previous GETPOST)
-if (!$sortfield) $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
-if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) {
+	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
+}
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
 
 // Initialize array of search criterias
 $search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
 $search = array();
-foreach ($object->fields as $key => $val)
-{
-	if (GETPOST('search_'.$key, 'alpha') !== '') $search[$key] = GETPOST('search_'.$key, 'alpha');
+foreach ($object->fields as $key => $val) {
+	if (GETPOST('search_'.$key, 'alpha') !== '') {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
+	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
 		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
 		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
@@ -123,8 +130,7 @@ foreach ($object->fields as $key => $val)
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
-foreach ($object->fields as $key => $val)
-{
+foreach ($object->fields as $key => $val) {
 	if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
 }
 
@@ -156,8 +162,7 @@ $permissiontodelete = $user->rights->mymodule->myobject->delete;
 // Security check
 if (empty($conf->mymodule->enabled)) accessforbidden('Module not enabled');
 $socid = 0;
-if ($user->socid > 0)	// Protection if external user
-{
+if ($user->socid > 0) { // Protection if external user
 	//$socid = $user->socid;
 	accessforbidden();
 }
@@ -170,21 +175,26 @@ if ($user->socid > 0)	// Protection if external user
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list';
+	$massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	// Selection of new fields
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 		foreach ($object->fields as $key => $val) {
 			$search[$key] = '';
 			if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
@@ -196,8 +206,7 @@ if (empty($reshook))
 		$search_array_options = array();
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
-		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
-	{
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
 		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
 	}
 
@@ -226,13 +235,14 @@ $title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("MyObjects"));
 // Build and execute select
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
-foreach ($object->fields as $key => $val)
-{
+foreach ($object->fields as $key => $val) {
 	$sql .= 't.'.$key.', ';
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+	}
 }
 // Add fields from hooks
 $parameters = array();
@@ -240,15 +250,16 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
+}
 // Add table from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 if ($object->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (".getEntity($object->element).")";
 else $sql .= " WHERE 1 = 1";
-foreach ($search as $key => $val)
-{
+foreach ($search as $key => $val) {
 	if (in_array($key, $object->fields)) {
 		if ($key == 'status' && $search[$key] == -1) continue;
 		$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
@@ -256,7 +267,9 @@ foreach ($search as $key => $val)
 			if ($search[$key] == '-1') $search[$key] = '';
 			$mode_search = 2;
 		}
-		if ($search[$key] != '') $sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+		if ($search[$key] != '') {
+			$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+		}
 	} else {
 		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
 			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key);
@@ -271,7 +284,9 @@ foreach ($search as $key => $val)
 		}
 	}
 }
-if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+if ($search_all) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+}
 //$sql.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear);
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -282,8 +297,7 @@ $sql .= $hookmanager->resPrint;
 
 /* If a group by is required
 $sql.= " GROUP BY ";
-foreach($object->fields as $key => $val)
-{
+foreach($object->fields as $key => $val) {
 	$sql.='t.'.$key.', ';
 }
 // Add fields from extrafields
@@ -325,8 +339,7 @@ if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit
 }
 
 // Direct jump if only one record found
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page)
-{
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".dol_buildpath('/mymodule/myobject_card.php', 1).'?id='.$id);
@@ -357,14 +370,24 @@ jQuery(document).ready(function() {
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-foreach ($search as $key => $val)
-{
-	if (is_array($search[$key]) && count($search[$key])) foreach ($search[$key] as $skey) $param .= '&search_'.$key.'[]='.urlencode($skey);
-	else $param .= '&search_'.$key.'='.urlencode($search[$key]);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
+foreach ($search as $key => $val) {
+	if (is_array($search[$key]) && count($search[$key])) {
+		foreach ($search[$key] as $skey) {
+			$param .= '&search_'.$key.'[]='.urlencode($skey);
+		}
+	} else {
+		$param .= '&search_'.$key.'='.urlencode($search[$key]);
+	}
+}
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
 }
-if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 // Add $param from hooks
@@ -379,12 +402,18 @@ $arrayofmassactions = array(
 	//'builddoc'=>$langs->trans("PDFMerge"),
 	//'presend'=>$langs->trans("SendByMail"),
 );
-if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if ($permissiontodelete) {
+	$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+}
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+	$arrayofmassactions = array();
+}
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="action" value="list">';
@@ -403,9 +432,10 @@ $objecttmp = new MyObject($db);
 $trackid = 'xxxx'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-if ($search_all)
-{
-	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+if ($search_all) {
+	foreach ($fieldstosearchall as $key => $val) {
+		$fieldstosearchall[$key] = $langs->trans($val);
+	}
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
 }
 
@@ -416,11 +446,13 @@ $moreforfilter.= '</div>';*/
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
-if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
-else $moreforfilter = $hookmanager->resPrint;
+if (empty($reshook)) {
+	$moreforfilter .= $hookmanager->resPrint;
+} else {
+	$moreforfilter = $hookmanager->resPrint;
+}
 
-if (!empty($moreforfilter))
-{
+if (!empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
 	print '</div>';
@@ -437,18 +469,22 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-foreach ($object->fields as $key => $val)
-{
+foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['css']) ? '' : $val['css']);
-	if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	elseif (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') $cssforfield .= ($cssforfield ? ' ' : '').'right';
-	if (!empty($arrayfields['t.'.$key]['checked']))
-	{
+	if ($key == 'status') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'right';
+	}
+	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
-		elseif (strpos($val['type'], 'integer:') === 0) {
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+		} elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
 		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
 			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
@@ -481,15 +517,18 @@ print '</tr>'."\n";
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-foreach ($object->fields as $key => $val)
-{
+foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
-	if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	elseif (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') $cssforfield .= ($cssforfield ? ' ' : '').'right';
-	if (!empty($arrayfields['t.'.$key]['checked']))
-	{
+	if ($key == 'status') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'right';
+	}
+	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
 	}
 }
@@ -506,10 +545,8 @@ print '</tr>'."\n";
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val)
-	{
+if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val) {
 		if (preg_match('/\$object/', $val)) $needToFetchEachLine++; // There is at least one compute field that use $object
 	}
 }
@@ -519,38 +556,51 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
-while ($i < ($limit ? min($num, $limit) : $num))
-{
+while ($i < ($limit ? min($num, $limit) : $num)) {
 	$obj = $db->fetch_object($resql);
-	if (empty($obj)) break; // Should not happen
+	if (empty($obj)) {
+		break; // Should not happen
+	}
 
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
 
 	// Show here line of result
 	print '<tr class="oddeven">';
-	foreach ($object->fields as $key => $val)
-	{
+	foreach ($object->fields as $key => $val) {
 		$cssforfield = (empty($val['css']) ? '' : $val['css']);
-		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-		elseif ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
+		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+		} elseif ($key == 'status') {
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+		}
 
-		if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-		elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		if (in_array($val['type'], array('timestamp'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		} elseif ($key == 'ref') {
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		}
 
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status'))) $cssforfield .= ($cssforfield ? ' ' : '').'right';
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'right';
+		}
 		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
 
-		if (!empty($arrayfields['t.'.$key]['checked']))
-		{
+		if (!empty($arrayfields['t.'.$key]['checked'])) {
 			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
-			if ($key == 'status') print $object->getLibStatut(5);
-			else print $object->showOutputField($val, $key, $object->$key, '');
+			if ($key == 'status') {
+				print $object->getLibStatut(5);
+			} else {
+				print $object->showOutputField($val, $key, $object->$key, '');
+			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
-			if (!empty($val['isameasure']))
-			{
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!empty($val['isameasure'])) {
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+				}
 				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
@@ -563,8 +613,7 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	print $hookmanager->resPrint;
 	// Action column
 	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-	{
+	if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 		$selected = 0;
 		if (in_array($object->id, $arrayofselected)) $selected = 1;
 		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
@@ -581,10 +630,13 @@ while ($i < ($limit ? min($num, $limit) : $num))
 include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
 // If no record found
-if ($num == 0)
-{
+if ($num == 0) {
 	$colspan = 1;
-	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
+	foreach ($arrayfields as $key => $val) {
+		if (!empty($val['checked'])) {
+			$colspan++;
+		}
+	}
 	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 
@@ -600,10 +652,11 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords))
-{
+if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+		$hidegeneratedfilelistifempty = 0;
+	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 	$formfile = new FormFile($db);

From 2a31ca969f31539426cbe93cc4e8736d83a5f551 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 Jan 2021 21:29:58 +0100
Subject: [PATCH 867/888] FIX #15388 #15891

---
 htdocs/bom/bom_card.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 591e9a69d88..b28cf459094 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -185,6 +185,8 @@ if (empty($reshook))
     		    unset($_POST['disable_stock_change']);
 
     		    $object->fetchLines();
+
+    		    $object->calculateCosts();
     		}
 		}
 	}
@@ -227,6 +229,8 @@ if (empty($reshook))
 		    unset($_POST['disable_stock_change']);
 
 		    $object->fetchLines();
+
+		    $object->calculateCosts();
 		}
 	}
 }

From 1f87bbbd01936becf6a646f70aee392f3837cf82 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 7 Jan 2021 06:26:24 +0100
Subject: [PATCH 868/888] Typo

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

diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index bf28ceb0996..ccb413ecf6f 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -182,8 +182,7 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->tax->charges->cre
 
 	if (!$dateech)
 	{
-		setEventMessages($langs->trans("ErrorFieldReqrequire_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
-uired", $langs->transnoentities("Date")), null, 'errors');
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
 		$action = 'edit';
 	} elseif (!$dateperiod)
 	{

From 74ba7e68daa34d4ecd4f91c7c914822845b51e26 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 7 Jan 2021 06:27:36 +0100
Subject: [PATCH 869/888] Mix two systems for create and edit account from
 balance

---
 htdocs/accountancy/bookkeeping/balance.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index b049abb7652..0f77de7d331 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -322,8 +322,10 @@ if ($action != 'export_csv')
 		$root_account_description = $tmparrayforrootaccount['label'];
 		$root_account_number = $tmparrayforrootaccount['account_number'];
 
-		if (empty($tmparrayforrootaccount['label'])) {
-			$link = '<a href="'.DOL_URL_ROOT.'/accountancy/admin/card.php?action=create&accountingaccount='.length_accountg($line->numero_compte).'">'.img_edit_add().'</a>';
+		if (empty($accountingaccountstatic->label) && $accountingaccountstatic->id > 0) {
+			$link = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/card.php?action=update&token=' . newToken() . '&id=' . $accountingaccountstatic->id . '">' . img_edit() . '</a>';
+		} elseif (empty($tmparrayforrootaccount['label'])) {
+			$link = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/card.php?action=create&token=' . newToken() . '&accountingaccount=' . length_accountg($line->numero_compte) . '">' . img_edit_add() . '</a>';
 		}
 
 		if (!empty($show_subgroup))

From 560654222005e4796752dc4c24408788d511dab7 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 7 Jan 2021 06:59:40 +0100
Subject: [PATCH 870/888] FIX: Accountancy - Add control on required fields
 when we create an account

---
 htdocs/accountancy/admin/card.php          | 188 +++++++++++----------
 htdocs/accountancy/bookkeeping/balance.php |   2 +-
 2 files changed, 103 insertions(+), 87 deletions(-)

diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index 029550192f0..c905ad25cd0 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 $error = 0;
 
 // Load translation files required by the page
-$langs->loadLangs(array("bills", "accountancy"));
+$langs->loadLangs(array("bills", "accountancy", "compta"));
 
 $mesg = '';
 $action = GETPOST('action', 'aZ09');
@@ -41,7 +41,9 @@ $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $rowid = GETPOST('rowid', 'int');
 $cancel = GETPOST('cancel', 'alpha');
-$accountingaccount = GETPOST('accountingaccount', 'alpha');
+
+$account_number = GETPOST('account_number', 'string');
+$label = GETPOST('label', 'alpha');
 
 // Security check
 if ($user->socid > 0) accessforbidden();
@@ -65,104 +67,118 @@ if (GETPOST('cancel', 'alpha'))
 if ($action == 'add' && $user->rights->accounting->chartofaccount)
 {
 	if (!$cancel) {
-		$sql = 'SELECT pcg_version FROM '.MAIN_DB_PREFIX.'accounting_system WHERE rowid='.$conf->global->CHARTOFACCOUNTS;
-
-		dol_syslog('accountancy/admin/card.php:: $sql='.$sql);
-		$result = $db->query($sql);
-		$obj = $db->fetch_object($result);
-
-		// Clean code
-
-		// To manage zero or not at the end of the accounting account
-		if ($conf->global->ACCOUNTING_MANAGE_ZERO == 1)
+		if (!$account_number)
 		{
-			$account_number = GETPOST('account_number', 'string');
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountNumber")), null, 'errors');
+			$action = 'create';
+		} elseif (!$label)
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
+			$action = 'create';
 		} else {
-			$account_number = clean_account(GETPOST('account_number', 'string'));
-		}
+			$sql = 'SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS;
 
-		if (GETPOST('account_parent', 'int') <= 0)
-		{
-			$account_parent = 0;
-		} else {
-			$account_parent = GETPOST('account_parent', 'int');
-		}
+			dol_syslog('accountancy/admin/card.php:: $sql=' . $sql);
+			$result = $db->query($sql);
+			$obj = $db->fetch_object($result);
 
-		$object->fk_pcg_version = $obj->pcg_version;
-		$object->pcg_type = GETPOST('pcg_type', 'alpha');
-		$object->account_number = $account_number;
-		$object->account_parent = $account_parent;
-		$object->account_category = GETPOST('account_category', 'alpha');
-		$object->label = GETPOST('label', 'alpha');
-		$object->labelshort = GETPOST('labelshort', 'alpha');
-		$object->active = 1;
+			// Clean code
 
-		$res = $object->create($user);
-		if ($res == - 3) {
-			$error = 1;
-			$action = "create";
-			setEventMessages($object->error, $object->errors, 'errors');
-		} elseif ($res == - 4) {
-			$error = 2;
-			$action = "create";
-			setEventMessages($object->error, $object->errors, 'errors');
-		} elseif ($res < 0)
-		{
-			$error++;
-			setEventMessages($object->error, $object->errors, 'errors');
-			$action = "create";
-		}
-		if (!$error)
-		{
-			setEventMessages("RecordCreatedSuccessfully", null, 'mesgs');
-			$urltogo = $backtopage ? $backtopage : dol_buildpath('/accountancy/admin/account.php', 1);
-			header("Location: ".$urltogo);
-			exit;
+			// To manage zero or not at the end of the accounting account
+			if ($conf->global->ACCOUNTING_MANAGE_ZERO == 1) {
+				$account_number = $account_number;
+			} else {
+				$account_number = clean_account($account_number);
+			}
+
+			if (GETPOST('account_parent', 'int') <= 0) {
+				$account_parent = 0;
+			} else {
+				$account_parent = GETPOST('account_parent', 'int');
+			}
+
+			$object->fk_pcg_version = $obj->pcg_version;
+			$object->pcg_type = GETPOST('pcg_type', 'alpha');
+			$object->account_number = $account_number;
+			$object->account_parent = $account_parent;
+			$object->account_category = GETPOST('account_category', 'alpha');
+			$object->label = $label;
+			$object->labelshort = GETPOST('labelshort', 'alpha');
+			$object->active = 1;
+
+			$res = $object->create($user);
+			if ($res == -3) {
+				$error = 1;
+				$action = "create";
+				setEventMessages($object->error, $object->errors, 'errors');
+			} elseif ($res == -4) {
+				$error = 2;
+				$action = "create";
+				setEventMessages($object->error, $object->errors, 'errors');
+			} elseif ($res < 0) {
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = "create";
+			}
+			if (!$error) {
+				setEventMessages("RecordCreatedSuccessfully", null, 'mesgs');
+				$urltogo = $backtopage ? $backtopage : dol_buildpath('/accountancy/admin/account.php', 1);
+				header("Location: " . $urltogo);
+				exit;
+			}
 		}
 	}
 } elseif ($action == 'edit' && $user->rights->accounting->chartofaccount) {
 	if (!$cancel) {
-		$result = $object->fetch($id);
-
-		$sql = 'SELECT pcg_version FROM '.MAIN_DB_PREFIX.'accounting_system WHERE rowid='.$conf->global->CHARTOFACCOUNTS;
-
-		dol_syslog('accountancy/admin/card.php:: $sql='.$sql);
-		$result2 = $db->query($sql);
-		$obj = $db->fetch_object($result2);
-
-		// Clean code
-
-		// To manage zero or not at the end of the accounting account
-		if ($conf->global->ACCOUNTING_MANAGE_ZERO == 1)
+		if (!$account_number)
 		{
-			$account_number = GETPOST('account_number', 'string');
-		} else {
-			$account_number = clean_account(GETPOST('account_number', 'string'));
-		}
-
-		if (GETPOST('account_parent', 'int') <= 0)
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountNumber")), null, 'errors');
+			$action = 'update';
+		} elseif (!$label)
 		{
-			$account_parent = 0;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
+			$action = 'update';
 		} else {
-			$account_parent = GETPOST('account_parent', 'int');
-		}
+			$result = $object->fetch($id);
 
-		$object->fk_pcg_version = $obj->pcg_version;
-		$object->pcg_type = GETPOST('pcg_type', 'alpha');
-		$object->account_number = $account_number;
-		$object->account_parent = $account_parent;
-		$object->account_category = GETPOST('account_category', 'alpha');
-		$object->label = GETPOST('label', 'alpha');
-		$object->labelshort = GETPOST('labelshort', 'alpha');
+			$sql = 'SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS;
 
-		$result = $object->update($user);
+			dol_syslog('accountancy/admin/card.php:: $sql=' . $sql);
+			$result2 = $db->query($sql);
+			$obj = $db->fetch_object($result2);
 
-		if ($result > 0) {
-			$urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"]."?id=".$id);
-			header("Location: ".$urltogo);
-			exit();
-		} else {
-			$mesg = $object->error;
+			// Clean code
+
+			// To manage zero or not at the end of the accounting account
+			if ($conf->global->ACCOUNTING_MANAGE_ZERO == 1) {
+				$account_number = $account_number;
+			} else {
+				$account_number = clean_account($account_number);
+			}
+
+			if (GETPOST('account_parent', 'int') <= 0) {
+				$account_parent = 0;
+			} else {
+				$account_parent = GETPOST('account_parent', 'int');
+			}
+
+			$object->fk_pcg_version = $obj->pcg_version;
+			$object->pcg_type = GETPOST('pcg_type', 'alpha');
+			$object->account_number = $account_number;
+			$object->account_parent = $account_parent;
+			$object->account_category = GETPOST('account_category', 'alpha');
+			$object->label = $label;
+			$object->labelshort = GETPOST('labelshort', 'alpha');
+
+			$result = $object->update($user);
+
+			if ($result > 0) {
+				$urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"] . "?id=" . $id);
+				header("Location: " . $urltogo);
+				exit();
+			} else {
+				$mesg = $object->error;
+			}
 		}
 	} else {
 		$urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"]."?id=".$id);
@@ -222,7 +238,7 @@ if ($action == 'create') {
 
 	// Account number
 	print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("AccountNumber").'</span></td>';
-	print '<td><input name="account_number" size="30" value="'.$accountingaccount.'"></td></tr>';
+	print '<td><input name="account_number" size="30" value="'.$account_number.'"></td></tr>';
 
 	// Label
 	print '<tr><td><span class="fieldrequired">'.$langs->trans("Label").'</span></td>';
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 0f77de7d331..fcd7efdab47 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -323,7 +323,7 @@ if ($action != 'export_csv')
 		$root_account_number = $tmparrayforrootaccount['account_number'];
 
 		if (empty($accountingaccountstatic->label) && $accountingaccountstatic->id > 0) {
-			$link = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/card.php?action=update&token=' . newToken() . '&id=' . $accountingaccountstatic->id . '">' . img_edit() . '</a>';
+			$link = '<a class="editfielda reposition" href="' . DOL_URL_ROOT . '/accountancy/admin/card.php?action=update&token=' . newToken() . '&id=' . $accountingaccountstatic->id . '">' . img_edit() . '</a>';
 		} elseif (empty($tmparrayforrootaccount['label'])) {
 			$link = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/card.php?action=create&token=' . newToken() . '&accountingaccount=' . length_accountg($line->numero_compte) . '">' . img_edit_add() . '</a>';
 		}

From 3399ab2c5d7938ee2e914ee36f6d5e7c0544c8b8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 Jan 2021 10:20:41 +0100
Subject: [PATCH 871/888] Fix phpcs

---
 .../triggers/interface_50_modTicket_TicketEmail.class.php     | 4 ++--
 htdocs/societe/card.php                                       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index c3cf0f56d01..55c128c2f0f 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -203,12 +203,12 @@ class InterfaceTicketEmail extends DolibarrTriggers
 
 					$contactid = GETPOST('contactid', 'alpha');
 
-					if(!empty($contactid)) {
+					if (!empty($contactid)) {
 						$contact = new Contact($this->db);
 						$res = $contact->fetch($contactid);
 					}
 
-					if($res > 0 && !empty($contact->email) && !empty($contact->statut)) {
+					if ($res > 0 && !empty($contact->email) && !empty($contact->statut)) {
 						$sendto = $contact->email;
 					} elseif (!empty($object->fk_soc)) {
 						$object->fetch_thirdparty();
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index c80e65b424b..9194f08cd18 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -2140,7 +2140,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 					$c = new Categorie($db);
 					$cats = $c->containing($object->id, Categorie::TYPE_SUPPLIER);
 					$arrayselected = array();
-					foreach($cats as $cat) {
+					foreach ($cats as $cat) {
 						$arrayselected[] = $cat->id;
 					}
 					print img_picto('', 'category').$form->multiselectarray('suppcats', $cate_arbo, $arrayselected, 0, 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);

From 312f11d7b3fae7a79265215f6b0ec45899fcee8c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 Jan 2021 10:30:11 +0100
Subject: [PATCH 872/888] Update objectline_edit.tpl.php

---
 htdocs/core/tpl/objectline_edit.tpl.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 88dfa07e028..d524fe22bf8 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -189,15 +189,14 @@ $coldisplay++;
 	</td>
 
 	<?php
-	if (!empty($conf->global->PRODUCT_USE_UNITS))
-	{
+	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 		$unit_type = false;
 		// limit unit select to unit type
-		if (!empty($line->fk_unit) && empty($conf->global->MAIN_EDIT_LINE_ALLOW_ALL_UNIT_TYPE)){
-			if (!class_exists('CUnits')) include_once DOL_DOCUMENT_ROOT . '/core/class/cunits.class.php';
+		if (!empty($line->fk_unit) && empty($conf->global->MAIN_EDIT_LINE_ALLOW_ALL_UNIT_TYPE)) {
+			include_once DOL_DOCUMENT_ROOT.'/core/class/cunits.class.php';
 			$cUnit = new CUnits($line->db);
-			if ($cUnit->fetch($line->fk_unit) > 0){
-				if (!empty($cUnit->unit_type)){
+			if ($cUnit->fetch($line->fk_unit) > 0) {
+				if (!empty($cUnit->unit_type)) {
 					$unit_type = $cUnit->unit_type;
 				}
 			}

From c2855d4d71d213b45624af9f6ca3d90da7f6a646 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 Jan 2021 10:32:23 +0100
Subject: [PATCH 873/888] Update html.form.class.php

---
 htdocs/core/class/html.form.class.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 7d74276ce90..99dd80a8b2d 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3890,9 +3890,10 @@ class Form
 	 *      @param	string	$selected       Preselected Unit ID
 	 *      @param  string	$htmlname       Select name
 	 *      @param	int		$showempty		Add a nempty line
+	 *      @param  string  $unit_type      Restrict to one given unit type
 	 * 		@return	string                  HTML select
 	 */
-	public function selectUnits($selected = '', $htmlname = 'units', $showempty = 0, $unit_type = false)
+	public function selectUnits($selected = '', $htmlname = 'units', $showempty = 0, $unit_type = '')
 	{
 		global $langs;
 
@@ -3902,8 +3903,8 @@ class Form
 
 		$sql = 'SELECT rowid, label, code from '.MAIN_DB_PREFIX.'c_units';
 		$sql .= ' WHERE active > 0';
-		if (!empty($unit_type)){
-			$sql .= ' AND unit_type = "'.$this->db->escape($unit_type).'" ';
+		if (!empty($unit_type)) {
+			$sql .= " AND unit_type = '".$this->db->escape($unit_type)."'";
 		}
 
 		$resql = $this->db->query($sql);

From f578164b4285cc28c4c02a0ad988626f46141dca Mon Sep 17 00:00:00 2001
From: Lars Wallenborn <lars@wallenborn.net>
Date: Thu, 7 Jan 2021 11:43:08 +0100
Subject: [PATCH 874/888] [FIX] sort order in birthday box

The current sort order is by date and not by day of month. This yields
the following unexpected results:

Given

* Person A, born on 1980-01-10
* Person B, born on 1970-01-30

I expect Person A to be listed first because their birthday is before
that of Person B _in January_. But without this fix, Person B would show
up first because 1970 is before 1980.
---
 htdocs/core/boxes/box_birthdays.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/boxes/box_birthdays.php b/htdocs/core/boxes/box_birthdays.php
index 9a2ccd33cf7..d984635bdd6 100644
--- a/htdocs/core/boxes/box_birthdays.php
+++ b/htdocs/core/boxes/box_birthdays.php
@@ -91,7 +91,7 @@ class box_birthdays extends ModeleBoxes
 			$sql .= " WHERE u.entity IN (".getEntity('user').")";
 			$sql .= " AND u.statut = 1";
 			$sql .= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0);
-			$sql .= " ORDER BY u.birth ASC";
+			$sql .= " ORDER BY DAYOFMONTH(u.birth) ASC";
 			$sql .= $this->db->plimit($max, 0);
 
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);

From 6da3ed1a51cbf27bc1249c5fbde7a4ff26e70bfb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 Jan 2021 12:39:51 +0100
Subject: [PATCH 875/888] Merge 2 exclusive options into 1

---
 htdocs/comm/propal/card.php               |  5 +--
 htdocs/core/class/conf.class.php          |  6 ++++
 htdocs/core/tpl/objectline_create.tpl.php |  6 ++--
 htdocs/core/tpl/objectline_view.tpl.php   |  3 +-
 htdocs/langs/en_US/admin.lang             |  7 ++--
 htdocs/langs/en_US/products.lang          |  2 +-
 htdocs/product/admin/product.php          | 44 ++++++++++++-----------
 htdocs/product/card.php                   |  7 ++--
 8 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index af00daa38e0..71f7f4d88cc 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1003,8 +1003,9 @@ if (empty($reshook))
 				} else {
 					$desc = $prod->description;
 				}
-
-				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
+var_dump($desc);
+var_dump($product_desc);exit;
+				//If text set in desc is the same as product description (as now it's preloaded) whe add it only one time
 				if ($product_desc==$desc && !empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
 					$product_desc='';
 				}
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 3191e5edd47..1eb3b9911ba 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -697,6 +697,12 @@ class Conf
 
 		if (!empty($this->global->MAIN_TZUSERINPUTKEY)) $this->tzuserinputkey = $this->global->MAIN_TZUSERINPUTKEY;	// 'tzserver' or 'tzuserrel'
 
+		if (!empty($this->global->PRODUIT_AUTOFILL_DESC)) {
+			$this->global->MAIN_NO_CONCAT_DESCRIPTION = 1;
+		} else {
+			unset($this->global->MAIN_NO_CONCAT_DESCRIPTION);
+		}
+
 		// For backward compatibility
 		if (isset($this->product))   $this->produit = $this->product;
 		if (isset($this->facture))   $this->invoice = $this->facture;
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index baf5881ce2e..58d4627bf87 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -677,7 +677,7 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 						console.log("Load unit price end, we got value "+data.price_ht);
 						jQuery("#price_ht").val(data.price_ht);
 						<?php
-						if (!empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
+						if (!empty($conf->global->PRODUIT_AUTOFILL_DESC) && $conf->global->PRODUIT_AUTOFILL_DESC == 1) {
 							if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) { ?>
 						var proddesc = data.desc_trans;
 								<?php
@@ -875,7 +875,7 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 			}
 
 			<?php
-			if (!empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
+			if (!empty($conf->global->PRODUIT_AUTOFILL_DESC) && $conf->global->PRODUIT_AUTOFILL_DESC == 1) {
 				?>
 			var description = $('option:selected', this).attr('data-description');
 			if (typeof description == 'undefined') { description = jQuery('#idprodfournprice').attr('data-description');	}
@@ -898,7 +898,7 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 			}?>
 		} else if (jQuery('#idprodfournprice').length > 0) {
 			<?php
-			if (!empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
+			if (!empty($conf->global->PRODUIT_AUTOFILL_DESC) && $conf->global->PRODUIT_AUTOFILL_DESC == 1) {
 				if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) { ?>
 			if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined")
 			{
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index cba0b0b3e53..e6f41eaa8a5 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -119,8 +119,7 @@ if (($line->info_bits & 2) == 2) {
 } else {
 	$format = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE ? 'dayhour' : 'day';
 
-	if ($line->fk_product > 0)
-	{
+	if ($line->fk_product > 0) {
 		print $form->textwithtooltip($text, $description, 3, '', '', $i, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
 	} else {
 		$type = (!empty($line->product_type) ? $line->product_type : $line->fk_product_type);
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index f759da42f3b..cf35c4c0f83 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1599,9 +1599,12 @@ ProductServiceSetup=Products and Services modules setup
 NumberOfProductShowInSelect=Maximum number of products to show in combo select lists (0=no limit)
 ViewProductDescInFormAbility=Display product descriptions in forms (otherwise shown in a tooltip popup)
 DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
-OnProductSelectAddProductDesc=On product selection in forms get the production description into description line
+OnProductSelectAddProductDesc=How to use the description of the products when adding a product as a line of a document
+AutoFillFormFieldBeforeSubmit=Auto fill the description input field with the description of product
+DoNotAutofillButAutoConcat=Do not autofill the input field with description of product. Description of the product will be concatenated to the entered description automatically. 
+DoNotUseDescriptionOfProdut=Description of the product will never be included into the description of lines of documents 
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in the language of the third party
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 UseSearchToSelectProductTooltip=Also if you have a large number of products (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Wait until you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index f0c4a5362b8..9ecc11ed93d 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -108,7 +108,7 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Enable Kits (set of other products)
+AssociatedProductsAbility=Enable Kits (set of several products)
 VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 5eabeb3ddfd..25c5c8b1142 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -148,9 +148,6 @@ if ($action == 'other')
 	$value = GETPOST('activate_FillProductDescAuto', 'alpha');
 	$res = dolibarr_set_const($db, "PRODUIT_AUTOFILL_DESC", $value, 'chaine', 0, '', $conf->entity);
 
-	$value = GETPOST('activate_DoNotAddStdProductDescOnAddLine', 'alpha');
-	$res = dolibarr_set_const($db, "MAIN_NO_CONCAT_DESCRIPTION", $value, 'chaine', 0, '', $conf->entity);
-
 	if ($value) {
 		$sql_test = "SELECT count(desc_fourn) as cpt FROM ".MAIN_DB_PREFIX."product_fournisseur_price WHERE 1";
 		$resql = $db->query($sql_test);
@@ -583,7 +580,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES)) $current_rule = 'PRODUIT_MULTIPR
 if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) $current_rule = 'PRODUIT_CUSTOMER_PRICES_BY_QTY';
 if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) $current_rule = 'PRODUIT_CUSTOMER_PRICES';
 if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $current_rule = 'PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES';
-print $form->selectarray("princingrule", $select_pricing_rules, $current_rule);
+print $form->selectarray("princingrule", $select_pricing_rules, $current_rule, 0, 0, 0, '', 1, 0, 0, '', 'maxwidth400', 1);
 print '</td>';
 print '</tr>';
 
@@ -635,6 +632,28 @@ if (empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))
 	print '</tr>';
 }
 
+// Do Not Add Product description on add lines
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("OnProductSelectAddProductDesc").'</td>';
+print '<td class="right">';
+print $form->selectarray(
+	"activate_FillProductDescAuto",
+	array(1=>'AutoFillFormFieldBeforeSubmit', 0=>'DoNotAutofillButAutoConcat', -1=>'DoNotUseDescriptionOfProdut'),
+	empty($conf->global->PRODUIT_AUTOFILL_DESC) ? 0 : $conf->global->PRODUIT_AUTOFILL_DESC,
+	0,
+	0,
+	0,
+	'',
+	1,
+	0,
+	0,
+	'',
+	'maxwidth400',
+	1
+);
+print '</td>';
+print '</tr>';
+
 // Visualiser description produit dans les formulaires activation/desactivation
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ViewProductDescInFormAbility").'</td>';
@@ -643,23 +662,6 @@ print $form->selectyesno("activate_viewProdDescInForm", $conf->global->PRODUIT_D
 print '</td>';
 print '</tr>';
 
-// Do Not Add Product description on add lines
-print '<tr class="oddeven">';
-print '<td>'.$langs->trans("DoNotAddProductDescAtAddLines").'</td>';
-print '<td class="right">';
-print $form->selectyesno("activate_DoNotAddStdProductDescOnAddLine", $conf->global->MAIN_NO_CONCAT_DESCRIPTION, 1);
-print '</td>';
-print '</tr>';
-
-// Do Not Add Product description on add lines
-print '<tr class="oddeven">';
-print '<td>'.$langs->trans("OnProductSelectAddProductDesc").'</td>';
-print '<td class="right">';
-print $form->selectyesno("activate_FillProductDescAuto", $conf->global->PRODUIT_AUTOFILL_DESC, 1);
-print '</td>';
-print '</tr>';
-
-
 // Activate propal merge produt card
 /* Kept as hidden feature only. PRODUIT_PDF_MERGE_PROPAL can be added manually. Still did not understand how this feature works.
 
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index b351b9ec7e1..b2997d948ac 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -413,7 +413,10 @@ if (empty($reshook))
 
 				$object->ref                    = $ref;
 				$object->label                  = GETPOST('label', $label_security_check);
-				$object->description            = dol_htmlcleanlastbr(GETPOST('desc', 'restricthtml'));
+
+				$desc = dol_htmlcleanlastbr(preg_replace('/&nbsp;$/', '', GETPOST('desc', 'restricthtml')));
+				$object->description            = $desc;
+
 				$object->url = GETPOST('url');
 				if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 				{
@@ -426,8 +429,8 @@ if (empty($reshook))
 				$object->status                 = GETPOST('statut', 'int');
 				$object->status_buy             = GETPOST('statut_buy', 'int');
 				$object->status_batch = GETPOST('status_batch', 'aZ09');
-				// removed from update view so GETPOST always empty
 				$object->fk_default_warehouse   = GETPOST('fk_default_warehouse');
+				// removed from update view so GETPOST always empty
 				/*
                 $object->seuil_stock_alerte     = GETPOST('seuil_stock_alerte');
                 $object->desiredstock           = GETPOST('desiredstock');

From 8c3e7b4dc6a85ef5ed8e5e025f0355c8a8bb03fb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 Jan 2021 12:43:15 +0100
Subject: [PATCH 876/888] Fix vardump

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

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 71f7f4d88cc..71da2e69336 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1003,8 +1003,7 @@ if (empty($reshook))
 				} else {
 					$desc = $prod->description;
 				}
-var_dump($desc);
-var_dump($product_desc);exit;
+
 				//If text set in desc is the same as product description (as now it's preloaded) whe add it only one time
 				if ($product_desc==$desc && !empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
 					$product_desc='';

From ddc3f35be15926bccea61e843eb51c0691c09467 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 Jan 2021 12:47:16 +0100
Subject: [PATCH 877/888] Update box_birthdays.php

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

diff --git a/htdocs/core/boxes/box_birthdays.php b/htdocs/core/boxes/box_birthdays.php
index d984635bdd6..ea83e022079 100644
--- a/htdocs/core/boxes/box_birthdays.php
+++ b/htdocs/core/boxes/box_birthdays.php
@@ -91,7 +91,7 @@ class box_birthdays extends ModeleBoxes
 			$sql .= " WHERE u.entity IN (".getEntity('user').")";
 			$sql .= " AND u.statut = 1";
 			$sql .= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0);
-			$sql .= " ORDER BY DAYOFMONTH(u.birth) ASC";
+			$sql .= " ORDER BY DAY(u.birth) ASC";
 			$sql .= $this->db->plimit($max, 0);
 
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);

From 094ea841db7bedf0369303fdbda1f933cceeedf8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 Jan 2021 12:49:19 +0100
Subject: [PATCH 878/888] Fix sort by day

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

diff --git a/htdocs/core/boxes/box_birthdays_members.php b/htdocs/core/boxes/box_birthdays_members.php
index 02a315ea836..56619fac581 100644
--- a/htdocs/core/boxes/box_birthdays_members.php
+++ b/htdocs/core/boxes/box_birthdays_members.php
@@ -91,7 +91,7 @@ class box_birthdays_members extends ModeleBoxes
 			$sql .= " WHERE u.entity IN (".getEntity('adherent').")";
 	  		$sql .= " AND u.statut = 1";
 	  		$sql .= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0);
-			$sql .= " ORDER BY u.birth ASC";
+			$sql .= " ORDER BY DAY(u.birth) ASC";
 			$sql .= $this->db->plimit($max, 0);
 
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);

From a498f8dfe188ff8299cc40a85379901ccec72cb6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 Jan 2021 12:49:19 +0100
Subject: [PATCH 879/888] Fix sort by day

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

diff --git a/htdocs/core/boxes/box_birthdays_members.php b/htdocs/core/boxes/box_birthdays_members.php
index 02a315ea836..56619fac581 100644
--- a/htdocs/core/boxes/box_birthdays_members.php
+++ b/htdocs/core/boxes/box_birthdays_members.php
@@ -91,7 +91,7 @@ class box_birthdays_members extends ModeleBoxes
 			$sql .= " WHERE u.entity IN (".getEntity('adherent').")";
 	  		$sql .= " AND u.statut = 1";
 	  		$sql .= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0);
-			$sql .= " ORDER BY u.birth ASC";
+			$sql .= " ORDER BY DAY(u.birth) ASC";
 			$sql .= $this->db->plimit($max, 0);
 
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);

From 1880e51d1c7d6857f3551daa9feab6f67efc61ff Mon Sep 17 00:00:00 2001
From: Lars Wallenborn <lars@wallenborn.net>
Date: Thu, 7 Jan 2021 11:43:08 +0100
Subject: [PATCH 880/888] [FIX] sort order in birthday box

The current sort order is by date and not by day of month. This yields
the following unexpected results:

Given

* Person A, born on 1980-01-10
* Person B, born on 1970-01-30

I expect Person A to be listed first because their birthday is before
that of Person B _in January_. But without this fix, Person B would show
up first because 1970 is before 1980.
---
 htdocs/core/boxes/box_birthdays.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/boxes/box_birthdays.php b/htdocs/core/boxes/box_birthdays.php
index 9a2ccd33cf7..d984635bdd6 100644
--- a/htdocs/core/boxes/box_birthdays.php
+++ b/htdocs/core/boxes/box_birthdays.php
@@ -91,7 +91,7 @@ class box_birthdays extends ModeleBoxes
 			$sql .= " WHERE u.entity IN (".getEntity('user').")";
 			$sql .= " AND u.statut = 1";
 			$sql .= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0);
-			$sql .= " ORDER BY u.birth ASC";
+			$sql .= " ORDER BY DAYOFMONTH(u.birth) ASC";
 			$sql .= $this->db->plimit($max, 0);
 
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);

From 2794327e1056c423673c06b4e47980b74800f065 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 Jan 2021 12:47:16 +0100
Subject: [PATCH 881/888] Update box_birthdays.php

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

diff --git a/htdocs/core/boxes/box_birthdays.php b/htdocs/core/boxes/box_birthdays.php
index d984635bdd6..ea83e022079 100644
--- a/htdocs/core/boxes/box_birthdays.php
+++ b/htdocs/core/boxes/box_birthdays.php
@@ -91,7 +91,7 @@ class box_birthdays extends ModeleBoxes
 			$sql .= " WHERE u.entity IN (".getEntity('user').")";
 			$sql .= " AND u.statut = 1";
 			$sql .= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0);
-			$sql .= " ORDER BY DAYOFMONTH(u.birth) ASC";
+			$sql .= " ORDER BY DAY(u.birth) ASC";
 			$sql .= $this->db->plimit($max, 0);
 
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);

From 53da17e051aca34933b457553946d609224e4194 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 8 Jan 2021 00:49:58 +0100
Subject: [PATCH 882/888] Add column to count pageview on website module

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 4 ++++
 htdocs/install/mysql/tables/llx_website.sql      | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 7b9cb8c9ef8..ad3250f4694 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -43,3 +43,7 @@ ALTER TABLE llx_bank_account ADD COLUMN ics varchar(32) NULL;
 ALTER TABLE llx_bank_account ADD COLUMN ics_transfer varchar(32) NULL;
 
 ALTER TABLE llx_facture MODIFY COLUMN date_valid DATETIME NULL DEFAULT NULL;
+
+ALTER TABLE llx_website ADD COLUMN lastaccess datetime NULL;
+ALTER TABLE llx_website ADD COLUMN pageviews_month integer DEFAULT 0;
+ALTER TABLE llx_website ADD COLUMN pageviews_total BIGINT UNSIGNED DEFAULT 0;
diff --git a/htdocs/install/mysql/tables/llx_website.sql b/htdocs/install/mysql/tables/llx_website.sql
index b2103177972..21b88d16ece 100644
--- a/htdocs/install/mysql/tables/llx_website.sql
+++ b/htdocs/install/mysql/tables/llx_website.sql
@@ -36,6 +36,9 @@ CREATE TABLE llx_website
     fk_user_modif integer,
     date_creation datetime,
     position      integer DEFAULT 0,
+    lastaccess    datetime NULL,
+    pageviews_month integer DEFAULT 0,
+    pageviews_total BIGINT UNSIGNED DEFAULT 0,
 	tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     import_key    varchar(14)      -- import key	
 ) ENGINE=innodb;

From 0448bf07cb370b8db3c7eed133e697357abf9f16 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 8 Jan 2021 00:52:26 +0100
Subject: [PATCH 883/888] Fix field size

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index ad3250f4694..a006b1747e7 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -45,5 +45,5 @@ ALTER TABLE llx_bank_account ADD COLUMN ics_transfer varchar(32) NULL;
 ALTER TABLE llx_facture MODIFY COLUMN date_valid DATETIME NULL DEFAULT NULL;
 
 ALTER TABLE llx_website ADD COLUMN lastaccess datetime NULL;
-ALTER TABLE llx_website ADD COLUMN pageviews_month integer DEFAULT 0;
+ALTER TABLE llx_website ADD COLUMN pageviews_month BIGINT UNSIGNED DEFAULT 0;
 ALTER TABLE llx_website ADD COLUMN pageviews_total BIGINT UNSIGNED DEFAULT 0;

From 8fca2ce2eb74e51888ee7385445b88af427523d2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 8 Jan 2021 00:52:38 +0100
Subject: [PATCH 884/888] Fix field size

---
 htdocs/install/mysql/tables/llx_website.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/tables/llx_website.sql b/htdocs/install/mysql/tables/llx_website.sql
index 21b88d16ece..0df6ccf8ef3 100644
--- a/htdocs/install/mysql/tables/llx_website.sql
+++ b/htdocs/install/mysql/tables/llx_website.sql
@@ -37,7 +37,7 @@ CREATE TABLE llx_website
     date_creation datetime,
     position      integer DEFAULT 0,
     lastaccess    datetime NULL,
-    pageviews_month integer DEFAULT 0,
+    pageviews_month BIGINT UNSIGNED DEFAULT 0,
     pageviews_total BIGINT UNSIGNED DEFAULT 0,
 	tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     import_key    varchar(14)      -- import key	

From b91bca7022993bb8d631faa20d537c058618dc39 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 8 Jan 2021 01:56:23 +0100
Subject: [PATCH 885/888] Fix the source object may have been modified with
 corrupted data.

---
 htdocs/expedition/card.php                          | 2 --
 htdocs/expedition/class/expedition.class.php        | 6 +++---
 htdocs/product/stock/class/mouvementstock.class.php | 1 -
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 31ea04c1fdf..c4d646160e5 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -188,7 +188,6 @@ if (empty($reshook))
 	if ($action == 'add' && $user->rights->expedition->creer)
 	{
 		$error = 0;
-		$predef = '';
 
 		$db->begin();
 
@@ -215,7 +214,6 @@ if (empty($reshook))
 		$object->fk_delivery_address	= $objectsrc->fk_delivery_address;
 		$object->shipping_method_id		= GETPOST('shipping_method_id', 'int');
 		$object->tracking_number = GETPOST('tracking_number', 'alpha');
-		$object->ref_int = GETPOST('ref_int', 'alpha');
 		$object->note_private = GETPOST('note_private', 'restricthtml');
 		$object->note_public = GETPOST('note_public', 'restricthtml');
 		$object->fk_incoterms = GETPOST('incoterm_id', 'int');
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index e4722cabb4d..20091028583 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -671,7 +671,7 @@ class Expedition extends CommonObject
 		// Protection
 		if ($this->statut)
 		{
-			dol_syslog(get_class($this)."::valid no draft status", LOG_WARNING);
+			dol_syslog(get_class($this)."::valid not in draft status", LOG_WARNING);
 			return 0;
 		}
 
@@ -757,7 +757,7 @@ class Expedition extends CommonObject
 
 					//var_dump($this->lines[$i]);
 					$mouvS = new MouvementStock($this->db);
-					$mouvS->origin = &$this;
+					$mouvS->origin = dol_clone($this, 1);
 
 					if (empty($obj->edbrowid))
 					{
@@ -765,6 +765,7 @@ class Expedition extends CommonObject
 
 						// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
 						$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentValidatedInDolibarr", $numref));
+
 						if ($result < 0) {
 							$error++;
 							$this->error = $mouvS->error;
@@ -794,7 +795,6 @@ class Expedition extends CommonObject
 
 		// Change status of order to "shipment in process"
 		$ret = $this->setStatut(Commande::STATUS_SHIPMENTONPROCESS, $this->origin_id, $this->origin);
-
 		if (!$ret)
 		{
 			$error++;
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 2429a4c09c5..4e1c8a4e57f 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -666,7 +666,6 @@ class MouvementStock extends CommonObject
 			}
 
 			// Retrieve all extrafield
-			// fetch optionals attributes and labels
 			$this->fetch_optionals();
 
 			// $this->fetch_lines();

From 69c614ec2a402d45b424c04fa5bc94775766818d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 8 Jan 2021 11:22:11 +0100
Subject: [PATCH 886/888] Sync transifex

---
 htdocs/langs/am_ET/accountancy.lang       |   17 +-
 htdocs/langs/am_ET/admin.lang             |   25 +-
 htdocs/langs/am_ET/banks.lang             |    4 +-
 htdocs/langs/am_ET/blockedlog.lang        |    2 +-
 htdocs/langs/am_ET/boxes.lang             |    5 +
 htdocs/langs/am_ET/cashdesk.lang          |   10 +-
 htdocs/langs/am_ET/categories.lang        |   17 +-
 htdocs/langs/am_ET/companies.lang         |    2 +-
 htdocs/langs/am_ET/compta.lang            |   13 +-
 htdocs/langs/am_ET/cron.lang              |   13 +-
 htdocs/langs/am_ET/errors.lang            |   23 +-
 htdocs/langs/am_ET/exports.lang           |    1 +
 htdocs/langs/am_ET/mails.lang             |   25 +-
 htdocs/langs/am_ET/main.lang              |   12 +-
 htdocs/langs/am_ET/modulebuilder.lang     |    7 +-
 htdocs/langs/am_ET/other.lang             |    8 +-
 htdocs/langs/am_ET/products.lang          |    7 +-
 htdocs/langs/am_ET/recruitment.lang       |    1 +
 htdocs/langs/am_ET/sendings.lang          |    2 +
 htdocs/langs/am_ET/stocks.lang            |    1 +
 htdocs/langs/am_ET/ticket.lang            |    9 +-
 htdocs/langs/am_ET/website.lang           |    4 +-
 htdocs/langs/am_ET/withdrawals.lang       |    5 +-
 htdocs/langs/ar_SA/accountancy.lang       |   17 +-
 htdocs/langs/ar_SA/admin.lang             |   25 +-
 htdocs/langs/ar_SA/banks.lang             |    4 +-
 htdocs/langs/ar_SA/blockedlog.lang        |    2 +-
 htdocs/langs/ar_SA/boxes.lang             |    5 +
 htdocs/langs/ar_SA/cashdesk.lang          |   10 +-
 htdocs/langs/ar_SA/categories.lang        |   17 +-
 htdocs/langs/ar_SA/companies.lang         |    2 +-
 htdocs/langs/ar_SA/compta.lang            |   13 +-
 htdocs/langs/ar_SA/cron.lang              |   36 +-
 htdocs/langs/ar_SA/errors.lang            |   23 +-
 htdocs/langs/ar_SA/exports.lang           |    3 +
 htdocs/langs/ar_SA/mails.lang             |   25 +-
 htdocs/langs/ar_SA/main.lang              |   12 +-
 htdocs/langs/ar_SA/modulebuilder.lang     |    7 +-
 htdocs/langs/ar_SA/other.lang             |    8 +-
 htdocs/langs/ar_SA/products.lang          |    9 +-
 htdocs/langs/ar_SA/recruitment.lang       |    1 +
 htdocs/langs/ar_SA/sendings.lang          |    2 +
 htdocs/langs/ar_SA/stocks.lang            |    1 +
 htdocs/langs/ar_SA/ticket.lang            |    9 +-
 htdocs/langs/ar_SA/website.lang           |    4 +-
 htdocs/langs/ar_SA/withdrawals.lang       |    5 +-
 htdocs/langs/az_AZ/accountancy.lang       |   17 +-
 htdocs/langs/az_AZ/admin.lang             |   25 +-
 htdocs/langs/az_AZ/banks.lang             |    4 +-
 htdocs/langs/az_AZ/blockedlog.lang        |    2 +-
 htdocs/langs/az_AZ/boxes.lang             |    5 +
 htdocs/langs/az_AZ/cashdesk.lang          |   10 +-
 htdocs/langs/az_AZ/categories.lang        |   17 +-
 htdocs/langs/az_AZ/companies.lang         |    2 +-
 htdocs/langs/az_AZ/compta.lang            |   13 +-
 htdocs/langs/az_AZ/cron.lang              |   13 +-
 htdocs/langs/az_AZ/errors.lang            |   23 +-
 htdocs/langs/az_AZ/exports.lang           |    1 +
 htdocs/langs/az_AZ/mails.lang             |   25 +-
 htdocs/langs/az_AZ/main.lang              |   12 +-
 htdocs/langs/az_AZ/modulebuilder.lang     |    7 +-
 htdocs/langs/az_AZ/other.lang             |    8 +-
 htdocs/langs/az_AZ/products.lang          |    9 +-
 htdocs/langs/az_AZ/recruitment.lang       |    1 +
 htdocs/langs/az_AZ/sendings.lang          |    2 +
 htdocs/langs/az_AZ/stocks.lang            |    1 +
 htdocs/langs/az_AZ/ticket.lang            |    9 +-
 htdocs/langs/az_AZ/website.lang           |    4 +-
 htdocs/langs/az_AZ/withdrawals.lang       |    5 +-
 htdocs/langs/bg_BG/accountancy.lang       |   17 +-
 htdocs/langs/bg_BG/admin.lang             |   25 +-
 htdocs/langs/bg_BG/banks.lang             |    4 +-
 htdocs/langs/bg_BG/blockedlog.lang        |    2 +-
 htdocs/langs/bg_BG/boxes.lang             |    5 +
 htdocs/langs/bg_BG/cashdesk.lang          |   10 +-
 htdocs/langs/bg_BG/categories.lang        |   17 +-
 htdocs/langs/bg_BG/companies.lang         |    2 +-
 htdocs/langs/bg_BG/compta.lang            |   13 +-
 htdocs/langs/bg_BG/cron.lang              |   13 +-
 htdocs/langs/bg_BG/errors.lang            |   23 +-
 htdocs/langs/bg_BG/exports.lang           |    1 +
 htdocs/langs/bg_BG/mails.lang             |   25 +-
 htdocs/langs/bg_BG/main.lang              |   12 +-
 htdocs/langs/bg_BG/modulebuilder.lang     |    7 +-
 htdocs/langs/bg_BG/other.lang             |    6 +-
 htdocs/langs/bg_BG/products.lang          |    9 +-
 htdocs/langs/bg_BG/recruitment.lang       |    1 +
 htdocs/langs/bg_BG/sendings.lang          |    2 +
 htdocs/langs/bg_BG/stocks.lang            |    1 +
 htdocs/langs/bg_BG/ticket.lang            |    9 +-
 htdocs/langs/bg_BG/website.lang           |    4 +-
 htdocs/langs/bg_BG/withdrawals.lang       |    5 +-
 htdocs/langs/bn_BD/accountancy.lang       |   17 +-
 htdocs/langs/bn_BD/admin.lang             |   25 +-
 htdocs/langs/bn_BD/banks.lang             |    4 +-
 htdocs/langs/bn_BD/blockedlog.lang        |    2 +-
 htdocs/langs/bn_BD/boxes.lang             |    5 +
 htdocs/langs/bn_BD/cashdesk.lang          |   10 +-
 htdocs/langs/bn_BD/categories.lang        |   17 +-
 htdocs/langs/bn_BD/companies.lang         |    2 +-
 htdocs/langs/bn_BD/compta.lang            |   13 +-
 htdocs/langs/bn_BD/cron.lang              |   36 +-
 htdocs/langs/bn_BD/errors.lang            |   23 +-
 htdocs/langs/bn_BD/exports.lang           |    3 +
 htdocs/langs/bn_BD/mails.lang             |   25 +-
 htdocs/langs/bn_BD/main.lang              |   12 +-
 htdocs/langs/bn_BD/modulebuilder.lang     |    7 +-
 htdocs/langs/bn_BD/other.lang             |    8 +-
 htdocs/langs/bn_BD/products.lang          |    9 +-
 htdocs/langs/bn_BD/recruitment.lang       |    1 +
 htdocs/langs/bn_BD/sendings.lang          |    2 +
 htdocs/langs/bn_BD/stocks.lang            |    1 +
 htdocs/langs/bn_BD/ticket.lang            |    9 +-
 htdocs/langs/bn_BD/website.lang           |    4 +-
 htdocs/langs/bn_BD/withdrawals.lang       |    5 +-
 htdocs/langs/bn_IN/accountancy.lang       |   17 +-
 htdocs/langs/bn_IN/admin.lang             |   25 +-
 htdocs/langs/bn_IN/banks.lang             |    4 +-
 htdocs/langs/bn_IN/blockedlog.lang        |    2 +-
 htdocs/langs/bn_IN/boxes.lang             |    5 +
 htdocs/langs/bn_IN/cashdesk.lang          |   10 +-
 htdocs/langs/bn_IN/categories.lang        |   17 +-
 htdocs/langs/bn_IN/companies.lang         |    2 +-
 htdocs/langs/bn_IN/compta.lang            |   13 +-
 htdocs/langs/bn_IN/cron.lang              |   13 +-
 htdocs/langs/bn_IN/errors.lang            |   23 +-
 htdocs/langs/bn_IN/exports.lang           |    1 +
 htdocs/langs/bn_IN/mails.lang             |   25 +-
 htdocs/langs/bn_IN/main.lang              |   12 +-
 htdocs/langs/bn_IN/modulebuilder.lang     |    7 +-
 htdocs/langs/bn_IN/other.lang             |    8 +-
 htdocs/langs/bn_IN/products.lang          |    9 +-
 htdocs/langs/bn_IN/recruitment.lang       |    1 +
 htdocs/langs/bn_IN/sendings.lang          |    2 +
 htdocs/langs/bn_IN/stocks.lang            |    1 +
 htdocs/langs/bn_IN/ticket.lang            |    9 +-
 htdocs/langs/bn_IN/website.lang           |    4 +-
 htdocs/langs/bn_IN/withdrawals.lang       |    5 +-
 htdocs/langs/bs_BA/accountancy.lang       |   17 +-
 htdocs/langs/bs_BA/admin.lang             |   25 +-
 htdocs/langs/bs_BA/banks.lang             |    4 +-
 htdocs/langs/bs_BA/blockedlog.lang        |    2 +-
 htdocs/langs/bs_BA/boxes.lang             |    5 +
 htdocs/langs/bs_BA/cashdesk.lang          |   10 +-
 htdocs/langs/bs_BA/categories.lang        |   17 +-
 htdocs/langs/bs_BA/companies.lang         |    2 +-
 htdocs/langs/bs_BA/compta.lang            |   13 +-
 htdocs/langs/bs_BA/cron.lang              |   36 +-
 htdocs/langs/bs_BA/errors.lang            |   23 +-
 htdocs/langs/bs_BA/exports.lang           |    3 +
 htdocs/langs/bs_BA/mails.lang             |   25 +-
 htdocs/langs/bs_BA/main.lang              |   12 +-
 htdocs/langs/bs_BA/modulebuilder.lang     |    7 +-
 htdocs/langs/bs_BA/other.lang             |    8 +-
 htdocs/langs/bs_BA/products.lang          |    9 +-
 htdocs/langs/bs_BA/recruitment.lang       |    1 +
 htdocs/langs/bs_BA/sendings.lang          |    2 +
 htdocs/langs/bs_BA/stocks.lang            |    1 +
 htdocs/langs/bs_BA/ticket.lang            |    9 +-
 htdocs/langs/bs_BA/website.lang           |    4 +-
 htdocs/langs/bs_BA/withdrawals.lang       |    5 +-
 htdocs/langs/ca_ES/accountancy.lang       |   71 +-
 htdocs/langs/ca_ES/admin.lang             |  207 ++--
 htdocs/langs/ca_ES/agenda.lang            |   14 +-
 htdocs/langs/ca_ES/banks.lang             |   26 +-
 htdocs/langs/ca_ES/bills.lang             |   56 +-
 htdocs/langs/ca_ES/blockedlog.lang        |    8 +-
 htdocs/langs/ca_ES/bookmarks.lang         |    6 +-
 htdocs/langs/ca_ES/boxes.lang             |    8 +-
 htdocs/langs/ca_ES/cashdesk.lang          |   17 +-
 htdocs/langs/ca_ES/categories.lang        |   21 +-
 htdocs/langs/ca_ES/companies.lang         |    6 +-
 htdocs/langs/ca_ES/compta.lang            |   40 +-
 htdocs/langs/ca_ES/cron.lang              |   23 +-
 htdocs/langs/ca_ES/dict.lang              |   10 +-
 htdocs/langs/ca_ES/ecm.lang               |    8 +-
 htdocs/langs/ca_ES/errors.lang            |   23 +-
 htdocs/langs/ca_ES/exports.lang           |   15 +-
 htdocs/langs/ca_ES/holiday.lang           |   24 +-
 htdocs/langs/ca_ES/hrm.lang               |    2 +-
 htdocs/langs/ca_ES/install.lang           |   34 +-
 htdocs/langs/ca_ES/interventions.lang     |    8 +-
 htdocs/langs/ca_ES/mails.lang             |   53 +-
 htdocs/langs/ca_ES/main.lang              |   58 +-
 htdocs/langs/ca_ES/modulebuilder.lang     |   15 +-
 htdocs/langs/ca_ES/mrp.lang               |    2 +-
 htdocs/langs/ca_ES/oauth.lang             |    8 +-
 htdocs/langs/ca_ES/opensurvey.lang        |   14 +-
 htdocs/langs/ca_ES/orders.lang            |   14 +-
 htdocs/langs/ca_ES/other.lang             |   37 +-
 htdocs/langs/ca_ES/productbatch.lang      |   20 +-
 htdocs/langs/ca_ES/products.lang          |   53 +-
 htdocs/langs/ca_ES/projects.lang          |   18 +-
 htdocs/langs/ca_ES/receiptprinter.lang    |   14 +-
 htdocs/langs/ca_ES/recruitment.lang       |    3 +-
 htdocs/langs/ca_ES/resource.lang          |    4 +-
 htdocs/langs/ca_ES/salaries.lang          |    8 +-
 htdocs/langs/ca_ES/sendings.lang          |    9 +-
 htdocs/langs/ca_ES/stocks.lang            |   43 +-
 htdocs/langs/ca_ES/stripe.lang            |   12 +-
 htdocs/langs/ca_ES/supplier_proposal.lang |    9 +-
 htdocs/langs/ca_ES/ticket.lang            |   33 +-
 htdocs/langs/ca_ES/trips.lang             |   32 +-
 htdocs/langs/ca_ES/users.lang             |    8 +-
 htdocs/langs/ca_ES/website.lang           |    6 +-
 htdocs/langs/ca_ES/withdrawals.lang       |   25 +-
 htdocs/langs/ca_ES/workflow.lang          |    6 +-
 htdocs/langs/cs_CZ/accountancy.lang       |   17 +-
 htdocs/langs/cs_CZ/admin.lang             |   25 +-
 htdocs/langs/cs_CZ/banks.lang             |    4 +-
 htdocs/langs/cs_CZ/blockedlog.lang        |    2 +-
 htdocs/langs/cs_CZ/boxes.lang             |    5 +
 htdocs/langs/cs_CZ/cashdesk.lang          |   10 +-
 htdocs/langs/cs_CZ/categories.lang        |   17 +-
 htdocs/langs/cs_CZ/companies.lang         |    2 +-
 htdocs/langs/cs_CZ/compta.lang            |   13 +-
 htdocs/langs/cs_CZ/cron.lang              |   13 +-
 htdocs/langs/cs_CZ/errors.lang            |   23 +-
 htdocs/langs/cs_CZ/exports.lang           |    1 +
 htdocs/langs/cs_CZ/mails.lang             |   25 +-
 htdocs/langs/cs_CZ/main.lang              |   12 +-
 htdocs/langs/cs_CZ/modulebuilder.lang     |    7 +-
 htdocs/langs/cs_CZ/other.lang             |    8 +-
 htdocs/langs/cs_CZ/products.lang          |    9 +-
 htdocs/langs/cs_CZ/recruitment.lang       |    1 +
 htdocs/langs/cs_CZ/sendings.lang          |    2 +
 htdocs/langs/cs_CZ/stocks.lang            |    1 +
 htdocs/langs/cs_CZ/ticket.lang            |    9 +-
 htdocs/langs/cs_CZ/website.lang           |    4 +-
 htdocs/langs/cs_CZ/withdrawals.lang       |    5 +-
 htdocs/langs/da_DK/accountancy.lang       |   17 +-
 htdocs/langs/da_DK/admin.lang             |   25 +-
 htdocs/langs/da_DK/banks.lang             |    4 +-
 htdocs/langs/da_DK/bills.lang             |    7 +-
 htdocs/langs/da_DK/blockedlog.lang        |    2 +-
 htdocs/langs/da_DK/boxes.lang             |    9 +-
 htdocs/langs/da_DK/cashdesk.lang          |   24 +-
 htdocs/langs/da_DK/categories.lang        |   17 +-
 htdocs/langs/da_DK/companies.lang         |    2 +-
 htdocs/langs/da_DK/compta.lang            |   15 +-
 htdocs/langs/da_DK/cron.lang              |   13 +-
 htdocs/langs/da_DK/errors.lang            |   31 +-
 htdocs/langs/da_DK/exports.lang           |    1 +
 htdocs/langs/da_DK/mailmanspip.lang       |   46 +-
 htdocs/langs/da_DK/mails.lang             |   31 +-
 htdocs/langs/da_DK/main.lang              |   70 +-
 htdocs/langs/da_DK/modulebuilder.lang     |    7 +-
 htdocs/langs/da_DK/orders.lang            |    4 +-
 htdocs/langs/da_DK/other.lang             |   10 +-
 htdocs/langs/da_DK/products.lang          |   35 +-
 htdocs/langs/da_DK/propal.lang            |    8 +-
 htdocs/langs/da_DK/recruitment.lang       |   59 +-
 htdocs/langs/da_DK/sendings.lang          |    6 +-
 htdocs/langs/da_DK/stocks.lang            |   17 +-
 htdocs/langs/da_DK/ticket.lang            |   13 +-
 htdocs/langs/da_DK/website.lang           |    4 +-
 htdocs/langs/da_DK/withdrawals.lang       |   21 +-
 htdocs/langs/de_AT/mails.lang             |    2 -
 htdocs/langs/de_AT/products.lang          |    1 -
 htdocs/langs/de_CH/accountancy.lang       |    3 -
 htdocs/langs/de_CH/admin.lang             |    3 -
 htdocs/langs/de_CH/banks.lang             |    2 -
 htdocs/langs/de_CH/boxes.lang             |    1 +
 htdocs/langs/de_CH/categories.lang        |    6 +-
 htdocs/langs/de_CH/cron.lang              |    1 -
 htdocs/langs/de_CH/mails.lang             |    4 -
 htdocs/langs/de_CH/products.lang          |    2 -
 htdocs/langs/de_CH/sendings.lang          |    5 +
 htdocs/langs/de_CH/ticket.lang            |    1 -
 htdocs/langs/de_DE/accountancy.lang       |   17 +-
 htdocs/langs/de_DE/admin.lang             |   25 +-
 htdocs/langs/de_DE/agenda.lang            |    2 +-
 htdocs/langs/de_DE/banks.lang             |    4 +-
 htdocs/langs/de_DE/blockedlog.lang        |    2 +-
 htdocs/langs/de_DE/boxes.lang             |    7 +-
 htdocs/langs/de_DE/cashdesk.lang          |   10 +-
 htdocs/langs/de_DE/categories.lang        |   17 +-
 htdocs/langs/de_DE/companies.lang         |    2 +-
 htdocs/langs/de_DE/compta.lang            |   13 +-
 htdocs/langs/de_DE/cron.lang              |   13 +-
 htdocs/langs/de_DE/ecm.lang               |    2 +-
 htdocs/langs/de_DE/errors.lang            |   23 +-
 htdocs/langs/de_DE/exports.lang           |    1 +
 htdocs/langs/de_DE/interventions.lang     |    6 +-
 htdocs/langs/de_DE/mails.lang             |   25 +-
 htdocs/langs/de_DE/main.lang              |   14 +-
 htdocs/langs/de_DE/modulebuilder.lang     |    7 +-
 htdocs/langs/de_DE/other.lang             |    6 +-
 htdocs/langs/de_DE/products.lang          |   11 +-
 htdocs/langs/de_DE/recruitment.lang       |    1 +
 htdocs/langs/de_DE/sendings.lang          |   14 +-
 htdocs/langs/de_DE/stocks.lang            |    1 +
 htdocs/langs/de_DE/ticket.lang            |    9 +-
 htdocs/langs/de_DE/website.lang           |    4 +-
 htdocs/langs/de_DE/withdrawals.lang       |    5 +-
 htdocs/langs/el_CY/products.lang          |    2 -
 htdocs/langs/el_GR/accountancy.lang       |   17 +-
 htdocs/langs/el_GR/admin.lang             |   25 +-
 htdocs/langs/el_GR/banks.lang             |    4 +-
 htdocs/langs/el_GR/blockedlog.lang        |    4 +-
 htdocs/langs/el_GR/boxes.lang             |    5 +
 htdocs/langs/el_GR/cashdesk.lang          |   10 +-
 htdocs/langs/el_GR/categories.lang        |   17 +-
 htdocs/langs/el_GR/companies.lang         |    2 +-
 htdocs/langs/el_GR/compta.lang            |   13 +-
 htdocs/langs/el_GR/cron.lang              |   50 +-
 htdocs/langs/el_GR/errors.lang            |   23 +-
 htdocs/langs/el_GR/exports.lang           |    3 +
 htdocs/langs/el_GR/mails.lang             |   25 +-
 htdocs/langs/el_GR/main.lang              |   12 +-
 htdocs/langs/el_GR/modulebuilder.lang     |    7 +-
 htdocs/langs/el_GR/other.lang             |    8 +-
 htdocs/langs/el_GR/products.lang          |    9 +-
 htdocs/langs/el_GR/recruitment.lang       |    1 +
 htdocs/langs/el_GR/sendings.lang          |    2 +
 htdocs/langs/el_GR/stocks.lang            |    1 +
 htdocs/langs/el_GR/ticket.lang            |    9 +-
 htdocs/langs/el_GR/website.lang           |    4 +-
 htdocs/langs/el_GR/withdrawals.lang       |    5 +-
 htdocs/langs/en_AU/accountancy.lang       |    2 +
 htdocs/langs/en_AU/products.lang          |    2 -
 htdocs/langs/en_AU/withdrawals.lang       |    2 +
 htdocs/langs/en_CA/accountancy.lang       |    2 +
 htdocs/langs/en_CA/compta.lang            |    2 -
 htdocs/langs/en_CA/products.lang          |    2 -
 htdocs/langs/en_CA/withdrawals.lang       |    2 +
 htdocs/langs/en_GB/accountancy.lang       |    3 +-
 htdocs/langs/en_GB/products.lang          |    1 -
 htdocs/langs/en_GB/sendings.lang          |    1 +
 htdocs/langs/en_GB/withdrawals.lang       |    1 +
 htdocs/langs/en_IN/accountancy.lang       |    2 +
 htdocs/langs/en_IN/products.lang          |    2 -
 htdocs/langs/en_IN/withdrawals.lang       |    2 +
 htdocs/langs/en_SG/accountancy.lang       |    2 +
 htdocs/langs/en_SG/compta.lang            |    2 -
 htdocs/langs/en_SG/products.lang          |    2 -
 htdocs/langs/en_SG/withdrawals.lang       |    2 +
 htdocs/langs/es_AR/accountancy.lang       |    1 +
 htdocs/langs/es_AR/admin.lang             |    4 -
 htdocs/langs/es_AR/blockedlog.lang        |    1 -
 htdocs/langs/es_AR/companies.lang         |    1 -
 htdocs/langs/es_AR/cron.lang              |    3 -
 htdocs/langs/es_AR/mails.lang             |   10 -
 htdocs/langs/es_AR/products.lang          |    1 -
 htdocs/langs/es_AR/sendings.lang          |   39 +-
 htdocs/langs/es_AR/ticket.lang            |    1 -
 htdocs/langs/es_AR/withdrawals.lang       |    2 +-
 htdocs/langs/es_BO/accountancy.lang       |    2 +
 htdocs/langs/es_BO/compta.lang            |    2 -
 htdocs/langs/es_BO/products.lang          |    2 -
 htdocs/langs/es_BO/withdrawals.lang       |    2 +
 htdocs/langs/es_CL/accountancy.lang       |    3 +-
 htdocs/langs/es_CL/admin.lang             |    5 -
 htdocs/langs/es_CL/banks.lang             |    2 -
 htdocs/langs/es_CL/blockedlog.lang        |    1 -
 htdocs/langs/es_CL/boxes.lang             |    1 +
 htdocs/langs/es_CL/cashdesk.lang          |    1 -
 htdocs/langs/es_CL/categories.lang        |    5 -
 htdocs/langs/es_CL/companies.lang         |    1 -
 htdocs/langs/es_CL/compta.lang            |    5 -
 htdocs/langs/es_CL/cron.lang              |    3 -
 htdocs/langs/es_CL/errors.lang            |    2 -
 htdocs/langs/es_CL/mails.lang             |   10 -
 htdocs/langs/es_CL/modulebuilder.lang     |    1 -
 htdocs/langs/es_CL/products.lang          |    2 -
 htdocs/langs/es_CL/sendings.lang          |    1 +
 htdocs/langs/es_CL/ticket.lang            |    1 -
 htdocs/langs/es_CL/withdrawals.lang       |    1 +
 htdocs/langs/es_CO/accountancy.lang       |    2 +-
 htdocs/langs/es_CO/admin.lang             |    5 -
 htdocs/langs/es_CO/boxes.lang             |    1 +
 htdocs/langs/es_CO/compta.lang            |   17 +-
 htdocs/langs/es_CO/cron.lang              |    5 +
 htdocs/langs/es_CO/main.lang              |    1 +
 htdocs/langs/es_CO/products.lang          |    2 -
 htdocs/langs/es_CO/sendings.lang          |    1 +
 htdocs/langs/es_CO/ticket.lang            |    1 -
 htdocs/langs/es_CO/withdrawals.lang       |    1 +
 htdocs/langs/es_DO/accountancy.lang       |    2 +
 htdocs/langs/es_DO/compta.lang            |    2 -
 htdocs/langs/es_DO/products.lang          |    2 -
 htdocs/langs/es_DO/withdrawals.lang       |    2 +
 htdocs/langs/es_EC/accountancy.lang       |    3 +-
 htdocs/langs/es_EC/admin.lang             |    7 -
 htdocs/langs/es_EC/banks.lang             |    2 -
 htdocs/langs/es_EC/blockedlog.lang        |    6 +
 htdocs/langs/es_EC/boxes.lang             |    1 +
 htdocs/langs/es_EC/cashdesk.lang          |    3 -
 htdocs/langs/es_EC/categories.lang        |    3 -
 htdocs/langs/es_EC/companies.lang         |    1 -
 htdocs/langs/es_EC/compta.lang            |    5 -
 htdocs/langs/es_EC/cron.lang              |    3 -
 htdocs/langs/es_EC/errors.lang            |    2 -
 htdocs/langs/es_EC/mails.lang             |    9 -
 htdocs/langs/es_EC/main.lang              |    2 +
 htdocs/langs/es_EC/modulebuilder.lang     |    2 -
 htdocs/langs/es_EC/products.lang          |    2 -
 htdocs/langs/es_EC/sendings.lang          |    1 +
 htdocs/langs/es_EC/ticket.lang            |    2 -
 htdocs/langs/es_EC/withdrawals.lang       |    1 +
 htdocs/langs/es_ES/accountancy.lang       |   21 +-
 htdocs/langs/es_ES/admin.lang             |   43 +-
 htdocs/langs/es_ES/agenda.lang            |   21 +-
 htdocs/langs/es_ES/banks.lang             |    6 +-
 htdocs/langs/es_ES/blockedlog.lang        |    2 +-
 htdocs/langs/es_ES/boxes.lang             |    9 +-
 htdocs/langs/es_ES/cashdesk.lang          |   36 +-
 htdocs/langs/es_ES/categories.lang        |   21 +-
 htdocs/langs/es_ES/companies.lang         |   26 +-
 htdocs/langs/es_ES/compta.lang            |   15 +-
 htdocs/langs/es_ES/cron.lang              |   13 +-
 htdocs/langs/es_ES/deliveries.lang        |    1 +
 htdocs/langs/es_ES/errors.lang            |   39 +-
 htdocs/langs/es_ES/exports.lang           |    1 +
 htdocs/langs/es_ES/intracommreport.lang   |    2 +-
 htdocs/langs/es_ES/languages.lang         |    2 +-
 htdocs/langs/es_ES/mails.lang             |   31 +-
 htdocs/langs/es_ES/main.lang              |   22 +-
 htdocs/langs/es_ES/modulebuilder.lang     |    7 +-
 htdocs/langs/es_ES/mrp.lang               |    2 +-
 htdocs/langs/es_ES/other.lang             |   10 +-
 htdocs/langs/es_ES/products.lang          |    9 +-
 htdocs/langs/es_ES/recruitment.lang       |    5 +-
 htdocs/langs/es_ES/sendings.lang          |    2 +
 htdocs/langs/es_ES/stocks.lang            |    9 +-
 htdocs/langs/es_ES/ticket.lang            |    9 +-
 htdocs/langs/es_ES/website.lang           |    6 +-
 htdocs/langs/es_ES/withdrawals.lang       |   65 +-
 htdocs/langs/es_GT/accountancy.lang       |    2 +
 htdocs/langs/es_GT/compta.lang            |    2 -
 htdocs/langs/es_GT/products.lang          |    2 -
 htdocs/langs/es_GT/withdrawals.lang       |    2 +
 htdocs/langs/es_HN/accountancy.lang       |    2 +
 htdocs/langs/es_HN/compta.lang            |    2 -
 htdocs/langs/es_HN/products.lang          |    2 -
 htdocs/langs/es_HN/withdrawals.lang       |    2 +
 htdocs/langs/es_MX/accountancy.lang       |    3 +-
 htdocs/langs/es_MX/admin.lang             |    2 -
 htdocs/langs/es_MX/companies.lang         |    1 -
 htdocs/langs/es_MX/compta.lang            |    5 +
 htdocs/langs/es_MX/main.lang              |    2 +
 htdocs/langs/es_MX/products.lang          |    1 -
 htdocs/langs/es_MX/sendings.lang          |    3 +
 htdocs/langs/es_MX/withdrawals.lang       |    3 +
 htdocs/langs/es_PA/accountancy.lang       |    2 +
 htdocs/langs/es_PA/compta.lang            |    2 -
 htdocs/langs/es_PA/products.lang          |    2 -
 htdocs/langs/es_PA/withdrawals.lang       |    2 +
 htdocs/langs/es_PE/accountancy.lang       |    2 +-
 htdocs/langs/es_PE/admin.lang             |    1 -
 htdocs/langs/es_PE/cron.lang              |    1 -
 htdocs/langs/es_PE/products.lang          |    1 -
 htdocs/langs/es_PE/ticket.lang            |    1 -
 htdocs/langs/es_PE/withdrawals.lang       |    2 +
 htdocs/langs/es_PY/accountancy.lang       |    2 +
 htdocs/langs/es_PY/compta.lang            |    2 -
 htdocs/langs/es_PY/products.lang          |    2 -
 htdocs/langs/es_PY/withdrawals.lang       |    2 +
 htdocs/langs/es_US/accountancy.lang       |    2 +
 htdocs/langs/es_US/compta.lang            |    2 -
 htdocs/langs/es_US/products.lang          |    2 -
 htdocs/langs/es_US/withdrawals.lang       |    2 +
 htdocs/langs/es_UY/accountancy.lang       |    2 +
 htdocs/langs/es_UY/compta.lang            |    2 -
 htdocs/langs/es_UY/products.lang          |    2 -
 htdocs/langs/es_UY/withdrawals.lang       |    2 +
 htdocs/langs/es_VE/accountancy.lang       |    2 +
 htdocs/langs/es_VE/products.lang          |    1 -
 htdocs/langs/es_VE/withdrawals.lang       |    1 +
 htdocs/langs/et_EE/accountancy.lang       |   17 +-
 htdocs/langs/et_EE/admin.lang             |   25 +-
 htdocs/langs/et_EE/banks.lang             |    4 +-
 htdocs/langs/et_EE/blockedlog.lang        |    2 +-
 htdocs/langs/et_EE/boxes.lang             |    5 +
 htdocs/langs/et_EE/cashdesk.lang          |   10 +-
 htdocs/langs/et_EE/categories.lang        |   17 +-
 htdocs/langs/et_EE/companies.lang         |    2 +-
 htdocs/langs/et_EE/compta.lang            |   13 +-
 htdocs/langs/et_EE/cron.lang              |   36 +-
 htdocs/langs/et_EE/errors.lang            |   23 +-
 htdocs/langs/et_EE/exports.lang           |    3 +
 htdocs/langs/et_EE/mails.lang             |   25 +-
 htdocs/langs/et_EE/main.lang              |   12 +-
 htdocs/langs/et_EE/modulebuilder.lang     |    7 +-
 htdocs/langs/et_EE/other.lang             |    8 +-
 htdocs/langs/et_EE/products.lang          |    9 +-
 htdocs/langs/et_EE/recruitment.lang       |    1 +
 htdocs/langs/et_EE/sendings.lang          |    2 +
 htdocs/langs/et_EE/stocks.lang            |    1 +
 htdocs/langs/et_EE/ticket.lang            |    9 +-
 htdocs/langs/et_EE/website.lang           |    4 +-
 htdocs/langs/et_EE/withdrawals.lang       |    5 +-
 htdocs/langs/eu_ES/accountancy.lang       |   17 +-
 htdocs/langs/eu_ES/admin.lang             |   25 +-
 htdocs/langs/eu_ES/banks.lang             |    4 +-
 htdocs/langs/eu_ES/blockedlog.lang        |    2 +-
 htdocs/langs/eu_ES/boxes.lang             |    5 +
 htdocs/langs/eu_ES/cashdesk.lang          |   10 +-
 htdocs/langs/eu_ES/categories.lang        |   17 +-
 htdocs/langs/eu_ES/companies.lang         |    2 +-
 htdocs/langs/eu_ES/compta.lang            |   13 +-
 htdocs/langs/eu_ES/cron.lang              |   36 +-
 htdocs/langs/eu_ES/errors.lang            |   23 +-
 htdocs/langs/eu_ES/exports.lang           |    3 +
 htdocs/langs/eu_ES/mails.lang             |   25 +-
 htdocs/langs/eu_ES/main.lang              |   12 +-
 htdocs/langs/eu_ES/modulebuilder.lang     |    7 +-
 htdocs/langs/eu_ES/other.lang             |    8 +-
 htdocs/langs/eu_ES/products.lang          |    9 +-
 htdocs/langs/eu_ES/recruitment.lang       |    1 +
 htdocs/langs/eu_ES/sendings.lang          |    2 +
 htdocs/langs/eu_ES/stocks.lang            |    1 +
 htdocs/langs/eu_ES/ticket.lang            |    9 +-
 htdocs/langs/eu_ES/website.lang           |    4 +-
 htdocs/langs/eu_ES/withdrawals.lang       |    5 +-
 htdocs/langs/fa_IR/accountancy.lang       |   17 +-
 htdocs/langs/fa_IR/admin.lang             |   25 +-
 htdocs/langs/fa_IR/banks.lang             |    4 +-
 htdocs/langs/fa_IR/blockedlog.lang        |    2 +-
 htdocs/langs/fa_IR/boxes.lang             |    5 +
 htdocs/langs/fa_IR/cashdesk.lang          |   10 +-
 htdocs/langs/fa_IR/categories.lang        |   17 +-
 htdocs/langs/fa_IR/companies.lang         |    2 +-
 htdocs/langs/fa_IR/compta.lang            |   13 +-
 htdocs/langs/fa_IR/cron.lang              |   16 +-
 htdocs/langs/fa_IR/errors.lang            |   23 +-
 htdocs/langs/fa_IR/exports.lang           |    3 +
 htdocs/langs/fa_IR/mails.lang             |   25 +-
 htdocs/langs/fa_IR/main.lang              |   10 +
 htdocs/langs/fa_IR/modulebuilder.lang     |    7 +-
 htdocs/langs/fa_IR/other.lang             |    8 +-
 htdocs/langs/fa_IR/products.lang          |    9 +-
 htdocs/langs/fa_IR/recruitment.lang       |    1 +
 htdocs/langs/fa_IR/sendings.lang          |    2 +
 htdocs/langs/fa_IR/stocks.lang            |    1 +
 htdocs/langs/fa_IR/ticket.lang            |    9 +-
 htdocs/langs/fa_IR/website.lang           |    4 +-
 htdocs/langs/fa_IR/withdrawals.lang       |    5 +-
 htdocs/langs/fi_FI/accountancy.lang       |   17 +-
 htdocs/langs/fi_FI/admin.lang             |   25 +-
 htdocs/langs/fi_FI/banks.lang             |    4 +-
 htdocs/langs/fi_FI/blockedlog.lang        |    2 +-
 htdocs/langs/fi_FI/boxes.lang             |    5 +
 htdocs/langs/fi_FI/cashdesk.lang          |   10 +-
 htdocs/langs/fi_FI/categories.lang        |   17 +-
 htdocs/langs/fi_FI/companies.lang         |    2 +-
 htdocs/langs/fi_FI/compta.lang            |   13 +-
 htdocs/langs/fi_FI/cron.lang              |   36 +-
 htdocs/langs/fi_FI/errors.lang            |   23 +-
 htdocs/langs/fi_FI/exports.lang           |    3 +
 htdocs/langs/fi_FI/mails.lang             |   25 +-
 htdocs/langs/fi_FI/main.lang              |   12 +-
 htdocs/langs/fi_FI/modulebuilder.lang     |    7 +-
 htdocs/langs/fi_FI/other.lang             |    8 +-
 htdocs/langs/fi_FI/products.lang          |    9 +-
 htdocs/langs/fi_FI/recruitment.lang       |    1 +
 htdocs/langs/fi_FI/sendings.lang          |    2 +
 htdocs/langs/fi_FI/stocks.lang            |    1 +
 htdocs/langs/fi_FI/ticket.lang            |    9 +-
 htdocs/langs/fi_FI/website.lang           |    4 +-
 htdocs/langs/fi_FI/withdrawals.lang       |    5 +-
 htdocs/langs/fr_BE/accountancy.lang       |    1 +
 htdocs/langs/fr_BE/products.lang          |    2 -
 htdocs/langs/fr_BE/withdrawals.lang       |    1 +
 htdocs/langs/fr_CA/accountancy.lang       |    2 +-
 htdocs/langs/fr_CA/admin.lang             |    1 -
 htdocs/langs/fr_CA/categories.lang        |    2 +-
 htdocs/langs/fr_CA/compta.lang            |    1 -
 htdocs/langs/fr_CA/cron.lang              |    5 -
 htdocs/langs/fr_CA/errors.lang            |    1 -
 htdocs/langs/fr_CA/mails.lang             |    8 -
 htdocs/langs/fr_CA/other.lang             |    1 +
 htdocs/langs/fr_CA/products.lang          |    2 -
 htdocs/langs/fr_CA/sendings.lang          |    1 +
 htdocs/langs/fr_CA/withdrawals.lang       |    1 +
 htdocs/langs/fr_CH/accountancy.lang       |    2 +
 htdocs/langs/fr_CH/compta.lang            |    2 -
 htdocs/langs/fr_CH/products.lang          |    2 -
 htdocs/langs/fr_CH/withdrawals.lang       |    2 +
 htdocs/langs/fr_CI/accountancy.lang       |    2 +
 htdocs/langs/fr_CI/compta.lang            |    2 -
 htdocs/langs/fr_CI/products.lang          |    2 -
 htdocs/langs/fr_CI/withdrawals.lang       |    2 +
 htdocs/langs/fr_CM/accountancy.lang       |    2 +
 htdocs/langs/fr_CM/compta.lang            |    2 -
 htdocs/langs/fr_CM/products.lang          |    2 -
 htdocs/langs/fr_CM/withdrawals.lang       |    2 +
 htdocs/langs/fr_FR/accountancy.lang       |   23 +-
 htdocs/langs/fr_FR/admin.lang             |   23 +-
 htdocs/langs/fr_FR/agenda.lang            |   12 +-
 htdocs/langs/fr_FR/banks.lang             |    2 +-
 htdocs/langs/fr_FR/blockedlog.lang        |    2 +-
 htdocs/langs/fr_FR/boxes.lang             |    5 +
 htdocs/langs/fr_FR/cashdesk.lang          |   10 +-
 htdocs/langs/fr_FR/categories.lang        |   17 +-
 htdocs/langs/fr_FR/companies.lang         |    2 +-
 htdocs/langs/fr_FR/compta.lang            |   11 +-
 htdocs/langs/fr_FR/cron.lang              |    6 +-
 htdocs/langs/fr_FR/deliveries.lang        |    2 +-
 htdocs/langs/fr_FR/errors.lang            |   22 +-
 htdocs/langs/fr_FR/exports.lang           |    2 +-
 htdocs/langs/fr_FR/install.lang           |    2 +-
 htdocs/langs/fr_FR/mails.lang             |   25 +-
 htdocs/langs/fr_FR/main.lang              |   11 +-
 htdocs/langs/fr_FR/modulebuilder.lang     |    7 +-
 htdocs/langs/fr_FR/mrp.lang               |    2 +-
 htdocs/langs/fr_FR/other.lang             |   14 +-
 htdocs/langs/fr_FR/products.lang          |    9 +-
 htdocs/langs/fr_FR/recruitment.lang       |    1 +
 htdocs/langs/fr_FR/sendings.lang          |    2 +
 htdocs/langs/fr_FR/stocks.lang            |    1 +
 htdocs/langs/fr_FR/ticket.lang            |    9 +-
 htdocs/langs/fr_FR/website.lang           |    4 +-
 htdocs/langs/fr_FR/withdrawals.lang       |    5 +-
 htdocs/langs/fr_GA/accountancy.lang       |    2 +
 htdocs/langs/fr_GA/compta.lang            |    2 -
 htdocs/langs/fr_GA/products.lang          |    2 -
 htdocs/langs/fr_GA/withdrawals.lang       |    2 +
 htdocs/langs/gl_ES/accountancy.lang       |  127 +-
 htdocs/langs/gl_ES/admin.lang             | 1339 +++++++++++----------
 htdocs/langs/gl_ES/agenda.lang            |   95 +-
 htdocs/langs/gl_ES/assets.lang            |    2 +-
 htdocs/langs/gl_ES/banks.lang             |   26 +-
 htdocs/langs/gl_ES/bills.lang             |  297 ++---
 htdocs/langs/gl_ES/blockedlog.lang        |  106 +-
 htdocs/langs/gl_ES/boxes.lang             |   15 +-
 htdocs/langs/gl_ES/cashdesk.lang          |   80 +-
 htdocs/langs/gl_ES/categories.lang        |  185 +--
 htdocs/langs/gl_ES/companies.lang         |   60 +-
 htdocs/langs/gl_ES/compta.lang            |  155 +--
 htdocs/langs/gl_ES/contracts.lang         |   20 +-
 htdocs/langs/gl_ES/cron.lang              |   15 +-
 htdocs/langs/gl_ES/deliveries.lang        |    1 +
 htdocs/langs/gl_ES/ecm.lang               |   10 +-
 htdocs/langs/gl_ES/errors.lang            |  551 +++++----
 htdocs/langs/gl_ES/exports.lang           |   15 +-
 htdocs/langs/gl_ES/ftp.lang               |   18 +-
 htdocs/langs/gl_ES/holiday.lang           |   16 +-
 htdocs/langs/gl_ES/hrm.lang               |   26 +-
 htdocs/langs/gl_ES/install.lang           |  316 ++---
 htdocs/langs/gl_ES/interventions.lang     |    4 +-
 htdocs/langs/gl_ES/intracommreport.lang   |   52 +-
 htdocs/langs/gl_ES/languages.lang         |   76 +-
 htdocs/langs/gl_ES/link.lang              |   20 +-
 htdocs/langs/gl_ES/mailmanspip.lang       |   52 +-
 htdocs/langs/gl_ES/mails.lang             |   53 +-
 htdocs/langs/gl_ES/main.lang              |  224 ++--
 htdocs/langs/gl_ES/members.lang           |   54 +-
 htdocs/langs/gl_ES/modulebuilder.lang     |    9 +-
 htdocs/langs/gl_ES/mrp.lang               |  160 +--
 htdocs/langs/gl_ES/oauth.lang             |   60 +-
 htdocs/langs/gl_ES/orders.lang            |   18 +-
 htdocs/langs/gl_ES/other.lang             |  512 ++++----
 htdocs/langs/gl_ES/paypal.lang            |   68 +-
 htdocs/langs/gl_ES/printing.lang          |   18 +-
 htdocs/langs/gl_ES/products.lang          |  241 ++--
 htdocs/langs/gl_ES/projects.lang          |   52 +-
 htdocs/langs/gl_ES/propal.lang            |  146 +--
 htdocs/langs/gl_ES/receptions.lang        |   78 +-
 htdocs/langs/gl_ES/recruitment.lang       |   85 +-
 htdocs/langs/gl_ES/sendings.lang          |    6 +-
 htdocs/langs/gl_ES/sms.lang               |   26 +-
 htdocs/langs/gl_ES/stocks.lang            |  447 +++----
 htdocs/langs/gl_ES/supplier_proposal.lang |   93 +-
 htdocs/langs/gl_ES/suppliers.lang         |   44 +-
 htdocs/langs/gl_ES/ticket.lang            |  457 ++++---
 htdocs/langs/gl_ES/users.lang             |   13 +-
 htdocs/langs/gl_ES/website.lang           |  262 ++--
 htdocs/langs/gl_ES/withdrawals.lang       |  225 ++--
 htdocs/langs/gl_ES/workflow.lang          |   36 +-
 htdocs/langs/he_IL/accountancy.lang       |   17 +-
 htdocs/langs/he_IL/admin.lang             |   25 +-
 htdocs/langs/he_IL/banks.lang             |    4 +-
 htdocs/langs/he_IL/blockedlog.lang        |    2 +-
 htdocs/langs/he_IL/boxes.lang             |    5 +
 htdocs/langs/he_IL/cashdesk.lang          |   10 +-
 htdocs/langs/he_IL/categories.lang        |   17 +-
 htdocs/langs/he_IL/companies.lang         |    2 +-
 htdocs/langs/he_IL/compta.lang            |   13 +-
 htdocs/langs/he_IL/cron.lang              |   36 +-
 htdocs/langs/he_IL/errors.lang            |   23 +-
 htdocs/langs/he_IL/exports.lang           |    3 +
 htdocs/langs/he_IL/mails.lang             |   25 +-
 htdocs/langs/he_IL/main.lang              |   12 +-
 htdocs/langs/he_IL/modulebuilder.lang     |    7 +-
 htdocs/langs/he_IL/other.lang             |    8 +-
 htdocs/langs/he_IL/products.lang          |    9 +-
 htdocs/langs/he_IL/recruitment.lang       |    1 +
 htdocs/langs/he_IL/sendings.lang          |    2 +
 htdocs/langs/he_IL/stocks.lang            |    1 +
 htdocs/langs/he_IL/ticket.lang            |    9 +-
 htdocs/langs/he_IL/website.lang           |    4 +-
 htdocs/langs/he_IL/withdrawals.lang       |    5 +-
 htdocs/langs/hi_IN/accountancy.lang       |   17 +-
 htdocs/langs/hi_IN/admin.lang             |   25 +-
 htdocs/langs/hi_IN/banks.lang             |    4 +-
 htdocs/langs/hi_IN/blockedlog.lang        |    2 +-
 htdocs/langs/hi_IN/boxes.lang             |    5 +
 htdocs/langs/hi_IN/cashdesk.lang          |   10 +-
 htdocs/langs/hi_IN/categories.lang        |   17 +-
 htdocs/langs/hi_IN/companies.lang         |    2 +-
 htdocs/langs/hi_IN/compta.lang            |   13 +-
 htdocs/langs/hi_IN/cron.lang              |   13 +-
 htdocs/langs/hi_IN/errors.lang            |   23 +-
 htdocs/langs/hi_IN/exports.lang           |    1 +
 htdocs/langs/hi_IN/mails.lang             |   25 +-
 htdocs/langs/hi_IN/main.lang              |   12 +-
 htdocs/langs/hi_IN/modulebuilder.lang     |    7 +-
 htdocs/langs/hi_IN/other.lang             |    8 +-
 htdocs/langs/hi_IN/products.lang          |    9 +-
 htdocs/langs/hi_IN/recruitment.lang       |    1 +
 htdocs/langs/hi_IN/sendings.lang          |    2 +
 htdocs/langs/hi_IN/stocks.lang            |    1 +
 htdocs/langs/hi_IN/ticket.lang            |    9 +-
 htdocs/langs/hi_IN/website.lang           |    4 +-
 htdocs/langs/hi_IN/withdrawals.lang       |    5 +-
 htdocs/langs/hr_HR/accountancy.lang       |   17 +-
 htdocs/langs/hr_HR/admin.lang             |   25 +-
 htdocs/langs/hr_HR/banks.lang             |    4 +-
 htdocs/langs/hr_HR/blockedlog.lang        |    2 +-
 htdocs/langs/hr_HR/boxes.lang             |    5 +
 htdocs/langs/hr_HR/cashdesk.lang          |   10 +-
 htdocs/langs/hr_HR/categories.lang        |   17 +-
 htdocs/langs/hr_HR/companies.lang         |    2 +-
 htdocs/langs/hr_HR/compta.lang            |   13 +-
 htdocs/langs/hr_HR/cron.lang              |   16 +-
 htdocs/langs/hr_HR/errors.lang            |   23 +-
 htdocs/langs/hr_HR/exports.lang           |    3 +
 htdocs/langs/hr_HR/mails.lang             |   25 +-
 htdocs/langs/hr_HR/main.lang              |   18 +-
 htdocs/langs/hr_HR/modulebuilder.lang     |    7 +-
 htdocs/langs/hr_HR/other.lang             |    8 +-
 htdocs/langs/hr_HR/products.lang          |    9 +-
 htdocs/langs/hr_HR/recruitment.lang       |    1 +
 htdocs/langs/hr_HR/sendings.lang          |    2 +
 htdocs/langs/hr_HR/stocks.lang            |    1 +
 htdocs/langs/hr_HR/ticket.lang            |    9 +-
 htdocs/langs/hr_HR/website.lang           |    4 +-
 htdocs/langs/hr_HR/withdrawals.lang       |    5 +-
 htdocs/langs/hu_HU/accountancy.lang       |   17 +-
 htdocs/langs/hu_HU/admin.lang             |   25 +-
 htdocs/langs/hu_HU/banks.lang             |    4 +-
 htdocs/langs/hu_HU/blockedlog.lang        |    2 +-
 htdocs/langs/hu_HU/boxes.lang             |    5 +
 htdocs/langs/hu_HU/cashdesk.lang          |   10 +-
 htdocs/langs/hu_HU/categories.lang        |   17 +-
 htdocs/langs/hu_HU/companies.lang         |    2 +-
 htdocs/langs/hu_HU/compta.lang            |   13 +-
 htdocs/langs/hu_HU/cron.lang              |   13 +-
 htdocs/langs/hu_HU/errors.lang            |   23 +-
 htdocs/langs/hu_HU/exports.lang           |    3 +
 htdocs/langs/hu_HU/mails.lang             |   25 +-
 htdocs/langs/hu_HU/main.lang              |   12 +-
 htdocs/langs/hu_HU/modulebuilder.lang     |    9 +-
 htdocs/langs/hu_HU/other.lang             |    6 +-
 htdocs/langs/hu_HU/products.lang          |    9 +-
 htdocs/langs/hu_HU/recruitment.lang       |    1 +
 htdocs/langs/hu_HU/sendings.lang          |    2 +
 htdocs/langs/hu_HU/stocks.lang            |    1 +
 htdocs/langs/hu_HU/ticket.lang            |    9 +-
 htdocs/langs/hu_HU/website.lang           |    4 +-
 htdocs/langs/hu_HU/withdrawals.lang       |    5 +-
 htdocs/langs/id_ID/accountancy.lang       |   17 +-
 htdocs/langs/id_ID/admin.lang             |   25 +-
 htdocs/langs/id_ID/banks.lang             |    4 +-
 htdocs/langs/id_ID/blockedlog.lang        |    2 +-
 htdocs/langs/id_ID/boxes.lang             |    5 +
 htdocs/langs/id_ID/cashdesk.lang          |   10 +-
 htdocs/langs/id_ID/categories.lang        |   17 +-
 htdocs/langs/id_ID/companies.lang         |    2 +-
 htdocs/langs/id_ID/compta.lang            |   13 +-
 htdocs/langs/id_ID/cron.lang              |   13 +-
 htdocs/langs/id_ID/errors.lang            |   23 +-
 htdocs/langs/id_ID/exports.lang           |    1 +
 htdocs/langs/id_ID/mails.lang             |   25 +-
 htdocs/langs/id_ID/main.lang              |   12 +-
 htdocs/langs/id_ID/modulebuilder.lang     |    7 +-
 htdocs/langs/id_ID/other.lang             |    6 +-
 htdocs/langs/id_ID/products.lang          |    9 +-
 htdocs/langs/id_ID/recruitment.lang       |    1 +
 htdocs/langs/id_ID/sendings.lang          |    2 +
 htdocs/langs/id_ID/stocks.lang            |    1 +
 htdocs/langs/id_ID/ticket.lang            |    9 +-
 htdocs/langs/id_ID/website.lang           |    4 +-
 htdocs/langs/id_ID/withdrawals.lang       |    5 +-
 htdocs/langs/is_IS/accountancy.lang       |   17 +-
 htdocs/langs/is_IS/admin.lang             |   25 +-
 htdocs/langs/is_IS/banks.lang             |    4 +-
 htdocs/langs/is_IS/blockedlog.lang        |    2 +-
 htdocs/langs/is_IS/boxes.lang             |    5 +
 htdocs/langs/is_IS/cashdesk.lang          |   10 +-
 htdocs/langs/is_IS/categories.lang        |   17 +-
 htdocs/langs/is_IS/companies.lang         |    2 +-
 htdocs/langs/is_IS/compta.lang            |   13 +-
 htdocs/langs/is_IS/cron.lang              |   36 +-
 htdocs/langs/is_IS/errors.lang            |   23 +-
 htdocs/langs/is_IS/exports.lang           |    3 +
 htdocs/langs/is_IS/mails.lang             |   25 +-
 htdocs/langs/is_IS/main.lang              |   12 +-
 htdocs/langs/is_IS/modulebuilder.lang     |    7 +-
 htdocs/langs/is_IS/other.lang             |    8 +-
 htdocs/langs/is_IS/products.lang          |    9 +-
 htdocs/langs/is_IS/recruitment.lang       |    1 +
 htdocs/langs/is_IS/sendings.lang          |    2 +
 htdocs/langs/is_IS/stocks.lang            |    1 +
 htdocs/langs/is_IS/ticket.lang            |    9 +-
 htdocs/langs/is_IS/website.lang           |    4 +-
 htdocs/langs/is_IS/withdrawals.lang       |    5 +-
 htdocs/langs/it_CH/compta.lang            |    2 -
 htdocs/langs/it_CH/products.lang          |    2 -
 htdocs/langs/it_IT/accountancy.lang       |   19 +-
 htdocs/langs/it_IT/admin.lang             |   25 +-
 htdocs/langs/it_IT/banks.lang             |    4 +-
 htdocs/langs/it_IT/blockedlog.lang        |    6 +-
 htdocs/langs/it_IT/boxes.lang             |    7 +-
 htdocs/langs/it_IT/cashdesk.lang          |   12 +-
 htdocs/langs/it_IT/categories.lang        |   17 +-
 htdocs/langs/it_IT/companies.lang         |    6 +-
 htdocs/langs/it_IT/compta.lang            |   15 +-
 htdocs/langs/it_IT/cron.lang              |   13 +-
 htdocs/langs/it_IT/errors.lang            |   29 +-
 htdocs/langs/it_IT/exports.lang           |    1 +
 htdocs/langs/it_IT/mails.lang             |   23 +-
 htdocs/langs/it_IT/main.lang              |   12 +-
 htdocs/langs/it_IT/modulebuilder.lang     |    7 +-
 htdocs/langs/it_IT/multicurrency.lang     |   18 +-
 htdocs/langs/it_IT/other.lang             |   10 +-
 htdocs/langs/it_IT/products.lang          |    9 +-
 htdocs/langs/it_IT/recruitment.lang       |   11 +-
 htdocs/langs/it_IT/sendings.lang          |    4 +-
 htdocs/langs/it_IT/stocks.lang            |    5 +-
 htdocs/langs/it_IT/ticket.lang            |   11 +-
 htdocs/langs/it_IT/website.lang           |    4 +-
 htdocs/langs/it_IT/withdrawals.lang       |    5 +-
 htdocs/langs/ja_JP/accountancy.lang       |   23 +-
 htdocs/langs/ja_JP/admin.lang             |   47 +-
 htdocs/langs/ja_JP/banks.lang             |    6 +-
 htdocs/langs/ja_JP/bills.lang             |    2 +-
 htdocs/langs/ja_JP/blockedlog.lang        |    4 +-
 htdocs/langs/ja_JP/boxes.lang             |    4 +
 htdocs/langs/ja_JP/cashdesk.lang          |    9 +-
 htdocs/langs/ja_JP/categories.lang        |   19 +-
 htdocs/langs/ja_JP/companies.lang         |    4 +-
 htdocs/langs/ja_JP/compta.lang            |   10 +-
 htdocs/langs/ja_JP/cron.lang              |    9 +-
 htdocs/langs/ja_JP/donations.lang         |    2 +-
 htdocs/langs/ja_JP/errors.lang            |   33 +-
 htdocs/langs/ja_JP/exports.lang           |    3 +-
 htdocs/langs/ja_JP/ftp.lang               |    2 +-
 htdocs/langs/ja_JP/hrm.lang               |    2 +-
 htdocs/langs/ja_JP/install.lang           |    4 +-
 htdocs/langs/ja_JP/languages.lang         |    2 +-
 htdocs/langs/ja_JP/loan.lang              |    2 +-
 htdocs/langs/ja_JP/mails.lang             |   19 +-
 htdocs/langs/ja_JP/main.lang              |   34 +-
 htdocs/langs/ja_JP/modulebuilder.lang     |    5 +-
 htdocs/langs/ja_JP/mrp.lang               |    2 +-
 htdocs/langs/ja_JP/other.lang             |  399 +++---
 htdocs/langs/ja_JP/paybox.lang            |   25 +-
 htdocs/langs/ja_JP/paypal.lang            |   58 +-
 htdocs/langs/ja_JP/products.lang          |   23 +-
 htdocs/langs/ja_JP/projects.lang          |    6 +-
 htdocs/langs/ja_JP/receptions.lang        |    4 +-
 htdocs/langs/ja_JP/recruitment.lang       |    1 +
 htdocs/langs/ja_JP/sendings.lang          |  103 +-
 htdocs/langs/ja_JP/sms.lang               |   50 +-
 htdocs/langs/ja_JP/stocks.lang            |  411 +++----
 htdocs/langs/ja_JP/stripe.lang            |  113 +-
 htdocs/langs/ja_JP/suppliers.lang         |   78 +-
 htdocs/langs/ja_JP/ticket.lang            |    3 +-
 htdocs/langs/ja_JP/trips.lang             |  276 ++---
 htdocs/langs/ja_JP/website.lang           |   26 +-
 htdocs/langs/ja_JP/withdrawals.lang       |  225 ++--
 htdocs/langs/ja_JP/workflow.lang          |   36 +-
 htdocs/langs/ka_GE/accountancy.lang       |   17 +-
 htdocs/langs/ka_GE/admin.lang             |   25 +-
 htdocs/langs/ka_GE/banks.lang             |    4 +-
 htdocs/langs/ka_GE/blockedlog.lang        |    2 +-
 htdocs/langs/ka_GE/boxes.lang             |    5 +
 htdocs/langs/ka_GE/cashdesk.lang          |   10 +-
 htdocs/langs/ka_GE/categories.lang        |   17 +-
 htdocs/langs/ka_GE/companies.lang         |    2 +-
 htdocs/langs/ka_GE/compta.lang            |   13 +-
 htdocs/langs/ka_GE/cron.lang              |   36 +-
 htdocs/langs/ka_GE/errors.lang            |   23 +-
 htdocs/langs/ka_GE/exports.lang           |    3 +
 htdocs/langs/ka_GE/mails.lang             |   25 +-
 htdocs/langs/ka_GE/main.lang              |   12 +-
 htdocs/langs/ka_GE/modulebuilder.lang     |    7 +-
 htdocs/langs/ka_GE/other.lang             |    8 +-
 htdocs/langs/ka_GE/products.lang          |    9 +-
 htdocs/langs/ka_GE/recruitment.lang       |    1 +
 htdocs/langs/ka_GE/sendings.lang          |    2 +
 htdocs/langs/ka_GE/stocks.lang            |    1 +
 htdocs/langs/ka_GE/ticket.lang            |    9 +-
 htdocs/langs/ka_GE/website.lang           |    4 +-
 htdocs/langs/ka_GE/withdrawals.lang       |    5 +-
 htdocs/langs/km_KH/accountancy.lang       |   17 +-
 htdocs/langs/km_KH/admin.lang             |   25 +-
 htdocs/langs/km_KH/banks.lang             |    4 +-
 htdocs/langs/km_KH/blockedlog.lang        |    2 +-
 htdocs/langs/km_KH/boxes.lang             |    5 +
 htdocs/langs/km_KH/cashdesk.lang          |   10 +-
 htdocs/langs/km_KH/categories.lang        |   17 +-
 htdocs/langs/km_KH/companies.lang         |    2 +-
 htdocs/langs/km_KH/compta.lang            |   13 +-
 htdocs/langs/km_KH/cron.lang              |   13 +-
 htdocs/langs/km_KH/errors.lang            |   23 +-
 htdocs/langs/km_KH/exports.lang           |    1 +
 htdocs/langs/km_KH/mails.lang             |   25 +-
 htdocs/langs/km_KH/main.lang              |   12 +-
 htdocs/langs/km_KH/modulebuilder.lang     |    7 +-
 htdocs/langs/km_KH/other.lang             |    8 +-
 htdocs/langs/km_KH/products.lang          |    9 +-
 htdocs/langs/km_KH/recruitment.lang       |    1 +
 htdocs/langs/km_KH/sendings.lang          |    2 +
 htdocs/langs/km_KH/stocks.lang            |    1 +
 htdocs/langs/km_KH/ticket.lang            |    9 +-
 htdocs/langs/km_KH/website.lang           |    4 +-
 htdocs/langs/km_KH/withdrawals.lang       |    5 +-
 htdocs/langs/kn_IN/accountancy.lang       |   17 +-
 htdocs/langs/kn_IN/admin.lang             |   25 +-
 htdocs/langs/kn_IN/banks.lang             |    4 +-
 htdocs/langs/kn_IN/blockedlog.lang        |    2 +-
 htdocs/langs/kn_IN/boxes.lang             |    5 +
 htdocs/langs/kn_IN/cashdesk.lang          |   10 +-
 htdocs/langs/kn_IN/categories.lang        |   17 +-
 htdocs/langs/kn_IN/companies.lang         |    2 +-
 htdocs/langs/kn_IN/compta.lang            |   13 +-
 htdocs/langs/kn_IN/cron.lang              |   36 +-
 htdocs/langs/kn_IN/errors.lang            |   23 +-
 htdocs/langs/kn_IN/exports.lang           |    3 +
 htdocs/langs/kn_IN/mails.lang             |   25 +-
 htdocs/langs/kn_IN/main.lang              |   12 +-
 htdocs/langs/kn_IN/modulebuilder.lang     |    7 +-
 htdocs/langs/kn_IN/other.lang             |    8 +-
 htdocs/langs/kn_IN/products.lang          |    9 +-
 htdocs/langs/kn_IN/recruitment.lang       |    1 +
 htdocs/langs/kn_IN/sendings.lang          |    2 +
 htdocs/langs/kn_IN/stocks.lang            |    1 +
 htdocs/langs/kn_IN/ticket.lang            |    9 +-
 htdocs/langs/kn_IN/website.lang           |    4 +-
 htdocs/langs/kn_IN/withdrawals.lang       |    5 +-
 htdocs/langs/ko_KR/accountancy.lang       |   17 +-
 htdocs/langs/ko_KR/admin.lang             |   25 +-
 htdocs/langs/ko_KR/banks.lang             |    4 +-
 htdocs/langs/ko_KR/blockedlog.lang        |    2 +-
 htdocs/langs/ko_KR/boxes.lang             |    5 +
 htdocs/langs/ko_KR/cashdesk.lang          |   10 +-
 htdocs/langs/ko_KR/categories.lang        |   17 +-
 htdocs/langs/ko_KR/companies.lang         |    2 +-
 htdocs/langs/ko_KR/compta.lang            |   13 +-
 htdocs/langs/ko_KR/cron.lang              |   36 +-
 htdocs/langs/ko_KR/errors.lang            |   23 +-
 htdocs/langs/ko_KR/exports.lang           |    3 +
 htdocs/langs/ko_KR/mails.lang             |   25 +-
 htdocs/langs/ko_KR/main.lang              |   12 +-
 htdocs/langs/ko_KR/modulebuilder.lang     |    7 +-
 htdocs/langs/ko_KR/other.lang             |    8 +-
 htdocs/langs/ko_KR/products.lang          |    9 +-
 htdocs/langs/ko_KR/recruitment.lang       |    1 +
 htdocs/langs/ko_KR/sendings.lang          |    2 +
 htdocs/langs/ko_KR/stocks.lang            |    1 +
 htdocs/langs/ko_KR/ticket.lang            |    9 +-
 htdocs/langs/ko_KR/website.lang           |    4 +-
 htdocs/langs/ko_KR/withdrawals.lang       |    5 +-
 htdocs/langs/lo_LA/accountancy.lang       |   17 +-
 htdocs/langs/lo_LA/admin.lang             |   25 +-
 htdocs/langs/lo_LA/banks.lang             |    4 +-
 htdocs/langs/lo_LA/blockedlog.lang        |    2 +-
 htdocs/langs/lo_LA/boxes.lang             |    5 +
 htdocs/langs/lo_LA/cashdesk.lang          |   10 +-
 htdocs/langs/lo_LA/categories.lang        |   17 +-
 htdocs/langs/lo_LA/companies.lang         |    2 +-
 htdocs/langs/lo_LA/compta.lang            |   13 +-
 htdocs/langs/lo_LA/cron.lang              |   36 +-
 htdocs/langs/lo_LA/errors.lang            |   23 +-
 htdocs/langs/lo_LA/exports.lang           |    3 +
 htdocs/langs/lo_LA/mails.lang             |   25 +-
 htdocs/langs/lo_LA/main.lang              |   12 +-
 htdocs/langs/lo_LA/modulebuilder.lang     |    7 +-
 htdocs/langs/lo_LA/other.lang             |    8 +-
 htdocs/langs/lo_LA/products.lang          |    9 +-
 htdocs/langs/lo_LA/recruitment.lang       |    1 +
 htdocs/langs/lo_LA/sendings.lang          |    2 +
 htdocs/langs/lo_LA/stocks.lang            |    1 +
 htdocs/langs/lo_LA/ticket.lang            |    9 +-
 htdocs/langs/lo_LA/website.lang           |    4 +-
 htdocs/langs/lo_LA/withdrawals.lang       |    5 +-
 htdocs/langs/lt_LT/accountancy.lang       |   17 +-
 htdocs/langs/lt_LT/admin.lang             |   25 +-
 htdocs/langs/lt_LT/banks.lang             |    4 +-
 htdocs/langs/lt_LT/blockedlog.lang        |    2 +-
 htdocs/langs/lt_LT/boxes.lang             |    5 +
 htdocs/langs/lt_LT/cashdesk.lang          |   10 +-
 htdocs/langs/lt_LT/categories.lang        |   17 +-
 htdocs/langs/lt_LT/companies.lang         |    2 +-
 htdocs/langs/lt_LT/compta.lang            |   13 +-
 htdocs/langs/lt_LT/cron.lang              |   36 +-
 htdocs/langs/lt_LT/errors.lang            |   23 +-
 htdocs/langs/lt_LT/exports.lang           |    3 +
 htdocs/langs/lt_LT/mails.lang             |   25 +-
 htdocs/langs/lt_LT/main.lang              |   12 +-
 htdocs/langs/lt_LT/modulebuilder.lang     |    7 +-
 htdocs/langs/lt_LT/other.lang             |    8 +-
 htdocs/langs/lt_LT/products.lang          |    9 +-
 htdocs/langs/lt_LT/recruitment.lang       |    1 +
 htdocs/langs/lt_LT/sendings.lang          |    2 +
 htdocs/langs/lt_LT/stocks.lang            |    1 +
 htdocs/langs/lt_LT/ticket.lang            |    9 +-
 htdocs/langs/lt_LT/website.lang           |    4 +-
 htdocs/langs/lt_LT/withdrawals.lang       |    5 +-
 htdocs/langs/lv_LV/accountancy.lang       |   17 +-
 htdocs/langs/lv_LV/admin.lang             |   25 +-
 htdocs/langs/lv_LV/banks.lang             |    4 +-
 htdocs/langs/lv_LV/blockedlog.lang        |    4 +-
 htdocs/langs/lv_LV/boxes.lang             |    5 +
 htdocs/langs/lv_LV/cashdesk.lang          |   12 +-
 htdocs/langs/lv_LV/categories.lang        |   17 +-
 htdocs/langs/lv_LV/companies.lang         |    2 +-
 htdocs/langs/lv_LV/compta.lang            |   13 +-
 htdocs/langs/lv_LV/cron.lang              |    9 +-
 htdocs/langs/lv_LV/errors.lang            |   13 +-
 htdocs/langs/lv_LV/exports.lang           |    1 +
 htdocs/langs/lv_LV/mails.lang             |    7 +-
 htdocs/langs/lv_LV/main.lang              |   12 +-
 htdocs/langs/lv_LV/modulebuilder.lang     |    7 +-
 htdocs/langs/lv_LV/other.lang             |    6 +-
 htdocs/langs/lv_LV/products.lang          |    9 +-
 htdocs/langs/lv_LV/recruitment.lang       |    1 +
 htdocs/langs/lv_LV/sendings.lang          |    2 +
 htdocs/langs/lv_LV/stocks.lang            |    1 +
 htdocs/langs/lv_LV/ticket.lang            |    9 +-
 htdocs/langs/lv_LV/website.lang           |    4 +-
 htdocs/langs/lv_LV/withdrawals.lang       |    5 +-
 htdocs/langs/mk_MK/accountancy.lang       |   17 +-
 htdocs/langs/mk_MK/admin.lang             |   25 +-
 htdocs/langs/mk_MK/banks.lang             |    4 +-
 htdocs/langs/mk_MK/blockedlog.lang        |    2 +-
 htdocs/langs/mk_MK/boxes.lang             |    5 +
 htdocs/langs/mk_MK/cashdesk.lang          |   10 +-
 htdocs/langs/mk_MK/categories.lang        |   17 +-
 htdocs/langs/mk_MK/companies.lang         |    2 +-
 htdocs/langs/mk_MK/compta.lang            |   13 +-
 htdocs/langs/mk_MK/cron.lang              |   36 +-
 htdocs/langs/mk_MK/errors.lang            |   23 +-
 htdocs/langs/mk_MK/exports.lang           |    3 +
 htdocs/langs/mk_MK/mails.lang             |   25 +-
 htdocs/langs/mk_MK/main.lang              |   12 +-
 htdocs/langs/mk_MK/modulebuilder.lang     |    7 +-
 htdocs/langs/mk_MK/other.lang             |    8 +-
 htdocs/langs/mk_MK/products.lang          |    9 +-
 htdocs/langs/mk_MK/recruitment.lang       |    1 +
 htdocs/langs/mk_MK/sendings.lang          |    2 +
 htdocs/langs/mk_MK/stocks.lang            |    1 +
 htdocs/langs/mk_MK/ticket.lang            |    9 +-
 htdocs/langs/mk_MK/website.lang           |    4 +-
 htdocs/langs/mk_MK/withdrawals.lang       |    5 +-
 htdocs/langs/mn_MN/accountancy.lang       |   17 +-
 htdocs/langs/mn_MN/admin.lang             |   25 +-
 htdocs/langs/mn_MN/banks.lang             |    4 +-
 htdocs/langs/mn_MN/blockedlog.lang        |    2 +-
 htdocs/langs/mn_MN/boxes.lang             |    5 +
 htdocs/langs/mn_MN/cashdesk.lang          |   10 +-
 htdocs/langs/mn_MN/categories.lang        |   17 +-
 htdocs/langs/mn_MN/companies.lang         |    2 +-
 htdocs/langs/mn_MN/compta.lang            |   13 +-
 htdocs/langs/mn_MN/cron.lang              |   36 +-
 htdocs/langs/mn_MN/errors.lang            |   23 +-
 htdocs/langs/mn_MN/exports.lang           |    3 +
 htdocs/langs/mn_MN/mails.lang             |   25 +-
 htdocs/langs/mn_MN/main.lang              |   12 +-
 htdocs/langs/mn_MN/modulebuilder.lang     |    7 +-
 htdocs/langs/mn_MN/other.lang             |    8 +-
 htdocs/langs/mn_MN/products.lang          |    9 +-
 htdocs/langs/mn_MN/recruitment.lang       |    1 +
 htdocs/langs/mn_MN/sendings.lang          |    2 +
 htdocs/langs/mn_MN/stocks.lang            |    1 +
 htdocs/langs/mn_MN/ticket.lang            |    9 +-
 htdocs/langs/mn_MN/website.lang           |    4 +-
 htdocs/langs/mn_MN/withdrawals.lang       |    5 +-
 htdocs/langs/nb_NO/accountancy.lang       |   53 +-
 htdocs/langs/nb_NO/admin.lang             |  213 ++--
 htdocs/langs/nb_NO/agenda.lang            |   19 +-
 htdocs/langs/nb_NO/banks.lang             |    6 +-
 htdocs/langs/nb_NO/bills.lang             |    8 +-
 htdocs/langs/nb_NO/blockedlog.lang        |    4 +-
 htdocs/langs/nb_NO/boxes.lang             |    9 +-
 htdocs/langs/nb_NO/cashdesk.lang          |   38 +-
 htdocs/langs/nb_NO/categories.lang        |   21 +-
 htdocs/langs/nb_NO/companies.lang         |   26 +-
 htdocs/langs/nb_NO/compta.lang            |   10 +-
 htdocs/langs/nb_NO/cron.lang              |   36 +-
 htdocs/langs/nb_NO/deliveries.lang        |    3 +-
 htdocs/langs/nb_NO/ecm.lang               |    2 +-
 htdocs/langs/nb_NO/errors.lang            |   13 +-
 htdocs/langs/nb_NO/exports.lang           |    3 +
 htdocs/langs/nb_NO/intracommreport.lang   |   10 +-
 htdocs/langs/nb_NO/languages.lang         |    2 +-
 htdocs/langs/nb_NO/mails.lang             |    7 +-
 htdocs/langs/nb_NO/main.lang              |   22 +-
 htdocs/langs/nb_NO/members.lang           |    4 +-
 htdocs/langs/nb_NO/modulebuilder.lang     |    5 +-
 htdocs/langs/nb_NO/mrp.lang               |    2 +-
 htdocs/langs/nb_NO/other.lang             |    1 +
 htdocs/langs/nb_NO/products.lang          |   13 +-
 htdocs/langs/nb_NO/projects.lang          |    2 +-
 htdocs/langs/nb_NO/recruitment.lang       |   31 +-
 htdocs/langs/nb_NO/sendings.lang          |    2 +
 htdocs/langs/nb_NO/stocks.lang            |   43 +-
 htdocs/langs/nb_NO/suppliers.lang         |    2 +-
 htdocs/langs/nb_NO/ticket.lang            |    9 +-
 htdocs/langs/nb_NO/website.lang           |    8 +-
 htdocs/langs/nb_NO/withdrawals.lang       |   65 +-
 htdocs/langs/ne_NP/accountancy.lang       |   17 +-
 htdocs/langs/ne_NP/admin.lang             |   25 +-
 htdocs/langs/ne_NP/banks.lang             |    4 +-
 htdocs/langs/ne_NP/blockedlog.lang        |    2 +-
 htdocs/langs/ne_NP/boxes.lang             |    5 +
 htdocs/langs/ne_NP/cashdesk.lang          |   10 +-
 htdocs/langs/ne_NP/categories.lang        |   17 +-
 htdocs/langs/ne_NP/companies.lang         |    2 +-
 htdocs/langs/ne_NP/compta.lang            |   13 +-
 htdocs/langs/ne_NP/cron.lang              |   13 +-
 htdocs/langs/ne_NP/errors.lang            |   23 +-
 htdocs/langs/ne_NP/exports.lang           |    1 +
 htdocs/langs/ne_NP/mails.lang             |   25 +-
 htdocs/langs/ne_NP/main.lang              |   12 +-
 htdocs/langs/ne_NP/modulebuilder.lang     |    7 +-
 htdocs/langs/ne_NP/other.lang             |    8 +-
 htdocs/langs/ne_NP/products.lang          |    9 +-
 htdocs/langs/ne_NP/recruitment.lang       |    1 +
 htdocs/langs/ne_NP/sendings.lang          |    2 +
 htdocs/langs/ne_NP/stocks.lang            |    1 +
 htdocs/langs/ne_NP/ticket.lang            |    9 +-
 htdocs/langs/ne_NP/website.lang           |    4 +-
 htdocs/langs/ne_NP/withdrawals.lang       |    5 +-
 htdocs/langs/nl_BE/accountancy.lang       |    1 +
 htdocs/langs/nl_BE/admin.lang             |   39 +-
 htdocs/langs/nl_BE/banks.lang             |    9 +
 htdocs/langs/nl_BE/cashdesk.lang          |    1 +
 htdocs/langs/nl_BE/categories.lang        |    5 +-
 htdocs/langs/nl_BE/exports.lang           |    2 +
 htdocs/langs/nl_BE/externalsite.lang      |    4 +
 htdocs/langs/nl_BE/mails.lang             |   26 +
 htdocs/langs/nl_BE/main.lang              |    3 +
 htdocs/langs/nl_BE/products.lang          |    1 -
 htdocs/langs/nl_BE/sendings.lang          |    1 +
 htdocs/langs/nl_BE/ticket.lang            |    1 -
 htdocs/langs/nl_BE/withdrawals.lang       |    2 +
 htdocs/langs/nl_NL/accountancy.lang       |   21 +-
 htdocs/langs/nl_NL/admin.lang             |  327 ++---
 htdocs/langs/nl_NL/agenda.lang            |   21 +-
 htdocs/langs/nl_NL/banks.lang             |   88 +-
 htdocs/langs/nl_NL/bills.lang             |   12 +-
 htdocs/langs/nl_NL/blockedlog.lang        |    2 +-
 htdocs/langs/nl_NL/boxes.lang             |    9 +-
 htdocs/langs/nl_NL/cashdesk.lang          |   25 +-
 htdocs/langs/nl_NL/categories.lang        |   27 +-
 htdocs/langs/nl_NL/companies.lang         |   38 +-
 htdocs/langs/nl_NL/compta.lang            |   19 +-
 htdocs/langs/nl_NL/contracts.lang         |    8 +-
 htdocs/langs/nl_NL/cron.lang              |   13 +-
 htdocs/langs/nl_NL/deliveries.lang        |    1 +
 htdocs/langs/nl_NL/ecm.lang               |    8 +-
 htdocs/langs/nl_NL/errors.lang            |   37 +-
 htdocs/langs/nl_NL/exports.lang           |    3 +-
 htdocs/langs/nl_NL/externalsite.lang      |    6 +-
 htdocs/langs/nl_NL/ftp.lang               |   18 +-
 htdocs/langs/nl_NL/hrm.lang               |   18 +-
 htdocs/langs/nl_NL/interventions.lang     |   26 +-
 htdocs/langs/nl_NL/intracommreport.lang   |    6 +-
 htdocs/langs/nl_NL/languages.lang         |   14 +-
 htdocs/langs/nl_NL/loan.lang              |    6 +-
 htdocs/langs/nl_NL/mails.lang             |    7 +-
 htdocs/langs/nl_NL/main.lang              |  132 +-
 htdocs/langs/nl_NL/members.lang           |   14 +-
 htdocs/langs/nl_NL/modulebuilder.lang     |    7 +-
 htdocs/langs/nl_NL/mrp.lang               |    8 +-
 htdocs/langs/nl_NL/multicurrency.lang     |   16 +
 htdocs/langs/nl_NL/orders.lang            |    2 +-
 htdocs/langs/nl_NL/other.lang             |   10 +-
 htdocs/langs/nl_NL/products.lang          |   35 +-
 htdocs/langs/nl_NL/projects.lang          |   14 +-
 htdocs/langs/nl_NL/propal.lang            |   10 +-
 htdocs/langs/nl_NL/receiptprinter.lang    |    4 +-
 htdocs/langs/nl_NL/recruitment.lang       |   49 +-
 htdocs/langs/nl_NL/salaries.lang          |   12 +-
 htdocs/langs/nl_NL/sendings.lang          |    2 +
 htdocs/langs/nl_NL/stocks.lang            |   39 +-
 htdocs/langs/nl_NL/suppliers.lang         |    4 +-
 htdocs/langs/nl_NL/ticket.lang            |    9 +-
 htdocs/langs/nl_NL/trips.lang             |    4 +-
 htdocs/langs/nl_NL/users.lang             |   11 +-
 htdocs/langs/nl_NL/website.lang           |    8 +-
 htdocs/langs/nl_NL/withdrawals.lang       |   29 +-
 htdocs/langs/nl_NL/workflow.lang          |   10 +-
 htdocs/langs/nl_NL/zapier.lang            |    2 +-
 htdocs/langs/pl_PL/accountancy.lang       |   17 +-
 htdocs/langs/pl_PL/admin.lang             |   25 +-
 htdocs/langs/pl_PL/banks.lang             |    4 +-
 htdocs/langs/pl_PL/blockedlog.lang        |    2 +-
 htdocs/langs/pl_PL/boxes.lang             |    5 +
 htdocs/langs/pl_PL/cashdesk.lang          |   10 +-
 htdocs/langs/pl_PL/categories.lang        |   17 +-
 htdocs/langs/pl_PL/companies.lang         |    2 +-
 htdocs/langs/pl_PL/compta.lang            |   13 +-
 htdocs/langs/pl_PL/cron.lang              |   36 +-
 htdocs/langs/pl_PL/errors.lang            |   23 +-
 htdocs/langs/pl_PL/exports.lang           |    3 +
 htdocs/langs/pl_PL/mails.lang             |   25 +-
 htdocs/langs/pl_PL/main.lang              |   12 +-
 htdocs/langs/pl_PL/modulebuilder.lang     |    7 +-
 htdocs/langs/pl_PL/other.lang             |    8 +-
 htdocs/langs/pl_PL/products.lang          |    9 +-
 htdocs/langs/pl_PL/recruitment.lang       |    1 +
 htdocs/langs/pl_PL/sendings.lang          |    2 +
 htdocs/langs/pl_PL/stocks.lang            |    1 +
 htdocs/langs/pl_PL/ticket.lang            |   21 +-
 htdocs/langs/pl_PL/website.lang           |    4 +-
 htdocs/langs/pl_PL/withdrawals.lang       |    5 +-
 htdocs/langs/pt_AO/main.lang              |   21 +
 htdocs/langs/pt_BR/accountancy.lang       |    5 -
 htdocs/langs/pt_BR/admin.lang             |   12 +-
 htdocs/langs/pt_BR/banks.lang             |    2 -
 htdocs/langs/pt_BR/bills.lang             |   16 -
 htdocs/langs/pt_BR/blockedlog.lang        |    2 +-
 htdocs/langs/pt_BR/boxes.lang             |    5 +-
 htdocs/langs/pt_BR/cashdesk.lang          |    3 -
 htdocs/langs/pt_BR/categories.lang        |    6 +-
 htdocs/langs/pt_BR/compta.lang            |    4 +-
 htdocs/langs/pt_BR/cron.lang              |    6 +-
 htdocs/langs/pt_BR/errors.lang            |    3 +-
 htdocs/langs/pt_BR/exports.lang           |    2 +
 htdocs/langs/pt_BR/mails.lang             |    7 -
 htdocs/langs/pt_BR/main.lang              |    3 +
 htdocs/langs/pt_BR/modulebuilder.lang     |    1 -
 htdocs/langs/pt_BR/other.lang             |    2 +-
 htdocs/langs/pt_BR/products.lang          |    1 -
 htdocs/langs/pt_BR/sendings.lang          |    1 +
 htdocs/langs/pt_BR/ticket.lang            |    1 -
 htdocs/langs/pt_BR/withdrawals.lang       |    1 -
 htdocs/langs/pt_PT/accountancy.lang       |   17 +-
 htdocs/langs/pt_PT/admin.lang             |   25 +-
 htdocs/langs/pt_PT/banks.lang             |    4 +-
 htdocs/langs/pt_PT/bills.lang             |  111 +-
 htdocs/langs/pt_PT/blockedlog.lang        |    2 +-
 htdocs/langs/pt_PT/boxes.lang             |   51 +-
 htdocs/langs/pt_PT/cashdesk.lang          |   10 +-
 htdocs/langs/pt_PT/categories.lang        |   17 +-
 htdocs/langs/pt_PT/companies.lang         |    2 +-
 htdocs/langs/pt_PT/compta.lang            |   19 +-
 htdocs/langs/pt_PT/cron.lang              |   70 +-
 htdocs/langs/pt_PT/errors.lang            |   23 +-
 htdocs/langs/pt_PT/exports.lang           |    3 +
 htdocs/langs/pt_PT/mails.lang             |   25 +-
 htdocs/langs/pt_PT/main.lang              |   12 +-
 htdocs/langs/pt_PT/modulebuilder.lang     |    7 +-
 htdocs/langs/pt_PT/other.lang             |    8 +-
 htdocs/langs/pt_PT/products.lang          |    9 +-
 htdocs/langs/pt_PT/recruitment.lang       |    1 +
 htdocs/langs/pt_PT/sendings.lang          |    2 +
 htdocs/langs/pt_PT/stocks.lang            |    1 +
 htdocs/langs/pt_PT/ticket.lang            |    9 +-
 htdocs/langs/pt_PT/website.lang           |    4 +-
 htdocs/langs/pt_PT/withdrawals.lang       |    5 +-
 htdocs/langs/ro_RO/accountancy.lang       |   17 +-
 htdocs/langs/ro_RO/admin.lang             |   25 +-
 htdocs/langs/ro_RO/banks.lang             |    4 +-
 htdocs/langs/ro_RO/blockedlog.lang        |    2 +-
 htdocs/langs/ro_RO/boxes.lang             |    5 +
 htdocs/langs/ro_RO/cashdesk.lang          |   12 +-
 htdocs/langs/ro_RO/categories.lang        |   13 +-
 htdocs/langs/ro_RO/companies.lang         |    2 +-
 htdocs/langs/ro_RO/compta.lang            |   13 +-
 htdocs/langs/ro_RO/cron.lang              |   13 +-
 htdocs/langs/ro_RO/errors.lang            |   23 +-
 htdocs/langs/ro_RO/exports.lang           |    1 +
 htdocs/langs/ro_RO/mails.lang             |   25 +-
 htdocs/langs/ro_RO/main.lang              |   12 +-
 htdocs/langs/ro_RO/modulebuilder.lang     |    7 +-
 htdocs/langs/ro_RO/other.lang             |    8 +-
 htdocs/langs/ro_RO/products.lang          |    7 +-
 htdocs/langs/ro_RO/recruitment.lang       |    1 +
 htdocs/langs/ro_RO/sendings.lang          |    2 +
 htdocs/langs/ro_RO/stocks.lang            |    1 +
 htdocs/langs/ro_RO/ticket.lang            |    9 +-
 htdocs/langs/ro_RO/website.lang           |    4 +-
 htdocs/langs/ro_RO/withdrawals.lang       |    5 +-
 htdocs/langs/ru_RU/accountancy.lang       |   17 +-
 htdocs/langs/ru_RU/admin.lang             |   25 +-
 htdocs/langs/ru_RU/banks.lang             |    4 +-
 htdocs/langs/ru_RU/blockedlog.lang        |    2 +-
 htdocs/langs/ru_RU/boxes.lang             |    5 +
 htdocs/langs/ru_RU/cashdesk.lang          |   10 +-
 htdocs/langs/ru_RU/categories.lang        |   17 +-
 htdocs/langs/ru_RU/companies.lang         |    2 +-
 htdocs/langs/ru_RU/compta.lang            |   13 +-
 htdocs/langs/ru_RU/cron.lang              |   16 +-
 htdocs/langs/ru_RU/errors.lang            |   23 +-
 htdocs/langs/ru_RU/exports.lang           |    3 +
 htdocs/langs/ru_RU/mails.lang             |   25 +-
 htdocs/langs/ru_RU/main.lang              |   12 +-
 htdocs/langs/ru_RU/modulebuilder.lang     |    7 +-
 htdocs/langs/ru_RU/other.lang             |    8 +-
 htdocs/langs/ru_RU/products.lang          |    9 +-
 htdocs/langs/ru_RU/recruitment.lang       |    1 +
 htdocs/langs/ru_RU/sendings.lang          |    2 +
 htdocs/langs/ru_RU/stocks.lang            |    1 +
 htdocs/langs/ru_RU/ticket.lang            |    9 +-
 htdocs/langs/ru_RU/website.lang           |    4 +-
 htdocs/langs/ru_RU/withdrawals.lang       |    5 +-
 htdocs/langs/ru_UA/products.lang          |    2 -
 htdocs/langs/sk_SK/accountancy.lang       |   17 +-
 htdocs/langs/sk_SK/admin.lang             |   25 +-
 htdocs/langs/sk_SK/banks.lang             |    4 +-
 htdocs/langs/sk_SK/blockedlog.lang        |    2 +-
 htdocs/langs/sk_SK/boxes.lang             |    5 +
 htdocs/langs/sk_SK/cashdesk.lang          |   10 +-
 htdocs/langs/sk_SK/categories.lang        |   17 +-
 htdocs/langs/sk_SK/companies.lang         |    2 +-
 htdocs/langs/sk_SK/compta.lang            |   13 +-
 htdocs/langs/sk_SK/cron.lang              |   36 +-
 htdocs/langs/sk_SK/errors.lang            |   23 +-
 htdocs/langs/sk_SK/exports.lang           |    3 +
 htdocs/langs/sk_SK/mails.lang             |   25 +-
 htdocs/langs/sk_SK/main.lang              |   12 +-
 htdocs/langs/sk_SK/modulebuilder.lang     |    7 +-
 htdocs/langs/sk_SK/other.lang             |    8 +-
 htdocs/langs/sk_SK/products.lang          |    9 +-
 htdocs/langs/sk_SK/recruitment.lang       |    1 +
 htdocs/langs/sk_SK/sendings.lang          |    2 +
 htdocs/langs/sk_SK/stocks.lang            |    1 +
 htdocs/langs/sk_SK/ticket.lang            |    9 +-
 htdocs/langs/sk_SK/website.lang           |    4 +-
 htdocs/langs/sk_SK/withdrawals.lang       |    5 +-
 htdocs/langs/sl_SI/accountancy.lang       |   17 +-
 htdocs/langs/sl_SI/admin.lang             |   25 +-
 htdocs/langs/sl_SI/banks.lang             |    4 +-
 htdocs/langs/sl_SI/blockedlog.lang        |    2 +-
 htdocs/langs/sl_SI/boxes.lang             |    5 +
 htdocs/langs/sl_SI/cashdesk.lang          |   10 +-
 htdocs/langs/sl_SI/categories.lang        |   17 +-
 htdocs/langs/sl_SI/companies.lang         |    2 +-
 htdocs/langs/sl_SI/compta.lang            |   13 +-
 htdocs/langs/sl_SI/cron.lang              |   36 +-
 htdocs/langs/sl_SI/errors.lang            |   23 +-
 htdocs/langs/sl_SI/exports.lang           |    3 +
 htdocs/langs/sl_SI/mails.lang             |   25 +-
 htdocs/langs/sl_SI/main.lang              |   12 +-
 htdocs/langs/sl_SI/modulebuilder.lang     |    7 +-
 htdocs/langs/sl_SI/other.lang             |    8 +-
 htdocs/langs/sl_SI/products.lang          |    9 +-
 htdocs/langs/sl_SI/recruitment.lang       |    1 +
 htdocs/langs/sl_SI/sendings.lang          |    2 +
 htdocs/langs/sl_SI/stocks.lang            |    1 +
 htdocs/langs/sl_SI/ticket.lang            |    9 +-
 htdocs/langs/sl_SI/website.lang           |    4 +-
 htdocs/langs/sl_SI/withdrawals.lang       |    5 +-
 htdocs/langs/sq_AL/accountancy.lang       |   17 +-
 htdocs/langs/sq_AL/admin.lang             |   25 +-
 htdocs/langs/sq_AL/banks.lang             |    4 +-
 htdocs/langs/sq_AL/blockedlog.lang        |    2 +-
 htdocs/langs/sq_AL/boxes.lang             |    5 +
 htdocs/langs/sq_AL/cashdesk.lang          |   10 +-
 htdocs/langs/sq_AL/categories.lang        |   17 +-
 htdocs/langs/sq_AL/companies.lang         |    2 +-
 htdocs/langs/sq_AL/compta.lang            |   13 +-
 htdocs/langs/sq_AL/cron.lang              |   36 +-
 htdocs/langs/sq_AL/errors.lang            |   23 +-
 htdocs/langs/sq_AL/exports.lang           |    3 +
 htdocs/langs/sq_AL/mails.lang             |   25 +-
 htdocs/langs/sq_AL/main.lang              |   12 +-
 htdocs/langs/sq_AL/modulebuilder.lang     |    7 +-
 htdocs/langs/sq_AL/other.lang             |    8 +-
 htdocs/langs/sq_AL/products.lang          |    9 +-
 htdocs/langs/sq_AL/recruitment.lang       |    1 +
 htdocs/langs/sq_AL/sendings.lang          |    2 +
 htdocs/langs/sq_AL/stocks.lang            |    1 +
 htdocs/langs/sq_AL/ticket.lang            |    9 +-
 htdocs/langs/sq_AL/website.lang           |    4 +-
 htdocs/langs/sq_AL/withdrawals.lang       |    5 +-
 htdocs/langs/sr_RS/accountancy.lang       |   17 +-
 htdocs/langs/sr_RS/admin.lang             |   25 +-
 htdocs/langs/sr_RS/banks.lang             |    4 +-
 htdocs/langs/sr_RS/blockedlog.lang        |    2 +-
 htdocs/langs/sr_RS/boxes.lang             |    5 +
 htdocs/langs/sr_RS/cashdesk.lang          |   10 +-
 htdocs/langs/sr_RS/categories.lang        |   17 +-
 htdocs/langs/sr_RS/companies.lang         |    2 +-
 htdocs/langs/sr_RS/compta.lang            |   13 +-
 htdocs/langs/sr_RS/cron.lang              |   36 +-
 htdocs/langs/sr_RS/errors.lang            |   23 +-
 htdocs/langs/sr_RS/exports.lang           |    3 +
 htdocs/langs/sr_RS/mails.lang             |   25 +-
 htdocs/langs/sr_RS/main.lang              |   12 +-
 htdocs/langs/sr_RS/modulebuilder.lang     |    7 +-
 htdocs/langs/sr_RS/other.lang             |    8 +-
 htdocs/langs/sr_RS/products.lang          |    9 +-
 htdocs/langs/sr_RS/recruitment.lang       |    1 +
 htdocs/langs/sr_RS/sendings.lang          |    2 +
 htdocs/langs/sr_RS/stocks.lang            |    1 +
 htdocs/langs/sr_RS/ticket.lang            |    9 +-
 htdocs/langs/sr_RS/website.lang           |    4 +-
 htdocs/langs/sr_RS/withdrawals.lang       |    5 +-
 htdocs/langs/sv_SE/accountancy.lang       |   19 +-
 htdocs/langs/sv_SE/admin.lang             |   25 +-
 htdocs/langs/sv_SE/banks.lang             |    4 +-
 htdocs/langs/sv_SE/blockedlog.lang        |    2 +-
 htdocs/langs/sv_SE/boxes.lang             |    5 +
 htdocs/langs/sv_SE/cashdesk.lang          |   10 +-
 htdocs/langs/sv_SE/categories.lang        |   17 +-
 htdocs/langs/sv_SE/companies.lang         |    2 +-
 htdocs/langs/sv_SE/compta.lang            |   13 +-
 htdocs/langs/sv_SE/cron.lang              |   18 +-
 htdocs/langs/sv_SE/errors.lang            |   23 +-
 htdocs/langs/sv_SE/exports.lang           |    3 +
 htdocs/langs/sv_SE/mails.lang             |   25 +-
 htdocs/langs/sv_SE/main.lang              |   12 +-
 htdocs/langs/sv_SE/members.lang           |    2 +-
 htdocs/langs/sv_SE/modulebuilder.lang     |    7 +-
 htdocs/langs/sv_SE/other.lang             |    6 +-
 htdocs/langs/sv_SE/products.lang          |    9 +-
 htdocs/langs/sv_SE/projects.lang          |   12 +-
 htdocs/langs/sv_SE/recruitment.lang       |    1 +
 htdocs/langs/sv_SE/sendings.lang          |    2 +
 htdocs/langs/sv_SE/stocks.lang            |    1 +
 htdocs/langs/sv_SE/ticket.lang            |    9 +-
 htdocs/langs/sv_SE/website.lang           |    4 +-
 htdocs/langs/sv_SE/withdrawals.lang       |    5 +-
 htdocs/langs/sw_SW/accountancy.lang       |   17 +-
 htdocs/langs/sw_SW/admin.lang             |   25 +-
 htdocs/langs/sw_SW/banks.lang             |    4 +-
 htdocs/langs/sw_SW/blockedlog.lang        |    2 +-
 htdocs/langs/sw_SW/boxes.lang             |    5 +
 htdocs/langs/sw_SW/cashdesk.lang          |   10 +-
 htdocs/langs/sw_SW/categories.lang        |   17 +-
 htdocs/langs/sw_SW/companies.lang         |    2 +-
 htdocs/langs/sw_SW/compta.lang            |   13 +-
 htdocs/langs/sw_SW/cron.lang              |   36 +-
 htdocs/langs/sw_SW/errors.lang            |   23 +-
 htdocs/langs/sw_SW/exports.lang           |    3 +
 htdocs/langs/sw_SW/mails.lang             |   25 +-
 htdocs/langs/sw_SW/main.lang              |   12 +-
 htdocs/langs/sw_SW/modulebuilder.lang     |    7 +-
 htdocs/langs/sw_SW/other.lang             |    8 +-
 htdocs/langs/sw_SW/products.lang          |    9 +-
 htdocs/langs/sw_SW/recruitment.lang       |    1 +
 htdocs/langs/sw_SW/sendings.lang          |    2 +
 htdocs/langs/sw_SW/stocks.lang            |    1 +
 htdocs/langs/sw_SW/ticket.lang            |    9 +-
 htdocs/langs/sw_SW/website.lang           |    4 +-
 htdocs/langs/sw_SW/withdrawals.lang       |    5 +-
 htdocs/langs/th_TH/accountancy.lang       |   17 +-
 htdocs/langs/th_TH/admin.lang             |   25 +-
 htdocs/langs/th_TH/banks.lang             |    4 +-
 htdocs/langs/th_TH/blockedlog.lang        |    2 +-
 htdocs/langs/th_TH/boxes.lang             |    5 +
 htdocs/langs/th_TH/cashdesk.lang          |   10 +-
 htdocs/langs/th_TH/categories.lang        |   17 +-
 htdocs/langs/th_TH/companies.lang         |    2 +-
 htdocs/langs/th_TH/compta.lang            |   13 +-
 htdocs/langs/th_TH/cron.lang              |   36 +-
 htdocs/langs/th_TH/errors.lang            |   23 +-
 htdocs/langs/th_TH/exports.lang           |    3 +
 htdocs/langs/th_TH/mails.lang             |   25 +-
 htdocs/langs/th_TH/main.lang              |   12 +-
 htdocs/langs/th_TH/modulebuilder.lang     |    7 +-
 htdocs/langs/th_TH/other.lang             |    8 +-
 htdocs/langs/th_TH/products.lang          |    9 +-
 htdocs/langs/th_TH/recruitment.lang       |    1 +
 htdocs/langs/th_TH/sendings.lang          |    2 +
 htdocs/langs/th_TH/stocks.lang            |    1 +
 htdocs/langs/th_TH/ticket.lang            |    9 +-
 htdocs/langs/th_TH/website.lang           |    4 +-
 htdocs/langs/th_TH/withdrawals.lang       |    5 +-
 htdocs/langs/tr_TR/accountancy.lang       |   17 +-
 htdocs/langs/tr_TR/admin.lang             |   25 +-
 htdocs/langs/tr_TR/banks.lang             |    4 +-
 htdocs/langs/tr_TR/blockedlog.lang        |    2 +-
 htdocs/langs/tr_TR/boxes.lang             |    9 +-
 htdocs/langs/tr_TR/cashdesk.lang          |   10 +-
 htdocs/langs/tr_TR/categories.lang        |   17 +-
 htdocs/langs/tr_TR/companies.lang         |    2 +-
 htdocs/langs/tr_TR/compta.lang            |   13 +-
 htdocs/langs/tr_TR/cron.lang              |   16 +-
 htdocs/langs/tr_TR/errors.lang            |   23 +-
 htdocs/langs/tr_TR/exports.lang           |    3 +
 htdocs/langs/tr_TR/mails.lang             |   25 +-
 htdocs/langs/tr_TR/main.lang              |   12 +-
 htdocs/langs/tr_TR/modulebuilder.lang     |    7 +-
 htdocs/langs/tr_TR/other.lang             |    6 +-
 htdocs/langs/tr_TR/products.lang          |    9 +-
 htdocs/langs/tr_TR/recruitment.lang       |    1 +
 htdocs/langs/tr_TR/sendings.lang          |    2 +
 htdocs/langs/tr_TR/stocks.lang            |    1 +
 htdocs/langs/tr_TR/ticket.lang            |    9 +-
 htdocs/langs/tr_TR/website.lang           |    4 +-
 htdocs/langs/tr_TR/withdrawals.lang       |    5 +-
 htdocs/langs/uk_UA/accountancy.lang       |   17 +-
 htdocs/langs/uk_UA/admin.lang             |   25 +-
 htdocs/langs/uk_UA/banks.lang             |    4 +-
 htdocs/langs/uk_UA/blockedlog.lang        |    2 +-
 htdocs/langs/uk_UA/boxes.lang             |    5 +
 htdocs/langs/uk_UA/cashdesk.lang          |   10 +-
 htdocs/langs/uk_UA/categories.lang        |   17 +-
 htdocs/langs/uk_UA/companies.lang         |    2 +-
 htdocs/langs/uk_UA/compta.lang            |   13 +-
 htdocs/langs/uk_UA/cron.lang              |   36 +-
 htdocs/langs/uk_UA/errors.lang            |   23 +-
 htdocs/langs/uk_UA/exports.lang           |    1 +
 htdocs/langs/uk_UA/mails.lang             |   25 +-
 htdocs/langs/uk_UA/main.lang              |   10 +
 htdocs/langs/uk_UA/modulebuilder.lang     |    7 +-
 htdocs/langs/uk_UA/other.lang             |    8 +-
 htdocs/langs/uk_UA/products.lang          |    9 +-
 htdocs/langs/uk_UA/recruitment.lang       |    1 +
 htdocs/langs/uk_UA/sendings.lang          |    2 +
 htdocs/langs/uk_UA/stocks.lang            |    1 +
 htdocs/langs/uk_UA/ticket.lang            |    9 +-
 htdocs/langs/uk_UA/website.lang           |    4 +-
 htdocs/langs/uk_UA/withdrawals.lang       |    5 +-
 htdocs/langs/uz_UZ/accountancy.lang       |   17 +-
 htdocs/langs/uz_UZ/admin.lang             |   25 +-
 htdocs/langs/uz_UZ/banks.lang             |    4 +-
 htdocs/langs/uz_UZ/blockedlog.lang        |    2 +-
 htdocs/langs/uz_UZ/boxes.lang             |    5 +
 htdocs/langs/uz_UZ/cashdesk.lang          |   10 +-
 htdocs/langs/uz_UZ/categories.lang        |   17 +-
 htdocs/langs/uz_UZ/companies.lang         |    2 +-
 htdocs/langs/uz_UZ/compta.lang            |   13 +-
 htdocs/langs/uz_UZ/cron.lang              |   36 +-
 htdocs/langs/uz_UZ/errors.lang            |   23 +-
 htdocs/langs/uz_UZ/exports.lang           |    3 +
 htdocs/langs/uz_UZ/mails.lang             |   25 +-
 htdocs/langs/uz_UZ/main.lang              |   12 +-
 htdocs/langs/uz_UZ/modulebuilder.lang     |    7 +-
 htdocs/langs/uz_UZ/other.lang             |    8 +-
 htdocs/langs/uz_UZ/products.lang          |    9 +-
 htdocs/langs/uz_UZ/recruitment.lang       |    1 +
 htdocs/langs/uz_UZ/sendings.lang          |    2 +
 htdocs/langs/uz_UZ/stocks.lang            |    1 +
 htdocs/langs/uz_UZ/ticket.lang            |    9 +-
 htdocs/langs/uz_UZ/website.lang           |    4 +-
 htdocs/langs/uz_UZ/withdrawals.lang       |    5 +-
 htdocs/langs/vi_VN/accountancy.lang       |   17 +-
 htdocs/langs/vi_VN/admin.lang             |   25 +-
 htdocs/langs/vi_VN/banks.lang             |    4 +-
 htdocs/langs/vi_VN/blockedlog.lang        |    4 +-
 htdocs/langs/vi_VN/boxes.lang             |    5 +
 htdocs/langs/vi_VN/cashdesk.lang          |   10 +-
 htdocs/langs/vi_VN/categories.lang        |   17 +-
 htdocs/langs/vi_VN/companies.lang         |    2 +-
 htdocs/langs/vi_VN/compta.lang            |   13 +-
 htdocs/langs/vi_VN/cron.lang              |   13 +-
 htdocs/langs/vi_VN/errors.lang            |   23 +-
 htdocs/langs/vi_VN/exports.lang           |    5 +-
 htdocs/langs/vi_VN/mails.lang             |   25 +-
 htdocs/langs/vi_VN/main.lang              |   10 +
 htdocs/langs/vi_VN/modulebuilder.lang     |    7 +-
 htdocs/langs/vi_VN/other.lang             |    6 +-
 htdocs/langs/vi_VN/products.lang          |    9 +-
 htdocs/langs/vi_VN/recruitment.lang       |    1 +
 htdocs/langs/vi_VN/sendings.lang          |    2 +
 htdocs/langs/vi_VN/stocks.lang            |    1 +
 htdocs/langs/vi_VN/ticket.lang            |    9 +-
 htdocs/langs/vi_VN/website.lang           |    4 +-
 htdocs/langs/vi_VN/withdrawals.lang       |    5 +-
 htdocs/langs/zh_CN/accountancy.lang       |   17 +-
 htdocs/langs/zh_CN/admin.lang             |   25 +-
 htdocs/langs/zh_CN/banks.lang             |    4 +-
 htdocs/langs/zh_CN/blockedlog.lang        |    2 +-
 htdocs/langs/zh_CN/boxes.lang             |    5 +
 htdocs/langs/zh_CN/cashdesk.lang          |   10 +-
 htdocs/langs/zh_CN/categories.lang        |   17 +-
 htdocs/langs/zh_CN/companies.lang         |    2 +-
 htdocs/langs/zh_CN/compta.lang            |   13 +-
 htdocs/langs/zh_CN/cron.lang              |   64 +-
 htdocs/langs/zh_CN/errors.lang            |   23 +-
 htdocs/langs/zh_CN/exports.lang           |    3 +
 htdocs/langs/zh_CN/mails.lang             |   25 +-
 htdocs/langs/zh_CN/main.lang              |   12 +-
 htdocs/langs/zh_CN/modulebuilder.lang     |    7 +-
 htdocs/langs/zh_CN/other.lang             |    8 +-
 htdocs/langs/zh_CN/products.lang          |    9 +-
 htdocs/langs/zh_CN/recruitment.lang       |    1 +
 htdocs/langs/zh_CN/sendings.lang          |    2 +
 htdocs/langs/zh_CN/stocks.lang            |    1 +
 htdocs/langs/zh_CN/ticket.lang            |    9 +-
 htdocs/langs/zh_CN/website.lang           |    4 +-
 htdocs/langs/zh_CN/withdrawals.lang       |    5 +-
 htdocs/langs/zh_HK/accountancy.lang       |   17 +-
 htdocs/langs/zh_HK/admin.lang             |   25 +-
 htdocs/langs/zh_HK/banks.lang             |    4 +-
 htdocs/langs/zh_HK/blockedlog.lang        |    2 +-
 htdocs/langs/zh_HK/boxes.lang             |    5 +
 htdocs/langs/zh_HK/cashdesk.lang          |   10 +-
 htdocs/langs/zh_HK/categories.lang        |   17 +-
 htdocs/langs/zh_HK/companies.lang         |    2 +-
 htdocs/langs/zh_HK/compta.lang            |   13 +-
 htdocs/langs/zh_HK/cron.lang              |   13 +-
 htdocs/langs/zh_HK/errors.lang            |   23 +-
 htdocs/langs/zh_HK/exports.lang           |    1 +
 htdocs/langs/zh_HK/mails.lang             |   25 +-
 htdocs/langs/zh_HK/main.lang              |   12 +-
 htdocs/langs/zh_HK/modulebuilder.lang     |    7 +-
 htdocs/langs/zh_HK/other.lang             |    8 +-
 htdocs/langs/zh_HK/products.lang          |    9 +-
 htdocs/langs/zh_HK/recruitment.lang       |    1 +
 htdocs/langs/zh_HK/sendings.lang          |    2 +
 htdocs/langs/zh_HK/stocks.lang            |    1 +
 htdocs/langs/zh_HK/ticket.lang            |    9 +-
 htdocs/langs/zh_HK/website.lang           |    4 +-
 htdocs/langs/zh_HK/withdrawals.lang       |    5 +-
 htdocs/langs/zh_TW/accountancy.lang       |   17 +-
 htdocs/langs/zh_TW/admin.lang             |  143 +--
 htdocs/langs/zh_TW/agenda.lang            |   11 +-
 htdocs/langs/zh_TW/banks.lang             |    4 +-
 htdocs/langs/zh_TW/bills.lang             |  117 +-
 htdocs/langs/zh_TW/blockedlog.lang        |   10 +-
 htdocs/langs/zh_TW/boxes.lang             |    5 +
 htdocs/langs/zh_TW/cashdesk.lang          |   22 +-
 htdocs/langs/zh_TW/categories.lang        |   27 +-
 htdocs/langs/zh_TW/companies.lang         |   36 +-
 htdocs/langs/zh_TW/compta.lang            |   15 +-
 htdocs/langs/zh_TW/cron.lang              |   13 +-
 htdocs/langs/zh_TW/errors.lang            |   31 +-
 htdocs/langs/zh_TW/exports.lang           |    3 +
 htdocs/langs/zh_TW/hrm.lang               |    2 +-
 htdocs/langs/zh_TW/install.lang           |    2 +-
 htdocs/langs/zh_TW/intracommreport.lang   |   10 +-
 htdocs/langs/zh_TW/mails.lang             |   31 +-
 htdocs/langs/zh_TW/main.lang              |   38 +-
 htdocs/langs/zh_TW/modulebuilder.lang     |    9 +-
 htdocs/langs/zh_TW/other.lang             |   12 +-
 htdocs/langs/zh_TW/products.lang          |    9 +-
 htdocs/langs/zh_TW/recruitment.lang       |    1 +
 htdocs/langs/zh_TW/sendings.lang          |    2 +
 htdocs/langs/zh_TW/stocks.lang            |    1 +
 htdocs/langs/zh_TW/ticket.lang            |   13 +-
 htdocs/langs/zh_TW/users.lang             |   21 +-
 htdocs/langs/zh_TW/website.lang           |    4 +-
 htdocs/langs/zh_TW/withdrawals.lang       |   17 +-
 1643 files changed, 15248 insertions(+), 10673 deletions(-)
 delete mode 100644 htdocs/langs/el_CY/products.lang
 create mode 100644 htdocs/langs/en_AU/accountancy.lang
 delete mode 100644 htdocs/langs/en_AU/products.lang
 create mode 100644 htdocs/langs/en_AU/withdrawals.lang
 create mode 100644 htdocs/langs/en_CA/accountancy.lang
 delete mode 100644 htdocs/langs/en_CA/compta.lang
 delete mode 100644 htdocs/langs/en_CA/products.lang
 create mode 100644 htdocs/langs/en_CA/withdrawals.lang
 create mode 100644 htdocs/langs/en_IN/accountancy.lang
 delete mode 100644 htdocs/langs/en_IN/products.lang
 create mode 100644 htdocs/langs/en_IN/withdrawals.lang
 create mode 100644 htdocs/langs/en_SG/accountancy.lang
 delete mode 100644 htdocs/langs/en_SG/compta.lang
 delete mode 100644 htdocs/langs/en_SG/products.lang
 create mode 100644 htdocs/langs/en_SG/withdrawals.lang
 create mode 100644 htdocs/langs/es_BO/accountancy.lang
 delete mode 100644 htdocs/langs/es_BO/compta.lang
 delete mode 100644 htdocs/langs/es_BO/products.lang
 create mode 100644 htdocs/langs/es_BO/withdrawals.lang
 create mode 100644 htdocs/langs/es_DO/accountancy.lang
 delete mode 100644 htdocs/langs/es_DO/compta.lang
 delete mode 100644 htdocs/langs/es_DO/products.lang
 create mode 100644 htdocs/langs/es_DO/withdrawals.lang
 create mode 100644 htdocs/langs/es_GT/accountancy.lang
 delete mode 100644 htdocs/langs/es_GT/compta.lang
 delete mode 100644 htdocs/langs/es_GT/products.lang
 create mode 100644 htdocs/langs/es_GT/withdrawals.lang
 create mode 100644 htdocs/langs/es_HN/accountancy.lang
 delete mode 100644 htdocs/langs/es_HN/compta.lang
 delete mode 100644 htdocs/langs/es_HN/products.lang
 create mode 100644 htdocs/langs/es_HN/withdrawals.lang
 create mode 100644 htdocs/langs/es_PA/accountancy.lang
 delete mode 100644 htdocs/langs/es_PA/compta.lang
 delete mode 100644 htdocs/langs/es_PA/products.lang
 create mode 100644 htdocs/langs/es_PA/withdrawals.lang
 create mode 100644 htdocs/langs/es_PE/withdrawals.lang
 create mode 100644 htdocs/langs/es_PY/accountancy.lang
 delete mode 100644 htdocs/langs/es_PY/compta.lang
 delete mode 100644 htdocs/langs/es_PY/products.lang
 create mode 100644 htdocs/langs/es_PY/withdrawals.lang
 create mode 100644 htdocs/langs/es_US/accountancy.lang
 delete mode 100644 htdocs/langs/es_US/compta.lang
 delete mode 100644 htdocs/langs/es_US/products.lang
 create mode 100644 htdocs/langs/es_US/withdrawals.lang
 create mode 100644 htdocs/langs/es_UY/accountancy.lang
 delete mode 100644 htdocs/langs/es_UY/compta.lang
 delete mode 100644 htdocs/langs/es_UY/products.lang
 create mode 100644 htdocs/langs/es_UY/withdrawals.lang
 create mode 100644 htdocs/langs/es_VE/accountancy.lang
 delete mode 100644 htdocs/langs/fr_BE/products.lang
 create mode 100644 htdocs/langs/fr_CH/accountancy.lang
 delete mode 100644 htdocs/langs/fr_CH/compta.lang
 delete mode 100644 htdocs/langs/fr_CH/products.lang
 create mode 100644 htdocs/langs/fr_CH/withdrawals.lang
 create mode 100644 htdocs/langs/fr_CI/accountancy.lang
 delete mode 100644 htdocs/langs/fr_CI/compta.lang
 delete mode 100644 htdocs/langs/fr_CI/products.lang
 create mode 100644 htdocs/langs/fr_CI/withdrawals.lang
 create mode 100644 htdocs/langs/fr_CM/accountancy.lang
 delete mode 100644 htdocs/langs/fr_CM/compta.lang
 delete mode 100644 htdocs/langs/fr_CM/products.lang
 create mode 100644 htdocs/langs/fr_CM/withdrawals.lang
 create mode 100644 htdocs/langs/fr_GA/accountancy.lang
 delete mode 100644 htdocs/langs/fr_GA/compta.lang
 delete mode 100644 htdocs/langs/fr_GA/products.lang
 create mode 100644 htdocs/langs/fr_GA/withdrawals.lang
 delete mode 100644 htdocs/langs/it_CH/compta.lang
 delete mode 100644 htdocs/langs/it_CH/products.lang
 create mode 100644 htdocs/langs/nl_BE/exports.lang
 create mode 100644 htdocs/langs/nl_BE/externalsite.lang
 create mode 100644 htdocs/langs/nl_BE/withdrawals.lang
 create mode 100644 htdocs/langs/pt_AO/main.lang
 delete mode 100644 htdocs/langs/ru_UA/products.lang

diff --git a/htdocs/langs/am_ET/accountancy.lang b/htdocs/langs/am_ET/accountancy.lang
index 3211a0b62df..33ba4d9fea7 100644
--- a/htdocs/langs/am_ET/accountancy.lang
+++ b/htdocs/langs/am_ET/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/am_ET/admin.lang b/htdocs/langs/am_ET/admin.lang
index f1c41a3b62b..189b0b5186a 100644
--- a/htdocs/langs/am_ET/admin.lang
+++ b/htdocs/langs/am_ET/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=List of OpenDocument templates directories
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Position of Name/Lastname
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu handler where to show new menu
 DetailMenuModule=Module name if menu entry come from a module
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/am_ET/banks.lang b/htdocs/langs/am_ET/banks.lang
index 9500a5b8b2e..a0dc27f86c4 100644
--- a/htdocs/langs/am_ET/banks.lang
+++ b/htdocs/langs/am_ET/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/am_ET/blockedlog.lang b/htdocs/langs/am_ET/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/am_ET/blockedlog.lang
+++ b/htdocs/langs/am_ET/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/am_ET/boxes.lang b/htdocs/langs/am_ET/boxes.lang
index d6fd298a3a7..7db4ea8aa17 100644
--- a/htdocs/langs/am_ET/boxes.lang
+++ b/htdocs/langs/am_ET/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/am_ET/cashdesk.lang b/htdocs/langs/am_ET/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/am_ET/cashdesk.lang
+++ b/htdocs/langs/am_ET/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/am_ET/categories.lang b/htdocs/langs/am_ET/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/am_ET/categories.lang
+++ b/htdocs/langs/am_ET/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/am_ET/companies.lang b/htdocs/langs/am_ET/companies.lang
index dadff6a7894..8dc815b522e 100644
--- a/htdocs/langs/am_ET/companies.lang
+++ b/htdocs/langs/am_ET/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/am_ET/compta.lang b/htdocs/langs/am_ET/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/am_ET/compta.lang
+++ b/htdocs/langs/am_ET/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/am_ET/cron.lang b/htdocs/langs/am_ET/cron.lang
index 1de1251831a..2ebdda1e685 100644
--- a/htdocs/langs/am_ET/cron.lang
+++ b/htdocs/langs/am_ET/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup=Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
 CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Number of launches
 CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -56,7 +58,7 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
 DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/am_ET/errors.lang b/htdocs/langs/am_ET/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/am_ET/errors.lang
+++ b/htdocs/langs/am_ET/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
 ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/am_ET/exports.lang b/htdocs/langs/am_ET/exports.lang
index 3549e3f8b23..a0eb7161ef2 100644
--- a/htdocs/langs/am_ET/exports.lang
+++ b/htdocs/langs/am_ET/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/am_ET/mails.lang b/htdocs/langs/am_ET/mails.lang
index 1235eef3b27..7fd93be7b71 100644
--- a/htdocs/langs/am_ET/mails.lang
+++ b/htdocs/langs/am_ET/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/am_ET/main.lang b/htdocs/langs/am_ET/main.lang
index 96c68cdcfa3..e196120c27d 100644
--- a/htdocs/langs/am_ET/main.lang
+++ b/htdocs/langs/am_ET/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/am_ET/modulebuilder.lang b/htdocs/langs/am_ET/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/am_ET/modulebuilder.lang
+++ b/htdocs/langs/am_ET/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/am_ET/other.lang b/htdocs/langs/am_ET/other.lang
index 54c0572d453..0a7b3723ab1 100644
--- a/htdocs/langs/am_ET/other.lang
+++ b/htdocs/langs/am_ET/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/am_ET/products.lang b/htdocs/langs/am_ET/products.lang
index 18af7f2f252..f0c4a5362b8 100644
--- a/htdocs/langs/am_ET/products.lang
+++ b/htdocs/langs/am_ET/products.lang
@@ -109,6 +109,7 @@ MultiPricesAbility=Multiple price segments per product/service (each customer is
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
 AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/am_ET/recruitment.lang b/htdocs/langs/am_ET/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/am_ET/recruitment.lang
+++ b/htdocs/langs/am_ET/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/am_ET/sendings.lang b/htdocs/langs/am_ET/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/am_ET/sendings.lang
+++ b/htdocs/langs/am_ET/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Other shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Shipments to validate
 StatusSendingCanceled=Canceled
+StatusSendingCanceledShort=Canceled
 StatusSendingDraft=Draft
 StatusSendingValidated=Validated (products to ship or already shipped)
 StatusSendingProcessed=Processed
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/am_ET/stocks.lang b/htdocs/langs/am_ET/stocks.lang
index 660443bcded..6cf089096dd 100644
--- a/htdocs/langs/am_ET/stocks.lang
+++ b/htdocs/langs/am_ET/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/am_ET/ticket.lang b/htdocs/langs/am_ET/ticket.lang
index 59519282c80..982fff90ffa 100644
--- a/htdocs/langs/am_ET/ticket.lang
+++ b/htdocs/langs/am_ET/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/am_ET/website.lang b/htdocs/langs/am_ET/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/am_ET/website.lang
+++ b/htdocs/langs/am_ET/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/am_ET/withdrawals.lang b/htdocs/langs/am_ET/withdrawals.lang
index 114a8d9dd6c..e3bec6f9cb8 100644
--- a/htdocs/langs/am_ET/withdrawals.lang
+++ b/htdocs/langs/am_ET/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index 0809eff3c9f..6395f2a0846 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=التاريخ
 Docref=مرجع
 LabelAccount=حساب التسمية
 LabelOperation=Label operation
-Sens=السيناتور
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=دفتر اليومية
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=لم يتم تسويتة
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 6b8e53c6c3b..ed58bd93d71 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -56,6 +56,8 @@ GUISetup=العرض
 SetupArea=التثبيت
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=نموذج لاختبار تحميل ملف (وفقا لبرنامج الإعداد)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=ملاحظة : نعم فعالة فقط في حال كان النموذج <b>%s</b> مفعل
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=آظهر المعاينة
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=المعاينة غير متاحة
 ThemeCurrentlyActive=الثيم النشط حالياً
-CurrentTimeZone=حسب توقيت خادم البي إتش بي
 MySQLTimeZone=والوقت مسقل (قاعدة بيانات)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=فراغ
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=أحذف
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=إحذف الآن
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=الشركاء المفضلين
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=للمستخدم أو وثائق المطور (الوثيقة، أسئلة وأجوبة ...)، <br> نلقي نظرة على Dolibarr يكي: <br> <b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=عن أي أسئلة أخرى / مساعدة، يمكنك استخدام المنتدى Dolibarr: <br> <b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=قائمة الدلائل المفتوحة قوالب
 ListOfDirectoriesForModelGenODT=قائمة الدلائل التي تحتوي على قوالب ملفات مع شكل المفتوحة. <br><br> ضع هنا المسار الكامل من الدلائل. <br> إضافة إرجاع بين الدليل ايه. <br> لإضافة دليل وحدة GED، أضيف هنا <b>DOL_DATA_ROOT / ECM / yourdirectoryname.</b> <br><br> الملفات في هذه الدلائل يجب أن ينتهي <b>.odt</b> أو <b>.ods.</b>
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=أمثلة على بناء الجملة : <br> ج : mydir \\ <br> / الوطن / mydir <br> DOL_DATA_ROOT / إدارة المحتوى في المؤسسة / ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> لمعرفة كيفية إنشاء قوالب المستند ODT، قبل تخزينها في تلك الدلائل، وقراءة وثائق ويكي:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=موقف الإسم / اسم
@@ -406,7 +408,7 @@ UrlGenerationParameters=المعلمات لتأمين عناوين المواق
 SecurityTokenIsUnique=استخدام معلمة securekey فريدة لكل URL
 EnterRefToBuildUrl=أدخل مرجع لكائن %s
 GetSecuredUrl=الحصول على عنوان محسوب
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=معدل ضريبة القيمة المضافة القديم
 NewVATRates=معدل ضريبة القيمة المضافة الجديد
 PriceBaseTypeToChange=تعديل على الأسعار مع القيمة المرجعية قاعدة المعرفة على
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=قائمة جديدة
 MenuHandler=قائمة مناول
 MenuModule=مصدر في وحدة
-HideUnauthorizedMenu= إخفاء القوائم غير المصرح به (الرمادي)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=معرف القائمة
 DetailMenuHandler=قائمة المعالج حيث تظهر قائمة جديدة
 DetailMenuModule=اسم وحدة قائمة في حال الدخول من وحدة
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=الرمز البريدي
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/ar_SA/banks.lang b/htdocs/langs/ar_SA/banks.lang
index 5b82860bea7..1ad6f3dfe9d 100644
--- a/htdocs/langs/ar_SA/banks.lang
+++ b/htdocs/langs/ar_SA/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=تفويض سيبا الخاص بك
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/ar_SA/blockedlog.lang b/htdocs/langs/ar_SA/blockedlog.lang
index 5f6dd79f6f5..2f01fbe9817 100644
--- a/htdocs/langs/ar_SA/blockedlog.lang
+++ b/htdocs/langs/ar_SA/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/ar_SA/boxes.lang b/htdocs/langs/ar_SA/boxes.lang
index 58b9e904429..95dace869cc 100644
--- a/htdocs/langs/ar_SA/boxes.lang
+++ b/htdocs/langs/ar_SA/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=النشاط العالمي (الفواتير والمقترحات والطلبات)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=المهام المجدولة
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=أية إشارات محددة.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=المحاسبة
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/ar_SA/cashdesk.lang b/htdocs/langs/ar_SA/cashdesk.lang
index bdad092c1c5..0fdc5513233 100644
--- a/htdocs/langs/ar_SA/cashdesk.lang
+++ b/htdocs/langs/ar_SA/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=ملاحظة : من الفواتير
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/ar_SA/categories.lang b/htdocs/langs/ar_SA/categories.lang
index fa97cbaba63..ffc098c9333 100644
--- a/htdocs/langs/ar_SA/categories.lang
+++ b/htdocs/langs/ar_SA/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=منطقة علامات / فئات المشاريع
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=قائمة العلامات / الفئات
+CatListAll=List of tags/categories (all types)
 NewCategory=علامة / فئة جديدة
 ModifCat=تعديل العلامة / الفئة
 CatCreated=تم إنشاء العلامة / الفئة
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=معرف العلامة / الفئة 
-CatSupList=List of vendor tags/categories
-CatCusList=قائمة  علامات / فئات العملاء / احتمال
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=قائمة علامات / فئات المنتجات 
 CatMemberList=قائمة علامات / فئات الأعضاء 
-CatContactList=قائمة  اتصال العلامات / الفئات 
-CatSupLinks=الروابط بين الموردين والعلامات / الفئات
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=الروابط بين العملاء / احتمال والعلامات / فئات
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=الروابط بين المنتجات / الخدمات والعلامات / الفئات
-CatProJectLinks=الروابط بين المشاريع والعلامات / الفئات
+CatMembersLinks=الروابط بين أفراد والعلامات / فئات
+CatProjectsLinks=الروابط بين المشاريع والعلامات / الفئات
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=إزالة من العلامة / الفئة
 ExtraFieldsCategories=سمات تكميلية
 CategoriesSetup=إعداد العلامات / الفئات 
diff --git a/htdocs/langs/ar_SA/companies.lang b/htdocs/langs/ar_SA/companies.lang
index a17eed9cf32..4c65642bdba 100644
--- a/htdocs/langs/ar_SA/companies.lang
+++ b/htdocs/langs/ar_SA/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=وليس من الممكن التحقق. تأكد من خدمة لا تقدمها دولة عضو (في المائة).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=الموظفين
 ProspectLevelShort=المحتملة
diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang
index b83bfef9a8a..7b8dd642c33 100644
--- a/htdocs/langs/ar_SA/compta.lang
+++ b/htdocs/langs/ar_SA/compta.lang
@@ -111,7 +111,7 @@ Refund=رد
 SocialContributionsPayments=الاجتماعية المدفوعات / الضرائب المالية
 ShowVatPayment=وتظهر دفع ضريبة القيمة المضافة
 TotalToPay=على دفع ما مجموعه
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=الزبون. حساب. رمز
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=هل أنت متأكد أنك تريد حذف /
 ExportDataset_tax_1=الضرائب والمدفوعات الاجتماعية والمالية
 CalcModeVATDebt=<b>الوضع٪ SVAT بشأن المحاسبة الالتزام٪ الصورة.</b>
 CalcModeVATEngagement=وضع <b>SVAT٪ على مداخيل مصاريف٪ الصورة.</b>
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= <b>الوضع٪ زارة العلاقات الخارجية على فواتير العملاء - فواتير الموردين٪ الصورة</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=ميزان الإيرادات والمصروفات
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- المبالغ المبينة لمع جميع الضرائب المدرجة
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- ويشمل المدفوعات الحقيقية المحرز في الفواتير والمصاريف والضريبة على القيمة المضافة والرواتب. <br> - لأنه يقوم على مواعيد دفع الفواتير والمصاريف والضريبة على القيمة المضافة والرواتب. تاريخ التبرع للتبرع.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=تقرير RE طرف ثالث
 LT2ReportByCustomersES=تقرير من قبل طرف ثالث IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/ar_SA/cron.lang b/htdocs/langs/ar_SA/cron.lang
index 36980f15406..338d3adb957 100644
--- a/htdocs/langs/ar_SA/cron.lang
+++ b/htdocs/langs/ar_SA/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = إنشاء / تحديث المجدولة وظيفة
 Permission23103 = حذف مهمة مجدولة
 Permission23104 = تنفيذ مهمة مجدولة
 # Admin
-CronSetup= من المقرر إعداد إدارة العمل
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=أو لفحص وإطلاق وظيفة محددة
+CronSetup=من المقرر إعداد إدارة العمل
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=مفتاح أمان للURL لإطلاق كرون الوظائف
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=على بيئة يونكس يجب عليك استخدام دخول كرونتاب التالي لتشغيل سطر الأوامر كل 5 دقائق
-CronExplainHowToRunWin=على مايكروسوفت (TM) ويندوز environement يمكنك استخدام أدوات مهمة مجدولة لتشغيل سطر الأوامر كل 5 دقائق
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -42,10 +43,11 @@ CronModule=وحدة
 CronNoJobs=أي وظيفة سجلت
 CronPriority=الأولوية
 CronLabel=ملصق
-CronNbRun=ملحوظة. إطلاق
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=كل
 JobFinished=العمل بدأ وانتهى
+Scheduled=Scheduled
 #Page card
 CronAdd= إضافة وظائف
 CronEvery=العمل كل تنفيذ
@@ -56,16 +58,16 @@ CronNote=التعليق
 CronFieldMandatory=الحقول%s إلزامي
 CronErrEndDateStartDt=تاريخ نهاية لا يمكن أن يكون قبل تاريخ البدء
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=تمكين
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=يعطل
 CronTaskInactive=تم تعطيل هذه الوظائف
 CronId=هوية شخصية
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=سطر الأوامر لتنفيذ النظام.
 CronCreateJob=إنشاء مهمة مجدولة جديدة
 CronFrom=من عند
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=الأمر Shell
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=تعطيل وظيفة
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index 8348252dd0b..bf46cf3364d 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=أي خطأ، ونحن نلزم
 # Errors
 ErrorButCommitIsDone=تم العثور على أخطاء لكننا تحقق على الرغم من هذا
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=عنوان الموقع هو الخطأ %s
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=ادخل ٪ ق موجود بالفعل.
 ErrorGroupAlreadyExists=المجموعة ٪ ق موجود بالفعل.
 ErrorRecordNotFound=لم يتم العثور على السجل.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=تتطلب بعض المجالات لم تملأ.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=فشل إنشاء دليل. تأكد من أن خادم الويب المستخدم أذونات لكتابة وثائق Dolibarr في الدليل. إذا تم تمكين المعلم <b>safe_mode</b> على هذا PHP ، تحقق من أن ملفات Dolibarr php تملك لخدمة الويب المستخدم (أو مجموعة).
 ErrorNoMailDefinedForThisUser=البريد لا يعرف لهذا المستخدم
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=هذه الميزة تحتاج إلى تفعيل جافا سكريبت في العمل. هذا التغيير في البنية -- عرض.
 ErrorTopMenuMustHaveAParentWithId0=وهناك قائمة من نوع 'توب' لا يمكن أن يكون أحد الوالدين القائمة. 0 وضعت في القائمة أو الأم في اختيار قائمة من نوع 'اليسار'.
 ErrorLeftMenuMustHaveAParentId=وهناك قائمة من نوع 'اليسار' يجب أن يكون لها هوية الوالد.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=هذا الاسم الشخصي موجود مسبقا
 ErrorLDAPSetupNotComplete=Dolibarr - LDAP المطابقة وليس كاملا.
 ErrorLDAPMakeManualTest=ألف. ldif الملف قد ولدت في الدليل ٪ s. انها محاولة لتحميل يدويا من سطر في الحصول على مزيد من المعلومات عن الأخطاء.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=المرجع المستخدمة لإنشاء موجود بالفعل.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=تم تعيين كلمة مرور لهذا العضو. ومع ذلك، تم إنشاء أي حساب المستخدم. لذلك يتم تخزين كلمة المرور هذه ولكن لا يمكن استخدامها للدخول إلى Dolibarr. ويمكن استخدامه من قبل وحدة / واجهة خارجية ولكن إذا كنت لا تحتاج إلى تعريف أي تسجيل دخول أو كلمة المرور لأحد أفراد، يمكنك تعطيل خيار "إدارة تسجيل دخول لكل عضو" من إعداد وحدة الأعضاء. إذا كنت بحاجة إلى إدارة تسجيل الدخول ولكن لا تحتاج إلى أي كلمة المرور، يمكنك الحفاظ على هذا الحقل فارغا لتجنب هذا التحذير. ملاحظة: يمكن أيضا أن تستخدم البريد الإلكتروني لتسجيل الدخول إذا تم ربط عضو إلى المستخدم.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/ar_SA/exports.lang b/htdocs/langs/ar_SA/exports.lang
index d839282e9de..53ce1753324 100644
--- a/htdocs/langs/ar_SA/exports.lang
+++ b/htdocs/langs/ar_SA/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=حقل العنوان
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=المكتبة
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=خطوة
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/ar_SA/mails.lang b/htdocs/langs/ar_SA/mails.lang
index 8e4e3308318..61daa08322e 100644
--- a/htdocs/langs/ar_SA/mails.lang
+++ b/htdocs/langs/ar_SA/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=خط المستندات في ملف ٪
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=لا ترسل البريد الإلكتروني. مرسل سيئة أو البريد الإلكتروني المستلم. تحقق ملف تعريف المستخدم.
 # Module Notifications
 Notifications=الإخطارات
-NoNotificationsWillBeSent=إشعارات البريد الإلكتروني لا يجري التخطيط لهذا الحدث ، وشركة
-ANotificationsWillBeSent=1 سيتم إرسال الإشعار عن طريق البريد الإلكتروني
-SomeNotificationsWillBeSent=ق ٪ سوف يتم إرسال الإخطارات عبر البريد الإلكتروني
-AddNewNotification=تفعيل هدفا إشعار البريد الإلكتروني الجديد
-ListOfActiveNotifications=List all active targets for email notification
-ListOfNotificationsDone=أرسلت قائمة جميع اشعارات بالبريد الالكتروني
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=وقد تم تكوين إرسال البريد الإلكتروني الإعداد ل'٪ ق'. هذا الوضع لا يمكن أن تستخدم لإرسال إرساله عبر البريد الإلكتروني الشامل.
 MailSendSetupIs2=يجب عليك أولا الذهاب، مع حساب مشرف، في القائمة٪ sHome - إعداد - رسائل البريد الإلكتروني٪ s إلى تغيير المعلمة <strong>'٪ ق'</strong> لاستخدام وضع '٪ ق'. مع هذا الوضع، يمكنك إدخال الإعداد خادم SMTP المقدمة من قبل موفر خدمة الإنترنت واستخدام قداس ميزة البريد الإلكتروني.
 MailSendSetupIs3=إذا كان لديك أي أسئلة حول كيفية إعداد ملقم SMTP الخاص بك، يمكنك أن تطلب إلى٪ s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=معلومات
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index 7e4057e374a..4de3c2e8526 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=لا يوجد ترجمة
 Translation=الترجمة
+CurrentTimeZone=حسب توقيت خادم البي إتش بي
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=لا يوجد سجلات
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=يتم اختيار ملف لمرفق ولكن لم تحمي
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=قراءة المساعدة
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=سجل حفظ
 RecordDeleted=سجل محذوف
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=خيار
+Filters=Filters
 List=قائمة
 FullList=القائمة الكاملة
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=إرسال بريد إلكتروني
 Email=Email
 NoEMail=أي بريد إلكتروني
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=لا هاتف المحمول
 Owner=مالك
 FollowingConstantsWillBeSubstituted=الثوابت التالية ستكون بديلا المقابلة القيمة.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=في الانتظار
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/ar_SA/modulebuilder.lang b/htdocs/langs/ar_SA/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/ar_SA/modulebuilder.lang
+++ b/htdocs/langs/ar_SA/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang
index cd09294d71d..9087f403bbb 100644
--- a/htdocs/langs/ar_SA/other.lang
+++ b/htdocs/langs/ar_SA/other.lang
@@ -5,8 +5,6 @@ Tools=أدوات
 TMenuTools=أدوات
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=عيد ميلاد
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=عيد ميلاد النشطة في حالة تأهب
 BirthdayAlertOff=عيد الميلاد فى حالة تأهب الخاملة
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=حق
 CalculatedWeight=يحسب الوزن
 CalculatedVolume=يحسب حجم
 Weight=وزن
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=كجم
 WeightUnitg=ز
 WeightUnitmg=مغلم
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=صادرات المنطقة
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index 0db9c6d5673..fcb5ba21081 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=عدد من السعر
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=عدد منتج التعبئة الاب
@@ -167,8 +168,10 @@ BuyingPrices=شراء أسعار
 CustomerPrices=أسعار العميل
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=بلد المنشأ
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=استخدم السعر الثابت
 PriceByQuantity=أسعار مختلفة حسب الكمية
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=مدى الكمية
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=٪٪ الاختلاف على الصورة٪
 PercentDiscountOver=٪٪ خصم أكثر من٪ الصورة
diff --git a/htdocs/langs/ar_SA/recruitment.lang b/htdocs/langs/ar_SA/recruitment.lang
index 9c348486cdb..43d1e0fbc55 100644
--- a/htdocs/langs/ar_SA/recruitment.lang
+++ b/htdocs/langs/ar_SA/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/ar_SA/sendings.lang b/htdocs/langs/ar_SA/sendings.lang
index 64db057f549..b18d5eb4842 100644
--- a/htdocs/langs/ar_SA/sendings.lang
+++ b/htdocs/langs/ar_SA/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=الإرسال الأخرى لهذا النظام
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=للمصادقة على إرسال
 StatusSendingCanceled=ألغيت
+StatusSendingCanceledShort=ألغيت
 StatusSendingDraft=مسودة
 StatusSendingValidated=صادق (لشحن المنتجات أو شحنها بالفعل)
 StatusSendingProcessed=معالجة
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=أكمل نموذج لتسليم وثيقة من وثائق الإيصالات (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER ثابت لم تحدد
 SumOfProductVolumes=مجموع أحجام المنتج
 SumOfProductWeights=مجموع الأوزان المنتج
diff --git a/htdocs/langs/ar_SA/stocks.lang b/htdocs/langs/ar_SA/stocks.lang
index 09cf9dbae0b..2cae290ca53 100644
--- a/htdocs/langs/ar_SA/stocks.lang
+++ b/htdocs/langs/ar_SA/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/ar_SA/ticket.lang b/htdocs/langs/ar_SA/ticket.lang
index bbaece1060f..307fdeb1792 100644
--- a/htdocs/langs/ar_SA/ticket.lang
+++ b/htdocs/langs/ar_SA/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=الآخر
 TicketSeverityShortLOW=منخفض
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=عال
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=قرأ
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/ar_SA/website.lang b/htdocs/langs/ar_SA/website.lang
index f271ef38fe8..7bf9189512a 100644
--- a/htdocs/langs/ar_SA/website.lang
+++ b/htdocs/langs/ar_SA/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=صفحة
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/ar_SA/withdrawals.lang b/htdocs/langs/ar_SA/withdrawals.lang
index bbf352bb2b2..0976b9ba4be 100644
--- a/htdocs/langs/ar_SA/withdrawals.lang
+++ b/htdocs/langs/ar_SA/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=تصنيف حساب
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=لم يتم تعيين خيار الوضع الحقيقي، ونحن بعد توقف هذه المحاكاة
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/az_AZ/accountancy.lang b/htdocs/langs/az_AZ/accountancy.lang
index 3211a0b62df..33ba4d9fea7 100644
--- a/htdocs/langs/az_AZ/accountancy.lang
+++ b/htdocs/langs/az_AZ/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/az_AZ/admin.lang b/htdocs/langs/az_AZ/admin.lang
index f1c41a3b62b..189b0b5186a 100644
--- a/htdocs/langs/az_AZ/admin.lang
+++ b/htdocs/langs/az_AZ/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=List of OpenDocument templates directories
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Position of Name/Lastname
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu handler where to show new menu
 DetailMenuModule=Module name if menu entry come from a module
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/az_AZ/banks.lang b/htdocs/langs/az_AZ/banks.lang
index 9500a5b8b2e..a0dc27f86c4 100644
--- a/htdocs/langs/az_AZ/banks.lang
+++ b/htdocs/langs/az_AZ/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/az_AZ/blockedlog.lang b/htdocs/langs/az_AZ/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/az_AZ/blockedlog.lang
+++ b/htdocs/langs/az_AZ/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/az_AZ/boxes.lang b/htdocs/langs/az_AZ/boxes.lang
index d6fd298a3a7..7db4ea8aa17 100644
--- a/htdocs/langs/az_AZ/boxes.lang
+++ b/htdocs/langs/az_AZ/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/az_AZ/cashdesk.lang b/htdocs/langs/az_AZ/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/az_AZ/cashdesk.lang
+++ b/htdocs/langs/az_AZ/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/az_AZ/categories.lang b/htdocs/langs/az_AZ/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/az_AZ/categories.lang
+++ b/htdocs/langs/az_AZ/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/az_AZ/companies.lang b/htdocs/langs/az_AZ/companies.lang
index dadff6a7894..8dc815b522e 100644
--- a/htdocs/langs/az_AZ/companies.lang
+++ b/htdocs/langs/az_AZ/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/az_AZ/compta.lang b/htdocs/langs/az_AZ/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/az_AZ/compta.lang
+++ b/htdocs/langs/az_AZ/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/az_AZ/cron.lang b/htdocs/langs/az_AZ/cron.lang
index 1de1251831a..2ebdda1e685 100644
--- a/htdocs/langs/az_AZ/cron.lang
+++ b/htdocs/langs/az_AZ/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup=Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
 CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Number of launches
 CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -56,7 +58,7 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
 DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/az_AZ/errors.lang b/htdocs/langs/az_AZ/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/az_AZ/errors.lang
+++ b/htdocs/langs/az_AZ/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
 ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/az_AZ/exports.lang b/htdocs/langs/az_AZ/exports.lang
index 3549e3f8b23..a0eb7161ef2 100644
--- a/htdocs/langs/az_AZ/exports.lang
+++ b/htdocs/langs/az_AZ/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/az_AZ/mails.lang b/htdocs/langs/az_AZ/mails.lang
index 1235eef3b27..7fd93be7b71 100644
--- a/htdocs/langs/az_AZ/mails.lang
+++ b/htdocs/langs/az_AZ/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/az_AZ/main.lang b/htdocs/langs/az_AZ/main.lang
index 96c68cdcfa3..e196120c27d 100644
--- a/htdocs/langs/az_AZ/main.lang
+++ b/htdocs/langs/az_AZ/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/az_AZ/modulebuilder.lang b/htdocs/langs/az_AZ/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/az_AZ/modulebuilder.lang
+++ b/htdocs/langs/az_AZ/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/az_AZ/other.lang b/htdocs/langs/az_AZ/other.lang
index 54c0572d453..0a7b3723ab1 100644
--- a/htdocs/langs/az_AZ/other.lang
+++ b/htdocs/langs/az_AZ/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/az_AZ/products.lang b/htdocs/langs/az_AZ/products.lang
index 97db059594f..f0c4a5362b8 100644
--- a/htdocs/langs/az_AZ/products.lang
+++ b/htdocs/langs/az_AZ/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/az_AZ/recruitment.lang b/htdocs/langs/az_AZ/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/az_AZ/recruitment.lang
+++ b/htdocs/langs/az_AZ/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/az_AZ/sendings.lang b/htdocs/langs/az_AZ/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/az_AZ/sendings.lang
+++ b/htdocs/langs/az_AZ/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Other shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Shipments to validate
 StatusSendingCanceled=Canceled
+StatusSendingCanceledShort=Canceled
 StatusSendingDraft=Draft
 StatusSendingValidated=Validated (products to ship or already shipped)
 StatusSendingProcessed=Processed
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/az_AZ/stocks.lang b/htdocs/langs/az_AZ/stocks.lang
index 660443bcded..6cf089096dd 100644
--- a/htdocs/langs/az_AZ/stocks.lang
+++ b/htdocs/langs/az_AZ/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/az_AZ/ticket.lang b/htdocs/langs/az_AZ/ticket.lang
index 59519282c80..982fff90ffa 100644
--- a/htdocs/langs/az_AZ/ticket.lang
+++ b/htdocs/langs/az_AZ/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/az_AZ/website.lang b/htdocs/langs/az_AZ/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/az_AZ/website.lang
+++ b/htdocs/langs/az_AZ/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/az_AZ/withdrawals.lang b/htdocs/langs/az_AZ/withdrawals.lang
index 114a8d9dd6c..e3bec6f9cb8 100644
--- a/htdocs/langs/az_AZ/withdrawals.lang
+++ b/htdocs/langs/az_AZ/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
index 89ff86ac06d..19fcab09bc9 100644
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=Всички държави с изключение на %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Основна счетоводна сметка за клиенти, която не е дефинирана в настройката
 MainAccountForSuppliersNotDefined=Основна счетоводна сметка за доставчици, която не е дефинирана в настройката
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Не е свързан със счетоводната с
 XLineSuccessfullyBinded=%s продукти / услуги успешно са свързани към счетоводна сметка
 XLineFailedToBeBinded=%s продукти / услуги, които не са свързани с нито една счетоводна сметка
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Брой елементи за свързване, показани на страница (препоръчително: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Започнете сортирането на страницата „За свързване“, използвайки най-новите елементи
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Започнете сортирането на страницата „Извършено свързване“, използвайки най-новите елементи
 
@@ -198,7 +199,8 @@ Docdate=Дата
 Docref=Референция
 LabelAccount=Име на сметка
 LabelOperation=Име на операция
-Sens=Значение
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Буквен код
 Lettering=Означение
 Codejournal=Журнал
@@ -206,7 +208,8 @@ JournalLabel=Име на журнал
 NumPiece=Пореден номер
 TransactionNumShort=Транзакция №
 AccountingCategory=Персонализирани групи
-GroupByAccountAccounting=Групиране по счетоводна сметка
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Тук може да определите някои групи счетоводни сметки. Те ще бъдат използвани за персонализирани счетоводни отчети.
 ByAccounts=По сметки
 ByPredefinedAccountGroups=По предварително определени групи
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Плащането не е свързано с нит
 OpeningBalance=Начално салдо
 ShowOpeningBalance=Показване на баланс при откриване
 HideOpeningBalance=Скриване на баланс при откриване
-ShowSubtotalByGroup=Показване на междинна сума по групи
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Група от сметки
 PcgtypeDesc=Групата от сметки се използва като предварително зададен критерий за филтриране и групиране за някои счетоводни отчети. Например 'Приход' или 'Разход' се използват като групи за счетоводни сметки на продукти за съставяне на отчет за разходи / приходи.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Преглед на списъка с редове на
 DescVentilExpenseReportMore=Ако настроите счетоводна сметка за видовете разходен отчет, то системата ще може да извърши всички свързвания между редовете на разходния отчет и счетоводната сметка във вашия сметкоплан, просто с едно щракване с бутона <strong>"%s"</strong>. Ако сметката не е зададена в речника с таксите или ако все още имате някои редове, които не са свързани с нито една сметка ще трябва да направите ръчно свързване от менюто "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Преглед на списъка с редове на разходни отчети и тяхната счетоводна сметка за такса
 
+Closure=Annual closure
 DescClosure=Преглед на броя движения за месец, които не са валидирани за активните фискални години
 OverviewOfMovementsNotValidated=Стъпка 1 / Преглед на движенията, които не са валидирани (необходимо за приключване на фискална година)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Валидиране на движения
 DescValidateMovements=Всякакви промени или изтриване на написаното ще бъдат забранени. Всички записи за изпълнение трябва да бъдат валидирани, в противен случай приключването няма да е възможно.
-SelectMonthAndValidate=Изберете месец и валидирайте движенията
 
 ValidateHistory=Автоматично свързване
 AutomaticBindingDone=Автоматичното свързване завърши
@@ -293,6 +298,7 @@ Accounted=Осчетоводено в книгата
 NotYetAccounted=Все още не е осчетоводено в книгата
 ShowTutorial=Показване на урок
 NotReconciled=Не е съгласувано
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Експортиране за LD Compta (v10 и по-нов
 Modelcsv_openconcerto=Експортиране за OpenConcerto (Тест)
 Modelcsv_configurable=Експортиране в конфигурируем CSV
 Modelcsv_FEC=Експортиране за FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Експортиране за Sage 50 Швейцария
 Modelcsv_winfic=Експортиране за Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index d40a4f22556..49fa2fa380a 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Интерфейс
 SetupArea=Настройки
 UploadNewTemplate=Качване на нов(и) шаблон(и)
 FormToTestFileUploadForm=Формуляр за тестване на качването на файлове (според настройката)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Забележка: Ефективно е само ако модула <b>%s</b> е активиран
 RemoveLock=Премахнете / преименувайте файла <b>%s</b>, ако съществува, за да разрешите използването на инструмента за инсталиране / актуализиране.
 RestoreLock=Възстановете файла <b>%s</b> с права само за четене, за да забраните по-нататъшното използване на инструмента за инсталиране / актуализиране.
@@ -85,7 +87,6 @@ ShowPreview=Показване на преглед
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Прегледът не е налице
 ThemeCurrentlyActive=Темата е активна в момента
-CurrentTimeZone=Времева зона на PHP (сървър)
 MySQLTimeZone=Времева зона на MySql (база данни)
 TZHasNoEffect=Датите се съхраняват и връщат от сървъра на базата данни така, сякаш се съхраняват като подаден низ. Часовата зона има ефект само когато се използва функцията UNIX_TIMESTAMP (която не трябва да се използва от Dolibarr, така че базата данни TZ не трябва да има ефект, дори ако бъде променена след въвеждането на данните).
 Space=Пространство
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Тази секция осигурява администр
 Purge=Разчистване
 PurgeAreaDesc=Тази страница ви позволява да изтриете всички файлове, генерирани или съхранени от Dolibarr (временни файлове или всички файлове в директорията <b>%s</b>). Използването на тази функция обикновено не е необходимо. Той се предоставя като решение за потребители, чиито Dolibarr се хоства от доставчик, който не предлага разрешения за изтриване на файлове, генерирани от уеб сървъра.
 PurgeDeleteLogFile=Изтриване на лог файлове, включително <b>%s</b> генериран от Debug Logs модула (няма риск от загуба на данни)
-PurgeDeleteTemporaryFiles=Изтриване на всички временни файлове (няма риск от загуба на данни). Забележка: Изтриването се извършва, само ако директорията temp е създадена преди 24 часа.
-PurgeDeleteTemporaryFilesShort=Изтриване на временни файлове
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Изтриване на  всички файлове в директорията: <b>%s</b>.<br>Това ще изтрие всички генерирани документи, свързани с елементи (контрагенти, фактури и т.н.), файлове, качени чрез ECM модула, архиви на базата данни и временни файлове.
 PurgeRunNow=Разчисти сега
 PurgeNothingToDelete=Няма директория или файлове за изтриване.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Предпочитани партньори
 OtherResources=Други ресурси
 ExternalResources=Външни ресурси
 SocialNetworks=Социални мрежи
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=За потребителска документация и такава за разработчици (документи, често задавани въпроси,...), <br> погледнете в Dolibarr Wiki: <br> <b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=За всякакви други въпроси / помощ може да използвате Dolibarr форума: <br> <b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Ресурси за получаване на помощ и поддръжка относно Dolibarr
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Примери с текуща конфигурация
 ListOfDirectories=Списък на директории с OpenDocument шаблони
 ListOfDirectoriesForModelGenODT=Списък на директории, съдържащи файлове с шаблони във формат OpenDocument. <br><br> Попълнете тук пълния път на директориите. <br> Добавете нов ред за всяка директория. <br> За да включите директория на GED модула, добавете тук <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br> Файловете в тези директории трябва да завършват на <b>.odt</b> или <b>.ods</b>.
 NumberOfModelFilesFound=Брой файлове с шаблони за ODT/ODS, намерени в тези директории
-ExampleOfDirectoriesForModelGen=Примери за синтаксис: <br> C:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>За да узнаете как да създадете вашите ODT шаблони за документи преди да ги съхраните в тези директории прочетете Wiki документацията:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Позиция на име / фамилия
@@ -406,7 +408,7 @@ UrlGenerationParameters=Параметри за защитени URL адрес
 SecurityTokenIsUnique=Използвайте уникален параметър за защитен ключ за всеки URL адрес
 EnterRefToBuildUrl=Въведете референция за обект %s
 GetSecuredUrl=Получете изчисления URL адрес
-ButtonHideUnauthorized=Скриване на бутоните за потребители, които не са администратори, вместо показване на сиви бутони.
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Първоначална ставка на ДДС
 NewVATRates=Нова ставка на ДДС
 PriceBaseTypeToChange=Променяне на цените с базова референтна стойност, определена на
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Персонализирани менюта, коит
 NewMenu=Ново меню
 MenuHandler=Манипулатор на меню
 MenuModule=Модул източник
-HideUnauthorizedMenu= Скриване на неоторизирани (сиви) менюта
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Идентификатор на меню
 DetailMenuHandler=Манипулатор на меню, в който да се покаже новото меню
 DetailMenuModule=Име на модула, ако входните данни на менюто идват от модул
@@ -1983,11 +1985,12 @@ EMailHost=Адрес на IMAP сървър
 MailboxSourceDirectory=Директория / Източник в пощенската кутия
 MailboxTargetDirectory=Директория / Цел в пощенската кутия
 EmailcollectorOperations=Операции за извършване от колекционера
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Максимален брой събрани имейли при колекциониране
 CollectNow=Колекциониране
 ConfirmCloneEmailCollector=Сигурни ли сте, че искате да клонирате имейл колектора %s?
-DateLastCollectResult=Дата на последен опит за колекциониране
-DateLastcollectResultOk=Дата на последно успешно колекциониране
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Последен резултат
 EmailCollectorConfirmCollectTitle=Потвърждение за колекциониране на имейли
 EmailCollectorConfirmCollect=Искате ли да стартирате колекционирането на този колекционер?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Код на меню (главно меню)
 ECMAutoTree=Показване на автоматично ECM дърво
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/bg_BG/banks.lang b/htdocs/langs/bg_BG/banks.lang
index 234d788aaa4..8fb17db8823 100644
--- a/htdocs/langs/bg_BG/banks.lang
+++ b/htdocs/langs/bg_BG/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA нареждане
 YourSEPAMandate=Вашите SEPA нареждания
 FindYourSEPAMandate=Това е вашето SEPA нареждане, с което да упълномощите нашата фирма да направи поръчка за директен дебит към вашата банка. Върнете го подписано (сканиран подписан документ) или го изпратете по пощата на
 AutoReportLastAccountStatement=Автоматично попълване на полето „номер на банково извлечение“ с последния номер на извлечение, когато правите съгласуване.
-CashControl=Лимит за плащане в брой на ПОС
-NewCashFence=Нов лимит за плащане в брой
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Оцветяване на движения
 BankColorizeMovementDesc=Ако тази функция е активирана може да изберете конкретен цвят на фона за дебитни или кредитни движения
 BankColorizeMovementName1=Цвят на фона за дебитно движение
diff --git a/htdocs/langs/bg_BG/blockedlog.lang b/htdocs/langs/bg_BG/blockedlog.lang
index 60c5d813935..892210b3ebb 100644
--- a/htdocs/langs/bg_BG/blockedlog.lang
+++ b/htdocs/langs/bg_BG/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Дарението е логически изтрито
 logMEMBER_SUBSCRIPTION_CREATE=Членският внос е създаден
 logMEMBER_SUBSCRIPTION_MODIFY=Членският внос е променен
 logMEMBER_SUBSCRIPTION_DELETE=Членският внос е логически изтрит
-logCASHCONTROL_VALIDATE=Регистриране на финансово престъпление
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Изтегляне на фактура за продажба
 BlockedLogBillPreview=Преглед на фактура за продажба
 BlockedlogInfoDialog=Подробности в регистъра
diff --git a/htdocs/langs/bg_BG/boxes.lang b/htdocs/langs/bg_BG/boxes.lang
index f360c2f0d01..927ca02c0f9 100644
--- a/htdocs/langs/bg_BG/boxes.lang
+++ b/htdocs/langs/bg_BG/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Дарения: %s последно промене
 BoxTitleLastModifiedExpenses=Разходни отчети: %s последно променени
 BoxTitleLatestModifiedBoms=Спецификации: %s последно променени
 BoxTitleLatestModifiedMos=Поръчки за производство: %s последно променени
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Глобална дейност (фактури, предложения, поръчки)
 BoxGoodCustomers=Добри клиенти
 BoxTitleGoodCustomers=%s Добри клиенти
+BoxScheduledJobs=Планирани задачи
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Неуспешно опресняване на RSS поток. Последното успешно опресняване е на дата: %s
 LastRefreshDate=Последна дата на опресняване
 NoRecordedBookmarks=Не са дефинирани отметки.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Не е дефинирана временна смет
 BoxLastCustomerShipments=Последни пратки към клиенти
 BoxTitleLastCustomerShipments=Пратки: %s последни към клиенти
 NoRecordedShipments=Няма регистрирани пратки към клиенти
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Счетоводство
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/bg_BG/cashdesk.lang b/htdocs/langs/bg_BG/cashdesk.lang
index a30ed1b0a22..a7d3530d1e3 100644
--- a/htdocs/langs/bg_BG/cashdesk.lang
+++ b/htdocs/langs/bg_BG/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Футър
 AmountAtEndOfPeriod=Сума в края на периода (ден, месец или година)
 TheoricalAmount=Теоретична сума
 RealAmount=Реална сума
-CashFence=Cash fence
-CashFenceDone=Парична граница за периода
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Брой фактури
 Paymentnumpad=Тип Pad за въвеждане на плащане
 Numberspad=Числов Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> тагът се използва за добавяне на номера на терминала
 TakeposGroupSameProduct=Групиране на едни и същи продукти
 StartAParallelSale=Стартиране на нова паралелна продажба
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Паричен отчет
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/bg_BG/categories.lang b/htdocs/langs/bg_BG/categories.lang
index 717f1a5fadd..54c706a7b42 100644
--- a/htdocs/langs/bg_BG/categories.lang
+++ b/htdocs/langs/bg_BG/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Секция с тагове / категории за п
 UsersCategoriesArea=Секция с тагове / категории за потребители
 SubCats=Подкатегории
 CatList=Списък с тагове / категории
+CatListAll=List of tags/categories (all types)
 NewCategory=Нов таг / категория
 ModifCat=Променяне на таг / категория
 CatCreated=Създаден е таг / категория
@@ -65,16 +66,22 @@ UsersCategoriesShort=Категории потребители
 StockCategoriesShort=Тагове / Категории
 ThisCategoryHasNoItems=Тази категория не съдържа никакви елементи
 CategId=Идентификатор на таг / категория
-CatSupList=Списък на тагове / категории за доставчици
-CatCusList=Списък на тагове / категории за клиенти / потенциални клиенти
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Списък на тагове / категории за продукти
 CatMemberList=Списък на тагове / категории за членове
-CatContactList=Списък на тагове / категории за контакти
-CatSupLinks=Връзки между доставчици и тагове / категории
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Връзки между клиенти / потенциални клиенти и тагове / категории
 CatContactsLinks=Връзки между контакти / адреси и тагове / категории
 CatProdLinks=Връзки между продукти / услуги и тагове / категории
-CatProJectLinks=Връзки между проекти и тагове / категории
+CatMembersLinks=Връзки между членове и етикети/категории
+CatProjectsLinks=Връзки между проекти и тагове / категории
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Изтриване от таг / категория
 ExtraFieldsCategories=Допълнителни атрибути
 CategoriesSetup=Настройка на тагове / категории
diff --git a/htdocs/langs/bg_BG/companies.lang b/htdocs/langs/bg_BG/companies.lang
index 267abddeb98..5acad41ae81 100644
--- a/htdocs/langs/bg_BG/companies.lang
+++ b/htdocs/langs/bg_BG/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Проверяване на вътрешно-общн
 VATIntraManualCheck=Може да проверите също така ръчно в интернет страницата на Европейската Комисия: <a href="%s" target="_blank"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Проверка не е възможна. Услугата за проверка не се предоставя от държавата-членка (%s).
 NorProspectNorCustomer=Нито потенциален клиент, нито клиент
-JuridicalStatus=Правна форма
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Служители
 ProspectLevelShort=Потенциал
diff --git a/htdocs/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang
index c9dd8bc51e4..177dc32434a 100644
--- a/htdocs/langs/bg_BG/compta.lang
+++ b/htdocs/langs/bg_BG/compta.lang
@@ -111,7 +111,7 @@ Refund=Възстановяване
 SocialContributionsPayments=Плащания на социални / фискални данъци
 ShowVatPayment=Показване на плащане на ДДС
 TotalToPay=Общо за плащане
-BalanceVisibilityDependsOnSortAndFilters=Балансът е видим в този списък само ако таблицата е сортирана възходящо на %s и филтрирана за 1 банкова сметка
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Счетоводен код на клиент
 SupplierAccountancyCode=Счетоводен код на доставчик
 CustomerAccountancyCodeShort=Счет. код на клиент
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Сигурни ли сте, че искате д
 ExportDataset_tax_1=Социални / фискални данъци и плащания
 CalcModeVATDebt=Режим <b>%sДДС върху осчетоводени задължения%s</b>
 CalcModeVATEngagement=Режим <b>%sДДС върху приходи - разходи%s</b>
-CalcModeDebt=Анализ на регистрирани фактури, включително на неосчетоводени в книгата
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Анализ на регистрирани плащания, включително на неосчетоводени в книгата
 CalcModeBookkeeping=Анализ на данни, регистрирани в таблицата на счетоводната книга.
 CalcModeLT1= Режим <b>%sRE върху фактури за продажба - фактури за доставка%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Баланс на приходи и разходи,
 AnnualByCompanies=Баланс на приходи и разходи, по предварително определени групи сметки
 AnnualByCompaniesDueDebtMode=Баланс на приходи и разходи, по предварително определени групи, режим <b>%sВземания - Дългове%s</b> или казано още <b>Осчетоводяване на вземания</b>.
 AnnualByCompaniesInputOutputMode=Баланс на приходи и разходи, по предварително определени групи, режим <b>%sПриходи - Разходи%s</b> или казано още <b>Касова отчетност</b>.
-SeeReportInInputOutputMode=Вижте %sанализа на плащанията%s за изчисляване на действителните плащания, дори и ако те все още не са осчетоводени в книгата.
-SeeReportInDueDebtMode=Вижте %sанализа на фактурите%s за изчисляване, който е базиран на регистираните фактури, дори и ако те все още не са осчетоводени в книгата.
-SeeReportInBookkeepingMode=Вижте <b>%sСчетоводния доклад%s</b> за изчисляване на <b>таблицата в счетоводната книга</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Посочените суми са с включени всички данъци
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- Включва реални плащания по фактури, разходи, ДДС и заплати<br>- Основава се на дата на плащане на фактури, разходи, ДДС и заплати. Дата на дарение за дарения.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Показва запис във вашата
 SeePageForSetup=Вижте менюто <a href="%s">%s</a> за настройка
 DepositsAreNotIncluded=- Не включва фактури за авансови плащания
 DepositsAreIncluded=- Включва фактури за авансови плащания
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Справка за данък 2 по контрагент
 LT2ReportByCustomers=Справка за данък 3 по контрагент
 LT1ReportByCustomersES=Справка за RE по контрагент
 LT2ReportByCustomersES=Справка за IRPF по контрагент
 VATReport=Справка за данък върху продажби
 VATReportByPeriods=Справка за данък върху продажби по периоди
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Справка за данък върху продажби по ставки
 VATReportByThirdParties=Справка за данък върху продажби по контрагенти
 VATReportByCustomers=Справка за данък върху продажби по клиенти
diff --git a/htdocs/langs/bg_BG/cron.lang b/htdocs/langs/bg_BG/cron.lang
index d762cb8a0ed..91af655214e 100644
--- a/htdocs/langs/bg_BG/cron.lang
+++ b/htdocs/langs/bg_BG/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Изтриване на планирани задачи
 Permission23104 = Стартиране на планирани задачи
 # Admin
 CronSetup=Настройки за управление на планирани задачи
-URLToLaunchCronJobs=URL адрес за проверка и стартиране на определени cron задачи
-OrToLaunchASpecificJob=Или за проверка и зареждане на специфична задача
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Защитен ключ на URL за зареждане на cron задачи
 FileToLaunchCronJobs=Команден ред за проверка и стартиране на определени cron задачи
 CronExplainHowToRunUnix=В Unix среда би трябвало да използвате следния crontab ред за изпълнение на командния ред на всеки 5 минути
 CronExplainHowToRunWin=В среда на Microsoft (tm) Windows можете да използвате инструментите за планирани задачи, за да стартирате командния ред на всеки 5 минути
 CronMethodDoesNotExists=Класът %s не съдържа метод %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Профилите на Cron задачите се дефинират в дескрипторния файл на модула. Когато модулът е активиран, те са заредени и достъпни, така че можете да администрирате задачите от менюто за администриране %s.
 CronJobProfiles=Списък на предварително определени профили на cron задачи
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Брой стартирания
 CronMaxRun=Максимален брой стартирания
 CronEach=Всеки
 JobFinished=Задачи заредени и приключили
+Scheduled=Scheduled
 #Page card
 CronAdd= Добавяне на задачи
 CronEvery=Изпълни задачата всеки
@@ -56,7 +58,7 @@ CronNote=Коментар
 CronFieldMandatory=Полета %s са задължителни
 CronErrEndDateStartDt=Крайната дата не може да бъде преди началната дата
 StatusAtInstall=Състояние при инсталиране на модула
-CronStatusActiveBtn=Активиране
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Деактивиране
 CronTaskInactive=Тази задача е деактивирана
 CronId=Идентификатор
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=Архивиране на локална база д
 MakeLocalDatabaseDump=Създаване на локална база данни. Параметрите са: компресия ('gz' or 'bz' or 'none'), вид архивиране ('mysql', 'pgsql', 'auto'), 1, 'auto' или име на файла за съхранение, брой резервни файлове, които да се запазят
 WarningCronDelayed=Внимание, за целите на изпълнението, каквато и да е следващата дата на изпълнение на активирани задачи, вашите задачи могат да бъдат забавени до максимум %s часа, преди да бъдат стартирани.
 DATAPOLICYJob=Почистване на данни и анонимност
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index 622d5c15041..aea2d732d1c 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Няма грешка, но се ангажираме.
 # Errors
 ErrorButCommitIsDone=Намерени са грешки, но ние валидираме въпреки това.
 ErrorBadEMail=Имейл %s е грешен
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=URL адрес %s е грешен
 ErrorBadValueForParamNotAString=Неправилна стойност за вашия параметър. Обикновено се добавя, когато преводът липсва.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Потребител %s вече съществува.
 ErrorGroupAlreadyExists=Група %s вече съществува.
 ErrorRecordNotFound=Записът не е намерен.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Някои задължителни полета не са 
 ErrorSubjectIsRequired=Необходима е тема на имейл
 ErrorFailedToCreateDir=Неуспешно създаване на директория. Уверете се, че уеб сървър потребител има разрешение да пишат в Dolibarr документи. Ако параметър <b>safe_mode</b> е разрешен в тази PHP, проверете дали Dolibarr PHP файлове притежава за потребителя на уеб сървъра (или група).
 ErrorNoMailDefinedForThisUser=Няма дефиниран имейл за този потребител
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Тази функция трябва ДжаваСкрипт да се активира, за да работят. Променете тази настройка - дисплей.
 ErrorTopMenuMustHaveAParentWithId0=Меню от тип 'Горно' не може да има главно меню. Поставете 0 за главно меню или изберете меню от тип 'Ляво'.
 ErrorLeftMenuMustHaveAParentId=Менюто на &quot;левицата&quot; тип трябва да имат родителски идентификатор.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Това име на профил вече същес
 ErrorLDAPSetupNotComplete=Dolibarr LDAP съвпадение не е пълна.
 ErrorLDAPMakeManualTest=. LDIF файл е генериран в директорията %s. Опитайте се да го заредите ръчно от командния ред, за да има повече информация за грешките,.
 ErrorCantSaveADoneUserWithZeroPercentage=Не може да се съхрани действие със „състояние не е стартирано“, ако е попълнено и поле „извършено от“.
-ErrorRefAlreadyExists=Ref използван за създаване вече съществува.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Моля, въведете името на банковото извлечение, където трябва да се докладва вписването (формат YYYYMM или YYYYMMDD)
 ErrorRecordHasChildren=Изтриването на записа не бе успешно, тъй като има някои наследени записи.
 ErrorRecordHasAtLeastOneChildOfType=Обектът има поне един наследен обект от тип %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Трябва да изберет
 ErrorDiscountLargerThanRemainToPaySplitItBefore=Отстъпката, която се опитвате да приложите, е по-голяма, отколкото оставащото за плащане. Разделете отстъпката преди това в 2 по-малки отстъпки.
 ErrorFileNotFoundWithSharedLink=Файлът не бе намерен. Може да е променен ключът за споделяне или файлът е премахнат наскоро.
 ErrorProductBarCodeAlreadyExists=Продуктовият баркод %s вече съществува за друга продуктова референция.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Обърнете внимание също така, че използването на виртуален продукт за автоматично увеличаване/намаляване на подпродукти не е възможно, когато поне един подпродукт (или подпродукт на подпродукти) се нуждае от партиден/сериен номер.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Описанието е задължително за редове със свободни продукти
 ErrorAPageWithThisNameOrAliasAlreadyExists=Страницата/контейнера <strong>%s</strong> има същото име или алтернативен псевдоним, който се опитвате да използвате
 ErrorDuringChartLoad=Грешка при зареждане на диаграмата на сметките. Ако някои сметки не са заредени, може да ги въведете ръчно.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Публичният интерфейс не е активиран
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Вашата стойност на PHP параметър upload_max_filesize (%s) е по-голяма от стойността на PHP параметър post_max_size (%s). Това не е последователна настройка.
 WarningPasswordSetWithNoAccount=За този член бе зададена парола. Въпреки това, не е създаден потребителски акаунт. Така че тази парола е съхранена, но не може да се използва за влизане в Dolibarr. Може да се използва от външен модул/интерфейс, но ако не е необходимо да дефинирате потребителско име или парола за член може да деактивирате опцията "Управление на вход за всеки член" от настройката на модула Членове. Ако трябва да управлявате вход, но не се нуждаете от парола, можете да запазите това поле празно, за да избегнете това предупреждение. Забележка: Имейлът може да се използва и като вход, ако членът е свързан с потребител.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Входните ви данни са п
 WarningAnEntryAlreadyExistForTransKey=Вече съществува запис за ключа за превод за този език
 WarningNumberOfRecipientIsRestrictedInMassAction=Внимание, броят на различните получатели е ограничен до <b>%s</b>, когато се използват масови действия в списъците
 WarningDateOfLineMustBeInExpenseReportRange=Внимание, датата на реда не е в обхвата на разходния отчет
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Проектът е приключен. Трябва първо да го активирате отново.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Някои банкови транзакции бяха премахнати, след което бе генерирана разписка, в която са включени. Броят на чековете и общата сума на разписката може да се различават от броя и общата сума в списъка.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/bg_BG/exports.lang b/htdocs/langs/bg_BG/exports.lang
index f54b6ab17aa..f371671587f 100644
--- a/htdocs/langs/bg_BG/exports.lang
+++ b/htdocs/langs/bg_BG/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Ключ (колона), който да се използв
 NbInsert=Брой вмъкнати редове: %s
 NbUpdate=Брой актуализирани редове: %s
 MultipleRecordFoundWithTheseFilters=Намерени са няколко записа с тези филтри: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/bg_BG/mails.lang b/htdocs/langs/bg_BG/mails.lang
index 998b2de9d97..cbadb96be42 100644
--- a/htdocs/langs/bg_BG/mails.lang
+++ b/htdocs/langs/bg_BG/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Имейли, въведени от потреб
 MailingModuleDescDolibarrUsers=Потребители с имейли
 MailingModuleDescThirdPartiesByCategories=Контрагенти (с категории)
 SendingFromWebInterfaceIsNotAllowed=Изпращането от уеб интерфейса не е позволено.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Ред %s във файл
@@ -125,12 +126,13 @@ TagMailtoEmail=Емейл на получателя (включително HTML
 NoEmailSentBadSenderOrRecipientEmail=Няма изпратени имейли. Неправилен имейл на подателя или получателя. Проверете потребителския профил.
 # Module Notifications
 Notifications=Известия
-NoNotificationsWillBeSent=За това събитие и този контрагент не са планирани известия по имейл
-ANotificationsWillBeSent=1 известие ще бъде изпратено по имейл
-SomeNotificationsWillBeSent=%s известия ще бъдат изпратени по имейл
-AddNewNotification=Активиране на ново имейл известяване за цел / събитие
-ListOfActiveNotifications=Списък на всички активни имейл известия за цели/събития
-ListOfNotificationsDone=Списък на всички изпратени имейл известия
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Конфигурацията за изпращане на имейл е настроена на '%s'. Този режим не може да се използва за изпращане на масови имейли.
 MailSendSetupIs2=Трябва първо да отидете с администраторски акаунт в меню %sНачало - Настройка - Имейли%s и да промените параметър <strong>'%s'</strong>, за да използвате режим '%s'. С този режим може да въведете настройки за SMTP сървъра, предоставен от вашия доставчик на интернет услуги и да използвате функцията за изпращане на масови имейли.
 MailSendSetupIs3=Ако имате някакви въпроси как да настроите вашия SMTP сървър, може да се обърнете към %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Импортираният файл трябва да
 UseFormatInputEmailToTarget=Въведете низ с формат <strong>имейл;фамилия;име;друго</strong>
 MailAdvTargetRecipients=Получатели (разширен избор)
 AdvTgtTitle=Попълнете полетата за въвеждане, за да посочите предварително избраните контрагенти или контакти/адреси
-AdvTgtSearchTextHelp=Използвайте %% като заместващи символи. Например, за да намерите всички елементи като <b>jean, joe, jim</b>, може да въведете <b>j%%</b> или да използвате ; като разделител за стойност, а ! за изключване на стойност. Например <b>jean;joe;jim%%;!jimo;!jima%</b> ще се цели всички jean, joe, започващи с jim, но не с jimo и всичко останало, което започва с jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Използвайте интервал, за да изберете целочислена или десетична стойност
 AdvTgtMinVal=Минимална стойност
 AdvTgtMaxVal=Максимална стойност
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Създаване на филтър
 AdvTgtOrCreateNewFilter=Име на новия филтър
 NoContactWithCategoryFound=Няма намерен контакт/адрес с тази категория
 NoContactLinkedToThirdpartieWithCategoryFound=Няма намерен контакт/адрес с тази категория
-OutGoingEmailSetup=Настройка на изходяща електронна поща
-InGoingEmailSetup=Настройка на входящата поща
-OutGoingEmailSetupForEmailing=Настройка на изходяща електронна поща (за модул %s)
-DefaultOutgoingEmailSetup=Настройка на изходящата поща по подразбиране
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Информация
 ContactsWithThirdpartyFilter=Контакти с филтър за контрагент
 Unanswered=Unanswered
 Answered=Отговорен
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index 335801537fa..b54d46a8d73 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Няма наличен шаблон за този тип им
 AvailableVariables=Налични променливи за заместване
 NoTranslation=Няма превод
 Translation=Превод
+CurrentTimeZone=Времева зона на PHP (сървър)
 EmptySearchString=Въведете критерии за търсене
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Няма намерен запис
 NoRecordDeleted=Няма изтрит запис
 NotEnoughDataYet=Няма достатъчно данни
@@ -85,6 +87,8 @@ FileWasNotUploaded=Избран е файл за прикачване, но вс
 NbOfEntries=Брой вписвания
 GoToWikiHelpPage=Прочетете онлайн помощта (необходим е достъп до интернет)
 GoToHelpPage=Прочетете помощната информация
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Начална страница
 RecordSaved=Записът е съхранен
 RecordDeleted=Записът е изтрит
 RecordGenerated=Записът е генериран
@@ -433,6 +437,7 @@ RemainToPay=Оставащо за плащане
 Module=Модул / Приложение
 Modules=Модули / Приложения
 Option=Опция
+Filters=Filters
 List=Списък
 FullList=Пълен списък
 FullConversation=Пълен списък със съобщения
@@ -671,7 +676,7 @@ SendMail=Изпращане на имейл
 Email=Имейл
 NoEMail=Няма имейл
 AlreadyRead=Вече е прочетено
-NotRead=Непрочетено
+NotRead=Непрочетен
 NoMobilePhone=Няма мобилен телефон
 Owner=Собственик
 FollowingConstantsWillBeSubstituted=Следните константи ще бъдат заменени със съответната стойност:
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=На изчакване
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/bg_BG/modulebuilder.lang b/htdocs/langs/bg_BG/modulebuilder.lang
index 214ce4293d0..eb76c35f976 100644
--- a/htdocs/langs/bg_BG/modulebuilder.lang
+++ b/htdocs/langs/bg_BG/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP страница за създаване / проме
 PageForAgendaTab=PHP страница за раздел със събития
 PageForDocumentTab=PHP страница за раздел с документация
 PageForNoteTab=PHP страница за раздел с бележки
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Път до zip пакет на модул / приложение
 PathToModuleDocumentation=Път до файл с документация на модул / приложение (%s)
 SpaceOrSpecialCharAreNotAllowed=Интервали или специални символи не са разрешени.
@@ -77,7 +78,7 @@ IsAMeasure=Измерва се
 DirScanned=Сканирани директории
 NoTrigger=Няма тригер
 NoWidget=Няма джаджа
-GoToApiExplorer=Отидете в API Explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=Списък на записи в меню
 ListOfDictionariesEntries=Списък на записи в речници
 ListOfPermissionsDefined=Списък на дефинирани права
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Ако имате познания за SQL и PHP мо
 SeeTopRightMenu=Вижте <span class="fa fa-bug"></span> в десния край на горното меню
 AddLanguageFile=Добавяне на езиков файл
 YouCanUseTranslationKey=Може да използвате тук ключ, който е ключ за превод от езиков файл (вижте раздел 'Езици').
-DropTableIfEmpty=(Изтриване на таблица, ако е празна)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=Таблицата %s не съществува
 TableDropped=Таблица %s е изтрита
 InitStructureFromExistingTable=Създаване на низова структура в масив на съществуваща таблица
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Използване на конкретен URL адре
 UseSpecificFamily = Използване на конкретна фамилия
 UseSpecificAuthor = Използване на конкретен автор
 UseSpecificVersion = Използване на конкретна първоначална версия
-ModuleMustBeEnabled=Първо трябва да бъде активиран модулът / приложението
 IncludeRefGeneration=Референцията на обекта трябва да се генерира автоматично
 IncludeRefGenerationHelp=Маркирайте това, ако искате да включите код за управление на автоматичното генериране на референция.
 IncludeDocGeneration=Искам да генерирам някои документи от обекта
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Тип на полета:<br>varchar(99), double(24,8), real, t
 AsciiToHtmlConverter=Ascii към HTML конвертор
 AsciiToPdfConverter=Ascii към PDF конвертор
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang
index b256d336fd7..82bb5cecad3 100644
--- a/htdocs/langs/bg_BG/other.lang
+++ b/htdocs/langs/bg_BG/other.lang
@@ -5,8 +5,6 @@ Tools=Инструменти
 TMenuTools=Инструменти
 ToolsDesc=Всички инструменти, които не са включени в другите менюта, са групирани тук.<br>Всички инструменти са достъпни, чрез лявото меню.
 Birthday=Рожден ден
-BirthdayDate=Рождена дата
-DateToBirth=Рождена дата
 BirthdayAlertOn=сигнал за рожден ден активен
 BirthdayAlertOff=сигнал за рожден ден неактивен
 TransKey=Превод на ключа TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Предишен месец (число 1-12) от дат
 TextPreviousMonthOfInvoice=Предишен месец (текст) от дата на фактурата
 NextMonthOfInvoice=Следващ месец (число 1-12) от дата на фактурата
 TextNextMonthOfInvoice=Следващ месец (текст) от дата на фактурата
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Архивния файл е генериран в <b>%s</b>.
 DocFileGeneratedInto=Документа е генериран в <b>%s</b>.
 JumpToLogin=Връзката е прекъсната. Отидете на страницата за въвеждане на входни данни...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Здравейте)__,\n\nМоля, виж
 PredefinedMailContentSendFichInter=__(Здравейте)__,\n\nМоля, вижте приложената интервенция __REF__\n\n\n__(Поздрави)__,\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Може да кликнете върху връзката по-долу, за да направите плащане, в случай, че не сте го извършили.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Здравейте)__,\n\n\n__(Поздрави)__,\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr е компактна ERP / CRM система, която поддържа различни работни модули. Няма смисъл от демонстрация, показваща всички модули, тъй като такъв сценарий никога не се случва (на разположение са стотици модули). Налични са няколко демо профила.
 ChooseYourDemoProfil=Изберете демо профила, който най-добре отговаря на вашите нужди...
 ChooseYourDemoProfilMore=...или създайте свой собствен профил<br>(свободен избор на модули)
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Контактът / адресът е създа
 ProjectCreatedByEmailCollector=Проектът е създаден, чрез имейл колектор от имейл MSGID %s
 TicketCreatedByEmailCollector=Тикетът е създаден, чрез имейл колектор от имейл MSGID %s
 OpeningHoursFormatDesc=Използвайте средно тире '-' за разделяне на часовете на отваряне и затваряне.<br> Използвайте интервал, за да въведете различни диапазони.<br> Пример: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Секция с експортирания
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index 02ca66e192d..70ada1c9db0 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Множество ценови сегменти за продукт / услуга (всеки клиент е в един ценови сегмент)
 MultiPricesNumPrices=Брой цени
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Брой основни опаковащи продукти
@@ -167,8 +168,10 @@ BuyingPrices=Покупни цени
 CustomerPrices=Клиентски цени
 SuppliersPrices=Доставни цени
 SuppliersPricesOfProductsOrServices=Доставни цени (на продукти / услуги)
-CustomCode=Митнически / Стоков / ХС код
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Държава на произход
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Произход на продукта (суровина / произведен)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Използване на фиксирана цена
 PriceByQuantity=Различни цени за количество
 DisablePriceByQty=Деактивиране на цени за количество
 PriceByQuantityRange=Количествен диапазон
-MultipriceRules=Правила за ценови сегмент
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Използване на правила за ценови сегмент (дефинирани в настройката на модула 'Продукти"), за да се изчисляват автоматично цените за всички други сегменти според първия сегмент
 PercentVariationOver=%% вариация над %s
 PercentDiscountOver=%% отстъпка над %s
diff --git a/htdocs/langs/bg_BG/recruitment.lang b/htdocs/langs/bg_BG/recruitment.lang
index 2dfffcd1215..14eeb3f6dda 100644
--- a/htdocs/langs/bg_BG/recruitment.lang
+++ b/htdocs/langs/bg_BG/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/bg_BG/sendings.lang b/htdocs/langs/bg_BG/sendings.lang
index 0a41c54d2d7..cf1a6ec0ef6 100644
--- a/htdocs/langs/bg_BG/sendings.lang
+++ b/htdocs/langs/bg_BG/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Други пратки за тази поръчка
 SendingsAndReceivingForSameOrder=Пратки и разписки за тази поръчка
 SendingsToValidate=Пратки за валидиране
 StatusSendingCanceled=Анулирана
+StatusSendingCanceledShort=Анулирана
 StatusSendingDraft=Чернова
 StatusSendingValidated=Валидирана (продукти за изпращане или вече изпратени)
 StatusSendingProcessed=Обработена
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Първо трябва да валидират
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Шаблон на разписка за доставка (лого, ...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Константата EXPEDITION_ADDON_NUMBER не е дефинирана
 SumOfProductVolumes=Общ обем на продуктите
 SumOfProductWeights=Общо тегло на продуктите
diff --git a/htdocs/langs/bg_BG/stocks.lang b/htdocs/langs/bg_BG/stocks.lang
index a2a308ad231..5475fd6afe5 100644
--- a/htdocs/langs/bg_BG/stocks.lang
+++ b/htdocs/langs/bg_BG/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/bg_BG/ticket.lang b/htdocs/langs/bg_BG/ticket.lang
index 196f2f14856..e1801645a17 100644
--- a/htdocs/langs/bg_BG/ticket.lang
+++ b/htdocs/langs/bg_BG/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Тикет - Видове
 TicketDictCategory=Тикет - Групи
 TicketDictSeverity=Тикет - Приоритети
 TicketDictResolution=Тикет - Решения
-TicketTypeShortBUGSOFT=Софтуерна неизправност
-TicketTypeShortBUGHARD=Хардуерна неизправност
-TicketTypeShortCOM=Търговски въпрос
 
+TicketTypeShortCOM=Търговски въпрос
 TicketTypeShortHELP=Молба за асистенция
 TicketTypeShortISSUE=Въпрос, грешка или проблем
 TicketTypeShortREQUEST=Заявка за подобрение
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Друго
 TicketSeverityShortLOW=Нисък
 TicketSeverityShortNORMAL=Нормален
 TicketSeverityShortHIGH=Висок
-TicketSeverityShortBLOCKING=Критичен
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Полето "%s" е неправилно
 MenuTicketMyAssign=Мои тикети
@@ -60,7 +58,6 @@ OriginEmail=Имейл източник
 Notify_TICKET_SENTBYMAIL=Изпращане на тикет съобщението по имейл
 
 # Status
-NotRead=Непрочетен
 Read=Прочетен
 Assigned=Възложен
 InProgress=В изпълнение
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Публичният интерфейс по
 TicketsAutoAssignTicket=Автоматично възлагане на тикета на потребителя, който го е създал
 TicketsAutoAssignTicketHelp=При създаване на тикет, той може автоматично да бъде възложен на потребителя, който го е създал.
 TicketNumberingModules=Модул за номериране на тикети
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Уведомяване на контрагента при създаване
 TicketsDisableCustomerEmail=Деактивиране на имейлите, когато тикетът е създаден от публичния интерфейс
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Статусът е променен: от %s на %s
 TicketNotNotifyTiersAtCreate=Да не се уведомява фирмата при създаване на тикета
 Unread=Непрочетен
 TicketNotCreatedFromPublicInterface=Не е налично. Тикетът не беше създаден от публичният интерфейс.
-PublicInterfaceNotEnabled=Публичният интерфейс не е активиран
 ErrorTicketRefRequired=Изисква се референтен номер на тикета
 
 #
diff --git a/htdocs/langs/bg_BG/website.lang b/htdocs/langs/bg_BG/website.lang
index 7378ad1189a..1696d94a7ad 100644
--- a/htdocs/langs/bg_BG/website.lang
+++ b/htdocs/langs/bg_BG/website.lang
@@ -30,7 +30,6 @@ EditInLine=Редактиране в движение
 AddWebsite=Добавяне на уебсайт
 Webpage=Уеб страница / контейнер
 AddPage=Добавяне на страница / контейнер
-HomePage=Начална страница
 PageContainer=Страница
 PreviewOfSiteNotYetAvailable=Преглед на вашия уебсайт <strong>%s</strong> все още не е наличен. Първо трябва да '<strong>Импортирате пълен шаблон за уебсайт</strong>' или просто да '<strong>Добавите страница / контейнер</strong>'.
 RequestedPageHasNoContentYet=Заявената страница с id %s все още няма съдържание или кеш файлът .tpl.php е бил премахнат. Редактирайте съдържанието на страницата, за да коригирате това.
@@ -101,7 +100,7 @@ EmptyPage=Празна страница
 ExternalURLMustStartWithHttp=Външният URL адрес трябва да започва с http:// или https://
 ZipOfWebsitePackageToImport=Качете Zip файла на пакета с шаблон на уебсайта
 ZipOfWebsitePackageToLoad=или Изберете наличен пакет с вграден шаблон за уебсайт
-ShowSubcontainers=Вмъкване на динамично съдържание
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Вътрешен URL адрес на страница
 ThisPageIsTranslationOf=Тази страница / контейнер е превод на
 ThisPageHasTranslationPages=Тази страница / контейнер има превод
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/bg_BG/withdrawals.lang b/htdocs/langs/bg_BG/withdrawals.lang
index 00e2744c5ba..c96a89ead7e 100644
--- a/htdocs/langs/bg_BG/withdrawals.lang
+++ b/htdocs/langs/bg_BG/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Разписки с директен дебит: %s пос
 MakeWithdrawRequest=Заявяване на плащане с директен дебит
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s заявления за плащане с директен дебит са записани
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Банков код на контрагента
 NoInvoiceCouldBeWithdrawed=Няма успешно дебитирани фактури. Проверете дали фактурите са на фирми с валиден IBAN и дали този IBAN има UMR (Unique Mandate Reference) в режим <strong>%s</strong>.
 ClassCredited=Класифициране като 'Кредитирана'
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Дата на изпълнение
 CreateForSepa=Създаване на файл с директен дебит
-ICS=Идентификатор на кредитора CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END='EndToEndId' SEPA XML таг - Уникален идентификатор, присвоен на транзакция
 USTRD='Unstructured' SEPA XML таг
 ADDDAYS=Добавяне на дни към датата на изпълнение
@@ -146,3 +148,4 @@ InfoRejectSubject=Платежното нареждане с директен д
 InfoRejectMessage=Здравейте, <br><br> Платежното нареждане с директен дебит по фактура %s, отнасящо се до фирма %s, със сума от %s е отказано от банката. <br><br>--<br>%s
 ModeWarning=Опцията за реален режим не беше зададена, спираме след тази симулация
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/bn_BD/accountancy.lang b/htdocs/langs/bn_BD/accountancy.lang
index 3211a0b62df..33ba4d9fea7 100644
--- a/htdocs/langs/bn_BD/accountancy.lang
+++ b/htdocs/langs/bn_BD/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index f1c41a3b62b..189b0b5186a 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=List of OpenDocument templates directories
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Position of Name/Lastname
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu handler where to show new menu
 DetailMenuModule=Module name if menu entry come from a module
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/bn_BD/banks.lang b/htdocs/langs/bn_BD/banks.lang
index 5cddfdaf30c..27f76ce0c74 100644
--- a/htdocs/langs/bn_BD/banks.lang
+++ b/htdocs/langs/bn_BD/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/bn_BD/blockedlog.lang b/htdocs/langs/bn_BD/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/bn_BD/blockedlog.lang
+++ b/htdocs/langs/bn_BD/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/bn_BD/boxes.lang b/htdocs/langs/bn_BD/boxes.lang
index d6fd298a3a7..7db4ea8aa17 100644
--- a/htdocs/langs/bn_BD/boxes.lang
+++ b/htdocs/langs/bn_BD/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/bn_BD/cashdesk.lang b/htdocs/langs/bn_BD/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/bn_BD/cashdesk.lang
+++ b/htdocs/langs/bn_BD/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/bn_BD/categories.lang b/htdocs/langs/bn_BD/categories.lang
index 84e5796763e..52327db3510 100644
--- a/htdocs/langs/bn_BD/categories.lang
+++ b/htdocs/langs/bn_BD/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/bn_BD/companies.lang b/htdocs/langs/bn_BD/companies.lang
index ee3854f04f8..e60b163d09f 100644
--- a/htdocs/langs/bn_BD/companies.lang
+++ b/htdocs/langs/bn_BD/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/bn_BD/compta.lang b/htdocs/langs/bn_BD/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/bn_BD/compta.lang
+++ b/htdocs/langs/bn_BD/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/bn_BD/cron.lang b/htdocs/langs/bn_BD/cron.lang
index d2da7ded67e..2ebdda1e685 100644
--- a/htdocs/langs/bn_BD/cron.lang
+++ b/htdocs/langs/bn_BD/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Create/update Scheduled job
 Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
-CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+CronSetup=Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -56,16 +58,16 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Shell command
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/bn_BD/errors.lang
+++ b/htdocs/langs/bn_BD/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
 ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/bn_BD/exports.lang b/htdocs/langs/bn_BD/exports.lang
index 2dcf4317e00..a0eb7161ef2 100644
--- a/htdocs/langs/bn_BD/exports.lang
+++ b/htdocs/langs/bn_BD/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Step
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/bn_BD/mails.lang b/htdocs/langs/bn_BD/mails.lang
index 1235eef3b27..7fd93be7b71 100644
--- a/htdocs/langs/bn_BD/mails.lang
+++ b/htdocs/langs/bn_BD/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang
index 49a5986c0df..acdecffa3b3 100644
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/bn_BD/modulebuilder.lang b/htdocs/langs/bn_BD/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/bn_BD/modulebuilder.lang
+++ b/htdocs/langs/bn_BD/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/bn_BD/other.lang b/htdocs/langs/bn_BD/other.lang
index 54c0572d453..0a7b3723ab1 100644
--- a/htdocs/langs/bn_BD/other.lang
+++ b/htdocs/langs/bn_BD/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/bn_BD/products.lang b/htdocs/langs/bn_BD/products.lang
index 97db059594f..f0c4a5362b8 100644
--- a/htdocs/langs/bn_BD/products.lang
+++ b/htdocs/langs/bn_BD/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/bn_BD/recruitment.lang b/htdocs/langs/bn_BD/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/bn_BD/recruitment.lang
+++ b/htdocs/langs/bn_BD/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/bn_BD/sendings.lang b/htdocs/langs/bn_BD/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/bn_BD/sendings.lang
+++ b/htdocs/langs/bn_BD/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Other shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Shipments to validate
 StatusSendingCanceled=Canceled
+StatusSendingCanceledShort=Canceled
 StatusSendingDraft=Draft
 StatusSendingValidated=Validated (products to ship or already shipped)
 StatusSendingProcessed=Processed
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/bn_BD/stocks.lang b/htdocs/langs/bn_BD/stocks.lang
index 660443bcded..6cf089096dd 100644
--- a/htdocs/langs/bn_BD/stocks.lang
+++ b/htdocs/langs/bn_BD/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/bn_BD/ticket.lang b/htdocs/langs/bn_BD/ticket.lang
index 59519282c80..982fff90ffa 100644
--- a/htdocs/langs/bn_BD/ticket.lang
+++ b/htdocs/langs/bn_BD/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/bn_BD/website.lang b/htdocs/langs/bn_BD/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/bn_BD/website.lang
+++ b/htdocs/langs/bn_BD/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/bn_BD/withdrawals.lang b/htdocs/langs/bn_BD/withdrawals.lang
index a80c1865a0a..ecb8099c033 100644
--- a/htdocs/langs/bn_BD/withdrawals.lang
+++ b/htdocs/langs/bn_BD/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/bn_IN/accountancy.lang b/htdocs/langs/bn_IN/accountancy.lang
index 3211a0b62df..33ba4d9fea7 100644
--- a/htdocs/langs/bn_IN/accountancy.lang
+++ b/htdocs/langs/bn_IN/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/bn_IN/admin.lang b/htdocs/langs/bn_IN/admin.lang
index f1c41a3b62b..189b0b5186a 100644
--- a/htdocs/langs/bn_IN/admin.lang
+++ b/htdocs/langs/bn_IN/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=List of OpenDocument templates directories
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Position of Name/Lastname
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu handler where to show new menu
 DetailMenuModule=Module name if menu entry come from a module
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/bn_IN/banks.lang b/htdocs/langs/bn_IN/banks.lang
index 9500a5b8b2e..a0dc27f86c4 100644
--- a/htdocs/langs/bn_IN/banks.lang
+++ b/htdocs/langs/bn_IN/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/bn_IN/blockedlog.lang b/htdocs/langs/bn_IN/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/bn_IN/blockedlog.lang
+++ b/htdocs/langs/bn_IN/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/bn_IN/boxes.lang b/htdocs/langs/bn_IN/boxes.lang
index d6fd298a3a7..7db4ea8aa17 100644
--- a/htdocs/langs/bn_IN/boxes.lang
+++ b/htdocs/langs/bn_IN/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/bn_IN/cashdesk.lang b/htdocs/langs/bn_IN/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/bn_IN/cashdesk.lang
+++ b/htdocs/langs/bn_IN/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/bn_IN/categories.lang b/htdocs/langs/bn_IN/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/bn_IN/categories.lang
+++ b/htdocs/langs/bn_IN/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/bn_IN/companies.lang b/htdocs/langs/bn_IN/companies.lang
index dadff6a7894..8dc815b522e 100644
--- a/htdocs/langs/bn_IN/companies.lang
+++ b/htdocs/langs/bn_IN/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/bn_IN/compta.lang b/htdocs/langs/bn_IN/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/bn_IN/compta.lang
+++ b/htdocs/langs/bn_IN/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/bn_IN/cron.lang b/htdocs/langs/bn_IN/cron.lang
index 1de1251831a..2ebdda1e685 100644
--- a/htdocs/langs/bn_IN/cron.lang
+++ b/htdocs/langs/bn_IN/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup=Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
 CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Number of launches
 CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -56,7 +58,7 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
 DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/bn_IN/errors.lang b/htdocs/langs/bn_IN/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/bn_IN/errors.lang
+++ b/htdocs/langs/bn_IN/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
 ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/bn_IN/exports.lang b/htdocs/langs/bn_IN/exports.lang
index 3549e3f8b23..a0eb7161ef2 100644
--- a/htdocs/langs/bn_IN/exports.lang
+++ b/htdocs/langs/bn_IN/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/bn_IN/mails.lang b/htdocs/langs/bn_IN/mails.lang
index 1235eef3b27..7fd93be7b71 100644
--- a/htdocs/langs/bn_IN/mails.lang
+++ b/htdocs/langs/bn_IN/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/bn_IN/main.lang b/htdocs/langs/bn_IN/main.lang
index 96c68cdcfa3..e196120c27d 100644
--- a/htdocs/langs/bn_IN/main.lang
+++ b/htdocs/langs/bn_IN/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/bn_IN/modulebuilder.lang b/htdocs/langs/bn_IN/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/bn_IN/modulebuilder.lang
+++ b/htdocs/langs/bn_IN/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/bn_IN/other.lang b/htdocs/langs/bn_IN/other.lang
index 54c0572d453..0a7b3723ab1 100644
--- a/htdocs/langs/bn_IN/other.lang
+++ b/htdocs/langs/bn_IN/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/bn_IN/products.lang b/htdocs/langs/bn_IN/products.lang
index 97db059594f..f0c4a5362b8 100644
--- a/htdocs/langs/bn_IN/products.lang
+++ b/htdocs/langs/bn_IN/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/bn_IN/recruitment.lang b/htdocs/langs/bn_IN/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/bn_IN/recruitment.lang
+++ b/htdocs/langs/bn_IN/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/bn_IN/sendings.lang b/htdocs/langs/bn_IN/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/bn_IN/sendings.lang
+++ b/htdocs/langs/bn_IN/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Other shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Shipments to validate
 StatusSendingCanceled=Canceled
+StatusSendingCanceledShort=Canceled
 StatusSendingDraft=Draft
 StatusSendingValidated=Validated (products to ship or already shipped)
 StatusSendingProcessed=Processed
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/bn_IN/stocks.lang b/htdocs/langs/bn_IN/stocks.lang
index 660443bcded..6cf089096dd 100644
--- a/htdocs/langs/bn_IN/stocks.lang
+++ b/htdocs/langs/bn_IN/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/bn_IN/ticket.lang b/htdocs/langs/bn_IN/ticket.lang
index 59519282c80..982fff90ffa 100644
--- a/htdocs/langs/bn_IN/ticket.lang
+++ b/htdocs/langs/bn_IN/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/bn_IN/website.lang b/htdocs/langs/bn_IN/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/bn_IN/website.lang
+++ b/htdocs/langs/bn_IN/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/bn_IN/withdrawals.lang b/htdocs/langs/bn_IN/withdrawals.lang
index 114a8d9dd6c..e3bec6f9cb8 100644
--- a/htdocs/langs/bn_IN/withdrawals.lang
+++ b/htdocs/langs/bn_IN/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
index 27f2742906e..34353b75cf9 100644
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Nije izmireno
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index 4149ca416ca..59f77d8c8c1 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Prikaz
 SetupArea=Postavke
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Forma za testiranje uploada fajlova (prema postavkama)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Prikaži pretpregled
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Pretpregled nije moguć
 ThemeCurrentlyActive=Trenutno aktivna tema
-CurrentTimeZone=Vremenska zona PHP (servera)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Razmak
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=List of OpenDocument templates directories
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Position of Name/Lastname
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu handler where to show new menu
 DetailMenuModule=Module name if menu entry come from a module
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/bs_BA/banks.lang b/htdocs/langs/bs_BA/banks.lang
index 696a6ff35f6..ab664bec272 100644
--- a/htdocs/langs/bs_BA/banks.lang
+++ b/htdocs/langs/bs_BA/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Vaš SEPA mandat
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/bs_BA/blockedlog.lang b/htdocs/langs/bs_BA/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/bs_BA/blockedlog.lang
+++ b/htdocs/langs/bs_BA/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/bs_BA/boxes.lang b/htdocs/langs/bs_BA/boxes.lang
index 7106f0a31c4..b38069cfe38 100644
--- a/htdocs/langs/bs_BA/boxes.lang
+++ b/htdocs/langs/bs_BA/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Posljednjih %s izmijenjenih donacija
 BoxTitleLastModifiedExpenses=Posljednjih %s izmijenjenih troškovnika
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Globalne aktivnosti (fakture, prijedlozi, narudžbe)
 BoxGoodCustomers=Dobar kupac
 BoxTitleGoodCustomers=%s dobrih kupaca
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Posljednji datum ažuriranja
 NoRecordedBookmarks=Nema definisanih bookmark-a.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Računovodstvo
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/bs_BA/cashdesk.lang b/htdocs/langs/bs_BA/cashdesk.lang
index b0ffb1d3f05..6ae6a2bda91 100644
--- a/htdocs/langs/bs_BA/cashdesk.lang
+++ b/htdocs/langs/bs_BA/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Broj faktura
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/bs_BA/categories.lang b/htdocs/langs/bs_BA/categories.lang
index 0672e7c4bc7..68923ab7d34 100644
--- a/htdocs/langs/bs_BA/categories.lang
+++ b/htdocs/langs/bs_BA/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Spisak oznaka proizvoda/kategorija
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/bs_BA/companies.lang b/htdocs/langs/bs_BA/companies.lang
index f1b1949d9a9..b199c6e0fce 100644
--- a/htdocs/langs/bs_BA/companies.lang
+++ b/htdocs/langs/bs_BA/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Provjera nije moguća. Servis za provjeru nije naveden od stran države članice (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potencijal
diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang
index 90a8289d2d9..233903b0bfe 100644
--- a/htdocs/langs/bs_BA/compta.lang
+++ b/htdocs/langs/bs_BA/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/bs_BA/cron.lang b/htdocs/langs/bs_BA/cron.lang
index 32e49dd3bde..cb278ba6885 100644
--- a/htdocs/langs/bs_BA/cron.lang
+++ b/htdocs/langs/bs_BA/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Create/update Scheduled job
 Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
-CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+CronSetup=Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Sigurnosni ključ za URL za pokretanje cron poslova
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -42,10 +43,11 @@ CronModule=Modul
 CronNoJobs=Nema registrovanih poslova
 CronPriority=Prioritet
 CronLabel=Oznaka
-CronNbRun=Broj pokretanja
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Dodaj posao
 CronEvery=Execute job each
@@ -56,16 +58,16 @@ CronNote=Komentar
 CronFieldMandatory=Polja %s su obavezna
 CronErrEndDateStartDt=Datum završetka ne može biti prije datuma početka
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Iskljući
 CronTaskInactive=This job is disabled
 CronId=ID
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=Sistemska komanda za izvršenje
 CronCreateJob=Create new Scheduled Job
 CronFrom=Od
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Shell komanda
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index d3460403a51..e2d3b3e5347 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s je pogrešan
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Prijava %s već postoji.
 ErrorGroupAlreadyExists=Grupa %s već postoji.
 ErrorRecordNotFound=Zapis nije pronađen.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
 ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/bs_BA/exports.lang b/htdocs/langs/bs_BA/exports.lang
index c1e9cc4b30f..30e7e97e5a5 100644
--- a/htdocs/langs/bs_BA/exports.lang
+++ b/htdocs/langs/bs_BA/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Step
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/bs_BA/mails.lang b/htdocs/langs/bs_BA/mails.lang
index 93bde73c33f..a51e2c1bbc0 100644
--- a/htdocs/langs/bs_BA/mails.lang
+++ b/htdocs/langs/bs_BA/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Linija %s u fajlu
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifikacije
-NoNotificationsWillBeSent=Nema planiranih email notifikacija za ovaj događaj i kompaniju
-ANotificationsWillBeSent=1 notifikacija će biti poslana emailom
-SomeNotificationsWillBeSent=%s notifikacija će biti poslane emailom
-AddNewNotification=Activate a new email notification target
-ListOfActiveNotifications=List all active targets for email notification
-ListOfNotificationsDone=Lista svih notifikacija o slanju emaila
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Inromacije
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index 53577a4ab73..57d95ed9df7 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Šablon za ovu vrstu emaila nije dostupan
 AvailableVariables=Dostupne zamjenske varijable
 NoTranslation=Nema prevoda
 Translation=Prevod
+CurrentTimeZone=Vremenska zona PHP (servera)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Nije pronađen zapis
 NoRecordDeleted=Nijedan zapis nije obrisan
 NotEnoughDataYet=Nema dovoljno podataka
@@ -85,6 +87,8 @@ FileWasNotUploaded=Datoteka je odabrana za prilog ali nije još postavljena. Kli
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Pročitajte online pomoć (neophodan pristup internetu)
 GoToHelpPage=Pročitaj pomoć
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Unos spremljen
 RecordDeleted=Unos obrisan
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Preostalo za platiti
 Module=Modul/aplikacija
 Modules=Moduli/aplikacije
 Option=Opcija
+Filters=Filters
 List=Spisak
 FullList=Potpuni spisak
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Pošalji e-mail
 Email=email
 NoEMail=nema emaila
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=Nema broj mobitela
 Owner=Vlasnik
 FollowingConstantsWillBeSubstituted=Sljedeće konstante će se zamijeniti sa odgovarajućim vrijednostima.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/bs_BA/modulebuilder.lang b/htdocs/langs/bs_BA/modulebuilder.lang
index db704769abd..9281e1f7849 100644
--- a/htdocs/langs/bs_BA/modulebuilder.lang
+++ b/htdocs/langs/bs_BA/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang
index 024bf6013d5..bc8408ad6a6 100644
--- a/htdocs/langs/bs_BA/other.lang
+++ b/htdocs/langs/bs_BA/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index 23be1f760b5..76237566481 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/bs_BA/recruitment.lang b/htdocs/langs/bs_BA/recruitment.lang
index 1d485508eff..a2e64d9e81f 100644
--- a/htdocs/langs/bs_BA/recruitment.lang
+++ b/htdocs/langs/bs_BA/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/bs_BA/sendings.lang b/htdocs/langs/bs_BA/sendings.lang
index dfae5d3a8a8..1fc121104eb 100644
--- a/htdocs/langs/bs_BA/sendings.lang
+++ b/htdocs/langs/bs_BA/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Druge pošiljke za ovu narudžbu
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Pošiljke za potvrditi
 StatusSendingCanceled=Otkazano
+StatusSendingCanceledShort=Otkazan
 StatusSendingDraft=Nacrt
 StatusSendingValidated=Potvrđeno (proizvodi za slanje ili već poslano)
 StatusSendingProcessed=Obrađeno
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Suma količina proizvoda
 SumOfProductWeights=Suma težina proizvoda
diff --git a/htdocs/langs/bs_BA/stocks.lang b/htdocs/langs/bs_BA/stocks.lang
index 9dbb5dd7df2..bb58f89c839 100644
--- a/htdocs/langs/bs_BA/stocks.lang
+++ b/htdocs/langs/bs_BA/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/bs_BA/ticket.lang b/htdocs/langs/bs_BA/ticket.lang
index c93c3a3c59e..fd582550e54 100644
--- a/htdocs/langs/bs_BA/ticket.lang
+++ b/htdocs/langs/bs_BA/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Ostalo
 TicketSeverityShortLOW=Nizak potencijal
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Veliki potencijal
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Pročitaj
 Assigned=Assigned
 InProgress=U toku
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/bs_BA/website.lang b/htdocs/langs/bs_BA/website.lang
index 8aa0ca84eb0..aa90f42f735 100644
--- a/htdocs/langs/bs_BA/website.lang
+++ b/htdocs/langs/bs_BA/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Stranica
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/bs_BA/withdrawals.lang b/htdocs/langs/bs_BA/withdrawals.lang
index ae61a690ede..0562c1419b0 100644
--- a/htdocs/langs/bs_BA/withdrawals.lang
+++ b/htdocs/langs/bs_BA/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Označi na potraživanja
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Datum izvršenja
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index 6146dd28e9f..2c6e0389526 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -31,7 +31,7 @@ AssignDedicatedAccountingAccount=Compte nou per a assignar
 InvoiceLabel=Etiqueta de factura
 OverviewOfAmountOfLinesNotBound=Vista general de la quantitat de línies no comptabilitzades en un compte comptable
 OverviewOfAmountOfLinesBound=Vista general de la quantitat de línies ja comptabilitzades en un compte comptable
-OtherInfo=Altra informació
+OtherInfo=Una altra informació
 DeleteCptCategory=Eliminar el compte comptable del grup
 ConfirmDeleteCptCategory=Estàs segur que vols eliminar aquest compte comptable del grup de comptabilitat?
 JournalizationInLedgerStatus=Estat del diari
@@ -46,8 +46,9 @@ CountriesNotInEEC=Països no integrats a la CEE
 CountriesInEECExceptMe=Països a la CEE excepte %s
 CountriesExceptMe=Tots els països, excepte %s
 AccountantFiles=Exporta documents d'origen
-ExportAccountingSourceDocHelp=Amb aquesta eina, podeu exportar els esdeveniments d'origen (llista i PDF) que es van utilitzar per generar la vostra comptabilitat. Per exportar els vostres diaris, utilitzeu l’entrada de menú %s - %s.
+ExportAccountingSourceDocHelp=Amb aquesta eina, podeu exportar els esdeveniments d'origen (llista i PDF) que es van utilitzar per a generar la vostra comptabilitat. Per a exportar els vostres diaris, utilitzeu l’entrada de menú %s - %s.
 VueByAccountAccounting=Veure per compte comptable
+VueBySubAccountAccounting=Veure-ho per subcomptes comptables
 
 MainAccountForCustomersNotDefined=Compte comptable per a clients no definida en la configuració
 MainAccountForSuppliersNotDefined=Compte comptable principal per a proveïdors no definit a la configuració
@@ -58,12 +59,12 @@ MainAccountForSubscriptionPaymentNotDefined=Compte comptable per a IVA no defini
 AccountancyArea=Àrea de comptabilitat
 AccountancyAreaDescIntro=L'ús del mòdul de comptabilitat es realitza en diverses etapes:
 AccountancyAreaDescActionOnce=Les següents accions s'executen normalment per una sola vegada, o un cop l'any ...
-AccountancyAreaDescActionOnceBis=Els passos següents s'han de fer per a estalviar-vos temps en el futur suggerint-vos el compte comptable per defecte correcte al fer els diaris (escriptura dels registres en els diaris i Llibre Major)
+AccountancyAreaDescActionOnceBis=Cal fer els passos següents per a estalviar-vos temps en el futur, suggerint-vos el compte comptable per defecte correcte quan feu els diaris (escriptura dels registres en els Diaris i Llibre major)
 AccountancyAreaDescActionFreq=Les següents accions s'executen normalment cada mes, setmana o dia per empreses molt grans ...
 
 AccountancyAreaDescJournalSetup=PAS %s: Crea o consulta el contingut dels teus diaris des del menú %s
 AccountancyAreaDescChartModel=PAS %s: Comproveu que existeix un model de pla comptable o creeu-ne un des del menú %s
-AccountancyAreaDescChart=PAS %s: Seleccioneu i/o completeu el vostre pla comptable al menú %s
+AccountancyAreaDescChart=PAS %s: Seleccioneu o completeu el vostre pla comptable al menú %s
 
 AccountancyAreaDescVat=PAS %s: Defineix comptes comptables per cada tipus d'IVA. Per això, utilitzeu l'entrada del menú %s.
 AccountancyAreaDescDefault=PAS %s: Definiu comptes comptables per defecte. Per a això, utilitzeu l'entrada de menú %s.
@@ -144,24 +145,24 @@ NotVentilatedinAccount=No vinculat al compte comptable
 XLineSuccessfullyBinded=%s productes/serveis vinculats amb èxit a un compte comptable
 XLineFailedToBeBinded=%s de productes/serveis no comptabilitzats en cap compte comptable
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Nombre d'elements a vincular mostrats per pàgina (màxim recomanat: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comença l'ordenació de la pàgina "Comptabilització per fer" pels elements més recents
+ACCOUNTING_LIMIT_LIST_VENTILATION=Nombre màxim de línies en llistes per pàgina (recomanat: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comença l'ordenació de la pàgina "Comptabilització per a fer" pels elements més recents
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comença l'ordenació de la pàgina "Comptabilització realitzada" pels elements més recents
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncar descripcions de producte i serveis en llistes de x caràcters (Millor = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncar descripcions de comptes de producte i serveis en llistes de x caràcters (Millor = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Longitud dels comptes generals (Si s'estableix el valor a 6 aquí, el compte '706' apareixerà com '706000' a la pantalla)
-ACCOUNTING_LENGTH_AACCOUNT=Longitud dels subcomptes (Si s'estableix el valor a 6 aquí, el compte '401' apareixerà com '401000' a la pantalla)
-ACCOUNTING_MANAGE_ZERO=Gestiona un nombre diferent de zero al final d'un compte comptable. Necessària per alguns països (com Suïssa). Si es manté apagat (per defecte), pot configurar els següents 2 paràmetres per a demanar a l'aplicació afegir un zero virtual.
-BANK_DISABLE_DIRECT_INPUT=Des-habilitar l'enregistrament directe de transaccions al compte bancari 
+ACCOUNTING_LENGTH_GACCOUNT=Longitud dels comptes generals (Si s'estableix el valor a 6 aquí, el compte «706» apareixerà com «706000» a la pantalla)
+ACCOUNTING_LENGTH_AACCOUNT=Longitud dels subcomptes (Si s'estableix el valor a 6 aquí, el compte «401» apareixerà com «401000» a la pantalla)
+ACCOUNTING_MANAGE_ZERO=Gestiona un nombre diferent de zero al final d'un compte comptable. És necessari per a alguns països (com Suïssa). Si es manté apagat (per defecte), podeu configurar els següents dos paràmetres per a demanar a l'aplicació d'afegir zeros virtuals.
+BANK_DISABLE_DIRECT_INPUT=Desactiva el registre directe de transaccions al compte bancari
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Habilita l'exportació d'esborrany en el diari
 ACCOUNTANCY_COMBO_FOR_AUX=Activa la llista de combo per al compte subsidiari (pot ser lent si tens molts tercers)
-ACCOUNTING_DATE_START_BINDING=Definiu una data per començar la vinculació i transferència a la comptabilitat. Per sota d’aquesta data, les transaccions no es transferiran a la comptabilitat.
+ACCOUNTING_DATE_START_BINDING=Definiu una data per a començar la vinculació i transferència a la comptabilitat. Per sota d’aquesta data, les transaccions no es transferiran a la comptabilitat.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=En el cas de transferència de comptabilitat, seleccioneu el període a mostrar per defecte
 
 ACCOUNTING_SELL_JOURNAL=Diari de venda
 ACCOUNTING_PURCHASE_JOURNAL=Diari de compra
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Diari varis
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Diaris varis
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Diari de l'informe de despeses
 ACCOUNTING_SOCIAL_JOURNAL=Diari social
 ACCOUNTING_HAS_NEW_JOURNAL=Té un nou Diari
@@ -177,7 +178,7 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Compte comptable d'espera
 DONATION_ACCOUNTINGACCOUNT=Compte comptable per a registrar les donacions
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Compte comptable per a registrar les donacions
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Compte comptable per defecte per registrar el dipòsit del client
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Compte comptable per defecte per a registrar el dipòsit del client
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Compte comptable per defecte per als productes comprats (utilitzat si no es defineix en el producte)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Compte de comptabilitat per defecte dels productes comprats a la CEE (utilitzat si no està definit a la taula de productes)
@@ -198,7 +199,8 @@ Docdate=Data
 Docref=Referència
 LabelAccount=Etiqueta de compte
 LabelOperation=Etiqueta de l'operació
-Sens=Significat
+Sens=Direcció
+AccountingDirectionHelp=Per a un compte comptable d'un client, utilitzeu Crèdit per a registrar un pagament que heu rebut <br> Per a un compte comptable d'un proveïdor, utilitzeu Dèbit per a registrar un pagament que feu
 LetteringCode=Codi de retolació
 Lettering=Lletres
 Codejournal=Diari
@@ -206,7 +208,8 @@ JournalLabel=Títol de Diari
 NumPiece=Número de peça
 TransactionNumShort=Número de transacció
 AccountingCategory=Grups personalitzats
-GroupByAccountAccounting=Agrupar per compte comptable
+GroupByAccountAccounting=Agrupa per compte major
+GroupBySubAccountAccounting=Agrupa per subcompte comptable
 AccountingAccountGroupsDesc=Pots definir aquí alguns grups de compte comptable. S'utilitzaran per a informes comptables personalitzats.
 ByAccounts=Per comptes
 ByPredefinedAccountGroups=Per grups predefinits
@@ -216,14 +219,14 @@ NotMatch=No definit
 DeleteMvt=Elimina algunes línies d'operació de la comptabilitat
 DelMonth=Mes a eliminar
 DelYear=Any a eliminar
-DelJournal=Diari per esborrar
-ConfirmDeleteMvt=Això suprimirà totes les línies d'operació de la comptabilitat de l'any/mes i/o d'un diari específic (cal un criteri com a mínim). Haureu de tornar a utilitzar la funció '%s' per a que el registre suprimit torni al llibre major.
+DelJournal=Diari per a suprimir
+ConfirmDeleteMvt=Això suprimirà totes les línies d'operació de la comptabilitat de l'any/mes o d'un diari específic (cal un criteri com a mínim). Haureu d'utilitzar la funció «%s» per a tornar a tenir el registre suprimit al llibre major.
 ConfirmDeleteMvtPartial=Això suprimirà la transacció de la comptabilitat (se suprimiran totes les línies d’operació relacionades amb la mateixa transacció)
 FinanceJournal=Diari de finances
 ExpenseReportsJournal=Informe-diari de despeses
 DescFinanceJournal=Finance journal including all the types of payments by bank account
 DescJournalOnlyBindedVisible=Aquesta és una vista de registre que està vinculada a un compte comptable i que es pot registrar als diaris i llibres majors.
-VATAccountNotDefined=Comptes comptables de IVA sense definir
+VATAccountNotDefined=Comptes comptables d'IVA sense definir
 ThirdpartyAccountNotDefined=Comptes comptables de tercers (clients o proveïdors) sense definir
 ProductAccountNotDefined=Comptes comptables per al producte sense definir
 FeeAccountNotDefined=Compte per tarifa no definit
@@ -248,10 +251,10 @@ PaymentsNotLinkedToProduct=Pagament no vinculat a cap producte / servei
 OpeningBalance=Saldo d'obertura
 ShowOpeningBalance=Mostra el saldo d'obertura
 HideOpeningBalance=Amagueu el balanç d'obertura
-ShowSubtotalByGroup=Mostrar subtotals per grup
+ShowSubtotalByGroup=Mostra el subtotal per nivell
 
 Pcgtype=Grup de compte
-PcgtypeDesc=S'utilitzen grups de comptes com a criteris predefinits de "filtre" i "agrupació" per a alguns informes de comptabilitat. Per exemple, "Ingressos" o "DESPESES" s'utilitzen com a grups per a comptes de comptabilitat de productes per crear l'informe de despeses / ingressos.
+PcgtypeDesc=S'utilitzen grups de comptes com a criteris predefinits de «filtre» i «agrupació» per a alguns informes de comptabilitat. Per exemple, «INGRESSOS» o «DESPESES» s'utilitzen com a grups per a comptes comptables de productes per a crear l'informe de despeses/ingressos.
 
 Reconcilable=Reconciliable
 
@@ -259,7 +262,7 @@ TotalVente=Total turnover before tax
 TotalMarge=Marge total de vendes
 
 DescVentilCustomer=Consulti aquí la llista de línies de factures de client vinculades (o no) a comptes comptables de producte
-DescVentilMore=En la majoria dels casos, si tu utilitzes productes o serveis predefinits i poses el número de compte a la fitxa de producte/servei, l'aplicació serà capaç de fer tots els vincles entre les línies de factura i els comptes comptables del teu pla comptable, només amb un clic mitjançant el botó <strong>"%s"</strong>. Si el compte no està col·locat  a la fitxa del producte/servei o si encara hi ha alguna línia no vinculada a cap compte, hauràs de fer una vinculació manual a partir del menú "<strong>%s</strong>".
+DescVentilMore=En la majoria dels casos, si utilitzeu productes o serveis predefinits i poses el número de compte a la fitxa de producte/servei, l'aplicació serà capaç de fer tots els vincles entre les línies de factura i els comptes comptables del vostre pla comptable, només amb un clic mitjançant el botó <strong>«%s»</strong>. Si el compte no està col·locat a la fitxa del producte/servei o si encara hi ha alguna línia no vinculada a cap compte, haureu de fer una vinculació manual a partir del menú «<strong>%s</strong>».
 DescVentilDoneCustomer=Consulta aquí la llista de línies de factures a clients i els seus comptes comptables de producte
 DescVentilTodoCustomer=Comptabilitza les línies de factura encara no comptabilitzades amb un compte comptable de producte
 ChangeAccount=Canvia el compte comptable de producte/servei per les línies seleccionades amb el següent compte comptable:
@@ -268,14 +271,16 @@ DescVentilSupplier=Consulteu aquí la llista de les línies de facturació dels
 DescVentilDoneSupplier=Consulteu aquí la llista de les línies de venedors de factures i el seu compte comptable
 DescVentilTodoExpenseReport=Línies d'informes de despeses comptabilitzades encara no comptabilitzades amb un compte comptable de tarifa
 DescVentilExpenseReport=Consulteu aquí la llista de les línies d'informe de despeses vinculada (o no) a un compte comptable corresponent a tarifa
-DescVentilExpenseReportMore=Si tu poses el compte comptable sobre les línies de l'informe per tipus de despesa, l'aplicació serà capaç de fer tots els vincles entre les línies de l'informe i els comptes comptables del teu pla comptable, només amb un clic amb el botó <strong>"%s"</strong>. Si el compte no estava al diccionari de tarifes o si encara hi ha línies no vinculades a cap compte, hauràs de fer-ho manualment a partir del menú "<strong>%s</strong>".
+DescVentilExpenseReportMore=Si poseu el compte comptable sobre les línies de l'informe per tipus de despesa, l'aplicació serà capaç de fer tots els vincles entre les línies de l'informe i els comptes comptables del vostre pla comptable, només amb un clic amb el botó <strong>«%s»</strong>. Si el compte no estava al diccionari de tarifes o si encara hi ha línies no vinculades a cap compte, haureu de fer-ho manualment a partir del menú «<strong>%s</strong>».
 DescVentilDoneExpenseReport=Consulteu aquí la llista de les línies d'informes de despeses i el seu compte comptable de comissions
 
-DescClosure=Consulteu aquí el nombre de moviments per mes que no són validats i els exercicis ja oberts
+Closure=Tancament anual
+DescClosure=Consulteu aquí el nombre de moviments mensuals que no estan validats i els exercicis fiscals encara oberts
 OverviewOfMovementsNotValidated=Pas 1 / Visió general dels moviments no validats. (Cal tancar un exercici)
+AllMovementsWereRecordedAsValidated=Tots els moviments es van registrar com a validats
+NotAllMovementsCouldBeRecordedAsValidated=No es poden registrar tots els moviments com a validats
 ValidateMovements=Valida moviments
 DescValidateMovements=Queda prohibida qualsevol modificació o supressió de registres. Totes les entrades d’un exercici s’han de validar, en cas contrari, el tancament no serà possible
-SelectMonthAndValidate=Selecciona el mes i valida els moviments
 
 ValidateHistory=Comptabilitza automàticament
 AutomaticBindingDone=Comptabilització automàtica realitzada
@@ -293,6 +298,7 @@ Accounted=Comptabilitzat en el llibre major
 NotYetAccounted=Encara no comptabilitzat en el llibre major
 ShowTutorial=Mostrar Tutorial
 NotReconciled=No conciliat
+WarningRecordWithoutSubledgerAreExcluded=Advertiment: totes les operacions sense subcompte comptable definit es filtren i s'exclouen d'aquesta vista
 
 ## Admin
 BindingOptions=Opcions d'enquadernació
@@ -320,7 +326,7 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Desactiva la vinculació i transferènci
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Desactiva la vinculació i transferència de comptes en els informes de despeses (els informes de despeses no es tindran en compte a la comptabilitat)
 
 ## Export
-ExportDraftJournal=Exportar esborranys del llibre 
+ExportDraftJournal=Exporta els esborranys del llibre
 Modelcsv=Model d'exportació
 Selectmodelcsv=Selecciona un model d'exportació
 Modelcsv_normal=Exportació clàssica
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Exportar per LD Compta (v10 i més)
 Modelcsv_openconcerto=Exporta per a OpenConcerto (Test)
 Modelcsv_configurable=Exporta CSV configurable
 Modelcsv_FEC=Exporta FEC
+Modelcsv_FEC2=Exporta FEC (amb escriptura de generació de dates / document invertit)
 Modelcsv_Sage50_Swiss=Exportació per Sage 50 Switzerland
 Modelcsv_winfic=Exportar Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Exporta per a Gestinum (v3)
@@ -345,13 +352,13 @@ ChartofaccountsId=Id pla comptable
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Inicialitza la comptabilitat
-InitAccountancyDesc=Aquesta pàgina es pot utilitzar per inicialitzar un compte de comptabilitat en productes i serveis que no tenen compte comptable definit per a vendes i compres.
-DefaultBindingDesc=Aquesta pàgina es pot utilitzar per establir un compte predeterminat que s'utilitzarà per enllaçar el registre de transaccions sobre el pagament de salaris, donacions, impostos i IVA quan encara no s'hagi establert cap compte comptable específic.
-DefaultClosureDesc=Aquesta pàgina es pot utilitzar per definir els paràmetres usats per als tancaments de comptabilitat.
+InitAccountancyDesc=Aquesta pàgina es pot utilitzar per a inicialitzar un compte comptable de productes i serveis que no tenen un compte comptable definit per a vendes i compres.
+DefaultBindingDesc=Aquesta pàgina es pot utilitzar per a establir un compte predeterminat que s'utilitzarà per a enllaçar el registre de transaccions sobre el pagament de salaris, donacions, impostos i IVA quan encara no s'hagi establert cap compte comptable específic.
+DefaultClosureDesc=Aquesta pàgina es pot utilitzar per a definir els paràmetres utilitzats per als tancaments de comptabilitat.
 Options=Opcions
-OptionModeProductSell=En mode vendes
-OptionModeProductSellIntra=Les vendes de mode exportades a la CEE
-OptionModeProductSellExport=Les vendes de mode exportades a altres països
+OptionModeProductSell=Modalitat de vendes
+OptionModeProductSellIntra=Modalitats de vendes exportades a la CEE
+OptionModeProductSellExport=Modalitats de vendes exportades a altres països
 OptionModeProductBuy=En mode compres
 OptionModeProductBuyIntra=Mode compres importades a la CEE
 OptionModeProductBuyExport=Mode compres importades de fora la CEE
@@ -389,7 +396,7 @@ BookeppingLineAlreayExists=Les línies ja existeixen en la comptabilitat
 NoJournalDefined=Cap diari definit
 Binded=Línies comptabilitzades
 ToBind=Línies a comptabilitzar
-UseMenuToSetBindindManualy=Línies encara no enllaçades, utilitzeu el menú <a href="%s"> %s </a> per fer l'enllaç manualment
+UseMenuToSetBindindManualy=Línies encara no enllaçades, utilitzeu el menú <a href="%s"> %s </a> per a fer l'enllaç manualment
 
 ## Import
 ImportAccountingEntries=Entrades de comptabilitat
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 7d1f089796c..17744eb3df8 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -2,7 +2,7 @@
 Foundation=Entitat
 Version=Versió
 Publisher=Publicador
-VersionProgram=Versió programa
+VersionProgram=Versió del programa
 VersionLastInstall=Versió d'instal·lació inicial
 VersionLastUpgrade=Versió de l'última actualització
 VersionExperimental=Experimental
@@ -10,7 +10,7 @@ VersionDevelopment=Desenvolupament
 VersionUnknown=Desconeguda
 VersionRecommanded=Recomanada
 FileCheck=Comprovador d'integritat de fitxers
-FileCheckDesc=Aquesta eina et permet comprovar la integritat dels fitxers i la configuració de la vostra aplicació, comparant cada fitxer amb l'oficial. També es pot comprovar el valor d'algunes constants de configuració. Pots utilitzar aquesta eina per determinar si s'han modificat fitxers (per exemple, per un hacker).
+FileCheckDesc=Aquesta eina us permet comprovar la integritat dels fitxers i la configuració de la vostra aplicació, comparant cada fitxer amb l'oficial. També es pot comprovar el valor d'algunes constants de configuració. Podeu utilitzar aquesta eina per a determinar si s'han modificat fitxers (per exemple, per un hacker).
 FileIntegrityIsStrictlyConformedWithReference=La integritat dels arxius està estrictament conforme amb la referència.
 FileIntegrityIsOkButFilesWereAdded=La comprovació de la integritat dels arxius ha resultat exitosa, no obstant s'han afegit alguns arxius nous.
 FileIntegritySomeFilesWereRemovedOrModified=La comprovació d'integritat d'arxius ha fallat. Alguns arxius han sigut modificats, eliminats o afegits.
@@ -22,7 +22,7 @@ FilesMissing=Arxius que falten
 FilesUpdated=Arxius actualitzats
 FilesModified=Fitxers modificats
 FilesAdded=Fitxers afegits
-FileCheckDolibarr=Comprovar l'integritat dels arxius de l'aplicació
+FileCheckDolibarr=Comprova la integritat dels fitxers de l'aplicació
 AvailableOnlyOnPackagedVersions=El fitxer local per a la comprovació d'integritat només està disponible quan l'aplicació està instal·lada des d'un paquet oficial
 XmlNotFound=No es troba l'arxiu xml
 SessionId=ID de sessió
@@ -41,7 +41,7 @@ PermissionsOnFilesInWebRoot=Permisos als fitxers del directori arrel web
 PermissionsOnFile=Permisos al fitxer %s
 NoSessionFound=Sembla que el seu PHP no pot llistar les sessions actives. El directori de salvaguardat de sessions (<b>%s</b>) pot estar protegit (per exemple, pels permisos del sistema operatiu o per la directiva open_basedir del seu PHP).
 DBStoringCharset=Codificació base de dades per emmagatzematge de dades
-DBSortingCharset=Codificació base de dades per classificar les dades
+DBSortingCharset=Conjunt de caràcters de base de dades per a ordenar les dades
 HostCharset=Joc de caràcters del servidor
 ClientCharset=Joc de caràcters del client
 ClientSortingCharset="Collation" del client
@@ -56,8 +56,10 @@ GUISetup=Entorn
 SetupArea=Configuració
 UploadNewTemplate=Carrega plantilles noves
 FormToTestFileUploadForm=Formulari de prova de càrrega de fitxer (segons opcions escollides)
+ModuleMustBeEnabled=El mòdul/aplicació <b>%s</b> s'ha d'activar
+ModuleIsEnabled=El mòdul/aplicació <b>%s</b> s'ha activat
 IfModuleEnabled=Nota: sí només és eficaç si el mòdul <b>%s</b> està activat
-RemoveLock=Elimineu/renombreu el fitxer <b> %s </b> si existeix, per a permetre l'ús de l'eina d'actualització/instal·lació.
+RemoveLock=Elimineu/reanomeneu el fitxer <b> %s </b> si existeix, per a permetre l'ús de l'eina d'actualització/instal·lació.
 RestoreLock=Substituir un arxiu <b>%s</b>, donant-li només drets de lectura a aquest arxiu per tal de prohibir noves actualitzacions.
 SecuritySetup=Configuració de seguretat
 SecurityFilesDesc=Defineix les opcions relacionades amb la seguretat de càrrega de fitxers.
@@ -66,7 +68,7 @@ ErrorModuleRequireDolibarrVersion=Error, aquest mòdul requereix una versió %s
 ErrorDecimalLargerThanAreForbidden=Error, les precisions superiors a <b>%s</b> no estan suportades.
 DictionarySetup=Configuració de Diccionari
 Dictionary=Diccionaris
-ErrorReservedTypeSystemSystemAuto=L'ús del tipus 'system' i 'systemauto' està reservat. Podeu utilitzar 'user' com a valor per afegir el seu propi registre
+ErrorReservedTypeSystemSystemAuto=Els valors "sistema" i "systemauto" per al tipus estan reservats. Podeu utilitzar "user" com a valor per a afegir el vostre propi registre
 ErrorCodeCantContainZero=El codi no pot contenir el valor 0
 DisableJavascript=Desactivar les funcions Javascript
 DisableJavascriptNote=Nota: per a propòsits de prova o de depuració. Per a l’optimització dels navegadors cec o de text, és possible que preferiu utilitzar la configuració en el perfil de l’usuari
@@ -74,7 +76,7 @@ UseSearchToSelectCompanyTooltip=A més, si teniu un gran nombre de tercers (> 10
 UseSearchToSelectContactTooltip=A més, si teniu un gran nombre de tercers (> 100.000), podeu augmentar la velocitat establint la constant CONTACT_DONOTSEARCH_ANYWHERE a 1 a Configuració->Altres. La cerca es limitarà a l'inici de la cadena.
 DelaiedFullListToSelectCompany=Esperar fins que es prem una tecla abans de carregar el contingut de la llista combinada de Tercers. <br> Això pot augmentar el rendiment si teniu un gran nombre de tercers, però és menys convenient.
 DelaiedFullListToSelectContact=Espereu fins que es prem una tecla abans de carregar el contingut de la llista combinada de contactes. <br> Això pot augmentar el rendiment si teniu un gran nombre de contactes, però és menys convenient.
-NumberOfKeyToSearch=Nombre de caràcters per activar la cerca: %s
+NumberOfKeyToSearch=Nombre de caràcters per a activar la cerca: %s
 NumberOfBytes=Nombre de bytes
 SearchString=Cerca cadena
 NotAvailableWhenAjaxDisabled=No disponible quan Ajax estigui desactivat
@@ -85,7 +87,6 @@ ShowPreview=Veure previsualització
 ShowHideDetails=Mostra-Amaga els detalls
 PreviewNotAvailable=Vista prèvia no disponible
 ThemeCurrentlyActive=Tema actualment actiu
-CurrentTimeZone=Fus horari PHP (Servidor)
 MySQLTimeZone=Zona horària MySql (base de dades)
 TZHasNoEffect=El servidor de base de dades emmagatzema i retorna les dates com si les haguessin enviat com una cadena. La zona horària només té efecte quan s’utilitza la funció UNIX_TIMESTAMP (que Dolibarr no hauria d’utilitzar, de manera que la base de dades TZ no hauria de tenir cap efecte, fins i tot si es canvia després d’introduir les dades).
 Space=Àrea
@@ -100,7 +101,7 @@ NextValueForDeposit=Següent valor (bestreta)
 NextValueForReplacements=Pròxim valor (rectificatives)
 MustBeLowerThanPHPLimit=Nota: actualment la vostra configuració PHP limita la mida màxima de fitxers per a la pujada a <b> %s </b> %s, independentment del valor d'aquest paràmetre.
 NoMaxSizeByPHPLimit=Cap limitació interna en el seu servidor PHP
-MaxSizeForUploadedFiles=Tamany màxim dels documents a pujar (0 per prohibir la pujada)
+MaxSizeForUploadedFiles=Mida màxima per als fitxers a pujar (0 per a no permetre cap pujada)
 UseCaptchaCode=Utilització de codi gràfic (CAPTCHA) en el login
 AntiVirusCommand=Ruta completa cap al comandament antivirus
 AntiVirusCommandExample=Exemple per al dimoni ClamAv (requereix clamav-daemon): /usr/bin/clamdscan<br>Exemple per a ClamWin (molt molt lent): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
@@ -108,7 +109,7 @@ AntiVirusParam= Paràmetres complementaris en la línia de comandes
 AntiVirusParamExample=Exemple per al dimoni de ClamAv: --fdpass<br>Exemple per a ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Configuració del mòdul Comptabilitat
 UserSetup=Configuració de gestió d'usuaris
-MultiCurrencySetup=Configuració multi-divisa
+MultiCurrencySetup=Configuració multidivisa
 MenuLimits=Límits i precisió
 MenuIdParent=Id del menú pare
 DetailMenuIdParent=IDr del menú pare (buit per a un menú superior)
@@ -133,7 +134,7 @@ PHPTZ=Zona horària Servidor PHP
 DaylingSavingTime=Horari d'estiu (usuari)
 CurrentHour=Hora PHP (servidor)
 CurrentSessionTimeOut=Timeout sessió actual
-YouCanEditPHPTZ=Per establir una zona horària PHP diferent (no és necessari), pots intentar afegir un fitxer .htaccess amb una línia com aquesta "SetEnv TZ Europe/Madrid"
+YouCanEditPHPTZ=Per a establir una zona horària PHP diferent (no obligatori), podeu provar d'afegir un fitxer .htaccess amb una línia com aquesta "SetEnv TZ Europe/Madrid"
 HoursOnThisPageAreOnServerTZ=Avís, al contrari d'altres pantalles, les hores d'aquesta pàgina no són a la vostra zona horària local, sinó a la zona horària del servidor.
 Box=Panell
 Boxes=Panells
@@ -141,23 +142,23 @@ MaxNbOfLinesForBoxes=Màx. nombre de línies pels panells
 AllWidgetsWereEnabled=Tots els widgets disponibles estan habilitats
 PositionByDefault=Posició per defecte
 Position=Lloc
-MenusDesc=Els gestors de menú defineixen el contingut de les dos barres de menú (horitzontal i vertical)
-MenusEditorDesc=L'editor de menús permet definir entrades a mida. S'ha d'emprar amb cura per evitar introduir entrades que no siguin no portin enlloc. <br>Alguns mòduls afegeixen entrades de menú (normalment a <b>Tots</b>). Si per error elimineu cap d'aquestes entrades de menú, podeu restablir-les desactivant i tornant a activar el mòdul.
+MenusDesc=Els gestors de menú configuren el contingut de les dues barres de menú (horitzontal i vertical).
+MenusEditorDesc=L'editor de menú us permet definir entrades de menú personalitzades. Feu-lo servir amb cura per a evitar la inestabilitat i les entrades de menú inaccessibles permanentment. <br> Alguns mòduls afegeixen entrades de menú (al menú <b> Tot </b> sobretot). Si elimineu algunes d'aquestes entrades per error, podeu restaurar-les desactivant i tornant a activar el mòdul.
 MenuForUsers=Menú per als usuaris
 LangFile=arxiu .lang
 Language_en_US_es_MX_etc=Idioma (ca_ES, es_ES, ...)
 System=Sistema
 SystemInfo=Informació del sistema
 SystemToolsArea=Àrea utilitats del sistema
-SystemToolsAreaDesc=Aquesta àrea proporciona funcions d'administració. Utilitza el menú per triar la funció necessària.
+SystemToolsAreaDesc=Aquesta àrea proporciona funcions d'administració. Utilitzeu el menú per a triar la funció necessària.
 Purge=Purga
 PurgeAreaDesc=Aquesta pàgina permet eliminar tots els fitxers generats o guardats per Dolibarr (fitxers temporals o tots els fitxers de la carpeta <b>%s</b>). L'ús d'aquesta funció no és necessària. Es dóna per als usuaris que alberguen Dolibarr en un servidor que no ofereix els permisos d'eliminació de fitxers generats pel servidor web.
 PurgeDeleteLogFile=Suprimeix els fitxers de registre, incloent <b>%s</b> definit per al mòdul Syslog (sense risc de perdre dades)
-PurgeDeleteTemporaryFiles=Elimineu tots els fitxers temporals (no hi ha risc de perdre dades). Nota: La supressió només es fa si el directori temporal es va crear fa 24 hores.
-PurgeDeleteTemporaryFilesShort=Elimina els fitxers temporals
-PurgeDeleteAllFilesInDocumentsDir=Elimineu tots els arxius del directori: <b> %s </b>. <br> Això esborrarà tots documents generats i relacionats amb els elements (Tercers, factures etc ...), arxius carregats al mòdul ECM, còpies de seguretat de la Base de Dades, paperera i arxius temporals.
+PurgeDeleteTemporaryFiles=Suprimeix tots els registres i fitxers temporals (no hi ha risc de perdre dades). Nota: la supressió de fitxers temporals només es fa si el directori temporal es va crear fa més de 24 hores.
+PurgeDeleteTemporaryFilesShort=Esborra el registre i els fitxers temporals
+PurgeDeleteAllFilesInDocumentsDir=Suprimiu tots els fitxers del directori: <b>%s</b>.<br> Això suprimirà tots els documents generats relacionats amb elements (tercers, factures, etc.), fitxers penjats al mòdul GED,  còpies de seguretat de la base de dades i fitxers temporals.
 PurgeRunNow=Purgar
-PurgeNothingToDelete=No hi ha carpeta o fitxers per esborrar.
+PurgeNothingToDelete=No hi ha cap directori ni fitxers per a suprimir.
 PurgeNDirectoriesDeleted=<b>%s</b> arxius o carpetes eliminats
 PurgeNDirectoriesFailed=No s'han pogut eliminar <b>%s</b> fitxers o directoris.
 PurgeAuditEvents=Purgar els esdeveniments de seguretat
@@ -172,14 +173,14 @@ YouCanDownloadBackupFile=Ara es pot descarregar el fitxer generat
 NoBackupFileAvailable=Cap còpia disponible
 ExportMethod=Mètode d'exportació
 ImportMethod=Mètode d'importació
-ToBuildBackupFileClickHere=Per crear una còpia, feu clic <a href="%s">aquí</a>.
+ToBuildBackupFileClickHere=Per a crear un fitxer de còpia de seguretat, feu clic <a href="%s">aquí</a>.
 ImportMySqlDesc=Per a importar una còpia de seguretat MySQL, podeu utilitzar phpMyAdmin a través del vostre hosting o utilitzar les ordres mysql de la línia de comandes. <br> Per exemple:
 ImportPostgreSqlDesc=Per a importar una còpia de seguretat, useu l'ordre pg_restore des de la línia de comandes:
 ImportMySqlCommand=%s %s < elmeuarxiubackup.sql
 ImportPostgreSqlCommand=%s %s elmeuarxiubackup.sql
 FileNameToGenerate=Nom del fitxer de còpia de seguretat:
 Compression=Compressió
-CommandsToDisableForeignKeysForImport=Comanda per desactivar les claus excloents a la importació
+CommandsToDisableForeignKeysForImport=Comanda per a desactivar les claus forànies a la importació
 CommandsToDisableForeignKeysForImportWarning=Obligatori si vol poder restaurar més tard el dump SQL
 ExportCompatibility=Compatibilitat de l'arxiu d'exportació generat
 ExportUseMySQLQuickParameter=Utilitza el paràmetre --quick
@@ -201,11 +202,11 @@ IgnoreDuplicateRecords=Ignorar errors de registres duplicats (INSERT IGNORE)
 AutoDetectLang=Autodetecta (idioma del navegador)
 FeatureDisabledInDemo=Opció deshabilitada en demo
 FeatureAvailableOnlyOnStable=Funcionalitat disponible únicament en versions estables oficials 
-BoxesDesc=Els panells són components que mostren algunes dades que poden afegir-se per personalitzar algunes pàgines. Pots triar entre mostrar el panell o no seleccionant la pàgina de destí i fent clic a 'Activar', o fent clic en la paperera per desactivar.
+BoxesDesc=Els panells són components que mostren algunes dades que poden afegir-se per a personalitzar algunes pàgines. Pots triar entre mostrar el panell o no seleccionant la pàgina de destí i fent clic a 'Activar', o fent clic en la paperera per a desactivar.
 OnlyActiveElementsAreShown=Només els elements de <a href="%s"> mòduls activats</a> són mostrats
 ModulesDesc=Els mòduls/aplicacions determinen quines funcions estan disponibles al programari. Alguns mòduls requereixen que es concedeixin permisos als usuaris després d'activar-lo. Feu clic al botó d'encesa/apagada <span class="small valignmiddle">%s</span> de cada mòdul per a habilitar o desactivar un mòdul/aplicació.
-ModulesMarketPlaceDesc=Pots trobar més mòduls per descarregar en pàgines web externes per internet...
-ModulesDeployDesc=Si els permisos del vostre sistema de fitxers ho permeten, podeu utilitzar aquesta eina per desplegar un mòdul extern. El mòdul serà visible a la pestanya <strong> %s </strong>.
+ModulesMarketPlaceDesc=A internet podeu trobar més mòduls per a descarregar en pàgines web externes...
+ModulesDeployDesc=Si els permisos del vostre sistema de fitxers ho permeten, podeu utilitzar aquesta eina per a desplegar un mòdul extern. El mòdul serà visible a la pestanya <strong> %s </strong>.
 ModulesMarketPlaces=Trobar mòduls/complements externs
 ModulesDevelopYourModule=Desenvolupeu els vostres mòduls/aplicacions
 ModulesDevelopDesc=Podeu desenvolupar o trobar un partner que desenvolupi per a vostè, el vostre mòdul personalitzat
@@ -220,11 +221,11 @@ SeeSetupOfModule=Vegi la configuració del mòdul %s
 Updated=Actualitzat
 Nouveauté=Novetat
 AchatTelechargement=Comprar / Descarregar
-GoModuleSetupArea=Per desplegar / instal·lar un nou mòdul, aneu a l'àrea de configuració del mòdul: <a href="%s"> %s </a>.
+GoModuleSetupArea=Per a desplegar/instal·lar un mòdul nou, aneu a l'àrea de configuració del mòdul: <a href="%s"> %s </a>.
 DoliStoreDesc=DoliStore, el lloc oficial de mòduls complementaris per Dolibarr ERP / CRM
 DoliPartnersDesc=Llista d’empreses que ofereixen mòduls o funcions desenvolupades a mida. <br> Nota: ja que Dolibarr és una aplicació de codi obert, <i> qualsevol usuari </i> experimentat en la programació PHP hauria de poder desenvolupar un mòdul.
 WebSiteDesc=Llocs web de referència per a trobar més mòduls (no core)...
-DevelopYourModuleDesc=Algunes solucions per desenvolupar el vostre propi mòdul...
+DevelopYourModuleDesc=Algunes solucions per a desenvolupar el vostre propi mòdul...
 URL=URL
 RelativeURL=URL relativa
 BoxesAvailable=Panells disponibles
@@ -239,8 +240,8 @@ Security=Seguretat
 Passwords=Contrasenyes
 DoNotStoreClearPassword=Encripta les contrasenyes emmagatzemades a la base de dades (NO com a text sense format). Es recomana activar aquesta opció.
 MainDbPasswordFileConfEncrypted=Encriptar la contrasenya de la base de dades emmagatzemada a conf.php. Es recomana activar aquesta opció.
-InstrucToEncodePass=Per tenir la contrasenya encriptada al fitxer <b>conf.php</b> reemplaça la línia<br><b>$dolibarr_main_db_pass="...";</b><br>per<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
-InstrucToClearPass=Per tenir la contrasenya descodificada en el fitxer de configuració <b> conf.php </b>, reemplaça en aquest fitxer la línia <br><b>$dolibarr_main_db_pass="crypted:..."</b><br> per <br><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=Per a tenir la contrasenya codificada al fitxer <b>conf.php</b>, substituïu la línia <br> <b> $ dolibarr_main_db_pass="...";</b><br>per<br><b> $dolibarr_main_db_pass = "xifrat:%s";</b>
+InstrucToClearPass=Per a tenir la contrasenya descodificada en el fitxer de configuració <b>conf.php</b>, reemplaça en aquest fitxer la línia <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>per<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protegeix els fitxers PDF generats. Això NO es recomana ja que trenca la generació massiva de PDF.
 ProtectAndEncryptPdfFilesDesc=La protecció d'un document PDF el manté disponible per llegir i imprimir amb qualsevol navegador PDF. No obstant això, l'edició i la còpia ja no és possible. Tingues en compte que l'ús d'aquesta característica fa que la construcció d'un arxiu PDF fusionat global no funcioni.
 Feature=Funció
@@ -256,19 +257,20 @@ ReferencedPreferredPartners=Soci preferent
 OtherResources=Altres recursos
 ExternalResources=Recursos externs
 SocialNetworks=Xarxes socials
+SocialNetworkId=Identificador de la xarxa social
 ForDocumentationSeeWiki=Per a la documentació d'usuari, desenvolupador o Preguntes Freqüents (FAQ), consulteu el wiki Dolibarr: <br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Per altres qüestions o realitzar les seves pròpies consultes, pot utilitzar el fòrum Dolibarr: <br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Aquests són alguns recursos per obtenir ajuda i suport amb Dolibarr.
 HelpCenterDesc2=Alguns d'aquests serveis només estan disponibles en <b>anglès</b>.
 CurrentMenuHandler=Gestor de menú
 MeasuringUnit=Unitat de mesura
-LeftMargin=Marge esquerra
+LeftMargin=Marge esquerre
 TopMargin=Marge superior
 PaperSize=Tipus de paper
 Orientation=Orientació
 SpaceX=Àrea X
 SpaceY=Àrea Y
-FontSize=Tamany de font
+FontSize=Mida de la font
 Content=Contingut
 NoticePeriod=Preavís
 NewByMonth=Nou per mes
@@ -326,7 +328,7 @@ MenuHandlers=Gestors de menú
 MenuAdmin=Editor de menú
 DoNotUseInProduction=No utilitzar en producció
 ThisIsProcessToFollow=Procediment d'actualització:
-ThisIsAlternativeProcessToFollow=Aquesta és una configuració alternativa per processar manualment:
+ThisIsAlternativeProcessToFollow=Aquesta és una configuració alternativa per a processar manualment:
 StepNb=Pas %s
 FindPackageFromWebSite=Cerca un paquet que proporcioni les funcions que necessites (per exemple, al lloc web oficial %s).
 DownloadPackageFromWebSite=Descarrega el paquet (per exemple, des del lloc web oficial %s).
@@ -358,7 +360,7 @@ ServerNotAvailableOnIPOrPort=Servidor no disponible en l'adreça <b>%s</b> al po
 DoTestServerAvailability=Provar la connexió amb el servidor
 DoTestSend=Provar enviament
 DoTestSendHTML=Prova l'enviament HTML
-ErrorCantUseRazIfNoYearInMask=Error: no pot utilitzar l'opció @ per reiniciar el comptador cada any si la seqüencia {yy} o {yyyy} no es troba a la mascara
+ErrorCantUseRazIfNoYearInMask=Error, no es pot utilitzar l'opció @ per a restablir el comptador cada any si la seqüència {yy} o {yyyy} no està emmascarada.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, no es pot usar opció @ si la seqüència (yy) (mm) o (yyyy) (mm) no es troba a la màscara.
 UMask=Paràmetre UMask de nous fitxers en Unix/Linux/BSD.
 UMaskExplanation=Aquest paràmetre determina els drets dels arxius creats en el servidor Dolibarr (durant la pujada, per exemple).<br>Aquest ha de ser el valor octal (per exemple, 0666 significa lectura/escriptura per a tots).<br>Aquest paràmetre no té cap efecte sobre un servidor Windows.
@@ -367,7 +369,7 @@ UseACacheDelay= Demora en memòria cau de l'exportació en segons (0 o buit sens
 DisableLinkToHelpCenter=Amagar l'enllaç "Necessita suport o ajuda" a la pàgina de login
 DisableLinkToHelp=Amaga l'enllaç a l'ajuda en línia "<b>%s</b>"
 AddCRIfTooLong=No hi ha cap tall de text automàtic, el text massa llarg no es mostrarà als documents. Si cal, afegiu devolucions de carro a l'àrea de text.
-ConfirmPurge=Estàs segur de voler realitzar aquesta purga? <br> Això esborrarà definitivament totes les dades dels seus fitxers (àrea GED, arxius adjunts etc.).
+ConfirmPurge=Esteu segur que voleu executar aquesta purga? <br>Això suprimirà permanentment tots els fitxers de dades sense opció de restaurar-los (fitxers del GED, fitxers adjunts...).
 MinLength=Longitud mínima
 LanguageFilesCachedIntoShmopSharedMemory=arxius .lang en memòria compartida
 LanguageFile=Fitxer d'idioma
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Exemples amb configuració actual
 ListOfDirectories=Llistat de directoris de plantilles OpenDocument
 ListOfDirectoriesForModelGenODT=Llista de directoris que contenen fitxers de plantilles amb format OpenDocument.<br><br>Posa aquí l'adreça completa dels directoris.<br>Afegeix un "intro" entre cada directori.<br>Per afegir un directori del mòdul GED, afegeix aquí <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Els fitxers d'aquests directoris han de tenir l'extensió <b>.odt</b> o <b>.ods</b>.
 NumberOfModelFilesFound=Nombre d'arxius de plantilles ODT/ODS trobats en aquest(s) directori(s)
-ExampleOfDirectoriesForModelGen=Exemples de sintaxi:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Exemples de sintaxi: <br>c:\\myapp\\mydocumentdir\\mysubdir <br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=Posant les següents etiquetes a la plantilla, obtindrà una substitució amb el valor personalitzat en generar el document:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Crear_un_modelo_de_documento_ODT
 FirstnameNamePosition=Posició del Nom/Cognoms
@@ -388,7 +390,7 @@ ConnectionTimeout=Temps d'espera de connexió
 ResponseTimeout=Timeout de resposta
 SmsTestMessage=Missatge de prova de __PHONEFROM__ per __PHONETO__
 ModuleMustBeEnabledFirst=El mòdul "<b>%s</b>" ha d'habilitar-se primer si necessita aquesta funcionalitat.
-SecurityToken=Clau per encriptar urls
+SecurityToken=Clau per a protegir les URL
 NoSmsEngine=No hi ha cap gestor d'enviament de SMS. Els gestors d'enviament de SMS no s'instal·len per defecte ja que depenen de cada proveïdor, però pot trobar-los a la plataforma %s
 PDF=PDF
 PDFDesc=Opcions globals de generació de PDF
@@ -406,7 +408,7 @@ UrlGenerationParameters=Seguretat de les URL
 SecurityTokenIsUnique=Fer servir un paràmetre securekey únic per a cada URL?
 EnterRefToBuildUrl=Introduïu la referència de l'objecte %s
 GetSecuredUrl=Obté la URL calculada
-ButtonHideUnauthorized=Amaga els botons a usuaris no administradors per accions no autoritzades enlloc de mostrar-los en gris deshabilitats
+ButtonHideUnauthorized=Amaga els botons d'acció no autoritzats també per als usuaris interns (en cas contrari, en gris)
 OldVATRates=Taxa d'IVA antiga
 NewVATRates=Taxa d'IVA nova
 PriceBaseTypeToChange=Canviar el preu on la referència de base és
@@ -435,18 +437,18 @@ ExtrafieldCheckBox=Caselles de selecció
 ExtrafieldCheckBoxFromList=Caselles de selecció des d'una taula
 ExtrafieldLink=Enllaç a un objecte
 ComputedFormula=Camp calculat
-ComputedFormulaDesc=Podeu introduir aquí una fórmula utilitzant altres propietats de l’objecte o qualsevol codi PHP per obtenir un valor calculat dinàmicament. Podeu utilitzar qualsevol fórmula compatible amb PHP, inclòs l'operador condicional "?"  i els següents objectes globals: <strong> $db, $conf, $langs, $mysoc, $user, $object </strong>. <br> <strong> ATENCIÓ </strong>: Només poden estar disponibles algunes propietats de $object. Si necessiteu una propietat no carregada, només cal que incorporeu l'objecte a la vostra fórmula com en el segon exemple. <br> Utilitzar un camp calculat implica que no podreu introduir cap valor des de la interfície. A més, si hi ha un error de sintaxi, la fórmula pot no tornar res. <br> <br> Exemple de fórmula: <br> $object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2 ) <br> <br> Exemple per tornar a carregar l'objecte <br>  (($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br> <br> Un altre exemple de fórmula per forçar la càrrega de l'objecte i el seu objecte pare: <br> (($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=Podeu introduir aquí una fórmula utilitzant altres propietats de l’objecte o qualsevol codi PHP per a obtenir un valor calculat dinàmicament. Podeu utilitzar qualsevol fórmula compatible amb PHP, inclòs l'operador condicional «?»  i els següents objectes globals: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>. <br><strong>ATENCIÓ</strong>: Només poden estar disponibles algunes propietats de $object. Si necessiteu una propietat no carregada, només cal que incorporeu l'objecte a la vostra fórmula com en el segon exemple. <br> Utilitzar un camp calculat implica que no podreu introduir cap valor des de la interfície. A més, si hi ha un error de sintaxi, la fórmula pot no tornar res. <br> <br> Exemple de fórmula: <br> $object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2 ) <br> <br> Exemple per a tornar a carregar l'objecte <br>  (($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br> <br> Un altre exemple de fórmula per a forçar la càrrega de l'objecte i el seu objecte pare: <br> (($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Emmagatzemar el camp computat
-ComputedpersistentDesc=Els camps addicionals computats s’emmagatzemaran a la base de dades, però, el valor només es tornarà a calcular quan l’objecte d’aquest camp s’ha canviat. Si el camp calculat depèn d'altres objectes o dades globals, aquest valor podria estar equivocat !!
+ComputedpersistentDesc=Els camps addicionals calculats s’emmagatzemaran a la base de dades, però el valor només es recalcularà quan es canviï l’objecte d’aquest camp. Si el camp calculat depèn d'altres objectes o dades globals, aquest valor pot ser incorrecte!!
 ExtrafieldParamHelpPassword=Mantenir aquest camp buit significa que el valor s'emmagatzema sense xifrar (el camp només ha d'estar amagat amb una estrella sobre la pantalla). <br> Establiu aquí el valor 'auto' per utilitzar la regla de xifrat per defecte per guardar la contrasenya a la base de dades (el valor llegit serà només el "hash", no hi haurà cap manera de recuperar el valor original)
-ExtrafieldParamHelpselect=La llista de valors ha de ser un conjunt de línies amb un par del tipus clau,valor (on la clau no pot ser '0') <br><br> per exemple : <br>clau1,valor1<br>clau2,valor2<br>clau3,valor3<br>...<br><br>Per tenir la llista depenent d'una altra llista d'atributs complementaris: <br>1,valor1|options_<i>codi_llista_pare</i>:clau_pare<br>2,valor2|options_<i>codi_llista_pare</i>:clau_pare <br><br>Per tenir la llista depenent d'una altra llista:<br>1,valor1|<i>codi_llista_pare</i>:clau_pare<br>2,valor2|<i>codi_llista_pare</i>:clau_pare
-ExtrafieldParamHelpcheckbox=La llista de valor ha de ser un conjunt de línies del tipus clau,valor (a on la clau no pot ser '0')<br><br> per exemple : <br>1,valor1<br>2,valor2<br>3,valor3<br>...
-ExtrafieldParamHelpradio=La llista de valor ha de ser un conjunt de línies del tipus clau,valor (a on la clau no pot ser '0')<br><br> per exemple : <br>1,valor1<br>2,valor2<br>3,valor3<br>...
-ExtrafieldParamHelpsellist=Llista de valors que provenen d’una taula<br>Sintaxi: nom_taula:nom_camp:id_camp::filtre<br>Exemple: c_typent:libelle:id::filtre<br><br>- id_camp ha de ser necessàriament una "primary int key"<br>- el filtre pot ser una comprovació senzilla (p.e. active=1) per mostrar només els valors actius<br>També pots utilitzar $ID$ al filtre per representar el ID de l'actual objecte en curs<br>Per utilitzar un SELECT al filtre, utilitzeu la paraula clau $SEL$ per evitar la protecció antiinjecció.<br>Si vols filtrar camps addicionals utilitza la sintaxi extra.nom_camp=... (on nom_camp és el codi del camp addicional)<br><br>Per tenir la llista en funció d’una altra llista d’atributs complementaris:<br>c_typent:libelle:id:options_<i>codi_llista_mare</i>|parent_column:filtre <br><br>Per tenir la llista en funció d'una altra llista:<br>c_typent:libelle:id:<i>codi_llista_mare</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=La llista de valors prové d'una taula <br> Sintaxi: nom_taula:nom_camp:id_camp::filtre <br> Exemple: c_typent:libelle:id::filter<br> <br> filtre pot ser una comprovació simple (p. ex. active=1) per mostrar només el valor actiu <br> També podeu utilitzar $ID$ en el filtre per representar l'ID actual de l'objecte en curs <br>Per fer un SELECT en el filtre utilitzeu $SEL$ <br> si voleu filtrar per camps extra utilitzeu sintaxi extra.fieldcode=... (on el codi de camp és el codi del extrafield) <br> <br>Per tenir la llista depenent d'una altra llista d'atributs complementaris: <br>c_typent:libelle:id:options_<i>codi_llista_pare</i>|parent_column: filter  <br><br>Per tenir la llista depenent d'una altra llista: c_typent:libelle:id:<i>codi_llista_pare</i>|parent_column:filter
+ExtrafieldParamHelpselect=La llista de valors ha de ser un conjunt de línies amb un format del tipus clau,valor (on la clau no pot ser '0') <br><br> per exemple: <br>1,valor1<br>2,valor2<br>codi3,valor3<br>...<br><br>Per a tenir la llista depenent d'una altra llista d'atributs complementaris: <br>1,valor1|options_<i>codi_llista_pare</i>:clau_pare<br>2,valor2|options_<i>codi_llista_pare</i>:clau_pare <br><br>Per a tenir la llista depenent d'una altra llista:<br>1,valor1|<i>codi_llista_pare</i>:clau_pare<br>2,valor2|<i>codi_llista_pare</i>:clau_pare
+ExtrafieldParamHelpcheckbox=La llista de valor ha de ser un conjunt de línies del tipus clau,valor (on la clau no pot ser '0')<br><br> per exemple: <br>1,valor1<br>2,valor2<br>3,valor3<br>...
+ExtrafieldParamHelpradio=La llista de valor ha de ser un conjunt de línies del tipus clau,valor (on la clau no pot ser '0')<br><br> per exemple: <br>1,valor1<br>2,valor2<br>3,valor3<br>...
+ExtrafieldParamHelpsellist=Llista de valors que provenen d’una taula<br>Sintaxi: nom_taula:nom_camp:id_camp::filtre<br>Exemple: c_typent:libelle:id::filtre<br><br>- id_camp ha de ser necessàriament una "primary int key"<br>- el filtre pot ser una comprovació senzilla (p.e. active=1) per a mostrar només els valors actius<br>També pots utilitzar $ID$ al filtre per a representar el ID de l'actual objecte en curs<br>Per a utilitzar un SELECT al filtre, utilitzeu la paraula clau $SEL$ per a evitar la protecció anti injecció.<br>Si vols filtrar camps addicionals utilitza la sintaxi extra.nom_camp=... (on nom_camp és el codi del camp addicional)<br><br>Per a tenir la llista en funció d’una altra llista d’atributs complementaris:<br>c_typent:libelle:id:options_<i>codi_llista_mare</i>|parent_column:filtre <br><br>Per a tenir la llista en funció d'una altra llista:<br>c_typent:libelle:id:<i>codi_llista_mare</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=La llista de valors prové d'una taula <br> Sintaxi: nom_taula:nom_camp:id_camp::filtre <br> Exemple: c_typent:libelle:id::filter<br> <br> filtre pot ser una comprovació simple (p. ex. active=1) per a mostrar només el valor actiu <br> També podeu utilitzar $ID$ en el filtre per a representar l'ID actual de l'objecte en curs <br>Per fer un SELECT en el filtre utilitzeu $SEL$ <br> si voleu filtrar per camps extra utilitzeu sintaxi extra.fieldcode=... (on el codi de camp és el codi del extrafield) <br> <br>Per a tenir la llista depenent d'una altra llista d'atributs complementaris: <br>c_typent:libelle:id:options_<i>codi_llista_pare</i>|parent_column: filter  <br><br>Per a tenir la llista depenent d'una altra llista: c_typent:libelle:id:<i>codi_llista_pare</i>|parent_column:filter
 ExtrafieldParamHelplink=Els paràmetres han de ser ObjectName:Classpath <br>Sintaxi: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Manteniu-lo buit per un simple separador <br> Configureu-ho a 1 per a un separador col·lapsador (obert per defecte per a la sessió nova, i es mantindrà l'estat de cada sessió d'usuari) <br> Configureu-ho a 2 per a un separador col·lapsat (es va desplomar per defecte per a la sessió nova, i es mantindrà l'estat per a cada sessió d'usuari)
-LibraryToBuildPDF=Llibreria utilitzada per generar PDF
+LibraryToBuildPDF=Llibreria utilitzada per a la generació de PDF
 LocalTaxDesc=Alguns països apliquen 2 o 3 impostos en cada línia de factura. Si aquest és el cas, escull el tipus pel segon i el tercer impost i el seu valor. Els tipus possibles són: <br>1: impostos locals aplicats en productes i serveis sense IVA (l'impost local serà calculat en el total sense impostos)<br>2: impost local aplicat en productes i serveis amb IVA (l'impost local serà calculat amb el total + l'impost principal)<br>3: impost local aplicat en productes sense IVA (l'impost local serà calculat en el total sense impost)<br>4: impost local aplicat en productes amb IVA (l'impost local serà calculat amb el total + l'impost principal)<br>5: impost local aplicat en serveis sense IVA (l'impost local serà calculat amb el total sense impost)<br>6: impost local aplicat en serveis amb IVA inclòs (l'impost local serà calculat amb el total + IVA)
 SMS=SMS
 LinkToTestClickToDial=Introduïu un número de telèfon que voleu marcar per provar l'enllaç de crida ClickToDial per a l'usuari <strong>%s</strong>
@@ -467,7 +469,7 @@ EraseAllCurrentBarCode=Esborrar tots els valors de codi de barres actuals
 ConfirmEraseAllCurrentBarCode=Esteu segur que voleu esborrar tots els valors de codis de barres actuals?
 AllBarcodeReset=S'han eliminat tots els valors de codi de barres
 NoBarcodeNumberingTemplateDefined=No hi ha cap plantilla de codi de barres habilitada a la configuració del mòdul de codi de barres.
-EnableFileCache=Habilita la caché de fitxers
+EnableFileCache=Activa la memòria cau de fitxers
 ShowDetailsInPDFPageFoot=Afegiu més detalls al peu de pàgina, com ara l'adreça de l'empresa o els noms dels gestors (a més d'identificadors professionals, capital de l'empresa i número de NIF/CIF).
 NoDetails=No hi ha detalls addicionals al peu de pàgina
 DisplayCompanyInfo=Mostra l'adreça de l'empresa
@@ -502,11 +504,11 @@ EnableOverwriteTranslation=Habilita l'ús de la traducció sobreescrita
 GoIntoTranslationMenuToChangeThis=S'ha trobat una traducció de la clau amb aquest codi. Per a canviar aquest valor, l’heu d’editar des d'Inici-Configuració-Traducció.
 WarningSettingSortOrder=Avís, establir un ordre de classificació predeterminat pot provocar un error tècnic en passar a la pàgina de la llista si el camp és un camp desconegut. Si experimentes aquest error, torna a aquesta pàgina per eliminar l'ordre de classificació predeterminat i restablir el comportament predeterminat.
 Field=Camp
-ProductDocumentTemplates=Plantilles de documents per generar document de producte
+ProductDocumentTemplates=Plantilles de documents per a generar document de producte
 FreeLegalTextOnExpenseReports=Text legal lliure en informes de despeses
 WatermarkOnDraftExpenseReports=Marca d'aigua en informes de despeses esborrany
 AttachMainDocByDefault=Establiu-lo a 1 si voleu adjuntar el document principal al correu electrònic de manera predeterminada (si escau)
-FilesAttachedToEmail=Adjuntar fitxer
+FilesAttachedToEmail=Adjunta el fitxer
 SendEmailsReminders=Enviar recordatoris d'agenda per correu electrònic
 davDescription=Configura un servidor WebDAV
 DAVSetup=Configuració del mòdul DAV
@@ -615,11 +617,11 @@ Module1520Desc=Generació de documents de correu electrònic massiu
 Module1780Name=Etiquetes
 Module1780Desc=Crea etiquetes (productes, clients, proveïdors, contactes o socis)
 Module2000Name=Editor WYSIWYG
-Module2000Desc=Permetre que els camps de text es puguin editar/formatejar amb CKEditor (html)
+Module2000Desc=Permet editar/formatar els camps de text mitjançant CKEditor (html)
 Module2200Name=Multi-preus
 Module2200Desc=Utilitza expressions matemàtiques per a la generació automàtica de preus
 Module2300Name=Tasques programades
-Module2300Desc=Gestió de tasques programades (alias cron o taula chrono)
+Module2300Desc=Gestió de tasques programades (àlies cron o taula de crons)
 Module2400Name=Esdeveniments/Agenda
 Module2400Desc=Seguiment d'esdeveniments. Registre d'esdeveniments automàtics per a fer el seguiment o registrar esdeveniments manuals o reunions. Aquest és el mòdul principal per a una bona gestió de la relació amb clients o proveïdors.
 Module2500Name=SGD / GCE
@@ -641,7 +643,7 @@ Module4000Name=RRHH
 Module4000Desc=Gestió de recursos humans (gestionar departaments, empleats, contractes i "feelings")
 Module5000Name=Multi-empresa
 Module5000Desc=Permet gestionar diverses empreses
-Module6000Name=Workflow
+Module6000Name=Flux de treball
 Module6000Desc=Gestió del flux de treball (creació automàtica d'objectes i / o canvi d'estat automàtic)
 Module10000Name=Pàgines web
 Module10000Desc=Creeu llocs web (públics) amb un editor WYSIWYG. Es tracta d’un CMS per a administradors web o desenvolupador (és millor conèixer el llenguatge HTML i CSS). N’hi ha prou amb configurar el servidor web (Apache, Nginx, ...) per assenyalar el directori dedicat a Dolibarr perquè el tingui en línia a Internet amb el seu propi nom de domini.
@@ -652,15 +654,15 @@ Module39000Desc=Lots, números de sèrie, gestió de data de comerç / venda per
 Module40000Name=Multidivisa
 Module40000Desc=Utilitza divises alternatives en preus i documents
 Module50000Name=PayBox
-Module50000Desc=Oferiu als clients una pàgina de pagament en línia de PayBox (targetes de crèdit / dèbit). Això es pot utilitzar per permetre als vostres clients fer pagaments o pagaments ad hoc relacionats amb un objecte Dolibarr específic (factura, ordre, etc ...)
+Module50000Desc=Oferiu als clients una pàgina de pagament en línia de PayBox (targetes de crèdit/dèbit). Es pot utilitzar per a permetre als vostres clients fer pagaments ad-hoc o pagaments relacionats amb un objecte Dolibarr específic (factura, comanda, etc.)
 Module50100Name=TPV SimplePOS
 Module50100Desc=Mòdul de punt de venda SimplePOS (TPV simple).
 Module50150Name=TPV TakePOS
 Module50150Desc=Mòdul de punt de venda TakePOS (TOS de pantalla tàctil, per a botigues, bars o restaurants).
 Module50200Name=Paypal
-Module50200Desc=Ofereix als clients una pàgina de pagament en línia de PayPal (compte PayPal o targetes de crèdit / dèbit). Això es pot utilitzar per permetre als vostres clients fer pagaments o pagaments ad-hoc relacionats amb un objecte Dolibarr específic (factura, ordre, etc ...)
+Module50200Desc=Oferiu als clients una pàgina de pagament en línia de PayPal (compte de PayPal o targetes de crèdit/dèbit). Es pot utilitzar per a permetre als vostres clients fer pagaments ad-hoc o pagaments relacionats amb un objecte Dolibarr específic (factura, comanda, etc.)
 Module50300Name=Stripe
-Module50300Desc=Oferiu als clients una pàgina de pagament en línia de Stripe (targetes de crèdit / dèbit). Això es pot utilitzar per permetre als vostres clients fer pagaments o pagaments ad-hoc relacionats amb un objecte Dolibarr específic (factura, ordre, etc ...)
+Module50300Desc=Oferiu als clients una pàgina de pagaments en línia de Stripe (targetes de crèdit/dèbit). Es pot utilitzar per a permetre als vostres clients fer pagaments ad-hoc o pagaments relacionats amb un objecte Dolibarr específic (factura, comanda, etc.)
 Module50400Name=Comptabilitat (doble entrada)
 Module50400Desc=Gestió comptable (entrades dobles, suport de comptabilitats generals i subsidiàries). Exporteu el llibre major en altres formats de programari de comptabilitat.
 Module54000Name=PrintIPP
@@ -678,13 +680,13 @@ Module63000Desc=Gestiona els recursos (impressores, cotxes, habitacions...) que
 Permission11=Consulta factures de client
 Permission12=Crear/Modificar factures
 Permission13=Invalida les factures dels clients
-Permission14=Validar factures
+Permission14=Valida les factures dels clients
 Permission15=Envia factures per e-mail
 Permission16=Crear cobraments per factures de client
 Permission19=Elimina factures de client
 Permission21=Consulta pressupostos
 Permission22=Crear/modificar pressupostos
-Permission24=Validar pressupostos
+Permission24=Valida pressupostos
 Permission25=Envia pressupostos
 Permission26=Tancar pressupostos
 Permission27=Elimina pressupostos
@@ -695,9 +697,9 @@ Permission34=Elimina productes
 Permission36=Veure/gestionar els productes ocults
 Permission38=Exportar productes
 Permission39=Ignora el preu mínim
-Permission41=Llegir projectes i tasques (projectes compartits i projectes dels que sóc contacte). També pot introduir temps consumits, per a mi o els meus subordinats, en tasques assignades (Fulls de temps).
-Permission42=Crea/modifica projectes (projectes compartits i projectes dels que sóc contacte). També pot crear tasques i assignar usuaris a projectes i tasques
-Permission44=Elimina projectes (projectes compartits i projectes dels que en sóc contacte)
+Permission41=Consulta projectes i tasques (projecte compartit i projectes dels qui en soc contacte). També pot introduir temps consumits, per a mi o dels meus subordinats, en tasques assignades (Fulls de temps).
+Permission42=Crea/modifica projectes (projecte compartit i projectes dels qui en soc contacte). També pot crear tasques i assignar usuaris al projecte i tasques
+Permission44=Elimina projectes (projecte compartit i projectes de qui en soc contacte)
 Permission45=Exporta projectes
 Permission61=Consulta intervencions
 Permission62=Crea/modifica intervencions
@@ -742,9 +744,9 @@ Permission121=Consulta tercers enllaçats a usuaris
 Permission122=Crea/modifica tercers enllaçats a l'usuari
 Permission125=Elimina tercers enllaçats a l'usuari
 Permission126=Exporta tercers
-Permission141=Consulta tots els projectes i tasques (també els projectes privats dels que no sóc contacte)
-Permission142=Crea/modifica tots els projectes i tasques (també projectes privats dels que no sóc el contacte)
-Permission144=Elimina tots els projectes i tasques (també els projectes privats dels que no sóc contacte)
+Permission141=Consulta tots els projectes i tasques (també els projectes privats dels qui no en soc contacte)
+Permission142=Crea/modifica tots els projectes i tasques (també projectes privats dels qui no en soc contacte)
+Permission144=Elimina tots els projectes i tasques (també els projectes privats dels qui no en soc contacte)
 Permission146=Consulta proveïdors
 Permission147=Consulta estadístiques
 Permission151=Llegir domiciliacions
@@ -833,7 +835,7 @@ Permission354=Eliminar o desactivar grups
 Permission358=Exportar usuaris
 Permission401=Consultar havers
 Permission402=Crear/modificar havers
-Permission403=Validar havers
+Permission403=Valida els descomptes
 Permission404=Eliminar havers
 Permission430=Utilitzeu la barra de depuració
 Permission511=Consulta els pagaments dels sous (vostres i subordinats)
@@ -1047,14 +1049,14 @@ VATIsNotUsedExampleFR=A França, es tracta d'associacions que no siguin declarad
 TypeOfSaleTaxes=Tipus d’impost sobre vendes
 LTRate=Tarifa
 LocalTax1IsNotUsed=No subjecte
-LocalTax1IsUsedDesc=Utilitzar un 2on tipus d'impost (diferent de l'IVA)
-LocalTax1IsNotUsedDesc=No utilitzar un 2on tipus d'impost (diferent de l'IVA)
+LocalTax1IsUsedDesc=Utilitza un 2n tipus d'impost (diferent de l'IVA)
+LocalTax1IsNotUsedDesc=No utilitzis un 2n tipus d’impost (diferent de l'IVA)
 LocalTax1Management=2n tipus d'impost
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
 LocalTax2IsNotUsed=No subjecte
-LocalTax2IsUsedDesc=Utilitzar un 3er tipus d'impost (diferent de l'IVA)
-LocalTax2IsNotUsedDesc=No utilitzar un 3er tipus d'impost (diferent de l'IVA)
+LocalTax2IsUsedDesc=Utilitza un 3r tipus d'impost (diferent de l'IVA)
+LocalTax2IsNotUsedDesc=No utilitzis un 3r tipus d'impost (diferent de l'IVA)
 LocalTax2Management=3r tipus d'impost
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
@@ -1094,7 +1096,7 @@ MenuUpgrade=Actualització / Extensió
 AddExtensionThemeModuleOrOther=Instal·lar mòduls/complements externs
 WebServer=Servidor web
 DocumentRootServer=Carpeta arrel de les pàgines web
-DataRootServer=Carpeta arrel dels arxius de dades
+DataRootServer=Directori de fitxers de dades
 IP=IP
 Port=Port
 VirtualServerName=Nom del servidor virtual
@@ -1170,7 +1172,7 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Informe de despeses per aprovar
 Delays_MAIN_DELAY_HOLIDAYS=Dies lliures a aprovar
 SetupDescription1=Abans de començar a utilitzar Dolibarr cal definir alguns paràmetres inicials i habilitar/configurar els mòduls.
 SetupDescription2=Les dues seccions següents són obligatòries (les dues primeres entrades al menú Configuració):
-SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Paràmetres bàsics utilitzats per personalitzar el comportament predeterminat de la teva aplicació (per exemple, per a les funcions relacionades amb el país).
+SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Paràmetres bàsics utilitzats per a personalitzar el comportament per defecte de la vostra aplicació (per exemple, per a funcions relacionades amb el país).
 SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Aquest programari és un conjunt de molts mòduls / aplicacions. Els mòduls relacionats amb les vostres necessitats s’han d’activar i configurar. Les entrades del menú apareixen amb l’activació d’aquests mòduls.
 SetupDescription5=Altres entrades del menú d'instal·lació gestionen paràmetres opcionals.
 LogEvents=Auditoria de la seguretat d'esdeveniments
@@ -1201,12 +1203,12 @@ SessionTimeOut=Temps de desconnexió per a la sessió
 SessionExplanation=Aquest número garanteix que la sessió no caduqui abans d'aquest retard, si el netejador de sessió es fa mitjançant un netejador de sessió de PHP intern (i res més). El netejador de sessió intern de PHP no garanteix que la sessió expire després d'aquest retard. Caducarà, després d'aquest retard, i quan s'executi el netejador de sessió, de manera que cada accés <b> %s / %s </b>, però només durant l'accés fet per altres sessions (si el valor és 0, significa que l'eliminació de la sessió només es fa mitjançant un extern procés). <br> Nota: en alguns servidors amb un mecanisme de neteja de sessió externa (cron sota debian, ubuntu ...), les sessions es poden destruir després d'un període definit per una configuració externa, independentment del valor introduït aquí.
 SessionsPurgedByExternalSystem=Sembla que les sessions en aquest servidor són netejades mitjançant un mecanisme extern (cron sota debian, ubuntu ...), probablement cada  <b> %s </b> segons (= el valor del paràmetre  sessió.gc_maxlifetime ), així que modificant aquest valor aquí no té cap efecte, Heu de sol·licitar a l’administrador del servidor que canviï la durada de la sessió.
 TriggersAvailable=Triggers disponibles
-TriggersDesc=Els triggers són arxius que modifiquen el comportament del fluxe de treball de Dolibarr un cop s'han copiat a la carpeta <b>htdocs/core/triggers</b>. Realitzen noves accions activades pels esdeveniments de Dolibarr (creació d'empresa, validació factura, ...).
+TriggersDesc=Els activadors són fitxers que modificaran el comportament del flux de treball de Dolibarr un cop copiat al directori <b>htdocs/core/triggers</b>. Realitzen accions noves, activades en esdeveniments Dolibarr (creació d'empresa nova, validació de factures, ...).
 TriggerDisabledByName=Triggers d'aquest arxiu desactivador pel sufix <b>-NORUN</b> en el nom de l'arxiu.
 TriggerDisabledAsModuleDisabled=Triggers d'aquest arxiu desactivats ja que el mòdul <b>%s</b> no està activat.
 TriggerAlwaysActive=Triggers d'aquest arxiu sempre actius, ja que els mòduls Dolibarr relacionats estan activats
 TriggerActiveAsModuleActive=Triggers d'aquest arxiu actius ja que el mòdul <b>%s</b> està activat
-GeneratedPasswordDesc=Trieu el mètode que s'utilitzarà per a les contrasenyes auto-generades.
+GeneratedPasswordDesc=Trieu el mètode que s'utilitzarà per a les contrasenyes generades automàticament.
 DictionaryDesc=Afegeix totes les dades de referència. Pots afegir els teus valors per defecte.
 ConstDesc=Aquesta pàgina permet editar (anul·lar) paràmetres no disponibles en altres pàgines. Aquests són paràmetres reservats només per a desenvolupadors o solucions avançades de problemes.
 MiscellaneousDesc=Aquí es defineixen la resta de paràmetres relacionats amb la seguretat.
@@ -1222,7 +1224,7 @@ ParameterActiveForNextInputOnly=Paràmetre efectiu només a partir de les proper
 NoEventOrNoAuditSetup=No s'ha registrat cap esdeveniment de seguretat. Això és normal si l'auditoria no s'ha activat a la pàgina "Configuració - Seguretat - Esdeveniments".
 NoEventFoundWithCriteria=No s'han trobat esdeveniments de seguretat per a aquests criteris de cerca.
 SeeLocalSendMailSetup=Veure la configuració local de sendmail
-BackupDesc=Una còpia de seguretat <b> completa de </b> d'una instal·lació de Dolibarr requereix dos passos.
+BackupDesc=Una còpia de seguretat <b>completa</b> d'una instal·lació Dolibarr requereix dos passos.
 BackupDesc2=Feu una còpia de seguretat del contingut del directori "documents" (<b> %s </b>) que conté tots els fitxers carregats i generats. Això també inclourà tots els fitxers d'escombraries generats al pas 1. Aquesta operació pot tardar uns minuts
 BackupDesc3=Feu una còpia de seguretat de l'estructura i continguts de la vostra base de dades (<b> %s </b>) en un arxiu de bolcat. Per això, podeu utilitzar el següent assistent.
 BackupDescX=La carpeta arxivada haurà de guardar-se en un lloc segur
@@ -1240,7 +1242,7 @@ WeekStartOnDay=Primer dia de la setmana
 RunningUpdateProcessMayBeRequired=Sembla que cal executar el procés d’actualització (la versió del programa %s és diferent de la versió de la base de dades %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Ha d'executar la comanda des d'un shell després d'haver iniciat sessió amb el compte <b>%s</b>.
 YourPHPDoesNotHaveSSLSupport=Funcions SSL no disponibles al vostre PHP
-DownloadMoreSkins=Més temes per descarregar
+DownloadMoreSkins=Més temes per a descarregar
 SimpleNumRefModelDesc=Retorna el número de referència amb el format %syymm-nnnn on yy és l'any, mm és el mes i nnnn és el seqüencial sense inicialitzar
 ShowProfIdInAddress=Mostra l'identificador professional amb adreces
 ShowVATIntaInAddress=Amaga el número d'IVA intracomunitari amb adreces
@@ -1276,12 +1278,12 @@ ExtraFieldsSupplierInvoices=Atributs complementaris (factures)
 ExtraFieldsProject=Atributs complementaris (projectes)
 ExtraFieldsProjectTask=Atributs complementaris (tasques)
 ExtraFieldsSalaries=Atributs complementaris (sous)
-ExtraFieldHasWrongValue=L'atribut %s té un valor no valid
+ExtraFieldHasWrongValue=L'atribut %s té un valor incorrecte.
 AlphaNumOnlyLowerCharsAndNoSpace=només caràcters alfanumèrics i en minúscula sense espai
 SendmailOptionNotComplete=Atenció, en alguns sistemes Linux, amb aquest mètode d'enviament, per poder enviar mails en nom seu, la configuració de sendmail ha de contenir l'opció <b>-ba</b> (paràmetre <b>mail.force_extra_parameters</b> a l'arxiu <b>php.ini</b>). Si alguns dels seus destinataris no reben els seus missatges, proveu de modificar aquest paràmetre PHP amb <b>mail.force_extra_parameters =-ba </b>.
 PathToDocuments=Rutes d'accés a documents
 PathDirectory=Catàleg
-SendmailOptionMayHurtBuggedMTA=La característica per enviar correus mitjançant el mètode "correu directe de PHP" generarà un missatge de correu que podria no ser analitzat correctament per alguns servidors de correu rebuts. El resultat és que alguns usuaris no poden llegir alguns mails d'aquestes plataformes falses. Aquest és el cas d'alguns proveïdors d'Internet (Ex: Orange a França). Això no és un problema amb Dolibarr o PHP, però amb el servidor de correu rebedor. Tanmateix, podeu afegir una opció MAIN_FIX_FOR_BUGGED_MTA a 1 en la instal·lació: una altra per modificar Dolibarr per evitar-ho. Tanmateix, pot tenir problemes amb altres servidors que utilitzin estrictament l'estàndard SMTP. L'altra solució (recomanada) és utilitzar el mètode "biblioteca de sockets SMTP" que no té cap desavantatge.
+SendmailOptionMayHurtBuggedMTA=La característica per a enviar correus mitjançant el mètode "correu directe de PHP" generarà un missatge de correu que podria no ser analitzat correctament per alguns servidors de correu entrant. El resultat és que alguns usuaris no poden llegir alguns correus d'aquestes plataformes errònies. Aquest és el cas d'alguns proveïdors d'Internet (Ex: Orange a França). Això no és un problema amb Dolibarr o PHP, però sí amb el servidor de correu entrant. Tanmateix, podeu afegir una opció MAIN_FIX_FOR_BUGGED_MTA a 1 a Configuració - Altres per a modificar Dolibarr per tal d'evitar-ho. Tanmateix, podeu tenir problemes amb altres servidors que utilitzin estrictament l'estàndard SMTP. L'altra solució (recomanada) és utilitzar el mètode "llibreria de sockets SMTP" que no té cap desavantatge.
 TranslationSetup=Configuració de traducció
 TranslationKeySearch=Cerca una clau o cadena de traducció
 TranslationOverwriteKey=Sobreescriu una cadena de traducció
@@ -1324,8 +1326,8 @@ DocumentModules=Models de documents
 ##### Module password generation
 PasswordGenerationStandard=Retorna una contrasenya generada segons l'algorisme intern de Dolibarr: %s caràcters amb barreja de números i caràcters en minúscula.
 PasswordGenerationNone=No suggereixis una contrasenya generada. La contrasenya s'ha d'escriure manualment.
-PasswordGenerationPerso=Retorna una contrasenya d'acord a la seva configuració personalitzada.
-SetupPerso=D'acord a la teva configuració
+PasswordGenerationPerso=Retorna una contrasenya segons la vostra configuració personalitzada.
+SetupPerso=Segons la vostra configuració
 PasswordPatternDesc=Descripció patró contrasenya
 ##### Users setup #####
 RuleForGeneratedPasswords=Regles per a generar i validar contrasenyes
@@ -1340,7 +1342,7 @@ HRMSetup=Configuració de mòdul de gestió de recursos humans
 ##### Company setup #####
 CompanySetup=Configuració del mòdul empreses
 CompanyCodeChecker=Opcions per a la generació automàtica de codis de client / proveïdor
-AccountCodeManager=Opcions per generar automàticament codis de comptabilitat de client / proveïdor
+AccountCodeManager=Opcions per a la generació automàtica de comptes comptables de client/proveïdor
 NotificationsDesc=Les notificacions per correu electrònic es poden enviar automàticament per a alguns esdeveniments de Dolibarr. <br> Es poden definir els destinataris de les notificacions:
 NotificationsDescUser=* per usuari, un usuari alhora.
 NotificationsDescContact=* per contactes de tercers (clients o venedors), un contacte a la vegada.
@@ -1389,7 +1391,7 @@ SupplierProposalPDFModules=Models de documents de sol·licituds de preus a prove
 FreeLegalTextOnSupplierProposal=Text lliure en sol·licituds de preus a proveïdors
 WatermarkOnDraftSupplierProposal=Marca d'aigua en sol·licituds de preus a proveïdors (en cas d'estar buit)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Preguntar per compte bancari per utilitzar en el pressupost
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Preguntar per el magatzem d'origen per a la comanda
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Demana pel magatzem d'origen per a la comanda
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Demana el compte bancari de destí de la comanda de compra
 ##### Orders #####
@@ -1399,8 +1401,8 @@ OrdersNumberingModules=Models de numeració de comandes
 OrdersModelModule=Models de documents de comandes
 FreeLegalTextOnOrders=Text lliure en comandes
 WatermarkOnDraftOrders=Marca d'aigua en comandes esborrany (en cas d'estar buit)
-ShippableOrderIconInList=Afegir una icona en el llistat de comandes que indica si la comanda és enviable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Preguntar pel compte bancari a l'utilitzar la comanda
+ShippableOrderIconInList=Afegeix una icona a la llista de comandes que indiqui si la comanda es pot enviar
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Demana el compte bancari de destí en la comanda
 ##### Interventions #####
 InterventionsSetup=Configuració del mòdul intervencions
 FreeLegalTextOnInterventions=Text addicional en les fitxes d'intervenció
@@ -1569,7 +1571,7 @@ NotSlowedDownByThis=No frenat per això.
 NotRiskOfLeakWithThis=No hi ha risc de filtració amb això.
 ApplicativeCache=Aplicació memòria cau
 MemcachedNotAvailable=No s'ha trobat una aplicació de cache. Pot millorar el rendiment instal·lant un cache server Memcached i un mòdul capaç d'utilitzar aquest servidor de cache.<br>Mes informació aquí <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Tingui en compte que alguns hostings no ofereixen servidors cache.
-MemcachedModuleAvailableButNotSetup=S'ha trobat el mòdul memcached per a la aplicació de memòria cau, però la configuració del mòdul no està completa.
+MemcachedModuleAvailableButNotSetup=S'ha trobat el mòdul memcached per a l'aplicació de memòria cau, però la configuració del mòdul no està completa.
 MemcachedAvailableAndSetup=El mòdul memcached dedicat a utilitzar el servidor memcached està habilitat.
 OPCodeCache=OPCode memòria cau
 NoOPCodeCacheFound=No s'ha trobat cap memòria cau OPCode. Potser utilitzeu una memòria cau OPCode diferent de XCache o eAccelerator (bé), o potser no tingueu la memòria cau OPCode (molt dolenta).
@@ -1617,7 +1619,7 @@ ErrorUnknownSyslogConstant=La constant %s no és una constant syslog coneguda
 OnlyWindowsLOG_USER=En Windows, només s'admetrà la funció LOG_USER
 CompressSyslogs=Compressió i còpia de seguretat dels fitxers de registre de depuració (generats pel mòdul Log per depurar)
 SyslogFileNumberOfSaves=Nombre de registres de còpia de seguretat que cal conservar
-ConfigureCleaningCronjobToSetFrequencyOfSaves=Configura la tasca programada de neteja per establir la freqüència de còpia de seguretat del registre
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configureu la tasca programada de neteja per a establir la freqüència de còpia de seguretat del registre
 ##### Donations #####
 DonationsSetup=Configuració del mòdul donacions
 DonationsReceiptModel=Plantilla de rebut de donació
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Els menús personalitzats no estan enllaçats a una e
 NewMenu=Menú nou
 MenuHandler=Gestor de menús
 MenuModule=Mòdul origen
-HideUnauthorizedMenu= Amaga també els menús no autoritzats a usuaris interns (si no només atenuats)
+HideUnauthorizedMenu=Amaga els menús no autoritzats també per als usuaris interns (en cas contrari, en gris)
 DetailId=Identificador del menú
 DetailMenuHandler=Nom del gestor de menús
 DetailMenuModule=Nom del mòdul si l'entrada del menú és resultant d'un mòdul
@@ -1761,7 +1763,7 @@ CashDeskDoNotDecreaseStock=Desactiva la reducció d'estoc quan es realitza una v
 CashDeskIdWareHouse=Força i restringeix el magatzem a utilitzar per disminuir l'estoc
 StockDecreaseForPointOfSaleDisabled=La disminució d'estocs des del punt de venda està desactivat
 StockDecreaseForPointOfSaleDisabledbyBatch=La disminució d'accions en POS no és compatible amb el mòdul de gestió de Serial / Lot (actualment actiu) perquè la disminució de l'estoc està desactivada.
-CashDeskYouDidNotDisableStockDecease=No va desactivar la disminució de les existències en fer una venda des del punt de venda. Per tant, es requereix un magatzem.
+CashDeskYouDidNotDisableStockDecease=No vau desactivar la disminució de l'estoc en fer una venda des del TPV. Per tant, es requereix un magatzem.
 CashDeskForceDecreaseStockLabel=La disminució d’estoc dels productes per lots es obligada.
 CashDeskForceDecreaseStockDesc=Disminuïu primer les dates més antigues de consumir i vendre.
 CashDeskReaderKeyCodeForEnter=Codi clau per a "Enter" definit al lector de codi de barres (Exemple: 13)
@@ -1777,11 +1779,11 @@ EndPointIs=Els clients SOAP han d’enviar les seves sol·licituds al punt final
 ##### API ####
 ApiSetup=Configuració del mòdul API
 ApiDesc=Habilitant aquest mòdul, Dolibarr serà un servidor REST per oferir varis serveis web.
-ApiProductionMode=Activa el mode de producció (activarà l'ús de cachés per a la gestió de serveis)
+ApiProductionMode=Activa el mode de producció (activarà l'ús d'una memòria cau per a la gestió de serveis)
 ApiExporerIs=Pots explorar i provar les API en la URL
 OnlyActiveElementsAreExposed=Només s'exposen els elements de mòduls habilitats
 ApiKey=Clau per l'API
-WarningAPIExplorerDisabled=S'ha deshabilitat l'explorador de API. No és necessari API Explorer per a proporcionar serveis API. És una ferramenta per a que el desenvolupador trobe/probe API REST. Si necessita aquesta ferramenta, vaja a la configuració del mòdul API REST per activar-la.
+WarningAPIExplorerDisabled=S'ha desactivat l'explorador d'API. L'explorador d'API no és necessari per a proporcionar serveis d'API. És una eina perquè el desenvolupador pugui trobar/provar API REST. Si necessiteu aquesta eina, aneu a la configuració del mòdul API REST per a activar-la.
 ##### Bank #####
 BankSetupModule=Configuració del mòdul Banc
 FreeLegalTextOnChequeReceipts=Text lliure en els rebuts de xecs
@@ -1803,7 +1805,7 @@ IfSetToYesDontForgetPermission=Si establiu un valor vàlid, no us oblideu d'esta
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Configuració del mòdul GeoIP  Maxmind
 PathToGeoIPMaxmindCountryDataFile=Ruta al fitxer que conté Maxmind ip a la traducció del país. <br> Exemples: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoLite2-Country.mmdb
-NoteOnPathLocation=Tingueu en compte que aquest arxiu ha d'estar en una carpeta accessible desde la seva PHP (Comproveu la configuració de open_basedir de la seva PHP i els permisos d'arxiu/carpetes).
+NoteOnPathLocation=Tingueu en compte que el fitxer de dades IP a país ha de ser dins d’un directori que pugui llegir PHP (Comproveu la configuració de PHP open_basedir i els permisos del sistema de fitxers).
 YouCanDownloadFreeDatFileTo=Pot descarregar-se una <b>versió demo gratuïta</b> de l'arxiu de països  Maxmind GeoIP a l'adreça %s.
 YouCanDownloadAdvancedDatFileTo=També pot descarregar-se una <b>versió més completa</b> de l'arxiu de països Maxmind GeoIP a l'adreça %s.
 TestGeoIPResult=Test de conversió IP -> País
@@ -1825,7 +1827,7 @@ DeleteFiscalYear=Eliminar any fiscal
 ConfirmDeleteFiscalYear=Esteu segur d'eliminar aquest any fiscal?
 ShowFiscalYear=Mostra el període comptable
 AlwaysEditable=Sempre es pot editar
-MAIN_APPLICATION_TITLE=Força veure el nom de l'aplicació (advertència: indicar el teu propi nom aquí pot trencar la característica d'auto-omplir l'inici de sessió en utilitzar l'aplicació mòbil DoliDroid)
+MAIN_APPLICATION_TITLE=Força el nom visible de l'aplicació (advertència: definir el vostre propi nom aquí pot trencar la funció d'inici de sessió d'emplenament automàtic quan s'utilitza l'aplicació mòbil DoliDroid)
 NbMajMin=Nombre mínim de caràcters en majúscules
 NbNumMin=Nombre mínim de caràcters numèrics
 NbSpeMin=Nombre mínim de caràcters especials
@@ -1839,8 +1841,8 @@ IncludePath=Incloure ruta (que es defineix a la variable %s)
 ExpenseReportsSetup=Configuració del mòdul Informe de Despeses
 TemplatePDFExpenseReports=Plantilles de documents per a generar un document d’informe de despeses
 ExpenseReportsRulesSetup=Configurar mòdul Informes de despeses - Regles
-ExpenseReportNumberingModules=Número del mòdul Informe de despeses
-NoModueToManageStockIncrease=No esta activat el mòdul per gestionar automàticament l'increment d'estoc. L'increment d'estoc es realitzara només amb l'entrada manual
+ExpenseReportNumberingModules=Mòdul de numeració d'informes de despeses
+NoModueToManageStockIncrease=No s'ha activat cap mòdul capaç de gestionar l'increment automàtic d'estoc. L’increment d’estoc es farà només amb entrada manual.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Podeu trobar opcions de notificacions per correu electrònic habilitant i configurant el mòdul "Notificació".
 ListOfNotificationsPerUser=Llista de notificacions automàtiques per usuari *
 ListOfNotificationsPerUserOrContact=Llista de possibles notificacions automàtiques (en un esdeveniment comercial) disponibles per usuari* o per contacte**
@@ -1853,7 +1855,7 @@ BackupZipWizard=Assistent per crear el directori d’arxiu de documents
 SomethingMakeInstallFromWebNotPossible=No és possible la instal·lació de mòduls externs des de la interfície web per la següent raó:
 SomethingMakeInstallFromWebNotPossible2=Per aquest motiu, el procés d'actualització descrit aquí és un procés manual que només un usuari privilegiat pot realitzar.
 InstallModuleFromWebHasBeenDisabledByFile=La instal·lació de mòduls externs des de l'aplicació es troba desactivada per l'administrador. Ha de requerir que elimini l'arxiu <strong>%s</strong> per habilitar aquesta funció
-ConfFileMustContainCustom=Per instal·lar o crear un mòdul extern desde l'aplicació es necessita desar els fitxers del mòdul en el directori <strong>%s</strong>. Per permetre a Dolibarr el processament d'aquest directori, has de configurar el teu <strong>conf/conf.php</strong> afegint aquestes 2 línies:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMustContainCustom=Per a instal·lar o crear un mòdul extern des de l'aplicació es necessita desar els fitxers del mòdul en el directori <strong>%s</strong>. Per a permetre a Dolibarr el processament d'aquest directori, has de configurar el teu <strong>conf/conf.php</strong> afegint aquestes 2 línies:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Remarca línies de la taula quan el ratolí passi per sobre
 HighlightLinesColor=Ressalteu el color de la línia quan el ratolí passa (utilitzeu 'ffffff' per no ressaltar)
 HighlightLinesChecked=Ressalteu el color de la línia quan està marcada (utilitzeu 'ffffff' per no ressaltar)
@@ -1983,15 +1985,16 @@ EMailHost=Servidor IMAP de correu electrònic
 MailboxSourceDirectory=Directori d'origen de la bústia
 MailboxTargetDirectory=Directori de destinació de la bústia
 EmailcollectorOperations=Operacions a fer per recol·lector
+EmailcollectorOperationsDesc=Les operacions s’executen de dalt a baix
 MaxEmailCollectPerCollect=Nombre màxim de correus electrònics recopilats per recollida
 CollectNow=Recolliu ara
 ConfirmCloneEmailCollector=Esteu segur que voleu clonar el recollidor de correu electrònic %s?
-DateLastCollectResult=Data del darrer intent de recollida
+DateLastCollectResult=Data de l'últim intent de recollida
 DateLastcollectResultOk=Data de la darrera recollida amb èxit
 LastResult=Últim resultat
 EmailCollectorConfirmCollectTitle=Confirmació de recollida de correu electrònic
 EmailCollectorConfirmCollect=Voleu executar ara la recol·lecció d’aquest col·lector?
-NoNewEmailToProcess=No hi ha cap altre correu electrònic (filtres coincidents) per processar
+NoNewEmailToProcess=No hi ha cap correu electrònic nou (filtres coincidents) per a processar
 NothingProcessed=No s'ha fet res
 XEmailsDoneYActionsDone=%s correus electrònics qualificats, %s correus electrònics processats amb èxit (per %s registre / accions realitzades)
 RecordEvent=Registre d'esdeveniments de correu electrònic
@@ -2005,17 +2008,17 @@ WithDolTrackingID=Missatge d'una conversa iniciada per un primer correu electrò
 WithoutDolTrackingID=Missatge d'una conversa iniciada per un primer correu electrònic NO enviat des de Dolibarr
 WithDolTrackingIDInMsgId=Missatge enviat des de Dolibarr
 WithoutDolTrackingIDInMsgId=Missatge NO enviat des de Dolibarr
-CreateCandidature=Crea candidatura
-FormatZip=Codi postal
+CreateCandidature=Crea sol·licitud de feina
+FormatZip=Format Zip
 MainMenuCode=Codi d'entrada del menú (menú principal)
 ECMAutoTree=Mostra l'arbre ECM automàtic
-OperationParamDesc=Definiu els valors a emprar per l'objecte de l'acció, o com extreure valors. Per exemple:<br>objproperty1=SET:el valor a assignar<br>objproperty2=SET:un valor am un valor amb substitució de __objproperty1__<br>objproperty3=SETIFEMPTY:valor usat si objproperty3 no ha estat definit<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:EL nom de la meva empresa és\\s([^\\s]*)<br><br>Empreu un punt i coma (;) com a separadorper a extreure o definir vàries propietats alhora.
+OperationParamDesc=Definiu els valors a utilitzar per a l'objecte de l'acció, o com extreure valors. Per exemple:<br>objproperty1=SET:el valor a assignar<br>objproperty2=SET:un valor amb substitució de __objproperty1__<br>objproperty3=SETIFEMPTY:valor usat si objproperty3 no ha estat definit<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:El nom de la meva empresa és\\s([^\\s]*)<br><br>Empreu ; com a separador per a extreure o definir diverses propietats alhora.
 OpeningHours=Horari d'obertura
 OpeningHoursDesc=Introduïu aquí l'horari habitual d'obertura de la vostra empresa.
 ResourceSetup=Configuració del mòdul de recursos
 UseSearchToSelectResource=Utilitza un formulari de cerca per a seleccionar un recurs (millor que una llista desplegable)
-DisabledResourceLinkUser=Desactiva la funció per enllaçar un recurs als usuaris
-DisabledResourceLinkContact=Desactiva la funció per enllaçar un recurs als contactes
+DisabledResourceLinkUser=Desactiva la funció per a enllaçar un recurs amb els usuaris
+DisabledResourceLinkContact=Desactiva la funció per a enllaçar un recurs amb els contactes
 EnableResourceUsedInEventCheck=Habilita la funció per comprovar si s’utilitza un recurs en un esdeveniment
 ConfirmUnactivation=Confirma el restabliment del mòdul
 OnMobileOnly=Només en pantalla petita (telèfon intel·ligent)
@@ -2066,12 +2069,12 @@ MakeAnonymousPing=Creeu un ping &quot;+1&quot; anònim al servidor de bases Doli
 FeatureNotAvailableWithReceptionModule=Funció no disponible quan el mòdul Recepció està habilitat
 EmailTemplate=Plantilla per correu electrònic
 EMailsWillHaveMessageID=Els correus electrònics tindran una etiqueta "Referències" que coincideix amb aquesta sintaxi
-PDF_USE_ALSO_LANGUAGE_CODE=Si voleu tenir alguns textos del vostre PDF duplicats en 2 idiomes diferents en el mateix PDF generat, heu d’establir aquí aquest segon idioma a fi que el PDF generat contingui 2 idiomes diferents a la mateixa pàgina, el triat per generar el PDF i aquest segon ( només algunes plantilles PDF suporten això). Manteniu-lo buit per a 1 idioma per PDF.
+PDF_USE_ALSO_LANGUAGE_CODE=Si voleu que alguns textos del vostre PDF es copiïn en 2 idiomes diferents en el mateix PDF generat, heu d’establir aquí aquest segon idioma per a que el PDF generat contingui 2 idiomes diferents a la mateixa pàgina, l’escollit en generar el PDF i aquesta (només poques plantilles de PDF admeten això). Mantingueu-lo buit per a 1 idioma per PDF.
 FafaIconSocialNetworksDesc=Introduïu aquí el codi de la icona de FontAwesome. Si no sabeu què és FontAwesome, podeu utilitzar el llibre genèric d’adreces.
 FeatureNotAvailableWithReceptionModule=Funció no disponible quan el mòdul Recepció està habilitat
-RssNote=Nota: Cada definició de canal RSS proporciona un giny que heu d'habilitar per tenir-lo disponible al tauler de control
+RssNote=Nota: Cada definició del canal RSS proporciona un giny que heu d’habilitar per a tenir-lo disponible al tauler de control
 JumpToBoxes=Vés a Configuració -> Ginys
-MeasuringUnitTypeDesc=Utilitzeu aquí un valor com "size", "surface", "volume", "weight", "time"
+MeasuringUnitTypeDesc=Utilitzeu aquí un valor com "mida", "superfície", "volum", "pes", "temps"
 MeasuringScaleDesc=L'escala és el nombre de llocs que heu de moure la part decimal per a coincidir amb la unitat de referència predeterminada. Per al tipus d'unitat de "temps", és el nombre de segons. Els valors entre 80 i 99 són valors reservats.
 TemplateAdded=S'ha afegit la plantilla
 TemplateUpdated=Plantilla actualitzada
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=País (si és específic d'un país determinat)
 YouMayFindSecurityAdviceHere=Podeu trobar assessorament de seguretat aquí
 ModuleActivatedMayExposeInformation=Aquest mòdul pot exposar dades sensibles. Si no el necessiteu, desactiveu-lo.
 ModuleActivatedDoNotUseInProduction=S'ha habilitat un mòdul dissenyat per al desenvolupament. No l'activeu en un entorn de producció.
+CombinationsSeparator=Caràcter separador per a combinacions de productes
+SeeLinkToOnlineDocumentation=Vegeu l'enllaç a la documentació en línia al menú superior per a obtenir exemples
+SHOW_SUBPRODUCT_REF_IN_PDF=Si s'utilitza la funció "%s" del mòdul <b> %s </b>, mostra els detalls dels subproductes d'un kit en el PDF.
+AskThisIDToYourBank=Poseu-vos en contacte amb el vostre banc per a obtenir aquesta identificació
diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang
index ac453608960..7950ff65d5b 100644
--- a/htdocs/langs/ca_ES/agenda.lang
+++ b/htdocs/langs/ca_ES/agenda.lang
@@ -34,7 +34,7 @@ AutoActions= Inclusió automàtica a l'agenda
 AgendaAutoActionDesc= Aquí pots definir esdeveniments que vols que Dolibarr creï automàticament a Agenda. Si no hi ha res comprovat, només s'inclouran les accions manuals als registres i es mostraran a Agenda. El seguiment automàtic de les accions empresarials realitzades en objectes (validació, canvi d'estat) no es desarà.
 AgendaSetupOtherDesc= Aquesta pàgina permet configurar algunes opcions que permeten exportar una vista de la seva agenda Dolibar a un calendari extern (thunderbird, google calendar, ...)
 AgendaExtSitesDesc=Aquesta pàgina permet configurar calendaris externs per a la seva visualització en l'agenda de Dolibarr.
-ActionsEvents=Esdeveniments per a què Dolibarr crei una acció de forma automàtica
+ActionsEvents=Esdeveniments pels quals Dolibarr crearà una acció a l'agenda automàticament
 EventRemindersByEmailNotEnabled=Els recordatoris d'esdeveniments per correu electrònic no estaven habilitats en la configuració del mòdul %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Tercer %s creat
@@ -60,7 +60,7 @@ MemberSubscriptionModifiedInDolibarr=Subscripció %s per a membre %s, modificada
 MemberSubscriptionDeletedInDolibarr=Subscripció %s per a membre %s, eliminada
 ShipmentValidatedInDolibarr=Expedició %s validada
 ShipmentClassifyClosedInDolibarr=Expedició %s classificada com a facturada
-ShipmentUnClassifyCloseddInDolibarr=Enviament %s classificat com a re-obert
+ShipmentUnClassifyCloseddInDolibarr=Enviament %s classificat de nou com a obert
 ShipmentBackToDraftInDolibarr=Enviament %s retornat a l'estat d'esborrany
 ShipmentDeletedInDolibarr=Expedició %s eliminada
 ReceptionValidatedInDolibarr=S'ha validat la recepció %s
@@ -131,7 +131,7 @@ AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> per a restringir la sortida d'
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> per excloure esdeveniments automàtics.
 AgendaUrlOptionsIncludeHolidays= <b> includeholidays = 1 </b> per incloure esdeveniments de vacances.
 AgendaShowBirthdayEvents=Mostra aniversaris dels contactes
-AgendaHideBirthdayEvents=Oculta aniversaris dels contactes
+AgendaHideBirthdayEvents=Amaga els aniversaris dels contactes
 Busy=Ocupat
 ExportDataset_event1=Llista d'esdeveniments de l'agenda
 DefaultWorkingDays=Rang de dies de treball per defecte durant la setmana (Exemple: 1-5, 1-6)
@@ -158,12 +158,12 @@ EveryMonth=Cada mes
 DayOfMonth=Dia del mes
 DayOfWeek=Dia de la setmana
 DateStartPlusOne=Data d'inici + 1 hora
-SetAllEventsToTodo=Definir tots els events com a pendents
-SetAllEventsToInProgress=Definir tots els events en progrés
-SetAllEventsToFinished=Definir tots els events com a enllestits
+SetAllEventsToTodo=Estableix tots els esdeveniments com a pendents
+SetAllEventsToInProgress=Estableix tots els esdeveniments a en curs
+SetAllEventsToFinished=Estableix tots els esdeveniments com a finalitzats
 ReminderTime=Període de recordatori abans de l'esdeveniment
 TimeType=Tipus de durada
 ReminderType=Tipus de devolució de trucada
 AddReminder=Crea una notificació de recordatori automàtica per a aquest esdeveniment
 ErrorReminderActionCommCreation=S'ha produït un error en crear la notificació de recordatori per a aquest esdeveniment
-BrowserPush=Notificació del navegador
+BrowserPush=Notificació emergent del navegador
diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang
index 593678f8d7d..f84f17f7ff0 100644
--- a/htdocs/langs/ca_ES/banks.lang
+++ b/htdocs/langs/ca_ES/banks.lang
@@ -69,14 +69,14 @@ BankTransactionByCategories=Registres bancaris per categories
 BankTransactionForCategory=Registres bancaris per la categoria <b>%s</b>
 RemoveFromRubrique=Suprimir vincle amb categoria
 RemoveFromRubriqueConfirm=Està segur de voler eliminar l'enllaç entre el registre i la categoria?
-ListBankTransactions=Llistat de registres bancaris
+ListBankTransactions=Llista de registres bancaris
 IdTransaction=Id de transacció
 BankTransactions=Registres bancaris
 BankTransaction=Registre bancari
-ListTransactions=Llistat registres
-ListTransactionsByCategory=Llistat registres/categoria
+ListTransactions=Llista de registres
+ListTransactionsByCategory=Llista de registres/categoria
 TransactionsToConciliate=Registres a conciliar
-TransactionsToConciliateShort=Per conciliar
+TransactionsToConciliateShort=Per a conciliar
 Conciliable=Conciliable
 Conciliate=Conciliar
 Conciliation=Conciliació
@@ -93,7 +93,7 @@ StatusAccountOpened=Obert
 StatusAccountClosed=Tancada
 AccountIdShort=Número
 LineRecord=Registre
-AddBankRecord=Afegir registre
+AddBankRecord=Afegeix entrada
 AddBankRecordLong=Afegir registre manualment
 Conciliated=Conciliat
 ConciliatedBy=Conciliat per
@@ -124,7 +124,7 @@ BankChecksToReceiptShort=Xecs en espera de l'ingrés
 ShowCheckReceipt=Mostra la remesa d'ingrés de xec
 NumberOfCheques=Nº de xec
 DeleteTransaction=Eliminar registre
-ConfirmDeleteTransaction=Esteu segur de voler eliminar aquesta registre?
+ConfirmDeleteTransaction=Esteu segur que voleu suprimir aquest registre?
 ThisWillAlsoDeleteBankRecord=Açò eliminarà també els registres bancaris generats
 BankMovements=Moviments
 PlannedTransactions=Registres prevists
@@ -133,7 +133,7 @@ ExportDataset_banque_1=Registres bancaris i extractes
 ExportDataset_banque_2=Resguard
 TransactionOnTheOtherAccount=Transacció sobre l'altra compte
 PaymentNumberUpdateSucceeded=Número de pagament actualitzat correctament
-PaymentNumberUpdateFailed=Numero de pagament no va poder ser modificat
+PaymentNumberUpdateFailed=No s'ha pogut actualitzar el número de pagament
 PaymentDateUpdateSucceeded=Data de pagament actualitzada correctament
 PaymentDateUpdateFailed=Data de pagament no va poder ser modificada
 Transactions=Transaccions
@@ -157,10 +157,10 @@ RejectCheck=Xec retornat
 ConfirmRejectCheck=Estàs segur que vols marcar aquesta comprovació com a rebutjada?
 RejectCheckDate=Data de devolució del xec
 CheckRejected=Xec retornat
-CheckRejectedAndInvoicesReopened=Xecs retornats i factures re-obertes
+CheckRejectedAndInvoicesReopened=Xec retornat i factures reobertes
 BankAccountModelModule=Plantilles de documents per comptes bancaris
 DocumentModelSepaMandate=Plantilla per a mandat SEPA. Vàlid només per a països europeus de la CEE.
-DocumentModelBan=Plantilla per imprimir una pàgina amb informació BAN
+DocumentModelBan=Plantilla per a imprimir una pàgina amb informació BAN.
 NewVariousPayment=Pagament divers nou
 VariousPayment=Pagament divers
 VariousPayments=Pagaments varis
@@ -171,12 +171,12 @@ VariousPaymentLabel=Etiqueta de pagament divers
 ConfirmCloneVariousPayment=Confirmeu el clon d'un pagament divers
 SEPAMandate=Mandat SEPA
 YourSEPAMandate=La vostra ordre SEPA
-FindYourSEPAMandate=Aquest és el vostre mandat de SEPA per autoritzar a la nostra empresa a realitzar un ordre de dèbit directe al vostre banc. Gràcies per retornar-la signada (escanejar el document signat) o envieu-lo per correu a
+FindYourSEPAMandate=Aquest és el vostre mandat SEPA per a autoritzar la nostra empresa a fer una ordre de domiciliació bancària al vostre banc. Torneu-lo signat (escaneja el document signat) o envieu-lo per correu electrònic a
 AutoReportLastAccountStatement=Ompliu automàticament el camp "nombre d'extracte bancari" amb l'últim número de l'extracte al fer la conciliació
-CashControl=Tancar Efectiu del Punt de Venda
-NewCashFence=Tancament d'efectiu nou
+CashControl=Control de caixa TPV
+NewCashFence=Tancament de caixa nou
 BankColorizeMovement=Color de moviments
 BankColorizeMovementDesc=Si aquesta funció està habilitada, podeu triar un color de fons específic per als moviments de dèbit o de crèdit
 BankColorizeMovementName1=Color de fons pel moviment de dèbit
 BankColorizeMovementName2=Color de fons pel moviment de crèdit
-IfYouDontReconcileDisableProperty=Si no feu les conciliacions bancàries en alguns comptes bancaris, desactiveu la propietat "%s" per eliminar aquest advertiment.
+IfYouDontReconcileDisableProperty=Si no feu cap conciliació bancària en alguns comptes bancaris, desactiveu la propietat "%s" per a eliminar aquest advertiment.
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index 61e70a38bea..dbe1ced2434 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -12,7 +12,7 @@ BillsLate=Retard en el pagament
 BillsStatistics=Estadístiques factures a clients
 BillsStatisticsSuppliers=Estadístiques de Factures de proveïdors
 DisabledBecauseDispatchedInBookkeeping=Desactivat perquè la factura s'ha contabilitzat
-DisabledBecauseNotLastInvoice=Desactivat perque la factura no es pot eliminar. S'han creat factures després d'aquesta i crearia buits al contador.
+DisabledBecauseNotLastInvoice=Desactivat perquè la factura no es pot esborrar. Algunes factures s'han registrat després d'aquesta i això crearia espais buits al comptador.
 DisabledBecauseNotErasable=Desactivat perque no es pot eliminar
 InvoiceStandard=Factura estàndard
 InvoiceStandardAsk=Factura estàndard
@@ -66,9 +66,9 @@ paymentInInvoiceCurrency=en divisa de factures
 PaidBack=Reemborsat
 DeletePayment=Elimina el pagament
 ConfirmDeletePayment=Esteu segur de voler eliminar aquest pagament?
-ConfirmConvertToReduc=Voleu convertir aquesta %s en crèdit disponible?
+ConfirmConvertToReduc=Voleu convertir aquest %s en un crèdit disponible?
 ConfirmConvertToReduc2=L’import s’emmagatzemarà entre tots els descomptes i es podrà utilitzar com a descompte per a una factura actual o futura per a aquest client.
-ConfirmConvertToReducSupplier=Voleu convertir aquesta %s en un crèdit disponible?
+ConfirmConvertToReducSupplier=Voleu convertir aquest %s en un crèdit disponible?
 ConfirmConvertToReducSupplier2=L’import s’ha desat entre tots els descomptes i es podrà utilitzar com a descompte per a una factura actual o futura per a aquest proveïdor.
 SupplierPayments=Pagaments a proveïdors
 ReceivedPayments=Pagaments rebuts
@@ -94,11 +94,11 @@ PaymentAmount=Import pagament
 PaymentHigherThanReminderToPay=Pagament superior a la resta a pagar
 HelpPaymentHigherThanReminderToPay=Atenció, l'import del pagament d'una o més factures és superior a l'import pendent de pagar. <br> Editeu la vostra entrada; en cas contrari, confirmeu i considereu la possibilitat de crear un abonament per l'excés rebut per cada factura pagada de més.
 HelpPaymentHigherThanReminderToPaySupplier=Atenció, l'import del pagament d'una o més factures és superior a l'import pendent de pagar.<br>Editeu l'entrada, en cas contrari, confirmeu i considereu la possibilitat de crear un abonament per l'excés pagat per cada factura pagada de més.
-ClassifyPaid=Classificar 'Pagat'
+ClassifyPaid=Classifica "Pagat"
 ClassifyUnPaid=Classifica &quot;sense pagar&quot;
-ClassifyPaidPartially=Classificar 'Pagat parcialment'
-ClassifyCanceled=Classificar 'Abandonat'
-ClassifyClosed=Classificar 'Tancat'
+ClassifyPaidPartially=Classifica "Pagat parcialment"
+ClassifyCanceled=Classifica "Abandonat"
+ClassifyClosed=Classifica "Tancat"
 ClassifyUnBilled=Classifiqueu 'facturar'
 CreateBill=Crear factura
 CreateCreditNote=Crear abonament
@@ -109,11 +109,11 @@ SearchACustomerInvoice=Cercar una factura a client
 SearchASupplierInvoice=Cercar una factura de proveïdor
 CancelBill=Anul·lar una factura
 SendRemindByMail=Envia recordatori per e-mail
-DoPayment=Afegir pagament
+DoPayment=Introdueix el pagament
 DoPaymentBack=Afegir reemborsament
 ConvertToReduc=Marca com a crèdit disponible
-ConvertExcessReceivedToReduc=Convertir l'excés rebut en el crèdit disponible
-ConvertExcessPaidToReduc=Convertir l'excés pagat en descompte disponible
+ConvertExcessReceivedToReduc=Converteix l'excés rebut en crèdit disponible
+ConvertExcessPaidToReduc=Converteix l'excés pagat en descompte disponible
 EnterPaymentReceivedFromCustomer=Afegir cobrament rebut del client
 EnterPaymentDueToCustomer=Fer pagament del client
 DisabledBecauseRemainderToPayIsZero=Desactivar ja que la resta a pagar és 0
@@ -156,12 +156,12 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, no és possible cancel·l
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Aquesta part o una altra ja s'utilitza, de manera que la sèrie de descompte no es pot treure.
 BillFrom=Emissor
 BillTo=Enviar a
-ActionsOnBill=Eventos sobre la factura
+ActionsOnBill=Accions en la factura
 RecurringInvoiceTemplate=Plantilla / Factura recurrent
-NoQualifiedRecurringInvoiceTemplateFound=No s'ha qualificat cap plantilla de factura recurrent per generar-se.
-FoundXQualifiedRecurringInvoiceTemplate=S'ha trobat la plantilla de factura/es recurrent %s qualificada per generar-se.
+NoQualifiedRecurringInvoiceTemplateFound=No es pot generar cap factura de plantilla periòdica.
+FoundXQualifiedRecurringInvoiceTemplate=S'han trobat %s factures recurrents de plantilla qualificades per a la generació.
 NotARecurringInvoiceTemplate=No és una plantilla de factura recurrent
-NewBill=Nova factura
+NewBill=Factura nova
 LastBills=Últimes %s factures
 LatestTemplateInvoices=Últimes %s plantilles de factura 
 LatestCustomerTemplateInvoices=Últimes %s plantilles de factures de client 
@@ -192,7 +192,7 @@ ConfirmClassifyPaidPartiallyReasonBadCustomer=Client morós
 ConfirmClassifyPaidPartiallyReasonProductReturned=Productes retornats en part
 ConfirmClassifyPaidPartiallyReasonOther=D'altra raó
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Aquesta opció és possible si la teva factura s'ha proporcionat amb comentaris adequats. (Exemple «Només l'impost corresponent al preu realment pagat dóna dret a la deducció»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=En alguns països, aquesta elecció només pot ser possible si la teva factura conté les notes correctes.
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=En alguns països, aquesta opció només és possible si la factura conté les notes correctes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Aquesta elecció és l'elecció que s'ha de prendre si les altres no són aplicables
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Un <b> client morós </b> és un client que es nega a pagar el seu deute.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Aquesta elecció és possible si el cas de pagament incomplet és arran d'una devolució de part dels productes
@@ -202,7 +202,7 @@ ConfirmClassifyAbandonReasonOtherDesc=Aquesta elecció serà per a qualsevol alt
 ConfirmCustomerPayment=Confirmes aquesta entrada de pagament per a <b>%s</b> %s?
 ConfirmSupplierPayment=Confirmes aquesta entrada de pagament per a <b>%s</b> %s?
 ConfirmValidatePayment=Estàs segur que vols validar aquest pagament? No es poden fer canvis un cop el pagament s'ha validat.
-ValidateBill=Validar factura
+ValidateBill=Valida la factura
 UnvalidateBill=Tornar factura a esborrany
 NumberOfBills=Nº de factures
 NumberOfBillsByMonth=Nº de factures per mes
@@ -256,7 +256,7 @@ DateMaxPayment=Pagament vençut
 DateInvoice=Data facturació
 DatePointOfTax=Punt d'impostos
 NoInvoice=Cap factura
-ClassifyBill=Classificar la factura
+ClassifyBill=Classifica la factura
 SupplierBillsToPay=Factures de proveïdors pendents de pagament
 CustomerBillsUnpaid=Factures de client pendents de cobrament
 NonPercuRecuperable=No percebut recuperable
@@ -269,7 +269,7 @@ RepeatableInvoice=Factura recurrent
 RepeatableInvoices=Factures recurrents
 Repeatable=Recurrent
 Repeatables=Recurrents
-ChangeIntoRepeatableInvoice=Convertir en recurrent
+ChangeIntoRepeatableInvoice=Converteix-la en plantilla
 CreateRepeatableInvoice=Crear factura recurrent
 CreateFromRepeatableInvoice=Crear des de factura recurrent
 CustomersInvoicesAndInvoiceLines=Factures del client i detalls de la factura
@@ -304,8 +304,8 @@ DiscountFromExcessReceived=Pagaments superiors a la factura %s
 DiscountFromExcessPaid=Pagaments superiors a la factura %s
 AbsoluteDiscountUse=Aquest tipus de crèdit no es pot utilitzar en una factura abans de la seva validació
 CreditNoteDepositUse=La factura deu estar validada per a utilitzar aquest tipus de crèdits
-NewGlobalDiscount=Nou descompte fixe
-NewRelativeDiscount=Nou descompte
+NewGlobalDiscount=Descompte absolut nou
+NewRelativeDiscount=Descompte relatiu nou
 DiscountType=Tipus de descompte
 NoteReason=Nota/Motiu
 ReasonDiscount=Motiu
@@ -371,10 +371,10 @@ NextDateToExecution=Data de la propera generació de factures
 NextDateToExecutionShort=Data següent gen.
 DateLastGeneration=Data de l'última generació
 DateLastGenerationShort=Data última gen.
-MaxPeriodNumber=Nº màxim de generació de factures
-NbOfGenerationDone=Número de generació de factura ja realitzat
+MaxPeriodNumber=Màx. nombre de generació de factures
+NbOfGenerationDone=Nombre de generació de factura ja realitzat
 NbOfGenerationDoneShort=Número de generació realitzat
-MaxGenerationReached=Número màxim de generacions aconseguides
+MaxGenerationReached=Nombre màxim de generacions assolides
 InvoiceAutoValidate=Valida les factures automàticament
 GeneratedFromRecurringInvoice=Generat des de la plantilla de factura recurrent %s
 DateIsNotEnough=Encara no s'ha arribat a la data
@@ -476,19 +476,19 @@ UseCreditNoteInInvoicePayment=Reduir el pagament amb aquest crèdit
 MenuChequeDeposits=Ingrés de xecs
 MenuCheques=Xecs
 MenuChequesReceipts=Remeses de xecs
-NewChequeDeposit=Nou dipòsit
+NewChequeDeposit=Dipòsit nou
 ChequesReceipts=Remeses de xecs
 ChequesArea=Àrea de ingrés de xecs
 ChequeDeposits=Ingrés de xecs
 Cheques=Xecs
 DepositId=Id. dipòsit
-NbCheque=Número de xecs
+NbCheque=Nombre de xecs
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Utilitzeu el contacte / adreça amb el tipus 'contacte de facturació' en comptes de l'adreça de tercers com a destinatari de factures
 ShowUnpaidAll=Mostrar tots els pendents
 ShowUnpaidLateOnly=Mostrar els pendents en retard només
 PaymentInvoiceRef=Pagament factura %s
-ValidateInvoice=Validar factura
+ValidateInvoice=Valida la factura
 ValidateInvoices=Validació de factures
 Cash=Efectiu
 Reported=Ajornat
@@ -515,7 +515,7 @@ PDFCrevetteDescription=Plantilla Crevette per factures PDF. Una plantilla de fac
 TerreNumRefModelDesc1=Retorna el nombre sota el format %syymm-nnnn per a les factures i %syymm-nnnn per als abonaments on yy és l'any, mm. el mes i nnnn un comptador seqüencial sense ruptura i sense permanència a 0
 MarsNumRefModelDesc1=Retorna el nombre sota el format %syymm-nnnn per a les factures, %syymm-nnnn per a les factures rectificatives, %syymm-nnnn per a les factures de dipòsit i %syymm-nnnn pels abonaments  on yy és l'any, mm el mes i nnnn un comptador seqüencial sense ruptura i sense retorn a 0
 TerreNumRefModelError=Ja hi ha una factura amb $syymm i no és compatible amb aquest model de seqüència. Elimineu o renómbrela per poder activar aquest mòdul
-CactusNumRefModelDesc1=Retorna un numero amb format %syymm-nnnn per a factures estàndard, %syymm-nnnn per a notes de crèdit i %syymm-nnnn per a factures de dipòsits anticipats a on yy es l'any, mm és el mes i nnnn és una seqüència sense ruptura i sense retorn a 0
+CactusNumRefModelDesc1=Retorna un número amb format %syymm-nnnn per a factures estàndard, %syymm-nnnn per a devolucions i %syymm-nnnn per a factures de dipòsits anticipats on yy es l'any, mm és el mes i nnnn és una seqüència sense ruptura i sense retorn a 0
 EarlyClosingReason=Motiu de tancament anticipat
 EarlyClosingComment=Nota de tancament anticipat
 ##### Types de contacts #####
@@ -557,7 +557,7 @@ TotalSituationInvoice=Total situació
 invoiceLineProgressError=El progrés de la línia de factura no pot ser igual o superior a la següent línia de factura
 updatePriceNextInvoiceErrorUpdateline=Error : actualització de preu en línia de factura : %s
 ToCreateARecurringInvoice=Per crear una factura recurrent d'aquest contracte, primer crea aquesta factura esborrany, després converteix-la en una plantilla de factura i defineix la freqüència per a la generació de factures futures.
-ToCreateARecurringInvoiceGene=Per generar futures factures regulars i manualment, només ves al menú <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGene=Per a generar futures factures regularment i manualment, només cal que aneu al menú <strong> %s - %s - %s </strong>.
 ToCreateARecurringInvoiceGeneAuto=Si necessites tenir cada factura generada automàticament, pregunta a l'administrador per habilitar i configurar el mòdul <strong>%s</strong>. Tingues en compte que ambdós mètodes (manual i automàtic) es poden utilitzar alhora sense risc de duplicats.
 DeleteRepeatableInvoice=Elimina la factura recurrent
 ConfirmDeleteRepeatableInvoice=Vols eliminar la plantilla de factura?
diff --git a/htdocs/langs/ca_ES/blockedlog.lang b/htdocs/langs/ca_ES/blockedlog.lang
index 5c380fdb581..dc38c2149c7 100644
--- a/htdocs/langs/ca_ES/blockedlog.lang
+++ b/htdocs/langs/ca_ES/blockedlog.lang
@@ -2,7 +2,7 @@ BlockedLog=Registres inalterables
 Field=Camp
 BlockedLogDesc=Aquest mòdul fa un seguiment d'alguns esdeveniments en un registre inalterable (que no es pot modificar una vegada registrat) en una cadena de blocs, en temps real. Aquest mòdul ofereix compatibilitat amb els requisits de les lleis d'alguns països (com França amb la llei Finances 2016 - Norma NF525).
 Fingerprints=Esdeveniments arxivats i empremtes digitals
-FingerprintsDesc=Aquesta és l'eina per explorar o extreure els registres inalterables. Els registres inalterables es generen i es arxiven localment en una taula dedicada, en temps real quan es registra un esdeveniment empresarial. Podeu utilitzar aquesta eina per exportar aquest arxiu i desar-lo en un suport extern (alguns països, com França, demanen que ho feu cada any). Tingueu en compte que, no hi ha cap funció per purgar aquest registre i tots els canvis que s'hagin intentat fer directament en aquest registre (per exemple, un hacker) es comunicaran amb una empremta digital no vàlida. Si realment necessiteu purgar aquesta taula perquè heu utilitzat la vostra aplicació per a un propòsit de demostració / prova i voleu netejar les vostres dades per iniciar la vostra producció, podeu demanar al vostre distribuïdor o integrador que restableixi la vostra base de dades (totes les vostres dades seran eliminades).
+FingerprintsDesc=Aquesta és l'eina per a explorar o extreure els registres inalterables. Els registres inalterables es generen i s'arxiven localment en una taula dedicada, en temps real quan es registra un esdeveniment de negoci. Podeu utilitzar aquesta eina per a exportar aquest arxiu i desar-lo en un suport extern (alguns països, com França, demanen que ho feu cada any). Tingueu en compte que, no hi ha cap funció per a purgar aquest registre i tots els canvis que s'hagin intentat fer directament en aquest registre (per exemple, un hacker) es comunicaran amb una empremta digital no vàlida. Si realment necessiteu purgar aquesta taula perquè heu utilitzat la vostra aplicació per a un propòsit de demostració / prova i voleu netejar les vostres dades per a iniciar la vostra producció, podeu demanar al vostre distribuïdor o integrador que restableixi la vostra base de dades (totes les vostres dades seran eliminades).
 CompanyInitialKey=Clau inicial de l'empresa (hash de bloc de gènesi)
 BrowseBlockedLog=Registres inalterables
 ShowAllFingerPrintsMightBeTooLong=Mostra tots els registres arxivats (pot ser llarg)
@@ -35,7 +35,7 @@ logDON_DELETE=Donació de l'eliminació lògica
 logMEMBER_SUBSCRIPTION_CREATE=S'ha creat una subscripció de membre
 logMEMBER_SUBSCRIPTION_MODIFY=S'ha modificat la subscripció de membre
 logMEMBER_SUBSCRIPTION_DELETE=Supressió lògica de subscripció de membre
-logCASHCONTROL_VALIDATE=Gravació de tanques d'efectiu
+logCASHCONTROL_VALIDATE=Registre de tancament de caixa
 BlockedLogBillDownload=Descarrega la factura del client
 BlockedLogBillPreview=Previsualització de la factura del client
 BlockedlogInfoDialog=Detalls del registre
@@ -45,10 +45,10 @@ DownloadLogCSV=Exporta els registres arxivats (CSV)
 logDOC_PREVIEW=Vista prèvia d'un document validat per imprimir o descarregar
 logDOC_DOWNLOAD=Descarregar un document validat per imprimir o enviar
 DataOfArchivedEvent=Dades completes d'esdeveniments arxivats
-ImpossibleToReloadObject=Objecte original (tipus %s, id %s) no enllaçat (vegeu la columna "Dades complets" per obtenir dades guardades inalterables)
+ImpossibleToReloadObject=Objecte original (tipus %s, identificador %s) no enllaçat (vegeu la columna "Dades completes" per a obtenir dades desades inalterables)
 BlockedLogAreRequiredByYourCountryLegislation=El mòdul de registres inalterables pot ser requerit per la legislació del vostre país. La desactivació d'aquest mòdul pot fer que qualsevol transacció futura sigui invàlida pel que fa a la llei i l'ús del programari legal, ja que no es pot validar mitjançant una auditoria fiscal.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=El mòdul de registres inalterables s'ha activat a causa de la legislació del vostre país. La desactivació d'aquest mòdul pot fer que qualsevol transacció futura sigui invàlida pel que fa a la llei i l'ús del programari legal, ja que no es pot validar mitjançant una auditoria fiscal.
 BlockedLogDisableNotAllowedForCountry=Llista de països on l'ús d'aquest mòdul és obligatori (només per impedir que es desactivi el mòdul per error, si el vostre país està en aquesta llista, la desactivació del mòdul no és possible sense editar aquesta llista. Noteu també que habilitar / desactivar aquest mòdul seguiu una pista en el registre inalterable).
 OnlyNonValid=No vàlid
 TooManyRecordToScanRestrictFilters=Hi ha massa registres per escanejar / analitzar. Limiteu la llista amb filtres més restrictius.
-RestrictYearToExport=Restringiu el mes / any per exportar
+RestrictYearToExport=Restringeix el mes / any per a exportar
diff --git a/htdocs/langs/ca_ES/bookmarks.lang b/htdocs/langs/ca_ES/bookmarks.lang
index 8e406ad77d6..423f70a3814 100644
--- a/htdocs/langs/ca_ES/bookmarks.lang
+++ b/htdocs/langs/ca_ES/bookmarks.lang
@@ -4,15 +4,15 @@ Bookmark=Marcador
 Bookmarks=Marcadors
 ListOfBookmarks=Llista de marcadors
 EditBookmarks=Llista/edita els marcadors
-NewBookmark=Nou marcador
+NewBookmark=Marcador nou
 ShowBookmark=Mostra marcador
 OpenANewWindow=Obriu una pestanya nova
 ReplaceWindow=Reemplaça la pestanya actual
-BookmarkTargetNewWindowShort=Nova pestanya
+BookmarkTargetNewWindowShort=Pestanya nova
 BookmarkTargetReplaceWindowShort=Pestanya actual
 BookmarkTitle=Nom de marcatge
 UrlOrLink=URL
-BehaviourOnClick=Comportament al fer clic a la URL
+BehaviourOnClick=Comportament quan se selecciona un URL de marcador
 CreateBookmark=Crea marcador
 SetHereATitleForLink=Estableix un nom per al marcador
 UseAnExternalHttpLinkOrRelativeDolibarrLink=Utilitzeu un enllaç extern / absolut (https://URL) o un enllaç intern / relatiu (/DOLIBARR_ROOT/htdocs/...)
diff --git a/htdocs/langs/ca_ES/boxes.lang b/htdocs/langs/ca_ES/boxes.lang
index db7fab66a6b..6d7ac837c78 100644
--- a/htdocs/langs/ca_ES/boxes.lang
+++ b/htdocs/langs/ca_ES/boxes.lang
@@ -40,19 +40,22 @@ BoxTitleLastModifiedContacts=Adreces i contactes: últims %s modificats
 BoxMyLastBookmarks=Adreces d'interès: últims %s
 BoxOldestExpiredServices=Serveis antics expirats
 BoxLastExpiredServices=Últims %s contactes amb serveis actius expirats
-BoxTitleLastActionsToDo=Últims %s events a realitzar
+BoxTitleLastActionsToDo=Últimes %s accions a fer
 BoxTitleLastContracts=Últims %s contractes modificats
 BoxTitleLastModifiedDonations=Últimes %s donacions modificades
 BoxTitleLastModifiedExpenses=Últimes %s despeses modificades
 BoxTitleLatestModifiedBoms=Últimes %s llistes de material modificades
 BoxTitleLatestModifiedMos=Últimes %s ordres de fabricació modificades
+BoxTitleLastOutstandingBillReached=Clients que han superat el màxim pendent
 BoxGlobalActivity=Activitat global
 BoxGoodCustomers=Bons clients
 BoxTitleGoodCustomers=% bons clients
+BoxScheduledJobs=Tasques programades
+BoxTitleFunnelOfProspection=Oportunitat embut
 FailedToRefreshDataInfoNotUpToDate=No s'ha pogut actualitzar el flux RSS. Última data d'actualització amb èxit: %s
 LastRefreshDate=Última data que es va refrescar
 NoRecordedBookmarks=No hi ha marcadors personals.
-ClickToAdd=Faci clic aquí per afegir.
+ClickToAdd=Feu clic aquí per afegir.
 NoRecordedCustomers=Cap client registrat
 NoRecordedContacts=Cap contacte registrat
 NoActionsToDo=Sense esdeveniments a realitzar
@@ -102,6 +105,7 @@ SuspenseAccountNotDefined=El compte de suspens no està definit
 BoxLastCustomerShipments=Últims enviaments de clients
 BoxTitleLastCustomerShipments=Últims %s enviaments de clients
 NoRecordedShipments=Cap enviament de client registrat
+BoxCustomersOutstandingBillReached=Clients que superen el límit pendent
 # Pages
 AccountancyHome=Comptabilitat
 ValidatedProjects=Projectes validats
diff --git a/htdocs/langs/ca_ES/cashdesk.lang b/htdocs/langs/ca_ES/cashdesk.lang
index c17e230f1ee..fbc87a00e27 100644
--- a/htdocs/langs/ca_ES/cashdesk.lang
+++ b/htdocs/langs/ca_ES/cashdesk.lang
@@ -11,10 +11,10 @@ CashDeskStock=Estoc
 CashDeskOn=de
 CashDeskThirdParty=Tercer
 ShoppingCart=Cistella
-NewSell=Nova venda
+NewSell=Venda nova
 AddThisArticle=Afegeix aquest article
 RestartSelling=Reprendre la venda
-SellFinished=Venda acabada
+SellFinished=Venda completa
 PrintTicket=Imprimir
 SendTicket=Envia el tiquet
 NoProductFound=Cap article trobat
@@ -49,7 +49,7 @@ Footer=Peu de pàgina
 AmountAtEndOfPeriod=Import al final del període (dia, mes o any)
 TheoricalAmount=Import teòric
 RealAmount=Import real
-CashFence=Recompte d'efectiu
+CashFence=Tancament de caixa
 CashFenceDone=Tancament de caixa realitzat pel període
 NbOfInvoices=Nº de factures
 Paymentnumpad=Tipus de pad per introduir el pagament
@@ -95,12 +95,13 @@ PrintMethod=Mètode d'impressió
 ReceiptPrinterMethodDescription=Mètode potent amb molts paràmetres. Completament personalitzable amb plantilles. No es pot imprimir des del núvol.
 ByTerminal=Per terminal
 TakeposNumpadUsePaymentIcon=Utilitzeu la icona en lloc del text als botons de pagament del teclat numèric
-CashDeskRefNumberingModules=Mòdul de numeració per a vendes del Punt de Venda (POS)
-CashDeskGenericMaskCodes6 = <br>l'etiqueta <b>{TN}</b> s'utilitza per afegir el numero de terminal
+CashDeskRefNumberingModules=Mòdul de numeració per a vendes des del TPV (Punt de Venda)
+CashDeskGenericMaskCodes6 =  L'etiqueta <br><b>{TN}</b> s'utilitza per a afegir el número de terminal
 TakeposGroupSameProduct=Agrupa les mateixes línies de productes
-StartAParallelSale=Inicia una nova venda paral·lela
-ControlCashOpening=Control de caixa en obrir el TPV
-CloseCashFence=Tanca el recompte d'efectiu
+StartAParallelSale=Comenceu una venda nova paral·lela
+SaleStartedAt=La venda va començar a %s
+ControlCashOpening=Finestra emergent de control de caixa en obrir el TPV
+CloseCashFence=Tanca el control de caixa
 CashReport=Informe d'efectiu
 MainPrinterToUse=Impressora principal a utilitzar
 OrderPrinterToUse=Impressora de comandes a utilitzar
diff --git a/htdocs/langs/ca_ES/categories.lang b/htdocs/langs/ca_ES/categories.lang
index 900f42e763a..195fe0a4157 100644
--- a/htdocs/langs/ca_ES/categories.lang
+++ b/htdocs/langs/ca_ES/categories.lang
@@ -5,9 +5,9 @@ RubriquesTransactions=Etiquetes d'assentaments
 categories=etiquetes
 NoCategoryYet=No s'ha creat cap etiqueta d'aquest tipus
 In=En
-AddIn=Afegir en
-modify=Modificar
-Classify=Classificar
+AddIn=Afegeix
+modify=Modifica
+Classify=Classifica
 CategoriesArea=Àrea d'etiquetes
 ProductsCategoriesArea=Àrea d'etiquetes de productes/serveis
 SuppliersCategoriesArea=Àrea d'etiquetes de proveïdors
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Àrea d'etiquetes de projectes
 UsersCategoriesArea=Àrea d'etiquetes d'usuaris
 SubCats=Subcategories
 CatList=Llistat d'etiquetes
+CatListAll=Llista d'etiquetes (tots els tipus)
 NewCategory=Etiqueta nova
 ModifCat=Modifica l'etiqueta
 CatCreated=Etiqueta creada
@@ -65,16 +66,22 @@ UsersCategoriesShort=Etiquetes d'usuaris
 StockCategoriesShort=Etiquetes / categories de magatzem
 ThisCategoryHasNoItems=Aquesta categoria no conté cap element.
 CategId=ID d'etiqueta
-CatSupList=Llistat d'etiquetes de proveïdors
-CatCusList=Llistat d'etiquetes de clients/clients potencials
+ParentCategory=Etiqueta mare
+ParentCategoryLabel=Descripció de l'etiqueta mare
+CatSupList=Llista d'etiquetes de proveïdors
+CatCusList=Llista d'etiquetes de clients/potencials
 CatProdList=Llistat d'etiquetes de productes
 CatMemberList=Llistat d'etiquetes de socis
-CatContactList=Llistat d'etiquetes de contactes
+CatContactList=Llista d’etiquetes de contactes
+CatProjectsList=Llista d’etiquetes de projectes
+CatUsersList=Llista d'etiquetes d'usuaris
 CatSupLinks=Enllaços entre proveïdors i etiquetes
 CatCusLinks=Enllaços entre clients/clients potencials i etiquetes
 CatContactsLinks=Enllaços entre contactes / adreces i etiquetes / categories
 CatProdLinks=Enllaços entre productes/serveis i etiquetes
-CatProJectLinks=Enllaços entre projectes i etiquetes
+CatMembersLinks=Enllaços entre socis i etiquetes
+CatProjectsLinks=Enllaços entre projectes i etiquetes
+CatUsersLinks=Enllaços entre usuaris i etiquetes
 DeleteFromCat=Elimina de l'etiqueta
 ExtraFieldsCategories=Atributs complementaris
 CategoriesSetup=Configuració d'etiquetes
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index 1ed63965f27..be17f07426e 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -245,7 +245,7 @@ ProfId3TN=CNAE
 ProfId4TN=CCC
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id (FEIN) <i>associat a l'Administració de taxes dels USA</i>
+ProfId1US=FEIN
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -349,7 +349,7 @@ NewContactAddress=Contacte/Adreça nova
 MyContacts=Els meus contactes
 Capital=Capital
 CapitalOf=Capital de %s
-EditCompany=Modificar empresa
+EditCompany=Edita l'empresa
 ThisUserIsNot=Aquest usuari no és client potencial, client o proveïdor
 VATIntraCheck=Verificar
 VATIntraCheckDesc=L'enllaç <b>%s</b> permet consultar el NIF intracomunitari al servei de control europeu. Es requereix accés a internet per a que el servei funcioni.
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Verifica el NIF Intracomunitari a la web de la Comissi
 VATIntraManualCheck=També podeu verificar-ho manualment al lloc web de la Comissió Europea <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Comprovació impossible. El servei de comprovació no és prestat pel país membre (%s).
 NorProspectNorCustomer=Ni client, ni client potencial
-JuridicalStatus=Tipus d'entitat legal
+JuridicalStatus=Tipus d'entitat empresarial
 Workforce=Força de treball
 Staff=Empleats
 ProspectLevelShort=Potencial
diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index 7cd6406d3ff..c4dbff76836 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -75,12 +75,12 @@ TypeContrib=Tipus d'aportació
 MenuSpecialExpenses=Pagaments especials
 MenuTaxAndDividends=Impostos i càrregues
 MenuSocialContributions=Impostos varis
-MenuNewSocialContribution=Nou impost varis
-NewSocialContribution=Nou impost varis
+MenuNewSocialContribution=Impost varis nou
+NewSocialContribution=Impost varis nou
 AddSocialContribution=Afegeix un impost varis
 ContributionsToPay=Impostos varis a pagar
 AccountancyTreasuryArea=Àrea de facturació i pagament
-NewPayment=Nou pagament
+NewPayment=Pagament nou
 PaymentCustomerInvoice=Cobrament factura a client
 PaymentSupplierInvoice=Pagament de la factura del proveïdor
 PaymentSocialContribution=Pagament d'impost varis
@@ -88,16 +88,16 @@ PaymentVat=Pagament IVA
 ListPayment=Llistat de pagaments
 ListOfCustomerPayments=Llistat de cobraments de clients
 ListOfSupplierPayments=Llista de pagaments a proveïdors
-DateStartPeriod=Data d'inici del periode
-DateEndPeriod=Data final del periode
-newLT1Payment=Nou pagament de RE
-newLT2Payment=Nou pagament IRPF
+DateStartPeriod=Data d'inici del període
+DateEndPeriod=Data final del període
+newLT1Payment=Pagament de RE nou
+newLT2Payment=Pagament d'IRPF nou
 LT1Payment=Pagament RE
 LT1Payments=Pagaments RE
 LT2Payment=Pagament IRPF
 LT2Payments=Pagaments IRPF
-newLT1PaymentES=Nou pagament de RE
-newLT2PaymentES=Nou pagament d'IRPF
+newLT1PaymentES=Pagament de RE nou
+newLT2PaymentES=Pagament d'IRPF nou
 LT1PaymentES=Pagament de RE
 LT1PaymentsES=Pagaments de RE
 LT2PaymentES=Pagament IRPF
@@ -105,19 +105,19 @@ LT2PaymentsES=Pagaments IRPF
 VATPayment=Pagament d'impost de vendes
 VATPayments=Pagaments d'impost de vendes
 VATRefund=Devolució IVA
-NewVATPayment=Nou pagament d'impostos a les vendes
-NewLocalTaxPayment=Nou pagament d'impostos %s
+NewVATPayment=Pagament nou de l'impost sobre les vendes
+NewLocalTaxPayment=Pagament nou d'impostos %s
 Refund=Devolució
 SocialContributionsPayments=Pagaments d'impostos varis
 ShowVatPayment=Veure pagaments IVA
 TotalToPay=Total a pagar
-BalanceVisibilityDependsOnSortAndFilters=El balanç es visible en aquest llistat només si la taula està ordenada de manera ascendent sobre %s i filtrada per 1 compte bancari
+BalanceVisibilityDependsOnSortAndFilters=El saldo només es pot veure en aquesta llista si la taula està ordenada amb %s i es filtra en 1 compte bancari (sense altres filtres)
 CustomerAccountancyCode=Codi comptable del client
 SupplierAccountancyCode=Codi de comptabilitat del venedor
 CustomerAccountancyCodeShort=Codi compt. cli.
 SupplierAccountancyCodeShort=Codi compt. prov.
 AccountNumber=Número de compte
-NewAccountingAccount=Nou compte
+NewAccountingAccount=Compte nou
 Turnover=Facturació facturada
 TurnoverCollected=Facturació recopilada
 SalesTurnoverMinimum=Facturació mínima
@@ -127,8 +127,8 @@ ByUserAuthorOfInvoice=Per autor de la factura
 CheckReceipt=Ingrés de xec
 CheckReceiptShort=Ingrés de xec
 LastCheckReceiptShort=Últimes %s remeses de xec
-NewCheckReceipt=Nou descompte
-NewCheckDeposit=Nou ingrés
+NewCheckReceipt=Descompte nou
+NewCheckDeposit=Ingrés nou
 NewCheckDepositOn=Crea remesa per ingressar al compte: %s
 NoWaitingChecks=Sense xecs en espera de l'ingrés.
 DateChequeReceived=Data recepció del xec
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Esteu segur de voler eliminar el pagament d'aque
 ExportDataset_tax_1=Impostos varis i pagaments
 CalcModeVATDebt=Mode d'<b>%sIVA sobre comptabilitat de compromís%s </b>.
 CalcModeVATEngagement=Mode d'<b>%sIVA sobre ingressos-despeses%s</b>.
-CalcModeDebt=Anàlisi de factures conegudes registrades, fins i tot si encara no estan comptabilitzades en el llibre major.
+CalcModeDebt=Anàlisi de documents registrats coneguts encara no comptabilitzats al llibre major.
 CalcModeEngagement=Anàlisi dels pagaments registrats coneguts, fins i tot si encara no estan comptabilitzat en el Llibre Major.
 CalcModeBookkeeping=Anàlisi de dades publicades a la taula de compilació de llibres.
 CalcModeLT1= Metode <b>%sRE factures a client - factures de proveïdor%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Saldo d'ingressos i despeses, resum anual
 AnnualByCompanies=Saldo d'ingressos i despeses, per grups de compte predefinits
 AnnualByCompaniesDueDebtMode=Saldo d'ingressos i despeses, detall per grups predefinits, mode <b> %sReclamacions-Deutes%s</b> és a dir <b>Comptabilitat de compromisos</b>.
 AnnualByCompaniesInputOutputMode=Saldo d'ingressos i despeses, detall per grups predefinits, mode <b> %sIngresos-Despeses%s</b> és a dir <b>comptabilitat d'efectiu</b>.
-SeeReportInInputOutputMode=Veure %sl'anàlisi de pagaments %s per a un càlcul dels pagaments realitzats fins i tot si encara no estan comptabilitzats en el Llibre Major.
-SeeReportInDueDebtMode=Veure l'informe %sanàlisi de factures%s per a un càlcul basat en factures registrades conegudes encara que encara no s'hagin comptabilitzat en el Llibre Major.
-SeeReportInBookkeepingMode=Veure <b>%sl'informe%s</b> per a un càlcul a <b> Taula de Llibre Major</b>
+SeeReportInInputOutputMode=Mostra<b>%sl'anàlisi de pagaments%s</b> per a obtenir un càlcul basat en <b>pagaments registrats</b> realitzats fins i tot si encara no estan comptabilitzats al llibre major
+SeeReportInDueDebtMode=Mostra l'<b>%sanàlisi de documents registrats%s </b> per a obtenir un càlcul basat en els <b>documents registrats</b> coneguts, fins i tot si encara no estan comptabilitzats al llibre major.
+SeeReportInBookkeepingMode=Mostra <b>%sl'anàlisi de la taula de llibres comptables%s</b> per a obtenir un informe basat en <b>Taula de llibres comptables</b>
 RulesAmountWithTaxIncluded=- Els imports mostrats són amb tots els impostos inclosos.
 RulesResultDue=- Inclou factures pendents, despeses, IVA, donacions tant si han estat pagades com si no. També inclou salaris pagats. <br> - Es basa en la data de facturació de les factures i en la data de venciment per despeses o pagaments d’impostos. Per als salaris definits amb el mòdul Salari, s’utilitza la data de valor del pagament.
 RulesResultInOut=- Inclou els pagaments reals realitzats en les factures, les despeses, l'IVA i els salaris. <br> - Es basa en les dates de pagament de les factures, les despeses, l'IVA i els salaris. La data de la donació per a la donació.
@@ -231,7 +231,7 @@ ACCOUNTING_VAT_SOLD_ACCOUNT=Compte de comptabilitat per defecte per l'IVA en ven
 ACCOUNTING_VAT_BUY_ACCOUNT=Compte de comptabilitat per defecte per l'IVA en les compres (s'utilitza si no es defineix en la configuració del diccionari d'IVA)
 ACCOUNTING_VAT_PAY_ACCOUNT=Compte comptable per defecte per IVA pagat
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
-ACCOUNTING_ACCOUNT_CUSTOMER_Desc=El compte de comptabilitat dedicat definit a la targeta de tercers només s'utilitzarà per a la comptabilitat del Llibre Major. Aquest serà utilitzat per al Llibre Major i com a valor predeterminat de la comptabilitat de subcompte si el compte de comptabilitat de clients dedicat a tercers no està definit.
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=El compte comptable dedicat definit a la fitxa de tercer només s’utilitzarà per a la comptabilitat auxiliar. Aquest s'utilitzarà per al llibre major i com a valor per defecte de la comptabilitat auxiliar si no es defineix un compte comptable de client dedicat a tercers.
 ACCOUNTING_ACCOUNT_SUPPLIER=Compte de comptabilitat utilitzat per tercers proveïdors
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=El compte comptable dedicat definit a la fitxa de tercers només s'utilitzarà per al Llibre Major. Aquest serà utilitzat pel Llibre Major i com a valor predeterminat del subcompte si no es defineix un compte comptable a la fitxa del tercer.
 ConfirmCloneTax=Confirma el clonat d'un impost social / fiscal
diff --git a/htdocs/langs/ca_ES/cron.lang b/htdocs/langs/ca_ES/cron.lang
index c2771dd9a03..80c0b738715 100644
--- a/htdocs/langs/ca_ES/cron.lang
+++ b/htdocs/langs/ca_ES/cron.lang
@@ -7,10 +7,10 @@ Permission23103 = Elimina la tasca programada
 Permission23104 = Executa les tasques programades
 # Admin
 CronSetup=Pàgina de configuració del mòdul - Gestió de tasques planificades
-URLToLaunchCronJobs=URL per comprovar i posar en marxa les tasques automàtiques qualificades
-OrToLaunchASpecificJob=O per llançar una tasca específica
+URLToLaunchCronJobs=URL per comprovar i iniciar les tasques programades des d'un navegador
+OrToLaunchASpecificJob=O per comprovar i iniciar una tasca específica des d’un navegador
 KeyForCronAccess=Codi de seguretat per a la URL de llançament de tasques automàtiques
-FileToLaunchCronJobs=Línia de comando per verificar i executar tasques cron qualificades
+FileToLaunchCronJobs=Línia d'ordres per a comprovar i iniciar les tasques cron qualificades
 CronExplainHowToRunUnix=A entorns Unix s'ha d'utilitzar la següent entrada crontab per executar la comanda cada 5 minuts
 CronExplainHowToRunWin=En l'entorn de Microsoft (tm) de Windows, podeu utilitzar les Eines de tasques programades per executar la línia de comandaments cada 5 minuts
 CronMethodDoesNotExists=La classe %s no conté cap mètode %s
@@ -22,7 +22,7 @@ EnabledAndDisabled=Habilitat i deshabilitat
 # Page list
 CronLastOutput=Última sortida d'execució
 CronLastResult=Últim codi retornat
-CronCommand=Comando
+CronCommand=Ordre
 CronList=Tasques programades
 CronDelete=Elimina les tasques programades
 CronConfirmDelete=Vols eliminar aquests treballs programats?
@@ -43,13 +43,13 @@ CronModule=Mòdul
 CronNoJobs=Sense treballs actualment
 CronPriority=Prioritat
 CronLabel=Etiqueta
-CronNbRun=Nº execucions
-CronMaxRun=Número màxim d'execucions
+CronNbRun=Nombre d'execucions
+CronMaxRun=Nombre màxim d'execucions
 CronEach=Tota (s)
 JobFinished=Tasques llançades i finalitzades
 Scheduled=Programat
 #Page card
-CronAdd= Afegir una tasca
+CronAdd= Afegeix tasques
 CronEvery=Executa cada tasca
 CronObject=Instància/Objecte a crear
 CronArgs=Argument
@@ -68,14 +68,14 @@ CronClassFileHelp=La ruta relativa i el nom del fitxer a carregar (la ruta és r
 CronObjectHelp=El nom de l'objecte a carregar. <BR> Per exemple, per cridar al mètode "fetch" de l'objecte Producte de Dolibarr /htdocs/product/class/product.class.php, el valor pel nom del fitxer de classe és<br> <i>Product</i>
 CronMethodHelp=El mètode d'objecte a cridar. <BR> Per exemple, per cridar al mètode "fetch" de l'objecte Producte de Dolibarr /htdocs/product/class/product.class.php, el valor pel mètode és<br> <i>fetch</i>
 CronArgsHelp=Els arguments del mètode. <BR> Per exemple, cridar al mètode "fetch" de l'objecte Producte de Dolibarr /htdocs/product/class/product.class.php, el valor dels paràmetres pot ser <br> <i>0, ProductRef</i>
-CronCommandHelp=El comando del sistema a executar
+CronCommandHelp=La línia d'ordres del sistema a executar.
 CronCreateJob=Crear nova tasca programada
 CronFrom=De
 # Info
 # Common
 CronType=Tipus de tasca
 CronType_method=Mètode per cridar una classe PHP
-CronType_command=Comando Shell
+CronType_command=Ordre Shell
 CronCannotLoadClass=Impossible carregar el fitxer de la classe %s (per utilitzar la classe %s)
 CronCannotLoadObject=El "class file" %s s'ha carregat, però l'objecte %s no s'ha trobat dins d'ell
 UseMenuModuleToolsToAddCronJobs=Vés al menú "<a href="%s">Inici - Eines d'administració: treballs programats</a>" per veure i editar les tasques programades.
@@ -84,3 +84,8 @@ MakeLocalDatabaseDumpShort=Còpia de seguretat de la base de dades local
 MakeLocalDatabaseDump=Crear un bolcat de la base de dades local. Els paràmetres són: compressió ('gz' o 'bz' o 'none'), tipus de còpia de seguretat ('mysql' o 'pgsql'), 1, 'auto' o nom de fitxer per a compilar, nombre de fitxers de còpia de seguretat per conservar
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
 DATAPOLICYJob=Netejador de dades i anonimitzador
+JobXMustBeEnabled=La tasca %s s'ha d'activar
+# Cron Boxes
+LastExecutedScheduledJob=Darrera tasca programada executada
+NextScheduledJobExecute=Propera tasca programada a executar
+NumberScheduledJobError=Nombre de tasques programades en error
diff --git a/htdocs/langs/ca_ES/dict.lang b/htdocs/langs/ca_ES/dict.lang
index 00988d0d397..1d0f708a3e0 100644
--- a/htdocs/langs/ca_ES/dict.lang
+++ b/htdocs/langs/ca_ES/dict.lang
@@ -166,7 +166,7 @@ CountryNR=Nauru
 CountryNP=Nepal
 CountryAN=Antilles Holandeses
 CountryNC=Nova Caledònia
-CountryNZ=Nouvelle-Zélande
+CountryNZ=Nova Zelanda
 CountryNI=Nicaragua
 CountryNE=Níger
 CountryNG=Nigèria
@@ -197,7 +197,7 @@ CountryPM=San Pedro i Miquelon
 CountryVC=Saint Vincent i les Grenadines
 CountryWS=Samoa
 CountrySM=San Marino
-CountryST=São Tomé i Príncipe
+CountryST=Sao Tomé i Príncep
 CountryRS=Serbia
 CountrySC=Seychelles
 CountrySL=Sierra Leone
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinité-et-Tobago
 CountryTR=Turquia
 CountryTM=Turkmenistan
-CountryTC=Illes turques i caicos
+CountryTC=Illes Turques i Caicos
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ucraïna
@@ -245,7 +245,7 @@ CountryGG=Guernesey
 CountryIM=Ile de Man
 CountryJE=Jersey
 CountryME=Monténégro
-CountryBL=Saint-Barthélemy
+CountryBL=Sant Bartomeu
 CountryMF=Saint-Martin
 
 ##### Civilities #####
@@ -353,7 +353,7 @@ ExpAuto10PCV=10 CV i més
 ExpAuto11PCV=11 CV i més
 ExpAuto12PCV=12 CV i més
 ExpAuto13PCV=13 CV i més
-ExpCyclo=Capacitat inferior a 50cm3
+ExpCyclo=Capacitat inferior a 50 cm3
 ExpMoto12CV=Moto 1 ó 2 CV
 ExpMoto345CV=Moto 3, 4 ó 5 CV
 ExpMoto5PCV=Moto 5 CV i més
diff --git a/htdocs/langs/ca_ES/ecm.lang b/htdocs/langs/ca_ES/ecm.lang
index f26824bcc38..fb39f111e08 100644
--- a/htdocs/langs/ca_ES/ecm.lang
+++ b/htdocs/langs/ca_ES/ecm.lang
@@ -7,15 +7,15 @@ ECMSectionsManual=Arbre manual
 ECMSectionsAuto=Arbre automàtic
 ECMSections=Carpetes
 ECMRoot=Arrel del ECM
-ECMNewSection=Nova carpeta
-ECMAddSection=Afegir carpeta
+ECMNewSection=Carpeta nova
+ECMAddSection=Afegeix directori
 ECMCreationDate=Data creació
 ECMNbOfFilesInDir=Nombre d'arxius a la carpeta
-ECMNbOfSubDir=nombre de subcarpetes
+ECMNbOfSubDir=Nombre de subcarpetes
 ECMNbOfFilesInSubDir=Nombre d'arxius en les subcarpetes
 ECMCreationUser=Creador
 ECMArea=Àrea SGD/GCE
-ECMAreaDesc=L'àrea SGD / GCE (Sistema de Gestió de Documents / Gestió de Continguts Electrònics) et permet desar, compartir i cercar ràpidament tot tipus de documents a Dolibarr.
+ECMAreaDesc=L’àrea SGD/GED (Sistema de Gestió de Documents / Gestió de Continguts Electrònics) us permet desar, compartir i cercar ràpidament tota mena de documents a Dolibarr.
 ECMAreaDesc2=Podeu crear carpetes manuals i adjuntar els documents<br>Les carpetes automàtiques són emplenades automàticament en l'addició d'un document en una fitxa.
 ECMSectionWasRemoved=La carpeta <b>%s</b> ha estat eliminada
 ECMSectionWasCreated=S'ha creat el directori <b>%s</b>.
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index 520515f844c..cb12fdd27c9 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -8,6 +8,7 @@ ErrorBadEMail=Correu electrònic %s és incorrecte
 ErrorBadMXDomain=El correu electrònic %s sembla incorrecte (el domini no té cap registre MX vàlid)
 ErrorBadUrl=Url %s invàlida
 ErrorBadValueForParamNotAString=Valor incorrecte del paràmetre. Acostuma a passar quan falta la traducció.
+ErrorRefAlreadyExists=La referència <b> %s </b> ja existeix.
 ErrorLoginAlreadyExists=El login %s ja existeix.
 ErrorGroupAlreadyExists=El grup %s ja existeix.
 ErrorRecordNotFound=Registre no trobat
@@ -49,6 +50,7 @@ ErrorFieldsRequired=No s'han indicat alguns camps obligatoris
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Error en la creació d'una carpeta. Comprovi que l'usuari del servidor web té drets d'escriptura en les carpetes de documents de Dolibarr. Si el paràmetre <b>safe_mode</b> està actiu en aquest PHP, Comproveu que els fitxers php dolibarr pertanyen a l'usuari del servidor web.
 ErrorNoMailDefinedForThisUser=E-Mail no definit per a aquest usuari
+ErrorSetupOfEmailsNotComplete=La configuració dels correus electrònics no s'ha completat
 ErrorFeatureNeedJavascript=Aquesta funcionalitat requereix javascript actiu per funcionar. Modifiqueu en configuració->entorn.
 ErrorTopMenuMustHaveAParentWithId0=Un menú del tipus 'Superior' no pot tenir un menú pare. Poseu 0 al menú pare o trieu un menú del tipus 'Esquerra'.
 ErrorLeftMenuMustHaveAParentId=Un menú del tipus 'Esquerra' ha de tenir un ID de pare
@@ -74,9 +76,9 @@ ErrorFieldMustHaveXChar=El camp <b> %s </b> ha de tenir com a mínim %s caràcte
 ErrorNoAccountancyModuleLoaded=Mòdul de comptabilitat no activat
 ErrorExportDuplicateProfil=El nom d'aquest perfil ja existeix per aquest conjunt d'exportació
 ErrorLDAPSetupNotComplete=La configuració Dolibarr-LDAP és incompleta.
-ErrorLDAPMakeManualTest=S'ha creat un arxiu .ldif a la carpeta %s. Intenta carregar-lo manualment des de la línia de comandes per tenir més informació sobre l'error.
+ErrorLDAPMakeManualTest=S'ha generat un fitxer .ldif al directori %s. Proveu de carregar-lo manualment des de la línia de comandes per a obtenir més informació sobre els errors.
 ErrorCantSaveADoneUserWithZeroPercentage=No es pot desar una acció amb "estat no iniciat" si el camp "fet per" també s'omple.
-ErrorRefAlreadyExists=La referència utilitzada per a la creació ja existeix
+ErrorRefAlreadyExists=La referència <b> %s </b> ja existeix.
 ErrorPleaseTypeBankTransactionReportName=Si us plau, tecleja el nom del extracte bancari on s'informa del registre (format AAAAMM o AAAAMMDD)
 ErrorRecordHasChildren=No s'ha pogut eliminar el registre, ja que té alguns registres fills.
 ErrorRecordHasAtLeastOneChildOfType=L'objecte té almenys un fill de tipus %s
@@ -133,7 +135,7 @@ ErrorModuleFileRequired=Ha de seleccionar un arxiu del paquet del mòdul de Doli
 ErrorPhpCurlNotInstalled=L'extensió PHP CURL no es troba instal·lada, és indispensable per dialogar amb Paypal.
 ErrorFailedToAddToMailmanList=S'ha produït un error en intentar afegir un registre a la llista Mailman o base de dades SPIP
 ErrorFailedToRemoveToMailmanList=Error en l'eliminació de %s de la llista Mailmain %s o base SPIP
-ErrorNewValueCantMatchOldValue=El Nou valor no pot ser igual al antic
+ErrorNewValueCantMatchOldValue=El valor nou no pot ser igual al valor antic
 ErrorFailedToValidatePasswordReset=No s'ha pogut restablir la contrasenya. És possible que aquest enllaç ja s'hagi utilitzat (aquest enllaç només es pot utilitzar una vegada). Si no és el cas prova de reiniciar el procés de restabliment de contrasenya des del principi.
 ErrorToConnectToMysqlCheckInstance=Error de connexió amb la base de dades. Comprovi que el servidor de la base de dades està funcionant (per exemple, amb mysql/mariadb, pot iniciar-lo amb el comandament 'sudo service mysql start')
 ErrorFailedToAddContact=Error en l'addició del contacte
@@ -181,7 +183,7 @@ ErrorGlobalVariableUpdater5=Sense variable global seleccionada
 ErrorFieldMustBeANumeric=El camp <b>%s</b> ha de ser un valor numèric
 ErrorMandatoryParametersNotProvided=Paràmetre/s obligatori/s no definits
 ErrorOppStatusRequiredIfAmount=Establiu una quantitat estimada d'aquest avantatge. Així que també heu d'introduir el seu estat.
-ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
+ErrorFailedToLoadModuleDescriptorForXXX=No s'ha pogut carregar la classe del descriptor del mòdul per %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Definició incorrecta del menú Array en el descriptor del mòdul (valor incorrecte per a la clau fk_menu)
 ErrorSavingChanges=S'ha produït un error en desar els canvis
 ErrorWarehouseRequiredIntoShipmentLine=El magatzem és obligatori en la línia a enviar
@@ -224,10 +226,10 @@ ErrorDuringChartLoad=S'ha produït un error en carregar el gràfic de comptes. S
 ErrorBadSyntaxForParamKeyForContent=Sintaxi incorrecta per a la clau de contingut del paràmetre. Ha de tenir un valor que comenci per %s o %s
 ErrorVariableKeyForContentMustBeSet=Error, s'ha d'establir la constant amb el nom %s (amb contingut de text per mostrar) o %s (amb url extern per mostrar).
 ErrorURLMustStartWithHttp=L'URL %s ha de començar amb http: // o https: //
-ErrorNewRefIsAlreadyUsed=Error, la nova referència ja s’està utilitzant
+ErrorNewRefIsAlreadyUsed=Error, la referència nova ja s’està utilitzant
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, l’eliminació del pagament vinculat a una factura tancada no és possible.
 ErrorSearchCriteriaTooSmall=Criteris de cerca massa petits.
-ErrorObjectMustHaveStatusActiveToBeDisabled=Per desactivar els objectes, han de tenir l'estat "Actiu"
+ErrorObjectMustHaveStatusActiveToBeDisabled=Per a desactivar els objectes, han de tenir l'estat "Actiu"
 ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Per ser activats, els objectes han de tenir l'estat "Esborrany" o "Desactivat"
 ErrorNoFieldWithAttributeShowoncombobox=Cap camp té la propietat "showoncombobox" en la definició de l'objecte "%s". No es pot mostrar el llistat desplegable.
 ErrorFieldRequiredForProduct=El camp "%s" és obligatori per al producte %s
@@ -246,6 +248,14 @@ ErrorProductDoesNotNeedBatchNumber=Error, el producte '<b> %s </b>' no accepta u
 ErrorFailedToReadObject=Error, no s'ha pogut llegir l'objecte del tipus <b> %s </b>
 ErrorParameterMustBeEnabledToAllwoThisFeature=Error, el paràmetre <b> %s </b> s'ha d'activar a <b>conf/conf.php<b> per permetre l'ús de la interfície de línia d'ordres pel programador de treball intern
 ErrorLoginDateValidity=Error, aquest inici de sessió està fora de l'interval de dates de validesa
+ErrorValueLength=La longitud del camp '<b> %s </b>' ha de ser superior a '<b> %s </b>'
+ErrorReservedKeyword=La paraula '<b> %s </b>' és una paraula clau reservada
+ErrorNotAvailableWithThisDistribution=No disponible amb aquesta distribució
+ErrorPublicInterfaceNotEnabled=La interfície pública no s'ha activat
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=Cal definir l'idioma de la pàgina nova si es defineix com a traducció d'una altra pàgina
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=L'idioma de la pàgina nova no ha de ser l'idioma d'origen si s'estableix com a traducció d'una altra pàgina
+ErrorAParameterIsRequiredForThisOperation=Un paràmetre és obligatori per a aquesta operació
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=El paràmetre PHP upload_max_filesize (%s) és superior al paràmetre PHP post_max_size (%s). No es tracta d’una configuració consistent.
 WarningPasswordSetWithNoAccount=S'ha indicat una contrasenya per aquest soci. En canvi, no s'ha creat cap compte d'usuari, de manera que aquesta contrasenya s'ha desat però no pot ser utilitzada per entrar a Dolibarr. Es pot utilitzar per un mòdul/interfície extern, però si no cal definir cap usuari i contrasenya per un soci, pots deshabilitar la opció "Gestiona l'entrada per tots els socis" des de la configuració del mòdul Socis. Si necessites gestionar una entrada sense contrasenya, pots mantenir aquest camp buit i permetre aquest avís. Nota: El correu electrònic es pot utilitzar per entrar si el soci està enllaçat a un usuarí
@@ -276,3 +286,4 @@ WarningSomeBankTransactionByChequeWereRemovedAfter=Algunes transaccions bancàri
 WarningFailedToAddFileIntoDatabaseIndex=Advertiment: no s'ha pogut afegir l'entrada de fitxer a la taula d'índex de la base de dades ECM
 WarningTheHiddenOptionIsOn=Advertiment, l'opció oculta <b> %s </b> està activada.
 WarningCreateSubAccounts=Atenció, no podeu crear directament un subcompte, heu de crear un tercer o un usuari i assignar-los un codi comptable per trobar-los en aquesta llista.
+WarningAvailableOnlyForHTTPSServers=Disponible només si s'utilitza una connexió segura HTTPS.
diff --git a/htdocs/langs/ca_ES/exports.lang b/htdocs/langs/ca_ES/exports.lang
index 5a0d95fcf7d..40abe119e07 100644
--- a/htdocs/langs/ca_ES/exports.lang
+++ b/htdocs/langs/ca_ES/exports.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - exports
 ExportsArea=Exportacions
 ImportArea=Importació
-NewExport=Nova exportació
-NewImport=Nova importació
+NewExport=Exportació nova
+NewImport=Importació nova
 ExportableDatas=Conjunt de dades exportables
 ImportableDatas=Conjunt de dades importables
 SelectExportDataSet=Trieu un conjunt predefinit de dades que voleu exportar ...
@@ -23,7 +23,7 @@ DatasetToImport=Lot de dades a importar
 ChooseFieldsOrdersAndTitle=Trieu l'ordre dels camps ...
 FieldsTitle=Títol camps
 FieldTitle=Títol camp
-NowClickToGenerateToBuildExportFile=Ara, seleccioneu el format del fitxer al quadre combinat i feu clic a "Generar" per generar el fitxer d'exportació ...
+NowClickToGenerateToBuildExportFile=Ara, seleccioneu el format de fitxer al quadre combinat i feu clic a "Genera" per a crear el fitxer d'exportació...
 AvailableFormats=Formats disponibles
 LibraryShort=Llibreria
 ExportCsvSeparator=Caràcter separador del CSV
@@ -35,7 +35,7 @@ FormatedImportDesc2=El primer pas és triar el tipus de dades que voleu importar
 FormatedExport=Assistent d'exportació
 FormatedExportDesc1=Aquestes eines permeten l'exportació de dades personalitzades mitjançant un assistent, per ajudar-vos en el procés sense necessitat de coneixements tècnics.
 FormatedExportDesc2=El primer pas és triar un conjunt de dades predefinit, després els camps que voleu exportar i en quin ordre.
-FormatedExportDesc3=Quan se seleccionen les dades per exportar, podeu triar el format del fitxer de sortida.
+FormatedExportDesc3=Quan se seleccionen les dades per a exportar, podeu triar el format del fitxer de sortida.
 Sheet=Fulla
 NoImportableData=Sense taules de dades importables (cap mòdul amb les definicions dels perfils d'importació està actiu)
 FileSuccessfullyBuilt=Fitxer generat
@@ -117,7 +117,7 @@ ImportFromLine=Importa començant des del número de línia
 EndAtLineNb=Final en el número de línia
 ImportFromToLine=Interval límit (Des de - Fins a). Per exemple per a ometre les línies de capçalera.
 SetThisValueTo2ToExcludeFirstLine=Per exemple, estableixi aquest valor a 3 per excloure les 2 primeres línies. <br> Si no s'ometen les línies de capçalera, això provocarà diversos errors en la simulació d'importació.
-KeepEmptyToGoToEndOfFile=Mantingueu aquest camp buit per processar totes les línies al final del fitxer.
+KeepEmptyToGoToEndOfFile=Mantingueu aquest camp buit per a processar totes les línies fins al final del fitxer.
 SelectPrimaryColumnsForUpdateAttempt=Seleccioneu les columnes que s'utilitzaran com a clau principal per a una importació UPDATE
 UpdateNotYetSupportedForThisImport=L'actualització no és compatible amb aquest tipus d'importació (només afegir)
 NoUpdateAttempt=No s'ha realitzat cap intent d'actualització, només afegir
@@ -130,6 +130,7 @@ FilteredFieldsValues=Valors de filtres
 FormatControlRule=Regla de control de format
 ## imports updates
 KeysToUseForUpdates=Clau (columna) a utilitzar per <b> actualització </b> dades existents
-NbInsert=Número de línies afegides: %s
-NbUpdate=Número de línies actualizades: %s
+NbInsert=Nombre de línies afegides: %s
+NbUpdate=Nombre de línies actualitzades: %s
 MultipleRecordFoundWithTheseFilters=S'han trobat múltiples registres amb aquests filtres: %s
+StocksWithBatch=Estocs i ubicacions (magatzem) de productes amb número de lot/sèrie
diff --git a/htdocs/langs/ca_ES/holiday.lang b/htdocs/langs/ca_ES/holiday.lang
index e1143a0ae38..699105808bb 100644
--- a/htdocs/langs/ca_ES/holiday.lang
+++ b/htdocs/langs/ca_ES/holiday.lang
@@ -3,7 +3,7 @@ HRM=RRHH
 Holidays=Dies lliures
 CPTitreMenu=Dies lliures
 MenuReportMonth=Estat mensual
-MenuAddCP=Nova petició de dia lliure
+MenuAddCP=Sol·licitud nova de permís
 NotActiveModCP=Ha d'activar el mòdul Dies lliures retribuïts per veure aquesta pàgina
 AddCP=Realitzar una petició de dies lliures
 DateDebCP=Data inici
@@ -15,7 +15,7 @@ CancelCP=Anul·lada
 RefuseCP=Rebutjada
 ValidatorCP=Validador
 ListeCP=Llista de dies lliures
-Leave=Fitxa de dies lliures
+Leave=Sol·licitud de permís
 LeaveId=Identificador de baixa
 ReviewedByCP=Serà revisada per
 UserID=ID d'usuari
@@ -33,7 +33,7 @@ ErrorSQLCreateCP=S'ha produït un error de SQL durant la creació:
 ErrorIDFicheCP=S'ha produït un error, aquesta sol·licitud de dies lliures no existeix
 ReturnCP=Tornar a la pàgina anterior
 ErrorUserViewCP=No esta autoritzat a llegir aquesta petició de dies lliures.
-InfosWorkflowCP=Informació del workflow
+InfosWorkflowCP=Informació del flux de treball
 RequestByCP=Comandada per
 TitreRequestCP=Fitxa de dies lliures
 TypeOfLeaveId=Tipus d'identificador de baixa
@@ -46,14 +46,14 @@ NbUseDaysCPShortInMonth=Dies consumits al mes
 DayIsANonWorkingDay=%s és un dia no laborable
 DateStartInMonth=Data d'inici al mes
 DateEndInMonth=Data de finalització al mes
-EditCP=Modificar
+EditCP=Edita
 DeleteCP=Eliminar
 ActionRefuseCP=Rebutja
 ActionCancelCP=Cancel·la
 StatutCP=Estat
 TitleDeleteCP=Eliminar la petició de dies lliures
 ConfirmDeleteCP=Estàs segur de voler eliminar aquesta petició de dies lliures?
-ErrorCantDeleteCP=Error, no te permisos per eliminar aquesta petició de dies lliures
+ErrorCantDeleteCP=Error, no teniu permisos per a suprimir aquesta sol·licitud de permís.
 CantCreateCP=Note permisos per realitzar peticions de dies lliures
 InvalidValidatorCP=Ha d'indicar un validador per la seva petició de dies lliures
 NoDateDebut=Ha d'indicar una data d'inici.
@@ -80,12 +80,12 @@ UserCP=Usuari
 ErrorAddEventToUserCP=S'ha produït un error en l'assignació del permís excepcional.
 AddEventToUserOkCP=S'ha afegit el permís excepcional.
 MenuLogCP=Veure registre de canvis
-LogCP=Historial d'actualizacions de dies lliures
+LogCP=Registre d’actualitzacions dels dies de vacances disponibles
 ActionByCP=Realitzat per
 UserUpdateCP=Per a l'usuari
 PrevSoldeCP=Saldo anterior
-NewSoldeCP=Nou saldo
-alreadyCPexist=Ha s'ha efectuat una petició de dies lliures per aquest periode
+NewSoldeCP=Saldo nou
+alreadyCPexist=En aquest període ja s’ha fet una sol·licitud de dia lliure.
 FirstDayOfHoliday=Primer dia lliure
 LastDayOfHoliday=Últim dia de vacances
 BoxTitleLastLeaveRequests=Últimes %s peticions de dies lliures modificades
@@ -113,15 +113,15 @@ ErrorMailNotSend=S'ha produït un error en l'enviament del correu electrònic:
 NoticePeriod=Preavís
 #Messages
 HolidaysToValidate=Dies lliures retribuïts a validar
-HolidaysToValidateBody=A continuació trobara una sol·licitud de dies lliures retribuïts per validar
+HolidaysToValidateBody=A continuació es mostra una sol·licitud de permís per a validar
 HolidaysToValidateDelay=Aquesta sol·licitud de dies lliures retribuïts tindrà lloc en un termini de menys de %s dies.
 HolidaysToValidateAlertSolde=L'usuari que ha realitzat la sol·licitud de dies lliures retribuïts no disposa de suficients dies disponibles
-HolidaysValidated=Dies lliures retribuïts valids
+HolidaysValidated=Sol·licituds de permís validats
 HolidaysValidatedBody=La seva sol·licitud de dies lliures retribuïts des de el %s al %s ha sigut validada.
 HolidaysRefused=Dies lliures retribuïts denegats
 HolidaysRefusedBody=La seva sol·licitud de dies lliures retribuïts des de el %s al %s ha sigut denegada per el següent motiu:
 HolidaysCanceled=Dies lliures retribuïts cancel·lats
-HolidaysCanceledBody=La seva solicitud de dies lliures retribuïts del %s al %s ha sigut cancel·lada.
+HolidaysCanceledBody=S'ha cancel·lat la vostra sol·licitud de permís del %s al %s.
 FollowedByACounter=1: Aquest tipus de dia lliure necessita el seguiment d'un comptador. El comptador s'incrementa manualment o automàticament i quan hi ha una petició de dia lliure validada, el comptador es decrementa.<br>0: No seguit per un comptador.
 NoLeaveWithCounterDefined=No s'han definit els tipus de dies lliures que son necessaris per poder seguir-los amb comptador
 GoIntoDictionaryHolidayTypes=Ves a <strong>Inici - Configuració - Diccionaris - Tipus de dies lliures</strong> per configurar els diferents tipus de dies lliures
@@ -131,4 +131,4 @@ TemplatePDFHolidays=Plantilla de sol · licitud de dies lliures en PDF
 FreeLegalTextOnHolidays=Text gratuït a PDF
 WatermarkOnDraftHolidayCards=Marques d'aigua sobre esborranys de sol·licituds de dies lliures
 HolidaysToApprove=Vacances per aprovar
-NobodyHasPermissionToValidateHolidays=Ningú té permís per validar vacances
+NobodyHasPermissionToValidateHolidays=Ningú no té permís per a validar les vacances
diff --git a/htdocs/langs/ca_ES/hrm.lang b/htdocs/langs/ca_ES/hrm.lang
index 2952d702637..cc584a4d291 100644
--- a/htdocs/langs/ca_ES/hrm.lang
+++ b/htdocs/langs/ca_ES/hrm.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - en_US - hrm
 # Admin
-HRM_EMAIL_EXTERNAL_SERVICE=Correu electrònic per prevenir serveis externs HRM
+HRM_EMAIL_EXTERNAL_SERVICE=Correu electrònic per a evitar el servei extern de HRM
 Establishments=Establiments
 Establishment=Establiment
 NewEstablishment=Establiment nou
diff --git a/htdocs/langs/ca_ES/install.lang b/htdocs/langs/ca_ES/install.lang
index 98b6efbeb16..7fbc7a86898 100644
--- a/htdocs/langs/ca_ES/install.lang
+++ b/htdocs/langs/ca_ES/install.lang
@@ -42,7 +42,7 @@ WebPagesDirectory=Carpeta que conté les pàgines web
 DocumentsDirectory=Carpeta que ha de contenir els documents generats (PDF, etc.)
 URLRoot=URL Arrel
 ForceHttps=Forçar connexions segures (https)
-CheckToForceHttps=Marqueu aquesta opció per forçar connexions segures (https).<br>Per a això és necessari que el servidor web està configurat amb un certificat SSL.
+CheckToForceHttps=Marqueu aquesta opció per a forçar connexions segures (https). <br> Això requereix que el servidor web estigui configurat amb un certificat SSL.
 DolibarrDatabase=Base de dades Dolibarr
 DatabaseType=Tipus de la base de dades
 DriverType=Tipus del driver
@@ -92,18 +92,18 @@ LoginAlreadyExists=Ja existeix
 DolibarrAdminLogin=Login de l'usuari administrador de Dolibarr
 AdminLoginAlreadyExists=El compte d'administrador de Dolibarr '<b> %s </b>' ja existeix. Torneu enrere si voleu crear un altre.
 FailedToCreateAdminLogin=No s'ha pogut crear el compte d'administrador de Dolibarr.
-WarningRemoveInstallDir=Avís, per motius de seguretat, un cop finalitzada la instal·lació o l'actualització, heu d'afegir un fitxer anomenat <b> install.lock </b> al directori del document Dolibarr per evitar l'ús accidental / maliciós de les eines d'instal·lació de nou.
+WarningRemoveInstallDir=Advertiment, per motius de seguretat, un cop finalitzada la instal·lació o actualització, heu d'afegir un fitxer anomenat <b> install.lock </b> al directori del document Dolibarr per a evitar l'ús accidental / malintencionat de les eines d'instal·lació.
 FunctionNotAvailableInThisPHP=No està disponible en aquest PHP
 ChoosedMigrateScript=Elecció de l'script de migració
 DataMigration=Migració de la base de dades (dades)
 DatabaseMigration=Migració de la base de dades (estructura + algunes dades)
 ProcessMigrateScript=Execució del script
-ChooseYourSetupMode=Tria el teu mètode d'instal·lació i fes clic a "Començar"
+ChooseYourSetupMode=Trieu el mode de configuració i feu clic a "Comença"...
 FreshInstall=Nova instal·lació
 FreshInstallDesc=Utilitzeu aquest mode si aquesta és la vostra primera instal·lació. Si no, aquest mode pot reparar una instal·lació prèvia incompleta. Si voleu actualitzar la vostra versió, seleccioneu "Actualitzar".
 Upgrade=Actualització
 UpgradeDesc=Utilitzeu aquest mètode després d'haver actualitzat els fitxers d'una instal·lació Dolibarr antiga pels d'una versió més recent. Aquesta elecció permet posar al dia la base de dades i les seves dades per a aquesta nova versió.
-Start=Començar
+Start=Comença
 InstallNotAllowed=Instal·lació no autoritzada per els permisos de l'arxiu <b>conf.php</b>
 YouMustCreateWithPermission=Ha de crear un fitxer %s i donar-li els drets d'escriptura al servidor web durant el procés d'instal·lació.
 CorrectProblemAndReloadPage=Corregiu el problema i premeu F5 per tornar a carregar la pàgina.
@@ -117,7 +117,7 @@ YouAskLoginCreationSoDolibarrNeedToConnect=Heu seleccionat crear un usuari de ba
 BecauseConnectionFailedParametersMayBeWrong=La connexió a la base de dades ha fallat: els paràmetres de l'amfitrió o superusuari han de ser incorrectes.
 OrphelinsPaymentsDetectedByMethod=Pagaments orfes detectats pel mètode %s
 RemoveItManuallyAndPressF5ToContinue=Esborreu manualment i premeu F5 per continuar.
-FieldRenamed=Camp renombrat
+FieldRenamed=S'ha canviat el nom del camp
 IfLoginDoesNotExistsCheckCreateUser=Si l'usuari encara no existeix, heu de marcar l'opció "Crear usuari"
 ErrorConnection=El servidor "<b> %s </b>", el nom de la base de dades "<b> %s </b>", inici de sessió "<b> %s </b>" o la contrasenya de la base de dades pot ser incorrecte o la versió del client PHP pot ser massa antiga en comparació amb la versió de la base de dades.
 InstallChoiceRecommanded=Opció recomanada per a instal·lar la versió <b>%s</b> sobre la seva actual versió <b>%s</b>
@@ -129,10 +129,10 @@ OpenBaseDir=Paràmetre php openbasedir
 YouAskToCreateDatabaseSoRootRequired=Heu marcat el quadre "Crea una base de dades". Per això, heu de proporcionar el login / contrasenya del superusuari (part inferior del formulari).
 YouAskToCreateDatabaseUserSoRootRequired=Heu marcat el quadre "Crea propietari de la base de dades". Per això, heu de proporcionar el login / contrasenya del superusuari (part inferior del formulari).
 NextStepMightLastALongTime=El següent pas pot trigar diversos minuts. Després d'haver validat, li agraïm esperi a la completa visualització de la pàgina següent per continuar.
-MigrationCustomerOrderShipping=Actualització de les dades de expedicions de comandes de clients
-MigrationShippingDelivery=Actualització de les dades de expedicions
-MigrationShippingDelivery2=Actualització de les dades expedicions 2
-MigrationFinished=Acabada l'actualització
+MigrationCustomerOrderShipping=Migració de dades d'enviament de comandes de venda
+MigrationShippingDelivery=Actualització de les dades d'enviaments
+MigrationShippingDelivery2=Actualització de les dades d'enviaments 2
+MigrationFinished=S'ha acabat la migració
 LastStepDesc=<strong> Darrer pas </strong>: definiu aquí l'inici de sessió i la contrasenya que voleu utilitzar per connectar-se a Dolibarr. <b> No perdis això, ja que és el compte mestre per administrar tots els altres / comptes d'usuari addicionals.</b>
 ActivateModule=Activació del mòdul %s
 ShowEditTechnicalParameters=Premi aquí per veure/editar els paràmetres tècnics (mode expert)
@@ -142,9 +142,9 @@ KeepDefaultValuesWamp=Heu utilitzat l'assistent de configuració Dolibarr de Dol
 KeepDefaultValuesDeb=Heu utilitzat l'assistent de configuració Dolibarr des d'un paquet Linux (Ubuntu, Debian, Fedora ...), de manera que els valors proposats aquí ja estan optimitzats. Només s'ha d'introduir la contrasenya del propietari de la base de dades per crear. Canvieu altres paràmetres només si saps el que estàs fent.
 KeepDefaultValuesMamp=Heu utilitzat l'assistent de configuració Dolibarr de DoliMamp, de manera que els valors proposats aquí ja estan optimitzats. Canvieu-los només si saps el que estàs fent.
 KeepDefaultValuesProxmox=Heu utilitzat l'assistent de configuració de Dolibarr des d'un dispositiu virtual Proxmox, de manera que els valors proposats aquí ja estan optimitzats. Canvieu-los només si saps el que estàs fent.
-UpgradeExternalModule=Executeu el procés d'actualització dedicat del mòdul extern
+UpgradeExternalModule=Execució del procés d'actualització dedicat de mòdul extern
 SetAtLeastOneOptionAsUrlParameter=Estableix com a mínim una opció com a paràmetre a l'URL. Per exemple: '... repair.php?standard=confirmed'
-NothingToDelete=Res per netejar / esborrar
+NothingToDelete=Res a netejar/esborrar
 NothingToDo=No hi ha res a fer
 #########
 # upgrade
@@ -167,15 +167,15 @@ MigrationContractsNumberToUpdate=%s contracte(s) a actualitzar
 MigrationContractsLineCreation=Crea una línia de contracte per referència del contracte %s
 MigrationContractsNothingToUpdate=No hi ha més contractes (vinculats a un producte) sense línies de detalls que hagin de corregir.
 MigrationContractsFieldDontExist=El camp fk_facture ja no existeix. Res a fer.
-MigrationContractsEmptyDatesUpdate=Actualització de les dades de contractes no indicades
+MigrationContractsEmptyDatesUpdate=Correcció de la data buida de contracte
 MigrationContractsEmptyDatesUpdateSuccess=La correcció de la data buida del contracte s'ha realitzat correctament
 MigrationContractsEmptyDatesNothingToUpdate=No hi ha data de contracte buida per corregir
 MigrationContractsEmptyCreationDatesNothingToUpdate=No hi ha data de creació del contracte per corregir
-MigrationContractsInvalidDatesUpdate=Actualització dades contracte incorrectes (per contractes amb detall en servei)
+MigrationContractsInvalidDatesUpdate=Correcció del valor incorrecte de la data de contracte
 MigrationContractsInvalidDateFix=Corregir contracte %s (data contracte=%s, Data posada en servei min=%s)
 MigrationContractsInvalidDatesNumber=%s contractes modificats
 MigrationContractsInvalidDatesNothingToUpdate=No hi ha més de contractes que hagin de corregir-se.
-MigrationContractsIncoherentCreationDateUpdate=Actualització de les dades de creació de contracte que tenen un valor incoherent
+MigrationContractsIncoherentCreationDateUpdate=Correcció del valor incorrecte de la data de creació del contracte
 MigrationContractsIncoherentCreationDateUpdateSuccess=S'ha fet correctament la correcció del valor incorrecte en la data de creació de contracte
 MigrationContractsIncoherentCreationDateNothingToUpdate=No hi ha més dades de contractes.
 MigrationReopeningContracts=Reobertura dels contractes que tenen almenys un servei actiu no tancat
@@ -187,13 +187,13 @@ MigrationBankTransfertsNothingToUpdate=Cap vincle desfasat
 MigrationShipmentOrderMatching=Actualitzar rebuts de lliurament
 MigrationDeliveryOrderMatching=Actualitzar rebuts d'entrega
 MigrationDeliveryDetail=Actualitzar recepcions
-MigrationStockDetail=Actualitzar valor en stock dels productes
+MigrationStockDetail=Actualitza el valor de l'estoc dels productes
 MigrationMenusDetail=Actualització de la taula de menús dinàmics
 MigrationDeliveryAddress=Actualització de les adreces d'enviament en les notes de lliurament
 MigrationProjectTaskActors=Migració de dades per a la taula llx_projet_task_actors
 MigrationProjectUserResp=Migració del camp fk_user_resp de llx_projet a llx_element_contact
 MigrationProjectTaskTime=Actualitza el temps dedicat en segons
-MigrationActioncommElement=Actualització de les dades de accions sobre elements
+MigrationActioncommElement=Actualització de dades d'accions
 MigrationPaymentMode=Migració de dades per tipus de pagament
 MigrationCategorieAssociation=Actualització de les categories
 MigrationEvents=Migració d'esdeveniments per afegir el propietari de l'esdeveniment a la taula d'assignacions
@@ -203,7 +203,7 @@ MigrationRemiseExceptEntity=Actualitza el valor del camp entity de llx_societe_r
 MigrationUserRightsEntity=Actualitza el valor del camp de l'entitat llx_user_rights
 MigrationUserGroupRightsEntity=Actualitza el valor del camp de l'entitat llx_usergroup_rights
 MigrationUserPhotoPath=Migració de rutes per les fotos dels usuaris
-MigrationFieldsSocialNetworks=Migració de camps de xarxes socials de usuaris (%s)
+MigrationFieldsSocialNetworks=Migració de camps de xarxes socials d'usuaris (%s)
 MigrationReloadModule=Recarrega el mòdul %s
 MigrationResetBlockedLog=Restablir el mòdul BlockedLog per l'algoritme v7
 ShowNotAvailableOptions=Mostra les opcions no disponibles
diff --git a/htdocs/langs/ca_ES/interventions.lang b/htdocs/langs/ca_ES/interventions.lang
index ec994e9dd8d..24cc1fd4acb 100644
--- a/htdocs/langs/ca_ES/interventions.lang
+++ b/htdocs/langs/ca_ES/interventions.lang
@@ -2,7 +2,7 @@
 Intervention=Intervenció
 Interventions=Intervencions
 InterventionCard=Fitxa intervenció
-NewIntervention=Nova intervenció
+NewIntervention=Intervenció nova
 AddIntervention=Crea intervenció
 ChangeIntoRepeatableIntervention=Canvia-ho a intervenció repetible
 ListOfInterventions=Llistat d'intervencions
@@ -18,14 +18,14 @@ DeleteInterventionLine=Eliminar línia d'intervenció
 ConfirmDeleteIntervention=Vols eliminar aquesta intervenció?
 ConfirmValidateIntervention=Vols validar aquesta intervenció amb nom <b>%s</b>?
 ConfirmModifyIntervention=Vols modificar aquesta intervenció?
-ConfirmDeleteInterventionLine=Vols eliminar aquesta línia d'intervenció?
+ConfirmDeleteInterventionLine=Esteu segur que voleu suprimir aquesta línia d'intervenció?
 ConfirmCloneIntervention=Estàs segur que vols clonar aquesta intervenció?
 NameAndSignatureOfInternalContact=Nom i signatura del participant:
 NameAndSignatureOfExternalContact=Nom i signatura del client:
 DocumentModelStandard=Document model estàndard per a intervencions
 InterventionCardsAndInterventionLines=Fitxes i línies d'intervenció
-InterventionClassifyBilled=Classificar "facturat"
-InterventionClassifyUnBilled=Classificar "no facturat"
+InterventionClassifyBilled=Classifica "Facturat"
+InterventionClassifyUnBilled=Classifica "No facturat"
 InterventionClassifyDone=Classifica com a "Fet"
 StatusInterInvoiced=Facturada
 SendInterventionRef=Presentar intervenció %s
diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang
index be984d41323..c0c06305804 100644
--- a/htdocs/langs/ca_ES/mails.lang
+++ b/htdocs/langs/ca_ES/mails.lang
@@ -14,7 +14,7 @@ MailTo=Destinatari(s)
 MailToUsers=A l'usuari(s)
 MailCC=Còpia a
 MailToCCUsers=Còpia l'usuari(s)
-MailCCC=Adjuntar còpia a
+MailCCC=Còpia oculta a
 MailTopic=Tema de correu electrònic
 MailText=Missatge
 MailFile=Fitxers adjunts
@@ -23,7 +23,7 @@ SubjectNotIn=No està subjecte
 BodyNotIn=No en el cos
 ShowEMailing=Mostrar E-Mailing
 ListOfEMailings=Llistat de E-Mailings
-NewMailing=Nou E-Mailing
+NewMailing=E-Mailing nou
 EditMailing=Editar E-Mailing
 ResetMailing=Nou enviament
 DeleteMailing=Elimina E-Mailing
@@ -57,7 +57,7 @@ NoRecipientEmail=No hi ha cap correu electrònic destinatari per a %s
 RemoveRecipient=Eliminar destinatari
 YouCanAddYourOwnPredefindedListHere=Per crear el seu mòdul de selecció e-mails, mireu htdocs /core/modules/mailings/README.
 EMailTestSubstitutionReplacedByGenericValues=En mode prova, les variables de substitució són substituïdes per valors genèrics
-MailingAddFile=Adjuntar aquest arxiu
+MailingAddFile=Adjunta aquest fitxer
 NoAttachedFiles=Sense fitxers adjunts
 BadEMail=Valor incorrecte per correu electrònic
 ConfirmCloneEMailing=Vols clonar aquest E-Mailing?
@@ -87,14 +87,15 @@ MailingModuleDescContactsWithThirdpartyFilter=Contacte amb filtres de client
 MailingModuleDescContactsByCompanyCategory=Contactes per categoria de tercers
 MailingModuleDescContactsByCategory=Contactes per categories
 MailingModuleDescContactsByFunction=Contactes per càrrec
-MailingModuleDescEmailsFromFile=Correus electrònics desde fitxer
+MailingModuleDescEmailsFromFile=Correus electrònics des de fitxer
 MailingModuleDescEmailsFromUser=Entrada de correus electrònics per usuari
 MailingModuleDescDolibarrUsers=Usuaris amb correus electrònics
 MailingModuleDescThirdPartiesByCategories=Tercers (per categories)
 SendingFromWebInterfaceIsNotAllowed=L'enviament des de la interfície web no està permès.
+EmailCollectorFilterDesc=Tots els filtres han de coincidir perquè es reculli un correu electrònic
 
 # Libelle des modules de liste de destinataires mailing
-LineInFile=Línea %s en archiu
+LineInFile=Línia %s al fitxer
 RecipientSelectionModules=Mòduls de selecció dels destinataris
 MailSelectedRecipients=Destinataris seleccionats
 MailingArea=Àrea E-Mailings
@@ -105,10 +106,10 @@ MailNoChangePossible=Destinataris d'un E-Mailing validat no modificables
 SearchAMailing=Cercar un E-Mailing
 SendMailing=Envia e-mailing
 SentBy=Enviat por
-MailingNeedCommand=L'enviament d'un emailing pot realitzar-se desde la línia de comandos. Solicita a l'administrador del servidor que executi el següent comando per enviar l'emailing a tots els destinataris:
+MailingNeedCommand=L’enviament de correus electrònics massius es pot realitzar des de la línia de comandes. Demaneu a l'administrador del servidor que iniciï la següent comanda per enviar els correus electrònics a tots els destinataris:
 MailingNeedCommand2=Podeu enviar en línia afegint el paràmetre MAILING_LIMIT_SENDBYWEB amb un valor nombre que indica el màxim nombre d'e-mails enviats per sessió. Per això aneu a Inici - Configuració - Varis
-ConfirmSendingEmailing=Si desitja enviar emailing directament desde aquesta pantalla, confirme que està segur de voler enviar l'emailing ara desde el seu navegador
-LimitSendingEmailing=Nota: L'enviament de e-mailings des de l'interfície web es realitza en tandes per raons de seguretat i "timeouts", s'enviaran a <b>%s</b> destinataris per tanda
+ConfirmSendingEmailing=Si voleu enviar correus electrònics directament des d'aquesta pantalla, confirmeu que esteu segur que voleu enviar correus electrònics ara des del vostre navegador?
+LimitSendingEmailing=Nota: L'enviament de missatges massius de correu electrònic des de la interfície web es realitza diverses vegades per motius de seguretat i temps d'espera, <b> %s </b> als destinataris de cada sessió d'enviament.
 TargetsReset=Buidar llista
 ToClearAllRecipientsClickHere=Per buidar la llista dels destinataris d'aquest E-Mailing, feu clic al botó
 ToAddRecipientsChooseHere=Per afegir destinataris, escolliu els que figuren en les llistes a continuació
@@ -125,22 +126,23 @@ TagMailtoEmail=Correu electrònic del destinatari (inclòs l'enllaç "mailto:" h
 NoEmailSentBadSenderOrRecipientEmail=No s'ha enviat el correu electrònic. Enviador del correu incorrecte. Verifica el perfil d'usuari.
 # Module Notifications
 Notifications=Notificacions
-NoNotificationsWillBeSent=Cap notificació per e-mail està prevista per a aquest esdeveniment i empresa
-ANotificationsWillBeSent=1 notificació serà enviada per e-mail
-SomeNotificationsWillBeSent=%s notificacions seran enviades per e-mail
-AddNewNotification=Activar una de notificació per correu electrònic
-ListOfActiveNotifications=Llista tots els destinataris actius per notificacions de correu electrònic
-ListOfNotificationsDone=Llista de notificacions d'e-mails enviades
+NotificationsAuto=Notificacions automàtiques.
+NoNotificationsWillBeSent=No hi ha previstes notificacions automàtiques per correu electrònic per a aquest tipus d'esdeveniment ni per a aquesta empresa
+ANotificationsWillBeSent=S'enviarà 1 notificació automàtica per correu electrònic
+SomeNotificationsWillBeSent=S'enviaran %s notificacions automàtiques per correu electrònic
+AddNewNotification=Subscriviu-vos a una nova notificació automàtica per correu electrònic (destinatari/esdeveniment)
+ListOfActiveNotifications=Llista totes les subscripcions actives (destinataris/esdeveniments) per a notificacions automàtiques per correu electrònic
+ListOfNotificationsDone=Llista totes les notificacions automàtiques enviades per correu electrònic
 MailSendSetupIs=La configuració d'enviament d'e-mail s'ha ajustat a '%s'. Aquest mètode no es pot utilitzar per enviar e-mails massius.
-MailSendSetupIs2=Abans tindrà que, amb un compte d'administrador, en el menú %sinici - Configuració - E-Mails%s, camviar el paràmetre <strong>'%s'</strong> per usar el mètode '%s'. Amb aquest metode pot configurar un servidor SMTP del seu proveïdor de serveis d'internet.
+MailSendSetupIs2=Primer heu d’anar, amb un compte d’administrador, al menú %sInici - Configuració - Correus electrònics%s per canviar el paràmetre <strong>'%s'</strong> per utilitzar el mode '%s'. Amb aquest mode, podeu introduir la configuració del servidor SMTP proporcionat pel vostre proveïdor de serveis d'Internet i utilitzar la funció de correu electrònic massiu.
 MailSendSetupIs3=Si te preguntes de com configurar el seu servidor SMTP, pot contactar amb %s.
 YouCanAlsoUseSupervisorKeyword=També pot afegir l'etiqueta <strong>__SUPERVISOREMAIL__</strong> per tenir un e-mail enviat pel supervisor a l'usuari (només funciona si un e-mail és definit per aquest supervisor)
-NbOfTargetedContacts=Número actual de contactes destinataris d'e-mails
+NbOfTargetedContacts=Nombre actual de correus electrònics de contactes destinataris
 UseFormatFileEmailToTarget=El fitxer importat ha de tenir el format <strong>email;nom;cognom;altre</strong>
 UseFormatInputEmailToTarget=Entra una cadena amb el format <strong>email;nom;cognom;altre</strong>
 MailAdvTargetRecipients=Destinataris (selecció avançada)
 AdvTgtTitle=Ompliu els camps d'entrada per seleccionar prèviament els tercers o contactes / adreces a destinació
-AdvTgtSearchTextHelp=Utilitzeu %% com comodins. Per exemple, per trobar tots els elements com <b> jean, joe, jim </b>, podeu ingressar <b> j%% </b>, també podeu utilitzar; com a separador de valor i ús! per excepte aquest valor. Per exemple, <b> jean; joe; jim%% ;; jimo ;; jima% </b> tindrà com a objectiu tot Jean, joe, comença amb Jim però no Jimo i no tot el que comença amb Jima
+AdvTgtSearchTextHelp=Utilitzeu %% com a comodins. Per exemple, per trobar tots els elements com <b> jean, joe, jim </b>, podeu introduir <b> j%% </b>, també podeu utilitzar ; com a separador de valor i utilitzar ! per excepcions d'aquest valor. Per exemple, <b> jean;joe;jim%%;!jimo;!jima%% </b> tindrà com a objectiu tots els jean, joe, començant per jim però no jimo ni tot el que comenci amb jima
 AdvTgtSearchIntHelp=Utilitza un interval per seleccionar un valor enter o decimal
 AdvTgtMinVal=Valor mínim
 AdvTgtMaxVal=Valor màxim
@@ -159,16 +161,17 @@ AdvTgtLoadFilter=Carrega filtre
 AdvTgtDeleteFilter=Elimina filtre
 AdvTgtSaveFilter=Desa filtre
 AdvTgtCreateFilter=Crea filtre
-AdvTgtOrCreateNewFilter=Nom de nou filtre
+AdvTgtOrCreateNewFilter=Nom del filtre nou
 NoContactWithCategoryFound=No s'han trobat contactes/adreces amb categoria
 NoContactLinkedToThirdpartieWithCategoryFound=No s'han trobat contactes/adreces amb categoria
-OutGoingEmailSetup=Configuració de correus electrònics sortints
-InGoingEmailSetup=Configuració de correus electrònics entrants
-OutGoingEmailSetupForEmailing=Configuració del correu sortint (per al mòdul %s)
-DefaultOutgoingEmailSetup=Configuració per defecte del correu electrònic sortint 
+OutGoingEmailSetup=Correus electrònics de sortida
+InGoingEmailSetup=Correus electrònics entrants
+OutGoingEmailSetupForEmailing=Correu electrònic de sortida (per al mòdul %s)
+DefaultOutgoingEmailSetup=La mateixa configuració que el correu electrònic de sortida global
 Information=Informació
 ContactsWithThirdpartyFilter=Contactes amb filtre de tercers
-Unanswered=Unanswered
+Unanswered=Sense resposta
 Answered=Respost
-IsNotAnAnswer=Is not answer (initial email)
-IsAnAnswer=Is an answer of an initial email
+IsNotAnAnswer=No és resposta (correu electrònic inicial)
+IsAnAnswer=És la resposta d’un correu electrònic inicial
+RecordCreatedByEmailCollector=Registre creat pel Receptor de correus electrònics %s des del correu electrònic %s
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index c970c1697f3..88880d9e53b 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No hi ha cap plantilla disponible per a aquest tipus de correu
 AvailableVariables=Variables de substitució disponibles
 NoTranslation=Sense traducció
 Translation=Traducció
+CurrentTimeZone=Fus horari PHP (Servidor)
 EmptySearchString=Introdueix criteris de cerca no buits
+EnterADateCriteria=Introduïu un criteri de data
 NoRecordFound=No s'han trobat registres
 NoRecordDeleted=Sense registres eliminats
 NotEnoughDataYet=Dades insuficients
@@ -52,7 +54,7 @@ ErrorFileNotUploaded=El fitxer no s'ha pogut transferir
 ErrorInternalErrorDetected=Error detectat
 ErrorWrongHostParameter=Paràmetre Servidor invàlid
 ErrorYourCountryIsNotDefined=El teu país no està definit. Ves a Inici-Configuració-Empresa-Edita i omple de nou el formulari
-ErrorRecordIsUsedByChild=Impossible de suprimir aquest registre. Es sent utilitzat com a pare per almenys un registre fill.
+ErrorRecordIsUsedByChild=No s'ha pogut suprimir aquest registre. Aquest registre l’utilitza almenys un registre fill.
 ErrorWrongValue=Valor incorrecte
 ErrorWrongValueForParameterX=Valor incorrecte del paràmetre %s
 ErrorNoRequestInError=Cap petició en error
@@ -75,7 +77,7 @@ ClickHere=Fes clic aquí
 Here=Aquí
 Apply=Aplicar
 BackgroundColorByDefault=Color de fons
-FileRenamed=L'arxiu s'ha renombrat correctament
+FileRenamed=El fitxer s’ha reanomenat correctament
 FileGenerated=L'arxiu ha estat generat correctament
 FileSaved=El fitxer s'ha desat correctament
 FileUploaded=L'arxiu s'ha carregat correctament
@@ -85,6 +87,8 @@ FileWasNotUploaded=Un arxiu ha estat seleccionat per adjuntar, però encara no h
 NbOfEntries=Nº d'entrades
 GoToWikiHelpPage=Llegiu l'ajuda en línia (cal tenir accés a Internet)
 GoToHelpPage=Consultar l'ajuda
+DedicatedPageAvailable=Hi ha una pàgina d’ajuda dedicada relacionada amb la pantalla actual
+HomePage=Pàgina d'inici
 RecordSaved=Registre guardat
 RecordDeleted=Registre eliminat
 RecordGenerated=Registre generat
@@ -149,11 +153,11 @@ Enable=Activar
 Deprecated=Obsolet
 Disable=Desactivar
 Disabled=Desactivat
-Add=Afegir
+Add=Afegeix
 AddLink=Enllaçar
 RemoveLink=Elimina enllaç
 AddToDraft=Afegeix a esborrany
-Update=Modificar
+Update=Actualitza
 Close=Tancar
 CloseAs=Indica l'estat 
 CloseBox=Elimina el panell de la taula de control
@@ -163,10 +167,10 @@ Delete=Elimina
 Remove=Retirar
 Resiliate=Dona de baixa
 Cancel=Cancel·la
-Modify=Modificar
+Modify=Modifica
 Edit=Editar
-Validate=Validar
-ValidateAndApprove=Validar i aprovar
+Validate=Valida
+ValidateAndApprove=Valida i aprova
 ToValidate=A validar
 NotValidated=No validat
 Save=Desa
@@ -174,10 +178,10 @@ SaveAs=Desa com
 SaveAndStay=Desa i continua
 SaveAndNew=Desa i nou
 TestConnection=Provar la connexió
-ToClone=Copiar
+ToClone=Clona
 ConfirmCloneAsk=Esteu segur que voleu clonar l'objecte <b> %s </b>?
 ConfirmClone=Trieu les dades que voleu clonar:
-NoCloneOptionsSpecified=no hi ha dades definits per copiar
+NoCloneOptionsSpecified=No s'ha definit cap dada per a clonar.
 Of=de
 Go=Anar
 Run=llançar
@@ -329,7 +333,7 @@ HourShort=H
 MinuteShort=Minut
 Rate=Tipus
 CurrencyRate=Tarifa de conversió de moneda
-UseLocalTax=Incloure taxes
+UseLocalTax=Inclou impostos
 Bytes=Bytes
 KiloBytes=Kilobytes
 MegaBytes=Megabytes
@@ -343,7 +347,7 @@ Mb=Mb
 Gb=Gb
 Tb=Tb
 Cut=Tallar
-Copy=Copiar
+Copy=Copia
 Paste=Pegar
 Default=Defecte
 DefaultValue=Valor per defecte
@@ -433,6 +437,7 @@ RemainToPay=Queda per pagar
 Module=Mòdul/Aplicació
 Modules=Mòduls/Aplicacions
 Option=Opció
+Filters=Filtres
 List=Llistat
 FullList=Llista completa
 FullConversation=Conversa completa
@@ -484,7 +489,7 @@ TotalDuration=Duració total
 Summary=Resum
 DolibarrStateBoard=Estadístiques de base de dades
 DolibarrWorkBoard=Elements oberts
-NoOpenedElementToProcess=No hi ha elements oberts per processar
+NoOpenedElementToProcess=No hi ha elements oberts per a processar
 Available=Disponible
 NotYetAvailable=Encara no disponible
 NotAvailable=No disponible
@@ -501,7 +506,7 @@ and=i
 or=o
 Other=Altres
 Others=Altres
-OtherInformations=Altra informació
+OtherInformations=Una altra informació
 Quantity=Quantitat
 Qty=Qt.
 ChangedBy=Modificat per
@@ -525,7 +530,7 @@ New=Nou
 Discount=Descompte
 Unknown=Desconegut
 General=General
-Size=Tamany
+Size=Mida
 OriginalSize=Mida original
 Received=Rebut
 Paid=Pagat
@@ -546,7 +551,7 @@ LateDesc=L'element es defineix com Retardat segons la configuració del sistema
 NoItemLate=No hi ha cap element tardà
 Photo=Foto
 Photos=Fotos
-AddPhoto=Afegir foto
+AddPhoto=Afegeix una imatge
 DeletePicture=Elimina la imatge
 ConfirmDeletePicture=Confirmes l'eliminació de la imatge?
 Login=Login
@@ -716,7 +721,7 @@ MenuAWStats=AWStats
 MenuMembers=Socis
 MenuAgendaGoogle=Agenda Google
 MenuTaxesAndSpecialExpenses=Impostos | Despeses especials
-ThisLimitIsDefinedInSetup=Límit Dolibarr (Menú inici-configuració-seguretat): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetup=Límit Dolibarr (Menú inici-configuració-seguretat): %s Kb, límit PHP: %s Kb
 NoFileFound=No hi ha documents guardats en aquesta carpeta
 CurrentUserLanguage=Idioma actual
 CurrentTheme=Tema actual
@@ -737,7 +742,7 @@ Informations=Informació
 Page=Pàgina
 Notes=Notes
 AddNewLine=Afegeix una línia nova
-AddFile=Afegir arxiu
+AddFile=Afegeix un fitxer
 FreeZone=Producte de text lliure
 FreeLineOfType=Element de text lliure, escriviu:
 CloneMainAttributes=Clonar l'objecte amb aquests atributs principals
@@ -749,7 +754,7 @@ PrintContentArea=Mostrar pàgina d'impressió de la zona central
 MenuManager=Gestor de menú
 WarningYouAreInMaintenanceMode=Advertència, esteu en mode de manteniment: només podeu iniciar sessió <b> %s </b> per utilitzar l'aplicació en aquest mode.
 CoreErrorTitle=Error del sistema
-CoreErrorMessage=Ho sentim, hi ha un error. Contacti amb el seu administrador del sistema per a comprovar els "logs" o des-habilita $dolibarr_main_prod=1 per a obtenir més informació.
+CoreErrorMessage=Ho sentim, s'ha produït un error. Poseu-vos en contacte amb l'administrador del sistema per a comprovar els registres o desactiva $dolibarr_main_prod=1 per a obtenir més informació.
 CreditCard=Targeta de crèdit
 ValidatePayment=Validar aquest pagament
 CreditOrDebitCard=Tarja de crèdit o dèbit
@@ -822,8 +827,8 @@ toward=cap a
 Access=Accés
 SelectAction=Selecciona acció
 SelectTargetUser=Selecciona l'usuari/empleat de destí
-HelpCopyToClipboard=Utilitzeu Ctrl+C per copiar al portapapers
-SaveUploadedFileWithMask=Desa el fitxer al servidor amb el nom "<strong>%s</strong>" (del contrari "%s")
+HelpCopyToClipboard=Utilitzeu Ctrl+C per a copiar al porta-retalls
+SaveUploadedFileWithMask=Desa el fitxer al servidor amb el nom "<strong> %s </strong>" (en cas contrari "%s")
 OriginFileName=Nom original de l'arxiu
 SetDemandReason=Indica l'origen
 SetBankAccount=Definir el compte bancari
@@ -858,7 +863,7 @@ ConfirmDeleteObject=Esteu segur que voleu suprimir aquest objecte?
 DeleteLine=Elimina la línia
 ConfirmDeleteLine=Esteu segur que voleu suprimir aquesta línia?
 ErrorPDFTkOutputFileNotFound=Error: el fitxer no s'ha generat. Comproveu que la comanda "pdftk" estigui instal·lada en un directori inclòs a la variable d'entorn $ PATH (només linux / unix) o poseu-vos en contacte amb l'administrador del vostre sistema.
-NoPDFAvailableForDocGenAmongChecked=No hi havia PDF disponibles per a la generació de document entre els registre comprovats
+NoPDFAvailableForDocGenAmongChecked=No hi havia PDF disponible per a la generació de document amb el registre comprovat
 TooManyRecordForMassAction=S'ha seleccionat massa registres per a l'acció massiva. L'acció està restringida a una llista de %s registres.
 NoRecordSelected=No s'han seleccionat registres
 MassFilesArea=Àrea de fitxers generats per accions massives
@@ -866,8 +871,8 @@ ShowTempMassFilesArea=Mostra l'àrea de fitxers generats per accions massives
 ConfirmMassDeletion=Confirmació d'esborrament massiu
 ConfirmMassDeletionQuestion=Esteu segur que voleu suprimir els (s) registre (s) %s?
 RelatedObjects=Objectes relacionats
-ClassifyBilled=Classificar facturat
-ClassifyUnbilled=Classificar no facturat
+ClassifyBilled=Classifica facturat
+ClassifyUnbilled=Classifica no facturat
 Progress=Progrés
 ProgressShort=Progr.
 FrontOffice=Front office
@@ -1093,7 +1098,7 @@ AmountMustBePositive=L'import ha de ser positiu
 ByStatus=Per estat
 InformationMessage=Informació
 Used=Usat
-ASAP=El més aviat possible
+ASAP=Tan aviat com sigui possible
 CREATEInDolibarr=Registre %s creat
 MODIFYInDolibarr=Registre %s modificat
 DELETEInDolibarr=Registre %s eliminat
@@ -1107,3 +1112,8 @@ UpToDate=Actualitzat
 OutOfDate=Obsolet
 EventReminder=Recordatori d'esdeveniments
 UpdateForAllLines=Actualització per a totes les línies
+OnHold=Fora de servei
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/ca_ES/modulebuilder.lang b/htdocs/langs/ca_ES/modulebuilder.lang
index 59936812c4a..089377fa6bf 100644
--- a/htdocs/langs/ca_ES/modulebuilder.lang
+++ b/htdocs/langs/ca_ES/modulebuilder.lang
@@ -5,18 +5,18 @@ EnterNameOfObjectDesc=Introduïu el nom de l'objecte que voleu crear sense espai
 ModuleBuilderDesc2=Camí on es generen / editen els mòduls (primer directori per als mòduls externs definits en %s): <strong> %s </strong>
 ModuleBuilderDesc3=S'han trobat mòduls generats/editables: <strong>%s</strong>
 ModuleBuilderDesc4=Es detecta un mòdul com "editable" quan el fitxer <strong>%s</strong> existeix al directori arrel del mòdul
-NewModule=Nou mòdul
-NewObjectInModulebuilder=Nou objecte
+NewModule=Mòdul nou
+NewObjectInModulebuilder=Objecte nou
 ModuleKey=Clau del mòdul
 ObjectKey=Clau de l'objecte
 ModuleInitialized=Mòdul inicialitzat
-FilesForObjectInitialized=S'han inicialitzat els fitxers per al nou objecte '%s'
+FilesForObjectInitialized=S'han inicialitzat els fitxers per al objecte nou '%s'
 FilesForObjectUpdated=Fitxers de l'objecte '%s' actualitzat (fitxers .sql i fitxer .class.php)
 ModuleBuilderDescdescription=Introduïu aquí tota la informació general que descrigui el vostre mòdul.
 ModuleBuilderDescspecifications=Podeu introduir aquí una descripció detallada de les especificacions del mòdul que encara no està estructurada en altres pestanyes. Així que teniu a la vostra disposició totes les normes que es desenvolupin. També aquest contingut de text s'inclourà a la documentació generada (veure l'última pestanya). Podeu utilitzar el format de Markdown, però es recomana utilitzar el format Asciidoc (comparació entre .md i .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
 ModuleBuilderDescobjects=Definiu aquí els objectes que voleu gestionar amb el mòdul. Es crearà una classe CRUD DAO, fitxers SQL, una pàgina per llistar el registre d'objectes, per crear/editar/veure un registre i es generarà una API.
 ModuleBuilderDescmenus=Aquesta pestanya està dedicada a definir les entrades de menú proporcionades pel teu mòdul.
-ModuleBuilderDescpermissions=Aquesta pestanya està dedicada a definir els nous permisos que vols proporcionar amb el teu mòdul.
+ModuleBuilderDescpermissions=Aquesta pestanya està dedicada a definir els permisos nous que voleu proporcionar amb el vostre mòdul.
 ModuleBuilderDesctriggers=Aquesta és la vista dels disparadors proporcionats pel teu mòdul. Per incloure el codi executat quan es posa en marxa un esdeveniment de negoci desencadenat, edita aquest fitxer.
 ModuleBuilderDeschooks=Aquesta pestanya està dedicada als ganxos (hooks)
 ModuleBuilderDescwidgets=Aquesta pestanya està dedicada per crear/gestionar ginys
@@ -40,6 +40,7 @@ PageForCreateEditView=Pàgina PHP per crear/editar/veure un registre
 PageForAgendaTab=Pàgina de PHP per a la pestanya d'esdeveniments
 PageForDocumentTab=Pàgina de PHP per a la pestanya de documents
 PageForNoteTab=Pàgina de PHP per a la pestanya de notes
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Ruta al zip del paquet del mòdul/aplicació
 PathToModuleDocumentation=Camí al fitxer de la documentació del mòdul / aplicació (%s)
 SpaceOrSpecialCharAreNotAllowed=Els espais o caràcters especials no estan permesos.
@@ -82,11 +83,11 @@ ListOfMenusEntries=Llista d'entrades de menú
 ListOfDictionariesEntries=Llista d'entrades de diccionaris
 ListOfPermissionsDefined=Llista de permisos definits
 SeeExamples=Mira exemples aquí
-EnabledDesc=Condició per tenir activat aquest camp (Exemples: 1 ó $conf->global->MYMODULE_MYOPTION)
+EnabledDesc=Condició per a tenir aquest camp actiu (Exemples: 1 ó $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=És visible el camp ? (Exemples: 0=Mai visible, 1=Visible als llistats i als formularis crear/modificar/veure, 2=Visible només als llistats, 3=Visible només als formularis crear/modificar/veure (no als llistats), 4=Visible als llistats i només als formularis modificar/veure (no al de crear), 5=Visible als llistats i només al formulari de veure (però no als formularis de crear i modificar).<br><br>Utilitzant un valor negatiu implicarà que el camp no es mostrarà per defecte als llistats però podrà ser escollit per veure's).<br><br>pot ser una expressió, per exemple:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
 DisplayOnPdfDesc=Mostra aquest camp en documents PDF compatibles. Podeu gestionar la posició amb el camp "Posició". <br/> Actualment, els models PDF compatibles coneguts són: eratosthene (comanda), espadon (enviament), sponge (factures), cyan (propal / pressupost), cornas (comanda del proveïdor) <br/> <br/><strong>Per al document :</strong><br/>0 = no es mostra<br/> 1 = mostra <br/> 2 = només si no està buit <br/> <br/> <strong> Per a les línies de documents: </strong> <br/> 0 = no es veuen les <br/> 1 = mostra en una columna <br/> = 3 = mostra a la columna de descripció de línia després de la descripció <br/> 4 = mostra a la columna de descripció després de la descripció només si no està buida
 DisplayOnPdf=Visualització en PDF
-IsAMeasureDesc=Es pot acumular el valor del camp per obtenir un total en la llista? (Exemples: 1 o 0)
+IsAMeasureDesc=Es pot acumular el valor del camp per a obtenir un total a la llista? (Exemples: 1 o 0)
 SearchAllDesc=El camp utilitzat per realitzar una cerca des de l'eina de cerca ràpida? (Exemples: 1 o 0)
 SpecDefDesc=Introduïu aquí tota la documentació que voleu proporcionar amb el vostre mòdul que encara no està definit per altres pestanyes. Podeu utilitzar .md o millor, la sintaxi enriquida .asciidoc.
 LanguageDefDesc=Introduïu a aquests fitxers, totes les claus i les traduccions per a cada fitxer d'idioma.
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Utilitzeu editor específic URL
 UseSpecificFamily = Utilitzeu una família específica
 UseSpecificAuthor = Utilitzeu un autor específic
 UseSpecificVersion = Utilitzeu una versió inicial específica
-ModuleMustBeEnabled=El mòdul / aplicació s'ha d’habilitar primer
 IncludeRefGeneration=La referència de l’objecte s’ha de generar automàticament
 IncludeRefGenerationHelp=Marca-ho si vols incloure codi per gestionar la generació automàtica de la referència
 IncludeDocGeneration=Vull generar alguns documents des de l'objecte
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Tipus de camps: <br> varchar(99), double (24,8), real, text, ht
 AsciiToHtmlConverter=Convertidor Ascii a HTML
 AsciiToPdfConverter=Convertidor Ascii a PDF
 TableNotEmptyDropCanceled=La taula no està buida. S'ha cancel·lat l'eliminació.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/ca_ES/mrp.lang b/htdocs/langs/ca_ES/mrp.lang
index 32ad23c0c3a..29171a2eef4 100644
--- a/htdocs/langs/ca_ES/mrp.lang
+++ b/htdocs/langs/ca_ES/mrp.lang
@@ -37,7 +37,7 @@ NewMO=Ordre de fabricació nova
 QtyToProduce=Quantitat per produir
 DateStartPlannedMo=Data d’inici prevista
 DateEndPlannedMo=Data prevista de finalització
-KeepEmptyForAsap=Buit significa &quot;el més aviat possible&quot;
+KeepEmptyForAsap=Buit significa "Tan aviat com sigui possible"
 EstimatedDuration=Durada estimada
 EstimatedDurationDesc=Durada estimada per fabricar aquest producte mitjançant aquesta llista de material
 ConfirmValidateBom=Segur que voleu validar la llista de material amb la referència <strong>%s</strong> (podreu utilitzar-lo per crear noves Ordres de Fabricació)
diff --git a/htdocs/langs/ca_ES/oauth.lang b/htdocs/langs/ca_ES/oauth.lang
index 62daa92dadc..ef6edf0d30a 100644
--- a/htdocs/langs/ca_ES/oauth.lang
+++ b/htdocs/langs/ca_ES/oauth.lang
@@ -7,13 +7,13 @@ IsTokenGenerated=S'ha generat el token?
 NoAccessToken=No es pot accedir al token desat en la base de dades local
 HasAccessToken=S'ha generat un token i s'ha desat en la base de dades local
 NewTokenStored=Token rebut i desat
-ToCheckDeleteTokenOnProvider=Fes clic aqui per comprovar/eliminar l'autorització desada pel proveïdor OAuth %s
+ToCheckDeleteTokenOnProvider=Feu clic aquí per comprovar/eliminar l'autorització desada pel proveïdor OAuth %s
 TokenDeleted=Token eliminat
 RequestAccess=Clica aquí per demanar/renovar l'accés i rebre un nou token per desar
-DeleteAccess=Faci clic aquí per eliminar token
+DeleteAccess=Feu clic aquí per a suprimir el testimoni
 UseTheFollowingUrlAsRedirectURI=Utilitzeu l'URL següent com a URI de redirecció quan creeu les vostres credencials amb el vostre proveïdor de OAuth:
 ListOfSupportedOauthProviders=Introduïu les credencials proporcionades pel vostre proveïdor OAuth2. Només es mostren aquí els proveïdors compatibles OAuth2. Aquests serveis poden ser utilitzats per altres mòduls que necessiten autenticació OAuth2.
-OAuthSetupForLogin=Pàgina per generar un token OAuth
+OAuthSetupForLogin=Pàgina per a generar un token OAuth
 SeePreviousTab=Veure la pestanya anterior
 OAuthIDSecret=OAuth ID i Secret
 TOKEN_REFRESH=Refresc present de token
@@ -27,6 +27,6 @@ OAUTH_GOOGLE_DESC=Aneu a <a class="notasortlink" href="https://console.developer
 OAUTH_GITHUB_NAME=Servei OAuth GitHub
 OAUTH_GITHUB_ID=OAuth GitHub Id
 OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_GITHUB_DESC=Aneu a <a class="notasortlink" href="https://github.com/settings/developers" target="_blank"> a aquesta pàgina </a> i després "Registra una nova aplicació" per crear credencials d'OAuth.
+OAUTH_GITHUB_DESC=Aneu a<a class="notasortlink" href="https://github.com/settings/developers" target="_blank">aquesta pàgina</a> i després a "Registra una aplicació nova" per a crear les credencials d'OAuth
 OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/ca_ES/opensurvey.lang b/htdocs/langs/ca_ES/opensurvey.lang
index a2a57bd1d8f..a4d79dfc95d 100644
--- a/htdocs/langs/ca_ES/opensurvey.lang
+++ b/htdocs/langs/ca_ES/opensurvey.lang
@@ -5,12 +5,12 @@ OrganizeYourMeetingEasily=Organitza fàcilment les teves reunions i enquestes. P
 NewSurvey=Enquesta nova
 OpenSurveyArea=Àrea enquestes
 AddACommentForPoll=Pot afegir un comentari a  l'enquesta...
-AddComment=Afegir comentari
+AddComment=Afegeix un comentari
 CreatePoll=Crear enquesta
 PollTitle=Títol de l'enquesta
 ToReceiveEMailForEachVote=Rebre un correu electrònic per cada vot
 TypeDate=Tipus de data
-TypeClassic=Tipus estándar
+TypeClassic=Tipus estàndard
 OpenSurveyStep2=Selecciona les dates entre els dies lliures (gris). Els dies seleccionats són verds. Pots anul·lar la selecció d'un dia prèviament seleccionat fent clic de nou en ell
 RemoveAllDays=Eliminar tots els dies
 CopyHoursOfFirstDay=Copia hores del primer dia
@@ -30,11 +30,11 @@ CreateSurveyStandard=Crear una enquesta estàndard
 CheckBox=Casella de selecció simple
 YesNoList=Llista (buit/sí/no)
 PourContreList=Llista (buit/a favor/en contra)
-AddNewColumn=Afegir nova columna
+AddNewColumn=Afegeix una columna nova
 TitleChoice=Títol de l'opció
 ExportSpreadsheet=Exportar resultats a un full de càlcul
 ExpireDate=Data límit
-NbOfSurveys=Número d'enquestes
+NbOfSurveys=Nombre d'enquestes
 NbOfVoters=Nº de votants
 SurveyResults=Resultats
 PollAdminDesc=Està autoritzat per canviar totes les línies de l'enquesta amb el botó "Editar". Pot, també, eliminar una columna o una línia amb %s. També podeu afegir una nova columna amb %s.
@@ -42,9 +42,9 @@ PollAdminDesc=Està autoritzat per canviar totes les línies de l'enquesta amb e
 Against=En contra
 YouAreInivitedToVote=Està convidat a votar en aquesta enquesta
 VoteNameAlreadyExists=Aquest nom ja havia estat usat per a aquesta enquesta
-AddADate=Afegir una data
-AddStartHour=Afegir hora d'inici
-AddEndHour=Afegir hora de fi
+AddADate=Afegeix una data
+AddStartHour=Afegeix l’hora d’inici
+AddEndHour=Afegeix l'hora final
 votes=vot(s)
 NoCommentYet=Cap comentari ha estat publicat per a aquesta enquesta
 CanComment=Els votants poden comentar a l'enquesta
diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang
index ff1877a88a0..7e4434c3a27 100644
--- a/htdocs/langs/ca_ES/orders.lang
+++ b/htdocs/langs/ca_ES/orders.lang
@@ -10,8 +10,8 @@ OrderLine=Línia de comanda
 OrderDate=Data comanda
 OrderDateShort=Data comanda
 OrderToProcess=Comanda a processar
-NewOrder=Nova comanda
-NewOrderSupplier=Nova comanda de compra
+NewOrder=Comanda nova
+NewOrderSupplier=Comanda de compra nova
 ToOrder=Realitzar comanda
 MakeOrder=Realitzar comanda
 SupplierOrder=Comanda de compra
@@ -24,7 +24,7 @@ CustomersOrdersAndOrdersLines=Ordres de venda i detalls de la comanda
 OrdersDeliveredToBill=Comandes de venda lliurats a la factura
 OrdersToBill=Ordres de venda lliurades
 OrdersInProcess=Ordres de venda en procés
-OrdersToProcess=Ordres de venda per processar
+OrdersToProcess=Comandes de venda a processar
 SuppliersOrdersToProcess=Comandes de compra a processar
 SuppliersOrdersAwaitingReception=Comandes de compra en espera de recepció
 AwaitingReception=Esperant recepció
@@ -97,7 +97,7 @@ ConfirmUnvalidateOrder=Vols restaurar la comanda <b>%s</b> a l'estat esborrany?
 ConfirmCancelOrder=Vols anul·lar aquesta comanda?
 ConfirmMakeOrder=Vols confirmar la creació d'aquesta comanda a data de <b>%s</b>?
 GenerateBill=Facturar
-ClassifyShipped=Classificar enviat
+ClassifyShipped=Classifica enviada
 DraftOrders=Esborranys de comandes
 DraftSuppliersOrders=Esborrany de comandes de compra
 OnProcessOrders=Comandes en procés
@@ -107,7 +107,7 @@ RefOrderSupplier=Ref. comanda pel proveïdor
 RefOrderSupplierShort=Ref. comanda proveïdor
 SendOrderByMail=Envia comanda per e-mail
 ActionsOnOrder=Esdeveniments sobre la comanda
-NoArticleOfTypeProduct=No hi ha articles de tipus 'producte' i per tant enviables en aquesta comanda
+NoArticleOfTypeProduct=No hi ha cap article del tipus "producte", de manera que no es pot enviar cap article per a aquesta comanda
 OrderMode=Mètode de comanda
 AuthorRequest=Autor/Sol·licitant
 UserWithApproveOrderGrant=Usuaris habilitats per aprovar les comandes
@@ -148,14 +148,14 @@ PDFProformaDescription=Una plantilla completa de factura Proforma
 CreateInvoiceForThisCustomer=Facturar comandes
 CreateInvoiceForThisSupplier=Facturar comandes
 NoOrdersToInvoice=Sense comandes facturables
-CloseProcessedOrdersAutomatically=Classificar automàticament com "Processades" les comandes seleccionades.
+CloseProcessedOrdersAutomatically=Classifica com a "Processades" totes les comandes seleccionades.
 OrderCreation=Creació comanda
 Ordered=Comandat
 OrderCreated=Les vostres comandes s'han creat
 OrderFail=S'ha produït un error durant la creació de les seves comandes
 CreateOrders=Crear comandes
 ToBillSeveralOrderSelectCustomer=Per crear una factura per nombroses comandes, faci primer clic sobre el client i després esculli "%s".
-OptionToSetOrderBilledNotEnabled=Està desactivada l'opció del mòdul Workflow per canviar automàticament l'estat de la comanda com a "Facturada" quan la factura es valida, així que haurà d'establir manualment l'estat de la comanda com a "Facturada".
+OptionToSetOrderBilledNotEnabled=L'opció del mòdul Flux de treball, per establir la comanda com a "Facturada" automàticament quan es valida la factura, no està habilitada, de manera que haureu d'establir l'estat de les comandes a "Facturada" manualment després de generar la factura.
 IfValidateInvoiceIsNoOrderStayUnbilled=Si la validació de la factura és "No", l'ordre romandrà a l'estat "No facturat" fins que es validi la factura.
 CloseReceivedSupplierOrdersAutomatically=Tanqueu l'ordre d'estat "%s" automàticament si es reben tots els productes.
 SetShippingMode=Indica el tipus d'enviament
diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang
index acae89147c1..a5e732c9647 100644
--- a/htdocs/langs/ca_ES/other.lang
+++ b/htdocs/langs/ca_ES/other.lang
@@ -23,7 +23,7 @@ MessageForm=Missatge al formulari de pagament en línia
 MessageOK=Missatge a la pàgina de devolució d'un pagament validat
 MessageKO=Missatge a la pàgina de devolució d'un pagament cancel·lat
 ContentOfDirectoryIsNotEmpty=El contingut d'aquest directori no és buit.
-DeleteAlsoContentRecursively=Marqueu per eliminar tot el contingut recursivament
+DeleteAlsoContentRecursively=Marqueu per a suprimir tot el contingut recursivament
 PoweredBy=Impulsat per
 YearOfInvoice=Any de la data de factura
 PreviousYearOfInvoice=Any anterior de la data de la factura
@@ -81,8 +81,8 @@ Notify_HOLIDAY_APPROVE=Deixa la sol · licitud aprovada
 SeeModuleSetup=Vegi la configuració del mòdul %s
 NbOfAttachedFiles=Número arxius/documents adjunts
 TotalSizeOfAttachedFiles=Mida total dels arxius/documents adjunts
-MaxSize=Tamany màxim
-AttachANewFile=Adjuntar nou arxiu/document
+MaxSize=Mida màxima
+AttachANewFile=Adjunta un fitxer/document nou
 LinkedObject=Objecte adjuntat
 NbOfActiveNotifications=Nombre de notificacions (número de correus electrònics del destinatari)
 PredefinedMailTest=__(Hola)__\nAquest és un missatge de prova enviat a __EMAIL__.\nLes línies estan separades per una tornada de carro.\n\n__USER_SIGNATURE__
@@ -100,7 +100,7 @@ PredefinedMailContentSendFichInter=__(Hola)__\n\nTrobeu la intervenció __REF__
 PredefinedMailContentLink=Podeu fer clic a l'enllaç següent per fer el pagament si encara no està fet.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendActionComm=Recordatori d'esdeveniments "__EVENT_LABEL__" el dia __EVENT_DATE__ a les __EVENT_TIME__ <br> <br> Aquest és un missatge automàtic, no respongueu.
-DemoDesc=Dolibarr és un ERP/CRM per a la gestió de negocis (professionals o associacions), compost de mòduls funcionals independents i opcionals. Una demostració que incloga tots aquests mòduls no té sentit perquè no utilitzarà tots els mòduls al mateix temps. Per això, hi han disponibles diferents tipus de perfils de demostració.
+DemoDesc=Dolibarr és un ERP/CRM compacte que admet diversos mòduls empresarials. Una demostració que mostri tots els mòduls no té cap sentit, ja que aquest escenari no es produeix mai (diversos centenars disponibles). Per tant, hi ha disponibles diversos perfils de demostració.
 ChooseYourDemoProfil=Selecciona el perfil de demo que cobreixi millor les teves necessitats...
 ChooseYourDemoProfilMore=o construeix el teu perfil<br>(selecció de mòduls manual)
 DemoFundation=Gestió de socis d'una entitat
@@ -136,7 +136,7 @@ Bottom=Inferior
 Left=Esquerra
 Right=Dreta
 CalculatedWeight=Pes calculat
-CalculatedVolume=Volume calculat
+CalculatedVolume=Volum calculat
 Weight=Pes
 WeightUnitton=tona
 WeightUnitkg=kg
@@ -177,23 +177,23 @@ BugTracker=Incidències
 SendNewPasswordDesc=Aquest formulari et permet sol·licitar una nova contrasenya. S'enviarà a la teva adreça de correu electrònic. <br> El canvi es farà efectiu una vegada facis clic a l'enllaç de confirmació del correu electrònic. <br> Comprova la teva safata d'entrada.
 BackToLoginPage=Tornar a la pàgina de connexió
 AuthenticationDoesNotAllowSendNewPassword=El mode d'autenticació de Dolibarr està configurat com "<b>%s</b>".<br>En aquest mode Dolibarr no pot conèixer ni modificar la seva contrasenya<br>Contacti amb l'administrador per conèixer les modalitats de canvi.
-EnableGDLibraryDesc=Instala o habilita la llibreria GD en la teva instal·lació PHP per poder utilitzar aquesta opció.
+EnableGDLibraryDesc=Instal·leu o activeu la biblioteca GD a la instal·lació de PHP per a utilitzar aquesta opció.
 ProfIdShortDesc=<b>Prof Id %s </b> és una informació que depèn del país del tercer. <br>Per exemple, per al país <b>%s</b>, és el codi <b>%s</b>.
 DolibarrDemo=Demo de Dolibarr ERP/CRM
 StatsByNumberOfUnits=Estadístiques de suma quantitat de productes/serveis
 StatsByNumberOfEntities=Estadístiques en nombre d'entitats referents (número de factura o ordre ...)
-NumberOfProposals=Número de pressupostos
+NumberOfProposals=Nombre de pressupostos
 NumberOfCustomerOrders=Nombre de comandes de venda
-NumberOfCustomerInvoices=Número de factures de client
-NumberOfSupplierProposals=Nombre de propostes de venedor
+NumberOfCustomerInvoices=Nombre de factures de client
+NumberOfSupplierProposals=Nombre de pressupostos de proveïdor
 NumberOfSupplierOrders=Nombre de comandes de compra
 NumberOfSupplierInvoices=Nombre de factures de venedor
 NumberOfContracts=Nombre de contractes
 NumberOfMos=Nombre d'ordres de fabricació
-NumberOfUnitsProposals=Número d'unitats en pressupostos
+NumberOfUnitsProposals=Nombre d'unitats en pressupostos
 NumberOfUnitsCustomerOrders=Nombre d'unitats per comandes de venda
-NumberOfUnitsCustomerInvoices=Número d'unitats en factures de client
-NumberOfUnitsSupplierProposals=Nombre d'unitats en propostes de venedor
+NumberOfUnitsCustomerInvoices=Nombre d'unitats en factures de client
+NumberOfUnitsSupplierProposals=Nombre d'unitats en pressupostos de proveïdor
 NumberOfUnitsSupplierOrders=Nombre d'unitats en comandes de compra
 NumberOfUnitsSupplierInvoices=Nombre d'unitats a les factures del venedor
 NumberOfUnitsContracts=Nombre d’unitats en contractes
@@ -218,9 +218,9 @@ EMailTextHolidayApproved=S'ha aprovat la sol licitud %s.
 ImportedWithSet=Lot d'importació (import key)
 DolibarrNotification=Notificació automàtica
 ResizeDesc=Introduïu l'ample <b>O</b> la nova alçada. La relació es conserva en canviar la mida...
-NewLength=Nou ample
-NewHeight=Nova alçada
-NewSizeAfterCropping=Noves dimensions després de retallar
+NewLength=Amplada nova
+NewHeight=Alçada nova
+NewSizeAfterCropping=Mida nova després de retallar
 DefineNewAreaToPick=Indiqueu la zona d'imatge a conservar (Clic sobre la imatge i arrossegueu fins a la cantonada oposada)
 CurrentInformationOnImage=Aquesta eina va ser dissenyada per ajudar-vos a canviar la mida o retallar una imatge. Aquesta és la informació de la imatge editada actual
 ImageEditor=Editor d'imatge
@@ -230,18 +230,18 @@ ThisIsListOfModules=Li mostrem un llistat de mòduls preseleccionats per a aques
 UseAdvancedPerms=Usar els drets avançats en els permisos dels mòduls
 FileFormat=Format d'arxiu
 SelectAColor=Tria un color
-AddFiles=Afegir arxius
+AddFiles=Afegeix arxius
 StartUpload=Transferir
 CancelUpload=Cancel·lar transferència
 FileIsTooBig=L'arxiu és massa gran
 PleaseBePatient=Preguem esperi uns instants...
-NewPassword=Nova contrasenya
+NewPassword=Contrasenya nova
 ResetPassword=Restablir la contrasenya
 RequestToResetPasswordReceived=S'ha rebut una sol·licitud per canviar la teva contrasenya.
 NewKeyIs=Aquesta és la nova contrasenya per iniciar sessió
 NewKeyWillBe=La seva nova contrasenya per iniciar sessió en el software serà
 ClickHereToGoTo=Clica aquí per anar a %s
-YouMustClickToChange=però, primer ha de fer clic en el següent enllaç per validar aquest canvi de contrasenya
+YouMustClickToChange=De totes formes, primer heu de fer clic al següent enllaç per a validar aquest canvi de contrasenya
 ForgetIfNothing=Si vostè no ha sol·licitat aquest canvi, simplement ignori aquest e-mail. Les seves credencials són guardades de forma segura
 IfAmountHigherThan=si l'import es major que <strong>%s</strong>
 SourcesRepository=Repositori de fonts
@@ -259,6 +259,7 @@ ContactCreatedByEmailCollector=Contacte / adreça creada pel recollidor de corre
 ProjectCreatedByEmailCollector=Projecte creat pel recollidor de correus electrònics MSGID %s
 TicketCreatedByEmailCollector=Tiquet creat pel recollidor de correus electrònics MSGID %s
 OpeningHoursFormatDesc=Utilitzeu a - per separar l’horari d’obertura i tancament. <br> Utilitzeu un espai per introduir diferents intervals. <br> Exemple: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Àrea d'exportacions
diff --git a/htdocs/langs/ca_ES/productbatch.lang b/htdocs/langs/ca_ES/productbatch.lang
index 8ca82527e6c..798e4d56cbb 100644
--- a/htdocs/langs/ca_ES/productbatch.lang
+++ b/htdocs/langs/ca_ES/productbatch.lang
@@ -1,17 +1,17 @@
 # ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Utilitzar numeració per lots/series
-ProductStatusOnBatch=Si (es necessita lot/serie)
-ProductStatusNotOnBatch=No (no s'utilitza lot/serie)
+ManageLotSerial=Utilitza el número de lot/sèrie
+ProductStatusOnBatch=Sí (es requereix un lot/sèrie)
+ProductStatusNotOnBatch=No (lot/sèrie no utilitzat)
 ProductStatusOnBatchShort=Si
 ProductStatusNotOnBatchShort=No
-Batch=Lot/Serie
-atleast1batchfield=Data de caducitat o Data de venda o Lot/Numero de Serie
-batch_number=Número de Lot/Serie
-BatchNumberShort=Lot/Serie
+Batch=Lot/Sèrie
+atleast1batchfield=Data de caducitat o data de venda o número de lot/sèrie
+batch_number=Número de lot/sèrie
+BatchNumberShort=Lot/Sèrie
 EatByDate=Data de caducitat
 SellByDate=Data límit de venda
-DetailBatchNumber=Detalls del lot/serie
-printBatch=Lot/Serie %s
+DetailBatchNumber=Detalls del lot/sèrie
+printBatch=Lot/Sèrie: %s
 printEatby=Caducitat: %s
 printSellby=Límit venda: %s
 printQty=Quant.: %d
@@ -21,4 +21,4 @@ ProductDoesNotUseBatchSerial=Aquest producte no utilitza lot/número de sèrie
 ProductLotSetup=Configuració del mòdul lot/sèries
 ShowCurrentStockOfLot=Mostra l'estoc actual de la parella producte/lot
 ShowLogOfMovementIfLot=Mostra el registre de moviments de la parella producte/lot
-StockDetailPerBatch=Detalls del stock per lot
+StockDetailPerBatch=Detall d’estoc per lot
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index 49bfe4daa99..1bd732c8479 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -15,12 +15,12 @@ Service=Servei
 ProductId=ID producte/servei
 Create=Crear
 Reference=Referència
-NewProduct=Nou producte
-NewService=Nou servei
+NewProduct=Producte nou
+NewService=Servei nou
 ProductVatMassChange=Actualització d'Impostos Global 
 ProductVatMassChangeDesc=Aquesta eina actualitza el tipus d'IVA establert a <b> <u> TOTS </u> </b> els productes i serveis!
 MassBarcodeInit=Inicialització massiu de codis de barres
-MassBarcodeInitDesc=Pot utilitzar aquesta pàgina per inicialitzar el codi de barres en els objectes que no tenen un codi de barres definit. Comprovi abans que el mòdul de codis de barres estar ben configurat
+MassBarcodeInitDesc=Aquesta pàgina es pot utilitzar per a inicialitzar un codi de barres en els objectes que no tenen un codi de barres definit. Comproveu abans que la configuració del mòdul de codi de barres està completada.
 ProductAccountancyBuyCode=Codi comptable (compra)
 ProductAccountancyBuyIntraCode=Codi comptable (compra intracomunitària)
 ProductAccountancyBuyExportCode=Codi comptable (compra d'importació)
@@ -48,7 +48,7 @@ LastRecordedProducts=Últims %s productes registrats
 LastRecordedServices=Últims %s serveis registrats
 CardProduct0=Producte
 CardProduct1=Servei
-Stock=Stock
+Stock=Estoc
 MenuStocks=Estocs
 Stocks=Estocs i ubicació (magatzem) de productes
 Movements=Moviments
@@ -77,7 +77,7 @@ CostPriceDescription=Aquest camp de preus (sense IVA) es pot utilitzar per emmag
 CostPriceUsage=Aquest valor pot utilitzar-se per al càlcul de marges
 SoldAmount=Import venut
 PurchasedAmount=Import comprat
-NewPrice=Nou preu
+NewPrice=Preu nou
 MinPrice=Min. preu de venda
 EditSellingPriceLabel=Edita l'etiqueta de preu de venda
 CantBeLessThanMinPrice=El preu de venda no ha de ser inferior al mínim per a aquest producte (%s sense IVA). Aquest missatge pot estar causat per un descompte molt gran.
@@ -93,7 +93,7 @@ ShowService=Mostrar servei
 ProductsAndServicesArea=Àrea productes i serveis
 ProductsArea=Àrea Productes
 ServicesArea=Àrea Serveis
-ListOfStockMovements=Llistat de moviments de stock
+ListOfStockMovements=Llista de moviments d’estoc
 BuyingPrice=Preu de compra
 PriceForEachProduct=Productes amb preus específics
 SupplierCard=Targeta venedor
@@ -106,12 +106,13 @@ NoteNotVisibleOnBill=Nota (no visible en les factures, pressupostos, etc.)
 ServiceLimitedDuration=Si el servei és de durada limitada:
 FillWithLastServiceDates=Emplena les dates de l'última línia de servei
 MultiPricesAbility=Segments de preus múltiples per producte / servei (cada client està en un segment de preus)
-MultiPricesNumPrices=Nº de preus
+MultiPricesNumPrices=Nombre de preus
 DefaultPriceType=Base de preus per defecte (contra impostos) en afegir preus de venda nous
-AssociatedProductsAbility=Activa els kits (productes virtuals)
+AssociatedProductsAbility=Activa els kits (conjunt d'altres productes)
+VariantsAbility=Activa les variants (variacions de productes, per exemple, color, mida)
 AssociatedProducts=Kits
-AssociatedProductsNumber=Número de productes que componen aquest kit
-ParentProductsNumber=Nº de productes que aquest compon
+AssociatedProductsNumber=Nombre de productes que componen aquest kit
+ParentProductsNumber=Nombre de productes on està inclòs
 ParentProducts=Productes pare
 IfZeroItIsNotAVirtualProduct=Si és 0, aquest producte no és un kit
 IfZeroItIsNotUsedByVirtualProduct=Si és 0, aquest producte no s'utilitza en cap kit
@@ -131,7 +132,7 @@ ExportDataset_service_1=Serveis
 ImportDataset_produit_1=Productes
 ImportDataset_service_1=Serveis
 DeleteProductLine=Eliminar línia de producte
-ConfirmDeleteProductLine=Esteu segur de voler eliminar aquesta línia de producte?
+ConfirmDeleteProductLine=Esteu segur que voleu suprimir aquesta línia de producte?
 ProductSpecial=Especial
 QtyMin=Min. quantitat de compra
 PriceQtyMin=Preu mínim
@@ -161,14 +162,16 @@ CloneCategoriesProduct=Etiquetes i categories de clons enllaçades
 CloneCompositionProduct=Clonar virtualment un producte/servei
 CloneCombinationsProduct=Clonar variants de producte
 ProductIsUsed=Aquest producte és utilitzat
-NewRefForClone=Ref. del nou producte/servei
+NewRefForClone=Ref. del producte/servei nou
 SellingPrices=Preus de venda
 BuyingPrices=Preus de compra
 CustomerPrices=Preus de client
 SuppliersPrices=Preus del proveïdor
 SuppliersPricesOfProductsOrServices=Preus del venedor (de productes o serveis)
-CustomCode=Duana / mercaderia / codi HS
+CustomCode=Duanes | Productes bàsics | Codi HS
 CountryOrigin=País d'origen
+RegionStateOrigin=Regió d'origen
+StateOrigin=Estat | Província d'origen
 Nature=Naturalesa del producte (material/acabat)
 NatureOfProductShort=Naturalesa del producte
 NatureOfProductDesc=Matèria primera o producte acabat
@@ -216,7 +219,7 @@ unitDM=dm
 unitCM=cm
 unitMM=mm
 unitFT=peu
-unitIN=pulzada
+unitIN=polzada
 unitM2=Metre quadrat
 unitDM2=dm²
 unitCM2=cm²
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Utilitzar el preu fixat
 PriceByQuantity=Preus diferents per quantitat
 DisablePriceByQty=Desactivar els preus per quantitat
 PriceByQuantityRange=Rang de quantitats
-MultipriceRules=Regles de nivell de preu
+MultipriceRules=Preus automàtics per segment
 UseMultipriceRules=Utilitzeu les regles del segment de preus (definides a la configuració del mòdul de producte) per calcular automàticament els preus de tots els altres segments segons el primer segment
 PercentVariationOver=%% variació sobre %s
 PercentDiscountOver=%% descompte sobre %s
@@ -258,7 +261,7 @@ Quarter3=3º trimestre
 Quarter4=4º trimestre
 BarCodePrintsheet=Imprimeix codi de barres
 PageToGenerateBarCodeSheets=Amb aquesta eina, podeu imprimir fulls adhesius de codis de barres. Trieu el format de la vostra pàgina d'etiqueta, tipus de codi de barres i valor del codi de barres, i feu clic al botó <b> %s </b>.
-NumberOfStickers=Nùmero d'etiquetes per imprimir a la pàgina
+NumberOfStickers=Nombre d'adhesius per imprimir a la pàgina
 PrintsheetForOneBarCode=Imprimir varies etiquetes per codi de barres
 BuildPageToPrint=Generar pàgines a imprimir
 FillBarCodeTypeAndValueManually=Emplenar tipus i valor del codi de barres manualment
@@ -276,10 +279,10 @@ AddCustomerPrice=Afegir preus per client
 ForceUpdateChildPriceSoc=Indica el mateix preu a les filials dels clients
 PriceByCustomerLog=Registre de preus de clients anteriors
 MinimumPriceLimit=El preu mínim no pot ser inferior a %s
-MinimumRecommendedPrice=El preu mínim recomenat es: %s
+MinimumRecommendedPrice=El preu mínim recomanat és: %s
 PriceExpressionEditor=Editor d'expressions de preus
 PriceExpressionSelected=Expressió de preus seleccionat
-PriceExpressionEditorHelp1="price = 2 + 2" o "2 + 2" per configurar un preu. Utilitzi ; per separar expresions
+PriceExpressionEditorHelp1="price = 2 + 2" o "2 + 2" per definir el preu. Utilitzeu ; per separar expressions
 PriceExpressionEditorHelp2=Pots accedir als atributs complementaris amb variables com <b>#extrafield_myextrafieldkey#</b> i variables globals amb <b>#global_mycode#</b>
 PriceExpressionEditorHelp3=En productes/serveis i preus de proveïdor, hi ha disponibles les següents variables<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
 PriceExpressionEditorHelp4=Només en els preus de productes/serveis: <b>#supplier_min_price#</b><br>Només en els preus dels proveïdors: <b>#supplier_quantity# i #supplier_tva_tx#</b>
@@ -328,7 +331,7 @@ WidthUnits=Unitat d’amplada
 LengthUnits=Unitat de longitud
 HeightUnits=Unitat d'alçada
 SurfaceUnits=Unitat de superfície
-SizeUnits=Unitat de tamany
+SizeUnits=Unitat de mida
 DeleteProductBuyPrice=Elimina preu de compra
 ConfirmDeleteProductBuyPrice=Esteu segur de voler eliminar aquest preu de compra?
 SubProduct=Subproducte
@@ -356,9 +359,9 @@ ProductCombinations=Variants
 PropagateVariant=Propaga variants
 HideProductCombinations=Ocultar les variants en el selector de productes
 ProductCombination=Variant
-NewProductCombination=Nova variant
+NewProductCombination=Variant nova
 EditProductCombination=Editant variant
-NewProductCombinations=Nous variants
+NewProductCombinations=Variants noves
 EditProductCombinations=Editant variants
 SelectCombination=Selecciona la combinació
 ProductCombinationGenerator=Generador de variants
@@ -368,11 +371,11 @@ ImpactOnPriceLevel=Impacte en el nivell de preus %s
 ApplyToAllPriceImpactLevel= Aplica a tots els nivells
 ApplyToAllPriceImpactLevelHelp=En fer clic aquí, establireu el mateix impacte de preu en tots els nivells
 WeightImpact=Impacte en el pes
-NewProductAttribute=Nou atribut
-NewProductAttributeValue=Nou valor de l'atribut
-ErrorCreatingProductAttributeValue=Ha ocorregut un error al crear el valor de l'atribut. Això pot ser perque ja no existeixca un valor amb aquesta referència
+NewProductAttribute=Atribut nou
+NewProductAttributeValue=Valor d'atribut nou
+ErrorCreatingProductAttributeValue=S'ha produït un error en crear el valor de l'atribut. Podria ser perquè ja hi ha un valor existent amb aquesta referència
 ProductCombinationGeneratorWarning=Si continua, abans de generar noves variants, totes les anteriors seran ELIMINADES. Les ja existents s'actualitzaran amb els nous valors
-TooMuchCombinationsWarning=Generar una gran quantitat de variants pot donar lloc a un ús de CPU alta, ús de memòria i que Dolibarr no siga capaç de crearles. Habilitar l'opció "%s" pot ajudar a reduir l'ús de memòria.
+TooMuchCombinationsWarning=La generació de moltes variants pot provocar un elevat consum de la CPU i ús de memòria i Dolibarr no les podrà crear. Habilitant l'opció "%s" pot ajudar a reduir l'ús de memòria.
 DoNotRemovePreviousCombinations=No elimineu les variants anteriors
 UsePercentageVariations=Utilitzar variants percentuals
 PercentageVariation=Variant percentual
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index d7b36bb013a..dfc378b36f0 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -7,7 +7,7 @@ ProjectsArea=Àrea de projectes
 ProjectStatus=Estat el projecte
 SharedProject=Projecte compartit
 PrivateProject=Contactes del projecte
-ProjectsImContactFor=Projectes on sóc explícitament un contacte
+ProjectsImContactFor=Projectes dels qui en soc explícitament un contacte
 AllAllowedProjects=Tots els projectes que puc llegir (meu + públic)
 AllProjects=Tots els projectes
 MyProjectsDesc=Aquesta vista mostra aquells projectes dels quals sou un contacte.
@@ -20,12 +20,12 @@ MyTasksDesc=Aquesta vista es limita als projectes o a les tasques als quals sou
 OnlyOpenedProject=Només visibles els projectes oberts (els projectes en estat d'esborrany o tancats no són visibles)
 ClosedProjectsAreHidden=Els projectes tancats no són visibles.
 TasksPublicDesc=Aquesta vista mostra tots els projectes i tasques en els que vostè té dret a tenir visibilitat.
-TasksDesc=Aquesta vista mostra tots els projectes i tasques (les sevas autoritzacions li ofereixen una visió completa).
+TasksDesc=Aquesta vista presenta tots els projectes i tasques (els permisos d'usuari us concedeixen permís per veure-ho tot).
 AllTaskVisibleButEditIfYouAreAssigned=Totes les tasques per a projectes qualificats són visibles, però podeu ingressar només el temps per a la tasca assignada a l'usuari seleccionat. Assigneu la tasca si necessiteu introduir-hi el temps.
 OnlyYourTaskAreVisible=Només són visibles les tasques que tens assignades. Assigna't tasques si no són visibles i vols afegir-hi les hores.
 ImportDatasetTasks=Tasques de projectes
 ProjectCategories=Etiquetes de projecte
-NewProject=Nou projecte
+NewProject=Projecte nou
 AddProject=Crear projecte
 DeleteAProject=Eliminar un projecte
 DeleteATask=Eliminar una tasca
@@ -65,10 +65,10 @@ Task=Tasca
 TaskDateStart=Data d'inici
 TaskDateEnd=Data de finalització
 TaskDescription=Descripció de tasca
-NewTask=Nova tasca
+NewTask=Tasca nova
 AddTask=Crear tasca
 AddTimeSpent=Crea temps dedicat
-AddHereTimeSpentForDay=Afegeix aqui el temps dedicat per aquest dia/tasca
+AddHereTimeSpentForDay=Afegiu aquí el temps dedicat a aquest dia/tasca
 AddHereTimeSpentForWeek=Afegeix aquí el temps dedicat per aquesta setmana/tasca
 Activity=Activitat
 Activities=Tasques/activitats
@@ -120,7 +120,7 @@ ValidateProject=Validar projecte
 ConfirmValidateProject=Vols validar aquest projecte?
 CloseAProject=Tancar projecte
 ConfirmCloseAProject=Vols tancar aquest projecte?
-AlsoCloseAProject=Tancar també el projecte (mantindre obert si encara necessita seguir les tasques de producció en ell)
+AlsoCloseAProject=Tanqueu el projecte també (manteniu-lo obert si encara heu de seguir les tasques de producció)
 ReOpenAProject=Reobrir projecte
 ConfirmReOpenAProject=Vols reobrir aquest projecte?
 ProjectContact=Contactes del projecte
@@ -139,7 +139,7 @@ LinkedToAnotherCompany=Enllaçat a una altra empresa
 TaskIsNotAssignedToUser=Tasca no assignada a l'usuari. Utilitza el botó '<strong>%s</strong>' per assignar una tasca ara.
 ErrorTimeSpentIsEmpty=El temps dedicat està buit
 ThisWillAlsoRemoveTasks=Aquesta operació també destruirà les tasques del projecte (<b>%s</b> tasques en aquest moment) i tots els seus temps dedicats.
-IfNeedToUseOtherObjectKeepEmpty=Si els elements (factura, comanda, ...) pertanyen a un tercer que no és el seleccionat, havent aquests estar lligats al projecte a crear, deixeu buit per permetre el projecte a multi-tercers.
+IfNeedToUseOtherObjectKeepEmpty=Si alguns objectes (factura, comanda...), pertanyents a un altre tercer, han d'estar vinculats al projecte a crear, manteniu-los buits perquè el projecte sigui multitercers.
 CloneTasks=Clonar les tasques
 CloneContacts=Clonar els contactes
 CloneNotes=Clonar les notes
@@ -254,7 +254,7 @@ TimeSpentForInvoice=Temps dedicat
 OneLinePerUser=Una línia per usuari
 ServiceToUseOnLines=Servei d'ús a les línies
 InvoiceGeneratedFromTimeSpent=La factura %s s'ha generat a partir del temps dedicat al projecte
-ProjectBillTimeDescription=Comproveu si heu introduït el full de temps en les tasques del projecte I teniu previst generar factures des del full de temps per facturar al client del projecte (no comproveu si voleu crear la factura que no es basa en els fulls de temps introduïts). Nota: Per generarla  factura, aneu a la pestanya "Temps introduït" del projecte i seleccioneu les línies que cal incloure.
+ProjectBillTimeDescription=Comproveu si heu introduït el full de temps en les tasques del projecte I teniu previst generar factures des del full de temps per a facturar al client del projecte (no comproveu si voleu crear la factura que no es basa en els fulls de temps introduïts). Nota: Per a generar la factura, aneu a la pestanya "Temps introduït" del projecte i seleccioneu les línies que cal incloure.
 ProjectFollowOpportunity=Segueix l’oportunitat
 ProjectFollowTasks=Seguir les tasques o el temps dedicat
 Usage=Ús
@@ -262,7 +262,7 @@ UsageOpportunity=Ús: Oportunitat
 UsageTasks=Ús: Tasques
 UsageBillTimeShort=Ús: temps de facturació
 InvoiceToUse=Esborrany de factura a utilitzar
-NewInvoice=Nova factura
+NewInvoice=Factura nova
 OneLinePerTask=Una línia per tasca
 OneLinePerPeriod=Una línia per període
 RefTaskParent=Ref. Tasca pare
diff --git a/htdocs/langs/ca_ES/receiptprinter.lang b/htdocs/langs/ca_ES/receiptprinter.lang
index d0aa69ce402..32fce852506 100644
--- a/htdocs/langs/ca_ES/receiptprinter.lang
+++ b/htdocs/langs/ca_ES/receiptprinter.lang
@@ -5,28 +5,28 @@ PrinterUpdated=Impressora %s actualitzada
 PrinterDeleted=Impressora %s esborrada
 TestSentToPrinter=Prova enviada a la impressora %s
 ReceiptPrinter=Impressores de tiquets
-ReceiptPrinterDesc=Configuració d'impresora de tiquets
+ReceiptPrinterDesc=Configuració d'impressores de tiquets
 ReceiptPrinterTemplateDesc=Configuració de plantilles
-ReceiptPrinterTypeDesc=Descripció del tipus d'impresora de tiquets
-ReceiptPrinterProfileDesc=Descripció del perfil d'impresora de tiquets
+ReceiptPrinterTypeDesc=Descripció del tipus d'impressora de tiquets
+ReceiptPrinterProfileDesc=Descripció del perfil de la impressora de tiquets
 ListPrinters=Llista d'impressores
 SetupReceiptTemplate=Configuració de plantilla
 CONNECTOR_DUMMY=Impressora de proves
-CONNECTOR_NETWORK_PRINT=Impresora en xarxa
+CONNECTOR_NETWORK_PRINT=Impressora de xarxa
 CONNECTOR_FILE_PRINT=Impressora local
 CONNECTOR_WINDOWS_PRINT=Impressora local en Windows
 CONNECTOR_CUPS_PRINT=Impressora CUPS
-CONNECTOR_DUMMY_HELP=Impresora de proves, no fa res
+CONNECTOR_DUMMY_HELP=Impressora falsa per provar, no fa res
 CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
 CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
 CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
 CONNECTOR_CUPS_PRINT_HELP=Nom de la impressora CUPS, exemple: HPRT_TP805L
 PROFILE_DEFAULT=Perfil per defecte
-PROFILE_SIMPLE=Perfil simpre
+PROFILE_SIMPLE=Perfil simple
 PROFILE_EPOSTEP=Perfil Epos Tep
 PROFILE_P822D=Perfil P822D
 PROFILE_STAR=Perfil Star
-PROFILE_DEFAULT_HELP=Perfil per defecte per a les impresores Epson
+PROFILE_DEFAULT_HELP=Perfil predeterminat adequat per a impressores Epson
 PROFILE_SIMPLE_HELP=Perfil simple sense gràfics
 PROFILE_EPOSTEP_HELP=Perfil Epos Tep
 PROFILE_P822D_HELP=Perfil P822D sense gràfics
diff --git a/htdocs/langs/ca_ES/recruitment.lang b/htdocs/langs/ca_ES/recruitment.lang
index 538b7c54ea1..a9a64d93e3f 100644
--- a/htdocs/langs/ca_ES/recruitment.lang
+++ b/htdocs/langs/ca_ES/recruitment.lang
@@ -20,7 +20,7 @@
 # Module label 'ModuleRecruitmentName'
 ModuleRecruitmentName = Contractació
 # Module description 'ModuleRecruitmentDesc'
-ModuleRecruitmentDesc = Gestiona i segueix les campanyes de contractació de nous llocs de treball
+ModuleRecruitmentDesc = Gestiona i segueix les campanyes de contractació de llocs de treball nous
 
 #
 # Admin page
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=L’oferta de feina està tancada. El lloc s'ha cobe
 JobClosedTextCanceled=L’oferta de feina està tancada.
 ExtrafieldsJobPosition=Atributs complementaris (llocs de treball)
 ExtrafieldsCandidatures=Atributs complementaris (sol·licituds de feina)
+MakeOffer=Feu una oferta
diff --git a/htdocs/langs/ca_ES/resource.lang b/htdocs/langs/ca_ES/resource.lang
index f4b0d69ddf6..a608f69d929 100644
--- a/htdocs/langs/ca_ES/resource.lang
+++ b/htdocs/langs/ca_ES/resource.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - resource
 MenuResourceIndex=Recursos
-MenuResourceAdd=Nou recurs
+MenuResourceAdd=Recurs nou
 DeleteResource=Elimina recurs
 ConfirmDeleteResourceElement=Estàs segur de voler eliminar el recurs d'aquest element?
 NoResourceInDatabase=Sense recursos a la base de dades.
@@ -31,7 +31,7 @@ DictionaryResourceType=Tipus de recurs
 SelectResource=Seleccionar recurs
 
 IdResource=Id de recurs
-AssetNumber=Número de serie
+AssetNumber=Número de sèrie
 ResourceTypeCode=Codi de tipus de recurs
 ImportDataset_resource_1=Recursos
 
diff --git a/htdocs/langs/ca_ES/salaries.lang b/htdocs/langs/ca_ES/salaries.lang
index f4567d2fd49..de594952360 100644
--- a/htdocs/langs/ca_ES/salaries.lang
+++ b/htdocs/langs/ca_ES/salaries.lang
@@ -1,18 +1,18 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Compte comptable utilitzat per usuaris tercers
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=S'utilitzarà un compte comptable dedicat definit en la fitxa d'usuari per a omplir el Llibre Major, o com valor predeterminar de la comptabilitat del Llibre Major si no es defineix un compte comptable en la fitxa d'usuari.
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=El compte comptable dedicat definit a la fitxa d'usuari només s’utilitzarà per a la comptabilitat auxiliar. Aquest s'utilitzarà per al llibre major i com a valor per defecte de la comptabilitat auxiliar si no es defineix un compte comptable d'usuari dedicat.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Compte comptable per defecte per als pagaments salarials
 Salary=Sou
 Salaries=Sous
-NewSalaryPayment=Nou pagament de sous
+NewSalaryPayment=Pagament de salari nou
 AddSalaryPayment=Afegeix pagament de sou
 SalaryPayment=Pagament de sous
 SalariesPayments=Pagaments de sous
 ShowSalaryPayment=Veure pagament de sous
 THM=Tarifa per hora mitjana
-TJM=Tarifa diaria mitjana
+TJM=Tarifa mitjana diària
 CurrentSalary=Salari actual
-THMDescription=Aquest valor es pot utilitzar per calcular el cost del temps consumit en un projecte introduït pels usuaris si s'utilitza el projecte de mòdul
+THMDescription=Aquest valor es pot utilitzar per a calcular el cost del temps consumit en un projecte introduït pels usuaris si s'utilitza el mòdul de projecte
 TJMDescription=Aquest valor només és informatiu i no s'utilitza en cap càlcul
 LastSalaries=Últims %s pagaments de salari
 AllSalaries=Tots els pagaments de salari
diff --git a/htdocs/langs/ca_ES/sendings.lang b/htdocs/langs/ca_ES/sendings.lang
index 421112e34da..a973ace4aee 100644
--- a/htdocs/langs/ca_ES/sendings.lang
+++ b/htdocs/langs/ca_ES/sendings.lang
@@ -15,7 +15,7 @@ StatisticsOfSendings=Estadístiques d'enviaments
 NbOfSendings=Nombre d'enviaments
 NumberOfShipmentsByMonth=Nombre d'enviaments per mes
 SendingCard=Fitxa d'enviament
-NewSending=Nou enviament
+NewSending=Enviament nou
 CreateShipment=Crear enviament
 QtyShipped=Qt. enviada
 QtyShippedShort=Quant. env.
@@ -30,16 +30,17 @@ OtherSendingsForSameOrder=Altres enviaments d'aquesta comanda
 SendingsAndReceivingForSameOrder=Enviaments i recepcions per aquesta comanda
 SendingsToValidate=Enviaments a validar
 StatusSendingCanceled=Anul·lada
+StatusSendingCanceledShort=Cancel·lat
 StatusSendingDraft=Esborrany
 StatusSendingValidated=Validat (productes a enviar o enviats)
 StatusSendingProcessed=Processat
 StatusSendingDraftShort=Esborrany
 StatusSendingValidatedShort=Validat
 StatusSendingProcessedShort=Processat
-SendingSheet=Nota d'entrga
+SendingSheet=Full d’enviament
 ConfirmDeleteSending=Estàs segur que vols eliminar aquest enviament?
 ConfirmValidateSending=Estàs segur que vols validar aquest enviament amb referència <b>%s</b>?
-ConfirmCancelSending=Estàs segur que vols cancelar aquest enviament?
+ConfirmCancelSending=Esteu segur que voleu cancel·lar aquest enviament?
 DocumentModelMerou=Model Merou A5
 WarningNoQtyLeftToSend=Alerta, cap producte en espera d'enviament.
 StatsOnShipmentsOnlyValidated=Estadístiques realitzades únicament sobre les expedicions validades
@@ -50,7 +51,7 @@ DateReceived=Data real de recepció
 ClassifyReception=Marca rebut
 SendShippingByEMail=Envia expedició per e-mail
 SendShippingRef=Enviament de l'expedició %s
-ActionsOnShipping=Events sobre l'expedició
+ActionsOnShipping=Esdeveniments en l'enviament
 LinkToTrackYourPackage=Enllaç per al seguiment del seu paquet
 ShipmentCreationIsDoneFromOrder=De moment, la creació d'una nova expedició es realitza des de la fitxa de comanda.
 ShipmentLine=Línia d'expedició
diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang
index a567ac331f0..fbda84602e8 100644
--- a/htdocs/langs/ca_ES/stocks.lang
+++ b/htdocs/langs/ca_ES/stocks.lang
@@ -3,13 +3,13 @@ WarehouseCard=Fitxa magatzem
 Warehouse=Magatzem
 Warehouses=Magatzems
 ParentWarehouse=Magatzem pare
-NewWarehouse=Nou magatzem o zona d'emmagatzematge
+NewWarehouse=Magatzem / Ubicació d'estoc nova
 WarehouseEdit=Edició magatzem
-MenuNewWarehouse=Nou magatzem
+MenuNewWarehouse=Magatzem nou
 WarehouseSource=Magatzem origen
 WarehouseSourceNotDefined=Sense magatzems definits,
 AddWarehouse=Crea un magatzem
-AddOne=Afegir un
+AddOne=Afegeix-ne un
 DefaultWarehouse=Magatzem predeterminat
 WarehouseTarget=Magatzem destinació
 ValidateSending=Elimina l'enviament
@@ -17,8 +17,8 @@ CancelSending=Cancel·la l'enviament
 DeleteSending=Elimina l'enviament
 Stock=Estoc
 Stocks=Estocs
-MissingStocks=Estoc que falta
-StockAtDate=Existències en data
+MissingStocks=Estocs que falten
+StockAtDate=Estocs en data
 StockAtDateInPast=Data passada
 StockAtDateInFuture=Data en el futur
 StocksByLotSerial=Estocs per lot/sèrie
@@ -27,7 +27,7 @@ LotSerialList=Llista de lots/sèries
 Movements=Moviments
 ErrorWarehouseRefRequired=El nom de referència del magatzem és obligatori
 ListOfWarehouses=Llistat de magatzems
-ListOfStockMovements=Llistat de moviments de estoc
+ListOfStockMovements=Llistat de moviments d'estoc
 ListOfInventories=Llista d'inventaris
 MovementId=ID del moviment
 StockMovementForId=ID de moviment %d
@@ -46,7 +46,7 @@ Units=Unitats
 Unit=Unitat
 StockCorrection=Regularització d'estoc
 CorrectStock=Regularització d'estoc
-StockTransfer=Transferencia d'estoc
+StockTransfer=Transferència d’estoc
 TransferStock=Transferència d'estoc
 MassStockTransferShort=Transferència d'estoc massiu
 StockMovement=Moviment d'estoc
@@ -102,9 +102,9 @@ IdWarehouse=Id. magatzem
 DescWareHouse=Descripció magatzem
 LieuWareHouse=Localització magatzem
 WarehousesAndProducts=Magatzems i productes
-WarehousesAndProductsBatchDetail=Magatzems i productes (amb detalls per lot/serie)
+WarehousesAndProductsBatchDetail=Magatzems i productes (amb detall per lot/sèrie)
 AverageUnitPricePMPShort=Preu mitjà ponderat
-AverageUnitPricePMPDesc=El preu unitari mitjà d’entrada que hem de pagar als proveïdors per incorporar el producte a les nostres existències.
+AverageUnitPricePMPDesc=El preu unitari mitjà d’entrada que hem hagut de pagar als proveïdors per incorporar el producte al nostre estoc.
 SellPriceMin=Preu de venda unitari
 EstimatedStockValueSellShort=Valor per vendre
 EstimatedStockValueSell=Valor per vendre
@@ -112,7 +112,7 @@ EstimatedStockValueShort=Valor compra (PMP)
 EstimatedStockValue=Valor de compra (PMP)
 DeleteAWarehouse=Eliminar un magatzem
 ConfirmDeleteWarehouse=Vols eliminar el magatzem <b>%s</b>?
-PersonalStock=Stoc personal %s
+PersonalStock=Estoc personal %s
 ThisWarehouseIsPersonalStock=Aquest magatzem representa l'estoc personal de %s %s
 SelectWarehouseForStockDecrease=Tria el magatzem a utilitzar en el decrement d'estoc
 SelectWarehouseForStockIncrease=Tria el magatzem a utilitzar en l'increment d'estoc
@@ -127,13 +127,13 @@ UseRealStockByDefault=Utilitza estoc real, en lloc d’estoc virtual, per a la f
 ReplenishmentCalculation=La quantitat a demanar serà (quantitat desitjada - estoc real) en lloc de (quantitat desitjada - estoc virtual)
 UseVirtualStock=Utilitza estoc virtual
 UsePhysicalStock=Utilitzar estoc físic
-CurentSelectionMode=Mode de sel·leció actual
+CurentSelectionMode=Mètode de selecció actual
 CurentlyUsingVirtualStock=Estoc virtual
 CurentlyUsingPhysicalStock=Estoc físic
 RuleForStockReplenishment=Regla pels reaprovisionaments d'estoc
 SelectProductWithNotNullQty=Seleccioneu com a mínim un producte amb un valor no nul i un proveïdor
 AlertOnly= Només alertes
-IncludeProductWithUndefinedAlerts = Incloure també estocs negatius per als productes sense la quantitat desitjada definida, per restaurar-los a 0
+IncludeProductWithUndefinedAlerts = Incloure també estoc negatiu per als productes sense la quantitat desitjada definida, per restaurar-los a 0
 WarehouseForStockDecrease=Per la disminució d'estoc s'utilitzara el magatzem <b>%s</b>
 WarehouseForStockIncrease=Pe l'increment d'estoc s'utilitzara el magatzem <b>%s</b>
 ForThisWarehouse=Per aquest magatzem
@@ -141,10 +141,10 @@ ReplenishmentStatusDesc=Aquesta és una llista de tots els productes amb un esto
 ReplenishmentStatusDescPerWarehouse=Si voleu una reposició basada en la quantitat desitjada definida per magatzem, heu d’afegir un filtre al magatzem.
 ReplenishmentOrdersDesc=Aquesta és una llista de totes les comandes de compra oberta incloent productes predefinits. Només s'obren ordres amb productes predefinits, de manera que les comandes que poden afectar les existències, són visibles aquí.
 Replenishments=reaprovisionament
-NbOfProductBeforePeriod=Quantitat del producte %s en estoc abans del periode seleccionat (< %s)
+NbOfProductBeforePeriod=Quantitat del producte %s en estoc abans del període seleccionat (< %s)
 NbOfProductAfterPeriod=Quantitat de producte %s en estoc després del període seleccionat (> %s)
 MassMovement=Moviments en massa
-SelectProductInAndOutWareHouse=Seleccioneu un magatzem d'origen i un magatzem destí, un producte i una quantitat i feu clic a "%s". Un cop fet això per a tots els moviments necessaris, feu clic a "%s".
+SelectProductInAndOutWareHouse=Seleccioneu un magatzem d'origen i un magatzem de destí, un producte i una quantitat i feu clic a "%s". Un cop fet això per a tots els moviments necessaris, feu clic a "%s".
 RecordMovement=Registre de transferència
 ReceivingForSameOrder=Recepcions d'aquesta comanda
 StockMovementRecorded=Moviments d'estoc registrat
@@ -165,7 +165,7 @@ MovementCorrectStock=Ajustament d'estoc del producte %s
 MovementTransferStock=Transferència d'estoc de producte %s a un altre magatzem
 InventoryCodeShort=Codi Inv./Mov.
 NoPendingReceptionOnSupplierOrder=No hi ha cap recepció pendent deguda a l'ordre de compra obert
-ThisSerialAlreadyExistWithDifferentDate=Aquest número de lot/serie (<strong%s</strong>) ja existeix, però amb una data de caducitat o venda diferent (trobat <strong>%s</strong> però ha introduït <strong>%s</strong>).
+ThisSerialAlreadyExistWithDifferentDate=Aquest número de lot/sèrie (<strong> %s </strong>) ja existeix però amb diferent data de caducitat o venda (s'ha trobat <strong> %s </strong> però heu introduït <strong> %s </strong>).
 OpenAll=Actiu per a totes les accions
 OpenInternal=Actiu sols per accions internes
 UseDispatchStatus=Utilitzeu un estat d'enviament (aprovació / rebuig) per a les línies de productes en la recepció de l'ordre de compra
@@ -176,9 +176,9 @@ ProductStockWarehouseDeleted=S'ha eliminat correctament el límit d'estoc per al
 AddNewProductStockWarehouse=Posar nou estoc límit per alertar i nou estoc òptim desitjat
 AddStockLocationLine=Decrementa quantitat i a continuació fes clic per afegir un altre magatzem per aquest producte
 InventoryDate=Data d'inventari
-NewInventory=Nou inventari
+NewInventory=Inventari nou
 inventorySetup = Configuració de l'inventari
-inventoryCreatePermission=Crea un nou inventari
+inventoryCreatePermission=Crea un inventari nou
 inventoryReadPermission=Veure inventaris
 inventoryWritePermission=Actualitza els inventaris
 inventoryValidatePermission=Valida l'inventari
@@ -186,7 +186,7 @@ inventoryTitle=Inventari
 inventoryListTitle=Inventaris
 inventoryListEmpty=Cap inventari en progrés
 inventoryCreateDelete=Crea/elimina l'inventari
-inventoryCreate=Crea nou
+inventoryCreate=Crea un nou
 inventoryEdit=Edita
 inventoryValidate=Validat
 inventoryDraft=En servei
@@ -201,7 +201,7 @@ SelectFournisseur=Categoria del proveïdor
 inventoryOnDate=Inventari
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Els moviments d’estoc tindran la data de l'inventari (en lloc de la data de validació de l'inventari)
 inventoryChangePMPPermission=Permet canviar el valor PMP d'un producte
-ColumnNewPMP=Nova unitat PMP
+ColumnNewPMP=Unitat PMP nova
 OnlyProdsInStock=No afegeixis producte sense estoc
 TheoricalQty=Qtat. teòrica
 TheoricalValue=Qtat. teòrica
@@ -233,10 +233,11 @@ InventoryForASpecificProduct=Inventari d’un producte específic
 StockIsRequiredToChooseWhichLotToUse=Es requereix estoc per a triar quin lot utilitzar
 ForceTo=Obligar a
 AlwaysShowFullArbo=Mostra l'arbre complet de magatzems a la finestra emergent dels enllaços de magatzem (Advertència: pot disminuir el rendiment de manera espectacular)
-StockAtDatePastDesc=Podeu veure aquí el valor (accions reals) en una data determinada en el passat
-StockAtDateFutureDesc=Podeu veure aquí l'estoc (accions virtuals) en una data determinada en endavant
+StockAtDatePastDesc=Aquí podeu veure l'estoc (estoc real) en una data determinada del passat
+StockAtDateFutureDesc=Aquí podeu veure l'estoc (estoc virtual) en una data determinada en el futur
 CurrentStock=Estoc actual
 InventoryRealQtyHelp=Estableix el valor a 0 per restablir qty <br> Mantenir el camp buit o suprimir la línia per mantenir-la sense canvis
 UpdateByScaning=Actualitza per escaneig
 UpdateByScaningProductBarcode=Actualització per escaneig (codi de barres de producte)
 UpdateByScaningLot=Actualització per escaneig (codi de barres lot|sèrie)
+DisableStockChangeOfSubProduct=Desactiva el canvi d'estoc de tots els subproductes d'aquest kit durant aquest moviment.
diff --git a/htdocs/langs/ca_ES/stripe.lang b/htdocs/langs/ca_ES/stripe.lang
index 70f55a466e2..436808a0af2 100644
--- a/htdocs/langs/ca_ES/stripe.lang
+++ b/htdocs/langs/ca_ES/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Configuració del mòdul Stripe
-StripeDesc=Ofereix als clients una pàgina de pagament en línia de Stripe per als pagaments amb targetes credit / cebit a través de <a href="http://www.stripe.com" target="_blank"> Stripe </a>. Això es pot utilitzar per permetre als vostres clients fer pagaments ad-hoc o pagaments relacionats amb un objecte particular de Dolibarr (factura, comanda ...)
+StripeDesc=Ofereix als clients una pàgina de pagaments en línia de Stripe per als pagaments amb targetes de crèdit/dèbit mitjançant <a href="http://www.stripe.com" target="_blank">Stripe</a>. Es pot utilitzar per a permetre als clients fer pagaments ad-hoc o per a pagaments relacionats amb un objecte Dolibarr concret (factura, comanda, ...)
 StripeOrCBDoPayment=Pagar amb targeta de crèdit o Stripe
 FollowingUrlAreAvailableToMakePayments=Les següents URL estan disponibles per a permetre a un client fer un cobrament en objectes de Dolibarr
 PaymentForm=Formulari de pagament
@@ -22,24 +22,24 @@ ToOfferALinkForOnlinePaymentOnContractLine=URL per oferir una pàgina de pagamen
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL per oferir una pàgina de pagament en línia %s de qualsevol quantitat sense cap objecte associat
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL per oferir una pàgina de pagament en línia %s per a una subscripció per membres
 ToOfferALinkForOnlinePaymentOnDonation=URL per oferir una pàgina de pagament en línia %s per al pagament d’una donació
-YouCanAddTagOnUrl=També podeu afegir el paràmetre URL <b>&tag= <i>valor</i> </b> a qualsevol d'aquestes URLs (obligatori només per al pagament no vinculat a cap objecte) per afegir la vostra pròpia etiqueta de comentari de pagament. <br> Per a la URL de pagaments no vinculta a cap objecte existent, també podeu afegir el paràmetre <strong>&noidempotency=1</strong> de manera que el mateix enllaç amb una mateixa etiqueta es pot utilitzar diverses vegades (alguns modes de pagament poden limitar els intents de pagament a 1 per a cada enllaç si no s'utilitza aquest paràmetre)
+YouCanAddTagOnUrl=També podeu afegir el paràmetre URL <b> &tag=<i>valor</i></b> a qualsevol d’aquests URL (obligatori només per al pagament que no estigui vinculat a un objecte) per a afegir la vostra pròpia etiqueta de comentari de pagament. <br>Per a l'URL de pagaments sense objecte existent, també podeu afegir el paràmetre <strong> &noidempotency=1 </strong>, de manera que es pot utilitzar el mateix enllaç amb la mateixa etiqueta diverses vegades (alguns modes de pagament poden limitar el pagament a 1 per a cada enllaç diferent sense aquest paràmetre)
 SetupStripeToHavePaymentCreatedAutomatically=Configureu el vostre Stripe amb l'URL <b>%s</b> per fer que el pagament es creï automàticament quan es valide mitjançant Stripe.
 AccountParameter=Paràmetres del compte
 UsageParameter=Paràmetres d'ús
 InformationToFindParameters=Informació per trobar la seva configuració de compte %s
 STRIPE_CGI_URL_V2=URL CGI del mòdul Stripe per al pagament
 CSSUrlForPaymentForm=Url del full d'estil CSS per al formulari de pagament
-NewStripePaymentReceived=S'ha rebut un nou pagament de Stripe
-NewStripePaymentFailed=S'ha intentat el pagament de Stripe però, ha fallat
+NewStripePaymentReceived=S'ha rebut un pagament nou de Stripe
+NewStripePaymentFailed=S'ha intentat el pagament nou de Stripe, però ha fallat
 FailedToChargeCard=No s'ha pogut fer el càrrec a la targeta
 STRIPE_TEST_SECRET_KEY=Clau secreta de test
 STRIPE_TEST_PUBLISHABLE_KEY=Clau de test publicable
 STRIPE_TEST_WEBHOOK_KEY=Clau de prova de Webhook
 STRIPE_LIVE_SECRET_KEY=Clau secreta
-STRIPE_LIVE_PUBLISHABLE_KEY=Clau pubicable
+STRIPE_LIVE_PUBLISHABLE_KEY=Clau publicable
 STRIPE_LIVE_WEBHOOK_KEY=Webhook clau en directe
 ONLINE_PAYMENT_WAREHOUSE=Les existències per utilitzar per disminuir les existències quan es fa el pagament en línia <br> (Pendent de fer Quan es fa una opció per reduir l'estoc en una acció a la factura i es genera la factura el pagament en línia?)
-StripeLiveEnabled=Stripe live activat (del contrari en mode test/sandbox)
+StripeLiveEnabled=Stripe live activat (en cas contrari, mode de prova/sandbox)
 StripeImportPayment=Importar pagaments per Stripe
 ExampleOfTestCreditCard=Exemple de targeta de crèdit per a la prova: %s => vàlid, %s => error CVC, %s => caducat, %s => falla la càrrega
 StripeGateways=Passarel·les Stripe
diff --git a/htdocs/langs/ca_ES/supplier_proposal.lang b/htdocs/langs/ca_ES/supplier_proposal.lang
index b7f9c5a4ba4..5a6546a4e81 100644
--- a/htdocs/langs/ca_ES/supplier_proposal.lang
+++ b/htdocs/langs/ca_ES/supplier_proposal.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
 SupplierProposal=Pressupostos de proveïdor
 supplier_proposalDESC=Gestiona les peticions de preu de proveïdors
-SupplierProposalNew=Nova petició de preu
+SupplierProposalNew=Sol·licitud de preu nova
 CommRequest=Petició de preu
 CommRequests=Peticions de preu
 SearchRequest=Busca una petició
@@ -13,12 +13,13 @@ SupplierProposalArea=Àrea de pressupostos de proveïdor
 SupplierProposalShort=Pressupost de proveïdor
 SupplierProposals=Pressupostos de proveïdor
 SupplierProposalsShort=Pressupostos de proveïdor
-NewAskPrice=Nova petició de preu
+AskPrice=Petició de preu
+NewAskPrice=Sol·licitud de preu nova
 ShowSupplierProposal=Mostra una petició de preu
 AddSupplierProposal=Crea una petició de preu
 SupplierProposalRefFourn=Ref. proveïdor
 SupplierProposalDate=Data de lliurament
-SupplierProposalRefFournNotice=Abans de tancar-ho com a "Acceptat", pensa en captar les referències del proveïdor.
+SupplierProposalRefFournNotice=Abans de tancar-ho com a "Acceptat", penseu a captar les referències dels proveïdors.
 ConfirmValidateAsk=Estàs segur que vols validar aquest preu de sol·licitud sota el nom <b>%s</b>?
 DeleteAsk=Elimina la petició
 ValidateAsk=Validar petició
@@ -48,7 +49,7 @@ DefaultModelSupplierProposalToBill=Model per defecte en tancar una petició de p
 DefaultModelSupplierProposalClosed=Model per defecte en tancar una petició de preu (rebutjada)
 ListOfSupplierProposals=Llista de sol·licituds de pressupostos a proveïdor
 ListSupplierProposalsAssociatedProject=Llista de pressupostos de proveïdor associats al projecte
-SupplierProposalsToClose=Pressupostos de proveïdor per tancar
+SupplierProposalsToClose=Pressupostos de proveïdor per a tancar
 SupplierProposalsToProcess=Pressupostos de proveïdor a processar
 LastSupplierProposals=Últims %s preus de sol·licitud
 AllPriceRequests=Totes les peticions
diff --git a/htdocs/langs/ca_ES/ticket.lang b/htdocs/langs/ca_ES/ticket.lang
index ee5f34745e3..8c4a695766a 100644
--- a/htdocs/langs/ca_ES/ticket.lang
+++ b/htdocs/langs/ca_ES/ticket.lang
@@ -58,7 +58,6 @@ OriginEmail=Origen de correu electrònic
 Notify_TICKET_SENTBYMAIL=Envia el missatge del tiquet per correu electrònic
 
 # Status
-NotRead=No llegit
 Read=Llegit
 Assigned=Assignat
 InProgress=En progrés
@@ -107,7 +106,7 @@ TicketPublicInterfaceTextHelpMessageHelpAdmin=Aquest text apareixerà a sobre de
 ExtraFieldsTicket=Extra atributs
 TicketCkEditorEmailNotActivated=L'editor HTML no està activat. Poseu FCKEDITOR_ENABLE_MAIL contingut a 1 per obtenir-lo.
 TicketsDisableEmail=No enviïs missatges de correu electrònic per a la creació de bitllets o la gravació de missatges
-TicketsDisableEmailHelp=De manera predeterminada, s'envien correus electrònics quan es creen nous tiquets o missatges. Activeu aquesta opció per desactivar totes les *all* notificacions per correu electrònic
+TicketsDisableEmailHelp=De manera predeterminada, s'envien correus electrònics quan es creen nous tiquets o missatges. Activeu aquesta opció per a desactivar *totes* les notificacions per correu electrònic
 TicketsLogEnableEmail=Activa el 'log' (registre d'activitat) per correu electrònic
 TicketsLogEnableEmailHelp=En cada canvi, s'enviarà un correu ** a cada contacte ** associat al tiquet.
 TicketParams=Paràmetres
@@ -124,12 +123,13 @@ TicketsActivatePublicInterfaceHelp=La interfície pública permet qualsevol visi
 TicketsAutoAssignTicket=Assigna automàticament l'usuari que va crear el tiquet
 TicketsAutoAssignTicketHelp=Quan es crea un tiquet, l'usuari pot assignar-se automàticament al tiquet.
 TicketNumberingModules=Mòdul de numeració de tiquets
+TicketsModelModule=Plantilles de document per a tiquets
 TicketNotifyTiersAtCreation=Notifica la creació de tercers
 TicketsDisableCustomerEmail=Desactiveu sempre els correus electrònics quan es crea un tiquet des de la interfície pública
-TicketsPublicNotificationNewMessage=Enviar correu(s) electonic(s) quan s'afegeix un nou missatge
-TicketsPublicNotificationNewMessageHelp=Enviar correu(s) electrònic(s) quan un nou missatge s'afegeix des d'una interfície pública (cap a l'usuari assignat o la notificació del correu electrònic cap a (actualitzar) i/o les notificacions del correu electrònic cap a)
+TicketsPublicNotificationNewMessage=Envia correus electrònics quan s'afegeixi un missatge nou
+TicketsPublicNotificationNewMessageHelp=Envia correus electrònics quan s'afegeixi un missatge nou des de la interfície pública (a l'usuari assignat o al correu electrònic de notificacions a (actualitzar) i/o al correu electrònic de notificacions)
 TicketPublicNotificationNewMessageDefaultEmail=Notificar correu electrònic cap a (actualitzar)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Enviar un correu nou missatge de notificació cap a aquesta adreça si el tiquet no te usuari assignat o l'usuari no te correu electrònic.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Envia notificacions de missatges nous per correu electrònic a aquesta adreça si el tiquet no té assignat cap usuari o l’usuari no en té cap.
 #
 # Index & list page
 #
@@ -155,7 +155,7 @@ CreateTicket=Crea un tiquet
 EditTicket=Editar el tiquet
 TicketsManagement=Gestió de tiquets
 CreatedBy=Creat per
-NewTicket=Nou tiquet
+NewTicket=Tiquet nou
 SubjectAnswerToTicket=Resposta de tiquet
 TicketTypeRequest=Tipus de sol·licitud
 TicketCategory=Grup
@@ -192,7 +192,7 @@ TicketDurationAuto=Durada calculada
 TicketDurationAutoInfos=Durada calculada automàticament a partir de la intervenció relacionada
 TicketUpdated=Tiquet actualitzat
 SendMessageByEmail=Envia un missatge per correu electrònic
-TicketNewMessage=Mou missatge
+TicketNewMessage=Missatge nou
 ErrorMailRecipientIsEmptyForSendTicketMessage=El destinatari està buit. Email no enviat
 TicketGoIntoContactTab=Aneu a la pestanya "Contactes" per seleccionar-los
 TicketMessageMailIntro=Introducció
@@ -225,13 +225,12 @@ UnableToCreateInterIfNoSocid=No es pot crear una intervenció quan no s'hagi def
 TicketMailExchanges=Intercanvis de correus
 TicketInitialMessageModified=Missatge inicial modificat
 TicketMessageSuccesfullyUpdated=Missatge actualitzat amb èxit
-TicketChangeStatus=Canvi de estatus
-TicketConfirmChangeStatus=Confirmar el canvi d'estatus : %s ?
-TicketLogStatusChanged=Estatus canviat : %s a %s
+TicketChangeStatus=Canvia l'estat
+TicketConfirmChangeStatus=Confirmeu el canvi d'estat: %s?
+TicketLogStatusChanged=Estat canviat: %s a %s
 TicketNotNotifyTiersAtCreate=No es notifica a l'empresa a crear
 Unread=No llegit
 TicketNotCreatedFromPublicInterface=No disponible El tiquet no s'ha creat des de la interfície pública.
-PublicInterfaceNotEnabled=La interfície pública no s'ha activat
 ErrorTicketRefRequired=El nom de referència del tiquet és obligatori
 
 #
@@ -242,7 +241,7 @@ NoLogForThisTicket=Encara no hi ha 'log' per aquest tiquet
 TicketLogAssignedTo=Tiquet %s assignat a %s
 TicketLogPropertyChanged=Tiquet %s modificat: classificació de %s a %s
 TicketLogClosedBy=Tiquet %s tancat per %s
-TicketLogReopen=El tiquet %s s'ha re-obert
+TicketLogReopen=El tiquet %s s'ha reobert
 
 #
 # Public pages
@@ -252,14 +251,14 @@ ShowListTicketWithTrackId=Mostra la llista d'entrades a partir de l'identificado
 ShowTicketWithTrackId=Mostra tiquets de l'identificador de traça 
 TicketPublicDesc=Podeu crear un tiquet d'assistència o consultar des d'una identificació (ID) existent.
 YourTicketSuccessfullySaved=S'ha desat el tiquet amb èxit!
-MesgInfosPublicTicketCreatedWithTrackId=S'ha creat un nou tiquet amb l'ID %s i la ref. %s.
+MesgInfosPublicTicketCreatedWithTrackId=S'ha creat un tiquet nou amb l'ID %s i la ref. %s.
 PleaseRememberThisId=Guardeu el número de traça que us podríem demanar més tard.
 TicketNewEmailSubject=Confirmació de la creació de tiquet - Ref %s (ID de l’entrada pública %s)
-TicketNewEmailSubjectCustomer=Nou tiquet de suport
+TicketNewEmailSubjectCustomer=Tiquet de suport nou
 TicketNewEmailBody=Aquest és un correu electrònic automàtic per confirmar que heu registrat un nou tiquet.
 TicketNewEmailBodyCustomer=Aquest és un correu electrònic automàtic per confirmar que un nou tiquet acaba de ser creat al vostre compte.
 TicketNewEmailBodyInfosTicket=Informació per al seguiment del tiquet
-TicketNewEmailBodyInfosTrackId=Traça de tiquet numero: %s
+TicketNewEmailBodyInfosTrackId=Número de seguiment de tiquet: %s
 TicketNewEmailBodyInfosTrackUrl=Podeu veure el progrés del tiquet fent clic a l'enllaç de dalt.
 TicketNewEmailBodyInfosTrackUrlCustomer=Podeu veure el progrés del tiquet a la interfície específica fent clic al següent enllaç
 TicketEmailPleaseDoNotReplyToThisEmail=No respongueu directament a aquest correu electrònic. Utilitzeu l'enllaç per respondre des de la mateixa interfície.
@@ -273,13 +272,13 @@ Subject=Assumpte
 ViewTicket=Vista del tiquet
 ViewMyTicketList=Veure la meva llista de tiquets
 ErrorEmailMustExistToCreateTicket=Error: adreça de correu electrònic no trobada a la nostra base de dades
-TicketNewEmailSubjectAdmin=S'ha creat un nou tiquet: Ref %s (ID d'entrada pública %s)
+TicketNewEmailSubjectAdmin=S'ha creat un tiquet nou - Ref %s (ID de tiquet públic %s)
 TicketNewEmailBodyAdmin=<p>S'ha creat una entrada amb ID #%s, veure informació :</p>
 SeeThisTicketIntomanagementInterface=Consulteu el tiquet a la interfície de gestió
 TicketPublicInterfaceForbidden=La interfície pública de les entrades no estava habilitada
 ErrorEmailOrTrackingInvalid=Valor incorrecte per a identificació de seguiment o correu electrònic
 OldUser=Usuari antic
-NewUser=Nou usuari
+NewUser=Usuari nou
 NumberOfTicketsByMonth=Nombre d’entrades mensuals
 NbOfTickets=Nombre d’entrades
 # notifications
diff --git a/htdocs/langs/ca_ES/trips.lang b/htdocs/langs/ca_ES/trips.lang
index 04c987be86f..4fb800249a6 100644
--- a/htdocs/langs/ca_ES/trips.lang
+++ b/htdocs/langs/ca_ES/trips.lang
@@ -6,20 +6,20 @@ TripsAndExpensesStatistics=Estadístiques de l'informe de despeses
 TripCard=Informe de despesa de targeta
 AddTrip=Crear informe de despeses
 ListOfTrips=Llistat de informes de despeses
-ListOfFees=Llistat notes de honoraris
+ListOfFees=Llista de taxes
 TypeFees=Tipus de despeses
 ShowTrip=Mostra l'informe de despeses
-NewTrip=Nou informe de despeses
+NewTrip=Informe de despeses nou
 LastExpenseReports=Últims %s informes de despeses 
 AllExpenseReports=Tots els informes de despeses
 CompanyVisited=Empresa/organització visitada
 FeesKilometersOrAmout=Import o quilòmetres
-DeleteTrip=Eliminar informe de despeses
+DeleteTrip=Suprimeix l'informe de despeses
 ConfirmDeleteTrip=Estàs segur que vols eliminar aquest informe de despeses?
 ListTripsAndExpenses=Llistat d'informes de despeses
 ListToApprove=Pendent d'aprovació
 ExpensesArea=Àrea d'informes de despeses
-ClassifyRefunded=Classificar 'Retornat'
+ClassifyRefunded=Classifica "Retornat"
 ExpenseReportWaitingForApproval=S'ha generat un nou informe de vendes per aprovació
 ExpenseReportWaitingForApprovalMessage=S'ha enviat un nou informe de despeses i està pendent d'aprovació. <br> - Usuari: %s <br> - Període: %s <br> Cliqueu aquí per validar: %s
 ExpenseReportWaitingForReApproval=S'ha generat un informe de despeses per a re-aprovació
@@ -27,16 +27,16 @@ ExpenseReportWaitingForReApprovalMessage=S'ha enviat un informe de despeses i es
 ExpenseReportApproved=S'ha aprovat un informe de despeses
 ExpenseReportApprovedMessage=S'ha aprovat l'informe de despeses %s. <br> - Usuari: %s <br> - Aprovat per: %s <br> Feu clic aquí per veure l'informe de despeses: %s
 ExpenseReportRefused=S'ha rebutjat un informe de despeses
-ExpenseReportRefusedMessage=El informe de despeses %s s'ha denegat. <br> - Usuari: %s <br> - Rebutjada per: %s <br> - Motiu de denegació: %s <br> Cliqueu aquí per veure l'informe de despeses: %s
+ExpenseReportRefusedMessage=L'informe de despeses %s s'ha denegat. <br> - Usuari: %s <br> - Rebutjat per: %s <br> - Motiu de denegació: %s <br> Cliqueu aquí per a veure l'informe de despeses: %s
 ExpenseReportCanceled=S'ha cancel·lat un informe de despeses
 ExpenseReportCanceledMessage=L'informe de despeses %s s'ha cancel·lat. <br> - Usuari: %s <br> - Cancel·lat per: %s <br> - Motiu de cancel·lació: %s <br> Cliqueu aquí per veure l'informe de despeses: %s
 ExpenseReportPaid=S'ha pagat un informe de despeses
-ExpenseReportPaidMessage=El informe de despeses %s s'ha pagat. <br> - Usuari: %s <br> - Pagat per: %s <br> Feu clic aquí per veure l'informe de despeses: %s
+ExpenseReportPaidMessage=L'informe de despeses %s s'ha pagat. <br> - Usuari: %s <br> - Pagat per: %s <br> Feu clic aquí per a veure l'informe de despeses: %s
 TripId=Id d'informe de despeses
 AnyOtherInThisListCanValidate=Persona a informar per a validar
 TripSociete=Informació de l'empresa
 TripNDF=Informacions de l'informe de despeses
-PDFStandardExpenseReports=Plantilla estàndard per generar un document PDF per l'informe de despeses
+PDFStandardExpenseReports=Plantilla estàndard per a generar un document PDF per a l'informe de despeses
 ExpenseReportLine=Línia de l'informe de despeses
 TF_OTHER=Altres
 TF_TRIP=Transport
@@ -73,7 +73,7 @@ EX_PAR_VP=PV d'aparcament
 EX_CAM_VP=PV de manteniment i reparació
 DefaultCategoryCar=Mode de transport per defecte
 DefaultRangeNumber=Número de rang per defecte
-UploadANewFileNow=Carrega ara un nou document
+UploadANewFileNow=Carrega ara un document nou
 Error_EXPENSEREPORT_ADDON_NotDefined=Error, la regla per a la numeració d'informes de despeses no es va definir a la configuració del mòdul "Informe de despeses"
 ErrorDoubleDeclaration=Has declarat un altre informe de despeses en un altre rang de dates semblant
 AucuneLigne=Encara no hi ha informe de despeses declarat
@@ -88,24 +88,24 @@ MOTIF_REFUS=Raó
 MOTIF_CANCEL=Raó
 DATE_REFUS=Data de denegació
 DATE_SAVE=Data de validació
-DATE_CANCEL=Data de cancelació
+DATE_CANCEL=Data de cancel·lació
 DATE_PAIEMENT=Data de pagament
 BROUILLONNER=Reobrir
 ExpenseReportRef=Ref. de l'informe de despeses
 ValidateAndSubmit=Validar i sotmetre a aprovació
 ValidatedWaitingApproval=Validat (pendent d'aprovació)
-NOT_AUTHOR=No ets l'autor d'aquest informe de despeses. L'operació s'ha cancelat.
+NOT_AUTHOR=No sou l’autor d’aquest informe de despeses. Operació cancel·lada.
 ConfirmRefuseTrip=Estàs segur que vols denegar aquest informe de despeses?
 ValideTrip=Aprova l'informe de despeses
 ConfirmValideTrip=Estàs segur que vols aprovar aquest informe de despeses?
 PaidTrip=Pagar un informe de despeses
-ConfirmPaidTrip=Estàs segur que vols canviar l'estatus d'aquest informe de despeses a "Pagat"?
+ConfirmPaidTrip=Esteu segur que voleu canviar l'estat d'aquest informe de despeses a "Pagat"?
 ConfirmCancelTrip=Estàs segur que vols cancel·lar aquest informe de despeses?
 BrouillonnerTrip=Tornar l'informe de despeses a l'estat "Esborrany"
-ConfirmBrouillonnerTrip=Estàs segur que vols moure aquest informe de despeses al estatus de "Esborrany"?
+ConfirmBrouillonnerTrip=Esteu segur que voleu traslladar aquest informe de despeses a l'estat "Esborrany"?
 SaveTrip=Valida l'informe de despeses
 ConfirmSaveTrip=Estàs segur que vols validar aquest informe de despeses?
-NoTripsToExportCSV=No hi ha informe de despeses per exportar en aquest període
+NoTripsToExportCSV=No hi ha cap informe de despeses per a exportar en aquest període.
 ExpenseReportPayment=Informe de despeses pagades
 ExpenseReportsToApprove=Informes de despeses per aprovar
 ExpenseReportsToPay=Informes de despeses a pagar
@@ -113,7 +113,7 @@ ConfirmCloneExpenseReport=Estàs segur de voler clonar aquest informe de despese
 ExpenseReportsIk=Configuració de les despeses de quilometratge
 ExpenseReportsRules=Normes d'informe de despeses
 ExpenseReportIkDesc=Podeu modificar el càlcul de les despeses de quilometratge per categoria i abast, els quals s'han definit anteriorment. <b>d</b> és la distància en quilòmetres
-ExpenseReportRulesDesc=Podeu crear o actualitzar les regles del càlcul. Aquesta part s'utilitzarà quan l'usuari crei un nou informe de despeses
+ExpenseReportRulesDesc=Podeu crear o actualitzar qualsevol regla de càlcul. Aquesta part s'utilitzarà quan l'usuari crei un informe de despeses nou
 expenseReportOffset=Decàleg
 expenseReportCoef=Coeficient
 expenseReportTotalForFive=Exemple amb <u>d</u> = 5
@@ -124,13 +124,13 @@ expenseReportCatDisabled=Categoria deshabilitada: consulteu el diccionari c_exp_
 expenseReportRangeDisabled=S'ha desactivat el rang: consulteu el diccionari c_exp_tax_range
 expenseReportPrintExample=offset + (d x coef) = %s
 ExpenseReportApplyTo=Aplicar a
-ExpenseReportDomain=Domini al que aplicar
+ExpenseReportDomain=Domini a aplicar
 ExpenseReportLimitOn=Limitar a
 ExpenseReportDateStart=Data inici
 ExpenseReportDateEnd=Data fi
 ExpenseReportLimitAmount=Import límit
 ExpenseReportRestrictive=Restrictiu
-AllExpenseReport=Tot tipus d'informe de despeses
+AllExpenseReport=Tots els tipus d’informe de despeses
 OnExpense=Línia de despesa
 ExpenseReportRuleSave=S'ha desat la regla de l'informe de despeses
 ExpenseReportRuleErrorOnSave=Error: %s
diff --git a/htdocs/langs/ca_ES/users.lang b/htdocs/langs/ca_ES/users.lang
index 8ec96cdf243..efd250617cd 100644
--- a/htdocs/langs/ca_ES/users.lang
+++ b/htdocs/langs/ca_ES/users.lang
@@ -6,7 +6,7 @@ Permission=Permís
 Permissions=Permisos
 EditPassword=Canviar contrasenya
 SendNewPassword=Enviar una contrasenya nova
-SendNewPasswordLink=Envia enllaç per reiniciar la contrasenya
+SendNewPasswordLink=Envia restabliment de contrasenya
 ReinitPassword=Generar una contrasenya nova
 PasswordChangedTo=Contrasenya modificada en: %s
 SubjectNewPassword=La teva nova paraula de pas per a %s
@@ -26,7 +26,7 @@ ConfirmDeleteGroup=Vols eliminar el grup <b>%s</b>?
 ConfirmEnableUser=Vols habilitar l'usuari <b>%s</b>?
 ConfirmReinitPassword=Vols generar una nova contrasenya per a l'usuari <b>%s</b>?
 ConfirmSendNewPassword=Vols generar i enviar una nova contrasenya per a l'usuari <b>%s</b>?
-NewUser=Nou usuari
+NewUser=Usuari nou
 CreateUser=Crear usuari
 LoginNotDefined=L'usuari no està definit
 NameNotDefined=El nom no està definit
@@ -40,7 +40,7 @@ DolibarrUsers=Usuaris Dolibarr
 LastName=Cognoms
 FirstName=Nom
 ListOfGroups=Llistat de grups
-NewGroup=Nou grup
+NewGroup=Grup nou
 CreateGroup=Crear el grup
 RemoveFromGroup=Eliminar del grup
 PasswordChangedAndSentTo=Contrasenya canviada i enviada a <b>%s</b>.
@@ -81,7 +81,7 @@ UserWillBeExternalUser=L'usuari creat serà un usuari extern (ja que està lliga
 IdPhoneCaller=ID trucant (telèfon)
 NewUserCreated=usuari %s  creat
 NewUserPassword=Contrasenya canviada per a %s
-NewPasswordValidated=La vostra nova contrasenya s’ha validat i s’ha d’utilitzar ara per iniciar la sessió.
+NewPasswordValidated=La vostra contrasenya nova s'ha validat i s'ha d'utilitzar ara per a iniciar la sessió.
 EventUserModified=Usuari %s modificat
 UserDisabled=Usuari %s deshabilitat
 UserEnabled=Usuari %s activat
diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang
index 7adb65909be..0995b6233bd 100644
--- a/htdocs/langs/ca_ES/website.lang
+++ b/htdocs/langs/ca_ES/website.lang
@@ -30,7 +30,6 @@ EditInLine=Editar en línia
 AddWebsite=Afegir lloc web
 Webpage=Pàgina/contenidor web
 AddPage=Afegeix pàgina/contenidor
-HomePage=Pàgina d'inici
 PageContainer=Pàgina
 PreviewOfSiteNotYetAvailable=Vista prèvia del seu lloc web <strong>%s</strong> encara no està disponible. Primer ha de '<strong>Importar plantilla web</strong>' o sols '<strong>Afegir pàgina/contenidor</strong>'.
 RequestedPageHasNoContentYet=La pàgina sol·licitada amb l'identificador %s encara no té contingut, o el fitxer de memòria cau .tpl.php s'ha eliminat. Edita el contingut de la pàgina per solucionar-ho.
@@ -101,7 +100,7 @@ EmptyPage=Pàgina buida
 ExternalURLMustStartWithHttp=L'URL externa ha de començar amb http:// o https://
 ZipOfWebsitePackageToImport=Carregueu el fitxer Zip del paquet de plantilles del lloc web
 ZipOfWebsitePackageToLoad=o trieu un paquet de plantilles de lloc web incrustat disponible
-ShowSubcontainers=Inclou contingut dinàmic
+ShowSubcontainers=Mostra contingut dinàmic
 InternalURLOfPage=URL interna de la pàgina
 ThisPageIsTranslationOf=Aquesta pàgina/contenidor és una traducció de
 ThisPageHasTranslationPages=Aquesta pàgina/contenidor té traducció
@@ -115,7 +114,7 @@ DeleteAlsoMedias=Voleu suprimir també tots els fitxers de mitjans específics d
 MyWebsitePages=Les meves pàgines web
 SearchReplaceInto=Cercar | Substituïu-lo a
 ReplaceString=Cadena nova
-CSSContentTooltipHelp=Introduïu aquí contingut CSS. Per evitar qualsevol conflicte amb el CSS de l’aplicació, assegureu-vos que preposeu tota declaració amb la classe .bodywebsite. Per exemple: <br><br> #mycssselector, input.myclass: hover {...} <br> ha de ser <br> .bodywebsite #mycssselector, .bodywebsite input.myclass: hover {...} <br><br> Nota: Si teniu un fitxer gran sense aquest prefix, podeu fer servir 'lessc' per convertir-lo per afegir el prefix .bodywebs site arreu.
+CSSContentTooltipHelp=Introduïu aquí contingut CSS. Per a evitar qualsevol conflicte amb el CSS de l’aplicació, assegureu-vos que preposeu tota declaració amb la classe .bodywebsite. Per exemple: <br><br> #mycssselector, input.myclass: hover {...} <br> ha de ser <br> .bodywebsite #mycssselector, .bodywebsite input.myclass: hover {...} <br><br> Nota: Si teniu un fitxer gran sense aquest prefix, podeu fer servir 'lessc' per a convertir-lo per a afegir el prefix .bodywebsite arreu.
 LinkAndScriptsHereAreNotLoadedInEditor=Avís: aquest contingut només es produeix quan s'accedeix al lloc des d'un servidor. No s'utilitza en mode Edit, de manera que si necessiteu carregar fitxers Javascript també en mode d'edició, només heu d'afegir la vostra etiqueta 'script src = ...' a la pàgina.
 Dynamiccontent=Exemple d’una pàgina amb contingut dinàmic
 ImportSite=Importa la plantilla del lloc web
@@ -137,3 +136,4 @@ RSSFeedDesc=Podeu obtenir un feed RSS dels darrers articles amb el tipus "blogpo
 PagesRegenerated=%s pàgina (es) / contenidor (s) regenerada
 RegenerateWebsiteContent=Regenera els fitxers de memòria cau del lloc web
 AllowedInFrames=Es permet en marcs
+DefineListOfAltLanguagesInWebsiteProperties=Definiu la llista de tots els idiomes disponibles a les propietats del lloc web.
diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang
index 6d70774d3ac..4f984f852ca 100644
--- a/htdocs/langs/ca_ES/withdrawals.lang
+++ b/htdocs/langs/ca_ES/withdrawals.lang
@@ -3,8 +3,8 @@ CustomersStandingOrdersArea=Cobraments per ordres de domiciliació bancària
 SuppliersStandingOrdersArea=Pagaments per transferència bancària
 StandingOrdersPayment=Ordres de cobrament per domiciliació
 StandingOrderPayment=Ordre de cobrament per domiciliació
-NewStandingOrder=Nova ordre de domiciliació bancària
-NewPaymentByBankTransfer=Nou pagament mitjançant transferència bancària
+NewStandingOrder=Domiciliació nova
+NewPaymentByBankTransfer=Pagament nou per transferència bancària
 StandingOrderToProcess=A processar
 PaymentByBankTransferReceipts=Ordres de transferència bancària
 PaymentByBankTransferLines=Línies d'ordres de transferència bancària
@@ -39,12 +39,13 @@ WithdrawStatistics=Estadístiques del pagament mitjançant domiciliació bancàr
 CreditTransferStatistics=Estadístiques de transferència bancària
 Rejects=Devolucions
 LastWithdrawalReceipt=Últims %s rebuts domiciliats
-MakeWithdrawRequest=Fer una petició de pagament per domiciliació bancària
-MakeBankTransferOrder=Fes una petició de transferència bancària
+MakeWithdrawRequest=Fes una sol·licitud de domiciliació
+MakeBankTransferOrder=Fes una sol·licitud de transferència
 WithdrawRequestsDone=%s domiciliacions registrades
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Codi bancari de tercers
 NoInvoiceCouldBeWithdrawed=Cap factura s'ha carregat amb èxit. Comproveu que els tercers de les factures tenen un IBAN vàlid i que IBAN té un RUM (Referència de mandat exclusiva) amb mode <strong>%s</strong>.
-ClassCredited=Classificar com "Abonada"
+ClassCredited=Classifica com "Abonada"
 ClassCreditedConfirm=Esteu segur de voler classificar aquesta domiciliació com abonada al seu compte bancari?
 TransData=Data enviament
 TransMetod=Mètode enviament
@@ -92,21 +93,21 @@ WithBankUsingBANBIC=Per als comptes bancaris que utilitzen el codi BAN/BIC/SWIFT
 BankToReceiveWithdraw=Recepció del compte bancari
 BankToPayCreditTransfer=Compte bancari utilitzat com a font de pagaments
 CreditDate=Abonada el
-WithdrawalFileNotCapable=No és possible generar el fitxer bancari de domiciliació pel país %s (El país no esta suportat)
+WithdrawalFileNotCapable=No es pot generar el fitxer de rebut de domiciliació del vostre país %s (El vostre país no és compatible)
 ShowWithdraw=Mostra l'ordre de domiciliació
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Tanmateix, si la factura té com a mínim una ordre de pagament de domiciliació bancària que encara no ha estat processada, no es definirà com a pagament per permetre la gestió prèvia de la retirada.
-DoStandingOrdersBeforePayments=Aquesta pestanya et permet sol·licitar una ordre de domiciliació. Un cop fet, ves al menú Banc->Cobrament per domiciliació per generar i gestionar l’ordre de domiciliació. Quan es tanqui l’ordre de domiciliació, es registrarà automàticament el cobrament de les factures i es tancaran les factures si no queda cobrament pendent.
-DoCreditTransferBeforePayments=Aquesta pestanya et permet sol·licitar una ordre de transferència bancària. Un cop fet, ves al menú Banc->Pagament per transferència bancària per generar i gestionar l’ordre de transferència bancària. Quan es tanqui l’ordre de transferència bancària, es registrarà automàticament el pagament de les factures i es tancaran les factures si no queda pagament pendent.
+DoStandingOrdersBeforePayments=Aquesta pestanya us permet sol·licitar una ordre de pagament per domiciliació bancària. Un cop fet això, aneu al menú Banc-> Pagament mitjançant domiciliació bancària per a generar i gestionar l’ordre de domiciliació bancària. Quan es tanca la comanda de domiciliació bancària, el pagament de les factures es registrarà automàticament i es tancaran les factures si la resta de pagament és nul·la.
+DoCreditTransferBeforePayments=Aquesta pestanya et permet sol·licitar una ordre de transferència bancària. Un cop feta, ves al menú Banc->Pagament per transferència bancària per agenerar i gestionar l’ordre de transferència bancària. Quan es tanqui l’ordre de transferència bancària, es registrarà automàticament el pagament de les factures i es tancaran les factures si no queda cap pagament pendent.
 WithdrawalFile=Fitxer de comanda de dèbit
 CreditTransferFile=Fitxer de transferència de crèdit
-SetToStatusSent=Classificar com "Arxiu enviat"
+SetToStatusSent=Estableix l'estat "Fitxer enviat"
 ThisWillAlsoAddPaymentOnInvoice=També registrarà els pagaments en les factures i els classificarà com a "Pagats" si resten a pagar és nul
 StatisticsByLineStatus=Estadístiques per estats de línies
 RUM=UMR
 DateRUM=Data de signatura del mandat
 RUMLong=Referència de mandat única (UMR)
 RUMWillBeGenerated=Si està buit, es generarà una UMR (Referència de mandat únic) una vegada que es guardi la informació del compte bancari.
-WithdrawMode=Modo de domiciliació bancària (FRST o RECUR)
+WithdrawMode=Mode de domiciliació bancària (FRST o RECUR)
 WithdrawRequestAmount=Import de la domiciliació
 BankTransferAmount=Import de la petició de transferència bancària:
 WithdrawRequestErrorNilAmount=No és possible crear una domiciliació sense import
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Data d'execució
 CreateForSepa=Crea un fitxer de domiciliació bancària
-ICS=Identificador de creditor CI
+ICS=Identificador de creditor CI per domiciliació bancària
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END=Etiqueta XML "EndToEndId" de SEPA - Id. Única assignada per transacció
 USTRD=Etiqueta XML de la SEPA "no estructurada"
 ADDDAYS=Afegiu dies a la data d'execució
@@ -146,3 +148,4 @@ InfoRejectSubject=Rebut de domiciliació bancària rebutjat
 InfoRejectMessage=Hola,<br><br>el rebut domiciliat de la factura %s relacionada amb la companyia %s, amb un import de %s ha estat rebutjada pel banc.<br><br>--<br>%s
 ModeWarning=No s'ha establert l'opció de treball en real, ens aturarem després d'aquesta simulació
 ErrorCompanyHasDuplicateDefaultBAN=L’empresa amb l’identificador %s té més d’un compte bancari per defecte. No hi ha manera de saber quin utilitzar.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/ca_ES/workflow.lang b/htdocs/langs/ca_ES/workflow.lang
index 0cbac959060..4b1de45aba8 100644
--- a/htdocs/langs/ca_ES/workflow.lang
+++ b/htdocs/langs/ca_ES/workflow.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - workflow
-WorkflowSetup=Configuració del mòdul workflow
+WorkflowSetup=Configuració del mòdul de flux de treball
 WorkflowDesc=Aquest mòdul ofereix algunes accions automàtiques. Per defecte, el flux de treball està obert (podeu fer les coses en l'ordre que vulgueu), però aquí podeu activar algunes accions automàtiques.
-ThereIsNoWorkflowToModify=No hi ha modificacions disponibles del fluxe de treball amb els mòduls activats.
+ThereIsNoWorkflowToModify=No hi ha disponibles modificacions del flux de treball amb els mòduls activats.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crea automàticament una comanda de client després de signar un pressupost (la nova comanda tindrà el mateix import que el pressupost)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crea automàticament una comanda de client després de signar un pressupost (la comanda nova tindrà el mateix import que el pressupost)
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crea automàticament una factura del client després de signar un pressupost (la nova factura tindrà el mateix import que el pressupost)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crear automàticament una factura a client després de validar un contracte
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crea automàticament una factura de client després de tancar una comanda de client (la nova factura tindrà el mateix import que la comanda)
diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang
index cc61eeb86f0..6ec2d245f88 100644
--- a/htdocs/langs/cs_CZ/accountancy.lang
+++ b/htdocs/langs/cs_CZ/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=Všechny země kromě %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Hlavní účetní účetnictví pro zákazníky, které nejsou definovány v nastavení
 MainAccountForSuppliersNotDefined=Hlavní účty účetnictví pro dodavatele, které nejsou definovány v nastavení
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Neprověřeno v účetním účtu
 XLineSuccessfullyBinded=%s Produkty / služby úspěšně spojené s účtem účetnictví
 XLineFailedToBeBinded=%s produkty / služby nebyly vázány na žádný účetní účet
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Počet prvků pro vazbu zobrazených na stránce (maximální doporučeno: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Začněte třídění stránky "Vazba na pověření" pomocí nejnovějších prvků
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Zahájit třídění na stránce „Prověření hotovo“ od nejnovějších prvků
 
@@ -198,7 +199,8 @@ Docdate=Datum
 Docref=Reference
 LabelAccount=Štítek účtu
 LabelOperation=Operace štítků
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Písmenový kód
 Lettering=Nápis
 Codejournal=Deník
@@ -206,7 +208,8 @@ JournalLabel=Označení časopisu
 NumPiece=počet kusů
 TransactionNumShort=Num. transakce
 AccountingCategory=Personalizované skupiny
-GroupByAccountAccounting=Seskupte účetní účet
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Zde můžete definovat některé skupiny účetních účtů. Budou se používat pro personalizované účetní výkazy.
 ByAccounts=Podle účtů
 ByPredefinedAccountGroups=Podle předdefinovaných skupin
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Platba není spojena s žádným produktem / službou
 OpeningBalance=Počáteční zůstatek
 ShowOpeningBalance=Zobrazit počáteční zůstatek
 HideOpeningBalance=Skrýt počáteční zůstatek
-ShowSubtotalByGroup=Zobrazit mezisoučet podle skupiny
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Skupina účtů
 PcgtypeDesc=Skupina účtů se používá jako předdefinovaná kritéria pro filtrování a seskupování pro některé účetní výkazy. Například „PŘÍJMY“ nebo „VÝDAJE“ se používají jako skupiny pro účetní účty produktů k sestavení výkazu nákladů / výnosů.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Zde si přečtěte seznam výkazů výdajů vázaných (
 DescVentilExpenseReportMore=Pokud nastavíte účetní účet na řádcích výkazu druhů výdajů, aplikace bude schopna provést veškerou vazbu mezi řádky výkazu výdajů a účetním účtem vašeho účtovacího schématu, a to jedním kliknutím tlačítkem <strong> "%s" </strong>. Pokud účet nebyl nastaven na slovník poplatků nebo máte stále nějaké řádky, které nejsou vázány na žádný účet, budete muset provést ruční vazbu z nabídky "<strong> %s </strong>".
 DescVentilDoneExpenseReport=Poraďte se zde seznam v souladu se zprávami výdajů a jejich poplatků účtování účtu
 
+Closure=Annual closure
 DescClosure=Zde se podívejte na počet pohybů za měsíc, kteří nejsou validováni a fiskální roky již otevřeny
 OverviewOfMovementsNotValidated=Krok 1 / Přehled pohybů neověřených. (Nezbytné uzavřít fiskální rok)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Ověřte pohyby
 DescValidateMovements=Jakékoli úpravy nebo vymazání písem, nápisů a vymazání budou zakázány. Všechny přihlášky na cvičení musí být validovány, jinak nebude možné uzavřít
-SelectMonthAndValidate=Vyberte měsíc a potvrďte pohyby
 
 ValidateHistory=Ověřit automaticky
 AutomaticBindingDone=Automatické vázání provedeno
@@ -293,6 +298,7 @@ Accounted=Účtováno v knize
 NotYetAccounted=Zatím nebyl zaznamenán v knize
 ShowTutorial=Zobrazit výuku
 NotReconciled=Nesladěno
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export pro LD Compta (v10 a vyšší)
 Modelcsv_openconcerto=Export pro OpenConcerto (Test)
 Modelcsv_configurable=Export CSV konfigurovatelný
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export pro Sage 50 Švýcarsko
 Modelcsv_winfic=Exportovat Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index 4a4c07061e4..1026908d2b1 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Zobrazení
 SetupArea=Nastavení
 UploadNewTemplate=Nahrát novou šablonu(y)
 FormToTestFileUploadForm=Formulář pro testování uploadu souborů (dle nastavení)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Poznámka: Ano má efekt pouze tehdy, pokud je aktivní modul <b>%s</b>
 RemoveLock=Odebrat / přejmenovat soubor <b> %s </b>, pokud existuje, povolit použití nástroje Update / Install.
 RestoreLock=Obnovte soubor <b>%s,</b> pouze s opravněním ke čtení, chcete-li zakázat jakékoliv použití aktualizačního nástroje.
@@ -85,7 +87,6 @@ ShowPreview=Zobrazit náhled
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Náhled není k dispozici
 ThemeCurrentlyActive=Téma aktivní
-CurrentTimeZone=Časové pásmo PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Data jsou uložena a vrácena databázovým serverem, jako kdyby byly uchovávány jako předložený řetězec. Časová zóna je účinná pouze při použití funkce UNIX_TIMESTAMP (která by Dolibarr neměla používat, takže databáze TZ by neměla mít žádný vliv, i když byla změněna po zadání dat).
 Space=Mezera
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Tato oblast poskytuje uživatelských funkcí. Pomocí nabí
 Purge=Očistit
 PurgeAreaDesc=Tato stránka umožňuje odstranit všechny soubory generované nebo uložené v Dolibarr (dočasné soubory nebo všechny soubory v adresáři <b> %s </b>). Použití této funkce není obvykle nutné. Je poskytována jako řešení pro uživatele, jejichž Dolibarr hostuje poskytovatel, který nenabízí oprávnění k odstranění souborů generovaných webovým serverem.
 PurgeDeleteLogFile=Odstranit soubory protokolu, včetně <b> %s </b> definované pro modul Syslog (bez rizika ztráty dat)
-PurgeDeleteTemporaryFiles=Odstraňte všechny dočasné soubory (bez rizika ztráty dat). Poznámka: Odstranění se provede pouze v případě, že dočasný adresář byl vytvořen před 24 hodinami.
-PurgeDeleteTemporaryFilesShort=Odstranit dočasné soubory
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Odstranit všechny soubory v adresáři: <b> %s </b>. <br> Tímto odstraníte všechny generované dokumenty související s prvky (subjekty, faktury atd.), Soubory nahrané do modulu ECM, zálohování databází a dočasné soubory.
 PurgeRunNow=Vyčistit nyní
 PurgeNothingToDelete=Žádný adresář nebo soubor k odstranění
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferovaní partneři
 OtherResources=jiné zdroje
 ExternalResources=Externí zdroje
 SocialNetworks=Sociální sítě
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=Pro uživatelskou nebo vývojářskou dokumentaci (Doc, FAQs ...) <br> navštivte Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
 ForAnswersSeeForum=V případě jakýchkoliv dalších dotazů nebo nápovědy použijte fórum Dolibarr: <br> <a href="%s" target="_blank"><b>%s</b></a>
 HelpCenterDesc1=Tato oblast slouží k získání nápovědy a podpory systému Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Příklady s aktuální konfigurací
 ListOfDirectories=Seznam adresářů šablon OpenDocument
 ListOfDirectoriesForModelGenODT=Seznam adresářů obsahující soubory šablon s formátem OpenDocument. <br> <br> Zde vložte úplnou cestu adresářů. <br> Přidejte návrat vozíku mezi adresářem eah. <br> Chcete-li přidat adresář modulu GED, přidejte zde <b> DOL_DATA_ROOT / ecm / yourdirectoryname </b>. <br> <br> Soubory v těchto adresářích musí končit <b> .odt </b> nebo <b> .ods </b>.
 NumberOfModelFilesFound=Počet souborů šablon ODT / ODS nalezených v těchto adresářích
-ExampleOfDirectoriesForModelGen=Příklady syntaxe: <br> c: \\ mydir <br> / Home / mydir <br> DOL_DATA_ROOT / ECM / ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Chcete-li vědět, jak vytvořit své ODT šablony dokumentů před jejich uložením do těchto adresářů, přečtěte si wiki dokumentace:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Pozice Jméno / Příjmení
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parametry k zajištění URL
 SecurityTokenIsUnique=Pro každou adresu URL použijte jedinečný bezpečnostní parametr
 EnterRefToBuildUrl=Zadejte odkaz na objekt %s
 GetSecuredUrl=Získejte vypočtenou URL
-ButtonHideUnauthorized=Skrýt tlačítka pro uživatele, kteří nejsou administrátory, pro neoprávněné akce namísto zobrazování šedých vypnutých tlačítek
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Staré Sazba DPH
 NewVATRates=Nová sazba DPH
 PriceBaseTypeToChange=Změňte ceny podle základní referenční hodnoty definované na
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalizované nabídky, které nejsou propojeny s
 NewMenu=Nová nabídka
 MenuHandler=Ovládání nabídek
 MenuModule=Zdrojový modul
-HideUnauthorizedMenu= Skrýt neautorizovaná menu (šedá)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id nabídka
 DetailMenuHandler=Ovládání nabídek, kde se má zobrazit nové menu
 DetailMenuModule=Název modulu, pokud položky nabídky pocházejí z modulu
@@ -1983,11 +1985,12 @@ EMailHost=Hostitel poštovního IMAP serveru
 MailboxSourceDirectory=Adresář zdrojové schránky
 MailboxTargetDirectory=Adresář cílové schránky
 EmailcollectorOperations=Operace prováděné sběratelem
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Maximální počet e-mailů shromážděných za sběr
 CollectNow=Sbírat nyní
 ConfirmCloneEmailCollector=Opravdu chcete klonovat sběratel e-mailů %s?
-DateLastCollectResult=Datum poslední vyzvednutí vyzkoušeno
-DateLastcollectResultOk=Datum poslední sbírat úspěšně
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Poslední výsledek
 EmailCollectorConfirmCollectTitle=Potvrzení sběru e-mailu
 EmailCollectorConfirmCollect=Chcete nyní spustit kolekci tohoto sběratele?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Vstupní kód nabídky (hlavní menu)
 ECMAutoTree=Zobrazit automatický strom ECM
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/cs_CZ/banks.lang b/htdocs/langs/cs_CZ/banks.lang
index 5dea684e67a..30f81d62472 100644
--- a/htdocs/langs/cs_CZ/banks.lang
+++ b/htdocs/langs/cs_CZ/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=Mandát SEPA
 YourSEPAMandate=Váš mandát SEPA
 FindYourSEPAMandate=Toto je vaše mandát SEPA, který autorizuje naši společnost, aby inkasovala inkasní příkaz k vaší bance. Vraťte jej podepsanou (skenování podepsaného dokumentu) nebo pošlete jej poštou
 AutoReportLastAccountStatement=Automaticky vyplňte pole "číslo bankovního výpisu" s posledním číslem výpisu při odsouhlasení
-CashControl=POS peněžní oplocení
-NewCashFence=Nový peněžní plot
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Zbarvujte pohyby
 BankColorizeMovementDesc=Pokud je tato funkce povolena, můžete vybrat konkrétní barvu pozadí pro pohyby debetů nebo kreditů
 BankColorizeMovementName1=Barva pozadí pro debetní pohyb
diff --git a/htdocs/langs/cs_CZ/blockedlog.lang b/htdocs/langs/cs_CZ/blockedlog.lang
index bb64468a731..2637c5675ae 100644
--- a/htdocs/langs/cs_CZ/blockedlog.lang
+++ b/htdocs/langs/cs_CZ/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donace logické odstranění
 logMEMBER_SUBSCRIPTION_CREATE=Členové odběry byly vytvořeny
 logMEMBER_SUBSCRIPTION_MODIFY=Členský odběr byl změněn
 logMEMBER_SUBSCRIPTION_DELETE=Členská logická smazání odběru
-logCASHCONTROL_VALIDATE=Zaznamenávání peněžních plotů
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Stažení faktury od zákazníka
 BlockedLogBillPreview=Zobrazení náhledu zákaznické faktury
 BlockedlogInfoDialog=Podrobnosti o protokolu
diff --git a/htdocs/langs/cs_CZ/boxes.lang b/htdocs/langs/cs_CZ/boxes.lang
index b7104985e78..cf4e76d8b8e 100644
--- a/htdocs/langs/cs_CZ/boxes.lang
+++ b/htdocs/langs/cs_CZ/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Nejnovější %s upravené dary
 BoxTitleLastModifiedExpenses=Nejnovější %s upravené výkazy výdajů
 BoxTitleLatestModifiedBoms=Poslední %s upravené kusovníky
 BoxTitleLatestModifiedMos=Poslední upravené výrobní zakázky %s
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Globální aktivita (faktury, návrhy, objednávky)
 BoxGoodCustomers=Dobří zákazníci
 BoxTitleGoodCustomers=%s Dobří zákazníci
+BoxScheduledJobs=Naplánované úlohy
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Nepodařilo se obnovit RSS zdroj. Poslední úspěšné datum obnovení: %s
 LastRefreshDate=Nejnovější datum obnovení
 NoRecordedBookmarks=Nejsou definované žádné záložky.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Účet pozastavení není definován
 BoxLastCustomerShipments=Poslední zásilky zákazníků
 BoxTitleLastCustomerShipments=Nejnovější %s zásilky zákazníků
 NoRecordedShipments=Žádná zaznamenaná zásilka zákazníka
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Účetnictví
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/cs_CZ/cashdesk.lang b/htdocs/langs/cs_CZ/cashdesk.lang
index e83a9e313de..58ca4072acb 100644
--- a/htdocs/langs/cs_CZ/cashdesk.lang
+++ b/htdocs/langs/cs_CZ/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Zápatí
 AmountAtEndOfPeriod=Částka na konci období (den, měsíc nebo rok)
 TheoricalAmount=Teoretická částka
 RealAmount=Skutečná částka
-CashFence=Hotovostní plot
-CashFenceDone=Peněžní oplatek za období
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Některé z faktur
 Paymentnumpad=Zadejte Pad pro vložení platby
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Modul číslování pro prodej POS
 CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> se používá k přidání čísla terminálu
 TakeposGroupSameProduct=Seskupte stejné produktové řady
 StartAParallelSale=Zahajte nový paralelní prodej
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Zavřete hotovostní plot
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Hotovostní zpráva
 MainPrinterToUse=Hlavní tiskárna k použití
 OrderPrinterToUse=Objednejte tiskárnu k použití
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/cs_CZ/categories.lang b/htdocs/langs/cs_CZ/categories.lang
index 53d6caa3877..fc7d27f5efa 100644
--- a/htdocs/langs/cs_CZ/categories.lang
+++ b/htdocs/langs/cs_CZ/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Oblast projektů značek/kategorií
 UsersCategoriesArea=Kategorie značek/kategorií uživatelů
 SubCats=Podkategorie
 CatList=Výpis tagů/kategorií
+CatListAll=List of tags/categories (all types)
 NewCategory=Nový tag/kategorie
 ModifCat=Upravit tag/kategorii
 CatCreated=Tag/kategorie byla vytvořená
@@ -65,16 +66,22 @@ UsersCategoriesShort=Uživatelské značky/kategorie
 StockCategoriesShort=Značky/kategorie skladů
 ThisCategoryHasNoItems=Tato kategorie neobsahuje žádné položky.
 CategId=ID tagu/kategorie
-CatSupList=Seznam tagů/kategorií dodavatelů
-CatCusList=Seznam tagů/kategorií zákazníků/cílů
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Seznam tagů/kategorií produktů
 CatMemberList=Seznam tagů/kategorií uživatelů
-CatContactList=Seznam kontaktů tagů/kategorií
-CatSupLinks=Spojení mezi dodavateli a tagy/kategoriemi
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Spojení mezi zákazníky/cíly a tagy/kategoriemi
 CatContactsLinks=Odkazy mezi kontakty/adresami a značkami/kategoriemi
 CatProdLinks=Spojení mezi produkty/službami a tagy/kategoriemi
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Spojení mezi uživateli a tagy/kategoriemi
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Odebrat z tagů/kategorií
 ExtraFieldsCategories=Doplňkové atributy
 CategoriesSetup=Nastavení tagů/kategorií
diff --git a/htdocs/langs/cs_CZ/companies.lang b/htdocs/langs/cs_CZ/companies.lang
index 19b9513ae7c..7f16ddead5c 100644
--- a/htdocs/langs/cs_CZ/companies.lang
+++ b/htdocs/langs/cs_CZ/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Zkontrolujte ID DPH uvnitř Společenství na webovýc
 VATIntraManualCheck=Můžete také zkontrolovat ručně na evropských stránkách <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Kontrola není možná. Služba není členským státem poskytována (%s).
 NorProspectNorCustomer=Ani cíl, ani zákazník
-JuridicalStatus=Typ právnické osoby
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Zaměstnanci
 ProspectLevelShort=Potenciální
diff --git a/htdocs/langs/cs_CZ/compta.lang b/htdocs/langs/cs_CZ/compta.lang
index 9e64b689ff2..b725f1ab696 100644
--- a/htdocs/langs/cs_CZ/compta.lang
+++ b/htdocs/langs/cs_CZ/compta.lang
@@ -111,7 +111,7 @@ Refund=Vrácení
 SocialContributionsPayments=Sociální / platby daně za
 ShowVatPayment=Zobrazit platbu DPH
 TotalToPay=Celkem k zaplacení
-BalanceVisibilityDependsOnSortAndFilters=pouze tehdy, pokud je řazen tabulka vzestupně na %s a filtrován 1 bankovního účtu je vidět v tomto seznamu Balance
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Zákaznický účetní kód
 SupplierAccountancyCode=dodavatelský účetní kód
 CustomerAccountancyCodeShort=Cust. účet. kód
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Opravdu chcete vymazat tuto sociální / daňovo
 ExportDataset_tax_1=Sociální a fiskální daně a platby
 CalcModeVATDebt=Režim <b>%sDPH zápočtu na závazky%s.</b>
 CalcModeVATEngagement=Režim <b>%sDPH z rozšířených příjmů%s.</b>
-CalcModeDebt=Analýza známých zaznamenaných faktur, a to i v případě, že ještě nejsou účtovány v účetní evidenci.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analýza známých zaznamenaných plateb, i když ještě nejsou účtovány v Ledgeru.
 CalcModeBookkeeping=Analýza údajů publikovaných v tabulce Účetnictví účetnictví.
 CalcModeLT1= Mod <b>%sRE na zákaznické faktury - dodavatelské faktury%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Bilance příjmů a výdajů, roční shrnutí
 AnnualByCompanies=Bilance příjmů a výdajů podle předem definovaných skupin účtů
 AnnualByCompaniesDueDebtMode=Bilance výnosů a nákladů, podrobnosti podle předdefinovaných skupin, režim <b> %sClaims-Debts%s</b> uvedl  <b>Účtování závazků</b> .
 AnnualByCompaniesInputOutputMode=Bilance výnosů a nákladů, podrobnosti podle předdefinovaných skupin, režim <b> %sInvestice-Výdaje%s </b> uvedl <b> hotovostní účetnictví </b>.
-SeeReportInInputOutputMode=Viz %sanalýza plateb %spro výpočet skutečných plateb, i když ještě nejsou účtovány v Ledgeru.
-SeeReportInDueDebtMode=Viz %sanalýza faktur %s pro výpočet založený na známých zaznamenaných fakturách, i když ještě nejsou účtovány v Ledgeru.
-SeeReportInBookkeepingMode=Viz část <b> %sKontrola report %s</b> pro výpočet na <b> Tabulce účtů účetnictví </b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Uvedené částky jsou se všemi daněmi
 RulesResultDue=- Zahrnuje nezaplacené faktury, výdaje, DPH, dary, ať už jsou či nejsou zaplaceny. Zahrnuje také placené platy. <br> - Je založen na fakturačním datu faktur a na datu splatnosti pro výdaje nebo platby daní. U platů definovaných modulem Plat se použije datum platby.
 RulesResultInOut=- To zahrnuje skutečné platby na fakturách, nákladů, DPH a platů. <br> - Je založen na datech plateb faktur, náklady, DPH a platů. Datum daru pro dárcovství.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Zobrazuje záznam ve vašem účtu s účetn
 SeePageForSetup=Viz menu <a href="%s"> %s </a> pro nastavení
 DepositsAreNotIncluded=- Zálohové faktury nejsou zahrnuty
 DepositsAreIncluded=- Zálohové faktury jsou zahrnuty
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Nahlásit daň 2 subjektu
 LT2ReportByCustomers=Oznámte daň 3 subjektu
 LT1ReportByCustomersES=Zpráva třetí strany RE
 LT2ReportByCustomersES=Zpráva o třetí straně IRPF
 VATReport=Zpráva o dani z prodeje
 VATReportByPeriods=Zpráva o dani z prodeje podle období
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Zpráva o dani z prodeje podle sazeb
 VATReportByThirdParties=Zpráva o dani z prodeje subjekty
 VATReportByCustomers=Zpráva o dani z prodeje zákazníkem
diff --git a/htdocs/langs/cs_CZ/cron.lang b/htdocs/langs/cs_CZ/cron.lang
index b2b351ec4e2..2301936582d 100644
--- a/htdocs/langs/cs_CZ/cron.lang
+++ b/htdocs/langs/cs_CZ/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Smazat naplánovanou úlohu
 Permission23104 = Provést naplánovanou úlohu
 # Admin
 CronSetup=Nastavení naplánovaných úloh
-URLToLaunchCronJobs=URL ke kontrole a spuštění úlohy v případě potřeby
-OrToLaunchASpecificJob=Nebo zkontrolovat a zahájit konkrétní práci
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Bezpečnostní klíč URL spuštění úlohy
 FileToLaunchCronJobs=Příkazový řádek pro kontrolu a spuštění kvalifikovaných úloh v cronu
 CronExplainHowToRunUnix=Na Unixových systémech by jste měli použít následující položku crontab ke spuštění příkazového řádku každých 5 minut
 CronExplainHowToRunWin=V prostředí Microsoft  Windows můžete pomocí nástrojů Naplánované úlohy spustit příkazový řádek každých 5 minut
 CronMethodDoesNotExists=Třída %s neobsahuje žádné metody %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Profily úloh Cron jsou definovány do souboru deskriptoru modulu. Když je modul aktivován, jsou načteny a dostupné, takže můžete spravovat úlohy z nabídky nástrojů admin %s.
 CronJobProfiles=Seznam předdefinovaných úloh profilu cron
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Počet spuštění
 CronMaxRun=Maximální počet spuštění
 CronEach=Každý
 JobFinished=Práce zahájena a dokončena
+Scheduled=Scheduled
 #Page card
 CronAdd= Přidat práci
 CronEvery=Vykonat práci každý
@@ -56,7 +58,7 @@ CronNote=Komentář
 CronFieldMandatory=Pole %s je povinné
 CronErrEndDateStartDt=Datum ukončení nemůže být před datem zahájení
 StatusAtInstall=Stav při instalaci modulu
-CronStatusActiveBtn=Umožnit
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Zakázat
 CronTaskInactive=Tato úloha je zakázána
 CronId=Id
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=Záloha lokální databáze
 MakeLocalDatabaseDump=Vytvoření výpisu místní databáze. Parametry jsou: komprese ('gz' nebo 'bz' nebo 'none'), zálohovací typ ('mysql', 'pgsql', 'auto'),
 WarningCronDelayed=Pozor, pokud jde o výkonnost, bez ohledu na to, co je příštím datem provedení povolených úloh, mohou být vaše úlohy zpožděny maximálně do %s hodin, než budou spuštěny.
 DATAPOLICYJob=Čistič dat a anonymizér
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index a9028d01278..0be889628dc 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Žádná chyba, jsme se nedopustili
 # Errors
 ErrorButCommitIsDone=Byly nalezeny chyby, ale přesto jsme provedli ověření. Snad to pojede ....
 ErrorBadEMail=E-mail %s je špatný
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s je špatně
 ErrorBadValueForParamNotAString=Špatná hodnota parametru. Připojí se obecně, když chybí překlad.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Přihlášení %s již existuje.
 ErrorGroupAlreadyExists=Skupina %s již existuje.
 ErrorRecordNotFound=Záznam není nalezen.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Některá povinná pole nebyla vyplněna.  Neflákejte to !!
 ErrorSubjectIsRequired=Předmět e-mailu je povinný
 ErrorFailedToCreateDir=Nepodařilo se vytvořit adresář. Zkontrolujte, zda má uživatel webového serveru oprávnění zapisovat do adresáře dokumentů Dolibarr. Pokud je v tomto PHP aktivován parametr <b> safe_mode</b>, zkontrolujte, zda jsou soubory Dolibarr php vlastní uživateli (nebo skupinou) webového serveru.
 ErrorNoMailDefinedForThisUser=Pro tohoto uživatele není definován žádný e-mail
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Tato funkce vyžaduje zapnutí javascriptu pro práci. Změňte nastavení v zobrazení nastavení.
 ErrorTopMenuMustHaveAParentWithId0=Nabídka typu "Top" nemůže mít nadřazenou nabídku. Vložte 0 do rodičovského menu nebo zvolte nabídku typu "Vlevo".
 ErrorLeftMenuMustHaveAParentId=Nabídka typu "Left" musí mít nadřazený identifikátor.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Toto jméno profilu již existuje pro tuto exportní
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP shoda není dokončena.
 ErrorLDAPMakeManualTest=Soubor .ldif byl vygenerován v adresáři %s. Pokuste se jej z příkazového řádku ručně načíst a získat další informace o chybách.
 ErrorCantSaveADoneUserWithZeroPercentage=Nelze uložit akci s "stav nebyl spuštěn", pokud je vyplněn také pole "provedeno".
-ErrorRefAlreadyExists=Ref používané pro vytváření již existuje.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Zadejte prosím název výpisu banky, na kterém má být záznam zaznamenán (formát YYYYMM nebo YYYYMMDD)
 ErrorRecordHasChildren=Záznam se nepodařilo smazat, protože má některé podřízené záznamy.
 ErrorRecordHasAtLeastOneChildOfType=Objekt má alespoň jeden podřízený záznam typu %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Musíte zvolit, zda je článek p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=Sleva, kterou se pokoušíte použít, je větší než platba. Rozdělte slevu ve 2 menších slevách dříve. A moc to nepřehánějte ....
 ErrorFileNotFoundWithSharedLink=Soubor nebyl nalezen. Může být změněn klíč sdílení nebo nedávno odstraněn soubor.
 ErrorProductBarCodeAlreadyExists=Výrobní čárový kód %s již existuje u jiného odkazu na produkt.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Všimněte si také, že použití virtuálního produktu k automatickému zvýšení / snížení podprogramů není možné, pokud alespoň jeden subprodukt (nebo subprodukt subproduktů) potřebuje číslo seriálu / šarže.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Popis je povinný pro linky s volným produktem
 ErrorAPageWithThisNameOrAliasAlreadyExists=Stránka / kontejner <strong> %s</strong> má stejný název nebo jiný alias, než ten, který se pokoušíte použít
 ErrorDuringChartLoad=Při načtení tabulky účtů došlo k chybě. Pokud nebylo načteno několik účtů, můžete je zadat ručně.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Chyba, řetězec, který chcete nahradit, je prázdný
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Veřejné rozhraní nebylo povoleno
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Váš parametr PHP upload_max_filesize (%s) je vyšší než parametr PHP post_max_size (%s). Toto není konzistentní nastavení.
 WarningPasswordSetWithNoAccount=Pro tohoto člena bylo nastaveno heslo. Nebyl však vytvořen žádný uživatelský účet. Toto heslo je uloženo, ale nemůže být použito pro přihlášení k Dolibarr. Může být použito externím modulem / rozhraním, ale pokud nemáte pro člena definováno žádné přihlašovací jméno ani heslo, můžete vypnout možnost "Správa přihlášení pro každého člena" z nastavení modulu člena. Pokud potřebujete spravovat přihlašovací údaje, ale nepotřebujete žádné heslo, můžete toto pole ponechat prázdné, abyste se tomuto varování vyhnuli. Poznámka: E-mail může být také použit jako přihlašovací jméno, pokud je člen připojen k uživateli.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Vaše přihlašovací údaje byly změně
 WarningAnEntryAlreadyExistForTransKey=Položka již existuje pro překladatelské klíč pro tento jazyk
 WarningNumberOfRecipientIsRestrictedInMassAction=Upozornění: počet různých příjemců je omezen na <b> %s </b> při použití hromadných akcí v seznamech
 WarningDateOfLineMustBeInExpenseReportRange=Upozornění: datum řádku není v rozsahu výkazu výdajů
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Projekt je uzavřen. Nejprve je musíte znovu otevřít.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Některé bankovní transakce byly odstraněny poté, co byly vygenerovány potvrzení včetně těchto. Počet kontrol a celkový příjem se tedy může lišit od počtu a celkového počtu v seznamu. Špek pro případnou kontrolu !!
-WarningFailedToAddFileIntoDatabaseIndex=Výstraha: Nepodařilo se přidat položku souboru do indexové tabulky databáze ECM
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/cs_CZ/exports.lang b/htdocs/langs/cs_CZ/exports.lang
index 85d98be9e68..34c0d9b41d6 100644
--- a/htdocs/langs/cs_CZ/exports.lang
+++ b/htdocs/langs/cs_CZ/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Klíč (sloupec), který chcete použít pro <b> aktualizaci
 NbInsert=Počet vložených řádků: %s
 NbUpdate=Počet aktualizovaných řádků: %s
 MultipleRecordFoundWithTheseFilters=Bylo nalezeno více záznamů s těmito filtry: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/cs_CZ/mails.lang b/htdocs/langs/cs_CZ/mails.lang
index aad25597cf4..34643b05d34 100644
--- a/htdocs/langs/cs_CZ/mails.lang
+++ b/htdocs/langs/cs_CZ/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emaily zadávané uživatelem
 MailingModuleDescDolibarrUsers=Uživatelé s e-maily
 MailingModuleDescThirdPartiesByCategories=Subjekty (podle kategorií)
 SendingFromWebInterfaceIsNotAllowed=Odesílání z webového rozhraní není povoleno.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Řádek  %s v souboru
@@ -125,12 +126,13 @@ TagMailtoEmail=E-mail příjemce (včetně html odkazu "mailto:")
 NoEmailSentBadSenderOrRecipientEmail=Žádný e-mail nebyl odeslán. Špatný e-mail odesílatele nebo příjemce. Ověřte profil uživatele.
 # Module Notifications
 Notifications=Upozornění
-NoNotificationsWillBeSent=Nejsou plánovány žádná e-mailová oznámení pro tuto událost nebo společnost
-ANotificationsWillBeSent=1 notifikace bude zaslána e-mailem
-SomeNotificationsWillBeSent=%s oznámení bude zasláno e-mailem
-AddNewNotification=Aktivace cíle pro  nové e-mailové upozornění
-ListOfActiveNotifications=Seznam všech aktivních cílů / událostí pro oznámení emailem
-ListOfNotificationsDone=Vypsat všechny odeslané e.mailové oznámení
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Konfigurace odesílání e-maiů byla nastavena tak, aby '%s'. Tento režim nelze použít k odesílání hromadných e-mailů.
 MailSendSetupIs2=Nejprve je nutné jít s admin účtem, do nabídky%sHome - Nastavení - e-maily%s pro změnu parametru <strong>"%s"</strong> do režimu použít "%s". V tomto režimu, můžete zadat nastavení serveru SMTP vašeho  poskytovatele služeb internetu a používat hromadnou e-mailovou funkci.
 MailSendSetupIs3=Pokud máte nějaké otázky o tom, jak nastavit SMTP server, můžete se zeptat na%s, nebo si prostudujte dokumentaci vašeho poskytovatele. \nPoznámka: V současné době bohužel většina serverů nasazuje služby pro filtrování nevyžádané pošty a různé způsoby ověřování odesilatele. Bez detailnějších znalostí a nastavení vašeho SMTP serveru se vám bude vracet většina zpráv jako nedoručené.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Importovaný soubor musí mít formát <strong> e-mai
 UseFormatInputEmailToTarget=Zadejte řetězec s formátem <strong> e-mail; jméno; první jméno; další </strong>
 MailAdvTargetRecipients=Příjemci (rozšířený výběr)
 AdvTgtTitle=Vyplňte vstupní pole, chcete-li předvolit subjekty nebo kontakty / adresy, na které chcete cílit
-AdvTgtSearchTextHelp=Jako zástupné znaky použijte %%. Chcete-li například najít všechny položky jako <b> jean, joe, jim</b>, můžete zadat <b> j%%</b>, můžete také použít; jako oddělovač pro hodnotu a použití pro tuto hodnotu. Například<b>jim%%; jimo; jima% </b> bude zaměřen na všechny jean, joe, začít s jim, ale ne jimo a ne všechno, co začíná jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Pomocí intervalu vyberte hodnotu int nebo float
 AdvTgtMinVal=Minimální hodnota
 AdvTgtMaxVal=Maximální hodnota
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Vytvořte filtr
 AdvTgtOrCreateNewFilter=Název nového filtru
 NoContactWithCategoryFound=Žádný kontakt / adresa s nalezenou kategorií
 NoContactLinkedToThirdpartieWithCategoryFound=Žádný kontakt / adresa s nalezenou kategorií
-OutGoingEmailSetup=Nastavení odchozí pošty
-InGoingEmailSetup=Příchozí nastavení e-mailu
-OutGoingEmailSetupForEmailing=Nastavení odchozí pošty (pro modul %s)
-DefaultOutgoingEmailSetup=Výchozí nastavení odchozí pošty
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Informace
 ContactsWithThirdpartyFilter=Kontakty s filtrem subjektu
 Unanswered=Unanswered
 Answered=Odpovězeno
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index b2fcda76ae4..b499c548007 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Pro tento typ e-mailu není k dispozici žádná šablona
 AvailableVariables=K dispozici substituční proměnné
 NoTranslation=Překlad není
 Translation=Překlad
+CurrentTimeZone=Časové pásmo PHP (server)
 EmptySearchString=Zadejte neprázdná kritéria vyhledávání
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Nebyl nalezen žádný záznam
 NoRecordDeleted=Žádný záznam nebyl smazán
 NotEnoughDataYet=Nedostatek dat
@@ -85,6 +87,8 @@ FileWasNotUploaded=Soubor vybrán pro připojení, ale ještě nebyl nahrán. Kl
 NbOfEntries=Počet vstupů
 GoToWikiHelpPage=Přečtěte si online nápovědu (přístup k internetu je potřeba)
 GoToHelpPage=Přečíst nápovědu
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Domovská stránka
 RecordSaved=Záznam uložen
 RecordDeleted=Záznam smazán
 RecordGenerated=Záznam byl vygenerován
@@ -433,6 +437,7 @@ RemainToPay=Zbývá platit
 Module=Modul/aplikace
 Modules=Moduly/aplikace
 Option=Volba
+Filters=Filters
 List=Seznam
 FullList=Plný seznam
 FullConversation=Plná konverzace
@@ -671,7 +676,7 @@ SendMail=Odeslat e-mail
 Email=E-mail
 NoEMail=Žádný e-mail
 AlreadyRead=Již jste si přečetli
-NotRead=Nepřečetl
+NotRead=Nepřečtený
 NoMobilePhone=Žádné telefonní číslo
 Owner=Majitel
 FollowingConstantsWillBeSubstituted=Následující konstanty budou nahrazeny odpovídající hodnotou.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=Pozdržen
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/cs_CZ/modulebuilder.lang b/htdocs/langs/cs_CZ/modulebuilder.lang
index 51093a410ec..325c3fe3b52 100644
--- a/htdocs/langs/cs_CZ/modulebuilder.lang
+++ b/htdocs/langs/cs_CZ/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP stránku pro vytvoření / úpravu / prohlížení zá
 PageForAgendaTab=Stránka PHP pro kartu události
 PageForDocumentTab=Stránka PHP pro kartu dokumentu
 PageForNoteTab=Stránka PHP pro kartu poznámky
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Cesta k zip modulu / aplikačního balíčku
 PathToModuleDocumentation=Cesta k souboru dokumentace modulu/aplikace (%s)
 SpaceOrSpecialCharAreNotAllowed=Mezery nebo speciální znaky nejsou povoleny.
@@ -77,7 +78,7 @@ IsAMeasure=Je to opatření
 DirScanned=Adresář naskenován
 NoTrigger=Žádný spouštěč
 NoWidget=Žádný widget
-GoToApiExplorer=Přejděte na prohlížeč rozhraní API
+GoToApiExplorer=API explorer
 ListOfMenusEntries=Seznam položek menu
 ListOfDictionariesEntries=Seznam položek slovníků
 ListOfPermissionsDefined=Seznam definovaných oprávnění
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Pokud máte znalosti o SQL a PHP, můžete použít pr
 SeeTopRightMenu=Viz <span class="fa fa-bug"> </span> v pravé horní nabídce
 AddLanguageFile=Přidat jazyk
 YouCanUseTranslationKey=Zde můžete použít klíč, který je překladatelským klíčem nalezeným v jazykovém souboru (viz záložka "Jazyky")
-DropTableIfEmpty=(Vymazat tabulku, pokud je prázdná)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=Tabulka %s neexistuje
 TableDropped=Tabulka %s byla smazána
 InitStructureFromExistingTable=Vytvořte řetězec struktury pole existující tabulky
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Použijte specifickou adresu URL editoru
 UseSpecificFamily = Použijte konkrétní rodinu
 UseSpecificAuthor = Použijte specifického autora
 UseSpecificVersion = Použijte specifickou počáteční verzi
-ModuleMustBeEnabled=Nejprve musí být aktivován modul / aplikace
 IncludeRefGeneration=Odkaz na objekt musí být generován automaticky
 IncludeRefGenerationHelp=Zaškrtněte toto, pokud chcete zahrnout kód pro automatické generování reference
 IncludeDocGeneration=Chci z objektu vygenerovat nějaké dokumenty
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Typ polí: <br> varchar (99), dvojitý (24,8), reálný, text,
 AsciiToHtmlConverter=Převodník ASCII na HTML
 AsciiToPdfConverter=Převodník ASCII na PDF
 TableNotEmptyDropCanceled=Tabulka není prázdná. Odstranění tabulky bylo zrušeno.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/cs_CZ/other.lang b/htdocs/langs/cs_CZ/other.lang
index ba0a69321c7..03a2397864f 100644
--- a/htdocs/langs/cs_CZ/other.lang
+++ b/htdocs/langs/cs_CZ/other.lang
@@ -5,8 +5,6 @@ Tools=Nástroje
 TMenuTools=Nástroje
 ToolsDesc=Všechny nástroje, které nejsou zahrnuty v jiných položkách nabídky, jsou zde seskupeny. <br> Všechny nástroje jsou přístupné v levém menu.
 Birthday=Narozeniny
-BirthdayDate=datum narozenin
-DateToBirth=Datum narození
 BirthdayAlertOn=Připomenutí narozenin aktivní
 BirthdayAlertOff=Připomenutí narozenin neaktivní
 TransKey=Překlad klíčů TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Předchozí měsíc (číslo 1-12) data faktury
 TextPreviousMonthOfInvoice=Předchozí měsíc (text) data faktury
 NextMonthOfInvoice=Následující měsíc (číslo 1-12) data faktury
 TextNextMonthOfInvoice=Následující měsíc (text) data faktury
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip soubor generovaný do <b> %s </b>.
 DocFileGeneratedInto=Soubor Doc generován do <b> %s </b>.
 JumpToLogin=Odpojeno. Přejít na přihlašovací stránku ...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Ahoj)__\n\nNajděte prosím dodací lhůtu
 PredefinedMailContentSendFichInter=__(Ahoj)__\n\nNajděte zásah __REF__\n\n\n__(S pozdravem)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Klepnutím na níže uvedený odkaz proveďte platbu, pokud ještě není hotovo.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Ahoj)__\n\n\n__(S pozdravem)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr je kompaktní ERP/CRM systém, který se  skládá z více funkčních modulů. Demo, které obsahuje všechny moduly vám nepředstaví všechny možnosti, protože v reálné situaci všechny moduly najednou používat nebudete.  Pro lepší a snadnější seznámení s celým systémem máte k dispozici několik demo profilů lépe vystihujících vaše požadavky. 
 ChooseYourDemoProfil=Vyberte demo profil, který nejlépe odpovídá vaší činnosti, nebo zaměření ...
 ChooseYourDemoProfilMore=... nebo vytvořit vlastní profil <br> (manuální výběr požadovaných modulů)
@@ -137,7 +138,7 @@ Right=Pravý
 CalculatedWeight=Vypočtená hmotnost
 CalculatedVolume=Vypočtený objem
 Weight=Hmotnost
-WeightUnitton=tuna
+WeightUnitton=tón
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Kontakt/adresa vytvořená sběratelem e-mailů z
 ProjectCreatedByEmailCollector=Projekt vytvořený sběratelem e-mailů z e-mailu MSGID %s
 TicketCreatedByEmailCollector=Lístek vytvořený sběratelem e-mailů z e-mailu MSGID %s
 OpeningHoursFormatDesc=Pomocí a - oddělte otevírací a zavírací dobu. <br> Pomocí mezery zadejte různé rozsahy. <br> Příklad: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exportní plocha
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index 239f764a81b..ea05be2a28b 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Více cenových segmentů na produkt / službu (každý zákazník je v jednom cenovém segmentu)
 MultiPricesNumPrices=Počet cen
 DefaultPriceType=Základ cen za prodlení (s versus bez daně) při přidávání nových prodejních cen
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Počet výchozích balení výrobku
@@ -167,8 +168,10 @@ BuyingPrices=Nákupní ceny
 CustomerPrices=Zákaznické ceny
 SuppliersPrices=Ceny prodejců
 SuppliersPricesOfProductsOrServices=Ceny prodejců (produktů nebo služeb)
-CustomCode=Kód cla / komodity / HS
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Země původu
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Druh produktu (materiál / hotový)
 NatureOfProductShort=Druh produktu
 NatureOfProductDesc=Surovina nebo hotový produkt
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Použijte pevnou cenu
 PriceByQuantity=Různé ceny podle množství
 DisablePriceByQty=Zakázat ceny podle množství
 PriceByQuantityRange=Množstevní rozsah
-MultipriceRules=Pravidla segmentu cen
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Použijte pravidla segmentu cen (definovaná v nastavení modulu produktu) pro automatické výpočty cen všech ostatních segmentů podle prvního segmentu
 PercentVariationOver=%% variace přes %s
 PercentDiscountOver=%% sleva na %s
diff --git a/htdocs/langs/cs_CZ/recruitment.lang b/htdocs/langs/cs_CZ/recruitment.lang
index e8f2b878873..e60db728965 100644
--- a/htdocs/langs/cs_CZ/recruitment.lang
+++ b/htdocs/langs/cs_CZ/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/cs_CZ/sendings.lang b/htdocs/langs/cs_CZ/sendings.lang
index 94d137ed4a6..61d599a95a7 100644
--- a/htdocs/langs/cs_CZ/sendings.lang
+++ b/htdocs/langs/cs_CZ/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Další zásilky pro tuto objednávku
 SendingsAndReceivingForSameOrder=Zásilky a potvrzení o této objednávce
 SendingsToValidate=Zásilky se ověřují
 StatusSendingCanceled=Zrušený
+StatusSendingCanceledShort=Zrušený
 StatusSendingDraft=Návrh
 StatusSendingValidated=Ověřené (výrobky pro dodávku nebo již dodány)
 StatusSendingProcessed=Zpracované
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Nejprve musíte potvrdit objednávku před tím
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Více kompletních modelů dokumentů pro potvrzení o doručení (logo. ..)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstanta EXPEDITION_ADDON_NUMBER není definována
 SumOfProductVolumes=Součet objemu produktů
 SumOfProductWeights=Součet hmotnosti produktů
diff --git a/htdocs/langs/cs_CZ/stocks.lang b/htdocs/langs/cs_CZ/stocks.lang
index 25558173d1a..be798ca0ade 100644
--- a/htdocs/langs/cs_CZ/stocks.lang
+++ b/htdocs/langs/cs_CZ/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/cs_CZ/ticket.lang b/htdocs/langs/cs_CZ/ticket.lang
index 83a4e3cd4e6..268ab00719c 100644
--- a/htdocs/langs/cs_CZ/ticket.lang
+++ b/htdocs/langs/cs_CZ/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Vstupenka - Typy
 TicketDictCategory=Vstupenka - skupiny
 TicketDictSeverity=Vstupenka - závažnosti
 TicketDictResolution=Vstupenka - rozlišení
-TicketTypeShortBUGSOFT=Logika Dysfonctionnement
-TicketTypeShortBUGHARD=Dysfonctionnement matériel -nějaký mišmaš ???
-TicketTypeShortCOM=Obchodní otázka
 
+TicketTypeShortCOM=Obchodní otázka
 TicketTypeShortHELP=Žádost o funkční pomoc
 TicketTypeShortISSUE=Problém, chyba nebo problém
 TicketTypeShortREQUEST=Žádost o změnu nebo vylepšení
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Jiný
 TicketSeverityShortLOW=Nízký
 TicketSeverityShortNORMAL=Normální
 TicketSeverityShortHIGH=Vysoký
-TicketSeverityShortBLOCKING=Kritické / Blokování
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Pole '%s' nesprávné
 MenuTicketMyAssign=Moje jízdenky
@@ -60,7 +58,6 @@ OriginEmail=Zdroj e-mailu
 Notify_TICKET_SENTBYMAIL=Odeslat e-mailem zprávu o lince
 
 # Status
-NotRead=Nepřečetl
 Read=Číst
 Assigned=Přidělené
 InProgress=probíhá
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Veřejné rozhraní umožňuje všem návšt
 TicketsAutoAssignTicket=Automaticky přiřadit uživateli, který vytvořil lístek
 TicketsAutoAssignTicketHelp=Při tvorbě vstupenky může být uživateli automaticky přiřazen lístek.
 TicketNumberingModules=Modul číslování vstupenek
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Upozornit subjekt na vytvoření
 TicketsDisableCustomerEmail=Pokud je lístek vytvořen z veřejného rozhraní, vždy zakažte e-maily
 TicketsPublicNotificationNewMessage=Po přidání nové zprávy odešlete e-mail(y)
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Stav změněn: %s až %s
 TicketNotNotifyTiersAtCreate=Neinformovat společnost na vytvoření
 Unread=Nepřečtený
 TicketNotCreatedFromPublicInterface=Není dostupný. Vstupenka nebyla vytvořena z veřejného rozhraní.
-PublicInterfaceNotEnabled=Veřejné rozhraní nebylo povoleno
 ErrorTicketRefRequired=Je vyžadován referenční název vstupenky
 
 #
diff --git a/htdocs/langs/cs_CZ/website.lang b/htdocs/langs/cs_CZ/website.lang
index cf30e5bd64d..1fb8d39059e 100644
--- a/htdocs/langs/cs_CZ/website.lang
+++ b/htdocs/langs/cs_CZ/website.lang
@@ -30,7 +30,6 @@ EditInLine=Úpravy v řádku
 AddWebsite=Přidat webovou stránku
 Webpage=Webová stránka / kontejner
 AddPage=Přidat stránku / kontejner
-HomePage=Domovská stránka
 PageContainer=Strana
 PreviewOfSiteNotYetAvailable=Náhled vašeho webu <strong> %s </strong> zatím není k dispozici. Nejprve musíte '<strong> Importovat celou šablonu webových stránek </strong>' nebo jen '<strong> Přidat stránku / kontejner </strong>'.
 RequestedPageHasNoContentYet=Požadovaná stránka s ID %s nemá dosud žádný obsah nebo byl odstraněn soubor cache .tpl.php. Upravte obsah stránky pro vyřešení tohoto problému.
@@ -101,7 +100,7 @@ EmptyPage=Prázdná stránka
 ExternalURLMustStartWithHttp=Externí adresa URL musí začít s http: // nebo https: //
 ZipOfWebsitePackageToImport=Nahrajte soubor ZIP balíčku šablony webové stránky
 ZipOfWebsitePackageToLoad=nebo Vyberte dostupný balíček integrovaných webových stránek
-ShowSubcontainers=Zahrnout dynamický obsah
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Interní adresa URL stránky
 ThisPageIsTranslationOf=Tato stránka / kontejner je překladem
 ThisPageHasTranslationPages=Tato stránka / kontejner obsahuje překlad
@@ -137,3 +136,4 @@ RSSFeedDesc=Pomocí této adresy URL můžete získat RSS kanál nejnovějších
 PagesRegenerated=%s regenerováno stránky / kontejnery
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/cs_CZ/withdrawals.lang b/htdocs/langs/cs_CZ/withdrawals.lang
index 1d5f1bb8ada..cb303de282d 100644
--- a/htdocs/langs/cs_CZ/withdrawals.lang
+++ b/htdocs/langs/cs_CZ/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Poslední %s přímého inkasa debetní
 MakeWithdrawRequest=Zadejte žádost o platbu inkasem
 MakeBankTransferOrder=Proveďte žádost o převod
 WithdrawRequestsDone=%s zaznamenané žádosti o inkaso
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Kód banky subjektu
 NoInvoiceCouldBeWithdrawed=Žádná faktura nebyla odepsána úspěšně. Zkontrolujte, zda jsou faktury u společností s platným IBAN a zda má IBAN UMR (Unique Mandate Reference) s režimem <strong> %s </strong>.
 ClassCredited=Označit přidání kreditu
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Datum provedení
 CreateForSepa=Vytvořte soubor s inkasem
-ICS=Identifikátor věřitele CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - jedinečný identifikátor přiřazený ke každé transakci
 USTRD="Nestrukturovaná" značka SEPA XML
 ADDDAYS=Přidání dnů do data provedení
@@ -146,3 +148,4 @@ InfoRejectSubject=Příkaz k inkasu odmítnut
 InfoRejectMessage=Dobrý den, <br> <br> příkaz k inkasu faktury %s týkající se společnosti %s, částkou %s, byla bankou odmítnuta. <br> <br> - <br> %s
 ModeWarning=Volba pro reálný režim nebyl nastaven, můžeme zastavit tuto simulaci
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index 3af2cf33fbc..addd2c719d7 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=Alle lande undtagen %s
 AccountantFiles=Eksporter kildedokumenter
 ExportAccountingSourceDocHelp=Med dette værktøj kan du eksportere de kildehændelser (liste og PDF-filer), der blev brugt til at generere din regnskab. For at eksportere dine tidsskrifter skal du bruge menuindgangen %s - %s.
 VueByAccountAccounting=Vis efter regnskabskonto
+VueBySubAccountAccounting=Vis efter regnskabsmæssig underkonto
 
 MainAccountForCustomersNotDefined=Standardkonto for kunder, der ikke er defineret i opsætningen
 MainAccountForSuppliersNotDefined=Hoved kontokort for leverandører, der ikke er defineret i opsætningen
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Ikke bundet til regnskabskontoen
 XLineSuccessfullyBinded=%s varer/ydelser blev bundet til en regnskabskonto
 XLineFailedToBeBinded=%s varer/ydelser blev ikke bundet til en regnskabskonto
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Antal elementer, der skal bindes vist efter side (maks. Anbefalet: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maksimalt antal linjer på listen og bind siden (anbefales: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Vis siden "Ikke bogførte linjer" med de nyeste poster først
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Vis siden "Ikke bogførte linjer" med de nyeste poster først
 
@@ -198,7 +199,8 @@ Docdate=Dato
 Docref=Reference
 LabelAccount=Kontonavn
 LabelOperation=Bilagstekst
-Sens=Sens
+Sens=Retning
+AccountingDirectionHelp=For en kundes regnskabskonto skal du bruge kredit til at registrere en betaling, du har modtaget <br>. For en leverandørs regnskabskonto skal du bruge Debet til at registrere en betaling, du foretager
 LetteringCode=Bogstaver kode
 Lettering=Skrift
 Codejournal=Kladde
@@ -206,7 +208,8 @@ JournalLabel=Journalmærke
 NumPiece=Partsnummer
 TransactionNumShort=Transaktionsnr.
 AccountingCategory=Regnskabskontogrupper
-GroupByAccountAccounting=Gruppér efter regnskabskonto
+GroupByAccountAccounting=Gruppér efter hovedkontokonto
+GroupBySubAccountAccounting=Gruppér efter underkonto konto
 AccountingAccountGroupsDesc=Du kan definere her nogle grupper af regnskabskonto. De vil blive brugt til personlige regnskabsrapporter.
 ByAccounts=Konti
 ByPredefinedAccountGroups=Efter foruddefinerede grupper
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Betaling er ikke knyttet til noget produkt / tjeneste
 OpeningBalance=Åbnings balance
 ShowOpeningBalance=Vis åbningsbalance
 HideOpeningBalance=Skjul åbningsbalancen
-ShowSubtotalByGroup=Vis subtotal efter grupper
+ShowSubtotalByGroup=Vis subtotal efter niveau
 
 Pcgtype=Kontoens gruppe
 PcgtypeDesc=Kontogruppe bruges som foruddefinerede 'filter' og 'gruppering' kriterier for nogle regnskabsrapporter. For eksempel bruges 'INKOMST' eller 'UDGIFT' som grupper til regnskabsmæssige regnskaber for produkter til at oprette omkostnings- / indkomstrapporten.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Her vises listen over udgiftsrapporter linjer bundet (el
 DescVentilExpenseReportMore=Hvis du opsætter regnskabskonto på typen af ​​udgiftsrapporter, vil applikationen kunne foretage hele bindingen mellem dine udgiftsrapporter og kontoen for dit kontoplan, kun med et klik med knappen <strong> "%s" </strong>. Hvis kontoen ikke var angivet i gebyrordbog, eller hvis du stadig har nogle linjer, der ikke er bundet til nogen konto, skal du lave en manuel binding fra menuen "<strong> %s</strong>".
 DescVentilDoneExpenseReport=Her vises listen over linjerne for udgiftsrapporter og deres gebyrkonto
 
+Closure=Årlig lukning
 DescClosure=Se her antallet af bevægelser pr. Måned, der ikke er valideret og regnskabsår, der allerede er åbent
 OverviewOfMovementsNotValidated=Trin 1 / Oversigt over bevægelser, der ikke er valideret. (Nødvendigt at lukke et regnskabsår)
+AllMovementsWereRecordedAsValidated=Alle bevægelser blev registreret som godkendt
+NotAllMovementsCouldBeRecordedAsValidated=Ikke alle bevægelser kunne registreres som godkendt
 ValidateMovements=Valider bevægelser
 DescValidateMovements=Enhver ændring eller sletning af skrivning, bogstaver og sletning er forbudt. Alle poster til en øvelse skal valideres, ellers er lukning ikke mulig
-SelectMonthAndValidate=Vælg måned og valider bevægelser
 
 ValidateHistory=Automatisk Bogføring
 AutomaticBindingDone=Automatisk Bogføring
@@ -293,6 +298,7 @@ Accounted=Regnskab i hovedbog
 NotYetAccounted=Endnu ikke indregnet i hovedbog
 ShowTutorial=Vis selvstudie
 NotReconciled=Ikke afstemt
+WarningRecordWithoutSubledgerAreExcluded=Advarsel, alle handlinger uden underskrevet konto defineret filtreres og udelukkes fra denne visning
 
 ## Admin
 BindingOptions=Bindende muligheder
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Eksport til LD Compta (v10 og nyere)
 Modelcsv_openconcerto=Eksport til OpenConcerto (Test)
 Modelcsv_configurable=Eksporter CSV Konfigurerbar
 Modelcsv_FEC=Eksport FEC
+Modelcsv_FEC2=Eksport FEC (med datagenereringsskrivning / omvendt dokument)
 Modelcsv_Sage50_Swiss=Eksport til Sage 50 Schweiz
 Modelcsv_winfic=Eksport Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Eksport til Gestinum (v3)
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index d7714c0c1df..78572942536 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Udseende
 SetupArea=Indstillinger
 UploadNewTemplate=Upload nye skabelon(er)
 FormToTestFileUploadForm=Formular til test af fil upload (ifølge opsætning)
+ModuleMustBeEnabled=Modulet / applikationen <b> %s </b> skal være aktiveret
+ModuleIsEnabled=Modulet / applikationen <b> %s </b> er blevet aktiveret
 IfModuleEnabled=Note: ja er kun effektivt, hvis <b>modul %s</b> er aktiveret
 RemoveLock=Fjern/omdøbe fil <b> %s </b> hvis den eksisterer, for at tillade brug af Update/Install værktøjet.
 RestoreLock=Gendan filen <b> %s </b>, kun med tilladelse for "læsning", for at deaktivere yderligere brug af Update/Install-værktøjet.
@@ -85,7 +87,6 @@ ShowPreview=Vis forhåndsvisning
 ShowHideDetails=Vis skjul detaljer
 PreviewNotAvailable=Preview ikke tilgængeligt
 ThemeCurrentlyActive=Tema aktuelt aktive
-CurrentTimeZone=Aktuelle tidszone
 MySQLTimeZone=Tidszone MySql (database)
 TZHasNoEffect=Datoer gemmes og returneres af databaseserveren som om de blev holdt som sendt streng. Tidszonen har kun virkning, når du bruger UNIX_TIMESTAMP-funktionen (som ikke skal bruges af Dolibarr, så databasen TZ skal ikke have nogen effekt, selvom den er ændret efter indtastning af data).
 Space=Mellemrum
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Dette område giver administrationsfunktioner. Brug menuen t
 Purge=Ryd
 PurgeAreaDesc=På denne side kan du slette alle filer, der er genereret eller gemt af Dolibarr (midlertidige filer eller alle filer i <b> %s </b> bibliotek). Brug af denne funktion er normalt ikke nødvendig. Den leveres som en løsning for brugere, hvis Dolibarr er vært for en udbyder, der ikke tilbyder tilladelser til at slette filer genereret af webserveren.
 PurgeDeleteLogFile=Slet log-filer, herunder <b>%s</b> oprettet til Syslog-modul (ingen risiko for at miste data)
-PurgeDeleteTemporaryFiles=Slet alle midlertidige filer (ingen risiko for at miste data). Bemærk: Sletning udføres kun, hvis "temp" biblioteket blev oprettet for 24 timer siden.
-PurgeDeleteTemporaryFilesShort=Slet midlertidige filer
+PurgeDeleteTemporaryFiles=Slet alle logfiler og midlertidige filer (ingen risiko for at miste data). Bemærk: Sletning af midlertidige filer udføres kun, hvis temp-biblioteket blev oprettet for mere end 24 timer siden.
+PurgeDeleteTemporaryFilesShort=Slet logfiler og midlertidige filer
 PurgeDeleteAllFilesInDocumentsDir=Slet alle filer i mappen: <b> %s </b>. <br> Dette vil slette alle genererede dokumenter relateret til elementer (tredjeparter, fakturaer osv. ..), filer uploadet til ECM modulet, database backup dumps og midlertidige filer.
 PurgeRunNow=Rensningsanordningen nu
 PurgeNothingToDelete=Ingen mappe eller filer, der skal slettes.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Foretrukne partnere
 OtherResources=Andre ressourcer
 ExternalResources=Eksterne ressourcer
 SocialNetworks=Sociale netværk
+SocialNetworkId=Socialt netværk ID
 ForDocumentationSeeWiki=For brugerens eller bygherren dokumentation (doc, FAQs ...), <br> tage et kig på Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s</b></a>
 ForAnswersSeeForum=For alle andre spørgsmål / hjælpe, kan du bruge Dolibarr forum: <br> <a href="%s" target="_blank"><b> %s</b></a>
 HelpCenterDesc1=Her er nogle ressourcer til at få hjælp og support med Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Eksempler med den nuværende konfiguration
 ListOfDirectories=Liste over OpenDocument-skabeloner mapper
 ListOfDirectoriesForModelGenODT=Liste over mapper, som indeholder skabeloner filer med OpenDocument format.<br><br>her fulde sti til mapper.<br>Føjer vognretur mellem eah mappe.<br / >for At tilføje en mappe af GED modul, tilføje her <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Filer i disse mapper skal ende med <b>.odt</b> eller <b>.ods</b>.
 NumberOfModelFilesFound=Antal ODT / ODS-template filer, der findes i disse mapper
-ExampleOfDirectoriesForModelGen=Eksempler på syntaks: <br> c: \\ mydir <br> / Home / mydir <br> DOL_DATA_ROOT / ECM / ecmdir
+ExampleOfDirectoriesForModelGen=Eksempler på syntaks: <br> c: \\ myapp \\ mydocumentdir \\ mysubdir <br> / home / myapp / mydocumentdir / mysubdir <br> DOL_DATA_ROOT / ecm / ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> At vide hvordan du opretter dine odt dokumentskabeloner, før gemme dem i disse mapper, skal du læse wiki dokumentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Placering af fornavn / navn
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parametre for at sikre URL'er
 SecurityTokenIsUnique=Brug en unik securekey parameter for hver enkelt webadresse
 EnterRefToBuildUrl=Indtast reference for objekter %s
 GetSecuredUrl=Få beregnet URL
-ButtonHideUnauthorized=Skjul knapper til brugere uden for administrasjon for uautoriserede handlinger i stedet for at vise gråaktiverede knapper
+ButtonHideUnauthorized=Skjul uautoriserede handlingsknapper også for interne brugere (bare ellers gråtonet)
 OldVATRates=Gammel momssats
 NewVATRates=Ny momssats
 PriceBaseTypeToChange=Rediger priser med basisreferenceværdi defineret på
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personlige menuer, der ikke er knyttet til en topmenu
 NewMenu=Ny menu
 MenuHandler=Menu handling
 MenuModule=Kilde modul
-HideUnauthorizedMenu= Skjul uautoriserede menuer (grå)
+HideUnauthorizedMenu=Skjul uautoriserede menuer også for interne brugere (bare gråtonet ellers)
 DetailId=Id menuen
 DetailMenuHandler=Menu handling, hvor der viser ny menu
 DetailMenuModule=Modul navn, hvis menuen indrejse kommer fra et modul
@@ -1983,11 +1985,12 @@ EMailHost=Vært af e-mail-IMAP-server
 MailboxSourceDirectory=Postkasse kilde bibliotek
 MailboxTargetDirectory=Postkasse målkatalog
 EmailcollectorOperations=Operationer at gøre af samleren
+EmailcollectorOperationsDesc=Opgaver udføres fra øverste til nederste ordre
 MaxEmailCollectPerCollect=Maks antal Emails indsamlet pr. Samling
 CollectNow=Indsamle nu
 ConfirmCloneEmailCollector=Er du sikker på, at du vil klone Email samleren %s?
-DateLastCollectResult=Dato seneste indsamlet prøvet
-DateLastcollectResultOk=Dato seneste indsamling succesfuld
+DateLastCollectResult=Dato for seneste indsamlingsforsøg
+DateLastcollectResultOk=Dato for seneste succes med indsamling
 LastResult=Seneste resultat
 EmailCollectorConfirmCollectTitle=Email samle bekræftelse
 EmailCollectorConfirmCollect=Vil du køre kollektionen for denne samler nu?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Besked fra en samtale startet af en første e-mail sendt fra D
 WithoutDolTrackingID=Besked fra en samtale startet af en første e-mail, der IKKE blev sendt fra Dolibarr
 WithDolTrackingIDInMsgId=Besked sendt fra Dolibarr
 WithoutDolTrackingIDInMsgId=Besked IKKE sendt fra Dolibarr
-CreateCandidature=Opret kandidatur
+CreateCandidature=Opret jobansøgning
 FormatZip=Postnummer
 MainMenuCode=Menu indtastningskode (hovedmenu)
 ECMAutoTree=Vis automatisk ECM-træ
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Land (hvis det er specifikt for et givet land)
 YouMayFindSecurityAdviceHere=Du kan finde sikkerhedsrådgivning her
 ModuleActivatedMayExposeInformation=Dette modul kan udsætte følsomme data. Hvis du ikke har brug for det, skal du deaktivere det.
 ModuleActivatedDoNotUseInProduction=Et modul designet til udviklingen er blevet aktiveret. Aktivér det ikke i et produktionsmiljø.
+CombinationsSeparator=Separatorkarakter til produktkombinationer
+SeeLinkToOnlineDocumentation=Se link til online dokumentation i topmenuen for eksempler
+SHOW_SUBPRODUCT_REF_IN_PDF=Hvis funktionen "%s" i modul <b> %s </b> bruges, skal du vise detaljer om delprodukter af et sæt på PDF.
+AskThisIDToYourBank=Kontakt din bank for at få dette ID
diff --git a/htdocs/langs/da_DK/banks.lang b/htdocs/langs/da_DK/banks.lang
index add4d042a86..ecd8b55b8e2 100644
--- a/htdocs/langs/da_DK/banks.lang
+++ b/htdocs/langs/da_DK/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandat
 YourSEPAMandate=Dit SEPA mandat
 FindYourSEPAMandate=Dette er dit SEPA-mandat til at give vores firma tilladelse til at foretage en direkte debitering til din bank. Ret det underskrevet (scan af det underskrevne dokument) eller send det pr. Mail til
 AutoReportLastAccountStatement=Udfyld automatisk feltet 'antal kontoudtog' med det sidste erklæringsnummer, når du foretager afstemning
-CashControl=POS kontant terminal
-NewCashFence=Nyt kontanthegn
+CashControl=POS kasse apparats kontrol
+NewCashFence=Ny kasse apparat  lukker
 BankColorizeMovement=Farvelæg bevægelser
 BankColorizeMovementDesc=Hvis denne funktion er aktiveret, kan du vælge specifik baggrundsfarve til debet- eller kreditbevægelser
 BankColorizeMovementName1=Baggrundsfarve til debetbevægelse
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index a996f7a199a..07502e953de 100644
--- a/htdocs/langs/da_DK/bills.lang
+++ b/htdocs/langs/da_DK/bills.lang
@@ -207,7 +207,7 @@ UnvalidateBill=Fjern godkendelse af faktura
 NumberOfBills=Antal fakturaer
 NumberOfBillsByMonth=Antal fakturaer pr. Måned
 AmountOfBills=Mængden af fakturaer
-AmountOfBillsHT=Fakturabeløb (ekskl. Skat)
+AmountOfBillsHT=Fakturabeløb (ekskl. moms)
 AmountOfBillsByMonthHT=Mængden af ​​fakturaer efter måned (ekskl. moms)
 UseSituationInvoices=Tillad midlertidig faktura
 UseSituationInvoicesCreditNote=Tillad midlertidig faktura kreditnota
@@ -531,6 +531,7 @@ TypeContact_invoice_supplier_external_SERVICE=Leverandørens kontakt
 InvoiceFirstSituationAsk=Første faktura
 InvoiceFirstSituationDesc=<B> Situationsfakturaerne </b> er bundet til situationer, der er relateret til en progression, for eksempel fremdriften af ​​en konstruktion. Hver situation er bundet til en faktura.
 InvoiceSituation=Kontoudtog
+PDFInvoiceSituation=Kontoudtog
 InvoiceSituationAsk=Faktura efter kontoudtog
 InvoiceSituationDesc=Opret en ny situation efter en allerede eksisterende
 SituationAmount=Kontoudtog beløb (netto)
@@ -575,3 +576,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Leverandørfaktura slettet
 UnitPriceXQtyLessDiscount=Enhedspris x Antal - Rabat
 CustomersInvoicesArea=Kunde fakturerings område
 SupplierInvoicesArea=Leverandør fakturerings område 
+FacParentLine=Faktura Line Parent
+SituationTotalRayToRest=Resten til at betale uden skat
+PDFSituationTitle=Situation nr. %d
+SituationTotalProgress=Samlet fremskridt %d %%
diff --git a/htdocs/langs/da_DK/blockedlog.lang b/htdocs/langs/da_DK/blockedlog.lang
index 186fadbf852..cc7298bf441 100644
--- a/htdocs/langs/da_DK/blockedlog.lang
+++ b/htdocs/langs/da_DK/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logisk sletning
 logMEMBER_SUBSCRIPTION_CREATE=Medlem abonnement oprettet
 logMEMBER_SUBSCRIPTION_MODIFY=Medlems abonnement ændret
 logMEMBER_SUBSCRIPTION_DELETE=Medlems abonnement logisk sletning
-logCASHCONTROL_VALIDATE=Registrering af kontanthegn
+logCASHCONTROL_VALIDATE=Optagelse ved lukning af kasse apparatet 
 BlockedLogBillDownload=Kundefaktura download
 BlockedLogBillPreview=Kunde faktura preview
 BlockedlogInfoDialog=Log detaljer
diff --git a/htdocs/langs/da_DK/boxes.lang b/htdocs/langs/da_DK/boxes.lang
index 1481c03b97f..9e51ea3a7b0 100644
--- a/htdocs/langs/da_DK/boxes.lang
+++ b/htdocs/langs/da_DK/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Nyeste %s modificerede styklister
 BoxTitleLatestModifiedMos=Seneste %s ændrede produktionsordrer
+BoxTitleLastOutstandingBillReached=Kunder med maksimalt udestående overskredet
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Blytragt
 FailedToRefreshDataInfoNotUpToDate=Kunne ikke opdatere RSS-flux. Seneste succesfulde opdateringsdato: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=Ingen bogmærker defineret.
@@ -83,8 +86,8 @@ BoxTitleLatestModifiedSupplierOrders=Leverandør Ordrer: senest %s ændret
 BoxTitleLastModifiedCustomerBills=Kundefakturaer: sidst %s ændret
 BoxTitleLastModifiedCustomerOrders=Salgsordrer: sidst %s ændret
 BoxTitleLastModifiedPropals=Seneste %s tilrettede tilbud
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Seneste %s ændrede job
+BoxTitleLatestModifiedCandidatures=Seneste %s ændrede kandidaturer
 ForCustomersInvoices=Kundernes fakturaer
 ForCustomersOrders=Customers orders
 ForProposals=Tilbud
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Midlertidig konto er ikke defineret
 BoxLastCustomerShipments=Sidste kunde forsendelser
 BoxTitleLastCustomerShipments=Nyeste %s forsendelser kunde
 NoRecordedShipments=Ingen registreret kundeforsendelse
+BoxCustomersOutstandingBillReached=Kunder med en udestående grænse nået
 # Pages
 AccountancyHome=Bogføring
+ValidatedProjects=Validerede projekter
diff --git a/htdocs/langs/da_DK/cashdesk.lang b/htdocs/langs/da_DK/cashdesk.lang
index bcba80e2087..9f5abd81617 100644
--- a/htdocs/langs/da_DK/cashdesk.lang
+++ b/htdocs/langs/da_DK/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Sidefod
 AmountAtEndOfPeriod=Beløb ved udgangen af perioden (dag, måned eller år)
 TheoricalAmount=Teoretisk mængde
 RealAmount=Reelt beløb
-CashFence=Kontant begrænsning 
-CashFenceDone=Cash fence gjort for perioden
+CashFence=Lukning af kasseapperat
+CashFenceDone=Lukning af kasseapparat udført for perioden
 NbOfInvoices=Antal fakturaer
 Paymentnumpad=numerisk tastatur til at indtaste betaling
 Numberspad=Numerisk tastatur
@@ -77,7 +77,7 @@ POSModule=POS Modulet
 BasicPhoneLayout=Brug grundlæggende layout til telefoner
 SetupOfTerminalNotComplete=Opsætning af terminal %s er ikke afsluttet
 DirectPayment=Direkte betaling
-DirectPaymentButton=Add a "Direct cash payment" button
+DirectPaymentButton=Tilføj en "Direkte kontant betaling" -knap
 InvoiceIsAlreadyValidated=Fakturaen er allerede valideret
 NoLinesToBill=Ingen linjer til fakturering
 CustomReceipt=Tilpasset kvittering
@@ -94,13 +94,14 @@ TakeposConnectorMethodDescription=Eksternt modul med ekstra funktioner. Mulighed
 PrintMethod=Udskrivningsmetode
 ReceiptPrinterMethodDescription=Kraftig metode med en masse parametre. Fuld tilpasning med skabeloner. Kan ikke udskrive fra cloud.
 ByTerminal=Med terminal
-TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
+TakeposNumpadUsePaymentIcon=Brug ikonet i stedet for tekst på betalingsknapperne på numpad
 CashDeskRefNumberingModules=Nummereringsmodul til POS-salg
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b>  tag bruges til at tilføje terminal nummere
 TakeposGroupSameProduct=Grupper sammen produktlinjer
 StartAParallelSale=Start et nyt parallelt salg
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Luk kontantindhold
+SaleStartedAt=Salget startede den %s
+ControlCashOpening=Kontroller kontant beholdning ved åbning af POS
+CloseCashFence=Luk kontrol af kasseapparatet 
 CashReport=Kontantrapport
 MainPrinterToUse=Fortrukket printer til brug
 OrderPrinterToUse=Bestil printer, der skal bruges
@@ -117,8 +118,9 @@ HideCategoryImages=Skjul Kategori billeder
 HideProductImages=Skjul produktbilleder
 NumberOfLinesToShow=Antal linjer af billeder, der skal vises
 DefineTablePlan=Definer tabeller planlægger
-GiftReceiptButton=Add a "Gift receipt" button
-GiftReceipt=Gift receipt
-ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
-AllowDelayedPayment=Allow delayed payment
-PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+GiftReceiptButton=Tilføj en "gavekvittering" -knap
+GiftReceipt=Gavekvittering
+ModuleReceiptPrinterMustBeEnabled=Modul kvitterings printer skal først være aktiveret
+AllowDelayedPayment=Tillad forsinket betaling
+PrintPaymentMethodOnReceipts=Udskriv betalingsmetode på billetter | kvitteringer
+WeighingScale=Vægt skala 
diff --git a/htdocs/langs/da_DK/categories.lang b/htdocs/langs/da_DK/categories.lang
index 18b12b53318..881d4fe22c6 100644
--- a/htdocs/langs/da_DK/categories.lang
+++ b/htdocs/langs/da_DK/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projekter tags/kategorier område
 UsersCategoriesArea=Brugere tags / kategorier område
 SubCats=Sub-kategorier
 CatList=Liste over tags/kategorier
+CatListAll=Liste over tags / kategorier (alle typer)
 NewCategory=Nyt tag/kategori
 ModifCat=Rediger tag/kategori
 CatCreated=Tag/kategori oprettet
@@ -65,16 +66,22 @@ UsersCategoriesShort=Brugere tags / kategorier
 StockCategoriesShort=Lagermærker / kategorier
 ThisCategoryHasNoItems=Denne kategori indeholder ikke nogen produkter.
 CategId=Tag/kategori id
-CatSupList=Liste over leverandør tags / kategorier
-CatCusList=Liste over kunde/potentiel kunde tags/kategorier
+ParentCategory=Overordnet tag / kategori
+ParentCategoryLabel=Mærke for overordnet tag / kategori
+CatSupList=Liste over leverandørmærker / kategorier
+CatCusList=Liste over kunder / potentielle tags / kategorier
 CatProdList=Liste over tags/kategorier for varer
 CatMemberList=Liste over medlemmer tags/kategorier
-CatContactList=Liste over kontaktmærker/kategorier
-CatSupLinks=Links mellem leverandører og tags/kategorier
+CatContactList=Liste over kontaktkoder / kategorier
+CatProjectsList=Liste over projekter tags / kategorier
+CatUsersList=Liste over brugers tags / kategorier
+CatSupLinks=Links mellem leverandører og tags / kategorier
 CatCusLinks=Links mellem kunder/potentielle kunder og tags/kategorier
 CatContactsLinks=Links mellem kontakter / adresser og tags / kategorier
 CatProdLinks=Links mellem varer/ydelser og tags/kategorier
-CatProJectLinks=Links mellem projekter og tags/kategorier
+CatMembersLinks=Links mellem medlemmer og tags / kategorier
+CatProjectsLinks=Links mellem projekter og tags/kategorier
+CatUsersLinks=Links mellem brugere og tags / kategorier
 DeleteFromCat=Fjern fra tags/kategori
 ExtraFieldsCategories=Supplerende attributter
 CategoriesSetup=Tags/kategorier opsætning
diff --git a/htdocs/langs/da_DK/companies.lang b/htdocs/langs/da_DK/companies.lang
index 76b286db769..c01f19fef89 100644
--- a/htdocs/langs/da_DK/companies.lang
+++ b/htdocs/langs/da_DK/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Kontroller moms nummer på EU webside
 VATIntraManualCheck=Du kan også tjekke manuelt på Europa-Kommissionens websted <a href="%s" target="_blank"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Kontrol er ikke muligt. Denne service leveres ikke af medlemsstaten (%s).
 NorProspectNorCustomer=Ikke mulighedder eller kunde
-JuridicalStatus=Juridisk enhedstype
+JuridicalStatus=Forretningsenhedstype
 Workforce=Arbejdskraft
 Staff=Medarbejdere
 ProspectLevelShort=Potentiale
diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang
index 22641410445..67d0f186df3 100644
--- a/htdocs/langs/da_DK/compta.lang
+++ b/htdocs/langs/da_DK/compta.lang
@@ -111,7 +111,7 @@ Refund=Tilbagebetaling
 SocialContributionsPayments=Betalinger af skat/afgift
 ShowVatPayment=Vis momsbetaling
 TotalToPay=At betale i alt
-BalanceVisibilityDependsOnSortAndFilters=Balancen er kun synlig i denne liste, hvis tabellen sorteres stigende på %s og filtreret til 1 bankkonto
+BalanceVisibilityDependsOnSortAndFilters=Saldo er kun synlig på denne liste, hvis tabellen er sorteret på %s og filtreret på 1 bankkonto (uden andre filtre)
 CustomerAccountancyCode=Regnskabskode for kunde
 SupplierAccountancyCode=Sælgers regnskabskode
 CustomerAccountancyCodeShort=Cust. konto. kode
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Er du sikker på, at du vil slette denne betalin
 ExportDataset_tax_1=Betalinger af skatter/afgifter
 CalcModeVATDebt=Indstilling <b> %sMoms på forpligtelseskonto%s </b>.
 CalcModeVATEngagement=Mode <b> %sVAT på indkomst-udgifter%s </ b>.
-CalcModeDebt=Analyse af kendte registrerede fakturaer, selvom de endnu ikke er bogført i hovedbogen.
+CalcModeDebt=Analyse af kendte registrerede dokumenter, selvom de endnu ikke er bogført i hovedbogen.
 CalcModeEngagement=Analyse af kendte registrerede betalinger, selvom de endnu ikke er indregnet i hovedbogen.
 CalcModeBookkeeping=Analyse af data journaliseret i bogførings tabelen.
 CalcModeLT1= Mode <b> %sRE på kundefakturaer - leverandører invoices%s </b>
@@ -154,10 +154,10 @@ AnnualSummaryInputOutputMode=Balance mellem indtægter og udgifter, årligt samm
 AnnualByCompanies=Indkomst- og udgiftsbalance, pr. Foruddefinerede regnskabet
 AnnualByCompaniesDueDebtMode=Indkomst- og udgiftsbalance, detaljer ved foruddefinerede grupper, tilstand <b> %sClaims-Debts%s </b> sagde <b> Forpligtelsesregnskab </b>.
 AnnualByCompaniesInputOutputMode=Indkomst- og udgiftsbalance, detaljer ved foruddefinerede grupper, tilstand <b> %sIncomes-Expenses%s </b> sagde <b> kontantregnskab </b>.
-SeeReportInInputOutputMode=Se %sanalyse af betaling%s for en beregning af faktiske betalinger foretaget, selvom de endnu ikke er opført i hovedbogen.
-SeeReportInDueDebtMode=Se %sanalyse af faktura%s for en beregning baseret på kendte registrerede fakturaer, selvom de endnu ikke er opført i hovedbogen.
-SeeReportInBookkeepingMode=Se <b> %skassekladde report%s </b> til en beregning på <b> kasssekladdens tabelen </b>
-RulesAmountWithTaxIncluded=- De viste beløb er med alle inkl. moms
+SeeReportInInputOutputMode=Se <b> %sanalyse af betalinger%s </b> for en beregning baseret på <b> registrerede betalinger </b> foretaget, selvom de endnu ikke er registreret i Ledger
+SeeReportInDueDebtMode=Se <b> %sanalyse af registrerede dokumenter%s </b> for en beregning baseret på kendt <b> registrerede dokumenter </b> selvom de endnu ikke er registreret
+SeeReportInBookkeepingMode=Se <b> %sanalyse af bogholderibillede table%s </b> for en rapport baseret på <b> Bogholderibord </b>
+RulesAmountWithTaxIncluded=- De viste beløb er inkl. moms og afgifter
 RulesResultDue=- Det inkluderer udestående fakturaer, udgifter, moms, donationer, uanset om de er betalt eller ej. Indeholder også betalte lønninger.<br> - Det er baseret på faktureringens fakturadato og på forfaldsdato for udgifter eller skattebetalinger. For lønninger, der er defineret med lønningsmodulet, bruges betalingsdato.
 RulesResultInOut=- Den omfatter de reelle betalinger foretaget på fakturaer, udgifter, moms og løn. <br> - Det er baseret på betalingsdatoer for fakturaer, udgifter, moms og løn. Donationsdatoen for donation.
 RulesCADue=- Det inkluderer kundens forfaldne fakturaer, uanset om de er betalt eller ej.<br> - Det er baseret på faktureringsdatoen for disse fakturaer.<br>
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Det viser kontoer i din hovedbog med regnskab
 SeePageForSetup=Se menuen <a href="%s"> %s </a> til opsætning
 DepositsAreNotIncluded=- Betalingsfakturaer er ikke inkluderet
 DepositsAreIncluded=- Fakturaer med forudbetaling er inkluderet
+LT1ReportByMonth=Skat 2-rapport efter måned
+LT2ReportByMonth=Skat 3-rapport efter måned
 LT1ReportByCustomers=Indberette skat 2 af tredjepart
 LT2ReportByCustomers=Indberette skat 3 af tredjepart
 LT1ReportByCustomersES=Rapport fra tredjemand RE
 LT2ReportByCustomersES=Rapport fra tredjepart IRPF
 VATReport=Salgsskat rapport
 VATReportByPeriods=Salgsskat rapport efter periode
+VATReportByMonth=Salgsmoms rapport efter måned
 VATReportByRates=Salgsskat rapport med satser
 VATReportByThirdParties=Salgsskatterapport fra tredjepart
 VATReportByCustomers=Salgsskat rapport af kunde
diff --git a/htdocs/langs/da_DK/cron.lang b/htdocs/langs/da_DK/cron.lang
index af3f09161a9..ed3fbc88478 100644
--- a/htdocs/langs/da_DK/cron.lang
+++ b/htdocs/langs/da_DK/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup=Planlagt opsætning af jobstyring
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+URLToLaunchCronJobs=URL til at kontrollere og starte kvalificerede cron-job fra en browser
+OrToLaunchASpecificJob=Eller for at kontrollere og starte et bestemt job fra en browser
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Kommandolinje for at kontrollere og starte kvalificerede cron-job
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
 CronExplainHowToRunWin=På Microsoft (tm) Windows-miljø kan du bruge Scheduled Task-værktøjer til at køre kommandolinjen hvert 5. minut
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Metode %s af klasse %s er i sortliste over forbudte metoder
 CronJobDefDesc=Cron-jobprofiler er defineret i modulbeskrivelsesfilen. Når modulet er aktiveret, er de indlæst og tilgængeligt, så du kan administrere jobene fra adminværktøjsmenuen %s.
 CronJobProfiles=Liste over forud definerede cron jobprofiler
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Antal lanceringer
 CronMaxRun=Maksimalt antal lanceringer
 CronEach=Every
 JobFinished=Job startet og gennemført
+Scheduled=Planlagt
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -56,7 +58,7 @@ CronNote=Kommentar
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status ved modul installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Tidsplan
 CronStatusInactiveBtn=Deaktivere
 CronTaskInactive=This job is disabled
 CronId=Id
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Opret en lokal database dump. Parametre er: komprimering ('gz' eller 'bz' eller 'ingen'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' eller filnavn til opbygning, antal backupfiler
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
 DATAPOLICYJob=Datarenser og anonymizer
+JobXMustBeEnabled=Job %s skal være aktiveret
+# Cron Boxes
+LastExecutedScheduledJob=Sidste udførte planlagte job
+NextScheduledJobExecute=Næste planlagte job, der skal udføres
+NumberScheduledJobError=Antal planlagte job med fejl
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index 9306acbcee1..96148c9c1a8 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -1,12 +1,14 @@
 # Dolibarr language file - Source file is en_US - errors
 
 # No errors
-NoErrorCommitIsDone=No error, we commit
+NoErrorCommitIsDone=Ingen fejl, vi begår
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=E-mail%s er forkert
+ErrorBadMXDomain=E-mail %s virker forkert (domæne har ingen gyldig MX-post)
 ErrorBadUrl=Url %s er forkert
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b> %s </b> findes allerede.
 ErrorLoginAlreadyExists=Log ind %s eksisterer allerede.
 ErrorGroupAlreadyExists=Gruppe %s eksisterer allerede.
 ErrorRecordNotFound=Optag ikke fundet.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Nogle krævede felter ikke var fyldt.
 ErrorSubjectIsRequired=Emne er påkrævet
 ErrorFailedToCreateDir=Det lykkedes ikke at oprette en mappe. Kontroller, at web-serveren bruger har tilladelse til at skrive i Dolibarr dokumenter bibliotek. Hvis parameter <b>safe_mode</b> er aktiveret på dette PHP, kontrollere, at Dolibarr php filer ejer til web-serveren bruger (eller gruppe).
 ErrorNoMailDefinedForThisUser=Ingen e-mail defineret for denne bruger
+ErrorSetupOfEmailsNotComplete=Opsætningen af e-mails er ikke afsluttet
 ErrorFeatureNeedJavascript=Denne funktion kræver, at javascript aktiveres for at fungere. Skift dette i setup - display.
 ErrorTopMenuMustHaveAParentWithId0=En menu af type 'Top' kan ikke have en forælder menuen. Sæt 0 i moderselskabet menu eller vælge en menu af typen »Venstre«.
 ErrorLeftMenuMustHaveAParentId=En menu af typen »Venstre« skal have en forælder id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matchende er ikke komplet.
 ErrorLDAPMakeManualTest=A. LDIF-fil er blevet genereret i mappen %s. Prøv at indlæse den manuelt fra kommandolinjen for at få flere informationer om fejl.
 ErrorCantSaveADoneUserWithZeroPercentage=Kan ikke gemme en handling med "status ikke startet", hvis feltet "udført af" også er udfyldt.
-ErrorRefAlreadyExists=Ref bruges til oprettelse eksisterer allerede.
+ErrorRefAlreadyExists=Reference <b> %s </b> findes allerede.
 ErrorPleaseTypeBankTransactionReportName=Indtast venligst kontoudskriftsnavnet, hvor indgangen skal rapporteres (Format YYYYMM eller YYYYMMDD)
 ErrorRecordHasChildren=Kunne ikke slette rekord, da det har nogle børneposter.
 ErrorRecordHasAtLeastOneChildOfType=Objektet har mindst et under objekt af type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Du skal vælge, om artiklen er en
 ErrorDiscountLargerThanRemainToPaySplitItBefore=Den rabat, du forsøger at anvende, er større end det der forblive at betale. Opdel rabatten i 2 mindre rabatter før.
 ErrorFileNotFoundWithSharedLink=Filen blev ikke fundet. Det kan være, at dele nøglen blev ændret eller filen blev fjernet for nylig.
 ErrorProductBarCodeAlreadyExists=Produktets stregkode %s eksisterer allerede på en anden produktreference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Bemærk også, at brug af virtuelt produkt med automatisk forøgelse / nedsættelse af underprodukter ikke er mulig, når mindst et underprodukt (eller underprodukt af underprodukter) har brug for et serienummer / parti nummer.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Bemærk også, at det ikke er muligt at bruge sæt til automatisk forøgelse / formindskelse af underprodukter, når mindst et underprodukt (eller underprodukt af underprodukter) har brug for et serienummer / lotnummer.
 ErrorDescRequiredForFreeProductLines=Beskrivelse er obligatorisk for linjer med gratis produkt
 ErrorAPageWithThisNameOrAliasAlreadyExists=Siden / beholderen <strong> %s </ strong> har samme navn eller alternativt alias som den, du forsøger at bruge
 ErrorDuringChartLoad=Fejl ved indlæsning af kontoplan. Hvis nogle konti ikke blev indlæst, kan du stadig indtaste dem manuelt.
@@ -240,9 +243,19 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Ikke tilstrækkelig mængde
 ErrorOnlyOneFieldForGroupByIsPossible=Kun 1 felt for 'Group by' er muligt (andre kasseres)
 ErrorTooManyDifferentValueForSelectedGroupBy=Fundet for mange forskellig værdi (mere end <b>%s</b>) til feltet '<b>%s</b>', så vi ikke kan bruge det som en 'gruppe af' for grafik. Feltet 'Gruppe Af' er blevet fjernet. Kan være du ønskede at bruge det som en X-akse?
 ErrorReplaceStringEmpty=Fejl, strengen, der skal erstattes til, er tom
-ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
-ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
-ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorProductNeedBatchNumber=Fejl, produkt '<b> %s </b>' har brug for meget / serienummer
+ErrorProductDoesNotNeedBatchNumber=Fejl, produkt '<b> %s </b>' accepterer ikke meget / serienummer
+ErrorFailedToReadObject=Fejl, objektet af typen <b> kunne ikke læses %s </b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Fejl, parameter <b> %s </b> skal aktiveres i <b> conf / conf.php <b> for at tillade brug af kommandolinjegrænsefladen af den interne jobplanlægning
+ErrorLoginDateValidity=Fejl, dette login er uden for gyldighedsdatointervallet
+ErrorValueLength=Feltets længde '<b> %s </b>' skal være højere end '<b> %s </b>'
+ErrorReservedKeyword=Ordet '<b> %s </b>' er et forbeholdt nøgleord
+ErrorNotAvailableWithThisDistribution=Ikke tilgængelig med denne distribution
+ErrorPublicInterfaceNotEnabled=Offentlig grænseflade var ikke aktiveret
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=Sprog for den nye side skal defineres, hvis det er indstillet som en oversættelse af en anden side
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=Sprog på den nye side må ikke være kildesproget, hvis det er indstillet som en oversættelse af en anden side
+ErrorAParameterIsRequiredForThisOperation=En parameter er obligatorisk for denne handling
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Din PHP-parameter upload_max_filesize (%s) er højere end PHP-parameter post_max_size (%s). Dette er ikke en ensartet opsætning.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Advarsel, antallet af forskellige modtagere er begrænset til <b> %s </ b>, når du bruger massehandlingerne på lister
 WarningDateOfLineMustBeInExpenseReportRange=Advarsel, datoen for linjen ligger ikke inden for udgiftsrapporten
+WarningProjectDraft=Projektet er stadig i kladdetilstand. Glem ikke at validere det, hvis du planlægger at bruge opgaver.
 WarningProjectClosed=Projektet er lukket. Du skal genåbne det først.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Nogle banktransaktioner blev fjernet, efter at kvitteringen inklusive dem blev genereret. Så nb af kontroller og det samlede antal modtagelser kan afvige fra antal og total på listen.
-WarningFailedToAddFileIntoDatabaseIndex=Advarsel, kunne ikke tilføje filpost i ECM-databasens indekstabel
+WarningFailedToAddFileIntoDatabaseIndex=Advarsel! Kunne ikke tilføje filindtastning i ECM-databaseindekstabellen
+WarningTheHiddenOptionIsOn=Advarsel, den skjulte mulighed <b> %s </b> er aktiveret.
+WarningCreateSubAccounts=Advarsel, du kan ikke oprette en underkonto direkte, du skal oprette en tredjepart eller en bruger og tildele dem en regnskabskode for at finde dem på denne liste
+WarningAvailableOnlyForHTTPSServers=Kun tilgængelig, hvis du bruger HTTPS-sikret forbindelse.
diff --git a/htdocs/langs/da_DK/exports.lang b/htdocs/langs/da_DK/exports.lang
index 5f05261b9c9..3b1b4072def 100644
--- a/htdocs/langs/da_DK/exports.lang
+++ b/htdocs/langs/da_DK/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Nøgle (kolonne), der skal bruges til <b> opdatering </ b> e
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Lager og placering (lager) af produkter med batch / serienummer
diff --git a/htdocs/langs/da_DK/mailmanspip.lang b/htdocs/langs/da_DK/mailmanspip.lang
index bab4b3576b4..b0f19f96de9 100644
--- a/htdocs/langs/da_DK/mailmanspip.lang
+++ b/htdocs/langs/da_DK/mailmanspip.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - mailmanspip
-MailmanSpipSetup=Mailman and SPIP module Setup
-MailmanTitle=Mailman mailing list system
-TestSubscribe=To test subscription to Mailman lists
-TestUnSubscribe=To test unsubscribe from Mailman lists
-MailmanCreationSuccess=Subscription test was executed successfully
-MailmanDeletionSuccess=Unsubscription test was executed successfully
-SynchroMailManEnabled=A Mailman update will be performed
-SynchroSpipEnabled=A Spip update will be performed
-DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
-DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
-DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
-DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
+MailmanSpipSetup=Mailman og SPIP-modul Sætop
+MailmanTitle=Mailman post list system
+TestSubscribe=At teste abonnement på Mailman lister
+TestUnSubscribe=For at afprøve afmeldingen fra Mailman lister
+MailmanCreationSuccess=Abonnements testen blev udført med succes
+MailmanDeletionSuccess=Unsubscription test blev udført med succes
+SynchroMailManEnabled=En Mailman opdatering vil blive udført
+SynchroSpipEnabled=En Spip opdatering vil blive udført
+DescADHERENT_MAILMAN_ADMINPW=Mailman administrator adgangskode
+DescADHERENT_MAILMAN_URL=URL til Mailman abonnementer
+DescADHERENT_MAILMAN_UNSUB_URL=URL til Mailman abonnementer
+DescADHERENT_MAILMAN_LISTS=Liste (r) til automatisk registrering af nye medlemmer (adskilt af komma)
 SPIPTitle=SPIP Content Management System
 DescADHERENT_SPIP_SERVEUR=SPIP Server
-DescADHERENT_SPIP_DB=SPIP database name
+DescADHERENT_SPIP_DB=SPIP database navn
 DescADHERENT_SPIP_USER=SPIP database login
-DescADHERENT_SPIP_PASS=SPIP database password
-AddIntoSpip=Add into SPIP
-AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
-AddIntoSpipError=Failed to add the user in SPIP
-DeleteIntoSpip=Remove from SPIP
-DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
-DeleteIntoSpipError=Failed to suppress the user from SPIP
-SPIPConnectionFailed=Failed to connect to SPIP
-SuccessToAddToMailmanList=%s successfully added to mailman list %s or SPIP database
-SuccessToRemoveToMailmanList=%s successfully removed from mailman list %s or SPIP database
+DescADHERENT_SPIP_PASS=SPIP database kodeord
+AddIntoSpip=Tilføj til SPIP
+AddIntoSpipConfirmation=Er du sikker på, at du vil tilføje denne medlem til SPIP?
+AddIntoSpipError=Kunne ikke tilføje brugeren i SPIP
+DeleteIntoSpip=Fjern fra SPIP
+DeleteIntoSpipConfirmation=Er du sikker på, at du vil fjerne denne medlem fra SPIP?
+DeleteIntoSpipError=Kunne ikke undertrykke brugeren fra SPIP
+SPIPConnectionFailed=Kunne ikke oprette forbindelse til SPIP
+SuccessToAddToMailmanList=%s med succes tilføjet mailman liste %s eller SPIP database
+SuccessToRemoveToMailmanList=%s med succes fjernet fra mailman liste %s eller SPIP database
diff --git a/htdocs/langs/da_DK/mails.lang b/htdocs/langs/da_DK/mails.lang
index bfd9b1dd5ea..4f1a2f02d3d 100644
--- a/htdocs/langs/da_DK/mails.lang
+++ b/htdocs/langs/da_DK/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails indlæst af brugeren
 MailingModuleDescDolibarrUsers=Brugere med e-mails
 MailingModuleDescThirdPartiesByCategories=Tredjeparter (efter kategorier)
 SendingFromWebInterfaceIsNotAllowed=Afsendelse fra webgrænseflade er ikke tilladt.
+EmailCollectorFilterDesc=Alle filtre skal matche for at en e-mail bliver indsamlet
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s filtjenester
@@ -125,12 +126,13 @@ TagMailtoEmail=Modtager E-mail (herunder html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Adviséringer
-NoNotificationsWillBeSent=Ingen e-mail-meddelelser er planlagt for denne begivenhed, og firmaet
-ANotificationsWillBeSent=1 anmeldelse vil blive sendt via email
-SomeNotificationsWillBeSent=%s meddelelser vil blive sendt via email
-AddNewNotification=Activate a new email notification target
-ListOfActiveNotifications=List all active targets for email notification
-ListOfNotificationsDone=List alle e-mail meddelelser
+NotificationsAuto=Underretninger Auto.
+NoNotificationsWillBeSent=Ingen automatiske e-mail-underretninger er planlagt for denne begivenhedstype og virksomhed
+ANotificationsWillBeSent=1 automatisk underretning sendes via e-mail
+SomeNotificationsWillBeSent=%s automatiske meddelelser sendes via e-mail
+AddNewNotification=Abonner på en ny automatisk e-mail-underretning (mål / begivenhed)
+ListOfActiveNotifications=Liste over alle aktive abonnementer (mål / begivenheder) til automatisk e-mail-underretning
+ListOfNotificationsDone=Liste over alle sendte automatiske e-mail-meddelelser
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Udfyld indtastningsfelter for at vælge tredjeparter eller kontaktpersoner / adresser, der skal målrettes
-AdvTgtSearchTextHelp=Brug %% som jokertegn. For eksempel for at finde alle emner som <b> jean, joe, jim </ b>, kan du indtaste <b> j%% </ b>, du kan også bruge; som separator for værdi og brug! for undtagen denne værdi. For eksempel <b> jean; joe; jim%%;! Jimo;! Jima% </ b> vil målrette alle jean, joe, start med jim men ikke jimo og ikke alt der starter med jima
+AdvTgtSearchTextHelp=Brug %% som wildcards. For eksempel for at finde alle varer som <b> jean, joe, jim </b>, kan du indtaste <b> j%% </b>, du kan også bruge; som separator for værdi, og brug! for undtagen denne værdi. For eksempel <b> jean; joe; jim%%;! Jimo;! Jima%% </b> vil målrette mod alle jean, joe, start med jim, men ikke jimo og ikke alt, der starter med jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Udgående e-mail opsætning
-InGoingEmailSetup=Indgående e-mail opsætning
-OutGoingEmailSetupForEmailing=Udgående e-mail opsætning (til modul%s)
-DefaultOutgoingEmailSetup=Standard udgående e-mail opsætning
+OutGoingEmailSetup=Udgående e-mails
+InGoingEmailSetup=Indgående e-mails
+OutGoingEmailSetupForEmailing=Udgående e-mails (for modul %s)
+DefaultOutgoingEmailSetup=Samme konfiguration end den globale opsætning af udgående e-mail
 Information=Information
 ContactsWithThirdpartyFilter=Kontakter med tredjepart filter
-Unanswered=Unanswered
+Unanswered=Ubesvaret
 Answered=Besvaret
-IsNotAnAnswer=Is not answer (initial email)
-IsAnAnswer=Is an answer of an initial email
+IsNotAnAnswer=Er ikke svar (indledende e-mail)
+IsAnAnswer=Er et svar på en indledende e-mail
+RecordCreatedByEmailCollector=Post oprettet af Email Collector %s fra e-mail %s
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index b388aeabcdd..dddf212c95d 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -24,11 +24,13 @@ FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Database forbindelse
-NoTemplateDefined=Ingen skabelon til rådighed for denne Email-type
+NoTemplateDefined=Ingen skabelon til rådighed for denne e-mail-type
 AvailableVariables=Tilgængelige erstatnings variabler
 NoTranslation=Ingen oversættelse
 Translation=Oversættelse
+CurrentTimeZone=Aktuelle tidszone
 EmptySearchString=Indtast ikke tomme søgekriterier
+EnterADateCriteria=Indtast et datokriterium
 NoRecordFound=Ingen poster fundet
 NoRecordDeleted=Ingen post slettet
 NotEnoughDataYet=Ikke nok data
@@ -47,7 +49,7 @@ ErrorSQL=SQL Fejl
 ErrorLogoFileNotFound=Logo fil '%s' blev ikke fundet
 ErrorGoToGlobalSetup=Gå til 'Firma/Organisation' opsætning for at rette dette
 ErrorGoToModuleSetup=Gå til modulopsætning for at rette dette
-ErrorFailedToSendMail=Det lykkedes ikke at sende Email (sender=%s, receiver= %s)
+ErrorFailedToSendMail=Det lykkedes ikke at sende e-mail (afsender=%s, modtager= %s)
 ErrorFileNotUploaded=Filen blev ikke uploadet. Kontroller, at størrelse ikke overstiger det maksimalt tilladte, at den frie plads der er til rådighed på disken, og at der ikke allerede en fil med samme navn i denne mappe.
 ErrorInternalErrorDetected=Fejl opdaget
 ErrorWrongHostParameter=Forkert vært parameter
@@ -85,6 +87,8 @@ FileWasNotUploaded=En fil er valgt som vedhæng, men endnu ikke uploadet. Klik p
 NbOfEntries=Antal indgange
 GoToWikiHelpPage=Læs online hjælp (Adgang til Internettet er nødvendig)
 GoToHelpPage=Læs hjælp
+DedicatedPageAvailable=Der er en dedikeret hjælpeside, der er relateret til din aktuelle skærm
+HomePage=Hjemmeside
 RecordSaved=Data gemt
 RecordDeleted=Post slettet
 RecordGenerated=Data genereret
@@ -236,7 +240,7 @@ Designation=Beskrivelse
 DescriptionOfLine=Beskrivelse af linje
 DateOfLine=Dato for linje
 DurationOfLine=Linjens varighed
-Model=Dokumenter skabeloner
+Model=Skabelon
 DefaultModel=Standard dokument skabelon
 Action=Begivenhed
 About=Om
@@ -248,7 +252,7 @@ Limit=Grænseværdi
 Limits=Grænseværdier
 Logout=Log ud
 NoLogoutProcessWithAuthMode=Ingen applikations afbrydelses funktion med autentificeringstilstand <b>%s</b>
-Connection=Logind
+Connection=Log ind
 Setup=Opsætning
 Alert=Alarm
 MenuWarnings=Indberetninger
@@ -355,25 +359,25 @@ UnitPriceHT=Enhedspris (ekskl.)
 UnitPriceHTCurrency=Enhedspris (ekskl.) (Valuta)
 UnitPriceTTC=Enhedspris
 PriceU=Salgspris
-PriceUHT=Salgspris (netto)
+PriceUHT=Pris (netto)
 PriceUHTCurrency=Salgspris (Valuta)
-PriceUTTC=Brutto(Inkl.Moms)
+PriceUTTC=Brutto (inkl. moms)
 Amount=Beløb
 AmountInvoice=Fakturabeløbet
 AmountInvoiced=Beløb faktureres
 AmountInvoicedHT=Faktureret beløb (ekskl. Moms)
-AmountInvoicedTTC=Faktureret beløb (inkl. Moms)
+AmountInvoicedTTC=Faktureret beløb (inkl. moms)
 AmountPayment=Indbetalingsbeløb
 AmountHTShort=Beløb (ekskl.)
 AmountTTCShort=Beløb (inkl. moms)
-AmountHT=Beløb (ekskl. Skat)
+AmountHT=Beløb (ekskl. moms)
 AmountTTC=Beløb (inkl. moms)
 AmountVAT=Momsbeløb
 MulticurrencyAlreadyPaid=Allerede betalt, original valuta
 MulticurrencyRemainderToPay=Manglene betaling , original valuta
 MulticurrencyPaymentAmount=Betalingsbeløb, oprindelig valuta
-MulticurrencyAmountHT=Beløb (ekskl. Skat), original valuta
-MulticurrencyAmountTTC=Beløb (inkl. Moms), oprindelig valuta
+MulticurrencyAmountHT=Beløb (ekskl. moms), original valuta
+MulticurrencyAmountTTC=Beløb (inkl. moms), oprindelig valuta
 MulticurrencyAmountVAT=Momsbeløb, oprindelige valuta
 MulticurrencySubPrice=Beløb subpris multi valuta
 AmountLT1=Momsbeløb 2
@@ -387,15 +391,15 @@ PriceQtyMinHTCurrency=Prismængde min. (ekskl. skat) (valuta)
 Percentage=Procent
 Total=I alt
 SubTotal=Sum
-TotalHTShort=I alt (ekskl.)
+TotalHTShort=I alt (u/moms)
 TotalHT100Short=I alt 100%% (ekskl.)
-TotalHTShortCurrency=I alt (ekskl. I valuta)
-TotalTTCShort=I alt (Inkl. moms)
-TotalHT=I alt (ekskl. Skat)
-TotalHTforthispage=I alt (ekskl. Skat) for denne side
+TotalHTShortCurrency=I alt (ekskl. i valuta)
+TotalTTCShort=I alt (m/moms)
+TotalHT=I alt (u/moms)
+TotalHTforthispage=I alt (ekskl. moms) for denne side
 Totalforthispage=I alt for denne side
-TotalTTC=I alt (Inkl. Moms)
-TotalTTCToYourCredit=I alt (Inkl. Moms) til din kredit
+TotalTTC=I alt (m/moms)
+TotalTTCToYourCredit=I alt (inkl. moms) til din kredit
 TotalVAT=Moms i alt
 TotalVATIN=IGST i alt
 TotalLT1=Total Moms 2
@@ -404,10 +408,10 @@ TotalLT1ES=RE i alt
 TotalLT2ES=IRPF i alt
 TotalLT1IN=I alt CGST
 TotalLT2IN=I alt SGST
-HT=Ekskl. skat
-TTC=Inkl. Moms
-INCVATONLY=Inkl. Moms
-INCT=Inkl. Alle skatter 
+HT=Ekskl. moms
+TTC=Inkl. moms
+INCVATONLY=Inkl. moms
+INCT=Inkl. moms og afgifter
 VAT=Moms
 VATIN=IGST
 VATs=Salgs Moms
@@ -433,6 +437,7 @@ RemainToPay=Manglende betaling
 Module=Modul/Applikation
 Modules=Moduler/Applikationer
 Option=Valgmulighed
+Filters=Filtre
 List=Liste
 FullList=Fuldstændig liste
 FullConversation=Fuld samtale
@@ -503,7 +508,7 @@ Other=Anden
 Others=Andre
 OtherInformations=Anden information
 Quantity=Antal
-Qty=Qty
+Qty=Antal
 ChangedBy=Ændret af
 ApprovedBy=Godkendt af
 ApprovedBy2=Godkendt af (sekundær)
@@ -550,10 +555,10 @@ AddPhoto=Tilføj billede
 DeletePicture=Billede slette
 ConfirmDeletePicture=Bekræft billed sletning?
 Login=Login
-LoginEmail=Logind (email)
-LoginOrEmail=Logind eller Email
+LoginEmail=Login (e-mail)
+LoginOrEmail=Login eller e-mail
 CurrentLogin=Nuværende login
-EnterLoginDetail=Indtast logind oplysninger
+EnterLoginDetail=Indtast login-oplysninger
 January=Januar
 February=Februar
 March=Marts
@@ -662,16 +667,16 @@ FeatureNotYetSupported=Funktion endnu ikke understøttet
 CloseWindow=Luk vindue
 Response=Responds
 Priority=Prioritet
-SendByMail=Send via email
-MailSentBy=Email sendt fra
+SendByMail=Send via e-mail
+MailSentBy=E-mail sendt af
 NotSent=Ikke sendt
 TextUsedInTheMessageBody=Email indhold
 SendAcknowledgementByMail=Send bekræftelses Email
-SendMail=Send Email
-Email=EMail
+SendMail=Send e-mail
+Email=E-mail
 NoEMail=Ingen Email
 AlreadyRead=Har allerede læst
-NotRead=Ikke læst
+NotRead=Ulæst
 NoMobilePhone=Ingen mobil telefon
 Owner=Ejer
 FollowingConstantsWillBeSubstituted=Følgende konstanterne skal erstatte med tilsvarende værdi.
@@ -1107,3 +1112,8 @@ UpToDate=Opdateret
 OutOfDate=Umoderne
 EventReminder=Påmindelse om begivenhed
 UpdateForAllLines=Opdatering til alle linjer
+OnHold=I venteposition
+AffectTag=Påvirke tags
+ConfirmAffectTag=Bulk Tags påvirker
+ConfirmAffectTagQuestion=Er du sikker på, at du vil påvirke tags til den %s valgte post (er)?
+CategTypeNotFound=Ingen tag-type fundet for typen af poster
diff --git a/htdocs/langs/da_DK/modulebuilder.lang b/htdocs/langs/da_DK/modulebuilder.lang
index d576de3f2db..7d0df081858 100644
--- a/htdocs/langs/da_DK/modulebuilder.lang
+++ b/htdocs/langs/da_DK/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP side til at oprette / redigere / se en post
 PageForAgendaTab=PHP side for fanen begivenhed
 PageForDocumentTab=PHP-side for dokumentfanen
 PageForNoteTab=PHP side til notatfane
+PageForContactTab=PHP-side til kontaktfanen
 PathToModulePackage=Sti til zip af modul / applikationspakke
 PathToModuleDocumentation=Sti til fil af modul / applikationsdokumentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Mellemrum eller specialtegn er ikke tilladt.
@@ -77,7 +78,7 @@ IsAMeasure=Er en foranstaltning
 DirScanned=Directory scannet
 NoTrigger=Ingen udløser
 NoWidget=Ingen widget
-GoToApiExplorer=Gå til API Explorer
+GoToApiExplorer=API udforske 
 ListOfMenusEntries=Liste over menupunkter
 ListOfDictionariesEntries=Liste over poster i ordbøger
 ListOfPermissionsDefined=Liste over definerede tilladelser
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Hvis du har kendskab til SQL og PHP, kan du bruge guide
 SeeTopRightMenu=Se <span class = "fa fa-bug"> </span> i øverste højre menu
 AddLanguageFile=Tilføj sprogfil
 YouCanUseTranslationKey=Du kan her bruge en nøgle, der er oversættelsessnøglen fundet i sprogfilen (se fanen "Sprog").
-DropTableIfEmpty=(Slet tabel hvis tom)
+DropTableIfEmpty=(Ødelæg tabel, hvis det er tomt)
 TableDoesNotExists=Tabellen %s findes ikke
 TableDropped=Tabel %s slettet
 InitStructureFromExistingTable=Byg strukturen array streng af en eksisterende tabel
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Brug en bestemt editor webadresse
 UseSpecificFamily = Brug en bestemt familie
 UseSpecificAuthor = Brug en bestemt forfatter
 UseSpecificVersion = Brug en bestemt initial version
-ModuleMustBeEnabled=Modulet / applikationen skal være aktiveret først
 IncludeRefGeneration=Reference til objekt skal genereres automatisk
 IncludeRefGenerationHelp=Kontroller dette, hvis du vil inkludere kode til at styre genereringen af referencen automatisk
 IncludeDocGeneration=Jeg vil generere nogle dokumenter fra objektet
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Felttype:<br> varchar (99), dobbelt (24,8), reel, tekst, html,
 AsciiToHtmlConverter=Ascii til HTML-konverter
 AsciiToPdfConverter=Ascii til PDF konverter
 TableNotEmptyDropCanceled=Tabellen er ikke tom. Drop er annulleret.
+ModuleBuilderNotAllowed=Modulbyggeren er tilgængelig, men ikke tilladt for din bruger.
diff --git a/htdocs/langs/da_DK/orders.lang b/htdocs/langs/da_DK/orders.lang
index 42464a28ed3..11b4d53dfbd 100644
--- a/htdocs/langs/da_DK/orders.lang
+++ b/htdocs/langs/da_DK/orders.lang
@@ -55,7 +55,7 @@ StatusOrderRefused=Afvist
 StatusOrderReceivedPartially=Delvist modtaget
 StatusOrderReceivedAll=Alle varer modtaget
 ShippingExist=En forsendelse findes
-QtyOrdered=Qty bestilt
+QtyOrdered=Antal bestilt
 ProductQtyInDraft=Produkt mængde i udkast ordrer
 ProductQtyInDraftOrWaitingApproved=Produkt mængde i udkast eller godkendte ordrer, endnu ikke bestilt
 MenuOrdersToBill=Ordrer leveret
@@ -137,7 +137,7 @@ Error_OrderNotChecked=Ingen ordrer til faktura valgt
 # Order modes (how we receive order). Not the "why" are keys stored into dict.lang
 OrderByMail=Mail
 OrderByFax=Fax
-OrderByEMail=EMail
+OrderByEMail=E-mail
 OrderByWWW=Online
 OrderByPhone=Telefon
 # Documents models
diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang
index 31fb1453cd4..e4e1c879704 100644
--- a/htdocs/langs/da_DK/other.lang
+++ b/htdocs/langs/da_DK/other.lang
@@ -5,8 +5,6 @@ Tools=Værktøj
 TMenuTools=Værktøjer
 ToolsDesc=Alle værktøjer, der ikke er inkluderet i andre menupunkter, er grupperet her. <br> Alle værktøjerne er tilgængelige via menuen til venstre.
 Birthday=Fødselsdag
-BirthdayDate=Fødselsdato
-DateToBirth=Fødselsdato
 BirthdayAlertOn=fødselsdag alarm aktive
 BirthdayAlertOff=fødselsdag alarm inaktive
 TransKey=Oversættelse af nøgle TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Forrige måned (nummer 1-12) på faktura dato
 TextPreviousMonthOfInvoice=Forrige måned (tekst) af faktura dato
 NextMonthOfInvoice=Følgende måned (nummer 1-12) på faktura dato
 TextNextMonthOfInvoice=Følgende måned (tekst) af faktura dato
+PreviousMonth=Forrige måned
+CurrentMonth=Indeværende måned
 ZipFileGeneratedInto=Zip-fil genereret til <b> %s </ b>.
 DocFileGeneratedInto=Doc-fil genereret til <b> %s </ b>.
 JumpToLogin=Afbrudt. Gå til login side ...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nFind forsendelse __REF__ vedhæ
 PredefinedMailContentSendFichInter=__(Hello)__\n\nFind intervention __REF__ vedhæftet\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Du kan klikke på linket herunder for at foretage din betaling, hvis den ikke allerede er færdig.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hej)__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Begivenhedspåmindelse "__EVENT_LABEL__" den __EVENT_DATE__ kl. __EVENT_TIME__ <br> <br> Dette er en automatisk besked, bedes du ikke svare.
 DemoDesc=Dolibarr er en kompakt ERP / CRM, der understøtter flere forretningsmoduler. En demo, der viser alle moduler, giver ingen mening, da dette scenario aldrig forekommer (flere hundrede tilgængelige). Så flere demo profiler er tilgængelige.
 ChooseYourDemoProfil=Vælg den demoprofil, der passer bedst til dine behov ...
 ChooseYourDemoProfilMore=... eller bygg din egen profil <br> (manuel modulvalg)
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Kontakt / adresse skabt via e-mail indsamler fra
 ProjectCreatedByEmailCollector=Projekt skabt via e-mail indsamler fra mail MSGID %s
 TicketCreatedByEmailCollector=Billet skabt via e-mail indsamler fra mail MSGID %s
 OpeningHoursFormatDesc=Brug et - til separat åbning og lukning timer. <br> brug en mellemrum"Space" til at indtaste forskellige område. <br> Eksempel: 8-12 14-18
+PrefixSession=Præfiks til session-id
 
 ##### Export #####
 ExportsArea=Eksport område
@@ -278,9 +280,9 @@ LinesToImport=Linjer at importere
 
 MemoryUsage=Brug af hukommelse
 RequestDuration=Anmodningens varighed
-ProductsPerPopularity=Products/Services by popularity
+ProductsPerPopularity=Produkter / Ydelser efter popularitet
 PopuProp=Produkter/tjenester efter popularitet i forslag
 PopuCom=Produkter/tjenester efter popularitet i ordrer
 ProductStatistics=Produkter / services statistik
 NbOfQtyInOrders=Antal i ordrer
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Vælg den type objekt, der skal analyseres ...
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index d266cdfa657..2524c84be6f 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -70,7 +70,7 @@ UpdateDefaultPrice=Opdater standardpris
 UpdateLevelPrices=Opdater priser for hvert niveau
 AppliedPricesFrom=Anvendt fra
 SellingPrice=Salgspris
-SellingPriceHT=Salgspris (ekskl. Skat)
+SellingPriceHT=Salgspris (ekskl. moms)
 SellingPriceTTC=Salgspris (inkl. moms)
 SellingMinPriceTTC=Minimumssalgspris (inkl. Skat)
 CostPriceDescription=Dette prisfelt (ekskl. Skat) kan bruges til at gemme det gennemsnitlige beløb, dette produkt koster for din virksomhed. Det kan være enhver pris, du selv beregner, for eksempel ud fra den gennemsnitlige købspris plus gennemsnitlige produktions- og distributionsomkostninger.
@@ -104,24 +104,25 @@ SetDefaultBarcodeType=Vælg stregkodetype
 BarcodeValue=Stregkodeværdi
 NoteNotVisibleOnBill=Note (ikke synlig på fakturaer, tilbud ...)
 ServiceLimitedDuration=Hvis varen er en ydelse med begrænset varighed:
-FillWithLastServiceDates=Fill with last service line dates
+FillWithLastServiceDates=Udfyld med sidste servicelinjedatoer
 MultiPricesAbility=Flere prissegmenter pr. Produkt / service (hver kunde er i et prissegment)
 MultiPricesNumPrices=Antal priser
 DefaultPriceType=Prisgrundlag pr. Standard (med eller uden skat) ved tilføjelse af nye salgspriser
-AssociatedProductsAbility=Activate kits (virtual products)
-AssociatedProducts=Kits
-AssociatedProductsNumber=Number of products composing this kit
+AssociatedProductsAbility=Aktivér sæt (sæt andre produkter)
+VariantsAbility=Aktiver varianter (variationer af produkter, f.eks. Farve, størrelse)
+AssociatedProducts=Sæt
+AssociatedProductsNumber=Antal produkter, der udgør dette sæt
 ParentProductsNumber=Antal forældrevarer
 ParentProducts=Moderselskaber
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
+IfZeroItIsNotAVirtualProduct=Hvis 0, er dette produkt ikke et sæt
+IfZeroItIsNotUsedByVirtualProduct=Hvis 0, bruges dette produkt ikke af noget sæt
 KeywordFilter=Keyword filter
 CategoryFilter=Kategori filter
 ProductToAddSearch=Søg produkt for at tilføje
 NoMatchFound=Ingen match fundet
 ListOfProductsServices=Liste over produkter / tjenester
-ProductAssociationList=List of products/services that are component(s) of this kit
-ProductParentList=List of kits with this product as a component
+ProductAssociationList=Liste over produkter / tjenester, der er komponent (er) i dette sæt
+ProductParentList=Liste over sæt med dette produkt som en komponent
 ErrorAssociationIsFatherOfThis=En af valgte produkt er moderselskab med aktuelle produkt
 DeleteProduct=Slet en vare/ydelse
 ConfirmDeleteProduct=Er du sikker på du vil slette denne vare/ydelse?
@@ -167,8 +168,10 @@ BuyingPrices=Købspriser
 CustomerPrices=Kundepriser
 SuppliersPrices=Leverandørpriser
 SuppliersPricesOfProductsOrServices=Sælgerpriser (af produkter eller tjenester)
-CustomCode=Told / vare / HS-kode
+CustomCode=Told | Råvare | HS-kode
 CountryOrigin=Oprindelsesland
+RegionStateOrigin=Region oprindelse
+StateOrigin=Stat | provinsens oprindelse
 Nature=Produktets art (materiale / færdig)
 NatureOfProductShort=Produktets art
 NatureOfProductDesc=Råmateriale eller færdigt produkt
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Brug den faste pris
 PriceByQuantity=Forskellige priser efter mængde
 DisablePriceByQty=Deaktiver priserne efter antal
 PriceByQuantityRange=Mængdeområde
-MultipriceRules=Prissegmentregler
+MultipriceRules=Automatiske priser for segment
 UseMultipriceRules=Brug prissegmentregler (defineret i opsætning af produktmodul) til automatisk beregning af priser for alle andre segmenter i henhold til første segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% rabat over %s
@@ -287,7 +290,7 @@ PriceExpressionEditorHelp5=Tilgængelige globale værdier:
 PriceMode=Pris-tilstand
 PriceNumeric=Numero
 DefaultPrice=Standard pris
-DefaultPriceLog=Log of previous default prices
+DefaultPriceLog=Log over tidligere standardpriser
 ComposedProductIncDecStock=Forøg / sænk lagerbeholdning ved forældreændring
 ComposedProduct=Børneprodukter
 MinSupplierPrice=Min købskurs
@@ -340,7 +343,7 @@ UseProductFournDesc=Tilføj en funktion til at definere beskrivelser af produkte
 ProductSupplierDescription=Leverandørbeskrivelse for produktet
 UseProductSupplierPackaging=Brug emballage til leverandørpriser (genberegn mængder i henhold til emballage, der er angivet på leverandørpris, når du tilføjer / opdaterer linje i leverandørdokumenter)
 PackagingForThisProduct=Emballage
-PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
+PackagingForThisProductDesc=Ved leverandørbestilling bestiller du automatisk denne mængde (eller et multiplum af denne mængde). Må ikke være mindre end det mindste købsmængde
 QtyRecalculatedWithPackaging=Mængden af linjen blev beregnet om efter leverandøremballage
 
 #Attributes
@@ -364,9 +367,9 @@ SelectCombination=Vælg kombination
 ProductCombinationGenerator=Varianter generator
 Features=Funktioner
 PriceImpact=Prispåvirkning
-ImpactOnPriceLevel=Impact on price level %s
-ApplyToAllPriceImpactLevel= Apply to all levels
-ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
+ImpactOnPriceLevel=Effekt på prisniveau %s
+ApplyToAllPriceImpactLevel= Anvend på alle niveauer
+ApplyToAllPriceImpactLevelHelp=Ved at klikke her indstiller du den samme prispåvirkning på alle niveauer
 WeightImpact=Vægtpåvirkning
 NewProductAttribute=Ny attribut
 NewProductAttributeValue=Ny attributværdi
diff --git a/htdocs/langs/da_DK/propal.lang b/htdocs/langs/da_DK/propal.lang
index d742aaccad7..01e676de7d8 100644
--- a/htdocs/langs/da_DK/propal.lang
+++ b/htdocs/langs/da_DK/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Send tilbud med posten
 DatePropal=Dato for tilbud
 DateEndPropal=Gyldighed udløber
 ValidityDuration=Gyldighedstid
-CloseAs=Sæt status til
 SetAcceptedRefused=Sæt accepteret/afvist
 ErrorPropalNotFound=Propal %s blev ikke fundet
 AddToDraftProposals=Tilføj skabelon
@@ -57,7 +56,7 @@ CreateEmptyPropal=Opret tomt kommercielt forslag eller fra listen over produkter
 DefaultProposalDurationValidity=Standard gyldighedstid for tilbud (i dage)
 UseCustomerContactAsPropalRecipientIfExist=Brug kontakt/adresse med type 'Kontakt opfølgnings forslag', hvis det er defineret i stedet for tredjepartsadresse som forslag modtageradresse
 ConfirmClonePropal=Er du sikker på, du vil klone tilbuddet <b>%s</b>?
-ConfirmReOpenProp=Er du sikker på du vil genåbne tilbuddet <b>%s</b>?
+ConfirmReOpenProp=Er du sikker på, at du vil åbne det tilbud igen <b> %s </b>?
 ProposalsAndProposalsLines=Tilbud og linjer
 ProposalLine=Tilbudslinje
 AvailabilityPeriod=Tilgængelighed forsinkelse
@@ -85,3 +84,8 @@ ProposalCustomerSignature=Skriftlig accept, firmastempel, dato og underskrift
 ProposalsStatisticsSuppliers=Forhandler forslagsstatistik
 CaseFollowedBy=Sag efterfulgt af
 SignedOnly=Kun underskrevet
+IdProposal=Forslags-id
+IdProduct=Produkt-id
+PrParentLine=Forslagsforældrelinje
+LineBuyPriceHT=Købspris Beløb fratrukket skat for linje
+
diff --git a/htdocs/langs/da_DK/recruitment.lang b/htdocs/langs/da_DK/recruitment.lang
index 3895222dc56..a747076bfdd 100644
--- a/htdocs/langs/da_DK/recruitment.lang
+++ b/htdocs/langs/da_DK/recruitment.lang
@@ -27,10 +27,10 @@ ModuleRecruitmentDesc = Administrer og følg rekrutteringskampagner til nye stil
 #
 RecruitmentSetup = Rekrutteringsopsætning
 Settings = Indstillinger
-RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentSetupPage = Indtast her opsætningen af de vigtigste muligheder for rekrutteringsmodulet
 RecruitmentArea=Rekrutteringsområde
-PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
-EnablePublicRecruitmentPages=Enable public pages of open jobs
+PublicInterfaceRecruitmentDesc=Offentlige sider med job er offentlige webadresser, der skal vises og besvares ved åbne job. Der er et andet link til hvert åbent job, der findes på hver jobjournal.
+EnablePublicRecruitmentPages=Aktivér offentlige sider med åbne job
 
 #
 # About page
@@ -46,30 +46,31 @@ FutureManager=Fremtidig leder
 ResponsibleOfRecruitement=Ansættelsesansvarlig
 IfJobIsLocatedAtAPartner=Hvis jobbet er placeret på en partner sted
 PositionToBeFilled=Stilling
-PositionsToBeFilled=Job positions
-ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job positions
+PositionsToBeFilled=Jobstillinger
+ListOfPositionsToBeFilled=Liste over jobstillinger
+NewPositionToBeFilled=Nye jobstillinger
 
-JobOfferToBeFilled=Job position to be filled
-ThisIsInformationOnJobPosition=Information of the job position to be filled
-ContactForRecruitment=Contact for recruitment
-EmailRecruiter=Email recruiter
-ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New application
-ListOfCandidatures=List of applications
-RequestedRemuneration=Requested remuneration
-ProposedRemuneration=Proposed remuneration
-ContractProposed=Contract proposed
-ContractSigned=Contract signed
-ContractRefused=Contract refused
-RecruitmentCandidature=Application
-JobPositions=Job positions
-RecruitmentCandidatures=Applications
-InterviewToDo=Interview to do
-AnswerCandidature=Application answer
-YourCandidature=Your application
-YourCandidatureAnswerMessage=Thanks you for your application.<br>...
-JobClosedTextCandidateFound=The job position is closed. The position has been filled.
-JobClosedTextCanceled=The job position is closed.
-ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+JobOfferToBeFilled=Jobposition, der skal besættes
+ThisIsInformationOnJobPosition=Oplysninger om den stilling, der skal besættes
+ContactForRecruitment=Kontakt for rekruttering
+EmailRecruiter=E-mail-rekrutterer
+ToUseAGenericEmail=At bruge en generisk e-mail. Hvis det ikke er defineret, vil e-mailen til den ansvarlige for rekrutteringen blive brugt
+NewCandidature=Ny applikation
+ListOfCandidatures=Liste over applikationer
+RequestedRemuneration=Anmodet vederlag
+ProposedRemuneration=Foreslået vederlag
+ContractProposed=Foreslået kontrakt
+ContractSigned=Kontrakt underskrevet
+ContractRefused=Kontrakten blev afvist
+RecruitmentCandidature=Ansøgning
+JobPositions=Jobstillinger
+RecruitmentCandidatures=Ansøgninger
+InterviewToDo=Interview at gøre
+AnswerCandidature=Ansøgning svar
+YourCandidature=Din ansøgning
+YourCandidatureAnswerMessage=Tak for din ansøgning. <br> ...
+JobClosedTextCandidateFound=Jobpositionen er lukket. Stillingen er besat.
+JobClosedTextCanceled=Jobpositionen er lukket.
+ExtrafieldsJobPosition=Supplerende attributter (jobstillinger)
+ExtrafieldsCandidatures=Supplerende attributter (jobansøgninger)
+MakeOffer=Giv et tilbud
diff --git a/htdocs/langs/da_DK/sendings.lang b/htdocs/langs/da_DK/sendings.lang
index d430c0fe7ac..4d4c7a5a07d 100644
--- a/htdocs/langs/da_DK/sendings.lang
+++ b/htdocs/langs/da_DK/sendings.lang
@@ -17,10 +17,10 @@ NumberOfShipmentsByMonth=Antal forsendelser pr. Måned
 SendingCard=Forsendelse kort
 NewSending=Ny afsendelse
 CreateShipment=Opret afsendelse
-QtyShipped=Qty afsendt
+QtyShipped=Antal afsendt
 QtyShippedShort=Antal skibe.
 QtyPreparedOrShipped=Antal forberedt eller afsendt
-QtyToShip=Qty til skibet
+QtyToShip=Antal til afsendelse
 QtyToReceive=Antal at modtage
 QtyReceived=Antal modtagne
 QtyInOtherShipments=Antal i andre forsendelser
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Andre sendings for denne ordre
 SendingsAndReceivingForSameOrder=Forsendelser og kvitteringer for denne ordre
 SendingsToValidate=Henvist til bekræfte
 StatusSendingCanceled=Aflyst
+StatusSendingCanceledShort=Aflyst
 StatusSendingDraft=Udkast
 StatusSendingValidated=Bekræftet (varer til afsendelse eller allerede afsendt)
 StatusSendingProcessed=Forarbejdet
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Du skal først bekræfte ordren, inden du kan f
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Mere komplet dokument model for levering kvitteringer (logo. ..)
+DocumentModelStorm=Mere komplet dokumentmodel for leveringskvitteringer og ekstrafields kompatibilitet (logo ...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstant EXPEDITION_ADDON_NUMBER ikke defineret
 SumOfProductVolumes=Summen af ​​produktmængder
 SumOfProductWeights=Summen af ​​produktvægt
diff --git a/htdocs/langs/da_DK/stocks.lang b/htdocs/langs/da_DK/stocks.lang
index 5c024d33a93..c44c10a07e2 100644
--- a/htdocs/langs/da_DK/stocks.lang
+++ b/htdocs/langs/da_DK/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Bevægelses-id %d
 ListMouvementStockProject=Liste over lagerbevægelser forbundet med projektet
 StocksArea=Pakhuse
 AllWarehouses=Alle lagre
-IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
+IncludeEmptyDesiredStock=Inkluder også negativ bestand med udefineret ønsket lager
 IncludeAlsoDraftOrders=Medtag også udkast til ordrer
 Location=Placering
 LocationSummary=Kort placerings navn
@@ -122,9 +122,9 @@ DesiredStockDesc=Dette lagerbeløb er den værdi, der bruges til at fylde lagere
 StockToBuy=At bestille
 Replenishment=genopfyldning
 ReplenishmentOrders=Replenishment ordrer
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
-UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
-ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
+VirtualDiffersFromPhysical=I henhold til stigning / formindskelse af aktieoptioner kan fysisk aktie og virtuel aktie (fysisk aktie + åbne ordrer) variere
+UseRealStockByDefault=Brug ægte lager i stedet for virtuel lager til genopfyldningsfunktion
+ReplenishmentCalculation=Mængden til ordren vil være (ønsket mængde - reel lager) i stedet for (ønsket mængde - virtuel lager)
 UseVirtualStock=Brug virtuelt lager
 UsePhysicalStock=Brug fysisk lager
 CurentSelectionMode=Aktuel valgtilstand
@@ -236,7 +236,8 @@ AlwaysShowFullArbo=Vis hele træets lagertrin ved pop op af warehouse-links (Adv
 StockAtDatePastDesc=Du kan her se aktien (ægte aktier) på en given dato i fortiden
 StockAtDateFutureDesc=Du kan her se bestanden (virtuel bestand) på en given dato fremover
 CurrentStock=Aktuel lager
-InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
-UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|serial barcode)
+InventoryRealQtyHelp=Sæt værdi til 0 for at nulstille antal <br> Hold feltet tomt, eller fjern linjen for at forblive uændret
+UpdateByScaning=Opdater ved at scanne
+UpdateByScaningProductBarcode=Opdatering ved scanning (produktstregkode)
+UpdateByScaningLot=Opdatering ved scanning (parti | seriel stregkode)
+DisableStockChangeOfSubProduct=Deaktiver lagerændringen for alle delprodukter i dette sæt under denne bevægelse.
diff --git a/htdocs/langs/da_DK/ticket.lang b/htdocs/langs/da_DK/ticket.lang
index 9bc8f5b81c7..86d053f9cc4 100644
--- a/htdocs/langs/da_DK/ticket.lang
+++ b/htdocs/langs/da_DK/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Opgaver - Typer
 TicketDictCategory=Opgave - Grupper
 TicketDictSeverity=Opgave - Sværhedsgrader
 TicketDictResolution=Opgave - Afsluttet
-TicketTypeShortBUGSOFT=Funktionssvigt logik
-TicketTypeShortBUGHARD=Funktionssvigt udstyr
-TicketTypeShortCOM=Kommercielt spørgsmål
 
+TicketTypeShortCOM=Kommercielt spørgsmål
 TicketTypeShortHELP=Anmodning om hjælp
 TicketTypeShortISSUE=Problem, fejl eller problemer
 TicketTypeShortREQUEST=Skift eller anmodning om forbedring
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Andre
 TicketSeverityShortLOW=Lav
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Høj
-TicketSeverityShortBLOCKING=Kritiske / Blokering
+TicketSeverityShortBLOCKING=Kritisk, blokering
 
 ErrorBadEmailAddress=Felt '%s' forkert
 MenuTicketMyAssign=Mine opgaver
@@ -60,7 +58,6 @@ OriginEmail=Email kilde
 Notify_TICKET_SENTBYMAIL=Send opgaver besked via Email
 
 # Status
-NotRead=Ikke læst
 Read=Læs
 Assigned=Tildelt
 InProgress=I gang
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Offentlig grænseflade tillader alle besøgen
 TicketsAutoAssignTicket=Tildel automatisk brugeren, der oprettede opgaven
 TicketsAutoAssignTicketHelp=Når du opretter en opgave, kan brugeren automatisk tildeles opgaven.
 TicketNumberingModules=Opgave nummerering modul
+TicketsModelModule=Dokumentskabeloner til billetter
 TicketNotifyTiersAtCreation=Underret tredjepart ved oprettelsen
 TicketsDisableCustomerEmail=Deaktiver altid Emails, når en opgave oprettes fra den offentlige grænseflade
 TicketsPublicNotificationNewMessage=Send e-mail (s), når en ny besked tilføjes
@@ -164,7 +162,7 @@ TicketCategory=Gruppe
 SeeTicket=Se opgave
 TicketMarkedAsRead=Opgaven er blevet markeret som læst
 TicketReadOn=Læs videre
-TicketCloseOn=Udløbsdato
+TicketCloseOn=lukke dato
 MarkAsRead=Markér opgaven som læst
 TicketHistory=Opgave historik
 AssignUser=Tildel til bruger
@@ -224,7 +222,7 @@ InitialMessage=Indledende besked
 LinkToAContract=Link til en kontrakt
 TicketPleaseSelectAContract=Vælg en kontrakt
 UnableToCreateInterIfNoSocid=Kan ikke oprette en intervention, når der ikke er defineret nogen tredjepart
-TicketMailExchanges=Email udvekslinger
+TicketMailExchanges=Email udveksling
 TicketInitialMessageModified=Indledende besked ændret
 TicketMessageSuccesfullyUpdated=Meddelelsen er opdateret
 TicketChangeStatus=Skift status
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status ændret: %s til %s
 TicketNotNotifyTiersAtCreate=Ikke underret firma på create
 Unread=Ulæst
 TicketNotCreatedFromPublicInterface=Ikke tilgængelig. Opgaven blev ikke oprettet fra den offentlige grænseflade.
-PublicInterfaceNotEnabled=Den offentlige grænseflade var ikke aktiveret
 ErrorTicketRefRequired=Opgave reference navn er påkrævet
 
 #
diff --git a/htdocs/langs/da_DK/website.lang b/htdocs/langs/da_DK/website.lang
index 35d95b5bc5e..ec009b5ebf1 100644
--- a/htdocs/langs/da_DK/website.lang
+++ b/htdocs/langs/da_DK/website.lang
@@ -30,7 +30,6 @@ EditInLine=Rediger inline
 AddWebsite=Tilføj hjemmeside
 Webpage=Webside / container
 AddPage=Tilføj side / container
-HomePage=Hjemmeside
 PageContainer=Side
 PreviewOfSiteNotYetAvailable=Forhåndsvisning af dit websted <strong> %s </ strong> endnu ikke tilgængeligt. Du skal først <strong> Importer en fuld hjemmeside skabelon </ strong> 'eller bare <strong> Tilføj en side / container </ strong>'.
 RequestedPageHasNoContentYet=Den ønskede side med id %s har intet indhold endnu, eller cache-filen .tpl.php blev fjernet. Rediger indholdet på siden for at løse dette.
@@ -101,7 +100,7 @@ EmptyPage=Tom side
 ExternalURLMustStartWithHttp=Ekstern webadresse skal starte med http: // eller https: //
 ZipOfWebsitePackageToImport=Upload Zip-filen i webstedsskabelonpakken
 ZipOfWebsitePackageToLoad=eller vælg en tilgængelig indbygget websteds skabelonpakke
-ShowSubcontainers=Inkluder dynamisk indhold
+ShowSubcontainers=Vis dynamisk indhold
 InternalURLOfPage=Intern webadresse for siden
 ThisPageIsTranslationOf=Denne side / container er en oversættelse af
 ThisPageHasTranslationPages=Denne side / container har oversættelse
@@ -137,3 +136,4 @@ RSSFeedDesc=Du kan få et RSS-feed af de nyeste artikler med typen 'blogpost' ve
 PagesRegenerated=%sside (r) / container (r) regenereret
 RegenerateWebsiteContent=Genopret cache-filer på webstedet
 AllowedInFrames=Tilladt i rammer
+DefineListOfAltLanguagesInWebsiteProperties=Definer liste over alle tilgængelige sprog i webstedets egenskaber.
diff --git a/htdocs/langs/da_DK/withdrawals.lang b/htdocs/langs/da_DK/withdrawals.lang
index 0ae1c22b6f9..134ecf86e91 100644
--- a/htdocs/langs/da_DK/withdrawals.lang
+++ b/htdocs/langs/da_DK/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Seneste %s direkte debit kvitteringer
 MakeWithdrawRequest=Lav en anmodning om direkte debitering
 MakeBankTransferOrder=Foretag en kreditoverførselsanmodning
 WithdrawRequestsDone=%s anmodninger om direkte debitering indbetalt
+BankTransferRequestsDone=%s kredit overførselsanmodninger registreret
 ThirdPartyBankCode=Tredjeparts bankkode
 NoInvoiceCouldBeWithdrawed=Ingen faktura debiteres med succes. Kontroller, at fakturaer er på virksomheder med en gyldig IBAN, og at IBAN har en UMR (Unique Mandate Reference) med tilstanden <strong> %s </ strong>.
 ClassCredited=Klassificere krediteres
@@ -63,7 +64,7 @@ InvoiceRefused=Faktura nægtet (Oplad afvisningen til kunden)
 StatusDebitCredit=Status debet / kredit
 StatusWaiting=Venter
 StatusTrans=Transmitteret
-StatusDebited=Debited
+StatusDebited=Debiteret
 StatusCredited=Krediteres
 StatusPaid=Betalt
 StatusRefused=Afviste
@@ -79,13 +80,13 @@ StatusMotif8=Andre grunde
 CreateForSepaFRST=Opret direkte debit fil (SEPA FRST)
 CreateForSepaRCUR=Opret direkte debitering fil (SEPA RCUR)
 CreateAll=Opret direkte debitfil (alle)
-CreateFileForPaymentByBankTransfer=Create file for credit transfer
+CreateFileForPaymentByBankTransfer=Opret fil til kreditoverførsel
 CreateSepaFileForPaymentByBankTransfer=Opret kreditoverførselsfil (SEPA)
 CreateGuichet=Kun kontor
 CreateBanque=Kun bank
 OrderWaiting=Venter på behandling
-NotifyTransmision=Record file transmission of order
-NotifyCredit=Record credit of order
+NotifyTransmision=Registrer filoverførsel af ordre
+NotifyCredit=Registrer ordrekredit
 NumeroNationalEmetter=National Transmitter Antal
 WithBankUsingRIB=For bankkonti ved hjælp af RIB
 WithBankUsingBANBIC=For bankkonti ved hjælp af IBAN / BIC / SWIFT
@@ -97,8 +98,8 @@ ShowWithdraw=Vis direkte debiteringsordre
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Hvis fakturaen dog har mindst en betalingsordre til direkte debitering, der endnu ikke er behandlet, indstilles den ikke til at blive betalt for at tillade forudgående udtræksstyring.
 DoStandingOrdersBeforePayments=Denne fane giver dig mulighed for at anmode om en betalingsordre med direkte debitering. Når det er gjort, skal du gå til menuen Bank-> Betaling med direkte debet for at generere og administrere direkte debetordre. Når ordre med direkte debitering lukkes, registreres betaling på fakturaer automatisk, og fakturaer lukkes, hvis resten til betaling er null.
 DoCreditTransferBeforePayments=Denne fane giver dig mulighed for at anmode om en kredit overførselsordre. Når det er gjort, skal du gå til menuen Bank-> Betaling med kreditoverførsel for at generere og administrere kredit overførselsordren. Når pengeoverførsel er lukket, vil betaling på fakturaer oplysninger registreres automatisk, og fakturaer lukkes, hvis resten til løn er nul.\n 
-WithdrawalFile=Debit order file
-CreditTransferFile=Credit transfer file
+WithdrawalFile=Debiteringsfil
+CreditTransferFile=Kreditoverførselsfil
 SetToStatusSent=Sæt til status "Fil sendt"
 ThisWillAlsoAddPaymentOnInvoice=Dette registrerer også betalinger på fakturaer og klassificerer dem som "Betalt", hvis resterende betaling er null
 StatisticsByLineStatus=Statistikker efter status af linjer
@@ -124,14 +125,15 @@ SEPAFrstOrRecur=Betalings type
 ModeRECUR=Tilbagevendende betaling
 ModeFRST=Engangsbetaling
 PleaseCheckOne=Tjek venligst kun en
-CreditTransferOrderCreated=Credit transfer order %s created
+CreditTransferOrderCreated=Kreditoverførselsordre %s oprettet
 DirectDebitOrderCreated=Direkte debitering %s oprettet
 AmountRequested=Beløb anmodet
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Udførelsesdato
 CreateForSepa=Opret direkte debitering fil
-ICS=Kreditor identifikator CI
+ICS=Kreditor identifikator CI til direkte debitering
+ICSTransfer=Kreditor identifikator CI til bankoverførsel
 END_TO_END=SEPA XML-tag "EndToEndId" - Unikt id tildelt pr. Transaktion
 USTRD="Ustruktureret" SEPA XML-tag
 ADDDAYS=Tilføj dage til udførelsesdato
@@ -145,4 +147,5 @@ InfoTransData=Beløb: %s <br> Methodology: %s <br> Dato: %s
 InfoRejectSubject=Betalingsordren afvises
 InfoRejectMessage=Hej, <br> <br> Betalingsordre for faktura %s relateret til firmaet %s, med et beløb på %s er blevet afvist af banken. <br> <br> <br> <br> %s
 ModeWarning=Mulighed for real mode ikke var indstillet, vi stopper efter denne simulation
-ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorCompanyHasDuplicateDefaultBAN=Virksomhed med id %s har mere end en standard bankkonto. Ingen måde at vide, hvilken man skal bruge.
+ErrorICSmissing=Mangler ICS på bankkonto %s
diff --git a/htdocs/langs/de_AT/mails.lang b/htdocs/langs/de_AT/mails.lang
index 3c3f69af33e..dc53b9e6bab 100644
--- a/htdocs/langs/de_AT/mails.lang
+++ b/htdocs/langs/de_AT/mails.lang
@@ -8,5 +8,3 @@ MailingArea=E-Mail-Kampagnenübersicht
 MailNoChangePossible=Die Empfängerliste einer freigegebenen E-Mail-Kampagne kann nicht mehr geändert werden
 LimitSendingEmailing=Aus Sicherheits- und Zeitüberschreitungsgründen ist der Online-Versadn von E-Mails auf <b>%s</b> Empfänger je Sitzung beschränkt.
 IdRecord=Eintrags ID
-ANotificationsWillBeSent=1 Benachrichtigung wird per E-Mail versandt
-ListOfNotificationsDone=Liste aller versandten E-Mail-Benachrichtigungen
diff --git a/htdocs/langs/de_AT/products.lang b/htdocs/langs/de_AT/products.lang
index d4e36dd82c8..272a2cf3d92 100644
--- a/htdocs/langs/de_AT/products.lang
+++ b/htdocs/langs/de_AT/products.lang
@@ -30,4 +30,3 @@ ListProductByPopularity=Liste der Produkte/Services nach Beliebtheit
 ListServiceByPopularity=Liste der Services nach Beliebtheit
 Finished=Eigenerzeugung
 NewRefForClone=Artikel Nr. des neuen Produkts/Services
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/de_CH/accountancy.lang b/htdocs/langs/de_CH/accountancy.lang
index afe0da5d99f..5c5fc2cf9fb 100644
--- a/htdocs/langs/de_CH/accountancy.lang
+++ b/htdocs/langs/de_CH/accountancy.lang
@@ -104,7 +104,6 @@ VentilatedinAccount=Erfolgreich mit dem Buchhaltungskonto verknüpft!
 NotVentilatedinAccount=Nicht mit einem Buchhaltungskonto verknüpft
 XLineSuccessfullyBinded=%s Produkte / Leistungen erfolgreich mit einem Buchhaltungskonto verknüpft.
 XLineFailedToBeBinded=%s Produkte / Leistungen konnten nicht mit einem Buchhaltungskonto verknüpft werden.
-ACCOUNTING_LIMIT_LIST_VENTILATION=Zu verbindende Elemente pro Bildschirmseite (Empfohlen max. 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Sortiere nach den neuesten zu verknüpfenden Positionen
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Sortiere nach den neuesten zu verknüpften Positionen
 ACCOUNTING_LENGTH_DESCRIPTION=Produkt- und Dienstleistungsbeschreibungen abkürzen (Wir empfehlen nach 50 Zeichen)
@@ -139,7 +138,6 @@ LetteringCode=Beschriftung
 JournalLabel=Journalbezeichnung
 TransactionNumShort=Transaktionsnummer
 AccountingCategory=Eigene Kontogruppen
-GroupByAccountAccounting=Sortiere nach Buchhaltungskonto
 AccountingAccountGroupsDesc=Trage hier deine eigenen Buchhaltungs - Kontogruppen ein. Daraus kannst du spezielle Berichte erzeugen.
 ByAccounts=Nach Konto
 ByPredefinedAccountGroups=Nach Gruppe
@@ -187,7 +185,6 @@ DescClosure=Du siehst hier die Bewegungen pro Monat des offenen Geschäftsjahres
 OverviewOfMovementsNotValidated=Schritt 1: Nicht frei gegebene Bewegungen (Die müssen für den Jahresabschluss bearbeitet sein).
 ValidateMovements=Kontobewegungen freigeben
 DescValidateMovements=Für den Abschluss müssen alle Kontobewegungen frei gegeben sein. Danach sind sie nicht mehr änderbar.
-SelectMonthAndValidate=Wähle den Monat, um dessen Bewegungen frei zu geben.
 ValidateHistory=Automatisch verknüpfen
 AutomaticBindingDone=Automatisches Verknüpfen abgeschlossen
 ErrorAccountancyCodeIsAlreadyUse=Hoppla, dieses Buchhaltungskonto wird noch verwendet - du kannst es deshalb nicht löschen.
diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang
index 951b6e8c534..8361a3878ea 100644
--- a/htdocs/langs/de_CH/admin.lang
+++ b/htdocs/langs/de_CH/admin.lang
@@ -74,8 +74,6 @@ Language_en_US_es_MX_etc=Sprache setzen (de_CH, en_GB,...)
 SystemToolsAreaDesc=Dieser Bereich ist voll mit Administratorfunktionen - Wähle im Menu aus.
 Purge=Säubern
 PurgeAreaDesc=Hier können Sie alle vom System erzeugten und gespeicherten Dateien löschen (temporäre Dateien oder alle Dateien im Verzeichnis <b>%s</b>). Diese Funktion ist richtet sich vorwiegend an Benutzer ohne Zugriff auf das Dateisystem des Webservers (z.B. Hostingpakete)
-PurgeDeleteTemporaryFiles=Lösche alle Temporären Dateien. Dabei gehen keine Arbeitsdaten verloren.\nHinweis: Das funktioniert nur, wenn das Verzeichnis 'Temp' seit 24h da ist.
-PurgeDeleteTemporaryFilesShort=Temporärdateien löschen
 PurgeDeleteAllFilesInDocumentsDir=Alle Dateien im Verzeichnis <b>%s</b> löschen. <br> Dadurch werden alle generierten Dokumente gelöscht, die sich auf Elemente (Geschäftspartner, Rechnungen usw.), Dateien, die in das ECM-Modul hochgeladen wurden, Datenbank-Backup-Dumps und temporäre Dateien beziehen.
 PurgeNDirectoriesDeleted=<b>%s</b> Dateien oder Verzeichnisse gelöscht.
 PurgeNDirectoriesFailed=Löschen von <b>%s</b> Dateien oder Verzeichnisse fehlgeschlagen.
@@ -205,7 +203,6 @@ HideDescOnPDF=Verstecke Produktbeschreibungen
 HideRefOnPDF=Verstecke Produktnummern
 HideDetailsOnPDF=Verstecke Produktzeilen
 PlaceCustomerAddressToIsoLocation=ISO Position für die Kundenadresse verwenden
-ButtonHideUnauthorized=Buttons für Nicht-Admins ausblenden anstatt ausgrauen?
 OldVATRates=Alter MwSt. Satz
 NewVATRates=Neuer MwSt. Satz
 MassConvert=Massenkonvertierung starten
diff --git a/htdocs/langs/de_CH/banks.lang b/htdocs/langs/de_CH/banks.lang
index b0dd8f505a0..68eae87b2c8 100644
--- a/htdocs/langs/de_CH/banks.lang
+++ b/htdocs/langs/de_CH/banks.lang
@@ -86,8 +86,6 @@ SEPAMandate=SEPA - Mandat
 YourSEPAMandate=Dein SEPA - Mandat
 FindYourSEPAMandate=Dein SEPA - Mandat berechtigt uns, Aufträge via LSV direkt deinem Bankkonto zu belasten. Bitte schick uns das unterschrieben retour, oder Scanne- und Maile es an
 AutoReportLastAccountStatement=Das Feld "Kontoauszug" automatisch mit der letzten bekannten Kontoauszugsnummer ausfüllen, beim Ausgleichen.
-CashControl=POS - Bartransaktion
-NewCashFence=Neue Bartransaktion
 BankColorizeMovement=Transaktionen einfärben
 BankColorizeMovementDesc=Wenn du das einschaltest, kannst du für Belastungen und Gutschriften separate Farben für die Anzeige wählen.
 BankColorizeMovementName1=Hintergrundfarbe für Belastungen
diff --git a/htdocs/langs/de_CH/boxes.lang b/htdocs/langs/de_CH/boxes.lang
index e597dd56def..38375ab0778 100644
--- a/htdocs/langs/de_CH/boxes.lang
+++ b/htdocs/langs/de_CH/boxes.lang
@@ -37,6 +37,7 @@ BoxTitleLatestModifiedBoms=Die neuesten %s geänderten Materiallisten (BOMs)
 BoxTitleLatestModifiedMos=Die neuesten %s geänderten Fertigungsaufträge
 BoxGoodCustomers=Guter Kunde
 LastRefreshDate=Datum der letzten Aktualisierung
+NoRecordedBookmarks=Keine Lesezeichen gesetzt. Klicken Sie <a href="%s">hier</a>, um ein Lesezeichen zu setzen.
 NoRecordedCustomers=Keine erfassten Kunden
 NoRecordedContacts=Keine erfassten Kontakte
 NoRecordedInterventions=Keine verzeichneten Einsätze
diff --git a/htdocs/langs/de_CH/categories.lang b/htdocs/langs/de_CH/categories.lang
index 589f21b1d0e..974a26170ae 100644
--- a/htdocs/langs/de_CH/categories.lang
+++ b/htdocs/langs/de_CH/categories.lang
@@ -58,15 +58,11 @@ AccountsCategoriesShort=Kontenschlagworte / -kategorien
 ProjectsCategoriesShort=Projektschlagworte / -kateorien
 UsersCategoriesShort=Benutzerschlagworte und -kategorien
 CategId=Schlagwort / Kategorie ID
-CatSupList=Liste der Lieferantenschlagworte / -kategorien
-CatCusList=Liste der Kunden-/ Interessentenschlagworte / -kategorien
 CatProdList=Liste der Produktschlagworte / -kategorien
 CatMemberList=Liste der Mitgliederschlagworte / -kategorien
-CatContactList=Liste der Kontaktschlagworte / -kategorien
-CatSupLinks=Verbindung zwischen Lieferanten und Schlagwörtern / Kategorien
 CatCusLinks=Verbindung zwischen Kunden-/Leads und Schlagwörtern / Kategorien
 CatProdLinks=Verbindung zwischen Produkten/Leistungen und Schlagwörtern / Kategorien
-CatProJectLinks=Verknüpfungen zwischen Projekten und Schlagwörtern / Kategorien
+CatProjectsLinks=Verknüpfungen zwischen Projekten und Schlagwörtern / Kategorien
 ExtraFieldsCategories=Ergänzende Eigenschaften
 CategoriesSetup=Suchwörter/Kategorien Einrichten
 CategorieRecursiv=Automatisch mit übergeordnetem Schlagwort / Kategorie verbinden
diff --git a/htdocs/langs/de_CH/cron.lang b/htdocs/langs/de_CH/cron.lang
index cc4ff19f7eb..137bb7f08e8 100644
--- a/htdocs/langs/de_CH/cron.lang
+++ b/htdocs/langs/de_CH/cron.lang
@@ -4,6 +4,5 @@ EnabledAndDisabled=Aktiviert und deaktiviert
 CronDtStart=Nicht vor
 CronDtEnd=Nicht nach
 JobFinished=Job gestarted und beendet
-UseMenuModuleToolsToAddCronJobs=Öffnen Sie das Menü "Start - Module Werkzeuge - Cronjob Liste" um geplante Skript-Aufgaben zu sehen und zu verändern.
 JobDisabled=Job deaktiviert
 MakeLocalDatabaseDumpShort=Lokale Datenbanksicherung
diff --git a/htdocs/langs/de_CH/mails.lang b/htdocs/langs/de_CH/mails.lang
index 3bcda95e62c..b279747d723 100644
--- a/htdocs/langs/de_CH/mails.lang
+++ b/htdocs/langs/de_CH/mails.lang
@@ -28,10 +28,6 @@ ToAddRecipientsChooseHere=Fügen Sie Empfänger über die Listenauswahl hinzu
 NbOfEMailingsSend=E-Mail-Kampagne versandt
 TagUnsubscribe=Abmelde Link
 NoEmailSentBadSenderOrRecipientEmail=Kein E-Mail gesendet. Ungültige Absender oder Empfänger Adresse. Benutzerprofil kontrollieren.
-NoNotificationsWillBeSent=Für dieses Ereignis und diesen Geschäftspartner sind keine Benachrichtigungen geplant
-ANotificationsWillBeSent=Eine Benachrichtigung wird per E-Mail versandt
-SomeNotificationsWillBeSent=%s Benachrichtigungen werden per E-Mail versandt
-ListOfNotificationsDone=Liste aller versandten E-Mail Benachrichtigungen
 MailSendSetupIs2=Sie müssen zuerst mit einem Admin-Konto im Menü %sStart - Einstellungen - EMails%s den Parameter <strong>'%s'</strong> auf den Modus '%s' ändern. Dann können Sie die Daten des SMTP-Servers von Ihrem Internetdienstanbieter eingeben und die E-Mail-Kampagnen-Funktion nutzen.
 MailAdvTargetRecipients=Empfänger (Erweiterte Selektion)
 AdvTgtSearchIntHelp=Intervall verwenden um den Zahlenwert auszuwählen
diff --git a/htdocs/langs/de_CH/products.lang b/htdocs/langs/de_CH/products.lang
index ea19db34f53..fe068de6eeb 100644
--- a/htdocs/langs/de_CH/products.lang
+++ b/htdocs/langs/de_CH/products.lang
@@ -64,7 +64,6 @@ BuyingPrices=Einkaufspreise
 CustomerPrices=Kunden Preise
 SuppliersPrices=Lieferantenpreise
 SuppliersPricesOfProductsOrServices=Anbieterpreise
-CustomCode=Zolltarifnummer (z.B. HSN)
 set=gesetzt
 se=gesetzt
 kilogram=Kilo
@@ -78,7 +77,6 @@ unitCM3=Kubikcentimeter
 unitMM3=Kubikmillimeter
 ServiceCodeModel=Vorlage für Dienstleistungs-Referenz
 DisablePriceByQty=Staffelpreise sperren
-MultipriceRules=Regeln für Preissegmente
 UseMultipriceRules=Mit diesen Regeln für Preisstufen kann man automatisch von der ersten Stufe aus die Preise der folgenden Stufen ausrechnen lassen.\nDie Regeln werden im Modul - Setup hinterlegt.
 KeepEmptyForAutoCalculation=Für automatische Berechnung kannst du das einfach leer lassen.
 VariantRefExample=Zum Beispiel: Col, Gr.
diff --git a/htdocs/langs/de_CH/sendings.lang b/htdocs/langs/de_CH/sendings.lang
index ec1ab38899a..e03dac2f60c 100644
--- a/htdocs/langs/de_CH/sendings.lang
+++ b/htdocs/langs/de_CH/sendings.lang
@@ -1,7 +1,12 @@
 # Dolibarr language file - Source file is en_US - sendings
 RefSending=Versand Nr.
 SendingCard=Auslieferungen
+QtyToShip=Versandmenge
 KeepToShip=Zum Versand behalten
+StatusSendingCanceledShort=widerrufen
+StatusSendingProcessed=Verarbeitete
+StatusSendingProcessedShort=Fertig
+SendingSheet=Auslieferungen
 WarningNoQtyLeftToSend=Achtung, keine Produkte für den Versand
 StatsOnShipmentsOnlyValidated=Versandstatistik (nur Freigegebene). Das Datum ist das der Freigabe (geplantes Lieferdatum ist nicht immer bekannt).
 ClassifyReception=Lieferung klassifizieren
diff --git a/htdocs/langs/de_CH/ticket.lang b/htdocs/langs/de_CH/ticket.lang
index 2c200f923ce..18ff7a30fab 100644
--- a/htdocs/langs/de_CH/ticket.lang
+++ b/htdocs/langs/de_CH/ticket.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - ticket
 TypeContact_ticket_external_SUPPORTCLI=Kundenkontakt / Störfallverfolgung
-NotRead=Ungelesen
 InProgress=In Bearbeitung
 TicketCloseOn=Schliessungsdatum
 TicketAddIntervention=Einsatz erstellen
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index 112d1879d15..5d89bce0e06 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=Alle Länder außer %s
 AccountantFiles=Belegdokumente exportieren
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=Ansicht nach Buchhaltungskonto
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Standardkonto für Kunden im Setup nicht definiert
 MainAccountForSuppliersNotDefined=Standardkonto für Lieferanten die nicht im Setup definiert sind
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Nicht zugeordnet, zu einem Buchhaltungskonto
 XLineSuccessfullyBinded=%s Produkte/Leistungen erfolgreich an Buchhaltungskonto zugewiesen
 XLineFailedToBeBinded=%s Produkte/Leistungen waren an kein Buchhaltungskonto zugeordnet
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Anzahl der Elemente, die zum Kontieren angezeigt werden  (empfohlen max. 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Beginnen Sie die Sortierung der Seite "Link zu realisieren“ durch die neuesten Elemente
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Beginnen Sie mit der Sortierung der Seite &quot; Zuordnung erledigt &quot; nach den neuesten Elementen
 
@@ -198,7 +199,8 @@ Docdate=Datum
 Docref=Referenz
 LabelAccount=Konto-Beschriftung
 LabelOperation=Bezeichnung der Operation
-Sens=Zweck
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Beschriftungscode
 Lettering=Beschriftung
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Journal-Bezeichnung
 NumPiece=Teilenummer
 TransactionNumShort=Anz. Buchungen
 AccountingCategory=Personalisierte Gruppen
-GroupByAccountAccounting=Gruppieren nach Buchhaltungskonto
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Hier können Kontengruppen definiert werden. Diese werden für personaliserte Buchhaltungsreports verwendet.
 ByAccounts=Pro Konto
 ByPredefinedAccountGroups=Pro vordefinierten Gruppen
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Zahlung ist keinem Produkt oder Dienstleistung zugewi
 OpeningBalance=Eröffnungsbilanz
 ShowOpeningBalance=Eröffnungsbilanz anzeigen
 HideOpeningBalance=Eröffnungsbilanz ausblenden
-ShowSubtotalByGroup=Zwischensumme nach Gruppe anzeigen
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Kontenklasse
 PcgtypeDesc=Kontengruppen werden für einige Buchhaltungsberichte als vordefinierte Filter- und Gruppierungskriterien verwendet. Beispielsweise werden "EINKOMMEN" oder "AUSGABEN" als Gruppen für die Buchhaltung von Produktkonten verwendet, um die Ausgaben- / Einnahmenrechnung zu erstellen.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Kontieren Sie hier in der Liste Spesenabrechnungszeilen
 DescVentilExpenseReportMore=Wenn Sie beim Buchhaltungskonto den Typen Spesenabrechnungpositionen eingestellt haben, wird die Applikation alle Kontierungen zwischen den Spesenabrechnungspositionen und dem Buchhaltungskonto von Ihrem Kontenrahmen verwenden, durch einen einzigen Klick auf die Schaltfläche <strong> "%s" </strong>. Wenn kein Konto definiert wurde unter Stammdaten / Gebührenarten oder wenn Sie einige Zeilen nicht zu irgendeinem automatischen Konto gebunden haben, müssen Sie die Zuordnung manuell aus dem Menü  "<strong> %s </strong>“ machen.
 DescVentilDoneExpenseReport=Hier finden Sie die Liste der Aufwendungsposten und ihr Gebühren Buchhaltungskonto
 
+Closure=Annual closure
 DescClosure=Informieren Sie sich hier über die Anzahl der Bewegungen pro Monat, die nicht validiert sind und die bereits in den Geschäftsjahren geöffnet sind.
 OverviewOfMovementsNotValidated=Schritt 1 / Bewegungsübersicht nicht validiert. \n(Notwendig, um ein Geschäftsjahr abzuschließen.)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Bewegungen validieren
 DescValidateMovements=Jegliche Änderung oder Löschung des Schreibens, Beschriftens und Löschens ist untersagt. Alle Eingaben für eine Übung müssen validiert werden, da sonst ein Abschluss nicht möglich ist
-SelectMonthAndValidate=Monat auswählen und Bewegungen validieren
 
 ValidateHistory=automatisch zuordnen
 AutomaticBindingDone=automatische Zuordnung erledigt
@@ -293,6 +298,7 @@ Accounted=im Hauptbuch erfasst
 NotYetAccounted=noch nicht im Hauptbuch erfasst
 ShowTutorial=Tutorial anzeigen
 NotReconciled=nicht ausgeglichen
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export für LD Compta (v10 und höher)
 Modelcsv_openconcerto=Export für OpenConcerto (Test)
 Modelcsv_configurable=konfigurierbarer CSV-Export
 Modelcsv_FEC=Export nach FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export für Sage 50 (Schweiz)
 Modelcsv_winfic=Exportiere Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 7af899574d9..809c3a8b797 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Benutzeroberfläche
 SetupArea=Einstellungen
 UploadNewTemplate=Neue Druckvorlage(n) hochladen
 FormToTestFileUploadForm=Formular für das Testen von Datei-Uplads (je nach Konfiguration)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Anmerkung: Ist nur wirksam wenn Modul <b>%s</b> aktiviert ist
 RemoveLock=Sie müssen die Datei <b>%s</b>  entfernen oder umbennen, falls vorhanden, um die Benutzung des Installations-/Update-Tools zu erlauben.
 RestoreLock=Stellen Sie die Datei <b>%s</b> mit ausschließlicher Leseberechtigung wieder her, um die Benutzung des Installations-/Update-Tools zu deaktivieren.
@@ -85,7 +87,6 @@ ShowPreview=Vorschau anzeigen
 ShowHideDetails=Details ein-/ausblenden
 PreviewNotAvailable=Vorschau nicht verfügbar
 ThemeCurrentlyActive=derzeit aktivierte grafische Oberfläche
-CurrentTimeZone=Aktuelle Zeitzone des PHP-Servers
 MySQLTimeZone=Aktuelle Zeitzone der SQL-Datenbank
 TZHasNoEffect=Daten werden vom Datenbank-Server gespeichert und zurückgeliefert, als würde der eingegebene String abgelegt werden. Die Zeitzone hat nur dann eine Auswirkung, wenn die UNIX_TIMESTAMP-Funktion benutzt wird (Dolibarr nutzt diese nicht, daher sollte die Datenbank-TZ keine Rolle spielen, selbst wenn diese nach Dateneingabe geändert wird).
 Space=Platz
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=In diesem Bereich finden Sie die Verwaltungsfunktionen. Verw
 Purge=Bereinigen
 PurgeAreaDesc=Auf dieser Seite können Sie alle von Dolibarr erzeugten oder gespeicherten Dateien (temporäre Dateien oder alle Dateien im Verzeichnis <b>%s</b> ) löschen. Die Verwendung dieser Funktion ist in der Regel nicht erforderlich. Es wird als Workaround für Benutzer bereitgestellt, deren Dolibarr von einem Anbieter gehostet wird, der keine Berechtigungen zum löschen von Dateien anbietet, die vom Webserver erzeugt wurden.
 PurgeDeleteLogFile=Löschen der Protokolldateien, einschließlich <b>%s</b>, die für das Syslog-Modul definiert wurden (kein Risiko Daten zu verlieren)
-PurgeDeleteTemporaryFiles=Löschen Sie alle temporären Dateien (kein Datenverlustrisiko). Hinweis: Das Löschen erfolgt nur, wenn das temporäre Verzeichnis vor über 24 Stunden erstellt wurde.
-PurgeDeleteTemporaryFilesShort=temporäre Dateien löschen
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Alle Dateien im Verzeichnis: <b>%s</b> löschen: <br>Dadurch werden alle erzeugten Dokumente löschen, die sich auf verknüpfte (Dritte, Rechnungen usw....), Dateien, die in das ECM Modul hochgeladen wurden, Datenbank, Backup, Dumps und temporäre Dateien beziehen.
 PurgeRunNow=Jetzt bereinigen
 PurgeNothingToDelete=Keine zu löschenden Verzeichnisse oder Dateien
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Bevorzugte Partner
 OtherResources=Weitere Ressourcen
 ExternalResources=Externe Ressourcen
 SocialNetworks=Soziale Netzwerke
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=Für Benutzer-und Entwickler-Dokumentationen und FAQs<br>werfen Sie bitte einen Blick auf die Dolibarr-Wiki: <br> <a href="%s" target="_blank"><b> %s</b></a>
 ForAnswersSeeForum=Für alle anderen Fragen können Sie das Dolibarr-Forum <br> <a href="%s" target="_blank"><b> %s</b></a> benutzen.
 HelpCenterDesc1=In diesem Bereich finden Sie eine Übersicht an verfügbaren Quellen, bei denen Sie im Fall von Problemen und Fragen Unterstützung bekommen können.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Beispiele mit der aktuellen Systemkonfiguration
 ListOfDirectories=Liste der OpenDocument-Vorlagenverzeichnisse
 ListOfDirectoriesForModelGenODT=Liste der Verzeichnisse mit Vorlagendateien im OpenDocument-Format.<br><br>Fügen Sie hier den vollständigen Pfad der Verzeichnisse ein.<br>Trennen Sie jedes Verzeichnis mit einem Zeilenumbruch.<br>Verzeichnisse des ECM-Moduls fügen Sie z.B. so ein <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br> Dateien in diesen Verzeichnissen müssen mit <b>.odt</b>  oder <b>.ods</b> enden.
 NumberOfModelFilesFound=Anzahl der in diesen Verzeichnissen gefundenen .odt/.ods-Dokumentvorlagen
-ExampleOfDirectoriesForModelGen=Beispiele für Syntax:<br>c:\\mydir<br>/Home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Lesen Sie die Wiki Dokumentation um zu wissen, wie Sie Ihre odt Dokumentenvorlage erstellen, bevor Sie diese in den Kategorien speichern:
 FullListOnOnlineDocumentation=https://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Reihenfolge von Vor- und Nachname
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameter zum Sichern von URLs
 SecurityTokenIsUnique=Verwenden Sie einen eindeutigen Sicherheitsschlüssel für jede URL
 EnterRefToBuildUrl=Geben Sie eine Referenz für das Objekt %s ein
 GetSecuredUrl=Holen der berechneten URL
-ButtonHideUnauthorized=Ausblenden von Schaltflächen für Nicht-Administrator für nicht autorisierte Aktionen, anstatt grau unterlegte deaktivierte Schaltflächen anzuzeigen.
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Alter Umsatzsteuer-Satz
 NewVATRates=Neuer Umsatzsteuer-Satz
 PriceBaseTypeToChange=Ändern Sie den Basispreis definierte nach
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalisierte Menüs die nicht mit dem Top-Menü ve
 NewMenu=Neues Menü
 MenuHandler=Menü-Handler
 MenuModule=Quellmodul
-HideUnauthorizedMenu= Hide unbefugte Menüs (grau)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Menü ID
 DetailMenuHandler=Menü-Handler für die Anzeige des neuen Menüs
 DetailMenuModule=Modulname falls Menüeintrag aus einem Modul stimmt
@@ -1983,11 +1985,12 @@ EMailHost=Hostname des IMAP-Servers
 MailboxSourceDirectory=Quellverzechnis des eMail-Kontos
 MailboxTargetDirectory=Zielverzechnis des eMail-Kontos
 EmailcollectorOperations=Aktivitäten, die der eMail-Collector ausführen soll
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Maximale Anzahl an einzusammelnden E-Mails je Collect-Vorgang 
 CollectNow=Jetzt abrufen
 ConfirmCloneEmailCollector=Sind Sie sicher, dass Sie den eMail-Collektor %s duplizieren möchten?
-DateLastCollectResult=Datum des letzten eMail-Collect-Versuchs
-DateLastcollectResultOk=Datum des letzten, erfolgreichen eMail-Collect
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Letztes Ergebnis
 EmailCollectorConfirmCollectTitle=eMail-Collect-Bestätigung
 EmailCollectorConfirmCollect=Möchten Sie den Einsammelvorgang für diesen eMail-Collector starten?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Nachricht einer Unterhaltung die durch eine erste von Dolibarr
 WithoutDolTrackingID=Nachricht einer Unterhaltung die NICHT durch eine erste von Dolibarr gesendete E-Mail initiiert wurde 
 WithDolTrackingIDInMsgId=Nachricht von Dolibarr gesendet
 WithoutDolTrackingIDInMsgId=Nachricht NICHT von Dolibarr gesendet
-CreateCandidature=Bewerbung erstellen
+CreateCandidature=Create job application
 FormatZip=PLZ
 MainMenuCode=Menüpunktcode (Hauptmenü)
 ECMAutoTree=Automatischen ECM-Baum anzeigen
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Land (falls spezifisch für ein bestimmtes Land)
 YouMayFindSecurityAdviceHere=Hier finden Sie Sicherheitshinweise
 ModuleActivatedMayExposeInformation=Dieses Modul kann vertrauliche Daten verfügbar machen. Wenn Sie es nicht benötigen, deaktivieren Sie es.
 ModuleActivatedDoNotUseInProduction=Ein für die Entwicklung entwickeltes Modul wurde aktiviert. Aktivieren Sie es nicht in einer Produktionsumgebung.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/de_DE/agenda.lang b/htdocs/langs/de_DE/agenda.lang
index 73e7c40f93c..3e455da3ac5 100644
--- a/htdocs/langs/de_DE/agenda.lang
+++ b/htdocs/langs/de_DE/agenda.lang
@@ -166,4 +166,4 @@ TimeType=Erinnerungsdauer
 ReminderType=Erinnerungstyp
 AddReminder=Erstellt eine automatische Erinnerungsbenachrichtigung für dieses Ereignis
 ErrorReminderActionCommCreation=Fehler beim Erstellen der Erinnerungsbenachrichtigung für dieses Ereignis
-BrowserPush=Browser Benachrichtigung
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang
index a5c59fe2608..194484c6c0f 100644
--- a/htdocs/langs/de_DE/banks.lang
+++ b/htdocs/langs/de_DE/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA Mandat
 YourSEPAMandate=Ihr SEPA-Mandat
 FindYourSEPAMandate=Dies ist Ihr SEPA-Mandat, um unser Unternehmen zu ermächtigen, Lastschriftaufträge bei Ihrer Bank zu tätigen. Senden Sie es unterschrieben (Scan des unterschriebenen Dokuments) oder per Post an
 AutoReportLastAccountStatement=Füllen Sie das Feld 'Nummer des Kontoauszugs' bei der Abstimmung automatisch mit der Nummer des letzten Kontoauszugs
-CashControl=POS Kassenbestand
-NewCashFence=neuer Kassenbestand
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Bewegungen färben
 BankColorizeMovementDesc=Wenn diese Funktion aktiviert ist, können Sie eine bestimmte Hintergrundfarbe für Debit- oder Kreditbewegungen auswählen
 BankColorizeMovementName1=Hintergrundfarbe für Debit-Bewegung
diff --git a/htdocs/langs/de_DE/blockedlog.lang b/htdocs/langs/de_DE/blockedlog.lang
index 76f7b5b97ce..000bab2d484 100644
--- a/htdocs/langs/de_DE/blockedlog.lang
+++ b/htdocs/langs/de_DE/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Spende automatisch gelöscht
 logMEMBER_SUBSCRIPTION_CREATE=Mitglieds-Abonnement erstellt
 logMEMBER_SUBSCRIPTION_MODIFY=Mitglieds-Abonnement geändert
 logMEMBER_SUBSCRIPTION_DELETE=Mitglieds-Abonnement automatisch löschen
-logCASHCONTROL_VALIDATE=Aufzeichnung Kassenschnitt
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Kundenrechnung herunterladen
 BlockedLogBillPreview=Kundenrechnung - Vorschau
 BlockedlogInfoDialog=Details zum Log
diff --git a/htdocs/langs/de_DE/boxes.lang b/htdocs/langs/de_DE/boxes.lang
index b633a2ef019..fd97417a179 100644
--- a/htdocs/langs/de_DE/boxes.lang
+++ b/htdocs/langs/de_DE/boxes.lang
@@ -46,12 +46,15 @@ BoxTitleLastModifiedDonations=Zuletzt bearbeitete Spenden (maximal %s)
 BoxTitleLastModifiedExpenses=Zuletzt bearbeitete Spesenabrechnungen (maximal %s)
 BoxTitleLatestModifiedBoms=Zuletzt bearbeitete Stücklisten (maximal %s)
 BoxTitleLatestModifiedMos=Zuletzt bearbeitete Produktionsaufträge (maximal %s)
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Globale Aktivität (Rechnungen, Angebote, Aufträge)
 BoxGoodCustomers=Gute Kunden
 BoxTitleGoodCustomers=%s gute Kunden
+BoxScheduledJobs=Geplante Aufträge
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Fehler beim RSS-Abruf. Letzte erfolgreiche Aktualisierung: %s
 LastRefreshDate=Letzte Aktualisierung
-NoRecordedBookmarks=Keine Lesezeichen gesetzt. Klicken Sie <a href="%s">hier</a>, um ein Lesezeichen zu setzen.
+NoRecordedBookmarks=Keine Lesezeichen definiert.
 ClickToAdd=Hier klicken um hinzuzufügen.
 NoRecordedCustomers=keine erfassten Kunden
 NoRecordedContacts=keine erfassten Kontakte
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Zwischenkonto ist nicht definiert
 BoxLastCustomerShipments=Letzte Kundenlieferungen
 BoxTitleLastCustomerShipments=Neueste %s Kundensendungen
 NoRecordedShipments=Keine erfasste Kundensendung
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Buchführung
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/de_DE/cashdesk.lang b/htdocs/langs/de_DE/cashdesk.lang
index 095e3d6e1f8..91749c258e3 100644
--- a/htdocs/langs/de_DE/cashdesk.lang
+++ b/htdocs/langs/de_DE/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Fußzeile
 AmountAtEndOfPeriod=Betrag am Ende der Periode (Tag, Monat oder Jahr)
 TheoricalAmount=Theoretischer Betrag
 RealAmount=Realer Betrag
-CashFence=Kassenschluss
-CashFenceDone=Kassenschnitt im Zeitraum durchgeführt
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Anzahl der Rechnungen
 Paymentnumpad=Art des Pads zur Eingabe der Zahlung
 Numberspad=Nummernblock
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Nummerierungsmodul für POS-Verkäufe
 CashDeskGenericMaskCodes6 =  Das Tag <br> <b> {TN} </b> wird zum Hinzufügen der Terminalnummer verwendet
 TakeposGroupSameProduct=Gruppieren Sie dieselben Produktlinien
 StartAParallelSale=Starten Sie einen neuen Parallelverkauf
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Kasse schließen
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Kassenbericht
 MainPrinterToUse=Quittungsdrucker
 OrderPrinterToUse=Drucker für Bestellungen
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/de_DE/categories.lang b/htdocs/langs/de_DE/categories.lang
index c8fc85f28c9..3bdeda64aab 100644
--- a/htdocs/langs/de_DE/categories.lang
+++ b/htdocs/langs/de_DE/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Übersicht Projektkategorien
 UsersCategoriesArea=Bereich:  Benutzer Tags/Kategorien
 SubCats=Unterkategorie(n)
 CatList=Liste der Kategorien
+CatListAll=List of tags/categories (all types)
 NewCategory=Neue Kategorie
 ModifCat=Kategorie bearbeiten
 CatCreated=Kategorie erstellt
@@ -65,16 +66,22 @@ UsersCategoriesShort=Benutzerkategorien
 StockCategoriesShort=Lagerort-Kategorien
 ThisCategoryHasNoItems=Diese Kategorie enthält keine Elemente.
 CategId=Kategorie-ID
-CatSupList=Liste der Lieferanten-Kategorien
-CatCusList=Liste der Kunden-/ Interessentenkategorien
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Liste der Produktkategorien
 CatMemberList=Liste der Mitgliederkategorien
-CatContactList=Liste der Kontaktkategorien
-CatSupLinks=Verbindung zwischen Lieferanten und Kategorien
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Verbindung zwischen Kunden-/Leads und Kategorien
 CatContactsLinks=Verknüpfungen zwischen Kontakten/Adressen und Tags/Kategorien
 CatProdLinks=Verbindung zwischen Produkten/Leistungen und Kategorien
-CatProJectLinks=Verbindung zwischen Projekten und Kategorien bzw. Suchwörtern
+CatMembersLinks=Verbindung zwischen Mitgliedern und Kategorien
+CatProjectsLinks=Verbindung zwischen Projekten und Kategorien bzw. Suchwörtern
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Aus Kategorie entfernen
 ExtraFieldsCategories=Ergänzende Attribute
 CategoriesSetup=Kategorie-Einstellungen
diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index f8bad6b3a9e..44fe68c41d4 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Überprüfungsergebnis des MwSt-Informationsaustauschs
 VATIntraManualCheck=Sie können die Überprüfung auch manuell auf der Internetseite der Europäische Kommission durchführen: <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Anfrage nicht möglich. Überprüfungsdienst wird vom Mitgliedsland nicht angeboten (%s).
 NorProspectNorCustomer=kein Interessent / kein Kunde
-JuridicalStatus=Rechtsform
+JuridicalStatus=Business entity type
 Workforce=Mitarbeiter/innen
 Staff=Mitarbeiter
 ProspectLevelShort=Potenzial
diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang
index 6d646740b35..e1534b71545 100644
--- a/htdocs/langs/de_DE/compta.lang
+++ b/htdocs/langs/de_DE/compta.lang
@@ -111,7 +111,7 @@ Refund=Rückerstattung
 SocialContributionsPayments=Sozialabgaben-/Steuer Zahlungen
 ShowVatPayment=Zeige USt. Zahlung
 TotalToPay=Zu zahlender Gesamtbetrag
-BalanceVisibilityDependsOnSortAndFilters=Differenz ist nur in dieser Liste sichtbar, wenn die Tabelle aufsteigend nach %s sortiert ist und gefiltert mit nur 1 Bankkonto
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Kontierungscode Kunde
 SupplierAccountancyCode=Kontierungscode Lieferanten
 CustomerAccountancyCodeShort=Buchh. Kunden-Konto
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Möchten Sie diese Sozialabgaben-, oder Steuerza
 ExportDataset_tax_1=Steuer- und Sozialabgaben und Zahlungen
 CalcModeVATDebt=Modus <b>%s USt. auf Engagement Rechnungslegung %s</b>.
 CalcModeVATEngagement=Modus <b>%sTVA auf  Einnahmen-Ausgaben%s</b>.
-CalcModeDebt=Analyse der erfassten Rechnungen, auch wenn diese noch nicht Kontiert wurden
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analyse der erfassten Zahlungen, auch wenn diese noch nicht Kontiert wurden
 CalcModeBookkeeping=Analyse der in der Tabelle Buchhaltungs-Ledger protokollierten Daten.
 CalcModeLT1= Modus <b>%sRE auf Kundenrechnungen - Lieferantenrechnungen%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Saldo der Erträge und Aufwendungen, Jahresübersic
 AnnualByCompanies=Bilanz Ertrag/Aufwand, pro vordefinierten Kontogruppen
 AnnualByCompaniesDueDebtMode=Die Ertrags-/Aufwands-Bilanz nach vordefinierten Gruppen, im Modus <b>%sForderungen-Verbindlichkeiten%s</b> meldet <b>Kameralistik</b>.
 AnnualByCompaniesInputOutputMode=Die Ertrags-/Aufwands-Bilanz im Modus <b>%sEinkünfte-Ausgaben%s</b> meldet <b>Ist-Besteuerung</b>.
-SeeReportInInputOutputMode=Zeige %sZahlungsanalyse%s für die Berechnung der aktuellen Zahlungen auch wenn diese noch nicht ins Hauptbuch übernommen wurden.
-SeeReportInDueDebtMode=Zeige %sRechnungsanalyse%s für die Berechnung der aktuellen Rechnungen auch wenn diese noch nicht ins Hauptbuch übernommen wurden.
-SeeReportInBookkeepingMode=Siehe <b>%sBuchungsreport%s</b> für die Berechnung via <b>Hauptbuch </b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Angezeigte Beträge enthalten alle Steuern
 RulesResultDue=- Es beinhaltet ausstehende Rechnungen, Ausgaben, Mehrwertsteuer, Spenden, ob sie bezahlt sind oder nicht. Es sind auch bezahlte Gehälter enthalten. <br> - Es basiert auf dem Rechnungsdatum von Rechnungen und dem Fälligkeitsdatum für Ausgaben oder Steuerzahlungen. Für Gehälter, die mit dem Modul Gehalt definiert wurden, wird der Wert Datum der Zahlung verwendet.
 RulesResultInOut=- Es sind nur tatsächliche Zahlungen für Rechnungen, Kostenabrechnungen, USt und Gehälter enthalten. <br>- Bei Rechnungen, Kostenabrechnungen, USt und Gehälter gilt das Zahlugnsdatum. Bei Spenden gilt das Spendendatum.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Zeigt die Buchungen im Hauptbuch mit Konten <
 SeePageForSetup=Siehe Menü <a href="%s"> %s </a> für die Einrichtung
 DepositsAreNotIncluded=- Anzahlungsrechnungen sind nicht enthalten 
 DepositsAreIncluded=- Inklusive Anzahlungsrechnungen
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Auswertung Steuer 2 pro Partner
 LT2ReportByCustomers=Auswertung Steuer 3 pro Partner
 LT1ReportByCustomersES=Bericht von Kunden RE
 LT2ReportByCustomersES=Bericht von Partner EKSt.
 VATReport=Umsatzsteuer Report
 VATReportByPeriods=Umsatzsteuerauswertung pro Periode
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Umsatzsteuerauswertung pro Steuersatz
 VATReportByThirdParties=Umsatzsteuerauswertung pro Partner
 VATReportByCustomers=Umsatzsteuerauswertung pro Kunde
diff --git a/htdocs/langs/de_DE/cron.lang b/htdocs/langs/de_DE/cron.lang
index a2b7c2ffa51..134c7aaecc9 100644
--- a/htdocs/langs/de_DE/cron.lang
+++ b/htdocs/langs/de_DE/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Lösche geplanten Job
 Permission23104 = Führe geplanten Job aus
 # Admin
 CronSetup=Jobverwaltungs-Konfiguration
-URLToLaunchCronJobs=URL zum Prüfen und Starten von speziellen Jobs
-OrToLaunchASpecificJob=Oder zum Prüfen und Starten von speziellen Jobs
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Sicherheitsschlüssel für URL zum Starten von Cronjobs
 FileToLaunchCronJobs=Befehlszeile zum Überprüfen und Starten von qualifizierten Cron-Jobs
 CronExplainHowToRunUnix=In Unix-Umgebung sollten Sie die folgenden crontab-Eintrag verwenden, um die Befehlszeile alle 5 Minuten ausführen
 CronExplainHowToRunWin=In Microsoft™ Windows Umgebungen kannst Du die Aufgabenplanung benutzen, um die Kommandozeile alle 5 Minuten aufzurufen.
 CronMethodDoesNotExists=Klasse %s enthält keine Methode %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron-Jobprofile sind in der Moduldeskriptordatei definiert. Wenn das Modul aktiviert ist, sind diese geladen und verfügbar, so dass Sie die Jobs über das Menü admin tools %s verwalten können.
 CronJobProfiles=Liste vordefinierter Cron-Jobprofile
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Anzahl Starts
 CronMaxRun=Maximale Anzahl von Starts
 CronEach=Jede
 JobFinished=Job gestartet und beendet
+Scheduled=Scheduled
 #Page card
 CronAdd= Jobs hinzufügen
 CronEvery=Jeden Job ausführen
@@ -56,7 +58,7 @@ CronNote=Kommentar
 CronFieldMandatory=Feld %s ist zwingend nötig
 CronErrEndDateStartDt=Enddatum kann nicht vor dem Startdatum liegen
 StatusAtInstall=Status bei der Modulinstallation
-CronStatusActiveBtn=Aktivieren
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Deaktivieren
 CronTaskInactive=Dieser Job ist deaktiviert
 CronId=ID
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=lokales Datenbankbackup
 MakeLocalDatabaseDump=Erstellen Sie einen lokalen Datenbankspeicherauszug. Parameter sind: Komprimierung ('gz' oder 'bz' oder 'none'), Sicherungstyp ('mysql', 'pgsql', 'auto'), 1, 'auto' oder zu erstellender Dateiname, Anzahl der zu speichernden Sicherungsdateien
 WarningCronDelayed=Bitte beachten: Aus Leistungsgründen können Ihre Jobs um bis zu %s Stunden verzögert werden, unabhängig vom nächsten Ausführungstermin.
 DATAPOLICYJob=Datenbereiniger und Anonymisierer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/de_DE/ecm.lang b/htdocs/langs/de_DE/ecm.lang
index 8dffa1f324e..ca982970c68 100644
--- a/htdocs/langs/de_DE/ecm.lang
+++ b/htdocs/langs/de_DE/ecm.lang
@@ -40,4 +40,4 @@ NoDirectoriesFound=Keine Verzeichnisse gefunden
 FileNotYetIndexedInDatabase=Datei noch nicht in Datenbank indiziert (bitte Datei nochmals hochladen)
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
-ECMSetup=ECM Setup
+ECMSetup=DMS Einstellungen
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index 77988952bc9..dda5099960f 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Kein Fehler, Befehl wurde ausgeführt
 # Errors
 ErrorButCommitIsDone=Fehler aufgetreten, Freigabe erfolgt dennoch
 ErrorBadEMail=Die E-Mail-Adresse %s ist nicht korrekt
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=URL %s ist nicht korrekt
 ErrorBadValueForParamNotAString=Ungültiger Wert für Ihren Parameter. Normalerweise passiert das, wenn die Übersetzung fehlt.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Benutzername %s existiert bereits.
 ErrorGroupAlreadyExists=Gruppe %s existiert bereits.
 ErrorRecordNotFound=Eintrag wurde nicht gefunden.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Ein oder mehrere erforderliche Felder wurden nicht ausgefül
 ErrorSubjectIsRequired=Der E-Mail-Betreff ist obligatorisch
 ErrorFailedToCreateDir=Fehler beim Erstellen eines Verzeichnisses. Vergewissern Sie sich, dass der Webserver-Benutzer Schreibberechtigungen für das Dokumentverzeichnis des Systems besitzt. Bei aktiviertem <b>safe_mode</b> sollten die Systemdateien den Webserver-Benutzer oder die -Gruppe als Besitzer haben.
 ErrorNoMailDefinedForThisUser=Für diesen Benutzer ist keine E-Mail-Adresse eingetragen.
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Diese Funktion erfordert aktiviertes JavaScript. Sie können dies unter Einstellungen-Anzeige ändern.
 ErrorTopMenuMustHaveAParentWithId0=Ein Menü vom Typ 'Top' kann kein Eltern-Menü sein. Setzen Sie 0 als Eltern-Menü oder wählen Sie ein Menü vom Typ 'Links'.
 ErrorLeftMenuMustHaveAParentId=Ein Menü vom Typ 'Links' erfordert einen Eltern-Menü ID.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Dieser Profilname existiert bereits für dieses Expor
 ErrorLDAPSetupNotComplete=Der LDAP-Abgleich für dieses System ist nicht vollständig eingerichtet.
 ErrorLDAPMakeManualTest=Eine .ldif-Datei wurde im Verzeichnis %s erstellt. Laden Sie diese Datei von der Kommandozeile aus um mehr Informationen über Fehler zu erhalten.
 ErrorCantSaveADoneUserWithZeroPercentage=Ereignisse können nicht mit Status "Nicht begonnen" gespeichert werden, wenn das Feld "Erledigt durch" ausgefüllt ist.
-ErrorRefAlreadyExists=Die Nr. für den Erstellungsvorgang ist bereits vergeben
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Geben Sie den Kontoauszug an, in dem die Zahlung enthalten ist (Format JJJJMM oder JJJJMMTT)
 ErrorRecordHasChildren=Kann diesen Eintrag nicht löschen. Dieser Eintrag wird von mindestens einem untergeordneten Datensatz verwendet.
 ErrorRecordHasAtLeastOneChildOfType=Objekt hat mindestens einen Untereintrag vom Typ %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Sie müssen angeben ob der Artike
 ErrorDiscountLargerThanRemainToPaySplitItBefore=Der Rabatt den Sie anwenden wollen ist grösser als der verbleibende Rechnungsbetrag. Teilen Sie den Rabatt in zwei kleinere Rabatte auf.
 ErrorFileNotFoundWithSharedLink=Datei nicht gefunden. Eventuell wurde der Sharekey verändert oder die Datei wurde gelöscht.
 ErrorProductBarCodeAlreadyExists=Der Produktbarcode %sexistiert schon bei einer anderen Produktreferenz
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Das verwenden von virtuellen Produkten welche den Lagerbestand von Unterprodukten verändern ist nicht möglich, wenn ein Unterprodukt (Oder Unter-Unterprodukt) eine Seriennummer oder Chargennummer benötigt.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Beschreibung ist erforderlich für freie Produkte
 ErrorAPageWithThisNameOrAliasAlreadyExists=Die Seite/der Container <strong> %s </strong> hat denselben Namen oder alternativen Alias, den Sie verwenden möchten
 ErrorDuringChartLoad=Fehler beim Laden des Kontenplans. Wenn einige Konten nicht geladen wurden, können Sie sie trotzdem manuell eingeben.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Fehler: die zu ersetzende Zeichenfolge ist leer
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Öffentliche Schnittstelle wurde nicht aktiviert
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Ihr PHP Parameter upload_max_filesize (%s) ist größer als Parameter post_max_size (%s). Dies ist eine inkonsistente Einstellung.
 WarningPasswordSetWithNoAccount=Es wurde ein Passwort für dieses Mitglied vergeben, aber kein Benutzer erstellt. Das Passwort wird gespeichert, aber kann nicht für die Anmeldung an Dolibarr verwendet werden. Es kann von einem externen Modul/einer Schnittstelle verwendet werden, aber wenn Sie kein Login oder Passwort für dieses Mitglied definiert müssen, können Sie die Option "Login für jedes Mitglied verwalten" in den Mitgliedseinstellungen deaktivieren. Wenn Sie ein Login aber kein Passwort benötige, lassen Sie dieses Feld leer, um diese Meldung zu deaktivieren. Anmerkung: Die E-Mail-Adresse kann auch zur Anmeldung verwendet werden, wenn das Mitglied mit einem Benutzer verbunden wird.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Ihr Login wurde verändert. Aus Sicherhei
 WarningAnEntryAlreadyExistForTransKey=Eine Übersetzung für diesen Übersetzungsschlüssel existiert schon für diese Sprache
 WarningNumberOfRecipientIsRestrictedInMassAction=Achtung, die Anzahl der verschiedenen Empfänger ist auf <b> %s </b> beschränkt, wenn Massenaktionen für Listen verwendet werden
 WarningDateOfLineMustBeInExpenseReportRange=Das Datum dieser Positionszeile ist ausserhalb der Datumsspanne dieser Spesenabrechnung
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Projekt ist geschlossen. Sie müssen es zuerst wieder öffnen.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Einige Bank-Transaktionen wurden entfernt, nachdem der Kassenbon, der diese enthielt, erzeugt wurde. Daher wird sich die Anzahl der Checks und die Endsumme auf dem Kassenbon von der Anzahl und Endsumme in der Liste unterscheiden.
-WarningFailedToAddFileIntoDatabaseIndex=Warnung, Dateieintrag zur ECM-Datenbankindextabelle konnte nicht hinzugefügt werden.
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/de_DE/exports.lang b/htdocs/langs/de_DE/exports.lang
index 972584e5da7..2aeaf6a36a0 100644
--- a/htdocs/langs/de_DE/exports.lang
+++ b/htdocs/langs/de_DE/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Schlüssel (Spalte), der zum <b> Aktualisieren </b> der vorh
 NbInsert=Anzahl eingefügter Zeilen: %s
 NbUpdate=Anzahl geänderter Zeilen: %s
 MultipleRecordFoundWithTheseFilters=Mehrere Ergebnisse wurden mit diesen Filtern gefunden: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/de_DE/interventions.lang b/htdocs/langs/de_DE/interventions.lang
index ca931e06152..8e13ddb9d25 100644
--- a/htdocs/langs/de_DE/interventions.lang
+++ b/htdocs/langs/de_DE/interventions.lang
@@ -17,10 +17,10 @@ ModifyIntervention=Ändere Serviceauftrag
 DeleteInterventionLine=Serviceauftragsposition löschen
 ConfirmDeleteIntervention=Möchten Sie diesen Serviceauftrag wirklich löschen?
 ConfirmValidateIntervention=Sind Sie sicher, dass Sie den Serviceauftrag <b>%s</b> freigeben wollen?
-ConfirmModifyIntervention=Möchten sie diesen Serviceauftrag wirklich ändern?
+ConfirmModifyIntervention=Möchten Sie diesen Serviceauftrag wirklich ändern?
 ConfirmDeleteInterventionLine=Möchten Sie diese Vertragsposition wirklich löschen?
 ConfirmCloneIntervention=Möchten Sie diesen Serviceauftrag wirklich duplizieren?
-NameAndSignatureOfInternalContact=Name und Unterschrift des Mitarbeiter:
+NameAndSignatureOfInternalContact=Name und Unterschrift des Mitarbeiters:
 NameAndSignatureOfExternalContact=Name und Unterschrift des Kunden:
 DocumentModelStandard=Standard-Dokumentvorlage für Serviceaufträge
 InterventionCardsAndInterventionLines=Serviceaufträge und Serviceauftragspositionen
@@ -64,3 +64,5 @@ InterLineDuration=Serviceauftragsposition Dauer
 InterLineDesc=Serviceauftragsposition Beschreibung
 RepeatableIntervention=Vorlage der Intervention
 ToCreateAPredefinedIntervention=Für eine vordefinierte oder wiederkehrende Intervention erstellen Sie zunächst eine gemeinsame Intervention und konvertieren diese dann in eine Vorlage
+Reopen=entwerfen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang
index 413cb8e07f1..0fce6b642ae 100644
--- a/htdocs/langs/de_DE/mails.lang
+++ b/htdocs/langs/de_DE/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=E-Mail-Adresse durch manuelle Eingabe hinzufüge
 MailingModuleDescDolibarrUsers=Benutzer mit E-Mail-Adresse
 MailingModuleDescThirdPartiesByCategories=Partner (nach Kategorien)
 SendingFromWebInterfaceIsNotAllowed=Versand vom Webinterface ist nicht erlaubt
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Zeile %s in der Datei
@@ -125,12 +126,13 @@ TagMailtoEmail=Empfänger E-Mail (beinhaltet html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=Kein E-Mail gesendet. Ungültige Absender- oder Empfängeradresse. Benutzerprofil kontrollieren.
 # Module Notifications
 Notifications=Benachrichtigungen
-NoNotificationsWillBeSent=Für dieses Ereignis und diesen Partner sind keine Benachrichtigungen geplant
-ANotificationsWillBeSent=Eine Benachrichtigung wird per E-Mail versendet.
-SomeNotificationsWillBeSent=%s Benachrichtigungen werden per E-Mail versendet.
-AddNewNotification=Neues E-Mail-Benachrichtigungsziel-Event aktivieren
-ListOfActiveNotifications=Liste aller aktiven Empänger/Events für E-Mail Benachrichtigungen
-ListOfNotificationsDone=Liste aller versendeten E-Mail-Benachrichtigungen
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Der E-Mail-Versand wurde auf '%s' konfiguriert. Dieser Modus kann nicht für E-Mail-Kampagnen verwendet werden.
 MailSendSetupIs2=Sie müssen zuerst mit einem Admin-Konto im Menü %sStart - Einstellungen - E-Mails%s den Parameter <strong>'%s'</strong> auf den Modus '%s' ändern. Dann können Sie die Daten des SMTP-Servers von Ihrem Internetdienstanbieter eingeben und die E-Mail-Kampagnen-Funktion nutzen.
 MailSendSetupIs3=Bei Fragen über die Einrichtung Ihres SMTP-Servers, können Sie %s fragen.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Die importierte Datei muss im folgenden Format vorlie
 UseFormatInputEmailToTarget=Geben Sie eine Zeichenkette im Format<br><strong>E-Mail-Adresse;Nachname;Vorname;Zusatzinformationen</strong> ein
 MailAdvTargetRecipients=Empfänger (Erweitere Selektion)
 AdvTgtTitle=Füllen Sie die Eingabefelder zur Vorauswahl der Partner- oder  Kontakt- / Adressen - Empänger
-AdvTgtSearchTextHelp=Verwenden Sie %% als Platzhalter. Um beispielsweise alle Elemente wie <b> jean, joe, jim </b> zu finden, können Sie auch <b> j%% </b> eingeben. als Trennzeichen für Wert und Verwendung! für außer diesem Wert. Beispiel: <b> jean; joe; jim%%;! Jimo;! Jima% </b> zielt auf alle jean, joe, beginnt mit jim, aber nicht mit jimo und nicht auf alles, was mit jima beginnt
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Intervall verwenden um eine Integer oder Fliesskommazahl auszuwählen
 AdvTgtMinVal=Mindestwert
 AdvTgtMaxVal=Maximalwert
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Filter erstellen
 AdvTgtOrCreateNewFilter=Name des neuen Filters
 NoContactWithCategoryFound=Kein Kontakt/Adresse mit einer Kategorie gefunden
 NoContactLinkedToThirdpartieWithCategoryFound=Kein Kontakt/Adresse mit einer Kategorie gefunden
-OutGoingEmailSetup=Postausgang
-InGoingEmailSetup=Posteingang
-OutGoingEmailSetupForEmailing=Einrichtung ausgehender E-Mails (für Modul %s)
-DefaultOutgoingEmailSetup=Standardeinstellungen für ausgehende E-Mails
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Kontakte mit Drittanbieter-Filter
 Unanswered=Unanswered
 Answered=Beantwortet
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index 3b75f3e7964..15d7fd40d5c 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -18,7 +18,7 @@ FormatHourShortJQuery=HH:MI
 FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d %b %Y
-FormatDateText=%d %B %Y
+FormatDateText=%d. %B %Y
 FormatDateHourShort=%d.%m.%Y %H:%M
 FormatDateHourSecShort=%d.%m.%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
@@ -28,7 +28,9 @@ NoTemplateDefined=Für diesen E-Mail-Typ ist keine Vorlage verfügbar
 AvailableVariables=verfügbare Variablen
 NoTranslation=Keine Übersetzung
 Translation=Übersetzung
+CurrentTimeZone=Aktuelle Zeitzone des PHP-Servers
 EmptySearchString=Keine leeren Suchkriterien eingeben
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Keinen Eintrag gefunden
 NoRecordDeleted=Keine Datensätze gelöscht
 NotEnoughDataYet=nicht genügend Daten
@@ -85,6 +87,8 @@ FileWasNotUploaded=Ein Dateianhang wurde gewählt aber noch nicht hochgeladen. K
 NbOfEntries=Anz. an Einträgen
 GoToWikiHelpPage=Onlinehilfe lesen (Internetzugang notwendig)
 GoToHelpPage=Hilfe lesen
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Startseite
 RecordSaved=Eintrag gespeichert
 RecordDeleted=Eintrag gelöscht
 RecordGenerated=Eintrag erzeugt
@@ -433,6 +437,7 @@ RemainToPay=noch offen
 Module=Module / Anwendungen
 Modules=Module / Anwendungen
 Option=Option
+Filters=Filters
 List=Liste
 FullList=Vollständige Liste
 FullConversation=Ganzes Gespräch
@@ -671,7 +676,7 @@ SendMail=E-Mail versenden
 Email=E-Mail
 NoEMail=Keine E-Mail-Adresse(n) vorhanden
 AlreadyRead=Bereits gelesen
-NotRead=Nicht gelesen
+NotRead=Ungelesen
 NoMobilePhone=Kein Handy
 Owner=Eigentümer
 FollowingConstantsWillBeSubstituted=Nachfolgende Konstanten werden durch entsprechende Werte ersetzt.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Ereignis-Erinnerung
 UpdateForAllLines=Update for all lines
+OnHold=angehalten
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/de_DE/modulebuilder.lang b/htdocs/langs/de_DE/modulebuilder.lang
index 04d3f86d971..4d101f691b4 100644
--- a/htdocs/langs/de_DE/modulebuilder.lang
+++ b/htdocs/langs/de_DE/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Pfad des zu komprimierenden Moduls/Anwendungspakets
 PathToModuleDocumentation=Pfad zur Datei der Modul- / Anwendungsdokumentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Leer- oder Sonderzeichen sind nicht erlaubt.
@@ -77,7 +78,7 @@ IsAMeasure=Ist eine Maßnahme
 DirScanned=Verzeichnis gescannt
 NoTrigger=Kein Trigger
 NoWidget=Kein Widget 
-GoToApiExplorer=Gehe zum API Explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=Liste der Menüeinträge
 ListOfDictionariesEntries=Liste der Wörterbucheinträge
 ListOfPermissionsDefined=Liste der definierten Berechtigungen
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Sind Kenntnisse in SQL und PHP vorhanden, können Sie d
 SeeTopRightMenu=Siehe <span class="fa fa-bug"></span>im Menü Oben Rechts
 AddLanguageFile=Sprachdatei hinzufügen
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Tabelle löschen wenn leer)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=Die Tabelle %s existiert nicht
 TableDropped=Tabelle %s gelöscht
 InitStructureFromExistingTable=Erstelle die Struktur-Array-Zeichenfolge einer vorhandenen Tabelle
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Verwenden Sie eine bestimmte Editor-URL
 UseSpecificFamily = Verwenden Sie eine bestimmte Familie
 UseSpecificAuthor = Verwenden Sie einen bestimmten Autor
 UseSpecificVersion = Verwenden Sie eine bestimmte Anfangsversion
-ModuleMustBeEnabled=Das Modul / die Anwendung muss zuerst aktiviert werden
 IncludeRefGeneration=Die Objektreferen muss automatisch generiert werden
 IncludeRefGenerationHelp=Aktivieren Sie diese Option, wenn Sie Code einschließen möchten, um die Generierung der Referenz automatisch zu verwalten
 IncludeDocGeneration=Ich möchte einige Dokumente aus dem Objekt generieren
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Feldtypen:<br>varchar(99), double(24,8), real, text, html, date
 AsciiToHtmlConverter=Ascii zu HTML Konverter
 AsciiToPdfConverter=Ascii zu PDF Konverter
 TableNotEmptyDropCanceled=Tabelle nicht leer. Löschen wurde abgebrochen.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang
index 49c7e511d24..6998d27f784 100644
--- a/htdocs/langs/de_DE/other.lang
+++ b/htdocs/langs/de_DE/other.lang
@@ -5,8 +5,6 @@ Tools=Hilfsprogramme
 TMenuTools=Hilfsprogramme
 ToolsDesc=Hier finden Sie weitere Hilfsprogramme, die keinem anderem Menüeintrag zugeordnet werden können.<br>Diese Hilfsprogramme können über das linke Menü aufgerufen werden.
 Birthday=Geburtstag
-BirthdayDate=Geburtstag
-DateToBirth=Geburtsdatum
 BirthdayAlertOn=Geburtstagserinnerung EIN
 BirthdayAlertOff=Geburtstagserinnerung AUS
 TransKey=Übersetzung des Schlüssels TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Vorangehender Monat (1-12) des Rechnungsdatums
 TextPreviousMonthOfInvoice=Vorangehender Monat (Text) des Rechnungsdatums
 NextMonthOfInvoice=Folgender Monat (1-12) des Rechnungsdatums
 TextNextMonthOfInvoice=Folgender Monat (1-12) des Rechnungsdatum
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=ZIP-Datei erstellt in <b>%s</b>.
 DocFileGeneratedInto=Doc Datei in <b>%s</b> generiert.
 JumpToLogin=Abgemeldet. Zur Anmeldeseite...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hallo)__\n\nAls Anlage erhalten Sie unsere
 PredefinedMailContentSendFichInter=__(Hallo)__\n\nBitte finden Sie den Serviceauftrag __REF__ im Anhang\n\n\n__(Mit freundlichen Grüßen)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Sie können den folgenden Link anklicken um die Zahlung auszuführen, falls sie noch nicht getätigt wurde.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr ist eine Management-Software die mehrere Business-Module anbietet. Eine Demo, die alle Module beinhaltet ist nicht sinnvoll , weil der Fall nie existiert (Hunderte von verfügbaren Module). Es stehen auch einige Demo-Profile Typen zur Verfügung.
 ChooseYourDemoProfil=Bitte wählen Sie das Demo-Profil das Ihrem Anwendgsfall am ehesten entspricht
 ChooseYourDemoProfilMore=...oder bauen Sie Ihr eigenes Profil <br> (manuelle Auswahl der Module)
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Kontakt / Adresse durch das Modul E-Mail-Sammler
 ProjectCreatedByEmailCollector=Projekt durch das Modul E-Mail-Sammler aus der E-Mail erstellt. MSGID %s
 TicketCreatedByEmailCollector=Ticket durch das Modul E-Mail-Sammler aus der E-Mail erstellt. MSGID %s
 OpeningHoursFormatDesc=Benutze unterschiedliche von - bis Öffnungs- und Schließzeiten.<br>Leerzeichen trennt unterschiedliche Bereiche.<br>Beispiel: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exportübersicht
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index fca33bebb23..75344418352 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Mehrere Preissegmente pro Produkt / Dienstleistung (jeder Kunde befindet sich in einem Preissegment)
 MultiPricesNumPrices=Anzahl Preise
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Anzahl der übergeordneten Produkte
@@ -167,8 +168,10 @@ BuyingPrices=Einkaufspreis
 CustomerPrices=Kundenpreise
 SuppliersPrices=Lieferanten Preise
 SuppliersPricesOfProductsOrServices=Herstellerpreise (von Produkten oder Dienstleistungen)
-CustomCode=Zolltarifnummer
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Urspungsland
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Produkttyp  (Material / Fertig)
 NatureOfProductShort=Art des Produkts
 NatureOfProductDesc=Rohstoff oder Fertigprodukt
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Festen Preis nutzen
 PriceByQuantity=Unterschiedliche Preise nach Menge
 DisablePriceByQty=Preise nach Menge ausschalten
 PriceByQuantityRange=Bereich der Menge
-MultipriceRules=Regeln der Preisstufen
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Verwenden Sie die im Produktmodul-Setup definierten Preissegmentregeln, um automatisch die Preise aller anderen Segmente gemäß dem ersten Segment zu berechnen
 PercentVariationOver=%%  Veränderung über %s
 PercentDiscountOver=%% Nachlass über %s
@@ -289,7 +292,7 @@ PriceNumeric=Nummer
 DefaultPrice=Standardpreis
 DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Erhöhen/Verringern des Lagerbestands bei verknüpften Produkten
-ComposedProduct=Kinderprodukte
+ComposedProduct=Unterprodukte
 MinSupplierPrice=Minimaler Kaufpreis
 MinCustomerPrice=Minimaler Verkaufspreis
 DynamicPriceConfiguration=Dynamische Preis Konfiguration
diff --git a/htdocs/langs/de_DE/recruitment.lang b/htdocs/langs/de_DE/recruitment.lang
index f7bd9daa1bd..eac81d9fadc 100644
--- a/htdocs/langs/de_DE/recruitment.lang
+++ b/htdocs/langs/de_DE/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/de_DE/sendings.lang b/htdocs/langs/de_DE/sendings.lang
index 71c8092fb07..f4eadf44997 100644
--- a/htdocs/langs/de_DE/sendings.lang
+++ b/htdocs/langs/de_DE/sendings.lang
@@ -20,7 +20,7 @@ CreateShipment=Auslieferung erstellen
 QtyShipped=Liefermenge
 QtyShippedShort=Gelieferte Menge
 QtyPreparedOrShipped=Menge vorbereitet oder versendet
-QtyToShip=Versandmenge
+QtyToShip=Liefermenge
 QtyToReceive=Menge zu erhalten
 QtyReceived=Erhaltene Menge
 QtyInOtherShipments=Menge in anderen Lieferungen
@@ -30,16 +30,17 @@ OtherSendingsForSameOrder=Weitere Lieferungen zu dieser Bestellung
 SendingsAndReceivingForSameOrder=Warenerhalt und Versand dieser Bestellung
 SendingsToValidate=Freizugebende Auslieferungen
 StatusSendingCanceled=Storniert
+StatusSendingCanceledShort=storniert
 StatusSendingDraft=Entwurf
 StatusSendingValidated=Freigegeben (Artikel versandfertig oder bereits versandt)
-StatusSendingProcessed=Verarbeitete
+StatusSendingProcessed=Erledigt
 StatusSendingDraftShort=Entwurf
 StatusSendingValidatedShort=Freigegeben
-StatusSendingProcessedShort=Fertig
+StatusSendingProcessedShort=Erledigt
 SendingSheet=Lieferschein
-ConfirmDeleteSending=Möchten Sie diesen Versand wirklich löschen?
-ConfirmValidateSending=Möchten Sie diesen Versand mit der Referenz <b>%s</b> wirklich freigeben?
-ConfirmCancelSending=Möchten Sie diesen Versand wirklich abbrechen?
+ConfirmDeleteSending=Möchten Sie diese Lieferung wirklich löschen?
+ConfirmValidateSending=Möchten Sie die Lieferung mit der Referenz <b>%s</b> wirklich freigeben?
+ConfirmCancelSending=Möchten Sie diese Auslieferung wirklich abbrechen?
 DocumentModelMerou=Merou A5-Modell
 WarningNoQtyLeftToSend=Achtung, keine weiteren Produkte für den Versand.
 StatsOnShipmentsOnlyValidated=Versandstatistik (nur freigegebene). Das Datum ist das der Freigabe (geplantes Lieferdatum ist nicht immer bekannt).
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Sie müssen den Auftrag erst bestätigen bevor
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Vollständig Dokumentvorlage für die Lieferscheine (Logo, ...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstante EXPEDITION_ADDON_NUMBER nicht definiert
 SumOfProductVolumes=Summe der Produktvolumen
 SumOfProductWeights=Summe der Produktgewichte
diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index 9361b1582d6..eb423e561ad 100644
--- a/htdocs/langs/de_DE/stocks.lang
+++ b/htdocs/langs/de_DE/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update durch Scannen
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/de_DE/ticket.lang b/htdocs/langs/de_DE/ticket.lang
index 697e9678441..a86ee0f403d 100644
--- a/htdocs/langs/de_DE/ticket.lang
+++ b/htdocs/langs/de_DE/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket-Typ
 TicketDictCategory=Ticket-Kategorien
 TicketDictSeverity=Ticket-Dringlichkeiten
 TicketDictResolution=Ticket-Auflösung
-TicketTypeShortBUGSOFT=Softwarefehler
-TicketTypeShortBUGHARD=Hardwarefehler
-TicketTypeShortCOM=Anfrage an Verkauf
 
+TicketTypeShortCOM=Anfrage an Verkauf
 TicketTypeShortHELP=Erbitte funktionale Hilfestellung
 TicketTypeShortISSUE=Aspekt, Fehler oder Problem
 TicketTypeShortREQUEST=Änderungs- oder Erweiterungsanforderung
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Sonstige
 TicketSeverityShortLOW=Niedrig
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Hoch
-TicketSeverityShortBLOCKING=Kritisch/Blockierend
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Feld '%s' ungültig
 MenuTicketMyAssign=Meine Tickets
@@ -60,7 +58,6 @@ OriginEmail=E-Mail Absender
 Notify_TICKET_SENTBYMAIL=Ticket Nachricht per E-Mail versenden
 
 # Status
-NotRead=Nicht gelesen
 Read=Lesen
 Assigned=Zugewiesen
 InProgress=in Bearbeitung
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Mit dem öffentlichen Interface können alle
 TicketsAutoAssignTicket=Den Ersteller automatisch dem Ticket zuweisen
 TicketsAutoAssignTicketHelp=Wenn ein Ticket erstellt wird, kann der Ersteller automatisch dem Ticket zugewiesen werden.
 TicketNumberingModules=Ticketnummerierungsmodul
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Partner über Ticketerstellung informieren
 TicketsDisableCustomerEmail=E-Mails immer deaktivieren, wenn ein Ticket über die öffentliche Oberfläche erstellt wird
 TicketsPublicNotificationNewMessage=Senden Sie E-Mails, wenn eine neue Nachricht hinzugefügt wird
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status von %s zu  %s geändert
 TicketNotNotifyTiersAtCreate=Firma bei Erstellen nicht Benachrichtigen
 Unread=Ungelesen
 TicketNotCreatedFromPublicInterface=Nicht verfügbar. Ticket wurde nicht über die öffentliche Schnittstelle erstellt.
-PublicInterfaceNotEnabled=Öffentliche Schnittstelle wurde nicht aktiviert
 ErrorTicketRefRequired=Ein Ticket-Betreff ist erforderlich
 
 #
diff --git a/htdocs/langs/de_DE/website.lang b/htdocs/langs/de_DE/website.lang
index 2170414d12f..51e046e1b72 100644
--- a/htdocs/langs/de_DE/website.lang
+++ b/htdocs/langs/de_DE/website.lang
@@ -30,7 +30,6 @@ EditInLine=Direktes bearbeiten
 AddWebsite=Website hinzufügen
 Webpage=Webseite / Container
 AddPage=Seite / Container hinzufügen
-HomePage=Startseite
 PageContainer=Seite
 PreviewOfSiteNotYetAvailable=Vorschau ihrer Webseite <strong>%s</strong> noch nicht verfügbar. Zuerst muss eine '<strong>Webseiten-Vorlage importiert</strong>' oder '<strong>Seite / Container hinzugefügt</strong>' werden.
 RequestedPageHasNoContentYet=Die Seite mit id %s hat keinen Inhalt oder die Cachedatei .tpl.php wurde gelöscht. Editieren Sie den Inhalt der Seite um das Problem zu lösen.
@@ -101,7 +100,7 @@ EmptyPage=Leere Seite
 ExternalURLMustStartWithHttp=Externe URL muss mit http:// oder https:// beginnen
 ZipOfWebsitePackageToImport=Laden Sie die Zip-Datei der Websseiten-Vorlage hoch
 ZipOfWebsitePackageToLoad=oder wählen Sie eine verfügbare eingebettete Webseiten-Vorlage
-ShowSubcontainers=Dynamische Inhalte einfügen
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Interne URL der Seite
 ThisPageIsTranslationOf=Diese Seite/Container ist eine Übersetzung von
 ThisPageHasTranslationPages=Es existieren Übersetzungen dieser Seite/Containers
@@ -137,3 +136,4 @@ RSSFeedDesc=Über diese URL können Sie einen RSS-Feed mit den neuesten Artikeln
 PagesRegenerated=%s Seite(n) / Container neu generiert
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/de_DE/withdrawals.lang b/htdocs/langs/de_DE/withdrawals.lang
index 8ed5c2711fc..36984885427 100644
--- a/htdocs/langs/de_DE/withdrawals.lang
+++ b/htdocs/langs/de_DE/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Letzte 1%s Einnahmen per Lastschrift
 MakeWithdrawRequest=Erstelle eine  Lastschrift
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s Lastschrift-Zahlungsaufforderungen aufgezeichnet
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Bankcode Geschäftspartner
 NoInvoiceCouldBeWithdrawed=Keine Rechnung mit Erfolg eingezogen. Überprüfen Sie, ob die Rechnungen auf Unternehmen mit einer gültigen IBAN Nummer verweisen und die IBAN Nummer eine eindeutige Mandatsreferenz besitzt <strong>%s</strong>.
 ClassCredited=Als eingegangen markieren
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Ausführungsdatum
 CreateForSepa=Erstellen Sie eine Lastschriftdatei
-ICS=Gläubigeridentifikator CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="Ende-zu-Ende" SEPA-XML-Tag - Eindeutige ID, die pro Transaktion zugewiesen wird
 USTRD="Unstrukturiertes" SEPA-XML-Tag
 ADDDAYS=Füge Tage zum Abbuchungsdatum hinzu
@@ -146,3 +148,4 @@ InfoRejectSubject=Lastschriftauftrag abgelehnt
 InfoRejectMessage=Hallo,<br><br> der Lastschrift-Zahlungsauftrag der Rechnung %s im Zusammenhang mit dem Unternehmen %s, mit einem Betrag von %s wurde von der Bank abgelehnt <br> -- <br> %s
 ModeWarning=Echtzeit-Modus wurde nicht aktiviert, wir stoppen nach der Simulation.
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/el_CY/products.lang b/htdocs/langs/el_CY/products.lang
deleted file mode 100644
index 6e900475275..00000000000
--- a/htdocs/langs/el_CY/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index 1189c759ce7..c4bf9b28db7 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=Όλες οι χώρες εκτός από το %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Κύριος λογαριασμός λογιστικής για πελάτες που δεν έχουν οριστεί στη ρύθμιση
 MainAccountForSuppliersNotDefined=Κύριος λογαριασμός λογιστικής για προμηθευτές που δεν καθορίζονται στη ρύθμιση
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Δεν δεσμεύεται στον λογαριασμό
 XLineSuccessfullyBinded=%s προϊόντα / υπηρεσίες με επιτυχία δεσμεύεται σε λογιστικό λογαριασμό
 XLineFailedToBeBinded=%s προϊόντα / υπηρεσίες δεν δεσμεύονται σε κανένα λογιστικό λογαριασμό
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Αριθμός στοιχείων που δεσμεύονται με τη σελίδα (μέγιστη συνιστώμενη τιμή: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Ξεκινήστε τη διαλογή της σελίδας &quot;Δεσμευτική ενέργεια&quot; από τα πιο πρόσφατα στοιχεία
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Ξεκινήστε τη διαλογή της σελίδας &quot;Δεσμευτική πραγματοποίηση&quot; από τα πιο πρόσφατα στοιχεία
 
@@ -198,7 +199,8 @@ Docdate=Ημερομηνία
 Docref=Παραπομπή
 LabelAccount=Ετικέτα λογαριασμού
 LabelOperation=Λειτουργία ετικετών
-Sens=Σημασία
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Κωδικός γράμματος
 Lettering=Γράμματα
 Codejournal=Ημερολόγιο
@@ -206,7 +208,8 @@ JournalLabel=Ετικέτα περιοδικών
 NumPiece=Αριθμός τεμαχίου
 TransactionNumShort=Αριθ. συναλλαγή
 AccountingCategory=Προσωποποιημένες ομάδες
-GroupByAccountAccounting=Ομαδοποίηση κατά λογιστικό λογαριασμό
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Μπορείτε να ορίσετε εδώ ορισμένες ομάδες λογιστικού λογαριασμού. Θα χρησιμοποιηθούν για εξατομικευμένες λογιστικές εκθέσεις.
 ByAccounts=Με λογαριασμούς
 ByPredefinedAccountGroups=Με προκαθορισμένες ομάδες
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Πληρωμή που δεν συνδέεται με
 OpeningBalance=Opening balance
 ShowOpeningBalance=Εμφάνιση αρχικού υπολοίπου
 HideOpeningBalance=Κρύψιμο αρχικού υπολοίπου
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Ομάδα του λογαριασμού
 PcgtypeDesc=Η ομάδα λογαριασμού χρησιμοποιείται ως προκαθορισμένα κριτήρια «φίλτρου» και «ομαδοποίησης» για ορισμένες λογιστικές αναφορές. Για παράδειγμα, τα «ΕΙΣΟΔΗΜΑ» ή «ΕΞΟΔΑ» χρησιμοποιούνται ως ομάδες λογιστικών λογαριασμών προϊόντων για τη δημιουργία της αναφοράς εξόδων / εσόδων.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Συμβουλευτείτε εδώ τον κατάλο
 DescVentilExpenseReportMore=Εάν ρυθμίσετε τον λογαριασμό λογαριασμών σε γραμμές αναφοράς τύπου εξόδων, η εφαρμογή θα είναι σε θέση να κάνει όλη τη δέσμευση μεταξύ των γραμμών αναφοράς δαπανών σας και του λογαριασμού λογιστικής του λογαριασμού σας, με ένα μόνο κλικ με το κουμπί <strong>&quot;%s&quot;</strong> . Εάν ο λογαριασμός δεν έχει οριστεί σε λεξικό τελών ή αν έχετε ακόμα ορισμένες γραμμές που δεν δεσμεύονται σε κανένα λογαριασμό, θα πρέπει να κάνετε μια χειροκίνητη σύνδεση από το μενού &quot; <strong>%s</strong> &quot;.
 DescVentilDoneExpenseReport=Συμβουλευτείτε εδώ τον κατάλογο των γραμμών των εκθέσεων δαπανών και του λογιστικού λογαριασμού τους
 
+Closure=Annual closure
 DescClosure=Συμβουλευτείτε εδώ τον αριθμό των κινήσεων ανά μήνα που δεν έχουν επικυρωθεί και τα οικονομικά έτη είναι ήδη ανοιχτά
 OverviewOfMovementsNotValidated=Βήμα 1 / Επισκόπηση των κινήσεων που δεν έχουν επικυρωθεί. (Είναι απαραίτητο να κλείσετε ένα οικονομικό έτος)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Επικυρώστε τις κινήσεις
 DescValidateMovements=Απαγορεύεται οποιαδήποτε τροποποίηση ή διαγραφή γραφής, γράμματος και διαγραφής. Όλες οι καταχωρήσεις για μια άσκηση πρέπει να επικυρωθούν, διαφορετικά το κλείσιμο δεν θα είναι δυνατό
-SelectMonthAndValidate=Επιλέξτε μήνα και επικυρώστε τις κινήσεις
 
 ValidateHistory=Δεσμεύστε αυτόματα
 AutomaticBindingDone=Έγινε αυτόματη σύνδεση
@@ -293,6 +298,7 @@ Accounted=Πληρώθηκε σε
 NotYetAccounted=Δεν έχει ακόμη καταλογιστεί στο βιβλίο
 ShowTutorial=Εμφάνιση εκπαιδευτικού προγράμματος
 NotReconciled=Δεν ταιριάζουν
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Εξαγωγή για LD Compta (v10 και άνω)
 Modelcsv_openconcerto=Εξαγωγή για OpenConcerto (Test)
 Modelcsv_configurable=Εξαγωγή CSV εξαγωγής
 Modelcsv_FEC=Εξαγωγή FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Εξαγωγή για Sage 50 Ελβετία
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 9066b5bbf90..0eac7c5138e 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Εμφάνιση
 SetupArea=Ρύθμιση
 UploadNewTemplate=Μεταφόρτωση νέου(-ων) προτύπου(-ων)
 FormToTestFileUploadForm=Έντυπο για να ελέγξετε το αρχείο μεταφόρτωσης (ανάλογα με τις ρυθμίσεις)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Σημείωση: ναι, είναι αποτελεσματική μόνο αν το module <b>%s</b> είναι ενεργοποιημένο
 RemoveLock=Αφαιρέστε/μετονομάστε το αρχείο <b>%s</b>, αν υπάρχει, για να επιτραπεί η χρήση του εργαλείου ενημέρωσης/εγκατάστασης.
 RestoreLock=Επαναφέρετε το  αρχείο <b>%s</b>, με δικαίωμα ανάγνωσης μόνο, για να απενεργοποιηθεί οποιαδήποτε χρήση του εργαλείου ενημέρωσης/εγκατάστασης.
@@ -85,7 +87,6 @@ ShowPreview=Εμφάνιση προ επισκόπησης
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Η προ επισκόπηση δεν είναι διαθέσιμη
 ThemeCurrentlyActive=Θεματική Επι του Παρόντος Ενεργή
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (βάση δεδομένων)
 TZHasNoEffect=Οι ημερομηνίες αποθηκεύονται και επιστρέφονται από το διακομιστή βάσης δεδομένων σαν να κρατήθηκαν ως υποβληθείσες συμβολοσειρές. Η ζώνη ώρας έχει ισχύ μόνο όταν χρησιμοποιείτε τη συνάρτηση UNIX_TIMESTAMP (η οποία δεν πρέπει να χρησιμοποιείται από τον Dolibarr, ώστε η βάση δεδομένων TZ να μην επηρεαστεί, ακόμη και αν αλλάξει μετά την εισαγωγή των δεδομένων).
 Space=Κενό
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Αυτή η περιοχή παρέχει λειτουργί
 Purge=Εκκαθάριση
 PurgeAreaDesc=Αυτή η σελίδα σας επιτρέπει να διαγράψετε όλα τα αρχεία που κατασκευάζονται ή αποθηκεύονται από την Dolibarr (προσωρινά αρχεία ή όλα τα αρχεία σε <b>%s </ b> directory).  Η χρήση αυτής της λειτουργίας δεν είναι απαραίτητη.  Παρέχεται για χρήστες των οποίων η Dolibarr φιλοξενείται από πάροχο, που δεν προσφέρει δικαίωμα διαγραφής αρχείων που κατασκευάστηκαν από τον web server.
 PurgeDeleteLogFile=Διαγράψτε τα αρχεία καταγραφής, συμπεριλαμβανομένων<b>%s</b> που είναι ορισμένα για τη χρήση της μονάδας Syslog (χωρίς κίνδυνο απώλειας δεδομένων)
-PurgeDeleteTemporaryFiles=Διαγράψτε όλα τα προσωρινά αρχεία (χωρίς κίνδυνο απώλειας δεδομένων). Σημείωση: η διαγραφή γίνεται μόνο αν ο κατάλογος Temp δημιουργήθηκε πριν από 24 ώρες
-PurgeDeleteTemporaryFilesShort=Διαγραφή προσωρινών αρχείων
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Διαγράψτε όλα τα αρχεία στον κατάλογο: <b>%s</b> . <br> Αυτό θα διαγράψει όλα τα παραγόμενα έγγραφα που σχετίζονται με στοιχεία (τρίτα μέρη, τιμολόγια κ.λπ.), αρχεία που έχουν φορτωθεί στη μονάδα ECM, αρχεία από αντίγραφα ασφαλείας βάσεων δεδομένων και προσωρινά αρχεία.
 PurgeRunNow=Διαγραφή τώρα
 PurgeNothingToDelete=Δεν υπάρχει κατάλογος ή αρχείο για διαγραφή.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Άλλοι πόροι
 ExternalResources=Εξωτερικοί πόροι
 SocialNetworks=Κοινωνικά δίκτυα
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=Για την τεκμηρίωση χρήστη ή προγραμματιστή  (Doc, FAQs...),<br>ρίξτε μια ματιά στο Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Για οποιαδήποτε άλλη ερώτηση/βοήθεια, μπορείτε να χρησιμοποιήσετε το forum του Dolibarr:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Εδώ είναι μερικοί πόροι για να λάβετε βοήθεια και υποστήριξη με τον Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Παραδείγματα με την τρέχουσα 
 ListOfDirectories=Λίστα φακέλων προτύπων OpenDocument
 ListOfDirectoriesForModelGenODT=Λίστα καταλόγων που περιέχουν αρχεία προτύπων με μορφή OpenDocument. <br><br> Βάλτε εδώ την πλήρη διαδρομή των καταλόγων. <br> Προσθέστε μια επιστροφή μεταφοράς μεταξύ του καταλόγου eah. <br> Για να προσθέσετε έναν κατάλογο της λειτουργικής μονάδας GED, προσθέστε εδώ <b>DOL_DATA_ROOT / ecm / yourdirectoryname</b> . <br><br> Τα αρχεία σε αυτούς τους καταλόγους πρέπει να τελειώνουν με <b>.odt</b> ή <b>.ods</b> .
 NumberOfModelFilesFound=Αριθμός αρχείων προτύπου ODT / ODS που βρέθηκαν σε αυτούς τους καταλόγους
-ExampleOfDirectoriesForModelGen=Παραδείγματα σύνταξης:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Για να μάθετε πως να δημιουργήσετε τα δικά σας αρχεία προτύπων, πριν τα αποθηκεύσετε σε αυτούς τους φακέλους, διαβάστε την τεκμηρίωση στο wiki:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Θέση ονόματος/επιθέτου
@@ -406,7 +408,7 @@ UrlGenerationParameters=Παράμετροι για δημιουργία ασφ
 SecurityTokenIsUnique=Χρησιμοποιήστε μια μοναδική παράμετρο securekey για κάθε διεύθυνση URL
 EnterRefToBuildUrl=Εισάγετε αναφοράς για %s αντικείμενο
 GetSecuredUrl=Πάρτε υπολογιζόμενο URL
-ButtonHideUnauthorized=Απόκρυψη κουμπιών για μη χρήστες διαχειριστή για μη εξουσιοδοτημένες ενέργειες αντί να εμφανίζονται κουμπιά απενεργοποιημένου με γκρι
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Παλιός συντελεστής ΦΠΑ
 NewVATRates=Νέος συντελεστής ΦΠΑ
 PriceBaseTypeToChange=Τροποποίηση τιμών με βάση την τιμή αναφοράς όπως ρυθμίστηκε στο
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Εξατομικευμένα μενού που δεν
 NewMenu=New menu
 MenuHandler=Χειριστής μενού
 MenuModule=Source module
-HideUnauthorizedMenu= Απόκρυψη μη εξουσιοδοτημένων μενού (γκρι)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu handler where to show new menu
 DetailMenuModule=Module name if menu entry come from a module
@@ -1983,11 +1985,12 @@ EMailHost=Υποδοχή διακομιστή IMAP ηλεκτρονικού τα
 MailboxSourceDirectory=Κατάλογος προέλευσης γραμματοκιβωτίου
 MailboxTargetDirectory=Κατάλογος προορισμού γραμματοκιβωτίου
 EmailcollectorOperations=Λειτουργίες από συλλέκτη
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Μέγιστος αριθμός μηνυμάτων ηλεκτρονικού ταχυδρομείου που συλλέγονται ανά συλλογή
 CollectNow=Συλλέξτε τώρα
 ConfirmCloneEmailCollector=Είστε βέβαιοι ότι θέλετε να κλωνοποιήσετε τον συλλέκτη e-mail %s?
-DateLastCollectResult=Η τελευταία συλλογή δοκιμάστηκε
-DateLastcollectResultOk=Ημερομηνία τελευταίας συλλογής επιτυχούς
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Τελευταίο αποτέλεσμα
 EmailCollectorConfirmCollectTitle=Το email συλλέγει επιβεβαίωση
 EmailCollectorConfirmCollect=Θέλετε να εκτελέσετε τη συλλογή για αυτόν τον συλλέκτη τώρα;
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Κωδικός εισόδου μενού (mainmenu)
 ECMAutoTree=Εμφάνιση αυτόματης δομής ECM
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/el_GR/banks.lang b/htdocs/langs/el_GR/banks.lang
index 7cd78ac18a0..ed88e57f266 100644
--- a/htdocs/langs/el_GR/banks.lang
+++ b/htdocs/langs/el_GR/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=Εντολές άμεσης χρέωσης
 YourSEPAMandate=Οι εντολές άμεσης χρέωσης σας.
 FindYourSEPAMandate=Αυτή είναι η εντολή ΕΧΠΕ για να εξουσιοδοτήσετε την εταιρεία μας να κάνει άμεση εντολή χρέωσης στην τράπεζά σας. Επιστρέψτε το υπογεγραμμένο (σάρωση του υπογεγραμμένου εγγράφου) ή στείλτε το ταχυδρομικώς η με mail
 AutoReportLastAccountStatement=Συμπληρώστε αυτόματα το πεδίο ' αριθμός τραπεζικού λογαριασμού ' με τον τελευταίο αριθμό τραπεζικής δήλωσης όταν κάνετε τη συμφωνία.
-CashControl=Χρηματοκιβώτιο μετρητών POS
-NewCashFence=Νέο φράχτη μετρητών
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Χρωματισμός κινήσεων
 BankColorizeMovementDesc=Εάν αυτή η λειτουργία είναι ενεργή, μπορείτε να επιλέξετε συγκεκριμένο χρώμα φόντου για χρεωστικές ή πιστωτικές κινήσεις
 BankColorizeMovementName1=Χρώμα φόντου για την κίνηση χρέωσης
diff --git a/htdocs/langs/el_GR/blockedlog.lang b/htdocs/langs/el_GR/blockedlog.lang
index 8172e83ec81..10f44bd0947 100644
--- a/htdocs/langs/el_GR/blockedlog.lang
+++ b/htdocs/langs/el_GR/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Μη τροποποιήσιμα κορμούς
 ShowAllFingerPrintsMightBeTooLong=Εμφάνιση όλων των αρχειοθετημένων αρχείων καταγραφής (μπορεί να είναι μακρά)
 ShowAllFingerPrintsErrorsMightBeTooLong=Εμφάνιση όλων των μη έγκυρων αρχείων καταγραφής αρχείων (μπορεί να είναι μεγάλο)
 DownloadBlockChain=Κατεβάστε τα δακτυλικά αποτυπώματα
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Η καταχώριση αρχειοθετημένου αρχείου καταγραφής δεν είναι έγκυρη. Αυτό σημαίνει ότι κάποιος (ένας εισβολέας;) έχει τροποποιήσει ορισμένα δεδομένα αυτής της εγγραφής μετά την εγγραφή του ή έχει διαγράψει την προηγούμενη αρχειοθετημένη εγγραφή (ελέγξτε τη γραμμή με την προηγούμενη # υπάρχει).
 OkCheckFingerprintValidity=Η αρχειοθετημένη εγγραφή είναι έγκυρη. Τα δεδομένα αυτής της γραμμής δεν τροποποιήθηκαν και η καταχώριση ακολουθεί την προηγούμενη.
 OkCheckFingerprintValidityButChainIsKo=Το αρχειοθετημένο ημερολόγιο φαίνεται έγκυρο σε σύγκριση με το προηγούμενο, αλλά η αλυσίδα είχε καταστραφεί προηγουμένως.
 AddedByAuthority=Αποθηκεύεται σε απομακρυσμένη εξουσία
@@ -35,7 +35,7 @@ logDON_DELETE=Δωρεά λογική διαγραφή
 logMEMBER_SUBSCRIPTION_CREATE=Δημιουργία συνδρομής μέλους
 logMEMBER_SUBSCRIPTION_MODIFY=Η συνδρομή μέλους τροποποιήθηκε
 logMEMBER_SUBSCRIPTION_DELETE=Συνδρομή λογικής διαγραφής μέλους
-logCASHCONTROL_VALIDATE=Εγγραφή φράχτη μετρητών
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Λήψη τιμολογίου πελατών
 BlockedLogBillPreview=Προβολή τιμολογίου πελατών
 BlockedlogInfoDialog=Στοιχεία καταγραφής
diff --git a/htdocs/langs/el_GR/boxes.lang b/htdocs/langs/el_GR/boxes.lang
index bc59ca654da..8d5d9e05122 100644
--- a/htdocs/langs/el_GR/boxes.lang
+++ b/htdocs/langs/el_GR/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Τελευταία %s τροποποίηση δω
 BoxTitleLastModifiedExpenses=Τελευταίες αναφορές τροποποιημένων δαπανών %s
 BoxTitleLatestModifiedBoms=Τα τελευταία %s τροποποιημένα BOMs
 BoxTitleLatestModifiedMos=Οι τελευταίες %s τροποποιημένες παραγγελίες κατασκευής
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Η γενική δραστηριότητα για (τιμολόγια, προσφορές, παραγγελίες)
 BoxGoodCustomers=Καλοί πελάτες
 BoxTitleGoodCustomers=%s καλών πελατών
+BoxScheduledJobs=Προγραμματισμένες εργασίες
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Αποτυχία ανανέωσης ροής RSS. Τελευταία επιτυχημένη ημερομηνία ανανέωσης: %s
 LastRefreshDate=Ημερομηνία τελευταίας ανανέωσης
 NoRecordedBookmarks=Δεν υπάρχουν σελιδοδείκτες που ορίζονται. Κάντε κλικ <a href="%s">εδώ</a> για να προσθέσετε σελιδοδείκτες.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Ο λογαριασμός Suspense δεν έχει ο
 BoxLastCustomerShipments=Τελευταίες αποστολές πελάτη
 BoxTitleLastCustomerShipments=Τελευταίες %s αποστολές πελάτη
 NoRecordedShipments=Καμία καταγεγραμμένη αποστολή πελάτη
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Λογιστική
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/el_GR/cashdesk.lang b/htdocs/langs/el_GR/cashdesk.lang
index 53dcd336847..52d5e03abb0 100644
--- a/htdocs/langs/el_GR/cashdesk.lang
+++ b/htdocs/langs/el_GR/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Υποσέλιδο
 AmountAtEndOfPeriod=Ποσό στο τέλος της περιόδου (ημέρα, μήνας ή έτος)
 TheoricalAmount=Θεωρητικό ποσό
 RealAmount=Πραγματικό ποσό
-CashFence=Φραγή μετρητών
-CashFenceDone=Μετρητά φράχτη για την περίοδο
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Πλήθος τιμολογίων
 Paymentnumpad=Τύπος πλακέτας για να πληκτρολογήσετε την πληρωμή
 Numberspad=Αριθμητικό Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> ετικέτα χρησιμοποιείται για την προσθήκη του αριθμού τερματικού
 TakeposGroupSameProduct=Ομαδοποιήστε τις ίδιες σειρές προϊόντων
 StartAParallelSale=Ξεκινήστε μια νέα παράλληλη πώληση
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Κλείστε το φράχτη μετρητών
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Έκθεση μετρητών
 MainPrinterToUse=Κύριος εκτυπωτής προς χρήση
 OrderPrinterToUse=Παραγγείλετε τον εκτυπωτή για χρήση
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/el_GR/categories.lang b/htdocs/langs/el_GR/categories.lang
index 258447b74e0..02ad08d26d6 100644
--- a/htdocs/langs/el_GR/categories.lang
+++ b/htdocs/langs/el_GR/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Περιοχή ετικετών / κατηγοριών χρηστών
 SubCats=Υποκατηγορίες
 CatList=Λίστα Ετικετών/Κατηγοριών
+CatListAll=List of tags/categories (all types)
 NewCategory=Νέα Ετικέτα/Κατηγορία
 ModifCat=Τροποποίηση Ετικέτας/Κατηγορίας
 CatCreated=Ετικέτα/Κατηγορία δημιουργήθηκε
@@ -65,16 +66,22 @@ UsersCategoriesShort=Ετικέτες / κατηγορίες χρηστών
 StockCategoriesShort=Ετικέτες / κατηγορίες αποθήκης
 ThisCategoryHasNoItems=Αυτή η κατηγορία δεν περιέχει στοιχεία.
 CategId=Ετικέτα/κατηγορία id
-CatSupList=Λίστα ετικετών / κατηγοριών πωλητών
-CatCusList=Λίστα πελάτη/προοπτικής ετικέτες/κατηγορίες
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Λίστα προϊόντων ετικέτες/κατηγορίες
 CatMemberList=Λίστα μελών ετικέτες/κατηγορίες
-CatContactList=Λίστα ετικετών/κατηγοριών επαφών
-CatSupLinks=Συνδέσεις μεταξύ προμηθευτών και ετικετών/κατηγοριών
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Συνδέσεις μεταξύ πελατών/προοπτικών και ετικετών/κατηγοριών
 CatContactsLinks=Σύνδεσμοι μεταξύ επαφών / διευθύνσεων και ετικετών / κατηγοριών
 CatProdLinks=Συνδέσεις μεταξύ προϊόντων/υπηρεσιών και ετικετών/κατηγοριών
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Αφαίρεση αυτής της ετικέτας/κατηγορίας
 ExtraFieldsCategories=Συμπληρωματικά χαρακτηριστικά
 CategoriesSetup=Ρύθμιση ετικετών/κατηγοριών
diff --git a/htdocs/langs/el_GR/companies.lang b/htdocs/langs/el_GR/companies.lang
index 318aa1d98d3..976e2709e1a 100644
--- a/htdocs/langs/el_GR/companies.lang
+++ b/htdocs/langs/el_GR/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Ελέγξτε το ενδοκοινοτικό ανα
 VATIntraManualCheck=Μπορείτε επίσης να ελέγξετε χειροκίνητα στον ιστότοπο της Ευρωπαϊκής Επιτροπής <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Δεν προοπτική, ούτε πελάτης
-JuridicalStatus=Τύπος νομικού προσώπου
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Εργαζόμενοι
 ProspectLevelShort=Δυναμική
diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang
index 274e8851e74..d814080d930 100644
--- a/htdocs/langs/el_GR/compta.lang
+++ b/htdocs/langs/el_GR/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Πληρωμές Κοινωνικών/Φορολογικών εισφορών
 ShowVatPayment=Εμφάνιση πληρωμής φόρου
 TotalToPay=Σύνολο πληρωμής
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Κωδικός λογιστικής πελάτη
 SupplierAccountancyCode=Κωδικός Προμηθευτή
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Είστε σίγουροι ότι θέλετε
 ExportDataset_tax_1=Κοινωνικές/Φορολογικές εισφορές και πληρωμές
 CalcModeVATDebt=Κατάσταση <b>%sΦΠΑ επί των λογιστικών υποχρεώσεων%s</b>
 CalcModeVATEngagement=Κατάσταση <b>%sΦΠΑ επί των εσόδων-έξοδα%s</b>.
-CalcModeDebt=Ανάλυση γνωστών καταγεγραμμένων τιμολογίων, ακόμη και αν δεν έχουν ακόμη καταλογιστεί στο βιβλίο.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Ανάλυση γνωστών καταγεγραμμένων πληρωμών, ακόμη και αν δεν έχουν ακόμη καταλογιστεί στο Ledger.
 CalcModeBookkeeping=Ανάλυση δεδομένων που έχουν καταχωρηθεί στον πίνακα Λογαριασμού Λογιστηρίου.
 CalcModeLT1= Λειτουργία <b>%sRE στα τιμολόγια πελατών - τιμολόγια προμηθευτών%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Υπόλοιπο των εσόδων και εξό
 AnnualByCompanies=Ισοζύγιο εσόδων και εξόδων, βάσει προκαθορισμένων ομάδων λογαριασμού
 AnnualByCompaniesDueDebtMode=Ισοζύγιο εσόδων και εξόδων, λεπτομέρεια κατά προκαθορισμένες ομάδες, τρόπος <b>%sClaims-Debts%s</b> δήλωσε τη <b>λογιστική δέσμευσης</b> .
 AnnualByCompaniesInputOutputMode=Ισοζύγιο εσόδων και εξόδων, λεπτομέρεια κατά προκαθορισμένες ομάδες, τρόπος <b>%sIncomes-Expenses%s</b> δήλωσε <b>ταμειακή λογιστική</b> .
-SeeReportInInputOutputMode=Ανατρέξτε στο %sanalysis of payments%s για έναν υπολογισμό σχετικά με τις πραγματικές πληρωμές, ακόμη και αν δεν έχουν ακόμη λογιστικοποιηθεί στο Ledger.
-SeeReportInDueDebtMode=Ανατρέξτε στο %sanalysis των τιμολογίων%s για έναν υπολογισμό βασισμένο σε γνωστά καταγεγραμμένα τιμολόγια, ακόμη και αν δεν έχουν ακόμη καταλογιστεί στο Ledger.
-SeeReportInBookkeepingMode=Δείτε <b>%sBookeeping report%s</b> για έναν υπολογισμό στον <b>πίνακα &quot;</b> <b>Λογαριασμός Λογιστηρίου&quot;</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
 RulesResultDue=- Περιλαμβάνει εκκρεμή τιμολόγια, έξοδα, ΦΠΑ, δωρεές είτε πληρώνονται είτε όχι. Περιλαμβάνει επίσης πληρωμένους μισθούς. <br> - Βασίζεται στην ημερομηνία χρέωσης των τιμολογίων και στην ημερομηνία λήξης των εξόδων ή των φόρων. Για τους μισθούς που ορίζονται με την ενότητα Μισθός, χρησιμοποιείται η ημερομηνία αξίας πληρωμής.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Εμφανίζει ρεκόρ στο Λογα
 SeePageForSetup=Δείτε το μενού <a href="%s">%s</a> για τη ρύθμιση
 DepositsAreNotIncluded=- Δεν συμπεριλαμβάνονται τα τιμολόγια για τις προκαταβολές
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Αναφέρετε τον φόρο 2 από τρίτους
 LT2ReportByCustomers=Αναφορά φόρου 3 από τρίτους
 LT1ReportByCustomersES=Αναφορά Πελ./Προμ. RE
 LT2ReportByCustomersES=Έκθεση του τρίτου IRPF
 VATReport=Έκθεση φορολογίας πώλησης
 VATReportByPeriods=Έκθεση φορολογίας πώλησης ανά περίοδο
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Πώληση φορολογική έκθεση με τιμές
 VATReportByThirdParties=Έκδοση φορολογικού δελτίου από τρίτους
 VATReportByCustomers=Πώληση φορολογική έκθεση από τον πελάτη
diff --git a/htdocs/langs/el_GR/cron.lang b/htdocs/langs/el_GR/cron.lang
index c2fe5100a6a..fcf0424f06d 100644
--- a/htdocs/langs/el_GR/cron.lang
+++ b/htdocs/langs/el_GR/cron.lang
@@ -6,16 +6,17 @@ Permission23102 = Δημιουργία/ενημέρωση προγραμματι
 Permission23103 = Διαγραφή προγραμματισμένης εργασίας
 Permission23104 = Εκτέλεση προγραμματισμένης εργασίας
 # Admin
-CronSetup= Προγραμματισμένη ρύθμιση διαχείρισης των εργασιών
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Ή να ελέγξετε και να ξεκινήσει μία συγκεκριμένη εργασία
+CronSetup=Προγραμματισμένη ρύθμιση διαχείρισης των εργασιών
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Κλειδί ασφαλείας για το URL για να ξεκινήσει η εργασία cron
-FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
+FileToLaunchCronJobs=Γραμμή εντολών για έλεγχο και εκκίνηση ειδικών εργασιών cron
 CronExplainHowToRunUnix=Στο Unix περιβάλλον θα πρέπει να χρησιμοποιήσετε την ακόλουθη καταχώρηση crontab για να τρέχει η γραμμή εντολών καθένα 5 λεπτά
-CronExplainHowToRunWin=Σε Microsoft (tm) Windows περιβάλλον μπορείτε να χρησιμοποιήσετε τα εργαλεία Προγραμματισμένη εργασία ώστε να εκτελείτε η γραμμή εντολών καθένα 5 λεπτά
+CronExplainHowToRunWin=Στο περιβάλλον Microsoft (tm) των Windows μπορείτε να χρησιμοποιήσετε τα εργαλεία προγραμματισμένης εργασίας για να εκτελέσετε τη γραμμή εντολών κάθε 5 λεπτά
 CronMethodDoesNotExists=Class %s does not contains any method %s
-CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
-CronJobProfiles=List of predefined cron job profiles
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
+CronJobDefDesc=Τα προφίλ εργασίας Cron ορίζονται στο αρχείο περιγραφικής ενότητας. Όταν η ενότητα είναι ενεργοποιημένη, φορτώνεται και είναι διαθέσιμη, ώστε να μπορείτε να διαχειριστείτε τις εργασίες από το μενού εργαλείων admin %s.
+CronJobProfiles=Λίστα προκαθορισμένων προφίλ εργασίας cron
 # Menu
 EnabledAndDisabled=Ενεργοποίηση και απενεργοποίηση
 # Page list
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=Δεν έχουν καταχωρηθεί εργασίες
 CronPriority=Προτεραιότητα
 CronLabel=Ετικέτα
-CronNbRun=Nb. έναρξης
-CronMaxRun=Max number launch
+CronNbRun=Αριθμός εκτοξεύσεων
+CronMaxRun=Μέγιστος αριθμός εκτοξεύσεων
 CronEach=Κάθε
 JobFinished=Ξεκίνησε και τελείωσε
+Scheduled=Scheduled
 #Page card
 CronAdd= Προσθήκη εργασίας
 CronEvery=Execute job each
@@ -55,29 +57,35 @@ CronSaveSucess=Επιτυχής αποθήκευση
 CronNote=Σχόλιο
 CronFieldMandatory=Τα πεδία %s είναι υποχρεωτικά
 CronErrEndDateStartDt=Η ημερομηνία λήξης δεν μπορεί να είναι πριν από την ημερομηνία έναρξης
-StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Ενεργοποίηση
+StatusAtInstall=Κατάσταση κατά την εγκατάσταση της μονάδας
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Απενεργοποίηση
 CronTaskInactive=Αυτή η εργασία είναι απενεργοποιημένη
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Όνομα του καταλόγου μονάδων Dolibarr (επίσης λειτουργούν με εξωτερική μονάδα Dolibarr). <BR> Για παράδειγμα, για να καλέσουμε τη μέθοδο fetch του προϊόντος Dolibarr Product / htdocs / <u>product</u> / class / product.class.php, η τιμή για την ενότητα είναι <br> <i>προϊόν</i>
+CronClassFileHelp=Η σχετική διαδρομή και το όνομα του αρχείου για φόρτωση (η διαδρομή είναι σχετική με τον κεντρικό κατάλογο διακομιστή ιστού). <BR> Για παράδειγμα, για να καλέσετε τη μέθοδο λήψης του προϊόντος Dolibarr Product htdocs / product / class / <u>product.class.php</u> , η τιμή για το όνομα αρχείου κλάσης είναι <br> <i>προϊόν / κλάση / product.class.php</i>
+CronObjectHelp=Το όνομα αντικειμένου που θα φορτωθεί. <BR> Για παράδειγμα, για να καλέσετε τη μέθοδο λήψης του προϊόντος Dolibarr Product /htdocs/product/class/product.class.php, η τιμή για το όνομα του αρχείου κλάσης είναι <br> <i>Προϊόν</i>
+CronMethodHelp=Η μέθοδος αντικειμένου για την εκκίνηση. <BR> Για παράδειγμα, για να καλέσετε τη μέθοδο λήψης του προϊόντος Dolibarr Product /htdocs/product/class/product.class.php, η τιμή για τη μέθοδο είναι <br> <i>φέρω</i>
+CronArgsHelp=Τα επιχειρήματα της μεθόδου. <BR> Για παράδειγμα, για να καλέσετε τη μέθοδο λήψης του προϊόντος Dolibarr Product /htdocs/product/class/product.class.php, η τιμή για τους paramters μπορεί να είναι <br> <i>0, ProductRef</i>
 CronCommandHelp=Γραμμή εντολών του συστήματος προς εκτέλεση.
 CronCreateJob=Create new Scheduled Job
 CronFrom=Από
 # Info
 # Common
 CronType=Είδος εργασίας
-CronType_method=Call method of a PHP Class
+CronType_method=Μέθοδος κλήσης μιας κλάσης PHP
 CronType_command=Εντολή Shell
-CronCannotLoadClass=Cannot load class file %s (to use class %s)
-CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+CronCannotLoadClass=Δεν είναι δυνατή η φόρτωση του αρχείου κλάσης %s (για χρήση της κλάσης %s)
+CronCannotLoadObject=Το αρχείο κλάσης %s φορτώθηκε, αλλά το αντικείμενο %s δεν βρέθηκε σε αυτό
+UseMenuModuleToolsToAddCronJobs=Μεταβείτε στο μενού &quot; <a href="%s">Αρχική σελίδα - Εργαλεία διαχειριστή - Προγραμματισμένες εργασίες</a> &quot; για να δείτε και να επεξεργαστείτε προγραμματισμένες εργασίες.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Αντίγραφο ασφαλείας τοπικής βάσης δεδομένων
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Δημιουργήστε μια τοπική χωματερή βάση δεδομένων. Οι παράμετροι είναι: συμπίεση (&#39;gz&#39; ή &#39;bz&#39; ή &#39;none&#39;), backup type (&#39;mysql&#39;, &#39;pgsql&#39;, &#39;auto&#39;),
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Cleaner δεδομένων και ανώνυμος
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 393b97c7174..0cdb22a79d6 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Κανένα σφάλμα
 # Errors
 ErrorButCommitIsDone=Σφάλματα που διαπιστώθηκαν αλλά παρόλα αυτά επικυρώνει
 ErrorBadEMail=Το μήνυμα ηλεκτρονικού ταχυδρομείου %s είναι λάθος
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=%s url είναι λάθος
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Είσοδος %s υπάρχει ήδη.
 ErrorGroupAlreadyExists=Ομάδα %s υπάρχει ήδη.
 ErrorRecordNotFound=Εγγραφή δεν βρέθηκε.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Ορισμένα από τα απαιτούμενα πεδί
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Αποτυχία δημιουργίας φακέλου. Βεβαιωθείτε ότι ο Web server χρήστης έχει δικαιώματα να γράψει στο φάκελο εγγράφων του Dolibarr. Αν η <b>safe_mode</b> παράμετρος είναι ενεργοποιημένη για την PHP, ελέγξτε ότι τα αρχεία php του Dolibarr ανήκουν στον web server χρήστη (ή ομάδα).
 ErrorNoMailDefinedForThisUser=Δεν έχει οριστεί mail για αυτόν το χρήστη
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Αυτό το χαρακτηριστικό χρειάζεται ενεργοποιημένη την javascript. Αλλάξτε την ρύθμιση στο Ρυθμίσεις - Εμφάνιση.
 ErrorTopMenuMustHaveAParentWithId0=Ένα μενού του «Top» τύπου δεν μπορεί να έχει ένα μενού γονέα. Βάλτε 0 στο μενού του γονέα ή να επιλέξετε ένα μενού του τύπου «αριστερά».
 ErrorLeftMenuMustHaveAParentId=Ένα μενού της «Αριστεράς» τύπου πρέπει να έχει ένα id γονέα.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Αυτό το όνομα προφίλ υπάρχει
 ErrorLDAPSetupNotComplete=Η αντιστοίχιση Dolibarr-LDAP δεν είναι πλήρης.
 ErrorLDAPMakeManualTest=Ένα αρχείο. Ldif έχει δημιουργηθεί στον φάκελο %s. Προσπαθήστε να το φορτώσετε χειροκίνητα από την γραμμή εντολών για να έχετε περισσότερες πληροφορίες σχετικά με τα σφάλματα.
 ErrorCantSaveADoneUserWithZeroPercentage=Δεν είναι δυνατή η αποθήκευση μιας ενέργειας με &quot;κατάσταση δεν έχει ξεκινήσει&quot; εάν συμπληρώνεται επίσης το πεδίο &quot;done by&quot;.
-ErrorRefAlreadyExists=Κωδικός που χρησιμοποιείται για τη δημιουργία ήδη υπάρχει.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Παρακαλούμε εισάγετε το όνομα του τραπεζικού λογαριασμού όπου πρέπει να αναφέρεται η καταχώρηση (Format YYYYMM ή YYYYMMDD)
 ErrorRecordHasChildren=Δεν ήταν δυνατή η διαγραφή της εγγραφής, δεδομένου ότι έχει ορισμένα αρχεία παιδιών.
 ErrorRecordHasAtLeastOneChildOfType=Το αντικείμενο έχει τουλάχιστον ένα παιδί τύπου %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Πρέπει να επιλέξε
 ErrorDiscountLargerThanRemainToPaySplitItBefore=Η έκπτωση που προσπαθείτε να εφαρμόσετε είναι μεγαλύτερη από την αποπληρωμή. Διαχωρίστε την έκπτωση σε 2 μικρότερες εκπτώσεις πριν.
 ErrorFileNotFoundWithSharedLink=Το αρχείο δεν βρέθηκε. Μπορεί να τροποποιηθεί το κλειδί κοινής χρήσης ή να καταργηθεί πρόσφατα το αρχείο.
 ErrorProductBarCodeAlreadyExists=Ο γραμμωτός κώδικας προϊόντος %s υπάρχει ήδη σε άλλη αναφορά προϊόντος.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Σημειώστε επίσης ότι η χρήση εικονικού προϊόντος για την αυτόματη αύξηση / μείωση υποπροϊόντων δεν είναι δυνατή όταν τουλάχιστον ένα υποπροϊόν (ή υποπροϊόν των υποπροϊόντων) χρειάζεται έναν αριθμό σειράς / παρτίδας.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Η περιγραφή είναι υποχρεωτική για γραμμές με δωρεάν προϊόν
 ErrorAPageWithThisNameOrAliasAlreadyExists=Η σελίδα / κοντέινερ <strong>%s</strong> έχει το ίδιο όνομα ή εναλλακτικό ψευδώνυμο με εκείνο που προσπαθείτε να χρησιμοποιήσετε
 ErrorDuringChartLoad=Σφάλμα κατά τη φόρτωση του γραφήματος λογαριασμών. Εάν δεν έχουν φορτωθεί μερικοί λογαριασμοί, μπορείτε να τις εισαγάγετε με μη αυτόματο τρόπο.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Σφάλμα, η συμβολοσειρά για αντ
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Η παράμετρος PHP upload_max_filesize (%s) είναι υψηλότερη από την παράμετρο PHP post_max_size (%s). Αυτό δεν είναι μια σταθερή ρύθμιση.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Προειδοποίηση, ο αριθμός διαφορετικών παραληπτών περιορίζεται στο <b>%s</b> όταν χρησιμοποιείτε τις μαζικές ενέργειες σε λίστες
 WarningDateOfLineMustBeInExpenseReportRange=Προειδοποίηση, η ημερομηνία της γραμμής δεν βρίσκεται στο εύρος της έκθεσης δαπανών
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Το έργο είναι κλειστό. Πρέπει πρώτα να το ανοίξετε ξανά.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Ορισμένες τραπεζικές συναλλαγές καταργήθηκαν μετά την ενσωμάτωσής τους εκεί οπου δημιουργήθηκαν. Επομένως, οι έλεγχοι και το σύνολο της απόδειξης μπορεί να διαφέρουν από τον αριθμό και το σύνολο της λίστας.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/el_GR/exports.lang b/htdocs/langs/el_GR/exports.lang
index bf03b366fa0..28459f2238d 100644
--- a/htdocs/langs/el_GR/exports.lang
+++ b/htdocs/langs/el_GR/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Τώρα, επιλέξτε τη μορφή αρχείου στο σύνθετο πλαίσιο και κάντε κλικ στο &quot;Δημιουργία&quot; για να δημιουργήσετε το αρχείο εξαγωγής ...
 AvailableFormats=Διαθέσιμες μορφές
 LibraryShort=Library
+ExportCsvSeparator=Csv διαχωριστικό χαρακτήρων
+ImportCsvSeparator=Csv διαχωριστικό χαρακτήρων
 Step=Step
 FormatedImport=Βοηθός εισαγωγής
 FormatedImportDesc1=Αυτή η ενότητα σάς επιτρέπει να ενημερώσετε υπάρχοντα δεδομένα ή να προσθέσετε νέα αντικείμενα στη βάση δεδομένων από ένα αρχείο χωρίς τεχνικές γνώσεις, χρησιμοποιώντας έναν βοηθό.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Πλήκτρο (στήλη) που χρησιμοποιεί
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/el_GR/mails.lang b/htdocs/langs/el_GR/mails.lang
index cd95cc106e2..c5636adddf8 100644
--- a/htdocs/langs/el_GR/mails.lang
+++ b/htdocs/langs/el_GR/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Εισαγωγή μηνυμάτων ηλεκτρ
 MailingModuleDescDolibarrUsers=Χρήστες με μηνύματα ηλεκτρονικού ταχυδρομείου
 MailingModuleDescThirdPartiesByCategories=Τρίτα μέρη (κατά κατηγορίες)
 SendingFromWebInterfaceIsNotAllowed=Η αποστολή από τη διεπαφή ιστού δεν επιτρέπεται.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Σειρά %s στο αρχείο
@@ -125,12 +126,13 @@ TagMailtoEmail=E-mail παραλήπτη (συμπεριλαμβανομένου
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=Δεν υπάρχουν ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου που έχουν προγραμματιστεί για αυτό το συμβάν και την εταιρεία
-ANotificationsWillBeSent=1 ειδοποίηση θα σταλεί μέσω e-mail
-SomeNotificationsWillBeSent=%s Θα αποστέλλονται ειδοποιήσεις μέσω e-mail
-AddNewNotification=Ενεργοποιήστε ένα νέο στόχο ειδοποίησης μέσω ηλεκτρονικού ταχυδρομείου
-ListOfActiveNotifications=List all active targets for email notification
-ListOfNotificationsDone=Λίστα όλων των ειδοποιήσεων ηλεκτρονικού ταχυδρομείου που αποστέλλονται
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Διαμόρφωση αποστολή email έχει ρυθμιστεί σε '%s'. Αυτή η λειτουργία δεν μπορεί να χρησιμοποιηθεί για να σταλθούν μαζικά μηνύματα ηλεκτρονικού ταχυδρομείου.
 MailSendSetupIs2=Θα πρέπει πρώτα να πάτε, με έναν λογαριασμό διαχειριστή, στο μενού %s Αρχική - Ρύθμιση - Emails %s για να αλλάξετε την παράμετρο <strong>'%s'</strong> για να χρησιμοποιήσετε τη λειτουργία '%s'. Με αυτόν τον τρόπο, μπορείτε να μεταβείτε στις ρυθμίσεις του διακομιστή SMTP παρέχεται από τον Internet Service Provider και να χρησιμοποιήσετε τη Μαζική αποστολή ηλεκτρονικού ταχυδρομείου.
 MailSendSetupIs3=Αν έχετε οποιαδήποτε απορία σχετικά με το πώς να ρυθμίσετε το διακομιστή SMTP σας, μπορείτε να ζητήσετε στο %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Συμπληρώστε τα πεδία εισαγωγής για να επιλέξετε εκ των προτέρων τα τρίτα μέρη ή τις επαφές / διευθύνσεις που θέλετε να στοχεύσετε
-AdvTgtSearchTextHelp=Χρησιμοποιήστε %% ως μπαλαντέρ. Για παράδειγμα, για να βρείτε όλα τα στοιχεία όπως το <b>jean, joe, jim</b> , μπορείτε να εισάγετε το <b>j%%</b> , μπορείτε επίσης να χρησιμοποιήσετε. ως διαχωριστικό για αξία και χρήση! για εκτός αυτής της τιμής. Για παράδειγμα, το <b>jean, joe, jim%%;! Jimo;! Jima%</b> θα στοχεύσει όλους τους Jean, joe, ξεκινήστε με τον Jim αλλά όχι το jimo και όχι με όλα όσα αρχίζουν με jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Ελάχιστη τιμή
 AdvTgtMaxVal=Μέγιστη τιμή
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Εγκατάσταση εξερχόμενου email (για ενότητα %s)
-DefaultOutgoingEmailSetup=Προεπιλεγμένη ρύθμιση εξερχόμενων email
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Πληροφορίες
 ContactsWithThirdpartyFilter=Επαφές με φίλτρο τρίτου μέρους
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index 420fc166108..7a1e39e0fb0 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Δεν υπάρχει διαθέσιμο πρότυπο για
 AvailableVariables=Διαθέσιμες μεταβλητές αντικατάστασης
 NoTranslation=Δεν μεταφράστηκε
 Translation=Μετάφραση
+CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Δεν υπάρχουν καταχωρημένα στοιχεία
 NoRecordDeleted=Δεν διαγράφηκε εγγραφή
 NotEnoughDataYet=Τα δεδομένα δεν είναι επαρκή
@@ -85,6 +87,8 @@ FileWasNotUploaded=Επιλέχθηκε ένα αρχείο για επισύν
 NbOfEntries=Αριθ. Εγγραφών
 GoToWikiHelpPage=Online βοήθεια (απαιτείται σύνδεση στο internet)
 GoToHelpPage=Βοήθεια
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Η εγγραφή αποθηκεύτηκε
 RecordDeleted=Η εγγραφή διγραφηκε
 RecordGenerated=Η εγγραφή δημιουργήθηκε
@@ -433,6 +437,7 @@ RemainToPay=Πληρώστε
 Module=Ενότητα / Εφαρμογή
 Modules=Ενότητες / Εφαρμογές
 Option=Επιλογή
+Filters=Filters
 List=Λίστα
 FullList=Πλήρης Λίστα
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Αποστολή email
 Email=Email
 NoEMail=Χωρίς email
 AlreadyRead=Διαβάσατε ήδη
-NotRead=Δεν διαβάζεται
+NotRead=Unread
 NoMobilePhone=Χωρείς κινητό τηλέφωνο
 Owner=Ιδιοκτήτης
 FollowingConstantsWillBeSubstituted=Οι ακόλουθες σταθερές θα αντικαταστασθούν με τις αντίστοιχες τιμές
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Υπενθύμιση συμβάντος
 UpdateForAllLines=Update for all lines
+OnHold=Σε Αναμονή
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/el_GR/modulebuilder.lang b/htdocs/langs/el_GR/modulebuilder.lang
index 6f8f201d666..0c97a5a3b30 100644
--- a/htdocs/langs/el_GR/modulebuilder.lang
+++ b/htdocs/langs/el_GR/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=Σελίδα PHP για δημιουργία / επεξε
 PageForAgendaTab=Σελίδα PHP για καρτέλα συμβάντος
 PageForDocumentTab=PHP σελίδα για καρτέλα έγγραφο
 PageForNoteTab=Σελίδα PHP για την καρτέλα σημείωσης
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Διαδρομή προς φερμουάρ του πακέτου ενότητας / εφαρμογής
 PathToModuleDocumentation=Διαδρομή αρχείου τεκμηρίωσης ενότητας / εφαρμογής (%s)
 SpaceOrSpecialCharAreNotAllowed=Δεν επιτρέπονται χώροι ή ειδικοί χαρακτήρες.
@@ -77,7 +78,7 @@ IsAMeasure=Είναι ένα μέτρο
 DirScanned=Κατάλογος σάρωση
 NoTrigger=Δεν ενεργοποιείται
 NoWidget=Δεν γραφικό στοιχείο
-GoToApiExplorer=Μεταβείτε στον εξερευνητή API
+GoToApiExplorer=API explorer
 ListOfMenusEntries=Λίστα καταχωρήσεων μενού
 ListOfDictionariesEntries=Λίστα καταχωρήσεων λεξικών
 ListOfPermissionsDefined=Λίστα καθορισμένων δικαιωμάτων
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Αν έχετε γνώσεις SQL και PHP, μπορ
 SeeTopRightMenu=Βλέπω <span class="fa fa-bug"></span> στο πάνω δεξιό μενού
 AddLanguageFile=Προσθήκη αρχείου γλώσσας
 YouCanUseTranslationKey=Μπορείτε να χρησιμοποιήσετε εδώ ένα κλειδί που είναι το κλειδί μετάφρασης που βρίσκεται στο αρχείο γλώσσας (δείτε την καρτέλα &quot;Γλώσσες&quot;)
-DropTableIfEmpty=(Διαγραφή πίνακα εάν είναι κενή)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=Ο πίνακας %s δεν υπάρχει
 TableDropped=Ο πίνακας %s διαγράφηκε
 InitStructureFromExistingTable=Δημιουργήστε τη συμβολοσειρά συστοιχιών δομής ενός υπάρχοντος πίνακα
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Χρησιμοποιήστε μια συγκεκριμέ
 UseSpecificFamily = Χρησιμοποιήστε μια συγκεκριμένη οικογένεια
 UseSpecificAuthor = Χρησιμοποιήστε έναν συγκεκριμένο συντάκτη
 UseSpecificVersion = Χρησιμοποιήστε μια συγκεκριμένη αρχική έκδοση
-ModuleMustBeEnabled=Η μονάδα / εφαρμογή πρέπει πρώτα να ενεργοποιηθεί
 IncludeRefGeneration=Η αναφορά του αντικειμένου πρέπει να δημιουργείται αυτόματα
 IncludeRefGenerationHelp=Ελέγξτε αν θέλετε να συμπεριλάβετε κώδικα για να διαχειριστείτε την αυτόματη παραγωγή της αναφοράς
 IncludeDocGeneration=Θέλω να δημιουργήσω κάποια έγγραφα από το αντικείμενο
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Τύπος πεδίων: <br> varchar (99), διπλό (24,8),
 AsciiToHtmlConverter=Μεταροπέας από Ascii σε HTML
 AsciiToPdfConverter=Μεταροπέας από Ascii σε PDF
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index 28a0f808756..92d6f312061 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -5,8 +5,6 @@ Tools=Εργαλεία
 TMenuTools=Εργαλεία
 ToolsDesc=Όλα τα εργαλεία που δεν περιλαμβάνονται σε άλλες καταχωρίσεις μενού ομαδοποιούνται εδώ. <br> Όλα τα εργαλεία μπορούν να προσπελαστούν μέσω του αριστερού μενού.
 Birthday=Γενέθλια
-BirthdayDate=Ημερομηνία γενέθλια
-DateToBirth=Ημερομηνία γέννησης
 BirthdayAlertOn=Ειδοποίηση γενεθλίων ενεργή
 BirthdayAlertOff=Ειδοποίηση γενεθλίων ανενεργή
 TransKey=Μετάφραση του κλειδιού TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Προηγούμενος μήνας (αριθμός 1-12)
 TextPreviousMonthOfInvoice=Προηγούμενος μήνας (κείμενο) της ημερομηνίας του τιμολογίου
 NextMonthOfInvoice=Μετά τον μήνα (αριθμός 1-12) της ημερομηνίας του τιμολογίου
 TextNextMonthOfInvoice=Μετά τον μήνα (κείμενο) της ημερομηνίας του τιμολογίου
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Το αρχείο Zip δημιουργήθηκε σε <b>%s</b> .
 DocFileGeneratedInto=Το αρχείο Doc δημιουργήθηκε σε <b>%s</b> .
 JumpToLogin=Ασύνδετος. Μετάβαση στη σελίδα σύνδεσης ...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__ (Γεια σας) __ Παρακαλούμε
 PredefinedMailContentSendFichInter=__ (Γεια σας) __ Βρείτε την παρέμβαση __REF__ επισυνάπτεται __ (ειλικρινά) __ __USER_SIGNATURE__
 PredefinedMailContentLink=Μπορείτε να κάνετε κλικ στον παρακάτω σύνδεσμο για να πραγματοποιήσετε την πληρωμή σας, αν δεν έχει γίνει ήδη. %s
 PredefinedMailContentGeneric=__ (Γεια σας) __ __ (ειλικρινά) __ __USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Το Dolibarr είναι ένα συμπαγές ERP / CRM που υποστηρίζει διάφορες λειτουργικές μονάδες. Ένα demo που παρουσιάζει όλες τις μονάδες δεν έχει νόημα καθώς το σενάριο αυτό δεν εμφανίζεται ποτέ (αρκετές εκατοντάδες διαθέσιμες). Έτσι, πολλά προφίλ επίδειξης είναι διαθέσιμα.
 ChooseYourDemoProfil=Επιλέξτε το προφίλ επίδειξης που ταιριάζει καλύτερα στις ανάγκες σας ...
 ChooseYourDemoProfilMore=... ή να δημιουργήσετε το δικό σας προφίλ <br> (επιλογή χειροκίνητης μονάδας)
@@ -137,7 +138,7 @@ Right=Δικαίωμα
 CalculatedWeight=Υπολογισμένο βάρος
 CalculatedVolume=Υπολογισμένος όγκος
 Weight=Βάρος
-WeightUnitton=τόνο
+WeightUnitton=τόνος
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Επαφή / διεύθυνση που δημιο
 ProjectCreatedByEmailCollector=Έργο που δημιουργήθηκε από τον συλλέκτη ηλεκτρονικού ταχυδρομείου από το ηλεκτρονικό ταχυδρομείο MSGID %s
 TicketCreatedByEmailCollector=Εισιτήριο που δημιουργήθηκε από τον συλλέκτη ηλεκτρονικού ταχυδρομείου από το ηλεκτρονικό ταχυδρομείο MSGID %s
 OpeningHoursFormatDesc=Χρησιμοποιήστε το "-" για να διαχωρίσετε τις ώρες ανοίγματος και κλεισίματος. <br> Χρησιμοποιήστε "κενό" για να εισάγετε διαφορετικές περιοχές. <br> Παράδειγμα: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index 6570f5f1b60..f74ea812c40 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Πολλαπλά τμήματα τιμών ανά προϊόν / υπηρεσία (κάθε πελάτης βρίσκεται σε ένα τμήμα τιμών)
 MultiPricesNumPrices=Αριθμός τιμής
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Αριθμός μητρικής συσκευασίας προϊόντος
@@ -167,8 +168,10 @@ BuyingPrices=Τιμές Αγοράς
 CustomerPrices=Τιμές Πελατών
 SuppliersPrices=Τιμές πωλητών
 SuppliersPricesOfProductsOrServices=Τιμές πωλητών (προϊόντων ή υπηρεσιών)
-CustomCode=Τελωνείο / εμπορεύματα / κωδικός ΕΣ
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Χώρα προέλευσης
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Φύση προϊόντος (υλικό / τελικό)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Διαφορετικές τιμές από την ποσότητα
 DisablePriceByQty=Απενεργοποιήστε τις τιμές ανά ποσότητα
 PriceByQuantityRange=Quantity range
-MultipriceRules=Κανόνες τμήματος τιμών
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Χρησιμοποιήστε κανόνες για το τμήμα των τιμών (που ορίζονται στην εγκατάσταση μονάδας προϊόντος) για να υπολογίσετε αυτόματα τις τιμές όλων των άλλων τμημάτων σύμφωνα με τον πρώτο τομέα
 PercentVariationOver=Παραλλαγή %% μέσω %s
 PercentDiscountOver=%% έκπτωση πάνω από %s
diff --git a/htdocs/langs/el_GR/recruitment.lang b/htdocs/langs/el_GR/recruitment.lang
index 979cbd02335..6bd34b116f7 100644
--- a/htdocs/langs/el_GR/recruitment.lang
+++ b/htdocs/langs/el_GR/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/el_GR/sendings.lang b/htdocs/langs/el_GR/sendings.lang
index d72b07464cb..d4bf5fdbe92 100644
--- a/htdocs/langs/el_GR/sendings.lang
+++ b/htdocs/langs/el_GR/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Άλλες αποστολές για αυτό το σ
 SendingsAndReceivingForSameOrder=Αποστολές και αποδείξεις για αυτήν την παραγγελία
 SendingsToValidate=Αποστολές για επικύρωση
 StatusSendingCanceled=Ακυρώθηκε
+StatusSendingCanceledShort=Ακυρώθηκε
 StatusSendingDraft=Σχέδιο
 StatusSendingValidated=Επικυρωμένη (προϊόντα για αποστολή ή που έχουν ήδη αποσταλεί)
 StatusSendingProcessed=Επεξεργασμένα
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Θα πρέπει πρώτα να επικυρ
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Πληρέστερο πρότυπο έγγραφο για αποδεικτικά παράδοσης (logo. ..)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Σταθερή EXPEDITION_ADDON_NUMBER δεν ορίζεται
 SumOfProductVolumes=Άθροισμα όγκου του προϊόντος
 SumOfProductWeights=Άθροισμα το βάρος των προϊόντων
diff --git a/htdocs/langs/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang
index 50808768598..22b2e9fdf59 100644
--- a/htdocs/langs/el_GR/stocks.lang
+++ b/htdocs/langs/el_GR/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/el_GR/ticket.lang b/htdocs/langs/el_GR/ticket.lang
index 67327d94483..65f2b2d8d39 100644
--- a/htdocs/langs/el_GR/ticket.lang
+++ b/htdocs/langs/el_GR/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Τύπος εισιτηρίου
 TicketDictCategory=Εισιτήριο - Ομαδοποιεί
 TicketDictSeverity=Εισιτήριο - Βαρύτητα
 TicketDictResolution=Εισιτήριο - Ανάλυση
-TicketTypeShortBUGSOFT=Λογική δυσλειτουργίας
-TicketTypeShortBUGHARD=Dysfonctionnement υλικά
-TicketTypeShortCOM=Εμπορική ερώτηση
 
+TicketTypeShortCOM=Εμπορική ερώτηση
 TicketTypeShortHELP=Αίτημα για λειτουργική βοήθεια
 TicketTypeShortISSUE=Θέμα, σφάλμα ή πρόβλημα
 TicketTypeShortREQUEST=Αίτημα αλλαγής ή βελτίωσης
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Άλλο
 TicketSeverityShortLOW=Χαμηλή
 TicketSeverityShortNORMAL=Κανονικός
 TicketSeverityShortHIGH=Υψηλή
-TicketSeverityShortBLOCKING=Κρίσιμη / Αποκλεισμός
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Το πεδίο &#39;%s&#39; είναι εσφαλμένο
 MenuTicketMyAssign=Τα εισιτήριά μου
@@ -60,7 +58,6 @@ OriginEmail=Πηγή ηλεκτρονικού ταχυδρομείου
 Notify_TICKET_SENTBYMAIL=Στείλτε μήνυμα εισιτηρίου μέσω ηλεκτρονικού ταχυδρομείου
 
 # Status
-NotRead=Δεν διαβάζεται
 Read=Ανάγνωση
 Assigned=Ανατεθεί
 InProgress=Σε εξέλιξη
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Η δημόσια διεπαφή επιτρέ
 TicketsAutoAssignTicket=Ορίστε αυτόματα τον χρήστη που δημιούργησε το εισιτήριο
 TicketsAutoAssignTicketHelp=Κατά τη δημιουργία ενός εισιτηρίου, ο χρήστης μπορεί να αντιστοιχιστεί αυτόματα στο εισιτήριο.
 TicketNumberingModules=Μονάδα αρίθμησης εισιτηρίων
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Ειδοποιήστε τρίτο μέρος στη δημιουργία
 TicketsDisableCustomerEmail=Πάντα να απενεργοποιείτε τα μηνύματα ηλεκτρονικού ταχυδρομείου όταν δημιουργείται ένα εισιτήριο από τη δημόσια διασύνδεση
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Η κατάσταση άλλαξε: %s to %s
 TicketNotNotifyTiersAtCreate=Μην ειδοποιείτε την εταιρεία στη δημιουργία
 Unread=Αδιάβαστος
 TicketNotCreatedFromPublicInterface=Μη διαθέσιμος. Το εισιτήριο δεν δημιουργήθηκε από το δημόσιο περιβάλλον.
-PublicInterfaceNotEnabled=Η δημόσια διεπαφή δεν ήταν ενεργοποιημένη
 ErrorTicketRefRequired=Το όνομα αναφοράς Eισιτηρίου είναι υποχρεωτικό
 
 #
diff --git a/htdocs/langs/el_GR/website.lang b/htdocs/langs/el_GR/website.lang
index 50dd8e48759..7ed1f8aab8f 100644
--- a/htdocs/langs/el_GR/website.lang
+++ b/htdocs/langs/el_GR/website.lang
@@ -30,7 +30,6 @@ EditInLine=Επεξεργασία εν σειρά
 AddWebsite=Προσθήκη ιστοτόπου
 Webpage=Ιστοσελίδα / δοχείο
 AddPage=Προσθήκη σελίδας / δοχείου
-HomePage=Αρχική σελίδα
 PageContainer=Σελίδα
 PreviewOfSiteNotYetAvailable=<strong>Δεν</strong> είναι ακόμα διαθέσιμη η προεπισκόπηση του ιστοτόπου σας <strong>%s</strong> . Πρέπει πρώτα να <strong>εισαγάγετε ένα πλήρες πρότυπο ιστότοπου</strong> ή απλά να <strong>προσθέσετε μια σελίδα / κοντέινερ</strong> .
 RequestedPageHasNoContentYet=Η σελίδα που ζητήθηκε με id %s δεν έχει ακόμα περιεχόμενο, ή το αρχείο cache .tpl.php καταργήθηκε. Επεξεργαστείτε το περιεχόμενο της σελίδας για να το επιλύσετε.
@@ -101,7 +100,7 @@ EmptyPage=Κενή σελίδα
 ExternalURLMustStartWithHttp=Η εξωτερική διεύθυνση URL πρέπει να ξεκινά με http: // ή https: //
 ZipOfWebsitePackageToImport=Μεταφορτώστε το αρχείο Zip του πακέτου πρότυπου ιστότοπου
 ZipOfWebsitePackageToLoad=ή Επιλέξτε ένα διαθέσιμο πακέτο πρότυπου ιστότοπου
-ShowSubcontainers=Συμπεριλάβετε δυναμικό περιεχόμενο
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Εσωτερική διεύθυνση URL της σελίδας
 ThisPageIsTranslationOf=Αυτή η σελίδα / δοχείο είναι μια μετάφραση του
 ThisPageHasTranslationPages=Αυτή η σελίδα / κοντέινερ έχει μετάφραση
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/el_GR/withdrawals.lang b/htdocs/langs/el_GR/withdrawals.lang
index b4cebd19f0c..7a986327a4b 100644
--- a/htdocs/langs/el_GR/withdrawals.lang
+++ b/htdocs/langs/el_GR/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Τελευταίες εισπράξεις άμεσης χ
 MakeWithdrawRequest=Πραγματοποιήστε αίτημα πληρωμής με άμεση χρέωση
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s καταγράφονται τα αιτήματα πληρωμής άμεσης χρέωσης
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Τραπεζικός κωδικός τρίτου μέρους
 NoInvoiceCouldBeWithdrawed=Κανένα τιμολόγιο δεν χρεώθηκε με επιτυχία. Βεβαιωθείτε ότι τα τιμολόγια είναι σε εταιρείες με έγκυρο αριθμό IBAN και ότι ο IBAN έχει UMR (Unique Mandate Reference) με τον τρόπο <strong>%s</strong> .
 ClassCredited=Ταξινομήστε πιστώνεται
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Ημερομηνία εκτέλεσης
 CreateForSepa=Δημιουργήστε αρχείο άμεσης χρέωσης
-ICS=Αναγνωριστικό πιστωτή CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END=&quot;EndToEndId&quot; Ετικέτα XML SEPA - Μοναδική ταυτότητα που αντιστοιχεί σε κάθε συναλλαγή
 USTRD=&quot;Μη δομημένη&quot; ετικέτα XML SEPA
 ADDDAYS=Προσθήκη ημερών στην Ημερομηνία Εκτέλεσης
@@ -146,3 +148,4 @@ InfoRejectSubject=Η εντολή πληρωμής άμεσης χρέωσης 
 InfoRejectMessage=Γεια σας, <br><br> η εντολή πληρωμής άμεσης χρέωσης του τιμολογίου %s σχετικά με την εταιρεία %s, με το ποσό %s απορρίφθηκε από την τράπεζα. <br><br> - <br> %s
 ModeWarning=Επιλογή για την πραγματική κατάσταση, δεν είχε καθοριστεί, σταματάμε μετά από αυτή την προσομοίωση
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/en_AU/accountancy.lang b/htdocs/langs/en_AU/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/en_AU/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/en_AU/products.lang b/htdocs/langs/en_AU/products.lang
deleted file mode 100644
index 6e900475275..00000000000
--- a/htdocs/langs/en_AU/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/en_AU/withdrawals.lang b/htdocs/langs/en_AU/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/en_AU/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/en_CA/accountancy.lang b/htdocs/langs/en_CA/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/en_CA/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/en_CA/compta.lang b/htdocs/langs/en_CA/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/en_CA/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/en_CA/products.lang b/htdocs/langs/en_CA/products.lang
deleted file mode 100644
index 6e900475275..00000000000
--- a/htdocs/langs/en_CA/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/en_CA/withdrawals.lang b/htdocs/langs/en_CA/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/en_CA/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/en_GB/accountancy.lang b/htdocs/langs/en_GB/accountancy.lang
index 9a42aff0270..d759a22f0c6 100644
--- a/htdocs/langs/en_GB/accountancy.lang
+++ b/htdocs/langs/en_GB/accountancy.lang
@@ -49,6 +49,7 @@ VentilatedinAccount=Linked successfully to the financial account
 NotVentilatedinAccount=Not linked to the financial account
 XLineSuccessfullyBinded=%s products/services successfully linked to the finance account
 XLineFailedToBeBinded=%s products/services were not linked to any finance account
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin sorting the page "Links to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin sorting the page "Links done" by the most recent elements
 ACCOUNTING_LENGTH_GACCOUNT=Length of the General Ledger accounts (If you set value to 6 here, the account '706' will appear as '706000' on screen)
@@ -61,10 +62,8 @@ ACCOUNTING_SERVICE_BUY_ACCOUNT=Default services purchase account (used if not de
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default services sales account (used if not defined in the service sheet)
 LabelAccount=Account name
 LabelOperation=Account operation
-Sens=Meaning
 NumPiece=Item number
 AccountingCategory=Personalised groups
-GroupByAccountAccounting=Group by finance account
 AccountingAccountGroupsDesc=Here you can define some groups of financial accounts. They will be used for personalised accounting reports.
 ByPersonalizedAccountGroups=By personalised groups
 FeeAccountNotDefined=Account for fees not defined
diff --git a/htdocs/langs/en_GB/products.lang b/htdocs/langs/en_GB/products.lang
index 844ae30d7c1..e707e316257 100644
--- a/htdocs/langs/en_GB/products.lang
+++ b/htdocs/langs/en_GB/products.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
 PrintsheetForOneBarCode=Print several labels for one barcode
diff --git a/htdocs/langs/en_GB/sendings.lang b/htdocs/langs/en_GB/sendings.lang
index ed103dc3a4b..61058b10825 100644
--- a/htdocs/langs/en_GB/sendings.lang
+++ b/htdocs/langs/en_GB/sendings.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - sendings
 StatusSendingCanceled=Cancelled
+StatusSendingCanceledShort=Cancelled
diff --git a/htdocs/langs/en_GB/withdrawals.lang b/htdocs/langs/en_GB/withdrawals.lang
index b1d58194878..3ec4f7ab0ec 100644
--- a/htdocs/langs/en_GB/withdrawals.lang
+++ b/htdocs/langs/en_GB/withdrawals.lang
@@ -13,4 +13,5 @@ WithdrawalFileNotCapable=Unable to generate Payment receipt file for your countr
 WithdrawRequestAmount=The amount of Direct Debit request:
 WithdrawRequestErrorNilAmount=Unable to create a Direct Debit request for an empty amount.
 SEPALegalText=By signing this mandate form, you authorise (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+ICS=Creditor Identifier CI for direct debit
 InfoRejectMessage=Hello,<br><br>the direct debit payment order for invoice %s related to the company %s, for an amount of %s has been refused by the bank.<br><br>--<br>%s
diff --git a/htdocs/langs/en_IN/accountancy.lang b/htdocs/langs/en_IN/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/en_IN/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/en_IN/products.lang b/htdocs/langs/en_IN/products.lang
deleted file mode 100644
index 6e900475275..00000000000
--- a/htdocs/langs/en_IN/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/en_IN/withdrawals.lang b/htdocs/langs/en_IN/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/en_IN/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/en_SG/accountancy.lang b/htdocs/langs/en_SG/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/en_SG/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/en_SG/compta.lang b/htdocs/langs/en_SG/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/en_SG/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/en_SG/products.lang b/htdocs/langs/en_SG/products.lang
deleted file mode 100644
index 6e900475275..00000000000
--- a/htdocs/langs/en_SG/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/en_SG/withdrawals.lang b/htdocs/langs/en_SG/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/en_SG/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_AR/accountancy.lang b/htdocs/langs/es_AR/accountancy.lang
index 96c58aaf400..ab876d97846 100644
--- a/htdocs/langs/es_AR/accountancy.lang
+++ b/htdocs/langs/es_AR/accountancy.lang
@@ -16,3 +16,4 @@ Journals=Diarios Contables
 JournalFinancial=Diarios Financieros
 AssignDedicatedAccountingAccount=Nueva cuenta para asignar
 InvoiceLabel=Etiqueta de la factura
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang
index 6b938db0388..fb204e4d784 100644
--- a/htdocs/langs/es_AR/admin.lang
+++ b/htdocs/langs/es_AR/admin.lang
@@ -61,7 +61,6 @@ AllowToSelectProjectFromOtherCompany=En el documento de un tercero, puede elegir
 JavascriptDisabled=JavaScript desactivado
 UsePreviewTabs=Usar pestañas de vista previa
 ShowPreview=Mostrar vista previa
-CurrentTimeZone=TimeZone PHP (servidor)
 MySQLTimeZone=TimeZone MySql (base de datos)
 TZHasNoEffect=Las fechas son almacenadas y devueltas por el servidor de base de datos como si se mantuvieran como una cadena enviada. La zona horaria solo tiene efecto cuando se usa la función UNIX_TIMESTAMP (que Dolibarr no debe usar, por lo que la base de datos TZ no debería tener ningún efecto, incluso si se cambia después de ingresar los datos).
 Space=Espacio
@@ -112,8 +111,6 @@ SystemToolsArea=Área de herramientas del sistema
 SystemToolsAreaDesc=Esta área proporciona funciones de administración. Utilice el menú para elegir la función requerida.
 PurgeAreaDesc=Esta página le permite eliminar todos los archivos generados o almacenados por Dolibarr (archivos temporales o todos los archivos en el directorio <b> %s </b>). Usando esta característica normalmente no es necesario. Se proporciona como una solución para los usuarios cuyo Dolibarr está alojado por un proveedor que no ofrece permisos para eliminar archivos generados por el servidor web.
 PurgeDeleteLogFile=Elimine los archivos de registro, incluido el <b> %s </b> definido para el módulo Syslog (sin riesgo de perder datos)
-PurgeDeleteTemporaryFiles=Eliminar todos los archivos temporales (no hay risgo de perder información), Nota: La eliminación se realizará sólo si la carpeta temporal sólo fue creada hace 24 horas.
-PurgeDeleteTemporaryFilesShort=Borrar archivos temporales
 PurgeDeleteAllFilesInDocumentsDir=Elimine todos los archivos en el directorio: <b> %s </b>. <br> Esto eliminará todos los documentos generados relacionados con elementos (terceros, facturas, etc.), archivos cargados en el módulo ECM, volcados de copia de seguridad de la base de datos y archivos temporales. archivos.
 PurgeRunNow=Purga ahora
 PurgeNothingToDelete=No hay directorio o archivos para eliminar.
@@ -254,7 +251,6 @@ LastActivationIP=IP de última activación
 UpdateServerOffline=Actualizar servidor fuera de línea
 WithCounter=Administrar un contador
 AddCRIfTooLong=No hay ajuste de texto automático. El texto que es demasiado largo no será mostrado en el documento.  Por favor agregar saltos de línea en el área de texto si es necesario.
-ExampleOfDirectoriesForModelGen=Ejemplo de  sintaxis:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 String=Cuerda
 Module30Name=Facturas
 Module40Desc=Gestión de proveedores y compras (órdenes de compra y facturas de proveedores)
diff --git a/htdocs/langs/es_AR/blockedlog.lang b/htdocs/langs/es_AR/blockedlog.lang
index 5b0a4d9d1b5..080e82c85c5 100644
--- a/htdocs/langs/es_AR/blockedlog.lang
+++ b/htdocs/langs/es_AR/blockedlog.lang
@@ -24,7 +24,6 @@ logBILL_SENTBYMAIL=Factura de cliente enviada por corre
 logBILL_DELETE=Borrado lógico de una factura de cliente
 logDON_DELETE=Borrado lógico de una donación
 logMEMBER_SUBSCRIPTION_DELETE=Borrado lógico de una suscripción de miembro
-logCASHCONTROL_VALIDATE=Registro de flujo de efectivo
 ListOfTrackedEvents=Lista de eventos rastreados
 logDOC_DOWNLOAD=Descarga de un documento validado para imprimir o enviar
 DataOfArchivedEvent=Datos completos del evento archivado
diff --git a/htdocs/langs/es_AR/companies.lang b/htdocs/langs/es_AR/companies.lang
index 5e7e576b77f..3dd71f9bcdc 100644
--- a/htdocs/langs/es_AR/companies.lang
+++ b/htdocs/langs/es_AR/companies.lang
@@ -209,7 +209,6 @@ VATIntraCheckableOnEUSite=Consulte el ID de IVA intracomunitario en el sitio web
 VATIntraManualCheck=También puedes consultar manualmente en el sitio web de la Comisión Europea <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=No es posible comprobar. El servicio de verificación no lo proporciona el estado del miembro (%s).
 NorProspectNorCustomer=Ni cliente ni cliente potencial
-JuridicalStatus=Tipo de entidad legal
 ProspectLevel=Cliente potencia
 OthersNotLinkedToThirdParty=Otros, no vinculados a un tercero
 ProspectStatus=Estado del cliente potencial
diff --git a/htdocs/langs/es_AR/cron.lang b/htdocs/langs/es_AR/cron.lang
index f3f72b8cb2f..e9709b188f5 100644
--- a/htdocs/langs/es_AR/cron.lang
+++ b/htdocs/langs/es_AR/cron.lang
@@ -4,8 +4,6 @@ Permission23102 =Crear/actualizar tarea programada
 Permission23103 =Eliminar tarea programada
 Permission23104 =Ejecutar tarea programada
 CronSetup=Configuración para administración de tareas programadas
-URLToLaunchCronJobs=URL para verificar y ejecutar tareas programadas calificadas
-OrToLaunchASpecificJob=O para verificar y ejecutar una tarea específica
 KeyForCronAccess=Clave de seguridad para la URL para ejecutar tareas programadas
 FileToLaunchCronJobs=Línea de comandos para verificar y ejecutar tareas programadas calificadas
 CronExplainHowToRunUnix=O el ambiente de Unix que deberías utilizar para una entrada programada para ejecutar el comando cada 5 minutos
@@ -37,7 +35,6 @@ CronNote=Comentar
 CronFieldMandatory=Los campos %s son obligatorios
 CronErrEndDateStartDt=La fecha de finalización no puede ser anterior a la fecha de inicio
 StatusAtInstall=Estado de la instalación del módulo
-CronStatusActiveBtn=Habilitar
 CronStatusInactiveBtn=Deshabilitar
 CronTaskInactive=Esta tarea está deshabilitada
 CronClassFile=Nombre de archivo y clase
diff --git a/htdocs/langs/es_AR/mails.lang b/htdocs/langs/es_AR/mails.lang
index 02b4225c64c..13fbbbe92c7 100644
--- a/htdocs/langs/es_AR/mails.lang
+++ b/htdocs/langs/es_AR/mails.lang
@@ -99,12 +99,6 @@ TagSignature=Firma del emisor
 EMailRecipient=Correo del destinatario
 TagMailtoEmail=Correo del destinatario (incluyendo el enlace htm "mailto:")
 NoEmailSentBadSenderOrRecipientEmail=No se han enviado correos. El correo del emisor o destinatario están incorrectos. Verifique el perfil del usuario.
-NoNotificationsWillBeSent=No se han planificado notificaciones por correo para este evento y compañía
-ANotificationsWillBeSent=1 notificación werá enviada por correo
-SomeNotificationsWillBeSent=%s notificaciones serán enviadas por correo
-AddNewNotification=Activar una nueva notificación por mail para ese objetivo/evento
-ListOfActiveNotifications=Listar todos los objetivos/eventos activos para la notificación por correo
-ListOfNotificationsDone=Listar todas las notificaciones enviadas por correo
 MailSendSetupIs=La configuración de envío de correo ha sido establecida a '%s'. Este modo no puede ser utilizado para envío masivo de correos.
 MailSendSetupIs2=Debes dirigirte primero, utilizando una cuenta de administrador, al menú %s Inicio - Configuración - Correos%s para cambiar el parámetro <strong>'%s'</strong> para utilizar el modo '%s'. Con este modo, podrás entrar en la configuración del servidor SMTP provisto por tu proveedor de internet y utilizar la funcionalidad de envío masivo de correos.
 MailSendSetupIs3=Si tienes alguna consulta acerca de cómo configurar tu servidor SMTP, puedes preguntarle a %s.
@@ -113,7 +107,6 @@ NbOfTargetedContacts=Cantidad de contactos de correo objetivo
 UseFormatFileEmailToTarget=El archivo importado debe tener el formato <strong>correo;nombre;primer nombre;otro</strong>
 UseFormatInputEmailToTarget=Ingrese una cadena con el formato <strong>correo;nombre;primer nombre;otro</strong>
 AdvTgtTitle=Complete los campos para agregar los terceros o contactos/direcciones de correo al objetivo
-AdvTgtSearchTextHelp=Utilice %% como comodines. Por ejemplo para encontrar todos los item como <b>jean, joe, jim</b>, puedes ingresar <b>j%%</b>, también puedes usar ; como separador de valores, y usar ! para exceptuarlo. Por ejemplo  <b>jean;joe;jim%%;!jimo;!jima%</b> para ubicar a todos los jean, joe, comenzando con jim pero no jimo ni nada que comience con jima
 AdvTgtSearchIntHelp=Utilice el intervalo para seleccionar entero o valor decimal
 AdvTgtMaxVal=Valor máximo
 AdvTgtSearchDtHelp=Utilice intervalos para seleccionar el valor de fecha
@@ -128,7 +121,4 @@ AdvTgtAddContact=Agregar correos acorde al criterio
 AdvTgtOrCreateNewFilter=Nombre del filtro nuevo
 NoContactWithCategoryFound=No se encontraron contactos/direcciones con la categoría buscada
 NoContactLinkedToThirdpartieWithCategoryFound=No se encontraron contactos/direcciones con la categoría buscada
-OutGoingEmailSetup=Configuración de correo saliente
-InGoingEmailSetup=Configuración de correo entrante
-DefaultOutgoingEmailSetup=Configuración de correo saliente por defecto
 ContactsWithThirdpartyFilter=Contactos con filtro de terceros
diff --git a/htdocs/langs/es_AR/products.lang b/htdocs/langs/es_AR/products.lang
index 1b8705686ca..a429996096a 100644
--- a/htdocs/langs/es_AR/products.lang
+++ b/htdocs/langs/es_AR/products.lang
@@ -73,4 +73,3 @@ PriceQtyMin=Precio para cantidad mín.
 PriceQtyMinCurrency=Precio (moneda) para esta cant. (sin descuento)
 PredefinedProductsToSell=Producto Predefinido
 SuppliersPrices=Precio de Proveedor
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/es_AR/sendings.lang b/htdocs/langs/es_AR/sendings.lang
index 0fab9dbcf71..d573200cc64 100644
--- a/htdocs/langs/es_AR/sendings.lang
+++ b/htdocs/langs/es_AR/sendings.lang
@@ -1,48 +1,41 @@
 # Dolibarr language file - Source file is en_US - sendings
-RefSending=Ref. viaje
-Sending=Viaje
-Sendings=Viajes
-AllSendings=Todos los viajes
-Shipment=Viaje
-Shipments=Viajes
-ShowSending=Mostrar viajes
+AllSendings=Todos los Envíos
+ShowSending=Mostrar Envíos
 Receivings=Comprobantes de entrega
 SendingsArea=Área de envíos
-ListOfSendings=Lista de viajes
-LastSendings=Últimos %s viajes
-NbOfSendings=Cantidad de viajes
-NumberOfShipmentsByMonth=Cantidad de viajes por mes
-SendingCard=Ficha del viaje
-NewSending=Nuevo viaje
-CreateShipment=Crear viaje
+ListOfSendings=Lista de envíos
+NbOfSendings=Cantidad de envíos
+NumberOfShipmentsByMonth=Cantidad de envíos por mes
+SendingCard=Ficha del envío
 QtyShipped=Cantidad enviada
 QtyShippedShort=Cantidad enviada
 QtyPreparedOrShipped=Cantidad preparada o enviada
 QtyToShip=Cantidad para enviar
 QtyToReceive=Cantidad para recibir
 QtyReceived=Cantidad recibida
-QtyInOtherShipments=Cantidad en otros viajes
+QtyInOtherShipments=Cantidad en otros envíos
 KeepToShip=Pendiente de enviar
-OtherSendingsForSameOrder=Otros viajes para esta orden
+OtherSendingsForSameOrder=Otros envíos para este pedido
 SendingsAndReceivingForSameOrder=Viajes y recepciones de esta orden
-SendingsToValidate=Viajes para validar
+SendingsToValidate=Envíos para validar
 StatusSendingCanceled=Cancelado
+StatusSendingCanceledShort=Cancelada
 StatusSendingValidated=Validado (productos para enviar o ya enviados)
-SendingSheet=Hoja de viaje
-ConfirmDeleteSending=¿Estás seguro que quieres eliminar este viaje?
-ConfirmValidateSending=¿Estás seguro que quieres validar este viaje con referencia <b>%s</b>?
-ConfirmCancelSending=¿Estás seguro que quieres cancelar este viaje?
+SendingSheet=Remito
+ConfirmDeleteSending=¿Estás seguro que quieres eliminar este envío?
+ConfirmValidateSending=¿Estás seguro que quiere validar este envío con referencia <b>%s</b>?
+ConfirmCancelSending=¿Estás seguro que quieres cancelar este envío?
 WarningNoQtyLeftToSend=Advertencia, no hay productos esperando para ser enviados.
 StatsOnShipmentsOnlyValidated=Estadísticas realizadas sólo sobre viajes validados. La fecha utilizada es la de validación del viaje (la fecha de entrega prevista no siempre se conoce).
 RefDeliveryReceipt=Ref. comprobante de entrega
 StatusReceipt=Estado del comprobante de entrega
 DateReceived=Fecha de entrega
-SendShippingByEMail=Enviar detalles del viaje por correo
+SendShippingByEMail=Enviar detalles del envío por correo
 SendShippingRef=Enviar el viaje %s
 ActionsOnShipping=Eventos del viaje
 LinkToTrackYourPackage=Vínculo al seguimiento del envío
 ShipmentCreationIsDoneFromOrder=Por el momento, la creación de un nuevo viaje se realiza desde la ficha de la orden.
-ShipmentLine=Línea del viaje
+ShipmentLine=Línea del envío
 ProductQtyInCustomersOrdersRunning=Cantidad de productos de órdenes de venta abiertas
 ProductQtyInSuppliersOrdersRunning=Cantidad de productos de órdenes de compra abiertas
 ProductQtyInShipmentAlreadySent=Cantidad de productos enviados de órdenes de venta abiertas
diff --git a/htdocs/langs/es_AR/ticket.lang b/htdocs/langs/es_AR/ticket.lang
index 20fc88f15a7..c608fa6569c 100644
--- a/htdocs/langs/es_AR/ticket.lang
+++ b/htdocs/langs/es_AR/ticket.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - ticket
 TicketTypeShortPROJET=Projecto
-NotRead=Sin leer
 Read=Leído
 Waiting=Esperando
 Type=Tipo
diff --git a/htdocs/langs/es_AR/withdrawals.lang b/htdocs/langs/es_AR/withdrawals.lang
index 7c806c8b5f3..5e623914282 100644
--- a/htdocs/langs/es_AR/withdrawals.lang
+++ b/htdocs/langs/es_AR/withdrawals.lang
@@ -76,7 +76,7 @@ PleaseCheckOne=Por favor marque uno sólo
 DirectDebitOrderCreated=Orden de débito automático %s creada
 AmountRequested=Monto solicitada
 CreateForSepa=Crear archivo de débito automático
-ICS=Identificador CI de acreedor
+ICS=Creditor Identifier CI for direct debit
 END_TO_END=Etiqueta "EndToEndId" SEPA XML: identificación única asignada por transacción
 USTRD=Etiqueta "Unstructured" SEPA XML
 ADDDAYS=Agregar días a la fecha de ejecución
diff --git a/htdocs/langs/es_BO/accountancy.lang b/htdocs/langs/es_BO/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/es_BO/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_BO/compta.lang b/htdocs/langs/es_BO/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/es_BO/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/es_BO/products.lang b/htdocs/langs/es_BO/products.lang
deleted file mode 100644
index 6e900475275..00000000000
--- a/htdocs/langs/es_BO/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/es_BO/withdrawals.lang b/htdocs/langs/es_BO/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/es_BO/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_CL/accountancy.lang b/htdocs/langs/es_CL/accountancy.lang
index 764defc64a4..cdb95b2da16 100644
--- a/htdocs/langs/es_CL/accountancy.lang
+++ b/htdocs/langs/es_CL/accountancy.lang
@@ -92,7 +92,7 @@ VentilatedinAccount=Vinculado exitosamente a la cuenta de contabilidad
 NotVentilatedinAccount=No vinculado a la cuenta de contabilidad
 XLineSuccessfullyBinded=%s productos / servicios vinculados con éxito a una cuenta de contabilidad
 XLineFailedToBeBinded=%s productos / servicios no estaban vinculados a ninguna cuenta de contabilidad
-ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a enlazar mostrados por página (máximo recomendado: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comience la clasificación de la página "Encuadernación para hacer" por los elementos más recientes
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comience la clasificación de la página "Encuadernación realizada" por los elementos más recientes
 ACCOUNTING_LENGTH_DESCRIPTION=Truncar descripción de productos y servicios en listados después de x caracteres (Mejor = 50)
@@ -122,7 +122,6 @@ ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Cuenta contable por defecto para los servi
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Cuenta contable por defecto para los servicios vendidos y exportados fuera de la EEC (usado si no está definido en la hoja de servicios)
 LabelAccount=Cuenta
 LabelOperation=Operación de etiqueta
-Sens=Significado
 LetteringCode=Codigo de letras
 JournalLabel=Etiqueta de revista
 NumPiece=Pieza número
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index 71fb8fe9887..e24562839c5 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -60,7 +60,6 @@ AllowToSelectProjectFromOtherCompany=En el documento de un tercero, puede elegir
 JavascriptDisabled=JavaScript deshabilitado
 UsePreviewTabs=Usa pestañas de vista previa
 ShowPreview=Mostrar vista previa
-CurrentTimeZone=TimeZone PHP (servidor)
 MySQLTimeZone=TimeZone MySql (base de datos)
 TZHasNoEffect=Las fechas son almacenadas y devueltas por el servidor de bases de datos como si se mantuvieran como una cadena enviada. La zona horaria tiene efecto solo cuando se usa la función UNIX_TIMESTAMP (que no debe ser utilizada por Dolibarr, por lo que la base de datos TZ no debería tener ningún efecto, incluso si se cambia después de ingresar los datos).
 Space=Espacio
@@ -290,7 +289,6 @@ UrlGenerationParameters=Parámetros para asegurar URLs
 SecurityTokenIsUnique=Use un parámetro de clave segura único para cada URL
 EnterRefToBuildUrl=Ingrese la referencia para el objeto %s
 GetSecuredUrl=Obtener URL calculado
-ButtonHideUnauthorized=Ocultar botones para usuarios no administradores para acciones no autorizadas en lugar de mostrar botones deshabilitados en gris
 OldVATRates=Tasa de IVA anterior
 NewVATRates=Nueva tasa de IVA
 PriceBaseTypeToChange=Modificar en precios con el valor de referencia base definido en
@@ -1153,7 +1151,6 @@ MenuDeleted=Menú borrado
 NotTopTreeMenuPersonalized=Menús personalizados no vinculados a una entrada del menú superior
 MenuHandler=Controlador de menú
 MenuModule=Módulo fuente
-HideUnauthorizedMenu=Ocultar menús no autorizados (gris)
 DetailId=Menú Id
 DetailMenuHandler=Manejador de menú donde mostrar el nuevo menú
 DetailMenuModule=Nombre del módulo si la entrada del menú proviene de un módulo
@@ -1365,8 +1362,6 @@ EMailHost=Host del servidor de correo electrónico IMAP
 EmailcollectorOperations=Operaciones a realizar por coleccionista.
 MaxEmailCollectPerCollect=Número máximo de correos electrónicos recogidos por cobro
 ConfirmCloneEmailCollector=¿Está seguro de que desea clonar el recopilador de correo electrónico %s?
-DateLastCollectResult=Fecha de última recopilación probada
-DateLastcollectResultOk=Fecha última recogida exitosa
 EmailCollectorConfirmCollectTitle=Correo electrónico recoger confirmación
 EmailCollectorConfirmCollect=¿Quieres ejecutar la colección para este coleccionista ahora?
 NoNewEmailToProcess=No hay correo electrónico nuevo (filtros coincidentes) para procesar
diff --git a/htdocs/langs/es_CL/banks.lang b/htdocs/langs/es_CL/banks.lang
index 851975f9121..5c4a24c2f6d 100644
--- a/htdocs/langs/es_CL/banks.lang
+++ b/htdocs/langs/es_CL/banks.lang
@@ -125,6 +125,4 @@ SEPAMandate=Mandato de la SEPA
 YourSEPAMandate=Su mandato de SEPA
 FindYourSEPAMandate=Este es su mandato de SEPA para autorizar a nuestra empresa a realizar un pedido de débito directo a su banco. Devuélvalo firmado (escaneo del documento firmado) o envíelo por correo a
 AutoReportLastAccountStatement=Rellene automáticamente el campo &#39;número de extracto bancario&#39; con el último número de extracto al realizar la conciliación
-CashControl=Cerca de efectivo POS
-NewCashFence=Nueva valla de efectivo
 BankColorizeMovementDesc=Si esta función está habilitada, puede elegir un color de fondo específico para los movimientos de débito o crédito
diff --git a/htdocs/langs/es_CL/blockedlog.lang b/htdocs/langs/es_CL/blockedlog.lang
index 49d3348ac1a..c97c5e815d6 100644
--- a/htdocs/langs/es_CL/blockedlog.lang
+++ b/htdocs/langs/es_CL/blockedlog.lang
@@ -10,7 +10,6 @@ logBILL_UNPAYED=Factura del cliente fijada sin pagar
 logBILL_VALIDATE=Factura del cliente validada
 logBILL_SENTBYMAIL=Factura del cliente enviar por correo
 logMEMBER_SUBSCRIPTION_DELETE=Suscripción de miembros de eliminación lógica
-logCASHCONTROL_VALIDATE=Grabación de la cerca de efectivo
 ListOfTrackedEvents=Lista de eventos rastreados
 logDOC_PREVIEW=Vista previa de un documento validado para imprimir o descargar.
 ImpossibleToReloadObject=Objeto original (escriba %s, id %s) no vinculado (consulte la columna &#39;Datos completos&#39; para obtener datos guardados inalterables)
diff --git a/htdocs/langs/es_CL/boxes.lang b/htdocs/langs/es_CL/boxes.lang
index e8b72e33d75..f59f9eb19a8 100644
--- a/htdocs/langs/es_CL/boxes.lang
+++ b/htdocs/langs/es_CL/boxes.lang
@@ -31,6 +31,7 @@ BoxTitleLatestModifiedBoms=Ultimas %s Listas de Materiales modificadas
 BoxTitleLatestModifiedMos=Últimas %s Ordenes de Fabricación modificadas
 BoxGlobalActivity=Actividad global (facturas, propuestas, pedidos)
 BoxTitleGoodCustomers=%s Buenos clientes
+BoxScheduledJobs=Trabajos programados
 FailedToRefreshDataInfoNotUpToDate=Error al actualizar el flujo de RSS. Última fecha de actualización correcta: %s
 LastRefreshDate=Última fecha de actualización
 NoRecordedBookmarks=No hay marcadores definidos
diff --git a/htdocs/langs/es_CL/cashdesk.lang b/htdocs/langs/es_CL/cashdesk.lang
index 2d9ac0386f3..c81210b6a0b 100644
--- a/htdocs/langs/es_CL/cashdesk.lang
+++ b/htdocs/langs/es_CL/cashdesk.lang
@@ -30,7 +30,6 @@ Header=Encabezamiento
 Footer=Pie de página
 TheoricalAmount=Cantidad teórica
 RealAmount=Cantidad real
-CashFenceDone=Cerca de efectivo hecha para el período.
 NbOfInvoices=N° de facturas
 OrderNotes=pedidos
 CashDeskBankAccountFor=Cuenta predeterminada para usar para pagos en
diff --git a/htdocs/langs/es_CL/categories.lang b/htdocs/langs/es_CL/categories.lang
index e6f54ab9caa..8a54c49822d 100644
--- a/htdocs/langs/es_CL/categories.lang
+++ b/htdocs/langs/es_CL/categories.lang
@@ -58,15 +58,10 @@ ProjectsCategoriesShort=Etiquetas / categorías de proyectos
 UsersCategoriesShort=Etiquetas / categorías de usuarios
 StockCategoriesShort=Etiquetas / categorías de almacén
 CategId=ID de etiqueta / categoría
-CatSupList=Lista de etiquetas / categorías de proveedores
-CatCusList=Lista de etiquetas / categorías de clientes / prospectos
 CatProdList=Lista de etiquetas / categorías de productos
 CatMemberList=Lista de etiquetas / categorías de miembros
-CatContactList=Lista de etiquetas / categorías de contacto
-CatSupLinks=Enlaces entre proveedores y etiquetas / categorías
 CatCusLinks=Enlaces entre clientes / prospectos y etiquetas / categorías
 CatProdLinks=Enlaces entre productos / servicios y etiquetas / categorías
-CatProJectLinks=Enlaces entre proyectos y etiquetas / categorías
 ExtraFieldsCategories=Atributos complementarios
 CategoriesSetup=Configuración de etiquetas / categorías
 CategorieRecursiv=Enlace con la etiqueta / categoría principal automáticamente
diff --git a/htdocs/langs/es_CL/companies.lang b/htdocs/langs/es_CL/companies.lang
index a1b385f9d95..6b70cfe2d00 100644
--- a/htdocs/langs/es_CL/companies.lang
+++ b/htdocs/langs/es_CL/companies.lang
@@ -156,7 +156,6 @@ VATIntraCheckableOnEUSite=Compruebe la identificación del IVA intracomunitaria
 VATIntraManualCheck=También puede consultar manualmente en el sitio web de la Comisión Europea <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=No es posible comprobar. El servicio de verificación no proporcionado por el estado miembro  (%s).
 NorProspectNorCustomer=No prospecto, ni cliente
-JuridicalStatus=Tipo de entidad jurídica
 ProspectLevel=Potencial prospectivo
 OthersNotLinkedToThirdParty=Otros, no vinculados a un tercero
 ProspectStatus=Estado de la perspectiva
diff --git a/htdocs/langs/es_CL/compta.lang b/htdocs/langs/es_CL/compta.lang
index 4a4fb6fe85e..0f7a9f7764c 100644
--- a/htdocs/langs/es_CL/compta.lang
+++ b/htdocs/langs/es_CL/compta.lang
@@ -91,7 +91,6 @@ NewLocalTaxPayment=Nuevo impuesto %s pago
 Refund=Reembolso
 SocialContributionsPayments=Pagos de impuestos sociales/fiscales
 ShowVatPayment=Mostrar el pago del IVA
-BalanceVisibilityDependsOnSortAndFilters=El saldo es visible en esta lista solo si la tabla se ordena de forma ascendente en %s y se filtra para 1 cuenta bancaria
 CustomerAccountancyCode=Código de contabilidad del cliente
 SupplierAccountancyCode=Código contable del proveedor
 CustomerAccountancyCodeShort=Cust. cuenta. código
@@ -117,7 +116,6 @@ ConfirmDeleteSocialContribution=¿Estás seguro de que deseas eliminar este pago
 ExportDataset_tax_1=Impuestos y pagos sociales y fiscales
 CalcModeVATDebt=Modo <b>%sIVA sobre compromisos contables%s</b>.
 CalcModeVATEngagement=Modo <b>%s IVA en ingresos-gastos%s</b>.
-CalcModeDebt=Análisis de facturas registradas conocidas incluso si aún no se contabilizan en el libro mayor.
 CalcModeEngagement=Análisis de los pagos registrados conocidos, incluso si aún no se contabilizan en el Libro mayor.
 CalcModeBookkeeping=Análisis de los datos registrados en la tabla de Contabilidad.
 CalcModeLT1=Modo<b> %sRE en facturas de clientes - facturas de proveedores %s</b>
@@ -130,9 +128,6 @@ AnnualSummaryInputOutputMode=Balance de ingresos y gastos, resumen anual
 AnnualByCompanies=Saldo de ingresos y gastos, por grupos predefinidos de cuenta
 AnnualByCompaniesDueDebtMode=Saldo de ingresos y gastos, detalle por grupos predefinidos, modo <b>%sReclamaciones-Deudas%s</b> escrito en <b>compromiso contable</b>
 AnnualByCompaniesInputOutputMode=Balance de ingresos y gastos, detalle por grupos predefinidos, modo <b>%sIngresos-Gastos%s</b> escrito en <b>contabilidad de efectivo</b>.
-SeeReportInInputOutputMode=Consulte %sanálisis de pagos%s para obtener un cálculo de los pagos efectuados, incluso si aún no se contabilizaron en el Libro mayor.
-SeeReportInDueDebtMode=Consulte %sanálisis de facturas %s para un cálculo basado en facturas registradas conocidas, incluso si aún no se contabilizaron en Libro mayor.
-SeeReportInBookkeepingMode=Consulte <b>%sInforme de facturación%s</b> para realizar un cálculo en <b>Tabla Libro mayor contable</b>
 RulesAmountWithTaxIncluded=- Las cantidades que se muestran son con todos los impuestos incluidos
 RulesResultInOut=- Incluye los pagos reales realizados en facturas, gastos, IVA y salarios. <br> - Se basa en las fechas de pago de las facturas, gastos, IVA y salarios. La fecha de donación para la donación.
 RulesCAIn=- Incluye todos los pagos efectivos de las facturas recibidas de los clientes. <br> - Se basa en la fecha de pago de estas facturas. <br>
diff --git a/htdocs/langs/es_CL/cron.lang b/htdocs/langs/es_CL/cron.lang
index 2e5a82e0aca..cd31d44645c 100644
--- a/htdocs/langs/es_CL/cron.lang
+++ b/htdocs/langs/es_CL/cron.lang
@@ -4,8 +4,6 @@ Permission23102 =Crear / actualizar trabajo programado
 Permission23103 =Eliminar trabajo programado
 Permission23104 =Ejecutar trabajo programado
 CronSetup=Configuración programada de gestión de trabajos
-URLToLaunchCronJobs=URL para verificar e iniciar trabajos cron calificados
-OrToLaunchASpecificJob=O para verificar e iniciar un trabajo específico
 KeyForCronAccess=Clave de seguridad para URL para iniciar trabajos cron
 FileToLaunchCronJobs=Línea de comando para verificar e iniciar trabajos cron calificados
 CronExplainHowToRunUnix=En el entorno Unix, debe usar la siguiente entrada crontab para ejecutar la línea de comando cada 5 minutos
@@ -40,7 +38,6 @@ CronArgs=Parámetros
 CronSaveSucess=Guardado exitosamente
 CronFieldMandatory=Fields %s es obligatorio
 CronErrEndDateStartDt=La fecha de finalización no puede ser anterior a la fecha de inicio
-CronStatusActiveBtn=Habilitar
 CronStatusInactiveBtn=Inhabilitar
 CronTaskInactive=Este trabajo está deshabilitado
 CronId=Carné de identidad
diff --git a/htdocs/langs/es_CL/errors.lang b/htdocs/langs/es_CL/errors.lang
index f5567607900..5eb96141ab7 100644
--- a/htdocs/langs/es_CL/errors.lang
+++ b/htdocs/langs/es_CL/errors.lang
@@ -63,7 +63,6 @@ ErrorExportDuplicateProfil=Este nombre de perfil ya existe para este conjunto de
 ErrorLDAPSetupNotComplete=La coincidencia Dolibarr-LDAP no está completa.
 ErrorLDAPMakeManualTest=Se ha generado un archivo .ldif en el directorio %s. Intente cargarlo manualmente desde la línea de comando para tener más información sobre los errores.
 ErrorCantSaveADoneUserWithZeroPercentage=No se puede guardar una acción con &quot;estado no iniciado&quot; si el campo &quot;hecho por&quot; también se llena.
-ErrorRefAlreadyExists=La referencia utilizada para la creación ya existe.
 ErrorPleaseTypeBankTransactionReportName=Ingrese el nombre del extracto bancario donde se debe informar la entrada (Formato AAAAMM o AAAAMMDD)
 ErrorRecordHasChildren=Error al eliminar el registro ya que tiene algunos registros secundarios.
 ErrorRecordIsUsedCantDelete=No se puede borrar el registro. Ya está usado o incluido en otro objeto.
@@ -177,7 +176,6 @@ ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Solo se pueden enviar facturas va
 ErrorDiscountLargerThanRemainToPaySplitItBefore=El descuento que intentas aplicar es más grande que el que queda por pagar. Divida el descuento en 2 descuentos más pequeños antes.
 ErrorFileNotFoundWithSharedLink=Archivo no fue encontrado. Puede ser que la clave compartida se haya modificado o que el archivo se haya eliminado recientemente.
 ErrorProductBarCodeAlreadyExists=El código de barras del producto %s ya existe en otra referencia del producto.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Tenga en cuenta también que no es posible utilizar productos virtuales para aumentar / disminuir automáticamente subproductos cuando al menos un subproducto (o subproducto de subproductos) necesita un número de serie / lote.
 ErrorDescRequiredForFreeProductLines=La descripción es obligatoria para líneas con producto gratis
 ErrorAPageWithThisNameOrAliasAlreadyExists=La página / contenedor <strong>%s</strong> tiene el mismo nombre o alias alternativo que el que intenta utilizar
 ErrorDuringChartLoad=Error al cargar el cuadro de cuentas. Si algunas cuentas no se cargaron, aún puede ingresarlas manualmente.
diff --git a/htdocs/langs/es_CL/mails.lang b/htdocs/langs/es_CL/mails.lang
index 381e5510788..a65acf18f23 100644
--- a/htdocs/langs/es_CL/mails.lang
+++ b/htdocs/langs/es_CL/mails.lang
@@ -98,12 +98,6 @@ TagUnsubscribe=Darse de baja enlace
 EMailRecipient=Receptor de E-mail
 TagMailtoEmail=Correo electrónico del destinatario (incluido el enlace html &quot;mailto:&quot;)
 NoEmailSentBadSenderOrRecipientEmail=Sin correo electrónico enviado Correo electrónico malo del remitente o del destinatario. Verificar el perfil del usuario.
-NoNotificationsWillBeSent=No se planean notificaciones por correo electrónico para este evento y compañía
-ANotificationsWillBeSent=1 notificación será enviada por correo electrónico
-SomeNotificationsWillBeSent=%s notificaciones serán enviadas por correo electrónico
-AddNewNotification=Activar un nuevo objetivo / evento de notificación por correo electrónico
-ListOfActiveNotifications=Enumerar todos los objetivos / eventos activos para recibir notificaciones por correo electrónico
-ListOfNotificationsDone=Enumerar todas las notificaciones de correo electrónico enviadas
 MailSendSetupIs=La configuración del envío de correo electrónico se ha configurado en '%s'. Este modo no se puede usar para enviar correos masivos.
 MailSendSetupIs2=Primero debe ir, con una cuenta de administrador, al menú %sHome-Configuración - EMails%s para cambiar el parámetro <strong>'%s'</strong> para usar el modo '%s'. Con este modo, puede ingresar a la configuración del servidor SMTP proporcionado por su Proveedor de servicios de Internet y usar la función de envío masivo de correos electrónicos.
 MailSendSetupIs3=Si tiene alguna pregunta sobre cómo configurar su servidor SMTP, puede solicitarlo al %s.
@@ -112,7 +106,6 @@ NbOfTargetedContacts=Número actual de correos electrónicos de contacto dirigid
 UseFormatFileEmailToTarget=El archivo importado debe tener formato <strong> correo electrónico; nombre; nombre; otro </ strong>
 UseFormatInputEmailToTarget=Ingrese una cadena con formato <strong> correo electrónico; nombre; nombre; otro </ strong>
 AdvTgtTitle=Rellene los campos de entrada para preseleccionar los terceros o contactos / direcciones para orientar
-AdvTgtSearchTextHelp=Utilice %% como comodines. Por ejemplo, para encontrar todos los elementos como <b>jean, joe, jim</b> , puede ingresar <b>j%%</b> , también puede usar; como separador de valor, y uso! Para excepto este valor. Por ejemplo, <b>jean; joe; jim%%;! Jimo;! Jima%</b> apuntará a todos los jean, joe, comienza con jim pero no jimo y no todo lo que comienza con jima
 AdvTgtSearchIntHelp=Use intervalo para seleccionar el valor int o float
 AdvTgtMaxVal=Valor máximo
 AdvTgtSearchDtHelp=Usar intervalo para seleccionar el valor de la fecha
@@ -126,6 +119,3 @@ AdvTgtAddContact=Añadir emails según criterio
 AdvTgtLoadFilter=Filtro de carga
 NoContactWithCategoryFound=Sin contacto / dirección con una categoría encontrada
 NoContactLinkedToThirdpartieWithCategoryFound=Sin contacto / dirección con una categoría encontrada
-OutGoingEmailSetup=Configuración de correo electrónico saliente
-InGoingEmailSetup=Configuración de correo electrónico entrante
-DefaultOutgoingEmailSetup=Configuración predeterminada de correo electrónico saliente
diff --git a/htdocs/langs/es_CL/modulebuilder.lang b/htdocs/langs/es_CL/modulebuilder.lang
index b1a0f954a41..062d82e135d 100644
--- a/htdocs/langs/es_CL/modulebuilder.lang
+++ b/htdocs/langs/es_CL/modulebuilder.lang
@@ -88,7 +88,6 @@ UseSpecificEditorName =Usa un nombre de editor específico
 UseSpecificEditorURL =Usa un editor URL específico
 UseSpecificFamily =Usa una familia específica
 UseSpecificVersion =Usa una versión inicial específica
-ModuleMustBeEnabled=El módulo / aplicación debe ser habilitado primero
 IncludeDocGenerationHelp=Si marca esto, se generará algún código para agregar un cuadro "Generar documento" en el registro.
 ShowOnCombobox=Mostrar valor en el cuadro combinado
 KeyForTooltip=Clave para información sobre herramientas
diff --git a/htdocs/langs/es_CL/products.lang b/htdocs/langs/es_CL/products.lang
index 5619277c9d4..29de095e2ec 100644
--- a/htdocs/langs/es_CL/products.lang
+++ b/htdocs/langs/es_CL/products.lang
@@ -99,7 +99,6 @@ NewRefForClone=Referencia de nuevo producto/servicio
 CustomerPrices=Precios de cliente
 SuppliersPrices=Precios del proveedor
 SuppliersPricesOfProductsOrServices=Precios de venta (de productos o servicios).
-CustomCode=Código de Aduanas / Productos / HS
 ProductCodeModel=Plantilla de referencia de producto
 ServiceCodeModel=Plantilla de referencia de servicio
 AlwaysUseNewPrice=Utilice siempre el precio actual del producto/servicio
@@ -107,7 +106,6 @@ AlwaysUseFixedPrice=Usa el precio fijo
 PriceByQuantity=Diferentes precios por cantidad
 DisablePriceByQty=Deshabilitar precios por cantidad
 PriceByQuantityRange=Rango Cantidad
-MultipriceRules=Reglas del segmento de precios
 UseMultipriceRules=Utilice las reglas de segmento de precios (definidas en la configuración del módulo del producto) para calcular automáticamente los precios de todos los demás segmentos de acuerdo con el primer segmento
 KeepEmptyForAutoCalculation=Manténgase vacío para que esto se calcule automáticamente a partir del peso o volumen de productos
 VariantRefExample=Ejemplos: COL, SIZE
diff --git a/htdocs/langs/es_CL/sendings.lang b/htdocs/langs/es_CL/sendings.lang
index f250e751edb..b09b9b53d2d 100644
--- a/htdocs/langs/es_CL/sendings.lang
+++ b/htdocs/langs/es_CL/sendings.lang
@@ -18,6 +18,7 @@ OtherSendingsForSameOrder=Otros envíos para esta orden
 SendingsAndReceivingForSameOrder=Envíos y recibos para esta orden
 SendingsToValidate=Envíos para validar
 StatusSendingCanceled=Cancelado
+StatusSendingCanceledShort=Cancelado
 StatusSendingValidated=Validado (productos para enviar o ya enviados)
 StatusSendingProcessed=Procesada
 StatusSendingProcessedShort=Procesada
diff --git a/htdocs/langs/es_CL/ticket.lang b/htdocs/langs/es_CL/ticket.lang
index 7e8bb612452..f0511ad43e0 100644
--- a/htdocs/langs/es_CL/ticket.lang
+++ b/htdocs/langs/es_CL/ticket.lang
@@ -14,7 +14,6 @@ TypeContact_ticket_internal_CONTRIBUTOR=Colaborador
 TypeContact_ticket_external_SUPPORTCLI=Contacto con el cliente / seguimiento de incidentes
 OriginEmail=Fuente de correo electrónico
 Notify_TICKET_SENTBYMAIL=Enviar mensaje de Ticket por correo electrónico
-NotRead=No leer
 Read=Leer
 NeedMoreInformation=Esperando informacion
 Waiting=Esperando
diff --git a/htdocs/langs/es_CL/withdrawals.lang b/htdocs/langs/es_CL/withdrawals.lang
index ae95201deba..a205a30add6 100644
--- a/htdocs/langs/es_CL/withdrawals.lang
+++ b/htdocs/langs/es_CL/withdrawals.lang
@@ -79,6 +79,7 @@ PleaseCheckOne=Por favor marque uno solo
 DirectDebitOrderCreated=Orden de débito directo %s creado
 AmountRequested=Monto solicitado
 CreateForSepa=Crear un archivo de débito directo
+ICS=Creditor Identifier CI for direct debit
 END_TO_END=Etiqueta XML SEPA &quot;EndToEndId&quot; - ID única asignada por transacción
 USTRD=Etiqueta XML no estructurada de SEPA
 InfoCreditSubject=Pago de la orden de pago de débito directo %s por el banco
diff --git a/htdocs/langs/es_CO/accountancy.lang b/htdocs/langs/es_CO/accountancy.lang
index ccd905cc761..08958e517aa 100644
--- a/htdocs/langs/es_CO/accountancy.lang
+++ b/htdocs/langs/es_CO/accountancy.lang
@@ -83,6 +83,7 @@ VentilatedinAccount=Enlazado exitosamente a la cuenta contable.
 NotVentilatedinAccount=No vinculado a la cuenta contable.
 XLineSuccessfullyBinded=%s productos / servicios vinculados con éxito a una cuenta contable
 XLineFailedToBeBinded=%s productos / servicios no estaban vinculados a ninguna cuenta contable
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comience la clasificación de la página "Enlace para hacer" según los elementos más recientes.
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comience la clasificación de la página "Encuadernación hecha" por los elementos más recientes.
 ACCOUNTING_LENGTH_DESCRIPTION=Truncar la descripción de productos y servicios en las listas después de x caracteres (Mejor = 50)
@@ -107,7 +108,6 @@ LetteringCode=Codigo de letras
 Codejournal=diario
 NumPiece=Número de pieza
 TransactionNumShort=Num. transacción
-GroupByAccountAccounting=Grupo por cuenta contable
 AccountingAccountGroupsDesc=Puede definir aquí algunos grupos de cuentas contables. Serán utilizados para informes contables personalizados.
 ByPredefinedAccountGroups=Por grupos predefinidos.
 DelYear=Año para borrar
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index f9161cc6931..5483fbdbfda 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -51,7 +51,6 @@ JavascriptDisabled=JavaScript desactivado
 UsePreviewTabs=Use las pestañas de vista previa
 ShowPreview=Mostrar vista previa
 ThemeCurrentlyActive=Tema activo actualmente
-CurrentTimeZone=Zona horaria de PHP (servidor)
 MySQLTimeZone=TimeZone MySql (base de datos)
 TZHasNoEffect=Las fechas son almacenadas y devueltas por el servidor de base de datos como si se mantuvieran como una cadena enviada. La zona horaria tiene efecto solo cuando se usa la función UNIX_TIMESTAMP (que Dolibarr no debe usar, por lo que la base de datos TZ no debería tener ningún efecto, incluso si se cambia después de ingresar los datos).
 Space=Espacio
@@ -99,7 +98,6 @@ MenuForUsers=Menú para usuarios.
 SystemInfo=Información del sistema
 SystemToolsArea=Área de herramientas del sistema
 PurgeDeleteLogFile=Elimine los archivos de registro, incluido el <b> %s </b> definido para el módulo Syslog (sin riesgo de perder datos)
-PurgeDeleteTemporaryFilesShort=Borrar archivos temporales
 PurgeRunNow=Purga ahora
 PurgeNothingToDelete=No hay directorio o archivos para eliminar.
 PurgeNDirectoriesDeleted=Se eliminaron los archivos o directorios de <b> %s </b>.
@@ -242,7 +240,6 @@ LanguageFilesCachedIntoShmopSharedMemory=Archivos .lang cargados en memoria comp
 ListOfDirectories=Lista de directorios de plantillas de OpenDocument
 ListOfDirectoriesForModelGenODT=Lista de directorios que contienen archivos de plantillas con formato OpenDocument. <br> <br> Ruta aquí completa de los directorios. Agregue un retorno de carro entre cada directorio. <br> Para agregar un directorio del módulo GED, agregue aquí <b > DOL_DATA_ROOT / ecm / yourdirectoryname </b>. Los archivos en esos directorios deben terminar con <b> .odt </b> o <b> .ods </b>.
 NumberOfModelFilesFound=Número de archivos de plantilla ODT / ODS encontrados en estos directorios
-ExampleOfDirectoriesForModelGen=Ejemplos de sintaxis: <br> c: \\ mydir <br> / home / mydir <br> DOL_DATA_ROOT / ecm / ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Para saber cómo crear sus plantillas de documento odt, antes de almacenarlas en esos directorios, lea la documentación de la wiki:
 FirstnameNamePosition=Posición del nombre / apellido
 KeyForWebServicesAccess=Clave para usar servicios web (parámetro "dolibarrkey" en servicios web)
@@ -260,7 +257,6 @@ UrlGenerationParameters=Parámetros para proteger las URL
 SecurityTokenIsUnique=Utilice un parámetro de clave segura único para cada URL
 EnterRefToBuildUrl=Introduzca la referencia para el objeto %s
 GetSecuredUrl=Obtener URL calculada
-ButtonHideUnauthorized=Ocultar botones para usuarios no administradores para acciones no autorizadas en lugar de mostrar botones deshabilitados en gris
 OldVATRates=Vieja tasa de IVA
 NewVATRates=Nueva tasa de IVA
 PriceBaseTypeToChange=Modificar en precios con valor de referencia base definido en
@@ -925,7 +921,6 @@ NotTopTreeMenuPersonalized=Menús personalizados no vinculados a una entrada del
 NewMenu=Nuevo menu
 MenuHandler=Manejador de menú
 MenuModule=Módulo fuente
-HideUnauthorizedMenu=Ocultar menús no autorizados (gris)
 DetailId=Menú de identificación
 DetailMenuHandler=Manejador de menú donde mostrar nuevo menú.
 DetailMenuModule=Nombre del módulo si la entrada del menú proviene de un módulo
diff --git a/htdocs/langs/es_CO/boxes.lang b/htdocs/langs/es_CO/boxes.lang
index 6a5f709d318..1253f30ed1a 100644
--- a/htdocs/langs/es_CO/boxes.lang
+++ b/htdocs/langs/es_CO/boxes.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxScheduledJobs=Trabajos programados
 ForCustomersInvoices=Facturas de clientes
 ForProposals=Propuestas
diff --git a/htdocs/langs/es_CO/compta.lang b/htdocs/langs/es_CO/compta.lang
index a8bd33a6a73..0466a9ef875 100644
--- a/htdocs/langs/es_CO/compta.lang
+++ b/htdocs/langs/es_CO/compta.lang
@@ -10,6 +10,7 @@ FeatureIsSupportedInInOutModeOnly=Función solo disponible en el modo de contabi
 VATReportBuildWithOptionDefinedInModule=Las cantidades que se muestran aquí se calculan utilizando las reglas definidas por la configuración del módulo de impuestos.
 LTReportBuildWithOptionDefinedInModule=Las cantidades que se muestran aquí se calculan utilizando las reglas definidas por la configuración de la Compañía.
 Param=Configuración
+RemainingAmountPayment=Cantidad del pago restante:
 Accountparent=Cuenta para padres
 Accountsparent=Cuentas de los padres
 MenuReportInOut=Ingresos / Gastos
@@ -66,6 +67,7 @@ AddSocialContribution=Añadir impuesto social / fiscal
 ContributionsToPay=Impuestos sociales / fiscales a pagar.
 AccountancyTreasuryArea=Área de facturación y pago.
 PaymentCustomerInvoice=Pago factura a cliente
+PaymentSupplierInvoice=pago de factura del proveedor
 PaymentSocialContribution=Pago de impuestos sociales / fiscales
 PaymentVat=Pago del IVA
 ListPayment=Lista de pagos
@@ -91,8 +93,8 @@ NewLocalTaxPayment=Nuevo pago de impuestos %s
 Refund=Reembolso
 SocialContributionsPayments=Pago de impuestos sociales / fiscales
 ShowVatPayment=Mostrar pago del IVA
-BalanceVisibilityDependsOnSortAndFilters=El saldo es visible en esta lista solo si la tabla está ordenada en forma ascendente en %s y se filtra para 1 cuenta bancaria
 CustomerAccountancyCode=Código de contabilidad del cliente
+SupplierAccountancyCode=Código contable del proveedor
 CustomerAccountancyCodeShort=Cust. cuenta. código
 SupplierAccountancyCodeShort=Cenar. cuenta. código
 Turnover=Facturación facturada
@@ -117,7 +119,6 @@ ConfirmDeleteSocialContribution=¿Está seguro de que desea eliminar este pago f
 ExportDataset_tax_1=Impuestos y pagos sociales y fiscales.
 CalcModeVATDebt=Modo <b> %sVAT en contabilidad de compromiso%s </b>.
 CalcModeVATEngagement=Modo <b> %sVAT en ingresos-expenses%s </b>.
-CalcModeDebt=Análisis de facturas registradas conocidas incluso si aún no se han contabilizado en el libro de contabilidad.
 CalcModeEngagement=Análisis de pagos registrados conocidos, incluso si aún no se han contabilizado en el Libro mayor.
 CalcModeBookkeeping=Análisis de los datos registrados en la tabla de Contabilidad.
 CalcModeLT1=Modo <b> %sRE en facturas de clientes: facturas de proveedores%s </b>
@@ -131,11 +132,11 @@ AnnualSummaryInputOutputMode=Balance de ingresos y gastos, resumen anual.
 AnnualByCompanies=Saldo de ingresos y gastos, por grupos de cuentas predefinidos.
 AnnualByCompaniesDueDebtMode=Balance de ingresos y gastos, detalle por grupos predefinidos, modo <b> %sClaims-Debts%s </b> dijo <b> Contabilidad de compromisos </b>.
 AnnualByCompaniesInputOutputMode=Balance de ingresos y gastos, detalle por grupos predefinidos, modo <b> %sIncomes-Expenses%s </b>, dijo <b> contabilidad de caja </b>.
-SeeReportInInputOutputMode=Consulte %sanálisis de pagos%s para obtener un cálculo de los pagos reales realizados incluso si aún no se han contabilizado en el Libro mayor.
-SeeReportInDueDebtMode=Consulte %sanálisis de facturas%s para un cálculo basado en facturas registradas conocidas, incluso si aún no se han contabilizado en el Libro mayor.
-SeeReportInBookkeepingMode=Consulte <b> %sRestauración report%s </b> para obtener un cálculo de la <b> tabla del Libro mayor de contabilidad </b>
 RulesAmountWithTaxIncluded=- Las cantidades mostradas están con todos los impuestos incluidos.
+RulesResultDue=- Incluye facturas pendientes, gastos, IVA, donaciones ya sean pagadas o no. También incluye salarios pagados. <br> - Se basa en la fecha de facturación de las facturas y en la fecha de vencimiento de los gastos o pagos de impuestos. Para los salarios definidos con el módulo Salario, se utiliza la fecha de pago del valor.
 RulesResultInOut=- Incluye los pagos reales realizados en facturas, gastos, IVA y salarios. <br> - Se basa en las fechas de pago de las facturas, gastos, IVA y salarios. La fecha de donación para la donación.
+RulesCADue=- Incluye las facturas vencidas del cliente, ya sean pagadas o no. <br> - Se basa en la fecha de facturación de estas facturas. <br>
+RulesCAIn=- Incluye todos los pagos efectivos de las facturas recibidas de los clientes. <br> - Se basa en la fecha de pago de estas facturas <br>
 RulesCATotalSaleJournal=Incluye todas las líneas de crédito del diario Sale.
 RulesAmountOnInOutBookkeepingRecord=Incluye el registro en su Libro mayor con cuentas contables que tiene el grupo "GASTOS" o "INGRESOS"
 RulesResultBookkeepingPredefined=Incluye el registro en su Libro mayor con cuentas contables que tiene el grupo "GASTOS" o "INGRESOS"
@@ -186,6 +187,7 @@ RefExt=Ref externo
 ToCreateAPredefinedInvoice=Para crear una factura de plantilla, cree una factura estándar, luego, sin validarla, haga clic en el botón "%s".
 LinkedOrder=Enlace a pedido
 CalculationRuleDesc=Para calcular el IVA total, hay dos métodos: <br> El método 1 es redondear la tina en cada línea, luego sumarlos. <br> El método 2 es sumar todas la tina en cada línea, luego redondear el resultado. <br> El resultado final puede diferir de unos céntimos. El modo predeterminado es el modo <b> %s </b>.
+CalculationRuleDescSupplier=Según el proveedor, elija el método apropiado para aplicar la misma regla de cálculo y obtener el mismo resultado esperado por su proveedor.
 TurnoverPerProductInCommitmentAccountingNotRelevant=El informe del volumen de negocios recogido por producto no está disponible. Este informe solo está disponible para facturación facturada.
 TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=El informe del volumen de negocios recaudado por tasa de impuesto de venta no está disponible. Este informe solo está disponible para facturación facturada.
 AccountancyJournal=Diario de código contable
@@ -195,6 +197,7 @@ ACCOUNTING_VAT_PAY_ACCOUNT=Cuenta contable por defecto para el pago del IVA.
 ACCOUNTING_ACCOUNT_CUSTOMER=Cuenta contable utilizada para terceros clientes.
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=La cuenta contable dedicada definida en la tarjeta de terceros se utilizará solo para la contabilidad de Libro mayor auxiliar. Este se usará para el Libro mayor general y como valor predeterminado de la contabilidad del Libro mayor auxiliar si no se define una cuenta de cuenta del cliente dedicada a un tercero.
 ACCOUNTING_ACCOUNT_SUPPLIER=Cuenta contable utilizada para terceros proveedores.
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=La cuenta de contabilidad dedicada definida en la tarjeta de un tercero se usará solo para la contabilidad del Libro auxiliar. Este se usará para el Libro mayor y como valor predeterminado de la contabilidad del libro auxiliar si no se define la cuenta de contabilidad del proveedor dedicada en un tercero.
 ConfirmCloneTax=Confirmar el clon de un impuesto social / fiscal.
 CloneTaxForNextMonth=Clonala para el mes que viene.
 SimpleReport=Informe simple
@@ -216,3 +219,7 @@ ByVatRate=Por impuesto de venta
 TurnoverbyVatrate=Facturación facturada por impuesto de venta
 TurnoverCollectedbyVatrate=Volumen de negocios recaudado por tasa de impuesto de venta
 PurchasebyVatrate=Tasa de impuesto de compra por venta
+PurchaseTurnoverCollected=Volumen de compras recogido
+RulesPurchaseTurnoverDue=- Incluye las facturas vencidas del proveedor, ya sean pagadas o no. <br> - Se basa en la fecha de facturación de estas facturas. <br>
+RulesPurchaseTurnoverIn=- Incluye todos los pagos efectivos de facturas hechas a proveedores. <br> - Se basa en la fecha de pago de estas facturas <br>
+ReportPurchaseTurnoverCollected=Volumen de compras recogido
diff --git a/htdocs/langs/es_CO/cron.lang b/htdocs/langs/es_CO/cron.lang
index 5ef1f0eb645..0c30b974b96 100644
--- a/htdocs/langs/es_CO/cron.lang
+++ b/htdocs/langs/es_CO/cron.lang
@@ -1,4 +1,9 @@
 # Dolibarr language file - Source file is en_US - cron
+Permission23101 =Leer trabajo programado
+Permission23102 =Crear / actualizar trabajo programado
+Permission23103 =Eliminar trabajo programado
+Permission23104 =Ejecutar trabajo programado
+CronList=Trabajos programados
 CronMethod=Método
 CronModule=Módulo
 CronArgs=Parámetros
diff --git a/htdocs/langs/es_CO/main.lang b/htdocs/langs/es_CO/main.lang
index f4a6163ecd8..cf729c5dde4 100644
--- a/htdocs/langs/es_CO/main.lang
+++ b/htdocs/langs/es_CO/main.lang
@@ -21,6 +21,7 @@ FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 NoTemplateDefined=No hay plantilla disponible para este tipo de correo electrónico.
 AvailableVariables=Variables de sustitución disponibles
+CurrentTimeZone=Zona horaria de PHP (servidor)
 NoRecordFound=No se encontraron registros
 NoRecordDeleted=Ningún registro eliminado
 Errors=Los errores
diff --git a/htdocs/langs/es_CO/products.lang b/htdocs/langs/es_CO/products.lang
index 2493b627165..f3e96745592 100644
--- a/htdocs/langs/es_CO/products.lang
+++ b/htdocs/langs/es_CO/products.lang
@@ -85,7 +85,6 @@ CloneCombinationsProduct=Variantes de productos clonados.
 ProductIsUsed=Este producto es usado
 NewRefForClone=Árbitro. de nuevo producto / servicio
 CustomerPrices=Precios al cliente
-CustomCode=Aduanas / productos / código HS
 p=u
 d=re
 g=sol
@@ -98,7 +97,6 @@ AlwaysUseFixedPrice=Usar el precio fijo
 PriceByQuantity=Diferentes precios por cantidad.
 DisablePriceByQty=Desactivar precios por cantidad.
 PriceByQuantityRange=Rango Cantidad
-MultipriceRules=Reglas del segmento de precios
 UseMultipriceRules=Utilice reglas de segmento de precios (definidas en la configuración del módulo del producto) para calcular automáticamente los precios de todos los demás segmentos de acuerdo con el primer segmento
 PercentVariationOver=variación %% sobre %s
 KeepEmptyForAutoCalculation=Manténgalo vacío para que esto se calcule automáticamente por peso o volumen de productos
diff --git a/htdocs/langs/es_CO/sendings.lang b/htdocs/langs/es_CO/sendings.lang
index 96689e2c322..ea9f35bd5dd 100644
--- a/htdocs/langs/es_CO/sendings.lang
+++ b/htdocs/langs/es_CO/sendings.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - sendings
 StatusSendingCanceled=Cancelado
+StatusSendingCanceledShort=Cancelado
diff --git a/htdocs/langs/es_CO/ticket.lang b/htdocs/langs/es_CO/ticket.lang
index 05339775ed1..e0099d503d0 100644
--- a/htdocs/langs/es_CO/ticket.lang
+++ b/htdocs/langs/es_CO/ticket.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ticket
 TypeContact_ticket_internal_CONTRIBUTOR=Contribuyente
-NotRead=No leer
 Type=Tipo
 Subject=Tema
diff --git a/htdocs/langs/es_CO/withdrawals.lang b/htdocs/langs/es_CO/withdrawals.lang
index 33ea339dcd8..4c73e87c98e 100644
--- a/htdocs/langs/es_CO/withdrawals.lang
+++ b/htdocs/langs/es_CO/withdrawals.lang
@@ -4,3 +4,4 @@ WithdrawalsReceipts=Órdenes de débito directo
 WithdrawalReceipt=Orden de domiciliación bancaria
 StatusPaid=Pagado
 StatusRefused=Rechazado
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_DO/accountancy.lang b/htdocs/langs/es_DO/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/es_DO/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_DO/compta.lang b/htdocs/langs/es_DO/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/es_DO/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/es_DO/products.lang b/htdocs/langs/es_DO/products.lang
deleted file mode 100644
index 6e900475275..00000000000
--- a/htdocs/langs/es_DO/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/es_DO/withdrawals.lang b/htdocs/langs/es_DO/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/es_DO/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_EC/accountancy.lang b/htdocs/langs/es_EC/accountancy.lang
index ffe1b3a23e6..7d111fb5828 100644
--- a/htdocs/langs/es_EC/accountancy.lang
+++ b/htdocs/langs/es_EC/accountancy.lang
@@ -90,7 +90,7 @@ VentilatedinAccount=Vinculado con éxito a la cuenta contable
 NotVentilatedinAccount=No vinculado a la cuenta contable
 XLineSuccessfullyBinded=%s productos/servicios vinculados con éxito a una cuenta de contabilidad
 XLineFailedToBeBinded=Los productos/servicios de%s no estaban vinculados a ninguna cuenta contable
-ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a unir mostrados por página (máximo recomendado: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comienza la clasificación de la página "Vinculación a hacer" por los elementos más recientes
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comienza la clasificación de la página "Encuadernación realizada" por los elementos más recientes
 ACCOUNTING_LENGTH_DESCRIPTION=Truncar la descripción de los productos y servicios en los listados después de los caracteres x (Mejor
@@ -126,7 +126,6 @@ LetteringCode=Codigo de letras
 Codejournal=diario
 NumPiece=Número de pieza
 TransactionNumShort=Num. transacción
-GroupByAccountAccounting=Grupo por cuenta contable
 AccountingAccountGroupsDesc=Puede definir aquí algunos grupos de cuentas contables. Se usarán para informes de contabilidad personalizados.
 DelMonth=Mes para borrar
 DelJournal=Diario para borrar
diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
index 63854f4450c..bf0e5e8941b 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -60,7 +60,6 @@ AllowToSelectProjectFromOtherCompany=En el documento de un cliente, puede elegir
 JavascriptDisabled=JavaScript desactivado
 UsePreviewTabs=Usar pestañas de vista previa
 ShowPreview=Mostrar vista previa
-CurrentTimeZone=Zona horaria PHP (servidor)
 MySQLTimeZone=Zona horaria MySQL (base de datos)
 TZHasNoEffect=Las fechas son almacenadas y devueltas por el servidor de base de datos como si se mantuvieran como una cadena enviada. La zona horaria tiene efecto solo cuando se usa la función UNIX_TIMESTAMP (que no debe ser utilizada por Dolibarr, por lo que la base de datos TZ no debería tener ningún efecto, incluso si se cambia después de ingresar los datos)
 Space=Espacio
@@ -112,7 +111,6 @@ SystemToolsAreaDesc=Esta área proporciona funciones de administración. Utilice
 Purge=Purgar
 PurgeAreaDesc=Esta página le permite eliminar todos los archivos generados o almacenados por Dolibarr (archivos temporales o todos los archivos en el directorio <b>%s</b>). Usando esta característica normalmente no es necesario. Se proporciona como una solución para los usuarios cuyo Dolibarr está alojado por un proveedor que no ofrece permisos para eliminar archivos generados por el servidor web.
 PurgeDeleteLogFile=Eliminar archivo de registro <b>%s</b> definido para el módulo de Registro del Sistema (Syslog) (sin riesgo de perder datos)
-PurgeDeleteTemporaryFiles=Elimine todos los archivos temporales (sin riesgo de perder datos). Nota: La eliminación se realiza solo si el directorio temporal se creó hace 24 horas.
 PurgeDeleteAllFilesInDocumentsDir=Eliminar todos los archivos en el directorio: <b>%s</b>. <br> Esto eliminará todos los documentos generados relacionados con los elementos (terceros, facturas, etc.), los archivos cargados en el módulo ECM, los volcados de respaldo de la base de datos y archivos temporales.
 PurgeRunNow=Purgar ahora
 PurgeNothingToDelete=Sin directorio o archivos que desea eliminar.
@@ -285,7 +283,6 @@ LanguageFilesCachedIntoShmopSharedMemory=Archivos .lang cargados en la memoria c
 ListOfDirectories=Lista de directorios de plantillas OpenDocument
 ListOfDirectoriesForModelGenODT=Open to Document. <br> <br> Ponga aquí la ruta completa de los directorios. <br> Para un directorio del módulo GED, añádalo aquí <b> DOL_DATA_ROOT / ecm / yourdirectoryname </b>. <br> <br> Los archivos de esos deben ser eliminados con <b> .odt </b> o <b> .ods </b>.
 NumberOfModelFilesFound=Número de archivos de plantilla ODT / ODS encontrados en estos directorios
-ExampleOfDirectoriesForModelGen=Ejemplos de sintaxis: <br> c:\\mydir <br> / home / mydir <br> DOL_DATA_ROOT / ecm / ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Para saber cómo crear sus plantillas de documentos ODT, antes de guardarlos en esos directorios, leer la documentación wiki:
 FirstnameNamePosition=Posición del Nombre / Apellido
 DescWeather=Las siguientes imágenes se mostrarán en el tablero cuando el número de acciones tardías alcance los siguientes valores:
@@ -310,7 +307,6 @@ UrlGenerationParameters=Parámetros para asegurar URL
 SecurityTokenIsUnique=Use un parámetro de SecureKey único para cada URL
 EnterRefToBuildUrl=Insertar la referencia del objeto %s
 GetSecuredUrl=Obtener URL calculada
-ButtonHideUnauthorized=Ocultar botones para usuarios no administradores para acciones no autorizadas en lugar de mostrar botones deshabilitados en gris
 OldVATRates=Antigua tasa de IVA
 NewVATRates=Nueva tasa de IVA
 PriceBaseTypeToChange=Modificar los precios con el valor base de referencia definida en
@@ -1227,7 +1223,6 @@ IfYouUsePointOfSaleCheckModule=Si utiliza el módulo de Punto de Venta (POS) pro
 NotTopTreeMenuPersonalized=Menús personalizados no vinculados a una entrada de menú superior
 MenuHandler=Manejador de menús
 MenuModule=Módulo fuente
-HideUnauthorizedMenu= Ocultar menús no autorizados
 DetailId=Identificación del menú
 DetailMenuHandler=Manejador de menús donde mostrar el nuevo menú
 DetailMenuModule=Nombre del módulo
@@ -1452,8 +1447,6 @@ EMailHost=Host de correo electrónico del servidor IMAP
 EmailcollectorOperations=Operaciones a realizar por coleccionista.
 MaxEmailCollectPerCollect=Número máximo de correos electrónicos recopilados por recopilación
 ConfirmCloneEmailCollector=¿Está seguro de que desea clonar el recopilador de correo electrónico %s?
-DateLastCollectResult=Fecha de último cobro probado
-DateLastcollectResultOk=Fecha más reciente de cobrar exitosamente
 EmailCollectorConfirmCollectTitle=Correo electrónico recoger confirmación
 EmailCollectorConfirmCollect=¿Quieres ejecutar la colección para este coleccionista ahora?
 NoNewEmailToProcess=No hay correo electrónico nuevo (filtros coincidentes) para procesar
diff --git a/htdocs/langs/es_EC/banks.lang b/htdocs/langs/es_EC/banks.lang
index e9526d449e9..94929d9f3b4 100644
--- a/htdocs/langs/es_EC/banks.lang
+++ b/htdocs/langs/es_EC/banks.lang
@@ -117,6 +117,4 @@ ShowVariousPayment=Mostrar pago misceláneo
 AddVariousPayment=Agregar pago misceláneo
 FindYourSEPAMandate=Este es su mandato de SEPA para autorizar a nuestra empresa a realizar un pedido de débito directo a su banco. Devuélvalo firmado (escaneo del documento firmado) o envíelo por correo a
 AutoReportLastAccountStatement=Rellene automáticamente el campo 'número de extracto bancario' con el último número de extracto al realizar la conciliación
-CashControl=POS Limite de efectivo
-NewCashFence=Nuevo limite de efectivo
 BankColorizeMovementDesc=Si esta función está habilitada, puede elegir un color de fondo específico para los movimientos de débito o crédito
diff --git a/htdocs/langs/es_EC/blockedlog.lang b/htdocs/langs/es_EC/blockedlog.lang
index ffd95d6e203..4f7bb9a99a4 100644
--- a/htdocs/langs/es_EC/blockedlog.lang
+++ b/htdocs/langs/es_EC/blockedlog.lang
@@ -1,7 +1,13 @@
 # Dolibarr language file - Source file is en_US - blockedlog
+BlockedLogDesc=Este módulo rastrea algunos eventos en un registro inalterable (que no puede modificar una vez registrado) en una cadena de bloques, en tiempo real. Este módulo proporciona compatibilidad con los requisitos de las leyes de algunos países (como Francia con la ley Finanzas 2016 - Norma NF525).
 FingerprintsDesc=Esta es la herramienta para navegar o extraer los registros inalterables. Los registros inalterables se generan y archivan localmente en una tabla dedicada, en tiempo real cuando registra un evento de negocios. Puede usar esta herramienta para exportar este archivo y guardarlo en un soporte externo (algunos países, como Francia, le piden que lo haga todos los años). Tenga en cuenta que no hay ninguna función para limpiar este registro y que todos los cambios que se intentaron realizar directamente en este registro (por ejemplo, un pirata informático) se informarán con una huella digital no válida. Si realmente necesita purgar esta tabla porque usó su aplicación para una demostración / propósito de prueba y desea limpiar sus datos para comenzar su producción, puede solicitar a su revendedor o integrador que reinicie su base de datos (se eliminarán todos sus datos).
+KoCheckFingerprintValidity=La entrada de registro archivada no es válida. Significa que alguien (¿un pirata informático?) Ha modificado algunos datos de este registro después de que fue grabado, o ha borrado el registro archivado anterior (verifique que exista esa línea con # anterior).
+OkCheckFingerprintValidity=El registro de registro archivado es válido. Los datos en esta línea no se modificaron y la entrada sigue a la anterior.
 AddedByAuthority=Almacenado en sitio remoto
 NotAddedByAuthorityYet=Aún no almacenado en sitio remoto
+logPAYMENT_VARIOUS_CREATE=Pago (no asignado a una factura) creado
+logPAYMENT_VARIOUS_MODIFY=Pago (no asignado a una factura) modificado
+logPAYMENT_VARIOUS_DELETE=Pago (no asignado a una factura) eliminación lógica
 logPAYMENT_ADD_TO_BANK=Pago agregado al banco
 logDONATION_PAYMENT_DELETE=Eliminación lógica del pago de donaciones.
 logBILL_UNPAYED=Factura del cliente sin pagar
diff --git a/htdocs/langs/es_EC/boxes.lang b/htdocs/langs/es_EC/boxes.lang
index 68072918006..6ae463eaff3 100644
--- a/htdocs/langs/es_EC/boxes.lang
+++ b/htdocs/langs/es_EC/boxes.lang
@@ -34,6 +34,7 @@ BoxTitleLatestModifiedBoms=Últimas BOMs modificadas %s
 BoxTitleLatestModifiedMos=Últimas órdenes de fabricación modificadas %s
 BoxGlobalActivity=Actividad global (facturas, propuestas, pedidos)
 BoxTitleGoodCustomers=%s Buenos clientes
+BoxScheduledJobs=Trabajos programados
 FailedToRefreshDataInfoNotUpToDate=Error al actualizar el flujo de RSS. Última fecha de actualización exitosa: %s
 LastRefreshDate=Fecha de actualización más reciente
 NoRecordedBookmarks=No se han definido marcadores.
diff --git a/htdocs/langs/es_EC/cashdesk.lang b/htdocs/langs/es_EC/cashdesk.lang
index 3361d257dc5..91bfc85b052 100644
--- a/htdocs/langs/es_EC/cashdesk.lang
+++ b/htdocs/langs/es_EC/cashdesk.lang
@@ -31,8 +31,6 @@ Footer=Pie de página
 AmountAtEndOfPeriod=Cantidad al final del período (día, mes o año)
 TheoricalAmount=Cantidad teórica
 RealAmount=Cantidad real
-CashFence=Valla de efectivo
-CashFenceDone=Cerca de efectivo hecha para el período.
 NbOfInvoices=Nb de facturas
 Paymentnumpad=Tipo de Pad para ingresar el pago
 Numberspad=Pad de números
@@ -56,7 +54,6 @@ CashDeskRefNumberingModules=Módulo de numeración para ventas POS
 CashDeskGenericMaskCodes6 =<br><b>{TN} </b>la etiqueta se usa para agregar el número de terminal
 TakeposGroupSameProduct=Agrupar las mismas líneas de productos
 StartAParallelSale=Comience una nueva venta paralela
-CloseCashFence=Cerca de efectivo
 CashReport=Informe de caja
 MainPrinterToUse=Impresora principal para usar
 OrderPrinterToUse=Solicitar impresora para usar
diff --git a/htdocs/langs/es_EC/categories.lang b/htdocs/langs/es_EC/categories.lang
index 48cdc8b6202..3545e7ba532 100644
--- a/htdocs/langs/es_EC/categories.lang
+++ b/htdocs/langs/es_EC/categories.lang
@@ -46,11 +46,8 @@ UsersCategoriesShort=Etiquetas/categorías de usuarios
 StockCategoriesShort=Etiquetas / categorías de almacén
 ThisCategoryHasNoItems=Esta categoría no contiene ningún artículo.
 CategId=ID de etiqueta/categoría
-CatSupList=Lista de etiquetas / categorías de proveedores
-CatCusList=Lista de etiquetas/categorías de cliente/prospecto
 CatProdList=Lista de productos etiquetas/categorías
 CatMemberList=Lista de miembros tags/categories
-CatContactList=Lista de etiquetas/categorías de contacto
 CatCusLinks=Enlaces entre clientes/prospectos y etiquetas/categorías
 CatContactsLinks=Enlaces entre contactos / direcciones y etiquetas / categorías
 ExtraFieldsCategories=Atributos complementarios
diff --git a/htdocs/langs/es_EC/companies.lang b/htdocs/langs/es_EC/companies.lang
index 398cf5448d1..8a15891b3f1 100644
--- a/htdocs/langs/es_EC/companies.lang
+++ b/htdocs/langs/es_EC/companies.lang
@@ -207,7 +207,6 @@ VATIntraCheckableOnEUSite=Consulte el ID de IVA intracomunitario en el sitio web
 VATIntraManualCheck=También puede consultar manualmente en el sitio web de la Comisión Europea. <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=No es posible el chequeo. El servicio de chequeo no es proporcionado por el estado miembro (%s).
 NorProspectNorCustomer=No prospecto, ni cliente
-JuridicalStatus=Tipo de entidad jurídica
 ProspectLevel=Prospecto potencial
 OthersNotLinkedToThirdParty=Otros, no vinculados a cliente/proveedor
 ProspectStatus=Estado del prospecto
diff --git a/htdocs/langs/es_EC/compta.lang b/htdocs/langs/es_EC/compta.lang
index e77516e0630..5933896e5b7 100644
--- a/htdocs/langs/es_EC/compta.lang
+++ b/htdocs/langs/es_EC/compta.lang
@@ -94,7 +94,6 @@ NewLocalTaxPayment=Nuevo pago de impuestos %s
 Refund=Reembolso
 SocialContributionsPayments=Pagos de impuestos sociales y fiscales
 ShowVatPayment=Mostrar pago de IVA
-BalanceVisibilityDependsOnSortAndFilters=El equilibrio es visible en esta lista sólo si la tabla está ordenada ascendiendo en%s y filtrada para una cuenta bancaria
 CustomerAccountancyCode=Código de contabilidad del cliente
 SupplierAccountancyCode=Código contable del proveedor
 CustomerAccountancyCodeShort=Cuenta de cliente. código
@@ -120,7 +119,6 @@ ConfirmDeleteSocialContribution=¿Seguro que desea eliminar este pago de impuest
 ExportDataset_tax_1=Impuestos y pagos sociales y fiscales
 CalcModeVATDebt=Modo <b>%sVAT en la contabilidad de compromiso%s </b>.
 CalcModeVATEngagement=Modo <b>%sVAT en los ingresos-gastos%s </b>.
-CalcModeDebt=Análisis de facturas registradas conocidas incluso si aún no se contabilizan en el libro mayor.
 CalcModeEngagement=Análisis de los pagos registrados conocidos, incluso si aún no se contabilizan en el Libro mayor.
 CalcModeBookkeeping=Análisis de los datos registrados en la tabla de Contabilidad.
 CalcModeLT1= Modo <b>%sRE en facturas de clientes - facturas de proveedores%s </b>
@@ -133,9 +131,6 @@ AnnualSummaryDueDebtMode=Balance de ingresos y gastos, resumen anual
 AnnualSummaryInputOutputMode=Balance de ingresos y gastos, resumen anual
 AnnualByCompaniesDueDebtMode=Balance de ingresos y gastos, detalle por grupos predefinidos, modo <b>%sClaims-Deudas%s </b> dicho <b> Compromiso de contabilidad </b>.
 AnnualByCompaniesInputOutputMode=Balance de ingresos y gastos, detalle por grupos predefinidos, modo <b>%sIngresos-Gastos%s </b> dicho <b> contabilidad de caja </b>.
-SeeReportInInputOutputMode=Vea %s el análisis de pagos %s para cálcular los pagos efectuados, incluso si aún no se contabilizaron en el Libro mayor.
-SeeReportInDueDebtMode=Vea %s el análisis de facturas %s para un cálculo basado en facturas registradas conocidas, incluso si aún no se contabilizaron en el Libro mayor.
-SeeReportInBookkeepingMode=Consulte el informe <b>%s Libro Mayor %s </b> para un cálculo en <b> la tabla contable del Libro Mayor </b>
 RulesAmountWithTaxIncluded=Los importes mostrados son con todos los impuestos incluidos
 RulesResultDue=- Incluye facturas pendientes, gastos, IVA, donaciones ya sean pagadas o no. También incluye salarios pagados. <br>- se basa en la fecha de facturación de las facturas y en la fecha de vencimiento de los gastos o pagos de impuestos. Para los salarios definidos con el módulo Salario, se utiliza la fecha de pago del valor.
 RulesResultInOut=Incluye los pagos reales realizados en facturas, gastos, IVA y sueldos. <br> - Se basa en las fechas de pago de las facturas, gastos, IVA y salarios. la fecha de donación para la donación.
diff --git a/htdocs/langs/es_EC/cron.lang b/htdocs/langs/es_EC/cron.lang
index 1bcb97a8f7b..7dbff235dc7 100644
--- a/htdocs/langs/es_EC/cron.lang
+++ b/htdocs/langs/es_EC/cron.lang
@@ -4,8 +4,6 @@ Permission23102 =Crear / actualizar trabajo programado
 Permission23103 =Eliminar trabajo programado
 Permission23104 =Ejecutar trabajo programado
 CronSetup=Configuración de administración de trabajos programada
-URLToLaunchCronJobs=URL para verificar e iniciar trabajos calificados de cron
-OrToLaunchASpecificJob=O para comprobar y lanzar un trabajo específico
 KeyForCronAccess=Clave de seguridad para la URL para iniciar trabajos cron
 FileToLaunchCronJobs=Línea de comandos para comprobar y poner en marcha trabajos calificados de cron
 CronExplainHowToRunUnix=En el entorno Unix, debe utilizar la siguiente entrada crontab para ejecutar la línea de comandos cada 5 minutos
@@ -41,7 +39,6 @@ CronArgs=Parámetros
 CronSaveSucess=Guardado exitosamente
 CronFieldMandatory=Los campos%s son obligatorios
 CronErrEndDateStartDt=La fecha de finalización no puede ser anterior a la fecha de inicio
-CronStatusActiveBtn=Habilitar
 CronStatusInactiveBtn=En rehabilitación
 CronTaskInactive=Este trabajo está deshabilitado
 CronId=Carné de identidad
diff --git a/htdocs/langs/es_EC/errors.lang b/htdocs/langs/es_EC/errors.lang
index d857d9acdeb..50196eff061 100644
--- a/htdocs/langs/es_EC/errors.lang
+++ b/htdocs/langs/es_EC/errors.lang
@@ -59,7 +59,6 @@ ErrorExportDuplicateProfil=Este nombre de perfil ya existe para este conjunto de
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP no está completo.
 ErrorLDAPMakeManualTest=Se ha generado un archivo .ldif en el directorio%s. Trate de cargarlo manualmente desde la línea de comandos para obtener más información sobre los errores.
 ErrorCantSaveADoneUserWithZeroPercentage=No se puede guardar una acción con "estado no iniciado" si el campo "hecho por" también se llena.
-ErrorRefAlreadyExists=La referencia usada para la creación ya existe.
 ErrorPleaseTypeBankTransactionReportName=Ingrese el nombre del extracto bancario donde se debe informar la entrada (Formato AAAAMM o AAAAMMDD)
 ErrorRecordHasChildren=Error al eliminar el registro ya que tiene algunos registros secundarios.
 ErrorRecordHasAtLeastOneChildOfType=El objeto tiene al menos un hijo del tipo%s
@@ -178,7 +177,6 @@ ErrorObjectMustHaveLinesToBeValidated=El objeto%s debe tener líneas a validar.
 ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Sólo se pueden enviar facturas validadas mediante la acción masiva "Enviar por correo electrónico".
 ErrorDiscountLargerThanRemainToPaySplitItBefore=El descuento que usted intenta aplicar es más grande que permanecer para pagar. Divida el descuento en 2 descuentos más pequeños antes.
 ErrorFileNotFoundWithSharedLink=Archivo no fue encontrado. Puede ser que la clave compartida se haya modificado o que el archivo se haya eliminado recientemente.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Tenga en cuenta que no es posible utilizar productos virtuales para aumentar/disminuir automáticamente subproductos cuando al menos un subproducto (o subproducto de subproductos) necesita un número de serie/lote.
 ErrorDescRequiredForFreeProductLines=La descripción es obligatoria para campos con producto gratis
 ErrorDuringChartLoad=Error al cargar el plan de cuentas. Si no se cargaron algunas cuentas, aún puede ingresarlas manualmente.
 ErrorBadSyntaxForParamKeyForContent=Mala sintaxis para param keyforcontent. Debe tener un valor que comience con %s o %s
diff --git a/htdocs/langs/es_EC/mails.lang b/htdocs/langs/es_EC/mails.lang
index b24a2b0d5f6..d726c01c4b9 100644
--- a/htdocs/langs/es_EC/mails.lang
+++ b/htdocs/langs/es_EC/mails.lang
@@ -95,12 +95,6 @@ TagSignature=Firma del usuario enviado
 EMailRecipient=Receptor de E-mail
 TagMailtoEmail=Correo electrónico del destinatario (incluido el enlace html "mailto:")
 NoEmailSentBadSenderOrRecipientEmail=No hay correo electrónico enviado. Correo electrónico incorrecto del remitente o del destinatario. Verifique el perfil de usuario.
-NoNotificationsWillBeSent=No hay notificaciones por correo electrónico para este evento y la empresa
-ANotificationsWillBeSent=Se enviará una notificación por correo electrónico
-SomeNotificationsWillBeSent=Las notificaciones de %s se enviarán por correo electrónico
-AddNewNotification=Activar un nuevo destino / evento de notificación por correo electrónico
-ListOfActiveNotifications=Lista todos los destinos / eventos activos para la notificación por correo electrónico
-ListOfNotificationsDone=Lista todas las notificaciones por correo electrónico enviadas
 MailSendSetupIs=La configuración del envío de correo electrónico se ha configurado en '%s'. Este modo no se puede utilizar para enviar correos electrónicos masivos.
 MailSendSetupIs2=Primero debe ir, con una cuenta de administrador, al menú %s Home - Setup - EMails%s para cambiar el parámetro <strong> '%s' </strong> para usar el modo '%s'. Con este modo, puede ingresar la configuración del servidor SMTP proporcionado por su proveedor de servicios de Internet y usar la función de correo electrónico masivo.
 MailSendSetupIs3=Si tiene alguna pregunta sobre cómo configurar su servidor SMTP, puede preguntar a %s.
@@ -109,7 +103,6 @@ NbOfTargetedContacts=Número actual de correos electrónicos de contacto
 UseFormatFileEmailToTarget=El archivo importado debe tener formato <strong> correo electrónico; nombre; nombre; otro </ strong>
 UseFormatInputEmailToTarget=Introduzca una cadena con formato <strong> correo electrónico; nombre; nombre; otro </strong>
 AdvTgtTitle=Rellene los campos de entrada para preseleccionar los clientes/proveedores o contactos/direcciones de destino
-AdvTgtSearchTextHelp=Utilizar como comodines %%. Por ejemplo, para encontrar todos los elementos como <b>jean, joe, jim</b>, puede ingresar <b>j%%</b>, también puede usar ; como separador de valor, y uso ! para excepto este valor. Por ejemplo, <b>jean;joe;jim%%;!Jimo;!Jima%</b> apuntará a todos los jean, joe, comienza con jim pero no jimo y no todo lo que comienza con jima
 AdvTgtSearchIntHelp=Utilice el intervalo para seleccionar el valor int o float
 AdvTgtMaxVal=Valor máximo
 AdvTgtSearchDtHelp=Usar el intervalo para seleccionar el valor de fecha
@@ -123,7 +116,5 @@ AdvTgtAddContact=Añadir emails según criterio.
 AdvTgtLoadFilter=Filtro de carga
 NoContactWithCategoryFound=No hay contacto/dirección con una categoría encontrada
 NoContactLinkedToThirdpartieWithCategoryFound=No hay contacto/dirección con una categoría encontrada
-OutGoingEmailSetup=Configuración de correo saliente
-InGoingEmailSetup=Configuración de correo entrante
 ContactsWithThirdpartyFilter=Contactos con filtro de terceros
 Answered=Contestada
diff --git a/htdocs/langs/es_EC/main.lang b/htdocs/langs/es_EC/main.lang
index f7bc16c0fc9..6fea34ee2ae 100644
--- a/htdocs/langs/es_EC/main.lang
+++ b/htdocs/langs/es_EC/main.lang
@@ -22,6 +22,7 @@ FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Conexión con la base de datos
 NoTemplateDefined=No hay plantilla disponible para este tipo de correo electrónico
 AvailableVariables=Variables de sustitución disponibles
+CurrentTimeZone=Zona horaria PHP (servidor)
 NoRecordFound=Ningún registro encontrado
 NoRecordDeleted=Ningún registro eliminado
 NoError=No hay error
@@ -64,6 +65,7 @@ FileWasNotUploaded=Se ha seleccionado un archivo para adjuntarlo, pero todavía
 NbOfEntries=Numero de entradas
 GoToWikiHelpPage=Lea la ayuda en línea (acceso a Internet es necesario)
 GoToHelpPage=Leer la ayuda
+HomePage=Página Principal
 DolibarrInHttpAuthenticationSoPasswordUseless=El modo de autenticación Dolibarr está configurado en <b>%s</b> en el archivo de configuración <b>conf.php</b>. <br> Esto significa que la base de datos de contraseñas es externa a Dolibarr, por lo que cambiar este campo puede no tener efecto.
 Undefined=Indefinido
 PasswordForgotten=¿Contraseña olvidada?
diff --git a/htdocs/langs/es_EC/modulebuilder.lang b/htdocs/langs/es_EC/modulebuilder.lang
index ffad475bff9..3c61371c2a3 100644
--- a/htdocs/langs/es_EC/modulebuilder.lang
+++ b/htdocs/langs/es_EC/modulebuilder.lang
@@ -48,7 +48,6 @@ SqlFileKey=Archivo SQL para las claves
 SqlFileKeyExtraFields=Archivo SQL para claves de atributos complementarios
 UseAsciiDocFormat=Puede usar el formato Markdown, pero se recomienda usar el formato Asciidoc (omparison entre .md y .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 NoTrigger=Sin disparador
-GoToApiExplorer=Ir a explorador de API
 ListOfDictionariesEntries=Lista de entradas de diccionarios
 ListOfPermissionsDefined=Lista de permisos definidos
 SeeExamples=Ver ejemplos aquí
@@ -83,7 +82,6 @@ UseSpecificEditorURL =Use una URL de editor específica
 UseSpecificFamily =Use una familia específica
 UseSpecificAuthor =Use un autor específico
 UseSpecificVersion =Use una versión inicial específica
-ModuleMustBeEnabled=El módulo / aplicación debe habilitarse primero
 IncludeDocGenerationHelp=Si marca esto, se generará algún código para agregar un cuadro "Generar documento" en el registro.
 ShowOnCombobox=Mostrar valor en el cuadro combinado
 KeyForTooltip=Clave para información sobre herramientas
diff --git a/htdocs/langs/es_EC/products.lang b/htdocs/langs/es_EC/products.lang
index 59bf558386b..5cdd3a75153 100644
--- a/htdocs/langs/es_EC/products.lang
+++ b/htdocs/langs/es_EC/products.lang
@@ -102,7 +102,6 @@ NewRefForClone=Árbitro. de nuevo producto/servicio
 CustomerPrices=Precios de los clientes
 SuppliersPrices=Precios del proveedor
 SuppliersPricesOfProductsOrServices=Precios de proveedor (de productos o servicios)
-CustomCode=Código de Aduanas / Productos / HS
 Nature=Naturaleza del producto (material / acabado)
 g=gramo
 m=metro
@@ -116,7 +115,6 @@ AlwaysUseFixedPrice=Utilizar el precio fijo
 PriceByQuantity=Diferentes precios por cantidad
 DisablePriceByQty=Deshabilitar precios por cantidad
 PriceByQuantityRange=Rango Cantidad
-MultipriceRules=Reglas del segmento de precios
 UseMultipriceRules=Utilice las reglas de segmento de precios (definidas en la configuración del módulo del producto) para calcular automáticamente los precios de todos los demás segmentos de acuerdo con el primer segmento
 KeepEmptyForAutoCalculation=Manténgase vacío para que esto se calcule automáticamente de peso o volumen de productos
 VariantRefExample=Ejemplos: COL, TAMAÑO
diff --git a/htdocs/langs/es_EC/sendings.lang b/htdocs/langs/es_EC/sendings.lang
index 08d25169ac0..db824ebf01e 100644
--- a/htdocs/langs/es_EC/sendings.lang
+++ b/htdocs/langs/es_EC/sendings.lang
@@ -17,6 +17,7 @@ OtherSendingsForSameOrder=Otros envíos para este pedido
 SendingsAndReceivingForSameOrder=Envíos y recibos para este pedido
 SendingsToValidate=Envíos para validar
 StatusSendingCanceled=Cancelado
+StatusSendingCanceledShort=Cancelado
 StatusSendingValidated=Validado (productos para enviar o ya enviar)
 StatusSendingProcessed=Procesada
 StatusSendingValidatedShort=validado
diff --git a/htdocs/langs/es_EC/ticket.lang b/htdocs/langs/es_EC/ticket.lang
index 1b7ecded84a..ae99f099a88 100644
--- a/htdocs/langs/es_EC/ticket.lang
+++ b/htdocs/langs/es_EC/ticket.lang
@@ -5,14 +5,12 @@ TicketDictType=Tipos - Tickets
 TicketDictCategory=Ticket - Grupos
 TicketDictSeverity=Ticket - Prioridades
 TicketTypeShortISSUE=Problema o Error
-TicketSeverityShortBLOCKING=Crítico/Bloqueo
 ErrorBadEmailAddress=Campo '%s' incorrecto
 MenuListNonClosed=Tikests abiertos
 TypeContact_ticket_internal_CONTRIBUTOR=Contribuyente
 TypeContact_ticket_external_SUPPORTCLI=Contacto con el cliente / seguimiento de incidentes
 OriginEmail=Origen del correo electrónico
 Notify_TICKET_SENTBYMAIL=Enviar mensaje del ticket por correo electrónico
-NotRead=No leer
 Read=Leer
 NeedMoreInformation=Esperando información
 Waiting=Esperando
diff --git a/htdocs/langs/es_EC/withdrawals.lang b/htdocs/langs/es_EC/withdrawals.lang
index ba83f5af30c..baadc69e3b1 100644
--- a/htdocs/langs/es_EC/withdrawals.lang
+++ b/htdocs/langs/es_EC/withdrawals.lang
@@ -77,6 +77,7 @@ SEPAFormYourBIC=Su código de identificación bancaria (BIC)
 PleaseCheckOne=Por favor, marque uno solo
 DirectDebitOrderCreated=Orden de domiciliación %s creada
 CreateForSepa=Crear un archivo de débito directo
+ICS=Creditor Identifier CI for direct debit
 END_TO_END=Etiqueta XML SEPA "EndToEndId": identificación única asignada por transacción
 USTRD=Etiqueta XML SEPA "no estructurada"
 ADDDAYS=Agregar días a la fecha de ejecución
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index 62560e80262..5d2b70ce4c5 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=Todos los países excepto %s
 AccountantFiles=Exportar documentos de origen
 ExportAccountingSourceDocHelp=Con esta herramienta, puede exportar los eventos de origen (lista y PDF) que se utilizaron para generar su contabilidad. Para exportar sus diarios, use la entrada de menú %s - %s.
 VueByAccountAccounting=Ver por cuenta contable
+VueBySubAccountAccounting=Ver por subcuenta contable
 
 MainAccountForCustomersNotDefined=Cuenta contable para clientes no definida en la configuración
 MainAccountForSuppliersNotDefined=Cuenta contable para proveedores no definida en la configuración
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Cuenta sin contabilización en la contabilidad
 XLineSuccessfullyBinded=%s productos/servicios relacionada correctamente a una cuenta contable
 XLineFailedToBeBinded=%s productos/servicios sin cuenta contable
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a contabilizar que se muestran por página (máximo recomendado: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Número máximo de líneas en la lista y la página de enlace (recomendado: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Ordenar las páginas de contabilización "A contabilizar" por los elementos más recientes
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Ordenar las páginas de contabilización "Contabilizadas" por los elementos más recientes
 
@@ -198,7 +199,8 @@ Docdate=Fecha
 Docref=Referencia
 LabelAccount=Descripción
 LabelOperation=Etiqueta operación
-Sens=Sentido
+Sens=Dirección
+AccountingDirectionHelp=Para una cuenta contable de un cliente, use Crédito para registrar un pago que recibió <br> Para una cuenta contable de un proveedor, use Débito para registrar un pago que usted realice
 LetteringCode=Cogido de letras
 Lettering=Letras
 Codejournal=Diario
@@ -206,7 +208,8 @@ JournalLabel=Etiqueta del diario
 NumPiece=Apunte
 TransactionNumShort=Núm. transacción
 AccountingCategory=Grupos personalizados
-GroupByAccountAccounting=Agrupar por cuenta contable
+GroupByAccountAccounting=Agrupar por cuenta del Libro Mayor
+GroupBySubAccountAccounting=Agrupar por cuenta de libro mayor auxiliar
 AccountingAccountGroupsDesc=Puedes definir aquí algunos grupos de cuentas contables. Se usarán para informes de contabilidad personalizados.
 ByAccounts=Por cuentas
 ByPredefinedAccountGroups=Por grupos predefinidos
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Pagos no vinculados a un producto/servicio
 OpeningBalance=Saldo inicial
 ShowOpeningBalance=Mostrar saldo inicial
 HideOpeningBalance=Ocultar saldo inicial
-ShowSubtotalByGroup=Mostrar subtotal por grupo
+ShowSubtotalByGroup=Mostrar subtotal por nivel
 
 Pcgtype=Grupo de cuenta
 PcgtypeDesc=Los grupos de cuentas se utilizan como criterios predefinidos de "filtro" y "agrupación" para algunos informes contables. Por ejemplo, 'INGRESOS' o 'GASTOS' se utilizan como grupos para las cuentas contables de productos para construir el informe de gastos / ingresos.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consulte aquí la lista de líneas de informes de gastos
 DescVentilExpenseReportMore=Si configura la cuentas contables de los tipos de informes de gastos, la aplicación será capaz de hacer el enlace entre sus líneas de informes de gastos y las cuentas contables, simplemente con un clic en el botón <strong>"%s"</strong> , Si no se ha establecido la cuenta contable en el diccionario o si todavía tiene algunas líneas no contabilizadas a alguna cuenta, tendrá que hacer una contabilización manual desde el menú "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consulte aquí las líneas de informes de gastos y sus cuentas contables
 
+Closure=Cierre anual
 DescClosure=Consulte aquí el número de movimientos por mes que no están validados y los años fiscales ya abiertos
 OverviewOfMovementsNotValidated=Paso 1 / Resumen de movimientos no validados. (Necesario para cerrar un año fiscal)
+AllMovementsWereRecordedAsValidated=Todos los movimientos se registraron como validados
+NotAllMovementsCouldBeRecordedAsValidated=No todos los movimientos pueden registrarse como validados
 ValidateMovements=Validar movimientos
 DescValidateMovements=Se prohíbe cualquier modificación o eliminación de registros. Todas las entradas para un ejercicio deben validarse; de lo contrario, no será posible cerrarlo
-SelectMonthAndValidate=Seleccionar mes y validar movimientos
 
 ValidateHistory=Vincular automáticamente
 AutomaticBindingDone=Vinculación automática finalizada
@@ -293,6 +298,7 @@ Accounted=Contabilizada en el Libro Mayor
 NotYetAccounted=Aún no contabilizada en el Libro Mayor
 ShowTutorial=Ver Tutorial
 NotReconciled=No reconciliado
+WarningRecordWithoutSubledgerAreExcluded=Advertencia, todas las operaciones sin una cuenta de libro mayor auxiliar definida se filtran y excluyen de esta vista
 
 ## Admin
 BindingOptions=Opciones de enlace
@@ -337,10 +343,11 @@ Modelcsv_LDCompta10=Exportar para LD Compta (v10 & superior)
 Modelcsv_openconcerto=Exportar a OpenConcerto (En pruebas)
 Modelcsv_configurable=Exportación CSV Configurable
 Modelcsv_FEC=Exportación FEC
+Modelcsv_FEC2=Exportar FEC (con escritura de generación de fechas / documento invertido)
 Modelcsv_Sage50_Swiss=Exportación a Sage 50 Suiza
 Modelcsv_winfic=Exportar Winfic - eWinfic - WinSis Compta
-Modelcsv_Gestinumv3=Export for Gestinum (v3)
-Modelcsv_Gestinumv5Export for Gestinum (v5)
+Modelcsv_Gestinumv3=Exportar para Gestinum (v3)
+Modelcsv_Gestinumv5Export para Gestinum (v5)
 ChartofaccountsId=Id plan contable
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 12d860d8ecc..878ea6c13df 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Entorno
 SetupArea=Configuración
 UploadNewTemplate=Nueva(s) plantilla(s) actualizada(s)
 FormToTestFileUploadForm=Formulario de prueba de subida de archivo (según opciones elegidas)
+ModuleMustBeEnabled=El módulo / aplicación <b> %s </b> debe estar habilitado
+ModuleIsEnabled=Se ha habilitado el módulo / aplicación <b> %s </b>
 IfModuleEnabled=Nota: sólo es eficaz si el módulo <b>%s</b> está activado
 RemoveLock=Elimine o renombre el archivo <b>%s</b>, si existe, para permitir el uso de la herramienta de Actualización/Instalación.
 RestoreLock=Restaure el archivo <b> %s </b>, solo con permiso de lectura, para deshabilitar cualquier uso posterior de la herramienta Actualización/Instalación.
@@ -85,7 +87,6 @@ ShowPreview=Ver vista previa
 ShowHideDetails=Mostrar-Ocultar detalles
 PreviewNotAvailable=Vista previa no disponible
 ThemeCurrentlyActive=Tema actualmente activo
-CurrentTimeZone=Zona horaria PHP (Servidor)
 MySQLTimeZone=Zona horaria MySql (base de datos)
 TZHasNoEffect=Las fechas se guardan y devueltas por el servidor de base de datos tal y como si se las hubieran enviado como una cadena. La zona horaria solamente tiene efecto si se usa la función UNIX_TIMESTAMP (que no debe ser usada por Dolibarr, por lo que la zona horaria de la base de datos no debe tener efecto, aunque se haya cambiado después de introducir los datos).
 Space=Área
@@ -103,7 +104,7 @@ NoMaxSizeByPHPLimit=Ninguna limitación interna en su servidor PHP
 MaxSizeForUploadedFiles=Tamaño máximo de los documentos a subir (0 para prohibir la subida)
 UseCaptchaCode=Utilización de código gráfico (CAPTCHA) en la página de inicio de sesión
 AntiVirusCommand=Ruta completa hacia el comando del antivirus
-AntiVirusCommandExample=Ejemplo para ClamAv Daemon (requiere clamav-daemon): //usr/bin/clamdscan<br> Ejemplo para ClamWin (muy lento): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe\n 
+AntiVirusCommandExample=Ejemplo para ClamAv Daemon (requiere clamav-daemon): /usr/bin/clamdscan<br> Ejemplo para ClamWin (muy lento): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe\n 
 AntiVirusParam= Parámetros complementarios en la línea de comandos
 AntiVirusParamExample=Ejemplo para ClamAv Daemon: --fdpass<br>Ejemplo para ClamWin: -- database="CC:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Configuración del módulo Contabilidad
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Esta área ofrece distintas funciones de administración. Ut
 Purge=Purga
 PurgeAreaDesc=Esta página le permite borrar todos los archivos generados o almacenados por Dolibarr (archivos temporales o todos los archivos del directorio <b>%s</b>). El uso de esta función no es necesaria. Se proporciona como solución para los usuarios cuyos Dolibarr se encuentran en un proveedor que no ofrece permisos para eliminar los archivos generados por el servidor web.
 PurgeDeleteLogFile=Eliminar archivos de registro, incluidos <b> %s</b> definidos por el módulo Syslog (sin riesgo de perder datos)
-PurgeDeleteTemporaryFiles=Eliminar todos los archivos temporales (sin riesgo de perder datos). Nota: la eliminación se realiza solo si el directorio temporal se creó hace 24 horas.
-PurgeDeleteTemporaryFilesShort=Eliminar archivos temporales
+PurgeDeleteTemporaryFiles=Elimine todos los archivos de registro y temporales (sin riesgo de perder datos). Nota: La eliminación de archivos temporales se realiza solo si el directorio temporal se creó hace más de 24 horas.
+PurgeDeleteTemporaryFilesShort=Eliminar archivos de registro y temporales
 PurgeDeleteAllFilesInDocumentsDir=Eliminar todos los archivos del directorio <b>%s</b>. Serán eliminados archivos temporales y archivos relacionados con elementos (terceros, facturas, etc.), archivos subidos al módulo GED, copias de seguridad de la base de datos y archivos temporales.
 PurgeRunNow=Purgar
 PurgeNothingToDelete=Sin directorios o archivos a eliminar.
@@ -203,7 +204,7 @@ FeatureDisabledInDemo=Opción deshabilitada en demo
 FeatureAvailableOnlyOnStable=Funcionaliad disponible únicamente en versiones oficiales estables
 BoxesDesc=Los paneles son componentes que muestran algunos datos que pueden añadirse para personalizar algunas páginas. Puede elegir entre mostrar o no el panel mediante la selección de la página de destino y haciendo clic en 'Activar', o haciendo clic en la papelera para desactivarlo.
 OnlyActiveElementsAreShown=Sólo los elementos de <a href="%s">módulos activados</a> son mostrados.
-ModulesDesc=Los módulos/aplicaciones definen qué funcionalidad está habilitada en el software. Algunos módulos requieren permisos que se deben conceder a los usuarios después de activar el módulo. Haga clic en el botón de on/off <span class="small valignmiddle">%s</span>de cada módulo para habilitar o deshabilitar un módulo / aplicación.
+ModulesDesc=Los módulos/aplicaciones definen qué funcionalidad está habilitada en el software. Algunos módulos requieren permisos que se deben conceder a los usuarios después de activar el módulo. Haga clic en el botón de on/off <span class="small valignmiddle">%s</span>de cada módulo para habilitar o deshabilitar un módulo/aplicación.
 ModulesMarketPlaceDesc=Puede encontrar más módulos para descargar en sitios web externos en Internet ...
 ModulesDeployDesc=Si los permisos en su sistema de archivos lo permiten, puede utilizar esta herramienta para instalar un módulo externo. El módulo estará entonces visible en la pestaña <strong>%s</strong>.
 ModulesMarketPlaces=Buscar módulos externos...
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Otros recursos
 ExternalResources=Recursos externos
 SocialNetworks=Redes sociales
+SocialNetworkId=ID de red social
 ForDocumentationSeeWiki=Para la documentación de usuario, desarrollador o Preguntas Frecuentes (FAQ), consulte el wiki Dolibarr: <br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Para otras cuestiones o realizar sus propias consultas, puede utilizar el foro Dolibarr: <br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Aquí hay algunos recursos para obtener ayuda y soporte de Dolibarr
@@ -274,7 +276,7 @@ NoticePeriod=Plazo de aviso
 NewByMonth=Nuevo por mes
 Emails=E-Mails
 EMailsSetup=Configuración e-mails
-EMailsDesc=Esta página le permite definir las opciones para enviar e-mails.
+EMailsDesc=Esta página le permite definir los parámetros u opciones para enviar e-mails.
 EmailSenderProfiles=Perfiles de remitentes de e-mails
 EMailsSenderProfileDesc=Puede mantener esta sección vacía. Si indica algunos e-mails aquí, se agregarán a la lista de posibles remitentes en el combobox cuando escriba un nuevo e-mail
 MAIN_MAIL_SMTP_PORT=Puerto del servidor SMTP (Por defecto en php.ini: <b>%s</b>)
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Ejemplos con la configuración actual
 ListOfDirectories=Listado de directorios de plantillas OpenDocument
 ListOfDirectoriesForModelGenODT=Listado de directorios que contienen las plantillas de archivos con el formato OpenDocument.<br>Ponga aquí la ruta completa de directorios.<br>Añada un retorno de carro entre cada directorio<br> Para agregar un directorio del módulo GED, agregue aquí <b>DOL_DATA_ROOT/ecm/sunombrededirectorio.</b><br><br>Los archivos de esos directorios deben terminar con <b>.odt</b> o <b>.ods</b>.
 NumberOfModelFilesFound=Número de archivos de plantillas ODT/ODS encontrados en estos directorios
-ExampleOfDirectoriesForModelGen=Ejemplos de sintaxis:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Ejemplos de sintaxis: <br>c:\\myapp\\mydocumentdir\\mysubdir<br> /home/myapp/mydocumentdir/mysubdir <br> DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=Colocando los siguientes tags en la plantilla, obtendrá una sustitución con el valor personalizado al generar el documento:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Crear_un_modelo_de_documento_ODT
 FirstnameNamePosition=Orden visualización nombre/apellidos
@@ -406,7 +408,7 @@ UrlGenerationParameters=Seguridad de las URLs
 SecurityTokenIsUnique=¿Usar un parámetro securekey único para cada URL?
 EnterRefToBuildUrl=Introduzca la referencia del objeto %s
 GetSecuredUrl=Obtener la URL calculada
-ButtonHideUnauthorized=Ocultar botones de acciones no autorizadas a los usuarios no administradores en vez de mostrarlos atenuados
+ButtonHideUnauthorized=Oculte los botones de acción no autorizados también para los usuarios internos (solo en gris de lo contrario)
 OldVATRates=Tasa de IVA antigua
 NewVATRates=Tasa de IVA nueva
 PriceBaseTypeToChange=Cambiar el precio cuya referencia de base es
@@ -1314,7 +1316,7 @@ PHPModuleLoaded=El componente PHP %s está cargado
 PreloadOPCode=Se utiliza OPCode precargado
 AddRefInList=Mostrar código de cliente/proveedor en los listados (y selectores) y enlaces.<br>Los terceros aparecerán con el nombre "CC12345 - SC45678 - The big company coorp", en lugar de "The big company coorp".
 AddAdressInList=Mostrar la dirección del cliente/proveedor en los listados (y selectores) <br>Los terceros aparecerán con el nombre "The big company coorp - 21 jump street 123456 Big town - USA ", en lugar de "The big company coorp".
-AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
+AddEmailPhoneTownInContactList=Mostrar correo electrónico de contacto (o teléfonos si no están definidos) y lista de información de la ciudad (lista de selección o cuadro combinado) <br> Los contactos aparecerán con un formato de nombre de "Dupond Durand - dupond.durand@email.com - Paris" o "Dupond Durand - 06 07 59 65 66 - Paris "en lugar de" Dupond Durand ".
 AskForPreferredShippingMethod=Consultar por el método preferido de envío a terceros.
 FieldEdition=Edición del campo %s
 FillThisOnlyIfRequired=Ejemplo: +2 (Complete sólo si se registra una desviación del tiempo en la exportación)
@@ -1421,7 +1423,7 @@ AdherentMailRequired=E-Mail obligatorio para crear un miembro nuevo
 MemberSendInformationByMailByDefault=Casilla de verificación para enviar el correo de confirmación (validación ó nueva cotización) a los miembros es por defecto "sí"
 VisitorCanChooseItsPaymentMode=El visitante puede elegir entre los modos de pago disponibles
 MEMBER_REMINDER_EMAIL=Habilitar recordatorio de eventos <b>por e-mail</b> de suscripciones expiradas. Nota: El módulo <strong>%s</strong> debe estar habilitado y configurado correctamente para que el recordatorio se envíe.
-MembersDocModules=Document templates for documents generated from member record
+MembersDocModules=Plantillas de documentos para documentos generados a partir de registros de miembros
 ##### LDAP setup #####
 LDAPSetup=Configuración del módulo LDAP
 LDAPGlobalParameters=Parámetros globales
@@ -1672,7 +1674,7 @@ AdvancedEditor=Editor avanzado
 ActivateFCKeditor=Activar editor avanzado para :
 FCKeditorForCompany=Creación/edición WYSIWIG de la descripción y notas de los terceros
 FCKeditorForProduct=Creación/edición WYSIWIG de la descripción y notas de los productos/servicios
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
+FCKeditorForProductDetails=WYSIWIG creación / edición de líneas de detalle de productos para todas las entidades (propuestas, pedidos, facturas, etc ...). <span class="warning"> Advertencia: El uso de esta opción para este caso no se recomienda seriamente, ya que puede crear problemas con caracteres especiales y formato de página al crear archivos PDF. </span>
 FCKeditorForMailing= Creación/edición WYSIWIG de los E-Mails (Utilidades->E-Mailings)
 FCKeditorForUserSignature=Creación/edición WYSIWIG de la firma de usuarios
 FCKeditorForMail=Creación/edición WYSIWIG de todos los e-mails ( excepto Utilidades->E-Mailings)
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Menús personalizados no enlazados a un menú superio
 NewMenu=Nuevo menú
 MenuHandler=Gestor de menús
 MenuModule=Módulo origen
-HideUnauthorizedMenu= Ocultar también los menús no autorizados a usuarios internos (si no sólo atenuados)
+HideUnauthorizedMenu=Ocultar menús no autorizados también para usuarios internos (solo en gris de lo contrario)
 DetailId=Identificador del menú
 DetailMenuHandler=Nombre del gestor de menús
 DetailMenuModule=Nombre del módulo si la entrada del menú es resultante de un módulo
@@ -1738,10 +1740,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Establecer automáticamente este valor por defecto
 AGENDA_DEFAULT_FILTER_TYPE=Establecer por defecto este tipo de evento en el filtro de búsqueda en la vista de la agenda
 AGENDA_DEFAULT_FILTER_STATUS=Establecer por defecto este estado de eventos en el filtro de búsqueda en la vista de la agenda
 AGENDA_DEFAULT_VIEW=Establecer la vista por defecto al seleccionar el menú Agenda
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
+AGENDA_REMINDER_BROWSER=Habilite el recordatorio de eventos <b> en el navegador del usuario </b> (Cuando se alcanza la fecha de recordatorio, el navegador muestra una ventana emergente. Cada usuario puede deshabilitar dichas notificaciones desde la configuración de notificaciones del navegador).
 AGENDA_REMINDER_BROWSER_SOUND=Activar sonido de notificación
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL=Habilite el recordatorio de eventos <b> por correo electrónico </b> (la opción de recordatorio / retraso se puede definir en cada evento).
+AGENDA_REMINDER_EMAIL_NOTE=Nota: La frecuencia de la tarea %s debe ser suficiente para asegurarse de que los recordatorios se envíen en el momento correcto.
 AGENDA_SHOW_LINKED_OBJECT=Mostrar el link en la agenda
 ##### Clicktodial #####
 ClickToDialSetup=Configuración del módulo Click To Dial
@@ -1983,11 +1985,12 @@ EMailHost=Host del servidor de e-mail IMAP
 MailboxSourceDirectory=Directorio fuente del buzón
 MailboxTargetDirectory=Directorio de destino del buzón
 EmailcollectorOperations=Operaciones a realizar por el colector
+EmailcollectorOperationsDesc=Las operaciones se ejecutan de arriba hacia abajo.
 MaxEmailCollectPerCollect=Número máximo de e-mails recolectados por la recolección
 CollectNow=Recoger ahora
 ConfirmCloneEmailCollector=¿Está seguro de que desea clonar el recolector de e-mails %s?
-DateLastCollectResult=Fecha de última recolección probada
-DateLastcollectResultOk=Fecha última recolección exitosa
+DateLastCollectResult=Fecha del último intento de recopilación
+DateLastcollectResultOk=Fecha del último éxito de recopilación
 LastResult=Último resultado
 EmailCollectorConfirmCollectTitle=Confirmación recolección e-mail
 EmailCollectorConfirmCollect=¿Desea ejecutar la recolección de este recolector ahora?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Mensaje de una conversación iniciada por un primer e-mail env
 WithoutDolTrackingID=Mensaje de una conversación iniciada por un primer e-mail NO enviado desde Dolibarr
 WithDolTrackingIDInMsgId=Mensaje enviado desde Dolibarr
 WithoutDolTrackingIDInMsgId=Mensaje NO enviado desde Dolibarr
-CreateCandidature=Crear candidatura
+CreateCandidature=Crear solicitud de empleo
 FormatZip=Código postal
 MainMenuCode=Código de entrada del menú (menú principal)
 ECMAutoTree=Mostrar arbol automático GED
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=País (si es específico de un país determinado)
 YouMayFindSecurityAdviceHere=Puede encontrar un aviso de seguridad aqui.
 ModuleActivatedMayExposeInformation=Este modulo puede exponer datos sensibles. Si no lo necesita, desactivelo.
 ModuleActivatedDoNotUseInProduction=Un modulo diseñado para desarrollo ha sido habilitado. No lo habilite en un entorno de produccion.
+CombinationsSeparator=Carácter separador para las combinaciones de productos
+SeeLinkToOnlineDocumentation=Ver enlace a la documentación online del menú superior para ejemplos
+SHOW_SUBPRODUCT_REF_IN_PDF=Si se utiliza la función "%s" del módulo <b>%s</b>, muestra los detalles de los subproductos de un kit en PDF.
+AskThisIDToYourBank=Comuníquese con su banco para obtener esta identificación
diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang
index ecf2af5c4f4..ecf81d8bad2 100644
--- a/htdocs/langs/es_ES/agenda.lang
+++ b/htdocs/langs/es_ES/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Número de eventos
 ListOfActions=Listado de eventos
 EventReports=Informes de eventos
 Location=Localización
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Evento asignado a cualquier usuario del grupo
 EventOnFullDay=Evento para todo el día
 MenuToDoActions=Eventos incompletos
 MenuDoneActions=Eventos terminados
@@ -63,7 +63,7 @@ ShipmentClassifyClosedInDolibarr=Expedición %s clasificada como pagada
 ShipmentUnClassifyCloseddInDolibarr=Envío %s clasificado como reabierto
 ShipmentBackToDraftInDolibarr=Envío %s ha sido devuelto al estado de borrador
 ShipmentDeletedInDolibarr=Expedición %s eliminada
-ReceptionValidatedInDolibarr=Reception %s validated
+ReceptionValidatedInDolibarr=Recepción %s validada
 OrderCreatedInDolibarr=Pedido %s creado
 OrderValidatedInDolibarr=Pedido %s validado
 OrderDeliveredInDolibarr=Pedido %s clasificado como enviado
@@ -86,8 +86,8 @@ ProposalDeleted=Presupuesto eliminado
 OrderDeleted=Pedido eliminado
 InvoiceDeleted=Factura eliminada
 DraftInvoiceDeleted=Borrador de factura eliminado
-CONTACT_CREATEInDolibarr=Contact %s created
-CONTACT_DELETEInDolibarr=Contact %s deleted
+CONTACT_CREATEInDolibarr=Contacto %s creado
+CONTACT_DELETEInDolibarr=Contacto %s eliminado
 PRODUCT_CREATEInDolibarr=Producto %s creado
 PRODUCT_MODIFYInDolibarr=Producto %s modificado
 PRODUCT_DELETEInDolibarr=Producto %s eliminado
@@ -152,6 +152,7 @@ ActionType=Tipo de evento
 DateActionBegin=Fecha de inicio del evento
 ConfirmCloneEvent=¿Esta seguro de querer clonar el evento <b>%s</b>?
 RepeatEvent=Repetir evento
+OnceOnly=Una sola vez
 EveryWeek=Cada semana
 EveryMonth=Cada mes
 DayOfMonth=Día del mes
@@ -160,9 +161,9 @@ DateStartPlusOne=Fecha inicio +1 hora
 SetAllEventsToTodo=Establecer todos los eventos para hacer
 SetAllEventsToInProgress=Establecer todos los eventos en progreso
 SetAllEventsToFinished=Establecer todos los eventos para finalizar
-ReminderTime=Reminder period before the event
-TimeType=Duration type
-ReminderType=Callback type
-AddReminder=Create an automatic reminder notification for this event
-ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+ReminderTime=Período de recordatorio antes del evento
+TimeType=Tipo de duración
+ReminderType=Tipo de devolución de llamada
+AddReminder=Crea una notificación de recordatorio automática para este evento
+ErrorReminderActionCommCreation=Error al crear la notificación de recordatorio para este evento
+BrowserPush=Notificación emergente del navegador
diff --git a/htdocs/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang
index 38c78945dc7..9e154aab266 100644
--- a/htdocs/langs/es_ES/banks.lang
+++ b/htdocs/langs/es_ES/banks.lang
@@ -173,10 +173,10 @@ SEPAMandate=Mandato SEPA
 YourSEPAMandate=Su mandato SEPA
 FindYourSEPAMandate=Este es su mandato SEPA para autorizar a nuestra empresa a realizar un petición de débito directo a su banco. Gracias por devolverlo firmado (escaneo del documento firmado) o enviado por correo a
 AutoReportLastAccountStatement=Rellenar automáticamente el campo 'número de extracto bancario' con el último número de extracto cuando realice la conciliación
-CashControl=Caja de efectivo POS
-NewCashFence=Nueva Caja de efectivo
+CashControl=Cierra de caja del POS
+NewCashFence=Nuevo cierre de caja
 BankColorizeMovement=Colorear movimientos
 BankColorizeMovementDesc=Si esta función está activada, puede elegir un color de fondo específico para los movimientos de débito o crédito
 BankColorizeMovementName1=Color de fondo para el movimiento de débito
 BankColorizeMovementName2=Color de fondo para el movimiento de crédito
-IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
+IfYouDontReconcileDisableProperty=Si no realiza las conciliaciones bancarias en algunas cuentas bancarias, desactive la propiedad "%s" en ellas para eliminar esta advertencia.
diff --git a/htdocs/langs/es_ES/blockedlog.lang b/htdocs/langs/es_ES/blockedlog.lang
index 3e23cf955d5..576218090d6 100644
--- a/htdocs/langs/es_ES/blockedlog.lang
+++ b/htdocs/langs/es_ES/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Supresión lógica de la donación.
 logMEMBER_SUBSCRIPTION_CREATE=Suscripción de miembro creada
 logMEMBER_SUBSCRIPTION_MODIFY=Suscripción de miembro modificada
 logMEMBER_SUBSCRIPTION_DELETE=Suscripción miembro eliminación lógica
-logCASHCONTROL_VALIDATE=Registro de la caja de efectivo
+logCASHCONTROL_VALIDATE=Registro de cierres de caja
 BlockedLogBillDownload=Descarga de factura de cliente
 BlockedLogBillPreview=Vista previa de la factura del cliente
 BlockedlogInfoDialog=Detalles del registro
diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang
index c5871f7db00..c66dad3560f 100644
--- a/htdocs/langs/es_ES/boxes.lang
+++ b/htdocs/langs/es_ES/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Últimas %s donaciones modificadas
 BoxTitleLastModifiedExpenses=Últimos %s informes de gastos modificados
 BoxTitleLatestModifiedBoms=Últimas %s Listas de materiales modificadas 
 BoxTitleLatestModifiedMos=Últimas %s Órdenes de Fabricación modificadas 
+BoxTitleLastOutstandingBillReached=Clientes con máximo pendiente superado
 BoxGlobalActivity=Actividad global
 BoxGoodCustomers=Buenos clientes
 BoxTitleGoodCustomers=%s buenos clientes
+BoxScheduledJobs=Tareas programadas
+BoxTitleFunnelOfProspection=Embudo oportunidad
 FailedToRefreshDataInfoNotUpToDate=Error al actualizar el RSS. Último refresco correcto: %s
 LastRefreshDate=Último refresco
 NoRecordedBookmarks=No hay marcadores personales.
@@ -83,8 +86,8 @@ BoxTitleLatestModifiedSupplierOrders=Últimos %s pedidos de clientes modificados
 BoxTitleLastModifiedCustomerBills=Últimas %s  facturas a clientes modificadas
 BoxTitleLastModifiedCustomerOrders=Últimos %s pedidos de clientes modificados
 BoxTitleLastModifiedPropals=Últimos %s presupuestos modificados
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Últimos %s trabajos modificados 
+BoxTitleLatestModifiedCandidatures=Últimas %s candidaturas modificadas 
 ForCustomersInvoices=Facturas a clientes
 ForCustomersOrders=Pedidos de clientes
 ForProposals=Presupuestos
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=La cuenta de suspenso no está definida
 BoxLastCustomerShipments=Últimos envíos a clientes
 BoxTitleLastCustomerShipments=Últimos %s envíos a clientes 
 NoRecordedShipments=Ningún envío a clientes registrado
+BoxCustomersOutstandingBillReached=Clientes con límite pendiente alcanzado
 # Pages
 AccountancyHome=Contabilidad
+ValidatedProjects=Proyectos validados
diff --git a/htdocs/langs/es_ES/cashdesk.lang b/htdocs/langs/es_ES/cashdesk.lang
index bf0b61bff10..d9501021ef0 100644
--- a/htdocs/langs/es_ES/cashdesk.lang
+++ b/htdocs/langs/es_ES/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=Módulo POS
 BasicPhoneLayout=Utilizar diseño básico para teléfonos.
 SetupOfTerminalNotComplete=La configuración del terminal %s no está completa
 DirectPayment=Pago directo
-DirectPaymentButton=Add a "Direct cash payment" button
+DirectPaymentButton=Añadir un botón "Pago directo en efectivo"
 InvoiceIsAlreadyValidated=La factura ya está validada
 NoLinesToBill=No hay líneas para facturar
 CustomReceipt=Recibo personalizado
@@ -94,31 +94,33 @@ TakeposConnectorMethodDescription=Módulo externo para impresión directa.
 PrintMethod=Método de impresión
 ReceiptPrinterMethodDescription=Método potente con muchos parámetros. Completamente personalizable con plantillas. No se puede imprimir desde la nube.
 ByTerminal=Por terminal
-TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
+TakeposNumpadUsePaymentIcon=Usar icono de pago en lugar del texto en los botones de pago del teclado numérico
 CashDeskRefNumberingModules=Módulo de numeración para el TPV
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag es usado para añadir el número de terminal
 TakeposGroupSameProduct=Agrupar mismas líneas de producto
 StartAParallelSale=Nueva venta simultánea 
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Cierre de caja
+SaleStartedAt=Oferta comenzada en %s
+ControlCashOpening=Controle la ventana emergente de efectivo al abrir POS
+CloseCashFence=Control de cierre de caja
 CashReport=Arqueo
 MainPrinterToUse=Impresora principal
 OrderPrinterToUse=Impresora de pedido
 MainTemplateToUse=Plantilla de impresión
 OrderTemplateToUse=Plantilla de impresión para pedidos
 BarRestaurant=Bar Restaurante
-AutoOrder=Order by the customer himself
+AutoOrder=Auto pedido
 RestaurantMenu=Carta
 CustomerMenu=Carta de cliente
-ScanToMenu=Scan QR code to see the menu
-ScanToOrder=Scan QR code to order
-Appearance=Appearance
-HideCategoryImages=Hide Category Images
-HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines of images to show
-DefineTablePlan=Define tables plan
-GiftReceiptButton=Add a "Gift receipt" button
-GiftReceipt=Gift receipt
-ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
-AllowDelayedPayment=Allow delayed payment
-PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+ScanToMenu=Escanee el código QR para ver el menú
+ScanToOrder=Escanee el código QR para realizar un pedido
+Appearance=Apariencia
+HideCategoryImages=Ocultar imágenes de categoría
+HideProductImages=Ocultar imágenes de productos
+NumberOfLinesToShow=Número de líneas de imágenes para mostrar
+DefineTablePlan=Definir plan de tablas
+GiftReceiptButton=Agregar un botón "Ticket regalo"
+GiftReceipt=Ticket regalo
+ModuleReceiptPrinterMustBeEnabled=Debe activarse primero el módulo de impresora de tickets
+AllowDelayedPayment=Permitir pago aplazado
+PrintPaymentMethodOnReceipts=Imprimir método de pago en tickets|recibos
+WeighingScale=Balanza
diff --git a/htdocs/langs/es_ES/categories.lang b/htdocs/langs/es_ES/categories.lang
index a48a95c6da2..99106a86314 100644
--- a/htdocs/langs/es_ES/categories.lang
+++ b/htdocs/langs/es_ES/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Área etiquetas/categorías Proyectos
 UsersCategoriesArea=Área etiquetas/categorías Usuarios
 SubCats=Subcategorías
 CatList=Listado de etiquetas/categorías
+CatListAll=Lista de etiquetas / categorías (todos los tipos)
 NewCategory=Nueva etiqueta/categoría
 ModifCat=Modificar etiqueta/categoría
 CatCreated=Etiqueta/categoría creada
@@ -65,24 +66,30 @@ UsersCategoriesShort=Área etiquetas/categorías Usuarios
 StockCategoriesShort=Etiquetas/categorías almacenes
 ThisCategoryHasNoItems=Esta categoría no contiene ningún objeto
 CategId=Id etiqueta/categoría
-CatSupList=Listado de etiquetas/categorías de proveedores
-CatCusList=Listado de etiquetas/categorías de clientes
+ParentCategory=Etiqueta / categoría principal
+ParentCategoryLabel=Etiqueta de etiqueta / categoría principal
+CatSupList=Lista de etiquetas/categorías de proveedores
+CatCusList=Lista de etiquetas/categorías de clientes/potenciales
 CatProdList=Listado de etiquetas/categorías de productos
 CatMemberList=Listado de etiquetas/categorías de miembros
-CatContactList=Listado de etiquetas/categorías de contactos
-CatSupLinks=Enlaces entre proveedores y etiquetas/categorías
+CatContactList=Lista de etiquetas/categorías de contactos
+CatProjectsList=Lista de etiquetas/categorías de proyectos
+CatUsersList=Lista de etiquetas/categorías de usuarios
+CatSupLinks=Vínculos entre proveedores y etiquetas/categorías
 CatCusLinks=Enlaces entre clientes/clientes potenciales y etiquetas/categorías
 CatContactsLinks=Enlaces entre contactos/direcciones y etiquetas/categorías
 CatProdLinks=Enlaces entre productos/servicios y etiquetas/categorías
-CatProJectLinks=Enlaces entre proyectos y etiquetas/categorías
+CatMembersLinks=Enlace entre miembros y etiquetas/categorías
+CatProjectsLinks=Enlaces entre proyectos y etiquetas/categorías
+CatUsersLinks=Vínculos entre usuarios y etiquetas/categorías
 DeleteFromCat=Eliminar de la etiqueta/categoría
 ExtraFieldsCategories=Campos adicionales
 CategoriesSetup=Configuración de etiquetas/categorías
 CategorieRecursiv=Enlazar con la etiqueta/categoría automáticamente
 CategorieRecursivHelp=Si la opción está activada, cuando agrega un producto a una subcategoría, el producto también se agregará a la categoría principal.
 AddProductServiceIntoCategory=Añadir el siguiente producto/servicio
-AddCustomerIntoCategory=Assign category to customer
-AddSupplierIntoCategory=Assign category to supplier
+AddCustomerIntoCategory=Asignar categoría al cliente
+AddSupplierIntoCategory=Asignar categoría a proveedor
 ShowCategory=Mostrar etiqueta/categoría
 ByDefaultInList=Por defecto en lista
 ChooseCategory=Elija una categoría
diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index 6a1e2a35020..3a99ea2432b 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=Número EORI
 ProfId6AT=-
 ProfId1AU=ABN
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=N° colegiado
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=Número EORI
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=UID-Nummer
+ProfId1CH=Número UID
 ProfId2CH=-
 ProfId3CH=Número federado
 ProfId4CH=Num registro de comercio
-ProfId5CH=EORI number
+ProfId5CH=Número EORI
 ProfId6CH=-
 ProfId1CL=R.U.T.
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Id prof. 1 (USt.-IdNr)
 ProfId2DE=Id prof. 2 (USt.-Nr)
 ProfId3DE=Id prof. 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=Número EORI
 ProfId6DE=-
 ProfId1ES=CIF/NIF
 ProfId2ES=Núm. seguridad social
 ProfId3ES=CNAE
 ProfId4ES=Núm. colegiado
-ProfId5ES=EORI number
+ProfId5ES=Número EORI
 ProfId6ES=-
 ProfId1FR=SIREN
 ProfId2FR=SIRET
 ProfId3FR=NAF (Ex APE)
 ProfId4FR=RCS/RM
-ProfId5FR=EORI number
+ProfId5FR=Número EORI
 ProfId6FR=-
 ProfId1GB=Número registro
 ProfId2GB=-
@@ -202,12 +202,12 @@ ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=Número EORI
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=Número EORI
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
@@ -225,13 +225,13 @@ ProfId1NL=Número KVK
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL=EORI number
+ProfId5NL=Número EORI
 ProfId6NL=-
 ProfId1PT=NIPC
 ProfId2PT=Núm. seguridad social
 ProfId3PT=Num reg. comercial
 ProfId4PT=Conservatorio
-ProfId5PT=EORI number
+ProfId5PT=Número EORI
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +255,7 @@ ProfId1RO=CUI
 ProfId2RO=Prof ID 2 (Numero de registro)
 ProfId3RO=CAEN
 ProfId4RO=EUID
-ProfId5RO=EORI number
+ProfId5RO=Número EORI
 ProfId6RO=-
 ProfId1RU=OGRN
 ProfId2RU=INN
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Verificar el CIF/NIF intracomunitario en la web de la
 VATIntraManualCheck=Puede también realizar una verificación manual en la web de la comisión europea <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Comprobación imposible. El servicio de comprobación no es prestado por el país país miembro (%s).
 NorProspectNorCustomer=Ni cliente, ni cliente potencial
-JuridicalStatus=Forma jurídica
+JuridicalStatus=Tipo de entidad comercial
 Workforce=Personal
 Staff=Empleados
 ProspectLevelShort=Potencial
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index b0b4b087cb1..2fd8288fc12 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -69,7 +69,7 @@ SocialContribution=Impuestos sociales o fiscales
 SocialContributions=Impuestos sociales o fiscales
 SocialContributionsDeductibles=Impuestos sociales o fiscales deducibles
 SocialContributionsNondeductibles=Impuestos sociales o fiscales no deducibles
-DateOfSocialContribution=Date of social or fiscal tax
+DateOfSocialContribution=Fecha del impuesto social o fiscal
 LabelContrib=Etiqueta
 TypeContrib=Tipo
 MenuSpecialExpenses=Pagos especiales
@@ -111,7 +111,7 @@ Refund=Devolución
 SocialContributionsPayments=Pagos tasas sociales/fiscales
 ShowVatPayment=Ver pagos IVA
 TotalToPay=Total a pagar
-BalanceVisibilityDependsOnSortAndFilters=El balance es visible en esta lista sólo si la tabla está ordenada ascendente en %s y se filtra para 1 cuenta bancaria
+BalanceVisibilityDependsOnSortAndFilters=El saldo es visible en esta lista solo si la tabla se ordena en %s y se filtra en 1 cuenta bancaria (sin otros filtros)
 CustomerAccountancyCode=Código contable cliente
 SupplierAccountancyCode=Código contable proveedor
 CustomerAccountancyCodeShort=Cód. cuenta cliente
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=¿Está seguro de querer eliminar este pago de t
 ExportDataset_tax_1=tasas sociales y fiscales y pagos
 CalcModeVATDebt=Modo <b>%sIVA sobre facturas emitidas%s</b>.
 CalcModeVATEngagement=Modo <b>%sIVA sobre facturas cobradas%s</b>.
-CalcModeDebt=Análisis de facturas registradas conocidas incluso si aún no se encuentran contabilizadas en el libro mayor.
+CalcModeDebt=Análisis de documentos registrados conocidos incluso si aún no están contabilizados en el libro mayor.
 CalcModeEngagement=Análisis de los pagos registrados conocidos, incluso si aún no se encuentran contabilizados en el Libro mayor.
 CalcModeBookkeeping=Análisis de los datos registrados en el Libro mayor
 CalcModeLT1= Modo <b>%sRE facturas a clientes - facturas de proveedores%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Resumen anual del balance de ingresos y gastos
 AnnualByCompanies=Balance de ingresos y gastos, por grupos de cuenta predefinidos
 AnnualByCompaniesDueDebtMode=Balance de ingresos y gastos, desglosado por terceros, en modo<b>%sCréditos-Deudas%s</b> llamada <b>contabilidad de compromiso</b>.
 AnnualByCompaniesInputOutputMode=Balance de ingresos y gastos, desglosado por terceros, en modo <b>%sIngresos-Gastos%s</b> llamada <b>contabilidad de caja</b>.
-SeeReportInInputOutputMode=Consulte %sanálisis de pagos%s para obtener un cálculo de los pagos efectuados, incluso si aún no se han contabilizado en el Libro mayor.
-SeeReportInDueDebtMode=Consulte %sanálisis de facturas %s para un cálculo basado en facturas registradas conocidas, incluso si aún no se han contabilizado en Libro mayor.
-SeeReportInBookkeepingMode=Consulte el <b>%sInforme de facturación%s</b> para realizar un cálculo en la <b>Tabla Libro mayor</b>
+SeeReportInInputOutputMode=Consulte <b> %sanálisis de pagos%s </b> para obtener un cálculo basado en <b> pagos registrados </b> realizados incluso si aún no están contabilizados en el Libro Mayor
+SeeReportInDueDebtMode=Consulte <b> %sanálisis de documentos registrados %s </b> para un cálculo basado en <b> documentos registrados conocidos </b> incluso si aún no están contabilizados en el Libro Mayor
+SeeReportInBookkeepingMode=Consulte <b> %sanálisis de la tabla de contabilidad %s </b> para obtener un informe basado en <b> Tabla de Libro Mayor </b>
 RulesAmountWithTaxIncluded=- Los importes mostrados son con todos los impuestos incluídos.
 RulesResultDue=- Incluye facturas pendientes, gastos, IVA, donaciones ya sean pagadas o no. También incluye salarios pagados.<br>- Se basa en la fecha de facturación de las facturas y en la fecha de vencimiento de los gastos o pagos de impuestos. Para los salarios definidos con el módulo Salario, se utiliza el valor de la fecha de pago.
 RulesResultInOut=- Incluye los pagos realizados sobre las facturas, las gastos y el IVA. <br>- Se basa en las fechas de pago de las facturas, gastos e IVA. La fecha de donación para las donaciones
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Muestra un registro en su libro mayor con cue
 SeePageForSetup=Vea el menú <a href="%s">%s</a> para configurarlo
 DepositsAreNotIncluded=- Las facturas de anticipo no están incluidas
 DepositsAreIncluded=- Las facturas de anticipo están incluidas
+LT1ReportByMonth=Informe de impuestos 2 por mes
+LT2ReportByMonth=Informe de impuestos 3 por mes
 LT1ReportByCustomers=Informe por tercero del RE
 LT2ReportByCustomers=Informe por tercero del IRPF
 LT1ReportByCustomersES=Informe de RE por tercero
 LT2ReportByCustomersES=Informe de IRPF por tercero del
 VATReport=Informe IVA
 VATReportByPeriods=Informe de IVA por período
+VATReportByMonth=Informe de impuestos de venta por mes
 VATReportByRates=Informe de impuestos por tasa
 VATReportByThirdParties=Informe de impuestos por terceros
 VATReportByCustomers=Informe IVA por cliente
diff --git a/htdocs/langs/es_ES/cron.lang b/htdocs/langs/es_ES/cron.lang
index 27dcaa7e9e9..fbd82ed411d 100644
--- a/htdocs/langs/es_ES/cron.lang
+++ b/htdocs/langs/es_ES/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Borrar Tarea Programada
 Permission23104 = Ejecutar Taraea programada
 # Admin
 CronSetup=Configuración del módulo Programador
-URLToLaunchCronJobs=URL para combrobar y ejecutar tareas
-OrToLaunchASpecificJob=O para ejecutar una tarea en concreto
+URLToLaunchCronJobs=URL para verificar e iniciar trabajos cron calificados desde un navegador
+OrToLaunchASpecificJob=O para verificar e iniciar un trabajo específico desde un navegador
 KeyForCronAccess=Clave para la URL para ejecutar tareas Cron
 FileToLaunchCronJobs=Comando para ejecutar tareas Cron
 CronExplainHowToRunUnix=En entornos Unix se debe utilizar la siguiente entrada crontab para ejecutar el comando cada 5 minutos
 CronExplainHowToRunWin=En entornos Microsoft (tm) Windows, puede utilizar las herramienta  tareas programadas para ejecutar el comando cada 5 minutos
 CronMethodDoesNotExists=La clase %s no contiene ningún método %s
+CronMethodNotAllowed=El método %s de la clase %s está en la lista negra de métodos prohibidos
 CronJobDefDesc=Los perfiles de trabajo de Cron se definen en el archivo descriptor del módulo. Cuando el módulo está activado, se cargan y están disponibles para que pueda administrar los trabajos desde el menú de herramientas de administración %s.
 CronJobProfiles=Lista de perfiles de trabajos cron predefinidos
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Número de ejecuciones
 CronMaxRun=Número máximo ejecuciones
 CronEach=Toda(s)
 JobFinished=Tareas lanzadas y finalizadas
+Scheduled=Programado
 #Page card
 CronAdd= Tarea Nueva
 CronEvery=Ejecutar la tarea cada
@@ -56,7 +58,7 @@ CronNote=Comentario
 CronFieldMandatory=campos %s son obligatorios
 CronErrEndDateStartDt=La fecha de finalizacion no puede ser anterior a la fecha de inicio
 StatusAtInstall=Estado en la instalación del módulo
-CronStatusActiveBtn=Activo
+CronStatusActiveBtn=Calendario
 CronStatusInactiveBtn=Inactivo
 CronTaskInactive=Esta tarea esta inactiva
 CronId=Id
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=Copia local de la base de datos
 MakeLocalDatabaseDump=Crear una copia local de la base de datos. Los parámetros son: compresión ('gz' o 'bz' o 'ninguno'), tipo de copia de seguridad ('mysql' o 'pgsql'), 1, 'auto' o nombre de archivo para construir, nº de archivos de copia de seguridad a mantener
 WarningCronDelayed=Atención: para mejorar el rendimiento, cualquiera que sea la próxima fecha de ejecución de las tareas activas, sus tareas pueden retrasarse un máximo de %s horas antes de ejecutarse
 DATAPOLICYJob=Limpiador de datos y anonimizador
+JobXMustBeEnabled=El trabajo %s debe estar habilitado
+# Cron Boxes
+LastExecutedScheduledJob=Último trabajo programado ejecutado
+NextScheduledJobExecute=Siguiente trabajo programado para ejecutar
+NumberScheduledJobError=Número de trabajos programados con error
diff --git a/htdocs/langs/es_ES/deliveries.lang b/htdocs/langs/es_ES/deliveries.lang
index 3bd711bdeea..d4ebc8747db 100644
--- a/htdocs/langs/es_ES/deliveries.lang
+++ b/htdocs/langs/es_ES/deliveries.lang
@@ -27,5 +27,6 @@ Recipient=Destinatario
 ErrorStockIsNotEnough=No hay suficiente stock
 Shippable=Enviable
 NonShippable=No enviable
+ShowShippableStatus=Mostrar estado de envío
 ShowReceiving=Mostrar nota de recepción
 NonExistentOrder=Pedido inexistente
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index 2bc9c1698ef..44801df91fb 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Sin errores,  es válido
 # Errors
 ErrorButCommitIsDone=Errores encontrados, pero es válido a pesar de todo
 ErrorBadEMail=E-mail %s incorrecto
+ErrorBadMXDomain=El correo electrónico %s parece incorrecto (el dominio no tiene un registro MX válido)
 ErrorBadUrl=Url %s inválida
 ErrorBadValueForParamNotAString=Valor incorrecto para su parámetro. Generalmente aparece cuando no existe traducción.
+ErrorRefAlreadyExists=La referencia <b>%s</b> ya existe.
 ErrorLoginAlreadyExists=El login %s ya existe.
 ErrorGroupAlreadyExists=El grupo %s ya existe.
 ErrorRecordNotFound=Registro no encontrado
@@ -36,7 +38,7 @@ ErrorBadSupplierCodeSyntax=La sintaxis del código proveedor es incorrecta
 ErrorSupplierCodeRequired=Código proveedor obligatorio
 ErrorSupplierCodeAlreadyUsed=Código de proveedor ya utilizado
 ErrorBadParameters=Parámetros incorrectos
-ErrorWrongParameters=Wrong or missing parameters
+ErrorWrongParameters=Parámetros inválidos o faltantes
 ErrorBadValueForParameter=valor '%s' incorrecto para el parámetro '%s'
 ErrorBadImageFormat=El archivo de imagen es de un formato no soportado (Su PHP no soporta las funciones de conversión de este formato de imagen)
 ErrorBadDateFormat=El valor '%s' tiene un formato de fecha no reconocido
@@ -48,6 +50,7 @@ ErrorFieldsRequired=No se indicaron algunos campos obligatorios
 ErrorSubjectIsRequired=El asunto del e-mail es obligatorio
 ErrorFailedToCreateDir=Error en la creación de un directorio. Compruebe que el usuario del servidor Web tiene derechos de escritura en los directorios de documentos de Dolibarr. Si el  parámetro <b>safe_mode</b> está activo en este PHP, Compruebe que los archivos php Dolibarr pertenecen al usuario del servidor Web.
 ErrorNoMailDefinedForThisUser=E-Mail no definido para este usuario
+ErrorSetupOfEmailsNotComplete=La configuración de los correos electrónicos no está completa
 ErrorFeatureNeedJavascript=Esta funcionalidad precisa de javascript activo para funcionar. Modifique en configuración->entorno.
 ErrorTopMenuMustHaveAParentWithId0=Un menú del tipo 'Superior' no puede tener un menú padre. Ponga 0 en el ID padre o busque un menú del tipo 'Izquierdo'
 ErrorLeftMenuMustHaveAParentId=Un menú del tipo 'Izquierdo' debe de tener un ID de padre
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=El nombre de este perfil ya existe para este conjunto
 ErrorLDAPSetupNotComplete=La configuración Dolibarr-LDAP es incompleta.
 ErrorLDAPMakeManualTest=Se ha creado unn archivo .ldif en el directorio %s. Trate de cargar manualmente este archivo desde la línea de comandos para obtener más detalles acerca del error.
 ErrorCantSaveADoneUserWithZeroPercentage=No se puede cambiar una acción al estado no comenzada si tiene un usuario realizante de  la acción.
-ErrorRefAlreadyExists=La referencia utilizada para la creación ya existe
+ErrorRefAlreadyExists=La referencia <b>%s</b> ya existe.
 ErrorPleaseTypeBankTransactionReportName=Por favor escriba el nombre del extracto bancario donde se informa del registro (Formato AAAAMM o AAAAMMDD)
 ErrorRecordHasChildren=No se puede eliminar el registro porque tiene registros hijos.
 ErrorRecordHasAtLeastOneChildOfType=El objeto tiene al menos un hijo del tipo %s
@@ -120,7 +123,7 @@ ErrorLoginHasNoEmail=Este usuario no tiene e-mail. Imposible continuar.
 ErrorBadValueForCode=Valor incorrecto para el código. Vuelva a intentar con un nuevo valor...
 ErrorBothFieldCantBeNegative=Los campos %s y %s no pueden ser negativos
 ErrorFieldCantBeNegativeOnInvoice=El campo <strong>%s</strong> no puede ser negativo en este tipo de factura. Si necesita agregar una línea de descuento, simplemente cree el descuento primero (desde el campo '%s' en la ficha de terceros) y aplíquelo a la factura.
-ErrorLinesCantBeNegativeForOneVATRate=Total of lines (net of tax) can't be negative for a given not null VAT rate (Found a negative total for VAT rate <b>%s</b>%%).
+ErrorLinesCantBeNegativeForOneVATRate=El total de líneas (neto de impuestos) no puede ser negativo para un IVA no nulo (se encontró un total negativo para el IVA <b> %s </b> %%).
 ErrorLinesCantBeNegativeOnDeposits=Las líneas no pueden ser negativas en un depósito. Si lo hace, tendrá problemas para consumir el depósito en la factura final.
 ErrorQtyForCustomerInvoiceCantBeNegative=Las cantidades en las líneas de facturas a clientes no pueden ser negativas
 ErrorWebServerUserHasNotPermission=La cuenta de ejecución del servidor web <b>%s</b> no dispone de los permisos para esto
@@ -136,8 +139,8 @@ ErrorNewValueCantMatchOldValue=El nuevo valor no puede ser igual al antiguo
 ErrorFailedToValidatePasswordReset=No se ha podido restablecer la contraseña. Es posible que este enlace ya se haya utilizado (este enlace sólo puede usarse una vez). Si no es el caso, trate de reiniciar el proceso de restablecimiento de contraseña desde el principio.
 ErrorToConnectToMysqlCheckInstance=Error de conexión con la base de datos. Compruebe que el servidor de base de datos está en marcha (por ejemplo, con mysql/maríadb, pudes lanzarlo con la línea de comando 'sudo service mysql start').
 ErrorFailedToAddContact=Error en la adición del contacto
-ErrorDateMustBeBeforeToday=The date must be lower than today
-ErrorDateMustBeInFuture=The date must be greater than today
+ErrorDateMustBeBeforeToday=La fecha debe ser anterior a la de hoy
+ErrorDateMustBeInFuture=La fecha debe ser posterior a hoy
 ErrorPaymentModeDefinedToWithoutSetup=Se ha establecido el modo de pago al tipo %s pero en la configuración del módulo de facturas no se ha indicado la información para mostrar de este modo de pago.
 ErrorPHPNeedModule=Error, su PHP debe tener instalado el módulo <b>%s</b> para usar esta funcionalidad.
 ErrorOpenIDSetupNotComplete=Ha configurado Dolibarr para aceptar la autentificación OpenID, pero la URL del servicio OpenID no se encuentra definida en la constante %s
@@ -185,7 +188,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Definición incorrecta de la mat
 ErrorSavingChanges=Ha ocurrido un error al guardar los cambios
 ErrorWarehouseRequiredIntoShipmentLine=El almacén es obligatorio en la línea a enviar
 ErrorFileMustHaveFormat=El archivo debe tener el formato %s
-ErrorFilenameCantStartWithDot=Filename can't start with a '.'
+ErrorFilenameCantStartWithDot=El nombre de archivo no puede comenzar con '.'
 ErrorSupplierCountryIsNotDefined=El país de este proveedor no está definido, corríjalo en su ficha
 ErrorsThirdpartyMerge=No se han podido fusionar los dos registros. Petición cancelada. 
 ErrorStockIsNotEnoughToAddProductOnOrder=No hay stock suficiente del producto %s para añadirlo a un nuevo pedido.
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Debe elegir si el artículo es un
 ErrorDiscountLargerThanRemainToPaySplitItBefore=El descuento que usted intenta aplicar es más grande que el resto a pagar. Divida el descuento en 2 descuentos más pequeños antes.
 ErrorFileNotFoundWithSharedLink=Archivo no encontrado. Puede ser que la clave compartida se haya modificado o que el archivo se haya eliminado recientemente.
 ErrorProductBarCodeAlreadyExists=El código de barras del producto %s ya existe en otra referencia de producto.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Tenga en cuenta también que no es posible utilizar productos virtuales para aumentar/disminuir automáticamente subproductos cuando al menos un subproducto (o subproducto de subproductos) necesita un número de serie/lote.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Tenga en cuenta también que el uso de kits para aumentar / disminuir automáticamente los subproductos no es posible cuando al menos un subproducto (o subproducto de subproductos) necesita un número de serie / lote.
 ErrorDescRequiredForFreeProductLines=La descripción es obligatoria para las líneas libres
 ErrorAPageWithThisNameOrAliasAlreadyExists=La página/contenedor <strong>%s</strong> tiene el mismo nombre o alias alternativo que el que intenta utilizar
 ErrorDuringChartLoad=Error al cargar plan contable. Si no se cargaron algunas cuentas, aún puede introducirlas manualmente.
@@ -240,9 +243,19 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No hay suficiente cantidad
 ErrorOnlyOneFieldForGroupByIsPossible=Solo es posible un campo para 'Agrupar por' (otros se descartan)
 ErrorTooManyDifferentValueForSelectedGroupBy=Se encontraron demasiados valores diferentes (más de <b>%s</b>) para el campo '<b>%s</b>', así que no podemos usarlo como 'Agrupar por' para gráficos. El campo 'Agrupar por' ha sido eliminado. ¿Puede ser que quieras usarlo como un eje X?
 ErrorReplaceStringEmpty=Error, la cadena para reemplazar está vacía
-ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
-ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
-ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorProductNeedBatchNumber=Error, el producto '<b> %s </b>' necesita un lote/número de serie
+ErrorProductDoesNotNeedBatchNumber=Error, el producto '<b> %s </b>' no acepta un número de serie/lote
+ErrorFailedToReadObject=Error, no se pudo leer el objeto de tipo <b> %s </b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, el parámetro <b> %s </b> debe estar habilitado en <b> conf / conf.php <b> para permitir el uso de la interfaz de línea de comandos por parte del programador de trabajos interno
+ErrorLoginDateValidity=Error, este inicio de sesión está fuera del rango de fechas de validez
+ErrorValueLength=Longitud del campo '<b>%s</b>' debe ser superior a '<b>%s</b>'
+ErrorReservedKeyword=La palabra '<b>%s</b>' es una palabra reservada
+ErrorNotAvailableWithThisDistribution=No disponible con esta distribución
+ErrorPublicInterfaceNotEnabled=La interfaz pública no estaba habilitada
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=El idioma de la nueva página debe definirse si se establece como una traducción de otra página.
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=El idioma de la nueva página no debe ser el idioma de origen si está configurado como traducción de otra página.
+ErrorAParameterIsRequiredForThisOperation=Un parámetro es obligatorio para esta operación.
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=El parámetro PHP upload_max_filesize (%s) es más alto que el parámetro PHP post_max_size (%s). Esta no es una configuración consistente.
 WarningPasswordSetWithNoAccount=Se fijó una contraseña para este miembro. Sin embargo, no se ha creado ninguna cuenta de usuario. Así que esta contraseña no se puede utilizar para acceder a Dolibarr. Puede ser utilizada por un módulo/interfaz externo, pero si no necesitar definir accesos de un miembro, puede desactivar la opción "Administrar un inicio de sesión para cada miembro" en la configuración del módulo miembros. Si necesita administrar un inicio de sesión, pero no necesita ninguna contraseña, puede dejar este campo vacío para evitar esta advertencia. Nota: También puede usarse el correo electrónico como inicio de sesión si el miembro está vinculada a un usuario.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Su cuenta de acceso ha sido modificada. P
 WarningAnEntryAlreadyExistForTransKey=Ya existe una entrada para la clave de traducción para este idioma
 WarningNumberOfRecipientIsRestrictedInMassAction=Atención, el número de destinatarios diferentes está limitado a <b>%s</b>cuando se usan las acciones masivas en las listas
 WarningDateOfLineMustBeInExpenseReportRange=Advertencia, la fecha de la línea no está en el rango del informe de gastos
+WarningProjectDraft=El proyecto todavía está en modo borrador. No olvide validarlo si planea usar tareas.
 WarningProjectClosed=El proyecto está cerrado. Debe volver a abrirlo primero.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Algunas transacciones bancarias se eliminaron después de que se generó el recibo. Por lo tanto, el número de cheques y el total del recibo pueden diferir del número y el total en el listado.
-WarningFailedToAddFileIntoDatabaseIndex=Atención, no se pudo agregar la entrada del archivo en la tabla de índice de la base de datos ECM
+WarningFailedToAddFileIntoDatabaseIndex=Advertencia, no se pudo agregar la entrada de archivo en la tabla de índice de la base de datos de ECM
+WarningTheHiddenOptionIsOn=Advertencia, la opción oculta <b> %s </b> está activada.
+WarningCreateSubAccounts=Advertencia, no puede crear directamente una subcuenta, debe crear un tercero o un usuario y asignarles un código de contabilidad para encontrarlos en esta lista.
+WarningAvailableOnlyForHTTPSServers=Disponible solo si usa una conexión segura HTTPS.
diff --git a/htdocs/langs/es_ES/exports.lang b/htdocs/langs/es_ES/exports.lang
index 056236382aa..9a0e7decd49 100644
--- a/htdocs/langs/es_ES/exports.lang
+++ b/htdocs/langs/es_ES/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Clave (columna) a usar para <b>actualizar</b> datos existent
 NbInsert=Número de líneas añadidas: %s
 NbUpdate=Número de líneas actualizadas: %s
 MultipleRecordFoundWithTheseFilters=Se han encontrado varios registros con estos filtros: %s
+StocksWithBatch=Existencias y ubicación (almacén) de productos con número de lote / serie
diff --git a/htdocs/langs/es_ES/intracommreport.lang b/htdocs/langs/es_ES/intracommreport.lang
index 6931efda553..fe40fe3e14d 100644
--- a/htdocs/langs/es_ES/intracommreport.lang
+++ b/htdocs/langs/es_ES/intracommreport.lang
@@ -32,7 +32,7 @@ IntracommReportTitle=Preparación de un archivo XML en formato ProDouane
 # List
 IntracommReportList=Lista de declaraciones generadas
 IntracommReportNumber=Número de declaración
-IntracommReportPeriod=Período de análisis
+IntracommReportPeriod=Periodo de análisis
 IntracommReportTypeDeclaration=Tipo de declaración
 IntracommReportDownload=descargar archivo XML
 
diff --git a/htdocs/langs/es_ES/languages.lang b/htdocs/langs/es_ES/languages.lang
index d8a30708395..2bfc571a284 100644
--- a/htdocs/langs/es_ES/languages.lang
+++ b/htdocs/langs/es_ES/languages.lang
@@ -40,7 +40,7 @@ Language_es_PA=Español (Panamá)
 Language_es_PY=Español (Paraguay)
 Language_es_PE=Español (Perú)
 Language_es_PR=Español (Puerto Rico)
-Language_es_US=Spanish (USA)
+Language_es_US=Español (EE. UU.)
 Language_es_UY=Español (Uruguay)
 Language_es_GT=Español (Guatemala)
 Language_es_VE=Español (Venezuela)
diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang
index 947cb08fdef..72cba6b3d41 100644
--- a/htdocs/langs/es_ES/mails.lang
+++ b/htdocs/langs/es_ES/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=E-mails enviados por usuario
 MailingModuleDescDolibarrUsers=Usuarios con e-mails
 MailingModuleDescThirdPartiesByCategories=Terceros (por categoría)
 SendingFromWebInterfaceIsNotAllowed=El envío desde la interfaz web no está permitido.
+EmailCollectorFilterDesc=Todos los filtros deben coincidir para que se recopile un correo electrónico
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Línea %s en archivo
@@ -125,12 +126,13 @@ TagMailtoEmail=Email del destinatario (incluyendo el enlace html "mailto:")
 NoEmailSentBadSenderOrRecipientEmail=No se ha enviado el e-mail. El remitente o destinatario es incorrecto. Compruebe los datos del usuario.
 # Module Notifications
 Notifications=Notificaciones
-NoNotificationsWillBeSent=Ninguna notificación por e-mail está prevista para este evento y empresa
-ANotificationsWillBeSent=1 notificación va a ser enviada por e-mail
-SomeNotificationsWillBeSent=%s notificaciones van a ser enviadas por e-mail
-AddNewNotification=Activar un nuevo destinatario de notificaciones
-ListOfActiveNotifications=Listado de destinatarios activos para notifiaciones por e-mail
-ListOfNotificationsDone=Listado de notificaciones enviadas
+NotificationsAuto=Notificaciones automáticas.
+NoNotificationsWillBeSent=No se planean notificaciones automáticas por correo electrónico para este tipo de evento y empresa.
+ANotificationsWillBeSent=Se enviará 1 notificación automática por correo electrónico
+SomeNotificationsWillBeSent=%s se enviarán notificaciones automáticas por correo electrónico
+AddNewNotification=Suscríbase a una nueva notificación automática por correo electrónico (destinatario/evento)
+ListOfActiveNotifications=Lista de todas las suscripciones activas (destinatarios/eventos) para la notificación automática por correo electrónico
+ListOfNotificationsDone=Lista de todas las notificaciones automáticas enviadas por correo electrónico
 MailSendSetupIs=La configuración de e-mailings está a '%s'. Este modo no puede ser usado para enviar e-mails masivos.
 MailSendSetupIs2=Antes debe, con una cuenta de administrador, en el menú %sInicio - Configuración - E-Mails%s, cambiar el parámetro <strong>'%s'</strong> para usar el modo '%s'. Con este modo puede configurar un servidor SMTP de su proveedor de servicios de internet.
 MailSendSetupIs3=Si tiene preguntas de como configurar su servidor SMTP, puede contactar con %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Los ficheros importados deben tener el formato <stron
 UseFormatInputEmailToTarget=Entra una cadena con el formato <strong>email;nombre;apellido;otros</strong>
 MailAdvTargetRecipients=Destinatarios (selección avanzada)
 AdvTgtTitle=Rellene los campos para preseleccionar los terceros o contactos/direcciones a enviar
-AdvTgtSearchTextHelp=Use %% como comodín. Por ejemplo para encontrar todos los elementos como <b>juan, jose,jorge</b>, puede indicar <b>j%%</b>, también puede usar ; como separador de valor y usar ! para omitir el valor. Por ejemplo <b>juan;jose;jor%%!jimo;!jima%</b> hará como destinatarios todos los juan, jose, los que empiecen por jor pero no jimo o jima.
+AdvTgtSearchTextHelp=Utilice %% como comodines. Por ejemplo, para encontrar todos los elementos como <b> jean, joe, jim </b>, puede ingresar <b> j%% </b>, también puede usar; como separador de valor y uso! para excepto este valor. Por ejemplo, <b> jean; joe; jim%%;! Jimo;! Jima%% </b> apuntará a todos jean, joe, comience con jim pero no jimo y no todo lo que comience con jima
 AdvTgtSearchIntHelp=Use un intervaldo para seleccionar valor int o float
 AdvTgtMinVal=Valor mínimo
 AdvTgtMaxVal=Valor máxio
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Crear filtro
 AdvTgtOrCreateNewFilter=Nombre del nuevo filtro
 NoContactWithCategoryFound=No se han encontrado contactos/direcciones con alguna categoría
 NoContactLinkedToThirdpartieWithCategoryFound=No se han encontrado contactos/direcciones con alguna categoría
-OutGoingEmailSetup=Configuración del correo saliente
-InGoingEmailSetup=Configuración del correo entrante
-OutGoingEmailSetupForEmailing=Configuración del correo electrónico saliente (para el módulo %s)
-DefaultOutgoingEmailSetup=Configuración de correo saliente predeterminada
+OutGoingEmailSetup=Correos electrónicos salientes
+InGoingEmailSetup=Correos electrónicos entrantes
+OutGoingEmailSetupForEmailing=Correos electrónicos salientes (para el módulo %s)
+DefaultOutgoingEmailSetup=Misma configuración que la configuración global de correo electrónico saliente
 Information=Información
 ContactsWithThirdpartyFilter=Contactos con filtro de terceros.
-Unanswered=Unanswered
+Unanswered=Sin respuesta
 Answered=Contestado
-IsNotAnAnswer=Is not answer (initial email)
-IsAnAnswer=Is an answer of an initial email
+IsNotAnAnswer=No responde (e-mail inicial)
+IsAnAnswer=Es una respuesta de un e-mail inicial.
+RecordCreatedByEmailCollector=Registro creado por el Recopilador de Correo Electrónico %s del correo electrónico %s
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index e60664f5d0f..4270fb44a93 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Sin plantilla definida para este tipo de e-mail
 AvailableVariables=Variables de substitución disponibles
 NoTranslation=Sin traducción
 Translation=Traducción
+CurrentTimeZone=Zona horaria PHP (Servidor)
 EmptySearchString=Ingrese una cadena de búsqueda no vacía
+EnterADateCriteria=Ingrese un criterio de fecha
 NoRecordFound=No se han encontrado registros
 NoRecordDeleted=No se ha eliminado el registro
 NotEnoughDataYet=No hay suficientes datos
@@ -85,6 +87,8 @@ FileWasNotUploaded=Un archivo ha sido seleccionado para adjuntarlo, pero aún no
 NbOfEntries=Nº de entradas
 GoToWikiHelpPage=Leer la ayuda en línea (es necesario acceso a Internet )
 GoToHelpPage=Consultar la ayuda
+DedicatedPageAvailable=Hay una página de ayuda dedicada relacionada con su pantalla actual
+HomePage=Página de inicio
 RecordSaved=Registro guardado
 RecordDeleted=Registro eliminado
 RecordGenerated=Registro generado
@@ -197,7 +201,7 @@ ReOpen=Reabrir
 Upload=Enviar archivo
 ToLink=Enlace
 Select=Seleccionar
-SelectAll=Select all
+SelectAll=Seleccionar todo
 Choose=Elegir
 Resize=Redimensionar
 ResizeOrCrop=Cambiar el tamaño o cortar
@@ -258,7 +262,7 @@ Cards=Fichas
 Card=Ficha
 Now=Ahora
 HourStart=Hora de inicio
-Deadline=Deadline
+Deadline=Fecha límite
 Date=Fecha
 DateAndHour=Fecha y hora
 DateToday=Fecha de hoy
@@ -267,10 +271,10 @@ DateStart=Fecha de inicio
 DateEnd=Fecha de fin
 DateCreation=Fecha de creación
 DateCreationShort=Fecha creación
-IPCreation=Creation IP
+IPCreation=IP de creación
 DateModification=Fecha de modificación
 DateModificationShort=Fecha modif.
-IPModification=Modification IP
+IPModification=IP de modificación
 DateLastModification=Última fecha de modificación
 DateValidation=Fecha de validación
 DateClosing=Fecha de cierre
@@ -433,6 +437,7 @@ RemainToPay=Queda por pagar
 Module=Módulo
 Modules=Módulos
 Option=Opción
+Filters=Filtros
 List=Listado
 FullList=Listado completo
 FullConversation=Conversación completa
@@ -671,7 +676,7 @@ SendMail=Enviar e-mail
 Email=Correo
 NoEMail=Sin e-mail
 AlreadyRead=Ya leído
-NotRead=No lleído
+NotRead=No leído
 NoMobilePhone=Sin teléfono móvil
 Owner=Propietario
 FollowingConstantsWillBeSubstituted=Las siguientes constantes serán substituidas por su valor correspondiente.
@@ -1106,4 +1111,9 @@ SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=El token de seguridad
 UpToDate=A hoy
 OutOfDate=Fuera de plazo
 EventReminder=Recordatorio evento
-UpdateForAllLines=Update for all lines
+UpdateForAllLines=Actualización para todas las líneas
+OnHold=En espera
+AffectTag=Afectar etiqueta
+ConfirmAffectTag=Afectar etiquetas masivas
+ConfirmAffectTagQuestion=¿Está seguro de que desea afectar las etiquetas a los %s registros seleccionados?
+CategTypeNotFound=No se encontró ningún tipo de etiqueta para el tipo de registros
diff --git a/htdocs/langs/es_ES/modulebuilder.lang b/htdocs/langs/es_ES/modulebuilder.lang
index a2a857957a9..c04311b0c80 100644
--- a/htdocs/langs/es_ES/modulebuilder.lang
+++ b/htdocs/langs/es_ES/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=Página PHP para crear/editar/ver un registro
 PageForAgendaTab=Página de PHP para la pestaña de eventos
 PageForDocumentTab=Página de PHP para la pestaña de documento
 PageForNoteTab=Página de PHP para la pestaña de notas
+PageForContactTab=Página PHP para la pestaña de contacto
 PathToModulePackage=Ruta al zip del módulo/aplicación
 PathToModuleDocumentation=Ruta a la documentación del módulo/aplicación (%s)
 SpaceOrSpecialCharAreNotAllowed=Espacios o caracteres especiales no son permitidos.
@@ -77,7 +78,7 @@ IsAMeasure=Es una medida
 DirScanned=Directorio analizado
 NoTrigger=No hay trigger
 NoWidget=No hay widget
-GoToApiExplorer=Ir al Explorador de API
+GoToApiExplorer=Explorador de API
 ListOfMenusEntries=Lista de entradas de menú
 ListOfDictionariesEntries=Listado de entradas de diccionarios
 ListOfPermissionsDefined=Listado de permisos definidos
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Si tiene conocimientos de SQL y PHP, puede usar el asis
 SeeTopRightMenu=Ver <span class="fa fa-bug"></span> en el menú superior derecho
 AddLanguageFile=Añadir archivo de idioma
 YouCanUseTranslationKey=Aquí puede usar una clave que es la clave de traducción encontrada en el archivo de idioma (ver pestaña "Idiomas")
-DropTableIfEmpty=(Eliminar tabla si está vacía)
+DropTableIfEmpty=(Destruya la tabla si está vacía)
 TableDoesNotExists=La tabla %s no existe
 TableDropped=Tabla %s eliminada
 InitStructureFromExistingTable=Construir la estructura de array de una tabla existente
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Usar un editor específico URL
 UseSpecificFamily = Usar una familia específica
 UseSpecificAuthor = Usar un autor especifico
 UseSpecificVersion = Usar una versión inicial específica
-ModuleMustBeEnabled=El módulo debe ser activado primero
 IncludeRefGeneration=La referencia del objeto debe generarse automáticamente
 IncludeRefGenerationHelp=Marque esto si desea incluir código para gestionar la generación automática de la referencia
 IncludeDocGeneration=Quiero generar algunos documentos del objeto.
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Tipo de campos: <br> varchar(99), double(24,8), real, text, htm
 AsciiToHtmlConverter=Conversor de ASCII a HTML
 AsciiToPdfConverter=Conversor de ASCII a PDF
 TableNotEmptyDropCanceled=La tabla no está vacía. La eliminación ha sido cancelada.
+ModuleBuilderNotAllowed=El constructor de módulos está disponible pero no permitido para su usuario.
diff --git a/htdocs/langs/es_ES/mrp.lang b/htdocs/langs/es_ES/mrp.lang
index 34538f681bb..26c76201145 100644
--- a/htdocs/langs/es_ES/mrp.lang
+++ b/htdocs/langs/es_ES/mrp.lang
@@ -77,4 +77,4 @@ UnitCost=Costo unitario
 TotalCost=Coste total
 BOMTotalCost=El costo para producir esta Lista de Materiales en función del costo de cada cantidad y producto a consumir (use el precio de costo si está definido, de lo contrario, el precio promedio ponderado si está definido, o el mejor precio de compra)
 GoOnTabProductionToProduceFirst=Primero debe haber iniciado la producción para cerrar una orden de fabricación (consulte la pestaña '%s'). Pero puedes cancelarlo.
-ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Un kit no se puede usar en una Lista de Materiales (BOM) o una Orden de Fabricación (MO)
diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
index dcaaa909282..d3ac9bf9d1d 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -5,8 +5,6 @@ Tools=Utilidades
 TMenuTools=Utilidades
 ToolsDesc=Todas las utilidades que no están incluidas en otras entradas del menú se encuentran aquí.<br>Están disponibles en el menú de la izquierda.
 Birthday=Aniversario
-BirthdayDate=Fecha de cumpleaños
-DateToBirth=Fecha de nacimiento
 BirthdayAlertOn=alerta aniversario activada
 BirthdayAlertOff=alerta aniversario desactivada
 TransKey=Traducción de la clave TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Mes anterior (texto) de la fecha de la factura
 TextPreviousMonthOfInvoice=Mes anterior (texto) de la fecha de la factura
 NextMonthOfInvoice=Mes siguiente (número 1-12) de la fecha de la factura
 TextNextMonthOfInvoice=Mes siguiente (texto) de la fecha de la factura
+PreviousMonth=Mes anterior
+CurrentMonth=Mes actual
 ZipFileGeneratedInto=Archivo zip generado en <b>%s</b>.
 DocFileGeneratedInto=Fichero documentación generado en <b>%s</b>.
 JumpToLogin=Desconectado. Ir a la página de inicio de sesión ...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nNos ponemos en contacto con ust
 PredefinedMailContentSendFichInter=__(Hello)__\n\nNos ponemos en contacto con usted para facilitarle la intervención __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Puede hacer clic en el siguiente enlace para realizar su pago, si aún no lo ha hecho.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hola)__\n\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Recordatorio de evento "__EVENT_LABEL__" el __EVENT_DATE__ a las __EVENT_TIME__ <br> <br> Este es un mensaje automático, no responda.
 DemoDesc=Dolibarr es un ERP/CRM para la gestión de negocios (profesionales o asociaciones), compuesto de módulos funcionales independientes y opcionales. Una demostración que incluya todos estos módulos no tiene sentido porque no utilizará todos los módulos. Además, tiene disponibles varios tipos de perfiles de demostración.
 ChooseYourDemoProfil=Elija el perfil de demostración que mejor se adapte a sus necesidades ...
 ChooseYourDemoProfilMore=... o construya su perfil<br>(modo de selección manual)
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contacto/dirección creada por el recolector de e
 ProjectCreatedByEmailCollector=Proyecto creado por el recolector de e-mails del MSGID de e-mail %s
 TicketCreatedByEmailCollector=Ticket creado por el recolector de e-mails del MSGID de e-mail %s
 OpeningHoursFormatDesc=Use un - para separar las horas de apertura y cierre. <br> Use un espacio para ingresar diferentes rangos. <br> Ejemplo: 8-12 14-18
+PrefixSession=Prefijo para ID de sesión
 
 ##### Export #####
 ExportsArea=Área de exportaciones
@@ -278,9 +280,9 @@ LinesToImport=Líneas a importar
 
 MemoryUsage=Uso de memoria
 RequestDuration=Duración de la solicitud
-ProductsPerPopularity=Products/Services by popularity
+ProductsPerPopularity=Productos/Servicios por popularidad
 PopuProp=Productos/Servicios por popularidad en Presupuestos
 PopuCom=Productos/Servicios por popularidad en Pedidos
 ProductStatistics=Estadísticas de productos/servicios
 NbOfQtyInOrders=Cantidad en pedidos
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Seleccione el tipo de objeto a analizar...
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index 340ead2edf3..8ad0604428e 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Complete con las fechas de la última línea de servici
 MultiPricesAbility=Varios segmentos de precios por producto/servicio (cada cliente está en un segmento)
 MultiPricesNumPrices=Nº de precios
 DefaultPriceType=Base de precios por defecto (con versus sin impuestos) al agregar nuevos precios de venta
-AssociatedProductsAbility=Activar kits (productos virtuales)
+AssociatedProductsAbility=Habilitar kits (conjunto de otros productos)
+VariantsAbility=Habilitar variantes (variaciones de productos, por ejemplo, color, tamaño)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Número de productos que componen este kit
 ParentProductsNumber=Nº de productos que este producto compone
@@ -167,8 +168,10 @@ BuyingPrices=Precios de compra
 CustomerPrices=Precios a clientes
 SuppliersPrices=Precios de proveedores
 SuppliersPricesOfProductsOrServices=Precios de proveedores (productos o servicios)
-CustomCode=Código aduanero
+CustomCode=Aduanas | Producto | Código HS
 CountryOrigin=País de origen
+RegionStateOrigin=Región de origen
+StateOrigin=Estado | Provincia de origen
 Nature=Naturaleza del producto (materia prima/producto acabado)
 NatureOfProductShort=Naturaleza del producto
 NatureOfProductDesc=Materia prima o producto terminado
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Usar el precio fijado
 PriceByQuantity=Precios diferentes por cantidad
 DisablePriceByQty=Desactivar precios por cantidad
 PriceByQuantityRange=Rango cantidad
-MultipriceRules=Reglas para segmento de precios
+MultipriceRules=Precios automáticos por segmento
 UseMultipriceRules=Use las reglas de segmentación de precios (definidas en la configuración de módulo de productos) para autocalcular los precios de todos los demás segmentos de acuerdo con el primer segmento
 PercentVariationOver=%% variación sobre %s
 PercentDiscountOver=%% descuento sobre %s
diff --git a/htdocs/langs/es_ES/recruitment.lang b/htdocs/langs/es_ES/recruitment.lang
index e542b1ec190..26cacddf8cc 100644
--- a/htdocs/langs/es_ES/recruitment.lang
+++ b/htdocs/langs/es_ES/recruitment.lang
@@ -71,5 +71,6 @@ YourCandidature=Su aplicación
 YourCandidatureAnswerMessage=Gracias por su aplicación. <br> ...
 JobClosedTextCandidateFound=El puesto de trabajo esta cerrado. El puesto ha sido ocupado.
 JobClosedTextCanceled=El puesto de trabajo esta cerrado
-ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsJobPosition=Campos adicionales (puestos de trabajo)
+ExtrafieldsCandidatures=Campos adicionales (solicitudes de empleo)
+MakeOffer=Realizar un presupuesto
diff --git a/htdocs/langs/es_ES/sendings.lang b/htdocs/langs/es_ES/sendings.lang
index 92f5556b279..f531fbacb46 100644
--- a/htdocs/langs/es_ES/sendings.lang
+++ b/htdocs/langs/es_ES/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Otros envíos de este pedido
 SendingsAndReceivingForSameOrder=Envíos y recepciones de este pedido
 SendingsToValidate=Envíos a validar
 StatusSendingCanceled=Anulado
+StatusSendingCanceledShort=Anulado
 StatusSendingDraft=Borrador
 StatusSendingValidated=Validado (productos a enviar o enviados)
 StatusSendingProcessed=Procesado
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Antes de poder realizar envíos debe validar el
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Modelo completo de nota de entrega / recepción (logo...)
+DocumentModelStorm=Modelo de documento más completo para recibos de entrega y compatibilidad de campos extra (logotipo ...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constante EXPEDITION_ADDON_NUMBER no definida
 SumOfProductVolumes=Suma del volumen de los productos
 SumOfProductWeights=Suma del peso de los productos
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index 75b1e30418d..970960da78c 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=ID movimiento %d
 ListMouvementStockProject=Listado de movimientos de stock asociados al proyecto
 StocksArea=Área almacenes
 AllWarehouses=Todos los almacenes
-IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
+IncludeEmptyDesiredStock=Incluir también stock negativo con stock deseado indefinido
 IncludeAlsoDraftOrders=Incluir también pedidos borrador
 Location=Lugar
 LocationSummary=Nombre corto del lugar
@@ -122,9 +122,9 @@ DesiredStockDesc=Esta cantidad será el valor que se utilizará para llenar el s
 StockToBuy=A pedir
 Replenishment=Reaprovisionamiento
 ReplenishmentOrders=Ordenes de reaprovisionamiento
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
-UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
-ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
+VirtualDiffersFromPhysical=Según las opciones de aumento/disminución, el stock físico y virtual (stock físico + pedidos en curso) puede diferir
+UseRealStockByDefault=Usar stock real, en lugar de stock virtual, para la función de reaprovisionamiento
+ReplenishmentCalculation=La cantidad a ordenar será (cantidad deseada - stock real) en lugar de (cantidad deseada - stock virtual)
 UseVirtualStock=Usar stock virtual
 UsePhysicalStock=Usar stock físico
 CurentSelectionMode=Modo de selección actual
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Establezca el valor en 0 para restablecer la cantidad <br>
 UpdateByScaning=Actualizar escaneando
 UpdateByScaningProductBarcode=Actualización por escaneo (código de barras del producto)
 UpdateByScaningLot=Actualización por escaneo (lote | código de barras de serie)
+DisableStockChangeOfSubProduct=Desactive el cambio de stock de todos los subproductos de este Kit durante este movimiento.
diff --git a/htdocs/langs/es_ES/ticket.lang b/htdocs/langs/es_ES/ticket.lang
index ccc27036015..2ff65db0cfc 100644
--- a/htdocs/langs/es_ES/ticket.lang
+++ b/htdocs/langs/es_ES/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Tipo de tickets
 TicketDictCategory=Categorías de tickets
 TicketDictSeverity=Gravedad de los tickets
 TicketDictResolution=Ticket - Resolución
-TicketTypeShortBUGSOFT=Mal funcionamiento del software
-TicketTypeShortBUGHARD=Mal funcionamiento del hardware
-TicketTypeShortCOM=Pregunta comercial
 
+TicketTypeShortCOM=Pregunta comercial
 TicketTypeShortHELP=Solicitud de ayuda funcional
 TicketTypeShortISSUE=Asunto, error o problema
 TicketTypeShortREQUEST=Solicitud de cambio o mejora
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Otro
 TicketSeverityShortLOW=Bajo
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Alto
-TicketSeverityShortBLOCKING=Crítico / Bloqueo
+TicketSeverityShortBLOCKING=Crítico, Bloqueo
 
 ErrorBadEmailAddress=El campo '%s' es incorrecto
 MenuTicketMyAssign=Mis tickets
@@ -60,7 +58,6 @@ OriginEmail=Origen E-Mail
 Notify_TICKET_SENTBYMAIL=Enviar mensaje de ticket por e-mail
 
 # Status
-NotRead=No lleído
 Read=Leido
 Assigned=Asignado
 InProgress=En progreso
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=La interfaz pública permite a cualquier visi
 TicketsAutoAssignTicket=Asignar automáticamente al usuario que creó el ticket
 TicketsAutoAssignTicketHelp=Al crear un ticket, el usuario puede asignarse automáticamente al ticket.
 TicketNumberingModules=Módulo de numeración de tickets
+TicketsModelModule=Plantillas de documentos para tickets
 TicketNotifyTiersAtCreation=Notificar a los terceros en la creación
 TicketsDisableCustomerEmail=Desactivar siempre los e-mails al crear tickets desde la interfaz pública
 TicketsPublicNotificationNewMessage=Enviar e-mail(s) cuando se añade un nuevo mensaje
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Estado cambiado: %s a %s
 TicketNotNotifyTiersAtCreate=No notificar a la compañía al crear
 Unread=No leído
 TicketNotCreatedFromPublicInterface=No disponible. El ticket no se creó desde la interfaz pública.
-PublicInterfaceNotEnabled=La interfaz pública no estaba habilitada
 ErrorTicketRefRequired=La referencia del ticket es obligatoria
 
 #
diff --git a/htdocs/langs/es_ES/website.lang b/htdocs/langs/es_ES/website.lang
index 56cb631183f..7ea28bc2c96 100644
--- a/htdocs/langs/es_ES/website.lang
+++ b/htdocs/langs/es_ES/website.lang
@@ -30,7 +30,6 @@ EditInLine=Editar en línea
 AddWebsite=Añadir sitio web
 Webpage=Página web/Contenedor
 AddPage=Añadir página/contenedor
-HomePage=Página de inicio
 PageContainer=Página
 PreviewOfSiteNotYetAvailable=La vista previa de su sitio web <strong>%s</strong> aún no está disponible. Primero debe '<strong>Importar una plantilla de sitio web completa</strong>' o simplemente '<strong>Agregar una página/contenedor</strong>'.
 RequestedPageHasNoContentYet=La página pedida con id %s todavía no tiene contenido, o cache file.tpl.php ha sido eliminado. Editar el contenido de la página para resolverlo.
@@ -101,7 +100,7 @@ EmptyPage=Página vacía
 ExternalURLMustStartWithHttp=La URL externa debe comenzar con http:// o https://
 ZipOfWebsitePackageToImport=Cargue el archivo Zip del paquete de plantilla del sitio web
 ZipOfWebsitePackageToLoad=o Elija un paquete de plantilla de sitio web incorporado disponible
-ShowSubcontainers=Incluir contenido dinámico
+ShowSubcontainers=Mostrar contenido dinámico
 InternalURLOfPage=URL interna de la página
 ThisPageIsTranslationOf=Esta página/contenedor es traducción de
 ThisPageHasTranslationPages=Esta página/contenedor tiene traducción
@@ -136,4 +135,5 @@ RSSFeed=Hilos RSS
 RSSFeedDesc=Puede obtener una fuente RSS de los últimos artículos con el tipo 'blogpost' usando esta URL
 PagesRegenerated=%s página(s)/contenedor(s) regenerados
 RegenerateWebsiteContent=Regenerar archivos de caché del sitio web
-AllowedInFrames=Allowed in Frames
+AllowedInFrames=Permitido en marcos
+DefineListOfAltLanguagesInWebsiteProperties=Defina la lista de todos los idiomas disponibles en las propiedades del sitio web.
diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang
index b2e4eeb7439..522b85d51d7 100644
--- a/htdocs/langs/es_ES/withdrawals.lang
+++ b/htdocs/langs/es_ES/withdrawals.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Payments by Direct debit orders
-SuppliersStandingOrdersArea=Payments by Credit transfer
+CustomersStandingOrdersArea=Pagos por domiciliación bancaria
+SuppliersStandingOrdersArea=Pagos por transferencia bancaria
 StandingOrdersPayment=Domiciliaciones
 StandingOrderPayment=Domiciliación
 NewStandingOrder=Nueva domiciliación
@@ -11,37 +11,38 @@ PaymentByBankTransferLines=Líneas de orden de transferencia bancaria
 WithdrawalsReceipts=Domiciliaciones
 WithdrawalReceipt=Domiciliación
 BankTransferReceipts=Órdenes de transferencia bancaria
-BankTransferReceipt=Credit transfer order
+BankTransferReceipt=Orden de transferencia bancaria
 LatestBankTransferReceipts=Últimas %s órdenes de transferencia bancaria 
 LastWithdrawalReceipts=Últimas %s domiciliaciones
-WithdrawalsLine=Direct debit order line
-CreditTransferLine=Credit transfer line
+WithdrawalsLine=Línea de  domiciliación bancaria
+CreditTransferLine=Línea de transferencia bancaria
 WithdrawalsLines=Lineas de domiciliación
-CreditTransferLines=Credit transfer lines
-RequestStandingOrderToTreat=Requests for direct debit payment order to process
-RequestStandingOrderTreated=Requests for direct debit payment order processed
-RequestPaymentsByBankTransferToTreat=Requests for credit transfer to process
-RequestPaymentsByBankTransferTreated=Requests for credit transfer processed
+CreditTransferLines=Líneas de transferencia bancaria
+RequestStandingOrderToTreat=Órdenes de domiciliaciones a procesar
+RequestStandingOrderTreated=Órdenes de domiciliaciones procesadas
+RequestPaymentsByBankTransferToTreat=Órdenes de transferencias bancarias a procesar
+RequestPaymentsByBankTransferTreated=Órdenes de transferencias bancarias procesadas
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Todavía no es posible. El estado de la domiciliación debe ser 'abonada' antes de poder realizar devoluciones a sus líneas
 NbOfInvoiceToWithdraw=Nº de facturas pendientes de domiciliación
 NbOfInvoiceToWithdrawWithInfo=Número de facturas en espera de domiciliación para clientes que tienen su número de cuenta definida
 NbOfInvoiceToPayByBankTransfer=Nº de facturas de proveedores pendientes de transferencia bancaria
 SupplierInvoiceWaitingWithdraw=Factura de proveedor pendiente de transferencia bancaria
 InvoiceWaitingWithdraw=Facturas en espera de domiciliación
-InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
+InvoiceWaitingPaymentByBankTransfer=Factura en espera de transferencia bancaria
 AmountToWithdraw=Cantidad a domiciliar
-NoInvoiceToWithdraw=No invoice open for '%s' is waiting. Go on tab '%s' on invoice card to make a request.
+NoInvoiceToWithdraw=No hay niguna factura abierta esperando para '%s' . Vaya a la pestaña '%s'  de la factura para realizar una solicitud.
 NoSupplierInvoiceToWithdraw=No hay ninguna factura de proveedor con 'Solicitudes de crédito directas' pendientes. Vaya a la pestaña '%s' en la pestaña de factura para hacer una solicitud.
 ResponsibleUser=Usuario responsable de las domiciliaciones
 WithdrawalsSetup=Configuración de las domiciliaciones
-CreditTransferSetup=Credit transfer setup
+CreditTransferSetup=Configuración de transferencias bancarias
 WithdrawStatistics=Estadísticas de domiciliaciones
-CreditTransferStatistics=Credit transfer statistics
+CreditTransferStatistics=Estadísticas de transferencias bancarias
 Rejects=Devoluciones
 LastWithdrawalReceipt=Las %s últimas domiciliaciones
 MakeWithdrawRequest=Realizar una petición de domiciliación
-MakeBankTransferOrder=Make a credit transfer request
+MakeBankTransferOrder=Realizar una solicitud de transferencia bancaria
 WithdrawRequestsDone=%s domiciliaciones registradas
+BankTransferRequestsDone=%s solicitudes de transferencia de crédito registradas
 ThirdPartyBankCode=Código banco del tercero
 NoInvoiceCouldBeWithdrawed=No se ha podido realizar la petición de domiciliación de ninguna factura. Compruebe que los terceros de las facturas relacionadas tienen una cuenta  IBAN válida y dicho IBAN tiene un RUM con modo <strong>%s</strong>.
 ClassCredited=Clasificar como "Abonada"
@@ -53,7 +54,7 @@ Lines=Líneas
 StandingOrderReject=Emitir una devolución
 WithdrawsRefused=Domiciliaciones devueltas
 WithdrawalRefused=Devolución de domiciliación
-CreditTransfersRefused=Credit transfers refused
+CreditTransfersRefused=Transferencias bancarias rechazadas
 WithdrawalRefusedConfirm=¿Está seguro de querer crear una devolución de domiciliación para la empresa
 RefusedData=Fecha de devolución
 RefusedReason=Motivo de devolución
@@ -63,7 +64,7 @@ InvoiceRefused=Factura rechazada (Cargar los gastos al cliente)
 StatusDebitCredit=Estado de débito/crédito
 StatusWaiting=En espera
 StatusTrans=Enviada
-StatusDebited=Debited
+StatusDebited=Abonada
 StatusCredited=Abonada
 StatusPaid=Tratada
 StatusRefused=Devuelta
@@ -79,13 +80,13 @@ StatusMotif8=Otro motivo
 CreateForSepaFRST=Domiciliar (SEPA FRST)
 CreateForSepaRCUR=Domiciliar (SEPA RCUR)
 CreateAll=Domiciliar todas
-CreateFileForPaymentByBankTransfer=Create file for credit transfer
-CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
+CreateFileForPaymentByBankTransfer=Crear archivo para transferencia bancaria
+CreateSepaFileForPaymentByBankTransfer=Crear archivo de transferencia bancaria (SEPA)
 CreateGuichet=Sólo oficina
 CreateBanque=Sólo banco
 OrderWaiting=En espera de proceso
-NotifyTransmision=Record file transmission of order
-NotifyCredit=Record credit of order
+NotifyTransmision=Registro de envio del archivo de la orden
+NotifyCredit=Registro de abono de la orden
 NumeroNationalEmetter=Número Nacional del Emisor
 WithBankUsingRIB=Para las cuentas bancarias que utilizan CCC
 WithBankUsingBANBIC=Para las cuentas bancarias que utilizan el código BAN/BIC/SWIFT
@@ -95,12 +96,12 @@ CreditDate=Abonada el
 WithdrawalFileNotCapable=No es posible generar el fichero bancario de domiciliación para el país %s (El país no está soportado)
 ShowWithdraw=Mostrar domiciliación
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Sin embargo, si la factura tiene pendiente algún pago por domiciliación no procesado, no será marcada como pagada para permitir la gestión de la domiciliación.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Debit order file
-CreditTransferFile=Credit transfer file
+DoStandingOrdersBeforePayments=Esta pestaña le permite realizar una petición de domiciliación. Una vez realizadas las peticiones, vaya al menú Bancos->Pagos para gestionar la domiciliación. Al cerrar una domiciliación, los pagos de las facturas se registrarán automáticamente, y las facturas completamente pagadas serán cerradas.
+DoCreditTransferBeforePayments=Esta pestaña le permite realizar una petición de transferencia bancaria. Una vez realizadas las peticiones, vaya al menú Bancos->Pagos para gestionar la petición. Al cerrar una petición, los pagos de las facturas se registrarán automáticamente, y las facturas completamente pagadas serán cerradas.
+WithdrawalFile=Archivo de domiciliación
+CreditTransferFile=Archivo de transferencia bancaria
 SetToStatusSent=Clasificar como "Archivo enviado"
-ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
+ThisWillAlsoAddPaymentOnInvoice=Se crearán los pagos de las facturas y las clasificarán como pagadas si el resto a pagar es 0
 StatisticsByLineStatus=Estadísticas por estados de líneas
 RUM=RUM
 DateRUM=Fecha de firma del mandato
@@ -108,7 +109,7 @@ RUMLong=Referencia Única de Mandato
 RUMWillBeGenerated=Si está vacío,se generará un número RUM (Referencia Unica de Mandato) una vez que se guarde la información de la cuenta bancaria
 WithdrawMode=Modo domiciliación (FRST o RECUR)
 WithdrawRequestAmount=Importe de la domiciliación
-BankTransferAmount=Amount of Credit Transfer request:
+BankTransferAmount=Importe de transferencia bancaria:
 WithdrawRequestErrorNilAmount=No es posible crear una domiciliación sin importe
 SepaMandate=Mandato SEPA
 SepaMandateShort=Mandato SEPA
@@ -124,18 +125,19 @@ SEPAFrstOrRecur=Tipo de pago
 ModeRECUR=Pago recurrente
 ModeFRST=Pago único
 PleaseCheckOne=Escoja solamente uno
-CreditTransferOrderCreated=Credit transfer order %s created
+CreditTransferOrderCreated=Orden de transferencia bancaria %s creada
 DirectDebitOrderCreated=Domiciliación %s creada
 AmountRequested=Importe solicitado
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Fecha de ejecución
 CreateForSepa=Crear archivo SEPA
-ICS=Identificador de acreedor CI
+ICS=Identificador de acreedor CI para domiciliación bancaria
+ICSTransfer=Identificador de acreedor CI para transferencia bancaria
 END_TO_END=Etiqueta XML SEPA "EndToEndId" - ID única asignada por transacción
 USTRD=Etiqueta SEPA XML "Unstructured"
 ADDDAYS=Añadir días a la fecha de ejecución
-NoDefaultIBANFound=No default IBAN found for this third party
+NoDefaultIBANFound=No se encontró ningún IBAN predeterminado para este tercero
 ### Notifications
 InfoCreditSubject=Abono de domiciliación %s por el banco
 InfoCreditMessage=La orden de domiciliación %s ha sido abonada por el banco<br>Fecha de abono: %s
@@ -145,4 +147,5 @@ InfoTransData=Importe: %s<br>Método: %s<br>Fecha: %s
 InfoRejectSubject=Domiciliación devuelta
 InfoRejectMessage=Buenos días:<br><br>la domiciliación de la factura %s por cuenta de la empresa %s, con un importe de %s ha sido devuelta por el banco.<br><br>--<br>%s
 ModeWarning=No se ha establecido la opción de modo real, nos detendremos después de esta simulación
-ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorCompanyHasDuplicateDefaultBAN=La empresa con id %s tiene más de una cuenta bancaria predeterminada. No hay forma de saber cuál usar.
+ErrorICSmissing=Falta ICS en la cuenta bancaria %s
diff --git a/htdocs/langs/es_GT/accountancy.lang b/htdocs/langs/es_GT/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/es_GT/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_GT/compta.lang b/htdocs/langs/es_GT/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/es_GT/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/es_GT/products.lang b/htdocs/langs/es_GT/products.lang
deleted file mode 100644
index 6e900475275..00000000000
--- a/htdocs/langs/es_GT/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/es_GT/withdrawals.lang b/htdocs/langs/es_GT/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/es_GT/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_HN/accountancy.lang b/htdocs/langs/es_HN/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/es_HN/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_HN/compta.lang b/htdocs/langs/es_HN/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/es_HN/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/es_HN/products.lang b/htdocs/langs/es_HN/products.lang
deleted file mode 100644
index 6e900475275..00000000000
--- a/htdocs/langs/es_HN/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/es_HN/withdrawals.lang b/htdocs/langs/es_HN/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/es_HN/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_MX/accountancy.lang b/htdocs/langs/es_MX/accountancy.lang
index 073d5f060b7..e0e66ccf761 100644
--- a/htdocs/langs/es_MX/accountancy.lang
+++ b/htdocs/langs/es_MX/accountancy.lang
@@ -79,7 +79,7 @@ VentilatedinAccount=Agregado exitosamente a la cuenta contable
 NotVentilatedinAccount=No añadido a la cuenta contable
 XLineSuccessfullyBinded=%s productos / servicios vinculados con éxito a una cuenta contable
 XLineFailedToBeBinded=%s productos / servicios no estaban vinculados a ninguna cuenta contable
-ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a unir mostrados por página (máximo recomendado: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comience la ordenación de la página "Enlazar para hacer" por los elementos más recientes
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comience la ordenación de la página "Enlace realizado" por los elementos más recientes
 BANK_DISABLE_DIRECT_INPUT=Deshabilitar el registro directo de la transacción en la cuenta bancaria
@@ -101,7 +101,6 @@ ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Cuenta contable por defecto para los prod
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Cuenta contable por defecto para los servicios comprados (si no ha sido definida en la hoja \nservicio)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Cuenta contable por defecto para los servicios vendidos (si no ha sido definida en la hoja servicio)
 LabelAccount=Descripción de la cuenta
-Sens=Significado
 DelYear=Año a borrar
 DelJournal=Diario a borrar
 DescFinanceJournal=Diario financiero incluyendo todos los tipos de pagos por cuenta bancaria
diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
index 522f487bfb6..0b3f888ace9 100644
--- a/htdocs/langs/es_MX/admin.lang
+++ b/htdocs/langs/es_MX/admin.lang
@@ -56,7 +56,6 @@ AllowToSelectProjectFromOtherCompany=En documento de un tercero, puede seleccion
 JavascriptDisabled=JavaScript desactivado
 UsePreviewTabs=Utilizar pestañas de vista previa
 ShowPreview=Mostrar previsualización
-CurrentTimeZone=Zona horaria PHP (servidor)
 TZHasNoEffect=Las fechas son guardadas y retornadas por el servidor de base de datos como si fueran guardadas como cadenas sometidas. La zona horaria tiene efecto solo cuando usamos la función UNIX_TIMESTAMP (que no debe ser usada por Dolibarr, ya que TZ no debe tener efecto, incluso si cambió despues de que datos fueron ingresados).
 Space=Espacio
 NextValue=Valor siguiente
@@ -107,7 +106,6 @@ SystemToolsArea=Área de herramientas del sistema
 SystemToolsAreaDesc=Esta área provee funciones administrativas. Usar el menú  para seleccionar la característica requerida.
 PurgeAreaDesc=Esta página te permite eliminar todos los archivos generados o guardados por Dolibarr (archivos temporales o todos los archivos en <b>%s</b> el directorio). Usar esta característica no es normalmente necesario. Esta es proporcionada como una solución alternativa para usuarios cuyo Dolibarr es hospedado por un proveedor que no ofrece permisos de borrado de archivos generados por el servidor web.
 PurgeDeleteLogFile=Eliminar archivos log, incluyendo <b>%s</b> definido por módulo Syslog (sin riesgo de perdida de datos)
-PurgeDeleteTemporaryFiles=Eliminar todos los archivos temporales (sin riesgo de perdida de datos). Nota: La eliminación es hecha solo si el directorio temporal fue creado 24 horas antes.
 PurgeDeleteAllFilesInDocumentsDir=Eliminar todos los archivos en el directorio: <b>%s</b>.<br>Esto borrara todos los documentos generados relacionados a elementos (terceras partes, facturas etc...), archivos subidos a el  módulo ECM, volcados de respaldo de base de datos y archivos temporales.
 PurgeRunNow=Purgar ahora
 PurgeNothingToDelete=Ningún directorio o archivos que desee eliminar.
diff --git a/htdocs/langs/es_MX/companies.lang b/htdocs/langs/es_MX/companies.lang
index 94d7e8f6bd4..811526bc5ac 100644
--- a/htdocs/langs/es_MX/companies.lang
+++ b/htdocs/langs/es_MX/companies.lang
@@ -167,7 +167,6 @@ VATIntraCheckableOnEUSite=Verificar el numero de control de IVA intracomunitario
 VATIntraManualCheck=También puedes verificar manualmente desde el sitio web de la comision europea <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=No es posible realizar la verificación. El servicio de comprobación no es prestado por el país miembro (%s).
 NorProspectNorCustomer=No es cliente potencial, ni cliente
-JuridicalStatus=Tipo de entidad legal
 OthersNotLinkedToThirdParty=Otros, no vinculado a un tercero
 ProspectStatus=Estatus del cliente potencial
 TE_MEDIUM=Mediana empresa
diff --git a/htdocs/langs/es_MX/compta.lang b/htdocs/langs/es_MX/compta.lang
index 9c1cd218356..b8c48cab211 100644
--- a/htdocs/langs/es_MX/compta.lang
+++ b/htdocs/langs/es_MX/compta.lang
@@ -1,4 +1,9 @@
 # Dolibarr language file - Source file is en_US - compta
+MenuFinancial=Facturación | Pago
+TaxModuleSetupToModifyRules=Vaya a la configuración del módulo de impuestos <a href="%s"> </a> para modificar las reglas de cálculo
+TaxModuleSetupToModifyRulesLT=Vaya a <a href="%s"> Configuración de la empresa </a> para modificar las reglas de cálculo
+OptionMode=Opción de contabilidad
+OptionModeVirtual=Opción Reclamaciones-Deudas
 Param=Configuración
 PaymentSocialContribution=Pago de impuesto social/fiscal
 ByThirdParties=Por terceros
diff --git a/htdocs/langs/es_MX/main.lang b/htdocs/langs/es_MX/main.lang
index d2d2407adfe..b2b9ca9f0e5 100644
--- a/htdocs/langs/es_MX/main.lang
+++ b/htdocs/langs/es_MX/main.lang
@@ -20,6 +20,7 @@ FormatDateHourSecShort=%I:%M:%S %p %d/%m/%Y
 FormatDateHourTextShort=%I:%M %p, %d %b %Y
 FormatDateHourText=%I:%M %p, %d %B %Y
 AvailableVariables=Variables de sustitución disponibles
+CurrentTimeZone=Zona horaria PHP (servidor)
 NoRecordFound=Ningún registro fue encontrado
 NoError=No hay error
 ErrorFieldFormat=El campo '%s' contiene un valor incorrecto
@@ -40,6 +41,7 @@ SetDate=Ajustar fecha
 SeeHere=Mira aquí
 BackgroundColorByDefault=Color de fondo por defecto
 FileWasNotUploaded=Un archivo fue seleccionado para adjuntar, sin embargo, no ha sido cargado aún. De clic en "Adjuntar archivo" para éllo.
+HomePage=Página Principal
 LevelOfFeature=Nivel de características
 NotDefined=No definido
 ConnectedOnMultiCompany=Conectado a la entidad
diff --git a/htdocs/langs/es_MX/products.lang b/htdocs/langs/es_MX/products.lang
index 8bd908672b5..8ade985e293 100644
--- a/htdocs/langs/es_MX/products.lang
+++ b/htdocs/langs/es_MX/products.lang
@@ -10,7 +10,6 @@ NoMatchFound=No se encontraron coincidencias
 DeleteProduct=Eliminar un producto / servicio
 ExportDataset_produit_1=Productos
 ImportDataset_produit_1=productos
-CustomCode=Customs / Commodity / HS code
 BarCodePrintsheet=Imprimir código de barras
 GlobalVariableUpdaterType0=Datos JSON
 GlobalVariableUpdaterHelp0=Analiza los datos JSON de la URL especificada, VALUE especifica la ubicación del valor relevante,
diff --git a/htdocs/langs/es_MX/sendings.lang b/htdocs/langs/es_MX/sendings.lang
index 96689e2c322..96ffc6ab5ff 100644
--- a/htdocs/langs/es_MX/sendings.lang
+++ b/htdocs/langs/es_MX/sendings.lang
@@ -1,2 +1,5 @@
 # Dolibarr language file - Source file is en_US - sendings
 StatusSendingCanceled=Cancelado
+StatusSendingCanceledShort=Cancelado
+StatusSendingProcessed=Procesada
+StatusSendingProcessedShort=Procesada
diff --git a/htdocs/langs/es_MX/withdrawals.lang b/htdocs/langs/es_MX/withdrawals.lang
index 52a15f0786e..2f810c0c725 100644
--- a/htdocs/langs/es_MX/withdrawals.lang
+++ b/htdocs/langs/es_MX/withdrawals.lang
@@ -1,5 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
+StandingOrderToProcess=Procesar
 WithdrawalReceipt=Orden de domiciliación bancaria
 Rejects=Rechazos
 StatusPaid=Pagado
 StatusRefused=Rechazado
+StatusMotif4=Órdenes de venta
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_PA/accountancy.lang b/htdocs/langs/es_PA/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/es_PA/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_PA/compta.lang b/htdocs/langs/es_PA/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/es_PA/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/es_PA/products.lang b/htdocs/langs/es_PA/products.lang
deleted file mode 100644
index 6e900475275..00000000000
--- a/htdocs/langs/es_PA/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/es_PA/withdrawals.lang b/htdocs/langs/es_PA/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/es_PA/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_PE/accountancy.lang b/htdocs/langs/es_PE/accountancy.lang
index 3fa654ee77c..94dd1838fd8 100644
--- a/htdocs/langs/es_PE/accountancy.lang
+++ b/htdocs/langs/es_PE/accountancy.lang
@@ -27,6 +27,7 @@ EndProcessing=Proceso finalizado.
 Lineofinvoice=Línea de factura
 VentilatedinAccount=Vinculado con éxito a la cuenta contable
 NotVentilatedinAccount=No vinculado a la cuenta contable
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comienza la clasificación de la página "Vinculación a hacer" por los elementos más recientes
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comienza la clasificación de la página "Encuadernación realizada" por los elementos más recientes
 ACCOUNTING_LENGTH_DESCRIPTION=Truncar la descripción de los productos y servicios en los listados después de los caracteres x (mejor = 50)
@@ -38,7 +39,6 @@ ACCOUNTING_MISCELLANEOUS_JOURNAL=Diario diverso
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Informe de Gastos Diario
 ACCOUNTING_SOCIAL_JOURNAL=Diario Social
 ACCOUNTING_ACCOUNT_SUSPENSE=Cuenta contable de espera
-Sens=Significado
 Codejournal=Periódico
 FinanceJournal=Periodo Financiero
 TotalMarge=Margen total de ventas
diff --git a/htdocs/langs/es_PE/admin.lang b/htdocs/langs/es_PE/admin.lang
index 6c8dc0a38a9..6ab8ad59b97 100644
--- a/htdocs/langs/es_PE/admin.lang
+++ b/htdocs/langs/es_PE/admin.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
 VersionProgram=Versión del programa
 VersionLastInstall=Instalar versión inicial
-ExampleOfDirectoriesForModelGen=Ejemplo de sintaxis:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 Module30Name=Facturas
 Permission91=Consultar impuestos e IGV
 Permission92=Crear/modificar impuestos e IGV
diff --git a/htdocs/langs/es_PE/cron.lang b/htdocs/langs/es_PE/cron.lang
index 96e3d29ed2c..bde4921afff 100644
--- a/htdocs/langs/es_PE/cron.lang
+++ b/htdocs/langs/es_PE/cron.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - cron
-CronStatusActiveBtn=Activado
 CronStatusInactiveBtn=Inhabilitar
diff --git a/htdocs/langs/es_PE/products.lang b/htdocs/langs/es_PE/products.lang
index 2e576f6187d..d29e3ce3677 100644
--- a/htdocs/langs/es_PE/products.lang
+++ b/htdocs/langs/es_PE/products.lang
@@ -4,4 +4,3 @@ ProductLabel=Etiqueta del producto
 ProductServiceCard=Ficha Productos/Servicios
 ProductOrService=Producto o Servicio
 ExportDataset_produit_1=Productos
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/es_PE/ticket.lang b/htdocs/langs/es_PE/ticket.lang
index 363410255e5..9b8429210d8 100644
--- a/htdocs/langs/es_PE/ticket.lang
+++ b/htdocs/langs/es_PE/ticket.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ticket
-NotRead=Sin leer
 Read=Leer
 Type=Tipo
 TicketNewEmailBodyInfosTrackUrl=Puedes ver la progresión del ticket haciendo click sobre el seguimiento del ticket.
diff --git a/htdocs/langs/es_PE/withdrawals.lang b/htdocs/langs/es_PE/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/es_PE/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_PY/accountancy.lang b/htdocs/langs/es_PY/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/es_PY/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_PY/compta.lang b/htdocs/langs/es_PY/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/es_PY/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/es_PY/products.lang b/htdocs/langs/es_PY/products.lang
deleted file mode 100644
index 6e900475275..00000000000
--- a/htdocs/langs/es_PY/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/es_PY/withdrawals.lang b/htdocs/langs/es_PY/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/es_PY/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_US/accountancy.lang b/htdocs/langs/es_US/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/es_US/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_US/compta.lang b/htdocs/langs/es_US/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/es_US/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/es_US/products.lang b/htdocs/langs/es_US/products.lang
deleted file mode 100644
index 6e900475275..00000000000
--- a/htdocs/langs/es_US/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/es_US/withdrawals.lang b/htdocs/langs/es_US/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/es_US/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_UY/accountancy.lang b/htdocs/langs/es_UY/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/es_UY/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_UY/compta.lang b/htdocs/langs/es_UY/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/es_UY/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/es_UY/products.lang b/htdocs/langs/es_UY/products.lang
deleted file mode 100644
index 6e900475275..00000000000
--- a/htdocs/langs/es_UY/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/es_UY/withdrawals.lang b/htdocs/langs/es_UY/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/es_UY/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_VE/accountancy.lang b/htdocs/langs/es_VE/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/es_VE/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_VE/products.lang b/htdocs/langs/es_VE/products.lang
index 7347e866031..7c5fda8bea0 100644
--- a/htdocs/langs/es_VE/products.lang
+++ b/htdocs/langs/es_VE/products.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - products
 TMenuProducts=Productos y servicios
 ProductStatusNotOnBuyShort=Fuera compra
-CustomCode=Customs / Commodity / HS code
 PriceExpressionEditorHelp2=Puede acceder a los atributos adicionales con variables como <b>#extrafield_myextrafieldkey#</b> y variables globales con <b>#global_mycode#</b>
diff --git a/htdocs/langs/es_VE/withdrawals.lang b/htdocs/langs/es_VE/withdrawals.lang
index fb9616a1788..0512b713a32 100644
--- a/htdocs/langs/es_VE/withdrawals.lang
+++ b/htdocs/langs/es_VE/withdrawals.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 StatusPaid=Pagada
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang
index 682433c526e..0b2bed4baae 100644
--- a/htdocs/langs/et_EE/accountancy.lang
+++ b/htdocs/langs/et_EE/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Kuupäev
 Docref=Viide
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index 268ecfbe48e..a65e94ed7bd 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Kuva
 SetupArea=Seadistamine
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Failide üleslaadimise teistimiseks kasutatav vorm (vastavalt seadistustele)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Märkus: jah töötab vaid siis, kui moodul <b>%s</b> on sisse lülitatud.
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Kuva eelvaade
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Eelvaade pole saadaval
 ThemeCurrentlyActive=Hetkel kasutatav teema
-CurrentTimeZone=PHP ajavöönd (serveri ajavöönd)
 MySQLTimeZone=MySQLi (andmebaasi) ajavöönd
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Ruum
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Tühjenda
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Kustuta ajutised failid
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Tühjenda nüüd
 PurgeNothingToDelete=Pole ühtki faili ega kausta, mida kustutada.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Eelistatud partnerid
 OtherResources=Muud ressursid
 ExternalResources=Välised ressursid
 SocialNetworks=Sotsiaalvõrgud
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=Kasutaja või arendaja dokumentatsiooni (KKK jms) võid leida<br>ametlikust Dolibarri Wikist:<br><a href="%s" target="_blank"><b>%s</b></a>
 ForAnswersSeeForum=Muude küsimuste või abi küsimise tarbeks saab kasutada Dolibarri foorumit:<br><a href="%s" target="_blank"><b>%s</b></a>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Praeguse konfiguratsiooniga näited
 ListOfDirectories=OpenDocument mallide kaustad
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Nendes kataloogides leiduvate ODT / ODS-malli failide arv
-ExampleOfDirectoriesForModelGen=Süntaksi näited:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Enne dokumendimallide loomist loe wikis olevat dokumentatsiooni:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Nimi/perekonnanimi ametikoht
@@ -406,7 +408,7 @@ UrlGenerationParameters=URLide turvamise parameetrid
 SecurityTokenIsUnique=Kasuta iga URLi jaoks unikaalset turvalise võtme parameetrit
 EnterRefToBuildUrl=Sisesta viide objektile %s
 GetSecuredUrl=Saada arvutatud URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Vana käibemaksumäär
 NewVATRates=Uus käibemaksumäär
 PriceBaseTypeToChange=Muuda hindadel, mille baasväärtus on defineeritud kui
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Uus menüü
 MenuHandler=Menüü töötleja
 MenuModule=Lähtekoodi moodul
-HideUnauthorizedMenu= Peida volitamata menüüd (hall)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=ID menüü
 DetailMenuHandler=Menüü töötleja uue menüü asukoha jaoks
 DetailMenuModule=Mooduli nimi, kui menüükanne tuleb moodulist
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Postiindeks
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/et_EE/banks.lang b/htdocs/langs/et_EE/banks.lang
index 60e4f3457b4..a1bb7028a82 100644
--- a/htdocs/langs/et_EE/banks.lang
+++ b/htdocs/langs/et_EE/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/et_EE/blockedlog.lang b/htdocs/langs/et_EE/blockedlog.lang
index ac567943c5c..7b3480de3b1 100644
--- a/htdocs/langs/et_EE/blockedlog.lang
+++ b/htdocs/langs/et_EE/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/et_EE/boxes.lang b/htdocs/langs/et_EE/boxes.lang
index 7c9fca21f40..204b90f03ea 100644
--- a/htdocs/langs/et_EE/boxes.lang
+++ b/htdocs/langs/et_EE/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Üldine tegevus (arved, pakkumised, tellimused)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Plaanitud käivitused
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=Järjehoidjaid pole määratletud.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Raamatupidamine
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/et_EE/cashdesk.lang b/htdocs/langs/et_EE/cashdesk.lang
index ce7e0354ab2..0f87e95779e 100644
--- a/htdocs/langs/et_EE/cashdesk.lang
+++ b/htdocs/langs/et_EE/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Arveid
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/et_EE/categories.lang b/htdocs/langs/et_EE/categories.lang
index ac9524d0f0d..f288163f0d9 100644
--- a/htdocs/langs/et_EE/categories.lang
+++ b/htdocs/langs/et_EE/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/et_EE/companies.lang b/htdocs/langs/et_EE/companies.lang
index 7689d22553b..6bafeb504b3 100644
--- a/htdocs/langs/et_EE/companies.lang
+++ b/htdocs/langs/et_EE/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Kontrollida pole võimalik. Kontrolli, et liikmesriik (%s) võimaldab teenust kasutada.
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Töötajad
 ProspectLevelShort=Potentsiaalne
diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang
index 5be099381a7..35f06da633f 100644
--- a/htdocs/langs/et_EE/compta.lang
+++ b/htdocs/langs/et_EE/compta.lang
@@ -111,7 +111,7 @@ Refund=Tagasimakse
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Näita käibemaksu makset
 TotalToPay=Kokku maksta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Režiim <b>%stekkepõhise raamatupidamise KM%s</b>.
 CalcModeVATEngagement=Režiim <b>%stulude-kulude KM%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Tulude ja kulude saldo, aasta kokkuvõte
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Näidatud summad sisaldavad kõiki makse
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Kolmandate isikute IRPFi aruanne
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/et_EE/cron.lang b/htdocs/langs/et_EE/cron.lang
index edf8cd714cf..f727eb118fc 100644
--- a/htdocs/langs/et_EE/cron.lang
+++ b/htdocs/langs/et_EE/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Create/update Scheduled job
 Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
-CronSetup= Plaanitavata programmide haldamise seadistamine
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Või mõne kindla programmi kontrollimiseks ja käivitamiseks
+CronSetup=Plaanitavata programmide haldamise seadistamine
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Croni käivitatavate programmide URLile ligipääsu turvavõti
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -42,10 +43,11 @@ CronModule=Moodul
 CronNoJobs=Pole ühtki registreeritud programm
 CronPriority=Prioriteet
 CronLabel=Nimi
-CronNbRun=Käivituste arv
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Iga
 JobFinished=Tegevus käivitatud ja lõpetatud
+Scheduled=Scheduled
 #Page card
 CronAdd= Lisa programme
 CronEvery=Execute job each
@@ -56,16 +58,16 @@ CronNote=Kommentaar
 CronFieldMandatory=Välja %s täitmine on nõutud
 CronErrEndDateStartDt=Lõppkuupäev ei saa olla alguskuupäevast varasem
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Lülita sisse
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Lülita välja
 CronTaskInactive=See tegevus on välja lülitatud
 CronId=ID
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=Käivitatav süsteemi käsk.
 CronCreateJob=Create new Scheduled Job
 CronFrom=Kellelt
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Käsurea käsk
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index 11b82753a43..4d3ae37fabc 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Ühtegi viga ei ole, teostame
 # Errors
 ErrorButCommitIsDone=Esines vigu, kuid kinnitame sellest hoolimata
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=URL %s on vale
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Kasutajanimi %s on juba olemas.
 ErrorGroupAlreadyExists=Grupp %s on juba olemas.
 ErrorRecordNotFound=Kirjet ei leitud.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Mõned nõutud väljad on täitmata.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Kausta loomine ebaõnnestus. Kontrolli, et veebiserveri kasutajal on piisavalt õigusi Dolibarri dokumentide kausta kirjutamiseks. Kui PHP <b>safe_mode</b> parameeter on sisse lülitatud, siis kontrolli, et veebiserveri kasutaja (või grupp) on Dolibarri PHP failide omanik.
 ErrorNoMailDefinedForThisUser=Antud kasutaja e-posti aadressi pole määratletud
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=See funktsioon vajab töötamiseks JavaScripti sisse lülitamist. Muuda seadeid Seadistamine->Kuva menüüs.
 ErrorTopMenuMustHaveAParentWithId0='Ülemine' tüüpi menüül ei saa olla emamenüüd. Sisesta emamenüü lahtrisse 0 või vali menüütüübiks 'Vasakul'.
 ErrorLeftMenuMustHaveAParentId='Vasak' tüüpi menüül peab olema ema ID.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP sobitamine ei ole täielik.
 ErrorLDAPMakeManualTest=Kausta %s on loodud .ldif fail. Vigade kohta lisainfo saamiseks proovi selle käsitsi käsurealt laadimist.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Loomiseks kasutatav viide on juba olemas.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/et_EE/exports.lang b/htdocs/langs/et_EE/exports.lang
index 516ee5c69c2..ed1048c18f3 100644
--- a/htdocs/langs/et_EE/exports.lang
+++ b/htdocs/langs/et_EE/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Välja nimi
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Teek
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Samm
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/et_EE/mails.lang b/htdocs/langs/et_EE/mails.lang
index bd62e283b06..9f3afdb2f66 100644
--- a/htdocs/langs/et_EE/mails.lang
+++ b/htdocs/langs/et_EE/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Rida %s failis
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Teated
-NoNotificationsWillBeSent=Selle tegevuse ja ettevõttega ei ole plaanis saata ühtki e-kirja teadet
-ANotificationsWillBeSent=E-posti teel saadetakse 1 teade
-SomeNotificationsWillBeSent=E-posti teel saadetakse %s teadet
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=Loetle kõik saadetud e-posti teated
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Informatsioon
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index 813ad00b669..14a0599dabe 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=Tõlge puudub
 Translation=Tõlge
+CurrentTimeZone=PHP ajavöönd (serveri ajavöönd)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Kirjet ei leitud
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Pole piisavalt andmeid
@@ -85,6 +87,8 @@ FileWasNotUploaded=Fail on valitud manustamiseks, kuid on veel üles laadimata.
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Loe abi
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Kirje salvestatud
 RecordDeleted=Kirje kustutatud
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Valik
+Filters=Filters
 List=Nimekiri
 FullList=Täielik nimekiri
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Saada e-kiri
 Email=E-post
 NoEMail=E-posti aadress puudub
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=Mobiiltelefon puudub
 Owner=Omanik
 FollowingConstantsWillBeSubstituted=Järgnevad konstandid asendatakse vastavate väärtustega.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/et_EE/modulebuilder.lang b/htdocs/langs/et_EE/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/et_EE/modulebuilder.lang
+++ b/htdocs/langs/et_EE/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang
index a1aa2f9a67b..40c748ce837 100644
--- a/htdocs/langs/et_EE/other.lang
+++ b/htdocs/langs/et_EE/other.lang
@@ -5,8 +5,6 @@ Tools=Tööriistad
 TMenuTools=Tööriistad
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Sünnipäev
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=sünnipäeva hoiatus aktiivne
 BirthdayAlertOff=sünnipäeva hoiatus mitteaktiivne
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Parem
 CalculatedWeight=Arvutuslik kaal
 CalculatedVolume=Arvutuslik ruumala
 Weight=Kaal
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Ekspordi ala
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index 9cd6afef593..1ae6f48c83c 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Hindasid
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Päritolumaa
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Kasuta fikseeritud hinda
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Koguse ulatus
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/et_EE/recruitment.lang b/htdocs/langs/et_EE/recruitment.lang
index 8f3197e0311..1f6dab3f416 100644
--- a/htdocs/langs/et_EE/recruitment.lang
+++ b/htdocs/langs/et_EE/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/et_EE/sendings.lang b/htdocs/langs/et_EE/sendings.lang
index ec6b68fa3ea..92c76b98f03 100644
--- a/htdocs/langs/et_EE/sendings.lang
+++ b/htdocs/langs/et_EE/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Tellimusega seotud teised saadetised
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Kinnitamast vajavad saadetised
 StatusSendingCanceled=Tühistatud
+StatusSendingCanceledShort=Tühistatud
 StatusSendingDraft=Mustand
 StatusSendingValidated=Kinnitatud (väljastamisele minevad või juba väljastatud kaubad)
 StatusSendingProcessed=Töödeldud
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Täiuslikum saatelehtede dokumendi mudel (logo jne)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstant EXPEDITION_ADDON_NUMBER on määratlemata
 SumOfProductVolumes=Toodete ruumala summa
 SumOfProductWeights=Toodete kaalude summa
diff --git a/htdocs/langs/et_EE/stocks.lang b/htdocs/langs/et_EE/stocks.lang
index 51bb0035e42..fd742bbe14a 100644
--- a/htdocs/langs/et_EE/stocks.lang
+++ b/htdocs/langs/et_EE/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/et_EE/ticket.lang b/htdocs/langs/et_EE/ticket.lang
index 6ebd80a96c2..fd7ed8ea019 100644
--- a/htdocs/langs/et_EE/ticket.lang
+++ b/htdocs/langs/et_EE/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Muu
 TicketSeverityShortLOW=Madal
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Kõrge
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Loe
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/et_EE/website.lang b/htdocs/langs/et_EE/website.lang
index b1d332fe020..780b74ae7da 100644
--- a/htdocs/langs/et_EE/website.lang
+++ b/htdocs/langs/et_EE/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Lehekülg
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/et_EE/withdrawals.lang b/htdocs/langs/et_EE/withdrawals.lang
index f1edf12b9b0..91462e241a0 100644
--- a/htdocs/langs/et_EE/withdrawals.lang
+++ b/htdocs/langs/et_EE/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Määra krediteerituks
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Tootmisrežiim ei olnud seadistatud, pärast seda peatatakse simulatsioon
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang
index 3211a0b62df..33ba4d9fea7 100644
--- a/htdocs/langs/eu_ES/accountancy.lang
+++ b/htdocs/langs/eu_ES/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index 4e1e3f4f917..2c22dcf86db 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Itxura
 SetupArea=Konfigurazioa
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Aurreikuspena aurkeztu
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Aurreikuspena ez dago eskuragarri
 ThemeCurrentlyActive=Aktibatuta dagoen gaia
-CurrentTimeZone=TimeZone PHP (zerbitzaria)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Garbitu
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Orain garbitu
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=List of OpenDocument templates directories
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Izena/Abizena-ren kokapena
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=%s objektuen erreferentzia sartu
 GetSecuredUrl=Kalkulatutako URL-a hartu
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu handler where to show new menu
 DetailMenuModule=Module name if menu entry come from a module
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/eu_ES/banks.lang b/htdocs/langs/eu_ES/banks.lang
index cd868f74239..218733473be 100644
--- a/htdocs/langs/eu_ES/banks.lang
+++ b/htdocs/langs/eu_ES/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/eu_ES/blockedlog.lang b/htdocs/langs/eu_ES/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/eu_ES/blockedlog.lang
+++ b/htdocs/langs/eu_ES/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/eu_ES/boxes.lang b/htdocs/langs/eu_ES/boxes.lang
index ebe7ba3d683..fb6cacaea9b 100644
--- a/htdocs/langs/eu_ES/boxes.lang
+++ b/htdocs/langs/eu_ES/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/eu_ES/cashdesk.lang b/htdocs/langs/eu_ES/cashdesk.lang
index c671c19b97e..e108028d9cb 100644
--- a/htdocs/langs/eu_ES/cashdesk.lang
+++ b/htdocs/langs/eu_ES/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/eu_ES/categories.lang b/htdocs/langs/eu_ES/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/eu_ES/categories.lang
+++ b/htdocs/langs/eu_ES/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/eu_ES/companies.lang b/htdocs/langs/eu_ES/companies.lang
index 50a8223fe7c..4318ea805b7 100644
--- a/htdocs/langs/eu_ES/companies.lang
+++ b/htdocs/langs/eu_ES/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/eu_ES/compta.lang b/htdocs/langs/eu_ES/compta.lang
index 9aca33839a6..af1267b60ab 100644
--- a/htdocs/langs/eu_ES/compta.lang
+++ b/htdocs/langs/eu_ES/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/eu_ES/cron.lang b/htdocs/langs/eu_ES/cron.lang
index d2da7ded67e..2ebdda1e685 100644
--- a/htdocs/langs/eu_ES/cron.lang
+++ b/htdocs/langs/eu_ES/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Create/update Scheduled job
 Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
-CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+CronSetup=Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -56,16 +58,16 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Shell command
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/eu_ES/errors.lang
+++ b/htdocs/langs/eu_ES/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
 ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/eu_ES/exports.lang b/htdocs/langs/eu_ES/exports.lang
index 45b56224b30..bcb14df4934 100644
--- a/htdocs/langs/eu_ES/exports.lang
+++ b/htdocs/langs/eu_ES/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Liburutegia
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Step
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/eu_ES/mails.lang b/htdocs/langs/eu_ES/mails.lang
index 1f26534ddc7..f64df420fab 100644
--- a/htdocs/langs/eu_ES/mails.lang
+++ b/htdocs/langs/eu_ES/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Jakinarazpenak
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Informazioa
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index ce139e4fb15..a14fca3d91f 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+CurrentTimeZone=TimeZone PHP (zerbitzaria)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=e-posta bidali
 Email=E-posta
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/eu_ES/modulebuilder.lang b/htdocs/langs/eu_ES/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/eu_ES/modulebuilder.lang
+++ b/htdocs/langs/eu_ES/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang
index f855300b038..2f1a2c826fc 100644
--- a/htdocs/langs/eu_ES/other.lang
+++ b/htdocs/langs/eu_ES/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
index 63ff9381818..21585dbd228 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_ES/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/eu_ES/recruitment.lang b/htdocs/langs/eu_ES/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/eu_ES/recruitment.lang
+++ b/htdocs/langs/eu_ES/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/eu_ES/sendings.lang b/htdocs/langs/eu_ES/sendings.lang
index 52467f47a81..079b2533513 100644
--- a/htdocs/langs/eu_ES/sendings.lang
+++ b/htdocs/langs/eu_ES/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Other shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Shipments to validate
 StatusSendingCanceled=Canceled
+StatusSendingCanceledShort=Canceled
 StatusSendingDraft=Draft
 StatusSendingValidated=Validated (products to ship or already shipped)
 StatusSendingProcessed=Processed
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/eu_ES/stocks.lang b/htdocs/langs/eu_ES/stocks.lang
index d709920da07..afc5de4c285 100644
--- a/htdocs/langs/eu_ES/stocks.lang
+++ b/htdocs/langs/eu_ES/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/eu_ES/ticket.lang b/htdocs/langs/eu_ES/ticket.lang
index d03e28f558d..086d398b0a1 100644
--- a/htdocs/langs/eu_ES/ticket.lang
+++ b/htdocs/langs/eu_ES/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Besteak
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/eu_ES/website.lang b/htdocs/langs/eu_ES/website.lang
index f00254a6c66..921f6edf20f 100644
--- a/htdocs/langs/eu_ES/website.lang
+++ b/htdocs/langs/eu_ES/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/eu_ES/withdrawals.lang b/htdocs/langs/eu_ES/withdrawals.lang
index 114a8d9dd6c..e3bec6f9cb8 100644
--- a/htdocs/langs/eu_ES/withdrawals.lang
+++ b/htdocs/langs/eu_ES/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
index be45e5ff3ed..dad3cbd4038 100644
--- a/htdocs/langs/fa_IR/accountancy.lang
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=همۀ کشورها باستثناء %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=در برپاسازی برای مشتریان حساب حساب‌داری اصلی تعریف نشده است
 MainAccountForSuppliersNotDefined=در برپاسازی برای تامین کنندگان حساب حساب‌داری اصلی تعریف نشده است
@@ -144,7 +145,7 @@ NotVentilatedinAccount=به حساب حسابداری بند نشد
 XLineSuccessfullyBinded=محصول/خدمت %s‌ با موفقیت به حساب حساب‌داری بند شد
 XLineFailedToBeBinded=محصول/خدمت %s به حساب حساب‌داری بند نشد
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=تعداد عناصری که باید بند بشوند و در صفحه نمایش داده شوند (حداکثر پیشنهادی: 50 مورد)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=آغاز مرتب‌کردن صفحۀ "بندکردن برای انجام" بواسطۀ عناصر اخیر
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=آغاز مرتب‌کردن صفحۀ "بندکردن انجام شد" بواسطۀ عناصر اخیر
 
@@ -198,7 +199,8 @@ Docdate=تاریخ
 Docref=مرجع
 LabelAccount=برچسب حساب
 LabelOperation=عملیات برچسب
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=کد حروف‌بندی
 Lettering=حروف‌بندی
 Codejournal=دفتر
@@ -206,7 +208,8 @@ JournalLabel=برچسب دفتر
 NumPiece=شمارۀ بخش
 TransactionNumShort=تعداد تراکنش‌ها
 AccountingCategory=گروه‌های دل‌خواه
-GroupByAccountAccounting=گروه‌بندی با حساب حساب‌داری
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=در این قسمت می‌توانید گروه‌های متشکل از حساب‌حساب‌داری بسازید. این گروه‌ها برای گزارش‌های دل‌خواه حساب‌داری استفاده می‌شود.
 ByAccounts=به واسطۀ حساب‌ها
 ByPredefinedAccountGroups=به واسطۀ  گروه‌های از پیش‌تعریف شده
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=پرداخت به هیچ محصول/خدمتی وصل
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=گروه حساب
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=در این قسمت فهرستی از سطور گزار
 DescVentilExpenseReportMore=در صورتی‌که شما حساب‌حساب‌داری را از نوع سطور گزارش هزینه تنظیم می‌کنید، برنامه قادر خواهد بود همۀ بندهای لازم را بین سطور گزارش هزینه‌های شما و حساب حساب‌داری شما در ساختار حساب‌های‌تان را ایجاد نماید، فقط با یک کلیک بر روی کلید <strong>"%s"</strong>. در صورتی‌که حساب بر روی واژه‌نامۀ پرداخت‌ها ثبت نشده باشد یا هنوز سطوری داشته باشید که به هیچ حسابی متصل نباشد، باید بندها را به شکل دستی از فهرست "<strong>%s</strong>: ایجاد نمائید.
 DescVentilDoneExpenseReport=در این قسمت فهرستی از سطور گزارشات هزینه و حساب‌حساب‌داری پرداخت آن‌ها را داشته باشید
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=بندکردن خودکار
 AutomaticBindingDone=بندکردن خودکار انجام شد
@@ -293,6 +298,7 @@ Accounted=در دفترکل حساب‌شده است
 NotYetAccounted=هنوز در دفترکل حساب نشده‌است
 ShowTutorial=Show Tutorial
 NotReconciled=وفق داده نشده
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=صادرکردن برای OpenConcerto  (آزمایشی)
 Modelcsv_configurable= صدور قابل پیکربندی CSV 
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=صادرکردن برای Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index 047c4802f96..85ca56bff21 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -56,6 +56,8 @@ GUISetup=نمایش
 SetupArea=برپاسازی
 UploadNewTemplate=بارگذاری قالب‌(های) جدید
 FormToTestFileUploadForm=برگه آزمایش بارگذاری فایل (با توجه به برپاسازی)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=توجه: «بله» تنها در صورتی مؤثر است که واحد <b>%s</b> فعال باشد
 RemoveLock=فایل <b>%s</b> را در صورت موجود بودن تغییر دهید تا امکان استفاده از ابزار نصب/روزآمدسازی وجود داشته باشد.
 RestoreLock=فایل <b>%s</b> را با مجوز فقط خواندنی بازیابی کنید تا امکان استفاده از ابزار نصب/روزآمدسازی را غیرفعال کنید.
@@ -85,7 +87,6 @@ ShowPreview=نمایش پیش‌نمایش
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=پیش‌نمایش در دسترس نیست
 ThemeCurrentlyActive=محیطی که اکنون فعال است
-CurrentTimeZone=منطقه زمانی PHP (سرور)
 MySQLTimeZone=منطقه زمانی MySql (پایگاه داده)
 TZHasNoEffect=در صورتی که تاریخ‌ها به‌عنوان رشتۀ ارسال شده حفظ شوند، توسط سرویس‌دهندۀ بانک‌داده ذخیره شده و ارائه می‌شود. ناحیه‌های زمانی تنها در صورتی مؤثرند که از تابع UNIX_TIMESTAMP استفاده شده باشد ( در Dolibarr نباید استفاده شود، بنابراین ناحیۀ زمانی بانک داده نباید تاثیر داشته باشد، حتی اگر بعد از درج داده تغییر داده شود).
 Space=فضا
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=این واحد دربردارندۀ عوامل مربوط 
 Purge=پاک‌کردن
 PurgeAreaDesc=این صفحه به شما امکان حذف همۀ فایل‌های تولید شده و ذخیره شده با Dolibarr  را می‌دهد (فایل‌های موقت یا همۀ فایلهای داخل پوشۀ <b>%s</b>). استفاده از این قابلیت در شرایط عادی ضرورتی ندارد. این قابلیت برای کاربرانی ایجاد شده است که میزبانی وبگاه آن‌ها امکان حذف فایل‌هائی که توسط سرویس‌دهندۀ وب ایجاد شده‌اند را نداده است. 
 PurgeDeleteLogFile=حذف فایل‌های گزارش‌کار، شامل تعریف <b>%s</b> برای واحد گزارش‌کار سامانه Syslog (خطری برای از دست دادن داده‌ها نیست)
-PurgeDeleteTemporaryFiles=حذف همۀ فایل‌های موقت (خطری برای از دست دادن داده نیست). توجه: حذف تها در صورتی انجام خواهد شد که پوشۀ موقتی حداقل 24 ساعت قبل ساخته شده باشد.
-PurgeDeleteTemporaryFilesShort=حذف فایل‌های موقتی
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=حذف همۀ فایل‌های موجود در پوشۀ: <b>%s</b>. <br> این باعث حذف همۀ مستنداتی که به عناصر مربوطند ( اشخاص سوم، صورت‌حساب و غیره ...)، فایل‌هائی که به واحد ECM ارسال شده‌اند، نسخه‌برداری‌های پشتیبان بانک‌داده و فایل‌های موقت خواهد شد.
 PurgeRunNow=شروع پاک‌سازی
 PurgeNothingToDelete=هیچ فایل یا پوشه‌ای برای حذف وجود ندارد.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=هم‌کاران پیش‌نهادی
 OtherResources=سایر منابع
 ExternalResources=منابع بیرونی
 SocialNetworks=شبکه‌های اجتماعی
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=مستندات مربوط به کاربر یا برنامه‌نویس (مستندات، سوال و جواب و غیره)، <br> نگاهی به ویکی Dolibarr داشته باشید: <br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=در صورتی که سوال دارید یا به کمک نیاز دارید می‌توانید از تالارهای گفتمان Dolibarr  استفاده نمائید: <br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=در این‌جا منابعی برای دریافت کمک و پشتیبانی در خصوص Dolibarr می‌یابید:
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=مثال‌هائی با پیکربندی کنونی
 ListOfDirectories=فهرست پوشه‌های قالب‌های OpenDocument
 ListOfDirectoriesForModelGenODT=فهرست پوشه‌هائی که دربردارندۀ قالب‌های به شکل OpenDocument هستند. <br><br>مسیر کامل پوشه‌ها را قرار دهید.<br>بین هر پوشه یک ارجاع به اول سطر قرار دهید.<br>برای افزودن پوشۀ واحد GED، اینجا قرار دهید <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>فایل‌های موجود در آن پوشه باشید با <b>.odt</b> یا <b>.ods</b> خاتمه یابند.
 NumberOfModelFilesFound=تعداد فایل‌های قالب ODT/ODS پیدا شده در این پوشه‌ها
-ExampleOfDirectoriesForModelGen=نمونه‌های روش نوشتاری:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> برای اطلاع از طرز ساخت مستندات قالب ODT دلخواه، قبل از این‌که آن‌ها را در این پوشه‌ها ذخیره کنید، مستندات راهنمای ویکی را بخوانید:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=مکان نام/نام‌خانوادگی
@@ -406,7 +408,7 @@ UrlGenerationParameters=مقادیر امن‌سازی نشانی‌های ای
 SecurityTokenIsUnique=استفاده از یک مقدار securekey منحصربه‌فرد برای هر نشانی اینترنتی
 EnterRefToBuildUrl=مرجع را برای شیء %s وارد کنید
 GetSecuredUrl=نشانی اینترنتی محاسبه شده را دریافت کنید
-ButtonHideUnauthorized=پنهان کردن کلیدهای مربوط به فعالیت‌های غیرمجاز برای کاربران غیرمدیر به جای نمایش کلیدهای خاکستری غیرفعال
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=نرخ قدیمی مالیات‌بر‌ارزش‌افزوده
 NewVATRates=نرخ جدید قدیمی مالیات‌بر‌ارزش‌افزوده
 PriceBaseTypeToChange=تغییر قیمت‌ها بر پایۀ مقدار مرجع تعریف شده در
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=فهرست‌های شخصی که به یکی از ق
 NewMenu=فهرست جدید
 MenuHandler=اداره‌کنندۀ فهرست
 MenuModule=واحد منبع
-HideUnauthorizedMenu= پنهان کردن فهرست‌های غیرمجاز (خاکستری)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=فهرست شناسه
 DetailMenuHandler=اداره کنندۀ فهرست برای تعیین مکان نمایش فهرست جدید
 DetailMenuModule=نام واحد در صورتی که یک قسمت از فهرست از یک واحد می‌آید
@@ -1983,11 +1985,12 @@ EMailHost=میزبان سرور IMAP رایانامه
 MailboxSourceDirectory=پوشۀ منبع صندوق‌پستی
 MailboxTargetDirectory=پوشۀ مقصد صندوق‌پستی
 EmailcollectorOperations=عملیات قابل انجام جمع‌کننده
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=حداکثر تعداد رایانامه‌های جمع‌آوری شده در یک جمع‌آوری
 CollectNow=الآن جمع‌آوری شود
 ConfirmCloneEmailCollector=آیا مطمئن هستید می‌خواهد جمع‌آورندۀ رایانامۀ %s را نسخه‌برداری کنید؟
-DateLastCollectResult=آخرین تاریخ تلاش برای جمع‌‌آوری
-DateLastcollectResultOk=آخرین تلاش جمع‌آوری موفق
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=آخرین نتیجه
 EmailCollectorConfirmCollectTitle=تائید جمع‌آوری رایانامه
 EmailCollectorConfirmCollect=آیا می‌خواهید عملیات جمع‌آوری این جمع‌آورنده را حالا اجرا کنید؟
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=کدپستی
 MainMenuCode=کد ورودی فهرست (فهرست اصلی)
 ECMAutoTree=نمایش ساختاردرختی خودکار ECM
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/fa_IR/banks.lang b/htdocs/langs/fa_IR/banks.lang
index b2492377312..230dd8c779c 100644
--- a/htdocs/langs/fa_IR/banks.lang
+++ b/htdocs/langs/fa_IR/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=تعهدنامۀ SEPA
 YourSEPAMandate=تعهدنامۀ SEPAی شما
 FindYourSEPAMandate=این تعهدنامۀ SEPAی شماست تا شرکت ما را مجاز کند سفارش پرداخت مستقیم از بانک داشته باشد. آن را امضا شده بازگردانید (نسخۀ اسکن‌شدۀ برگۀ امضا شده) یا آن را توسط رایانامه ارسال کنید:
 AutoReportLastAccountStatement=پرکردن خودکار بخش "شمارۀ شرح کار بانک" با آخرین شمارۀ شرح کار در هنگام وفق دادن
-CashControl=محدودۀ مبلغ‌نقدی صندوق-نقطۀ فروش-
-NewCashFence=محدودۀ جدید مبلغ‌نقدی
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/fa_IR/blockedlog.lang b/htdocs/langs/fa_IR/blockedlog.lang
index 116a6acbb42..f5999b78250 100644
--- a/htdocs/langs/fa_IR/blockedlog.lang
+++ b/htdocs/langs/fa_IR/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=حذف منطقی کمک‌مالی
 logMEMBER_SUBSCRIPTION_CREATE=عضویت برای عضو ساخت شده
 logMEMBER_SUBSCRIPTION_MODIFY=عضویت برای عضو ویرایش شد
 logMEMBER_SUBSCRIPTION_DELETE=حذف منطقی عضویت برای عضیو
-logCASHCONTROL_VALIDATE=ثبت محدودۀ پول‌نقد
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=دریافت صورت‌حساب مشتری
 BlockedLogBillPreview=پیش‌نمایش صورت‌حساب مشتری
 BlockedlogInfoDialog=جزئیات گزارش‌کار
diff --git a/htdocs/langs/fa_IR/boxes.lang b/htdocs/langs/fa_IR/boxes.lang
index 3ee603aee83..d9d03656410 100644
--- a/htdocs/langs/fa_IR/boxes.lang
+++ b/htdocs/langs/fa_IR/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=آخرین %s کمکِ تغییریافته
 BoxTitleLastModifiedExpenses=آخرین %s گزارش هزینۀ تغییریافته
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=فعالیت‌های سراسری (صورت‌حساب‌ها،  پیشنهادها، سفارشات)
 BoxGoodCustomers=مشتریان خوب
 BoxTitleGoodCustomers=%s مشتری خوب
+BoxScheduledJobs=وظایف برنامه‌ریزی‌شده
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=باسازی واکشی RSS ناموفق بود، آخرین تاریخ باسازی موفق: %s
 LastRefreshDate=آخرین تاریخ نوسازی
 NoRecordedBookmarks=هیچ نشانه‌ای تعریف نشده است
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=حسابداری
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/fa_IR/cashdesk.lang b/htdocs/langs/fa_IR/cashdesk.lang
index 40313762c8d..2c4889740bb 100644
--- a/htdocs/langs/fa_IR/cashdesk.lang
+++ b/htdocs/langs/fa_IR/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=پاورقی
 AmountAtEndOfPeriod=مبلغ در انتهای دوره (روز، ماه یا سال)
 TheoricalAmount=مبلغ نظری
 RealAmount=مقدار واقعی
-CashFence=Cash fence
-CashFenceDone=حصار نقدی برای دوره تعیین شده
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb و از فاکتورها
 Paymentnumpad=نوع بخش‌کناری
 Numberspad=بخش‌کناری عددی
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/fa_IR/categories.lang b/htdocs/langs/fa_IR/categories.lang
index adc3e73cfdb..5c7ca6a0f2e 100644
--- a/htdocs/langs/fa_IR/categories.lang
+++ b/htdocs/langs/fa_IR/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌ها
 UsersCategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌های کاربران
 SubCats=زیردسته‌ها
 CatList=فهرست کلیدواژه‌ها/دسته‌بندی‌ها
+CatListAll=List of tags/categories (all types)
 NewCategory=کلیدواژه/دسته‌بندی جدید
 ModifCat=ویرایش کلیدواژه/دسته‌بندی 
 CatCreated=کلیدواژه/دسته‌بندی  ساخته شد
@@ -65,16 +66,22 @@ UsersCategoriesShort=کلیدواژه/دسته‌بندی‌های کاربرا
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=شناسۀ کلیدواژه/دسته‌بندی 
-CatSupList=فهرست کلیدواژه/دسته‌بندی‌های فروشندگان
-CatCusList=فهرست کلیدواژه/دسته‌بندی‌های مشتریان/احتمالی‌ها
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=فهرست گروه‌بندی‌ها/برچسب‌های محصولات
 CatMemberList=فهرست کلیدواژه/دسته‌بندی‌های اعضا
-CatContactList=فهرست کلیدواژه/دسته‌بندی‌های طرف‌های تماس
-CatSupLinks=پیوندهای میان تامین‌کنندگان و کلیدواژه/دسته‌بندی‌ها
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=پیوندهای میان مشتریان/احتمالی‌ها و کلیدواژه/دسته‌بندی‌ها
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=پیوندهای میان محصولات/خدمات و کلیدواژه/دسته‌بندی‌ها
-CatProJectLinks=پیوندهای میان طرح‌ها و کلیدواژه/دسته‌بندی‌ها
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=پیوندهای میان طرح‌ها و کلیدواژه/دسته‌بندی‌ها
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=حذف از کلیدواژه/دسته‌بندی
 ExtraFieldsCategories=ویژگی های مکمل
 CategoriesSetup=برپاسازی کلیدواژه/دسته‌بندی‌
diff --git a/htdocs/langs/fa_IR/companies.lang b/htdocs/langs/fa_IR/companies.lang
index 9a4bc483b57..ab78f11dd02 100644
--- a/htdocs/langs/fa_IR/companies.lang
+++ b/htdocs/langs/fa_IR/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=بررسی شناسۀ م.ب.ا.ا. داخل جامعه
 VATIntraManualCheck=همچنین می‌توانید به‌طور دستی روی وبگاه کمیسیون اروپا بررسی کنید <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=بررسی مقدور نبود. خدمات بررسی برای کشور عضو (%s) ارائه نمی‌شود.
 NorProspectNorCustomer=مشتری‌احتمالی نیست/مشتری نیست
-JuridicalStatus=نوع موجودیت قانونی
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=کارمندان
 ProspectLevelShort=توان‌بالقوه-پتانسیل
diff --git a/htdocs/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang
index cdf21783347..5e300643567 100644
--- a/htdocs/langs/fa_IR/compta.lang
+++ b/htdocs/langs/fa_IR/compta.lang
@@ -111,7 +111,7 @@ Refund=بازپس‌گیری
 SocialContributionsPayments=پرداخت‌های مالیات اجتماعی/ساختاری
 ShowVatPayment=نمایش پرداخت م.ب.ا.ا
 TotalToPay=مجموع قابل پرداخت
-BalanceVisibilityDependsOnSortAndFilters=موجودی در این فهرست تنها در صورتی قابل مشاهده خواهد بود که جدول به صورت صعودی برای %s انجام شده باشد و صافی برای 1 حساب بانکی تنظیم شده باشد
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=کد حسابداری مشتری
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=کد حساب‌داری مشتری
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=آیا مطمئن هستید می‌خواهید
 ExportDataset_tax_1=مالیات‌های اجتماعی و ساختاری و پرداخت‌ها
 CalcModeVATDebt=حالت <b>%sحساب‌داری مالیات‌بر‌ارزش افزوده تعهدی%s</b>.
 CalcModeVATEngagement=حالت <b>%sمالیات بر ارزش افزوده در ازای درآمد-هزینه%s</b>.
-CalcModeDebt=تحلیل صورت‌حساب‌های معلوم و ثبت شده حتی در صورتی که هنوز در دفترکل حساب نشده باشند.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=تحلیل پرداخت‌های معلوم و ثبت شده حتی در صورتی که هنوز در دفترکل حساب نشده باشند.
 CalcModeBookkeeping=تحلیل داده‌های ثبت شده در دفتر روزنامه در جدول دفترداری دفترکل
 CalcModeLT1= حالت <b>%sRE بر حسب صورت‌حساب مشتری - صورت‌حساب تامین کننده%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=ماندۀ درآمدها و هزینه‌ها، ج
 AnnualByCompanies=ماندۀ درآمدها و هزینه‌ها، بر حسب حساب‌های از گروه‌بندی شده
 AnnualByCompaniesDueDebtMode=ماندۀ درآمدها و هزینه‌ها، جزئیات بر حسب گروه‌های از قبل تعیین شده، حالت <b>%s طلب‌ها-بدهی‌ها%s</b> یا <b>حساب‌داری تعهدی</b>
 AnnualByCompaniesInputOutputMode=ماندۀ درآمدها و هزینه‌ها، جزئیات بر حسب گروه‌های از قبل تعیین شده، حالت <b>%sدرآمدها-هزینه‌ها%s</b> یا <b>حساب‌داری نقدی</b>.
-SeeReportInInputOutputMode=برای محاسبۀ پرداخت‌های حقیقی که حتی هنوز در دفترکل حساب نشده‌اند به %sتحلیل پرداخت‌ها%s نگاه کنید.
-SeeReportInDueDebtMode=برای محاسبۀ صورت‌حساب‌های ثبت شده که حتی هنوز در دفترکل حساب نشده‌اند به %sتحلیل صورت‌حساب‌ها %s نگاه کنید.
-SeeReportInBookkeepingMode=برای محاسبه‌ای بر روی <b>جدول حساب‌داری دفترکل</b> به <b>%sگزارش حساب‌داری%s</b> مراجعه کنید.
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- تمام مالیات‌ها در مقادیر نمایش داده شده، گنجانده شده‌اند
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- این شامل همۀ پرداخت‌های واقعی صورت‌حساب‌ها، هزینه‌ها، مالیات بر ارزش افزوده و حقوق‌ها است. <br>- بر حسب تاریخ پرداخت صورت‌حساب‌ها، هزینه‌ها، مالیات بر ارزش افزوده و حقوق‌ها می‌باشد. تاریخ کمک‌مالی برای کمک‌های مالی
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=نمایش دهندۀ ردیف دفترکل 
 SeePageForSetup=برای برپاسازی فهرست <a href="%s">%s</a> را ببینید
 DepositsAreNotIncluded=- صورت‌حساب‌های پیش‌پرداخت شامل نشده‌اند
 DepositsAreIncluded=- صورت‌حساب‌های پیش‌پرداخت شامل شده‌اند
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=گزارش مالیات 2 توسط شخص سوم
 LT2ReportByCustomers=گزارش مالیات 3 توسط شخص سوم
 LT1ReportByCustomersES=گزارش توسط شخص سوم RE
 LT2ReportByCustomersES=گزارش توسط شخص سوم IRPF
 VATReport=گزارش مالیات‌برفروش
 VATReportByPeriods=گزارش مالیات‌برفروش بر حسب دورۀ زمانی
+VATReportByMonth=Sale tax report by month
 VATReportByRates=گزارش مالیات‌برفروش بر حسب نرخ‌ها
 VATReportByThirdParties=گزارش مالیات‌برفروش بر حسب شخص‌سوم‌ها
 VATReportByCustomers=گزارش مالیات‌برفروش بر حسب مشتری
diff --git a/htdocs/langs/fa_IR/cron.lang b/htdocs/langs/fa_IR/cron.lang
index 0302013fc26..b88af91c016 100644
--- a/htdocs/langs/fa_IR/cron.lang
+++ b/htdocs/langs/fa_IR/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = حذف  وظایف زمان‌بندی‌شده
 Permission23104 = اجرای  وظایف زمان‌بندی‌شده
 # Admin
 CronSetup=برپاسازی مدیریت وظایف زمان‌بندی‌شده
-URLToLaunchCronJobs=نشانی برای بررسی و اجرای وظایف‌زمان‌بندی‌شدۀ واجدشرایط 
-OrToLaunchASpecificJob=یا برای بررسی و اجرای یک وظیفۀ خاص
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=کلیدامنیتی نشانی برای اجرای وظایف‌زمان‌بندی‌شده
 FileToLaunchCronJobs=خطفرمان برای بررسی و اجرای وظایف‌زمانی واجد شرایط
 CronExplainHowToRunUnix=در فضای لینوکس شما باید ورودی crontab زیر را استفاده کنید تا در هر 5 دقیقه فرمان اجرا شود
 CronExplainHowToRunWin=در فضای مایکروسافت ویندوز شما می‌توانید از ابزارهای وظایف زمان‌بندی شده استفاده کنید تا در هر 5 دقیقه دستور را اجرا کنید
 CronMethodDoesNotExists=کلاس %s دربردارندۀ هیچ متد %s نیست
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=نمایه‌های وظایف زمانی‌بندی شده در فایل توضیح واحد مربوطه تعریف می‌شوند. در هنگامی که این واحد فعال شد، این فایل‌ها بارگذاری شده و در دسترس خواهند بود و در نتیجه شما می‌توانید واظیف را از فهرست ابزارهای مدیر %s مدیریت کنید.
 CronJobProfiles=نمایه‌های از پیش تعیین شدۀ وظایف‌زمان‌بندی‌شده
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=تعداد اجراها
 CronMaxRun=حداکثر تعداد اجراها
 CronEach=هر
 JobFinished=وظیفه اجرا شده و به سرانجام رسید
+Scheduled=Scheduled
 #Page card
 CronAdd= اضافه‌کردن وظیفه
 CronEvery=اجرای وظیفه در هر
@@ -56,7 +58,7 @@ CronNote=توضیح
 CronFieldMandatory=بخش %s الزامی است
 CronErrEndDateStartDt=تاریخ پایان نمی‌تواند قبل از تاریخ شروع باشد
 StatusAtInstall=وضعیت نصب واحد
-CronStatusActiveBtn=فعال‌کردن
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=غیرفعال‌کردن
 CronTaskInactive=این وظیفه غیرفعال است
 CronId=شناسه
@@ -76,8 +78,14 @@ CronType_method=روش-متد فراخوان یک کلاس PHP
 CronType_command=فرمان شل
 CronCannotLoadClass=امکان بارگذاری فایل کلاس %s (برای بارگذاری کلاس %s)
 CronCannotLoadObject=فایل کلاس %s بارگذاری شد، اما شیء %s درون آن پیدا نشد
-UseMenuModuleToolsToAddCronJobs=به فهرست "خانه-ابزارهای مدیر-وظایف زمان‌بندی شده" رفته تا این وظایف را مشاهده کرده یا ویرایش کنید.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=وظیفه غیرفعال است
 MakeLocalDatabaseDumpShort=پشتیبان‌گیری از پایگاه داده محلی
 MakeLocalDatabaseDump=نسخه‌برداری-dump از پایگاه دادۀ محلی. مؤلفه‌های مربوطه از قرار: فشرده‌سازی ('gz'  یا 'bz' یا 'none')، نوع پشتیبان‌گیری  ('mysql', 'pgsql', 'auto'), 1, 'auto' یا نام فایلی که ساخته می‌شود, تعداد فایل‌هائی که نگه‌داری می‌شود است
 WarningCronDelayed=توجه، برای مقاصد بهینه‌سازی، زمان اجرای بعدی وظایف فعال، وظایف شما ممکن است حداکثر %s ساعت قبل از اجرا تاخیر داشته  باشد.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index 3547d8ea6cb..43ad72288b6 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=خطائی نیست، حرکت می‌کنیم
 # Errors
 ErrorButCommitIsDone=علیرغم وجود خطا، تائید می‌شود
 ErrorBadEMail=رایانامۀ %s غلط است
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=نشانی‌اینترنتی %s اشتباه است
 ErrorBadValueForParamNotAString=برای مؤلفۀ موردنظر مقدار خطائی وارد شده است. عموما در هنگام فقدان ترجمه، الحاق می‌شود.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=نام‌کاربری %s قبلا وجود داشته است.
 ErrorGroupAlreadyExists=گروه %s قبلا وجود داشته است.
 ErrorRecordNotFound=ردیف موجود نیست.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=برخی از بخش‌های الزامی، پر نشده
 ErrorSubjectIsRequired=موضوع رایانامه الزامی است.
 ErrorFailedToCreateDir=ایجاد یک پوشه با شکست مواجه شد. بررسی کنید، کاربر سرور وب، دارای مجوزهای نوشتاری بر روی پوشۀ documents مربوط به Dolibarr باشد در صورتی که مؤلفۀ <b>safe_mode</b> روی این نسخه از PHP فعال باشد، بررسی کنید فایل‌های PHP مربوط به Dolibarr متعلق به کاربر سرور وب (یا گروه مربوطه) باشد.
 ErrorNoMailDefinedForThisUser=نشانی رایانامه برای این کاربر تعریف نشده است
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=این قابلیت برای کار کردن نیاز به فعال بودن جاوااسکریپت دارد. این گزینه را در بخش برپاسازی-نمایش فعال کنید.
 ErrorTopMenuMustHaveAParentWithId0=فهرست‌هائی از نوع "بالا" می‌توانند دارای فهرست مادر باشند. برای این‌که فهرست "کنار" داشته باشید، عدد 0 را وارد کنید.
 ErrorLeftMenuMustHaveAParentId=فهرست‌های "کنار" باید یک شناسۀ مادر داشته باشند
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=این نام نمایه برای این مجموعۀ
 ErrorLDAPSetupNotComplete=تطبیق Dolibarr-LDAP کامل نیست.
 ErrorLDAPMakeManualTest=یک فایل .ldif در پوشۀ  %s تولید شد. تلاش کنید آن را از خط فرمان به شکل دستی اجرا کنید تا اطلاعات بیشتری در مورد خطاها داشته باشید.
 ErrorCantSaveADoneUserWithZeroPercentage=در صورتی که بخش "انجام شده توسط" هم پر شده باشد، امکان ذخیرۀ یک کنش با "وضعیت شروع نشده" نیست.
-ErrorRefAlreadyExists=ارجاعی که برای مورد ساخته شده استفاده شده قبلا وجود داشته است.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=لطفا نام اطلاعیۀ بانک را در خصوص چگونگی گزارش ورودی وارد کنید (حالت YYYYMM  یا YYYYMMDD)
 ErrorRecordHasChildren=هنگامی که یک ردیف دارای زیرمجموعه است، امکان حذف آن وجود ندارد.
 ErrorRecordHasAtLeastOneChildOfType=این شیء حداقل یک فرزند از نوع %s دارد
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=شما باید تعیین کنی
 ErrorDiscountLargerThanRemainToPaySplitItBefore=تخفیفی که می‌دهید بزرگتر از مقدار قابل پرداخت است. قبل از این کار تخفیف را به 2 تخفیف کوچکتر تقسیم کنید.
 ErrorFileNotFoundWithSharedLink=فایل پیدا نشد. ممکن است کلید به‌اشتراک‌گذاری ویرایش شده یا فایل حذف شده باشد
 ErrorProductBarCodeAlreadyExists=بارکد محصول %s در یک ارجاع محصول دیگر قبلا وجود داشته است
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=همچنین توجه داشته باشید در هنگامی که حداقل یک زیرمحصول (یا زیرمحصولی از زیرمحصول) به یک شمارۀ سری‌ساخت/شماره سریال احتیاج داشته باشد، استفاده از محصول مجازی برای افزایش/کاهش خودکار زیرمحصولات ممکن نیست.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=برای سطوری که محصول مجانی دارند، توضیحات الزامی است
 ErrorAPageWithThisNameOrAliasAlreadyExists=صفحه/دربردارندۀ <strong>%s</strong> نام مشابه یا نام‌مستعار جایگزین مشابه ورودی مورد استفادۀ شما دارد
 ErrorDuringChartLoad=خطا در هنگام بارگذاری نمودار حساب‌ها. در صورتی برخی حساب‌ها بارگذاری نشوند، همچنان می‌توانید به طور دستی آن‌ها را وارد کنید
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=یک گذرواژه برای این عضو تنظیم شده است. با این‌حال هیچ حساب کاربری‌ای ساخته نشده است. بنابراین این گذرواژه برای ورود به Dolibarr قابل استفاده نیست. ممکن است برای یک رابط/واحد بیرونی قابل استفاده باشد، اما اگر شما نخواهید هیچ نام کاربری ورود و گذرواژه‌ای برای یک عضو استفاده کنید، شما می‌توانید گزینۀ "ایجاد یک نام‌ورد برای هر عضو" را از برپاسازی واحد اعضاء غیرفعال کنید. در صورتی که نیاز دارید که نام‌ورود داشته باشید اما گذرواژه نداشته باشید، می‌توانید این بخش را خالی گذاشته تا از این هشدار بر حذر باشید. نکته: همچنین نشانی رایانامه می‌تواند در صورتی که عضو به یک‌کاربر متصل باشد، می‌‌تواند مورد استفاده قرار گیرد
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=نام‌ورود شما تغییر پی
 WarningAnEntryAlreadyExistForTransKey=یک ورودی برای این کلید ترجمه برای این زبان قبلا وجود داشته است
 WarningNumberOfRecipientIsRestrictedInMassAction=هشدار، در هنگام انجام عملیات انبوده روی فهرست‌ها، تعداد دریافت‌کنندگان مختلف به <b>%s</b> محدود است.
 WarningDateOfLineMustBeInExpenseReportRange=هشدار، تاریخ مربوط به سطر در بازۀ گزارش هزینه‌ها نیست
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=طرح بسته است. ابتدا باید آن را باز کنید
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/fa_IR/exports.lang b/htdocs/langs/fa_IR/exports.lang
index 87e543c7259..c514c0638f1 100644
--- a/htdocs/langs/fa_IR/exports.lang
+++ b/htdocs/langs/fa_IR/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=عنوان بخش
 NowClickToGenerateToBuildExportFile=حالا نوع فایل را در کادرترکیبی وارد کرده و کلید "تولید" را برای ساخت فایل صادرات کلیک کنید..
 AvailableFormats=انواع‌فایل ممکن
 LibraryShort=کتابخانه
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=گام
 FormatedImport=دستیار واردات
 FormatedImportDesc1=این واحد به شما امکان می‌دهد با استفاده از فایل و بدون دانش فنی، با استفاده از یک دستیار داده‌های موجود را روزآمد کرده یا اشیاء جدید به پایگاه‌داده اضافه کنید.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=کلید (ستون) برای استفاده در <b>به‌
 NbInsert=تعدا سطور درج شده: %s
 NbUpdate=تعداد سطور روزآمد شده: %s
 MultipleRecordFoundWithTheseFilters=ردیف‌های متعددی با این صافی پیدا شد: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/fa_IR/mails.lang b/htdocs/langs/fa_IR/mails.lang
index 75df4395c03..1f688c5cbdc 100644
--- a/htdocs/langs/fa_IR/mails.lang
+++ b/htdocs/langs/fa_IR/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=ورودی رایانامه کاربر
 MailingModuleDescDolibarrUsers=کاربران دارای رایانامه
 MailingModuleDescThirdPartiesByCategories=شخص‌سوم‌ها (بر حسب دسته‌بندی)
 SendingFromWebInterfaceIsNotAllowed=ارسال از رابط وب مجاز نیست.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=خط٪ در فایل
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=اطلاعیه ها
-NoNotificationsWillBeSent=بدون اطلاعیه ها ایمیل ها برای این رویداد و شرکت برنامه ریزی
-ANotificationsWillBeSent=1 اطلاع رسانی خواهد شد از طریق ایمیل ارسال می شود
-SomeNotificationsWillBeSent=اطلاعیه٪ خواهد شد از طریق ایمیل ارسال می شود
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=لیست همه اطلاعیه ها ایمیل فرستاده شده
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=اطلاعات
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=پاسخ داده شده
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index c53d9860524..5e41a7d862e 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=برای این نوع رایانامه قالبی وجود ن
 AvailableVariables=متغیرهای موجود برای جایگزینی 
 NoTranslation=بدون ترجمه
 Translation=ترجمه
+CurrentTimeZone=منطقه زمانی PHP (سرور)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=هیچ ردیفی پیدا نشد
 NoRecordDeleted=هیچ ردیفی حذف نشد
 NotEnoughDataYet=دادۀ کافی وجود ندارد
@@ -85,6 +87,8 @@ FileWasNotUploaded=یک فایل برای پیوست کردن انتخاب شد
 NbOfEntries=تعداد ورودی‌ه
 GoToWikiHelpPage=مطالعۀ راهنمای برخط (دسترسی به اینترنت نیاز است)
 GoToHelpPage=مطالعۀ راهنما
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=ردیف، ذخیره شد
 RecordDeleted=ردیف، حذف شد
 RecordGenerated=ردیف، تولید شد
@@ -433,6 +437,7 @@ RemainToPay=در انتظار پرداخت
 Module=واحد/برنامه
 Modules=واحد/برنامه
 Option=گزینه
+Filters=Filters
 List=فهرست
 FullList=فهرست کامل
 FullConversation=Full conversation
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/fa_IR/modulebuilder.lang b/htdocs/langs/fa_IR/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/fa_IR/modulebuilder.lang
+++ b/htdocs/langs/fa_IR/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang
index 8bd88a5db5d..23a5df065e7 100644
--- a/htdocs/langs/fa_IR/other.lang
+++ b/htdocs/langs/fa_IR/other.lang
@@ -5,8 +5,6 @@ Tools=ابزار
 TMenuTools=ابزارها
 ToolsDesc=همۀ ابزارهائی که در سایر فهرست‌ها نیامده‌اند این‌جا گروه‌بندی شده‌اند. <br> همۀ ابزارها از فهرست سمت راست در دسترس هستند
 Birthday=تولد
-BirthdayDate=تاریخ تولد
-DateToBirth=Birth date
 BirthdayAlertOn=اعلان تولد فعال است
 BirthdayAlertOff=اعلان تولد غیرفعال است
 TransKey=ترجمۀ کلیدواژۀ TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=راست
 CalculatedWeight=وزن محاسبه شده
 CalculatedVolume=حجم محاسبه شده
 Weight=وزن
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=کیلوگرم
 WeightUnitg=گرم
 WeightUnitmg=میلی گرم
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=منطقه صادرات
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index 2a07d19a11f..80b1542d055 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=چند قسمت قیمتی در هر محصول/خدمات (هر مشتری در یک قسمت قیمتی است)
 MultiPricesNumPrices=تعداد قیمت‌ها
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=تعداد محصولات بسته‌بندی مادر
@@ -167,8 +168,10 @@ BuyingPrices=قیمت‌های خرید
 CustomerPrices=قیمت‌های مشتری
 SuppliersPrices=قیمت‌های فروشنده
 SuppliersPricesOfProductsOrServices=قیمت‌های فروشنده (مربوط به محصولات و خدمات)
-CustomCode=گمرک / کالا / کدبندی هماهنگ کالا
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=کشور مبدا
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=استفاده از قیمت ثابت
 PriceByQuantity=استفاده از قیمت‌ بر حسب تعداد
 DisablePriceByQty=غیرفعال کردن استفاده از قیمت برحسب تعداد
 PriceByQuantityRange=بازۀ تعدا
-MultipriceRules=مقررات قسمت‌بندی قیمت
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=استفاده از مقررات قسمت‌بندی قیمت (که در برپاسازی واحد محصولات آمده است) برای محاسبۀ خودکار قیمت سایر قسمت‌ها بر حسب اولین قسمت
 PercentVariationOver=%% انواع بر حسب%s
 PercentDiscountOver=%% تخفیف بر حسب%s
diff --git a/htdocs/langs/fa_IR/recruitment.lang b/htdocs/langs/fa_IR/recruitment.lang
index 082b58f6499..3647b8204d5 100644
--- a/htdocs/langs/fa_IR/recruitment.lang
+++ b/htdocs/langs/fa_IR/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/fa_IR/sendings.lang b/htdocs/langs/fa_IR/sendings.lang
index 4365e45f340..a042ba09638 100644
--- a/htdocs/langs/fa_IR/sendings.lang
+++ b/htdocs/langs/fa_IR/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=دیگر محموله برای این منظور
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=حمل و نقل به اعتبار
 StatusSendingCanceled=لغو شد
+StatusSendingCanceledShort=لغو ظده
 StatusSendingDraft=پیش نویس
 StatusSendingValidated=اعتبار (محصولات به کشتی و یا در حال حمل می شود)
 StatusSendingProcessed=پردازش
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=مدل سند کامل بیشتر برای رسید تحویل (logo. ..)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER ثابت تعریف نشده
 SumOfProductVolumes=مجموع حجم محصول
 SumOfProductWeights=مجموع وزن محصول
diff --git a/htdocs/langs/fa_IR/stocks.lang b/htdocs/langs/fa_IR/stocks.lang
index 2ebf520b14e..18ce5c1d53e 100644
--- a/htdocs/langs/fa_IR/stocks.lang
+++ b/htdocs/langs/fa_IR/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/fa_IR/ticket.lang b/htdocs/langs/fa_IR/ticket.lang
index a1ad4eacc4e..8f525262ab5 100644
--- a/htdocs/langs/fa_IR/ticket.lang
+++ b/htdocs/langs/fa_IR/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=برگه‌ها - انواع
 TicketDictCategory=برگه‌ها - دسته‌بندی‌ها
 TicketDictSeverity=برگه‌ها - سطح اهمیت
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=اشکال نرم‌افزاری
-TicketTypeShortBUGHARD=اشکال نرم‌افزاری
-TicketTypeShortCOM=سوال تجاری
 
+TicketTypeShortCOM=سوال تجاری
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=سایر
 TicketSeverityShortLOW=کم
 TicketSeverityShortNORMAL=عادی
 TicketSeverityShortHIGH=زیاد
-TicketSeverityShortBLOCKING=انتقادی/مسدودی
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=بخش '%s' نادرست است
 MenuTicketMyAssign=برگه‌ها من
@@ -60,7 +58,6 @@ OriginEmail=منبع رایانامه
 Notify_TICKET_SENTBYMAIL=ارسال پیام برگه با رایانامه
 
 # Status
-NotRead=خوانده نشده
 Read=خوانده‌شده
 Assigned=نسبت‌داده شده
 InProgress=در حال انجام
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=رابط عمومی به کاربران ام
 TicketsAutoAssignTicket=نسبت دادن خودکار کاربری که برگۀ‌پشتیبانی را ساخته است
 TicketsAutoAssignTicketHelp=در هنگام ساخت برگۀ‌پشتیبانی، کاربر می‌تواند به شکل خودکار به برگه نسبت داده شود
 TicketNumberingModules=واحد شماره‌دهی برگه‌های پشتیبانی
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=اطلاع‌رسانی به شخص‌سوم در هنگام ساخت
 TicketsDisableCustomerEmail=همواره در هنگامی که یک برگۀ‌پشتیبانی از طریق رابط عمومی ساخته می‌شود، قابلیت رایانامه غیرفعال شود
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=وضعیت تغییر پیدا کرد: %s به %s
 TicketNotNotifyTiersAtCreate=عدم اطلاع‌رسانی به شرکت در هنگام ساخت
 Unread=خوانده نشده
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/fa_IR/website.lang b/htdocs/langs/fa_IR/website.lang
index 3c1ada31ac4..5c5a464d39c 100644
--- a/htdocs/langs/fa_IR/website.lang
+++ b/htdocs/langs/fa_IR/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=صفحه
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/fa_IR/withdrawals.lang b/htdocs/langs/fa_IR/withdrawals.lang
index 5c0b517c19a..ef958d540e4 100644
--- a/htdocs/langs/fa_IR/withdrawals.lang
+++ b/htdocs/langs/fa_IR/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=طبقه بندی اعتبار
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=انتخاب برای حالت واقعی تنظیم نشده بود، ما بعد از این شبیه سازی را متوقف کند
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang
index 2e529b15833..f70614cf020 100644
--- a/htdocs/langs/fi_FI/accountancy.lang
+++ b/htdocs/langs/fi_FI/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=Kaikki maat, poislukien %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Ei sidottu kirjanpitotilille
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Päiväys
 Docref=Viite
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Päiväkirja
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Kirjattu pääkirjanpitoon
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Täsmäyttämätön
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index 59cee45e755..676dbbf41e0 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Näyttö
 SetupArea=Asetukset
 UploadNewTemplate=Päivitä uusi pohja(t)
 FormToTestFileUploadForm=Lomake tiedostonlähetyksen testaamiseen (asetusten mukainen)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Huomaa: kyllä on tehokas vain, jos <b>moduuli %s</b> on käytössä
 RemoveLock=Mahdollistaaksesi Päivitys-/Asennustyökalun käytön, poista/nimeä uudelleen tarvittaessa tiedosto <b>%s</b>
 RestoreLock=Palauta tiedosto <b>%s</b> vain lukuoikeuksin. Tämä estää myöhemmän Päivitys-/Asennustyökalun käytön
@@ -85,7 +87,6 @@ ShowPreview=Näytä esikatselu
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Esikatselu ei ole käytettävissä
 ThemeCurrentlyActive=Aktiivinen teema
-CurrentTimeZone=Aikavyöhyke PHP (palvelin)
 MySQLTimeZone=Aikavyöhyke MySql (tietokanta)
 TZHasNoEffect=Päivämäärät talletetaan ja palautetaan siinä muodossa kuin ne on syötetty. Aikavyöhykkeellä on merkitystä ainoastaan käytettäessä UNIX_TIMESTAMP - funktiota. (Dolibarr ei käytä tätä, joten tietokannan aikavyöhykeellä ei ole vaikutusta vaikka se muuttuisi tietojen tallentamisen jälkeen)
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Pääkäyttäjien toiminnot. Valitse valikosta haluttu omina
 Purge=Poista
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Poista väliaikaiset tiedostot
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Siivoa nyt
 PurgeNothingToDelete=Ei poistettavia hakemistoja tai tiedostoja.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Muut resurssit
 ExternalResources=Ulkoiset resurssit
 SocialNetworks=Sosiaaliset verkostot
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=Käyttäjälle tai kehittäjän dokumentaatio (doc, FAQs ...), <br> katsoa, että Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s</b></a>
 ForAnswersSeeForum=Muita kysymyksiä / apua, voit käyttää Dolibarr foorumilla: <br> <a href="%s" target="_blank"><b> %s</b></a>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=Luettelo OpenDocument malleja hakemistoja
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Esimerkkejä syntaksin: <br> c: \\ mydir <br> / Home / mydir <br> DOL_DATA_ROOT / ECM / ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Jos haluat tietää, miten voit luoda odt asiakirjamalleja, ennen kuin laitat ne näistä hakemistoista, lue wiki dokumentaatio:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Etunimi/Sukunimi - sijainti
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parametrit turvata URL
 SecurityTokenIsUnique=Käytä ainutlaatuinen securekey parametri jokaiselle URL
 EnterRefToBuildUrl=Kirjoita viittaus objektin %s
 GetSecuredUrl=Hanki lasketaan URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Vanha ALV-prosentti
 NewVATRates=Uusi ALV-prosentti
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Uusi valikko
 MenuHandler=Valikko huolitsijan
 MenuModule=Lähde moduuli
-HideUnauthorizedMenu= Piilota luvaton valikot (harmaa)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id-valikosta
 DetailMenuHandler=Valikko huolitsijan missä osoittavat uuden valikon
 DetailMenuModule=Moduulin nimi, jos Valikosta kotoisin moduuli
@@ -1983,11 +1985,12 @@ EMailHost=IMAP-palvelin
 MailboxSourceDirectory=Sähköpostin lähdehakemisto
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Postinumero
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/fi_FI/banks.lang b/htdocs/langs/fi_FI/banks.lang
index ef24faa1c72..7ab1f895aa8 100644
--- a/htdocs/langs/fi_FI/banks.lang
+++ b/htdocs/langs/fi_FI/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=SEPA-toimeksiantonne
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/fi_FI/blockedlog.lang b/htdocs/langs/fi_FI/blockedlog.lang
index f9a07298706..6e6393f5cd1 100644
--- a/htdocs/langs/fi_FI/blockedlog.lang
+++ b/htdocs/langs/fi_FI/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/fi_FI/boxes.lang b/htdocs/langs/fi_FI/boxes.lang
index a63ed303fb5..8ca18cbccb6 100644
--- a/htdocs/langs/fi_FI/boxes.lang
+++ b/htdocs/langs/fi_FI/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Viimeisimmät %s muokatut matka- ja kuluraportit
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Yleisaktiviteetit (laskut, ehdotukset, tilaukset)
 BoxGoodCustomers=Hyvät asiakkaat
 BoxTitleGoodCustomers=%s Hyvät asiakkaat
+BoxScheduledJobs=Ajastetut työt
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=Kirjanmerkkejä ei ole määritelty.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Viimeisimmät asiakastoimitukset
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Kirjanpito
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/fi_FI/cashdesk.lang b/htdocs/langs/fi_FI/cashdesk.lang
index 3cb4a43d36f..ef8471c05da 100644
--- a/htdocs/langs/fi_FI/cashdesk.lang
+++ b/htdocs/langs/fi_FI/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb laskuista
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/fi_FI/categories.lang b/htdocs/langs/fi_FI/categories.lang
index 371a1c6cbb7..8738530c575 100644
--- a/htdocs/langs/fi_FI/categories.lang
+++ b/htdocs/langs/fi_FI/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Täydentävät ominaisuudet
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/fi_FI/companies.lang b/htdocs/langs/fi_FI/companies.lang
index a542eed8fcc..9501c740d2c 100644
--- a/htdocs/langs/fi_FI/companies.lang
+++ b/htdocs/langs/fi_FI/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Tarkasta ALV-tunnus E.U: n sivuilta
 VATIntraManualCheck=Voit tehdä tarkastuksen myös käsin E.U: n sivuilla <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Tarkistaminen ei mahdollista. Jäsenvaltio ei toimita tarkastuspalvelua ( %s).
 NorProspectNorCustomer=Ei mahdollinen asiakas eikä asiakas
-JuridicalStatus=Yritysmuoto
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Työntekijät
 ProspectLevelShort=Potenttiaali
diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang
index a4dbebfc263..d75596e0a5b 100644
--- a/htdocs/langs/fi_FI/compta.lang
+++ b/htdocs/langs/fi_FI/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Näytä arvonlisäveron maksaminen
 TotalToPay=Yhteensä maksaa
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Raportti kolmannen osapuolen IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/fi_FI/cron.lang b/htdocs/langs/fi_FI/cron.lang
index beaef6c9fe0..289befd89cd 100644
--- a/htdocs/langs/fi_FI/cron.lang
+++ b/htdocs/langs/fi_FI/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Create/update Scheduled job
 Permission23103 = Poista Ajastettu työ
 Permission23104 = Suorita Ajastettu työ
 # Admin
-CronSetup= Ajastettujen tehtävien asetusten hallinta
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Tai tietyn tehtävän tarkistamiseen ja ajamiseen
+CronSetup=Ajastettujen tehtävien asetusten hallinta
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Turva avain ajastettujen  tehtävien ajamiseen URL-sta
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -42,10 +43,11 @@ CronModule=Moduuli
 CronNoJobs=No jobs registered
 CronPriority=Prioriteetti
 CronLabel=Etiketti
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -56,16 +58,16 @@ CronNote=Kommentti
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Poistaa käytöstä
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=Mistä
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Shell command
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index 90dc974eeeb..df9826daae0 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s on väärä
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Kirjaudu %s on jo olemassa.
 ErrorGroupAlreadyExists=Ryhmän %s on jo olemassa.
 ErrorRecordNotFound=Levykauppa ei löytynyt.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Jotkin vaaditut kentät eivät ole täytetty.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Luominen epäonnistui hakemiston. Tarkista, että Web-palvelin käyttäjällä on oikeudet kirjoittaa Dolibarr asiakirjat hakemistoon. Jos parametri <b>safe_mode</b> on käytössä tämän PHP, tarkista, että Dolibarr php tiedostot omistaa web-palvelimen käyttäjä (tai ryhmä).
 ErrorNoMailDefinedForThisUser=Ei postia määritelty tälle käyttäjälle
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Tätä ominaisuutta tarvitaan JavaScript on aktivoitu työstä. Muuta tämän setup - näyttö.
 ErrorTopMenuMustHaveAParentWithId0=A-valikosta tyyppi "Alkuun" ei voi olla emo-valikosta. Laita 0 vanhemman valikosta tai valita valikosta tyyppi "vasemmisto".
 ErrorLeftMenuMustHaveAParentId=A-valikosta tyyppi "vasemmisto" on oltava vanhemman id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP yhteensovitus ei ole täydellinen.
 ErrorLDAPMakeManualTest=A. LDIF tiedosto on luotu hakemistoon %s. Yritä ladata se manuaalisesti komentoriviltä on enemmän tietoa virheitä.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref käytetään luomista jo olemassa.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/fi_FI/exports.lang b/htdocs/langs/fi_FI/exports.lang
index 038bf61ce23..00784ec6116 100644
--- a/htdocs/langs/fi_FI/exports.lang
+++ b/htdocs/langs/fi_FI/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Kentän nimi
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Kirjasto
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Vaihe
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/fi_FI/mails.lang b/htdocs/langs/fi_FI/mails.lang
index c327a9bc3c9..9efd5a62a2f 100644
--- a/htdocs/langs/fi_FI/mails.lang
+++ b/htdocs/langs/fi_FI/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Rivi %s tiedosto
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Ilmoitukset
-NoNotificationsWillBeSent=Ei sähköposti-ilmoituksia on suunniteltu tähän tapahtumaan ja yritys
-ANotificationsWillBeSent=1 ilmoituksesta lähetetään sähköpostitse
-SomeNotificationsWillBeSent=%s ilmoitukset lähetetään sähköpostitse
-AddNewNotification=Aktivoi uusi sähköposti ilmoitus tavoittelle/tapahtumalle
-ListOfActiveNotifications=Luettelo kaikista aktiivisista kohteista / tapahtumista sähköpostin ilmoittamiselle
-ListOfNotificationsDone=Listaa kaikki sähköposti-ilmoitukset lähetetään
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Sähköpostin lähettämisen määritys on asetettu "%s": ksi. Tätä tilaa ei voi käyttää massapostitusten lähettämiseen.
 MailSendSetupIs2=Sinun on ensin siirryttävä admin-tilillä valikkoon %sHome - Setup - EMails%s parametrin <strong> '%s' </strong> muuttamiseksi käytettäväksi tilassa "%s". Tässä tilassa voit syöttää Internet-palveluntarjoajan antaman SMTP-palvelimen vaatimat asetukset ja käyttää Massa-sähköpostitoimintoa.
 MailSendSetupIs3=Jos sinulla on kysyttävää SMTP-palvelimen määrittämisestä, voit kysyä osoitteesta %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index a9649731ddb..0f20b7dedbf 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Tämän tyyliselle sähköpostille ei ole pohjaa saatavilla
 AvailableVariables=Available substitution variables
 NoTranslation=Ei käännöstä
 Translation=Käännös
+CurrentTimeZone=Aikavyöhyke PHP (palvelin)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Tietueita ei löytynyt
 NoRecordDeleted=Tallennuksia ei poistettu
 NotEnoughDataYet=Ei tarpeeksi tietoja
@@ -85,6 +87,8 @@ FileWasNotUploaded=Tiedosto on valittu liite mutta ei ollut vielä ladattu. Klik
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Lue online-ohjeet (tarvitaan Internet-yhteys)
 GoToHelpPage=Lue auttaa
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Kotisivu
 RecordSaved=Record tallennettu
 RecordDeleted=Tallennus poistettu
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Moduuli/Applikaatio
 Modules=Moduulit/Applikaatiot
 Option=Vaihtoehto
+Filters=Filters
 List=Luettelo
 FullList=Täydellinen luettelo
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Lähetä sähköpostia
 Email=Sähköposti
 NoEMail=Ei sähköpostia
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=Ei matkapuhelinta
 Owner=Omistaja
 FollowingConstantsWillBeSubstituted=Seuraavat vakiot voidaan korvata ja vastaava arvo.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/fi_FI/modulebuilder.lang b/htdocs/langs/fi_FI/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/fi_FI/modulebuilder.lang
+++ b/htdocs/langs/fi_FI/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang
index 4a6a9b8c6c6..0da9959a710 100644
--- a/htdocs/langs/fi_FI/other.lang
+++ b/htdocs/langs/fi_FI/other.lang
@@ -5,8 +5,6 @@ Tools=Työkalut
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Syntymäpäivä
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=syntymäpäivä hälytys aktiivinen
 BirthdayAlertOff=syntymäpäivä varoituskynnysten inaktiivinen
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Oikeus
 CalculatedWeight=Laskettu paino
 CalculatedVolume=Laskettu määrä
 Weight=Paino
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Vienti alueen
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index fb19101c1ee..d9da0549768 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Hintojen lukumäärä
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Ostohinnat
 CustomerPrices=Asiakas hinnat
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Alkuperämaa
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Poista käytöstä hinnat kappalemäärän mukaan
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/fi_FI/recruitment.lang b/htdocs/langs/fi_FI/recruitment.lang
index eb65908493a..9702bc62631 100644
--- a/htdocs/langs/fi_FI/recruitment.lang
+++ b/htdocs/langs/fi_FI/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/fi_FI/sendings.lang b/htdocs/langs/fi_FI/sendings.lang
index f45dd858ab4..7c6e6c9e98e 100644
--- a/htdocs/langs/fi_FI/sendings.lang
+++ b/htdocs/langs/fi_FI/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Tämän tilauksen muut toimitukset
 SendingsAndReceivingForSameOrder=Tämän tilauksen toimitukset ja kuittaukset
 SendingsToValidate=Toimitu
 StatusSendingCanceled=Peruttu
+StatusSendingCanceledShort=Peruttu
 StatusSendingDraft=Vedos
 StatusSendingValidated=Validoidut (lähetettävät tai lähetetyt tuotteet)
 StatusSendingProcessed=Jalostettu
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Täydellisempi mallin toimitusten kuitit (logo. ..)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Jatkuva EXPEDITION_ADDON_NUMBER ei määritelty
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/fi_FI/stocks.lang b/htdocs/langs/fi_FI/stocks.lang
index 3bd141f559b..7d6f3eae9eb 100644
--- a/htdocs/langs/fi_FI/stocks.lang
+++ b/htdocs/langs/fi_FI/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/fi_FI/ticket.lang b/htdocs/langs/fi_FI/ticket.lang
index d25c38981fc..732f53a18fd 100644
--- a/htdocs/langs/fi_FI/ticket.lang
+++ b/htdocs/langs/fi_FI/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Kaupallinen kysymys
 
+TicketTypeShortCOM=Kaupallinen kysymys
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Muu
 TicketSeverityShortLOW=Matala
 TicketSeverityShortNORMAL=Normaali
 TicketSeverityShortHIGH=Korkea
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Kohta '%s' on väärin
 MenuTicketMyAssign=Minun tiketit
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Luettu
 Assigned=Assigned
 InProgress=Käsittelyssä
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/fi_FI/website.lang b/htdocs/langs/fi_FI/website.lang
index 5ecbd8e3ca4..218d9313551 100644
--- a/htdocs/langs/fi_FI/website.lang
+++ b/htdocs/langs/fi_FI/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Lisää sivusto
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Kotisivu
 PageContainer=Sivu
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Tyhjä sivu
 ExternalURLMustStartWithHttp=Ulkoisen osoitteen on oltava muotoa http:// tai https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Sisällytä dynaaminen sisältö
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/fi_FI/withdrawals.lang b/htdocs/langs/fi_FI/withdrawals.lang
index aba0cc2a0cc..a09329f1302 100644
--- a/htdocs/langs/fi_FI/withdrawals.lang
+++ b/htdocs/langs/fi_FI/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Luokittele hyvitetyksi
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Vaihtoehto todellista tilaa ei ole asetettu, pysähdymme jälkeen simulointi
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/fr_BE/accountancy.lang b/htdocs/langs/fr_BE/accountancy.lang
index 11b91eb3db3..5f291cc8cb7 100644
--- a/htdocs/langs/fr_BE/accountancy.lang
+++ b/htdocs/langs/fr_BE/accountancy.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - accountancy
 Processing=Exécution
 Lineofinvoice=Lignes de facture
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 Doctype=Type de document
 ErrorDebitCredit=Débit et crédit ne peuvent pas être non-nuls en même temps
 TotalMarge=Marge de ventes totale
diff --git a/htdocs/langs/fr_BE/products.lang b/htdocs/langs/fr_BE/products.lang
deleted file mode 100644
index 6e900475275..00000000000
--- a/htdocs/langs/fr_BE/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/fr_BE/withdrawals.lang b/htdocs/langs/fr_BE/withdrawals.lang
index eb336cadcc0..76b150a8eb2 100644
--- a/htdocs/langs/fr_BE/withdrawals.lang
+++ b/htdocs/langs/fr_BE/withdrawals.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 StatusTrans=Envoyé
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/fr_CA/accountancy.lang b/htdocs/langs/fr_CA/accountancy.lang
index c34f7d4c7ad..62afd3dc49d 100644
--- a/htdocs/langs/fr_CA/accountancy.lang
+++ b/htdocs/langs/fr_CA/accountancy.lang
@@ -87,6 +87,7 @@ LineOfExpenseReport=Ligne de rapport de dépenses
 NoAccountSelected=Aucun compte comptable sélectionné
 VentilatedinAccount=Lié avec succès au compte comptable
 XLineFailedToBeBinded=%s produits / services n'étaient liés à aucun compte comptable
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Commencez le tri de la page "Reliure à faire" par les éléments les plus récents
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Commencez le tri de la page "Reliure faite" par les éléments les plus récents
 ACCOUNTING_LENGTH_DESCRIPTION=Tronquer la description des produits et services dans les listes après les caractères X (Best = 50)
@@ -97,7 +98,6 @@ ACCOUNTING_EXPENSEREPORT_JOURNAL=Note de frais
 DONATION_ACCOUNTINGACCOUNT=Compte comptable pour enregistrer des dons
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Compte comptable par défaut pour les services achetés (utilisé si non défini dans la fiche de service)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Compte comptable par défaut pour les services vendus (utilisé si non défini dans la fiche de service)
-GroupByAccountAccounting=Groupe par compte comptable
 NotMatch=Pas encore défini
 FinanceJournal=Journal des finances
 ExpenseReportsJournal=Journal des rapports de dépenses
diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index a0f940824b8..0d38f03c9fa 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -25,7 +25,6 @@ AllWidgetsWereEnabled=Tous les widgets disponibles sont activés
 MenusDesc=Les gestionnaires de menu définissent le contenu des deux barres de menus (horizontales et verticales).
 MenusEditorDesc=L'éditeur de menu vous permet de définir des entrées de menu personnalisées. Utilisez-le soigneusement pour éviter l'instabilité et les entrées de menu inaccessibles en permanence. <br>Certains modules ajoutent des entrées de menu (dans le menu<b> principal </b>principalement). Si vous supprimez certaines de ces entrées par erreur, vous pouvez les restaurer en désactivant et en réactivant le module.
 PurgeDeleteLogFile=Supprimer les fichiers journaux, y compris ceux<b>%s</b> définis pour le module Syslog (pas de risque de perte de données)
-PurgeDeleteTemporaryFilesShort=Supprimer les fichiers temporaires
 PurgeNothingToDelete=Pas de répertoire ou de fichiers à supprimer.
 PurgeNDirectoriesFailed=Impossible de supprimer <b>%s</b> fichiers ou les répertoires.
 ConfirmPurgeAuditEvents=Êtes-vous sûr de vouloir purger tous les événements de sécurité? Tous les journaux de sécurité seront supprimés, aucune autre donnée ne sera supprimée.
diff --git a/htdocs/langs/fr_CA/categories.lang b/htdocs/langs/fr_CA/categories.lang
index 71116b8842c..ce7287abbe9 100644
--- a/htdocs/langs/fr_CA/categories.lang
+++ b/htdocs/langs/fr_CA/categories.lang
@@ -22,4 +22,4 @@ ProductsCategoriesShort=Tags/catégories de produits
 MembersCategoriesShort=Tags/catégories de membres
 AccountsCategoriesShort=Étiquettes / catégories de comptes
 ProjectsCategoriesShort=Projets Tags / catégories
-CatProJectLinks=Liens entre projets et tags / catégories
+CatMembersLinks=Liens entre membres et libellés/catégories
diff --git a/htdocs/langs/fr_CA/compta.lang b/htdocs/langs/fr_CA/compta.lang
index 9426cca9d08..67522c477f0 100644
--- a/htdocs/langs/fr_CA/compta.lang
+++ b/htdocs/langs/fr_CA/compta.lang
@@ -32,7 +32,6 @@ VATPayments=Paiements d'impôt sur les ventes
 VATRefund=Remboursement de la taxe de vente
 SocialContributionsPayments=Règlements charges sociales
 ShowVatPayment=Affiche paiement TPS/TVH
-BalanceVisibilityDependsOnSortAndFilters=La balance est visible dans cette liste uniquement si la table est triée en ascendant sur %s et filtrée pour 1 compte bancaire
 CustomerAccountancyCodeShort=Cust. Compte. code
 SupplierAccountancyCodeShort=Souper. Compte. code
 ByExpenseIncome=Par dépenses et revenus
diff --git a/htdocs/langs/fr_CA/cron.lang b/htdocs/langs/fr_CA/cron.lang
index d4a1f4689f9..c0ac78610c3 100644
--- a/htdocs/langs/fr_CA/cron.lang
+++ b/htdocs/langs/fr_CA/cron.lang
@@ -4,11 +4,8 @@ Permission23102 =Créer/Modifier des travaux planifiées
 Permission23103 =Effacer travail planifié
 Permission23104 =Exécuté Travail planifié
 CronSetup=Configuration programmée de la gestion des tâches
-URLToLaunchCronJobs=URL pour vérifier et lancer des emplois qualifiés cron
-OrToLaunchASpecificJob=Ou pour vérifier et lancer un travail spécifique
 KeyForCronAccess=Clé de sécurité pour URL pour lancer des travaux de cron
 CronExplainHowToRunUnix=Sur l'environnement Unix, vous devez utiliser l'entrée crontab suivante pour exécuter la ligne de commande toutes les 5 minutes
-CronExplainHowToRunWin=Sur Microsoft (tm) environnement Windows, vous pouvez utiliser les outils de tâches planifiés pour exécuter la ligne de commande toutes les 5 minutes
 EnabledAndDisabled=Activé et désactivé
 CronLastOutput=Dernier résultat d'exécution
 CronLastResult=Le dernier code de résultat
@@ -24,7 +21,6 @@ CronNone=Aucune
 CronDtLastLaunch=Date de début de la dernière exécution
 CronDtLastResult=Date de fin de la dernière exécution
 CronNoJobs=Aucun emploi enregistré
-CronNbRun=Nb. lancement
 CronEach=Chaque
 CronAdd=Ajouter des emplois
 CronEvery=Exécuter le travail chaque
@@ -39,6 +35,5 @@ CronCreateJob=Créer un nouvel emploi planifié
 CronFrom=De
 CronType=Type d'emploi
 CronType_command=Commande Shell
-UseMenuModuleToolsToAddCronJobs=Accédez au menu «Accueil - Outils d'administration - Emplois programmés» pour voir et modifier les tâches planifiées.
 MakeLocalDatabaseDumpShort=Sauvegarde de la base de données locale
 WarningCronDelayed=Attention, à des fins de performance, quelle que soit la prochaine date d'exécution des travaux activés, vos travaux peuvent être retardés jusqu'à un maximum de %s heures avant d'être exécutés.
diff --git a/htdocs/langs/fr_CA/errors.lang b/htdocs/langs/fr_CA/errors.lang
index 967bf583d1c..be3f8df0eb9 100644
--- a/htdocs/langs/fr_CA/errors.lang
+++ b/htdocs/langs/fr_CA/errors.lang
@@ -51,7 +51,6 @@ ErrorBadFormatValueList=La valeur de la liste ne peut pas contenir plus d'une vi
 ErrorExportDuplicateProfil=Ce nom de profil existe déjà pour ce jeu d'exportation.
 ErrorLDAPSetupNotComplete=La correspondance Dolibarr-LDAP n'est pas complète.
 ErrorLDAPMakeManualTest=Un fichier .ldif a été généré dans le répertoire %s. Essayez de le charger manuellement à partir de la ligne de commande pour avoir plus d'informations sur les erreurs.
-ErrorRefAlreadyExists=La référence utilisée pour la création existe déjà.
 ErrorModuleRequireJavascript=Javascript ne doit pas être désactivé pour que cette fonction fonctionne. Pour activer / désactiver Javascript, accédez au menu Accueil-> Configuration-> Affichage.
 ErrorPasswordsMustMatch=Les deux mots de passe dactylographiés doivent correspondre les uns aux autres
 ErrorFileIsInfectedWithAVirus=Le programme antivirus n'a pas pu valider le fichier (le fichier peut être infecté par un virus)
diff --git a/htdocs/langs/fr_CA/mails.lang b/htdocs/langs/fr_CA/mails.lang
index 9661c2d4ed1..cd12fe65172 100644
--- a/htdocs/langs/fr_CA/mails.lang
+++ b/htdocs/langs/fr_CA/mails.lang
@@ -76,12 +76,6 @@ YouCanUseCommaSeparatorForSeveralRecipients=Vous pouvez utiliser le séparateur
 TagCheckMail=Suivre l'ouverture du courrier
 TagUnsubscribe=Désinscription lien
 NoEmailSentBadSenderOrRecipientEmail=Aucun courriel envoyé. Mauvais expéditeur ou courrier électronique du destinataire. Vérifiez le profil de l'utilisateur.
-NoNotificationsWillBeSent=Aucune notification par courrier électronique n'est prévue pour cet événement et cette entreprise
-ANotificationsWillBeSent=1 notification sera envoyée par courrier électronique
-SomeNotificationsWillBeSent=%s les notifications seront envoyées par courrier électronique
-AddNewNotification=Activer un nouvel objectif / événement de notification par courrier électronique
-ListOfActiveNotifications=Liste tous les cibles / événements actifs pour la notification par courrier électronique
-ListOfNotificationsDone=Liste toutes les notifications par courrier électronique envoyées
 MailSendSetupIs=La configuration de l'envoi de courrier électronique a été configurée sur '%s'. Ce mode ne peut pas être utilisé pour envoyer des messages électroniques de masse.
 MailSendSetupIs2=Vous devez d'abord aller, avec un compte admin, dans le menu %sHome - Configuration - EMails%s pour modifier le paramètre <strong> '%s' </strong>pour utiliser le mode '%s'. Avec ce mode, vous pouvez entrer dans la configuration du serveur SMTP fourni par votre fournisseur de services Internet et utiliser la fonctionnalité de messagerie en masse.
 MailSendSetupIs3=Si vous avez des questions sur la configuration de votre serveur SMTP, vous pouvez demander à %s.
@@ -104,5 +98,3 @@ AdvTgtDeleteFilter=Supprimer le filtre
 AdvTgtCreateFilter=Créer un filtre
 NoContactWithCategoryFound=Aucun contact / adresse avec une catégorie trouvée
 NoContactLinkedToThirdpartieWithCategoryFound=Aucun contact / adresse avec une catégorie trouvée
-OutGoingEmailSetup=Configuration de messagerie sortante
-InGoingEmailSetup=Configuration de messagerie entrante
diff --git a/htdocs/langs/fr_CA/other.lang b/htdocs/langs/fr_CA/other.lang
index 23fbaaa759a..f9ca31c6f78 100644
--- a/htdocs/langs/fr_CA/other.lang
+++ b/htdocs/langs/fr_CA/other.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - other
+SecurityCode=Code de sécurité
 NumberingShort=N °
 BirthdayAlertOn=Alerte d'anniversaire active
 BirthdayAlertOff=Alerte d'anniversaire inactive
diff --git a/htdocs/langs/fr_CA/products.lang b/htdocs/langs/fr_CA/products.lang
index 313aab6abb2..181bb2e3175 100644
--- a/htdocs/langs/fr_CA/products.lang
+++ b/htdocs/langs/fr_CA/products.lang
@@ -80,7 +80,6 @@ NewRefForClone=Réf. De nouveau produit / service
 SellingPrices=Prix ​​de vente
 BuyingPrices=Prix ​​d'achat
 CustomerPrices=Prix ​​client
-CustomCode=Customs / Commodity / HS code
 ShortLabel=Étiquette courte
 p=U.
 s=S
@@ -100,7 +99,6 @@ AlwaysUseNewPrice=Toujours utiliser le prix actuel du produit / service
 AlwaysUseFixedPrice=Utilisez le prix fixe
 PriceByQuantity=Différents prix par quantité
 PriceByQuantityRange=Gamme de quantité
-MultipriceRules=Règles du segment des prix
 PercentVariationOver=%% variation par rapport à %s
 PercentDiscountOver=%% discount sur %s
 KeepEmptyForAutoCalculation=Restez vide pour que ceci soit calculé automatiquement à partir du poids ou du volume de produits
diff --git a/htdocs/langs/fr_CA/sendings.lang b/htdocs/langs/fr_CA/sendings.lang
index 1886150f850..9cf4c3906c4 100644
--- a/htdocs/langs/fr_CA/sendings.lang
+++ b/htdocs/langs/fr_CA/sendings.lang
@@ -19,6 +19,7 @@ OtherSendingsForSameOrder=Autres envois pour cette commande
 SendingsAndReceivingForSameOrder=Livraisons et recettes pour cet ordre
 SendingsToValidate=Livraisons à valider
 StatusSendingCanceled=Annulé
+StatusSendingCanceledShort=Annulé
 StatusSendingValidated=Validé (produits à expédier ou déjà expédiés)
 StatusSendingProcessed=Traité
 StatusSendingProcessedShort=Traité
diff --git a/htdocs/langs/fr_CA/withdrawals.lang b/htdocs/langs/fr_CA/withdrawals.lang
index d1c2577c8d4..75020c6fcaf 100644
--- a/htdocs/langs/fr_CA/withdrawals.lang
+++ b/htdocs/langs/fr_CA/withdrawals.lang
@@ -56,6 +56,7 @@ SEPAFormYourBAN=Votre nom de compte bancaire (IBAN)
 SEPAFormYourBIC=Votre code d'identification de banque (BIC)
 ModeFRST=Paiement unique
 PleaseCheckOne=Veuillez cocher un seul
+ICS=Creditor Identifier CI for direct debit
 InfoCreditSubject=Paiement de l'ordre de paiement de débit direct %s par la banque
 InfoCreditMessage=La ligne de paiement de débit direct %s a été payée par la banque <br> Données de paiement: %s
 InfoTransSubject=Transmission de l'ordre de paiement de débit direct %s à la banque
diff --git a/htdocs/langs/fr_CH/accountancy.lang b/htdocs/langs/fr_CH/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/fr_CH/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/fr_CH/compta.lang b/htdocs/langs/fr_CH/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/fr_CH/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/fr_CH/products.lang b/htdocs/langs/fr_CH/products.lang
deleted file mode 100644
index 6e900475275..00000000000
--- a/htdocs/langs/fr_CH/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/fr_CH/withdrawals.lang b/htdocs/langs/fr_CH/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/fr_CH/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/fr_CI/accountancy.lang b/htdocs/langs/fr_CI/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/fr_CI/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/fr_CI/compta.lang b/htdocs/langs/fr_CI/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/fr_CI/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/fr_CI/products.lang b/htdocs/langs/fr_CI/products.lang
deleted file mode 100644
index 6e900475275..00000000000
--- a/htdocs/langs/fr_CI/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/fr_CI/withdrawals.lang b/htdocs/langs/fr_CI/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/fr_CI/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/fr_CM/accountancy.lang b/htdocs/langs/fr_CM/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/fr_CM/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/fr_CM/compta.lang b/htdocs/langs/fr_CM/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/fr_CM/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/fr_CM/products.lang b/htdocs/langs/fr_CM/products.lang
deleted file mode 100644
index 6e900475275..00000000000
--- a/htdocs/langs/fr_CM/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/fr_CM/withdrawals.lang b/htdocs/langs/fr_CM/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/fr_CM/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index 7937bfcebbf..f829a086456 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=Tous les pays sauf %s
 AccountantFiles=Exporter les documents sources
 ExportAccountingSourceDocHelp=Avec cet outil, vous pouvez exporter les événements sources (liste et PDF) qui ont été utilisés pour générer votre comptabilité. Pour exporter vos journaux, utilisez l'entrée de menu %s - %s.
 VueByAccountAccounting=Vue par comptes comptables
+VueBySubAccountAccounting=Affichage par compte auxiliaire
 
 MainAccountForCustomersNotDefined=Compte comptable général pour les clients non défini dans la configuration
 MainAccountForSuppliersNotDefined=Compte comptable général pour les fournisseurs non défini dans la configuration
@@ -62,16 +63,16 @@ AccountancyAreaDescActionOnceBis=Les prochaines étapes doivent être faites pou
 AccountancyAreaDescActionFreq=Les actions suivantes sont habituellement exécutées chaque mois, semaine, ou jour pour les très grandes entreprises ...
 
 AccountancyAreaDescJournalSetup=Étape %s : Créer ou vérifier le contenu de la liste des journaux depuis le menu %s
-AccountancyAreaDescChartModel=ÉTAPE %s: Vérifiez qu'il existe un modèle de plan comptable ou créez-en un à partir du menu %s
-AccountancyAreaDescChart=ÉTAPE %s: Sélectionnez et | ou complétez votre plan de compte dans le menu %s
+AccountancyAreaDescChartModel=Étape %s : Vérifiez qu'il existe un modèle de plan comptable ou créez-en un à partir du menu %s
+AccountancyAreaDescChart=Étape %s : Sélectionnez et | ou complétez votre plan de compte dans le menu %s
 
 AccountancyAreaDescVat=Étape %s : Définissez les comptes comptables de chaque taux de TVA utilisé. Pour cela, suivez le menu suivant %s.
-AccountancyAreaDescDefault=Étape %s: Définir les comptes de comptabilité par défaut. Pour cela, utilisez l'entrée de menu %s.
+AccountancyAreaDescDefault=Étape %s : Définir les comptes de comptabilité par défaut. Pour cela, utilisez l'entrée de menu %s.
 AccountancyAreaDescExpenseReport=Étape %s : Définissez les comptes comptables par défaut des dépenses des notes de frais. Pour cela, suivez le menu suivant %s.
 AccountancyAreaDescSal=Étape %s : Définissez les comptes comptables de paiements de salaires. Pour cela, suivez le menu suivant %s.
 AccountancyAreaDescContrib=Étape %s : Définissez les comptes comptables des dépenses spéciales (taxes diverses). Pour cela, suivez le menu suivant %s.
 AccountancyAreaDescDonation=Étape %s : Définissez le compte comptable par défaut des dons. Pour cela, suivez le menu suivant %s.
-AccountancyAreaDescSubscription=ÉTAPE %s: définissez les comptes de comptabilité par défaut pour les abonnements des membres. Pour cela, utilisez l’entrée de menu %s.
+AccountancyAreaDescSubscription=Étape %s : définissez les comptes de comptabilité par défaut pour les abonnements des membres. Pour cela, utilisez l’entrée de menu %s.
 AccountancyAreaDescMisc=Étape %s : Définissez le compte par défaut obligatoire et les comptes comptables par défaut pour les transactions diverses. Pour cela, utilisez l'entrée du menu suivant %s.
 AccountancyAreaDescLoan=Étape %s : Définissez les comptes comptables par défaut des emprunts. Pour cela, suivez le menu suivant %s.
 AccountancyAreaDescBank=Étape %s : Définissez les comptes comptables et les codes des journaux de chaque compte bancaire et financier. Vous pouvez commencer à partir de la page %s.
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Non lié au compte comptable
 XLineSuccessfullyBinded=%s produits/service correctement liés à un compte comptable
 XLineFailedToBeBinded=%s produits/services n'ont pu être liés à un compte comptable
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Nombre d'éléments à lier représentés par page (maximum recommandé: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Nombre maximum de lignes pour les listes et les pages de liaison comptable (recommandé : 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Commencez le tri de la page "Lien à réaliser" par les éléments les plus récents
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Commencez le tri de la page "Liens réalisés" par les éléments les plus récents
 
@@ -199,6 +200,7 @@ Docref=Référence
 LabelAccount=Libellé du compte
 LabelOperation=Libellé opération
 Sens=Sens
+AccountingDirectionHelp=Pour le compte comptable d'un client, utilisez Crédit pour enregistrer un règlement reçu.<br>Pour le compte comptable d'un fournisseur, utilisez Débit pour enregistrer un règlement reçu.
 LetteringCode=Code de lettrage
 Lettering=Lettrage
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Libellé journal
 NumPiece=Numéro de pièce
 TransactionNumShort=Num. transaction
 AccountingCategory=Groupes personnalisés
-GroupByAccountAccounting=Grouper par compte comptable
+GroupByAccountAccounting=Affichage par compte comptable
+GroupBySubAccountAccounting=Affichage par compte auxiliaire
 AccountingAccountGroupsDesc=Vous pouvez définir ici des groupes de comptes comptable. Il seront utilisés pour les reporting comptables personnalisés
 ByAccounts=Par compte comptable
 ByPredefinedAccountGroups=Par groupes prédéfinis
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Paiement non lié à un produit / service
 OpeningBalance=Solde d'ouverture
 ShowOpeningBalance=Afficher balance d'ouverture
 HideOpeningBalance=Cacher balance d'ouverture
-ShowSubtotalByGroup=Afficher le sous-total par groupe
+ShowSubtotalByGroup=Afficher le sous-total par niveau
 
 Pcgtype=Groupe de comptes comptables
 PcgtypeDesc=Les groupes de comptes sont utilisés comme critères de filtre et de regroupement prédéfinis pour certains rapports de comptabilité. Par exemple, «INCOME» ou «EXPENSE» sont utilisés en tant que groupes pour la comptabilité afin de générer le rapport dépenses / revenus.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consultez ici la liste des lignes de notes de frais lié
 DescVentilExpenseReportMore=Si vous avez défini des comptes comptables au niveau des types de lignes notes de frais, l'application sera capable de faire l'association automatiquement entre les lignes de notes de frais et le compte comptable de votre plan comptable, en un simple clic sur le bouton <strong>"%s"</strong>. Si aucun compte n'a été défini au niveau du dictionnaire de types de lignes de notes de frais ou si vous avez toujours des lignes de notes de frais non liables automatiquement à un compte comptable, vous devez faire l'association manuellement depuis le menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consultez ici la liste des lignes des notes de frais et leur compte comptable
 
+Closure=Clôture annuelle
 DescClosure=Consultez ici le nombre de mouvements par mois non validés et les périodes fiscales déjà ouvertes
 OverviewOfMovementsNotValidated=Etape 1/ Aperçu des mouvements non validés. (Nécessaire pour clôturer un exercice comptable)
+AllMovementsWereRecordedAsValidated=Tous les mouvements ont été enregistrés et validés
+NotAllMovementsCouldBeRecordedAsValidated=Tous les mouvements n'ont pas pu être enregistrés et validés
 ValidateMovements=Valider les mouvements
 DescValidateMovements=Toute modification ou suppression d'écriture, de lettrage et de suppression sera interdite. Toutes les entrées pour un exercice doivent être validées, sinon la fermeture ne sera pas possible
-SelectMonthAndValidate=Sélectionnez le mois et validez les mouvements
 
 ValidateHistory=Lier automatiquement
 AutomaticBindingDone=Liaison automatique faite
@@ -293,6 +298,7 @@ Accounted=En comptabilité
 NotYetAccounted=Pas encore en comptabilité
 ShowTutorial=Afficher le tutoriel
 NotReconciled=Non rapproché
+WarningRecordWithoutSubledgerAreExcluded=Attention : toutes les opérations sans compte auxiliaire défini sont filtrées et exclues de cet écran
 
 ## Admin
 BindingOptions=Options de liaisons avec les codes comptables
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export pour LD Compta (v10 et supérieure)
 Modelcsv_openconcerto=Export pour OpenConcerto (Test)
 Modelcsv_configurable=Export configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (avec dates enregistrement et document inversées)
 Modelcsv_Sage50_Swiss=Export pour Sage 50 Suisse
 Modelcsv_winfic=Export pour Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export vers Gestinum (v3)
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 601ed14f0c1..a8521c09de1 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Affichage
 SetupArea=Configuration
 UploadNewTemplate=Téléverser un / des nouveau(x) modèle(s)
 FormToTestFileUploadForm=Formulaire de test d'envoi de fichier (selon options choisies)
+ModuleMustBeEnabled=Le module <b>%s</b>doit être activé
+ModuleIsEnabled=Le module <b>%s</b>à été désactivé
 IfModuleEnabled=Rem: oui est effectif uniquement si le module <b>%s</b> est activé
 RemoveLock=Effacer le fichier <b>%s</b> s'il existe afin d'autoriser l'outil de mise à jour.
 RestoreLock=Replacer un fichier <b>%s</b>, en ne donnant que les droits de lecture sur ce fichier, afin d'interdire à nouveau les mises à jour.
@@ -85,7 +87,6 @@ ShowPreview=Afficher aperçu
 ShowHideDetails=Afficher/masquer les détails
 PreviewNotAvailable=Aperçu non disponible
 ThemeCurrentlyActive=Thème actif actuellement
-CurrentTimeZone=Fuseau horaire PHP (serveur)
 MySQLTimeZone=Fuseau horaire MySQL (serveur)
 TZHasNoEffect=Les dates sont stockées et retournées par le serveur de base de données comme si elles étaient conservées sous forme de chaîne. Le fuseau horaire n'a d'effet que lorsque vous utilisez la fonction UNIX_TIMESTAMP (qui ne devrait pas être utilisé par Dolibarr, aussi le TZ de la base de données ne devrait avoir aucun effet, même si changé après que les données aient été saisies).
 Space=Espace
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Cet espace offre des fonctions d'administration diverses. Ut
 Purge=Purger
 PurgeAreaDesc=Cette page vous permet d'effacer tous les fichiers construits ou stockés par Dolibarr (fichiers temporaires ou tous les fichiers du répertoire <b>%s</b>). L'utilisation de cette fonction n'est pas nécessaire. Elle est fournie pour les utilisateurs qui hébergent Dolibarr chez un hébergeur qui n'offre pas les permissions de supprimer les fichiers sauvegardés par le serveur Web.
 PurgeDeleteLogFile=Effacer les fichiers de traces de debug, incluant <b>%s</b> défini dans le module 'Journaux et traces' (pas de risque de perte de données)
-PurgeDeleteTemporaryFiles=Effacer tous les fichiers temporaires (pas de risque de perte de données). Note: L'effacement n'est réalisé que si le répertoire temp a été créé depuis plus de 24h.
-PurgeDeleteTemporaryFilesShort=Effacer les fichiers temporaires
+PurgeDeleteTemporaryFiles=Effacer tous les fichiers de log et fichiers temporaires (pas de risque de perte de données). Note : La suppression s'applique aux fichiers supprimés depuis plus de 24 heures.
+PurgeDeleteTemporaryFilesShort=Effacer les fichiers de log et fichiers temporaires
 PurgeDeleteAllFilesInDocumentsDir=Effacer tous les fichiers du répertoire <b>%s</b>. <br>Les fichiers temporaires mais aussi les fichiers «dumps» de sauvegarde de base de données, les fichiers joints aux éléments (tiers, factures, ...) ou fichiers stockés dans le module GED seront irrémédiablement effacés.
 PurgeRunNow=Lancer la purge maintenant
 PurgeNothingToDelete=Aucun dossier ou fichier à supprimer.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Autres ressources
 ExternalResources=Ressources externes
 SocialNetworks=Réseaux sociaux
+SocialNetworkId=ID du réseau social
 ForDocumentationSeeWiki=Pour la documentation utilisateur, développeur ou les FAQs,<br>consultez le wiki Dolibarr:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Pour tout autre question/aide, vous pouvez utiliser le forum Dolibarr:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Voici quelques ressources pour obtenir de l’aide et du support avec Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Exemples avec la configuration actuelle
 ListOfDirectories=Liste des répertoires des modèles OpenDocument
 ListOfDirectoriesForModelGenODT=Liste des répertoires contenant des documents modèles au format OpenDocument.<br><br>Indiquer ici les chemins complets de répertoire.<br>Ajouter un retour à la ligne entre chaque répertoire.<br>Pour indiquer un répertoire du module GED, mettre ici <b>DOL_DATA_ROOT/ecm/nomdurepertoireged</b><br><br>Les fichiers modèles dans ces répertoires doivent se terminer par <b>.odt</b> ou <b>.ods</b>.
 NumberOfModelFilesFound=Nombre de fichiers modèles ODT/ODS trouvés dans ce(s) répertoire(s)
-ExampleOfDirectoriesForModelGen=Exemple de syntaxe :<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Exemples de syntaxe : <br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Pour savoir comment rédiger des modèles de document odt avant de les placer dans un de ces répertoires, consulter la documentation du wiki :
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Créer_un_modèle_de_document_ODT
 FirstnameNamePosition=Ordre d'affichage prénom/nom
@@ -406,7 +408,7 @@ UrlGenerationParameters=Sécurisation des URLs
 SecurityTokenIsUnique=Utiliser un paramètre securekey unique pour chaque URL ?
 EnterRefToBuildUrl=Entrer la référence pour l'objet %s
 GetSecuredUrl=Obtenir l'URL calculée
-ButtonHideUnauthorized=Cacher les boutons non autorisés, pour les utilisateurs non admin, au lieu de les voir grisés
+ButtonHideUnauthorized=Cacher les boutons non autorisés pour les utilisateurs internes également (sinon, il seront seulement grisés)
 OldVATRates=Ancien taux de TVA
 NewVATRates=Nouveau taux de TVA
 PriceBaseTypeToChange=Modifier sur les prix dont la référence de base est le
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Menus personalisés non liés à un menu haut
 NewMenu=Nouveau menu
 MenuHandler=Gestionnaire de menu
 MenuModule=Module source
-HideUnauthorizedMenu= Masquer les menus non autorisés aussi pour les utilisateurs internes (sinon juste grisés)
+HideUnauthorizedMenu=Cacher les menus non autorisés aussi pour les utilisateurs internes également (sinon, il seront seulement grisés)
 DetailId=Identifiant du menu
 DetailMenuHandler=Nom du gestionnaire menu dans lequel faire apparaitre le nouveau menu
 DetailMenuModule=Nom du module si l'entrée menu est issue d'un module
@@ -1983,11 +1985,12 @@ EMailHost=Hôte du serveur de messagerie IMAP
 MailboxSourceDirectory=Répertoire source de la boîte aux lettres
 MailboxTargetDirectory=Répertoire cible de la boîte aux lettres
 EmailcollectorOperations=Opérations à effectuer par le collecteur
+EmailcollectorOperationsDesc=Les opérations sont exécutées de haut en bas
 MaxEmailCollectPerCollect=Nombre maximum d'emails collectés par collecte
 CollectNow=Collecter maintenant
 ConfirmCloneEmailCollector=Êtes-vous sûr de vouloir cloner ce collecteur de courrier électronique %s?
-DateLastCollectResult=Date de dernière collecte essayée
-DateLastcollectResultOk=Date de dernière collecte réussie
+DateLastCollectResult=Date de la dernière tentative de collecte
+DateLastcollectResultOk=Date de la dernière collecte réussie
 LastResult=Dernier résultat
 EmailCollectorConfirmCollectTitle=Confirmation de la collecte Email
 EmailCollectorConfirmCollect=Voulez-vous exécuter la collecte pour ce collecteur maintenant ?
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Pays (si spécifique à un pays donné)
 YouMayFindSecurityAdviceHere=Trouvez ici des conseils de sécurité.
 ModuleActivatedMayExposeInformation=Ce module peut exposer des données sensibles. Si il n'est pas nécessaire, désactivez-le.
 ModuleActivatedDoNotUseInProduction=Un module conçu pour le développement a été activé. Ne l'activez pas sur un environnement de production
+CombinationsSeparator=Séparateur de caractères pour les combinaisons de produits
+SeeLinkToOnlineDocumentation=Suivez le lien vers la documentation en ligne depuis le menu du haut pour des exemples
+SHOW_SUBPRODUCT_REF_IN_PDF=Afficher les détails des sous-produits d'un kit dans les PDF si la fonctionnalité "%s" du module <b>%s</b> est activée.
+AskThisIDToYourBank=Contacter votre établissement bancaire pour obtenir ce code
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index 3b7a9f0e8c0..072fd057dbf 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Nombre d'événements
 ListOfActions=Liste des événements
 EventReports=Rapport des évènements
 Location=Lieu
-ToUserOfGroup=Assigné à tout utilisateur du groupe
+ToUserOfGroup=Événement assigné à tout utilisateur du groupe
 EventOnFullDay=Événement sur la(les) journée(s)
 MenuToDoActions=Événements incomplets
 MenuDoneActions=Événements terminés
@@ -152,6 +152,7 @@ ActionType=Type événement
 DateActionBegin=Date début événément
 ConfirmCloneEvent=Êtes-vous sûr de vouloir cloner cet événement <b>%s</b> ?
 RepeatEvent=Evénement répétitif
+OnceOnly=Une seule fois
 EveryWeek=Chaque semaine
 EveryMonth=Chaque mois
 DayOfMonth=Jour du mois
@@ -160,10 +161,9 @@ DateStartPlusOne=Date de début + 1 heure
 SetAllEventsToTodo=Réglez tous les événements à "A faire"
 SetAllEventsToInProgress=Définir tous les événements à "En cours"
 SetAllEventsToFinished=Définir tous les événements sur "Terminés"
-ReminderTime=Délai de rappel avant l'événement
+ReminderTime=Période de rappel avant l'événement
 TimeType=Type de durée
 ReminderType=Type de rappel
-AddReminder=Créer une notification de rappel automatique pour cet évènement
-ErrorReminderActionCommCreation=Erreur lors de la création de la notification de rappel de cet événement
-BrowserPush=Notification navigateur
-EventReminder=Rappel événement
+AddReminder=Créer une notification de rappel automatique pour cet événement
+ErrorReminderActionCommCreation=Erreur lors de la création de la notification de rappel pour cet événement
+BrowserPush=Notification par Popup navigateur
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index 17a6d56823f..74f682dffb3 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -173,7 +173,7 @@ SEPAMandate=Mandat SEPA
 YourSEPAMandate=Votre mandat SEPA
 FindYourSEPAMandate=Voici votre mandat SEPA pour autoriser notre société à réaliser les prélèvements depuis votre compte bancaire. Merci de retourner ce mandat signé (scan du document signé) ou en l'envoyant par courrier à 
 AutoReportLastAccountStatement=Remplissez automatiquement le champ 'numéro de relevé bancaire' avec le dernier numéro lors du rapprochement
-CashControl=Clôture de caisse
+CashControl=Contrôle de caisse POS
 NewCashFence=Nouvelle clôture de caisse
 BankColorizeMovement=Coloriser les mouvements
 BankColorizeMovementDesc=Si cette fonction est activée, vous pouvez choisir une couleur de fond spécifique pour les mouvements de débit ou de crédit.
diff --git a/htdocs/langs/fr_FR/blockedlog.lang b/htdocs/langs/fr_FR/blockedlog.lang
index c0619d33371..be1cefc6ef7 100644
--- a/htdocs/langs/fr_FR/blockedlog.lang
+++ b/htdocs/langs/fr_FR/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Logs inaltérables
 ShowAllFingerPrintsMightBeTooLong=Afficher tous les journaux archivés (peut être long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Afficher tous les journaux d'archives non valides (peut être long)
 DownloadBlockChain=Télécharger les empreintes
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Le journal archivé n'est pas valide. Cela signifie que quelqu'un (un pirate informatique ?) a modifié certaines données de ce journal archivé après son enregistrement ou a effacé l'enregistrement archivé précédent (vérifiez que la ligne avec le numéro précédent existe).
 OkCheckFingerprintValidity=Le journal archivé est valide. Les données de cette ligne n'ont pas été modifiées et l'enregistrement suit le précédent.
 OkCheckFingerprintValidityButChainIsKo=Le journal archivé semble valide par rapport au précédent mais la chaîne était corrompue auparavant.
 AddedByAuthority=Stocké dans une autorité distante
diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang
index e2964afd6a3..c889696c75e 100644
--- a/htdocs/langs/fr_FR/boxes.lang
+++ b/htdocs/langs/fr_FR/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Les %s derniers dons modifiés
 BoxTitleLastModifiedExpenses=Les %s dernières notes de frais modifiées
 BoxTitleLatestModifiedBoms=Les %s dernières nomenclatures modifiées
 BoxTitleLatestModifiedMos=Les %s dernières Ordres de Fabrication modifiées
+BoxTitleLastOutstandingBillReached=Clients dont l'en-cours autorisé est dépassé
 BoxGlobalActivity=Activité globale (factures, propositions, commandes)
 BoxGoodCustomers=Bons clients
 BoxTitleGoodCustomers=%s bons clients
+BoxScheduledJobs=Travaux planifiés
+BoxTitleFunnelOfProspection=Tunnel de prospection
 FailedToRefreshDataInfoNotUpToDate=Échec du rafraichissement du flux RSS. Date du dernier rafraichissement : %s
 LastRefreshDate=Date dernier rafraichissement
 NoRecordedBookmarks=Pas de marques-pages personnels.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Le compte d'attente n'est pas défini
 BoxLastCustomerShipments=Dernières expéditions clients
 BoxTitleLastCustomerShipments=Les %s dernières expéditions clients 
 NoRecordedShipments=Aucune expédition client
+BoxCustomersOutstandingBillReached=Clients dont l'en-cours de facturation est dépassé
 # Pages
 AccountancyHome=Comptabilité
+ValidatedProjects=Projets validés
diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang
index 525062f1f32..5e292b0b637 100644
--- a/htdocs/langs/fr_FR/cashdesk.lang
+++ b/htdocs/langs/fr_FR/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Bas de page
 AmountAtEndOfPeriod=Montant en fin de période (jour, mois ou année)
 TheoricalAmount=Montant théorique
 RealAmount=Montant réel
-CashFence=Clôture de caisse
-CashFenceDone=Clôture de caisse faite pour la période
+CashFence=Fermeture de caisse
+CashFenceDone=Clôture de caisse effectuée pour la période
 NbOfInvoices=Nb de factures
 Paymentnumpad=Type de pavé pour entrer le paiement
 Numberspad=Pavé numérique
@@ -99,7 +99,8 @@ CashDeskRefNumberingModules=Module de numérotation pour le POS
 CashDeskGenericMaskCodes6 = <br>La balise <b> {TN} </b> est utilisée pour ajouter le numéro de terminal
 TakeposGroupSameProduct=Regrouper les mêmes lignes de produits
 StartAParallelSale=Lancer une nouvelle vente en parallèle
-ControlCashOpening=Fenêtre de contrôle de caisse à l'ouverture du PDV
+SaleStartedAt=Ventes démarrées le %s
+ControlCashOpening=Pop-up de contrôle de caisse à l'ouverture du POS
 CloseCashFence=Clôturer la caisse
 CashReport=Rapport de caisse
 MainPrinterToUse=Imprimante principale à utiliser
@@ -121,4 +122,5 @@ GiftReceiptButton=Ajouter un bouton "Reçu cadeau"
 GiftReceipt=Reçu cadeau
 ModuleReceiptPrinterMustBeEnabled=Le module Imprimante de reçus doit d'abord avoir été activée
 AllowDelayedPayment=Autoriser le paiement différé
-PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+PrintPaymentMethodOnReceipts=Imprimer le mode de paiement sur les tickets | reçus
+WeighingScale=échelle de poids
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index f69d8573827..a28bf476eeb 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Zone des tags/catégories des projets
 UsersCategoriesArea=Espace tags/catégories des utlisateurs
 SubCats=Sous-catégories
 CatList=Liste des tags/catégories
+CatListAll=Liste de toutes les catégories (de tous types)
 NewCategory=Nouveau tag/catégorie
 ModifCat=Modifier tag/catégorie
 CatCreated=Tags/catégorie créé(e)
@@ -65,22 +66,22 @@ UsersCategoriesShort=Tags utlisateurs
 StockCategoriesShort=Tags/catégories d’entrepôt
 ThisCategoryHasNoItems=Cette catégorie ne contient aucun élément.
 CategId=ID du(de la) tag/catégorie
-ParentCategory=Tag/catégorie parent
-ParentCategoryLabel=Libellé du/de la tag/catégorie parent
-CatSupList=Liste des tags/catégories de fournisseurs
-CatCusList=Liste des tags/catégories de clients/prospects
+ParentCategory=Catégorie parente
+ParentCategoryLabel=Libellé du tag/catégorie parent
+CatSupList=Liste des tags/catégories des fournisseurs
+CatCusList=Liste des tags/catégories des clients/prospects
 CatProdList=Liste des tags/catégories de produits/services
 CatMemberList=Liste des tags/catégories de membres
-CatContactList=Liste des tags/catégories de contacts
-CatProjectsList=Liste des tags/catégories de projets
-CatUsersList=Liste des tags/catégories d'utilisateurs
+CatContactList=Liste des tags/catégories des contacts
+CatProjectsList=Liste des tags/catégories des projets
+CatUsersList=Liste des tags/catégories des utilisateurs
 CatSupLinks=Liens entre fournisseurs et tags/catégories
 CatCusLinks=Liens entre clients/prospects et tags/catégories
 CatContactsLinks=Liens entre contacts/adresses et tags/catégories
 CatProdLinks=Liens entre produits/services et tags/catégories
 CatMembersLinks=Liens entre membres et tags/catégories
 CatProjectsLinks=Liens entre projets et tags/catégories
-CatUsersLinks=Liens entre utilisateurs et tags/catégories
+CatUsersLinks=Liaisons entre les utilisateurs et les tags/catégories
 DeleteFromCat=Enlever des tags/catégories
 ExtraFieldsCategories=Attributs supplémentaires
 CategoriesSetup=Configuration des tags/catégories
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index 1fc19440a1c..c07b5c4611f 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -213,7 +213,7 @@ ProfId1MA=Id. prof. 1 (R.C.)
 ProfId2MA=Id. prof. 2 (Patente)
 ProfId3MA=Id. prof. 3 (I.F.)
 ProfId4MA=Id. prof. 4 (C.N.S.S.)
-ProfId5MA=Identifiant Commun de l’Entreprise (ICE)
+ProfId5MA=Identifiant Commun d’Entreprise (ICE)
 ProfId6MA=-
 ProfId1MX=Id. prof. 1 (R.F.C).
 ProfId2MX=ID. prof. 2 (R..P. IMSS)
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index bc79d32d709..648d8541d28 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -111,7 +111,7 @@ Refund=Rembourser
 SocialContributionsPayments=Paiements de charges fiscales/sociales
 ShowVatPayment=Affiche paiement TVA
 TotalToPay=Total à payer
-BalanceVisibilityDependsOnSortAndFilters=Le solde est visible dans cette liste que si la table est triée en ordre croissant sur %s et filtré pour 1 compte bancaire
+BalanceVisibilityDependsOnSortAndFilters=Le solde est visible dans cette liste que si la table est triée sur %s et filtré sur 1 compte bancaire (sans autres filtres)
 CustomerAccountancyCode=Code comptable client
 SupplierAccountancyCode=Code comptable fournisseur
 CustomerAccountancyCodeShort=Compte comptable client
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Bilan des recettes et dépenses, résumé annuel
 AnnualByCompanies=Balance revenus et dépenses, par groupes prédéfinis de comptes
 AnnualByCompaniesDueDebtMode=Bilan des recettes et dépenses, détaillé par regroupements prédéfinis, mode <b>%sCréances-Dettes%s</b> dit <b>comptabilité d'engagement</b>.
 AnnualByCompaniesInputOutputMode=Bilan des recettes et dépenses, détaillé par regroupements prédéfinis, mode <b>%sRecettes-Dépenses%s</b> dit <b>comptabilité de caisse</b>.
-SeeReportInInputOutputMode=Voir %sanalyse des paiements%s pour un calcul sur les paiements réels effectués même s'ils ne sont pas encore comptabilisés dans le Grand Livre.
-SeeReportInDueDebtMode=Voir %sanalyse des factures%s pour un calcul basé sur les factures enregistrées connues même si elles ne sont pas encore comptabilisées dans le Grand Livre.
-SeeReportInBookkeepingMode=Voir le <b> %sRapport sur le Grand Livre%s </b> pour un calcul sur les <b> tables du Grand Livre</b>
+SeeReportInInputOutputMode=Voir <b>%sanalyse des paiements%s</b> pour un calcul sur les <b>paiements réels effectués</b> même s'ils ne sont pas encore comptabilisés dans le grand livre.
+SeeReportInDueDebtMode=Voir <b>%sanalyse des documents enregistrés%s </b>pour un calcul basé sur les <b>documents enregistrées</b> même s'ils ne sont pas encore comptabilisés dans le Grand Livre.
+SeeReportInBookkeepingMode=Voir <b> %sanalyse du grand livre%s </b> pour un rapport basé sur la <b>comptabilité</b>
 RulesAmountWithTaxIncluded=- Les montants affichés sont les montants taxe incluse
 RulesResultDue=- Il comprend les factures impayées, les dépenses, la TVA, les dons, qu'ils soient payées ou non. Il comprend également les salaires versés. <br> - Il est basé sur la date de facturation des factures et sur la date des dépenses et paiement des taxes. Pour les salaires définis avec le module Salaire, la date de valeur du paiement est utilisée.
 RulesResultInOut=- Il comprend les paiements réels effectués sur les factures, les dépenses, la TVA et les salaires. <br> - Il est basé sur les dates de paiement des factures, les dépenses, la TVA et les salaires. La date du don pour le don.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Cela inclut les enregistrements dans votre Gr
 SeePageForSetup=Voir le menu <a href="%s"> %s </a> pour la configuration
 DepositsAreNotIncluded=- Les factures d'acomptes ne sont pas incluses
 DepositsAreIncluded=- Les factures d'acomptes sont incluses
+LT1ReportByMonth=Rapport de taxe 2 par mois
+LT2ReportByMonth=Rapport de taxe 3 par mois
 LT1ReportByCustomers=Rapport Tax 2 par Tiers
 LT2ReportByCustomers=Rapport Tax 3 par Tiers
 LT1ReportByCustomersES=Rapport par tiers des RE
 LT2ReportByCustomersES=Rapport par client des IRPF
 VATReport=Rapport TVA
 VATReportByPeriods=Rapport de TVA par période
+VATReportByMonth=Rapport de TVA par mois
 VATReportByRates=Rapport TVA par taux
 VATReportByThirdParties=Rapport TVA par Tiers
 VATReportByCustomers=Rapport par client
diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang
index b154c5de72c..5d7b0fc7462 100644
--- a/htdocs/langs/fr_FR/cron.lang
+++ b/htdocs/langs/fr_FR/cron.lang
@@ -84,4 +84,8 @@ MakeLocalDatabaseDumpShort=Sauvegarde locale de base
 MakeLocalDatabaseDump=Créez un fichier dump de base local. Les paramètres sont: compression ('gz' ou 'bz' ou 'none'), type de sauvegarde ('mysql', 'pgsql', 'auto'), 1, 'auto' ou nom du fichier à générer, nombre de fichiers de sauvegarde à garder
 WarningCronDelayed=Attention, à des fins de performance, quelle que soit la prochaine date d'exécution des travaux activés, vos travaux peuvent être retardés jusqu'à %s heures avant d'être exécutés.
 DATAPOLICYJob=Nettoyeur de données et anonymiseur
-JobXMustBeEnabled=Le poste %s doit être activé
+JobXMustBeEnabled=La tâche planifiée %s doit être activée
+# Cron Boxes
+LastExecutedScheduledJob=Dernier travail planifié exécuté
+NextScheduledJobExecute=Prochaine travail planifié à exécuter
+NumberScheduledJobError=Nombre de travaux planifiées en erreur
diff --git a/htdocs/langs/fr_FR/deliveries.lang b/htdocs/langs/fr_FR/deliveries.lang
index 29cbd5736cf..bd13cce814c 100644
--- a/htdocs/langs/fr_FR/deliveries.lang
+++ b/htdocs/langs/fr_FR/deliveries.lang
@@ -27,6 +27,6 @@ Recipient=Destinataire
 ErrorStockIsNotEnough=Le stock est insuffisant
 Shippable=Expédiable
 NonShippable=Non expédiable
-ShowShippableCommand=Afficher statut expédiabilité
+ShowShippableStatus=Afficher le statut Expédiable
 ShowReceiving=Afficher le bon de réception
 NonExistentOrder=Commande inexistante
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index abd1c6ec9f9..f2e046506f7 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -5,9 +5,10 @@ NoErrorCommitIsDone=Pas d'erreur, on valide
 # Errors
 ErrorButCommitIsDone=Erreurs trouvées mais on valide malgré tout
 ErrorBadEMail=email %s invalide
+ErrorBadMXDomain=L'adresse e-mail %s ne semble pas correcte (le domaine n'a pas d'enregistrement MX valide)
 ErrorBadUrl=Url %s invalide
 ErrorBadValueForParamNotAString=Mauvaise valeur de paramètre. Ceci arrive lors d'une tentative de traduction d'une clé non renseignée.
-ErrorRefAlreadyExists=La référence %s existe déjà.
+ErrorRefAlreadyExists=La référence <b>%s</b> existe déjà.
 ErrorLoginAlreadyExists=L'identifiant %s existe déjà.
 ErrorGroupAlreadyExists=Le groupe %s existe déjà.
 ErrorRecordNotFound=Enregistrement non trouvé.
@@ -49,6 +50,7 @@ ErrorFieldsRequired=Des champs obligatoires n'ont pas été renseignés
 ErrorSubjectIsRequired=Le sujet du mail est obligatoire
 ErrorFailedToCreateDir=Echec à la création d'un répertoire. Vérifiez que le user du serveur Web ait bien les droits d'écriture dans les répertoires documents de Dolibarr. Si le paramètre <b>safe_mode</b> a été activé sur ce PHP, vérifiez que les fichiers php dolibarr appartiennent à l'utilisateur du serveur Web.
 ErrorNoMailDefinedForThisUser=Email non défini pour cet utilisateur
+ErrorSetupOfEmailsNotComplete=La configuration de l'envoi des e-mails n'est pas terminée
 ErrorFeatureNeedJavascript=Cette fonctionnalité a besoin de javascript activé pour fonctionner. Modifiez dans configuration - affichage.
 ErrorTopMenuMustHaveAParentWithId0=Un menu de type 'Top' ne peut avoir de menu père. Mettre 0 dans l'id père ou choisir un menu de type 'Left'.
 ErrorLeftMenuMustHaveAParentId=Un menu de type 'Left' doit avoir un id de père.
@@ -76,7 +78,7 @@ ErrorExportDuplicateProfil=Ce nom de profil existe déjà pour ce lot d'export.
 ErrorLDAPSetupNotComplete=Le matching Dolibarr-LDAP est incomplet.
 ErrorLDAPMakeManualTest=Un fichier .ldif a été généré dans le répertoire %s. Essayez de charger ce fichier manuellement depuis la ligne de commande pour plus de détail sur l'erreur.
 ErrorCantSaveADoneUserWithZeroPercentage=Impossible de sauver une action à l'état "non commencé" si le champ "réalisé par" est aussi défini.
-ErrorRefAlreadyExists=La référence utilisée pour la création existe déjà
+ErrorRefAlreadyExists=Le référence <b>%s</b> existe déjà.
 ErrorPleaseTypeBankTransactionReportName=Choisissez le nom du relevé bancaire sur lequel la ligne est rapportées (Format AAAAMM ou AAAAMMJJ)
 ErrorRecordHasChildren=Impossible de supprimer l'enregistrement car il possède des enregistrements fils.
 ErrorRecordHasAtLeastOneChildOfType=L'objet a au moins un enfant de type %s
@@ -217,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Vous devez choisir si l'article e
 ErrorDiscountLargerThanRemainToPaySplitItBefore=La réduction que vous essayez d'appliquer est supérieure au montant du paiement. Auparavant, divisez le rabais en 2 rabais plus petits.
 ErrorFileNotFoundWithSharedLink=Fichier non trouvé. Peut être que la clé de partage a été modifiée ou le fichier a été récemment supprimé.
 ErrorProductBarCodeAlreadyExists=Le code-barre du produit %s existe déjà sur une autre référence de produit
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Notez également que l'utilisation d'un produit virtuel pour augmenter ou réduire automatiquement les sous-produits n'est pas possible lorsqu'au moins un sous-produit (ou sous-produit de sous-produits) a besoin d'un numéro de série/lot.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Notez également que l'utilisation d'un kit pour augmenter ou réduire automatiquement les sous-produits n'est pas possible lorsqu'au moins un sous-produit (ou sous-produit de sous-produits) a besoin d'un numéro de série/lot.
 ErrorDescRequiredForFreeProductLines=La description est obligatoire pour les lignes avec un produit non prédéfini
 ErrorAPageWithThisNameOrAliasAlreadyExists=La page / container <strong> %s </strong> a le même nom ou un autre alias que celui que vous tentez d'utiliser.
 ErrorDuringChartLoad=Erreur lors du chargement du tableau de compte. Si certains comptes n'ont pas été chargés, vous pouvez toujours les entrer manuellement.
@@ -244,6 +246,16 @@ ErrorReplaceStringEmpty=Erreur, la chaîne à remplacer est vide
 ErrorProductNeedBatchNumber=Erreur, le produit '<b> %s </b>' a besoin d'un numéro de lot/série
 ErrorProductDoesNotNeedBatchNumber=Erreur, le produit '<b> %s </b>' n'accepte pas un numéro de lot/série
 ErrorFailedToReadObject=Erreur, échec de la lecture de l'objet de type <b> %s </b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Erreur, le paramètre <b> %s </b> doit être activé dans <b> conf/conf.php <b> pour permettre l'utilisation de l'interface de ligne de commande par le planificateur de travaux interne
+ErrorLoginDateValidity=Erreur, cet identifiant est hors de la plage de date de validité
+ErrorValueLength=La longueur du champ <b>%s</b> doit être supérieure à <b>%s</b>
+ErrorReservedKeyword=Le terme '<b>%s</b>' est un mot clé réservé
+ErrorNotAvailableWithThisDistribution=Non disponible dans cette distribution
+ErrorPublicInterfaceNotEnabled=L’interface publique n’a pas été activée
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=La langue d'une nouvelle page, si elle est la traduction d'une autre page, doit être définie
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=La langue d'une nouvelle page, si elle est définie comme traduction d'une autre page, ne peut pas être la langue principale.
+ErrorAParameterIsRequiredForThisOperation=Un paramètre est obligatoire pour cette opération
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Votre paramètre PHP upload_max_filesize (%s) est supérieur au paramètre PHP post_max_size (%s). Ceci n'est pas une configuration cohérente.
 WarningPasswordSetWithNoAccount=Un mot de passe a été fixé pour cet adhérent. Cependant, aucun compte d'utilisateur n'a été créé. Donc, ce mot de passe est stocké, mais ne peut être utilisé pour accéder à Dolibarr. Il peut être utilisé par un module/interface externe, mais si vous n'avez pas besoin de définir ni login ni mot de passe pour un adhérent, vous pouvez désactiver l'option «Gérer un login pour chaque adhérent" depuis la configuration du module Adhérents. Si vous avez besoin de gérer un login, mais pas de mot de passe, vous pouvez laisser ce champ vide pour éviter cet avertissement. Remarque: L'email peut également être utilisé comme login si l'adhérent est lié à un utilisateur.
@@ -268,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Votre identifiant a été modifié. Par s
 WarningAnEntryAlreadyExistForTransKey=Une donnée identique existe déjà pour la traduction du code dans cette langue
 WarningNumberOfRecipientIsRestrictedInMassAction=Attention, le nombre de destinataires différents est limité à <b>%s</b> lorsque vous utilisez les actions en masse sur les listes
 WarningDateOfLineMustBeInExpenseReportRange=Attention, la date de la ligne n'est pas dans la plage de la note de frais
+WarningProjectDraft=Le projet est au statut brouillon. Validez-le pour utiliser les tâches
 WarningProjectClosed=Le projet est fermé. Vous devez d'abord le rouvrir.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Certaines transactions bancaires ont été supprimées après que le relevé les incluant ait été généré. Aussi, le nombre de chèques et le total des encaissements peuvent différer du nombre et du total dans la liste.
 WarningFailedToAddFileIntoDatabaseIndex=Avertissement, échec de l’ajout d’une entrée de fichier dans le tableau d’index de la base de données GED
+WarningTheHiddenOptionIsOn=Attention, l'option cachée <b>%s</b> est activée
+WarningCreateSubAccounts=Attention, vous ne pouvez pas créer directement un compte auxiliaire, vous devez créer un tiers ou un utilisateur et leur attribuer un code comptable pour les retrouver dans cette liste
+WarningAvailableOnlyForHTTPSServers=Disponible uniquement si une connexion sécurisée HTTPS est utilisée
diff --git a/htdocs/langs/fr_FR/exports.lang b/htdocs/langs/fr_FR/exports.lang
index 3de20e83d20..c3c426daf4e 100644
--- a/htdocs/langs/fr_FR/exports.lang
+++ b/htdocs/langs/fr_FR/exports.lang
@@ -133,4 +133,4 @@ KeysToUseForUpdates=Clé à utiliser pour mettre à jour les données
 NbInsert=Nombre de lignes insérées: %s
 NbUpdate=Nombre de lignes mises à jour: %s
 MultipleRecordFoundWithTheseFilters=Plusieurs enregistrements ont été trouvés avec ces filtres: %s
-StocksWithBatch=Stocks et emplacements (entrepôts) des produits avec numéros de lots/séries
\ No newline at end of file
+StocksWithBatch=Stocks et entrepôts des produits avec numéro de lot/série
diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang
index 29d8c39b8b3..f696c06c241 100644
--- a/htdocs/langs/fr_FR/install.lang
+++ b/htdocs/langs/fr_FR/install.lang
@@ -133,7 +133,7 @@ MigrationCustomerOrderShipping=Mise à jour stockage des expéditions des comman
 MigrationShippingDelivery=Mise à jour stockage des expéditions
 MigrationShippingDelivery2=Mise à jour stockage des expéditions 2
 MigrationFinished=Migration terminée
-LastStepDesc=<strong> Dernière étape </strong>: définissez ici le nom d'utilisateur et le mot de passe que vous souhaitez utiliser pour vous connecter à Dolibarr. <b> Ne perdez pas cette information, car il s’agit du compte principal pour administrer tous les comptes d’utilisateurs supplémentaires / supplémentaires. </b>
+LastStepDesc=<strong> Dernière étape </strong>: définissez ici le nom d'utilisateur et le mot de passe que vous souhaitez utiliser pour vous connecter à Dolibarr. <b> Ne perdez pas cette information, car il s’agit du compte principal pour administrer tous les comptes d’utilisateurs autres / supplémentaires. </b>
 ActivateModule=Activation du module %s
 ShowEditTechnicalParameters=Cliquer ici pour afficher/éditer les paramètres techniques (mode expert)
 WarningUpgrade=Attention:\nAvez-vous d'abord effectué une sauvegarde de base de données?\nCeci est hautement recommandé. Une perte de données (due par exemple à des bogues dans mysql version 5.5.40/41/42/43) peut être possible au cours de ce processus. Il est donc essentiel de réaliser un vidage complet de votre base de données avant de commencer toute migration.\n\nCliquez sur OK pour démarrer le processus de migration ...
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index 66bc8728cd4..418c76be10e 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=E-mails entrés par l'utilisateur
 MailingModuleDescDolibarrUsers=Utilisateurs avec e-mail
 MailingModuleDescThirdPartiesByCategories=Tiers (par catégories/tags)
 SendingFromWebInterfaceIsNotAllowed=L'envoyer depuis l'interface Web n'est pas autorisé.
+EmailCollectorFilterDesc=Tous les filtres doivent correspondre pour qu'un e-mail soit collecté
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Ligne %s du fichier
@@ -125,12 +126,13 @@ TagMailtoEmail=Email destinataire (incluant le lien "mailto:" html)
 NoEmailSentBadSenderOrRecipientEmail=Aucune email envoyé. Mauvais email expéditeur ou le destinataire. Vérifiez le profil de l'utilisateur.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=Aucune notification par email n'est prévue pour cet événement et société
-ANotificationsWillBeSent=1 notification va être envoyée par email
-SomeNotificationsWillBeSent=%s notifications vont être envoyées par email
-AddNewNotification=Activer un nouveau couple cible/évènement pour notification email
-ListOfActiveNotifications=Liste des cibles/évènements actifs pour notification par emails
-ListOfNotificationsDone=Liste des notifications emails envoyées
+NotificationsAuto=Notifications automatiques
+NoNotificationsWillBeSent=Aucune notification automatique prévue pour ce type d'événement et de tiers.
+ANotificationsWillBeSent=1 notification automatique sera envoyée par e-mail
+SomeNotificationsWillBeSent=%s notification(s) automatique(s) sera enviyée par e-mail
+AddNewNotification=Souscrire à une nouvelle notification automatique (cible/évènement)
+ListOfActiveNotifications=Liste de toutes les souscriptions (cibles/évènements) pour des notifications emails automatiques
+ListOfNotificationsDone=Liste des toutes les notifications automatiques envoyées par e-mail
 MailSendSetupIs=La configuration d'envoi d'emails a été définir sur '%s'. Ce mode ne peut pas être utilisé pour envoyer des e-mailing en masse.
 MailSendSetupIs2=Vous devez d'abord aller, avec un compte d'administrateur, dans le menu %sAccueil - Configuration - EMails%s pour changer le paramètre <strong>'%s'</strong> pour utiliser le mode '%s'. Avec ce mode, vous pouvez entrer le paramétrage du serveur SMTP fourni par votre fournisseur de services Internet et utiliser la fonction d'envoi d'email en masse.
 MailSendSetupIs3=Si vous avez des questions sur la façon de configurer votre serveur SMTP, vous pouvez demander à %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Le fichier d'import doit être au format <strong>emai
 UseFormatInputEmailToTarget=Saisissez une chaîne de caractères au format <strong>email;nom;prénom;autre</strong>
 MailAdvTargetRecipients=Destinataires (sélection avancée)
 AdvTgtTitle=Remplissez les champs de saisie pour pré-sélectionner les tiers ou contacts/adresses cibles
-AdvTgtSearchTextHelp=Utilisez %% comme caractères génériques. Par exemple, pour rechercher tous les éléments tels que <b> jean, joe, jim </b>, vous pouvez saisir <b>j%%</b>, vous pouvez également utiliser ; comme séparateur de valeur et utiliser ! pour exclure cette valeur. Par exemple, <b> jean; joe; jim%%;! jimo;!jima%</b> ciblera tous les jean, joe, commence par jim mais pas jimo et pas tout ce qui commence par jima.
+AdvTgtSearchTextHelp=Utilisez %% comme caractères génériques. Par exemple, pour rechercher tous les éléments tels que <b> jean, joe, jim </b>, vous pouvez saisir <b>j%%</b>, vous pouvez également utiliser ; comme séparateur de valeur et utiliser ! pour exclure cette valeur. Par exemple, <b> jean; joe; jim%%;! jimo;!jima%%</b> ciblera tous les jean, joe, ce qui commence par jim mais pas jimo et pas tout ce qui commence par jima.
 AdvTgtSearchIntHelp=Utiliser un intervalle pour sélectionner un entier ou décimal
 AdvTgtMinVal=Valeur minimum
 AdvTgtMaxVal=Valeur maximum
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Créer filtre
 AdvTgtOrCreateNewFilter=Nom du nouveau filtre
 NoContactWithCategoryFound=Pas de contact/adresses avec cette catégorie
 NoContactLinkedToThirdpartieWithCategoryFound=Pas de contact/adresses associés à un ters avec cette catégorie
-OutGoingEmailSetup=Configuration email sortant
-InGoingEmailSetup=Configuration email entrant
-OutGoingEmailSetupForEmailing=Configuration des e-mails sortants (pour le module %s)
-DefaultOutgoingEmailSetup=Configuration des emails sortant
+OutGoingEmailSetup=E-mails sortants
+InGoingEmailSetup=E-mails entrants
+OutGoingEmailSetupForEmailing=E-mails sortants (module %s)
+DefaultOutgoingEmailSetup=Même configuration que la configuration globale des e-mails sortants
 Information=Information
 ContactsWithThirdpartyFilter=Contacts ayant pour tiers
 Unanswered=Sans réponse
 Answered=Répondu
 IsNotAnAnswer=N'est pas une réponse (e-mail initial)
 IsAnAnswer=Est une réponse à un e-mail initial
+RecordCreatedByEmailCollector=Enregistrement créé par le Collecteur d'e-mails%s depuis l'email %s
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 3f1076eb335..f5e71e4e48b 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Pas de modèle défini pour ce type d'email
 AvailableVariables=Variables de substitution disponibles
 NoTranslation=Pas de traduction
 Translation=Traduction
+CurrentTimeZone=Fuseau horaire PHP (serveur)
 EmptySearchString=Entrez des critères de recherche non vides
+EnterADateCriteria=Saisissez une date
 NoRecordFound=Aucun enregistrement trouvé
 NoRecordDeleted=Aucun enregistrement supprimé
 NotEnoughDataYet=Pas assez de données
@@ -85,6 +87,8 @@ FileWasNotUploaded=Un fichier a été sélectionné pour attachement mais n'a pa
 NbOfEntries=Nb d'entrées
 GoToWikiHelpPage=Consulter l'aide (nécessite un accès internet)
 GoToHelpPage=Consulter l'aide
+DedicatedPageAvailable=Une page d'aide dédiée à cette page existe
+HomePage=Page d'accueil
 RecordSaved=Enregistrement sauvegardé
 RecordDeleted=Enregistrement supprimé
 RecordGenerated=Enregistrement généré
@@ -433,6 +437,7 @@ RemainToPay=Reste à payer
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filtres
 List=Liste
 FullList=Liste complète
 FullConversation=Conversation complète
@@ -672,7 +677,6 @@ Email=Email
 NoEMail=Pas d'email
 AlreadyRead=Déjà lu
 NotRead=Non lu
-Unread=Non lu
 NoMobilePhone=Pas de téléphone portable
 Owner=Propriétaire
 FollowingConstantsWillBeSubstituted=Les constantes suivantes seront substituées par leur valeur correspondante.
@@ -1108,3 +1112,8 @@ UpToDate=Adhésion à jour
 OutOfDate=Adhésion expirée
 EventReminder=Rappel d'événement
 UpdateForAllLines=Mise à jour de toutes les lignes
+OnHold=En attente
+AffectTag=Affecter une catégorie
+ConfirmAffectTag=Affectation de catégories en masse
+ConfirmAffectTagQuestion=Êtes-vous sur de vouloir affecter ces catégories aux %s lignes sélectionnées ?
+CategTypeNotFound=Aucune catégorie trouvée
diff --git a/htdocs/langs/fr_FR/modulebuilder.lang b/htdocs/langs/fr_FR/modulebuilder.lang
index 9dea25a8b29..15d87656f4b 100644
--- a/htdocs/langs/fr_FR/modulebuilder.lang
+++ b/htdocs/langs/fr_FR/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=Page PHP pour créer/modifier/afficher un enregistrement
 PageForAgendaTab=Page PHP pour l'onglet événement
 PageForDocumentTab=Page PHP pour l'onglet document
 PageForNoteTab=Page PHP pour l'onglet note
+PageForContactTab=Page PHP pour l'onglet contact
 PathToModulePackage=Chemin du zip du package du module/application
 PathToModuleDocumentation=Chemin d'accès au fichier de documentation du module (%s)
 SpaceOrSpecialCharAreNotAllowed=Les espaces et les caractères spéciaux ne sont pas autorisés.
@@ -77,7 +78,7 @@ IsAMeasure=Est une mesure
 DirScanned=Répertoire scanné
 NoTrigger=Pas de trigger
 NoWidget=Aucun widget
-GoToApiExplorer=Se rendre sur l'explorateur d'API
+GoToApiExplorer=Explorateur d'API
 ListOfMenusEntries=Liste des entrées du menu
 ListOfDictionariesEntries=Liste des entrées de dictionnaires
 ListOfPermissionsDefined=Liste des permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Si vous connaissez SQL et PHP, vous pouvez utiliser l'a
 SeeTopRightMenu=Voir <span class="fa fa-bug"></span> à droite de votre barre de menu principal
 AddLanguageFile=Ajouter le fichier de langue
 YouCanUseTranslationKey=Vous pouvez utiliser ici une clé qui est la clé de traduction trouvée dans le fichier de langue (voir l'onglet "Langues")
-DropTableIfEmpty=(Supprimer la table si vide)
+DropTableIfEmpty=(Supprimer la table si elle est vide)
 TableDoesNotExists=La table %s n'existe pas
 TableDropped=La table %s a été supprimée
 InitStructureFromExistingTable=Construire la chaîne du tableau de structure d'une table existante
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Utiliser une URL d'éditeur spécifique
 UseSpecificFamily = Utiliser une famille spécifique
 UseSpecificAuthor = Utiliser un auteur spécifique
 UseSpecificVersion = Utiliser une version initiale spécifique
-ModuleMustBeEnabled=Le module / application doit être activé d'abord
 IncludeRefGeneration=La référence de l'objet doit être générée automatiquement
 IncludeRefGenerationHelp=Cochez cette option si vous souhaitez inclure du code pour gérer la génération automatique de la référence
 IncludeDocGeneration=Je veux générer des documents à partir de l'objet
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type de champs: <br> varchar (99), double (24,8), réel, texte,
 AsciiToHtmlConverter=Convertisseur Ascii en HTML
 AsciiToPdfConverter=Convertisseur Ascii en PDF
 TableNotEmptyDropCanceled=La table n’est pas vide. La suppression a été annulée.
+ModuleBuilderNotAllowed=Le module builder est activé mais son accès n'est pas autorisé à l'utilisateur courant
diff --git a/htdocs/langs/fr_FR/mrp.lang b/htdocs/langs/fr_FR/mrp.lang
index f1eaeffdfed..011ce1f8964 100644
--- a/htdocs/langs/fr_FR/mrp.lang
+++ b/htdocs/langs/fr_FR/mrp.lang
@@ -77,4 +77,4 @@ UnitCost=Coût unitaire
 TotalCost=Coût total
 BOMTotalCost=Le coût de production de cette nomenclature basé sur chaque quantité et produit à consommer (utilise le prix de revient si défini, sinon le PMP si défini, sinon le meilleur prix d'achat)
 GoOnTabProductionToProduceFirst=Vous devez avoir la production pour clôturer un Ordre de Fabrication (voir onglet '%s'). Mais vous pouvez l'annuler.
-ErrorAVirtualProductCantBeUsedIntoABomOrMo=Un kit ne peut pas être utilisé dans une nomenclature ou un ordre de fabrication.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Un kit ne peut pas être utilisé dans une Nomenclature ou un Ordre de fabrication.
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 0a5abbfbf3a..68fb0bbce97 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -1,12 +1,10 @@
 # Dolibarr language file - Source file is en_US - other
-SecurityCode=Code de sécurité
+SecurityCode=Code sécurité
 NumberingShort=N°
 Tools=Outils
 TMenuTools=Outils
 ToolsDesc=Cet espace regroupe divers outils non accessibles par les autres entrées du menu. <br>Tous ces outils sont accessibles depuis le menu sur le côté.. 
 Birthday=Anniversaire
-BirthdayDate=Date anniversaire
-DateToBirth=Date de naissance
 BirthdayAlertOn=alerte anniversaire active
 BirthdayAlertOff=alerte anniversaire inactive
 TransKey=Traduction de la clé TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Mois précédent (numéro 1-12) la date de facturation
 TextPreviousMonthOfInvoice=Mois précédent (texte) de la date de facturation
 NextMonthOfInvoice=Le mois suivant (numéro 1-12) la date de facturation
 TextNextMonthOfInvoice=Le mois suivant (texte) la date de facturation
+PreviousMonth=Mois précédent
+CurrentMonth=Mois en cours
 ZipFileGeneratedInto=Fichier zip généré dans <b>%s</b>
 DocFileGeneratedInto=Fichier doc généré dans <b>%s</b>.
 JumpToLogin=Déconnecté. Aller à la page de connexion ...
@@ -97,12 +97,9 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nVeuillez trouver, ci-joint
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nVeuillez trouver, ci-joint, la facture __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nVeuillez trouver, ci-joint, le bon d'expédition __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nVeuillez trouver, ci-joint, la fiche intervention __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Vous pouvez cliquer sur le lien ci-dessous pour effectuer votre paiement si ce n'est déjà fait.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendActionComm=Rappel événement "__EVENT_LABEL__" le __EVENT_DATE__ à __EVENT_TIME__<br><br>Ceci est un message automatique, merci de ne pas répondre.
+PredefinedMailContentSendActionComm=Rappel de l'événement "__EVENT_LABEL__" le __EVENT_DATE__ à __EVENT_TIME__<br> <br>Ceci est un message automatique. Veuillez ne pas y répondre.
 DemoDesc=Dolibarr est un logiciel de gestion proposant plusieurs modules métiers. Une démonstration qui inclut tous ces modules n'a pas de sens car ce cas n'existe jamais (plusieurs centaines de modules disponibles). Aussi, quelques profils type de démo sont disponibles.
 ChooseYourDemoProfil=Veuillez choisir le profil de démonstration qui correspond le mieux à votre activité…
 ChooseYourDemoProfilMore=...ou construisez votre propre profil<br>(sélection manuelle des modules)
@@ -141,7 +138,7 @@ Right=Droite
 CalculatedWeight=Poids calculé
 CalculatedVolume=Volume calculé
 Weight=Poids
-WeightUnitton=tonnes
+WeightUnitton=tonne
 WeightUnitkg=Kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -262,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/adresse créé par le collecteur de courr
 ProjectCreatedByEmailCollector=Projet créé par le collecteur de courrier électronique à partir du courrier électronique MSGID %s
 TicketCreatedByEmailCollector=Ticket créé par le collecteur de courrier électronique à partir du courrier électronique MSGID %s
 OpeningHoursFormatDesc=Utilisez un - pour séparer les heures d'ouverture et de fermeture. <br> Utilisez un espace pour entrer différentes plages. <br> Exemple: 8-12 14-18
+PrefixSession=Préfixe pour l'ID de la session
 
 ##### Export #####
 ExportsArea=Espace exports
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index c380edd77f3..92ca1b00c0f 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Remplissez avec la date de la dernière ligne de servic
 MultiPricesAbility=Plusieurs niveaux de prix par produit/service (chaque client est dans un et un seul niveau)
 MultiPricesNumPrices=Nombre de prix
 DefaultPriceType=Base des prix par défaut (avec ou hors taxes) lors de l’ajout de nouveaux prix de vente
-AssociatedProductsAbility=Activer les kits (produits virtuels)
+AssociatedProductsAbility=Activer les kits (ensemble d'autres produits)
+VariantsAbility=Activer les variantes (variantes de produits, par exemple couleur, taille,...)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Nombre de sous-produits constituant ce kit
 ParentProductsNumber=Nbre de produits virtuels/packages parent
@@ -167,8 +168,10 @@ BuyingPrices=Prix d'achat
 CustomerPrices=Prix clients
 SuppliersPrices=Prix fournisseurs
 SuppliersPricesOfProductsOrServices=Prix fournisseurs (des produits ou services)
-CustomCode=Nomenclature douanière / Code SH
+CustomCode=Nomenclature douanière ou Code SH
 CountryOrigin=Pays d'origine
+RegionStateOrigin=Région d'origine
+StateOrigin=Département d'origine
 Nature=Nature du produit (matière première / produit fini)
 NatureOfProductShort=Nature de produit
 NatureOfProductDesc=Matière première ou produit fini
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Utiliser le prix fixé
 PriceByQuantity=Prix différents par quantité
 DisablePriceByQty=Désactiver les prix par quantité
 PriceByQuantityRange=Grille de quantités
-MultipriceRules=Règles du niveau de prix
+MultipriceRules=Prix automatiques pour le niveau
 UseMultipriceRules=Utilisation des règles de niveau de prix (définies dans la configuration du module de produit) pour calculer automatiquement le prix de tous les autres niveaux en fonction de premier niveau
 PercentVariationOver=%% de variation sur %s
 PercentDiscountOver=%% de remis sur %s
diff --git a/htdocs/langs/fr_FR/recruitment.lang b/htdocs/langs/fr_FR/recruitment.lang
index bea2b2fa539..c3fcd8fece3 100644
--- a/htdocs/langs/fr_FR/recruitment.lang
+++ b/htdocs/langs/fr_FR/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=Le poste n'est plus ouvert. Le poste a été pourvu.
 JobClosedTextCanceled=Le poste n'est plus ouvert.
 ExtrafieldsJobPosition=Attributs complémentaires (postes)
 ExtrafieldsCandidatures=Attributs complémentaires (candidature)
+MakeOffer=Faire un offre
diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang
index 49586113bd9..d2b56dfe677 100644
--- a/htdocs/langs/fr_FR/sendings.lang
+++ b/htdocs/langs/fr_FR/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Autres expéditions pour cette commande
 SendingsAndReceivingForSameOrder=Expéditions et réceptions pour cette commande
 SendingsToValidate=Expéditions à valider
 StatusSendingCanceled=Annulée
+StatusSendingCanceledShort=Annulée
 StatusSendingDraft=Brouillon
 StatusSendingValidated=Validée (produits à envoyer ou envoyés)
 StatusSendingProcessed=Traitée
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Vous devez d'abord valider la commande pour pou
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Modèle de bon de réception/livraison complet (logo…)
+DocumentModelStorm=Modèle de document plus complet des fiches expéditions et compatibilité avec les attributs complémentaires (logo,...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constante EXPEDITION_ADDON_NUMBER non définie
 SumOfProductVolumes=Somme des volumes des produits
 SumOfProductWeights=Somme des poids des produits
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index f5c3c9453e3..f07c003d9c8 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Définissez la valeur sur 0 pour réinitialiser la quantit
 UpdateByScaning=Mise à jour par scan
 UpdateByScaningProductBarcode=Mettre à jour par scan (code-barres produit)
 UpdateByScaningLot=Mise à jour par scan (code barres lot/série)
+DisableStockChangeOfSubProduct=Désactiver les mouvements de stock des composants pour tout mouvement de stock de ce kit
diff --git a/htdocs/langs/fr_FR/ticket.lang b/htdocs/langs/fr_FR/ticket.lang
index 926ca24d3da..d2dbef92452 100644
--- a/htdocs/langs/fr_FR/ticket.lang
+++ b/htdocs/langs/fr_FR/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Sévérités
 TicketDictResolution=Ticket - Résolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Question commerciale
 
+TicketTypeShortCOM=Question commerciale
 TicketTypeShortHELP=Demande d'aide fonctionnelle
 TicketTypeShortISSUE=Problème ou bogue
 TicketTypeShortREQUEST=Demande de changement ou d'amélioration
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Autre
 TicketSeverityShortLOW=Faible
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Élevé
-TicketSeverityShortBLOCKING=Critique/Bloquant
+TicketSeverityShortBLOCKING=Critique, bloquant
 
 ErrorBadEmailAddress=Champ '%s' incorrect
 MenuTicketMyAssign=Mes tickets
@@ -125,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=L'interface publique permet à tous les visit
 TicketsAutoAssignTicket=Affecter automatiquement l'utilisateur qui a créé le ticket
 TicketsAutoAssignTicketHelp=Lors de la création d'un ticket, l'utilisateur peut être automatiquement affecté au ticket.
 TicketNumberingModules=Module de numérotation des tickets
+TicketsModelModule=Modèles de documents pour les tickets
 TicketNotifyTiersAtCreation=Notifier le tiers à la création
 TicketsDisableCustomerEmail=Toujours désactiver les courriels lorsqu'un ticket est créé depuis l'interface publique
 TicketsPublicNotificationNewMessage=Envoyer un (des) courriel (s) lorsqu’un nouveau message est ajouté
@@ -230,8 +229,8 @@ TicketChangeStatus=Changer l'état
 TicketConfirmChangeStatus=Confirmez le changement d'état: %s?
 TicketLogStatusChanged=Statut modifié: %s à %s
 TicketNotNotifyTiersAtCreate=Ne pas notifier l'entreprise à la création
+Unread=Non lu
 TicketNotCreatedFromPublicInterface=Non disponible. Le ticket n’a pas été créé à partir de l'interface publique.
-PublicInterfaceNotEnabled=L’interface publique n’a pas été activée
 ErrorTicketRefRequired=La référence du ticket est requise
 
 #
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index 0db2af94537..ce277cc5f52 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -30,7 +30,6 @@ EditInLine=Editer en ligne
 AddWebsite=Ajouter site web
 Webpage=Page/container Web
 AddPage=Ajouter une page/container
-HomePage=Page d'accueil
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=La prévisualisation de votre site web <strong>%s</strong> n'est pas disponible actuellement. Vous devez d'abord '<strong>Importer un modèle de site web complet</strong>' ou juste '<strong>Ajouter une page/container</strong>.
 RequestedPageHasNoContentYet=La page demandée avec l'id=%s ne présente encore aucun contenu ou le fichier cache .tpl.php a été supprimé. Ajoutez du contenu à la page pour résoudre cela.
@@ -136,4 +135,5 @@ RSSFeed=Flux RSS
 RSSFeedDesc=Vous pouvez obtenir un flux RSS des derniers articles de type 'blogpost' en utilisant cette URL
 PagesRegenerated=%s page(s)/conteneur(s) régénéré(s)
 RegenerateWebsiteContent=Régénérer les fichiers de cache du site Web
-AllowedInFrames=Autorisé dans les cadres
+AllowedInFrames=Autorisé dans les Frames
+DefineListOfAltLanguagesInWebsiteProperties=Définir la liste des langues disponibles dans les propriétés du site web.
diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang
index 1649b7271de..5c524abfe58 100644
--- a/htdocs/langs/fr_FR/withdrawals.lang
+++ b/htdocs/langs/fr_FR/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Les %s derniers bons de prélèvements
 MakeWithdrawRequest=Faire une demande de prélèvement
 MakeBankTransferOrder=Faire une demande de virement
 WithdrawRequestsDone=%s demandes de prélèvements enregistrées
+BankTransferRequestsDone=%s demande de prélèvement enregistrée
 ThirdPartyBankCode=Code banque du tiers
 NoInvoiceCouldBeWithdrawed=Aucune facture traitée avec succès. Vérifiez que les factures sont sur les sociétés avec un BAN par défaut valide et que le BAN a un RUM avec le mode <strong> %s </strong>.
 ClassCredited=Classer crédité
@@ -131,7 +132,8 @@ SEPARCUR=SEPA RCUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Date d'éxecution
 CreateForSepa=Créer fichier de prélèvement automatique
-ICS=Identifiant du créancier CI
+ICS=Identifiant du créditeur (CI) du prélèvement
+ICSTransfer=Identifiant créditeur (CI) du virement bancaire
 END_TO_END=Balise XML SEPA "EndToEndId" - Identifiant unique attribué par transaction
 USTRD=Balise XML SEPA "Non structurée"
 ADDDAYS=Ajouter des jours à la date d'exécution
@@ -146,3 +148,4 @@ InfoRejectSubject=Ordre de prélèvement rejeté
 InfoRejectMessage=Bonjour, <br><br> l'ordre de prélèvement de la facture %s liée à la société %s, avec un montant de %s a été refusé par la banque.<br><br>--<br>%s
 ModeWarning=Option mode réel non établi, nous allons arrêter après cette simulation
 ErrorCompanyHasDuplicateDefaultBAN=La société avec l'identifiant %s a plus d'un compte bancaire par défaut. Aucun moyen de savoir lequel utiliser.
+ErrorICSmissing=ICS manquant pour le compte bancaire %s
diff --git a/htdocs/langs/fr_GA/accountancy.lang b/htdocs/langs/fr_GA/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/fr_GA/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/fr_GA/compta.lang b/htdocs/langs/fr_GA/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/fr_GA/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/fr_GA/products.lang b/htdocs/langs/fr_GA/products.lang
deleted file mode 100644
index 6e900475275..00000000000
--- a/htdocs/langs/fr_GA/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/fr_GA/withdrawals.lang b/htdocs/langs/fr_GA/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/fr_GA/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/gl_ES/accountancy.lang b/htdocs/langs/gl_ES/accountancy.lang
index 1aa15550b74..ee77a166128 100644
--- a/htdocs/langs/gl_ES/accountancy.lang
+++ b/htdocs/langs/gl_ES/accountancy.lang
@@ -18,14 +18,14 @@ DefaultForService=Predeterminado para o servizo
 DefaultForProduct=Predeterminado para o produto
 CantSuggest=Non pode suxerirse
 AccountancySetupDoneFromAccountancyMenu=A maior parte da configuración da contabilidade realizase dende o menú %s
-ConfigAccountingExpert=Configuration of the module accounting (double entry)
+ConfigAccountingExpert=Configuración do módulo contabilidade (entrada doble)
 Journalization=Procesar diarios
 Journals=Diarios
 JournalFinancial=Diarios financieiros
 BackToChartofaccounts=Voltar ao plan contable
 Chartofaccounts=Plan contable
-ChartOfSubaccounts=Chart of individual accounts
-ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
+ChartOfSubaccounts=Gráficos de contas individuais
+ChartOfIndividualAccountsOfSubsidiaryLedger=Graficos de contas indivudais dependendets do libro maior
 CurrentDedicatedAccountingAccount=Conta contable adicada
 AssignDedicatedAccountingAccount=Nova conta a asignar
 InvoiceLabel=Etiqueta factura
@@ -35,8 +35,8 @@ OtherInfo=Outra información
 DeleteCptCategory=Eliminar a conta contable do grupo
 ConfirmDeleteCptCategory=¿Está certo de querer eliminar esta conta contable do grupo de contas contables?
 JournalizationInLedgerStatus=Estado de diario
-AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
+AlreadyInGeneralLedger=Xa rexistrado en contas contables e no Libro Maior
+NotYetInGeneralLedger=Non foi rexistrado aínda en contas contables nin no Libro Maior
 GroupIsEmptyCheckSetup=O grupo está baleiro, comprobe a configuración da personalización de grupos contables
 DetailByAccount=Amosar detalles por conta
 AccountWithNonZeroValues=Contas con valores non cero
@@ -45,9 +45,10 @@ CountriesInEEC=Países na CEE
 CountriesNotInEEC=Países non CEE
 CountriesInEECExceptMe=Todos os paises incluidos na CEE excepto %s
 CountriesExceptMe=Todos os países excepto %s
-AccountantFiles=Export source documents
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
-VueByAccountAccounting=View by accounting account
+AccountantFiles=Exportar documentos contables
+ExportAccountingSourceDocHelp=Con esta utilidade, pode exportar os eventos de orixe (lista e PDFs) que foron empregados para xerar a súa contabilidade. Para exportar os seus diarios, use a entrada de menú% s -% s.
+VueByAccountAccounting=Ver por conta contable
+VueBySubAccountAccounting=Ver pos subconta contable
 
 MainAccountForCustomersNotDefined=Conta contable principal para clientes non definida na configuración
 MainAccountForSuppliersNotDefined=Conta contable principal para provedores non definida na configuración
@@ -83,7 +84,7 @@ AccountancyAreaDescAnalyze=PASO %s: Engadir ou editar transaccións existentes,
 
 AccountancyAreaDescClosePeriod=PASO %s: Pechar periodo, polo que non poderá facer modificacións nun futuro.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Non foi completado un paso obrigatorio na configuración (conta contable non definida en todas as contas bancarias)
 Selectchartofaccounts=Seleccione un plan contable activo
 ChangeAndLoad=Cambiar e cargar
 Addanaccount=Engadir unha conta contable
@@ -93,8 +94,8 @@ SubledgerAccount=Subconta contable
 SubledgerAccountLabel=Etiqueta subconta contable
 ShowAccountingAccount=Amosar contabilidade
 ShowAccountingJournal=Amosar diario contable
-ShowAccountingAccountInLedger=Show accounting account in ledger
-ShowAccountingAccountInJournals=Show accounting account in journals
+ShowAccountingAccountInLedger=Amosar a conta contable no libro maior
+ShowAccountingAccountInJournals=Amosar a conta contable nos diarios
 AccountAccountingSuggest=Conta contable suxerida
 MenuDefaultAccounts=Contas contables por defecto
 MenuBankAccounts=Contas Bancarias
@@ -116,9 +117,9 @@ ExpenseReportsVentilation=Contabilizar informes de gastos
 CreateMvts=Crear nova transacción
 UpdateMvts=Modificación dunha transacción
 ValidTransaction=Transacción validada
-WriteBookKeeping=Register transactions in accounting
+WriteBookKeeping=Rexistrar movementos en contabilidade
 Bookkeeping=Libro Maior
-BookkeepingSubAccount=Subledger
+BookkeepingSubAccount=Librp maior auxiliar
 AccountBalance=Saldo da conta
 ObjectsRef=Referencia de obxecto orixe
 CAHTF=Total compras a provedor antes de impostos
@@ -128,7 +129,7 @@ InvoiceLinesDone=Liñas de facturas contabilizadas
 ExpenseReportLines=Liñas de informes de gastos a contabilizar
 ExpenseReportLinesDone=Liñas de informes de gastos contabilizadas
 IntoAccount=Contabilizar liña coa conta contable
-TotalForAccount=Total para a conta contable
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Contabilizar
@@ -144,20 +145,20 @@ NotVentilatedinAccount=Conta sen contabilización na contabilidad
 XLineSuccessfullyBinded=%s produtos/servizos relacionados correctamente nunha conta contable
 XLineFailedToBeBinded=%s produtos/servizos sen conta contable
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a contabilizar que amósanse por páxina (máximo recomendado: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Número máximo de liñas na listaxe e na páxina de ligazón (recomendado: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Ordear as páxinas de contabilización "A contabilizar" polos elementos mais recentes
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Ordear as páxinas de contabilización "Contabilizadas" polos elementos mais recentes
 
-ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
-ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
+ACCOUNTING_LENGTH_DESCRIPTION=Acortar a descrición de produtoe e servizos nas listaxes despois de x caracteres (Mellor = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Acortar no formulario de descrición da conta de produtos e servizos nas listaxes despois de x caracteres (Mellor = 50)
+ACCOUNTING_LENGTH_GACCOUNT=Lonxitude das contas contables en xeral (Se define o valor 6 aquí, a conta "706" aparecerá como "706000" na pantalla)
+ACCOUNTING_LENGTH_AACCOUNT=Lonxitude das contas contables de terceiros (Se define o valor 6 aquí, a conta "401" aparecerá como "401000" na pantalla)
+ACCOUNTING_MANAGE_ZERO=Permitir xestionar un número diferente de ceros ao final dunha conta contable. Preciso por algúns países (como Suíza). Se está desactivado (predeterminado), pode configurar os seguintes dous parámetros  para solicitar á aplicación que engada ceros virtuais.
 BANK_DISABLE_DIRECT_INPUT=Desactivar transaccións directas en conta bancaria
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Habilitar exportación de borradores al diario
-ACCOUNTANCY_COMBO_FOR_AUX=Habilita a listaxe combinada para a conta subsidiaria (pode ser lento se ten moitos terceiros)
-ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
+ACCOUNTANCY_COMBO_FOR_AUX=Habilita a listaxe combinada para a conta contable subsidiaria (pode ser lento se ten moitos terceiros)
+ACCOUNTING_DATE_START_BINDING=Define unha data para comezar a ligar e transferir na contabilidade. Por debaixo desta data, as transaccións non se transferirán á contabilidade.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Na transferencia de contabilidade, selecciona amosar o período por defecto
 
 ACCOUNTING_SELL_JOURNAL=Diario de vendas
 ACCOUNTING_PURCHASE_JOURNAL=Diario de compras
@@ -177,18 +178,18 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Conta contable de operacións pendentes de asignar
 DONATION_ACCOUNTINGACCOUNT=Conta contable de rexistro de doacións/subvencións
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Conta contable de rexistro subscricións
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Conta contable por defecto para rexistrar os ingresos do cliente
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Conta contable predeterminada para produtos comprados (usada se non están definidos na folla de produtos)
-ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Conta contable predeterminada para os produtos comprados (usada se non están definidos na folla de produtos)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Conta contable predeterminada para os produtos comprados na CEE (usados se non están definidos na folla de produto)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Conta contable predeterminada para os produtos comprados e importados fóra da CEE (usada se non está definido na folla de produto)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Conta contable predeterminada para os produtos vendidos (usada se non están definidos na folla de produtos)
-ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Conta contable predeterminada para os produtos vendidos na CEE (usados se non están definidos na folla de produto)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Conta contable predeterminada para os produtos vendidos e exportados fóra da CEE (usados se non están definidos na folla de produto)
 
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Conta contable predeterminada para os servizos comprados (usada se non están definidos na folla de servizos)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Conta contable predeterminada para os servizos comprados na CEE (usada se non está definido na folla de servizos)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Conta contable predeterminada para os servizos comprados e importados fóra da CEE (úsase se non está definido na folla de servizos)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Conta contable predeterminada para os servizos vendidos (usada se non están definidos na folla de servizos)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Conta contable predeterminada para os servizos vendidos en EU (usada se non están definidos na folla de servizos)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=AConta contable predeterminada para os servizos vendidos e exportados fora da EU  (usada se non están definidos na folla de servizos)
@@ -198,7 +199,8 @@ Docdate=Data
 Docref=Referencia
 LabelAccount=Etiqueta conta
 LabelOperation=Etiqueta operación
-Sens=Sentido
+Sens=Dirección
+AccountingDirectionHelp=Para unha conta contable dun cliente, use o crédito para rexistrar o pago recibido. <br>. Para unha conta contable dun provedor, use Débito para rexistrar o pago realizado
 LetteringCode=Codigo de letras
 Lettering=Letras
 Codejournal=Diario
@@ -206,23 +208,24 @@ JournalLabel=Etiqueta diario
 NumPiece=Apunte
 TransactionNumShort=Núm. transacción
 AccountingCategory=Grupos persoalizados
-GroupByAccountAccounting=Agrupar por conta contable
+GroupByAccountAccounting=Agrupar por Libro Maior
+GroupBySubAccountAccounting=Agrupar por subconta contable
 AccountingAccountGroupsDesc=Pode definir aquí algúns grupos de contas contables. Serán usadas para informes de contabilidade personalizados.
 ByAccounts=Por contas
 ByPredefinedAccountGroups=Por grupos predefinidos
 ByPersonalizedAccountGroups=Por grupos persoalizados
 ByYear=Por ano
 NotMatch=Non establecido
-DeleteMvt=Delete some operation lines from accounting
+DeleteMvt=Eliminar liñas do Libro Maior
 DelMonth=Mes a eliminar
 DelYear=Ano a eliminar
 DelJournal=Diario a eliminar
-ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
+ConfirmDeleteMvt=Isto eliminará todas as liñas da contabilidade do ano/mes e/ou dun diario específico. (Precísase alo menos un criterio). Terá que reutilizar a función '% s' para que o rexistro eliminado volte ao libro maior.
+ConfirmDeleteMvtPartial=Isto eliminará a transacción d da contabilidade (eliminaranse todas as liñas relacionadas coa mesma transacción)
 FinanceJournal=Diario financiero
 ExpenseReportsJournal=Diario informe de gastos
 DescFinanceJournal=O diario financiero inclúe todos os tipos de pagos por conta bancaria
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
+DescJournalOnlyBindedVisible=Ista é una vista do rexistro ligada a unha conta contable e que pode ser rexistrada nos diarios e Libro Maior.
 VATAccountNotDefined=Conta contable para IVE non definida
 ThirdpartyAccountNotDefined=Conta contable para terceiro non definida
 ProductAccountNotDefined=Conta contable para produto non definida
@@ -241,19 +244,19 @@ ListAccounts=Listaxe de contas contables
 UnknownAccountForThirdparty=Conta contable de terceiro descoñecida, usaremos %s
 UnknownAccountForThirdpartyBlocking=Conta contable de terceiro descoñecida. Erro de bloqueo.
 ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Conta contable de terceiro non definida ou terceiro descoñecido. Usaremos a %s
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Terceiro descoñecido e conta vinculada non definidos no pago. Manteremos o valor da conta vinculada baleiro.
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Conta do terceiro descoñecida ou terceiro descoñecido. Erro de bloqueo
-UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Conta do terceiros descoñecida e conta de espera non definida. Erro de bloqueo
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Conta de terceiros descoñecida e conta de espera non definida. Erro de bloqueo
 PaymentsNotLinkedToProduct=Pagos non ligados a un produto/servizo
 OpeningBalance=Saldo de apertura
 ShowOpeningBalance=Amosar saldo de apertura
 HideOpeningBalance=Ocultar saldo de apertura
-ShowSubtotalByGroup=Amosar subtotal por grupo
+ShowSubtotalByGroup=Amosar subtotal por nivel
 
 Pcgtype=Grupo de conta
 PcgtypeDesc=Grupo e subgrupo de conta utilízanse como criterios predefinidos de "filtro" e "agrupación" para algúns informes de contabilidade. Por exemplo, "INGRESOS" ou "GASTOS" usanse como grupos para contas contables de produtos para construir o informe de gastos/ingresos.
 
-Reconcilable=Reconcilable
+Reconcilable=Reconciliable
 
 TotalVente=Total facturación antes de impostos
 TotalMarge=Total marxe vendas
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consulte aquí a listaxe de liñas de informes de gastos
 DescVentilExpenseReportMore=Se configura as contas contables dos tipos de informes de gastos, a aplicación será capaz de facer a ligazón entre as súas liñas de informes de gastos e as contas contables, simplemente cun clic no botón <strong>"%s"</strong> , Se non estableceu a conta contable no diccionario ou se aínda ten algunhas liñas non contabilizadas a alguna conta, terá que facer unha contabilización manual dende o menú "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consulte aquí as liñas de informes de gastos e as súas contas contables
 
+Closure=Peche anual
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=Todos os movementos foron rexistrados e validados
+NotAllMovementsCouldBeRecordedAsValidated=Non todos os movementos puideron ser rexistrados e validados
 ValidateMovements=Validar os movementos
-DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Selecciona mes e valida movementos
+DescValidateMovements=Prohíbese calquera modificación ou eliminación de rexistros. Todas as entradas para un exercicio deben validarse doutro xeito ou non será posible pechalo
 
 ValidateHistory=Contabilizar automáticamente
 AutomaticBindingDone=Ligazón automática finalizada
@@ -293,9 +298,10 @@ Accounted=Contabilizada no Libro Maior
 NotYetAccounted=Aínda non contabilizada no Libro Maior
 ShowTutorial=Amosar Tutorial
 NotReconciled=Non reconciliado
+WarningRecordWithoutSubledgerAreExcluded=Aviso: todas as operacións sen subcontas contables defininidas están filtradas e excluídas desta vista
 
 ## Admin
-BindingOptions=Binding options
+BindingOptions=Opcións de ligazón
 ApplyMassCategories=Aplicar categorías en masa
 AddAccountFromBookKeepingWithNoCategories=Conta dispoñible sen grupo persoalizado
 CategoryDeleted=A categoría para a conta contable foi eliminada
@@ -315,9 +321,9 @@ ErrorAccountingJournalIsAlreadyUse=Este diario xa está a ser utilizado
 AccountingAccountForSalesTaxAreDefinedInto=Nota: A conta contable do IVE nas vendas defínese no menú <b> %s</b> - <b> %s</b>
 NumberOfAccountancyEntries=Número de entradas
 NumberOfAccountancyMovements=Número de movementos
-ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
-ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
-ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Desactivar a ligazón e transferencia na contabilidade das vendas (as facturas do cliente non se terán en conta na contabilidade)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Desactivar a ligazón e transferencia na contabilidade das compras (as facturas do provedor non se terán en conta na contabilidade)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Desactivar a ligazón e transferencia na contabilidade dos informes de gastos (os informes de gastos non se terán en conta na contabilidade)
 
 ## Export
 ExportDraftJournal=Exportar libro borrador
@@ -335,12 +341,13 @@ Modelcsv_agiris=Exportar a Agiris
 Modelcsv_LDCompta=Exportar a LD Compta (v9 & maior) (En Probas)
 Modelcsv_LDCompta10=Exportar a LD Compta (v10 & maior)
 Modelcsv_openconcerto=Exportar a OpenConcerto (En probas)
-Modelcsv_configurable=Exportar a CSV Configurable
-Modelcsv_FEC=Exportar FEC (Art. L47 A)
-Modelcsv_Sage50_Swiss=Exportar a Sage 50 Suiza
+Modelcsv_configurable=Exportación CSV Configurable
+Modelcsv_FEC=Exportación FEC (Art. L47 A)
+Modelcsv_FEC2=Exportar FEC (con escritura de xeración de datas / documento inverso)
+Modelcsv_Sage50_Swiss=Exportación a Sage 50 Suiza
 Modelcsv_winfic=Exportar a Winfic - eWinfic - WinSis Conta
-Modelcsv_Gestinumv3=Export for Gestinum (v3)
-Modelcsv_Gestinumv5Export for Gestinum (v5)
+Modelcsv_Gestinumv3=Exportar a Gestinum (v3)
+Modelcsv_Gestinumv5Export para Gestinum (v5)
 ChartofaccountsId=Id do plan contable
 
 ## Tools - Init accounting account on product / service
@@ -353,16 +360,16 @@ OptionModeProductSell=Modo vendas
 OptionModeProductSellIntra=Modo Vendas exportación CEE
 OptionModeProductSellExport=Modo vendas exportación outros paises
 OptionModeProductBuy=Modo compras
-OptionModeProductBuyIntra=Mode purchases imported in EEC
-OptionModeProductBuyExport=Mode purchased imported from other countries
+OptionModeProductBuyIntra=Modo compras importadas importadas de EEC
+OptionModeProductBuyExport=Modo compras importadas doutros paises
 OptionModeProductSellDesc=Amosar todos os produtos con conta contable de vendas
 OptionModeProductSellIntraDesc=Amosar todos os produtos con conta contable para vendas na CEE.
 OptionModeProductSellExportDesc=Amosar todos os produtos con conta contable para outras vendas ao exterior.
 OptionModeProductBuyDesc=Amosar todos os produtos con conta contable de compras
-OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
-OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
+OptionModeProductBuyIntraDesc=Amosar todos os produtos con conta contable para compras en CEE
+OptionModeProductBuyExportDesc=Amosar todos os produtos con conta contable para outras compras no extranxeiro.
 CleanFixHistory=Eliminar código contable das liñas que no existen no plan contable
-CleanHistory=Resetear todos os vínculos do ano seleccionado
+CleanHistory=Resetear todas as ligazóns do ano seleccionado
 PredefinedGroups=Grupos persoalizados
 WithoutValidAccount=Sen conta adicada válida
 WithValidAccount=Con conta adicada válida
@@ -371,8 +378,8 @@ AccountRemovedFromGroup=Conta eliminada do grupo
 SaleLocal=Venda local
 SaleExport=Venda de exportación
 SaleEEC=Venda na CEE
-SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
-SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
+SaleEECWithVAT=Vendas na CEE con IVE non nulo, polo que supoñemos que isto non é unha venda intracomunitaria e a conta suxerida é a conta estandar de produto.
+SaleEECWithoutVATNumber=Venda na CEE sen IVE pero non se define o número de identificación do IVE de terceiros. Respondemos á conta do produto para as vendas estándar. Pode corrixir o ID de IVE de terceiros ou a conta do produto se é preciso.
 
 ## Dictionary
 Range=Rango de conta contable
@@ -380,7 +387,7 @@ Calculated=Calculado
 Formula=Fórmula
 
 ## Error
-SomeMandatoryStepsOfSetupWereNotDone=Algúns pasos precisoss da configuración non foron realizados, prégase completalos.
+SomeMandatoryStepsOfSetupWereNotDone=Algúns pasos precisos da configuración non foron realizados, prégase completalos.
 ErrorNoAccountingCategoryForThisCountry=Non hai grupos contables dispoñibles para %s (Vexa Inicio - Configuración - Diccionarios)
 ErrorInvoiceContainsLinesNotYetBounded=Tenta facer un diario de algunhas liñas da factura <strong>%s</strong>, pero algunhas outras liñas aínda non están ligadas a contas contables. Rexeitase a contabilización de todas as liñas de factura desta factura.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Algunhas liñas da factura non están ligadas a contas contables.
diff --git a/htdocs/langs/gl_ES/admin.lang b/htdocs/langs/gl_ES/admin.lang
index dc2f2aa0a84..df51036e9e9 100644
--- a/htdocs/langs/gl_ES/admin.lang
+++ b/htdocs/langs/gl_ES/admin.lang
@@ -18,10 +18,10 @@ GlobalChecksum=Suma de comprobación global
 MakeIntegrityAnalysisFrom=Realizar o análise da integridade dos ficheiros da aplicación dende
 LocalSignature=Sinatura local incrustada (menos segura)
 RemoteSignature=Sinatura remota (mais segura)
-FilesMissing=Arquivos non atopados
-FilesUpdated=Arquivos actualizados
-FilesModified=Arquivos modificados
-FilesAdded=Arquivos engadidos
+FilesMissing=Ficheiros non atopados
+FilesUpdated=Ficheiros actualizados
+FilesModified=Ficheiros modificados
+FilesAdded=Ficheiros engadidos
 FileCheckDolibarr=Comprobar a integradade dos ficheiros da aplicación
 AvailableOnlyOnPackagedVersions=O ficheiro local para a comprobación da integridade só está dispoñible cando a aplicación instálase dende un paquete oficial
 XmlNotFound=Non atópase o ficheiro xml de Integridade
@@ -37,8 +37,8 @@ UnlockNewSessions=Eliminar bloqueo de conexións
 YourSession=A súa sesión
 Sessions=Sesións de usuarios
 WebUserGroup=Usuario/grupo do servidor web
-PermissionsOnFilesInWebRoot=Permissions on files in web root directory
-PermissionsOnFile=Permissions on file %s
+PermissionsOnFilesInWebRoot=Permisos de ficheiros no directorio web raiz
+PermissionsOnFile=Permisos de ficheiro %s
 NoSessionFound=Parece que o seu PHP non pode listar as sesións activas. El directorio de salvaguardado de sesións (<b>%s</b>) puede estar protegido (por ejemplo, por los permisos del sistema operativo o por la directiva open_basedir de su PHP).
 DBStoringCharset=Codificación da base de datos para o almacenamento de datos
 DBSortingCharset=Codificación da base de datos para clasificar os datos
@@ -56,6 +56,8 @@ GUISetup=Entorno
 SetupArea=Configuración
 UploadNewTemplate=Nova(s) prantilla(s) actualizada(s)
 FormToTestFileUploadForm=Formulario de proba de subida de ficheiro (según opcións escollidas)
+ModuleMustBeEnabled=O módulo/aplicación <b>%s</b> debe estar activado
+ModuleIsEnabled=The O módulo/aplicación <b>%s</b> has foi activado
 IfModuleEnabled=Nota: só é eficaz se o módulo <b>%s</b> está activado
 RemoveLock=Elimine o ficheiro <b>%s</b>, se existe, para permitir a utilidade de actualización.
 RestoreLock=Substituir un ficheiro <b>%s</b>, dándolle só dereitos de lectura a este ficheiro con el fin de prohibir nuevas actualizaciones.
@@ -68,12 +70,12 @@ DictionarySetup=Configuración do diccionario
 Dictionary=Diccionario
 ErrorReservedTypeSystemSystemAuto=O valor 'system' e 'systemauto' para o tipo está reservado. Vostede pode empregar 'user' como valor para engadir o seu propio rexistro
 ErrorCodeCantContainZero=O código non pode conter o valor 0
-DisableJavascript=Deshabilitar Javascript e funcións Ajax (Recomendado para personas ciegas ou navegadores de texto)
-DisableJavascriptNote=Nota: Para propósitos de proba ou depuración. Para a optimización para persoas ciegas ou navegadores de texto, é posible que prefira utilizar a configuración no perfil do usuario.
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Agardar a que presione unha tecla antes de cargar o contido da listaxe combinada de terceiros <br>Isto pode incrementar o rendemento se ten un grande número de terceiros, pero é menos convinte.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
+DisableJavascript=Deshabilitar Javascript e funcións Ajax
+DisableJavascriptNote=Nota: Para propósitos de proba ou depuración. Para a optimización para persoas cegas ou navegadores de texto, é posible que prefira utilizar a configuración no perfil do usuario.
+UseSearchToSelectCompanyTooltip=Tamén se ten un grande número de terceiros (> 100 000), pode aumentar a velocidade mediante a constante COMPANY_DONOTSEARCH_ANYWHERE establecendo a 1 en Configuración-> Outros. A procura será limitada á creación de cadea.
+UseSearchToSelectContactTooltip=Tamén se ten un grande número de terceiros (> 100 000), pode aumentar a velocidade mediante a constante CONTACT_DONOTSEARCH_ANYWHERE establecendo a 1 en Configuración-> Outros. A procura será limitada á creación de cadea.
+DelaiedFullListToSelectCompany=Agardar a que presione unha tecla antes de cargar o contido da lista combinada de terceiros <br>Isto pode incrementar o rendemento se ten un grande número de terceiros, pero é menos convinte.
+DelaiedFullListToSelectContact=Agardar a que presione unha tecla antes de cargar o contido da lista combinada de contactos. <br> Isto pode incrementar o rendemento se ten un grande número de contactos, pero é menos convinte.
 NumberOfKeyToSearch=Nº de caracteres para desencadenar a busca: %s
 NumberOfBytes=Número de Bytes
 SearchString=Buscar cadea
@@ -82,12 +84,11 @@ AllowToSelectProjectFromOtherCompany=Nun documento dun terceiro, pode escoller u
 JavascriptDisabled=Javascript desactivado
 UsePreviewTabs=Ver lapelas vista previa
 ShowPreview=Ver vista previa
-ShowHideDetails=Show-Hide details
+ShowHideDetails=Show-Ocultar detalles
 PreviewNotAvailable=Vista previa non dispoñible
 ThemeCurrentlyActive=Tema actualmente activo
-CurrentTimeZone=Zona horaria PHP (Servidor)
 MySQLTimeZone=Zona horaria MySql (base de datos)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
+TZHasNoEffect=As datas son almacenadas e servidas polo servidor da base de datos coma se foran enviadas coma unha cadea. A zona horaria só ten efecto se é usada a función UNIX_TIMESTAMP (que no debera ser usada pol Dolibarr, polo que a zona horaria da base de datos non debe tener efecto, qínda que fora cambiada despois de introducir os datos).
 Space=Área
 Table=Taboa
 Fields=Campos
@@ -98,14 +99,14 @@ NextValueForInvoices=Próximo valor (facturas)
 NextValueForCreditNotes=Próximo valor (abonos)
 NextValueForDeposit=Próximo valor (anticipos)
 NextValueForReplacements=Próximo valor (rectificativas)
-MustBeLowerThanPHPLimit=Nota: A configuración actual do PHP limita o tamaño máximo de subida a <b>%s</b> %s, cualquera que sexa o valor deste parámetro
+MustBeLowerThanPHPLimit=Nota: A configuración actual do PHP limita o tamaño máximo de subida a <b>%s</b> %s, calquera que sexa o valor deste parámetro
 NoMaxSizeByPHPLimit=Ningunha limitación interna configurada no seu servidor PHP
 MaxSizeForUploadedFiles=Tamaño máximo dos ficheiros a subir (0 para desactivar a subida)
 UseCaptchaCode=Utilización de código gráfico (CAPTCHA) na página de inicio de sesión
 AntiVirusCommand=Ruta completa ao comando do antivirus
-AntiVirusCommandExample=Exemplo para ClamWin: c:\\Program Files (x86)\\ClamWin\\bin\\clamscan.exe<br>Exemplo para ClamAv: /usr/bin/clamscan
+AntiVirusCommandExample=Exemplo para ClamAv (require clamav-daemon):/usr/bin/clamdscan<br> Exemplo para ClamWin (moi moi lento): c::\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Mais parámetors na liña de comandos
-AntiVirusParamExample=Exemplo para o demo ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Exemplo para o ClamAv: --fdpass <br> Exemplo para ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Configuración do módulo Contabilidade
 UserSetup=Configuración na xestión de usuarios
 MultiCurrencySetup=Configuración do módulo multimoeda
@@ -133,7 +134,7 @@ PHPTZ=Zona Horaria Servidor PHP
 DaylingSavingTime=Horario de verán (usuario)
 CurrentHour=Hora PHP (servidor)
 CurrentSessionTimeOut=Timeout sesión actual
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a .htaccess file with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=Para definir unha zona horaria PHP diferente (non é preciso), probe a engadir un ficheiro .htacces cunha liña coma esta "SetEnvTZ Europe/Madrid"
 HoursOnThisPageAreOnServerTZ=Atención, ao contrario doutras pantallas, o horario nesta páxina non atópase na súa zona horaria local, atópase na zona horaria do servidor.
 Box=Panel
 Boxes=Paneis
@@ -141,8 +142,8 @@ MaxNbOfLinesForBoxes=Número máximo de liñas para paneis
 AllWidgetsWereEnabled=Todos os widgets dispoñibles están activados
 PositionByDefault=Posición por defecto
 Position=Posición
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br>Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
+MenusDesc=Os xestores de menús definen o contido das dúas barras de menú (horizontal e vertical)
+MenusEditorDesc=O editor de menús permite definir entradas de menú persoalizadas. Useo con coidado para evitar inestabilidade e entradas de menús erróneos. <br> Algúns módulos engaden entradas do menú (no menú <b>Todo</b> maioritariamente). Se elimina algunhas destas entradas por erro, pode restauralas desactivando e reactivando o módulo.
 MenuForUsers=Menú para os usuarios
 LangFile=ficheiro .lang
 Language_en_US_es_MX_etc=Lingua (en_US, es_MX, ...)
@@ -153,9 +154,9 @@ SystemToolsAreaDesc=Esta área ofrece distintas funcións de administración. Ut
 Purge=Purga
 PurgeAreaDesc=Esta páxina permitelle borrar todos os ficheiros xerados ou almacenados por Dolibarr (ficheiros temporais ou todos os ficheiros do directorio <b>%s</b>). O uso desta función non é precisa. Se proporciona como solución para os usuarios cuxos Dolibarr atópanse nun provedor que non ofrece permisos para eliminar os ficheiros xerados polo servidor web.
 PurgeDeleteLogFile=Eliminar ficheiros de rexistro, incluidos <b> %s</b> definidos polo módulo Syslog (sen risco de perda de datos)
-PurgeDeleteTemporaryFiles=Eliminar todos os ficheros temporais (sen risco de perda de datos)
-PurgeDeleteTemporaryFilesShort=Eliminar ficheiros temporais purgados
-PurgeDeleteAllFilesInDocumentsDir=Eliminar todos os ficheiros do directorio <b>%s</b>. Ficheiros temporais e ficheiros relacionados con elementos (terceiros, facturas, etc.) serán eliminados.
+PurgeDeleteTemporaryFiles=Eliminar todos os logs e ficheros temporais (sen risco de perda de datos). Nota: A eliminación dos ficheiros temporais é realizada só de o directorio temporal foi creado hai mas de 24h.
+PurgeDeleteTemporaryFilesShort=Eliminar logs e ficheiros temporais.
+PurgeDeleteAllFilesInDocumentsDir=Eliminar todos os ficheiros do directorio <b>%s</b>. <br> Isto eliminará todos os documentos xerados relacionados con elementos (terceiros, facturas, etc...), ficheiros actualizados no módulo ECM, copias de seguridade de bases de datos e ficheiros temporais.
 PurgeRunNow=Purgar agora
 PurgeNothingToDelete=Sen directorios ou ficheiros a eliminar.
 PurgeNDirectoriesDeleted=<b>%s</b> ficheiros ou directorios eliminados
@@ -173,14 +174,14 @@ NoBackupFileAvailable=Ningunha copia dispoñible
 ExportMethod=Método de exportación
 ImportMethod=Método de importación
 ToBuildBackupFileClickHere=Para crear unha copia, faga click <a href="%s">aquí</a>.
-ImportMySqlDesc=Para importar unha copia, hai que utilizar o comando mysql na liña seguinte:
+ImportMySqlDesc=Para importar un ficheiro de copia de seguridade de MYQL, pode usar phpMyAdmin a través do se aloxamento web ou usar o comando mysql desde a liña de comandos <br> Por exemplo:
 ImportPostgreSqlDesc=Para importar unha copia de seguridade, debe usar o comando pg_restore dende a línea de comandos:
 ImportMySqlCommand=%s %s < meuficheirobackup.sql
 ImportPostgreSqlCommand=%s %s meuficheirobackup.sql
 FileNameToGenerate=Nome do ficheiro a xerar
 Compression=Compresión
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
+CommandsToDisableForeignKeysForImport=Comando para desactivar as claves externas á importación
+CommandsToDisableForeignKeysForImportWarning=Obrigatorio se quiere poder restaurar mais tarde o seu volcado SQL
 ExportCompatibility=Compatibilidade do ficheiro de exportación xerado
 ExportUseMySQLQuickParameter=Use a opción --quick
 ExportUseMySQLQuickParameterHelp=A opción'--quick' parameter axuda a limitar o consumo de RAM en táboas longas.
@@ -201,30 +202,30 @@ IgnoreDuplicateRecords=Ignorar os erros por rexistro duplicado (INSERT IGNORE)
 AutoDetectLang=Autodetección (navegador)
 FeatureDisabledInDemo=Opción deshabilitada no demo
 FeatureAvailableOnlyOnStable=Funcionaliade dispoñible exclusivamente en versións oficiais estables
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
-OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external app/modules
-ModulesDevelopYourModule=Develop your own app/modules
-ModulesDevelopDesc=You may also develop your own module or find a partner to develop one for you.
-DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will perform the search on the external market place for you (may be slow, need an internet access)...
-NewModule=New module
-FreeModule=Free
+BoxesDesc=Os paneis son compoñentes que amosan algunha información que pode engadires para persoalizar algunhas páxinas. Pode escoller entre amosar ou non o panel seleccionando a páxina de destino e facendo clic en 'Activar', ou facendo clic na papeleira para desactivalo.
+OnlyActiveElementsAreShown=Só os elementos de <a href="%s">módulos activados</a> son amosados.
+ModulesDesc=Os módulos/aplicacións determinan qué funcionalidade está habilitada no software. Algúns módulos requiren permisos que teñen que ser concedidos aos usuarios logo de activar o módulo. Faga clic no botón<span class="small valignmiddle"> %s </span>de acendido/apagado de cada módulo para habilitar ou desactivar un módulo/aplicación.
+ModulesMarketPlaceDesc=Pode atopar mais módulos para descargar en sitios web externos da Internet ...
+ModulesDeployDesc=Se os permisos no seu sistema de ficheiros llo permiten, pode utilizar esta ferramenta para instalar un módulo externo. O módulo estará entón visible na lapela <strong>%s</strong>.
+ModulesMarketPlaces=Procurar módulos externos...
+ModulesDevelopYourModule=Desenvolva as súas propias aplicacións/módulos
+ModulesDevelopDesc=Vostede pode desenvolver o seu propio módulo ou atopar un socio para que desenvolva un para vostede.
+DOLISTOREdescriptionLong=En lugar de ir al sitio web <a href="https://www.dolistore.com">www.dolistore.com</a> para encontrar un módulo externo, puede utilizar esta herramienta incorporada que hará la búsqueda en la tienda por usted (puede ser lento, es necesario acceso a Internet)...
+NewModule=Novo
+FreeModule=Gratis
 CompatibleUpTo=Compatible coa versión %s
-NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s).
-CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
-SeeInMarkerPlace=See in Market place
-SeeSetupOfModule=See setup of module %s
+NotCompatible=Este módulo non parece compatible co seu Dolibarr %s (Min %s - Max %s).
+CompatibleAfterUpdate=Este módulo require unha actualización do seu Dolibarr %s (Min %s - Max %s).
+SeeInMarkerPlace=Ver na tenda
+SeeSetupOfModule=Ver a configuración do módulo %s
 Updated=Actualizado
 Nouveauté=Novidade
 AchatTelechargement=Compra/Descarga
-GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
-DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
-WebSiteDesc=External websites for more add-on (non-core) modules...
-DevelopYourModuleDesc=Some solutions to develop your own module...
+GoModuleSetupArea=Para aplicar/instalar un novo módulo, ir ao área de configuración de módulos <a href="%s">%s</a>.
+DoliStoreDesc=DoliStore, o sitio oficial de módulos externos e para Dolibarr ERP/CRM
+DoliPartnersDesc=Listaxe de empresas que ofrecen módulos-desenvolvementos a medida.<br> Nota: dende que Dolibarr é una aplicación de código aberto, <i>calquera persoa</i> con experiencia en programación PHP pode desenvolver un módulo.
+WebSiteDesc=Sitios web de referencia para atopar mais módulos (non core)...
+DevelopYourModuleDesc=Algunhas solucións para desenvolver o seu propio módulo ...
 URL=Ligazón
 RelativeURL=Ligazón relativa
 BoxesAvailable=Paneis dispoñibles
@@ -232,17 +233,17 @@ BoxesActivated=Paneis activos
 ActivateOn=Activar en
 ActiveOn=Activo en
 SourceFile=Ficheiro orixe
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=Dispoñible só se Javascript e Ajax non están desactivados
 Required=Requirido
 UsedOnlyWithTypeOption=Usado só por algunha opción da axenda
 Security=Seguridade
 Passwords=Contrasinais
-DoNotStoreClearPassword=Encrypt passwords stored in database (NOT as plain-text). It is strongly recommended to activate this option.
-MainDbPasswordFileConfEncrypted=Encrypt database password stored in conf.php. It is strongly recommended to activate this option.
-InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
-InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
-ProtectAndEncryptPdfFiles=Protect generated PDF files. This is NOT recommended as it breaks bulk PDF generation.
-ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
+DoNotStoreClearPassword=Non almacenar o contrasinal sen cifrar na base de datos (NON en texto plano). É moi recomendable activar esta opción.
+MainDbPasswordFileConfEncrypted=Cifrar o contrasinal da base de datos no ficheiro conf.php. É moi recomendable activar esta opción.
+InstrucToEncodePass=Para ter o contrasinal codificado en <b>conf.php</b>, mude a liña <br><b>$dolibarr_main_db_pass = "...";</b><br>por<br> <b>$dolibarr_main_db_pass = "crypted:%s";</b>
+InstrucToClearPass=Para ter o contrasinal decodificado (visible) en <b>conf.php</b>, mude a liña <br><b>$dolibarr_main_db_pass = "crypted:...";</b><br>por<br><b>$dolibarr_main_db_pass = "%s";</b>
+ProtectAndEncryptPdfFiles=Protección dos ficheros PDF xerados. Isto NON está recomendado, pode fallar a xeración de PDF en masa
+ProtectAndEncryptPdfFilesDesc=A protección dun documento PDF o garda dispoñible para ler e imprimir con calquera navegador PDF. Porén, a edición e a copia non son posibles. Teña conta de que o uso desta característica fai que a creación global dun conxunto de PDFs non funcione.
 Feature=Función
 DolibarrLicense=Licenza
 Developpers=Desenvolvedores/contribuidores
@@ -256,11 +257,12 @@ ReferencedPreferredPartners=Partners preferidos
 OtherResources=Outros recursos
 ExternalResources=Recursos externos
 SocialNetworks=Redes sociais
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
-HelpCenterDesc2=Some of these resources are only available in <b>english</b>.
-CurrentMenuHandler=Current menu handler
+SocialNetworkId=ID Rede Social
+ForDocumentationSeeWiki=Para a documentación de usuario, desenvolvedor (Doc, FAQS),<br> visite o wiki Dolibarr: <br><b><a href="%s" target="_blank">%s</a></b>
+ForAnswersSeeForum=Para calquera outra dúbida/axuda, pode facer uso do foro Dolibarr: <br><b><a href="%s" target="_blank">%s</a></b>
+HelpCenterDesc1=Aquí hai algúns recursos para obter axuda e soporte de Dolibarr
+HelpCenterDesc2=Algúns destes recursos só están dispoñibles en <b>inglés</b>.
+CurrentMenuHandler=Xestor de menú actual
 MeasuringUnit=Unidade de medida
 LeftMargin=Marxe esquerdo
 TopMargin=Marxe superior
@@ -274,41 +276,41 @@ NoticePeriod=Prazo de aviso
 NewByMonth=Novo por mes
 Emails=E-Mails
 EMailsSetup=Configuración e-mails
-EMailsDesc=This page allows you to set parameters or options for email sending.
+EMailsDesc=Esta páxina permite configurar parámetros ou opcións para envíos de correos electrónicos.
 EmailSenderProfiles=Perfís de remitentes de e-mails
 EMailsSenderProfileDesc=Pode gardar esta sección baleira. Se vostede introduce algúns enderezos de correo aquí, estes serán engadidos a listaxe de posibles emisores dentro da caixa cando escribe un novo enderezo.
-MAIN_MAIL_SMTP_PORT=Porto do servidor SMTP (Por defecto en php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (default value in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix-like systems)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix-like systems)
-MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (default value in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used for error returns emails (fields 'Errors-To' in emails sent)
-MAIN_MAIL_AUTOCOPY_TO= Copy (Bcc) all sent emails to
-MAIN_DISABLE_ALL_MAILS=Disable all email sending (for test purposes or demos)
-MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
-MAIN_MAIL_ENABLED_USER_DEST_SELECT=Suggest emails of employees (if defined) into the list of predefined recipient when writing a new email
-MAIN_MAIL_SENDMODE=Email sending method
-MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
-MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
-MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
-MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
-MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
-MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
-MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
-MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Private key for dkim signing
-MAIN_DISABLE_ALL_SMS=Disable all SMS sending (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send SMS
-MAIN_MAIL_SMS_FROM=Default sender phone number for SMS sending
-MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email or Company email)
-UserEmail=User email
-CompanyEmail=Company Email
-FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
-FixOnTransifex=Fix the translation on the online translation platform of project
-SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
-ModuleSetup=Configuración do Módulo
-ModulesSetup=Configuración dos Módulos/Aplicacións
+MAIN_MAIL_SMTP_PORT=Porto do servidor SMTP (Valor por defecto en php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_SERVER=Host SMTP/SMTPS (Valor por defecto en php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Porto SMTP/SMTPS (Non definido en PHP en sistemas de tipo Unix)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Nome/ip servidor SMTP/SMTPS (Non definido en PHP en sistemas  tipo Unix)
+MAIN_MAIL_EMAIL_FROM=Correo electrónico do remitente para correos electrónicos automáticos (valor predeterminado en php.ini: <b>%s </b>)
+MAIN_MAIL_ERRORS_TO=Correo electrónico utilizado enviar os correos electrónicos con erros (campos "Errors-To" nos correos electrónicos enviados)
+MAIN_MAIL_AUTOCOPY_TO= Enviar a copia oculta (Bcc) de todos os correos electrónicos enviados a
+MAIN_DISABLE_ALL_MAILS=Deshabilitar todo o envío de correo electrónico (para fins de proba ou demostracións)
+MAIN_MAIL_FORCE_SENDTO=Enviar todos os correos electrónicos a (en lugar de destinatarios reais, para fins de proba)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Engadir correos electrónicos dos empregados (se se define) na lista de destinatarios predefinidos ao escribir un novo correo electrónico
+MAIN_MAIL_SENDMODE=Método de envío de correos electrónico
+MAIN_MAIL_SMTPS_ID=ID de autentificación SMTP  (se o servidor de envío require autenticación)
+MAIN_MAIL_SMTPS_PW=Contrasinal SMTP (se o servidor de envío require autenticación)
+MAIN_MAIL_EMAIL_TLS=Usar cifrado TLS (SSL)
+MAIN_MAIL_EMAIL_STARTTLS=Usar cifrado TLS (STARTTLS)
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autorizar os certificados autosinados
+MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM para xerar sinatura de correo electrónico
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=Dominio de correo electrónico para usar con DKIM
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=Nome do selector DKIM
+MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Chave privada para a sinatura de DKIM
+MAIN_DISABLE_ALL_SMS=Desactivar todo o envío de SMS (para fins de proba ou demostracións)
+MAIN_SMS_SENDMODE=Método de envío de SMS
+MAIN_MAIL_SMS_FROM=Número de teléfono por defecto do remitente para os envíos SMS
+MAIN_MAIL_DEFAULT_FROMTYPE=Correo electrónico predeterminado do remitente para o envío manual (correo electrónico do usuario ou correo electrónico da Empresa)
+UserEmail=Correo electrónico de usuario
+CompanyEmail=Correo electrónico da empresa
+FeatureNotAvailableOnLinux=Funcionalidad non dispoñible en sistemas similares a Unix. Proba localmente o teu programa sendmail..
+FixOnTransifex=Corrixa a tradución na plataforma de tradución en liña do proxecto Transifex
+SubmitTranslation=Se a tradución deste idioma non está completa ou atopa erros, pode corrixilo editando ficheiros no directorio <b>langs/%s</b> e envía o teu cambio a www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslationENUS=Se a tradución deste idioma non está completa ou atopa erros, pode corrixilo editando ficheiros no directorio <b>langs/%s</b> e enviar os ficheiros modificados a dolibarr.org/forum ou, se son desenvolvedores, cun PR a github.com/Dolibarr/dolibarr.
+ModuleSetup=Configuración do módulo
+ModulesSetup=Configuración dos módulos
 ModuleFamilyBase=Sistema
 ModuleFamilyCrm=Xestión de Relacións cos Clientes (CRM)
 ModuleFamilySrm=Xestión de Relacións cos Provedores (VRM)
@@ -335,7 +337,7 @@ UnpackPackageInModulesRoot=Para instalar un módulo externo, descomprima o fiche
 SetupIsReadyForUse=A instalación do módulo rematou. Porén, debe habilitar e configurar o módulo na súa aplicación, indo á páxina para configurar os módulos: <a href="%s">%s</a>.
 NotExistsDirect=O directorio raíz alternativo non está configurado nun directorio existente.<br>
 InfDirAlt=Dende a versión 3, é posible definir un directorio raíz alternativo. Isto permítelle almacenar, nun directorio adicado, plug-ins e prantillas persoalizadas.<br>Só en que crear un directorio na raíz de Dolibarr (por exemplo: custom).<br>
-InfDirExample=<br>Despois indíqueo no ficheiro <strong>conf.php</strong><br> $ dolibarr_main_url_root_alt = 'http://miservidor /custom'<br>$ dolibarr_main_document_root_alt = '/ruta/de/dolibarr/htdocs/custom '<br>Se estas liñas atópanse comentadas con "#", para habilitalas, chega con descomentar eliminando o carácter "#".
+InfDirExample=<br>Despois indíqueo no ficheiro <strong>conf.php</strong><br> $dolibarr_main_url_root_alt ='/custom'<br>$dolibarr_main_document_root_alt= '/path/of/dolibarr/htdocs/custom '<br>Se estas liñas atópanse comentadas con "#", para habilitalas, chega con descomentar eliminando o carácter "#".
 YouCanSubmitFile=Alternativamente, pode subir o módulo .zip comprimido:
 CurrentVersion=Versión actual de Dolibarr
 CallUpdatePage=Ir á páxina de actualización da estrutura da base de datos e os seus datos: %s.
@@ -348,7 +350,7 @@ WithCounter=Con contador
 GenericMaskCodes=Pode introducir calquera máscara numérica. Nsta máscara, pode utilizar as seguintes etiquetas:<br><b>{000000} </b> corresponde a un número que incrementase en cada un de %s. Introduza tantos ceros como lonxitude desexa amosar. O contador complétase a partir de ceros pola esquerda coa finalidade de ter tantos ceros como a máscara. <br> <b> {000000+000}</ b> Igual que o anterior, cunha compensación correspondente ao número á dereita do sinal + aplícase a partires do primeiro %s. <br> <b> {000000@x}</b> igual que o anterior, pero o contador restablecese a cero cando chega a x meses (x entre 1 e 12). Se esta opción é utilizada e x é de 2 ou superior, entón a secuencia {yy}{mm} o {yyyy}{mm} tamén é precisa. <br> <b> {dd} </b> días (01 a 31). <br><b> {mm}</b> mes (01 a 12). <br><b>{yy}</b>, <b>{yyyy}</b> ou <b>{y}</b> ano en 2, 4 ou 1 cifra.<br>
 GenericMaskCodes2=<b>{cccc}</b> código de cliente con n caracteres<br><b>{cccc000}</b> código de cliente con n caracteres é seguido por un contador adicado a clientes. Este contador adicado a clientes será reseteado ao mismo tempo que o contador global.<br><b>{tttt}</b> O código do tipo de empresa con n caracteres (vexa diccionarios->tipos de empresa).<br>
 GenericMaskCodes3=Calquera outro caracter na máscara quedará sen cambios. <br>Non son permitidos espazos <br>
-GenericMaskCodes4a=<u>Exemplo na 99ª %s do terceiro. A empresa realizada o 31/03/2007: </u><br>
+GenericMaskCodes4a=<u>Exemplo no 99th %s do terceiro a Empresa con data do 31/01/2007: </u><br>
 GenericMaskCodes4b=<u>Exemplo sobre un terceiro creado o 31/03/2007:</u><br>
 GenericMaskCodes4c=<u>Exemplo nun produto/servizo creado o 31/03/2007:</u><br>
 GenericMaskCodes5=<b>ABC {yy} {mm} - {000000} </b> dará <b> ABC0701-000099 </b><br><b> {0000+100@1}-ZZZ/{dd}/XXX</b> dará <b>0199-ZZZ/31/ XXX</b> <br><b>IN{yy}{mm}-{0000}-{t}</b> dará <b>IN0701-0099-A</b> se o tipo de empresa é 'Responsable Inscrito' con código para o tipo 'A_RI'
@@ -364,7 +366,7 @@ UMask=Parámetro UMask de novos ficheiros en Unix/Linux/BSD.
 UMaskExplanation=Este parámetro determina os dereitos dos ficheiros creados no servidor Dolibarr (durante a subida, por exemplo).<br>Este debe ser o valor octal (por exemplo, 0666 significa leitura / escritura para todos).<br>Este parámetro non ten ningún efecto sobre un servidor Windows.
 SeeWikiForAllTeam=Vexa o wiki para mais detalles de todos os actores e da súa organización
 UseACacheDelay= Demora en caché da exportación en segundos (0 o vacio sen caché)
-DisableLinkToHelpCenter=Ocultar a ligazón "¿Precisa soporte ou axuda?" na páxina de login
+DisableLinkToHelpCenter=Ocultar a ligazón "<b>¿Precisa soporte ou axuda?</b>" na páxina de login
 DisableLinkToHelp=Ocultar a ligazón á axuda en liña "<b>%s</b>"
 AddCRIfTooLong=Non hai liñas de corte automático, de tal xeito que se o texto é longo demais non será amosado nos documentos. Prégase que engada un salto de liña na área de texto se fora preciso
 ConfirmPurge=¿Está certo de querer realizar esta purga?<br>Isto borrará definitivamente todos os datos dos seus ficheiros (área GED, ficheiros axuntados...).
@@ -373,11 +375,11 @@ LanguageFilesCachedIntoShmopSharedMemory=ficheiros .lang en memoria compartida
 LanguageFile=Ficheiro de idioma
 ExamplesWithCurrentSetup=Exemplos coa configuración actual
 ListOfDirectories=Listaxe de directorios de prantillas OpenDocument
-ListOfDirectoriesForModelGenODT=Listaxe de directorios que conteñen as prantillas de ficheiros co formato OpenDocument.<br>Poña aquí a ruta completa de directorios.<br>Engada un retorno de carro entre cada directorio<br> Para engadir un directorio de módulo GED, engada aquí <b>DOL_DATA_ROOT/ecm/seunomededirectorio.</b><br><br>Os ficheiros deses directorios deben terminar co <b>.odt</b> o <b>.ods</b>.
+ListOfDirectoriesForModelGenODT=Listaxe de directorios que conteñen as prantillas de ficheiros co formato OpenDocument.<br><br> Poña aquí a ruta completa de directorios.<br>Engada un retorno de carro entre cada directorio<br> Para engadir un directorio de módulo GED, engada aquí <b>DOL_DATA_ROOT/ecm/seunomededirectorio.</b><br><br>Os ficheiros deses directorios deben terminar co <b>.odt</b> o <b>.ods</b>.
 NumberOfModelFilesFound=Número de ficheiros de prantillas ODT/ODS atopados nestes directorios
 ExampleOfDirectoriesForModelGen=Exemplos de sintaxe:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-FollowingSubstitutionKeysCanBeUsed=Colocando as seguintes etiquetas na prantilla, obterá uhna substitución co valor persoalizado ao xerar o documento:
-FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Crear_un_modelo_de_documento_ODT
+FollowingSubstitutionKeysCanBeUsed=<br>Colocando as seguintes etiquetas na prantilla, obterá uhna substitución co valor persoalizado ao xerar o documento:
+FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Orde visualización nome/apelidos
 DescWeather=Os seguintes gráficos serán amosados no panel se o número de elementos chega a estes valores:
 KeyForWebServicesAccess=Clave para usar os Web Services (parámetro "dolibarrkey" en webservices)
@@ -391,12 +393,12 @@ ModuleMustBeEnabledFirst=O módulo <b>%s</b> debe ser activado antes se precisa
 SecurityToken=Chave para cifrar urls
 NoSmsEngine=Non hai dispoñible ningún xestor de envío de SMS. Os xestores de envío de SMS no son instalados por defecto xa que dependen de cada provedor, porén pode atopalos na plataforma %s
 PDF=PDF
-PDFDesc=Global options for PDF generation
-PDFAddressForging=Rules for address section
+PDFDesc=Opcións globais para xerar os PDF
+PDFAddressForging=Regras de visualización de enderezos
 HideAnyVATInformationOnPDF=Ocultar toda a información relacionada co IVE ao xerar os PDF
 PDFRulesForSalesTax=Regras de IVE
 PDFLocaltax=Regras para %s
-HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
+HideLocalTaxOnPDF=Ocultar a taxa %s na columna de impostos do pdf
 HideDescOnPDF=Ocultar descrición dos produtos ao xerar os PDF
 HideRefOnPDF=Ocultar referencia dos produtos ao xerar os PDF
 HideDetailsOnPDF=Ocultar detalles das liñas ao xerar os PDF
@@ -406,16 +408,16 @@ UrlGenerationParameters=Seguridade das URLs
 SecurityTokenIsUnique=¿Usar un parámetro securekey único para cada URL?
 EnterRefToBuildUrl=Introduza a referencia do obxecto %s
 GetSecuredUrl=Obter a URL calculada
-ButtonHideUnauthorized=Ocultar botóns de accións non permitidas aos usuarios non administradores en vez de amosalos atenuados
+ButtonHideUnauthorized=Ocultar botóns de accións non permitidas tamén aos usuarios internos (en gris doutro xeito)
 OldVATRates=Taxa de IVE antiga
 NewVATRates=Taxa de IVE nova
 PriceBaseTypeToChange=Cambiar o prezo cuxa referencia de base é
 MassConvert=Convertir masivamente
 PriceFormatInCurrentLanguage=Formato de prezo na lingua utilizada
 String=Cadea de texto
-String1Line=String (1 line)
+String1Line=Cadea (1 liña)
 TextLong=Texto longo
-TextLongNLines=Long text (n lines)
+TextLongNLines=Texto longo (n liñas)
 HtmlText=Texto html
 Int=Numérico enteiro
 Float=Decimal
@@ -435,31 +437,31 @@ ExtrafieldCheckBox=Caixa de verificación
 ExtrafieldCheckBoxFromList=Caixa de verificación da táboa
 ExtrafieldLink=Vínculo a un obxecto
 ComputedFormula=Campo combinado
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
-Computedpersistent=Store computed field
-ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
-ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
-ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
-LibraryToBuildPDF=Library used for PDF generation
-LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
+ComputedFormulaDesc=Puede introducir aquí unha fórmula utilizando outras propiedades de obxecto o calquera código PHP para obter un valor calculado dinámico. Pode utilizar calquera fórmula compatible con PHP, incluído o operador de condición "?" e os obxectos globais seguintes: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>ATENCIÓN</strong>: Só algunhas propiedades de $object poden estar dispoñibles. Se precisa propiedades non cargadas, só procure o obxecto na súa fórmula como no segundo exemplo. <br>Usar un campo computado significa que non pode ingresar ningún valor dende a interfaz. Además, se hai un error de sintaxe, e posible que a fórmula non devolva nada. <br><br>Exemplo de fórmula: <br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br> Exemlo de recarga de obxectto<br> (($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Outro exemplo de fórmula para forzar a carga do objeto e su obxecto principal:  <br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+Computedpersistent=Almacenar campo combinado
+ComputedpersistentDesc=Os campos adicionais calculados gardaranse na base de datos, con todo, o valor só se recalculará cando se cambie o obxecto deste campo. Se o campo calculado depende doutros obxectos ou datos globais, este valor pode ser incorrecto.
+ExtrafieldParamHelpPassword=Deixar este campo en branco significa que este valor gardarase sen cifrado (o campo estará oculto coa estrelas na pantalla). <br> Estableza aquí o valor "auto" para usar a regra de cifrado predeterminada para gardar o contrasinal na base de datos (entón o valor lido será só o hash, non hai forma de recuperar o valor orixinal)
+ExtrafieldParamHelpselect=A listaxe de parámetros ten que ser key,valor<br><br> por exemplo: <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>Para ter unha lista en funcion de campos adicionais de lista:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>Para ter unha lista en función doutra:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=A listaxe de parámetros debe ser ser liñas con formato key,value (onde key non pode ser '0')<br><br> por exemplo: <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpradio=A listaxe de parámetros tiene que ser key,valor (onde key non pode ser 0)<br><br> por exemplo: <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpsellist=A listaxe de parámetros provén dunha táboa <br> Syntax: table_name:label_field:id_field::filter <br> Exemplo: c_typent: libelle:id::filter <br> <br> - id_field é necesariamente unha chave int primaria <br> -filter pode ser unha proba sinxela (por exemplo, activa = 1) Para amosar só o valor activo <br> Tamén pode utilizar $ID$ no filtro o cal é o  id do obxecto actual <br> Para facer un SELECT no filtro de uso $SEL$ <br> se desexa filtrar en campos adicionais pode utilizar a sintaxe extra.fieldcode=... (onde código de campo é o código de campo adicional) <br> <br> Para que a lista dependa doutra lista de campos adicionais list: <br> c_typent:libelle:id: options_ <i> parent_list_code </i> |parent_column:filter <br> <br> Para que a lista dependa doutra lista: <br> c_typent:libelle:id: <i> parent_list_code </i> |parent_column:filter
+ExtrafieldParamHelpchkbxlst=A listaxe de parámetros provén dunha táboa <br> Sintaxe: table_name:label_field:id_field::filter<br> Exemplo: c_typent: libelle: id:: filter <br> <br> o filtro pode ser unha proba sinxela (por exemplo, activa = 1) Para amosar só o valor activo <br> Tamén pode utilizar $ID$ no filtro no que é o id  do obxecto actual <br> Para facer un SELECT no filtro  use $SEL$ <br> se desexa filtrar en campos adicionais pode utilizar a sintaxe extra.fieldcode = ... (onde o código de campo é o código de campo adicional) <br> <br> Para que a lista dependa doutra lista de campos adicionais: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> |parent_column: filter <br> <br> Para que a lista dependa doutra lista: <br> c_typent: libelle:id: <i> parent_list_code </i> |parent_column:filter
+ExtrafieldParamHelplink=Os parámetros deben ser ObjectName:Classpath<br>Sintaxe: ObjectName:Classpath
+ExtrafieldParamHelpSeparator=Manter baleiro para un separador simple. <br> Estableza isto en 1 para un separador colapsado (aberto por defecto para a nova sesión, entón o estado manterase para cada sesión de usuario) <br> Estableza isto a 2 para un separador colapsado (contraído por defecto para a nova sesión, o estado mantense antes de cada sesión de usuario)
+LibraryToBuildPDF=Libreria usada na xeración dos PDF
+LocalTaxDesc=Algúns países poden aplicar dous ou tres impostos en cada liña de factura. Se é o caso, escolla o tipo da segunda e terceira taxa e o seu valor. Os tipos posibles son: <br> 1: aplícase o imposto local sobre produtos e servizos sen IVE (a taxa local calcúlase sobre a base impoñible) <br> 2: aplícase o imposto local sobre produtos e servizos incluíndo o IVE (a taxa local calcúlase sobre a base impoñible + imposto principal ) <br> 3: aplicar o imposto local sobre produtos sen IVE (a taxa local calcúlase sobre a base impoñible) <br> 4: aplicar o imposto local sobre produtos incluíndo a IVE (a taxa local calcúlase sobre a base impoñible + ive principal) <br> 5: local imposto aplicable a servizos sen IVE (a taxa local calcúlase sobre a base impoñible) <br> 6: aplícase o imposto local a servizos incluíndo a IVE (a taxa local calcúlase sobre a base impoñible + imposto)
 SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
+LinkToTestClickToDial=Insira un número de teléfono ao que chamar para amosar unha ligazón e probar a URL ClickToDial para o usuario <strong>%s </strong>
 RefreshPhoneLink=Refrescar ligazón
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-KeepThisEmptyInMostCases=In most cases, you can keep this field empy.
+LinkToTest=Ligazón seleccionable xarada para o usuario  <strong>%s</strong> (faga clic no número de teléfono para probar)
+KeepEmptyToUseDefault=Deixe baleiro este campo para usar o valor por defecto
+KeepThisEmptyInMostCases=En moitos casos, pode deixar este campo baleiro.
 DefaultLink=Ligazón por defecto
 SetAsDefault=Establecer por defecto
 ValueOverwrittenByUserSetup=Atención: Este valor pode ser sobreescrito por un valor específico da configuración do usuario (cada usuario pode ter a súa propia url clicktodial)
-ExternalModule=Módulo externo - Instalado no directorio %s
+ExternalModule=Módulo externo
 InstalledInto=Instalado no directory %s
-BarcodeInitForThirdparties=Mass barcode init for third-parties
+BarcodeInitForThirdparties=Inicio de código de barras masivo para terceiros
 BarcodeInitForProductsOrServices=Inicio masivo de código de barras para produtos ou servizos
 CurrentlyNWithoutBarCode=Actualmente ten <strong>%s</strong> rexistros de <strong>%s</strong> %s sen código de barras definido.
 InitEmptyBarCode=Iniciar valor para os %s rexistros baleiros.
@@ -478,44 +480,44 @@ ModuleCompanyCodeCustomerAquarium=%s seguido por un código de cliente para cód
 ModuleCompanyCodeSupplierAquarium=%s seguido por un código de provedor  para código de contabilidade de provedor
 ModuleCompanyCodePanicum=Volta un código contable baleiro.
 ModuleCompanyCodeDigitaria=O código contable depende do código do terceiro. O código está formado polo caracter ' C ' na primeira posición seguido dos 5 primeiros caracteres do código terceiro.
-ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by the number of characters: %s for the customer accounting code.
-ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
+ModuleCompanyCodeCustomerDigitaria=%s seguido do nome de cliente acortado polo número de caracteres:%s para o código de contabilidade do cliente.
+ModuleCompanyCodeSupplierDigitaria=%s seguido do nome do provedor acortado polo número de caracteres:%s para o código de contabilidade do provedor.
 Use3StepsApproval=De forma predeterminada, os pedimentos a provedor teñen que ser creados e aprobados por 2 usuarios diferentes (un paso/usuario para crear e un paso/usuario para aprobar. Teña conta de que se o usuario ten tanto o permiso para crear e aprobar, un paso/usuario será suficiente. Pode pedir con esta opción introducir unha terceira etapa de aprobación/usuario, se a cantidade é superior a un valor específico (polo que serán precisos 3 pasos: 1 validación, 2=primeira aprobación e 3=segunda aprobación se a cantidade é suficiente).<br>Deixe baleiro se unha aprobación (2 pasos) é suficiente, se establece un valor moi baixo (0,1) requírese unha segunda aprobación sempre (3 pasos).
 UseDoubleApproval=Usar 3 pasos de aprobación se o importe (sen IVE) é maior que...
-WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
-WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
-WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
-WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
-WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
-WarningPHPMail2=Se o seu provedor SMTP de correo electrónico precisa restrinxir o cliente de correo electrónico a algunhos enderezos IP (moi raro), este é o seu enderezo IP da súa aplicación ERP CRM: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMail=AVISO: a configuración para enviar correos electrónicos desde a aplicación está a usar a configuración xenérica predeterminada. Moitas veces é mellor configurar os correos electrónicos saíntes para usar o servidor de correo electrónico do seu fornecedor de servizos de correo electrónico en lugar da configuración predeterminada por varios motivos:
+WarningPHPMailA=- Usar o servidor do fornecedor de servizos de correo electrónico aumenta a confiabilidade do seu correo electrónico, polo que aumenta a entrega sen ser marcado como SPAM
+WarningPHPMailB=- Algúns provedores de servizos de correo electrónico (como Yahoo) non permiten enviar un correo electrónico desde outro servidor que o seu propio. A súa configuración actual usa o servidor da aplicación para enviar correo electrónico e non o servidor do seu fornecedor de correo electrónico, polo que algúns destinatarios (o compatible co protocolo DMARC restritivo) preguntarán ao seu fornecedor de correo electrónico se poden aceptar o seu correo electrónico e algúns provedores de correo electrónico. (como Yahoo) pode responder "non" porque o servidor non é seu, polo que poucos dos seus correos electrónicos enviados poden non ser aceptados para a súa entrega (teña coidado tamén coa cota de envío do seu fornecedor de correo electrónico).
+WarningPHPMailC=- Tamén é interesante usar o servidor SMTP do seu propio fornecedor de servizos de correo electrónico para enviar correos electrónicos, polo que todos os correos electrónicos enviados desde a aplicación tamén se gardarán no directorio "Enviado" da súa caixa de correo.
+WarningPHPMailD=Se o método 'PHP Mail' é realmente o método que desexa usar, pode eliminar este aviso engadindo a constante MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP a 1 en Inicio-Configuración-Outro. MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home-Setup-Other.
+WarningPHPMail2=Se o seu fornecedorr SMTP de correo electrónico precisa restrinxir o cliente de correo electrónico a algúns enderezos IP (moi raro), este é o seu enderezo IP do seu axente de usuario de correo (MUA) da súa aplicación ERP CRM: <strong>%s</strong>.
+WarningPHPMailSPF=Se o nome de dominio do seu enderezo de correo electrónico do remitente está protexido por un rexistro SPF (pregúntelle ao seu rexistro de nome de dominio), debe engadir as seguintes IPs no rexistro SPF do DNS do seu dominio: <strong>%s</strong>.
 ClickToShowDescription=Clic para ver a descrición
 DependsOn=Este módulo precisa o módulo(s)
-RequiredBy=Este módulo é requirido polos módulos
+RequiredBy=Este módulo é requirido polo(s) módulo(s)
 TheKeyIsTheNameOfHtmlField=Este é o nome do campo HTML. Son precisos coñecementos técnicos para ler o contido da páxina HTML para obter o nome clave dun campo.
 PageUrlForDefaultValues=Debe introducir aquí a URL relativa da páxina. Se inclúe parámetros na URL, os valores predeterminados serán efectivos se todos os parámetros están configurados co mesmo valor.
 PageUrlForDefaultValuesCreate=<br> Exemplo: <br> Para o formulario para crear un novo terceiro, é <strong> %s </strong>. <br> Para a URL dos módulos externos instalados no directorio custom, non inclúa "custom/", use a ruta como <strong> mymodule/mypage.php </strong> e non custom/mymodule/mypage.php. <br> Se desexa un valor predeterminado só se a url ten algún parámetro, pode usar <strong> %s</strong>
-PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
-EnableDefaultValues=Enable customization of default values
-EnableOverwriteTranslation=Enable usage of overwritten translation
-GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
-WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+PageUrlForDefaultValuesList=<br> Exemplo: <br> Para a páxina que lista terceiros, é <strong>%s</strong>. <br> Para o URL de módulos externos instalados no directorio custom, non inclúa o "custom/" use un camiño como <strong> mymodule/mypagelist.php</strong> e non custom/mymodule/mypagelist.php. <br> Se quere un valor predeterminado só se a URL ten algún parámetro, pode usar <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Teña conta tamén que sobreescribir os valores predeterminados para a creación de formularios só funciona para páxinas que foron deseñadas correctamente (polo tanto, co parámetro action = create ou presend ...)
+EnableDefaultValues=Activar a personalización dos valores predeterminados
+EnableOverwriteTranslation=Activar o uso de traducións sobreescritas
+GoIntoTranslationMenuToChangeThis=Atopouse unha tradución para a clave con este código. Para cambiar este valor, debe editalo desde Inicio-Configuración-Tradución.
+WarningSettingSortOrder=Aviso, establecer unha orde de clasificación predeterminada pode producir un erro técnico ao entrar na páxina da listaxe se o campo é un campo descoñecido. Se experimentas tal erro, volte a esta páxina para eliminar a orde de clasificación predeterminada e restaurar o comportamento predeterminado.Field=Campo
 Field=Campo
 ProductDocumentTemplates=Prantillas de documentos para xerar documento de produto
 FreeLegalTextOnExpenseReports=Texto libre legal nos informes de gastos
 WatermarkOnDraftExpenseReports=Marca de auga nos informes de gastos
-AttachMainDocByDefault=Establezca esto en 1 se desexa axuntar o documento principal ao e-mail de forma predeterminada (se corresponde)
+AttachMainDocByDefault=Establezca isto en 1 se desexa axuntar o documento principal ao e-mail de forma predeterminada (se corresponde)
 FilesAttachedToEmail=Axuntar ficheiro
 SendEmailsReminders=Enviar recordatorios da axenda por correo electrónico
 davDescription=Configuración do servidor DAV
 DAVSetup=Configuración do módulo DAV
-DAV_ALLOW_PRIVATE_DIR=Enable the generic private directory (WebDAV dedicated directory named "private" - login required)
-DAV_ALLOW_PRIVATE_DIRTooltip=The generic private directory is a WebDAV directory anybody can access with its application login/pass.
-DAV_ALLOW_PUBLIC_DIR=Enable the generic public directory (WebDAV dedicated directory named "public" - no login required)
-DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account).
-DAV_ALLOW_ECM_DIR=Enable the DMS/ECM private directory (root directory of the DMS/ECM module - login required)
-DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adecuate permissions to access it.
+DAV_ALLOW_PRIVATE_DIR=Active o directorio privado xenérico (o directorio adicado de WebDAV chamado "privado" é preciso iniciar sesión)
+DAV_ALLOW_PRIVATE_DIRTooltip=O directorio privado xenérico é un directorio WebDAV ao que calquera pode acceder co seu inicio de sesión/contrasinal de aplicación.
+DAV_ALLOW_PUBLIC_DIR=Active o directorio público xenérico (o directorio adicado de WebDAV chamado "público" - non é preciso iniciar sesión)
+DAV_ALLOW_PUBLIC_DIRTooltip=O directorio público xenérico é un directorio WebDAV ao que calquera pode acceder (en modo de lectura e escritura), sen autorización necesaria (conta de inicio de sesión/contrasinal).
+DAV_ALLOW_ECM_DIR=Active o directorio privado DMS/ECM (directorio raíz do módulo DMS/ECM - é preciso iniciar sesión)
+DAV_ALLOW_ECM_DIRTooltip=O directorio raíz onde son cargados todos os ficheiros manualmente cando se usa o módulo DMS/ECM. Do mesmo xeito que o acceso desde a interface web, precisará un inicio de sesión/contrasinal válido con permisos adecuados para acceder a ela.
 # Modules
 Module0Name=Usuarios e grupos
 Module0Desc=Xestión de Usuarios / Empregados e grupos
@@ -546,17 +548,17 @@ Module50Desc=Xestión de produtos
 Module51Name=Mailings masivos
 Module51Desc=Administraciónde correo de papel en masa
 Module52Name=Stocks
-Module52Desc=Xestión de stocks (só produtos)
+Module52Desc=Xestión de stock
 Module53Name=Servizos
 Module53Desc=Xestión de servizos
 Module54Name=Contratos/Suscricións
 Module54Desc=Xestión de contratos (servizos ou suscripcións recurrentes)
 Module55Name=Códigos de barras
 Module55Desc=Xestión dos códigos de barras
-Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Payments by Direct Debit
-Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
+Module56Name=Pagamento por transferencia bancaria
+Module56Desc=Xestión do pagamento de provedores mediante pedidos de transferencia. Inclúe a xeración de ficheiros SEPA para países europeos.
+Module57Name=Domiciliacións bancarias
+Module57Desc=Xestión de domiciliacións. Tamén inclue xeración de ficheiro SEPA para países Europeos.
 Module58Name=ClickToDial
 Module58Desc=Integración con sistema ClickToDial (Asterisk, ...)
 Module60Name=Pegatinas
@@ -615,14 +617,14 @@ Module1520Desc=Xeración de documentos de correo masivo
 Module1780Name=Etiquetas/Categorías
 Module1780Desc=Crear etiquetas/categoría (produtos, clientes, provedores, contactos ou membros)
 Module2000Name=Editor WYSIWYG
-Module2000Desc=Permite a edición dn área de texto usando CKEditor
+Module2000Desc=Permite edictar/formatar campos de texto usando CKEditor (html)
 Module2200Name=Precios dinámicos
-Module2200Desc=Activar o uso de expresións matemáticas para auto xerarprezos
+Module2200Desc=Activar o uso de expresións matemáticas para auto xerar prezos
 Module2300Name=Tarefas programadas
 Module2300Desc=Xestión do traballo programado (alias cron ou chrono taboa)
 Module2400Name=Eventos/Axenda
-Module2400Desc=Track events. Log automatic events for tracking purposes or record manual events or meetings. This is the principal module for good Customer or Vendor Relationship Management.
-Module2500Name=DMS / ECM
+Module2400Desc=Siga os eventos ou citas. Deixe que Dolibarr rexistre eventos automáticos co fin de realizar seguemento ou rexistre eventos manuais ou xuntanzas. Este é o módulo principal para unha bona xestión de relacións cos clientes ou provedores.
+Module2500Name=GED / SGD
 Module2500Desc=Sistema de Xestión de Documentos / Xestión Electrónica de Contidos. Organización automática dos seus documentos xerados o almacenados. Compárta cando o precise.
 Module2600Name=API/Servizos web (servidor SOAP)
 Module2600Desc=Habilitar os servizos Dolibarr SOAP proporcionando servizos API
@@ -644,7 +646,7 @@ Module5000Desc=Permite xestionar varias empresas
 Module6000Name=Fluxo de traballo
 Module6000Desc=Xestión de fluxos de traballo (creación automática dun obxecto e/ou cambio de estado automático)
 Module10000Name=Sitios web
-Module10000Desc=Cree sitios web públicos cun editor WYSIWYG. Configure o servidor web (Apache, Nginx,...) para que apunte ao directorio adicado para telo en líña en Internet.
+Module10000Desc=Crea sitios web (públicos) cun editor WYSIWYG. Trátase dun CMS orientado a administradores web ou desenvolvedores (é mellor coñecer linguaxe HTML e CSS). Só ten que configurar o seu servidor web (Apache, Nginx, ...) para que apunte ao directorio Dolibarr adicado para que estexa en liña en internet co seu propio nome de dominio.
 Module20000Name=Xestión de días libres retribuidos
 Module20000Desc=Xestión dos días libres dos empregados
 Module39000Name=Lotes de produtos
@@ -662,9 +664,9 @@ Module50200Desc=Ofrece aos clientes pagamentos online  vía PayPal (cuenta PayPa
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Contabilidade (avanzada)
-Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Xestión contable (dobre partida, libros xerais e auxiliares). Exporte a varios formatos de software de contabilidade.
 Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
+Module54000Desc=A impresión directa (sen abrir os documentos) usa o interfaz Cups IPP (A impresora ten que ser visible dende o servidor e CUPS debe estar instalado no servidor)
 Module55000Name=Enquisa ou Voto
 Module55000Desc=Módulo para facer enquisas en líña ou votos (como Doodle, Studs, Rdvz, ...)
 Module59000Name=Marxes
@@ -674,10 +676,10 @@ Module60000Desc=Módulo para xestionar aas comisións de venda
 Module62000Name=Incoterms
 Module62000Desc=Engade funcións para xestionar Incoterms
 Module63000Name=Recursos
-Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
+Module63000Desc=Xestionar recursos (impresoras, automóbiles, salas, ...) pode asignalos a eventos
 Permission11=Consultar facturas de cliente
 Permission12=Crear/Modificar facturas de cliente
-Permission13=Invalidate customer invoices
+Permission13=Invalidar facturas de cliente
 Permission14=Validar facturas de cliente
 Permission15=Enviar facturas de cliente por correo
 Permission16=Emitir pagamentos de facturas de cliente
@@ -694,7 +696,7 @@ Permission32=Crear/modificar produtos
 Permission34=Eliminar produtos
 Permission36=Ver/xestionar produtos ocultos
 Permission38=Exportar produtos
-Permission39=Ignore minimum price
+Permission39=Ignore prezo mínimo
 Permission41=Consultar proxectos e tarefas (proxectos compartidos e proxectos dos que son contacto). Tamén pode introducir tempos consumidos, para mín ou os meus subordinados, en tarefas asignadas (Follas de tempo).
 Permission42=Crear/modificar proxectos (proxectos compartidos e proxectos dos que son contacto). Tamén pode crear tarefas e asignar usuarios a proxectos e tarefas
 Permission44=Eliminar proxectos (compartidos ou son contacto)
@@ -703,9 +705,9 @@ Permission61=Consultar intervencións
 Permission62=Crear/modificar intervencións
 Permission64=Eliminar intervencións
 Permission67=Exportar intervencións
-Permission68=Send interventions by email
-Permission69=Validate interventions
-Permission70=Invalidate interventions
+Permission68=Enviar intervención por correo
+Permission69=Validar intervención
+Permission70=Invalidar intervencións
 Permission71=Consultar membros
 Permission72=Crear/modificar membros
 Permission74=Eliminar membros
@@ -728,7 +730,7 @@ Permission95=Consultar balances e resultados
 Permission101=Consultar expedicións
 Permission102=Crear/modificar expedicións
 Permission104=Validar expedicións
-Permission105=Send sendings by email
+Permission105=Enviar envíos por correo
 Permission106=Exportar expedicións
 Permission109=Eliminar expedicións
 Permission111=Consultar contas financieras
@@ -836,10 +838,10 @@ Permission402=Crear/modificar haberes
 Permission403=Validar haberes
 Permission404=Eliminar haberes
 Permission430=Usa barra de debug
-Permission511=Read payments of salaries (yours and subordinates)
+Permission511=Consultar pagamentos de salarios (teus e dos subordinados)
 Permission512=Crear/modificar pagamentos de salarios
 Permission514=Eliminar pagamentos de salarios
-Permission517=Read payments of salaries of everybody
+Permission517=Ler pagos de salarios de todos
 Permission519=Exportar salarios
 Permission520=Consultar Créditos
 Permission522=Crear/modificar Créditos
@@ -851,19 +853,19 @@ Permission532=Crear/modificar servizos
 Permission534=Eliminar servizos
 Permission536=Ver/xestionar os servizos ocultos
 Permission538=Exportar servizos
-Permission561=Read payment orders by credit transfer
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
-Permission564=Record Debits/Rejections of credit transfer
-Permission601=Read stickers
-Permission602=Create/modify stickers
-Permission609=Delete stickers
+Permission561=Ler ordes de pagamento mediante transferencia
+Permission562=Crear/modificar orde de pagamento mediante transferencia
+Permission563=Enviar/Transmitir orde de pagamento mediante transferencia
+Permission564=Rexistrar débitos/rexeitamentos da transferencia
+Permission601=Ler etiquetas
+Permission602=Crear/modificar eqtiquetas
+Permission609=Borrar etiquetas
 Permission650=Consultar lista de materiais
 Permission651=Crear/Actualizar lista de material
 Permission652=Eliminar lista de material
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
+Permission660=Ler a orde de fabricación (MO)
+Permission661=Crear / Actualizar orde de fabricación (MO)
+Permission662=Eliminar orde de fabricación (MO)
 Permission701=Consultar doacións/subvencións
 Permission702=Crear/modificar doacións/subvencións
 Permission703=Eliminar doacións/subvencións
@@ -873,8 +875,8 @@ Permission773=Eliminar informe de gastos
 Permission774=Consultar todos os informes de gastos (incluidos os non subordinados)
 Permission775=Aprobar informe de gastos
 Permission776=Pagar informe de gastos
-Permission777=Read expense reports of everybody
-Permission778=Create/modify expense reports of everybody
+Permission777=Ler informes de gastos de todos
+Permission778=Crear/modificar informes de gastos de todos
 Permission779=Exportar informe de gastos
 Permission1001=Consultar stocks
 Permission1002=Crear/modificar almacéns
@@ -899,9 +901,9 @@ Permission1185=Aprobar pedimentos a provedores
 Permission1186=Enviar pedimentos a provedores
 Permission1187=Recibir pedimentos de provedores
 Permission1188=Pechar pedimentos a provedores
-Permission1189=Check/Uncheck a purchase order reception
+Permission1189=Marcar/Desmarcar a recepción dunha orde de compra
 Permission1190=Aprobar (segunda aprobación) pedimentos a provedores
-Permission1191=Export supplier orders and their attributes
+Permission1191=Exportar pedidos de provedores e os seus atributos
 Permission1201=Obter resultado dunha exportación
 Permission1202=Crear/codificar exportacións
 Permission1231=Consultar facturas de provedores
@@ -915,8 +917,8 @@ Permission1251=Lanzar as importacións en masa á base de datos (carga de datos)
 Permission1321=Exportar facturas a clientes, campos adicionais e cobros
 Permission1322=Reabrir unha factura pagada
 Permission1421=Exportar pedimentos de clientes e campos adicionais
-Permission1521=Read documents
-Permission1522=Delete documents
+Permission1521=Ler documentos
+Permission1522=Eliminar documentos
 Permission2401=Consultar accións (eventos ou tarefas) ligadas a súa conta
 Permission2402=Crear/modificar accións (eventos ou tarefas) ligadas a súa conta
 Permission2403=Eliminar accións (eventos ou tarefas) ligadas a súa conta
@@ -931,7 +933,7 @@ Permission2515=Configuración directorios de documentos
 Permission2801=Utilizar o cliente FTP en modo leitura (só explorar e descargar)
 Permission2802=Utilizar o cliente FTP en modo escritura (borrar ou subir ficheiros)
 Permission3200=Consultar eventos arquivados e huellas dixitais
-Permission3301=Generate new modules
+Permission3301=Xerar novos módulos
 Permission4001=Ver empregados
 Permission4002=Crear empregados
 Permission4003=Eliminar empregados
@@ -951,13 +953,13 @@ Permission23001=Consultar. Traballo programado
 Permission23002=Crear/actualizar. Traballo programado
 Permission23003=Borrar. Traballo Programado
 Permission23004=Executar. Traballo programado
-Permission50101=Use Point of Sale (SimplePOS)
-Permission50151=Use Point of Sale (TakePOS)
+Permission50101=Usar TPV
+Permission50151=Usar TPV (TakeTPV)
 Permission50201=Consultar as transaccións
 Permission50202=Importar as transaccións
-Permission50330=Read objects of Zapier
-Permission50331=Create/Update objects of Zapier
-Permission50332=Delete objects of Zapier
+Permission50330=Ler obxectos de Zapier
+Permission50331=Crear/Actualizar obxectos de Zapier
+Permission50332=Eliminar obxectos de Zapier
 Permission50401=Contabilizar produtos e facturas con contas contables
 Permission50411=Consultar operacións do Libro Maior
 Permission50412=Rexistrar/Editar operacións no Libro Maior
@@ -981,21 +983,21 @@ Permission63001=Consultar recursos
 Permission63002=Crear/modificar recursos
 Permission63003=Eliminar recursos
 Permission63004=Ligar recursos a eventos da axenda
-Permission64001=Allow direct printing
-Permission67000=Allow printing of receipts
-Permission68001=Read intracomm report
-Permission68002=Create/modify intracomm report
-Permission68004=Delete intracomm report
-Permission941601=Read receipts
-Permission941602=Create and modify receipts
-Permission941603=Validate receipts
-Permission941604=Send receipts by email
-Permission941605=Export receipts
-Permission941606=Delete receipts
+Permission64001=Permitir impresión directa
+Permission67000=Permitir impresión de recibos
+Permission68001=Ler o informe intracom
+Permission68002=Crear/modificar informe intracom
+Permission68004=Eliminar informe intracom
+Permission941601=Ler recibos
+Permission941602=Crear e modificar recibos
+Permission941603=Validar recibos
+Permission941604=Enviar recibos por correo electrónico
+Permission941605=Exportar recibos
+Permission941606=Eliminar recibos
 DictionaryCompanyType=Tipos de terceiros
 DictionaryCompanyJuridicalType=Formas xurídicas de terceiros
-DictionaryProspectLevel=Prospect potential level for companies
-DictionaryProspectContactLevel=Prospect potential level for contacts
+DictionaryProspectLevel=Nivel potencial de perspectivas para as empresas
+DictionaryProspectContactLevel=Nivel potencial de perspectivas para clientes
 DictionaryCanton=Provincias
 DictionaryRegion=Rexións
 DictionaryCountry=Países
@@ -1003,7 +1005,7 @@ DictionaryCurrency=Moedas
 DictionaryCivility=Títulos honoríficos
 DictionaryActions=Tipos de eventos da axenda
 DictionarySocialContributions=Tipos de impostos sociais ou fiscais
-DictionaryVAT=Tasa de IVE (Imposto sobre vendas en EEUU)
+DictionaryVAT=Tipos de IVE ou Tipos de impostos sobre Vendas
 DictionaryRevenueStamp=Importes de selos fiscais
 DictionaryPaymentConditions=Condicións de pagamento
 DictionaryPaymentModes=Modos de pagamento
@@ -1025,14 +1027,14 @@ DictionaryEMailTemplates=Prantillas E-Mails
 DictionaryUnits=Unidades
 DictionaryMeasuringUnits=Unidades de Medida
 DictionarySocialNetworks=Redes sociais
-DictionaryProspectStatus=Prospect status for companies
-DictionaryProspectContactStatus=Prospect status for contacts
+DictionaryProspectStatus=Estado cliente potencial
+DictionaryProspectContactStatus=Estado da prospección dos contactos
 DictionaryHolidayTypes=Tipos de vacacións
 DictionaryOpportunityStatus=Estado de oportunidade para o proxecto/oportunidade
 DictionaryExpenseTaxCat=Informe de gastos - Categorías de transporte
 DictionaryExpenseTaxRange=Informe de gastos - Rango por categoría de transporte
-DictionaryTransportMode=Intracomm report - Transport mode
-TypeOfUnit=Type of unit
+DictionaryTransportMode=Informe intracom - Modo de transporte
+TypeOfUnit=Tipo de unidade
 SetupSaved=Configuración gardada
 SetupNotSaved=Configuración non gardada
 BackToModuleList=Voltar á lista de módulos
@@ -1062,15 +1064,15 @@ LocalTax1ManagementES=Xestión RE
 LocalTax1IsUsedDescES=O tipo de RE proposto por defecto nas emisións de orzamentos, facturas, pedimentos, etc. Responde á seguinte regra:<br>Se o comprador non está suxeito a RE, RE por defecto=0. Fin da regra.<br>Se o comprador está suxeito a RE entón aplícase o valor de RE por defecto. Fin da regra.<br>
 LocalTax1IsNotUsedDescES=O tipo de RE proposto por defecto é 0. Fin da regra.
 LocalTax1IsUsedExampleES=En España, trátase de persoas físicas: autónomos suxeitos a unhos epígrafes concretos do IAE.
-LocalTax1IsNotUsedExampleES=En España, trátase de entidades xurídicas: Sociedades limitadas, anónimas, etc. e persoas físicas (autónomos) suxeitos a certos epígrafes do IAE.
+LocalTax1IsNotUsedExampleES=En España, trátase de entidades xurídicas:  e persoas físicas autónomos suxeitos a certos epígrafes do IAE.
 LocalTax2ManagementES=Xestión IRPF
 LocalTax2IsUsedDescES=O tipo de IRPF proposto por defecto nas emisións de orzamentos, facturas, pedimentos, etc. Responde á seguinte regra:<br>Se o vendedor non está suxeito a IRPF, IRPF por defecto=0. Fin da regra.<br>Se o vendedor está suxeito a IRPF entón aplícase o valor de IRPF por defecto. Fin da regra.<br>
 LocalTax2IsNotUsedDescES=O tipo de IRPF proposto por defecto é 0. Fin da regra.
 LocalTax2IsUsedExampleES=En España, trátase de persoas físicas: autónomos e profesionais independentes que prestan servizos, e empresas que escolleron o réxime fiscal de módulos.
 LocalTax2IsNotUsedExampleES=En España, trátase de empresas non suxeitas ao réxime fiscal de módulos.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
-UseRevenueStamp=Use a tax stamp
-UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
+RevenueStampDesc=O "selo fiscal" ou "selo de ingresos" é un imposto fixo por factura (non depende do importe da factura). Tamén pode ser un % de impostos, pero usar o segundo ou terceiro tipo de impostos é mellor para a porcentaxe de impostos, xa que os selos de impostos non proporcionan ningún informe. Só algúns países utilizan este tipo de impostos.
+UseRevenueStamp=Use un selo fiscal
+UseRevenueStampExample=valor do selo fiscal defínese por defecto na configuración dos dicionarios (%s-%s-%s)
 CalcLocaltax=Informes de impostos locais
 CalcLocaltax1=Vendas - Compras
 CalcLocaltax1Desc=Os informes calcúlanse coa diferencia entre as vendas e as compras
@@ -1078,12 +1080,12 @@ CalcLocaltax2=Compras
 CalcLocaltax2Desc=Os informes se basan no total das compras
 CalcLocaltax3=Vendas
 CalcLocaltax3Desc=Os informes se basan no total das vendas
-NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+NoLocalTaxXForThisCountry=Segundo a configuración dos impostos (ver% s -% s -% s), o seu país non precisa aplicar ese tipo de impostos
 LabelUsedByDefault=Etiqueta que se utilizará se non se atopa tradución para este código
 LabelOnDocuments=Etiqueta sobre documentos
 LabelOrTranslationKey=Clave de tradución ou cadea
 ValueOfConstantKey=Valor da constante
-ConstantIsOn=Option %s is on
+ConstantIsOn=Opción %s está activada
 NbOfDays=Nº de días
 AtEndOfMonth=A fin de mes
 CurrentNext=Actual/Seguinte
@@ -1128,7 +1130,7 @@ LoginPage=Páxina de login
 BackgroundImageLogin=Imaxe de fondo
 PermanentLeftSearchForm=Zona de procura permanente do menú esquerdo
 DefaultLanguage=Idioma por defecto
-EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
+EnableMultilangInterface=Activar interfaz multi-idioma para relacións con clientes ou provedores
 EnableShowLogo=Amosar o logotipo no menú da esquerda
 CompanyInfo=Empresa/Organización
 CompanyIds=Identificación da empresa/organización
@@ -1152,26 +1154,26 @@ ShowBugTrackLink=Amosar ligazón "<strong>%s</strong>"
 Alerts=Alertas
 DelaysOfToleranceBeforeWarning=Atraso antes da amosar unha alerta
 DelaysOfToleranceDesc=Esta pantalla permite configurar os prazos de tolerancia antes da alerta co icono %s, sobre cada elemento en atraso.
-Delays_MAIN_DELAY_ACTIONS_TODO=Atraso (en días) sobre eventos planificados (eventos da axenda) aínda non completados
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Atraso antes da alerta (en días) sobre proxectos non pechados a tempo
-Delays_MAIN_DELAY_TASKS_TODO=Atraso (en días) sobre tarefas planificadas (tarefas de proxectos) aínda non completadas
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Atraso antes da alerta (en días) sobre pedimentos non procesados
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Atraso antes da alerta (en días) sobre pedimentos a provedores non procesados
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Atraso antes da alerta (en días) sobre orzamentos non pechados
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Atraso antes da alerta (en días) sobre orzamentos non facturados
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Atraso antes da alerta (en días) sobre servizos a activar
-Delays_MAIN_DELAY_RUNNING_SERVICES=Atraso antes da alerta (en días) sobre servizos expirados
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Atraso antes da alerta (en días) sobre facturas de provedor impagadas
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Atraso antes da alerta (en días) sobre facturas a cliente impagadas
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Atraso antes da alerta (en días) sobre conciliacións bancarias pendentes
-Delays_MAIN_DELAY_MEMBERS=Atraso antes da alerta (en días) sobre cotizacións de membros en atraso
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Atraso antes da alerta  (en días) sobre talóns a ingresar
-Delays_MAIN_DELAY_EXPENSEREPORTS=Atraso antes da alerta  (en días) sobre informes de gastos a aprobar
-Delays_MAIN_DELAY_HOLIDAYS=Atraso antes da alerta  (en días) sobre días libres a aprobar.
+Delays_MAIN_DELAY_ACTIONS_TODO=Os eventos planificados (eventos da axenda) non se completaron
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Proxecto non pechado a tempo
+Delays_MAIN_DELAY_TASKS_TODO=A tarefa planificada (tarefas do proxecto) non se completou
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Pedimento non procesado
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Pedimento non procesado
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Orzamento non pechado
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Orzamento non facturado
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Servizos a activar
+Delays_MAIN_DELAY_RUNNING_SERVICES=Servizos expirados
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Facturas de provedor non pagas
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Facturas a cliente non pagas
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Conciliacións bancarias pendentes
+Delays_MAIN_DELAY_MEMBERS=Cotizacións de membros en atraso
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Talóns a ingresar non realizados
+Delays_MAIN_DELAY_EXPENSEREPORTS=Informe de gastos a aprobar
+Delays_MAIN_DELAY_HOLIDAYS=Días libres a aprobar.
 SetupDescription1=Antes de comezar a usar Dolibarr, algúns parámetros iniciais teñen que ser definidos e activar/configurar os módulos.
 SetupDescription2=As seguintes dúas seccións son obrigatorias (as dúas primeiras entradas no menu de configuración):
-SetupDescription3=<a href="%s">%s->%s</a> <br>Parámetros básicos usados para persoalizar o comportamento por defecto de Dolibarr (ex. características relacionadas co país)
-SetupDescription4=<a href="%s">%s -> %s</a> <br>Este software é unha colección de moitos módulos/aplicacións, todos eles mais ou menos independentes. Os módulos relevantes que precisas deben ser activados e configurados. Novos elementos/opcións serán engadidos aos menús coa activación do módulo.
+SetupDescription3=<a href="%s">%s->%s</a> <br><br> Parámetros básicos usados para persoalizar o comportamento por defecto de Dolibarr (ex. características relacionadas co país)
+SetupDescription4=<a href="%s">%s -> %s</a> <br><br> Este software é unha colección de moitos módulos/aplicacións, todos eles mais ou menos independentes. Os módulos relevantes que precisas deben ser activados e configurados. Novos elementos/opcións serán engadidos aos menús coa activación do módulo.
 SetupDescription5=Outras entradas do menú de configuración xestionan parámetros opcionais.
 LogEvents=Auditoría da seguridade de eventos
 Audit=Auditoría
@@ -1182,7 +1184,7 @@ InfoWebServer=Sobre o Servidor Web
 InfoDatabase=Sobre a base de datos
 InfoPHP=Sobre o PHP
 InfoPerf=Sobre o rendimento
-InfoSecurity=About Security
+InfoSecurity=Acerca da seguridade
 BrowserName=Nome do navegador
 BrowserOS=S.O. do navegador
 ListOfSecurityEvents=Listaxe de eventos de seguridade Dolibarr
@@ -1191,7 +1193,7 @@ LogEventDesc=Pode habilitar o rexistro de eventos de seguridade aquí. Os admini
 AreaForAdminOnly=Os parámetros de configuración poden ser tratados por <b>usuarios administradores</b> exclusivamente.
 SystemInfoDesc=A información do sistema é información técnica accesible en modo lectura para administradores exclusivamente.
 SystemAreaForAdminOnly=Esta área é accesible aos usuarios administradores exclusivamente. Os permisos dos usuarios de Dolibarr non permiten cambiar esta restricción.
-CompanyFundationDesc=Edite a información da empresa/entidade. Faga clic nos botóns "%s" ou "%s" a pé de páxina.
+CompanyFundationDesc=Edite a información da súa empresa/entidade. Faga clic no botón "%s" a pé de páxina cando remate
 AccountantDesc=Se ten un contable/auditor externo, pode editar aquí a súa información.
 AccountantFileNumber=Número de ficheiro
 DisplayDesc=Pode modificar aquí todos os parámetros relacionados coa apariencia do Dolibarr
@@ -1199,7 +1201,7 @@ AvailableModules=Módulos dispoñibles
 ToActivateModule=Para activar os módulos, ir ao área de Configuración (Inicio->Configuración->Módulos).
 SessionTimeOut=Timeout de sesións
 SessionExplanation=Este número garantiza que a sesión nunca caducará antes deste atraso, si el limpiador de sesión se realiza mediante un limpiador de sesión interno de PHP (e nada más). El limpiador interno de sesións de PHP no garantiza que la sesión caduque después de este retraso. Expirará, después de este retraso, e cuando se ejecute o limpiador de sesións, por lo que cada acceso <b> %s/%s </b>, pero solo durante o acceso realizado por otras sesións (si el valor es 0, significa que la limpieza de sesións solo se realiza por un proceso externo). <br> Nota: en algunos servidores con un mecanismo externo de limpieza de sesión (cron bajo debian, ubuntu...), las sesións se pueden destruir después de un período definido por una configuración externa, sin importar el valor introducido aquí
-SessionsPurgedByExternalSystem=Sessions on this server seems to be cleaned by an external mechanism (cron under debian, ubuntu ...), probably every <b>%s</b> seconds (= value of parameter <b>session.gc_maxlifetime</b>), so changing the value here has no effect. You must ask the server administrator to change session delay.
+SessionsPurgedByExternalSystem=As sesións neste servidor parecen estar limpas por un mecanismo externo (cron baixo debian, ubuntu ...), probablemente cada <b>%s</b> segundos (= valor do parámetro <b>session.gc_maxlifetime</b>), polo que cambiar o valor aquí non ten efecto. Debe solicitar ao administrador do servidor que cambie o atraso da sesión.
 TriggersAvailable=Triggers dispoñibles
 TriggersDesc=Os triggers son ficheiros que, unha vez copiados no directorio <b>htdocs/core/triggers</b>, modifican o comportamento do fluxo de traballo de Dolibarr. Realizan accións suplementarias, desencadenadas polos eventos Dolibarr (creación de empresa, validación factura...).
 TriggerDisabledByName=Triggers deste ficheiro desactivados polo sufixo <b>-NORUN</b> no nome do ficheiro.
@@ -1208,37 +1210,37 @@ TriggerAlwaysActive=Triggers deste ficheiro sempre activos, posto que os módulo
 TriggerActiveAsModuleActive=Triggers deste ficheiro activos posto que o módulo <b>%s</b> está activado
 GeneratedPasswordDesc=Indique aquí que norma quere utilizar para xerar as contrasinais cando precise xerar un novo contrasinal
 DictionaryDesc=Inserte aquí os datos de referencia. Pode engadir os seus datos aos predefinidos.
-ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting only.
-MiscellaneousDesc=All other security related parameters are defined here.
+ConstDesc=Esta páxina permítelle editar (substituír) parámetros non dispoñibles noutras páxinas. Estes son principalmente parámetros reservados só para desenvolvedores ou solución avanzadas de problemas.
+MiscellaneousDesc=Todos os outros parámetros relacionados coa seguridad definense aquí.
 LimitsSetup=Configuración de límites e precisións
 LimitsDesc=Pode definir aquí os límites e precisións utilizados por Dolibarr
 MAIN_MAX_DECIMALS_UNIT=Decimais máximos para os prezos unitarios
 MAIN_MAX_DECIMALS_TOT=Decimais máximos para os prezos totais
-MAIN_MAX_DECIMALS_SHOWN=Max. decimals for prices <b>shown on screen</b>. Add an ellipsis <b>...</b> after this parameter (e.g. "2...") if you want to see "<b>...</b>" suffixed to the truncated price.
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something other than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
+MAIN_MAX_DECIMALS_SHOWN=Decimais máximos nos prezos <b>amosados na pantalla</b>. Engade unha elipse <b> ... </b> despois deste parámetro (por exemplo, "2 ...") se queres ver o sufixo "<b> ... </b>" ao prezo acurtado.
+MAIN_ROUNDING_RULE_TOT=Salto do intervalo de redondeo (para os países onde o redondeo se fai noutra cousa que non sexa a base 10. Por exemplo, pon 0,05 se o redondeo se fai 0,05 pasos)
 UnitPriceOfProduct=Prezo unitario sen IVE dun produto
-TotalPriceAfterRounding=Prezo total despois do redondeo
+TotalPriceAfterRounding=Prezo total (sen IVE/ incluído taxas) despois do redondeo
 ParameterActiveForNextInputOnly=Parámetro efectivo só a partires das próximas sesións
 NoEventOrNoAuditSetup=Non foron rexistrados eventos de seguridade aínda. Isto pode ser normal se a auditoría non foi habilitada na páxina "Configuración->Seguridade->Auditoría".
 NoEventFoundWithCriteria=Non atopáronse eventos de seguridade para tales criterios de búsca.
 SeeLocalSendMailSetup=Ver a configuración local de sendmail
-BackupDesc=Para realizar unha copia de seguridade completa de Dolibarr, vostede debe:
-BackupDesc2=Garde o contido do directorio de documentos (<b>%s</b>), contén todos os ficheiros subidos e xerados  (Polo que inclúe todos os ficheiros de copias xeradas no primeiro paso).
+BackupDesc=Unha copia de seguridade <b>completa</b>da instalación de Dolibarr, require dous pasos.
+BackupDesc2=Garde o contido do directorio de "documentos" (<b>%s</b>), que contén todos os ficheiros subidos e xerados  Isto tamén incluirça os ficheiros xerados no paso 1. Esta operación pode levar varios minutos.
 BackupDesc3=Gardar o contido da súa base de datos (<b>%s</b>) nun ficheiro de volcado. Para isto pode utilizar o asistente a continuación.
 BackupDescX=O directorio arquivado deberá gardarse  nun lugar seguro.
 BackupDescY=O ficheiro de volcado xerado deberá gardarse nun lugar seguro.
 BackupPHPWarning=A copia de seguridade non pode ser garantida con este método. É preferible utilizar o anterior
 RestoreDesc=Para restaurar unha copia de seguridade de Dolibarr, vostede debe:
 RestoreDesc2=Tomar o ficheiro (ficheiro zip, por exemplo) do directorio dos documentos e descomprimilo no directorio dos documentos dunha nova instalación de Dolibarr ou na carpeta dos documentos desta instalación (<b>%s</b>).
-RestoreDesc3=Restaurar o ficheiro de volcado gardado na base de datos da nova instalación de Dolibarr ou desta instalación (<b>%s</b>). Atención, unha vez realizada a restauración, deberá utilizar un login/contrasinal de administrador existente no momento da copia de seguridade para conectarse. Para restaurar a base de datos na instalación actual, pode utilizar o asistente a continuación.
+RestoreDesc3=Restaurar o ficheiro de volcado gardado na base de datos da nova instalación de Dolibarr ou desta instalación (<b>%s</b>). Atención, unha vez realizada a restauración, deberá utilizar un login/contrasinal de administrador existente no momento da copia de seguridade para conectarse.<br> Para restaurar a base de datos na instalación actual, pode utilizar o asistente a continuación.
 RestoreMySQL=Importación MySQL
-ForcedToByAModule=Esta regra está forzada a <b>%s</b> por un dos módulos activados
-ValueIsForcedBySystem=This value is forced by the system. You can't change it.
+ForcedToByAModule=Esta regra é obrigada a <b>%s</b> por un dos módulos activados
+ValueIsForcedBySystem=Este valor é obrigado polo sistema. Non pode cambialo.
 PreviousDumpFiles=Copias de seguridade da base de datos realizadas anteriormente
 PreviousArchiveFiles=Copias de seguridade do directorio documentos realizadas anteriormente
 WeekStartOnDay=Primeiro día da semana
 RunningUpdateProcessMayBeRequired=Parece preciso realizar o proceso de actualización (a versión do programa %s difiere da versión da base de datos %s)
-YouMustRunCommandFromCommandLineAfterLoginToUser=Debe executar o comando dende unha shell despois de ter iniciado sesión coa conta <b>%s</b>.
+YouMustRunCommandFromCommandLineAfterLoginToUser=Debe executar esta orde dende unha shell despois de ter iniciado sesión co usuario <b>%s</b> ou debe engadir a opción -W ao final da liña para proporcionar un contrasinal de <b> %s </b>
 YourPHPDoesNotHaveSSLSupport=Funcións SSL non dispoñibles no seu PHP
 DownloadMoreSkins=Mais temas para descargar
 SimpleNumRefModelDesc=Volta un número baixo o formato %syymm-nnnn donde y é o ano, mm o mes e nnnn un contador secuencial sen ruptura e sen regresar a 0
@@ -1275,46 +1277,46 @@ ExtraFieldsSupplierOrders=Campos adicionais (pedimentos a provedores)
 ExtraFieldsSupplierInvoices=Campos adicionais (facturas)
 ExtraFieldsProject=Campos adicionais (proxectos)
 ExtraFieldsProjectTask=Campos adicionais (tarefas)
-ExtraFieldsSalaries=Campos dicionais (salarios)
+ExtraFieldsSalaries=Campos adicionais (salarios)
 ExtraFieldHasWrongValue=O campo %s contén un valor non válido
 AlphaNumOnlyLowerCharsAndNoSpace=só alfanuméricos e minúsculas sen espazo
-SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
+SendmailOptionNotComplete=Aviso, nalgúns sistemas Linux, para enviar correos electrónicos desde o seu correo electrónico, a configuración de execución de sendmail debe conter a opción -ba (o parámetro mail.force_extra_parameters no seu ficheiro php.ini). Se algúns dos seus destinatarios nunca reciben correos electrónicos, tente editar este parámetro PHP con mail.force_extra_parameters=-ba).
 PathToDocuments=Ruta de acceso a documentos
 PathDirectory=Directorio
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might not be parsed correctly by some receiving mail servers. The result is that some mails can't be read by people hosted by those bugged platforms. This is the case for some Internet providers (Ex: Orange in France). This is not a problem with Dolibarr or PHP but with the receiving mail server. You can however add an option MAIN_FIX_FOR_BUGGED_MTA to 1 in Setup - Other to modify Dolibarr to avoid this. However, you may experience problems with other servers that strictly use the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" which has no disadvantages.
-TranslationSetup=Setup of translation
-TranslationKeySearch=Search a translation key or string
-TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set the display language:<br>* Default/Systemwide: menu <strong>Home -> Setup -> Display</strong><br>* Per user: Click on the username at the top of the screen and modify the <strong>User Display Setup</strong> tab on the user card.
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
-TranslationOverwriteDesc2=You can use the other tab to help you know which translation key to use
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TitleNumberOfActivatedModules=Activated modules
-TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found in PHP path
+SendmailOptionMayHurtBuggedMTA=A función para enviar correos usando o método "PHP mail direct" xerará unha mensaxe de correo que algúns servidores de correo receptores poden non analizar correctamente. O resultado é que algúns correos non poden ser lidos por persoas aloxadas nesas plataformas. É o caso dalgúns fornecedores de Internet (por exemplo: Orange en Franza). Isto non é un problema con Dolibarr ou PHP senón co servidor de correo receptor. Porén, pode engadir unha opción MAIN_FIX_FOR_BUGGED_MTA a 1 en Configuración-Outro para modificar Dolibarr para evitar o erro. Porén, pode ter problemas con outros servidores que usan estritamente o estándar SMTP. A outra solución (recomendada) é empregar o método "SMTP socket library" que non ten desvantaxes.
+TranslationSetup=Configuración de tradución
+TranslationKeySearch=Buscar unha chave ou cadea de tradución
+TranslationOverwriteKey=Sobreescribir una cadena traducida
+TranslationDesc=Como configurar o idioma de visualización:<br>* Por defecto Sistema: menu <strong>Inicio - Configuración - Entorno</strong><br>* Por usuario: faga clic no nome de usuario na parte superior da pantalla e modifique a pestana <strong> Configuración da visualización do usuario </strong> na tarxeta de usuario.
+TranslationOverwriteDesc=Tamén pode reemplazar cadeas enchendo a seguinte táboa. Escolla o seu idioma no menú despregable "%s", insira a cadea de clave de tradución en "%s" e a súa nova tradución en "%s"
+TranslationOverwriteDesc2=Podes usar a outra pestana para axudarche a saber que clave de tradución usar
+TranslationString=Cadea traducida
+CurrentTranslationString=Cadna traducida actual
+WarningAtLeastKeyOrTranslationRequired=Requírese un criterio de busca polo menos para a clave ou a cadea de tradución
+NewTranslationStringToShow=Nova cadea traducida a amosar
+OriginalValueWas=A tradución orixinal sobrescríbese. O valor orixinal era:<br><br>%s
+TransKeyWithoutOriginalValue=Forzou unha nova tradución para a clave de tradución '<strong>%s</strong>' que non existe en ningún ficheiro de idioma
+TitleNumberOfActivatedModules=Módulos activados
+TotalNumberOfActivatedModules=Número total de módulos activados: <b>%s</b> / <b>%s</b>
+YouMustEnableOneModule=Debe activar polo menos 1 módulo.
+ClassNotFoundIntoPathWarning=Clase 1%s non foi atopada na ruta PHP
 YesInSummer=Sí en verano
-OnlyFollowingModulesAreOpenedToExternalUsers=Atención: únicamente os módulos seguintes están dispoñibles a usuarios externos (sexa cal fora o permiso de ditos usuarios) e só outorganse permisos:
+OnlyFollowingModulesAreOpenedToExternalUsers=Atención: Teña conta que os módulos seguintes están dispoñibles a usuarios externos (sexa cal fora o permiso destes usuarios) e só se os permisos son concedidos:<br>
 SuhosinSessionEncrypt=Almacenamento de sesións cifradas por Suhosin
 ConditionIsCurrently=Actualmente a condición é %s
 YouUseBestDriver=Está usando o driver %s, actualmente é o mellor driver dispoñible.
 YouDoNotUseBestDriver=Usa o driver %s aínda que é recomendable usar o driver %s.
-NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=So ten %s %s na base de datos. Isto non require ningunha optimización particular
 SearchOptim=Buscar optimización
 YouHaveXObjectUseSearchOptim=Ten %s %s produtos na base de datos. Debería engadir a constante %s a 1 e Inicio-Configuración-Outra Configuración. Limita a busca ao comezo da cadea o que fai posible que a base de datos use o indice e acade unha resposta inmediata.
 YouHaveXObjectAndSearchOptimOn=Ten %s %s na base de datos e a constante %s está configurada en 1 in Inicio-Configuración-Outra Configuración.
 BrowserIsOK=Usa o navegador web %s. Este navegador está optimizado para a seguridade e o rendemento.
 BrowserIsKO=Usa o navegador web %s.  Este navegador é unha mala escolla para a seguridade, rendemento e fiabilidade. Aconsellamos utilizar Firefox, Chrome, Opera ou Safari.
-PHPModuleLoaded=PHP component %s is loaded
+PHPModuleLoaded=%s de compoñente PHP está cargado
 PreloadOPCode=Pregarca de OPCode está activa
 AddRefInList=Amosar código de cliente/provedor nas listaxes (e selectores) e ligazóns.<br>Os terceiros aparecerán co nome "CC12345 - SC45678 - The big company coorp", no lugar de "The big company coorp".
 AddAdressInList=Amosar o enderezo do cliente/provedor nas listaxes (e selectores) <br>Os terceiros aparecerán co nome "The big company coorp - 21 jump street 123456 Big town - USA ", no lugar de "The big company coorp".
-AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
+AddEmailPhoneTownInContactList=Amosar o correo electrónico de contacto (ou os teléfonos se non é definido) e a lista de información da cidade (seleccionar lista ou caixa de combinación) <br> Os contactos aparecerán cun formato de nome "Dupond Durand-dupond.durand@email.com-Paris" ou "Dupond" Durand - 06 07 59 65 66 - París "en lugar de" Dupond Durand ".
 AskForPreferredShippingMethod=Consultar polo método preferido de envío a terceiros.
 FieldEdition=Edición do campo %s
 FillThisOnlyIfRequired=Exemplo: +2 (Complete só se rexistra unha desviación do tempo na exportación)
@@ -1322,7 +1324,7 @@ GetBarCode=Obter código de barras
 NumberingModules=Modelos de numeración
 DocumentModules=Modelos de documento
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Volta un contrasinal xerado segundo o algoritmo interno de Dolibarr:%s caracteres, que conteñen números e caracteres en minúsculas mesturados.
 PasswordGenerationNone=Non suxerir ningún contrasinal xerada. O contrasinal debe ser escrito manualmente.
 PasswordGenerationPerso=Volta un contrasinal segundo a configuración definida.
 SetupPerso=Segundo a túa configuración
@@ -1332,16 +1334,16 @@ RuleForGeneratedPasswords=Norma para a xeración das contrasinais propostas
 DisableForgetPasswordLinkOnLogonPage=Non amosar a ligazón "Contrasinal esquecida" na páxina de login
 UsersSetup=Configuración do módulo usuarios
 UserMailRequired=E-Mail preciso para crear un novo usuario
-UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
-UsersDocModules=Document templates for documents generated from user record
-GroupsDocModules=Document templates for documents generated from a group record
+UserHideInactive=Ocultar usuarios inactivos de todas as listas combinadas de usuarios (Non recomendado: isto pode significar que non poderá filtrar nin buscar usuarios antigos nalgunhas páxinas)
+UsersDocModules=Modelos de documentos para documentos xerados desde o rexistro do usuario
+GroupsDocModules=Modelos de documentos para documentos xerados desde un rexistro de grupo
 ##### HRM setup #####
-HRMSetup=HRM module setup
+HRMSetup=Setup do módulo RRHH
 ##### Company setup #####
 CompanySetup=Configuración do módulo Terceiros
 CompanyCodeChecker=Opcións para a xeración automática de códigos de clientes / provedores.
 AccountCodeManager=Opcións para a xeración automática de contas contables de clientes / provedores.
-NotificationsDesc=As notificacións por e-mail permitenlle enviar silenciosamente e-mails  automáticos, para algúns eventos Dolibarr. Pódense definir os destinatarios:
+NotificationsDesc=As notificacións por e-mail permitenlle enviar silenciosamente e-mails  automáticos, para algúns eventos Dolibarr.<br> Pódense definir os destinatarios:
 NotificationsDescUser=* por usuarios, un usuario á vez.
 NotificationsDescContact=* por contactos de terceiros (clientes ou provedores), un contacto á vez.
 NotificationsDescGlobal=* o configurando destinatarios globlalmente na configuración do módulo.
@@ -1355,10 +1357,10 @@ MustBeMandatory=¿Obrigatorio para crear terceiros (se o CIF ou tipo de compañ
 MustBeInvoiceMandatory=¿Obrigatorio para validar facturas?
 TechnicalServicesProvided=Servizos técnicos prestados
 #####DAV #####
-WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that needs an existing login account/password for access.
+WebDAVSetupDesc=Estas son as ligazóns para acceder ao directorio WebDAV. Conten un directorio "público" aberto para calquera usuario que coñeza a URL (se permite o acceso público ao directorio) e un directorio "privado" que precisa unha conta de inicio de sesión / contrasinal para acceder.
 WebDavServer=URL raíz do servidor %s: %s
 ##### Webcal setup #####
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
+WebCalUrlForVCalExport=Hai unha ligazón de exportación ao formato <b>%s</b> dispoñible na seguinte ligazón:: %s
 ##### Invoices #####
 BillsSetup=Configuración do módulo Facturas
 BillsNumberingModule=Módulo de numeración de facturas e abonos
@@ -1391,16 +1393,16 @@ WatermarkOnDraftSupplierProposal=Marca de auga en orzamentos de provedor (no cas
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Preguntar por conta bancaria a usar no orzamento
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Almacén a utilizar para o pedimento
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Preguntar por conta bancaria a usar no pedimento a provedor
 ##### Orders #####
 SuggestedPaymentModesIfNotDefinedInOrder=Modo suxerido de pago en pedimentos de cliente por defecto se non está definido no pedimento
-OrdersSetup=Sales Orders management setup
-OrdersNumberingModules=Orders numbering models
-OrdersModelModule=Order documents models
-FreeLegalTextOnOrders=Free text on orders
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
+OrdersSetup=Configuración da xestión de pedimentos de cliente
+OrdersNumberingModules=Modelos de numeración de pedimentos
+OrdersModelModule=Modelos de documentos de pedimentos
+FreeLegalTextOnOrders=Texto libre en pedimentos
+WatermarkOnDraftOrders=Marca de auga en borradores de pedimentos (ningunha se está baleira)
+ShippableOrderIconInList=Engade unha icona na lista de pedimentos que indique se se pode enviar o pedimento
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Solicitar o destino da orde bancaria
 ##### Interventions #####
 InterventionsSetup=Configuración do módulo intervencións
 FreeLegalTextOnInterventions=Texto adicional nas fichas de intervención
@@ -1421,7 +1423,7 @@ AdherentMailRequired=E-Mail obrigatorio para crear un membro novo
 MemberSendInformationByMailByDefault=Caixa de verificación para enviar o correo de confirmación (validación ou nova cotización) aos membros é por defecto "sí"
 VisitorCanChooseItsPaymentMode=O visitante pode escoller entre os modos de pagamento dispoñibles
 MEMBER_REMINDER_EMAIL=Habilitar recordatorio de eventos <b>por e-mail</b> de suscripcións expiradas. Nota: O módulo <strong>%s</strong> debe estar habilitado e configurado correctamente para que o recordatorio sexa enviado.
-MembersDocModules=Document templates for documents generated from member record
+MembersDocModules=Modelos de documentos para documentos xerados a partir do rexistro de membros
 ##### LDAP setup #####
 LDAPSetup=Configuración do módulo LDAP
 LDAPGlobalParameters=Parámetros globais
@@ -1490,27 +1492,27 @@ LDAPTestSynchroMemberType=Probar a sincronización de tipo de membro
 LDAPTestSearch= Probar unha busca LDAP
 LDAPSynchroOK=Proba de sincronización realizada correctamente
 LDAPSynchroKO=Proba de sincronización erronea
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that the connection to the server is correctly configured and allows LDAP updates
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authenticate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authenticate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=LDAP server configured for version 3
-LDAPSetupForVersion2=LDAP server configured for version 2
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (unix)
+LDAPSynchroKOMayBePermissions=Fallou a proba de sincronización. Comprobe se a conexión co servidor está configurada correctamente e permite actualizacións LDAP
+LDAPTCPConnectOK=Conexión TCP ao servidor LDAP realizada (Servidor=%s, Porto=%s)
+LDAPTCPConnectKO=Fallo de conexión TCP ao servidor LDAP (Servidor=%s, Porto=%s)
+LDAPBindOK=Conexión/Autenticación realizada ao servidor LDAP (Servidor=%s, Puerto=%s, Admin=%s, Password=%s)
+LDAPBindKO=Fallo de conexión/autenticación ao servidor LDAP (Servidor=%s, Puerto=%s, Admin=%s, Password=%s)
+LDAPSetupForVersion3=Servidor LDAP configurado para versión 3
+LDAPSetupForVersion2=Servidor LDAP configurado para versión 2
+LDAPDolibarrMapping=Mapping Dolibarr
+LDAPLdapMapping=Mapping LDAP
+LDAPFieldLoginUnix=Inicio de sesión (unix)
 LDAPFieldLoginExample=Exemplo : uid
-LDAPFilterConnection=Search filter
-LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPFilterConnection=Filtro de búsqueda
+LDAPFilterConnectionExample=Exemplo : &(objectClass=inetOrgPerson)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example: samaccountname
+LDAPFieldLoginSambaExample=Exemplo : samaccountname
 LDAPFieldFullname=Nome completo
-LDAPFieldFullnameExample=Example: cn
-LDAPFieldPasswordNotCrypted=Password not encrypted
-LDAPFieldPasswordCrypted=Password encrypted
-LDAPFieldPasswordExample=Example: userPassword
-LDAPFieldCommonNameExample=Example: cn
+LDAPFieldFullnameExample=Exemplo : cn
+LDAPFieldPasswordNotCrypted=Contrasinal non cifrada
+LDAPFieldPasswordCrypted=Contrasinal cifrada
+LDAPFieldPasswordExample=Exemplo : userPassword
+LDAPFieldCommonNameExample=Exemplo : cn
 LDAPFieldName=Nome
 LDAPFieldNameExample=Exemplo : sn
 LDAPFieldFirstName=Nome
@@ -1545,51 +1547,51 @@ LDAPFieldSid=SID
 LDAPFieldSidExample=Exemplo : objectsid
 LDAPFieldEndLastSubscription=Data finalización como membro
 LDAPFieldTitle=Posto de traballo
-LDAPFieldTitleExample=Example: title
-LDAPFieldGroupid=Group id
-LDAPFieldGroupidExample=Exemple : gidnumber
-LDAPFieldUserid=User id
-LDAPFieldUseridExample=Exemple : uidnumber
-LDAPFieldHomedirectory=Home directory
-LDAPFieldHomedirectoryExample=Exemple : homedirectory
-LDAPFieldHomedirectoryprefix=Home directory prefix
-LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
-LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
-LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
-LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
-LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
-LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types.
-LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following loaded schemas: <b>core.schema, cosine.schema, inetorgperson.schema</b>). If you use thoose values and OpenLDAP, modify your LDAP config file <b>slapd.conf</b> to have all thoose schemas loaded.
-ForANonAnonymousAccess=For an authenticated access (for a write access for example)
-PerfDolibarr=Performance setup/optimizing report
+LDAPFieldTitleExample=Exemplo:título
+LDAPFieldGroupid=Id Grupo
+LDAPFieldGroupidExample=Exemplo : número gid
+LDAPFieldUserid=Id usuario
+LDAPFieldUseridExample=Exemplo : número uid
+LDAPFieldHomedirectory=Directorio Inicio
+LDAPFieldHomedirectoryExample=Exemplo : directorioinicio
+LDAPFieldHomedirectoryprefix=Prefixo do directorio inicio
+LDAPSetupNotComplete=Configuración LDAP incompleta (a completar nas outras pestanas)
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Administrador ou contrasinal non proporcionados. O acceso LDAP será anónimo e en modo só lectura.
+LDAPDescContact=Esta páxina permítelle definir o nome dos atributos LDAP na árbore LDAP para cada dato atopado nos contactos Dolibarr.
+LDAPDescUsers=Esta páxina permítelle definir o nome dos atributos LDAP na árbore LDAP para cada dato atopado nos usuarios de Dolibarr..
+LDAPDescGroups=Esta páxina permítelle definir o nome dos atributos LDAP na árbore LDAP para cada dato atopado nos grupos Dolibarr.
+LDAPDescMembers=Esta páxina permítelle definir o nome dos atributos LDAP na árbore LDAP para cada dato atopado no módulo de membros de Dolibarr..
+LDAPDescMembersTypes=Esta páxina permítelle definir o nome dos atributos LDAP na árbore LDAP para cada dato atopado nos tipos de membros de Dolibarr.
+LDAPDescValues=Os valores de exemplo están deseñados para <b> OpenLDAP </b> cos seguintes esquemas cargados: <b> core.schema, cosine.schema, inetorgperson.schema </b>). Se usa estes valores e OpenLDAP, modifique o ficheiro de configuración LDAP <b> slapd.conf </b> para ter todos os esquemas cargados.
+ForANonAnonymousAccess=Para un acceso autenticado (por exemplo para un accesos de escritura)
+PerfDolibarr=Informe da configuración/optimización do rendemento
 YouMayFindPerfAdviceHere=Nesta páxina atopará varias probas e consellos relacionados co rendemento.
-NotInstalled=Not installed.
-NotSlowedDownByThis=Not slowed down by this.
-NotRiskOfLeakWithThis=Not risk of leak with this.
+NotInstalled=Non instalado.
+NotSlowedDownByThis=Non ralentizado por isto.
+NotRiskOfLeakWithThis=Non hai risco de fuga con isto
 ApplicativeCache=Aplicación caché
-MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. Maybe you are using an OPCode cache other than XCache or eAccelerator (good), or maybe you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gif A2592000"
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
-DefaultValuesDesc=Here you may define the default value you wish to use when creating a new record, and/or default filters or the sort order when you list records.
-DefaultCreateForm=Default values (to use on forms)
-DefaultSearchFilters=Default search filters
-DefaultSortOrder=Default sort orders
-DefaultFocus=Default focus fields
-DefaultMandatory=Mandatory form fields
+MemcachedNotAvailable=Non se atopou aplicación caché. Pode mellorar o rendemento instalando un servidor caché. Memcached é un módulo capaz de usar este servidor caché. <br>Mais información aquí <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Teña conta que moitos provedores de hospedaxe web non fornecen ese servidor caché.
+MemcachedModuleAvailableButNotSetup=Atopouse o módulo memcached para a aplicación caché pero a configuración do módulo non está completa.
+MemcachedAvailableAndSetup=O módulo memcached adicado a usar o servidor memcached está habilitado.
+OPCodeCache=Caché OPCode
+NoOPCodeCacheFound=Non se atopou caché OPCode. Cicais estexa a usar unha caché OPCode distinta de XCache ou eAccelerator (bo) ou cicais non teña caché OPCode (moi mal).
+HTTPCacheStaticResources=Caché HTTP para estatísticas de recursos (css, img, javascript)
+FilesOfTypeCached=Os ficheiros de tipo %s son almacenados en caché polo servidor HTTP
+FilesOfTypeNotCached=Os ficheiros de tipo %s non son almacenados en caché polo servidor HTTP
+FilesOfTypeCompressed=Os ficheiros de tipo %s son comprimidos polo servidor HTTP
+FilesOfTypeNotCompressed=Os ficheiros de tipo %s non son comprimidos polo servidor HTTP
+CacheByServer=Caché por servidor
+CacheByServerDesc=Por exemplo, usando a directiva  Apache "ExpiresByType image/gif A2592000"
+CacheByClient=Caché por navegador
+CompressionOfResources=Compresión das respostas HTTP
+CompressionOfResourcesDesc=Por exemplo, usando a directiva Apache  "AddOutputFilterByType DEFLATE"
+TestNotPossibleWithCurrentBrowsers=Esta detección automática non é posible cos navegadores actuais
+DefaultValuesDesc=Aquí pode definir o valor predeterminado que desexa usar ao crear un novo rexistro e / ou filtros predeterminados ou a orde de clasificación ao listar rexistros.
+DefaultCreateForm=Valores predeterminados (para usar nos formularios)
+DefaultSearchFilters=Filtros de busca predeterminados
+DefaultSortOrder=Ordes de clasificación predeterminados
+DefaultFocus=Campos de enfoque predeterminados
+DefaultMandatory=Campos de formulario obrigatorios
 ##### Products #####
 ProductSetup=Configuración do módulo Produtos
 ServiceSetup=Configuración do módulo Servizos
@@ -1597,15 +1599,15 @@ ProductServiceSetup=Configuración dos módulos Produtos e Servizos
 NumberOfProductShowInSelect=Nº de produtos máx. nas listas (0=sen límite)
 ViewProductDescInFormAbility=Visualización das descripcións dos produtos nos formularios (no caso contrario como tooltip)
 MergePropalProductCard=Activar no produto/servizo a pestana Documentos unha opción para fusionar documentos PDF de produtos ao orzamento PDF azur se o produto/servizo atópase no orzamento
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in the language of the third party
-UseSearchToSelectProductTooltip=Also if you have a large number of products (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectProduct=Wait until you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
-SetDefaultBarcodeTypeProducts=Default barcode type to use for products
-SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
-IsNotADir=is not a directory!
+ViewProductDescInThirdpartyLanguageAbility=Amosar as descricións dos produtos no idioma do terceiro
+UseSearchToSelectProductTooltip=Tamén, se ten un gran número de produtos (> 100 000), pode aumentar a velocidade configurando PRODUCT_DONOTSEARCH_ANYWHERE constante en 1 en Configuración-> Outro. A busca limitarase entón ao comezo da cadea.
+UseSearchToSelectProduct=Agard a que prema unha tecla antes de cargar o contido da listaxe combinada de produtos (Isto pode aumentar o rendemento se ten un gran número de produtos, pero é menos conveniente)
+SetDefaultBarcodeTypeProducts=Tipo de código de barras predeterminado para usar en produtos
+SetDefaultBarcodeTypeThirdParties=Tipo de código de barras predeterminado para usar con terceiros
+UseUnits=Defina unha unidade de medida para Cantidade durante a edición de liñas de orzamento, pedimento ou factura
+ProductCodeChecker= Módulo para a xeración e comprobación de código de produto (produto ou servizo)
+ProductOtherConf= Configuración de Produto/Servizo
+IsNotADir=non é un directorio!
 ##### Syslog #####
 SyslogSetup=Configuración do módulo Syslog
 SyslogOutput=Saída do log
@@ -1614,9 +1616,9 @@ SyslogLevel=Nivel
 SyslogFilename=Nome e ruta do ficheiro
 YouCanUseDOL_DATA_ROOT=Pode utilizar DOL_DATA_ROOT/dolibarr.log para un rexistro no directorio "documentos" de Dolibarr. Porén, pode establecer un directorio diferente para gardar este ficheiro.
 ErrorUnknownSyslogConstant=A constante %s non é unha constante syslog coñecida
-OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
+OnlyWindowsLOG_USER=Windows só soporta LOG_USER
 CompressSyslogs=Compresión e copia de seguridade dos ficheiros de rexistro de depuración (xerados polo módulo Log para a depuración)
-SyslogFileNumberOfSaves=Number of backup logs to keep
+SyslogFileNumberOfSaves=Copias de seguridade de log a gardar
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configurar tareas programados de limpeza para establecer a frecuencia de copia de seguridade do log
 ##### Donations #####
 DonationsSetup=Configuración do módulo doacións/subvencións
@@ -1640,46 +1642,46 @@ GenbarcodeLocation=Ferramenta de xeración de códigos de barras na liña de com
 BarcodeInternalEngine=Motor interno
 BarCodeNumberManager=Xestor para auto definir números de código de barras
 ##### Prelevements #####
-WithdrawalsSetup=Configuración d0 módulo domiciliacións
+WithdrawalsSetup=Configuración do módulo domiciliacións
 ##### ExternalRSS #####
 ExternalRSSSetup=Configuración das importaciones do fluxo RSS
 NewRSS=Sindicación dun novo fluxo RSS
 RSSUrl=URL del RSS
 RSSUrlExample=Un fluxo RSS interesante
 ##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Sender email (From) for emails sent by emailing module
-MailingEMailError=Return Email (Errors-to) for emails with errors
-MailingDelay=Seconds to wait after sending next message
+MailingSetup=Configuración do módulo E-Mailing
+MailingEMailFrom=E-Mail emisor (From) dos correos enviados por E-Mailing
+MailingEMailError=E-Mail de resposta (Errors-to) para as respostas acerca de envíos por e-mailing con erros.
+MailingDelay=Segundos que agarda despois de enviar a mensaxe seguinte
 ##### Notification #####
-NotificationSetup=Email Notification module setup
-NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
-FixedEmailTarget=Destinatario
+NotificationSetup=Configuración do módulo notificacións
+NotificationEMailFrom=E-Mail emisor (From) dos correos enviados ao través de notificacións
+FixedEmailTarget=Destinatario fixo
 ##### Sendings #####
-SendingsSetup=Shipping module setup
-SendingsReceiptModel=Sending receipt model
-SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
+SendingsSetup=Configuración do módulo Expedicións
+SendingsReceiptModel=Modelo de notas de entrega
+SendingsNumberingModules=Módulos de numeración de notas de entrega
+SendingsAbility=Soporte de follas de envío para entregas a clientes
+NoNeedForDeliveryReceipts=Na maioría dos casos, as notas de entrega (listaxe de produtos enviados) tamén actúan como notas de recepción e son asinadas polo cliente. A xestión das notas de recepción é polo tanto redundante e rara vez será activada.
+FreeLegalTextOnShippings=Texto libre en envíos
 ##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
-DeliveryOrderModel=Products deliveries receipt model
-DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
+DeliveryOrderNumberingModules=Módulos de numeración das notas de recepción
+DeliveryOrderModel=Modelo de notas de recepción
+DeliveriesOrderAbility=Uso de notas de recepción
+FreeLegalTextOnDeliveryReceipts=Texto libre nas notas de recepción
 ##### FCKeditor #####
 AdvancedEditor=Editor avanzado
 ActivateFCKeditor=Activar editor avanzado para :
 FCKeditorForCompany=Creación/edición WYSIWIG da descrición e notas dos terceiros
 FCKeditorForProduct=Creación/edición WYSIWIG da descrición e notas dos produtos/servizos
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
+FCKeditorForProductDetails=Creación/edición WYSIWIG das liñas de detalle dos produtos (pedimentos, orzamentos, facturas, etc.). <font class="warning">Atención: O uso desta opción non é recomendable xa que pode crear problemas cos caracteres especiais e o formateo de páxina ao xerar ficheiros PDF.</font>
 FCKeditorForMailing= Creación/edición WYSIWIG dos E-Mails (Utilidades->E-Mailings)
 FCKeditorForUserSignature=Creación/edición WYSIWIG da sinatura de usuarios
 FCKeditorForMail=Creación/edición WYSIWIG de todos os e-mails ( excepto Utilidades->E-Mailings)
 FCKeditorForTicket=Creación/edición WYSIWIG para tickets
 ##### Stock #####
 StockSetup=Configuración do módulo Almacéns
-IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
+IfYouUsePointOfSaleCheckModule=Se utiliza un módulo de Punto de Venda (módulo TPV por defecto ou otro módulo externo), esta configuración pode ser ignorada polo seu módulo de Punto de Venda. A maioría de módulos TPV están deseñados para crear inmediatamente unha factura e decrementar stocks calquera que sexan estas opcións. Por tanto, se vosteda precisa ou non decrementar stocks no rexistro dunha venda do seu punto de venda, controle tamén a configuración do seu módulo TPV.
 ##### Menu #####
 MenuDeleted=Menú eliminado
 Menu=Menu
@@ -1689,17 +1691,17 @@ NotTopTreeMenuPersonalized=Menús personalizados non ligados a un menú superior
 NewMenu=Novo menú
 MenuHandler=Xestor de menús
 MenuModule=Módulo orixe
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+HideUnauthorizedMenu=Ocultar menús non autorizados tamén para usuarios internos (en gris, doutro xeito)
 DetailId=Id menu
-DetailMenuHandler=Menu handler where to show new menu
-DetailMenuModule=Module name if menu entry come from a module
-DetailType=Type of menu (top or left)
-DetailTitre=Menu label or label code for translation
-DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
-DetailEnabled=Condition to show or not entry
-DetailRight=Condition to display unauthorized grey menus
-DetailLangs=Lang file name for label code translation
-DetailUser=Intern / Extern / All
+DetailMenuHandler=Controlador de menús onde amosar o novo menú
+DetailMenuModule=Nome do módulo se a entrada do menú provén dun módulo
+DetailType=Tipo de menú (arriba ou á esquerda)
+DetailTitre=Etiqueta de menú ou código de etiqueta para a tradución
+DetailUrl=URL onde o menú o envía (ligazón URL absoluta ou ligazón externa con http: //)
+DetailEnabled=Condición para amosar ou non a entrada
+DetailRight=Condición para amosar menús grises non autorizados
+DetailLangs=Nome do ficheiro Lang para a tradución de código de etiqueta
+DetailUser=Intern / Extern / Todo
 Target=Destinatario
 DetailTarget=Comportamento da ligazón (_blank para abrir unha nova ventana)
 DetailLevel=Nivel (-1:menú superior, 0:principal, >0 menú e submenú)
@@ -1708,105 +1710,105 @@ DeleteMenu=Eliminar entrada de menú
 ConfirmDeleteMenu=¿Está certo de querer eliminar a entrada de menú <b>%s</b>?
 FailedToInitializeMenu=Erro ao inicialiar o menú
 ##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
-OptionVatMode=VAT due
-OptionVATDefault=Standard basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on invoice (debit) for services
-OptionPaymentForProductAndServices=Cash basis for products and services
-OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
-SummaryOfVatExigibilityUsedByDefault=Time of VAT eligibility by default according to chosen option:
+TaxSetup=Configuración do módulo de impostos, impostos sociais ou fiscais e dividendos
+OptionVatMode=IVE vencido
+OptionVATDefault=Base estándar
+OptionVATDebitOption=Base de devengo
+OptionVatDefaultDesc=Vence o IVE: <br> - na entrega de mercadorías (en función da data da factura) <br> - nos pagos por servizos
+OptionVatDebitOptionDesc=Vence o IVE: <br> - na entrega de mercadorías (en función da data da factura) <br> - na factura (débito) para servizos
+OptionPaymentForProductAndServices=Base de efectivo para produtos e servizos
+OptionPaymentForProductAndServicesDesc=Vence o IVE: <br> - no pago de mercadorías <br> - no pago de servizos
+SummaryOfVatExigibilityUsedByDefault=Tempo de elección do IVE por defecto segundo a opción escollida:
 OnDelivery=Pagamento á entrega
-OnPayment=On payment
-OnInvoice=On invoice
-SupposedToBePaymentDate=Payment date used
-SupposedToBeInvoiceDate=Invoice date used
-Buy=Buy
+OnPayment=No pagamento
+OnInvoice=Na factura
+SupposedToBePaymentDate=Data de pago empregada
+SupposedToBeInvoiceDate=Data de utilización da factura
+Buy=Mercar
 Sell=Vendas
-InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
-AccountancyCode=Accounting Code
-AccountancyCodeSell=Sale account. code
-AccountancyCodeBuy=Purchase account. code
+InvoiceDateUsed=Data de utilización da factura
+YourCompanyDoesNotUseVAT=A súa empresa está cofigurada para que non use o IVE (Inicio - Configuración - Empresa / Organización), polo que non hai opcións de IVE para configurar.
+AccountancyCode=Código de contabilidade
+AccountancyCodeSell=Conta de venda. código
+AccountancyCodeBuy=Conta de compras código
 ##### Agenda #####
-AgendaSetup=Events and agenda module setup
-PasswordTogetVCalExport=Key to authorize export link
-PastDelayVCalExport=Do not export event older than
-AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
-AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
-AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
-AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
-AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
-AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
+AgendaSetup=Configuración do módulo de eventos e axenda
+PasswordTogetVCalExport=Chave para autorizar a ligazón de exportación
+PastDelayVCalExport=Non exportar eventos anteriores a
+AGENDA_USE_EVENT_TYPE=Usar tipos de eventos (xestionados no menú Configuración -> Dicionarios -> Tipo de eventos da axenda)
+AGENDA_USE_EVENT_TYPE_DEFAULT=Definir automaticamente este valor predeterminado para o tipo de evento no formulario de creación de eventos
+AGENDA_DEFAULT_FILTER_TYPE=Establecer automaticamente este tipo de eventos no filtro de busca da vista de axenda
+AGENDA_DEFAULT_FILTER_STATUS=Establecer automaticamente este estado para eventos no filtro de busca da vista de axenda
+AGENDA_DEFAULT_VIEW=Cal vista desexa abrir de xeito predeterminado ao seleccionar o menú Axenda
+AGENDA_REMINDER_BROWSER=Activar a lembranza de eventos <b> no navegador do usuario </b> (Cando se alcanza a data de lembranza, o navegador amosa unha ventá emerxente. Cada usuario pode desactivar estas notificacións desde a configuración de notificacións do navegador).
+AGENDA_REMINDER_BROWSER_SOUND=Activar a notificación de son
+AGENDA_REMINDER_EMAIL=Activar a lembranza de eventos <b> por correo electrónico </b> (a opción de lembranza/atraso pódese definir en cada evento).
+AGENDA_REMINDER_EMAIL_NOTE=Nota: A frecuencia da tarefa %s debe ser suficiente para asegurarse de que as lembranzas se envían no momento correcto.
+AGENDA_SHOW_LINKED_OBJECT=Amosar o obxecto ligado á vista de axenda
 ##### Clicktodial #####
-ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
-ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialSetup=Faga clic para marcar a configuración do módulo
+ClickToDialUrlDesc=Url chamada cando se fai un clic na imaxe do teléfono. En URL, pode usar etiquetas <br> <b> __PHONETO__ </b> que se substituirán polo número de teléfono da persoa á que chamar <br> <b> __PHONEFROM__ </b> que se substituirá polo número de teléfono persoa (túa) <br> <b> __LOGIN__ </b> que se substituirá por inicio de sesión clicktodial (definido na tarxeta de usuario) <br> <b> __PASS__ </b> que se substituirá por contrasinal clicktodial (definido na tarxeta de usuario).
+ClickToDialDesc=Este módulo cambia os números de teléfono cando se usa un ordenador de escritorio por ligazóns onde se pode facer clic. Un clic chamará ao número. Isto pódese empregar para iniciar a chamada cando se usa un teléfono por software no seu escritorio ou cando se usa un sistema CTI baseado no protocolo SIP por exemplo. Nota: Cando se usa un teléfono intelixente, sempre se pode facer clic nos números de teléfono.
+ClickToDialUseTelLink=Use só unha ligazón "tel:" nos números de teléfono
+ClickToDialUseTelLinkDesc=Utilice este método se os seus usuarios teñen instalado no mesmo ordenador  que o do navegador un software de teléfono ou unha interface telefónica, chamando cando fan clic nunha ligazón do seu navegador que comeza con "tel:". Se precisa unha solución de servidor completa (sen necesidade de instalación de software local), debe establecer isto en "Non" e encher o seguinte campo.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Terminales Punto de Venda
-CashDeskSetup=Point of Sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sales
-CashDeskBankAccountForSell=Default account to use to receive cash payments
-CashDeskBankAccountForCheque=Default account to use to receive payments by check
-CashDeskBankAccountForCB=Default account to use to receive payments by credit cards
-CashDeskBankAccountForSumup=Default bank account to use to receive payments by SumUp
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sale is done from Point of Sale (if "no", stock decrease is done for each sale done from POS, irrespective of the option set in module Stock).
-CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point of Sale disabled
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with module Serial/Lot management (currently active) so stock decrease is disabled.
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sale from Point of Sale. Hence a warehouse is required.
-CashDeskForceDecreaseStockLabel=Stock decrease for batch products was forced.
-CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
-CashDeskReaderKeyCodeForEnter=Key code for "Enter" defined in barcode reader (Example: 13)
+CashDeskSetup=Configuración do módulo Punto de venda
+CashDeskThirdPartyForSell=Un terceiro xenérico predeterminado para usar nas vendas
+CashDeskBankAccountForSell=Conta predeterminada a usar para recibir pagos en efectivo
+CashDeskBankAccountForCheque=Conta predeterminada a usar para recibir pagos mediante cheque
+CashDeskBankAccountForCB=Conta predeterminada a usar para recibir pagos con tarxetas de crédito
+CashDeskBankAccountForSumup=Conta bancaria predeterminada a usar para recibir pagos por SumUp
+CashDeskDoNotDecreaseStock=Desactivar a diminución de stock cando se realiza unha venda desde o punto de venda (se "non", a diminución destock faise por cada venda realizada desde TPV, independentemente da opción establecida no módulo Stock).
+CashDeskIdWareHouse=Forzar e restrinxir o almacén para que diminúa o stock
+StockDecreaseForPointOfSaleDisabled=Desactivado diminución de stock desde o punto de venda
+StockDecreaseForPointOfSaleDisabledbyBatch=A diminución de stock no TPV non é compatible coa xestión de módulos serie/lote (actualmente activa) polo que a diminución de stock está desactivada.
+CashDeskYouDidNotDisableStockDecease=Non desactivou a diminución de stock ao facer unha venda desde o punto de venda. Por iso é preciso un almacén.
+CashDeskForceDecreaseStockLabel=Forzouse a diminución do stock de produtos por lotes
+CashDeskForceDecreaseStockDesc=Diminuír primeiro polas datas máis antigas para comer por e vender por.
+CashDeskReaderKeyCodeForEnter=Código clave para "Enter" definido no lector de códigos de barras. (Exemplo:13)
 ##### Bookmark #####
-BookmarkSetup=Bookmark module setup
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or external web sites on your left menu.
-NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
+BookmarkSetup=Configuración do módulo de marcador
+BookmarkDesc=Este módulo permítelle xestionar marcadores. Tamén pode engadir atallos a calquera páxina de Dolibarr ou sitios web externos no menú esquerdo.
+NbOfBoomarkToShow=Número máximo de marcadores para amosar no menú esquerdo
 ##### WebServices #####
-WebServicesSetup=Webservices module setup
-WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
-WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
+WebServicesSetup=Configuración do módulo de servizos web
+WebServicesDesc=Ao habilitar este módulo, Dolibarr convértese nun servidor de servizos web para proporcionar servizos web diversos.
+WSDLCanBeDownloadedHere=Os ficheiros descritores WSDL dos servizos proporcionados pódense descargar aquí
+EndPointIs=Os clientes SOAP deben enviar as súas solicitudes ao punto final Dolibarr dispoñible no URL
 ##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore and test the APIs at URL
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
+ApiSetup=Configuración do módulo API
+ApiDesc=Ao habilitar este módulo, Dolibarr convértese nun servidor REST para proporcionar servizos web diversos.
+ApiProductionMode=Activa o modo de produción (isto activarase uso de caché para a xestión de servizos)
+ApiExporerIs=Pode explorar e probar as API na URL
+OnlyActiveElementsAreExposed=Só están expostos os elementos dos módulos habilitados
+ApiKey=Chave para API
+WarningAPIExplorerDisabled=Desactivouse o explorador de API. O explorador API non está obrigado a proporcionar servizos API. É unha ferramenta para que os desenvolvedores atopen/proben as API REST. Se precisa esta ferramenta, acceda á configuración do módulo API REST para activala.
 ##### Bank #####
-BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on check receipts
-BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
+BankSetupModule=Configuración do módulo Banco
+FreeLegalTextOnChequeReceipts=Texto gratuíto nos recibos do talón
+BankOrderShow=Amosar a orde das contas bancarias dos países que usan "número bancario detallado"
 BankOrderGlobal=Xeral
-BankOrderGlobalDesc=General display order
+BankOrderGlobalDesc=Orde xeral de visualización
 BankOrderES=Español
-BankOrderESDesc=Spanish display order
-ChequeReceiptsNumberingModule=Check Receipts Numbering Module
+BankOrderESDesc=Orde de exhibición
+ChequeReceiptsNumberingModule=Comprobar o módulo de numeración de recibos
 ##### Multicompany #####
 MultiCompanySetup=Configuración do módulo Multi-empresa
 ##### Suppliers #####
 SuppliersSetup=Configuración do módulo Provedores
-SuppliersCommandModel=Modelo de pedimentos a provedores completo (logo...)
-SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
-SuppliersInvoiceModel=Modelo de facturas de provedores completo (logo...)
+SuppliersCommandModel=Modelo completo de pedimento a provedor
+SuppliersCommandModelMuscadet=Modelo completo da orde de compra (implementación antiga do modelo cornas)
+SuppliersInvoiceModel=Modelo completo de facturas de provedor
 SuppliersInvoiceNumberingModel=Modelos de numeración de facturas de provedor
 IfSetToYesDontForgetPermission=Se está seleccionado, non esqueza modificar os permisos nos grupos ou usuarios para permitir a segunda aprobación
 ##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
-NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
-YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
-YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
-TestGeoIPResult=Test of a conversion IP -> country
+GeoIPMaxmindSetup=Configuración do módulo GeoIP Maxmind
+PathToGeoIPMaxmindCountryDataFile=Ruta ao ficheiro que contén IP Maxmind á tradución do país. <br> Exemplos: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoLite2-Country.mmdb
+NoteOnPathLocation=Teña conta que o ficheiro de datos de IP a país debe estar dentro dun directorio que poida ler PHP (Comprobe a configuración de PHP open_basedir e os permisos do sistema de ficheiros).
+YouCanDownloadFreeDatFileTo=Pode descargar unha <b> versión de demostración gratuíta </b> do ficheiro de país Maxmind GeoIP en %s.
+YouCanDownloadAdvancedDatFileTo=Tamén pode descargar unha <b> versión máis completa, con actualizacións </b> do ficheiro de país Maxmind GeoIP en %s.
+TestGeoIPResult=Proba dunha conversión IP -> País
 ##### Projects #####
 ProjectsNumberingModules=Módulo de numeración para as referencias dos proxectos
 ProjectsSetup=Configuración do módulo Proxectos
@@ -1825,12 +1827,12 @@ DeleteFiscalYear=Eliminar ano fiscal
 ConfirmDeleteFiscalYear=¿Está certo de querer eliminar este ano fiscal?
 ShowFiscalYear=Ver período contable
 AlwaysEditable=Pode editarse sempre
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+MAIN_APPLICATION_TITLE=Forzar visibilidade do nome da aplicación (aviso: configurar aquí o seu propio nome pode rachar a función de inicio de sesión de autocompletado cando se usa a aplicación móbil DoliDroid)
+NbMajMin=Número mínimo de caracteres en maiúscula
+NbNumMin=Número mínimo de caracteres numéricos
+NbSpeMin=Número mínimo de caracteres especiais
+NbIteConsecutive=Número máximo dos mesmos caracteres que se repiten
+NoAmbiCaracAutoGeneration=Non use caracteres ambiguos ("1","l","i","|","0","O") para a xeración automática
 SalariesSetup=Configuración do módulo salarios
 SortOrder=Ordenación
 Format=Formatear
@@ -1840,49 +1842,49 @@ ExpenseReportsSetup=Configuración do módulo Informe de Gastos
 TemplatePDFExpenseReports=Modelos de documento para xerar informes de gastos
 ExpenseReportsRulesSetup=Configuración do módulo Informes de gastos - Regras
 ExpenseReportNumberingModules=Módulo de numeración de informes de gastos
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of automatic notifications per user*
-ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
-ListOfFixedNotifications=List of automatic fixed notifications
-GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
-Threshold=Threshold
+NoModueToManageStockIncrease=Non se activou ningún módulo capaz de xestionar o aumento automático de stock. O aumento do stock farase só en entrada manual.
+YouMayFindNotificationsFeaturesIntoModuleNotification=Pode atopar opcións para as notificacións por correo electrónico habilitando e configurando o módulo "Notificación".
+ListOfNotificationsPerUser=Listaxe de notificacións automáticas por usuario *
+ListOfNotificationsPerUserOrContact=Listaxe de posibles notificacións automáticas (no evento empresarial) dispoñibles por usuario * ou por contacto **
+ListOfFixedNotifications=Listaxe de notificacións fixas automáticas
+GoOntoUserCardToAddMore=Vaia á pestana "Notificacións" dun usuario para engadir ou eliminar notificacións para os usuarios
+GoOntoContactCardToAddMore=Vaia á pestana "Notificacións" dun terceiro para engadir ou eliminar notificacións de contactos/enderezos
+Threshold=Límite
 BackupDumpWizard=Asistente para crear unha copia de seguridade da base de datos
 BackupZipWizard=Asistente para crear unha copia de seguridade do directorio de documentos
-SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
-SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
-InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
-HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
-HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
-HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
-TextTitleColor=Text color of Page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
+SomethingMakeInstallFromWebNotPossible=A instalación do módulo externo non é posible desde a interface web polo seguinte motivo:
+SomethingMakeInstallFromWebNotPossible2=Por estae motivo, o proceso de actualización descrito aquí é un proceso manual que só pode realizar un usuario privilexiado con privilexios o ficheiro <strong>%s</strong> para permitir esta función.
+InstallModuleFromWebHasBeenDisabledByFile=O seu administrador desactivou a instalación do módulo externo desde a aplicación. Debe pedirlle que elimine o ficheiro <strong>%s</strong> para permitir esta función.
+ConfFileMustContainCustom=A instalación ou construción dun módulo externo desde a aplicación precisa gardar os ficheiros do módulo no directorio <strong>%s</strong>. Para que Dolibarr procese este directorio, debe configurar o seu <strong>conf/conf.php</strong> para engadir as dúas liñas directivas: <br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+HighlightLinesOnMouseHover=Resalte as liñas da táboa cando pasa o rato por riba
+HighlightLinesColor=Resaltar a cor da liña cando pasa o rato pasa (use 'ffffff' para non destacar)
+HighlightLinesChecked=Resaltar a cor da liña cando está marcada (use 'ffffff' para non destacar)
+TextTitleColor=Cor do texto do título da páxina
+LinkColor=Cor das ligazóns
+PressF5AfterChangingThis=Prema CTRL+F5 no teclado ou limpe a caché do navegador despois de cambiar este valor para que sexa efectivo
+NotSupportedByAllThemes=Traballará con temas core, pode que non sexan compatibles con temas externos
 BackgroundColor=Cor de fondo
 TopMenuBackgroundColor=Cor de fondo para o Menú superior
 TopMenuDisableImages=Ocultar imaxes no Menú superior
 LeftMenuBackgroundColor=Cor de fondo para o Menú esquerdo
 BackgroundTableTitleColor=Cor de fondo para a Taboa título líña
 BackgroundTableTitleTextColor=Cor do texto para a liña de título da taboa
-BackgroundTableTitleTextlinkColor=Text color for Table title link line
+BackgroundTableTitleTextlinkColor=Cor do texto para a liña de ligazón do título da táboa
 BackgroundTableLineOddColor=Cor de fondo para liñas de tabla odd
 BackgroundTableLineEvenColor=Cor de fondo para todas as liñas de taboa
 MinimumNoticePeriod=Período mínimo de notificación (A súa solicitude de licenza debe facerse antes deste período)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
-Enter0or1=Enter 0 or 1
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-ColorFormat=The RGB color is in HEX format, eg: FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
-RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offers a page or web site to check the status of your shipments, you may enter it here. You can use the key {TRACKID} in the URL parameters so the system will replace it with the tracking number the user entered into the shipment card.
-OpportunityPercent=When you create a lead, you will define an estimated amount of project/lead. According to status of the lead, this amount may be multiplied by this rate to evaluate a total amount all your leads may generate. Value is a percentage (between 0 and 100).
-TemplateForElement=This template record is dedicated to which element
+NbAddedAutomatically=Número de días engadidos aos contadores de usuarios (automaticamente) cada mes
+EnterAnyCode=Este campo contén unha referencia para identificar a liña. Introduza calquera valor da súa escolla, pero sen caracteres especiais.
+Enter0or1=Engada 0 ou 1
+UnicodeCurrency=Introduza aquí entre chaves, listaxe do número de bytes que representan o símbolo de moeda. Por exemplo: por $, introduza [36] - para Brasil real R$ [82,36] - para €, introduza [8364]
+ColorFormat=A cor RGB está en formato HEX, por exemplo: FF0000
+PictoHelp=Nome da icona en formato dolibarr ('image.png' se está no directorio do tema actual, 'image.png@nom_du_module' se está no directorio /img/ dun módulo)
+PositionIntoComboList=Posición da liña nas listas combinadas
+SellTaxRate=Tipo de imposto sobre a venda
+RecuperableOnly=Sí para o IVE "Non percibido pero recuperable" dedicado a algún estado de Franza. Manteña o valor en "Non" no resto dos casos.
+UrlTrackingDesc=Se o provedor ou servizo de transporte ofrece unha páxina ou sitio web para comprobar o estado dos seus envíos, pode introducilo aquí. Podes usar a clave {TRACKID} nos parámetros de URL para que o sistema a substitúa polo número de seguimento que o usuario introduciu na tarxeta de envío.
+OpportunityPercent=Cando cree un cliente potencial, definirá unha cantidade estimada de proxecto/cliente potencial. Segundo o estado do cliente potencial, este importe pode multiplicarse por esta taxa para avaliar unha cantidade total que todos os clientes potenciais poden xerar. O valor é unha porcentaxe (entre 0 e 100).
+TemplateForElement=Este rexistro de modelo está adicado a cal elemento
 TypeOfTemplate=Tipo de prantilla
 TemplateIsVisibleByOwnerOnly=A prantilla é visible só polo propietario
 VisibleEverywhere=Visible en todas partes
@@ -1891,147 +1893,148 @@ FixTZ=Corrección de zona horaria
 FillFixTZOnlyIfRequired=Exemplo: +2 (complete só se ten algún problema)
 ExpectedChecksum=Agardando a suma de comprobación
 CurrentChecksum=Suma de comprobación actual
-ExpectedSize=Expected size
-CurrentSize=Current size
-ForcedConstants=Required constant values
+ExpectedSize=Tamaño agardado
+CurrentSize=Tamaño actual
+ForcedConstants=Valores constantes requiridos
 MailToSendProposal=Orzamentos a clientes
 MailToSendOrder=Pedimentos de clientes
 MailToSendInvoice=Facturas a clientes
 MailToSendShipment=Envíos
 MailToSendIntervention=Intervencións
-MailToSendSupplierRequestForQuotation=Para enviar solicitude de orzamento a provedor
+MailToSendSupplierRequestForQuotation=Para enviar solicitude de orzamento ao provedor
 MailToSendSupplierOrder=Pedimentos a provedor
 MailToSendSupplierInvoice=Facturas provedor
 MailToSendContract=Contratos
-MailToSendReception=Receptions
+MailToSendReception=Recepcións
 MailToThirdparty=Terceiros
 MailToMember=Membros
 MailToUser=Usuarios
 MailToProject=Proxectos
 MailToTicket=Tickets
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
-ModelModulesProduct=Templates for product documents
-WarehouseModelModules=Templates for documents of warehouses
-ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-SeeChangeLog=See ChangeLog file (english only)
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDataTables=Add object tables
-AddDictionaries=Add dictionaries tables
-AddData=Add objects or dictionaries data
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
+ByDefaultInList=Amosar por defecto en modo lista
+YouUseLastStableVersion=Emprega a última versión estable
+TitleExampleForMajorRelease=Exemplo de mensaxe que pode usar para anunciar a versión maior (non dubide en usalo nos seus sitios web)
+TitleExampleForMaintenanceRelease=Exemplo de mensaxe que pode usar para anunciar esta versión de mantemento (non dubide en usala nos seus sitios web)
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP e CRM %s están dispoñibles. A versión %s é unha versión importante con moitas novas funcións tanto para usuarios como para desenvolvedores. Podes descargalo desde a área de descarga do portal https://www.dolibarr.org (versións estables do subdirectorio). Podes ler <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> para ver a lista completa de cambios.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP e CRM %s están dispoñibles. A versión %s é unha versión de mantemento, polo que só contén correccións de erros. Recomendamos a todos os usuarios que actualicen a esta versión. Unha versión de mantemento non introduce novas funcións nin cambios na base de datos. Podes descargalo desde a área de descarga do portal https://www.dolibarr.org (versións estables do subdirectorio). Pode ler o <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> para ver a lista completa de cambios.
+MultiPriceRuleDesc=Cando a opción "Varios niveis de prezos por produto/servizo" está activada, pode definir diferentes prezos (un por nivel de prezo) para cada produto. Para aforrar tempo, aquí pode introducir unha regra para calcular automaticamente un prezo para cada nivel en función do prezo do primeiro nivel, polo que só terá que introducir un prezo para o primeiro nivel para cada produto. Esta páxina está deseñada para aforrar tempo pero só é útil se os prezos de cada nivel son relativos ao primeiro nivel. Pode ignorar esta páxina na maioría dos casos.
+ModelModulesProduct=Modelos para documentos do produto
+WarehouseModelModules=Modelos para documentos de almacéns
+ToGenerateCodeDefineAutomaticRuleFirst=Para poder xerar códigos automaticamente, primeiro ten que definir un manager para auto-axustar o número de código de barras.
+SeeSubstitutionVars=Ver a nota * para a lista de posibles variables de substitución
+SeeChangeLog=Ver o ficheiro ChangeLog (só en inglés)
+AllPublishers=Todos os editores
+UnknownPublishers=Editores descoñecidos
+AddRemoveTabs=Engadir ou eliminar pestanas
+AddDataTables=Engadir táboas de obxectos
+AddDictionaries=Engadir táboas de dicionarios
+AddData=Engade datos ou obxectos a dicionarios
+AddBoxes=Engadir widgets
+AddSheduledJobs=Engadir tarefas programadas
+AddHooks=Engadir Hooks
+AddTriggers=Engadir Triggers
 AddMenus=Engade menús
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved in database user table and must be provided on each API call)
-ListOfAvailableAPIs=List of available APIs
-activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
-CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
-LandingPage=Landing page
-SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", the price will also be the same for all companies if products are shared between environments
-ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
-UserHasNoPermissions=This user has no permissions defined
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "%s")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "%s" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month after delta (delta is field "%s", N is stored into field "%s")
-BaseCurrency=Reference currency of the company (go into setup of company to change this)
-WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016).
-WarningNoteModulePOSForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
-WarningInstallationMayBecomeNotCompliantWithLaw=You are trying to install module %s that is an external module. Activating an external module means you trust the publisher of that module and that you are sure that this module does not adversely impact the behavior of your application, and is compliant with laws of your country (%s). If the module introduces an illegal feature, you become responsible for the use of illegal software.
+AddPermissions=Engadir permisos
+AddExportProfiles=Engadir perfís de exportación
+AddImportProfiles=Engadir perfís de importación
+AddOtherPagesOrServices=Engadir outras páxinas ou servizos
+AddModels=Engadir modelos de documento ou numeración
+AddSubstitutions=Engadir substitucións de claves
+DetectionNotPossible=Non é posible a detección
+UrlToGetKeyToUseAPIs=Url para obter o token para usar coa API (unha vez recibido o token gárdase na táboa de usuarios da base de datos e debe fornecerse en cada chamada da API)
+ListOfAvailableAPIs=Listaxe de API dispoñibles
+activateModuleDependNotSatisfied=O módulo "%s" depende do módulo "%s" que falta, polo que o módulo "%1$s" pode non funcionar correctamente. Instale o módulo "%2$s" ou desactive o módulo "%1$s" se quere estar a salvo de calquera sorpresa
+CommandIsNotInsideAllowedCommands=O comando que tenta executar non está na listaxe de comandos permitidos definidos no parámetro <strong> $dolibarr_main_restrict_os_commands</strong> no ficheiro <strong>conf.php</strong>.
+LandingPage=Páxina de destino
+SamePriceAlsoForSharedCompanies=Se usa un módulo multi-empresa, coa opción "Prezo único", o prezo tamén será o mesmo para todas as empresas se os produtos se comparten entre elas
+ModuleEnabledAdminMustCheckRights=O módulo está activado. Os permisos para os módulos activados déronse só a usuarios administradores. É posible que teña que conceder permisos a outros usuarios ou grupos manualmente se é preciso.
+UserHasNoPermissions=Este usuario non ten permisos definidos
+TypeCdr=Use "Ningún" se a data do prazo de pagamento é a data da factura máis un delta en días (delta é o campo "%s")<br>Use "Ao final do mes", se, despois do delta, a data debe aumentará ata chegar ao final do mes (+ un opcional "%s" en días)<br>Use "Actual/Seguinte" para que a data do prazo de pago sexa a primeira Nth do mes despois do delta (o delta é o campo "%s" , N almacénase no campo "%s")
+BaseCurrency=Moeda de referencia da empresa (entre na configuración da empresa para cambiar isto)
+WarningNoteModuleInvoiceForFrenchLaw=Este módulo %s cumpre coas leis francesas (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=Este módulo %s cumpre coas leis francesas (Loi Finance 2016) porque o módulo Rexistros non reversibles está activado automaticamente.
+WarningInstallationMayBecomeNotCompliantWithLaw=Está intentando instalar o módulo %s que é un módulo externo. Activar un módulo externo significa que confía no editor dese módulo e que está seguro de que este módulo non afecta negativamente o comportamento da súa aplicación e cumpre coas leis do seu país (%s). Se o módulo introduce unha función ilegal, vostede será responsable do uso de software ilegal.
 MAIN_PDF_MARGIN_LEFT=Marxe esquerdo en PDF
 MAIN_PDF_MARGIN_RIGHT=Marxe dereito en PDF
 MAIN_PDF_MARGIN_TOP=Marxe superior en PDF
 MAIN_PDF_MARGIN_BOTTOM=Marxe inferior en PDF
-MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
-NothingToSetup=There is no specific setup required for this module.
-SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
-SeveralLangugeVariatFound=Several language variants found
-RemoveSpecialChars=Remove special characters
-COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
-COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
-COMPANY_DIGITARIA_UNIQUE_CODE=Duplicate not allowed
-GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
-GDPRContactDesc=If you store data about European companies/citizens, you can name the contact who is responsible for the General Data Protection Regulation here
-HelpOnTooltip=Help text to show on tooltip
-HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
-YouCanDeleteFileOnServerWith=You can delete this file on the server with Command Line:<br>%s
-ChartLoaded=Chart of account loaded
-SocialNetworkSetup=Setup of module Social Networks
-EnableFeatureFor=Enable features for <strong>%s</strong>
-VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
-EmailCollector=Email collector
-EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
-NewEmailCollector=New Email Collector
-EMailHost=Host of email IMAP server
-MailboxSourceDirectory=Mailbox source directory
-MailboxTargetDirectory=Mailbox target directory
-EmailcollectorOperations=Operations to do by collector
-MaxEmailCollectPerCollect=Max number of emails collected per collect
-CollectNow=Collect now
-ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
-LastResult=Latest result
-EmailCollectorConfirmCollectTitle=Email collect confirmation
-EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
-NoNewEmailToProcess=No new email (matching filters) to process
-NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
-CodeLastResult=Latest result code
-NbOfEmailsInInbox=Number of emails in source directory
-LoadThirdPartyFromName=Load third party searching on %s (load only)
-LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
-WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
-WithDolTrackingIDInMsgId=Message sent from Dolibarr
-WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+MAIN_DOCUMENTS_LOGO_HEIGHT=Altura para logotipo en PDF
+NothingToSetup=Non é precisa ningunha configuración específica para este módulo.
+SetToYesIfGroupIsComputationOfOtherGroups=Configure isto en sí, se este grupo é un cálculo doutros grupos
+EnterCalculationRuleIfPreviousFieldIsYes=Introduza a regra de cálculo se o campo anterior estaba configurado en Si (por exemplo 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Atopáronse varias variantes de idioma
+RemoveSpecialChars=Eliminar caracteres especiais
+COMPANY_AQUARIUM_CLEAN_REGEX=Filtro de rexistro para limpar o valor (COMPANY_AQUARIUM_CLEAN_REGEX)
+COMPANY_DIGITARIA_CLEAN_REGEX=Filtro de rexistro para limpar o valor (COMPANY_DIGITARIA_CLEAN_REGEX)
+COMPANY_DIGITARIA_UNIQUE_CODE=Non se permite duplicado
+GDPRContact=Responsable de protección de datos (DPO, privacidade de datos ou contacto GDPR)
+GDPRContactDesc=Se garda datos sobre empresas/cidadáns europeos, pode nomear o contacto responsable do Regulamento xeral de protección de datos aquí
+HelpOnTooltip=Texto de axuda para amosar na información de ferramentas
+HelpOnTooltipDesc=​​= Poner aquí o texto ou unha chave de tradución para que o texto apareza nunha tip sobre ferramentas cando este campo aparece nun formulario
+YouCanDeleteFileOnServerWith=Pode eliminar este ficheiro no servidor coa liña de comandos: <br>%s
+ChartLoaded=Cargado o gráfico da conta
+SocialNetworkSetup=Configuración do módulo Redes sociais
+EnableFeatureFor=Activar funcións para <strong>%s</strong>
+VATIsUsedIsOff=Nota: A opción para usar Vendas IVE ou IVE configurouse como <strong> Desactivado </strong> no menú %s -%s, polo que Vendas IVE ou IVE empregados serán sempre 0 para as vendas.
+SwapSenderAndRecipientOnPDF=Cambiar a posición do remitente e do destinatario en documentos PDF
+FeatureSupportedOnTextFieldsOnly=Aviso, característica admitida só nos campos de texto. Tamén debe definirse un parámetro URL action=create ou action=edit Ou o nome da páxina debe rematar con 'new.php' para activar esta función.
+EmailCollector=Receptor de correo electrónico
+EmailCollectorDescription=Engade unha tarefa programada e unha páxina de configuración para escanear regularmente caixas de correo electrónico (usando o protocolo IMAP) e gardarr os correos electrónicos recibidos na súa aplicación no lugar axeitado e/ou crear algúns rexistros automaticamente (como clientes potenciais).
+NewEmailCollector=Novo receptor de correo electrónico
+EMailHost=Anfitrión do servidor IMAP de correo electrónico
+MailboxSourceDirectory=Directorio fonte da caixa de correo
+MailboxTargetDirectory=Directorio de destino da caixa de correo
+EmailcollectorOperations=Operacións que debe facer o receptor
+EmailcollectorOperationsDesc=As operacións execútanse de arriba a abaixo
+MaxEmailCollectPerCollect=Número máximo de correos electrónicos recollidos por recepción
+CollectNow=Recibir agora
+ConfirmCloneEmailCollector=¿Está certo de que quere clonar o receptor de correo electrónico %s?
+DateLastCollectResult=Data do último intento de recepción
+DateLastcollectResultOk=Data do último éxito de recepción
+LastResult=Último resultado
+EmailCollectorConfirmCollectTitle=Confirmación de recepción por correo electrónico
+EmailCollectorConfirmCollect=¿Quere executar agora a recepcións deste receptor?
+NoNewEmailToProcess=Non hai ningún correo electrónico novo (filtros coincidentes) para procesar
+NothingProcessed=Nada feito
+XEmailsDoneYActionsDone=%s correos electrónicos cualificados, %s correos electrónicos procesados ​​correctamente (para %s rexistro/accións feitas)
+RecordEvent=Gravar evento de correo electrónico
+CreateLeadAndThirdParty=Crear cliente potencial (e terceiros se é preciso)
+CreateTicketAndThirdParty=Crear ticket (e ligar a terceiros se foi cargado nunha operación anterior)
+CodeLastResult=Código de resultado máis recente
+NbOfEmailsInInbox=Número de correos electrónicos no directorio de orixe
+LoadThirdPartyFromName=Cargar busca de terceiros en %s (só cargar)
+LoadThirdPartyFromNameOrCreate=Cargar a busca de terceiros en %s (crea se non se atopa)
+WithDolTrackingID=Mensaxe dunha conversa iniciada por un primeiro correo electrónico enviado desde Dolibarr
+WithoutDolTrackingID=Mensaxe dunha conversa iniciada por un primeiro correo electrónico NON enviado desde Dolibarr
+WithDolTrackingIDInMsgId=Mensaxe enviado desde Dolibarr
+WithoutDolTrackingIDInMsgId=Mensaxe NON enviado desde Dolibarr
+CreateCandidature=Crear solicitude de traballo
 FormatZip=Código postal
-MainMenuCode=Menu entry code (mainmenu)
-ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-OpeningHours=Opening hours
-OpeningHoursDesc=Enter here the regular opening hours of your company.
-ResourceSetup=Configuration of Resource module
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disable feature to link a resource to users
-DisabledResourceLinkContact=Disable feature to link a resource to contacts
-EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
-ConfirmUnactivation=Confirm module reset
-OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
-MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
-MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
-MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
-MAIN_OPTIMIZEFORCOLORBLINDDesc=Enable this option if you are a color blind person, in some case interface will change color setup to increase contrast.
+MainMenuCode=Código de entrada do menú (menú principal)
+ECMAutoTree=Amosar árbore automático GED
+OperationParamDesc=Defina os valores a empregar para o obxecto da acción, ou como extraer valores. Por exemplo: <br> objproperty1=SET: o valor a definir <br>objproperty2=SET:un valor con substitución de __objproperty1__<br>objproperty3=SETIFEMPTY: valor usado se objproperty3 non está xa definido <br> objproperty4 =EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:BODY:([^&#92;n]*)<br> object.objproperty5 = EXTRACT:BODY:O meu nome da empresa é\\s([^\\s]*) <br><br> Use a; char como separador para extraer ou establecer varias propiedades.
+OpeningHours=Horario de apertura
+OpeningHoursDesc=Introduza aquí o horario habitual da súa empresa.
+ResourceSetup=Configuración do módulo Recursos
+UseSearchToSelectResource=Use un formulario de busca para escoller un recurso (en lugar dunha lista despregable).
+DisabledResourceLinkUser=Desactivar a función para ligar un recurso aos usuarios
+DisabledResourceLinkContact=Desactivar a función para ligar un recurso aos contactos
+EnableResourceUsedInEventCheck=Activar a función para comprobar se un recurso está en uso nun evento
+ConfirmUnactivation=Confirmar o restablecemento do módulo
+OnMobileOnly=Só na pantalla pequena (smartphone)
+DisableProspectCustomerType=Desactiva o tipo de terceiro "Cliente Potencial+Cliente" (polo que o terceiro debe ser "Cliente Potencial" ou "Cliente", pero non pode ser ambos)
+MAIN_OPTIMIZEFORTEXTBROWSER=Simplificar a interface para persoas cegas
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Active esta opción se é unha persoa cega ou se usa a aplicación desde un explorador de texto como Lynx ou Links.
+MAIN_OPTIMIZEFORCOLORBLIND=Cambiar a cor da interface para daltónicos
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Active esta opción se é unha persoa daltónica, nalgún caso a interface cambiará a configuración da cor para aumentar o contraste.
 Protanopia=Protanopia
-Deuteranopes=Deuteranopes
-Tritanopes=Tritanopes
-ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
-DefaultCustomerType=Default thirdparty type for "New customer" creation form
-ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
-RootCategoryForProductsToSell=Root category of products to sell
-RootCategoryForProductsToSellDesc=If defined, only products inside this category or childs of this category will be available in the Point Of Sale
+Deuteranopes=Deuteranopsia
+Tritanopes=Tritanopia
+ThisValueCanOverwrittenOnUserLevel=Este valor pode ser substituído por cada usuario desde a súa páxina de usuario-pestana '%s'
+DefaultCustomerType=Tipo predeterminado de terceiros para o formulario de creación "Novo cliente"
+ABankAccountMustBeDefinedOnPaymentModeSetup=Nota: a conta bancaria debe estar definida no módulo de cada modo de pago (Paypal, Stripe, ...) para que esta función funcione.
+RootCategoryForProductsToSell=Categoría raíz de produtos a vender
+RootCategoryForProductsToSellDesc=Se se define, só os produtos desta categoría ou subcategoría estarán dispoñibles no Punto de Venda
 DebugBar=Barra de depuración
 DebugBarDesc=Barra de ferramentas que ven con moitas ferramentas para simplificar a depuración.
 DebugBarSetup=Configuración DebugBar
@@ -2039,47 +2042,51 @@ GeneralOptions=Opcións xerais
 LogsLinesNumber=Número de liñas a amosar na pestana de rexistros
 UseDebugBar=Use a barra de debug
 DEBUGBAR_LOGS_LINES_NUMBER=Número de últimas liñas de rexistro para manter na consola.
-WarningValueHigherSlowsDramaticalyOutput=Advertencia, os valores altos ralentizan dramáticamente a saída.
-ModuleActivated=Module %s is activated and slows the interface
-IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
-AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
-EXPORTS_SHARE_MODELS=Export models are share with everybody
+WarningValueHigherSlowsDramaticalyOutput=Advertencia, os valores altos ralentizan enormemente a saída.
+ModuleActivated=O módulo %s está activado e ralentiza a interface
+IfYouAreOnAProductionSetThis=Se estás nun entorno de produción, debes establecer esta propiedade en %s..
+AntivirusEnabledOnUpload=Antivirus activado nos ficheiros actualizados
+EXPORTS_SHARE_MODELS=Os modelos de exportación son compartidos con todos.
 ExportSetup=Configuración do módulo de exportación.
-ImportSetup=Setup of module Import
+ImportSetup=Configuración do módulo Importación
 InstanceUniqueID=ID única da instancia
 SmallerThan=Menor que
 LargerThan=Maior que
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
-WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
-EndPointFor=End point for %s : %s
-DeleteEmailCollector=Delete email collector
-ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
-RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
-AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
-RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+IfTrackingIDFoundEventWillBeLinked=Teña conta que se se atopa no correo electrónico un ID de seguimento dun correo electrónico entrante é unha resposta dun correo electrónico xa recollido e ligado a un obxecto, o evento creado ligarase automaticamente co obxecto relacionado coñecido.
+WithGMailYouCanCreateADedicatedPassword=Cunha conta de GMail, se habilitou a validación de 2 pasos, recoméndase crear un segundo contrasinal adicado para a aplicación no lugar de usar a súa propia contrasinal de conta de https://myaccount.google.com/.
+EmailCollectorTargetDir=Pode ser un comportamento desexado mover o correo electrónico a outra etiqueta/directorio cando se procesou con éxito. Simplemente configure o nome do directorio aquí para usar esta función (NON use caracteres especiais no nome). Teña conta que tamén debe usar unha conta de inicio de sesión de lectura/escritura.
+EmailCollectorLoadThirdPartyHelp=Pode usar esta acción para usar o contido do correo electrónico para atopar e cargar un terceiro existente na súa base de datos. O terceiro atopado (ou creada) usarase para seguir as accións que o precisen. No campo do parámetro pode usar por exemplo "EXTRACT:BODY:Name:\\s([^\\s]*)" se desexa extraer o nome do terceiro dunha cadea  "Nome: nome a atopar" atopada no corpo.
+EndPointFor=Punto final de %s:%s
+DeleteEmailCollector=Eliminar o receptor de correo electrónico
+ConfirmDeleteEmailCollector=¿Está certo de que quere eliminar este receptor de correo electrónico?
+RecipientEmailsWillBeReplacedWithThisValue=Os correos electrónicos dos destinatarios sempre se substituirán por este valor
+AtLeastOneDefaultBankAccountMandatory=Debe definirse polo menos unha conta bancaria predeterminada
+RESTRICT_ON_IP=Permitir acceso a APIS dispoñibles a algunha host IP  só (comodín non permitido, use espazo entre valores). Baleiro significa que todos os hosts poden acceder.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
-BaseOnSabeDavVersion=Based on the library SabreDAV version
-NotAPublicIp=Not a public IP
-MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
-EmailTemplate=Template for email
-EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
-PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
-FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
-RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
-JumpToBoxes=Jump to Setup -> Widgets
-MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
-MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
-TemplateAdded=Template added
-TemplateUpdated=Template updated
-TemplateDeleted=Template deleted
-MailToSendEventPush=Event reminder email
-SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
-DictionaryProductNature= Nature of product
-CountryIfSpecificToOneCountry=Country (if specific to a given country)
-YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
-ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+BaseOnSabeDavVersion=Baseado na versión SabreDAV da biblioteca
+NotAPublicIp=Non é unha IP pública
+MakeAnonymousPing=Fai un Ping anónimo '+1' ao servidor da fundación Dolibarr (só se fai unha vez despois da instalación) para permitir á fundación contar o número de instalacións de Dolibarr.
+FeatureNotAvailableWithReceptionModule=Función non dispoñible cando a recepción do módulo está activada
+EmailTemplate=Modelo para correo electrónico
+EMailsWillHaveMessageID=Os correos electrónicos terán unha etiqueta "Referencias" que coincide con esta sintaxe
+PDF_USE_ALSO_LANGUAGE_CODE=Se desexa ter algúns textos no seu PDF duplicados en 2 idiomas diferentes no mesmo PDF xerado, debe configurar aquí este segundo idioma para que o PDF xerado conteña 2 idiomas diferentes na mesma páxina, o elixido ao xerar PDF e este (só algúns modelos PDF soportan isto). Mantéñase baleiro por un idioma por PDF.
+FafaIconSocialNetworksDesc=Introduza aquí o código dunha icona FontAwesome. Se non sabe o que é FontAwesome, pode usar o valor xenérico fa-address-book.
+FeatureNotAvailableWithReceptionModule=Función non dispoñible cando a recepción do módulo está activada
+RssNote=Nota: Cada definición de fonte RSS proporciona un widget que debes habilitar para que estexa dispoñible no panel
+JumpToBoxes=Ir a Configuración -> Widgets
+MeasuringUnitTypeDesc=Use aquí un valor como "tamaño", "superficie", "volume", "peso", "hora"
+MeasuringScaleDesc=A escala é o número de lugares que ten que mover a parte decimal para que coincida coa unidade de referencia predeterminada. Para o tipo de unidade "hora", é o número de segundos. Os valores entre 80 e 99 son valores reservados.
+TemplateAdded=Modelo engadido
+TemplateUpdated=Modelo actualizado
+TemplateDeleted=Modelo eliminado
+MailToSendEventPush=Correo electronico lembranbdo o evento
+SwitchThisForABetterSecurity=Modificar este valor a %s çe recomendable para mair seguridade
+DictionaryProductNature= Natureza do produto
+CountryIfSpecificToOneCountry=País (se é específico dun determinado país)
+YouMayFindSecurityAdviceHere=Pode atopar avisos de seguridade aquí
+ModuleActivatedMayExposeInformation=Este módulo pode expor datos sensible. Se non o precisa, desactive.
+ModuleActivatedDoNotUseInProduction=Un módulo deseñado para desenvolvemento foi activado. Non o active nun entorno de produción.
+CombinationsSeparator=Caracter separador para combinación de produtos
+SeeLinkToOnlineDocumentation=Ver ligazón á documentación en liña no menú superior con exemplos
+SHOW_SUBPRODUCT_REF_IN_PDF=Se se usa a función "%s" do módulo <b>%s</b>, amosa os detalles dos subprodutos dun kit en PDF.
+AskThisIDToYourBank=Póñase en contacto co seu banco para obter esta identificación
diff --git a/htdocs/langs/gl_ES/agenda.lang b/htdocs/langs/gl_ES/agenda.lang
index b76942ad53e..b0328266609 100644
--- a/htdocs/langs/gl_ES/agenda.lang
+++ b/htdocs/langs/gl_ES/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Número de eventos
 ListOfActions=Listaxe de eventos
 EventReports=Informes de evento
 Location=Localización
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Enento asignado a calquera usuario do grupo
 EventOnFullDay=Evento para todo o(s) día(s)
 MenuToDoActions=Todos os eventos incompletos
 MenuDoneActions=Todos os eventos rematados
@@ -38,7 +38,7 @@ ActionsEvents=Eventos para que Dolibarr cre unha acción na axenda automáticame
 EventRemindersByEmailNotEnabled=Lembranzas de eventos por correo non foron activados na configuración do módulo %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Terceiro %s creado
-COMPANY_DELETEInDolibarr=Third party %s deleted
+COMPANY_DELETEInDolibarr=Terceiro %s eliminado
 ContractValidatedInDolibarr=Contrato %s validado
 CONTRACT_DELETEInDolibarr=Contrato %s eliminado
 PropalClosedSignedInDolibarr=Orzamento %s asinado
@@ -60,42 +60,42 @@ MemberSubscriptionModifiedInDolibarr=Suscrición %s do membro %s modificada
 MemberSubscriptionDeletedInDolibarr=Suscrición %s do membro %s eliminada
 ShipmentValidatedInDolibarr=Expedición %s validada
 ShipmentClassifyClosedInDolibarr=Expedición %s clasificada como pagada
-ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified re-open
+ShipmentUnClassifyCloseddInDolibarr=Expedición %s clasificada como aberta de novo
 ShipmentBackToDraftInDolibarr=Expedición %s de volta ao estatus de borrador
 ShipmentDeletedInDolibarr=Expedición %s eliminada
-ReceptionValidatedInDolibarr=Reception %s validated
-OrderCreatedInDolibarr=Pedido %s creado
-OrderValidatedInDolibarr=Pedido %s validado
-OrderDeliveredInDolibarr=Pedido %s clasificado como enviado
-OrderCanceledInDolibarr=Pedido %s anulado
-OrderBilledInDolibarr=Pedido %s clasificado como facturado
-OrderApprovedInDolibarr=Pedido %s aprobado
-OrderRefusedInDolibarr=Pedido %s rexeitado
-OrderBackToDraftInDolibarr=Pedido %s de volta ao estaus borrador
+ReceptionValidatedInDolibarr=Recepción %s validada
+OrderCreatedInDolibarr=Pedimento %s creado
+OrderValidatedInDolibarr=Pedimento %s validado
+OrderDeliveredInDolibarr=Pedimento %s clasificado como enviado
+OrderCanceledInDolibarr=Pedimento %s anulado
+OrderBilledInDolibarr=Pedimento %s clasificado como facturado
+OrderApprovedInDolibarr=Pedimento %s aprobado
+OrderRefusedInDolibarr=Pedimento %s rexeitado
+OrderBackToDraftInDolibarr=Pedimento %s de volta ao modo borrador
 ProposalSentByEMail=Orzamento %s enviado por e-mail
 ContractSentByEMail=Contrato %s enviado por e-Mail
-OrderSentByEMail=Pedido de cliente %s enviado por e-mail
+OrderSentByEMail=Pedimento de cliente %s enviado por correo electrónico
 InvoiceSentByEMail=Factura a cliente %s enviada por e-mail
-SupplierOrderSentByEMail=Pedido a proveedor %s enviado por e-mail
-ORDER_SUPPLIER_DELETEInDolibarr=Purchase order %s deleted
+SupplierOrderSentByEMail=Pedimento a proveedor %s enviado por correo electrónico
+ORDER_SUPPLIER_DELETEInDolibarr=Pedimento a provedor %s eliminado
 SupplierInvoiceSentByEMail=Factura de proveedor %s enviada por e-mail
 ShippingSentByEMail=Expedición %s enviada por email
 ShippingValidated= Expedición %s validada
 InterventionSentByEMail=Intervención %s enviada por e-mail
 ProposalDeleted=Orzamento eliminado
-OrderDeleted=Pedido eliminado
+OrderDeleted=Pedimento eliminado
 InvoiceDeleted=Factura eliminada
-DraftInvoiceDeleted=Draft invoice deleted
-CONTACT_CREATEInDolibarr=Contact %s created
-CONTACT_DELETEInDolibarr=Contact %s deleted
+DraftInvoiceDeleted=Borrador de factura eliminado
+CONTACT_CREATEInDolibarr=Creouse o contacto %s
+CONTACT_DELETEInDolibarr=Contacto %s eliminado
 PRODUCT_CREATEInDolibarr=Produto %s creado
 PRODUCT_MODIFYInDolibarr=Produto %s modificado
 PRODUCT_DELETEInDolibarr=Produto %s eliminado
-HOLIDAY_CREATEInDolibarr=Request for leave %s created
-HOLIDAY_MODIFYInDolibarr=Request for leave %s modified
-HOLIDAY_APPROVEInDolibarr=Request for leave %s approved
-HOLIDAY_VALIDATEInDolibarr=Request for leave %s validated
-HOLIDAY_DELETEInDolibarr=Request for leave %s deleted
+HOLIDAY_CREATEInDolibarr=Creouse a solicitude de días libres %s
+HOLIDAY_MODIFYInDolibarr=Modificada solicitude de días libres %s
+HOLIDAY_APPROVEInDolibarr=Aprobada solicitude de días libres %s
+HOLIDAY_VALIDATEInDolibarr=Solicitude de días libres %s validada
+HOLIDAY_DELETEInDolibarr=Eliminada solicitude de días libres %s
 EXPENSE_REPORT_CREATEInDolibarr=Informe de gastos %s creado
 EXPENSE_REPORT_VALIDATEInDolibarr=Informe de gastos %s validado
 EXPENSE_REPORT_APPROVEInDolibarr=Informe de gastos %s aprobado
@@ -106,30 +106,30 @@ PROJECT_MODIFYInDolibarr=Proxecto %s modificado
 PROJECT_DELETEInDolibarr=Proxecto %s eliminado
 TICKET_CREATEInDolibarr=Ticket %s creado
 TICKET_MODIFYInDolibarr=Ticket %s modificado
-TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
-TICKET_CLOSEInDolibarr=Ticket %s closed
+TICKET_ASSIGNEDInDolibarr=Ticket %s asignado
+TICKET_CLOSEInDolibarr=Ticket %s pechado
 TICKET_DELETEInDolibarr=Ticket %s eliminado
-BOM_VALIDATEInDolibarr=BOM validated
-BOM_UNVALIDATEInDolibarr=BOM unvalidated
-BOM_CLOSEInDolibarr=BOM disabled
-BOM_REOPENInDolibarr=BOM reopen
-BOM_DELETEInDolibarr=BOM deleted
-MRP_MO_VALIDATEInDolibarr=MO validated
-MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
-MRP_MO_PRODUCEDInDolibarr=MO produced
-MRP_MO_DELETEInDolibarr=MO deleted
-MRP_MO_CANCELInDolibarr=MO canceled
+BOM_VALIDATEInDolibarr=Lista de materiais validada
+BOM_UNVALIDATEInDolibarr=Lista de materiais non validada
+BOM_CLOSEInDolibarr=Lista de materiais desactivada
+BOM_REOPENInDolibarr=Lista de materiais aberta de novo
+BOM_DELETEInDolibarr=Lista de materiais non eliminada
+MRP_MO_VALIDATEInDolibarr=OF validada
+MRP_MO_UNVALIDATEInDolibarr=OF establecida a borrador
+MRP_MO_PRODUCEDInDolibarr=OF producida
+MRP_MO_DELETEInDolibarr=OF eliminada
+MRP_MO_CANCELInDolibarr=OF cancelada
 ##### End agenda events #####
 AgendaModelModule=Prantillas de documentos para eventos
 DateActionStart=Data de inicio
-DateActionEnd=Data de fin
+DateActionEnd=Data finalización
 AgendaUrlOptions1=Pode tamén engadir os seguintes parámetros ao filtro de saida:
 AgendaUrlOptions3=<b>logina=%s</b> para restrinxir saída as accións pertencentes ao usuario <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b> logina =!%s</b> para restrinxir saída as accións que non pertencen ao usuario <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b>para restrinxir saída as accións asignadas ao usuario <b>%s</b>(propietario e outros).
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> para restrinxir saída de accións asociadas ao proxecto <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype = systemauto</b> para excluir o evento automáticamente.
-AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
+AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> a incluir eventos de vacacións.
 AgendaShowBirthdayEvents=Amosar cumpreanos dos contactos
 AgendaHideBirthdayEvents=Ocultar cumpreanos dos contactos
 Busy=Ocupado
@@ -152,17 +152,18 @@ ActionType=Tipo de evento
 DateActionBegin=Data de comezo do evento
 ConfirmCloneEvent=¿Esta certo de querer clonar o evento <b>%s</b>?
 RepeatEvent=Repetir evento
+OnceOnly=Só unha vez
 EveryWeek=Cada semana
 EveryMonth=Cada mes
 DayOfMonth=Día do mes
 DayOfWeek=Día da semana
 DateStartPlusOne=Data inicio +1 hora
-SetAllEventsToTodo=Set all events to todo
-SetAllEventsToInProgress=Set all events to in progress
-SetAllEventsToFinished=Set all events to finished
-ReminderTime=Reminder period before the event
-TimeType=Duration type
-ReminderType=Callback type
-AddReminder=Create an automatic reminder notification for this event
-ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+SetAllEventsToTodo=Configura todos os eventos a todo
+SetAllEventsToInProgress=Configura todos os eventos a en progreso
+SetAllEventsToFinished=Configura todos os eventos a finalizados
+ReminderTime=Período de lembranza antes do evento
+TimeType=Tipo de duración
+ReminderType=Tipo de devolución da chamada
+AddReminder=Crear unha notificación de lembranza automática para este evento
+ErrorReminderActionCommCreation=Erro ao crear a notificación de lembranza para este evento
+BrowserPush=Notiticaciñon emerxente no navegador
diff --git a/htdocs/langs/gl_ES/assets.lang b/htdocs/langs/gl_ES/assets.lang
index a8ede67427d..06c7c76a069 100644
--- a/htdocs/langs/gl_ES/assets.lang
+++ b/htdocs/langs/gl_ES/assets.lang
@@ -34,7 +34,7 @@ ShowTypeCard=Ver tipo '%s'
 # Module label 'ModuleAssetsName'
 ModuleAssetsName = Activos
 # Module description 'ModuleAssetsDesc'
-ModuleAssetsDesc = Descrición ben
+ModuleAssetsDesc = Descrición de activos
 
 #
 # Admin page
diff --git a/htdocs/langs/gl_ES/banks.lang b/htdocs/langs/gl_ES/banks.lang
index bb0b955c32c..92dcc2a3bd5 100644
--- a/htdocs/langs/gl_ES/banks.lang
+++ b/htdocs/langs/gl_ES/banks.lang
@@ -37,9 +37,9 @@ IbanValid=IBAN válido
 IbanNotValid=IBAN non válido
 StandingOrders=Domiciliacións
 StandingOrder=Domiciliación
-PaymentByDirectDebit=Payment by direct debit
-PaymentByBankTransfers=Payments by credit transfer
-PaymentByBankTransfer=Payment by credit transfer
+PaymentByDirectDebit=Pagamento por domiciliación bancaria
+PaymentByBankTransfers=Pagamentos por transferencia
+PaymentByBankTransfer=Pagamento por transferencia
 AccountStatement=Extracto da conta
 AccountStatementShort=Extracto
 AccountStatements=Extractos da conta
@@ -166,17 +166,17 @@ VariousPayment=Pagamento varios
 VariousPayments=Pagamentos varios
 ShowVariousPayment=Amosar pagamentos varios
 AddVariousPayment=Engadir pagamentos varios
-VariousPaymentId=Miscellaneous payment ID
-VariousPaymentLabel=Miscellaneous payment label
-ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
+VariousPaymentId=ID de pagamentos varios
+VariousPaymentLabel=Etiqueta de pagamentos varios
+ConfirmCloneVariousPayment=Confirmar a clonación de pagamentos varios
 SEPAMandate=Orde SEPA
 YourSEPAMandate=A súa orde SEPA
 FindYourSEPAMandate=Esta é a súa orde SEPA para autorizar a nosa empresa a realizar un petición de débito ao seu banco. Envíea de volta asinada (dixitalice o documento asinado) ou envíe por correo a
 AutoReportLastAccountStatement=Automaticanete cubra a etiqueta 'numero de extracto bancario' co último número de extracto de cando fixo a reconciliación
-CashControl=POS cash fence
-NewCashFence=New cash fence
-BankColorizeMovement=Colorize movements
-BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
-BankColorizeMovementName1=Background color for debit movement
-BankColorizeMovementName2=Background color for credit movement
-IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
+CashControl=Control de caixa TPV
+NewCashFence=Pehe de nova caixa
+BankColorizeMovement=Colorear os movementos
+BankColorizeMovementDesc=Se esta función está activada, pode escoller unha cor específica do fondo dos movementos de crédito ou de débito
+BankColorizeMovementName1=Cor de fondo para movementos de débito
+BankColorizeMovementName2=Cor de fondo para os movementos de crédito
+IfYouDontReconcileDisableProperty=Se non aplica as reconciliacións bancarias nalgunhas contas bancarias, desactivar as propiedades "%s" nelas apara eliminar este aviso.
diff --git a/htdocs/langs/gl_ES/bills.lang b/htdocs/langs/gl_ES/bills.lang
index a11d0d3fecd..6047f9fbdfa 100644
--- a/htdocs/langs/gl_ES/bills.lang
+++ b/htdocs/langs/gl_ES/bills.lang
@@ -19,7 +19,7 @@ InvoiceStandardAsk=Factura estándar
 InvoiceStandardDesc=Este tipo de factura é a factura tradicional.
 InvoiceDeposit=Factura de anticipo
 InvoiceDepositAsk=Factura de anticipo
-InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
+InvoiceDepositDesc=Este tipo de factura crease cando se recibiu un anticipo.
 InvoiceProForma=Factura proforma
 InvoiceProFormaAsk=Factura proforma
 InvoiceProFormaDesc=A <b>factura proforma</b> é a imaxe dunha factura definitiva, pero que non ten ningún valor contable.
@@ -66,10 +66,10 @@ paymentInInvoiceCurrency=na moeda das facturas
 PaidBack=Reembolsado
 DeletePayment=Eliminar o pagamento
 ConfirmDeletePayment=¿Está certo de querer eliminar este pagamento?
-ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
-ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
-ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=¿Quere converter este %s nun crédito dispoñible?
+ConfirmConvertToReduc2=A cantidade gardarase entre todos os descontos e podería usarse como desconto dunha factura actual ou futura para este cliente.
+ConfirmConvertToReducSupplier=¿Quere converter este %s nun crédito dispoñible?
+ConfirmConvertToReducSupplier2=cantidade gardarase entre todos os descontos e podería usarse como desconto para unha factura actual ou futura deste provedor.
 SupplierPayments=Pagamentos a provedores
 ReceivedPayments=Pagamentos recibidos
 ReceivedCustomersPayments=Pagamentos recibidos de cliente
@@ -92,8 +92,8 @@ PaymentConditions=Condicións de pagamento
 PaymentConditionsShort=Condicións de pagamento
 PaymentAmount=Importe pagamento
 PaymentHigherThanReminderToPay=Pagamento superior ao resto a pagar
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Atención, o importe do pagamento dunha ou máis facturas é superior ao importe pendente a pagar. <br> Edite a súa entrada, se non, confirme e considere a posibilidade de crear unha nota de crédito polo exceso recibido por cada factura pagada de máis.
+HelpPaymentHigherThanReminderToPaySupplier=Atención, o importe do pagamento dunha ou máis facturas é superior ao importe pendente a pagar. <br> Edite a súa entrada, se non, confirme e considere a posibilidade de crear unha nota de crédito para o exceso pagado por cada factura pagada de máis.
 ClassifyPaid=Clasificar 'Pagado'
 ClassifyUnPaid=Clasificar 'Non pagado'
 ClassifyPaidPartially=Clasificar 'Pagado parcialmente'
@@ -135,37 +135,37 @@ BillShortStatusDraft=Borrador
 BillShortStatusPaid=Pagada
 BillShortStatusPaidBackOrConverted=Reembolsada ou convertida
 Refunded=Reembolsada
-BillShortStatusConverted=Pago
+BillShortStatusConverted=Paga
 BillShortStatusCanceled=Abandonada
 BillShortStatusValidated=Validada
 BillShortStatusStarted=Pagamento parcial
 BillShortStatusNotPaid=Pte. pagamento
 BillShortStatusNotRefunded=Non reembolsada
-BillShortStatusClosedUnpaid=Pechada (pte. pagamento)
+BillShortStatusClosedUnpaid=Pechada
 BillShortStatusClosedPaidPartially=Pechada (pagamento parcial)
 PaymentStatusToValidShort=A validar
 ErrorVATIntraNotConfigured=Número de CIF intracomunitario aínda non configurado
-ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.
-ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment types
-ErrorBillNotFound=Invoice %s does not exist
-ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
-ErrorDiscountAlreadyUsed=Error, discount already used
-ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
-ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
-ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
+ErrorNoPaiementModeConfigured=Non se definiu ningún tipo de pago por defecto. Vaia á configuración do módulo de facturas para solucionalo.
+ErrorCreateBankAccount=Crear unha conta bancaria e logo ir ao panel de configuración do módulo de factura para definir os tipos de pago
+ErrorBillNotFound=A factura %s non existe
+ErrorInvoiceAlreadyReplaced=Erro, intentou validar unha factura para substituír a factura %s. Pero esta xa foi substituída pola factura %s.
+ErrorDiscountAlreadyUsed=Erro, desconto xa utilizado
+ErrorInvoiceAvoirMustBeNegative=Erro, a factura correcta debe ter un importe negativo
+ErrorInvoiceOfThisTypeMustBePositive=Erro, este tipo de factura debe ter un importe sen impostos positivos (ou nulos)
+ErrorCantCancelIfReplacementInvoiceNotValidated=Erro, non se pode cancelar unha factura que foi substituída por outra que aínda está en estado de borrador
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Esta parte ou outra xa está empregada polo que a serie de descontos non se pode eliminar.
 BillFrom=De
 BillTo=A
-ActionsOnBill=Actions on invoice
-RecurringInvoiceTemplate=Template / Recurring invoice
-NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
-NotARecurringInvoiceTemplate=Not a recurring template invoice
+ActionsOnBill=Accións sobre a factura
+RecurringInvoiceTemplate=Modelo / Factura recorrente
+NoQualifiedRecurringInvoiceTemplateFound=Non hai ningunha factura de modelo recorrente cualificada para a xeración.
+FoundXQualifiedRecurringInvoiceTemplate=Atopáronse %s factura(s) de modelo recorrentes cualificadas para a xeración.
+NotARecurringInvoiceTemplate=Non é unha factura de modelo recorrente
 NewBill=Nova factura
-LastBills=Latest %s invoices
-LatestTemplateInvoices=Latest %s template invoices
-LatestCustomerTemplateInvoices=Latest %s customer template invoices
-LatestSupplierTemplateInvoices=Latest %s vendor template invoices
+LastBills=Últimas %s facturas
+LatestTemplateInvoices=As últimas %s prantillas de  facturas
+LatestCustomerTemplateInvoices=As últimas %s prantillas de facturas a cliente
+LatestSupplierTemplateInvoices=As últimas %s prantillas de facturas de provedor
 LastCustomersBills=Últimas %s facturas a clientes
 LastSuppliersBills=Últimas %s facturas de provedores
 AllBills=Todas as facturas
@@ -185,20 +185,20 @@ ConfirmCancelBillQuestion=¿Por qué quere clasificar esta factura como 'abandoa
 ConfirmClassifyPaidPartially=¿Está certo de querer cambiar o estado da factura <b>%s</b> a pagado?
 ConfirmClassifyPaidPartiallyQuestion=Esta factura non foi pagada completamente. ¿Cal é a razón para pechar esta factura?
 ConfirmClassifyPaidPartiallyReasonAvoir=O resto a pagar <b>(%s %s)</b> é un desconto outorgado por pronto pagamento. Regularizaré o IVE cun abono.
-ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
-ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
-ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
-ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
-ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
-ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscount=Restar sen pagar <b>(%s %s)</b> é un desconto concedido porque o pago foi adiantado ao prazo.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restar sen pagar <b>(%s %s)</b> é un desconto concedido porque o pago foi adiantado ao prazo. Acepto perder o IVE por este desconto.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Restar sen pagar <b>(%s %s)</b> é un desconto concedido porque o pago foi adiantado ao prazo. Recupero o IVE deste desconto sen unha nota de crédito.
+ConfirmClassifyPaidPartiallyReasonBadCustomer=Mal cliente
+ConfirmClassifyPaidPartiallyReasonProductReturned=Produtos parcialmente devoltos
+ConfirmClassifyPaidPartiallyReasonOther=Cantidade abandonada por outro motivo
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Esta opción é posible se a súa factura recibiu os comentarios axeitados. (Exemplo «Só o imposto correspondente ao prezo efectivamente pagado dá dereito a dedución»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Nalgúns países, esta elección só pode ser posible se a súa factura contén notas correctas.
+ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use esta opción se o resto non se adapta
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Un <b> mal cliente </b> é un cliente que rexeita pagar a súa débeda.
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Esta opción úsase cando o pago non se completa porque algúns dos produtos foron devoltos
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use esta opción se todas as demais non son axeitadas, por exemplo na seguinte situación:<br>- o pago non se completou porque algúns produtos foron devoltos <br>- cantidade reclamada demasiado importante porque se esqueceu un desconto <br> En todos os casos, o importe excedido debe corrixirse no sistema de contabilidade creando unha nota de crédito.
 ConfirmClassifyAbandonReasonOther=Outro
-ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
+ConfirmClassifyAbandonReasonOtherDesc=Esta opción usarase no resto dos casos. Por exemplo, porque ten pensado crear unha factura de rectificativa.
 ConfirmCustomerPayment=¿Confirma o proceso  deste pagamento de <b>%s</b> %s?
 ConfirmSupplierPayment=¿Confirma o proceso  deste pagamento de <b>%s</b> %s?
 ConfirmValidatePayment=¿Está certo de querer validar este pagamento? Non permitense cambios despois de validar o pagamento.
@@ -209,23 +209,23 @@ NumberOfBillsByMonth=Nº de facturas por mes
 AmountOfBills=Importe das facturas
 AmountOfBillsHT=Importe das facturas (Sen IVE)
 AmountOfBillsByMonthHT=Importe das facturas por mes (Sen IVE)
-UseSituationInvoices=Allow situation invoice
-UseSituationInvoicesCreditNote=Allow situation invoice credit note
-Retainedwarranty=Retained warranty
-AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
-RetainedwarrantyDefaultPercent=Retained warranty default percent
-RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
-RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
-ToPayOn=To pay on %s
-toPayOn=to pay on %s
-RetainedWarranty=Retained Warranty
-PaymentConditionsShortRetainedWarranty=Retained warranty payment terms
-DefaultPaymentConditionsRetainedWarranty=Default retained warranty payment terms
-setPaymentConditionsShortRetainedWarranty=Set retained warranty payment terms
-setretainedwarranty=Set retained warranty
-setretainedwarrantyDateLimit=Set retained warranty date limit
-RetainedWarrantyDateLimit=Retained warranty date limit
-RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
+UseSituationInvoices=Permitir factura de situación
+UseSituationInvoicesCreditNote=Permitir nota de crédito na factura da situación
+Retainedwarranty=Garantía retida
+AllowedInvoiceForRetainedWarranty=Garantía retida utilizable nos seguintes tipos de facturas
+RetainedwarrantyDefaultPercent=Porcentaxe por defecto da garantía retida
+RetainedwarrantyOnlyForSituation=Pon a "garantía retida" dispoñible só para facturas de situación
+RetainedwarrantyOnlyForSituationFinal=Nas facturas de situación, a dedución global de "garantía retida" aplícase só na situación final
+ToPayOn=Para pagar en %s
+toPayOn=pagar en %s
+RetainedWarranty=Garantía retida
+PaymentConditionsShortRetainedWarranty=Condicións de pago da garantía retida
+DefaultPaymentConditionsRetainedWarranty=Condicións de pago por garantía por defecto retidas
+setPaymentConditionsShortRetainedWarranty=Establecer os termos de pago da garantía retida
+setretainedwarranty=Establecer a garantía retida
+setretainedwarrantyDateLimit=Establecer o límite de data da garantía retida
+RetainedWarrantyDateLimit=Data límite de garantía retida
+RetainedWarrantyNeed100Percent=A factura de situación ten que estar ao 100%% de progreso para mostrarse en PDF
 AlreadyPaid=Xa pago
 AlreadyPaidBack=Xa reembolsado
 AlreadyPaidNoCreditNotesNoDeposits=Xa pago (excluidos os abonos e anticipos)
@@ -315,9 +315,9 @@ DiscountAlreadyCounted=Descontos xa consumidos
 CustomerDiscounts=Descontos a clientes
 SupplierDiscounts=Descontos de provedores
 BillAddress=Enderezo de facturación
-HelpEscompte=This discount is a discount granted to customer because payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
+HelpEscompte=Este desconto é un desconto concedido ao cliente porque o pago foi realizado antes de prazo.
+HelpAbandonBadCustomer=Esta cantidade foi abandonada (o cliente dixo que era un cliente malo) e considérase unha perda excepcional.
+HelpAbandonOther=Esta cantidade foi abandonada xa que foi un erro (cliente incorrecto ou factura substituída por outra por exemplo)
 IdSocialContribution=Id pagamento tasa social/fiscal
 PaymentId=ID pagamento
 PaymentRef=Ref. pagamento
@@ -358,32 +358,32 @@ ListOfPreviousSituationInvoices=Listaxe de facturas de situación previas
 ListOfNextSituationInvoices=Listaxe das próximas facturas de situación
 ListOfSituationInvoices=Listaxe de facturas de situación
 CurrentSituationTotal=Total situación actual
-DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
-RemoveSituationFromCycle=Remove this invoice from cycle
-ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
-ConfirmOuting=Confirm outing
+DisabledBecauseNotEnouthCreditNote=Para eliminar unha factura de situación do ciclo, o total da nota de crédito desta factura debe cubrir este total de factura
+RemoveSituationFromCycle=Eliminar esta factura do ciclo
+ConfirmRemoveSituationFromCycle=Eliminar esta factura %s do ciclo?
+ConfirmOuting=Confirmar a saída
 FrequencyPer_d=Cada %s días
 FrequencyPer_m=Cada %s meses
 FrequencyPer_y=Cada %s anos
 FrequencyUnit=Frecuencia
-toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
-NextDateToExecution=Date for next invoice generation
-NextDateToExecutionShort=Date next gen.
-DateLastGeneration=Date of latest generation
-DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max. number of invoice generation
-NbOfGenerationDone=Number of invoice generation already done
-NbOfGenerationDoneShort=Number of generation done
-MaxGenerationReached=Maximum number of generations reached
-InvoiceAutoValidate=Validate invoices automatically
-GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
-DateIsNotEnough=Date not reached yet
-InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
-GeneratedFromTemplate=Generated from template invoice %s
-WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
-WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
-ViewAvailableGlobalDiscounts=View available discounts
-GroupPaymentsByModOnReports=Group payments by mode on reports
+toolTipFrequency=Exemplos:<br><b>Indicar 7, Día</b>: creará unha nova factura cada 7 días<br><b>Indicar 3, Mes</b>: creará unha nova factura cada 3 meses
+NextDateToExecution=Data para a xeración da próxima factura
+NextDateToExecutionShort=Data próxima xeración
+DateLastGeneration=Data da última xeración
+DateLastGenerationShort=Data última xeración
+MaxPeriodNumber=Nº máximo de facturas a xerar
+NbOfGenerationDone=Número de facturas xa xeradas
+NbOfGenerationDoneShort=Número de xeracións feitas
+MaxGenerationReached=Máximo número de xeracións alcanzado
+InvoiceAutoValidate=Validar facturas automáticamente
+GeneratedFromRecurringInvoice=Xerado dende a prantilla de facturas recorrentes %s
+DateIsNotEnough=Ainda non foi alcanzada a data
+InvoiceGeneratedFromTemplate=Factura %s xerada dende a prantilla de factura recorrente %s
+GeneratedFromTemplate=Xerado dende a prantilla de facturas concorrentes %s
+WarningInvoiceDateInFuture=Atención: a data da factura é maior que a data actual
+WarningInvoiceDateTooFarInFuture=Atención: a data da factura é moi lonxana á data actual
+ViewAvailableGlobalDiscounts=Ver os descontos dispoñibles
+GroupPaymentsByModOnReports=Pagos agrupados por modo nos informes
 # PaymentConditions
 Statut=Estado
 PaymentConditionShortRECEP=Acuse de recibo
@@ -400,7 +400,7 @@ PaymentConditionShortPT_DELIVERY=Á entrega
 PaymentConditionPT_DELIVERY=Pagamento á entrega
 PaymentConditionShortPT_ORDER=Orde
 PaymentConditionPT_ORDER=Á recepción do pedimento
-PaymentConditionShortPT_5050=50/50
+PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=Pagamento 50%% por adiantado, 50%% á entrega
 PaymentConditionShort10D=10 días
 PaymentCondition10D=Pagamento aos 10 días
@@ -410,10 +410,10 @@ PaymentConditionShort14D=14 días
 PaymentCondition14D=Pagamento aos 14 días
 PaymentConditionShort14DENDMONTH=14 días fin de mes
 PaymentCondition14DENDMONTH=14 días a fin de més
-FixAmount=Importe fixo
+FixAmount=Importe fixo -1 liña coa etiqueta %s
 VarAmount=Importe variable (%% total)
 VarAmountOneLine=Cantidade variable (%% tot.) - 1 liña coa etiqueta '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Cantidade variable (%% tot.) - as mesmas liñas
 # PaymentType
 PaymentTypeVIR=Transferencia bancaria
 PaymentTypeShortVIR=Transferencia bancaria
@@ -421,10 +421,10 @@ PaymentTypePRE=Domiciliación
 PaymentTypeShortPRE=Domiciliación
 PaymentTypeLIQ=Efectivo
 PaymentTypeShortLIQ=Efectivo
-PaymentTypeCB=Tarxeta de crédito
-PaymentTypeShortCB=Tarxeta de crédito
-PaymentTypeCHQ=Verificar
-PaymentTypeShortCHQ=Verificar
+PaymentTypeCB=Tarxeta
+PaymentTypeShortCB=Tarxeta
+PaymentTypeCHQ=Talón
+PaymentTypeShortCHQ=Talón
 PaymentTypeTIP=TIP (Titulo interbancario de pagamento)
 PaymentTypeShortTIP=Pagamento TIP
 PaymentTypeVAD=Pagamento en liña
@@ -459,8 +459,8 @@ FullPhoneNumber=Teléfono
 TeleFax=Fax
 PrettyLittleSentence=Acepto o pagamento mediante talóns ao meu nome das sumas debidas, na miña calidade de membro dunha empresa autorizada pola Administración Fiscal.
 IntracommunityVATNumber=Número de IVE intracomunitario
-PaymentByChequeOrderedTo=Pagamento mediante talón nominativo a %s enviado a
-PaymentByChequeOrderedToShort=Pagamento mediante talón nominativo a
+PaymentByChequeOrderedTo=Pagamento mediante talón nominativo (taxas incluídas) a %s enviado a
+PaymentByChequeOrderedToShort=Pagamento mediante talón nominativo (taxas incluídas) a
 SendTo=enviado a
 PaymentByTransferOnThisBankAccount=Pagamento mediante transferencia á conta bancaria seguinte
 VATIsNotUsedForInvoice=* IVE non aplicable  art-293B del CGI
@@ -507,17 +507,17 @@ ListOfYourUnpaidInvoices=Listaxe de facturas impagadas
 NoteListOfYourUnpaidInvoices=Nota: Este listaxe só inclue os terceiros ds que vostede é comercial.
 RevenueStamp=Timbre fiscal
 YouMustCreateInvoiceFromThird=Esta opción só está dispoñible ao crear unha factura dende a lapela 'cliente' en terceiros
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
-YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
-PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-EarlyClosingReason=Early closing reason
-EarlyClosingComment=Early closing note
+YouMustCreateInvoiceFromSupplierThird=Esta opción só está dispoñible ao crear unha factura desde a pestana "Provedor" de terceiros
+YouMustCreateStandardInvoiceFirstDesc=Primeiro ten que crear unha factura estándar e convertela a "modelo" para crear unha nova factura modelo
+PDFCrabeDescription=Modelo PDF de factura Crabe. Un modelo de factura completo (implementación antiga do modelo Sponge)
+PDFSpongeDescription=Modelo PDF de factura Sponge. Un modelo de factura completo
+PDFCrevetteDescription=Modelo PDF de factura Crevette. Un modelo de factura completo para as facturas de situación
+TerreNumRefModelDesc1=Número de devolución co formato %syymm-nnnn para as facturas estándar e %syymm-nnnn para as notas de crédito onde aa é ano, mm é mes e nnnn é unha secuencia sen interrupción e sen retorno a 0
+MarsNumRefModelDesc1=Número de devolución co formato %syymm-nnnn para as facturas estándar, %syymm-nnnn para as facturas de reposición, %syymm-nnnn para as facturas de pago inicial e %syymm-nnnn para as notas de crédito onde aa é ano, mm é mes e nnnn é unha secuencia sen interrupción e sen retorno a 0
+TerreNumRefModelError=Xa existe unha factura que comeza con $syymm e non é compatible con este modelo de secuencia. Elimina ou renoméao para activar este módulo.
+CactusNumRefModelDesc1=Número de devolución co formato %syymm-nnnn para as facturas estándar, %syymm-nnnn para as notas de crédito e %syymm-nnnn para as facturas de pago inicial onde aa é ano, mm é mes e nnnn é unha secuencia sen interrupción e sen devolución a 0
+EarlyClosingReason=Motivo de peche anticipado
+EarlyClosingComment=Nota de peche anticipado
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Responsable seguimiento factura a cliente
 TypeContact_facture_external_BILLING=Contacto cliente facturación
@@ -528,50 +528,55 @@ TypeContact_invoice_supplier_external_BILLING=Contacto provedor facturación
 TypeContact_invoice_supplier_external_SHIPPING=Contacto provedor entregas
 TypeContact_invoice_supplier_external_SERVICE=Contacto provedor servizos
 # Situation invoices
-InvoiceFirstSituationAsk=First situation invoice
-InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
-InvoiceSituation=Situation invoice
-InvoiceSituationAsk=Invoice following the situation
-InvoiceSituationDesc=Create a new situation following an already existing one
-SituationAmount=Situation invoice amount(net)
-SituationDeduction=Situation subtraction
-ModifyAllLines=Modify all lines
-CreateNextSituationInvoice=Create next situation
-ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
-ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
-ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
-NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
-DisabledBecauseNotLastInCycle=The next situation already exists.
-DisabledBecauseFinal=This situation is final.
+InvoiceFirstSituationAsk=Factura de primeira situación
+InvoiceFirstSituationDesc=As <b>facturas de situación</b> están ligadas a situacións relacionadas cunha progresión, por exemplo, a progresión dunha construcción. Cada situación está ligada a unha factura.
+InvoiceSituation=Factura de situación
+PDFInvoiceSituation=Factura de situación
+InvoiceSituationAsk=Factura seguindo a situación
+InvoiceSituationDesc=Crear unha nova situación despois dunha xa existente
+SituationAmount=Importe da factura de situación (neto)
+SituationDeduction=Dedución da situación
+ModifyAllLines=Modificar todas as liñas
+CreateNextSituationInvoice=Crear a seguinte situación
+ErrorFindNextSituationInvoice=Erro ao non atopar a seguinte referencia do ciclo de situación
+ErrorOutingSituationInvoiceOnUpdate=Non se pode emitir a factura desta situación.
+ErrorOutingSituationInvoiceCreditNote=Non se pode emitir a nota de crédito ligada.
+NotLastInCycle=Esta factura non é a última do ciclo e non se debe modificar.
+DisabledBecauseNotLastInCycle=A seguinte situación xa existe.
+DisabledBecauseFinal=Esta situación é definitiva.
 situationInvoiceShortcode_AS=AS
 situationInvoiceShortcode_S=D
-CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No open situations
-InvoiceSituationLast=Final and general invoice
-PDFCrevetteSituationNumber=Situation N°%s
-PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
-PDFCrevetteSituationInvoiceTitle=Situation invoice
-PDFCrevetteSituationInvoiceLine=Situation N°%s: Inv. N°%s on %s
-TotalSituationInvoice=Total situation
-invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
-updatePriceNextInvoiceErrorUpdateline=Error: update price on invoice line: %s
-ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
-ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both methods (manual and automatic) can be used together with no risk of duplication.
-DeleteRepeatableInvoice=Delete template invoice
-ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
-CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
-StatusOfGeneratedDocuments=Status of document generation
-DoNotGenerateDoc=Do not generate document file
-AutogenerateDoc=Auto generate document file
-AutoFillDateFrom=Set start date for service line with invoice date
-AutoFillDateFromShort=Set start date
-AutoFillDateTo=Set end date for service line with next invoice date
-AutoFillDateToShort=Set end date
-MaxNumberOfGenerationReached=Max number of gen. reached
+CantBeLessThanMinPercent=O progreso non pode ser menor que o seu valor na situación anterior.
+NoSituations=Non hai situacións abertas
+InvoiceSituationLast=Factura final e xeral
+PDFCrevetteSituationNumber=Situación Nº%s
+PDFCrevetteSituationInvoiceLineDecompte=Factura de situación - COUNT
+PDFCrevetteSituationInvoiceTitle=Factura de situación
+PDFCrevetteSituationInvoiceLine=Situación nº%s: Fact. Nº%s en %s
+TotalSituationInvoice=Situación total
+invoiceLineProgressError=O progreso da liña de factura non pode ser maior nin igual á seguinte liña de factura
+updatePriceNextInvoiceErrorUpdateline=Erro: actualización do prezo na liña de factura:%s
+ToCreateARecurringInvoice=Para crear unha factura recorrente para este contrato, primeiro cree este borrador de factura, logo convértao nun modelo de factura e defina a frecuencia para a xeración de facturas futuras.
+ToCreateARecurringInvoiceGene=Para xerar futuras facturas regularmente e manualmente, só tes que ir ao menú <strong>%s-%s-%s </strong>.
+ToCreateARecurringInvoiceGeneAuto=Se precisa xerar estas facturas automaticamente, pídelle ao administrador que active e configure o módulo <strong>%s </strong>. Teña conta que os dous métodos (manual e automático) pódense empregar xuntos sen risco de duplicación.
+DeleteRepeatableInvoice=Eliminar factura modelo
+ConfirmDeleteRepeatableInvoice=¿Está certo de que quere eliminar a factura modelo?
+CreateOneBillByThird=Crear unha factura por terceiro (se non, unha factura por pedido)
+BillCreated=Creáronse %s factura(s)
+StatusOfGeneratedDocuments=Estado da xeración de documentos
+DoNotGenerateDoc=Non xerar ficheiro de documento
+AutogenerateDoc=Xerar automaticamente un ficheiro de documento
+AutoFillDateFrom=Establecer a data de inicio da liña de servizo coa data da factura
+AutoFillDateFromShort=Establecer a data de inicio
+AutoFillDateTo=Establecer a data de finalización da liña de servizo coa próxima data de factura
+AutoFillDateToShort=Establecer a data de finalización
+MaxNumberOfGenerationReached=Número máximo de xen. alcanzado
 BILL_DELETEInDolibarr=Factura eliminada
-BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
-UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
-CustomersInvoicesArea=Customer billing area
-SupplierInvoicesArea=Supplier billing area
+BILL_SUPPLIER_DELETEInDolibarr=Eliminouse a factura do provedor
+UnitPriceXQtyLessDiscount=Prezo unitario x Cantidade - Desconto
+CustomersInvoicesArea=Área de facturación do cliente
+SupplierInvoicesArea=Área de facturación de provedor
+FacParentLine=Liña principal de factura
+SituationTotalRayToRest=Lembranza de pagar sen impostos
+PDFSituationTitle=Situación n° %d
+SituationTotalProgress=Progreso total %d %%
diff --git a/htdocs/langs/gl_ES/blockedlog.lang b/htdocs/langs/gl_ES/blockedlog.lang
index 3a8b9adac84..99de9dd3d73 100644
--- a/htdocs/langs/gl_ES/blockedlog.lang
+++ b/htdocs/langs/gl_ES/blockedlog.lang
@@ -1,54 +1,54 @@
-BlockedLog=Unalterable Logs
+BlockedLog=Rexistros inalterables
 Field=Campo
-BlockedLogDesc=This module tracks some events into an unalterable log (that you can't modify once recorded) into a block chain, in real time. This module provides compatibility with requirements of laws of some countries (like France with the law Finance 2016 - Norme NF525).
-Fingerprints=Archived events and fingerprints
-FingerprintsDesc=This is the tool to browse or extract the unalterable logs. Unalterable logs are generated and archived locally into a dedicated table, in real time when you record a business event. You can use this tool to export this archive and save it into an external support (some countries, like France, ask that you do it every year). Note that, there is no feature to purge this log and every change tried to be done directly into this log (by a hacker for example) will be reported with a non-valid fingerprint. If you really need to purge this table because you used your application for a demo/test purpose and want to clean your data to start your production, you can ask your reseller or integrator to reset your database (all your data will be removed).
-CompanyInitialKey=Company initial key (hash of genesis block)
-BrowseBlockedLog=Unalterable logs
-ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
-ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
-DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
-OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
-OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
-AddedByAuthority=Stored into remote authority
-NotAddedByAuthorityYet=Not yet stored into remote authority
-ShowDetails=Show stored details
-logPAYMENT_VARIOUS_CREATE=Payment (not assigned to an invoice) created
-logPAYMENT_VARIOUS_MODIFY=Payment (not assigned to an invoice) modified
-logPAYMENT_VARIOUS_DELETE=Payment (not assigned to an invoice) logical deletion
-logPAYMENT_ADD_TO_BANK=Payment added to bank
-logPAYMENT_CUSTOMER_CREATE=Customer payment created
-logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion
-logDONATION_PAYMENT_CREATE=Donation payment created
-logDONATION_PAYMENT_DELETE=Donation payment logical deletion
-logBILL_PAYED=Customer invoice paid
-logBILL_UNPAYED=Customer invoice set unpaid
-logBILL_VALIDATE=Customer invoice validated
-logBILL_SENTBYMAIL=Customer invoice send by mail
-logBILL_DELETE=Customer invoice logically deleted
-logMODULE_RESET=Module BlockedLog was disabled
-logMODULE_SET=Module BlockedLog was enabled
-logDON_VALIDATE=Donation validated
-logDON_MODIFY=Donation modified
-logDON_DELETE=Donation logical deletion
-logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
-logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
-logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
-BlockedLogBillDownload=Customer invoice download
-BlockedLogBillPreview=Customer invoice preview
-BlockedlogInfoDialog=Log Details
-ListOfTrackedEvents=List of tracked events
-Fingerprint=Fingerprint
-DownloadLogCSV=Export archived logs (CSV)
-logDOC_PREVIEW=Preview of a validated document in order to print or download
-logDOC_DOWNLOAD=Download of a validated document in order to print or send
-DataOfArchivedEvent=Full datas of archived event
-ImpossibleToReloadObject=Original object (type %s, id %s) not linked (see 'Full datas' column to get unalterable saved data)
-BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit.
-BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they cannot be validated by a tax audit.
-BlockedLogDisableNotAllowedForCountry=List of countries where usage of this module is mandatory (just to prevent to disable the module by error, if your country is in this list, disable of module is not possible without editing this list first. Note also that enabling/disabling this module will keep a track into the unalterable log).
-OnlyNonValid=Non-valid
-TooManyRecordToScanRestrictFilters=Too many records to scan/analyze. Please restrict list with more restrictive filters.
-RestrictYearToExport=Restrict month / year to export
+BlockedLogDesc=Este módulo rastrexa algúns eventos nun rexistro inalterable (que non pode ser modificado unha vez rexistrado) nunha cadea de bloques, en tempo real. Este módulo proporciona compatibilidade cos requisitos das lexislacións dalgúns países (como Franza coa lei Finanzas 2016 - Norma NF525).
+Fingerprints=Eventos arquivados e huellas dixitais.
+FingerprintsDesc=Esta é a ferramenta para navegar ou extraer os rexistros inalterables. Os rexistros inalterables son xerados e arquivados localmente nunha taboa adicada, en tempo real cando é rexistrado un evento de negocios. Pode utilizar esta ferramenta para exportar este ficheiro e gardarlo nun soporte externo (algúns países, como Franza, pidenlle que o faga todos os anos). Teña conta que non hai ningunha función para limpar este rexistro e que todos os cambios que tentara facer hacer directamente neste rexistro (por exemplo, un pirata informático) informanse cunha huella dixital non válida. Se realmente precisa purgar esta taboa porque fixo uso da sua aplicación para unha mostra / propósito de proba e desexa limpar os seus datos para comezar coa súa produción, pode solicitar ao seu revendedor ou integrador que reinicie a súa base de datos (serán eliminados todos os seus datos).
+CompanyInitialKey=Clave inicial da empresa (hash do bloque de xénesis)
+BrowseBlockedLog=Rexistros inalterables
+ShowAllFingerPrintsMightBeTooLong=Amosar todos os rexistros arquivados (pode ser longo)
+ShowAllFingerPrintsErrorsMightBeTooLong=Mostrar todos os rexistros de ficheiro no válidos (pode ser longo)
+DownloadBlockChain=Descargar pegadas dactilares
+KoCheckFingerprintValidity=A entrada de rexistro arquivada non é válida. Significa que alguén (¿un hacker?) Modificou algúns datos deste rexistro despois de gravalo ou borrou o rexistro anterior arquivado (comprobe que existe a liña co # anterior).
+OkCheckFingerprintValidity=O rexistro de rexistro arquivado é válido. Os datos desta liña non se modificaron e a entrada segue a anterior.
+OkCheckFingerprintValidityButChainIsKo=O rexistro arquivado parece válido en comparación co anterior, pero a cadea estaba corrompida anteriormente.
+AddedByAuthority=Almacenado na autoridade remota
+NotAddedByAuthorityYet=Aínda non almacenado na autoridade remota
+ShowDetails=Amosar detalles almacenados
+logPAYMENT_VARIOUS_CREATE=Creouse o pagamento (non asignado á factura)
+logPAYMENT_VARIOUS_MODIFY=Modificouse o pagamento (non asignado á factura)
+logPAYMENT_VARIOUS_DELETE=Eliminación lóxico do pagamento (non asignado a factura).
+logPAYMENT_ADD_TO_BANK=Pagamento engadido ao banco
+logPAYMENT_CUSTOMER_CREATE=Pagamento do cliente creado
+logPAYMENT_CUSTOMER_DELETE=Eliminación lóxica do pagamento do cliente
+logDONATION_PAYMENT_CREATE=Creado pagamento de doación/subvención
+logDONATION_PAYMENT_DELETE=Eliminación lóxica do pagamento da doación/subvención.
+logBILL_PAYED=Factura do cliente pagada
+logBILL_UNPAYED=Factura do cliente marcada como pendente de cobro
+logBILL_VALIDATE=Validada factura a cliente
+logBILL_SENTBYMAIL=Enviar factura a cliente por correo electrónico
+logBILL_DELETE=Factura do cliente borrada lóxicamente
+logMODULE_RESET=O módulo BlockedLog foi deshabilitado
+logMODULE_SET=O módulo BlockedLog foi habilitado
+logDON_VALIDATE=Doación/Subvención validada
+logDON_MODIFY=Doación/subvención modificada
+logDON_DELETE=Eliminación lóxica da doación/subvención.
+logMEMBER_SUBSCRIPTION_CREATE=Creada subscrición de membro
+logMEMBER_SUBSCRIPTION_MODIFY=Modificada Subscrición de membro
+logMEMBER_SUBSCRIPTION_DELETE=Eliminación lóxica de subscrición de membro
+logCASHCONTROL_VALIDATE=Rexistro de peche de caixa
+BlockedLogBillDownload=Descarga da factura de cliente
+BlockedLogBillPreview=Vista previa da factura do cliente
+BlockedlogInfoDialog=Detalles do rexistro
+ListOfTrackedEvents=Listaxe de eventos seguidos
+Fingerprint=Pegada dactilar
+DownloadLogCSV=Exportar rexistros arquivados (CSV)
+logDOC_PREVIEW=Vista previa dun documento validado para imprimir ou descargar
+logDOC_DOWNLOAD=Descarga dun documento validado para imprimir ou enviar.
+DataOfArchivedEvent=Datos completos do evento arquivado.
+ImpossibleToReloadObject=O obxecto orixinal (tipo %s, id %s) non ligado (ver a columna "Datos completos" para obter datos gardados inalterables)
+BlockedLogAreRequiredByYourCountryLegislation=A lexislación do seu país pode requirir o módulo de rexistros inalterables. A desactivación deste módulo pode facer que calquera transacción futura sexa inválida con respecto á lei e ao uso de software legal xa que non poden ser validadas por unha auditoría fiscal.
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=O módulo de Rexistros inalterables activouse por mor da lexislación do seu país. A desactivación deste módulo pode facer que as transaccións futuras sexan inválidas con respecto á lei e ao uso de software legal, xa que non poden ser validadas por unha auditoría fiscal.
+BlockedLogDisableNotAllowedForCountry=Listaxe de países onde o uso deste módulo é obrigatorio (só para evitar desactivar o módulo por erro, se o seu país está nesta lista, a desactivación do módulo non é posible sen editar esta lista antes. Teña conta tamén que habilitar/desactivar este módulo manterá unha pista no rexistro inalterable).
+OnlyNonValid=Non válido
+TooManyRecordToScanRestrictFilters=Demasiados rexistros para escanear/analizar. Prégase restrinxa a listaxe con filtros mais restrictivos.
+RestrictYearToExport=Restrinxir mes/ano para exportar
diff --git a/htdocs/langs/gl_ES/boxes.lang b/htdocs/langs/gl_ES/boxes.lang
index 1ae5652b2a9..714a790e0a8 100644
--- a/htdocs/langs/gl_ES/boxes.lang
+++ b/htdocs/langs/gl_ES/boxes.lang
@@ -37,18 +37,21 @@ BoxTitleOldestUnpaidSupplierBills=Facturas Provedores: últimas %s pendentes de
 BoxTitleCurrentAccounts=Contas abertas: balance
 BoxTitleSupplierOrdersAwaitingReception=Pedimentos de provedores agardando recepción
 BoxTitleLastModifiedContacts=Contactos/Enderezos: Últimos %s modificados
-BoxMyLastBookmarks=Bookmarks: latest %s
+BoxMyLastBookmarks=Marcadores: últimos %s
 BoxOldestExpiredServices=Servizos antigos expirados
 BoxLastExpiredServices=Últimos %s contratos mais antigos con servizos expirados
 BoxTitleLastActionsToDo=Últimas %s accións a realizar
 BoxTitleLastContracts=Últimos %s contratos modificados
 BoxTitleLastModifiedDonations=Últimas %s doacións/subvencións modificadas
 BoxTitleLastModifiedExpenses=Últimos %s informes de gastos modificados
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLatestModifiedBoms=Últimos %s MRP modificados
+BoxTitleLatestModifiedMos=Últimos %s ordes de fabricación modificadas
+BoxTitleLastOutstandingBillReached=Superouse o máximo de clientes  con pendente
 BoxGlobalActivity=Actividade global (facturas, orzamentos, ordes)
 BoxGoodCustomers=Bos clientes
 BoxTitleGoodCustomers=%s Bos clientes
+BoxScheduledJobs=Tarefas programadas
+BoxTitleFunnelOfProspection=Embudo de clientes
 FailedToRefreshDataInfoNotUpToDate=Erro ao actualizar o RSS. Último refresco correcto na data: %s
 LastRefreshDate=Última data de refresco
 NoRecordedBookmarks=Non hai marcadores definidos
@@ -83,8 +86,8 @@ BoxTitleLatestModifiedSupplierOrders=Pedimentos Provedor: últimos %s modificado
 BoxTitleLastModifiedCustomerBills=Facturas Clientes: últimas %s modificadas
 BoxTitleLastModifiedCustomerOrders=Pedimentos Clientes: últimos %s pedimentos modificados
 BoxTitleLastModifiedPropals=Últimos %s orzamentos modificados
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Últimos %s traballos modificados
+BoxTitleLatestModifiedCandidatures=Últimas %s candidaturas modificadas
 ForCustomersInvoices=Facturas a clientes
 ForCustomersOrders=Pedimentos de clientes
 ForProposals=Orzamentos
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Conta en suspenso non está definida
 BoxLastCustomerShipments=Últimos envios a clientes
 BoxTitleLastCustomerShipments=Últimos %s envíos a clientes
 NoRecordedShipments=Ningún envío a cliente rexistrado
+BoxCustomersOutstandingBillReached=Alcanzáronse os clientes cun límite pendente
 # Pages
 AccountancyHome=Contabilidade
+ValidatedProjects=Proxectos validados
diff --git a/htdocs/langs/gl_ES/cashdesk.lang b/htdocs/langs/gl_ES/cashdesk.lang
index 0926360b26f..318445e1d3d 100644
--- a/htdocs/langs/gl_ES/cashdesk.lang
+++ b/htdocs/langs/gl_ES/cashdesk.lang
@@ -50,7 +50,7 @@ AmountAtEndOfPeriod=Importe ao final do período (día, mes ou ano)
 TheoricalAmount=Importe teórico
 RealAmount=Importe real
 CashFence=Peche de caixa
-CashFenceDone=Peche de caixa realizado para o período.
+CashFenceDone=Peche de caixa realizado para o período
 NbOfInvoices=Nº de facturas
 Paymentnumpad=Tipo de Pad para introducir o pago.
 Numberspad=Teclado numérico
@@ -62,7 +62,7 @@ CashDeskBankAccountFor=Conta por defecto a usar para cobros en
 NoPaimementModesDefined=Non existe modo de pago definido na configuración de TakePOS
 TicketVatGrouped=Agrupar por tipo de IVE nos tickets
 AutoPrintTickets=Imprimir tickets automáticamente
-PrintCustomerOnReceipts=Print customer on tickets|receipts
+PrintCustomerOnReceipts=Imprimir a cliente tickets/recibos
 EnableBarOrRestaurantFeatures=Habilitar características para Bar ou Restaurante
 ConfirmDeletionOfThisPOSSale=¿Está certo de querer eliminar a venda actual?
 ConfirmDiscardOfThisPOSSale=¿Queres descartar a venda actual??
@@ -77,48 +77,50 @@ POSModule=POS Modulo
 BasicPhoneLayout=Utilizar deseño básico para teléfonos.
 SetupOfTerminalNotComplete=Configuración da terminal %s non está finalizada
 DirectPayment=Pago directo
-DirectPaymentButton=Add a "Direct cash payment" button
+DirectPaymentButton=Engadir un botón "Pago en efectivo"
 InvoiceIsAlreadyValidated=A factura xa foi validada
 NoLinesToBill=Sen liñas a facturar
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
 ProductSupplements=Product Supplements
 SupplementCategory=Supplement category
-ColorTheme=Color theme
-Colorful=Colorful
-HeadBar=Head Bar
-SortProductField=Field for sorting products
+ColorTheme=Cor do tema
+Colorful=Colorido
+HeadBar=Barra na cabeceira
+SortProductField=Campo de clasificación de produtos
 Browser=Navegador
-BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
-TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
-PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
-ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
-CashDeskRefNumberingModules=Numbering module for POS sales
-CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
-TakeposGroupSameProduct=Group same products lines
-StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
-CashReport=Cash report
-MainPrinterToUse=Main printer to use
-OrderPrinterToUse=Order printer to use
-MainTemplateToUse=Main template to use
-OrderTemplateToUse=Order template to use
-BarRestaurant=Bar Restaurant
-AutoOrder=Order by the customer himself
+BrowserMethodDescription=Impresión de recibos sinxela e doada. Só algúns parámetros para configurar o recibo. Imprimir mediante navegador.
+TakeposConnectorMethodDescription=Módulo externo con funcións adicionais. Posibilidade de imprimir desde a nube.
+PrintMethod=Método de impresión
+ReceiptPrinterMethodDescription=Método potente con moitos parámetros. Completamente personalizable con modelos. Non se pode imprimir desde a nube.
+ByTerminal=Por terminal
+TakeposNumpadUsePaymentIcon=Usar a icona no canto do texto, nos botóns de pago do teclado numérico
+CashDeskRefNumberingModules=Módulo de numeración para vendas de TPV
+CashDeskGenericMaskCodes6 = A etiqueta <br><b>(TN)</b> é usada para engadir o número de terminal
+TakeposGroupSameProduct=Agrupa as mesmas liñas de produtos
+StartAParallelSale=Comeza unha nova venda en paralelo
+SaleStartedAt=A venda comezou en %s
+ControlCashOpening=Aviso emerxente do efectivo ao abris o TPV
+CloseCashFence=Controlar peche de caixa
+CashReport=Informe de caixa
+MainPrinterToUse=Impresora principal a usar
+OrderPrinterToUse=Solicitar que impresora usar
+MainTemplateToUse=Modelo principal a usar
+OrderTemplateToUse=Modelo de pedido a usar
+BarRestaurant=Bar Restaurante
+AutoOrder=Pedido do propio cliente
 RestaurantMenu=Menu
-CustomerMenu=Customer menu
-ScanToMenu=Scan QR code to see the menu
-ScanToOrder=Scan QR code to order
-Appearance=Appearance
-HideCategoryImages=Hide Category Images
-HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines of images to show
-DefineTablePlan=Define tables plan
-GiftReceiptButton=Add a "Gift receipt" button
-GiftReceipt=Gift receipt
-ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
-AllowDelayedPayment=Allow delayed payment
-PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+CustomerMenu=Menú do cliente
+ScanToMenu=Escanear o código QR para ver o menú
+ScanToOrder=Escanear o código QR para pedir
+Appearance=Apariencia
+HideCategoryImages=Ocultar imaxes de categoría
+HideProductImages=Ocultar imaxes do produto
+NumberOfLinesToShow=Número de liñas de imaxes a amosar
+DefineTablePlan=Definir o plan de mesas
+GiftReceiptButton=Engadir un botón "Recibo agasallo"
+GiftReceipt=Recibo agasallo
+ModuleReceiptPrinterMustBeEnabled=A impresora de recibos do módulo debe estar habilitada primeiro
+AllowDelayedPayment=Permitir o pago en débeda
+PrintPaymentMethodOnReceipts=Imprimir método de pago en tickets/recibos
+WeighingScale=Pesaxe
diff --git a/htdocs/langs/gl_ES/categories.lang b/htdocs/langs/gl_ES/categories.lang
index 2aa1b892b01..106d55b60f5 100644
--- a/htdocs/langs/gl_ES/categories.lang
+++ b/htdocs/langs/gl_ES/categories.lang
@@ -1,92 +1,99 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=Tag/Category
+Rubrique=Etiqueta/Categoría
 Rubriques=Etiquetas/Categorías
-RubriquesTransactions=Tags/Categories of transactions
-categories=tags/categories
-NoCategoryYet=No tag/category of this type created
-In=In
-AddIn=Add in
-modify=modify
-Classify=Classify
-CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
-SubCats=Sub-categories
-CatList=List of tags/categories
-NewCategory=New tag/category
-ModifCat=Modify tag/category
-CatCreated=Tag/category created
-CreateCat=Create tag/category
-CreateThisCat=Create this tag/category
-NoSubCat=No subcategory.
-SubCatOf=Subcategory
-FoundCats=Found tags/categories
-ImpossibleAddCat=Impossible to add the tag/category %s
-WasAddedSuccessfully=<b>%s</b> was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-ProductIsInCategories=Product/service is linked to following tags/categories
-CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party is linked to following vendors tags/categories
-MemberIsInCategories=This member is linked to following members tags/categories
-ContactIsInCategories=This contact is linked to following contacts tags/categories
-ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This third party is not in any tags/categories
-MemberHasNoCategory=This member is not in any tags/categories
-ContactHasNoCategory=This contact is not in any tags/categories
-ProjectHasNoCategory=This project is not in any tags/categories
-ClassifyInCategory=Add to tag/category
-NotCategorized=Without tag/category
-CategoryExistsAtSameLevel=This category already exists with this ref
-ContentsVisibleByAllShort=Contents visible by all
-ContentsNotVisibleByAllShort=Contents not visible by all
-DeleteCategory=Delete tag/category
-ConfirmDeleteCategory=Are you sure you want to delete this tag/category?
-NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Vendors tag/category
-CustomersCategoryShort=Customers tag/category
-ProductsCategoryShort=Products tag/category
-MembersCategoryShort=Members tag/category
-SuppliersCategoriesShort=Vendors tags/categories
-CustomersCategoriesShort=Customers tags/categories
-ProspectsCategoriesShort=Prospects tags/categories
-CustomersProspectsCategoriesShort=Cust./Prosp. tags/categories
-ProductsCategoriesShort=Products tags/categories
-MembersCategoriesShort=Members tags/categories
-ContactCategoriesShort=Contacts tags/categories
-AccountsCategoriesShort=Accounts tags/categories
-ProjectsCategoriesShort=Projects tags/categories
-UsersCategoriesShort=Users tags/categories
-StockCategoriesShort=Warehouse tags/categories
-ThisCategoryHasNoItems=This category does not contain any items.
-CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
-CatProdList=List of products tags/categories
-CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
-CatCusLinks=Links between customers/prospects and tags/categories
-CatContactsLinks=Links between contacts/addresses and tags/categories
-CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
-DeleteFromCat=Remove from tags/category
+RubriquesTransactions=Etiquetas/Categorías de transaccións
+categories=etiquetas/categorias
+NoCategoryYet=Ningunha etiqueta/categoría deste tipo creada
+In=En
+AddIn=Engadir en
+modify=modificar
+Classify=Clasificar
+CategoriesArea=Área Etiquetas/Categorías
+ProductsCategoriesArea=Área etiquetas/categorías Produtos/Servizos
+SuppliersCategoriesArea=Área etiquetas/categorías Provedores
+CustomersCategoriesArea=Área etiquetas/categorías Clientes
+MembersCategoriesArea=Área etiquetas/categorías Membros
+ContactsCategoriesArea=Área etiquetas/categorías de contactos
+AccountsCategoriesArea=Área etiquetas/categorías contables
+ProjectsCategoriesArea=Área etiquetas/categorías Proxectos
+UsersCategoriesArea=Área etiquetas/categorías Usuarios
+SubCats=Subcategorías
+CatList=Listaxe de etiquetas/categorías
+CatListAll=Listaxe de etiquetas/categorías (todos os tipos)
+NewCategory=Nova etiqueta/categoría
+ModifCat=Modificar etiqueta/categoría
+CatCreated=Etiqueta/categoría creada
+CreateCat=Crear etiqueta/categoría
+CreateThisCat=Crear esta etiqueta/categoría
+NoSubCat=Esta categoría non contén ningunha subcategoría.
+SubCatOf=Subcategoría
+FoundCats=Atopadas etiquetas/categorías
+ImpossibleAddCat=Imposible engadir á etiqueta/categoría %s
+WasAddedSuccessfully=<b>%s</b> foi engadida con éxito
+ObjectAlreadyLinkedToCategory=O elemento xa está ligado a esta etiqueta/categoría
+ProductIsInCategories=Produto/Servizo está ligado as seguintes etiquetas/categorías
+CompanyIsInCustomersCategories=Este terceiro está ligado nas seguintes etiquetas/categorías de clientes/clientes potenciais
+CompanyIsInSuppliersCategories=Este terceiro está ligado ás seguintes etiquetas/categorías de provedores
+MemberIsInCategories=Este membro está ligado ás seguintes etiquetas/categorías
+ContactIsInCategories=Este contacto está ligado ás seguintes etiquetas/categorías de contactos
+ProductHasNoCategory=Este produto/servizo non atópase en ningunha etiqueta/categoría
+CompanyHasNoCategory=Este terceiro non atópase en ningunha etiqueta/categoría
+MemberHasNoCategory=Este membro non atópase en ningunha etiqueta/categoría
+ContactHasNoCategory=Este contacto non atópase en ningunha etiqueta/categoría
+ProjectHasNoCategory=Este proxecto non atópase en ningunha etiqueta/categoría
+ClassifyInCategory=Engadir a unha etiqueta/categoría
+NotCategorized=Sen etiqueta/categoría
+CategoryExistsAtSameLevel=Esta categoría xa existe para esta referencia
+ContentsVisibleByAllShort=Contido visible por todos
+ContentsNotVisibleByAllShort=Contido non visible por todos
+DeleteCategory=Eliminar etiqueta/categoría
+ConfirmDeleteCategory=¿Está certo de querer eliminar esta etiqueta/categoría?
+NoCategoriesDefined=Ningunha etiqueta/categoría definida
+SuppliersCategoryShort=Etiqueta/categoría Provedores
+CustomersCategoryShort=Etiqueta/categoría Clientes
+ProductsCategoryShort=Etiqueta/categoría Produtos
+MembersCategoryShort=Etiqueta/categoría Membros
+SuppliersCategoriesShort=Etiquetas/categorías Provedores
+CustomersCategoriesShort=Etiquetas/categorías Clientes
+ProspectsCategoriesShort=Etiquetas/categorías Clientes Potenciais
+CustomersProspectsCategoriesShort=Etiquetas/categorías Clientes/Clientes Potenciais
+ProductsCategoriesShort=Etiquetas/categorías Produtos
+MembersCategoriesShort=Etiquetas/categorías Membros
+ContactCategoriesShort=Etiquetas/categorías Contactos
+AccountsCategoriesShort=Etiquetas/categorías Contabilidade
+ProjectsCategoriesShort=Etiquetas/categorías Proxectos
+UsersCategoriesShort=Etiquetas/categorías Usuarios
+StockCategoriesShort=Etiquetas/categorías Almacéns
+ThisCategoryHasNoItems=Esta categoría non contén ningún elemento
+CategId=Id de etiqueta/categoría
+ParentCategory=Etiqueta/categoría pai
+ParentCategoryLabel=Selo de pai /etiqueta/categoría
+CatSupList=Listaxe de etiquetas/categorías de provedores
+CatCusList=Listaxe de etiquetas/categorías de clientes/clientes potenciais
+CatProdList=Listaxe de etiquetas/categorías de produtos
+CatMemberList=Listaxe de etiquetas/categorías de membros
+CatContactList=Listaxe de etiquetas/categorías de contactos
+CatProjectsList=Listaxe de etiquetas/categorías de proxectos
+CatUsersList=Listaxe de etiquetas/categorías de usuarios
+CatSupLinks=Ligazóns entre provedores e etiquetas/categorías
+CatCusLinks=Ligazóns entre clientes/clientes potenciais e etiquetas/categorías
+CatContactsLinks=Ligazóns entre contactos/enderezos e etiquetas/categorías
+CatProdLinks=Ligazóns entre produtos/servizos e etiquetas/categorías
+CatMembersLinks=Ligazóns entre membros e etiquetas/categorías
+CatProjectsLinks=Ligazóns entre proxectos e etiquetas/categorías
+CatUsersLinks=Ligazóns entre usuarios e etiquetas/categorías
+DeleteFromCat=Eliminar de etiquetas/categorías
 ExtraFieldsCategories=Campos adicionais
-CategoriesSetup=Tags/categories setup
-CategorieRecursiv=Link with parent tag/category automatically
-CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
-AddProductServiceIntoCategory=Add the following product/service
-AddCustomerIntoCategory=Assign category to customer
-AddSupplierIntoCategory=Assign category to supplier
-ShowCategory=Show tag/category
-ByDefaultInList=By default in list
-ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
-WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+CategoriesSetup=Configuración de etiquetas/categorías
+CategorieRecursiv=Ligar co pai etiqueta/categoría automáticamente
+CategorieRecursivHelp=Se está activado, cando engade un produto nunha subcategoría o produto será ligado á categoría pai.
+AddProductServiceIntoCategory=Engadir o seguinte produto/servizo
+AddCustomerIntoCategory=Asignar categoría ao cliente
+AddSupplierIntoCategory=Asignar categoría ao provedor
+ShowCategory=Amosar etiqueta/categoría
+ByDefaultInList=Por defecto na listaxe
+ChooseCategory=Escoller categoría
+StocksCategoriesArea=Categorías de almacéns
+ActionCommCategoriesArea=Categorías de eventos
+WebsitePagesCategoriesArea=Categorías de contedores de páxina
+UseOrOperatorForCategories=Uso ou operador para categorías
diff --git a/htdocs/langs/gl_ES/companies.lang b/htdocs/langs/gl_ES/companies.lang
index fa0e5afee91..a866f64cb9c 100644
--- a/htdocs/langs/gl_ES/companies.lang
+++ b/htdocs/langs/gl_ES/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Id Prof 1 (USt.-IdNr)
 ProfId2AT=Id Prof 2 (USt.-Nr)
 ProfId3AT=Id Prof 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=Número EORI number
 ProfId6AT=-
 ProfId1AU=Id Prof 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Id Prof 1 (Número de colexiado)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=Número EORI
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscrición Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscrición Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=UID-Nummer
+ProfId1CH=UID-Número
 ProfId2CH=-
 ProfId3CH=Id Prof 1 (Número federal)
 ProfId4CH=Id Prof 2 (Número de rexistro comercial)
-ProfId5CH=EORI number
+ProfId5CH=EORI número
 ProfId6CH=-
 ProfId1CL=Id Prof 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Id prof. 1 (USt.-IdNr)
 ProfId2DE=Id prof. 2 (USt.-Nr)
 ProfId3DE=Id prof. 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=Número EORI
 ProfId6DE=-
-ProfId1ES=CIF/NIF
-ProfId2ES=Número Seguridade Social
-ProfId3ES=CNAE
-ProfId4ES=Número de colexiado
-ProfId5ES=EORI number
+ProfId1ES=Id Prof. 1  (CIF/NIF)
+ProfId2ES=Id Prof. 2 (Número Seguridade Social)
+ProfId3ES=Id Prof 3 (CNAE)
+ProfId4ES=Id Prof 4 (Número de colexiado)
+ProfId5ES=Número EORI
 ProfId6ES=-
 ProfId1FR=Id Prof 1 (SIREN)
 ProfId2FR=Id Prof 2 (SIRET)
 ProfId3FR=Id Prof 3 (NAF, antigo APE)
 ProfId4FR=Id Prof 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Número EORI
 ProfId6FR=-
 ProfId1GB=Número rexistro
 ProfId2GB=-
@@ -202,12 +202,12 @@ ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=Número EORI
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Negocios permitidos)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=Número EORI
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
@@ -225,13 +225,13 @@ ProfId1NL=Número KVK
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL=EORI number
+ProfId5NL=Número EORI
 ProfId6NL=-
-ProfId1PT=NIPC
-ProfId2PT=Número segurança social
-ProfId3PT=Número rexistro comercial
-ProfId4PT=Conservatorio
-ProfId5PT=EORI number
+ProfId1PT=Id Prof 1 (NIPC)
+ProfId2PT=Id Prof. 2 (Número segurança social)
+ProfId3PT=Id Prof. 3 (Número rexistro comercial)
+ProfId4PT=Id Prof 4 (Conservatorio)
+ProfId5PT=Número EORI
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +255,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Número EORI
 ProfId6RO=-
 ProfId1RU=Id prof. 1 (OGRN)
 ProfId2RU=Id prof. 2 (INN)
@@ -302,7 +302,7 @@ AddContact=Crear contacto
 AddContactAddress=Crear contacto/enderezo
 EditContact=Editar contacto
 EditContactAddress=Editar contacto/enderezo
-Contact=Contacto
+Contact=Contacto/Enderezo
 Contacts=Contactos/Enderezos
 ContactId=Id contacto
 ContactsAddresses=Contactos/Enderezos
@@ -358,8 +358,8 @@ VATIntraCheckableOnEUSite=Verificar o CIF/NIF intracomunitario na web da Comisi
 VATIntraManualCheck=Pode tamén verificar manualmente na web da Comisión Europea <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Comprobación imposible. O servizo de comprobación non é fornecido polo Estado membro (%s).
 NorProspectNorCustomer=Nin cliente, nin cliente potencial
-JuridicalStatus=Forma xurídica
-Workforce=Workforce
+JuridicalStatus=Tipo de entidade xurídica
+Workforce=TRaballadores
 Staff=Empregados
 ProspectLevelShort=Potencial
 ProspectLevel=Cliente potencial
@@ -413,7 +413,7 @@ AddAddress=Engadir enderezo
 SupplierCategory=Categoría de provedor
 JuridicalStatus200=Independente
 DeleteFile=Eliminación dun arquivo
-ConfirmDeleteFile=¿Está certo de querer eliminar este arquivo?
+ConfirmDeleteFile=¿Está certo de querer eliminar este ficheiro?
 AllocateCommercial=Asignado a comercial
 Organization=Organización
 FiscalYearInformation=Ano fiscal
@@ -426,7 +426,7 @@ SocialNetworksInstagramURL=Instagram URL
 SocialNetworksYoutubeURL=Youtube URL
 SocialNetworksGithubURL=Github URL
 YouMustAssignUserMailFirst=Primeiro tes que asignar un e-mail para este usuario para poder engadilo en notificaciónss de e-mail.
-YouMustCreateContactFirst=Para poder engadir notificaciones por e-mail, primeiro tes que definir contactos con e-mails válidos para terceiros
+YouMustCreateContactFirst=Para poder engadir notificacións por e-mail, primeiro hai que definir contactos con e-mails válidos para terceiros
 ListSuppliersShort=Listaxe de provedores
 ListProspectsShort=Listaxe de clientes potenciais
 ListCustomersShort=Listaxe de clientes
@@ -462,8 +462,8 @@ PaymentTermsSupplier=Termos de pagamento - Provedor
 PaymentTypeBoth=Tipo de pagamento - Cliente e Provedor
 MulticurrencyUsed=Usa MultiMoeda
 MulticurrencyCurrency=Moeda
-InEEC=Europe (EEC)
-RestOfEurope=Rest of Europe (EEC)
-OutOfEurope=Out of Europe (EEC)
-CurrentOutstandingBillLate=Current outstanding bill late
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
+InEEC=Europa (EEC)
+RestOfEurope=Resto de Europa (EEC)
+OutOfEurope=Fora de Europa (EEC)
+CurrentOutstandingBillLate=Factura actual pendente atrasada
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Ter coidado, dependendo da configuración do prezo do produto, debería mudarse o terceiro antes de engadir o produto ao TPV.
diff --git a/htdocs/langs/gl_ES/compta.lang b/htdocs/langs/gl_ES/compta.lang
index 872ffd25c6e..1506922c0b4 100644
--- a/htdocs/langs/gl_ES/compta.lang
+++ b/htdocs/langs/gl_ES/compta.lang
@@ -1,20 +1,20 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Billing | Payment
-TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
-TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
-OptionMode=Option for accountancy
-OptionModeTrue=Option Incomes-Expenses
-OptionModeVirtual=Option Claims-Debts
-OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). The validity of the figures is assured only if the book-keeping is scrutinized through the input/output on the accounts via invoices.
-OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output.
-FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration)
-VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup.
-LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
-Param=Config.
-RemainingAmountPayment=Amount payment remaining:
+MenuFinancial=Financieira
+TaxModuleSetupToModifyRules=Ir á <a href="%s">configuración do módulo de impostos</a> para modificar as regras de cálculo
+TaxModuleSetupToModifyRulesLT=Ir á <a href="%s">configuración da Empresa</a> para modificar as regras de cálculo
+OptionMode=Opción de contabilidade
+OptionModeTrue=Opción Ingresos-Gastos
+OptionModeVirtual=Opción Créditos-Débedas
+OptionModeTrueDesc=Neste contexto, o volume de negocio calcúlase sobre pagamentos (data dos pagamentos). A validez das cifras só se asegura se se analiza a contabilidade a través da entrada/saída das contas mediante facturas.
+OptionModeVirtualDesc=Neste contexto, o volume de negocio calcúlase sobre facturas (data de validación). Cando se paguen estas facturas, xa sexan pagadas ou non, aparecen na saída do volume de negocio.
+FeatureIsSupportedInInOutModeOnly=Función só dispoñible no modo de contabilidade DEBEDAS DE CRÉDITOS (Ver configuración do módulo de contabilidade)
+VATReportBuildWithOptionDefinedInModule=As cantidades que se amosan aquí calcúlanse empregando regras definidas pola configuración do módulo Tributario.
+LTReportBuildWithOptionDefinedInModule=As cantidades que se amosan aquí calcúlanse empregando regras definidas pola configuración da empresa.
+Param=Configuración.
+RemainingAmountPayment=Pagamento da cantidade restante:
 Account=Conta
-Accountparent=Conta pai
-Accountsparent=Contas pai
+Accountparent=Conta principal
+Accountsparent=Contas principais
 Income=Ingresos
 Outcome=Gastos
 MenuReportInOut=Ingresos / Gastos
@@ -30,34 +30,34 @@ Balance=Saldo
 Debit=Debe
 Credit=Haber
 Piece=Doc. contabilidade
-AmountHTVATRealReceived=Total repercutido
-AmountHTVATRealPaid=Total xa pago
+AmountHTVATRealReceived=Neto repercutido
+AmountHTVATRealPaid=Neto xa pago
 VATToPay=Vendas IVE
 VATReceived=IVE repercutido
 VATToCollect=IVE compras
 VATSummary=Balance de IVE mensual
 VATBalance=Balance de IVE
-VATPaid=Pagamento de IVE
-LT1Summary=Resumo RE
-LT2Summary=Resumo de IRPF
+VATPaid=IVE pagado
+LT1Summary=Resumo do imposto 2 RE
+LT2Summary=Resumo do imposto 3 IRPF
 LT1SummaryES=Balance de RE
 LT2SummaryES=Balance de IRPF
 LT1SummaryIN=Balance CGST
 LT2SummaryIN=Balance SGST
-LT1Paid=Pagamentos de IRPF
-LT2Paid=Pagamentos de IRPF
+LT1Paid=Imposto 2 xa pago RE
+LT2Paid=Imposto 3 xa pago IRPF
 LT1PaidES=RE xa pago
 LT2PaidES=IRPF xa pago
 LT1PaidIN=xa pago CGST
 LT2PaidIN=xa pago SGST
-LT1Customer=Vendas RE
-LT1Supplier=Compras RE
+LT1Customer=Imposto 2 vendas RE
+LT1Supplier=Imposto 2 compras RE
 LT1CustomerES=Vendas RE
 LT1SupplierES=Compras RE
 LT1CustomerIN=Vendas CGST
 LT1SupplierIN=Compras CGST
-LT2Customer=Vendas IRPF
-LT2Supplier=Compras IRPF
+LT2Customer=Imposto 3 vendas IRPF
+LT2Supplier=Imposto 3 compras IRPF
 LT2CustomerES=IRPF vendas
 LT2SupplierES=IRPF compras
 LT2CustomerIN=Vendas SGST
@@ -69,7 +69,7 @@ SocialContribution=Impostos sociais ou fiscais
 SocialContributions=Impostos sociais ou fiscais
 SocialContributionsDeductibles=Impostos sociais ou fiscais deducibles
 SocialContributionsNondeductibles=Impostos sociais ou fiscais non deducibles
-DateOfSocialContribution=Date of social or fiscal tax
+DateOfSocialContribution=Data do imposto social ou fiscal
 LabelContrib=Etiqueta de contribución
 TypeContrib=Tipo de contribución
 MenuSpecialExpenses=Pagamentos especiais
@@ -90,12 +90,12 @@ ListOfCustomerPayments=Listaxe de pagamentos de clientes
 ListOfSupplierPayments=Listaxe de pagamentos a provedores
 DateStartPeriod=Data inicio período
 DateEndPeriod=Data final período
-newLT1Payment=Novo pagamento de RE
-newLT2Payment=Novo pagamento de IRPF
-LT1Payment=Pagamento de RE
-LT1Payments=Pagamentos RE
-LT2Payment=Pagamento de IRPF
-LT2Payments=Pagamentos IRPF
+newLT1Payment=Novo pagamento taxa 2 RE
+newLT2Payment=Novo pagamento taxa 3 IRPF
+LT1Payment=Pagamento taxa 2 RE
+LT1Payments=Pagamentos taxa 2 RE
+LT2Payment=Pagamento taxa 3 IRPF
+LT2Payments=Pagamentos taxa 3 IRPF
 newLT1PaymentES=Novo pagamento de RE
 newLT2PaymentES=Novo pagamento de IRPF
 LT1PaymentES=Pagamento de RE
@@ -111,7 +111,7 @@ Refund=Reembolso
 SocialContributionsPayments=Pagamentos de taxas sociais/fiscais
 ShowVatPayment=Consultar pagamentos de IVE
 TotalToPay=Total a pagar
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=O saldo é visible nesta lista só se a táboa está ordenada en %s e filtrada nunha conta bancaria (sen outros filtros)
 CustomerAccountancyCode=Código contable cliente
 SupplierAccountancyCode=Código contable provedor
 CustomerAccountancyCodeShort=Cód. conta cliente
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=¿Está certo de querer eliminar este pagamento
 ExportDataset_tax_1=taxas sociais e fiscais e pagamentos
 CalcModeVATDebt=Modo <b>%sIVE sobre facturas emitidas%s</b>.
 CalcModeVATEngagement=Modo <b>%sIVE sobre facturas cobradas%s</b>.
-CalcModeDebt=Análise de facturas rexistradas incluidas as aínda non contabilizadas no Libro Maior.
+CalcModeDebt=Análise de documentos rexistrados coñecidos aínda que polo de agora non se contabilicen no Libro Maior.
 CalcModeEngagement=Análise dos pagamentos rexistrados, incluidos os aínda non contabilizados no Libro Maior.
 CalcModeBookkeeping=Análise dos datos rexistrados no Libro Maior
 CalcModeLT1= Modo <b>%sRE facturas a clientes - facturas de provedores%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Resumo anual do balance de ingresos e gastos
 AnnualByCompanies=Balance de ingresos e gastos, por grupos de conta predefinidos
 AnnualByCompaniesDueDebtMode=Balance de ingresos e gastos, desglosado por terceiros, en modo<b>%sCréditos-Débedas%s</b> coñecida como <b>contabilidade de compromiso</b>.
 AnnualByCompaniesInputOutputMode=Balance de ingresos e gastos, desglosado por terceiros, en modo <b>%sIngresos-Gastos%s</b> coñecido como <b>contabilidad de caixa</b>.
-SeeReportInInputOutputMode=Consulte %sanálise de pagamentos%s para obter un cálculo dos pagamentos efectuados, incluso se non foron contabilizados no Libro Maior.
-SeeReportInDueDebtMode=Consulte %sanálise de facturas %s para un cálculo baseado en facturas rexistradas coñecidas, incluso se aínda non foron contabilizadas no Libro Maior.
-SeeReportInBookkeepingMode=Consulte el <b>%sInforme de facturación%s</b> para realizar un cálculo na <b>Taboa Libro maior</b>
+SeeReportInInputOutputMode=Vexa  <b> %s  análise do dos pagos %s</b> para un cálculo baseado en <b> pagos rexistrados</b> realizados aínda que non se contabilicen no Libro Maior
+SeeReportInDueDebtMode=Vexa o <b>%s de análise de documentos gardados %s</b> para un cálculo baseado en coñecidos <b> documentos rexistrados</b> aínda que  non se contabilicen no Libro Maior
+SeeReportInBookkeepingMode=Vexa o <b>%s análise da táboa de libros de contabilidade %s</b> para un informe baseado na <b> táboa contable de Libro Maior</b>
 RulesAmountWithTaxIncluded=- Os importes amosados son con todos os impostos incluidos.
 RulesResultDue=- Incluidas as facturas pendentes, os gastos, o IVE,  as doacións pagadas ou non. También inclúe os salarios xa pagos.<br>- Baseado na data da validación das facturas e IVE e na data de vencemento ds gastos. Para os salarios definidos co módulo de Salarios, é usada a data de valor do pagamento.
 RulesResultInOut=- Inclúe os pagamentos realizados sobre as facturas, os gastos e o IVE. <br>- Basado nas datas de pagamento das facturas, gastos e IVE. A data de doación para as doacións
@@ -169,37 +169,40 @@ RulesResultBookkeepingPersonalized=Amosa un rexistro no Libro Maior con contas c
 SeePageForSetup=Vexa o menú <a href="%s">%s</a> para configuralo
 DepositsAreNotIncluded=- As facturas de anticipo non están incluidas
 DepositsAreIncluded=- As facturas de anticipo están incluidas
-LT1ReportByCustomers=Informe por terceiro do RE
-LT2ReportByCustomers=Informe por terceiro do IRPF
+LT1ReportByMonth=Taxa 2 informe por mes
+LT2ReportByMonth=Taxa 3 informe por mes
+LT1ReportByCustomers=Informe do imposto 2 RE por terceiro
+LT2ReportByCustomers=Informe do imposto 3 IRPF por terceiro
 LT1ReportByCustomersES=Informe de RE por terceiro
 LT2ReportByCustomersES=Informe de IRPF por terceiro
 VATReport=Informe IVE
 VATReportByPeriods=Informe de IVE por período
+VATReportByMonth=Informe do imposto sobre a venda por mes
 VATReportByRates=Informe de impostos por taxa
 VATReportByThirdParties=Informe de impostos por terceiros
 VATReportByCustomers=Informe IVE por cliente
 VATReportByCustomersInInputOutputMode=Informe por cliente do IVE repercutido e soportado
 VATReportByQuartersInInputOutputMode=Informe por taxa do IVE repercutido e soportado
-LT1ReportByQuarters=Informe de IRPF por taxa
-LT2ReportByQuarters=Informe de IRPF por taxa
+LT1ReportByQuarters=Informe do imposto 2 IRPF por taxa
+LT2ReportByQuarters=Informe do imposto 3 IRPF por taxa
 LT1ReportByQuartersES=Informe de RE por taxa
 LT2ReportByQuartersES=Informe de IRPF por taxa
 SeeVATReportInInputOutputMode=Ver o informe <b>%sIVA pagado%s</b> para un modo de cálculo estandard
 SeeVATReportInDueDebtMode=Ver o informe <b>%sIVA debido%s</b> para un modo de cálculo coa opción sobre o debido
-RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
-RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
-OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+RulesVATInServices=- Para os servizos, o informe inclúe a normativa do IVE realmente recibida ou emitida en función da data do pagamento.
+RulesVATInProducts=- Para os activos materiais, o informe inclúe o IVE recibido ou emitido en función da data do pagamento.
+RulesVATDueServices=- Para os servizos, o informe inclúe facturas de IVE vencidas, pagadas ou non, en función da data da factura.
+RulesVATDueProducts=- Para os activos materiais, o informe inclúe as facturas do IVE, en función da data da factura.
+OptionVatInfoModuleComptabilite=Nota: para os activos materiais, debe usar a data de entrega para estar máis axustado
 ThisIsAnEstimatedValue=Esta é unha vista previa, basaeda en eventos de negocios e non na taboa de contabilidade final, polo que os resultados finais poden diferir destos valores de vista previa
 PercentOfInvoice=%%/factura
 NotUsedForGoods=Non utilizado para os bens
 ProposalStats=Estatísticas de orzamentos
 OrderStats=Estatísticas de pedidos
 InvoiceStats=Estatísticas de facturas
-Dispatch=Desglose
-Dispatched=Contabilizadas
-ToDispatch=A contabilizar
+Dispatch=Enviando
+Dispatched=Enviado
+ToDispatch=A enviar
 ThirdPartyMustBeEditAsCustomer=O terceiro debe estar definido como cliente
 SellsJournal=Diario de vendas
 PurchasesJournal=Diario de compras
@@ -214,35 +217,35 @@ Pcg_subtype=Subtipo de conta
 InvoiceLinesToDispatch=Líñas de facturas a contabilizar
 ByProductsAndServices=Por produtos e servizos
 RefExt=Ref. externa
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
-LinkedOrder=Vincular a pedido
-Mode1=Method 1
-Mode2=Method 2
-CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
-CalculationRuleDescSupplier=According to vendor, choose appropriate method to apply same calculation rule and get same result expected by your vendor.
-TurnoverPerProductInCommitmentAccountingNotRelevant=The report of Turnover collected per product is not available. This report is only available for turnover invoiced.
-TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The report of Turnover collected per sale tax rate is not available. This report is only available for turnover invoiced.
+ToCreateAPredefinedInvoice=Para crear unha factura modelo, cree unha factura estándar e, sen validala, prema nos botóns "%s".
+LinkedOrder=Ligar a pedido
+Mode1=Método 1
+Mode2=Método 2
+CalculationRuleDesc=Para calcular o IVE total, hai dous métodos: <br> O método 1 é redondear o IVE en cada liña e logo sumalos.<br>  O método 2 suma todos os IVE en cada liña e despois redondea o resultado.<br> O modo predeterminado é o modo <b>%s</b>
+CalculationRuleDescSupplier=Segundo o provedor, escolla o método axeitado para aplicar a mesma regra de cálculo e obter o mesmo resultado esperado polo seu provedor.
+TurnoverPerProductInCommitmentAccountingNotRelevant=O informe do volume de negocio recollido por produto non está dispoñible. Este informe só está dispoñible para o volume de negocio facturado.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=O informe do volume de negocio recadado por tipo de imposto sobre a venda non está dispoñible. Este informe só está dispoñible para o volume de negocio facturado.
 CalculationMode=Modo de cálculo
 AccountancyJournal=Código contable diario
 ACCOUNTING_VAT_SOLD_ACCOUNT=Conta contable por defecto para o IVE de vendas (usado se non é definido no diccionario de IVE)
 ACCOUNTING_VAT_BUY_ACCOUNT=Cuenta contable por defecto para o IVE de compras (usado se non é definido no diccionario de IVE)
 ACCOUNTING_VAT_PAY_ACCOUNT=Código contable por defecto para o pagamento de IVE
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
-ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accounting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
-ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
+ACCOUNTING_ACCOUNT_CUSTOMER=Código contable empregado para terceiros clientes
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=O código contable adicado definido na tarxeta de terceiros usarase só para a contabilidade ddo Sub Libro Maior. Este usarase para o Libro Maior e como valor predeterminado da contabilidade de Sub Libro Maior se non se define unha conta contable de cliente adicada a terceiros.
+ACCOUNTING_ACCOUNT_SUPPLIER=Código contable empregado por terceiros provedores
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=A conta de contabilidade adicada definida na tarxeta de terceiros usarase só para a contabilidade d a conta maior. Esta usarase para o libro maior e como valor predeterminado da contabilidade de maior se non se define unha conta de contas de provedores adicada a terceiros.
 ConfirmCloneTax=Confirmar a clonación dunha taxa social/fiscal
 CloneTaxForNextMonth=Clonarla para o próximo mes
-SimpleReport=informe simple
+SimpleReport=Informe simple
 AddExtraReport=Informes adicionais (engade informe de clientes extranxeiros e locais)
 OtherCountriesCustomersReport=Informe de clientes extranxeiros
-BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
-SameCountryCustomersWithVAT=National customers report
-BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Baseado en que as dúas primeiras letras do número de IVE son diferentes do código de país da súa propia empresa
+SameCountryCustomersWithVAT=Informe de clientes estatais
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Baseado en que as dúas primeiras letras do número de IVE son as mesmas que o código de país da súa propia empresa
 LinkedFichinter=Ligar a unha intervención
 ImportDataset_tax_contrib=Impostos sociais/fiscais
 ImportDataset_tax_vat=Pagamentos IVE
-ErrorBankAccountNotFound=Error: Conta bancaria non atopada
+ErrorBankAccountNotFound=Erro: Conta bancaria non atopada
 FiscalPeriod=Período contable
 ListSocialContributionAssociatedProject=Listaxe de contribucións sociais asociadas ao proxecto
 DeleteFromCat=Eliminar do grupo de contabilidade
@@ -256,12 +259,12 @@ TurnoverbyVatrate=Volume de vendas emitidas por tipo de imposto
 TurnoverCollectedbyVatrate=Volume de vendas cobradas por tipo de imposto
 PurchasebyVatrate=Compra por taxa de impostos
 LabelToShow=Etiqueta curta
-PurchaseTurnover=Purchase turnover
-PurchaseTurnoverCollected=Purchase turnover collected
-RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
-RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
-RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
-ReportPurchaseTurnover=Purchase turnover invoiced
-ReportPurchaseTurnoverCollected=Purchase turnover collected
-IncludeVarpaysInResults = Include various payments in reports
-IncludeLoansInResults = Include loans in reports
+PurchaseTurnover=Volume de compras
+PurchaseTurnoverCollected=Volume de compras recollido
+RulesPurchaseTurnoverDue=- Inclúe as facturas vencidas do provedor se se pagan ou non. <br>- Baséase na data da factura destas facturas<br>
+RulesPurchaseTurnoverIn=- Inclúe todos os pagamentos efectivos das facturas feitos aos provedores<br>- Baséase na data de pagamento destas facturas<br>
+RulesPurchaseTurnoverTotalPurchaseJournal=Inclúe todas as liñas de débito do diario de compras.
+ReportPurchaseTurnover=Volume compras facturadas
+ReportPurchaseTurnoverCollected=Volume de compras abonadas
+IncludeVarpaysInResults = Inclúe varios pagos en informes
+IncludeLoansInResults = Inclúe prestamos en informes
diff --git a/htdocs/langs/gl_ES/contracts.lang b/htdocs/langs/gl_ES/contracts.lang
index 698aa2ad63f..e222030e8ab 100644
--- a/htdocs/langs/gl_ES/contracts.lang
+++ b/htdocs/langs/gl_ES/contracts.lang
@@ -16,7 +16,7 @@ ServiceStatusLateShort=Expirado
 ServiceStatusClosed=Pechado
 ShowContractOfService=Amosar contrato de servizos
 Contracts=Contratos
-ContractsSubscriptions=Contratos/Suscricións
+ContractsSubscriptions=Contratos/Subscricións
 ContractsAndLine=Contratos e liñas de contratos
 Contract=Contrato
 ContractLine=Liña de contrato
@@ -28,7 +28,7 @@ MenuRunningServices=Servizos activos
 MenuExpiredServices=Servizos expirados
 MenuClosedServices=Servizos pechados
 NewContract=Novo contrato
-NewContractSubscription=New contract or subscription
+NewContractSubscription=Novo contrato/subscrición
 AddContract=Crear contrato
 DeleteAContract=Eliminar un contrato
 ActivateAllOnContract=Activar todos os servizos
@@ -49,13 +49,13 @@ ListOfInactiveServices=Listaxe dos servizos inactivos
 ListOfExpiredServices=Listaxe dos servizos activos expirados
 ListOfClosedServices=Listaxe dos servizos pechados
 ListOfRunningServices=Listaxe de servizos activos
-NotActivatedServices=Inactive services (among validated contracts)
+NotActivatedServices=Servizos inactivos (entre contratos validados)
 BoardNotActivatedServices=Servizos a activar entre os contratos validados
 BoardNotActivatedServicesShort=Servizos a activar
 LastContracts=Últimos %s contratos
 LastModifiedServices=Últimos %s servizos modificados
-ContractStartDate=Data de inicio
-ContractEndDate=Data de fin
+ContractStartDate=Data inicio
+ContractEndDate=Data finalización
 DateStartPlanned=Data prevista posta en servizo
 DateStartPlannedShort=Data inicio prevista
 DateEndPlanned=Data prevista fin do servizo
@@ -71,14 +71,14 @@ BoardExpiredServices=Servicios expirados
 BoardExpiredServicesShort=Servizos expirados
 ServiceStatus=Estado do servizo
 DraftContracts=Contratos borrador
-CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
+CloseRefusedBecauseOneServiceActive=O contrato non pode ser pechado, hai polo menos un servizo aberto.
 ActivateAllContracts=Activar todas as liñas do contrato
 CloseAllContracts=Pechar todos as liñas do contrato
 DeleteContractLine=Eliminar liña de contrato
 ConfirmDeleteContractLine=¿Está certo de querer eliminar esta líña do contrato de servizo?
-MoveToAnotherContract=Mover o servizo a outro contrato deste tercero.
-ConfirmMoveToAnotherContract=He elegido el contrato y confirmo el cambio de servizo en el presente contrato.
-ConfirmMoveToAnotherContractQuestion=Elija cualquier otro contrato del mismo tercero, ¿desea mover este servizo?
+MoveToAnotherContract=Mover o servizo a outro contrato deste terceiro.
+ConfirmMoveToAnotherContract=Escollin o contrato e confirmo o cambio de servizo no presente contrato.
+ConfirmMoveToAnotherContractQuestion=Escolla calquera outro contrato do mesmo terceiro, ¿desexa mover este servizo?
 PaymentRenewContractId=Renovación servizo (número %s)
 ExpiredSince=Expirado dende o
 NoExpiredServices=Sen servizos activos expirados
@@ -88,7 +88,7 @@ ListOfServicesToExpire=Listaxe de servizos activos a expirar
 NoteListOfYourExpiredServices=Esta listaxe só contén os servizos de contratos de terceiros dos que vostede é comercial
 StandardContractsTemplate=Modelo de contrato estandar
 ContactNameAndSignature=Para %s, nome e sinatura:
-OnlyLinesWithTypeServiceAreUsed=Solo serán clonadas as liñas dotipo "Servizo"
+OnlyLinesWithTypeServiceAreUsed=Só serán clonadas as liñas do tipo "Servizo"
 ConfirmCloneContract=¿Está certo de querer copiar o contrato <b>%s</b>?
 LowerDateEndPlannedShort=A data de finalización planificada é anterior aos servizos activos
 SendContractRef=Información do contrato __REF__
diff --git a/htdocs/langs/gl_ES/cron.lang b/htdocs/langs/gl_ES/cron.lang
index 1a8a69c0585..50a3beee5e9 100644
--- a/htdocs/langs/gl_ES/cron.lang
+++ b/htdocs/langs/gl_ES/cron.lang
@@ -7,20 +7,21 @@ Permission23103 = Borrar. Traballo Programado
 Permission23104 = Executar. Traballo programado
 # Admin
 CronSetup=Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
 CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
 CronLastOutput=Latest run output
-CronLastResult=Latest result code
+CronLastResult=Código de resultado máis recente
 CronCommand=Command
 CronList=Tarefas programadas
 CronDelete=Delete scheduled jobs
@@ -46,6 +47,7 @@ CronNbRun=Number of launches
 CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -56,7 +58,7 @@ CronNote=Comentario
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Activo
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Desactivar
 CronTaskInactive=This job is disabled
 CronId=Id
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
 DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/gl_ES/deliveries.lang b/htdocs/langs/gl_ES/deliveries.lang
index b7e846dd4c6..25d25921e1c 100644
--- a/htdocs/langs/gl_ES/deliveries.lang
+++ b/htdocs/langs/gl_ES/deliveries.lang
@@ -27,5 +27,6 @@ Recipient=Destinatario
 ErrorStockIsNotEnough=Non hai suficiente stock
 Shippable=Enviable
 NonShippable=Non enviable
+ShowShippableStatus=Amosar estado de envío
 ShowReceiving=Mostrar nota de recepción
 NonExistentOrder=Pedido inexistente
diff --git a/htdocs/langs/gl_ES/ecm.lang b/htdocs/langs/gl_ES/ecm.lang
index ac1f38369d5..eb6c9efa259 100644
--- a/htdocs/langs/gl_ES/ecm.lang
+++ b/htdocs/langs/gl_ES/ecm.lang
@@ -15,7 +15,7 @@ ECMNbOfSubDir=Número de sub-directories
 ECMNbOfFilesInSubDir=Número de ficheiros en sub-directories
 ECMCreationUser=Creador
 ECMArea=Área MS/ECM
-ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMAreaDesc=O área DMS / ECM (Document Management System / Electronic Content Management) permítelle gardar, compartir e buscar rapidamente todo tipo de documentos en Dolibarr.
 ECMAreaDesc2=Pode crear directorios manuais e axuntar os documentos<br>Os directorios automáticos son cobertos automáticamente ao engadir un documento nunha ficha.
 ECMSectionWasRemoved=O directorio <b>%s</b> foi eliminado
 ECMSectionWasCreated=O directorio <b> %s </b> foi creado.
@@ -23,7 +23,7 @@ ECMSearchByKeywords=Buscar por palabras clave
 ECMSearchByEntity=Buscar por obxecto
 ECMSectionOfDocuments=Directorios de documentos
 ECMTypeAuto=Automático
-ECMDocsBy=Documents linked to %s
+ECMDocsBy=Documentos ligados a %s
 ECMNoDirectoryYet=Non foi creado o directorio
 ShowECMSection=Amosar directorio
 DeleteSection=Eliminación directorio
@@ -38,6 +38,6 @@ ReSyncListOfDir=Resincronizar a listaxe de directorios
 HashOfFileContent=Hash do contido do ficheiro
 NoDirectoriesFound=Non foron atopados directorios
 FileNotYetIndexedInDatabase=Ficheiro aínda non indexado na base de datos (tente voltar cargalo)
-ExtraFieldsEcmFiles=Extrafields Ecm Files
-ExtraFieldsEcmDirectories=Extrafields Ecm Directories
-ECMSetup=ECM Setup
+ExtraFieldsEcmFiles=Extrafields en ficheiros ECM
+ExtraFieldsEcmDirectories=Extrafields en directorios ECM
+ECMSetup=Configuración ECM
diff --git a/htdocs/langs/gl_ES/errors.lang b/htdocs/langs/gl_ES/errors.lang
index 893f4a35b65..516bd1b7feb 100644
--- a/htdocs/langs/gl_ES/errors.lang
+++ b/htdocs/langs/gl_ES/errors.lang
@@ -1,272 +1,289 @@
 # Dolibarr language file - Source file is en_US - errors
 
 # No errors
-NoErrorCommitIsDone=No error, we commit
+NoErrorCommitIsDone=Sen erro,  é válido
 # Errors
-ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadUrl=Url %s is wrong
-ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
-ErrorLoginAlreadyExists=Login %s already exists.
-ErrorGroupAlreadyExists=Group %s already exists.
-ErrorRecordNotFound=Record not found.
-ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
-ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
-ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
-ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
-ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
-ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
-ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
-ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
-ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
-ErrorBadThirdPartyName=Bad value for third-party name
-ErrorProdIdIsMandatory=The %s is mandatory
-ErrorBadCustomerCodeSyntax=Bad syntax for customer code
-ErrorBadBarCodeSyntax=Bad syntax for barcode. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
-ErrorCustomerCodeRequired=Customer code required
-ErrorBarCodeRequired=Barcode required
-ErrorCustomerCodeAlreadyUsed=Customer code already used
-ErrorBarCodeAlreadyUsed=Barcode already used
-ErrorPrefixRequired=Prefix required
-ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
-ErrorSupplierCodeRequired=Vendor code required
-ErrorSupplierCodeAlreadyUsed=Vendor code already used
-ErrorBadParameters=Bad parameters
-ErrorWrongParameters=Wrong or missing parameters
-ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
-ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
-ErrorBadDateFormat=Value '%s' has wrong date format
-ErrorWrongDate=Date is not correct!
-ErrorFailedToWriteInDir=Failed to write in directory %s
-ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
-ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields were not filled.
-ErrorSubjectIsRequired=The email topic is required
-ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
-ErrorNoMailDefinedForThisUser=No mail defined for this user
-ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
-ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
-ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
-ErrorFileNotFound=File <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
-ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
-ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
-ErrorDirAlreadyExists=A directory with this name already exists.
-ErrorFileAlreadyExists=A file with this name already exists.
-ErrorPartialFile=File not received completely by server.
-ErrorNoTmpDir=Temporary directy %s does not exists.
-ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
-ErrorFileSizeTooLarge=File size is too large.
-ErrorFieldTooLong=Field %s is too long.
-ErrorSizeTooLongForIntType=Size too long for int type (%s digits maximum)
-ErrorSizeTooLongForVarcharType=Size too long for string type (%s chars maximum)
-ErrorNoValueForSelectType=Please fill value for select list
-ErrorNoValueForCheckBoxType=Please fill value for checkbox list
-ErrorNoValueForRadioType=Please fill value for radio list
-ErrorBadFormatValueList=The list value cannot have more than one comma: <u>%s</u>, but need at least one: key,value
-ErrorFieldCanNotContainSpecialCharacters=The field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=The field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
-ErrorFieldMustHaveXChar=The field <b>%s</b> must have at least %s characters.
-ErrorNoAccountancyModuleLoaded=No accountancy module activated
-ErrorExportDuplicateProfil=This profile name already exists for this export set.
-ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
-ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
-ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref used for creation already exists.
-ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
-ErrorRecordHasChildren=Failed to delete record since it has some child records.
-ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
-ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object.
-ErrorModuleRequireJavascript=Javascript must not be disabled to have this feature working. To enable/disable Javascript, go to menu Home->Setup->Display.
-ErrorPasswordsMustMatch=Both typed passwords must match each other
-ErrorContactEMail=A technical error occured. Please, contact administrator to following email <b>%s</b> and provide the error code <b>%s</b> in your message, or add a screen copy of this page.
-ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
-ErrorFieldValueNotIn=Field <b>%s</b>: '<b>%s</b>' is not a value found in field <b>%s</b> of <b>%s</b>
-ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
-ErrorsOnXLines=%s errors found
-ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
-ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
-ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
-ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
-ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
-ErrorBadMask=Error on mask
-ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
-ErrorBadMaskBadRazMonth=Error, bad reset value
-ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
-ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
-ErrorSelectAtLeastOne=Error, select at least one entry.
-ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
-ErrorProdIdAlreadyExist=%s is assigned to another third
-ErrorFailedToSendPassword=Failed to send password
-ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information.
-ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
-ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s.
-ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...).
-ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display.
-ErrorRecordAlreadyExists=Record already exists
-ErrorLabelAlreadyExists=This label already exists
-ErrorCantReadFile=Failed to read file '%s'
-ErrorCantReadDir=Failed to read directory '%s'
-ErrorBadLoginPassword=Bad value for login or password
-ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
-ErrorFailedToChangePassword=Failed to change password
-ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
-ErrorLoginHasNoEmail=This user has no email address. Process aborted.
-ErrorBadValueForCode=Bad value for security code. Try again with new value...
-ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
-ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice.
-ErrorLinesCantBeNegativeForOneVATRate=Total of lines (net of tax) can't be negative for a given not null VAT rate (Found a negative total for VAT rate <b>%s</b>%%).
-ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
-ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
-ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
-ErrorNoActivatedBarcode=No barcode type activated
-ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
-ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorModuleFileRequired=You must select a Dolibarr module package file
-ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
-ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
-ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
-ErrorNewValueCantMatchOldValue=New value can't be equal to old one
-ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
-ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
-ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date must be lower than today
-ErrorDateMustBeInFuture=The date must be greater than today
-ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
-ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
-ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
-ErrorWarehouseMustDiffers=Source and target warehouses must differs
-ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
-ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
-ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank entry that was reconciled
-ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Paid
-ErrorPriceExpression1=Cannot assign to constant '%s'
-ErrorPriceExpression2=Cannot redefine built-in function '%s'
-ErrorPriceExpression3=Undefined variable '%s' in function definition
-ErrorPriceExpression4=Illegal character '%s'
-ErrorPriceExpression5=Unexpected '%s'
-ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
-ErrorPriceExpression8=Unexpected operator '%s'
-ErrorPriceExpression9=An unexpected error occured
-ErrorPriceExpression10=Operator '%s' lacks operand
-ErrorPriceExpression11=Expecting '%s'
-ErrorPriceExpression14=Division by zero
-ErrorPriceExpression17=Undefined variable '%s'
-ErrorPriceExpression19=Expression not found
-ErrorPriceExpression20=Empty expression
-ErrorPriceExpression21=Empty result '%s'
-ErrorPriceExpression22=Negative result '%s'
-ErrorPriceExpression23=Unknown or non set variable '%s' in %s
-ErrorPriceExpression24=Variable '%s' exists but has no value
-ErrorPriceExpressionInternal=Internal error '%s'
-ErrorPriceExpressionUnknown=Unknown error '%s'
-ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
-ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
-ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
-ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
-ErrorGlobalVariableUpdater2=Missing parameter '%s'
-ErrorGlobalVariableUpdater3=The requested data was not found in result
-ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
-ErrorGlobalVariableUpdater5=No global variable selected
-ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
-ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter it's status.
-ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
-ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
-ErrorSavingChanges=An error has occurred when saving the changes
-ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
-ErrorFileMustHaveFormat=File must have format %s
-ErrorFilenameCantStartWithDot=Filename can't start with a '.'
-ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
-ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
-ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
-ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
-ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
-ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
-ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
-ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
-ErrorTaskAlreadyAssigned=Task already assigned to user
-ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
-ErrorModuleFileSeemsToHaveAWrongFormat2=At least one mandatory directory must exists into zip of module: <strong>%s</strong> or <strong>%s</strong>
-ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
-ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
-ErrorNoWarehouseDefined=Error, no warehouses defined.
-ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
-ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
-ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
-ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated.
-ErrorObjectMustHaveLinesToBeValidated=Object %s must have lines to be validated.
-ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action.
-ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not
-ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
-ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
-ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
-ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
-ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
-ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
-ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
-ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
-ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
-ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
-ErrorSearchCriteriaTooSmall=Search criteria too small.
-ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to be disabled
-ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
-ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
-ErrorFieldRequiredForProduct=Field '%s' is required for product %s
-ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
-ErrorAddAtLeastOneLineFirst=Add at least one line first
-ErrorRecordAlreadyInAccountingDeletionNotPossible=Error, record is already transferred in accounting, deletion is not possible.
-ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Error, language is mandatory if you set the page as a translation of another one.
-ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated page is same than this one.
-ErrorBatchNoFoundForProductInWarehouse=No lot/serial found for product "%s" in warehouse "%s".
-ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this lot/serial for product "%s" in warehouse "%s".
-ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
-ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
-ErrorReplaceStringEmpty=Error, the string to replace into is empty
-ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
-ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
-ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorButCommitIsDone=Atopáronse erros pero validamos a pesar diso
+ErrorBadEMail=Correo electrónico %s incorrecto
+ErrorBadMXDomain=Correo electrónico %s parece incorrecto (o dominio non ten un rexistro MX válido)
+ErrorBadUrl=Url %s incorrecta
+ErrorBadValueForParamNotAString=Valor incorrecto para o seu parámetro. Xeralmente aparece cando falta a tradución
+ErrorRefAlreadyExists=A referencia <b>%s</b> xa existe
+ErrorLoginAlreadyExists=O login %s xa existe.
+ErrorGroupAlreadyExists=O grupo %s xa existe.
+ErrorRecordNotFound=Rexistro non atopado
+ErrorFailToCopyFile=Erro ao copiar o ficheiro '<b>%s</b>' en '<b>%s</b>'.
+ErrorFailToCopyDir=Erro ao copiar o directorio '<b>%s</b>' en '<b>%s</b>'.
+ErrorFailToRenameFile=Erro ao renomear o ficheiro '<b>%s</b>' a '<b>%s</b>'.
+ErrorFailToDeleteFile=Erro ao eliminar o ficheiro '<b>%s</b>'.
+ErrorFailToCreateFile=Erro ao crear o ficheiro '<b>%s</b>'
+ErrorFailToRenameDir=Erro ao renomear o directorio '<b>%s</b>' a '<b>%s</b>'.
+ErrorFailToCreateDir=Erro ao crear o directorio '<b>%s</b>'
+ErrorFailToDeleteDir=Erro a eliminar o directorio '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Erro ao facer a substitución no ficheiro '<b>%s</b>'.
+ErrorFailToGenerateFile=Erro ao xerar o ficheiro '<b>%s</b>'.
+ErrorThisContactIsAlreadyDefinedAsThisType=Este contacto xa está definido como contacto para este tipo.
+ErrorCashAccountAcceptsOnlyCashMoney=Esta conta bancaria é de tipo caixa e só acepta pagos en efectivo.
+ErrorFromToAccountsMustDiffers=A conta orixe e destino deben ser distintas.
+ErrorBadThirdPartyName=Nome de terceiro incorrecto
+ErrorProdIdIsMandatory=O %s é obrigado
+ErrorBadCustomerCodeSyntax=A sintaxe do código cliente é incorrecta.
+ErrorBadBarCodeSyntax=Sintaxe incorrecta do código de barras. Pode definir un tipo de código de barras incorrecto ou definir unha máscara de código de barras para a numeración que non coincide co valor escaneado.
+ErrorCustomerCodeRequired=Código cliente obrigado
+ErrorBarCodeRequired=Código de barras obrigado
+ErrorCustomerCodeAlreadyUsed=Código de cliente xa utilizado
+ErrorBarCodeAlreadyUsed=Código de barras xa utilizado
+ErrorPrefixRequired=Prefixo obrigado
+ErrorBadSupplierCodeSyntax=A sintaxe do código proveedor é incorrecta
+ErrorSupplierCodeRequired=Código proveedor obrigado
+ErrorSupplierCodeAlreadyUsed=Código de proveedor xa utilizado
+ErrorBadParameters=Parámetros incorrectos
+ErrorWrongParameters=Parámetros incorrectos
+ErrorBadValueForParameter=valor '%s' incorrecto para o parámetro '%s'
+ErrorBadImageFormat=O ficheiro de imaxe non ten un formato compatible (o seu PHP non admite funcións para converter imaxes deste formato)
+ErrorBadDateFormat=O valor '%s' ten un formato de data erroneo
+ErrorWrongDate=A data non correcta!
+ErrorFailedToWriteInDir=Erro ao escribir no directorio %s
+ErrorFoundBadEmailInFile=Atopouse unha sintaxe de correo electrónico incorrecta para % s liñas no ficheiro (exemplo liña %s con correo electrónico=%s)
+ErrorUserCannotBeDelete=Non pode eliminarse o usuario. É posible que esté asociado a entidades do Dolibarr
+ErrorFieldsRequired=Non se completaron algúns campos obrigatorios
+ErrorSubjectIsRequired=O asunto do correo electrónico é  obligatorio
+ErrorFailedToCreateDir=Fallou a creación dun directorio. Comprobe que o usuario do servidor web ten permisos para escribir no directorio de documentos Dolibarr. Se o parámetro <b>safe_mode</b> está activado neste PHP, comprobe que os ficheiros php Dolibarr son propiedade do usuario (ou grupo) do servidor web.
+ErrorNoMailDefinedForThisUser=Non existe enderezo de correo electrónico asignado a este usuario
+ErrorSetupOfEmailsNotComplete=A configuración do correo electrónico non está rematada
+ErrorFeatureNeedJavascript=Esta característica precisa que javascript estexa activado para funcionar. Cambie isto na configuración-visualización.
+ErrorTopMenuMustHaveAParentWithId0=Un menú do tipo "Arriba" non pode ter un menú principal. Poña 0 no menú principal ou escolla un menú do tipo "Esquerda".
+ErrorLeftMenuMustHaveAParentId=Un menú de tipo "esquerda" debe ter un identificador principal.
+ErrorFileNotFound=Non se atopou o ficheiro <b>%s</b> (ruta incorrecta, permisos incorrectos ou acceso denegado polo PHP openbasedir ou parámetro safe_mode)
+ErrorDirNotFound=Non se atopou o directorio <b>%s</b> (camiño incorrecto, permisos incorrectos ou acceso denegado polo PHP openbasedir ou parámetro safe_mode)
+ErrorFunctionNotAvailableInPHP=A función <b>%s</b> é precisa para esta característica pero non está dispoñible nesta versión/configuración de PHP.
+ErrorDirAlreadyExists=Xa existe un directorio con este nome.
+ErrorFileAlreadyExists=Xa existe un ficheiro con este nome.
+ErrorPartialFile=Ficheiro non recibido completamente polo servidor.
+ErrorNoTmpDir=Non existe o directorio temporal %s.
+ErrorUploadBlockedByAddon=Subida bloqueada por un plugin PHP/Apache.
+ErrorFileSizeTooLarge=O tamaño do ficheiro é grande de mais.
+ErrorFieldTooLong=Campo %s e longo de mais.
+ErrorSizeTooLongForIntType=Tamaño demasiado longo para o tipo int (máximo %s caracteres)
+ErrorSizeTooLongForVarcharType=Tamaño demasiado longo para o tipo de cadea (máximo %s caracteres)
+ErrorNoValueForSelectType=Pregase complete o valor da listaxe de selección
+ErrorNoValueForCheckBoxType=Pregase complete o valor da listaxe de caixa de verificación
+ErrorNoValueForRadioType=Pregase complete o valor da listaxe de radios
+ErrorBadFormatValueList=O valor da listaxe non pode ter máis dunha coma: <u>%s</u>, pero precisa polo menos unha: chave, valor
+ErrorFieldCanNotContainSpecialCharacters=O campo <b>%s</b> non debe conter caracteres especiais.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=O campo <b>%s</b> non debe conter caracteres especiais nin caracteres en maiúsculas e non pode conter só números.
+ErrorFieldMustHaveXChar=O campo <b>%s</b> debe ter polo menos %s caracteres.
+ErrorNoAccountancyModuleLoaded=Non hai ningún módulo de contabilidade activado
+ErrorExportDuplicateProfil=Este nome de perfil xa existe para este conxunto de exportacións.
+ErrorLDAPSetupNotComplete=A concordancia Dolibarr-LDAP non está completada.
+ErrorLDAPMakeManualTest=Xerouse un ficheiro .ldif no directorio %s. Tente cargalo manualmente desde a liña de comandos para ter máis información sobre erros.
+ErrorCantSaveADoneUserWithZeroPercentage=Non se pode gardar unha acción con "estado non iniciado" se o campo "feito por" tamén está cuberto.
+ErrorRefAlreadyExists=A referencia <b>%s</b> xa existe
+ErrorPleaseTypeBankTransactionReportName=Introduza o nome do extracto bancario onde se debe informar da entrada (Formato AAAAMM ou AAAAMMDD)
+ErrorRecordHasChildren=Erro ao eliminar o rexistro xa que ten algúns rexistros fillos.
+ErrorRecordHasAtLeastOneChildOfType=O obxecto ten polo menos un fillo do tipo %s
+ErrorRecordIsUsedCantDelete=Non se pode eliminar o rexistro. Xa se usa ou está incluído noutro obxecto.
+ErrorModuleRequireJavascript=Non se debe desactivar Javascript para que esta función sexa operativa. Para activar/desactivar Javascript, vaia ao menú Inicio->Configuración->Amosar.
+ErrorPasswordsMustMatch=Os dous contrasinais escritos deben coincidir entre si
+ErrorContactEMail=Produciuse un erro técnico. Póñase en contacto co administrador no seguinte correo electrónico <b>%s</b> e proporcione o código de erro <b>%s</b> na súa mensaxe ou engada unha copia desta páxina.
+ErrorWrongValueForField=O campo <b>%s</b>:'<b>%s</b>' non coincide coa regra  <b>%s</b>
+ErrorFieldValueNotIn=Campo <b>%s</b>:'<b>%s</b>' non é un valor atopado no campo <b>%s</b> de <b>%s</ b >
+ErrorFieldRefNotIn=Campo <b>%s</b>:'<b>%s</b>' non é unha referencia <b>%s</b> existente
+ErrorsOnXLines=Atopáronse %s erros
+ErrorFileIsInfectedWithAVirus=O programa antivirus non puido validar o ficheiro (o ficheiro pode estar infectado por un virus)
+ErrorSpecialCharNotAllowedForField=Non se permiten caracteres especiais para o campo %s
+ErrorNumRefModel=Existe unha referencia na base de datos (%s) e non é compatible con esta regra de numeración. Elimine o rexistro ou renomee a referencia para activar este módulo.
+ErrorQtyTooLowForThisSupplier=Cantidad insuficiente para este proveedor o no hay precio definido en este producto para este proveedor
+ErrorOrdersNotCreatedQtyTooLow=Algunos pedidos no se han creado debido a una cantidad demasiado baja
+ErrorModuleSetupNotComplete=La configuración del módulo parece incompleta. Vaya a Inicio - Configuración - Módulos para completarla.
+ErrorBadMask=Erro na máscara
+ErrorBadMaskFailedToLocatePosOfSequence=Erro, máscara sen número de secuencia
+ErrorBadMaskBadRazMonth=Erro, valor de restablecemento incorrecto
+ErrorMaxNumberReachForThisMask=Número máximo alcanzado para esta máscara
+ErrorCounterMustHaveMoreThan3Digits=O contador debe ter mais de 3 díxitos
+ErrorSelectAtLeastOne=Erro. seleccione polo menos unha entrada.
+ErrorDeleteNotPossibleLineIsConsolidated=Non é posible eliminar porque o rexistro está ligado a unha transacción bancaria conciliada
+ErrorProdIdAlreadyExist=%s está asignado a outro terceiro
+ErrorFailedToSendPassword=Erro ao enviar o contrasinal
+ErrorFailedToLoadRSSFile=Non alcanza a fonte RSS. Tente engadir a constante MAIN_SIMPLEXMLLOAD_DEBUG se as mensaxes de erro non proporcionan información suficiente.
+ErrorForbidden=Acceso denegado.<br> Intenta acceder a unha páxina, área ou función dun módulo desactivado ou sen estar nunha sesión autenticada ou que non está permitida ao seu usuario.
+ErrorForbidden2=O seu administrador Dolibarr pode definir o permiso para este inicio de sesión no menú %s->%s.
+ErrorForbidden3=Parece que Dolibarr non se usa a través dunha sesión autenticada. Bote unha ollada á documentación de configuración de Dolibarr para saber como xestionar as autenticacións (htaccess, mod_auth ou outro ...).
+ErrorNoImagickReadimage=A clase Imagick non se atopa neste PHP. Non pode estar dispoñible ningunha vista previa. Os administradores poden desactivar esta pestana no menú Configuración-Amosar
+ErrorRecordAlreadyExists=Rexistro xa existente
+ErrorLabelAlreadyExists=Etiqueta xa existente
+ErrorCantReadFile=Erro de lectura do ficheiro '%s'
+ErrorCantReadDir=Error de lectura do directorio '%s'
+ErrorBadLoginPassword=Valor incorrecto para o inicio de sesión ou o contrasinals
+ErrorLoginDisabled=A súa conta foi descativada
+ErrorFailedToRunExternalCommand=Non se puido executar o comando externo. Comprobe que está dispoñible e executable polo seu servidor PHP. Se PHP <b> Modo seguro</b>1 está habilitado, comprobe que o comando está dentro dun directorio definido polo parámetro <b>safe_mode_exec_dir</b>.
+ErrorFailedToChangePassword=Erro ao cambiar o contrasinal
+ErrorLoginDoesNotExists=Non foi posible atopar o usuario con inicio de sesión <b>%s</b>.
+ErrorLoginHasNoEmail=Este usuario non ten enderezo de correo electrónico. Proceso abortado.
+ErrorBadValueForCode=Valor incorrecto para o código de seguridade. Tenteo novamente cun novo valor ...
+ErrorBothFieldCantBeNegative=Os campos %s e %s non poen ser negativos
+ErrorFieldCantBeNegativeOnInvoice=O campo <strong>%s</strong> non pode ser negativo neste tipo de factura. Se precisa engadir unha liña de desconto, primeiro cree o desconto (a partir do campo '%s' na tarxeta de terceiros) e aplíqueo á factura.
+ErrorLinesCantBeNegativeForOneVATRate=O total de liñas (neto de impostos) non pode ser negativo para unha determinada taxa de IVE non nula (Atopouse un total negativo para o tipo de IVE <b>%s</b>%%)
+ErrorLinesCantBeNegativeOnDeposits=As liñas non poden ser negativas nun depósito. Terá problemas cando necesite consumir o depósito na factura final se o fai.
+ErrorQtyForCustomerInvoiceCantBeNegative=A cantidade da liña para as facturas do cliente non pode ser negativa
+ErrorWebServerUserHasNotPermission=A conta de usuario <b>%s </b>usada para executar o servidor web non ten permiso para iso
+ErrorNoActivatedBarcode=Non hai ningún tipo de código de barras activado
+ErrUnzipFails=Fallou ao descomprimir% s con ZipArchive
+ErrNoZipEngine=Non hai motor neste PHP para comprimir/descomprimir o ficheiro %s
+ErrorFileMustBeADolibarrPackage=O ficheiro %s debe ser un paquete zip Dolibarr
+ErrorModuleFileRequired=Debe seleccionar un ficheiro de paquete do módulo Dolibarr
+ErrorPhpCurlNotInstalled=O PHP CURL non está instalado, isto é esencial para comunicarse con Paypal
+ErrorFailedToAddToMailmanList=Erro ao engadir o rexistro %s á listaxe de Mailman %s ou á base de SPIP
+ErrorFailedToRemoveToMailmanList=Erro ao eliminar o rexistro %s da listaxe de Mailman %s ou a base de SPIP
+ErrorNewValueCantMatchOldValue=O novo valor non pode ser igual ao anterior
+ErrorFailedToValidatePasswordReset=Non se puido resetear o contrasinal. Pode que o reseteo xa este feito (esta ligazón só se pode usar unha vez). Se non, tente reiniciar o proceso de reseteo.
+ErrorToConnectToMysqlCheckInstance=Falla a conexión á base de datos. Comprobe que o servidor de base de datos está en execución (por exemplo, con mysql/mariadb, pode lanzalo desde a liña de comandos con 'sudo service mysql start').
+ErrorFailedToAddContact=Erro ao engadir o contacto
+ErrorDateMustBeBeforeToday=A data debe ser inferior á de hoxe
+ErrorDateMustBeInFuture=A data debe ser maior que a de hoxe
+ErrorPaymentModeDefinedToWithoutSetup=Estableceuse un modo de pago para escribir %s pero a configuración da factura do módulo non se completou para definir a información que se amosará para este modo de pago.
+ErrorPHPNeedModule=Erro, o seu PHP debe ter instalado o módulo <b>%s</b> para usar esta funcionalidade.
+ErrorOpenIDSetupNotComplete=Estableceu a configuración do ficheiro Dolibarr para permitir a autenticación OpenID, pero a URL do servizo OpenID non está definida na constante %s
+ErrorWarehouseMustDiffers=O almacén de orixe e destino deben de ser diferentes
+ErrorBadFormat=O formato contén erros!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Erro, este membro aínda non está ligado a ningún terceiro. Ligue o membro a un terceiro existente ou cree un novo terceiro antes de crear a subscrición con factura.
+ErrorThereIsSomeDeliveries=Erro, hai algunhas entregas ligadas a este envío. Rexeitouse a eliminación.
+ErrorCantDeletePaymentReconciliated=Non se pode eliminar un pago que xerou unha entrada bancaria conciliada
+ErrorCantDeletePaymentSharedWithPayedInvoice=Non se pode eliminar un pago compartido polo menos por unha factura co estado Pagado
+ErrorPriceExpression1=Non se pode asignar á constante '%s'
+ErrorPriceExpression2=Non se pode redefinir a función incorporada '%s'
+ErrorPriceExpression3=Variable "%s" sen definir na definición da función
+ErrorPriceExpression4=Carácter ilegal '%s'
+ErrorPriceExpression5='%s' inesperado
+ErrorPriceExpression6=Número incorrecto de argumentos (indicáronse %s, agardábase %s)
+ErrorPriceExpression8=Operador inesperado '%s'
+ErrorPriceExpression9=Ocorreu un erro inesperado
+ErrorPriceExpression10=O operador '%s' carece de operando
+ErrorPriceExpression11=Agardando '%s'
+ErrorPriceExpression14=División por cero
+ErrorPriceExpression17=Variable '%s' sen definir
+ErrorPriceExpression19=Non se atopou a expresión
+ErrorPriceExpression20=Expresión baleira
+ErrorPriceExpression21=Resultado baleiro '%s'
+ErrorPriceExpression22=Resultado negativo '%s'
+ErrorPriceExpression23=Variable descoñecida ou non definida '%s' en %s
+ErrorPriceExpression24=A variable '%s' existe pero non ten valor
+ErrorPriceExpressionInternal=Erro interno '%s'
+ErrorPriceExpressionUnknown=Erro descoñecido '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=Os almacéns de orixe e destino deben ser diferentes
+ErrorTryToMakeMoveOnProductRequiringBatchData=Erro ao tentar facer un movemento de stock sen información de lote/serie, no produto '%s' que requiría información de lote/serie
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Todas as recepcións rexistradas deben ser verificadas (aprobadas ou denegadas) antes de que se lle permita facer esta acción
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Todas as recepcións rexistradas deben verificarse (aprobarse) antes de que se lle permita facer esta acción
+ErrorGlobalVariableUpdater0=Petición HTTP request falla co erro '%s'
+ErrorGlobalVariableUpdater1=Formato JSON '%s' non válido
+ErrorGlobalVariableUpdater2=Falta o parámetro '%s'
+ErrorGlobalVariableUpdater3=Non se atoparon os datos solicitados no resultado
+ErrorGlobalVariableUpdater4=Fallou o cliente SOAP co erro '%s'
+ErrorGlobalVariableUpdater5=Non se seleccionou ningunha variable global
+ErrorFieldMustBeANumeric=O campo <b>%s</b> debe ser un valor numérico
+ErrorMandatoryParametersNotProvided=Non se proporcionan parámetro(s) obrigatorios
+ErrorOppStatusRequiredIfAmount=Establecerá unha cantidade estimada para este cliente potencial. Entón tamén debe introducir o seu estado.
+ErrorFailedToLoadModuleDescriptorForXXX=Erro ao cargar a clase do descritor do módulo para %s
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Mala definición do Menu Array na descrición do módulo (valor incorrecto para a chave fk_menu)
+ErrorSavingChanges=Produciuse un erro ao gardar os cambios
+ErrorWarehouseRequiredIntoShipmentLine=Requírese un almacén na liña para enviar
+ErrorFileMustHaveFormat=O ficheiro debe ter o formato %s
+ErrorFilenameCantStartWithDot=O nome do ficheiro non pode comezar cun "."
+ErrorSupplierCountryIsNotDefined=El país de este proveedor no está definido, corríjalo en su ficha
+ErrorsThirdpartyMerge=No se han podido fusionar los dos registros. Petición cancelada.
+ErrorStockIsNotEnoughToAddProductOnOrder=No hay stock suficiente del producto %s para añadirlo a un nuevo pedido.
+ErrorStockIsNotEnoughToAddProductOnInvoice=No hay stock suficiente del producto %s para añadirlo a una nueva factura.
+ErrorStockIsNotEnoughToAddProductOnShipment=No hay stock suficiente del producto %s para añadirlo a un nuevo envío.
+ErrorStockIsNotEnoughToAddProductOnProposal=No hay stock suficiente del producto %s para añadirlo a un nuevo presupuesto.
+ErrorFailedToLoadLoginFileForMode=Error al obtener la clave de acceso para el modo '%s'.
+ErrorModuleNotFound=No se ha encontrado el archivo del módulo.
+ErrorFieldAccountNotDefinedForBankLine=Valor para la cuenta contable no indicada para la línea origen %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Valor de la cuenta contable no indicado para la factura id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Valor para la cuenta contable no indicado para la línea (%s)
+ErrorBankStatementNameMustFollowRegex=Error, el nombre de estado de la cuenta bancaria debe seguir la siguiente regla de sintaxis %s
+ErrorPhpMailDelivery=Comprobe que non utiliza un número moi alto de destinatarios e que o seu contido de correo electrónico non é similar a  spam. Solicite tamén ao seu administrador que comprobe os ficheiros de firewall e rexistros do servidor para obter unha información máis completa.
+ErrorUserNotAssignedToTask=O usuario debe ser asignado á tarefa para poder ingresar o tempo consumido.
+ErrorTaskAlreadyAssigned=Tarefa xa asignada ao usuario
+ErrorModuleFileSeemsToHaveAWrongFormat=O paquete do módulo parece ter un formato incorrecto.
+ErrorModuleFileSeemsToHaveAWrongFormat2=Debe existir polo menos un directorio obrigatorio no zip do módulo: <strong>%s</strong> ou <strong>%s</strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=O nome do paquete do módulo (<strong>%s</strong>) non coincide coa sintaxe do nome agardada: <strong>%s</strong>
+ErrorDuplicateTrigger=Erro, nome de triggerr duplicado %s. Xa se cargou desde% s.
+ErrorNoWarehouseDefined=Erro, sen almacéns definidos.
+ErrorBadLinkSourceSetButBadValueForRef=A ligazón que usa non é válida. Defínese unha "fonte" para o pago, pero o valor para "ref" non é válido.
+ErrorTooManyErrorsProcessStopped=Demasiados erros. O proceso detívose.
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=A validación masiva non é posible cando se establece a opción de aumentar/diminuír o stock nesta acción (debe validalo un por un para que poida definir o almacén para aumentar/diminuír)
+ErrorObjectMustHaveStatusDraftToBeValidated=O obxecto %s debe ter o estado 'Borrador' para ser validado.
+ErrorObjectMustHaveLinesToBeValidated=O obxecto %s debe ter liñas para ser validado.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Só se poden enviar facturas validadas mediante a acción masiva "Enviar por correo electrónico".
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=Debe escoller se o artigo é un produto predefinido ou non
+ErrorDiscountLargerThanRemainToPaySplitItBefore=O desconto que intenta aplicar é maior do que queda para pagar. Dividir o desconto en 2 descontos menores antes.
+ErrorFileNotFoundWithSharedLink=Non se atopou o ficheiro. Pode ser que se modificara a chave para compartir ou que se eliminou o ficheiro recentemente.
+ErrorProductBarCodeAlreadyExists=O código de barras do produto %s xa existe noutra referencia de produto.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Teña conta tamén que o uso de kits para aumentar / diminuír automaticamente os subprodutos non é posible cando polo menos un subproduto (ou subproduto de subprodutos) precisa un número de serie / lote.
+ErrorDescRequiredForFreeProductLines=A descrición é obrigada para as liñas con produto gratuíto
+ErrorAPageWithThisNameOrAliasAlreadyExists=A páxina/contedor <strong>%s</strong> ten o mesmo nome ou alias alternativo que o que intenta empregar
+ErrorDuringChartLoad=Erro ao cargar o plan de contabilidade. Se non se cargaron algunhas contas, aínda pode introducilas manualmente.
+ErrorBadSyntaxForParamKeyForContent=Sintaxe incorrecta para o parémetro keyforcontent. Debe ter un valor que comece por %s ou %s
+ErrorVariableKeyForContentMustBeSet=Erro, debe establecerse a constante co nome %s (con contido de texto para amosar) ou %s (con URL externo para amosar).
+ErrorURLMustStartWithHttp=O URL %s debe comezar con http:// ou https://
+ErrorNewRefIsAlreadyUsed=Erro, a nova referencia xa está empregada
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Erro, non é posible eliminar o pago ligado a unha factura pechada.
+ErrorSearchCriteriaTooSmall=Os criterios de busca son demasiado pequenos.
+ErrorObjectMustHaveStatusActiveToBeDisabled=Os obxectos deben ter o estado "Activo" para ser desactivados
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Os obxectos deben ter o estado "Borrador" ou "Desactivado" para ser habilitados
+ErrorNoFieldWithAttributeShowoncombobox=Ningún campo ten a propiedade 'showoncombobox' na definición do obxecto '%s'. Non hai forma de amosar a listaxe combo.
+ErrorFieldRequiredForProduct=O campo '%s' é obrigado para o produto %s
+ProblemIsInSetupOfTerminal=O problema está na configuración do terminal %s.
+ErrorAddAtLeastOneLineFirst=Engada polo menos unha liña primeiro
+ErrorRecordAlreadyInAccountingDeletionNotPossible=Erro, o rexistro xa se transferiu á contabilidade, non se pode eliminar.
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Erro, o idioma é obrigatorio se configura a páxina como tradución doutra.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Erro, o idioma da páxina traducida é o mesmo que este.
+ErrorBatchNoFoundForProductInWarehouse=Non se atopou ningún lote/serie para o produto "%s" no almacén "%s".
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Non hai cantidade suficiente para este lote/serie do produto "%s" no almacén "%s".
+ErrorOnlyOneFieldForGroupByIsPossible=Só é posible un campo para "Agrupar por" (descártanse outros)
+ErrorTooManyDifferentValueForSelectedGroupBy=Atopouse demasiado valor diferente (máis de <b>%s </b>) para o campo "<b>%s</b>", polo que non podemos usalo como "Agrupar por" para gráficos. Eliminouse o campo "Agrupar por". ¿Quería usalo como eixo X?
+ErrorReplaceStringEmpty=Erro, a cadea para substituír está baleira
+ErrorProductNeedBatchNumber=Erro, o produto '<b>%s</b>' precisa un número de lote/serie
+ErrorProductDoesNotNeedBatchNumber=Erro, o produto '<b>%s</b>' non acepta número de lote/serie
+ErrorFailedToReadObject=Erro, falla o ler o tipo de obxecto <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Erro, o parámetro <b>%s</b>1debe estar habilitado en <b>conf/conf.php<b> para permitir o uso da interface de liña de comandos polo programador de traballo interno.
+ErrorLoginDateValidity=Erro, este inicio de sesión está fóra do intervalo de datas validas
+ErrorValueLength=A lonxitude do campo "<b>%s</b>" debe ser superior a "<b>%s</b>"
+ErrorReservedKeyword=A palabra '<b>%s</b>' é unha palabra chave reservada
+ErrorNotAvailableWithThisDistribution=Non dispoñible con esta distribución
+ErrorPublicInterfaceNotEnabled=Inf¡terfaz público non activada
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=O idioma da nova páxina debe definirse se se define como tradución doutra páxina
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=O idioma da nova páxina non debe ser o idioma de orixe se se define como tradución doutra páxina
+ErrorAParameterIsRequiredForThisOperation=É obrigado un parámetro para esta operación
+
 # Warnings
-WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
-WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
-WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
-WarningEnableYourModulesApplications=Click here to enable your modules and applications
-WarningSafeModeOnCheckExecDir=Warning, PHP option <b>safe_mode</b> is on so command must be stored inside a directory declared by php parameter <b>safe_mode_exec_dir</b>.
-WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists.
-WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this.
-WarningConfFileMustBeReadOnly=Warning, your config file (<b>htdocs/conf/conf.php</b>) can be overwritten by the web server. This is a serious security hole. Modify permissions on file to be in read only mode for operating system user used by Web server. If you use Windows and FAT format for your disk, you must know that this file system does not allow to add permissions on file, so can't be completely safe.
-WarningsOnXLines=Warnings on <b>%s</b> source record(s)
-WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be chosen by default until you check your module setup.
-WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable the installation/migration tools by adding a file <b>install.lock</b> into directory <b>%s</b>. Omitting the creation of this file is a grave security risk.
-WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other Setup).
-WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
-WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
-WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
-WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
-WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
-WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
-WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
-WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
-WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
-WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
-WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
-WarningProjectClosed=Project is closed. You must re-open it first.
-WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=O seu parámetro PHP upload_max_filesize (%s) é superior ao parámetro PHP post_max_size (%s). Esta non é unha configuración consistente.
+WarningPasswordSetWithNoAccount=Estableceuse un contrasinal para este membro. En calquera caso, non se creou ningunha conta de usuario. Polo tanto, este contrasinal está almacenado pero non se pode usar para iniciar sesión en Dolibarr. Pode ser usado por un módulo/interface externo, pero se non precisa definir ningún login ou contrasinal para un membro, pode desactivar a opción "Xestionar un inicio de sesión para cada membro" desde a configuración do módulo Membros. Se precisa xestionar un inicio de sesión pero non precisa ningún contrasinal, pode manter este campo baleiro para evitar este aviso. Nota: o correo electrónico tamén pode ser usado como inicio de sesión se o membro está ligado a un usuario.
+WarningMandatorySetupNotComplete=Faga clic aquí para configurar os parámetros obrigatorios
+WarningEnableYourModulesApplications=Faga clic aquí para habilitar os seus módulos e aplicacións
+WarningSafeModeOnCheckExecDir=Aviso, a opción PHP <b>safe_mode</b> está activada polo que o comando debe almacenarse dentro dun directorio declarado polo parámetro php <b>safe_mode_exec_dir</b>.
+WarningBookmarkAlreadyExists=Xa existe un marcador con este título ou este destino (URL).
+WarningPassIsEmpty=Aviso, o contrasinal da base de datos está baleiro. Este é un burato de seguridade. Debería engadir un contrasinal á súa base de datos e cambiar o ficheiro conf.php para reflectilo.
+WarningConfFileMustBeReadOnly=Aviso, o seu ficheiro de configuración (<b>htdocs/conf/conf.php</b>) pode ser sobrescrito polo servidor web. Este é un grave burato de seguridade. Modifique os permisos do ficheiro para que estexan en modo de só lectura para o usuario do sistema operativo usado polo servidor web. Se usa o formato Windows e FAT para o seu disco, debe saber que este sistema de ficheiros non permite engadir permisos no ficheiro, polo que non pode ser completamente seguro.
+WarningsOnXLines=Avisos nos rexistro(s) fonte <b>%s</b>
+WarningNoDocumentModelActivated=Non se activou ningún modelo para a xeración de documentos. Escollerase un modelo por defecto ata que comprobe a configuración do seu módulo.
+WarningLockFileDoesNotExists=Aviso, unha vez rematada a configuración, debe desactivar as ferramentas de instalación/migración engadindo un ficheiro <b>install.lock</b> ao directorio <b>%s</b>2. Omitir a creación deste ficheiro é un grave risco de seguridade.
+WarningUntilDirRemoved=Todos os avisos de seguridade (visibles só polos administradores) permanecerán activos mentres a vulnerabilidade estexa presente (ou se engada esa constante MAIN_REMOVE_INSTALL_WARNING en Configuración-> Outra configuración).
+WarningCloseAlways=Aviso, o peche faise aínda que a cantidade difire entre os elementos de orixe e de destino. Active esta función con precaución.
+WarningUsingThisBoxSlowDown=Aviso, usando este panel ralentiza seriamente todas as páxinas que amosan o panel.
+WarningClickToDialUserSetupNotComplete=A configuración da información ClickToDial para o seu usuario non está completa (consulte a lapela ClickToDial na súa tarxeta de usuario).
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Función desactivada cando a configuración da pantalla está optimizada para navegadores de texto ou persoas cegas.
+WarningPaymentDateLowerThanInvoiceDate=A data de pagamento (%s) é anterior á data da factura (%s) para a factura %s.
+WarningTooManyDataPleaseUseMoreFilters=Datos de mais (máis de %s liñas). Utilice máis filtros ou estableza a constante %s nun límite máis alto.
+WarningSomeLinesWithNullHourlyRate=Algunhas veces algúns usuarios rexistráronse mentres a súa tarifa por hora non estaba definida. Utilizouse un valor do 0 %s por hora, pero isto pode resultar nunha avaliación incorrecta do tempo empregado.
+WarningYourLoginWasModifiedPleaseLogin=Modificouse o seu inicio de sesión. Por motivos de seguridade, terá que iniciar sesión co novo inicio de sesión antes da seguinte acción.
+WarningAnEntryAlreadyExistForTransKey=Xa existe unha entrada para a clave de tradución para este idioma
+WarningNumberOfRecipientIsRestrictedInMassAction=Aviso, o número de destinatarios diferentes está limitado a <b>%s</b> cando se usan as accións masivas nas listaxes
+WarningDateOfLineMustBeInExpenseReportRange=Aviso, a data da liña non está no rango do informe de gastos
+WarningProjectDraft=O proxecto aínda está en modo borrador. Non esqueza validalo se ten pensado usar tarefas.
+WarningProjectClosed=O proxecto está pechado. Primeiro debe abrilo de novo.
+WarningSomeBankTransactionByChequeWereRemovedAfter=Algunhas transaccións bancarias elimináronse despois de que se xerou o recibo que as incluíu. Polo tanto, o número de cheques e o total da recepción poden diferir do número e o total na listaxe.
+WarningFailedToAddFileIntoDatabaseIndex=Aviso, non se puido engadir a entrada do ficheiro á táboa de índice da base de datos ECM
+WarningTheHiddenOptionIsOn=Aviso, a opción oculta <b>%s</b> está activa.
+WarningCreateSubAccounts=Aviso, non pode crear directamente unha subconta, debe crear un terceiro ou un usuario e asignarlles un código contable para atopalos nesta listaxe
+WarningAvailableOnlyForHTTPSServers=Dispoñible só se usa conexión segura HTTPS.
diff --git a/htdocs/langs/gl_ES/exports.lang b/htdocs/langs/gl_ES/exports.lang
index 52343e63453..92d24c84a79 100644
--- a/htdocs/langs/gl_ES/exports.lang
+++ b/htdocs/langs/gl_ES/exports.lang
@@ -26,8 +26,8 @@ FieldTitle=Título campo
 NowClickToGenerateToBuildExportFile=Agora, seleccione o formato de exportación da lista despregable e faga clic en "Xerar" para xerar o ficheiro de exportación...
 AvailableFormats=Formatos dispoñibles
 LibraryShort=Librería
-ExportCsvSeparator=Csv caracter separator
-ImportCsvSeparator=Csv caracter separator
+ExportCsvSeparator=Separador de caracteres en CSV
+ImportCsvSeparator=Separador de caracteres en CSV
 Step=Paso
 FormatedImport=Asistente de importación
 FormatedImportDesc1=Esta área permitelle realizar importacións persoalizadas de datos mediante un axudante que evita ter coñecementos técnicos de Dolibarr.
@@ -92,11 +92,11 @@ NbOfLinesOK=Número de liñas sen erros nin warnings: <b>%s</b>.
 NbOfLinesImported=Número de liñas correctamente importadas: <b>%s</b>.
 DataComeFromNoWhere=O valor a insertar non corresponde a ningún campo do ficheiro orixe.
 DataComeFromFileFieldNb=O valor a insertar correspondese ao campo número <b>%s</b> do ficheiro orixe.
-DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the object <b>%s</b> that has the ref. from source file must exist in the database).
-DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the code from source file must exist in the dictionary <b>%s</b>). Note that if you know the id, you can also use it in the source file instead of the code. Import should work in both cases.
-DataIsInsertedInto=Data coming from source file will be inserted into the following field:
-DataIDSourceIsInsertedInto=The id of parent object was found using the data in the source file, will be inserted into the following field:
-DataCodeIDSourceIsInsertedInto=The id of parent line found from code, will be inserted into following field:
+DataComeFromIdFoundFromRef=O valor que provén do campo número <b>%s</b> do ficheiro fonte usarase para atopar o id do obxecto principal que se vai usar (polo que o obxecto <b>%s</b> que ten a ref. a partir do ficheiro fonte debe existir na base de datos).
+DataComeFromIdFoundFromCodeId=O código que provén do campo número <b>%s</b> do ficheiro fonte usarase para atopar o id do obxecto principal que se vai usar (polo que o código do ficheiro fonte debe existir no dicionario <b>%s</b>). Teña conta que se coñece o id, tamén pode usalo no ficheiro fonte no canto do código. A importación debería funcionar nos dous casos.
+DataIsInsertedInto=Os datos procedentes do ficheiro fonte engádense no seguinte campo:
+DataIDSourceIsInsertedInto=A identificación do obxecto principal atopouse empregando os datos do ficheiro orixe e engádense no seguinte campo:
+DataCodeIDSourceIsInsertedInto=A identificación da liña principal atopada no códigoengádese no seguinte campo:
 SourceRequired=Datos de orixe obligatorios
 SourceExample=Ejemplo de datos de orixe posibles
 ExampleAnyRefFoundIntoElement=Todas as referencias atopadas para os elementos <b>%s</b>
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Clave a usar para actualizar datos
 NbInsert=Número de liñas engadidas: %s
 NbUpdate=Número de liñas actualizadas: %s
 MultipleRecordFoundWithTheseFilters=Atopáronse varios rexistros con estes filtros: %s
+StocksWithBatch=Existencias e localización (almacén) de produtos con número de lote/serie
diff --git a/htdocs/langs/gl_ES/ftp.lang b/htdocs/langs/gl_ES/ftp.lang
index a31e113a6bb..ec3838e9007 100644
--- a/htdocs/langs/gl_ES/ftp.lang
+++ b/htdocs/langs/gl_ES/ftp.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Configuración do módulo cliente FTP
-NewFTPClient=Nova configuracións cliente FTP
-FTPArea=Área FTP
-FTPAreaDesc=Esta pantalla amosa unha vista de servidor FTP
-SetupOfFTPClientModuleNotComplete=A configuración do módulo de cliente FTP parece incompleta
-FTPFeatureNotSupportedByYourPHP=O seu PHP no soporta as funcións FTP
-FailedToConnectToFTPServer=Non foi posible conectar co servidor FTP  (servidor: %s, porto %s)
-FailedToConnectToFTPServerWithCredentials=Non foi posible entrar co usuario/contrasinal FTP configurados
+FTPClientSetup=Configuración do módulo cliente FTP ou SFTP
+NewFTPClient=Nova configuración de conexión FTP/SFTP 
+FTPArea=Área FTP/SFTP
+FTPAreaDesc=Esta pantalla  amosa unha vista dun servidor FTP/SFTP
+SetupOfFTPClientModuleNotComplete=A configuración do módulo cliente FTP ou SFTP parece estar imcompleta
+FTPFeatureNotSupportedByYourPHP=O seu PHP non soporta funcións FTP/SFTP'
+FailedToConnectToFTPServer=Fallo ao conectar ao servidor (servidor %s, porto %s)
+FailedToConnectToFTPServerWithCredentials=Fallo ao iniciar sesión no servidor co inicio de sesión/contrasinal
 FTPFailedToRemoveFile=Non foi posible eliminar o ficheiro <b>%s</b>.
 FTPFailedToRemoveDir=Non foi posible eliminar o directorio <b>%s</b> (Comprobe os permisos e que o directorio está baleiro).
 FTPPassiveMode=Modo pasivo
-ChooseAFTPEntryIntoMenu=Escolla un sitio FTP no menú ...
+ChooseAFTPEntryIntoMenu=Escolla un sitio FTP/SFTM no menú ...
 FailedToGetFile=Non foi posible acadar os ficheiros %s
diff --git a/htdocs/langs/gl_ES/holiday.lang b/htdocs/langs/gl_ES/holiday.lang
index 6c59ada6a35..c2a87c5322c 100644
--- a/htdocs/langs/gl_ES/holiday.lang
+++ b/htdocs/langs/gl_ES/holiday.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - holiday
-HRM=HRM
-Holidays=Día libre
+HRM=RRHH
+Holidays=Vacacións
 CPTitreMenu=Día libre
 MenuReportMonth=Estado mensual
 MenuAddCP=Nova petición de vacacións
@@ -18,7 +18,7 @@ ListeCP=Listaxe de días libres
 Leave=Pedido de días libres
 LeaveId=ID Vacacións
 ReviewedByCP=Será revisada por
-UserID=User ID
+UserID=ID do Usuario
 UserForApprovalID=ID de usuario de aprobación
 UserForApprovalFirstname=Nome do usuario de aprobación
 UserForApprovalLastname=Apelido do usuario de aprobación
@@ -39,11 +39,11 @@ TitreRequestCP=Pedido de días libres
 TypeOfLeaveId=ID tipo de días libres
 TypeOfLeaveCode=Código tipo de días libres
 TypeOfLeaveLabel=Tipo de etiqueta de días libres
-NbUseDaysCP=Número de vacacións consumidos
-NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
+NbUseDaysCP=Número de días de vacacións consumidas
+NbUseDaysCPHelp=O cálculo toma dentro da conta os días non laborais e as vacacións definidas no diccionario.
 NbUseDaysCPShort=Días consumidos
 NbUseDaysCPShortInMonth=Días consumidos en mes
-DayIsANonWorkingDay=%s is a non working day
+DayIsANonWorkingDay=%s é un día non laboral
 DateStartInMonth=Data de inicio en mes
 DateEndInMonth=Data de fin en mes
 EditCP=Editar
@@ -130,5 +130,5 @@ HolidaysNumberingModules=Modelos de numeración de petición de días libres
 TemplatePDFHolidays=Prantilla PDF para petición de días libres
 FreeLegalTextOnHolidays=Texto libre no PDF
 WatermarkOnDraftHolidayCards=Marca de auga no borrador de petición de días libres
-HolidaysToApprove=Holidays to approve
-NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
+HolidaysToApprove=Vacacións para aprobar
+NobodyHasPermissionToValidateHolidays=Ninguén ten permisos para validar vacacións
diff --git a/htdocs/langs/gl_ES/hrm.lang b/htdocs/langs/gl_ES/hrm.lang
index bd222ac2e5e..d5a29275c06 100644
--- a/htdocs/langs/gl_ES/hrm.lang
+++ b/htdocs/langs/gl_ES/hrm.lang
@@ -1,19 +1,19 @@
 # Dolibarr language file - en_US - hrm
 # Admin
-HRM_EMAIL_EXTERNAL_SERVICE=Email to prevent HRM external service
-Establishments=Establishments
-Establishment=Establishment
-NewEstablishment=New establishment
-DeleteEstablishment=Delete establishment
-ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
-OpenEtablishment=Open establishment
-CloseEtablishment=Close establishment
+HRM_EMAIL_EXTERNAL_SERVICE=Cooreo electrónico do SPA
+Establishments=Establecementos
+Establishment=Establecemento
+NewEstablishment=Novo establecemento
+DeleteEstablishment=Eliminar establecemento
+ConfirmDeleteEstablishment=Está certo de querer eliminar este establecemento?
+OpenEtablishment=Abrir establecemento
+CloseEtablishment=Pechar establecemento
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
-DictionaryDepartment=HRM - Department list
-DictionaryFunction=HRM - Job positions
+DictionaryPublicHolidays=RRHH - Festivos
+DictionaryDepartment=RRHH - Listaxe Departamentos
+DictionaryFunction=RRHH - Postos de traballo
 # Module
 Employees=Empregados
 Employee=Empregado
-NewEmployee=New employee
-ListOfEmployees=List of employees
+NewEmployee=Novo empregado
+ListOfEmployees=Listaxe de empregados
diff --git a/htdocs/langs/gl_ES/install.lang b/htdocs/langs/gl_ES/install.lang
index 65fd314784a..2648507dbdd 100644
--- a/htdocs/langs/gl_ES/install.lang
+++ b/htdocs/langs/gl_ES/install.lang
@@ -1,55 +1,55 @@
 # Dolibarr language file - Source file is en_US - install
-InstallEasy=Just follow the instructions step by step.
-MiscellaneousChecks=Prerequisites check
-ConfFileExists=Configuration file <b>%s</b> exists.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
-ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
-ConfFileIsWritable=Configuration file <b>%s</b> is writable.
-ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Reloading parameters from configuration file.
-PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportSessions=This PHP supports sessions.
-PHPSupport=This PHP supports %s functions.
-PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
-PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
-Recheck=Click here for a more detailed test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
-ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
-ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
-ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
-ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
-ErrorDirDoesNotExists=Directory %s does not exist.
-ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
-ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
-ErrorFailedToCreateDatabase=Failed to create database '%s'.
-ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
-ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
-ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
-ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
-ErrorDatabaseAlreadyExists=Database '%s' already exists.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
-IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
-WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
-PHPVersion=PHP Version
-License=Using license
-ConfigurationFile=Configuration file
-WebPagesDirectory=Directory where web pages are stored
-DocumentsDirectory=Directory to store uploaded and generated documents
-URLRoot=URL Root
-ForceHttps=Force secure connections (https)
-CheckToForceHttps=Check this option to force secure connections (https).<br>This requires that the web server is configured with an SSL certificate.
-DolibarrDatabase=Dolibarr Database
-DatabaseType=Database type
-DriverType=Tipo de driver
+InstallEasy=Só ten que seguir as instrucións paso a paso.
+MiscellaneousChecks=Comprobación dos requisitos previos
+ConfFileExists=Existe o ficheiro de configuración <b>%s </b>.
+ConfFileDoesNotExistsAndCouldNotBeCreated=O ficheiro de configuración <b>%s</b> non existe e non puido ser creado!
+ConfFileCouldBeCreated=Pódese crear o ficheiro de configuración <b>%s</b>.
+ConfFileIsNotWritable=O ficheiro de configuración <b>%s</b> non se pode escribir. Comprobe os permisos. Para a primeira instalación, o servidor web debe poder escribir neste ficheiro durante o proceso de configuración ("chmod 666" por exemplo nun sistema operativo como Unix).
+ConfFileIsWritable=O ficheiro de configuración <b>%s</b> é escribíbel.
+ConfFileMustBeAFileNotADir=O ficheiro de configuración <b>%s</b> debe ser un ficheiro, non un directorio.
+ConfFileReload=Recargando parámetros do ficheiro de configuración.
+PHPSupportPOSTGETOk=Este PHP admite variables POST e GET.
+PHPSupportPOSTGETKo=É posible que a súa configuración de PHP non admita variables POST e/ou GET. Comprobe o parámetro <b>variables_order</b> en php.ini.
+PHPSupportSessions=Este PHP admite sesións.
+PHPSupport=Este PHP admite funcións de %s.
+PHPMemoryOK=A memoria de sesión máxima de PHP está configurada en <b>%s</b>. Isto debería ser suficiente.
+PHPMemoryTooLow=A memoria de sesión máxima de PHP está configurada en <b>%s</b> bytes. Isto é demasiado baixo. Cambie o seu <b>php.ini</b> para establecer o parámetro <b>memory_limit</b> en polo menos <b>%s</b> bytes.
+Recheck=Faga clic aquí para unha proba máis detallada
+ErrorPHPDoesNotSupportSessions=A súa instalación de PHP non admite sesións. Esta función é precisa para que Dolibarr poida traballar. Comprobe a súa configuración de PHP e os permisos do directorio de sesións.
+ErrorPHPDoesNotSupportGD=A súa instalación de PHP non admite funcións gráficas GD. Non haberá gráficos dispoñibles.
+ErrorPHPDoesNotSupportCurl=A súa instalación de PHP non admite Curl.
+ErrorPHPDoesNotSupportCalendar=A súa instalación de PHP non admite extensións do calendario php.
+ErrorPHPDoesNotSupportUTF8=A súa instalación de PHP non admite funcións UTF8. Dolibarr non pode funcionar correctamente. Resolva isto antes de instalar Dolibarr.
+ErrorPHPDoesNotSupportIntl=​​= A súa instalación de PHP non admite funcións Intl.
+ErrorPHPDoesNotSupportxDebug=A súa instalación de PHP non admite funcións de depuración extensivas.
+ErrorPHPDoesNotSupport=A súa instalación de PHP non admite funcións de %s.
+ErrorDirDoesNotExists=O directorio %s non existe.
+ErrorGoBackAndCorrectParameters=Voltar atrás e comprobar/corrixir os parámetros.
+ErrorWrongValueForParameter=Pode que escribise un valor incorrecto para o parámetro '%s'.
+ErrorFailedToCreateDatabase=Fallo ao crear a base de datos '%s'.
+ErrorFailedToConnectToDatabase=Produciuse un fallo ao conectarse á base de datos '%s'.
+ErrorDatabaseVersionTooLow=A versión da base de datos (%s) é antiga de mais. É precisa a versión %s ou superior.
+ErrorPHPVersionTooLow=A versión de PHP é antiga de mais. É precisa a versión %s.
+ErrorConnectedButDatabaseNotFound=Conexión correcta ao servidor pero non se atopou a base de datos '%s'.
+ErrorDatabaseAlreadyExists=A base de datos '%s' xa existe.
+IfDatabaseNotExistsGoBackAndUncheckCreate=Se a base de datos non existe, volte atrás e marque a opción "Crear base de datos".
+IfDatabaseExistsGoBackAndCheckCreate=Se a base de datos xa existe, volte atrás e desmarque a opción "Crear base de datos".
+WarningBrowserTooOld=A versión do navegador é antiga de mais. É moi recomendable actualizar o seu navegador a unha versión recente de Firefox, Chrome ou Opera.
+PHPVersion=Versión de PHP
+License=Usando licenza
+ConfigurationFile=Arquivo de configuración
+WebPagesDirectory=Directorio onde se almacenan as páxinas web
+DocumentsDirectory=Directorio para almacenar os documentos cargados e xerados
+URLRoot=Raíz URL
+ForceHttps=Forzar conexións seguras (https)
+CheckToForceHttps=Marque esta opción para forzar conexións seguras (https). <br> Isto require que o servidor web estexa configurado cun certificado SSL.
+DolibarrDatabase=Base de datos Dolibarr
+DatabaseType=Tipo de base de datos
+DriverType=Tipo de controlador
 Server=Servidor
-ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
-ServerPortDescription=Database server port. Keep empty if unknown.
-DatabaseServer=Database server
+ServerAddressDescription=Nome ou enderezo IP do servidor de base de datos. Normalmente "localhost" cando o servidor de base de datos está aloxado no mesmo servidor que o servidor web.
+ServerPortDescription=Porto do servidor da base de datos. Mantéñase baleiro se o descoñece.
+DatabaseServer=Servidor da base de datos
 DatabaseName=Nome da base de datos
 DatabasePrefix=Database table prefix
 DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
@@ -102,116 +102,116 @@ ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
 FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Actualización
-UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
+UpgradeDesc=Utilice este modo se substituíu ficheiros Dolibarr antigos por ficheiros dunha versión máis recente. Isto actualizará a súa base de datos e os datos.
 Start=Start
-InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
-YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
+InstallNotAllowed=A configuración non está permitida polos permisos en <b> conf.php </b>
+YouMustCreateWithPermission=Debe crear o ficheiro %s e establecer permisos de escritura nel para o servidor web durante o proceso de instalación.
+CorrectProblemAndReloadPage=Corrixa o problema e prema F5 para recargar a páxina.
 AlreadyDone=Already migrated
-DatabaseVersion=Database version
-ServerVersion=Database server version
-YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
-DBSortingCollation=Character sorting order
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
-OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
-RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
-FieldRenamed=Field renamed
-IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
-InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
-InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
-CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
-IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
-OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
-NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
-MigrationCustomerOrderShipping=Migrate shipping for sales orders storage
-MigrationShippingDelivery=Upgrade storage of shipping
-MigrationShippingDelivery2=Upgrade storage of shipping 2
-MigrationFinished=Migration finished
-LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
-ActivateModule=Activate module %s
-ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
-KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
-KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
-UpgradeExternalModule=Run dedicated upgrade process of external module
-SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
-NothingToDelete=Nothing to clean/delete
+DatabaseVersion=Versión da base de datos
+ServerVersion=Versión do servidor de base de datos
+YouMustCreateItAndAllowServerToWrite=Debe crear este directorio e permitir que o servidor web escriba nel.
+DBSortingCollation=Orde de clasificación de caracteres
+YouAskDatabaseCreationSoDolibarrNeedToConnect=Seleccionou crear base de datos <b>%s</b>, pero para iso, Dolibarr necesita conectarse ao servidor <b>%s</b> con permisos de superusuario <b>%s</b>.
+YouAskLoginCreationSoDolibarrNeedToConnect=Seleccionou crear usuario de base de datos <b>%s</b>, pero para iso, Dolibarr necesita conectarse ao servidor <b>%s</b> con permisos de superusuario <b>%s</b> .
+BecauseConnectionFailedParametersMayBeWrong=Fallou a conexión á base de datos: os parámetros host ou superusuario deben ser erroneos.
+OrphelinsPaymentsDetectedByMethod=Detectouse o pagamento de orfos polo método %s
+RemoveItManuallyAndPressF5ToContinue=Elimine manualmente e prema F5 para continuar.
+FieldRenamed=Cambiouse o nome do campo
+IfLoginDoesNotExistsCheckCreateUser=Se o usuario aínda non existe, debe marcar a opción "Crear usuario"
+ErrorConnection=O servidor "<b>%s</b>", o nome da base de datos "<b>%s</b>", o inicio de sesión "<b>%s</b>" ou o contrasinal da base de datos poden estar mal ou a versión do cliente de PHP pode ser demasiado antiga en comparación coa versión da base de datos.
+InstallChoiceRecommanded=Escolla recomendada para instalar a versión <b>%s</b> sobre a súa versión actual <b>%s</b>
+InstallChoiceSuggested=<b> Escolla de instalación suxerida polo instalador </b>.
+MigrateIsDoneStepByStep=A versión destino (%s) ten un oco de varias versións. O asistente de instalación volverá suxerir unha nova migración unha vez completada.
+CheckThatDatabasenameIsCorrect=Comprobe que o nome da base de datos "<b>%s</b>" é correcto.
+IfAlreadyExistsCheckOption=Se este nome é correcto e esa base de datos aínda non existe, debe marcar a opción "Crear base de datos".
+OpenBaseDir=Parámetro openbasedir de PHP
+YouAskToCreateDatabaseSoRootRequired=Marcou a caixa "Crear base de datos". Para iso, ten que proporcionar o nome de usuario/contrasinal do superusuario (parte inferior do formulario).
+YouAskToCreateDatabaseUserSoRootRequired=Marcou a caixa "Crear propietario da base de datos". Para iso, ten que proporcionar o nome de usuario/contrasinal do superusuario (parte inferior do formulario).
+NextStepMightLastALongTime=O paso actual pode levar varios minutos. Agarde ata que a seguinte pantalla se amose completamente antes de continuar.
+MigrationCustomerOrderShipping=Migrar o envío para o almacenamento de pedimentos de cliente
+MigrationShippingDelivery=Actualizar o almacenamento do envío
+MigrationShippingDelivery2=Actualizar o almacenamento do envío 2
+MigrationFinished=Rematou a migración
+LastStepDesc=​​= <strong> Último paso </strong>: defina aquí o inicio de sesión e o contrasinal que desexa usar para conectarse a Dolibarr. <b> Non o perda xa que é a conta principal para administrar todas as outras contas de usuario/ adicionais. </b>
+ActivateModule=Activar o módulo %s
+ShowEditTechnicalParameters=Faga clic aquí para amosar/editar parámetros avanzados (modo experto)
+WarningUpgrade=Aviso: \n Xestionou primeiro unha copia de seguridade da base de datos? \\ Esto é moi recomendable. A perda de datos (por exemplo, erros na versión 5.5.40 /41/42/43 de mysql) pode ser posible durante este proceso, polo que é esencial facer unha descarga completa da súa base de datos antes de iniciar calquera migración. \n \n Prema Aceptar para iniciar o proceso de migración ...
+ErrorDatabaseVersionForbiddenForMigration=A súa versión de base de datos é %s. Ten un erro crítico, o que fai posible a perda de datos se realiza cambios estruturais na súa base de datos, como o require o proceso de migración. Por esta razón, a migración non se permitirá ata que actualice a base de datos a unha versión mayor sin errores (parcheada) (lista de versiónscoñecidas con este erro: %s)
+KeepDefaultValuesWamp=Usou o asistente de configuración Dolibarr de DoliWamp, polo que os valores aquí propostos xa están optimizados. Cambialos só se sabe o que fai.
+KeepDefaultValuesDeb=Usou o asistente de configuración Dolibarr desde un paquete Linux (Ubuntu, Debian, Fedora ...), polo que os valores aquí propostos xa están optimizados. Só se debe introducir o contrasinal do propietario da base de datos para crear. Cambia outros parámetros só se sabe o que fai.
+KeepDefaultValuesMamp=Usou o asistente de configuración Dolibarr de DoliMamp, polo que os valores aquí propostos xa están optimizados. Cambialos só se sabe o que fai.
+KeepDefaultValuesProxmox=Usou o asistente de configuración Dolibarr desde unha aplicación virtual Proxmox, polo que os valores aquí propostos xa están optimizados. Cambialos só se sabe o que fai.
+UpgradeExternalModule=Executa o proceso adicado de actualización do módulo externo
+SetAtLeastOneOptionAsUrlParameter=Establecer polo menos unha opción como parámetro no URL. Por exemplo: '... repair.php?Standard=confirmado'
+NothingToDelete=Nada que limpar/eliminar
 NothingToDo=Nothing to do
 #########
 # upgrade
-MigrationFixData=Fix for denormalized data
-MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Data migration for vendor's orders
-MigrationProposal=Data migration for commercial proposals
-MigrationInvoice=Data migration for customer's invoices
-MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successful
-MigrationUpdateFailed=Failed upgrade process
-MigrationRelationshipTables=Data migration for relationship tables (%s)
-MigrationPaymentsUpdate=Payment data correction
-MigrationPaymentsNumberToUpdate=%s payment(s) to update
-MigrationProcessPaymentUpdate=Update payment(s) %s
-MigrationPaymentsNothingToUpdate=No more things to do
-MigrationPaymentsNothingUpdatable=No more payments that can be corrected
-MigrationContractsUpdate=Contract data correction
-MigrationContractsNumberToUpdate=%s contract(s) to update
-MigrationContractsLineCreation=Create contract line for contract ref %s
-MigrationContractsNothingToUpdate=No more things to do
-MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
-MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
-MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
-MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
-MigrationContractsInvalidDatesUpdate=Bad value date contract correction
-MigrationContractsInvalidDateFix=Correct contract %s (Contract date=%s, Starting service date min=%s)
-MigrationContractsInvalidDatesNumber=%s contracts modified
-MigrationContractsInvalidDatesNothingToUpdate=No date with bad value to correct
-MigrationContractsIncoherentCreationDateUpdate=Bad value contract creation date correction
-MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done successfully
-MigrationContractsIncoherentCreationDateNothingToUpdate=No bad value for contract creation date to correct
-MigrationReopeningContracts=Open contract closed by error
-MigrationReopenThisContract=Reopen contract %s
-MigrationReopenedContractsNumber=%s contracts modified
-MigrationReopeningContractsNothingToUpdate=No closed contract to open
-MigrationBankTransfertsUpdate=Update links between bank entry and a bank transfer
-MigrationBankTransfertsNothingToUpdate=All links are up to date
-MigrationShipmentOrderMatching=Sendings receipt update
-MigrationDeliveryOrderMatching=Delivery receipt update
-MigrationDeliveryDetail=Delivery update
-MigrationStockDetail=Update stock value of products
-MigrationMenusDetail=Update dynamic menus tables
-MigrationDeliveryAddress=Update delivery address in shipments
-MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
-MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
-MigrationProjectTaskTime=Update time spent in seconds
-MigrationActioncommElement=Update data on actions
-MigrationPaymentMode=Data migration for payment type
-MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration of events to add event owner into assignment table
-MigrationEventsContact=Migration of events to add event contact into assignment table
-MigrationRemiseEntity=Update entity field value of llx_societe_remise
-MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
-MigrationUserRightsEntity=Update entity field value of llx_user_rights
-MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
-MigrationUserPhotoPath=Migration of photo paths for users
-MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
-MigrationReloadModule=Reload module %s
-MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Show unavailable options
-HideNotAvailableOptions=Hide unavailable options
-ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
-YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
-ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=If an upgrade is in progress, please wait. If not, click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
-Loaded=Loaded
-FunctionTest=Function test
+MigrationFixData=Corrección de datos desnormalizados
+MigrationOrder=Migración de datos para os pedidos do cliente
+MigrationSupplierOrder=Migración de datos para os pedidos do provedor
+MigrationProposal=Migración de datos para propostas comerciais
+MigrationInvoice=Migración de datos para as facturas do cliente
+MigrationContract=Migración de datos para contratos
+MigrationSuccessfullUpdate=Actualización realizada correctamente
+MigrationUpdateFailed=Fallou o proceso de actualización
+MigrationRelationshipTables=Migración de datos para táboas de relacións (%s)
+MigrationPaymentsUpdate=Corrección de datos de pago
+MigrationPaymentsNumberToUpdate=%s pago(s) para actualizar
+MigrationProcessPaymentUpdate=Actualizar o(s) pagamento(s) %s
+MigrationPaymentsNothingToUpdate=Non hai máis cousas que facer
+MigrationPaymentsNothingUpdatable=Non hai máis pagamentos que se poidan corrixir
+MigrationContractsUpdate=Corrección de datos do contrato
+MigrationContractsNumberToUpdate=%s contrato(s) para actualizar
+MigrationContractsLineCreation=Crear unha liña de contrato para a ref. %S do contrato
+MigrationContractsNothingToUpdate=Non hai máis cousas que facer
+MigrationContractsFieldDontExist=O campo fk_facture xa non existe. Nada que facer.
+MigrationContractsEmptyDatesUpdate=Corrección de contratos de data baleira
+MigrationContractsEmptyDatesUpdateSuccess=A corrección da data baleira do contrato fíxose correctamente
+MigrationContractsEmptyDatesNothingToUpdate=Non hai data baleira do contrato para corrixir
+MigrationContractsEmptyCreationDatesNothingToUpdate=Non hai data de creación do contrato para corrixir
+MigrationContractsInvalidDatesUpdate=Corrección do contrato de data de valor incorrecto
+MigrationContractsInvalidDateFix=Contrato correcto %s (Data do contrato =%s, Data de inicio do servizo min =%s)
+MigrationContractsInvalidDatesNumber=%s contratos modificados
+MigrationContractsInvalidDatesNothingToUpdate=Non hai data con valor erroneo para corrixir
+MigrationContractsIncoherentCreationDateUpdate=Corrección da data de creación do contrato de valor incorrecto
+MigrationContractsIncoherentCreationDateUpdateSuccess=Corrección da data de creación do contrato de valor incorrecto feita correctamente
+MigrationContractsIncoherentCreationDateNothingToUpdate=Non hai ningún valor mal para corrixir a data de creación do contrato
+MigrationReopeningContracts=Contrato aberto e pechado por erro
+MigrationReopenThisContract=Voltar a abrir o contrato %s
+MigrationReopenedContractsNumber=%s contratos modificados
+MigrationReopeningContractsNothingToUpdate=Non hai contrato pechado para abrir
+MigrationBankTransfertsUpdate=Actualizar ligazóns entre a entrada bancaria e unha transferencia bancaria
+MigrationBankTransfertsNothingToUpdate=Todas as ligazóns están actualizadas
+MigrationShipmentOrderMatching=Actualización do recibo dos envíos
+MigrationDeliveryOrderMatching=Actualización do recibo de entrega
+MigrationDeliveryDetail=Actualización de entrega
+MigrationStockDetail=Actualizar o valor de stock dos produtos
+MigrationMenusDetail=Actualizar táboas de menús dinámicos
+MigrationDeliveryAddress=Actualizar o enderezo de entrega nos envíos
+MigrationProjectTaskActors=Migración de datos para a táboa llx_projet_task_actors
+MigrationProjectUserResp=Campo de migración de datos fk_user_resp de llx_projet para llx_element_contact
+MigrationProjectTaskTime=Tempo de actualización empregado en segundos
+MigrationActioncommElement=Actualizar datos sobre accións
+MigrationPaymentMode=Migración de datos para o tipo de pago
+MigrationCategorieAssociation=Migración de categorías
+MigrationEvents=Migración de eventos para engadir o propietario do evento á táboa de tarefas
+MigrationEventsContact=Migración de eventos para engadir contacto de evento á táboa de asignación
+MigrationRemiseEntity=Actualizar o valor do campo da entidade de llx_societe_remise
+MigrationRemiseExceptEntity=Actualizar o valor do campo da entidade de llx_societe_remise_except
+MigrationUserRightsEntity=Actualizar o valor do campo da entidade de llx_user_rights
+MigrationUserGroupRightsEntity=Actualizar o valor do campo da entidade de llx_usergroup_rights
+MigrationUserPhotoPath=Migración de enderezos de fotos para usuarios
+MigrationFieldsSocialNetworks=Migración de redes sociais dos campos dos usuarios (%s)
+MigrationReloadModule=Recargar o módulo %s
+MigrationResetBlockedLog=Restablecer o módulo BlockedLog para o algoritmo v7
+ShowNotAvailableOptions=Amosar as opcións non dispoñibles
+HideNotAvailableOptions=Ocultar opcións non dispoñibles
+ErrorFoundDuringMigration=Informáronse erros durante o proceso de migración polo que o seguinte paso non está dispoñible. Para ignorar os erros, pode <a href="%s"> facer clic aquí </a>, pero é posible que a aplicación ou algunhas funcións non funcionen correctamente ata que non se resolvan os erros.
+YouTryInstallDisabledByDirLock=A aplicación tentou actualizarse por si mesma, pero as páxinas de instalación/actualización desactiváronse por seguridade (directorio renomeado co sufixo .lock). <br>
+YouTryInstallDisabledByFileLock=A aplicación intentou actualizarse por si mesma, pero as páxinas de instalación/actualización desactiváronse por seguridade (pola existencia dun ficheiro de bloqueo <strong> install.lock </strong> no directorio de documentos dolibarr). <br>
+ClickHereToGoToApp=Fai clic aquí para ir á súa aplicación
+ClickOnLinkOrRemoveManualy=Se hai unha actualización en curso, agarde. Se non, faga clic na seguinte ligazón. Se sempre ve esta mesma páxina, debe eliminar/renomear o ficheiro install.lock no directorio de documentos.
+Loaded=Cargado
+FunctionTest=Función test
diff --git a/htdocs/langs/gl_ES/interventions.lang b/htdocs/langs/gl_ES/interventions.lang
index 37d18abb4c4..1da7ca6210a 100644
--- a/htdocs/langs/gl_ES/interventions.lang
+++ b/htdocs/langs/gl_ES/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervención
 Interventions=Intervencións
 InterventionCard=Intervention card
 NewIntervention=New intervention
-AddIntervention=Create intervention
+AddIntervention=Crear intervención
 ChangeIntoRepeatableIntervention=Change to repeatable intervention
 ListOfInterventions=List of interventions
 ActionsOnFicheInter=Actions on intervention
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/gl_ES/intracommreport.lang b/htdocs/langs/gl_ES/intracommreport.lang
index 576a0345c46..e0788dcbf47 100644
--- a/htdocs/langs/gl_ES/intracommreport.lang
+++ b/htdocs/langs/gl_ES/intracommreport.lang
@@ -1,40 +1,40 @@
-Module68000Name = Intracomm report
-Module68000Desc = Intracomm report management (Support for French DEB/DES format)
-IntracommReportSetup = Intracommreport module setup
-IntracommReportAbout = About intracommreport
+Module68000Name = Informe intracomm
+Module68000Desc = Xestión de informes intracomm (soporte para o formato francés DEB / DES)
+IntracommReportSetup = Configuración do módulo Intracommreport
+IntracommReportAbout = Acerca de intracommreport
 
 # Setup
-INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
-INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
-INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
-INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
-INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
-INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+INTRACOMMREPORT_NUM_AGREMENT=Número de aprobación (emitido polo CISD do anexo)
+INTRACOMMREPORT_TYPE_ACTEUR=Tipo de actor
+INTRACOMMREPORT_ROLE_ACTEUR=Rol interpretado polo actor
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Nivel de obriga das presentacións
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Nivel de obriga dos envíos
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Categoría de servizos tipo "Franqueo"
 
-INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+INTRACOMMREPORT_NUM_DECLARATION=Número de declarante
 
 # Menu
-MenuIntracommReport=Intracomm report
-MenuIntracommReportNew=New declaration
+MenuIntracommReport=Informe intracomm
+MenuIntracommReportNew=Nova declaración
 MenuIntracommReportList=Listaxe
 
 # View
-NewDeclaration=New declaration
-Declaration=Declaration
-AnalysisPeriod=Analysis period
-TypeOfDeclaration=Type of declaration
-DEB=Goods exchange declaration (DEB)
-DES=Services exchange declaration (DES)
+NewDeclaration=Nova declaración
+Declaration=Declaracion
+AnalysisPeriod=Período de análise
+TypeOfDeclaration=Tipo de declaración
+DEB=Declaración de cambio de mercadorías (DEB)
+DES=Declaración de intercambio de servizos (DES)
 
 # Export page
-IntracommReportTitle=Preparation of an XML file in ProDouane format
+IntracommReportTitle=Preparación dun ficheiro XML en formato ProAduana
 
 # List
-IntracommReportList=List of generated declarations
-IntracommReportNumber=Numero of declaration
-IntracommReportPeriod=Period of nalysis
-IntracommReportTypeDeclaration=Type of declaration
-IntracommReportDownload=download XML file
+IntracommReportList=Lista de declaracións xeradas
+IntracommReportNumber=Número de declaración
+IntracommReportPeriod=Período de análise
+IntracommReportTypeDeclaration=Tipo de declaración
+IntracommReportDownload=descargar o ficheiro XML
 
 # Invoice
-IntracommReportTransportMode=Transport mode
+IntracommReportTransportMode=Modo de transporte
diff --git a/htdocs/langs/gl_ES/languages.lang b/htdocs/langs/gl_ES/languages.lang
index ce9d78410c2..a66520eaa71 100644
--- a/htdocs/langs/gl_ES/languages.lang
+++ b/htdocs/langs/gl_ES/languages.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - languages
-Language_am_ET=Ethiopian
+Language_am_ET=Etíope
 Language_ar_AR=Árabe
-Language_ar_EG=Arabic (Egypt)
+Language_ar_EG=Árabe (Exipto)
 Language_ar_SA=Árabe
-Language_az_AZ=Azerbaijani
-Language_bn_BD=Bengali
+Language_az_AZ=Azerí
+Language_bn_BD=Bengalí
 Language_bn_IN=Bengali (India)
 Language_bg_BG=Búlgaro
 Language_bs_BA=Bosnio
@@ -14,61 +14,61 @@ Language_da_DA=Danés
 Language_da_DK=Danés
 Language_de_DE=Alemán
 Language_de_AT=Alemán (Austria)
-Language_de_CH=German (Switzerland)
+Language_de_CH=Alemán (Suíza)
 Language_el_GR=Grego
-Language_el_CY=Greek (Cyprus)
+Language_el_CY=Grego (Chipre)
 Language_en_AU=Inglés (Australia)
-Language_en_CA=English (Canada)
+Language_en_CA=Inglés (Canadá)
 Language_en_GB=Inglés (Reino Unido)
 Language_en_IN=Inglés (India)
 Language_en_NZ=Inglés (Nova Celandia)
 Language_en_SA=Inglés (Arabia Saudita)
-Language_en_SG=English (Singapore)
+Language_en_SG=Inglés (Singapur)
 Language_en_US=Inglés (Estados Unidos)
 Language_en_ZA=Inglés (Sudáfrica)
 Language_es_ES=Español
 Language_es_AR=Español (Arxentina)
-Language_es_BO=Spanish (Bolivia)
-Language_es_CL=Spanish (Chile)
-Language_es_CO=Spanish (Colombia)
-Language_es_DO=Spanish (Dominican Republic)
-Language_es_EC=Spanish (Ecuador)
-Language_es_GT=Spanish (Guatemala)
+Language_es_BO=Español (Bolivia)
+Language_es_CL=Español (Chile)
+Language_es_CO=Español (Colombia)
+Language_es_DO=Español (República Dominicana)
+Language_es_EC=Español (Ecuador)
+Language_es_GT=Español (Guatemala)
 Language_es_HN=Español (Honduras)
 Language_es_MX=Español (México)
-Language_es_PA=Spanish (Panama)
+Language_es_PA=Español (Panamá)
 Language_es_PY=Español (Paraguay)
 Language_es_PE=Español (Perú)
 Language_es_PR=Español (Porto Rico)
-Language_es_US=Spanish (USA)
-Language_es_UY=Spanish (Uruguay)
-Language_es_GT=Spanish (Guatemala)
-Language_es_VE=Spanish (Venezuela)
+Language_es_US=Español (USA)
+Language_es_UY=Español (Uruguai)
+Language_es_GT=Español (Guatemala)
+Language_es_VE=Español (Venezuela)
 Language_et_EE=Estoniano
 Language_eu_ES=Éuscaro
 Language_fa_IR=Persa
-Language_fi_FI=Finnish
+Language_fi_FI=Finés
 Language_fr_BE=Francés (Bélxica)
 Language_fr_CA=Francés (Canadá)
-Language_fr_CH=Francés (Suíza)
-Language_fr_CI=French (Cost Ivory)
-Language_fr_CM=French (Cameroun)
+Language_fr_CH=Francés (Suiza)
+Language_fr_CI=Francés (Costa Marfíl)
+Language_fr_CM=Francés (Camerún)
 Language_fr_FR=Francés
-Language_fr_GA=French (Gabon)
+Language_fr_GA=Francés (Gabón)
 Language_fr_NC=Francés (Nova Caledonia)
-Language_fr_SN=French (Senegal)
-Language_fy_NL=Frisian
-Language_gl_ES=Galician
+Language_fr_SN=Francés (Senegal)
+Language_fy_NL=Frisón
+Language_gl_ES=Galego
 Language_he_IL=Hebreo
 Language_hi_IN=Hindi (India)
 Language_hr_HR=Croata
 Language_hu_HU=Húngaro
-Language_id_ID=Indonesian
+Language_id_ID=Indonesio
 Language_is_IS=Islandés
 Language_it_IT=Italiano
-Language_it_CH=Italian (Switzerland)
+Language_it_CH=Italiano (Suíza)
 Language_ja_JP=Xaponés
-Language_ka_GE=Georgian
+Language_ka_GE=Xeorxiano
 Language_km_KH=Khmer
 Language_kn_IN=Kannada
 Language_ko_KR=Coreano
@@ -76,11 +76,11 @@ Language_lo_LA=Laos
 Language_lt_LT=Lituano
 Language_lv_LV=Letón
 Language_mk_MK=Macedonio
-Language_mn_MN=Mongolian
+Language_mn_MN=Mongol
 Language_nb_NO=Noruegués (Bokmål)
 Language_ne_NP=Nepali
 Language_nl_BE=Holandés (Bélxica)
-Language_nl_NL=Dutch
+Language_nl_NL=Alemán
 Language_pl_PL=Polaco
 Language_pt_BR=Portugués (Brasil)
 Language_pt_PT=Portugués
@@ -91,15 +91,15 @@ Language_tr_TR=Turco
 Language_sl_SI=Esloveno
 Language_sv_SV=Sueco
 Language_sv_SE=Sueco
-Language_sq_AL=Albanian
+Language_sq_AL=Albanés
 Language_sk_SK=Eslovaco
-Language_sr_RS=Serbian
+Language_sr_RS=Serbio
 Language_sw_SW=Kiswahili
-Language_th_TH=Thai
+Language_th_TH=Tailandés
 Language_uk_UA=Ucraíno
 Language_uz_UZ=Usbeco
 Language_vi_VN=Vietnamita
 Language_zh_CN=Chinés
-Language_zh_TW=Chinés (tradicional)
-Language_zh_HK=Chinese (Hong Kong)
-Language_bh_MY=Malay
+Language_zh_TW=Chinés (Tradicional)
+Language_zh_HK=Chinés (Hong Kong)
+Language_bh_MY=Malaio
diff --git a/htdocs/langs/gl_ES/link.lang b/htdocs/langs/gl_ES/link.lang
index 1ffcd41a18b..4815cf15e64 100644
--- a/htdocs/langs/gl_ES/link.lang
+++ b/htdocs/langs/gl_ES/link.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
-LinkANewFile=Link a new file/document
-LinkedFiles=Linked files and documents
-NoLinkFound=No registered links
-LinkComplete=The file has been linked successfully
-ErrorFileNotLinked=The file could not be linked
-LinkRemoved=The link %s has been removed
-ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
-ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
-URLToLink=URL to link
-OverwriteIfExists=Overwrite file if exists
+LinkANewFile=Ligar un novo ficheiro/documento
+LinkedFiles=Ficheiros e documentos ligados
+NoLinkFound=Sen ligazóns registrados
+LinkComplete=O ficheiro foi ligado correctamente
+ErrorFileNotLinked=O ficheiro non puido ser ligado
+LinkRemoved=A ligazón %s foi eliminada
+ErrorFailedToDeleteLink= Erro ao eliminar a ligazón '<b>%s</b>'
+ErrorFailedToUpdateLink= Erro ao actualizar a ligazón '<b>%s</b>'
+URLToLink=URL a ligar
+OverwriteIfExists=Sobrescribir ficheiro se existe
diff --git a/htdocs/langs/gl_ES/mailmanspip.lang b/htdocs/langs/gl_ES/mailmanspip.lang
index bab4b3576b4..08dbb902cca 100644
--- a/htdocs/langs/gl_ES/mailmanspip.lang
+++ b/htdocs/langs/gl_ES/mailmanspip.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - mailmanspip
-MailmanSpipSetup=Mailman and SPIP module Setup
-MailmanTitle=Mailman mailing list system
-TestSubscribe=To test subscription to Mailman lists
-TestUnSubscribe=To test unsubscribe from Mailman lists
-MailmanCreationSuccess=Subscription test was executed successfully
-MailmanDeletionSuccess=Unsubscription test was executed successfully
-SynchroMailManEnabled=A Mailman update will be performed
-SynchroSpipEnabled=A Spip update will be performed
-DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
-DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
-DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
-DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
-SPIPTitle=SPIP Content Management System
-DescADHERENT_SPIP_SERVEUR=SPIP Server
-DescADHERENT_SPIP_DB=SPIP database name
-DescADHERENT_SPIP_USER=SPIP database login
-DescADHERENT_SPIP_PASS=SPIP database password
-AddIntoSpip=Add into SPIP
-AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
-AddIntoSpipError=Failed to add the user in SPIP
-DeleteIntoSpip=Remove from SPIP
-DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
-DeleteIntoSpipError=Failed to suppress the user from SPIP
-SPIPConnectionFailed=Failed to connect to SPIP
-SuccessToAddToMailmanList=%s successfully added to mailman list %s or SPIP database
-SuccessToRemoveToMailmanList=%s successfully removed from mailman list %s or SPIP database
+MailmanSpipSetup=Configuración do módulo Mailman e SPIP
+MailmanTitle=Sistema de listaxes de correo Mailman
+TestSubscribe=Para comprobar a subscrición a listas Mailman
+TestUnSubscribe=Para comprobar a cancelación de subscricións a listas Mailman
+MailmanCreationSuccess=Subscrición de proba executada correctamente
+MailmanDeletionSuccess=Cancelación de subscrición de proba foi executada correctamente
+SynchroMailManEnabled=Unha actualización de Mailman será realizada
+SynchroSpipEnabled=Unha actualización de Spip será realizada
+DescADHERENT_MAILMAN_ADMINPW=Contrasinal de administrador Mailman
+DescADHERENT_MAILMAN_URL=URL para as subscricións Mailman
+DescADHERENT_MAILMAN_UNSUB_URL=URL para a cancelación de subscripcións Mailman
+DescADHERENT_MAILMAN_LISTS=Lista(s) para a subscripción automática dos novos membros (separados por comas)
+SPIPTitle=Sistema de xestión de contidos SPIP
+DescADHERENT_SPIP_SERVEUR=Servidor SPIP
+DescADHERENT_SPIP_DB=Nome da base de datos de SPIP
+DescADHERENT_SPIP_USER=Usuario da base de datos de SPIP
+DescADHERENT_SPIP_PASS=Contrasinal da base de datos de SPIP
+AddIntoSpip=Engadir a SPIP
+AddIntoSpipConfirmation=¿Está certo de querer engadir este membro a SPIP?
+AddIntoSpipError=Aconteceu un erro ao engadir o membro a SPIP
+DeleteIntoSpip=Eliminar de SPIP
+DeleteIntoSpipConfirmation=¿Está certo de querer eliminar este membro de SPIP?
+DeleteIntoSpipError=Aconteceu un erro ao eliminar o membro de SPIP
+SPIPConnectionFailed=Erro ao conectar con SPIP
+SuccessToAddToMailmanList=%s agregado con éxito a listaxe de mailman %s ou base de datos SPIP
+SuccessToRemoveToMailmanList=%s eliminado con éxito da listaxe de mailman %s ou base de datos SPIP
diff --git a/htdocs/langs/gl_ES/mails.lang b/htdocs/langs/gl_ES/mails.lang
index f3c5ab840b9..fbe1039382d 100644
--- a/htdocs/langs/gl_ES/mails.lang
+++ b/htdocs/langs/gl_ES/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Mails enviados por usuario
 MailingModuleDescDolibarrUsers=Usuarios con mails
 MailingModuleDescThirdPartiesByCategories=Terceiros (por categoría)
 SendingFromWebInterfaceIsNotAllowed=O envío dende a interfaz web non está permitido.
+EmailCollectorFilterDesc=Todos os filtros deben coincidir para recibir un correo electrónico
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Liña %s en ficheiro
@@ -106,9 +107,9 @@ SearchAMailing=Buscar un Mailing
 SendMailing=Enviar Mailing
 SentBy=Enviado por
 MailingNeedCommand=O envío dun mailing pode realizarse dende a liña de comandos. Solicite ao administrador do servidor que execute o siguiente comando para enviar o mailling a todos os destinatarios:
-MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
-ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+MailingNeedCommand2=Porén, pode envialos en liña engadindo o parámetro MAILING_LIMIT_SENDBYWEB co valor do número máximo de correos electrónicos que desexa enviar por sesión. Para iso, vaia a Inicio-Configuración-Outro.
+ConfirmSendingEmailing=Se desexa enviar correos electrónicos directamente desde esta pantalla, confirme que está certo de querer enviar correos electrónicos agora desde o seu navegador?
+LimitSendingEmailing=Nota: o envío de mensaxes de correo electrónico desde a interface web faise varias veces por motivos de seguridade e tempo de espera, <b>%s</b> destinatarios á vez por cada sesión de envío.
 TargetsReset=Vaciar listaxe
 ToClearAllRecipientsClickHere=Para vaciar a listaxe dos destinatarios deste mailing, faga click no botón
 ToAddRecipientsChooseHere=Para engadir destinatarios, escolla os que figuran nas listaxes a continuación
@@ -125,22 +126,23 @@ TagMailtoEmail=Mail do destinatario (incluindo a ligazón html "mailto:")
 NoEmailSentBadSenderOrRecipientEmail=Non foi enviado o mail. O remitente ou destinatario é incorrecto. Comprobe os datos do usuario.
 # Module Notifications
 Notifications=Notificacións
-NoNotificationsWillBeSent=Ningunha notificación por mail está prevista para este evento e empresa
-ANotificationsWillBeSent=Unha notificación vai ser enviada por mail
-SomeNotificationsWillBeSent=%s notificaciones van ser enviadas por mail
-AddNewNotification=Activar un novo destinatario de notificacións
-ListOfActiveNotifications=Listaxe de destinatarios activos para notifiacións por mail
-ListOfNotificationsDone=Listaxe de notificacións enviadas
+NotificationsAuto=Notificacións Auto.
+NoNotificationsWillBeSent=Non hai previstas notificacións automáticas por correo electrónico para este tipo de evento e para esta empresa
+ANotificationsWillBeSent=Enviarase 1 notificación automática por correo electrónico
+SomeNotificationsWillBeSent=As notificacións automáticas de %s enviaranse por correo electrónico
+AddNewNotification=Subscribirse a unha nova notificación automática por correo electrónico (destino/evento)
+ListOfActiveNotifications=Lista todas as subscricións activas (obxectivos/eventos) para a notificación automática por correo electrónico
+ListOfNotificationsDone=Lista todas as notificacións automáticas enviadas por correo electrónico
 MailSendSetupIs=A configuración de mailings está a '%s'. Este modo non pode ser usado para enviar mails masivos.
 MailSendSetupIs2=Antes debe, cunha conta de administrador, no menú %sInicio - Configuración - E-Mails%s, cambiar o parámetro <strong>'%s'</strong> para usar o modo '%s'. Con este modo pode configurar un servidor SMTP do seu provedor de servizos de internet.
-MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
-YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
-NbOfTargetedContacts=Current number of targeted contact emails
-UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
-UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
-MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+MailSendSetupIs3=Se ten algunha dúbida sobre como configurar o seu servidor SMTP, pode preguntar a %s.
+YouCanAlsoUseSupervisorKeyword=Tamén pode engadir a palabra clave <strong>__SUPERVISOREMAIL__</strong> para que se envíe un correo electrónico ao supervisor do usuario (só funciona se se define un correo electrónico para este supervisor)
+NbOfTargetedContacts=Número actual de correos electrónicos de contacto 
+UseFormatFileEmailToTarget=O ficheiro importado debe ter o formato <strong>email;name;name;other</strong>
+UseFormatInputEmailToTarget=Introduza unha cadea co formato <strong>email;name;firstname;other</strong>
+MailAdvTargetRecipients=Destinatarios (selección avanzada)
+AdvTgtTitle=Encha os campos de entrada para preseleccionar os terceiros ou os contactos/enderezos aos que desexa dirixirse
+AdvTgtSearchTextHelp=Use %% como comodíns. Por exemplo, para atopar todos os elementos como <b>jean, joe, jim</b>, pode introducir <b>j %% </b>, tamén pode usar; como separador de valor e usar ! para exceptuar este valor. Por exemplo <b>jean;joe;jim %% ;!jimo;!Jima %%</b> apuntará a todos jean, joe, ou comezaz con jim pero non jimo e non todo o que comeza con jima
 AdvTgtSearchIntHelp=Use un intervaldo para seleccionar valor int o float
 AdvTgtMinVal=Valor mínimo
 AdvTgtMaxVal=Valor máximo
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Crear filtro
 AdvTgtOrCreateNewFilter=Nome do novo filtro
 NoContactWithCategoryFound=Non atopáronse contactos/enderezos con algunha categoría
 NoContactLinkedToThirdpartieWithCategoryFound=Non atopáronse contactos/enderezos con algunha categoría
-OutGoingEmailSetup=Configuración do correo saínte
-InGoingEmailSetup=Configuración do correo entrante
-OutGoingEmailSetupForEmailing=Configuración do correo saínte (para correo masivo)
-DefaultOutgoingEmailSetup=Configuración do correo saínte predeterminada
+OutGoingEmailSetup=Configuración de correos electrónicos saíntes
+InGoingEmailSetup=Configuración de correos electrónicos entrantes
+OutGoingEmailSetupForEmailing=Configuración do correos electrónicos saíntes (para o módulo %s)
+DefaultOutgoingEmailSetup=A mesma configuración que a configuración de correos electrónicsoos saíntes predeterminados
 Information=Información
 ContactsWithThirdpartyFilter=Contactos con filtro de terceiros.
-Unanswered=Unanswered
-Answered=Answered
-IsNotAnAnswer=Is not answer (initial email)
-IsAnAnswer=Is an answer of an initial email
+Unanswered=Sen resposta
+Answered=Contestado
+IsNotAnAnswer=É unha resposta (a un coreo electrónico recibido)
+IsAnAnswer=É unha resposta de un coreo electrónico recibido
+RecordCreatedByEmailCollector=Rexistro creado polo receptor de correo electrónico %s a partir do correo electrónico %s
diff --git a/htdocs/langs/gl_ES/main.lang b/htdocs/langs/gl_ES/main.lang
index 5ccf9173975..c4ce3745b6a 100644
--- a/htdocs/langs/gl_ES/main.lang
+++ b/htdocs/langs/gl_ES/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Sen prantilla dispoñible para este tipo de e-mail
 AvailableVariables=Variables de substitución dispoñibles
 NoTranslation=Sen tradución
 Translation=Tradución
-EmptySearchString=Enter non empty search criterias
+CurrentTimeZone=Zona horaria PHP (Servidor)
+EmptySearchString=Entre unha cadea de busca non baleira
+EnterADateCriteria=Engadir un criterio de data
 NoRecordFound=Non atopáronse rexistros
 NoRecordDeleted=Non foi eliminado o rexistro
 NotEnoughDataYet=Non hai suficintes datos
@@ -85,6 +87,8 @@ FileWasNotUploaded=Un ficheiro foi seleccionado para axuntar, pero ainda non foi
 NbOfEntries=Nº de entradas
 GoToWikiHelpPage=Ler a axuda en liña (é preciso acceso a Internet )
 GoToHelpPage=Ler a axuda
+DedicatedPageAvailable=Hai unha páxina adicada de axuda  relacionada coa pantalla actual
+HomePage=Páxina Inicio
 RecordSaved=Rexistro gardado
 RecordDeleted=Rexistro eliminado
 RecordGenerated=Registro xerado
@@ -150,12 +154,12 @@ Deprecated=Obsoleto
 Disable=Desactivar
 Disabled=Desactivado
 Add=Engadir
-AddLink=Víncular
-RemoveLink=Eliminar vínculo
+AddLink=Ligar
+RemoveLink=Eliminar ligazón
 AddToDraft=Engadir a borrador
 Update=Actualizar
 Close=Pechar
-CloseAs=Set status to
+CloseAs=Establecer estado a
 CloseBox=Eliminar panel do seu taboleiro
 Confirm=Confirmar
 ConfirmSendCardByMail=¿Realmente quere enviar o contido desta ficha por correo a <b>%s</b>?
@@ -188,16 +192,16 @@ ShowCardHere=Ver a ficha
 Search=Procurar
 SearchOf=Procura
 SearchMenuShortCut=Ctrl + shift + f
-QuickAdd=Quick add
+QuickAdd=Engadido rápido
 QuickAddMenuShortCut=Ctrl + shift + l
 Valid=Validar
 Approve=Aprobar
 Disapprove=Desaprobar
 ReOpen=Reabrir
 Upload=Actualizar arquivo
-ToLink=Vínculo
+ToLink=Ligazón
 Select=Seleccionar
-SelectAll=Select all
+SelectAll=Seleccionar todo
 Choose=Escoller
 Resize=Redimensionar
 ResizeOrCrop=Cambiar o tamaño ou cortar
@@ -249,7 +253,7 @@ Limits=Límites
 Logout=Desconectar
 NoLogoutProcessWithAuthMode=Sen funcionalidades de desconexión co modo de autenticación <b>%s</b>
 Connection=Usuario
-Setup=Config.
+Setup=Configuración
 Alert=Alerta
 MenuWarnings=Alertas
 Previous=Anterior
@@ -267,10 +271,10 @@ DateStart=Data de inicio
 DateEnd=Data de fin
 DateCreation=Data de creación
 DateCreationShort=Data creac.
-IPCreation=Creation IP
+IPCreation=Asignación IP
 DateModification=Data de modificación
 DateModificationShort=Data modif.
-IPModification=Modification IP
+IPModification=Modificación IP
 DateLastModification=Última data de modificación
 DateValidation=Data de validación
 DateClosing=Data de peche
@@ -324,7 +328,7 @@ Morning=Na mañá
 Afternoon=Na tarde
 Quadri=Trimestre
 MonthOfDay=Mes do día
-DaysOfWeek=Days of week
+DaysOfWeek=Días da semana
 HourShort=H
 MinuteShort=min
 Rate=Tipo
@@ -362,7 +366,7 @@ Amount=Importe
 AmountInvoice=Importe factura
 AmountInvoiced=Importe facturado
 AmountInvoicedHT=Importe facturado (excl. tax)
-AmountInvoicedTTC=Amount invoiced (inc. tax)
+AmountInvoicedTTC=Importe facturado (incl. tax)
 AmountPayment=Importe pagamento
 AmountHTShort=Base imp.
 AmountTTCShort=Importe
@@ -375,7 +379,7 @@ MulticurrencyPaymentAmount=Importe total na divisa orixinal
 MulticurrencyAmountHT=Base impoñible na divisa orixinal
 MulticurrencyAmountTTC=Total na divisa orixinal
 MulticurrencyAmountVAT=Importe IVE na divisa orixinal
-MulticurrencySubPrice=Amount sub price multi currency
+MulticurrencySubPrice=Cantidade sub prezo divisa orixinal
 AmountLT1=Importe Imposto 2
 AmountLT2=Importe IRPF
 AmountLT1ES=Importe RE
@@ -433,9 +437,10 @@ RemainToPay=Resta por pagar
 Module=Módulo/Aplicación
 Modules=Módulos/Aplicacións
 Option=Opción
+Filters=Filtros
 List=Listaxe
 FullList=Listaxe completo
-FullConversation=Full conversation
+FullConversation=Conversa completa
 Statistics=Estatísticas
 OtherStatistics=Outras estatísticas
 Status=Estado
@@ -494,7 +499,7 @@ By=Por
 From=De
 FromDate=De
 FromLocation=De
-at=at
+at=a
 to=a
 To=a
 and=e
@@ -517,7 +522,7 @@ Draft=Borrador
 Drafts=Borradores
 StatusInterInvoiced=Facturado
 Validated=Validado
-ValidatedToProduce=Validated (To produce)
+ValidatedToProduce=Valido (A fabricar)
 Opened=Activo
 OpenAll=Aberto (todo)
 ClosedAll=Pechado (Todo)
@@ -533,7 +538,7 @@ Topic=Asunto
 ByCompanies=Por terceiros
 ByUsers=Por usuario
 Links=Ligazóns
-Link=Vínculo
+Link=Ligazón
 Rejects=Devolucións
 Preview=Vista previa
 NextStep=Seguinte paso
@@ -620,7 +625,7 @@ File=Ficheiro
 Files=Ficheiros
 NotAllowed=Non autorizado
 ReadPermissionNotAllowed=Sen permisos de lectura
-AmountInCurrency=Importes en %s (Moeda)
+AmountInCurrency=Importes en %s moeda
 Example=Exemplo
 Examples=Exemplos
 NoExample=Sen exemplo
@@ -677,7 +682,7 @@ Owner=Propietario
 FollowingConstantsWillBeSubstituted=As seguintes constantes serán substituidas polo seu valor correspondente.
 Refresh=Refrescar
 BackToList=Voltar á listaxe
-BackToTree=Back to tree
+BackToTree=Volta á árbore
 GoBack=Voltar atrás
 CanBeModifiedIfOk=Pode modificarse se é valido
 CanBeModifiedIfKo=Pode modificarse se non é valido
@@ -691,14 +696,14 @@ RecordsGenerated=%s rexistro(s) xerado(s)
 AutomaticCode=Creación automática de código
 FeatureDisabled=Función desactivada
 MoveBox=Mover panel
-Offered=Oferta
+Offered=Sen cargo
 NotEnoughPermissions=Non ten permisos para esta acción
 SessionName=Nome sesión
 Method=Método
 Receive=Recepción
-CompleteOrNoMoreReceptionExpected=Completado ou no agárdase mais
+CompleteOrNoMoreReceptionExpected=Completado ou non agárdase mais
 ExpectedValue=Valor agardado
-ExpectedQty=Expected Qty
+ExpectedQty=Cant. agardada
 PartialWoman=Parcial
 TotalWoman=Total
 NeverReceived=Nunca recibido
@@ -715,7 +720,7 @@ MenuECM=Documentos
 MenuAWStats=AWStats
 MenuMembers=Membros
 MenuAgendaGoogle=Axenda Google
-MenuTaxesAndSpecialExpenses=Taxes | Special expenses
+MenuTaxesAndSpecialExpenses=Taxas | Gastos especiais
 ThisLimitIsDefinedInSetup=Límite Dolibarr (Menú Inicio-configuración-seguridade): %s Kb, PHP limit: %s Kb
 NoFileFound=Non hai documentos gardados neste directorio
 CurrentUserLanguage=Idioma actual
@@ -729,16 +734,16 @@ For=Para
 ForCustomer=Para cliente
 Signature=Sinatura
 DateOfSignature=Data da sinatura
-HidePassword=Amosar comando con contrasinal oculta
+HidePassword=Amosar comando con contrasinal oculto
 UnHidePassword=Amosar comando con contrasinal á vista
 Root=Raíz
-RootOfMedias=Root of public medias (/medias)
+RootOfMedias=Raiz de medias públicas (/medias)
 Informations=Información
 Page=Páxina
 Notes=Notas
 AddNewLine=Engadir nova liña
 AddFile=Engadir arquivo
-FreeZone=Free-text product
+FreeZone=Sen produtos/servizos predefinidos
 FreeLineOfType=Entrada libre, tipo:
 CloneMainAttributes=Clonar o obxecto con estes atributos principais
 ReGeneratePDF=Xerar de novo o PDF
@@ -751,7 +756,7 @@ WarningYouAreInMaintenanceMode=Atención, está en modo mantemento, só o login
 CoreErrorTitle=Erro de sistema
 CoreErrorMessage=O sentimos, pero aconteceu un erro. Póñase en contacto co administrador do sistema para comprobar os rexistros ou desactive $dolibarr_main_prod=1 para obter mais información.
 CreditCard=Tarxeta de crédito
-ValidatePayment=Validar pago
+ValidatePayment=Validar pagamento
 CreditOrDebitCard=Tarxeta de crédito ou débito
 FieldsWithAreMandatory=Os campos marcados cun <b>%s</b> son obrigatorios
 FieldsWithIsForPublic=Os campos marcados co <b>%s</b> amosaránse na lista pública de membros. Se non desexa velos, desactive a caixa "público".
@@ -761,7 +766,7 @@ NotSupported=Non soportado
 RequiredField=Campo obrigatorio
 Result=Resultado
 ToTest=Probar
-ValidateBefore=Item must be validated before using this feature
+ValidateBefore=Para poder usar esta función debe validarse a ficha
 Visibility=Visibilidade
 Totalizable=Totalizable
 TotalizableDesc=Este campo é totalizable nas listaxes
@@ -778,18 +783,18 @@ IM=Mensaxería instantánea
 NewAttribute=Novo atributo
 AttributeCode=Código
 URLPhoto=Url da foto/logo
-SetLinkToAnotherThirdParty=Vincular a outro terceiro
-LinkTo=Vincular a
-LinkToProposal=Vincular a pedido
-LinkToOrder=Vincular a pedido
-LinkToInvoice=Vincular a factura
-LinkToTemplateInvoice=Vincular a prantilla de factura
-LinkToSupplierOrder=Vincular a pedido a provedor
-LinkToSupplierProposal=Vincular a orzamento de provedor
-LinkToSupplierInvoice=Vincular a factura de provedor
-LinkToContract=Vincular a contrato
-LinkToIntervention=Vincular a intervención
-LinkToTicket=Link to ticket
+SetLinkToAnotherThirdParty=Ligar a outro terceiro
+LinkTo=Ligar a
+LinkToProposal=Ligar a orzamento
+LinkToOrder=Ligar a pedimento
+LinkToInvoice=Ligar a factura
+LinkToTemplateInvoice=Ligar a prantilla de factura
+LinkToSupplierOrder=Ligar a pedimento a provedor
+LinkToSupplierProposal=Ligar a orzamento de provedor
+LinkToSupplierInvoice=Ligar a factura de provedor
+LinkToContract=Ligar a contrato
+LinkToIntervention=Ligar a intervención
+LinkToTicket=Ligar a ticket
 CreateDraft=Crear borrador
 SetToDraft=Voltar a borrador
 ClickToEdit=Clic para editar
@@ -823,7 +828,7 @@ Access=Acceso
 SelectAction=Seleccione acción
 SelectTargetUser=Seleccionar usuario/empregado de destino
 HelpCopyToClipboard=Use Ctrl+C para copiar ao portapapeis
-SaveUploadedFileWithMask=Gardar o arquivo no servidor co nome "<strong>%s</strong>" (senón "%s")
+SaveUploadedFileWithMask=Gardar o ficheiro no servidor co nome "<strong>%s</strong>" (senón "%s")
 OriginFileName=Nome do arquivo orixe
 SetDemandReason=Definir orixe
 SetBankAccount=Definir conta bancaria
@@ -857,7 +862,7 @@ Sincerely=Atentamente
 ConfirmDeleteObject=¿Está certo de querer eliminar esta liña?
 DeleteLine=Eliminación de liña
 ConfirmDeleteLine=¿Está certo de querer eliminar esta liña?
-ErrorPDFTkOutputFileNotFound=Error: the file was not generated. Please check that the 'pdftk' command is installed in a directory included in the $PATH environment variable (linux/unix only) or contact your system administrator.
+ErrorPDFTkOutputFileNotFound=Erro: o ficheiro non foi xerado. Comprobe que o comando 'pdftk' está instalado nun directorio incluído na variable de entorno $ PATH (só linux / unix) ou contacte co administrador do sistema.
 NoPDFAvailableForDocGenAmongChecked=Sen PDF dispoñibles para a xeración de documentos entre os rexistros seleccionados
 TooManyRecordForMassAction=Demasiados rexistros seleccionados para a acción masiva. A acción está restrinxida a unha listaxe de %s rexistros.
 NoRecordSelected=Sen rexistros seleccionados
@@ -888,8 +893,8 @@ Miscellaneous=Miscelánea
 Calendar=Calendario
 GroupBy=Agrupado por...
 ViewFlatList=Ver listaxe plana
-ViewAccountList=View ledger
-ViewSubAccountList=View subaccount ledger
+ViewAccountList=Ver Libro Maior
+ViewSubAccountList=Ver subconta Libro Maior
 RemoveString=Eliminar cadea '%s'
 SomeTranslationAreUncomplete=Algúns dos idiomas ofrecidos poden estar parcialmente traducidos ou poden conter erros. Axuda a corrixir teu idioma rexistrándose en <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Ligazón de descarga directa (público/externo)
@@ -915,7 +920,7 @@ ConfirmSetToDraft=¿Está certo de querer voltar ao estado Borrador?
 ImportId=ID de importación
 Events=Eventos
 EMailTemplates=Prantillas E-mail
-FileNotShared=Arquivo non compartido ao público externo
+FileNotShared=Ficheiro non compartido ao público externo
 Project=Proxecto
 Projects=Proxectos
 LeadOrProject=Oportunidade | Proxecto
@@ -930,7 +935,7 @@ LineNb=Líña no.
 IncotermLabel=Incoterms
 TabLetteringCustomer=Letras do cliente
 TabLetteringSupplier=Letras do provedor
-Monday=lúns
+Monday=luns
 Tuesday=martes
 Wednesday=mércores
 Thursday=xoves
@@ -944,7 +949,7 @@ ThursdayMin=Xo
 FridayMin=Ve
 SaturdayMin=Sa
 SundayMin=Do
-Day1=lúns
+Day1=luns
 Day2=martes
 Day3=mércores
 Day4=xoves
@@ -958,39 +963,39 @@ ShortThursday=X
 ShortFriday=V
 ShortSaturday=S
 ShortSunday=D
-one=one
-two=two
-three=three
-four=four
-five=five
-six=six
-seven=seven
-eight=eight
-nine=nine
-ten=ten
-eleven=eleven
-twelve=twelve
-thirteen=thirdteen
-fourteen=fourteen
-fifteen=fifteen
-sixteen=sixteen
-seventeen=seventeen
-eighteen=eighteen
-nineteen=nineteen
-twenty=twenty
-thirty=thirty
-forty=forty
-fifty=fifty
-sixty=sixty
-seventy=seventy
-eighty=eighty
-ninety=ninety
-hundred=hundred
-thousand=thousand
-million=million
-billion=billion
-trillion=trillion
-quadrillion=quadrillion
+one=un
+two=dous
+three=tres
+four=catro
+five=cinco
+six=seis
+seven=sete
+eight=oito
+nine=nove
+ten=dez
+eleven=once
+twelve=doce
+thirteen=trece
+fourteen=catorce
+fifteen=quince
+sixteen=dezaseis
+seventeen=dezasete
+eighteen=dezaoito
+nineteen=dezanove
+twenty=vinte
+thirty=trinta
+forty=corenta
+fifty=cincuente
+sixty=sesenta
+seventy=setenta
+eighty=oitenta
+ninety=noventa
+hundred=cen
+thousand=mil
+million=millón
+billion=billón
+trillion=trillón
+quadrillion=quadrillón
 SelectMailModel=Seleccione unha prantilla de correo
 SetRef=Establecer ref
 Select2ResultFoundUseArrows=Algúns resultados atopados. Use as frechas para seleccionar.
@@ -1021,7 +1026,7 @@ SearchIntoCustomerShipments=Envíos a clientes
 SearchIntoExpenseReports=Informes de gastos
 SearchIntoLeaves=Día libre
 SearchIntoTickets=Tickets
-SearchIntoCustomerPayments=Customer payments
+SearchIntoCustomerPayments=Pagamentos dos clientes
 SearchIntoVendorPayments=Pagamentos a provedores
 SearchIntoMiscPayments=Pagamentos varios
 CommentLink=Comentarios
@@ -1042,7 +1047,7 @@ KeyboardShortcut=Atallo de teclado
 AssignedTo=Asignada a
 Deletedraft=Eliminar borrador
 ConfirmMassDraftDeletion=Confirmación de borrado en masa
-FileSharedViaALink=Ficheiro compartido ao través dun vínculo
+FileSharedViaALink=Ficheiro compartido ao través dunha ligazón
 SelectAThirdPartyFirst=Selecciona un terceiro antes...
 YouAreCurrentlyInSandboxMode=Estás actualmente no modo %s "sandbox"
 Inventory=Inventario
@@ -1078,32 +1083,37 @@ ContactAddedAutomatically=Engadido contacto dende os contactos de terceiros
 More=Mais
 ShowDetails=Amosar detalles
 CustomReports=Informe de custos
-StatisticsOn=Statistics on
-SelectYourGraphOptionsFirst=Select your graph options to build a graph
+StatisticsOn=Estatísticas en
+SelectYourGraphOptionsFirst=Seleccione as súas opcións de gráfico para construir un gráfico
 Measures=Medidas
-XAxis=X-Eixes
-YAxis=Y-Eixes
-StatusOfRefMustBe=Status de %s debe ser %s
-DeleteFileHeader=Confirmar borrado de ficheiro
+XAxis=X-Eixe
+YAxis=Y-Eixe
+StatusOfRefMustBe=O estado de %s ten que ser %s
+DeleteFileHeader=Confirmar ficheiro a eliminar
 DeleteFileText=Está certo de querer borrar este ficheiro?
-ShowOtherLanguages=Amosar outras linguas
-SwitchInEditModeToAddTranslation=Cambiar a modo edición para axuntar traducións a esta lingua
-NotUsedForThisCustomer=Non usado para este cliente
-AmountMustBePositive=Importe ten que ser positivo
+ShowOtherLanguages=Amosar outras lingoas
+SwitchInEditModeToAddTranslation=Cambie ao modo de edición para engadir traduciáns a esta lingoa
+NotUsedForThisCustomer=Non usado neste cliente
+AmountMustBePositive=O importe ten que ser positivo
 ByStatus=By status
 InformationMessage=Información
-Used=Used
-ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s created
-MODIFYInDolibarr=Record %s modified
-DELETEInDolibarr=Record %s deleted
-VALIDATEInDolibarr=Record %s validated
-APPROVEDInDolibarr=Record %s approved
-DefaultMailModel=Default Mail Model
-PublicVendorName=Public name of vendor
-DateOfBirth=Date of birth
-SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
-UpToDate=Up-to-date
-OutOfDate=Out-of-date
-EventReminder=Event Reminder
-UpdateForAllLines=Update for all lines
+Used=Usado
+ASAP=Tan pronto como sexa posible
+CREATEInDolibarr=Rexistro %s creado
+MODIFYInDolibarr=Rexistro %s modificado
+DELETEInDolibarr=Rexistro %s eliminado
+VALIDATEInDolibarr=Rexistro %s validado
+APPROVEDInDolibarr=Rexistro %s aprobado
+DefaultMailModel=Modelo de correo predeterminado
+PublicVendorName=Nome público do provedor
+DateOfBirth=Data de nacemento
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=O token de seguridade caducou e a acción foi cancelada. Prégase intente de novo
+UpToDate=Ao día
+OutOfDate=Caducado
+EventReminder=Recordatorio de evento
+UpdateForAllLines=Actualizar todas as liñas
+OnHold=Agardando
+AffectTag=Poñer etiqueta
+ConfirmAffectTag=Poñer etiqueta masiva
+ConfirmAffectTagQuestion=Está certo de que quere poñer ás etiquetas dos rexistros seleccionados %s?
+CategTypeNotFound=Non se atopou ningún tipo de etiqueta para o tipo de rexistros
diff --git a/htdocs/langs/gl_ES/members.lang b/htdocs/langs/gl_ES/members.lang
index 819a5522627..97861ae2a0e 100644
--- a/htdocs/langs/gl_ES/members.lang
+++ b/htdocs/langs/gl_ES/members.lang
@@ -19,8 +19,8 @@ MembersCards=Carnés de membros
 MembersList=Listaxe de membros
 MembersListToValid=Listaxe de membros borrador (a validar)
 MembersListValid=Listaxe de membros validados
-MembersListUpToDate=List of valid members with up-to-date subscription
-MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListUpToDate=Lista de membros válidos con subscrición actualizada
+MembersListNotUpToDate=Lista de membros válidos con data vencida na subscrición 
 MembersListResiliated=Listaxe dos membros dados de baixa
 MembersListQualified=Listaxe dos membros cualificados
 MenuMembersToValidate=Membros borrador
@@ -32,7 +32,7 @@ DateSubscription=Data afiliación
 DateEndSubscription=Data fin afiliación
 EndSubscription=Fin afiliación
 SubscriptionId=ID afiliación
-WithoutSubscription=Without subscription
+WithoutSubscription=Sen subscrición
 MemberId=ID membro
 NewMember=Novo membro
 MemberType=Tipo de membro
@@ -80,7 +80,7 @@ DeleteType=Eliminar
 VoteAllowed=Voto autorizado
 Physical=Físico
 Moral=Xurídico
-MorAndPhy=Moral and Physical
+MorAndPhy=Moral e Físico
 Reenable=Reactivar
 ResiliateMember=Dar de baixa a un membro
 ConfirmResiliateMember=¿Está certo de querer dar de baixa a este membro?
@@ -116,7 +116,7 @@ SendingEmailOnMemberValidation=Enviar mail na validación dun novo membro
 SendingEmailOnNewSubscription=Enviar mail nunha nova afiliación
 SendingReminderForExpiredSubscription=Enviar un recordatorio para afiliación caducada
 SendingEmailOnCancelation=Enviar mail nunha cancelación
-SendingReminderActionComm=Sending reminder for agenda event
+SendingReminderActionComm=Enviando lembranzas desde os eventos da axenda
 # Topic of email templates
 YourMembershipRequestWasReceived=A súa membresía foi recibida.
 YourMembershipWasValidated=A súa membresía foi validada.
@@ -125,26 +125,26 @@ SubscriptionReminderEmail=Recordatorio de afiliación
 YourMembershipWasCanceled=A súa membresía foi cancelada.
 CardContent=Contido da súa ficha de membro
 # Text of email templates
-ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
-ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
-ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
-ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Sender Email for automatic emails
-DescADHERENT_ETIQUETTE_TYPE=Format of labels page
-DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
-DescADHERENT_CARD_TYPE=Format of cards page
-DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
-DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
-DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
-DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
+ThisIsContentOfYourMembershipRequestWasReceived=Queremos comunicarlle que se recibiu a súa solicitude de adhesión <br><br>
+ThisIsContentOfYourMembershipWasValidated=Queremos comunicarlle que a súa subscrición foi validada coa seguinte información:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=Queremos comunicarlle de que se rexistrou a súa nova subscrición<br><br>
+ThisIsContentOfSubscriptionReminderEmail=Queremos comunicarlle que a súa subscrición está a piques de caducar ou xa caducou (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Agardamos que a renove<br><br>
+ThisIsContentOfYourCard=Este é un resumo da información que temos sobre vostede. Póñase en contacto connosco se hai algo incorrecto<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Asunto do correo electrónico de notificación recibido en caso de inscrición automática dun convidado
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Contido do correo electrónico de notificación recibido en caso de inscrición automática dun convidado
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Modelo de correo electrónico para usar para envios de correo electrónico a membros na subscrición automática de membros
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Modelo de correo electrónico para usar para enviar correo electrónico a membros coa validación de membros
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Modelo de correo electrónico para usar para enviar correo electrónico a membros na nova gravación de subscrición
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Modelo de correo electrónico para usar para enviar recordatorios cando a subscrición está a piques de caducar
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Modelo de correo electrónico a usar para enviar a membros ao cancelar a subscrición
+DescADHERENT_MAIL_FROM=Correo electrónico do remitente para correos electrónicos automáticos
+DescADHERENT_ETIQUETTE_TYPE=Formato de páxinas de etiquetas
+DescADHERENT_ETIQUETTE_TEXT=Texto impreso nas follas de enderezos dos membros
+DescADHERENT_CARD_TYPE=Formato de páxinas de tarxetas
+DescADHERENT_CARD_HEADER_TEXT=Texto impreso na parte superior das tarxetas de membro
+DescADHERENT_CARD_TEXT=Texto impreso nas tarxetas de membro (aliñar á esquerda)
+DescADHERENT_CARD_TEXT_RIGHT=Texto impreso nas tarxetas de membro (aliñar á dereita)
+DescADHERENT_CARD_FOOTER_TEXT=Texto impreso na parte inferior das tarxetas de membro
 ShowTypeCard=Ver tipo '%s'
 HTPasswordExport=Xeración archivo htpassword
 NoThirdPartyAssociatedToMember=Ningún terceiro asociado a este membro
@@ -167,7 +167,7 @@ MembersStatisticsByState=Estatísticas de membros por provincia/pais
 MembersStatisticsByTown=Estatísticas de membros por poboación
 MembersStatisticsByRegion=Estatísticas de membros por rexión
 NbOfMembers=Número de membros
-NbOfActiveMembers=Number of current active members
+NbOfActiveMembers=Número de membros activos actuais
 NoValidatedMemberYet=Ningún membro validado atopado
 MembersByCountryDesc=Esta pantalla presenta unha estatística do número de membros por países. Porén, a gráfica utiliza o servizo en líña  de gráficas de Google e só é operativo cando ten operativa unha conexión a Internet.
 MembersByStateDesc=Esta pantalla presenta unha estatística do número de membros por paises/provincias/comunidades
@@ -177,7 +177,7 @@ MenuMembersStats=Estatísticas
 LastMemberDate=Última data de membro
 LatestSubscriptionDate=Data da última cotización
 MemberNature=Natureza do membro
-MembersNature=Nature of members
+MembersNature=Natureza dos membros
 Public=Información pública
 NewMemberbyWeb=Novo membro engadido. Agardando validación
 NewMemberForm=Novo formulario de membro
diff --git a/htdocs/langs/gl_ES/modulebuilder.lang b/htdocs/langs/gl_ES/modulebuilder.lang
index 460aef8103b..92f08b0ccbf 100644
--- a/htdocs/langs/gl_ES/modulebuilder.lang
+++ b/htdocs/langs/gl_ES/modulebuilder.lang
@@ -5,7 +5,7 @@ EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use upp
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
 ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
 ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
-NewModule=New module
+NewModule=Novo
 NewObjectInModulebuilder=New object
 ModuleKey=Module key
 ObjectKey=Object key
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/gl_ES/mrp.lang b/htdocs/langs/gl_ES/mrp.lang
index 84a0177e4de..e96eafdec79 100644
--- a/htdocs/langs/gl_ES/mrp.lang
+++ b/htdocs/langs/gl_ES/mrp.lang
@@ -1,80 +1,80 @@
-Mrp=Ordes de fabricación
-MOs=Manufacturing orders
-ManufacturingOrder=Manufacturing Order
-MRPDescription=Module to manage production and Manufacturing Orders (MO).
-MRPArea=MRP Area
-MrpSetupPage=Setup of module MRP
-MenuBOM=Bills of material
-LatestBOMModified=Latest %s Bills of materials modified
-LatestMOModified=Latest %s Manufacturing Orders modified
-Bom=Bills of Material
-BillOfMaterials=Bill of Material
-BOMsSetup=Setup of module BOM
-ListOfBOMs=List of bills of material - BOM
-ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
-BOMsNumberingModules=BOM numbering templates
-BOMsModelModule=BOM document templates
-MOsNumberingModules=MO numbering templates
-MOsModelModule=MO document templates
-FreeLegalTextOnBOMs=Free text on document of BOM
-WatermarkOnDraftBOMs=Watermark on draft BOM
-FreeLegalTextOnMOs=Free text on document of MO
-WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
-ManufacturingEfficiency=Manufacturing efficiency
-ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
-ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
-DeleteBillOfMaterials=Delete Bill Of Materials
-DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
-MenuMRP=Ordes de fabricación
-NewMO=New Manufacturing Order
-QtyToProduce=Qty to produce
-DateStartPlannedMo=Date start planned
-DateEndPlannedMo=Date end planned
-KeepEmptyForAsap=Empty means 'As Soon As Possible'
-EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
-ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
-ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
-ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
-StatusMOProduced=Produced
-QtyFrozen=Frozen Qty
-QuantityFrozen=Frozen Quantity
-QuantityConsumedInvariable=When this flag is set, the quantity consumed is always the value defined and is not relative to the quantity produced.
-DisableStockChange=Stock change disabled
-DisableStockChangeHelp=When this flag is set, there is no stock change on this product, whatever is the quantity consumed
-BomAndBomLines=Bills Of Material and lines
-BOMLine=Line of BOM
-WarehouseForProduction=Warehouse for production
-CreateMO=Create MO
-ToConsume=To consume
-ToProduce=To produce
-QtyAlreadyConsumed=Qty already consumed
-QtyAlreadyProduced=Qty already produced
-QtyRequiredIfNoLoss=Qty required if there is no loss (Manufacturing efficiency is 100%%)
-ConsumeOrProduce=Consume or Produce
-ConsumeAndProduceAll=Consume and Produce All
-Manufactured=Manufactured
-TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
-ForAQuantityOf=For a quantity to produce of %s
-ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
-ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
-ProductionForRef=Production of %s
-AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
-NoStockChangeOnServices=No stock change on services
-ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
-AddNewConsumeLines=Add new line to consume
-ProductsToConsume=Products to consume
-ProductsToProduce=Products to produce
-UnitCost=Unit cost
-TotalCost=Total cost
-BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
-GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
-ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
+Mrp=Pedimentos de fabricación
+MOs=Pedimentos de fabricación
+ManufacturingOrder=Pedimento de fabricación
+MRPDescription=Módulo para xestionar pedimentos de fabricación (MO).
+MRPArea=Área MRP
+MrpSetupPage=Configuración do módulo MRP
+MenuBOM=Listaxe de material
+LatestBOMModified=Últimas %s listaxes de materiais modificadas
+LatestMOModified=Últimos %s pedimentos de material modificados
+Bom=Listaxes de material
+BillOfMaterials=Listaxe de material
+BOMsSetup=Configuración do módulo BOM
+ListOfBOMs=Listaxe de facturas de materiais - BOM
+ListOfManufacturingOrders=Listaxe de pedimentos de fabricación
+NewBOM=Nova listaxe de materiais
+ProductBOMHelp=Produto a crear con este BOM.<br>Nota: os produtos coa propiedade 'Natureza do producto'='Materia prima' non están visibles nesta listaxe.
+BOMsNumberingModules=Modelos de numeración BOM
+BOMsModelModule=Prantillas de documentos BOMS
+MOsNumberingModules=Modelos de numeración MO
+MOsModelModule=Prantillas de documentos MO
+FreeLegalTextOnBOMs=Texto libre no documento BOM
+WatermarkOnDraftBOMs=Marca de auga no borrador MO
+FreeLegalTextOnMOs=Texto libre no documento MO
+WatermarkOnDraftMOs=Marca de auga no borrador MO
+ConfirmCloneBillOfMaterials=¿Está certo de querer clonar esta listaxe de materiais %s?
+ConfirmCloneMo=Está certo de querer clonar este pedimento de facturación %s?
+ManufacturingEfficiency=Eficiencia de fabricación
+ConsumptionEfficiency=Eficienci de consumo
+ValueOfMeansLoss=O valor de 0.95 significa un promedio de 5%% de perda durante a produción
+ValueOfMeansLossForProductProduced=O valor de 0,95 significa unha media do 5 %% da perda do produto producido
+DeleteBillOfMaterials=Eliminar listaxe de material
+DeleteMo=Borra pedimentos de manufacturación
+ConfirmDeleteBillOfMaterials=¿Está certo de querer eliminar esta Listaxe de Material?
+ConfirmDeleteMo=¿Está certo de querer eliminar esta Listaxe de Material?
+MenuMRP=Pedimentos de manufacturación
+NewMO=Novo pedimento de manufacturación
+QtyToProduce=Cant. a producir
+DateStartPlannedMo=Data de inicio prevista
+DateEndPlannedMo=Date de finalización prevista
+KeepEmptyForAsap=Baleiro quere dicir 'Tan pronto como sexa posible'
+EstimatedDuration=Duración estimada
+EstimatedDurationDesc=Duración estimada para manufacturar este produto usando este BOM
+ConfirmValidateBom=Está certo de que desexa validar a listaxe de materias coa referencia <strong>%s</strong> (poderá usala para crear novos pedimentos de fabricación)
+ConfirmCloseBom=¿Está certo de que quere cancelar esta listaxe de materiales (xa non poderá usalo para crear novos pedimentos de fabricación)?
+ConfirmReopenBom=Está certo de que quere voltar a abrir esta listaxe de materiales (poderá usala para construír novos pedimentoss de fabricación)
+StatusMOProduced=Producido
+QtyFrozen=Cant. conxelada
+QuantityFrozen=Cantidade conxelada
+QuantityConsumedInvariable=Cando se sinala esta marca, a cantidade consumida sempre é o valor definido e non é relativa á cantidade producida.
+DisableStockChange=Cambio de stock desactivado
+DisableStockChangeHelp=Cando se sinala esta marca, non hai cambio de stock neste produto, calquera que sexa a cantidade consumida
+BomAndBomLines=Listaxes de material e liñas
+BOMLine=Liña de BOM
+WarehouseForProduction=Almacén para produción
+CreateMO=Crear MO
+ToConsume=A consumir
+ToProduce=A poducir
+QtyAlreadyConsumed=Cant. xa consumida
+QtyAlreadyProduced=Cant. xa producida
+QtyRequiredIfNoLoss=Cant. precisa se non hai perda (a eficiencia de fabricación é do 100 %%)
+ConsumeOrProduce=Consumir ou producir
+ConsumeAndProduceAll=Consumir e producir todo
+Manufactured=Fabricado
+TheProductXIsAlreadyTheProductToProduce=O produto a engadir xa é o produto a fabricar.
+ForAQuantityOf=Para producir unha cantidade de %s
+ConfirmValidateMo=Está certo de que desexa validar este pedimento de fabricación?
+ConfirmProductionDesc=Ao facer clic en '%s', validará o consumo e/ou a produción para as cantidades establecidas. Isto tamén actualizará o stock e rexistrará os movementos de stock.
+ProductionForRef=Produción de %s
+AutoCloseMO=Pecha automaticamente o pedimento de fabricación se se alcanzan cantidades a consumir e producir
+NoStockChangeOnServices=Non hai cambio de stock nos servizos
+ProductQtyToConsumeByMO=Cantidade de produto aínda por consumir por MO aberto
+ProductQtyToProduceByMO=Cantidade de produto aínda por producir por MO aberto
+AddNewConsumeLines=Engadir nova liña para consumir
+ProductsToConsume=Produtos para consumir
+ProductsToProduce=Produtos para fabricar
+UnitCost=Custo unitario
+TotalCost=Custo total
+BOMTotalCost=O custo para producir este BOM está en función do custo de cada cantidade e produto a consumir (use o prezo de custo se se define, se non o prezo medio ponderado se se define, se non o mellor prezo de compra)
+GoOnTabProductionToProduceFirst=Primeiro debe iniciar a produción para pechar un pedimento de fabricación (ver a pestana '%s'). Pero pode cancelalo.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Non se pode usar un produto composto nunha lista de materiales nin nunha MO
diff --git a/htdocs/langs/gl_ES/oauth.lang b/htdocs/langs/gl_ES/oauth.lang
index 075ff49a895..1355842921f 100644
--- a/htdocs/langs/gl_ES/oauth.lang
+++ b/htdocs/langs/gl_ES/oauth.lang
@@ -1,32 +1,32 @@
 # Dolibarr language file - Source file is en_US - oauth
-ConfigOAuth=OAuth Configuration
-OAuthServices=OAuth Services
-ManualTokenGeneration=Manual token generation
-TokenManager=Token Manager
-IsTokenGenerated=Is token generated ?
-NoAccessToken=No access token saved into local database
-HasAccessToken=A token was generated and saved into local database
-NewTokenStored=Token received and saved
-ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
-TokenDeleted=Token deleted
-RequestAccess=Click here to request/renew access and receive a new token to save
-DeleteAccess=Click here to delete token
-UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credentials with your OAuth provider:
-ListOfSupportedOauthProviders=Enter the credentials provided by your OAuth2 provider. Only supported OAuth2 providers are listedd here. These services may be used by other modules that need OAuth2 authentication.
-OAuthSetupForLogin=Page to generate an OAuth token
-SeePreviousTab=See previous tab
-OAuthIDSecret=OAuth ID and Secret
-TOKEN_REFRESH=Token Refresh Present
-TOKEN_EXPIRED=Token expired
-TOKEN_EXPIRE_AT=Token expire at
-TOKEN_DELETE=Delete saved token
-OAUTH_GOOGLE_NAME=OAuth Google service
-OAUTH_GOOGLE_ID=OAuth Google Id
-OAUTH_GOOGLE_SECRET=OAuth Google Secret
-OAUTH_GOOGLE_DESC=Go to <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create OAuth credentials
-OAUTH_GITHUB_NAME=OAuth GitHub service
-OAUTH_GITHUB_ID=OAuth GitHub Id
-OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_GITHUB_DESC=Go to <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create OAuth credentials
-OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
+ConfigOAuth=Configuración Oauth
+OAuthServices=Servizos OAuth
+ManualTokenGeneration=Xeración manual de token
+TokenManager=Xestor de token
+IsTokenGenerated=¿Está o token xerado?
+NoAccessToken=Non hai token de acceso gardado na base de datos local
+HasAccessToken=Foi xerado e gardado na base de datos local un token
+NewTokenStored=Token recibido e gardado
+ToCheckDeleteTokenOnProvider=Faga clic aquí para comprobar/eliminar a autorización gardada polo fornecedor de OAuth %s
+TokenDeleted=Token eliminado
+RequestAccess=Faga clic aquí para consultar/renovar acceso e recibir un novo token a gardar
+DeleteAccess=Faga clic aquí para eliminar o token
+UseTheFollowingUrlAsRedirectURI=Utilice o seguinte URL como redirección URI cando cree as súas credenciais co seu provedor de OAuth:
+ListOfSupportedOauthProviders=Introduza as credenciais proporcionadas polo seu provedor OAuth2. Aquí só figuran os provedores compatibles con OAuth2. Estes servizos poden ser empregados por outros módulos que precisan autenticación OAuth2.
+OAuthSetupForLogin=Páxina para xerar un token OAuth
+SeePreviousTab=Ver a lapela previa
+OAuthIDSecret=ID OAuth e contrasinal
+TOKEN_REFRESH=Actualizar o token actual
+TOKEN_EXPIRED=Token expirado
+TOKEN_EXPIRE_AT=Token expira o
+TOKEN_DELETE=Eliminar token gardado
+OAUTH_GOOGLE_NAME=Servicio Oauth Google
+OAUTH_GOOGLE_ID=Id Oauth Google
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Vaia a <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">esta páxina</a> e a "Credenciais" para crear credenciais Oauth
+OAUTH_GITHUB_NAME=Servizo Oauth GitHub
+OAUTH_GITHUB_ID=Id Oauth Github
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Vaia a <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">esta páxina</a> e a  "Rexistrar unha nova aplicación" para crear crecenciais Oauth
+OAUTH_STRIPE_TEST_NAME=Test OAuth Stripe
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/gl_ES/orders.lang b/htdocs/langs/gl_ES/orders.lang
index 2bb9401c922..a140a6af6b4 100644
--- a/htdocs/langs/gl_ES/orders.lang
+++ b/htdocs/langs/gl_ES/orders.lang
@@ -53,7 +53,7 @@ StatusOrderToBill=Emitido
 StatusOrderApproved=Aprobado
 StatusOrderRefused=Rexeitado
 StatusOrderReceivedPartially=Recibido parcialmente
-StatusOrderReceivedAll=Todos os productos recibidos
+StatusOrderReceivedAll=Todos os produtos recibidos
 ShippingExist=Existe unha expedición
 QtyOrdered=Cant. pedida
 ProductQtyInDraft=Cantidades en borrador de pedimentos
@@ -85,7 +85,7 @@ LastModifiedOrders=Últimos %s pedimentos de clientes modificados
 AllOrders=Todos os pedimentos
 NbOfOrders=Número de pedimentos
 OrdersStatistics=Estatísticas de pedimentos de clientes
-OrdersStatisticsSuppliers=Estatísticas de ordes de pedimento
+OrdersStatisticsSuppliers=Estatísticas de pedimentos a provedor
 NumberOfOrdersByMonth=Número de pedimentos por mes
 AmountOfOrdersByMonthHT=Importe total de pedimentos por mes (sen IVE)
 ListOfOrders=Listaxe de pedimentos
@@ -161,7 +161,7 @@ CloseReceivedSupplierOrdersAutomatically=Pechar pedimento a modo "%s" automatica
 SetShippingMode=Indica o modo de envío
 WithReceptionFinished=Con recepción finalizada
 #### supplier orders status
-StatusSupplierOrderCanceledShort=Anulada
+StatusSupplierOrderCanceledShort=Anulado
 StatusSupplierOrderDraftShort=Borrador
 StatusSupplierOrderValidatedShort=Validado
 StatusSupplierOrderSentShort=Expedición en curso
@@ -171,19 +171,19 @@ StatusSupplierOrderProcessedShort=Procesado
 StatusSupplierOrderDelivered=Emitido
 StatusSupplierOrderDeliveredShort=Emitido
 StatusSupplierOrderToBillShort=Emitido
-StatusSupplierOrderApprovedShort=Aprobada
-StatusSupplierOrderRefusedShort=Rexeitada
+StatusSupplierOrderApprovedShort=Aprobado
+StatusSupplierOrderRefusedShort=Rexeitado
 StatusSupplierOrderToProcessShort=A procesar
 StatusSupplierOrderReceivedPartiallyShort=Recibido parcialmente
 StatusSupplierOrderReceivedAllShort=Produtos recibidos
-StatusSupplierOrderCanceled=Anulada
+StatusSupplierOrderCanceled=Anulado
 StatusSupplierOrderDraft=Borrador (é preciso validar)
 StatusSupplierOrderValidated=Validado
 StatusSupplierOrderOnProcess=Pedido - Agardando recepción
 StatusSupplierOrderOnProcessWithValidation=Pedido - Agardando recibir ou validar
 StatusSupplierOrderProcessed=Procesado
 StatusSupplierOrderToBill=Emitido
-StatusSupplierOrderApproved=Aprobada
-StatusSupplierOrderRefused=Rexeitada
+StatusSupplierOrderApproved=Aprobado
+StatusSupplierOrderRefused=Rexeitado
 StatusSupplierOrderReceivedPartially=Recibido parcialmente
-StatusSupplierOrderReceivedAll=Todos os productos recibidos
+StatusSupplierOrderReceivedAll=Todos os produtos recibidos
diff --git a/htdocs/langs/gl_ES/other.lang b/htdocs/langs/gl_ES/other.lang
index c476990f905..5270347b48e 100644
--- a/htdocs/langs/gl_ES/other.lang
+++ b/htdocs/langs/gl_ES/other.lang
@@ -1,154 +1,155 @@
 # Dolibarr language file - Source file is en_US - other
-SecurityCode=Security code
-NumberingShort=N°
-Tools=Tools
-TMenuTools=Tools
-ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
-Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
-BirthdayAlertOn=birthday alert active
-BirthdayAlertOff=birthday alert inactive
-TransKey=Translation of the key TransKey
-MonthOfInvoice=Month (number 1-12) of invoice date
-TextMonthOfInvoice=Month (text) of invoice date
-PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
-TextPreviousMonthOfInvoice=Previous month (text) of invoice date
-NextMonthOfInvoice=Following month (number 1-12) of invoice date
-TextNextMonthOfInvoice=Following month (text) of invoice date
-ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
-DocFileGeneratedInto=Doc file generated into <b>%s</b>.
-JumpToLogin=Disconnected. Go to login page...
-MessageForm=Message on online payment form
-MessageOK=Message on the return page for a validated payment
-MessageKO=Message on the return page for a canceled payment
-ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
-DeleteAlsoContentRecursively=Check to delete all content recursively
-PoweredBy=Powered by
-YearOfInvoice=Year of invoice date
-PreviousYearOfInvoice=Previous year of invoice date
-NextYearOfInvoice=Following year of invoice date
-DateNextInvoiceBeforeGen=Date of next invoice (before generation)
-DateNextInvoiceAfterGen=Date of next invoice (after generation)
-GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mode. The mode 'Lines' was automatically selected instead.
-OnlyOneFieldForXAxisIsPossible=Only 1 field is currently possible as X-Axis. Only the first selected field has been selected.
-AtLeastOneMeasureIsRequired=At least 1 field for measure is required
-AtLeastOneXAxisIsRequired=At least 1 field for X-Axis is required
-LatestBlogPosts=Latest Blog Posts
-Notify_ORDER_VALIDATE=Sales order validated
-Notify_ORDER_SENTBYMAIL=Sales order sent by mail
-Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
-Notify_ORDER_SUPPLIER_VALIDATE=Purchase order recorded
-Notify_ORDER_SUPPLIER_APPROVE=Purchase order approved
-Notify_ORDER_SUPPLIER_REFUSE=Purchase order refused
-Notify_PROPAL_VALIDATE=Customer proposal validated
-Notify_PROPAL_CLOSE_SIGNED=Customer proposal closed signed
-Notify_PROPAL_CLOSE_REFUSED=Customer proposal closed refused
-Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
-Notify_WITHDRAW_TRANSMIT=Transmission withdrawal
-Notify_WITHDRAW_CREDIT=Credit withdrawal
-Notify_WITHDRAW_EMIT=Perform withdrawal
-Notify_COMPANY_CREATE=Third party created
-Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
-Notify_BILL_VALIDATE=Customer invoice validated
-Notify_BILL_UNVALIDATE=Customer invoice unvalidated
-Notify_BILL_PAYED=Customer invoice paid
-Notify_BILL_CANCEL=Customer invoice canceled
-Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
-Notify_BILL_SUPPLIER_VALIDATE=Vendor invoice validated
-Notify_BILL_SUPPLIER_PAYED=Vendor invoice paid
-Notify_BILL_SUPPLIER_SENTBYMAIL=Vendor invoice sent by mail
-Notify_BILL_SUPPLIER_CANCELED=Vendor invoice cancelled
-Notify_CONTRACT_VALIDATE=Contract validated
-Notify_FICHINTER_VALIDATE=Intervention validated
-Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
-Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
-Notify_SHIPPING_VALIDATE=Shipping validated
-Notify_SHIPPING_SENTBYMAIL=Shipping sent by mail
-Notify_MEMBER_VALIDATE=Member validated
-Notify_MEMBER_MODIFY=Member modified
-Notify_MEMBER_SUBSCRIPTION=Member subscribed
-Notify_MEMBER_RESILIATE=Member terminated
-Notify_MEMBER_DELETE=Member deleted
-Notify_PROJECT_CREATE=Project creation
-Notify_TASK_CREATE=Task created
-Notify_TASK_MODIFY=Task modified
-Notify_TASK_DELETE=Task deleted
-Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
-Notify_EXPENSE_REPORT_APPROVE=Expense report approved
-Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
-Notify_HOLIDAY_APPROVE=Leave request approved
-SeeModuleSetup=See setup of module %s
-NbOfAttachedFiles=Number of attached files/documents
-TotalSizeOfAttachedFiles=Total size of attached files/documents
-MaxSize=Maximum size
-AttachANewFile=Attach a new file/document
-LinkedObject=Linked object
-NbOfActiveNotifications=Number of notifications (no. of recipient emails)
-PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe lines are separated by a carriage return.\n\n__USER_SIGNATURE__
-PredefinedMailTestHtml=__(Hello)__<br>This is a <b>test</b> mail sent to __EMAIL__ (the word test must be in bold).<br>The lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached \n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to remind you that the invoice  __REF__ seems to have not been paid. A copy of the invoice is attached as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find commercial proposal __REF__ attached \n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nPlease find price request __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendOrder=__(Hello)__\n\nPlease find order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
-PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
-ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
-ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
-DemoFundation=Manage members of a foundation
-DemoFundation2=Manage members and bank account of a foundation
-DemoCompanyServiceOnly=Company or freelance selling service only
-DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
-DemoCompanyManufacturing=Company manufacturing products
-DemoCompanyAll=Company with multiple activities (all main modules)
-CreatedBy=Created by %s
-ModifiedBy=Modified by %s
-ValidatedBy=Validated by %s
-ClosedBy=Closed by %s
-CreatedById=User id who created
-ModifiedById=User id who made latest change
-ValidatedById=User id who validated
-CanceledById=User id who canceled
-ClosedById=User id who closed
-CreatedByLogin=User login who created
-ModifiedByLogin=User login who made latest change
-ValidatedByLogin=User login who validated
-CanceledByLogin=User login who canceled
-ClosedByLogin=User login who closed
-FileWasRemoved=File %s was removed
-DirWasRemoved=Directory %s was removed
-FeatureNotYetAvailable=Feature not yet available in the current version
-FeaturesSupported=Supported features
-Width=Width
-Height=Height
-Depth=Depth
-Top=Top
-Bottom=Bottom
-Left=Left
-Right=Right
-CalculatedWeight=Calculated weight
-CalculatedVolume=Calculated volume
-Weight=Weight
-WeightUnitton=tonne
+SecurityCode=Código seguridade
+NumberingShort=Nº
+Tools=Utilidades
+TMenuTools=Utilidades
+ToolsDesc=Todas as utilidades que non están incluidas noutras entradas do menú atópanse aquí.<br>Todas as utilidades están dispoñibles no menú da esquerda.
+Birthday=Aniversario
+BirthdayAlertOn=Alerta de aniversario activa
+BirthdayAlertOff=Alerta de aniversario inactiva
+TransKey=Tradución da clave TransKey
+MonthOfInvoice=Mes (número 1-12) da data da factura
+TextMonthOfInvoice=Mes (texto) da data da factura
+PreviousMonthOfInvoice=Mes anterior (número 1-12) da data da factura
+TextPreviousMonthOfInvoice=Mes anterior (texto) da data da factura
+NextMonthOfInvoice=Mes seguinte (número 1-12) da data da factura
+TextNextMonthOfInvoice=Mes seguinte (texto) da data da factura
+PreviousMonth=Mes previo
+CurrentMonth=Mes actual
+ZipFileGeneratedInto=Ficheiro zip xerado en <b>%s</b>.
+DocFileGeneratedInto=Ficheiro documento xerado en <b>%s</b>.
+JumpToLogin=Desconectado. Ir á páxina de inicio de sesión ...
+MessageForm=Mensaxe no formulario de pago en liña
+MessageOK=Mensaxe na páxina de retorno de pago confirmado
+MessageKO=Mensaxe na páxina de retorno de pago cancelado
+ContentOfDirectoryIsNotEmpty=O contido deste directorio non está baleiro
+DeleteAlsoContentRecursively=Comprobe para eliminar todo o contido recursivamente
+PoweredBy=Fornecido by
+YearOfInvoice=Ano da data da factura
+PreviousYearOfInvoice=Ano previo da data da factura
+NextYearOfInvoice=Ano seguinte da data da factura
+DateNextInvoiceBeforeGen=Data da próxima factura (antes da xeración)
+DateNextInvoiceAfterGen=Data da próxima factura (despois da xeración)
+GraphInBarsAreLimitedToNMeasures=Os gráficos están limitados ao % medidos en modo "Barras". O modo 'Liñas' foi automáticamente seleccionado no seu lugar.
+OnlyOneFieldForXAxisIsPossible=Actualmente só e posible 1 campo como eixo X. Só escolleu o primeiro campo seleccionado.
+AtLeastOneMeasureIsRequired=Requírese polo menos1 campo para medir
+AtLeastOneXAxisIsRequired=Reuírese polo menos un campo para o eixo X
+LatestBlogPosts=Última publicación no blog
+Notify_ORDER_VALIDATE=Validación pedimento cliente
+Notify_ORDER_SENTBYMAIL=Envío pedimento do cliente por correo electrónico
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Envío pedimento ao provedor por correo electrónico
+Notify_ORDER_SUPPLIER_VALIDATE=Pedimento a provedor aprobado
+Notify_ORDER_SUPPLIER_APPROVE=Pedimento a provedor aprobado
+Notify_ORDER_SUPPLIER_REFUSE=Pedimento a provedor rexeitado
+Notify_PROPAL_VALIDATE=Validación orzamento cliente
+Notify_PROPAL_CLOSE_SIGNED=Orzamento cliente pechado como asinado
+Notify_PROPAL_CLOSE_REFUSED=Orzamento cliente pechado como rexeitado
+Notify_PROPAL_SENTBYMAIL=Envío orzamento cliente por correo electrónico
+Notify_WITHDRAW_TRANSMIT=Transmisión domiciliación
+Notify_WITHDRAW_CREDIT=Abono domiciliación
+Notify_WITHDRAW_EMIT=Emisión domiciliación
+Notify_COMPANY_CREATE=Creación terceiro
+Notify_COMPANY_SENTBYMAIL=Correos enviados dende a ficha do terceiro
+Notify_BILL_VALIDATE=Validada factura a cliente
+Notify_BILL_UNVALIDATE=Non validade factura a cliente
+Notify_BILL_PAYED=Factura do cliente pagada
+Notify_BILL_CANCEL=Cancelación factura a cliente
+Notify_BILL_SENTBYMAIL=Envío factura a cliente por correo electrónico
+Notify_BILL_SUPPLIER_VALIDATE=Validación factura de provedor
+Notify_BILL_SUPPLIER_PAYED=Factura do provedor pagada
+Notify_BILL_SUPPLIER_SENTBYMAIL=Envío factura de provedor por correo electrónico
+Notify_BILL_SUPPLIER_CANCELED=Factura del provedor cancelada
+Notify_CONTRACT_VALIDATE=Validación contrato
+Notify_FICHINTER_VALIDATE=Intervención validada
+Notify_FICHINTER_ADD_CONTACT=Contacto engadido a intervención
+Notify_FICHINTER_SENTBYMAIL=Intervención enviada por correo electrónico
+Notify_SHIPPING_VALIDATE=Envío validado
+Notify_SHIPPING_SENTBYMAIL=Expedición enviada por correo electrónico
+Notify_MEMBER_VALIDATE=Membro validado
+Notify_MEMBER_MODIFY=Membro modificado
+Notify_MEMBER_SUBSCRIPTION=Membro afiliado
+Notify_MEMBER_RESILIATE=Membro de baixa
+Notify_MEMBER_DELETE=Eliminación membro
+Notify_PROJECT_CREATE=Creación de proxecto
+Notify_TASK_CREATE=Tarefa creada
+Notify_TASK_MODIFY=Tarefa modificada
+Notify_TASK_DELETE=Tarefa eliminada
+Notify_EXPENSE_REPORT_VALIDATE=Informe de gastos validado (requírese aprobación)
+Notify_EXPENSE_REPORT_APPROVE=Informe de gastos aprobado
+Notify_HOLIDAY_VALIDATE=Petición días libres validada (requírese aprobación)
+Notify_HOLIDAY_APPROVE=Petición días libres aprobada
+SeeModuleSetup=Vexa a configuración do módulo %s
+NbOfAttachedFiles=Número ficheiros/documentos axuntados
+TotalSizeOfAttachedFiles=Tamaño total dos ficheiros/documentos axuntados
+MaxSize=Tamaño máximo
+AttachANewFile=Axuntar novo ficheiro/documento
+LinkedObject=Obxecto ligado
+NbOfActiveNotifications=Número de notificacións (nº de destinatarios)
+PredefinedMailTest=__(Hello)__\nEste é un correo de proba enviado a __EMAIL__.\nAs dúas liñas están separadas por un retorno de carro.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(Hello)__\nEste é un correo de <b> proba</b> (a palabra proba debe estar en negrita). <br> As dúas liñas están separadas por un retorno de carro. <br> <br> __USER_SIGNATURE__
+PredefinedMailContentContract=__(Ola)__\n\n\n__(Sinceiramente)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nAquí atopará a factura __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nGostariamos de advertirlle que a factura __REF__ parece non estar paga. Así que enviamoslle de novo a factura no ficheiro axuntado, coma un recordatorio.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nPoñémonos en contacto con vostede para facilitarlle o orzamento __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nPoñémonos en contacto con vostede para facilitarlle o orzamento __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendOrder=__(Hello)__\n\nPoñémonos en contacto con vostede para facilitarlle o pedimento __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPoñémonos en contacto con vostede para facilitarlle o pedimento __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPoñémonos en contacto con vostede para facilitarlle a factura __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendShipping=__(Hello)__\n\nPoñémonos en contacto con vostede para facilitarlle o envío __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendFichInter=__(Hello)__\n\nPoñémonos en contacto con vostede para facilitarllea intervención __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentLink=Pode facer clic na seguinte ligazón para realizar o seu pago, se aínda non o fixo.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sinceiramente)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Lembranza do evento "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>Está é uynha mensaxe automática, prégase non respostar.
+DemoDesc=Dolibarr é un ERP/CRM que suporta varios módulos de negocio. Non ten sentido unha demostración que amose xa que este escenario non sucede nunca (varios centos dispoñibles). Así, hai varios perfís dispoñibles de demostración.
+ChooseYourDemoProfil=Escolla o perfil de demostración que mellor se adapte as súas necesidades ...
+ChooseYourDemoProfilMore=... ou constrúa seu perfil<br>(modo de selección manual)
+DemoFundation=Xestión de membros dunha asociación
+DemoFundation2=Xestión de membros e contas bancarias dunha asociación
+DemoCompanyServiceOnly=Empresa ou traballador por conta propia vendendo só servizos
+DemoCompanyShopWithCashDesk=Xestión dunha tenda con caixa
+DemoCompanyProductAndStocks=Empresa vendendo produtos con punto de venda
+DemoCompanyManufacturing=Empresa fabricadora de produtos
+DemoCompanyAll=Empresa con actividades múltiples (todos os módulos principais)
+CreatedBy=Creado por %s
+ModifiedBy=Modificado por %s
+ValidatedBy=Validado por %s
+ClosedBy=Pechado por %s
+CreatedById=Id usuario que foi creado
+ModifiedById=Id de usuario no que foi realizado último cambio
+ValidatedById=Id usuario que validou
+CanceledById=Id usuario que canelou
+ClosedById=Id usuario que pechou
+CreatedByLogin=Login usuario que creou
+ModifiedByLogin=Login de usuario que fixo o último cambio
+ValidatedByLogin=Login usuario que validou
+CanceledByLogin=Login usuario que cancelou
+ClosedByLogin=Login usuario que pechou
+FileWasRemoved=O arquivo %s foi eliminado
+DirWasRemoved=O directorio %s foi eliminado
+FeatureNotYetAvailable=Funcionalidade ainda non dispoñible nesta versión actual
+FeaturesSupported=Funcionalidades dispoñibles
+Width=Ancho
+Height=Alto
+Depth=Fondo
+Top=Superior
+Bottom=Inferior
+Left=Esquerda
+Right=Dereita
+CalculatedWeight=Peso calculado
+CalculatedVolume=Volume calculado
+Weight=Peso
+WeightUnitton=tonelada
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
-WeightUnitpound=pound
-WeightUnitounce=ounce
-Length=Length
+WeightUnitpound=libra
+WeightUnitounce=onza
+Length=Lonxitude
 LengthUnitm=m
 LengthUnitdm=dm
 LengthUnitcm=cm
 LengthUnitmm=mm
-Surface=Area
+Surface=Área
 SurfaceUnitm2=m²
 SurfaceUnitdm2=dm²
 SurfaceUnitcm2=cm²
@@ -162,125 +163,126 @@ VolumeUnitcm3=cm³ (ml)
 VolumeUnitmm3=mm³ (µl)
 VolumeUnitfoot3=ft³
 VolumeUnitinch3=in³
-VolumeUnitounce=ounce
-VolumeUnitlitre=litre
-VolumeUnitgallon=gallon
+VolumeUnitounce=onza
+VolumeUnitlitre=litro
+VolumeUnitgallon=galón
 SizeUnitm=m
 SizeUnitdm=dm
 SizeUnitcm=cm
 SizeUnitmm=mm
-SizeUnitinch=inch
-SizeUnitfoot=foot
-SizeUnitpoint=point
-BugTracker=Bug tracker
-SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br>Check your inbox.
-BackToLoginPage=Back to login page
-AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br>In this mode, Dolibarr can't know nor change your password.<br>Contact your system administrator if you want to change your password.
-EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
-ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
-DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
-NumberOfProposals=Number of proposals
-NumberOfCustomerOrders=Number of sales orders
-NumberOfCustomerInvoices=Number of customer invoices
-NumberOfSupplierProposals=Number of vendor proposals
-NumberOfSupplierOrders=Number of purchase orders
-NumberOfSupplierInvoices=Number of vendor invoices
-NumberOfContracts=Number of contracts
-NumberOfMos=Number of manufacturing orders
-NumberOfUnitsProposals=Number of units on proposals
-NumberOfUnitsCustomerOrders=Number of units on sales orders
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices
-NumberOfUnitsSupplierProposals=Number of units on vendor proposals
-NumberOfUnitsSupplierOrders=Number of units on purchase orders
-NumberOfUnitsSupplierInvoices=Number of units on vendor invoices
-NumberOfUnitsContracts=Number of units on contracts
-NumberOfUnitsMos=Number of units to produce in manufacturing orders
-EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
-EMailTextInterventionValidated=The intervention %s has been validated.
-EMailTextInvoiceValidated=Invoice %s has been validated.
-EMailTextInvoicePayed=Invoice %s has been paid.
-EMailTextProposalValidated=Proposal %s has been validated.
-EMailTextProposalClosedSigned=Proposal %s has been closed signed.
-EMailTextOrderValidated=Order %s has been validated.
-EMailTextOrderApproved=Order %s has been approved.
-EMailTextOrderValidatedBy=Order %s has been recorded by %s.
-EMailTextOrderApprovedBy=Order %s has been approved by %s.
-EMailTextOrderRefused=Order %s has been refused.
-EMailTextOrderRefusedBy=Order %s has been refused by %s.
-EMailTextExpeditionValidated=Shipping %s has been validated.
-EMailTextExpenseReportValidated=Expense report %s has been validated.
-EMailTextExpenseReportApproved=Expense report %s has been approved.
-EMailTextHolidayValidated=Leave request %s has been validated.
-EMailTextHolidayApproved=Leave request %s has been approved.
-ImportedWithSet=Importation data set
-DolibarrNotification=Automatic notification
-ResizeDesc=Enter new width <b>OR</b> new height. Ratio will be kept during resizing...
-NewLength=New width
-NewHeight=New height
-NewSizeAfterCropping=New size after cropping
-DefineNewAreaToPick=Define new area on image to pick (left click on image then drag until you reach the opposite corner)
-CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is the information on the current edited image
-ImageEditor=Image editor
-YouReceiveMailBecauseOfNotification=You receive this message because your email has been added to list of targets to be informed of particular events into %s software of %s.
-YouReceiveMailBecauseOfNotification2=This event is the following:
-ThisIsListOfModules=This is a list of modules preselected by this demo profile (only most common modules are visible in this demo). Edit this to have a more personalized demo and click on "Start".
-UseAdvancedPerms=Use the advanced permissions of some modules
-FileFormat=File format
-SelectAColor=Choose a color
-AddFiles=Add Files
-StartUpload=Start upload
-CancelUpload=Cancel upload
-FileIsTooBig=Files is too big
-PleaseBePatient=Please be patient...
-NewPassword=New password
-ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your password has been received.
-NewKeyIs=This is your new keys to login
-NewKeyWillBe=Your new key to login to software will be
-ClickHereToGoTo=Click here to go to %s
-YouMustClickToChange=You must however first click on the following link to validate this password change
-ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
-IfAmountHigherThan=If amount higher than <strong>%s</strong>
-SourcesRepository=Repository for sources
-Chart=Chart
-PassEncoding=Password encoding
-PermissionsAdd=Permissions added
-PermissionsDelete=Permissions removed
-YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
-YourPasswordHasBeenReset=Your password has been reset successfully
-ApplicantIpAddress=IP address of applicant
-SMSSentTo=SMS sent to %s
-MissingIds=Missing ids
-ThirdPartyCreatedByEmailCollector=Third party created by email collector from email MSGID %s
-ContactCreatedByEmailCollector=Contact/address created by email collector from email MSGID %s
-ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
-TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
-OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+SizeUnitinch=pulgada
+SizeUnitfoot=pe
+SizeUnitpoint=punto
+BugTracker=Incidencias
+SendNewPasswordDesc=Este formulario permítelle solicitar un novo contrasinal. Enviarase ao seu enderezo de correo electrónico. <br> O cambio será efectivo unha vez faga clic na ligazón de confirmación do correo electrónico. <br> Comprobe a súa caixa de entrada.
+BackToLoginPage=Voltar á páxina de inicio de sesión
+AuthenticationDoesNotAllowSendNewPassword=O modo de autenticación é <b>% s </b>. <br> Neste modo, Dolibarr non pode saber nin cambiar o seu contrasinal. <br> Póñase en contacto co administrador do sistema se quere cambiar o seu contrasinal.
+EnableGDLibraryDesc=Instalar ou habilitar a biblioteca GD na súa instalación de PHP para usar esta opción.
+ProfIdShortDesc=<b> Id. Profesional% s </b> é unha información que depende dun país de terceiros. <br> Por exemplo, para o país <b>% s </b>, é o código <b>% s </ b>.
+DolibarrDemo=Demo de Dolibarr ERP/CRM
+StatsByNumberOfUnits=Estatísticas para suma de unidades de produto/servizo
+StatsByNumberOfEntities=Estatísticas en número de identidades referentes (nº de facturas o pedimentos...)
+NumberOfProposals=Número de pedimentos
+NumberOfCustomerOrders=Número de pedimentos de clientes
+NumberOfCustomerInvoices=Número de facturas a clientes
+NumberOfSupplierProposals=Número de orzamentos de provedores
+NumberOfSupplierOrders=Número de pedimentos a provedores
+NumberOfSupplierInvoices=Número de facturas de provedores
+NumberOfContracts=Número de contratos
+NumberOfMos=Número de pedimentos de fabricación
+NumberOfUnitsProposals=Número de unidades nos orzamentos a clientes
+NumberOfUnitsCustomerOrders=Número de unidades nos pedimentos de clientes
+NumberOfUnitsCustomerInvoices=Número de unidades nas facturas a clientes
+NumberOfUnitsSupplierProposals=Número de unidades nos orzamentos de provedores
+NumberOfUnitsSupplierOrders=Número de unidades nos pedimentos de provedores
+NumberOfUnitsSupplierInvoices=Número de unidades nas facturas de provedores
+NumberOfUnitsContracts=Número de unidades en contratos
+NumberOfUnitsMos=Número de unidades a producir nos pedimentos de fabricación
+EMailTextInterventionAddedContact=Unha nova intervencións %s foi asignada a vostede
+EMailTextInterventionValidated=Ficha intervención %s validada
+EMailTextInvoiceValidated=Factura %s validada
+EMailTextInvoicePayed=A factura %s foi pagada.
+EMailTextProposalValidated=O orzamento %s  do seu interese foi validado.
+EMailTextProposalClosedSigned=O orzamento %s foi pechado e asinado
+EMailTextOrderValidated=Pedimento %s validado.
+EMailTextOrderApproved=Pedimento %s aprobado
+EMailTextOrderValidatedBy=Pedimento %s rexistrado por %s.
+EMailTextOrderApprovedBy=Pedimento %s aprobado por %s
+EMailTextOrderRefused=Pedimento %s rexeitado
+EMailTextOrderRefusedBy=Pedimento %s rexeitado por %s
+EMailTextExpeditionValidated=Envío %s validado.
+EMailTextExpenseReportValidated=Informe de gastos %s validado.
+EMailTextExpenseReportApproved=Informe de gastos %s aprobado.
+EMailTextHolidayValidated=Petición de días libres %s validada.
+EMailTextHolidayApproved=Petición de días libres %s aprobada.
+ImportedWithSet=Lote de importación
+DolibarrNotification=Notificación automática
+ResizeDesc=Introduza o novo ancho <b>O</b> a nova altura. A relación conservase ao cambiar o tamaño ...
+NewLength=Novo ancho
+NewHeight=Nova altura
+NewSizeAfterCropping=Novas dimensións desois de recortar
+DefineNewAreaToPick=Establezca la zona de imagen a conservar (clic izquierdo sobre la imagen y arrastre hasta la esquina opuesta)
+CurrentInformationOnImage=Esta herramienta le permite cambiar el tamaño o cuadrar la imagen. Aquí hay información sobre la imagen que se está editando
+ImageEditor=Editor de imaxe
+YouReceiveMailBecauseOfNotification=Vostede está a recibir esta mensaxe porque o seu correo electrónico está subscrito a algunhas notificacións automáticas para informalo acerca de eventos especiais do programa %s de %s.
+YouReceiveMailBecauseOfNotification2=O evento en cuestión é o seguinte:
+ThisIsListOfModules=Amosámoslle un listado de módulos preseleccionados para este perfil de demostración (nesta demo só os mais comúns son accesibles). Axuste as súas preferencias e faga clic en "Iniciar".
+UseAdvancedPerms=Usar os dereitos avanzados nos permisos dalgúns módulos
+FileFormat=Formato de ficheiro
+SelectAColor=Escolla unha cor
+AddFiles=Engadir ficheiros
+StartUpload=Transferir
+CancelUpload=Cancelar a transferencia
+FileIsTooBig=O ficheiro é grande de mais
+PleaseBePatient=Pregamos sexa paciente...
+NewPassword=Novo contrasinal
+ResetPassword=Renovar contrasinal
+RequestToResetPasswordReceived=Foi recibida unha solicitude para cambiar o seu contrasinal de Dolibarr
+NewKeyIs=Este é o seu novo contrasinal para iniciar sesión
+NewKeyWillBe=O seu novo contradinal para iniciar sesión no software será
+ClickHereToGoTo=Faga click aquí para ir a %s
+YouMustClickToChange=Porén, debe facer click primeiro na seguinte ligazón para validar este cambio de contrasinal
+ForgetIfNothing=Se vostede non ten solicitado este cambio, simplemente ignore este correo electrónico. A súas credenciais son gardadas de forma segura.
+IfAmountHigherThan=Se o importe é maior que <strong>%s</strong>
+SourcesRepository=Repositorio das fontes
+Chart=Gráfico
+PassEncoding=Cifrado de contrasinal
+PermissionsAdd=Permisos engadidos
+PermissionsDelete=Permisos eliminados
+YourPasswordMustHaveAtLeastXChars=O seu contrasinal debe ter alo menos <strong>%s</strong>  caracteres
+YourPasswordHasBeenReset=O seu contrasinal foi restablecido con éxito
+ApplicantIpAddress=Enderezo IP do solicitante
+SMSSentTo=SMS enviado a %s
+MissingIds=IDs perdidos
+ThirdPartyCreatedByEmailCollector=Terceiro creado polo recolector de correos electrónicos do MSGID de correo electrónico %s
+ContactCreatedByEmailCollector=Contacto/enderezo creado polo recolector de correos electrónicos do MSGID de correo electrónico %s
+ProjectCreatedByEmailCollector=Proxecto creado polo recolector de correos electrónicos do MSGID de correo electrónico %s
+TicketCreatedByEmailCollector=Ticket creado polo recolector de correos electrónicos do MSGID de correo electrónico %s
+OpeningHoursFormatDesc=Use o - para separar horario de apertura e peche.<br>Use o espazo para engadir diferentes rangos.<br>Exemplo: 8-12 14-18
+PrefixSession=Prefixo do Id da sesión
 
 ##### Export #####
-ExportsArea=Exports area
-AvailableFormats=Available formats
-LibraryUsed=Library used
-LibraryVersion=Library version
-ExportableDatas=Exportable data
-NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions)
+ExportsArea=Área de exportación
+AvailableFormats=Formatos dispoñibles
+LibraryUsed=Librería utilizada
+LibraryVersion=Versión librería
+ExportableDatas=Datos exportables
+NoExportableData=Non hai datos exportables (sen módulos con datos exportables cargados, ou non teñen permisos)
 ##### External sites #####
-WebsiteSetup=Setup of module website
-WEBSITE_PAGEURL=URL of page
+WebsiteSetup=Configuración do módulo website
+WEBSITE_PAGEURL=URL da páxina
 WEBSITE_TITLE=Título
 WEBSITE_DESCRIPTION=Descrición
-WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITE_KEY__ in the path if path depends on website name (for example: image/__WEBSITE_KEY__/stories/myimage.png).
-WEBSITE_KEYWORDS=Keywords
-LinesToImport=Lines to import
+WEBSITE_IMAGE=Imaxe
+WEBSITE_IMAGEDesc=Ruta relativa das imaxes. Pode mantela baleira, rara vez ten uso (pode ser usada polo contido dinámico para amosar una vista previa dunha listaxe de publicacións de blog). Use __WEBSITE_KEY__ no  path se o path depende do nome do sitio web
+WEBSITE_KEYWORDS=Chaves
+LinesToImport=Liñas a importar
 
-MemoryUsage=Memory usage
-RequestDuration=Duration of request
-ProductsPerPopularity=Products/Services by popularity
-PopuProp=Products/Services by popularity in Proposals
-PopuCom=Products/Services by popularity in Orders
-ProductStatistics=Products/Services Statistics
-NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+MemoryUsage=Uso de memoria
+RequestDuration=Duración da solicitude
+ProductsPerPopularity=Produtos/Servizos por popularidade
+PopuProp=Produtos/Servizos por popularidade en Orzamentos
+PopuCom=Produtos/Servizos por popularidade e Pedimentos
+ProductStatistics=Estatísticas de Produtos/Servizos
+NbOfQtyInOrders=Cantidade en pedimentos
+SelectTheTypeOfObjectToAnalyze=Seleccione o tipo de obxecto a nalizar...
diff --git a/htdocs/langs/gl_ES/paypal.lang b/htdocs/langs/gl_ES/paypal.lang
index 5eb5f389445..ff13805b09a 100644
--- a/htdocs/langs/gl_ES/paypal.lang
+++ b/htdocs/langs/gl_ES/paypal.lang
@@ -1,36 +1,36 @@
 # Dolibarr language file - Source file is en_US - paypal
-PaypalSetup=PayPal module setup
-PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
-PaypalDoPayment=Pay with PayPal
-PAYPAL_API_SANDBOX=Mode test/sandbox
-PAYPAL_API_USER=API username
-PAYPAL_API_PASSWORD=API password
-PAYPAL_API_SIGNATURE=API signature
-PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
+PaypalSetup=Configuración do módulo PayPal
+PaypalDesc=Este módulo permite pagos de clientes vía <a href="http://www.paypal.com" target="_blank">Paypal</a>. Isto pode usarse para realizar calquera pago en relación cun obxecto Dolibarr (facturas, pedimentos ...)
+PaypalOrCBDoPayment=Pagar con Paypal (tarxeta ou Paypal)
+PaypalDoPayment=Pago mediante Paypal
+PAYPAL_API_SANDBOX=Modo de probas/sandbox
+PAYPAL_API_USER=Nome usuario API
+PAYPAL_API_PASSWORD=Contrasinal API
+PAYPAL_API_SIGNATURE=Sinatura API
+PAYPAL_SSLVERSION=Versión Curl SSL
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Propor pago integral (Tarxeta+Paypal) ou só Paypal
 PaypalModeIntegral=Integral
-PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
-ThisIsTransactionId=This is id of transaction: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
-NewOnlinePaymentReceived=New online payment received
-NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
-ReturnURLAfterPayment=Return URL after payment
-ValidationOfOnlinePaymentFailed=Validation of online payment failed
-PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
-SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
-DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
-DetailedErrorMessage=Detailed Error Message
-ShortErrorMessage=Short Error Message
-ErrorCode=Error Code
-ErrorSeverityCode=Error Severity Code
-OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import PayPal payments
-PostActionAfterPayment=Post actions after payments
-ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
-ValidationOfPaymentFailed=Validation of payment has failed
-CardOwner=Card holder
-PayPalBalance=Paypal credit
+PaypalModeOnlyPaypal=Só PayPal
+ONLINE_PAYMENT_CSS_URL=URL ou CSS opcional da folla de estilo na páxina de pago en liña
+ThisIsTransactionId=Identificador da transacción: <b>%s</b>
+PAYPAL_ADD_PAYMENT_URL=Engadir a url del pago Paypal ao enviar un documento por correo electrónico
+NewOnlinePaymentReceived=Nuevo pago en liña recibido
+NewOnlinePaymentFailed=Intentouse un novo pago en liña pero fallou
+ONLINE_PAYMENT_SENDEMAIL=Enderezo de correo electrónico a notificar no caso de intento de pago (con éxito ou non)
+ReturnURLAfterPayment=URL de retorno despois do pago
+ValidationOfOnlinePaymentFailed=Fallou a validación do pago en liña
+PaymentSystemConfirmPaymentPageWasCalledButFailed=A páxina de confirmación de pago foi chamada polo sistema de pago devolveu un erro
+SetExpressCheckoutAPICallFailed=Chamada á API SetExpressCheckout fallou.
+DoExpressCheckoutPaymentAPICallFailed=Chamada á API DoExpressCheckoutPayment fallou.
+DetailedErrorMessage=Detalle da mensaxe de erro
+ShortErrorMessage=Mensaxe curto de erro
+ErrorCode=Código do erro
+ErrorSeverityCode=Gravidade do código de erro
+OnlinePaymentSystem=Sistema de pago online
+PaypalLiveEnabled=Paypal en vivo habilitado (do contrario, modo proba/sandbox)
+PaypalImportPayment=Importe pagos Paypal
+PostActionAfterPayment=Accións despois dos pagos
+ARollbackWasPerformedOnPostActions=Foi executada unha reversión en todas as accións. Debe completar as acciones de publicación manualmente se son precisas.
+ValidationOfPaymentFailed=Avalidación do pago Paypal fallou
+CardOwner=Titular da tarxeta
+PayPalBalance=Crédito paypal
diff --git a/htdocs/langs/gl_ES/printing.lang b/htdocs/langs/gl_ES/printing.lang
index 97d17227276..19739ba42ba 100644
--- a/htdocs/langs/gl_ES/printing.lang
+++ b/htdocs/langs/gl_ES/printing.lang
@@ -43,12 +43,12 @@ IPP_State_reason1=Razon 1 do estado
 IPP_BW=Branco e negro
 IPP_Color=Cor
 IPP_Device=Dispositivo
-IPP_Media=Printer media
-IPP_Supported=Type of media
-DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
-GoogleAuthNotConfigured=Google OAuth has not been setup. Enable module OAuth and set a Google ID/Secret.
-GoogleAuthConfigured=Google OAuth credentials were found into setup of module OAuth.
-PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
-PrintingDriverDescprintipp=Configuration variables for printing driver Cups.
-PrintTestDescprintgcp=List of Printers for Google Cloud Print.
-PrintTestDescprintipp=List of Printers for Cups.
+IPP_Media=Impresora
+IPP_Supported=Tipo de soporte
+DirectPrintingJobsDesc=Esta páxina enumera os traballos de impresión atopados nas impresoras dispoñibles.
+GoogleAuthNotConfigured=Google OAuth non se configurou. Habilite o módulo OAuth e configure un ID/segredo de Google.
+GoogleAuthConfigured=As credenciais de Google OAuth atopáronse na configuración do módulo OAuth.
+PrintingDriverDescprintgcp=Variables de configuración para o controlador de impresión Google Cloud Print.
+PrintingDriverDescprintipp=Variables de configuración  de drivers para impresoras Cups
+PrintTestDescprintgcp=Listaxe de impresoras para Google Cloud Print.
+PrintTestDescprintipp=Listaxe de impresoras para servidor Cups
diff --git a/htdocs/langs/gl_ES/products.lang b/htdocs/langs/gl_ES/products.lang
index 585ebaf1788..0639c3bfb70 100644
--- a/htdocs/langs/gl_ES/products.lang
+++ b/htdocs/langs/gl_ES/products.lang
@@ -2,7 +2,7 @@
 ProductRef=Ref. produto
 ProductLabel=Etiqueta produto
 ProductLabelTranslated=Tradución etiqueta de produto
-ProductDescription=Product description
+ProductDescription=Descrición do produto
 ProductDescriptionTranslated=Tradución da descrición de produto
 ProductNoteTranslated=Tradución notas de produto
 ProductServiceCard=Ficha Produto/Servizo
@@ -18,12 +18,12 @@ Reference=Referencia
 NewProduct=Novo produto
 NewService=Novo servizo
 ProductVatMassChange=Cambio de IVE masivo
-ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
-MassBarcodeInit=Mass barcode init
-MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
+ProductVatMassChangeDesc=Esta ferramenta actualiza o tipo de IVE definido en <b><u>ALL</b></u>produtos e servizos
+MassBarcodeInit=Inicio masivo de código de barras
+MassBarcodeInitDesc=Esta páxina pódese usar para inicializar un código de barras en obxectos que non teñen definido un código de barras. Comprobe antes de completar a configuración do código de barras do módulo.
 ProductAccountancyBuyCode=Código contable (compra)
-ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
-ProductAccountancyBuyExportCode=Accounting code (purchase import)
+ProductAccountancyBuyIntraCode=Código contable (compra intra-comunitaria)
+ProductAccountancyBuyExportCode=Código contable (compra importación)
 ProductAccountancySellCode=Código contable (venda)
 ProductAccountancySellIntraCode=Código contable (venda intracomunitaria)
 ProductAccountancySellExportCode=Código contable (venda de exportación)
@@ -31,23 +31,23 @@ ProductOrService=Produto ou servizo
 ProductsAndServices=Produtos e servizos
 ProductsOrServices=Produtos ou servizos
 ProductsPipeServices=Produtos | Servizos
-ProductsOnSale=Products for sale
-ProductsOnPurchase=Products for purchase
+ProductsOnSale=Produtos á venda
+ProductsOnPurchase=Produtos en compra
 ProductsOnSaleOnly=Produtos só á venda
 ProductsOnPurchaseOnly=Produtos só en compra
 ProductsNotOnSell=Produtos nin á venda nin en compra
-ProductsOnSellAndOnBuy=Produtos en venda e en compra
-ServicesOnSale=Services for sale
-ServicesOnPurchase=Services for purchase
+ProductsOnSellAndOnBuy=Produtos en venda mais en compra
+ServicesOnSale=Servizos en venda
+ServicesOnPurchase=Servizos en compra
 ServicesOnSaleOnly=Servizos só á venda
 ServicesOnPurchaseOnly=Servizos só en compra
 ServicesNotOnSell=Servizos fora de venda e de compra
-ServicesOnSellAndOnBuy=Servizos á venda e en compra
-LastModifiedProductsAndServices=Latest %s modified products/services
+ServicesOnSellAndOnBuy=Servizos á venda mais en compra
+LastModifiedProductsAndServices=Últimos %s produtos/servizos modificados
 LastRecordedProducts=Últimos %s produtos rexistrados
 LastRecordedServices=Últimos %s servizos rexistrados
-CardProduct0=Produto
-CardProduct1=Servizo
+CardProduct0=Ficha produto
+CardProduct1=Ficha servizo
 Stock=Stock
 MenuStocks=Stocks
 Stocks=Stocks e localización de produtos (almacén)
@@ -72,22 +72,22 @@ AppliedPricesFrom=Prezo de venda
 SellingPrice=Prezo de venda
 SellingPriceHT=Prezo de venda sen IVE
 SellingPriceTTC=Prezo de venda con IVE
-SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=This value could be used for margin calculation.
+SellingMinPriceTTC=Prezo mínimo de venda (IVE incluido)
+CostPriceDescription=Este campo de prezo (sen impostos) pode usarse para almacenar o importe medio que este produto custa á súa empresa. Pode ser calquera prezo que calcule vostede mesmo, por exemplo a partir do prezo medio de compra máis o custo medio de produción e distribución.
+CostPriceUsage=Este valor podería usarse para o cálculo de marxes
 SoldAmount=Importe vendas
 PurchasedAmount=Importe compras
 NewPrice=Novo prezo
 MinPrice=Prezo de venda mín.
 EditSellingPriceLabel=Editar etiqueta prezo de venda
-CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
-ContractStatusClosed=Pechada
+CantBeLessThanMinPrice=O prezo de venda non pode ser inferior ao mínimo permitido para este produto (%s sen impostos). Esta mensaxe tamén pode aparecer se escribe un desconto demasiado alto.
+ContractStatusClosed=Pechado
 ErrorProductAlreadyExists=Un produto coa referencia %s xa existe.
-ErrorProductBadRefOrLabel=Wrong value for reference or label.
-ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
+ErrorProductBadRefOrLabel=Valor incorrecto como referencia ou etiqueta.
+ErrorProductClone=Houbo un problema ao tentar clonar o produto ou servizo.
+ErrorPriceCantBeLowerThanMinPrice=Erro, o prezo non pode ser inferior ao prezo mínimo.
 Suppliers=Provedores
-SupplierRef=Vendor SKU
+SupplierRef=SKU Provedor 
 ShowProduct=Amosar produto
 ShowService=Amosar servizo
 ProductsAndServicesArea=Área produtos e servizos
@@ -104,25 +104,26 @@ SetDefaultBarcodeType=Defina o tipo de código de barras
 BarcodeValue=Valor do código de barras
 NoteNotVisibleOnBill=Nota (non visible nas facturas, orzamentos...)
 ServiceLimitedDuration=Se o produto é un servizo con duración limitada :
-FillWithLastServiceDates=Fill with last service line dates
-MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
-MultiPricesNumPrices=Number of prices
-DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
-AssociatedProducts=Kits
-AssociatedProductsNumber=Number of products composing this kit
-ParentProductsNumber=Number of parent packaging product
-ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
+FillWithLastServiceDates=Complete coas últimas datas da liña de servizo
+MultiPricesAbility=Varios segmentos de prezos por produto/servizo (cada cliente está nun segmento)
+MultiPricesNumPrices=Nº de prezos
+DefaultPriceType=Base de prezos por defecto (con ou sen impostos) ao engadir novos prezos de venda
+AssociatedProductsAbility=Activar produtos compostos (kits)
+VariantsAbility=Activar variantes (variantes de produtos, por exemplo cor, tamaño)
+AssociatedProducts=Produtos compostos
+AssociatedProductsNumber=Nº de produtos que compoñen este produto
+ParentProductsNumber=Nº de produtos que este produto comptén
+ParentProducts=Produtos pai
+IfZeroItIsNotAVirtualProduct=Se 0, este produto non é un produto composto
+IfZeroItIsNotUsedByVirtualProduct=Se 0, este produto non está sendo utilizado por ningún produto composto
 KeywordFilter=Filtro por clave
-CategoryFilter=Category filter
-ProductToAddSearch=Search product to add
-NoMatchFound=No match found
-ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this kit
-ProductParentList=List of kits with this product as a component
-ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
+CategoryFilter=Filtro por categoría
+ProductToAddSearch=Procurar produtos a axuntar
+NoMatchFound=Non atopáronse resultados
+ListOfProductsServices=Listaxe de produtos/servizos
+ProductAssociationList=Listaxe de produtos/servizos que compoñen este produto composto
+ProductParentList=Listaxe de produtos/servizos con este produto como compoñente
+ErrorAssociationIsFatherOfThis=Un dos produtos seleccionados é pai do produto en curso
 DeleteProduct=Eliminar un produto/servizo
 ConfirmDeleteProduct=¿Está certo de querer eliminar este produto/servizo?
 ProductDeleted=O produto/servizo "%s" foi eliminado da base de datos.
@@ -134,8 +135,8 @@ DeleteProductLine=Eliminar liña  de produto
 ConfirmDeleteProductLine=¿Está certo de querer eliminar esta liña  de produto?
 ProductSpecial=Especial
 QtyMin=Cantidad mínima de compra
-PriceQtyMin=Price quantity min.
-PriceQtyMinCurrency=Price (currency) for this qty. (no discount)
+PriceQtyMin=Prezo para esta cantidade mínima
+PriceQtyMinCurrency=Prezo para esta cantidade mínima (sen desconto)
 VATRateForSupplierProduct=Tasa IVE (para este produto/provedor)
 DiscountQtyMin=Desconto para esta cantidade
 NoPriceDefinedForThisSupplier=Ningún prezo/cant. definido para este provedor/produto
@@ -157,8 +158,8 @@ RowMaterial=Materia prima
 ConfirmCloneProduct=¿Está certo de querer clonar o produto ou servizo <b>%s</b>?
 CloneContentProduct=Clonar a información principal do produto/servizo
 ClonePricesProduct=Clonar prezos
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
+CloneCategoriesProduct=Clonar etiquetas/categorías ligadas
+CloneCompositionProduct=Clonar produto/servizo virtual
 CloneCombinationsProduct=Clonar variantes de produto
 ProductIsUsed=Este produto é utilizado
 NewRefForClone=Ref. do novo produto/servizo
@@ -167,11 +168,13 @@ BuyingPrices=Prezos de compra
 CustomerPrices=Prezos a clientes
 SuppliersPrices=Prezos a provedores
 SuppliersPricesOfProductsOrServices=Prezos de provedores (de produtos ou servizos)
-CustomCode=Código aduaneiro / Mercancía /
+CustomCode=Aduanda / Mercadoría / Código HS
 CountryOrigin=País de orixe
-Nature=Nature of product (material/finished)
-NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+RegionStateOrigin=Rexión de orixe
+StateOrigin=Estado|Provincia de orixe
+Nature=Natureza do produto (material/manufacturado)
+NatureOfProductShort=Natureza do produto
+NatureOfProductDesc=Materia prima ou produto manufacturado
 ShortLabel=Etiqueta curta
 Unit=Unidade
 p=u.
@@ -205,12 +208,12 @@ unitLM=Metro lineal
 unitM2=Metro cadrado
 unitM3=Metro cúbico
 unitL=Litro
-unitT=ton
+unitT=tonelada
 unitKG=kg
 unitG=Gramo
 unitMG=mg
-unitLB=pound
-unitOZ=ounce
+unitLB=libra
+unitOZ=onza
 unitM=Metro
 unitDM=dm
 unitCM=cm
@@ -229,8 +232,8 @@ unitCM3=cm³
 unitMM3=mm³
 unitFT3=ft³
 unitIN3=in³
-unitOZ3=ounce
-unitgallon=gallon
+unitOZ3=onza
+unitgallon=galón
 ProductCodeModel=Modelo de ref. de produto
 ServiceCodeModel=Modelo de ref. de servizo
 CurrentProductPrice=Prezo actual
@@ -239,13 +242,13 @@ AlwaysUseFixedPrice=Usar o prezo fixado
 PriceByQuantity=Prezos diferentes por cantidade
 DisablePriceByQty=Desactivar prezos por cantidade
 PriceByQuantityRange=Rango cantidade
-MultipriceRules=Regras para segmento de prezos
-UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
+MultipriceRules=Prezos automaticamente por segmento
+UseMultipriceRules=Usar regras do segmento de prezos (definidas na configuración do módulo de produto) para calcular automaticamente os prezos de todos os outros segmentos segundo o primeiro segmento
 PercentVariationOver=%% variación sobre %s
 PercentDiscountOver=%% desconto sobre %s
 KeepEmptyForAutoCalculation=Mantéñase baleiro para que calcule automáticamente o peso ou volume dos produtos
-VariantRefExample=Examples: COL, SIZE
-VariantLabelExample=Examples: Color, Size
+VariantRefExample=Exemplo: COR, TAMAÑO
+VariantLabelExample=Exemplo: Cor, Tamaño
 ### composition fabrication
 Build=Fabricar
 ProductsMultiPrice=Produtos e prezos para cada segmento de prezos
@@ -257,15 +260,15 @@ Quarter2=2º trimestre
 Quarter3=3º trimestre
 Quarter4=4º trimestre
 BarCodePrintsheet=Imprimir código de barras
-PageToGenerateBarCodeSheets=With this tool, you can print sheets of barcode stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
-NumberOfStickers=Number of stickers to print on page
-PrintsheetForOneBarCode=Print several stickers for one barcode
-BuildPageToPrint=Generate page to print
-FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
-FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
-DefinitionOfBarCodeForProductNotComplete=Definition of type or value of barcode not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of barcode non complete for third party %s.
+PageToGenerateBarCodeSheets=Con esta ferramenta pode imprimir follas de pegatinas de código de barras. Escolla o formato da páxina da pegatina, o tipo de código de barras e o valor do código de barras e prema no botón <b>%s</b>.
+NumberOfStickers=Número de pegatinas para imprimir na páxina
+PrintsheetForOneBarCode=Imprimir varias pegatinas para un código de barras
+BuildPageToPrint=Xerar páxina para imprimir
+FillBarCodeTypeAndValueManually=Cubrir o tipo e o valor do código de barras manualmente.
+FillBarCodeTypeAndValueFromProduct=Cubrir o tipo de código de barras e o valor do código de barras dun produto.
+FillBarCodeTypeAndValueFromThirdParty=Cubrir o tipo de código de barras e o valor do código de barras dun terceiro.
+DefinitionOfBarCodeForProductNotComplete=A definición do tipo ou valor do código de barras non está completa para o produto %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=A definición do tipo ou valor do código de barras non completo para terceiros %s.
 BarCodeDataForProduct=Información do código de barras do produto %s:
 BarCodeDataForThirdparty=Información do código de barras do terceiro %s:
 ResetBarcodeForAllRecords=Definir valores de codigo de barras para todos os rexistros (isto restablecerá os valores de códigos de barras xa rexistrados cos novos valores)
@@ -280,31 +283,31 @@ MinimumRecommendedPrice=O prezo mínimo recomendado é: %s
 PriceExpressionEditor=Editor de expresión de prezos
 PriceExpressionSelected=Expresión de prezos seleccionada
 PriceExpressionEditorHelp1="price = 2 + 2" ou "2 + 2" para configurar un prezo. Use ; para separar expresións
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
-PriceExpressionEditorHelp3=In both product/service and vendor prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
-PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In vendor prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp2=Pode acceder a ExtraFields con variables como  <b>#extrafield_myextrafieldkey#</b> e variables globais con <b>#global_mycode#</b>
+PriceExpressionEditorHelp3=Tanto en produto/servizo como nos prezos de provedores hai estas variables dispoñibles:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
+PriceExpressionEditorHelp4=Só no prezo do produto/servizo:  <b>#supplier_min_price#</b><br>Só nos prezos do provedor:  <b>#supplier_quantity# and #supplier_tva_tx#</b>
 PriceExpressionEditorHelp5=Valores globais dispoñibles:
 PriceMode=Modo prezo
 PriceNumeric=Número
 DefaultPrice=Prezo por defecto
-DefaultPriceLog=Log of previous default prices
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Child products
+DefaultPriceLog=Rexistro de prezos predeterminados anteriores
+ComposedProductIncDecStock=Incrementar/Diminuir stock ao mudar o pai
+ComposedProduct=Subproduto
 MinSupplierPrice=Prezo mínimo de compra
 MinCustomerPrice=Prezo mínimo de venda
 DynamicPriceConfiguration=Configuración de prezo dinámico
-DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
+DynamicPriceDesc=Pode definir fórmulas matemáticas para calcular os prezos do cliente ou do provedor. Tales fórmulas poden empregar todos os operadores matemáticos, algunhas constantes e variables. Pode definir aquí as variables que desexa empregar. Se a variable precisa unha actualización automática, pode definir a URL externa para permitir a Dolibarr actualizar o valor automaticamente.
 AddVariable=Engadir variable
 AddUpdater=Engadir Actualizador
 GlobalVariables=Variables globais
 VariableToUpdate=Variable a actualizar
-GlobalVariableUpdaters=External updaters for variables
+GlobalVariableUpdaters=Variables globais a actualizar
 GlobalVariableUpdaterType0=datos JSON
-GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
-GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
-GlobalVariableUpdaterType1=WebService data
-GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
-GlobalVariableUpdaterHelpFormat1=Format for request is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}}
+GlobalVariableUpdaterHelp0=Analiza os datos JSON do URL especificado, VALUE especifica a localización do valor relevante,
+GlobalVariableUpdaterHelpFormat0=Formato da solicitude {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=Datos do servizo web
+GlobalVariableUpdaterHelp1=Analiza os datos do Webservice a partir dun URL especificado, NS especifica o espazo de nomes, VALUE especifica a localización do valor relevante, DATA debe conter os datos que se enviarán e METHOD é o método WS a chamar
+GlobalVariableUpdaterHelpFormat1=O formato da solicitude é {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your":"data","to":"send"}}
 UpdateInterval=Intervalo de actualización (minutos)
 LastUpdated=Última actualización
 CorrectlyUpdated=Actualizado correctamente
@@ -315,33 +318,33 @@ DefaultPriceRealPriceMayDependOnCustomer=Prezo por defecto, ou prezo real pode d
 WarningSelectOneDocument=Seleccione alo menos un documento
 DefaultUnitToShow=Unidade
 NbOfQtyInProposals=Cant. en orzamentos
-ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+ClinkOnALinkOfColumn=Click na ligazón da columna %s para obter unha vista detallada...
 ProductsOrServicesTranslations=Tradución Produtos/Servizos
-TranslatedLabel=Translated label
-TranslatedDescription=Translated description
-TranslatedNote=Translated notes
-ProductWeight=Weight for 1 product
-ProductVolume=Volume for 1 product
-WeightUnits=Weight unit
-VolumeUnits=Volume unit
-WidthUnits=Width unit
-LengthUnits=Length unit
-HeightUnits=Height unit
-SurfaceUnits=Surface unit
-SizeUnits=Size unit
-DeleteProductBuyPrice=Delete buying price
-ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
-SubProduct=Sub product
-ProductSheet=Product sheet
-ServiceSheet=Service sheet
-PossibleValues=Possible values
+TranslatedLabel=Tradución da etiqueta
+TranslatedDescription=Tradución da descrición
+TranslatedNote=Tradución das notas
+ProductWeight=Peso para 1 produto
+ProductVolume=Volume para 1 produto
+WeightUnits=Peso unitario
+VolumeUnits=Volumen unitario
+WidthUnits=Ancho unitario
+LengthUnits=Lonxitude unitaria
+HeightUnits=Peso unitario
+SurfaceUnits=Superficie unitaria
+SizeUnits=Tamaño unitario
+DeleteProductBuyPrice=Eliminar prezo de compra
+ConfirmDeleteProductBuyPrice=¿Está certo de querer eliminar este prezo de compra?
+SubProduct=Subproduto
+ProductSheet=Folla de produto
+ServiceSheet=Folla de servizo
+PossibleValues=Valores posibles
 GoOnMenuToCreateVairants=Vaia ao menú %s - %s para preparar variables de atributos (como cores, tamaño, ...)
-UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
-ProductSupplierDescription=Vendor description for the product
-UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
-PackagingForThisProduct=Packaging
-PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
-QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+UseProductFournDesc=Engade unha función para definir as descricións dos produtos definidos polos provedores ademais das descricións para os clientes
+ProductSupplierDescription=Descrición do produto do provedor
+UseProductSupplierPackaging=Utilice o envase nos prezos do provedor (recalcule as cantidades segundo o prezo do empaquetado do provedor ao engadir/actualizar a liña nos documentos do provedor)
+PackagingForThisProduct=Empaquetado
+PackagingForThisProductDesc=No pedido do provedor, solicitará automaticamente esta cantidade (ou un múltiplo desta cantidade). Non pode ser inferior á cantidade mínima de compra
+QtyRecalculatedWithPackaging=A cantidade da liña recalculouse segundo o empaquetado do provedor
 
 #Attributes
 VariantAttributes=Atributos variantes
@@ -364,31 +367,31 @@ SelectCombination=Seleccione combinación
 ProductCombinationGenerator=Xerador de variantes
 Features=Funcións
 PriceImpact=Impacto no prezo
-ImpactOnPriceLevel=Impact on price level %s
-ApplyToAllPriceImpactLevel= Apply to all levels
-ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
+ImpactOnPriceLevel=Impacto sobre o prexo no nivel %s
+ApplyToAllPriceImpactLevel= Aplicar a todos os niveis
+ApplyToAllPriceImpactLevelHelp=Ao facer clic aquí establecerá o mesmo impacto no prezo en todos os niveis
 WeightImpact=Impacto no peso
 NewProductAttribute=Novo atributo
 NewProductAttributeValue=Novo valor de atributo
 ErrorCreatingProductAttributeValue=Ocurriu un erro ao crear o valor do atributo. Esto pode ser por que xa existía un valor con esta referencia
-ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
-TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
+ProductCombinationGeneratorWarning=Se continúa, antes de xerar novas variantes, ELIMINARÁ todas as anteriores. as xa existentes actualizaranse cos novos valores
+TooMuchCombinationsWarning=Xerar moitas variantes pode producir un alto uso da CPU, uso de memoria e Dolibarr será quen de crealas. Activar a opción "%s" pode axudar a reducir o uso de memoria.
 DoNotRemovePreviousCombinations=Non remover variantes previas
 UsePercentageVariations=Utilizar variacións porcentuais
 PercentageVariation=Variación porcentual
 ErrorDeletingGeneratedProducts=Aconteceu un erro mentres eliminaba as variantes de produtos existentes
 NbOfDifferentValues=Nº de valores diferentes
-NbProducts=Number of products
-ParentProduct=Parent product
+NbProducts=Nº de produtos
+ParentProduct=Produto pai
 HideChildProducts=Ocultar as variantes de produtos
 ShowChildProducts=Amosar a variantes de produtos
-NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
-ConfirmCloneProductCombinations=Would you like to copy all the product variants to the other parent product with the given reference?
+NoEditVariants=Vaia á tarxeta de produto principal e edite o impacto do prezo das variantes na lapela de variantes
+ConfirmCloneProductCombinations=¿Quere copiar todas as variantes do produto ao outro produto pai coa referencia dada?
 CloneDestinationReference=Referencia de produto de destino
 ErrorCopyProductCombinations=Aconteceu un erro ao copiar as variantes de produto
 ErrorDestinationProductNotFound=Destino do produto non atopado
 ErrorProductCombinationNotFound=Variante do produto non atopada
-ActionAvailableOnVariantProductOnly=Action only available on the variant of product
-ProductsPricePerCustomer=Product prices per customers
-ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
-DeleteLinkedProduct=Delete the child product linked to the combination
+ActionAvailableOnVariantProductOnly=Acción só dispoñible na variante do produto
+ProductsPricePerCustomer=Prezos de produto por cliente
+ProductSupplierExtraFields=Atributos adicionais (Prezos Provedor)
+DeleteLinkedProduct=Eliminar o produto fillo ligado á combinación
diff --git a/htdocs/langs/gl_ES/projects.lang b/htdocs/langs/gl_ES/projects.lang
index 58766a79bc1..75bb1daca79 100644
--- a/htdocs/langs/gl_ES/projects.lang
+++ b/htdocs/langs/gl_ES/projects.lang
@@ -99,8 +99,8 @@ ListShippingAssociatedProject=Listaxe de envíos asociados ao proxecto
 ListFichinterAssociatedProject=Listaxe de intervencións asociadas ao proxecto
 ListExpenseReportsAssociatedProject=Listaxe de informes de gastos asociados ao proxecto
 ListDonationsAssociatedProject=Listaxe de doacións/subvencións asociadas ao proxecto
-ListVariousPaymentsAssociatedProject=Listaxe de pagos diversos asociados ao proxecto
-ListSalariesAssociatedProject=Listaxe de pagos de salarios asociados ao proxecto
+ListVariousPaymentsAssociatedProject=Listaxe de pagamentos diversos asociados ao proxecto
+ListSalariesAssociatedProject=Listaxe de pagamentos de salarios asociados ao proxecto
 ListActionsAssociatedProject=Listaxe de eventos asociados ao proxecto
 ListMOAssociatedProject=Listaxe de ordes de fabricación asociadas ao proxecto
 ListTaskTimeUserProject=Listaxe de tempo empregado nas tarefas do proxecto
@@ -115,7 +115,7 @@ ChildOfTask=Fío da tarefa
 TaskHasChild=A tarefa ten fíos
 NotOwnerOfProject=Non é dono deste proxecto privado
 AffectedTo=Asignado a
-CantRemoveProject=Este proxecto non pode ser eliminado porque está referenciado por algúns outros obxectoss (facturas, pedimentos ou outras). Ver lapela de referencias.
+CantRemoveProject=Este proxecto non pode ser eliminado porque está referenciado por algúns outros obxectoss (facturas, pedimentos ou outras). Ver lapela '%s.'
 ValidateProject=Validar proxecto
 ConfirmValidateProject=¿Está certo de querer validar este proxecto?
 CloseAProject=Pechar proxecto
@@ -126,25 +126,25 @@ ConfirmReOpenAProject=Está certo de querer reabrir este proxecto?
 ProjectContact=Contactos do proxecto
 TaskContact=Contactos de tarefas
 ActionsOnProject=Eventos do proxecto
-YouAreNotContactOfProject=You are not a contact of this private project
-UserIsNotContactOfProject=User is not a contact of this private project
-DeleteATimeSpent=Delete time spent
-ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
-DoNotShowMyTasksOnly=See also tasks not assigned to me
-ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Contacts of task
-ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
-NoTasks=No tasks for this project
-LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
-ErrorTimeSpentIsEmpty=Time spent is empty
-ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
-IfNeedToUseOtherObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
+YouAreNotContactOfProject=Vostede non é contacto deste proxecto privado
+UserIsNotContactOfProject=O usuario non é contacto deste proxecto privado
+DeleteATimeSpent=Eliminación de tempo adicado
+ConfirmDeleteATimeSpent=¿Está certo de querer eliminar este tempo adicado?
+DoNotShowMyTasksOnly=Ver tamén tarefas non asignadas a min
+ShowMyTasksOnly=Ver só tarefas asignadas a min
+TaskRessourceLinks=Contactos da tarefa
+ProjectsDedicatedToThisThirdParty=Proxectos adicados a este terceiro
+NoTasks=Ningunha tarefa para este proxecto
+LinkedToAnotherCompany=Ligado a outro terceiro
+TaskIsNotAssignedToUser=Tarefa non asignada ao usuario. Use o botón '<strong>%s</strong>' para asignar a tarefa agora.
+ErrorTimeSpentIsEmpty=O tempo consumido está baleiro
+ThisWillAlsoRemoveTasks=Esta operación tamén eliminará todas as tarefas do proxecto (<b>%s</b> tarefas neste intre) e todas as entradas de tempo adicado.
+IfNeedToUseOtherObjectKeepEmpty=Se os obxectos (factura, pedimento, ...) pertencen a outro terceiro, debe estar ligado ao proxecto a crear, deixe isto baleiro para permitir asignar o proxecto a distintos terceiros.
 CloneTasks=Clonar as tarefas
 CloneContacts=Clonar os contactos
 CloneNotes=Clonar a notas
 CloneProjectFiles=Clonar os ficheiros engadidos no proxecto
-CloneTaskFiles=Clonar os ficheiros engadidos da(s) tarefa(s) (se se clonan  a(s) tarefa(s))
+CloneTaskFiles=Clonar tarefa(s) engadida(s) a ficheiro(s) (se se clonaron  a(s) tarefa(s))
 CloneMoveDate=¿Actualizar as datas dos proxectos/tarefas?
 ConfirmCloneProject=¿Está certo de querer clonar este proxecto?
 ProjectReportDate=Cambiar data das tarefas segundo a data de inicio do novo proxecto
@@ -178,7 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Participante
 TypeContact_project_task_external_TASKCONTRIBUTOR=Participante
 SelectElement=Escolla elemento
 AddElement=Ligar ao elemento
-LinkToElementShort=Vincular a
+LinkToElementShort=Ligar a
 # Documents models
 DocumentModelBeluga=Prantilla de documento para a descrición dos obxectos ligados
 DocumentModelBaleine=Prantilla de documendo do proxecto para tarefas
@@ -187,7 +187,7 @@ PlannedWorkload=Carga de traballo planificada
 PlannedWorkloadShort=Carga de traballo
 ProjectReferers=Items relacionados
 ProjectMustBeValidatedFirst=O proxecto previamente ten que validarse
-FirstAddRessourceToAllocateTime=Asignar a un usuario a unha tarefa para asignar tempo
+FirstAddRessourceToAllocateTime=Asignar un usuario a unha tarefa para asignar tempo
 InputPerDay=Entrada por día
 InputPerWeek=Entrada por semana
 InputPerMonth=Entrada por mes
@@ -211,12 +211,12 @@ ProjectNbProjectByMonth=Nº de proxectos creados por mes
 ProjectNbTaskByMonth=Nº de tarefas creadas por mes
 ProjectOppAmountOfProjectsByMonth=Importe de oportunidades por mes
 ProjectWeightedOppAmountOfProjectsByMonth=Importe medio oportunidades por mes
-ProjectOpenedProjectByOppStatus=Open project|lead by lead status
-ProjectsStatistics=Statistics on projects or leads
-TasksStatistics=Statistics on tasks of projects or leads
+ProjectOpenedProjectByOppStatus=Proxectos/oportunidades abertas por estado da oportunidade
+ProjectsStatistics=Estatísticas sobre proxectos/oportunidades
+TasksStatistics=Estatísticas sobre tarefas en proxectos/oportunidade
 TaskAssignedToEnterTime=Tarefa asignada. Debería poder introducir tempos nesta tarefa.
 IdTaskTime=Id tempo da tarefa
-YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
+YouCanCompleteRef=Se desexa completar a referencia con algún sufixo, recoméndase engadir un carácter - para separala, polo que a numeración automática aínda funcionará correctamente para os próximos proxectos. Por exemplo %s-MYSUFFIX
 OpenedProjectsByThirdparties=Proxectos abertos de terceiros
 OnlyOpportunitiesShort=Só oportunidades
 OpenedOpportunitiesShort=Oportunidades abertas
@@ -238,7 +238,7 @@ LatestProjects=Últimos %s proxectos
 LatestModifiedProjects=Últimos %s proxectos modificados
 OtherFilteredTasks=Outras tarefas filtradas
 NoAssignedTasks=Sen tarefas asignadas ( Asigne proxectos/tarefas ao usuario actual dende o selector superior  para indicar tempos nelas)
-ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
+ThirdPartyRequiredToGenerateInvoice=Debe definirse un terceiro no proxecto para poder facturalo.
 ChooseANotYetAssignedTask=Escolla unha tarefa non asignada aínda a vostede
 # Comments trans
 AllowCommentOnTask=Permitir comentarios dos usuarios nas tarefas
@@ -254,7 +254,7 @@ TimeSpentForInvoice=Tempo empregado
 OneLinePerUser=Unha liña por usuario
 ServiceToUseOnLines=Servizo a usar en liñas
 InvoiceGeneratedFromTimeSpent=Factura %s foi xerada co tempo empregado no proxecto
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
+ProjectBillTimeDescription=Comprobe se introduce unha folla de tempo nas tarefas do proxecto e planea xerar factura(s) a partir da folla de tempo para facturar ao cliente do proxecto (non comprobe se pensa crear unha factura que non estexa baseada nas follas de traballo introducidas). Nota: para xerar factura, vaia a pestana "Tempo empregado" do proxecto e selecciona as liñas a incluír.
 ProjectFollowOpportunity=Seguir oportunidade
 ProjectFollowTasks=Seguir tarefa
 Usage=Uso
diff --git a/htdocs/langs/gl_ES/propal.lang b/htdocs/langs/gl_ES/propal.lang
index c0d0b31f60c..7870f3bd1ad 100644
--- a/htdocs/langs/gl_ES/propal.lang
+++ b/htdocs/langs/gl_ES/propal.lang
@@ -1,87 +1,91 @@
 # Dolibarr language file - Source file is en_US - propal
 Proposals=Orzamentos
-Proposal=Commercial proposal
+Proposal=Orzamento
 ProposalShort=Orzamento
 ProposalsDraft=Orzamentos borrador
-ProposalsOpened=Open commercial proposals
-CommercialProposal=Commercial proposal
-PdfCommercialProposalTitle=Commercial proposal
-ProposalCard=Proposal card
-NewProp=New commercial proposal
-NewPropal=New proposal
+ProposalsOpened=Orzamentos abertos
+CommercialProposal=Orzamento
+PdfCommercialProposalTitle=Orzamento
+ProposalCard=Ficha orzamento
+NewProp=Novo orzamento
+NewPropal=Novo orzamento
 Prospect=Cliente potencial
-DeleteProp=Delete commercial proposal
-ValidateProp=Validate commercial proposal
-AddProp=Create proposal
-ConfirmDeleteProp=Are you sure you want to delete this commercial proposal?
-ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b>?
-LastPropals=Latest %s proposals
+DeleteProp=Eliminar orzamento
+ValidateProp=Validar orzamento
+AddProp=Crear orzamento
+ConfirmDeleteProp=¿Está certo de querer eliminar este orzamento?
+ConfirmValidateProp=¿Está certo de querer validar este orzamento coa referencia <b>%s</b> ?
+LastPropals=Últimos %s orzamentos
 LastModifiedProposals=Últimos %s orzamentos modificados
-AllPropals=All proposals
-SearchAProposal=Search a proposal
-NoProposal=No proposal
-ProposalsStatistics=Commercial proposal's statistics
+AllPropals=Todos os orzamentos
+SearchAProposal=Atopar un orzamento
+NoProposal=Sen orzamentos
+ProposalsStatistics=Estatísticas de orzamentos
 NumberOfProposalsByMonth=Número por mes
-AmountOfProposalsByMonthHT=Amount by month (excl. tax)
-NbOfProposals=Number of commercial proposals
-ShowPropal=Show proposal
+AmountOfProposalsByMonthHT=Importe por mes (sen IVE)
+NbOfProposals=Número de orzamentos
+ShowPropal=Ver orzamento
 PropalsDraft=Borradores
 PropalsOpened=Aberta
 PropalStatusDraft=Borrador (é preciso validar)
-PropalStatusValidated=Validated (proposal is open)
-PropalStatusSigned=Signed (needs billing)
-PropalStatusNotSigned=Not signed (closed)
+PropalStatusValidated=Validado (Orzamento aberto)
+PropalStatusSigned=Asinado (a facturar)
+PropalStatusNotSigned=Non asinado (pechado)
 PropalStatusBilled=Facturado
 PropalStatusDraftShort=Borrador
-PropalStatusValidatedShort=Validated (open)
-PropalStatusClosedShort=Pechada
-PropalStatusSignedShort=Signed
-PropalStatusNotSignedShort=Not signed
+PropalStatusValidatedShort=Validado (aberto)
+PropalStatusClosedShort=Pechado
+PropalStatusSignedShort=Asinado
+PropalStatusNotSignedShort=Non asinado
 PropalStatusBilledShort=Facturado
-PropalsToClose=Commercial proposals to close
-PropalsToBill=Signed commercial proposals to bill
-ListOfProposals=List of commercial proposals
-ActionsOnPropal=Events on proposal
-RefProposal=Commercial proposal ref
-SendPropalByMail=Send commercial proposal by mail
-DatePropal=Date of proposal
-DateEndPropal=Validity ending date
-ValidityDuration=Validity duration
-CloseAs=Set status to
-SetAcceptedRefused=Set accepted/refused
-ErrorPropalNotFound=Propal %s not found
-AddToDraftProposals=Add to draft proposal
-NoDraftProposals=No draft proposals
-CopyPropalFrom=Create commercial proposal by copying existing proposal
-CreateEmptyPropal=Create empty commercial proposal or from list of products/services
-DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
-ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
-ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
-ProposalsAndProposalsLines=Commercial proposal and lines
-ProposalLine=Proposal line
-AvailabilityPeriod=Availability delay
-SetAvailability=Set availability delay
-AfterOrder=after order
-OtherProposals=Other proposals
+PropalsToClose=Orzamentos a pechar
+PropalsToBill=Orzamentos asinados a facturar
+ListOfProposals=Listaxe de orzamentos
+ActionsOnPropal=Eventos no orzamento
+RefProposal=Ref. orzamento
+SendPropalByMail=Enviar orzamento por mail
+DatePropal=Data orzamento
+DateEndPropal=Data fin de validez
+ValidityDuration=Duración de validez
+SetAcceptedRefused=Establecer aceptado/rexeitado
+ErrorPropalNotFound=Orzamento %s non atopado
+AddToDraftProposals=Engadir borrador do orzamento
+NoDraftProposals=Sen orzamentos borrador
+CopyPropalFrom=Crear orzamento por copia dun existente
+CreateEmptyPropal=Crear proposta comercial baleira ou dende a listaxe de produtos/servizos.
+DefaultProposalDurationValidity=Prazo de validez por defecto (en días)
+UseCustomerContactAsPropalRecipientIfExist=Utilizar enderezo do contacto de seguemento do cliente definido, na vez do enderezo do terceiro como destinatario dos orzamentos
+ConfirmClonePropal=¿Está certo de querer clonar o orzamento <b>%s</b>?
+ConfirmReOpenProp=¿Está certo de abrir de novo o orzamento <b>%s</b>?
+ProposalsAndProposalsLines=Orzamentos e liñas de orzamentos
+ProposalLine=Liña de orzamento
+AvailabilityPeriod=Tempo de entrega
+SetAvailability=Definir o tempo de entrega
+AfterOrder=dende a sinatura
+OtherProposals=Outros orzamentos
 ##### Availability #####
-AvailabilityTypeAV_NOW=Immediate
-AvailabilityTypeAV_1W=1 week
-AvailabilityTypeAV_2W=2 weeks
-AvailabilityTypeAV_3W=3 weeks
-AvailabilityTypeAV_1M=1 month
+AvailabilityTypeAV_NOW=Inmediata
+AvailabilityTypeAV_1W=1 semana
+AvailabilityTypeAV_2W=2 semanas
+AvailabilityTypeAV_3W=3 semanas
+AvailabilityTypeAV_1M=1 mes
 ##### Types de contacts #####
-TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
-TypeContact_propal_external_BILLING=Contacto cliente facturación pedido
-TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
-TypeContact_propal_external_SHIPPING=Customer contact for delivery
+TypeContact_propal_internal_SALESREPFOLL=Comercial seguemento orzamento
+TypeContact_propal_external_BILLING=Contacto cliente de facturación orzamento
+TypeContact_propal_external_CUSTOMER=Contacto cliente seguemento orzamento
+TypeContact_propal_external_SHIPPING=Contacto cliente para envíos
 # Document models
-DocModelAzurDescription=A complete proposal model (old implementation of Cyan template)
-DocModelCyanDescription=A complete proposal model
-DefaultModelPropalCreate=Default model creation
-DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
-ProposalCustomerSignature=Written acceptance, company stamp, date and signature
-ProposalsStatisticsSuppliers=Vendor proposals statistics
-CaseFollowedBy=Case followed by
-SignedOnly=Signed only
+DocModelAzurDescription=Modelo de orzamento completo (vella implementación de modelo Cyan)
+DocModelCyanDescription=Modelo de orzamento completo
+DefaultModelPropalCreate=Modelo por defecto
+DefaultModelPropalToBill=Modelo por defecto ao pechar un orzamento (a facturar)
+DefaultModelPropalClosed=Modelo por defecto ao pechar un orzamento (non facturado)
+ProposalCustomerSignature=Aceptado: sinatura dixital (selo da empresa, data e sinatura)
+ProposalsStatisticsSuppliers=Estatísticas orzamentos de provedores
+CaseFollowedBy=Caso seguido por
+SignedOnly=Só asinado
+IdProposal=ID orzamento
+IdProduct=ID Produto
+PrParentLine=Liña principal do orzamento
+LineBuyPriceHT=Importe do prezo de compra neto sen impostos para a liña
+
diff --git a/htdocs/langs/gl_ES/receptions.lang b/htdocs/langs/gl_ES/receptions.lang
index aa749200b20..6c33af15572 100644
--- a/htdocs/langs/gl_ES/receptions.lang
+++ b/htdocs/langs/gl_ES/receptions.lang
@@ -1,47 +1,47 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
-RefReception=Ref. reception
-Reception=Reception
-Receptions=Receptions
-AllReceptions=All Receptions
-Reception=Reception
-Receptions=Receptions
-ShowReception=Show Receptions
-ReceptionsArea=Receptions area
-ListOfReceptions=List of receptions
-ReceptionMethod=Reception method
-LastReceptions=Latest %s receptions
-StatisticsOfReceptions=Statistics for receptions
-NbOfReceptions=Number of receptions
-NumberOfReceptionsByMonth=Number of receptions by month
-ReceptionCard=Reception card
-NewReception=New reception
-CreateReception=Create reception
-QtyInOtherReceptions=Qty in other receptions
-OtherReceptionsForSameOrder=Other receptions for this order
-ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
-ReceptionsToValidate=Receptions to validate
+ReceptionsSetup=Configuración da recepción del producto
+RefReception=Ref. recepción
+Reception=Recepción
+Receptions=Recepcións
+AllReceptions=Todas as recepcións
+Reception=Recepción
+Receptions=Recepcións
+ShowReception=Amosar recepcións
+ReceptionsArea=Área recepcións
+ListOfReceptions=Listaxe de recepcións
+ReceptionMethod=Método de recepción
+LastReceptions=Últimas %s recepciones
+StatisticsOfReceptions=Estadísticas de recepciones
+NbOfReceptions=Número de recepciones
+NumberOfReceptionsByMonth=Número de recepciones por mes
+ReceptionCard=Ficha recepción
+NewReception=Nova recepción
+CreateReception=Crear recepción
+QtyInOtherReceptions=Cant. en outras recepcións
+OtherReceptionsForSameOrder=Outras recepciones deste pedimento
+ReceptionsAndReceivingForSameOrder=Recepcións e recibos deste pedimento.
+ReceptionsToValidate=Recepcións a validar
 StatusReceptionCanceled=Anulado
 StatusReceptionDraft=Borrador
-StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionValidated=Validado (produtos a enviar ou enviados)
 StatusReceptionProcessed=Procesado
 StatusReceptionDraftShort=Borrador
 StatusReceptionValidatedShort=Validado
 StatusReceptionProcessedShort=Procesado
-ReceptionSheet=Reception sheet
-ConfirmDeleteReception=Are you sure you want to delete this reception?
-ConfirmValidateReception=Are you sure you want to validate this reception with reference <b>%s</b>?
-ConfirmCancelReception=Are you sure you want to cancel this reception?
-StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated. Date used is date of validation of reception (planed delivery date is not always known).
-SendReceptionByEMail=Send reception by email
-SendReceptionRef=Submission of reception %s
-ActionsOnReception=Events on reception
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the order card.
-ReceptionLine=Reception line
-ProductQtyInReceptionAlreadySent=Product quantity from open sales order already sent
-ProductQtyInSuppliersReceptionAlreadyRecevied=Product quantity from open supplier order already received
-ValidateOrderFirstBeforeReception=You must first validate the order before being able to make receptions.
-ReceptionsNumberingModules=Numbering module for receptions
-ReceptionsReceiptModel=Document templates for receptions
-NoMorePredefinedProductToDispatch=No more predefined products to dispatch
+ReceptionSheet=Folla de recepción
+ConfirmDeleteReception=¿Está certo de querer eliminar esta recepción?
+ConfirmValidateReception=¿Está certo de querer validar esta recepción coa referencia <b>%s</b>?
+ConfirmCancelReception=¿Está certo de querer cancelar esta recepción?
+StatsOnReceptionsOnlyValidated=Estatísticas realizadas únicamente sobre as recepcións validadas. A data usada é a data de validación da recepción (a data prevista de envío aínda non é coñecida)
+SendReceptionByEMail=Enviar recepción por correo electrónico
+SendReceptionRef=Envío da recepción %s
+ActionsOnReception=Eventos sobre a recepción
+ReceptionCreationIsDoneFromOrder=Polo momento, a creación dunha nova recepción faise a partir da tarxeta de pedimento.
+ReceptionLine=Liña de recepción
+ProductQtyInReceptionAlreadySent=Cantidade de produto do pedimento de cliente aberto xa enviado
+ProductQtyInSuppliersReceptionAlreadyRecevied=Cantidade de produto en pedimentos a proveedores xa recibidos
+ValidateOrderFirstBeforeReception=Primeiro debe validar o pedimento antes de poder facer recepcións.
+ReceptionsNumberingModules=Módulo de numeración para recepcións
+ReceptionsReceiptModel=Modeloss de documentos para recepcións.
+NoMorePredefinedProductToDispatch=Non hai máis produtos predefinidos para enviar
 
diff --git a/htdocs/langs/gl_ES/recruitment.lang b/htdocs/langs/gl_ES/recruitment.lang
index f97c12e25bb..f247bc5bd29 100644
--- a/htdocs/langs/gl_ES/recruitment.lang
+++ b/htdocs/langs/gl_ES/recruitment.lang
@@ -18,58 +18,59 @@
 #
 
 # Module label 'ModuleRecruitmentName'
-ModuleRecruitmentName = Recruitment
+ModuleRecruitmentName = Contratación
 # Module description 'ModuleRecruitmentDesc'
-ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+ModuleRecruitmentDesc = Xestionar e seguir campañas de contratación para novos postos de traballo
 
 #
 # Admin page
 #
-RecruitmentSetup = Recruitment setup
+RecruitmentSetup = Configuración da contratación
 Settings = Configuracións
-RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
-RecruitmentArea=Recruitement area
-PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
-EnablePublicRecruitmentPages=Enable public pages of open jobs
+RecruitmentSetupPage = Introduza aquí a configuración das principais opcións para o módulo de contratación
+RecruitmentArea=Área de contratación
+PublicInterfaceRecruitmentDesc=As páxinas públicas dos traballos son URL públicas para mostrar e responder aos traballos dispoñibles. Hai un enlace diferente para cada traballo dispoñible, que se atopa en cada rexistro de traballo.
+EnablePublicRecruitmentPages=Activar páxinas públicas de traballos dispoñibles
 
 #
 # About page
 #
-About = Acerca de
-RecruitmentAbout = About Recruitment
-RecruitmentAboutPage = Recruitment about page
-NbOfEmployeesExpected=Expected nb of employees
-JobLabel=Label of job position
-WorkPlace=Work place
-DateExpected=Expected date
-FutureManager=Future manager
-ResponsibleOfRecruitement=Responsible of recruitment
-IfJobIsLocatedAtAPartner=If job is located at a partner place
+About = page
+RecruitmentAbout = Acerca de contratación
+RecruitmentAboutPage = Páxina acerca de contratación
+NbOfEmployeesExpected=Número esperado de empregados
+JobLabel=Etiqueta de posto de traballo
+WorkPlace=Lugar de traballo
+DateExpected=Data agardado
+FutureManager=Xestor de futuro
+ResponsibleOfRecruitement=Responsable da contratación
+IfJobIsLocatedAtAPartner=Se o traballo está situado nun lugar asociado
 PositionToBeFilled=Posto de traballo
-PositionsToBeFilled=Job positions
+PositionsToBeFilled=Listaxe de postos de traballo
 ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job positions
+NewPositionToBeFilled=Novos postos de traballo
 
-JobOfferToBeFilled=Job position to be filled
-ThisIsInformationOnJobPosition=Information of the job position to be filled
-ContactForRecruitment=Contact for recruitment
-EmailRecruiter=Email recruiter
-ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New application
-ListOfCandidatures=List of applications
-RequestedRemuneration=Requested remuneration
-ProposedRemuneration=Proposed remuneration
-ContractProposed=Contract proposed
-ContractSigned=Contract signed
-ContractRefused=Contract refused
-RecruitmentCandidature=Application
-JobPositions=Job positions
-RecruitmentCandidatures=Applications
-InterviewToDo=Interview to do
-AnswerCandidature=Application answer
-YourCandidature=Your application
-YourCandidatureAnswerMessage=Thanks you for your application.<br>...
-JobClosedTextCandidateFound=The job position is closed. The position has been filled.
-JobClosedTextCanceled=The job position is closed.
-ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+JobOfferToBeFilled=Posto de traballo a ocupar
+ThisIsInformationOnJobPosition=Información do posto de traballo a ocupar
+ContactForRecruitment=Contacto para a contratación
+EmailRecruiter=Correo electrónico do responsable de contratación
+ToUseAGenericEmail=Para usar un correo electrónico xenérico. Se non se define, utilizarase o correo electrónico do responsable de contratación
+NewCandidature=Nova aplicación
+ListOfCandidatures=Listaxe de aplicacións
+RequestedRemuneration=Remuneración solicitada
+ProposedRemuneration=Proposta de remuneración
+ContractProposed=Poroposta de contrato
+ContractSigned=Contrato asinado
+ContractRefused=Rexeitouse o contrato
+RecruitmentCandidature=Solicitude
+JobPositions=Postos de traballo
+RecruitmentCandidatures=Solicitudes
+InterviewToDo=Entrevista a realizar
+AnswerCandidature=Resposta da solicitude
+YourCandidature=A súa solicitude
+YourCandidatureAnswerMessage=Grazas pola túa solicitude.<br>...
+JobClosedTextCandidateFound=O posto de traballo está pechado. O posto foi cuberto.
+JobClosedTextCanceled=O posto de traballo está pechado
+ExtrafieldsJobPosition=Atributos complementarios (postos de traballo)
+ExtrafieldsCandidatures=Atributos complementarios (solicitudes de traballo)
+MakeOffer=Facer unha oferta
diff --git a/htdocs/langs/gl_ES/sendings.lang b/htdocs/langs/gl_ES/sendings.lang
index 7a2a0c2ce0b..c9c40f0b18a 100644
--- a/htdocs/langs/gl_ES/sendings.lang
+++ b/htdocs/langs/gl_ES/sendings.lang
@@ -30,8 +30,9 @@ OtherSendingsForSameOrder=Other shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Shipments to validate
 StatusSendingCanceled=Anulado
+StatusSendingCanceledShort=Anulada
 StatusSendingDraft=Borrador
-StatusSendingValidated=Validated (products to ship or already shipped)
+StatusSendingValidated=Validado (produtos a enviar ou enviados)
 StatusSendingProcessed=Procesado
 StatusSendingDraftShort=Borrador
 StatusSendingValidatedShort=Validado
@@ -56,7 +57,7 @@ ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is do
 ShipmentLine=Shipment line
 ProductQtyInCustomersOrdersRunning=Product quantity from open sales orders
 ProductQtyInSuppliersOrdersRunning=Product quantity from open purchase orders
-ProductQtyInShipmentAlreadySent=Product quantity from open sales order already sent
+ProductQtyInShipmentAlreadySent=Cantidade de produto do pedimento de cliente aberto xa enviado
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase orders already received
 NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
 WeightVolShort=Weight/Vol.
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/gl_ES/sms.lang b/htdocs/langs/gl_ES/sms.lang
index 75f91e553c4..6d1b63764fb 100644
--- a/htdocs/langs/gl_ES/sms.lang
+++ b/htdocs/langs/gl_ES/sms.lang
@@ -36,16 +36,16 @@ SmsStatusSentCompletely=Envío completado
 SmsStatusError=Erro
 SmsStatusNotSent=Non enviado
 SmsSuccessfulySent=SMS enviado correctamente (de 1%s a 1%s )
-ErrorSmsRecipientIsEmpty=Number of target is empty
-WarningNoSmsAdded=No new phone number to add to target list
-ConfirmValidSms=Do you confirm validation of this campaign?
-NbOfUniqueSms=No. of unique phone numbers
-NbOfSms=No. of phone numbers
-ThisIsATestMessage=This is a test message
-SendSms=Send SMS
-SmsInfoCharRemain=No. of remaining characters
-SmsInfoNumero= (international format i.e.: +33899701761)
-DelayBeforeSending=Delay before sending (minutes)
-SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
-SmsNoPossibleRecipientFound=No target available. Check setup of your SMS provider.
-DisableStopIfSupported=Disable STOP message (if supported)
+ErrorSmsRecipientIsEmpty=O número de destino está baleiro
+WarningNoSmsAdded=Non hai ningún número de teléfono novo para engadir á lista de destinos
+ConfirmValidSms=Confirmas a validación desta campaña?
+NbOfUniqueSms=Nº números de teléfonos únicos
+NbOfSms=Nº de números de teléfono
+ThisIsATestMessage=Esta é unha mensaxe de proba
+SendSms=Enviar SMS
+SmsInfoCharRemain=Nº de caracteres restantes
+SmsInfoNumero= (formato internacional ex.: +33899701761)
+DelayBeforeSending=Atraso antes de envío (minutos)
+SmsNoPossibleSenderFound=Sen remitente dispoñible. Comprobe a configuración do seu fornecedor de SMS.
+SmsNoPossibleRecipientFound=Sen destino dispoñible. Comprobe a configuración do seu fornecedor de SMS.
+DisableStopIfSupported=Desctivar a mensaxe STOP (sé é soportado)
diff --git a/htdocs/langs/gl_ES/stocks.lang b/htdocs/langs/gl_ES/stocks.lang
index dbe81a57b5b..be354f27b3e 100644
--- a/htdocs/langs/gl_ES/stocks.lang
+++ b/htdocs/langs/gl_ES/stocks.lang
@@ -1,242 +1,243 @@
 # Dolibarr language file - Source file is en_US - stocks
-WarehouseCard=Warehouse card
+WarehouseCard=Ficha almacén
 Warehouse=Almacén
-Warehouses=Warehouses
-ParentWarehouse=Parent warehouse
-NewWarehouse=New warehouse / Stock Location
-WarehouseEdit=Modify warehouse
-MenuNewWarehouse=New warehouse
-WarehouseSource=Source warehouse
-WarehouseSourceNotDefined=No warehouse defined,
-AddWarehouse=Create warehouse
-AddOne=Add one
-DefaultWarehouse=Default warehouse
-WarehouseTarget=Target warehouse
-ValidateSending=Delete sending
-CancelSending=Cancel sending
-DeleteSending=Delete sending
+Warehouses=Almacéns
+ParentWarehouse=Almacén pai
+NewWarehouse=Novo almacén / Zona de almacenaxe
+WarehouseEdit=Modificar almacén
+MenuNewWarehouse=Novo almacén
+WarehouseSource=Almacén orixe
+WarehouseSourceNotDefined=Sen almacéns definidos,
+AddWarehouse=Crear almacén
+AddOne=Engadir un
+DefaultWarehouse=Almacén por defecto
+WarehouseTarget=Almacén destino
+ValidateSending=Validar envío
+CancelSending=Anular envío
+DeleteSending=Eliminar envío
 Stock=Stock
 Stocks=Stocks
-MissingStocks=Missing stocks
-StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
-StocksByLotSerial=Stocks by lot/serial
-LotSerial=Lots/Serials
-LotSerialList=List of lot/serials
+MissingStocks=Falta sock
+StockAtDate=Stocks á data
+StockAtDateInPast=Data no pasado
+StockAtDateInFuture=Data no futuro
+StocksByLotSerial=Stocks por lotes/serie
+LotSerial=Lotes/Series
+LotSerialList=Listaxe de lotes/series
 Movements=Movementos
-ErrorWarehouseRefRequired=Warehouse reference name is required
-ListOfWarehouses=List of warehouses
+ErrorWarehouseRefRequired=O nome de referencia do almacén é obrigado
+ListOfWarehouses=Listaxe de almacéns
 ListOfStockMovements=Listaxe de movementos de stock
-ListOfInventories=List of inventories
-MovementId=Movement ID
-StockMovementForId=Movement ID %d
-ListMouvementStockProject=List of stock movements associated to project
-StocksArea=Warehouses area
-AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
-IncludeAlsoDraftOrders=Include also draft orders
+ListOfInventories=Listaxe de inventarios
+MovementId=ID movemento
+StockMovementForId=ID movemento %d
+ListMouvementStockProject=Listaxe de movementos de stock asociados ao proxecto
+StocksArea=Área almacéns
+AllWarehouses=Todos os almacéns
+IncludeEmptyDesiredStock=Inclúe tamén stock negativo con stock desexado indefinido
+IncludeAlsoDraftOrders=Incluir tamén pedimentos borrador
 Location=Localización
-LocationSummary=Short name location
-NumberOfDifferentProducts=Number of different products
-NumberOfProducts=Total number of products
-LastMovement=Latest movement
-LastMovements=Latest movements
+LocationSummary=Nome curto da localización
+NumberOfDifferentProducts=Número de produtos diferentes
+NumberOfProducts=Numero total de produtos
+LastMovement=Último movemento
+LastMovements=Últimos movementos
 Units=Unidades
 Unit=Unidade
-StockCorrection=Stock correction
-CorrectStock=Correct stock
-StockTransfer=Stock transfer
-TransferStock=Transfer stock
-MassStockTransferShort=Mass stock transfer
-StockMovement=Stock movement
-StockMovements=Stock movements
-NumberOfUnit=Number of units
-UnitPurchaseValue=Unit purchase price
-StockTooLow=Stock too low
-StockLowerThanLimit=Stock lower than alert limit (%s)
+StockCorrection=Corrección stock
+CorrectStock=Corrixir stock
+StockTransfer=Transferencia de stock
+TransferStock=Transferir stock
+MassStockTransferShort=Transferencia de stock masiva
+StockMovement=Movemento de stock
+StockMovements=Movementos de stock
+NumberOfUnit=Número de unidades
+UnitPurchaseValue=Prezo de compra unitario
+StockTooLow=Stock insuficinte
+StockLowerThanLimit=O stock é menor que o límite da alerta (%s)
 EnhancedValue=Valor
-PMPValue=Weighted average price
-PMPValueShort=WAP
-EnhancedValueOfWarehouses=Warehouses value
-UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
-RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
-UserDefaultWarehouse=Set a warehouse on Users
-MainDefaultWarehouse=Default warehouse
-MainDefaultWarehouseUser=Use a default warehouse for each user
-MainDefaultWarehouseUserDesc=By activating this option, during creation of a product, the warehouse assigned to the product will be defined on this one. If no warehouse is defined on the user, the default warehouse is defined.
-IndependantSubProductStock=Product stock and subproduct stock are independent
-QtyDispatched=Quantity dispatched
-QtyDispatchedShort=Qty dispatched
-QtyToDispatchShort=Qty to dispatch
-OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
-DeStockOnValidateOrder=Decrease real stocks on validation of sales order
-DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
-ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
-ReStockOnValidateOrder=Increase real stocks on purchase order approval
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
-StockOnReception=Increase real stocks on validation of reception
-StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
-OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
-StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
-NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
-DispatchVerb=Dispatch
-StockLimitShort=Limit for alert
-StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Physical Stock
-RealStock=Real Stock
-RealStockDesc=Physical/real stock is the stock currently in the warehouses.
-RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
-VirtualStock=Virtual stock
-VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
-IdWarehouse=Id warehouse
-DescWareHouse=Description warehouse
-LieuWareHouse=Localisation warehouse
-WarehousesAndProducts=Warehouses and products
-WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average price
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
-SellPriceMin=Selling Unit Price
-EstimatedStockValueSellShort=Value for sell
-EstimatedStockValueSell=Value for sell
-EstimatedStockValueShort=Input stock value
-EstimatedStockValue=Input stock value
-DeleteAWarehouse=Delete a warehouse
-ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b>?
-PersonalStock=Personal stock %s
-ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
-SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
-SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
-NoStockAction=No stock action
-DesiredStock=Desired Stock
-DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
-StockToBuy=To order
-Replenishment=Replenishment
-ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
-UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
-ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
-UseVirtualStock=Use virtual stock
-UsePhysicalStock=Use physical stock
-CurentSelectionMode=Current selection mode
-CurentlyUsingVirtualStock=Virtual stock
-CurentlyUsingPhysicalStock=Physical stock
-RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
-AlertOnly= Alerts only
-IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
-WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
-WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
-ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
-ReplenishmentStatusDescPerWarehouse=If you want a replenishment based on desired quantity defined per warehouse, you must add a filter on the warehouse.
-ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
-Replenishments=Replenishments
-NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
-NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
-MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
-RecordMovement=Record transfer
-ReceivingForSameOrder=Receipts for this order
-StockMovementRecorded=Stock movements recorded
-RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
-MovementLabel=Label of movement
-TypeMovement=Type of movement
-DateMovement=Date of movement
-InventoryCode=Movement or inventory code
-IsInPackage=Contained into package
-WarehouseAllowNegativeTransfer=Stock can be negative
-qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
-qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
+PMPValue=Prezo medio ponderado
+PMPValueShort=PMP
+EnhancedValueOfWarehouses=Valor de stocks en almacén
+UserWarehouseAutoCreate=Crea automáticamente un almacén de usuarios ao crear un usuario
+AllowAddLimitStockByWarehouse=Xestionar tamén o valor do stock mínimo e desexado por emparellamento (produto-almacén) ademais do valor do stock mínimo e stock desexado por produto
+RuleForWarehouse=Regras para almacén
+WarehouseAskWarehouseDuringOrder=Establecer un almacén para pedimentos de provedor
+UserDefaultWarehouse=Establecer un almacén para usuarios
+MainDefaultWarehouse=Almacén por defecto
+MainDefaultWarehouseUser=Usar un almacén por defecto para cada usuario
+MainDefaultWarehouseUserDesc=Ao activar esta opción, durante a creación dun produto, o almacén asignado ao produto definirase nesta. Se non se define ningún almacén no usuario, defínese automaticamente o almacén predeterminado.
+IndependantSubProductStock=Stock do producto e stock do subproducto son independentes
+QtyDispatched=Cantidade enviada
+QtyDispatchedShort=Cant. enviada
+QtyToDispatchShort=Cant. a enviar
+OrderDispatch=Artigos recibidos
+RuleForStockManagementDecrease=Escolla Regra para diminución automática de stock (sempre é posible a diminución manual, aínda que estexa activada unha regra de diminución automática)
+RuleForStockManagementIncrease=Escolla Regra para o aumento automático de stock (o aumento manual sempre é posible, aínda que estexa activada unha regra de aumento automático)
+DeStockOnBill=Diminuir o stock real na validación da factura/nota de crédito do cliente
+DeStockOnValidateOrder=Diminuír o stock real na validación do pedimento de provedor
+DeStockOnShipment=Diminuír o stock real na validación do envío
+DeStockOnShipmentOnClosing=Diminúe o stock real cando o envío está pechado
+ReStockOnBill=Aumenta o stock real na validación da factura/nota de crédito do provedor
+ReStockOnValidateOrder=Aumenta o stock real na aprobación do pedimento de provedor
+ReStockOnDispatchOrder=Aumentar o stock real no envío manual ao almacén, despois da recepción da mercadoría do pedimento de provedor
+StockOnReception=Aumento o stock real na validación da recepción
+StockOnReceptionOnClosing=Aumenta o stock real cando pecha a recepción
+OrderStatusNotReadyToDispatch=O pedimento de cliente aínda non ten ou non ten un estado que permite o envío de produtos en almacéns.
+StockDiffPhysicTeoric=Explicación da diferenza entre stock físico e virtual
+NoPredefinedProductToDispatch=Non hai produtos predefinidos para este obxecto. Polo tanto, non é preciso o stock en envío.
+DispatchVerb=Enviado
+StockLimitShort=Límite para alerta
+StockLimit=Stock límite para alertas
+StockLimitDesc=(baleiro) significa que non hai aviso.<br> 0 pode usarse como aviso en canto o stock estexa baleiro.
+PhysicalStock=Stock físico
+RealStock=Stock real
+RealStockDesc=O stock físico/real é o stock actualmente existente nos almacéns
+RealStockWillAutomaticallyWhen=O stock real modificarase segundo esta regra (como se define no módulo Stock):
+VirtualStock=Stock virtual
+VirtualStockAtDate=Stock virtual á data
+VirtualStockAtDateDesc=Stock virtual unha vez finalizados todos os pedidos pendentes que se prevé facer antes da data
+VirtualStockDesc=O stock virtual é o stock calculado dispoñible unha vez pechadas todas as accións abertas/pendentes (que afectan ao stock) (pedimentos a provedor recibidos, pedimentos de cliente enviados, pedimentos de fabricación producidos, etc.)
+IdWarehouse=Id. almacén
+DescWareHouse=Descrición almacén
+LieuWareHouse=Localización almacén
+WarehousesAndProducts=Almacéns e produtos
+WarehousesAndProductsBatchDetail=Almacéns e produtos (con detalle por lote/serie)
+AverageUnitPricePMPShort=Prezo medio ponderado (PMP)
+AverageUnitPricePMPDesc=O prezo unitario medio de entrada que houbo que pagar aos provedores para que o produto estivese no noso stock.
+SellPriceMin=Prezo de venda unitario
+EstimatedStockValueSellShort=Valor de venda
+EstimatedStockValueSell=Valor de venda
+EstimatedStockValueShort=Valor compra de stock
+EstimatedStockValue=Valor de compra de stock
+DeleteAWarehouse=Eliminar un almacén
+ConfirmDeleteWarehouse=¿Está certo de querer eliminar o almacén <b>%s</b>?
+PersonalStock=Stock persoal %s
+ThisWarehouseIsPersonalStock=Este almacén representa o stock persoal de %s %s
+SelectWarehouseForStockDecrease=Seleccione o almacén a usar no decremento de stock
+SelectWarehouseForStockIncrease=Seleccione o almacén a usar no incremento de stock
+NoStockAction=Sen accións sobre o stock
+DesiredStock=Stock ótimo desexado
+DesiredStockDesc=Esta cantidade será o valor que se utilizará para encher o stock no reposición.
+StockToBuy=A pedir
+Replenishment=Reposición
+ReplenishmentOrders=Ordes de reposición
+VirtualDiffersFromPhysical=Segundo as opcións de aumento/disminución, o stock físico e virtual (pedimentos en curso+stock físico) pode diferir
+UseRealStockByDefault=Usar stock real por defecto, en lugar de stock virtual, para o reposición
+ReplenishmentCalculation=A cantidade a pedir será (cantidade desexada - stock real) en lugar de (cantidade desexada - stock virtual)
+UseVirtualStock=Usar stock virtual
+UsePhysicalStock=Usar stock físico
+CurentSelectionMode=Modo de selección actual
+CurentlyUsingVirtualStock=Stock virtual
+CurentlyUsingPhysicalStock=Stock físico
+RuleForStockReplenishment=Regra para o reposicion de stock
+SelectProductWithNotNullQty=Seleccione alo menos un produto cunha cantidade distinta de cero e un provedor
+AlertOnly= Só alertas
+IncludeProductWithUndefinedAlerts = Inclúe tamén stock negativo para produtos sen cantidade desexada definida, para restablecelos a 0
+WarehouseForStockDecrease=Para o decremento de stock usarase o almacén <b>%s</b>
+WarehouseForStockIncrease=Para o incremento de stock usarase o almacén <b>%s</b>
+ForThisWarehouse=Para este almacén
+ReplenishmentStatusDesc=Esta é unha listaxe de todos os produtos cun stock inferior ao stock desexado (ou inferior ao valor de alerta se a caixa de verificación "só alerta" está marcada). Usando a caixa de verificación, pode crear pedimentos de provedor para cubrir a diferenza.
+ReplenishmentStatusDescPerWarehouse=Se desexa unha reposición baseada na cantidade desexada definida por almacén, debe engadir un filtro no almacén.
+ReplenishmentOrdersDesc=Esta é unha listaxe de todos os pedimentos a provedor abertos, incluídos os produtos predefinidos. Aquí só son visibles os pedimentos abertos con produtos predefinidos, polo que os pedimentos  poden afectar ao stock..
+Replenishments=Reposicións
+NbOfProductBeforePeriod=Cantidade de produto %s en stock antes do período seleccionado (<%s)
+NbOfProductAfterPeriod=Cantidade de produto %s en stock despois do período seleccionado (>%s)
+MassMovement=Movementos en masa
+SelectProductInAndOutWareHouse=Seleccione un almacén de orixe e un almacén de destino, un produto e unha cantidade e prema en "%s". Unha vez feito isto para todos os movementos precisos, faga clic en "%s".
+RecordMovement=Rexistrar transferencia
+ReceivingForSameOrder=Recepcións deste pedimento
+StockMovementRecorded=Movemento de stock rexistrado
+RuleForStockAvailability=Reglas de requerimento de stock
+StockMustBeEnoughForInvoice=O nivel de stock debe ser suficiente para engadir produto/servizo á factura (a comprobación faise no stock real actual ao engadir unha liña na factura calquera que sexa a regra para o cambio automático de stock)
+StockMustBeEnoughForOrder=O nivel de stock debe ser suficiente para engadir produto/servizo ao pedimento (a comprobación faise no stock real actual ao engadir unha liña no pedimento calquera que sexa a regra para o cambio de stock automático)
+StockMustBeEnoughForShipment= O nivel de stock debe ser suficiente para engadir produto/servizo ao envío (a comprobación faise no stock real actual cando se engade unha liña ao envío calquera que sexa a regra para o cambio automático de stock)
+MovementLabel=Etiqueta do movemento
+TypeMovement=Tipo de movemento
+DateMovement=Data de movemento
+InventoryCode=Movemento ou código de inventario
+IsInPackage=Contido no paquete
+WarehouseAllowNegativeTransfer=O stock pode ser negativvo
+qtyToTranferIsNotEnough=Non ten stock suficiente no seu almacén de orixe e a súa configuración non permite stocks negativos
+qtyToTranferLotIsNotEnough=Non ten stock suficiente para este número de lote no seu almacén de orixe e a súa configuración non permite existencias negativas (a cantidade para o produto '%s' co lote '%s' é %s no almacén '%s').
 ShowWarehouse=Ver almacén
-MovementCorrectStock=Stock correction for product %s
-MovementTransferStock=Stock transfer of product %s into another warehouse
-InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
-ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
-OpenAll=Open for all actions
-OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
-OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
-ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
-ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
-ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
-AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
-AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
-InventoryDate=Inventory date
-NewInventory=New inventory
-inventorySetup = Inventory Setup
-inventoryCreatePermission=Create new inventory
-inventoryReadPermission=View inventories
-inventoryWritePermission=Update inventories
-inventoryValidatePermission=Validate inventory
+MovementCorrectStock=Correción de sotck do produto %s
+MovementTransferStock=Transferencia de stock do produto %s a outro almacén
+InventoryCodeShort=Código Inv./Mov.
+NoPendingReceptionOnSupplierOrder=Non agárdanse recepcións do pedimento a provedor
+ThisSerialAlreadyExistWithDifferentDate=Este número de lote/serie (<strong>%s</strong>) xa existe, pero cunha data de caducidade ou venda distinta (atopada <strong>%s</strong> pero vostede introduce <strong>%s</strong>).
+OpenAll=Aberto para todas as accións
+OpenInternal=Aberto só a accións internas
+UseDispatchStatus=Use un estado de envío (aprobar/rexeitar) para as liñas de produtos na recepción do pedimento de provedor
+OptionMULTIPRICESIsOn=A opción "varios prezos por segmento" está activada. Significa que un produto ten varios prezos de venda polo que o valor para a venda non se pode calcular
+ProductStockWarehouseCreated=Límite stock para alertas e stock óptimo desxeado creado correctamente
+ProductStockWarehouseUpdated=Límite stock para alertas e stock óptimo desexado actualizado correctamente
+ProductStockWarehouseDeleted=Límite stock para alertas e stock óptimo desexado eliminado correctamente
+AddNewProductStockWarehouse=Indicar novo límite para alertas e stock óptimo desexado
+AddStockLocationLine=Disminúa a cantidade, e a continuación, faga clic para agregar outro almacén para este produto
+InventoryDate=Data inventario
+NewInventory=Novo inventario
+inventorySetup = Configuración inventario
+inventoryCreatePermission=Crear novo inventario
+inventoryReadPermission=Ver inventarios
+inventoryWritePermission=Actualizar inventarios
+inventoryValidatePermission=Validar inventario
 inventoryTitle=Inventario
-inventoryListTitle=Inventories
-inventoryListEmpty=No inventory in progress
-inventoryCreateDelete=Create/Delete inventory
-inventoryCreate=Create new
-inventoryEdit=Editar
+inventoryListTitle=Inventarios
+inventoryListEmpty=Sen inventario en progreso
+inventoryCreateDelete=Crear/Eliminar inventario
+inventoryCreate=Crear novo
+inventoryEdit=Modificar
 inventoryValidate=Validado
 inventoryDraft=En servizo
-inventorySelectWarehouse=Warehouse choice
+inventorySelectWarehouse=Selección de almacén
 inventoryConfirmCreate=Crear
-inventoryOfWarehouse=Inventory for warehouse: %s
-inventoryErrorQtyAdd=Error: one quantity is less than zero
-inventoryMvtStock=By inventory
-inventoryWarningProductAlreadyExists=This product is already into list
-SelectCategory=Category filter
-SelectFournisseur=Vendor filter
+inventoryOfWarehouse=Inventario para o almacén: %s
+inventoryErrorQtyAdd=Erro: A cantidade é menor que cero
+inventoryMvtStock=Por inventario
+inventoryWarningProductAlreadyExists=Este producto xa atópase no listado
+SelectCategory=Filtro por categoría
+SelectFournisseur=Filtro provedor
 inventoryOnDate=Inventario
-INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
-inventoryChangePMPPermission=Allow to change PMP value for a product
-ColumnNewPMP=New unit PMP
-OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
-LastPA=Last BP
-CurrentPA=Curent BP
-RecordedQty=Recorded Qty
-RealQty=Real Qty
-RealValue=Real Value
-RegulatedQty=Regulated Qty
-AddInventoryProduct=Add product to inventory
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Os movementos de stock terán a data do inventario (en lugar da data da validación do inventario)
+inventoryChangePMPPermission=Permitir cambiar o PMP dun produto
+ColumnNewPMP=Nova unidade PMP
+OnlyProdsInStock=Non engadir produto sen stock
+TheoricalQty=Cant. teórica
+TheoricalValue=Cant. teórica
+LastPA=Último BP
+CurrentPA=BP actual
+RecordedQty=Cant. gardada
+RealQty=Cant. real
+RealValue=Valor Real
+RegulatedQty=Cant. Regulada
+AddInventoryProduct=Engadir produto ao inventario
 AddProduct=Engadir
-ApplyPMP=Apply PMP
-FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action?
-InventoryFlushed=Inventory flushed
-ExitEditMode=Exit edition
+ApplyPMP=Aplicar PMP
+FlushInventory=Inventario
+ConfirmFlushInventory=¿Confirma esta acción?
+InventoryFlushed=Inventario finalizado
+ExitEditMode=Sair da edición
 inventoryDeleteLine=Eliminación de liña
-RegulateStock=Regulate Stock
+RegulateStock=Regular stock
 ListInventory=Listaxe
-StockSupportServices=Stock management supports Services
-StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
-ReceiveProducts=Receive items
-StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
-StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
-StockIncrease=Stock increase
-StockDecrease=Stock decrease
-InventoryForASpecificWarehouse=Inventory for a specific warehouse
-InventoryForASpecificProduct=Inventory for a specific product
-StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to use
-ForceTo=Force to
-AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
-StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
-CurrentStock=Current stock
-InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
-UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|serial barcode)
+StockSupportServices=A xestión de stock soporta Servizos
+StockSupportServicesDesc=Por defecto só pode almacenar o produto co tipo "produto". Se está activado e se o servizo de módulo está activado, tamén pode almacenar un produto co tipo "servizo"
+ReceiveProducts=Recibir artigos
+StockIncreaseAfterCorrectTransfer=Incremento por corrección/transferencia
+StockDecreaseAfterCorrectTransfer=Decremento por corrección/transferencia
+StockIncrease=Incremento de stock
+StockDecrease=Decremento de stock
+InventoryForASpecificWarehouse=Inventario para un almacén determinado
+InventoryForASpecificProduct=Inventario para un produto determinado
+StockIsRequiredToChooseWhichLotToUse=Stock é solicitado para escoller que lote usar
+ForceTo=Forzar a
+AlwaysShowFullArbo=Mostrar a árbore completa do almacén na ventá emerxente das ligazóns do almacén (aviso: isto pode diminuír drasticamente o rendemento)
+StockAtDatePastDesc=Aquí pode ver o stock (stock real) nunha data determinada no pasado
+StockAtDateFutureDesc=Aquí pode ver o stock (stock virtual) nunha data determinada no futuro
+CurrentStock=Stock actual
+InventoryRealQtyHelp=Estableza o valor en 0 para restablecer cantidade<br> Manteña o campo baleiro ou elimine a liña para mantelo sen cambios
+UpdateByScaning=Actualiza escaneando
+UpdateByScaningProductBarcode=Actualiza por escaneo (código de barras do produto)
+UpdateByScaningLot=Actualiza por escano (código de barras lote/serie)
+DisableStockChangeOfSubProduct=Desactive o cambio de stock de todos os subprodutos deste produto composto durante este movemento.
diff --git a/htdocs/langs/gl_ES/supplier_proposal.lang b/htdocs/langs/gl_ES/supplier_proposal.lang
index 1446d11794a..76ec6489a08 100644
--- a/htdocs/langs/gl_ES/supplier_proposal.lang
+++ b/htdocs/langs/gl_ES/supplier_proposal.lang
@@ -1,54 +1,55 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Vendor commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
-SupplierProposalNew=New price request
-CommRequest=Price request
-CommRequests=Prezo orzamentos
-SearchRequest=Find a request
-DraftRequests=Draft requests
-SupplierProposalsDraft=Draft vendor proposals
-LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
-SupplierProposalArea=Vendor proposals area
-SupplierProposalShort=Vendor proposal
-SupplierProposals=Orzamentos de provedor
-SupplierProposalsShort=Orzamentos de provedor
-NewAskPrice=New price request
-ShowSupplierProposal=Show price request
-AddSupplierProposal=Create a price request
-SupplierProposalRefFourn=Vendor ref
+SupplierProposal=Orzamentos de provedor
+supplier_proposalDESC=Xestiona orzamentos de provedor
+SupplierProposalNew=Novo orzamento
+CommRequest=Orzamento
+CommRequests=Orzamentos
+SearchRequest=Buscar un orzamento
+DraftRequests=Orzamentos borrador
+SupplierProposalsDraft=Orzamentos de provedor borrador
+LastModifiedRequests=Últimos %s orzamentos modificados
+RequestsOpened=Orzamentos abertos
+SupplierProposalArea=Área orzamentos de provedor
+SupplierProposalShort=Orzamento de provedor
+SupplierProposals=Orzamentos de provedores
+SupplierProposalsShort=Orzamentos de provedores
+AskPrice=Orzamento
+NewAskPrice=Novo orzamento
+ShowSupplierProposal=Amosar orzamento
+AddSupplierProposal=Crear un orzamento
+SupplierProposalRefFourn=Ref. provedor
 SupplierProposalDate=Data de entrega
 SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
 ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b>?
-DeleteAsk=Delete request
-ValidateAsk=Validate request
-SupplierProposalStatusDraft=Borrador (é preciso validar)
-SupplierProposalStatusValidated=Validated (request is open)
-SupplierProposalStatusClosed=Pechada
-SupplierProposalStatusSigned=Accepted
+DeleteAsk=Eliminar orzamento
+ValidateAsk=Validar orzamento
+SupplierProposalStatusDraft=Borrador (a validar)
+SupplierProposalStatusValidated=Validado (orzamento aberto)
+SupplierProposalStatusClosed=Pechado
+SupplierProposalStatusSigned=Aceptado
 SupplierProposalStatusNotSigned=Rexeitado
 SupplierProposalStatusDraftShort=Borrador
 SupplierProposalStatusValidatedShort=Validado
-SupplierProposalStatusClosedShort=Pechada
-SupplierProposalStatusSignedShort=Accepted
+SupplierProposalStatusClosedShort=Pechado
+SupplierProposalStatusSignedShort=Aceptado
 SupplierProposalStatusNotSignedShort=Rexeitado
-CopyAskFrom=Create a price request by copying an existing request
-CreateEmptyAsk=Create blank request
-ConfirmCloneAsk=Are you sure you want to clone the price request <b>%s</b>?
-ConfirmReOpenAsk=Are you sure you want to open back the price request <b>%s</b>?
-SendAskByMail=Send price request by mail
-SendAskRef=Sending the price request %s
-SupplierProposalCard=Request card
-ConfirmDeleteAsk=Are you sure you want to delete this price request <b>%s</b>?
-ActionsOnSupplierProposal=Events on price request
-DocModelAuroreDescription=A complete request model (logo...)
-CommercialAsk=Price request
-DefaultModelSupplierProposalCreate=Default model creation
-DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
-DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of vendor proposal requests
-ListSupplierProposalsAssociatedProject=List of vendor proposals associated with project
-SupplierProposalsToClose=Vendor proposals to close
-SupplierProposalsToProcess=Vendor proposals to process
-LastSupplierProposals=Latest %s price requests
-AllPriceRequests=All requests
+CopyAskFrom=Crear orzamento por copia dun existente
+CreateEmptyAsk=Crear un orzamento en branco
+ConfirmCloneAsk=¿Está certo de querer clonar o orzamento <b>%s</b>?
+ConfirmReOpenAsk=¿Está certo de querer abrir de novo o orzamento <b>%s</b>?
+SendAskByMail=Enviar orzamento por correo electrónico
+SendAskRef=Enviando o orzamento %s
+SupplierProposalCard=Ficha orzamento
+ConfirmDeleteAsk=¿Está certo de querer eliminar este orzamento <b>%s</b>?
+ActionsOnSupplierProposal=Eventos do orzamento
+DocModelAuroreDescription=Modelo de orzamento completo (logo...)
+CommercialAsk=Orzamento
+DefaultModelSupplierProposalCreate=Modelo por defecto
+DefaultModelSupplierProposalToBill=Modelo por defecto ao pechar un orzamento (aceptado)
+DefaultModelSupplierProposalClosed=Modelo por defecto ao pechar un orzamento (rexeitado)
+ListOfSupplierProposals=Listaxe de orzamentos de provedor
+ListSupplierProposalsAssociatedProject=Listaxe de orzamentos de provedor asociados ao proxecto
+SupplierProposalsToClose=Orzamentos de provedor a pechar
+SupplierProposalsToProcess=Orzamentos de provedor a procesar
+LastSupplierProposals=Últimos %s orzamentos
+AllPriceRequests=Todos os orzamentos
diff --git a/htdocs/langs/gl_ES/suppliers.lang b/htdocs/langs/gl_ES/suppliers.lang
index 99bc16f91d3..daa7379bf6f 100644
--- a/htdocs/langs/gl_ES/suppliers.lang
+++ b/htdocs/langs/gl_ES/suppliers.lang
@@ -6,43 +6,43 @@ NewSupplier=Novo provedor
 History=Histórico
 ListOfSuppliers=Listaxe de provedores
 ShowSupplier=Ver provedor
-OrderDate=Data de pedido
+OrderDate=Data de pedimento
 BuyingPriceMin=Mellor prezo de compra
 BuyingPriceMinShort=Mellor prezo de compra
-TotalBuyingPriceMinShort=Total dos prezos de compra dos subproductos
-TotalSellingPriceMinShort=Total dos prezos de venda dos subproductos
-SomeSubProductHaveNoPrices=Algúns subproductos non teñen prezo definido
+TotalBuyingPriceMinShort=Total dos prezos de compra dos subprodutos
+TotalSellingPriceMinShort=Total dos prezos de venda dos subprodutos
+SomeSubProductHaveNoPrices=Algúns subprodutos non teñen prezo definido
 AddSupplierPrice=Engadir prezo de compra
 ChangeSupplierPrice=Mudar prezo de compra
 SupplierPrices=Prezos provedor
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Esta referencia de provedor xa está asociada á referencia: %s
-NoRecordedSuppliers=Sen provedores registrados
+NoRecordedSuppliers=Sen provedores rexistrados
 SupplierPayment=Pagos a provedor
 SuppliersArea=Área provedores
 RefSupplierShort=Ref. provedor
 Availability=Dispoñibilidade
-ExportDataset_fournisseur_1=Facturas de provedor e detalle da factura
-ExportDataset_fournisseur_2=Facturas de provedor e pagos
-ExportDataset_fournisseur_3=Pedidos a provedor e detalles de pedido
-ApproveThisOrder=Aprobar este pedido
-ConfirmApproveThisOrder=Está certo de querer aprobar o pedido a provedor <b>%s</b>?
-DenyingThisOrder=Denegar este pedido
-ConfirmDenyingThisOrder=¿Está certo de querer denegar o pedido a provedor <b>%s</b>?
-ConfirmCancelThisOrder=¿Está certo de querer cancelar o pedido a provedor <b>%s</b>?
-AddSupplierOrder=Crear pedido a provedor
+ExportDataset_fournisseur_1=Facturas de provedor e liñas de factura
+ExportDataset_fournisseur_2=Facturas de provedor e pagamentos
+ExportDataset_fournisseur_3=Pedimentos a provedor e liñas de pedimento
+ApproveThisOrder=Aprobar este pedimento
+ConfirmApproveThisOrder=Está certo de querer aprobar o pedimento a provedor <b>%s</b>?
+DenyingThisOrder=Denegar este pedimento
+ConfirmDenyingThisOrder=¿Está certo de querer denegar o pedimento a provedor <b>%s</b>?
+ConfirmCancelThisOrder=¿Está certo de querer cancelar o pedimento a provedor <b>%s</b>?
+AddSupplierOrder=Crear pedimento a provedor
 AddSupplierInvoice=Crear factura de provedor
 ListOfSupplierProductForSupplier=Listaxe de produtos e prezos do provedor <b>%s</b>
 SentToSuppliers=Enviado a provedores
-ListOfSupplierOrders=Listaxe de pedidos de compra
-MenuOrdersSupplierToBill=Pedidos de provedor a facturar
-NbDaysToDelivery=Tempo de entrega (días)
-DescNbDaysToDelivery=O maior atraso nas entregas de produtos deste pedido
+ListOfSupplierOrders=Listaxe de pedimentos a provedor
+MenuOrdersSupplierToBill=Pedidos a provedor a facturar
+NbDaysToDelivery=Tempo de entrega en días
+DescNbDaysToDelivery=O maior atraso nas entregas de produtos deste pedimento
 SupplierReputation=Reputación provedor
-ReferenceReputation=Reference reputation
-DoNotOrderThisProductToThisSupplier=Non realizar pedidos
+ReferenceReputation=Reputación de referencia
+DoNotOrderThisProductToThisSupplier=Non realizar pedimentos
 NotTheGoodQualitySupplier=Mala calidade
 ReputationForThisProduct=Reputación
 BuyerName=Nome do comprador
-AllProductServicePrices=Todos os prezos de produto / servizo
-AllProductReferencesOfSupplier=All references of vendor
+AllProductServicePrices=Todos os prezos de produto/servizo
+AllProductReferencesOfSupplier=Todas as referencias de provedores de produto/servizo
 BuyingPriceNumShort=Prezos provedor
diff --git a/htdocs/langs/gl_ES/ticket.lang b/htdocs/langs/gl_ES/ticket.lang
index e99c740d69d..d9268409b20 100644
--- a/htdocs/langs/gl_ES/ticket.lang
+++ b/htdocs/langs/gl_ES/ticket.lang
@@ -19,289 +19,286 @@
 #
 
 Module56000Name=Tickets
-Module56000Desc=Ticket system for issue or request management
+Module56000Desc=Sistema detickets para a xestión de emisións ou solicitudes
 
-Permission56001=See tickets
-Permission56002=Modify tickets
-Permission56003=Delete tickets
-Permission56004=Manage tickets
-Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
+Permission56001=Ver tickets
+Permission56002=Modificar tickets
+Permission56003=Eliminar tickets
+Permission56004=Administrar tickets
+Permission56005=Ver tickets de todos os terceiros (non aplicable para usuarios externos, sempre estará limitado ao terceiro do que dependen)
 
-TicketDictType=Ticket - Types
-TicketDictCategory=Ticket - Groupes
-TicketDictSeverity=Ticket - Severities
-TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
+TicketDictType=Tipo de tickets
+TicketDictCategory=Grupos de tickets
+TicketDictSeverity=Gravidade dos tickets
+TicketDictResolution=Resolución dos tickets
 
-TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
-TicketTypeShortREQUEST=Change or enhancement request
+TicketTypeShortCOM=Pregunta comercial
+TicketTypeShortHELP=Solicitar axuda sobre funcións
+TicketTypeShortISSUE=Erro, bug ou problema
+TicketTypeShortREQUEST=Solicitude de cambio ou mellora
 TicketTypeShortPROJET=Proxecto
 TicketTypeShortOTHER=Outro
 
 TicketSeverityShortLOW=Baixo
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Alto
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Crítico / Bloqueo
 
-ErrorBadEmailAddress=Field '%s' incorrect
-MenuTicketMyAssign=My tickets
-MenuTicketMyAssignNonClosed=My open tickets
-MenuListNonClosed=Open tickets
+ErrorBadEmailAddress=O campo '%s' é incorrecto
+MenuTicketMyAssign=Meus tickets
+MenuTicketMyAssignNonClosed=Meus tickets abertos
+MenuListNonClosed=Tickets abertos
 
 TypeContact_ticket_internal_CONTRIBUTOR=Participante
-TypeContact_ticket_internal_SUPPORTTEC=Assigned user
-TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
-TypeContact_ticket_external_CONTRIBUTOR=External contributor
+TypeContact_ticket_internal_SUPPORTTEC=Usuario asignado
+TypeContact_ticket_external_SUPPORTCLI=Contacto seguemento cliente/incidente
+TypeContact_ticket_external_CONTRIBUTOR=Contribuidor externo
 
-OriginEmail=Email source
-Notify_TICKET_SENTBYMAIL=Send ticket message by email
+OriginEmail=Orixe E-Mail
+Notify_TICKET_SENTBYMAIL=Enviar mensaxe de ticket por e-mail
 
 # Status
-NotRead=Non lido
 Read=Lido
-Assigned=Assigned
+Assigned=Asignado
 InProgress=En progreso
-NeedMoreInformation=Waiting for information
-Answered=Answered
-Waiting=Waiting
-Closed=Pechada
-Deleted=Deleted
+NeedMoreInformation=Agardando información
+Answered=Contestado
+Waiting=Agardando
+Closed=Pechado
+Deleted=Eliminado
 
 # Dict
 Type=Tipo
-Severity=Severity
+Severity=Gravidade
 
 # Email templates
-MailToSendTicketMessage=To send email from ticket message
+MailToSendTicketMessage=Enviar correo electrónico dende ticket
 
 #
 # Admin page
 #
-TicketSetup=Ticket module setup
+TicketSetup=Configuración do módulo de ticket
 TicketSettings=Configuracións
 TicketSetupPage=
-TicketPublicAccess=A public interface requiring no identification is available at the following url
-TicketSetupDictionaries=The type of ticket, severity and analytic codes are configurable from dictionaries
-TicketParamModule=Module variable setup
-TicketParamMail=Email setup
-TicketEmailNotificationFrom=Notification email from
-TicketEmailNotificationFromHelp=Used into ticket message answer by example
-TicketEmailNotificationTo=Notifications email to
-TicketEmailNotificationToHelp=Send email notifications to this address.
-TicketNewEmailBodyLabel=Text message sent after creating a ticket
-TicketNewEmailBodyHelp=The text specified here will be inserted into the email confirming the creation of a new ticket from the public interface. Information on the consultation of the ticket are automatically added.
-TicketParamPublicInterface=Public interface setup
-TicketsEmailMustExist=Require an existing email address to create a ticket
-TicketsEmailMustExistHelp=In the public interface, the email address should already be filled in the database to create a new ticket.
-PublicInterface=Public interface
-TicketUrlPublicInterfaceLabelAdmin=Alternative URL for public interface
-TicketUrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server and thus make available the public interface with another URL (the server must act as a proxy on this new URL)
-TicketPublicInterfaceTextHomeLabelAdmin=Welcome text of the public interface
-TicketPublicInterfaceTextHome=You can create a support ticket or view existing from its identifier tracking ticket.
-TicketPublicInterfaceTextHomeHelpAdmin=The text defined here will appear on the home page of the public interface.
-TicketPublicInterfaceTopicLabelAdmin=Interface title
-TicketPublicInterfaceTopicHelp=This text will appear as the title of the public interface.
-TicketPublicInterfaceTextHelpMessageLabelAdmin=Help text to the message entry
-TicketPublicInterfaceTextHelpMessageHelpAdmin=This text will appear above the message input area of the user.
-ExtraFieldsTicket=Extra attributes
-TicketCkEditorEmailNotActivated=HTML editor is not activated. Please put FCKEDITOR_ENABLE_MAIL content to 1 to get it.
-TicketsDisableEmail=Do not send emails for ticket creation or message recording
-TicketsDisableEmailHelp=By default, emails are sent when new tickets or messages created. Enable this option to disable *all* email notifications
-TicketsLogEnableEmail=Enable log by email
-TicketsLogEnableEmailHelp=At each change, an email will be sent **to each contact** associated with the ticket.
-TicketParams=Params
-TicketsShowModuleLogo=Display the logo of the module in the public interface
-TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
-TicketsShowCompanyLogo=Display the logo of the company in the public interface
-TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
-TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
-TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
-TicketsActivatePublicInterface=Activate public interface
-TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create tickets.
-TicketsAutoAssignTicket=Automatically assign the user who created the ticket
-TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
-TicketNumberingModules=Tickets numbering module
-TicketNotifyTiersAtCreation=Notify third party at creation
-TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
-TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
-TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicAccess=Na seguinte url está dispoñible unha interface pública que non precisa identificación
+TicketSetupDictionaries=Os tipos de categorías e  os niveis de gravidade podense configurar nos diccionarios
+TicketParamModule=Configuración de variables do módulo
+TicketParamMail=Configuración de correo electrónicol
+TicketEmailNotificationFrom=E-mail de notificación de
+TicketEmailNotificationFromHelp=Utilizado na resposta da mensaxe do ticket por exemplo
+TicketEmailNotificationTo=Notificacións e-mail a
+TicketEmailNotificationToHelp=Envíe notificacións por e-mail a este enderezo.
+TicketNewEmailBodyLabel=Mensaxe de texto enviado despois de crear un ticket
+TicketNewEmailBodyHelp=O texto especificado aquí será insertado no correo electrónico de confirmación de creación dun novo ticket dende a interfaz pública. A información sobre a consulta do ticket agregase automáticamente.
+TicketParamPublicInterface=Configuración da interfaz pública
+TicketsEmailMustExist=Requirir un enderezo de e-mail existente para crear un ticket
+TicketsEmailMustExistHelp=Na interfaz pública, o enderezo de correo electrónico debe ser cuberto na base de datos para crear un novo ticket.
+PublicInterface=Interfaz pública.
+TicketUrlPublicInterfaceLabelAdmin=URL alternativa de interfaz pública
+TicketUrlPublicInterfaceHelpAdmin=É posible definir un alias para o servidor web e así poñer a disposición a interface pública con outro URL (o servidor debe actuar como proxy neste novo URL)
+TicketPublicInterfaceTextHomeLabelAdmin=Texto de benvida da interfaz pública
+TicketPublicInterfaceTextHome=Pode crear un ticket de asistencia ou ver algún existente desde o identificados do seu ticket de seguimento.
+TicketPublicInterfaceTextHomeHelpAdmin=O texto aquí definido aparecerá na páxina de inicio da interface pública.
+TicketPublicInterfaceTopicLabelAdmin=Título da interfaz
+TicketPublicInterfaceTopicHelp=Este texto aparecerá como o título da interfaz pública.
+TicketPublicInterfaceTextHelpMessageLabelAdmin=Texto de axuda á entrada da mensaxe
+TicketPublicInterfaceTextHelpMessageHelpAdmin=Este texto aparecerá sobre o área de entrada de mensaxes do usuario.
+ExtraFieldsTicket=Campos adicionais
+TicketCkEditorEmailNotActivated=O editor HTML non está activado. Poña o contido de FCKEDITOR_ENABLE_MAIL en 1 para obtelo.
+TicketsDisableEmail=Non enviar correos electrónicos de creación de tickets ou grabación de mensaxes
+TicketsDisableEmailHelp=Por defecto, os correos electrónicos envíanse cando se crean novas entradas ou mensaxes. Active esta opción para desactivar as notificacións de correo electrónico *all*
+TicketsLogEnableEmail=Activar o rexistro por correo electrónico
+TicketsLogEnableEmailHelp=A cada cambio, enviarase un correo electrónico **to each contact** asociado ao ticket.
+TicketParams=Parámetros
+TicketsShowModuleLogo=Amosar o logotipo do módulo na interfaz pública
+TicketsShowModuleLogoHelp=Active esta opción para ocultar o logotipo nas páxinas da interfaz pública
+TicketsShowCompanyLogo=Amosar o logotipo da empresa na interfaz pública
+TicketsShowCompanyLogoHelp=Active esta opción para ocultar o logotipo da empresa principal nas páxinas da interfaz pública
+TicketsEmailAlsoSendToMainAddress=Envíe tamén notificacións a enderezo de correo electrónico principal
+TicketsEmailAlsoSendToMainAddressHelp=Active esta opción para enviar un correo electrónico ao enderezo "Notificación de correo electrónico desde" (ver configuración a continuación)
+TicketsLimitViewAssignedOnly=Restrinxir a visualización aos tickets asignados ao usuario actual (non é efectivo para usuarios externos, limítase sempre ao terceiro do que dependen)
+TicketsLimitViewAssignedOnlyHelp=Só serán visibles os tickets asignados ao usuario actual. Non se aplica a un usuario con dereitos de xestión de tickets.
+TicketsActivatePublicInterface=Activar a interface pública
+TicketsActivatePublicInterfaceHelp=A interface pública permite aos visitantes crear entradas.
+TicketsAutoAssignTicket=Asignar automaticamente ao usuario que creou o ticket
+TicketsAutoAssignTicketHelp=Ao crear un ticket, o usuario pode asignarse automaticamente ao ticket.
+TicketNumberingModules=Módulo de numeración de entradas
+TicketsModelModule=Modelos de documentos para os tickets
+TicketNotifyTiersAtCreation=Notificar a terceiros a creación
+TicketsDisableCustomerEmail=Desactiva sempre os correos electrónicos cando se crea un ticket desde a interface pública
+TicketsPublicNotificationNewMessage=Enviar correo electrónico cando se engada unha nova mensaxe
+TicketsPublicNotificationNewMessageHelp=Enviar correo electrónico cando se engada unha nova mensaxe desde a interface pública (ao usuario asignado ou ao correo electrónico de notificacións a (actualizar) e/ou ao correo electrónico de notificacións a)
+TicketPublicNotificationNewMessageDefaultEmail=Correo electrónico de notificacións a (actualizar)
+TicketPublicNotificationNewMessageDefaultEmailHelp=Envía por correo electrónico novas mensaxes a este enderezo se o ticket non ten asignado un usuario ou o usuario non ten un correo electrónico.
 #
 # Index & list page
 #
-TicketsIndex=Tickets area
-TicketList=List of tickets
-TicketAssignedToMeInfos=This page display ticket list created by or assigned to current user
-NoTicketsFound=No ticket found
-NoUnreadTicketsFound=No unread ticket found
-TicketViewAllTickets=View all tickets
-TicketViewNonClosedOnly=View only open tickets
-TicketStatByStatus=Tickets by status
-OrderByDateAsc=Sort by ascending date
-OrderByDateDesc=Sort by descending date
-ShowAsConversation=Show as conversation list
-MessageListViewType=Show as table list
+TicketsIndex=Área Tickets
+TicketList=Listaxe de tickets
+TicketAssignedToMeInfos=Esta páxina amosa o listado de tickets que están asignados ao usuario actual
+NoTicketsFound=Ningún ticket atopado
+NoUnreadTicketsFound=Ningún ticket sen ler atopado
+TicketViewAllTickets=Ver todos os tickets
+TicketViewNonClosedOnly=Ver só tickets abertos
+TicketStatByStatus=Tickets por estado
+OrderByDateAsc=Ordear por data ascendente
+OrderByDateDesc=Ordear por data descendente
+ShowAsConversation=Amosar a listaxe de conversa
+MessageListViewType=Amosar a listaxe de taboas
 
 #
 # Ticket card
 #
 Ticket=Ticket
-TicketCard=Ticket card
-CreateTicket=Create ticket
-EditTicket=Edit ticket
-TicketsManagement=Tickets Management
-CreatedBy=Created by
-NewTicket=New Ticket
-SubjectAnswerToTicket=Ticket answer
-TicketTypeRequest=Request type
-TicketCategory=Grupo
-SeeTicket=See ticket
-TicketMarkedAsRead=Ticket has been marked as read
-TicketReadOn=Read on
+TicketCard=Ficha ticket
+CreateTicket=Crear ticket
+EditTicket=Editar ticket
+TicketsManagement=Xestión de tickets
+CreatedBy=Creado por
+NewTicket=Novo ticket
+SubjectAnswerToTicket=Resposta
+TicketTypeRequest=Tipo de solicitude
+TicketCategory=Grúpo
+SeeTicket=Ver ticket
+TicketMarkedAsRead=O ticket foi marcado como lido
+TicketReadOn=Lido o
 TicketCloseOn=Data de peche
-MarkAsRead=Mark ticket as read
-TicketHistory=Ticket history
-AssignUser=Assign to user
-TicketAssigned=Ticket is now assigned
-TicketChangeType=Change type
-TicketChangeCategory=Change analytic code
-TicketChangeSeverity=Change severity
-TicketAddMessage=Add a message
-AddMessage=Add a message
-MessageSuccessfullyAdded=Ticket added
-TicketMessageSuccessfullyAdded=Message successfully added
-TicketMessagesList=Message list
-NoMsgForThisTicket=No message for this ticket
-Properties=Classification
-LatestNewTickets=Latest %s newest tickets (not read)
-TicketSeverity=Severity
-ShowTicket=See ticket
-RelatedTickets=Related tickets
-TicketAddIntervention=Create intervention
-CloseTicket=Close ticket
-CloseATicket=Close a ticket
-ConfirmCloseAticket=Confirm ticket closing
-ConfirmDeleteTicket=Please confirm ticket deleting
-TicketDeletedSuccess=Ticket deleted with success
-TicketMarkedAsClosed=Ticket marked as closed
-TicketDurationAuto=Calculated duration
-TicketDurationAutoInfos=Duration calculated automatically from intervention related
-TicketUpdated=Ticket updated
-SendMessageByEmail=Send message by email
-TicketNewMessage=New message
-ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send
-TicketGoIntoContactTab=Please go into "Contacts" tab to select them
-TicketMessageMailIntro=Introduction
-TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.
-TicketMessageMailIntroLabelAdmin=Introduction to the message when sending email
-TicketMessageMailIntroText=Hello,<br>A new response was sent on a ticket that you contact. Here is the message:<br>
-TicketMessageMailIntroHelpAdmin=This text will be inserted before the text of the response to a ticket.
+MarkAsRead=Marcar ticket como lido
+TicketHistory=Historial
+AssignUser=Asignar ao usuario
+TicketAssigned=O Ticket foi asignado
+TicketChangeType=Cambiar tipo
+TicketChangeCategory=Cambiar categoría
+TicketChangeSeverity=Cambiar gravidade
+TicketAddMessage=Engadir mensaxe
+AddMessage=Engadir mensaxe
+MessageSuccessfullyAdded=Ticket engadido
+TicketMessageSuccessfullyAdded=Mensaxe engadida correctamente
+TicketMessagesList=Listaxe de mensaxes
+NoMsgForThisTicket=Ningunha mensaxe para este ticket
+Properties=Clasificación
+LatestNewTickets=Últimos %s tickets (non lidos)
+TicketSeverity=Gravidade
+ShowTicket=Ver ticket
+RelatedTickets=Tickets relacionados
+TicketAddIntervention=Crear intervención
+CloseTicket=Pechar ticket
+CloseATicket=Pechar un ticket
+ConfirmCloseAticket=Confirmar o peche do ticket
+ConfirmDeleteTicket=Confirme a eliminación do ticket
+TicketDeletedSuccess=Ticket eliminado con éxito
+TicketMarkedAsClosed=Ticket marcado como pechado
+TicketDurationAuto=Duración calculada
+TicketDurationAutoInfos=Duración calculada automáticamente a partir da intervención relacionada
+TicketUpdated=Ticket actualizado
+SendMessageByEmail=Enviar mensaxe por e-mail
+TicketNewMessage=Nova mensaxe
+ErrorMailRecipientIsEmptyForSendTicketMessage=O destinatario está baleiro. Non foi enviado o email
+TicketGoIntoContactTab=Vaia á lapela "Contactos" para seleccionalos
+TicketMessageMailIntro=Introdución
+TicketMessageMailIntroHelp=Este texto é engadido só ao principio do email e non será gardado.
+TicketMessageMailIntroLabelAdmin=Introdución á mensaxe cando enviase un e-mail
+TicketMessageMailIntroText=Ola, <br>Enviouse unha nova resposta a un ticket. Aquí está a mensaxe: <br>
+TicketMessageMailIntroHelpAdmin=Este texto será insertado antes do texto daa resposta a un ticket.
 TicketMessageMailSignature=Sinatura
-TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
-TicketMessageMailSignatureText=<p>Sincerely,</p><p>--</p>
-TicketMessageMailSignatureLabelAdmin=Signature of response email
-TicketMessageMailSignatureHelpAdmin=This text will be inserted after the response message.
-TicketMessageHelp=Only this text will be saved in the message list on ticket card.
-TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
-TimeElapsedSince=Time elapsed since
-TicketTimeToRead=Time elapsed before read
-TicketContacts=Contacts ticket
-TicketDocumentsLinked=Documents linked to ticket
-ConfirmReOpenTicket=Confirm reopen this ticket ?
-TicketMessageMailIntroAutoNewPublicMessage=A new message was posted on the ticket with the subject %s:
-TicketAssignedToYou=Ticket assigned
-TicketAssignedEmailBody=You have been assigned the ticket #%s by %s
-MarkMessageAsPrivate=Mark message as private
-TicketMessagePrivateHelp=This message will not display to external users
-TicketEmailOriginIssuer=Issuer at origin of the tickets
-InitialMessage=Initial Message
-LinkToAContract=Link to a contract
-TicketPleaseSelectAContract=Select a contract
-UnableToCreateInterIfNoSocid=Can not create an intervention when no third party is defined
-TicketMailExchanges=Mail exchanges
-TicketInitialMessageModified=Initial message modified
-TicketMessageSuccesfullyUpdated=Message successfully updated
-TicketChangeStatus=Change status
-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
-ErrorTicketRefRequired=Ticket reference name is required
+TicketMessageMailSignatureHelp=Este texto será agregado só ao final do correo electrónico e non será gardado.
+TicketMessageMailSignatureText=<p>Cordialmente,</p><p>--</p>
+TicketMessageMailSignatureLabelAdmin=Sinatura do correo electónico de resposta
+TicketMessageMailSignatureHelpAdmin=Este texto será insertado despois da mensaxe de resposta.
+TicketMessageHelp=Só este texto será gardado na listaxe de mensaxes na ficha do ticket
+TicketMessageSubstitutionReplacedByGenericValues=As variables de substitución son reemplazadas por valores xenéricos.
+TimeElapsedSince=Tempo transcurrido dende
+TicketTimeToRead=Tempo transcurrido antes de ler o ticket
+TicketContacts=Contactos do ticket
+TicketDocumentsLinked=Documentos ligados ao ticket
+ConfirmReOpenTicket=¿Está certo de querer reabrir este ticket?
+TicketMessageMailIntroAutoNewPublicMessage=Publicouse unha nova mensaxe no ticket co asunto %s:
+TicketAssignedToYou=Ticket asignado
+TicketAssignedEmailBody=Foille asignado o ticket #%s por %s
+MarkMessageAsPrivate=Marcar mensaxe como privada
+TicketMessagePrivateHelp=Esta mensaxe non será amosada aos usuarios externos
+TicketEmailOriginIssuer=Emisor orixe dos tickets
+InitialMessage=Mensaxe inicial
+LinkToAContract=Ligar a un contrato
+TicketPleaseSelectAContract=Seleccione un contrato
+UnableToCreateInterIfNoSocid=Non pode crearse unha intervención se non hai definidos terceiros
+TicketMailExchanges=Intercambios de correos electrónicos
+TicketInitialMessageModified=Mensaxe inicial modificada
+TicketMessageSuccesfullyUpdated=Mensaxe actualizada con éxito
+TicketChangeStatus=Cambiar estado
+TicketConfirmChangeStatus=¿Confirma o cambio de estado: %s?
+TicketLogStatusChanged=Estado cambiado: %s a %s
+TicketNotNotifyTiersAtCreate=Non notificar á compañía ao crear
+Unread=Non lido
+TicketNotCreatedFromPublicInterface=Non dispoñible. O ticket non se creou desde a interface pública.
+ErrorTicketRefRequired=O nome da referencia do ticket é obrigatorio
 
 #
 # Logs
 #
-TicketLogMesgReadBy=Ticket %s read by %s
-NoLogForThisTicket=No log for this ticket yet
-TicketLogAssignedTo=Ticket %s assigned to %s
-TicketLogPropertyChanged=Ticket %s modified: classification from %s to %s
-TicketLogClosedBy=Ticket %s closed by %s
-TicketLogReopen=Ticket %s re-open
+TicketLogMesgReadBy=Ticket %s lido por %s
+NoLogForThisTicket=Aínda no hai rexistro para este ticket
+TicketLogAssignedTo=Ticket %s asignado a %s
+TicketLogPropertyChanged=Ticket %s modificado: clasificación: de %s a %s
+TicketLogClosedBy=Ticket %s pechado por %s
+TicketLogReopen=Ticket %s aberto de novo
 
 #
 # Public pages
 #
-TicketSystem=Ticket system
-ShowListTicketWithTrackId=Display ticket list from track ID
-ShowTicketWithTrackId=Display ticket from track ID
-TicketPublicDesc=You can create a support ticket or check from an existing ID.
-YourTicketSuccessfullySaved=Ticket has been successfully saved!
-MesgInfosPublicTicketCreatedWithTrackId=A new ticket has been created with ID %s and Ref %s.
-PleaseRememberThisId=Please keep the tracking number that we might ask you later.
-TicketNewEmailSubject=Ticket creation confirmation - Ref %s (public ticket ID %s)
-TicketNewEmailSubjectCustomer=New support ticket
-TicketNewEmailBody=This is an automatic email to confirm you have registered a new ticket.
-TicketNewEmailBodyCustomer=This is an automatic email to confirm a new ticket has just been created into your account.
-TicketNewEmailBodyInfosTicket=Information for monitoring the ticket
-TicketNewEmailBodyInfosTrackId=Ticket tracking number: %s
-TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the link above.
-TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
-TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
-TicketPublicInfoCreateTicket=This form allows you to record a support ticket in our management system.
-TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.
-TicketPublicMsgViewLogIn=Please enter ticket tracking ID
-TicketTrackId=Public Tracking ID
-OneOfTicketTrackId=One of your tracking ID
-ErrorTicketNotFound=Ticket with tracking ID %s not found!
+TicketSystem=Sistema de tickets
+ShowListTicketWithTrackId=Amosar listado de tickets con track ID
+ShowTicketWithTrackId=Amosar ticket desde id de seguemento
+TicketPublicDesc=Pode crear un ticket de soporte ou comprobar un ID existente.
+YourTicketSuccessfullySaved=Ticket gardado con éxito!
+MesgInfosPublicTicketCreatedWithTrackId=Foi creado un novo ticket con ID %s.
+PleaseRememberThisId=Pregase que conserve o número de seguimento que lle podemos pedir máis adiante.
+TicketNewEmailSubject=Confirmación de creación de ticket
+TicketNewEmailSubjectCustomer=Novo ticket de soporte
+TicketNewEmailBody=Este é un correo electrónico automático para confirmar que foi rexistrado un novo ticket.
+TicketNewEmailBodyCustomer=Este es un e-mail automático para confirmar que creouse un novo ticket na súa conta.
+TicketNewEmailBodyInfosTicket=Información para monitorear o ticket
+TicketNewEmailBodyInfosTrackId=Número de seguemento do ticket: %s
+TicketNewEmailBodyInfosTrackUrl=Pode ver o progreso do ticket facendo click sobre a seguinte ligazón.
+TicketNewEmailBodyInfosTrackUrlCustomer=Pode ver o progreso do ticket na interfaz específica facendo clic na seguinte ligazón
+TicketEmailPleaseDoNotReplyToThisEmail=Prégase non respostar directamente a este correo. Use a ligazón para respostar.
+TicketPublicInfoCreateTicket=Este formulario permitelle rexistrar un ticket de soporte no noso sistema.
+TicketPublicPleaseBeAccuratelyDescribe=Prégase describa de forma precisa o problema. Aporte a maior cantidade de información posible para permitirnos identificar a súa solicitude.
+TicketPublicMsgViewLogIn=Ingrese o ID de seguemento do ticket
+TicketTrackId=ID público de seguemento
+OneOfTicketTrackId=Un dos seus ID de seguemento
+ErrorTicketNotFound=Non foi atopado o ticket co id de seguemento %s!
 Subject=Asunto
-ViewTicket=View ticket
-ViewMyTicketList=View my ticket list
-ErrorEmailMustExistToCreateTicket=Error: email address not found in our database
-TicketNewEmailSubjectAdmin=New ticket created - Ref %s (public ticket ID %s)
-TicketNewEmailBodyAdmin=<p>Ticket has just been created with ID #%s, see information:</p>
-SeeThisTicketIntomanagementInterface=See ticket in management interface
-TicketPublicInterfaceForbidden=The public interface for the tickets was not enabled
-ErrorEmailOrTrackingInvalid=Bad value for tracking ID or email
-OldUser=Old user
+ViewTicket=Ver ticket
+ViewMyTicketList=Ver a miña listaxe de tickets
+ErrorEmailMustExistToCreateTicket=Erro: enderezo de correo electrónico non atopado na nosa base de datos
+TicketNewEmailSubjectAdmin=Novo ticket creado.
+TicketNewEmailBodyAdmin=<p> O ticket foi creado co ID # %s, ver información: </p>
+SeeThisTicketIntomanagementInterface=Ver Ticket na interfaz de administración
+TicketPublicInterfaceForbidden=A interfaz pública para os tickets non estaba habilitada.
+ErrorEmailOrTrackingInvalid=ID de seguemento ou enderezo de correo electrónico incorrectos
+OldUser=Usuario antigo
 NewUser=Novo usuario
-NumberOfTicketsByMonth=Number of tickets per month
-NbOfTickets=Number of tickets
+NumberOfTicketsByMonth=Número de tickets por mes
+NbOfTickets=Número de tickets
 # notifications
-TicketNotificationEmailSubject=Ticket %s updated
-TicketNotificationEmailBody=This is an automatic message to notify you that ticket %s has just been updated
-TicketNotificationRecipient=Notification recipient
-TicketNotificationLogMessage=Log message
-TicketNotificationEmailBodyInfosTrackUrlinternal=View ticket into interface
-TicketNotificationNumberEmailSent=Notification email sent: %s
+TicketNotificationEmailSubject=Ticket %s actualizado
+TicketNotificationEmailBody=Esta é unha mensaxe automática para notificarlle queo ticket %s acaba de ser actualizado
+TicketNotificationRecipient=Recipiente de notificación
+TicketNotificationLogMessage=Rexistro de mensaxe
+TicketNotificationEmailBodyInfosTrackUrlinternal=Ver ticket na interfaz
+TicketNotificationNumberEmailSent=Enviouse un correo electrónico de notificación: %s
 
-ActionsOnTicket=Events on ticket
+ActionsOnTicket=Eventos no ticket
 
 #
 # Boxes
 #
-BoxLastTicket=Latest created tickets
-BoxLastTicketDescription=Latest %s created tickets
+BoxLastTicket=Últimos tickets creados
+BoxLastTicketDescription=Últimos %s tickets creados
 BoxLastTicketContent=
-BoxLastTicketNoRecordedTickets=No recent unread tickets
-BoxLastModifiedTicket=Latest modified tickets
-BoxLastModifiedTicketDescription=Latest %s modified tickets
+BoxLastTicketNoRecordedTickets=Non hai tickets recentes sen ler
+BoxLastModifiedTicket=Últimos tickets modificados
+BoxLastModifiedTicketDescription=Últimos %s tickets modificados
 BoxLastModifiedTicketContent=
-BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxLastModifiedTicketNoRecordedTickets=Non hai tickets modificados recentemente
diff --git a/htdocs/langs/gl_ES/users.lang b/htdocs/langs/gl_ES/users.lang
index e6bcfc93d77..18657d820b1 100644
--- a/htdocs/langs/gl_ES/users.lang
+++ b/htdocs/langs/gl_ES/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Eliminar do grupo
 PasswordChangedAndSentTo=Contrasinal cambiado e enviado a <b>%s</b>.
 PasswordChangeRequest=Solicitude para cambiar o contrasinal de <b>%s</b>
 PasswordChangeRequestSent=Solicitude de cambio de contrasinal para <b>%s</b> enviado a <b>%s</b>.
+IfLoginExistPasswordRequestSent=Se este inicio de sesión é unha conta válida, enviouse un correo electrónico para restablecer o contrasinal.
+IfEmailExistPasswordRequestSent=Se este correo electrónico é unha conta válida, enviouse un correo electrónico para restablecer o contrasinal.
 ConfirmPasswordReset=Confirmar restablecemento de contrasinal
 MenuUsersAndGroups=Usuarios e grupos
 LastGroupsCreated=Últimos %s grupos creados
@@ -73,6 +75,7 @@ CreateInternalUserDesc=Este formulario permitelle engadir un usuario interno par
 InternalExternalDesc=Un usuario <b>interno</b> é un usuario que pertence a súa empresa/organización.<br>Un usuario <b>externo</b> é un usuario cliente, provedor ou outro.<br><br>Nos dous casos, os permisos de usuarios definen os dereitos de acceso, pero o usuario externo pode a maiores ter un xestor de menús diferente ao usuario interno (véxase Inicio - Configuración - Entorno)
 PermissionInheritedFromAGroup=O permiso concédese xa que o hereda dun grupo ao cal pertence o usuario.
 Inherited=Heredado
+UserWillBe=Será o usuario creado
 UserWillBeInternalUser=O usuario creado será un usuario interno (xa que non está ligado a un terceiro en particular)
 UserWillBeExternalUser=O usuario creado será un usuario externo (xa que está ligado a un terceiro en particular)
 IdPhoneCaller=ID chamada recibida (teléfono)
@@ -108,13 +111,15 @@ DisabledInMonoUserMode=Desactivado en modo mantemento
 UserAccountancyCode=Código contable usuario
 UserLogoff=Usuario desconectado
 UserLogged=Usuario conectado
-DateOfEmployment=Employment date
-DateEmployment=Data de contratación do empregado
+DateOfEmployment=Data de contratación empregado
+DateEmployment=Contratación empregado
+DateEmploymentstart=Data de comezo da contratación do empregado
 DateEmploymentEnd=Data de baixa do empregado
+RangeOfLoginValidity=Rango de data de validez do inicio de sesión
 CantDisableYourself=Pode desactivar o seu propio rexistro de usuario
 ForceUserExpenseValidator=Forzar validación do informe de gasto
 ForceUserHolidayValidator=Forzar validación do rexeitamento do gasto
-ValidatorIsSupervisorByDefault=Por defecto, o responsable da validación é o supervisor do usuario. Manter baleiro para manter este comportamento.
+ValidatorIsSupervisorByDefault=Por defecto, o responsable da validación é o supervisor do usuario. Manter baleiro para gardar este comportamento.
 UserPersonalEmail=Email persoal
 UserPersonalMobile=Teléfono móbil persoal
-WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
+WarningNotLangOfInterface=Aviso, este é o idioma principal que fala o usuario, non o idioma da interface que escolleu ver. Para cambiar o idioma da interface visible por este usuario, vaia a lapela %s
diff --git a/htdocs/langs/gl_ES/website.lang b/htdocs/langs/gl_ES/website.lang
index e16ee97f8fa..7691822ddf4 100644
--- a/htdocs/langs/gl_ES/website.lang
+++ b/htdocs/langs/gl_ES/website.lang
@@ -1,139 +1,139 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Código
-WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
-DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
-WEBSITE_TYPE_CONTAINER=Type of page/container
-WEBSITE_PAGE_EXAMPLE=Web page to use as example
-WEBSITE_PAGENAME=Page name/alias
-WEBSITE_ALIASALT=Alternative page names/aliases
-WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
-WEBSITE_CSS_URL=URL of external CSS file
-WEBSITE_CSS_INLINE=CSS file content (common to all pages)
-WEBSITE_JS_INLINE=Javascript file content (common to all pages)
-WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
-WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Website .htaccess file
-WEBSITE_MANIFEST_JSON=Website manifest.json file
-WEBSITE_README=README.md file
-WEBSITE_KEYWORDSDesc=Use a comma to separate values
-EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
-HtmlHeaderPage=HTML header (specific to this page only)
-PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
-EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
-MediaFiles=Media library
-EditCss=Edit website properties
-EditMenu=Edit menu
-EditMedias=Edit medias
-EditPageMeta=Edit page/container properties
-EditInLine=Edit inline
-AddWebsite=Add website
-Webpage=Web page/container
-AddPage=Add page/container
-HomePage=Home Page
+WebsiteSetupDesc=​​ Cree aquí os sitios web que desexa usar. Despois vaia ao menú de sitios web para editalos.
+DeleteWebsite=Eliminar sitio web
+ConfirmDeleteWebsite=¿Está certo de querer eliminar este sitio web? Tamén se eliminarán todas as súas páxinas e o contido. Os ficheiros cargados (como no directorio multimedia, no módulo ECM, ...) permanecerán.
+WEBSITE_TYPE_CONTAINER=Tipo de páxina / contedor
+WEBSITE_PAGE_EXAMPLE=Páxina web para usar como exemplo
+WEBSITE_PAGENAME=Nome/alias da páxina
+WEBSITE_ALIASALT=Nomes/alias alternativos de páxinas
+WEBSITE_ALIASALTDesc=Use aquí a listaxe doutros nomes/alias para que tamén se poida acceder á páxina usando outros nomes/alias (por exemplo, o nome antigo despois de renomear o alias para manter a ligazón de retroceso na ligazón/nome antigo funcionando). A sintaxe é:<br> nome alternativo1,nome alternativo2, ...
+WEBSITE_CSS_URL=URL do ficheiro CSS externo
+WEBSITE_CSS_INLINE=Contido do ficheiro CSS (común a todas as páxinas)
+WEBSITE_JS_INLINE=Contido do ficheiro Javascript (común a todas as páxinas)
+WEBSITE_HTML_HEADER=Adición na parte inferior da cabeceira HTML (común a todas as páxinas)
+WEBSITE_ROBOT=Ficheiro robots (robots.txt)
+WEBSITE_HTACCESS=Ficheiro .htaccess do sitio web
+WEBSITE_MANIFEST_JSON=Ficheiro manifest.json do sitio web
+WEBSITE_README=Ficheiro README.md
+WEBSITE_KEYWORDSDesc=Use unha coma para separar os valores
+EnterHereLicenseInformation=Introduza aquí metadatos ou información de licenza para facer un ficheiro README.md. se distribúe o seu sitio web como modelo, o ficheiro incluirase no paquete temtate.
+HtmlHeaderPage=Cabeceira HTML (específica só para esta páxina)
+PageNameAliasHelp=Nome ou alias da páxina. <br> Este alias tamén se usa para forxar un URL de SEO cando o sitio web se executa desde un servidor virtual dun servidor web (como Apacke, Nginx, ...). Use o botón "<strong>%s </strong>" para editar este alias.
+EditTheWebSiteForACommonHeader=Nota: Se desexa definir unha cabeceira personalizada para todas as páxinas, edite a cabeceira a nivel de sitio en lugar de a páxina/contedor.
+MediaFiles=Librería de medios
+EditCss=Editar propiedades do sitio web
+EditMenu=Menú Editar
+EditMedias=Editar medios
+EditPageMeta=Editar as propiedades da páxina/contedor
+EditInLine=Editar en liña
+AddWebsite=Engadir sitio web
+Webpage=Páxina web/contedor
+AddPage=Engadir páxina/contedor
 PageContainer=Páxina
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
-RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
-SiteDeleted=Web site '%s' deleted
-PageContent=Page/Contenair
-PageDeleted=Page/Contenair '%s' of website %s deleted
-PageAdded=Page/Contenair '%s' added
-ViewSiteInNewTab=View site in new tab
-ViewPageInNewTab=View page in new tab
-SetAsHomePage=Set as Home page
-RealURL=Real URL
-ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
-ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
-YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
-YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+PreviewOfSiteNotYetAvailable=A vista previa do seu sitio web <strong>%s </strong> aínda non está dispoñible. Primeiro debe "<strong> Importar un modelo de sitio web completo </strong>" ou simplemente "<strong> Engadir unha páxina/contedor </strong>".
+RequestedPageHasNoContentYet=A páxina solicitada co id %s aínda non ten contido ou a caché file.tpl.php foi eliminada. Edite o contido da páxina para solucionar isto.
+SiteDeleted=Eliminouse o sitio web '%s'
+PageContent=Páxina/Contedor
+PageDeleted=Eliminouse a páxina/Contedor '%s' do sitio web %s
+PageAdded=Engadiuse a páxina/Contedor '%s'
+ViewSiteInNewTab=Ver o sitio nunha nova lapela
+ViewPageInNewTab=Ver a páxina nunha nova lapela
+SetAsHomePage=Establecer como páxina de inicio
+RealURL=URL real
+ViewWebsiteInProduction=Ver o sitio web usando URL de inicio
+SetHereVirtualHost=<u> Usar con Apache/NGinx/... </u> <br> Cree no seu servidor web (Apache, Nginx, ...) un host virtual adicado con PHP habilitado e un directorio raíz en <br > <strong>%s </strong>
+ExampleToUseInApacheVirtualHostConfig=Exemplo para usar na configuración do host virtual Apache:
+YouCanAlsoTestWithPHPS=<u> Usar con servidor incorporado PHP </u> <br> No entorno de desenvolvemento, pode que prefira probar o sitio co servidor web incorporado PHP (é preciso PHP 5.5) executando <br> <strong> php -S 0.0.0.0:8080 -t %s </strong>
+YouCanAlsoDeployToAnotherWHP=<u> Execute o seu sitio web con outro provedor de hospedaxe Dolibarr </u> <br> Se non ten un servidor web como Apache ou NGinx dispoñible en internet, pode exportar e importar o seu sitio web a outro Dolibarr por outro provedor de hospedaxe Dolibarr que proporciona unha integración completa co módulo do sitio web. Pode atopar unha lista dalgúns provedores de hospedaxe Dolibarr en <a href="https://saas.dolibarr.org" target="_blank"> https://saas.dolibarr.org </a>
+CheckVirtualHostPerms=Comprobe tamén que o servidor virtual ten permiso <strong>%s </strong> para ficheiros en <br> <strong>%s </strong>
 ReadPerm=Lido
-WritePerm=Write
-TestDeployOnWeb=Test/deploy on web
-PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
-VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
-NoPageYet=No pages yet
-YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
-SyntaxHelp=Help on specific syntax tips
-YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+WritePerm=Escribe
+TestDeployOnWeb=Probar/despregar na web
+PreviewSiteServedByWebServer=<u> Previsualizar %s nunha nova pestana. </u> <br> <br> O %s será servido por un servidor web externo (como Apache, Nginx, IIS). Debe instalar e configurar este servidor antes para apuntar ao directorio: <br> <strong>%s </strong> <br> URL ofrecido por un servidor externo: <br> <strong>%s </strong>
+PreviewSiteServedByDolibarr=<u> Previsualizar %s nunha nova lapela. </u> <br> <br> O servidor Dolibarr servirá o %s polo que non precisa instalar ningún servidor web adicional (como Apache, Nginx, IIS). <br> O inconveniente é que o URL das páxinas non é fácil de usar e empeza co camiño do Dolibarr. <br> URL servido por Dolibarr: <br> <strong>%s </strong> <br> < br> Para usar o seu propio servidor web externo para servir este sitio web, cree un servidor virtual no seu servidor web que apunte no directorio <br> <strong>%s </strong> <br> e logo introduza o nome deste servidor virtual e faga clic no outro botón de vista previa.
+VirtualHostUrlNotDefined=O URL do host virtual ofrecido por un servidor web externo non está definido
+NoPageYet=Aínda non hai páxinas
+YouCanCreatePageOrImportTemplate=Pode crear unha nova páxina ou importar un modelo de sitio web completo
+SyntaxHelp=Axuda sobre consellos específicos de sintaxe
+YouCanEditHtmlSourceckeditor=Pode editar o código fonte HTML empregando o botón "Fonte" do editor.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Pode incluír código PHP nesta fonte empregando etiquetas <strong>&lt;?php ?&gt;</strong>. Están dispoñibles as seguintes variables: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> Tamén podes incluír contido doutra páxina/contedor coa seguinte sintaxe: <br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span>  Pode facer unha redirección a outra páxina / contedor coa seguinte sintaxe (Nota: non publique ningún contido antes dunha redirección): <br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span>  Para engadir unha ligazón a outra páxina, use a sintaxe: :<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> Para incluír unha <strong> ligazón para descargar </strong> un ficheiro almacenado no directorio <strong> documentos </strong>, use o envoltorio <strong> document.php</strong> wrapper:<br>Exemplo, para un ficheiro en documentos / ecm (hai que rexistralo), a sintaxe é :<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Para un ficheiro en documentos/medios (abrir o directorio para acceso público), a sintaxe é: <br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>Para un ficheiro compartido con unha ligazón para compartir (acceso aberto empregando a chave hash para compartir ficheiro), a sintaxe é: <br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> Para incluír unha <strong> imaxe </strong> almacenada no directorio <strong> documentos </strong>, use o envoltorio <strong>viewimage.php</strong> <br>Exemplo, para unha imaxe en documentos/medios (directorio aberto para acceso público), a sintaxe é:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
-ClonePage=Clone page/container
-CloneSite=Clone site
-SiteAdded=Website added
-ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
-PageIsANewTranslation=The new page is a translation of the current page ?
-LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
-ParentPageId=Parent page ID
-WebsiteId=Website ID
-CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create page from scratch or from a page template...
-FetchAndCreate=Fetch and Create
-ExportSite=Export website
-ImportSite=Import website template
-IDOfPage=Id of page
+YouCanEditHtmlSource2=Para unha imaxe compartida cunha ligazón de uso compartido (acceso aberto mediante a chave hash para compartir ficheiro), a sintaxe é: <br><strong>&lt;img src =" viewimage.php? Hashp=12345679012 ..."&gt;<br></strong>
+YouCanEditHtmlSourceMore=<br>Máis exemplos de código HTML ou dinámico dispoñibles na <a href="%s" target="_blank">documentación wiki</a><br>
+ClonePage=Clonar páxina/contedor
+CloneSite=Clonar sitio
+SiteAdded=Sitio web engadido
+ConfirmClonePage=Introduza o código/alias da nova páxina e se é unha tradución da páxina clonada.
+PageIsANewTranslation=A nova páxina é unha tradución da páxina actual?
+LanguageMustNotBeSameThanClonedPage=Vostede clona unha páxina como tradución. O idioma da nova páxina debe ser diferente do idioma da páxina de orixe.
+ParentPageId=ID da páxina principal
+WebsiteId=ID do sitio web
+CreateByFetchingExternalPage=Crear páxina/contedor recuperando páxina desde un URL externo ...
+OrEnterPageInfoManually=Ou crea a páxina desde cero ou a partir dun modelo de páxina ...
+FetchAndCreate=Obter e crear
+ExportSite=Exportar sitio web
+ImportSite=Importar prantilla de sitio web
+IDOfPage=Id da páxina
 Banner=Banner
-BlogPost=Blog post
-WebsiteAccount=Website account
+BlogPost=Entrada no blog
+WebsiteAccount=Conta do sitio web
 WebsiteAccounts=Contas do sitio web
-AddWebsiteAccount=Create web site account
-BackToListForThirdParty=Back to list for the third-party
-DisableSiteFirst=Disable website first
-MyContainerTitle=My web site title
-AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
-SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
-YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
-OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
-GrabImagesInto=Grab also images found into css and page.
-ImagesShouldBeSavedInto=Images should be saved into directory
-WebsiteRootOfImages=Root directory for website images
-SubdirOfPage=Sub-directory dedicated to page
-AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
-CorporateHomePage=Corporate Home page
-EmptyPage=Empty page
-ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
-ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
-InternalURLOfPage=Internal URL of page
-ThisPageIsTranslationOf=This page/container is a translation of
-ThisPageHasTranslationPages=This page/container has translation
-NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
-GoTo=Go to
-DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
-NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
-ReplaceWebsiteContent=Search or Replace website content
-DeleteAlsoJs=Delete also all javascript files specific to this website?
-DeleteAlsoMedias=Delete also all medias files specific to this website?
-MyWebsitePages=My website pages
-SearchReplaceInto=Search | Replace into
-ReplaceString=New string
-CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
-LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
-Dynamiccontent=Sample of a page with dynamic content
-ImportSite=Import website template
-EditInLineOnOff=Mode 'Edit inline' is %s
-ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s
-GlobalCSSorJS=Global CSS/JS/Header file of web site
-BackToHomePage=Back to home page...
-TranslationLinks=Translation links
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
-UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters
-MainLanguage=Main language
-OtherLanguages=Other languages
-UseManifest=Provide a manifest.json file
-PublicAuthorAlias=Public author alias
-AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
-ReplacementDoneInXPages=Replacement done in %s pages or containers
+AddWebsiteAccount=Crear unha conta de sitio web
+BackToListForThirdParty=Votar á listaxe do terceiros
+DisableSiteFirst=Desactivar primeiro o sitio web
+MyContainerTitle=Título do sitio web
+AnotherContainer=Isto é como incluír contido doutra páxina/contedor (pode ter un erro aquí se activa o código dinámico porque o subcontedor incrustado pode que non exista)
+SorryWebsiteIsCurrentlyOffLine=Sentímolo, este sitio web está actualmente fóra de liña. Por favor, volte máis tarde ...
+WEBSITE_USE_WEBSITE_ACCOUNTS=Activar a táboa de contas do sitio web
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Habilite a táboa para almacenar as contas do sitio web (inicio de sesión/contrasinal) para cada sitio web/terceiro
+YouMustDefineTheHomePage=Primeiro debe definir a páxina de inicio predeterminada
+OnlyEditionOfSourceForGrabbedContentFuture=Aviso: a creación dunha páxina web importando unha páxina web externa está reservada a usuarios experimentados. Dependendo da complexidade da páxina de orixe, o resultado da importación pode diferir do orixinal. Tamén se a páxina de orixe usa estilos CSS comúns ou javascript en conflito, pode rachar o aspecto ou as características do editor de sitios web cando se traballa nesta páxina. Este método é un xeito máis rápido de crear unha páxina, pero recoméndase crear a súa nova páxina desde cero ou a partir dun modelo de páxina suxerido. <br> Teña en conta tamén que é posible que o editor en liña non funcione correctamente cando se usa nunha páxina externa.
+OnlyEditionOfSourceForGrabbedContent=Só é posible a edición de orixe HTML cando se capturou contido dun sitio externo
+GrabImagesInto=Toma tamén imaxes atopadas en css e páxina.
+ImagesShouldBeSavedInto=As imaxes deberían gardarse no directorio
+WebsiteRootOfImages=Directorio raíz para as imaxes do sitio web
+SubdirOfPage=Subdirectorio adicado á páxina
+AliasPageAlreadyExists=A páxina de alias <strong>%s </strong> xa existe
+CorporateHomePage=Páxina de inicio da empresa
+EmptyPage=Páxina baleira
+ExternalURLMustStartWithHttp=O URL externo debe comezar con http:// ou https://
+ZipOfWebsitePackageToImport=Cargue o ficheiro Zip do paquete de modelos do sitio web
+ZipOfWebsitePackageToLoad=ou Escolla un paquete de modelo de sitio web incrustado dispoñible
+ShowSubcontainers=Mostrar contido dinámico
+InternalURLOfPage=URL interno da páxina
+ThisPageIsTranslationOf=Esta páxina/contedor é unha tradución de
+ThisPageHasTranslationPages=Esta páxina/contedor ten tradución
+NoWebSiteCreateOneFirst=Aínda non se creou ningún sitio web. Cree un primeiro.
+GoTo=Ir a
+DynamicPHPCodeContainsAForbiddenInstruction=Engade un código PHP dinámico que contén a instrución PHP '<strong>%s </strong>' que está prohibida por defecto como contido dinámico (ver as opcións ocultas WEBSITE_PHP_ALLOW_xxx para aumentar a lista de comandos permitidos).
+NotAllowedToAddDynamicContent=Non ten permiso para engadir ou editar contido dinámico PHP en sitios web. Solicite permiso ou simplemente manteña o código nas etiquetas PHP sen modificar.
+ReplaceWebsiteContent=Buscar ou substituír contido do sitio web
+DeleteAlsoJs=¿Eliminar tamén todos os ficheiros javascript específicos deste sitio web?
+DeleteAlsoMedias=¿Quere eliminar tamén todos os ficheiros multimedia específicos deste sitio web?
+MyWebsitePages=Páxinas do sitio web
+SearchReplaceInto=Buscar|Substituir por
+ReplaceString=Nova cadea
+CSSContentTooltipHelp=Introduza aquí contido CSS. Para evitar calquera conflito co CSS da aplicación, asegúrese de antepoñer toda a declaración coa clase .bodywebsite. Por exemplo: <br> <br> #mycssselector, input.myclass:hover {...} <br> debe ser <br> .bodywebsite #mycssselector,.bodywebsite input.myclass:hover {...} <br> <br> Nota: Se ten un ficheiro grande sen este prefixo, pode usar "lessc" para convertelo para engadir o prefixo .bodywebsite en todas partes.
+LinkAndScriptsHereAreNotLoadedInEditor=Aviso: este contido só se emite cando se accede ao sitio desde un servidor. Non se usa no modo de edición, polo que se precisa cargar ficheiros javascript tamén no modo de edición, só ten que engadir a súa etiqueta 'script src=...' á páxina.
+Dynamiccontent=Mostra dunha páxina con contido dinámico
+ImportSite=Importar prantilla de sitio web
+EditInLineOnOff=O modo 'Editar en liña' é %s
+ShowSubContainersOnOff=O modo para executar "contido dinámico" é %s
+GlobalCSSorJS=Ficheiro global CSS/JS/Header do sitio web
+BackToHomePage=Voltar á páxina de inicio ...
+TranslationLinks=Ligazóns de tradución
+YouTryToAccessToAFileThatIsNotAWebsitePage=Tenta acceder a unha páxina que non está dispoñible. <br> (ref =%s, type =%s, status =%s)
+UseTextBetween5And70Chars=Para boas prácticas de SEO, use un texto de entre 5 e 70 caracteres
+MainLanguage=Idioma principal
+OtherLanguages=​​ Outros idiomas
+UseManifest=Proporciona un ficheiro manifest.json
+PublicAuthorAlias=​​ Alias ​​de autor público
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Os idiomas dispoñibles defínense nas propiedades do sitio web
+ReplacementDoneInXPages=Substitución feita en %s páxinas ou contedores
 RSSFeed=Fíos RSS
-RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
-PagesRegenerated=%s page(s)/container(s) regenerated
-RegenerateWebsiteContent=Regenerate web site cache files
-AllowedInFrames=Allowed in Frames
+RSSFeedDesc=Pode obter unha fonte RSS dos últimos artigos co tipo 'blogpost' usando este URL
+PagesRegenerated=%s páxina(s)/contedor(es) rexenerados
+RegenerateWebsiteContent=Rexenerar ficheiros de caché do sitio web
+AllowedInFrames=Permitido en marcos
+DefineListOfAltLanguagesInWebsiteProperties=Define a listaxe de todos os idiomas dispoñibles nas propiedades do sitio web.
diff --git a/htdocs/langs/gl_ES/withdrawals.lang b/htdocs/langs/gl_ES/withdrawals.lang
index 396c348cb5f..ecb3e21ff85 100644
--- a/htdocs/langs/gl_ES/withdrawals.lang
+++ b/htdocs/langs/gl_ES/withdrawals.lang
@@ -1,16 +1,16 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Payments by Direct debit orders
-SuppliersStandingOrdersArea=Payments by Credit transfer
-StandingOrdersPayment=Direct debit payment orders
+CustomersStandingOrdersArea=Área domiciliacións
+SuppliersStandingOrdersArea=Área domiciliacións
+StandingOrdersPayment=Domiciliacións
 StandingOrderPayment=Domiciliación
-NewStandingOrder=New direct debit order
-NewPaymentByBankTransfer=New payment by credit transfer
+NewStandingOrder=Nova domiciliación
+NewPaymentByBankTransfer=Novo pagamenyo por transferencia
 StandingOrderToProcess=A procesar
-PaymentByBankTransferReceipts=Credit transfer orders
+PaymentByBankTransferReceipts=Solicitudes de transferencia
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Domiciliacións
 WithdrawalReceipt=Domiciliación
-BankTransferReceipts=Credit transfer orders
+BankTransferReceipts=Solicitudes de transferencia
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -18,131 +18,134 @@ WithdrawalsLine=Direct debit order line
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
-RequestStandingOrderToTreat=Requests for direct debit payment order to process
-RequestStandingOrderTreated=Requests for direct debit payment order processed
+RequestStandingOrderToTreat=Peticións de domiciliacións a procesar
+RequestStandingOrderTreated=Peticións de domiciliacións procesadas
 RequestPaymentsByBankTransferToTreat=Requests for credit transfer to process
 RequestPaymentsByBankTransferTreated=Requests for credit transfer processed
-NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=No. of qualified customer invoices with waiting direct debit order
-NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Aínda non é posible. O estado da domiciliación debe ser 'abonada' antes de poder realizar devolucións as súas líñas
+NbOfInvoiceToWithdraw=Nº de facturas pendentes de domiciliación
+NbOfInvoiceToWithdrawWithInfo=Número de facturas agardando domiciliación para clientes que teñen o seu número de conta definida
 NbOfInvoiceToPayByBankTransfer=No. of qualified supplier invoices waiting for a payment by credit transfer
 SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by credit transfer
-InvoiceWaitingWithdraw=Invoice waiting for direct debit
+InvoiceWaitingWithdraw=Facturas agardando domiciliación
 InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
-AmountToWithdraw=Amount to withdraw
+AmountToWithdraw=Cantidade a domiciliar
 NoInvoiceToWithdraw=No invoice open for '%s' is waiting. Go on tab '%s' on invoice card to make a request.
 NoSupplierInvoiceToWithdraw=No supplier invoice with open 'Direct credit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=User Responsible
-WithdrawalsSetup=Direct debit payment setup
-CreditTransferSetup=Credit transfer setup
-WithdrawStatistics=Direct debit payment statistics
-CreditTransferStatistics=Credit transfer statistics
+ResponsibleUser=Usuario responsable das domiciliacións
+WithdrawalsSetup=Configuración das domiciliacións
+CreditTransferSetup=Configuración das transferencias
+WithdrawStatistics=Estatísticas de domiciliacións
+CreditTransferStatistics=Estatísticas das transferencias
 Rejects=Devolucións
-LastWithdrawalReceipt=Latest %s direct debit receipts
-MakeWithdrawRequest=Make a direct debit payment request
-MakeBankTransferOrder=Make a credit transfer request
-WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Third-party bank code
+LastWithdrawalReceipt=As %s últimas domiciliacións
+MakeWithdrawRequest=Realizar unha petición de domiciliación
+MakeBankTransferOrder=Realizar unha petición de transferencia
+WithdrawRequestsDone=%s domiciliacións rexistradas
+BankTransferRequestsDone=%s transferencias rexistradas
+ThirdPartyBankCode=Código banco do terceiro
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
-ClassCredited=Classify credited
-ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
-TransData=Transmission date
-TransMetod=Transmission method
-Send=Send
-Lines=Lines
-StandingOrderReject=Issue a rejection
-WithdrawsRefused=Direct debit refused
+ClassCredited=Clasificar como "Abonada"
+ClassCreditedConfirm=¿Está certo de querer clasificar esta domiciliación como abonada na súa conta bancaria?
+TransData=Data envío
+TransMetod=Método envío
+Send=Enviar
+Lines=Líñas
+StandingOrderReject=Emitir unha devolución
+WithdrawsRefused=Devolución de domiciliación
 WithdrawalRefused=Withdrawal refused
 CreditTransfersRefused=Credit transfers refused
-WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society
-RefusedData=Date of rejection
-RefusedReason=Reason for rejection
-RefusedInvoicing=Billing the rejection
-NoInvoiceRefused=Do not charge the rejection
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
-StatusDebitCredit=Status debit/credit
-StatusWaiting=Waiting
-StatusTrans=Enviado
+WithdrawalRefusedConfirm=¿Está certo de querer crear unha devolución de domiciliación para a empresa
+RefusedData=Data de devolución
+RefusedReason=Motivo de devolución
+RefusedInvoicing=Facturación da devolución
+NoInvoiceRefused=Non facturar a devolución
+InvoiceRefused=Factura rexeitada (Cargar os gastos ao cliente)
+StatusDebitCredit=Estado de débito/crédito
+StatusWaiting=Agardando
+StatusTrans=Enviada
 StatusDebited=Debited
-StatusCredited=Credited
-StatusPaid=Pagada
-StatusRefused=Rexeitado
-StatusMotif0=Unspecified
-StatusMotif1=Insufficient funds
-StatusMotif2=Request contested
-StatusMotif3=No direct debit payment order
-StatusMotif4=Pedido de cliente
-StatusMotif5=RIB unusable
-StatusMotif6=Account without balance
-StatusMotif7=Judicial Decision
-StatusMotif8=Other reason
-CreateForSepaFRST=Create direct debit file (SEPA FRST)
-CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
-CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create file for credit transfer
-CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
-CreateGuichet=Only office
-CreateBanque=Only bank
-OrderWaiting=Waiting for treatment
-NotifyTransmision=Record file transmission of order
-NotifyCredit=Record credit of order
-NumeroNationalEmetter=National Transmitter Number
-WithBankUsingRIB=For bank accounts using RIB
-WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Receiving Bank Account
+StatusCredited=Abonada
+StatusPaid=Paga
+StatusRefused=Rexeitada
+StatusMotif0=Non especificado
+StatusMotif1=Fondos insuficintes
+StatusMotif2=Solicitude rexeitada
+StatusMotif3=Sen domiciliacións
+StatusMotif4=Pedimento do cliente
+StatusMotif5=Conta inexistente
+StatusMotif6=Conta sen saldo
+StatusMotif7=Decisión xudicial
+StatusMotif8=Outro motivo
+CreateForSepaFRST=Domiciliar (SEPA FRST)
+CreateForSepaRCUR=Domiciliar (SEPA RCUR)
+CreateAll=Domiciliar (todas)
+CreateFileForPaymentByBankTransfer=Crear un ficheiro para a transferencia
+CreateSepaFileForPaymentByBankTransfer=Crear un ficheiro de transferencia (SEPA)
+CreateGuichet=Só oficina
+CreateBanque=Só banco
+OrderWaiting=Agardando proceso
+NotifyTransmision=Envío de domiciliación
+NotifyCredit=Abono de domiciliación
+NumeroNationalEmetter=Número Nacional do Emisor
+WithBankUsingRIB=Para as contas bancarias que utilizan RIB
+WithBankUsingBANBIC=Para as contas bancarias que utilizan o código BAN/BIC/SWIFT
+BankToReceiveWithdraw=Conta bancaria para recibir a domiciliación
 BankToPayCreditTransfer=Bank Account used as source of payments
-CreditDate=Credit on
+CreditDate=Abonada o
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Show Direct Debit Order
+ShowWithdraw=Ver domiciliación
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
 DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
 WithdrawalFile=Debit order file
 CreditTransferFile=Credit transfer file
-SetToStatusSent=Set to status "File Sent"
-ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
-StatisticsByLineStatus=Statistics by status of lines
-RUM=UMR
-DateRUM=Mandate signature date
-RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
-WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Amount of Direct debit request:
+SetToStatusSent=Clasificar como "Ficheiro enviado"
+ThisWillAlsoAddPaymentOnInvoice=Isto tamén rexistrará os pagos nas facturas e clasificaos como "Pagados" se queda por pagar é nulo
+StatisticsByLineStatus=Estatísticas por estado das liñas
+RUM=RUM
+DateRUM=Data da sinatura do mandato
+RUMLong=Referencia única do mandato
+RUMWillBeGenerated=Se está baleiro, o número RUM /Referencia Única do Mandato) xérase unha vez gardada a información da conta bancaria
+WithdrawMode=Modo domiciliación (FRST o RECUR)
+WithdrawRequestAmount=Importe da domiciliación
 BankTransferAmount=Amount of Credit Transfer request:
-WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
-SepaMandate=SEPA Direct Debit Mandate
-SepaMandateShort=SEPA Mandate
-PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
-SEPALegalText=By signing this mandate form, you authorize (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
-CreditorIdentifier=Creditor Identifier
-CreditorName=Creditor Name
-SEPAFillForm=(B) Please complete all the fields marked *
-SEPAFormYourName=Your name
-SEPAFormYourBAN=Your Bank Account Name (IBAN)
-SEPAFormYourBIC=Your Bank Identifier Code (BIC)
-SEPAFrstOrRecur=Type of payment
-ModeRECUR=Recurring payment
-ModeFRST=One-off payment
-PleaseCheckOne=Please check one only
+WithdrawRequestErrorNilAmount=Non é posible crear unha domiciliación sen importe
+SepaMandate=Mandato SEPA
+SepaMandateShort=Mandato SEPA
+PleaseReturnMandate=Envíe de volta este formulario de mandato por correo electrónico a %s ou por correo a
+SEPALegalText=Ao asinar este mandato, autoriza (A) %s a enviar instruccións ao seu banco para cargar na súa conta e (B) ao seu banco para cargar na súa conta en acordo coas instruccións de %s. Como parte dos seus dereitos, ten dereito a unha devolución nos termos e condicións do seu contrato co seu banco. Unha devolución debe reclamarse dentro de 8 semanas a partires da data na que foi realizado o cargo a súa conta. Os seus dereitos con respeito ao mandato anterior explícanse nun comunicado que pode obter do seu banco.
+CreditorIdentifier=Identificador Acredor
+CreditorName=Nome acredor
+SEPAFillForm=(B) Cubra todos os campos marcados con *
+SEPAFormYourName=O seu nome
+SEPAFormYourBAN=IBAN da  súa conta bancaria
+SEPAFormYourBIC=BIC do seu banco
+SEPAFrstOrRecur=Tipo de pagamento
+ModeRECUR=Pago recorrente
+ModeFRST=Pago único
+PleaseCheckOne=Escolla só un
 CreditTransferOrderCreated=Credit transfer order %s created
-DirectDebitOrderCreated=Direct debit order %s created
-AmountRequested=Amount requested
+DirectDebitOrderCreated=Domiciliación %s creada
+AmountRequested=Importe solicitado
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
-ExecutionDate=Execution date
-CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
-END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
-USTRD="Unstructured" SEPA XML tag
-ADDDAYS=Add days to Execution Date
-NoDefaultIBANFound=No default IBAN found for this third party
+ExecutionDate=Data de execución
+CreateForSepa=Crear ficheiro de domiciliación bancaria
+ICS=Identificador de acreedor CI
+ICSTransfer=Creditor Identifier CI for bank transfer
+END_TO_END=Etiqueta XML SEPA "EndToEndId" - ID único asignada por transacción
+USTRD=Etiqueta SEPA XML "Unstructured"
+ADDDAYS=Engadir días á data de execución
+NoDefaultIBANFound=Non atopouse o IBAN deste terceiro
 ### Notifications
-InfoCreditSubject=Payment of direct debit payment order %s by the bank
-InfoCreditMessage=The direct debit payment order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of direct debit payment order %s to bank
-InfoTransMessage=The direct debit payment order %s has been sent to bank by %s %s.<br><br>
-InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
-InfoRejectSubject=Direct debit payment order refused
-InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
-ModeWarning=Option for real mode was not set, we stop after this simulation
-ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+InfoCreditSubject=Abono de domiciliación %s polo banco
+InfoCreditMessage=A orde de domiciliación %s foi abonada polo banco<br>Data de abono: %s
+InfoTransSubject=Envío de domiciliación %s ao banco
+InfoTransMessage=A orde de domiciliación %s foi enviada ao banco por %s %s.<br><br>
+InfoTransData=Importe: %s<br>Método: %s<br>Data: %s
+InfoRejectSubject=Domiciliación devolta
+InfoRejectMessage=Bos días:<br><br>a domiciliación da factura %s por conta da empresa %s, cun importe de %s foi devolta polo banco.<br><br>--<br>%s
+ModeWarning=Non estableceuse a opción de modo real, deteremonos despois desta simulación
+ErrorCompanyHasDuplicateDefaultBAN=A empresa co identificador %s ten máis dunha conta bancaria predeterminada. Non hai xeito de saber cal usar.
+ErrorICSmissing=Falta o ICS na conta bancaria% s
diff --git a/htdocs/langs/gl_ES/workflow.lang b/htdocs/langs/gl_ES/workflow.lang
index 299be277e1d..18a8d3f5eb7 100644
--- a/htdocs/langs/gl_ES/workflow.lang
+++ b/htdocs/langs/gl_ES/workflow.lang
@@ -1,23 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
-WorkflowSetup=Workflow module setup
-WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
-ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+WorkflowSetup=Configuración do modulo Fluxo de Traballo
+WorkflowDesc=Este módulo permite algunhas accíóns automátizadas. Por defecto, o fluxo de traballo está aberto (podense facer cousas na orde desexada) mais aquí pode activar algunhas accións automátizadas.
+ThereIsNoWorkflowToModify=No hai dispoñibles modificacións de fluxo de traballo nos módulos activados.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crear automáticamente un pedimento de cliente despois da sinatura dun orzamento (o novo pedimento terá o mesmo importe que o orzamento)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crear automáticamente una factura a cliente despois da sinatura dun orzamento (a nova factura terá o mesmo importe que o orzamento)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crear unha factura a cliente automáticamente despois de validar un contrato
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crear automáticamente unha factura a cliente despois de pechar o pedimento de cliente ( nova factura terá o mesmo importe que o pedimento)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasificar orzamento(s) orixe como facturado cando o pedimento do cliente sexa marcado como facturado (e se o importe do pedimento é igual á suma dos importes dos orzamentos relacionados)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Clasificar os orzamento(s) orixe como facturados cando a factura ao cliente sexa validada (e se o importe da factura é igual á suma dos importes dos orzamentos relacionados)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasificar pedimento(s) de cliente orixe como facturado cando a factura ao cliente sexa validada (e se o importe da factura é igual á suma dos importes dos pedimentos relacionados)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasificar pedimento(s) de cliente orixe como facturado cando a factura ao cliente sexa marcada como pagada (e se o importe da factura é igual á suma dos importes dos pedimentos relacionados)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasificar automáticamente o pedimento orixe como enviado cando o envío sexa validado (e se a cantidade enviada por todos os envíos é a mesma que o pedimento a actualizar)
 # Autoclassify purchase order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
-descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasificar os orzamento(s) de provedor orixe como facturado(s) cando a factura de provedor sexa validada (e se o importe da factura é igual á suma dos importes dos orzamentos relacionados)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasificar pedimento(s) a provedor orixe como facturado(s) cando a factura de provedor sexa validada (e se o importe da factura é igual á suma dos importes dos pedimentos relacionados)
+descWORKFLOW_BILL_ON_RECEPTION=Clasificar recepcións a "facturado" cando sexa validado un pedido de provedor relacionado
 # Autoclose intervention
-descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
-AutomaticCreation=Automatic creation
-AutomaticClassification=Automatic classification
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Pecha todas as intervencións ligadas ao ticket cando o ticket está pechado
+AutomaticCreation=Creación automática
+AutomaticClassification=Clasificación automática
diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang
index 3211a0b62df..33ba4d9fea7 100644
--- a/htdocs/langs/he_IL/accountancy.lang
+++ b/htdocs/langs/he_IL/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index e630e1c2258..1aa36f4265d 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -56,6 +56,8 @@ GUISetup=להציג
 SetupArea=הגדרת
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=טופס לבדוק העלאת קובץ (על פי ההגדרה)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=הערה: כן, הוא יעיל רק אם <b>%s</b> מודול מופעלת
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=הצג תצוגה מקדימה
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=לא זמין תצוגה מקדימה
 ThemeCurrentlyActive=פעיל כרגע הנושא
-CurrentTimeZone=אזור PHP (שרת)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=מרחב
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=לטהר עכשיו
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=עבור המשתמש או תיעוד של מפתח (דוק, שאלות ...) <br> תסתכל על ויקי Dolibarr: <br> <a href="%s" target="_blank"><b>%s</b></a>
 ForAnswersSeeForum=אם יש לך שאלות נוספות / עזרה, אתה יכול להשתמש בפורום Dolibarr: <br> <a href="%s" target="_blank"><b>%s</b></a>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=רשימה של ספריות ותבניות OpenDocument
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=דוגמאות תחביר: <br> c: \\ mydir <br> / Home / mydir <br> DOL_DATA_ROOT / ECM / ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> לדעת איך ליצור תבניות ODT המסמכים שלך, לפני אחסונם ספריות אלה, קרא את התיעוד wiki:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=עמדת שם / שם משפחה
@@ -406,7 +408,7 @@ UrlGenerationParameters=פרמטרים כדי להבטיח את כתובות ה
 SecurityTokenIsUnique=השתמש פרמטר ייחודי securekey עבור כל כתובת אתר
 EnterRefToBuildUrl=הזן התייחסות %s אובייקט
 GetSecuredUrl=לקבל את כתובת האתר מחושב
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=תפריט חדש
 MenuHandler=תפריט המטפל
 MenuModule=מקור מודול
-HideUnauthorizedMenu= הסתר תפריטים בלתי מורשים (אפור)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=מזהה התפריט
 DetailMenuHandler=תפריט המטפל היכן להציג תפריט חדש
 DetailMenuModule=שם מודול אם סעיף מתפריט באים מודול
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=רוכסן
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/he_IL/banks.lang b/htdocs/langs/he_IL/banks.lang
index 9500a5b8b2e..a0dc27f86c4 100644
--- a/htdocs/langs/he_IL/banks.lang
+++ b/htdocs/langs/he_IL/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/he_IL/blockedlog.lang b/htdocs/langs/he_IL/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/he_IL/blockedlog.lang
+++ b/htdocs/langs/he_IL/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/he_IL/boxes.lang b/htdocs/langs/he_IL/boxes.lang
index 5fe5dc964a7..206876321c5 100644
--- a/htdocs/langs/he_IL/boxes.lang
+++ b/htdocs/langs/he_IL/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/he_IL/cashdesk.lang b/htdocs/langs/he_IL/cashdesk.lang
index 0e214defc7a..ddc13c48ea3 100644
--- a/htdocs/langs/he_IL/cashdesk.lang
+++ b/htdocs/langs/he_IL/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/he_IL/categories.lang b/htdocs/langs/he_IL/categories.lang
index c8bfcef77e2..d01b7fcecb9 100644
--- a/htdocs/langs/he_IL/categories.lang
+++ b/htdocs/langs/he_IL/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=משלימים תכונות
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/he_IL/companies.lang b/htdocs/langs/he_IL/companies.lang
index 2537b7e9b2f..d1b5cde4dac 100644
--- a/htdocs/langs/he_IL/companies.lang
+++ b/htdocs/langs/he_IL/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang
index 3dd45972e01..6635b8b2829 100644
--- a/htdocs/langs/he_IL/compta.lang
+++ b/htdocs/langs/he_IL/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/he_IL/cron.lang b/htdocs/langs/he_IL/cron.lang
index d2da7ded67e..2ebdda1e685 100644
--- a/htdocs/langs/he_IL/cron.lang
+++ b/htdocs/langs/he_IL/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Create/update Scheduled job
 Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
-CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+CronSetup=Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -56,16 +58,16 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Shell command
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
 ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/he_IL/exports.lang b/htdocs/langs/he_IL/exports.lang
index 2dcf4317e00..a0eb7161ef2 100644
--- a/htdocs/langs/he_IL/exports.lang
+++ b/htdocs/langs/he_IL/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Step
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/he_IL/mails.lang b/htdocs/langs/he_IL/mails.lang
index 041207e7c48..e31708339bb 100644
--- a/htdocs/langs/he_IL/mails.lang
+++ b/htdocs/langs/he_IL/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=הודעות
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index f6d4759a902..4371c400dc0 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+CurrentTimeZone=אזור PHP (שרת)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/he_IL/modulebuilder.lang b/htdocs/langs/he_IL/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/he_IL/modulebuilder.lang
+++ b/htdocs/langs/he_IL/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang
index 374c864f7dc..9daefe2e59c 100644
--- a/htdocs/langs/he_IL/other.lang
+++ b/htdocs/langs/he_IL/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index fe9deabbb4e..19febde0e82 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/he_IL/recruitment.lang b/htdocs/langs/he_IL/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/he_IL/recruitment.lang
+++ b/htdocs/langs/he_IL/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/he_IL/sendings.lang b/htdocs/langs/he_IL/sendings.lang
index 80e3aa3af9c..17d8f937b82 100644
--- a/htdocs/langs/he_IL/sendings.lang
+++ b/htdocs/langs/he_IL/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Other shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Shipments to validate
 StatusSendingCanceled=Canceled
+StatusSendingCanceledShort=Canceled
 StatusSendingDraft=Draft
 StatusSendingValidated=Validated (products to ship or already shipped)
 StatusSendingProcessed=Processed
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/he_IL/stocks.lang b/htdocs/langs/he_IL/stocks.lang
index 8907a4d5091..d99d23d1d18 100644
--- a/htdocs/langs/he_IL/stocks.lang
+++ b/htdocs/langs/he_IL/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/he_IL/ticket.lang b/htdocs/langs/he_IL/ticket.lang
index a8353b66744..39e0b9f8175 100644
--- a/htdocs/langs/he_IL/ticket.lang
+++ b/htdocs/langs/he_IL/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=אחר
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/he_IL/website.lang b/htdocs/langs/he_IL/website.lang
index bc14948946c..e476cd982a3 100644
--- a/htdocs/langs/he_IL/website.lang
+++ b/htdocs/langs/he_IL/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/he_IL/withdrawals.lang b/htdocs/langs/he_IL/withdrawals.lang
index 114a8d9dd6c..e3bec6f9cb8 100644
--- a/htdocs/langs/he_IL/withdrawals.lang
+++ b/htdocs/langs/he_IL/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/hi_IN/accountancy.lang b/htdocs/langs/hi_IN/accountancy.lang
index 0afe8f7a50d..c137d53be96 100644
--- a/htdocs/langs/hi_IN/accountancy.lang
+++ b/htdocs/langs/hi_IN/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/hi_IN/admin.lang b/htdocs/langs/hi_IN/admin.lang
index 976284cbff1..3704cf5a9cc 100644
--- a/htdocs/langs/hi_IN/admin.lang
+++ b/htdocs/langs/hi_IN/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=List of OpenDocument templates directories
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Position of Name/Lastname
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu handler where to show new menu
 DetailMenuModule=Module name if menu entry come from a module
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/hi_IN/banks.lang b/htdocs/langs/hi_IN/banks.lang
index 9500a5b8b2e..a0dc27f86c4 100644
--- a/htdocs/langs/hi_IN/banks.lang
+++ b/htdocs/langs/hi_IN/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/hi_IN/blockedlog.lang b/htdocs/langs/hi_IN/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/hi_IN/blockedlog.lang
+++ b/htdocs/langs/hi_IN/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/hi_IN/boxes.lang b/htdocs/langs/hi_IN/boxes.lang
index d6fd298a3a7..7db4ea8aa17 100644
--- a/htdocs/langs/hi_IN/boxes.lang
+++ b/htdocs/langs/hi_IN/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/hi_IN/cashdesk.lang b/htdocs/langs/hi_IN/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/hi_IN/cashdesk.lang
+++ b/htdocs/langs/hi_IN/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/hi_IN/categories.lang b/htdocs/langs/hi_IN/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/hi_IN/categories.lang
+++ b/htdocs/langs/hi_IN/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/hi_IN/companies.lang b/htdocs/langs/hi_IN/companies.lang
index e9f51f14885..1481398db45 100644
--- a/htdocs/langs/hi_IN/companies.lang
+++ b/htdocs/langs/hi_IN/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/hi_IN/compta.lang b/htdocs/langs/hi_IN/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/hi_IN/compta.lang
+++ b/htdocs/langs/hi_IN/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/hi_IN/cron.lang b/htdocs/langs/hi_IN/cron.lang
index 1de1251831a..2ebdda1e685 100644
--- a/htdocs/langs/hi_IN/cron.lang
+++ b/htdocs/langs/hi_IN/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup=Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
 CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Number of launches
 CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -56,7 +58,7 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
 DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/hi_IN/errors.lang b/htdocs/langs/hi_IN/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/hi_IN/errors.lang
+++ b/htdocs/langs/hi_IN/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
 ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/hi_IN/exports.lang b/htdocs/langs/hi_IN/exports.lang
index 3549e3f8b23..a0eb7161ef2 100644
--- a/htdocs/langs/hi_IN/exports.lang
+++ b/htdocs/langs/hi_IN/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/hi_IN/mails.lang b/htdocs/langs/hi_IN/mails.lang
index 1235eef3b27..7fd93be7b71 100644
--- a/htdocs/langs/hi_IN/mails.lang
+++ b/htdocs/langs/hi_IN/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/hi_IN/main.lang b/htdocs/langs/hi_IN/main.lang
index 50363abd476..d44adf6c9fb 100644
--- a/htdocs/langs/hi_IN/main.lang
+++ b/htdocs/langs/hi_IN/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/hi_IN/modulebuilder.lang b/htdocs/langs/hi_IN/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/hi_IN/modulebuilder.lang
+++ b/htdocs/langs/hi_IN/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/hi_IN/other.lang b/htdocs/langs/hi_IN/other.lang
index 54c0572d453..0a7b3723ab1 100644
--- a/htdocs/langs/hi_IN/other.lang
+++ b/htdocs/langs/hi_IN/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/hi_IN/products.lang b/htdocs/langs/hi_IN/products.lang
index 97db059594f..f0c4a5362b8 100644
--- a/htdocs/langs/hi_IN/products.lang
+++ b/htdocs/langs/hi_IN/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/hi_IN/recruitment.lang b/htdocs/langs/hi_IN/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/hi_IN/recruitment.lang
+++ b/htdocs/langs/hi_IN/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/hi_IN/sendings.lang b/htdocs/langs/hi_IN/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/hi_IN/sendings.lang
+++ b/htdocs/langs/hi_IN/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Other shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Shipments to validate
 StatusSendingCanceled=Canceled
+StatusSendingCanceledShort=Canceled
 StatusSendingDraft=Draft
 StatusSendingValidated=Validated (products to ship or already shipped)
 StatusSendingProcessed=Processed
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/hi_IN/stocks.lang b/htdocs/langs/hi_IN/stocks.lang
index 660443bcded..6cf089096dd 100644
--- a/htdocs/langs/hi_IN/stocks.lang
+++ b/htdocs/langs/hi_IN/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/hi_IN/ticket.lang b/htdocs/langs/hi_IN/ticket.lang
index 59519282c80..982fff90ffa 100644
--- a/htdocs/langs/hi_IN/ticket.lang
+++ b/htdocs/langs/hi_IN/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/hi_IN/website.lang b/htdocs/langs/hi_IN/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/hi_IN/website.lang
+++ b/htdocs/langs/hi_IN/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/hi_IN/withdrawals.lang b/htdocs/langs/hi_IN/withdrawals.lang
index 114a8d9dd6c..e3bec6f9cb8 100644
--- a/htdocs/langs/hi_IN/withdrawals.lang
+++ b/htdocs/langs/hi_IN/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
index d3f1ceacc61..8dc3ede2487 100644
--- a/htdocs/langs/hr_HR/accountancy.lang
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Oznaka računa
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Broj komada
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index 073e9232710..106fe1407cf 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Prikaz
 SetupArea=Postavke
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Obrazac za testiranje uploada datoteka (sukladno postavkama)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Napomena: DA je efektivno samo ako je modul <b>%s</b> omogućen
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Prikaži pregled
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Pregled nije dostupan
 ThemeCurrentlyActive=Tema trenutno aktivna
-CurrentTimeZone=Vremenska zona PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Razmak
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Trajno izbriši
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Obriši privremene datoteke
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Izbriši sada
 PurgeNothingToDelete=Nema mapa i datoteka za brisanje.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferirani partneri
 OtherResources=Drugi izvori
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=Za korisničku ili razvojnu dokumentciju ( DOC, FAQ...)<br> pogledajte na Dolibarr Wiki-u:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Za sva ostala pitanja/pomoć, obratite se na Dolibarr forumu:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=Popis mapa sa OpenDocument predlošcima
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Primjer:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Da bi ste saznali kako kreirati ODT predloške dokumenata, prije pohranjivanja istih u navedene mape, pročitajte wiki dokumentaciju na:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Pozicija Imena/Prezimena
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parametri za osiguranje URL-a
 SecurityTokenIsUnique=Koristi jedinstven securekey parametar za svaki URL
 EnterRefToBuildUrl=Unesite referencu za objekt %s
 GetSecuredUrl=Traži izračunan URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Stara stopa PDV-a
 NewVATRates=Nova stopa PDV-a
 PriceBaseTypeToChange=Promjeni cijene sa baznom referentnom vrijednosti definiranoj na
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Osobni izbornici nisu povezani na gornji izbornik
 NewMenu=Novi izbornik
 MenuHandler=Nosioc izbornika
 MenuModule=Izvorni modul
-HideUnauthorizedMenu= Sakrij neautorizirane izbornike (sivo)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=ID Izbornika
 DetailMenuHandler=Nosioc izbornika gdje da se prikaže novi izbornik
 DetailMenuModule=Naziv modula ako stavka izbornika dolazi iz modula
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=PBR
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/hr_HR/banks.lang b/htdocs/langs/hr_HR/banks.lang
index 722bbc6949d..8f4eededff5 100644
--- a/htdocs/langs/hr_HR/banks.lang
+++ b/htdocs/langs/hr_HR/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/hr_HR/blockedlog.lang b/htdocs/langs/hr_HR/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/hr_HR/blockedlog.lang
+++ b/htdocs/langs/hr_HR/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/hr_HR/boxes.lang b/htdocs/langs/hr_HR/boxes.lang
index 91564430c76..78c566be990 100644
--- a/htdocs/langs/hr_HR/boxes.lang
+++ b/htdocs/langs/hr_HR/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Zadnjih %s izmjenjenih donacija
 BoxTitleLastModifiedExpenses=Zadnjih %s izmjenjenih izvještaja troškova
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Globalna aktivnost (računi, prijedlozi, nalozi)
 BoxGoodCustomers=Dobar kupac
 BoxTitleGoodCustomers=%s dobrih kupaca
+BoxScheduledJobs=Planirani poslovi
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Datum zadnjeg osvježavanja
 NoRecordedBookmarks=Nema definiranih oznaka.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Računovodstvo
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/hr_HR/cashdesk.lang b/htdocs/langs/hr_HR/cashdesk.lang
index f03eb1340b0..ac1d97cc447 100644
--- a/htdocs/langs/hr_HR/cashdesk.lang
+++ b/htdocs/langs/hr_HR/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Broj računa
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/hr_HR/categories.lang b/htdocs/langs/hr_HR/categories.lang
index b3f785c8df7..38b81102ca5 100644
--- a/htdocs/langs/hr_HR/categories.lang
+++ b/htdocs/langs/hr_HR/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Sučelje kategorija projekata
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=Popis kategorija
+CatListAll=List of tags/categories (all types)
 NewCategory=Nova kategorija
 ModifCat=Promjeni kategoriju
 CatCreated=Kategorija kreirana
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=ID Kategorije
-CatSupList=List of vendor tags/categories
-CatCusList=Popis kategorija kupaca/potencijalnih kupaca
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Popis kategorija proizvoda
 CatMemberList=Popis kategorija članova
-CatContactList=Popis kategorija kontakta
-CatSupLinks=Veze između dobavljača i kategorija
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Veze između kupaca/potencijalnih kupaca i kategorija
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Veze izmeđi proizvoda/usluga i kategorija
-CatProJectLinks=Veze između projekata i kategorija
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Veze između projekata i kategorija
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Makni iz kategorije
 ExtraFieldsCategories=Dodatni atributi
 CategoriesSetup=Podešavanje kategorija
diff --git a/htdocs/langs/hr_HR/companies.lang b/htdocs/langs/hr_HR/companies.lang
index 70f428267e7..ab89dcbabc0 100644
--- a/htdocs/langs/hr_HR/companies.lang
+++ b/htdocs/langs/hr_HR/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Provjera nije moguća. Servis za provjeru nije pružena od strane države članice (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Zaposlenici
 ProspectLevelShort=Potencijal
diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang
index 35de89eb445..78940a5a086 100644
--- a/htdocs/langs/hr_HR/compta.lang
+++ b/htdocs/langs/hr_HR/compta.lang
@@ -111,7 +111,7 @@ Refund=Povrat
 SocialContributionsPayments=Plaćanja društveni/fiskalni porez
 ShowVatPayment=Prikaži PDV plaćanja
 TotalToPay=Ukupno za platiti
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Konto kupca
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Jeste li sigurni da želite obrisati ovu uplatu
 ExportDataset_tax_1=Društveni i fiskalni porezi i plaćanja
 CalcModeVATDebt=Način <b>%sPDV na računovodstvene usluge%s</b>
 CalcModeVATEngagement=Način <b>%sPDV na prihode-troškove%s</b>
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Način <b>%sRE na računima kupaca - računima dobavljača%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Stanje prihoda i troškova, godišnji sažetak
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=Prikazani iznosi su sa uključenim svim porezima
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- Uključuje stvarne uplate po računima, troškove, PDV i plaće. <br>- Baziran je po datumu plaćanja računa, troškova, PDV-a i plaćama. Datum donacje za donacije.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Računi za predujam nisu uključeni
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Izvještaj po RE komitenta
 LT2ReportByCustomersES=Izvještaj po IRPF komitenta
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/hr_HR/cron.lang b/htdocs/langs/hr_HR/cron.lang
index d91b7a5fb77..1f2d530e535 100644
--- a/htdocs/langs/hr_HR/cron.lang
+++ b/htdocs/langs/hr_HR/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Obriši planirani posao
 Permission23104 = Pokreni planirani posao
 # Admin
 CronSetup=Postavljanje upravljanja planiranih poslova
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Ili za provjeru i pokretanje specifičnog posla
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Sigurnosni ključ za URL za pokretanje cron zadataka
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=U Unix okolini potrebno je korisititi sljedeći crontab unos za pokretanje komande svakih 5 minuta
 CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Klasa %s ne sadrži niti jednu %s metodu
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Number of launches
 CronMaxRun=Maximum number of launches
 CronEach=Svakih
 JobFinished=Posao pokrenut i završen
+Scheduled=Scheduled
 #Page card
 CronAdd= Dodaj poslove
 CronEvery=Izvrši posao svaki
@@ -56,7 +58,7 @@ CronNote=Napomena
 CronFieldMandatory=Polja %s su obavezna
 CronErrEndDateStartDt=Datum kraja ne može biti prije datuma početka
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Omogući
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Onemogući
 CronTaskInactive=Ovaj posao je onemogućen
 CronId=ID
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Shell command
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Idite na izbornik "Home - Admin tools - Scheduled jobs" za prikaz i uređivanje planiranih poslova.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Posao onemogućen
 MakeLocalDatabaseDumpShort=Lakalni backup baze
 MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index 8b017fff9cf..cf19fd01b31 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
 ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/hr_HR/exports.lang b/htdocs/langs/hr_HR/exports.lang
index f8f24af0ed9..f214e7f85dd 100644
--- a/htdocs/langs/hr_HR/exports.lang
+++ b/htdocs/langs/hr_HR/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Biblioteka
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Step
 FormatedImport=Čarobnjak za unos podataka
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/hr_HR/mails.lang b/htdocs/langs/hr_HR/mails.lang
index 80155474705..f94b828340b 100644
--- a/htdocs/langs/hr_HR/mails.lang
+++ b/htdocs/langs/hr_HR/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Obavijesti
-NoNotificationsWillBeSent=Nema planiranih obavijesti za ovaj događaj i tvrtku
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Podatak
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index 8ef879f459d..12f0f2be331 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Nema predloška za taj tip e-pošte
 AvailableVariables=Dostupne zamjenske vrijednosti
 NoTranslation=Bez prijevoda
 Translation=Prijevod
+CurrentTimeZone=Vremenska zona PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Spis nije pronađen
 NoRecordDeleted=Spis nije izbrisan
 NotEnoughDataYet=Nedovoljno podataka
@@ -85,6 +87,8 @@ FileWasNotUploaded=Datoteka za prilog je odabrana, ali još nije učitana. Klikn
 NbOfEntries=Broj unosa
 GoToWikiHelpPage=Pročitajte Online pomoć (potreban pristup Internetu)
 GoToHelpPage=Pročitaj pomoć
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Podatak spremljen
 RecordDeleted=Podatak obrisan
 RecordGenerated=Record generated
@@ -354,8 +358,8 @@ UnitPrice=Jedinična cijena
 UnitPriceHT=Jedinična cijena (bez poreza)
 UnitPriceHTCurrency=Jedinična cijena (bez poreza) (u valuti)
 UnitPriceTTC=Jedinična cijena
-PriceU=Jed. cijena
-PriceUHT=Jed. cijena
+PriceU=Jed. cij.
+PriceUHT=J.C. netto
 PriceUHTCurrency=J.C. (valuta)
 PriceUTTC=J.C. (s porezom)
 Amount=Iznos
@@ -391,7 +395,7 @@ TotalHTShort=Ukupno (bez poreza)
 TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Ukupno s PDV-om
-TotalHT=Ukupno bez PDV-a
+TotalHT=Ukupno netto
 TotalHTforthispage=Ukupno (bez PDV-a) na ovoj stranici
 Totalforthispage=Ukupno na ovoj stranici
 TotalTTC=Ukupno s PDV-om
@@ -433,6 +437,7 @@ RemainToPay=Preostalo za platiti
 Module=Modul/Aplikacija
 Modules=Moduli/Aplikacije
 Option=Opcija
+Filters=Filters
 List=Popis
 FullList=Cijeli popis
 FullConversation=Cijeli razgovor
@@ -671,7 +676,7 @@ SendMail=Pošalji e-poštu
 Email=E-pošta
 NoEMail=Nema e-pošte
 AlreadyRead=Već pročitano
-NotRead=Nije pročitano
+NotRead=Unread
 NoMobilePhone=Nema mobilnog telefona
 Owner=Vlasnik
 FollowingConstantsWillBeSubstituted=Sljedeće konstante bit će zamjenjene s odgovarajućom vrijednošću. 
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/hr_HR/modulebuilder.lang b/htdocs/langs/hr_HR/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/hr_HR/modulebuilder.lang
+++ b/htdocs/langs/hr_HR/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang
index f2b9c16f0f7..87a41146b95 100644
--- a/htdocs/langs/hr_HR/other.lang
+++ b/htdocs/langs/hr_HR/other.lang
@@ -5,8 +5,6 @@ Tools=Alati
 TMenuTools=Alati
 ToolsDesc=Svi alati koji nisu uključeni u ostalim sučeljima grupirani su ovdje.<br>Možete im pristupiti uz pomoć izbornika lijevo.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=Poštovana/ni,\nposlali smo vam robu prema dos
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Right
 CalculatedWeight=Izračunata masa
 CalculatedVolume=Izračunati volumen
 Weight=Masa
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index bceda0c20e6..d702a04fc78 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Broj cijena
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Broj matičnih grupiranih proizvoda
@@ -167,8 +168,10 @@ BuyingPrices=Nabavne cijene
 CustomerPrices=Cijene kupaca
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Zemlja porijekla
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Koristi fiksnu cijenu
 PriceByQuantity=Različite cijene prema količini
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Raspon količine
-MultipriceRules=Pravila odjelnih cijena
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% varijacija preko %s
 PercentDiscountOver=%% popust preko %s
diff --git a/htdocs/langs/hr_HR/recruitment.lang b/htdocs/langs/hr_HR/recruitment.lang
index 31f81481a9c..519a3ae434e 100644
--- a/htdocs/langs/hr_HR/recruitment.lang
+++ b/htdocs/langs/hr_HR/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/hr_HR/sendings.lang b/htdocs/langs/hr_HR/sendings.lang
index 9d7ec4b228e..220a0004a70 100644
--- a/htdocs/langs/hr_HR/sendings.lang
+++ b/htdocs/langs/hr_HR/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Ostale isporuke za ovu narudžbu
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Isporuke za ovjeru
 StatusSendingCanceled=Poništeno
+StatusSendingCanceledShort=Poništeno
 StatusSendingDraft=Skica
 StatusSendingValidated=Ovjereno (proizvodi za isporuku ili su isporučeni)
 StatusSendingProcessed=Obrađen
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Prvo morate ovjeriti narudžbu prije izrade otp
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Kompletan model dokumenta za dostavnu primku (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstanta EXPEDITION_ADDON_NUMBER nije definirana
 SumOfProductVolumes=Ukupni volumen proizvoda
 SumOfProductWeights=Ukupna masa proizvoda
diff --git a/htdocs/langs/hr_HR/stocks.lang b/htdocs/langs/hr_HR/stocks.lang
index 20f7b0c745c..f19d6f180e9 100644
--- a/htdocs/langs/hr_HR/stocks.lang
+++ b/htdocs/langs/hr_HR/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/hr_HR/ticket.lang b/htdocs/langs/hr_HR/ticket.lang
index 70e17eef676..7a4ddd8295d 100644
--- a/htdocs/langs/hr_HR/ticket.lang
+++ b/htdocs/langs/hr_HR/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Ostalo
 TicketSeverityShortLOW=Nisko
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Visoko
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Nije pročitano
 Read=Read
 Assigned=Assigned
 InProgress=U postupku
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/hr_HR/website.lang b/htdocs/langs/hr_HR/website.lang
index 41f2e8808aa..893a4042577 100644
--- a/htdocs/langs/hr_HR/website.lang
+++ b/htdocs/langs/hr_HR/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Strana
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/hr_HR/withdrawals.lang b/htdocs/langs/hr_HR/withdrawals.lang
index 9d80e1ba9bd..2bd9d25c986 100644
--- a/htdocs/langs/hr_HR/withdrawals.lang
+++ b/htdocs/langs/hr_HR/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Označi kao kreditirano
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Opcija za stvarni način nije postavljena, zaustavljamo nakon ove simulacije
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index 70ffa6bdfbb..efbd2144bae 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Dátum
 Docref=Hivatkozás
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 2beca20a1c0..04f16556d06 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Kijelző
 SetupArea=Beállítás
 UploadNewTemplate=Új sablon(ok) feltöltése
 FormToTestFileUploadForm=A fájlfeltöltés tesztelésének űrlapja (beállítás szerint)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Megjegyzés: az 'igen' csak akkor eredményes, ha a <b>%s</b> modul engedélyezve van 
 RemoveLock=Távolítsa el / nevezze át a(z) <b>%s</b> fájlt, ha létezik, hogy engedélyezze a Frissítés / Telepítés eszközt.
 RestoreLock=Állítsa vissza az <b>%s</b> fájlt, csak olvasási jogokat engedélyezzen, hogy le lehessen tiltani a Frissítés / Telepítés eszköz további használatát.
@@ -85,7 +87,6 @@ ShowPreview=Előnézet megtekintése
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Előnézet nem elérhető
 ThemeCurrentlyActive=Jelenleg aktív téma
-CurrentTimeZone=A PHP (szerver) időzónája
 MySQLTimeZone=MySql (adatbázis) időzóna
 TZHasNoEffect=A dátumokat az adatbázis-kiszolgáló karakterláncként tárolja és küldi vissza. Az időzónának csak az UNIX_TIMESTAMP funkció használatakor van hatása (ezt a Dolibarr nem használhatja, tehát az adatbázis TZ-nek nincs hatása, még akkor sem, ha az adatok bevitele után megváltozott).
 Space=Hely
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Ez a terület adminisztrációs lehetőségeket biztosít. A
 Purge=Tisztítsd
 PurgeAreaDesc=Ezen az oldalon törölheti a Dolibarr által létrehozott vagy tárolt összes fájlt (ideiglenes fájlok vagy az <b>%s</b> könyvtárban lévő fájlok). Ennek a szolgáltatásnak a használata általában nem szükséges. Megkerülő megoldásként szolgál azoknak a felhasználóknak, akiknek a Dolibarr-ját olyan szolgáltató üzemelteti, amely nem engedélyezi a webszerver által generált fájlok törlését.
 PurgeDeleteLogFile=Naplófájlok törlése, beleértve a(z) <b>%s</b> fájlt, amely a Syslog modulhoz lett megadva (nincs adatvesztés kockázata)
-PurgeDeleteTemporaryFiles=Az összes ideiglenes fájl törlése (nincs adatvesztés kockázata). Megjegyzés: A törlés csak akkor történik meg, ha a temp könyvtárat 24 órával ezelőtt hozták létre.
-PurgeDeleteTemporaryFilesShort=Ideiglenes fájlok törlése
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Az összes fájlt törölése ebben a könyvtárban: <b> %s </b>. <br> Ezzel törölheti az elemekhez kapcsolódó összes generált dokumentumot (harmadik felek, számlák stb.), az ECM modulba feltöltött fájlokat, az adatbázis biztonsági mentési ürlapjait és az ideiglenes fájlokat.
 PurgeRunNow=Ürítsd ki most
 PurgeNothingToDelete=Nincs törlésre váró fájl vagy könyvtár
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferált partnerek
 OtherResources=Egyéb források
 ExternalResources=Külső források
 SocialNetworks=Közösségi hálózatok
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=A felhasználó vagy fejlesztői dokumentáció (doc, GYIK ...), <br> vessünk egy pillantást a Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
 ForAnswersSeeForum=Ha bármilyen további kérdése / help, akkor használja a fórumot Dolibarr: <br> <a href="%s" target="_blank"><b>%s</b></a>
 HelpCenterDesc1=Itt kaphat a Dolibarr-rel kapcsolatban segítséget és támogatást.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Példák az aktuális konfigurációval
 ListOfDirectories=OpenDocument sablonok listája könyvtárak
 ListOfDirectoriesForModelGenODT=Az OpenDocument formátumú sablonfájlokat tartalmazó könyvtárak listája. <br> <br> Írja ide a könyvtárak teljes elérési útját. <br> Nyomjon "Enter"-t minden egyes könyvtár között. <br> A GED modul könyvtárának hozzáadása: <b>DOL_DATA_ROOT/ecm/saját_könyvtár_neve</b>. <br> <br> Az e könyvtárakban található fájloknak <b>.odt</b> vagy <b>.ods</b> kiterjesztésre kell végződni.
 NumberOfModelFilesFound=Ezekben a könyvtárakban található ODT / ODS sablon fájlok száma
-ExampleOfDirectoriesForModelGen=Példák a szintaxis: <br> c: \\ mydir <br> / Home / mydir <br> DOL_DATA_ROOT / ECM / ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Ha tudod, hogyan kell létrehozni a odt dokumentumsablonok, mielőtt tárolja őket azokra a könyvtárakra, olvasd el a wiki dokumentáció:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=A név / vezetéknév sorrendje
@@ -406,7 +408,7 @@ UrlGenerationParameters=URL paraméterek biztosítása
 SecurityTokenIsUnique=Használjunk olyan egyedi securekey paraméter az URL
 EnterRefToBuildUrl=Adja meg az objektum referencia %s
 GetSecuredUrl=Get URL számított
-ButtonHideUnauthorized=Rejtett gombok elrejtése nem adminisztrátorok számára az illetéktelen tevékenységekhez a szürke letiltott gombok megjelenítése helyett
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Régi ÁFA-kulcs
 NewVATRates=Új ÁFA-kulcs
 PriceBaseTypeToChange=Módosítsa az árakat a meghatározott alap referenciaértékkel
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Új menü
 MenuHandler=Menü kezelő
 MenuModule=Forrás modul
-HideUnauthorizedMenu= Hide jogosulatlan menük (szürke)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menü
 DetailMenuHandler=Menü, ahol a kezelő jelzi az új menü
 DetailMenuModule=Modul neve, ha menübejegyzés származnak modul
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/hu_HU/banks.lang b/htdocs/langs/hu_HU/banks.lang
index b526b83be5c..2ceff216cd2 100644
--- a/htdocs/langs/hu_HU/banks.lang
+++ b/htdocs/langs/hu_HU/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/hu_HU/blockedlog.lang b/htdocs/langs/hu_HU/blockedlog.lang
index 8a37fe90724..e2c08d1d937 100644
--- a/htdocs/langs/hu_HU/blockedlog.lang
+++ b/htdocs/langs/hu_HU/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/hu_HU/boxes.lang b/htdocs/langs/hu_HU/boxes.lang
index 93ca573083a..7aa3db3646a 100644
--- a/htdocs/langs/hu_HU/boxes.lang
+++ b/htdocs/langs/hu_HU/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Időzített feladatok
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=Nincs könyvjezlő. Kattintson <a href="%s">ide</a> könyvjelző hozzáadásához.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/hu_HU/cashdesk.lang b/htdocs/langs/hu_HU/cashdesk.lang
index f562064c20c..3215e0e3839 100644
--- a/htdocs/langs/hu_HU/cashdesk.lang
+++ b/htdocs/langs/hu_HU/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Számlák száma
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/hu_HU/categories.lang b/htdocs/langs/hu_HU/categories.lang
index 741cab33de6..f16ea1f8280 100644
--- a/htdocs/langs/hu_HU/categories.lang
+++ b/htdocs/langs/hu_HU/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Kiegészítő tulajdonságok
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/hu_HU/companies.lang b/htdocs/langs/hu_HU/companies.lang
index d6179acca4b..7848c56a7d1 100644
--- a/htdocs/langs/hu_HU/companies.lang
+++ b/htdocs/langs/hu_HU/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Ellenőrizze a Közösségen belüli ÁFA-azonosítót
 VATIntraManualCheck=Manuálisan ellenőrizheti az Európai Bizottság webhelyén <a href="%s" target="_blank"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Ellenőrzés nem lehetséges. A szolgáltatást a tagállam nem teszi lehetővé (%s).
 NorProspectNorCustomer=Nem leendő partner, nem ügyfél
-JuridicalStatus=Jogi személy típusa
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Alkalmazottak
 ProspectLevelShort=Potenciális
diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang
index e750d016947..58ff2d8bdcf 100644
--- a/htdocs/langs/hu_HU/compta.lang
+++ b/htdocs/langs/hu_HU/compta.lang
@@ -111,7 +111,7 @@ Refund=Visszatérítés
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Mutasd ÁFA fizetési
 TotalToPay=Összes fizetni
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Jelentés a harmadik fél IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/hu_HU/cron.lang b/htdocs/langs/hu_HU/cron.lang
index 70fd2ff5e3c..88f0a731a8c 100644
--- a/htdocs/langs/hu_HU/cron.lang
+++ b/htdocs/langs/hu_HU/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Ütemezett feladatok törlése
 Permission23104 = Ütemezett feladat végrehajtása
 # Admin
 CronSetup=Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
 CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Number of launches
 CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -56,7 +58,7 @@ CronNote=Megjegyzés
 CronFieldMandatory=A %s mezőket kötelező kitölteni
 CronErrEndDateStartDt=A befejezés időpontja nem lehet hamarabb mint a kezdet
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Engedélyez
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Letiltás
 CronTaskInactive=Ez a feladat ki van kapcsolva
 CronId=Id
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
 DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index 2fcfb92b003..66351dfdb7e 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s rossz
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=A %s felhasználói név már létezik.
 ErrorGroupAlreadyExists=A %s csoport már létezik.
 ErrorRecordNotFound=A rekord nem található
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Néhány kötelezően kitöltendő mező még üres.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Nem sikerült létrehozni egy könyvtárat. Ellenőrizze, hogy a Web szerver felhasználó engedélyekkel rendelkezik, hogy ültesse át Dolibarr dokumentumok könyvtárba. Ha a paraméter <b>safe_mode</b> engedélyezve van ez a PHP-t, ellenőrizze, hogy Dolibarr PHP fájlok tulajdonosa a webszerver felhasználó (vagy csoport).
 ErrorNoMailDefinedForThisUser=Nincs megadva a felhasználó email címe
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=A funkcó működéséhez Javascript aktiválására van szükség. A beállítások - képernyő részben beállíthatja.
 ErrorTopMenuMustHaveAParentWithId0=Egy menü típusú &quot;fent&quot; nem lehet egy szülő menüben. Tedd 0 szülő menüből, vagy válasszon egy menüt típusú &quot;baloldal&quot;.
 ErrorLeftMenuMustHaveAParentId=Egy menü típusú &quot;Bal&quot; kell egy szülő id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr LDAP-egyezés nem teljes.
 ErrorLDAPMakeManualTest=Egy. LDIF fájlt keletkezett %s könyvtárban. Próbálja meg kézzel betölteni a parancssorból, hogy több információt hibákat.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref használt létrehozására már létezik.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/hu_HU/exports.lang b/htdocs/langs/hu_HU/exports.lang
index 69e7436c345..207e255a0f7 100644
--- a/htdocs/langs/hu_HU/exports.lang
+++ b/htdocs/langs/hu_HU/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Mező cím
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Könyvtár
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Lépés
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/hu_HU/mails.lang b/htdocs/langs/hu_HU/mails.lang
index a00af6c7a1f..dda1e486e67 100644
--- a/htdocs/langs/hu_HU/mails.lang
+++ b/htdocs/langs/hu_HU/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Vonal %s fájlban
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Értesítések
-NoNotificationsWillBeSent=Nincs e-mail értesítést terveznek erre az eseményre és vállalati
-ANotificationsWillBeSent=1 értesítést küldünk e-mailben
-SomeNotificationsWillBeSent=%s értesítést küldünk e-mailben
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=Lista minden e-mail értesítést küldeni
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Információ
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index 1cb2ef1cbf2..958c680691f 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Ilyen e-mail típushoz nincs elérhető sablon
 AvailableVariables=Elérhető helyettesítő változók
 NoTranslation=Nincs fordítás
 Translation=Fordítás
+CurrentTimeZone=A PHP (szerver) időzónája
 EmptySearchString=Adjon meg nem üres keresési feltételeket
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Rekord nem található
 NoRecordDeleted=Nincs törölt rekord
 NotEnoughDataYet=Nincs elég adat
@@ -85,6 +87,8 @@ FileWasNotUploaded=Egy fájl ki lett választva csatolásra, de még nincs felt
 NbOfEntries=Bejegyzések száma
 GoToWikiHelpPage=Online súgó olvasása (Internet hozzáférés szükséges)
 GoToHelpPage=Segítség olvasása
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Rekord elmentve
 RecordDeleted=Rekord törölve
 RecordGenerated=Rekord létrehozva
@@ -433,6 +437,7 @@ RemainToPay=Még fizetendő
 Module=Modul/Alkalmazás
 Modules=Modulok/alkalmazások
 Option=Opció
+Filters=Filters
 List=Lista
 FullList=Teljes lista
 FullConversation=Teljes beszélgetés
@@ -671,7 +676,7 @@ SendMail=E-mail küldése
 Email=E-mail
 NoEMail=Nincs email
 AlreadyRead=Már elolvasott
-NotRead=Nem olvasott
+NotRead=Unread
 NoMobilePhone=Nincs mobilszám
 Owner=Tulajdonos
 FollowingConstantsWillBeSubstituted=Az alábbi konstansok helyettesítve leszenek a hozzájuk tartozó értékekkel.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/hu_HU/modulebuilder.lang b/htdocs/langs/hu_HU/modulebuilder.lang
index 460aef8103b..d257f8a1b0b 100644
--- a/htdocs/langs/hu_HU/modulebuilder.lang
+++ b/htdocs/langs/hu_HU/modulebuilder.lang
@@ -5,7 +5,7 @@ EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use upp
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
 ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
 ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
-NewModule=New module
+NewModule=Új modul
 NewObjectInModulebuilder=New object
 ModuleKey=Module key
 ObjectKey=Object key
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang
index 934ae54ceb1..29967b14c24 100644
--- a/htdocs/langs/hu_HU/other.lang
+++ b/htdocs/langs/hu_HU/other.lang
@@ -5,8 +5,6 @@ Tools=Eszközök
 TMenuTools=Eszközök
 ToolsDesc=A menükben nem szereplő összes eszköz ide van gyűjtve. <br> Az eszközök a bal oldali menüből érhetők el.
 Birthday=Születésnap
-BirthdayDate=Születésnap dátuma
-DateToBirth=Születési dátum
 BirthdayAlertOn=Születésnaposok aktív
 BirthdayAlertOff=Születésnaposok inaktív
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=A számla dátumát megelőző hónap (1–12)
 TextPreviousMonthOfInvoice=A számla dátumát megelőző hónap (szöveges)
 NextMonthOfInvoice=A számla dátumát követő hónap (1-12)
 TextNextMonthOfInvoice=A számla dátumát követő hónap (szöveges)
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=A(z) <b>%s</b> fájlba létrehozott ZIP-fájl.
 DocFileGeneratedInto=A(z) <b>%s</b>  fájlba létrehozott dokumentum fájl.
 JumpToLogin=A kapcsolat megszakadt. Ugrás a bejelentkezési oldalra ...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=A kifizetéshez kattintson az alábbi linkre, ha még nem történt meg.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Helló)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=A Dolibarr egy kompakt ERP/CRM, amely számos üzleti modult támogat. Az összes modult bemutató demonstrációnak nincs értelme, mivel ez a forgatókönyv soha nem fordul elő (több száz elérhető). Azonban számos demo profil elérhető.
 ChooseYourDemoProfil=Válassza ki az igényeinek leginkább megfelelő bemutató profilt ...
 ChooseYourDemoProfilMore=... vagy készítsen saját profilt <br>(manuális modulválasztás)
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Az elérhetőség/cím létrehozva az e-mail gyű
 ProjectCreatedByEmailCollector=A projektet létrehozva az e-mail gyűjtő által az MSGID %s e-mailből
 TicketCreatedByEmailCollector=A jegy létrehozva az e-mail gyűjtő által az MSGID %s e-mailből
 OpeningHoursFormatDesc=A nyitvatartási időket (-tól-ig) kötőjellel (-) válassza el. <br> Használjon szóközt a különböző idősávok megadásához. <br> Példa: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Az export területén
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index f260c21a8ac..cfb3c184ba5 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Több árszegmens termékenként / szolgáltatásonként (minden ügyfél egy árszegmensben van)
 MultiPricesNumPrices=Árak száma
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Vételi árak
 CustomerPrices=Végfelhasználói árak
 SuppliersPrices=Eladási árak
 SuppliersPricesOfProductsOrServices=Eladási árak (termékek vagy szolgáltatások)
-CustomCode=Vám / Áru / HS kód
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Származási ország
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Használja a fix árat
 PriceByQuantity=Mennyiségtől függő ár
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Mennyiségi intervallum
-MultipriceRules=Árazási szabályok
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Használjon árszegmens-szabályokat (meghatározva a termékmodul beállításában), hogy automatikusan kiszámítsa az összes többi szegmens árát az első szegmens szerint
 PercentVariationOver=%% változó ár %s fölött
 PercentDiscountOver=%% kedvezmény %s fölött
diff --git a/htdocs/langs/hu_HU/recruitment.lang b/htdocs/langs/hu_HU/recruitment.lang
index 17638802c51..590a003a8f0 100644
--- a/htdocs/langs/hu_HU/recruitment.lang
+++ b/htdocs/langs/hu_HU/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/hu_HU/sendings.lang b/htdocs/langs/hu_HU/sendings.lang
index 9e47080363d..aba9cc8f51b 100644
--- a/htdocs/langs/hu_HU/sendings.lang
+++ b/htdocs/langs/hu_HU/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Más szállítások ehhez a megrendeléshez
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Hitelesítésre váró szállítások
 StatusSendingCanceled=Megszakítva
+StatusSendingCanceledShort=Visszavonva
 StatusSendingDraft=Piszkozat
 StatusSendingValidated=Hitelesítve (már szállítva)
 StatusSendingProcessed=Feldolgozott
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Teljesebb dokumentum modell bizonylatokhoz (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Állandó EXPEDITION_ADDON_NUMBER nincs definiálva
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/hu_HU/stocks.lang b/htdocs/langs/hu_HU/stocks.lang
index c41ce038ee2..796e088e34d 100644
--- a/htdocs/langs/hu_HU/stocks.lang
+++ b/htdocs/langs/hu_HU/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/hu_HU/ticket.lang b/htdocs/langs/hu_HU/ticket.lang
index 79cde86ee8b..eca711a1cf2 100644
--- a/htdocs/langs/hu_HU/ticket.lang
+++ b/htdocs/langs/hu_HU/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Egyéb
 TicketSeverityShortLOW=Alacsony
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Magas
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Nem olvasott
 Read=Olvas
 Assigned=Assigned
 InProgress=Folyamatban
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/hu_HU/website.lang b/htdocs/langs/hu_HU/website.lang
index 25d8faccd6d..d7e4a43010d 100644
--- a/htdocs/langs/hu_HU/website.lang
+++ b/htdocs/langs/hu_HU/website.lang
@@ -30,7 +30,6 @@ EditInLine=Szerkesztés inline
 AddWebsite=Webhely hozzáadása
 Webpage=Weblap / tároló
 AddPage=Oldal / tároló hozzáadása
-HomePage=Honlap
 PageContainer=Oldal
 PreviewOfSiteNotYetAvailable=A weboldal előnézete <strong>%s</strong> még nem érhető el. Először &#39; <strong>Teljes weboldal-sablont</strong> kell <strong>importálnia</strong> &#39; vagy csak &#39; <strong>Oldal / tároló hozzáadása</strong> &#39; <strong>elemet</strong> .
 RequestedPageHasNoContentYet=Az %s azonosítóval kért oldalnak még nincs tartalma, vagy a .tpl.php gyorsítótár fájlt eltávolították. Szerkessze az oldal tartalmát ennek megoldásához.
@@ -101,7 +100,7 @@ EmptyPage=Üres oldal
 ExternalURLMustStartWithHttp=A külső URL-nek http: // vagy https: // -el kell kezdődnie.
 ZipOfWebsitePackageToImport=Töltse fel a webhelysablon-csomag Zip fájlját
 ZipOfWebsitePackageToLoad=vagy Válasszon egy elérhető beágyazott webhelysablon-csomagot
-ShowSubcontainers=Vegye fel a dinamikus tartalmat
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Az oldal belső URL-je
 ThisPageIsTranslationOf=Ez az oldal / konténer a(z) ... nyelv fordítása
 ThisPageHasTranslationPages=Ezen az oldalon / tárolóban van fordítás
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/hu_HU/withdrawals.lang b/htdocs/langs/hu_HU/withdrawals.lang
index 7522b6d2bd1..5c76ab61299 100644
--- a/htdocs/langs/hu_HU/withdrawals.lang
+++ b/htdocs/langs/hu_HU/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Jóváírtan osztályozva
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Opció a valós módban nem volt beállítva, akkor hagyja abba ezt követően szimuláció
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index 669c6b2ad04..fdfffbf1e1b 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=Semua negara kecuali %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Akun akuntansi utama untuk pelanggan tidak ditentukan dalam pengaturan
 MainAccountForSuppliersNotDefined=Akun akuntansi utama untuk vendor tidak ditentukan dalam pengaturan
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Tidak terikat pada akun akuntansi
 XLineSuccessfullyBinded=%s produk/layanan berhasil diikat ke akun akuntansi
 XLineFailedToBeBinded=Produk/layanan %s tidak terikat pada akun akuntansi mana pun
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Jumlah elemen yang akan dijilidkan ditunjukkan oleh halaman (maksimum yang disarankan: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Mulailah menyortir halaman "Binding to do" oleh elemen-elemen terbaru
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Mulailah menyortir halaman "Binding done" oleh elemen-elemen terbaru
 
@@ -198,7 +199,8 @@ Docdate=Tanggal
 Docref=Referensi
 LabelAccount=Label Akun
 LabelOperation=Operasi label
-Sens=Sen
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Kode huruf
 Lettering=Tulisan
 Codejournal=Jurnal
@@ -206,7 +208,8 @@ JournalLabel=Label jurnal
 NumPiece=Jumlah potongan
 TransactionNumShort=Tidak. transaksi
 AccountingCategory=Grup yang dipersonalisasi
-GroupByAccountAccounting=Kelompokkan dengan akun akuntansi
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Anda dapat mendefinisikan di sini beberapa grup akun akuntansi. Mereka akan digunakan untuk laporan akuntansi yang dipersonalisasi.
 ByAccounts=Dengan akun
 ByPredefinedAccountGroups=Oleh kelompok yang telah ditentukan
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Pembayaran tidak terkait dengan produk / layanan apa
 OpeningBalance=Saldo awal
 ShowOpeningBalance=Tampilkan saldo awal
 HideOpeningBalance=Sembunyikan saldo awal
-ShowSubtotalByGroup=Tampilkan subtotal menurut grup
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Grup akun
 PcgtypeDesc=Grup akun digunakan sebagai kriteria 'filter' dan 'pengelompokan' yang telah ditentukan sebelumnya untuk beberapa laporan akuntansi. Misalnya, 'PENGHASILAN' atau 'BEBAN' digunakan sebagai grup untuk akun akuntansi produk untuk membangun laporan pengeluaran / pendapatan.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Konsultasikan di sini daftar garis laporan pengeluaran y
 DescVentilExpenseReportMore=Jika Anda mengatur akun akuntansi pada jenis garis laporan pengeluaran, aplikasi akan dapat membuat semua ikatan antara garis laporan pengeluaran Anda dan akun akuntansi dari bagan akun Anda, cukup dengan satu klik dengan tombol<strong>"%s" </strong>. Jika akun tidak ditetapkan pada kamus biaya atau jika Anda masih memiliki beberapa baris yang tidak terikat pada akun apa pun, Anda harus membuat manual yang mengikat dari menu "<strong> %s </strong>".
 DescVentilDoneExpenseReport=Konsultasikan di sini daftar garis laporan pengeluaran dan akun akuntansi biayanya
 
+Closure=Annual closure
 DescClosure=Konsultasikan di sini jumlah gerakan berdasarkan bulan yang tidak divalidasi & tahun fiskal sudah terbuka
 OverviewOfMovementsNotValidated=Langkah 1 / Ikhtisar gerakan yang tidak divalidasi. (Diperlukan untuk menutup tahun fiskal)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validasi gerakan
 DescValidateMovements=Setiap modifikasi atau penghapusan tulisan, huruf dan penghapusan akan dilarang. Semua entri untuk latihan harus divalidasi jika tidak, penutupan tidak akan mungkin
-SelectMonthAndValidate=Pilih bulan dan validasi gerakan
 
 ValidateHistory=Mengikat Secara Otomatis
 AutomaticBindingDone=Pengikatan otomatis dilakukan
@@ -293,6 +298,7 @@ Accounted=Disumbang dalam buku besar
 NotYetAccounted=Belum diperhitungkan dalam buku besar
 ShowTutorial=Perlihatkan Tutorial
 NotReconciled=Tidak didamaikan
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Ekspor untuk LD Compta (v10 & lebih tinggi)
 Modelcsv_openconcerto=Ekspor untuk OpenConcerto (Uji)
 Modelcsv_configurable=Ekspor CSV Dapat Dikonfigurasi
 Modelcsv_FEC=Ekspor FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Ekspor untuk Sage 50 Swiss
 Modelcsv_winfic=Ekspor Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index d5b84801d2d..a6f95dbd569 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Tampakan Display
 SetupArea=Pengaturan
 UploadNewTemplate=Unggah templat baru(s)
 FormToTestFileUploadForm=Halaman percobaan untuk mengunggah berkas (berdasarkan konfigurasi di pengaturan)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Catatan: Ya akan hanya efektif ketika modul <b>%s</b> diaktifkan
 RemoveLock=Hapus / ganti nama berkas <b>%s</b> jika sudah ada, untuk memperbolehkan pemakaian alat Perbarui / Instal.
 RestoreLock=Pulihkan berkas <b>%s</b>, dengan izin baca saja, untuk menonaktifkan pemakaian alat Pembaruan / Instal lebih lanjut.
@@ -85,7 +87,6 @@ ShowPreview=Tampilkan pratinjau
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview tidak tersedia
 ThemeCurrentlyActive=Tema yang sedang aktif
-CurrentTimeZone=TimeZone PHP (Server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Tanggal disimpan dan dikembalikan oleh server database seolah-olah disimpan sebagai string yang dikirimkan. Zona waktu hanya berpengaruh bila menggunakan fungsi UNIX_TIMESTAMP (yang seharusnya tidak digunakan oleh Dolibarr, jadi basis data TZ seharusnya tidak berpengaruh, bahkan jika diubah setelah data dimasukkan).
 Space=Ruang
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Area ini menyediakan fungsi administrasi. Gunakan menu untuk
 Purge=Perbersihan
 PurgeAreaDesc=Halaman ini memungkinkan Anda untuk menghapus semua file yang dihasilkan atau disimpan oleh Dolibarr (file sementara atau semua file di<b>%s</b>direktori). Menggunakan fitur ini biasanya tidak diperlukan. Ini disediakan sebagai solusi untuk pengguna yang Dolibarr di-host oleh penyedia yang tidak menawarkan izin untuk menghapus file yang dihasilkan oleh server web.
 PurgeDeleteLogFile=Hapus file log, termasuk<b>%s</b>didefinisikan untuk modul Syslog (tidak ada risiko kehilangan data)
-PurgeDeleteTemporaryFiles=Hapus semua file sementara (tidak ada risiko kehilangan data). Catatan: Penghapusan dilakukan hanya jika direktori temp dibuat 24 jam yang lalu.
-PurgeDeleteTemporaryFilesShort=Hapus file sementara
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Hapus semua file dalam direktori:<b>%s </b>. <br> Ini akan menghapus semua dokumen yang dihasilkan terkait dengan elemen (pihak ketiga, faktur dll ...), file yang diunggah ke dalam modul ECM, kesedihan cadangan database dan file sementara.
 PurgeRunNow=Bersihkan sekarang
 PurgeNothingToDelete=Tidak ada direktori atau file untuk dihapus.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Mitra yang Dipilih
 OtherResources=Sumber daya lainnya
 ExternalResources=Sumber Daya Eksternal
 SocialNetworks=Jaringan sosial
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=Untuk dokumentasi pengguna atau pengembang (Doc, FAQs ...), <br> lihatlah pada Dolibarr Wiki: <br><b><a href="%s" target="_blank"> %s a0ebd08bc08bc08
 ForAnswersSeeForum=Untuk pertanyaan / bantuan lain, Anda dapat menggunakan forum Dolibarr: <br><b><a href="%s" target="_blank"> %s </a> </b>
 HelpCenterDesc1=Berikut adalah beberapa sumber untuk mendapatkan bantuan dan dukungan dengan Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Contoh dengan konfigurasi saat ini
 ListOfDirectories=Daftar direktori templat OpenDocument
 ListOfDirectoriesForModelGenODT=Daftar direktori yang berisi file templat dengan format OpenDocument. <br> <br> Masukkan path direktori lengkap di sini. <br> Tambahkan carriage return antara direktori eah. <br> Untuk menambahkan direktori modul GED, tambahkan di sini<b>DOL_DATA_ROOT / ecm / yourdirectoryname </b>. <br> <br> File dalam direktori tersebut harus diakhiri dengan<b>.odt</b>atau<b>.ods </b>.
 NumberOfModelFilesFound=Jumlah file template ODT / ODS yang ditemukan di direktori ini
-ExampleOfDirectoriesForModelGen=Contoh sintaks: <br> c: \\ mydir <br> / home / mydir<br>DOL_DATA_ROOT / ecm / ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed= <br> Untuk mengetahui cara membuat tempt dokumen ODT Anda, sebelum menyimpannya di direktori tersebut, baca dokumentasi wiki:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Posisi Nama/Nama Belakang
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameter untuk mengamankan URL
 SecurityTokenIsUnique=Gunakan parameter keamanan unik untuk setiap URL
 EnterRefToBuildUrl=Masukkan referensi untuk objek %s
 GetSecuredUrl=Dapatkan URL yang dihitung
-ButtonHideUnauthorized=Sembunyikan tombol untuk pengguna non-admin untuk tindakan yang tidak sah alih-alih menunjukkan tombol yang dinonaktifkan yang berwarna abu-abu
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Suku VAT lama
 NewVATRates=Suku VAT baru
 PriceBaseTypeToChange=Ubah harga dengan nilai referensi dasar ditentukan pada
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Menu yang dipersonalisasi tidak ditautkan ke entri me
 NewMenu=Menu baru
 MenuHandler=Penangan menu
 MenuModule=Modul sumber
-HideUnauthorizedMenu= Sembunyikan menu yang tidak sah (abu-abu)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Menu id
 DetailMenuHandler=Penangan menu tempat menampilkan menu baru
 DetailMenuModule=Nama modul jika entri menu berasal dari modul
@@ -1983,11 +1985,12 @@ EMailHost=Host server IMAP email
 MailboxSourceDirectory=Direktori sumber kotak surat
 MailboxTargetDirectory=Direktori target kotak surat
 EmailcollectorOperations=Operasi yang harus dilakukan oleh kolektor
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Jumlah email maksimum yang dikumpulkan per kumpulkan
 CollectNow=Kumpulkan sekarang
 ConfirmCloneEmailCollector=Anda yakin ingin mengkloning kolektor Email %s?
-DateLastCollectResult=Tanggal kumpulkan terbaru dicoba
-DateLastcollectResultOk=Tanggal terbaru kumpulkan berhasill
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Hasil terbaru
 EmailCollectorConfirmCollectTitle=Konfirmasi pengumpulan email
 EmailCollectorConfirmCollect=Apakah Anda ingin menjalankan koleksi untuk kolektor ini sekarang?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Kode Pos
 MainMenuCode=Kode entri menu (mainmenu)
 ECMAutoTree=Tampilkan pohon ECM otomatis
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/id_ID/banks.lang b/htdocs/langs/id_ID/banks.lang
index 4f6a68201fd..c4da69105fe 100644
--- a/htdocs/langs/id_ID/banks.lang
+++ b/htdocs/langs/id_ID/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=Mandat SEPA
 YourSEPAMandate=Mandat SEPA Anda
 FindYourSEPAMandate=Ini adalah mandat SEPA Anda untuk mengotorisasi perusahaan kami untuk melakukan pemesanan debit langsung ke bank Anda. Kembalikan ditandatangani (pindai dokumen yang ditandatangani) atau kirimkan melalui pos ke
 AutoReportLastAccountStatement=Isi kolom 'nomor rekening bank' secara otomatis dengan nomor pernyataan terakhir saat melakukan rekonsiliasi
-CashControl=Pagar kas POS
-NewCashFence=Pagar uang tunai baru
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Warnai gerakan
 BankColorizeMovementDesc=Jika fungsi ini diaktifkan, Anda dapat memilih warna latar belakang spesifik untuk gerakan debit atau kredit
 BankColorizeMovementName1=Warna latar belakang untuk pergerakan debit
diff --git a/htdocs/langs/id_ID/blockedlog.lang b/htdocs/langs/id_ID/blockedlog.lang
index 6e33a07b94f..45c2d2264dd 100644
--- a/htdocs/langs/id_ID/blockedlog.lang
+++ b/htdocs/langs/id_ID/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Penghapusan donasi logis
 logMEMBER_SUBSCRIPTION_CREATE=Langganan anggota dibuat
 logMEMBER_SUBSCRIPTION_MODIFY=Langganan anggota diubah
 logMEMBER_SUBSCRIPTION_DELETE=Penghapusan logis langganan anggota
-logCASHCONTROL_VALIDATE=Rekaman pagar uang tunai
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Unduhan faktur pelanggan
 BlockedLogBillPreview=Pratinjau faktur pelanggan
 BlockedlogInfoDialog=Detail Log
diff --git a/htdocs/langs/id_ID/boxes.lang b/htdocs/langs/id_ID/boxes.lang
index d4ae8002577..87ccb7831b5 100644
--- a/htdocs/langs/id_ID/boxes.lang
+++ b/htdocs/langs/id_ID/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Donasi terbaru %s yang dimodifikasi
 BoxTitleLastModifiedExpenses=Laporan pengeluaran termodifikasi %s terbaru
 BoxTitleLatestModifiedBoms=BOM dimodifikasi %s terbaru
 BoxTitleLatestModifiedMos=Modifikasi Pesanan Manufaktur %s terbaru
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Aktivitas global (faktur, proposal, pesanan)
 BoxGoodCustomers=Pelanggan yang baik
 BoxTitleGoodCustomers=%s Pelanggan yang baik
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Gagal menyegarkan fluks RSS. Tanggal penyegaran yang sukses terakhir: %s
 LastRefreshDate=Tanggal penyegaran terbaru
 NoRecordedBookmarks=Tidak ada penanda yang ditentukan.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Akun penangguhan tidak ditentukan
 BoxLastCustomerShipments=Pengiriman pelanggan terakhir
 BoxTitleLastCustomerShipments=Pengiriman pelanggan %s terbaru
 NoRecordedShipments=Tidak ada pengiriman pelanggan yang direkam
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Akuntansi
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/id_ID/cashdesk.lang b/htdocs/langs/id_ID/cashdesk.lang
index bc39b8bf56b..b18ea4ad4a5 100644
--- a/htdocs/langs/id_ID/cashdesk.lang
+++ b/htdocs/langs/id_ID/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Catatan Kaki
 AmountAtEndOfPeriod=Jumlah pada akhir periode (hari, bulan atau tahun)
 TheoricalAmount=Jumlah teoretis
 RealAmount=Jumlah nyata
-CashFence=Anggaran uang tunai
-CashFenceDone=Anggaran uang tunai yang dilakukan untuk periode tersebut
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb faktur
 Paymentnumpad=Jenis Pad untuk memasukkan pembayaran
 Numberspad=Angka pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Modul penomoran untuk penjualan POS
 CashDeskGenericMaskCodes6 =  tag <br><b>{TN}</b>digunakan untuk menambahkan nomor terminal
 TakeposGroupSameProduct=Kelompokkan lini produk yang sama
 StartAParallelSale=Mulai penjualan paralel baru
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Tutup pagar uang
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Laporan tunai
 MainPrinterToUse=Printer utama untuk digunakan
 OrderPrinterToUse=Memesan printer untuk digunakan
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/id_ID/categories.lang b/htdocs/langs/id_ID/categories.lang
index 15b8b143200..d37a907add2 100644
--- a/htdocs/langs/id_ID/categories.lang
+++ b/htdocs/langs/id_ID/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Area label/kategori Proyek
 UsersCategoriesArea=Area label/kategori Pengguna
 SubCats=Sub-kategori
 CatList=Daftar label/kategori
+CatListAll=List of tags/categories (all types)
 NewCategory=Label/kategori baru
 ModifCat=Ubah label/kategori
 CatCreated=Label/kategori dibuat
@@ -65,16 +66,22 @@ UsersCategoriesShort=Label/kategori pengguna
 StockCategoriesShort=Label/kategori gudang
 ThisCategoryHasNoItems=Kategori ini tidak mengandung barang apa pun.
 CategId=Label/id kategori
-CatSupList=Daftar label/kategori vendor
-CatCusList=Daftar label/kategori pelanggan/prospek
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Daftar label/kategori produk
 CatMemberList=Daftar label/kategori anggota
-CatContactList=Daftar label/kategori kontak
-CatSupLinks=Tautan antara pemasok dan label/kategori
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Tautan antara pelanggan/prospek dan label/kategori
 CatContactsLinks=Tautan antara kontak/alamat dan label/kategori
 CatProdLinks=Tautan antara produk/layanan dan label/kategori
-CatProJectLinks=Tautan antara proyek dan label/kategori
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Tautan antara proyek dan label/kategori
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Hapus dari label/kategori
 ExtraFieldsCategories=Atribut pelengkap
 CategoriesSetup=Pengaturan label/kategori
diff --git a/htdocs/langs/id_ID/companies.lang b/htdocs/langs/id_ID/companies.lang
index 3dd19063424..08b96e96903 100644
--- a/htdocs/langs/id_ID/companies.lang
+++ b/htdocs/langs/id_ID/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Periksa ID PPN intra-Komunitas di situs web Komisi Ero
 VATIntraManualCheck=Anda juga dapat memeriksa secara manual di situs web Komisi Eropa <a href="%s" target="_blank"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Periksa tidak mungkin. Layanan cek tidak disediakan oleh negara anggota (%s).
 NorProspectNorCustomer=Bukan prospek, bukan pelanggan
-JuridicalStatus=Jenis Badan Hukum
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=karyawan
 ProspectLevelShort=Potensi
diff --git a/htdocs/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang
index 5b49606be63..9e62c742f29 100644
--- a/htdocs/langs/id_ID/compta.lang
+++ b/htdocs/langs/id_ID/compta.lang
@@ -111,7 +111,7 @@ Refund=Pengembalian dana
 SocialContributionsPayments=Pembayaran pajak sosial / fiskal
 ShowVatPayment=Tampilkan pembayaran PPN
 TotalToPay=Total yang harus dibayar
-BalanceVisibilityDependsOnSortAndFilters=Saldo terlihat dalam daftar ini hanya jika tabel diurutkan naik pada %s dan difilter untuk 1 rekening bank
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Kode akuntansi pelanggan
 SupplierAccountancyCode=Kode akuntansi vendor
 CustomerAccountancyCodeShort=Cust. Akun. kode
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Anda yakin ingin menghapus pembayaran pajak sosi
 ExportDataset_tax_1=Pajak dan pembayaran sosial dan fiskal
 CalcModeVATDebt=Mode<b>%sVAT pada komitmen akuning%s </b>.
 CalcModeVATEngagement=Mode<b>%sVAT pada pendapatan-pengeluaran%s </b>.
-CalcModeDebt=Analisis faktur tercatat yang diketahui bahkan jika mereka belum diperhitungkan dalam buku besar.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analisis pembayaran tercatat yang diketahui, bahkan jika mereka belum diperhitungkan dalam Buku Besar.
 CalcModeBookkeeping=Analisis data dijurnal dalam tabel Pembukuan Pembukuan.
 CalcModeLT1= Mode<b>%sRE pada faktur pelanggan - pemasok invoices%s </b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Neraca pendapatan dan pengeluaran, ringkasan tahuna
 AnnualByCompanies=Saldo pendapatan dan pengeluaran, menurut kelompok akun yang telah ditentukan
 AnnualByCompaniesDueDebtMode=Neraca pendapatan dan pengeluaran, perincian menurut kelompok yang telah ditentukan, mode<b>%sClaims-Debts%s</b>berkata<b>akuntansi akuntan a09a4b7f0f
 AnnualByCompaniesInputOutputMode=Neraca pendapatan dan pengeluaran, perincian menurut kelompok yang telah ditentukan, mode<b>%s Penghasilan-Pengeluaran%s</b>mengatakan<b>akuntansi kas a09a4b739f178
-SeeReportInInputOutputMode=Lihat %sanalisis pembayaran%s untuk perhitungan pembayaran aktual yang dilakukan bahkan jika mereka belum diperhitungkan dalam Ledger.
-SeeReportInDueDebtMode=Lihat %s analisis faktur %s untuk perhitungan berdasarkan faktur tercatat yang diketahui bahkan jika mereka belum diperhitungkan dalam Ledger.
-SeeReportInBookkeepingMode=Lihat<b>%sLaporan pembuatan%s</b>untuk perhitungan pada<b>Tabel Pembukuan Pembukuan a09a4b739f17f8f0z
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Jumlah yang ditampilkan termasuk semua pajak
 RulesResultDue=- Ini termasuk faktur terutang, biaya, PPN, sumbangan apakah mereka dibayar atau tidak. Juga termasuk gaji yang dibayarkan. <br> - Ini didasarkan pada tanggal penagihan faktur dan pada tanggal jatuh tempo untuk pengeluaran atau pembayaran pajak. Untuk gaji yang ditentukan dengan modul Gaji, tanggal nilai pembayaran digunakan.
 RulesResultInOut=- Ini termasuk pembayaran nyata yang dilakukan pada faktur, biaya, PPN dan gaji. <br> - Ini didasarkan pada tanggal pembayaran faktur, biaya, PPN dan gaji. Tanggal donasi untuk donasi.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Ini menunjukkan catatan dalam Buku Besar Anda
 SeePageForSetup=Lihat menu <a href="%s"> %s </a> untuk pengaturan
 DepositsAreNotIncluded=- Faktur pembayaran tidak termasuk
 DepositsAreIncluded=- Faktur pembayaran disertakan
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Laporkan pajak 2 oleh pihak ketiga
 LT2ReportByCustomers=Laporkan pajak 3 oleh pihak ketiga
 LT1ReportByCustomersES=Laporan oleh RE pihak ketiga
 LT2ReportByCustomersES=Laporkan oleh IRPF pihak ketiga
 VATReport=Laporan pajak penjualan
 VATReportByPeriods=Laporan pajak penjualan berdasarkan periode
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Laporan pajak penjualan berdasarkan tarif
 VATReportByThirdParties=Laporan pajak penjualan oleh pihak ketiga
 VATReportByCustomers=Laporan pajak penjualan oleh pelanggan
diff --git a/htdocs/langs/id_ID/cron.lang b/htdocs/langs/id_ID/cron.lang
index 611fd7aa4ba..226c36001ea 100644
--- a/htdocs/langs/id_ID/cron.lang
+++ b/htdocs/langs/id_ID/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Hapus pekerjaan terjadwal
 Permission23104 = Jalankan pekerjaan yang Dijadwalkan
 # Admin
 CronSetup=Penyiapan manajemen pekerjaan terjadwal
-URLToLaunchCronJobs=URL untuk memeriksa dan meluncurkan pekerjaan cron yang berkualitas
-OrToLaunchASpecificJob=Atau untuk memeriksa dan meluncurkan pekerjaan tertentu
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Kunci keamanan untuk URL untuk meluncurkan pekerjaan cron
 FileToLaunchCronJobs=Baris perintah untuk memeriksa dan meluncurkan pekerjaan cron yang berkualitas
 CronExplainHowToRunUnix=Pada lingkungan Unix Anda harus menggunakan entri crontab berikut untuk menjalankan baris perintah setiap 5 menit
 CronExplainHowToRunWin=Pada lingkungan Microsoft (tm) Windows Anda dapat menggunakan alat Tugas Terjadwal untuk menjalankan baris perintah setiap 5 menit
 CronMethodDoesNotExists=Kelas %s tidak mengandung metode apa pun %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Profil pekerjaan Cron didefinisikan ke dalam file deskriptor modul. Ketika modul diaktifkan, mereka dimuat dan tersedia sehingga Anda dapat mengelola pekerjaan dari menu alat admin %s.
 CronJobProfiles=Daftar profil pekerjaan cron yang telah ditentukan
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Jumlah peluncuran
 CronMaxRun=Jumlah maksimum peluncuran
 CronEach=Setiap
 JobFinished=Pekerjaan diluncurkan dan selesai
+Scheduled=Scheduled
 #Page card
 CronAdd= Tambahkan pekerjaan
 CronEvery=Jalankan pekerjaan masing-masing
@@ -56,7 +58,7 @@ CronNote=Komentar
 CronFieldMandatory=Bidang %s wajib diisi
 CronErrEndDateStartDt=Tanggal akhir tidak boleh sebelum tanggal mulai
 StatusAtInstall=Status pada pemasangan modul
-CronStatusActiveBtn=Memungkinkan
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Nonaktifkan
 CronTaskInactive=Pekerjaan ini dinonaktifkan
 CronId=Indo
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=Pencadangan basis data lokal
 MakeLocalDatabaseDump=Buat dump basis data lokal. Parameternya adalah: kompresi ('gz' atau 'bz' atau 'tidak ada'), jenis cadangan ('mysql', 'pgsql', 'auto'), 1, 'otomatis' atau nama file yang akan dibuat, jumlah file cadangan yang akan disimpan
 WarningCronDelayed=Perhatian, untuk tujuan kinerja, apa pun tanggal berikutnya pelaksanaan pekerjaan yang diaktifkan, pekerjaan Anda mungkin tertunda hingga maksimum %s jam, sebelum dijalankan.
 DATAPOLICYJob=Pembersih data dan penganonim
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index 0d776c69a27..73af84cd831 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Tidak ada kesalahan, kami berkomitmen
 # Errors
 ErrorButCommitIsDone=Kesalahan ditemukan tetapi kami memvalidasinya
 ErrorBadEMail=Email %s salah
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s salah
 ErrorBadValueForParamNotAString=Nilai buruk untuk parameter Anda. Biasanya ditambahkan ketika terjemahan tidak ada.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s sudah ada.
 ErrorGroupAlreadyExists=Grup %s sudah ada.
 ErrorRecordNotFound=Rekaman tidak ditemukan.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Beberapa bidang wajib diisi tidak terisi.
 ErrorSubjectIsRequired=Diperlukan topik email
 ErrorFailedToCreateDir=Gagal membuat direktori. Periksa apakah pengguna server Web memiliki izin untuk menulis ke direktori dokumen Dolibarr. Jika parameter<b>safe_mode</b>diaktifkan pada PHP ini, periksa apakah file-file Dolibarr php milik pengguna web server (atau grup).
 ErrorNoMailDefinedForThisUser=Tidak ada surat yang ditentukan untuk pengguna ini
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Fitur ini perlu javascript untuk diaktifkan agar berfungsi. Ubah ini dalam pengaturan - tampilan.
 ErrorTopMenuMustHaveAParentWithId0=Menu bertipe 'Top' tidak dapat memiliki menu induk. Masukkan 0 di menu induk atau pilih menu dengan tipe 'Kiri'.
 ErrorLeftMenuMustHaveAParentId=Menu bertipe 'Kiri' harus memiliki id induk.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Nama profil ini sudah ada untuk set ekspor ini.
 ErrorLDAPSetupNotComplete=Pencocokan Dolibarr-LDAP tidak lengkap.
 ErrorLDAPMakeManualTest=File .ldif telah dibuat di direktori %s. Cobalah memuatnya secara manual dari baris perintah untuk mendapatkan informasi lebih lanjut tentang kesalahan.
 ErrorCantSaveADoneUserWithZeroPercentage=Tidak dapat menyimpan tindakan dengan "status tidak dimulai" jika bidang "dilakukan oleh" juga diisi.
-ErrorRefAlreadyExists=Referensi yang digunakan untuk pembuatan sudah ada.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Masukkan nama laporan bank tempat entri harus dilaporkan (Format YYYYMM atau YYYYMMDD)
 ErrorRecordHasChildren=Gagal menghapus catatan karena memiliki beberapa catatan anak.
 ErrorRecordHasAtLeastOneChildOfType=Objek memiliki setidaknya satu anak tipe %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Anda harus memilih apakah artikel
 ErrorDiscountLargerThanRemainToPaySplitItBefore=Diskon yang Anda coba terapkan lebih besar daripada tetap membayar. Membagi diskon menjadi 2 diskon lebih kecil sebelumnya.
 ErrorFileNotFoundWithSharedLink=File tidak ditemukan. Mungkin kunci berbagi diubah atau file dihapus baru-baru ini.
 ErrorProductBarCodeAlreadyExists=Barcode produk %s sudah ada pada referensi produk lain.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Perhatikan juga bahwa menggunakan produk virtual untuk menambah / mengurangi subproduk secara otomatis tidak dimungkinkan ketika setidaknya satu sub-produk (atau subproduk dari subproduk) memerlukan nomor seri / lot.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Deskripsi adalah wajib untuk saluran dengan produk gratis
 ErrorAPageWithThisNameOrAliasAlreadyExists=Halaman / wadah<strong>%s </strong> memiliki nama atau alias alternatif yang sama dengan yang Anda coba gunakan
 ErrorDuringChartLoad=Kesalahan saat memuat bagan akun. Jika beberapa akun tidak dimuat, Anda masih dapat memasukkannya secara manual.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Kesalahan, string untuk diganti menjadi kosong
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Parameter PHP Anda upload_max_filesize (%s) lebih tinggi dari parameter PHP post_max_size (%s). Ini bukan pengaturan yang konsisten.
 WarningPasswordSetWithNoAccount=Kata sandi ditetapkan untuk anggota ini. Namun, tidak ada akun pengguna yang dibuat. Jadi kata sandi ini disimpan tetapi tidak dapat digunakan untuk masuk ke Dolibarr. Ini dapat digunakan oleh modul / antarmuka eksternal tetapi jika Anda tidak perlu mendefinisikan login atau kata sandi untuk anggota, Anda dapat menonaktifkan opsi "Kelola login untuk setiap anggota" dari pengaturan modul Anggota. Jika Anda perlu mengelola login tetapi tidak memerlukan kata sandi, Anda dapat mengosongkan isian ini untuk menghindari peringatan ini. Catatan: Email juga dapat digunakan sebagai login jika anggota tersebut tertaut ke pengguna.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Info masuk Anda telah diubah. Untuk tujua
 WarningAnEntryAlreadyExistForTransKey=Entri sudah ada untuk kunci terjemahan untuk bahasa ini
 WarningNumberOfRecipientIsRestrictedInMassAction=Peringatan, jumlah penerima yang berbeda terbatas pada<b>%s</b>saat menggunakan aksi massa dalam daftar
 WarningDateOfLineMustBeInExpenseReportRange=Peringatan, tanggal saluran tidak dalam kisaran laporan pengeluaran
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Proyek ditutup. Anda harus membukanya kembali terlebih dahulu.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Beberapa transaksi bank dihapus setelah kwitansi termasuk mereka dihasilkan. Jadi nb cek dan total penerimaan mungkin berbeda dari jumlah dan total dalam daftar.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, gagal menambahkan entri file ke tabel indeks basis data ECM
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/id_ID/exports.lang b/htdocs/langs/id_ID/exports.lang
index dcf4255886e..39cc5685c18 100644
--- a/htdocs/langs/id_ID/exports.lang
+++ b/htdocs/langs/id_ID/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Kunci (kolom) untuk digunakan untuk memperbarui data yang ad
 NbInsert=Jumlah baris yang dimasukkan: %s
 NbUpdate=Jumlah baris yang diperbarui: %s
 MultipleRecordFoundWithTheseFilters=Beberapa catatan telah ditemukan dengan filter ini: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/id_ID/mails.lang b/htdocs/langs/id_ID/mails.lang
index 60dae133949..fad0f4c4496 100644
--- a/htdocs/langs/id_ID/mails.lang
+++ b/htdocs/langs/id_ID/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Masukan input email oleh pengguna
 MailingModuleDescDolibarrUsers=Pengguna dengan Email
 MailingModuleDescThirdPartiesByCategories=Pihak ketiga (berdasarkan kategori)
 SendingFromWebInterfaceIsNotAllowed=Mengirim dari antarmuka web tidak diizinkan.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Baris %s dalam berkas
@@ -125,12 +126,13 @@ TagMailtoEmail=Email Penerima (termasuk tautan html "mailto:")
 NoEmailSentBadSenderOrRecipientEmail=Tidak ada email yang dikirim. Pengirim atau penerima email salah. Verifikasi profil pengguna.
 # Module Notifications
 Notifications=Notifikasi
-NoNotificationsWillBeSent=Tidak ada pemberitahuan email yang direncanakan untuk agenda dan perusahaan ini
-ANotificationsWillBeSent=1 notifikasi akan dikirim melalui email
-SomeNotificationsWillBeSent=notifikasi %s akan dikirim melalui email
-AddNewNotification=Aktifkan pemberitahuan email baru untuk target/agenda
-ListOfActiveNotifications=Daftar semua target/agenda aktif untuk pemberitahuan email
-ListOfNotificationsDone=Daftar semua pemberitahuan email yang dikirim
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Konfigurasi pengiriman email telah diatur ke '%s'. Mode ini tidak dapat digunakan untuk mengirim email masal.
 MailSendSetupIs2=Anda pertama-tama harus pergi, dengan akun admin, ke dalam menu %sHome - Setup - EMails%s untuk mengubah parameter<strong>'%s' </strong> untuk menggunakan mode ' %s'. Dengan mode ini, Anda dapat masuk ke pengaturan server SMTP yang disediakan oleh Penyedia Layanan Internet Anda dan menggunakan fitur kirim email dengan skala besar.
 MailSendSetupIs3=Jika Anda memiliki pertanyaan tentang cara mengatur server SMTP Anda, Anda dapat bertanya ke %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Berkas yang diimpor harus memiliki format email <stro
 UseFormatInputEmailToTarget=Masukkan string dengan format<strong>email;nama;nama depan;lainnya</strong>
 MailAdvTargetRecipients=Penerima (pilihan lanjutan)
 AdvTgtTitle=Isi kolom input untuk memilih pihak ketiga atau kontak/alamat yang ditargetkan
-AdvTgtSearchTextHelp=Gunakan %% sebagai wildcard. Misalnya untuk menemukan semua item seperti <b>jean, joe, jim</b>, Anda dapat memasukkan <b>j%%</b>, Anda juga dapat menggunakan ; sebagai pemisah untuk nilai, dan gunakan ! sebagai kecuali nilai ini. Sebagai contoh <b>jean;joe;jim%%;!jimo;!jima%</b> akan menargetkan semua jean, joe, mulai dengan jim tetapi tidak jimo dan tidak semua yang dimulai dengan jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Gunakan sela untuk memilih nilai int atau float
 AdvTgtMinVal=Nilai minimum
 AdvTgtMaxVal=Nilai maksimum
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Buat filter
 AdvTgtOrCreateNewFilter=Nama filter baru
 NoContactWithCategoryFound=Tidak ditemukan kontak/alamat dengan kategori
 NoContactLinkedToThirdpartieWithCategoryFound=Tidak ditemukan kontak/alamat dengan kategori
-OutGoingEmailSetup=Pengaturan email keluar
-InGoingEmailSetup=Penyiapan email masuk
-OutGoingEmailSetupForEmailing=Pengaturan Email Keluar (untuk modul %s)
-DefaultOutgoingEmailSetup=Pengaturan email keluar standar
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Informasi
 ContactsWithThirdpartyFilter=Kontak dengan filter pihak ketiga
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index def7208cb73..709d45afafa 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Tidak ada templat yang tersedia untuk jenis email ini
 AvailableVariables=Variabel substitusi yang tersedia
 NoTranslation=Tanpa terjemahan
 Translation=Terjemahan
+CurrentTimeZone=TimeZone PHP (Server)
 EmptySearchString=Masukkan kriteria pencarian yang tidak kosong
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Tidak ada catatan yang ditemukan
 NoRecordDeleted=Tidak ada catatan yang dihapus
 NotEnoughDataYet=Tidak cukup data
@@ -85,6 +87,8 @@ FileWasNotUploaded=File dipilih untuk lampiran tetapi belum diunggah. Klik pada
 NbOfEntries=Jumlah entri
 GoToWikiHelpPage=Baca bantuan online (Diperlukan akses Internet)
 GoToHelpPage=Baca bantuan
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Rekam disimpan
 RecordDeleted=Rekam dihapus
 RecordGenerated=Rekaman dihasilkan
@@ -433,6 +437,7 @@ RemainToPay=Tetap membayar
 Module=Modul / Aplikasi
 Modules=Modul / Aplikasi
 Option=Pilihan
+Filters=Filters
 List=Daftar
 FullList=Daftar lengkap
 FullConversation=Percakapan penuh
@@ -671,7 +676,7 @@ SendMail=Mengirim email
 Email=Email
 NoEMail=Tidak ada email
 AlreadyRead=Sudah baca
-NotRead=Tidak membaca
+NotRead=Unread
 NoMobilePhone=Tidak ada ponsel
 Owner=Pemilik
 FollowingConstantsWillBeSubstituted=Konstanta berikut akan diganti dengan nilai yang sesuai.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/id_ID/modulebuilder.lang b/htdocs/langs/id_ID/modulebuilder.lang
index e8584203a6e..aeecb827d2a 100644
--- a/htdocs/langs/id_ID/modulebuilder.lang
+++ b/htdocs/langs/id_ID/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=Halaman PHP untuk membuat / mengedit / melihat catatan
 PageForAgendaTab=Halaman PHP untuk tab agenda
 PageForDocumentTab=Halaman PHP untuk tab dokumen
 PageForNoteTab=Halaman PHP untuk tab note
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path ke zip paket modul / aplikasi
 PathToModuleDocumentation=Path ke file modul / dokumentasi aplikasi (%s)
 SpaceOrSpecialCharAreNotAllowed=Spasi atau karakter khusus tidak diperbolehkan.
@@ -77,7 +78,7 @@ IsAMeasure=Adalah ukuran
 DirScanned=Direktori dipindai
 NoTrigger=Tidak ada pemicu
 NoWidget=Tidak ada widget
-GoToApiExplorer=Buka Penjelajah API
+GoToApiExplorer=API explorer
 ListOfMenusEntries=Daftar entri menu
 ListOfDictionariesEntries=Daftar entri kamus
 ListOfPermissionsDefined=Daftar izin yang ditentukan
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Jika Anda memiliki pengetahuan tentang SQL dan PHP, And
 SeeTopRightMenu=Lihat <span class="fa fa-bug"> </span> di menu kanan atas
 AddLanguageFile=Tambahkan file bahasa
 YouCanUseTranslationKey=Di sini Anda dapat menggunakan kunci yang merupakan kunci terjemahan yang ditemukan dalam file bahasa (lihat tab "Bahasa")
-DropTableIfEmpty=(Hapus tabel jika kosong)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=Tabel %s tidak ada
 TableDropped=Tabel %s dihapus
 InitStructureFromExistingTable=Membangun string array struktur dari tabel yang ada
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Gunakan URL editor tertentu
 UseSpecificFamily = Gunakan keluarga tertentu
 UseSpecificAuthor = Gunakan penulis tertentu
 UseSpecificVersion = Gunakan versi awal tertentu
-ModuleMustBeEnabled=Modul / aplikasi harus diaktifkan terlebih dahulu
 IncludeRefGeneration=Referensi objek harus dihasilkan secara otomatis
 IncludeRefGenerationHelp=Periksa ini jika Anda ingin memasukkan kode untuk mengelola pembuatan referensi secara otomatis
 IncludeDocGeneration=Saya ingin menghasilkan beberapa dokumen dari objek
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Jenis bidang: <br> varchar (99), ganda (24,8), real, teks, html
 AsciiToHtmlConverter=Pengonversi Ascii ke HTML
 AsciiToPdfConverter=Pengonversi ascii ke PDF
 TableNotEmptyDropCanceled=Meja tidak kosong. Drop telah dibatalkan.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang
index 67d6dae2501..f2881a04775 100644
--- a/htdocs/langs/id_ID/other.lang
+++ b/htdocs/langs/id_ID/other.lang
@@ -5,8 +5,6 @@ Tools=Alat
 TMenuTools=Alat
 ToolsDesc=Semua alat yang tidak termasuk dalam entri menu lain dikelompokkan di sini.<br>Semua alat dapat diakses melalui menu kiri.
 Birthday=Ulang tahun
-BirthdayDate=Tanggal lahir
-DateToBirth=Tanggal lahir
 BirthdayAlertOn=peringatan ulang tahun aktif
 BirthdayAlertOff=peringatan ulang tahun tidak aktif
 TransKey=Terjemahan dari kunci TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Bulan sebelumnya (nomor 1-12) dari tanggal faktur
 TextPreviousMonthOfInvoice=Bulan sebelumnya (teks) dari tanggal faktur
 NextMonthOfInvoice=Bulan berikutnya (nomor 1-12) dari tanggal faktur
 TextNextMonthOfInvoice=Bulan berikutnya (teks) dari tanggal faktur
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=File zip dihasilkan menjadi<b>%s </b>.
 DocFileGeneratedInto=File Doc dihasilkan menjadi<b>%s </b>.
 JumpToLogin=Terputus. Buka halaman login ...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Halo)__\n\nSilakan temukan pengiriman __REF
 PredefinedMailContentSendFichInter=__(Halo)__\n\nSilakan temukan intervensi __REF__ terlampir\n\n\n__ (Hormat) __\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Anda dapat mengklik tautan di bawah untuk melakukan pembayaran jika belum dilakukan.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr adalah ERP / CRM ringkas yang mendukung beberapa modul bisnis. Demo yang menampilkan semua modul tidak masuk akal karena skenario ini tidak pernah terjadi (beberapa ratus tersedia). Jadi, beberapa profil demo tersedia.
 ChooseYourDemoProfil=Pilih profil demo yang paling sesuai dengan kebutuhan Anda ...
 ChooseYourDemoProfilMore=... atau buat profil Anda sendiri <br> (pemilihan modul manual)
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Kontak / alamat yang dibuat oleh kolektor email d
 ProjectCreatedByEmailCollector=Proyek dibuat oleh kolektor email dari email MSGID %s
 TicketCreatedByEmailCollector=Tiket dibuat oleh kolektor email dari email MSGID %s
 OpeningHoursFormatDesc=Gunakan a - untuk memisahkan jam buka dan tutup. <br> Gunakan spasi untuk memasukkan rentang yang berbeda. <br> Contoh: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Area ekspor
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index 74921ca30f8..096014935eb 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Beberapa segmen harga per produk / layanan (setiap pelanggan berada dalam satu segmen harga)
 MultiPricesNumPrices=Jumlah harga
 DefaultPriceType=Basis harga per default (dengan versus tanpa pajak) saat menambahkan harga jual baru
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Jumlah produk kemasan induk
@@ -167,8 +168,10 @@ BuyingPrices=Harga beli
 CustomerPrices=Harga pelanggan
 SuppliersPrices=Harga penjual
 SuppliersPricesOfProductsOrServices=Harga vendor (produk atau layanan)
-CustomCode=Bea Cukai / Komoditas / kode HS
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Negara Asal
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Sifat produk (bahan / selesai)
 NatureOfProductShort=Sifat produk
 NatureOfProductDesc=Bahan baku mentah atau produk jadi
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Gunakan harga tetap
 PriceByQuantity=Harga berbeda dengan kuantitas
 DisablePriceByQty=Nonaktifkan harga berdasarkan kuantitas
 PriceByQuantityRange=Rentang kuantitas
-MultipriceRules=Aturan segmen harga
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Gunakan aturan segmen harga (didefinisikan dalam pengaturan modul produk) untuk secara otomatis menghitung harga semua segmen lain sesuai dengan segmen pertama
 PercentVariationOver=variasi %% lebih dari %s
 PercentDiscountOver=%% diskon lebih dari %s
diff --git a/htdocs/langs/id_ID/recruitment.lang b/htdocs/langs/id_ID/recruitment.lang
index e1e686e6d5f..97ceb8dc169 100644
--- a/htdocs/langs/id_ID/recruitment.lang
+++ b/htdocs/langs/id_ID/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/id_ID/sendings.lang b/htdocs/langs/id_ID/sendings.lang
index c780874113f..cb5514d96ea 100644
--- a/htdocs/langs/id_ID/sendings.lang
+++ b/htdocs/langs/id_ID/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Pengiriman lain untuk pesanan ini
 SendingsAndReceivingForSameOrder=Pengiriman dan kwitansi untuk pesanan ini
 SendingsToValidate=Pengiriman untuk divalidasi
 StatusSendingCanceled=Dibatalkan
+StatusSendingCanceledShort=Dibatalkan
 StatusSendingDraft=Konsep
 StatusSendingValidated=Divalidasi (produk untuk dikirim atau pun sudah dikirim)
 StatusSendingProcessed=Diproses
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Anda harus terlebih dahulu memvalidasi pesanan
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Model dokumen yang lebih lengkap untuk tanda terima pengiriman (logo ...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER Konstan tidak ditentukan
 SumOfProductVolumes=Jumlah volume produk
 SumOfProductWeights=Jumlah bobot produk
diff --git a/htdocs/langs/id_ID/stocks.lang b/htdocs/langs/id_ID/stocks.lang
index 88ba7c376fd..e29ca8f5c29 100644
--- a/htdocs/langs/id_ID/stocks.lang
+++ b/htdocs/langs/id_ID/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/id_ID/ticket.lang b/htdocs/langs/id_ID/ticket.lang
index d8bc9fd797a..2a25919c9be 100644
--- a/htdocs/langs/id_ID/ticket.lang
+++ b/htdocs/langs/id_ID/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Tiket - Jenis
 TicketDictCategory=Tiket - Grup
 TicketDictSeverity=Tiket - Tingkat Permasalahan
 TicketDictResolution=Tiket - Resolusi
-TicketTypeShortBUGSOFT=Logika Tidak Berfungsi 
-TicketTypeShortBUGHARD=Materi Tidak Berfungsi
-TicketTypeShortCOM=Pertanyaan komersial
 
+TicketTypeShortCOM=Pertanyaan komersial
 TicketTypeShortHELP=Permintaan bantuan fungsional
 TicketTypeShortISSUE=Masalah, bug, atau masalah
 TicketTypeShortREQUEST=Ubah atau tingkatkan permintaan
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Lainnya
 TicketSeverityShortLOW=Rendah
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Tinggi
-TicketSeverityShortBLOCKING=Kritis/Memblokir
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Bidang '%s' salah
 MenuTicketMyAssign=Tiket saya
@@ -60,7 +58,6 @@ OriginEmail=Sumber email
 Notify_TICKET_SENTBYMAIL=Kirim pesan tiket melalui email
 
 # Status
-NotRead=Tidak membaca
 Read=Baca
 Assigned=Ditugaskan
 InProgress=Sedang berlangsung
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Antarmuka publik memungkinkan setiap pengunju
 TicketsAutoAssignTicket=Secara otomatis menetapkan pengguna yang membuat tiket
 TicketsAutoAssignTicketHelp=Saat membuat tiket, pengguna dapat secara otomatis ditugaskan ke tiket.
 TicketNumberingModules=Modul penomoran tiket
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Beri tahu pihak ketiga saat membuat
 TicketsDisableCustomerEmail=Selalu nonaktifkan email saat tiket dibuat dari antarmuka publik
 TicketsPublicNotificationNewMessage=Kirim email saat pesan baru ditambahkan
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status berubah: %s menjadi %s
 TicketNotNotifyTiersAtCreate=Tidak memberi tahu perusahaan saat membuat
 Unread=Belum dibaca
 TicketNotCreatedFromPublicInterface=Tidak tersedia. Tiket tidak dibuat dari antarmuka publik.
-PublicInterfaceNotEnabled=Antarmuka publik tidak diaktifkan
 ErrorTicketRefRequired=Diperlukan nama referensi tiket
 
 #
diff --git a/htdocs/langs/id_ID/website.lang b/htdocs/langs/id_ID/website.lang
index 9d0b6cc0fe1..eb522b5a859 100644
--- a/htdocs/langs/id_ID/website.lang
+++ b/htdocs/langs/id_ID/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit sebaris
 AddWebsite=Tambahkan situs web
 Webpage=Halaman web / wadah
 AddPage=Tambahkan halaman / wadah
-HomePage=Halaman Depan
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Pratinjau situs web Anda<strong>%s </strong> belum tersedia. Anda harus terlebih dahulu '<strong> Impor template situs web lengkap </strong>' atau hanya '<strong> Tambahkan halaman / wadah </strong>'.
 RequestedPageHasNoContentYet=Halaman yang diminta dengan id %s belum memiliki konten, atau file cache .tpl.php telah dihapus. Edit konten halaman untuk menyelesaikan ini.
@@ -101,7 +100,7 @@ EmptyPage=Halaman kosong
 ExternalURLMustStartWithHttp=URL eksternal harus dimulai dengan http: // atau https: //
 ZipOfWebsitePackageToImport=Unggah file Zip dari paket templat situs web
 ZipOfWebsitePackageToLoad=atau Pilih paket templat situs web tertanam yang tersedia
-ShowSubcontainers=Sertakan konten dinamis
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=URL halaman internal
 ThisPageIsTranslationOf=Halaman / wadah ini adalah terjemahan dari
 ThisPageHasTranslationPages=Halaman / wadah ini memiliki terjemahan
@@ -137,3 +136,4 @@ RSSFeedDesc=Anda bisa mendapatkan RSS feed dari artikel terbaru dengan mengetikk
 PagesRegenerated=%s halaman / wadah dibuat ulang
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/id_ID/withdrawals.lang b/htdocs/langs/id_ID/withdrawals.lang
index 1ff4c8b5eef..48f3e2b2044 100644
--- a/htdocs/langs/id_ID/withdrawals.lang
+++ b/htdocs/langs/id_ID/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Tanda terima debit langsung %s terbaru
 MakeWithdrawRequest=Buat permintaan pembayaran debit langsung
 MakeBankTransferOrder=Buat Permintaan Transfer Kredit
 WithdrawRequestsDone=%s permintaan pembayaran debit langsung dicatat
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Kode bank pihak ketiga
 NoInvoiceCouldBeWithdrawed=Tidak ada faktur yang berhasil didebit. Periksa apakah faktur ada pada perusahaan dengan IBAN yang valid dan bahwa IBAN memiliki UMR (Referensi Mandat Unik) dengan mode<strong>%s </strong>.
 ClassCredited=Klasifikasi dikreditkan
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Tanggal eksekusi
 CreateForSepa=Buat berkas debet langsung
-ICS=Pengidentifikasi Kreditor CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END=Tag XML SEPA "EndToEndId" - Id unik yang ditetapkan untuk setiap transaksi
 USTRD=Tag XML SEPA "Tidak Terstruktur"
 ADDDAYS=Tambahkan hari ke Tanggal Eksekusi
@@ -146,3 +148,4 @@ InfoRejectSubject=Pesanan pembayaran debit langsung ditolak
 InfoRejectMessage=Halo, <br> <br>, urutan pembayaran debit langsung dari %s yang terkait dengan perusahaan %s, dengan jumlah %s telah ditolak oleh bank. <br> <br> - <br> %s
 ModeWarning=Opsi untuk mode nyata tidak disetel, kami berhenti setelah simulasi ini
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang
index c83c3cef1d6..766d7cac0ca 100644
--- a/htdocs/langs/is_IS/accountancy.lang
+++ b/htdocs/langs/is_IS/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index a97b287a176..9696eab0725 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Skoða
 SetupArea=Skipulag
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form til að prófa skrá hlaða (samkvæmt skipulag)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Ath: er já aðeins gild ef <b>einingin %s </b> er virkt
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Sýna forskoðun
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Forskoðun er ekki í boði
 ThemeCurrentlyActive=Þema virk
-CurrentTimeZone=PHP-miðlara Tímasvæði
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Hreinsa nú
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=Notandanafn eða skjölum verktaki '(Doc, FAQs ...), <br> kíkið á Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s </b></a>
 ForAnswersSeeForum=Fyrir einhverjar aðrar spurningar / hjálp, getur þú notað Dolibarr spjall: <br> <a href="%s" target="_blank"><b> %s </b></a>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=Listi yfir OpenDocument sniðmát framkvæmdarstjóra
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Dæmi um setningafræði: <br> c: \\ mydir <br> / Home / mydir <br> DOL_DATA_ROOT / ECM / ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Til að vita hvernig á að búa odt skjalið sniðmát, áður en að geyma þá í þeim möppum, lesa wiki skjöl:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Staðsetning firstname / nafn
@@ -406,7 +408,7 @@ UrlGenerationParameters=Breytur til að tryggja vefslóðir
 SecurityTokenIsUnique=Nota einstakt securekey breytu fyrir hvert slóð
 EnterRefToBuildUrl=Sláðu inn tilvísun til %s mótmæla
 GetSecuredUrl=Fá reiknað slóð
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Nýr matseðill
 MenuHandler=Valmynd dýraþjálfari
 MenuModule=Heimild mát
-HideUnauthorizedMenu= Fela óviðkomandi valmyndir (grátt)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Auðkenni Valmynd
 DetailMenuHandler=Valmynd dýraþjálfari hvar á að birta nýja valmynd
 DetailMenuModule=Module nafn ef matseðill færsla kemur frá einingu
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/is_IS/banks.lang b/htdocs/langs/is_IS/banks.lang
index ca4aef62431..255e70e0997 100644
--- a/htdocs/langs/is_IS/banks.lang
+++ b/htdocs/langs/is_IS/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/is_IS/blockedlog.lang b/htdocs/langs/is_IS/blockedlog.lang
index 4a0e02851e2..ffd835ef987 100644
--- a/htdocs/langs/is_IS/blockedlog.lang
+++ b/htdocs/langs/is_IS/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/is_IS/boxes.lang b/htdocs/langs/is_IS/boxes.lang
index d1b8a7367be..d0b923855b3 100644
--- a/htdocs/langs/is_IS/boxes.lang
+++ b/htdocs/langs/is_IS/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=Engin bókamerki skilgreind. Smelltu <a href="%s">hér</a> til að bæta við bókamerki.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Bókhalds
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/is_IS/cashdesk.lang b/htdocs/langs/is_IS/cashdesk.lang
index e5ac19f8ff5..244a0b22645 100644
--- a/htdocs/langs/is_IS/cashdesk.lang
+++ b/htdocs/langs/is_IS/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=NB af reikningum
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/is_IS/categories.lang b/htdocs/langs/is_IS/categories.lang
index 12ea7e5e036..b5b63e566bb 100644
--- a/htdocs/langs/is_IS/categories.lang
+++ b/htdocs/langs/is_IS/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Fyllingar eiginleika
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/is_IS/companies.lang b/htdocs/langs/is_IS/companies.lang
index 1ec0e068f53..86883bf1c40 100644
--- a/htdocs/langs/is_IS/companies.lang
+++ b/htdocs/langs/is_IS/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Athuga ekki hægt. Athugaðu þjónusta er ekki veitt af aðildarríki ( %s ).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Möguleiki
diff --git a/htdocs/langs/is_IS/compta.lang b/htdocs/langs/is_IS/compta.lang
index 8a3d0831930..b281068b1a6 100644
--- a/htdocs/langs/is_IS/compta.lang
+++ b/htdocs/langs/is_IS/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Sýna VSK greiðslu
 TotalToPay=Samtals borga
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Skýrsla um þriðja aðila IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/is_IS/cron.lang b/htdocs/langs/is_IS/cron.lang
index 2d3b08fe463..52aaabab757 100644
--- a/htdocs/langs/is_IS/cron.lang
+++ b/htdocs/langs/is_IS/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Create/update Scheduled job
 Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
-CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+CronSetup=Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Forgangur
 CronLabel=Merki
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -56,16 +58,16 @@ CronNote=Athugasemd
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Slökkva
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=Frá
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Shell command
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index 05a5bca9bb6..82755eaab2b 100644
--- a/htdocs/langs/is_IS/errors.lang
+++ b/htdocs/langs/is_IS/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s  er rangt
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Innskráning %s  er þegar til.
 ErrorGroupAlreadyExists=Group %s  er þegar til.
 ErrorRecordNotFound=Upptaka fannst ekki.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Sumir Nauðsynlegir reitir voru ekki fylltir.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Ekki tókst að búa til möppu. Athugaðu að vefþjóninn notandi hefur réttindi til að skrifa inn Dolibarr skjöl skrá. Ef viðfang <b>safe_mode</b> er virkt á þessu PHP, athuga hvort Dolibarr PHP skrár á nú á netþjóninn notandi (eða hóp).
 ErrorNoMailDefinedForThisUser=Nei póstur er skilgreind fyrir þennan notanda
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Þessi aðgerð þarfnast javascript til að virkja til vinnu. Breyting þessi hefur skipulag - sýna.
 ErrorTopMenuMustHaveAParentWithId0=A valmynd af gerðinni 'Efst' má ekki hafa foreldri valmyndinni. Put 0 í valmyndinni foreldri eða veldu Valmynd af gerðinni 'Vinstri'.
 ErrorLeftMenuMustHaveAParentId=A valmynd af gerðinni 'Vinstri' verða að hafa foreldri kt.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP samsvörun er ekki lokið.
 ErrorLDAPMakeManualTest=A. LDIF skrá hefur verið búin til í %s . Prófaðu að hlaða það handvirkt úr stjórn lína að hafa meiri upplýsingar um villur.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref notað sköpun er þegar til.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/is_IS/exports.lang b/htdocs/langs/is_IS/exports.lang
index 63970ffbd21..a9f6a31bddf 100644
--- a/htdocs/langs/is_IS/exports.lang
+++ b/htdocs/langs/is_IS/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field titill
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Bókasafn
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Skref
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/is_IS/mails.lang b/htdocs/langs/is_IS/mails.lang
index 0c77e81bb81..b51a138bbc8 100644
--- a/htdocs/langs/is_IS/mails.lang
+++ b/htdocs/langs/is_IS/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Lína %s  í skrá
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Tilkynningar
-NoNotificationsWillBeSent=Engar tilkynningar í tölvupósti er mjög spennandi fyrir þennan atburð og fyrirtæki
-ANotificationsWillBeSent=1 tilkynning verður send með tölvupósti
-SomeNotificationsWillBeSent=%s  tilkynningar verða sendar í tölvupósti
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=Sýna allar tilkynningar í tölvupósti sendi
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index 55729865831..223a23162f8 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Þýðing
+CurrentTimeZone=PHP-miðlara Tímasvæði
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=A-skrá er valin fyrir viðhengi en var ekki enn upp. Smelltu
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Lestu hjálpina
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Upptaka vistuð
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Valkostur
+Filters=Filters
 List=Listi
 FullList=Sjá lista
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Senda tölvupóst
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Eigandi
 FollowingConstantsWillBeSubstituted=Eftir Fastar verður staðgengill með samsvarandi gildi.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/is_IS/modulebuilder.lang b/htdocs/langs/is_IS/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/is_IS/modulebuilder.lang
+++ b/htdocs/langs/is_IS/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang
index 6eef3ff2036..f14519c518e 100644
--- a/htdocs/langs/is_IS/other.lang
+++ b/htdocs/langs/is_IS/other.lang
@@ -5,8 +5,6 @@ Tools=Verkfæri
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Afmæli
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=afmæli viðvörun virk
 BirthdayAlertOff=afmæli viðvörun óvirk
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Hægri
 CalculatedWeight=Reiknað þyngd
 CalculatedVolume=Reiknað magn
 Weight=Þyngd
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Útflutningur area
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index 028eea77a82..2997e613496 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Fjöldi verð
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Uppruni land
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/is_IS/recruitment.lang b/htdocs/langs/is_IS/recruitment.lang
index feaa40a6de2..411fc152c09 100644
--- a/htdocs/langs/is_IS/recruitment.lang
+++ b/htdocs/langs/is_IS/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/is_IS/sendings.lang b/htdocs/langs/is_IS/sendings.lang
index b498380aa64..9bb3e783a22 100644
--- a/htdocs/langs/is_IS/sendings.lang
+++ b/htdocs/langs/is_IS/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Aðrar sendingar fyrir þessari röð
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Sendi til að sannreyna
 StatusSendingCanceled=Hætt við
+StatusSendingCanceledShort=Hætt við
 StatusSendingDraft=Víxill
 StatusSendingValidated=Staðfestar (vörur til skip eða þegar flutt)
 StatusSendingProcessed=Afgreitt
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Meira heill skjal líkan fyrir kvittunum sending (logo. ..)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER skilgreind ekki
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/is_IS/stocks.lang b/htdocs/langs/is_IS/stocks.lang
index eb22f8deba6..7fcebc4dc05 100644
--- a/htdocs/langs/is_IS/stocks.lang
+++ b/htdocs/langs/is_IS/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/is_IS/ticket.lang b/htdocs/langs/is_IS/ticket.lang
index 956e3b0a629..113be596543 100644
--- a/htdocs/langs/is_IS/ticket.lang
+++ b/htdocs/langs/is_IS/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Önnur
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Hár
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Lesa
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/is_IS/website.lang b/htdocs/langs/is_IS/website.lang
index 5f3b13b98b1..bcec388e753 100644
--- a/htdocs/langs/is_IS/website.lang
+++ b/htdocs/langs/is_IS/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/is_IS/withdrawals.lang b/htdocs/langs/is_IS/withdrawals.lang
index 755bbeb6aee..db2e367a991 100644
--- a/htdocs/langs/is_IS/withdrawals.lang
+++ b/htdocs/langs/is_IS/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Flokka fært
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Valkostur fyrir alvöru ham var ekki sett, að hætta við eftir þessa uppgerð
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/it_CH/compta.lang b/htdocs/langs/it_CH/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/it_CH/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/it_CH/products.lang b/htdocs/langs/it_CH/products.lang
deleted file mode 100644
index 6e900475275..00000000000
--- a/htdocs/langs/it_CH/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index efd66d86cb6..6464d3036eb 100644
--- a/htdocs/langs/it_IT/accountancy.lang
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=Tutti i paesi eccetto %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Account principale di contabilità per i clienti non definito nel setup
 MainAccountForSuppliersNotDefined=Account principale di contabilità per fornitori non definito nel setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Non collegato al piano dei conti
 XLineSuccessfullyBinded=%sprodotti/servizi correttamente collegato ad un piano dei conti
 XLineFailedToBeBinded=%sprodotti/servizi non collegato a nessun piano dei conti
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Numero di elementi da associare mostrato per pagina (massimo raccomandato: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Inizia ad ordinare la pagina "Associazioni da effettuare" dagli elementi più recenti
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Inizia ad ordinare la pagina "Associazioni effettuate" dagli elementi più recenti
 
@@ -198,7 +199,8 @@ Docdate=Data
 Docref=Riferimento
 LabelAccount=Etichetta conto
 LabelOperation=Etichetta operazione
-Sens=Verso
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Codice impressioni
 Lettering=Impressioni
 Codejournal=Giornale
@@ -206,7 +208,8 @@ JournalLabel=Etichetta del giornale
 NumPiece=Numero del pezzo
 TransactionNumShort=Num. transazione
 AccountingCategory=Gruppi personalizzati
-GroupByAccountAccounting=Raggruppamento piano dei conti
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Qui puoi definire alcuni gruppi di conti contabili. Saranno utilizzati per rapporti contabili personalizzati.
 ByAccounts=Per conto
 ByPredefinedAccountGroups=Per gruppi predefiniti
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Saldo di apertura
 ShowOpeningBalance=Mostra bilancio di apertura
 HideOpeningBalance=Nascondi bilancio di apertura
-ShowSubtotalByGroup=Mostra totale parziale per gruppo
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Gruppo di conto
 PcgtypeDesc=Il gruppo di conti viene utilizzato come criterio 'filtro' e 'raggruppamento' predefiniti per alcuni report contabili. Ad esempio, "REDDITO" o "SPESA" sono utilizzati come gruppi per la contabilità dei prodotti per creare il rapporto spese / entrate.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consultare qui il numero di movimenti per mese che non sono stati convalidati e gli anni fiscali già aperti
 OverviewOfMovementsNotValidated=Passaggio 1 / Panoramica dei movimenti non convalidati. (Necessario per chiudere un anno fiscale)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Convalida i movimenti
 DescValidateMovements=Qualsiasi modifica o cancellazione di scrittura, lettura e cancellazione sarà vietata. Tutte le voci per un esercizio devono essere convalidate altrimenti la chiusura non sarà possibile
-SelectMonthAndValidate=Seleziona il mese e convalida i movimenti
 
 ValidateHistory=Collega automaticamente
 AutomaticBindingDone=Collegamento automatico fatto
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Mostra tutorial
 NotReconciled=Non conciliata
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Esporta per LD Compta (v10 e successive)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Esporta Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
@@ -381,7 +388,7 @@ Formula=Formula
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
-ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorNoAccountingCategoryForThisCountry=Nessun gruppo di piano dei conti disponibile per il paese %s ( Vedi Home - Impostazioni - Dizionari )
 ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Alcune righe della fattura non sono collegato a un piano dei conti.
 ExportNotSupported=Il formato di esportazione configurato non è supportato in questa pagina
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index b20c40b7563..cf90d4b649d 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Aspetto grafico e lingua
 SetupArea=Impostazioni
 UploadNewTemplate=Carica nuovi modelli
 FormToTestFileUploadForm=Modulo per provare il caricamento file (secondo la configurazione)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Nota: funziona solo se il <b>modulo %s</b> è attivo
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Vedi anteprima
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Anteprima non disponibile
 ThemeCurrentlyActive=Tema attualmente attivo
-CurrentTimeZone=Fuso orario attuale
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Spazio
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Questa area fornisce funzioni di amministrazione. Usa il men
 Purge=Pulizia
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Eliminia il file log, compreso <b>%s</b> definito per il modulo Syslog (nessun rischio di perdita di dati)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Cancella fle temporanei
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Procedo all'eliminazione
 PurgeNothingToDelete=Nessuna directory o file da eliminare.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Altre risorse
 ExternalResources=Risorse esterne
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=La documentazione per utenti e sviluppatori e le FAQ sono disponibili sul wiki di Dolibarr: <br/>Dai un'occhiata a <a href="%s" target="_blank"><b> %s</b></a>
 ForAnswersSeeForum=Per qualsiasi altro problema/domanda, si può utilizzare il forum di Dolibarr: <br> <a href="%s" target="_blank"><b>%s</b></a>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Esempi di funzionamento secondo la configurazione attua
 ListOfDirectories=Elenco delle directory dei modelli OpenDocument
 ListOfDirectoriesForModelGenODT=Lista di cartelle contenenti file modello in formato OpenDocument.<br><br>Inserisci qui il percorso completo delle cartelle.<br>Digitare un 'Invio' tra ciascuna cartella.<br>Per aggiungere una cartella del modulo GED, inserire qui <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>I file in quelle cartelle devono terminare con <b>.odt</b> o <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Esempi di sintassi: <br/> c: dir \\ <br/> /Home/mydir <br/> DOL_DATA_ROOT/ECM/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br/>Per sapere come creare i modelli di documento odt, prima di salvarli in queste directory, leggere la documentazione wiki:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Posizione del cognome/nome
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parametri di generazione degli indirizzi
 SecurityTokenIsUnique=Utilizzare un unico parametro securekey per ogni URL
 EnterRefToBuildUrl=Inserisci la reference per l'oggetto %s
 GetSecuredUrl=Prendi URL calcolato
-ButtonHideUnauthorized=Nascondi i pulsanti per azioni non autorizzate anziché mostrare i pulsanti disabilitati
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Vecchia aliquota IVA
 NewVATRates=Nuova aliquota IVA
 PriceBaseTypeToChange=Modifica i prezzi con la valuta di base definita.
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Nuovo menu
 MenuHandler=Gestore menu
 MenuModule=Modulo sorgente
-HideUnauthorizedMenu= Nascondere i menu non autorizzati
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Gestore menu dove mostrare il nuovo menu
 DetailMenuModule=Nome del modulo, per le voci di menu provenienti da un modulo
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=CAP
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang
index 67051003cf9..efd3b871d94 100644
--- a/htdocs/langs/it_IT/banks.lang
+++ b/htdocs/langs/it_IT/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=Mandato SEPA
 YourSEPAMandate=I tuoi mandati SEPA
 FindYourSEPAMandate=Questo è il tuo mandato SEPA che autorizza la nostra azienda ad effettuare un ordine di addebito diretto alla tua banca. Da restituire firmata (scansione del documento firmato) o inviato all'indirizzo email
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colora i movimenti
 BankColorizeMovementDesc=Se questa funzione è abilitata, è possibile scegliere il colore di sfondo specifico per i movimenti di debito o credito
 BankColorizeMovementName1=Colore di sfondo per il movimento di debito
diff --git a/htdocs/langs/it_IT/blockedlog.lang b/htdocs/langs/it_IT/blockedlog.lang
index 7a37bfa4034..558233cd0dc 100644
--- a/htdocs/langs/it_IT/blockedlog.lang
+++ b/htdocs/langs/it_IT/blockedlog.lang
@@ -22,8 +22,8 @@ logPAYMENT_CUSTOMER_CREATE=Customer payment created
 logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion
 logDONATION_PAYMENT_CREATE=Donation payment created
 logDONATION_PAYMENT_DELETE=Donation payment logical deletion
-logBILL_PAYED=Customer invoice paid
-logBILL_UNPAYED=Customer invoice set unpaid
+logBILL_PAYED=Fattura attiva pagata
+logBILL_UNPAYED=Fattura attiva impostata "non pagata"
 logBILL_VALIDATE=Convalida fattura attiva
 logBILL_SENTBYMAIL=Customer invoice send by mail
 logBILL_DELETE=Customer invoice logically deleted
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/it_IT/boxes.lang b/htdocs/langs/it_IT/boxes.lang
index 9c5a07767a4..d8f902aa65b 100644
--- a/htdocs/langs/it_IT/boxes.lang
+++ b/htdocs/langs/it_IT/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Ultime %s donazioni modificate
 BoxTitleLastModifiedExpenses=Ultime %s note spese modificate
 BoxTitleLatestModifiedBoms=Ultime %s distinte componenti modificate
 BoxTitleLatestModifiedMos=Ultimi %s ordini di produzione modificati
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Attività generale (fatture, proposte, ordini)
 BoxGoodCustomers=Buoni clienti
 BoxTitleGoodCustomers=%s Buoni clienti
+BoxScheduledJobs=Processi pianificati
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Aggiornamento del flusso RSS fallito. Data dell'ultimo aggiornamento valido: %s
 LastRefreshDate=Data dell'ultimo aggiornamento
 NoRecordedBookmarks=Nessun segnalibro presente
@@ -83,7 +86,7 @@ BoxTitleLatestModifiedSupplierOrders=Ordini fornitore: ultimi %s modificati
 BoxTitleLastModifiedCustomerBills=Fatture attive: ultime %s modificate
 BoxTitleLastModifiedCustomerOrders=Ordini: ultimi %s modificati
 BoxTitleLastModifiedPropals=Ultime %s proposte modificate
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedJobPositions=Ultimi %s jobs modificati
 BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Fatture attive
 ForCustomersOrders=Ordini cliente
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=L'account Suspense non è definito
 BoxLastCustomerShipments=Ultime spedizioni cliente
 BoxTitleLastCustomerShipments=Ultime %s spedizioni cliente
 NoRecordedShipments=Nessuna spedizione cliente registrata
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Contabilità
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/it_IT/cashdesk.lang b/htdocs/langs/it_IT/cashdesk.lang
index da0aaa59816..b8069c4f189 100644
--- a/htdocs/langs/it_IT/cashdesk.lang
+++ b/htdocs/langs/it_IT/cashdesk.lang
@@ -47,10 +47,10 @@ Receipt=Ricevuta
 Header=Header
 Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
-TheoricalAmount=Theorical amount
+TheoricalAmount=Importo teorico
 RealAmount=Real amount
-CashFence=Cassetta dei contanti
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Numero di fatture
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Modulo di numerazione per vendite POS
 CashDeskGenericMaskCodes6 =  <br> Il tag <b> {TN} </b> viene utilizzato per aggiungere il numero del terminale
 TakeposGroupSameProduct=Raggruppa le stesse linee di prodotti
 StartAParallelSale=Inizia una nuova vendita parallela
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Chiudi cassetta contanti
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Rapporto di cassa
 MainPrinterToUse=Stampante principale da utilizzare
 OrderPrinterToUse=Ordine stampante da utilizzare
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/it_IT/categories.lang b/htdocs/langs/it_IT/categories.lang
index 7d60396caab..58cefe1d95c 100644
--- a/htdocs/langs/it_IT/categories.lang
+++ b/htdocs/langs/it_IT/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Area tag/categorie progetti
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categorie
 CatList=Lista delle tag/categorie
+CatListAll=List of tags/categories (all types)
 NewCategory=Nuova tag/categoria
 ModifCat=Modifica tag/categoria
 CatCreated=Tag/categoria creata
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Tag / categorie di magazzino
 ThisCategoryHasNoItems=Questa categoria non contiene alcun elemento.
 CategId=ID Tag/categoria
-CatSupList=List of vendor tags/categories
-CatCusList=Lista delle tag/categorie clienti
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Elenco delle tag/categorie prodotti
 CatMemberList=Lista delle tag/categorie membri
-CatContactList=Lista delle tag/categorie contatti
-CatSupLinks=Collegamenti tra fornitori e tag/categorie
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Collegamenti tra clienti e tag/categorie
 CatContactsLinks=Collegamento fra: contatti/indirizzi e tags/categorie
 CatProdLinks=Collegamenti tra prodotti/servizi e tag/categorie
-CatProJectLinks=Collegamenti tra progetti e tag/categorie
+CatMembersLinks=Collegamenti tra membri e tag/categorie
+CatProjectsLinks=Collegamenti tra progetti e tag/categorie
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Elimina dalla tag/categoria
 ExtraFieldsCategories=Campi extra
 CategoriesSetup=Impostazioni Tag/categorie
diff --git a/htdocs/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang
index 703fa6018f2..727159eed93 100644
--- a/htdocs/langs/it_IT/companies.lang
+++ b/htdocs/langs/it_IT/companies.lang
@@ -282,11 +282,11 @@ CustomerAbsoluteDiscountShort=Sconto assoluto
 CompanyHasRelativeDiscount=Il cliente ha uno sconto del <b> %s%% </b>
 CompanyHasNoRelativeDiscount=Il cliente non ha alcuno sconto relativo impostato
 HasRelativeDiscountFromSupplier=Hai uno sconto predefinito di <b>%s%%</b> da questo fornitore
-HasNoRelativeDiscountFromSupplier=You have no default relative discount from this vendor
+HasNoRelativeDiscountFromSupplier=Non esistono sconti relativi predefiniti per questo fornitore\n
 CompanyHasAbsoluteDiscount=Questo cliente ha degli sconti disponibili (note di credito o anticipi) per un totale di <b>%s</b>%s
 CompanyHasDownPaymentOrCommercialDiscount=Questo cliente ha uno sconto disponibile (commerciale, anticipi) per <b>%s</b>%s
 CompanyHasCreditNote=Il cliente ha ancora note di credito per <b> %s %s </b>
-HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this vendor
+HasNoAbsoluteDiscountFromSupplier=Il fornitore non ha disponibile alcuno sconto assoluto per credito
 HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this vendor
 HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this vendor
 HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this vendor
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=È anche possibile controllare manualmente sul sito della Commissione Europea <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Non è possibile effettuare il controllo. Servizio non previsto per lo stato membro ( %s).
 NorProspectNorCustomer=Né cliente, né cliente potenziale
-JuridicalStatus=Forma giuridica
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Dipendenti
 ProspectLevelShort=Cl. Pot.
diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang
index 8243a338ffc..a7638fb2824 100644
--- a/htdocs/langs/it_IT/compta.lang
+++ b/htdocs/langs/it_IT/compta.lang
@@ -111,7 +111,7 @@ Refund=Rimborso
 SocialContributionsPayments=Pagamenti tasse/contributi
 ShowVatPayment=Visualizza pagamento IVA
 TotalToPay=Totale da pagare
-BalanceVisibilityDependsOnSortAndFilters=Il bilancio è visibile in questo elenco solo se la tabella è ordinata in verso ascendente per %s e filtrata per un conto bancario
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=vendor accounting code
 CustomerAccountancyCodeShort=Cod. cont. cliente
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Sei sicuro di voler cancellare il pagamento di q
 ExportDataset_tax_1=Tasse/contributi e pagamenti
 CalcModeVATDebt=Modalità <b>%sIVA su contabilità d'impegno%s</b>.
 CalcModeVATEngagement=Calcola <b>%sIVA su entrate-uscite%s</b>
-CalcModeDebt=Analisi delle fatture registrate anche se non sono ancora contabilizzate nel libro mastro.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analisi dei pagamenti registrati, anche se non ancora contabilizzati nel libro mastro.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Modalità <b>%sRE su fatture clienti - fatture fornitori%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Bilancio di entrate e uscite, sintesi annuale
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=Vedi %sanalisi dei pagamenti%s per un calcolo sui pagamenti effettivi effettuati anche se non ancora contabilizzati nel libro mastro.
-SeeReportInDueDebtMode=Vedi %sanalisi delle fatture %s per un calcolo basato sulle fatture registrate anche se non ancora contabilizzate nel libro mastro.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Gli importi indicati sono tasse incluse
 RulesResultDue=- Include fatture in sospeso, spese, IVA, donazioni, indipendentemente dal fatto che siano pagate o meno. Comprende anche gli stipendi pagati. <br> - Si basa sulla data di fatturazione delle fatture e sulla data di scadenza delle spese o dei pagamenti delle imposte. Per gli stipendi definiti con il modulo Salario, viene utilizzata la data valuta del pagamento.
 RulesResultInOut=- Include i pagamenti reali di fatture, spese e IVA. <br>- Si basa sulle date di pagamento di fatture, spese e IVA.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Sono incluse le fatture d'acconto
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=IRPF soggetti terzi(Spagna)
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
@@ -208,7 +211,7 @@ DescPurchasesJournal=Storico acquisti
 CodeNotDef=Non definito
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=La data termine di pagamento non può essere anteriore alla data dell'oggetto
-Pcg_version=Chart of accounts models
+Pcg_version=Modelli piano dei conti
 Pcg_type=Tipo pcg
 Pcg_subtype=Sottotipo Pcg
 InvoiceLinesToDispatch=Riga di fattura da spedire *consegnare
diff --git a/htdocs/langs/it_IT/cron.lang b/htdocs/langs/it_IT/cron.lang
index bc04e98bec5..988a944ddfd 100644
--- a/htdocs/langs/it_IT/cron.lang
+++ b/htdocs/langs/it_IT/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Elimina processo pianificato
 Permission23104 = Esegui processo pianificato
 # Admin
 CronSetup=Impostazione delle azioni pianificate
-URLToLaunchCronJobs=URL per controllare ed eseguire i processi in cron
-OrToLaunchASpecificJob=O per lanciare un processo specifico
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Chiave di sicurezza per l'URL che lancia i processi pianificati
 FileToLaunchCronJobs=Riga di comando per controllare e lanciare i processi pianificati in cron
 CronExplainHowToRunUnix=In ambienti Unix per lanciare il comando ogni 5 minuti dovresti usare la seguente riga di crontab
 CronExplainHowToRunWin=In ambienti Microsoft(tm) Windows per lanciare il comando ogni 5 minuti dovresti usare le operazioni pianificate
 CronMethodDoesNotExists=La classe %s non contiene alcune metodo %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=I profili cron sono definiti nel file di descrizione del modulo. Quando il modulo viene attivao, vengono caricati e resi disponivbili permettendoti di amministrare i processi dal menu strumenti amministrazione %s.
 CronJobProfiles=Lista dei profili cron predefiniti
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Num. lancio
 CronMaxRun=Numero massimo di lanci
 CronEach=Ogni
 JobFinished=Processo eseguito e completato
+Scheduled=Scheduled
 #Page card
 CronAdd= Aggiungi processo
 CronEvery=Esegui ogni processo
@@ -56,7 +58,7 @@ CronNote=Commento
 CronFieldMandatory=Il campo %s è obbligatorio
 CronErrEndDateStartDt=La data di fine non può essere precedente a quella di inizio
 StatusAtInstall=Stato all'installazione del modulo
-CronStatusActiveBtn=Abilita
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disattiva
 CronTaskInactive=Questo processo è disabilitato
 CronId=Id
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=Backup del database locale
 MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attenzione, per motivi di performance, qualunque sia la data della prossima esecuzione dei processi attivi, i tuoi processi possono essere ritardati di un massimo di %s ore prima di essere eseguiti
 DATAPOLICYJob=Pulizia dei dati e anonimizzatore
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index 01a4e96f6b8..ec5b4234b48 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Nessun errore, committiamo
 # Errors
 ErrorButCommitIsDone=Sono stati trovati errori ma si convalida ugualmente
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=L'URL %s è sbagliato
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=L'utente %s esiste già.
 ErrorGroupAlreadyExists=Il gruppo %s esiste già
 ErrorRecordNotFound=Record non trovato
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Mancano alcuni campi obbligatori.
 ErrorSubjectIsRequired=Il titolo della email è obbligatorio
 ErrorFailedToCreateDir=Impossibile creare la directory. Verifica che l'utente del server Web abbia i permessi per scrivere nella directory Dolibarr. Se il parametro <b>safe_mode</b> è abilitato in PHP, verifica che i file php di Dolibarr appartengano all'utente o al gruppo del server web (per esempio www-data).
 ErrorNoMailDefinedForThisUser=Nessun indirizzo memorizzato per questo utente
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Questa funzione necessita di javascript per essere attivata. Modificare questa impostazione nel menu Impostazioni - layout di visualizzazione.
 ErrorTopMenuMustHaveAParentWithId0=Un menu di tipo "Top" non può appartenere ad un menu superiore. Seleziona 0 menu genitori o scegli un menu di tipo "Left".
 ErrorLeftMenuMustHaveAParentId=Un menu di tipo 'Left' deve avere un id genitore
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Questo nome profilo già esiste per questo set di esp
 ErrorLDAPSetupNotComplete=La configurazione per l'uso di LDAP è incompleta
 ErrorLDAPMakeManualTest=È stato generato un file Ldif nella directory %s. Prova a caricarlo dalla riga di comando per avere maggiori informazioni sugli errori.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Il riferimento utilizzato esiste già.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -99,7 +102,7 @@ ErrorBadMaskBadRazMonth=Errore, valore di reset non valido
 ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
 ErrorCounterMustHaveMoreThan3Digits=Il contatore deve avere più di 3 cifre
 ErrorSelectAtLeastOne=Errore. Selezionare almeno una voce. 
-ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
+ErrorDeleteNotPossibleLineIsConsolidated=Impossibile eliminare il record collegato ad una transazione bancaria conciliata\n
 ErrorProdIdAlreadyExist=%s è già assegnato
 ErrorFailedToSendPassword=Impossibile inviare la password
 ErrorFailedToLoadRSSFile=Impossibile ottenere feed RSS. Se i messaggi di errore non forniscono informazioni sufficienti, prova ad ativare il debug con MAIN_SIMPLEXMLLOAD_DEBUG.
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -224,7 +227,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
-ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Errore! Impossibile eliminare un pagamento collegato ad una fattura Pagata.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
 ErrorObjectMustHaveStatusActiveToBeDisabled=Gli oggetti devono avere lo stato 'Attivo' per essere disabilitati
 ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Gli oggetti devono avere lo stato 'Bozza' o 'Disabilitato' per essere abilitato
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Errore, la stringa da sostituire è vuota
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=L'interfaccia pubblica non è stata abilitata
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -266,7 +279,11 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=La tua login è stata modificata. Per ragioni di sicurezza dove accedere con la nuova login prima di eseguire una nuova azione.
 WarningAnEntryAlreadyExistForTransKey=Esiste già una voce tradotta per la chiave di traduzione per questa lingua
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
-WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningDateOfLineMustBeInExpenseReportRange=Attenzione, la data della riga non è compresa nel periodo della nota spese\n
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Il progetto è chiuso. È necessario prima aprirlo nuovamente.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Alcune transazioni bancarie sono state rimosse dopo che è stata generata la ricevuta che le includeva. Quindi il numero di assegni e il totale dello scontrino possono differire dal numero e dal totale nell'elenco.
-WarningFailedToAddFileIntoDatabaseIndex=Avviso, impossibile aggiungere la voce del file nella tabella dell'indice del database ECM
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/it_IT/exports.lang b/htdocs/langs/it_IT/exports.lang
index aa66a29179d..49d5c844d39 100644
--- a/htdocs/langs/it_IT/exports.lang
+++ b/htdocs/langs/it_IT/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Chiave da utilizzare per l'aggiornamento dei dati
 NbInsert=Numero di righe inserite: %s
 NbUpdate=Numero di righe aggiornate: %s
 MultipleRecordFoundWithTheseFilters=Righe multiple sono state trovate con questi filtri: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/it_IT/mails.lang b/htdocs/langs/it_IT/mails.lang
index af3f2044542..2b12f923619 100644
--- a/htdocs/langs/it_IT/mails.lang
+++ b/htdocs/langs/it_IT/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Soggetti terzi (per categoria)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Riga %s nel file
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=Nessuna email inviata. Mittente o destinatario errati. Verifica il profilo utente.
 # Module Notifications
 Notifications=Notifiche
-NoNotificationsWillBeSent=Non sono previste notifiche per questo evento o società
-ANotificationsWillBeSent=Verrà inviata una notifica via email
-SomeNotificationsWillBeSent=%s notifiche saranno inviate via email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=Elenco delle notifiche spedite per email
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=Verrà inviata una notifica tramite email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=Elenco delle notifiche email automatiche inviate
 MailSendSetupIs=La configurazione della posta elettronica di invio è stata impostata alla modalità '%s'. Questa modalità non può essere utilizzata per inviare mail di massa.
 MailSendSetupIs2=Con un account da amministratore è necessario cliccare su %sHome -> Setup -> EMails%s e modificare il parametro <strong>'%s'</strong> per usare la modalità '%s'. Con questa modalità è possibile inserire i dati del server SMTP di elezione e usare Il "Mass Emailing"
 MailSendSetupIs3=Se hai domande su come configurare il tuo server SMTP chiedi a %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Destinatari (selezione avanzata)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Valore minimo
 AdvTgtMaxVal=Valore massimo
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Crea filtro
 AdvTgtOrCreateNewFilter=Titolo del nuovo filtro
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Configurazione email in uscita
-InGoingEmailSetup=Incoming email setup
+OutGoingEmailSetup=Email in uscita
+InGoingEmailSetup=Email in entrata
 OutGoingEmailSetupForEmailing=Configurazione della posta elettronica in uscita (per il modulo %s)
-DefaultOutgoingEmailSetup=Impostazione predefinita email in uscita
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Informazioni
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index 0be748325f0..322e172936c 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Nessun tema disponibile per questo tipo di email
 AvailableVariables=Variabili di sostituzione disponibili
 NoTranslation=Nessuna traduzione
 Translation=Traduzioni
+CurrentTimeZone=Fuso orario attuale
 EmptySearchString=Inserisci criteri di ricerca non vuoti
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Nessun risultato trovato
 NoRecordDeleted=Nessun record eliminato
 NotEnoughDataYet=Dati insufficienti
@@ -85,6 +87,8 @@ FileWasNotUploaded=Il file selezionato per l'upload non è stato ancora caricato
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Leggi l'aiuto online (è richiesto un collegamento internet)
 GoToHelpPage=Vai alla pagina di aiuto
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Record salvato
 RecordDeleted=Record cancellato
 RecordGenerated=Record generato
@@ -433,6 +437,7 @@ RemainToPay=Rimanente da pagare
 Module=Moduli/Applicazioni
 Modules=Moduli/Applicazioni
 Option=Opzione
+Filters=Filters
 List=Elenco
 FullList=Elenco completo
 FullConversation=Conversazione completa
@@ -671,7 +676,7 @@ SendMail=Invia una email
 Email=Email
 NoEMail=Nessuna email
 AlreadyRead=Già letto
-NotRead=Non letto
+NotRead=Unread
 NoMobilePhone=Nessun cellulare
 Owner=Proprietario
 FollowingConstantsWillBeSubstituted=Le seguenti costanti saranno sostitute con i valori corrispondenti
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=In attesa
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/it_IT/modulebuilder.lang b/htdocs/langs/it_IT/modulebuilder.lang
index d15a6328f84..06e438b1978 100644
--- a/htdocs/langs/it_IT/modulebuilder.lang
+++ b/htdocs/langs/it_IT/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=Elenco voci dizionari
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=Il riferimento dell'oggetto deve essere generato automaticamente
 IncludeRefGenerationHelp=Seleziona questa opzione se desideri includere il codice per gestire la generazione automatica del riferimento
 IncludeDocGeneration=Desidero generare alcuni documenti da questo oggetto
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Tipo di campi: <br> varchar(99), double(24,8), real, text, html
 AsciiToHtmlConverter=Convertitore da Ascii a HTML
 AsciiToPdfConverter=Convertitore da Ascii a PDF
 TableNotEmptyDropCanceled=Tabella non vuota. Il rilascio è stato annullato.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/it_IT/multicurrency.lang b/htdocs/langs/it_IT/multicurrency.lang
index 556b727c6d6..1344eb123be 100644
--- a/htdocs/langs/it_IT/multicurrency.lang
+++ b/htdocs/langs/it_IT/multicurrency.lang
@@ -2,7 +2,7 @@
 MultiCurrency=Multi currency
 ErrorAddRateFail=Error in added rate
 ErrorAddCurrencyFail=Error in added currency
-ErrorDeleteCurrencyFail=Error delete fail
+ErrorDeleteCurrencyFail=Errore! Eliminazione fallita
 multicurrency_syncronize_error=Synchronisation error: %s
 MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use date of document to find currency rate, instead of using latest known rate
 multicurrency_useOriginTx=When an object is created from another, keep the original rate of source object (otherwise use the latest known rate)
@@ -20,3 +20,19 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 AmountToOthercurrency=Amount To (in currency of receiving account)
 CurrencyRateSyncSucceed=Sincronizzazione del tasso di cambio eseguita correttamente
 MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Usa la valuta del documento per i pagamenti online
+TabTitleMulticurrencyRate=Rate list
+ListCurrencyRate=List of exchange rates for the currency
+CreateRate=Create a rate
+FormCreateRate=Rate creation
+FormUpdateRate=Rate modification
+successRateCreate=Rate for currency %s has been added to the database
+ConfirmDeleteLineRate=Are you sure you want to remove the %s rate for currency %s on %s date?
+DeleteLineRate=Clear rate
+successRateDelete=Rate deleted
+errorRateDelete=Error when deleting the rate
+successUpdateRate=Modification made
+ErrorUpdateRate=Error when changing the rate
+Codemulticurrency=currency code
+UpdateRate=change the rate
+CancelUpdate=cancel
+NoEmptyRate=The rate field must not be empty
diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang
index 1e1fe945c8f..128070ab084 100644
--- a/htdocs/langs/it_IT/other.lang
+++ b/htdocs/langs/it_IT/other.lang
@@ -5,8 +5,6 @@ Tools=Strumenti
 TMenuTools=Strumenti
 ToolsDesc=Quest'area è dedicata agli strumenti di gruppo non disponibili in altre voci di menu.<br>Tali strumenti sono raggiungibili dal menu laterale.
 Birthday=Compleanno
-BirthdayDate=Giorno di nascita
-DateToBirth=Data di nascita
 BirthdayAlertOn=Attiva avviso compleanni
 BirthdayAlertOff=Avviso compleanni inattivo
 TransKey=Traduzione della chiave TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Archivio zip generato in <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Buongiorno)__\n\n\n__(Cordialmente)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr è un ERP/CRM compatto composto di diversi moduli funzionali. Un demo comprendente tutti i moduli non ha alcun senso, perché un caso simile non esiste nella realtà. Sono dunque disponibili diversi profili demo.
 ChooseYourDemoProfil=Scegli il profilo demo che corrisponde alla tua attività ...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Destra
 CalculatedWeight=Peso calcolato
 CalculatedVolume=volume calcolato
 Weight=Peso
-WeightUnitton=t
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -173,7 +174,7 @@ SizeUnitinch=pollice
 SizeUnitfoot=piede
 SizeUnitpoint=punto
 BugTracker=Bug tracker
-SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br>Check your inbox.
+SendNewPasswordDesc=Questo modulo consente di richiedere una nuova password che verrà inviata al tuo indirizzo email. <br> Il cambiamento sarà effettivo solo dopo aver cliccato sul link di conferma contenuto nell'email. <br> Controlla la tua casella di posta.
 BackToLoginPage=Torna alla pagina di login
 AuthenticationDoesNotAllowSendNewPassword=La modalità di autenticazione è <b>%s</b>.<br/>In questa modalità Dolibarr non può sapere né cambiare la tua password.<br/>Contatta l'amministratore di sistema se desideri cambiare password.
 EnableGDLibraryDesc=Per usare questa opzione bisogna installare o abilitare la libreria GD in PHP.
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Utilizzare - per separare gli orari di apertura e chiusura. <br> Utilizzare uno spazio per inserire intervalli diversi. <br> Esempio: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Area esportazioni
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index 46f0bfa0c75..f809b8791dd 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Diversi livelli di prezzo per prodotto/servizio (ogni cliente fa parte di un livello)
 MultiPricesNumPrices=Numero di prezzi per il multi-prezzi
 DefaultPriceType=Base dei prezzi per impostazione predefinita (con contro senza tasse) quando si aggiungono nuovi prezzi di vendita
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Numero di prodotti associati che includono questo sottoprodotto
@@ -167,8 +168,10 @@ BuyingPrices=Prezzi di acquisto
 CustomerPrices=Prezzi di vendita
 SuppliersPrices=Prezzi fornitore
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Dogana/Merce/Codice SA
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Paese di origine
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Natura del prodotto (materiale / finito)
 NatureOfProductShort=Natura del prodotto
 NatureOfProductDesc=Materia prima o prodotto finito
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Usa prezzo non negoziabile
 PriceByQuantity=Prezzi diversi in base alla quantità
 DisablePriceByQty=Disabilitare i prezzi per quantità
 PriceByQuantityRange=Intervallo della quantità
-MultipriceRules=Regole del segmento di prezzo
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Utilizza le regole del segmento di prezzo (definite nell'impostazione del modulo del prodotto) per autocalcolare i prezzi di tutti gli altri segmenti in base al primo segmento
 PercentVariationOver=variazione %% su %s
 PercentDiscountOver=sconto %% su %s
diff --git a/htdocs/langs/it_IT/recruitment.lang b/htdocs/langs/it_IT/recruitment.lang
index 3f136b5182e..b8e37753ea4 100644
--- a/htdocs/langs/it_IT/recruitment.lang
+++ b/htdocs/langs/it_IT/recruitment.lang
@@ -46,9 +46,9 @@ FutureManager=Manager futuro
 ResponsibleOfRecruitement=Responsabile della selezione
 IfJobIsLocatedAtAPartner=Se il luogo di lavoro è presso partner
 PositionToBeFilled=Posizione lavorativa
-PositionsToBeFilled=Job positions
-ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job positions
+PositionsToBeFilled=Posizione lavorativa
+ListOfPositionsToBeFilled=Elenco posizioni lavorative
+NewPositionToBeFilled=Nuova posizione lavorativa
 
 JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Informazioni sulla posizione lavorativa da compilare
@@ -60,10 +60,10 @@ ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
-ContractSigned=Contract signed
+ContractSigned=Contratto firmato
 ContractRefused=Contract refused
 RecruitmentCandidature=Application
-JobPositions=Job positions
+JobPositions=Posizione lavorativa
 RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
 AnswerCandidature=Application answer
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/it_IT/sendings.lang b/htdocs/langs/it_IT/sendings.lang
index 0820b5dbbe7..5f326c89cba 100644
--- a/htdocs/langs/it_IT/sendings.lang
+++ b/htdocs/langs/it_IT/sendings.lang
@@ -27,9 +27,10 @@ QtyInOtherShipments=Q.ta in altre spedizioni
 KeepToShip=Ancora da spedire
 KeepToShipShort=Rimanente
 OtherSendingsForSameOrder=Altre Spedizioni per questo ordine
-SendingsAndReceivingForSameOrder=Spedizioni e ricezioni per questo ordini
+SendingsAndReceivingForSameOrder=Spedizioni e ricezioni per questo ordine
 SendingsToValidate=Spedizione da convalidare
 StatusSendingCanceled=Annullato
+StatusSendingCanceledShort=Annullata
 StatusSendingDraft=Bozza
 StatusSendingValidated=Convalidata (prodotti per la spedizione o già spediti)
 StatusSendingProcessed=Processato
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=È necessario convalidare l'ordine prima di pot
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Modello più completo di documento per le ricevute di consegna (logo. ..)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER costante non definita
 SumOfProductVolumes=Totale volume prodotti
 SumOfProductWeights=Totale peso prodotti
diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang
index 3e8770750a4..a9358e7a321 100644
--- a/htdocs/langs/it_IT/stocks.lang
+++ b/htdocs/langs/it_IT/stocks.lang
@@ -203,8 +203,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=I movimenti delle scorte avranno la
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Q.tà teorica
+TheoricalValue=Q.tà teorica
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Qtà registrata
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/it_IT/ticket.lang b/htdocs/langs/it_IT/ticket.lang
index c51af811cb0..8125524088a 100644
--- a/htdocs/langs/it_IT/ticket.lang
+++ b/htdocs/langs/it_IT/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Risoluzione
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Richiesta di aiuto funzionale
 TicketTypeShortISSUE=Issue, bug o problemi
 TicketTypeShortREQUEST=Richiesta di modifica o miglioramento
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Altro
 TicketSeverityShortLOW=Basso
 TicketSeverityShortNORMAL=Normale
 TicketSeverityShortHIGH=Alto
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Campo '%s' non corretto
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Non letto
 Read=Da leggere
 Assigned=Assegnato
 InProgress=Avviato
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Invia e-mail quando viene aggiunto un nuovo messaggio
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Non disponibile. Il ticket non è stato creato dall'interfaccia pubblica.
-PublicInterfaceNotEnabled=L'interfaccia pubblica non è stata abilitata
 ErrorTicketRefRequired=È richiesto il nome di riferimento del biglietto
 
 #
@@ -265,7 +262,7 @@ TicketNewEmailBodyInfosTrackId=Ticket tracking number: %s
 TicketNewEmailBodyInfosTrackUrl=Puoi seguire l'avanzamento del ticket cliccando il link qui sopra
 TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
 TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
-TicketPublicInfoCreateTicket=This form allows you to record a support ticket in our management system.
+TicketPublicInfoCreateTicket=Questo modulo consente di registrare un ticket di supporto nel nostro sistema di gestione ticketing.
 TicketPublicPleaseBeAccuratelyDescribe=Descrivi il problema dettagliatamente. Fornisci più informazioni possibili per consentirci di identificare la tua richiesta.
 TicketPublicMsgViewLogIn=Please enter ticket tracking ID
 TicketTrackId=Public Tracking ID
diff --git a/htdocs/langs/it_IT/website.lang b/htdocs/langs/it_IT/website.lang
index 2037c7d7c8d..7c580045fb2 100644
--- a/htdocs/langs/it_IT/website.lang
+++ b/htdocs/langs/it_IT/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Aggiungi sito web
 Webpage=Web page/container
 AddPage=Aggiungi pagina/contenitore
-HomePage=Home Page
 PageContainer=Pagina
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=Puoi ottenere un feed RSS degli articoli più recenti con il tipo "b
 PagesRegenerated=%s pagina(e)/contenitore(i) rigenerato
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/it_IT/withdrawals.lang b/htdocs/langs/it_IT/withdrawals.lang
index 296e0fc1975..24837f63e55 100644
--- a/htdocs/langs/it_IT/withdrawals.lang
+++ b/htdocs/langs/it_IT/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Effettua una richiesta di addebito diretto
 MakeBankTransferOrder=Invia una richiesta di bonifico
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Codice bancario del Soggetto terzo
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classifica come accreditata
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Non è stata impostata la modalità reale, ci fermiamo dopo questa simulazione
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index 03fca6294e9..f08a623d4bd 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=%sを除くすべての国
 AccountantFiles=ソースドキュメントのエクスポート
 ExportAccountingSourceDocHelp=このツールを使用すると、会計処理の生成に使用されたソースイベント（リストとPDF）をエクスポートできる。仕訳をエクスポートするには、メニューエントリ%s-%sを使用する。
 VueByAccountAccounting=会計科目順に表示
+VueBySubAccountAccounting=アカウンティングサブアカウントで表示
 
 MainAccountForCustomersNotDefined=設定で定義されていない顧客のメインアカウンティング科目
 MainAccountForSuppliersNotDefined=設定で定義されていないベンダーのメインアカウンティング科目
@@ -144,7 +145,7 @@ NotVentilatedinAccount=会計科目にバインドされていない
 XLineSuccessfullyBinded=%s製品/サービスがアカウンティング科目に正常にバインドされた
 XLineFailedToBeBinded=%s製品/サービスはどの会計科目にもバインドされていない
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=ページごとに表示される紐付けする要素の数（最大推奨：50）
+ACCOUNTING_LIMIT_LIST_VENTILATION=リストおよびバインドページの最大行数（推奨：50）
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=「Bindingtodo」ページの最新の要素による並べ替えを開始する
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=「製本完了」ページの最新の要素による並べ替えを開始する
 
@@ -198,7 +199,8 @@ Docdate=日付
 Docref=参照
 LabelAccount=ラベル科目
 LabelOperation=ラベル操作
-Sens=Sens
+Sens=方向
+AccountingDirectionHelp=顧客の会計科目の場合、貸方を使用して受け取った支払いを記録する。<br>仕入先の会計科目の場合、借方を使用して支払いを記録する。
 LetteringCode=レタリングコード
 Lettering=レタリング
 Codejournal=仕訳帳
@@ -206,7 +208,8 @@ JournalLabel=仕訳帳ラベル
 NumPiece=個数番号
 TransactionNumShort=数トランザクション
 AccountingCategory=パーソナライズされたグループ
-GroupByAccountAccounting=会計科目によるグループ化
+GroupByAccountAccounting=総勘定元帳勘定によるグループ化
+GroupBySubAccountAccounting=補助元帳アカウントでグループ化
 AccountingAccountGroupsDesc=ここで、会計科目のいくつかのグループを定義できる。それらは、パーソナライズされた会計レポートに使用される。
 ByAccounts=科目別
 ByPredefinedAccountGroups=事前定義されたグループによる
@@ -248,10 +251,10 @@ PaymentsNotLinkedToProduct=支払いはどの製品/サービスにもリンク
 OpeningBalance=期首残高
 ShowOpeningBalance=期首残高を表示する
 HideOpeningBalance=期首残高を非表示にする
-ShowSubtotalByGroup=グループごとに小計を表示
+ShowSubtotalByGroup=レベルごとに小計を表示
 
 Pcgtype=勘定科目のグループ
-PcgtypeDesc=科目のグループは、一部のアカウンティングレポートの事前定義された「フィルター」および「グループ化」基準として使用される。たとえば、「INCOME」または「EXPENSE」は、費用/収入レポートを作成するための製品の会計科目のグループとして使用される。
+PcgtypeDesc=科目のグループは、一部のアカウンティングレポートの事前定義された「フィルタ」および「グループ化」基準として使用される。たとえば、「INCOME」または「EXPENSE」は、費用/収入レポートを作成するための製品の会計科目のグループとして使用される。
 
 Reconcilable=調整可能
 
@@ -271,11 +274,13 @@ DescVentilExpenseReport=手数料会計科目にバインドされている（
 DescVentilExpenseReportMore=経費報告行の種別で会計科目を設定すると、アプリケーションは、ボタン<strong> "%s" </strong>をワンクリックするだけで、経費報告行と勘定科目表の会計科目の間のすべての紐付けを行うことができる。科目が料金辞書に設定されていない場合、または科目に紐付けされていない行がまだある場合は、メニュー「<strong>%s</strong>」から手動で紐付けする必要がある。
 DescVentilDoneExpenseReport=経費報告書の行とその手数料会計科目のリストをここで参照すること
 
+Closure=年次閉鎖
 DescClosure=検証されていない月ごとの動きの数とすでに開いている会計年度をここで参照すること
 OverviewOfMovementsNotValidated=ステップ1 /検証されていない動きの概要。 （決算期に必要）
+AllMovementsWereRecordedAsValidated=すべての動きは検証済みとして記録された
+NotAllMovementsCouldBeRecordedAsValidated=すべての動きを検証済みとして記録できるわけではない
 ValidateMovements=動きを検証する
 DescValidateMovements=書き込み、レタリング、削除の変更または削除は禁止される。演習のすべてのエントリを検証する必要がある。検証しないと、閉じることができない。
-SelectMonthAndValidate=月を選択し、動きを検証する
 
 ValidateHistory=自動的に紐付け
 AutomaticBindingDone=自動紐付けが行われた
@@ -293,6 +298,7 @@ Accounted=元帳に計上
 NotYetAccounted=元帳にはまだ計上されていない
 ShowTutorial=チュートリアルを表示
 NotReconciled=調整されていない
+WarningRecordWithoutSubledgerAreExcluded=警告、補助元帳アカウントが定義されていないすべての操作はフィルタリングされ、このビューから除外される
 
 ## Admin
 BindingOptions=製本オプション
@@ -337,10 +343,11 @@ Modelcsv_LDCompta10=LD Compta（v10以降）のエクスポート
 Modelcsv_openconcerto=OpenConcertoのエクスポート（テスト）
 Modelcsv_configurable=CSV構成可能のエクスポート
 Modelcsv_FEC=FECのエクスポート
+Modelcsv_FEC2=FECのエクスポート（日付生成の書き込み/ドキュメントの反転あり）
 Modelcsv_Sage50_Swiss=セージ50スイスへのエクスポート
 Modelcsv_winfic=Winficのエクスポート-eWinfic-WinSisCompta
-Modelcsv_Gestinumv3=Export for Gestinum (v3)
-Modelcsv_Gestinumv5Export for Gestinum (v5)
+Modelcsv_Gestinumv3=Gestinum（v3）のエクスポート
+Modelcsv_Gestinumv5Export Gestinum（v5）の場合
 ChartofaccountsId=勘定科目表ID
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index 489bb909061..bb1e8e4c9da 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -56,6 +56,8 @@ GUISetup=表示
 SetupArea=設定
 UploadNewTemplate=新規テンプレート(s)をアップロード
 FormToTestFileUploadForm=ファイルのアップロードをテストするために形成する ( 設定に応じて ) 
+ModuleMustBeEnabled=モジュール/アプリケーション<b>%s</b>を有効にする必要がある
+ModuleIsEnabled=モジュール/アプリケーション<b>%s</b>が有効になった
 IfModuleEnabled=注：【はい】は、モジュールの<b>%sが</b>有効<b>になっ</b>ている場合にのみ有効 
 RemoveLock=ファイル<b>%s </b>が存在する場合、それを削除/改名することで、更新/インストール のツールが使用可能になる。
 RestoreLock=ファイル<b>%s </b>を読取権限のみで復元すると、これ以上の更新/インストール のツール使用が不可になる。
@@ -85,7 +87,6 @@ ShowPreview=プレビューを表示
 ShowHideDetails=詳細を 表示-非表示
 PreviewNotAvailable=プレビューは利用不可
 ThemeCurrentlyActive=現在有効なテーマ
-CurrentTimeZone=PHP(サーバー)のタイムゾーン
 MySQLTimeZone=MySql(データベース)のタイムゾーン
 TZHasNoEffect=日付は、送信された文字列として保持されているかのように、データベースサーバーによって保存され返される。タイムゾーンは、UNIX_TIMESTAMP関数を使用する場合にのみ有効 (Dolibarrでは不使用を推奨し、そうすると、データ入力後に変更があったとしても、データベースTZの影響を受けなくなる ) 。
 Space=スペース
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=この領域は管理機能を提供する。メニューを
 Purge=パージ
 PurgeAreaDesc=このページでは、Dolibarrによって生成または保存されたすべてのファイル ( 一時ファイルまたは<b> %s </b>ディレクトリ内のすべてのファイル ) を削除できる。通常、この機能を使用する必要はない。これは、Webサーバーによって生成されたファイルを削除する権限を提供しないプロバイダーによってDolibarrがホストされているユーザの回避策として提供されている。
 PurgeDeleteLogFile=Syslogモジュール用に定義された<b>%s </b>を含むログファイルを削除する ( データを失うリスクはない ) 
-PurgeDeleteTemporaryFiles=すべての一時ファイルを削除する ( データを失うリスクはない ) 。注：削除は、一時ディレクトリが24時間前に作成された場合にのみ実行される。
-PurgeDeleteTemporaryFilesShort=一時ファイルを削除する
+PurgeDeleteTemporaryFiles=すべてのログファイルと一時ファイルを削除する（データを失うリスクなし）。注：一時ファイルの削除は、一時ディレクトリが24時間以上前に作成された場合にのみ実行される。
+PurgeDeleteTemporaryFilesShort=ログと一時ファイルを削除する
 PurgeDeleteAllFilesInDocumentsDir=ディレクトリ：<b> %s</b> 内のすべてのファイルを削除する。 <br>これにより、要素 ( 取引先、請求書など ) に関連する生成されたすべてのドキュメント、ECMモジュールにアップロードされたファイル、データベースのバックアップダンプ、および一時ファイルが削除される。
 PurgeRunNow=今パージ
 PurgeNothingToDelete=削除するディレクトリやファイルはない。
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=優先パートナー
 OtherResources=その他のリソース
 ExternalResources=外部リソース
 SocialNetworks=ソーシャルネットワーク
+SocialNetworkId=ソーシャルネットワークID
 ForDocumentationSeeWiki=ユーザまたは開発者のドキュメント ( DOC、よくある質問 ( FAQ ) ... ) のために、 <br> Dolibarr Wikiで見てみましょう。 <br> <a href="%s" target="_blank"><b>%s</b></a>
 ForAnswersSeeForum=他の質問/ヘルプについては、Dolibarrフォーラムを使用することができる。 <br> <a href="%s" target="_blank"><b>%s</b></a>
 HelpCenterDesc1=Dolibarrのヘルプとサポートを受けるためのリソースをいくつか紹介する。
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=現在の構成の例
 ListOfDirectories=OpenDocumentをテンプレートディレクトリのリスト
 ListOfDirectoriesForModelGenODT=OpenDocument形式のテンプレートファイルを含むディレクトリのリスト。 <br><br>ここにディレクトリのフルパスを入力する。 <br>eahディレクトリ間にキャリッジリターンを追加する。 <br> GEDモジュールのディレクトリを追加するには、ここに<b> DOL_DATA_ROOT / ecm / yourdirectoryname</b>を追加する。 <br> <br>これらのディレクトリ内のファイルは、<b> .odt</b>または<b>.ods</b>で終わる必要がある。
 NumberOfModelFilesFound=これらのディレクトリで見つかったODT / ODSテンプレートファイルの数
-ExampleOfDirectoriesForModelGen=構文の例： <br> C：\\ mydirに<br> / home / mydirの<br> DOL_DATA_ROOT / ECM / ecmdir
+ExampleOfDirectoriesForModelGen=構文の例:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>あなたのODTドキュメントテンプレートを作成する方法を知って、それらのディレクトリに格納する前に、ウィキのドキュメントをお読みください。
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=名/姓の位置
@@ -406,7 +408,7 @@ UrlGenerationParameters=URLを確保するためのパラメータ
 SecurityTokenIsUnique=各URLごとに一意securekeyパラメータを使用して、
 EnterRefToBuildUrl=オブジェクト%sの参照を入力する。
 GetSecuredUrl=計算されたURLを取得する
-ButtonHideUnauthorized=灰色の無効なボタンを表示する代わりに、管理者以外のユーザの不正なアクションのボタンを非表示にする
+ButtonHideUnauthorized=内部ユーザーに対しても不正なアクションボタンを非表示にする（それ以外の場合は灰色で表示される）
 OldVATRates=古いVAT率
 NewVATRates=新規VAT率
 PriceBaseTypeToChange=で定義された基本参照値を使用して価格を変更する
@@ -442,8 +444,8 @@ ExtrafieldParamHelpPassword=このフィールドを空白のままにすると
 ExtrafieldParamHelpselect=値のリストは、 key,value形式 (key は '0' 以外) の行であること。<br><br> 例: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>別の補完属性リストに応じたリストを作るには:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>別のリストに応じたリストを作るには:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=値のリストは、 key,value形式 (key は '0' 以外) の行であること<br><br>例 : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=値のリストは、 key,value形式 (key は '0' 以外) の行であること<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=値のリストはテーブルから取得される<br>構文：table_name：label_field：id_field :: filter <br>例：c_typent：libelle：id :: filter <br> <br> --id_fieldは必然的にプライマリintキーa0342fccfda = 1 ) アクティブな値のみを表示するには<br>現在のオブジェクトの現在のIDであるフィルターで$ ID $を使用することもできる<br>フィルターにSELECTを使用するには、キーワード$ SEL $を使用してインジェクション防止保護をバイパスする。 <br>エクストラフィールドでフィルタリングする場合は、構文extra.fieldcode = ... ( フィールドコードはエクストラフィールドのコード ) を使用する。<br><br>別の補完属性リストに依存するリストを作成するには：<br> c_typent：libelle：id：options_ <i> parent_list_code </i> | parent_column：filter <br> <br>リストを別のリストに依存させるには：<br> c_typent：libelle：id：<i> parent_list_code
-ExtrafieldParamHelpchkbxlst=値のリストはテーブルから取得される<br>構文：table_name：label_field：id_field :: filter <br>例：c_typent：libelle：id :: filter <br> <br>フィルターは、アクティブな値a0342cfのみを表示する簡単なテスト ( 例：active = 1 ) にすることができるフィルタで$ ID $を使用することもできる。witchは現在のオブジェクトの現在のID。<br>フィルタでSELECTを実行するには、エクストラフィールドでフィルタリングする場合は$ SEL $ <br>を使用する。構文extra.fieldcode = ...を使用する ( フィールドコードはエクストラフィールドのコード ) <br> <br>別の補完属性リストに依存するリストを作成するには、次のようにする。 libelle：id：<i> parent_list_code </i> | parent_column：filter
+ExtrafieldParamHelpsellist=値のリストはテーブルから取得される<br>構文：table_name：label_field：id_field :: filter <br>例：c_typent：libelle：id :: filter <br> <br> --id_fieldは必然的にプライマリintキーa0342fccfda = 1 ) アクティブな値のみを表示するには<br>現在のオブジェクトの現在のIDであるフィルタで$ ID $を使用することもできる<br>フィルタにSELECTを使用するには、キーワード$ SEL $を使用してインジェクション防止保護をバイパスする。 <br>エクストラフィールドでフィルタリングする場合は、構文extra.fieldcode = ... ( フィールドコードはエクストラフィールドのコード ) を使用する。<br><br>別の補完属性リストに依存するリストを作成するには：<br> c_typent：libelle：id：options_ <i> parent_list_code </i> | parent_column：filter <br> <br>リストを別のリストに依存させるには：<br> c_typent：libelle：id：<i> parent_list_code
+ExtrafieldParamHelpchkbxlst=値のリストはテーブルから取得される<br>構文：table_name：label_field：id_field :: filter <br>例：c_typent：libelle：id :: filter <br> <br>フィルタは、アクティブな値a0342cfのみを表示する簡単なテスト ( 例：active = 1 ) にすることができるフィルタで$ ID $を使用することもできる。witchは現在のオブジェクトの現在のID。<br>フィルタでSELECTを実行するには、エクストラフィールドでフィルタリングする場合は$ SEL $ <br>を使用する。構文extra.fieldcode = ...を使用する ( フィールドコードはエクストラフィールドのコード ) <br> <br>別の補完属性リストに依存するリストを作成するには、次のようにする。 libelle：id：<i> parent_list_code </i> | parent_column：filter
 ExtrafieldParamHelplink=パラメータはObjectName：Classpathでなければなりません<br>構文：ObjectName：Classpath
 ExtrafieldParamHelpSeparator=単純なセパレーターの場合は空のままにする<br>折りたたみセパレーターの場合はこれを1に設定する ( 新規セッションの場合はデフォルトで開き、ユーザセッションごとにステータスが保持される ) <br>折りたたみセパレーターの場合はこれを2に設定する ( 新規セッションの場合はデフォルトで折りたたむ。ステータスは各ユーザセッションの間保持される ) 
 LibraryToBuildPDF=PDF生成に使用されるライブラリ
@@ -1501,7 +1503,7 @@ LDAPDolibarrMapping=Dolibarrマッピング
 LDAPLdapMapping=LDAPのマッピング
 LDAPFieldLoginUnix=ログイン ( UNIX ) 
 LDAPFieldLoginExample=例：uid
-LDAPFilterConnection=検索フィルター
+LDAPFilterConnection=検索フィルタ
 LDAPFilterConnectionExample=例：＆ ( objectClass = inetOrgPerson ) 
 LDAPFieldLoginSamba=ログイン ( サンバ、ActiveDirectoryを ) 
 LDAPFieldLoginSambaExample=例：samaccountname
@@ -1584,9 +1586,9 @@ CacheByClient=ブラウザによるキャッシュ
 CompressionOfResources=HTTP応答の圧縮
 CompressionOfResourcesDesc=たとえば、Apacheディレクティブ「AddOutputFilterByTypeDEFLATE」を使用する
 TestNotPossibleWithCurrentBrowsers=このような自動検出は、現在のブラウザでは不可能。
-DefaultValuesDesc=ここでは、新規レコードを作成するときに使用するデフォルト値や、レコードを一覧表示するときのデフォルトのフィルターまたは並べ替え順序を定義できる。
+DefaultValuesDesc=ここでは、新規レコードを作成するときに使用するデフォルト値や、レコードを一覧表示するときのデフォルトのフィルタまたは並べ替え順序を定義できる。
 DefaultCreateForm=デフォルト値 ( フォームで使用 ) 
-DefaultSearchFilters=デフォルトの検索フィルター
+DefaultSearchFilters=デフォルトの検索フィルタ
 DefaultSortOrder=デフォルトのソート順
 DefaultFocus=デフォルトのフォーカスフィールド
 DefaultMandatory=必須のフォームフィールド
@@ -1672,7 +1674,7 @@ AdvancedEditor=高度なエディタ
 ActivateFCKeditor=のための高度なエディタをアクティブにする。
 FCKeditorForCompany=要素の説明と注意事項のWYSIWIGエディタの作成/版 ( 製品/サービスを除く ) 
 FCKeditorForProduct=製品/サービスの説明と注意事項のWYSIWIGエディタの作成/版
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
+FCKeditorForProductDetails=WYSIWIGによる製品の作成/編集では、すべてのエンティティ（提案、注文、請求書など）の詳細行が示される。 <span class="warning">警告：この場合にこのオプションを使用することは、PDFファイルを作成するときに特殊文字やページの書式設定で問題が発生する可能性があるため、真剣に推奨されない。 </span>
 FCKeditorForMailing= 郵送のWYSIWIGエディタの作成/版
 FCKeditorForUserSignature=WYSIWIGによるユーザ署名の作成/編集
 FCKeditorForMail=すべてのメールのWYSIWIG作成/エディション ( 【ツール】-> 【電子メール】を除く ) 
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=トップメニューエントリにリンクされ
 NewMenu=新メニュー
 MenuHandler=メニューハンドラ
 MenuModule=ソース·モジュール
-HideUnauthorizedMenu= 不正なメニュー ( グレー ) を非表示
+HideUnauthorizedMenu=内部ユーザーに対しても許可されていないメニューを非表示にする（それ以外の場合は灰色で表示される）
 DetailId=idのメニュー
 DetailMenuHandler=新規メニューを表示するメニューハンドラ
 DetailMenuModule=モジュール名のメニューエントリは、モジュールから来る場合
@@ -1735,8 +1737,8 @@ PasswordTogetVCalExport=エクスポートのリンクを許可するキー
 PastDelayVCalExport=より古いイベントはエクスポートしない
 AGENDA_USE_EVENT_TYPE=イベント種別を使用する ( メニューの【設定】-> 【辞書】-> 【アジェンダイベントの種別】で管理 ) 
 AGENDA_USE_EVENT_TYPE_DEFAULT=イベント作成フォームでイベントの種別にこのデフォルト値を自動的に設定する
-AGENDA_DEFAULT_FILTER_TYPE=アジェンダビューの検索フィルターでこの種別のイベントを自動的に設定する
-AGENDA_DEFAULT_FILTER_STATUS=アジェンダビューの検索フィルターでイベントのこのステータスを自動的に設定する
+AGENDA_DEFAULT_FILTER_TYPE=アジェンダビューの検索フィルタでこの種別のイベントを自動的に設定する
+AGENDA_DEFAULT_FILTER_STATUS=アジェンダビューの検索フィルタでイベントのこのステータスを自動的に設定する
 AGENDA_DEFAULT_VIEW=メニューの議題を選択するときに、デフォルトでどのビューを開くか
 AGENDA_REMINDER_BROWSER=ユーザーのブラウザ</b>でイベントリマインダー<b>を有効にする（リマインダーの日付に達すると、ブラウザにポップアップが表示される。各ユーザーは、ブラウザの通知設定からそのような通知を無効にできる）。
 AGENDA_REMINDER_BROWSER_SOUND=音声通知を有効にする
@@ -1962,8 +1964,8 @@ SetToYesIfGroupIsComputationOfOtherGroups=このグループが他のグルー
 EnterCalculationRuleIfPreviousFieldIsYes=前のフィールドが「はい」に設定されている場合は、計算ルールを入力する ( たとえば、「CODEGRP1 + CODEGRP2」 ) 
 SeveralLangugeVariatFound=いくつかの言語バリアントが見つかりました
 RemoveSpecialChars=特殊文字を削除する
-COMPANY_AQUARIUM_CLEAN_REGEX=値をクリーンアップするための正規表現フィルター ( COMPANY_AQUARIUM_CLEAN_REGEX ) 
-COMPANY_DIGITARIA_CLEAN_REGEX=値をクリーンアップするための正規表現フィルター ( COMPANY_DIGITARIA_CLEAN_REGEX ) 
+COMPANY_AQUARIUM_CLEAN_REGEX=値をクリーンアップするための正規表現フィルタ ( COMPANY_AQUARIUM_CLEAN_REGEX ) 
+COMPANY_DIGITARIA_CLEAN_REGEX=値をクリーンアップするための正規表現フィルタ ( COMPANY_DIGITARIA_CLEAN_REGEX ) 
 COMPANY_DIGITARIA_UNIQUE_CODE=複製は許可されていない
 GDPRContact=データ保護責任者 ( DPO、データプライバシーまたはGDPRの連絡先 ) 
 GDPRContactDesc=ヨーロッパの企業/市民に関するデータを保存する場合は、ここで一般データ保護規則の責任者を指定できる
@@ -1983,15 +1985,16 @@ EMailHost=電子メールIMAPサーバーのホスト
 MailboxSourceDirectory=メールボックスのソースディレクトリ
 MailboxTargetDirectory=メールボックスのターゲットディレクトリ
 EmailcollectorOperations=コレクターによる操作
+EmailcollectorOperationsDesc=操作は上から下の順序で実行される
 MaxEmailCollectPerCollect=収集ごとに収集される電子メールの最大数
 CollectNow=今すぐ収集
 ConfirmCloneEmailCollector=メールコレクター%sのクローンを作成してもよいか？
-DateLastCollectResult=最新の収集が試行された日付
-DateLastcollectResultOk=最新の収集が成功した日付
+DateLastCollectResult=最新の取得試行の日付
+DateLastcollectResultOk=最新の取得成功の日付
 LastResult=最新の結果
 EmailCollectorConfirmCollectTitle=メール収集確認
 EmailCollectorConfirmCollect=このコレクターのコレクションを今すぐ実行するか？
-NoNewEmailToProcess=処理する新規電子メール ( 一致するフィルター ) はない
+NoNewEmailToProcess=処理する新規電子メール ( 一致するフィルタ ) はない
 NothingProcessed=何もしていない
 XEmailsDoneYActionsDone=%s電子メールが修飾され、%s電子メールが正常に処理されました ( %sレコード/アクションが実行された場合 ) 
 RecordEvent=メールイベントを記録する
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Dolibarrから送信された最初の電子メールによっ
 WithoutDolTrackingID=Dolibarrから送信されていない最初の電子メールによって開始された会話からのメッセージ
 WithDolTrackingIDInMsgId=Dolibarrから送信されたメッセージ
 WithoutDolTrackingIDInMsgId=Dolibarrからメッセージが送信されていない
-CreateCandidature=候補を作成する
+CreateCandidature=求人応募を作成する
 FormatZip=ZIP
 MainMenuCode=メニュー入力コード ( メインメニュー ) 
 ECMAutoTree=自動ECMツリーを表示する
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=国 ( 特定の国に固有の場合 )
 YouMayFindSecurityAdviceHere=ここにセキュリティアドバイザリがある
 ModuleActivatedMayExposeInformation=このモジュールは機密データを公開する可能性がある。不要な場合は無効にすること。
 ModuleActivatedDoNotUseInProduction=開発用に設計されたモジュールが有効になった。実稼働環境では有効にしないこと。
+CombinationsSeparator=製品の組み合わせの区切り文字
+SeeLinkToOnlineDocumentation=例については、トップメニューのオンラインドキュメントへのリンクを参照すること
+SHOW_SUBPRODUCT_REF_IN_PDF=モジュール<b>%s </b>の機能「%s」を使用する場合は、キットの副産物の詳細をPDFで表示すること。
+AskThisIDToYourBank=このIDを取得するには、銀行に問い合わせること
diff --git a/htdocs/langs/ja_JP/banks.lang b/htdocs/langs/ja_JP/banks.lang
index c04eea05179..9b72c922929 100644
--- a/htdocs/langs/ja_JP/banks.lang
+++ b/htdocs/langs/ja_JP/banks.lang
@@ -173,10 +173,10 @@ SEPAMandate=SEPA指令
 YourSEPAMandate=あなたのSEPA指令
 FindYourSEPAMandate=これは、当法人が銀行に口座振替を注文することを承認するSEPA指令です。署名済（署名済ドキュメントをスキャン）で返送するか、メールで送付すること
 AutoReportLastAccountStatement=照合を行うときに、フィールド「銀行取引明細書の番号」に最後の取引明細書番号を自動的に入力する
-CashControl=POSキャッシュフェンス
-NewCashFence=新規キャッシュフェンス
+CashControl=POS現金出納帳制御
+NewCashFence=新規現金出納帳の締め
 BankColorizeMovement=移動に色を付ける
 BankColorizeMovementDesc=この機能が有効になっている場合は、借方または貸方の移動に特定の背景色を選択できます
 BankColorizeMovementName1=借方移動の背景色
 BankColorizeMovementName2=クレジット移動の背景色
-IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
+IfYouDontReconcileDisableProperty=一部の銀行口座で銀行照合を行わない場合は、それらのプロパティ "%s"を無効にして、この警告を削除すること。
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index 281ae230ffd..258b829cd45 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -328,7 +328,7 @@ InvoiceStatus=請求書の状況
 InvoiceNote=請求書に注意
 InvoicePaid=支払われた請求
 InvoicePaidCompletely=完全に支払われた
-InvoicePaidCompletelyHelp=完全に支払われる請求書。これには、部分的に支払われる請求書は含まれない。すべての「クローズ」または「クローズ」以外の請求書のリストを取得するには、請求書のステータスにフィルターを使用することを勧める。
+InvoicePaidCompletelyHelp=完全に支払われる請求書。これには、部分的に支払われる請求書は含まれない。すべての「クローズ」または「クローズ」以外の請求書のリストを取得するには、請求書のステータスにフィルタを使用することを勧める。
 OrderBilled=請求済の注文
 DonationPaid=寄付金を支払ました
 PaymentNumber=支払番号
diff --git a/htdocs/langs/ja_JP/blockedlog.lang b/htdocs/langs/ja_JP/blockedlog.lang
index 239cc0674ba..d30b407f1d8 100644
--- a/htdocs/langs/ja_JP/blockedlog.lang
+++ b/htdocs/langs/ja_JP/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=寄付は論理削除済
 logMEMBER_SUBSCRIPTION_CREATE=メンバーサブスクリプションは作成済
 logMEMBER_SUBSCRIPTION_MODIFY=メンバーサブスクリプションは変更済
 logMEMBER_SUBSCRIPTION_DELETE=メンバーサブスクリプションは論理削除済
-logCASHCONTROL_VALIDATE=キャッシュフェンスの記録
+logCASHCONTROL_VALIDATE=現金出納帳の締めを記録中
 BlockedLogBillDownload=顧客請求書のダウンロード
 BlockedLogBillPreview=顧客請求書のプレビュー
 BlockedlogInfoDialog=ログの詳細
@@ -50,5 +50,5 @@ BlockedLogAreRequiredByYourCountryLegislation=変更不可能なログモジュ
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=あなたの国の法律により、変更不可能なログモジュールがアクティブ化済。このモジュールを無効にすると、税務監査で検証できないため、法律および法律ソフトウェアの使用に関して将来の取引が無効になる可能性あり。
 BlockedLogDisableNotAllowedForCountry=このモジュールの使用が必須である国のリスト(誤ってモジュールを無効にするのを防ぐために、あなたの国がこのリストにある場合、最初にこのリストを編集しないとモジュールを無効にできない。このモジュールの有効/無効は、変更不可能なログに追跡されることに注意)。
 OnlyNonValid=無効
-TooManyRecordToScanRestrictFilters=スキャン/分析するにはレコードが多すぎ。より制限の厳しいフィルターでリストを制限すること。
+TooManyRecordToScanRestrictFilters=スキャン/分析するにはレコードが多すぎ。より制限の厳しいフィルタでリストを制限すること。
 RestrictYearToExport=エクスポートする月/年を制限する
diff --git a/htdocs/langs/ja_JP/boxes.lang b/htdocs/langs/ja_JP/boxes.lang
index 2b6ffad8f97..48ec754be1b 100644
--- a/htdocs/langs/ja_JP/boxes.lang
+++ b/htdocs/langs/ja_JP/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=最新の%s変更された寄付
 BoxTitleLastModifiedExpenses=最新の%s変更された経費報告書
 BoxTitleLatestModifiedBoms=最新の%s変更されたBOM
 BoxTitleLatestModifiedMos=最新の%s変更された製造オーダー
+BoxTitleLastOutstandingBillReached=最大未払い額を超えた顧客
 BoxGlobalActivity=グローバルアクティビティ（請求書、提案、注文）
 BoxGoodCustomers=良い顧客
 BoxTitleGoodCustomers=%s良い顧客
+BoxScheduledJobs=スケジュールジョブ
+BoxTitleFunnelOfProspection=リードファンネル
 FailedToRefreshDataInfoNotUpToDate=RSSフラックスの更新に失敗しました。最新の正常な更新日：%s
 LastRefreshDate=最新の更新日
 NoRecordedBookmarks=ブックマークが定義されていない。
@@ -102,6 +105,7 @@ SuspenseAccountNotDefined=一時停止アカウントが定義されていない
 BoxLastCustomerShipments=最後の顧客の出荷
 BoxTitleLastCustomerShipments=最新の%s顧客出荷
 NoRecordedShipments=顧客の出荷は記録されていない
+BoxCustomersOutstandingBillReached=上限に達した顧客
 # Pages
 AccountancyHome=会計
 ValidatedProjects=検証済みプロジェクト
diff --git a/htdocs/langs/ja_JP/cashdesk.lang b/htdocs/langs/ja_JP/cashdesk.lang
index 15f5a1bd3b0..8970caa73d6 100644
--- a/htdocs/langs/ja_JP/cashdesk.lang
+++ b/htdocs/langs/ja_JP/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=フッター
 AmountAtEndOfPeriod=期末の金額（日、月、または年）
 TheoricalAmount=理論量
 RealAmount=実数
-CashFence=キャッシュフェンス
-CashFenceDone=期間中に行われたキャッシュフェンス
+CashFence=現金出納帳の締め
+CashFenceDone=当該期間での現金出納帳の締めが完了
 NbOfInvoices=請求書のNb
 Paymentnumpad=支払いを入力するパッドのタイプ
 Numberspad=ナンバーズパッド
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=POS販売用の番号付けモジュール
 CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b>タグは端末番号を追加するために使用される
 TakeposGroupSameProduct=同じ製品ラインをグループ化する
 StartAParallelSale=新規並行販売を開始する
-ControlCashOpening=POSを開くときにキャッシュボックスを制御する
-CloseCashFence=キャッシュフェンスを閉じる
+SaleStartedAt=%sから販売開始
+ControlCashOpening=POSを開くときにキャッシュポップアップを制御する
+CloseCashFence=現金出納帳制御を閉じる
 CashReport=現金レポート
 MainPrinterToUse=使用するメインプリンター
 OrderPrinterToUse=使用するプリンタを注文する
diff --git a/htdocs/langs/ja_JP/categories.lang b/htdocs/langs/ja_JP/categories.lang
index f3d63b0723d..3ab7139c3cb 100644
--- a/htdocs/langs/ja_JP/categories.lang
+++ b/htdocs/langs/ja_JP/categories.lang
@@ -19,7 +19,8 @@ ProjectsCategoriesArea=プロジェクトタグ/カテゴリ領域
 UsersCategoriesArea=ユーザータグ/カテゴリ領域
 SubCats=サブカテゴリ
 CatList=タグ/カテゴリのリスト
-NewCategory=新しいタグ/カテゴリ
+CatListAll=タグ/カテゴリのリスト（すべての種別）
+NewCategory=新規タグ/カテゴリ
 ModifCat=タグ/カテゴリを変更する
 CatCreated=作成されたタグ/カテゴリ
 CreateCat=タグ/カテゴリを作成する
@@ -65,24 +66,30 @@ UsersCategoriesShort=ユーザーのタグ/カテゴリ
 StockCategoriesShort=倉庫のタグ/カテゴリ
 ThisCategoryHasNoItems=このカテゴリにはアイテムは含まれていない。
 CategId=タグ/カテゴリID
-CatSupList=ベンダータグ/カテゴリのリスト
+ParentCategory=親タグ/カテゴリ
+ParentCategoryLabel=親タグ/カテゴリのラベル
+CatSupList=仕入先のタグ/カテゴリのリスト
 CatCusList=顧客/見込み客のタグ/カテゴリのリスト
 CatProdList=製品タグ/カテゴリのリスト
 CatMemberList=メンバーのタグ/カテゴリのリスト
 CatContactList=連絡先タグ/カテゴリのリスト
-CatSupLinks=サプライヤーとタグ/カテゴリー間のリンク
+CatProjectsList=プロジェクトのタグ/カテゴリのリスト
+CatUsersList=ユーザーのタグ/カテゴリのリスト
+CatSupLinks=仕入先とタグ/カテゴリ間のリンク
 CatCusLinks=顧客/見込み客とタグ/カテゴリ間のリンク
 CatContactsLinks=連絡先/アドレスとタグ/カテゴリ間のリンク
 CatProdLinks=製品/サービスとタグ/カテゴリ間のリンク
-CatProJectLinks=プロジェクトとタグ/カテゴリ間のリンク
+CatMembersLinks=メンバーとタグ/カテゴリ間のリンク
+CatProjectsLinks=プロジェクトとタグ/カテゴリ間のリンク
+CatUsersLinks=ユーザーとタグ/カテゴリ間のリンク
 DeleteFromCat=タグ/カテゴリから削除する
 ExtraFieldsCategories=補完的な属性
 CategoriesSetup=タグ/カテゴリの設定
 CategorieRecursiv=親タグ/カテゴリと自動的にリンクする
 CategorieRecursivHelp=オプションがオンの場合、製品をサブカテゴリに追加すると、製品も親カテゴリに追加される。
 AddProductServiceIntoCategory=次の製品/サービスを追加する
-AddCustomerIntoCategory=Assign category to customer
-AddSupplierIntoCategory=Assign category to supplier
+AddCustomerIntoCategory=顧客にカテゴリを割り当てる
+AddSupplierIntoCategory=カテゴリをサプライヤに割り当てる
 ShowCategory=タグ/カテゴリを表示
 ByDefaultInList=デフォルトでリストに
 ChooseCategory=カテゴリを選択
diff --git a/htdocs/langs/ja_JP/companies.lang b/htdocs/langs/ja_JP/companies.lang
index 4296d39f2dd..079eacaf90c 100644
--- a/htdocs/langs/ja_JP/companies.lang
+++ b/htdocs/langs/ja_JP/companies.lang
@@ -172,7 +172,7 @@ ProfId1ES=職 Id 1 (CIF/NIF)
 ProfId2ES=職 Id 2 (Social security number)
 ProfId3ES=職 Id 3 (CNAE)
 ProfId4ES=職 Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=EORI番号
 ProfId6ES=-
 ProfId1FR=職 Id 1 (SIREN)
 ProfId2FR=職 Id 2 (SIRET)
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=欧州委員会のウェブサイトでコミュニテ
 VATIntraManualCheck=欧州委員会のウェブサイト<a href="%s" target="_blank">%s</a>で手動で確認可能
 ErrorVATCheckMS_UNAVAILABLE=ことはできませんを確認してください。サービスは加盟国（%s）によって提供されていません確認してください。
 NorProspectNorCustomer=見込客でない、顧客でない
-JuridicalStatus=法的組織種別
+JuridicalStatus=事業体種別
 Workforce=労働力
 Staff=従業員
 ProspectLevelShort=潜在的な
diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang
index 2714ed31df3..df3a1078018 100644
--- a/htdocs/langs/ja_JP/compta.lang
+++ b/htdocs/langs/ja_JP/compta.lang
@@ -111,7 +111,7 @@ Refund=払戻
 SocialContributionsPayments=社会/財政税支払
 ShowVatPayment=付加価値税支払を表示する
 TotalToPay=支払に合計
-BalanceVisibilityDependsOnSortAndFilters=このリストに残高が表示されるのは、テーブルが%sで昇順で並べ替えられ、1つの銀行口座でフィルタリングされている場合のみ。
+BalanceVisibilityDependsOnSortAndFilters=残高は、テーブルが%sで並べ替えられ、1つの銀行口座でフィルタリングされている場合にのみこのリストに表示される（他のフィルタはない）
 CustomerAccountancyCode=顧客会計コード
 SupplierAccountancyCode=ベンダー会計コード
 CustomerAccountancyCodeShort=カスト。アカウント。コード
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=この社会的/財政的納税を削除して
 ExportDataset_tax_1=社会的および財政的な税金と支払
 CalcModeVATDebt=コミットメントアカウンティングのモード<b>%sVAT%s</b>。
 CalcModeVATEngagement=収入のモード<b>%sVAT-expenses%s</b>。
-CalcModeDebt=元帳にまだ計上されていない場合でも、既知の記録された請求書の分析。
+CalcModeDebt=元帳未計上によらず、既知の記録済文書の分析。
 CalcModeEngagement=元帳にまだ計上されていない場合でも、既知の記録された支払の分析。
 CalcModeBookkeeping=簿記元帳テーブルにジャーナル化されたデータの分析。
 CalcModeLT1= 顧客の請求書のモード<b>%sRE-サプライヤーの請求書s%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=収支差額、年次要約
 AnnualByCompanies=事前定義されたアカウントグループによる収支差額
 AnnualByCompaniesDueDebtMode=収支差額、事前定義されたグループによる詳細、モード<b> %sClaims-Debts%s</b>は<b>コミットメント会計</b>と言える。
 AnnualByCompaniesInputOutputMode=収支差額、事前定義されたグループによる詳細、モード<b>%sIncomes-Expenses%s</b>は<b>現金会計</b>と言える。
-SeeReportInInputOutputMode=元帳にまだ計上されていない場合でも、実際に行われた支払の計算については、%s支払の分析%sを参照すること。
-SeeReportInDueDebtMode=既知の記録された請求書に基づく計算については、元帳にまだ計上されていない場合でも、請求書の%sanalysiss%sを参照すること。
-SeeReportInBookkeepingMode=<b>簿記元帳テーブル</b>の計算については、<b> %sBookeeping report%s</b>を参照すること。
+SeeReportInInputOutputMode=元帳未計上によらず、 <b>%s支払の分析%s</b> を参照すること。その対象は <b>記録済支払</b> に基づく計算。
+SeeReportInDueDebtMode=元帳未計上によらず、 <b>%s記録済文書sの分析%s</b> を参照すること。その対象は、既知の <b>記録済文書s </b> に基づく計算。
+SeeReportInBookkeepingMode=<b>%s簿記元帳テーブルの分析%s</b> を参照すること。その対象は、 <b>簿記元帳テーブル</b>基づくレポート。
 RulesAmountWithTaxIncluded=-表示されている金額はすべての税金が含まれている
 RulesResultDue=-未払いの請求書、経費、VAT、支払の有無にかかわらず寄付が含まれる。給与も含まれている。 <br>-請求書の請求日と、経費または税金支払期日に基づいている。給与モジュールで定義された給与の場合、支払の起算日が使用される。
 RulesResultInOut=-これには、請求書、経費、VAT、および給与に対して行われた実際支払が含まれる。 <br>-請求書、経費、VAT、給与支払日に基づいている。寄付の寄付日。
diff --git a/htdocs/langs/ja_JP/cron.lang b/htdocs/langs/ja_JP/cron.lang
index 431b36d9c0d..317f2f0d8c4 100644
--- a/htdocs/langs/ja_JP/cron.lang
+++ b/htdocs/langs/ja_JP/cron.lang
@@ -7,8 +7,8 @@ Permission23103 = スケジュールされたジョブを削除する
 Permission23104 = スケジュールされたジョブを実行する
 # Admin
 CronSetup=スケジュールされたジョブ管理のセットアップ
-URLToLaunchCronJobs=修飾されたcronジョブを確認して起動するためのURL
-OrToLaunchASpecificJob=または、特定のジョブを確認して起動する
+URLToLaunchCronJobs=ブラウザから修飾されたcronジョブを確認して起動するためのURL
+OrToLaunchASpecificJob=または、ブラウザから特定のジョブを確認して起動する
 KeyForCronAccess=cronジョブを起動するためのURLのセキュリティキー
 FileToLaunchCronJobs=修飾されたcronジョブをチェックして起動するコマンドライン
 CronExplainHowToRunUnix=Unix環境では、次のcrontabエントリを使用して、5分ごとにコマンドラインを実行する必要がある。
@@ -84,3 +84,8 @@ MakeLocalDatabaseDumpShort=ローカルデータベースのバックアップ
 MakeLocalDatabaseDump=ローカルデータベースダンプを作成する。パラメータは次のもの: 圧縮 ('gz' or 'bz' or 'none')、バックアップ種別 ('mysql', 'pgsql', 'auto')、1、 'auto' またはビルドするファイル名、保持するバックアップファイルの数
 WarningCronDelayed=注意、パフォーマンスの目的で、有効なジョブの次の実行日が何であれ、ジョブは実行される前に最大%s時間まで遅延する可能性がある。
 DATAPOLICYJob=データクリーナとアノニマイザ
+JobXMustBeEnabled=ジョブ%sを有効にする必要がある
+# Cron Boxes
+LastExecutedScheduledJob=最後に実行されたスケジュールジョブ
+NextScheduledJobExecute=次に実行する予定のジョブ
+NumberScheduledJobError=エラーのあるスケジュールジョブの数
diff --git a/htdocs/langs/ja_JP/donations.lang b/htdocs/langs/ja_JP/donations.lang
index 6a498695940..e0b1a121335 100644
--- a/htdocs/langs/ja_JP/donations.lang
+++ b/htdocs/langs/ja_JP/donations.lang
@@ -4,7 +4,7 @@ Donations=寄付
 DonationRef=寄付参照
 Donor=ドナー
 AddDonation=寄付を作成する
-NewDonation=新しい寄付
+NewDonation=新規寄付
 DeleteADonation=寄付を削除する
 ConfirmDeleteADonation=この寄付を削除してもよいか？
 PublicDonation=義援金
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index 60df8eba840..29a6a5b5dc5 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -8,6 +8,7 @@ ErrorBadEMail=メール%sが間違っている
 ErrorBadMXDomain=メール%sが間違っているようだ（ドメインに有効なMXレコードがない）
 ErrorBadUrl=URLの%sが間違っている
 ErrorBadValueForParamNotAString=パラメータ の値が正しくない。通常、翻訳が欠落している場合に追加される。
+ErrorRefAlreadyExists=参照<b>%s</b>はすでに存在する。
 ErrorLoginAlreadyExists=ログイン%sはすでに存在している。
 ErrorGroupAlreadyExists=グループ%sはすでに存在している。
 ErrorRecordNotFound=レコードが見つからなかった。
@@ -49,6 +50,7 @@ ErrorFieldsRequired=いくつかの必須フィールドが満たされていな
 ErrorSubjectIsRequired=メールトピックが必要だ
 ErrorFailedToCreateDir=ディレクトリの作成に失敗した。そのWebサーバのユーザがDolibarrのドキュメントディレクトリに書き込む権限を持って確認すること。パラメータ の<b>safe_modeが</b>このPHPが有効になっている場合、Dolibarr PHPファイルは、Webサーバーのユーザー（またはグループ）に所有していることを確認すること。
 ErrorNoMailDefinedForThisUser=このユーザーに定義されたメールはない
+ErrorSetupOfEmailsNotComplete=メールの設定が完了していない
 ErrorFeatureNeedJavascript=この機能が動作するようにアクティブにするjavascriptをする必要がある。セットアップでこれを変更 - 表示される。
 ErrorTopMenuMustHaveAParentWithId0=タイプは 'top'のメニューが親メニューを持つことはできない。親メニューに0を置くか、または型 &quot;左&quot;のメニューを選択する。
 ErrorLeftMenuMustHaveAParentId=タイプ &quot;左&quot;のメニューは、親IDを持つ必要がある。
@@ -76,7 +78,7 @@ ErrorExportDuplicateProfil=このプロファイル名は、このエクスポ
 ErrorLDAPSetupNotComplete=Dolibarr-LDAPのマッチングは完全ではない。
 ErrorLDAPMakeManualTest=.ldifファイルは、ディレクトリ%sで生成された。エラーの詳細情報を持つようにコマンドラインから手動でそれをロードしようとする。
 ErrorCantSaveADoneUserWithZeroPercentage= "doneby" フィールドも入力されている場合、 "statusnotstarted" のアクションを保存できない。
-ErrorRefAlreadyExists=作成に使用refは、すでに存在している。
+ErrorRefAlreadyExists=参照<b>%s</b>はすでに存在する。
 ErrorPleaseTypeBankTransactionReportName=エントリを報告する必要のある銀行取引明細書名を入力すること（フォーマットYYYYMMまたはYYYYMMDD）
 ErrorRecordHasChildren=子レコードがいくつかあるため、レコードの削除に失敗した。
 ErrorRecordHasAtLeastOneChildOfType=オブジェクトには、タイプ%sの子が少なくとも1つある
@@ -118,7 +120,7 @@ ErrorFailedToRunExternalCommand=外部コマンドの実行に失敗した。そ
 ErrorFailedToChangePassword=パスワードの変更に失敗した
 ErrorLoginDoesNotExists=ログイン<b>%s</b>を持つユーザーを見つけることができなかった。
 ErrorLoginHasNoEmail=このユーザーは電子メールアドレスを持っていない。プロセスが中止された。
-ErrorBadValueForCode=セキュリティコードの値が正しくない。新しい値で再試行すること...
+ErrorBadValueForCode=セキュリティコードの値が正しくない。新規値で再試行すること...
 ErrorBothFieldCantBeNegative=フィールド%s %sとは負の両方にすることはできない
 ErrorFieldCantBeNegativeOnInvoice=このタイプの請求書では、フィールド<strong> %s</strong>を負にすることはできない。割引ラインを追加する必要がある場合は、最初に割引を作成し（サードパーティカードのフィールド '%s'から）、それを請求書に適用する。
 ErrorLinesCantBeNegativeForOneVATRate=行の合計（税控除後）は、特定のnull以外のVAT率に対して負になることはできない（VAT率<b> %s </b> %%の負の合計が見つかった）。
@@ -133,7 +135,7 @@ ErrorModuleFileRequired=Dolibarrモジュールパッケージファイルを選
 ErrorPhpCurlNotInstalled=PHPCURLがインストールされていない。これはPaypalと話すために不可欠だ。
 ErrorFailedToAddToMailmanList=レコード%sをMailmanリスト%sまたはSPIPベースに追加できなかった
 ErrorFailedToRemoveToMailmanList=レコード%sをMailmanリスト%sまたはSPIPベースに削除できなかった
-ErrorNewValueCantMatchOldValue=新しい値を古い値と等しくすることはできない
+ErrorNewValueCantMatchOldValue=新規値を古い値と等しくすることはできない
 ErrorFailedToValidatePasswordReset=パスワードの再初期化に失敗した。 reinitがすでに実行されている可能性がある（このリンクは1回しか使用できない）。そうでない場合は、再初期化プロセスを再開してみること。
 ErrorToConnectToMysqlCheckInstance=データベースへの接続に失敗。データベースサーバーが実行されていることを確認する（たとえば、mysql/mariadb なら、コマンドラインから "sudo service mysql start" を使用して起動できる）。
 ErrorFailedToAddContact=連絡先の追加に失敗した
@@ -144,7 +146,7 @@ ErrorPHPNeedModule=エラー、この機能を使用するには、PHPにモジ
 ErrorOpenIDSetupNotComplete=OpenID認証を許可するようにDolibarr構成ファイルを設定したが、OpenIDサービスのURLが定数%sに定義されていない
 ErrorWarehouseMustDiffers=ソースウェアハウスとターゲットウェアハウスは異なる必要がある
 ErrorBadFormat=悪いフォーマット！
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=エラー、このメンバーはまだサードパーティにリンクされていない。請求書付きのサブスクリプションを作成する前に、メンバーを既存のサードパーティにリンクするか、新しいサードパーティを作成すること。
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=エラー、このメンバーはまだサードパーティにリンクされていない。請求書付きのサブスクリプションを作成する前に、メンバーを既存のサードパーティにリンクするか、新規サードパーティを作成すること。
 ErrorThereIsSomeDeliveries=エラー、この出荷に関連するいくつかの配送がある。削除は拒否された。
 ErrorCantDeletePaymentReconciliated=調整された銀行エントリを生成した支払いを削除できない
 ErrorCantDeletePaymentSharedWithPayedInvoice=ステータスがPaidの少なくとも1つの請求書で共有されている支払いを削除できない
@@ -189,10 +191,10 @@ ErrorFileMustHaveFormat=ファイルの形式は%sである必要がある
 ErrorFilenameCantStartWithDot=ファイル名を "。" で始めることはできない。
 ErrorSupplierCountryIsNotDefined=このベンダーの国は定義されていない。最初にこれを修正すること。
 ErrorsThirdpartyMerge=2つのレコードのマージに失敗した。リクエストはキャンセルされた。
-ErrorStockIsNotEnoughToAddProductOnOrder=製品%sが新しい注文に追加するには、在庫が十分ではない。
-ErrorStockIsNotEnoughToAddProductOnInvoice=製品%sが新しい請求書に追加するには、在庫が十分ではない。
-ErrorStockIsNotEnoughToAddProductOnShipment=製品%sが新しい出荷に追加するには、在庫が十分ではない。
-ErrorStockIsNotEnoughToAddProductOnProposal=製品%sが新しい提案に追加するには、在庫が十分ではない。
+ErrorStockIsNotEnoughToAddProductOnOrder=製品%sが新規注文に追加するには、在庫が十分ではない。
+ErrorStockIsNotEnoughToAddProductOnInvoice=製品%sが新規請求書に追加するには、在庫が十分ではない。
+ErrorStockIsNotEnoughToAddProductOnShipment=製品%sが新規出荷に追加するには、在庫が十分ではない。
+ErrorStockIsNotEnoughToAddProductOnProposal=製品%sが新規提案に追加するには、在庫が十分ではない。
 ErrorFailedToLoadLoginFileForMode=モード "%s" のログインキーの取得に失敗した。
 ErrorModuleNotFound=モジュールのファイルが見つからなかった。
 ErrorFieldAccountNotDefinedForBankLine=ソース行ID%s（%s）に対してアカウンティングアカウントの値が定義されていない
@@ -224,7 +226,7 @@ ErrorDuringChartLoad=勘定科目表の読み込み中にエラーが発生し
 ErrorBadSyntaxForParamKeyForContent=paramkeyforcontentの構文が正しくない。 %sまたは%sで始まる値が必要だ
 ErrorVariableKeyForContentMustBeSet=エラー、名前%s（表示するテキストコンテンツ付き）または%s（表示する外部URL付き）の定数を設定する必要がある。
 ErrorURLMustStartWithHttp=URL %sは http:// または https:// で始まる必要がある
-ErrorNewRefIsAlreadyUsed=エラー、新しい参照はすでに使用されている
+ErrorNewRefIsAlreadyUsed=エラー、新規参照はすでに使用されている
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=エラー、クローズされた請求書にリンクされた支払いを削除することはできない。
 ErrorSearchCriteriaTooSmall=検索条件が小さすぎる。
 ErrorObjectMustHaveStatusActiveToBeDisabled=無効にするには、オブジェクトのステータスが "アクティブ" である必要がある
@@ -246,6 +248,14 @@ ErrorProductDoesNotNeedBatchNumber=エラー、製品 '<b> %s</b>'はロット/
 ErrorFailedToReadObject=エラー、タイプ<b> %s</b>のオブジェクトの読み取りに失敗した
 ErrorParameterMustBeEnabledToAllwoThisFeature=エラー、パラメータ <b> %s </b>を<b>conf / conf.php <b>で有効にして、内部ジョブスケジューラでコマンドラインインターフェイスを使用できるようにする必要がある
 ErrorLoginDateValidity=エラー、このログインは有効期間外だ
+ErrorValueLength=フィールドの長さ '<b> %s </b>'は '<b> %s</b>'より大きくなければならない
+ErrorReservedKeyword=「<b>%s</b>」という単語は予約語 
+ErrorNotAvailableWithThisDistribution=このディストリビューションでは利用できない
+ErrorPublicInterfaceNotEnabled=パブリックインターフェイスが有効になっていない
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=別のページの翻訳として設定されている場合は、新しいページの言語を定義する必要がある
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=新しいページの言語は、別ページの翻訳として設定されている場合、ソース言語にしないこと
+ErrorAParameterIsRequiredForThisOperation=この操作にはパラメーターが必須です
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHPパラメータ upload_max_filesize（%s）は、PHPパラメータ post_max_size（%s）よりも大きくなっている。これは一貫した設定ではない。
 WarningPasswordSetWithNoAccount=このメンバーにパスワードが設定された。ただし、ユーザーアカウントは作成されなかった。したがって、このパスワードは保存されるが、Dolibarrへのログインには使用できない。外部モジュール/インターフェースで使用できるが、メンバーのログインやパスワードを定義する必要がない場合は、メンバーモジュールの設定から "各メンバーのログインを管理する" オプションを無効にすることができる。ログインを管理する必要があるがパスワードは必要ない場合は、このフィールドを空のままにして、この警告を回避できる。注：メンバーがユーザーにリンクされている場合は、電子メールをログインとして使用することもできる。
@@ -264,9 +274,9 @@ WarningUsingThisBoxSlowDown=警告、このボックスを使用すると、ボ
 WarningClickToDialUserSetupNotComplete=ユーザーのClickToDial情報の設定が完了していない（ユーザーカードのClickToDialタブを参照）。
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=表示設定が視覚障害者またはテキストブラウザ用に最適化されている場合、機能は無効になる。
 WarningPaymentDateLowerThanInvoiceDate=請求書%sの支払い日（%s）が請求日（%s）よりも前だ。
-WarningTooManyDataPleaseUseMoreFilters=データが多すぎる（%s行を超えている）。より多くのフィルターを使用するか、定数%sをより高い制限に設定すること。
+WarningTooManyDataPleaseUseMoreFilters=データが多すぎる（%s行を超えている）。より多くのフィルタを使用するか、定数%sをより高い制限に設定すること。
 WarningSomeLinesWithNullHourlyRate=時間料金が定義されていないときに、一部のユーザーによって記録された時間もある。 1時間あたり0%sの値が使用されたが、これにより、費やされた時間の誤った評価が発生する可能性がある。
-WarningYourLoginWasModifiedPleaseLogin=ログインが変更された。セキュリティ上の理由から、次のアクションの前に新しいログインでログインする必要がある。
+WarningYourLoginWasModifiedPleaseLogin=ログインが変更された。セキュリティ上の理由から、次のアクションの前に新規ログインでログインする必要がある。
 WarningAnEntryAlreadyExistForTransKey=この言語の翻訳キーのエントリはすでに存在する
 WarningNumberOfRecipientIsRestrictedInMassAction=警告、リストで一括アクションを使用する場合、異なる受信者の数は<b> %s</b>に制限される
 WarningDateOfLineMustBeInExpenseReportRange=警告、行の日付が経費報告書の範囲内にない
@@ -276,3 +286,4 @@ WarningSomeBankTransactionByChequeWereRemovedAfter=一部の銀行取引は、
 WarningFailedToAddFileIntoDatabaseIndex=警告、ECMデータベースインデックステーブルにファイルエントリを追加できなかった
 WarningTheHiddenOptionIsOn=警告、非表示のオプション<b> %s</b>がオンになっている。
 WarningCreateSubAccounts=警告、サブアカウントを直接作成することはできない。このリストでそれらを見つけるには、サードパーティまたはユーザーを作成し、それらにアカウンティングコードを割り当てる必要がある
+WarningAvailableOnlyForHTTPSServers=HTTPSで保護された接続を使用している場合にのみ使用できます。
diff --git a/htdocs/langs/ja_JP/exports.lang b/htdocs/langs/ja_JP/exports.lang
index 1aefed12ba1..36b88c20eab 100644
--- a/htdocs/langs/ja_JP/exports.lang
+++ b/htdocs/langs/ja_JP/exports.lang
@@ -132,4 +132,5 @@ FormatControlRule=フォーマット制御ルール
 KeysToUseForUpdates=<b>が</b>の既存データを更新するために使用するキー（列）
 NbInsert=挿入された行数：%s
 NbUpdate=更新された行数：%s
-MultipleRecordFoundWithTheseFilters=これらのフィルターで複数のレコードが見つかった：%s
+MultipleRecordFoundWithTheseFilters=これらのフィルタで複数のレコードが見つかった：%s
+StocksWithBatch=バッチ/シリアル番号のある製品の在庫と場所（倉庫）
diff --git a/htdocs/langs/ja_JP/ftp.lang b/htdocs/langs/ja_JP/ftp.lang
index a95eeb0aa40..765e2a4c44f 100644
--- a/htdocs/langs/ja_JP/ftp.lang
+++ b/htdocs/langs/ja_JP/ftp.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - ftp
 FTPClientSetup=FTPまたはSFTPクライアントモジュールの設定
-NewFTPClient=新しいFTP / FTPS接続の設定
+NewFTPClient=新規FTP / FTPS接続の設定
 FTPArea=FTP / FTPSエリア
 FTPAreaDesc=この画面には、FTPおよびSFTPサーバのビューが表示される。
 SetupOfFTPClientModuleNotComplete=FTPまたはSFTPクライアントモジュールの設定が不完全なようです
diff --git a/htdocs/langs/ja_JP/hrm.lang b/htdocs/langs/ja_JP/hrm.lang
index 4b9b1edd9d3..a7be093eebe 100644
--- a/htdocs/langs/ja_JP/hrm.lang
+++ b/htdocs/langs/ja_JP/hrm.lang
@@ -16,4 +16,4 @@ DictionaryFunction=HRM - 職位
 Employees=従業員s
 Employee=従業員
 NewEmployee=新規従業員
-ListOfEmployees=List of employees
+ListOfEmployees=従業員リスト
diff --git a/htdocs/langs/ja_JP/install.lang b/htdocs/langs/ja_JP/install.lang
index 72525b888a8..96515a06978 100644
--- a/htdocs/langs/ja_JP/install.lang
+++ b/htdocs/langs/ja_JP/install.lang
@@ -61,7 +61,7 @@ CreateUser=Dolibarrデータベースでユーザアカウントを作成する
 DatabaseSuperUserAccess=データベースサーバ - スーパーユーザのアクセス
 CheckToCreateDatabase=データベースがまだ存在しないため、作成する必要がある場合は、チェックボックスをオンにする。 <br>この場合、このページの下部にスーパーユーザアカウントのユーザ名とパスワードも入力する必要がある。
 CheckToCreateUser=次の場合にチェックボックスをオンにする。<br>データベースユーザアカウントがまだ存在しないため作成する必要がある場合、またはユーザアカウントは存在するがデータベースが存在せず、アクセス許可を付与する必要がある場合は<br>。 <br>この場合、このページの下部にユーザアカウントとパスワードを入力する必要があり、<b>も</b>スーパーユーザアカウント名とパスワードを入力する必要がある。このボックスがオフの場合、データベースの所有者とパスワードがすでに存在する必要がある。
-DatabaseRootLoginDescription=スーパーユーザアカウント名（新しいデータベースまたは新しいユーザを作成するため）。データベースまたはその所有者がまだ存在しない場合は必須。
+DatabaseRootLoginDescription=スーパーユーザアカウント名（新規データベースまたは新規ユーザを作成するため）。データベースまたはその所有者がまだ存在しない場合は必須。
 KeepEmptyIfNoPassword=スーパーユーザにパスワードがない場合は空のままにする（非推奨）
 SaveConfigurationFile=パラメータをに保存する
 ServerConnection=サーバーへの接続
@@ -102,7 +102,7 @@ ChooseYourSetupMode=設定モードを選択し、"スタート"をクリック.
 FreshInstall=新規インストール
 FreshInstallDesc=これが初めてのインストールである場合は、このモードを使用すること。そうでない場合、このモードは不完全な以前のインストールを修復できる。バージョンをアップグレードする場合は、「アップグレード」モードを選択すること。
 Upgrade=アップグレード
-UpgradeDesc=あなたが新しいバージョンのファイルが古いDolibarrファイルを交換した場合、このモードを使用する。これにより、データベースとデータをアップグレードする。
+UpgradeDesc=あなたが新規バージョンのファイルが古いDolibarrファイルを交換した場合、このモードを使用する。これにより、データベースとデータをアップグレードする。
 Start=開始
 InstallNotAllowed=設定では<b>、conf.php</b>の権限で許可されていない
 YouMustCreateWithPermission=あなたは、ファイル%sを作成し、インストールプロセス中にWebサーバのためにそれへの書き込み権限を設定する必要がある。
diff --git a/htdocs/langs/ja_JP/languages.lang b/htdocs/langs/ja_JP/languages.lang
index 99d0e3d3fbb..33c1dee16eb 100644
--- a/htdocs/langs/ja_JP/languages.lang
+++ b/htdocs/langs/ja_JP/languages.lang
@@ -40,7 +40,7 @@ Language_es_PA=スペイン語 (パナマ)
 Language_es_PY=スペイン語（パラグアイ）
 Language_es_PE=スペイン語（ペルー）
 Language_es_PR=スペイン語（プエルトリコ）
-Language_es_US=Spanish (USA)
+Language_es_US=スペイン語（USA）
 Language_es_UY=スペイン語（ウルグアイ）
 Language_es_GT=スペイン語（グアテマラ）
 Language_es_VE=スペイン語 (ベネズエラ)
diff --git a/htdocs/langs/ja_JP/loan.lang b/htdocs/langs/ja_JP/loan.lang
index a0a77be01d9..7b09bf4ef54 100644
--- a/htdocs/langs/ja_JP/loan.lang
+++ b/htdocs/langs/ja_JP/loan.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - loan
 Loan=ローン
 Loans=ローン
-NewLoan=新しいローン
+NewLoan=新規ローン
 ShowLoan=ローンを表示
 PaymentLoan=ローンの支払
 LoanPayment=ローンの支払
diff --git a/htdocs/langs/ja_JP/mails.lang b/htdocs/langs/ja_JP/mails.lang
index 0a8693bb1be..6106bcfd346 100644
--- a/htdocs/langs/ja_JP/mails.lang
+++ b/htdocs/langs/ja_JP/mails.lang
@@ -23,7 +23,7 @@ SubjectNotIn=件名にない
 BodyNotIn=体にない
 ShowEMailing=電子メールで表示
 ListOfEMailings=emailingsのリスト
-NewMailing=新しいメール送信
+NewMailing=新規メール送信
 EditMailing=電子メールで編集
 ResetMailing=電子メールで送信する再送
 DeleteMailing=電子メールで送信する削除
@@ -45,7 +45,7 @@ MailUnsubcribe=登録を解除する
 MailingStatusNotContact=もう連絡しないこと
 MailingStatusReadAndUnsubscribe=読んで購読を解除する
 ErrorMailRecipientIsEmpty=電子メールの受信者は空 
-WarningNoEMailsAdded=受信者のリストに追加するない新しい電子メール。
+WarningNoEMailsAdded=受信者のリストに追加するない新規電子メール。
 ConfirmValidMailing=このメールを検証してもよいか？
 ConfirmResetMailing=警告、電子メール<b> %s </b>を再初期化することにより、この電子メールを一括メールで再送信できるようになる。これを実行してもよいか？
 ConfirmDeleteMailing=このメールを削除してもよいか？
@@ -83,7 +83,7 @@ NbIgnored=無視された数
 NbSent=送信番号
 SentXXXmessages=%sメッセージ(s)が送信された。
 ConfirmUnvalidateEmailing=メール<b>%s </b>をドラフトステータスに変更してもよいか？
-MailingModuleDescContactsWithThirdpartyFilter=顧客フィルターとの接触
+MailingModuleDescContactsWithThirdpartyFilter=顧客フィルタとの接触
 MailingModuleDescContactsByCompanyCategory=サードパーティカテゴリ別の連絡先
 MailingModuleDescContactsByCategory=カテゴリ別の連絡先
 MailingModuleDescContactsByFunction=位置別の連絡先
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=ユーザが入力したメール
 MailingModuleDescDolibarrUsers=メールを持っているユーザ
 MailingModuleDescThirdPartiesByCategories=サードパーティ（カテゴリ別）
 SendingFromWebInterfaceIsNotAllowed=Webインターフェイスからの送信は許可されていない。
+EmailCollectorFilterDesc=メールを取得するには、すべてのフィルタが適合している必要がある
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=ファイル内の行%s
@@ -129,8 +130,8 @@ NotificationsAuto=通知自動。
 NoNotificationsWillBeSent=このイベントタイプと法人では、自動電子メール通知は計画されていない
 ANotificationsWillBeSent=1つの自動通知が電子メールで送信される
 SomeNotificationsWillBeSent=%s自動通知は電子メールで送信される
-AddNewNotification=新しい自動電子メール通知ターゲット/イベントをアクティブ化する
-ListOfActiveNotifications=自動電子メール通知のすべてのアクティブなターゲット/イベントを一覧表示する
+AddNewNotification=新規自動電子メール通知を購読する（ターゲット/イベント）
+ListOfActiveNotifications=自動電子メール通知のすべてのアクティブなサブスクリプション（ターゲット/イベント）を一覧表示する
 ListOfNotificationsDone=送信されたすべての自動電子メール通知を一覧表示する
 MailSendSetupIs=電子メール送信の構成は「%s」に設定されている。このモードは、大量の電子メールを送信するために使用することはできない。
 MailSendSetupIs2=モード'%s'を使うには、まず、管理者アカウントを使用して、メニュー%sホーム - 設定 - メール %sに移動し、パラメーター<strong>'%s '</strong>を変更する。このモードでは、インターネットサービスプロバイダーが提供するSMTPサーバーの設定に入り、大量電子メールの機能を使用できる。
@@ -141,7 +142,7 @@ UseFormatFileEmailToTarget=インポートされたファイルの形式は<stro
 UseFormatInputEmailToTarget=<strong> email; name; firstname; other</strong>の形式で文字列を入力する
 MailAdvTargetRecipients=受信者（高度な選択）
 AdvTgtTitle=入力フィールドに入力して、ターゲットとするサードパーティまたは連絡先/アドレスを事前に選択する
-AdvTgtSearchTextHelp=ワイルドカードとして%%を使用する。たとえば、<b> jean、joe、jim </b>などのすべてのアイテムを検索するには、<b> j%% </b>と入力し、;を使用することもできる。値の区切り文字として使用し、！を使用する。この値を除いて。たとえば、<b> jean; joe; jim%%;！jimo;！jima%%</b>は、すべてのjean、joe、jimで始まりますが、jimoではなく、jimaで始まるすべてのものではない。
+AdvTgtSearchTextHelp=ワイルドカードとして %% を使用。たとえば、<b>jean, joe, jim</b> のような全アイテムを探すには、 <b>j%%</b> を入力、値の区切り文字として  ;  を使用し、値の除外として ! を使用できる。たとえば  <b>jean;joe;jim%%;!jimo;!jima%%</b> なら、すべての jean, joe と jim で始まる文字列の内で  jimo でないものと jima で始まるものを除外したすべてを意味する。
 AdvTgtSearchIntHelp=間隔を使用してintまたはfloat値を選択する
 AdvTgtMinVal=最小値
 AdvTgtMaxVal=最大値
@@ -156,11 +157,11 @@ RemoveAll=すべて削除する
 ItemsCount=アイテム(s)
 AdvTgtNameTemplate=フィルタ名
 AdvTgtAddContact=基準に従ってメールを追加する
-AdvTgtLoadFilter=ロードフィルター
+AdvTgtLoadFilter=ロードフィルタ
 AdvTgtDeleteFilter=フィルタを削除する
 AdvTgtSaveFilter=フィルタを保存
 AdvTgtCreateFilter=フィルタを作成する
-AdvTgtOrCreateNewFilter=新しいフィルターの名前
+AdvTgtOrCreateNewFilter=新規フィルタの名前
 NoContactWithCategoryFound=カテゴリの連絡先/住所が見つからない
 NoContactLinkedToThirdpartieWithCategoryFound=カテゴリの連絡先/住所が見つからない
 OutGoingEmailSetup=送信メール
@@ -168,7 +169,7 @@ InGoingEmailSetup=受信メール
 OutGoingEmailSetupForEmailing=送信メール（モジュール%sの場合）
 DefaultOutgoingEmailSetup=グローバルな送信メール設定と同じ構成
 Information=情報
-ContactsWithThirdpartyFilter=サードパーティのフィルターを使用した連絡先
+ContactsWithThirdpartyFilter=サードパーティのフィルタを使用した連絡先
 Unanswered=未回答
 Answered=答えた
 IsNotAnAnswer=回答でない（最初のメール）
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index 3612332cbff..88afad57b28 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=このメールタイプには適用可能なテンプレー
 AvailableVariables=適用可能な代替変数s
 NoTranslation=翻訳無し
 Translation=翻訳
+CurrentTimeZone=PHP(サーバー)のタイムゾーン
 EmptySearchString=空文字以外の検索候補を入力
+EnterADateCriteria=日付基準を入力する
 NoRecordFound=発見レコードは無し
 NoRecordDeleted=削除レコードは無し
 NotEnoughDataYet=データが不十分
@@ -85,6 +87,8 @@ FileWasNotUploaded=ファイルが添付ファイルが選択されているが
 NbOfEntries=エントリー番号
 GoToWikiHelpPage=オンラインヘルプを読む（インターネットアクセスが必要）
 GoToHelpPage=ヘルプを見る
+DedicatedPageAvailable=現在の画面に関連する専用のヘルプページがある
+HomePage=ホームページ
 RecordSaved=レコード保存
 RecordDeleted=レコード削除
 RecordGenerated=レコード生成
@@ -218,8 +222,8 @@ Parameter=パラメーター
 Parameters=パラメータ
 Value=値
 PersonalValue=個人的価値
-NewObject=新しい%s
-NewValue=新しい値
+NewObject=新規%s
+NewValue=新規値
 CurrentValue=電流値
 Code=コー​​ド
 Type=タイプ
@@ -258,7 +262,7 @@ Cards=カード
 Card=カード
 Now=現在
 HourStart=開始時間
-Deadline=Deadline
+Deadline=締切
 Date=日付
 DateAndHour=日付と時間
 DateToday=今日の日付
@@ -267,10 +271,10 @@ DateStart=開始日
 DateEnd=終了日
 DateCreation=作成日
 DateCreationShort=クリート。日付
-IPCreation=Creation IP
+IPCreation=作成IP
 DateModification=変更日
 DateModificationShort=MODIF。日付
-IPModification=Modification IP
+IPModification=変更IP
 DateLastModification=最新の変更日
 DateValidation=検証日
 DateClosing=日付を閉じる
@@ -347,7 +351,7 @@ Copy=コピー
 Paste=貼り付ける
 Default=デフォルト
 DefaultValue=デフォルト値
-DefaultValues=デフォルト値/フィルター/ソート
+DefaultValues=デフォルト値/フィルタ/ソート
 Price=価格
 PriceCurrency=価格（通貨）
 UnitPrice=単価
@@ -433,6 +437,7 @@ RemainToPay=支払いを続ける
 Module=モジュール/アプリケーション
 Modules=モジュール/アプリケーション
 Option=オプション
+Filters=フィルタ
 List=リスト
 FullList=全リスト
 FullConversation=完全な会話
@@ -671,7 +676,7 @@ SendMail=メールを送る
 Email=Eメール
 NoEMail=まだメールしない
 AlreadyRead=すでに読んだ
-NotRead=読んでいません
+NotRead=未読
 NoMobilePhone=携帯電話はありません
 Owner=所有者
 FollowingConstantsWillBeSubstituted=以下の定数は、対応する値を持つ代替となります。
@@ -705,7 +710,7 @@ NeverReceived=受信しませんでした
 Canceled=キャンセル
 YouCanChangeValuesForThisListFromDictionarySetup=このリストの値は、メニューの[設定]-[辞書]から変更できます。
 YouCanChangeValuesForThisListFrom=このリストの値は、メニュー%sから変更できます。
-YouCanSetDefaultValueInModuleSetup=モジュール設定で新しいレコードを作成するときに使用されるデフォルト値を設定できます
+YouCanSetDefaultValueInModuleSetup=モジュール設定で新規レコードを作成するときに使用されるデフォルト値を設定できます
 Color=カラー
 Documents=リンクされたファイル
 Documents2=ドキュメント
@@ -736,7 +741,7 @@ RootOfMedias=パブリックメディアのルート（/ medias）
 Informations=情報
 Page=ページ
 Notes=注釈
-AddNewLine=新しい行を追加します。
+AddNewLine=新規行を追加します。
 AddFile=ファイルを追加します。
 FreeZone=フリーテキスト製品
 FreeLineOfType=フリーテキストアイテム、タイプ：
@@ -775,7 +780,7 @@ After=後の
 IPAddress=IPアドレス
 Frequency=周波数
 IM=インスタントメッセージ
-NewAttribute=新しい属性
+NewAttribute=新規属性
 AttributeCode=属性コード
 URLPhoto=写真/ロゴのURL
 SetLinkToAnotherThirdParty=別の第三者へのリンク
@@ -924,7 +929,7 @@ Lead=鉛
 Leads=リード
 ListOpenLeads=オープンリードのリスト
 ListOpenProjects=開いているプロジェクトを一覧表示する
-NewLeadOrProject=新しいリードまたはプロジェクト
+NewLeadOrProject=新規リードまたはプロジェクト
 Rights=パーミッション
 LineNb=行番号
 IncotermLabel=インコタームズ
@@ -1106,4 +1111,9 @@ SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=セキュリティト
 UpToDate=最新の
 OutOfDate=時代遅れ
 EventReminder=イベントリマインダー
-UpdateForAllLines=Update for all lines
+UpdateForAllLines=すべての行を更新
+OnHold=保留
+AffectTag=タグに影響を与える
+ConfirmAffectTag=バルクタグの影響
+ConfirmAffectTagQuestion=選択した%sレコード(s)のタグに影響を与えてもよいか？
+CategTypeNotFound=レコードのタイプのタグタイプが見つからない
diff --git a/htdocs/langs/ja_JP/modulebuilder.lang b/htdocs/langs/ja_JP/modulebuilder.lang
index 00c0d9c6851..91866a353f1 100644
--- a/htdocs/langs/ja_JP/modulebuilder.lang
+++ b/htdocs/langs/ja_JP/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=レコードを作成/編集/表示するためのPHPペ
 PageForAgendaTab=イベントタブのPHPページ
 PageForDocumentTab=ドキュメントタブのPHPページ
 PageForNoteTab=メモタブのPHPページ
+PageForContactTab=連絡先タブのPHPページ
 PathToModulePackage=モジュール/アプリケーションパッケージのzipへのパス
 PathToModuleDocumentation=モジュール/アプリケーションドキュメントのファイルへのパス（%s）
 SpaceOrSpecialCharAreNotAllowed=スペースや特殊文字は使用できない。
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=SQLとPHPの知識がある場合は、ネイティブ
 SeeTopRightMenu=右上のメニューの<span class="fa fa-bug"></span>を参照すること
 AddLanguageFile=言語ファイルを追加する
 YouCanUseTranslationKey=ここでは、言語ファイルにある翻訳キーであるキーを使用できる（「言語」タブを参照）。
-DropTableIfEmpty=（空の場合はテーブルを削除する）
+DropTableIfEmpty=（空の場合はテーブルを破棄する）
 TableDoesNotExists=テーブル%sは存在しない
 TableDropped=テーブル%sが削除された
 InitStructureFromExistingTable=既存のテーブルの構造体配列文字列を作成する
@@ -126,7 +127,6 @@ UseSpecificEditorURL = 特定のエディターURLを使用する
 UseSpecificFamily = 特定の家族を使用する
 UseSpecificAuthor = 特定の作成者を使用する
 UseSpecificVersion = 特定の初期バージョンを使用する
-ModuleMustBeEnabled=モジュール/アプリケーションを最初に有効にする必要がある
 IncludeRefGeneration=オブジェクトの参照は自動的に生成される必要がある
 IncludeRefGenerationHelp=参照の生成を自動的に管理するコードを含める場合は、これをチェックすること
 IncludeDocGeneration=オブジェクトからいくつかのドキュメントを生成したい
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=フィールドの種別:<br>varchar(99), double(24,8), real, t
 AsciiToHtmlConverter=アスキーからHTMLへのコンバーター
 AsciiToPdfConverter=アスキーからPDFへのコンバーター
 TableNotEmptyDropCanceled=テーブルが空ではない。ドロップはキャンセルされた。
+ModuleBuilderNotAllowed=モジュールビルダーは利用できるが、あなたのユーザには許可されていない。
diff --git a/htdocs/langs/ja_JP/mrp.lang b/htdocs/langs/ja_JP/mrp.lang
index d783dd432ac..d85387241a5 100644
--- a/htdocs/langs/ja_JP/mrp.lang
+++ b/htdocs/langs/ja_JP/mrp.lang
@@ -77,4 +77,4 @@ UnitCost=単価
 TotalCost=総費用
 BOMTotalCost=消費する各数量と製品のコストに基づいてこのBOMを生成するためのコスト（定義されている場合は原価、定義されている場合は平均加重価格、それ以外の場合は最良の購入価格を使用）
 GoOnTabProductionToProduceFirst=製造指図を閉じるには、最初に製造を開始しておく必要がある（タブ '%s'を参照）。ただし、キャンセルすることはできる。
-ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=キットをBOMまたはMOに使用することはできない
diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang
index d294c7bb2a7..9042b4b81ef 100644
--- a/htdocs/langs/ja_JP/other.lang
+++ b/htdocs/langs/ja_JP/other.lang
@@ -1,133 +1,133 @@
 # Dolibarr language file - Source file is en_US - other
 SecurityCode=セキュリティコード
-NumberingShort=N°
+NumberingShort=番号
 Tools=ツール
-TMenuTools=Tools
-ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
+TMenuTools=ツールs
+ToolsDesc=他のメニューエントリに含まれていないすべてのツールがここにグループ化される。 <br>すべてのツールは左側のメニューからアクセスできる。
 Birthday=誕生日
 BirthdayAlertOn=誕生日アラートアクティブ
 BirthdayAlertOff=非アクティブな誕生日アラート
-TransKey=Translation of the key TransKey
-MonthOfInvoice=Month (number 1-12) of invoice date
-TextMonthOfInvoice=Month (text) of invoice date
-PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
-TextPreviousMonthOfInvoice=Previous month (text) of invoice date
-NextMonthOfInvoice=Following month (number 1-12) of invoice date
-TextNextMonthOfInvoice=Following month (text) of invoice date
-PreviousMonth=Previous month
-CurrentMonth=Current month
-ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
-DocFileGeneratedInto=Doc file generated into <b>%s</b>.
-JumpToLogin=Disconnected. Go to login page...
-MessageForm=Message on online payment form
-MessageOK=Message on the return page for a validated payment
-MessageKO=Message on the return page for a canceled payment
-ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
-DeleteAlsoContentRecursively=Check to delete all content recursively
-PoweredBy=Powered by
-YearOfInvoice=Year of invoice date
-PreviousYearOfInvoice=Previous year of invoice date
-NextYearOfInvoice=Following year of invoice date
-DateNextInvoiceBeforeGen=Date of next invoice (before generation)
-DateNextInvoiceAfterGen=Date of next invoice (after generation)
-GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mode. The mode 'Lines' was automatically selected instead.
-OnlyOneFieldForXAxisIsPossible=Only 1 field is currently possible as X-Axis. Only the first selected field has been selected.
-AtLeastOneMeasureIsRequired=At least 1 field for measure is required
-AtLeastOneXAxisIsRequired=At least 1 field for X-Axis is required
-LatestBlogPosts=Latest Blog Posts
-Notify_ORDER_VALIDATE=Sales order validated
-Notify_ORDER_SENTBYMAIL=Sales order sent by mail
-Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
-Notify_ORDER_SUPPLIER_VALIDATE=Purchase order recorded
-Notify_ORDER_SUPPLIER_APPROVE=Purchase order approved
-Notify_ORDER_SUPPLIER_REFUSE=Purchase order refused
+TransKey=キーTransKeyの翻訳
+MonthOfInvoice=請求日の月（数字 1-12）
+TextMonthOfInvoice=請求日の月（文字列）
+PreviousMonthOfInvoice=請求日の前月（数字 1-12）
+TextPreviousMonthOfInvoice=請求日の前月（文字列）
+NextMonthOfInvoice=請求日の翌月（数字 1-12）
+TextNextMonthOfInvoice=請求日の翌月（文字列）
+PreviousMonth=前月
+CurrentMonth=今月
+ZipFileGeneratedInto=<b> %s</b>に生成されたZipファイル。
+DocFileGeneratedInto=<b> %s</b>に生成されたドキュメントファイル。
+JumpToLogin=切断された。ログインページに移動...
+MessageForm=オンライン支払いフォームのメッセージ
+MessageOK=確認済みの支払いの返品ページのメッセージ
+MessageKO=キャンセルされた支払いの返品ページのメッセージ
+ContentOfDirectoryIsNotEmpty=このディレクトリの内容は空ではない。
+DeleteAlsoContentRecursively=チェックすると、すべてのコンテンツが再帰的に削除される
+PoweredBy=搭載
+YearOfInvoice=請求日の年
+PreviousYearOfInvoice=請求日の前年
+NextYearOfInvoice=請求日の翌年
+DateNextInvoiceBeforeGen=次の請求書の日付（生成前）
+DateNextInvoiceAfterGen=次の請求書の日付（生成後）
+GraphInBarsAreLimitedToNMeasures=Grapicsは、「バー」モードの%sメジャーに制限されています。代わりに、モード「ライン」が自動的に選択された。
+OnlyOneFieldForXAxisIsPossible=現在、X軸として使用できるフィールドは1つだけ 。最初に選択されたフィールドのみが選択されています。
+AtLeastOneMeasureIsRequired=測定には少なくとも1つのフィールドが必要 
+AtLeastOneXAxisIsRequired=X軸には少なくとも1つのフィールドが必要 
+LatestBlogPosts=最新のブログ投稿
+Notify_ORDER_VALIDATE=検証済みの販売注文
+Notify_ORDER_SENTBYMAIL=メールで送信された販売注文
+Notify_ORDER_SUPPLIER_SENTBYMAIL=電子メールで送信された注文書
+Notify_ORDER_SUPPLIER_VALIDATE=記録された発注書
+Notify_ORDER_SUPPLIER_APPROVE=注文書が承認された
+Notify_ORDER_SUPPLIER_REFUSE=注文書が拒否された
 Notify_PROPAL_VALIDATE=検証済みの顧客の提案
-Notify_PROPAL_CLOSE_SIGNED=Customer proposal closed signed
-Notify_PROPAL_CLOSE_REFUSED=Customer proposal closed refused
+Notify_PROPAL_CLOSE_SIGNED=顧客提案は署名された
+Notify_PROPAL_CLOSE_REFUSED=顧客の提案は拒否された
 Notify_PROPAL_SENTBYMAIL=電子メールによって送信された商業提案
 Notify_WITHDRAW_TRANSMIT=伝送撤退
 Notify_WITHDRAW_CREDIT=クレジット撤退
-Notify_WITHDRAW_EMIT=撤退を実行します。
+Notify_WITHDRAW_EMIT=撤退を実行する。
 Notify_COMPANY_CREATE=第三者が作成した
-Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
+Notify_COMPANY_SENTBYMAIL=サードパーティのカードから送信されたメール
 Notify_BILL_VALIDATE=顧客への請求書が検証さ
-Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_BILL_UNVALIDATE=顧客の請求書は未検証
 Notify_BILL_PAYED=顧客の請求書は支払済
 Notify_BILL_CANCEL=顧客への請求書が取り消さ
 Notify_BILL_SENTBYMAIL=メールで送信された顧客への請求書
-Notify_BILL_SUPPLIER_VALIDATE=Vendor invoice validated
-Notify_BILL_SUPPLIER_PAYED=Vendor invoice paid
-Notify_BILL_SUPPLIER_SENTBYMAIL=Vendor invoice sent by mail
-Notify_BILL_SUPPLIER_CANCELED=Vendor invoice cancelled
+Notify_BILL_SUPPLIER_VALIDATE=ベンダーの請求書が検証された
+Notify_BILL_SUPPLIER_PAYED=支払われたベンダーの請求書
+Notify_BILL_SUPPLIER_SENTBYMAIL=メールで送信されるベンダーの請求書
+Notify_BILL_SUPPLIER_CANCELED=ベンダーの請求書がキャンセルされた
 Notify_CONTRACT_VALIDATE=検証済みの契約
 Notify_FICHINTER_VALIDATE=介入検証
-Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
-Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
+Notify_FICHINTER_ADD_CONTACT=介入への連絡先を追加
+Notify_FICHINTER_SENTBYMAIL=郵送による介入
 Notify_SHIPPING_VALIDATE=送料は、検証
 Notify_SHIPPING_SENTBYMAIL=電子メールによって送信された商品
 Notify_MEMBER_VALIDATE=メンバー検証
-Notify_MEMBER_MODIFY=Member modified
+Notify_MEMBER_MODIFY=メンバーが変更された
 Notify_MEMBER_SUBSCRIPTION=メンバー購読
-Notify_MEMBER_RESILIATE=Member terminated
+Notify_MEMBER_RESILIATE=メンバーが終了した
 Notify_MEMBER_DELETE=メンバーが削除さ
-Notify_PROJECT_CREATE=Project creation
-Notify_TASK_CREATE=Task created
-Notify_TASK_MODIFY=Task modified
-Notify_TASK_DELETE=Task deleted
-Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
-Notify_EXPENSE_REPORT_APPROVE=Expense report approved
-Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
-Notify_HOLIDAY_APPROVE=Leave request approved
+Notify_PROJECT_CREATE=プロジェクトの作成
+Notify_TASK_CREATE=作成されたタスク
+Notify_TASK_MODIFY=タスクが変更された
+Notify_TASK_DELETE=タスクが削除された
+Notify_EXPENSE_REPORT_VALIDATE=経費報告書が検証された（承認が必要 ）
+Notify_EXPENSE_REPORT_APPROVE=経費報告書が承認された
+Notify_HOLIDAY_VALIDATE=リクエストを検証したままにする（承認が必要 ）
+Notify_HOLIDAY_APPROVE=リクエストを承認したままにする
 SeeModuleSetup=モジュール%sのセットアップを参照すること
 NbOfAttachedFiles=添付ファイル/文書の数
 TotalSizeOfAttachedFiles=添付ファイル/文書の合計サイズ
 MaxSize=最大サイズ
-AttachANewFile=新しいファイル/文書を添付する
+AttachANewFile=新規ファイル/文書を添付する
 LinkedObject=リンクされたオブジェクト
-NbOfActiveNotifications=Number of notifications (no. of recipient emails)
-PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe lines are separated by a carriage return.\n\n__USER_SIGNATURE__
-PredefinedMailTestHtml=__(Hello)__<br>This is a <b>test</b> mail sent to __EMAIL__ (the word test must be in bold).<br>The lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached \n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to remind you that the invoice  __REF__ seems to have not been paid. A copy of the invoice is attached as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find commercial proposal __REF__ attached \n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nPlease find price request __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendOrder=__(Hello)__\n\nPlease find order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
-PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
-ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
-ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
+NbOfActiveNotifications=通知の数（受信者の電子メールの数）
+PredefinedMailTest=__（こんにちは）__\nこれは__EMAIL__に送信されるテストメール 。\n行はキャリッジリターンで区切られる。\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__（Hello）__ <br>これは__EMAIL__に送信される<b>テスト</b>メール （テストという単語は太字にする必要がある）。 <br>行はキャリッジリターンで区切られる。 <br> <br> __USER_SIGNATURE__
+PredefinedMailContentContract=__（こんにちは）__\n\n\n__（誠意をこめて）__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__（こんにちは）__\n\n添付の請求書__REF__をご覧ください\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__（誠意をこめて）__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__（こんにちは）__\n\n請求書__REF__が支払われていないよう 。請求書のコピーがリマインダーとして添付されています。\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__（誠意をこめて）__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__（こんにちは）__\n\n添付の売買契約提案書__REF__を見つけること\n\n\n__（誠意をこめて）__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__（こんにちは）__\n\n添付の価格リクエストを見つけること__REF__\n\n\n__（誠意をこめて）__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendOrder=__（こんにちは）__\n\n添付の注文__REF__を見つけること\n\n\n__（誠意をこめて）__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__（こんにちは）__\n\n添付の注文__REF__をご覧ください\n\n\n__（誠意をこめて）__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__（こんにちは）__\n\n添付の請求書__REF__をご覧ください\n\n\n__（誠意をこめて）__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendShipping=__（こんにちは）__\n\n添付の送料__REF__をご覧ください\n\n\n__（誠意をこめて）__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendFichInter=__（こんにちは）__\n\n添付の介入__REF__を見つけること\n\n\n__（誠意をこめて）__\n\n__USER_SIGNATURE__
+PredefinedMailContentLink=まだ行っていない場合は、下のリンクをクリックして支払いを行うことができる。\n\n%s\n\n
+PredefinedMailContentGeneric=__（こんにちは）__\n\n\n__（誠意をこめて）__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=__EVENT_DATE__の__EVENT_TIME__のイベントリマインダー「__EVENT_LABEL __」<br><br>これは自動メッセージ 。返信しないこと。
+DemoDesc=Dolibarrは、いくつかのビジネスモジュールをサポートするコンパクトなERP / CRM 。このシナリオは決して発生しないため、すべてのモジュールを紹介するデモは意味がない（数百が利用可能）。したがって、いくつかのデモプロファイルが利用可能 。
+ChooseYourDemoProfil=ニーズに最適なデモプロファイルを選択すること...
+ChooseYourDemoProfilMore=...または独自のプロファイルを作成する<br>（手動モジュール選択）
 DemoFundation=基礎のメンバーを管理する
 DemoFundation2=基礎のメンバーとの銀行口座を管理する
-DemoCompanyServiceOnly=Company or freelance selling service only
+DemoCompanyServiceOnly=法人またはフリーランスの販売サービスのみ
 DemoCompanyShopWithCashDesk=現金デスクでお店を管理する
-DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
-DemoCompanyManufacturing=Company manufacturing products
-DemoCompanyAll=Company with multiple activities (all main modules)
+DemoCompanyProductAndStocks=POSで製品を販売するショップ
+DemoCompanyManufacturing=製品を製造する法人
+DemoCompanyAll=複数の活動を行う法人（すべてのメインモジュール）
 CreatedBy=%sによって作成された
 ModifiedBy=%sによって変更された
 ValidatedBy=%sによって検証
 ClosedBy=%sによって閉じ
-CreatedById=User id who created
-ModifiedById=User id who made latest change
-ValidatedById=User id who validated
-CanceledById=User id who canceled
-ClosedById=User id who closed
-CreatedByLogin=User login who created
-ModifiedByLogin=User login who made latest change
-ValidatedByLogin=User login who validated
-CanceledByLogin=User login who canceled
-ClosedByLogin=User login who closed
-FileWasRemoved=ファイルの%sは削除されました
-DirWasRemoved=ディレクトリの%sは削除されました
-FeatureNotYetAvailable=Feature not yet available in the current version
-FeaturesSupported=Supported features
+CreatedById=作成したユーザーID
+ModifiedById=最新の変更を行ったユーザーID
+ValidatedById=検証したユーザーID
+CanceledById=キャンセルしたユーザーID
+ClosedById=閉じたユーザーID
+CreatedByLogin=作成したユーザーログイン
+ModifiedByLogin=最新の変更を加えたユーザーログイン
+ValidatedByLogin=検証したユーザーログイン
+CanceledByLogin=キャンセルしたユーザーログイン
+ClosedByLogin=閉じたユーザーログイン
+FileWasRemoved=ファイルの%sは削除された
+DirWasRemoved=ディレクトリの%sは削除された
+FeatureNotYetAvailable=現在のバージョンではまだ利用できない機能
+FeaturesSupported=サポートされている機能
 Width=幅
 Height=高さ
 Depth=深さ
@@ -138,17 +138,17 @@ Right=右
 CalculatedWeight=計算された重み
 CalculatedVolume=計算されたボリューム
 Weight=重さ
-WeightUnitton=tonne
-WeightUnitkg=キロ
-WeightUnitg=グラム
-WeightUnitmg=ミリグラム
+WeightUnitton=トン
+WeightUnitkg=kg
+WeightUnitg=g
+WeightUnitmg=mg
 WeightUnitpound=ポンド
 WeightUnitounce=オンス
 Length=長さ
-LengthUnitm=メートル
-LengthUnitdm=DM
-LengthUnitcm=センチメートル
-LengthUnitmm=ミリメートル
+LengthUnitm=m
+LengthUnitdm=dm
+LengthUnitcm=cm
+LengthUnitmm=mm
 Surface=エリア
 SurfaceUnitm2=m²
 SurfaceUnitdm2=dm²
@@ -166,122 +166,123 @@ VolumeUnitinch3=in³
 VolumeUnitounce=オンス
 VolumeUnitlitre=リットル
 VolumeUnitgallon=ガロン
-SizeUnitm=メートル
-SizeUnitdm=DM
-SizeUnitcm=センチメートル
-SizeUnitmm=ミリメートル
-SizeUnitinch=インチの
-SizeUnitfoot=足
-SizeUnitpoint=point
+SizeUnitm=m
+SizeUnitdm=dm
+SizeUnitcm=cm
+SizeUnitmm=mm
+SizeUnitinch=インチ
+SizeUnitfoot=フィート
+SizeUnitpoint=ポイント
 BugTracker=バグトラッカー
-SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br>Check your inbox.
+SendNewPasswordDesc=このフォームでは、新規パスワードをリクエストできる。それはあなたのメールアドレスに送られる。 <br>メール内の確認リンクをクリックすると、変更が有効になる。 <br>受信トレイを確認すること。
 BackToLoginPage=ログインページに戻る
-AuthenticationDoesNotAllowSendNewPassword=認証モードは<b>%s</b>です。 <br>このモードでは、Dolibarrは知ってもパスワードを変更することはできません。 <br>あなたのパスワードを変更する場合は、システム管理者に問い合わせてください。
-EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
-ProfIdShortDesc=<b>教授イド%sは、</b>サードパーティの国に応じて情報です。 <br>たとえば、国<b>%s</b>のために、それはコード<b>%s</b>です。
+AuthenticationDoesNotAllowSendNewPassword=認証モードは<b>%s</b> 。 <br>このモードでは、Dolibarrは知ってもパスワードを変更することはできません。 <br>あなたのパスワードを変更する場合は、システム管理者に問い合わせてください。
+EnableGDLibraryDesc=このオプションを使用するには、PHPインストールでGDライブラリをインストールまたは有効にする。
+ProfIdShortDesc=<b>教授イド%sは、</b>サードパーティの国に応じて情報 。 <br>たとえば、国<b>%s</b>のために、それはコード<b>%s</b> 。
 DolibarrDemo=Dolibarr ERP / CRMデモ
-StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
-NumberOfProposals=Number of proposals
-NumberOfCustomerOrders=Number of sales orders
-NumberOfCustomerInvoices=Number of customer invoices
-NumberOfSupplierProposals=Number of vendor proposals
-NumberOfSupplierOrders=Number of purchase orders
-NumberOfSupplierInvoices=Number of vendor invoices
-NumberOfContracts=Number of contracts
-NumberOfMos=Number of manufacturing orders
-NumberOfUnitsProposals=Number of units on proposals
-NumberOfUnitsCustomerOrders=Number of units on sales orders
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices
-NumberOfUnitsSupplierProposals=Number of units on vendor proposals
-NumberOfUnitsSupplierOrders=Number of units on purchase orders
-NumberOfUnitsSupplierInvoices=Number of units on vendor invoices
-NumberOfUnitsContracts=Number of units on contracts
-NumberOfUnitsMos=Number of units to produce in manufacturing orders
-EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
+StatsByNumberOfUnits=製品/サービスの数量の合計の統計
+StatsByNumberOfEntities=参照エンティティの数の統計（請求書の数、または注文...）
+NumberOfProposals=提案数
+NumberOfCustomerOrders=受注数
+NumberOfCustomerInvoices=顧客の請求書の数
+NumberOfSupplierProposals=ベンダー提案の数
+NumberOfSupplierOrders=注文書の数
+NumberOfSupplierInvoices=ベンダーの請求書の数
+NumberOfContracts=契約数
+NumberOfMos=製造受注数
+NumberOfUnitsProposals=提案のユニット数
+NumberOfUnitsCustomerOrders=販売注文のユニット数
+NumberOfUnitsCustomerInvoices=顧客の請求書のユニット数
+NumberOfUnitsSupplierProposals=ベンダー提案のユニット数
+NumberOfUnitsSupplierOrders=注文書のユニット数
+NumberOfUnitsSupplierInvoices=ベンダーの請求書のユニット数
+NumberOfUnitsContracts=契約ユニット数
+NumberOfUnitsMos=製造指図で生産するユニットの数
+EMailTextInterventionAddedContact=新規介入%sが割り当てられた。
 EMailTextInterventionValidated=介入%sが検証されています。
-EMailTextInvoiceValidated=Invoice %s has been validated.
-EMailTextInvoicePayed=Invoice %s has been paid.
-EMailTextProposalValidated=Proposal %s has been validated.
-EMailTextProposalClosedSigned=Proposal %s has been closed signed.
-EMailTextOrderValidated=Order %s has been validated.
-EMailTextOrderApproved=Order %s has been approved.
-EMailTextOrderValidatedBy=Order %s has been recorded by %s.
-EMailTextOrderApprovedBy=Order %s has been approved by %s.
-EMailTextOrderRefused=Order %s has been refused.
-EMailTextOrderRefusedBy=Order %s has been refused by %s.
-EMailTextExpeditionValidated=Shipping %s has been validated.
-EMailTextExpenseReportValidated=Expense report %s has been validated.
-EMailTextExpenseReportApproved=Expense report %s has been approved.
-EMailTextHolidayValidated=Leave request %s has been validated.
-EMailTextHolidayApproved=Leave request %s has been approved.
+EMailTextInvoiceValidated=請求書%sが検証された。
+EMailTextInvoicePayed=請求書%sが支払われた。
+EMailTextProposalValidated=提案%sが検証された。
+EMailTextProposalClosedSigned=提案%sはクローズドサインされた。
+EMailTextOrderValidated=注文%sが検証された。
+EMailTextOrderApproved=注文%sが承認された。
+EMailTextOrderValidatedBy=注文%sは%sによって記録された。
+EMailTextOrderApprovedBy=注文%sは%sによって承認された。
+EMailTextOrderRefused=注文%sは拒否された。
+EMailTextOrderRefusedBy=注文%sは%sによって拒否された。
+EMailTextExpeditionValidated=出荷%sが検証された。
+EMailTextExpenseReportValidated=経費報告書%sが検証された。
+EMailTextExpenseReportApproved=経費報告書%sが承認された。
+EMailTextHolidayValidated=休暇申請%sが検証された。
+EMailTextHolidayApproved=休暇申請%sが承認された。
 ImportedWithSet=輸入データセット
 DolibarrNotification=自動通知
-ResizeDesc=新しい幅<b>または</b>新しい高さを入力します。比率は、サイズ変更時に保持されます...
-NewLength=新しい幅
-NewHeight=新しい高さ
-NewSizeAfterCropping=トリミング後の新しいサイズ
-DefineNewAreaToPick=（あなたが反対側の角に達するまで、イメージ上で左クリックをドラッグ）選択するには、画像を新たな領域を定義します。
-CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is the information on the current edited image
+ResizeDesc=新規幅<b>または</b>新規高さを入力する。比率は、サイズ変更時に保持される...
+NewLength=新規幅
+NewHeight=新規高さ
+NewSizeAfterCropping=トリミング後の新規サイズ
+DefineNewAreaToPick=（あなたが反対側の角に達するまで、イメージ上で左クリックをドラッグ）選択するには、画像を新たな領域を定義する。
+CurrentInformationOnImage=このツールは、画像のサイズ変更やトリミングに役立つように設計されています。これは現在編集されている画像に関する情報 
 ImageEditor=イメージエディタ
-YouReceiveMailBecauseOfNotification=あなたのメールアドレスは%sの%sソフトウェアに特定のイベントを通知されるターゲットのリストに追加されているため、このメッセージが表示されます。
-YouReceiveMailBecauseOfNotification2=このイベントは次のとおりです。
-ThisIsListOfModules=これは、このデモ·プロファイル（唯一の最も一般的なモジュールは、このデモに表示されます）によって事前に選択したモジュールのリストです。よりパーソナライズされたデモを持って、これを編集し、 &quot;スタート&quot;をクリックしてください。
+YouReceiveMailBecauseOfNotification=あなたのメールアドレスは%sの%sソフトウェアに特定のイベントを通知されるターゲットのリストに追加されているため、このメッセージが表示される。
+YouReceiveMailBecauseOfNotification2=このイベントは次のとおり 。
+ThisIsListOfModules=これは、このデモ·プロファイル（唯一の最も一般的なモジュールは、このデモに表示される）によって事前に選択したモジュールのリスト 。よりパーソナライズされたデモを持って、これを編集し、 &quot;スタート&quot;をクリックすること。
 UseAdvancedPerms=いくつかのモジュールの高度な権限を使用する
 FileFormat=ファイル形式
-SelectAColor=色を選択してください
+SelectAColor=色を選択すること
 AddFiles=ファイルを追加
 StartUpload=アップロード開始
 CancelUpload=アップロードをキャンセル
 FileIsTooBig=ファイルが大きすぎる
 PleaseBePatient=しばらくお待ちください...
-NewPassword=New password
-ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your password has been received.
-NewKeyIs=This is your new keys to login
-NewKeyWillBe=Your new key to login to software will be
-ClickHereToGoTo=Click here to go to %s
-YouMustClickToChange=You must however first click on the following link to validate this password change
-ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
-IfAmountHigherThan=If amount higher than <strong>%s</strong>
-SourcesRepository=Repository for sources
-Chart=Chart
-PassEncoding=Password encoding
-PermissionsAdd=Permissions added
-PermissionsDelete=Permissions removed
-YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
-YourPasswordHasBeenReset=Your password has been reset successfully
-ApplicantIpAddress=IP address of applicant
-SMSSentTo=SMS sent to %s
-MissingIds=Missing ids
-ThirdPartyCreatedByEmailCollector=Third party created by email collector from email MSGID %s
-ContactCreatedByEmailCollector=Contact/address created by email collector from email MSGID %s
-ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
-TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
-OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+NewPassword=新規パスワード
+ResetPassword=パスワードを再設定する
+RequestToResetPasswordReceived=パスワードの変更リクエストを受け取りた。
+NewKeyIs=これはログインするための新規キー 
+NewKeyWillBe=ソフトウェアにログインするための新規キーは次のようになる
+ClickHereToGoTo=%sに移動するには、ここをクリックすること
+YouMustClickToChange=ただし、このパスワードの変更を検証するには、最初に次のリンクをクリックする必要がある
+ForgetIfNothing=この変更をリクエストしなかった場合は、このメールを忘れてください。あなたの資格情報は安全に保たれる。
+IfAmountHigherThan=<strong> %s</strong>よりも多い場合
+SourcesRepository=ソースのリポジトリ
+Chart=チャート
+PassEncoding=パスワードエンコーディング
+PermissionsAdd=追加された権限
+PermissionsDelete=権限が削除された
+YourPasswordMustHaveAtLeastXChars=パスワードには、少なくとも<strong> %s</strong>文字が必要 。
+YourPasswordHasBeenReset=パスワードは正常にリセットされた
+ApplicantIpAddress=申請者のIPアドレス
+SMSSentTo=SMSが%sに送信された
+MissingIds=IDがない
+ThirdPartyCreatedByEmailCollector=電子メールMSGID%sから電子メールコレクターによって作成されたサードパーティ
+ContactCreatedByEmailCollector=メールMSGID%sからメールコレクターによって作成された連絡先/アドレス
+ProjectCreatedByEmailCollector=メールMSGID%sからメールコレクターによって作成されたプロジェクト
+TicketCreatedByEmailCollector=メールMSGID%sからメールコレクターによって作成されたチケット
+OpeningHoursFormatDesc=-を使用して、営業時間と営業時間を区切る。 <br>スペースを使用してさまざまな範囲を入力する。 <br>例：8-12 14-18
+PrefixSession=セッションIDのプレフィックス
 
 ##### Export #####
 ExportsArea=輸出地域
 AvailableFormats=利用可能なフォーマット
 LibraryUsed=ライブラリを使用
-LibraryVersion=Library version
+LibraryVersion=ライブラリバージョン
 ExportableDatas=エクスポート可能なデータ
-NoExportableData=いいえ、エクスポートデータがありません（ロード、エクスポートデータ、または欠落権限を持つモジュールなし）
+NoExportableData=いいえ、エクスポートデータがない（ロード、エクスポートデータ、または欠落権限を持つモジュールなし）
 ##### External sites #####
-WebsiteSetup=Setup of module website
-WEBSITE_PAGEURL=URL of page
+WebsiteSetup=モジュールのウェブサイトのセットアップ
+WEBSITE_PAGEURL=ページのURL
 WEBSITE_TITLE=タイトル
 WEBSITE_DESCRIPTION=説明
-WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITE_KEY__ in the path if path depends on website name (for example: image/__WEBSITE_KEY__/stories/myimage.png).
-WEBSITE_KEYWORDS=Keywords
-LinesToImport=Lines to import
+WEBSITE_IMAGE=画像
+WEBSITE_IMAGEDesc=画像メディアの相対パス。これはめったに使用されないため、これを空のままにしておくことができる（動的コンテンツで使用して、ブログ投稿のリストにサムネイルを表示できる）。パスがWebサイト名に依存する場合は、パスに__WEBSITE_KEY__を使用する（例：image / __ WEBSITE_KEY __ / stories / myimage.png）。
+WEBSITE_KEYWORDS=キーワード
+LinesToImport=インポートする行
 
-MemoryUsage=Memory usage
-RequestDuration=Duration of request
-ProductsPerPopularity=Products/Services by popularity
-PopuProp=Products/Services by popularity in Proposals
-PopuCom=Products/Services by popularity in Orders
-ProductStatistics=Products/Services Statistics
-NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+MemoryUsage=メモリ使用量
+RequestDuration=リクエストの期間
+ProductsPerPopularity=人気別の製品/サービス
+PopuProp=提案の人気による製品/サービス
+PopuCom=注文の人気別の製品/サービス
+ProductStatistics=製品/サービス統計
+NbOfQtyInOrders=注文数量
+SelectTheTypeOfObjectToAnalyze=分析するオブジェクトのタイプを選択する...
diff --git a/htdocs/langs/ja_JP/paybox.lang b/htdocs/langs/ja_JP/paybox.lang
index d11d36a329f..d5c4d747cdc 100644
--- a/htdocs/langs/ja_JP/paybox.lang
+++ b/htdocs/langs/ja_JP/paybox.lang
@@ -1,31 +1,30 @@
 # Dolibarr language file - Source file is en_US - paybox
-PayBoxSetup=PayBoxモジュールのセットアップ
+PayBoxSetup=PayBoxモジュールの設定
 PayBoxDesc=このモジュールは、上の支払いを可能にするためにページを提供して<a href="http://www.paybox.com" target="_blank">切符売り場</a>の顧客によって。これはフリーの支払いのためにまたは特定のDolibarrオブジェクトの支払いに用いることができる（請求書、発注、...）
-FollowingUrlAreAvailableToMakePayments=以下のURLはDolibarrオブジェクト上で支払いをするために顧客にページを提供するために利用可能です
+FollowingUrlAreAvailableToMakePayments=以下のURLはDolibarrオブジェクト上で支払いをするために顧客にページを提供するために利用可能 
 PaymentForm=支払い形態
-WelcomeOnPaymentPage=Welcome to our online payment service
+WelcomeOnPaymentPage=オンライン決済サービスへようこそ
 ThisScreenAllowsYouToPay=この画面では、%sにオンライン決済を行うことができます。
-ThisIsInformationOnPayment=これは、実行する支払いに関する情報です。
+ThisIsInformationOnPayment=これは、実行する支払いに関する情報。
 ToComplete=完了する
 YourEMail=入金確認を受信する電子メール
 Creditor=債権者
 PaymentCode=支払いコード
-PayBoxDoPayment=Pay with Paybox
-YouWillBeRedirectedOnPayBox=あなたが入力するクレジットカード情報をセキュリティで保護された切符売り場のページにリダイレクトされます。
+PayBoxDoPayment=Payboxで支払う
+YouWillBeRedirectedOnPayBox=あなたが入力するクレジットカード情報をセキュリティで保護された切符売り場のページにリダイレクトされる。
 Continue=次の
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Payboxによる検証時に支払いが自動的に作成されるように、URL <b> %s</b>を使用してPayboxを設定します。
 YourPaymentHasBeenRecorded=このページでは、あなたの支払が記録されていることを確認します。ありがとうございます。
-YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
+YourPaymentHasNotBeenRecorded=お支払いは記録されておらず、取引はキャンセルされています。ありがとうございます。
 AccountParameter=アカウントのパラメータ
 UsageParameter=使用パラメータ
 InformationToFindParameters=あなたの%sアカウント情報を見つけるのを助ける
 PAYBOX_CGI_URL_V2=支払いのために切符売り場CGIモジュールのurl
-VendorName=ベンダーの名前
 CSSUrlForPaymentForm=支払いフォームのCSSスタイルシートのURL
-NewPayboxPaymentReceived=新しいPaybox支払を受け取りました
-NewPayboxPaymentFailed=新しいPaybox支払を試みましたが失敗しました
-PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
+NewPayboxPaymentReceived=新規Paybox支払を受け取った
+NewPayboxPaymentFailed=新規Paybox支払を試みましたが失敗した
+PAYBOX_PAYONLINE_SENDEMAIL=支払い試行後の電子メール通知（成功または失敗）
 PAYBOX_PBX_SITE=PBX SITEの値
 PAYBOX_PBX_RANG=PBX Rangの値
 PAYBOX_PBX_IDENTIFIANT=PBX IDの値
-PAYBOX_HMAC_KEY=HMAC key
+PAYBOX_HMAC_KEY=HMACキー
diff --git a/htdocs/langs/ja_JP/paypal.lang b/htdocs/langs/ja_JP/paypal.lang
index e3b365f3c2d..2327913ff6f 100644
--- a/htdocs/langs/ja_JP/paypal.lang
+++ b/htdocs/langs/ja_JP/paypal.lang
@@ -1,36 +1,36 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=ペイパルモジュールのセットアップ
-PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
-PaypalDoPayment=Pay with PayPal
+PaypalDesc=このモジュールでは、<a href="http://www.paypal.com" target="_blank"> PayPal</a>を介した顧客による支払いが可能です。これは、アドホック支払いまたはDolibarrオブジェクト（請求書、注文など）に関連する支払いに使用できる。
+PaypalOrCBDoPayment=PayPalで支払う（カードまたはPayPal）
+PaypalDoPayment=PayPalで支払う
 PAYPAL_API_SANDBOX=モード試験/サンドボックス
 PAYPAL_API_USER=API名
 PAYPAL_API_PASSWORD=APIパスワード
 PAYPAL_API_SIGNATURE=APIの署名
-PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
-PaypalModeIntegral=Integral
-PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
+PAYPAL_SSLVERSION=カールSSLバージョン
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=「統合」支払い（クレジットカード+ PayPal）または「PayPal」のみを提供
+PaypalModeIntegral=統合
+PaypalModeOnlyPaypal=PayPalのみ
+ONLINE_PAYMENT_CSS_URL=オンライン支払いページのCSSスタイルシートのオプションのURL
 ThisIsTransactionId=<b>%s：</b>これは、トランザクションのIDです。
-PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
-NewOnlinePaymentReceived=New online payment received
-NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
-ReturnURLAfterPayment=Return URL after payment
-ValidationOfOnlinePaymentFailed=Validation of online payment failed
-PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
-SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
-DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
-DetailedErrorMessage=Detailed Error Message
-ShortErrorMessage=Short Error Message
-ErrorCode=Error Code
-ErrorSeverityCode=Error Severity Code
-OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import PayPal payments
-PostActionAfterPayment=Post actions after payments
-ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
-ValidationOfPaymentFailed=Validation of payment has failed
-CardOwner=Card holder
-PayPalBalance=Paypal credit
+PAYPAL_ADD_PAYMENT_URL=メールでドキュメントを送信するときは、PayPalの支払いURLを含めること
+NewOnlinePaymentReceived=受け取った新規オンライン支払い
+NewOnlinePaymentFailed=新規オンライン支払いが試行されたが失敗した
+ONLINE_PAYMENT_SENDEMAIL=各支払い試行後の通知の電子メールアドレス（成功および失敗の場合）
+ReturnURLAfterPayment=支払い後にURLを返す
+ValidationOfOnlinePaymentFailed=オンライン支払いの検証に失敗した
+PaymentSystemConfirmPaymentPageWasCalledButFailed=支払いシステムによって支払い確認ページが呼び出され、エラーが返された
+SetExpressCheckoutAPICallFailed=SetExpressCheckoutAPI呼び出しが失敗した。
+DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPaymentAPI呼び出しが失敗した。
+DetailedErrorMessage=詳細なエラーメッセージ
+ShortErrorMessage=短いエラーメッセージ
+ErrorCode=エラーコード
+ErrorSeverityCode=エラー重大度コード
+OnlinePaymentSystem=オンライン決済システム
+PaypalLiveEnabled=PayPalの「ライブ」モードが有効になっています（それ以外の場合はテスト/サンドボックスモード）
+PaypalImportPayment=PayPal支払いをインポートする
+PostActionAfterPayment=支払い後にアクションを投稿する
+ARollbackWasPerformedOnPostActions=すべてのPostアクションでロールバックが実行された。必要に応じて、投稿アクションを手動で完了する必要があります。
+ValidationOfPaymentFailed=支払いの検証に失敗した
+CardOwner=カードホルダー
+PayPalBalance=ペイパルクレジット
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index eb217d12ba6..8d0828a4136 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -107,8 +107,9 @@ ServiceLimitedDuration=製品は、限られた期間を持つサービスの場
 FillWithLastServiceDates=最後のサービスラインの日付を入力
 MultiPricesAbility=製品/サービスごとに複数の価格セグメント(各顧客は1つの価格セグメントに含まれる)
 MultiPricesNumPrices=価格数
-DefaultPriceType=新しい販売価格を追加するときのデフォルトあたりの価格のベース(税込みと税抜き)
-AssociatedProductsAbility=キット(仮想製品)をアクティブ化
+DefaultPriceType=新規販売価格を追加するときのデフォルトあたりの価格のベース(税込みと税抜き)
+AssociatedProductsAbility=キットを有効にする（他製品のセット）
+VariantsAbility=バリエーションを有効にする（色、サイズなどの製品バリエーション）
 AssociatedProducts=キット
 AssociatedProductsNumber=このキットを構成する製品の数
 ParentProductsNumber=親包装製品の数
@@ -167,8 +168,10 @@ BuyingPrices=購入価格
 CustomerPrices=顧客価格
 SuppliersPrices=仕入先価格
 SuppliersPricesOfProductsOrServices=(製品またはサービスの)仕入先価格
-CustomCode=税関/製品/ HSコード
+CustomCode=税関|商品| HSコード
 CountryOrigin=原産国
+RegionStateOrigin=地域 原産地
+StateOrigin=州|県 原産地
 Nature=製品の性質(素材/完成品)
 NatureOfProductShort=製品の性質
 NatureOfProductDesc=原材料または完成品
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=固定価格を使用する
 PriceByQuantity=数量による異なる価格
 DisablePriceByQty=数量で価格を無効にする
 PriceByQuantityRange=数量範囲
-MultipriceRules=価格セグメントルール
+MultipriceRules=セグメントの自動価格
 UseMultipriceRules=価格セグメントルール(製品モジュールのセットアップで定義)を使用して、最初のセグメントに従って他のすべてのセグメントの価格を自動計算する
 PercentVariationOver=%sに対する%%の変動
 PercentDiscountOver=%sに対する%%割引
@@ -268,7 +271,7 @@ DefinitionOfBarCodeForProductNotComplete=製品%sのバーコードのタイプ
 DefinitionOfBarCodeForThirdpartyNotComplete=サードパーティ%sのバーコードのタイプまたは値の定義が不完全です。
 BarCodeDataForProduct=製品%sのバーコード情報：
 BarCodeDataForThirdparty=サードパーティのバーコード情報%s：
-ResetBarcodeForAllRecords=すべてのレコードのバーコード値を定義する(これにより、新しい値ですでに定義されているバーコード値もリセットされる)
+ResetBarcodeForAllRecords=すべてのレコードのバーコード値を定義する(これにより、新規値ですでに定義されているバーコード値もリセットされる)
 PriceByCustomer=顧客ごとに異なる価格
 PriceCatalogue=製品/サービスごとの単一の販売価格
 PricingRule=販売価格のルール
@@ -356,9 +359,9 @@ ProductCombinations=バリアント
 PropagateVariant=バリアントの伝播
 HideProductCombinations=製品セレクタで製品バリアントを非表示にする
 ProductCombination=バリアント
-NewProductCombination=新しいバリアント
+NewProductCombination=新規バリアント
 EditProductCombination=バリアントの編集
-NewProductCombinations=新しい亜種
+NewProductCombinations=新規亜種
 EditProductCombinations=バリアントの編集
 SelectCombination=組み合わせを選択
 ProductCombinationGenerator=バリアントジェネレータ
@@ -368,10 +371,10 @@ ImpactOnPriceLevel=価格水準への影響%s
 ApplyToAllPriceImpactLevel= すべてのレベルに適用
 ApplyToAllPriceImpactLevelHelp=ここをクリックすると、すべてのレベルで同じ価格の影響を設定できる
 WeightImpact=重量への影響
-NewProductAttribute=新しい属性
-NewProductAttributeValue=新しい属性値
+NewProductAttribute=新規属性
+NewProductAttributeValue=新規属性値
 ErrorCreatingProductAttributeValue=属性値の作成中にエラーが発生した。その参照を持つ既存の値がすでに存在するためである可能性がある
-ProductCombinationGeneratorWarning=続行すると、新しいバリアントを生成前に、以前のバリアントはすべて削除される。既存のものは新しい値で更新される
+ProductCombinationGeneratorWarning=続行すると、新規バリアントを生成前に、以前のバリアントはすべて削除される。既存のものは新規値で更新される
 TooMuchCombinationsWarning=多数のバリアントを生成と、CPU、メモリ使用量が高くなり、Dolibarrがそれらを作成できなくなる可能性がある。オプション「%s」を有効にすると、メモリ使用量を減らすのに役立つ場合がある。
 DoNotRemovePreviousCombinations=以前のバリアントを削除しないこと
 UsePercentageVariations=パーセンテージバリエーションを使用
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index 62bd0dc7d19..479bc75bf88 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -25,7 +25,7 @@ AllTaskVisibleButEditIfYouAreAssigned=資格のあるプロジェクトのすべ
 OnlyYourTaskAreVisible=自分に割り当てられたタスクのみが表示される。タスクが表示されておらず、時間を入力する必要がある場合は、自分にタスクを割り当てる。
 ImportDatasetTasks=プロジェクトのタスク
 ProjectCategories=プロジェクトタグ/カテゴリ
-NewProject=新しいプロジェクト
+NewProject=新規プロジェクト
 AddProject=プロジェクトを作成する
 DeleteAProject=プロジェクトを削除します。
 DeleteATask=タスクを削除する
@@ -65,7 +65,7 @@ Task=タスク
 TaskDateStart=タスク開始日
 TaskDateEnd=タスクの終了日
 TaskDescription=タスクの説明
-NewTask=新しいタスク
+NewTask=新規タスク
 AddTask=タスクを作成する
 AddTimeSpent=費やした時間を作成する
 AddHereTimeSpentForDay=この日/タスクに費やした時間をここに追加する
@@ -262,7 +262,7 @@ UsageOpportunity=使用法：機会
 UsageTasks=使用法：タスク
 UsageBillTimeShort=使用法：請求時間
 InvoiceToUse=使用する請求書のドラフト
-NewInvoice=新しい請求書
+NewInvoice=新規請求書
 OneLinePerTask=タスクごとに1行
 OneLinePerPeriod=期間ごとに1行
 RefTaskParent=参照符号親タスク
diff --git a/htdocs/langs/ja_JP/receptions.lang b/htdocs/langs/ja_JP/receptions.lang
index 2464d8c30f4..14ca3b7a7e8 100644
--- a/htdocs/langs/ja_JP/receptions.lang
+++ b/htdocs/langs/ja_JP/receptions.lang
@@ -15,7 +15,7 @@ StatisticsOfReceptions=受付の統計
 NbOfReceptions=受付数
 NumberOfReceptionsByMonth=月別の受付数
 ReceptionCard=受付カード
-NewReception=新しい受付
+NewReception=新規受付
 CreateReception=受付を作成する
 QtyInOtherReceptions=他の受付の数量
 OtherReceptionsForSameOrder=この注文の他の受付
@@ -36,7 +36,7 @@ StatsOnReceptionsOnlyValidated=受付で実施された統計は検証された
 SendReceptionByEMail=メールで受付を送信する
 SendReceptionRef=受付の提出%s
 ActionsOnReception=受付のイベント
-ReceptionCreationIsDoneFromOrder=今のところ、新しい受付の作成はオーダーカードから行われる。
+ReceptionCreationIsDoneFromOrder=今のところ、新規受付の作成はオーダーカードから行われる。
 ReceptionLine=受付ライン
 ProductQtyInReceptionAlreadySent=未処理の受注からの製品数量はすでに送信された
 ProductQtyInSuppliersReceptionAlreadyRecevied=すでに受け取ったオープンサプライヤー注文からの製品数量
diff --git a/htdocs/langs/ja_JP/recruitment.lang b/htdocs/langs/ja_JP/recruitment.lang
index 9c7def0a589..e9acbc08c0e 100644
--- a/htdocs/langs/ja_JP/recruitment.lang
+++ b/htdocs/langs/ja_JP/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=求人はクローズされている。ポジショ
 JobClosedTextCanceled=求人はクローズされている。
 ExtrafieldsJobPosition=補完的な属性（職位）
 ExtrafieldsCandidatures=補完的な属性（求人応募）
+MakeOffer=申し出する
diff --git a/htdocs/langs/ja_JP/sendings.lang b/htdocs/langs/ja_JP/sendings.lang
index a8ecd193c38..41814713358 100644
--- a/htdocs/langs/ja_JP/sendings.lang
+++ b/htdocs/langs/ja_JP/sendings.lang
@@ -1,75 +1,76 @@
 # Dolibarr language file - Source file is en_US - sendings
-RefSending=REF。出荷
+RefSending=参照符号 出荷
 Sending=出荷
 Sendings=出荷
-AllSendings=All Shipments
+AllSendings=すべての出荷
 Shipment=出荷
 Shipments=出荷
-ShowSending=Show Shipments
-Receivings=Delivery Receipts
+ShowSending=出荷を表示
+Receivings=配達領収書
 SendingsArea=出荷エリア
 ListOfSendings=出荷のリスト
 SendingMethod=配送方法
-LastSendings=Latest %s shipments
+LastSendings=最新の%s出荷
 StatisticsOfSendings=出荷の統計
 NbOfSendings=出荷数
-NumberOfShipmentsByMonth=Number of shipments by month
-SendingCard=Shipment card
-NewSending=新しい出荷
-CreateShipment=出荷を作成します。
-QtyShipped=個数出荷
-QtyShippedShort=Qty ship.
-QtyPreparedOrShipped=Qty prepared or shipped
+NumberOfShipmentsByMonth=月ごとの出荷数
+SendingCard=出荷カード
+NewSending=新規出荷
+CreateShipment=出荷を作成
+QtyShipped=出荷済数量
+QtyShippedShort=出荷数量
+QtyPreparedOrShipped=準備済または出荷済 数量
 QtyToShip=出荷する数量
-QtyToReceive=Qty to receive
-QtyReceived=個数は、受信した
-QtyInOtherShipments=Qty in other shipments
-KeepToShip=Remain to ship
-KeepToShipShort=Remain
-OtherSendingsForSameOrder=このため、他の出荷
-SendingsAndReceivingForSameOrder=Shipments and receipts for this order
-SendingsToValidate=検証するために出荷
+QtyToReceive=受領する数量
+QtyReceived=受領済数量
+QtyInOtherShipments=他の出荷の数量
+KeepToShip=出荷残
+KeepToShipShort=残
+OtherSendingsForSameOrder=当該注文に対する他の出荷
+SendingsAndReceivingForSameOrder=当該注文の出荷と受領
+SendingsToValidate=検査用に出荷
 StatusSendingCanceled=キャンセル
-StatusSendingDraft=ドラフト
-StatusSendingValidated=検証（製品が出荷する、またはすでに出荷されます）
+StatusSendingCanceledShort=キャンセル
+StatusSendingDraft=下書き
+StatusSendingValidated=検査済（製品で出荷用または出荷済）
 StatusSendingProcessed=処理
-StatusSendingDraftShort=ドラフト
-StatusSendingValidatedShort=検証
+StatusSendingDraftShort=下書き
+StatusSendingValidatedShort=検査
 StatusSendingProcessedShort=処理
-SendingSheet=Shipment sheet
-ConfirmDeleteSending=Are you sure you want to delete this shipment?
-ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b>?
-ConfirmCancelSending=Are you sure you want to cancel this shipment?
+SendingSheet=出荷シート
+ConfirmDeleteSending=この貨物を削除してもよいか？
+ConfirmValidateSending=この出荷を参照<b>%s </b>で検査してもよいか？
+ConfirmCancelSending=この出荷をキャンセルしてもよいか？
 DocumentModelMerou=メロウA5モデル
-WarningNoQtyLeftToSend=警告は、出荷されるのを待っていない製品。
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Planned date of delivery
-RefDeliveryReceipt=Ref delivery receipt
-StatusReceipt=Status delivery receipt
-DateReceived=日付の配信は、受信した
-ClassifyReception=Classify reception
-SendShippingByEMail=Send shipment by email
-SendShippingRef=Submission of shipment %s
+WarningNoQtyLeftToSend=警告、出荷待ちの製品はない。
+StatsOnShipmentsOnlyValidated=出荷に関して実施された統計は検査済みです。使用日は出荷の検査日です（飛行機の配達日は常にわかっているわけではない）。
+DateDeliveryPlanned=配達予定日
+RefDeliveryReceipt=参照納品書
+StatusReceipt=ステータス納品書
+DateReceived=配達受領日付
+ClassifyReception=レセプションを分類する
+SendShippingByEMail=メールで出荷する
+SendShippingRef=出荷の提出%s
 ActionsOnShipping=出荷のイベント
 LinkToTrackYourPackage=あなたのパッケージを追跡するためのリンク
-ShipmentCreationIsDoneFromOrder=現時点では、新たな出荷の作成は、注文カードから行われます。
-ShipmentLine=Shipment line
-ProductQtyInCustomersOrdersRunning=Product quantity from open sales orders
-ProductQtyInSuppliersOrdersRunning=Product quantity from open purchase orders
+ShipmentCreationIsDoneFromOrder=現時点では、新たな出荷の作成は、注文カードから行われる。
+ShipmentLine=出荷ライン
+ProductQtyInCustomersOrdersRunning=未処理の受注からの製品数量
+ProductQtyInSuppliersOrdersRunning=未処理の発注書からの製品数量
 ProductQtyInShipmentAlreadySent=未処理の受注からの製品数量はすでに送信された
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase orders already received
-NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
-WeightVolShort=Weight/Vol.
-ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
+ProductQtyInSuppliersShipmentAlreadyRecevied=すでに受け取った未処理の発注書からの製品数量
+NoProductToShipFoundIntoStock=倉庫<b>%s</b>に出荷する製品が見つかりません。在庫を修正するか、戻って別の倉庫を選択すること。
+WeightVolShort=重量/容量
+ValidateOrderFirstBeforeShipment=出荷を行う前に、まず注文を検査する必要がある。
 
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=配信確認のために、より完全なドキュメントモデル（logo. ..）
-DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
-Error_EXPEDITION_ADDON_NUMBER_NotDefined=定数EXPEDITION_ADDON_NUMBERが定義されていません
-SumOfProductVolumes=Sum of product volumes
-SumOfProductWeights=Sum of product weights
+DocumentModelStorm=入庫とフィールド外の互換性のためのより完全なドキュメントモデル（ロゴ...）
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=定数EXPEDITION_ADDON_NUMBERが定義されていない
+SumOfProductVolumes=製品量の合計
+SumOfProductWeights=製品の重量の合計
 
 # warehouse details
-DetailWarehouseNumber= Warehouse details
-DetailWarehouseFormat= W:%s (Qty: %d)
+DetailWarehouseNumber= 倉庫の詳細
+DetailWarehouseFormat= W：%s（数量：%d）
diff --git a/htdocs/langs/ja_JP/sms.lang b/htdocs/langs/ja_JP/sms.lang
index 70e31818985..717e62c09d3 100644
--- a/htdocs/langs/ja_JP/sms.lang
+++ b/htdocs/langs/ja_JP/sms.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - sms
 Sms=SMS
-SmsSetup=SMSセットアップ
-SmsDesc=このページでは、SMS機能のグローバルオプションを定義することができます
+SmsSetup=SMSの設定
+SmsDesc=このページでは、SMS機能のグローバルオプションを定義できる
 SmsCard=SMSカード
-AllSms=すべてのSMS campains
+AllSms=すべてのSMSキャンペーン
 SmsTargets=ターゲット
 SmsRecipients=ターゲット
 SmsRecipient=ターゲット
@@ -13,39 +13,39 @@ SmsTo=ターゲット
 SmsTopic=SMSのトピック
 SmsText=メッセージ
 SmsMessage=SMSメッセージ
-ShowSms=ショーのSMS
-ListOfSms=リストSMS campains
-NewSms=新しいSMSキャンペーンし
-EditSms=編集SMS
-ResetSms=新しい送信
-DeleteSms=SMSのキャンペーンしを削除します。
-DeleteASms=SMSのキャンペーンしを削除します。
-PreviewSms=PreviuwのSMS
+ShowSms=SMSを表示
+ListOfSms=SMSキャンペーンを一覧表示する
+NewSms=新規SMSキャンペーン
+EditSms=SMSを編集する
+ResetSms=新規送信
+DeleteSms=SMSキャンペーンを削除する
+DeleteASms=SMSキャンペーンを削除する
+PreviewSms=前のSMS
 PrepareSms=SMSを準備する
 CreateSms=SMSを作成する
-SmsResult=SMSを送信することの結果
-TestSms=テストSMS
+SmsResult=SMS送信の結果
+TestSms=SMSをテストする
 ValidSms=SMSを検証する
 ApproveSms=SMSを承認する
-SmsStatusDraft=ドラフト
+SmsStatusDraft=下書き
 SmsStatusValidated=検証
 SmsStatusApproved=承認された
 SmsStatusSent=送信
 SmsStatusSentPartialy=部分的に送信
 SmsStatusSentCompletely=完全に送信
 SmsStatusError=エラー
-SmsStatusNotSent=送信されません
-SmsSuccessfulySent=正しく送信されたSMS（%sへ%sから）
+SmsStatusNotSent=送信されない
+SmsSuccessfulySent=SMSが正しく送信された（%sから%sへ）
 ErrorSmsRecipientIsEmpty=ターゲットの数が空である
-WarningNoSmsAdded=ターゲットリストに追加する新しい電話番号なし
-ConfirmValidSms=このキャンペーンの検証を確認しますか？
-NbOfUniqueSms=Nbの自由度のユニークな電話番号
-NbOfSms=ホン番号のNbre
+WarningNoSmsAdded=ターゲットリストに追加する新規電話番号なし
+ConfirmValidSms=このキャンペーンの検証を確認するか？
+NbOfUniqueSms=固有の電話番号の数
+NbOfSms=電話番号の数
 ThisIsATestMessage=これはテストメッセージです。
 SendSms=SMSを送信
-SmsInfoCharRemain=残りの文字のNb
-SmsInfoNumero= （フォーマット国際例：33899701761）
+SmsInfoCharRemain=残りの文字数
+SmsInfoNumero= （国際フォーマット、すなわち：+33899701761）
 DelayBeforeSending=送信する前に、遅延時間（分）
-SmsNoPossibleSenderFound=有効な送信者はありません。 SMSプロバイダの設定を確認してください。
-SmsNoPossibleRecipientFound=利用可能なターゲットはありません。 SMSプロバイダの設定を確認してください。
-DisableStopIfSupported=Disable STOP message (if supported)
+SmsNoPossibleSenderFound=有効な送信者はない。 SMSプロバイダの設定を確認すること。
+SmsNoPossibleRecipientFound=利用可能なターゲットはない。 SMSプロバイダの設定を確認すること。
+DisableStopIfSupported=STOPメッセージを無効にする（サポートされている場合）
diff --git a/htdocs/langs/ja_JP/stocks.lang b/htdocs/langs/ja_JP/stocks.lang
index e6ac2a3ec17..71404fd45c7 100644
--- a/htdocs/langs/ja_JP/stocks.lang
+++ b/htdocs/langs/ja_JP/stocks.lang
@@ -2,241 +2,242 @@
 WarehouseCard=倉庫カード
 Warehouse=倉庫
 Warehouses=倉庫
-ParentWarehouse=Parent warehouse
-NewWarehouse=New warehouse / Stock Location
+ParentWarehouse=親倉庫
+NewWarehouse=新規倉庫/在庫場所
 WarehouseEdit=倉庫を変更する
-MenuNewWarehouse=新倉庫
-WarehouseSource=ソースの倉庫
-WarehouseSourceNotDefined=No warehouse defined,
-AddWarehouse=Create warehouse
-AddOne=Add one
-DefaultWarehouse=Default warehouse
-WarehouseTarget=ターゲット·ウェアハウス
+MenuNewWarehouse=新規倉庫
+WarehouseSource=ソース倉庫
+WarehouseSourceNotDefined=倉庫が定義されていない、
+AddWarehouse=倉庫を作成する
+AddOne=1つ追加する
+DefaultWarehouse=デフォルトの倉庫
+WarehouseTarget=ターゲット倉庫
 ValidateSending=送信削除
 CancelSending=送信キャンセル
 DeleteSending=送信削除
-Stock=株式
-Stocks=ストック
-MissingStocks=Missing stocks
-StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
-StocksByLotSerial=Stocks by lot/serial
-LotSerial=Lots/Serials
-LotSerialList=List of lot/serials
-Movements=動作
-ErrorWarehouseRefRequired=ウェアハウスの参照名を指定する必要があります
+Stock=在庫
+Stocks=在庫
+MissingStocks=在庫がない
+StockAtDate=日付の在庫
+StockAtDateInPast=過去の日付
+StockAtDateInFuture=将来の日付
+StocksByLotSerial=ロット/シリアル別の在庫
+LotSerial=ロット/シリアル
+LotSerialList=ロット/シリアルのリスト
+Movements=移動
+ErrorWarehouseRefRequired=倉庫の参照名を指定する必要がある
 ListOfWarehouses=倉庫のリスト
 ListOfStockMovements=在庫変動のリスト
-ListOfInventories=List of inventories
-MovementId=Movement ID
-StockMovementForId=Movement ID %d
-ListMouvementStockProject=List of stock movements associated to project
-StocksArea=Warehouses area
-AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
-IncludeAlsoDraftOrders=Include also draft orders
+ListOfInventories=在庫一覧
+MovementId=移動 ID
+StockMovementForId=移動 ID%d
+ListMouvementStockProject=プロジェクトに関連する在庫移動のリスト
+StocksArea=倉庫エリア
+AllWarehouses=すべての倉庫
+IncludeEmptyDesiredStock=未定義の希望在庫で負の在庫も含める
+IncludeAlsoDraftOrders=ドラフト注文も含める
 Location=場所
 LocationSummary=短い名前の場所
-NumberOfDifferentProducts=Number of different products
+NumberOfDifferentProducts=異なる製品の数
 NumberOfProducts=商品の合計数
-LastMovement=Latest movement
-LastMovements=Latest movements
+LastMovement=最新の動き
+LastMovements=最新の動き
 Units=ユニット
 Unit=ユニット
-StockCorrection=Stock correction
-CorrectStock=正しい株式
-StockTransfer=Stock transfer
-TransferStock=Transfer stock
-MassStockTransferShort=Mass stock transfer
-StockMovement=Stock movement
-StockMovements=Stock movements
+StockCorrection=在庫修正
+CorrectStock=正しい在庫
+StockTransfer=在庫移転
+TransferStock=在庫移転
+MassStockTransferShort=大量在庫移転
+StockMovement=在庫移動
+StockMovements=在庫移動
 NumberOfUnit=ユニット数
-UnitPurchaseValue=Unit purchase price
-StockTooLow=低すぎると株式
-StockLowerThanLimit=Stock lower than alert limit (%s)
+UnitPurchaseValue=購入単価
+StockTooLow=低すぎる在庫
+StockLowerThanLimit=在庫がアラート制限を下回っている（%s）
 EnhancedValue=値
 PMPValue=加重平均価格
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=倉庫の値
-UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
-RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
-UserDefaultWarehouse=Set a warehouse on Users
-MainDefaultWarehouse=Default warehouse
-MainDefaultWarehouseUser=Use a default warehouse for each user
-MainDefaultWarehouseUserDesc=By activating this option, during creation of a product, the warehouse assigned to the product will be defined on this one. If no warehouse is defined on the user, the default warehouse is defined.
-IndependantSubProductStock=Product stock and subproduct stock are independent
-QtyDispatched=数量派遣
-QtyDispatchedShort=Qty dispatched
-QtyToDispatchShort=Qty to dispatch
-OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
-DeStockOnValidateOrder=Decrease real stocks on validation of sales order
-DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
-ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
-ReStockOnValidateOrder=Increase real stocks on purchase order approval
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
-StockOnReception=Increase real stocks on validation of reception
-StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
-OrderStatusNotReadyToDispatch=ご注文はまだないか、またはこれ以上の在庫倉庫の製品の派遣ができますステータスを持っていません。
-StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
-NoPredefinedProductToDispatch=このオブジェクト用に事前定義された製品がありません。そうは在庫に派遣する必要はありません。
+UserWarehouseAutoCreate=ユーザーの作成時にユーザー倉庫を自動的に作成する
+AllowAddLimitStockByWarehouse=製品ごとの最小在庫と希望在庫の値に加えて、ペアリングごとの最小在庫と希望在庫の値（製品倉庫）も管理する。
+RuleForWarehouse=倉庫のルール
+WarehouseAskWarehouseDuringOrder=販売注文に倉庫を設定する
+UserDefaultWarehouse=ユーザーに倉庫を設定する
+MainDefaultWarehouse=デフォルトの倉庫
+MainDefaultWarehouseUser=ユーザーごとにデフォルトの倉庫を使用する
+MainDefaultWarehouseUserDesc=このオプションを有効にすると、製品の作成時に、製品に割り当てられた倉庫がこのオプションで定義される。ユーザーに倉庫が定義されていない場合は、デフォルトの倉庫が定義される。
+IndependantSubProductStock=製品在庫と副製品在庫は独立している
+QtyDispatched=手配済数量
+QtyDispatchedShort=手配済数量
+QtyToDispatchShort=手配する数量
+OrderDispatch=アイテムの領収書
+RuleForStockManagementDecrease=自動在庫減少のルールを選択する（自動減少ルールが有効化されている場合でも、手動減少は常に可能 ）
+RuleForStockManagementIncrease=自動在庫増加のルールを選択する（自動増加ルールがアクティブ化されている場合でも、手動の増加は常に可能）
+DeStockOnBill=顧客の請求書/貸方表の検証で実際の在庫を減らす
+DeStockOnValidateOrder=受注の検証時に実在庫を減らす
+DeStockOnShipment=出荷検証で実際の在庫を減らす
+DeStockOnShipmentOnClosing=出荷がクローズに設定されている場合は、実際の在庫を減らす
+ReStockOnBill=仕入先の請求書/貸方表の検証で実際の在庫を増やす
+ReStockOnValidateOrder=注文書の承認時に実在庫を増やす
+ReStockOnDispatchOrder=商品の発注書受領後、倉庫への手動発送で実際の在庫を増やす
+StockOnReception=受信の検証で実際の在庫を増やす
+StockOnReceptionOnClosing=レセプションがクローズに設定されている場合は、実際の在庫を増やす
+OrderStatusNotReadyToDispatch=ご注文はまだないか、またはこれ以上の在庫倉庫の製品の派遣ができるステータスを持っていない。
+StockDiffPhysicTeoric=物理在庫と仮想在庫の違いの説明
+NoPredefinedProductToDispatch=このオブジェクト用に事前定義された製品がない。そうは在庫に派遣する必要はない。
 DispatchVerb=派遣
-StockLimitShort=Limit for alert
-StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Physical Stock
+StockLimitShort=アラートの制限
+StockLimit=アラートの在庫制限
+StockLimitDesc=（空）は警告がないことを意味する。 <br> 0は、在庫が空になるとすぐに警告として使用される。
+PhysicalStock=現物在庫
 RealStock=実在庫
-RealStockDesc=Physical/real stock is the stock currently in the warehouses.
-RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
+RealStockDesc=現物/実在庫は、現在倉庫にある在庫 。
+RealStockWillAutomaticallyWhen=実際の在庫は、このルールに従って変更される（在庫モジュールで定義されている）。
 VirtualStock=仮想在庫
-VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+VirtualStockAtDate=日付での仮想在庫
+VirtualStockAtDateDesc=日付より前に行われる予定のすべての保留中の注文が終了すると、仮想在庫が発生する
+VirtualStockDesc=仮想在庫は、すべてのオープン/保留アクション（在庫に影響を与える）が閉じられたときに使用可能な計算された在庫 （発注書の受領、販売注文の出荷、製造注文の作成など）。
 IdWarehouse=イド倉庫
 DescWareHouse=説明倉庫
 LieuWareHouse=ローカリゼーション倉庫
 WarehousesAndProducts=倉庫と製品
-WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
+WarehousesAndProductsBatchDetail=倉庫および製品（ロット/シリアルごとの詳細付き）
 AverageUnitPricePMPShort=加重平均価格
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=製品を在庫に入れるためにサプライヤーに支払わなければならなかった入力平均単価。
 SellPriceMin=販売単価
-EstimatedStockValueSellShort=Value for sell
-EstimatedStockValueSell=Value for sell
-EstimatedStockValueShort=入力株式価値
-EstimatedStockValue=入力株式価値
-DeleteAWarehouse=倉庫を削除します。
-ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b>?
-PersonalStock=個人の株式%s
-ThisWarehouseIsPersonalStock=この倉庫は%s %sの個人的な株式を表す
-SelectWarehouseForStockDecrease=株式の減少のために使用するために倉庫を選択します。
-SelectWarehouseForStockIncrease=在庫の増加に使用する倉庫を選択します。
-NoStockAction=No stock action
-DesiredStock=Desired Stock
-DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
-StockToBuy=To order
-Replenishment=Replenishment
-ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
-UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
-ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
-UseVirtualStock=Use virtual stock
-UsePhysicalStock=Use physical stock
-CurentSelectionMode=Current selection mode
+EstimatedStockValueSellShort=販売価値
+EstimatedStockValueSell=販売価値
+EstimatedStockValueShort=入力在庫価値
+EstimatedStockValue=入力在庫価値
+DeleteAWarehouse=倉庫を削除する。
+ConfirmDeleteWarehouse=倉庫<b>%s </b>を削除してもよろしい か？
+PersonalStock=個人の在庫%s
+ThisWarehouseIsPersonalStock=この倉庫は%s %sの個人的な在庫を表す
+SelectWarehouseForStockDecrease=在庫の減少のために使用する倉庫を選択する
+SelectWarehouseForStockIncrease=在庫の増加に使用する倉庫を選択する。
+NoStockAction=在庫アクションなし
+DesiredStock=希望在庫
+DesiredStockDesc=この在庫量は、補充機能によって在庫を埋めるために使用される値になる。
+StockToBuy=注文する
+Replenishment=補充
+ReplenishmentOrders=補充注文
+VirtualDiffersFromPhysical=在庫オプションの増減に応じて、現物在庫と仮想在庫（現物在庫+未決済注文）が異なる場合がある
+UseRealStockByDefault=補充機能には、仮想在庫ではなく実際の在庫を使用する
+ReplenishmentCalculation=注文金額は、（希望数量-仮想在庫）ではなく（希望数量-実在庫）になる。
+UseVirtualStock=仮想在庫を使用する
+UsePhysicalStock=現物在庫を使用する
+CurentSelectionMode=現在の選択モード
 CurentlyUsingVirtualStock=仮想在庫
-CurentlyUsingPhysicalStock=物理的な在庫
-RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
-AlertOnly= Alerts only
-IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
-WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
-WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
-ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
-ReplenishmentStatusDescPerWarehouse=If you want a replenishment based on desired quantity defined per warehouse, you must add a filter on the warehouse.
-ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
-Replenishments=Replenishments
-NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
-NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
-MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
-RecordMovement=Record transfer
-ReceivingForSameOrder=Receipts for this order
-StockMovementRecorded=Stock movements recorded
-RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
-MovementLabel=Label of movement
-TypeMovement=Type of movement
-DateMovement=Date of movement
-InventoryCode=Movement or inventory code
-IsInPackage=Contained into package
-WarehouseAllowNegativeTransfer=Stock can be negative
-qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
-qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
+CurentlyUsingPhysicalStock=現物在庫
+RuleForStockReplenishment=在庫補充のルール
+SelectProductWithNotNullQty=数量がnullではない製品と仕入先を少なくとも1つ選択してください
+AlertOnly= アラートのみ
+IncludeProductWithUndefinedAlerts = 希望数量が定義されていない製品の負の在庫も含めて、0に戻す。
+WarehouseForStockDecrease=倉庫<b>%s</b>は在庫減少に使用される
+WarehouseForStockIncrease=倉庫<b>%s</b>は在庫増加に使用される
+ForThisWarehouse=この倉庫のために
+ReplenishmentStatusDesc=これは、在庫が希望在庫より少ない（またはチェックボックス「アラートのみ」がチェックされている場合はアラート値より低い）すべての製品のリスト 。チェックボックスを使用して、差額を埋めるための発注書を作成できる。
+ReplenishmentStatusDescPerWarehouse=倉庫ごとに定義された希望数量に基づいて補充が必要な場合は、倉庫にフィルタを追加する必要がある。
+ReplenishmentOrdersDesc=これは、事前定義された製品を含むすべての未処理の注文書のリスト 。事前定義された製品を含む未処理の注文のみ、つまり在庫に影響を与える可能性のある注文がここに表示される。
+Replenishments=補充
+NbOfProductBeforePeriod=選択した期間の前に在庫がある製品%sの数量（<%s）
+NbOfProductAfterPeriod=選択した期間後の在庫の製品%sの数量（> %s）
+MassMovement=マス移動 
+SelectProductInAndOutWareHouse=ソース倉庫とターゲット倉庫、製品と数量を選択し、「%s」をクリックする。必要なすべての動きに対してこれが完了したら、「%s」をクリックする。
+RecordMovement=レコード移転
+ReceivingForSameOrder=この注文の領収書
+StockMovementRecorded=記録された在庫移動
+RuleForStockAvailability=在庫要件に関する規則
+StockMustBeEnoughForInvoice=在庫レベルは、製品/サービスを請求書に追加するのに十分でなければなりません（自動在庫変更のルールに関係なく、請求書に行を追加するときに現在の実際の在庫に対してチェックが行われる）
+StockMustBeEnoughForOrder=在庫レベルは、注文に製品/サービスを追加するのに十分でなければなりません（自動在庫変更のルールに関係なく、注文にラインを追加するときに現在の実際の在庫でチェックが行われる）
+StockMustBeEnoughForShipment= 在庫レベルは、製品/サービスを出荷に追加するのに十分でなければなりません（自動在庫変更のルールに関係なく、出荷にラインを追加するときに現在の実際の在庫でチェックが行われる）
+MovementLabel=動きのラベル
+TypeMovement=動きの種類
+DateMovement=移動日
+InventoryCode=移動または在庫コード
+IsInPackage=パッケージに含まれている
+WarehouseAllowNegativeTransfer=在庫はマイナスになる可能性がある
+qtyToTranferIsNotEnough=ソース倉庫からの十分な在庫がなく、セットアップで負の在庫が許可されていない。
+qtyToTranferLotIsNotEnough=ソース倉庫からこのロット番号に対して十分な在庫がなく、設定で負の在庫が許可されていない（製品 '%s'の数量とロット '%s'は倉庫 '%s'の%s ）。
 ShowWarehouse=倉庫を表示
-MovementCorrectStock=Stock correction for product %s
-MovementTransferStock=Stock transfer of product %s into another warehouse
-InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
-ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
-OpenAll=Open for all actions
-OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
-OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
-ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
-ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
-ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
-AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
-AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
-InventoryDate=Inventory date
-NewInventory=New inventory
-inventorySetup = Inventory Setup
-inventoryCreatePermission=Create new inventory
-inventoryReadPermission=View inventories
-inventoryWritePermission=Update inventories
-inventoryValidatePermission=Validate inventory
-inventoryTitle=Inventory
-inventoryListTitle=Inventories
-inventoryListEmpty=No inventory in progress
-inventoryCreateDelete=Create/Delete inventory
-inventoryCreate=Create new
+MovementCorrectStock=製品%sの在庫修正
+MovementTransferStock=製品%sの別の倉庫への在庫移転
+InventoryCodeShort=Inv./Mov。コード
+NoPendingReceptionOnSupplierOrder=注文書が開いているため、保留中の受付はない
+ThisSerialAlreadyExistWithDifferentDate=ロット/シリアル 番号 (<strong>%s</strong>) は異なる賞味期限または販売期限で ( <strong>%s</strong> が見つかったが、入力したのは <strong>%s</strong>).
+OpenAll=すべてのアクションに対して開く
+OpenInternal=内部アクションのためにのみ開く
+UseDispatchStatus=発注書受付の製品ラインにディスパッチステータス（承認/拒否）を使用する
+OptionMULTIPRICESIsOn=オプション「セグメントごとのいくつかの価格」がオンになっている。これは、製品に複数の販売価格があるため、販売価値を計算できないことを意味する
+ProductStockWarehouseCreated=アラートの在庫制限と希望する最適在庫が正しく作成された
+ProductStockWarehouseUpdated=アラートの在庫制限と希望する最適在庫が正しく更新された
+ProductStockWarehouseDeleted=アラートの在庫制限と希望する最適在庫が正しく削除された
+AddNewProductStockWarehouse=アラートと望ましい最適在庫の新規制限を設定する
+AddStockLocationLine=数量を減らしてから、クリックしてこの製品の別の倉庫を追加する
+InventoryDate=在庫日
+NewInventory=新規在庫
+inventorySetup = 在庫設定
+inventoryCreatePermission=新規在庫を作成する
+inventoryReadPermission=在庫を見る
+inventoryWritePermission=在庫を更新する
+inventoryValidatePermission=在庫を検証する
+inventoryTitle=在庫
+inventoryListTitle=在庫
+inventoryListEmpty=進行中の在庫はない
+inventoryCreateDelete=インベントリの作成/削除
+inventoryCreate=新規作成
 inventoryEdit=編集
 inventoryValidate=検証
 inventoryDraft=ランニング
-inventorySelectWarehouse=Warehouse choice
-inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse: %s
-inventoryErrorQtyAdd=Error: one quantity is less than zero
-inventoryMvtStock=By inventory
-inventoryWarningProductAlreadyExists=This product is already into list
+inventorySelectWarehouse=倉庫の選択
+inventoryConfirmCreate=作成
+inventoryOfWarehouse=倉庫の在庫：%s
+inventoryErrorQtyAdd=エラー：1つの数量がゼロ未満 
+inventoryMvtStock=在庫別
+inventoryWarningProductAlreadyExists=この製品はすでにリストに含まれている
 SelectCategory=カテゴリフィルタ
-SelectFournisseur=Vendor filter
-inventoryOnDate=Inventory
-INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
-inventoryChangePMPPermission=Allow to change PMP value for a product
-ColumnNewPMP=New unit PMP
-OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
-LastPA=Last BP
-CurrentPA=Curent BP
-RecordedQty=Recorded Qty
-RealQty=Real Qty
-RealValue=Real Value
-RegulatedQty=Regulated Qty
-AddInventoryProduct=Add product to inventory
+SelectFournisseur=仕入先フィルタ
+inventoryOnDate=在庫
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=在庫移動には、（在庫検証の日付ではなく）在庫の日付がある。
+inventoryChangePMPPermission=製品のPMP値の変更を許可する
+ColumnNewPMP=新規ユニットPMP
+OnlyProdsInStock=在庫のない製品は追加しないこと
+TheoricalQty=理論量
+TheoricalValue=理論量
+LastPA=最後のBP
+CurrentPA=現在のBP
+RecordedQty=記録された数量
+RealQty=実数量
+RealValue=真の価値
+RegulatedQty=規制数量
+AddInventoryProduct=製品を在庫に追加する
 AddProduct=加える
-ApplyPMP=Apply PMP
-FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action?
-InventoryFlushed=Inventory flushed
-ExitEditMode=Exit edition
-inventoryDeleteLine=行を削除します
-RegulateStock=Regulate Stock
+ApplyPMP=PMPを適用する
+FlushInventory=在庫をフラッシュする
+ConfirmFlushInventory=このアクションを確認するか？
+InventoryFlushed=在庫がフラッシュされた
+ExitEditMode=終了版
+inventoryDeleteLine=行を削除する
+RegulateStock=在庫を調整する
 ListInventory=リスト
-StockSupportServices=Stock management supports Services
-StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
-ReceiveProducts=Receive items
-StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
-StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
-StockIncrease=Stock increase
-StockDecrease=Stock decrease
-InventoryForASpecificWarehouse=Inventory for a specific warehouse
-InventoryForASpecificProduct=Inventory for a specific product
-StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to use
-ForceTo=Force to
-AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
-StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
-CurrentStock=Current stock
-InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
-UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|serial barcode)
+StockSupportServices=在庫管理はサービスをサポートする
+StockSupportServicesDesc=デフォルトでは、"製品" 種別 の製品のみを在庫できる。サービスモジュールとこのオプションの両方が有効になっている場合は、"サービス"種別 の製品を在庫することもできる。
+ReceiveProducts=アイテムを受け取る
+StockIncreaseAfterCorrectTransfer=修正/移転による増加
+StockDecreaseAfterCorrectTransfer=修正/移転による減少
+StockIncrease=在庫増加
+StockDecrease=在庫減少
+InventoryForASpecificWarehouse=特定の倉庫の在庫
+InventoryForASpecificProduct=特定の製品の在庫
+StockIsRequiredToChooseWhichLotToUse=使用するロットを選択するには在庫が必要 
+ForceTo=強制する
+AlwaysShowFullArbo=倉庫リンクのポップアップに倉庫の完全なツリーを表示する（警告：これによりパフォーマンスが大幅に低下する可能性がある）
+StockAtDatePastDesc=過去の特定の日付の在庫（実際の在庫）をここで表示できる
+StockAtDateFutureDesc=将来の特定の日付の在庫（仮想在庫）をここで表示できる
+CurrentStock=現在の在庫
+InventoryRealQtyHelp=値を0に設定して、数量をリセットする。<br>フィールドを空のままにするか、行を削除して、変更しないこと。
+UpdateByScaning=スキャンして更新する
+UpdateByScaningProductBarcode=スキャンによる更新（製品バーコード）
+UpdateByScaningLot=スキャンによる更新（ロット|シリアルバーコード）
+DisableStockChangeOfSubProduct=この移動中は、このキットのすべての副産物の在庫変更を無効にする。
diff --git a/htdocs/langs/ja_JP/stripe.lang b/htdocs/langs/ja_JP/stripe.lang
index 90be83666f7..cdd52522e8e 100644
--- a/htdocs/langs/ja_JP/stripe.lang
+++ b/htdocs/langs/ja_JP/stripe.lang
@@ -1,72 +1,71 @@
 # Dolibarr language file - Source file is en_US - stripe
-StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
-StripeOrCBDoPayment=Pay with credit card or Stripe
+StripeSetup=Stripe モジュールのセットアップ
+StripeDesc=<a href="http://www.stripe.com" target="_blank"> Stripe </a>を介して、クレジット/セビットカードでの支払い用のStripeオンライン支払いページを顧客に提供します。これは、顧客が臨時の支払いを行えるようにするため、または特定のDolibarrオブジェクト（請求書、注文など）に関連する支払いのために使用できる。
+StripeOrCBDoPayment=クレジットカードまたはStripeで支払う
 FollowingUrlAreAvailableToMakePayments=以下のURLはDolibarrオブジェクト上で支払いをするために顧客にページを提供するために利用可能です
 PaymentForm=支払い形態
-WelcomeOnPaymentPage=Welcome to our online payment service
-ThisScreenAllowsYouToPay=この画面では、%sにオンライン決済を行うことができます。
-ThisIsInformationOnPayment=これは、実行する支払いに関する情報です。
+WelcomeOnPaymentPage=オンライン決済サービスへようこそ
+ThisScreenAllowsYouToPay=この画面では、%sにオンライン決済を行うことができる。
+ThisIsInformationOnPayment=これは、実行する支払いに関する情報。
 ToComplete=完了する
 YourEMail=入金確認を受信する電子メール
-STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
+STRIPE_PAYONLINE_SENDEMAIL=支払い試行後の電子メール通知（成功または失敗）
 Creditor=債権者
 PaymentCode=支払いコード
-StripeDoPayment=Pay with Stripe
-YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
+StripeDoPayment=Stripeで支払う
+YouWillBeRedirectedOnStripe=クレジットカード情報を入力するために、セキュリティで保護されたStripeページにリダイレクトされる
 Continue=次の
 ToOfferALinkForOnlinePayment=%s支払いのURL
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment page for a sales order
-ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment page for a customer invoice
-ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment page for a contract line
-ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment page of any amount with no existing object
-ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment page for a member subscription
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment page for payment of a donation
-YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (mandatory only for payment not linked to an object) to add your own payment comment tag.<br>For the URL of payments with no existing object, you may also add the parameter <strong>&noidempotency=1</strong> so the same link with same tag can be used several times (some payment mode may limit the payment to 1 for each different link without this parameter)
-SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
+ToOfferALinkForOnlinePaymentOnOrder=受注の%sオンライン支払いページを提供するURL
+ToOfferALinkForOnlinePaymentOnInvoice=顧客の請求書に%sオンライン支払いページを提供するためのURL
+ToOfferALinkForOnlinePaymentOnContractLine=契約ラインの%sオンライン支払いページを提供するURL
+ToOfferALinkForOnlinePaymentOnFreeAmount=既存のオブジェクトのない任意の金額の%sオンライン支払いページを提供するURL
+ToOfferALinkForOnlinePaymentOnMemberSubscription=メンバーサブスクリプションの%sオンライン支払いページを提供するURL
+ToOfferALinkForOnlinePaymentOnDonation=寄付の支払いのために%sオンライン支払いページを提供するURL
+YouCanAddTagOnUrl=また、URLパラメーター<b>&tag=<i>value</i></b>をこれらのURLのいずれかに追加して（オブジェクトにリンクされていない支払いにのみ必須）、独自の支払いコメントタグを追加することもできる。 <br>既存のオブジェクトがない支払いのURLの場合、パラメーター<strong>&noidempotency=1</strong>を追加して、同じタグを持つ同じリンクを複数回使用できるようにすることもできる（一部の支払いモードでは、このパラメータがないと、異なるリンクごとに支払いが1に制限される場合がある）
+SetupStripeToHavePaymentCreatedAutomatically=Stripeによって検証されたときに支払いが自動的に作成されるように、URL <b> %s</b>を使用してStripeをセットアップします。
 AccountParameter=アカウントのパラメータ
 UsageParameter=使用パラメータ
 InformationToFindParameters=あなたの%sアカウント情報を見つけるのを助ける
-STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=ベンダーの名前
+STRIPE_CGI_URL_V2=支払い用のStripe CGIモジュールのURL
 CSSUrlForPaymentForm=支払いフォームのCSSスタイルシートのURL
-NewStripePaymentReceived=New Stripe payment received
-NewStripePaymentFailed=New Stripe payment tried but failed
-FailedToChargeCard=Failed to charge card
-STRIPE_TEST_SECRET_KEY=Secret test key
-STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
-STRIPE_TEST_WEBHOOK_KEY=Webhook test key
-STRIPE_LIVE_SECRET_KEY=Secret live key
-STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
-STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
-ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
-StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
-StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
-StripeGateways=Stripe gateways
-OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
-OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
-BankAccountForBankTransfer=Bank account for fund payouts
-StripeAccount=Stripe account
-StripeChargeList=List of Stripe charges
-StripeTransactionList=List of Stripe transactions
-StripeCustomerId=Stripe customer id
-StripePaymentModes=Stripe payment modes
-LocalID=Local ID
+NewStripePaymentReceived=新規Stripeの支払いを受け取りました
+NewStripePaymentFailed=新規Stripe支払いが試行されましたが、失敗した
+FailedToChargeCard=カードのチャージに失敗した
+STRIPE_TEST_SECRET_KEY=秘密のテストキー
+STRIPE_TEST_PUBLISHABLE_KEY=公開可能なテストキー
+STRIPE_TEST_WEBHOOK_KEY=Webhookテストキー
+STRIPE_LIVE_SECRET_KEY=秘密のライブキー
+STRIPE_LIVE_PUBLISHABLE_KEY=公開可能なライブキー
+STRIPE_LIVE_WEBHOOK_KEY=Webhookライブキー
+ONLINE_PAYMENT_WAREHOUSE=オンライン支払いが行われるときに在庫減少に使用する在庫<br>（TODO請求書のアクションで在庫を減らすオプションが実行され、オンライン支払いがそれ自体で請求書を生成する場合？）
+StripeLiveEnabled=Stripe ライブが有効（それ以外の場合はテスト/サンドボックスモード）
+StripeImportPayment=Stripe 支払いのインポート
+ExampleOfTestCreditCard=テスト用のクレジットカードの例：%s =>有効、%s =>エラーCVC、%s =>期限切れ、%s =>充電に失敗
+StripeGateways=Stripe ゲートウェイ
+OAUTH_STRIPE_TEST_ID=Stripe ConnectクライアントID（ca _...）
+OAUTH_STRIPE_LIVE_ID=Stripe ConnectクライアントID（ca _...）
+BankAccountForBankTransfer=資金支払いのための銀行口座
+StripeAccount=Stripe アカウント
+StripeChargeList=Stripe 料金のリスト
+StripeTransactionList=Stripeトランザクションのリスト
+StripeCustomerId=Stripe の顧客ID
+StripePaymentModes=Stripe 支払いモード
+LocalID=ローカルID
 StripeID=Stripe ID
-NameOnCard=Name on card
-CardNumber=Card Number
-ExpiryDate=Expiry Date
+NameOnCard=カードの名前
+CardNumber=カード番号
+ExpiryDate=有効期限
 CVN=CVN
-DeleteACard=Delete Card
-ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
-CreateCustomerOnStripe=Create customer on Stripe
-CreateCardOnStripe=Create card on Stripe
-ShowInStripe=Show in Stripe
-StripeUserAccountForActions=User account to use for email notification of some Stripe events (Stripe payouts)
-StripePayoutList=List of Stripe payouts
-ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mode)
-ToOfferALinkForLiveWebhook=Link to setup Stripe WebHook to call the IPN (live mode)
-PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
-ClickHereToTryAgain=<a href="%s">Click here to try again...</a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authentication rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+DeleteACard=カードを削除
+ConfirmDeleteCard=このクレジットカードまたはデビットカードを削除してもよいか？
+CreateCustomerOnStripe=Stripeで顧客を作成する
+CreateCardOnStripe=Stripeでカードを作成する
+ShowInStripe=Stripe で表示
+StripeUserAccountForActions=一部のStripeイベントの電子メール通知に使用するユーザーアカウント（Stripeペイアウト）
+StripePayoutList=Stripe ペイアウトのリスト
+ToOfferALinkForTestWebhook=IPNを呼び出すためのStripeWebHookのセットアップへのリンク（テストモード）
+ToOfferALinkForLiveWebhook=IPNを呼び出すためのStripeWebHookのセットアップへのリンク（ライブモード）
+PaymentWillBeRecordedForNextPeriod=支払いは次の期間に記録される。
+ClickHereToTryAgain= <a href="%s">ここをクリックして再試行すること... </a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=強力な顧客認証ルールにより、カードの作成はStripeバックオフィスから行う必要がある。 Stripeの顧客レコードをオンにするには、ここをクリックすること：%s
diff --git a/htdocs/langs/ja_JP/suppliers.lang b/htdocs/langs/ja_JP/suppliers.lang
index ce2aea9527f..66d0d7f2afe 100644
--- a/htdocs/langs/ja_JP/suppliers.lang
+++ b/htdocs/langs/ja_JP/suppliers.lang
@@ -1,48 +1,48 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=仕入先s
-SuppliersInvoice=ベンダー請求書
-ShowSupplierInvoice=Show Vendor Invoice
-NewSupplier=New vendor
+SuppliersInvoice=仕入先請求書
+ShowSupplierInvoice=仕入先の請求書を表示する
+NewSupplier=新規仕入先
 History=歴史
-ListOfSuppliers=List of vendors
-ShowSupplier=Show vendor
+ListOfSuppliers=仕入先のリスト
+ShowSupplier=仕入先を表示
 OrderDate=注文日
-BuyingPriceMin=Best buying price
-BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=Total of subproducts buying prices
-TotalSellingPriceMinShort=Total of subproducts selling prices
-SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=Add buying price
-ChangeSupplierPrice=Change buying price
+BuyingPriceMin=最高の購入価格
+BuyingPriceMinShort=最高の購入価格
+TotalBuyingPriceMinShort=サブ製品の購入価格の合計
+TotalSellingPriceMinShort=サブ製品の販売価格の合計
+SomeSubProductHaveNoPrices=一部のサブ製品には価格が定義されていない
+AddSupplierPrice=購入価格を追加
+ChangeSupplierPrice=購入価格の変更
 SupplierPrices=仕入先価格
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
-NoRecordedSuppliers=No vendor recorded
-SupplierPayment=ベンダーの支払
-SuppliersArea=Vendor area
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=この仕入先リファレンスは、すでに製品に関連付けられています：%s
+NoRecordedSuppliers=仕入先は記録されていない
+SupplierPayment=仕入先の支払
+SuppliersArea=仕入先エリア
 RefSupplierShort=仕入先参照符号
 Availability=可用性
-ExportDataset_fournisseur_1=Vendor invoices and invoice details
-ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order details
+ExportDataset_fournisseur_1=仕入先の請求書と請求書の詳細
+ExportDataset_fournisseur_2=仕入先の請求書と支払い
+ExportDataset_fournisseur_3=注文書と注文の詳細
 ApproveThisOrder=この注文を承認
-ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
-DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
-ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Create Purchase Order
-AddSupplierInvoice=Create vendor invoice
-ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
-SentToSuppliers=Sent to vendors
-ListOfSupplierOrders=List of purchase orders
-MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Delivery delay (days)
-DescNbDaysToDelivery=The longest delivery delay of the products from this order
-SupplierReputation=Vendor reputation
-ReferenceReputation=Reference reputation
-DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Low quality
-ReputationForThisProduct=Reputation
-BuyerName=Buyer name
-AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All references of vendor
+ConfirmApproveThisOrder=注文<b>%s </b>を承認してもよいか？
+DenyingThisOrder=この注文を拒否する
+ConfirmDenyingThisOrder=この注文を拒否してもよいか<b>%s </b>？
+ConfirmCancelThisOrder=この注文をキャンセルしてもよいか<b>%s </b>？
+AddSupplierOrder=注文書を作成する
+AddSupplierInvoice=仕入先の請求書を作成する
+ListOfSupplierProductForSupplier=仕入先の製品と価格のリスト<b>%s </b>
+SentToSuppliers=仕入先に送信
+ListOfSupplierOrders=注文書のリスト
+MenuOrdersSupplierToBill=請求書への注文書
+NbDaysToDelivery=配達遅延（日）
+DescNbDaysToDelivery=この注文からの製品の最長配達遅延
+SupplierReputation=仕入先の評判
+ReferenceReputation=参照の評判
+DoNotOrderThisProductToThisSupplier=注文しないこと
+NotTheGoodQualitySupplier=低品質
+ReputationForThisProduct=評判
+BuyerName=バイヤー名
+AllProductServicePrices=すべての製品/サービスの価格
+AllProductReferencesOfSupplier=仕入先のすべての参照
 BuyingPriceNumShort=仕入先価格
diff --git a/htdocs/langs/ja_JP/ticket.lang b/htdocs/langs/ja_JP/ticket.lang
index 8fdb14dc6e0..e11a4681c98 100644
--- a/htdocs/langs/ja_JP/ticket.lang
+++ b/htdocs/langs/ja_JP/ticket.lang
@@ -58,7 +58,6 @@ OriginEmail=メールソース
 Notify_TICKET_SENTBYMAIL=メールでチケットメッセージを送信する
 
 # Status
-NotRead=読んでいない
 Read=読む
 Assigned=割り当て済み
 InProgress=進行中
@@ -124,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=パブリックインターフェイスによ
 TicketsAutoAssignTicket=チケットを作成したユーザーを自動的に割り当てる
 TicketsAutoAssignTicketHelp=チケットを作成するときに、ユーザーを自動的にチケットに割り当てることができる。
 TicketNumberingModules=チケット番号付けモジュール
+TicketsModelModule=チケットのドキュメントテンプレート
 TicketNotifyTiersAtCreation=作成時にサードパーティに通知する
 TicketsDisableCustomerEmail=パブリックインターフェイスからチケットを作成するときは、常にメールを無効にすること
 TicketsPublicNotificationNewMessage=新規メッセージが追加されたときにメール(s)を送信する
@@ -231,7 +231,6 @@ TicketLogStatusChanged=ステータスが変更された：%sから%s
 TicketNotNotifyTiersAtCreate=作成時に法人に通知しない
 Unread=未読
 TicketNotCreatedFromPublicInterface=利用不可。チケットはパブリックインターフェイスから作成されなかった。
-PublicInterfaceNotEnabled=パブリックインターフェイスが有効になっていない
 ErrorTicketRefRequired=チケット参照名が必要
 
 #
diff --git a/htdocs/langs/ja_JP/trips.lang b/htdocs/langs/ja_JP/trips.lang
index 9ec51fa3ea2..ea9d799b1d4 100644
--- a/htdocs/langs/ja_JP/trips.lang
+++ b/htdocs/langs/ja_JP/trips.lang
@@ -1,151 +1,151 @@
 # Dolibarr language file - Source file is en_US - trips
-ShowExpenseReport=Show expense report
-Trips=Expense reports
-TripsAndExpenses=Expenses reports
-TripsAndExpensesStatistics=Expense reports statistics
-TripCard=Expense report card
-AddTrip=Create expense report
-ListOfTrips=List of expense reports
+ShowExpenseReport=経費報告書を表示する
+Trips=経費報告書
+TripsAndExpenses=経費報告書
+TripsAndExpensesStatistics=経費報告書の統計
+TripCard=経費通知表
+AddTrip=経費報告書を作成する
+ListOfTrips=経費報告書のリスト
 ListOfFees=手数料のリスト
-TypeFees=Types of fees
-ShowTrip=Show expense report
-NewTrip=New expense report
-LastExpenseReports=Latest %s expense reports
-AllExpenseReports=All expense reports
-CompanyVisited=Company/organization visited
-FeesKilometersOrAmout=量またはキロ
-DeleteTrip=Delete expense report
-ConfirmDeleteTrip=Are you sure you want to delete this expense report?
-ListTripsAndExpenses=List of expense reports
-ListToApprove=Waiting for approval
-ExpensesArea=Expense reports area
-ClassifyRefunded=Classify 'Refunded'
-ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
-ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
-ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
-ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
-ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
-ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
-TripId=Id expense report
-AnyOtherInThisListCanValidate=Person to inform for validation.
-TripSociete=Information company
-TripNDF=Informations expense report
-PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
-ExpenseReportLine=Expense report line
+TypeFees=料金の種類
+ShowTrip=経費報告書を表示する
+NewTrip=新規経費報告書
+LastExpenseReports=最新の%s経費報告書
+AllExpenseReports=すべての経費報告書
+CompanyVisited=訪問した法人/組織
+FeesKilometersOrAmout=金額またはキロメートル
+DeleteTrip=経費報告書を削除する
+ConfirmDeleteTrip=この経費報告書を削除してもよいか？
+ListTripsAndExpenses=経費報告書のリスト
+ListToApprove=承認待ち
+ExpensesArea=経費報告エリア
+ClassifyRefunded=分類「返金済み」
+ExpenseReportWaitingForApproval=新規経費報告書が承認のために提出された
+ExpenseReportWaitingForApprovalMessage=新規経費報告書が提出され、承認を待っている。 <br>-ユーザ：%s <br>-期間：%s <br>検証するにはここをクリック：%s
+ExpenseReportWaitingForReApproval=再承認のために経費報告書が提出された
+ExpenseReportWaitingForReApprovalMessage=経費報告書が提出され、再承認を待っている。 <br> %s、この理由で経費報告書の承認を拒否した：%s。 <br>新規バージョンが提案され、承認を待っている。 <br>-ユーザ：%s <br>-期間：%s <br>検証するにはここをクリック：%s
+ExpenseReportApproved=経費報告書が承認された
+ExpenseReportApprovedMessage=経費報告書%sが承認された。 <br>-ユーザ：%s <br>-承認者：%s <br>ここをクリックして経費報告書を表示する：%s
+ExpenseReportRefused=経費報告書は拒否された
+ExpenseReportRefusedMessage=経費報告書%sは拒否された。 <br>-ユーザ：%s <br>-拒否者：%s <br>-拒否の動機：%s <br>ここをクリックして経費報告書:%s を表示
+ExpenseReportCanceled=経費報告がキャンセルされた
+ExpenseReportCanceledMessage=経費報告書%sはキャンセルされた。 <br>-ユーザ：%s <br>-キャンセル者：%s <br>-キャンセルの動機：%s <br>ここをクリックして経費報告書: %s を表示
+ExpenseReportPaid=経費報告書が支払われた
+ExpenseReportPaidMessage=経費報告書%sが支払われた。 <br>-ユーザ：%s <br>-支払い者：%s <br>ここをクリックして経費報告書を表示する：%s
+TripId=ID経費レポート
+AnyOtherInThisListCanValidate=検証のために通知する人。
+TripSociete=情報法人
+TripNDF=情報経費報告書
+PDFStandardExpenseReports=経費報告書のPDFドキュメントを生成するための標準テンプレート
+ExpenseReportLine=経費報告行
 TF_OTHER=その他
-TF_TRIP=Transportation
+TF_TRIP=交通
 TF_LUNCH=ランチ
-TF_METRO=Metro
-TF_TRAIN=Train
-TF_BUS=Bus
+TF_METRO=メトロ
+TF_TRAIN=列車
+TF_BUS=バス
 TF_CAR=自動車
-TF_PEAGE=Toll
-TF_ESSENCE=Fuel
-TF_HOTEL=Hotel
-TF_TAXI=Taxi
-EX_KME=Mileage costs
-EX_FUE=Fuel CV
-EX_HOT=Hotel
-EX_PAR=Parking CV
-EX_TOL=Toll CV
-EX_TAX=Various Taxes
-EX_IND=Indemnity transportation subscription
-EX_SUM=Maintenance supply
-EX_SUO=Office supplies
-EX_CAR=Car rental
-EX_DOC=Documentation
-EX_CUR=Customers receiving
-EX_OTR=Other receiving
-EX_POS=Postage
-EX_CAM=CV maintenance and repair
-EX_EMM=Employees meal
-EX_GUM=Guests meal
-EX_BRE=Breakfast
-EX_FUE_VP=Fuel PV
-EX_TOL_VP=Toll PV
-EX_PAR_VP=Parking PV
-EX_CAM_VP=PV maintenance and repair
-DefaultCategoryCar=Default transportation mode
-DefaultRangeNumber=Default range number
-UploadANewFileNow=Upload a new document now
-Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
-ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-AucuneLigne=There is no expense report declared yet
-ModePaiement=Payment mode
-VALIDATOR=User responsible for approval
-VALIDOR=Approved by
-AUTHOR=Recorded by
-AUTHORPAIEMENT=Paid by
-REFUSEUR=Denied by
-CANCEL_USER=Deleted by
+TF_PEAGE=通行料金
+TF_ESSENCE=燃料
+TF_HOTEL=ホテル
+TF_TAXI=タクシー
+EX_KME=マイレージ費用
+EX_FUE=燃料CV
+EX_HOT=ホテル
+EX_PAR=駐車場履歴書
+EX_TOL=料金履歴書
+EX_TAX=さまざまな税金
+EX_IND=補償輸送サブスクリプション
+EX_SUM=メンテナンス用品
+EX_SUO=事務用品
+EX_CAR=レンタカー
+EX_DOC=ドキュメンテーション
+EX_CUR=受け取っている顧客
+EX_OTR=その他の受け取り
+EX_POS=送料
+EX_CAM=CVのメンテナンスと修理
+EX_EMM=従業員の食事
+EX_GUM=ゲストの食事
+EX_BRE=朝食
+EX_FUE_VP=燃料PV
+EX_TOL_VP=有料PV
+EX_PAR_VP=駐車場PV
+EX_CAM_VP=PVのメンテナンスと修理
+DefaultCategoryCar=デフォルトの輸送モード
+DefaultRangeNumber=デフォルトの範囲番号
+UploadANewFileNow=今すぐ新規ドキュメントをアップロードする
+Error_EXPENSEREPORT_ADDON_NotDefined=エラー、経費報告書の番号付け参照のルールがモジュール「経費報告書」の設定に定義されていなかった
+ErrorDoubleDeclaration=同様の日付範囲で別の経費報告書を宣言した。
+AucuneLigne=経費報告書はまだ宣言されていない
+ModePaiement=支払いモード
+VALIDATOR=承認を担当するユーザ
+VALIDOR=によって承認された
+AUTHOR=によって記録された
+AUTHORPAIEMENT=によって支払われた
+REFUSEUR=によって拒否された
+CANCEL_USER=によって削除された
 MOTIF_REFUS=理由
 MOTIF_CANCEL=理由
-DATE_REFUS=Deny date
+DATE_REFUS=拒否日
 DATE_SAVE=検証日
-DATE_CANCEL=Cancelation date
+DATE_CANCEL=キャンセル日
 DATE_PAIEMENT=支払期日
 BROUILLONNER=再開 
-ExpenseReportRef=Ref. expense report
-ValidateAndSubmit=Validate and submit for approval
-ValidatedWaitingApproval=Validated (waiting for approval)
-NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
-ConfirmRefuseTrip=Are you sure you want to deny this expense report?
-ValideTrip=Approve expense report
-ConfirmValideTrip=Are you sure you want to approve this expense report?
-PaidTrip=Pay an expense report
-ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid"?
-ConfirmCancelTrip=Are you sure you want to cancel this expense report?
-BrouillonnerTrip=Move back expense report to status "Draft"
-ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft"?
-SaveTrip=Validate expense report
-ConfirmSaveTrip=Are you sure you want to validate this expense report?
-NoTripsToExportCSV=No expense report to export for this period.
-ExpenseReportPayment=Expense report payment
-ExpenseReportsToApprove=Expense reports to approve
-ExpenseReportsToPay=Expense reports to pay
-ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
-ExpenseReportsIk=Configuration of mileage charges
-ExpenseReportsRules=Expense report rules
-ExpenseReportIkDesc=You can modify the calculation of kilometers expense by category and range who they are previously defined. <b>d</b> is the distance in kilometers
-ExpenseReportRulesDesc=You can create or update any rules of calculation. This part will be used when user will create a new expense report
+ExpenseReportRef=参照。経費報告書
+ValidateAndSubmit=検証して承認のために送信
+ValidatedWaitingApproval=検証済み（承認待ち）
+NOT_AUTHOR=あなたはこの経費報告書の作成者ではない。操作はキャンセルされた。
+ConfirmRefuseTrip=この経費報告書を拒否してもよいか？
+ValideTrip=経費報告書を承認する
+ConfirmValideTrip=この経費報告書を承認してもよいか？
+PaidTrip=経費報告書を支払う
+ConfirmPaidTrip=この経費報告書のステータスを「支払い済み」に変更してもよいか？
+ConfirmCancelTrip=この経費報告書をキャンセルしてもよいか？
+BrouillonnerTrip=経費報告書をステータス「ドラフト」に戻する
+ConfirmBrouillonnerTrip=この経費報告書をステータス「ドラフト」に移動してもよいか？
+SaveTrip=経費報告書を検証する
+ConfirmSaveTrip=この経費報告書を検証してもよいか？
+NoTripsToExportCSV=この期間にエクスポートする経費報告書はない。
+ExpenseReportPayment=経費報告書の支払い
+ExpenseReportsToApprove=承認する経費報告書
+ExpenseReportsToPay=支払うべき経費報告書
+ConfirmCloneExpenseReport=この経費報告書のクローンを作成してもよいか？
+ExpenseReportsIk=マイレージ料金の設定
+ExpenseReportsRules=経費報告規則
+ExpenseReportIkDesc=以前に定義したカテゴリと範囲ごとに、キロメートル費用の計算を変更できます。 <b> d </b>はキロメートル単位の距離です
+ExpenseReportRulesDesc=任意の計算ルールを作成または更新できます。この部分は、ユーザが新規経費報告書を作成するときに使用される
 expenseReportOffset=オフセット
-expenseReportCoef=Coefficient
-expenseReportTotalForFive=Example with <u>d</u> = 5
-expenseReportRangeFromTo=from %d to %d
-expenseReportRangeMoreThan=more than %d
-expenseReportCoefUndefined=(value not defined)
-expenseReportCatDisabled=Category disabled - see the c_exp_tax_cat dictionary
-expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay
-expenseReportPrintExample=offset + (d x coef) = %s
-ExpenseReportApplyTo=Apply to
-ExpenseReportDomain=Domain to apply
-ExpenseReportLimitOn=Limit on
+expenseReportCoef=係数
+expenseReportTotalForFive=<u> d </u> = 5の例
+expenseReportRangeFromTo=%dから%dへ
+expenseReportRangeMoreThan=%d以上
+expenseReportCoefUndefined=（値は定義されていない）
+expenseReportCatDisabled=カテゴリが無効-c_exp_tax_cat辞書を参照
+expenseReportRangeDisabled=範囲が無効になっている-c_exp_tax_range辞書を参照すること
+expenseReportPrintExample=オフセット+（d x coef）= %s
+ExpenseReportApplyTo=に適用する
+ExpenseReportDomain=適用するドメイン
+ExpenseReportLimitOn=制限
 ExpenseReportDateStart=開始日
 ExpenseReportDateEnd=日付の末尾
-ExpenseReportLimitAmount=Limite amount
-ExpenseReportRestrictive=Restrictive
-AllExpenseReport=All type of expense report
-OnExpense=Expense line
-ExpenseReportRuleSave=Expense report rule saved
-ExpenseReportRuleErrorOnSave=Error: %s
-RangeNum=Range %d
-ExpenseReportConstraintViolationError=Constraint violation id [%s]: %s  is superior to %s %s
-byEX_DAY=by day (limitation to %s)
-byEX_MON=by month (limitation to %s)
-byEX_YEA=by year (limitation to %s)
-byEX_EXP=by line (limitation to %s)
-ExpenseReportConstraintViolationWarning=Constraint violation id [%s]: %s  is superior to %s %s
-nolimitbyEX_DAY=by day (no limitation)
-nolimitbyEX_MON=by month (no limitation)
-nolimitbyEX_YEA=by year (no limitation)
-nolimitbyEX_EXP=by line (no limitation)
-CarCategory=Vehicle category
-ExpenseRangeOffset=Offset amount: %s
-RangeIk=Mileage range
-AttachTheNewLineToTheDocument=Attach the line to an uploaded document
+ExpenseReportLimitAmount=制限量
+ExpenseReportRestrictive=制限的
+AllExpenseReport=あらゆる種類の経費報告書
+OnExpense=経費ライン
+ExpenseReportRuleSave=経費報告ルールが保存された
+ExpenseReportRuleErrorOnSave=エラー：%s
+RangeNum=範囲%d
+ExpenseReportConstraintViolationError=制約違反ID [%s]：%sは%s%sよりも優れている
+byEX_DAY=日ごと（%sへの制限）
+byEX_MON=月ごと（%sへの制限）
+byEX_YEA=年ごと（%sへの制限）
+byEX_EXP=行ごと（%sへの制限）
+ExpenseReportConstraintViolationWarning=制約違反ID [%s]：%sは%s%sよりも優れている
+nolimitbyEX_DAY=日ごと（制限なし）
+nolimitbyEX_MON=月ごと（制限なし）
+nolimitbyEX_YEA=年ごと（制限なし）
+nolimitbyEX_EXP=行ごと（制限なし）
+CarCategory=車両カテゴリー
+ExpenseRangeOffset=オフセット量：%s
+RangeIk=走行距離範囲
+AttachTheNewLineToTheDocument=アップロードされたドキュメントに行を添付する
diff --git a/htdocs/langs/ja_JP/website.lang b/htdocs/langs/ja_JP/website.lang
index 2553493c60a..c8b7b24b73c 100644
--- a/htdocs/langs/ja_JP/website.lang
+++ b/htdocs/langs/ja_JP/website.lang
@@ -30,7 +30,6 @@ EditInLine=インライン編集
 AddWebsite=ウェブサイトを追加
 Webpage=Webページ/コンテナ
 AddPage=ページ/コンテナを追加
-HomePage=ホームページ
 PageContainer=ページ
 PreviewOfSiteNotYetAvailable=あなたのウェブサイトのプレビュー<strong>%s</strong>はまだ利用できません。最初に「<strong>完全なWebサイトテンプレート</strong>」をインポートするか、「<strong>ページ/コンテナ</strong>」を追加する必要がある。
 RequestedPageHasNoContentYet=ID %sの要求されたページにまだコンテンツがないか、キャッシュファイル.tpl.phpが削除された。これを解決するには、ページのコンテンツを編集すること。
@@ -38,8 +37,8 @@ SiteDeleted=Webサイト '%s'が削除された
 PageContent=ページ/コンテネア
 PageDeleted=ウェブサイト%sのページ/ Contenair'%s 'が削除された
 PageAdded=ページ/ Contenair'%s 'が追加された
-ViewSiteInNewTab=新しいタブでサイトを表示
-ViewPageInNewTab=新しいタブでページを表示
+ViewSiteInNewTab=新規タブでサイトを表示
+ViewPageInNewTab=新規タブでページを表示
 SetAsHomePage=ホームページに設定する
 RealURL=実際のURL
 ViewWebsiteInProduction=ホームURLを使用してWebサイトを表示する
@@ -51,11 +50,11 @@ CheckVirtualHostPerms=また、仮想ホストが<br> <strong> %s</strong>への
 ReadPerm=読む
 WritePerm=書く
 TestDeployOnWeb=Webでのテスト/デプロイ
-PreviewSiteServedByWebServer=<u>新しいタブで %s をプレビュー。</u><br><br>  %s は、外部Webサーバ (Apache, Nginx, IIS など) から提供される。 以下のディレクトリを指定するには、当該サーバをインストールして設定する必要あり:<br><strong>%s</strong><br>URL は外部サーバ:<br><strong>%s</strong> による
-PreviewSiteServedByDolibarr= <u>新しいタブで%sをプレビューする。 </u> <br> <br> %sはDolibarrサーバーによって提供されるため、追加のWebサーバー（Apache、Nginx、IISなど）をインストールする必要はない。 <br>不便なのは、ページのURLがユーザーフレンドリーではなく、Dolibarrのパスで始まること。 URL <br> Dolibarrによって提供：<br> <strong> %s </strong> <br> <br>ディレクトリ<br> <strong> %s </strong> <br>上のポイントは、この仮想サーバーの名前を入力するWebサーバー上の仮想ホストを作成し、このウェブサイトを提供するために、独自の外部Webサーバーを使用するには他のプレビューボタンをクリックする。
+PreviewSiteServedByWebServer=<u>新規タブで %s をプレビュー。</u><br><br>  %s は、外部Webサーバ (Apache, Nginx, IIS など) から提供される。 以下のディレクトリを指定するには、当該サーバをインストールして設定する必要あり:<br><strong>%s</strong><br>URL は外部サーバ:<br><strong>%s</strong> による
+PreviewSiteServedByDolibarr= <u>新規タブで%sをプレビューする。 </u> <br> <br> %sはDolibarrサーバーによって提供されるため、追加のWebサーバー（Apache、Nginx、IISなど）をインストールする必要はない。 <br>不便なのは、ページのURLがユーザーフレンドリーではなく、Dolibarrのパスで始まること。 URL <br> Dolibarrによって提供：<br> <strong> %s </strong> <br> <br>ディレクトリ<br> <strong> %s </strong> <br>上のポイントは、この仮想サーバーの名前を入力するWebサーバー上の仮想ホストを作成し、このウェブサイトを提供するために、独自の外部Webサーバーを使用するには他のプレビューボタンをクリックする。
 VirtualHostUrlNotDefined=外部Webサーバーによって提供される仮想ホストのURLが定義されていない
 NoPageYet=まだページはない
-YouCanCreatePageOrImportTemplate=新しいページを作成するか、完全なWebサイトテンプレートをインポートできる
+YouCanCreatePageOrImportTemplate=新規ページを作成するか、完全なWebサイトテンプレートをインポートできる
 SyntaxHelp=特定の構文のヒントに関するヘルプ
 YouCanEditHtmlSourceckeditor=エディタの "ソース" ボタンを使用して、HTMLソースコードを編集できる。
 YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> タグ <strong>&lt;?php ?&gt;</strong> を使用して、当該ソースにPHPコードを含めることができる。次のグローバル変数が使用できる: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> 以下の構文を使用して、別のページ/コンテナーのコンテンツを含めることもできる:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> 以下の構文で別のページ/コンテナへのリダイレクトを行うことができる（注：リダイレクト前には、いかなるコンテンツも出力しないこと） :<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> 別のページへのリンクを追加するには、以下の構文:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> 含めるのが <strong>ダウンロードリンク</strong> で、ファイル保管場所が <strong>documents</strong> ディレクトリなら、使うのは <strong>document.php</strong> ラッパー:<br>例、ファイルを documents/ecm (ログ記録が必須) に置くなら、構文は:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>ファイルを documents/medias (パブリックアクセス用のオープンディレクトリ) に置くなら、構文は:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>ファイルを共有リンク (ファイルの共有ハッシュキーを使用したオープンアクセス) で共有するなら、構文は:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> 含めるのが <strong>画像</strong> で、保管先が <strong>documents</strong> ディレクトリなら、使うのは <strong>viewimage.php</strong> ラッパー:<br>例、画像を documents/medias (パブリックアクセス用のオープンディレクトリ) に置くなら、構文は:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
@@ -65,9 +64,9 @@ YouCanEditHtmlSourceMore=<br>HTMLまたは動的コードのその他の例は
 ClonePage=クローンページ/コンテナ
 CloneSite=クローンサイト
 SiteAdded=ウェブサイトを追加
-ConfirmClonePage=新しいページのコード/エイリアスを入力し、それが複製されたページの翻訳であるかどうかを入力すること。
-PageIsANewTranslation=新しいページは現在のページの翻訳ですか？
-LanguageMustNotBeSameThanClonedPage=ページを翻訳として複製する。新しいページの言語は、ソースページの言語とは異なっている必要がある。
+ConfirmClonePage=新規ページのコード/エイリアスを入力し、それが複製されたページの翻訳であるかどうかを入力すること。
+PageIsANewTranslation=新規ページは現在のページの翻訳ですか？
+LanguageMustNotBeSameThanClonedPage=ページを翻訳として複製する。新規ページの言語は、ソースページの言語とは異なっている必要がある。
 ParentPageId=親ページID
 WebsiteId=ウェブサイトID
 CreateByFetchingExternalPage=外部URLからページをフェッチしてページ/コンテナを作成する...
@@ -89,7 +88,7 @@ SorryWebsiteIsCurrentlyOffLine=申し訳ないが、このウェブサイトは
 WEBSITE_USE_WEBSITE_ACCOUNTS=Webサイトのアカウントテーブルを有効にする
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=テーブルを有効にして、各Webサイト/サードパーティのWebサイトアカウント（ログイン/パス）を保存する
 YouMustDefineTheHomePage=最初にデフォルトのホームページを定義する必要がある
-OnlyEditionOfSourceForGrabbedContentFuture=警告：外部WebページをインポートしてWebページを作成することは、経験豊富なユーザーのために予約されています。ソースページの複雑さによっては、インポートの結果が元のページと異なる場合がある。また、ソースページが一般的なCSSスタイルまたは競合するJavaScriptを使用している場合、このページで作業するときにWebサイトエディターの外観や機能が損なわれる可能性がある。この方法はページを作成するためのより迅速な方法ですが、最初から、または提案されたページテンプレートから新しいページを作成することをお勧めする。 <br>取得した外部ページで使用すると、インラインエディタが正しく機能しない場合があることにも注意すること。
+OnlyEditionOfSourceForGrabbedContentFuture=警告：外部WebページをインポートしてWebページを作成することは、経験豊富なユーザーのために予約されています。ソースページの複雑さによっては、インポートの結果が元のページと異なる場合がある。また、ソースページが一般的なCSSスタイルまたは競合するJavaScriptを使用している場合、このページで作業するときにWebサイトエディターの外観や機能が損なわれる可能性がある。この方法はページを作成するためのより迅速な方法ですが、最初から、または提案されたページテンプレートから新規ページを作成することをお勧めする。 <br>取得した外部ページで使用すると、インラインエディタが正しく機能しない場合があることにも注意すること。
 OnlyEditionOfSourceForGrabbedContent=コンテンツが外部サイトから取得された場合は、HTMLソースのエディションのみが可能。
 GrabImagesInto=cssとページにある画像も取得する。
 ImagesShouldBeSavedInto=画像はディレクトリに保存する必要がある
@@ -101,7 +100,7 @@ EmptyPage=空のページ
 ExternalURLMustStartWithHttp=外部URLは http:// または https:// で始まる必要がある
 ZipOfWebsitePackageToImport=ウェブサイトテンプレートパッケージのZipファイルをアップロードする
 ZipOfWebsitePackageToLoad=または利用可能な埋め込みWebサイトテンプレートパッケージを選択する
-ShowSubcontainers=動的コンテンツを含める
+ShowSubcontainers=動的コンテンツを表示する
 InternalURLOfPage=ページの内部URL
 ThisPageIsTranslationOf=このページ/コンテナはの翻訳です
 ThisPageHasTranslationPages=このページ/コンテナには翻訳がある
@@ -114,7 +113,7 @@ DeleteAlsoJs=このウェブサイトに固有のすべてのJavaScriptファイ
 DeleteAlsoMedias=このウェブサイトに固有のすべてのメディアファイルも削除するか？
 MyWebsitePages=私のウェブサイトのページ
 SearchReplaceInto=検索|に置き換える
-ReplaceString=新しい文字列
+ReplaceString=新規文字列
 CSSContentTooltipHelp=ここにCSSコンテンツを入力する。アプリケーションのCSSとの競合を避けるために、すべての定義に .bodywebsite クラスを前置することが必須。例:<br><br>#mycssselector, input.myclass:hover { ... }<br>は、以下のようにする。<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>注記: もし大きなファイルでこの前置が無いものがあれば、 'lessc' を使用して .bodywebsite の前置をすべての場所に追加する変換ができる。
 LinkAndScriptsHereAreNotLoadedInEditor=警告：このコンテンツは、サーバーからサイトにアクセスした場合にのみ出力される。編集モードでは使用されないため、編集モードでもJavaScriptファイルをロードする必要がある場合は、タグ「scriptsrc = ...」をページに追加するだけ。
 Dynamiccontent=動的コンテンツを含むページのサンプル
@@ -136,4 +135,5 @@ RSSFeed=RSSフィード
 RSSFeedDesc=このURLを使用して、タイプ「blogpost」の最新記事のRSSフィードを取得できる。
 PagesRegenerated=%sページ(s)/コンテナ(s)が再生成された
 RegenerateWebsiteContent=Webサイトのキャッシュファイルを再生成する
-AllowedInFrames=Allowed in Frames
+AllowedInFrames=フレームで許可
+DefineListOfAltLanguagesInWebsiteProperties=使用可能なすべての言語のリストをWebサイトのプロパティに定義する。
diff --git a/htdocs/langs/ja_JP/withdrawals.lang b/htdocs/langs/ja_JP/withdrawals.lang
index a4f6da68897..915407bb2eb 100644
--- a/htdocs/langs/ja_JP/withdrawals.lang
+++ b/htdocs/langs/ja_JP/withdrawals.lang
@@ -1,148 +1,151 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Payments by Direct debit orders
-SuppliersStandingOrdersArea=Payments by Credit transfer
-StandingOrdersPayment=Direct debit payment orders
-StandingOrderPayment=Direct debit payment order
-NewStandingOrder=New direct debit order
-NewPaymentByBankTransfer=New payment by credit transfer
+CustomersStandingOrdersArea=口座振替による支払
+SuppliersStandingOrdersArea=クレジット振込による支払
+StandingOrdersPayment=口座振替の支払注文
+StandingOrderPayment=口座振替の支払注文
+NewStandingOrder=新規口座振替の注文
+NewPaymentByBankTransfer=クレジット振込による新規支払
 StandingOrderToProcess=処理するには
-PaymentByBankTransferReceipts=Credit transfer orders
-PaymentByBankTransferLines=Credit transfer order lines
-WithdrawalsReceipts=Direct debit orders
-WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer orders
-BankTransferReceipt=Credit transfer order
-LatestBankTransferReceipts=Latest %s credit transfer orders
-LastWithdrawalReceipts=Latest %s direct debit files
-WithdrawalsLine=Direct debit order line
-CreditTransferLine=Credit transfer line
-WithdrawalsLines=Direct debit order lines
-CreditTransferLines=Credit transfer lines
-RequestStandingOrderToTreat=Requests for direct debit payment order to process
-RequestStandingOrderTreated=Requests for direct debit payment order processed
-RequestPaymentsByBankTransferToTreat=Requests for credit transfer to process
-RequestPaymentsByBankTransferTreated=Requests for credit transfer processed
-NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=No. of qualified customer invoices with waiting direct debit order
-NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
-NbOfInvoiceToPayByBankTransfer=No. of qualified supplier invoices waiting for a payment by credit transfer
-SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by credit transfer
-InvoiceWaitingWithdraw=Invoice waiting for direct debit
-InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
-AmountToWithdraw=撤回する金額
-NoInvoiceToWithdraw=No invoice open for '%s' is waiting. Go on tab '%s' on invoice card to make a request.
-NoSupplierInvoiceToWithdraw=No supplier invoice with open 'Direct credit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=User Responsible
-WithdrawalsSetup=Direct debit payment setup
-CreditTransferSetup=Credit transfer setup
-WithdrawStatistics=Direct debit payment statistics
-CreditTransferStatistics=Credit transfer statistics
+PaymentByBankTransferReceipts=クレジット転送注文
+PaymentByBankTransferLines=クレジット転送オーダーライン
+WithdrawalsReceipts=口座振替の注文
+WithdrawalReceipt=口座振替の注文
+BankTransferReceipts=クレジット転送注文
+BankTransferReceipt=クレジット転送注文
+LatestBankTransferReceipts=最新の%sクレジット転送注文
+LastWithdrawalReceipts=最新の%s口座振替ファイル
+WithdrawalsLine=口座振替注文ライン
+CreditTransferLine=クレジット転送ライン
+WithdrawalsLines=口座振替注文明細
+CreditTransferLines=クレジット転送ライン
+RequestStandingOrderToTreat=処理する口座振替の注文のリクエスト
+RequestStandingOrderTreated=口座振替の支払注文のリクエストが処理された
+RequestPaymentsByBankTransferToTreat=処理するクレジット転送のリクエスト
+RequestPaymentsByBankTransferTreated=処理されたクレジット転送のリクエスト
+NotPossibleForThisStatusOfWithdrawReceiptORLine=まだ不可能。特定の行で拒否を宣言する前に、撤回ステータスを「クレジット済み」に設定する必要がある。
+NbOfInvoiceToWithdraw=口座振替の注文を待っている適格な顧客の請求書の数
+NbOfInvoiceToWithdrawWithInfo=銀行口座情報が定義された口座振替の注文を含む顧客の請求書の数
+NbOfInvoiceToPayByBankTransfer=クレジット振込による支払を待っている適格なサプライヤー請求書の数
+SupplierInvoiceWaitingWithdraw=クレジット振込による支払を待っている仕入先の請求書
+InvoiceWaitingWithdraw=口座振替を待っている請求書
+InvoiceWaitingPaymentByBankTransfer=クレジット転送を待っている請求書
+AmountToWithdraw=引落とす金額
+NoInvoiceToWithdraw='%s'の未処理の請求書は待機していない。請求書カードのタブ「%s」に移動して、リクエストを行う。
+NoSupplierInvoiceToWithdraw=「直接クレジットリクエスト」が開いているサプライヤの請求書は待機していない。請求書カードのタブ「%s」に移動して、リクエストを行う。
+ResponsibleUser=ユーザ責任
+WithdrawalsSetup=口座振替の設定
+CreditTransferSetup=クレジット転送の設定
+WithdrawStatistics=口座振替の支払統計
+CreditTransferStatistics=クレジット転送統計
 Rejects=拒否する
-LastWithdrawalReceipt=Latest %s direct debit receipts
-MakeWithdrawRequest=Make a direct debit payment request
-MakeBankTransferOrder=Make a credit transfer request
-WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Third-party bank code
-NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
+LastWithdrawalReceipt=最新の%s口座振替の領収書
+MakeWithdrawRequest=口座振替の支払リクエストを行う
+MakeBankTransferOrder=クレジット振込をリクエストする
+WithdrawRequestsDone=%s口座振替の支払要求が記録された
+BankTransferRequestsDone=%sクレジット転送リクエストが記録済
+ThirdPartyBankCode=サードパーティの銀行コード
+NoInvoiceCouldBeWithdrawed=正常に引き落とされた請求書はない。請求書が有効なIBANを持つ会社のものであり、IBANにモード<strong> %s </strong>のUMR（一意の委任参照）があることを確認すること。
 ClassCredited=入金分類
-ClassCreditedConfirm=あなたの銀行口座に入金、この撤退の領収書を分類してもよろしいですか？
+ClassCreditedConfirm=あなたの銀行口座に入金、この引落しの領収書を分類してもよいか？
 TransData=日付伝送
 TransMetod=方式伝送
 Send=送信
 Lines=行
 StandingOrderReject=拒否を発行
-WithdrawsRefused=Direct debit refused
-WithdrawalRefused=撤退は拒否されました
-CreditTransfersRefused=Credit transfers refused
-WithdrawalRefusedConfirm=あなたは社会のために撤退拒否を入力してもよろしいです
+WithdrawsRefused=口座振替は拒否された
+WithdrawalRefused=引落しは拒否された
+CreditTransfersRefused=クレジット転送が拒否された
+WithdrawalRefusedConfirm=協会に対する引落し拒否を入力してもよいか
 RefusedData=拒絶反応の日付
 RefusedReason=拒否理由
 RefusedInvoicing=拒絶反応を請求
-NoInvoiceRefused=拒絶反応を充電しないでください
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
-StatusDebitCredit=Status debit/credit
+NoInvoiceRefused=拒絶反応を充電しないこと
+InvoiceRefused=請求書が拒否された（拒否を顧客に請求する）
+StatusDebitCredit=ステータスの借方/貸方
 StatusWaiting=待っている
 StatusTrans=送信
-StatusDebited=Debited
+StatusDebited=借方記入
 StatusCredited=クレジット
 StatusPaid=有料
 StatusRefused=拒否
 StatusMotif0=特定されていない
 StatusMotif1=提供insuffisante
 StatusMotif2=ティラージュconteste
-StatusMotif3=No direct debit payment order
-StatusMotif4=Sales Order
+StatusMotif3=口座振替の注文はない
+StatusMotif4=販売注文
 StatusMotif5=inexploitable RIB
 StatusMotif6=バランスせずにアカウント
 StatusMotif7=裁判
 StatusMotif8=他の理由
-CreateForSepaFRST=Create direct debit file (SEPA FRST)
-CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
-CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create file for credit transfer
-CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
+CreateForSepaFRST=口座振替ファイルの作成（SEPA FRST）
+CreateForSepaRCUR=口座振替ファイルの作成（SEPA RCUR）
+CreateAll=口座振替ファイルの作成（すべて）
+CreateFileForPaymentByBankTransfer=クレジット転送用のファイルを作成する
+CreateSepaFileForPaymentByBankTransfer=クレジット転送ファイル（SEPA）の作成
 CreateGuichet=唯一のオフィス
 CreateBanque=唯一の銀行
 OrderWaiting=治療を待っている
-NotifyTransmision=Record file transmission of order
-NotifyCredit=Record credit of order
+NotifyTransmision=注文の記録ファイル送信
+NotifyCredit=注文のクレジットを記録する
 NumeroNationalEmetter=国立トランスミッタ数
 WithBankUsingRIB=RIBを使用した銀行口座
 WithBankUsingBANBIC=IBAN / BIC / SWIFTを使用した銀行口座
-BankToReceiveWithdraw=Receiving Bank Account
-BankToPayCreditTransfer=Bank Account used as source of payments
+BankToReceiveWithdraw=銀行口座の受け取り
+BankToPayCreditTransfer=支払元として使用される銀行口座
 CreditDate=クレジットで
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Show Direct Debit Order
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Debit order file
-CreditTransferFile=Credit transfer file
-SetToStatusSent=Set to status "File Sent"
-ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
-StatisticsByLineStatus=Statistics by status of lines
+WithdrawalFileNotCapable=お住まいの国の引き出しレシートファイルを生成できない%s（お住まいの国はサポートされていない）
+ShowWithdraw=口座振替の注文を表示
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=ただし、請求書にまだ処理されていない口座振替の支払注文が少なくとも1つある場合、事前の引き出し管理を可能にするために支払済みとして設定されない。
+DoStandingOrdersBeforePayments=このタブでは、口座振替の支払注文をリクエストできる。完了したら、メニューの 銀行 -> 口座振替による支払 に移動して、口座振替の注文を生成および管理する。口座振替の注文が締め切られると、請求書の支払は自動的に記録され、残りの支払がゼロの場合は請求書が締め切られる。
+DoCreditTransferBeforePayments=このタブでは、クレジット振込の注文をリクエストできる。完了したら、メニュー 銀行 -> クレジット転送による支払 に移動して、クレジット転送オーダーを生成および管理する。クレジット振込注文がクローズされると、請求書の支払が自動的に記録され、残りの支払がゼロの場合、請求書はクローズされる。
+WithdrawalFile=デビット注文ファイル
+CreditTransferFile=クレジット転送ファイル
+SetToStatusSent=ステータス「ファイル送信済み」に設定
+ThisWillAlsoAddPaymentOnInvoice=これはまた、請求書に支払を記録し、支払の残りがnullの場合、それらを「支払済み」として分類する
+StatisticsByLineStatus=回線のステータスによる統計
 RUM=UMR
-DateRUM=Mandate signature date
-RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
-WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Amount of Direct debit request:
-BankTransferAmount=Amount of Credit Transfer request:
-WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
-SepaMandate=SEPA Direct Debit Mandate
-SepaMandateShort=SEPA Mandate
-PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
-SEPALegalText=By signing this mandate form, you authorize (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
-CreditorIdentifier=Creditor Identifier
-CreditorName=Creditor Name
-SEPAFillForm=(B) Please complete all the fields marked *
-SEPAFormYourName=Your name
-SEPAFormYourBAN=Your Bank Account Name (IBAN)
-SEPAFormYourBIC=Your Bank Identifier Code (BIC)
-SEPAFrstOrRecur=Type of payment
-ModeRECUR=Recurring payment
-ModeFRST=One-off payment
-PleaseCheckOne=Please check one only
-CreditTransferOrderCreated=Credit transfer order %s created
-DirectDebitOrderCreated=Direct debit order %s created
-AmountRequested=Amount requested
+DateRUM=署名日を委任する
+RUMLong=独自のマンデートリファレンス
+RUMWillBeGenerated=空の場合、銀行口座情報が保存されると、UMR（Unique Mandate Reference）が生成される。
+WithdrawMode=口座振替モード（FRSTまたはRECUR）
+WithdrawRequestAmount=口座振替リクエストの金額：
+BankTransferAmount=クレジット送金リクエストの金額：
+WithdrawRequestErrorNilAmount=空の金額の口座振替リクエストを作成できない。
+SepaMandate=SEPA口座振替の委任
+SepaMandateShort=SEPAマンデート
+PleaseReturnMandate=この委任フォームを電子メールで%sに、または郵送でに返送すること。
+SEPALegalText=この委任フォームに署名することにより、（A）%sが銀行に口座から引き落とすように指示を送信し、（B）%sからの指示に従って銀行が口座から引き落とすように承認する。あなたの権利の一部として、あなたはあなたの銀行とのあなたの合意の条件の下であなたの銀行からの払い戻しを受ける権利がある。アカウントから引き落とされた日から8週間以内に払い戻しを請求する必要がある。上記の義務に関するあなたの権利は、あなたがあなたの銀行から入手できる残高明細で説明される。
+CreditorIdentifier=債権者識別子
+CreditorName=債権者名
+SEPAFillForm=（B）*のマークが付いているすべてのフィールドに入力すること
+SEPAFormYourName=あなたの名前
+SEPAFormYourBAN=あなたの銀行口座名（IBAN）
+SEPAFormYourBIC=銀行識別コード（BIC）
+SEPAFrstOrRecur=支払方法
+ModeRECUR=定期支払
+ModeFRST=一回限りの支払
+PleaseCheckOne=1つだけ確認すること
+CreditTransferOrderCreated=クレジット転送オーダー%sが作成された
+DirectDebitOrderCreated=口座振替注文%sが作成された
+AmountRequested=要求された金額
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
-ExecutionDate=Execution date
-CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
-END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
-USTRD="Unstructured" SEPA XML tag
-ADDDAYS=Add days to Execution Date
-NoDefaultIBANFound=No default IBAN found for this third party
+ExecutionDate=実行日
+CreateForSepa=口座振替ファイルを作成する
+ICS=口座振替の貸方識別子 CI
+ICSTransfer=銀行振込の貸方識別子 CI
+END_TO_END=「EndToEndId」SEPAXMLタグ-トランザクションごとに割り当てられた一意のID
+USTRD=「非構造化」SEPAXMLタグ
+ADDDAYS=実行日に日数を追加
+NoDefaultIBANFound=このサードパーティのデフォルトのIBANは見つからなかった
 ### Notifications
-InfoCreditSubject=Payment of direct debit payment order %s by the bank
-InfoCreditMessage=The direct debit payment order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of direct debit payment order %s to bank
-InfoTransMessage=The direct debit payment order %s has been sent to bank by %s %s.<br><br>
+InfoCreditSubject=銀行による口座振替注文%sの支払
+InfoCreditMessage=口座振替の支払注文%sは銀行によって支払われた<br>支払のデータ：%s
+InfoTransSubject=銀行への口座振替注文%sの送信
+InfoTransMessage=口座振替の支払注文%sは、%s%sによって銀行に送信された。 <br> <br>
 InfoTransData=金額：%s <br> Metode：%s <br>日付：%s
-InfoRejectSubject=Direct debit payment order refused
-InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
+InfoRejectSubject=口座振替の注文が拒否された
+InfoRejectMessage=こんにちは、<br><br>法人 %s に関連する請求書%sの口座振替の注文で、金額が%sのものは、銀行によって拒否された。 <br> <br>-<br> %s
 ModeWarning=リアルモードのオプションが設定されていない、我々は、このシミュレーションの後に停止
-ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorCompanyHasDuplicateDefaultBAN=ID %s の法人には、複数のデフォルトの銀行口座がある。どちらを使用するかを知る方法はない。
+ErrorICSmissing=銀行口座%sにICSがない
diff --git a/htdocs/langs/ja_JP/workflow.lang b/htdocs/langs/ja_JP/workflow.lang
index ab06c374860..9b005891405 100644
--- a/htdocs/langs/ja_JP/workflow.lang
+++ b/htdocs/langs/ja_JP/workflow.lang
@@ -1,23 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
-WorkflowSetup=ワークフローモジュールのセットアップ
-WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
-ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+WorkflowSetup=ワークフローモジュールの設定
+WorkflowDesc=このモジュールは、いくつかの自動アクションを提供する。デフォルトでは、ワークフローは開いている（必要な順序で実行できる）が、ここでいくつかの自動アクションをアクティブ化できる。
+ThereIsNoWorkflowToModify=アクティブ化されたモジュールで使用できるワークフローの変更はない。
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=売買契約提案書が署名された後、自動的に販売注文を作成する（新規注文は提案と同じ金額になる）
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=売買契約提案書書に署名した後、顧客の請求書を自動的に作成する（新規請求書は提案書と同じ金額になる）
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=契約が検証された後、顧客の請求書を自動的に作成する
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=受注がクローズされた後、顧客の請求書を自動的に作成する（新規請求書は注文と同じ金額になる）
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=販売注文が請求済みに設定されている場合（および注文の金額が署名されたリンクされた提案の合計金額と同じ場合）、リンクされたソース提案を請求済みとして分類する。
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=リンクされたソースプロポーザルを、顧客の請求書が検証されたときに請求済みとして分類する（また、請求書の金額が署名されたリンクされたプロポーザルの合計金額と同じである場合）
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=顧客の請求書が検証されたときに請求済みとしてリンクされたソース販売注文を分類する（請求書の金額がリンクされた注文の合計金額と同じである場合）
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=顧客の請求書が支払い済みに設定されている場合（および請求書の金額がリンクされた注文の合計金額と同じである場合）、リンクされたソース販売注文を請求済みとして分類する。
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=リンクされたソース販売注文を、出荷が検証されたときに出荷されたものとして分類する（また、すべての出荷によって出荷された数量が更新する注文と同じである場合）
 # Autoclassify purchase order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
-descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=リンクされたソースベンダーの提案を、ベンダーの請求書が検証されたときに請求済みとして分類する（また、請求書の金額がリンクされた提案の合計金額と同じである場合）。
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=ベンダーの請求書が検証されたときに請求済みとしてリンクされたソース発注書を分類する（請求書の金額がリンクされた注文の合計金額と同じである場合）
+descWORKFLOW_BILL_ON_RECEPTION=リンクされたサプライヤの注文が検証されたときに、受信を「請求済み」に分類する
 # Autoclose intervention
-descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
-AutomaticCreation=Automatic creation
-AutomaticClassification=Automatic classification
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=チケットが閉じられたら、チケットにリンクされているすべての介入を閉じる
+AutomaticCreation=自動作成
+AutomaticClassification=自動分類
diff --git a/htdocs/langs/ka_GE/accountancy.lang b/htdocs/langs/ka_GE/accountancy.lang
index 3211a0b62df..33ba4d9fea7 100644
--- a/htdocs/langs/ka_GE/accountancy.lang
+++ b/htdocs/langs/ka_GE/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index f1c41a3b62b..189b0b5186a 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=List of OpenDocument templates directories
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Position of Name/Lastname
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu handler where to show new menu
 DetailMenuModule=Module name if menu entry come from a module
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/ka_GE/banks.lang b/htdocs/langs/ka_GE/banks.lang
index 9500a5b8b2e..a0dc27f86c4 100644
--- a/htdocs/langs/ka_GE/banks.lang
+++ b/htdocs/langs/ka_GE/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/ka_GE/blockedlog.lang b/htdocs/langs/ka_GE/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/ka_GE/blockedlog.lang
+++ b/htdocs/langs/ka_GE/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/ka_GE/boxes.lang b/htdocs/langs/ka_GE/boxes.lang
index d6fd298a3a7..7db4ea8aa17 100644
--- a/htdocs/langs/ka_GE/boxes.lang
+++ b/htdocs/langs/ka_GE/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/ka_GE/cashdesk.lang b/htdocs/langs/ka_GE/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/ka_GE/cashdesk.lang
+++ b/htdocs/langs/ka_GE/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/ka_GE/categories.lang b/htdocs/langs/ka_GE/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/ka_GE/categories.lang
+++ b/htdocs/langs/ka_GE/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/ka_GE/companies.lang b/htdocs/langs/ka_GE/companies.lang
index dadff6a7894..8dc815b522e 100644
--- a/htdocs/langs/ka_GE/companies.lang
+++ b/htdocs/langs/ka_GE/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/ka_GE/compta.lang b/htdocs/langs/ka_GE/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/ka_GE/compta.lang
+++ b/htdocs/langs/ka_GE/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/ka_GE/cron.lang b/htdocs/langs/ka_GE/cron.lang
index d2da7ded67e..2ebdda1e685 100644
--- a/htdocs/langs/ka_GE/cron.lang
+++ b/htdocs/langs/ka_GE/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Create/update Scheduled job
 Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
-CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+CronSetup=Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -56,16 +58,16 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Shell command
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/ka_GE/errors.lang
+++ b/htdocs/langs/ka_GE/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
 ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/ka_GE/exports.lang b/htdocs/langs/ka_GE/exports.lang
index 2dcf4317e00..a0eb7161ef2 100644
--- a/htdocs/langs/ka_GE/exports.lang
+++ b/htdocs/langs/ka_GE/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Step
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/ka_GE/mails.lang b/htdocs/langs/ka_GE/mails.lang
index 1235eef3b27..7fd93be7b71 100644
--- a/htdocs/langs/ka_GE/mails.lang
+++ b/htdocs/langs/ka_GE/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
index 96c68cdcfa3..e196120c27d 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/ka_GE/modulebuilder.lang b/htdocs/langs/ka_GE/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/ka_GE/modulebuilder.lang
+++ b/htdocs/langs/ka_GE/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/ka_GE/other.lang b/htdocs/langs/ka_GE/other.lang
index 54c0572d453..0a7b3723ab1 100644
--- a/htdocs/langs/ka_GE/other.lang
+++ b/htdocs/langs/ka_GE/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang
index 97db059594f..f0c4a5362b8 100644
--- a/htdocs/langs/ka_GE/products.lang
+++ b/htdocs/langs/ka_GE/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/ka_GE/recruitment.lang b/htdocs/langs/ka_GE/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/ka_GE/recruitment.lang
+++ b/htdocs/langs/ka_GE/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/ka_GE/sendings.lang b/htdocs/langs/ka_GE/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/ka_GE/sendings.lang
+++ b/htdocs/langs/ka_GE/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Other shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Shipments to validate
 StatusSendingCanceled=Canceled
+StatusSendingCanceledShort=Canceled
 StatusSendingDraft=Draft
 StatusSendingValidated=Validated (products to ship or already shipped)
 StatusSendingProcessed=Processed
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/ka_GE/stocks.lang b/htdocs/langs/ka_GE/stocks.lang
index 660443bcded..6cf089096dd 100644
--- a/htdocs/langs/ka_GE/stocks.lang
+++ b/htdocs/langs/ka_GE/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/ka_GE/ticket.lang b/htdocs/langs/ka_GE/ticket.lang
index 59519282c80..982fff90ffa 100644
--- a/htdocs/langs/ka_GE/ticket.lang
+++ b/htdocs/langs/ka_GE/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/ka_GE/website.lang b/htdocs/langs/ka_GE/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/ka_GE/website.lang
+++ b/htdocs/langs/ka_GE/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/ka_GE/withdrawals.lang b/htdocs/langs/ka_GE/withdrawals.lang
index 114a8d9dd6c..e3bec6f9cb8 100644
--- a/htdocs/langs/ka_GE/withdrawals.lang
+++ b/htdocs/langs/ka_GE/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/km_KH/accountancy.lang b/htdocs/langs/km_KH/accountancy.lang
index 3211a0b62df..33ba4d9fea7 100644
--- a/htdocs/langs/km_KH/accountancy.lang
+++ b/htdocs/langs/km_KH/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/km_KH/admin.lang b/htdocs/langs/km_KH/admin.lang
index f1c41a3b62b..189b0b5186a 100644
--- a/htdocs/langs/km_KH/admin.lang
+++ b/htdocs/langs/km_KH/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=List of OpenDocument templates directories
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Position of Name/Lastname
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu handler where to show new menu
 DetailMenuModule=Module name if menu entry come from a module
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/km_KH/banks.lang b/htdocs/langs/km_KH/banks.lang
index 9500a5b8b2e..a0dc27f86c4 100644
--- a/htdocs/langs/km_KH/banks.lang
+++ b/htdocs/langs/km_KH/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/km_KH/blockedlog.lang b/htdocs/langs/km_KH/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/km_KH/blockedlog.lang
+++ b/htdocs/langs/km_KH/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/km_KH/boxes.lang b/htdocs/langs/km_KH/boxes.lang
index d6fd298a3a7..7db4ea8aa17 100644
--- a/htdocs/langs/km_KH/boxes.lang
+++ b/htdocs/langs/km_KH/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/km_KH/cashdesk.lang b/htdocs/langs/km_KH/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/km_KH/cashdesk.lang
+++ b/htdocs/langs/km_KH/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/km_KH/categories.lang b/htdocs/langs/km_KH/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/km_KH/categories.lang
+++ b/htdocs/langs/km_KH/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/km_KH/companies.lang b/htdocs/langs/km_KH/companies.lang
index dadff6a7894..8dc815b522e 100644
--- a/htdocs/langs/km_KH/companies.lang
+++ b/htdocs/langs/km_KH/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/km_KH/compta.lang b/htdocs/langs/km_KH/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/km_KH/compta.lang
+++ b/htdocs/langs/km_KH/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/km_KH/cron.lang b/htdocs/langs/km_KH/cron.lang
index 1de1251831a..2ebdda1e685 100644
--- a/htdocs/langs/km_KH/cron.lang
+++ b/htdocs/langs/km_KH/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup=Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
 CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Number of launches
 CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -56,7 +58,7 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
 DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/km_KH/errors.lang b/htdocs/langs/km_KH/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/km_KH/errors.lang
+++ b/htdocs/langs/km_KH/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
 ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/km_KH/exports.lang b/htdocs/langs/km_KH/exports.lang
index 3549e3f8b23..a0eb7161ef2 100644
--- a/htdocs/langs/km_KH/exports.lang
+++ b/htdocs/langs/km_KH/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/km_KH/mails.lang b/htdocs/langs/km_KH/mails.lang
index 1235eef3b27..7fd93be7b71 100644
--- a/htdocs/langs/km_KH/mails.lang
+++ b/htdocs/langs/km_KH/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/km_KH/main.lang b/htdocs/langs/km_KH/main.lang
index 68378c28883..3238b6ee9e0 100644
--- a/htdocs/langs/km_KH/main.lang
+++ b/htdocs/langs/km_KH/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/km_KH/modulebuilder.lang b/htdocs/langs/km_KH/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/km_KH/modulebuilder.lang
+++ b/htdocs/langs/km_KH/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/km_KH/other.lang b/htdocs/langs/km_KH/other.lang
index 54c0572d453..0a7b3723ab1 100644
--- a/htdocs/langs/km_KH/other.lang
+++ b/htdocs/langs/km_KH/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/km_KH/products.lang b/htdocs/langs/km_KH/products.lang
index 97db059594f..f0c4a5362b8 100644
--- a/htdocs/langs/km_KH/products.lang
+++ b/htdocs/langs/km_KH/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/km_KH/recruitment.lang b/htdocs/langs/km_KH/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/km_KH/recruitment.lang
+++ b/htdocs/langs/km_KH/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/km_KH/sendings.lang b/htdocs/langs/km_KH/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/km_KH/sendings.lang
+++ b/htdocs/langs/km_KH/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Other shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Shipments to validate
 StatusSendingCanceled=Canceled
+StatusSendingCanceledShort=Canceled
 StatusSendingDraft=Draft
 StatusSendingValidated=Validated (products to ship or already shipped)
 StatusSendingProcessed=Processed
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/km_KH/stocks.lang b/htdocs/langs/km_KH/stocks.lang
index 660443bcded..6cf089096dd 100644
--- a/htdocs/langs/km_KH/stocks.lang
+++ b/htdocs/langs/km_KH/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/km_KH/ticket.lang b/htdocs/langs/km_KH/ticket.lang
index 59519282c80..982fff90ffa 100644
--- a/htdocs/langs/km_KH/ticket.lang
+++ b/htdocs/langs/km_KH/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/km_KH/website.lang b/htdocs/langs/km_KH/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/km_KH/website.lang
+++ b/htdocs/langs/km_KH/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/km_KH/withdrawals.lang b/htdocs/langs/km_KH/withdrawals.lang
index 114a8d9dd6c..e3bec6f9cb8 100644
--- a/htdocs/langs/km_KH/withdrawals.lang
+++ b/htdocs/langs/km_KH/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/kn_IN/accountancy.lang b/htdocs/langs/kn_IN/accountancy.lang
index 3211a0b62df..33ba4d9fea7 100644
--- a/htdocs/langs/kn_IN/accountancy.lang
+++ b/htdocs/langs/kn_IN/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index 77951271212..262149b3dc3 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=List of OpenDocument templates directories
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Position of Name/Lastname
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu handler where to show new menu
 DetailMenuModule=Module name if menu entry come from a module
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/kn_IN/banks.lang b/htdocs/langs/kn_IN/banks.lang
index b1816234c5a..ac6f369f144 100644
--- a/htdocs/langs/kn_IN/banks.lang
+++ b/htdocs/langs/kn_IN/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/kn_IN/blockedlog.lang b/htdocs/langs/kn_IN/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/kn_IN/blockedlog.lang
+++ b/htdocs/langs/kn_IN/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/kn_IN/boxes.lang b/htdocs/langs/kn_IN/boxes.lang
index d6fd298a3a7..7db4ea8aa17 100644
--- a/htdocs/langs/kn_IN/boxes.lang
+++ b/htdocs/langs/kn_IN/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/kn_IN/cashdesk.lang b/htdocs/langs/kn_IN/cashdesk.lang
index caa77612db5..a70407c989f 100644
--- a/htdocs/langs/kn_IN/cashdesk.lang
+++ b/htdocs/langs/kn_IN/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/kn_IN/categories.lang b/htdocs/langs/kn_IN/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/kn_IN/categories.lang
+++ b/htdocs/langs/kn_IN/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/kn_IN/companies.lang b/htdocs/langs/kn_IN/companies.lang
index 5a13d292ec1..63f3c11bf02 100644
--- a/htdocs/langs/kn_IN/companies.lang
+++ b/htdocs/langs/kn_IN/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=ಸಂಭವನೀಯ
diff --git a/htdocs/langs/kn_IN/compta.lang b/htdocs/langs/kn_IN/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/kn_IN/compta.lang
+++ b/htdocs/langs/kn_IN/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/kn_IN/cron.lang b/htdocs/langs/kn_IN/cron.lang
index b05c7782037..4b73818c3aa 100644
--- a/htdocs/langs/kn_IN/cron.lang
+++ b/htdocs/langs/kn_IN/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Create/update Scheduled job
 Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
-CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+CronSetup=Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -56,16 +58,16 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Shell command
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/kn_IN/errors.lang
+++ b/htdocs/langs/kn_IN/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
 ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/kn_IN/exports.lang b/htdocs/langs/kn_IN/exports.lang
index 2dcf4317e00..a0eb7161ef2 100644
--- a/htdocs/langs/kn_IN/exports.lang
+++ b/htdocs/langs/kn_IN/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Step
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/kn_IN/mails.lang b/htdocs/langs/kn_IN/mails.lang
index 1235eef3b27..7fd93be7b71 100644
--- a/htdocs/langs/kn_IN/mails.lang
+++ b/htdocs/langs/kn_IN/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
index 9635417e322..031958eb288 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/kn_IN/modulebuilder.lang b/htdocs/langs/kn_IN/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/kn_IN/modulebuilder.lang
+++ b/htdocs/langs/kn_IN/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/kn_IN/other.lang b/htdocs/langs/kn_IN/other.lang
index 66bda179f9b..227a868b3a5 100644
--- a/htdocs/langs/kn_IN/other.lang
+++ b/htdocs/langs/kn_IN/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/kn_IN/products.lang b/htdocs/langs/kn_IN/products.lang
index a4e8e169446..ae80529a95e 100644
--- a/htdocs/langs/kn_IN/products.lang
+++ b/htdocs/langs/kn_IN/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/kn_IN/recruitment.lang b/htdocs/langs/kn_IN/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/kn_IN/recruitment.lang
+++ b/htdocs/langs/kn_IN/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/kn_IN/sendings.lang b/htdocs/langs/kn_IN/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/kn_IN/sendings.lang
+++ b/htdocs/langs/kn_IN/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Other shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Shipments to validate
 StatusSendingCanceled=Canceled
+StatusSendingCanceledShort=Canceled
 StatusSendingDraft=Draft
 StatusSendingValidated=Validated (products to ship or already shipped)
 StatusSendingProcessed=Processed
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/kn_IN/stocks.lang b/htdocs/langs/kn_IN/stocks.lang
index 660443bcded..6cf089096dd 100644
--- a/htdocs/langs/kn_IN/stocks.lang
+++ b/htdocs/langs/kn_IN/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/kn_IN/ticket.lang b/htdocs/langs/kn_IN/ticket.lang
index 1608bcb38d7..70bcd0c2f87 100644
--- a/htdocs/langs/kn_IN/ticket.lang
+++ b/htdocs/langs/kn_IN/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=ಇತರ
 TicketSeverityShortLOW=ಕಡಿಮೆ
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=ಹೆಚ್ಚು
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/kn_IN/website.lang b/htdocs/langs/kn_IN/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/kn_IN/website.lang
+++ b/htdocs/langs/kn_IN/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/kn_IN/withdrawals.lang b/htdocs/langs/kn_IN/withdrawals.lang
index 114a8d9dd6c..e3bec6f9cb8 100644
--- a/htdocs/langs/kn_IN/withdrawals.lang
+++ b/htdocs/langs/kn_IN/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang
index 2202ceafd92..e71a5113772 100644
--- a/htdocs/langs/ko_KR/accountancy.lang
+++ b/htdocs/langs/ko_KR/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=날짜
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index 41c75987caf..4fda6a9fe93 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -56,6 +56,8 @@ GUISetup=화면
 SetupArea=설정
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=파일업로드테스트용 양식
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=공간
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Syslog 모듈(데이타 손실 위험 없음) <b>%s</b>에 의해 정읜된 돌리바 로그파일
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=지금 제거하기
 PurgeNothingToDelete=삭제할 디렉토리나 파일이 없음
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=List of OpenDocument templates directories
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Position of Name/Lastname
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu handler where to show new menu
 DetailMenuModule=Module name if menu entry come from a module
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/ko_KR/banks.lang b/htdocs/langs/ko_KR/banks.lang
index cbe0734591b..b88ae14b627 100644
--- a/htdocs/langs/ko_KR/banks.lang
+++ b/htdocs/langs/ko_KR/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/ko_KR/blockedlog.lang b/htdocs/langs/ko_KR/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/ko_KR/blockedlog.lang
+++ b/htdocs/langs/ko_KR/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/ko_KR/boxes.lang b/htdocs/langs/ko_KR/boxes.lang
index f070f401eb4..a6b6fd620d8 100644
--- a/htdocs/langs/ko_KR/boxes.lang
+++ b/htdocs/langs/ko_KR/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=최근 %s 수정 된 기부
 BoxTitleLastModifiedExpenses=최근 %s 수정 된 비용 보고서
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=글로벌 활동 (송장, 제안서, 주문)
 BoxGoodCustomers=좋은 고객
 BoxTitleGoodCustomers=%s 좋은 고객
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=최근 새로 고침 날짜
 NoRecordedBookmarks=북마크가 정의되지 않았습니다.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/ko_KR/cashdesk.lang b/htdocs/langs/ko_KR/cashdesk.lang
index 266158be744..16169671a2d 100644
--- a/htdocs/langs/ko_KR/cashdesk.lang
+++ b/htdocs/langs/ko_KR/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/ko_KR/categories.lang b/htdocs/langs/ko_KR/categories.lang
index 79bfe18f625..e10c2c97c83 100644
--- a/htdocs/langs/ko_KR/categories.lang
+++ b/htdocs/langs/ko_KR/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/ko_KR/companies.lang b/htdocs/langs/ko_KR/companies.lang
index 4e623422f6e..ae5af71d69f 100644
--- a/htdocs/langs/ko_KR/companies.lang
+++ b/htdocs/langs/ko_KR/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=확인할 수 없습니다. 수표 서비스는 회원 국가에서 제공하지 않습니다 (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=가능성
diff --git a/htdocs/langs/ko_KR/compta.lang b/htdocs/langs/ko_KR/compta.lang
index 0761985d4aa..199ba3514ef 100644
--- a/htdocs/langs/ko_KR/compta.lang
+++ b/htdocs/langs/ko_KR/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/ko_KR/cron.lang b/htdocs/langs/ko_KR/cron.lang
index 8180e289d27..bbf04428a8c 100644
--- a/htdocs/langs/ko_KR/cron.lang
+++ b/htdocs/langs/ko_KR/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Create/update Scheduled job
 Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
-CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+CronSetup=Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=우선 순위
 CronLabel=라벨
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -56,16 +58,16 @@ CronNote=적요
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=사용 안함
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=부터
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Shell command
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/ko_KR/errors.lang
+++ b/htdocs/langs/ko_KR/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
 ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/ko_KR/exports.lang b/htdocs/langs/ko_KR/exports.lang
index 203054138bd..fda64411c9f 100644
--- a/htdocs/langs/ko_KR/exports.lang
+++ b/htdocs/langs/ko_KR/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Step
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/ko_KR/mails.lang b/htdocs/langs/ko_KR/mails.lang
index 14c7f27948a..863fc951a94 100644
--- a/htdocs/langs/ko_KR/mails.lang
+++ b/htdocs/langs/ko_KR/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index cd328ee454a..d0bceece221 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=사용 가능한 대체 변수
 NoTranslation=번역 없음
 Translation=Translation
+CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=레코드를 찾을 수 없습니다
 NoRecordDeleted=레코드가 삭제되지 않았습니다.
 NotEnoughDataYet=데이터가 충분하지 않습니다.
@@ -85,6 +87,8 @@ FileWasNotUploaded=첨부할 파일을 선택했지만 바로 업로드할 수
 NbOfEntries=No. of entries
 GoToWikiHelpPage=온라인 도움말 읽기 (인터넷 액세스 필요)
 GoToHelpPage=도움말 읽기
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=저장 레코드
 RecordDeleted=삭제 레코드
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=모듈 / 응용 프로그램
 Modules=모듈 / 응용 프로그램
 Option=옵션
+Filters=Filters
 List=목록
 FullList=전체 목록
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Send email
 Email=이메일
 NoEMail=이메일 없음
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=휴대 전화 없음
 Owner=소유자
 FollowingConstantsWillBeSubstituted=다음 상수는 해당 값으로 바뀝니다.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/ko_KR/modulebuilder.lang b/htdocs/langs/ko_KR/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/ko_KR/modulebuilder.lang
+++ b/htdocs/langs/ko_KR/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang
index a39cc328af3..6e827ab2752 100644
--- a/htdocs/langs/ko_KR/other.lang
+++ b/htdocs/langs/ko_KR/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
index 09ec43625fa..b3282a7a3ff 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/ko_KR/recruitment.lang b/htdocs/langs/ko_KR/recruitment.lang
index 8fa737f47ff..7514f8319ca 100644
--- a/htdocs/langs/ko_KR/recruitment.lang
+++ b/htdocs/langs/ko_KR/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/ko_KR/sendings.lang b/htdocs/langs/ko_KR/sendings.lang
index b6045614152..50cc2143119 100644
--- a/htdocs/langs/ko_KR/sendings.lang
+++ b/htdocs/langs/ko_KR/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Other shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Shipments to validate
 StatusSendingCanceled=취소 된
+StatusSendingCanceledShort=취소 됨
 StatusSendingDraft=초안
 StatusSendingValidated=Validated (products to ship or already shipped)
 StatusSendingProcessed=Processed
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/ko_KR/stocks.lang b/htdocs/langs/ko_KR/stocks.lang
index 7fbad957f4d..45f647abbce 100644
--- a/htdocs/langs/ko_KR/stocks.lang
+++ b/htdocs/langs/ko_KR/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/ko_KR/ticket.lang b/htdocs/langs/ko_KR/ticket.lang
index 39194e55eea..dbcd6edb987 100644
--- a/htdocs/langs/ko_KR/ticket.lang
+++ b/htdocs/langs/ko_KR/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=기타
 TicketSeverityShortLOW=낮음
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=높음
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/ko_KR/website.lang b/htdocs/langs/ko_KR/website.lang
index a3167ada553..1136b43873a 100644
--- a/htdocs/langs/ko_KR/website.lang
+++ b/htdocs/langs/ko_KR/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/ko_KR/withdrawals.lang b/htdocs/langs/ko_KR/withdrawals.lang
index a5301dbdf26..054c4d11865 100644
--- a/htdocs/langs/ko_KR/withdrawals.lang
+++ b/htdocs/langs/ko_KR/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index a0451ff066b..49054ee0f94 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=ວັນທີ
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index a651fd86d34..7c86ea21042 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=List of OpenDocument templates directories
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Position of Name/Lastname
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu handler where to show new menu
 DetailMenuModule=Module name if menu entry come from a module
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/lo_LA/banks.lang b/htdocs/langs/lo_LA/banks.lang
index 116b97d3f81..904c49c79df 100644
--- a/htdocs/langs/lo_LA/banks.lang
+++ b/htdocs/langs/lo_LA/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/lo_LA/blockedlog.lang b/htdocs/langs/lo_LA/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/lo_LA/blockedlog.lang
+++ b/htdocs/langs/lo_LA/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/lo_LA/boxes.lang b/htdocs/langs/lo_LA/boxes.lang
index d6fd298a3a7..7db4ea8aa17 100644
--- a/htdocs/langs/lo_LA/boxes.lang
+++ b/htdocs/langs/lo_LA/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/lo_LA/cashdesk.lang b/htdocs/langs/lo_LA/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/lo_LA/cashdesk.lang
+++ b/htdocs/langs/lo_LA/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/lo_LA/categories.lang b/htdocs/langs/lo_LA/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/lo_LA/categories.lang
+++ b/htdocs/langs/lo_LA/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/lo_LA/companies.lang b/htdocs/langs/lo_LA/companies.lang
index 4e8b86a7c57..a4225bc1cfb 100644
--- a/htdocs/langs/lo_LA/companies.lang
+++ b/htdocs/langs/lo_LA/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/lo_LA/compta.lang b/htdocs/langs/lo_LA/compta.lang
index 29c2f72f5bf..a84839cd09a 100644
--- a/htdocs/langs/lo_LA/compta.lang
+++ b/htdocs/langs/lo_LA/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/lo_LA/cron.lang b/htdocs/langs/lo_LA/cron.lang
index c4d35d1595a..86ecd876e5a 100644
--- a/htdocs/langs/lo_LA/cron.lang
+++ b/htdocs/langs/lo_LA/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Create/update Scheduled job
 Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
-CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+CronSetup=Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -56,16 +58,16 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=ປິດການນຳໃຊ້
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Shell command
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/lo_LA/errors.lang
+++ b/htdocs/langs/lo_LA/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
 ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/lo_LA/exports.lang b/htdocs/langs/lo_LA/exports.lang
index 2dcf4317e00..a0eb7161ef2 100644
--- a/htdocs/langs/lo_LA/exports.lang
+++ b/htdocs/langs/lo_LA/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Step
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/lo_LA/mails.lang b/htdocs/langs/lo_LA/mails.lang
index 1235eef3b27..7fd93be7b71 100644
--- a/htdocs/langs/lo_LA/mails.lang
+++ b/htdocs/langs/lo_LA/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index 026cbbb5ad7..ae6a57c1426 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=ລາຍການ
 FullList=Full list
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/lo_LA/modulebuilder.lang b/htdocs/langs/lo_LA/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/lo_LA/modulebuilder.lang
+++ b/htdocs/langs/lo_LA/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/lo_LA/other.lang b/htdocs/langs/lo_LA/other.lang
index 30dcda87f53..35343ff07d9 100644
--- a/htdocs/langs/lo_LA/other.lang
+++ b/htdocs/langs/lo_LA/other.lang
@@ -5,8 +5,6 @@ Tools=ເຄື່ອງມື
 TMenuTools=ເຄື່ອງມື
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang
index fb58c2e259c..999f6a32693 100644
--- a/htdocs/langs/lo_LA/products.lang
+++ b/htdocs/langs/lo_LA/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/lo_LA/recruitment.lang b/htdocs/langs/lo_LA/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/lo_LA/recruitment.lang
+++ b/htdocs/langs/lo_LA/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/lo_LA/sendings.lang b/htdocs/langs/lo_LA/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/lo_LA/sendings.lang
+++ b/htdocs/langs/lo_LA/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Other shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Shipments to validate
 StatusSendingCanceled=Canceled
+StatusSendingCanceledShort=Canceled
 StatusSendingDraft=Draft
 StatusSendingValidated=Validated (products to ship or already shipped)
 StatusSendingProcessed=Processed
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/lo_LA/stocks.lang b/htdocs/langs/lo_LA/stocks.lang
index 74d3d0a7efe..19b8d4c468f 100644
--- a/htdocs/langs/lo_LA/stocks.lang
+++ b/htdocs/langs/lo_LA/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/lo_LA/ticket.lang b/htdocs/langs/lo_LA/ticket.lang
index 6c1dc94704a..b2bea2dcbcd 100644
--- a/htdocs/langs/lo_LA/ticket.lang
+++ b/htdocs/langs/lo_LA/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/lo_LA/website.lang b/htdocs/langs/lo_LA/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/lo_LA/website.lang
+++ b/htdocs/langs/lo_LA/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/lo_LA/withdrawals.lang b/htdocs/langs/lo_LA/withdrawals.lang
index 114a8d9dd6c..e3bec6f9cb8 100644
--- a/htdocs/langs/lo_LA/withdrawals.lang
+++ b/htdocs/langs/lo_LA/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
index 006e60db613..e0c241d482a 100644
--- a/htdocs/langs/lt_LT/accountancy.lang
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Pagrindinė apskaitos sąskaita klientams, kurie nenustatyti sąrankos metu
 MainAccountForSuppliersNotDefined=Pagrindinė apskaitos sąskaita tiekėjams, kurie nenustatyti sąrankos metu
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Data
 Docref=Nuoroda
 LabelAccount=Sąskaitos etiketė
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Žurnalas
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index ea55fbcdc54..ce36622f33c 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Atvaizdavimas
 SetupArea=Nustatymai
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Failo-testo įkėlimo forma (pagal nustatymus)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Pastaba: Patvirtinimas yra efektyvus tik, kai modulis <b>%s</b> yra aktyvus
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Rodyti apžiūrą
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Apžiūra negalima
 ThemeCurrentlyActive=Tema yra veikli
-CurrentTimeZone=Laiko juostos PHP (serveris)
 MySQLTimeZone=TimeZone MySQL (duomenų bazės)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Erdvė
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Išvalyti
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Išvalyti dabar
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Privilegijuoti partneriai
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=Vartotojo arba kūrėjo dokumentacijos (doc, DUK ...) <br> ieškoti Dolibarr Wiki: <br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Dėl kitų klausimų/pagalbos galite kreiptis į Dolibarr forumą: <br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=OpenDocument šablonų katalogų sąrašas
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Pavyzdys: <br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Norėdami sužinoti, kaip sukurti savo odt dokumentų šablonus, prieš išsaugant juos šiuose kataloguose, paskaityti Wiki dokumentus:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Vardo/Pavardės pozicija
@@ -406,7 +408,7 @@ UrlGenerationParameters=URL apsaugos parametrai
 SecurityTokenIsUnique=Kiekvienam URL naudokite unikalų apsaugos rakto parametrą
 EnterRefToBuildUrl=Įveskite nuorodą objektui %s
 GetSecuredUrl=Gauti apskaičiuotą URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Senas PVM tarifas
 NewVATRates=Naujas PVM tarifas
 PriceBaseTypeToChange=Modifikuoti kainas su apibrėžta bazinės vertės nuoroda
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Naujas meniu
 MenuHandler=Meniu prižiūrėtojas
 MenuModule=Pirminis modulis
-HideUnauthorizedMenu= Paslėpti neleidžiamus meniu (pilki)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=ID meniu
 DetailMenuHandler=Meniu prižiūrėtojas gali rodyti naują meniu
 DetailMenuModule=Modulio pavadinimas, jei meniu įrašas gaunamas iš modulio
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Pašto kodas
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/lt_LT/banks.lang b/htdocs/langs/lt_LT/banks.lang
index 48e08a11c34..794c75da5f2 100644
--- a/htdocs/langs/lt_LT/banks.lang
+++ b/htdocs/langs/lt_LT/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/lt_LT/blockedlog.lang b/htdocs/langs/lt_LT/blockedlog.lang
index 0bb5b261bc1..f86bbba591f 100644
--- a/htdocs/langs/lt_LT/blockedlog.lang
+++ b/htdocs/langs/lt_LT/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/lt_LT/boxes.lang b/htdocs/langs/lt_LT/boxes.lang
index bed53614fc0..55b4aac24ef 100644
--- a/htdocs/langs/lt_LT/boxes.lang
+++ b/htdocs/langs/lt_LT/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Visuminė veikla (sąskaitos-faktūros, pasiūlymai, užsakymai)
 BoxGoodCustomers=Geri klientai
 BoxTitleGoodCustomers=%s geri klientai
+BoxScheduledJobs=Suplanuoti darbai
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=Nėra apibrėžtų žymeklių
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Apskaita
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/lt_LT/cashdesk.lang b/htdocs/langs/lt_LT/cashdesk.lang
index 00c067dd151..d9b9c68951e 100644
--- a/htdocs/langs/lt_LT/cashdesk.lang
+++ b/htdocs/langs/lt_LT/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Sąskaitų-faktūrų skaičius
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/lt_LT/categories.lang b/htdocs/langs/lt_LT/categories.lang
index eab51c93f5a..345dd6c3781 100644
--- a/htdocs/langs/lt_LT/categories.lang
+++ b/htdocs/langs/lt_LT/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Papildomi atributai
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/lt_LT/companies.lang b/htdocs/langs/lt_LT/companies.lang
index e121fe74fd6..5094a5a14dc 100644
--- a/htdocs/langs/lt_LT/companies.lang
+++ b/htdocs/langs/lt_LT/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Tikrinimas negalimas. Tikrinimo paslauga nėra teikiama valstybės narės (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potencialas
diff --git a/htdocs/langs/lt_LT/compta.lang b/htdocs/langs/lt_LT/compta.lang
index ba0519c1662..a0c6fe59908 100644
--- a/htdocs/langs/lt_LT/compta.lang
+++ b/htdocs/langs/lt_LT/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Rodyti PVM mokėjimą
 TotalToPay=Iš viso mokėti
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Režimas <b>%sPVM nuo įsipareigojimų apskaitos%s</b>.
 CalcModeVATEngagement=Režimas <b>%sPVM nuo pajamų-išlaidų%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Pajamų ir išlaidų balansas, metinė suvestinė
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Sumos rodomos su įtrauktais mokesčiais
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Ataskaita pagal trečiosios šalies IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/lt_LT/cron.lang b/htdocs/langs/lt_LT/cron.lang
index d7557437a6d..2433b64aa50 100644
--- a/htdocs/langs/lt_LT/cron.lang
+++ b/htdocs/langs/lt_LT/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = sukurti / atnaujinti planinį darbą
 Permission23103 = Panaikinti planinį darbą
 Permission23104 = Vykdyti planinį darbą
 # Admin
-CronSetup= Numatytos užduoties valdymo nustatymas
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Arba patikrinti ir pradėti spec. darbą
+CronSetup=Numatytos užduoties valdymo nustatymas
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Apsaugos raktas URL pradėti cron darbus
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -42,10 +43,11 @@ CronModule=Modulis
 CronNoJobs=Nėra registruotų darbų
 CronPriority=Prioritetas
 CronLabel=Etiketė
-CronNbRun=Pradėti skaičių
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Kiekvienas
 JobFinished=Darbas pradėtas ir baigtas
+Scheduled=Scheduled
 #Page card
 CronAdd= Pridėti darbus
 CronEvery=Execute job each
@@ -56,16 +58,16 @@ CronNote=Komentaras
 CronFieldMandatory=Laukai %s yra privalomi
 CronErrEndDateStartDt=Pabaigos data negali būti ankstesnė už pradžios datą
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Įjungti
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Išjungti
 CronTaskInactive=Šis darbas yra išjungtas
 CronId=ID
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=Sistemos komandinė eilutė vykdymui
 CronCreateJob=Create new Scheduled Job
 CronFrom=Nuo
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Apvalkalo komanda
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index e22aa414772..ee2fb18e9e6 100644
--- a/htdocs/langs/lt_LT/errors.lang
+++ b/htdocs/langs/lt_LT/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Nėra klaidos, mes įsipareigojame
 # Errors
 ErrorButCommitIsDone=Aptiktos klaidos, bet mes patvirtiname nepaisant to
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=URL %s yra neteisingas
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Prisijungimas %s jau egzistuoja
 ErrorGroupAlreadyExists=Grupė %s jau egzistuoja
 ErrorRecordNotFound=Įrašo nerasta
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Kai kurie privalomi laukai nėra užpildyti.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Nepavyko sukurti aplanko. Įsitikinkite, kad web serverio vartotojas turi teisę rašyti į Dolibarr dokumentų aplanką. Jei parametras <b>safe_mode</b> yra įjungtas šio PHP, patikrinkite, ar Dolibarr PHP failai priklauso web serverio vartotojui (ar jų grupei).
 ErrorNoMailDefinedForThisUser=Šiam klientui neapibrėžtas paštas
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Šiai funkcijai turi būti aktyvuotas Javascript, kad galėtumėte dirbti. Pakeiskite tai meniu Nustatymai-Ekranas.
 ErrorTopMenuMustHaveAParentWithId0=Meniu tipas "Pagrindinis" negali turėti patronuojančio meniu. Įrašyti 0 patronuojančiame meniu arba pasirinkti meniu tipą "Kairysis".
 ErrorLeftMenuMustHaveAParentId=Meniu tipas "Kairysis" turi turėti patronuojantį ID.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Profilio vardas jau egzistuoja šiam eksporto rinkini
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP derinimas nėra pilnas
 ErrorLDAPMakeManualTest=.ldif failas buvo sukurtas aplanke: %s. Pabandykite įkelti jį rankiniu būdu per komandinę eilutę, kad gauti daugiau informacijos apie klaidas
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Nuoroda, naudojama sukūrimui, jau egzistuoja.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/lt_LT/exports.lang b/htdocs/langs/lt_LT/exports.lang
index 37f6167789c..b42cd43974d 100644
--- a/htdocs/langs/lt_LT/exports.lang
+++ b/htdocs/langs/lt_LT/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Lauko pavadinimas
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Biblioteka
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Žingsnis
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/lt_LT/mails.lang b/htdocs/langs/lt_LT/mails.lang
index 485609c9c59..453d2b8adbe 100644
--- a/htdocs/langs/lt_LT/mails.lang
+++ b/htdocs/langs/lt_LT/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Failo eilutė %s
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Pranešimai
-NoNotificationsWillBeSent=Nėra numatytų e-pašto pranešimų šiam įvykiui ir įmonei
-ANotificationsWillBeSent=1 pranešimas bus išsiųstas e-paštu
-SomeNotificationsWillBeSent=%s pranešimai bus siunčiami e-paštu
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=Visų išsiųstų e-pašto pranešimų sąrašas
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Informacija
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index 5b05397b5d2..f19af3fea97 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=Nėra vertimo
 Translation=Vertimas
+CurrentTimeZone=Laiko juostos PHP (serveris)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Įrašų nerasta
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=Failas prikabinimui pasirinktas, bet dar nebuvo įkeltas. Pas
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Skaityti pagalbą
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Įrašas išsaugotas
 RecordDeleted=Įrašas ištrintas
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Opcija
+Filters=Filters
 List=Sąrašas
 FullList=Pilnas sąrašas
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Siųsti e-laišką
 Email=El. paštas
 NoEMail=E-laiškų nėra
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=Nėra mobilaus telefono
 Owner=Savininkas
 FollowingConstantsWillBeSubstituted=Šios konstantos bus pakeistos atitinkamomis reikšmėmis
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=Laikomas
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/lt_LT/modulebuilder.lang b/htdocs/langs/lt_LT/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/lt_LT/modulebuilder.lang
+++ b/htdocs/langs/lt_LT/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/lt_LT/other.lang b/htdocs/langs/lt_LT/other.lang
index 7e6a654fefa..389c6a69571 100644
--- a/htdocs/langs/lt_LT/other.lang
+++ b/htdocs/langs/lt_LT/other.lang
@@ -5,8 +5,6 @@ Tools=Įrankiai
 TMenuTools=Įrankiai
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Gimimo diena
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=Gimtadienio perspėjimas aktyvus
 BirthdayAlertOff=Gimtadienio perspėjimas neaktyvus
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Dešinė
 CalculatedWeight=Apskaičiuotas svoris
 CalculatedVolume=Apskaičiuotas tūris
 Weight=Svoris
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Eksporto sritis
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index 31a8d69bc7d..180c6d30d4c 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Kainų skaičius
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Kilmės šalis
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Naudokite fiksuotą kainą
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Kiekio diapazonas
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/lt_LT/recruitment.lang b/htdocs/langs/lt_LT/recruitment.lang
index 90e03cf6b72..c67390a9865 100644
--- a/htdocs/langs/lt_LT/recruitment.lang
+++ b/htdocs/langs/lt_LT/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/lt_LT/sendings.lang b/htdocs/langs/lt_LT/sendings.lang
index 74260916fb8..085e7a6c2db 100644
--- a/htdocs/langs/lt_LT/sendings.lang
+++ b/htdocs/langs/lt_LT/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Kiti vežimai, skirti šiam užsakymui
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Vežimai patvirtinimui
 StatusSendingCanceled=Atšauktas
+StatusSendingCanceledShort=Atšauktas
 StatusSendingDraft=Projektas
 StatusSendingValidated=Patvirtinta (produktai siuntimui arba jau išsiųsti)
 StatusSendingProcessed=Apdorotas
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Labiau išsamus dokumento modelis pristatymo kvitui (logo. ..)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstanta EXPEDITION_ADDON_NUMBER nėra apibrėžta
 SumOfProductVolumes=Produkcijos apimties suma
 SumOfProductWeights=Produktų svorių suma
diff --git a/htdocs/langs/lt_LT/stocks.lang b/htdocs/langs/lt_LT/stocks.lang
index 6956b3b8acd..69011ae1d62 100644
--- a/htdocs/langs/lt_LT/stocks.lang
+++ b/htdocs/langs/lt_LT/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/lt_LT/ticket.lang b/htdocs/langs/lt_LT/ticket.lang
index 7f3e3f99310..0dbbd874bab 100644
--- a/htdocs/langs/lt_LT/ticket.lang
+++ b/htdocs/langs/lt_LT/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Kiti
 TicketSeverityShortLOW=Žemas
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Aukštas
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Skaityti
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/lt_LT/website.lang b/htdocs/langs/lt_LT/website.lang
index df77c21ae55..6a589a71fd8 100644
--- a/htdocs/langs/lt_LT/website.lang
+++ b/htdocs/langs/lt_LT/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Puslapis
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/lt_LT/withdrawals.lang b/htdocs/langs/lt_LT/withdrawals.lang
index 11ebeb3ab99..89d57f9bf90 100644
--- a/htdocs/langs/lt_LT/withdrawals.lang
+++ b/htdocs/langs/lt_LT/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Priskirti įskaitytas (credited)
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Opcija realiam režimui nebuvo nustatyta, sustabdyta po šios simuliacijos
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index 9d43d7bcd9a..3f7a5711a93 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=Visas valstis, izņemot %s
 AccountantFiles=Eksportēt pirmdokumentus
 ExportAccountingSourceDocHelp=Izmantojot šo rīku, varat eksportēt avota notikumus (sarakstu un PDF failus), kas tika izmantoti grāmatvedības ģenerēšanai. Lai eksportētu žurnālus, izmantojiet izvēlnes ierakstu %s - %s.
 VueByAccountAccounting=Skatīt pēc grāmatvedības konta
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Galvenais grāmatvedības konts klientiem, kas nav definēti iestatījumos
 MainAccountForSuppliersNotDefined=Galvenais grāmatvedības konts piegādātājiem, kas nav definēti iestatījumos
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Nav saistošs grāmatvedības kontam
 XLineSuccessfullyBinded=%s produkti/pakalpojumi, kas veiksmīgi piesaistīti grāmatvedības kontam
 XLineFailedToBeBinded=%s produkti/pakalpojumi nav saistīti ar nevienu grāmatvedības kontu
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Saistīto elementu skaits, kas redzams lapā (maksimāli ieteicams: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Sāciet lappuses "Saistīšanu darīt" šķirošanu ar jaunākajiem elementiem
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Sāciet lappuses "Saistīšana pabeigta" šķirošanu ar jaunākajiem elementiem
 
@@ -198,7 +199,8 @@ Docdate=Datums
 Docref=Atsauce
 LabelAccount=Konta nosaukums
 LabelOperation=Etiķetes darbība
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Burtu kods
 Lettering=Burti
 Codejournal=Žurnāls
@@ -206,7 +208,8 @@ JournalLabel=Žurnāla etiķete
 NumPiece=Gabala numurs
 TransactionNumShort=Num. darījums
 AccountingCategory=Personalizētas grupas
-GroupByAccountAccounting=Grupēt pēc grāmatvedības konta
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Šeit jūs varat definēt dažas grāmatvedības kontu grupas. Tie tiks izmantoti personificētiem grāmatvedības pārskatiem.
 ByAccounts=Pēc kontiem
 ByPredefinedAccountGroups=Iepriekš definētās grupas
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Maksājums nav saistīts ar kādu produktu / pakalpoj
 OpeningBalance=Sākuma bilance
 ShowOpeningBalance=Rādīt sākuma atlikumu
 HideOpeningBalance=Slēpt sākuma atlikumu
-ShowSubtotalByGroup=Rādīt starpsummu pa grupām
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Kontu grupa
 PcgtypeDesc=Kontu grupa tiek izmantota kā iepriekš definēti “filtra” un “grupēšanas” kritēriji dažiem grāmatvedības pārskatiem. Piemēram, “IENĀKUMS” vai “IZDEVUMI” tiek izmantoti kā produktu uzskaites kontu grupas, lai izveidotu izdevumu / ienākumu pārskatu.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Konsultējieties šeit ar izdevumu pārskatu rindiņu sa
 DescVentilExpenseReportMore=Ja jūs izveidojat grāmatvedības kontu uz izdevumu pārskata rindiņu veida, programma varēs visu saistību starp jūsu rēķina pārskatu rindiņām un jūsu kontu diagrammas grāmatvedības kontu veikt tikai ar vienu klikšķi, izmantojot pogu <strong> "%s" </strong>. Ja kontam nav iestatīta maksu vārdnīca vai ja jums joprojām ir dažas rindiņas, kurām nav saistības ar kādu kontu, izvēlnē "<strong> %s </ strong>" būs jāveic manuāla piesaistīšana.
 DescVentilDoneExpenseReport=Konsultējieties šeit ar izdevumu pārskatu rindu sarakstu un to maksu grāmatvedības kontu
 
+Closure=Annual closure
 DescClosure=Šeit apskatiet neapstiprināto kustību skaitu mēnesī, un fiskālie gadi jau ir atvērti
 OverviewOfMovementsNotValidated=1. solis / Nepārvērtēts kustību pārskats. (Nepieciešams, lai slēgtu fiskālo gadu)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Apstipriniet kustības
 DescValidateMovements=Jebkādas rakstīšanas, burtu un izdzēsto tekstu izmaiņas vai dzēšana būs aizliegtas. Visi vingrinājumu ieraksti ir jāapstiprina, pretējā gadījumā aizvēršana nebūs iespējama
-SelectMonthAndValidate=Izvēlieties mēnesi un apstipriniet kustības
 
 ValidateHistory=Piesaistiet automātiski
 AutomaticBindingDone=Automātiskā piesaistīšana pabeigta
@@ -293,6 +298,7 @@ Accounted=Uzskaitīts virsgrāmatā
 NotYetAccounted=Vēl nav uzskaitīti virsgrāmatā
 ShowTutorial=Rādīt apmācību
 NotReconciled=Nesaskaņots
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Iesiešanas iespējas
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Eksports LD Compta (v10 un jaunākiem)
 Modelcsv_openconcerto=Eksportēt OpenConcerto (tests)
 Modelcsv_configurable=Eksportēt CSV konfigurējamu
 Modelcsv_FEC=Eksporta FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Eksports uz Sage 50 Šveici
 Modelcsv_winfic=Eksportēt Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index d4c3cc29788..afd8f75d9ff 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Attēlojums
 SetupArea=Iestatījumi
 UploadNewTemplate=Augšupielādēt jaunu veidni (-es)
 FormToTestFileUploadForm=Forma, lai pārbaudītu failu augšupielādi (pēc uiestatītajiem parametriem)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Piezīme: jā, ir efektīva tikai tad, ja modulis <b>%s</b> ir iespējots
 RemoveLock=Ja ir, noņemiet/pārdēvējiet failu <b>%s</b>, lai varētu izmantot atjaunināšanas/instalēšanas rīku.
 RestoreLock=Atjaunojiet failu <b>%s</b> tikai ar lasīšanas atļauju, lai atspējotu jebkādu turpmāku atjaunināšanas/instalēšanas rīka izmantošanu.
@@ -85,7 +87,6 @@ ShowPreview=Rādīt priekšskatījumu
 ShowHideDetails=Rādīt - slēpt informāciju
 PreviewNotAvailable=Priekšskatījums nav pieejams
 ThemeCurrentlyActive=aktīvā tēma
-CurrentTimeZone=Laika josla PHP (servera)
 MySQLTimeZone=Laika zona MySql (datubāze)
 TZHasNoEffect=Datus uzglabā un nodod atpakaļ datubāzes serverim tā, it kā tie tiktu turēti kā iesniegtā virkne. Laika josla ir spēkā tikai tad, ja tiek izmantota funkcija UNIX_TIMESTAMP (kuru nedrīkst izmantot Dolibarr, tāpēc datubāzei TZ nedrīkst būt nekādas ietekmes, pat ja tas ir mainīts pēc datu ievadīšanas).
 Space=Telpa
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Šī sadaļa nodrošina administrēšanas funkcijas. Izmanto
 Purge=Tīrīt
 PurgeAreaDesc=Šī lapa ļauj izdzēst visus Dolibarr ģenerētos vai glabātos failus (pagaidu faili vai visi faili <b> %s </b> direktorijā). Šīs funkcijas izmantošana parasti nav nepieciešama. Tas tiek nodrošināts kā risinājums lietotājiem, kuru Dolibarr uztur pakalpojumu sniedzējs, kas nepiedāvā atļaujas, lai dzēstu tīmekļa servera ģenerētos failus.
 PurgeDeleteLogFile=Dzēsiet žurnāla failus, tostarp <b>%s</b>, kas definēti Syslog modulim (nav datu pazaudēšanas riska).
-PurgeDeleteTemporaryFiles=Dzēst visus pagaidu failus (nav datu zaudēšanas riska). Piezīme. Dzēšana tiek veikta tikai tad, ja pagaidu katalogs tika izveidots pirms 24 stundām.
-PurgeDeleteTemporaryFilesShort=Dzēst pagaidu failus
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Dzēsiet visus failus direktorijā: <b> %s </b>. <br> Tas izdzēsīs visus radītos dokumentus, kas saistīti ar elementiem (trešajām personām, rēķiniem utt.), ECM modulī augšupielādētiem failiem, datu bāzes rezerves izgāztuvēm un pagaidu failus.
 PurgeRunNow=Tīrīt tagad
 PurgeNothingToDelete=Nav mapes vai failu, kurus jādzēš.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Ieteicamie partneri
 OtherResources=Citi resursi
 ExternalResources=Ārējie resursi
 SocialNetworks=Sociālie tīkli
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=Par lietotāju vai attīstītājs dokumentācijas (Doc, FAQ ...), <br> ieskatieties uz Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
 ForAnswersSeeForum=Par jebkuru citu jautājumu/palīdzību, jūs varat izmantot Dolibarr forumu: <br> <a href="%s" target="_blank"><b>%s</b></a>
 HelpCenterDesc1=Šeit ir daži resursi, lai iegūtu Dolibarr palīdzību un atbalstu.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Piemēri ar pašreizējo konfigurāciju
 ListOfDirectories=Saraksts OpenDocument veidnes katalogi
 ListOfDirectoriesForModelGenODT=Saraksts ar direktorijām, kurās ir veidnes faili ar OpenDocument formātu. <br> <br> Ievietojiet šeit pilnu direktoriju ceļu. <br> Pievienojiet karodziņu atpakaļ starp eah direktoriju. <br> Lai pievienotu GED moduļa direktoriju, pievienojiet šeit <b > DOL_DATA_ROOT / ecm / yourdirectoryname </b>. <br> <br> Faili šajos katalogos beidzas ar <b> .odt </b> vai <b> .ods </b>.
 NumberOfModelFilesFound=ODT / ODS veidņu failu skaits, kas atrodams šajos katalogos
-ExampleOfDirectoriesForModelGen=Piemēri sintaksei: <br> c:\\mydir<br>/Home/ mydir<br> DOL_DATA_ROOT/ECM/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Lai uzzinātu, kā izveidot odt dokumentu veidnes, pirms saglabājot tos šajās mapēs, lasīt wiki dokumentāciju:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Vārda/Uzvārda atrašanās vieta
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parametri, lai nodrošinātu drošas saites
 SecurityTokenIsUnique=Izmantojiet unikālu securekey parametru katram URL
 EnterRefToBuildUrl=Ievadiet atsauci objektam %s
 GetSecuredUrl=Saņemt aprēķināto URL
-ButtonHideUnauthorized=Slēpt pogas lietotājiem, kas nav administratori, par neatļautām darbībām, nevis rādīt pelēkas atspējotas pogas
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Vecā PVN likme
 NewVATRates=Jaunā PVN likme
 PriceBaseTypeToChange=Pārveidot par cenām ar bāzes atsauces vērtību, kas definēta tālāk
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalizētas izvēlnes, kas nav saistītas ar augs
 NewMenu=Jauna izvēlne
 MenuHandler=Izvēlnes apstrādātājs
 MenuModule=Avota modulis
-HideUnauthorizedMenu= Slēpt neatļautās izvēlnes (pelēkas)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id izvēlne
 DetailMenuHandler=Izvēlne administrators, kur rādīt jaunu izvēlni
 DetailMenuModule=Moduļa nosaukums, ja izvēlnes ierakstam nāk no moduļa
@@ -1983,11 +1985,12 @@ EMailHost=E-pasta IMAP serveris
 MailboxSourceDirectory=Pastkastes avota katalogs
 MailboxTargetDirectory=Pastkastes mērķa direktorija
 EmailcollectorOperations=Darbi, ko veic savācējs
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Maksimālais savākto e-pasta ziņojumu skaits
 CollectNow=Savākt tagad
 ConfirmCloneEmailCollector=Vai tiešām vēlaties klonēt e-pasta kolekcionāru %s?
-DateLastCollectResult=Datums, kad saņemts pēdējais savākšanas mēģinājums
-DateLastcollectResultOk=Pēdējais datums savāc veiksmīgi
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Jaunākais rezultāts
 EmailCollectorConfirmCollectTitle=E-pasts apkopo apstiprinājumu
 EmailCollectorConfirmCollect=Vai vēlaties savākt šīs kolekcijas kolekciju tagad?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Ziņojums no sarunas, kuru aizsāka pirmais e-pasts, kas nosū
 WithoutDolTrackingID=Ziņojums no sarunas, kuru aizsāka pirmais e-pasts, kuru NAV nosūtīts no Dolibarr
 WithDolTrackingIDInMsgId=Ziņojums nosūtīts no Dolibarr
 WithoutDolTrackingIDInMsgId=Ziņojums NAV nosūtīts no Dolibarr
-CreateCandidature=Izveidojiet kandidatūru
+CreateCandidature=Create job application
 FormatZip=Pasta indekss
 MainMenuCode=Izvēlnes ievades kods (mainmenu)
 ECMAutoTree=Rādīt automātisko ECM koku
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Valsts (ja tā ir konkrēta valsts)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/lv_LV/banks.lang b/htdocs/langs/lv_LV/banks.lang
index cf070821b46..0cd3a6e33e0 100644
--- a/htdocs/langs/lv_LV/banks.lang
+++ b/htdocs/langs/lv_LV/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandāts
 YourSEPAMandate=Jūsu SEPA mandāts
 FindYourSEPAMandate=Tas ir jūsu SEPA mandāts, lai pilnvarotu mūsu uzņēmumu veikt tiešā debeta pasūtījumu savai bankai. Atgriezt to parakstu (skenēt parakstīto dokumentu) vai nosūtīt pa pastu uz
 AutoReportLastAccountStatement=Veicot saskaņošanu, automātiski aizpildiet lauka “bankas izraksta numurs” ar pēdējo izraksta numuru
-CashControl=POS naudas žogs
-NewCashFence=Jauns naudas žogs
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Krāsojiet kustības
 BankColorizeMovementDesc=Ja šī funkcija ir iespējota, jūs varat izvēlēties īpašu fona krāsu debeta vai kredīta pārvietošanai
 BankColorizeMovementName1=Debeta kustības fona krāsa
diff --git a/htdocs/langs/lv_LV/blockedlog.lang b/htdocs/langs/lv_LV/blockedlog.lang
index 237dac224bc..3318d1d334c 100644
--- a/htdocs/langs/lv_LV/blockedlog.lang
+++ b/htdocs/langs/lv_LV/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Nepārveidojami žurnāli
 ShowAllFingerPrintsMightBeTooLong=Rādīt visus arhivētos žurnālus (var būt daudz)
 ShowAllFingerPrintsErrorsMightBeTooLong=Rādīt visus nederīgos arhīva žurnālus (var būt garš)
 DownloadBlockChain=Lejupielādējiet pirkstu nospiedumus
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Arhivēts žurnāla ieraksts nav derīgs. Tas nozīmē, ka kāds (hakeris?) Ir mainījis dažus šī ieraksta datus pēc tā ierakstīšanas vai ir izdzēsis iepriekšējo arhivēto ierakstu (pārbaudiet, vai pastāv līnija ar iepriekšējo #).
 OkCheckFingerprintValidity=Arhivēts žurnāla ieraksts ir derīgs. Dati par šo līniju netika mainīti un ieraksts seko iepriekšējam.
 OkCheckFingerprintValidityButChainIsKo=Arhivētais žurnāls šķiet derīgs salīdzinājumā ar iepriekšējo, bet ķēde agrāk tika bojāta.
 AddedByAuthority=Uzglabāti tālvadības iestādē
@@ -35,7 +35,7 @@ logDON_DELETE=Ziedojuma loģiska dzēšana
 logMEMBER_SUBSCRIPTION_CREATE=Dalībnieka abonements izveidots
 logMEMBER_SUBSCRIPTION_MODIFY=Dalībnieku abonēšana ir labota
 logMEMBER_SUBSCRIPTION_DELETE=Locekļu abonēšanas loģiskā dzēšana
-logCASHCONTROL_VALIDATE=Naudas žogu ierakstīšana
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Klientu rēķinu lejupielāde
 BlockedLogBillPreview=Klienta rēķina priekšskatījums
 BlockedlogInfoDialog=Žurnāla detaļas
diff --git a/htdocs/langs/lv_LV/boxes.lang b/htdocs/langs/lv_LV/boxes.lang
index 88d7803c340..7fdf89cf74d 100644
--- a/htdocs/langs/lv_LV/boxes.lang
+++ b/htdocs/langs/lv_LV/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Jaunākie %s labotie ziedojumi
 BoxTitleLastModifiedExpenses=Jaunākie %s modificētie izdevumu pārskati
 BoxTitleLatestModifiedBoms=Jaunākās %s modificētās BOM
 BoxTitleLatestModifiedMos=Jaunākie %s modificētie ražošanas pasūtījumi
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global darbība (pavadzīmes, priekšlikumi, rīkojumi)
 BoxGoodCustomers=Labi klienti
 BoxTitleGoodCustomers=%s Labi klienti
+BoxScheduledJobs=Plānoti darbi
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Neizdevās atsvaidzināt RSS plūsmu. Pēdējoreiz veiksmīgi atsvaidzināšanas datums: %s
 LastRefreshDate=Jaunākais atsvaidzināšanas datums
 NoRecordedBookmarks=Nav definētas grāmatzīmes.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Apturēšanas konts nav definēts
 BoxLastCustomerShipments=Pēdējo klientu sūtījumi
 BoxTitleLastCustomerShipments=Jaunākie %s klientu sūtījumi
 NoRecordedShipments=Nav reģistrēts klienta sūtījums
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Grāmatvedība
+ValidatedProjects=Apstiprināti projekti
diff --git a/htdocs/langs/lv_LV/cashdesk.lang b/htdocs/langs/lv_LV/cashdesk.lang
index 773bfdf4601..fddd50d2bac 100644
--- a/htdocs/langs/lv_LV/cashdesk.lang
+++ b/htdocs/langs/lv_LV/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Kājene
 AmountAtEndOfPeriod=Summa perioda beigās (diena, mēnesis vai gads)
 TheoricalAmount=Teorētiskā summa
 RealAmount=Reālā summa
-CashFence=Naudas žogs
-CashFenceDone=Naudas žogs veikts par periodu
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Rēķinu skaits
 Paymentnumpad=Padeves veids maksājuma ievadīšanai
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numerācijas modulis tirdzniecības vietu tirdzniec
 CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> tagu izmanto, lai pievienotu termināļa numuru
 TakeposGroupSameProduct=Grupējiet tās pašas produktu līnijas
 StartAParallelSale=Sāciet jaunu paralēlu izpārdošanu
-ControlCashOpening=Kontrolējiet kases atvēršanu kasē
-CloseCashFence=Aizveriet naudas žogu
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Skaidras naudas pārskats
 MainPrinterToUse=Galvenais izmantojamais printeris
 OrderPrinterToUse=Pasūtiet printeri izmantošanai
@@ -121,4 +122,5 @@ GiftReceiptButton=Pievienojiet pogu Dāvanu kvīts
 GiftReceipt=Dāvanu kvīts
 ModuleReceiptPrinterMustBeEnabled=Vispirms jābūt iespējotam moduļa saņemšanas printerim
 AllowDelayedPayment=Atļaut kavētu maksājumu
-PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+PrintPaymentMethodOnReceipts=Izdrukājiet maksājuma veidu uz biļetēm |
+WeighingScale=Svari
diff --git a/htdocs/langs/lv_LV/categories.lang b/htdocs/langs/lv_LV/categories.lang
index db3681c7335..bde3733eac6 100644
--- a/htdocs/langs/lv_LV/categories.lang
+++ b/htdocs/langs/lv_LV/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projektu tagi / kategoriju apgabals
 UsersCategoriesArea=Lietotāju tagu / kategoriju apgabals
 SubCats=Apakšsadaļas
 CatList=Atslēgvārdu/sadaļu saraksts
+CatListAll=List of tags/categories (all types)
 NewCategory=Jauna etiķete/sadaļa
 ModifCat=Labot etiķeti/sadaļu
 CatCreated=Etiķete/sadaļa izveidota
@@ -65,16 +66,22 @@ UsersCategoriesShort=Lietotāju atzīmes / kategorijas
 StockCategoriesShort=Noliktavas tagi / kategorijas
 ThisCategoryHasNoItems=Šajā kategorijā nav nevienas preces.
 CategId=Tag /sadaļas ID
-CatSupList=Piegādātāju tagu / kategoriju saraksts
-CatCusList=Klientu / perspektīvu tagu / kategoriju saraksts
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Produktu tagu / kategoriju saraksts
 CatMemberList=Dalībnieku tagu / kategoriju saraksts
-CatContactList=List of contact tags/categories
-CatSupLinks=Saites starp piegādātājiem un tagiem / sadaļām
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Saiknes starp klientiem / perspektīvām un tagiem / kategorijām
 CatContactsLinks=Saiknes starp kontaktiem / adresēm un tagiem / kategorijām
 CatProdLinks=Saiknes starp produktiem / pakalpojumiem un tagiem / kategorijām
-CatProJectLinks=Saiknes starp projektiem un tagiem / kategorijām
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Noņemt no tagiem / kategorijas
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tagu / kategoriju iestatīšana
diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang
index 21c55893303..6790975f63a 100644
--- a/htdocs/langs/lv_LV/companies.lang
+++ b/htdocs/langs/lv_LV/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Pārbaudiet Kopienas iekšējo PVN identifikācijas nu
 VATIntraManualCheck=Jūs varat manuāli pārbaudīt arī Eiropas Komisijas vietnē <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Pārbaude nav iespējams. Pārbaudes pakalpojums netiek nodrošināts no dalībvalsts (%s).
 NorProspectNorCustomer=Nav izredzes, ne klients
-JuridicalStatus=Juridiskās personas veids
+JuridicalStatus=Business entity type
 Workforce=Darbaspēks
 Staff=Darbinieki
 ProspectLevelShort=Potenciāls
diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
index a4add9768be..ad769c0e9d3 100644
--- a/htdocs/langs/lv_LV/compta.lang
+++ b/htdocs/langs/lv_LV/compta.lang
@@ -111,7 +111,7 @@ Refund=Atmaksa
 SocialContributionsPayments=Sociālo/fiskālo nodokļu maksājumi
 ShowVatPayment=Rādīt PVN maksājumu
 TotalToPay=Summa
-BalanceVisibilityDependsOnSortAndFilters=Bilance ir redzama šajā sarakstā tikai tad, ja tabula ir sakārtota uz augšu %s un tiek filtrēta 1 bankas kontam.
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Klienta grāmatvedības kods
 SupplierAccountancyCode=Pārdevēja grāmatvedības kods
 CustomerAccountancyCodeShort=Klienta. konta. kods
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Vai tiešām vēlaties dzēst šo sociālo / fis
 ExportDataset_tax_1=Sociālie un fiskālie nodokļi un maksājumi
 CalcModeVATDebt=Mode <b>%sVAT par saistību accounting%s.</b>
 CalcModeVATEngagement=Mode <b>%sVAT par ienākumu-expense%sS.</b>
-CalcModeDebt=Zināma reģistrēto rēķinu analīze, pat ja tie vēl nav uzskaitīti virsgrāmatā.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Zināma reģistrēto maksājumu analīze, pat ja tie vēl nav uzskaitīti Ledger.
 CalcModeBookkeeping=Grāmatvedības grāmatiņas žurnālā publicēto datu analīze.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Ienākumu un izdevumu bilance, gada kopsavilkums
 AnnualByCompanies=Ieņēmumu un izdevumu līdzsvars pēc iepriekš definētām kontu grupām
 AnnualByCompaniesDueDebtMode=Ieņēmumu un izdevumu bilance, detalizēti pēc iepriekš definētām grupām, režīms <b> %sClaims-Debts%s </b> norādīja <b> Saistību grāmatvedība </b>.
 AnnualByCompaniesInputOutputMode=Ieņēmumu un izdevumu līdzsvars, detalizēti pēc iepriekš definētām grupām, režīms <b> %sIncomes-Expenses%s </b> norādīja <b> naudas līdzekļu uzskaiti </b>.
-SeeReportInInputOutputMode=Skatīt %s maksājumu analīzi %s, lai aprēķinātu veiktos faktiskos maksājumus, pat ja tie vēl nav uzskaitīti Virsgrāmatā.
-SeeReportInDueDebtMode=Skatīt %srēķinu analīzi %s, lai aprēķiniem izmantotu zināmos reģistrētos rēķinus, pat ja tie vēl nav uzskaitīti Virsgrāmatā.
-SeeReportInBookkeepingMode=Lai skatītu <b> Grāmatvedības grāmatvedības tabulu </ b>, skatiet <b> %sBookBooking report%s </ b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Uzrādītas summas ir ar visiem ieskaitot nodokļus
 RulesResultDue=- Tas ietver nesamaksātos rēķinus, izdevumus, PVN, ziedojumus neatkarīgi no tā, vai tie ir samaksāti. Ietver arī algas. <br> - tas ir balstīts uz rēķinu izrakstīšanas datumu un izdevumu vai nodokļu samaksas termiņu. Algām, kas noteiktas ar Algas moduli, tiek izmantots maksājuma valutēšanas datums.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Tas rāda jūsu grāmatvedībā ierakstu ar g
 SeePageForSetup=Lai iestatītu, skatiet sadaļu <a href="%s"> %s </a>
 DepositsAreNotIncluded=- Sākuma rēķini nav iekļauti
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=2. nodokļu pārskats pa mēnešiem
+LT2ReportByMonth=Nodokļu 3 pārskats pa mēnešiem
 LT1ReportByCustomers=Trešo personu nodokļu pārskats 2
 LT2ReportByCustomers=Ziņojiet par trešās personas nodokli 3
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Ziņojumā, ko trešās puses IRPF
 VATReport=Pārdošanas nodokļa atskaite
 VATReportByPeriods=Pārdošanas nodokļu pārskats pa periodiem
+VATReportByMonth=Pārdošanas nodokļa pārskats pa mēnešiem
 VATReportByRates=Pārdošanas nodokļu pārskats pēc likmēm
 VATReportByThirdParties=Trešo personu pārdošanas nodokļa pārskats
 VATReportByCustomers=Pārdošanas nodokļa pārskats pēc klienta
diff --git a/htdocs/langs/lv_LV/cron.lang b/htdocs/langs/lv_LV/cron.lang
index 4cca272f272..864165259f3 100644
--- a/htdocs/langs/lv_LV/cron.lang
+++ b/htdocs/langs/lv_LV/cron.lang
@@ -7,8 +7,8 @@ Permission23103 = Dzēst plānoto darbu
 Permission23104 = Izpildīt plānoto darbu
 # Admin
 CronSetup=Plānoto darbu iestatīšana
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Drošības atslēga URL uzsākt cron darbavietas
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
@@ -84,3 +84,8 @@ MakeLocalDatabaseDumpShort=Lokālās datu bāzes dublēšana
 MakeLocalDatabaseDump=Izveidojiet vietējo datubāzes dump. Parametri ir: kompresija ("gz" vai "bz" vai "neviens"), dublēšanas veids ("mysql", "pgsql", "auto"), 1, "auto" vai faila nosaukums,
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
 DATAPOLICYJob=Datu tīrītājs un anonimizators
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index 033f9ff15e9..60299570880 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -8,6 +8,7 @@ ErrorBadEMail=E-pasts %s ir nepareizs
 ErrorBadMXDomain=E-pasts %s nepareizs (domēnam nav derīga MX ieraksta)
 ErrorBadUrl=Url %s ir nepareizs
 ErrorBadValueForParamNotAString=Jūsu parametra nepareiza vērtība. Tas parasti parādās, ja trūkst tulkojuma.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Lietotājs %s jau pastāv.
 ErrorGroupAlreadyExists=Grupa %s jau pastāv.
 ErrorRecordNotFound=Ierakstīt nav atrasts.
@@ -49,6 +50,7 @@ ErrorFieldsRequired=Daži nepieciešamie lauki netika aizpildīti.
 ErrorSubjectIsRequired=E-pasta tēma ir nepieciešama
 ErrorFailedToCreateDir=Neizdevās izveidot direktoriju. Pārbaudiet, vai Web servera lietotājam ir tiesības rakstīt uz Dolibarr dokumentus direktorijā. Ja parametrs <b>safe_mode</b> ir iespējots uz šo PHP, pārbaudiet, Dolibarr php faili pieder web servera lietotājam (vai grupa).
 ErrorNoMailDefinedForThisUser=Nav definēts e-pasts šim lietotājam
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Šai funkcijai ir nepieciešams aktivizēt javascript. Mainīt to var iestatījumi - attēlojums.
 ErrorTopMenuMustHaveAParentWithId0=Tipa &quot;Top&quot; izvēlnē nevar būt mātes ēdienkarti. Put ar 0 mātes izvēlnes vai izvēlēties izvēlni tips &quot;pa kreisi&quot;.
 ErrorLeftMenuMustHaveAParentId=Tipa 'Kreiso' izvēlne jābūt vecākiem id.
@@ -76,7 +78,7 @@ ErrorExportDuplicateProfil=Šāds profila nosaukums jau eksistē šim eksportam.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP saskaņošana nav pilnīga.
 ErrorLDAPMakeManualTest=. LDIF fails ir radīts direktorija %s. Mēģināt ielādēt manuāli no komandrindas, lai būtu vairāk informācijas par kļūdām.
 ErrorCantSaveADoneUserWithZeroPercentage=Nevar saglabāt darbību ar statusu, kas nav startēts, ja arī aizpildīts lauks "done by".
-ErrorRefAlreadyExists=Ref izmantot izveidot jau pastāv.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Lūdzu, ievadiet bankas izraksta nosaukumu, kurā ieraksts jāpaziņo (formāts GGGGMM vai GGGGMMDD).
 ErrorRecordHasChildren=Neizdevās dzēst ierakstu, jo tajā ir daži bērnu ieraksti.
 ErrorRecordHasAtLeastOneChildOfType=Objektam ir vismaz viens bērns no tipa %s
@@ -246,6 +248,14 @@ ErrorProductDoesNotNeedBatchNumber=Kļūda, produkts '<b> %s </b>' nepieņem par
 ErrorFailedToReadObject=Kļūda, neizdevās nolasīt <b> tipa objektu. %s
 ErrorParameterMustBeEnabledToAllwoThisFeature=Kļūda, parametram <b> %s </b> jābūt iespējotam <b> conf / conf.php <b>, lai iekšējais darba plānotājs varētu izmantot komandrindas saskarni
 ErrorLoginDateValidity=Kļūda, šī pieteikšanās ir ārpus derīguma datumu diapazona
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Jūsu PHP parametrs upload_max_filesize (%s) ir augstāks nekā PHP parametrs post_max_size (%s). Šī nav konsekventa iestatīšana.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -276,3 +286,4 @@ WarningSomeBankTransactionByChequeWereRemovedAfter=Daži bankas darījumi tika n
 WarningFailedToAddFileIntoDatabaseIndex=Brīdinājums, neizdevās pievienot faila ierakstu ECM datu bāzes rādītāju tabulā
 WarningTheHiddenOptionIsOn=Brīdinājums: slēpta opcija <b> %s </b> ir ieslēgta.
 WarningCreateSubAccounts=Brīdinājums: jūs nevarat izveidot tieši apakškontu, jums ir jāizveido trešā puse vai lietotājs un jāpiešķir viņiem grāmatvedības kods, lai tos atrastu šajā sarakstā
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/lv_LV/exports.lang b/htdocs/langs/lv_LV/exports.lang
index 8f3f62628ff..c7732d16a4b 100644
--- a/htdocs/langs/lv_LV/exports.lang
+++ b/htdocs/langs/lv_LV/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Atslēga (sleja), ko izmantot esošo datu <b> atjaunināšan
 NbInsert=Ievietoto līniju skaits: %s
 NbUpdate=Atjaunināto līniju skaits: %s
 MultipleRecordFoundWithTheseFilters=Ar šiem filtriem tika atrasti vairāki ieraksti: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/lv_LV/mails.lang b/htdocs/langs/lv_LV/mails.lang
index 24e05670a05..80a62c6eaf0 100644
--- a/htdocs/langs/lv_LV/mails.lang
+++ b/htdocs/langs/lv_LV/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Lietotāja ievadītie e-pasti
 MailingModuleDescDolibarrUsers=Lietotāji ar e-pastu
 MailingModuleDescThirdPartiesByCategories=Trešās personas (pēc sadaļām)
 SendingFromWebInterfaceIsNotAllowed=Sūtīšana no tīmekļa saskarnes nav atļauta.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Līnija %s failā
@@ -129,8 +130,8 @@ NotificationsAuto=Paziņojumi Automātiski.
 NoNotificationsWillBeSent=Šim notikuma veidam un uzņēmumam nav plānoti automātiski e-pasta paziņojumi
 ANotificationsWillBeSent=1 automātisks paziņojums tiks nosūtīts pa e-pastu
 SomeNotificationsWillBeSent=%s automātiskie paziņojumi tiks nosūtīti pa e-pastu
-AddNewNotification=Aktivizējiet jaunu automātisko e-pasta paziņojumu mērķi / notikumu
-ListOfActiveNotifications=Uzskaitiet visus aktīvos mērķus / notikumus automātiskai e-pasta paziņošanai
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
 ListOfNotificationsDone=Uzskaitiet visus nosūtītos automātiskos e-pasta paziņojumus
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
@@ -141,7 +142,7 @@ UseFormatFileEmailToTarget=Importētajam failam jābūt formatētam <strong>e-pa
 UseFormatInputEmailToTarget=Ievadiet virkni ar formātu <strong>e-pasts;nosaukums;vārds;cits</strong>
 MailAdvTargetRecipients=Saņēmēji (papildu izvēle)
 AdvTgtTitle=Aizpildiet ievades laukus, lai iepriekš atlasītu mērķauditoriju trešajām personām vai kontaktpersonām / adresēm
-AdvTgtSearchTextHelp=Izmantojiet %% kā aizstājējzīmes. Piemēram, lai atrastu visu objektu, piemēram, <b> jean, joe, jim </ b>, jūs varat ievadīt <b> j%% </ b>, kuru varat arī izmantot; kā atdalītājs par vērtību, un izmantot! izņemot šo vērtību. Piemēram, <b> jean; joe; jim%%;! Jimo;! Jima% </ b> tiks mērķētas uz visiem jean, joe, sākt ar jim, bet ne jimo, un ne visu, kas sākas ar jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Izmantojiet intervālu, lai izvēlētos int vai float vērtību
 AdvTgtMinVal=Minimālā vērtība
 AdvTgtMaxVal=Maksimālā vērtība
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index 3f1950cb761..cabd7893370 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Šim e-pasta veidam nav pieejamas veidnes
 AvailableVariables=Pieejamie aizstāšanas mainīgie
 NoTranslation=Nav iztulkots
 Translation=Tulkošana
+CurrentTimeZone=Laika josla PHP (servera)
 EmptySearchString=Ievadiet meklēšanas kritērijus
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Nav atrasti ieraksti
 NoRecordDeleted=Neviens ieraksts nav dzēsts
 NotEnoughDataYet=Nepietiek datu
@@ -85,6 +87,8 @@ FileWasNotUploaded=Fails ir izvēlēts pielikumam,  bet vēl nav augšupielādē
 NbOfEntries=Ierakstu skaits
 GoToWikiHelpPage=Lasīt tiešsaistes palīdzību (nepieciešams interneta piekļuve)
 GoToHelpPage=Lasīt palīdzību
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Mājas lapa
 RecordSaved=Ieraksts saglabāts
 RecordDeleted=Ieraksts dzēsts
 RecordGenerated=Ieraksts izveidots
@@ -433,6 +437,7 @@ RemainToPay=Vēl jāsamaksā
 Module=Module/Application
 Modules=Moduļi/lietojumprogrammas
 Option=Iespējas
+Filters=Filters
 List=Saraksts
 FullList=Pilns saraksts
 FullConversation=Pilna saruna
@@ -671,7 +676,7 @@ SendMail=Sūtīt e-pastu
 Email=E-pasts
 NoEMail=Nav e-pasta
 AlreadyRead=Jau izlasīts
-NotRead=Nav lasīts
+NotRead=Nelasīts
 NoMobilePhone=Nav mob. tel.
 Owner=Īpašnieks
 FollowingConstantsWillBeSubstituted=Šādas konstantes tiks aizstāts ar atbilstošo vērtību.
@@ -1107,3 +1112,8 @@ UpToDate=Aktuāls
 OutOfDate=Novecojis
 EventReminder=Atgādinājums par notikumu
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/lv_LV/modulebuilder.lang b/htdocs/langs/lv_LV/modulebuilder.lang
index 4d3e949e746..04eba6b459c 100644
--- a/htdocs/langs/lv_LV/modulebuilder.lang
+++ b/htdocs/langs/lv_LV/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP lapa, lai izveidotu / rediģētu / skatītu ierakstu
 PageForAgendaTab=PHP lappuse notikumu cilnē
 PageForDocumentTab=PHP lapas cilnei
 PageForNoteTab=PHP lapa piezīmju cilnē
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Ceļš uz moduļa / pieteikuma pakotnes rāvienu
 PathToModuleDocumentation=Ceļš uz moduļa / lietojumprogrammas dokumentācijas failu (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces vai speciālās rakstzīmes nav atļautas.
@@ -77,7 +78,7 @@ IsAMeasure=Vai pasākums
 DirScanned=Direktorija skenēta
 NoTrigger=Nav sprūda
 NoWidget=Nav logrīku
-GoToApiExplorer=Iet uz API pētnieku
+GoToApiExplorer=API pētnieks
 ListOfMenusEntries=Izvēlnes ierakstu saraksts
 ListOfDictionariesEntries=Vārdnīcu ierakstu saraksts
 ListOfPermissionsDefined=Noteikto atļauju saraksts
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Ja jums ir zināšanas par SQL un PHP, jūs varat izman
 SeeTopRightMenu=Augšējā labajā izvēlnē skatiet <span class="fa fa-bug"></span>
 AddLanguageFile=Pievienot valodas failu
 YouCanUseTranslationKey=Šeit varat izmantot atslēgu, kas ir tulkošanas atslēga, kas tiek atrasta valodas failā (sk. Cilni "Valodas").
-DropTableIfEmpty=(Dzēst tabulu, ja tukša)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=Tabula %s neeksistē
 TableDropped=Tabula %s dzēsta
 InitStructureFromExistingTable=Veidojiet esošās tabulas struktūras masīva virkni
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Izmantojiet konkrētu redaktora URL
 UseSpecificFamily = Izmantojiet noteiktu ģimeni
 UseSpecificAuthor = Izmantojiet noteiktu autoru
 UseSpecificVersion = Izmantojiet konkrētu sākotnējo versiju
-ModuleMustBeEnabled=Vispirms jāaktivizē modulis / programma
 IncludeRefGeneration=Objekta atsauce jāģenerē automātiski
 IncludeRefGenerationHelp=Atzīmējiet šo, ja vēlaties iekļaut kodu, lai automātiski pārvaldītu atsauces ģenerēšanu
 IncludeDocGeneration=Es gribu no objekta ģenerēt dažus dokumentus
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Lauku tips: <br> varchar (99), double (24,8), real, text, html,
 AsciiToHtmlConverter=Ascii uz HTML pārveidotāju
 AsciiToPdfConverter=Ascii uz PDF pārveidotāju
 TableNotEmptyDropCanceled=Tabula nav tukša. Dzēšana tika atcelta.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang
index 74075151ce5..71fbca02153 100644
--- a/htdocs/langs/lv_LV/other.lang
+++ b/htdocs/langs/lv_LV/other.lang
@@ -5,8 +5,6 @@ Tools=Darbarīki
 TMenuTools=Rīki
 ToolsDesc=Visi instrumenti, kas nav iekļauti citos izvēlnes ierakstos, tiek sagrupēti šeit. <br> Visiem rīkiem var piekļūt, izmantojot kreiso izvēlni.
 Birthday=Dzimšanas diena
-BirthdayDate=Dzimšanas diena
-DateToBirth=Dzimšanas datums
 BirthdayAlertOn=dzimšanas dienas brīdinājums aktīvs
 BirthdayAlertOff=dzimšanas dienas brīdinājums neaktīvs
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Rēķina datuma iepriekšējais mēnesis (no 1-12)
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Pēc mēneša (no 1-12) rēķina datums
 TextNextMonthOfInvoice=Pēc mēneša (teksts) rēķina datums
+PreviousMonth=Iepriekšējais mēnesis
+CurrentMonth=Tekošais mēnesis
 ZipFileGeneratedInto=Zip fails, kas ģenerēts <b> %s </b>.
 DocFileGeneratedInto=Doc fails ir izveidots <b> %s </b>.
 JumpToLogin=Atvienots. Iet uz pieteikšanās lapu ...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Labdien)__\n\nLūdzu, nosūtiet sūtījumu
 PredefinedMailContentSendFichInter=__(Labdien)__\n\nLūdzu, skatiet interviju __REF__\n\n\n__ (Ar cieņu) __\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Jūs varat noklikšķināt uz zemāk esošās saites, lai veiktu maksājumu, ja tas vēl nav izdarīts.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Labdien)__\n\n\n__ (Ar cieņu) __\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Notikuma atgādinājums "__EVENT_LABEL__" __EVENT_DATE__ plkst. __EVENT_TIME__ <br> <br> Šis ir automātisks ziņojums, lūdzu, neatbildiet.
 DemoDesc=Dolibarr ir kompakts ERP / CRM, kas atbalsta vairākus biznesa moduļus. Demonstrācija, kas demonstrē visus moduļus, nav jēga, jo šis scenārijs nekad nenotiek (pieejami vairāki simti). Tātad, ir pieejami vairāki demo profili.
 ChooseYourDemoProfil=Izvēlies demo profilu, kas vislabāk atbilst jūsu vajadzībām ...
 ChooseYourDemoProfilMore=... vai izveidojiet savu profilu <br> (manuālā moduļa izvēle)
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Kontaktpersona / adrese, ko izveidojis e-pasta ko
 ProjectCreatedByEmailCollector=Projekts, ko izveidojis e-pasta savācējs no e-pasta MSGID %s
 TicketCreatedByEmailCollector=Biļete, ko izveidojis e-pasta kolekcionārs no e-pasta MSGID %s
 OpeningHoursFormatDesc=Izmantojiet taustiņu -, lai nodalītu darba un aizvēršanas stundas. <br> Izmantojiet atstarpi, lai ievadītu dažādus diapazonus. <br> Piemērs: 8.-12
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Eksportēšanas sadaļa
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index 80aa1c66905..536127ff619 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Aizpildiet pēdējos pakalpojumu līnijas datumus
 MultiPricesAbility=Vairāki cenu segmenti katram produktam / pakalpojumam (katrs klients atrodas vienā cenu segmentā)
 MultiPricesNumPrices=Cenu skaits
 DefaultPriceType=Cenu bāze par saistību neizpildi (ar nodokli bez nodokļa), pievienojot jaunas pārdošanas cenas
-AssociatedProductsAbility=Komplektu aktivizēšana (virtuālie produkti)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Komplekti
 AssociatedProductsNumber=Produktu skaits, kas veido šo komplektu
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Iepirkšanas cenas
 CustomerPrices=Klienta cenas
 SuppliersPrices=Pārdevēja cenas
 SuppliersPricesOfProductsOrServices=Pārdevēja cenas (produktiem vai pakalpojumiem)
-CustomCode=Muita / Prece / HS kods
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Izcelsmes valsts
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Produkta veids (materiāls / gatavs)
 NatureOfProductShort=Produkta veids
 NatureOfProductDesc=Izejviela vai gatavais produkts
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Izmantot fiksētu cenu
 PriceByQuantity=Dažādas cenas apjomam
 DisablePriceByQty=Atspējot cenas pēc daudzuma
 PriceByQuantityRange=Daudzuma diapazons
-MultipriceRules=Cenu segmenta noteikumi
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Izmantojiet cenu segmenta noteikumus (definēti produktu moduļa iestatījumos), lai automātiski aprēķinātu visu pārējo segmentu cenas saskaņā ar pirmo segmentu
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/lv_LV/recruitment.lang b/htdocs/langs/lv_LV/recruitment.lang
index a06859e2516..dc5848592fc 100644
--- a/htdocs/langs/lv_LV/recruitment.lang
+++ b/htdocs/langs/lv_LV/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/lv_LV/sendings.lang b/htdocs/langs/lv_LV/sendings.lang
index f43aacf6d6c..4822bca650a 100644
--- a/htdocs/langs/lv_LV/sendings.lang
+++ b/htdocs/langs/lv_LV/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Citas sūtījumiem uz šo rīkojumu
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Sūtījumi apstiprināšanai,
 StatusSendingCanceled=Atcelts
+StatusSendingCanceledShort=Atcelts
 StatusSendingDraft=Uzmetums
 StatusSendingValidated=Apstiprinātas (produkti, uz kuģi vai jau nosūtīti)
 StatusSendingProcessed=Apstrādāts
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Vispirms jums ir jāapstiprina pasūtījums, la
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Vairāk pilnīgu dokumentu modelis piegādes ieņēmumiem (logo. ..)
+DocumentModelStorm=Pilnīgāks dokumentu paraugs piegādes kvīšu un ekstrahēto lauku saderībai (logotips ...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Pastāvīga EXPEDITION_ADDON_NUMBER nav noteikts
 SumOfProductVolumes=Produkta apjomu summa
 SumOfProductWeights=Summēt produkta svaru
diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
index 6c2b008b488..d98816193f2 100644
--- a/htdocs/langs/lv_LV/stocks.lang
+++ b/htdocs/langs/lv_LV/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Iestatiet vērtību 0, lai atiestatītu daudzumu <br>. Sagl
 UpdateByScaning=Atjauniniet, skenējot
 UpdateByScaningProductBarcode=Atjaunināšana, skenējot (produkta svītrkods)
 UpdateByScaningLot=Atjaunināt, skenējot (partija | sērijas svītrkods)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/lv_LV/ticket.lang b/htdocs/langs/lv_LV/ticket.lang
index b1947dfcce0..43c18d15509 100644
--- a/htdocs/langs/lv_LV/ticket.lang
+++ b/htdocs/langs/lv_LV/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Pieteikumu veids
 TicketDictCategory=Pieteikumu - grupas
 TicketDictSeverity=Pieteikuma svarīgums
 TicketDictResolution=Biļete - izšķirtspēja
-TicketTypeShortBUGSOFT=Dysfontionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Tirdzniecības jautājums
 
+TicketTypeShortCOM=Tirdzniecības jautājums
 TicketTypeShortHELP=Funkcionālās palīdzības pieprasījums
 TicketTypeShortISSUE=Izdošana, kļūda vai problēma
 TicketTypeShortREQUEST=Mainīt vai uzlabot pieprasījumu
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Cits
 TicketSeverityShortLOW=Zems
 TicketSeverityShortNORMAL=Normāls
 TicketSeverityShortHIGH=Augsts
-TicketSeverityShortBLOCKING=Kritiski/bloķēšana
+TicketSeverityShortBLOCKING=Kritisks, bloķējošs
 
 ErrorBadEmailAddress=Lauks "%s" ir nepareizs
 MenuTicketMyAssign=Mani pieteikumi
@@ -60,7 +58,6 @@ OriginEmail=E-pasta avots
 Notify_TICKET_SENTBYMAIL=Sūtīt biļeti pa e-pastu
 
 # Status
-NotRead=Nav lasāms
 Read=Lasīt
 Assigned=Piešķirts
 InProgress=Procesā
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Publiskā saskarne ļauj apmeklētājiem izve
 TicketsAutoAssignTicket=Automātiski piešķirt lietotāju, kas izveidojis biļeti
 TicketsAutoAssignTicketHelp=Veidojot biļeti, lietotājs var automātiski piešķirt biļeti.
 TicketNumberingModules=Čeku numerācijas modulis
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Paziņot trešajai pusei radīšanas laikā
 TicketsDisableCustomerEmail=Vienmēr atspējojiet e-pasta ziņojumus, ja biļete tiek veidota no publiskās saskarnes
 TicketsPublicNotificationNewMessage=Sūtiet e-pastu (s), kad tiek pievienots jauns ziņojums
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Statuss mainīts: %s līdz %s
 TicketNotNotifyTiersAtCreate=Neinformēt uzņēmumu par radīšanu
 Unread=Nelasīts
 TicketNotCreatedFromPublicInterface=Nav pieejams. Biļete netika izveidota no publiskās saskarnes.
-PublicInterfaceNotEnabled=Publiskā saskarne nebija iespējota
 ErrorTicketRefRequired=Nepieciešams biļetes atsauces nosaukums
 
 #
diff --git a/htdocs/langs/lv_LV/website.lang b/htdocs/langs/lv_LV/website.lang
index 45c5b91487f..42971c9e293 100644
--- a/htdocs/langs/lv_LV/website.lang
+++ b/htdocs/langs/lv_LV/website.lang
@@ -30,7 +30,6 @@ EditInLine=Rediģēt inline
 AddWebsite=Pievienot vietni
 Webpage=Web lapa / konteiners
 AddPage=Pievienot lapu / konteineru
-HomePage=Mājas lapa
 PageContainer=Lappuse
 PreviewOfSiteNotYetAvailable=Jūsu vietnes <strong> %s </strong>priekšskatījums vēl nav pieejams. Vispirms jums ir <strong> Jāimportē pilnu vietnes veidni</strong> vai vienkārši <strong>Pievienot lapu/konteineru</strong>".
 RequestedPageHasNoContentYet=Pieprasītā lapa ar id %s vēl nav ievietota, vai kešatmiņas fails .tpl.php tika noņemts. Rediģējiet lapas saturu, lai to atrisinātu.
@@ -101,7 +100,7 @@ EmptyPage=Tukša lapa
 ExternalURLMustStartWithHttp=Ārējam URL ir jāsākas ar http: // vai https: //
 ZipOfWebsitePackageToImport=Augšupielādējiet vietnes veidņu pakotnes ZIP failu
 ZipOfWebsitePackageToLoad=vai izvēlieties pieejamo iegultās vietnes veidņu paketi
-ShowSubcontainers=Iekļaut dinamisko saturu
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Lapas iekšējais URL
 ThisPageIsTranslationOf=Šī lapa / konteiners ir tulkojums
 ThisPageHasTranslationPages=Šajā lapā / konteinerā ir tulkojums
@@ -137,3 +136,4 @@ RSSFeedDesc=Izmantojot šo URL, varat iegūt RSS plūsmu no jaunākajiem rakstie
 PagesRegenerated=reģenerēta %s lapa (s) / konteiners (-i)
 RegenerateWebsiteContent=Atjaunojiet tīmekļa vietnes kešatmiņas failus
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/lv_LV/withdrawals.lang b/htdocs/langs/lv_LV/withdrawals.lang
index b041cca3eff..613a91e6d80 100644
--- a/htdocs/langs/lv_LV/withdrawals.lang
+++ b/htdocs/langs/lv_LV/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Jaunākie %s tiešā debeta ieņēmumi
 MakeWithdrawRequest=Izveidojiet tiešā debeta maksājumu pieprasījumu
 MakeBankTransferOrder=Veiciet kredīta pārveduma pieprasījumu
 WithdrawRequestsDone=%s reģistrēti tiešā debeta maksājumu pieprasījumi
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Trešās puses bankas kods
 NoInvoiceCouldBeWithdrawed=Netika veiksmīgi norakstīts rēķins. Pārbaudiet, vai rēķini ir norādīti uzĦēmumiem ar derīgu IBAN un IBAN ir UMR (unikālas pilnvaras atsauce) ar režīmu <strong> %s </strong>.
 ClassCredited=Klasificēt kreditēts
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA vispirms
 ExecutionDate=Izpildes datums
 CreateForSepa=Izveidojiet tiešā debeta failu
-ICS=Kreditora identifikators CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - katram darījumam piešķirts unikāls ID
 USTRD="Nestrukturēts" SEPA XML tag
 ADDDAYS=Pievienojiet dienas izpildes datumam
@@ -146,3 +148,4 @@ InfoRejectSubject=Tiešais debeta maksājuma uzdevums ir noraidīts
 InfoRejectMessage=Labdien, <br> <br> banka noraidījusi rēķina %s tiešā debeta maksājuma uzdevumu saistībā ar uzņēmumu %s ar summu %s. <br> <br> - <br> %s
 ModeWarning=Iespēja reālā režīmā nav noteikts, mēs pārtraucam pēc šīs simulācijas
 ErrorCompanyHasDuplicateDefaultBAN=Uzņēmumam ar ID %s ir vairāk nekā viens noklusējuma bankas konts. Nevar uzzināt, kuru izmantot.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang
index 01016a2fb76..7ac73743109 100644
--- a/htdocs/langs/mk_MK/accountancy.lang
+++ b/htdocs/langs/mk_MK/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=Сите земји освен %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Главна сметководствена сметка за клиенти што не се дефинирани во сетапот
 MainAccountForSuppliersNotDefined=Главна сметководствена сметка за трговците кои не се дефинирани во сетапот
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index 04f993c0811..f338c69d71f 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=List of OpenDocument templates directories
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Position of Name/Lastname
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu handler where to show new menu
 DetailMenuModule=Module name if menu entry come from a module
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/mk_MK/banks.lang b/htdocs/langs/mk_MK/banks.lang
index 7ed471f3c64..e6623eea6d4 100644
--- a/htdocs/langs/mk_MK/banks.lang
+++ b/htdocs/langs/mk_MK/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/mk_MK/blockedlog.lang b/htdocs/langs/mk_MK/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/mk_MK/blockedlog.lang
+++ b/htdocs/langs/mk_MK/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/mk_MK/boxes.lang b/htdocs/langs/mk_MK/boxes.lang
index 98e75053287..ec9b773dcf9 100644
--- a/htdocs/langs/mk_MK/boxes.lang
+++ b/htdocs/langs/mk_MK/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Најнови %s изменети донации
 BoxTitleLastModifiedExpenses=Најнови %s изменети извештаи за трошоци
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Глобална активност (фактури, понуди, нарачки)
 BoxGoodCustomers=Добри клиенти
 BoxTitleGoodCustomers=%s Добри клиенти
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Неуспешно RSS обновување. Последен успешен датум на обновување: %s
 LastRefreshDate=Најнов датум на обновување
 NoRecordedBookmarks=Нема дефинирани обележувачи.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Сметководство
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/mk_MK/cashdesk.lang b/htdocs/langs/mk_MK/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/mk_MK/cashdesk.lang
+++ b/htdocs/langs/mk_MK/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/mk_MK/categories.lang b/htdocs/langs/mk_MK/categories.lang
index 84e5796763e..52327db3510 100644
--- a/htdocs/langs/mk_MK/categories.lang
+++ b/htdocs/langs/mk_MK/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/mk_MK/companies.lang b/htdocs/langs/mk_MK/companies.lang
index ca5cbff55f1..2d27d1b69a4 100644
--- a/htdocs/langs/mk_MK/companies.lang
+++ b/htdocs/langs/mk_MK/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Вработените
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/mk_MK/compta.lang
+++ b/htdocs/langs/mk_MK/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/mk_MK/cron.lang b/htdocs/langs/mk_MK/cron.lang
index a4c2e9ca7de..016dca81e7a 100644
--- a/htdocs/langs/mk_MK/cron.lang
+++ b/htdocs/langs/mk_MK/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Create/update Scheduled job
 Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
-CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+CronSetup=Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -56,16 +58,16 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Shell command
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
 ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/mk_MK/exports.lang b/htdocs/langs/mk_MK/exports.lang
index 2dcf4317e00..a0eb7161ef2 100644
--- a/htdocs/langs/mk_MK/exports.lang
+++ b/htdocs/langs/mk_MK/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Step
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/mk_MK/mails.lang b/htdocs/langs/mk_MK/mails.lang
index 4d668952b76..0837df31830 100644
--- a/htdocs/langs/mk_MK/mails.lang
+++ b/htdocs/langs/mk_MK/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index 12eb210b51c..b8dd26ca1e1 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Сопственик
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/mk_MK/modulebuilder.lang b/htdocs/langs/mk_MK/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/mk_MK/modulebuilder.lang
+++ b/htdocs/langs/mk_MK/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang
index 54c0572d453..0a7b3723ab1 100644
--- a/htdocs/langs/mk_MK/other.lang
+++ b/htdocs/langs/mk_MK/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
index bf555405861..d2cfb308e8f 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/mk_MK/recruitment.lang b/htdocs/langs/mk_MK/recruitment.lang
index 85e1d55300b..c8838fc60b3 100644
--- a/htdocs/langs/mk_MK/recruitment.lang
+++ b/htdocs/langs/mk_MK/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/mk_MK/sendings.lang b/htdocs/langs/mk_MK/sendings.lang
index 4f7e1453e7f..e21b52f73f1 100644
--- a/htdocs/langs/mk_MK/sendings.lang
+++ b/htdocs/langs/mk_MK/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Other shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Shipments to validate
 StatusSendingCanceled=Canceled
+StatusSendingCanceledShort=Canceled
 StatusSendingDraft=Draft
 StatusSendingValidated=Validated (products to ship or already shipped)
 StatusSendingProcessed=Processed
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/mk_MK/stocks.lang b/htdocs/langs/mk_MK/stocks.lang
index 1de1066fb67..d709d74ae88 100644
--- a/htdocs/langs/mk_MK/stocks.lang
+++ b/htdocs/langs/mk_MK/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/mk_MK/ticket.lang b/htdocs/langs/mk_MK/ticket.lang
index 1353f492ef1..8b74414e186 100644
--- a/htdocs/langs/mk_MK/ticket.lang
+++ b/htdocs/langs/mk_MK/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/mk_MK/website.lang b/htdocs/langs/mk_MK/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/mk_MK/website.lang
+++ b/htdocs/langs/mk_MK/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/mk_MK/withdrawals.lang b/htdocs/langs/mk_MK/withdrawals.lang
index 114a8d9dd6c..e3bec6f9cb8 100644
--- a/htdocs/langs/mk_MK/withdrawals.lang
+++ b/htdocs/langs/mk_MK/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/mn_MN/accountancy.lang b/htdocs/langs/mn_MN/accountancy.lang
index 3211a0b62df..33ba4d9fea7 100644
--- a/htdocs/langs/mn_MN/accountancy.lang
+++ b/htdocs/langs/mn_MN/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/mn_MN/admin.lang b/htdocs/langs/mn_MN/admin.lang
index f1c41a3b62b..189b0b5186a 100644
--- a/htdocs/langs/mn_MN/admin.lang
+++ b/htdocs/langs/mn_MN/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=List of OpenDocument templates directories
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Position of Name/Lastname
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu handler where to show new menu
 DetailMenuModule=Module name if menu entry come from a module
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/mn_MN/banks.lang b/htdocs/langs/mn_MN/banks.lang
index 9500a5b8b2e..a0dc27f86c4 100644
--- a/htdocs/langs/mn_MN/banks.lang
+++ b/htdocs/langs/mn_MN/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/mn_MN/blockedlog.lang b/htdocs/langs/mn_MN/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/mn_MN/blockedlog.lang
+++ b/htdocs/langs/mn_MN/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/mn_MN/boxes.lang b/htdocs/langs/mn_MN/boxes.lang
index d6fd298a3a7..7db4ea8aa17 100644
--- a/htdocs/langs/mn_MN/boxes.lang
+++ b/htdocs/langs/mn_MN/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/mn_MN/cashdesk.lang b/htdocs/langs/mn_MN/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/mn_MN/cashdesk.lang
+++ b/htdocs/langs/mn_MN/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/mn_MN/categories.lang b/htdocs/langs/mn_MN/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/mn_MN/categories.lang
+++ b/htdocs/langs/mn_MN/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/mn_MN/companies.lang b/htdocs/langs/mn_MN/companies.lang
index dadff6a7894..8dc815b522e 100644
--- a/htdocs/langs/mn_MN/companies.lang
+++ b/htdocs/langs/mn_MN/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/mn_MN/compta.lang b/htdocs/langs/mn_MN/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/mn_MN/compta.lang
+++ b/htdocs/langs/mn_MN/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/mn_MN/cron.lang b/htdocs/langs/mn_MN/cron.lang
index d2da7ded67e..2ebdda1e685 100644
--- a/htdocs/langs/mn_MN/cron.lang
+++ b/htdocs/langs/mn_MN/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Create/update Scheduled job
 Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
-CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+CronSetup=Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -56,16 +58,16 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Shell command
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/mn_MN/errors.lang b/htdocs/langs/mn_MN/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/mn_MN/errors.lang
+++ b/htdocs/langs/mn_MN/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
 ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/mn_MN/exports.lang b/htdocs/langs/mn_MN/exports.lang
index 2dcf4317e00..a0eb7161ef2 100644
--- a/htdocs/langs/mn_MN/exports.lang
+++ b/htdocs/langs/mn_MN/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Step
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/mn_MN/mails.lang b/htdocs/langs/mn_MN/mails.lang
index 1235eef3b27..7fd93be7b71 100644
--- a/htdocs/langs/mn_MN/mails.lang
+++ b/htdocs/langs/mn_MN/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/mn_MN/main.lang b/htdocs/langs/mn_MN/main.lang
index e22785650ad..20913010d4d 100644
--- a/htdocs/langs/mn_MN/main.lang
+++ b/htdocs/langs/mn_MN/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/mn_MN/modulebuilder.lang b/htdocs/langs/mn_MN/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/mn_MN/modulebuilder.lang
+++ b/htdocs/langs/mn_MN/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/mn_MN/other.lang b/htdocs/langs/mn_MN/other.lang
index 54c0572d453..0a7b3723ab1 100644
--- a/htdocs/langs/mn_MN/other.lang
+++ b/htdocs/langs/mn_MN/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/mn_MN/products.lang b/htdocs/langs/mn_MN/products.lang
index 97db059594f..f0c4a5362b8 100644
--- a/htdocs/langs/mn_MN/products.lang
+++ b/htdocs/langs/mn_MN/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/mn_MN/recruitment.lang b/htdocs/langs/mn_MN/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/mn_MN/recruitment.lang
+++ b/htdocs/langs/mn_MN/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/mn_MN/sendings.lang b/htdocs/langs/mn_MN/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/mn_MN/sendings.lang
+++ b/htdocs/langs/mn_MN/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Other shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Shipments to validate
 StatusSendingCanceled=Canceled
+StatusSendingCanceledShort=Canceled
 StatusSendingDraft=Draft
 StatusSendingValidated=Validated (products to ship or already shipped)
 StatusSendingProcessed=Processed
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/mn_MN/stocks.lang b/htdocs/langs/mn_MN/stocks.lang
index 660443bcded..6cf089096dd 100644
--- a/htdocs/langs/mn_MN/stocks.lang
+++ b/htdocs/langs/mn_MN/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/mn_MN/ticket.lang b/htdocs/langs/mn_MN/ticket.lang
index 59519282c80..982fff90ffa 100644
--- a/htdocs/langs/mn_MN/ticket.lang
+++ b/htdocs/langs/mn_MN/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/mn_MN/website.lang b/htdocs/langs/mn_MN/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/mn_MN/website.lang
+++ b/htdocs/langs/mn_MN/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/mn_MN/withdrawals.lang b/htdocs/langs/mn_MN/withdrawals.lang
index 114a8d9dd6c..e3bec6f9cb8 100644
--- a/htdocs/langs/mn_MN/withdrawals.lang
+++ b/htdocs/langs/mn_MN/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index cdf26c85c07..50b7a4ce1c6 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -25,7 +25,7 @@ JournalFinancial=Finasielle journaler
 BackToChartofaccounts=Returner kontotabell
 Chartofaccounts=Diagram over kontoer
 ChartOfSubaccounts=Oversikt over individuelle kontoer
-ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
+ChartOfIndividualAccountsOfSubsidiaryLedger=Diagram over individuelle kontoer til sub-hovedboken
 CurrentDedicatedAccountingAccount=Nåværende dedikert konto
 AssignDedicatedAccountingAccount=Ny konto å tildele
 InvoiceLabel=Fakturaetikett
@@ -46,8 +46,9 @@ CountriesNotInEEC=Land ikke i EEC
 CountriesInEECExceptMe=Land i EEC unntatt %s
 CountriesExceptMe=Alle land unntatt %s
 AccountantFiles=Eksporter kildedokumenter
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
-VueByAccountAccounting=View by accounting account
+ExportAccountingSourceDocHelp=Med dette verktøyet kan du eksportere kildehendelsene (liste og PDF-filer) som ble brukt til å generere regnskapet. For å eksportere journalene, bruk menyoppføringen %s - %s.
+VueByAccountAccounting=Vis etter regnskapskonto
+VueBySubAccountAccounting=Vis etter regnskaps-subkonto
 
 MainAccountForCustomersNotDefined=Hoved regnskapskonto for kunder som ikke er definert i oppsettet
 MainAccountForSuppliersNotDefined=Hovedregnskapskonto for leverandører som ikke er definert i oppsettet
@@ -93,8 +94,8 @@ SubledgerAccount=Konto i sub-hovedbok
 SubledgerAccountLabel=Kontoetikett i sub-hovedbok
 ShowAccountingAccount=Vis regnskapskonto
 ShowAccountingJournal=Vis regnskapsjournal
-ShowAccountingAccountInLedger=Show accounting account in ledger
-ShowAccountingAccountInJournals=Show accounting account in journals
+ShowAccountingAccountInLedger=Vis regnskapskonto i hovedbok
+ShowAccountingAccountInJournals=Vis regnskapskonto i journaler
 AccountAccountingSuggest=Foreslått regnskapskonto
 MenuDefaultAccounts=Standard kontoer
 MenuBankAccounts=Bankkonti
@@ -118,7 +119,7 @@ UpdateMvts=Endre en transaksjon
 ValidTransaction=Valider transaksjonen
 WriteBookKeeping=Registrer transaksjoner i regnskap
 Bookkeeping=Hovedbok
-BookkeepingSubAccount=Subledger
+BookkeepingSubAccount=Sub-Hovedbok
 AccountBalance=Kontobalanse
 ObjectsRef=Kildeobjekt ref
 CAHTF=Samlet leverandørkjøp før skatt
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Ikke bundet til regnskapskontoen
 XLineSuccessfullyBinded=%s varer/tjenester bundet til en regnskapskonto
 XLineFailedToBeBinded=%s varer/tjenester ble ikke bundet til en regnskapskonto
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Antall elementer å binde vist pr. side (maksimum anbefalt er 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maksimalt antall linjer på listen og bindingsiden (anbefalt: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begynn sortering av siden "Bindinger å utføre" etter de nyeste først
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begynn sortering av siden "Bindinger utført" etter de nyeste først
 
@@ -156,8 +157,8 @@ ACCOUNTING_MANAGE_ZERO=Tillat å administrere forskjellig antall nuller på slut
 BANK_DISABLE_DIRECT_INPUT=Deaktiver direkteregistrering av transaksjoner på bankkonto
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Aktiver eksportutkast i journal
 ACCOUNTANCY_COMBO_FOR_AUX=Aktiver kombinasjonsliste for datterkonto (kan være treg hvis du har mange tredjeparter)
-ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
+ACCOUNTING_DATE_START_BINDING=Definer en dato for å starte binding og overføring i regnskap. Etter denne datoen vil ikke transaksjonene bli overført til regnskap.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Velg regnskapsvisning som standard ved overføring av regnskap
 
 ACCOUNTING_SELL_JOURNAL=Salgsjournal
 ACCOUNTING_PURCHASE_JOURNAL=Innkjøpsjournal
@@ -177,7 +178,7 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Regnskapskonto for vent
 DONATION_ACCOUNTINGACCOUNT=Regnskapskonto for registrering av donasjoner
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Regnskapskonto for å registrere abonnementer
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Regnskapskonto som standard for å registrere kundeinnskudd
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Regnskapskonto som standard for de kjøpte varene (brukt hvis ikke definert i produktarket)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Regnskapskonto som standard for kjøpte produkter i EU (brukt hvis ikke definert i produktarket)
@@ -198,7 +199,8 @@ Docdate=Dato
 Docref=Referanse
 LabelAccount=Kontoetikett
 LabelOperation=Etikettoperasjon
-Sens=som betyr
+Sens=Retning
+AccountingDirectionHelp=For en regnskapskonto til en kunde, bruk Kreditt for å registrere en betaling du mottok <br> For en regnskapskonto for en leverandør, bruk Debet for å registrere en betaling du foretar
 LetteringCode=Korrespondansekode
 Lettering=Korrespondanse
 Codejournal=Journal
@@ -206,23 +208,24 @@ JournalLabel=Journaletikett
 NumPiece=Del nummer
 TransactionNumShort=Transaksjonsnummer
 AccountingCategory=Personlige grupper
-GroupByAccountAccounting=Grupper etter regnskapskonto
+GroupByAccountAccounting=Gruppere etter hovedbokskonto
+GroupBySubAccountAccounting=Gruppere etter sub-hovedbokskonto
 AccountingAccountGroupsDesc=Her kan du definere noen grupper regnskapskonti. De vil bli brukt til personlige regnskapsrapporter.
 ByAccounts=Etter kontoer
 ByPredefinedAccountGroups=Etter forhåndsdefinerte grupper
 ByPersonalizedAccountGroups=Etter personlige grupper
 ByYear=Etter år
 NotMatch=Ikke valgt
-DeleteMvt=Delete some operation lines from accounting
+DeleteMvt=Slett noen operasjonslinjer fra regnskapet
 DelMonth=Måned å slette
 DelYear=År som skal slettes
 DelJournal=Journal som skal slettes
-ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
+ConfirmDeleteMvt=Dette vil slette alle operasjonslinjene i regnskapet for året/måneden og/eller for en bestemt journal (minst ett kriterium kreves). Du må bruke funksjonen '%s' for å hente den slettede posten tilbake til hovedboken.
+ConfirmDeleteMvtPartial=Dette vil slette transaksjonen fra regnskapet (alle operasjonslinjer relatert til den samme transaksjonen vil bli slettet)
 FinanceJournal=Finansjournal
 ExpenseReportsJournal=Journal for utgiftsrapporter
 DescFinanceJournal=Finansjournal med alle typer betalinger etter bankkonto
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
+DescJournalOnlyBindedVisible=Dette er en oversikt over poster som er bundet til en regnskapskonto og kan registreres i journaler og hovedbok.
 VATAccountNotDefined=MVA-konto er ikke definert
 ThirdpartyAccountNotDefined=Konto for tredjepart er ikke definert
 ProductAccountNotDefined=Konto for vare er ikke definert
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Betaling ikke knyttet til noen vare/tjeneste
 OpeningBalance=Inngående balanse
 ShowOpeningBalance=Vis åpningsbalanse
 HideOpeningBalance=Skjul åpningsbalansen
-ShowSubtotalByGroup=Vis subtotal etter gruppe
+ShowSubtotalByGroup=Vis subtotal etter nivå
 
 Pcgtype=Kontogruppe
 PcgtypeDesc=Kontogruppe brukes som forhåndsdefinerte 'filter' og 'gruppering' kriterier for noen regnskapsrapporter. For eksempel blir 'INNTEKT' eller 'UTGIFT' brukt som grupper for regnskapsføring av varer for å lage utgifts-/inntektsrapporten.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Liste over utgiftsrapport-linjer bundet (eller ikke) til
 DescVentilExpenseReportMore=Hvis du setter opp regnskapskonto med type utgiftsrapport-linjer, vil programmet være i stand til å gjøre alle bindinger mellom utgiftsrapport-linjer og regnskapskontoer med et klikk på knappen <strong>"%s"</strong>. Hvis du fortsatt har noen linjer som ikke er bundet til en konto, må du foreta en manuell binding fra menyen "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Liste over utgiftsrapport-linjer og tilhørende gebyr-regnskapskonto
 
+Closure=Årsavslutning
 DescClosure=Kontroller antall bevegelser per måned som ikke er validert og regnskapsår som allerede er åpne
 OverviewOfMovementsNotValidated=Trinn 1 / Oversikt over bevegelser som ikke er validert. (Nødvendig for å avslutte et regnskapsår)
+AllMovementsWereRecordedAsValidated=Alle bevegelser ble registrert som validert
+NotAllMovementsCouldBeRecordedAsValidated=Ikke alle bevegelser kunne registreres som validert
 ValidateMovements=Valider bevegelser
 DescValidateMovements=Enhver modifisering eller fjerning av skriving, bokstaver og sletting vil være forbudt. Alle påmeldinger for en oppgave må valideres, ellers er det ikke mulig å lukke
-SelectMonthAndValidate=Velg måned og valider bevegelser
 
 ValidateHistory=Bind automatisk
 AutomaticBindingDone=Automatisk binding utført
@@ -293,9 +298,10 @@ Accounted=Regnskapsført i hovedbok
 NotYetAccounted=Ikke regnskapsført i hovedboken enda
 ShowTutorial=Vis veiledning
 NotReconciled=Ikke sammenslått
+WarningRecordWithoutSubledgerAreExcluded=Advarsel, alle operasjoner uten definert sub-hovedbokskonto er filtrert og ekskludert fra denne visningen
 
 ## Admin
-BindingOptions=Binding options
+BindingOptions=Bindingsalternativer
 ApplyMassCategories=Masseinnlegging av kategorier
 AddAccountFromBookKeepingWithNoCategories=Tilgjengelig konto er ennå ikke i en personlig gruppe
 CategoryDeleted=Kategori for regnskapskontoen er blitt slettet
@@ -315,9 +321,9 @@ ErrorAccountingJournalIsAlreadyUse=Denne journalen er allerede i bruk
 AccountingAccountForSalesTaxAreDefinedInto=Merk: Regnskapskonto for MVA er definert i menyen <b>%s</b> - <b>%s </b>
 NumberOfAccountancyEntries=Antall oppføringer
 NumberOfAccountancyMovements=Antall bevegelser
-ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
-ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
-ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Deaktiver binding og overføring til regnskap ved salg (kundefakturaer blir ikke tatt med i regnskapet)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Deaktiver binding og overføring til regnskap ved kjøp (leverandørfakturaer blir ikke tatt med i regnskapet)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Deaktiver binding og overføring til regnskap på utgiftsrapporter (utgiftsrapporter blir ikke tatt med i regnskapet)
 
 ## Export
 ExportDraftJournal=Eksporter utkastjournal
@@ -337,9 +343,10 @@ Modelcsv_LDCompta10=Eksporter for LD Compta (v10 og høyere)
 Modelcsv_openconcerto=Eksport for OpenConcerto (Test)
 Modelcsv_configurable=Eksport CSV Konfigurerbar
 Modelcsv_FEC=Eksporter FEC
+Modelcsv_FEC2=Eksporter FEC (med datogenerering/dokument omvendt)
 Modelcsv_Sage50_Swiss=Eksport for Sage 50 Switzerland
 Modelcsv_winfic=Eksporter Winfic - eWinfic - WinSis Compta
-Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv3=Eksport for Gestinum (v3)
 Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Kontoplan ID
 
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index 9f6a787ed34..16bb89a5d31 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -37,8 +37,8 @@ UnlockNewSessions=Fjern forbindelseslås
 YourSession=Din økt
 Sessions=Brukers økter
 WebUserGroup=Webserver bruker/gruppe
-PermissionsOnFilesInWebRoot=Permissions on files in web root directory
-PermissionsOnFile=Permissions on file %s
+PermissionsOnFilesInWebRoot=Tillatelser for filer i rotkatalogen på web
+PermissionsOnFile=Tillatelser på fil %s
 NoSessionFound=Din PHP-konfigurasjon ser ut til å ikke tillate oppføring av aktive økter. Mappen som brukes til å lagre økter (<b> %s </b>) kan være beskyttet (for eksempel av operativsystemer eller ved hjelp av PHP-direktivet open_basedir).
 DBStoringCharset=Databasetegnsett for lagring av data
 DBSortingCharset=Databasetegnsett for sortering av data
@@ -56,6 +56,8 @@ GUISetup=Visning
 SetupArea=Oppsett
 UploadNewTemplate=Last opp ny mal(er)
 FormToTestFileUploadForm=Skjema for å teste opplasting (i henhold til oppsett)
+ModuleMustBeEnabled=Modulen/applikasjonen <b> %s </b> må være aktivert
+ModuleIsEnabled=Modulen/applikasjonen <b> %s </b> er aktivert
 IfModuleEnabled=Merk: Ja er bare effektiv hvis modulen <b>%s</b> er aktivert
 RemoveLock=Fjern/endre navn på filen <b>%s</b> hvis den eksisterer, for å tillate bruk av oppdaterings-/installeringsverktøyet.
 RestoreLock=Gjenopprett filen <b>%s</b> med kun leserettigheter, for å deaktivere bruk av oppdateringsverktøyet.
@@ -73,7 +75,7 @@ DisableJavascriptNote=Merk: For test eller feilsøking. For optimalisering for b
 UseSearchToSelectCompanyTooltip=Hvis du har et stort antall tredjeparter (> 100 000), kan du øke hastigheten ved å sette konstant COMPANY_DONOTSEARCH_ANYWHERE til 1 i Oppsett-> Annet. Søket vil da være begrenset til starten av strengen.
 UseSearchToSelectContactTooltip=Hvis du har et stort antall tredjeparter (> 100 000), kan du øke hastigheten ved å sette konstant CONTACT_DONOTSEARCH_ANYWHERE til 1 i Oppsett-> Annet. Søket vil da være begrenset til starten av strengen.
 DelaiedFullListToSelectCompany=Vent med å trykke på en tast før innholdet av tredjepart-kombinasjonslisten er lastet.<br>Dette kan øke ytelsen hvis du har mange tredjeparter
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
+DelaiedFullListToSelectContact=Vent til en tast er trykket før innholdet i kontaktlisten lastes. <br> Dette kan øke ytelsen hvis du har et stort antall kontakter, men det er mindre praktisk.
 NumberOfKeyToSearch=Antall tegn for å starte søk: %s
 NumberOfBytes=Antall bytes
 SearchString=Søkestreng
@@ -82,10 +84,9 @@ AllowToSelectProjectFromOtherCompany=På elementer av en tredjepart, kan du velg
 JavascriptDisabled=JavaScript er deaktivert
 UsePreviewTabs=Bruk faner for forhåndsvisning
 ShowPreview=Forhåndsvisning
-ShowHideDetails=Show-Hide details
+ShowHideDetails=Vis-skjul detaljer
 PreviewNotAvailable=Forhåndsvisning ikke tilgjengelig
 ThemeCurrentlyActive=Gjeldende tema
-CurrentTimeZone=Tidssone for PHP (server)
 MySQLTimeZone=Tidssone MySql (database)
 TZHasNoEffect=Datoer lagres og returneres av databaseserver som innsendt streng. Tidssonen har kun effekt ved bruk av UNIX_TIMESTAMP funksjon (som ikke bør brukes av Dolibarr, slik database TZ ikke skal ha noen effekt, selv om den ble endret etter at data ble lagt inn).
 Space=Mellomrom
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Dette området viser administrasjonsfunksjoner. Bruk menyen
 Purge=Utrenskning
 PurgeAreaDesc=Denne siden lar deg slette alle filer som er generert eller lagret av Dolibarr (midlertidige filer eller alle filer i katalogen <b> %s </b>). Bruk av denne funksjonen er normalt ikke nødvendig. Den leveres som en løsning for brukere hvis Dolibarr er vert for en leverandør som ikke tilbyr tillatelser for å slette filer generert av webserveren.
 PurgeDeleteLogFile=Slett loggfiler, inkludert <b>%s</b> definert for Syslog-modulen (ingen risiko for å miste data)
-PurgeDeleteTemporaryFiles=Slett alle midlertidige filer (ingen risiko for å miste data). Merk: Slettingen gjøres bare hvis temp-katalogen ble opprettet for over 24 timer siden.
-PurgeDeleteTemporaryFilesShort=Slett temporære filer
+PurgeDeleteTemporaryFiles=Slett alle loggfiler og midlertidige filer (ingen risiko for å miste data). Merk: Sletting av midlertidige filer gjøres bare hvis temp-katalogen ble opprettet for mer enn 24 timer siden.
+PurgeDeleteTemporaryFilesShort=Slett loggfiler og midlertidige filer
 PurgeDeleteAllFilesInDocumentsDir=Slett alle filer i katalogen: <b> %s </b>. <br> Dette vil slette alle genererte dokumenter relatert til elementer (tredjeparter, fakturaer etc ...), filer lastet opp i ECM-modulen, database backup dumper og midlertidig filer.
 PurgeRunNow=Start utrenskning
 PurgeNothingToDelete=Ingen mapper eller filer å slette.
@@ -222,7 +223,7 @@ Nouveauté=Nyhet
 AchatTelechargement=Kjøp/Last ned
 GoModuleSetupArea=For å distribuere/installere en ny modul, gå til området for Moduloppsett på <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, den offisielle markedsplassen for eksterne moduler til Dolibarr ERP/CRM 
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
+DoliPartnersDesc=Liste over selskaper som tilbyr spesialutviklede moduler eller funksjoner. <br> Merk: Siden Dolibarr er et program med åpen kildekode, bør <i> alle </i> med erfaring i PHP-programmering kunne utvikle en modul.
 WebSiteDesc=Eksterne nettsteder for flere tilleggs- (ikke-kjerne) moduler ...
 DevelopYourModuleDesc=Noen løsninger for å utvikle din egen modul...
 URL=URL
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Foretrukne Partnere
 OtherResources=Andre ressurser
 ExternalResources=Eksterne ressurser
 SocialNetworks=Sosiale nettverk
+SocialNetworkId=Sosialt nettverk ID
 ForDocumentationSeeWiki=For bruker- eller utviklerdokumentasjon (Doc, FAQs ...), <br> ta en titt på Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
 ForAnswersSeeForum=For andre spørsmål/hjelp, kan du bruke Dolibarr forumet: <br> <a href="%s" target="_blank"><b>%s</b></a>
 HelpCenterDesc1=Her er noen ressurser for å få hjelp og støtte med Dolibarr.
@@ -292,7 +294,7 @@ MAIN_MAIL_SMTPS_ID=SMTP-ID (hvis sending av server krever godkjenning)
 MAIN_MAIL_SMTPS_PW=SMTP-passord (hvis sending av server krever godkjenning)
 MAIN_MAIL_EMAIL_TLS=Bruk TLS (SSL) kryptering
 MAIN_MAIL_EMAIL_STARTTLS=Bruk TLS (STARTTL) kryptering
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autoriser selvsignerte sertifikater
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Bruk DKIM til å generere epostsignatur
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for bruk med DKIM
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Navn på DKIM-velger
@@ -304,9 +306,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Standard avsender-epost for manuell sending (Bruker-e
 UserEmail=Bruker-epost
 CompanyEmail=Firma epost
 FeatureNotAvailableOnLinux=Funksjonen er ikke tilgjengelig på Unix/Linux. Test sendmail lokalt.
-FixOnTransifex=Fix the translation on the online translation platform of project
+FixOnTransifex=Rett oversettelsen på prosjektets online oversettelsesplattform
 SubmitTranslation=Hvis oversettelsen for dette språket ikke er fullført, eller du finner feil, kan du rette opp dette ved å redigere filer i katalogen <b>langs/%s</b> og sende inn endringen til www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
+SubmitTranslationENUS=Hvis oversettelsen for dette språket ikke er komplett eller du finner feil, kan du rette dette ved å redigere filer i katalogen <b> langs/%s </b> og sende endrede filer til dolibarr.org/forum, eller, hvis du er en utvikler, med en PR på github .com / Dolibarr / dolibarr
 ModuleSetup=Modulinnstillinger
 ModulesSetup=Moduler/Applikasjonsoppsett
 ModuleFamilyBase=System
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Eksempler med gjeldende konfigurasjon
 ListOfDirectories=Liste over OpenDocument-mapper med maler
 ListOfDirectoriesForModelGenODT=Liste over kataloger som inneholder mal-filer med Opendocument format.<br><br>Sett inn hele banen til kataloger her.<br>Legg til et linjeskift mellom hver katalog.<br>For å legge til en katalog av GED modulen, legg til <b>DOL_DATA_ROOT/ECM/dittkatalognavn her</b>. <br><br>Filer i disse katalogene må slutte med <b>.odt</b> eller <b>.ods</b>.
 NumberOfModelFilesFound=Antall ODT/ODS-malfiler som finnes i disse katalogene
-ExampleOfDirectoriesForModelGen=Eksempler på syntaks:<br>c:\\mydir<br>/Home/mydir<br>DOL_DATA_ROOT/ECM/ecmdir
+ExampleOfDirectoriesForModelGen=Eksempler på syntaks: <br> c:\\myapp\\mydocumentdir\\mysubdir <br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>For å lære hvordan du oppretter ODT dokumentmaler, og før du lagrer dem, les wiki-dokumentasjon:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Plassering av fornavn/etternavn
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parametre for å sikre nettadresser
 SecurityTokenIsUnique=Bruk en unik securekey parameter for hver webadresse
 EnterRefToBuildUrl=Oppgi referanse for objekt %s
 GetSecuredUrl=Få beregnet URL
-ButtonHideUnauthorized=Skjul knapper for brukere uten administratorrettigheter i stedet for å vise dem som grå
+ButtonHideUnauthorized=Skjul uautoriserte handlingsknapper også for interne brukere (bare gråaktig ellers)
 OldVATRates=Gammel MVA-sats
 NewVATRates=Ny MVA-sats
 PriceBaseTypeToChange=Endre på prisene med base referanseverdi definert på
@@ -435,14 +437,14 @@ ExtrafieldCheckBox=Sjekkbokser
 ExtrafieldCheckBoxFromList=Avkrysningsbokser fra tabell
 ExtrafieldLink=Lenke til et objekt
 ComputedFormula=Beregnet felt
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=Du kan legge inn en formel her ved hjelp av andre egenskaper for objekt eller hvilken som helst PHP-koding for å få en dynamisk beregnet verdi. Du kan bruke alle PHP-kompatible formler, inkludert "?" tilstandsoperatør, og følgende globale objekt: <strong> $db, $conf, $langs, $mysoc, $user, $object </strong>. <br> <strong> ADVARSEL </strong>: Bare noen egenskaper for $-objekt kan være tilgjengelige. Hvis du trenger egenskaper som ikke er lastet, er det bare å hente objektet i formelen som i det andre eksemplet. <br> Ved å bruke et beregnet felt betyr det at du ikke kan skrive inn noen verdi fra grensesnittet. Og, hvis det er en syntaksfeil, kan det hende formelen ikke returnerer noe. <br> <br> Eksempel på formel: <br> $object-> id < 10 ? round($object->id / 2, 2): ($object-> id + 2 * $user-> id) * (int) substr($mysoc-> zip, 1, 2 ) <br> <br> Eksempel på å laste inn objekt <br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br> <br> Et annet eksempel på formel for å tvinge objektets belastning og dets overordnede objekt: <br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Overordnet prosjekt ikke funnet'
 Computedpersistent=Lagre beregnede felt
 ComputedpersistentDesc=Beregnede ekstrafelt vil bli lagret i databasen, men verdien blir bare omregnet når objektet til dette feltet endres. Hvis det beregnede feltet avhenger av andre objekter eller globale data, kan denne verdien være feil!
 ExtrafieldParamHelpPassword=Hvis dette feltet er tomt, vil denne verdien bli lagret uten kryptering (feltet må bare skjules med stjerne på skjermen). <br> Angi 'auto' for å bruke standard krypteringsregel for å lagre passordet i databasen (da vil verdiavlesning være bare hash, uten noen måte å hente opprinnelig verdi på)
 ExtrafieldParamHelpselect=Liste over verdier må være linjer med formatet nøkkel,verdi (hvor nøkkelen ikke kan være '0')<br><br>for eksempel:<br>1,verdi1<br>2,verdi2<br>kode3,verdi3<br>...<br><br>For å få listen avhengig av en annen komplementær attributtliste:<br>1,verdi1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>: parent_key<br><br>For å få listen avhengig av en annen liste:<br>1,verdi1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code </i>: parent_key
 ExtrafieldParamHelpcheckbox=Liste over verdier må være linjer med formatet nøkkel,verdi (hvor nøkkelen ikke kan være '0')<br><br>for eksempel:<br>1,verdi1 <br>2,verdi2<br>3,verdi3<br> ...
 ExtrafieldParamHelpradio=Liste over verdier må være linjer med formatet nøkkel,verdi (hvor nøkkelen ikke kan være '0')<br><br>for eksempel:<br>1,verdi1 <br>2,verdi2<br>3,verdi3<br> ...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=Liste over verdier kommer fra en tabell <br> Syntaks: table_name:label_field:id_field::filter<br> Eksempel: c_typent:libelle:id::filter<br><br> - id_field er nødvendigvis en primær nøkkel<br> Filter kan være en enkel test (f.eks active=1) for å vise bare aktiv verdi <br> Du kan også bruke $ID$ i filteret som er gjeldende id for gjeldende objekt <br> For å bruke en SELECT i filteret, bruk nøkkelordet $SEL$ for å omgå anti-injeksjonsbeskyttelse. <br> Hvis du vil filtrere på ekstrafelt, bruk syntaks ekstra.fieldcode=... (hvor feltkode er koden til extrafield) <br> <br> For å ha listen avhengig av en annen utfyllende attributtliste: <br>c_typent:libelle:id:options_12<i> parent_list_code </i>|parent_column:filter <br><br> For å ha listen avhengig av en annen liste: <br> c_typent:libelle:id:<br>parent_list_code<br>|parent_column:filter\n 
 ExtrafieldParamHelpchkbxlst=Liste over verdier kommer fra en tabell <br> Syntaks: table_name:label_field:id_field::filter <br> Eksempel: c_typent:libelle:id::filter<br><br> filter kan være en enkel test (f.eks. Aktiv=1 ) for å vise bare aktiv verdi<br>Du kan også bruke $ID$ i filter, som er gjeldende ID for nåværende objekt<br>For å utføre en SELECT i filter, bruk $SEL$<br>Hvis du vil filtrere på ekstrafeltbruk bruk syntaks extra.fieldcode=... (der feltkoden er koden til ekstrafelt)<br><br>For å få listen avhengig av en annen komplementær attributtliste:<br>c_typent:libelle:id:options_<i>parent_list_code </i> |parent_column:filter<br><br>For å få listen avhengig av en annen liste:<br>c_typent:libelle:id:<i>parent_list_code</i> |parent_column:filter
 ExtrafieldParamHelplink=Parametere må være ObjectName:Classpath <br> Syntaks: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Hold tomt for en enkel separator <br> Sett dette til 1 for en kollaps-separator (åpnes som standard for ny økt, da beholdes status for hver brukerøkt) <br> Sett dette til 2 for en kollaps-separator (kollapset som standard for ny økt, da holdes status foran hver brukerøkt)
@@ -482,13 +484,13 @@ ModuleCompanyCodeCustomerDigitaria=%s etterfulgt av det avkortede kundenavnet me
 ModuleCompanyCodeSupplierDigitaria=%s etterfulgt av det avkortede leverandørnavnet med antall tegn: %s for leverandørens regnskapskode.
 Use3StepsApproval=Som standard må innkjøpsordrer opprettes og godkjennes av 2 forskjellige brukere (ett trinn/bruker for å opprette og ett trinn/bruker for å godkjenne. Merk at hvis brukeren har både tillatelse til å opprette og godkjenne, vil ett trinn/ bruker vil være nok). Du kan bruke dette alternativet for å innføre et tredje trinn/bruker godkjenning, hvis beløpet er høyere enn en spesifisert verdi (så vil 3 trinn være nødvendig: 1=validering, 2=første godkjenning og 3=andre godkjenning dersom beløpet er høyt nok). <br> Sett denne tom en godkjenning (2 trinn) er nok, sett den til en svært lav verdi (0,1) hvis det alltid kreves en andre godkjenning (3 trinn).
 UseDoubleApproval=Bruk 3-trinns godkjennelse når beløpet (eks. MVA) er høyere enn...
-WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
-WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
-WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
-WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
-WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
+WarningPHPMail=ADVARSEL: Oppsettet for å sende e-post fra applikasjonen bruker standard generisk oppsett. Det er ofte bedre å konfigurere utgående epost for å bruke epostserveren til tjenesteleverandøren i stedet for standardoppsettet av flere grunner:
+WarningPHPMailA=- Å bruke serveren til epostleverandøren øker påliteligheten til eposten din, slik at den øker leveringsevnen uten å bli markert som spam
+WarningPHPMailB=- Noen e-posttjenesteleverandører (som Yahoo) tillater ikke at du sender en e-post fra en annen server enn deres egen server. Det nåværende oppsettet ditt bruker serveren til applikasjonen til å sende e-post og ikke serveren til e-postleverandøren din, så noen mottakere (den som er kompatibel med den begrensende DMARC-protokollen) vil spørre e-postleverandøren din om de kan godta e-posten din og noen e-postleverandører (som Yahoo) kan svare "nei" fordi serveren ikke er deres. Noen av de sendte e-postene dine blir kanskje ikke akseptert for levering (vær også oppmerksom på e-postleverandørens sendekvote).
+WarningPHPMailC=- Ved å bruke SMTP-serveren til din egen e-posttjenesteleverandør for å sende e-post vil alle e-postmeldinger som sendes fra applikasjonen bli lagret i "Sendt"-katalogen i postkassen din.
+WarningPHPMailD=Hvis metoden 'PHP Mail' virkelig er metoden du vil bruke, kan du fjerne denne advarselen ved å legge til konstanten MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP til 1 i Hjem - Oppsett - Annet.
 WarningPHPMail2=Hvis din epost-SMTP-leverandør må begrense epostklienten til noen IP-adresser (svært sjelden), er dette IP-adressen til epost-brukeragenten (MUA) for ERP CRM-programmet: <strong> %s </strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=Hvis domenenavnet i avsenderens epostadresse er beskyttet av en SPF-post (spør deg om domenenavnet registrert), må du legge til følgende IP-er i SPF-posten for DNS for domenet ditt: <strong> %s </strong>.
 ClickToShowDescription=Klikk for å vise beskrivelse
 DependsOn=Denne modulen trenger modulen(ene)
 RequiredBy=Denne modulen er påkrevd av modul(ene)
@@ -554,9 +556,9 @@ Module54Desc=Forvaltning av kontrakter (tjenester eller tilbakevendende abonneme
 Module55Name=Strekkoder
 Module55Desc=Behandling av strekkoder
 Module56Name=Betaling med kredittoverføring
-Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module56Desc=Håndtering av betaling til leverandører ved Credit Transfer-ordrer. Den inkluderer generering av SEPA-filer for europeiske land.
 Module57Name=Betalinger med dirketedebet
-Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
+Module57Desc=Håndtering av ordrer med direktedebet. Den inkluderer generering av SEPA-filer for europeiske land.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial integrasjon
 Module60Name=Klistremerker
@@ -662,7 +664,7 @@ Module50200Desc=Gi kunderne en PayPal-betalingssideside (PayPal-konto eller kred
 Module50300Name=Stripe
 Module50300Desc=Tilbyr kunder en Stripe online betalingsside (kreditt/debetkort). Dette kan brukes til å la kundene dine foreta ad-hoc-betalinger eller betalinger knyttet til et bestemt Dolibarr-objekt (faktura, bestilling osv.)
 Module50400Name=Regnskap (dobbeltoppføring)
-Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Regnskapsadministrasjon (dobbeltoppføringer, støtter hovedbok - og sub-hovedbøker). Eksporter hovedboken til flere andre regnskapsprogrammer.
 Module54000Name=PrintIPP
 Module54000Desc=Direkteutskrift (uten å åpne dokumentet)ved hjelp av CUPS IPP inteface (Skriveren må være synlig for serveren, og CUPS må være installert på serveren)
 Module55000Name=Meningsmåling, undersøkelse eller avstemming
@@ -703,9 +705,9 @@ Permission61=Vis intervensjoner
 Permission62=Opprett/endre intervensjoner
 Permission64=Slett intervensjoner
 Permission67=Eksporter intervensjoner
-Permission68=Send interventions by email
+Permission68=Send intervensjoner på e-post
 Permission69=Valider intervensjoner
-Permission70=Invalidate interventions
+Permission70=Ugyldiggjør intervensjoner
 Permission71=Vis medlemmer
 Permission72=Opprett/endre medlemmer
 Permission74=Slett medlemmer
@@ -728,7 +730,7 @@ Permission95=Les rapporter
 Permission101=Vis forsendelser
 Permission102=Opprett/endre forsendelser
 Permission104=Valider forsendelser
-Permission105=Send sendings by email
+Permission105=Send forsendelser på e-post
 Permission106=Eksporter forsendelser
 Permission109=Slett forsendelser
 Permission111=Vis kontoutdrag
@@ -836,10 +838,10 @@ Permission402=Opprett/endre rabatter
 Permission403=Valider rabatter
 Permission404=Slett rabatter
 Permission430=Bruk Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
+Permission511=Les lønnsutbetalinger (dine og underordnedes)
 Permission512=Opprett/endre betaling av lønn
 Permission514=Slett utbetalinger av lønn
-Permission517=Read payments of salaries of everybody
+Permission517=Les alles lønnsutbetalinger
 Permission519=Eksporter lønn
 Permission520=Les lån
 Permission522=Opprett/endre lån
@@ -851,19 +853,19 @@ Permission532=Opprett/endre tjenester
 Permission534=Slett tjenester
 Permission536=Administrer skjulte tjenester
 Permission538=Eksporter tjenester
-Permission561=Read payment orders by credit transfer
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
-Permission564=Record Debits/Rejections of credit transfer
-Permission601=Read stickers
-Permission602=Create/modify stickers
-Permission609=Delete stickers
+Permission561=Les betalingsordrer ved kredittoverføring
+Permission562=Opprett/endre betalingsordre ved kredittoverføring
+Permission563=Send/overfør betalingsordre ved kredittoverføring
+Permission564=Registrer debet/avvisning av kredittoverføring
+Permission601=Les klistremerker
+Permission602=Opprett/modifiser klistremerker
+Permission609=Slett klistremerker
 Permission650=Les BOM (Bills of Materials)
 Permission651=Opprett/oppdater BOM
 Permission652=Slett BOM
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
+Permission660=Les produksjonsordre (MO)
+Permission661=Opprett/endreproduksjonsordre (MO)
+Permission662=Slett produksjonsordre (MO)
 Permission701=Vis donasjoner
 Permission702=Opprett/endre donasjoner
 Permission703=Slett donasjoner
@@ -873,8 +875,8 @@ Permission773=Slett utgiftsrapport
 Permission774=Les alle utgiftsrapporter (alle brukere)
 Permission775=Godkjenn utgiftsrapport
 Permission776=Betal utgift
-Permission777=Read expense reports of everybody
-Permission778=Create/modify expense reports of everybody
+Permission777=Les utgiftsrapporter fra alle
+Permission778=Lag/endre utgiftsrapporter for alle
 Permission779=Eksporter utgiftsrapporter
 Permission1001=Vis beholdning
 Permission1002=Opprett/endre lager
@@ -899,9 +901,9 @@ Permission1185=Godkjen innkjøpsordre
 Permission1186=Utfør innkjøpsordre
 Permission1187=Bekreft mottak av innkjøpsordre
 Permission1188=Slett innkjøpsordre
-Permission1189=Check/Uncheck a purchase order reception
+Permission1189=Merk av/fjern merket for mottak av innkjøpsordre
 Permission1190=Godkjenn (andre godkjenning) innkjøpsordre
-Permission1191=Export supplier orders and their attributes
+Permission1191=Eksporter leverandørordre og deres attributter
 Permission1201=Resultat av en eksport
 Permission1202=Opprett/endre eksport
 Permission1231=Les leverandørfakturaer
@@ -915,8 +917,8 @@ Permission1251=Kjør masseimport av eksterne data til database (datalast)
 Permission1321=Eksportere kundefakturaer, attributter og betalinger
 Permission1322=Gjenåpne en betalt regning
 Permission1421=Eksporter salgsordre og attributter
-Permission1521=Read documents
-Permission1522=Delete documents
+Permission1521=Les dokumenter
+Permission1522=Slett dokumenter
 Permission2401=Les handlinger (hendelser eller oppgaver) knyttet til brukerkonto (hvis eier av en hendelse eller bare er tilordnet)
 Permission2402=Opprette/endre handlinger (hendelser eller oppgaver) knyttet til brukerkontoen (hvis eier av hendelsen)
 Permission2403=Slett handlinger (hendelser eller oppgaver) knyttet til brukerkontoen (hvis eier av hendelsen)
@@ -931,7 +933,7 @@ Permission2515=Oppsett av  dokumentmapper
 Permission2801=Bruk FTP-klient i lesemodus (bla gjennom og laste ned)
 Permission2802=Bruk FTP-klient i skrivemodus (slette eller laste opp filer)
 Permission3200=Les arkiverte hendelser og fingeravtrykk
-Permission3301=Generate new modules
+Permission3301=Generer nye moduler
 Permission4001=Se ansatte
 Permission4002=Opprett ansatte
 Permission4003=Slett ansatte
@@ -952,12 +954,12 @@ Permission23002=Opprett/endre planlagt oppgave
 Permission23003=Slett planlagt oppgave
 Permission23004=Utfør planlagt oppgave
 Permission50101=Bruk salgssted (SimplePOS)
-Permission50151=Use Point of Sale (TakePOS)
+Permission50151=Bruk salgssted (TakePOS)
 Permission50201=Les transaksjoner
 Permission50202=Importer transaksjoner
-Permission50330=Read objects of Zapier
-Permission50331=Create/Update objects of Zapier
-Permission50332=Delete objects of Zapier
+Permission50330=Les Zapier-objekter
+Permission50331=Opprett/oppdater Zapier-objekter
+Permission50332=Slett Zapier-objekter
 Permission50401=Tilknytt varer og fakturaer til regnskapskontoer
 Permission50411=Les operasjoner i hovedbok
 Permission50412=Skriv/rediger operasjoner i hovedbok
@@ -991,11 +993,11 @@ Permission941602=Opprett og endre kvitteringer
 Permission941603=Valider kvitteringer
 Permission941604=Send kvitteringer på e-post
 Permission941605=Eksporter kvitteringer
-Permission941606=Delete receipts
+Permission941606=Slett kvitteringer
 DictionaryCompanyType=Tredjepartstyper
 DictionaryCompanyJuridicalType=Tredjeparts juridiske enheter
-DictionaryProspectLevel=Prospect potential level for companies
-DictionaryProspectContactLevel=Prospect potential level for contacts
+DictionaryProspectLevel=Prospekt potensialnivå for selskaper
+DictionaryProspectContactLevel=Prospekt potensialnivå for kontakter
 DictionaryCanton=Stater/provinser
 DictionaryRegion=Region
 DictionaryCountry=Land
@@ -1026,12 +1028,12 @@ DictionaryUnits=Enheter
 DictionaryMeasuringUnits=Måleenheter
 DictionarySocialNetworks=Sosiale nettverk
 DictionaryProspectStatus=Prospektstatus for selskaper
-DictionaryProspectContactStatus=Prospect status for contacts
+DictionaryProspectContactStatus=Prospektstatus for kontakter
 DictionaryHolidayTypes=Typer permisjon
 DictionaryOpportunityStatus=Lead status for prosjekt/lead
 DictionaryExpenseTaxCat=Utgiftsrapport - Transportkategorier
 DictionaryExpenseTaxRange=Utgiftsrapport - Rangert etter transportkategori
-DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryTransportMode=Intracomm rapport - Transportmodus
 TypeOfUnit=Type enhet
 SetupSaved=Innstillinger lagret
 SetupNotSaved=Oppsettet er ikke lagret
@@ -1068,9 +1070,9 @@ LocalTax2IsUsedDescES=Standard RE-sats når du oppretter prospekter, fakturaer,
 LocalTax2IsNotUsedDescES=Som standard er den foreslåtte IRPF er 0. Slutt på regelen.
 LocalTax2IsUsedExampleES=I Spania, for frilansere og selvstendige som leverer tjenester, og bedrifter som har valgt moduler for skattesystem.
 LocalTax2IsNotUsedExampleES=I Spania er de bedrifter som ikke er ikke skattepliktige
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc="Avgiftsstempelet" eller "inntektsstempelet" er en fast avgift du betaler per faktura (det avhenger ikke av fakturabeløpet). Det kan også være en prosentskatt, men å bruke den andre eller tredje typen skatt er bedre for prosentskatt, ettersom avgiftsstempler ikke gir noen rapportering. Bare få land bruker denne typen avgifter.
 UseRevenueStamp=Bruk et avgiftsstempel
-UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
+UseRevenueStampExample=Verdien av avgiftstempelet er definert som standard i oppsettet av ordbøker (%s - %s - %s)
 CalcLocaltax=Rapport over lokale avgifter 
 CalcLocaltax1=Salg - Innkjøp
 CalcLocaltax1Desc=Lokale skatter-rapporter kalkuleres med forskjellen mellom kjøp og salg
@@ -1078,12 +1080,12 @@ CalcLocaltax2=Innkjøp
 CalcLocaltax2Desc=Lokale skatter-rapportene viser totalt kjøp
 CalcLocaltax3=Salg
 CalcLocaltax3Desc=Lokale skatter-rapportene viser totalt salg
-NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+NoLocalTaxXForThisCountry=I henhold til avgiftsoppsettet (Se %s - %s - %s), trenger ikke landet ditt å bruke en slik type skatt
 LabelUsedByDefault=Etiketten som brukes som standard hvis ingen oversettelse kan bli funnet for kode
 LabelOnDocuments=Etiketten på dokumenter
 LabelOrTranslationKey=Etikett eller oversettelsessnøkkel
 ValueOfConstantKey=Verdien av en konfigurasjonskonstant
-ConstantIsOn=Option %s is on
+ConstantIsOn=Alternativ %s er på
 NbOfDays=Antall dager
 AtEndOfMonth=Ved månedsslutt
 CurrentNext=Nåværende/Neste
@@ -1170,8 +1172,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Utgiftsrapporter for godkjenning
 Delays_MAIN_DELAY_HOLIDAYS=Legg igjen forespørsler for godkjenning
 SetupDescription1=Før du begynner å bruke Dolibarr, må noen innledende parametere defineres og moduler aktiveres/konfigureres.
 SetupDescription2=Følgende to seksjoner er obligatoriske (de to første oppføringene i oppsettmenyen):
-SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
+SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Grunnleggende parametere som brukes til å tilpasse standardoppførselen til applikasjonen din (for eksempel landrelaterte funksjoner).
+SetupDescription4=<a href="%s">%s -> %s</a><br><br> Denne programvaren er en serie med mange moduler/applikasjoner. Modulene relatert til dine behov må være aktivert og konfigurert. Menyoppføringer vises ved aktivering av disse modulene.
 SetupDescription5=Annet oppsett menyoppføringer styrer valgfrie parametere.
 LogEvents=Hendelser relatert til sikkerhet
 Audit=Revisjon
@@ -1182,7 +1184,7 @@ InfoWebServer=Om Webserver
 InfoDatabase=Om Database
 InfoPHP=Om PHP
 InfoPerf=Om ytelse
-InfoSecurity=About Security
+InfoSecurity=Om sikkerhet
 BrowserName=Navn på nettleser
 BrowserOS=Nettleserens operativsystem
 ListOfSecurityEvents=Oversikt over sikkerhetshendelser i Dolibarr
@@ -1191,7 +1193,7 @@ LogEventDesc=Aktiver logging av bestemte sikkerhetshendelser. Administratorer n
 AreaForAdminOnly=Oppsettparametere kan bare angis av <b> administratorbrukere </b>.
 SystemInfoDesc=Systeminformasjon er diverse teknisk informasjon som kun vises i skrivebeskyttet modus, og som kun er synlig for administratorer.
 SystemAreaForAdminOnly=Dette området er kun tilgjengelig for administratorbrukere. Dolibarr brukerrettigheter kan ikke endre denne begrensningen.
-CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
+CompanyFundationDesc=Rediger informasjonen til din bedrift/organisasjon. Klikk på "%s" -knappen nederst på siden når du er ferdig.
 AccountantDesc=Hvis du har en ekstern revisor/regnskapsholder, kan du endre dennes informasjon her.
 AccountantFileNumber=Regnskapsførerkode
 DisplayDesc=Parametre som påvirker utseende og oppførsel av Dolibarr kan endres her.
@@ -1199,7 +1201,7 @@ AvailableModules=Tilgjengelige apper/moduler
 ToActivateModule=Gå til innstillinger for å aktivere moduler.
 SessionTimeOut=Tidsgrense for økter
 SessionExplanation=Dette tallet garanterer at økten aldri utløper før denne forsinkelsen, hvis økten kjøres med intern PHP-session cleaner (og ingenting annet). Intern PHP session cleaner garanterer ikke at økten utløper like etter denne forsinkelsen. Det utløper etter denne forsinkelsen, og når session cleaner er ferdig,  hver <b>%s/%s</b> tilgang, men bare under tilgang fra andre økter <br>. Merk: på noen servere med en ekstern session cleaner(cron under debian, ubuntu ...), kan øktene bli ødelagt etter en periode definert av et eksternt oppsett, uansett verdien som er angitt her.
-SessionsPurgedByExternalSystem=Sessions on this server seems to be cleaned by an external mechanism (cron under debian, ubuntu ...), probably every <b>%s</b> seconds (= value of parameter <b>session.gc_maxlifetime</b>), so changing the value here has no effect. You must ask the server administrator to change session delay.
+SessionsPurgedByExternalSystem=Økter på denne serveren ser ut til å bli renset av en ekstern mekanisme (cron under debian, ubuntu ...), sannsynligvis hvert <b>%s</b> sekund (= verdien av parameteren <b> session.gc_maxlifetime </b>. Du må be serveradministratoren om å endre øktforsinkelse.
 TriggersAvailable=Tilgjengelige utløsere
 TriggersDesc=Utløsere (triggers) er filer som vil påvirke Dolibarrs virkemåte og arbeidsflyt når de kopieres inn i mappen <b>htdocs/core/triggers</b>. De aktiverer nye handlinger, aktivert av Dolibarrhendelser (ny tredjepart, opprette faktura ...).
 TriggerDisabledByName=Utløserne i denne filen er slått av med endelsen <b>-NORUN</b> i navnet.
@@ -1233,7 +1235,7 @@ RestoreDesc2=Gjenopprett sikkerhetskopifilen (f.eks. Zip-fil) i mappen "dokument
 RestoreDesc3=Gjenopprett databasestrukturen og dataene fra en sikkerhetskopierings-dumpfil i databasen til den nye Dolibarr-installasjonen eller i databasen til nåværende installasjonen (<b> %s </b>). Advarsel, når gjenopprettingen er fullført, må du bruke et login/passord, som eksisterte fra backup tid/installasjon for å koble til igjen. <br> For å gjenopprette en sikkerhetskopiert database til gjeldende installasjon, kan du følge denne assistenten.
 RestoreMySQL=MySQL import
 ForcedToByAModule=Denne regelen er tvunget til å <b>%s</b> av en aktivert modul
-ValueIsForcedBySystem=This value is forced by the system. You can't change it.
+ValueIsForcedBySystem=Denne verdien bestemmes av systemet. Du kan ikke endre det.
 PreviousDumpFiles=Eksisterende sikkerhetskopier
 PreviousArchiveFiles=Eksisterende arkivfiler
 WeekStartOnDay=Første dag i uken
@@ -1294,8 +1296,8 @@ WarningAtLeastKeyOrTranslationRequired=Et søkekriterie er nødvendig for nøkke
 NewTranslationStringToShow=Ny oversettelsesstreng som skal vises
 OriginalValueWas=Den originale oversettelsen er overskrevet. Original verdi var:<br><br>%s
 TransKeyWithoutOriginalValue=Du tvang en ny oversettelse for oversettelsesnøkkelen '<strong> %s</strong>' som ikke finnes i noen språkfiler
-TitleNumberOfActivatedModules=Activated modules
-TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Aktiverte moduler
+TotalNumberOfActivatedModules=Aktiverte moduler: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Du må minst aktivere en modul
 ClassNotFoundIntoPathWarning=Klasse %s ikke funnet i PHP banen
 YesInSummer=Ja i sommer
@@ -1314,7 +1316,7 @@ PHPModuleLoaded=PHP-komponent %s lastet
 PreloadOPCode=Forhåndslastet OPCode brukes
 AddRefInList=Vis kunde/leverandør-ref i liste (velg liste eller kombinasjonsboks), og det meste av hyperkobling. Tredjepart vil vises med navnet "CC12345 - SC45678 - Stort selskap", i stedet for "Stort selskap".
 AddAdressInList=Vis liste over kunde-/leverandøradresseinfo (velg liste eller kombinasjonsboks) <br> Tredjeparter vil vises med et navnformat av "The Big Company Corp." - 21 Jump Street 123456 Big Town - USA "i stedet for" The Big Company Corp ".
-AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
+AddEmailPhoneTownInContactList=Vis kontakt-epost (eller telefoner hvis ikke definert) og poststed (velg liste eller kombinasjonsfelt) <br> Kontakter vises med navneformatet "Ola Nordmann - ola.nordmann@email.com - Bergen" eller "Ola Nordmann - 55 55 55 55 - Bergen "i stedet for"Ola Nordmann".
 AskForPreferredShippingMethod=Spør etter foretrukket sendingsmetode for tredjeparter
 FieldEdition=Endre felt %s
 FillThisOnlyIfRequired=Eksempel: +2 (brukes kun hvis du opplever problemer med tidssone offset)
@@ -1322,7 +1324,7 @@ GetBarCode=Hent strekkode
 NumberingModules=Nummereringsmodeller
 DocumentModules=Dokumentmodeller
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Returner et passord generert i henhold til intern Dolibarr-algoritme: %s tegn som inneholder både tall og små bokstaver.
 PasswordGenerationNone=Ikke foreslå å generere passord. Passord må legges inn manuelt.
 PasswordGenerationPerso=Returner et passord i følge din personlige konfigurasjon
 SetupPerso=I følge din konfigurasjon
@@ -1332,7 +1334,7 @@ RuleForGeneratedPasswords=Regler for å generere og validere passord
 DisableForgetPasswordLinkOnLogonPage=Ikke vis koblingen "Glemt passord" på innloggingssiden
 UsersSetup=Oppsett av brukermodulen
 UserMailRequired=E-postadresse kreves for å opprette en ny bruker
-UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
+UserHideInactive=Skjul inaktive brukere fra alle kombinasjonslister over brukere (anbefales ikke: dette kan bety at du ikke vil kunne filtrere eller søke på gamle brukere på enkelte sider)
 UsersDocModules=Dokumentmaler for dokumenter generert fra brukerpost
 GroupsDocModules=Dokumentmaler for dokumenter generert fra en gruppeoppføring
 ##### HRM setup #####
@@ -1393,7 +1395,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Spør om Lagerkilde for ordre
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Be om bankkonto destinasjon for innkjøpsordre
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
+SuggestedPaymentModesIfNotDefinedInOrder=Foreslått betalingsmodus på salgsordre som standard hvis ikke definert i ordren
 OrdersSetup=Salgsordreoppsett
 OrdersNumberingModules=Nummereringsmodul for ordre
 OrdersModelModule=Ordremaler
@@ -1421,7 +1423,7 @@ AdherentMailRequired=E-post kreves for å lage et nytt medlem
 MemberSendInformationByMailByDefault=Valg for å sende e-postbekreftelse til medlemmer (validering eller nytt abonnement) er krysset av som standard
 VisitorCanChooseItsPaymentMode=Besøkende kan velge blant tilgjengelige betalingsmåter
 MEMBER_REMINDER_EMAIL=Aktiver automatisk påminnelse <b> via e-post </b> av utløpte abonnementer. Merk: Modul <strong> %s </strong> må være aktivert og riktig oppsatt for å sende påminnelser.
-MembersDocModules=Document templates for documents generated from member record
+MembersDocModules=Dokumentmaler for dokumenter generert fra medlemsregister
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Globale parametre
@@ -1564,9 +1566,9 @@ LDAPDescValues=Eksempelverdier er designet for <b>OpenLDAP</b> med følgende las
 ForANonAnonymousAccess=For autentisert tilgang (f.eks skrivetilgang)
 PerfDolibarr=Ytelse oppsett/optimaliseringsrapport
 YouMayFindPerfAdviceHere=Denne siden gir noen kontroller eller råd relatert til ytelse.
-NotInstalled=Not installed.
-NotSlowedDownByThis=Not slowed down by this.
-NotRiskOfLeakWithThis=Not risk of leak with this.
+NotInstalled=Ikke installert.
+NotSlowedDownByThis=Ikke bremset av dette.
+NotRiskOfLeakWithThis=Ikke fare for lekkasje med dette.
 ApplicativeCache=Applikasjons-cache
 MemcachedNotAvailable=Ingen applikativ cache funnet. Du kan forbedre ytelsen ved å installere en cache-server Memcached og en modul som kan bruke denne cache-serveren. <br> Mer informasjon her <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Merk: Mange webhosting-leverandører har ikke en slik cache-server.
 MemcachedModuleAvailableButNotSetup=Modulen memcache er funnet, men oppsett er ikke komplett
@@ -1614,7 +1616,7 @@ SyslogLevel=Nivå
 SyslogFilename=Filnavn og bane
 YouCanUseDOL_DATA_ROOT=Du kan bruke DOL_DATA_ROOT / dolibarr.log som loggfil i Dolibarr "dokumenter"-mappen. Du kan angi en annen bane for å lagre denne filen.
 ErrorUnknownSyslogConstant=Konstant %s er ikke en kjent syslog-konstant
-OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
+OnlyWindowsLOG_USER=I Windows støttes bare LOG_USER-funksjonen
 CompressSyslogs=Komprimering og sikkerhetskopiering av feilsøkingsloggfiler (generert av modulen Log for debug)
 SyslogFileNumberOfSaves=Antall sikkerhetskopilogger som skal beholdes
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Konfigurer planlagt jobb for å angi logg backupfrekvens
@@ -1672,7 +1674,7 @@ AdvancedEditor=Avansert editor
 ActivateFCKeditor=Aktiver avansert editor for:
 FCKeditorForCompany=WYSIWIG opprettelse/endring av elementbeskrivelse og notater (untatt varer og tjenester)
 FCKeditorForProduct=WYSIWIG opprettelse/endring av vare-/tjenestebeskrivelse og notater
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
+FCKeditorForProductDetails=WYSIWIG oppretting/endring av varedetaljer for alle enheter (tilbud, ordre, fakturaer, etc ...). <span class="warning"> Advarsel: Det er ikke anbefalt å bruke dette alternativet i dette tilfellet, da det kan skape problemer med spesialtegn og sideformatering når du bygger PDF-filer. </span>
 FCKeditorForMailing= WYSIWIG opprettelse/endring av masse-e-postutsendelser (Verktøy->E-post)
 FCKeditorForUserSignature=WYSIWIG-opprettelse av signatur
 FCKeditorForMail=WYSIWIG opprettelse/redigering for all post (unntatt Verktøy ->eMailing)
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personlige menyer som ikke er lenket til en toppmeny
 NewMenu=Ny meny
 MenuHandler=Menybehandler
 MenuModule=Kildemodul
-HideUnauthorizedMenu= Skjul uautoriserte menyer (grå)
+HideUnauthorizedMenu=Skjul uautoriserte menyer også for interne brukere (bare gråtonet ellers)
 DetailId=Meny-ID
 DetailMenuHandler=Menyhåndterer skulle vise en ny meny
 DetailMenuModule=Modulnavn hvis menyoppføringen kom  fra en modul
@@ -1737,16 +1739,16 @@ AGENDA_USE_EVENT_TYPE=Bruk hendelsestyper (administrert i menyoppsett -> Ordbøk
 AGENDA_USE_EVENT_TYPE_DEFAULT=Angi denne standardverdien automatisk for type hendelse i skjema for hendelsesoppretting
 AGENDA_DEFAULT_FILTER_TYPE=Still inn denne typen hendelse automatisk i søkefilter i agendavisning
 AGENDA_DEFAULT_FILTER_STATUS=Angi denne status automatisk for hendelser i søkefilter i agendavisning
-AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
+AGENDA_DEFAULT_VIEW=Hvilken visning vil du åpne som standard når du velger menyen Agenda
+AGENDA_REMINDER_BROWSER=Aktiver påminnelse om hendelse <b> i brukerens nettleser </b> (Når påminnelsesdato er nådd, vises en popup i nettleseren. Hver bruker kan deaktivere slike varsler i nettleseren).
 AGENDA_REMINDER_BROWSER_SOUND=Aktiver lydvarsler
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL=Aktiver påminnelse om hendelse <b> via epost </b> (påminnelsesalternativ/forsinkelse kan defineres for hver hendelse).
+AGENDA_REMINDER_EMAIL_NOTE=Merk: Frekvensen av oppgaven %s må være nok til å være sikker på at påminnelsen sendes i riktig øyeblikk.
 AGENDA_SHOW_LINKED_OBJECT=Vis koblet objekt i agendavisning
 ##### Clicktodial #####
 ClickToDialSetup='Click To Dial' modul
 ClickToDialUrlDesc=Url som kalles når man klikker på telefonpiktogrammet. I URL kan du bruke koder <br> <b> __ PHONETO __ </b> som blir erstattet med telefonnummeret til personen som skal ringes <br> <b> __ PHONEFROM __ </b> som blir erstattet med telefonnummeret til den som ringer(din) <br> <b> __ LOGIN __ </b> som vil bli erstattet med clicktodial login (definert på brukerkort) <br> <b> __ PASS __ </b> som vil bli erstattet med clicktodial passord (definert på brukerkort).
-ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
+ClickToDialDesc=Denne modulen endrer telefonnumre, når du bruker en datamaskin, til klikkbare lenker. Et klikk vil ringe nummeret. Dette kan brukes til å starte telefonsamtalen når du har en telefon på skrivebordet eller når du for eksempel bruker et CTI-system basert på SIP-protokoll. Merk: Når du bruker en smarttelefon, er telefonnumre alltid klikkbare.
 ClickToDialUseTelLink=Bruk kun en lenke "tlf:" for telefonnumre
 ClickToDialUseTelLinkDesc=Bruk denne metoden hvis brukerne har en softphone eller et programvaregrensesnitt installert på samme datamaskin som nettleseren, og kalles når du klikker på en link i nettleseren din som starter med "tel:". Hvis du trenger en full server-løsning (uten behov for lokal installasjon av programvare), må du sette denne på "Nei" og fylle neste felt.
 ##### Point Of Sale (CashDesk) #####
@@ -1867,7 +1869,7 @@ TopMenuDisableImages=Skjul bilder i toppmeny
 LeftMenuBackgroundColor=Bakgrunnsfarge for venstre meny
 BackgroundTableTitleColor=Bakgrunnsfarge for tittellinje i tabellen
 BackgroundTableTitleTextColor=Tekstfarge for tabellens tittellinje
-BackgroundTableTitleTextlinkColor=Text color for Table title link line
+BackgroundTableTitleTextlinkColor=Tekstfarge for tabellens tittellink
 BackgroundTableLineOddColor=Bakgrunnsfarge for oddetalls-tabellinjer
 BackgroundTableLineEvenColor=Bakgrunnsfarge for partalls-tabellinjer
 MinimumNoticePeriod=Frist for beskjed (Feriesøknaden må sendes inn før denne fristen)
@@ -1876,7 +1878,7 @@ EnterAnyCode=Dette feltet inneholder en referanse til identifikasjon av linje. B
 Enter0or1=Skriv inn 0 eller 1
 UnicodeCurrency=Her legger du inn en liste med Ascii-verdier, som representerer et valutasymbol. For eksempel: $ = [36], Brasilsk real R$ = [82,36], € = [8364]
 ColorFormat=RGB-fargen er i HEX-format, for eksempel: FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
+PictoHelp=Ikonnavn i dolibarr-format ('image.png' hvis det er i den aktuelle temakatalogen, 'image.png@nom_du_module' hvis det er i katalogen /img/ til en modul)
 PositionIntoComboList=Plassering av linje i kombinasjonslister
 SellTaxRate=Salgs-skattesats
 RecuperableOnly=Ja for MVA"Ikke oppfattet, men gjenopprettelig" dedikert til noen steder i Frankrike. Hold verdien til "Nei" i alle andre tilfeller.
@@ -1917,7 +1919,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s er tilgjengelig. Versj
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s er tilgjengelig. Versjon %s er en vedlikeholdsversjon, så den inneholder bare feilrettinger. Vi anbefaler alle brukere å oppgradere til denne versjonen. En vedlikeholdsløsning introduserer ikke nye funksjoner eller endringer i databasen. Du kan laste den ned fra nedlastingsområdet på https://www.dolibarr.org portal (underkatalog Stable versions). Du kan lese <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> for fullstendig liste over endringer.
 MultiPriceRuleDesc=Når alternativet "Flere prisnivået pr. vare/tjeneste" er på, kan du definere forskjellige priser (ett pr prisnivå) for hvert produkt. For å spare tid, kan du lage en regel som gir pris for hvert nivå autokalkulert i forhold til prisen på første nivå, slik at du bare legger inn en pris for hvert produkt. Denne siden er laget for å spare tid og kan være nyttig hvis prisene for hvert nivå står i forhold til første nivå. Du kan ignorere denne siden i de fleste tilfeller.
 ModelModulesProduct=Maler for produkt-dokumenter
-WarehouseModelModules=Templates for documents of warehouses
+WarehouseModelModules=Maler for varehusdokumenter
 ToGenerateCodeDefineAutomaticRuleFirst=For å kunne generere koder automatisk, må du først definere et program for å automatisk definere strekkodenummeret.
 SeeSubstitutionVars=Relaterte gjentakende fakturaer
 SeeChangeLog=Se Endringslogg-fil (kun på engelsk)
@@ -1983,10 +1985,11 @@ EMailHost=Vert for e-post IMAP-server
 MailboxSourceDirectory=Postkasse kildemappe
 MailboxTargetDirectory=Postkasse målmappe
 EmailcollectorOperations=Operasjoner som skal utføres av samler
+EmailcollectorOperationsDesc=Operasjoner utføres i rekkefølge fra topp til bunn
 MaxEmailCollectPerCollect=Maks antall e-postmeldinger pr. innsamling
 CollectNow=Samle nå
 ConfirmCloneEmailCollector=Er du sikker på at du vil klone e-postsamleren %s?
-DateLastCollectResult=Dato for sist forsøk på samling
+DateLastCollectResult=Dato for siste forsøk på samling
 DateLastcollectResultOk=Dato for siste vellykkede samling
 LastResult=Siste resultat
 EmailCollectorConfirmCollectTitle=E-post-samling bekreftelse
@@ -1996,20 +1999,20 @@ NothingProcessed=Ingenting gjort
 XEmailsDoneYActionsDone=%s e-postmeldinger kvalifiserte, %s e-postmeldinger som er vellykket behandlet (for %s-post/handlinger utført)
 RecordEvent=Registrer e-posthendelse
 CreateLeadAndThirdParty=Opprett lead (og tredjepart om nødvendig)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+CreateTicketAndThirdParty=Opprett billett (og lenke til tredjepart hvis den ble lastet inn av en tidligere operasjon)
 CodeLastResult=Siste resultatkode
 NbOfEmailsInInbox=Antall e-poster i kildemappen
 LoadThirdPartyFromName=Legg inn tredjepartsøk på %s (bare innlasting)
 LoadThirdPartyFromNameOrCreate=Legg inn tredjepartsøk på %s (opprett hvis ikke funnet)
 WithDolTrackingID=Melding fra en samtale initiert av en første e-post sendt fra Dolibarr
 WithoutDolTrackingID=Melding fra en samtale initiert av en første e-post IKKE sendt fra Dolibarr
-WithDolTrackingIDInMsgId=Message sent from Dolibarr
-WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Opprett kandidatur
+WithDolTrackingIDInMsgId=Melding sendt fra Dolibarr
+WithoutDolTrackingIDInMsgId=Melding IKKE sendt fra Dolibarr
+CreateCandidature=Opprett jobbsøknad
 FormatZip=Postnummer
 MainMenuCode=Meny-oppføringskode (hovedmeny)
 ECMAutoTree=Vis ECM-tre automatisk 
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Definer verdiene som skal brukes til objektet for handlingen, eller hvordan du trekker ut verdier. For eksempel: <br> objproperty1=SET: verdien som skal settes <br> objproperty2=SET: en verdi med erstatning av __objproperty1__ <br> objproperty3=SETIFEMPTY: verdi brukt hvis objproperty3b ikke allerede er definert <br>     objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>    options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br> Bruk semikolon som separator for å trekke ut eller angi flere egenskaper.
 OpeningHours=Åpningstider
 OpeningHoursDesc=Skriv inn de vanlige åpningstidene for bedriften din.
 ResourceSetup=Konfigurasjon av ressursmodulen
@@ -2041,17 +2044,17 @@ UseDebugBar=Bruk feilsøkingsfeltet
 DEBUGBAR_LOGS_LINES_NUMBER=Nummer på siste logglinjer å beholde i konsollen
 WarningValueHigherSlowsDramaticalyOutput=Advarsel, høyere verdier reduserer resultatet dramatisk
 ModuleActivated=Modul %s er aktivert og bremser grensesnittet
-IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
-AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+IfYouAreOnAProductionSetThis=Hvis du er i et produksjonsmiljø, bør du sette denne egenskapen til %s.
+AntivirusEnabledOnUpload=Antivirus aktivert på opplastede filer
 EXPORTS_SHARE_MODELS=Eksportmodellene er delt med alle
 ExportSetup=Oppsett av modul Eksport
 ImportSetup=Oppsett av importmodul
 InstanceUniqueID=Unik ID for forekomsten
 SmallerThan=Mindre enn
 LargerThan=Større enn
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
+IfTrackingIDFoundEventWillBeLinked=Merk at hvis en sporings-ID for et objekt blir funnet i epost, eller hvis eposten er et svar på en epostadresse som er samlet og koblet til et objekt, blir den opprettede hendelsen automatisk knyttet til det kjente relaterte objektet.
 WithGMailYouCanCreateADedicatedPassword=Med en Gmail-konto, hvis du aktiverte 2-trinns validering, anbefales det å opprette et dedikert annet passord for applikasjonen, i stedet for å bruke ditt eget kontopassord fra https://myaccount.google.com/.
-EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
+EmailCollectorTargetDir=Det kan være en ønsket oppførsel å flytte eposten til en annet merke/katalog når den er behandlet. Bare sett navnet på katalogen her for å bruke denne funksjonen (IKKE bruk spesialtegn i navnet). Vær oppmerksom på at du også må bruke en konto med lese-/skrivetillatelse .
 EmailCollectorLoadThirdPartyHelp=Du kan bruke denne handlingen til å bruke e-postinnholdet til å finne og laste inn en eksisterende tredjepart i databasen din. Den funnet (eller opprettede) tredjeparten vil bli brukt til å følge handlinger som trenger det. I parameterfeltet kan du bruke for eksempel 'EXTRACT:BODY:Name:\\s([^\\s]*)' hvis du vil trekke ut navnet på tredjeparten fra en streng 'Name: name to find' funnet i teksten.
 EndPointFor=Sluttpunkt for %s: %s
 DeleteEmailCollector=Slett e-postsamler
@@ -2066,20 +2069,24 @@ MakeAnonymousPing=Utfør et anonymt Ping '+1' til Dolibarr foundation-serveren (
 FeatureNotAvailableWithReceptionModule=Funksjonen er ikke tilgjengelig når modulen Mottak er aktivert
 EmailTemplate=Mal for e-post
 EMailsWillHaveMessageID=E-postmeldinger vil være merket 'Referanser' som samsvarer med denne syntaksen
-PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
+PDF_USE_ALSO_LANGUAGE_CODE=Hvis du vil at tekst i PDF-en din skal dupliseres på 2 forskjellige språk i samme genererte PDF, må du angi dette andre språket, slik at generert PDF vil inneholde 2 forskjellige språk på samme side, det som er valgt når du genererer PDF og dette ( bare få PDF-maler støtter dette). Hold tom for ett språk per PDF.
 FafaIconSocialNetworksDesc=Skriv inn koden til et FontAwesome-ikon. Hvis du ikke vet hva som er FontAwesome, kan du bruke den generelle verdien fa-adresseboken.
 FeatureNotAvailableWithReceptionModule=Funksjonen er ikke tilgjengelig når modulen Mottak er aktivert
-RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+RssNote=Merk: Hver definisjon av RSS-feed gir en widget som du må aktivere for å ha den tilgjengelig i dashbordet
 JumpToBoxes=Gå til Setup -> Widgets
 MeasuringUnitTypeDesc=Bruk en verdi som "størrelse", "overflate", "volum", "vekt", "tid"
 MeasuringScaleDesc=Skalaen er antall steder du må flytte kommaet for å samsvare med standard referansenhet. For enhetstypen "tid" er det antall sekunder. Verdier mellom 80 og 99 er reserverte verdier.
 TemplateAdded=Mal lagt til
 TemplateUpdated=Mal oppdatert
 TemplateDeleted=Mal slettet
-MailToSendEventPush=Event reminder email
-SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+MailToSendEventPush=Epospåminnelse om hendelse
+SwitchThisForABetterSecurity=Det anbefales å bytte denne verdien til %s for mer sikkerhet
 DictionaryProductNature= Varens art
 CountryIfSpecificToOneCountry=Land (hvis spesifikt for et gitt land)
-YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
-ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+YouMayFindSecurityAdviceHere=Du kan finne sikkerhetsrådgivning her
+ModuleActivatedMayExposeInformation=Denne modulen kan avsløre sensitive data. Hvis du ikke trenger det, deaktiver det.
+ModuleActivatedDoNotUseInProduction=En modul designet for utvikling er aktivert. Ikke aktiver det i et produksjonsmiljø.
+CombinationsSeparator=Skilletegn for varekombinasjoner
+SeeLinkToOnlineDocumentation=Se lenke til online dokumentasjon i toppmenyen for eksempler
+SHOW_SUBPRODUCT_REF_IN_PDF=Hvis funksjonen "%s" til modul <b> %s </b> brukes, kan du vise detaljer om undervarer av et sett på PDF.
+AskThisIDToYourBank=Kontakt banken din for å få denne ID-en
diff --git a/htdocs/langs/nb_NO/agenda.lang b/htdocs/langs/nb_NO/agenda.lang
index 755d782a5e0..6cbce1b00b5 100644
--- a/htdocs/langs/nb_NO/agenda.lang
+++ b/htdocs/langs/nb_NO/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Antall hendelser
 ListOfActions=Oversikt over hendelser
 EventReports=Hendelsesrapporter
 Location=Lokasjon
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Arrangement tildelt en eller flere brukere i gruppen
 EventOnFullDay=Hendelse over hele dagen(e)
 MenuToDoActions=Alle åpne handlinger
 MenuDoneActions=Alle avsluttede handlinger
@@ -86,8 +86,8 @@ ProposalDeleted=Tilbud slettet
 OrderDeleted=Ordre slettet
 InvoiceDeleted=Faktura slettet
 DraftInvoiceDeleted=Fakturautkast slettet
-CONTACT_CREATEInDolibarr=Contact %s created
-CONTACT_DELETEInDolibarr=Contact %s deleted
+CONTACT_CREATEInDolibarr=Kontakt %s opprettet
+CONTACT_DELETEInDolibarr=Kontakt %s slettet
 PRODUCT_CREATEInDolibarr=Vare%s opprettet
 PRODUCT_MODIFYInDolibarr=Vare %s endret
 PRODUCT_DELETEInDolibarr=Vare %s slettet
@@ -152,6 +152,7 @@ ActionType=Hendelsestype
 DateActionBegin=Startdato for hendelse
 ConfirmCloneEvent=Er du sikker på at du vil klone hendelsen <b>%s</b>?
 RepeatEvent=Gjenta hendelse
+OnceOnly=Kun en gang
 EveryWeek=Hver uke
 EveryMonth=Hver måned
 DayOfMonth=Dag i måned
@@ -160,9 +161,9 @@ DateStartPlusOne=Startdato + 1 time
 SetAllEventsToTodo=Sett alle hendelser til ToDo
 SetAllEventsToInProgress=Sett alle begivenheter til Pågår
 SetAllEventsToFinished=Sett alle hendelser til Ferdig
-ReminderTime=Reminder period before the event
-TimeType=Duration type
-ReminderType=Callback type
-AddReminder=Create an automatic reminder notification for this event
-ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+ReminderTime=Varslingsperiode før hendelsen
+TimeType=Varighetstype
+ReminderType=Tilbakekallingstype
+AddReminder=Opprett et automatisk varsel for denne hendelsen
+ErrorReminderActionCommCreation=Feil ved oppretting av varselet for denne hendelsen
+BrowserPush=Varsling om nettleser-popup
diff --git a/htdocs/langs/nb_NO/banks.lang b/htdocs/langs/nb_NO/banks.lang
index 4717bd50c69..447ebb7eff7 100644
--- a/htdocs/langs/nb_NO/banks.lang
+++ b/htdocs/langs/nb_NO/banks.lang
@@ -173,10 +173,10 @@ SEPAMandate=SEPA mandat
 YourSEPAMandate=Ditt SEPA-mandat
 FindYourSEPAMandate=Dette er ditt SEPA-mandat for å autorisere vårt firma til å utføre direktedebitering til din bank. Send det i retur signert (skanning av det signerte dokumentet) eller send det via post til
 AutoReportLastAccountStatement=Fyll feltet 'Antall bankoppgaver' automatisk med siste setningsnummer når du avstemmer
-CashControl=POS cash fence
-NewCashFence=Ny cash fence
+CashControl=POS kassekontroll
+NewCashFence=Ny kasseavslutning
 BankColorizeMovement=Fargelegg bevegelser
 BankColorizeMovementDesc=Hvis denne funksjonen er aktivert, kan du velge spesifikk bakgrunnsfarge for debet- eller kredittbevegelser
 BankColorizeMovementName1=Bakgrunnsfarge for debetbevegelse
 BankColorizeMovementName2=Bakgrunnsfarge for kredittbevegelse
-IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
+IfYouDontReconcileDisableProperty=Hvis du ikke foretar bankavstemninger på noen bankkontoer, deaktiverer du egenskapen"%s" for å fjerne denne advarselen.
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index 140ab547c4d..4e1c65ac58f 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -212,10 +212,10 @@ AmountOfBillsByMonthHT=Sum fakturaer pr. mnd (eks. MVA)
 UseSituationInvoices=Tillat delfaktura
 UseSituationInvoicesCreditNote=Tillat delfaktura kreditnota
 Retainedwarranty=Tilbakehold
-AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
+AllowedInvoiceForRetainedWarranty=Garantibeløp kan brukes på følgende typer fakturaer
 RetainedwarrantyDefaultPercent=Tilbakehold standardprosent
-RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
-RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
+RetainedwarrantyOnlyForSituation=Gjør "garantibeløp" tilgjengelig kun for delfakturaer
+RetainedwarrantyOnlyForSituationFinal=På delfakturaer brukes det globale "garantibeløpet" bare på den avsluttende fakturaen
 ToPayOn=Å betale på %s
 toPayOn=å betale på %s
 RetainedWarranty=Tilbakehold
@@ -578,5 +578,5 @@ CustomersInvoicesArea=Kunde-faktureringsområde
 SupplierInvoicesArea=Leverandør faktureringsområde
 FacParentLine=Faktura forelderlinje
 SituationTotalRayToRest=Rest å betale eks. mva
-PDFSituationTitle=Situation n° %d
+PDFSituationTitle=Delfaktura nr. %d
 SituationTotalProgress=Total progresjon%d %%
diff --git a/htdocs/langs/nb_NO/blockedlog.lang b/htdocs/langs/nb_NO/blockedlog.lang
index 1f7280e6ab8..554c86e4f39 100644
--- a/htdocs/langs/nb_NO/blockedlog.lang
+++ b/htdocs/langs/nb_NO/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Uforanderlige logger
 ShowAllFingerPrintsMightBeTooLong=Vis alle arkiverte logger (kan være lang)
 ShowAllFingerPrintsErrorsMightBeTooLong=Vis alle ikke-gyldige arkivlogger (kan være lang)
 DownloadBlockChain=Last ned fingeravtrykk
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Arkiverte loggoppføringer er ikke gyldige. Det betyr at noen (en hacker?) Har endret noen data fra denne posten etter at den ble spilt inn, eller har slettet den forrige arkiverte posten (sjekk at linjen med forrige # eksisterer).
 OkCheckFingerprintValidity=Arkivert logg er gyldig. Det betyr at ingen data på denne linjen ble endret og posten følger den forrige.
 OkCheckFingerprintValidityButChainIsKo=Arkivert logg ser ut til å være gyldig i forhold til den forrige, men kjeden var ødelagt tidligere.
 AddedByAuthority=Lagret hos ekstern myndighet
@@ -35,7 +35,7 @@ logDON_DELETE=Donasjon logisk sletting
 logMEMBER_SUBSCRIPTION_CREATE=Medlemskap opprettet
 logMEMBER_SUBSCRIPTION_MODIFY=Medlemsskap endret
 logMEMBER_SUBSCRIPTION_DELETE=Medlemskap logisk sletting
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Loggfør for kassaavslutning
 BlockedLogBillDownload=Kundefaktura nedlasting
 BlockedLogBillPreview=Kundefaktura forhåndsvisning
 BlockedlogInfoDialog=Loggdetaljer
diff --git a/htdocs/langs/nb_NO/boxes.lang b/htdocs/langs/nb_NO/boxes.lang
index 494febc0a2f..4e5b200dd3e 100644
--- a/htdocs/langs/nb_NO/boxes.lang
+++ b/htdocs/langs/nb_NO/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Siste %s endrede donasjoner
 BoxTitleLastModifiedExpenses=Siste %s endrede utgiftsrapporter
 BoxTitleLatestModifiedBoms=Siste %s modifiserte BOM-er
 BoxTitleLatestModifiedMos=Siste %s endrede produksjonsordre
+BoxTitleLastOutstandingBillReached=Kunder med maksimalt utestående overskredet
 BoxGlobalActivity=Global aktivitet (fakturaer, tilbud, ordrer)
 BoxGoodCustomers=Gode kunder
 BoxTitleGoodCustomers=%s gode kunder
+BoxScheduledJobs=Planlagte jobber
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Kunne ikke oppdatere RSS-flux. Siste vellykkede oppdateringsdato: %s
 LastRefreshDate=Siste oppdateringsdato
 NoRecordedBookmarks=Ingen bokmerker definert. Trykk <a href="%s">her</a> for å legge til bokmerker.
@@ -83,8 +86,8 @@ BoxTitleLatestModifiedSupplierOrders=Leverandørordre: siste %s endret
 BoxTitleLastModifiedCustomerBills=Kundefakturaer: siste %s endret
 BoxTitleLastModifiedCustomerOrders=Salgsordre: siste %s endret
 BoxTitleLastModifiedPropals=Siste %s endrede tilbud
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Siste %s endrede jobber
+BoxTitleLatestModifiedCandidatures=Siste %s endrede kandidaturer
 ForCustomersInvoices=Kundefakturaer
 ForCustomersOrders=Kundeordrer
 ForProposals=Tilbud
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Spenningskonto er ikke definert
 BoxLastCustomerShipments=Siste kundeforsendelser
 BoxTitleLastCustomerShipments=Siste %s kundeforsendelser
 NoRecordedShipments=Ingen registrert kundesending
+BoxCustomersOutstandingBillReached=Kunder med utestående grense nådd
 # Pages
 AccountancyHome=Regnskap
+ValidatedProjects=Validerte prosjekter
diff --git a/htdocs/langs/nb_NO/cashdesk.lang b/htdocs/langs/nb_NO/cashdesk.lang
index de0728f2754..3ec944ed126 100644
--- a/htdocs/langs/nb_NO/cashdesk.lang
+++ b/htdocs/langs/nb_NO/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Bunntekst
 AmountAtEndOfPeriod=Beløp ved periodens slutt (dag, måned eller år)
 TheoricalAmount=Teoretisk beløp
 RealAmount=Virkelig beløp
-CashFence=Cash fence
-CashFenceDone=Kontantoppgjør ferdig for perioden
+CashFence=Kasseavslutning
+CashFenceDone=Kasseavslutning utført for perioden
 NbOfInvoices=Ant. fakturaer
 Paymentnumpad=Tastaturtype for å legge inn betaling
 Numberspad=Nummertastatur
@@ -77,7 +77,7 @@ POSModule=POS-modul
 BasicPhoneLayout=Bruk grunnleggende oppsett for telefoner
 SetupOfTerminalNotComplete=Installasjonen av terminal %s er ikke fullført
 DirectPayment=Direktebetaling
-DirectPaymentButton=Add a "Direct cash payment" button
+DirectPaymentButton=Legg til en "Direkte kontantbetaling" -knapp
 InvoiceIsAlreadyValidated=Faktura er allerede validert
 NoLinesToBill=Ingen linjer å fakturere
 CustomReceipt=Tilpasset kvittering
@@ -94,31 +94,33 @@ TakeposConnectorMethodDescription=Ekstern modul med ekstra funksjoner. Mulighet
 PrintMethod=Utskriftsmetode
 ReceiptPrinterMethodDescription=Metode med mange parametere. Full tilpassbar med maler. Kan ikke skrive ut fra skyen.
 ByTerminal=Med terminal
-TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
-CashDeskRefNumberingModules=Numbering module for POS sales
+TakeposNumpadUsePaymentIcon=Bruk ikon i stedet for tekst på betalingsknappene på nummertastaturet
+CashDeskRefNumberingModules=Nummereringsmodul for POS-salg
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b>-tag brukes til å legge til terminalnummeret
 TakeposGroupSameProduct=Grupper samme produktlinjer
 StartAParallelSale=Start et nytt parallellsalg
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Salget startet %s
+ControlCashOpening=Kassekontroll popup når du åpner POS
+CloseCashFence=Lukk kassekontroll
 CashReport=Kontantrapport
 MainPrinterToUse=Hovedskriver som skal brukes
 OrderPrinterToUse=Odreskriver som skal brukes
 MainTemplateToUse=Hovedmal som skal brukes
 OrderTemplateToUse=Ordremal som skal brukes
 BarRestaurant=Bar Restaurant
-AutoOrder=Order by the customer himself
+AutoOrder=Bestilling av kunden selv
 RestaurantMenu=Meny
 CustomerMenu=Kundemeny
 ScanToMenu=Skann QR-koden for å se menyen
 ScanToOrder=Skann QR-koden for å bestille
-Appearance=Appearance
-HideCategoryImages=Hide Category Images
-HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines of images to show
-DefineTablePlan=Define tables plan
-GiftReceiptButton=Add a "Gift receipt" button
-GiftReceipt=Gift receipt
-ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
-AllowDelayedPayment=Allow delayed payment
-PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+Appearance=Utseende
+HideCategoryImages=Skjul kategoribilder
+HideProductImages=Skjul varebilder
+NumberOfLinesToShow=Antall linjer med bilder som skal vises
+DefineTablePlan=Definer tabellplan
+GiftReceiptButton=Legg til en "Gavekvittering" -knapp
+GiftReceipt=Gavekvittering
+ModuleReceiptPrinterMustBeEnabled=Modulen Kvitteringsskriver må ha blitt aktivert først
+AllowDelayedPayment=Tillat forsinket betaling
+PrintPaymentMethodOnReceipts=Skriv ut betalingsmåte på billetter/kvitteringer
+WeighingScale=Vektskala
diff --git a/htdocs/langs/nb_NO/categories.lang b/htdocs/langs/nb_NO/categories.lang
index b5d42ea3eba..fcce83f42ff 100644
--- a/htdocs/langs/nb_NO/categories.lang
+++ b/htdocs/langs/nb_NO/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Prosjekters merker/kategori-område
 UsersCategoriesArea=Område for brukertagger/-kategorier
 SubCats=Underkategorier
 CatList=Liste over merker/kategorier
+CatListAll=Liste over etiketter/kategorier (alle typer)
 NewCategory=Nytt merke/kategori
 ModifCat=Endre merke/kategori
 CatCreated=Merke/kategori opprettet
@@ -65,24 +66,30 @@ UsersCategoriesShort=Brukere tagger/kategorier
 StockCategoriesShort=Lager etiketter/kategorier
 ThisCategoryHasNoItems=Denne kategorien inneholder ingen artikler.
 CategId=Merke/kategori-ID
-CatSupList=Liste over selgerkoder/-kategorier
-CatCusList=Liste over kunde/prospekt merker/kategorier
+ParentCategory=Overordnet etikett/kategori
+ParentCategoryLabel=Merke for overordnet etikett/kategori
+CatSupList=Liste over leverandøretiketter/kategorier
+CatCusList=Liste over kunders/prospekters etiketter/kategorier
 CatProdList=Liste over vare-merker/kategorier
 CatMemberList=Liste over medlems-merker/kategorier
-CatContactList=Liste over kontakt-merker/kategorier
-CatSupLinks=Lenker mellom leverandører og merker/kategorier
+CatContactList=Liste over kontaktersr etiketter/kategorier
+CatProjectsList=Liste over prosjekters etiketter/kategorier
+CatUsersList=Liste over brukeres etiketter/kategorier
+CatSupLinks=Koblinger mellom leverandører og etiketter/kategorier
 CatCusLinks=Lenker mellom kunder/prospekter og merker/kategorier
 CatContactsLinks=Koblinger mellom kontakter/adresser og koder/kategorier
 CatProdLinks=Lenker mellom varer/tjenester og merker/kategorier
-CatProJectLinks=Lenker mellom prosjekter og merker/kategorier
+CatMembersLinks=Lenker mellom medlemmer og merker/kategorier
+CatProjectsLinks=Lenker mellom prosjekter og merker/kategorier
+CatUsersLinks=Koblinger mellom brukere og etiketter/kategorier
 DeleteFromCat=Fjern fra merker/kategorier
 ExtraFieldsCategories=Komplementære attributter
 CategoriesSetup=Oppsett av merker/kategorier
 CategorieRecursiv=Automatisk lenke til overordnet merke/kategori
 CategorieRecursivHelp=Hvis alternativet er på, når du legger til et produkt i en underkategori, vil produktet også bli lagt til i overordnet kategori.
 AddProductServiceIntoCategory=Legg til følgende vare/tjeneste
-AddCustomerIntoCategory=Assign category to customer
-AddSupplierIntoCategory=Assign category to supplier
+AddCustomerIntoCategory=Tilordne kategori til kunde
+AddSupplierIntoCategory=Tilordne kategori til leverandør
 ShowCategory=Vis merke/kategori
 ByDefaultInList=Som standard i liste
 ChooseCategory=Velg kategori
diff --git a/htdocs/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang
index 8a54b565605..d3302eb55c9 100644
--- a/htdocs/langs/nb_NO/companies.lang
+++ b/htdocs/langs/nb_NO/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-IdNr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=EORI-nummer
 ProfId6AT=-
 ProfId1AU=Prof ID 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof ID 1 (Profesjonelt nummer)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=EORI-nummer
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -148,7 +148,7 @@ ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof ID 1 (Føderalt nummer)
 ProfId4CH=Prof ID 2 (Commercial Record number)
-ProfId5CH=EORI number
+ProfId5CH=EORI-nummer
 ProfId6CH=-
 ProfId1CL=Prof ID 1 (RUT)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof ID 1 (USt.-IdNr)
 ProfId2DE=Prof ID 2 (USt.-Nr)
 ProfId3DE=Prof ID 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=EORI-nummer
 ProfId6DE=-
 ProfId1ES=Prof ID 1 (CIF / NIF)
 ProfId2ES=Prof ID 2 (personnummer)
 ProfId3ES=Prof ID 3 (CNAE)
 ProfId4ES=Prof ID 4 (Collegiate nummer)
-ProfId5ES=EORI number
+ProfId5ES=EORI-nummer
 ProfId6ES=-
 ProfId1FR=Prof ID 1 (SIREN)
 ProfId2FR=Prof ID 2 (SIRET)
 ProfId3FR=Prof ID 3 (NAF, gammel APE)
 ProfId4FR=Prof ID 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=EORI-nummer
 ProfId6FR=-
 ProfId1GB=Prof Id 1 (Registreringsnummer)
 ProfId2GB=-
@@ -202,18 +202,18 @@ ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=EORI-nummer
 ProfId1LU=Prof. ID 1 (R.C.S Luxembourg)
 ProfId2LU=Prof. ID (Forretningslisens)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=EORI-nummer
 ProfId6LU=-
 ProfId1MA=Prof ID 1 (RC)
 ProfId2MA=Prof ID 2 (patent)
 ProfId3MA=Prof ID 3 (IF)
 ProfId4MA=Prof ID 4 (CNSS)
-ProfId5MA=Id prof. 5 (I.C.E.)
+ProfId5MA=Profesjonell ID 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof ID 1 (RFC).
 ProfId2MX=Prof ID 2 (R.. P. IMSS)
@@ -225,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=EORI number
+ProfId5NL=EORI-nummer
 ProfId6NL=-
 ProfId1PT=Prof ID 1 (NIPC)
 ProfId2PT=Prof ID 2 (Personnummer)
 ProfId3PT=Prof ID 3 (Commercial Record number)
 ProfId4PT=Prof ID 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=EORI-nummer
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +255,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=EORI-nummer
 ProfId6RO=-
 ProfId1RU=Prof ID 1 (OGRN)
 ProfId2RU=Prof ID 2 (INN)
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Sjekk internasjonal MVA-ID på EU-kommisjonens nettste
 VATIntraManualCheck=Du kan også sjekke manuelt på den Europeiske kommisjonens nettside <a href="%s" target="_blank"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Sjekk er ikke tilgjengelig. Tjenesten er ikke tilgjengelig for landet (%s).
 NorProspectNorCustomer=Ikke prospekt, eller kunde
-JuridicalStatus=Juridisk enhetstype
+JuridicalStatus=Forretningsenhetstype
 Workforce=Arbeidsstyrke
 Staff=Ansatte
 ProspectLevelShort=Potensiell
diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang
index 41a36d6b33f..81f72a4f4d7 100644
--- a/htdocs/langs/nb_NO/compta.lang
+++ b/htdocs/langs/nb_NO/compta.lang
@@ -111,7 +111,7 @@ Refund=Refusjon
 SocialContributionsPayments=Skatter- og avgiftsbetalinger
 ShowVatPayment=Vis MVA betaling
 TotalToPay=Sum å betale
-BalanceVisibilityDependsOnSortAndFilters=Balanse er synlig i denne listen bare hvis tabellen er sortert stigende etter %s og filtrert for en bankkonto
+BalanceVisibilityDependsOnSortAndFilters=Balanse er bare synlig i denne listen hvis tabellen er sortert på %s og filtrert på 1 bankkonto (uten andre filtre)
 CustomerAccountancyCode=Kunde-regnskapskode
 SupplierAccountancyCode=Leverandørens regnskapskode
 CustomerAccountancyCodeShort=Kundens regnskapskode
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Er du sikker på at du vil slette denne skatten/
 ExportDataset_tax_1=Skatte- og avgiftsbetalinger
 CalcModeVATDebt=Modus <b>%sMVA ved commitment regnskap%s</b>.
 CalcModeVATEngagement=Modus <b>%sMVA på inntekt-utgifter%s</b>.
-CalcModeDebt=Analyse av kjente registrerte fakturaer selv om de ennå ikke er regnskapsført i hovedbok.
+CalcModeDebt=Analyse av kjente dokumenter, selv om de ennå ikke er regnskapsført i hovedbok.
 CalcModeEngagement=Analyse av kjente registrerte innbetalinger, selv om de ennå ikke er regnskapsført i Lhovedbokenedger.
 CalcModeBookkeeping=Analyse av data journalisert i hovedbokens tabell 
 CalcModeLT1= Modus <b>%sRE på kundefakturaer - leverandørfakturaer%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Inn/ut balanse. Årlig oppsummering
 AnnualByCompanies=Inntekts - og utgiftsbalanse, etter forhåndsdefinerte grupper av kontoer
 AnnualByCompaniesDueDebtMode=Balanse over inntekt og utgifter, detalj av forhåndsdefinerte grupper, modus<b>%sKredit-Debet%s</b> viser<b>Forpliktelsesregnskap </b>.
 AnnualByCompaniesInputOutputMode=Inntekts- og utgiftsbalanse, detalj ved forhåndsdefinerte grupper, modus <b> %sInntekter-Utgifter%s</b> viser<b>kontantregnskap</b>.
-SeeReportInInputOutputMode=Se %sanalyse av betalinger%s for en beregning av faktiske utbetalinger gjort selv om de ennå ikke er regnskapsført i hovedboken.
-SeeReportInDueDebtMode=Se %sanalyse av fakturaer%s for en beregning basert på kjente registrerte fakturaer, selv om de ennå ikke er regnskapsført i hovedboken.
-SeeReportInBookkeepingMode=Se <b> %sRegnskapsrapport%s </b> for en beregning på <b> Hovedbokstabell </b>
+SeeReportInInputOutputMode=Se <b> %sanalyse av betalinger%s </b> for en beregning basert på <b> registrerte betalinger </b> gjort selv om de ennå ikke er bokført i hovedbok
+SeeReportInDueDebtMode=Se <b> %sanalyse av registrerte dokumenter%s </b> for en beregning basert på kjente <b> registrerte dokumenter </b> selv om de ennå ikke er regnskapsført
+SeeReportInBookkeepingMode=Se <b> %sanalyse av hovedboktabell%s </b> for en rapport basert på <b> hovedboktabel </b>
 RulesAmountWithTaxIncluded=- Viste beløp er inkludert alle avgifter
 RulesResultDue=- Inkluderer utestående fakturaer, utgifter, mva, donasjoner enten de er betalt eller ikke. Inkluderer også innbetalt lønn. <br> - Basert på faktureringsdato for fakturaer og på forfallsdato for utgifter eller skattebetalinger. For lønn definert med Lønnsmodul brukes valuteringsdato.
 RulesResultInOut=- Inkluderer betalinger gjort mot fakturaer, utgifter, MVA og lønn. <br> Basert på betalingsdato. Donasjonsdato for donasjoner
diff --git a/htdocs/langs/nb_NO/cron.lang b/htdocs/langs/nb_NO/cron.lang
index 22d6c9ff273..74ea3057151 100644
--- a/htdocs/langs/nb_NO/cron.lang
+++ b/htdocs/langs/nb_NO/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Opprett/endre planlagt jobb
 Permission23103 = Slett planlagt jobb
 Permission23104 = Utfør planlagt jobb
 # Admin
-CronSetup= Administrasjon av planlagte oppgaver
-URLToLaunchCronJobs=URL for å sjekke og kjøre kvalifiserte cron-jobber
-OrToLaunchASpecificJob=eller for å sjekke og kjøre en spesifikk jobb
+CronSetup=Administrasjon av planlagte oppgaver
+URLToLaunchCronJobs=URL for å sjekke og starte kvalifiserte cron-jobber fra en nettleser
+OrToLaunchASpecificJob=Eller for å sjekke og starte en bestemt jobb fra en nettleser
 KeyForCronAccess=Sikkerhetsnøkkel for URL for å starte cronjobber
 FileToLaunchCronJobs=Kommandolinje for å sjekke og starte kvalifiserte cron-jobber
 CronExplainHowToRunUnix=I Unix-miljøer bør du bruke følgende crontab-oppføring for å kjøre kommandolinje hvert 5. minutt
-CronExplainHowToRunWin=I Microsoft(tm) Windows-miljø kan du bruke planlagte oppgaver-verktøyet for å kjøre kommandolinje hvert 5. minutt
+CronExplainHowToRunWin=I Microsoft Windows-miljø kan du bruke Planlagt oppgaveverktøy til å kjøre kommandolinjen hvert 5. minutt
 CronMethodDoesNotExists=Klasse %s inneholder ingen metode %s
+CronMethodNotAllowed=Metode %s av klasse %s er i svartelisten over forbudte metoder
 CronJobDefDesc=Cronjobbprofiler er definert i modulbeskrivelsesfilen. Når modulen er aktivert, er de lastet og tilgjengelig slik at du kan administrere jobbene fra administrasjonsmenyen %s.
 CronJobProfiles=Liste over forhåndsdefinerte cronjobbprofiler
 # Menu
@@ -42,10 +43,11 @@ CronModule=Modul
 CronNoJobs=Ingen registrerte jobber
 CronPriority=Prioritet
 CronLabel=Etikett
-CronNbRun=Antall starter
-CronMaxRun=Max number launch
+CronNbRun=Antall kjøringer
+CronMaxRun=Maksimum antall kjøringer
 CronEach=Alle
 JobFinished=Jobb startet og fullført
+Scheduled=Planlagt
 #Page card
 CronAdd= Legg til jobber
 CronEvery=Kjør jobb hver
@@ -56,16 +58,16 @@ CronNote=Kommentar
 CronFieldMandatory=Feltene %s er obligatoriske
 CronErrEndDateStartDt=Sluttdato kan ikke være før startdato
 StatusAtInstall=Status for modulinstallasjon
-CronStatusActiveBtn=Aktiver
+CronStatusActiveBtn=Tidsplan
 CronStatusInactiveBtn=Deaktiver
 CronTaskInactive=Denne jobben er deaktivert
 CronId=ID
 CronClassFile=Filnavn med klasse
-CronModuleHelp=Navn på Dolibarr-modulkatalogen (virker også med ekstern Dolibarr-modul). <BR> For eksempel å anrope hente-metoden for Dolibarr Product objektet/htdocs/<u>product</u>/class/product.class.php, er verdien for modulen<br><i> produkt </i>
-CronClassFileHelp=Den relative banen og filnavnet som skal lastes (banen er i forhold til webserverens rotkatalog). <BR> For eksempel å anrope hente-metoden for Dolibarr Product objekt htdocs/product/class/<u> product.class.php</u>, er verdien for klassefilnavnet<br><i> produkt/class/product.class.php</i>
-CronObjectHelp=Objektnavnet som skal lastes inn. <BR> For eksempel å anrope hente-metoden for Dolibarr Produkt-objektet /htdocs/product/class/product.class.php, er verdien for klassefilnavnet <br> <i> Product </i>
-CronMethodHelp=Objektmetoden som skal kjøres. <BR> For eksempel å anrope hente-metoden for Dolibarr Product objektet /htdocs/product/class/product.class.php, er verdien for metoden <br> <i> hent </i>
-CronArgsHelp=Metodeargumenter. <BR> For eksempel å anrope hente-metoden for Dolibarr Product objektet /htdocs/product/class/product.class.php, kan verdien for parametre være <br><i> 0, ProductRef </i>
+CronModuleHelp=Navn på Dolibarr-modulkatalog (også arbeid med ekstern Dolibarr-modul). <BR> For eksempel å kalle hentmetoden for Dolibarr Produkt objektet /htdocs/<u>product</u>/class/product.class.php, er verdien for modulen <br><i> produkt </i>
+CronClassFileHelp=Den relative banen og filnavnet som skal lastes (banen er i forhold til webserverens rotkatalog). <BR> For eksempel for å kalle hentmetoden for Dolibarr Produkt-objekt htdocs/product/class/ <u> product.class.php </u>, er verdien for klassen filnavn <br><i> produkt/klasse/product.class.php</i>
+CronObjectHelp=Objektnavnet som skal lastes inn. <BR> For eksempel for å kalle hentmetoden for Dolibarr Product-objektet /htdocs/product/class/product.class.php, er verdien for klassefilenavnet <br> <i> Produkt </i>
+CronMethodHelp=Objektmetoden å kjøre. <BR> For eksempel å kalle hentmetoden for Dolibarr Product-objektet /htdocs/product/class/product.class.php, er verdien for metoden <br> <i> hent </i>
+CronArgsHelp=Metoden argumenter. <BR> For eksempel for å kalle hentemetoden for Dolibarr Product-objektet /htdocs/product/class/product.class.php, kan verdien for paramters være<br> <i> 0, ProductRef </i>
 CronCommandHelp=System kommandolinje som skal kjøres
 CronCreateJob=Opprett ny planlagt jobb
 CronFrom=Fra
@@ -76,8 +78,14 @@ CronType_method=Anropsmetode for en PHP-klasse
 CronType_command=Shell kommando
 CronCannotLoadClass=Kan ikke laste klassefil %s (for å bruke klasse %s)
 CronCannotLoadObject=Klassefil %s ble lastet, men objektet %s ble ikke funnet i den
-UseMenuModuleToolsToAddCronJobs=Gå til menyen "Hjem - Administrative verktøy - Planlagte jobber" for å se og endre planlagte jobber
+UseMenuModuleToolsToAddCronJobs=Gå til menyen " <a href="%s">Hjem - Administratorverktøy - Planlagte jobber</a>" for å se og redigere planlagte jobber.
 JobDisabled=Jobb deaktivert
 MakeLocalDatabaseDumpShort=Backup av lokal database
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Opprett en lokal database dump. Parametrene er: komprimering ('gz' eller 'bz' eller 'ingen'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' eller filnavn for å bygge, antall backupfiler som skal beholdes
 WarningCronDelayed=NB, for ytelsesformål, uansett neste utførelsesdato for aktiverte jobber, kan jobbene dine forsinkes til maksimalt %s timer før de kjøres.
+DATAPOLICYJob=Datarenser og anonymiserer
+JobXMustBeEnabled=Jobb %s må være aktivert
+# Cron Boxes
+LastExecutedScheduledJob=Sist utførte planlagte jobb
+NextScheduledJobExecute=Neste planlagte jobb som skal utføres
+NumberScheduledJobError=Antall planlagte jobber med feil
diff --git a/htdocs/langs/nb_NO/deliveries.lang b/htdocs/langs/nb_NO/deliveries.lang
index a6d522cecfc..97f8ad9cdac 100644
--- a/htdocs/langs/nb_NO/deliveries.lang
+++ b/htdocs/langs/nb_NO/deliveries.lang
@@ -2,7 +2,7 @@
 Delivery=Levering
 DeliveryRef=Leveranse ref.
 DeliveryCard=Kvitteringskort
-DeliveryOrder=Delivery receipt
+DeliveryOrder=Leveringsbekreftelse
 DeliveryDate=Leveringsdato
 CreateDeliveryOrder=Generer leveringskvittering
 DeliveryStateSaved=Leveringsstatus lagret
@@ -27,5 +27,6 @@ Recipient=Mottaker
 ErrorStockIsNotEnough=Ikke nok på lager
 Shippable=Kan sendes
 NonShippable=Kan ikke sendes
+ShowShippableStatus=Vis status sendingsklar
 ShowReceiving=Vis leveringskvittering
 NonExistentOrder=Ikkeeksisterende ordre
diff --git a/htdocs/langs/nb_NO/ecm.lang b/htdocs/langs/nb_NO/ecm.lang
index 90e2fb21512..4e037c091f6 100644
--- a/htdocs/langs/nb_NO/ecm.lang
+++ b/htdocs/langs/nb_NO/ecm.lang
@@ -23,7 +23,7 @@ ECMSearchByKeywords=Søk på nøkkelord
 ECMSearchByEntity=Søk på objekt
 ECMSectionOfDocuments=Mapper med dokumenter
 ECMTypeAuto=Automatisk
-ECMDocsBy=Documents linked to %s
+ECMDocsBy=Dokumenter knyttet til %s
 ECMNoDirectoryYet=Ingen mapper opprettet
 ShowECMSection=Vis mappe
 DeleteSection=Fjern mappe
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index 38fa5f550a7..798e6598202 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -8,6 +8,7 @@ ErrorBadEMail=E-post %s er feil
 ErrorBadMXDomain=E-post %s virker feil (domenet har ingen gyldig MX-post)
 ErrorBadUrl=Url %s er feil
 ErrorBadValueForParamNotAString=Feil parameterverdi. Dette skjer vanligvis når en oversettelse mangler.
+ErrorRefAlreadyExists=Referanse <b> %s </b> eksisterer allerede.
 ErrorLoginAlreadyExists=brukernavnet %s eksisterer allerede.
 ErrorGroupAlreadyExists=Gruppen %s eksisterer allerede.
 ErrorRecordNotFound=Posten ble ikke funnet.
@@ -49,6 +50,7 @@ ErrorFieldsRequired=Noen påkrevde felt er ikke fylt ut.
 ErrorSubjectIsRequired=Epost-emnet er påkrevd
 ErrorFailedToCreateDir=Kunne ikke opprette mappen. Kontroller at webserverbrukeren har skriverettigheter i dokumentmappen i Dolibarr. Hvis <b>safe_mode</b> er akivert i PHP, sjekk at webserveren eier eller er med i gruppen(eller bruker) for Dolibarr php-filer.
 ErrorNoMailDefinedForThisUser=Ingen e-post angitt for denne brukeren.
+ErrorSetupOfEmailsNotComplete=Installasjonen av e-post er ikke fullført
 ErrorFeatureNeedJavascript=Denne funksjonen krever javascript for å virke. Endre dette i Oppsett - Visning.
 ErrorTopMenuMustHaveAParentWithId0=En meny av typen 'Topp' kan ikke ha noen foreldremeny. Skriv 0 i foreldremeny eller velg menytypen 'Venstre'.
 ErrorLeftMenuMustHaveAParentId=En meny av typen 'Venstre' må ha foreldre-ID.
@@ -76,7 +78,7 @@ ErrorExportDuplicateProfil=Profilnavnet til dette eksport-oppsettet finnes aller
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP oppsett er ikke komplett.
 ErrorLDAPMakeManualTest=En .ldif fil er opprettet i mappen %s. Prøv å lese den manuelt for å se mer informasjon om feil.
 ErrorCantSaveADoneUserWithZeroPercentage=Kan ikke lagre en handling med "status ikke startet" hvis feltet "ferdig innen" også er fylt ut.
-ErrorRefAlreadyExists=Ref bruket til oppretting finnes allerede.
+ErrorRefAlreadyExists=Referanse <b> %s </b> eksisterer allerede.
 ErrorPleaseTypeBankTransactionReportName=Vennligst skriv inn kontoutskriftsnavnet der oppføringen skal rapporteres (Format YYYYMM eller YYYYMMDD)
 ErrorRecordHasChildren=Kunne ikke slette posten fordi den har noen under-oppføringer.
 ErrorRecordHasAtLeastOneChildOfType=Objektet har minst under-objekt av typen %s
@@ -246,6 +248,14 @@ ErrorProductDoesNotNeedBatchNumber=Feil, vare'<b> %s </b>' godtar ikke lot/serie
 ErrorFailedToReadObject=Feil, kunne ikke lese objektet av typen <b> %s </b>
 ErrorParameterMustBeEnabledToAllwoThisFeature=Feil, parameter <b> %s </b> må være aktivert i <b> conf/conf.php <b> for å tillate bruk av kommandolinjegrensesnitt av den interne jobbplanleggeren
 ErrorLoginDateValidity=Feil, denne påloggingen er utenfor gyldig datoområde
+ErrorValueLength=Lengden på feltet '<b> %s </b>' må være høyere enn '<b> %s </b>'
+ErrorReservedKeyword=Ordet '<b> %s </b>' er et reservert nøkkelord
+ErrorNotAvailableWithThisDistribution=Ikke tilgjengelig i denne distribusjonen
+ErrorPublicInterfaceNotEnabled=Offentlig grensesnitt var ikke aktivert
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=Språket til den nye siden må defineres hvis den er angitt som oversettelse av en annen side
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=Språket på den nye siden må ikke være kildespråket hvis det er angitt som oversettelse av en annen side
+ErrorAParameterIsRequiredForThisOperation=En parameter er obligatorisk for denne operasjonen
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP-parameteren upload_max_filesize (%s) er høyere enn PHP-parameteren post_max_size (%s). Dette er ikke et konsistent oppsett.
 WarningPasswordSetWithNoAccount=Et passord ble satt for dette medlemmet, men ingen brukerkonto ble opprettet. Det fører til at passordet ikke kan benyttes for å logge inn på Dolibarr. Det kan brukes av en ekstern modul/grensesnitt, men hvis du ikke trenger å definere noen innlogging eller passord for et medlem, kan du deaktivere alternativet "opprett en pålogging for hvert medlem" fra medlemsmodul-oppsettet. Hvis du trenger å administrere en pålogging, men ikke trenger noe passord, kan du holde dette feltet tomt for å unngå denne advarselen. Merk: E-post kan også brukes som en pålogging dersom medlemmet er knyttet til en bruker.
@@ -276,3 +286,4 @@ WarningSomeBankTransactionByChequeWereRemovedAfter=Noen banktransaksjoner ble fj
 WarningFailedToAddFileIntoDatabaseIndex=Advarsel, kunne ikke legge til filoppføring i ECM-databasens indekstabell
 WarningTheHiddenOptionIsOn=Advarsel, det skjulte alternativet <b> %s </b> er på.
 WarningCreateSubAccounts=Advarsel, du kan ikke opprette en underkonto direkte, du må opprette en tredjepart eller en bruker og tildele dem en regnskapskode for å finne dem i denne listen
+WarningAvailableOnlyForHTTPSServers=Bare tilgjengelig hvis du bruker HTTPS-sikret tilkobling.
diff --git a/htdocs/langs/nb_NO/exports.lang b/htdocs/langs/nb_NO/exports.lang
index 3bf7bff58ef..e4e5740d9ee 100644
--- a/htdocs/langs/nb_NO/exports.lang
+++ b/htdocs/langs/nb_NO/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Felt tittel
 NowClickToGenerateToBuildExportFile=Velg filformatet i kombinasjonsboksen og klikk på "Generer" for å bygge eksportfilen ...
 AvailableFormats=Tilgjengelige formater
 LibraryShort=Bibliotek
+ExportCsvSeparator=Csv-karakterseparator
+ImportCsvSeparator=Csv-karakterseparator
 Step=Trinn
 FormatedImport=Importassistent
 FormatedImportDesc1=Denne modulen lar deg oppdatere eksisterende data eller legge til nye objekter i databasen fra en fil, ved hjelp av en assistent.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Nøkkel (kolonne) som skal brukes til <b> oppdatering av </b
 NbInsert=Antall innsatte linjer: %s
 NbUpdate=Antall oppdaterte linjer: %s
 MultipleRecordFoundWithTheseFilters=Flere poster er blitt funnet med disse filtrene: %s
+StocksWithBatch=Beholdning og plassering (varehus) av produkter med lot/serienummer
diff --git a/htdocs/langs/nb_NO/intracommreport.lang b/htdocs/langs/nb_NO/intracommreport.lang
index 09e18b987c2..83bcc175538 100644
--- a/htdocs/langs/nb_NO/intracommreport.lang
+++ b/htdocs/langs/nb_NO/intracommreport.lang
@@ -4,12 +4,12 @@ IntracommReportSetup = Oppsett av iIntracommrapport
 IntracommReportAbout = Om intracommreport
 
 # Setup
-INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_NUM_AGREMENT=Godkjenningsnummer (utstedt av vedleggets CISD)
 INTRACOMMREPORT_TYPE_ACTEUR=Aktørtype
 INTRACOMMREPORT_ROLE_ACTEUR=Aktørrolle
-INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
-INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
-INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Forpliktelsesnivå ved introduksjoner
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Forpliktelsesnivå på forsendelser
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Servicekategori av typen "Porto"
 
 INTRACOMMREPORT_NUM_DECLARATION=Deklarantnummer
 
@@ -31,7 +31,7 @@ IntracommReportTitle=Klargjøring av en XML-fil i ProDouane-format
 
 # List
 IntracommReportList=Liste over genererte deklarasjoner
-IntracommReportNumber=Numero of declaration
+IntracommReportNumber=Antall erklæringer
 IntracommReportPeriod=Analyseperiode
 IntracommReportTypeDeclaration=Type deklarasjon
 IntracommReportDownload=last ned XML-fil
diff --git a/htdocs/langs/nb_NO/languages.lang b/htdocs/langs/nb_NO/languages.lang
index 96839b3311b..9abffa71b5b 100644
--- a/htdocs/langs/nb_NO/languages.lang
+++ b/htdocs/langs/nb_NO/languages.lang
@@ -40,7 +40,7 @@ Language_es_PA=Spansk (Panama)
 Language_es_PY=Spansk (Paraguay)
 Language_es_PE=Spansk (Peru)
 Language_es_PR=Spansk (Puerto Rico)
-Language_es_US=Spanish (USA)
+Language_es_US=Spansk (USA)
 Language_es_UY=Spansk (Uruguay)
 Language_es_GT=Spansk (Guatemala)
 Language_es_VE=Spansk (Venezuela)
diff --git a/htdocs/langs/nb_NO/mails.lang b/htdocs/langs/nb_NO/mails.lang
index 5d1b285f2bb..0094103c3a9 100644
--- a/htdocs/langs/nb_NO/mails.lang
+++ b/htdocs/langs/nb_NO/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=E-postmeldinger innlagt av bruker
 MailingModuleDescDolibarrUsers=Brukere med e-post
 MailingModuleDescThirdPartiesByCategories=Tredjeparter (etter kategorier)
 SendingFromWebInterfaceIsNotAllowed=Det er ikke tillatt å sende fra webgrensesnitt.
+EmailCollectorFilterDesc=Alle filtre må samsvare for at en e-post skal hentes inn
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Antall linjer i filen: %s
@@ -129,8 +130,8 @@ NotificationsAuto=Påminnelser Auto.
 NoNotificationsWillBeSent=Ingen automatiske e-postvarsler er planlagt for denne hendelsestypen og selskap
 ANotificationsWillBeSent=Én automatisk varsling vil bli sendt via e-post
 SomeNotificationsWillBeSent=%s automatiske varsler vil bli sendt via e-post
-AddNewNotification=Aktiver et nytt automatisk mål/hendelse for e-postvarsling
-ListOfActiveNotifications=Liste over alle aktive mål/hendelser for automatisk e-postvarsling
+AddNewNotification=Abonner på et nytt automatisk e-postvarsel (mål/hendelse)
+ListOfActiveNotifications=Liste opp alle aktive abonnementer (mål/hendelser) for automatisk e-postvarsling
 ListOfNotificationsDone=Liste over alle automatiske e-postvarsler som er sendt
 MailSendSetupIs=E-postutsendelser er  blitt satt opp til '%s'. Denne modusen kan ikke brukes ved masseutsendelser
 MailSendSetupIs2=Logg på som administrator, gå til menyen %sHjem - Oppsett - E-post%s for å endre parameter <strong>'%s'</strong> for å bruke '%s' modus. I denne modusen for du tilgang til oppsett av SMTP-server og muligheten til å bruke masseutsendelser.
@@ -141,7 +142,7 @@ UseFormatFileEmailToTarget=Importert fil må følge formatet <strong>epost;navn;
 UseFormatInputEmailToTarget=Tast inn en streng med format <strong>epost;navn;fornavn;annet</strong>
 MailAdvTargetRecipients=Mottakere (avansert utvalg)
 AdvTgtTitle=Fyll inn felt for å forhåndsvelge tredjeparter eller kontakter/adresser som skal velges
-AdvTgtSearchTextHelp=Bruk %% som jokertegn. For eksempel for å finne alle element som <b> jan, jon, jimmy </b>, kan du skrive inn <b> j%% </b>. Du kan også bruke; som separator for verdi, og bruk ! for unntatt denne verdien. For eksempel vil <b> jan; jon; jim%%;! Jimo;! Jima% </b> målrette alle jan, jon, starter med jim men ikke jimo og ikke alt som starter med jima
+AdvTgtSearchTextHelp=Bruk %% som jokertegn. For eksempel for å finne alt som <b> jean, joe, jim </b>, kan du legge inn <b> j%% </b>, du kan også bruke ; som skilletegn for verdi, og bruk ! for å ekskludere denne verdien. For eksempel <b> jean; joe; jim%%;!Jimo;!Jima%% </b> vil målrette mot alle jean, joe, starter med jim, men ikke jimo og ikke alt som starter med jima
 AdvTgtSearchIntHelp=Bruk intervall for å velge heltall eller desimaltall
 AdvTgtMinVal=Minimumsverdi
 AdvTgtMaxVal=Maksimumsverdi
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index 8def7e71e28..d807171680c 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Ingen mal tilgjengelig for denne e-posttypen
 AvailableVariables=Tilgjengelige erstatningsverdier
 NoTranslation=Ingen oversettelse
 Translation=Oversettelse
+CurrentTimeZone=Tidssone for PHP (server)
 EmptySearchString=Angi ikke-tomme søkekriterier
+EnterADateCriteria=Skriv inn datokriterier
 NoRecordFound=Ingen post funnet
 NoRecordDeleted=Ingen poster slettet
 NotEnoughDataYet=Ikke nok data
@@ -85,6 +87,8 @@ FileWasNotUploaded=En fil er valgt som vedlegg, men er ennå ikke lastet opp. Kl
 NbOfEntries=Antall oppføringer
 GoToWikiHelpPage=Les online-hjelp (Du må være tilknyttet internett)
 GoToHelpPage=Les hjelp
+DedicatedPageAvailable=Det finnes en dedikert hjelpeside relatert til din nåværende side
+HomePage=Hjemmeside
 RecordSaved=Posten er lagret
 RecordDeleted=Oppføring slettet
 RecordGenerated=Post generert
@@ -197,7 +201,7 @@ ReOpen=Gjenåpne
 Upload=Last opp
 ToLink=Lenke
 Select=Velg
-SelectAll=Select all
+SelectAll=Velg alt
 Choose=Velg
 Resize=Endre størrelse
 ResizeOrCrop=Endre størrelse eller beskjær
@@ -258,7 +262,7 @@ Cards=Kort
 Card=Kort
 Now=Nå
 HourStart=Start time
-Deadline=Deadline
+Deadline=Frist
 Date=Dato
 DateAndHour=Dato og tid
 DateToday=Dagens dato
@@ -267,10 +271,10 @@ DateStart=Startdato
 DateEnd=Sluttdato
 DateCreation=Opprettet den
 DateCreationShort=Oppr. dato
-IPCreation=Creation IP
+IPCreation=Opprettelses-IP
 DateModification=Endret den
 DateModificationShort=Mod. dato
-IPModification=Modification IP
+IPModification=Modifikasjons-IP
 DateLastModification=Siste endringsdato
 DateValidation=Validert den
 DateClosing=Lukket den
@@ -433,6 +437,7 @@ RemainToPay=Gjenstår å betale
 Module=Modul/Applikasjon
 Modules=Moduler/Applikasjoner
 Option=Opsjon
+Filters=Filtre
 List=Liste
 FullList=Full liste
 FullConversation=Full samtale
@@ -671,7 +676,7 @@ SendMail=Send e-post
 Email=E-post
 NoEMail=Ingen e-post
 AlreadyRead=Allerede lest
-NotRead=Ikke lest
+NotRead=Ulest
 NoMobilePhone=Ingen mobiltelefon
 Owner=Eier
 FollowingConstantsWillBeSubstituted=Følgende konstanter vil bli erstattet med korresponderende verdi.
@@ -1106,4 +1111,9 @@ SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Sikkerhetstoken har ut
 UpToDate=Oppdatert
 OutOfDate=Utdatert
 EventReminder=Påminnelse om hendelse
-UpdateForAllLines=Update for all lines
+UpdateForAllLines=Oppdatering for alle linjer
+OnHold=Venter
+AffectTag=Påvirk merke
+ConfirmAffectTag=Påvirk bulkmerke
+ConfirmAffectTagQuestion=Er du sikker på at du vil påvirke merker til valgte %s post(er)?
+CategTypeNotFound=Ingen merketype funnet for denne post-typen
diff --git a/htdocs/langs/nb_NO/members.lang b/htdocs/langs/nb_NO/members.lang
index 8cebd358f8a..38f06382279 100644
--- a/htdocs/langs/nb_NO/members.lang
+++ b/htdocs/langs/nb_NO/members.lang
@@ -80,7 +80,7 @@ DeleteType=Slett
 VoteAllowed=Stemming tillatt
 Physical=Fysisk
 Moral=Moralsk
-MorAndPhy=Moral and Physical
+MorAndPhy=Moralsk og fysisk
 Reenable=Reaktiverer
 ResiliateMember=Terminer et medlem
 ConfirmResiliateMember=Er du sikker på at du vil terminere dette medlemmet?
@@ -177,7 +177,7 @@ MenuMembersStats=Statistikk
 LastMemberDate=Siste medlemsdato
 LatestSubscriptionDate=Siste abonnementsdato
 MemberNature=Medlemskapets art
-MembersNature=Nature of members
+MembersNature=Medlemmenes art
 Public=Informasjon er offentlig
 NewMemberbyWeb=Nytt medlem lagt til. Venter på godkjenning
 NewMemberForm=Skjema for nytt medlem 
diff --git a/htdocs/langs/nb_NO/modulebuilder.lang b/htdocs/langs/nb_NO/modulebuilder.lang
index d68c5733f57..24ffaf2f737 100644
--- a/htdocs/langs/nb_NO/modulebuilder.lang
+++ b/htdocs/langs/nb_NO/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP-side for å lage/redigere/vise en post
 PageForAgendaTab=PHP-side for hendelsesfanen
 PageForDocumentTab=PHP-side for dokumentfan
 PageForNoteTab=PHP-side for notatfane
+PageForContactTab=PHP-side for kontaktfanen
 PathToModulePackage=Sti til zip-fil av modul/applikasjonspakke
 PathToModuleDocumentation=Sti til fil med modul/applikasjonsdokumentasjon (%s)
 SpaceOrSpecialCharAreNotAllowed=Mellomrom eller spesialtegn er ikke tillatt.
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Hvis du har kunnskap i SQL og PHP, kan du prøve å bru
 SeeTopRightMenu=Se <span class="fa fa-bug"></span> i øverste høyre meny
 AddLanguageFile=Legg til språkfil
 YouCanUseTranslationKey=Her kan du bruke en nøkkel som er oversettelsesnøkkelen funnet i språkfilen (se kategorien "Språk")
-DropTableIfEmpty=(Slett tabell hvis tom)
+DropTableIfEmpty=(Fjern tabellen hvis den er tom)
 TableDoesNotExists=Tabellen %s finnes ikke
 TableDropped=Tabell %s slettet
 InitStructureFromExistingTable=Bygg struktur-matrisestrengen fra en eksisterende tabell
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Bruk en bestemt editor-URL
 UseSpecificFamily = Bruk en bestemt familie
 UseSpecificAuthor = Bruk en bestemt forfatter
 UseSpecificVersion = Bruk en bestemt innledende versjon
-ModuleMustBeEnabled=Modulen/applikasjonen må først aktiveres
 IncludeRefGeneration=Referansen til objektet må genereres automatisk
 IncludeRefGenerationHelp=Merk av for dette hvis du vil inkludere kode for å administrere genereringen av referansen automatisk
 IncludeDocGeneration=Jeg vil generere noen dokumenter fra objektet
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type felt: <br> varchar (99), dobbel (24,8), ekte, tekst, html,
 AsciiToHtmlConverter=Ascii til HTML konverter
 AsciiToPdfConverter=Ascii til PDF konverter
 TableNotEmptyDropCanceled=Tabellen er ikke tom. Drop har blitt kansellert.
+ModuleBuilderNotAllowed=Modulbyggeren er tilgjengelig, men ikke tillatt for brukeren din.
diff --git a/htdocs/langs/nb_NO/mrp.lang b/htdocs/langs/nb_NO/mrp.lang
index b3a5a2c1cd2..62c13051340 100644
--- a/htdocs/langs/nb_NO/mrp.lang
+++ b/htdocs/langs/nb_NO/mrp.lang
@@ -77,4 +77,4 @@ UnitCost=Enhetskostnad
 TotalCost=Totalkostnad
 BOMTotalCost=Kostnaden for å produsere denne stykklisten basert på kostnadene for hver mengde og vare som skal konsumeres (bruk kostpris hvis definert, ellers gjennomsnittlig vektet pris hvis definert, ellers den beste kjøpesummen)
 GoOnTabProductionToProduceFirst=Du må først ha startet produksjonen for å lukke en produksjonsordre (se fanen '%s'). Men du kan kansellere den.
-ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Et sett kan ikke brukes i en BOM eller en MO
diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang
index 975342e63b0..d04755eab4a 100644
--- a/htdocs/langs/nb_NO/other.lang
+++ b/htdocs/langs/nb_NO/other.lang
@@ -259,6 +259,7 @@ ContactCreatedByEmailCollector=Kontakt/adresse opprettet av e-post samler fra e-
 ProjectCreatedByEmailCollector=Prosjekt opprettet av e-post samler fra e-post MSGID %s
 TicketCreatedByEmailCollector=Supportseddel opprettet av e-post samler fra e-post MSGID %s
 OpeningHoursFormatDesc=Bruk en bindestrek for å skille åpning og stengetid. <br> Bruk et mellomrom for å angi forskjellige områder. <br> Eksempel: 8-12 14-18
+PrefixSession=Prefiks for økt-ID
 
 ##### Export #####
 ExportsArea=Eksportområde
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index f4a0610c847..0751b4c561d 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -104,11 +104,12 @@ SetDefaultBarcodeType=Angi strekkodetype
 BarcodeValue=Strekkodeverdi
 NoteNotVisibleOnBill=Notat (vises ikke på fakturaer, tilbud...)
 ServiceLimitedDuration=Hvis varen er en tjeneste med begrenset varighet:
-FillWithLastServiceDates=Fill with last service line dates
+FillWithLastServiceDates=Fyll ut med siste tjenestelinjedatoer
 MultiPricesAbility=Flere prissegmenter for hver vare/tjeneste (hver kunde er i et segment)
 MultiPricesNumPrices=Pris antall
 DefaultPriceType=Basis av priser per standard (med versus uten avgift) når nye salgspriser legges til
-AssociatedProductsAbility=Aktiver sett (virtuelle varer)
+AssociatedProductsAbility=Aktiver Sett (sett bestående av andre produkter)
+VariantsAbility=Aktiver Varianter (varianter av produkter, for eksempel farge, størrelse)
 AssociatedProducts=Sett
 AssociatedProductsNumber=Antall produkter som består av dette settet
 ParentProductsNumber=Antall foreldre-komponentvarer
@@ -167,8 +168,10 @@ BuyingPrices=Innkjøpspris
 CustomerPrices=Kundepriser
 SuppliersPrices=Leverandørpriser
 SuppliersPricesOfProductsOrServices=Leverandørpriser (av varer eller tjenester)
-CustomCode=Toll / vare / HS-kode
+CustomCode=Toll | Råvare | HS-kode
 CountryOrigin=Opprinnelsesland
+RegionStateOrigin=Region opprinnelse
+StateOrigin=Stat | Provins opprinnelse
 Nature=Produktets art (materiale/ferdig)
 NatureOfProductShort=Varens art
 NatureOfProductDesc=Råvare eller ferdig vare
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Bruk den faste prisen
 PriceByQuantity=Prisen varierer med mengde
 DisablePriceByQty=Deaktiver mengderabatt
 PriceByQuantityRange=Kvantumssatser
-MultipriceRules=Prissegment-regler
+MultipriceRules=Automatiske priser for segment
 UseMultipriceRules=Bruk prissegmentregler (definert i varemoduloppsett) for å automatisk beregne priser på alle andre segmenter i henhold til første segment
 PercentVariationOver=%% variasjon over %s
 PercentDiscountOver=%% rabatt på %s
@@ -287,7 +290,7 @@ PriceExpressionEditorHelp5=Tilgjengelige globale verdier:
 PriceMode=Prismodus
 PriceNumeric=Nummer
 DefaultPrice=Standardpris
-DefaultPriceLog=Log of previous default prices
+DefaultPriceLog=Logg over tidligere standardpriser
 ComposedProductIncDecStock=Øk/minsk beholdning ved overordnet endring
 ComposedProduct=Sub-varer
 MinSupplierPrice=Laveste innkjøpspris
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index 962ec3ea1b5..e6320de5bc7 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -213,7 +213,7 @@ ProjectOppAmountOfProjectsByMonth=Beløp i leads pr. måned
 ProjectWeightedOppAmountOfProjectsByMonth=Vektet beløp i leads pr. måned
 ProjectOpenedProjectByOppStatus=Åpne prosjekt|potensielle kunder etter status
 ProjectsStatistics=Statistikk over prosjekter eller potensielle kunder
-TasksStatistics=Statistics on tasks of projects or leads
+TasksStatistics=Statistikk over oppgaver til prosjekter eller potensielle kunder
 TaskAssignedToEnterTime=Oppgave tildelt. Tidsbruk kan legges til
 IdTaskTime=Oppgave-tid ID
 YouCanCompleteRef=Hvis du vil fullføre referansen med en suffiks, anbefales det å legge til et tegn for å skille det, slik at den automatiske nummereringen fortsatt fungerer riktig for neste prosjekt. For eksempel %s-MYSUFFIX
diff --git a/htdocs/langs/nb_NO/recruitment.lang b/htdocs/langs/nb_NO/recruitment.lang
index 4171ab7a120..a74389d13ff 100644
--- a/htdocs/langs/nb_NO/recruitment.lang
+++ b/htdocs/langs/nb_NO/recruitment.lang
@@ -47,29 +47,30 @@ ResponsibleOfRecruitement=Ansvarlig for rekruttering
 IfJobIsLocatedAtAPartner=Hvis jobben ligger på et partnersted
 PositionToBeFilled=Stilling
 PositionsToBeFilled=Stillinger
-ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job positions
+ListOfPositionsToBeFilled=Liste over stillinger
+NewPositionToBeFilled=Nye stillinger
 
-JobOfferToBeFilled=Job position to be filled
+JobOfferToBeFilled=Jobbstilling som skal besettes
 ThisIsInformationOnJobPosition=Informasjon om stillingen som skal besettes
 ContactForRecruitment=Kontakt for rekruttering
 EmailRecruiter=E-postrekruttering
 ToUseAGenericEmail=For å bruke en generisk e-post. Hvis ikke definert, vil e-posten til rekrutteringsansvarlig bli brukt
-NewCandidature=New application
-ListOfCandidatures=List of applications
+NewCandidature=Ny applikasjon
+ListOfCandidatures=Liste over applikasjoner
 RequestedRemuneration=Ønsket godtgjørelse
 ProposedRemuneration=Tilbudt godtgjørelse
 ContractProposed=Kontraktforslag
 ContractSigned=Kontrakt signert
-ContractRefused=Contract refused
-RecruitmentCandidature=Application
+ContractRefused=Kontrakten avvist
+RecruitmentCandidature=Applikasjon
 JobPositions=Stillinger
-RecruitmentCandidatures=Applications
+RecruitmentCandidatures=Applikasjoner
 InterviewToDo=Intervju som skal gjennomføres
-AnswerCandidature=Application answer
-YourCandidature=Your application
-YourCandidatureAnswerMessage=Thanks you for your application.<br>...
-JobClosedTextCandidateFound=The job position is closed. The position has been filled.
-JobClosedTextCanceled=The job position is closed.
-ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+AnswerCandidature=Søknadssvar
+YourCandidature=Din søknad
+YourCandidatureAnswerMessage=Takk for søknaden. <br> ...
+JobClosedTextCandidateFound=Stillingen er stengt. Stillingen er besatt.
+JobClosedTextCanceled=Stillingen er stengt.
+ExtrafieldsJobPosition=Utfyllende attributter (stillinger)
+ExtrafieldsCandidatures=Utfyllende attributter (jobbsøknader)
+MakeOffer=Gi et tilbud
diff --git a/htdocs/langs/nb_NO/sendings.lang b/htdocs/langs/nb_NO/sendings.lang
index 714838ddeac..166b31d739a 100644
--- a/htdocs/langs/nb_NO/sendings.lang
+++ b/htdocs/langs/nb_NO/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Andre leveringer på denne ordren
 SendingsAndReceivingForSameOrder=Forsendelser og kvitteringer for denne ordren
 SendingsToValidate=Leveringer til validering
 StatusSendingCanceled=Kansellert
+StatusSendingCanceledShort=Kansellert
 StatusSendingDraft=Kladd
 StatusSendingValidated=Validert (klar til levering eller allerede levert)
 StatusSendingProcessed=Behandlet
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Du må validere ordren før du kan utføre fors
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Mer fullstendig dokumentmodell for leveringskvitteringer (logo. ..)
+DocumentModelStorm=Mer komplett dokumentmodell for leveringskvitteringer og ekstrafeltkompatibilitet (logo ...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstant EXPEDITION_ADDON_NUMBER ikke definert
 SumOfProductVolumes=Sum varevolum
 SumOfProductWeights=Sum varevekt
diff --git a/htdocs/langs/nb_NO/stocks.lang b/htdocs/langs/nb_NO/stocks.lang
index 58d833ada6c..b8ad0e2471a 100644
--- a/htdocs/langs/nb_NO/stocks.lang
+++ b/htdocs/langs/nb_NO/stocks.lang
@@ -17,10 +17,10 @@ CancelSending=Avbryt levering
 DeleteSending=Slett levering
 Stock=Lagerbeholdning
 Stocks=Lagerbeholdning
-MissingStocks=Missing stocks
-StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+MissingStocks=Manglende varer
+StockAtDate=Varebeholdning på dato
+StockAtDateInPast=Tidligere dato
+StockAtDateInFuture=Senere dato
 StocksByLotSerial=Lager etter LOT/serienummer
 LotSerial=Lot/serienummer
 LotSerialList=Liste over lot/serienummer
@@ -34,7 +34,7 @@ StockMovementForId=Bevegelse ID %d
 ListMouvementStockProject=Liste over varebevegelser tilknyttet prosjekt
 StocksArea=Område for lager
 AllWarehouses=Alle lager
-IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
+IncludeEmptyDesiredStock=Inkluder også negativ beholdning med udefinert ønsket beholdning
 IncludeAlsoDraftOrders=Inkluder også ordrekladd
 Location=Lokasjon
 LocationSummary=Kort navn på lokasjon
@@ -95,16 +95,16 @@ RealStock=Virkelig beholdning
 RealStockDesc=Fysisk/reelt lager er beholdningen du for øyeblikket har i dine interne lagre.
 RealStockWillAutomaticallyWhen=Virkelig beholdning vil bli endret i henhold til denne regelen (som definert i Lager-modulen):
 VirtualStock=Virtuell beholdning
-VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+VirtualStockAtDate=Virtuell beholdning på dato
+VirtualStockAtDateDesc=Virtuell beholdning når alle planlagte ordrer før datoen, er fullført
+VirtualStockDesc=Virtuell lagerbeholdning er den beregnede beholdningen som er tilgjengelig når alle åpne/ventende handlinger (som påvirker varer) er lukket (mottatte innkjøpsordrer, leverte salgsordrer, utførte produksjonsordrer osv.)
 IdWarehouse=Lager-ID
 DescWareHouse=Beskrivelse av lager
 LieuWareHouse=Lagerlokasjon
 WarehousesAndProducts=Lager og varer
 WarehousesAndProductsBatchDetail=Lager og varer (med detaljer pr. lot/serienummer)
 AverageUnitPricePMPShort=Vektet gjennomsnittspris
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=Gjennomsnittlig enhetspris betalt til leverandører for å få varen på lager.
 SellPriceMin=Utsalgspris
 EstimatedStockValueSellShort=Verdi å selge
 EstimatedStockValueSell=Verdi å selge
@@ -122,9 +122,9 @@ DesiredStockDesc=Denne lagerbeholdningen vil være den verdien som brukes til å
 StockToBuy=For bestilling
 Replenishment=Påfylling av varer
 ReplenishmentOrders=Påfyllingsordre
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
-UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
-ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
+VirtualDiffersFromPhysical=I henhold til økning/reduksjon av varer, kan fysisk vare og virtuell vare (fysisk vare + åpne ordrer) variere
+UseRealStockByDefault=Bruk reell varebeholdning i stedet for virtuell, for påfyllingsfunksjon
+ReplenishmentCalculation=Beløpet på ordren vil være (ønsket mengde - reelt lager) i stedet for (ønsket antall - virtuelt lager)
 UseVirtualStock=Bruk teoretisk lagerbeholdning
 UsePhysicalStock=Bruk fysisk varebeholdning
 CurentSelectionMode=Gjeldende valgmodus
@@ -133,7 +133,7 @@ CurentlyUsingPhysicalStock=Fysisk varebeholdning
 RuleForStockReplenishment=Regler for lågerpåfylling
 SelectProductWithNotNullQty=Velg minst en vare med et antall, ikke null, og en leverandør
 AlertOnly= Kun varsler
-IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
+IncludeProductWithUndefinedAlerts = Inkluder også negativ beholdning for varer uten ønsket mengde definert, for å gjenopprette dem til 0
 WarehouseForStockDecrease=Lageret <b>%s</b> vil bli brukt til reduksjon av varebeholdning
 WarehouseForStockIncrease=Lageret <b>%s</b> vil bli brukt til økning av varebeholdning
 ForThisWarehouse=For dette lageret
@@ -144,7 +144,7 @@ Replenishments=Lagerpåfyllinger
 NbOfProductBeforePeriod=Beholdning av varen %s før valgte periode (< %s)
 NbOfProductAfterPeriod=Beholdning av varen %s før etter periode (< %s)
 MassMovement=Massebevegelse
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Velg et kilde-varehus og et mål-varehus, en vare og et antall, og klikk deretter "%s". Når dette er gjort for alle nødvendige bevegelser, klikker du på "%s".
 RecordMovement=Postoverføring
 ReceivingForSameOrder=Kvitteringer for denne ordren
 StockMovementRecorded=Registrerte varebevegelser
@@ -233,10 +233,11 @@ InventoryForASpecificProduct=Varetelling for en spesifikk vare
 StockIsRequiredToChooseWhichLotToUse=Det kreves lagerbeholdning for å velge hvilken lot du vil bruke
 ForceTo=Tving til
 AlwaysShowFullArbo=Vis hele lagertreet med popup av lagerkoblinger (Advarsel: Dette kan redusere ytelsen dramatisk)
-StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
-CurrentStock=Current stock
-InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
-UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|serial barcode)
+StockAtDatePastDesc=Her kan du se varen (reell beholdning) på en tidligere dato
+StockAtDateFutureDesc=Her kan du se varen (virtuell beholdning) på en gitt dato i fremtiden
+CurrentStock=Nåværende varebeholdning
+InventoryRealQtyHelp=Sett verdi til 0 for å tilbakestille antall <br> Hold feltet tomt, eller fjern linjen, for å holde uendret
+UpdateByScaning=Oppdater ved å skanne
+UpdateByScaningProductBarcode=Oppdater ved skanning (varestrekkode)
+UpdateByScaningLot=Oppdater ved skanning (LOT/seriell strekkode)
+DisableStockChangeOfSubProduct=Deaktiver lagerendringen for alle delvaren til dette settet under denne bevegelsen.
diff --git a/htdocs/langs/nb_NO/suppliers.lang b/htdocs/langs/nb_NO/suppliers.lang
index 6dc0db586bf..c7ade0f65bb 100644
--- a/htdocs/langs/nb_NO/suppliers.lang
+++ b/htdocs/langs/nb_NO/suppliers.lang
@@ -38,7 +38,7 @@ MenuOrdersSupplierToBill=Innkjøpsordre til faktura
 NbDaysToDelivery=Leveringsforsinkelse (dager)
 DescNbDaysToDelivery=Den lengste leveringsforsinkelsen til produktene i denne ordre
 SupplierReputation=Leverandørens rykte
-ReferenceReputation=Reference reputation
+ReferenceReputation=Referanse omdømme
 DoNotOrderThisProductToThisSupplier=Ikke bestill
 NotTheGoodQualitySupplier=Lav kvalitet
 ReputationForThisProduct=Rykte
diff --git a/htdocs/langs/nb_NO/ticket.lang b/htdocs/langs/nb_NO/ticket.lang
index ed590491d7c..63f1717d97e 100644
--- a/htdocs/langs/nb_NO/ticket.lang
+++ b/htdocs/langs/nb_NO/ticket.lang
@@ -58,7 +58,6 @@ OriginEmail=Epostkilde
 Notify_TICKET_SENTBYMAIL=Send billettmelding via e-post
 
 # Status
-NotRead=Ikke lest
 Read=Les
 Assigned=Tildelt
 InProgress=Pågår
@@ -124,12 +123,13 @@ TicketsActivatePublicInterfaceHelp=Offentlig grensesnitt gjør det mulig for all
 TicketsAutoAssignTicket=Tilordne automatisk brukeren som opprettet supportseddelen
 TicketsAutoAssignTicketHelp=Når du lager en supportseddel, kan brukeren automatisk tildeles billetten.
 TicketNumberingModules=Supportseddel nummereringsmodul
+TicketsModelModule=Dokumentmaler for billetter
 TicketNotifyTiersAtCreation=Varsle tredjepart ved opprettelse
 TicketsDisableCustomerEmail=Slå alltid av e-post når en billett er opprettet fra det offentlige grensesnittet
 TicketsPublicNotificationNewMessage=Send e-post(er) når en ny melding legges til
-TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
+TicketsPublicNotificationNewMessageHelp=Send epost(er) når en ny melding legges til fra det offentlige grensesnittet (til tildelt bruker eller varslings-eposten til (oppdatering) og/eller varslings-eposten til)
 TicketPublicNotificationNewMessageDefaultEmail=E-postvarsler til (oppdatere)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send epost med ny melding til denne adressen hvis billetten ikke er tildelt en bruker eller brukeren ikke har epost.
 #
 # Index & list page
 #
@@ -202,7 +202,7 @@ TicketMessageMailIntroText=Hei, <br> Et nytt svar ble sendt på en billett som d
 TicketMessageMailIntroHelpAdmin=Denne teksten blir satt inn før teksten til svaret på en supportseddel.
 TicketMessageMailSignature=Signatur
 TicketMessageMailSignatureHelp=Denne teksten er bare lagt til i slutten av eposten og vil ikke bli lagret.
-TicketMessageMailSignatureText= <p> Med vennlig hilsen </p> <p> - </p>
+TicketMessageMailSignatureText=<p> Med vennlig hilsen </p> <p> - </p>
 TicketMessageMailSignatureLabelAdmin=Signatur på svar-epost
 TicketMessageMailSignatureHelpAdmin=Denne teksten vil bli satt inn etter svarmeldingen.
 TicketMessageHelp=Kun denne teksten blir lagret i meldingslisten på supportseddelen.
@@ -231,7 +231,6 @@ TicketLogStatusChanged=Status endret: %s til %s
 TicketNotNotifyTiersAtCreate=Ikke gi beskjed til firmaet ved opprettelse
 Unread=Ulest
 TicketNotCreatedFromPublicInterface=Ikke tilgjengelig. Billett ble ikke opprettet fra offentlig grensesnitt.
-PublicInterfaceNotEnabled=Offentlig grensesnitt var ikke aktivert
 ErrorTicketRefRequired=Billettreferansenavn kreves
 
 #
diff --git a/htdocs/langs/nb_NO/website.lang b/htdocs/langs/nb_NO/website.lang
index a80a383be93..9cdf3dc0695 100644
--- a/htdocs/langs/nb_NO/website.lang
+++ b/htdocs/langs/nb_NO/website.lang
@@ -30,7 +30,6 @@ EditInLine=Rediger inline
 AddWebsite=Legg til nettside
 Webpage=Nettsted/container
 AddPage=Legg til side/container
-HomePage=Hjemmeside
 PageContainer=Side
 PreviewOfSiteNotYetAvailable=Forhåndsvisning av nettstedet ditt <strong> %s </strong> ennå ikke tilgjengelig. Du må først '<strong> Importer en full nettsidemal </strong>' eller bare '<strong> Legg til en side/container </strong>'.
 RequestedPageHasNoContentYet=Forespurt side med id %s har ikke noe innhold enda, eller cachefilen .tpl.php ble fjernet. Rediger innhold på siden for å løse dette.
@@ -58,7 +57,7 @@ NoPageYet=Ingen sider ennå
 YouCanCreatePageOrImportTemplate=Du kan opprette en ny side eller importere en full nettsidemal
 SyntaxHelp=Hjelp med spesifikke syntakstips
 YouCanEditHtmlSourceckeditor=Du kan redigere HTML kildekode ved hjelp av "Kilde" -knappen i redigeringsprogrammet.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Du kan inkludere PHP kode i denne kilden ved hjelp av tags <strong>&lt;?php ?&gt;</strong>. Følgende globale variabler er tilgjengelige: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> Du kan også inkludere innhold fra en annen side/container med følgende syntaks:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> Du kan omdirigere til en annen side/container med følgende syntaks (NB: ikke legg ut noe innhold før en omdirigering):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> For å opprette en kobling til en annen side, bruk syntaksen:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> For å inkludere en <strong>nedlastningslink</strong> til en fil i <strong>dokumenter</strong> mappen, bruk <strong>document.php</strong> pakkeren:<br>Eksempel, for en fil i documents/ecm (need to be loggedmå logges, er syntaksen:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For en fil i documents/medias (åpen mappe for offentlig tilgang), er syntaksen:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For en fil delt via en delingskobling (åpen tilgang ved bruk av deling av filens hash-nøkkel), er syntaksen:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> For å inkludere et <strong>bilde</strong> lagret i <strong>dokumenter</strong> mappen, bruk <strong>viewimage.php</strong> pakkeren:<br>Eksempel, for et bilde i documents/medias (åpen mappe for offentlig tilgang), er syntaksen:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource2=For et bilde som deles med en delekobling (åpen tilgang ved hjelp av delings-hash-nøkkelen til filen), er syntaksen: <br> <strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSourceMore= <br> Flere eksempler på HTML eller dynamisk kode tilgjengelig på <a href="%s" target="_blank"> wiki-dokumentasjonen </a> <br>.
@@ -101,7 +100,7 @@ EmptyPage=Tom side
 ExternalURLMustStartWithHttp=Ekstern nettadresse må starte med http:// eller https://
 ZipOfWebsitePackageToImport=Last opp zip-filen til malpakken til nettstedet
 ZipOfWebsitePackageToLoad=eller velg en tilgjengelig innebygd nettsted-malpakke
-ShowSubcontainers=Inkluder dynamisk innhold
+ShowSubcontainers=Vis dynamisk innhold
 InternalURLOfPage=Intern URL til siden
 ThisPageIsTranslationOf=Denne siden/containeren er en oversettelse av
 ThisPageHasTranslationPages=Denne siden/containeren har oversettelse
@@ -136,4 +135,5 @@ RSSFeed=RSS nyhetsstrøm
 RSSFeedDesc=Du kan få en RSS-feed med de nyeste artiklene med typen 'blogpost' ved hjelp av denne URL-en
 PagesRegenerated=%s side(r)/container(e) regenerert
 RegenerateWebsiteContent=Regenerer cache-filer på nettstedet
-AllowedInFrames=Allowed in Frames
+AllowedInFrames=Tillatt i frames
+DefineListOfAltLanguagesInWebsiteProperties=Definer liste over alle tilgjengelige språk i nettstedsegenskaper.
diff --git a/htdocs/langs/nb_NO/withdrawals.lang b/htdocs/langs/nb_NO/withdrawals.lang
index 50f65e74855..4e88dd8bf0b 100644
--- a/htdocs/langs/nb_NO/withdrawals.lang
+++ b/htdocs/langs/nb_NO/withdrawals.lang
@@ -1,36 +1,36 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Payments by Direct debit orders
+CustomersStandingOrdersArea=Betalinger med direktedebetsordrer
 SuppliersStandingOrdersArea=Betalinger med kredittoverføring
 StandingOrdersPayment=Direktedebet betalingsordre
 StandingOrderPayment=Direktedebet betalingsordre
 NewStandingOrder=Ny direktedebetsordre
-NewPaymentByBankTransfer=New payment by credit transfer
+NewPaymentByBankTransfer=Ny betaling med kreditoverføring
 StandingOrderToProcess=Til behandling
-PaymentByBankTransferReceipts=Credit transfer orders
-PaymentByBankTransferLines=Credit transfer order lines
+PaymentByBankTransferReceipts=Kredittoverføringsordrer
+PaymentByBankTransferLines=Kredittoverføring ordrelinjer
 WithdrawalsReceipts=Direktedebetsordre
 WithdrawalReceipt=Direktedebiter ordre
-BankTransferReceipts=Credit transfer orders
+BankTransferReceipts=Kredittoverføringsordrer
 BankTransferReceipt=Kredittoverføringsordre
-LatestBankTransferReceipts=Latest %s credit transfer orders
+LatestBankTransferReceipts=Siste %s kredittoverføringsordrer
 LastWithdrawalReceipts=Siste %s direktedebetslinjer
-WithdrawalsLine=Direct debit order line
-CreditTransferLine=Credit transfer line
+WithdrawalsLine=Ordrelinje for direktedebet
+CreditTransferLine=Kredittoverføringslinje
 WithdrawalsLines=Direktedebiter ordrelinjer
-CreditTransferLines=Credit transfer lines
-RequestStandingOrderToTreat=Requests for direct debit payment order to process
-RequestStandingOrderTreated=Requests for direct debit payment order processed
-RequestPaymentsByBankTransferToTreat=Requests for credit transfer to process
+CreditTransferLines=Kredittoverføringslinjer
+RequestStandingOrderToTreat=Forespørsler om utførelse av direktedebet betalingsordre
+RequestStandingOrderTreated=Forespørsel om utførte direktedebet betalingsordre
+RequestPaymentsByBankTransferToTreat=Forespørsler om behandling av kreditoverføring
 RequestPaymentsByBankTransferTreated=Forespørsler om kredittoverføring behandlet
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Ennå ikke mulig. Tilbaketrekkings-status må være satt til 'kreditert' før fjerning fra spesifikke linjer.
-NbOfInvoiceToWithdraw=No. of qualified customer invoices with waiting direct debit order
+NbOfInvoiceToWithdraw=Antall kvalifiserte kundefakturaer med ventende direktedebet
 NbOfInvoiceToWithdrawWithInfo=Antall kundefakturaer med direktedebetsordre som har definert bankkontoinformasjon
 NbOfInvoiceToPayByBankTransfer=Antall kvalifiserte leverandørfakturaer som venter på betaling med kredittoverføring
-SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by credit transfer
+SupplierInvoiceWaitingWithdraw=Leverandørfaktura som venter på betaling med kreditoverføring
 InvoiceWaitingWithdraw=Faktura som venter på direktedebet
-InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
+InvoiceWaitingPaymentByBankTransfer=Faktura venter på kreditoverføring
 AmountToWithdraw=Beløp å tilbakekalle
-NoInvoiceToWithdraw=No invoice open for '%s' is waiting. Go on tab '%s' on invoice card to make a request.
+NoInvoiceToWithdraw=Ingen faktura åpen for '%s' venter. Gå til fanen '%s' på fakturakortet for å gjøre en forespørsel.
 NoSupplierInvoiceToWithdraw=Ingen leverandørfaktura med åpne 'Direkte kredittforespørsler' venter. Gå til fanen '%s' på fakturakortet for å sende en forespørsel.
 ResponsibleUser=Brukeransvarlig
 WithdrawalsSetup=Oppsett av direktedebetsbetalinger
@@ -40,8 +40,9 @@ CreditTransferStatistics=Kredittoverføringsstatistikk
 Rejects=Avvisninger
 LastWithdrawalReceipt=Siste %s direktedebetskvitteringer
 MakeWithdrawRequest=Foreta en direktedebet betalingsforespørsel
-MakeBankTransferOrder=Make a credit transfer request
+MakeBankTransferOrder=Opprett en forespørsel om kreditoverføring
 WithdrawRequestsDone=%s direktedebet-betalingforespørsler registrert
+BankTransferRequestsDone=%s forespørsler om kreditoverføring registrert
 ThirdPartyBankCode=Tredjeparts bankkode
 NoInvoiceCouldBeWithdrawed=Ingen faktura debitert. Kontroller at fakturaer mot selskaper med gyldig standard BAN, og at BAN har en RUM-modus <strong> %s </strong>.
 ClassCredited=Klassifiser som kreditert
@@ -53,7 +54,7 @@ Lines=Linjer
 StandingOrderReject=Utsted en avvisning
 WithdrawsRefused=Direktedebet avvist
 WithdrawalRefused=Tilbakekalling avvist
-CreditTransfersRefused=Credit transfers refused
+CreditTransfersRefused=Kredittoverføringer avvist
 WithdrawalRefusedConfirm=Er du sikker på at du vil avvise en tilbakekallings-forespørsel for medlemmet?
 RefusedData=Dato for avvisning
 RefusedReason=Årsak til avslag
@@ -63,7 +64,7 @@ InvoiceRefused=Faktura avvist (Kunden skal belastes for avvisningen)
 StatusDebitCredit=Status debet/kreditt
 StatusWaiting=Venter
 StatusTrans=Sendt
-StatusDebited=Debited
+StatusDebited=Debiterte
 StatusCredited=Kreditert
 StatusPaid=Betalt
 StatusRefused=Nektet
@@ -79,13 +80,13 @@ StatusMotif8=Annen grunn
 CreateForSepaFRST=Opprett direktedebetsfil (SEPA FRST)
 CreateForSepaRCUR=Opprett direktedebitfil (SEPA RCUR)
 CreateAll=Opprett direktedebetfil (alle)
-CreateFileForPaymentByBankTransfer=Create file for credit transfer
+CreateFileForPaymentByBankTransfer=Opprett fil for kreditoverføring
 CreateSepaFileForPaymentByBankTransfer=Opprett kreditoverføringsfil (SEPA)
 CreateGuichet=Bare kontor
 CreateBanque=Bare bank
 OrderWaiting=Venter på behandling
-NotifyTransmision=Record file transmission of order
-NotifyCredit=Record credit of order
+NotifyTransmision=Registrer filoverføring av ordre
+NotifyCredit=Registrer kreditt av ordren
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bankkontoer som bruker RIB
 WithBankUsingBANBIC=For bankkontoer som bruker IBAN/BIC/SWIFT
@@ -96,11 +97,11 @@ WithdrawalFileNotCapable=Kan ikke ikke generere kvitteringsfil for tilbaketrekki
 ShowWithdraw=Vis direkte debitordre
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Men, hvis fakturaen har minst én avbestillingsordre som ikke er behandlet ennå, blir den ikke satt som betalt for å tillate tidligere håndtering av tilbaketrekninger.
 DoStandingOrdersBeforePayments=Denne fanen lar deg be om en betalingsordre med direkte belastning. Når du er ferdig, kan du gå til menyen Bank-> Betaling med direkte belastning for å generere og administrere direkte belastning. Når ordre med direkte belastning blir stengt, blir betaling på fakturaer automatisk registrert, og fakturaer stengt hvis resten til betaling er null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Debit order file
-CreditTransferFile=Credit transfer file
+DoCreditTransferBeforePayments=Denne fanen lar deg be om en kreditoverføringsordre. Når du er ferdig, går du inn i menyen Bank-> Betaling ved overføring for å generere og administrere overføringsordren. Når kredittoverføringsordren er lukket, vil betaling på fakturaer automatisk bli registrert, og fakturaer stengt hvis resten av utestående er null.
+WithdrawalFile=Debetordrefil
+CreditTransferFile=Kredittoverføringsfil
 SetToStatusSent=Sett status til "Fil Sendt"
-ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
+ThisWillAlsoAddPaymentOnInvoice=Dette vil også registrere betalinger på fakturaer og vil klassifisere dem som "Betalt" hvis gjenværende betaling er null
 StatisticsByLineStatus=Statistikk etter linjestatus
 RUM=UMR
 DateRUM=Mandats signaturdato
@@ -108,7 +109,7 @@ RUMLong=Unik Mandat Referanse
 RUMWillBeGenerated=Hvis tomt, vil UMR (Unique Mandate Reference) bli generert når bankkontoinformasjon er lagret
 WithdrawMode=Direktedebetsmodus (FRST eller RECUR)
 WithdrawRequestAmount=Antall direktedebet-betalingforespørsler
-BankTransferAmount=Amount of Credit Transfer request:
+BankTransferAmount=Beløp i forespørsler om kredittoverføring:
 WithdrawRequestErrorNilAmount=Kan ikke opprette en tom direktedebet-betalingforespørsel
 SepaMandate=SEPA Direktedebet mandat
 SepaMandateShort=SEPA-Mandat
@@ -124,18 +125,19 @@ SEPAFrstOrRecur=Betalingstype
 ModeRECUR=Gjentakende betaling
 ModeFRST=Engangsbetaling
 PleaseCheckOne=Vennligs kryss av kun en
-CreditTransferOrderCreated=Credit transfer order %s created
+CreditTransferOrderCreated=Kredittoverføringsordre %s opprettet
 DirectDebitOrderCreated=Direktedebet-ordre %s opprettet
 AmountRequested=Beløp forespurt
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Utførelsesdato
 CreateForSepa=Lag direkte debitfil
-ICS=Kreditoridentifikator CI
+ICS=Kreditoridentifikator CI for direkte belastning
+ICSTransfer=Kreditoridentifikator CI for bankoverføring
 END_TO_END="EndToEndId" SEPA XML-tag - Unik ID tildelt per transaksjon
 USTRD="Ustrukturert" SEPA XML-tag
 ADDDAYS=Legg til dager til utførelsesdato
-NoDefaultIBANFound=No default IBAN found for this third party
+NoDefaultIBANFound=Ingen standard IBAN funnet for denne tredjeparten
 ### Notifications
 InfoCreditSubject=Betaling av direktedebets-betalingsordre %s utført av banken
 InfoCreditMessage=Direktedebet betalingsordre %s er blitt betalt av banken<br>Betalingsdata: %s
@@ -145,4 +147,5 @@ InfoTransData=Beløp: %s <br> Metode: %s <br> Dato: %s
 InfoRejectSubject=Direktedebet betalingsordre avvist
 InfoRejectMessage=Hei,<br><br>direktedebet betalingsordre av faktura %s tilhørende firma %s, med beløpet %s er blitt avvist av banken.<br><br>--<br>%s
 ModeWarning=Opsjon for reell-modus ble ikke satt, så vi stopper etter denne simuleringen
-ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorCompanyHasDuplicateDefaultBAN=Firma med ID%s har mer enn én standard bankkonto. Ingen måte å vite hvilken du skal bruke.
+ErrorICSmissing=Mangler ICS i bankkonto %s
diff --git a/htdocs/langs/ne_NP/accountancy.lang b/htdocs/langs/ne_NP/accountancy.lang
index 3211a0b62df..33ba4d9fea7 100644
--- a/htdocs/langs/ne_NP/accountancy.lang
+++ b/htdocs/langs/ne_NP/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/ne_NP/admin.lang b/htdocs/langs/ne_NP/admin.lang
index f1c41a3b62b..189b0b5186a 100644
--- a/htdocs/langs/ne_NP/admin.lang
+++ b/htdocs/langs/ne_NP/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=List of OpenDocument templates directories
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Position of Name/Lastname
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu handler where to show new menu
 DetailMenuModule=Module name if menu entry come from a module
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/ne_NP/banks.lang b/htdocs/langs/ne_NP/banks.lang
index 9500a5b8b2e..a0dc27f86c4 100644
--- a/htdocs/langs/ne_NP/banks.lang
+++ b/htdocs/langs/ne_NP/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/ne_NP/blockedlog.lang b/htdocs/langs/ne_NP/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/ne_NP/blockedlog.lang
+++ b/htdocs/langs/ne_NP/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/ne_NP/boxes.lang b/htdocs/langs/ne_NP/boxes.lang
index d6fd298a3a7..7db4ea8aa17 100644
--- a/htdocs/langs/ne_NP/boxes.lang
+++ b/htdocs/langs/ne_NP/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/ne_NP/cashdesk.lang b/htdocs/langs/ne_NP/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/ne_NP/cashdesk.lang
+++ b/htdocs/langs/ne_NP/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/ne_NP/categories.lang b/htdocs/langs/ne_NP/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/ne_NP/categories.lang
+++ b/htdocs/langs/ne_NP/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/ne_NP/companies.lang b/htdocs/langs/ne_NP/companies.lang
index dadff6a7894..8dc815b522e 100644
--- a/htdocs/langs/ne_NP/companies.lang
+++ b/htdocs/langs/ne_NP/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/ne_NP/compta.lang b/htdocs/langs/ne_NP/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/ne_NP/compta.lang
+++ b/htdocs/langs/ne_NP/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/ne_NP/cron.lang b/htdocs/langs/ne_NP/cron.lang
index 1de1251831a..2ebdda1e685 100644
--- a/htdocs/langs/ne_NP/cron.lang
+++ b/htdocs/langs/ne_NP/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup=Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
 CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Number of launches
 CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -56,7 +58,7 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
 DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/ne_NP/errors.lang b/htdocs/langs/ne_NP/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/ne_NP/errors.lang
+++ b/htdocs/langs/ne_NP/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
 ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/ne_NP/exports.lang b/htdocs/langs/ne_NP/exports.lang
index 3549e3f8b23..a0eb7161ef2 100644
--- a/htdocs/langs/ne_NP/exports.lang
+++ b/htdocs/langs/ne_NP/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/ne_NP/mails.lang b/htdocs/langs/ne_NP/mails.lang
index 1235eef3b27..7fd93be7b71 100644
--- a/htdocs/langs/ne_NP/mails.lang
+++ b/htdocs/langs/ne_NP/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/ne_NP/main.lang b/htdocs/langs/ne_NP/main.lang
index 96c68cdcfa3..e196120c27d 100644
--- a/htdocs/langs/ne_NP/main.lang
+++ b/htdocs/langs/ne_NP/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/ne_NP/modulebuilder.lang b/htdocs/langs/ne_NP/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/ne_NP/modulebuilder.lang
+++ b/htdocs/langs/ne_NP/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/ne_NP/other.lang b/htdocs/langs/ne_NP/other.lang
index 54c0572d453..0a7b3723ab1 100644
--- a/htdocs/langs/ne_NP/other.lang
+++ b/htdocs/langs/ne_NP/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/ne_NP/products.lang b/htdocs/langs/ne_NP/products.lang
index 97db059594f..f0c4a5362b8 100644
--- a/htdocs/langs/ne_NP/products.lang
+++ b/htdocs/langs/ne_NP/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/ne_NP/recruitment.lang b/htdocs/langs/ne_NP/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/ne_NP/recruitment.lang
+++ b/htdocs/langs/ne_NP/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/ne_NP/sendings.lang b/htdocs/langs/ne_NP/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/ne_NP/sendings.lang
+++ b/htdocs/langs/ne_NP/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Other shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Shipments to validate
 StatusSendingCanceled=Canceled
+StatusSendingCanceledShort=Canceled
 StatusSendingDraft=Draft
 StatusSendingValidated=Validated (products to ship or already shipped)
 StatusSendingProcessed=Processed
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/ne_NP/stocks.lang b/htdocs/langs/ne_NP/stocks.lang
index 660443bcded..6cf089096dd 100644
--- a/htdocs/langs/ne_NP/stocks.lang
+++ b/htdocs/langs/ne_NP/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/ne_NP/ticket.lang b/htdocs/langs/ne_NP/ticket.lang
index 59519282c80..982fff90ffa 100644
--- a/htdocs/langs/ne_NP/ticket.lang
+++ b/htdocs/langs/ne_NP/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/ne_NP/website.lang b/htdocs/langs/ne_NP/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/ne_NP/website.lang
+++ b/htdocs/langs/ne_NP/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/ne_NP/withdrawals.lang b/htdocs/langs/ne_NP/withdrawals.lang
index 114a8d9dd6c..e3bec6f9cb8 100644
--- a/htdocs/langs/ne_NP/withdrawals.lang
+++ b/htdocs/langs/ne_NP/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/nl_BE/accountancy.lang b/htdocs/langs/nl_BE/accountancy.lang
index 080da3b8334..b778d524492 100644
--- a/htdocs/langs/nl_BE/accountancy.lang
+++ b/htdocs/langs/nl_BE/accountancy.lang
@@ -20,6 +20,7 @@ UpdateMvts=Wijzigen van een transactie
 Processing=Verwerken
 EndProcessing=Verwerking beëindigd
 Lineofinvoice=Factuur lijn
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 Docdate=Datum
 Docref=Artikelcode
 TotalVente=Totaal omzet voor belastingen
diff --git a/htdocs/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang
index f1308c0cdfe..9e36971311b 100644
--- a/htdocs/langs/nl_BE/admin.lang
+++ b/htdocs/langs/nl_BE/admin.lang
@@ -11,6 +11,7 @@ RemoteSignature=Remote distant handtekening (betrouwbaarder)
 FilesAdded=Bestanden toegevoegd
 AvailableOnlyOnPackagedVersions=Het lokale bestand voor integriteitscontrole is alleen beschikbaar als de toepassing is geïnstalleerd vanuit een officieel pakket
 XmlNotFound=Xml-integriteitsbestand van toepassing niet gevonden
+SessionId=Sessie-ID
 SessionSavePath=Sessie opslaglocatie
 ConfirmPurgeSessions=Ben je zeker dat je alle sessies wil wissen? De connectie van elke gebruiker zal worden verbroken (uitgezonderd jezelf).
 NoSessionListWithThisHandler=Save session handler geconfigureerd in uw PHP staat niet toe dat alle lopende sessies worden getoond.
@@ -28,23 +29,29 @@ UploadNewTemplate=Upload nieuwe template(s)
 RestoreLock=Herstel het bestand <b>%s</b> , met enkel leesrechten, om verder gebruik van de Update / Install-tool uit te schakelen.
 SecurityFilesDesc=Definieer opties met betrekking tot beveiliging voor het uploaden van bestanden.
 DictionarySetup=Woordenboek setup
-Dictionary=Woordenboeken
+ErrorReservedTypeSystemSystemAuto=De waarde 'system' en 'systemauto' als type zijn voorbehouden voor het systeem.  Je kan 'user' als waarde gebruiken om je eigen gegevens-record toe te voegen.
 DisableJavascript=Schakel JavaScript en Ajax-functies uit.
 DelaiedFullListToSelectCompany=Wacht tot een toets wordt ingedrukt voordat u de inhoud van de combinatielijst van derden laadt. <br> Dit kan de prestaties verbeteren als u een groot aantal derden hebt, maar het is minder handig.
 SearchString=Zoekopdracht
+NotAvailableWhenAjaxDisabled=Niet beschikbaar wanneer AJAX functionaliteit uitgeschakeld is
 AllowToSelectProjectFromOtherCompany=Op een document van een derde partij, kunt u een project kiezen dat is gekoppeld aan een andere derde partij
 UsePreviewTabs=Gebruik voorbeelweergavetabbladen
 ShowPreview=Toon voorbeelweergave
-CurrentTimeZone=Huidige Tijdszone
 TZHasNoEffect=Datums worden opgeslagen en geretourneerd door de databaseserver alsof ze worden bewaard als verzonden string. De tijdzone heeft alleen effect bij het gebruik van de UNIX_TIMESTAMP-functie (die niet door Dolibarr mag worden gebruikt, dus database TZ zou geen effect mogen hebben, zelfs als deze wordt gewijzigd nadat gegevens zijn ingevoerd).
 NextValueForDeposit=Volgende waarde (aanbetaling)
+ComptaSetup=Instellingen van de boekhoudkundige module
 UserSetup=Gebruikersbeheerinstellingen
 MultiCurrencySetup=Instellingen voor meerdere valuta
+DetailPosition=Sorteren aantal te definiëren menupositie
 AllMenus=Alle
 NotConfigured=Module/Applicatie is niet geconfigureerd
 OtherSetup=Overige instellingen
+CurrentValueSeparatorThousand=Duizend scheidingsteken
 LocalisationDolibarrParameters=Lokalisatieparameters
+ClientTZ=Tijdzone van de klant (gebruiker)
+ClientHour=Tijd bij de klant (gebruiker)
 PHPTZ=Tijdzone binnen de PHP server
+DaylingSavingTime=Zomertijd (gebruiker)
 CurrentHour=Huidige tijd op server
 CurrentSessionTimeOut=Huidige sessietimeout
 YouCanEditPHPTZ=Om een andere PHP-tijdzone in te stellen (niet vereist), kunt u proberen een .htaccess-bestand toe te voegen met een regel als deze "SetEnv TZ Europe/Paris"
@@ -63,20 +70,25 @@ PurgeNothingToDelete=Geen map of bestanden om te verwijderen.
 PurgeNDirectoriesFailed=Verwijderen van <b>%s-</b> bestanden of mappen is mislukt.
 PurgeAuditEvents=Verwijder alle gebeurtenisen
 ConfirmPurgeAuditEvents=Ben je zeker dat je alle veiligheidsgebeurtenissen wil verwijderen? Alle veiligheidslogboeken zullen worden verwijderd, en geen andere bestanden worden verwijderd
+RunCommandSummary=Backup geïnitieerd met het volgende commando
+BackupResult=Resultaat backup
+BackupFileSuccessfullyCreated=Backupbestand succesvol gegenereerd
 NoBackupFileAvailable=Geen backupbestanden beschikbaar.
 ToBuildBackupFileClickHere=Om een backupbestand te maken, klik <a href="%s">hier</a>.
+ImportMySqlDesc=Om een MySQL-back-upbestand te importeren, kunt u phpMyAdmin gebruiken via uw hosting of de opdracht mysql gebruiken vanaf de opdrachtregel. <br> Bijvoorbeeld:
+ImportPostgreSqlDesc=Om een backupbestand te importeren, dient u het 'pg_restore' commando vanaf de opdrachtregel uit te voeren:
 CommandsToDisableForeignKeysForImportWarning=Verplicht als je je sql neerslag later wil gebruiken
 ExportUseMySQLQuickParameterHelp=De parameter '--quick' helpt het RAM-verbruik voor grote tabellen te beperken.
 MySqlExportParameters=MySQL exporteer instellingen
 ExportStructure=Struktuur
 NameColumn=Kollomennaam
+NoLockBeforeInsert=Geen lock-opdrachten rond INSERT
 FeatureAvailableOnlyOnStable=Functie alleen beschikbaar op officiële stabiele versies
 BoxesDesc=Widgets zijn componenten die informatie tonen die u kunt toevoegen om sommige pagina's te personaliseren. U kunt kiezen tussen het weergeven van de widget of niet door de doelpagina te selecteren en op 'Activeren' te klikken, of door op de prullenbak te klikken om deze uit te schakelen.
 ModulesMarketPlaceDesc=Je kan meer modules vinden door te zoeken op andere externe websites, waar je ze kan downloaden
 ModulesMarketPlaces=Zoek externe app / modules
 ModulesDevelopYourModule=Ontwikkel je eigen app / modules
 SeeInMarkerPlace=Zie Marktplaats
-Nouveauté=Nieuwigheid
 GoModuleSetupArea=Ga naar het gedeelte Module-instellingen om een nieuwe module te implementeren / installeren: <a href="%s">%s</a> .
 DoliStoreDesc=DoliStore, de officiële markt voor externe Dolibarr ERP / CRM modules
 WebSiteDesc=Externe websites voor meer add-on (niet-basis) modules ...
@@ -88,6 +100,7 @@ OfficialWiki=Dolibarr-documentatie / Wiki
 OtherResources=Andere bronnen
 ExternalResources=Externe Bronnen
 SocialNetworks=Sociale Netwerken
+ForDocumentationSeeWiki=Documentatie voor gebruikers of ontwikkelaars kunt u inzien door <br>te kijken op de Dolibarr Wiki-pagina's:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Hier zijn enkele bronnen voor hulp en ondersteuning bij Dolibarr.
 HelpCenterDesc2=Sommige van deze bronnen zijn alleen beschikbaar in het <b>Engels</b> .
 MeasuringUnit=Maateenheid
@@ -111,6 +124,8 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (als verzendende server authenticatie vereist)
 MAIN_MAIL_SMTPS_PW=SMTP-wachtwoord (als verzendende server verificatie vereist)
 MAIN_MAIL_EMAIL_TLS=Gebruik TLS (SSL) -versleuteling
 MAIN_MAIL_EMAIL_STARTTLS=Gebruik TLS (STARTTLS) -versleuteling
+MAIN_MAIL_EMAIL_DKIM_ENABLED=Gebruik DKIM om een e-mailhandtekening te genereren
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=E-maildomein voor gebruik met dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Naam van dkim-selector
 MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Privésleutel voor dkim-ondertekening
 MAIN_DISABLE_ALL_SMS=Schakel alle sms-berichten uit (voor testdoeleinden of demo's)
@@ -118,9 +133,13 @@ MAIN_MAIL_SMS_FROM=Standaard telefoonnummer van afzender voor sms-verzending
 MAIN_MAIL_DEFAULT_FROMTYPE=Standaard afzender-e-mailadres voor handmatig verzenden (e-mailadres gebruiker of professionele e-mail)
 UserEmail=Email gebruiker
 CompanyEmail=Professionele e-mail
+ModuleSetup=Module-instellingen
 ModulesSetup=Instellingen voor Modules / Applicaties
 ModuleFamilyProducts=Productbeheer (PM)
 ModuleFamilyHr=Personeelszaken (HR)
+ModuleFamilyProjects=Projecten / Samenwerkingen
+ModuleFamilyTechnic=Hulpmiddelen voor multi-modules
+ModuleFamilyPortal=Websites en andere frontale toepassing
 ThisIsAlternativeProcessToFollow=Dit is een alternatieve configuratie om handmatig te verwerken:
 UnpackPackageInDolibarrRoot=Pak de verpakte bestanden uit in uw Dolibarr-servermap: <b>%s</b>
 UnpackPackageInModulesRoot=Om een externe module te implementeren / installeren, moet u de verpakte bestanden uitpakken / uitpakken in de servermap voor externe modules: <br> <b>%s</b>
@@ -129,15 +148,23 @@ NotExistsDirect=De alternatieve hoofdmap is niet gedefinieerd voor een bestaande
 InfDirAlt=Sinds versie 3 is het mogelijk om een alternatieve rootmap te definiëren. Hiermee kunt u in een speciale map plug-ins en aangepaste sjablonen opslaan. <br> Maak gewoon een map aan in de root van Dolibarr (bv: aangepast). <br>
 InfDirExample=<br> <strong>Verklaar</strong> het dan in het bestand <strong>conf.php</strong> <br> $ Dolibarr_main_url_root_alt='/custom' <br> $ Dolibarr_main_document_root_alt='/pad/of/Dolibarr/htdocs/custom' <br> Als deze regels worden becommentarieerd met "#", schakelt u ze gewoon uit door het teken "#" te verwijderen.
 LastStableVersion=Nieuwste stabiele versie
+LastActivationIP=Laatste activerings-IP
 GenericMaskCodes2=<b>{cccc}</b> de clientcode van n tekens <br> <b>{cccc000}</b> de <b>klantcode</b> op n tekens wordt gevolgd door een teller voor de klant. Deze teller die aan de klant is toegewezen, wordt tegelijkertijd opnieuw ingesteld als de globale teller. <br> <b>{tttt}</b> De code van het type van een derde partij op n tekens (zie menu Home - Instellingen - Woordenboek - Typen derde partijen). Als u deze tag toevoegt, verschilt de teller voor elk type derde partij. <br>
 GenericMaskCodes4a=<u>Voorbeeld op de 99e %s van de derde partij TheCompany, met datum 31-01-2007:</u> <br>
 GenericMaskCodes5=<b>ABC {jj} {mm} - {000000}</b> geeft <b>ABC0701-000099</b> <br> <b>{0000 + 100 @ 1} -ZZZ / {dd} / XXX</b> geeft <b>0199-ZZZ / 31 / XXX</b> <br> <b>IN {jj} {mm} - {0000} - {t}</b> geeft <b>IN0701-0099-A</b> als het type bedrijf 'Responsable Inscripto' is met code voor het type dat 'A_RI' is
+UMask=Umask parameter voor nieuwe bestanden op een Unix- / Linux- / BSD-bestandssysteem.
+UMaskExplanation=Deze parameter laat u de rechten bepalen welke standaard zijn ingesteld voor de bestanden aangemaakt door Dolibarr op de server (tijdens het uploaden, bijvoorbeeld).<br>Het moet de octale waarde zijn (bijvoorbeeld, 0666 betekent lezen en schrijven voor iedereen).<br>Deze parameter wordt NIET op een windows-server gebruikt
+SeeWikiForAllTeam=Kijk op de Wiki-pagina voor een lijst met bijdragers en hun organisatie
+UseACacheDelay=Ingestelde vertraging voor de cacheexport in secondes (0 of leeg voor geen cache)
+DisableLinkToHelpCenter=Verberg de link "<b>ondersteuning of hulp nodig</b>" op de inlogpagina
 DisableLinkToHelp=Link naar online help "<b>%s</b>" <b>verbergen</b>
 AddCRIfTooLong=Er is geen automatische tekst terugloop, tekst die te lang is, wordt niet weergegeven op documenten. Voeg indien nodig regeleinden in het tekstgebied toe.
 ConfirmPurge=Weet u zeker dat u deze zuivering wilt uitvoeren? <br> Hiermee worden al uw gegevensbestanden permanent verwijderd zonder dat u ze kunt herstellen (ECM-bestanden, bijgevoegde bestanden ...).
 LanguageFile=Bestandstaal
+ListOfDirectories=Lijst van OpenDocument sjablonenmappen
 ListOfDirectoriesForModelGenODT=Lijst met mappen die sjablonenbestanden met OpenDocument-indeling bevatten. <br><br> Plaats hier het volledige pad van mappen. <br> Voeg een regelterugloop toe tussen elke directory. <br> Voeg hier een map van de GED-module toe <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b> . <br><br> Bestanden in die mappen moeten eindigen op <b>.odt</b> of <b>.ods</b>.
 NumberOfModelFilesFound=Aantal ODT / ODS-sjabloonbestanden gevonden in deze mappen
+FollowingSubstitutionKeysCanBeUsed=Door het plaatsen van de volgende velden in het sjabloon krijgt u een vervanging met de aangepaste waarde bij het genereren van het document:
 DescWeather=De volgende afbeeldingen worden op het dashboard weergegeven wanneer het aantal late acties de volgende waarden bereikt:
 ConnectionTimeout=Time-out verbinding
 ModuleMustBeEnabledFirst=Module <b>%s</b> moet eerst worden ingeschakeld als u deze functie nodig hebt.
@@ -148,8 +175,12 @@ HideDescOnPDF=Productbeschrijving verbergen
 HideRefOnPDF=Verberg ref. producten
 HideDetailsOnPDF=Verberg details van productlijnen
 PlaceCustomerAddressToIsoLocation=Gebruik de Franse standaardpositie (La Poste) voor de positie van het klantadres
+UrlGenerationParameters=Parameters om URL beveiligen
+SecurityTokenIsUnique=Gebruik een unieke securekey parameter voor elke URL
 GetSecuredUrl=Get berekend URL
-ButtonHideUnauthorized=Knoppen verbergen voor niet-beheerders voor ongeautoriseerde acties in plaats van grijze uitgeschakelde knoppen te tonen
+OldVATRates=Oud BTW tarief
+NewVATRates=Nieuw BTW tarief
+PriceBaseTypeToChange=Wijzig op prijzen waarop een base reference waarde gedefiniëerd is
 MassConvert=Start bulkconversie
 Boolean=Boolean (één selectievakje)
 ExtrafieldUrl =url
diff --git a/htdocs/langs/nl_BE/banks.lang b/htdocs/langs/nl_BE/banks.lang
index 69a470c6db3..6a27c2a6715 100644
--- a/htdocs/langs/nl_BE/banks.lang
+++ b/htdocs/langs/nl_BE/banks.lang
@@ -1,5 +1,14 @@
 # Dolibarr language file - Source file is en_US - banks
+ShowAllTimeBalance=Toon saldo sinds begin
+LabelBankCashAccount=label van bank of kas
 TransferTo=Aan
+CheckTransmitter=Overboeker
 BankChecksToReceipt=Te innen cheques
 BankChecksToReceiptShort=Te innen cheques
+InputReceiptNumber=Kies het bankafschrift in verband met de bemiddeling. Gebruik een sorteerbaar numerieke waarde: YYYYMM of YYYYMMDD
+EventualyAddCategory=Tenslotte een categorie opgeven waarin de gegevens bewaard kunnen worden
+ThenCheckLinesAndConciliate=Duid dan de lijnen aan van het bankafschrift en klik
+DeleteARib=Verwijderen BAN gegeven
+RejectCheck=Teruggekeerde cheque
 RejectCheckDate=Datum de cheque was teruggekeerd
+CheckRejected=Teruggekeerde cheque
diff --git a/htdocs/langs/nl_BE/cashdesk.lang b/htdocs/langs/nl_BE/cashdesk.lang
index a64cdb82256..9019947e4b7 100644
--- a/htdocs/langs/nl_BE/cashdesk.lang
+++ b/htdocs/langs/nl_BE/cashdesk.lang
@@ -7,3 +7,4 @@ BankToPay=Betalingsaccount
 ShowCompany=Toon bedrijf
 ShowStock=Toon magazijn
 DolibarrReceiptPrinter=Dolibarr Ontvangsten Printer
+Receipt=Ontvangst
diff --git a/htdocs/langs/nl_BE/categories.lang b/htdocs/langs/nl_BE/categories.lang
index cc68f1795a9..9d86adc7acd 100644
--- a/htdocs/langs/nl_BE/categories.lang
+++ b/htdocs/langs/nl_BE/categories.lang
@@ -46,14 +46,11 @@ ContactCategoriesShort=Contacten tags/categorieën
 AccountsCategoriesShort=Accounts tags/categorieën
 ProjectsCategoriesShort=Projecten tags/categorieën
 CategId=Tag/categorie id
-CatCusList=Lijst van de klant/prospect tags/categorieën
 CatProdList=Lijst van producten tags/categorieën
 CatMemberList=Lijst van leden tags/categorieën
-CatContactList=Lijst van contact tags/categorieën
-CatSupLinks=Koppelingen tussen leveranciers en tags/categorieën
 CatCusLinks=Koppelingen tussen klanten/prospects en tags/categorieën
 CatProdLinks=Koppelingen tussen producten/diensten en tags/categorieën
-CatProJectLinks=Koppelingen tussen projecten en tags/categorieën
+CatProjectsLinks=Koppelingen tussen projecten en tags/categorieën
 CategoriesSetup=Tags/categorieën instellingen
 CategorieRecursiv=Automatische koppeling met bovenliggende tag/categorie
 ShowCategory=Toon tag / categorie
diff --git a/htdocs/langs/nl_BE/exports.lang b/htdocs/langs/nl_BE/exports.lang
new file mode 100644
index 00000000000..757f616a372
--- /dev/null
+++ b/htdocs/langs/nl_BE/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+ExportStringFilter=%% laat het vervangen toe van één of meer tekens in de tekst
diff --git a/htdocs/langs/nl_BE/externalsite.lang b/htdocs/langs/nl_BE/externalsite.lang
new file mode 100644
index 00000000000..9fdddaacccf
--- /dev/null
+++ b/htdocs/langs/nl_BE/externalsite.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - externalsite
+ExternalSiteSetup=Setup link naar externe website
+ExternalSiteURL=Externe Site URL
+ExternalSiteModuleNotComplete=Module ExternalSite werd niet correct geconfigureerd.
diff --git a/htdocs/langs/nl_BE/mails.lang b/htdocs/langs/nl_BE/mails.lang
index c4133e0bebe..776b4ed9b2e 100644
--- a/htdocs/langs/nl_BE/mails.lang
+++ b/htdocs/langs/nl_BE/mails.lang
@@ -1,4 +1,30 @@
 # Dolibarr language file - Source file is en_US - mails
+AllEMailings=Alle EMailings
 MailCard=EMailings kaart
+MailCC=Kopiëren naar
+MailCCC=Gecachde kopie aan
+MailMessage=E-mailinhoud
+ShowEMailing=Toon EMailing
+ListOfEMailings=EMailingenlijst
+NewMailing=Nieuwe EMailing
+EditMailing=Bewerk EMailing
+ResetMailing=EMailing opnieuw verzenden
+DeleteMailing=Verwijder EMailing
+DeleteAMailing=Verwijder een EMailing
+PreviewMailing=Voorbeeldweergave EMailing
+CreateMailing=Creëer EMailing
+ValidMailing=Geldige EMailing
+MailingSuccessfullyValidated=Emailing succesvol gevalideerd
+MailingStatusNotContact=Niet meer contacten
+WarningNoEMailsAdded=Geen nieuw E-mailadres aan de lijst van ontvangers toe te voegen.
+YouCanAddYourOwnPredefindedListHere=Om uw e-mailselectormodule te creëren, zie htdocs/core/modules/mailings/README.
+XTargetsAdded=<b>%s</b> ontvangers toegevoegd in bestemming-lijst
+MailingArea=EMailingsoverzicht
+TargetsStatistics=Geaddresseerdenstatistieken
+MailNoChangePossible=Ontvangers voor gevalideerde EMailings kunnen niet worden gewijzigd
 SearchAMailing=Zoek een E-mailing
 SendMailing=Verzend E-mailing
+TargetsReset=Lijst legen
+ToClearAllRecipientsClickHere=Klik hier om de lijst met ontvangers van deze EMailing te legen
+NbOfEMailingsReceived=Bulk Emailings ontvangen
+NbOfEMailingsSend=Mailings verstuurd
diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang
index e91ff7bd44a..293c494d51e 100644
--- a/htdocs/langs/nl_BE/main.lang
+++ b/htdocs/langs/nl_BE/main.lang
@@ -19,6 +19,7 @@ FormatDateHourShort=%d-%m-%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
+CurrentTimeZone=Huidige Tijdszone
 NoRecordFound=Geen record gevonden
 ErrorCanNotCreateDir=Kan dir %s niet maken
 ErrorCanNotReadDir=Kan dir %s niet lezen
@@ -75,6 +76,7 @@ Category=Tag / categorie
 to=aan
 To=aan
 ApprovedBy2=Goedgekeurd door (tweede goedkeuring)
+NotRead=Ongelezen
 Offered=Beschikbaar
 SetLinkToAnotherThirdParty=Link naar een derde partij
 SelectAction=Selecteer actie
@@ -91,3 +93,4 @@ Select2SearchInProgress=Zoeken is aan de gang...
 SearchIntoProductsOrServices=Producten of diensten
 SearchIntoCustomerInvoices=Klant facturen
 SearchIntoExpenseReports=Uitgaven rapporten
+OnHold=Tijdelijk geblokkeerd
diff --git a/htdocs/langs/nl_BE/products.lang b/htdocs/langs/nl_BE/products.lang
index 788278f0576..5448b609364 100644
--- a/htdocs/langs/nl_BE/products.lang
+++ b/htdocs/langs/nl_BE/products.lang
@@ -6,6 +6,5 @@ NotOnSell=Niet meer beschikbaar
 ProductStatusNotOnSell=Niet meer verkrijgbaar
 ProductStatusOnSellShort=Te koop
 ListOfStockMovements=Voorradenlijst
-CustomCode=Customs / Commodity / HS code
 ProductSellByQuarterHT=Bruto omzetcijfer per trimester
 ServiceSellByQuarterHT=Bruto omzetcijfer per trimester
diff --git a/htdocs/langs/nl_BE/sendings.lang b/htdocs/langs/nl_BE/sendings.lang
index c29f8d65119..d6acc920084 100644
--- a/htdocs/langs/nl_BE/sendings.lang
+++ b/htdocs/langs/nl_BE/sendings.lang
@@ -3,6 +3,7 @@ ShowSending=Toon Verzendingen
 Receivings=Ontvangstbevestingen
 LastSendings=Laatste %s verzendingen
 QtyPreparedOrShipped=Aantal voorbereid of verzonden
+QtyToShip=Aantal te verzenden
 QtyInOtherShipments=Aantal in andere verzendingen
 SendingsAndReceivingForSameOrder=Verzendingen en ontvangstbevestigingen van deze bestelling
 ConfirmDeleteSending=Weet u zeker dat u deze verzending wilt verwijderen?
diff --git a/htdocs/langs/nl_BE/ticket.lang b/htdocs/langs/nl_BE/ticket.lang
index 5fdcb01d6ba..943c019bd35 100644
--- a/htdocs/langs/nl_BE/ticket.lang
+++ b/htdocs/langs/nl_BE/ticket.lang
@@ -8,7 +8,6 @@ TicketDictSeverity=Ticket - Gradaties
 TicketTypeShortISSUE=Probleem, bug of probleem
 TicketTypeShortREQUEST=Verander- of verbeteringsverzoek
 TicketTypeShortOTHER=Ander
-TicketSeverityShortBLOCKING=Kritisch / Blokkerend
 ErrorBadEmailAddress=Veld '%s' onjuist
 MenuTicketMyAssignNonClosed=Mijn open tickets
 TypeContact_ticket_external_SUPPORTCLI=Klantcontact / incident volgen
diff --git a/htdocs/langs/nl_BE/withdrawals.lang b/htdocs/langs/nl_BE/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/nl_BE/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index c6449f8ac34..d633a3e3d03 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=Alle landen behalve %s
 AccountantFiles=Bron-documenten exporteren
 ExportAccountingSourceDocHelp=Met deze tool kunt u de lijsten en pdf bestanden exporteren die werden gebruikt om uw boekhouding te genereren. Gebruik het menu-item %s - %s om uw dagboeken te exporteren.
 VueByAccountAccounting=Overzicht per grootboekrekening
+VueBySubAccountAccounting=Overzicht op volgorde subrekening
 
 MainAccountForCustomersNotDefined=De standaard grootboekrekening voor klanten is niet vastgelegd bij de instellingen
 MainAccountForSuppliersNotDefined=Hoofdrekening voor leveranciers die niet zijn gedefinieerd in de configuratie
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Niet gekoppeld aan grootboekrekening
 XLineSuccessfullyBinded=%s producten/diensten met succes gekoppeld aan een grootboekrekening
 XLineFailedToBeBinded=%s producten/diensten zijn niet gekoppeld aan een grootboekrekening
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Aantal verbonden elementen per pagina (voorstel: max. 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximumaantal regels op lijst en bindpagina (aanbevolen: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin met het sorteren van de pagina nog te koppelen met de laatste boekingen
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin met het sorteren van de pagina koppelen voltooid met de laatste boekingen
 
@@ -198,7 +199,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Werking label
-Sens=D/C
+Sens=Richting
+AccountingDirectionHelp=Voor een tegenrekening van een klant, gebruik Credit om een betaling vast te leggen die u hebt ontvangen <br> Gebruik een tegenrekening van een leverancier Debet om een betaling vast te leggen die u hebt gedaan
 LetteringCode=Aflettercode
 Lettering=Afletteren
 Codejournal=Journaal
@@ -206,7 +208,8 @@ JournalLabel=Journaal label
 NumPiece=Boekingstuk
 TransactionNumShort=Transactienummer
 AccountingCategory=Gepersonaliseerde groepen
-GroupByAccountAccounting=Groeperen per grootboekrekening
+GroupByAccountAccounting=Groeperen op grootboekrekening
+GroupBySubAccountAccounting=Groepeer op subgrootboekrekening
 AccountingAccountGroupsDesc=Hier kunt u enkele grootboekrekening-groepen definiëren. Deze worden gebruikt voor gepersonaliseerde boekhoudrapporten.
 ByAccounts=Op grootboekrekening
 ByPredefinedAccountGroups=Op voorgedefinieerde groepen
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Betaling niet gekoppeld aan een product / dienst
 OpeningBalance=Beginbalans
 ShowOpeningBalance=Toon beginbalans
 HideOpeningBalance=Verberg beginbalans
-ShowSubtotalByGroup=Totaal per groep
+ShowSubtotalByGroup=Toon subtotaal op niveau
 
 Pcgtype=Rekening hoofdgroep
 PcgtypeDesc=Cluster grootboekrekeningen welke gebruikt worden als vooraf gedefinieerde 'filter'- en' groepeer'-criteria voor sommige boekhoudrapporten. 'INKOMEN' of 'UITGAVEN' worden bijvoorbeeld gebruikt als groepen voor boekhoudrekeningen van producten om het kosten- / inkomstenrapport samen te stellen.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Hier kunt u de lijst raadplegen van kostenregels om te k
 DescVentilExpenseReportMore=Als u een account instelt op het type onkostendeclaratieregels, kan de toepassing alle bindingen maken tussen uw declaratieregels en de boekhoudrekening van uw rekeningschema, met één klik met de knop <strong> "%s" </ strong>. Als het account niet is ingesteld op het tarievenwoordenboek of als u nog steeds regels hebt die niet aan een account zijn gekoppeld, moet u een manuele binding maken via het menu "<strong> %s </ strong>".
 DescVentilDoneExpenseReport=Hier kunt u de lijst raadplegen van kostenregels met hun tegenrekening
 
+Closure=Jaarafsluiting
 DescClosure=Raadpleeg hier het aantal bewegingen per maand die niet zijn gevalideerd en fiscale jaren die al open zijn
 OverviewOfMovementsNotValidated=Stap 1 / Overzicht van bewegingen niet gevalideerd. (Noodzakelijk om een boekjaar af te sluiten)
+AllMovementsWereRecordedAsValidated=Alle boekingen zijn geregistreerd als gevalideerd
+NotAllMovementsCouldBeRecordedAsValidated=Niet alle boekingen konden als gevalideerd worden geregistreerd
 ValidateMovements=Valideer wijzigingen
 DescValidateMovements=Elke wijziging of verwijdering van inboeken, afletteren en verwijderingen is verboden. Alle boekingen moeten worden gevalideerd, anders is afsluiten niet mogelijk
-SelectMonthAndValidate=Selecteer een maand en valideer bewerkingen
 
 ValidateHistory=Automatisch boeken
 AutomaticBindingDone=Automatisch koppelen voltooid
@@ -293,6 +298,7 @@ Accounted=Geboekt in grootboek
 NotYetAccounted=Nog niet doorgeboekt in boekhouding
 ShowTutorial=Handleiding weergeven
 NotReconciled=Niet afgestemd
+WarningRecordWithoutSubledgerAreExcluded=Pas op, alle bewerkingen zonder gedefinieerde subgrootboekrekening worden gefilterd en uitgesloten van deze weergave
 
 ## Admin
 BindingOptions=Koppelmogelijkheden
@@ -337,10 +343,11 @@ Modelcsv_LDCompta10=Exporteren voor LD Compta (v10 en hoger)
 Modelcsv_openconcerto=Exporteren voor OpenConcerto (test)
 Modelcsv_configurable=Configureerbare CSV export
 Modelcsv_FEC=FEC exporteren
+Modelcsv_FEC2=FEC exporteren (met datumgeneratie schrijven / document omgekeerd)
 Modelcsv_Sage50_Swiss=Export voor Sage 50 Zwitserland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
-Modelcsv_Gestinumv3=Export for Gestinum (v3)
-Modelcsv_Gestinumv5Export for Gestinum (v5)
+Modelcsv_Gestinumv3=Exporteren voor Gestinum (v3)
+Modelcsv_Gestinumv5Export voor Gestinum (v5)
 ChartofaccountsId=Rekeningschema Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index 99c50f85f22..6617f98ff61 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -9,10 +9,10 @@ VersionExperimental=Experimenteel
 VersionDevelopment=Ontwikkeling
 VersionUnknown=Onbekend
 VersionRecommanded=Aanbevolen
-FileCheck=Bestands integriteit controles
-FileCheckDesc=Met deze tool kunt u de integriteit van bestanden en de installatie van uw applicatie controleren door elk bestand met het officiële bestand te vergelijken. De waarde van sommige setup-constanten kan ook worden gecontroleerd. U kunt deze tool gebruiken om te bepalen of bestanden zijn gewijzigd (bijvoorbeeld door een hacker).
-FileIntegrityIsStrictlyConformedWithReference=Bestandsintegriteit is sterk conform de referentiebestanden.
-FileIntegrityIsOkButFilesWereAdded=Integriteitscontrole is geslaagd, echter zijn er nieuwe bestanden toegevoegd.
+FileCheck=Bestandsintegriteit controles
+FileCheckDesc=Met deze tool kunt u de integriteit van bestanden en de installatie van uw applicatie controleren door elk bestand met het officiële bestand te vergelijken. De waarde van sommige set-up constanten kan ook worden gecontroleerd. U kunt deze tool gebruiken om te bepalen of bestanden zijn gewijzigd (bijvoorbeeld door een hacker).
+FileIntegrityIsStrictlyConformedWithReference=De integriteit van bestanden is strikt in overeenstemming met de referentie.
+FileIntegrityIsOkButFilesWereAdded=Integriteitscontrole is geslaagd, er zijn echter nieuwe bestanden toegevoegd.
 FileIntegritySomeFilesWereRemovedOrModified=Controle op integriteit van de bestanden is mislukt. Sommige bestanden zijn gewijzigd, verwijderd of toegevoegd.
 GlobalChecksum=Globaal controlegetal
 MakeIntegrityAnalysisFrom=Maak integriteitsanalyse van toepassingsbestanden van
@@ -24,27 +24,27 @@ FilesModified=Gewijzigde bestanden
 FilesAdded=Toegevoegde bestanden
 FileCheckDolibarr=Controleer de integriteit van applicatiebestanden
 AvailableOnlyOnPackagedVersions=Het lokale bestand voor integriteitscontrole is alleen beschikbaar wanneer de toepassing wordt geïnstalleerd vanuit een officieel pakket
-XmlNotFound=Xml-integriteitsbestand van de toepassing is niet gevonden
-SessionId=Sessie-ID
+XmlNotFound=XML integriteitsbestand van de toepassing is niet gevonden
+SessionId=Sessie ID
 SessionSaveHandler=Wijze van sessieopslag
 SessionSavePath=Sessie opslag locatie
 PurgeSessions=Verwijderen van sessies
 ConfirmPurgeSessions=Wilt u werkelijk alle sessies sluiten? Dit zal elke gebruikerssessie afbreken (behalve die van uzelf).
 NoSessionListWithThisHandler=Save session handler geconfigureerd in uw PHP staat niet toe dat alle lopende sessies worden vermeld.
 LockNewSessions=Blokkeer nieuwe sessies
-ConfirmLockNewSessions=Weet je zeker dat je elke nieuwe Dolibarr-verbinding wilt beperken tot jezelf? Alleen gebruiker <b>%s</b> kan daarna verbinding maken.
+ConfirmLockNewSessions=Weet je zeker dat je elke nieuwe Dolibarr verbinding wilt beperken tot jezelf? Alleen gebruiker <b>%s</b> kan daarna verbinding maken.
 UnlockNewSessions=Verwijder sessieblokkering
 YourSession=Uw sessie
-Sessions=Gebruikersessies
+Sessions=Gebruikerssessies
 WebUserGroup=Webserver gebruiker / groep
 PermissionsOnFilesInWebRoot=Machtigingen voor bestanden in de hoofdmap van het web
 PermissionsOnFile=Rechten op bestand %s
-NoSessionFound=Uw PHP-configuratie lijkt geen lijst van actieve sessies toe te staan. De map die wordt gebruikt om sessies op te slaan ( <b>%s</b> ) kan worden beschermd (bijvoorbeeld door OS-machtigingen of door PHP-richtlijn open_basedir).
+NoSessionFound=Uw PHP-configuratie lijkt geen lijst van actieve sessies toe te staan. De map die wordt gebruikt om sessies op te slaan ( <b>%s</b> ) kan worden beschermd (bijvoorbeeld door OS machtigingen of door PHP richtlijn open_basedir).
 DBStoringCharset=Database karakterset voor het opslaan van gegevens
 DBSortingCharset=Database karakterset voor het sorteren van gegevens
-HostCharset=Host-tekenset
-ClientCharset=Cliënt tekenset
-ClientSortingCharset=Cliënt vergelijking
+HostCharset=Host karakterset
+ClientCharset=Cliënt karakterset
+ClientSortingCharset=Cliënt collatie
 WarningModuleNotActive=<b>Module %s</b> dient te worden ingeschakeld
 WarningOnlyPermissionOfActivatedModules=Hier worden alleen de rechten van geactiveerde modules weergegeven. U kunt andere modules activeren  in het menu Home > Instellingen > Modules
 DolibarrSetup=Installatie of update van Dolibarr
@@ -56,6 +56,8 @@ GUISetup=Weergave
 SetupArea=Instellingen
 UploadNewTemplate=Nieuwe template(s) uploaden
 FormToTestFileUploadForm=Formulier waarmee bestandsupload kan worden getest (afhankelijk van de gekozen opties)
+ModuleMustBeEnabled=Module / applicatie <b>%s</b> moet ingeschakeld zijn
+ModuleIsEnabled=Module / applicatie <b>%s</b> is ingeschakeld
 IfModuleEnabled=Opmerking: Ja, is alleen effectief als module <b>%s</b> is geactiveerd
 RemoveLock=Verwijder / hernoem het bestand <b>%s</b> als het bestaat, om het gebruik van de update / installatie-tool toe te staan.
 RestoreLock=Herstel het bestand <b>%s</b> , met alleen leesrechten, om verder gebruik van de update / installatie-tool uit te schakelen.
@@ -64,9 +66,9 @@ SecurityFilesDesc=Definieer hier de opties met betrekking tot beveiliging bij he
 ErrorModuleRequirePHPVersion=Fout, deze module vereist PHP versie %s of hoger.
 ErrorModuleRequireDolibarrVersion=Fout, deze module vereist Dolibarr versie %s of hoger.
 ErrorDecimalLargerThanAreForbidden=Fout, een nauwkeurigheid van meer dan <b>%s</b> wordt niet ondersteund.
-DictionarySetup=Veldwaarde instellingen
-Dictionary=Veld waarden
-ErrorReservedTypeSystemSystemAuto=De waarde 'system' en 'systemauto' als type zijn voorbehouden voor het systeem.  Je kan 'user' als waarde gebruiken om je eigen gegevens-record toe te voegen.
+DictionarySetup=Woordenboek instellingen
+Dictionary=Woordenboeken
+ErrorReservedTypeSystemSystemAuto=De waarde 'system' en 'systemauto' als type zijn voorbehouden aan het systeem.  Je kan 'user' als waarde gebruiken om je eigen record toe te voegen.
 ErrorCodeCantContainZero=Code mag geen 0 bevatten
 DisableJavascript=Schakel JavaScript en AJAX-functionaliteit uit
 DisableJavascriptNote=Opmerking: voor test- of foutopsporingsdoeleinden. Voor optimalisatie voor blinden of tekstbrowsers, kunt u ervoor kiezen om de instellingen op het profiel van de gebruiker te gebruiken
@@ -76,17 +78,16 @@ DelaiedFullListToSelectCompany=Wacht tot een toets wordt ingedrukt voordat inhou
 DelaiedFullListToSelectContact=Wacht tot een toets wordt ingedrukt voordat de inhoud van de combo-lijst met contactpersonen wordt geladen. <br> Dit kan de prestaties verbeteren als u een groot aantal contacten heeft, maar het is minder handig.
 NumberOfKeyToSearch=Aantal tekens om de zoekopdracht te activeren: %s
 NumberOfBytes=Aantal bytes
-SearchString=Zoekstring
-NotAvailableWhenAjaxDisabled=Niet beschikbaar wanneer AJAX functionaliteit uitgeschakeld is
-AllowToSelectProjectFromOtherCompany=Bij een document van een relatiej, kan een project worden gekozen dat is gekoppeld aan een relatie
+SearchString=Zoekreeks
+NotAvailableWhenAjaxDisabled=Niet beschikbaar wanneer AJAX functionaliteit is uitgeschakeld
+AllowToSelectProjectFromOtherCompany=Bij een document van een relatie, kan een project worden gekozen dat  gekoppeld is aan een andere relatie
 JavascriptDisabled=JavaScript uitgeschakeld
-UsePreviewTabs=Gebruik voorbeeld tabbladen
+UsePreviewTabs=Gebruik voorbeeldtabbladen
 ShowPreview=Toon voorbeeldweergave
 ShowHideDetails=Toon of verberg details
 PreviewNotAvailable=Voorbeeldweergave niet beschikbaar
 ThemeCurrentlyActive=Huidige thema
-CurrentTimeZone=Huidige tijdzone (server)
-MySQLTimeZone=Huidige tijdzone (database)
+MySQLTimeZone=Huidige tijdzone MySQL (database)
 TZHasNoEffect=Datums worden opgeslagen en geretourneerd door de databaseserver alsof ze werden bewaard als ingeleverde reeks. De tijdzone heeft alleen effect wanneer de UNIX_TIMESTAMP-functie wordt gebruikt (die niet door Dolibarr zou moeten worden gebruikt, dus database-TZ zou geen effect moeten hebben, zelfs als deze werd gewijzigd nadat gegevens waren ingevoerd).
 Space=Ruimte
 Table=Tabel
@@ -106,13 +107,13 @@ AntiVirusCommand=Het volledige pad naar het antiviruscommando
 AntiVirusCommandExample=Voorbeeld voor ClamAv Daemon (vereist clamav-daemon): / usr / bin / clamdscan<br>Voorbeeld voor ClamWin (erg langzaam): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
 AntiVirusParam= Aanvullende parameters op de opdrachtregel
 AntiVirusParamExample=Voorbeeld voor ClamAv Daemon: --fdpass<br>Voorbeeld voor ClamWin: --database = "C: \\ Program Files (x86) \\ ClamWin \\ lib"
-ComptaSetup=Instellingen van de boekhoudkundige module
+ComptaSetup=Instellingen van de boekhoud module
 UserSetup=Gebruikersbeheer instellingen
-MultiCurrencySetup=Setup meerdere valuta's
+MultiCurrencySetup=Set-up meerdere valuta's
 MenuLimits=Limieten en nauwkeurigheid
 MenuIdParent=ID van het bovenliggende menu
 DetailMenuIdParent=ID van het bovenliggend menu (0 voor een hoogste menu)
-DetailPosition=Sorteren aantal te definiëren menupositie
+DetailPosition=Sorteer nummer dat de volgorde van menupositie bepaalt
 AllMenus=Alles
 NotConfigured=Module/applicatie niet geconfigureerd
 Active=Actief
@@ -120,20 +121,20 @@ SetupShort=Instellingen
 OtherOptions=Overige opties
 OtherSetup=Andere instellingen
 CurrentValueSeparatorDecimal=Decimaal scheidingsteken
-CurrentValueSeparatorThousand=Duizend scheidingsteken
+CurrentValueSeparatorThousand=Duizendtal scheidingsteken
 Destination=Bestemming
 IdModule=Module ID
 IdPermissions=Rechten ID
 LanguageBrowserParameter=Instelling %s
-LocalisationDolibarrParameters=Localisatie-instellingen
-ClientTZ=Tijdzone van de klant (gebruiker)
-ClientHour=Tijd bij de klant (gebruiker)
+LocalisationDolibarrParameters=Lokalisatie instellingen
+ClientTZ=Tijdzone van de gebruiker
+ClientHour=Tijd bij de gebruiker
 OSTZ=Server OS tijdzone
 PHPTZ=Tijdzone PHP server
-DaylingSavingTime=Zomertijd (gebruiker)
-CurrentHour=Huidige tijd (server)
-CurrentSessionTimeOut=Huidige sessie timeout
-YouCanEditPHPTZ=Om een ​​andere PHP-tijdzone in te stellen (niet verplicht), kunt u proberen een .htaccess-bestand toe te voegen met de volgende regel: "SetEnv TZ Europe / Paris"
+DaylingSavingTime=Zomertijd
+CurrentHour=PHP tijd (server)
+CurrentSessionTimeOut=Huidige sessie time-out
+YouCanEditPHPTZ=Om een ​​andere PHP tijdzone in te stellen (niet verplicht), kunt u proberen een .htaccess bestand toe te voegen met de volgende regel: "SetEnv TZ Europe / Paris"
 HoursOnThisPageAreOnServerTZ=Waarschuwing, in tegenstelling tot andere schermen, bevinden de uren op deze pagina zich niet in uw lokale tijdzone, maar in de tijdzone van de server.
 Box=Widget
 Boxes=Widgets
@@ -142,7 +143,7 @@ AllWidgetsWereEnabled=Alle beschikbare widgets zijn geactiveerd
 PositionByDefault=Standaard volgorde
 Position=Positie
 MenusDesc=Menu-managers bepalen de inhoud van de twee menubalken in (horizontaal en verticaal).
-MenusEditorDesc=Met behulp van de menu-editor kunt u gepersonaliseerde items in menu's instellen. Gebruik deze functionaliteit zorgvuldig om te vermijden dat Dolibarr instabiel wordt en menu-items permanent onbereikbaar worden.<br>Sommige modules voegen items toe in de menu's (in de meeste gevallen in het menu <b>Alle</b>). Als u sommige van deze items abusievelijk verwijderd, dan kunt u ze herstellen door de module eerst uit te schakelen en daarna opnieuw in te schakelen.
+MenusEditorDesc=Met behulp van de menu-editor kunt u gepersonaliseerde items in menu's instellen. Gebruik deze functionaliteit zorgvuldig om te vermijden dat Dolibarr instabiel wordt en menu-items permanent onbereikbaar worden.<br>Sommige modules voegen items toe in de menu's (in de meeste gevallen in het menu <b>Alle</b>). Wanneer u sommige van deze items abusievelijk verwijdert, dan kunt u ze herstellen door de module eerst uit te schakelen en daarna weer opnieuw in te schakelen.
 MenuForUsers=Gebruikersmenu
 LangFile=.lang bestand
 Language_en_US_es_MX_etc=Taal (en_US, es_MX, ...)
@@ -153,9 +154,9 @@ SystemToolsAreaDesc=Dit gebied biedt beheerfuncties. Gebruik het menu om de gewe
 Purge=Leegmaken
 PurgeAreaDesc=Op deze pagina kunt u alle bestanden verwijderen die zijn gegenereerd of opgeslagen door Dolibarr (tijdelijke bestanden of alle bestanden in de map <b>%s</b> ). Het gebruik van deze functie is normaal gesproken niet nodig. Het wordt aangeboden als een oplossing voor gebruikers van wie Dolibarr wordt gehost door een provider die geen machtigingen biedt voor het verwijderen van bestanden die zijn gegenereerd door de webserver.
 PurgeDeleteLogFile=Verwijder logbestanden <b>%s</b> aangemaakt door de Syslog module (Geen risico op verlies van gegevens)
-PurgeDeleteTemporaryFiles=Verwijder alle tijdelijke bestanden (geen risico op gegevensverlies). Opmerking: verwijdering vindt alleen plaats als de tijdelijke map 24 uur geleden is gemaakt.
-PurgeDeleteTemporaryFilesShort=Verwijder tijdelijke bestanden
-PurgeDeleteAllFilesInDocumentsDir=Verwijder alle bestanden in de map: <b>%s</b> . <br> Hiermee worden alle gegenereerde documenten met betrekking tot elementen (relaties, facturen, enz ...), bestanden die zijn geüpload naar de ECM-module, database back-up dumps en tijdelijke bestanden verwijderd.
+PurgeDeleteTemporaryFiles=Verwijder alle log- en tijdelijke bestanden (geen risico op gegevensverlies). Opmerking: tijdelijke bestanden worden alleen verwijderd als de tijdelijke map meer dan 24 uur geleden is gemaakt.
+PurgeDeleteTemporaryFilesShort=Verwijder logboek en tijdelijke bestanden
+PurgeDeleteAllFilesInDocumentsDir=Verwijder alle bestanden in de map: <b>%s</b> . <br> Hiermee worden alle gegenereerde documenten met betrekking tot elementen (relaties, facturen, enz ...), bestanden die zijn geüpload naar de ECM module, database back-up dumps en tijdelijke bestanden verwijderd.
 PurgeRunNow=Nu opschonen
 PurgeNothingToDelete=Geen directory of bestanden om te verwijderen.
 PurgeNDirectoriesDeleted=<b>%s</b> bestanden of mappen verwijderd.
@@ -163,18 +164,18 @@ PurgeNDirectoriesFailed=Kan <b>%s</b>bestanden of mappen niet verwijderen.
 PurgeAuditEvents=Verwijder alle beveiligingsgerelateerde gebeurtenissen
 ConfirmPurgeAuditEvents=Weet u zeker dat u alle beveiligingsgerelateerde gebeurtenissen wilt verwijderen? Alle beveiligingsgerelateerde logbestanden zullen worden verwijderd. Er zullen geen andere gegevens worden verwijderd.
 GenerateBackup=Genereer backup
-Backup=Backup
+Backup=Back-up
 Restore=Herstellen
-RunCommandSummary=Backup geïnitieerd met het volgende commando
-BackupResult=Resultaat backup
-BackupFileSuccessfullyCreated=Backupbestand succesvol gegenereerd
+RunCommandSummary=Back-up geïnitieerd met het volgende commando
+BackupResult=Resultaat back-up
+BackupFileSuccessfullyCreated=Back-upbestand succesvol gegenereerd
 YouCanDownloadBackupFile=Het gegenereerde bestand kan nu worden gedownload
 NoBackupFileAvailable=Geen back-up bestanden beschikbaar.
 ExportMethod=Exporteer methode
 ImportMethod=Importeer methode
 ToBuildBackupFileClickHere=Om een back-up bestand te maken, klik <a href="%s">hier</a>.
-ImportMySqlDesc=Om een MySQL-back-upbestand te importeren, kunt u phpMyAdmin gebruiken via uw hosting of de opdracht mysql gebruiken vanaf de opdrachtregel. <br> Bijvoorbeeld:
-ImportPostgreSqlDesc=Om een backupbestand te importeren, dient u het 'pg_restore' commando vanaf de opdrachtregel uit te voeren:
+ImportMySqlDesc=Om een MySQL back-upbestand te importeren, kunt u phpMyAdmin gebruiken via uw hosting of de opdracht mysql gebruiken vanaf de opdrachtregel. <br> Bijvoorbeeld:
+ImportPostgreSqlDesc=Om een back-upbestand te importeren, dient u het 'pg_restore' commando vanaf de opdrachtregel uit te voeren:
 ImportMySqlCommand=%s %s < mijnbackupbestand.sql
 ImportPostgreSqlCommand=%s %s mijnbackupbestand.sql
 FileNameToGenerate=Bestandsnaam voor back-up:
@@ -194,7 +195,7 @@ AddDropTable=Voeg 'DROP TABLE' commando toe
 ExportStructure=Structuur
 NameColumn=Naam kolommen
 ExtendedInsert=Uitgebreide (extended) INSERT
-NoLockBeforeInsert=Geen lock-opdrachten rond INSERT
+NoLockBeforeInsert=Geen lock opdrachten rond INSERT
 DelayedInsert=Vertraagde (delayed) INSERT
 EncodeBinariesInHexa=Codeer binaire data in hexadecimalen
 IgnoreDuplicateRecords=Negeer fouten van dubbele tabelregels (INSERT negeren)
@@ -218,11 +219,11 @@ CompatibleAfterUpdate=Deze module vereist een update van uw Dolibarr %s (Min %s
 SeeInMarkerPlace=Bekijk in winkel
 SeeSetupOfModule=Zie setup van module%s
 Updated=Bijgewerkt
-Nouveauté=Nieuwsitems
+Nouveauté=Nieuwigheid
 AchatTelechargement=Kopen / Downloaden
 GoModuleSetupArea=Ga naar het gedeelte Module-instellingen om een nieuwe module te implementeren/installeren: <a href="%s">%s</a> .
 DoliStoreDesc=DoliStore, de officiële markt voor externe Dolibarr ERP / CRM modules.
-DoliPartnersDesc=Lijst met bedrijven die op maat ontwikkelde modules of functies leveren. <br>Opmerking: aangezien Dolibarr een open source-applicatie is, moet <i>iedereen</i> die ervaring heeft met PHP-programmering een module moeten kunnen ontwikkelen.
+DoliPartnersDesc=Lijst met bedrijven die op maat ontwikkelde modules of functies leveren. <br>Opmerking: aangezien Dolibarr een open source-applicatie is, moet <i>iedereen</i> die ervaring heeft met PHP-programmering een module kunnen ontwikkelen.
 WebSiteDesc=Externe websites voor meer add-on (niet-core) modules ...
 DevelopYourModuleDesc=Enkele oplossingen om uw eigen module te ontwikkelen ...
 URL=URL
@@ -246,17 +247,18 @@ ProtectAndEncryptPdfFilesDesc=Bescherming van PDF files, deze kunnen nog gelezen
 Feature=Functionaliteit
 DolibarrLicense=Licentie
 Developpers=Ontwikkelaars / mensen die bijgedragen hebben
-OfficialWebSite=Officiële Dolibarr-website
+OfficialWebSite=Officiële Dolibarr website
 OfficialWebSiteLocal=Lokale website (%s)
 OfficialWiki=Dolibarr documentatie / Wiki
 OfficialDemo=Online demonstratie van Dolibarr
 OfficialMarketPlace=Officiële markt voor externe modules / addons
 OfficialWebHostingService=Verwezen web hosting diensten (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
+ReferencedPreferredPartners=Voorkeur Partners
 OtherResources=Andere middelen
 ExternalResources=Externe bronnen
 SocialNetworks=Sociale netwerken
-ForDocumentationSeeWiki=Documentatie voor gebruikers of ontwikkelaars kunt u inzien door <br>te kijken op de Dolibarr Wiki-pagina's:<br><b><a href="%s" target="_blank">%s</a></b>
+SocialNetworkId=Sociale netwerk ID
+ForDocumentationSeeWiki=Documentatie voor gebruikers of ontwikkelaars kunt u inzien door <br>te kijken op de Dolibarr Wiki pagina's:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Voor alle andere vragen / hulp, kunt u gebruik maken van het Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Hier enkele bronnen voor hulp en ondersteuning met Dolibarr.
 HelpCenterDesc2=Enkele bronnen zijn alleen beschikbaar in het <b>Engels</b>.
@@ -277,8 +279,8 @@ EMailsSetup=E-mail instellingen
 EMailsDesc=Op deze pagina kunt u parameters of opties instellen voor het verzenden van e-mail.
 EmailSenderProfiles=Verzender e-mails profielen
 EMailsSenderProfileDesc=U kunt deze sectie leeg houden. Als u hier enkele e-mails invoert, worden deze toegevoegd aan de lijst met mogelijke afzenders in de combobox wanneer u een nieuwe e-mail schrijft.
-MAIN_MAIL_SMTP_PORT=SMTP / SMTPS-poort (standaardwaarde in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS-host (standaardwaarde in php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_PORT=SMTP / SMTPS-poort (standaard waarde in php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS-host (standaard waarde in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS-poort (niet gedefinieerd in PHP op Unix-achtige systemen)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (niet gedefinieerd in PHP op Unix-achtige systemen)
 MAIN_MAIL_EMAIL_FROM=E-mail afzender voor automatische e-mails (standaardwaarde in php.ini: <b>%s</b>)
@@ -289,17 +291,17 @@ MAIN_MAIL_FORCE_SENDTO=Stuur alle e-mails naar (in plaats van echte ontvangers,
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Stel e-mails van werknemers (indien gedefinieerd) voor in de lijst met vooraf gedefinieerde ontvangers bij het schrijven van een nieuwe e-mail
 MAIN_MAIL_SENDMODE=E-mail verzendmethode
 MAIN_MAIL_SMTPS_ID=SMTP ID (als het verzenden vanaf de server authenticatie vereist)
-MAIN_MAIL_SMTPS_PW=SMTP-wachtwoord (als het verzenden vanaf de server authenticatie vereist)
+MAIN_MAIL_SMTPS_PW=SMTP wachtwoord (als het verzenden vanaf de server authenticatie vereist)
 MAIN_MAIL_EMAIL_TLS=Gebruik TLS (SSL) encryptie
 MAIN_MAIL_EMAIL_STARTTLS=Gebruik TLS (STARTTLS) -codering
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
-MAIN_MAIL_EMAIL_DKIM_ENABLED=Gebruik DKIM om een e-mailhandtekening te genereren
-MAIN_MAIL_EMAIL_DKIM_DOMAIN=E-maildomein voor gebruik met dkim
-MAIN_MAIL_EMAIL_DKIM_SELECTOR=Naam van dkim selector
-MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Persoonlijke sleutel voor dkim-ondertekening
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autoriseer zelfondertekende certificaten
+MAIN_MAIL_EMAIL_DKIM_ENABLED=Gebruik DKIM om een e-mail handtekening te genereren
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=E-maildomein voor gebruik met DKIM
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=Naam van DKIM selector
+MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Persoonlijke sleutel voor DKIM ondertekening
 MAIN_DISABLE_ALL_SMS=Schakel alle sms-verzending uit (voor testdoeleinden of demo's)
 MAIN_SMS_SENDMODE=Methode te gebruiken om SMS te verzenden
-MAIN_MAIL_SMS_FROM=Standaard afzender telefoonnummer voor SMS-verzending
+MAIN_MAIL_SMS_FROM=Standaard afzender telefoonnummer voor SMS verzending
 MAIN_MAIL_DEFAULT_FROMTYPE=Standaard afzender e-mail voor handmatig verzenden (gebruikers e-mail of bedrijf e-mail)
 UserEmail=E-mailadres gebruiker
 CompanyEmail=E-mailadres bedrijf
@@ -307,46 +309,46 @@ FeatureNotAvailableOnLinux=Functionaliteit niet beschikbaar op Unix-achtige syst
 FixOnTransifex=Verbeter de vertaling op het online vertaalplatform van het project
 SubmitTranslation=Als de vertaling voor deze taal niet compleet is of als u fouten vindt, kunt u dit corrigeren door bestanden in directory <b>langs / %s te bewerken</b> en uw wijziging in te dienen op www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=Als de vertaling voor deze taal niet compleet is of als je fouten tegenkomt, kun je dit corrigeren door bestanden te bewerken in de directory <b> langs / %s </b> en aangepaste bestanden in te dienen op dolibarr.org/forum of, als je een ontwikkelaar bent, met een PR op github .com / Dolibarr / dolibarr
-ModuleSetup=Module-instellingen
+ModuleSetup=Module instellingen
 ModulesSetup=Instellingen van modules & applicatie
 ModuleFamilyBase=Systeem
 ModuleFamilyCrm=Customer Relationship Management (CRM)
 ModuleFamilySrm=Vendor Relationship Management (VRM)
 ModuleFamilyProducts=Product Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
-ModuleFamilyProjects=Projecten / Samenwerkingen
+ModuleFamilyProjects=Projecten / Samenwerking
 ModuleFamilyOther=Ander
-ModuleFamilyTechnic=Hulpmiddelen voor multi-modules
+ModuleFamilyTechnic=Hulpmiddelen voor multi modules
 ModuleFamilyExperimental=Experimentele modules
 ModuleFamilyFinancial=Financiële Modules (Boekhouding / Bedrijfsfinanciën)
 ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Websites en andere frontale toepassing
+ModuleFamilyPortal=Websites en andere toepassingen met gebruikersinterface
 ModuleFamilyInterface=Interfaces met externe systemen
 MenuHandlers=Menuverwerkers
 MenuAdmin=Menu wijzigen
 DoNotUseInProduction=Niet in productie gebruiken
 ThisIsProcessToFollow=Upgradeprocedure:
-ThisIsAlternativeProcessToFollow=Dit is een alternatieve setup om handmatig te verwerken:
+ThisIsAlternativeProcessToFollow=Dit is een alternatieve set-up om handmatig te verwerken:
 StepNb=Stap %s
 FindPackageFromWebSite=Zoek een pakket met de functies die u nodig hebt (bijvoorbeeld op de officiële website %s).
 DownloadPackageFromWebSite=Downloadpakket (bijvoorbeeld van de officiële website %s).
-UnpackPackageInDolibarrRoot=Pak de ingepakte bestanden uit in uw Dolibarr-servermap: <b>%s</b>
-UnpackPackageInModulesRoot=Om een externe module te implementeren / installeren, moet u de verpakte bestanden uitpakken in de servermap voor externe modules: <br> <b>%s</b>
-SetupIsReadyForUse=Module-implementatie is voltooid. U moet de module in uw toepassing echter inschakelen en instellen door naar de pagina-instellingsmodules te gaan: <a href="%s">%s</a>.
+UnpackPackageInDolibarrRoot=Pak de ingepakte bestanden uit in uw Dolibarr servermap: <b>%s</b>
+UnpackPackageInModulesRoot=Om een externe module te implementeren / installeren, moet u de gezipte bestanden uitpakken in de servermap voor externe modules: <br> <b>%s</b>
+SetupIsReadyForUse=Module-implementatie is voltooid. U moet de module in uw toepassing echter inschakelen en configureren door naar de pagina Instellingen / modules te gaan: <a href="%s">%s</a>.
 NotExistsDirect=De alternatieve hoofdmap is niet gedefinieerd in een bestaande map.<br>
 InfDirAlt=Vanaf versie 3 is het mogelijk om een alternatieve root directory te definiëren.  Dit stelt je in staat om op dezelfde plaats zowel plug-ins als eigen templates te bewaren. <br>Maak gewoon een directory op het niveau van de root van Dolibarr (bv met de naam: aanpassing).<br>
-InfDirExample=<br>Leg dit vast in het bestand <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>Als deze lijnen zijn inactief gemaakt met een "#" teken, verwijder dit teken dan om ze te activeren.
-YouCanSubmitFile=U kunt het .zip-bestand van het modulepakket vanaf hier uploaden:
+InfDirExample=<br>Leg dit vast in het bestand <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>Als deze regels inactief zijn gemaakt met een "#" teken, verwijder dit teken dan om ze te activeren.
+YouCanSubmitFile=U kunt het .zip bestand van het modulepakket vanaf hier uploaden:
 CurrentVersion=Huidige versie van Dolibarr
 CallUpdatePage=Blader naar de pagina die de databasestructuur en gegevens bijwerkt: %s.
 LastStableVersion=Laatste stabiele versie
 LastActivationDate=Laatste activeringsdatum
 LastActivationAuthor=Laatste activeringsauteur
-LastActivationIP=Laatste activerings-IP
+LastActivationIP=Laatste activering IP-adres
 UpdateServerOffline=Updateserver offline
 WithCounter=Beheer een teller
 GenericMaskCodes=U kunt elk gewenst maskernummer invoeren. In dit masker, kunnen de volgende tags worden gebruikt:<br><b>{000000}</b> correspondeert met een nummer welke vermeerderd zal worden op elke %s. Voer zoveel nullen in als de gewenste lengte van de teller. De teller wordt aangevuld met nullen vanaf links zodat er zoveel nullen zijn als in het masker.<br><b>{000000+000}</b> hetzelfde als voorgaand maar een offset corresponderend met het nummer aan de rechterkant van het + teken is toegevoegd startend op de eerste %s. <br><b>{000000@x}</b> hetzelfde als voorgaande maar de teller wordt gereset naar nul, wanneer maand x is bereikt (x tussen 1 en 12). Als deze optie is gebruikt en x is 2 of hoger, dan is de volgorde {yy}{mm} of {yyyy}{mm} ook vereist. <br><b>{dd}</b> dag (01 t/m 31).<br><b>{mm}</b> maand (01 t/m 12).<br><b>{yy}</b>, <b>{yyyy}</b> of <b>{y}</b> jaat over 2, 4 of 1 nummer(s). <br>
-GenericMaskCodes2=<b>{cccc}</b>de clientcode op n tekens<br> <b>{cccc000}</b> de cliëntcode op n tekens wordt gevolgd door een teller die is toegewezen aan de klant. Deze teller voor de klant wordt op hetzelfde moment gereset als de globale teller.<br><b> {tttt}</b> De code van het type van derden op n tekens (zie menu Home - Setup - Woordenboek - Soorten derden) . Als u deze label toevoegt, is de teller anders voor elk type derde partij.<br>
+GenericMaskCodes2=<b>{cccc}</b>de cliëntcode op n tekens<br> <b>{cccc000}</b> de cliëntcode op n tekens wordt gevolgd door een teller die is toegewezen aan de klant. Deze teller voor de klant wordt op hetzelfde moment gereset als de globale teller.<br><b> {tttt}</b> De code van het type van derden op n tekens (zie menu Home - Set-up - Woordenboek - Soorten derden) . Als u deze label toevoegt, is de teller anders voor elk type derde partij.<br>
 GenericMaskCodes3=Alle andere karakters in het masker zullen intact blijven.<br>Spaties zijn niet toegestaan.<br>
 GenericMaskCodes4a=<u>Voorbeeld op de 99e %s van relaties TheCompany, met datum 2007-01-31: </u><br>
 GenericMaskCodes4b=<u>Voorbeeld van een Klant gecreëerd op 2007-03-01:</u><br>
@@ -360,23 +362,23 @@ DoTestSend=Test verzenden
 DoTestSendHTML=Test het verzenden van HTML
 ErrorCantUseRazIfNoYearInMask=Fout, kan optie @ niet gebruiken om teller te resetten als sequence {yy} or {yyyy}  niet in het masker.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Fout, kan optie @ niet gebruiken wanneer de volgorde {jj}{mm} of {jjjj}{mm} niet is opgenomen in het masker.
-UMask=Umask parameter voor nieuwe bestanden op een Unix- / Linux- / BSD-bestandssysteem.
-UMaskExplanation=Deze parameter laat u de rechten bepalen welke standaard zijn ingesteld voor de bestanden aangemaakt door Dolibarr op de server (tijdens het uploaden, bijvoorbeeld).<br>Het moet de octale waarde zijn (bijvoorbeeld, 0666 betekent lezen en schrijven voor iedereen).<br>Deze parameter wordt NIET op een windows-server gebruikt
-SeeWikiForAllTeam=Kijk op de Wiki-pagina voor een lijst met bijdragers en hun organisatie
-UseACacheDelay= Ingestelde vertraging voor de cacheexport in secondes (0 of leeg voor geen cache)
-DisableLinkToHelpCenter=Verberg de link "<b>ondersteuning of hulp nodig</b>" op de inlogpagina
+UMask=Umask parameter voor nieuwe bestanden op een Unix- / Linux- / BSD bestandssysteem.
+UMaskExplanation=Deze parameter laat u de rechten bepalen welke standaard zijn ingesteld voor de bestanden aangemaakt door Dolibarr op de server (tijdens het uploaden, bijvoorbeeld).<br>Het moet de octale waarde zijn (bijvoorbeeld, 0666 betekent lezen en schrijven voor iedereen).<br>Deze parameter wordt NIET op een Windows server gebruikt
+SeeWikiForAllTeam=Kijk op de Wiki pagina voor een lijst met bijdragers en hun organisatie
+UseACacheDelay= Ingestelde vertraging voor de cache export in secondes (0 of leeg voor geen cache)
+DisableLinkToHelpCenter=Verberg de link "<b>Ondersteuning of hulp nodig</b>" op de inlogpagina
 DisableLinkToHelp=Verberg de link naar online hulp "<b>%s</b>"
-AddCRIfTooLong=Er is geen automatische tekstterugloop, tekst die te lang is, wordt niet weergegeven in documenten. Voeg zo nodig carriage returns toe in het tekstgebied.
-ConfirmPurge=Weet u zeker dat u deze zuivering wilt uitvoeren? <br> Hiermee worden al uw gegevensbestanden permanent verwijderd zonder dat ze worden teruggezet (ECM-bestanden, bijgevoegde bestanden ...).
+AddCRIfTooLong=Er is geen automatische tekst terugloop, tekst die te lang is, wordt niet weergegeven in documenten. Voeg zo nodig carriage returns toe in het tekstgebied.
+ConfirmPurge=Weet u zeker dat u deze opschoning wilt uitvoeren? <br> Hiermee worden al uw gegevensbestanden permanent verwijderd zonder dat ze worden teruggezet (ECM-bestanden, bijgevoegde bestanden ...).
 MinLength=Minimale lengte
 LanguageFilesCachedIntoShmopSharedMemory=Bestanden .lang in het gedeelde geheugen
 LanguageFile=Taalbestand
 ExamplesWithCurrentSetup=Voorbeelden met huidige configuratie
-ListOfDirectories=Lijst van OpenDocument sjablonenmappen
-ListOfDirectoriesForModelGenODT=Lijst van de directorie's die de templates bevatten in OpenDocument formaat.<br><br>Plaats hier het volledige pad van de directorie.<br>Voeg een nieuwe lijn tussen elke directorie.<br>Om een directorie van de GED module bij te voegen, voeg hier <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b> toe.<br><br>Bestanden in deze directorie's moeten eindigen op <b>.odt</b> of <b>.ods</b>.
-NumberOfModelFilesFound=Aantal  gevonden ODT/ODS-sjabloonbestanden
-ExampleOfDirectoriesForModelGen=Voorbeelden van de syntaxis: <br>c:\\mijndir<br>/home/mijndir<br>DOL_DATA_ROOT/ECM/ecmdir
-FollowingSubstitutionKeysCanBeUsed=Door het plaatsen van de volgende velden in het sjabloon krijgt u een vervanging met de aangepaste waarde bij het genereren van het document:
+ListOfDirectories=Lijst van OpenDocument sjabloonmappen
+ListOfDirectoriesForModelGenODT=Lijst van de directory's die de templates bevatten in OpenDocument formaat.<br><br>Plaats hier het volledige pad van de directory.<br>Voeg een nieuwe lijn tussen elke directory.<br>Om een directory van de GED module bij te voegen, voeg hier <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b> toe.<br><br>Bestanden in deze directory's moeten eindigen op <b>.odt</b> of <b>.ods</b>.
+NumberOfModelFilesFound=Aantal  gevonden ODT/ODS sjabloonbestanden
+ExampleOfDirectoriesForModelGen=Syntax-voorbeeld: <br> c: \\ myapp \\ mydocumentdir \\ mysubdir <br> / home / myapp / mydocumentdir / mysubdir <br> DOL_DATA_ROOT / ecm / ecmdir
+FollowingSubstitutionKeysCanBeUsed=Lees de Wiki documentatie om te weten hoe u uw odt documentsjablonen moet maken voordat u ze in die mappen opslaat
 FullListOnOnlineDocumentation=De complete lijst met beschikbare velden is te vinden in de gebruikersdocumentatie op de Wiki van Dolibar: http://wiki.dolibarr.org.
 FirstnameNamePosition=Positie van voornaam / achternaam
 DescWeather=De volgende afbeeldingen worden op het dashboard weergegeven wanneer het aantal late acties de volgende waarden bereiken:
@@ -389,28 +391,28 @@ ResponseTimeout=Time-out antwoord
 SmsTestMessage=Testbericht van __PHONEFROM__ naar __PHONETO__
 ModuleMustBeEnabledFirst=Module <b>%s</b> moet eerst worden ingeschakeld als je deze functie wilt gebruiken.
 SecurityToken=Sleutel tot URL beveiligen
-NoSmsEngine=Geen SMS-afzende-rbeheerder beschikbaar. Een SMS-afzenderbeheer is niet geïnstalleerd met de standaarddistributie omdat deze afhankelijk zijn van een externe leverancier, maar u kunt er enkele vinden op %s
+NoSmsEngine=Geen SMS afzender beheerder beschikbaar. Een SMS afzender beheerder is niet geïnstalleerd met de standaarddistributie omdat deze afhankelijk zijn van een externe leverancier, maar u kunt er enkele vinden op %s
 PDF=PDF
 PDFDesc=Algemene opties voor het genereren van PDF's
 PDFAddressForging=Regels voor adres sectie
-HideAnyVATInformationOnPDF=Verberg alle informatie met betrekking tot omzetbelasting / BTW
-PDFRulesForSalesTax=Regels voor omzet-belasting/btw
+HideAnyVATInformationOnPDF=Verberg alle informatie met betrekking tot omzetbelasting / Btw
+PDFRulesForSalesTax=Regels voor omzet-belasting/Btw
 PDFLocaltax=Regels voor %s
-HideLocalTaxOnPDF=Verberg het %s-tarief in de kolom Verkoopbelasting / btw
+HideLocalTaxOnPDF=Verberg het %s-tarief in de kolom Verkoopbelasting / Btw
 HideDescOnPDF=Verberg productomschrijving
 HideRefOnPDF=Verberg productreferentie
 HideDetailsOnPDF=Verberg productdetails
 PlaceCustomerAddressToIsoLocation=Gebruik de Franse standaardpositie (La Poste) als positie van het klant-adres
 Library=Bibliotheek
-UrlGenerationParameters=Parameters om URL beveiligen
-SecurityTokenIsUnique=Gebruik een unieke securekey parameter voor elke URL
+UrlGenerationParameters=Parameters om URL's te beveiligen
+SecurityTokenIsUnique=Gebruik een unieke secure key parameter voor elke URL
 EnterRefToBuildUrl=Geef referentie voor object %s
-GetSecuredUrl=Get berekende URL
-ButtonHideUnauthorized=Verberg de knoppen voor niet-beheerders bij ongeoorloofde acties in plaats van grijs gekleurde, uitgeschakelde knoppen
-OldVATRates=Oud BTW tarief
-NewVATRates=Nieuw BTW tarief
-PriceBaseTypeToChange=Wijzig op prijzen waarop een base reference waarde gedefiniëerd is
-MassConvert=Start conversie
+GetSecuredUrl=Verkrijg berekende URL
+ButtonHideUnauthorized=Verberg ongeautoriseerde actieknoppen ook voor interne gebruikers (anders alleen grijs)
+OldVATRates=Oud Btw tarief
+NewVATRates=Nieuw Btw tarief
+PriceBaseTypeToChange=Wijzig op prijzen waarop een basis referentie waarde gedefinieerd is
+MassConvert=Start bulk conversie
 PriceFormatInCurrentLanguage=Prijsindeling in huidige taal
 String=String
 String1Line=String (1 regel)
@@ -420,7 +422,7 @@ HtmlText=HTML-tekst
 Int=Integer
 Float=Float
 DateAndTime=Datum en uur
-Unique=Unique
+Unique=Uniek
 Boolean=Boolean (één checkbox)
 ExtrafieldPhone = Telefoon
 ExtrafieldPrice = Prijs
@@ -435,16 +437,16 @@ ExtrafieldCheckBox=Checkboxen
 ExtrafieldCheckBoxFromList=Checkboxen uit tabel
 ExtrafieldLink=Link naar een object
 ComputedFormula=Berekend veld
-ComputedFormulaDesc=U kunt hier een formule invoeren met andere eigenschappen van het object of een PHP-codering om een dynamisch berekende waarde te krijgen. U kunt alle PHP-compatibele formules gebruiken, inclusief de "?" condition operator en volgend globaal object: <strong> $ db, $ conf, $ langs, $ mysoc, $ user, $ object </strong>. <br> <strong> WAARSCHUWING </strong>: Mogelijk zijn slechts enkele eigenschappen van $ object beschikbaar. Als je eigenschappen nodig hebt die niet zijn geladen, haal dan gewoon het object in je formule zoals in het tweede voorbeeld. <br> Als u een berekend veld gebruikt, betekent dit dat u geen enkele waarde uit de interface kunt invoeren. Als er een syntaxisfout is, retourneert de formule mogelijk ook niets. <br> <br> Voorbeeld van formule: <br> $ object-> id < 10 ? round($object-> id / 2, 2): ($ object-> id + 2 * $ user-> id) * (int) substr ($ mysoc-> zip, 1, 2 ) <br> <br> Voorbeeld om object <br> (($ $ reloadedobj = new Societe ($ db)) && ($ reloadedobj-> fetchNoCompute ($ obj-> id? $ obj-> id> ($ obj-> id: ($ obj-)) te herladen > rowid: $ object-> id))> 0))? $ reloadedobj-> array_options ['options_extrafieldkey'] * $ reloadedobj-> capital / 5: '-1' <br> <br> Ander voorbeeld van formule om het laden van een object en het bovenliggende object te forceren: <br> (($ reloadedbj0) )) && ($ reloadedobj-> fetchNoCompute ($ object-> id)> 0) && ($ secondloadedobj = nieuw project ($ db)) && ($ secondloadedobj-> fetchNoCompute ($ reloadedobj-> fk_project)> 0))? $ secondloadedobj-> ref: 'Parent project not found'
+ComputedFormulaDesc=U kunt hier een formule invoeren met andere eigenschappen van het object of een PHP-codering om een dynamisch berekende waarde te krijgen. U kunt alle PHP compatibele formules gebruiken, inclusief de "?" condition operator en volgend globaal object: <strong> $ db, $ conf, $ langs, $ mysoc, $ user, $ object </strong>. <br> <strong> WAARSCHUWING </strong>: Mogelijk zijn slechts enkele eigenschappen van $ object beschikbaar. Als je eigenschappen nodig hebt die niet zijn geladen, haal dan gewoon het object in je formule zoals in het tweede voorbeeld. <br> Als u een berekend veld gebruikt, betekent dit dat u geen enkele waarde uit de interface kunt invoeren. Als er een syntaxisfout is, retourneert de formule mogelijk ook niets. <br> <br> Voorbeeld van formule: <br> $ object-> id < 10 ? round($object-> id / 2, 2): ($ object-> id + 2 * $ user-> id) * (int) substr ($ mysoc-> zip, 1, 2 ) <br> <br> Voorbeeld om object <br> (($ $ reloadedobj = new Societe ($ db)) && ($ reloadedobj-> fetchNoCompute ($ obj-> id? $ obj-> id> ($ obj-> id: ($ obj-)) te herladen > rowid: $ object-> id))> 0))? $ reloadedobj-> array_options ['options_extrafieldkey'] * $ reloadedobj-> capital / 5: '-1' <br> <br> Ander voorbeeld van formule om het laden van een object en het bovenliggende object te forceren: <br> (($ reloadedbj0) )) && ($ reloadedobj-> fetchNoCompute ($ object-> id)> 0) && ($ secondloadedobj = nieuw project ($ db)) && ($ secondloadedobj-> fetchNoCompute ($ reloadedobj-> fk_project)> 0))? $ secondloadedobj-> ref: 'Parent project not found'
 Computedpersistent=Berekend veld opslaan
 ComputedpersistentDesc=Berekende extra velden worden opgeslagen in de database, maar de waarde wordt alleen opnieuw berekend als het object van dit veld wordt gewijzigd. Als het berekende veld afhankelijk is van andere objecten of algemene gegevens, kan deze waarde onjuist zijn !!
 ExtrafieldParamHelpPassword=Dit veld leeg laten betekent dat deze waarde zonder codering wordt opgeslagen (veld mag alleen worden verborgen met een ster op het scherm). <br> Stel 'auto' in om de standaard coderingsregel te gebruiken om het wachtwoord in de database op te slaan (waarde lezen is dan alleen de hash, geen manier om de oorspronkelijke waarde op te halen)
-ExtrafieldParamHelpselect=Waardenlijst moet regels zijn met opmaaksleutel, waarde (waar sleutel niet '0' kan zijn) <br><br> bijvoorbeeld: <br> 1, waarde1 <br> 2, value2 <br> code3, waarde3 <br> ... <br><br> Om de lijst afhankelijk van een andere aanvullende attributenlijst te krijgen: <br> 1, waarde1 | options_ <i>parent_list_code</i> : parent_key <br> 2, <i>value2</i> | options_ <i>parent_list_code</i> : parent_key <br><br> Om de lijst afhankelijk van een andere lijst te krijgen: <br> 1, waarde1 | <i>parent_list_code</i> : parent_key <br> 2, waarde2 | <i>parent_list_code</i> : parent_key
-ExtrafieldParamHelpcheckbox=Waardenlijst moet regels zijn met opmaaksleutel, waarde (waar sleutel niet '0' kan zijn) <br><br> bijvoorbeeld: <br> 1, waarde1 <br> 2, value2 <br> 3, waarde3 <br> ...
-ExtrafieldParamHelpradio=Waardenlijst moet regels zijn met opmaaksleutel, waarde (waar sleutel niet '0' kan zijn) <br><br> bijvoorbeeld: <br> 1, waarde1 <br> 2, value2 <br> 3, waarde3 <br> ...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpselect=Lijst met waarden moeten regels zijn met opmaaksleutel, waarde (waar sleutel niet '0' kan zijn) <br><br> bijvoorbeeld: <br> 1, waarde1 <br> 2, value2 <br> code3, waarde3 <br> ... <br><br> Om de lijst afhankelijk van een andere aanvullende attributenlijst te krijgen: <br> 1, waarde1 | options_ <i>parent_list_code</i> : parent_key <br> 2, <i>value2</i> | options_ <i>parent_list_code</i> : parent_key <br><br> Om de lijst afhankelijk van een andere lijst te krijgen: <br> 1, waarde1 | <i>parent_list_code</i> : parent_key <br> 2, waarde2 | <i>parent_list_code</i> : parent_key
+ExtrafieldParamHelpcheckbox=Lijst met waarden moeten regels zijn met opmaaksleutel, waarde (waar sleutel niet '0' kan zijn) <br><br> bijvoorbeeld: <br> 1, waarde1 <br> 2, value2 <br> 3, waarde3 <br> ...
+ExtrafieldParamHelpradio=Lijst met waarden moeten regels zijn met opmaaksleutel, waarde (waar sleutel niet '0' kan zijn) <br><br> bijvoorbeeld: <br> 1, waarde1 <br> 2, value2 <br> 3, waarde3 <br> ...
+ExtrafieldParamHelpsellist=Lijst met waarden komen van een tabel<br>Syntax: table_name:label_field:id_field::filter<br>Bijvoorbeeld: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Lijst met waarden komt uit een tabel <br> Syntaxis: tabelnaam: labelveld: id_veld :: filter <br> Voorbeeld: c_typent: libelle: id :: filter <br><br> filter kan een eenvoudige test zijn (bijv. actief = 1) om alleen de actieve waarde weer te geven <br> U kunt ook $ ID $ gebruiken in filter waarvan de huidige id van het huidige object is <br> Gebruik $ SEL $ om een SELECT in filter te doen <br> Als u op extra velden wilt filteren, gebruikt u syntaxis extra.fieldcode = ... (waarbij veldcode de code van extraveld is) <br><br> Om de lijst afhankelijk van een andere aanvullende attributenlijst te krijgen: <br> c_typent: libelle: id: options_ <i>parent_list_code</i> | parent_column: filter <br><br> Om de lijst afhankelijk van een andere lijst te krijgen: <br> c_typent: libelle: id: <i>parent_list_code</i> | parent_column: filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
+ExtrafieldParamHelplink=Parameters moeten Objectnaam: Classpath<br> Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Blijf leeg voor een eenvoudig scheidingsteken <br> Stel dit in op 1 voor een samenvouwend scheidingsteken (standaard geopend voor nieuwe sessie, dan wordt de status behouden voor elke gebruikerssessie) <br> Stel dit in op 2 voor een samenvouwend scheidingsteken (standaard samengevouwen voor nieuwe sessie, dan wordt de status behouden voor elke gebruikerssessie)
 LibraryToBuildPDF=Gebruikte library voor generen PDF
 LocalTaxDesc=Sommige landen kunnen twee of drie belastingen toepassen op elke factuurregel. Als dit het geval is, kiest u het type voor de tweede en derde belasting en het tarief. Mogelijk type zijn: <br> 1: lokale belasting van toepassing op producten en diensten zonder btw (lokale belasting wordt berekend op bedrag zonder btw) <br> 2: lokale belasting van toepassing op producten en diensten inclusief btw (lokale belasting wordt berekend op bedrag + hoofdbelasting) <br> 3: lokale belasting van toepassing op producten zonder btw (lokale belasting wordt berekend op bedrag zonder btw) <br> 4: lokale belasting van toepassing op producten inclusief btw (lokale belasting wordt berekend op bedrag + hoofd btw) <br> 5: lokale belasting van toepassing op diensten zonder btw (lokale belasting wordt berekend op bedrag zonder btw) <br> 6: lokale belasting van toepassing op diensten inclusief btw (lokale belasting wordt berekend op bedrag + belasting)
@@ -554,9 +556,9 @@ Module54Desc=Beheer van contracten (diensten of terugkerende abonnementen)
 Module55Name=Streepjescodes
 Module55Desc=Streepjescodesbeheer
 Module56Name=Betaling via overschrijving
-Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module56Desc=Beheer van de betaling van leveranciers door middel van overboekingsopdrachten. Het omvat het genereren van SEPA-bestanden voor Europese landen.
 Module57Name=Betalingen via automatische incasso
-Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
+Module57Desc=Beheer van incasso-opdrachten. Het omvat het genereren van SEPA-bestanden voor Europese landen.
 Module58Name=ClickToDial
 Module58Desc=Integratie van een 'ClickToDial' systeem (Asterisk, etc)
 Module60Name=stickers
@@ -662,7 +664,7 @@ Module50200Desc=Bied klanten een PayPal-online betaalpagina (PayPal-account of c
 Module50300Name=Stripe
 Module50300Desc=Bied klanten een Stripe online betaalpagina (credit / debit cards). Dit kan worden gebruikt om uw klanten toe te staan ad-hocbetalingen te doen of betalingen gerelateerd aan een specifiek Dolibarr-object (factuur, bestelling, enz ...)
 Module50400Name=Boekhouding (dubbele invoer)
-Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Boekhoudkundig beheer (dubbele boekingen, ondersteuning van algemene en dochterondernemingen). Exporteer het grootboek in verschillende andere boekhoudsoftware-indelingen.
 Module54000Name=PrintIPP
 Module54000Desc=Direct afdrukken (zonder de documenten te openen) met behulp van Cups IPP-interface (printer moet zichtbaar zijn vanaf de server en CUPS moet op de server zijn geïnstalleerd).
 Module55000Name=Poll, Onderzoek of Stemmen
@@ -854,16 +856,16 @@ Permission538=Diensten exporteren
 Permission561=Inlezen betalingsopdrachten via overschrijving
 Permission562=Betaalopdracht aanmaken/wijzigen via overschrijving
 Permission563=Betaalopdracht verzenden
-Permission564=Record Debits/Rejections of credit transfer
+Permission564=Vastleggen verwerkingen/weigeringen van overboekingen
 Permission601=Lees stickers
 Permission602=Stickers maken/wijzigen
 Permission609=Verwijder etiketten
 Permission650=Lees stuklijsten
 Permission651=Materiaalrekeningen maken / bijwerken
 Permission652=Materiaalrekeningen verwijderen
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
+Permission660=Lees productieorder (MO)
+Permission661=Aanmaken/bijwerken productieorder (MO)
+Permission662=Verwijder productieorder (MO)
 Permission701=Bekijk donaties
 Permission702=Creëren / wijzigen donaties
 Permission703=Verwijderen donaties
@@ -873,8 +875,8 @@ Permission773=Verwijderen onkostennota's
 Permission774=Lees alle onkostennota's (ook voor de gebruiker niet ondergeschikten)
 Permission775=Goedkeuren onkostennota's
 Permission776=Betalen onkostennota's
-Permission777=Read expense reports of everybody
-Permission778=Create/modify expense reports of everybody
+Permission777=Lees onkostendeclaraties van iedereen
+Permission778=Aanmaken/wijzigen onkostendeclaraties van iedereen
 Permission779=Export onkostennota's
 Permission1001=Bekijk voorraden
 Permission1002=Toevoegen/wijzigen van een magazijn
@@ -899,9 +901,9 @@ Permission1185=Aankooporders goedkeuren
 Permission1186=Verwerk inkooporders
 Permission1187=Bevestig de ontvangst van inkooporders
 Permission1188=Bestellingen verwijderen
-Permission1189=Check/Uncheck a purchase order reception
+Permission1189=Vink de ontvangst van een inkooporder aan / uit
 Permission1190=Goedkeuren (tweede goedkeuring) inkooporders
-Permission1191=Export supplier orders and their attributes
+Permission1191=Exporteer bestellingen van leveranciers en hun attributen
 Permission1201=Geef het resultaat van een uitvoervergunning
 Permission1202=Creëren/wijzigen een uitvoervergunning
 Permission1231=Lees leveranciersfacturen
@@ -955,8 +957,8 @@ Permission50101=Gebruik kassaonderdeel (SimplePOS)
 Permission50151=Gebruik verkooppunt (TakePOS)
 Permission50201=Lees transacties
 Permission50202=Importeer transacties
-Permission50330=Read objects of Zapier
-Permission50331=Create/Update objects of Zapier
+Permission50330=Lees objecten van Zapier
+Permission50331=Maak/update objecten van Zapier
 Permission50332=Verwijder objecten van Zapier
 Permission50401=Bind producten en facturen met boekhoudrekeningen
 Permission50411=Bewerkingen lezen in grootboek
@@ -986,15 +988,15 @@ Permission67000=Printen kassabon toestaan
 Permission68001=Lees intracomm rapport
 Permission68002=Intracomm-rapport maken/wijzigen
 Permission68004=Intracomm-rapport verwijderen
-Permission941601=Read receipts
+Permission941601=Bonnen inlezen
 Permission941602=Bonnen aanmaken en wijzigen
-Permission941603=Validate receipts
-Permission941604=Send receipts by email
-Permission941605=Export receipts
-Permission941606=Delete receipts
+Permission941603=Bonnen valideren
+Permission941604=Verzend bonnen per e-mail
+Permission941605=Bonnen exporteren
+Permission941606=Verwijder bonnen
 DictionaryCompanyType=Relatietype
 DictionaryCompanyJuridicalType=Externe rechtspersonen
-DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectLevel=Potentieel niveau voor bedrijven
 DictionaryProspectContactLevel=Prospect potentieel niveau voor contacten
 DictionaryCanton=Staten / Provincies
 DictionaryRegion=Regio
@@ -1025,14 +1027,14 @@ DictionaryEMailTemplates=E-mailsjablonen
 DictionaryUnits=Eenheden
 DictionaryMeasuringUnits=Meeteenheden
 DictionarySocialNetworks=Sociale netwerken
-DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectStatus=Prospectstatus van bedrijven
 DictionaryProspectContactStatus=Prospect-status voor contacten
 DictionaryHolidayTypes=Soorten verlof
 DictionaryOpportunityStatus=Leadstatus voor project / lead
 DictionaryExpenseTaxCat=Onkostenoverzicht - Vervoerscategorieën
 DictionaryExpenseTaxRange=Onkostenoverzicht - bereik per transportcategorie
-DictionaryTransportMode=Intracomm report - Transport mode
-TypeOfUnit=Type of unit
+DictionaryTransportMode=Intracomm rapport - Transportmodus
+TypeOfUnit=Type eenheid
 SetupSaved=Instellingen opgeslagen
 SetupNotSaved=Installatie niet opgeslagen
 BackToModuleList=Terug naar modulelijst
@@ -1083,7 +1085,7 @@ LabelUsedByDefault=Standaard te gebruiken label indien er geen vertaling kan wor
 LabelOnDocuments=Etiket op documenten
 LabelOrTranslationKey=Label- of vertaalsleutel
 ValueOfConstantKey=Waarde van een configuratieconstante
-ConstantIsOn=Option %s is on
+ConstantIsOn=Optie %s is ingeschakeld
 NbOfDays=Aantal dagen
 AtEndOfMonth=Aan het einde van de maand
 CurrentNext=Huidige/volgende
@@ -1128,7 +1130,7 @@ LoginPage=Inlogpagina
 BackgroundImageLogin=Achtergrond afbeelding
 PermanentLeftSearchForm=Permanent zoekformulier in linker menu
 DefaultLanguage=Standaard taal
-EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
+EnableMultilangInterface=Schakel meertalige ondersteuning in voor klant- of leveranciersrelaties
 EnableShowLogo=Toon het bedrijfslogo in het menu
 CompanyInfo=Bedrijf/Organisatie
 CompanyIds=Bedrijfs-/organisatie-identiteiten
@@ -1182,7 +1184,7 @@ InfoWebServer=Over Web Server
 InfoDatabase=Over Database
 InfoPHP=Over PHP
 InfoPerf=Over Prestaties
-InfoSecurity=About Security
+InfoSecurity=Over beveiliging
 BrowserName=Browser naam
 BrowserOS=Browser OS
 ListOfSecurityEvents=Lijst van Dolibarr veiligheidgebeurtenisen
@@ -1233,7 +1235,7 @@ RestoreDesc2=Herstel het back-upbestand (zip-bestand bijvoorbeeld) van de map &q
 RestoreDesc3=Herstel de databasestructuur en gegevens van een back-up dumpbestand in de database van de nieuwe Dolibarr-installatie of in de database van deze huidige installatie ( <b>%s</b> ). Waarschuwing, zodra het herstel is voltooid, moet u een login / wachtwoord gebruiken dat bestond uit de back-uptijd / installatie om opnieuw verbinding te maken. <br> Om een back-updatabase te herstellen in deze huidige installatie, kunt u deze assistent volgen.
 RestoreMySQL=MySQL import
 ForcedToByAModule=Geforceerd tot <b>%s</b> door een geactiveerde module
-ValueIsForcedBySystem=This value is forced by the system. You can't change it.
+ValueIsForcedBySystem=Vaste waarde door het systeem. U kunt deze niet aanpassen.
 PreviousDumpFiles=Bestaande back-upbestanden
 PreviousArchiveFiles=Bestaande archiefbestanden
 WeekStartOnDay=Eerste dag van de week
@@ -1314,7 +1316,7 @@ PHPModuleLoaded=PHP component %s is geladen
 PreloadOPCode=Voorgeladen OPCode wordt gebruikt
 AddRefInList=Weergave klant/leverancier ref. infolijst (selecteer lijst of combobox) en de meeste hyperlinks. <br> Derden zullen verschijnen met een naamnotatie van "CC12345 - SC45678 - The Big Company corp." in plaats van "The Big Company corp".
 AddAdressInList=Toon klant / leverancier adres infolijst (selecteer lijst of combobox) <br> Derden zullen verschijnen met een naamnotatie van &quot;The Big Company corp. - 21 jump street 123456 Big town - USA&quot; in plaats van &quot;The Big Company corp&quot;.
-AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
+AddEmailPhoneTownInContactList=E-mailadres van contactpersoon (of telefoons indien niet gedefinieerd) en stadsinfo-lijst (selecteer lijst of combobox) weergeven <br> Contacten worden weergegeven met de naamindeling "Dupond Durand - dupond.durand@email.com - Parijs" of "Dupond Durand - 06 07 59 65 66 - Paris "in plaats van" Dupond Durand ".
 AskForPreferredShippingMethod=Vraag de gewenste verzendmethode voor derden.
 FieldEdition=Wijziging van het veld %s
 FillThisOnlyIfRequired=Voorbeeld: +2 (alleen invullen als tijdzone offset problemen worden ervaren)
@@ -1322,7 +1324,7 @@ GetBarCode=Haal barcode
 NumberingModules=Nummeringsmodellen
 DocumentModules=Documentmodellen
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Retourneer een wachtwoord dat is gegenereerd volgens het interne Dolibarr-algoritme: %s-tekens met gedeelde cijfers en tekens in kleine letters.
 PasswordGenerationNone=Stel geen gegenereerd wachtwoord voor. Wachtwoord moet handmatig worden ingevoerd.
 PasswordGenerationPerso=Retourneer een wachtwoord volgens uw persoonlijk gedefinieerde configuratie.
 SetupPerso=Volgens uw configuratie
@@ -1421,7 +1423,7 @@ AdherentMailRequired=E-mail vereist om een nieuw lid te maken
 MemberSendInformationByMailByDefault=Vinkvakje om een bevestigingse-mail te sturen naar leden (validatie van nieuwe abonnementen). Staat standaard aan.
 VisitorCanChooseItsPaymentMode=Bezoeker kan kiezen uit beschikbare betalingsmodi
 MEMBER_REMINDER_EMAIL=Automatische herinnering <b>per e-mail</b> inschakelen voor verlopen abonnementen. Opmerking: Module <strong>%s</strong> moet zijn ingeschakeld en correct zijn ingesteld om herinneringen te verzenden.
-MembersDocModules=Document templates for documents generated from member record
+MembersDocModules=Documentsjablonen voor documenten die zijn gegenereerd op basis van een ledenrecord
 ##### LDAP setup #####
 LDAPSetup=LDAP-instellingen
 LDAPGlobalParameters=Algemene instellingen
@@ -1565,8 +1567,8 @@ ForANonAnonymousAccess=Voor een geautoriseerde verbinding (bijvoorbeeld om over
 PerfDolibarr=Prestaties setup / optimaliseren rapport
 YouMayFindPerfAdviceHere=Deze pagina biedt enkele controles of advies met betrekking tot prestaties.
 NotInstalled=Niet geïnstalleerd.
-NotSlowedDownByThis=Not slowed down by this.
-NotRiskOfLeakWithThis=Not risk of leak with this.
+NotSlowedDownByThis=Hierdoor niet vertraagd.
+NotRiskOfLeakWithThis=Hiermee geen risico op lekken.
 ApplicativeCache=Applicatieve cache
 MemcachedNotAvailable=Geen applicatieve cache gevonden. U kunt de prestaties verbeteren door een cacheserver Memcached te installeren en een module die deze cacheserver kan gebruiken. <br> Meer informatie hier <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a> . <br> Merk op dat veel webhostingproviders dergelijke cacheserver niet bieden.
 MemcachedModuleAvailableButNotSetup=Module in memcache voor applicatieve cache gevonden, maar installatie van module is niet voltooid.
@@ -1614,9 +1616,9 @@ SyslogLevel=Level
 SyslogFilename=Bestandsnaam en -pad
 YouCanUseDOL_DATA_ROOT=U kunt DOL_DATA_ROOT/dolibarr.log gebruiken voor een logbestand in de Dolibarr "documenten"-map. U kunt ook een ander pad gebruiken om dit bestand op te slaan.
 ErrorUnknownSyslogConstant=Constante %s is geen bekende 'syslog' constante
-OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
+OnlyWindowsLOG_USER=Op Windows wordt alleen de LOG_USER-faciliteit ondersteund
 CompressSyslogs=Compressie en back-up van foutopsporingslogbestanden (gegenereerd door module Log voor foutopsporing)
-SyslogFileNumberOfSaves=Number of backup logs to keep
+SyslogFileNumberOfSaves=Aantal back-uplogboeken dat moet worden bewaard
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configureer de geplande taak opschonen om de frequentie van de logboekback-up in te stellen
 ##### Donations #####
 DonationsSetup=Donatiemoduleinstellingen
@@ -1672,7 +1674,7 @@ AdvancedEditor=Geavanceerde editor
 ActivateFCKeditor=Activeer FCKeditor voor:
 FCKeditorForCompany=WYSIWIG creatie / bewerking van bedrijfsomschrijving en notities
 FCKeditorForProduct=WYSIWIG creatie / bewerking van product- / dienstomschrijving en notities
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
+FCKeditorForProductDetails=WYSIWIG creatie / editie van productdetails regels voor alle entiteiten (voorstellen, bestellingen, facturen, enz ...). <span class="warning"> Waarschuwing: het gebruik van deze optie in dit geval wordt serieus niet aanbevolen, aangezien het problemen kan veroorzaken met speciale tekens en paginaopmaak bij het samenstellen van PDF-bestanden. </span>
 FCKeditorForMailing= WYSIWIG creatie / bewerking van mailings
 FCKeditorForUserSignature=WYSIWIG creatie /aanpassing van ondertekening
 FCKeditorForMail=WYSIWIG creatie / bewerking voor alle e-mail (behalve Gereedschap-> E-mailing)
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Gepersonaliseerde menu&#39;s niet gekoppeld aan een h
 NewMenu=Nieuw menu
 MenuHandler=Menuverwerker
 MenuModule=Bronmodule
-HideUnauthorizedMenu= Verberg ongeautoriseerde menu's (grijs)
+HideUnauthorizedMenu=Verberg ongeautoriseerde menu's ook voor interne gebruikers (anders alleen grijs)
 DetailId=Menu ID
 DetailMenuHandler=Menuverwerker waar het nieuwe menu getoond moet worden
 DetailMenuModule=Modulenaam als menu-item van een module afkomstig is
@@ -1737,11 +1739,11 @@ AGENDA_USE_EVENT_TYPE=Gebruik gebeurtenistypen (beheerd in menu Setup -&gt; Woor
 AGENDA_USE_EVENT_TYPE_DEFAULT=Stel deze standaardwaarde automatisch in voor het type evenement in het formulier voor het maken van een evenement
 AGENDA_DEFAULT_FILTER_TYPE=Stel dit type evenement automatisch in het zoekfilter van de agendaweergave in
 AGENDA_DEFAULT_FILTER_STATUS=Stel deze status automatisch in voor evenementen in het zoekfilter van de agendaweergave
-AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
+AGENDA_DEFAULT_VIEW=Welke weergave wil je standaard openen als je menu Agenda selecteert
+AGENDA_REMINDER_BROWSER=Schakel gebeurtenisherinnering <b> in de browser van de gebruiker </b> in (wanneer de herinneringsdatum wordt bereikt, wordt een pop-up weergegeven door de browser. Elke gebruiker kan dergelijke meldingen uitschakelen via de instellingen van de browser).
 AGENDA_REMINDER_BROWSER_SOUND=Schakel geluidsmelding in
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL=Schakel gebeurtenisherinnering <b> per e-mail in </b> (herinneringsoptie / vertraging kan voor elke gebeurtenis worden gedefinieerd).
+AGENDA_REMINDER_EMAIL_NOTE=Opmerking: De frequentie van de taak %s moet voldoende zijn om er zeker van te zijn dat de herinnering op het juiste moment wordt verzonden.
 AGENDA_SHOW_LINKED_OBJECT=Gekoppeld object weergeven in agendaweergave
 ##### Clicktodial #####
 ClickToDialSetup='Click-To-Dial' moduleinstellingen
@@ -1876,7 +1878,7 @@ EnterAnyCode=Dit veld bevat een referentie om de lijn te identificeren. Voer een
 Enter0or1=Voer 0 of 1 in
 UnicodeCurrency=Voer hier tussen accolades in, lijst met byte-nummers die het valutasymbool vertegenwoordigen. Bijvoorbeeld: voer voor $ [36] in - voor Brazilië real R $ [82,36] - voer voor € [8364] in
 ColorFormat=De RGB-kleur heeft het HEX-formaat, bijvoorbeeld: FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
+PictoHelp=Pictogramnaam in dolibarr-formaat ('image.png' indien in de huidige themamap, 'image.png@nom_du_module' indien in de directory / img / van een module)
 PositionIntoComboList=Positie van regel in combolijst
 SellTaxRate=BTW tarief
 RecuperableOnly=Ja voor BTW  "Niet waargemaakt maar herstelbaar", bestemd voor een deelstaat in Frankrijk. Houd in alle andere gevallen de waarde "Nee" aan.
@@ -1917,7 +1919,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP &amp; CRM %s is beschikbaar. Ve
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP &amp; CRM %s is beschikbaar. Versie %s is een onderhoudsversie, dus bevat alleen bugfixes. We raden alle gebruikers aan om naar deze versie te upgraden. Een onderhoudsrelease introduceert geen nieuwe functies of wijzigingen in de database. U kunt het downloaden van het downloadgedeelte van de https://www.dolibarr.org portal (submap Stabiele versies). U kunt de <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> lezen voor een volledige lijst met wijzigingen.
 MultiPriceRuleDesc=Wanneer de optie &quot;Meerdere prijsniveaus per product / service&quot; is ingeschakeld, kunt u verschillende prijzen (één per prijsniveau) voor elk product definiëren. Om u tijd te besparen, kunt u hier een regel invoeren om een prijs voor elk niveau automatisch te berekenen op basis van de prijs van het eerste niveau, dus u hoeft alleen een prijs voor het eerste niveau voor elk product in te voeren. Deze pagina is ontworpen om u tijd te besparen, maar is alleen nuttig als uw prijzen voor elk niveau relatief zijn aan het eerste niveau. U kunt deze pagina in de meeste gevallen negeren.
 ModelModulesProduct=Sjablonen voor productdocumenten
-WarehouseModelModules=Templates for documents of warehouses
+WarehouseModelModules=Sjablonen voor magazijndocumenten
 ToGenerateCodeDefineAutomaticRuleFirst=Om codes automatisch te kunnen genereren, moet u eerst een manager definiëren om het barcodenummer automatisch te definiëren.
 SeeSubstitutionVars=Zie * opmerking voor een lijst met mogelijke substitutievariabelen
 SeeChangeLog=Zie ChangeLog bestand (alleen in het Engels)
@@ -1983,11 +1985,12 @@ EMailHost=Host van e-mail IMAP-server
 MailboxSourceDirectory=Brondirectory van mailbox
 MailboxTargetDirectory=Doeldirectory voor mailbox
 EmailcollectorOperations=Operaties te doen door verzamelaar
+EmailcollectorOperationsDesc=Bewerkingen worden op volgorde begin tot eind uitgevoerd
 MaxEmailCollectPerCollect=Max aantal verzamelde e-mails per verzameling
 CollectNow=Verzamel nu
 ConfirmCloneEmailCollector=Weet je zeker dat je de e-mailverzamelaar %s wilt klonen?
-DateLastCollectResult=Laatste datum geprobeerd te verzamelen
-DateLastcollectResultOk=Datum laatste verzamelen succesvol
+DateLastCollectResult=Datum laatste poging van verzamelen
+DateLastcollectResultOk=Datum van laatste succesvolle verzamelen
 LastResult=Laatste resultaat
 EmailCollectorConfirmCollectTitle=E-mail verzamelbevestiging
 EmailCollectorConfirmCollect=Wil je de collectie voor deze verzamelaar nu runnen?
@@ -1996,16 +1999,16 @@ NothingProcessed=Niets gedaan
 XEmailsDoneYActionsDone=%s e-mails gekwalificeerd, %s e-mails succesvol verwerkt (voor %s record / acties gedaan)
 RecordEvent=E-mail gebeurtenis opnemen
 CreateLeadAndThirdParty=Creëer lead (en relatie indien nodig)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+CreateTicketAndThirdParty=Maak een ticket aan (en link naar een relatie als het door een eerdere bewerking is geladen)
 CodeLastResult=Laatste resultaatcode
 NbOfEmailsInInbox=Aantal e-mails in bronmap
 LoadThirdPartyFromName=Zoeken van derden laden op %s (alleen laden)
 LoadThirdPartyFromNameOrCreate=Zoeken van derden laden op %s (maken indien niet gevonden)
-WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
-WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
-WithDolTrackingIDInMsgId=Message sent from Dolibarr
-WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+WithDolTrackingID=Bericht inzake een gesprek geïnitieerd door een eerste e-mail verzonden vanuit Dolibarr
+WithoutDolTrackingID=Bericht van een gesprek geïnitieerd door een eerste e-mail die NIET is verzonden vanuit Dolibarr
+WithDolTrackingIDInMsgId=Bericht verzonden vanuit Dolibarr
+WithoutDolTrackingIDInMsgId=Bericht NIET verzonden vanuit Dolibarr
+CreateCandidature=Maak een sollicitatie
 FormatZip=Zip
 MainMenuCode=Menu toegangscode (hoofdmenu)
 ECMAutoTree=Toon automatische ECM-structuur
@@ -2019,7 +2022,7 @@ DisabledResourceLinkContact=Schakel functie uit om een ​​bron te koppelen aa
 EnableResourceUsedInEventCheck=Schakel de functie in om te controleren of een bron in een gebeurtenis wordt gebruikt
 ConfirmUnactivation=Bevestig de module-reset
 OnMobileOnly=Alleen op klein scherm (smartphone)
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
+DisableProspectCustomerType=Schakel het derde type 'Prospect + klant' uit (de derde moet dus 'Prospect' of 'Klant' zijn, maar kan niet beide zijn)
 MAIN_OPTIMIZEFORTEXTBROWSER=Vereenvoudig de interface voor blinden
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Schakel deze optie in als u een blinde persoon bent of als u de toepassing gebruikt vanuit een tekstbrowser zoals Lynx of Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Wijzig de kleur van de interface voor kleurenblinde persoon
@@ -2041,15 +2044,15 @@ UseDebugBar=Gebruik de foutopsporingsbalk
 DEBUGBAR_LOGS_LINES_NUMBER=Aantal laatste logboekregels dat in de console moet worden bewaard
 WarningValueHigherSlowsDramaticalyOutput=Waarschuwing, hogere waarden vertragen de uitvoer dramatisch
 ModuleActivated=Module %s is geactiveerd en vertraagt de interface
-IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
-AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+IfYouAreOnAProductionSetThis=Als u zich in een productieomgeving bevindt, moet u deze eigenschap instellen op %s.
+AntivirusEnabledOnUpload=Antivirus ingeschakeld op geüploade bestanden
 EXPORTS_SHARE_MODELS=Exportmodellen zijn met iedereen te delen
 ExportSetup=Installatie van exportmodule
 ImportSetup=Instellen van module Import
 InstanceUniqueID=Uniek ID van de instantie
 SmallerThan=Kleiner dan
 LargerThan=Groter dan
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
+IfTrackingIDFoundEventWillBeLinked=Houd er rekening mee dat als een tracking-ID van een object in e-mail wordt gevonden, of als de e-mail een antwoord is van een e-mail die al is verzameld en aan een object is gekoppeld, de gemaakte gebeurtenis automatisch wordt gekoppeld aan het bekende gerelateerde object.
 WithGMailYouCanCreateADedicatedPassword=Als u bij een GMail-account de validatie in 2 stappen hebt ingeschakeld, wordt aanbevolen om een speciaal tweede wachtwoord voor de toepassing te maken in plaats van uw eigen wachtwoord van https://myaccount.google.com/.
 EmailCollectorTargetDir=Het kan een gewenst gedrag zijn om de e-mail naar een andere tag / directory te verplaatsen wanneer deze met succes is verwerkt. Stel hier gewoon de naam van de map in om deze functie te gebruiken (gebruik GEEN speciale tekens in de naam). Houd er rekening mee dat u ook een inlogaccount voor lezen / schrijven moet gebruiken.
 EmailCollectorLoadThirdPartyHelp=U kunt deze actie gebruiken om de e-mailinhoud te gebruiken om een bestaande relatie in uw database te zoeken en te laden. De gevonden (of gecreëerde) relatie zal worden gebruikt voor het volgen van acties die het nodig hebben. In het parameterveld kunt u bijvoorbeeld 'EXTRACT: BODY: Name: \\ s ([^ \\ s] *)' gebruiken als u de naam van de relatie wilt extraheren uit een string 'Name: name to find' gevonden in de bron.
@@ -2076,10 +2079,14 @@ MeasuringScaleDesc=De schaal is het aantal plaatsen dat u nodig heeft om het dec
 TemplateAdded=Sjabloon toegevoegd
 TemplateUpdated=Sjabloon bijgewerkt
 TemplateDeleted=Sjabloon verwijderd
-MailToSendEventPush=Event reminder email
-SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
-DictionaryProductNature= Nature of product
-CountryIfSpecificToOneCountry=Country (if specific to a given country)
-YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
-ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+MailToSendEventPush=E-mail ter herinnering voor een evenement
+SwitchThisForABetterSecurity=Het wijzigen van deze waarde naar %s wordt aanbevolen voor meer beveiliging
+DictionaryProductNature= Aard van het product
+CountryIfSpecificToOneCountry=Land (indien specifiek voor een bepaald land)
+YouMayFindSecurityAdviceHere=Mogelijk vindt u hier beveiligingsadvies
+ModuleActivatedMayExposeInformation=Deze module kan gevoelige gegevens blootleggen. Schakel het uit als u het niet nodig heeft.
+ModuleActivatedDoNotUseInProduction=Een module ontworpen voor de ontwikkeling is ingeschakeld. Schakel het niet in bij een productieomgeving.
+CombinationsSeparator=Scheidingsteken voor productcombinaties
+SeeLinkToOnlineDocumentation=Zie link naar online documentatie in het bovenste menu voor voorbeelden
+SHOW_SUBPRODUCT_REF_IN_PDF=Als de functie "%s" van module <b>%s</b> wordt gebruikt, toon dan de details van subproducten van een kit op PDF.
+AskThisIDToYourBank=Neem contact op met uw bank om deze ID te krijgen
diff --git a/htdocs/langs/nl_NL/agenda.lang b/htdocs/langs/nl_NL/agenda.lang
index 83cf46b9711..4c6bbdab045 100644
--- a/htdocs/langs/nl_NL/agenda.lang
+++ b/htdocs/langs/nl_NL/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Aantal gebeurtenissen
 ListOfActions=Gebeurtenissenlijst
 EventReports=Overzicht gebeurtenissen
 Location=Locatie
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Gebeurtenis toegewezen aan elke gebruiker in de groep
 EventOnFullDay=Gebeurtenis volledige dag
 MenuToDoActions=Alle openstaande acties
 MenuDoneActions=Alle beëindigde acties
@@ -63,7 +63,7 @@ ShipmentClassifyClosedInDolibarr=Verzending %s geclassificeerd als gefactureerd
 ShipmentUnClassifyCloseddInDolibarr=Zending %s geclassificeerd, opnieuw openen
 ShipmentBackToDraftInDolibarr=Zending %s ga terug naar conceptstatus
 ShipmentDeletedInDolibarr=Verzending %s verwijderd
-ReceptionValidatedInDolibarr=Reception %s validated
+ReceptionValidatedInDolibarr=Ontvangst %s gevalideerd
 OrderCreatedInDolibarr=Bestelling %s aangemaakt
 OrderValidatedInDolibarr=Opdracht %s gevalideerd
 OrderDeliveredInDolibarr=Bestelling %s is geleverd
@@ -86,8 +86,8 @@ ProposalDeleted=Voorstel verwijderd
 OrderDeleted=Bestelling verwijderd
 InvoiceDeleted=Factuur verwijderd
 DraftInvoiceDeleted=Conceptfactuur verwijderd
-CONTACT_CREATEInDolibarr=Contact %s created
-CONTACT_DELETEInDolibarr=Contact %s deleted
+CONTACT_CREATEInDolibarr=Contact %s gemaakt
+CONTACT_DELETEInDolibarr=Contact %s verwijderd
 PRODUCT_CREATEInDolibarr=Product %s aangemaakt
 PRODUCT_MODIFYInDolibarr=Product %s aangepast
 PRODUCT_DELETEInDolibarr=Product %s verwijderd
@@ -152,6 +152,7 @@ ActionType=Taak type
 DateActionBegin=Begindatum
 ConfirmCloneEvent=Weet u zeker dat u gebeurtenis <b> %s </b> wilt klonen?
 RepeatEvent=Herhaal gebeurtenis/taak
+OnceOnly=Eenmalig
 EveryWeek=Elke week
 EveryMonth=Elke maand
 DayOfMonth=Dag van de maand
@@ -160,9 +161,9 @@ DateStartPlusOne=Begindatum + 1 uur
 SetAllEventsToTodo=Zet alle evenementen op te doen
 SetAllEventsToInProgress=Stel alle evenementen in proces
 SetAllEventsToFinished=Stel alle evenementen in op voltooid
-ReminderTime=Reminder period before the event
-TimeType=Duration type
-ReminderType=Callback type
-AddReminder=Create an automatic reminder notification for this event
-ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+ReminderTime=Herinneringsperiode voor het evenement
+TimeType=Duur
+ReminderType=Terugbellen
+AddReminder=Maak een automatische herinneringsmelding voor deze afspraak
+ErrorReminderActionCommCreation=Fout bij het maken van de herinneringsmelding voor deze afspraak
+BrowserPush=Browser pop-up melding
diff --git a/htdocs/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang
index 2bdc1c80373..3ca33c9c71b 100644
--- a/htdocs/langs/nl_NL/banks.lang
+++ b/htdocs/langs/nl_NL/banks.lang
@@ -7,7 +7,7 @@ BankName=Banknaam
 FinancialAccount=Rekening
 BankAccount=Bankrekening
 BankAccounts=Bankrekeningen
-BankAccountsAndGateways=Bankrekeningen | gateways
+BankAccountsAndGateways=Bankrekeningen | Gateways
 ShowAccount=Toon rekening
 AccountRef=Financiële rekening referentie
 AccountLabel=Financiële rekening label
@@ -25,19 +25,19 @@ InitialBankBalance=Beginbalans
 EndBankBalance=Eindbalans
 CurrentBalance=Huidig saldo
 FutureBalance=Toekomstig saldo
-ShowAllTimeBalance=Toon saldo sinds begin
+ShowAllTimeBalance=Toon saldo vanaf begin
 AllTime=Vanaf het begin
 Reconciliation=Overeenstemming
 RIB=Bankrekeningnummer
-IBAN=IBAN-nummer
-BIC=BIC/SWIFT-code
+IBAN=IBAN nummer
+BIC=BIC/SWIFT code
 SwiftValid=BIC / SWIFT geldig
-SwiftVNotalid=BIC / SWIFT is niet geldig
+SwiftVNotalid=BIC / SWIFT code onjuist
 IbanValid=IBAN geldig
-IbanNotValid=IBAN is niet geldig
-StandingOrders=Incasso-opdrachten
-StandingOrder=Incasso-opdracht
-PaymentByDirectDebit=Automatische incasso
+IbanNotValid=IBAN onjuist
+StandingOrders=Incasso opdrachten
+StandingOrder=Automatische incasso
+PaymentByDirectDebit=Betaling via automatische incasso
 PaymentByBankTransfers=Betalingen via overschrijving
 PaymentByBankTransfer=Betaling via overschrijving
 AccountStatement=Rekeningafschrift
@@ -55,7 +55,7 @@ NewBankAccount=Nieuwe rekening
 NewFinancialAccount=Nieuwe financiële rekening
 MenuNewFinancialAccount=Nieuwe financiële rekening
 EditFinancialAccount=Wijzig rekening
-LabelBankCashAccount=label van bank of kas
+LabelBankCashAccount=Label van bank of kas
 AccountType=Rekeningtype
 BankType0=Spaarrekening
 BankType1=Betaalrekening
@@ -63,9 +63,9 @@ BankType2=Kasrekening
 AccountsArea=Rekeningenoverzicht
 AccountCard=Rekeningdetailkaart
 DeleteAccount=Rekening verwijderen
-ConfirmDeleteAccount=Weet u deze dat u dit account wilt verwijderen?
+ConfirmDeleteAccount=Weet u zeker dat u deze rekening wilt verwijderen?
 Account=Rekening
-BankTransactionByCategories=Bankregels op categorie
+BankTransactionByCategories=Bankboekingen per categorie
 BankTransactionForCategory=Bankboekingen voor categorie <b>%s</b>
 RemoveFromRubrique=Verwijder link met categorie
 RemoveFromRubriqueConfirm=Weet u zeker dat u de link tussen het item en de categorie wilt wissen?
@@ -75,7 +75,7 @@ BankTransactions=Bankmutaties
 BankTransaction=Bankmutatie
 ListTransactions=Mutatieoverzicht
 ListTransactionsByCategory=Mutaties per categorie
-TransactionsToConciliate=Items af te stemmen
+TransactionsToConciliate=Af te stemmen transacties
 TransactionsToConciliateShort=Af te stemmen
 Conciliable=Kunnen worden afgestemd
 Conciliate=Afstemmen
@@ -83,7 +83,7 @@ Conciliation=Afstemming
 SaveStatementOnly=Afschrift alleen opslaan
 ReconciliationLate=Later afstemmen
 IncludeClosedAccount=Inclusief opgeheven rekeningen
-OnlyOpenedAccount=Alleen open accounts
+OnlyOpenedAccount=Alleen open rekeningen
 AccountToCredit=Te crediteren rekening
 AccountToDebit=Te debiteren rekening
 DisableConciliation=Afstemming van deze rekening uitschakelen
@@ -93,36 +93,36 @@ StatusAccountOpened=Open
 StatusAccountClosed=Opgeheven
 AccountIdShort=Aantal
 LineRecord=Transactie
-AddBankRecord=Item toevoegen
-AddBankRecordLong=Item handmatig toevoegen
+AddBankRecord=Transactie toevoegen
+AddBankRecordLong=Transactie handmatig toevoegen
 Conciliated=Afgestemd
 ConciliatedBy=Afgestemd door
 DateConciliating=Afgestemd op
-BankLineConciliated=Boeking afgestemd met afschrift
+BankLineConciliated=Boeking afgestemd met bankafschrift
 Reconciled=Afgestemd
 NotReconciled=Niet afgestemd
 CustomerInvoicePayment=Afnemersbetaling
-SupplierInvoicePayment=Betaling van de leverancier
+SupplierInvoicePayment=Leveranciersbetaling
 SubscriptionPayment=Betaling van abonnement
 WithdrawalPayment=Debet betalingsopdracht
 SocialContributionPayment=Sociale/fiscale belastingbetaling
-BankTransfer=Credit transfer
-BankTransfers=Credit transfers
+BankTransfer=Overschrijving
+BankTransfers=Overschrijvingen
 MenuBankInternalTransfer=Interne overboeking
 TransferDesc=Overdracht van de ene rekening naar de andere. Dolibarr zal twee records schrijven (een debet in de bronaccount en een tegoed in het doelaccount). Hetzelfde bedrag (behalve aanduiding), label en datum worden gebruikt voor deze transactie)
 TransferFrom=Van
 TransferTo=T/m
 TransferFromToDone=Een overboeking van <b>%s</b> naar <b>%s</b> van <b>%s</b> is geregistreerd.
-CheckTransmitter=Overboeker
+CheckTransmitter=Verzender
 ValidateCheckReceipt=Betaling met cheque goedkeuren?
 ConfirmValidateCheckReceipt=Weet u zeker dat u deze cheque wilt valideren? Hierna is het niet meer mogelijk dit te wijzigen.
-DeleteCheckReceipt=Dit chequebewijs verwijderen?
+DeleteCheckReceipt=Deze cheque ontvangst verwijderen?
 ConfirmDeleteCheckReceipt=Weet u zeker dat u deze betaling via cheque wilt verwijderen?
 BankChecks=Bankcheque
 BankChecksToReceipt=Cheques in afwachting van storting
 BankChecksToReceiptShort=Cheques in afwachting van storting
 ShowCheckReceipt=Toon controleren stortingsbewijs
-NumberOfCheques=Checknr.
+NumberOfCheques=Check nr.
 DeleteTransaction=Ingave verwijderen
 ConfirmDeleteTransaction=Weet u zeker dat u deze boeking wilt verwijderen?
 ThisWillAlsoDeleteBankRecord=Hiermee wordt ook de boeking in de bank verwijderd
@@ -143,40 +143,40 @@ BackToAccount=Terug naar rekening
 ShowAllAccounts=Toon alle rekeningen
 FutureTransaction=Toekomstige transactie. Nog niet mogelijk af te stemmen
 SelectChequeTransactionAndGenerate=Selecteer/ filter cheques om op te nemen in de chequebetaling en klik op "Aanmaken"
-InputReceiptNumber=Kies het bankafschrift in verband met de bemiddeling. Gebruik een sorteerbaar numerieke waarde: YYYYMM of YYYYMMDD
-EventualyAddCategory=Tenslotte een categorie opgeven waarin de gegevens bewaard kunnen worden
+InputReceiptNumber=Kies het bankafschrift in verband met de bemiddeling. Gebruik een sorteerbare numerieke waarde: YYYYMM of YYYYMMDD
+EventualyAddCategory=Geef tenslotte een categorie op waarin de gegevens bewaard kunnen worden
 ToConciliate=Afstemmen?
-ThenCheckLinesAndConciliate=Duid dan de lijnen aan van het bankafschrift en klik
+ThenCheckLinesAndConciliate=Controleer vervolgens de regels op het bankafschrift en klik
 DefaultRIB=Standaard BAN
 AllRIB=Alle BAN
 LabelRIB=BAN label
 NoBANRecord=Geen BAN gegeven
-DeleteARib=Verwijderen BAN gegeven
-ConfirmDeleteRib=Weet u zeker dat u dit BAN-record wilt verwijderen?
-RejectCheck=Teruggekeerde cheque
-ConfirmRejectCheck=Weet u zeker dat u deze controle wilt markeren als afgewezen?
-RejectCheckDate=Teruggave datum cheque
-CheckRejected=Teruggekeerde cheque
+DeleteARib=Verwijderen BAN record
+ConfirmDeleteRib=Weet u zeker dat u dit BAN record wilt verwijderen?
+RejectCheck=Geretourneerde cheque
+ConfirmRejectCheck=Weet u zeker dat u deze cheque wilt markeren als afgewezen?
+RejectCheckDate=Datum dat cheque is geretourneerd
+CheckRejected=Geretourneerde cheque
 CheckRejectedAndInvoicesReopened=Cheque geretourneerd en facturen worden opnieuw geopend
 BankAccountModelModule=Documentsjablonen voor bankrekeningen
-DocumentModelSepaMandate=Sjabloon van SEPA-mandaat. Alleen bruikbaar voor Europese landen in de Europese Unie.
-DocumentModelBan=Sjabloon om een pagina met BAN-informatie af te drukken.
+DocumentModelSepaMandate=Sjabloon van SEPA mandaat. Alleen bruikbaar voor Europese landen in de Europese Unie.
+DocumentModelBan=Sjabloon om een pagina met BAN informatie af te drukken.
 NewVariousPayment=Nieuwe overige betaling
 VariousPayment=Overige betaling
 VariousPayments=Diverse betalingen
 ShowVariousPayment=Laat overige betaling zien
 AddVariousPayment=Overige betaling toevoegen
-VariousPaymentId=Miscellaneous payment ID
-VariousPaymentLabel=Miscellaneous payment label
-ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
-SEPAMandate=SEPA-mandaat
-YourSEPAMandate=Uw SEPA-mandaat
-FindYourSEPAMandate=Met deze SEPA-machtiging geeft u ons bedrijf toestemming een opdracht ter incasso te sturen naar uw bank. Retourneer het ondertekend (scan van het ondertekende document) of stuur het per e-mail naar
-AutoReportLastAccountStatement=Vul bij het automatisch afstemmen het veld 'aantal bankafschriften' in met het laatste afschriftnummer.
-CashControl=POS kasopmaak
-NewCashFence=Kasopmaak
+VariousPaymentId=Diverse betalings-ID
+VariousPaymentLabel=Diversen betaalomschrijving
+ConfirmCloneVariousPayment=Bevestig maken kopie van een diverse betaling
+SEPAMandate=SEPA mandaat
+YourSEPAMandate=Uw SEPA mandaat
+FindYourSEPAMandate=Met deze SEPA machtiging geeft u ons bedrijf toestemming een opdracht ter incasso te sturen naar uw bank. Retourneer het ondertekend (scan van het ondertekende document) of stuur het per e-mail naar
+AutoReportLastAccountStatement=Vul bij het automatisch afstemmen het veld 'aantal bankafschriften' in met het laatste afschrift nummer.
+CashControl=POS kassa controle
+NewCashFence=Nieuwe kassa sluiting
 BankColorizeMovement=Inkleuren mutaties
 BankColorizeMovementDesc=Als deze functie is ingeschakeld, kunt u een specifieke achtergrondkleur kiezen voor debet- of creditmutaties
 BankColorizeMovementName1=Achtergrondkleur voor debetmutatie
 BankColorizeMovementName2=Achtergrondkleur voor creditmutatie
-IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
+IfYouDontReconcileDisableProperty=Als u op sommige bankrekeningen geen bankafstemmingen uitvoert, schakelt u de eigenschap "%s" uit om deze waarschuwing te verwijderen.
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index 20d977e1cf6..845323b0228 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -441,8 +441,8 @@ BankAccountNumberKey=checksum
 Residence=Adres
 IBANNumber=IBAN-rekeningnummer
 IBAN=IBAN
-CustomerIBAN=IBAN of customer
-SupplierIBAN=IBAN of vendor
+CustomerIBAN=IBAN van klant
+SupplierIBAN=IBAN van leverancier
 BIC=BIC / SWIFT
 BICNumber=BIC/SWIFT-code
 ExtraInfos=Extra info
@@ -576,7 +576,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Leverancierfactuur verwijderd
 UnitPriceXQtyLessDiscount=Eenheidsprijs x Aantal - Korting
 CustomersInvoicesArea=Factureringsgebied voor klanten
 SupplierInvoicesArea=Factureringsgebied leverancier
-FacParentLine=Invoice Line Parent
-SituationTotalRayToRest=Remainder to pay without taxe
-PDFSituationTitle=Situation n° %d
-SituationTotalProgress=Total progress %d %%
+FacParentLine=Hoofd factuurregel 
+SituationTotalRayToRest=Netto restant te betalen
+PDFSituationTitle=Situatie n ° %d
+SituationTotalProgress=Totale voortgang %d %%
diff --git a/htdocs/langs/nl_NL/blockedlog.lang b/htdocs/langs/nl_NL/blockedlog.lang
index f455e80d1d6..1507f2b3991 100644
--- a/htdocs/langs/nl_NL/blockedlog.lang
+++ b/htdocs/langs/nl_NL/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donatie logische verwijdering
 logMEMBER_SUBSCRIPTION_CREATE=Lid abonnement gemaakt
 logMEMBER_SUBSCRIPTION_MODIFY=Lid abonnement gewijzigd
 logMEMBER_SUBSCRIPTION_DELETE=Lid abonnement logische verwijdering
-logCASHCONTROL_VALIDATE=Contant geïnd
+logCASHCONTROL_VALIDATE=Kassa afsluiten
 BlockedLogBillDownload=Klant factuur downloaden
 BlockedLogBillPreview=Voorbeeld van klant factuur
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/nl_NL/boxes.lang b/htdocs/langs/nl_NL/boxes.lang
index 71c851c2c3b..adfa20cb15d 100644
--- a/htdocs/langs/nl_NL/boxes.lang
+++ b/htdocs/langs/nl_NL/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Laatste %s aangepaste donaties
 BoxTitleLastModifiedExpenses=Laatste gewijzigde %s onkostendeclaraties
 BoxTitleLatestModifiedBoms=Laatste %s gemodificeerde stuklijsten
 BoxTitleLatestModifiedMos=Laatste %s gewijzigde productieorders
+BoxTitleLastOutstandingBillReached=Klanten met meer dan maximaal toegestaan krediet
 BoxGlobalActivity=Globale activiteit (facturen, offertes, bestellingen)
 BoxGoodCustomers=Goede klanten
 BoxTitleGoodCustomers=%s Goede klanten
+BoxScheduledJobs=Geplande taken
+BoxTitleFunnelOfProspection=Lood trechter
 FailedToRefreshDataInfoNotUpToDate=Vernieuwen van RSS-flux is mislukt. Laatste succesvolle vernieuwingsdatum: %s
 LastRefreshDate=Laatste bijwerkingsdatum
 NoRecordedBookmarks=Geen weblinks ingesteld. Klik <a href="%s">weblinks</a> aan om deze toe te voegen.
@@ -83,8 +86,8 @@ BoxTitleLatestModifiedSupplierOrders=Orders van leveranciers: laatste %s gewijzi
 BoxTitleLastModifiedCustomerBills=Klantfacturen: laatste %s gewijzigd
 BoxTitleLastModifiedCustomerOrders=Klantorders: laatste %s gewijzigd
 BoxTitleLastModifiedPropals=Laatste %s aangepaste offertes
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Laatste %s gewijzigde taken
+BoxTitleLatestModifiedCandidatures=Laatste %s gewijzigde kandidaturen
 ForCustomersInvoices=Afnemersfacturen
 ForCustomersOrders=Klantenbestellingen
 ForProposals=Zakelijke voorstellen / Offertes
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense-account is niet gedefinieerd
 BoxLastCustomerShipments=Laatste klantzendingen
 BoxTitleLastCustomerShipments=Laatste %s klantverzendingen
 NoRecordedShipments=Geen geregistreerde klantverzending
+BoxCustomersOutstandingBillReached=Klanten met bereikt limiet
 # Pages
 AccountancyHome=Boekhouden
+ValidatedProjects=Gevalideerde projecten
diff --git a/htdocs/langs/nl_NL/cashdesk.lang b/htdocs/langs/nl_NL/cashdesk.lang
index 18a7e03de51..24bff1481e4 100644
--- a/htdocs/langs/nl_NL/cashdesk.lang
+++ b/htdocs/langs/nl_NL/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Voetnoot
 AmountAtEndOfPeriod=Bedrag aan het einde van de periode (dag, maand of jaar)
 TheoricalAmount=Theoretisch bedrag
 RealAmount=Aanwezig bedrag
-CashFence=Cash hek
-CashFenceDone=Kas te ontvangen voor de periode
+CashFence=Kassa sluiten
+CashFenceDone=Kassa gesloten voor de periode
 NbOfInvoices=Aantal facturen
 Paymentnumpad=Soort betaling om de betaling in te voeren
 Numberspad=Cijferblok
@@ -94,13 +94,14 @@ TakeposConnectorMethodDescription=Externe module met extra functies. Mogelijkhei
 PrintMethod=Afdrukmethode
 ReceiptPrinterMethodDescription=Krachtige methode met veel parameters. Volledig aanpasbaar met sjablonen. Kan niet afdrukken vanuit de cloud.
 ByTerminal=Per terminal
-TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
+TakeposNumpadUsePaymentIcon=Gebruik pictogram in plaats van tekst op betalingsknoppen van numpad
 CashDeskRefNumberingModules=Nummeringsmodule voor POS-verkoop
 CashDeskGenericMaskCodes6 =  <br><b>{TN}</b> tag wordt gebruikt om het terminalnummer toe te voegen
 TakeposGroupSameProduct=Groepeer dezelfde productlijnen
 StartAParallelSale=Start een nieuwe parallelle verkoop
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Sluit de kassa
+SaleStartedAt=Verkoop begon op %s
+ControlCashOpening=Controle contant geld pop-up bij het openen van POS
+CloseCashFence=Sluit de kassa-bediening
 CashReport=Kassa verslag
 MainPrinterToUse=Hoofdprinter om te gebruiken
 OrderPrinterToUse=Bestel printer om te gebruiken
@@ -115,11 +116,11 @@ ScanToOrder=Scan de QR code om te bestellen
 Appearance=Weergave
 HideCategoryImages=Verberg categorie afbeeldingen
 HideProductImages=Verberg productafbeeldingen
-NumberOfLinesToShow=Number of lines of images to show
-DefineTablePlan=Define tables plan
-GiftReceiptButton=Add a "Gift receipt" button
-GiftReceipt=Gift receipt
-ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
-AllowDelayedPayment=Allow delayed payment
-PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+NumberOfLinesToShow=Aantal regels met afbeeldingen dat moet worden weergegeven
+DefineTablePlan=Definieer tafelschikking
+GiftReceiptButton=Voeg een knop "Cadeaubon" toe
+GiftReceipt=Cadeaubon
+ModuleReceiptPrinterMustBeEnabled=Module Bonprinter moet eerst zijn ingeschakeld
+AllowDelayedPayment=Laat uitgestelde betaling toe
+PrintPaymentMethodOnReceipts=Betaalmethode afdrukken op tickets | bonnen
 WeighingScale=Weegschaal
diff --git a/htdocs/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang
index c4008fe1ce5..1f1c51d1027 100644
--- a/htdocs/langs/nl_NL/categories.lang
+++ b/htdocs/langs/nl_NL/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Labels/categorieën projecten
 UsersCategoriesArea=Gebruikers tags / categorieën gebied
 SubCats=Sub-categorieën
 CatList=Lijst van kenmerken/categorieën
+CatListAll=Lijst met groepen /categorieën (alle typen)
 NewCategory=Nieuw label/categorie
 ModifCat=Wijzigen label/categorie
 CatCreated=Label/categorie gecreëerd
@@ -65,28 +66,34 @@ UsersCategoriesShort=Gebruikers tags / categorieën
 StockCategoriesShort=Magazijn-tags / categorieën
 ThisCategoryHasNoItems=Deze categorie bevat geen items.
 CategId=Label/categorie id
-CatSupList=Lijst met leverancierslabels/categorieën
-CatCusList=Lijst van de klant/prospect kenmerken/categorieën
+ParentCategory=Bovenliggende groep/categorie
+ParentCategoryLabel=Label van bovenliggende groep/categorie
+CatSupList=Lijst met leveranciers groepen/ categorieën
+CatCusList=Lijst met klant groepen/categorieën
 CatProdList=Lijst van product kenmerken/categorieën
 CatMemberList=Lijst leden kenmerken/categorieën
-CatContactList=Lijst met contactpersoon labels/-categorieën
-CatSupLinks=Koppelingen tussen leveranciers en kenmerken/categorieën
+CatContactList=Lijst met groepen/categorieën voor contacten
+CatProjectsList=Lijst met projectgroepen/-categorieën
+CatUsersList=Lijst met groepen/categorieën van gebruikers
+CatSupLinks=Koppelingen tussen leveranciers en groepen/categorieën
 CatCusLinks=Koppelingen tussen klanten/prospects en labels/categorieën
 CatContactsLinks=Koppelingen tussen contacten / adressen en tags / categorieën
 CatProdLinks=Koppelingen tussen producten/diensten en labels/categorieën
-CatProJectLinks=Koppelingen tussen projecten en labels/categorieën
+CatMembersLinks=Koppelingen tussen leden en tags / categorieën
+CatProjectsLinks=Koppelingen tussen projecten en labels/categorieën
+CatUsersLinks=Koppelingen tussen gebruikers en groepen/categorieën
 DeleteFromCat=Verwijderen uit labels/categorie
 ExtraFieldsCategories=Complementaire kenmerken
 CategoriesSetup=Labels/categorieën instelling
 CategorieRecursiv= Automatische koppeling met bovenliggende label/categorie
 CategorieRecursivHelp=Als de optie is ingeschakeld, wordt het product ook toegevoegd aan de bovenliggende categorie wanneer u een product toevoegt aan een subcategorie.
 AddProductServiceIntoCategory=Voeg het volgende product/dienst toe
-AddCustomerIntoCategory=Assign category to customer
-AddSupplierIntoCategory=Assign category to supplier
+AddCustomerIntoCategory=Wijs categorie toe aan klant
+AddSupplierIntoCategory=Wijs categorie toe aan leverancier
 ShowCategory=Toon label/categorie
 ByDefaultInList=Standaard in de lijst
 ChooseCategory=Kies categorie
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
-WebsitePagesCategoriesArea=Page-Container Categories
+StocksCategoriesArea=Categorieën voor magazijnen
+ActionCommCategoriesArea=Categorieën voor gebeurtenissen
+WebsitePagesCategoriesArea= Categorieën voor Page-Container
 UseOrOperatorForCategories=Gebruik of operator voor categorieën
diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang
index 2b4e7b136b4..c310afcbe4b 100644
--- a/htdocs/langs/nl_NL/companies.lang
+++ b/htdocs/langs/nl_NL/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=EORI-nummer
 ProfId6AT=-
 ProfId1AU=Prof. id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof. id 1 (Professioneel nummer)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=EORI-nummer
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Belastingsnummer staat)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Belastingsnummer stad)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=UID-Nummer
+ProfId1CH=UID-nummer
 ProfId2CH=-
 ProfId3CH=Prof id 1 (Federale nummer)
 ProfId4CH=Handelsregisternummer
-ProfId5CH=EORI number
+ProfId5CH=EORI-nummer
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (RUT)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof. id 1 (USt.-IdNr)
 ProfId2DE=Prof. id 2 (USt.-Nr)
 ProfId3DE=Prof. Id 3 (Handelsregisternummer)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=EORI-nummer
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=EORI-nummer
 ProfId6ES=-
 ProfId1FR=Prof. id 1 (SIREN)
 ProfId2FR=Prof. id 2 (SIRET)
 ProfId3FR=Prof. Id 3 (NAF, oude APE)
 ProfId4FR=Prof. id 4 (RCS / RM)
-ProfId5FR=EORI number
+ProfId5FR=EORI-nummer
 ProfId6FR=-
 ProfId1GB=Prof. id 1 (Registratienummer)
 ProfId2GB=-
@@ -202,12 +202,12 @@ ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=EORI-nummer
 ProfId1LU=Id. prof. 1 (R.C.S. Luxemburg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=EORI-nummer
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
@@ -225,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL==
 ProfId3NL==
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=EORI number
+ProfId5NL=EORI-nummer
 ProfId6NL=-
 ProfId1PT=Prof. id 1 (NIPC)
 ProfId2PT=Prof. id 2 (Social security number)
 ProfId3PT=Prof. Id 3 (Commercial Record aantal)
 ProfId4PT=Prof. id 4 (Conservatorium)
-ProfId5PT=EORI number
+ProfId5PT=EORI-nummer
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +255,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=EORI-nummer
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -358,8 +358,8 @@ VATIntraCheckableOnEUSite=Controleer het intracommunautaire btw-nummer op de web
 VATIntraManualCheck=U kunt het ook handmatig controleren op de website van de Europese Commissie <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Controle niet mogelijk. Controleerdienst wordt niet verleend door lidstaat (%s).
 NorProspectNorCustomer=Geen prospect, noch klant
-JuridicalStatus=Type juridische entiteit
-Workforce=Workforce
+JuridicalStatus=Soort bedrijf
+Workforce=Personeelsbestand
 Staff=Werknemers
 ProspectLevelShort=Potentieel
 ProspectLevel=Prospectpotentieel
@@ -462,8 +462,8 @@ PaymentTermsSupplier=Betalingstermijn - Leverancier
 PaymentTypeBoth=Betaalwijze - Klant en leverancier
 MulticurrencyUsed=Gebruik meerdere valuta
 MulticurrencyCurrency=Valuta
-InEEC=Europe (EEC)
-RestOfEurope=Rest of Europe (EEC)
-OutOfEurope=Out of Europe (EEC)
-CurrentOutstandingBillLate=Current outstanding bill late
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
+InEEC=Europa (EEG)
+RestOfEurope=Rest van Europa (EEG)
+OutOfEurope=Buiten Europa (EEG)
+CurrentOutstandingBillLate=Openstaande factuur met vervallen betaaldatum
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Wees voorzichtig, afhankelijk van uw productprijsinstellingen, moet u van relatie veranderen voordat u een product aan POS toevoegt.
diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang
index c811965f35d..79d8621996a 100644
--- a/htdocs/langs/nl_NL/compta.lang
+++ b/htdocs/langs/nl_NL/compta.lang
@@ -69,7 +69,7 @@ SocialContribution=Sociale of fiscale heffingen/belasting
 SocialContributions=Sociale of fiscale heffingen/belastingen
 SocialContributionsDeductibles=Aftrekbare sociale/fiscale lasten/belastingen
 SocialContributionsNondeductibles=Niet aftrekbare sociale/fiscale lasten/belastingen
-DateOfSocialContribution=Date of social or fiscal tax
+DateOfSocialContribution=Datum van sociale of fiscale belasting
 LabelContrib=Labelbijdrage
 TypeContrib=Type bijdrage
 MenuSpecialExpenses=Speciale uitgaven
@@ -111,9 +111,9 @@ Refund=Terugbetaling
 SocialContributionsPayments=Betaling Sociale/fiscale lasten
 ShowVatPayment=Toon BTW-betaling
 TotalToPay=Totaal te voldoen
-BalanceVisibilityDependsOnSortAndFilters=Saldo is alleen zichtbaar in deze lijst als de tabel oplopend is gesorteerd op %s en is gefilterd op 1 bankrekening
+BalanceVisibilityDependsOnSortAndFilters=Saldo is alleen zichtbaar in deze lijst als de tabel is gesorteerd op %s en gefilterd op 1 bankrekening (zonder andere filters)
 CustomerAccountancyCode=Debiteurenrekening
-SupplierAccountancyCode=Leveranciersboekhoudingscode
+SupplierAccountancyCode=Boekcode leverancier
 CustomerAccountancyCodeShort=Klant account. code
 SupplierAccountancyCodeShort=Lev. account. code
 AccountNumber=Rekeningnummer
@@ -140,8 +140,8 @@ ConfirmDeleteSocialContribution=Weet u zeker dat u deze sociale- of fiscale bela
 ExportDataset_tax_1=Sociale- en fiscale belastingen en betalingen
 CalcModeVATDebt=Mode <b>%sBTW op verbintenissenboekhouding %s.</b>
 CalcModeVATEngagement=Mode <b>%sBTW op de inkomens-uitgaven %s.</b>
-CalcModeDebt=Analyse van bekende geregistreerde facturen, zelfs als deze nog niet in het grootboek zijn opgenomen.
-CalcModeEngagement=Analyse van bekende geregistreerde betalingen, zelfs als deze nog niet in Ledger zijn geregistreerd.
+CalcModeDebt=Analyse van bekende geregistreerde documenten, zelfs als ze nog niet in het grootboek zijn geboekt.
+CalcModeEngagement=Analyse van bekende geregistreerde betalingen welke nog niet zijn doorgeboekt in de boekhouding.
 CalcModeBookkeeping=Analyse van gegevens gejournaliseerd in de boekhoudboekentabel.
 CalcModeLT1= <b>Modus %s RE op klant- leveranciers facturen %s</b>
 CalcModeLT1Debt=Modus <b>%sRE op klantfacturen%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balans van inkomsten en uitgaven, jaarlijks overzic
 AnnualByCompanies=Saldo van baten en lasten, per vooraf gedefinieerde rekeninggroepen
 AnnualByCompaniesDueDebtMode=Evenwicht tussen baten en lasten, gedetailleerd per vooraf gedefinieerde groepen, modus <b>%sClaims-Debts%s</b> zei <b>Commitment accounting</b> .
 AnnualByCompaniesInputOutputMode=Saldo van baten en lasten, detail door vooraf gedefinieerde groepen, mode <b>%sIncomes-Expenses%s</b> zei <b>cash accounting.</b>
-SeeReportInInputOutputMode=Zie %sanalyse van betalingen%s voor een berekening van werkelijke betalingen, zelfs als deze nog niet in Ledger zijn geregistreerd.
-SeeReportInDueDebtMode=Zie %sanalyse van facturen%s voor een berekening op basis van bekende geregistreerde facturen, zelfs als deze nog niet in Ledger zijn geregistreerd.
-SeeReportInBookkeepingMode=Zie <b>%s Boekhoudverslag%s</b> voor een berekening op de <b>boekhoudboekentabel</b>
+SeeReportInInputOutputMode=Zie <b>%s analyse van betalingen%s </b>voor een berekening op basis van<b>geregistreerde betalingen</b>gedaan, zelfs als ze nog niet het grootboek zijn opgenomen
+SeeReportInDueDebtMode=Zie <b>%s analyse van geregistreerde documenten%s</b> voor een berekening op basis van bekende<b> geregistreerde documenten </b> zelfs als ze nog niet zijn geboekt
+SeeReportInBookkeepingMode=Zie <b>%s analyse van de boekhoudtabel %s</b> voor een rapport gebaseerd op<b>Boekhoudkundige grootboektabel </b>
 RulesAmountWithTaxIncluded=- Bedragen zijn inclusief alle belastingen
 RulesResultDue=- Het omvat openstaande facturen, uitgaven, BTW, donaties, of ze nu betaald zijn of niet. Bevat ook betaalde salarissen. <br> - Het is gebaseerd op de factuurdatum van facturen en op de vervaldatum voor uitgaven of belastingbetalingen. Voor salarissen gedefinieerd met Salaris module, wordt de valutadatum van betaling gebruikt.
 RulesResultInOut=- Het omvat de echte betalingen op facturen, uitgaven, btw en salarissen. <br> - Het is gebaseerd op de betalingsdatums van de facturen, uitgaven, btw en salarissen. De donatiedatum voor donatie.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Het toont record in uw grootboek met boekhoud
 SeePageForSetup=Zie menu <a href="%s">%s</a> voor instellingen
 DepositsAreNotIncluded=- Vooruitbetalingsfacturen zijn niet inbegrepen
 DepositsAreIncluded=- Facturen met vooruitbetaling zijn inbegrepen
+LT1ReportByMonth=BTW 2-rapport per maand
+LT2ReportByMonth=BTW 3 rapport per maand
 LT1ReportByCustomers=Belasting 2 rapporteren door relatie
 LT2ReportByCustomers=Belasting 3 rapporteren door derden
 LT1ReportByCustomersES=Rapport door derde partij RE
 LT2ReportByCustomersES=Verslag van derden IRPF
 VATReport=Verkoop belasting rapportage
 VATReportByPeriods=Verkoopbelastingrapport per periode
+VATReportByMonth=BTW-overzicht per maand
 VATReportByRates=BTW overzicht per tarief
 VATReportByThirdParties=Verkoopbelastingrapport door relatie
 VATReportByCustomers=BTW-overzicht per klant
diff --git a/htdocs/langs/nl_NL/contracts.lang b/htdocs/langs/nl_NL/contracts.lang
index 9cbf6c3b23e..835a44f62a1 100644
--- a/htdocs/langs/nl_NL/contracts.lang
+++ b/htdocs/langs/nl_NL/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Actieve diensten
 MenuExpiredServices=Verlopen diensten
 MenuClosedServices=Gesloten diensten
 NewContract=Nieuw contract
-NewContractSubscription=New contract or subscription
+NewContractSubscription=Nieuw contract of abonnement
 AddContract=Nieuw contract
 DeleteAContract=Verwijder een contract
 ActivateAllOnContract=Activeer alle services
@@ -99,6 +99,6 @@ TypeContact_contrat_internal_SALESREPFOLL=Vertegenwoordiger opvolging contract
 TypeContact_contrat_external_BILLING=Afnemersfactuurcontactpersoon
 TypeContact_contrat_external_CUSTOMER=Contactpersoon die follow-up doet voor deze afnemer
 TypeContact_contrat_external_SALESREPSIGN=Ondertekening contract contactpersoon
-HideClosedServiceByDefault=Hide closed services by default
-ShowClosedServices=Show Closed Services
-HideClosedServices=Hide Closed Services
+HideClosedServiceByDefault=Verberg gesloten services als default
+ShowClosedServices=Toon gesloten services
+HideClosedServices=Verberg gesloten services
diff --git a/htdocs/langs/nl_NL/cron.lang b/htdocs/langs/nl_NL/cron.lang
index 235ff89766f..a44efab9516 100644
--- a/htdocs/langs/nl_NL/cron.lang
+++ b/htdocs/langs/nl_NL/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Verwijder geplande taak
 Permission23104 = Voer geplande taak uit
 # Admin
 CronSetup=Beheer taakplanning
-URLToLaunchCronJobs=URL om gekwalificeerde cron-taken te controleren en te starten
-OrToLaunchASpecificJob=Of om een specifieke taak te controleren en te starten
+URLToLaunchCronJobs=URL om gekwalificeerde cron-taken vanuit een browser te controleren en te starten
+OrToLaunchASpecificJob=Of om een specifieke taak vanuit een browser te controleren en te starten
 KeyForCronAccess=Beveiligingssleutel voor URL om cron-taken te starten
 FileToLaunchCronJobs=Opdrachtregel om gekwalificeerde cron-taken te controleren en te starten
 CronExplainHowToRunUnix=In een Unix-omgeving moet u het volgende crontab-item gebruiken om de opdrachtregel elke 5 minuten uit te voeren
 CronExplainHowToRunWin=In een Microsoft (tm) Windows-omgeving kunt u de geplande taakhulpmiddelen gebruiken om de opdrachtregel elke 5 minuten uit te voeren
 CronMethodDoesNotExists=Class%sbevat geen methode%s
+CronMethodNotAllowed=Methode %s van class %s staat op de zwarte lijst met verboden methoden
 CronJobDefDesc=Cron-taakprofielen worden gedefinieerd in het modulebeschrijvingsbestand. Wanneer de module is geactiveerd, zijn ze geladen en beschikbaar, zodat u de taken kunt beheren vanuit het menu admin tools %s.
 CronJobProfiles=Lijst met vooraf gedefinieerde cron-functieprofielen
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Aantal lanceringen
 CronMaxRun=Maximaal aantal lanceringen
 CronEach=Elke
 JobFinished=Taak gestart en be-eindigd
+Scheduled=Gepland
 #Page card
 CronAdd= Taak toevoegen
 CronEvery=Alle taken uitvoeren
@@ -56,7 +58,7 @@ CronNote=Reactie
 CronFieldMandatory=Velden %s zijn verplicht
 CronErrEndDateStartDt=Einddatum kan niet vóór startdatum liggen
 StatusAtInstall=Status bij module-installatie
-CronStatusActiveBtn=Activeren
+CronStatusActiveBtn=Schema
 CronStatusInactiveBtn=Deactiveren
 CronTaskInactive=Deze taak is uitgeschakeld
 CronId=Id
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=Back-up van lokale database
 MakeLocalDatabaseDump=Maak een lokale database dump. Parameters zijn: compressie ('gz' of 'bz' of 'none'), back-uptype ('mysql', 'pgsql', 'auto'), 1, 'auto' of te creëren bestandsnaam, aantal te bewaren back-upbestanden
 WarningCronDelayed=Opgelet, voor prestatiedoeleinden, ongeacht de volgende datum van uitvoering van ingeschakelde taken, kunnen uw taken worden vertraagd tot maximaal %s uur voordat ze worden uitgevoerd.
 DATAPOLICYJob=Gegevens opschonen en anonimiseren
+JobXMustBeEnabled=Taak %s moet zijn ingeschakeld
+# Cron Boxes
+LastExecutedScheduledJob=Laatst uitgevoerde geplande taak
+NextScheduledJobExecute=Volgende geplande taak om uit te voeren
+NumberScheduledJobError=Aantal foutieve geplande taken
diff --git a/htdocs/langs/nl_NL/deliveries.lang b/htdocs/langs/nl_NL/deliveries.lang
index 8a8382da107..329c2b74ad0 100644
--- a/htdocs/langs/nl_NL/deliveries.lang
+++ b/htdocs/langs/nl_NL/deliveries.lang
@@ -27,5 +27,6 @@ Recipient=Ontvanger
 ErrorStockIsNotEnough=Er is niet genoeg voorraad
 Shippable=Zendklaar
 NonShippable=Niet verzendbaar
+ShowShippableStatus=Toon verzendstatus
 ShowReceiving=Toon afleverbon
 NonExistentOrder=Niet bestaande order
diff --git a/htdocs/langs/nl_NL/ecm.lang b/htdocs/langs/nl_NL/ecm.lang
index 0fe01fa5726..b0b224d1835 100644
--- a/htdocs/langs/nl_NL/ecm.lang
+++ b/htdocs/langs/nl_NL/ecm.lang
@@ -23,7 +23,7 @@ ECMSearchByKeywords=Zoeken op trefwoorden
 ECMSearchByEntity=Zoek op object
 ECMSectionOfDocuments=Mappen van documenten
 ECMTypeAuto=Automatisch
-ECMDocsBy=Documents linked to %s
+ECMDocsBy=Documenten gekoppeld aan %s
 ECMNoDirectoryYet=Geen map aangemaakt
 ShowECMSection=Toon map
 DeleteSection=Verwijder map
@@ -38,6 +38,6 @@ ReSyncListOfDir=Hersynchroniseer de lijst met mappen
 HashOfFileContent=Hash van bestandsinhoud
 NoDirectoriesFound=Geen mappen gevonden
 FileNotYetIndexedInDatabase=Bestand nog niet geïndexeerd in database (probeer deze opnieuw te uploaden)
-ExtraFieldsEcmFiles=Extrafields Ecm Files
-ExtraFieldsEcmDirectories=Extrafields Ecm Directories
-ECMSetup=ECM Setup
+ExtraFieldsEcmFiles=Extrafields Ecm-bestanden
+ExtraFieldsEcmDirectories=Extrafields Ecm-mappen
+ECMSetup=ECM-instellingen
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index d9b7214e8d9..e829cd22faf 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Geen fout, wij bevestigen
 # Errors
 ErrorButCommitIsDone=Fouten gevonden maar we valideren toch
 ErrorBadEMail=E-mail %s is verkeerd
+ErrorBadMXDomain=E-mail %s lijkt verkeerd (domein heeft geen geldige MX-record)
 ErrorBadUrl=Ongeldige Url %s
 ErrorBadValueForParamNotAString=Slechte parameterwaarde. Wordt over het algemeen gegenereerd als de vertaling ontbreekt.
+ErrorRefAlreadyExists=Referentie <b>%s</b> bestaat al.
 ErrorLoginAlreadyExists=Inlog %s bestaat reeds.
 ErrorGroupAlreadyExists=Groep %s bestaat reeds.
 ErrorRecordNotFound=Tabelregel niet gevonden.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Enkele verplichte velden zijn niet ingevuld.
 ErrorSubjectIsRequired=Het e-mail onderwerp is verplicht
 ErrorFailedToCreateDir=Creëren van een map mislukt. Controleer of de Webservergebruiker toestemming heeft om te schrijven in Dolibarr documentenmap. Wanneer de parameter <b>safe_mode</b> is ingeschakeld in PHP, controleer dan dat de Dolibarr php bestanden eigendom zijn van de de webserve gebruiker (of groep).
 ErrorNoMailDefinedForThisUser=Geen e-mailadres ingesteld voor deze gebruiker
+ErrorSetupOfEmailsNotComplete=Het instellen van e-mails is niet voltooid
 ErrorFeatureNeedJavascript=Voor deze functie moet Javascript geactiveerd zijn. Verander dit in het Instellingen - scherm.
 ErrorTopMenuMustHaveAParentWithId0=Een menu van het type 'Top' kan niet beschikken over een bovenliggend menu. Stel 0 in in het 'Top' menu of kies een menu van het type  'Left'.
 ErrorLeftMenuMustHaveAParentId=Een menu van het type 'Left' moeten een id van een bovenliggend menu hebben.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Deze profile naam bestaat al voor deze export set.
 ErrorLDAPSetupNotComplete=De Dolibarr-LDAP installatie is niet compleet.
 ErrorLDAPMakeManualTest=Een .ldif bestand is gegenereerd in de map %s. Probeer het handmatig te laden vanuit een opdrachtregel om meer informatie over fouten te verkrijgen.
 ErrorCantSaveADoneUserWithZeroPercentage=Kan een actie met "status niet gestart" niet opslaan als het veld "gedaan door" ook is ingevuld.
-ErrorRefAlreadyExists=De referentie gebruikt voor het maken bestaat al
+ErrorRefAlreadyExists=Referentie <b>%s</b> bestaat al.
 ErrorPleaseTypeBankTransactionReportName=Voer de naam van het bankafschrift in waar de boeking moet worden gerapporteerd (formaat YYYYMM of YYYYMMDD)
 ErrorRecordHasChildren=Kan record niet verwijderen omdat het enkele onderliggende records heeft.
 ErrorRecordHasAtLeastOneChildOfType=Object heeft ten minste één kind van het type %s
@@ -120,7 +123,7 @@ ErrorLoginHasNoEmail=Deze gebruiker heeft geen e-mail adres. Proces afgebroken.
 ErrorBadValueForCode=Onjuist waardetypen voor code. Probeer het opnieuw met een nieuwe waarde
 ErrorBothFieldCantBeNegative=Velden %s %s en kan niet beide negatief
 ErrorFieldCantBeNegativeOnInvoice=Veld <strong> %s </strong> mag niet negatief zijn voor dit type factuur. Als u een kortingsregel moet toevoegen, maakt u eerst de korting (uit veld '%s' op de kaart van een derde partij) en past u deze toe op de factuur.
-ErrorLinesCantBeNegativeForOneVATRate=Total of lines (net of tax) can't be negative for a given not null VAT rate (Found a negative total for VAT rate <b>%s</b>%%).
+ErrorLinesCantBeNegativeForOneVATRate=Totaal aantal regels (na aftrek van belastingen) kan niet negatief zijn voor een bepaald btw-tarief dat niet nul is (negatief totaal gevonden voor btw-tarief <b>%s</b>%%).
 ErrorLinesCantBeNegativeOnDeposits=Lijnen kunnen niet negatief zijn in een storting. U zult problemen ondervinden wanneer u de aanbetaling in de eindfactuur moet verbruiken als u dit doet.
 ErrorQtyForCustomerInvoiceCantBeNegative=Aantal voor regel in klantfacturen kan niet negatief zijn
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> gebruikt om web-server uit te voeren heeft geen toestemming voor die
@@ -136,8 +139,8 @@ ErrorNewValueCantMatchOldValue=Nieuwe waarde kan niet gelijk is aan de oude
 ErrorFailedToValidatePasswordReset=Mislukt om wachtwoord opnieuw te initialiseren. Misschien werd de her-init al gedaan (deze link kan slechts een keer worden). Zo niet, probeer dan het her-init proces opnieuw te starten.
 ErrorToConnectToMysqlCheckInstance=Verbinding maken met database mislukt. Controleer of de databaseserver actief is (bijvoorbeeld, met mysql / mariadb, kunt u het starten vanaf de opdrachtregel met 'sudo service mysql start').
 ErrorFailedToAddContact=Mislukt om contact toe te voegen
-ErrorDateMustBeBeforeToday=The date must be lower than today
-ErrorDateMustBeInFuture=The date must be greater than today
+ErrorDateMustBeBeforeToday=De datum moet eerder zijn dan vandaag
+ErrorDateMustBeInFuture=De datum moet later zijn dan vandaag
 ErrorPaymentModeDefinedToWithoutSetup=Er is een betalingsmodus ingesteld om %s te typen, maar het instellen van de module Factuur is niet voltooid om te definiëren welke informatie moet worden weergegeven voor deze betalingsmodus.
 ErrorPHPNeedModule=Fout, op uw PHP moet module <b>%s zijn</b> geïnstalleerd om deze functie te gebruiken.
 ErrorOpenIDSetupNotComplete=U stelt het Dolibarr-configuratiebestand in om OpenID-authenticatie toe te staan, maar de URL van de OpenID-service is niet gedefinieerd als een constante %s
@@ -185,7 +188,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Onjuiste definitie van menureeks
 ErrorSavingChanges=Er is een fout opgetreden bij het opslaan van de wijzigingen
 ErrorWarehouseRequiredIntoShipmentLine=Magazijn is vereist op de lijn om te verzenden
 ErrorFileMustHaveFormat=Bestand moet het formaat %s hebben
-ErrorFilenameCantStartWithDot=Filename can't start with a '.'
+ErrorFilenameCantStartWithDot=Bestandsnaam mag niet beginnen met een '.'
 ErrorSupplierCountryIsNotDefined=Land voor deze leverancier is niet gedefinieerd. Corrigeer dit eerst.
 ErrorsThirdpartyMerge=Kan de twee records niet samenvoegen. Verzoek geannuleerd.
 ErrorStockIsNotEnoughToAddProductOnOrder=De voorraad is niet voldoende om het product %s toe te voegen aan een nieuwe bestelling.
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=U moet kiezen of het artikel een
 ErrorDiscountLargerThanRemainToPaySplitItBefore=De korting die u probeert toe te passen is groter dan u nog moet betalen. Verdeel de korting eerder in 2 kleinere kortingen.
 ErrorFileNotFoundWithSharedLink=Bestand is niet gevonden. Mogelijk is de gedeelde sleutel gewijzigd of is het bestand onlangs verwijderd.
 ErrorProductBarCodeAlreadyExists=De productstreepjescode %s bestaat al op een andere productreferentie.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Merk ook op dat het gebruik van een virtueel product voor het automatisch verhogen / verlagen van subproducten niet mogelijk is wanneer ten minste één subproduct (of subproduct van subproducten) een serie- / partijnummer nodig heeft.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Merk ook op dat het gebruik van kits voor het automatisch verhogen / verlagen van subproducten niet mogelijk is wanneer ten minste één subproduct (of subproduct van subproducten) een serie-/lotnummer nodig heeft.
 ErrorDescRequiredForFreeProductLines=Beschrijving is verplicht voor lijnen met gratis product
 ErrorAPageWithThisNameOrAliasAlreadyExists=De pagina / container <strong>%s</strong> heeft dezelfde naam of alternatieve alias die u probeert te gebruiken
 ErrorDuringChartLoad=Fout bij het laden van een rekeningschema. Als enkele accounts niet werden geladen, kunt u ze nog steeds handmatig invoeren.
@@ -240,9 +243,19 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Geen voorraad voor dit lot
 ErrorOnlyOneFieldForGroupByIsPossible=Slechts 1 veld voor de 'Groepeer op' is mogelijk (andere worden weggegooid)
 ErrorTooManyDifferentValueForSelectedGroupBy=Te veel verschillende waarden gevonden (meer dan <b> %s </b>) voor het veld '<b> %s </b>', dus we kunnen het niet gebruiken voor afbeeldingen als '. Het veld 'Goepeer op' is verwijderd. Misschien wil je het gebruiken als een X-as?
 ErrorReplaceStringEmpty=Fout, de tekenreeks waarin moet worden vervangen, is leeg
-ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
-ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
-ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorProductNeedBatchNumber=Fout, product '<b>%s</b>' heeft een lot/serienummer nodig
+ErrorProductDoesNotNeedBatchNumber=Fout, product '<b>%s</b>' accepteert geen lot- /serienummer
+ErrorFailedToReadObject=Fout, kan object van het type<b>%s</b> niet lezen
+ErrorParameterMustBeEnabledToAllwoThisFeature=Fout, parameter <b>%s</b> moet zijn ingeschakeld in<b>conf / conf.php<b>om het gebruik van de opdrachtregelinterface door de interne taakplanner mogelijk te maken
+ErrorLoginDateValidity=Fout, deze login valt buiten de geldigheidsperiode
+ErrorValueLength=Lengte van veld '<b>%s</b>' moet hoger zijn dan '<b>%s</b>'
+ErrorReservedKeyword=Het woord '<b>%s</b>' is een gereserveerd trefwoord
+ErrorNotAvailableWithThisDistribution=Niet beschikbaar in deze distributie
+ErrorPublicInterfaceNotEnabled=Publieke interface was niet ingeschakeld
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=De taal van een nieuwe pagina moet worden gedefinieerd als deze is ingesteld als een vertaling van een andere pagina
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=De taal van de nieuwe pagina mag niet de brontaal zijn als deze is ingesteld als vertaling van een andere pagina
+ErrorAParameterIsRequiredForThisOperation=Een parameter is verplicht voor deze bewerking
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Uw PHP-parameter upload_max_filesize (%s) is hoger dan PHP-parameter post_max_size (%s). Dit is geen consistente opstelling.
 WarningPasswordSetWithNoAccount=Er is een wachtwoord ingesteld voor dit lid. Er is echter geen gebruikersaccount gemaakt. Dus dit wachtwoord is opgeslagen maar kan niet worden gebruikt om in te loggen bij Dolibarr. Het kan worden gebruikt door een externe module / interface, maar als u geen gebruikersnaam of wachtwoord voor een lid hoeft aan te maken, kunt u de optie "Beheer een login voor elk lid" in de module-setup van Member uitschakelen. Als u een login moet beheren maar geen wachtwoord nodig heeft, kunt u dit veld leeg houden om deze waarschuwing te voorkomen. Opmerking: e-mail kan ook worden gebruikt als login als het lid aan een gebruiker is gekoppeld.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Uw login is gewijzigd. Om veiligheidsrede
 WarningAnEntryAlreadyExistForTransKey=Er bestaat al een vermelding voor de vertaalsleutel voor deze taal
 WarningNumberOfRecipientIsRestrictedInMassAction=Waarschuwing, het aantal verschillende ontvangers is beperkt tot <b>%s</b> wanneer u de massa-acties op lijsten gebruikt
 WarningDateOfLineMustBeInExpenseReportRange=Waarschuwing, de datum van de regel valt niet binnen het bereik van het onkostenoverzicht
+WarningProjectDraft=Het project bevindt zich nog in de conceptmodus. Vergeet niet om het te valideren als u van plan bent taken te gebruiken.
 WarningProjectClosed=Project is afgesloten. U moet het eerst opnieuw openen.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Sommige banktransacties werden verwijderd nadat het ontvangstbewijs inclusief deze was gegenereerd. Het aantal cheques en het totaal van de ontvangst kan dus verschillen van het aantal en het totaal in de lijst.
-WarningFailedToAddFileIntoDatabaseIndex=Pasop., Kan geen bestandsinvoer toevoegen aan de ECM-database-indextabel
+WarningFailedToAddFileIntoDatabaseIndex=Pas op, het toevoegen van bestandsinvoer aan de ECM-database-indextabel is mislukt
+WarningTheHiddenOptionIsOn=Pas op, de verborgen optie <b>%s</b> is ingeschakeld.
+WarningCreateSubAccounts=Waarschuwing, u kunt niet rechtstreeks een subaccount aanmaken, u moet een derde partij of een gebruiker aanmaken en hen een boekhoudcode toewijzen om ze in deze lijst te vinden
+WarningAvailableOnlyForHTTPSServers=Alleen beschikbaar als u een beveiligde HTTPS-verbinding gebruikt.
diff --git a/htdocs/langs/nl_NL/exports.lang b/htdocs/langs/nl_NL/exports.lang
index af7fa1643d8..5ea7b305541 100644
--- a/htdocs/langs/nl_NL/exports.lang
+++ b/htdocs/langs/nl_NL/exports.lang
@@ -110,7 +110,7 @@ CsvOptions=CSV-formaatopties
 Separator=Veldscheider
 Enclosure=Stringscheidingsteken
 SpecialCode=Speciale code
-ExportStringFilter=%% laat het vervangen toe van één of meer tekens in de tekst
+ExportStringFilter=Gebruik%% voor het vervangen van één of meer tekens in de tekst
 ExportDateFilter=JJJJ, JJJJMM, JJJJMMDD: filters per jaar/maand/dag <br> JJJJ + JJJJ, JJJJMM + JJJJMM, JJJJMMDD + JJJJMMDD: filters over een periode van jaren/maanden/dagen <br> > JJJJ, >JJJJMM, >JJJJMMDD: filters op alle volgende jaren/maanden/dagen <br><JJJJ, <JJJJMM, <JJJJMMDD: filters op alle voorgaande jaren/maanden/dagen
 ExportNumericFilter=NNNNN filters met één waarde <br> NNNNN + NNNNN filters over een bereik van waarden <br>< NNNNN filters met lagere waarden <br>> NNNNN filters met hogere waarden
 ImportFromLine=Importeren vanaf regelnummer
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Sleutel (kolom) om te gebruiken voor het <b>bijwerken van</b
 NbInsert=Aantal ingevoegde regels: %s
 NbUpdate=Aantal bijgewerkte regels: %s
 MultipleRecordFoundWithTheseFilters=Meerdere records zijn gevonden met deze filters: %s
+StocksWithBatch=Voorraden en locatie (magazijn) van producten met batch- / serienummer
diff --git a/htdocs/langs/nl_NL/externalsite.lang b/htdocs/langs/nl_NL/externalsite.lang
index e3cb3ba9869..1a4033fb34b 100644
--- a/htdocs/langs/nl_NL/externalsite.lang
+++ b/htdocs/langs/nl_NL/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Setup link naar externe website
-ExternalSiteURL=Externe Site URL
-ExternalSiteModuleNotComplete=Module ExternalSite werd niet correct geconfigureerd.
+ExternalSiteSetup=Instellingen voor de link naar een externe website
+ExternalSiteURL=Externe website URL
+ExternalSiteModuleNotComplete=Module Externe Site werd niet correct geconfigureerd.
 ExampleMyMenuEntry=Mijn menu-item
diff --git a/htdocs/langs/nl_NL/ftp.lang b/htdocs/langs/nl_NL/ftp.lang
index 14fbe8e04d9..6d3bee48b51 100644
--- a/htdocs/langs/nl_NL/ftp.lang
+++ b/htdocs/langs/nl_NL/ftp.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Instellen van de FTP-client module
-NewFTPClient=Nieuwe FTP-client
-FTPArea=FTP gedeelte
-FTPAreaDesc=Dit scherm toont een weergave van een FTP-server.
-SetupOfFTPClientModuleNotComplete=De installatie van de FTP-cliëntmodule lijkt onvolledig te zijn
-FTPFeatureNotSupportedByYourPHP=Uw PHP-installatie ondersteunt niet de juiste FTP-functies
-FailedToConnectToFTPServer=Kon geen verbinding maken met de server (FTP-server: %s, poort: %s)
-FailedToConnectToFTPServerWithCredentials=Inloggen op FTP met ingestelde gebruikernaam / wachtwoord mislukt
+FTPClientSetup=FTP of SFTP Client module setup
+NewFTPClient=Nieuwe FTP/SFTP connectie instellen
+FTPArea=FTP/SFTP omgeving
+FTPAreaDesc=Dit scherm geeft een voorbeeld van een FTP of SFTP server weer
+SetupOfFTPClientModuleNotComplete=De setup van de FTP- of SFTP-clientmodule lijkt niet volledig
+FTPFeatureNotSupportedByYourPHP=Uw PHP ondersteunt geen FTP- of SFTP-functies
+FailedToConnectToFTPServer=Kan geen verbinding maken met server (server%s, poort%s)
+FailedToConnectToFTPServerWithCredentials=Inloggen op server met gedefinieerde login / wachtwoord is mislukt
 FTPFailedToRemoveFile=Bestand <b>%s</b> kon niet verwijderd worden.
 FTPFailedToRemoveDir=Kan map <b>%s</b> niet verwijderen: controleer de machtigingen en of de map leeg is.
 FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Kies een FTP-site in het menu ...
+ChooseAFTPEntryIntoMenu=Kies een FTP / SFTP-site uit het menu ...
 FailedToGetFile=%sBestanden niet ontvangen
diff --git a/htdocs/langs/nl_NL/hrm.lang b/htdocs/langs/nl_NL/hrm.lang
index 00b91ece0f6..479157a79aa 100644
--- a/htdocs/langs/nl_NL/hrm.lang
+++ b/htdocs/langs/nl_NL/hrm.lang
@@ -1,19 +1,19 @@
 # Dolibarr language file - en_US - hrm
 # Admin
-HRM_EMAIL_EXTERNAL_SERVICE=E-mail om externe HRM services te verhinderen.
-Establishments=Bedrijven
-Establishment=Bedrijf
-NewEstablishment=Nieuw bedrijf
-DeleteEstablishment=Verwijder bedrijf
+HRM_EMAIL_EXTERNAL_SERVICE=E-mail om externe HRM service te verhinderen.
+Establishments=Vestigingen
+Establishment=Vestiging
+NewEstablishment=Nieuwe Vestiging
+DeleteEstablishment=Verwijder vestiging
 ConfirmDeleteEstablishment=Weet u zeker dat u deze vestiging wilt verwijderen?
-OpenEtablishment=Open bedrijf
-CloseEtablishment=Sluit bedrijf
+OpenEtablishment=Open vestiging
+CloseEtablishment=Sluit vestiging
 # Dictionary
 DictionaryPublicHolidays=HRM - Feestdagen
 DictionaryDepartment=HRM - Afdelingslijst
-DictionaryFunction=HRM - Functies
+DictionaryFunction=HRM - Vacatures
 # Module
 Employees=Werknemers
 Employee=Werknemer
 NewEmployee=Nieuwe werknemer
-ListOfEmployees=List of employees
+ListOfEmployees=Werknemers lijst
diff --git a/htdocs/langs/nl_NL/interventions.lang b/htdocs/langs/nl_NL/interventions.lang
index ca03ab08ba8..b984fa9206f 100644
--- a/htdocs/langs/nl_NL/interventions.lang
+++ b/htdocs/langs/nl_NL/interventions.lang
@@ -1,18 +1,18 @@
 # Dolibarr language file - Source file is en_US - interventions
 Intervention=Interventie
 Interventions=Interventies
-InterventionCard=Interventiedetails
+InterventionCard=Interventie details
 NewIntervention=Nieuwe interventie
-AddIntervention=Nieuwe interventie
+AddIntervention=Creëer interventie
 ChangeIntoRepeatableIntervention=Schakel over naar herhaalbare interventie
 ListOfInterventions=Interventielijst
 ActionsOnFicheInter=Acties bij interventie
 LastInterventions=Laatste %s interventies
 AllInterventions=Alle interventies
 CreateDraftIntervention=Creëer conceptinterventie
-InterventionContact=Interventiecontactpersoon
+InterventionContact=Interventie contactpersoon
 DeleteIntervention=Interventie verwijderen
-ValidateIntervention=Inteverntie valideren
+ValidateIntervention=Interventie valideren
 ModifyIntervention=Interventie aanpassen
 DeleteInterventionLine=Interventieregel verwijderen
 ConfirmDeleteIntervention=Weet u zeker dat u deze interventie wilt verwijderen?
@@ -22,13 +22,13 @@ ConfirmDeleteInterventionLine=Weet u zeker dat u deze interventieregel wilt verw
 ConfirmCloneIntervention=Weet je zeker dat je deze interventie wilt klonen?
 NameAndSignatureOfInternalContact=Naam en handtekening van de tussenkomende partij:
 NameAndSignatureOfExternalContact=Naam en handtekening van klant:
-DocumentModelStandard=Standaard modeldocument voor interventies
-InterventionCardsAndInterventionLines=Inteventiebladen en -regels
+DocumentModelStandard=Standaard model document voor interventies
+InterventionCardsAndInterventionLines=Interventies en interventie -regels
 InterventionClassifyBilled=Classificeer "gefactureerd"
 InterventionClassifyUnBilled=Classificeer "Nog niet gefactureerd"
 InterventionClassifyDone=Classificeer "Klaar"
 StatusInterInvoiced=Gefactureerd
-SendInterventionRef=Indiening van de interventie %s
+SendInterventionRef=Inzending van de interventie %s
 SendInterventionByMail=Stuur interventie per e-mail
 InterventionCreatedInDolibarr=Interventie %s gecreëerd
 InterventionValidatedInDolibarr=Interventie %s gevalideerd
@@ -38,10 +38,10 @@ InterventionClassifiedUnbilledInDolibarr=Interventie %s als nog niet gefactureer
 InterventionSentByEMail=Interventie %s verzonden per e-mail
 InterventionDeletedInDolibarr=Interventie %s verwijderd
 InterventionsArea=Interventies onderdeel
-DraftFichinter=Concept-interventies
+DraftFichinter=Concept interventies
 LastModifiedInterventions=Laatste %s aangepaste interventies
 FichinterToProcess=Interventies om te verwerken
-TypeContact_fichinter_external_CUSTOMER=Nabehandeling afnemerscontact
+TypeContact_fichinter_external_CUSTOMER=Opvolgen klantcontact
 PrintProductsOnFichinter=Print ook regels van het type "product" (niet alleen diensten) op de interventiekaart
 PrintProductsOnFichinterDetails=Interventies gegenereerd op basis van bestellingen
 UseServicesDurationOnFichinter=Gebruik de duur van de services voor interventies die zijn gegenereerd op basis van bestellingen
@@ -51,16 +51,18 @@ InterventionStatistics=Interventie statistieken
 NbOfinterventions=Aantal interventiekaarten
 NumberOfInterventionsByMonth=Aantal interventiekaarten per maand (datum van validatie)
 AmountOfInteventionNotIncludedByDefault=Het bedrag voor interventie is niet standaard opgenomen in de winst (in de meeste gevallen worden de urenstaten gebruikt om de bestede tijd te tellen). Voeg optie PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT toe aan 1 in home-setup-diversen om ze op te nemen.
-InterId=Interventie-ID
+InterId=Interventie ID
 InterRef=Interventie ref.
 InterDateCreation=Aanmaakdatum interventie
 InterDuration=Interventieduur
 InterStatus=Interventiestatus
 InterNote=Opmerking interventie
-InterLine=Lijn van interventie
-InterLineId=Regel ID-interventie
+InterLine=Lijn/regel van interventie
+InterLineId=Regel ID interventie
 InterLineDate=Datum regel interventie
 InterLineDuration=Duur regel interventie
 InterLineDesc=Opmerking regel interventie
 RepeatableIntervention=Sjabloon voor interventie
 ToCreateAPredefinedIntervention=Als u een vooraf gedefinieerde of terugkerende interventie wilt maken, maakt u een gemeenschappelijke interventie en converteert u deze naar een interventiesjabloon
+Reopen=Heropenen
+ConfirmReopenIntervention=Weet u zeker dat u de interventie <b>%s</b> weer wilt openen?
diff --git a/htdocs/langs/nl_NL/intracommreport.lang b/htdocs/langs/nl_NL/intracommreport.lang
index e30b5fe8ff2..f7a16dc291f 100644
--- a/htdocs/langs/nl_NL/intracommreport.lang
+++ b/htdocs/langs/nl_NL/intracommreport.lang
@@ -31,10 +31,10 @@ IntracommReportTitle=Voorbereiding van een XML-bestand in ProDouane formaat
 
 # List
 IntracommReportList=Lijst met gegenereerde aangiften
-IntracommReportNumber=Numero of declaration
-IntracommReportPeriod=Period of nalysis
+IntracommReportNumber=Nummer van aangifte
+IntracommReportPeriod=Analyseperiode
 IntracommReportTypeDeclaration=Type aangifte
-IntracommReportDownload=download XML file
+IntracommReportDownload=download XML-bestand
 
 # Invoice
 IntracommReportTransportMode=Transport methode
diff --git a/htdocs/langs/nl_NL/languages.lang b/htdocs/langs/nl_NL/languages.lang
index e6b9fa70658..4d1ee5150ff 100644
--- a/htdocs/langs/nl_NL/languages.lang
+++ b/htdocs/langs/nl_NL/languages.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
-Language_am_ET=Ethiopian
+Language_am_ET=Ethiopisch
 Language_ar_AR=Arabisch
 Language_ar_EG=Arabisch (Egyptisch)
 Language_ar_SA=Arabisch
-Language_az_AZ=Azerbaijani
+Language_az_AZ=Azerbeidzjaans
 Language_bn_BD=Bengaals
-Language_bn_IN=Bengali (India)
+Language_bn_IN=Bengaals (India)
 Language_bg_BG=Bulgaars
 Language_bs_BA=Bosnisch
 Language_ca_ES=Catalaans
@@ -40,7 +40,7 @@ Language_es_PA=Spaans (Panama)
 Language_es_PY=Spaans (Paraguay)
 Language_es_PE=Spaans (Peru)
 Language_es_PR=Spaans (Puerto Rico)
-Language_es_US=Spanish (USA)
+Language_es_US=Spaans (VS)
 Language_es_UY=Spaans (Uruguay)
 Language_es_GT=Spaans (Guatemala)
 Language_es_VE=Spaans (Venezuela)
@@ -54,11 +54,11 @@ Language_fr_CH=Frans (Zwitserland)
 Language_fr_CI=Frans (Ivoorkust)
 Language_fr_CM=Frans (Kameroen)
 Language_fr_FR=Frans (Frankrijk)
-Language_fr_GA=French (Gabon)
+Language_fr_GA=Frans (Gabon)
 Language_fr_NC=Frans (Nieuw-Caledonië)
 Language_fr_SN=Frans (Senegal)
 Language_fy_NL=Frisian
-Language_gl_ES=Galician
+Language_gl_ES=Galicisch
 Language_he_IL=Hebreeuws
 Language_hi_IN=Hindi (India)
 Language_hr_HR=Kroatisch
@@ -78,7 +78,7 @@ Language_lv_LV=Lets
 Language_mk_MK=Macedonisch
 Language_mn_MN=Mongools
 Language_nb_NO=Noors (Bokmål)
-Language_ne_NP=Nepali
+Language_ne_NP=Nepalees
 Language_nl_BE=Nederlands (België)
 Language_nl_NL=Nederlands
 Language_pl_PL=Pools
diff --git a/htdocs/langs/nl_NL/loan.lang b/htdocs/langs/nl_NL/loan.lang
index 82892fa1a0f..82c7adbae4e 100644
--- a/htdocs/langs/nl_NL/loan.lang
+++ b/htdocs/langs/nl_NL/loan.lang
@@ -23,9 +23,9 @@ AddLoan=Aanmaken lening
 FinancialCommitment=Financiële verplichting
 InterestAmount=Rente
 CapitalRemain=Saldo kapitaal
-TermPaidAllreadyPaid = This term is allready paid
-CantUseScheduleWithLoanStartedToPaid = Can't use scheduler for a loan with payment started
-CantModifyInterestIfScheduleIsUsed = You can't modify interest if you use schedule
+TermPaidAllreadyPaid = Deze termijn is al betaald
+CantUseScheduleWithLoanStartedToPaid = Kan planner niet gebruiken voor een lening waarvan de betaling is gestart
+CantModifyInterestIfScheduleIsUsed = U kunt de rente niet wijzigen indien u een schema gebruikt
 # Admin
 ConfigLoan=Configuratie van de module lening
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Standaard grootboekrekening kapitaal
diff --git a/htdocs/langs/nl_NL/mails.lang b/htdocs/langs/nl_NL/mails.lang
index 0d1eca7a0ff..a14f41f49c8 100644
--- a/htdocs/langs/nl_NL/mails.lang
+++ b/htdocs/langs/nl_NL/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=E-mails door gebruiker opgemaakt
 MailingModuleDescDolibarrUsers=Gebruikers met e-mails
 MailingModuleDescThirdPartiesByCategories=Derden (op categorieën)
 SendingFromWebInterfaceIsNotAllowed=Verzenden vanuit de web interface is niet toegestaan.
+EmailCollectorFilterDesc=Alle filters moeten overeenkomen om een e-mail te kunnen verzamelen
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Regel %s in bestand
@@ -129,8 +130,8 @@ NotificationsAuto=Automatisch meldingen
 NoNotificationsWillBeSent=Er staan geen e-mail kennisgevingen gepland voor dit type evenement en bedrijf
 ANotificationsWillBeSent=1 automatische notificatie zal worden verstuurd per e-mail
 SomeNotificationsWillBeSent=%s automatische notificatie zal per e-mail worden verstuurd
-AddNewNotification=Activeer een nieuw doel / evenement voor e-mailmeldingen
-ListOfActiveNotifications=Lijst met alle actieve doelen / evenementen voor e-mail melding
+AddNewNotification=Abonneer u op een nieuwe automatische e-mailmelding (doel/gebeurtenis)
+ListOfActiveNotifications=Lijst van alle actieve abonnementen (doelen/evenementen) voor automatische e-mailmelding
 ListOfNotificationsDone=Lijst met alle automatisch verstuurde e-mail kennisgevingen
 MailSendSetupIs=Configuratie van e-mailverzending is ingesteld op '%s'. Deze modus kan niet worden gebruikt om bulk e-mails te verzenden.
 MailSendSetupIs2=Ga eerst met een beheerdersaccount naar menu %s Home - Set-up - E-mails%s om de parameter <strong>'%s'</strong> te wijzigen om de modus '%s' te gebruiken. Met deze modus kunt u de installatie van de SMTP-server van uw internetprovider openen en de functie Bulk e-mails gebruiken.
@@ -141,7 +142,7 @@ UseFormatFileEmailToTarget=Het geïmporteerde bestand moet de indeling <strong>e
 UseFormatInputEmailToTarget=Voer een string in met het formaat <strong>e-mail; naam; voornaam; andere</strong>
 MailAdvTargetRecipients=Ontvangers (geavanceerde selectie)
 AdvTgtTitle=Vul invoervelden in om de derde partijen of contacten / adressen voor te selecteren
-AdvTgtSearchTextHelp=Gebruik %% als jokertekens. Om bijvoorbeeld alle items zoals <b>jean, joe, jim te vinden</b> , kun je <b>j%% invoeren</b> , je kunt ook  ; gebruiken als scheidingsteken voor waarde en gebruik ! voor behalve deze waarde. Voorbeeld <b>jean; joe; jim%%;! Jimo;! Jima%</b> richt zich op alle jean, joe, start met jim maar niet jimo en niet alles wat met jima begint
+AdvTgtSearchTextHelp=Gebruik %% als joker-teken. Om bijvoorbeeld alle items zoals <b>jean, joe, jim</b> te vinden, kun je <b> j%%</b> invoeren Je kunt ook een ; gebruiken als scheidingsteken voor de waarde, en gebruik ! alleen hiervoor. Voorbeeld<b>jean;joe;jim%%;!Jimo;!Jima%%</b> zal alle jean, joe, beginnen met jim maar niet met jimo en niet alles dat begint met jima
 AdvTgtSearchIntHelp=Gebruik interval om de waarde int of float te selecteren
 AdvTgtMinVal=Minimum waarde
 AdvTgtMaxVal=Maximum waarde
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index 34b50571fb7..c04dad49fea 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Geen sjabloon beschikbaar voor dit e-mailtype
 AvailableVariables=Beschikbare substitutievariabelen
 NoTranslation=Geen vertaling
 Translation=Vertaling
+CurrentTimeZone=Huidige tijdzone (server)
 EmptySearchString=Voer geen lege zoekcriteria in
+EnterADateCriteria=Voer een datumcriterium in
 NoRecordFound=Geen item gevonden
 NoRecordDeleted=Geen record verwijderd
 NotEnoughDataYet=Niet genoeg data
@@ -85,6 +87,8 @@ FileWasNotUploaded=Een bestand is geselecteerd als bijlage, maar is nog niet ge
 NbOfEntries=Aantal inzendingen
 GoToWikiHelpPage=Lees de online hulptekst (internettoegang vereist)
 GoToHelpPage=Lees de hulptekst
+DedicatedPageAvailable=Er is een speciale help-pagina die betrekking heeft op uw huidige scherm
+HomePage=Startpagina
 RecordSaved=Item opgeslagen
 RecordDeleted=Item verwijderd
 RecordGenerated=Record gegenereerd
@@ -197,7 +201,7 @@ ReOpen=Heropenen
 Upload=Uploaden
 ToLink=Link
 Select=Selecteer
-SelectAll=Select all
+SelectAll=Selecteer alles
 Choose=Kies
 Resize=Schalen
 ResizeOrCrop=Formaat wijzigen of bijsnijden
@@ -267,10 +271,10 @@ DateStart=Begindatum
 DateEnd=Einddatum
 DateCreation=Aanmaakdatum
 DateCreationShort=Aanmaakdatum
-IPCreation=Creation IP
+IPCreation=Creatie IP
 DateModification=Wijzigingsdatum
 DateModificationShort=Wijzigingsdatum
-IPModification=Modification IP
+IPModification=Wijziging IP
 DateLastModification=Laatste wijzigingsdatum
 DateValidation=Validatiedatum
 DateClosing=Sluitingsdatum
@@ -324,7 +328,7 @@ Morning=Ochtend
 Afternoon=Namiddag
 Quadri=Trimester
 MonthOfDay=Maand van de dag
-DaysOfWeek=Days of week
+DaysOfWeek=Dagen van de week
 HourShort=U
 MinuteShort=mn
 Rate=Tarief
@@ -362,7 +366,7 @@ Amount=Hoeveelheid
 AmountInvoice=Factuurbedrag
 AmountInvoiced=Gefactureerd bedrag
 AmountInvoicedHT=Gefactureerd bedrag (excl. BTW)
-AmountInvoicedTTC=Amount invoiced (inc. tax)
+AmountInvoicedTTC=Gefactureerd bedrag (incl. BTW)
 AmountPayment=Betalingsbedrag
 AmountHTShort=Bedrag (excl.)
 AmountTTCShort=Bedrag met BTW
@@ -375,7 +379,7 @@ MulticurrencyPaymentAmount=Betalingsbedrag, originele valuta
 MulticurrencyAmountHT=Bedrag (excl. BTW), oorspronkelijke valuta
 MulticurrencyAmountTTC=Bedrag (incl. BTW), oorspronkelijke valuta
 MulticurrencyAmountVAT=BTW bedrag, oorspronkelijke valuta
-MulticurrencySubPrice=Amount sub price multi currency
+MulticurrencySubPrice=Bedrag subprijs in meerdere valuta
 AmountLT1=Bedrag tax 2
 AmountLT2=Bedrag tax 3
 AmountLT1ES=Bedrag RE
@@ -433,6 +437,7 @@ RemainToPay=Restant te betalen
 Module=Module/Applicatie
 Modules=Modules / Applicaties
 Option=Optie
+Filters=Filters
 List=Lijstoverzicht
 FullList=Volledig overzicht
 FullConversation=Volledig gesprek
@@ -494,7 +499,7 @@ By=Door
 From=Van
 FromDate=Van
 FromLocation=Van
-at=at
+at=Bij
 to=t/m
 To=t/m
 and=en
@@ -517,7 +522,7 @@ Draft=Concept
 Drafts=Concepten
 StatusInterInvoiced=gefactureerd
 Validated=Gevalideerd
-ValidatedToProduce=Validated (To produce)
+ValidatedToProduce=Gevalideerd (om te produceren)
 Opened=Open
 OpenAll=Open (alles)
 ClosedAll=Gesloten (alles)
@@ -698,7 +703,7 @@ Method=Methode
 Receive=Ontvangen
 CompleteOrNoMoreReceptionExpected=Voltooid of niets meer verwacht
 ExpectedValue=Verwachte waarde
-ExpectedQty=Expected Qty
+ExpectedQty=Verwacht aantal
 PartialWoman=Gedeeltelijke
 TotalWoman=Totaal
 NeverReceived=Nooit ontvangen
@@ -715,7 +720,7 @@ MenuECM=Documenten
 MenuAWStats=AWStats
 MenuMembers=Leden
 MenuAgendaGoogle=Google-agenda
-MenuTaxesAndSpecialExpenses=Taxes | Special expenses
+MenuTaxesAndSpecialExpenses=Belastingen | Bijzondere kosten
 ThisLimitIsDefinedInSetup=Dolibarr limiet (Menu Home-Instellingen-Beveiliging): %s Kb, PHP grens: %s Kb
 NoFileFound=Geen documenten die zijn opgeslagen in deze map
 CurrentUserLanguage=Huidige taal
@@ -738,7 +743,7 @@ Page=Pagina
 Notes=Notitie
 AddNewLine=Voeg nieuwe regel toe
 AddFile=Voeg bestand toe
-FreeZone=Free-text product
+FreeZone=Product met vrije tekst
 FreeLineOfType=Vrije omschrijving, type:
 CloneMainAttributes=Kloon het object met de belangrijkste kenmerken
 ReGeneratePDF=PDF opnieuw genereren
@@ -888,8 +893,8 @@ Miscellaneous=Diversen
 Calendar=Kalender
 GroupBy=Groeperen op ...
 ViewFlatList=Weergeven als lijst
-ViewAccountList=View ledger
-ViewSubAccountList=View subaccount ledger
+ViewAccountList=Grootboek bekijken
+ViewSubAccountList=Bekijk het grootboek van de subrekening
 RemoveString='%s' string verwijderen
 SomeTranslationAreUncomplete=Sommige aangeboden talen zijn mogelijk slechts gedeeltelijk vertaald of kunnen fouten bevatten. Help ons om uw taal te corrigeren door u te registreren op <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> om uw verbeteringen toe te voegen.
 DirectDownloadLink=Directe download link (openbaar/extern)
@@ -958,39 +963,39 @@ ShortThursday=Do
 ShortFriday=Vr
 ShortSaturday=Za
 ShortSunday=Zo
-one=one
-two=two
-three=three
-four=four
-five=five
-six=six
-seven=seven
-eight=eight
-nine=nine
-ten=ten
-eleven=eleven
-twelve=twelve
-thirteen=thirdteen
-fourteen=fourteen
-fifteen=fifteen
-sixteen=sixteen
-seventeen=seventeen
-eighteen=eighteen
-nineteen=nineteen
-twenty=twenty
-thirty=thirty
-forty=forty
-fifty=fifty
-sixty=sixty
-seventy=seventy
-eighty=eighty
-ninety=ninety
-hundred=hundred
-thousand=thousand
-million=million
-billion=billion
-trillion=trillion
-quadrillion=quadrillion
+one=één
+two=twee
+three=drie
+four=vier
+five=vijf
+six=zes
+seven=zeven
+eight=acht
+nine=negen
+ten=tien
+eleven=elf
+twelve=twaalf
+thirteen=dertien
+fourteen=veertien
+fifteen=vijftien
+sixteen=zestien
+seventeen=zeventien
+eighteen=achttien
+nineteen=negentien
+twenty=twintig
+thirty=dertig
+forty=veertig
+fifty=vijftig
+sixty=zestig
+seventy=zeventig
+eighty=tachtig
+ninety=negentig
+hundred=honderd
+thousand=duizend
+million=miljoen
+billion=miljard
+trillion=biljoen
+quadrillion=biljard
 SelectMailModel=Selecteer een e-mail template
 SetRef=Stel ref in
 Select2ResultFoundUseArrows=Resultaten gevonden. Gebruik de pijlen om te selecteren.
@@ -1021,7 +1026,7 @@ SearchIntoCustomerShipments=Klantzendingen
 SearchIntoExpenseReports=Onkostennota's 
 SearchIntoLeaves=Vertrekken
 SearchIntoTickets=Tickets
-SearchIntoCustomerPayments=Customer payments
+SearchIntoCustomerPayments=Betalingen door klanten
 SearchIntoVendorPayments=Leveranciersbetalingen
 SearchIntoMiscPayments=Diverse betalingen
 CommentLink=Opmerkingen
@@ -1092,18 +1097,23 @@ NotUsedForThisCustomer=Niet gebruikt voor deze klant
 AmountMustBePositive=Bedrag moet positief zijn
 ByStatus=Op status
 InformationMessage=Informatie
-Used=Used
-ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s created
-MODIFYInDolibarr=Record %s modified
-DELETEInDolibarr=Record %s deleted
-VALIDATEInDolibarr=Record %s validated
-APPROVEDInDolibarr=Record %s approved
-DefaultMailModel=Default Mail Model
-PublicVendorName=Public name of vendor
+Used=Gebruikt
+ASAP=Zo spoedig mogelijk
+CREATEInDolibarr=Record %s aangemaakt
+MODIFYInDolibarr=Record %s gewijzigd
+DELETEInDolibarr=Record %s verwijderd
+VALIDATEInDolibarr=Record %s gevalideerd
+APPROVEDInDolibarr=Record %s goedgekeurd
+DefaultMailModel=Standaard mailmodel
+PublicVendorName=Openbare naam van de leverancier
 DateOfBirth=Geboortedatum
-SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
-UpToDate=Up-to-date
-OutOfDate=Out-of-date
-EventReminder=Event Reminder
-UpdateForAllLines=Update for all lines
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Beveiligingstoken is verlopen, dus actie is geannuleerd. Probeer het a.u.b. opnieuw.
+UpToDate=Bijgewerkt
+OutOfDate=Verouderd
+EventReminder=Herinnering voor evenement
+UpdateForAllLines=Update voor alle lijnen
+OnHold=In de wacht
+AffectTag=Heeft invloed op de tag
+ConfirmAffectTag=invloed op bulk-tag
+ConfirmAffectTagQuestion=Weet u zeker dat u tags wilt beïnvloeden voor de %s geselecteerde record (s)?
+CategTypeNotFound=Geen tag-soort gevonden voor type records
diff --git a/htdocs/langs/nl_NL/members.lang b/htdocs/langs/nl_NL/members.lang
index 405b9331dba..ee9c303d352 100644
--- a/htdocs/langs/nl_NL/members.lang
+++ b/htdocs/langs/nl_NL/members.lang
@@ -19,8 +19,8 @@ MembersCards=Visitekaarten van leden
 MembersList=Ledenlijst
 MembersListToValid=Lijst van conceptleden (te valideren)
 MembersListValid=Lijst van geldige leden
-MembersListUpToDate=List of valid members with up-to-date subscription
-MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListUpToDate=Geldige leden met een up-to-date abonnement
+MembersListNotUpToDate=Geldige leden met een verouderd abonnement
 MembersListResiliated=Lijst verwijderde leden
 MembersListQualified=Lijst van gekwalificeerde leden
 MenuMembersToValidate=Conceptleden
@@ -32,7 +32,7 @@ DateSubscription=Inschrijvingsdatum
 DateEndSubscription=Einddatum abonnement
 EndSubscription=Einde abonnement
 SubscriptionId=Inschrijvings-ID
-WithoutSubscription=Without subscription
+WithoutSubscription=Zonder abonnement
 MemberId=Lid ID
 NewMember=Nieuw lid
 MemberType=Type lid
@@ -80,7 +80,7 @@ DeleteType=Verwijderen
 VoteAllowed=Stemming toegestaan
 Physical=Fysiek
 Moral=Moreel
-MorAndPhy=Moral and Physical
+MorAndPhy=Moreel en fysiek
 Reenable=Opnieuw inschakelen
 ResiliateMember=Verwijder een lid
 ConfirmResiliateMember=Weet je zeker dat je dit lidmaatschap wilt beëindigen?
@@ -116,7 +116,7 @@ SendingEmailOnMemberValidation=E-mail verzenden bij validatie van nieuwe leden
 SendingEmailOnNewSubscription=E-mail verzenden bij nieuw abonnement
 SendingReminderForExpiredSubscription=Herinnering verzenden voor verlopen abonnementen
 SendingEmailOnCancelation=Verzenden van e-mail bij annulering
-SendingReminderActionComm=Sending reminder for agenda event
+SendingReminderActionComm=Herinnering verzenden voor agenda-evenement
 # Topic of email templates
 YourMembershipRequestWasReceived=Je lidmaatschap is ontvangen.
 YourMembershipWasValidated=Uw lidmaatschap is gevalideerd
@@ -167,7 +167,7 @@ MembersStatisticsByState=Leden statistieken per staat / provincie
 MembersStatisticsByTown=Leden van de statistieken per gemeente
 MembersStatisticsByRegion=Leden statistieken per regio
 NbOfMembers=Aantal leden
-NbOfActiveMembers=Number of current active members
+NbOfActiveMembers=Aantal huidige actieve leden
 NoValidatedMemberYet=Geen gevalideerde leden gevonden
 MembersByCountryDesc=Dit scherm tonen statistieken over de leden door de landen. Grafisch is echter afhankelijk van Google online grafiek service en is alleen beschikbaar als een internet verbinding is werkt.
 MembersByStateDesc=Dit scherm tonen statistieken over de leden door de staat / provincies / kanton.
@@ -177,7 +177,7 @@ MenuMembersStats=Statistiek
 LastMemberDate=Laatste liddatum
 LatestSubscriptionDate=Laatste abonnementsdatum
 MemberNature=Aard van het lid
-MembersNature=Nature of members
+MembersNature=Aard van de leden
 Public=Informatie zijn openbaar (no = prive)
 NewMemberbyWeb=Nieuw lid toegevoegd. In afwachting van goedkeuring
 NewMemberForm=Nieuw lid formulier
diff --git a/htdocs/langs/nl_NL/modulebuilder.lang b/htdocs/langs/nl_NL/modulebuilder.lang
index 1b4a871f69f..767bee4b08a 100644
--- a/htdocs/langs/nl_NL/modulebuilder.lang
+++ b/htdocs/langs/nl_NL/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP-pagina om een ​​record te maken / bewerken / bekij
 PageForAgendaTab=PHP-pagina voor evenemententabblad
 PageForDocumentTab=PHP-pagina voor documenttabblad
 PageForNoteTab=PHP-pagina voor notitietabblad
+PageForContactTab=PHP-pagina voor tabblad contact
 PathToModulePackage=Pad naar zip van module / applicatiepakket
 PathToModuleDocumentation=Pad naar bestand van module / applicatiedocumentatie (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaties of speciale tekens zijn niet toegestaan.
@@ -77,7 +78,7 @@ IsAMeasure=Is een maat
 DirScanned=Directory gescand
 NoTrigger=Geen trigger
 NoWidget=Geen widget
-GoToApiExplorer=Ga naar API explorer
+GoToApiExplorer=API-verkenner
 ListOfMenusEntries=Lijst met menu-items
 ListOfDictionariesEntries=Lijst met woordenboekingangen
 ListOfPermissionsDefined=Lijst met gedefinieerde machtigingen
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Als u kennis van SQL en PHP hebt, kunt u de wizard voor
 SeeTopRightMenu=Zien <span class="fa fa-bug"></span> in het menu rechtsboven
 AddLanguageFile=Taalbestand toevoegen
 YouCanUseTranslationKey=U kunt hier een sleutel gebruiken die de vertaalsleutel is die in het taalbestand is gevonden (zie tabblad "Talen")
-DropTableIfEmpty=(Verwijder tabel indien leeg)
+DropTableIfEmpty=(Vernietig de tabel als deze leeg is)
 TableDoesNotExists=Tabel %s bestaat niet
 TableDropped=Tabel %s verwijderd
 InitStructureFromExistingTable=Bouw de reeks structuurstructuren van een bestaande tabel
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Gebruik een specifieke editor-URL
 UseSpecificFamily = Gebruik een specifieke familie
 UseSpecificAuthor = Gebruik een specifieke auteur
 UseSpecificVersion = Gebruik een specifieke eerste versie
-ModuleMustBeEnabled=De module / toepassing moet eerst worden ingeschakeld
 IncludeRefGeneration=De referentie van het object moet automatisch worden gegenereerd
 IncludeRefGenerationHelp=Vink dit aan als u code wilt opnemen om het genereren van de referentie automatisch te beheren
 IncludeDocGeneration=Ik wil enkele documenten genereren van het object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type velden: <br> varchar (99), dubbel (24,8), real, tekst, htm
 AsciiToHtmlConverter=Ascii naar HTML converter
 AsciiToPdfConverter=Ascii naar PDF converter
 TableNotEmptyDropCanceled=Tabel is niet leeg. Drop is geannuleerd.
+ModuleBuilderNotAllowed=De modulebouwer is beschikbaar maar niet toegestaan voor uw gebruiker.
diff --git a/htdocs/langs/nl_NL/mrp.lang b/htdocs/langs/nl_NL/mrp.lang
index d6ad354427d..7b36a04d9c6 100644
--- a/htdocs/langs/nl_NL/mrp.lang
+++ b/htdocs/langs/nl_NL/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Productieorders
-MOs=Manufacturing orders
-ManufacturingOrder=Manufacturing Order
+MOs=Productieopdrachten
+ManufacturingOrder=Productieorder
 MRPDescription=Module om productie- en productieorders (PO) te beheren.
 MRPArea=MRP-gebied
 MrpSetupPage=Installatie van module MRP
@@ -76,5 +76,5 @@ ProductsToProduce=Te produceren producten
 UnitCost=De kosten per eenheid
 TotalCost=Totale prijs
 BOMTotalCost=De kosten voor het produceren van deze stuklijst op basis van de kosten van elke hoeveelheid en elk te consumeren product (gebruik kostprijs indien gedefinieerd, anders gemiddelde gewogen prijs indien gedefinieerd, anders de beste aankoopprijs)
-GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
-ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
+GoOnTabProductionToProduceFirst=U moet eerst de productie hebben gestart om een Productieorder te sluiten (zie tabblad '%s'). Maar u kunt het annuleren.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Een kit kan niet worden gebruikt in een stuklijst of een MO
diff --git a/htdocs/langs/nl_NL/multicurrency.lang b/htdocs/langs/nl_NL/multicurrency.lang
index 342ced55f1b..dcf54838389 100644
--- a/htdocs/langs/nl_NL/multicurrency.lang
+++ b/htdocs/langs/nl_NL/multicurrency.lang
@@ -20,3 +20,19 @@ MulticurrencyPaymentAmount=Betalingsbedrag, originele valuta
 AmountToOthercurrency=Bedrag in (in valuta van ontvangende account)
 CurrencyRateSyncSucceed=Synchronisatie van valutakoersen is geslaagd
 MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Gebruik de valuta van het document voor online betalingen
+TabTitleMulticurrencyRate=Koerslijst
+ListCurrencyRate=Lijst met wisselkoersen voor de valuta
+CreateRate=Koers aanmaken
+FormCreateRate=Aanmaken koers
+FormUpdateRate=Aanpassen koers
+successRateCreate=Koers voor valuta %s is toegevoegd aan de database
+ConfirmDeleteLineRate=Weet u zeker dat u de %s-koers voor valuta %s op %s-datum wilt verwijderen?
+DeleteLineRate=Opschonen koers
+successRateDelete=Koers verwijderd
+errorRateDelete=Fout bij het verwijderen van de koers
+successUpdateRate=Wijziging aangebracht
+ErrorUpdateRate=Fout bij het wijzigen van de koers
+Codemulticurrency=valuta code
+UpdateRate=wijzig de koers
+CancelUpdate=annuleren
+NoEmptyRate=Het koersveld mag niet leeg zijn
diff --git a/htdocs/langs/nl_NL/orders.lang b/htdocs/langs/nl_NL/orders.lang
index 63befed613c..9ec42fd206a 100644
--- a/htdocs/langs/nl_NL/orders.lang
+++ b/htdocs/langs/nl_NL/orders.lang
@@ -87,7 +87,7 @@ NbOfOrders=Aantal opdrachten
 OrdersStatistics=Opdrachtenstatistieken
 OrdersStatisticsSuppliers=Inkooporder statistieken
 NumberOfOrdersByMonth=Aantal opdrachten per maand
-AmountOfOrdersByMonthHT=Aantal bestellingen per maand (excl. BTW)
+AmountOfOrdersByMonthHT=Totaalbedrag bestellingen per maand (excl. BTW)
 ListOfOrders=Opdrachtenlijst
 CloseOrder=Opdracht sluiten
 ConfirmCloseOrder=Weet u zeker dat u deze bestelling wilt instellen op afgeleverd? Zodra een bestelling is afgeleverd, kan deze worden ingesteld op gefactureerd.
diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang
index d6bbceb831c..0ce46830a80 100644
--- a/htdocs/langs/nl_NL/other.lang
+++ b/htdocs/langs/nl_NL/other.lang
@@ -5,8 +5,6 @@ Tools=Gereedschap
 TMenuTools=Gereedschap
 ToolsDesc=Alle tools die niet in andere menu-items zijn opgenomen, zijn hier gegroepeerd. <br> Alle tools zijn toegankelijk via het linkermenu.
 Birthday=Verjaardag
-BirthdayDate=Geboorte datum
-DateToBirth=Geboortedatum
 BirthdayAlertOn=Verjaardagskennisgeving actief
 BirthdayAlertOff=Verjaardagskennisgeving inactief
 TransKey=Vertaling van de sleutel TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Vorige maand (nummer 1-12) van factuurdatum
 TextPreviousMonthOfInvoice=Voorgaande maand (tekst) van factuurdatum.
 NextMonthOfInvoice=Volgende maand (nummer 1-12) van factuurdatum
 TextNextMonthOfInvoice=Volgende maand (tekst) van factuurdatum
+PreviousMonth=Vorige maand
+CurrentMonth=Deze maand
 ZipFileGeneratedInto=ZIP bestand aangemaakt in <b>%s</b>.
 DocFileGeneratedInto=Doc-bestand aangemaakt in <b>%s</b>.
 JumpToLogin=Verbinding verbroken. Ga naar het loginscherm...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__ (Hallo) __ Vind verzending __REF__ bijgevoe
 PredefinedMailContentSendFichInter=__ (Hallo) __ Zoek interventie __REF__ bijgevoegd __ (Met vriendelijke groet) __ __USER_SIGNATURE__
 PredefinedMailContentLink=Indien u nog niet heeft betaald kunt u op de onderstaande link klikken. %s
 PredefinedMailContentGeneric=__ (Hallo) __ __ (Met vriendelijke groet) __ __USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Herinnering "__EVENT_LABEL__" op __EVENT_DATE__ om __EVENT_TIME__ <br> <br> Dit is een automatisch bericht, gelieve niet te antwoorden.
 DemoDesc=Dolibarr is een compacte ERP / CRM die verschillende bedrijfsmodules ondersteunt. Een demo met alle modules heeft geen zin omdat dit scenario zich nooit voordoet (enkele honderden beschikbaar). Er zijn dus verschillende demoprofielen beschikbaar.
 ChooseYourDemoProfil=Kies het demoprofiel dat het beste bij u past ...
 ChooseYourDemoProfilMore=... of bouw je eigen profiel <br> (handmatige moduleselectie)
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact / adres gecreëerd door e-mailverzamelaar
 ProjectCreatedByEmailCollector=Project gemaakt door e-mailverzamelaar uit e-mail MSGID %s
 TicketCreatedByEmailCollector=Ticket gemaakt door e-mailverzamelaar vanuit e-mail MSGID %s
 OpeningHoursFormatDesc=Gebruik a - om de openings- en sluitingsuren te scheiden. <br> Gebruik een spatie om verschillende bereiken in te voeren. <br> Voorbeeld: 8-12 14-18
+PrefixSession=Voorloper sessie-ID
 
 ##### Export #####
 ExportsArea=Uitvoeroverzicht
@@ -278,9 +280,9 @@ LinesToImport=Regels om te importeren
 
 MemoryUsage=Geheugengebruik
 RequestDuration=Duur van het verzoek
-ProductsPerPopularity=Products/Services by popularity
+ProductsPerPopularity=Producten/diensten op populariteit
 PopuProp=Producten / diensten op populariteit in voorstellen
 PopuCom=Producten / services op populariteit in Orders
 ProductStatistics=Producten / diensten Statistieken
 NbOfQtyInOrders=Aantal in bestellingen
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Selecteer het type object dat u wilt analyseren ...
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index 27d14439fea..bac0be02a89 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -104,24 +104,25 @@ SetDefaultBarcodeType=Stel type streepjescode in
 BarcodeValue=Waarde streepjescode
 NoteNotVisibleOnBill=Notitie (niet zichtbaar op facturen, offertes, etc)
 ServiceLimitedDuration=Als product een dienst is met een beperkte houdbaarheid:
-FillWithLastServiceDates=Fill with last service line dates
+FillWithLastServiceDates=Vul de data van de laatste servicelijn in
 MultiPricesAbility=Meerdere prijssegmenten per product / dienst (elke klant bevindt zich in één prijssegment)
 MultiPricesNumPrices=Aantal prijzen
 DefaultPriceType=Basisprijzen per standaard (met versus zonder belasting) bij het toevoegen van nieuwe verkoopprijzen
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Kits inschakelen (set van andere producten)
+VariantsAbility=Varianten inschakelen (variaties van producten, bijvoorbeeld kleur, maat)
 AssociatedProducts=Kits
-AssociatedProductsNumber=Number of products composing this kit
+AssociatedProductsNumber=Aantal producten waaruit deze kit bestaat
 ParentProductsNumber=Aantal ouder pakket producten
 ParentProducts=Gerelateerde producten
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
+IfZeroItIsNotAVirtualProduct=Indien 0, is dit product geen kit
+IfZeroItIsNotUsedByVirtualProduct=Indien 0, wordt dit product door geen enkele kit gebruikt
 KeywordFilter=Trefwoord filter
 CategoryFilter=Categorie filter
 ProductToAddSearch=Zoek product om toe te voegen
 NoMatchFound=Geen resultaten gevonden
 ListOfProductsServices=Producten/diensten lijst
-ProductAssociationList=List of products/services that are component(s) of this kit
-ProductParentList=List of kits with this product as a component
+ProductAssociationList=Lijst met producten/diensten die onderdeel zijn van deze kit
+ProductParentList=Lijst van kits met dit product als onderdeel
 ErrorAssociationIsFatherOfThis=Een van de geselecteerde product is de ouder van het huidige product
 DeleteProduct=Verwijderen een product / dienst
 ConfirmDeleteProduct=Weet u zeker dat u dit product / deze dienst wilt verwijderen?
@@ -167,11 +168,13 @@ BuyingPrices=Inkoop prijzen
 CustomerPrices=Consumenten prijzen
 SuppliersPrices=Prijzen van leveranciers
 SuppliersPricesOfProductsOrServices=Leverancierprijzen (van producten of services)
-CustomCode=Douane / Commodity / HS-code
+CustomCode=Douane | Goederen | HS-code
 CountryOrigin=Land van herkomst
+RegionStateOrigin=Regio oorsprong
+StateOrigin=Staat | Provincie oorsprong
 Nature=Aard van het product (materiaal / afgewerkt)
-NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductShort=Aard van het product
+NatureOfProductDesc=Grondstof of afgewerkt product
 ShortLabel=Kort label
 Unit=Eenheid
 p=u.
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Gebruik vaste prijs
 PriceByQuantity=Verschillende prijzen per hoeveelheid
 DisablePriceByQty=Prijs per hoeveelheid uitschakelen
 PriceByQuantityRange=Aantal bereik
-MultipriceRules=Regels voor prijssegmenten
+MultipriceRules=Automatische prijzen voor segment
 UseMultipriceRules=Gebruik regels voor prijssegmenten (gedefinieerd in de configuratie van de productmodule) om automatisch de prijzen van alle andere segmenten te berekenen op basis van het eerste segment
 PercentVariationOver=%% variatie over %s
 PercentDiscountOver=%% korting op meer dan %s
@@ -287,7 +290,7 @@ PriceExpressionEditorHelp5=Beschikbare globale waarden:
 PriceMode=Prijs-modus
 PriceNumeric=Nummer
 DefaultPrice=Standaard prijs
-DefaultPriceLog=Log of previous default prices
+DefaultPriceLog=Logboek van eerdere standaardprijzen
 ComposedProductIncDecStock=Verhogen/verlagen voorraad bij de ouder verandering
 ComposedProduct=Producten voor kinderen
 MinSupplierPrice=Minimum aankoopprijs
@@ -340,7 +343,7 @@ UseProductFournDesc=Voeg een functie toe om de beschrijvingen van producten te d
 ProductSupplierDescription=Leveranciersbeschrijving voor het product
 UseProductSupplierPackaging=Gebruik verpakkingen op leveranciersprijzen (herbereken hoeveelheden volgens verpakking ingesteld op leveranciersprijs bij toevoegen / bijwerken van regel in leveranciersdocumenten)
 PackagingForThisProduct=Verpakking
-PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
+PackagingForThisProductDesc=Bij een leveranciersbestelling bestelt u automatisch deze hoeveelheid (of een veelvoud van deze hoeveelheid). Mag niet minder zijn dan de minimumaankoophoeveelheid
 QtyRecalculatedWithPackaging=De hoeveelheid van de lijn werd herberekend volgens de verpakking van de leverancier
 
 #Attributes
@@ -364,9 +367,9 @@ SelectCombination=Selecteer combinatie
 ProductCombinationGenerator=Variatie generator
 Features=Kenmerken
 PriceImpact=Gevolgen voor prijs
-ImpactOnPriceLevel=Impact on price level %s
-ApplyToAllPriceImpactLevel= Apply to all levels
-ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
+ImpactOnPriceLevel=Impact op prijsniveau %s
+ApplyToAllPriceImpactLevel= Toepassen op alle niveaus
+ApplyToAllPriceImpactLevelHelp=Door hier te klikken, stelt u dezelfde prijsimpact in op alle niveaus
 WeightImpact=Gevolgen voor gewicht
 NewProductAttribute=Nieuwe attribuut
 NewProductAttributeValue=Waarde nieuw attribuut
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index d7c0b9b1ba6..7cf5e47c573 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -7,7 +7,7 @@ ProjectsArea=Project omgeving
 ProjectStatus=Project status
 SharedProject=Iedereen
 PrivateProject=Projectcontacten
-ProjectsImContactFor=Projects for which I am explicitly a contact
+ProjectsImContactFor=Projecten waarvoor ik expliciet contactpersoon ben
 AllAllowedProjects=Alle projecten die ik kan lezen (mine + public)
 AllProjects=Alle projecten
 MyProjectsDesc=Deze weergave is beperkt tot projecten waarvan u een contactpersoon bent
@@ -79,9 +79,9 @@ DurationEffective=Effectieve duur
 ProgressDeclared=Aangekondigd echte vooruitgang
 TaskProgressSummary=Taakvoortgang
 CurentlyOpenedTasks=Momenteel openstaande taken
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
-ProgressCalculated=Progress on consumption
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=De aangegeven werkelijke vooruitgang is minder %s dan de voortgang op consumptie
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=De aangegeven echte vooruitgang is meer %s dan de vooruitgang op het gebied van consumptie
+ProgressCalculated=Vooruitgang in consumptie
 WhichIamLinkedTo=waaraan ik gekoppeld ben
 WhichIamLinkedToProject=die ik ben gekoppeld aan het project
 Time=Tijd
@@ -211,9 +211,9 @@ ProjectNbProjectByMonth=Aantal gemaakte projecten per maand
 ProjectNbTaskByMonth=Aantal gemaakte taken per maand
 ProjectOppAmountOfProjectsByMonth=Aantal leads per maand
 ProjectWeightedOppAmountOfProjectsByMonth=Gewogen aantal leads per maand
-ProjectOpenedProjectByOppStatus=Open project|lead by lead status
-ProjectsStatistics=Statistics on projects or leads
-TasksStatistics=Statistics on tasks of projects or leads
+ProjectOpenedProjectByOppStatus=Open project | geleid door lead-status
+ProjectsStatistics=Statistieken over projecten of leads
+TasksStatistics=Statistieken over taken van projecten of leads
 TaskAssignedToEnterTime=Taak toegewezen. Tijd invoeren voor deze taak moet mogelijk zijn.
 IdTaskTime=Id taak tijd
 YouCanCompleteRef=Als je de ref met een achtervoegsel wilt voltooien, wordt aanbevolen om een - -teken toe te voegen om het te scheiden, zodat de automatische nummering nog steeds correct werkt voor volgende projecten. Bijvoorbeeld %s-MYSUFFIX
diff --git a/htdocs/langs/nl_NL/propal.lang b/htdocs/langs/nl_NL/propal.lang
index c2efc292ccf..ed9e284c461 100644
--- a/htdocs/langs/nl_NL/propal.lang
+++ b/htdocs/langs/nl_NL/propal.lang
@@ -83,9 +83,9 @@ DefaultModelPropalClosed=Standaard sjabloon bij het sluiten van een zakelijk voo
 ProposalCustomerSignature=Schriftelijke aanvaarding , stempel , datum en handtekening
 ProposalsStatisticsSuppliers=Leveranciersoffertes statistieken 
 CaseFollowedBy=Geval gevolgd door
-SignedOnly=Signed only
-IdProposal=Proposal ID
-IdProduct=Product ID
-PrParentLine=Proposal Parent Line
-LineBuyPriceHT=Buy Price Amount net of tax for line
+SignedOnly=Alleen gesigneerd
+IdProposal=Offerte-ID
+IdProduct=Product-ID
+PrParentLine=Voorstel bovenliggende lijn
+LineBuyPriceHT=Koopprijs bedrag exclusief BTW voor regel
 
diff --git a/htdocs/langs/nl_NL/receiptprinter.lang b/htdocs/langs/nl_NL/receiptprinter.lang
index 0da7647a6c9..f0598541b6b 100644
--- a/htdocs/langs/nl_NL/receiptprinter.lang
+++ b/htdocs/langs/nl_NL/receiptprinter.lang
@@ -54,7 +54,7 @@ DOL_DOUBLE_WIDTH=Dubbele breedte
 DOL_DEFAULT_HEIGHT_WIDTH=Standaard hoogte en breedte
 DOL_UNDERLINE=Activeer onderstrepen
 DOL_UNDERLINE_DISABLED=Deactiveer onderstrepen
-DOL_BEEP=Beed geluid
+DOL_BEEP=Geluid
 DOL_PRINT_TEXT=Afdrukken tekst
 DateInvoiceWithTime=Factuur datum en tijd
 YearInvoice=Factuur jaar
@@ -77,6 +77,6 @@ DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Saldo klant account
 DOL_VALUE_MYSOC_NAME=Uw bedrijfsnaam
 VendorLastname=Achternaam leverancier
 VendorFirstname=Voornaam leverancier
-VendorEmail=Vendor email
+VendorEmail=E-mailadres van leverancier
 DOL_VALUE_CUSTOMER_POINTS=Klantpunten
 DOL_VALUE_OBJECT_POINTS=Objectpunten
diff --git a/htdocs/langs/nl_NL/recruitment.lang b/htdocs/langs/nl_NL/recruitment.lang
index dbf7e374eba..4ad441ecff0 100644
--- a/htdocs/langs/nl_NL/recruitment.lang
+++ b/htdocs/langs/nl_NL/recruitment.lang
@@ -29,8 +29,8 @@ RecruitmentSetup = Werving instellingen
 Settings = Instellingen
 RecruitmentSetupPage = Stel hier de hoofdopties voor de recruitment module in
 RecruitmentArea=Werving gebied
-PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
-EnablePublicRecruitmentPages=Enable public pages of open jobs
+PublicInterfaceRecruitmentDesc=Openbare pagina's met vacatures zijn openbare URL's om openstaande vacatures weer te geven en te beantwoorden. Er is een verschillende link voor elke openstaande vacature, te vinden op elk vacatureblad.
+EnablePublicRecruitmentPages=Schakel openbare pagina's van open vacatures in
 
 #
 # About page
@@ -47,29 +47,30 @@ ResponsibleOfRecruitement=Verantwoordelijk voor werving
 IfJobIsLocatedAtAPartner=Als baan zich op een partnerlocatie bevindt
 PositionToBeFilled=Functie
 PositionsToBeFilled=Vacature
-ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job positions
+ListOfPositionsToBeFilled=Lijst met vacatures
+NewPositionToBeFilled=Nieuwe vacatures
 
-JobOfferToBeFilled=Job position to be filled
-ThisIsInformationOnJobPosition=Information of the job position to be filled
-ContactForRecruitment=Contact for recruitment
-EmailRecruiter=Email recruiter
-ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New application
-ListOfCandidatures=List of applications
-RequestedRemuneration=Requested remuneration
-ProposedRemuneration=Proposed remuneration
+JobOfferToBeFilled=Functie die moet worden vervuld
+ThisIsInformationOnJobPosition=Informatie over de te vervullen vacature
+ContactForRecruitment=Contactpersoon voor werving
+EmailRecruiter=E-mail de recruiter
+ToUseAGenericEmail=Om een generiek e-mailadres te gebruiken. Indien niet gedefinieerd, wordt het e-mailadres van de rekruteringsverantwoordelijke gebruikt
+NewCandidature=Nieuwe applicatie
+ListOfCandidatures=Lijst met applicaties
+RequestedRemuneration=Gevraagde vergoeding
+ProposedRemuneration=Voorgestelde vergoeding
 ContractProposed=Contractvoorstel gedaan
 ContractSigned=Contract getekend
-ContractRefused=Contract refused
-RecruitmentCandidature=Application
+ContractRefused=Contract geweigerd
+RecruitmentCandidature=Toepassing
 JobPositions=Vacature
-RecruitmentCandidatures=Applications
-InterviewToDo=Interview to do
-AnswerCandidature=Application answer
-YourCandidature=Your application
-YourCandidatureAnswerMessage=Thanks you for your application.<br>...
-JobClosedTextCandidateFound=The job position is closed. The position has been filled.
-JobClosedTextCanceled=The job position is closed.
-ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+RecruitmentCandidatures=Toepassingen
+InterviewToDo=Te maken interview
+AnswerCandidature=Toepassing antwoord
+YourCandidature=Jouw toepassing
+YourCandidatureAnswerMessage=Bedankt voor je aanmelding. <br> ...
+JobClosedTextCandidateFound=De vacature is gesloten. De functie is vervuld.
+JobClosedTextCanceled=De vacature is gesloten.
+ExtrafieldsJobPosition=Complementaire attributen (functieposities)
+ExtrafieldsCandidatures=Aanvullende attributen (sollicitaties)
+MakeOffer=Doe een aanbod
diff --git a/htdocs/langs/nl_NL/salaries.lang b/htdocs/langs/nl_NL/salaries.lang
index 7e29f0ff949..5f91fe4db8b 100644
--- a/htdocs/langs/nl_NL/salaries.lang
+++ b/htdocs/langs/nl_NL/salaries.lang
@@ -1,21 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Grootboekrekening voor medewerker derde partij
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=De specifieke account die op de gebruikerskaart is gedefinieerd, wordt alleen voor de boekhouding van subgrootboek gebruikt. Deze wordt gebruikt voor grootboek en als standaardwaarde voor subgrootboek-boekhouding als specifieke gebruikersaccount voor de account op gebruiker niet is gedefinieerd.
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=De boekhoudrekening die in het gebruikersbestand is gedefinieerd, wordt alleen gebruikt voor aanvullende boekhouding. Deze wordt gebruikt voor het grootboek en als standaardwaarde voor aanvullende boekhouding als de speciale rekening van de gebruiker niet is gedefinieerd.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Standaard grootboekrekening voor salaris betalingen
 Salary=Salaris
 Salaries=Salarissen
 NewSalaryPayment=Nieuwe salarisbetaling
 AddSalaryPayment=Salarisbetaling toevoegen
 SalaryPayment=Salarisbetaling
-SalariesPayments=Salarissen betalingen
+SalariesPayments=Salarisbetalingen
 ShowSalaryPayment=Toon salarisbetaling
 THM=Gemiddeld uurtarief
 TJM=Gemiddeld dagtarief
 CurrentSalary=Huidig salaris
-THMDescription=Deze waarde kan worden gebruikt om de kosten te berekenen van de tijd die wordt besteed aan een project dat door gebruikers is ingevoerd als het moduleproject wordt gebruikt
+THMDescription=Deze waarde kan worden gebruikt om de kosten te berekenen van de tijd die wordt besteed aan een project dat door gebruikers is ingevoerd als de module Project wordt gebruikt
 TJMDescription=Deze waarde is momenteel alleen ter informatie en wordt niet gebruikt voor enige berekening
-LastSalaries=Laatste %s salaris betalingen
+LastSalaries=Laatste %s salarisbetalingen
 AllSalaries=Alle salarisbetalingen
-SalariesStatistics=Salarisstatistieken
+SalariesStatistics=Salaris statistieken
 # Export
-SalariesAndPayments=Lonen en betalingen
+SalariesAndPayments=Salarissen en betalingen
diff --git a/htdocs/langs/nl_NL/sendings.lang b/htdocs/langs/nl_NL/sendings.lang
index 2c3d237a2db..b16b9726c7d 100644
--- a/htdocs/langs/nl_NL/sendings.lang
+++ b/htdocs/langs/nl_NL/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Andere verzendingen voor deze opdracht
 SendingsAndReceivingForSameOrder=Verzendingen en ontvangsten voor deze bestelling
 SendingsToValidate=Te valideren verzendingen
 StatusSendingCanceled=Geannuleerd
+StatusSendingCanceledShort=Geannuleerd
 StatusSendingDraft=Concept
 StatusSendingValidated=Gevalideerd (producten te verzenden of reeds verzonden)
 StatusSendingProcessed=Verwerkt
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=U moet eerst de bestelling valideren voordat u
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Completer leveringsbewijs documentmodel (logo, etc)
+DocumentModelStorm=Compleet documentmodel voor ontvangstbewijzen en compatibiliteit met extrafields (logo ...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER niet gedefinieerd
 SumOfProductVolumes=Som van alle productvolumes
 SumOfProductWeights=Som van product-gewichten
diff --git a/htdocs/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang
index 1a21ab2c3b2..125bb7814bf 100644
--- a/htdocs/langs/nl_NL/stocks.lang
+++ b/htdocs/langs/nl_NL/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Verwijder verzending
 Stock=Voorraad
 Stocks=Voorraden
 MissingStocks=Ontbrekende voorraad
-StockAtDate=Stocks at date
+StockAtDate=Voorraden op datum
 StockAtDateInPast=Datum uit het verleden
 StockAtDateInFuture=Toekomstige datum
 StocksByLotSerial=Voorraad volgorde op lot/serienummer
@@ -34,7 +34,7 @@ StockMovementForId=Verplaatsing ID %d
 ListMouvementStockProject=Lijst met voorraad verplaatsingen die aan het project zijn gekoppeld
 StocksArea=Magazijnen
 AllWarehouses=Alle magazijnen
-IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
+IncludeEmptyDesiredStock=Voeg ook een negatieve voorraad toe met een ongedefinieerde gewenste voorraad
 IncludeAlsoDraftOrders=Neem ook conceptorders op
 Location=Locatie
 LocationSummary=Korte naam locatie
@@ -66,7 +66,7 @@ WarehouseAskWarehouseDuringOrder=Stel een magazijn in op Verkooporders
 UserDefaultWarehouse=Stel een magazijn in op gebruikers
 MainDefaultWarehouse=Standaardmagazijn
 MainDefaultWarehouseUser=Gebruik standaard magazijn voor elke gebruiker
-MainDefaultWarehouseUserDesc=By activating this option, during creation of a product, the warehouse assigned to the product will be defined on this one. If no warehouse is defined on the user, the default warehouse is defined.
+MainDefaultWarehouseUserDesc=Door deze optie te activeren, wordt tijdens het aanmaken van een product het magazijn dat aan het product is toegewezen op deze bepaald. Als er geen magazijn is gedefinieerd voor de gebruiker, wordt het standaardmagazijn gedefinieerd.
 IndependantSubProductStock=Product voorraad en subproduct voorraad zijn onafhankelijk
 QtyDispatched=Hoeveelheid verzonden
 QtyDispatchedShort=Aantal verzonden
@@ -95,16 +95,16 @@ RealStock=Werkelijke voorraad
 RealStockDesc=Fysieke/echte voorraad is de voorraad die momenteel in de magazijnen aanwezig is.
 RealStockWillAutomaticallyWhen=De werkelijke voorraad wordt aangepast volgens deze regel (zoals gedefinieerd in de module Voorraad):
 VirtualStock=Virtuele voorraad
-VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+VirtualStockAtDate=Virtuele voorraad op datum
+VirtualStockAtDateDesc=Virtuele voorraad zodra alle lopende bestellingen die volgens de planning vóór de datum moeten worden gedaan, zijn voltooid
+VirtualStockDesc=Virtuele voorraad is de berekende voorraad die beschikbaar is zodra alle openstaande / lopende acties (die van invloed zijn op voorraden) zijn gesloten (inkooporders ontvangen, verkooporders verzonden, productieorders geproduceerd, enz.)
 IdWarehouse=Magazijn-ID
 DescWareHouse=Beschrijving magazijn
 LieuWareHouse=Localisatie magazijn
 WarehousesAndProducts=Magazijn en producten
 WarehousesAndProductsBatchDetail=Magazijnen en producten (met detail per lot/serieenummer)
 AverageUnitPricePMPShort=Waardering (PMP)
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=De input gemiddelde eenheidsprijs die we aan leveranciers moesten betalen om het product in onze voorraad te krijgen.
 SellPriceMin=Verkopen Prijs per Eenheid
 EstimatedStockValueSellShort=Verkoopwaarde
 EstimatedStockValueSell=Verkoopwaarde
@@ -122,9 +122,9 @@ DesiredStockDesc=Dit voorraadbedrag is de waarde die wordt gebruikt om de voorra
 StockToBuy=Te bestellen
 Replenishment=Bevoorrading
 ReplenishmentOrders=Bevoorradingsorder
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
-UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
-ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
+VirtualDiffersFromPhysical=Afhankelijk van de opties voor het verhogen / verlagen van de voorraad, kunnen fysieke voorraad en virtuele voorraad (fysieke voorraad + openstaande bestellingen) verschillen
+UseRealStockByDefault=Gebruik echte voorraad in plaats van virtuele voorraad voor de aanvullingsfunctie
+ReplenishmentCalculation=Het te bestellen bedrag is (gewenste hoeveelheid - echte voorraad) in plaats van (gewenste hoeveelheid - virtuele voorraad)
 UseVirtualStock=Gebruik virtuele voorraad
 UsePhysicalStock=Gebruik fysieke voorraad
 CurentSelectionMode=Huidige selectiemodus
@@ -133,7 +133,7 @@ CurentlyUsingPhysicalStock=Fysieke voorraad
 RuleForStockReplenishment=Regels voor bevoorrading
 SelectProductWithNotNullQty=Selecteer ten minste één product met een aantal niet nul en een leverancier
 AlertOnly= Enkel waarschuwingen
-IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
+IncludeProductWithUndefinedAlerts = Neem ook een negatieve voorraad op voor producten waarvoor geen gewenste hoeveelheid is gedefinieerd, om deze op 0 te zetten
 WarehouseForStockDecrease=De voorraad van magazijn <b>%s</b> zal verminderd worden
 WarehouseForStockIncrease=De voorraad van magazijn <b>%s</b> zal verhoogd worden
 ForThisWarehouse=Voor dit magazijn
@@ -144,7 +144,7 @@ Replenishments=Bevoorradingen
 NbOfProductBeforePeriod=Aantal op voorraad van product %s voor de gekozen periode (<%s)
 NbOfProductAfterPeriod=Aantal op voorraad van product %s na de gekozen periode (<%s)
 MassMovement=Volledige verplaatsing
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Selecteer een bronmagazijn en een doelmagazijn, een product en een hoeveelheid en klik op "%s". Zodra dit is gedaan voor alle vereiste bewegingen, klikt u op "%s".
 RecordMovement=Vastleggen verplaatsing
 ReceivingForSameOrder=Ontvangsten voor deze bestelling
 StockMovementRecorded=Geregistreerde voorraadbewegingen
@@ -231,12 +231,13 @@ StockDecrease=Voorraad afnemen
 InventoryForASpecificWarehouse=Voorraad voor een specifiek magazijn
 InventoryForASpecificProduct=Voorraad voor een specifiek product
 StockIsRequiredToChooseWhichLotToUse=Voorraad is vereist om te kiezen welk lot te gebruiken
-ForceTo=Dwingen tot
+ForceTo=Toevoegen aan
 AlwaysShowFullArbo=Volledige boomstructuur van magazijn weergeven op pop-up van magazijnkoppelingen (Waarschuwing: dit kan de prestaties drastisch verminderen)
-StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDatePastDesc=U kunt hier de echte voorraad op een bepaalde datum in het verleden bekijken
+StockAtDateFutureDesc=U kunt hier de virtuele voorraad op een bepaalde datum in de toekomst bekijken
 CurrentStock=Huidige voorraad
-InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
-UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|serial barcode)
+InventoryRealQtyHelp=Stel de waarde in op 0 om het aantal te resetten<br>Veld leeg laten of regel verwijderen om ongewijzigd te houden
+UpdateByScaning=Update door te scannen
+UpdateByScaningProductBarcode=Update door scan (product barcode)
+UpdateByScaningLot=Update door scan (partij/serie barcode)
+DisableStockChangeOfSubProduct=De-activeer tijdens deze bewerking de voorraad voor alle subproducten van deze kit.
diff --git a/htdocs/langs/nl_NL/suppliers.lang b/htdocs/langs/nl_NL/suppliers.lang
index bff19a2422c..dd087ffdb83 100644
--- a/htdocs/langs/nl_NL/suppliers.lang
+++ b/htdocs/langs/nl_NL/suppliers.lang
@@ -38,11 +38,11 @@ MenuOrdersSupplierToBill=Te factureren inkooporders
 NbDaysToDelivery=Levertijd (dagen)
 DescNbDaysToDelivery=De langste leveringstermijn van de producten van deze bestelling
 SupplierReputation=Reputatie van de leverancier
-ReferenceReputation=Reference reputation
+ReferenceReputation=Referentie reputatie
 DoNotOrderThisProductToThisSupplier=Niet bestellen
 NotTheGoodQualitySupplier=Lage kwaliteit
 ReputationForThisProduct=Reputatie
 BuyerName=Afnemer
 AllProductServicePrices=Prijzen alle producten/diensten
-AllProductReferencesOfSupplier=All references of vendor
+AllProductReferencesOfSupplier=Alle referenties van leverancier
 BuyingPriceNumShort=Prijzen van leveranciers
diff --git a/htdocs/langs/nl_NL/ticket.lang b/htdocs/langs/nl_NL/ticket.lang
index 9af5045058e..51f8fe3a18c 100644
--- a/htdocs/langs/nl_NL/ticket.lang
+++ b/htdocs/langs/nl_NL/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Types
 TicketDictCategory=Groepen
 TicketDictSeverity=Prioriteit
 TicketDictResolution=Ticket - resolutie
-TicketTypeShortBUGSOFT=Foutmelding
-TicketTypeShortBUGHARD=Storing hardware
-TicketTypeShortCOM=Commerciële vraag
 
+TicketTypeShortCOM=Commerciële vraag
 TicketTypeShortHELP=Verzoek om functionele hulp
 TicketTypeShortISSUE=Probleem of bug
 TicketTypeShortREQUEST=Verander-  of verbeteringsverzoek
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Overig
 TicketSeverityShortLOW=Laag
 TicketSeverityShortNORMAL=Normaal
 TicketSeverityShortHIGH=Hoog
-TicketSeverityShortBLOCKING=Kritiek/Bokkerend
+TicketSeverityShortBLOCKING=Kritiek, blokkerend
 
 ErrorBadEmailAddress=Veld '%s' foutief
 MenuTicketMyAssign=Mijn tickets
@@ -60,7 +58,6 @@ OriginEmail=E-mail bron
 Notify_TICKET_SENTBYMAIL=Verzend ticketbericht per e-mail
 
 # Status
-NotRead=Niet gelezen
 Read=Gelezen
 Assigned=Toegekend
 InProgress=Reeds bezig
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Met de openbare interface kunnen bezoekers ti
 TicketsAutoAssignTicket=Wijs automatisch de gebruiker toe die het ticket heeft aangemaakt
 TicketsAutoAssignTicketHelp=Bij het maken van een ticket kan de gebruiker automatisch aan het ticket worden toegewezen.
 TicketNumberingModules=Nummering module voor tickets
+TicketsModelModule=Documentsjablonen voor tickets
 TicketNotifyTiersAtCreation=Breng relatie op de hoogte bij het aanmaken
 TicketsDisableCustomerEmail=Schakel e-mails altijd uit wanneer een ticket wordt gemaakt vanuit de openbare interface
 TicketsPublicNotificationNewMessage=Stuur e-mail (s) wanneer een nieuw bericht is toegevoegd
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status gewijzigd: %s in %s
 TicketNotNotifyTiersAtCreate=Geen bedrijf melden bij aanmaken
 Unread=Niet gelezen
 TicketNotCreatedFromPublicInterface=Niet beschikbaar. Ticket is niet gemaakt vanuit de openbare interface.
-PublicInterfaceNotEnabled=Publieke interface was niet ingeschakeld
 ErrorTicketRefRequired=Naam van ticket is vereist
 
 #
diff --git a/htdocs/langs/nl_NL/trips.lang b/htdocs/langs/nl_NL/trips.lang
index 642842482c6..8d07d7709ad 100644
--- a/htdocs/langs/nl_NL/trips.lang
+++ b/htdocs/langs/nl_NL/trips.lang
@@ -110,7 +110,7 @@ ExpenseReportPayment=Onkostendeclaratie
 ExpenseReportsToApprove=Onkostendeclaraties te accorderen
 ExpenseReportsToPay=Declaraties te betalen
 ConfirmCloneExpenseReport=Weet u zeker dat u dit onkostenrapport wilt klonen?
-ExpenseReportsIk=Onkostendeclaratie kilometrage index
+ExpenseReportsIk=Configuratie van kilometervergoedingen
 ExpenseReportsRules=Regels voor onkostendeclaraties
 ExpenseReportIkDesc=U kunt de berekening van de kilometerkosten wijzigen per categorie en bereik die eerder zijn gedefinieerd. <b>d</b> is de afstand in kilometers
 ExpenseReportRulesDesc=U kunt berekeningsregels maken of bijwerken. Dit onderdeel wordt gebruikt wanneer de gebruiker een nieuw onkostenrapport maakt
@@ -145,7 +145,7 @@ nolimitbyEX_DAY=per dag (geen beperking)
 nolimitbyEX_MON=per maand (geen beperking)
 nolimitbyEX_YEA=per jaar (geen beperking)
 nolimitbyEX_EXP=per regel (geen beperking)
-CarCategory=Auto categorie
+CarCategory=Voertuig categorie
 ExpenseRangeOffset=Offset-bedrag: %s
 RangeIk=Afstand in km.
 AttachTheNewLineToTheDocument=Koppel de regel aan een geüpload document
diff --git a/htdocs/langs/nl_NL/users.lang b/htdocs/langs/nl_NL/users.lang
index 20ea6e8fba2..d22bd138009 100644
--- a/htdocs/langs/nl_NL/users.lang
+++ b/htdocs/langs/nl_NL/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Verwijderen uit groep
 PasswordChangedAndSentTo=Wachtwoord veranderd en verstuurd naar <b>%s</b>.
 PasswordChangeRequest=Wachtwoord aanpassing verzoek voor <b>%s</b>
 PasswordChangeRequestSent=Verzoek om wachtwoord te wijzigen van <b>%s</b> verstuurt naar <b>%s</b>.
+IfLoginExistPasswordRequestSent=Bij een geldig account is er een e-mail gestuurd om het wachtwoord opnieuw in te stellen.
+IfEmailExistPasswordRequestSent=Bij een geldig account is er een e-mail verzonden om het wachtwoord opnieuw in te stellen.
 ConfirmPasswordReset=Bevestig wachtwoord reset
 MenuUsersAndGroups=Gebruikers & groepen
 LastGroupsCreated=Laatste %s groepen aangemaakt
@@ -73,6 +75,7 @@ CreateInternalUserDesc=Met dit formulier kunt u een interne gebruiker in uw bedr
 InternalExternalDesc=Een <b> interne </b>-gebruiker is een gebruiker die deel uitmaakt van uw bedrijf / organisatie. <br> Een externe <b> externe </b>-gebruiker is een klant, leverancier of andere (het aanmaken van een externe gebruiker voor een derde partij kan worden gedaan vanuit het contactrecord van de derde partij). <br> <br> In beide gevallen definieert de machtiging rechten op Dolibarr, ook kan de externe gebruiker een andere menumanager hebben dan de interne gebruiker (zie Home - Setup - Display)
 PermissionInheritedFromAGroup=Toestemming verleend, omdat geërfd van een bepaalde gebruikersgroep.
 Inherited=Overgeërfd
+UserWillBe=De aangemaakte gebruiker zal zijn
 UserWillBeInternalUser=Gemaakt gebruiker een interne gebruiker te zijn (want niet gekoppeld aan een bepaalde derde partij)
 UserWillBeExternalUser=Gemaakt gebruiker zal een externe gebruiker (omdat gekoppeld aan een bepaalde derde partij)
 IdPhoneCaller=Beller ID (telefoon)
@@ -108,13 +111,15 @@ DisabledInMonoUserMode=Uitgeschakeld in onderhoudsmodus
 UserAccountancyCode=Gebruiker accounting code
 UserLogoff=Gebruiker uitgelogd
 UserLogged=Gebruiker gelogd
-DateOfEmployment=Employment date
-DateEmployment=Startdatum dienstverband
+DateOfEmployment=Datum indiensttreding
+DateEmployment=Werkgelegenheid
+DateEmploymentstart=Startdatum dienstverband
 DateEmploymentEnd=Einddatum dienstverband
+RangeOfLoginValidity=Datumbereik van inloggeldigheid
 CantDisableYourself=U kunt uw eigen gebruikersrecord niet uitschakelen
 ForceUserExpenseValidator=Validatierapport valideren
 ForceUserHolidayValidator=Forceer verlofaanvraag validator
 ValidatorIsSupervisorByDefault=Standaard is de validator de supervisor van de gebruiker. Blijf leeg om dit gedrag te behouden.
 UserPersonalEmail=Persoonlijke e-mail
 UserPersonalMobile=Persoonlijke mobiele telefoon
-WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
+WarningNotLangOfInterface=Pas op, dit is de hoofdtaal die de gebruiker spreekt, niet de taal van de interface die hij wil zien. Ga naar het tabblad %s om de de taal van de interface, die voor deze gebruiker zichtbaar is, te wijzigen
diff --git a/htdocs/langs/nl_NL/website.lang b/htdocs/langs/nl_NL/website.lang
index 855e09828b2..a2424762f54 100644
--- a/htdocs/langs/nl_NL/website.lang
+++ b/htdocs/langs/nl_NL/website.lang
@@ -30,7 +30,6 @@ EditInLine=Inline bewerken
 AddWebsite=Website toevoegen
 Webpage=Webpagina/container
 AddPage=Voeg pagina/container toe
-HomePage=Startpagina
 PageContainer=Pagina
 PreviewOfSiteNotYetAvailable=Voorbeeld van uw website <strong>%s</strong> is nog niet beschikbaar. U moet eerst '<strong>Een volledige websitesjabloon importeren</strong>' of alleen '<strong>Een pagina / container toevoegen</strong>'.
 RequestedPageHasNoContentYet=Gevraagde pagina met id %s heeft nog geen inhoud of cachebestand .tpl.php is verwijderd. Bewerk de inhoud van de pagina om dit op te lossen.
@@ -101,7 +100,7 @@ EmptyPage=Lege pagina
 ExternalURLMustStartWithHttp=Externe URL moet beginnen met http: // of https: //
 ZipOfWebsitePackageToImport=Upload het zipbestand van het website-sjabloonpakket
 ZipOfWebsitePackageToLoad=of Kies een beschikbaar ingesloten websitesjabloonpakket
-ShowSubcontainers=Neem dynamische inhoud op
+ShowSubcontainers=Toon dynamische inhoud
 InternalURLOfPage=Interne URL van pagina
 ThisPageIsTranslationOf=Deze pagina / container is een vertaling van
 ThisPageHasTranslationPages=Deze pagina / container heeft vertaling
@@ -135,5 +134,6 @@ ReplacementDoneInXPages=Vervanging gedaan in %s pagina's of containers
 RSSFeed=RSS-feeds
 RSSFeedDesc=U kunt via deze URL een RSS-feed krijgen van de nieuwste artikelen met het type 'blogpost'
 PagesRegenerated=%s pagina ('s) / container (s) her-aangemaakt
-RegenerateWebsiteContent=Regenerate web site cache files
-AllowedInFrames=Allowed in Frames
+RegenerateWebsiteContent=Genereer cachebestanden van websites opnieuw
+AllowedInFrames=Toegestaan in frames
+DefineListOfAltLanguagesInWebsiteProperties=Definieer een lijst van alle beschikbare talen in website-eigenschappen.
diff --git a/htdocs/langs/nl_NL/withdrawals.lang b/htdocs/langs/nl_NL/withdrawals.lang
index fe5dc16fe25..b8f22e173a6 100644
--- a/htdocs/langs/nl_NL/withdrawals.lang
+++ b/htdocs/langs/nl_NL/withdrawals.lang
@@ -11,7 +11,7 @@ PaymentByBankTransferLines=Overschrijvingsorderregels
 WithdrawalsReceipts=Incasso-opdrachten
 WithdrawalReceipt=Incasso-opdracht
 BankTransferReceipts=Overboekingsopdrachten
-BankTransferReceipt=Credit transfer order
+BankTransferReceipt=Betalingsopdracht
 LatestBankTransferReceipts=Laatste %s overboekingsopdrachten
 LastWithdrawalReceipts=Laatste %s incassobestanden
 WithdrawalsLine=Incasso-orderregel
@@ -40,8 +40,9 @@ CreditTransferStatistics=Overboeking statistieken
 Rejects=Verworpen
 LastWithdrawalReceipt=Laatste %s ontvangen incasso's
 MakeWithdrawRequest=Automatische incasso aanmaken
-MakeBankTransferOrder=Make a credit transfer request
+MakeBankTransferOrder=Maak een verzoek tot overboeking
 WithdrawRequestsDone=%s Betalingsverzoeken voor automatische incasso geregistreerd
+BankTransferRequestsDone=%s overboekingsverzoeken geregistreerd
 ThirdPartyBankCode=Bankcode van derden
 NoInvoiceCouldBeWithdrawed=Geen factuur afgeschreven. Controleer of de facturen betrekking hebben op bedrijven met een geldige IBAN en dat IBAN een UMR (Unique Mandate Reference) met modus <strong>%s heeft</strong> .
 ClassCredited=Classificeer creditering
@@ -63,7 +64,7 @@ InvoiceRefused=Factuur geweigerd (de afwijzing door belasten aan de klant)
 StatusDebitCredit=Status debet / credit
 StatusWaiting=Wachtend
 StatusTrans=Verzonden
-StatusDebited=Debited
+StatusDebited=Afgeschreven
 StatusCredited=Gecrediteerd
 StatusPaid=Betaald
 StatusRefused=Geweigerd
@@ -79,13 +80,13 @@ StatusMotif8=Andere reden
 CreateForSepaFRST=Maak een domiciliëringsbestand (SEPA FRST)
 CreateForSepaRCUR=Maak een domiciliëringsbestand (SEPA RCUR)
 CreateAll=Maak een domiciliëringsbestand (alles)
-CreateFileForPaymentByBankTransfer=Create file for credit transfer
+CreateFileForPaymentByBankTransfer=Maak bestand aan met overboekingen
 CreateSepaFileForPaymentByBankTransfer=Maak een overboekingsbestand (SEPA) aan
 CreateGuichet=Alleen kantoor
 CreateBanque=Alleen de bank
 OrderWaiting=Wachtend op behandeling
-NotifyTransmision=Record file transmission of order
-NotifyCredit=Record credit of order
+NotifyTransmision=Registreer bestandsoverdracht van bestelling
+NotifyCredit=Vastleggen credit order
 NumeroNationalEmetter=Nationale zender nummer
 WithBankUsingRIB=Voor bankrekeningen die gebruik maken van RIB
 WithBankUsingBANBIC=Voor bankrekeningen die gebruik maken van IBAN / BIC / SWIFT
@@ -95,10 +96,10 @@ CreditDate=Crediteer op
 WithdrawalFileNotCapable=Kan geen ontvangstbewijsbestand voor uw land genereren %s (uw land wordt niet ondersteund)
 ShowWithdraw=Incasso-opdracht weergeven
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Als de factuur echter ten minste één betalingsopdracht voor automatische incasso bevat die nog niet is verwerkt, wordt deze niet ingesteld als betaald om voorafgaand opnamebeheer mogelijk te maken.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Debit order file
-CreditTransferFile=Credit transfer file
+DoStandingOrdersBeforePayments=Op dit tabblad kunt u een betalingsopdracht voor automatische incasso aanvragen. Als u klaar bent, gaat u naar het menu Bank-> Betaling via automatische incasso om de incasso-opdracht te genereren en te beheren. Wanneer de automatische incasso-opdracht wordt afgesloten, wordt de betaling op facturen automatisch geregistreerd en worden de facturen gesloten als het te betalen restant nul is.
+DoCreditTransferBeforePayments=Op dit tabblad kunt u een overboekingsopdracht aanvragen. Als u klaar bent, gaat u naar het menu Bank-> Betaling via overschrijving om de overschrijvingsopdracht te genereren en te beheren. Wanneer de overboekingsopdracht is gesloten, wordt de betaling op facturen automatisch geregistreerd en worden de facturen gesloten als het te betalen restant nul is.
+WithdrawalFile=Debet orderbestand
+CreditTransferFile=Credit overdrachtbestand
 SetToStatusSent=Stel de status in &quot;Bestand verzonden&quot;
 ThisWillAlsoAddPaymentOnInvoice=Dit registreert ook betalingen op facturen en classificeert ze als "Betaald" als het resterende bedrag niet is betaald
 StatisticsByLineStatus=Statistieken per status van lijnen
@@ -124,14 +125,15 @@ SEPAFrstOrRecur=Soort betaling
 ModeRECUR=Terugkomende betaling
 ModeFRST=Eenmalige incasso
 PleaseCheckOne=Alleen één controleren
-CreditTransferOrderCreated=Credit transfer order %s created
+CreditTransferOrderCreated=Overboekingsopdracht %s gemaakt
 DirectDebitOrderCreated=Incasso-opdracht %s gemaakt
 AmountRequested=Aangevraagde hoeveelheid
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Uitvoeringsdatum
 CreateForSepa=Aanmaken incassobestand
-ICS=Creditor Identifier CI
+ICS=Crediteur Identifier CI voor automatische incasso
+ICSTransfer=Crediteur Identifier CI voor bankoverschrijving
 END_TO_END=&quot;EndToEndId&quot; SEPA XML-tag - Uniek ID toegewezen per transactie
 USTRD=&quot;Ongestructureerde&quot; SEPA XML-tag
 ADDDAYS=Dagen toevoegen aan uitvoeringsdatum
@@ -145,4 +147,5 @@ InfoTransData=Bedrag: %s<br>Wijze: %s<br>Datum: %s
 InfoRejectSubject=Betalingsopdracht voor automatische incasso geweigerd
 InfoRejectMessage=M,<br><br>de incasso van factuur %s voor bedrijf %s, met een bedrag van %s is geweigerd door de bank.<br><br>--<br>%s
 ModeWarning=Optie voor echte modus was niet ingesteld, we stoppen na deze simulatie
-ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorCompanyHasDuplicateDefaultBAN=Bedrijf met id %s heeft meer dan één standaard bankrekening. Er is geen manier aanwezig om te weten welke u moet gebruiken.
+ErrorICSmissing=ICS ontbreekt op bankrekening %s
diff --git a/htdocs/langs/nl_NL/workflow.lang b/htdocs/langs/nl_NL/workflow.lang
index 9d4ed65e55b..86779e7cde8 100644
--- a/htdocs/langs/nl_NL/workflow.lang
+++ b/htdocs/langs/nl_NL/workflow.lang
@@ -1,23 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
-WorkflowSetup=Workflow module setup
+WorkflowSetup=Workflow module set-up
 WorkflowDesc=Deze module biedt enkele automatische acties. Standaard is de workflow open (u kunt dingen doen in de gewenste volgorde), maar hier kunt u enkele automatische acties activeren.
 ThereIsNoWorkflowToModify=Er zijn geen wijzigingen in de workflow beschikbaar met de geactiveerde modules.
 # Autocreate
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatisch een verkooporder maken nadat een offerte is ondertekend (de nieuwe bestelling heeft hetzelfde bedrag als offerte)
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Creëer automatisch een klantfactuur nadat een offerte is ondertekend (de nieuwe factuur heeft hetzelfde bedrag als de offerte)
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Maak automatisch een klant factuur aan nadat contract is gevalideerd.
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Maak automatisch een klant factuur aan nadat een contract is gevalideerd.
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Creëer automatisch een klantfactuur nadat een verkooporder is gesloten (de nieuwe factuur heeft hetzelfde bedrag als de bestelling)
 # Autoclassify customer proposal or order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classificeer gekoppeld bronvoorstel als gefactureerd wanneer verkooporder is ingesteld op gefactureerd (en als het bedrag van de bestelling gelijk is aan het totale bedrag van het ondertekende gekoppelde voorstel)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classificeer het gekoppelde bronvoorstel als gefactureerd wanneer de klantfactuur is gevalideerd (en als het factuurbedrag gelijk is aan het totale bedrag van het ondertekende gekoppelde voorstel)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classificeer gekoppelde bronverkooporder als gefactureerd wanneer klantfactuur is gevalideerd (en als het factuurbedrag gelijk is aan het totale bedrag van de gekoppelde bestelling)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classificeer gekoppelde bronverkooporder als gefactureerd wanneer klantfactuur is ingesteld op betaald (en als het factuurbedrag gelijk is aan het totale bedrag van de gekoppelde bestelling)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classificeer gekoppelde bronverkooporder zoals verzonden wanneer een zending is gevalideerd (en als de hoeveelheid die door alle zendingen is verzonden dezelfde is als in de te updaten bestelling)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classificeer gekoppelde bronverkooporder als verzonden wanneer een zending is gevalideerd (en als de hoeveelheid die door alle zendingen is verzonden dezelfde is als in de te updaten bestelling)
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classificeer het gekoppelde bronvoorstel als gefactureerd wanneer de leveranciersfactuur is gevalideerd (en als het factuurbedrag gelijk is aan het totale bedrag van het gekoppelde voorstel)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classificeer gekoppelde inkooporder als gefactureerd wanneer leveranciersfactuur is gevalideerd (en als het factuurbedrag gelijk is aan het totale bedrag van de gekoppelde order)
-descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+descWORKFLOW_BILL_ON_RECEPTION=Classificeer ontvangsten als "gefactureerd" wanneer een gekoppelde leveranciersorder wordt gevalideerd
 # Autoclose intervention
-descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Sluit alle interventies die aan het ticket zijn gekoppeld wanneer een ticket is gesloten
 AutomaticCreation=Automatisch aanmaken
 AutomaticClassification=Automatisch classificeren
diff --git a/htdocs/langs/nl_NL/zapier.lang b/htdocs/langs/nl_NL/zapier.lang
index 770a821038b..f9f576f9fbe 100644
--- a/htdocs/langs/nl_NL/zapier.lang
+++ b/htdocs/langs/nl_NL/zapier.lang
@@ -26,4 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier voor Dolibarr-module
 # Admin page
 #
 ZapierForDolibarrSetup = Installatie van Zapier voor Dolibarr
-ZapierDescription=Interface with Zapier
+ZapierDescription=Interface met Zapier
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index f7abea4f251..873bbc8f7b6 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=Wszystkie kraje oprócz %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Główne konto księgowe dla klientów nie zdefiniowane w ustawieniach
 MainAccountForSuppliersNotDefined=Główne konto rozliczeniowe dla dostawców niezdefiniowane w konfiguracji
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Nie dowiązane do konta księgowego
 XLineSuccessfullyBinded=%sprodukty/usługi z powodzeniem dowiązane do konta księgowego
 XLineFailedToBeBinded=%s produkty/usługi nie dowiązane do żadnego konta księgowego
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Rozpocznij sortowanie strony "Dowiązania do zrobienia" po najnowszych elementach
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Rozpocznij sortowanie strony "Dowiązania ukończone" po najnowszych elementach
 
@@ -198,7 +199,8 @@ Docdate=Data
 Docref=Odniesienie
 LabelAccount=Etykieta konta
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Dziennik
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=ilość sztuk
 TransactionNumShort=Numer transakcji
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Grupuj według konta księgowego
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=Według kont
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Grupa konta
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Dowiąż automatycznie
 AutomaticBindingDone=Automatyczne dowiązanie ukończone
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index cfd5007cf51..5efc0a3727a 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Wyświetlanie
 SetupArea=Konfiguracja
 UploadNewTemplate=Załaduj nowy szablon(y)
 FormToTestFileUploadForm=Formularz do wysyłania pliku testowego (według konfiguracji)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Uwaga: tak jest skuteczne tylko wtedy, gdy <b>moduł %s</b> jest aktywny
 RemoveLock=Usuń/zmień nazwę pliku <b>%s</b> o ile istnieje, aby umożliwić korzystanie z narzędzia Aktualizuj/Instaluj.
 RestoreLock=Przywróć plik <b>%s</b> o uprawnieniach tylko do odczytu, aby wyłączyć dalsze korzystanie z narzędzia Aktualizuj/Instaluj.
@@ -85,7 +87,6 @@ ShowPreview=Pokaż podgląd
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Podgląd niedostępny
 ThemeCurrentlyActive=Temat obecnie aktywny
-CurrentTimeZone=Strefa czasowa PHP (server)
 MySQLTimeZone=Strefa czasowa MySQL (baza danych)
 TZHasNoEffect=Daty są przechowywane i zwracane przez serwer bazy danych tak, jakby były przechowywane jako przesłany ciąg. Strefa czasowa działa tylko przy użyciu funkcji UNIX_TIMESTAMP (która nie powinna być używana przez Dolibarr, więc baza danych TZ nie powinna mieć żadnego efektu, nawet jeśli zostanie zmieniona po wprowadzeniu danych).
 Space=Przestrzeń
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Ten Obszar zapewnia funkcje administracyjne. Użyj menu, aby
 Purge=Czyszczenie
 PurgeAreaDesc=Ta strona pozwala usunąć wszystkie pliki wygenerowane lub przechowywane przez Dolibarr (pliki tymczasowe lub wszystkie pliki w katalogu <b>%s</b>). Korzystanie z tej funkcji zwykle nie jest konieczne. Jest to obejście dla użytkowników, których Dolibarr jest hostowany przez dostawcę, który nie oferuje uprawnień do usuwania plików wygenerowanych przez serwer WWW.
 PurgeDeleteLogFile=Usuń pliki logu, wliczając <b>%s</b> zdefiniowany dla modułu Syslog (brak ryzyka utraty danych)
-PurgeDeleteTemporaryFiles=Usuń wszystkie pliki tymczasowe (bez ryzyka utraty danych). Uwaga: Usuwanie odbywa się tylko wtedy, gdy katalog tymczasowy został utworzony 24 godziny temu.
-PurgeDeleteTemporaryFilesShort=Usuń pliki tymczasowe
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Usuń wszystkie pliki z katalogu: <b>%s</b>.<br>Spowoduje to usunięcie wszystkich wygenerowanych dokumentów związanych z elementami (strony trzecie, faktury itp.), plików przesłanych do modułu ECM, zrzutów kopii zapasowej bazy danych i plików tymczasowych.
 PurgeRunNow=Czyść teraz
 PurgeNothingToDelete=Brak katalogu lub plików do usunięcia.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferowani Partnerzy
 OtherResources=Inne zasoby
 ExternalResources=Zasoby zewnętrzne
 SocialNetworks=Sieci społecznościowe
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=Aby zapoznać się z dokumentacją użytkownika lub dewelopera (Doc, FAQ ...), <br> zajrzyj do Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s</b></a>
 ForAnswersSeeForum=Aby znaleźć odpowiedzi na pytania / uzyskać dodatkową pomoc, możesz skorzystać z  forum Dolibarr : <br> <a href="%s" target="_blank"><b> %s</b></a>
 HelpCenterDesc1=Oto niektóre zasoby pozwalające uzyskać pomoc i wsparcie z Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=Lista katalogów szablonów OpenDocument
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Przykłady składni: <br> c: \\ mydir <br> / Home / mydir <br> DOL_DATA_ROOT / ECM / ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Aby dowiedzieć się jak stworzyć szablony dokumentów odt, przed zapisaniem ich w katalogach, zapoznaj się z dokumentacją wiki:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Pozycja Imienia / Nazwiska
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parametry do zabezpiecznie adresu URL
 SecurityTokenIsUnique=Użyj unikalnego klucza zabezpieczeń dla każdego adresu
 EnterRefToBuildUrl=Wprowadź odwołanie do obiektu %s
 GetSecuredUrl=Pobierz obliczony adres URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Poprzednia stawka VAT
 NewVATRates=Nowa stawka VAT
 PriceBaseTypeToChange=Zmiana dla cen opartych na wartości referencyjnej ustalonej na
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Nowe menu
 MenuHandler=Menu obsługi
 MenuModule=Źródło modułu
-HideUnauthorizedMenu= Ukryj nieautoryzowane menu (wyszarz)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu obsługi gdzie pokazać nowe menu
 DetailMenuModule=Moduł nazwę w menu, jeśli pochodzą z modułem
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Kod pocztowy
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/pl_PL/banks.lang b/htdocs/langs/pl_PL/banks.lang
index 58fe92e5f58..2da0c9d11cd 100644
--- a/htdocs/langs/pl_PL/banks.lang
+++ b/htdocs/langs/pl_PL/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/pl_PL/blockedlog.lang b/htdocs/langs/pl_PL/blockedlog.lang
index 8ca78fd8046..dae949d1149 100644
--- a/htdocs/langs/pl_PL/blockedlog.lang
+++ b/htdocs/langs/pl_PL/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/pl_PL/boxes.lang b/htdocs/langs/pl_PL/boxes.lang
index 3c3730b9e9c..9d93c3e1e90 100644
--- a/htdocs/langs/pl_PL/boxes.lang
+++ b/htdocs/langs/pl_PL/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Ostatnich %s zmodyfikowanych dotacji
 BoxTitleLastModifiedExpenses=Ostatnich %s zmodyfikowanych raportów kosztów
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Globalna aktywność (faktury, wnioski, zamówienia)
 BoxGoodCustomers=Dobrzy klienci
 BoxTitleGoodCustomers=%s dobrych klientów
+BoxScheduledJobs=Zaplanowane zadania
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Data ostatniego odświeżenia
 NoRecordedBookmarks=Brak zdefiniowanych zakładek
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Księgowość
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/pl_PL/cashdesk.lang b/htdocs/langs/pl_PL/cashdesk.lang
index 337d7d5708e..f420c946b3c 100644
--- a/htdocs/langs/pl_PL/cashdesk.lang
+++ b/htdocs/langs/pl_PL/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Ilość faktur
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/pl_PL/categories.lang b/htdocs/langs/pl_PL/categories.lang
index a6dfccaf849..b0372678bc6 100644
--- a/htdocs/langs/pl_PL/categories.lang
+++ b/htdocs/langs/pl_PL/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Obszar tagów / kategorii projektów
 UsersCategoriesArea=Obszar znaczników/kategorii użytkowników
 SubCats=Podkategorie
 CatList=Lista tagów / kategorii
+CatListAll=List of tags/categories (all types)
 NewCategory=Nowy tag / kategoria
 ModifCat=Modyfikuj tag/kategorię
 CatCreated=Tag / kategoria stworzona
@@ -65,16 +66,22 @@ UsersCategoriesShort=Znaczniki/kategorie użytkowników
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag / ID kategorii
-CatSupList=List of vendor tags/categories
-CatCusList=Lista klientów / perspektywa tagów / kategorii
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Lista tagów/kategorii produktów
 CatMemberList=Lista tagów/kategorii członków
-CatContactList=Lista tagów/kategorii kontaktu
-CatSupLinks=Powiązania między dostawcami i tagami/kategoriami
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Powiązania między klientami / perspektyw i tagów / kategorii
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Powiązania między produktami/usługami i tagami/kategoriami
-CatProJectLinks=Połączenia pomiędzy projektami a tagami / kategoriami
+CatMembersLinks=Związki między członkami i tagów / kategorii
+CatProjectsLinks=Połączenia pomiędzy projektami a tagami / kategoriami
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Usuń z tagów/kategorii
 ExtraFieldsCategories=Atrybuty uzupełniające
 CategoriesSetup=Tagi / kategorie Konfiguracja
diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang
index 0c7c3c2eb09..c5d2714854e 100644
--- a/htdocs/langs/pl_PL/companies.lang
+++ b/htdocs/langs/pl_PL/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Brak możliwości sprawdzenia. Usługa nie jest dostarczana dla wybranego regionu (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Pracownicy
 ProspectLevelShort=Potencjał
diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang
index 1596c31aaa7..cb71232d049 100644
--- a/htdocs/langs/pl_PL/compta.lang
+++ b/htdocs/langs/pl_PL/compta.lang
@@ -111,7 +111,7 @@ Refund=Zwrot
 SocialContributionsPayments=Płatności za ZUS/podatki
 ShowVatPayment=Pokaż płatności za podatek VAT
 TotalToPay=Razem do zapłaty
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Kod księg. klienta
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Jesteś pewien/a, że chcesz oznaczyć tą opła
 ExportDataset_tax_1=Składki ZUS, podatki i płatności
 CalcModeVATDebt=<b>Tryb% Svat na rachunkowości zaangażowanie% s.</b>
 CalcModeVATEngagement=<b>Tryb% Svat na dochody-wydatki% s.</b>
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= <b>Tryb% SRE faktur klienta - dostawcy wystawia faktury% s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Saldo przychodów i kosztów, roczne podsumowanie
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Kwoty podane są łącznie z podatkami
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- Obejmuje rzeczywiste płatności dokonywane za faktury, koszty, podatek VAT oraz wynagrodzenia. <br> Opiera się na  datach płatności faktur, wygenerowania kosztów, podatku VAT oraz wynagrodzeń. Dla darowizn brana jest pod uwagę data przekazania darowizny.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Sprawozdanie trzecim RE partii
 LT2ReportByCustomersES=Raport osób trzecich IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/pl_PL/cron.lang b/htdocs/langs/pl_PL/cron.lang
index 745767075eb..68a5f84d9e3 100644
--- a/htdocs/langs/pl_PL/cron.lang
+++ b/htdocs/langs/pl_PL/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Stwórz/zaktualizuj zaplanowane zadanie
 Permission23103 = Usuń zaplanowane zadanie
 Permission23104 = Wykonaj zaplanowane zadanie
 # Admin
-CronSetup= Konfiguracja zarządzania zaplanowanymi zadaniami
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Albo sprawdzić i uruchomić określonej pracy
+CronSetup=Konfiguracja zarządzania zaplanowanymi zadaniami
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Klucz zabezpieczeń dla URL, aby uruchomić cron
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=W środowisku Unix należy użyć następującego wpisu crontab, aby uruchomić wiersz poleceń co 5 minut
-CronExplainHowToRunWin=W środowisku Microsoft Windows(tm) można użyć narzędzia  Zaplanowane zadania, aby uruchomić linię poleceń co 5 minut
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Klasa %s nie zawiera żadnej metody %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -42,10 +43,11 @@ CronModule=Moduł
 CronNoJobs=Brak zarejestrowanych zadań
 CronPriority=Priorytet
 CronLabel=Etykieta
-CronNbRun=Ilość uruchomień
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Każdy
 JobFinished=Zadania uruchomione i zakończone
+Scheduled=Scheduled
 #Page card
 CronAdd= Dodaj zadanie
 CronEvery=Wykonaj każde zadanie
@@ -56,16 +58,16 @@ CronNote=Komentarz
 CronFieldMandatory=Pole %s jest obowiązkowe
 CronErrEndDateStartDt=Data zakończenia nie może być wcześniejsza niż data rozpoczęcia
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Włączone
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Wyłączone
 CronTaskInactive=To zadanie jest wyłączone
 CronId=ID
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=System linii poleceń do wykonania.
 CronCreateJob=Utwórz nowe zaplanowane zadanie
 CronFrom=Z
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Polecenie powłoki
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Idź do "Strona główna - Narzędzia administracyjne - Zaplanowane zadania" aby zobaczyć i zmieniać zaplanowane zadania
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Zadanie wyłączone
 MakeLocalDatabaseDumpShort=Backup lokalnej bazy danych
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index 13d89600986..bd9179e37d9 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Nie ma błędu, zobowiązujemy
 # Errors
 ErrorButCommitIsDone=Znalezione błędy, ale mimo to możemy potwierdzić
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s jest błędny
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Zaloguj %s już istnieje.
 ErrorGroupAlreadyExists=Grupa %s już istnieje.
 ErrorRecordNotFound=Rekord nie został znaleziony.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Niektóre pola wymagane nie były uzupełnione.
 ErrorSubjectIsRequired=Temat wiadomości jest wymagany
 ErrorFailedToCreateDir=Nie można utworzyć katalogu. Sprawdź, czy serwer WWW użytkownik ma uprawnienia do zapisu do katalogu dokumentów Dolibarr. Jeśli parametr <b>safe_mode</b> jest włączona w tym PHP, czy posiada Dolibarr php pliki do serwera internetowego użytkownika (lub grupy).
 ErrorNoMailDefinedForThisUser=Nie określono adresu email dla tego użytkownika
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Ta funkcja wymaga do pracy aktywowanego JavaScript. Zmień to w konfiguracji - wyświetlanie.
 ErrorTopMenuMustHaveAParentWithId0=Menu typu "góry" nie może mieć dominującej menu. Umieść 0 dominującej w menu lub wybrać z menu typu "Lewy".
 ErrorLeftMenuMustHaveAParentId=Menu typu "Lewy" musi mieć identyfikator rodzica.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Ta nazwa profil już istnieje dla tego zestawu ekspor
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP dopasowywania nie jest kompletna.
 ErrorLDAPMakeManualTest=A. LDIF plik został wygenerowany w katalogu %s. Spróbuj załadować go ręcznie z wiersza polecenia, aby mieć więcej informacji na temat błędów.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Numer identyfikacyjny używany do tworzenia już istnieje.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=Hasło zostało ustawione dla tego użytkownika. Jednakże nie Konto użytkownika zostało utworzone. Więc to hasło jest przechowywane, ale nie mogą być używane do logowania do Dolibarr. Może być stosowany przez zewnętrzny moduł / interfejsu, ale jeśli nie trzeba definiować dowolną logowania ani hasła do członka, można wyłączyć opcję "Zarządzaj login dla każdego członka" od konfiguracji modułu użytkownika. Jeśli potrzebujesz zarządzać logowanie, ale nie wymagają hasła, możesz zachować to pole puste, aby uniknąć tego ostrzeżenia. Uwaga: E może być również stosowany jako login, jeśli element jest połączony do użytkownika.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Twój login został zmodyfikowany. Z powo
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/pl_PL/exports.lang b/htdocs/langs/pl_PL/exports.lang
index dd5e8ee3731..4a291b908d4 100644
--- a/htdocs/langs/pl_PL/exports.lang
+++ b/htdocs/langs/pl_PL/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=pole tytuł
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Biblioteka
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Krok
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=ilość wprowadzonych linii: %s
 NbUpdate=Ilość zaktualizowanych linii: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/pl_PL/mails.lang b/htdocs/langs/pl_PL/mails.lang
index 10ef6063468..ce291b8154c 100644
--- a/htdocs/langs/pl_PL/mails.lang
+++ b/htdocs/langs/pl_PL/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Linia w pliku %s
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=Nie wysłano wiadomości email. Zły email nadawcy lub odbiorcy. Sprawdź profil użytkownika.
 # Module Notifications
 Notifications=Powiadomienia
-NoNotificationsWillBeSent=Brak planowanych powiadomień mailowych dla tego wydarzenia i firmy
-ANotificationsWillBeSent=1 zgłoszenie zostanie wysłane pocztą elektroniczną
-SomeNotificationsWillBeSent=%s powiadomienia będą wysyłane przez e-mail
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=Lista wszystkich powiadomień wysłanych maili
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Konfiguracja poczty e-mail wysyłającego musi być połączone z '% s'. Tryb ten może być wykorzystywany do wysyłania masowego wysyłania.
 MailSendSetupIs2=Najpierw trzeba przejść, z konta administratora, w menu% sHome - Ustawienia - e-maile% s, aby zmienić parametr <strong>'% s'</strong> na tryb '% s' używać. W tym trybie można wprowadzić ustawienia serwera SMTP dostarczonych przez usługodawcę internetowego i używać funkcji e-maila Mszę św.
 MailSendSetupIs3=Jeśli masz jakieś pytania na temat konfiguracji serwera SMTP, możesz zapytać %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Informacja
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index 401ac7b9b3c..38a2f882bf5 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Szablon niedostępny dla tego typu wiadomości email
 AvailableVariables=Dostępne zmienne substytucji
 NoTranslation=Brak tłumaczenia
 Translation=Tłumaczenie
+CurrentTimeZone=Strefa czasowa PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Rekord nie został znaleziony.
 NoRecordDeleted=Brak usuniętych rekordów
 NotEnoughDataYet=Za mało danych
@@ -85,6 +87,8 @@ FileWasNotUploaded=Wybrano pliku do zamontowaia, ale jeszcze nie wysłano. W tym
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Przeczytaj pomoc online (wymaga połączenia z internetem)
 GoToHelpPage=Przeczytaj pomoc
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Strona główna
 RecordSaved=Rekord zapisany
 RecordDeleted=Rekord usunięty
 RecordGenerated=Rekord wygenerowany
@@ -433,6 +437,7 @@ RemainToPay=Pozostało do zapłaty
 Module=Moduł/Aplikacja
 Modules=Moduły/Aplikacje
 Option=Opcja
+Filters=Filters
 List=Lista
 FullList=Pełna lista
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Wyślij wiadomość email
 Email=Adres e-mail
 NoEMail=Brak e-mail
 AlreadyRead=Obecnie przeczytane
-NotRead=Nie przeczytane
+NotRead=Unread
 NoMobilePhone=Brak telefonu komórkowego
 Owner=Właściciel
 FollowingConstantsWillBeSubstituted=Kolejna zawartość będzie zastąpiona wartością z korespondencji.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=Wstrzymany
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/pl_PL/modulebuilder.lang b/htdocs/langs/pl_PL/modulebuilder.lang
index d9d1d794c77..e2346e75b40 100644
--- a/htdocs/langs/pl_PL/modulebuilder.lang
+++ b/htdocs/langs/pl_PL/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang
index 42937a4dc0d..fb0923edbcb 100644
--- a/htdocs/langs/pl_PL/other.lang
+++ b/htdocs/langs/pl_PL/other.lang
@@ -5,8 +5,6 @@ Tools=Narzędzia
 TMenuTools=Narzędzia
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Urodziny
-BirthdayDate=Data urodzin
-DateToBirth=Birth date
 BirthdayAlertOn=urodziny wpisu aktywnych
 BirthdayAlertOff=urodziny wpisu nieaktywne
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Rozłączono. Idź do strony logowania...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Wybierz profil demo najlepiej odzwierciedlający twoje potrzeby...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Prawo
 CalculatedWeight=Obliczona waga
 CalculatedVolume=Obliczona wartość
 Weight=Waga
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Wywóz obszarze
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index bac16142cef..cadfc326e95 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Ilość cen
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Liczba dominującej opakowaniu produktu
@@ -167,8 +168,10 @@ BuyingPrices=Cena zakupu
 CustomerPrices=Ceny klienta
 SuppliersPrices=Ceny dostawców
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Kraj pochodzenia
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Zastosuj stałą cenę
 PriceByQuantity=Różne ceny według ilości
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Zakres ilości
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% Zmiany na% s
 PercentDiscountOver=%% Rabatu na% s
diff --git a/htdocs/langs/pl_PL/recruitment.lang b/htdocs/langs/pl_PL/recruitment.lang
index 8faa1e9912f..d1f573b8bf9 100644
--- a/htdocs/langs/pl_PL/recruitment.lang
+++ b/htdocs/langs/pl_PL/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/pl_PL/sendings.lang b/htdocs/langs/pl_PL/sendings.lang
index 69db52a7677..1b1f4fc5baf 100644
--- a/htdocs/langs/pl_PL/sendings.lang
+++ b/htdocs/langs/pl_PL/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Inne wysyłki do tego zamówienia
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Transporty do zatwierdzenia
 StatusSendingCanceled=Anulowany
+StatusSendingCanceledShort=Anulowany
 StatusSendingDraft=Szkic
 StatusSendingValidated=Zatwierdzone (produkty do wysyłki lub już wysłane)
 StatusSendingProcessed=Przetwarzany
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=W pierwszej kolejności musisz zatwierdzić zam
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Więcej kompletny dokument model dostawy wpływy (logo. ..)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Stała EXPEDITION_ADDON_NUMBER nie zdefiniowano
 SumOfProductVolumes=Suma wolumenów
 SumOfProductWeights=Suma wag produktów
diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang
index b7b0ba0716a..661f8362a47 100644
--- a/htdocs/langs/pl_PL/stocks.lang
+++ b/htdocs/langs/pl_PL/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/pl_PL/ticket.lang b/htdocs/langs/pl_PL/ticket.lang
index e33e54c62e2..457e5110c6b 100644
--- a/htdocs/langs/pl_PL/ticket.lang
+++ b/htdocs/langs/pl_PL/ticket.lang
@@ -18,23 +18,21 @@
 # Generic
 #
 
-Module56000Name=Tickets
+Module56000Name=Bilety
 Module56000Desc=System biletów do zarządzania kwestiami lub żądaniami
 
-Permission56001=See tickets
-Permission56002=Modify tickets
-Permission56003=Delete tickets
-Permission56004=Manage tickets
+Permission56001=Zobacz bilety
+Permission56002=Modyfikuj bilety
+Permission56003=Usuwaj bilety
+Permission56004=Zarządzaj biletami
 Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
 
-TicketDictType=Ticket - Types
+TicketDictType=Bilet - Typ
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Inne
 TicketSeverityShortLOW=Niski
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Wysoki
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Czytać
 Assigned=Assigned
 InProgress=W trakcie
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/pl_PL/website.lang b/htdocs/langs/pl_PL/website.lang
index 2d9b4e9aa97..bb7ff022723 100644
--- a/htdocs/langs/pl_PL/website.lang
+++ b/htdocs/langs/pl_PL/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edytuj w linii
 AddWebsite=Dodaj witrynę
 Webpage=Strona/pojemnik
 AddPage=Dodaj stronę
-HomePage=Strona główna
 PageContainer=Strona
 PreviewOfSiteNotYetAvailable=Podgląd Twej witryny <strong>%s</strong> nie jest jeszcze dostępny. Użyj wpierw '<strong>Załaduj szablon witryny</strong>' lub '<strong>Dodaj stronę/pojemnik</strong>'.
 RequestedPageHasNoContentYet=Żądana strona o identyfikatorze %s nie ma jeszcze treści lub plik pamięci podręcznej .tpl.php został usunięty. Edytuj zawartość strony, aby to rozwiązać.
@@ -101,7 +100,7 @@ EmptyPage=Pusta strona
 ExternalURLMustStartWithHttp=Zewnętrzny adres URL musi zaczynać się od http:// lub https://
 ZipOfWebsitePackageToImport=Prześlij plik Zip pakietu szablonu witryny
 ZipOfWebsitePackageToLoad=lub Wybierz jakiś dostępny wbudowany pakiet szablonu web witryny
-ShowSubcontainers=Uwzględnij zawartość dynamiczną
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Wewnętrzny adres URL strony
 ThisPageIsTranslationOf=Ta strona/pojemnik to tłumaczenie
 ThisPageHasTranslationPages=Ta strona/pojemnik ma tłumaczenie
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/pl_PL/withdrawals.lang b/htdocs/langs/pl_PL/withdrawals.lang
index a9750a149e1..7c324b5c093 100644
--- a/htdocs/langs/pl_PL/withdrawals.lang
+++ b/htdocs/langs/pl_PL/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Klasyfikacja zapisane
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Opcja dla trybu rzeczywistego nie był ustawiony, zatrzymujemy po tej symulacji
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/pt_AO/main.lang b/htdocs/langs/pt_AO/main.lang
new file mode 100644
index 00000000000..2e691473326
--- /dev/null
+++ b/htdocs/langs/pt_AO/main.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
+SeparatorDecimal=.
+SeparatorThousand=,
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%I:%M %p
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%m/%d/%Y %I:%M %p
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang
index d453360b552..e4b7f6b2454 100644
--- a/htdocs/langs/pt_BR/accountancy.lang
+++ b/htdocs/langs/pt_BR/accountancy.lang
@@ -87,7 +87,6 @@ VentilatedinAccount=Vinculado a conta contábil com sucesso
 NotVentilatedinAccount=Não vinculado a conta contábil
 XLineSuccessfullyBinded=%s produtos / serviços vinculados com sucesso a uma conta contábil
 XLineFailedToBeBinded=%s produtos/serviços não estão vinculados a qualquer conta da Contabilidade
-ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a vincular mostrados por página (máximo recomendado: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Iniciar a página "Vinculações a fazer" ordenando pelos elementos mais recentes
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Iniciar a página "Vinculações feitas" ordenando pelos elementos mais recentes
 ACCOUNTING_LENGTH_DESCRIPTION=Truncar a descrição de Produtos & Serviços nas listagens, após x caracteres (Melhor = 50)
@@ -122,10 +121,8 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Conta contábil padrão para os serviços vendid
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Conta contábil por padrão para os serviços vendidos na EEC (usada se não definida na ficha de serviço)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Conta contábil por padrão para os serviços vendidos e exportados para fora do EEC (usados ​​se não definidos na ficha de serviço)
 LabelAccount=Conta rótulo
-Sens=Significado
 JournalLabel=Rótulo de jornal
 TransactionNumShort=Nº da transação
-GroupByAccountAccounting=Agrupar pela conta da Contabilidade
 AccountingAccountGroupsDesc=Você pode definir aqui alguns grupos de contabilidade. Eles serão usados ​​para relatórios contábeis personalizados.
 NotMatch=Não Definido
 DelMonth=Mês a excluir
@@ -153,7 +150,6 @@ UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Conta de terceiro
 OpeningBalance=Saldo inicial
 ShowOpeningBalance=Mostrar saldo inicial
 HideOpeningBalance=Ocultar saldo inicial
-ShowSubtotalByGroup=Mostrar subtotal por grupo
 Pcgtype=Plano de Contas
 PcgtypeDesc=O grupo de contas é usado como critério predefinido de 'filtro' e 'agrupamento' para alguns relatórios contábeis. Por exemplo, 'RENDA' ou 'DESPESA' são usados ​​como grupos para contas contábeis de produtos para criar o relatório de despesas / receitas.
 Reconcilable=Reconciliável
@@ -172,7 +168,6 @@ DescClosure=Consulte aqui o número de movimentos por mês que não são validad
 OverviewOfMovementsNotValidated=Etapa 1 / Visão geral dos movimentos não validados. (Necessário para fechar um ano fiscal)
 ValidateMovements=Validar movimentações
 DescValidateMovements=Qualquer modificação ou exclusão de escrita, letras e exclusões será proibida. Todas as entradas para um exercício devem ser validadas, caso contrário, o fechamento não será possível
-SelectMonthAndValidate=Selecionar mês e validar movimentações
 ValidateHistory=Vincular Automaticamente
 AutomaticBindingDone=Vinculação automática realizada
 ErrorAccountancyCodeIsAlreadyUse=Erro, você não pode excluir esta conta contábil, pois ela esta em uso
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index a6c2222a0d7..b3ead82fa80 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -33,6 +33,8 @@ UnlockNewSessions=Remover Bloqueio de Conexão
 YourSession=Sua Sessão
 Sessions=Sessões de Usuários
 WebUserGroup=Servidor Web para usuário/grupo
+PermissionsOnFilesInWebRoot=Permissões em arquivos no diretório raiz da web
+PermissionsOnFile=Permissões no arquivo %s
 NoSessionFound=Sua configuração do PHP parece não permitir listar as sessões ativas. O diretório usado para salvar sessões (<b>%s</ b>) pode estar protegido (por exemplo, pelas permissões do sistema operacional ou pela diretiva PHP "open_basedir").
 DBStoringCharset=Charset base de dados para armazenamento de dados (Database charset to store data)
 DBSortingCharset=Charset base de dados para classificar os dados (Database charset to sort data)
@@ -71,7 +73,6 @@ UsePreviewTabs=Usar previsão de digitação na tecla 'tab'
 ShowPreview=Mostrar Previsão
 PreviewNotAvailable=Previsão Indisponível
 ThemeCurrentlyActive=Tema Ativo
-CurrentTimeZone=Timezone PHP (do servidor apache)
 MySQLTimeZone=Timezone Mysql (do servidor sql)
 NextValue=Próximo Valor
 NextValueForInvoices=Próximo Valor (Faturas)
@@ -121,7 +122,6 @@ SystemToolsAreaDesc=Essa área dispõem de funções administrativas. Use esse m
 Purge=Purgar (apagar tudo)
 PurgeAreaDesc=Esta página permite deletar todos os arquivos gerados ou armazenados pelo Dolibarr (arquivos temporários ou todos os arquivos no diretório <b>%s</b>). Este recurso é fornecido como uma solução alternativa aos usuários cujo a instalação esteja hospedado num servidor que impeça o acesso as pastas onde os arquivos gerados pelo Dolibarr são armazenados, para excluí-los.
 PurgeDeleteLogFile=Excluir os arquivos de registro, incluindo o <b>%s</b> definido pelo módulo Syslog (não há risco de perda de dados)
-PurgeDeleteTemporaryFilesShort=Excluir arquivos temporários
 PurgeDeleteAllFilesInDocumentsDir=Eliminar todos os arquivos do diretório <b>%s</b>. Isto irá excluir todos documentos (Terceiros, faturas, ...), arquivos carregados no módulo ECM, Backups e arquivos temporários
 PurgeRunNow=Purgar(Apagar) Agora
 PurgeNothingToDelete=Sem diretório ou arquivos para excluir
@@ -214,6 +214,7 @@ MAIN_MAIL_AUTOCOPY_TO=Copiar (Cco) todos os e-mails enviados para
 MAIN_DISABLE_ALL_MAILS=Desativar todo o envio de e-mail (para fins de teste ou demonstrações)
 MAIN_MAIL_FORCE_SENDTO=Envie todos os e-mails para (em vez de destinatários reais, para fins de teste)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Sugira e-mails de funcionários (se definidos) na lista de destinatários predefinidos ao escrever um novo e-mail
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autorizar certificados auto-assinados
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use o DKIM para gerar assinatura de e-mail
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Domínio de e-mail para uso com o dkim
 MAIN_SMS_SENDMODE=Método usado para enviar SMS
@@ -272,7 +273,6 @@ LanguageFilesCachedIntoShmopSharedMemory=Os arquivos .lang foram carregados na m
 LanguageFile=Arquivo de idioma
 ListOfDirectories=Lista de diretórios com templates de documentos abertos(.odt)
 ListOfDirectoriesForModelGenODT=A lista de diretórios contém modelos de arquivos no formato OpenDocument.<br><br>Insira aqui o caminho dos diretórios.<br>Adicione uma quebra de linha entre cada diretório.<br>Para adicionar um diretório do módulo GED, adicione aqui <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Os arquivos  nestes diretórios devem terminar com <b>.odt</b> ou <b>.ods</b>.
-ExampleOfDirectoriesForModelGen=Exemplo de sintaxe:<br>c:\\meudir<br>/home/meudir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Para saber como criar seus temas de documento em ODT, antes de armazená-los nesses diretórios, leia a documentação wiki:
 FirstnameNamePosition=Posição do Nome/Sobrenome
 KeyForWebServicesAccess=Chave para usar o Serviços Web (parâmetro "dolibarrkey" no serviço web)
@@ -1183,7 +1183,6 @@ MenuDeleted=Menu Deletado
 NotTopTreeMenuPersonalized=Menus personalizados não conectados à uma entrada do menu superior
 NewMenu=Novo Menu
 MenuModule=Fonte do módulo
-HideUnauthorizedMenu=Esconder menus não autorizados (cinza)
 DetailId=Menu ID
 DetailMenuHandler=Gestor de menu onde mostra novo menu
 DetailMenuModule=Nome do módulo se a entrada do menu vier de um módulo
@@ -1380,8 +1379,6 @@ EmailCollectorDescription=Adicione um trabalho agendado e uma página de configu
 NewEmailCollector=Novo coletor de e-mail
 MaxEmailCollectPerCollect=Número máximo de e-mails coletados por coleta
 ConfirmCloneEmailCollector=Tem certeza de que deseja clonar o coletor de e-mail %s?
-DateLastCollectResult=Data da última coleta testada
-DateLastcollectResultOk=Data da última coleta bem-sucedida
 LastResult=Último resultado
 EmailCollectorConfirmCollectTitle=Confirmação de recebimento de e-mail
 EmailCollectorConfirmCollect=Deseja executar a coleta deste coletor agora?
@@ -1449,4 +1446,7 @@ RssNote=Nota: Cada definição de feed RSS fornece um widget que você deve ativ
 JumpToBoxes=Vá para Configuração -> Widgets
 MeasuringUnitTypeDesc=Use aqui um valor como "tamanho", "superfície", "volume", "peso", "tempo"
 MeasuringScaleDesc=A escala é o número de casas que você precisa mover a parte decimal para corresponder à unidade de referência padrão. Para o tipo de unidade "time", é o número de segundos. Valores entre 80 e 99 são valores reservados.
+TemplateAdded=Modelo adicionado
+TemplateUpdated=Modelo atualizado
+TemplateDeleted=Modelo excluído
 DictionaryProductNature=Natureza do produto
diff --git a/htdocs/langs/pt_BR/banks.lang b/htdocs/langs/pt_BR/banks.lang
index 8b5063b041d..e57792e9621 100644
--- a/htdocs/langs/pt_BR/banks.lang
+++ b/htdocs/langs/pt_BR/banks.lang
@@ -134,8 +134,6 @@ ShowVariousPayment=Mostrar pagamento diverso
 AddVariousPayment=Adicionar pagamento diverso
 YourSEPAMandate=Seu mandato Área Única de Pagamentos em Euros
 AutoReportLastAccountStatement=Preencha automaticamente o campo 'número de extrato bancário' com o último número de extrato ao fazer a reconciliação
-CashControl=Caixa de dinheiro PDV
-NewCashFence=Nova caixa
 BankColorizeMovement=Colorir movimentos
 BankColorizeMovementDesc=Se esta função estiver ativada, você poderá escolher uma cor de plano de fundo específica para movimentos de débito ou crédito
 BankColorizeMovementName1=Cor de fundo para movimento de débito
diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang
index 34fb1404b65..a20be8fd4bd 100644
--- a/htdocs/langs/pt_BR/bills.lang
+++ b/htdocs/langs/pt_BR/bills.lang
@@ -2,11 +2,8 @@
 BillsCustomer=Fatura de cliente
 BillsCustomersUnpaid=Faturas de clientes não pagos
 BillsCustomersUnpaidForCompany=Faturas de clientes não pagas para %s
-BillsSuppliersUnpaid=Faturas de fornecedores não pagas
-BillsSuppliersUnpaidForCompany=Faturas de fornecedores não pagas para %s
 BillsLate=Pagamentos atrasados
 BillsStatistics=Estatísticas de faturas de clientes
-BillsStatisticsSuppliers=Estatísticas de faturas de fornecedores
 DisabledBecauseDispatchedInBookkeeping=Desativado porque a nota fiscal foi despachada na contabilidade
 DisabledBecauseNotLastInvoice=Desativado porque a fatura não é apagável. Algumas faturas foram gravadas após esta e ele criará buracos no balcão.
 DisabledBecauseNotErasable=Desativada já que não pode ser apagada
@@ -42,16 +39,13 @@ InvoiceCustomer=Fatura de cliente
 CustomerInvoice=Fatura de cliente
 CustomersInvoices=Faturas de clientes
 SupplierInvoice=Fatura do fornecedores
-SuppliersInvoices=Faturas de fornecedores
 SupplierBill=Fatura do fornecedores
 SupplierBills=Faturas de fornecedores
 PaymentBack=Reembolso
 CustomerInvoicePaymentBack=Reembolso
-PaymentsBack=Reembolsos
 PaidBack=Reembolso pago
 DeletePayment=Deletar pagamento
 ConfirmDeletePayment=Você tem certeza que deseja excluir este pagamento?
-ConfirmConvertToReduc=Deseja converter este %s em um crédito disponível?
 ConfirmConvertToReduc2=O valor será salvo junto a todos os descontos e poderá ser usado como desconto em uma fatura atual ou futura deste cliente.
 ConfirmConvertToReducSupplier=Deseja converter este %s em um crédito disponível?
 ConfirmConvertToReducSupplier2=O valor será salvo junto a todos os descontos e poderá ser usado como desconto em uma fatura atual ou futura deste fornecedor.
@@ -63,15 +57,12 @@ PaymentsReportsForYear=Relatórios de pagamentos por %s
 PaymentsAlreadyDone=Pagamentos já feitos
 PaymentsBackAlreadyDone=Reembolsos já realizados
 PaymentRule=Regra de pagamento
-PaymentMode=Tipo de pagamento
 PaymentTypeDC=Cartão de débito / crédito
 IdPaymentMode=Tipo de pagamento (id)
 CodePaymentMode=Tipo de pagamento (código)
 LabelPaymentMode=Tipo de pagamento (etiqueta)
 PaymentModeShort=Tipo de pagamento
 PaymentTerm=Termo de pagamento
-PaymentConditions=Termos de pagamento
-PaymentConditionsShort=Termos de pagamento
 PaymentAmount=Valor a ser pago
 PaymentHigherThanReminderToPay=Pagamento superior ao valor a ser pago
 ClassifyPaid=Classificar 'pago'
@@ -199,7 +190,6 @@ SendReminderBillByMail=Enviar o restante por e-mail
 RelatedRecurringCustomerInvoices=Faturas recorrentes relacionadas ao cliente
 MenuToValid=Validar
 ClassifyBill=Classificar fatura
-SupplierBillsToPay=Faturas de fornecedores não pagas
 CustomerBillsUnpaid=Faturas de clientes não pagos
 SetConditions=Definir condições de pagamento
 SetMode=Definir tipo de pagamento
@@ -217,7 +207,6 @@ ExportDataset_invoice_1=Faturas do cliente e detalhes da fatura
 ExportDataset_invoice_2=Faturas de clientes e pagamentos
 ProformaBill=Conta pro-forma:
 Reductions=Reduções
-ReductionsShort=Disco.
 AddDiscount=Criar desconto
 EditGlobalDiscounts=Editar desconto fixo
 ShowDiscount=Mostrar desconto
@@ -252,7 +241,6 @@ DescTaxAndDividendsArea=Esta área apresenta um resumo de todos os pagamentos fe
 NbOfPayments=Nº. de pagamentos
 SplitDiscount=Dividir desconto em dois
 ConfirmSplitDiscount=Tem certeza de que deseja dividir este desconto de <b>%s</b> %s em dois descontos menores?
-TotalOfTwoDiscountMustEqualsOriginal=O total dos dois novos descontos deve ser igual ao valor do desconto original.
 ConfirmRemoveDiscount=Você tem certeza que deseja remover este desconto?
 RelatedSupplierInvoices=Faturas de fornecedores relacionadas
 LatestRelatedBill=Últimas fatura correspondente
@@ -296,11 +284,9 @@ PaymentTypeTRA=Cheque administrativo
 PaymentTypeShortTRA=Minuta
 BankDetails=Detalhes bancário
 BankCode=Código bancário
-DeskCode=Código da Agência
 BankAccountNumber=Número da conta
 BankAccountNumberKey=Soma de verificação
 Residence=Endereço
-IBANNumber=Número da conta IBAN
 IBAN=Agencia
 CustomerIBAN=IBAN do cliente
 SupplierIBAN=IBAN do fornecedor
@@ -319,7 +305,6 @@ IntracommunityVATNumber=ID do IVA intracomunitário
 PaymentByChequeOrderedTo=Cheque pagamentos (incluindo impostos) são pagas para %s, enviar para
 PaymentByChequeOrderedToShort=Cheque pagamentos (incl. Imposto) são pagas para
 SendTo=Enviar para
-PaymentByTransferOnThisBankAccount=Pagamento por transferência para a seguinte conta bancária
 VATIsNotUsedForInvoice=* Não aplicável ICMS art-293B de CGI
 LawApplicationPart1=Pela aplicação da lei 80.335 de 12/05/80
 LawApplicationPart2=os bens permanece propriedade de
@@ -371,7 +356,6 @@ TypeContact_facture_external_SERVICE=Contato de serviço de cliente
 TypeContact_invoice_supplier_internal_SALESREPFOLL=Fatura de fornecedor subsequente representativa
 TypeContact_invoice_supplier_external_BILLING=Contato da fatura do fornecedor
 TypeContact_invoice_supplier_external_SHIPPING=Contato de remessa do fornecedor
-TypeContact_invoice_supplier_external_SERVICE=Contato de serviço do fornecedor
 InvoiceFirstSituationAsk=Primeira situação da fatura
 InvoiceFirstSituationDesc=A <b>situação faturas</b> são amarradas às situações relacionadas com uma progressão, por exemplo, a progressão de uma construção. Cada situação é amarrada a uma fatura.
 InvoiceSituation=Situação da fatura
diff --git a/htdocs/langs/pt_BR/blockedlog.lang b/htdocs/langs/pt_BR/blockedlog.lang
index 390258dcf55..0a12ec89ee3 100644
--- a/htdocs/langs/pt_BR/blockedlog.lang
+++ b/htdocs/langs/pt_BR/blockedlog.lang
@@ -8,6 +8,7 @@ BrowseBlockedLog=Logs nao modificaveis
 ShowAllFingerPrintsMightBeTooLong=Mostrar todos os Logs Arquivados (pode ser demorado)
 ShowAllFingerPrintsErrorsMightBeTooLong=Mostrar todos os arquivos de log inválidos (pode demorar)
 DownloadBlockChain=Baixar impressoes digitais
+KoCheckFingerprintValidity=A entrada de log arquivada não é válida. Isso significa que alguém (um hacker?) Modificou alguns dados desse registro depois que ele foi gravado ou apagou o registro arquivado anterior (verifique se existe a linha com o número anterior).
 OkCheckFingerprintValidity=O registro de log arquivado é válido. Os dados nesta linha não foram modificados e a entrada segue a anterior.
 OkCheckFingerprintValidityButChainIsKo=O log arquivado parece válido em comparação com o anterior, mas a cadeia foi previamente corrompida.
 AddedByAuthority=Salvo na autoridade remota
@@ -17,7 +18,6 @@ logPAYMENT_VARIOUS_MODIFY=Pagamento (não atribuído a uma fatura) modificado
 logPAYMENT_VARIOUS_DELETE=Pagamento (não atribuído a uma fatura) exclusão lógica
 logBILL_VALIDATE=Fatura de cliente confirmada
 logBILL_SENTBYMAIL=Fatura do cliente enviada por email
-logCASHCONTROL_VALIDATE=Gravação de caixa
 Fingerprint=Impressao digial
 logDOC_PREVIEW=Pré -visualização de um documento validado para imprimir ou baixar
 DataOfArchivedEvent=Dados completos do evento arquivado
diff --git a/htdocs/langs/pt_BR/boxes.lang b/htdocs/langs/pt_BR/boxes.lang
index 77eb32557aa..48e343e41d6 100644
--- a/htdocs/langs/pt_BR/boxes.lang
+++ b/htdocs/langs/pt_BR/boxes.lang
@@ -35,25 +35,22 @@ BoxTitleLastModifiedDonations=Últimas %s doações modificadas
 BoxTitleLatestModifiedBoms=%s BOMs modificadas recentemente
 BoxTitleLatestModifiedMos=%s ordens de fabricação modificadas recentemente
 BoxGlobalActivity=Atividade global (faturas, propostas, pedidos)
+BoxScheduledJobs=Tarefas agendadas
 FailedToRefreshDataInfoNotUpToDate=Falha ao atualizar o fluxo de RSS. Data de atualização mais recente com êxito: %s
 LastRefreshDate=Ultima data atualizacao
 NoRecordedBookmarks=Nenhum marcador definido.
 NoRecordedContacts=Nenhum contato registrado
 NoActionsToDo=Nenhuma ação para fazer
-NoRecordedOrders=Nenhum pedido de venda registrado
 NoRecordedProposals=Nenhum possível cliente registrado
 NoRecordedInvoices=Nenhuma nota fiscal registrada
 NoUnpaidCustomerBills=Não há notas fiscais de clientes não pagas
 NoUnpaidSupplierBills=Nenhuma fatura de fornecedor não paga
-NoModifiedSupplierBills=Nenhuma fatura de fornecedor registrada
 NoRecordedProducts=Nenhum registro de produtos/serviços
 NoRecordedProspects=Nenhum registro de possíveis clientes
 NoContractedProducts=Nenhum produtos/serviços contratados
 NoRecordedContracts=Nenhum registro de contratos
 NoRecordedInterventions=Nenhum registro de intervenções
-BoxLatestSupplierOrders=Últimos pedidos de compra
 BoxLatestSupplierOrdersAwaitingReception=Últimos pedidos (com uma recepção pendente)
-NoSupplierOrder=Nenhum pedido de compra registrado
 BoxCustomersInvoicesPerMonth=Faturas do cliente por mês
 BoxSuppliersInvoicesPerMonth=Faturas do fornecedor por mês
 BoxCustomersOrdersPerMonth=Pedidos de vendas por mês
diff --git a/htdocs/langs/pt_BR/cashdesk.lang b/htdocs/langs/pt_BR/cashdesk.lang
index ff2e4bbd438..3a5201ded49 100644
--- a/htdocs/langs/pt_BR/cashdesk.lang
+++ b/htdocs/langs/pt_BR/cashdesk.lang
@@ -25,8 +25,6 @@ Footer=Rodapé
 AmountAtEndOfPeriod=Montante no final do período (dia, mês ou ano)
 TheoricalAmount=Quantidade teórica
 RealAmount=Quantidade real
-CashFence=Cerca de dinheiro
-CashFenceDone=Caixa feito para o período
 NbOfInvoices=Núm. de faturas
 Paymentnumpad=Tipo de Pad para inserir pagamento
 Numberspad=Números de Pad
@@ -70,7 +68,6 @@ CashDeskRefNumberingModules=Módulo de numeração para vendas PDV
 CashDeskGenericMaskCodes6 =<br>A tag {TN} é usada para adicionar o número do terminal
 TakeposGroupSameProduct=Agrupe as mesmas linhas de produtos
 StartAParallelSale=Iniciar uma nova venda paralela
-CloseCashFence=Fechar cerca de dinheiro
 CashReport=Relatório de caixa
 MainPrinterToUse=Impressora principal a ser usada
 OrderPrinterToUse=Solicite impressora a ser usada
diff --git a/htdocs/langs/pt_BR/categories.lang b/htdocs/langs/pt_BR/categories.lang
index fd9c6ce0047..daab834c237 100644
--- a/htdocs/langs/pt_BR/categories.lang
+++ b/htdocs/langs/pt_BR/categories.lang
@@ -56,15 +56,13 @@ UsersCategoriesShort=Tags / categorias de usuários
 StockCategoriesShort=Tags / categorias de armazém
 ThisCategoryHasNoItems=Esta categoria não contém nenhum item.
 CategId=ID Tag / categoria
-CatCusList=Lista de cliente / perspectivas de tags / categorias
 CatProdList=Lista de produtos tags / categorias
 CatMemberList=Lista de membros tags / categorias
-CatContactList=Lista de contatos tags / categorias
-CatSupLinks=Ligações entre fornecedores e tags / categorias
 CatCusLinks=Relação/links entre clientes / perspectivas e tags / categorias
 CatContactsLinks=Links entre contatos / endereços e tags / categorias
 CatProdLinks=Relação/links entre produtos / serviços e tags / categorias
-CatProJectLinks=Links entre projetos e tags/categorias
+CatMembersLinks=Ligações entre os membros e tags / categorias
+CatProjectsLinks=Links entre projetos e tags/categorias
 ExtraFieldsCategories=atributos complementares
 CategoriesSetup=Configuração Tags / categorias
 CategorieRecursiv=Fazer a ligação com os pais tag/categoria automaticamente
diff --git a/htdocs/langs/pt_BR/compta.lang b/htdocs/langs/pt_BR/compta.lang
index a7001066d5f..1dadb249b1e 100644
--- a/htdocs/langs/pt_BR/compta.lang
+++ b/htdocs/langs/pt_BR/compta.lang
@@ -54,6 +54,7 @@ SocialContribution=Contribuição fiscal ou social
 SocialContributions=Encargos sociais e fiscais
 SocialContributionsDeductibles=Contribuições fiscais ou sociais dedutíveis
 SocialContributionsNondeductibles=Contribuições fiscais ou sociais não dedutíveis
+DateOfSocialContribution=Data do imposto social ou fiscal
 LabelContrib=Rótulo da contribuição
 TypeContrib=Tipo de contribuição
 MenuSpecialExpenses=Despesas especiais
@@ -85,7 +86,6 @@ VATRefund=Reembolso da taxa sobre vendas
 SocialContributionsPayments=Pagamentos de impostos sociais / fiscais
 ShowVatPayment=Ver Pagamentos ICMS
 TotalToPay=Total a pagar
-BalanceVisibilityDependsOnSortAndFilters=O saldo é visível nessa lista somente se a tabela for ordenada ascendendo em %s e filtrada por 1 conta bancária
 CustomerAccountancyCode=Código contábil do cliente
 SupplierAccountancyCode=Código contábil do fornecedor
 CustomerAccountancyCodeShort=Cod. cont. cli.
@@ -176,3 +176,5 @@ RulesPurchaseTurnoverIn=- Inclui todos os pagamentos efetivos das faturas feitas
 RulesPurchaseTurnoverTotalPurchaseJournal=Inclui todas as linhas de débito no diário de compras.
 ReportPurchaseTurnover=Volume de negócios de compra faturada
 ReportPurchaseTurnoverCollected=Rotatividade de compras coletadas
+IncludeVarpaysInResults =Incluir vários pagamentos nos relatórios
+IncludeLoansInResults =Incluir empréstimos nos relatórios
diff --git a/htdocs/langs/pt_BR/cron.lang b/htdocs/langs/pt_BR/cron.lang
index 343355e7a5f..eed6598232e 100644
--- a/htdocs/langs/pt_BR/cron.lang
+++ b/htdocs/langs/pt_BR/cron.lang
@@ -4,8 +4,6 @@ Permission23102 =Criar / atualização de tarefa agendada
 Permission23103 =Excluir trabalho agendado
 Permission23104 =Executar trabalho agendado
 CronSetup=Configuração do gerenciamento de trabalho agendado
-URLToLaunchCronJobs=URL para verificar e iniciar os cron jobs qualificados
-OrToLaunchASpecificJob=Ou checkar e iniciar um specifico trabalho
 KeyForCronAccess=Chave seguranca para URL que lanca tarefas cron
 FileToLaunchCronJobs=Linha de comando para checar e iniciar tarefas cron qualificadas
 CronExplainHowToRunUnix=No ambiente Unix você deve usar a seguinte entrada crontab para executar a linha de comando a cada 5 minutos
@@ -29,7 +27,6 @@ CronNbRun=Número de lançamentos
 CronMaxRun=Número máximo de lançamentos
 JobFinished=Trabalho iniciado e terminado
 CronAdd=Adicionar tarefa
-CronEvery=Executar cada tarefa
 CronObject=Instância/Objeto a se criar
 CronSaveSucess=Salvo com sucesso
 CronFieldMandatory=O campo %s é obrigatório
@@ -44,12 +41,13 @@ CronMethodHelp=O método do objeto a ser lançado. <BR> Por exemplo, para chamar
 CronArgsHelp=Os argumentos do método. <BR> Por exemplo, para chamar o método fetch do objeto Dolibarr Product /htdocs/product/class/product.class.php, o valor dos parâmetros pode ser <i> 0, ProductRef </ i>
 CronCommandHelp=A linha de comando de sistema que deve ser executada.
 CronCreateJob=Criar uma nova Tarefa agendada
-CronType=Tipo de tarefa
 CronType_method=Chamar método de uma Classe PHP
 CronType_command=Comando Shell
 CronCannotLoadClass=Não é possível carregar o arquivo de classe %s (para usar a classe %s)
 CronCannotLoadObject=O arquivo de classe %s foi carregado, mas o objeto %s não foi encontrado nele
+UseMenuModuleToolsToAddCronJobs=Vá para o menu "<a href="%s">Página inicial - Ferramentas administrativas - Trabalhos agendados</a>" para ver e editar os trabalhos agendados.
 JobDisabled=Tarefa desativada
 MakeLocalDatabaseDumpShort=Backup do banco de dados local
 MakeLocalDatabaseDump=Crie um despejo de banco de dados local. Os parâmetros são: compression ('gz' ou 'bz' ou 'none'), tipo de backup ('mysql', 'pgsql', 'auto'), 1, 'auto' ou nome de arquivo para construir, número de arquivos de backup para manter
 WarningCronDelayed=Atenção, para fins de desempenho, seja qual for a próxima data de execução de tarefas habilitadas, suas tarefas podem ser atrasadas em até um máximo de %s horas, antes de serem executadas.
+DATAPOLICYJob=Limpador de dados e anonimizador
diff --git a/htdocs/langs/pt_BR/errors.lang b/htdocs/langs/pt_BR/errors.lang
index afe2c1ac0b2..971fb3d2fe0 100644
--- a/htdocs/langs/pt_BR/errors.lang
+++ b/htdocs/langs/pt_BR/errors.lang
@@ -60,7 +60,6 @@ ErrorNoAccountancyModuleLoaded=Módulo de Contabilidade não ativado
 ErrorExportDuplicateProfil=Este nome de perfil já existe para este lote de exportação.
 ErrorLDAPSetupNotComplete=A correspondência Dolibarr-LDAP não está completa.
 ErrorLDAPMakeManualTest=foi criado unn Arquivo .ldif na pasta %s. Trate de gastor manualmente este Arquivo a partir da linha de comandos para Obter mais detalles acerca do error.
-ErrorRefAlreadyExists=A ref. utilizada para a criação já existe.
 ErrorRecordHasAtLeastOneChildOfType=Object tem pelo menos um filho do tipo %s
 ErrorModuleRequireJavascript=Javascript não deve ser desativado para ter esse recurso funcionando. Para ativar / desativar o Javascript, vá ao menu Home-> Configuração-> Display.
 ErrorPasswordsMustMatch=Deve existir correspondência entre as senhas digitadas
@@ -163,6 +162,7 @@ ErrorBatchNoFoundForProductInWarehouse=Nenhum lote / série encontrado para o pr
 ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Quantidade insuficiente para este lote / série para o produto "%s"  "no armazém"%s ".
 ErrorOnlyOneFieldForGroupByIsPossible=Apenas 1 campo para o 'Agrupar por' é possível (outros são descartados)
 ErrorReplaceStringEmpty=Erro, a cadeia de caracteres para substituir está vazia
+ErrorPublicInterfaceNotEnabled=A interface pública não foi ativada
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Seu parâmetro PHP upload_max_filesize (%s) é maior que o parâmetro PHP post_max_size (%s). Esta não é uma configuração consistente.
 WarningPasswordSetWithNoAccount=A senha foi definida para esse membro. No entanto, nenhuma conta de usuário foi criada. Portanto, esta senha é armazenada, mas não pode ser usado para acessar Dolibarr. Ele pode ser usado por um módulo / interface externa, mas se você não precisa definir qualquer login nem palavra-passe para um membro, você pode desabilitar a opção "Gerenciar um login para cada membro" da configuração do módulo-Membro. Se você precisa para gerenciar um login, mas não precisa de qualquer senha, você pode manter este campo em branco para evitar este aviso. Nota: E-mail pode também ser utilizado como uma entre o membro se está ligado a um utilizador.
 WarningMandatorySetupNotComplete=Clique aqui para configurar os parâmetros obrigatórios
@@ -183,4 +183,3 @@ WarningSomeLinesWithNullHourlyRate=Algumas vezes foram registrados por alguns us
 WarningYourLoginWasModifiedPleaseLogin=O seu login foi modificado. Por questões de segurança, você terá de autenticar-se com o seu novo login antes da próxima ação.
 WarningProjectClosed=O projeto está fechado. Você deve reabri-lo primeiro.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Algumas transações bancárias foram removidas após geração do recebimento, incluindo elas. Portanto, o número de cheques e o total de recebimento podem diferir do número e do total na lista.
-WarningFailedToAddFileIntoDatabaseIndex=Aviso, falha ao adicionar entrada de arquivo na tabela de índice do banco de dados ECM
diff --git a/htdocs/langs/pt_BR/exports.lang b/htdocs/langs/pt_BR/exports.lang
index 63bff69e01d..4475adb3a39 100644
--- a/htdocs/langs/pt_BR/exports.lang
+++ b/htdocs/langs/pt_BR/exports.lang
@@ -6,6 +6,8 @@ NotImportedFields=Os campos de arquivo de origem não importado
 ExportModelSaved=Exportar perfil salvo como <b> %s </b>.
 ImportModelName=Nome do perfil de importação
 DatasetToImport=Conjunto de dados a importar
+ExportCsvSeparator=Separador de caracteres csv
+ImportCsvSeparator=Separador de caracteres csv
 FormatedImportDesc1=Este módulo permite atualizar dados existentes ou adicionar novos objetos ao banco de dados a partir de um arquivo sem conhecimento técnico, usando um assistente.
 NoImportableData=Não existe tipo de dados importavel (não existe nenhum módulo com definições de dados importavel ativado)
 FileSuccessfullyBuilt=Arquivo gerado
diff --git a/htdocs/langs/pt_BR/mails.lang b/htdocs/langs/pt_BR/mails.lang
index e0efe3c7f34..54faf80d28a 100644
--- a/htdocs/langs/pt_BR/mails.lang
+++ b/htdocs/langs/pt_BR/mails.lang
@@ -71,9 +71,6 @@ TagUnsubscribe=Atalho para se desenscrever
 EMailRecipient=E-mail do destinatário
 TagMailtoEmail=E-mail do destinatário (incluindo o link "mailto:" em html)
 NoEmailSentBadSenderOrRecipientEmail=Nenhum e-mail enviado. Bad remetente ou destinatário de e-mail. Verifique perfil de usuário.
-AddNewNotification=Ativar um novo alvo / evento de notificação por e-mail
-ListOfActiveNotifications=Listar todos os destinos/eventos ativos para notificação por e-mail
-ListOfNotificationsDone=Listar todas as notificações de e-mail enviadas
 MailSendSetupIs=Configuração do envio de e-mails foi configurado a '%s'. Este modo não pode ser usado para envios de massa de e-mails.
 MailSendSetupIs2=Voçê precisa primeiramente acessar com uma conta de Administrador o menu %sInicio - Configurações - E-mails%s para mudar o parâmetro <strong>'%s'</strong> para usar o modo '%s'. Neste modo você pode entrar a configuração do servidor SMTP fornecido pelo seu Provedor de Acesso a Internet e usar a funcionalidade de envios de massa de e-mails.
 MailSendSetupIs3=Se tiver perguntas sobre como configurar o seu servidor SMTP voçê pode perguntar %s.
@@ -94,8 +91,4 @@ AdvTgtDeleteFilter=Excluir filtro
 AdvTgtSaveFilter=Salvar filtro
 NoContactWithCategoryFound=Nenhum foi encontrado nenhum contato/endereço com uma categoria
 NoContactLinkedToThirdpartieWithCategoryFound=Nenhum foi encontrado nenhum contato/endereço com uma categoria
-OutGoingEmailSetup=Configuração de e-mail de saída
-InGoingEmailSetup=Configuração de e-mail de entrada
-OutGoingEmailSetupForEmailing=Configuração de email de saída (para o módulo %s)
-DefaultOutgoingEmailSetup=Configuração de e-mail de saída padrão
 ContactsWithThirdpartyFilter=Contatos com filtro de terceiros
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index c0d7d0ed2ac..7792b3ddc3c 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -21,6 +21,7 @@ FormatDateHourTextShort=%d %b, %Y, %I:%M %p
 FormatDateHourText=%d %B, %Y, %I:%M %p
 DatabaseConnection=Login à Base de Dados
 NoTemplateDefined=Nenhum modelo disponível para este tipo de email
+CurrentTimeZone=Timezone PHP (do servidor apache)
 EmptySearchString=Digite critérios na pesquisa
 NoRecordFound=Nenhum registro encontrado
 NoRecordDeleted=Nenhum registro foi deletado
@@ -65,6 +66,7 @@ FileWasNotUploaded=O arquivo foi selecionado, mas nao foi ainda enviado. Clique
 NbOfEntries=N°. de entradas
 GoToWikiHelpPage=Ler a ajuda online (necessário acesso a Internet)
 GoToHelpPage=Consulte a ajuda (pode necessitar de acesso à internet)
+HomePage=Pagina inicial
 RecordDeleted=Registro apagado
 RecordGenerated=Registro gerado
 LevelOfFeature=Nível de funções
@@ -532,3 +534,4 @@ NotUsedForThisCustomer=Não usado para este cliente
 AmountMustBePositive=O valor deve ser positivo
 ByStatus=Por status
 DateOfBirth=Data de nascimento
+OnHold=Em espera
diff --git a/htdocs/langs/pt_BR/modulebuilder.lang b/htdocs/langs/pt_BR/modulebuilder.lang
index 3c474204a64..e5120fa2996 100644
--- a/htdocs/langs/pt_BR/modulebuilder.lang
+++ b/htdocs/langs/pt_BR/modulebuilder.lang
@@ -51,7 +51,6 @@ UseSpecificEditorURL =Use um URL de editor específico
 UseSpecificFamily =Use uma família específica
 UseSpecificAuthor =Use um autor específico
 UseSpecificVersion =Use uma versão inicial específica
-ModuleMustBeEnabled=O módulo/aplicativo deve ser ativado primeiro
 IncludeRefGeneration=A referência do objeto deve ser gerada automaticamente
 IncludeRefGenerationHelp=Marque aqui se desejar incluir código para gerenciar a geração automaticamente da referência
 IncludeDocGeneration=Gerar alguns documentos a partir do objeto
diff --git a/htdocs/langs/pt_BR/other.lang b/htdocs/langs/pt_BR/other.lang
index 2c7d8cbc922..3bb86856d85 100644
--- a/htdocs/langs/pt_BR/other.lang
+++ b/htdocs/langs/pt_BR/other.lang
@@ -92,7 +92,7 @@ DirWasRemoved=a pasta foi eliminado
 FeatureNotYetAvailable=Funcionalidade ainda não disponível na versão atual
 Left=Esquerda
 Right=Direita
-WeightUnitton=tonelada
+WeightUnitton=t
 VolumeUnitgallon=gallão
 SizeUnitfoot=pe
 BugTracker=Incidências
diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang
index 6f9b9ca7a94..ca73468eb49 100644
--- a/htdocs/langs/pt_BR/products.lang
+++ b/htdocs/langs/pt_BR/products.lang
@@ -115,7 +115,6 @@ AlwaysUseNewPrice=Usar sempre preço atual do produto/serviço
 AlwaysUseFixedPrice=Usar preço fixo
 PriceByQuantity=Diferentes preços por quantidade
 PriceByQuantityRange=Intervalo de quantidade
-MultipriceRules=Regras de preços por segmento
 PercentVariationOver=%% variação sobre %s
 PercentDiscountOver=%% disconto sobre %s
 VariantRefExample=Exemplos: COR, TAMANHO
diff --git a/htdocs/langs/pt_BR/sendings.lang b/htdocs/langs/pt_BR/sendings.lang
index c686aba270c..88024602add 100644
--- a/htdocs/langs/pt_BR/sendings.lang
+++ b/htdocs/langs/pt_BR/sendings.lang
@@ -17,6 +17,7 @@ KeepToShip=Permaneça para enviar
 KeepToShipShort=Permanecer
 SendingsAndReceivingForSameOrder=Envios e recibos para esse pedido
 SendingsToValidate=Envios a Confirmar
+StatusSendingCanceledShort=Cancelada
 StatusSendingValidated=Validado (produtos a enviar o enviados)
 SendingSheet=Folha de embarque
 ConfirmDeleteSending=Tem certeza que quer remover este envio?
diff --git a/htdocs/langs/pt_BR/ticket.lang b/htdocs/langs/pt_BR/ticket.lang
index 14a27fd797e..2f52343c451 100644
--- a/htdocs/langs/pt_BR/ticket.lang
+++ b/htdocs/langs/pt_BR/ticket.lang
@@ -97,7 +97,6 @@ TicketChangeStatus=Alterar status
 TicketConfirmChangeStatus=Confirma alteração de situação %s ?
 TicketLogStatusChanged=Situação modificada  de%s para %s
 TicketNotCreatedFromPublicInterface=Não disponível. O ticket não foi criado a partir da interface pública.
-PublicInterfaceNotEnabled=A interface pública não foi ativada
 ErrorTicketRefRequired=O nome de referência do ticket é obrigatório
 TicketLogMesgReadBy=Tíquete %s lido por %s
 TicketLogAssignedTo=Tíquete %s assinalado para %s
diff --git a/htdocs/langs/pt_BR/withdrawals.lang b/htdocs/langs/pt_BR/withdrawals.lang
index 5d560f9548b..dd45990f9a9 100644
--- a/htdocs/langs/pt_BR/withdrawals.lang
+++ b/htdocs/langs/pt_BR/withdrawals.lang
@@ -64,7 +64,6 @@ ModeRECUR=Pagamento recorrente
 PleaseCheckOne=Favor marcar apenas um
 DirectDebitOrderCreated=Pedido de débito direto %s criado
 CreateForSepa=Crie um arquivo de débito direto
-ICS=Identificador do credor
 END_TO_END=Tag SEPA XML "EndToEndId" - ID exclusivo atribuído por transação
 USTRD=Tag SEPA XML "não estruturada"
 ADDDAYS=Adicionar dias à data de execução
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index c94ba9653ef..a39273a24c0 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=Todos os países, exceto %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Principal conta contábil para clientes não definidos na configuração
 MainAccountForSuppliersNotDefined=Conta contábil principal para fornecedores não definidos na configuração
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Não vinculado à conta contabilística
 XLineSuccessfullyBinded=produtos / serviços %s vinculados com êxito a uma conta contábil
 XLineFailedToBeBinded=%s produtos/serviços não foram vinculados a uma conta contabilística
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comece a ordenação da página "Vinculação a efetuar" pelos elementos mais recentes
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comece a ordenação da página "Vinculação efetuada" pelos elementos mais recentes
 
@@ -198,7 +199,8 @@ Docdate=Data
 Docref=Referência
 LabelAccount=Etiqueta de conta
 LabelOperation=Operação de etiqueta
-Sens=Sentido
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Código de rotulação
 Lettering=Lettering
 Codejournal=Diário
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Número da peça
 TransactionNumShort=Núm. de transação
 AccountingCategory=Grupos personalizados
-GroupByAccountAccounting=Agrupar por conta contabilística
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Você pode definir aqui alguns grupos de conta contábil. Eles serão usados ​​para relatórios contábeis personalizados.
 ByAccounts=Por contas
 ByPredefinedAccountGroups=Por grupos predefinidos
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Pagamento não vinculado a nenhum produto / serviço
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Grupo de conta
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consulte aqui a lista de linhas do relatório de despesa
 DescVentilExpenseReportMore=Se você configurar uma conta contábil no tipo de linhas de relatório de despesas, o aplicativo poderá fazer toda a ligação entre suas linhas de relatório de despesas e a conta contábil do seu plano de contas, em apenas um clique com o botão <strong> "%s" </ strong>. Se a conta não foi definida no dicionário de taxas ou se você ainda tiver algumas linhas não vinculadas a nenhuma conta, será necessário fazer uma ligação manual no menu "<strong> %s </ strong>".
 DescVentilDoneExpenseReport=Consulte aqui a lista das linhas de relatórios de despesas e os seus honorários da conta contabilística
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Vincular automaticamente
 AutomaticBindingDone=Vinculação automática efetuada
@@ -293,6 +298,7 @@ Accounted=Contabilizado no ledger
 NotYetAccounted=Ainda não contabilizado no razão
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Exportar CSV configurável
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index b2961d731ca..77d70a3f040 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Aparência
 SetupArea=Configuração
 UploadNewTemplate=Carregar novo(s) modelo(s)
 FormToTestFileUploadForm=Formulário para testar o envio de ficheiro (de acordo com a configuração)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Nota: sim, só é eficaz se o <b>módulo %s</b> estiver ativado
 RemoveLock=Remova / renomeie o arquivo <b> %s </b> se existir, para permitir o uso da ferramenta Atualizar / Instalar.
 RestoreLock=Restaure o arquivo <b> %s </b>, apenas com permissão de leitura, para desativar qualquer uso posterior da ferramenta Atualizar / Instalar.
@@ -85,7 +87,6 @@ ShowPreview=Mostrar pré-visualização
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Pré-visualização não disponível
 ThemeCurrentlyActive=Tema atualmente ativo
-CurrentTimeZone=Zona Horária PHP (servidor)
 MySQLTimeZone=Fuso Horário MySQL (base de dados)
 TZHasNoEffect=As datas são armazenadas e retornadas pelo servidor de banco de dados como se fossem mantidas como uma string enviada. O fuso horário só tem efeito ao usar a função UNIX_TIMESTAMP (que não deve ser usada pelo Dolibarr, portanto, o banco de dados TZ não deve ter efeito, mesmo se for alterado depois que os dados forem inseridos).
 Space=Área
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Esta área fornece funções de administração. Use o menu
 Purge=Limpar
 PurgeAreaDesc=Esta página permite excluir todos os arquivos gerados ou armazenados pelo Dolibarr (arquivos temporários ou todos os arquivos no diretório <b> %s </b>). Usar esse recurso normalmente não é necessário. Ele é fornecido como uma solução alternativa para usuários cujo Dolibarr é hospedado por um provedor que não oferece permissões para excluir arquivos gerados pelo servidor da web.
 PurgeDeleteLogFile=Eliminar os ficheiros de registo, incluindo <b>%s</b> definido para o módulo Syslog (não existe risco de perda de dados)
-PurgeDeleteTemporaryFiles=Exclua todos os arquivos temporários (sem risco de perder dados). Nota: A exclusão é feita apenas se o diretório temporário foi criado 24 horas atrás.
-PurgeDeleteTemporaryFilesShort=Eliminar ficheiros temporários
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Exclua todos os arquivos do diretório: <b> %s </b>. <br> Isso excluirá todos os documentos gerados relacionados aos elementos (terceiros, faturas etc ...), arquivos carregados no módulo ECM, despejos de backup de banco de dados e arquivos temporários.
 PurgeRunNow=Limpar agora
 PurgeNothingToDelete=Nenhuma diretoria ou ficheiros para eliminar.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Parceiros preferidos
 OtherResources=Outros recursos
 ExternalResources=External Resources
 SocialNetworks=Redes sociais
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=Para a documentação de utilizador, programador ou Perguntas Frequentes (FAQ), consulte o wiki do Dolibarr<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Para outras questões, como efectuar as consultas, pode utilizar o forum do Dolibarr:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Aqui estão alguns recursos para obter ajuda e suporte com o Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Exemplos com configuração atual
 ListOfDirectories=Lista de diretórios com modelos OpenDocument
 ListOfDirectoriesForModelGenODT=Lista de diretórios que contêm ficheiros template com formato OpenDocument.<br><br>Digite aqui o caminho completo dos diretórios.<br>Adicione um "Enter" entre cada diratório.<br>Para adicionar um diretório do módulo GCE, adicione aqui <b>DOL_DATA_ROOT/ecm/seudiretorio</b>.<br><br>Ficheiros nesses diretórios têm de acabar com <b>.odt</b> ou <b>.ods</b>.
 NumberOfModelFilesFound=Número de arquivos de modelo ODT / ODS encontrados nesses diretórios
-ExampleOfDirectoriesForModelGen=Exemplos de sintaxe: <br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Para saber como criar os seus modelos de documentos ODT, antes de armazená-los nestes diretórios, leia a documentação no wiki:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Posição do primeiro nome/último nome
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parâmetros para tornar URLs seguros
 SecurityTokenIsUnique=Use um parâmetro securekey único para cada URL
 EnterRefToBuildUrl=Digite a referência para o objeto %s
 GetSecuredUrl=Obter URL seguro
-ButtonHideUnauthorized=Ocultar botões para usuários não administradores para ações não autorizadas, em vez de mostrar botões desativados acinzentados
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Taxa de IVA antiga
 NewVATRates=Nova taxa de IVA
 PriceBaseTypeToChange=Modificar nos preços com valor de referência base definido em
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Menus personalizados não ligados a uma entrada do me
 NewMenu=Novo menu
 MenuHandler=Gestor de menus
 MenuModule=Módulo origem
-HideUnauthorizedMenu= Ocultar menus não autorizados (cinza)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id do menu
 DetailMenuHandler=Gestor de menus onde será exibido o novo menu
 DetailMenuModule=Nome do módulo, no caso da entrada do menu ser resultante de um módulo
@@ -1983,11 +1985,12 @@ EMailHost=Host do servidor IMAP de e-mail
 MailboxSourceDirectory=Diretório de origem da caixa de correio
 MailboxTargetDirectory=Diretório de destino da caixa de correio
 EmailcollectorOperations=Operações para fazer pelo coletor
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Recolher agora
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Confirmação de recebimento de email
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Código postal
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/pt_PT/banks.lang b/htdocs/langs/pt_PT/banks.lang
index 2401d4caf2a..34eb2d63a88 100644
--- a/htdocs/langs/pt_PT/banks.lang
+++ b/htdocs/langs/pt_PT/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=Mandato SEPA
 YourSEPAMandate=Seu mandato SEPA
 FindYourSEPAMandate=Este é o seu mandato da SEPA para autorizar a nossa empresa a efetuar um pedido de débito direto ao seu banco. Devolva-o assinado (digitalização do documento assinado) ou envie-o por correio para
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index 9489ccfabda..ce7dadc46fc 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -6,11 +6,11 @@ BillsCustomer=Fatura a cliente
 BillsSuppliers=Faturas do fornecedor
 BillsCustomersUnpaid=Faturas a receber de clientes
 BillsCustomersUnpaidForCompany=Faturas a clientes não pagas para %s
-BillsSuppliersUnpaid=Unpaid vendor invoices
-BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
+BillsSuppliersUnpaid=Faturas de fornecedores não pagas
+BillsSuppliersUnpaidForCompany=Faturas de fornecedores não pagas para %s
 BillsLate=Pagamentos em atraso
 BillsStatistics=Estatísticas das faturas a clientes
-BillsStatisticsSuppliers=Vendors invoices statistics
+BillsStatisticsSuppliers=Estatísticas de faturas de fornecedores
 DisabledBecauseDispatchedInBookkeeping=Desativado porque a fatura foi enviada para a contabilidade
 DisabledBecauseNotLastInvoice=Desativado porque a fatura não pode ser apagada. Algumas faturas foram registradas após esta e irão criar furos no contador.
 DisabledBecauseNotErasable=Desativar porque não pode ser eliminado
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Fatura Pró-Forma
 InvoiceProFormaDesc=A <b>Fatura Pró-Forma</b> é uma imagem de uma fatura, mas não tem valor contabilístico.
 InvoiceReplacement=Fatura de Substituição
 InvoiceReplacementAsk=Fatura de Substituição para a Fatura
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc= <b> Fatura de substituição </b> é usada para substituir completamente uma fatura sem pagamento já recebido. <br> <br> Nota: Apenas as faturas sem pagamento podem ser substituídas. Se a fatura que você substituiu ainda não foi fechada, ela será automaticamente encerrada como 'abandonada'.
 InvoiceAvoir=Nota de Crédito
 InvoiceAvoirAsk=Nota de crédito para corrigir a fatura
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice shows an amount that differs from the amount actually paid (eg the customer paid too much by mistake, or will not pay the complete amount since some products were returned).
+InvoiceAvoirDesc=A nota de crédito <b> </b> é uma fatura negativa usada para corrigir o fato de que uma fatura mostra um valor diferente do valor efetivamente pago (por exemplo, o cliente pagou muito por engano ou não pagará o valor completo porque alguns produtos foram devolvidos) .
 invoiceAvoirWithLines=Criar Nota de Crédito com as linhas da fatura de origem
 invoiceAvoirWithPaymentRestAmount=Criar nota de crédito com fatura não paga de origem
 invoiceAvoirLineWithPaymentRestAmount=Nota de crédito para o restante valor não pago
@@ -41,7 +41,7 @@ CorrectionInvoice=Correção da Fatura
 UsedByInvoice=Utilizado para pagar a fatura %s
 ConsumedBy=Consumida por
 NotConsumed=Não consumiu
-NoReplacableInvoice=No replaceable invoices
+NoReplacableInvoice=Sem faturas substituíveis
 NoInvoiceToCorrect=Nenhuma Fatura para corrigir
 InvoiceHasAvoir=Era fonte de uma ou várias notas de crédito
 CardBill=Ficha da Fatura
@@ -54,23 +54,23 @@ InvoiceCustomer=Fatura a cliente
 CustomerInvoice=Fatura a cliente
 CustomersInvoices=Faturas a clientes
 SupplierInvoice=Fatura de fornecedor
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Faturas de fornecedores
 SupplierBill=Fatura de fornecedor
 SupplierBills=faturas de fornecedores
 Payment=Pagamento
-PaymentBack=Refund
+PaymentBack=Restituição
 CustomerInvoicePaymentBack=Refund
 Payments=Pagamentos
-PaymentsBack=Refunds
+PaymentsBack=Reembolsos
 paymentInInvoiceCurrency=na moeda das faturas
 PaidBack=Reembolsada
 DeletePayment=Eliminar pagamento
 ConfirmDeletePayment=Tem a certeza que deseja eliminar este pagamento?
-ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
+ConfirmConvertToReduc=Deseja converter este %s em um crédito disponível?
 ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
 ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
 ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
-SupplierPayments=Vendor payments
+SupplierPayments=Pagamentos a fornecedores
 ReceivedPayments=Pagamentos recebidos
 ReceivedCustomersPayments=Pagamentos recebidos dos clientes
 PayedSuppliersPayments=Payments paid to vendors
@@ -78,9 +78,9 @@ ReceivedCustomersPaymentsToValid=Pagamentos recebidos dos clientes para validar
 PaymentsReportsForYear=Relatórios de pagamentos para %s
 PaymentsReports=Relatórios de pagamentos
 PaymentsAlreadyDone=Pagamentos já efetuados
-PaymentsBackAlreadyDone=Refunds already done
+PaymentsBackAlreadyDone=Reembolsos já feitos
 PaymentRule=Estado do Pagamento
-PaymentMode=Payment Type
+PaymentMode=Tipo de pagamento
 PaymentTypeDC=Cartão de débito/crédito
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -88,8 +88,8 @@ CodePaymentMode=Payment Type (code)
 LabelPaymentMode=Payment Type (label)
 PaymentModeShort=Payment Type
 PaymentTerm=Payment Term
-PaymentConditions=Payment Terms
-PaymentConditionsShort=Payment Terms
+PaymentConditions=Termos de pagamento
+PaymentConditionsShort=Termos de pagamento
 PaymentAmount=Montante a Pagar
 PaymentHigherThanReminderToPay=Pagamento superior ao valor a pagar
 HelpPaymentHigherThanReminderToPay=Atenção, o valor do pagamento de uma ou mais contas é maior do que o valor pendente a pagar. <br> Edite sua entrada, caso contrário, confirme e considere a criação de uma nota de crédito para o excesso recebido para cada fatura paga em excesso.
@@ -106,7 +106,7 @@ AddBill=Criar fatura ou nota de crédito
 AddToDraftInvoices=Adicionar à fatura rascunho
 DeleteBill=Eliminar fatura
 SearchACustomerInvoice=Procurar por uma fatura a cliente
-SearchASupplierInvoice=Search for a vendor invoice
+SearchASupplierInvoice=Pesquise uma fatura de fornecedor
 CancelBill=Cancelar uma fatura
 SendRemindByMail=Enviar um lembrete por E-Mail
 DoPayment=Inserir pagamento
@@ -145,17 +145,17 @@ BillShortStatusClosedUnpaid=Fechada por pagar
 BillShortStatusClosedPaidPartially=Paga (parcialmente)
 PaymentStatusToValidShort=Por validar
 ErrorVATIntraNotConfigured=Número de IVA intracomunitário ainda não definido
-ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.
-ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment types
+ErrorNoPaiementModeConfigured=Nenhum tipo de pagamento padrão definido. Vá para a configuração do módulo de fatura para corrigir isso.
+ErrorCreateBankAccount=Crie uma conta bancária e vá para o painel Configuração do módulo Fatura para definir os tipos de pagamento
 ErrorBillNotFound=Fatura %s inexistente
 ErrorInvoiceAlreadyReplaced=Erro, você tentou validar uma fatura para substituir a fatura %s. Mas este já foi substituído pela nota fiscal %s.
 ErrorDiscountAlreadyUsed=Erro, a remessa está já assignada
 ErrorInvoiceAvoirMustBeNegative=Erro, uma fatura deste tipo deve ter um montante negativo
-ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
+ErrorInvoiceOfThisTypeMustBePositive=Erro, este tipo de fatura deve ter um valor sem imposto positivo (ou nulo)
 ErrorCantCancelIfReplacementInvoiceNotValidated=Erro, não pode cancelar uma fatura que tenha sido substituída por uma outra fatura e que se encontra ainda em rascunho
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Essa parte ou outra já é usada para que as séries de descontos não possam ser removidas.
 BillFrom=Emissor
-BillTo=Enviar a
+BillTo=Cliente
 ActionsOnBill=Ações sobre a fatura
 RecurringInvoiceTemplate=Fatura de modelo / recorrente
 NoQualifiedRecurringInvoiceTemplateFound=Nenhuma fatura de modelo recorrente qualificada para geração.
@@ -167,13 +167,13 @@ LatestTemplateInvoices=Últimas facturas modelo %s
 LatestCustomerTemplateInvoices=Últimas facturas de modelo de cliente %s
 LatestSupplierTemplateInvoices=Latest %s vendor template invoices
 LastCustomersBills=Últimas %s faturas a clientes
-LastSuppliersBills=Latest %s vendor invoices
+LastSuppliersBills=Faturas de fornecedor %s mais recentes
 AllBills=Todas as faturas
 AllCustomerTemplateInvoices=Todas as faturas modelo
 OtherBills=Outras faturas
 DraftBills=Faturas rascunho
 CustomersDraftInvoices=Faturas provisórias a cliente
-SuppliersDraftInvoices=Vendor draft invoices
+SuppliersDraftInvoices=Rascunho de faturas de fornecedor
 Unpaid=Pendentes
 ErrorNoPaymentDefined=Error No payment defined
 ConfirmDeleteBill=Tem a certeza que deseja eliminar esta fatura?
@@ -183,7 +183,7 @@ ConfirmClassifyPaidBill=Tem a certeza que pretende alterar a fatura <b>%s</b> pa
 ConfirmCancelBill=Tem a certeza que pretende cancelar a fatura <b>%s</b>?
 ConfirmCancelBillQuestion=Porque é que pretende classificar esta fatura como 'abandonada'?
 ConfirmClassifyPaidPartially=Tem a certeza que pretende alterar a fatura <b>%s</b> para o estado de paga?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason for closing this invoice?
+ConfirmClassifyPaidPartiallyQuestion=Esta fatura não foi totalmente paga. Qual o motivo do fechamento desta fatura?
 ConfirmClassifyPaidPartiallyReasonAvoir=O restante <b> (%s %s) </ b> é um desconto concedido porque o pagamento foi feito antes do prazo. Regularizo o IVA com uma nota de crédito.
 ConfirmClassifyPaidPartiallyReasonDiscount=O restante <b> (%s %s) </ b> é um desconto concedido porque o pagamento foi feito antes do prazo.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=O restante <b> (%s %s) </ b> é um desconto concedido porque o pagamento foi feito antes do prazo. Aceito perder o IVA sobre esse desconto.
@@ -257,11 +257,11 @@ DateInvoice=Data da fatura
 DatePointOfTax=Ponto de imposto
 NoInvoice=Nenhuma fatura
 ClassifyBill=Classificar a fatura
-SupplierBillsToPay=Unpaid vendor invoices
+SupplierBillsToPay=Faturas de fornecedores não pagas
 CustomerBillsUnpaid=Faturas a receber de clientes
 NonPercuRecuperable=Não recuperável
-SetConditions=Set Payment Terms
-SetMode=Set Payment Type
+SetConditions=Definir termos de pagamento
+SetMode=Definir Tipo de Pagamento
 SetRevenuStamp=Definir selo fiscal
 Billed=Faturado
 RecurringInvoices=Faturas recorrentes
@@ -278,9 +278,9 @@ ExportDataset_invoice_1=Faturas de clientes e detalhes da fatura
 ExportDataset_invoice_2=Faturas a clientes e pagamentos
 ProformaBill=Fatura pró-forma:
 Reduction=Redução
-ReductionShort=Disc.
+ReductionShort=Disco.
 Reductions=Descontos
-ReductionsShort=Disc.
+ReductionsShort=Disco.
 Discounts=Descontos
 AddDiscount=Adicionar Desconto
 AddRelativeDiscount=Criar desconto relativo
@@ -289,7 +289,7 @@ AddGlobalDiscount=Criar desconto fixo
 EditGlobalDiscounts=Editar descontos fixos
 AddCreditNote=Criar nota de crédito
 ShowDiscount=Ver o deposito
-ShowReduc=Show the discount
+ShowReduc=Mostre o desconto
 ShowSourceInvoice=Show the source invoice
 RelativeDiscount=Desconto relativo
 GlobalDiscount=Desconto fixo
@@ -337,12 +337,12 @@ WatermarkOnDraftBill=Marca de agua em faturas rascunho (nada sem está vazia)
 InvoiceNotChecked=Nenhuma fatura selecionada
 ConfirmCloneInvoice=Tem a certeza que pretende clonar esta fatura <b>%s</b>?
 DisabledBecauseReplacedInvoice=Ação desativada porque a fatura foi substituída
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payments during the fixed year are included here.
+DescTaxAndDividendsArea=Esta área apresenta um resumo de todos os pagamentos feitos para despesas especiais. Somente registros com pagamentos durante o ano fixo são incluídos aqui.
 NbOfPayments=N.ª de pagamentos
 SplitDiscount=Dividido em duas desconto
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
+ConfirmSplitDiscount=Tem certeza de que deseja dividir este desconto de <b> %s </b> %s em dois descontos menores?
 TypeAmountOfEachNewDiscount=Quantidade de entrada para cada uma das duas partes:
-TotalOfTwoDiscountMustEqualsOriginal=The total of the two new discounts must be equal to the original discount amount.
+TotalOfTwoDiscountMustEqualsOriginal=O total dos dois novos descontos deve ser igual ao valor do desconto original.
 ConfirmRemoveDiscount=Tem certeza que deseja remover este desconto?
 RelatedBill=Fatura relacionada
 RelatedBills=Faturas relacionadas
@@ -410,7 +410,7 @@ PaymentConditionShort14D=14 dias
 PaymentCondition14D=14 dias
 PaymentConditionShort14DENDMONTH=14 dias do final do mês
 PaymentCondition14DENDMONTH=Dentro de 14 dias após o final do mês
-FixAmount=Fixed amount - 1 line with label '%s'
+FixAmount=Quantidade fixa - 1 linha com rótulo '%s'
 VarAmount=Quantidade variável (%% total.)
 VarAmountOneLine=Quantidade variável (%% tot.) - 1 linha com o rótulo '%s'
 VarAmountAllLines=Variable amount (%% tot.) - all same lines
@@ -435,16 +435,16 @@ PaymentTypeFAC=Fator
 PaymentTypeShortFAC=Fator
 BankDetails=Dados bancários
 BankCode=Código banco
-DeskCode=Branch code
+DeskCode=Código da Agência
 BankAccountNumber=Número conta
 BankAccountNumberKey=Checksum
 Residence=Direcção
-IBANNumber=IBAN account number
+IBANNumber=Número da conta IBAN
 IBAN=IBAN
 CustomerIBAN=IBAN of customer
 SupplierIBAN=IBAN of vendor
 BIC=BIC/SWIFT
-BICNumber=BIC/SWIFT code
+BICNumber=Código BIC / SWIFT
 ExtraInfos=Informações complementarias
 RegulatedOn=Regulado em
 ChequeNumber=Cheque nº
@@ -458,11 +458,11 @@ PhoneNumber=Tel.
 FullPhoneNumber=telefone
 TeleFax=Fax
 PrettyLittleSentence=Aceito o pagamento mediante cheques a meu nome dos valores em divida, na qualidade de membro de uma empresa autorizada por a Administração Fiscal.
-IntracommunityVATNumber=Intra-Community VAT ID
-PaymentByChequeOrderedTo=Check payments (including tax) are payable to %s, send to
-PaymentByChequeOrderedToShort=Check payments (incl. tax) are payable to
+IntracommunityVATNumber=ID de IVA intracomunitário
+PaymentByChequeOrderedTo=Os pagamentos em cheque (incluindo impostos) devem ser pagos a %s, enviar para
+PaymentByChequeOrderedToShort=Pagamentos de cheques (incluindo impostos) devem ser pagos a
 SendTo=- Enviando Para
-PaymentByTransferOnThisBankAccount=Payment by transfer to the following bank account
+PaymentByTransferOnThisBankAccount=Pagamento por transferência para a seguinte conta bancária
 VATIsNotUsedForInvoice=* IVA não aplicável  art-293B do CGI
 LawApplicationPart1=Por aplicação da lei 80.335 de 12/05/80
 LawApplicationPart2=As mercadorias permanecem em propriedade de
@@ -473,18 +473,18 @@ UseLine=Aplicar
 UseDiscount=Aplicar Desconto
 UseCredit=Uso de crédito
 UseCreditNoteInInvoicePayment=Reduzir o pagamento com este deposito
-MenuChequeDeposits=Check Deposits
+MenuChequeDeposits=Depósitos de cheques
 MenuCheques=Gestão cheques
-MenuChequesReceipts=Check receipts
+MenuChequesReceipts=Verifique os recibos
 NewChequeDeposit=Novo deposito
-ChequesReceipts=Check receipts
-ChequesArea=Check deposits area
-ChequeDeposits=Check deposits
+ChequesReceipts=Verifique os recibos
+ChequesArea=Área de depósitos de cheques
+ChequeDeposits=Depósitos de cheques
 Cheques=Cheques
 DepositId=Depósito de identificação
 NbCheque=Número de cheques
 CreditNoteConvertedIntoDiscount=Esta nota de crédito %s, foi convertida no desconto %s
-UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third-party address as recipient for invoices
+UsBillingContactAsIncoiveRecipientIfExist=Use o contato / endereço com o tipo 'contato para cobrança' em vez do endereço de terceiros como destinatário das faturas
 ShowUnpaidAll=Mostrar todas as faturas não pagas
 ShowUnpaidLateOnly=Mostrar apenas faturas atrasadas não pagas
 PaymentInvoiceRef=Pagamento da fatura %s
@@ -497,19 +497,19 @@ CantRemovePaymentWithOneInvoicePaid=Não é possível remover o pagamento, uma v
 ExpectedToPay=Pagamento esperado
 CantRemoveConciliatedPayment=Não é possível remover o pagamento reconciliado
 PayedByThisPayment=Pago por esse pagamento
-ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
-ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
+ClosePaidInvoicesAutomatically=Classifica automaticamente todas as faturas padrão, de adiantamento ou de substituição como "Pagas" quando o pagamento é feito inteiramente.
+ClosePaidCreditNotesAutomatically=Classifica automaticamente todas as notas de crédito como "Pagas" quando o reembolso é feito totalmente.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
-AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
+AllCompletelyPayedInvoiceWillBeClosed=Todas as faturas sem sobras a pagar serão automaticamente encerradas com o status "Pago".
 ToMakePayment=Pagar
 ToMakePaymentBack=Reembolsar
 ListOfYourUnpaidInvoices=Lista de faturas não pagas
 NoteListOfYourUnpaidInvoices=Nota: Esta lista apenas contém fatura de terceiros dos quais você está definido como representante de vendas.
-RevenueStamp=Tax stamp
+RevenueStamp=Selo fiscal
 YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=Você precisa criar uma fatura padrão primeiro e convertê-la em "modelo" para criar uma nova fatura modelo
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFCrabeDescription=Fatura PDF template Crabe. Um modelo de fatura completo (implementação antiga do modelo Sponge)
 PDFSpongeDescription=Modelo PDF da fatura Esponja. Um modelo de fatura completo
 PDFCrevetteDescription=Modelo PDF da fatura Crevette. Um modelo de fatura completo para faturas de situação
 TerreNumRefModelDesc1=Devolve o número com o formato %syymm-nnnn para facturas standard e %syymm-nnnn para notas de crédito em que yy é ano, mm é mês e nnnn é uma sequência sem pausa e sem retorno a 0
@@ -523,14 +523,15 @@ TypeContact_facture_internal_SALESREPFOLL=Representante que dá seguimento à fa
 TypeContact_facture_external_BILLING=Contacto na fatura do cliente
 TypeContact_facture_external_SHIPPING=Contacto com o transporte do cliente
 TypeContact_facture_external_SERVICE=Contactar o serviço ao cliente
-TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up vendor invoice
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Fatura de fornecedor de acompanhamento representativo
 TypeContact_invoice_supplier_external_BILLING=Contacto da fatura do fornecedor
 TypeContact_invoice_supplier_external_SHIPPING=Contacto da expedição do fornecedor
-TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
+TypeContact_invoice_supplier_external_SERVICE=Contato de serviço do fornecedor
 # Situation invoices
 InvoiceFirstSituationAsk=Fatura da primeira situação
 InvoiceFirstSituationDesc=As <b> faturas de situação </ b> estão vinculadas a situações relacionadas a uma progressão, por exemplo, a progressão de uma construção. Cada situação está vinculada a uma fatura.
 InvoiceSituation=Fatura de situação
+PDFInvoiceSituation=Fatura de situação
 InvoiceSituationAsk=Fatura seguindo a situação
 InvoiceSituationDesc=Crie uma nova situação seguindo uma já existente
 SituationAmount=Valor da fatura da situação (líquida)
@@ -575,3 +576,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/pt_PT/blockedlog.lang b/htdocs/langs/pt_PT/blockedlog.lang
index d50a1d77f48..798b7e6a075 100644
--- a/htdocs/langs/pt_PT/blockedlog.lang
+++ b/htdocs/langs/pt_PT/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Exclusão lógica de doação
 logMEMBER_SUBSCRIPTION_CREATE=Inscrição de membro criada
 logMEMBER_SUBSCRIPTION_MODIFY=Inscrição de membro modificada
 logMEMBER_SUBSCRIPTION_DELETE=Exclusão lógica de assinatura de membro
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Download da fatura do cliente
 BlockedLogBillPreview=Pré-visualização da fatura do cliente
 BlockedlogInfoDialog=Detalhes do log
diff --git a/htdocs/langs/pt_PT/boxes.lang b/htdocs/langs/pt_PT/boxes.lang
index bfe70c39c7e..145da5f3ee4 100644
--- a/htdocs/langs/pt_PT/boxes.lang
+++ b/htdocs/langs/pt_PT/boxes.lang
@@ -1,18 +1,18 @@
 # Dolibarr language file - Source file is en_US - boxes
 BoxLoginInformation=Login Information
-BoxLastRssInfos=RSS Information
-BoxLastProducts=Latest %s Products/Services
+BoxLastRssInfos=Informação RSS
+BoxLastProducts=Produtos / serviços %s mais recentes
 BoxProductsAlertStock=Alertas de stock para produtos
 BoxLastProductsInContract=Os %s últimos produtos/serviços contratados
-BoxLastSupplierBills=Latest Vendor invoices
-BoxLastCustomerBills=Latest Customer invoices
+BoxLastSupplierBills=Últimas faturas do fornecedor
+BoxLastCustomerBills=Últimas faturas do cliente
 BoxOldestUnpaidCustomerBills=Faturas a clientes não pagas mais antigas
-BoxOldestUnpaidSupplierBills=Oldest unpaid vendor invoices
+BoxOldestUnpaidSupplierBills=Faturas de fornecedores não pagas mais antigas
 BoxLastProposals=Últimos orçamentos
 BoxLastProspects=Últimas prospeções modificadas
 BoxLastCustomers=Últimos clientes modificados
 BoxLastSuppliers=Últimos fornecedores modificados
-BoxLastCustomerOrders=Latest sales orders
+BoxLastCustomerOrders=Últimos pedidos de venda
 BoxLastActions=Últimas ações
 BoxLastContracts=Últimos contratos
 BoxLastContacts=Últimos contactos/endereços
@@ -21,23 +21,23 @@ BoxFicheInter=Últimas intervenções
 BoxCurrentAccounts=Saldo de abertura das contas
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
 BoxTitleLastRssInfos=Últimas %s notícias de %s
-BoxTitleLastProducts=Products/Services: last %s modified
+BoxTitleLastProducts=Produtos / serviços: último %s modificado
 BoxTitleProductsAlertStock=Produtos: alerta de stock
 BoxTitleLastSuppliers=Últimos %s fornecedores registados
-BoxTitleLastModifiedSuppliers=Vendors: last %s modified
-BoxTitleLastModifiedCustomers=Customers: last %s modified
+BoxTitleLastModifiedSuppliers=Fornecedores: última modificação %s
+BoxTitleLastModifiedCustomers=Clientes: última modificação %s
 BoxTitleLastCustomersOrProspects=Últimos %s clientes ou prospeções
-BoxTitleLastCustomerBills=Latest %s modified Customer invoices
-BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
-BoxTitleLastModifiedProspects=Prospects: last %s modified
+BoxTitleLastCustomerBills=Faturas do cliente modificadas %s mais recentes
+BoxTitleLastSupplierBills=Faturas de fornecedor modificadas %s mais recentes
+BoxTitleLastModifiedProspects=Perspectivas: última modificação %s
 BoxTitleLastModifiedMembers=Últimos %s membros
 BoxTitleLastFicheInter=Últimas %s intervenções modificadas 
-BoxTitleOldestUnpaidCustomerBills=Customer Invoices: oldest %s unpaid
-BoxTitleOldestUnpaidSupplierBills=Vendor Invoices: oldest %s unpaid
+BoxTitleOldestUnpaidCustomerBills=Faturas do cliente: %s mais antiga não paga
+BoxTitleOldestUnpaidSupplierBills=Faturas do fornecedor: %s mais antigo não pago
 BoxTitleCurrentAccounts=Contas em aberto: saldos
 BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
-BoxTitleLastModifiedContacts=Contacts/Addresses: last %s modified
-BoxMyLastBookmarks=Bookmarks: latest %s
+BoxTitleLastModifiedContacts=Contatos / endereços: último %s modificado
+BoxMyLastBookmarks=Marcadores: último %s
 BoxOldestExpiredServices=Mais antigos ativos de serviços vencidos
 BoxLastExpiredServices=Últimos %s contactos mais antigos com serviços ativos expirados
 BoxTitleLastActionsToDo=Últimas %s ações a fazer
@@ -46,36 +46,39 @@ BoxTitleLastModifiedDonations=Últimos %s donativos modificados
 BoxTitleLastModifiedExpenses=Últimos %s relatórios de despesas modificados
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Atividade global (faturas, orçamentos, encomendas)
 BoxGoodCustomers=Bons clientes
 BoxTitleGoodCustomers=%s bons clientes
-FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
+BoxScheduledJobs=Trabalhos agendadas
+BoxTitleFunnelOfProspection=Lead funnel
+FailedToRefreshDataInfoNotUpToDate=Falha ao atualizar o fluxo RSS. Data da última atualização bem-sucedida: %s
 LastRefreshDate=Última data de atualização
 NoRecordedBookmarks=Não existem marcadores definidos.
 ClickToAdd=Clique aqui para adicionar.
 NoRecordedCustomers=Nenhum cliente registado
 NoRecordedContacts=Nenhum contacto registado
 NoActionsToDo=Sem ações a realizar
-NoRecordedOrders=No recorded sales orders
+NoRecordedOrders=Nenhum pedido de venda registrado
 NoRecordedProposals=Sem orçamentos registados
 NoRecordedInvoices=Nenhuma fatura a cliente registada
 NoUnpaidCustomerBills=Nenhuma fatura a clientes pendente de pagamento
-NoUnpaidSupplierBills=No unpaid vendor invoices
-NoModifiedSupplierBills=No recorded vendor invoices
+NoUnpaidSupplierBills=Sem faturas de fornecedores não pagas
+NoModifiedSupplierBills=Nenhuma fatura de fornecedor registrada
 NoRecordedProducts=Nenhum produto/serviço registado
 NoRecordedProspects=Nenhuma prospecção registada
 NoContractedProducts=Não contractados produtos / serviços
 NoRecordedContracts=Sem contratos registrados
 NoRecordedInterventions=Nenhuma intervenção registada
-BoxLatestSupplierOrders=Latest purchase orders
+BoxLatestSupplierOrders=Últimos pedidos de compra
 BoxLatestSupplierOrdersAwaitingReception=Latest Purchase Orders (with a pending reception)
-NoSupplierOrder=No recorded purchase order
+NoSupplierOrder=Nenhum pedido de compra registrado
 BoxCustomersInvoicesPerMonth=Customer Invoices per month
 BoxSuppliersInvoicesPerMonth=Vendor Invoices per month
 BoxCustomersOrdersPerMonth=Sales Orders per month
 BoxSuppliersOrdersPerMonth=Vendor Orders per month
 BoxProposalsPerMonth=Orçamentos por mês
-NoTooLowStockProducts=No products are under the low stock limit
+NoTooLowStockProducts=Nenhum produto está abaixo do limite mínimo de estoque
 BoxProductDistribution=Products/Services Distribution
 ForObject=On %s
 BoxTitleLastModifiedSupplierBills=Vendor Invoices: last %s modified
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Contabilidade
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/pt_PT/cashdesk.lang b/htdocs/langs/pt_PT/cashdesk.lang
index d1dba40375b..4c30714cba3 100644
--- a/htdocs/langs/pt_PT/cashdesk.lang
+++ b/htdocs/langs/pt_PT/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nº de faturas
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/pt_PT/categories.lang b/htdocs/langs/pt_PT/categories.lang
index bd0e39a4308..57c37b4515a 100644
--- a/htdocs/langs/pt_PT/categories.lang
+++ b/htdocs/langs/pt_PT/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Área de etiquetas/categorias de projetos
 UsersCategoriesArea=Users tags/categories area
 SubCats=Subcategorias
 CatList=Lista de etiquetas/categorias
+CatListAll=List of tags/categories (all types)
 NewCategory=Nova etiqueta/categoria
 ModifCat=Modificar etiqueta/categoria
 CatCreated=Etiqueta/categoria criada
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=ID de etiqueta/categoria
-CatSupList=Lista de tags / categorias de fornecedores
-CatCusList=Lista de etiquetas/categorias de clientes/prospecções
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Lista de etiquetas/categorias de produtos
 CatMemberList=Lista de etiquetas/categorias de membros
-CatContactList=Lista de etiquetas/categorias de contactos
-CatSupLinks=Ligações entre fornecedores e etiquetas/categorias
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Ligações entre clientes/prospecções e etiquetas/categorias
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Ligações entre produtos/serviços e etiquetas/categorias
-CatProJectLinks=Ligações entre os projetos e etiquetas/categorias
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Ligações entre os projetos e etiquetas/categorias
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remover das etiquetas/categoria
 ExtraFieldsCategories=Atributos Complementares
 CategoriesSetup=Configuração de etiquetas/categorias
diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
index 0c75b753e4c..6e9e1163487 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Verifique o ID do IVA intracomunitário no site da Com
 VATIntraManualCheck=Você também pode verificar manualmente no site da Comissão Europeia <a href="%s" target="_blank"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Verificação Impossivel. O serviço de verificação não é prestado pelo país membro (%s).
 NorProspectNorCustomer=Não é cliente potencial, nem cliente
-JuridicalStatus=Tipo de Entidade Legal
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Funcionários
 ProspectLevelShort=Cli. Potenc.
diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang
index 429e6922009..03ccdc3308f 100644
--- a/htdocs/langs/pt_PT/compta.lang
+++ b/htdocs/langs/pt_PT/compta.lang
@@ -11,7 +11,7 @@ FeatureIsSupportedInInOutModeOnly=Função disponível somente ao modo contas CR
 VATReportBuildWithOptionDefinedInModule=Montantes apresentados aqui são calculadas usando as regras definidas pelo Imposto de configuração do módulo.
 LTReportBuildWithOptionDefinedInModule=Os valores mostrados aqui são calculados usando regras definidas pela configuração da empresa.
 Param=Parametrização
-RemainingAmountPayment=Amount payment remaining:
+RemainingAmountPayment=Valor do pagamento restante:
 Account=Conta
 Accountparent=Conta pai
 Accountsparent=Contas pai
@@ -111,9 +111,9 @@ Refund=Reembolso
 SocialContributionsPayments=Pagamentos de impostos sociais/fiscais
 ShowVatPayment=Ver Pagamentos IVA
 TotalToPay=Total a Pagar
-BalanceVisibilityDependsOnSortAndFilters=O saldo é visível nesta lista apenas se a tabela estiver classificada como ascendente no %s e filtrada para uma conta bancária
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Código de contabilidade do cliente
-SupplierAccountancyCode=Vendor accounting code
+SupplierAccountancyCode=Código de contabilidade do fornecedor
 CustomerAccountancyCodeShort=Cust. conta. código
 SupplierAccountancyCodeShort=Sup. conta. código
 AccountNumber=Número de conta
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Tem certeza de que deseja eliminar este pagament
 ExportDataset_tax_1=Impostos e pagamentos sociais e fiscais
 CalcModeVATDebt=Modo <b> %sVAT no compromisso accounting%s </ b>.
 CalcModeVATEngagement=Modo <b> %sVAT em rendimentos-expenses%s </ b>.
-CalcModeDebt=Análise de faturas registradas, mesmo que ainda não estejam contabilizadas no razão.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Análise de pagamentos registrados conhecidos, mesmo que eles ainda não sejam contabilizados no Ledger.
 CalcModeBookkeeping=Análise de dados com periodicidade na tabela Ledger de contabilidade.
 CalcModeLT1= Modo <b> %sRE nas faturas do cliente - fornecedores invoices%s </ b>
@@ -154,11 +154,11 @@ AnnualSummaryInputOutputMode=Balanço da receita e despesas, resumo anual
 AnnualByCompanies=Saldo de receitas e despesas, por grupos predefinidos de conta
 AnnualByCompaniesDueDebtMode=Saldo de receitas e despesas, detalhe por grupos predefinidos, modo <b> %sClaims-Debts%s </ b> disse <b> Contabilidade de compromisso </ b>.
 AnnualByCompaniesInputOutputMode=Saldo de receitas e despesas, detalhe por grupos predefinidos, modo <b> %sIncomes-Expenses%s </ b> disse <b> contabilidade de caixa </ b>.
-SeeReportInInputOutputMode=Consulte %sanálise de payments%s para um cálculo de pagamentos reais efetuados, mesmo que eles ainda não tenham sido contabilizados no Ledger.
-SeeReportInDueDebtMode=Consulte %sanálise de invoices%s para um cálculo baseado em faturas registradas conhecidas, mesmo que elas ainda não tenham sido contabilizadas no Ledger.
-SeeReportInBookkeepingMode=Consulte <b> %sRelatório de reservas%s </ b> para um cálculo na <b> tabela Razão da contabilidade </ b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Os montantes exibidos contêm todas as taxas incluídas
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
+RulesResultDue=- Inclui faturas pendentes, despesas, IVA, doações pagas ou não. Inclui também salários pagos. <br> - Baseia-se na data de cobrança das faturas e na data de vencimento das despesas ou pagamentos de impostos. Para salários definidos com o módulo Salários, é utilizada a data-valor de pagamento.
 RulesResultInOut=- Inclui os pagamentos reais feitos em faturas, despesas, IVA e salários. <br> - Baseia-se nas datas de pagamento das faturas, despesas, IVA e salários. A data de doação para doação.
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Ele mostra um registro em seu livro contábil
 SeePageForSetup=Veja o menu <a href="%s"> %s </a> para configuração
 DepositsAreNotIncluded=- As faturas de adiantamento não estão incluídas
 DepositsAreIncluded=- As faturas de adiantamento estão incluídas
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Denunciar imposto 2 por terceiros
 LT2ReportByCustomers=Denunciar imposto 3 por terceiros
 LT1ReportByCustomersES=Relatório de terceiros RE
 LT2ReportByCustomersES=Relatório de terceiros IRPF
 VATReport=Relatório fiscal de venda
 VATReportByPeriods=Relatório fiscal de vendas por período
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Relatório fiscal de venda por taxas
 VATReportByThirdParties=Relatório fiscal de vendas de terceiros
 VATReportByCustomers=Relatório fiscal de venda por cliente
diff --git a/htdocs/langs/pt_PT/cron.lang b/htdocs/langs/pt_PT/cron.lang
index 4f3f47748fe..d6f7062e193 100644
--- a/htdocs/langs/pt_PT/cron.lang
+++ b/htdocs/langs/pt_PT/cron.lang
@@ -1,19 +1,20 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 # Right
-Permission23101 = Ler trabalho 'Agendado'
-Permission23102 = Criar/atualizar trabalho agendado
-Permission23103 = Eliminar trabalho agendado
-Permission23104 = Executar Trabalho Agendado
+Permission23101 = Ler tarefa 'Agendada'
+Permission23102 = Criar/atualizar tarefa 'Agendada'
+Permission23103 = Eliminar tarefa 'Agendada'
+Permission23104 = Executar tarefa 'Agendada'
 # Admin
-CronSetup= Configuração da gestão de tarefas agendadas
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
-KeyForCronAccess=Security key for URL to launch cron jobs
+CronSetup=Configuração da gestão de tarefas agendadas
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
+KeyForCronAccess=Código de segurança para URL para iniciar tarefas qualificadas
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -22,12 +23,12 @@ EnabledAndDisabled=Ativado e desativado
 CronLastOutput=Latest run output
 CronLastResult=Latest result code
 CronCommand=Comando
-CronList=Tarefas agendadas
-CronDelete=Delete scheduled jobs
-CronConfirmDelete=Tem certeza de que deseja eliminar estes trabalhos agendados?
-CronExecute=Launch scheduled job
-CronConfirmExecute=Tem certeza de que deseja executar esses trabalhos agendados agora?
-CronInfo=Módulo de trabalhos agendados permite agendar trabalhos para executá-los automaticamente. Os trabalhos também podem ser iniciados manualmente.
+CronList=Trabalhos agendadas
+CronDelete=Eliminar tarefas agendadas
+CronConfirmDelete=Tem a certeza que deseja eliminar estas tarefas agendadas?
+CronExecute=Iniciar tarefa agendada
+CronConfirmExecute=Tem a certeza de que deseja executar agora estas tarefas agendadas?
+CronInfo=O módulo de tarefas agendadas permite agendar tarefas para executá-las automaticamente. As tarefas também podem ser iniciadas manualmente.
 CronTask=Tarefa
 CronNone=Nenhuma
 CronDtStart=Não antes
@@ -39,16 +40,17 @@ CronFrequency=Frequência
 CronClass=Classe
 CronMethod=Método
 CronModule=Módulo
-CronNoJobs=Nenhumas tarefas registadas
+CronNoJobs=Sem tarefas registadas
 CronPriority=Prioridade
 CronLabel=Etiqueta
-CronNbRun=N.º de Execução
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Cada
-JobFinished=Terafa lançada e concluída
+JobFinished=Tarefa iniciada e concluída
+Scheduled=Scheduled
 #Page card
 CronAdd= Adicionar tarefas
-CronEvery=Executar cada trabalho
+CronEvery=Executar cada tarefa
 CronObject=Instância/Objeto para criar
 CronArgs=Parâmetros
 CronSaveSucess=Guardado com sucesso
@@ -56,28 +58,34 @@ CronNote=Comentário
 CronFieldMandatory=Os campos %s são obrigatórios
 CronErrEndDateStartDt=A data de fim não pode ser anterior à data de início
 StatusAtInstall=Estado da instalação do módulo
-CronStatusActiveBtn=Ativar
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Desativar
-CronTaskInactive=Esta tarefa está desactivada
+CronTaskInactive=Esta tarefa está desativada
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
-CronCreateJob=Create new Scheduled Job
+CronCreateJob=Criar nova 'Tarefa Agendada'
 CronFrom=De
 # Info
 # Common
-CronType=Tipo de trabalho
+CronType=Tipo de tarefa
 CronType_method=Call method of a PHP Class
 CronType_command=Shell command
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index 1750e06b3f6..57f8d93ee48 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Nenhum erro
 # Errors
 ErrorButCommitIsDone=Erros encontrados, mas a validação foi efetuada apesar disso
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=O url %s está errado
 ErrorBadValueForParamNotAString=Valor ruim para o seu parâmetro. Acrescenta geralmente quando falta a tradução.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=O login %s já existe.
 ErrorGroupAlreadyExists=O grupo %s já existe.
 ErrorRecordNotFound=Registo não foi encontrado.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Não se indicaram alguns campos obrigatórios
 ErrorSubjectIsRequired=O tópico do email é obrigatório
 ErrorFailedToCreateDir=Erro na criação de uma pasta. Verifique se o usuário do servidor Web tem acesso de escrita aos documentos Dolibarr. Se o parâmetro <b> safe_mode </ b> está ativo no PHP, Verifique se os arquivos php do Dolibarr são da propriedade do usuário do servidor web.
 ErrorNoMailDefinedForThisUser=E-Mail não definido para este utilizador
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Esta Funcionalidade precisa de javascript activo para funcionar. Modifique em configuração->ambiente.
 ErrorTopMenuMustHaveAParentWithId0=Um menu do tipo 'Superior' não pode ter um menu pai. Coloque 0 ao ID pai ou busque um menu do tipo 'esquerdo'
 ErrorLeftMenuMustHaveAParentId=Um menu do tipo 'esquerdo' deve de ter um ID de pai
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Este nome de perfil já existe para este conjunto de
 ErrorLDAPSetupNotComplete=A configuração Dolibarr-LDAP é incompleta.
 ErrorLDAPMakeManualTest=Foi criado um Ficheiro .ldif na pasta %s. Trate de gerir manualmente este Ficheiro desde a linha de comandos para Obter mais detalhes acerca do erro.
 ErrorCantSaveADoneUserWithZeroPercentage=Não é possível salvar uma ação com "status não iniciado" se o campo "concluído por" também estiver preenchido.
-ErrorRefAlreadyExists=A referencia utilizada para a criação já existe
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Por favor, insira o nome do extrato bancário onde a entrada deve ser relatada (Formato AAAA ou AAAAMMDD)
 ErrorRecordHasChildren=Falha ao excluir registro, pois possui alguns registros filhos.
 ErrorRecordHasAtLeastOneChildOfType=O objeto tem pelo menos um elemento do tipo %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Você deve escolher se o artigo 
 ErrorDiscountLargerThanRemainToPaySplitItBefore=O desconto que você tenta aplicar é maior do que continuar a pagar. Divida o desconto em 2 descontos menores antes.
 ErrorFileNotFoundWithSharedLink=Ficheiro não encontrado. É possível que a chave de partilha tenha sido modificada ou o ficheiro tenha sido removido recentemente.
 ErrorProductBarCodeAlreadyExists=O código de barras do produto %s já existe em outra referência de produto.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Observe também que não é possível usar o produto virtual para aumentar / diminuir automaticamente subprodutos quando pelo menos um subproduto (ou subproduto de subprodutos) precisa de um número de série / lote.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=A descrição é obrigatória para linhas com produto livre
 ErrorAPageWithThisNameOrAliasAlreadyExists=A página / container <strong> %s </ strong> tem o mesmo nome ou alias alternativo que você usa
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=Uma senha foi definida para este membro. No entanto, nenhuma conta de usuário foi criada. Portanto, essa senha é armazenada, mas não pode ser usada para fazer login no Dolibarr. Pode ser usado por um módulo externo / interface, mas se você não precisa definir nenhum login nem senha para um membro, você pode desativar a opção "Gerenciar um login para cada membro" da configuração do módulo de membro. Se você precisar gerenciar um login, mas não precisar de nenhuma senha, poderá manter esse campo vazio para evitar esse aviso. Nota: O email também pode ser usado como um login se o membro estiver vinculado a um usuário.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=O seu login foi modificado. Por motivos d
 WarningAnEntryAlreadyExistForTransKey=Já existe uma entrada para a chave de tradução para este idioma
 WarningNumberOfRecipientIsRestrictedInMassAction=Atenção, o número de destinatários diferentes é limitado a <b> %s </ b> ao usar as ações em massa nas listas
 WarningDateOfLineMustBeInExpenseReportRange=Atenção, a data da linha não está no intervalo do relatório de despesas
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/pt_PT/exports.lang b/htdocs/langs/pt_PT/exports.lang
index 519f3985bc9..083e48f5527 100644
--- a/htdocs/langs/pt_PT/exports.lang
+++ b/htdocs/langs/pt_PT/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Campo título
 NowClickToGenerateToBuildExportFile=Agora, selecione o formato de arquivo na caixa de combinação e clique em "Generate" para construir o arquivo de exportação ...
 AvailableFormats=Formatos Disponíveis
 LibraryShort=Biblioteca
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Passo
 FormatedImport=Assistente de Importação
 FormatedImportDesc1=Este módulo permite-lhe atualizar os dados existentes ou adicionar novos objetos na base de dados a partir de um ficheiro sem conhecimentos técnicos, utilizando um assistente.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Chave (coluna) a ser usada para <b> atualizar </ b> dados ex
 NbInsert=Número de linhas inseridas: %s
 NbUpdate=Número de linhas atualizadas: %s
 MultipleRecordFoundWithTheseFilters=Foram encontrados vários registos com esses filtros: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/pt_PT/mails.lang b/htdocs/langs/pt_PT/mails.lang
index 4711f17de75..48aee28e94b 100644
--- a/htdocs/langs/pt_PT/mails.lang
+++ b/htdocs/langs/pt_PT/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Entrada de e-mails pelo usuário
 MailingModuleDescDolibarrUsers=Usuários com e-mails
 MailingModuleDescThirdPartiesByCategories=Terceiros (por categorias)
 SendingFromWebInterfaceIsNotAllowed=Envio de interface web não é permitido.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Linha %s em Ficheiro
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=Nenhum email enviado. Remetente incorreto ou email do destinatário. Verifique o perfil do usuário.
 # Module Notifications
 Notifications=Notificações
-NoNotificationsWillBeSent=Nenhuma notificação por e-mail está prevista para este evento e empresa
-ANotificationsWillBeSent=1 notificação vai a ser enviada por e-mail
-SomeNotificationsWillBeSent=%s Notificações vão ser enviadas por e-mail
-AddNewNotification=Ativar um novo alvo/evento de notificação por e-mail
-ListOfActiveNotifications=Listar todos os destinos / eventos ativos para notificação por email
-ListOfNotificationsDone=Lista de todas as notificações de e-mail enviado
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=A configuração do envio de email foi configurada para '%s'. Este modo não pode ser usado para enviar e-mails em massa.
 MailSendSetupIs2=Você deve primeiro ir, com uma conta admin, no menu %sHome - Setup - EMails%s para alterar o parâmetro <strong> '%s' </ strong> para usar o modo '%s'. Com esse modo, você pode inserir a configuração do servidor SMTP fornecido pelo seu provedor de serviços de Internet e usar o recurso de envio de email em massa.
 MailSendSetupIs3=Se você tiver alguma dúvida sobre como configurar seu servidor SMTP, você pode perguntar para %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=O arquivo importado deve ter formato <strong> email;
 UseFormatInputEmailToTarget=Insira uma string com o formato <strong> email; nome; nome; outro </ strong>
 MailAdvTargetRecipients=Destinatários (seleção avançada)
 AdvTgtTitle=Preencha os campos de entrada para pré-selecionar os terceiros ou contatos / endereços para segmentar
-AdvTgtSearchTextHelp=Use %% como curingas. Por exemplo, para encontrar todos os itens como <b> jean, joe, jim </ b>, você pode inserir <b> j%% </ b>, você também pode usar; como separador por valor e use! por exceto este valor. Por exemplo, <b> jean; joe; jim%%;! Jimo;! Jima% </ b> terá como alvo todo o jean, joe, comece com jim mas não jimo e nem tudo que começar com jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval para selecionar int ou valor float
 AdvTgtMinVal=Valor mínimo
 AdvTgtMaxVal=Valor máximo
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Criar filtro
 AdvTgtOrCreateNewFilter=Nome do novo filtro
 NoContactWithCategoryFound=Nenhum contato / endereço com uma categoria encontrada
 NoContactLinkedToThirdpartieWithCategoryFound=Nenhum contato / endereço com uma categoria encontrada
-OutGoingEmailSetup=Configuração de email de saída
-InGoingEmailSetup=Configuração de email de entrada
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Configuração de email de saída padrão
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Informação
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index d49765da4c1..2fb27694a89 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Nenhum modelo disponível para este tipo de e-mail
 AvailableVariables=Variáveis de substituição disponíveis
 NoTranslation=Sem tradução
 Translation=Tradução
+CurrentTimeZone=Zona Horária PHP (servidor)
 EmptySearchString=Introduza alguns critérios de pesquisa
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Nenhum foi encontrado nenhum registo
 NoRecordDeleted=Nenhum registo eliminado
 NotEnoughDataYet=Não existe dados suficientes
@@ -85,6 +87,8 @@ FileWasNotUploaded=Um ficheiro foi seleccionada para ser anexado, mas ainda não
 NbOfEntries=N.º de entradas
 GoToWikiHelpPage=Consultar ajuda online (necessita de acesso à Internet)
 GoToHelpPage=Ir para páginas de ajuda
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Página Inicial
 RecordSaved=Registo Guardado
 RecordDeleted=Registo eliminado
 RecordGenerated=Registo gerado
@@ -433,6 +437,7 @@ RemainToPay=Montante por pagar
 Module=Módulo/Aplicação
 Modules=Módulos/Aplicações
 Option=Opção
+Filters=Filters
 List=Lista
 FullList=Lista Completa
 FullConversation=Conversa completa
@@ -671,7 +676,7 @@ SendMail=Enviar e-mail
 Email=Email
 NoEMail=Sem e-mail
 AlreadyRead=Já lido
-NotRead=Não lido
+NotRead=Unread
 NoMobilePhone=Sem telefone móvel
 Owner=Proprietário
 FollowingConstantsWillBeSubstituted=As seguintes constantes serão substituidas pelo seu valor correspondente.
@@ -1107,3 +1112,8 @@ UpToDate=Actualizado
 OutOfDate=Desactualizado
 EventReminder=Lembrete de evento
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/pt_PT/modulebuilder.lang b/htdocs/langs/pt_PT/modulebuilder.lang
index 416c94c117f..f4005f2db69 100644
--- a/htdocs/langs/pt_PT/modulebuilder.lang
+++ b/htdocs/langs/pt_PT/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=Página PHP para criar/editar/visualizar um registo
 PageForAgendaTab=Página PHP para guia de evento
 PageForDocumentTab=Página PHP para guia do documento
 PageForNoteTab=Página do PHP para a guia de nota
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Caminho para o ficheiro pacote .zip do módulo/aplicação
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Espaços ou caracteres especiais não são permitidos.
@@ -77,7 +78,7 @@ IsAMeasure=É uma medida
 DirScanned=Diretório varrido
 NoTrigger=Nenhum gatilho
 NoWidget=Nenhum widget
-GoToApiExplorer=Ir para o explorador de API
+GoToApiExplorer=API explorer
 ListOfMenusEntries=Lista de entradas do menu
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=Lista de permissões definidas
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Se você tem conhecimento de SQL e PHP, você pode usar
 SeeTopRightMenu=Veja <span class = "fa fa-bug"> </ span> no menu superior direito
 AddLanguageFile=Adicionar ficheiro de idiomas
 YouCanUseTranslationKey=Você pode usar aqui uma chave que é a chave de tradução encontrada no arquivo de idioma (veja a aba "Idiomas")
-DropTableIfEmpty=(Excluir tabela se vazia)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=A tabela %s não existe
 TableDropped=Tabela %s excluída
 InitStructureFromExistingTable=Construir a cadeia de matriz de estrutura de uma tabela existente
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang
index ce2b87ce1ac..eb83548c18c 100644
--- a/htdocs/langs/pt_PT/other.lang
+++ b/htdocs/langs/pt_PT/other.lang
@@ -5,8 +5,6 @@ Tools=Utilidades
 TMenuTools=Ferramentas
 ToolsDesc=Todas as ferramentas não incluídas em outras entradas do menu estão agrupadas aqui. Todas as ferramentas podem ser acessadas através do menu à esquerda.
 Birthday=Aniversario
-BirthdayDate=Data de nascimento
-DateToBirth=Birth date
 BirthdayAlertOn=Alerta de aniversário activo
 BirthdayAlertOff=Alerta aniversário inativo
 TransKey=Tradução da chave TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Mês anterior (número 1-12) à data da fatura
 TextPreviousMonthOfInvoice=Mês anterior (texto) da data da fatura
 NextMonthOfInvoice=Mês seguinte (número 1-12) à data da fatura
 TextNextMonthOfInvoice=Mês seguinte (texto) à data da fatura
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Ficheiro zip gerado em <b>%s</b>.
 DocFileGeneratedInto=Ficheiro doc gerado em <b>%s</b>.
 JumpToLogin=Desconectado. Vá para a página de inicio de sessão...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Você pode clicar no link abaixo para fazer seu pagamento, se ainda não estiver pronto.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Olá)__\n\n\n__(Atenciosamente)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=O Dolibarr é um ERP/CRM compacto que suporta vários módulos de negócios. Uma demonstração mostrando todos os módulos não faz sentido porque esse cenário nunca ocorre (várias centenas disponíveis). Assim, vários perfis de demonstração estão disponíveis.
 ChooseYourDemoProfil=Escolha o perfil de demonstração que melhor se adequa às suas necessidades ...
 ChooseYourDemoProfilMore=...ou crie o seu próprio perfil <br> (seleção manual de módulo)
@@ -137,7 +138,7 @@ Right=Direito
 CalculatedWeight=Peso calculado
 CalculatedVolume=Volume calculado
 Weight=Peso
-WeightUnitton=Toneladas
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Área de Exportações
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index c3b0fc3d5eb..1645e82dee9 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Nº de preços
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Número de produtos de embalagem fonte
@@ -167,8 +168,10 @@ BuyingPrices=Preços de compra
 CustomerPrices=Preços aos clientes
 SuppliersPrices=Preços de fornecedor
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Código Aduaneiro / Commodity / HS
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=País de origem
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Utilizar o preço fixo
 PriceByQuantity=Preços diferentes por quantidade
 DisablePriceByQty=Desativar preços por quantidade
 PriceByQuantityRange=Gama de quantidades
-MultipriceRules=Regras de segmento de preço
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Utilizar regras de segmento de preço (definidas na configuração do módulo do produto) para calcular automaticamente os preços de todos os outros segmentos de acordo com o primeiro segmento
 PercentVariationOver=variação %% sobre %s
 PercentDiscountOver=%% desconto sobre %s
diff --git a/htdocs/langs/pt_PT/recruitment.lang b/htdocs/langs/pt_PT/recruitment.lang
index b11245de51e..eb48df47240 100644
--- a/htdocs/langs/pt_PT/recruitment.lang
+++ b/htdocs/langs/pt_PT/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/pt_PT/sendings.lang b/htdocs/langs/pt_PT/sendings.lang
index 156fc7a9c54..f66f4fbc0fe 100644
--- a/htdocs/langs/pt_PT/sendings.lang
+++ b/htdocs/langs/pt_PT/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Outros Envios deste Pedido
 SendingsAndReceivingForSameOrder=Envios e receções para esta encomenda
 SendingsToValidate=Expedições por validar
 StatusSendingCanceled=Cancelado
+StatusSendingCanceledShort=Cancelado
 StatusSendingDraft=Rascunho
 StatusSendingValidated=Validado (produtos a enviar ou enviados)
 StatusSendingProcessed=Processado
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Deve validar a encomenda antes de poder efetuar
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Modelo de documento mais completo para a entrega recibos (logo. ..)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER constante não definida
 SumOfProductVolumes=Soma dos volumes dos produtos
 SumOfProductWeights=Soma dos pesos dos produtos
diff --git a/htdocs/langs/pt_PT/stocks.lang b/htdocs/langs/pt_PT/stocks.lang
index 2ad95e6aadc..749a693d3b6 100644
--- a/htdocs/langs/pt_PT/stocks.lang
+++ b/htdocs/langs/pt_PT/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/pt_PT/ticket.lang b/htdocs/langs/pt_PT/ticket.lang
index 4ef4dab738e..3b45f4471c9 100644
--- a/htdocs/langs/pt_PT/ticket.lang
+++ b/htdocs/langs/pt_PT/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Lógica do sistema de desconexão
-TicketTypeShortBUGHARD=Disfonctionnement matériel
-TicketTypeShortCOM=Questão comercial
 
+TicketTypeShortCOM=Questão comercial
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Outro
 TicketSeverityShortLOW=Baixo
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Alto
-TicketSeverityShortBLOCKING=Crítico / Bloqueio
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Campo '%s' incorreto
 MenuTicketMyAssign=Os meus tickets
@@ -60,7 +58,6 @@ OriginEmail=Fonte de e-mail
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Não lido
 Read=Ler
 Assigned=Atribuído
 InProgress=Em progresso
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=A interface pública permite que qualquer vis
 TicketsAutoAssignTicket=Atribuir automaticamente o usuário que criou o ticket
 TicketsAutoAssignTicketHelp=Ao criar um ticket, o usuário pode ser atribuído automaticamente ao ticket.
 TicketNumberingModules=Módulo de numeração de ingressos
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Não notificar a empresa na criação
 Unread=Não lida
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/pt_PT/website.lang b/htdocs/langs/pt_PT/website.lang
index c18079450fb..9b4a56eab98 100644
--- a/htdocs/langs/pt_PT/website.lang
+++ b/htdocs/langs/pt_PT/website.lang
@@ -30,7 +30,6 @@ EditInLine=Editar em linha
 AddWebsite=Adicionar site da Web
 Webpage=Página/recipiente da Web
 AddPage=Adicionar página/recipiente
-HomePage=Página Inicial
 PageContainer=Página
 PreviewOfSiteNotYetAvailable=Pré-visualização do seu site <strong> %s </ strong> ainda não disponível. Você deve primeiro '<strong> Importar um modelo de site completo </ strong>' ou apenas '<strong> Adicionar uma página / contêiner </ strong>'.
 RequestedPageHasNoContentYet=Página solicitada com o ID %s ainda não tem conteúdo, ou o arquivo de cache .tpl.php foi removido. Edite o conteúdo da página para resolver isso.
@@ -101,7 +100,7 @@ EmptyPage=Página vazia
 ExternalURLMustStartWithHttp=O URL externo deve começar com http: // ou https: //
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Incluir conteúdo dinâmico
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=URL interno da página
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=Esta página / contêiner tem tradução
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/pt_PT/withdrawals.lang b/htdocs/langs/pt_PT/withdrawals.lang
index 56a6745c1c0..e0badd9bf68 100644
--- a/htdocs/langs/pt_PT/withdrawals.lang
+++ b/htdocs/langs/pt_PT/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Últimos recibos de débito direto %s
 MakeWithdrawRequest=Efetuar um pedido de pagamento por débito direto
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=Pedidos de pagamento por débito direto %s registrados
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=Nenhuma fatura debitada com sucesso. Verifique se as faturas estão em empresas com um IBAN válido e se o IBAN tem uma UMR (Unique Mandate Reference) com o modo <strong> %s </ strong>.
 ClassCredited=Classificar como creditado
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Data de execução
 CreateForSepa=Criar ficheiro de débito direto
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Pedido de pagamento por débito direto recusado
 InfoRejectMessage=Olá, <br> <br> a ordem de pagamento de débito directo da factura  %s relacionada com a empresa %s, com uma quantidade de %s foi recusada pelo banco. <br> <br> <br> <br>%s
 ModeWarning=Opção para o modo real não foi definido, nós paramos depois desta simulação
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index db1f0e59b3f..729619f6738 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=Toate țările, cu excepția %s
 AccountantFiles=Export documente sursă
 ExportAccountingSourceDocHelp=Cu acest instrument, puteți exporta evenimentele sursă (listă și PDF-uri) care au fost utilizate pentru a vă genera înregistrările contabile. Pentru a vă exporta jurnalele, utilizați intrarea din meniu %s-%s.
 VueByAccountAccounting=Vizualizare după contul contabil
+VueBySubAccountAccounting=Vizualizați după subcont contabil
 
 MainAccountForCustomersNotDefined=Contul contabil principal pentru clienții care nu sunt definiți în configurare
 MainAccountForSuppliersNotDefined=Contul contabil principal pentru furnizorii care nu sunt definiți în configurare
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Nu este asociat cu contul contabil
 XLineSuccessfullyBinded=%s produse/servicii legate cu succes de un cont contabil
 XLineFailedToBeBinded=Produsele / serviciile %s nu au fost asociate niciunui cont contabil
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Număr de elemente de legat afișate de pagină (maximum recomandat: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Numărul maxim de linii în liste și pe pagina de legare (recomandat: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Începeți sortarea paginii "Asocieri de făcut" după cele mai recente elemente
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Începeți sortarea paginii "Asocieri făcute" după cele mai recente elemente
 
@@ -198,7 +199,8 @@ Docdate=Data
 Docref=Referinţă
 LabelAccount=Etichetă cont
 LabelOperation=Etichetarea operaţiei
-Sens=Sens
+Sens=Direcţie
+AccountingDirectionHelp=Pentru un cont contabil al unui client, utilizați Credit pentru a înregistra o plată pe care ați primit-o <br> Pentru un cont contabil al unui furnizor, utilizați Debit pentru a înregistra o plată pe care o efectuați
 LetteringCode=Codul de scriere
 Lettering=Numerotare
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Eticheta jurnalului
 NumPiece=Număr nota contabila
 TransactionNumShort=Numărul tranzacţiei
 AccountingCategory=Grupuri personalizate
-GroupByAccountAccounting=Grupează după contul contabil
+GroupByAccountAccounting=Grupare după cont registru
+GroupBySubAccountAccounting=Grupare după cont de subregistru
 AccountingAccountGroupsDesc=Puteți defini aici câteva grupuri de conturi de contabilitate. Acestea vor fi utilizate pentru rapoarte contabile personalizate.
 ByAccounts=Prin conturi
 ByPredefinedAccountGroups=Prin grupuri predefinite
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Plata nu legată de vreun produs/serviciu
 OpeningBalance=Sold iniţial de deschidere
 ShowOpeningBalance=Afişează  soldurile de deschidere
 HideOpeningBalance=Ascunde soldurile de deschidere
-ShowSubtotalByGroup=Afişare subtotal după grupă
+ShowSubtotalByGroup=Afișează subtotalul după nivel
 
 Pcgtype=Grup de conturi
 PcgtypeDesc=Grupele de conturi sunt utilizate ca criterii predefinite de 'filtrare' și 'grupare' pentru unele rapoarte contabile. De exemplu, 'VENITURI' sau 'CHELTUIELI' sunt utilizate ca grupe pentru conturile contabile ale produselor pentru a construi raportul de cheltuieli/venituri.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consultați aici lista liniilor de raportare a cheltuiel
 DescVentilExpenseReportMore=Dacă configurați contul de contabilitate pe linii de raportare a tipurilor de cheltuieli, aplicația va putea face toate legătura între liniile dvs. de raportare a cheltuielilor și contul contabil al planului dvs. de conturi, într-un singur clic <strong> „%s“ </strong>. În cazul în care contul nu a fost stabilit în dicționar de taxe sau dacă aveți încă anumite linii care nu sunt legate de niciun cont, va trebui să faceți o legare manuală din meniu<strong> %s </strong>".
 DescVentilDoneExpenseReport=Consultați aici lista liniilor rapoartelor privind cheltuielile și contul contabil a taxelor lor
 
+Closure=Închidere anuală
 DescClosure=Consultați aici numărul de tranzacţii lunare care nu sunt validate și se află în anii fiscali deschişi
 OverviewOfMovementsNotValidated=Pasul 1 / Prezentarea generală a tranzacţiilor nevalidate. (Necesar pentru a închide un an fiscal)
+AllMovementsWereRecordedAsValidated=Toate mișcările au fost înregistrate ca validate
+NotAllMovementsCouldBeRecordedAsValidated=Nu toate mișcările au putut fi înregistrate ca validate
 ValidateMovements=Vallidare trasferuri
 DescValidateMovements= Orice modificare sau ștergere a înregistrărilor va fi interzisă. Toate intrările pentru un exercițiu financiar trebuie validate, altfel închiderea nu va fi posibilă
-SelectMonthAndValidate=Selectează luna şi validează trasferurile
 
 ValidateHistory=Asociază automat
 AutomaticBindingDone=Asociere automată făcută
@@ -293,6 +298,7 @@ Accounted=Contabilizat în jurnal - Cartea Mare
 NotYetAccounted=Nu a fost încă înregistrată în jurnal - Cartea Mare
 ShowTutorial=Arată tutorial
 NotReconciled=Nu este conciliat
+WarningRecordWithoutSubledgerAreExcluded=Atenție, toate operațiunile fără cont de subregistru definit sunt filtrate și excluse din această vizualizare
 
 ## Admin
 BindingOptions=Opțiuni de legare
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export pentru LD Compta (v10 & mai nou)
 Modelcsv_openconcerto=Export pentru OpenConcerto (Test)
 Modelcsv_configurable=Exportați CSV configurabil
 Modelcsv_FEC=Exportă fişier FEC
+Modelcsv_FEC2=Export FEC (cu scriere de date generate/document inversat)
 Modelcsv_Sage50_Swiss=Export pentru Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export pentru Gestinum (v3)
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index 604e4a99a94..d131e90ac86 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Afişare
 SetupArea=Setări
 UploadNewTemplate=Încărcați șabloane noi
 FormToTestFileUploadForm=Formular pentru testarear încărcării de  fişiere (în funcţie de configurare)
+ModuleMustBeEnabled=Modulul/aplicația <b>%s</b> trebuie să fie activată
+ModuleIsEnabled=Modulul/aplicația <b>%s</b> a fost activată
 IfModuleEnabled=Notă: Da este folositor numai dacă modul  <b>%s</b> este activat
 RemoveLock=Eliminați / redenumiți fișierul <b> %s </b> dacă există, pentru a permite utilizarea instrumentului Actualizare / Instalare.
 RestoreLock=Restaurați fișierul <b> %s </b>, numai cu permisiunea de citire, pentru a dezactiva orice viitoare utilizare a instrumentului Actualizare / Instalare.
@@ -85,7 +87,6 @@ ShowPreview=Arată previzualizare
 ShowHideDetails=Afişare-Ascundere detalii
 PreviewNotAvailable=Preview nu este disponibil
 ThemeCurrentlyActive=Tema activă în prezent
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Datele sunt stocate și returnate de serverul de baze de date ca și cum ar fi păstrate ca șir trimis. Fusul orar are efect doar atunci când se folosește funcția UNIX_TIMESTAMP (care nu ar trebui să fie utilizată de Dolibarr, astfel că baza de date TZ nu ar trebui să aibă efect, chiar dacă este schimbată după introducerea datelor).
 Space=Spaţiu
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Această zonă oferă funcții de administrare. Utilizați m
 Purge=Curăţenie
 PurgeAreaDesc=Această pagină vă permite să ștergeți toate fișierele generate sau stocate de Dolibarr (fișiere temporare sau toate fișierele din directorul <b> %s </b>). Utilizarea acestei funcții nu este în mod normal necesară. Este oferită ca soluție pentru utilizatorii care găzduiesc Dolibarr la un furnizor care nu oferă permisiuni de ștergere a fișierelor generate de serverul web.
 PurgeDeleteLogFile=Ștergeți fișierele din jurnal, inclusiv <b> %s </ b> definite pentru modulul Syslog (fără risc de pierdere a datelor)
-PurgeDeleteTemporaryFiles=Ștergeți toate fișierele temporare (fără riscul de a pierde date). Notă: Ștergerea se face numai dacă directorul temporar a fost creat acum 24 de ore.
-PurgeDeleteTemporaryFilesShort=Sterge fisiere temporare
+PurgeDeleteTemporaryFiles= Ștergeți toate fișierele jurnal și temporare (fără risc de pierdere a datelor). Notă: Ștergerea fișierelor temporare se face numai dacă directorul temporar a fost creat acum mai mult de 24 de ore. 
+PurgeDeleteTemporaryFilesShort=Ștergeți fișierele jurnal și temporare
 PurgeDeleteAllFilesInDocumentsDir=Ștergeți toate fișierele din directorul: <b>%s</b>.<br>\nAceasta va șterge toate documentele generate legate de elemente (terțe părți, facturi etc.), fișierele încărcate în modulul ECM, gropile de rezervă pentru baze de date și fișierele temporare . 
 PurgeRunNow=Elimină acum
 PurgeNothingToDelete=Nici un director sau fișier de șters.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Parteneri preferati
 OtherResources=Alte resurse
 ExternalResources=Resurse externe
 SocialNetworks=Retele sociale
+SocialNetworkId=ID reţea socială
 ForDocumentationSeeWiki=Pentru utilizator sau developer documentaţia (doc, FAQs ...), <br> aruncăm o privire la Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s</b></a>
 ForAnswersSeeForum=Pentru orice alte întrebări / ajutor, se poate utiliza Dolibarr forum: <br> <a href="%s" target="_blank"><b> %s</b></a>
 HelpCenterDesc1=Iată câteva resurse pentru a obține ajutor și asistență cu Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Exemple cu configurația curentă
 ListOfDirectories=Lista de directoare OpenDocument template-uri
 ListOfDirectoriesForModelGenODT=Lista de directoare care conţin fişiere șablon in format OpenDocument.<br><br>puneţi aici intreaga cale de directoare.<br>Intoarceţi-va la inceputul textului la fiecare director.<br>Pentru a adăuga un director de modul GED, adăugaţi aici <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Fişierele în aceste directoare trebuie să se termine cu <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Numărul de fișiere șablon ODT / ODS găsite în aceste directoare
-ExampleOfDirectoriesForModelGen=Exemple de sintaxa: <br> c: mydir \\ <br> / Home / mydir <br> DOL_DATA_ROOT / ECM / ecmdir
+ExampleOfDirectoriesForModelGen=Exemple de sintaxă:<br> c:\\ myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Pentru a şti cum să vă creaţi şabloane DOCX, ODT documente, înainte de a le stoca în aceste directoare, citiţi documentaţia wiki:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Poziţia Prenume / Nume
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parametrii pentru a asigura URL-uri
 SecurityTokenIsUnique=Utilizaţi un unic parametru securekey pentru fiecare URL
 EnterRefToBuildUrl=Introduceţi de referinţă pentru %s obiect
 GetSecuredUrl=Obţineţi URL-ul calculat
-ButtonHideUnauthorized=Ascundeți butoanele pentru utilizatorii care nu sunt administratori pentru acțiuni neautorizate, în loc să apară butoane dezactivate în culoarea gri
+ButtonHideUnauthorized= Ascunde butoanele de acțiune neautorizate și pentru utilizatorii interni (doar gri în caz contrar) 
 OldVATRates=Vechea rată TVA
 NewVATRates=Noua rată TVA
 PriceBaseTypeToChange=Modifică la prețuri cu valoarea de referință de bază definit pe
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Meniuri personalizate care nu sunt legate de o intrar
 NewMenu=New meniul
 MenuHandler=Meniu manipulant
 MenuModule=Sursa de modul
-HideUnauthorizedMenu= Ascunde meniuri neautorizate (gri)
+HideUnauthorizedMenu=Ascunde meniurile neautorizate și pentru utilizatorii interni (doar gri altfel)
 DetailId=Id-ul pentru meniul
 DetailMenuHandler=Meniu manipulant în cazul în care pentru a arăta noul meniu
 DetailMenuModule=Modul de intrare în meniu numele dacă provin dintr-un modul
@@ -1983,11 +1985,12 @@ EMailHost=Gazdă a serverului de email IMAP
 MailboxSourceDirectory=Directorul sursă al cutiei poștale
 MailboxTargetDirectory=Directorul ţintă al cutiei poștale 
 EmailcollectorOperations=Operațiuni de făcut de către colector
+EmailcollectorOperationsDesc=Operațiunile sunt executate în ordinea de sus în jos
 MaxEmailCollectPerCollect=Număr maxim de email-uri colectae per operaţiune
 CollectNow=Colectați acum
 ConfirmCloneEmailCollector=Eşti sigur că vrei să clonezi colectorul de email %s?
-DateLastCollectResult=Data ultimei încercări de colectare 
-DateLastcollectResultOk=Data ultimei colectări efectuate cu succes
+DateLastCollectResult=Data ultimei încercări de colectare
+DateLastcollectResultOk=Data ultimei colectări cu succes
 LastResult=Ultimul rezultat
 EmailCollectorConfirmCollectTitle=Confirmarea colectării de emailuri
 EmailCollectorConfirmCollect=Doriți să rulați acum colecția pentru acest colector?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Mesaj dintr-o conversație inițiată de un prim e-mail trimis
 WithoutDolTrackingID=Mesaj dintr-o conversație inițiată de un prim e-mail NU trimis de la Dolibarr
 WithDolTrackingIDInMsgId=Mesaj transmis de la Dolibarr
 WithoutDolTrackingIDInMsgId= Mesajul NU a fost trimis de la Dolibarr
-CreateCandidature=Creare candidatură
+CreateCandidature=Creare aplicare la job
 FormatZip=Zip
 MainMenuCode=Codul de introducere a meniului (meniu principal)
 ECMAutoTree=Afișați arborele ECM automat
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Țară (dacă este specifică unei anumite țări)
 YouMayFindSecurityAdviceHere=Aici puteți găsi recomandări de securitate
 ModuleActivatedMayExposeInformation=Acest modul poate expune date sensibile. Dacă nu aveți nevoie de el, dezactivați-l.
 ModuleActivatedDoNotUseInProduction=Un modul conceput pentru dezvoltare a fost activat. Nu-l activați într-un mediu de producție.
+CombinationsSeparator=Caracter separator pentru combinații de produse
+SeeLinkToOnlineDocumentation=Pentru exemple, consultați linkul către documentația online din meniul de sus
+SHOW_SUBPRODUCT_REF_IN_PDF=Dacă se folosește caracteristica "%s" a modulului <b>%s</b>, afișați detalii despre subprodusele unui kit în PDF.
+AskThisIDToYourBank=Contactați banca dvs. pentru a obține acest ID
diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang
index 5e85e7eb2bc..ceffaaa830d 100644
--- a/htdocs/langs/ro_RO/banks.lang
+++ b/htdocs/langs/ro_RO/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=Mandat SEPA
 YourSEPAMandate=Mandatul dvs. SEPA  
 FindYourSEPAMandate=Acesta este mandatul dvs. SEPA pentru a autoriza compania noastră să efectueze un ordin de debitare directă către banca dvs. Reveniți semnat (scanarea documentului semnat) sau trimiteți-l prin poștă la
 AutoReportLastAccountStatement=Completați automat câmpul "numărul extrasului de cont" cu ultimul număr al declarației atunci când efectuați reconcilierea
-CashControl= Limită de numerar POS
-NewCashFence= Limită nouă de numerar
+CashControl=Control POS casierie
+NewCashFence=Închidere nouă de casierie
 BankColorizeMovement=Colorează tranzacţiile
 BankColorizeMovementDesc=Dacă această funcţie este activată, poţi alege o culoare de fundal personalizată pentru tranzacţiile de debit sau de credit
 BankColorizeMovementName1=Culoarea de fundal pentru tranzacţiile de debit
diff --git a/htdocs/langs/ro_RO/blockedlog.lang b/htdocs/langs/ro_RO/blockedlog.lang
index fb1ab84c5eb..aadcbc5379c 100644
--- a/htdocs/langs/ro_RO/blockedlog.lang
+++ b/htdocs/langs/ro_RO/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Ştergerea logică a donaţiei
 logMEMBER_SUBSCRIPTION_CREATE=Abonamentul de membru a fost creat
 logMEMBER_SUBSCRIPTION_MODIFY=Abonamentul de membru a fost modificat
 logMEMBER_SUBSCRIPTION_DELETE=Ștergerea logică a abonamentului de membru
-logCASHCONTROL_VALIDATE=Înregistrarea limitei de bani
+logCASHCONTROL_VALIDATE= Înregistrare închidere casierie
 BlockedLogBillDownload=Descărcarea facturii clientului
 BlockedLogBillPreview=Previzualizarea facturii clientului
 BlockedlogInfoDialog=Detalii înregistrare
diff --git a/htdocs/langs/ro_RO/boxes.lang b/htdocs/langs/ro_RO/boxes.lang
index c258d9aee69..061ab4052d7 100644
--- a/htdocs/langs/ro_RO/boxes.lang
+++ b/htdocs/langs/ro_RO/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Ultimele %s donaţii modificate
 BoxTitleLastModifiedExpenses=Ultimele %s deconturi modificare 
 BoxTitleLatestModifiedBoms=Ultimile %sbonuri de consum modificate 
 BoxTitleLatestModifiedMos=Ultimile %s comenzi de producţie modificate
+BoxTitleLastOutstandingBillReached=Clienţii cu restanţe mai mari decât limita de credit acceptată
 BoxGlobalActivity=Activitate globală ( facturi, oferte, comenzi)
 BoxGoodCustomers=Clienţi buni
 BoxTitleGoodCustomers=%s Clienţi buni
+BoxScheduledJobs=Joburi programate
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Actualizarea fluxului RSS a eșuat. Ultima actualizare reușită: %s
 LastRefreshDate=Ultima dată reîmprospătare
 NoRecordedBookmarks=Niciun bookmark definit.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Contul suspendat nu este definit
 BoxLastCustomerShipments=Ultimile livrări către clienţi 
 BoxTitleLastCustomerShipments=Ultimile %s livrări către clienţi
 NoRecordedShipments=Nici o livrare către clienţi
+BoxCustomersOutstandingBillReached=Clienţi care au epuizat limita de credit
 # Pages
 AccountancyHome=Contabilitate
+ValidatedProjects=Proiecte validate
diff --git a/htdocs/langs/ro_RO/cashdesk.lang b/htdocs/langs/ro_RO/cashdesk.lang
index a1d61daa35e..d8622b9d3ee 100644
--- a/htdocs/langs/ro_RO/cashdesk.lang
+++ b/htdocs/langs/ro_RO/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Subsol
 AmountAtEndOfPeriod=Valoare la sfârșitul perioadei (zi, lună sau an)
 TheoricalAmount=Valoare teoretică
 RealAmount=Sumă reală
-CashFence=Limită cash
-CashFenceDone=Limita de bani realizată pentru perioada
+CashFence=Închidere casierie
+CashFenceDone=Închiderea casei de marcat efectuată pentru perioada respectivă
 NbOfInvoices=Nr  facturi
 Paymentnumpad=Tipul de pad utilizat pentru introducerea plăţii
 Numberspad=Suport de numere
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Modul de numerotare pentru vânzările POS
 CashDeskGenericMaskCodes6 = Tag-ul <br><b>{TN}</b> este utilizat pentru adăugarea numărului de terminal
 TakeposGroupSameProduct=Grupează liniile cu produse identice
 StartAParallelSale=Iniţiază o vânzare paralelă
-ControlCashOpening=Controlează sertarul de bani la deschiderea POS
-CloseCashFence=Închidere plafon de numerar
+SaleStartedAt=Vânzarea a început la %s
+ControlCashOpening=Controlați sertarul de numerar la deschiderea POS
+CloseCashFence= Închideți controlul casieriei
 CashReport=Raport numerar
 MainPrinterToUse=Imprimantă principală de utilizat
 OrderPrinterToUse=Imprimantă utilizată pentru comenzi
@@ -121,4 +122,5 @@ GiftReceiptButton=Adaugă un buton "Bon cadou"
 GiftReceipt=Bon cadou 
 ModuleReceiptPrinterMustBeEnabled= \nModulul Imprimanta bonuri trebuie să fi fost activat mai întâi
 AllowDelayedPayment= Permite plata cu întârziere
-PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+PrintPaymentMethodOnReceipts=Tipăriți metoda de plată pe bonuri|chitanțe 
+WeighingScale=Cântar
diff --git a/htdocs/langs/ro_RO/categories.lang b/htdocs/langs/ro_RO/categories.lang
index 921c1fbbdb8..5bce5a6db56 100644
--- a/htdocs/langs/ro_RO/categories.lang
+++ b/htdocs/langs/ro_RO/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Tag-uri/categorii proiecte
 UsersCategoriesArea=Tag-uri/categorii utilizatori
 SubCats=Subcategorii
 CatList=Lista tag-uri/categorii
+CatListAll=Listă tag-uri/categorii (toate tipurile)
 NewCategory=Tag/categorie nouă
 ModifCat=Modifică tag/categorie
 CatCreated=Tag/categorie creată
@@ -65,16 +66,22 @@ UsersCategoriesShort=Tag-uri/categorii utilizatori
 StockCategoriesShort=Tag-uri/categorii depozite
 ThisCategoryHasNoItems=Această categorie nu conţine nici un element.
 CategId=ID tag/categorie
+ParentCategory=Tag/categorie părinte
+ParentCategoryLabel=Etichetă tag/categorie părinte
 CatSupList=Listă tag-uri/categorii furnizori
-CatCusList=Listă taguri/categorii clienţi/prospecţi
+CatCusList=Listă tag-uri/categorii clienţi/prospecţi
 CatProdList=Listă tag-uri/categorii produse 
 CatMemberList=Listă tag-uri/categorii membri
 CatContactList=Listă tag-uri/categorii contacte
-CatSupLinks=Asocieri între furnizori şi tag-uri/categorii
+CatProjectsList=Listă tag-uri/categorii proiecte
+CatUsersList=Listă tag-uri/categorii utilizatori
+CatSupLinks=Legături între furnizori și tag-uri/categorii
 CatCusLinks=Asocieri între clienţi/prospecţi şi tag-uri/categorii
 CatContactsLinks=Asocieri între contacte/adrese şi tag-uri/categorii 
 CatProdLinks=Asocieri între produse/servicii şi tag-uri/categorii
-CatProJectLinks=Asocieri între proiecte și tag-uri/categorii
+CatMembersLinks=Legături între membri şi tag-uri/categorii
+CatProjectsLinks=Asocieri între proiecte și tag-uri/categorii
+CatUsersLinks=Legături între utilizatori şi tag-uri/categorii
 DeleteFromCat=Elimină din tag-uri/categoriii
 ExtraFieldsCategories=Atribute complementare
 CategoriesSetup=Configurare tag-uri/categorii
diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang
index 08129c19f16..044d0a52957 100644
--- a/htdocs/langs/ro_RO/companies.lang
+++ b/htdocs/langs/ro_RO/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Verificați codul TV intracomunitar pe site-ul web al
 VATIntraManualCheck=De asemenea, puteți verifica manual pe site-ul web al UE <a href="%s" target="_blank"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Verificare imposibilă. Verificaţi dacă serviciul este furnizat de către statul membru ( %s).
 NorProspectNorCustomer=Nici prospect, nici client
-JuridicalStatus=Tip entitate juridică
+JuridicalStatus=Tipul entității comerciale
 Workforce=Forţa de muncă
 Staff=Angajati
 ProspectLevelShort=Potenţial
diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang
index ea0496677f0..bd3bde9e637 100644
--- a/htdocs/langs/ro_RO/compta.lang
+++ b/htdocs/langs/ro_RO/compta.lang
@@ -111,7 +111,7 @@ Refund=Rambursare
 SocialContributionsPayments=Plata taxe sociale sau fiscale
 ShowVatPayment=Arata plata TVA
 TotalToPay=Total de plată
-BalanceVisibilityDependsOnSortAndFilters=Soldul este vizibil în această listă numai dacă tabelul este sortat ascendent pe %s și filtrat pentru 1 cont bancar
+BalanceVisibilityDependsOnSortAndFilters= Soldul este vizibil în această listă numai dacă tabelul este sortat și filtrat pe %s 1 cont bancar (fără alte filtre)
 CustomerAccountancyCode=Codul contabilității clienților
 SupplierAccountancyCode=Codul contabil al furnizorului
 CustomerAccountancyCodeShort=Cont contabil client
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Sunteţi sigur că doriţi să ştergeţi aceast
 ExportDataset_tax_1=Taxe sociale și fiscale și plăți 
 CalcModeVATDebt=Mod <b>%s TVA pe baza contabilității de angajament %s</b>.
 CalcModeVATEngagement=Mod <b>%s TVA pe baza venituri-cheltuieli%s.</b>
-CalcModeDebt=Analiza facturilor înregistrate cunoscute, chiar dacă acestea nu sunt încă înregistrate în registru.
+CalcModeDebt= Analiza documentelor înregistrate cunoscute chiar dacă acestea nu sunt încă introduse în registru contabil.
 CalcModeEngagement=Analiza plăților înregistrate cunoscute, chiar dacă acestea nu sunt încă înregistrate în registru.
 CalcModeBookkeeping=Analiza datelor publicate în tabelul registrului contabil.
 CalcModeLT1= Mode <b>%sRE pe facturi clienţi - facturi furnizori %s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balanța de venituri și cheltuieli, rezumat anual
 AnnualByCompanies=Soldul veniturilor și al cheltuielilor, pe grupuri predefinite de cont
 AnnualByCompaniesDueDebtMode=Soldul veniturilor și cheltuielilor, detaliu după grupuri predefinite, modul <b> %sCereri-Datorii%s </b> a spus <b> Contabilitatea de angajament </b>.
 AnnualByCompaniesInputOutputMode=Soldul veniturilor și cheltuielilor, detaliile după grupuri predefinite, modul <b> %sVenituri-cheltuieli%s </b> a spus <b> contabilitatea numerică </b>.
-SeeReportInInputOutputMode=Vedeți %sanaliza plăților%s pentru un calcul al plăților actuale efectuate chiar dacă acestea nu sunt încă înregistrate în registru.
-SeeReportInDueDebtMode=Vedeți %sanaliza facturilor%s pentru un calcul bazat pe facturi înregistrate cunoscute, chiar dacă acestea nu sunt încă înregistrate în registru.
-SeeReportInBookkeepingMode=Vedeți <b> %sraportul contabil%s </b> pentru un calcul la <b> Tabelul registrului contabil </b>
+SeeReportInInputOutputMode=Consultați <b>%s analiza plăților %s</b> pentru un calcul bazat pe <b>plățile înregistrate</b> efectuate chiar dacă acestea nu sunt încă contabilizate în Registru
+SeeReportInDueDebtMode=Consultați <b>%s analiza documentelor înregistrate %s</b> pentru un calcul pe baza <b>documentelor înregistrate</b> cunoscute, chiar dacă acestea nu sunt încă contabilizate în Registru
+SeeReportInBookkeepingMode=Consultați <b>%sanaliza registrului contabil%s</b> pentru un raport bazat pe <b>Registrul de contabilitate</b>
 RulesAmountWithTaxIncluded=- Valoarea afişată este cu toate taxele incluse
 RulesResultDue=- Include facturi restante, cheltuieli, TVA, donații indiferent dacă sunt plătite sau nu. Include și salariile plătite. <br>- se bazează pe data de emitere a facturilor și data scadenței pentru cheltuieli sau plăți fiscale. Pentru salariile definite cu modulul Salarii, se utilizează data plăţii. 
 RulesResultInOut=- Include plățile efective pe facturi, cheltuieli,TVA și salarii. <br> - Se ia  în calcul data plăţii facturilor, cheltuielilor, TVA-ului  și salariilor .
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Se înregistrează în registrul dvs. cu cont
 SeePageForSetup=Vedeți meniul <a href="%s"> %s </a> pentru configurare
 DepositsAreNotIncluded=- Facturile de plată în avans nu sunt incluse
 DepositsAreIncluded=- Sunt incluse facturile de plată în avans
+LT1ReportByMonth=Taxa 2 raportare lunară
+LT2ReportByMonth=Taxa 3 raportare lunară
 LT1ReportByCustomers=Raportați taxa 2 de către un terț
 LT2ReportByCustomers=Raportați taxa 3 de către un terț
 LT1ReportByCustomersES=Raport pe terţ RE
 LT2ReportByCustomersES=Raport de terţă parte IRPF
 VATReport=Raport privind impozitul pe vânzare
 VATReportByPeriods=Raport privind impozitul pe vânzare după perioadă
+VATReportByMonth=Taxa pe vânzări TVA raportare lunară
 VATReportByRates=Raport privind impozitul pe vânzare pe tarife
 VATReportByThirdParties=Raportul privind impozitul pe vânzări de către terți
 VATReportByCustomers=Raportul privind impozitul pe vânzări de către client
diff --git a/htdocs/langs/ro_RO/cron.lang b/htdocs/langs/ro_RO/cron.lang
index 352feb51e3e..fbfafaf8424 100644
--- a/htdocs/langs/ro_RO/cron.lang
+++ b/htdocs/langs/ro_RO/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Şterge Job programat
 Permission23104 = Execută Job programat
 # Admin
 CronSetup=Setare Managementul joburilor programate
-URLToLaunchCronJobs=URL pentru a verifica și a lansa sarcini cron calificate 
-OrToLaunchASpecificJob=Sau pentru a verifica și  a lansa un anumit job
+URLToLaunchCronJobs=Adresă URL pentru a verifica și lansa joburi cron calificate din browser
+OrToLaunchASpecificJob=Sau pentru a verifica și lansa un anumit task dintr-un browser
 KeyForCronAccess=Cheie de securitate pentru URL de lansare a joburilor cron
 FileToLaunchCronJobs=Linie de comanda pentru a verifica și a lansa sarcini cron calificate
 CronExplainHowToRunUnix=Pe mediul Unix veţi  utiliza instrumentul crontab pentru a  rula urmatoarea  linia de comanda la fiecare 5 minute
 CronExplainHowToRunWin=În mediul Microsoft (tm) Windows, puteți utiliza instrumentele programate pentru a executa linia de comandă la fiecare 5 minute
 CronMethodDoesNotExists= Clasa %s nu conține metoda %s
+CronMethodNotAllowed=Metoda %s clasei %seste în lista neagră a metodelor interzise
 CronJobDefDesc=Profilele sarcinilor Cron sunt definite în fișierul descriptor de module. Când modulul este activat, acestea sunt încărcate și disponibile, astfel încât să puteți administra lucrările din meniul instrumentelor de administrare%s.
 CronJobProfiles=Lista profilurilor sarcinilor cron predefinite
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Numărul de lansări
 CronMaxRun=Număr maxim de lansări
 CronEach=Fiecare
 JobFinished=Job lansat şi terminat
+Scheduled=Programat
 #Page card
 CronAdd= Adaugă joburi
 CronEvery=Executa fiecare job
@@ -56,7 +58,7 @@ CronNote=Comenteaza
 CronFieldMandatory=Câmpurile %s sunt obligatorii
 CronErrEndDateStartDt=Data de sfârşit nu poate fi înaintea datei de început
 StatusAtInstall=Stare la instalarea modulului
-CronStatusActiveBtn=Activare
+CronStatusActiveBtn=Programare
 CronStatusInactiveBtn=Dezactivare
 CronTaskInactive=Acest post este dezactivat
 CronId=Id
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=Backup local baza de date
 MakeLocalDatabaseDump=Creați o bază de date locală. Parametrii sunt: ​​compresie ("gz" sau "bz" sau "none"), tipul de backup (mysql, pgsql, auto) 1, "auto" sau nume de fișier de construit, număr de fișiere de rezervă de păstrat
 WarningCronDelayed=Atenție, în scopul performanței, indiferent de data următoare a executării activităţilor activate, este posibil ca activităţile dvs. să fie întârziate la maximum %s ore înainte de a rula
 DATAPOLICYJob=Curățător de date și anonimizator
+JobXMustBeEnabled=Jobul %s trebuie să fie activat
+# Cron Boxes
+LastExecutedScheduledJob=Ultima execuţie a jobului programat 
+NextScheduledJobExecute=Următoarea execuţie a jobului programat
+NumberScheduledJobError=Numărul de joburi programate cu eroare
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index 2a7f2df8659..01159bce39a 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Ncio eroare, dăm commit
 # Errors
 ErrorButCommitIsDone=Erori constatate dar încă nevalidate
 ErrorBadEMail=Emailul %s este greșit
+ErrorBadMXDomain=Email-ul %s pare greșit (domeniul nu are nicio înregistrare MX validă)
 ErrorBadUrl=Url-ul %s este greşit
 ErrorBadValueForParamNotAString=Valoare greșită pentru parametru. Se adaugă,  în general, atunci când traducerea lipsește.
+ErrorRefAlreadyExists=Referinţa <b>%s</b> există deja.
 ErrorLoginAlreadyExists=Login %s există deja.
 ErrorGroupAlreadyExists=Grupul %s există deja.
 ErrorRecordNotFound=Înregistrarea nu a fost găsit.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Unele campuri obligatorii nu au fost ocupate.
 ErrorSubjectIsRequired=Tema e-mailului este necesară
 ErrorFailedToCreateDir=Nu a reuşit să creeze un director. Verificaţi ca server Web utilizator are permisiuni pentru a scrie în directorul de Dolibarr documente. Dacă <b>safe_mode</b> parametru este activat pe această PHP, Dolibarr verifica faptul că fişierele PHP detine la server web utilizator (sau grup).
 ErrorNoMailDefinedForThisUser=Nu mail definite pentru acest utilizator
+ErrorSetupOfEmailsNotComplete=Configurarea email-urilor nu este finalizată
 ErrorFeatureNeedJavascript=Această caracteristică JavaScript trebuie activat pentru a fi la locul de muncă. Schimbare în acest setup - display.
 ErrorTopMenuMustHaveAParentWithId0=Un meniu de tip "Top" nu poate avea un părinte de meniu. Pune-0 în meniul părinte sau alege un meniu de tip "stânga".
 ErrorLeftMenuMustHaveAParentId=Un meniu de tip "stânga" trebuie să aibă o mamă id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Acest profil nume există deja pentru acest set de ex
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP de potrivire nu este completă.
 ErrorLDAPMakeManualTest=A. Ldif fişier a fost generat în directorul %s. Încercaţi să încărcaţi manual de la linia de comandă pentru a avea mai multe informatii cu privire la erori.
 ErrorCantSaveADoneUserWithZeroPercentage=Nu se poate salva o acțiune cu "starea nu a început" dacă se completează și câmpul "efectuat de".
-ErrorRefAlreadyExists=Ref utilizate pentru crearea există deja.
+ErrorRefAlreadyExists=Referinţa <b>%s</b> există deja.
 ErrorPleaseTypeBankTransactionReportName=Introduceți numele contului bancar unde trebuie raportată înregistrarea (Format YYYYMM sau YYYYMMDD)
 ErrorRecordHasChildren=Nu s-a reușit ștergerea înregistrării deoarece are unele înregistrări copii.
 ErrorRecordHasAtLeastOneChildOfType=Obiectul are cel puțin o copie de tipul %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Trebuie să alegeți dacă artico
 ErrorDiscountLargerThanRemainToPaySplitItBefore=Reducerea pe care încercați să o aplicați este mai mare decât restul de plată. Împărțiți reducerea în 2 reduceri mai mici înainte.
 ErrorFileNotFoundWithSharedLink=Dosarul nu a fost găsit. Poate fi modificată cheia de distribuire sau fișierul a fost eliminat recent.
 ErrorProductBarCodeAlreadyExists=Codul de bare al produsului %s există deja în altă referință la produs.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Rețineți, de asemenea, că utilizarea produsului virtual pentru a avea o creștere / scădere automată a subproduselor nu este posibilă atunci când cel puțin un subprodus (sau subprodus de subproduse) are nevoie de un număr serial / lot.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Rețineți, de asemenea, că utilizarea kiturilor pentru a crește/micșora automat subprodusele nu este posibilă atunci când cel puțin un subprodus (sau subprodus al subproduselor) are nevoie de un număr de serie/lot. 
 ErrorDescRequiredForFreeProductLines=Descrierea este obligatorie pentru liniile cu produse gratuite
 ErrorAPageWithThisNameOrAliasAlreadyExists=Pagina/containerul <strong> %s </strong> are același nume sau un alias alternativ ca cel pe care încercați să îl utilizați
 ErrorDuringChartLoad=Eroare la încărcarea schemei de conturi. În cazul în care câteva conturi nu au fost încărcate, le puteți introduce în continuare manual.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Eroare, şirul înlocuitor este gol
 ErrorProductNeedBatchNumber=Eroare, produsul '<b>%s</b>' necesită un număr de lot/serie
 ErrorProductDoesNotNeedBatchNumber=Eroare, produsul '<b>%s</b>' nu acceptă un număr de lot/serie
 ErrorFailedToReadObject=Eroare, nu am putut citi tipul obiectului <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Eroare, parametrul <b>%s</b> trebuie să fie activat în <b>conf / conf.php<b> pentru a permite utilizarea interfeței de linie de comandă de către programatorul de job-uri intern
+ErrorLoginDateValidity=Eroare, această conectare se află în afara intervalului temporal valabil
+ErrorValueLength=Lungimea câmpului '<b>%s</b>' trebuie să fie mai mare de '<b>%s</b>'
+ErrorReservedKeyword=Cuvântul '<b>%s</b>' este un cuvânt cheie rezervat
+ErrorNotAvailableWithThisDistribution=Nu este disponibil cu această distribuție
+ErrorPublicInterfaceNotEnabled=Interfaţa publică nu a fost activată
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=Limba noii pagini trebuie definită dacă este setată ca traducere a altei pagini 
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother= Limba nooi pagini nu trebuie să fie limba sursă dacă este setată ca traducere a altei pagini 
+ErrorAParameterIsRequiredForThisOperation=Un parametru este obligatoriu pentru această operațiune
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Parametrul tău PHP upload_max_filesize (%s) este mai mare decât paramentrul PHP post_max_size (%s). Aceasta nu este o configuraţie consistentă.
 WarningPasswordSetWithNoAccount= O parolă a fost trimisă către acest membru. Cu toate acestea, nu a fost creat nici un cont de utilizator. Astfel, această parolă este stocată, dar nu poate fi utilizată pentru autentificare. Poate fi utilizată de către un modul / interfată externă, dar dacă nu aveți nevoie să definiți un utilizator sau o parolă pentru un membru, puteți dezactiva opțiunea "Gestionați o conectare pentru fiecare membru" din modul de configurare membri. În cazul în care aveți nevoie să gestionați un utilizator, dar nu este nevoie de parolă, aveți posibilitatea să păstrați acest câmp gol pentru a evita acest avertisment. Notă: Adresa de e-mail poate fi utilizată ca utilizator la autentificare, în cazul în care membrul este legat de un utilizator. 
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Utilizatorul-ul a fost modificat. Din mot
 WarningAnEntryAlreadyExistForTransKey=Există deja o intrare pentru cheia de traducere pentru această limbă
 WarningNumberOfRecipientIsRestrictedInMassAction=Avertisment, numărul destinatarului diferit este limitat la <b> %s </b> când se utilizează acțiunile de masă din liste
 WarningDateOfLineMustBeInExpenseReportRange=Avertisment, data liniei nu este în intervalul raportului de cheltuieli
+WarningProjectDraft=Proiectul este încă în modul schiţă. Nu uitați să îl validați dacă intenționați să utilizați sarcini.
 WarningProjectClosed=Proiectul este închis. Trebuie să-l redeschideți mai întâi.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Anumite tranzacţii bancare au fost eliminate după ce a fost generat extrasul care le includea. Aşa că numărul de cecuri şi totalul extrasului pot diferi de cele din listă.
-WarningFailedToAddFileIntoDatabaseIndex=Avertizare, nu am putut adăuga fişierul în tabela index a ECM
+WarningFailedToAddFileIntoDatabaseIndex=Atenţie , nu s-a putut adăuga fișierului în tabela index al bazei de date ECM
+WarningTheHiddenOptionIsOn=Atenţie, opţiunea ascunsă <b>%s</b> este activă.
+WarningCreateSubAccounts=Atenție, nu puteți crea direct un cont secundar, trebuie să creați un terț sau un utilizator și să le atribuiți un cod contabil pentru a le găsi în această listă
+WarningAvailableOnlyForHTTPSServers=Disponibil numai dacă se utilizează conexiunea securizată HTTPS.
diff --git a/htdocs/langs/ro_RO/exports.lang b/htdocs/langs/ro_RO/exports.lang
index 34a37b99469..08f9a64d27e 100644
--- a/htdocs/langs/ro_RO/exports.lang
+++ b/htdocs/langs/ro_RO/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Tastă (coloană) de utilizat pentru <b>actualizarea </b>dat
 NbInsert=Numărul liniilor inserate: %s
 NbUpdate=Numărul liniilor actualizate: %s
 MultipleRecordFoundWithTheseFilters=Au fost găsite mai multe înregistrări cu ajutorul acestor filtre: %s
+StocksWithBatch=Stocuri și locație (depozit) a produselor cu număr de lot/serie
diff --git a/htdocs/langs/ro_RO/mails.lang b/htdocs/langs/ro_RO/mails.lang
index c021a5391ca..70ecbe53f8e 100644
--- a/htdocs/langs/ro_RO/mails.lang
+++ b/htdocs/langs/ro_RO/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emailuri introduse de utilizator
 MailingModuleDescDolibarrUsers=Utilizatorii cu emailuri
 MailingModuleDescThirdPartiesByCategories=Terți (pe categorii)
 SendingFromWebInterfaceIsNotAllowed=Trimiterea de pe interfața web nu este permisă.
+EmailCollectorFilterDesc=Toate filtrele trebuie să se potrivească pentru ca un email să fie colectat
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Linia %s în fişierul
@@ -125,12 +126,13 @@ TagMailtoEmail=Email destinatar (inclusiv linkul html "mailto:")
 NoEmailSentBadSenderOrRecipientEmail=Nu a fost trimis niciun email.  Expeditor sau destinatar email greșit . Verificați profilul utilizatorului.
 # Module Notifications
 Notifications=Anunturi
-NoNotificationsWillBeSent=Nu notificări prin email sunt planificate pentru acest eveniment şi a companiei
-ANotificationsWillBeSent=1 notificarea va fi trimis prin e-mail
-SomeNotificationsWillBeSent=%s notificări vor fi trimise prin e-mail
-AddNewNotification=Activați o nouă țintă/eveniment de notificare prin email
-ListOfActiveNotifications=Afișați toate țintele / evenimentele active pentru notificarea prin email
-ListOfNotificationsDone=Lista toate notificările e-mail trimis
+NotificationsAuto=Notificări automate
+NoNotificationsWillBeSent=Nu sunt planificate notificări automate prin e-mail pentru acest tip de eveniment și companie
+ANotificationsWillBeSent=1 notificare automată va fi transmisă pe email
+SomeNotificationsWillBeSent=%s notificări automate vor fi transmise pe email
+AddNewNotification=Abonare la o nouă notificare automată prin email (țintă/eveniment)
+ListOfActiveNotifications=Enumerați toate abonamentele active (ținte/evenimente) pentru notificări automate prin email
+ListOfNotificationsDone=Afişaţi toate notificările automate trimise prin email 
 MailSendSetupIs=Configurarea trimiterii  e-mail a fost de configurat la '%s'.  Acest mod nu poate fi utilizat pentru a trimite email-uri în masă.
 MailSendSetupIs2=Trebuie mai întâi să mergi, cu un cont de administrator, în meniu%sHome - Setup - EMails%s  pentru a schimba parametrul  <strong>'%s'</strong> de utilizare în modul '%s'.  Cu acest mod, puteți introduce configurarea serverului SMTP furnizat de furnizorul de servicii Internet și de a folosi facilitatea Mass email .
 MailSendSetupIs3=Daca aveti intrebari cu privire la modul de configurare al serverului SMTP, puteți cere la %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Fișierul importat trebuie să aibă format <strong>
 UseFormatInputEmailToTarget=Introduceți un șir cu formatul de email <strong>; nume; prenume; altul </strong>
 MailAdvTargetRecipients=Destinatari (selecție avansată)
 AdvTgtTitle=Completați câmpurile de introducere pentru a preselecta terții sau contactele/adresele vizate
-AdvTgtSearchTextHelp=Utilizați %% ca metacaractere. De exemplu, pentru a găsi toate elementele cum ar fi <b> jean, joe, jim </b>, puteți introduce <b> j%% </b>, de asemenea, puteți utiliza; ca separator pentru valoare și utilizați ! pentru excepția acestei valori. De exemplu, <b> jean; joe; jim%%;! Jimo;! Jima% </b> va viza toate jean, joe, începe cu jim dar nu jimo și nu tot ce începe cu jima
+AdvTgtSearchTextHelp= Se utilizează %% ca metacaracter. De exemplu, pentru a găsi toate articolele cum ar fi j<b>ean, joe, jim</b>, puteți introduce <b>j%%</b>, puteți utiliza și; ca separator pentru valoare și folosiți ! pentru exceptarea acestei valori. De exemplu <b>jean; joe; jim%%;!Jimo;!Jima%%</b> va viza toate jean, joe, cele care încep cu jim dar nu jimo și tot ce nu începe cu jima
 AdvTgtSearchIntHelp=Utilizați intervalul pentru a selecta valoarea int sau float
 AdvTgtMinVal=Valoare minima
 AdvTgtMaxVal=Valoare maxima
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Creare filtru
 AdvTgtOrCreateNewFilter=Numele noului filtru
 NoContactWithCategoryFound=Nu s-a găsit niciun contact / adresă cu o categorie 
 NoContactLinkedToThirdpartieWithCategoryFound=Nu s-a găsit niciun contact / adresă cu o categorie 
-OutGoingEmailSetup=Setarea emailului de ieșire
-InGoingEmailSetup=Configurarea emailului de primire
-OutGoingEmailSetupForEmailing=Setup email de ieşire( pentru modulul %s)
-DefaultOutgoingEmailSetup=Configurarea implicită a emailurilor de ieșire
+OutGoingEmailSetup= Email-uri trimise
+InGoingEmailSetup=Email-uri primite
+OutGoingEmailSetupForEmailing=Email-uri trimise (pentru modulul %s)
+DefaultOutgoingEmailSetup=Aceeași configurație ca şi configurarea globală de trimitere email
 Information=Informatie
 ContactsWithThirdpartyFilter=Contacte cu filtrul terț
 Unanswered=Fără răspuns
 Answered=Răspuns
 IsNotAnAnswer=Nu răspunde (e-mail inițial)
 IsAnAnswer= Este un răspuns al unui email inițial
+RecordCreatedByEmailCollector=Înregistrare creată de colectorul de email %sdin adresa %s
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index 58dea3a79cb..3d3b79a3fcf 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Nu există șablon disponibil pentru acest tip de email
 AvailableVariables=Variabile de substituţie disponibile
 NoTranslation=Fără traducere
 Translation=Traduceri
+CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Introdu criterii de căutare valide
+EnterADateCriteria= Introduceți un criteriu de tip dată
 NoRecordFound=Nicio înregistrare  gasită
 NoRecordDeleted=Nu s-au șters înregistrări
 NotEnoughDataYet=Nu sunt date
@@ -85,6 +87,8 @@ FileWasNotUploaded=Un fișier este selectat pentru atașament, dar nu a fost în
 NbOfEntries=Numărul de intrări
 GoToWikiHelpPage=Citeşte ajutorul online (Acces la Internet necesar)
 GoToHelpPage=Citeşte Ajutorul
+DedicatedPageAvailable=Există o pagină de ajutor dedicată legată de ecranul curent
+HomePage=Acasă
 RecordSaved=Înregistrare salvată
 RecordDeleted=Înregistrare ştearsă
 RecordGenerated=Înregistrată generată
@@ -433,6 +437,7 @@ RemainToPay=Rămas de plată
 Module=Modul/Aplicaţie
 Modules=Module/Aplicații
 Option=Opţiune
+Filters=Filtre
 List=Listă
 FullList=Listă completă
 FullConversation=Conversaţie integrală
@@ -671,7 +676,7 @@ SendMail=Trimite un email
 Email=Email
 NoEMail=Niciun email
 AlreadyRead=Citit deja
-NotRead=Necitit
+NotRead=Necitită
 NoMobilePhone=Fără număr mobil
 Owner=Proprietar
 FollowingConstantsWillBeSubstituted=Următoarele constante vor fi înlocuite cu valoarea corespunzătoare.
@@ -1107,3 +1112,8 @@ UpToDate=Actualizat la zi
 OutOfDate=Expirat
 EventReminder=Memento eveniment
 UpdateForAllLines=Actualizare pentru toate liniile
+OnHold=În aşteptare
+AffectTag=Afectează eticheta
+ConfirmAffectTag=Afectare multiplă etichete
+ConfirmAffectTagQuestion=Sigur doriți să afectați etichetele înregistrărilor %s selectat(e)?
+CategTypeNotFound=Nu s-a găsit niciun tip de etichetă pentru tipul de înregistrări
diff --git a/htdocs/langs/ro_RO/modulebuilder.lang b/htdocs/langs/ro_RO/modulebuilder.lang
index 090269ab52f..219513f661d 100644
--- a/htdocs/langs/ro_RO/modulebuilder.lang
+++ b/htdocs/langs/ro_RO/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=Pagina PHP pentru a crea/edita/vizualiza o înregistrare
 PageForAgendaTab=Pagina PHP pentru fila eveniment
 PageForDocumentTab=Pagina PHP pentru fila document
 PageForNoteTab=Pagina PHP pentru fila note
+PageForContactTab=Pagina PHP pentru fila contact
 PathToModulePackage=Calea pentru zipul pachetului de module/aplicații
 PathToModuleDocumentation=Calea către fişierul documentaţie al modulului/aplicaţiei (%s)
 SpaceOrSpecialCharAreNotAllowed=Spațiile sau caracterele speciale nu sunt permise.
@@ -77,7 +78,7 @@ IsAMeasure=Este o măsură
 DirScanned=Directorul scanat
 NoTrigger=Niciun declanșator
 NoWidget=Nu există widget
-GoToApiExplorer=Mergeți la exploratorul API
+GoToApiExplorer=Explorer API
 ListOfMenusEntries=Lista intrărilor din meniu
 ListOfDictionariesEntries=Listă înregistrări dicţionare
 ListOfPermissionsDefined=Lista permisiunilor definite
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Dacă aveți cunoștințe despre SQL și PHP, puteți f
 SeeTopRightMenu=Vedeți <span class="fa fa-bug"> </span> din meniul din dreapta sus
 AddLanguageFile=Adăugați fișierul de limbă
 YouCanUseTranslationKey=Puteți folosi aici o cheie care este cheia de traducere găsită în fișierul de limbă (vezi fila "Limbi")
-DropTableIfEmpty=(Ștergeți tabelul dacă este gol)
+DropTableIfEmpty=(Distruge tabelul dacă este gol)
 TableDoesNotExists=Tabelul %s nu există
 TableDropped=Tabelul %s a fost șters
 InitStructureFromExistingTable=Construiți șirul de structură al unui tabel existent
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Utilizează un URL specificat de editor
 UseSpecificFamily = Utilizează o familie specifică
 UseSpecificAuthor = Utilizează un autor specific
 UseSpecificVersion = Utilizează o versiune iniţială specifică
-ModuleMustBeEnabled=Modulul/aplicaţia trebuie activată mai întâi
 IncludeRefGeneration=Referinţa obiectului trebuie să fie generată automat
 IncludeRefGenerationHelp=Bifează aceasta dacă vrei să incluzi cod de management pentru generarea automată a referinţei
 IncludeDocGeneration=Vreau să generez documente din obiect
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Tip de câmpuri: <br>varchar (99), double(24,8), real, text, ht
 AsciiToHtmlConverter=Convertor ASCII la HTML
 AsciiToPdfConverter=Convertor ASCII la PDF
 TableNotEmptyDropCanceled=Tabelul nu este gol. Operaţiunea de drop a fost anulată. 
+ModuleBuilderNotAllowed=Generatorul de module este disponibil, dar nu este permis utilizatorului dvs.
diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang
index 545383cb7a3..71fadeb9d6a 100644
--- a/htdocs/langs/ro_RO/other.lang
+++ b/htdocs/langs/ro_RO/other.lang
@@ -5,8 +5,6 @@ Tools=Instrumente
 TMenuTools=Instrumente
 ToolsDesc=Toate instrumentele care nu sunt incluse în alte intrări în meniu sunt grupate aici. <br> Toate instrumentele pot fi accesate prin meniul din stânga.
 Birthday=Zi de naştere
-BirthdayDate=Data naştere
-DateToBirth=Data naşterii
 BirthdayAlertOn=ziua de nastere de alertă activă
 BirthdayAlertOff=ziua de nastere de alertă inactiv
 TransKey=Traducerea cheii TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Luna anterioară (numărul 1-12) de la data facturării
 TextPreviousMonthOfInvoice=Luna anterioară (textul) datei facturii
 NextMonthOfInvoice=Luna următoare (numărul 1-12) de la data facturării
 TextNextMonthOfInvoice=În luna următoare (textul) datei facturii
+PreviousMonth=Luna anterioară
+CurrentMonth=Luna curentă
 ZipFileGeneratedInto=Fișierul Zip generat în <b> %s </b>.
 DocFileGeneratedInto=Fișierul doc generat în <b> %s </b>.
 JumpToLogin=Deconectată. Accesați pagina de conectare ...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Salut)__\n\nVeți găsi transportul __REF__
 PredefinedMailContentSendFichInter=__(Salut)__\n\nConsultați intervenția __REF__ atașată\n\n\n__(Cu sinceritate)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Puteți face clic pe linkul de mai jos pentru a efectua plata dacă nu este deja făcută.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Salut)__\n\n\n__(Cu sinceritate)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Memento eveniment "__EVENT_LABEL__" în data de  __EVENT_DATE__ la ora __EVENT_TIME__<br><br> Acesta este un mesaj automat, vă rugăm să nu răspundeți.
 DemoDesc=Dolibarr este un sistem ERP/CRM compact care suportă mai multe module de afaceri. O prezentare Demo pentru toate modulele nu are sens deoarece acest scenariu nu se produce niciodată (câteva sute disponibile). Deci, sunt disponibile mai multe profiluri demo.
 ChooseYourDemoProfil=Alegeți profilul demo care se potrivește cel mai bine nevoilor dvs. ...
 ChooseYourDemoProfilMore=... sau construiți propriul profil <br> (selectarea manuală a modulelor)
@@ -137,7 +138,7 @@ Right=Dreapta
 CalculatedWeight=Calculat în greutate
 CalculatedVolume=Calculat volum
 Weight=Greutate
-WeightUnitton=tonner
+WeightUnitton=tonă
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/adresă creată de colectorul de email-ur
 ProjectCreatedByEmailCollector=Proiect creat de colectorul de email-uri din email-ul cu MSGID %s
 TicketCreatedByEmailCollector=Tichet creat de colectorul de email-uri din email-ul cu MSGID %s
 OpeningHoursFormatDesc=Foloseşte un - pentru a separa orele de lucru.<br>Foloseşte un spaţiu pentru a introduce intervale oarare diferite.<br>Exemplu: 8-12 14-18
+PrefixSession=Prefix pentru ID-ul sesiunii
 
 ##### Export #####
 ExportsArea=Export
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index b65779946bc..e623fd9e6cb 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Completează cu data ultimelor linii de servicii
 MultiPricesAbility=Segmente multiple de preț pentru fiecare produs / serviciu (fiecare client se află într-un singur segment de preț)
 MultiPricesNumPrices=Numărul de preţ
 DefaultPriceType=Baza prețurilor în mod implicit (cu sau fără taxe) la adăugarea noilor prețuri de vânzare
-AssociatedProductsAbility=Activeaz kit-uri (produse virtuale)
+AssociatedProductsAbility=Activare kit-uri (set de alte produse)
+VariantsAbility=Activare variante (variații ale produselor, de exemplu, culoare, dimensiune)
 AssociatedProducts=Kit-uri
 AssociatedProductsNumber=Numărul de produse care compun acest kit
 ParentProductsNumber=Numărul  pachetelor produselor  părinte
@@ -169,6 +170,8 @@ SuppliersPrices=Prețurile furnizorului
 SuppliersPricesOfProductsOrServices=Prețurile furnizorilor (de produse sau servicii)
 CustomCode=Cod vamal/Marfă/Cod HS
 CountryOrigin=Ţara de origine
+RegionStateOrigin=Regiune de origine
+StateOrigin=Judeţ/regiune de origine
 Nature=Natură produs(materie primă/produs finit)
 NatureOfProductShort=Natură produs
 NatureOfProductDesc=Materie primă sau produs finit
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Foloseşte preţul fix
 PriceByQuantity=Preţuri diferite pe cantitate
 DisablePriceByQty=Dezactivați prețurile în funcție de cantitate
 PriceByQuantityRange=Interval cantitate
-MultipriceRules=Regulile segmentului de prețuri
+MultipriceRules=Prețuri automate pentru segment
 UseMultipriceRules=Utilizați regulile segmentului de preț (definite în configurarea modulului de produs) pentru a calcula automat prețurile tuturor celorlalte segmente în funcție de primul segment
 PercentVariationOver=Variația %% peste %s
 PercentDiscountOver=%% reducere peste %s
diff --git a/htdocs/langs/ro_RO/recruitment.lang b/htdocs/langs/ro_RO/recruitment.lang
index d2fb1c6d642..b09ecb6b976 100644
--- a/htdocs/langs/ro_RO/recruitment.lang
+++ b/htdocs/langs/ro_RO/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=Oferta de job este închisă. Postul a fost ocupat.
 JobClosedTextCanceled=Oferta de job este închisă.
 ExtrafieldsJobPosition=Atribute complementare (oferte job)
 ExtrafieldsCandidatures=Atribute complementare (aplicări job)
+MakeOffer=Fă o ofertă
diff --git a/htdocs/langs/ro_RO/sendings.lang b/htdocs/langs/ro_RO/sendings.lang
index 763d028c91f..8e18a146120 100644
--- a/htdocs/langs/ro_RO/sendings.lang
+++ b/htdocs/langs/ro_RO/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Alte livrări pentru această comandă
 SendingsAndReceivingForSameOrder=Expedieri și documente pentru această comandă
 SendingsToValidate=Livrări de validat
 StatusSendingCanceled=Anulată
+StatusSendingCanceledShort=Anulata
 StatusSendingDraft=Schiţă
 StatusSendingValidated=Validată (produse  de livrat sau deja livrate)
 StatusSendingProcessed=Procesată
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Mai întâi trebuie să validezi comanda înain
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Model complet pentru dispoziţie de livrare  (logo. ..)
+DocumentModelStorm=Modele de documente mult mai complete pentru chitanțe de livrare și compatibilitate cu câmpurile suplimentare(sigla ...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constanta EXPEDITION_ADDON_NUMBER nu este definită
 SumOfProductVolumes=Volumul total al produselor
 SumOfProductWeights=Greutatea totală a produselor
diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang
index ae3b0d063aa..440c6e7fc47 100644
--- a/htdocs/langs/ro_RO/stocks.lang
+++ b/htdocs/langs/ro_RO/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Setați valoarea la 0 pentru a reseta câmpul cantitate<br>
 UpdateByScaning=Actualizare prin scanare
 UpdateByScaningProductBarcode=Actualizare prin scanare (cod de bare produs)
 UpdateByScaningLot=Actualizare prin scanare (cod de bare lot|serie)
+DisableStockChangeOfSubProduct= Dezactivare modificare de stoc pentru toate subprodusele acestui kit în timpul acestei mișcări.
diff --git a/htdocs/langs/ro_RO/ticket.lang b/htdocs/langs/ro_RO/ticket.lang
index 6c582307da8..70ee1b31ebd 100644
--- a/htdocs/langs/ro_RO/ticket.lang
+++ b/htdocs/langs/ro_RO/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Tipuri de tichete
 TicketDictCategory=Tichet - Grupuri
 TicketDictSeverity=Tichet - Severități
 TicketDictResolution=Tichet - Rezoluție
-TicketTypeShortBUGSOFT=Logică disfuncţională
-TicketTypeShortBUGHARD=Material disfuncţional
-TicketTypeShortCOM=Întrebare comercială
 
+TicketTypeShortCOM=Întrebare comercială
 TicketTypeShortHELP=Solicitare funcţionalitate
 TicketTypeShortISSUE=Solicitare, eroare sau problemă
 TicketTypeShortREQUEST=Solicitare de modificare sau îmbunătăţire
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Altele
 TicketSeverityShortLOW=Scăzut
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Mare
-TicketSeverityShortBLOCKING=Critic / Blocaj
+TicketSeverityShortBLOCKING=Critic, blocant
 
 ErrorBadEmailAddress=Câmpul "%s" este incorect
 MenuTicketMyAssign=Tichetele mele
@@ -60,7 +58,6 @@ OriginEmail=Sursa emailului
 Notify_TICKET_SENTBYMAIL=Trimite mesaj tichet pe email
 
 # Status
-NotRead=Necitit
 Read=Citit
 Assigned=Atribuit
 InProgress=In progres
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Interfața publică permite vizitatorilor să
 TicketsAutoAssignTicket=Desemnați automat utilizatorul care a creat tichetul
 TicketsAutoAssignTicketHelp=La crearea unui tichet, utilizatorul poate fi automat alocat tichetului.
 TicketNumberingModules=Modul de numerotare a tichetelor
+TicketsModelModule=Şabloane documente pentru tichete
 TicketNotifyTiersAtCreation=Notificați terțul la creare
 TicketsDisableCustomerEmail=Dezactivați întotdeauna email-urile atunci când un tichet este creat din interfața publică 
 TicketsPublicNotificationNewMessage=Trimite email(uri) când un mesaj nou este adăugat
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Starea modificată: %s la %s
 TicketNotNotifyTiersAtCreate=Nu notificați compania la crearea
 Unread=Necitită
 TicketNotCreatedFromPublicInterface=Indisponibil. Tichetul nu a fost creat din interfaţa publică.
-PublicInterfaceNotEnabled=Interfaţa publică nu a fost activată
 ErrorTicketRefRequired=Denumirea de referință al tichetului este necesară
 
 #
diff --git a/htdocs/langs/ro_RO/website.lang b/htdocs/langs/ro_RO/website.lang
index 5e2dab5d97a..f1ca739ae33 100644
--- a/htdocs/langs/ro_RO/website.lang
+++ b/htdocs/langs/ro_RO/website.lang
@@ -30,7 +30,6 @@ EditInLine=Editați inline
 AddWebsite=Adaugă pagina web
 Webpage=Pagina web / container
 AddPage=Adăugați o pagină / un container
-HomePage=Acasă
 PageContainer=Pagina
 PreviewOfSiteNotYetAvailable=Previzualizarea site-ului dvs. web <strong> %s </strong> nu este încă disponibil. Mai întâi trebuie să '<strong> Importați un șablon complet de site-uri web </strong>' sau doar '<strong> Adăugați o pagină / container </strong>'.
 RequestedPageHasNoContentYet=Pagina solicitată cu id %s nu are încă conținut, sau fișierul cache cache.php a fost eliminat. Editați conținutul paginii pentru a rezolva această problemă.
@@ -101,7 +100,7 @@ EmptyPage=Pagina goală
 ExternalURLMustStartWithHttp=Adresa URL externă trebuie să înceapă cu http:// sau https://
 ZipOfWebsitePackageToImport=Încărcați fișierul Zip cu pachetul șablon website
 ZipOfWebsitePackageToLoad=sau Alegeți un pachet șablon website încorporat disponibil
-ShowSubcontainers=Includeți conținut dinamic
+ShowSubcontainers=Afişare conţinut dinamic
 InternalURLOfPage=Adresa URL internă a paginii
 ThisPageIsTranslationOf=Această pagină/recipient este o traducere a
 ThisPageHasTranslationPages=Această pagină / recipient are traducere
@@ -137,3 +136,4 @@ RSSFeedDesc=Puteți obține un flux RSS al celor mai recente articole cu tipul '
 PagesRegenerated=%s pagină(i) /container(e) regenerate
 RegenerateWebsiteContent=Regenerați fișierele cache ale site-ului web
 AllowedInFrames=Permis în Frame-uri
+DefineListOfAltLanguagesInWebsiteProperties=Definiți lista tuturor limbilor disponibile în proprietățile site-ului web.
diff --git a/htdocs/langs/ro_RO/withdrawals.lang b/htdocs/langs/ro_RO/withdrawals.lang
index d0c4e6162c6..7bffe55a8e5 100644
--- a/htdocs/langs/ro_RO/withdrawals.lang
+++ b/htdocs/langs/ro_RO/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Ultimele încasări de debit direct %s
 MakeWithdrawRequest=Efectuați o solicitare de plată cu debit direct
 MakeBankTransferOrder=Solicitare transfer de credit
 WithdrawRequestsDone=%s au fost înregistrate cererile de debitare directă
+BankTransferRequestsDone=%s solicitări de transfer de credit înregistrate
 ThirdPartyBankCode=Codul bancar al terțului
 NoInvoiceCouldBeWithdrawed=Nici o factură nu a fost debitată cu succes. Verificați dacă facturile sunt pe companiile cu un IBAN valabil și că IBAN are un UMR (referință unică de mandat) cu modul <strong> %s </strong>.
 ClassCredited=Clasifica creditat
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Data executării
 CreateForSepa=Creați un fișier de debit direct
-ICS=Identificatorul creditorului CI
+ICS=Identificator creditor CI pentru debit direct
+ICSTransfer=Identificator creditor CI pentru transfer bancar
 END_TO_END=Eticheta "EndToEndId" SEPA XML - Id unic atribuit pentru fiecare tranzacție
 USTRD=Eticheta XML "nestructurată" SEPA
 ADDDAYS=Adăugați zile la data de executare
@@ -146,3 +148,4 @@ InfoRejectSubject=Comanda de debitare directă a fost refuzată
 InfoRejectMessage=Bună ziua, <br> <br> ordinul de plată prin debit direct al facturii %s aferente companiei %s, cu o sumă de %s a fost refuzată de bancă. <br> <br> - <br> %s
 ModeWarning=Opţiunea pentru modul real, nu a fost stabilit, ne oprim după această simulare
 ErrorCompanyHasDuplicateDefaultBAN=Compania cu id %s are mai multe conturi bancare implicite. Nu se poate determina cel care se doreşte a fi utilizat.
+ErrorICSmissing=ICS lipsă în contul bancar %s
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index bc73a4d82a0..4518c9cc151 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Дата
 Docref=Ссылка
 LabelAccount=Метка бухгалтерского счёта
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Журнал
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Не согласовано
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index 8894f182715..f8d2f6942fd 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Внешний вид
 SetupArea=Настройка
 UploadNewTemplate=Загрузить новый шаблон(ы)
 FormToTestFileUploadForm=Форма для проверки загрузки файлов (в зависимости от настройки)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Примечание: "Да" влияет только тогда, когда модуль <b>%s</b> включен
 RemoveLock=Удалите/переименуйте файл <b>%s</b>, если он существует, чтобы разрешить использование инструмента обновления/установки.
 RestoreLock=Восстановите файл <b>%s</b> с разрешением только для чтение, чтобы отключить дальнейшее использование инструмента обновления/установки.
@@ -85,7 +87,6 @@ ShowPreview=Предварительный просмотр
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Предварительный просмотр не доступен
 ThemeCurrentlyActive=Текущая тема
-CurrentTimeZone=Текущий часовой пояс в настройках PHP
 MySQLTimeZone=Часовой пояс БД (MySQL)
 TZHasNoEffect=Даты хранятся и возвращаются сервером базы данных, как если бы они хранились в виде переданной строки. Часовой пояс действует только при использовании функции UNIX_TIMESTAMP (которая не должна использоваться Dolibarr, поэтому часовая зона (TZ) базы данных не должна иметь никакого эффекта, даже если она изменилась после ввода данных).
 Space=Пробел
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Эта область обеспечивает функци
 Purge=Очистить
 PurgeAreaDesc=Эта страница позволяет вам удалить все файлы, созданные или сохраненные Dolibarr (временные файлы или все файлы в каталоге <b> %s</b> ). Использование этой функции обычно не требуется. Он предоставляется в качестве обходного пути для пользователей, чей Dolibarr размещен поставщиком, который не предлагает разрешения на удаление файлов, созданных веб-сервером.
 PurgeDeleteLogFile=Удаление файлов журналов, включая <b>%s</b> определенный для модуля Syslog (без риска потери данных)
-PurgeDeleteTemporaryFiles=Удалить все временные файлы (без риска потери данных). Примечание: Удаление выполняется только в том случае, если временный каталог был создан 24 часа назад.
-PurgeDeleteTemporaryFilesShort=Удаление временных файлов
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Удалить все файлы в каталоге: <b>%s</b> . <br> Это удалит все сгенерированные документы, связанные с элементами (контрагенты, счета и т.д.), файлы, загруженные в модуль ECM, резервные копии базы данных и временные файлы.
 PurgeRunNow=Очистить сейчас
 PurgeNothingToDelete=Нет директории или файла для удаления.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Предпочитаемые партнёры
 OtherResources=Другие источники
 ExternalResources=Внешние Ресурсы
 SocialNetworks=Социальные сети
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=Для получения документации пользователя или разработчика (документация, часто задаваемые вопросы...),<br> посетите Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Для любых других вопросов / помощи, вы можете использовать форум Dolibarr:<br><b><a href="%s" target="_blank">%s</b></a>
 HelpCenterDesc1=Вот некоторые ресурсы для получения помощи и поддержки с Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Примеры с текущей конфигураци
 ListOfDirectories=Список каталогов с шаблонами OpenDocument
 ListOfDirectoriesForModelGenODT=Список каталогов, содержащих файлы шаблонов в формате OpenDocument. <br><br> Укажите здесь полный путь к каталогу. <br> Каждый каталог с новой строки. <br> Чтобы добавить каталог GED-модуля, добавьте здесь <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b> . <br><br> Файлы в этих каталогах должны заканчиваться на <b>.odt</b> или <b>.ods</b> .
 NumberOfModelFilesFound=Количество файлов шаблонов ODT/ODS, найденных в этих каталогах
-ExampleOfDirectoriesForModelGen=Примеры синтаксиса: <br> C: \\ MYDIR <br> / home / mydir <br> DOL_DATA_ROOT / ecm / ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Прежде чем сохранить шаблоны в этих каталогах прочитайте документацию на Wiki чтобы узнать, как создать свой шаблоны ODT документов:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Расположение Имени / Фамилиии
@@ -406,7 +408,7 @@ UrlGenerationParameters=Параметры безопасных URL`ов
 SecurityTokenIsUnique=Использовать уникальный параметр securekey для каждого URL
 EnterRefToBuildUrl=Введите ссылку на объект %s
 GetSecuredUrl=Получить рассчитанный URL
-ButtonHideUnauthorized=Скрыть кнопки для пользователей без прав администратора для несанкционированных действий вместо отображения серых отключенных кнопок
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Предыдущее значение НДС
 NewVATRates=Новое значение НДС
 PriceBaseTypeToChange=Изменять базовые цены на определенную величину
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Персонализированные меню, не
 NewMenu=Новое меню
 MenuHandler=Меню обработчик
 MenuModule=Исходный модуль
-HideUnauthorizedMenu= Скрыть несанкционированного меню (серый)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Идентификатор меню
 DetailMenuHandler=Обработчик меню, где показывать новое меню
 DetailMenuModule=Имя модуля, если пункт меню взят из модуля
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Индекс
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/ru_RU/banks.lang b/htdocs/langs/ru_RU/banks.lang
index 8c02e198885..a735e4ba31a 100644
--- a/htdocs/langs/ru_RU/banks.lang
+++ b/htdocs/langs/ru_RU/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=Мандат SEPA
 YourSEPAMandate=Ваш мандат SEPA
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/ru_RU/blockedlog.lang b/htdocs/langs/ru_RU/blockedlog.lang
index 99bf472eed0..74164531cae 100644
--- a/htdocs/langs/ru_RU/blockedlog.lang
+++ b/htdocs/langs/ru_RU/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/ru_RU/boxes.lang b/htdocs/langs/ru_RU/boxes.lang
index b8e47954693..5656e826dc1 100644
--- a/htdocs/langs/ru_RU/boxes.lang
+++ b/htdocs/langs/ru_RU/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Последние  %sизмененные пож
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Глобальная активность (фактуры, предложения, заказы)
 BoxGoodCustomers=Хорошие клиенты
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Запланированные задания
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Дата последнего обновления
 NoRecordedBookmarks=Закладки не созданы.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Бухгалтерия
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/ru_RU/cashdesk.lang b/htdocs/langs/ru_RU/cashdesk.lang
index 9b2073aed88..4a435be4e06 100644
--- a/htdocs/langs/ru_RU/cashdesk.lang
+++ b/htdocs/langs/ru_RU/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Нижний колонтитул
 AmountAtEndOfPeriod=Сумма на конец периода (день, месяц или год)
 TheoricalAmount=Теоретическая сумма
 RealAmount=Действительная сумма
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Кол-во счетов-фактур
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/ru_RU/categories.lang b/htdocs/langs/ru_RU/categories.lang
index c1fd9fc39d7..fc188dff315 100644
--- a/htdocs/langs/ru_RU/categories.lang
+++ b/htdocs/langs/ru_RU/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Раздел тегов/категорий проекто
 UsersCategoriesArea=Раздел тегов/категорий пользователей
 SubCats=Подкатегории
 CatList=Список тегов/категорий
+CatListAll=List of tags/categories (all types)
 NewCategory=Новый тег/категория
 ModifCat=Изменить тег/категорию
 CatCreated=Тег/категория созданы
@@ -65,16 +66,22 @@ UsersCategoriesShort=Теги/категории пользователей
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=ID тега/категории
-CatSupList=List of vendor tags/categories
-CatCusList=Список тегов/категорий клиента/потенциального клиента
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Список тегов/категорий товаров
 CatMemberList=Список тегов/категорий участников
-CatContactList=Список тегов/категорий контактов
-CatSupLinks=Связи между поставщиками и  тегами/категориями
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Связи между клиентами/потенц. клиентами  и  тегами/категориями
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Связи между продуктами/услугами  и  тегами/категориями
-CatProJectLinks=Связи между проектами и тегами/категориями
+CatMembersLinks=Связи между участниками  и  тегами/категориями
+CatProjectsLinks=Связи между проектами и тегами/категориями
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Удалить из тега/категории
 ExtraFieldsCategories=Дополнительные атрибуты
 CategoriesSetup=Настройка тегов/категорий
diff --git a/htdocs/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang
index 53e53122d77..2f8f9c2005b 100644
--- a/htdocs/langs/ru_RU/companies.lang
+++ b/htdocs/langs/ru_RU/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Проверьте идентификатора НДС
 VATIntraManualCheck=Вы также можете проверить его вручную на сайте Европейской Комиссии <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Проверка невозможна. Сервис проверки не предоставляется государством-членом ЕС (%s).
 NorProspectNorCustomer=Не потенциальный клиент, не клиент
-JuridicalStatus=Тип юридического лица
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Сотрудники
 ProspectLevelShort=Потенциальный
diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang
index f9002c431a6..c7e9361c99f 100644
--- a/htdocs/langs/ru_RU/compta.lang
+++ b/htdocs/langs/ru_RU/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Показать оплате НДС
 TotalToPay=Всего к оплате
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Режим <b>%sRE на счетах клиентов - счетах поставщиков%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Баланс доходов и расходов, г
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded= - Суммы даны с учётом всех налогов
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Доклад третьей стороной IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/ru_RU/cron.lang b/htdocs/langs/ru_RU/cron.lang
index c21b1597510..d65f1c21c33 100644
--- a/htdocs/langs/ru_RU/cron.lang
+++ b/htdocs/langs/ru_RU/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Удалить Запланированную задачу
 Permission23104 = Выполнить запланированную задачу
 # Admin
 CronSetup=Настройки запланированных заданий
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Или проверить и запустить специальную задачу
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Ключ безопасности для запуска запланированных заданий
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=В системах Unix-like вы должны задать crontab для выполнения команды каждые 5 минут.
 CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Number of launches
 CronMaxRun=Maximum number of launches
 CronEach=Каждый
 JobFinished=Задание запущено и завершено
+Scheduled=Scheduled
 #Page card
 CronAdd= Добавить задание
 CronEvery=Execute job each
@@ -56,7 +58,7 @@ CronNote=Комментарий
 CronFieldMandatory=Поле %s является обязательным
 CronErrEndDateStartDt=Дата окончания не может быть раньше даты начала
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Включено
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Выключать
 CronTaskInactive=Задание отключено
 CronId=ID
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Команда командной строки
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index d9a8f880d67..3bcf15212e8 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Нет ошибок, мы принимаем
 # Errors
 ErrorButCommitIsDone=Обнаружены ошибки, но мы подтвердиле несмотря на это
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s неправильно
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Логин %s уже существует.
 ErrorGroupAlreadyExists=Группа %s уже существует.
 ErrorRecordNotFound=Запись не найдена.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Некоторые обязательные поля не б
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Не удалось создать каталог. Убедитесь, что веб-сервер пользователь имеет разрешения на запись в каталог Dolibarr документы. Если параметр <b>safe_mode</b> включен по этому PHP, проверьте, что Dolibarr PHP файлы принадлежат к веб-серверу пользователей (или группы).
 ErrorNoMailDefinedForThisUser=Нет определена почта для этого пользователя
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Эта функция JavaScript должны быть активированы на работу. Изменить это в настройки - дисплей.
 ErrorTopMenuMustHaveAParentWithId0=Меню типа 'Top' не может быть родителем меню. Положить 0 родителей в меню или выбрать меню типа 'левых'.
 ErrorLeftMenuMustHaveAParentId=Меню типа 'левых' должен иметь родителя ID.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Имя этого профиля уже сущесв
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP соответствия не является полной.
 ErrorLDAPMakeManualTest=. LDIF файл был создан в директории %s. Попробуйте загрузить его вручную из командной строки, чтобы иметь больше информации об ошибках.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ссылки, используемые для создания, уже существует.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/ru_RU/exports.lang b/htdocs/langs/ru_RU/exports.lang
index 380635eca51..5fbbcfd4665 100644
--- a/htdocs/langs/ru_RU/exports.lang
+++ b/htdocs/langs/ru_RU/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Поле название
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Библиотека
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Шаг
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/ru_RU/mails.lang b/htdocs/langs/ru_RU/mails.lang
index 1da962648ec..aa01654c759 100644
--- a/htdocs/langs/ru_RU/mails.lang
+++ b/htdocs/langs/ru_RU/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Линия %s в файл
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Уведомления
-NoNotificationsWillBeSent=Нет электронной почте уведомления, планируется к этому мероприятию и компании
-ANotificationsWillBeSent=1 уведомление будет отправлено по электронной почте
-SomeNotificationsWillBeSent=%s уведомления будут отправлены по электронной почте
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=Список всех уведомлений по электронной почте отправлено
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Информация
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index bcd5f1ea608..bbccccbc886 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Для этого типа электронной почты 
 AvailableVariables=Доступны переменные для замены
 NoTranslation=Нет перевода
 Translation=Перевод
+CurrentTimeZone=Текущий часовой пояс в настройках PHP
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Запись не найдена
 NoRecordDeleted=Нет удаленных записей
 NotEnoughDataYet=Недостаточно данных
@@ -85,6 +87,8 @@ FileWasNotUploaded=Файл выбран как вложение, но пока
 NbOfEntries=Кол-во записей
 GoToWikiHelpPage=Читать интернет-справку (необходим доступ к Интернету)
 GoToHelpPage=Читать помощь
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Запись сохранена
 RecordDeleted=Запись удалена
 RecordGenerated=Запись сгенерирована
@@ -433,6 +437,7 @@ RemainToPay=Осталось заплатить
 Module=Модуль/Приложение
 Modules=Модули/Приложения
 Option=Опция
+Filters=Filters
 List=Список
 FullList=Полный список
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Отправить письмо
 Email=Адрес электронной почты
 NoEMail=Нет Email
 AlreadyRead=Прочитано
-NotRead=Не прочитано
+NotRead=Unread
 NoMobilePhone=Нет мобильного телефона
 Owner=Владелец
 FollowingConstantsWillBeSubstituted=Следующие константы будут подменять соответствующие значения.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/ru_RU/modulebuilder.lang b/htdocs/langs/ru_RU/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/ru_RU/modulebuilder.lang
+++ b/htdocs/langs/ru_RU/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang
index 390b2716c41..975a61e5488 100644
--- a/htdocs/langs/ru_RU/other.lang
+++ b/htdocs/langs/ru_RU/other.lang
@@ -5,8 +5,6 @@ Tools=Инструменты
 TMenuTools=Инструменты
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=День рождения
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=рождения активного оповещения
 BirthdayAlertOff=рождения оповещения неактивные
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Право
 CalculatedWeight=расчетный вес
 CalculatedVolume=Beregnet volum
 Weight=Вес
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=кг
 WeightUnitg=G
 WeightUnitmg=мг
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Экспорт области
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index dd1b39584f5..e399136ba48 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Кол-во цен
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Количество родительских упаковочных продуктов
@@ -167,8 +168,10 @@ BuyingPrices=Цены на покупку
 CustomerPrices=Цены клиентов
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Таможенный / Товарный / HS код
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Страна происхождения
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Использовать фиксированную цену
 PriceByQuantity=Разные цены по количеству
 DisablePriceByQty=Отключить цены по количеству
 PriceByQuantityRange=Диапазон количества
-MultipriceRules=Правила ценового сегмента
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% вариация над %s
 PercentDiscountOver=%% скидка на %s
diff --git a/htdocs/langs/ru_RU/recruitment.lang b/htdocs/langs/ru_RU/recruitment.lang
index f113cfbe396..71fa83a3e38 100644
--- a/htdocs/langs/ru_RU/recruitment.lang
+++ b/htdocs/langs/ru_RU/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/ru_RU/sendings.lang b/htdocs/langs/ru_RU/sendings.lang
index 83633eb27c1..8f423ba15d8 100644
--- a/htdocs/langs/ru_RU/sendings.lang
+++ b/htdocs/langs/ru_RU/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Другие поставки для этого зак
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Поставки для проверки
 StatusSendingCanceled=Отменена
+StatusSendingCanceledShort=Отменена
 StatusSendingDraft=Черновик
 StatusSendingValidated=Утверждена (товары для отправки или уже отправлены)
 StatusSendingProcessed=Обработано
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Более полная модель документа для доставки квитанций (logo. ..)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Постоянное EXPEDITION_ADDON_NUMBER не определена
 SumOfProductVolumes=Сумма сторон товара
 SumOfProductWeights=Вес товара в сумме
diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang
index e06e1cebd17..d561e35bfae 100644
--- a/htdocs/langs/ru_RU/stocks.lang
+++ b/htdocs/langs/ru_RU/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/ru_RU/ticket.lang b/htdocs/langs/ru_RU/ticket.lang
index 99c9e52ce56..708af1e5769 100644
--- a/htdocs/langs/ru_RU/ticket.lang
+++ b/htdocs/langs/ru_RU/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Другое
 TicketSeverityShortLOW=Низкий
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Высокий
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Не прочитано
 Read=Читать
 Assigned=Assigned
 InProgress=Выполняется
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/ru_RU/website.lang b/htdocs/langs/ru_RU/website.lang
index 4b46043e5a1..775344b328a 100644
--- a/htdocs/langs/ru_RU/website.lang
+++ b/htdocs/langs/ru_RU/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Страница
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/ru_RU/withdrawals.lang b/htdocs/langs/ru_RU/withdrawals.lang
index e7d2417a55d..d93b73ddd37 100644
--- a/htdocs/langs/ru_RU/withdrawals.lang
+++ b/htdocs/langs/ru_RU/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Классифицировать зачисленных
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Вариант для реального режима не был установлен, мы останавливаемся после этого моделирования
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/ru_UA/products.lang b/htdocs/langs/ru_UA/products.lang
deleted file mode 100644
index 6e900475275..00000000000
--- a/htdocs/langs/ru_UA/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang
index 5b1f85a55c1..c4ce2ba8726 100644
--- a/htdocs/langs/sk_SK/accountancy.lang
+++ b/htdocs/langs/sk_SK/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Nie je viazaný na účet
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s produkty / služby neboli viazané na žiadny účtovný účet
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Začnite triediť stránku "Väzba urobiť" najnovšími prvkami
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Začnite triediť stránku "Väzba vykonaná" najnovšími prvkami
 
@@ -198,7 +199,8 @@ Docdate=dátum
 Docref=referencie
 LabelAccount=Značkový účet
 LabelOperation=Label operation
-Sens=sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=časopis
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Číslo kusu
 TransactionNumShort=Num. transakcie
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Skupinové účty
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Priradzovať automaticky
 AutomaticBindingDone=Automatické priradenie dokončené
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Nezlúčené
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 22c255b5c06..5d56e6cdbf8 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Zobraziť
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Formulár pre testovanie nahrávania súborov (podľa nastavenia)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Poznámka: áno je účinné len vtedy, ak je modul <b>%s</b> zapnutý
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Zobraziť náhľad
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Náhľad nie je k dispozícii
 ThemeCurrentlyActive=Téma aktívnej
-CurrentTimeZone=Časové pásmo PHP (server)
 MySQLTimeZone=TimeZone MySql (databáza)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Miesto
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Očistiť
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Vyčistiť teraz
 PurgeNothingToDelete=Žiadne súbory alebo priečinky na zmazanie
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferovaní partneri
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=Pre používateľov alebo vývojárov dokumentácie (doc, FAQs ...) <br> pozrite sa na Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
 ForAnswersSeeForum=V prípade akýchkoľvek ďalších otázok / help, môžete použiť fórum Dolibarr: <br> <a href="%s" target="_blank"><b>%s</b></a>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=Zoznam OpenDocument šablóny zoznamov
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Príklady syntaxe: <br> c: \\ mydir <br> / Home / mydir <br> DOL_DATA_ROOT / ECM / ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Ak chcete vedieť, ako vytvoriť svoje ODT šablóny dokumentov pred ich uložením do týchto adresárov, prečítajte si wiki dokumentácie:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Pozícia Meno / Priezvisko
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parametre na zabezpečenie URL
 SecurityTokenIsUnique=Používame unikátny securekey parameter pre každú adresu URL
 EnterRefToBuildUrl=Zadajte odkaz na objekt %s
 GetSecuredUrl=Získajte vypočítanú URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Staré Sadzba DPH
 NewVATRates=Nová sadzba DPH
 PriceBaseTypeToChange=Zmeniť na cenách s hodnotou základného odkazu uvedeného na
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Nová ponuka
 MenuHandler=Menu handler
 MenuModule=Modul zdroja
-HideUnauthorizedMenu= Skryť neoprávneným menu (sivá)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id ponuka
 DetailMenuHandler=Menu handler, kde má novú ponuku
 DetailMenuModule=Názov modulu, pokiaľ položky ponuky pochádzajú z modulu
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zips
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/sk_SK/banks.lang b/htdocs/langs/sk_SK/banks.lang
index 471e6830858..3000af0f069 100644
--- a/htdocs/langs/sk_SK/banks.lang
+++ b/htdocs/langs/sk_SK/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/sk_SK/blockedlog.lang b/htdocs/langs/sk_SK/blockedlog.lang
index bce0ea3bd25..05233648848 100644
--- a/htdocs/langs/sk_SK/blockedlog.lang
+++ b/htdocs/langs/sk_SK/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/sk_SK/boxes.lang b/htdocs/langs/sk_SK/boxes.lang
index dea1fdff8da..eb5e417ed1e 100644
--- a/htdocs/langs/sk_SK/boxes.lang
+++ b/htdocs/langs/sk_SK/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Najnovšie %s upravené príspevky
 BoxTitleLastModifiedExpenses=Najnovšie %s upravené správy o výdavkoch
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Globálna aktivita (faktúry, návrhy, objednávky)
 BoxGoodCustomers=Top zákazníci
 BoxTitleGoodCustomers=%s Top zákazníkov
+BoxScheduledJobs=Naplánované úlohy
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Najnovší čas obnovenia
 NoRecordedBookmarks=Žiadne záložky definované.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Účtovníctvo
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/sk_SK/cashdesk.lang b/htdocs/langs/sk_SK/cashdesk.lang
index 849dfa5d97a..0c85aa44b53 100644
--- a/htdocs/langs/sk_SK/cashdesk.lang
+++ b/htdocs/langs/sk_SK/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb faktúr
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/sk_SK/categories.lang b/htdocs/langs/sk_SK/categories.lang
index 1f28159b136..9c7e4ed9951 100644
--- a/htdocs/langs/sk_SK/categories.lang
+++ b/htdocs/langs/sk_SK/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Doplnkové atribúty
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/sk_SK/companies.lang b/htdocs/langs/sk_SK/companies.lang
index 1aae4a6f624..fc39a7f1038 100644
--- a/htdocs/langs/sk_SK/companies.lang
+++ b/htdocs/langs/sk_SK/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Skontrolujte, nie je možné. Skontrolujte, služba nie je poskytovaná členským štátom (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potenciál
diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang
index 86356ba2d4a..2f3486a9535 100644
--- a/htdocs/langs/sk_SK/compta.lang
+++ b/htdocs/langs/sk_SK/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Zobraziť DPH platbu
 TotalToPay=Celkom k zaplateniu
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Režim <b>%sVAT na záväzky accounting%s.</b>
 CalcModeVATEngagement=Režim <b>%sVAT z príjmov-expense%sS.</b>
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Bilancia príjmov a výdavkov, ročné zhrnutie
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Uvedené sumy sú so všetkými daňami
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Správa o treťou stranou IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/sk_SK/cron.lang b/htdocs/langs/sk_SK/cron.lang
index ba8fc86897a..1631b6c9038 100644
--- a/htdocs/langs/sk_SK/cron.lang
+++ b/htdocs/langs/sk_SK/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Vytvoriť / upraviť naplánovanú úlohu
 Permission23103 = Odstrániť naplánovanú úlohu
 Permission23104 = Spustiť naplánovanú úlohu
 # Admin
-CronSetup= Naplánované úlohy správy Nastavenie
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+CronSetup=Naplánované úlohy správy Nastavenie
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Bezpečnostný kľúč pre URL spustiť cron
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -42,10 +43,11 @@ CronModule=Modul
 CronNoJobs=Žiadny registrovaný práce
 CronPriority=Priorita
 CronLabel=Štítok
-CronNbRun=Nb. začať
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Každý
 JobFinished=Práca zahájená a dokončená
+Scheduled=Scheduled
 #Page card
 CronAdd= Pridať pracovných miest
 CronEvery=Execute job each
@@ -56,16 +58,16 @@ CronNote=Komentár
 CronFieldMandatory=Pole je povinné %s
 CronErrEndDateStartDt=Dátum ukončenia nemôže byť pred dátumom začatia
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Umožniť
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Zakázať
 CronTaskInactive=Táto úloha je zakázaný
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=Systém príkazového riadka spustiť.
 CronCreateJob=Create new Scheduled Job
 CronFrom=Z
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Shell príkaz
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index 2b0b88987e9..30e9dea3094 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Žiadna chyba sa zaväzujeme
 # Errors
 ErrorButCommitIsDone=Boli nájdené chyby, ale my overiť aj cez to
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s je zle
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Prihlásenie %s už existuje.
 ErrorGroupAlreadyExists=Skupina %s už existuje.
 ErrorRecordNotFound=Záznam nie je nájdený.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Niektoré požadované pole sa nevypĺňa.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Nepodarilo sa vytvoriť adresár. Uistite sa, že webový server má užívateľ oprávnenie na zápis do adresára dokumentov Dolibarr. Ak je parameter <b>safe_mode</b> je povolené na tomto PHP, skontrolujte, či Dolibarr php súbory, vlastné pre užívateľa webového servera (alebo skupina).
 ErrorNoMailDefinedForThisUser=Žiadna pošta definované pre tohto používateľa
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Táto funkcia potrebujete mať Java scripty byť aktivovaný do práce. Zmeniť v nastavení - displej.
 ErrorTopMenuMustHaveAParentWithId0=Ponuka typu &quot;top&quot; nemôže mať rodič menu. Dajte 0 do nadradenej ponuky alebo zvoliť ponuku typu &quot;vľavo&quot;.
 ErrorLeftMenuMustHaveAParentId=Ponuka typu &quot;ľavica&quot;, musí mať rodič id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP zhoda nie je úplná.
 ErrorLDAPMakeManualTest=. LDIF súbor bol vytvorený v adresári %s. Skúste načítať ručne z príkazového riadku získať viac informácií o chybách.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref používa pre tvorbu už existuje.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/sk_SK/exports.lang b/htdocs/langs/sk_SK/exports.lang
index 5d9514819a8..a9991f8c0fd 100644
--- a/htdocs/langs/sk_SK/exports.lang
+++ b/htdocs/langs/sk_SK/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Polia názov
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Knižnica
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Krok
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/sk_SK/mails.lang b/htdocs/langs/sk_SK/mails.lang
index d8f41131b19..5c0b127f7e3 100644
--- a/htdocs/langs/sk_SK/mails.lang
+++ b/htdocs/langs/sk_SK/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Linka %s v súbore
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Upozornenie
-NoNotificationsWillBeSent=Žiadne oznámenia e-mailom sú naplánované pre túto udalosť a spoločnosť
-ANotificationsWillBeSent=1 bude zaslaný e-mailom
-SomeNotificationsWillBeSent=%s oznámenia bude zaslané e-mailom
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=Vypísať všetky e-maily odosielané oznámenia
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Informácie
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index efb38289b90..5bacb243779 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=Preklad neexistuje
 Translation=Preklad
+CurrentTimeZone=Časové pásmo PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Nebol nájdený žiadny záznam
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=Súbor vybraný pre pripojenie, ale ešte nebol nahraný. Kli
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Prečítajte si pomáhať
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Záznam uložený
 RecordDeleted=Zaznamenajte zmazaný
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Voľba
+Filters=Filters
 List=Zoznam
 FullList=Plný zoznam
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Odoslať e-mail
 Email=E-mail
 NoEMail=Žiadny e-mail
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=Žiadny mobil
 Owner=Majiteľ
 FollowingConstantsWillBeSubstituted=Nasledujúci konštanty bude nahradený zodpovedajúcou hodnotou.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/sk_SK/modulebuilder.lang b/htdocs/langs/sk_SK/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/sk_SK/modulebuilder.lang
+++ b/htdocs/langs/sk_SK/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang
index d758a30e814..681daf39c91 100644
--- a/htdocs/langs/sk_SK/other.lang
+++ b/htdocs/langs/sk_SK/other.lang
@@ -5,8 +5,6 @@ Tools=Nástroje
 TMenuTools=Nástroje
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Narodeniny
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=narodeniny výstraha aktívna
 BirthdayAlertOff=narodeniny upozornenia neaktívne
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Právo
 CalculatedWeight=Vypočítaná hmotnosť
 CalculatedVolume=Vypočítaný objem
 Weight=Hmotnosť
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Vývoz plocha
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index ef7e10c7f3f..bd34c331e16 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Počet cien
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Počet rodičovských balíčkov produktu
@@ -167,8 +168,10 @@ BuyingPrices=Nákupné ceny
 CustomerPrices=Zákaznícka cena
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Krajina pôvodu
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Použite pevnú cenu
 PriceByQuantity=Rozdielné ceny podľa quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Množstvo rozsah
-MultipriceRules=Pravidlá cenových oblastí
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% zmena cez %s
 PercentDiscountOver=%% zľava cez %s
diff --git a/htdocs/langs/sk_SK/recruitment.lang b/htdocs/langs/sk_SK/recruitment.lang
index f010df9c509..321f949aa39 100644
--- a/htdocs/langs/sk_SK/recruitment.lang
+++ b/htdocs/langs/sk_SK/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/sk_SK/sendings.lang b/htdocs/langs/sk_SK/sendings.lang
index 54d61a56291..76606f60e53 100644
--- a/htdocs/langs/sk_SK/sendings.lang
+++ b/htdocs/langs/sk_SK/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Ďalšie zásielky pre túto objednávku
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Zásielky na overenie
 StatusSendingCanceled=Zrušený
+StatusSendingCanceledShort=Zrušený
 StatusSendingDraft=Návrh
 StatusSendingValidated=Overené (výrobky na odoslanie alebo už dodané)
 StatusSendingProcessed=Spracované
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Najprv musíte overiť objednávku pred vytvore
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Viac Celý dokument model pre potvrdenie o doručení (logo. ..)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konštantná EXPEDITION_ADDON_NUMBER nie je definované
 SumOfProductVolumes=Súčet objemov produktov
 SumOfProductWeights=Súčet hmotností produktov
diff --git a/htdocs/langs/sk_SK/stocks.lang b/htdocs/langs/sk_SK/stocks.lang
index 29fb6b84fcf..e050622b21f 100644
--- a/htdocs/langs/sk_SK/stocks.lang
+++ b/htdocs/langs/sk_SK/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/sk_SK/ticket.lang b/htdocs/langs/sk_SK/ticket.lang
index b0914c5f748..f45e4fb3067 100644
--- a/htdocs/langs/sk_SK/ticket.lang
+++ b/htdocs/langs/sk_SK/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Ostatné
 TicketSeverityShortLOW=Nízky
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Vysoký
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Čítať
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/sk_SK/website.lang b/htdocs/langs/sk_SK/website.lang
index b2c84ed0d5b..e1cfe004a2f 100644
--- a/htdocs/langs/sk_SK/website.lang
+++ b/htdocs/langs/sk_SK/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Strana
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/sk_SK/withdrawals.lang b/htdocs/langs/sk_SK/withdrawals.lang
index a13acf88e77..41a3cfab464 100644
--- a/htdocs/langs/sk_SK/withdrawals.lang
+++ b/htdocs/langs/sk_SK/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Klasifikovať pripísaná
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Voľba pre reálny režim nebol nastavený, môžeme zastaviť po tomto simuláciu
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index 93e33834eff..ca8fc700696 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Datum
 Docref=Reference
 LabelAccount=Račun Label
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Revija
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 38d716f78eb..5b46b9c1770 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Prikaz
 SetupArea=Nastavitve
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Testiranje »upload-a« (v skladu z nastavitvami)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Opomba: 'Da' velja samo, če je omogočen modul <b>%s</b>
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Prikaži predogled
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Predogled ni na voljo
 ThemeCurrentlyActive=Trenutno aktivna tema
-CurrentTimeZone=Časovni pas PHP strežnika
 MySQLTimeZone=Časovni pas MySql (baze podatkov)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Presledek
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Počisti
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Počisti zdaj
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferirani partnerji
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=Glede dokumentacije za uporabnike in razvojnike (Doc, FAQ...),<br>poglejte na Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Za vsa ostala vprašanja/pomoč lahko uporabite Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=Seznam map z OpenDocument predlogami
 ListOfDirectoriesForModelGenODT=Seznam map, ki vsebujejo predloge v OpenDocument formatu.<br><br>Tukaj navedite celotno pot do mape.<br>Med mapami vstavite CR.<br>Mapo GED modula dodajte tukaj <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Datoteke v tej mapi morajo imeti končnico <b>.odt</b> ali <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Primeri sintakse:<br>c:\\mydir<br>/home/mydir <br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=Z dodatkom takih oznak v predlogo, boste ob kreiranju dokumenta dobili personalizirane vrednosti:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org
 FirstnameNamePosition=Položaj imena/priimka
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parametri za zagotovitev URL
 SecurityTokenIsUnique=Uporabite edinstven parameter securekey za vsako URL
 EnterRefToBuildUrl=Vnesite sklic za predmet %s
 GetSecuredUrl=Get izračuna URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Stara stopnja DDV
 NewVATRates=Nova stopnja DDV
 PriceBaseTypeToChange=Sprememba cen z definirano osnovno referenčno vrednostjo
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Nov meni
 MenuHandler=Menijski vmesnik
 MenuModule=Modul izvorov
-HideUnauthorizedMenu= Zasenči neavtoriziran meni (sivo)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=ID meni
 DetailMenuHandler=Upravljavec menijev za prikaz novega menija
 DetailMenuModule=Ime modula, če vnos prihaja iz modula
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/sl_SI/banks.lang b/htdocs/langs/sl_SI/banks.lang
index a73db019812..a4865b7a107 100644
--- a/htdocs/langs/sl_SI/banks.lang
+++ b/htdocs/langs/sl_SI/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/sl_SI/blockedlog.lang b/htdocs/langs/sl_SI/blockedlog.lang
index 84dc7eb9c06..cb5b53c1bd8 100644
--- a/htdocs/langs/sl_SI/blockedlog.lang
+++ b/htdocs/langs/sl_SI/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/sl_SI/boxes.lang b/htdocs/langs/sl_SI/boxes.lang
index 92f815a1a33..1aa5a9b7b44 100644
--- a/htdocs/langs/sl_SI/boxes.lang
+++ b/htdocs/langs/sl_SI/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Zadnje %s spremenjene donacije
 BoxTitleLastModifiedExpenses=Zadnja %s poročila o stroških
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Globalna aktivnost (računi, ponudbe, naročila)
 BoxGoodCustomers=Dobri kupci
 BoxTitleGoodCustomers=%s dobri kupci
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Zadnji datum osvežitve podatkov
 NoRecordedBookmarks=Ni definiranih zaznamkov.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Računovodstvo
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/sl_SI/cashdesk.lang b/htdocs/langs/sl_SI/cashdesk.lang
index a103bd51275..90b364f16d4 100644
--- a/htdocs/langs/sl_SI/cashdesk.lang
+++ b/htdocs/langs/sl_SI/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Število računov
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/sl_SI/categories.lang b/htdocs/langs/sl_SI/categories.lang
index 70060a70318..187bd536897 100644
--- a/htdocs/langs/sl_SI/categories.lang
+++ b/htdocs/langs/sl_SI/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=Seznam značk/kategorij
+CatListAll=List of tags/categories (all types)
 NewCategory=Nova značka/kategorija
 ModifCat=Spremeni značko/kategorijo
 CatCreated=Kreirana značka/kategorija
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=ID značke/kategorije
-CatSupList=List of vendor tags/categories
-CatCusList=Seznam značk/kategorij kupcev/možnih strank
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Seznam značk/kategorij proizvodov
 CatMemberList=Seznam značk/kategorij članov
-CatContactList=Seznam kontaktnih oznak/kategorij
-CatSupLinks=Povezave med dobavitelji in značkami/kategorijami
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Povezave med kupci/možnimi strankami in značkami/kategorijami
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Povezave med proizvodi/storitvami in značkami/kategorijami
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Povezave med člani in značkami/kategorijami
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Odstrani iz značk/kategorije
 ExtraFieldsCategories=Koplementarni atributi
 CategoriesSetup=Nastavitev značk/kategorij
diff --git a/htdocs/langs/sl_SI/companies.lang b/htdocs/langs/sl_SI/companies.lang
index c83ab2f3231..95e4d763b46 100644
--- a/htdocs/langs/sl_SI/companies.lang
+++ b/htdocs/langs/sl_SI/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Kontrola ni možna. Država članica ne zagotavlja storitve poizvedbe (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potencial
diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang
index a3a4ec4adde..2f71f9efc4f 100644
--- a/htdocs/langs/sl_SI/compta.lang
+++ b/htdocs/langs/sl_SI/compta.lang
@@ -111,7 +111,7 @@ Refund=Vračilo
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Prikaži plačilo DDV
 TotalToPay=Skupaj za plačilo
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Bilanca prihodkov in stroškov, letni povzetek
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Prikazane vrednosti vključujejo vse davke
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Poročilo tretjih oseb IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/sl_SI/cron.lang b/htdocs/langs/sl_SI/cron.lang
index bf247f95c88..5f3c8ecd5fa 100644
--- a/htdocs/langs/sl_SI/cron.lang
+++ b/htdocs/langs/sl_SI/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Ustvari/posodobi načrtovano delo
 Permission23103 = Izbriši načrtovano delo
 Permission23104 = Izvedi načrtovano delo
 # Admin
-CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+CronSetup=Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -42,10 +43,11 @@ CronModule=Modul
 CronNoJobs=Nobene naloge niso registrirane
 CronPriority=Prioriteta
 CronLabel=Oznaka
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Dodaj naloge
 CronEvery=Execute job each
@@ -56,16 +58,16 @@ CronNote=Komentar
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Omogočeno
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Onemogoči
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=Od
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Shell command
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index c9142ec4843..ef8cfd2d53f 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s je napačen
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Uporabniško ime %s že obstaja.
 ErrorGroupAlreadyExists=Skupina %s že obstaja.
 ErrorRecordNotFound=Ne najdem zapisa.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Nekatera zahtevana polja niso izpolnjena.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Kreiranje mape ni uspelo. Preverite, če ima uporabnik internetne strani dovoljenje za pisanje v mapo z Dolibarr dokumenti. Če je parameter <b>safe_mode</b> v tem PHP omogočen, preverite če je lastnik Dolibarr php datotek uporabnik web strežnika (ali skupina).
 ErrorNoMailDefinedForThisUser=Ta uporabnik nima določenega Email naslova
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Za aktiviranje ali delovanje te funkcije je potreben javascript. Spremenite »Nastavitve – Prikaz«.
 ErrorTopMenuMustHaveAParentWithId0='Zgoernji' meni ne more imeti nadrejenega menija. Vnesite 0 v nadrejeni meni ali izberite vrsto menija 'Levi'.
 ErrorLeftMenuMustHaveAParentId='Levi' meni mora imeti Nadrejeni ID.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP združevanje ni popolno.
 ErrorLDAPMakeManualTest=Datoteka .ldif je bila ustvarjena v mapi %s. Poskusite jo naložiti ročno preko ukazne vrstice, da bi dobili več podatkov o napaki.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Referenca, uporabljena za kreiranje, že obstaja.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/sl_SI/exports.lang b/htdocs/langs/sl_SI/exports.lang
index b9cb40877c1..e48218574d6 100644
--- a/htdocs/langs/sl_SI/exports.lang
+++ b/htdocs/langs/sl_SI/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Naziv polja
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Knjižnica
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Korak
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/sl_SI/mails.lang b/htdocs/langs/sl_SI/mails.lang
index 8c93e61eedc..6996e55999a 100644
--- a/htdocs/langs/sl_SI/mails.lang
+++ b/htdocs/langs/sl_SI/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=%s vrstica v datoteki
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=Email ni bil poslan. Napačen naslov pošiljatelja ali prejemnika. Preverite profil uporabnika.
 # Module Notifications
 Notifications=Obvestila
-NoNotificationsWillBeSent=Za ta dogodek in podjetje niso predvidena obvestila po e-pošti
-ANotificationsWillBeSent=1 obvestilo bo poslano z e-pošto
-SomeNotificationsWillBeSent=%s obvestil bo poslanih z e-pošto
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=Seznam vseh poslanih e-poštnih obvestil
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Konfiguracij pošiljanja e-pošte je bila nastavljena na '%s'. Ta način ne more biti uporabljen za masovno pošiljanje.
 MailSendSetupIs2=Najprej morate kot administrator preko menija %sDomov - Nastavitve - E-pošta%s spremeniti parameter <strong>'%s'</strong> za uporabo načina '%s'. V tem načinu lahko odprete nastavitve SMTP strežnika, ki vam jih omogoča vaš spletni oprerater in uporabite masovno pošiljanje.
 MailSendSetupIs3=Če imate vprašanja o nastavitvi SMTP strežnika, lahko vprašate %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Informacija
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index f7d1c8a39d7..458c2fd2da1 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=Ni prevoda
 Translation=Prevod
+CurrentTimeZone=Časovni pas PHP strežnika
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Ni najden zapis
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=Izbrana je bila datoteka za prilogo, vendar še ni dodana. Kl
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Preberite pomoč
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Zapis je shranjen
 RecordDeleted=Zapis je izbrisan
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Opcija
+Filters=Filters
 List=Seznam
 FullList=Celoten seznam
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Pošlji e-pošto
 Email=E-pošta
 NoEMail=Ni email-a
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=Ni mobilnega telefona
 Owner=Lastnik
 FollowingConstantsWillBeSubstituted=Naslednje konstante bodo zamenjane z ustrezno vrednostjo.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=Ustavljeno
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/sl_SI/modulebuilder.lang b/htdocs/langs/sl_SI/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/sl_SI/modulebuilder.lang
+++ b/htdocs/langs/sl_SI/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang
index 3cc9bcea61e..bf7ec90ae36 100644
--- a/htdocs/langs/sl_SI/other.lang
+++ b/htdocs/langs/sl_SI/other.lang
@@ -5,8 +5,6 @@ Tools=Orodja
 TMenuTools=Orodja
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Rojstni dan
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=Vklopljeno opozorilo na rojstni dan
 BirthdayAlertOff=Izklopljeno opozorilo na rojstni dan
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Desno
 CalculatedWeight=Kalkulirana teža
 CalculatedVolume=Kalkulirana prostornina
 Weight=Teža
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Področje izvoza
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index 21ec9a1ac38..0c7ad25d31b 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Število cen
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Število nadrejenih sestavljenih izdelkov
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Cene za kupce
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Država porekla
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Uporabi fiksno ceno
 PriceByQuantity=Različne cene glede na količino
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Območje količin
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/sl_SI/recruitment.lang b/htdocs/langs/sl_SI/recruitment.lang
index 30292aa07dc..9c84e4c01d8 100644
--- a/htdocs/langs/sl_SI/recruitment.lang
+++ b/htdocs/langs/sl_SI/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/sl_SI/sendings.lang b/htdocs/langs/sl_SI/sendings.lang
index 722f6d6c939..928c2e0f03c 100644
--- a/htdocs/langs/sl_SI/sendings.lang
+++ b/htdocs/langs/sl_SI/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Ostale pošiljke za to naročilo
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Pošiljke za potrditev
 StatusSendingCanceled=Preklicano
+StatusSendingCanceledShort=Preklicano
 StatusSendingDraft=Osnutek
 StatusSendingValidated=Potrjeno (proizvodi za pošiljanje ali že poslani)
 StatusSendingProcessed=Obdelani
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Popolnejši vzorec dobavnice (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined==
 SumOfProductVolumes=Vsota volumnov proizvodov
 SumOfProductWeights=Vsota tež proizvodov
diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang
index a9cb3761255..de2d407d3c9 100644
--- a/htdocs/langs/sl_SI/stocks.lang
+++ b/htdocs/langs/sl_SI/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/sl_SI/ticket.lang b/htdocs/langs/sl_SI/ticket.lang
index 4fce4674b17..c8506ca6800 100644
--- a/htdocs/langs/sl_SI/ticket.lang
+++ b/htdocs/langs/sl_SI/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Ostalo
 TicketSeverityShortLOW=Majhen potencial
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Visok potencial
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Preberite
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/sl_SI/website.lang b/htdocs/langs/sl_SI/website.lang
index 92889944fa4..26e7a852a93 100644
--- a/htdocs/langs/sl_SI/website.lang
+++ b/htdocs/langs/sl_SI/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Stran
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/sl_SI/withdrawals.lang b/htdocs/langs/sl_SI/withdrawals.lang
index 98b270589d9..f262981bcb8 100644
--- a/htdocs/langs/sl_SI/withdrawals.lang
+++ b/htdocs/langs/sl_SI/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Označi kot prejeto
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Opcija za delo v živo ni bila nastavljena, zato se bo sistem ustavil po simulaciji
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang
index 4e7da1a8564..ac69d8e7715 100644
--- a/htdocs/langs/sq_AL/accountancy.lang
+++ b/htdocs/langs/sq_AL/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index 6ca94565b87..fb3aa531bd5 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Shfaq
 SetupArea=Konfiguro
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Spastro
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Spastro tani
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=List of OpenDocument templates directories
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Position of Name/Lastname
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu handler where to show new menu
 DetailMenuModule=Module name if menu entry come from a module
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/sq_AL/banks.lang b/htdocs/langs/sq_AL/banks.lang
index e131a6bbd10..7f0c2952384 100644
--- a/htdocs/langs/sq_AL/banks.lang
+++ b/htdocs/langs/sq_AL/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/sq_AL/blockedlog.lang b/htdocs/langs/sq_AL/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/sq_AL/blockedlog.lang
+++ b/htdocs/langs/sq_AL/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/sq_AL/boxes.lang b/htdocs/langs/sq_AL/boxes.lang
index 1468b3a7864..82bcc13ecfe 100644
--- a/htdocs/langs/sq_AL/boxes.lang
+++ b/htdocs/langs/sq_AL/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Blerës të mirë
 BoxTitleGoodCustomers=%s Blerës të mirë
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/sq_AL/cashdesk.lang b/htdocs/langs/sq_AL/cashdesk.lang
index 489e2191fa6..1c7c73155f2 100644
--- a/htdocs/langs/sq_AL/cashdesk.lang
+++ b/htdocs/langs/sq_AL/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/sq_AL/categories.lang b/htdocs/langs/sq_AL/categories.lang
index 8acad1ef594..66125ff271d 100644
--- a/htdocs/langs/sq_AL/categories.lang
+++ b/htdocs/langs/sq_AL/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/sq_AL/companies.lang b/htdocs/langs/sq_AL/companies.lang
index f0fb358a3b8..63049256431 100644
--- a/htdocs/langs/sq_AL/companies.lang
+++ b/htdocs/langs/sq_AL/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Punonjësit
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang
index 7a237dbc407..c587a416989 100644
--- a/htdocs/langs/sq_AL/compta.lang
+++ b/htdocs/langs/sq_AL/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/sq_AL/cron.lang b/htdocs/langs/sq_AL/cron.lang
index 6238f0fce2c..485accd2a17 100644
--- a/htdocs/langs/sq_AL/cron.lang
+++ b/htdocs/langs/sq_AL/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Create/update Scheduled job
 Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
-CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+CronSetup=Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Prioriteti
 CronLabel=Label
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -56,16 +58,16 @@ CronNote=Koment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Aktivizo
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Çaktivizo
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Shell command
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
 ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/sq_AL/exports.lang b/htdocs/langs/sq_AL/exports.lang
index 2dcf4317e00..a0eb7161ef2 100644
--- a/htdocs/langs/sq_AL/exports.lang
+++ b/htdocs/langs/sq_AL/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Step
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/sq_AL/mails.lang b/htdocs/langs/sq_AL/mails.lang
index 16e913977d4..93690ea34e4 100644
--- a/htdocs/langs/sq_AL/mails.lang
+++ b/htdocs/langs/sq_AL/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index b52a374d7d5..9852d648bb3 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/sq_AL/modulebuilder.lang b/htdocs/langs/sq_AL/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/sq_AL/modulebuilder.lang
+++ b/htdocs/langs/sq_AL/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang
index fd7a7fb44ea..32cc9045e5a 100644
--- a/htdocs/langs/sq_AL/other.lang
+++ b/htdocs/langs/sq_AL/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index 497ce01c6dc..72ef8f02173 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/sq_AL/recruitment.lang b/htdocs/langs/sq_AL/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/sq_AL/recruitment.lang
+++ b/htdocs/langs/sq_AL/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/sq_AL/sendings.lang b/htdocs/langs/sq_AL/sendings.lang
index dce3be1c1db..cea753bf79b 100644
--- a/htdocs/langs/sq_AL/sendings.lang
+++ b/htdocs/langs/sq_AL/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Other shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Shipments to validate
 StatusSendingCanceled=Anulluar
+StatusSendingCanceledShort=Anulluar
 StatusSendingDraft=Draft
 StatusSendingValidated=Validated (products to ship or already shipped)
 StatusSendingProcessed=Processed
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/sq_AL/stocks.lang b/htdocs/langs/sq_AL/stocks.lang
index 11577ff1d3e..482ffce2fd4 100644
--- a/htdocs/langs/sq_AL/stocks.lang
+++ b/htdocs/langs/sq_AL/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/sq_AL/ticket.lang b/htdocs/langs/sq_AL/ticket.lang
index 97de9a5b5f9..5f259230780 100644
--- a/htdocs/langs/sq_AL/ticket.lang
+++ b/htdocs/langs/sq_AL/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Tjetër
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/sq_AL/website.lang b/htdocs/langs/sq_AL/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/sq_AL/website.lang
+++ b/htdocs/langs/sq_AL/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/sq_AL/withdrawals.lang b/htdocs/langs/sq_AL/withdrawals.lang
index 68f1a63dbe7..7c51c37c930 100644
--- a/htdocs/langs/sq_AL/withdrawals.lang
+++ b/htdocs/langs/sq_AL/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/sr_RS/accountancy.lang b/htdocs/langs/sr_RS/accountancy.lang
index 66b404cdec9..8c76969f9e2 100644
--- a/htdocs/langs/sr_RS/accountancy.lang
+++ b/htdocs/langs/sr_RS/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Datum
 Docref=Referenca
 LabelAccount=Oznaka računa
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Izveštaj
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Deo broj
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index 842fbea4662..15917e890ca 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Display
 SetupArea=Podešavanja
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=List of OpenDocument templates directories
 ListOfDirectoriesForModelGenODT=Lista foldera sa templejtima u OpenDocument formatu.<br><br>Staviti apsolutnu putanju foldera.<br>Svaki folder u listi mora biti na novoj liniji.<br>Da biste dodali folder GED modulu, ubacite ga ovde <b>DOL_DATA_ROOT/ecm/ime_vaseg_foldera</b>.<br><br>Fajlovi u tim folderima moraju imati ekstenziju <b>.odt</b> ili <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Position of Name/Lastname
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu handler where to show new menu
 DetailMenuModule=Module name if menu entry come from a module
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/sr_RS/banks.lang b/htdocs/langs/sr_RS/banks.lang
index 2939146c14e..eaac0204641 100644
--- a/htdocs/langs/sr_RS/banks.lang
+++ b/htdocs/langs/sr_RS/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/sr_RS/blockedlog.lang b/htdocs/langs/sr_RS/blockedlog.lang
index 9be5b672696..977e3f9d5c0 100644
--- a/htdocs/langs/sr_RS/blockedlog.lang
+++ b/htdocs/langs/sr_RS/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/sr_RS/boxes.lang b/htdocs/langs/sr_RS/boxes.lang
index 037853abcf2..64caf8d79dc 100644
--- a/htdocs/langs/sr_RS/boxes.lang
+++ b/htdocs/langs/sr_RS/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Opšta aktivnost (fakture, ponude, narudžbine)
 BoxGoodCustomers=Dobri kupci
 BoxTitleGoodCustomers=%s Dobri kupci
+BoxScheduledJobs=Planirane operacije
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=Nema definisane zabeleške
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Računovodstvo
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/sr_RS/cashdesk.lang b/htdocs/langs/sr_RS/cashdesk.lang
index 5074b404df8..75b0acd39a2 100644
--- a/htdocs/langs/sr_RS/cashdesk.lang
+++ b/htdocs/langs/sr_RS/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/sr_RS/categories.lang b/htdocs/langs/sr_RS/categories.lang
index 3467c78c1e5..f72f3351441 100644
--- a/htdocs/langs/sr_RS/categories.lang
+++ b/htdocs/langs/sr_RS/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=Lista naziva/kategorija
+CatListAll=List of tags/categories (all types)
 NewCategory=Nov naziv/kategorija
 ModifCat=Izmeni naziv/kategoriju
 CatCreated=Kreiran naziv/kategorija
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=ID naziva/kategorije
-CatSupList=List of vendor tags/categories
-CatCusList=Lista naziva/kategorija kupca/prospekta
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Lista naziva/kategorija proizvoda
 CatMemberList=Lista naziva/kategorija članova
-CatContactList=Lista naziva/kategorija kontakata
-CatSupLinks=Povezanost između dobavljača i naziva/kategorija
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Povezanost između kupaca/prospekta i naziva/kategorija
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Povezanost između proizvoda/usluga i naziva/kategorija
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Povezanost između članova i naziva/kategorija
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Ukloni iz naziva/kategorije
 ExtraFieldsCategories=Komplementarni atributi
 CategoriesSetup=TPodešavanje naziva/kategorija
diff --git a/htdocs/langs/sr_RS/companies.lang b/htdocs/langs/sr_RS/companies.lang
index 31db7cdc260..154132b33da 100644
--- a/htdocs/langs/sr_RS/companies.lang
+++ b/htdocs/langs/sr_RS/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Provera nije moguća. Servis nije dostupan za datu državu (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Zaposleni
 ProspectLevelShort=Potencijal
diff --git a/htdocs/langs/sr_RS/compta.lang b/htdocs/langs/sr_RS/compta.lang
index edf211abd56..122fa300178 100644
--- a/htdocs/langs/sr_RS/compta.lang
+++ b/htdocs/langs/sr_RS/compta.lang
@@ -111,7 +111,7 @@ Refund=Povraćaj
 SocialContributionsPayments=Uplate poreza/doprinosa
 ShowVatPayment=Prikaži PDV uplatu
 TotalToPay=Ukupno za uplatu
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Rač. kod klijenta
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Da li ste sigurni da želite da obrišete ovu up
 ExportDataset_tax_1=Uplate poreza/doprinosa
 CalcModeVATDebt=Mod <b>%sPDV u posvećenom računovodstvu%s</b>.
 CalcModeVATEngagement=Mod <b>%sPDV na prihodima-rashodima%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mod <b>%sRE za fakture klijenata - fakture dobavljača%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Stanje prihoda i rashoda, godišnji prikaz
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Prikazani su bruto iznosi
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- Sadrži realne uplate računa, troškova, PDV-a i zarada.<br>- Zasniva se na datumima isplate računa, troškova, PDV-a i zarada. Za donacije se zasniva na datumu donacije.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Izveštaj po RE subjektima
 LT2ReportByCustomersES=Izveštaj po subjektu IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/sr_RS/cron.lang b/htdocs/langs/sr_RS/cron.lang
index 184926050c0..5a246d49be9 100644
--- a/htdocs/langs/sr_RS/cron.lang
+++ b/htdocs/langs/sr_RS/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Kreiraj/ažuriraj planiranu operaciju
 Permission23103 = Obriši planiranu operaciju
 Permission23104 = Izvrši planiranu operaciju
 # Admin
-CronSetup= Podešavanja planiranih operacija
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Ili za proveru i izvršenje određene operacije
+CronSetup=Podešavanja planiranih operacija
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Security key za URL za izvršenje cron operacija
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=U Unix okruženju možete koristiti crontab za izvršenje komandne linije svakih 5 minuta
-CronExplainHowToRunWin=U Windows okruženju možete koristiti Scheduled task tools za izvršenje komandne linije svakih 5 minuta
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Klasa %s ne sadrži ni jedan metod %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -42,10 +43,11 @@ CronModule=Modul
 CronNoJobs=Nema prijavljenih operacija
 CronPriority=Prioritet
 CronLabel=Naziv
-CronNbRun=Br. izvršenja
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Svakih
 JobFinished=Operacija je izvršena
+Scheduled=Scheduled
 #Page card
 CronAdd= Dodaj operacije
 CronEvery=Izvrši operaciju svakih
@@ -56,16 +58,16 @@ CronNote=Komentar
 CronFieldMandatory=Polje %s je obavezno
 CronErrEndDateStartDt=Kraj ne može biti pre početka
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Aktiviraj
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Deaktiviraj
 CronTaskInactive=Operacije je deaktivirana
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=Komandna linija za izvršenje
 CronCreateJob=Kreiraj novu planiranu operaciju
 CronFrom=Od
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Komandna linija
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Operacija deaktivirana
 MakeLocalDatabaseDumpShort=Bekap lokalne baze
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/sr_RS/errors.lang b/htdocs/langs/sr_RS/errors.lang
index b257b6a38d4..29ba9a69da3 100644
--- a/htdocs/langs/sr_RS/errors.lang
+++ b/htdocs/langs/sr_RS/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Nema greške, commit.
 # Errors
 ErrorButCommitIsDone=Bilo je grešaka, ali potvrđujemo uprkos tome
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=URL %s je pogrešan
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s već postoji
 ErrorGroupAlreadyExists=Grupa %s već postoji
 ErrorRecordNotFound=Linija nije pronađena.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Neka obavezna polja nisu popunjena
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Greška prilikom kreacije foldera. Proverite da li Web server nalog ima prava da piše u Dolibarr documents folderu. Ako je parametar <b>safe_mode</b> aktivan u PHP-u, proverite da li Dolibarr php fajlovi pripadaju korisniku (ili grupi) Web server naloga.
 ErrorNoMailDefinedForThisUser=Mail nije definisan za ovog korisnika
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Za ovu funkcionalnost morate aktivirati javascript.
 ErrorTopMenuMustHaveAParentWithId0=Meni tipa "Top" ne može imati parent meni. Stavite 0 u parent meni ili izaberite meni tipa "Left".
 ErrorLeftMenuMustHaveAParentId=Meni tipa "Levi" mora imati parent ID.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Ovo ime profila već postoji za ovaj export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching nije završen.
 ErrorLDAPMakeManualTest=.ldif fajl je generisan u folderu %s. Pokušajte da ga učitate ručno iz komandne linije da biste imali više informacija o greškama.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref korišćena za kreaciju već postoji.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=Lozinka je podešena za ovog člana, ali korisnik nije kreiran. To znači da je lozinka sačuvana, ali se član ne može ulogovati na Dolibarr. Informaciju može koristiti neka eksterna komponenta, ali ako nemate potrebe da definišete korisnika/lozinku za članove, možete deaktivirati opciju "Upravljanje lozinkama za svakog člana" u podešavanjima modula Članovi. Ukoliko morate da kreirate login, ali Vam nije potrebna lozinka, ostavite ovo polje prazno da se ovo upozorenje ne bi prikazivalo. Napomena: email može biti korišćen kao login ako je član povezan sa korisnikom.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Vaša prijava je promenjena. Iz sigurnosn
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/sr_RS/exports.lang b/htdocs/langs/sr_RS/exports.lang
index 1ed869416fd..41f2f5ed861 100644
--- a/htdocs/langs/sr_RS/exports.lang
+++ b/htdocs/langs/sr_RS/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Naziv polja
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Biblioteka
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Korak
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/sr_RS/mails.lang b/htdocs/langs/sr_RS/mails.lang
index 9b2a31bd01f..44407502dcc 100644
--- a/htdocs/langs/sr_RS/mails.lang
+++ b/htdocs/langs/sr_RS/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Linija %s u fajlu
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=Mail nije poslat. Pogrešan mail primaoca ili pošiljaoca. Proverite profil korisnika.
 # Module Notifications
 Notifications=Obaveštenja
-NoNotificationsWillBeSent=Nema planiranih obaveštenja za ovaj događaj i kompaniju
-ANotificationsWillBeSent=1 obaveštenje će biti poslato mailom
-SomeNotificationsWillBeSent=%s obaveštenja će biti poslato mailom
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=Lista svih poslatih obaveštenja
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Konfiguracija slanja mailova je podešena na "%s". Ovaj mod ne može slati masovne mailove.
 MailSendSetupIs2=Prvo morate sa admin nalogom otvoriti meni %sHome - Setup - EMails%s da biste promenili parametar <strong>'%s'</strong> i prešli u mod '%s'. U ovom modu, možete uneti podešavanja SMTP servera Vašeg provajdera i koristiti funkcionalnost masovnog emailinga.
 MailSendSetupIs3=Ukoliko imate pitanja oko podešavanja SMTP servera, možete pitati %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Informacija
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
index d6425161390..5b18671c78a 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Dostupne zamenske promenljive
 NoTranslation=Nema prevoda
 Translation=Prevod
+CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Nema rezultata
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=Fajl je selektiran za prilog, ali još uvek nije uploadovan.
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Pročitajte pomoć
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Linija sačuvana
 RecordDeleted=Linija obrisana
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Opcija
+Filters=Filters
 List=Lista
 FullList=Cela lista
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Pošalji email
 Email=Email
 NoEMail=Nema maila
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=Nema mobilnog telefona
 Owner=Vlasnik
 FollowingConstantsWillBeSubstituted=Sledeće konstante će biti zamenjene odgovarajućim vrednostima.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=Na čekanju
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/sr_RS/modulebuilder.lang b/htdocs/langs/sr_RS/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/sr_RS/modulebuilder.lang
+++ b/htdocs/langs/sr_RS/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/sr_RS/other.lang b/htdocs/langs/sr_RS/other.lang
index a314caa0fb6..0b96a4cfd7c 100644
--- a/htdocs/langs/sr_RS/other.lang
+++ b/htdocs/langs/sr_RS/other.lang
@@ -5,8 +5,6 @@ Tools=Alati
 TMenuTools=Alati
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Datum rođenja
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=Obaveštenje o rođendanu je aktivno
 BirthdayAlertOff=Obaveštenje o rođendanu je neaktivno
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Desno
 CalculatedWeight=Izračunata težina
 CalculatedVolume=Izračunata zapremina
 Weight=Težina
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Oblast exporta
diff --git a/htdocs/langs/sr_RS/products.lang b/htdocs/langs/sr_RS/products.lang
index d553a48ca39..e7807279d63 100644
--- a/htdocs/langs/sr_RS/products.lang
+++ b/htdocs/langs/sr_RS/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Broj cena
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Broj paketa proizvoda
@@ -167,8 +168,10 @@ BuyingPrices=Kupovne cene
 CustomerPrices=Cene klijenta
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Zemlja porekla
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Koristi fiksnu cenu
 PriceByQuantity=Različite cene po količini
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Raspon količina
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% varijacija od %s
 PercentDiscountOver=%% popust od %s
diff --git a/htdocs/langs/sr_RS/recruitment.lang b/htdocs/langs/sr_RS/recruitment.lang
index 2d9b75ed0b9..ae1eb5feb23 100644
--- a/htdocs/langs/sr_RS/recruitment.lang
+++ b/htdocs/langs/sr_RS/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/sr_RS/sendings.lang b/htdocs/langs/sr_RS/sendings.lang
index 6aa01a7b447..25672b23d46 100644
--- a/htdocs/langs/sr_RS/sendings.lang
+++ b/htdocs/langs/sr_RS/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Druge isporuke za ovu narudžbinu
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Isporuke za potvrdu
 StatusSendingCanceled=Otkazano
+StatusSendingCanceledShort=Poništeno
 StatusSendingDraft=Nacrt
 StatusSendingValidated=Potvrđeno (proizvodi za isporuku ili već isporučeni)
 StatusSendingProcessed=Procesuirano
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Morate prvo potvrditi porudžbinu pre nego omog
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Kompletni model dokumenta za prijemnice isporuka (logo, ...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstanta EXPEDITION_ADDON_NUMBER nije definisana
 SumOfProductVolumes=Suma količina proizvoda
 SumOfProductWeights=Suma težina proizvoda
diff --git a/htdocs/langs/sr_RS/stocks.lang b/htdocs/langs/sr_RS/stocks.lang
index 2df84e2de08..8c928a95f9c 100644
--- a/htdocs/langs/sr_RS/stocks.lang
+++ b/htdocs/langs/sr_RS/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/sr_RS/ticket.lang b/htdocs/langs/sr_RS/ticket.lang
index 88a8ad89046..35102542484 100644
--- a/htdocs/langs/sr_RS/ticket.lang
+++ b/htdocs/langs/sr_RS/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Drugo
 TicketSeverityShortLOW=Nizak
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Visok
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Pročitaj
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/sr_RS/website.lang b/htdocs/langs/sr_RS/website.lang
index 0ff0213ef31..baa3b7e08c8 100644
--- a/htdocs/langs/sr_RS/website.lang
+++ b/htdocs/langs/sr_RS/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Strana
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/sr_RS/withdrawals.lang b/htdocs/langs/sr_RS/withdrawals.lang
index e207c6d1316..11e866cb7a1 100644
--- a/htdocs/langs/sr_RS/withdrawals.lang
+++ b/htdocs/langs/sr_RS/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Označi kreditirano
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Opcija za realni mod nije podešena, prekidamo posle ove simulacije.
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index 30f4f0325a6..bdb19269ac8 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -47,7 +47,8 @@ CountriesInEECExceptMe=Länder i EEG förutom %s
 CountriesExceptMe=Alla länder utom %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
-VueByAccountAccounting=View by accounting account
+VueByAccountAccounting=Visa baserat på redovisningskonto
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Huvudsakliga bokföringskonto för kunder som inte definierats i installationen
 MainAccountForSuppliersNotDefined=Huvudkonton för leverantörer som inte definierats i installationen
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Ej bunden till bokföringskonto
 XLineSuccessfullyBinded=%s produkter / tjänster har framgångsrikt bundet till ett bokföringskonto
 XLineFailedToBeBinded=%s produkter / tjänster var inte bundna till något kontokonto
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Antal element att förbinda visat per sida (högst rekommenderat: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Börja sorteringen av sidan "Bindning att göra" av de senaste elementen
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Börja sorteringen av sidan "Bindning gjort" av de senaste elementen
 
@@ -198,7 +199,8 @@ Docdate=Datum
 Docref=Referens
 LabelAccount=Etikett konto
 LabelOperation=Etikettoperation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Brevkod
 Lettering=Lettering
 Codejournal=Loggbok
@@ -206,7 +208,8 @@ JournalLabel=Loggboksetikett
 NumPiece=Stycke nummer
 TransactionNumShort=Num. transaktion
 AccountingCategory=Personliga grupper
-GroupByAccountAccounting=Grupp efter bokföringskonto
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Här kan du definiera vissa grupper av bokföringskonto. De kommer att användas för personliga redovisningsrapporter.
 ByAccounts=Enligt konton
 ByPredefinedAccountGroups=Av fördefinierade grupper
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Betalning som inte är kopplad till någon produkt /
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Grupp av konto
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Här kan du se listan över kostnadsrapporter som är bu
 DescVentilExpenseReportMore=Om du ställer in bokföringskonto på typ av kostnadsrapportrader kommer applikationen att kunna göra alla bindningar mellan dina kostnadsrapporter och konton för ditt kontoplan, bara med ett klick med knappen <strong> "%s" </strong>. Om kontot inte var inställt på avgifterna eller om du fortfarande har några rader som inte är kopplade till något konto måste du göra en manuell bindning från menyn "<strong> %s </strong>".
 DescVentilDoneExpenseReport=Här kan du se listan över raderna för kostnadsrapporter och deras bokföringskonto
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Förbind automatiskt
 AutomaticBindingDone=Automatisk bindning gjord
@@ -293,6 +298,7 @@ Accounted=Redovisas i huvudbok
 NotYetAccounted=Ännu inte redovisad i huvudbok
 ShowTutorial=Show Tutorial
 NotReconciled=Inte avstämd
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Exportera CSV konfigurerbar
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 067f3a478a2..052749dd38f 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Visa
 SetupArea=Inställning
 UploadNewTemplate=Ladda upp ny mall (er)
 FormToTestFileUploadForm=Formulär för att testa filuppladdning (enligt inställningar)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Anm: ja effektivt endast om modul <b>%s</b> är aktiverat
 RemoveLock=Ta bort / byt namn på filen <b> %s </b> om den existerar, för att tillåta användning av Update / Install-verktyget.
 RestoreLock=Återställ fil <b> %s </b>, endast med läsbehörighet, för att inaktivera ytterligare användning av Update / Install-verktyget.
@@ -85,7 +87,6 @@ ShowPreview=Visa förhandsgranskning
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Förhandsgranska inte tillgänglig
 ThemeCurrentlyActive=Tema för tillfället
-CurrentTimeZone=PHP server tidszon
 MySQLTimeZone=Timezone MySql (databas)
 TZHasNoEffect=Datum lagras och returneras av databaseserver som om de behölls som inlämnade strängar. Tidszonen har endast effekt när UNIX_TIMESTAMP-funktionen används (som inte ska användas av Dolibarr, så databasen TZ skulle inte ha någon effekt, även om den ändrats efter att data hade angetts).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Detta område ger administrationsfunktioner. Använd menyn f
 Purge=Rensa
 PurgeAreaDesc=På den här sidan kan du radera alla filer som genereras eller lagras av Dolibarr (temporära filer eller alla filer i <b> %s </b> katalog). Att använda den här funktionen är normalt inte nödvändig. Den tillhandahålls som en lösning för användare vars Dolibarr är värd av en leverantör som inte erbjuder behörigheter för att radera filer som genereras av webbservern.
 PurgeDeleteLogFile=Ta bort loggfiler, inklusive <b> %s </b> definierad för Syslog-modulen (ingen risk att förlora data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Ta bort temporära filer
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Ta bort alla filer i katalogen: <b> %s </b>. <br> Detta tar bort alla genererade dokument relaterade till elementer (tredje part, fakturor etc ...), filer som laddas upp i ECM-modulen, databassäkerhetskopior och tillfälliga filer.
 PurgeRunNow=Rensa nu
 PurgeNothingToDelete=Ingen katalog eller filer att radera.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Andra resurser
 ExternalResources=Externa resurser
 SocialNetworks=Sociala nätverk
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=För användarens eller utvecklarens dokumentation (Doc, FAQs ...), <br> ta en titt på Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
 ForAnswersSeeForum=För alla andra frågor / hjälp, kan du använda Dolibarr forumet: <br> <a href="%s" target="_blank"><b>%s</b></a>
 HelpCenterDesc1=Här finns några resurser för att få hjälp och support med Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Exempel med nuvarande konfiguration
 ListOfDirectories=Förteckning över OpenDocument mallar kataloger
 ListOfDirectoriesForModelGenODT=Lista över kataloger som innehåller mallfiler med OpenDocument-format. <br> <br> Sätt här hela sökvägen till kataloger. <br> Lägg till en vagnretur mellan eah-katalogen. <br> För att lägga till en katalog över GED-modulen, lägg till här <b> DOL_DATA_ROOT / ecm / ditt katalognamn </b>. <br> <br> Filer i katalogerna måste sluta med <b> .odt </b> eller <b> .ods </b>.
 NumberOfModelFilesFound=Antal ODT / ODS-mallfiler som finns i dessa kataloger
-ExampleOfDirectoriesForModelGen=Exempel på syntax: <br> C: \\ Mydir <br> / Home / Mydir <br> DOL_DATA_ROOT / ECM / ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Att veta hur du skapar dina odT dokumentmallar, innan du förvarar dem i dessa kataloger, läs wiki dokumentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Ståndpunkt av förnamn / namn
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parametrar för att säkra webbadresser
 SecurityTokenIsUnique=Använd en unik securekey parameter för varje webbadress
 EnterRefToBuildUrl=Ange referens för objekt %s
 GetSecuredUrl=Få beräknat URL
-ButtonHideUnauthorized=Dölj knappar för icke-administrativa användare för obehöriga åtgärder istället för att visa grått inaktiverade knappar
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Gammal momssats
 NewVATRates=Ny momssats
 PriceBaseTypeToChange=Ändra om priser med bas referensvärde som definieras på
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personliga menyer som inte är kopplade till en toppm
 NewMenu=Ny meny
 MenuHandler=Meny handler
 MenuModule=Källa modul
-HideUnauthorizedMenu= Göm obehöriga menyer (grå)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id-menyn
 DetailMenuHandler=Meny hanterare där för att visa nya menyn
 DetailMenuModule=Modulnamn om menyalternativet kommer från en modul
@@ -1983,11 +1985,12 @@ EMailHost=Värd för e-post IMAP-server
 MailboxSourceDirectory=Postkälla källkatalog
 MailboxTargetDirectory=Målkatalogen för brevlådan
 EmailcollectorOperations=Verksamhet att göra av samlare
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Samla nu
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Datum senaste samlingen försökt
-DateLastcollectResultOk=Datum senaste samla framgångsrikt
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Senaste resultatet
 EmailCollectorConfirmCollectTitle=E-post samla bekräftelse
 EmailCollectorConfirmCollect=Vill du springa samlingen för den här samlaren nu?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menyinmatningskod (huvudmeny)
 ECMAutoTree=Visa automatiskt ECM-träd
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/sv_SE/banks.lang b/htdocs/langs/sv_SE/banks.lang
index dc82d075631..21b5c960d74 100644
--- a/htdocs/langs/sv_SE/banks.lang
+++ b/htdocs/langs/sv_SE/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA-mandatet
 YourSEPAMandate=Ditt SEPA-mandat
 FindYourSEPAMandate=Detta är ditt SEPA-mandat för att bemyndiga vårt företag att göra direkt debitering till din bank. Returnera det undertecknat (skanna av det signerade dokumentet) eller skicka det via post till
 AutoReportLastAccountStatement=Fyll i fältet 'Antal kontoutdrag' automatiskt med det sista kontonummeret när avstämning görs
-CashControl=POS kontantstängsel
-NewCashFence=Nytt kontantstängsel
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/sv_SE/blockedlog.lang b/htdocs/langs/sv_SE/blockedlog.lang
index 480f38a923d..56f0339d071 100644
--- a/htdocs/langs/sv_SE/blockedlog.lang
+++ b/htdocs/langs/sv_SE/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logisk borttagning
 logMEMBER_SUBSCRIPTION_CREATE=Medlemskapsabonnemang skapad
 logMEMBER_SUBSCRIPTION_MODIFY=Medlemsabonnemang modifierad
 logMEMBER_SUBSCRIPTION_DELETE=Medlems abonnemangs logisk borttagning
-logCASHCONTROL_VALIDATE=Kontantskyddsinspelning
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Kundfaktura nedladdning
 BlockedLogBillPreview=Kundfaktura förhandsvisning
 BlockedlogInfoDialog=Logguppgifter
diff --git a/htdocs/langs/sv_SE/boxes.lang b/htdocs/langs/sv_SE/boxes.lang
index 8de035e3c7b..882e2535019 100644
--- a/htdocs/langs/sv_SE/boxes.lang
+++ b/htdocs/langs/sv_SE/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Senast %s ändrade donationer
 BoxTitleLastModifiedExpenses=Senaste %s modifierade kostnadsrapporterna
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global aktivitet (fakturor, förslag, order)
 BoxGoodCustomers=Bra kunder
 BoxTitleGoodCustomers=%s Bra kunder
+BoxScheduledJobs=Schemalagda jobb
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Misslyckades med att uppdatera RSS-flöde. Senaste framgångsrika uppdateringsdatum: %s
 LastRefreshDate=Senaste uppdateringsdatum
 NoRecordedBookmarks=Inga bokmärken definieras. Klicka <a href="%s">här</a> för att lägga till bokmärken.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Redovisning
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/sv_SE/cashdesk.lang b/htdocs/langs/sv_SE/cashdesk.lang
index de64394d96b..96ea227c941 100644
--- a/htdocs/langs/sv_SE/cashdesk.lang
+++ b/htdocs/langs/sv_SE/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=sidfot
 AmountAtEndOfPeriod=Belopp vid periodens utgång (dag, månad eller år)
 TheoricalAmount=Teoretisk mängd
 RealAmount=Verklig mängd
-CashFence=Cash fence
-CashFenceDone=Kassaskydd gjord för perioden
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Antal av fakturor
 Paymentnumpad=Typ av kudde för att komma in i betalningen
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/sv_SE/categories.lang b/htdocs/langs/sv_SE/categories.lang
index f3c56936403..821c5b52128 100644
--- a/htdocs/langs/sv_SE/categories.lang
+++ b/htdocs/langs/sv_SE/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projektets taggar / kategorier område
 UsersCategoriesArea=Användare taggar / kategorier område
 SubCats=Underkategorier
 CatList=Lista med taggar / kategorier
+CatListAll=List of tags/categories (all types)
 NewCategory=Ny tagg / kategori
 ModifCat=Ändra tagg / kategori
 CatCreated=Tagg / kategori skapad
@@ -65,16 +66,22 @@ UsersCategoriesShort=Användare taggar / kategorier
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tagg / kategori id
-CatSupList=Lista över leverantörskoder / kategorier
-CatCusList=Lista över kund / prospektetiketter / kategorier
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Lista över produkter taggar / kategorier
 CatMemberList=Lista över medlemmar taggar / kategorier
-CatContactList=Lista över kontaktkoder / kategorier
-CatSupLinks=Länkar mellan leverantörer och taggar / kategorier
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Länkar mellan kunder / utsikter och taggar / kategorier
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Länkar mellan produkter / tjänster och taggar / kategorier
-CatProJectLinks=Länkar mellan projekt och taggar / kategorier
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Ta bort från taggar / kategori
 ExtraFieldsCategories=Extra attibut
 CategoriesSetup=Taggar / kategorier inställning
diff --git a/htdocs/langs/sv_SE/companies.lang b/htdocs/langs/sv_SE/companies.lang
index 57b74758a58..1e64d1649c3 100644
--- a/htdocs/langs/sv_SE/companies.lang
+++ b/htdocs/langs/sv_SE/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Kontrollera momsnumret inom gemenskapen på Europeiska
 VATIntraManualCheck=Du kan också kontrollera manuellt på Europeiska kommissionens webbplats <a href="%s" target="_blank"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Kontroll inte möjlig. Kontrollera om tjänsten tillhandahålls av medlemsstaten (%s).
 NorProspectNorCustomer=Inte utsikter, eller kund
-JuridicalStatus=Juridisk enhetstyp
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=anställda
 ProspectLevelShort=Potentiella
diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang
index 481d0ead328..b9ac03cf0ef 100644
--- a/htdocs/langs/sv_SE/compta.lang
+++ b/htdocs/langs/sv_SE/compta.lang
@@ -111,7 +111,7 @@ Refund=Återbetalning
 SocialContributionsPayments=Betalning av sociala / skattemässiga skatter
 ShowVatPayment=Visa mervärdesskatteskäl
 TotalToPay=Totalt att betala
-BalanceVisibilityDependsOnSortAndFilters=Balans är endast synlig i den här listan om tabell sorteras stigande på %s och filtreras för 1 bankkonto
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Kundbokföringskod
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. konto. koda
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Är du säker på att du vill ta bort denna soci
 ExportDataset_tax_1=Sociala och skattemässiga skatter och betalningar
 CalcModeVATDebt=<b>Läge% svat på redovisning engagemang% s.</b>
 CalcModeVATEngagement=<b>Läge% svat på inkomster-utgifter% s.</b>
-CalcModeDebt=Analys av kända inspelade fakturor, även om de ännu inte redovisas i huvudboken.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analys av kända registrerade betalningar, även om de ännu inte är redovisade i huvudboken.
 CalcModeBookkeeping=Analys av data bokförd i huvudboken.
 CalcModeLT1= <b>Läge% SRE på kundfakturor - leverantörerna fakturerar% s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Överskott av intäkter och kostnader, årliga samm
 AnnualByCompanies=Inkomst- och utgiftsbalans, enligt fördefinierade konton
 AnnualByCompaniesDueDebtMode=Balans av intäkter och kostnader, detalj av fördefinierade grupper, läge <b> %sClaims-Debts%s </b> sa <b> Åtagandebetalning </b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=Se %sanalys av payments%s för en beräkning av faktiska betalningar som gjorts även om de ännu inte är redovisade i huvudboken.
-SeeReportInDueDebtMode=Se %sanalys av fakturor%s för en beräkning baserad på kända inspelade fakturor, även om de ännu inte är redovisade i huvudboken.
-SeeReportInBookkeepingMode=Se <b> %sBokföringsrapport%s </b> för en beräkning på <b> Bokföring huvudboken tabell </b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Belopp som visas är med alla skatter inkluderade
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- Det inkluderar de reala betalningarna på fakturor, utgifter, moms och löner. <br> - Det baseras på fakturadatum för fakturor, utgifter, moms och löner. Donationsdatum för donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Det visar rekord i din huvudboken med bokför
 SeePageForSetup=Se meny <a href="%s"> %s </a> för installation
 DepositsAreNotIncluded=- Betalningsfakturor ingår ej
 DepositsAreIncluded=- Betalningsfakturor ingår
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Rapportera skatt 2 av tredje part
 LT2ReportByCustomers=Rapportera skatt 3 av tredje part
 LT1ReportByCustomersES=Rapport från tredje part RE
 LT2ReportByCustomersES=Rapport från tredje part IRPF
 VATReport=Försäljningsskatterapport
 VATReportByPeriods=Försäljningsskattrapport per period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Försäljningsskattrapport enligt priser
 VATReportByThirdParties=Försäljningsskattrapport från tredje part
 VATReportByCustomers=Försäljningsskatt rapport från kund
diff --git a/htdocs/langs/sv_SE/cron.lang b/htdocs/langs/sv_SE/cron.lang
index a8a025d1345..05f3017600e 100644
--- a/htdocs/langs/sv_SE/cron.lang
+++ b/htdocs/langs/sv_SE/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Radera schemalagt jobb
 Permission23104 = Utför schemalagt jobb
 # Admin
 CronSetup=Planerad jobbhantering installation
-URLToLaunchCronJobs=URL för att kontrollera och starta kvalificerade cron-jobb
-OrToLaunchASpecificJob=Eller för att kontrollera och starta ett specifikt arbete
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Säkerhetsnyckel för URL för att lansera cron-jobb
 FileToLaunchCronJobs=Kommandorad för att kontrollera och starta kvalificerade cron-jobb
 CronExplainHowToRunUnix=I en Unix-miljö bör följande rad läggas i crontab så kommandot exekveras var 5:e minut.
 CronExplainHowToRunWin=I Microsoft (tm) Windows-miljö kan du använda Schemalagda uppgiftsverktyg för att köra kommandoraden var 5: e minut
 CronMethodDoesNotExists=Klass %s innehåller ingen metod %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron-jobbprofiler definieras i modulbeskrivningsfilen. När modulen är aktiverad laddas de och är tillgängliga så att du kan administrera jobben från adminverktygsmenyn %s.
 CronJobProfiles=Förteckning över fördefinierade cron jobbprofiler
 # Menu
@@ -42,10 +43,11 @@ CronModule=Modul
 CronNoJobs=Inga jobb registrerade
 CronPriority=Prioritet
 CronLabel=Etikett
-CronNbRun=Antal lanseringar
+CronNbRun=Number of launches
 CronMaxRun=Maximalt antal lanseringar
 CronEach=Varje
 JobFinished=Job lanserad och klar
+Scheduled=Scheduled
 #Page card
 CronAdd= Lägg till jobb
 CronEvery=Utför jobbet vardera
@@ -56,7 +58,7 @@ CronNote=Kommentar
 CronFieldMandatory=Fält %s är obligatoriskt
 CronErrEndDateStartDt=Slutdatum kan inte vara före startdatum
 StatusAtInstall=Status vid modulinstallation
-CronStatusActiveBtn=Aktivera
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Inaktivera
 CronTaskInactive=Det här jobbet är avaktiverat
 CronId=Id
@@ -76,8 +78,14 @@ CronType_method=Samtalsmetod för en PHP-klass
 CronType_command=Skalkommando
 CronCannotLoadClass=Kan inte ladda klassfilen %s (för att använda klass %s)
 CronCannotLoadObject=Klassfilen %s laddades, men objektet %s kunde inte hittas i det
-UseMenuModuleToolsToAddCronJobs=Gå till menyn "Hem - Adminverktyg - Schemalagda jobb" för att se och redigera schemalagda jobb.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Jobb inaktiverat
 MakeLocalDatabaseDumpShort=Lokal databas säkerhetskopia
 MakeLocalDatabaseDump=Skapa en lokal databasdump. Parametrarna är: komprimering ('gz' eller 'bz' eller 'none'), säkerhetskopieringstyp ('mysql', 'pgsql', 'auto'), 1, 'auto' eller filnamn att bygga, antal backupfiler för att hålla
 WarningCronDelayed=Uppmärksamhet, för prestationsändamål, vad som än är nästa datum för utförande av aktiverade jobb, kan dina jobb försenas till högst %s timmar innan de körs.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index feca0db02b2..0ec329c972d 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Inget fel
 # Errors
 ErrorButCommitIsDone=Fel hittades men vi bekräfta trots detta
 ErrorBadEMail=E-post %s är fel
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s är fel
 ErrorBadValueForParamNotAString=Dåligt värde för din parameter. Det lägger till i allmänhet när översättning saknas.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Logga %s finns redan.
 ErrorGroupAlreadyExists=Grupp %s finns redan.
 ErrorRecordNotFound=Spela in hittades inte.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Vissa obligatoriska fält inte fylls.
 ErrorSubjectIsRequired=E-postämnet krävs
 ErrorFailedToCreateDir=Misslyckades med att skapa en katalog. Kontrollera att webbservern användaren har rättigheter att skriva till Dolibarr dokument katalogen. Om parametern <b>safe_mode</b> är aktiv på PHP, kontrollera att Dolibarr php-filer äger till webbserver användare (eller grupp).
 ErrorNoMailDefinedForThisUser=Ingen post definierats för denna användare
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Denna funktion måste ha Javascript vara aktiverat för att arbeta. Ändra detta i inställning - displayen.
 ErrorTopMenuMustHaveAParentWithId0=En meny av typen &quot;Top&quot; kan inte ha en förälder meny. Sätt 0 i överordnade menyn eller välja en meny av typen &quot;Vänster&quot;.
 ErrorLeftMenuMustHaveAParentId=En meny av typen &quot;Vänster&quot; måste ha en förälder id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Detta profilnamn finns redan för denna export.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matchning inte är fullständig.
 ErrorLDAPMakeManualTest=A. LDIF filen har genererats i katalogen %s. Försök att läsa in den manuellt från kommandoraden för att få mer information om fel.
 ErrorCantSaveADoneUserWithZeroPercentage=Kan inte spara en åtgärd med "status inte startad" om fältet "gjort av" också är fyllt.
-ErrorRefAlreadyExists=Ref används för att skapa finns redan.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Var god ange kontoutdragsnamnet där posten ska rapporteras
 ErrorRecordHasChildren=Misslyckades med att radera rekord eftersom det har några barnrekord.
 ErrorRecordHasAtLeastOneChildOfType=Objektet har minst ett barn av typ %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Du måste välja om artikeln är
 ErrorDiscountLargerThanRemainToPaySplitItBefore=Den rabatt du försöker att tillämpa är större än förblir att betala. Dela rabatten i 2 mindre rabatter före.
 ErrorFileNotFoundWithSharedLink=Filen hittades inte. Det kan hända att dela nyckeln ändrades eller filen togs bort nyligen.
 ErrorProductBarCodeAlreadyExists=Produktens streckkod %s finns redan på en annan produktreferens.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Observera också att det är inte möjligt att använda en virtuell produkt för automatisk ökning / minskning av underprodukt när minst en underprodukt (eller delprodukt av underprodukter) behöver ett serienummer / lotnummer.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Beskrivning är obligatorisk för linjer med fri produkt
 ErrorAPageWithThisNameOrAliasAlreadyExists=Sidan / behållaren <strong> %s </strong> har samma namn eller alternativ alias som den du försöker använda
 ErrorDuringChartLoad=Fel vid inmatning av kontoplan. Om några konton inte laddades, kan du fortfarande skriva in dem manuellt.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=Ett lösenord har ställts för den här medlemmen. Men inget användarkonto skapades. Så det här lösenordet är lagrat men kan inte användas för att logga in till Dolibarr. Den kan användas av en extern modul / gränssnitt men om du inte behöver definiera någon inloggning eller ett lösenord för en medlem kan du inaktivera alternativet "Hantera en inloggning för varje medlem" från inställningen av medlemsmodulen. Om du behöver hantera en inloggning men inte behöver något lösenord, kan du hålla fältet tomt för att undvika denna varning. Obs! Email kan också användas som inloggning om medlemmen är länkad till en användare.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Din inloggning har ändrats. För säkerh
 WarningAnEntryAlreadyExistForTransKey=Det finns redan en post för översättningsnyckeln för det här språket
 WarningNumberOfRecipientIsRestrictedInMassAction=Varning, antalet olika mottagare är begränsat till <b> %s </b> vid användning av massåtgärder på listor
 WarningDateOfLineMustBeInExpenseReportRange=Varning, datumet för raden ligger inte inom kostnadsberäkningsområdet
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Projektet är stängt. Du måste öppna den först igen.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/sv_SE/exports.lang b/htdocs/langs/sv_SE/exports.lang
index cd841c26648..445763abcf0 100644
--- a/htdocs/langs/sv_SE/exports.lang
+++ b/htdocs/langs/sv_SE/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Fält titel
 NowClickToGenerateToBuildExportFile=Välj nu filformatet i kombinationsrutan och klicka på "Generera" för att bygga exportfilen ...
 AvailableFormats=Tillgängliga format
 LibraryShort=Bibliotek
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Steg
 FormatedImport=Importassistent
 FormatedImportDesc1=Den här modulen låter dig uppdatera befintliga data eller lägga till nya objekt i databasen från en fil utan teknisk kunskap, med hjälp av en assistent.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Nyckel (kolumn) som ska användas för <b> uppdatering av </
 NbInsert=Antal infogade rader: %s
 NbUpdate=Antal uppdaterade rader: %s
 MultipleRecordFoundWithTheseFilters=Flera poster har hittats med dessa filter: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/sv_SE/mails.lang b/htdocs/langs/sv_SE/mails.lang
index ae4c2707259..21677a700f2 100644
--- a/htdocs/langs/sv_SE/mails.lang
+++ b/htdocs/langs/sv_SE/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=E-postmeddelanden inskrivna av användaren
 MailingModuleDescDolibarrUsers=Användare med e-post
 MailingModuleDescThirdPartiesByCategories=Tredje part (enligt kategorier)
 SendingFromWebInterfaceIsNotAllowed=Skicka från webbgränssnitt är inte tillåtet.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s i filen
@@ -125,12 +126,13 @@ TagMailtoEmail=Mottagar Email (inklusive html "mailto:" länk)
 NoEmailSentBadSenderOrRecipientEmail=Ingen email skickad. Dålig avsändare eller mottagarens e-postadress. Verifiera användarprofil.
 # Module Notifications
 Notifications=Anmälningar
-NoNotificationsWillBeSent=Inga e-postmeddelanden planeras för detta evenemang och företag
-ANotificationsWillBeSent=En anmälan kommer att skickas via e-post
-SomeNotificationsWillBeSent=%s anmälningar kommer att skickas via e-post
-AddNewNotification=Aktivera ett nytt e-postmeddelandemål / -händelse
-ListOfActiveNotifications=Lista alla aktiva mål / händelser för e-postmeddelande
-ListOfNotificationsDone=Lista alla e-postmeddelanden skickas
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Konfiguration av e-post att skicka har ställts in till "% s". Detta läge kan inte användas för att skicka massutskick.
 MailSendSetupIs2=Du måste först gå, med ett administratörskonto, i meny% Shome - Setup - e-post% s för att ändra parameter <strong>'% s'</strong> för att använda läget "% s". Med det här läget kan du ange inställningar för SMTP-servern från din internetleverantör och använda Mass mejla funktionen.
 MailSendSetupIs3=Om du har några frågor om hur man ställer in din SMTP-server, kan du be att% s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Importerad fil måste ha format <strong> email, namn,
 UseFormatInputEmailToTarget=Ange en sträng med format <strong> email, namn, förnamn, annat </strong>
 MailAdvTargetRecipients=Mottagare (avancerat urval)
 AdvTgtTitle=Fyll i inmatningsfält för att välja tredjepart eller kontakter / adresser som ska riktas in
-AdvTgtSearchTextHelp=Använd %% som jokertecken. Till exempel för att hitta alla objekt som <b> jean, joe, jim </b>, kan du skriva <b> j%% </b>, du kan också använda; som separator för värde och använd! för utom detta värde. Till exempel <b> jean; joe; jim%%;! Jimo;! Jima% </b> kommer att rikta alla jean, joe, börja med jim men inte jimo och inte allt som börjar med jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Använd intervall för att välja int eller float värde
 AdvTgtMinVal=Minsta värde
 AdvTgtMaxVal=Maximalt värde
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Skapa filter
 AdvTgtOrCreateNewFilter=Namn på nytt filter
 NoContactWithCategoryFound=Ingen kontakt / adress med en kategori hittad
 NoContactLinkedToThirdpartieWithCategoryFound=Ingen kontakt / adress med en kategori hittad
-OutGoingEmailSetup=Utgående e-postinstallation
-InGoingEmailSetup=Inkommande e-postinstallation
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Standard utgående e-postinstallation
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Kontakter med filter från tredje part
 Unanswered=Unanswered
 Answered=Besvarade
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index 4820abfdd05..28d6fde7041 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Ingen mall tillgänglig för denna e-posttyp
 AvailableVariables=Tillgängliga substitutionsvariabler
 NoTranslation=Ingen översättning
 Translation=Översättning
+CurrentTimeZone=PHP server tidszon
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Ingen post funnen
 NoRecordDeleted=Ingen post borttagen
 NotEnoughDataYet=Inte tillräckligt med data
@@ -85,6 +87,8 @@ FileWasNotUploaded=En fil är vald att bifogas, men har ännu inte laddats upp.
 NbOfEntries=Antal poster
 GoToWikiHelpPage=Läs onlinehjälp (Internet behövs)
 GoToHelpPage=Läs hjälpen
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Webbsida
 RecordSaved=Post sparades
 RecordDeleted=Post raderad
 RecordGenerated=Post skapad
@@ -433,6 +437,7 @@ RemainToPay=Fortsätt att betala
 Module=Modul / applikation
 Modules=Moduler / Applications
 Option=Alternativ
+Filters=Filters
 List=Lista
 FullList=Fullständig lista
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Skicka e-post
 Email=epost
 NoEMail=Ingen e-post
 AlreadyRead=Redan läst
-NotRead=Inte läst
+NotRead=Unread
 NoMobilePhone=Ingen mobiltelefon
 Owner=Ägare
 FollowingConstantsWillBeSubstituted=Följande konstanter kommer att ersätta med motsvarande värde.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/sv_SE/members.lang b/htdocs/langs/sv_SE/members.lang
index bde1806a162..848cc24cf49 100644
--- a/htdocs/langs/sv_SE/members.lang
+++ b/htdocs/langs/sv_SE/members.lang
@@ -32,7 +32,7 @@ DateSubscription=Teckningsdag
 DateEndSubscription=Prenumeration slutdatum
 EndSubscription=Avsluta prenumeration
 SubscriptionId=Prenumeration id
-WithoutSubscription=Without subscription
+WithoutSubscription=Utan prenumeration
 MemberId=Medlem id
 NewMember=Ny medlem
 MemberType=Medlem typ
diff --git a/htdocs/langs/sv_SE/modulebuilder.lang b/htdocs/langs/sv_SE/modulebuilder.lang
index 84447f97569..9983f774100 100644
--- a/htdocs/langs/sv_SE/modulebuilder.lang
+++ b/htdocs/langs/sv_SE/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP-sida för att skapa / redigera / visa en post
 PageForAgendaTab=PHP-sida för händelsefliken
 PageForDocumentTab=PHP-sida för dokumentfliken
 PageForNoteTab=PHP-sida för fliken Not
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Vägen till zip på modulen / applikationspaketet
 PathToModuleDocumentation=Ban till fil med modul / ansökningsdokumentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Mellanslag eller specialtecken är inte tillåtna.
@@ -77,7 +78,7 @@ IsAMeasure=Är en åtgärd
 DirScanned=Directory skannad
 NoTrigger=Ingen utlösare
 NoWidget=Ingen widget
-GoToApiExplorer=Gå till API-explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=Lista över menyuppgifter
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=Lista över definierade behörigheter
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Om du har kunskap om SQL och PHP kan du använda guiden
 SeeTopRightMenu=Se <span class="fa fa-bug"> </span> längst upp till höger
 AddLanguageFile=Lägg till språkfil
 YouCanUseTranslationKey=Här kan du använda en nyckel som är översättningsnyckeln i språkfilen (se fliken "Språk")
-DropTableIfEmpty=(Ta bort tabellen om den är tom)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=Tabellen %s existerar inte
 TableDropped=Tabell %s utgår
 InitStructureFromExistingTable=Bygg strukturen array-strängen i en befintlig tabell
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Använd en specifik redigeringsadress
 UseSpecificFamily = Använd en specifik familj
 UseSpecificAuthor = Använd en specifik författare
 UseSpecificVersion = Använd en specifik första version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang
index 15add067b10..bdf131055ed 100644
--- a/htdocs/langs/sv_SE/other.lang
+++ b/htdocs/langs/sv_SE/other.lang
@@ -5,8 +5,6 @@ Tools=Verktyg
 TMenuTools=Verktyg
 ToolsDesc=Alla verktyg som inte ingår i andra menyposter grupperas här. <br> Alla verktyg kan nås via menyn till vänster.
 Birthday=Födelsedag
-BirthdayDate=Födelsedagsdatum
-DateToBirth=Birth date
 BirthdayAlertOn=födelsedag alert aktiva
 BirthdayAlertOff=födelsedag alert inaktiv
 TransKey=Översättning av nyckel: TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Föregående månad (nummer 1-12) på fakturadatum
 TextPreviousMonthOfInvoice=Föregående månad (text) på fakturadatum
 NextMonthOfInvoice=Följande månad (nummer 1-12) på fakturadatum
 TextNextMonthOfInvoice=Följande månad (text) på fakturadatum
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip-fil genererad till <b> %s </b>.
 DocFileGeneratedInto=Doc-filen genereras till <b> %s </b>.
 JumpToLogin=Förbindelse förlorad. Gå till inloggningssidan ...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hej)__\n\nVänligen hitta frakt __REF__ bif
 PredefinedMailContentSendFichInter=__(Hej)__\n\nVänligen hitta intervention __REF__ bifogad\n\n\n__(Vänliga hälsningar)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Du kan klicka på länken nedan för att göra din betalning om den inte redan är klar.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hej)__\n\n\n__(Vänliga hälsningar)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr är en kompakt ERP / CRM som stöder flera affärsmoduler. En demo som visar alla moduler ger ingen mening eftersom detta scenario aldrig uppstår (flera hundra tillgängliga). Det finns därför flera demoprofiler tillgängliga.
 ChooseYourDemoProfil=Välj den demoprofil som bäst passar dina behov ...
 ChooseYourDemoProfilMore=... eller bygg din egen profil <br> (manuellt modulval)
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Kontakt / adress skapad via e-post samlare från
 ProjectCreatedByEmailCollector=Projekt skapat av e-post samlare från email MSGID %s
 TicketCreatedByEmailCollector=Biljett skapad av e-post samlare från email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Export område
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index 35ad5dd24d9..00c9fe273ff 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Flera prissegment per produkt / tjänst (varje kund är i ett prissegment)
 MultiPricesNumPrices=Antal pris
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Antal förälder förpackningsartikel
@@ -167,8 +168,10 @@ BuyingPrices=Köpa priser
 CustomerPrices=Kundpriser
 SuppliersPrices=Leverantörspriser
 SuppliersPricesOfProductsOrServices=Leverantörspriser (av produkter eller tjänster)
-CustomCode=Tull / Varu / HS-kod
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Ursprungsland
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Använd fast pris
 PriceByQuantity=Olika priser m.a.p. mängd
 DisablePriceByQty=Inaktivera priserna efter antal
 PriceByQuantityRange=Pris för mängdgaffel
-MultipriceRules=Prissegmentregler
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Använd prissegmentregler (definierad i produktmoduluppsättning) för att automatiskt beräkna priser för alla andra segment enligt första segmentet
 PercentVariationOver=%% variation över %s
 PercentDiscountOver=%% rabatt över %s
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index e07fe348437..b19f2e470bc 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -68,7 +68,7 @@ TaskDescription=Uppgiftsbeskrivning
 NewTask=Ny uppgift
 AddTask=Skapa uppgift
 AddTimeSpent=Skapa tid spenderad
-AddHereTimeSpentForDay=Lägg till här dags tid för denna dag / uppgift
+AddHereTimeSpentForDay=Lägg till här tid för denna dag / uppgift
 AddHereTimeSpentForWeek=Add here time spent for this week/task
 Activity=Aktivitet
 Activities=Uppgifter / aktiviteter
@@ -76,18 +76,18 @@ MyActivities=Mina uppgifter / aktiviteter
 MyProjects=Mina projekt
 MyProjectsArea=Mina projektområde
 DurationEffective=Effektiv längd
-ProgressDeclared=Förklarades framsteg
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Beräknat framsteg
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Tid
 ListOfTasks=Lista över uppgifter
 GoToListOfTimeConsumed=Gå till listan över tidskrävt
-GanttView=Gantt View
+GanttView=Gantt-vy
 ListProposalsAssociatedProject=Förteckning över de kommersiella förslagen relaterade till projektet
 ListOrdersAssociatedProject=Förteckning över försäljningsorder relaterade till projektet
 ListInvoicesAssociatedProject=Förteckning över kundfakturor relaterade till projektet
diff --git a/htdocs/langs/sv_SE/recruitment.lang b/htdocs/langs/sv_SE/recruitment.lang
index a88bbbbcb31..cc983d2e347 100644
--- a/htdocs/langs/sv_SE/recruitment.lang
+++ b/htdocs/langs/sv_SE/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/sv_SE/sendings.lang b/htdocs/langs/sv_SE/sendings.lang
index ff472cc3f3e..c11320eba55 100644
--- a/htdocs/langs/sv_SE/sendings.lang
+++ b/htdocs/langs/sv_SE/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Andra sändningar för denna beställning
 SendingsAndReceivingForSameOrder=Sändningar och kvitton för denna beställning
 SendingsToValidate=Transporter för att bekräfta
 StatusSendingCanceled=Annullerad
+StatusSendingCanceledShort=Annullerad
 StatusSendingDraft=Förslag
 StatusSendingValidated=Bekräftat (produkter till ett fartyg eller som redan sänts)
 StatusSendingProcessed=Bearbetade
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Du måste först validera ordern innan du kan g
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Mer komplett dokument modell för leverans intäkter (logo. ..)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstant EXPEDITION_ADDON_NUMBER definieras inte
 SumOfProductVolumes=Summan av produktvolymer
 SumOfProductWeights=Summan av produktvikter
diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang
index f840a0301be..13e5131c99d 100644
--- a/htdocs/langs/sv_SE/stocks.lang
+++ b/htdocs/langs/sv_SE/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/sv_SE/ticket.lang b/htdocs/langs/sv_SE/ticket.lang
index 860b4453738..95a2fb76ef8 100644
--- a/htdocs/langs/sv_SE/ticket.lang
+++ b/htdocs/langs/sv_SE/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Biljett - Typer
 TicketDictCategory=Biljett - Grupper
 TicketDictSeverity=Ticket - Severiteter
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Programfel
-TicketTypeShortBUGHARD=Hårdvarufel
-TicketTypeShortCOM=Kommersiell fråga
 
+TicketTypeShortCOM=Kommersiell fråga
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Andra
 TicketSeverityShortLOW=Låg
 TicketSeverityShortNORMAL=Vanligt
 TicketSeverityShortHIGH=Hög
-TicketSeverityShortBLOCKING=Kritisk / Blockering
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Fältet '%s' felaktigt
 MenuTicketMyAssign=Mina biljetter
@@ -60,7 +58,6 @@ OriginEmail=E-postkälla
 Notify_TICKET_SENTBYMAIL=Skicka biljettmeddelande via e-post
 
 # Status
-NotRead=Inte läst
 Read=Läsa
 Assigned=Tilldelad
 InProgress=Pågående
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Offentligt gränssnitt tillåter alla besöka
 TicketsAutoAssignTicket=Tilldela automatiskt användaren som skapade biljetten
 TicketsAutoAssignTicketHelp=När du skapar en biljett kan användaren automatiskt tilldelas biljetten.
 TicketNumberingModules=Biljettnummermodul
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Meddela tredje part vid skapandet
 TicketsDisableCustomerEmail=Avaktivera alltid e-postmeddelanden när en biljett skapas från det offentliga gränssnittet
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status ändrad: %s till %s
 TicketNotNotifyTiersAtCreate=Meddela inte företaget på create
 Unread=Oläst
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/sv_SE/website.lang b/htdocs/langs/sv_SE/website.lang
index 7770506abfb..e04af80c19a 100644
--- a/htdocs/langs/sv_SE/website.lang
+++ b/htdocs/langs/sv_SE/website.lang
@@ -30,7 +30,6 @@ EditInLine=Redigera inline
 AddWebsite=Lägg till webbplats
 Webpage=Webbsida / container
 AddPage=Lägg till sida / behållare
-HomePage=Webbsida
 PageContainer=Sida
 PreviewOfSiteNotYetAvailable=Förhandsgranskning av din webbplats <strong> %s </strong> ej tillgänglig än. Du måste först '<strong> Importera en fullständig webbplatsmall </strong>' eller bara '<strong> Lägg till en sida / behållare </strong>'.
 RequestedPageHasNoContentYet=Den begärda sidan med id %s har inget innehåll ännu, eller cachefilen .tpl.php har tagits bort. Redigera innehållet på sidan för att lösa detta.
@@ -101,7 +100,7 @@ EmptyPage=Tom sida
 ExternalURLMustStartWithHttp=Extern webbadress måste börja med http: // eller https: //
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Inkludera dynamiskt innehåll
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Intern webbadress
 ThisPageIsTranslationOf=Den här sidan / behållaren är en översättning av
 ThisPageHasTranslationPages=Den här sidan / behållaren har översättning
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/sv_SE/withdrawals.lang b/htdocs/langs/sv_SE/withdrawals.lang
index 4b18e747ab8..8aec0a32333 100644
--- a/htdocs/langs/sv_SE/withdrawals.lang
+++ b/htdocs/langs/sv_SE/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Senaste %s direktavköpsintäkterna
 MakeWithdrawRequest=Gör en förskottsbetalningsförfrågan
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s begärda betalningsförfrågningar
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Tredjeparts bankkod
 NoInvoiceCouldBeWithdrawed=Ingen faktura debiteras framgångsrikt. Kontrollera att fakturor är på företag med en giltig IBAN och att IBAN har en UMR (Unique Mandate Reference) med läget <strong> %s </strong>.
 ClassCredited=Märk krediterad
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Exekveringsdatum
 CreateForSepa=Skapa direkt debitfil
-ICS=Krediteridentifierare CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML-tagg - Unikt ID tilldelat per transaktion
 USTRD="Ostrukturerad" SEPA XML-tagg
 ADDDAYS=Lägg till dagar till Exekveringsdatum
@@ -146,3 +148,4 @@ InfoRejectSubject=Betalningsordern vägrade
 InfoRejectMessage=Hej, <br> <br> Betalningsordern för fakturan %s relaterad till företaget %s, med ett belopp på %s, har vägrats av banken. <br> <br> - <br> %s
 ModeWarning=Alternativ på riktigt läget inte var satt, sluta vi efter denna simulering
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/sw_SW/accountancy.lang b/htdocs/langs/sw_SW/accountancy.lang
index 3211a0b62df..33ba4d9fea7 100644
--- a/htdocs/langs/sw_SW/accountancy.lang
+++ b/htdocs/langs/sw_SW/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index f1c41a3b62b..189b0b5186a 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=List of OpenDocument templates directories
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Position of Name/Lastname
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu handler where to show new menu
 DetailMenuModule=Module name if menu entry come from a module
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/sw_SW/banks.lang b/htdocs/langs/sw_SW/banks.lang
index 9500a5b8b2e..a0dc27f86c4 100644
--- a/htdocs/langs/sw_SW/banks.lang
+++ b/htdocs/langs/sw_SW/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/sw_SW/blockedlog.lang b/htdocs/langs/sw_SW/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/sw_SW/blockedlog.lang
+++ b/htdocs/langs/sw_SW/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/sw_SW/boxes.lang b/htdocs/langs/sw_SW/boxes.lang
index d6fd298a3a7..7db4ea8aa17 100644
--- a/htdocs/langs/sw_SW/boxes.lang
+++ b/htdocs/langs/sw_SW/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/sw_SW/cashdesk.lang b/htdocs/langs/sw_SW/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/sw_SW/cashdesk.lang
+++ b/htdocs/langs/sw_SW/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/sw_SW/categories.lang b/htdocs/langs/sw_SW/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/sw_SW/categories.lang
+++ b/htdocs/langs/sw_SW/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/sw_SW/companies.lang b/htdocs/langs/sw_SW/companies.lang
index dadff6a7894..8dc815b522e 100644
--- a/htdocs/langs/sw_SW/companies.lang
+++ b/htdocs/langs/sw_SW/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/sw_SW/compta.lang b/htdocs/langs/sw_SW/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/sw_SW/compta.lang
+++ b/htdocs/langs/sw_SW/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/sw_SW/cron.lang b/htdocs/langs/sw_SW/cron.lang
index d2da7ded67e..2ebdda1e685 100644
--- a/htdocs/langs/sw_SW/cron.lang
+++ b/htdocs/langs/sw_SW/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Create/update Scheduled job
 Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
-CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+CronSetup=Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -56,16 +58,16 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Shell command
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/sw_SW/errors.lang
+++ b/htdocs/langs/sw_SW/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
 ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/sw_SW/exports.lang b/htdocs/langs/sw_SW/exports.lang
index 2dcf4317e00..a0eb7161ef2 100644
--- a/htdocs/langs/sw_SW/exports.lang
+++ b/htdocs/langs/sw_SW/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Step
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/sw_SW/mails.lang b/htdocs/langs/sw_SW/mails.lang
index 1235eef3b27..7fd93be7b71 100644
--- a/htdocs/langs/sw_SW/mails.lang
+++ b/htdocs/langs/sw_SW/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index 96c68cdcfa3..e196120c27d 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/sw_SW/modulebuilder.lang b/htdocs/langs/sw_SW/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/sw_SW/modulebuilder.lang
+++ b/htdocs/langs/sw_SW/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/sw_SW/other.lang b/htdocs/langs/sw_SW/other.lang
index 54c0572d453..0a7b3723ab1 100644
--- a/htdocs/langs/sw_SW/other.lang
+++ b/htdocs/langs/sw_SW/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang
index 97db059594f..f0c4a5362b8 100644
--- a/htdocs/langs/sw_SW/products.lang
+++ b/htdocs/langs/sw_SW/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/sw_SW/recruitment.lang b/htdocs/langs/sw_SW/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/sw_SW/recruitment.lang
+++ b/htdocs/langs/sw_SW/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/sw_SW/sendings.lang b/htdocs/langs/sw_SW/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/sw_SW/sendings.lang
+++ b/htdocs/langs/sw_SW/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Other shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Shipments to validate
 StatusSendingCanceled=Canceled
+StatusSendingCanceledShort=Canceled
 StatusSendingDraft=Draft
 StatusSendingValidated=Validated (products to ship or already shipped)
 StatusSendingProcessed=Processed
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/sw_SW/stocks.lang b/htdocs/langs/sw_SW/stocks.lang
index 660443bcded..6cf089096dd 100644
--- a/htdocs/langs/sw_SW/stocks.lang
+++ b/htdocs/langs/sw_SW/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/sw_SW/ticket.lang b/htdocs/langs/sw_SW/ticket.lang
index 59519282c80..982fff90ffa 100644
--- a/htdocs/langs/sw_SW/ticket.lang
+++ b/htdocs/langs/sw_SW/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/sw_SW/website.lang b/htdocs/langs/sw_SW/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/sw_SW/website.lang
+++ b/htdocs/langs/sw_SW/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/sw_SW/withdrawals.lang b/htdocs/langs/sw_SW/withdrawals.lang
index 114a8d9dd6c..e3bec6f9cb8 100644
--- a/htdocs/langs/sw_SW/withdrawals.lang
+++ b/htdocs/langs/sw_SW/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang
index 4c4d303f11c..9b3f2e7bb42 100644
--- a/htdocs/langs/th_TH/accountancy.lang
+++ b/htdocs/langs/th_TH/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=วันที่
 Docref=การอ้างอิง
 LabelAccount=บัญชีฉลาก
 LabelOperation=Label operation
-Sens=ซองส์
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=วารสาร
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index c50cf3e78cf..14c917aad14 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -56,6 +56,8 @@ GUISetup=แสดง
 SetupArea=การติดตั้ง
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=แบบทดสอบการอัปโหลดไฟล์ (ตามการตั้งค่า)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=หมายเหตุ: <b>ใช่จะมีผลเฉพาะถ้าโมดูล% s</b> ถูกเปิดใช้งาน
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=แสดงตัวอย่าง
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=ตัวอย่างที่ไม่สามารถใช้ได้
 ThemeCurrentlyActive=รูปแบบที่ใช้งานอยู่ในปัจจุบัน
-CurrentTimeZone=เขต PHP (เซิร์ฟเวอร์)
 MySQLTimeZone=เขตฐาน (ฐานข้อมูล)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=ช่องว่าง
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=ล้าง
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=ล้างในขณะนี้
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=พาร์ทเนอร์ที่ต้อง
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=สำหรับผู้ใช้หรือเอกสารพัฒนา (หมอคำถามที่พบบ่อย ... ), <br> ดูที่วิกิพีเดีย Dolibarr: <br> <a href="%s" target="_blank"><b>% s</b></a>
 ForAnswersSeeForum=สำหรับคำถามใด ๆ / ความช่วยเหลือคุณสามารถใช้ฟอรั่ม Dolibarr: <br> <a href="%s" target="_blank"><b>% s</b></a>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=รายการ OpenDocument ไดเรกทอรีแม่
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=ตัวอย่างของไวยากรณ์: <br> C: \\ mydir <br> / home / mydir <br> DOL_DATA_ROOT / ECM / ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> หากต้องการทราบวิธีการสร้างเอกสารของคุณ ODT แม่ก่อนที่จะเก็บไว้ในไดเรกทอรีเหล่านั้นอ่านเอกสารวิกิพีเดีย:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=ตำแหน่งชื่อ / นามสกุล
@@ -406,7 +408,7 @@ UrlGenerationParameters=พารามิเตอร์ URL ที่การ
 SecurityTokenIsUnique=ใช้พารามิเตอร์ SecureKey ไม่ซ้ำกันสำหรับแต่ละ URL
 EnterRefToBuildUrl=ป้อนการอ้างอิงสำหรับวัตถุ% s
 GetSecuredUrl=รับ URL คำนวณ
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=อัตราภาษีมูลค่าเพิ่มเก่า
 NewVATRates=ใหม่อัตราภาษีมูลค่าเพิ่ม
 PriceBaseTypeToChange=การปรับเปลี่ยนราคาค่าอ้างอิงกับฐานที่กำหนดไว้ใน
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=เมนูใหม่
 MenuHandler=จัดการเมนู
 MenuModule=โมดูลที่มา
-HideUnauthorizedMenu= ซ่อนเมนูไม่ได้รับอนุญาต (สีเทา)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=เมนู Id
 DetailMenuHandler=จัดการเมนูที่จะแสดงเมนูใหม่
 DetailMenuModule=ชื่อโมดูลถ้ารายการเมนูมาจากโมดูล
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=ไปรษณีย์
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/th_TH/banks.lang b/htdocs/langs/th_TH/banks.lang
index fd3ab8f2696..92bea611931 100644
--- a/htdocs/langs/th_TH/banks.lang
+++ b/htdocs/langs/th_TH/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/th_TH/blockedlog.lang b/htdocs/langs/th_TH/blockedlog.lang
index 88511cd5fbd..1b2467dcb5e 100644
--- a/htdocs/langs/th_TH/blockedlog.lang
+++ b/htdocs/langs/th_TH/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/th_TH/boxes.lang b/htdocs/langs/th_TH/boxes.lang
index 48979414509..04231e5012f 100644
--- a/htdocs/langs/th_TH/boxes.lang
+++ b/htdocs/langs/th_TH/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=กิจกรรมทั่วโลก (ใบแจ้งหนี้, ข้อเสนอ, การสั่งซื้อ)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=งานที่กำหนดเวลาไว้
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=บุ๊คมาร์คไม่มีกำหนด
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=การบัญชี
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/th_TH/cashdesk.lang b/htdocs/langs/th_TH/cashdesk.lang
index ec6eefe89a4..7dee305ab80 100644
--- a/htdocs/langs/th_TH/cashdesk.lang
+++ b/htdocs/langs/th_TH/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=nb ของใบแจ้งหนี้
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/th_TH/categories.lang b/htdocs/langs/th_TH/categories.lang
index 1e978741186..e61138aee8e 100644
--- a/htdocs/langs/th_TH/categories.lang
+++ b/htdocs/langs/th_TH/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=รายการของแท็ก / ประเภท
+CatListAll=List of tags/categories (all types)
 NewCategory=แท็กใหม่ / หมวดหมู่
 ModifCat=ปรับเปลี่ยนแท็ก / หมวดหมู่
 CatCreated=Tag / สร้างหมวดหมู่
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag / รหัสหมวดหมู่
-CatSupList=List of vendor tags/categories
-CatCusList=รายชื่อลูกค้า / โอกาสแท็ก / ประเภท
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=รายการของแท็ก / ผลิตภัณฑ์ประเภท
 CatMemberList=รายชื่อสมาชิกแท็ก / ประเภท
-CatContactList=รายการของแท็กติดต่อ / ประเภท
-CatSupLinks=การเชื่อมโยงระหว่างซัพพลายเออร์และแท็ก / ประเภท
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=การเชื่อมโยงระหว่างลูกค้า / ลูกค้าเป้าหมาย และ แท็ก / ประเภท
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=การเชื่อมโยงระหว่างผลิตภัณฑ์ / บริการและแท็ก / ประเภท
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=การเชื่อมโยงระหว่างสมาชิกและแท็ก / ประเภท
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=ลบออกจากแท็ก / หมวดหมู่
 ExtraFieldsCategories=คุณลักษณะที่สมบูรณ์
 CategoriesSetup=แท็ก / ประเภทการติดตั้ง
diff --git a/htdocs/langs/th_TH/companies.lang b/htdocs/langs/th_TH/companies.lang
index 698f595ebaf..8956b27f853 100644
--- a/htdocs/langs/th_TH/companies.lang
+++ b/htdocs/langs/th_TH/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=ตรวจสอบไม่ได้ บริการตรวจสอบไม่ได้ให้โดยรัฐสมาชิก (% s)
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=ที่อาจเกิดขึ้น
diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang
index 60fe78c8f6f..a74d5c1967d 100644
--- a/htdocs/langs/th_TH/compta.lang
+++ b/htdocs/langs/th_TH/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=สังคม / การชำระเงินภาษีการคลัง
 ShowVatPayment=แสดงการชำระเงินภาษีมูลค่าเพิ่ม
 TotalToPay=ทั้งหมดที่จะต้องจ่าย
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=คุณแน่ใจหรือว่าต
 ExportDataset_tax_1=ภาษีสังคมและการคลังและการชำระเงิน
 CalcModeVATDebt=<b>โหมด% sVAT ความมุ่งมั่นบัญชี%</b> s
 CalcModeVATEngagement=โหมด <b>sVAT% รายได้ค่าใช้จ่าย-%</b> s
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= <b>โหมด% Sre ในใบแจ้งหนี้ของลูกค้า - ซัพพลายเออร์ใบแจ้งหนี้% s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=ความสมดุลของรายได
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- จํานวนเงินที่แสดงเป็นกับภาษีรวมทั้งหมด
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=รายงานโดยเรื่องของบุคคลที่สาม
 LT2ReportByCustomersES=รายงานโดยบุคคลที่สาม IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/th_TH/cron.lang b/htdocs/langs/th_TH/cron.lang
index 85838088924..8294f683d7e 100644
--- a/htdocs/langs/th_TH/cron.lang
+++ b/htdocs/langs/th_TH/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = สร้าง / การปรับปรุงกำห
 Permission23103 = ลบงานที่กำหนด
 Permission23104 = การดำเนินงานที่กำหนด
 # Admin
-CronSetup= กำหนดเวลาการตั้งค่าการจัดการงาน
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=หรือเพื่อตรวจสอบและการเปิดตัวงานที่เฉพาะเจาะจง
+CronSetup=กำหนดเวลาการตั้งค่าการจัดการงาน
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=กุญแจสำคัญในการรักษาความปลอดภัยสำหรับ URL ที่จะเปิดตัวงาน cron
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=ในสภาพแวดล้อมระบบปฏิบัติการยูนิกซ์ที่คุณควรใช้ crontab รายการต่อไปนี้เพื่อเรียกใช้บรรทัดคำสั่งแต่ละ 5 นาที
-CronExplainHowToRunWin=ไมโครซอฟท์ (TM) ของ Windows environement คุณสามารถใช้เครื่องมือการจัดตารางงานที่จะเรียกใช้บรรทัดคำสั่งแต่ละ 5 นาที
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -42,10 +43,11 @@ CronModule=โมดูล
 CronNoJobs=ไม่มีงานที่ลงทะเบียน
 CronPriority=ลำดับความสำคัญ
 CronLabel=ฉลาก
-CronNbRun=nb ยิง
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=ทุกๆ
 JobFinished=งานเปิดตัวและจบ
+Scheduled=Scheduled
 #Page card
 CronAdd= เพิ่มงาน
 CronEvery=ดำเนินงานแต่ละงาน
@@ -56,16 +58,16 @@ CronNote=ความเห็น
 CronFieldMandatory=ทุ่ง% s มีผลบังคับใช้
 CronErrEndDateStartDt=วันที่สิ้นสุดไม่สามารถก่อนวันเริ่มต้น
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=เปิดใช้งาน
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=ปิดการใช้งาน
 CronTaskInactive=งานนี้ถูกปิดใช้งาน
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=บรรทัดคำสั่งระบบที่จะดำเนินการ
 CronCreateJob=สร้างงานใหม่กำหนด
 CronFrom=จาก
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=คำสั่งเชลล์
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=ปิดการใช้งาน
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index 125ecf6e5b3..4de399f8493 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=ไม่มีข้อผิดพลาดที่เร
 # Errors
 ErrorButCommitIsDone=พบข้อผิดพลาด แต่เราตรวจสอบอย่างไรก็ตามเรื่องนี้
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=% s url ที่ไม่ถูกต้อง
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=เข้าสู่ระบบ% s อยู่แล้ว
 ErrorGroupAlreadyExists=s% กลุ่มที่มีอยู่แล้ว
 ErrorRecordNotFound=บันทึกไม่พบ
@@ -48,6 +50,7 @@ ErrorFieldsRequired=ฟิลด์ที่จำเป็นบางคนไ
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=ล้มเหลวในการสร้างไดเรกทอรี ตรวจสอบการใช้เว็บเซิร์ฟเวอร์ที่มีสิทธิ์ในการเขียนลงในไดเรกทอรีเอกสาร Dolibarr หาก <b>safe_mode</b> พารามิเตอร์เปิดใช้งานบน PHP นี้ตรวจสอบว่า php ไฟล์ Dolibarr เป็นเจ้าของให้กับผู้ใช้เว็บเซิร์ฟเวอร์ (หรือกลุ่ม)
 ErrorNoMailDefinedForThisUser=จดหมายไม่มีกำหนดไว้สำหรับผู้ใช้นี้
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=คุณลักษณะนี้จะต้องเปิดการใช้งานได้ในการทำงาน เปลี่ยนนี้ในการตั้งค่า - การแสดงผล
 ErrorTopMenuMustHaveAParentWithId0=เมนูประเภทยอด 'ไม่สามารถมีเมนูปกครอง ใส่ 0 ในเมนูปกครองหรือเลือกเมนูประเภท 'ซ้าย'
 ErrorLeftMenuMustHaveAParentId=เมนูชนิด 'ซ้าย' ต้องมีรหัสผู้ปกครอง
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=ชื่อโปรไฟล์นี้มีอ
 ErrorLDAPSetupNotComplete=การจับคู่ Dolibarr-LDAP ไม่สมบูรณ์
 ErrorLDAPMakeManualTest=ไฟล์ .ldif ได้รับการสร้างขึ้นในไดเรกทอรี% s พยายามที่จะโหลดได้ด้วยตนเองจากบรรทัดคำสั่งที่จะมีข้อมูลเพิ่มเติมเกี่ยวกับข้อผิดพลาด
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref ใช้สำหรับการสร้างที่มีอยู่แล้ว
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/th_TH/exports.lang b/htdocs/langs/th_TH/exports.lang
index e7c28b1980e..4ec434b49a1 100644
--- a/htdocs/langs/th_TH/exports.lang
+++ b/htdocs/langs/th_TH/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=ชื่อฟิลด์
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=ห้องสมุด
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=ขั้นตอน
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/th_TH/mails.lang b/htdocs/langs/th_TH/mails.lang
index ea92de0f2ba..2627c963ee0 100644
--- a/htdocs/langs/th_TH/mails.lang
+++ b/htdocs/langs/th_TH/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=สาย% s ในแฟ้ม
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=ส่งอีเมลไม่มี ผู้ส่งที่ไม่ดีหรืออีเมลของผู้รับ ตรวจสอบรายละเอียดของผู้ใช้
 # Module Notifications
 Notifications=การแจ้งเตือน
-NoNotificationsWillBeSent=ไม่มีการแจ้งเตือนอีเมลที่มีการวางแผนสำหรับเหตุการณ์และ บริษัท นี้
-ANotificationsWillBeSent=1 การแจ้งเตือนจะถูกส่งไปทางอีเมล
-SomeNotificationsWillBeSent=% s การแจ้งเตือนจะถูกส่งไปทางอีเมล
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=รายการทั้งหมดแจ้งเตือนอีเมลที่ส่ง
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=การกำหนดค่าของการส่งอีเมล์ที่ได้รับการติดตั้งเพื่อ '% s' โหมดนี้ไม่สามารถใช้ในการส่งการส่งอีเมลมวล
 MailSendSetupIs2=ก่อนอื่นคุณต้องไปกับบัญชีผู้ดูแลระบบลงไปในเมนู% sHome - การติดตั้ง - อีเมล์% s จะเปลี่ยนพารามิเตอร์ <strong>'% s'</strong> เพื่อใช้โหมด '% s' ด้วยโหมดนี้คุณสามารถเข้าสู่การตั้งค่าของเซิร์ฟเวอร์ที่ให้บริการโดยผู้ให้บริการอินเทอร์เน็ตของคุณและใช้คุณลักษณะการส่งอีเมลมวล
 MailSendSetupIs3=หากคุณมีคำถามใด ๆ เกี่ยวกับวิธีการติดตั้งเซิร์ฟเวอร์ของคุณคุณสามารถขอให้% s
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=ข้อมูล
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index 71d84671325..1812b69b149 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=แปลไม่มี
 Translation=การแปล
+CurrentTimeZone=เขต PHP (เซิร์ฟเวอร์)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=บันทึกไม่พบ
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=ไฟล์ที่ถูกเลือกสำหรั
 NbOfEntries=No. of entries
 GoToWikiHelpPage=อ่านความช่วยเหลือออนไลน์ (อินเทอร์เน็ตจำเป็น)
 GoToHelpPage=อ่านความช่วยเหลือ
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=บันทึกที่บันทึกไว้
 RecordDeleted=บันทึกลบ
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=ตัวเลือก
+Filters=Filters
 List=รายการ
 FullList=รายการเต็มรูปแบบ
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=ส่งอีเมล
 Email=อีเมล์
 NoEMail=ไม่มีอีเมล
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=ไม่มีโทรศัพท์มือถือ
 Owner=เจ้าของ
 FollowingConstantsWillBeSubstituted=ค่าคงที่ต่อไปนี้จะถูกแทนที่ด้วยค่าที่สอดคล้องกัน
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=ไว้
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/th_TH/modulebuilder.lang b/htdocs/langs/th_TH/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/th_TH/modulebuilder.lang
+++ b/htdocs/langs/th_TH/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang
index d877cbda594..520ff5d1076 100644
--- a/htdocs/langs/th_TH/other.lang
+++ b/htdocs/langs/th_TH/other.lang
@@ -5,8 +5,6 @@ Tools=เครื่องมือ
 TMenuTools=เครื่องมือ
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=วันเกิด
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=การแจ้งเตือนการใช้งานวันเกิด
 BirthdayAlertOff=การแจ้งเตือนวันเกิดไม่ได้ใช้งาน
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=เหมาะสม
 CalculatedWeight=น้ำหนักการคำนวณ
 CalculatedVolume=ปริมาณการคำนวณ
 Weight=น้ำหนัก
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=กก.
 WeightUnitg=ก.
 WeightUnitmg=มก.
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=พื้นที่การส่งออก
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index 08f045c48a9..c1e6935e3ec 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=จำนวนของราคา
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=จำนวนผู้ปกครองผลิตภัณฑ์บรรจุภัณฑ์
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=ราคาของลูกค้า
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=ประเทศแหล่งกำเนิดสินค้า
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=ใช้ราคาคงที่
 PriceByQuantity=ราคาที่แตกต่างกันตามปริมาณ
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=จำนวนช่วง
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/th_TH/recruitment.lang b/htdocs/langs/th_TH/recruitment.lang
index 45af9e2bfbb..fafd8a9a580 100644
--- a/htdocs/langs/th_TH/recruitment.lang
+++ b/htdocs/langs/th_TH/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/th_TH/sendings.lang b/htdocs/langs/th_TH/sendings.lang
index 2dcc36fe18f..f5e201c2f33 100644
--- a/htdocs/langs/th_TH/sendings.lang
+++ b/htdocs/langs/th_TH/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=การจัดส่งอื่น ๆ สำห
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=ในการตรวจสอบการจัดส่ง
 StatusSendingCanceled=ยกเลิก
+StatusSendingCanceledShort=ยกเลิก
 StatusSendingDraft=ร่าง
 StatusSendingValidated=การตรวจสอบ (สินค้าจะจัดส่งหรือจัดส่งแล้ว)
 StatusSendingProcessed=การประมวลผล
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=รูปแบบเอกสารที่สมบูรณ์มากขึ้นสำหรับการจัดส่งใบเสร็จรับเงิน (โลโก้ ... )
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER คงที่ไม่ได้กำหนดไว้
 SumOfProductVolumes=ผลรวมของปริมาณสินค้า
 SumOfProductWeights=ผลรวมของน้ำหนักสินค้า
diff --git a/htdocs/langs/th_TH/stocks.lang b/htdocs/langs/th_TH/stocks.lang
index 25e162a70a3..6702db1eb8b 100644
--- a/htdocs/langs/th_TH/stocks.lang
+++ b/htdocs/langs/th_TH/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/th_TH/ticket.lang b/htdocs/langs/th_TH/ticket.lang
index 63e20a956df..c66c4830bdf 100644
--- a/htdocs/langs/th_TH/ticket.lang
+++ b/htdocs/langs/th_TH/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=อื่น ๆ
 TicketSeverityShortLOW=ต่ำ
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=สูง
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=อ่าน
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/th_TH/website.lang b/htdocs/langs/th_TH/website.lang
index d905e966535..373eab76476 100644
--- a/htdocs/langs/th_TH/website.lang
+++ b/htdocs/langs/th_TH/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=หน้า
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/th_TH/withdrawals.lang b/htdocs/langs/th_TH/withdrawals.lang
index 4cdd1b59e6f..6834b715e38 100644
--- a/htdocs/langs/th_TH/withdrawals.lang
+++ b/htdocs/langs/th_TH/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=จำแนกเครดิต
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=ตัวเลือกสำหรับโหมดจริงไม่ได้ตั้งค่าเราหยุดหลังจากจำลองนี้
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index 9abb47b577e..1f60ca24d39 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=%s hariç tüm ülkeler
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Müşteriler için ana muhasebe hesabı kurulumda tanımlı değil
 MainAccountForSuppliersNotDefined=Tedarikçiler için ana muhasebe hesabı kurulumda tanımlı değil
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Muhasebe hesabına bağlı değil
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO="Bağlama yapılacaklar" sayfasının sıralama işlemini en son öğelerden başlatın
 ACCOUNTING_LIST_SORT_VENTILATION_DONE="Bağlama yapılanlar" sayfasının sıralama işlemini en son öğelerden başlatın
 
@@ -198,7 +199,8 @@ Docdate=Tarih
 Docref=Referans
 LabelAccount=Hesap etiketi
 LabelOperation=Label operation
-Sens=Sens (borsa haberleri yayınlama günlüğü)
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Günlük
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Parça sayısı
 TransactionNumShort=Num. transaction
 AccountingCategory=Kişiselleştirilmiş gruplar
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=Önceden tanımlanmış gruplar tarafından
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Hesap grubu
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Otomatik Olarak Bağla
 AutomaticBindingDone=Otomatik bağlama bitti
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Büyük defterde henüz muhasebeleştirilmemiş
 ShowTutorial=Show Tutorial
 NotReconciled=Uzlaştırılmadı
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index fc4430e87ca..cb583b2f55d 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Ekran
 SetupArea=Ayarlar
 UploadNewTemplate=Yeni şablon(lar) yükleyin
 FormToTestFileUploadForm=Dosya yükleme deneme formu (ayarlara göre)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Not: yalnızca <b>%s</b> modülü etkinleştirildiğinde evet etkilidir.
 RemoveLock=<b>%s</b> dosyası mevcutsa, Güncelleme/Yükleme aracının kullanımına izin vermek için kaldırın veya yeniden adlandırın.
 RestoreLock=Güncelleme/Yükleme aracının daha sonraki kullanımlarına engel olmak için <b>%s</b> dosyasını, sadece okuma iznine sahip olacak şekilde geri yükleyin.
@@ -85,7 +87,6 @@ ShowPreview=Önizleme göster
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Önizleme yok
 ThemeCurrentlyActive=Geçerli etkin tema
-CurrentTimeZone=PHP Saat Dilimi (sunucu)
 MySQLTimeZone=MySql Saat Dilimi (veritabanı)
 TZHasNoEffect=Tarihler veritabanı sunucusu tarafından gönderilmiş dize gibi saklanır ve getirilir. Saat dilimi yalnızca UNIX_TIMESTAMP işlevi kullanıldığında etkilidir (Dolibarr tarafından kullanılmamalıdır, bu nedenle veri girdikten sonra değiştirilse bile veritabanı TZ'nin bir etkisi olmamalıdır).
 Space=Boşluk
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Bu alan yönetim işlevlerini sunar. İstenilen özelliği s
 Purge=Temizleme
 PurgeAreaDesc=Bu sayfa Dolibarr tarafından oluşturulan veya depolanan tüm dosyaları silmenizi sağlar (<b>%s</b> dizinindeki geçici veya tüm dosyalar). Bu özelliğin kullanılması normalde gerekli değildir. Bu araç, Dolibarr yazılımı web sunucusu tarafından oluşturulan dosyaların silinmesine izin vermeyen bir sağlayıcı tarafından barındırılan kullanıcılar için geçici bir çözüm olarak sunulur.
 PurgeDeleteLogFile=Syslog modülü için tanımlı <b>%s</b> dosyası da dahil olmak üzere günlük dosyalarını sil (veri kaybetme riskiniz yoktur)
-PurgeDeleteTemporaryFiles=Tüm geçici dosyaları sil (veri kaybetme riskiniz yoktur). Not: Geçici dizin eğer 24 saat önce oluşturulmuşsa silme işlemi tamamlanır.
-PurgeDeleteTemporaryFilesShort=Geçici dosyaları sil
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=<b>%s</b> dizinindeki bütün dosyaları sil.<br>Bu işlem, öğelerle (üçüncü partiler, faturalar, v.s.) ilgili oluşturulan tüm dosyaları, ECM modülüne yüklenen dosyaları, veritabanı yedekleme dökümlerini ve geçici dosyaları silecektir.
 PurgeRunNow=Şimdi temizle
 PurgeNothingToDelete=Silinecek dizin ya da dosya yok.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Tercihli Ortaklar
 OtherResources=Diğer kaynaklar
 ExternalResources=Dış Kaynaklar
 SocialNetworks=Sosyal Ağlar
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=Kullanıcıların ve geliştiricilerin belgeleri (Doc, FAQs…), <br>Dolibarr Wiki ye bir göz atın:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Herhangi bir başka soru/yardım için Dolibarr forumunu kullanabilirsiniz:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Burada Dolibar ile ilgili yardım ve destek almak için bazı kaynaklar bulabilirsiniz.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Tanımladığınız mevcut yapılandırma için örnekl
 ListOfDirectories=OpenDocument (AçıkBelge) temaları dizin listesi
 ListOfDirectoriesForModelGenODT=OpenDocument biçimli şablon dosyalarını içeren dizinler listesi.<br><br>Buraya tam yol dizinlerini koyun.<br>Her dizin arasına satır başı ekleyin.<br>GED modülü dizinini eklemek için buraya ekleyin<b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>O dizinlerdeki dosyaların bitiş şekli böyle omalıdır <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Bu dizinlerde bulunana ODT/ODS şablon dosyalarının sayısı 
-ExampleOfDirectoriesForModelGen=Sözdizimi örnekleri:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Odt belge şablonlarının nasıl oluşturulacağını öğrenmek için o dizinlere kaydetmeden önce, wiki belgelerini okuyun:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Ad/Soyad konumu
@@ -406,7 +408,7 @@ UrlGenerationParameters=URL güvenliği için parametreler
 SecurityTokenIsUnique=Her URL için benzersiz bir güvenlik anahtarı kullan
 EnterRefToBuildUrl=Nesen %s için hata referansı
 GetSecuredUrl=Hesaplanan URL al
-ButtonHideUnauthorized=Yönetici olmayan kullanıcıların yetkisiz eylemlerinin önüne geçmek için, butonları gri ve engellenmiş olarak göstermek yerine tamamen gizle.
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Eski KDV oranı
 NewVATRates=Yeni KDV oranı
 PriceBaseTypeToChange=Buna göre tanımlanan temel referans değerli fiyatları değiştir
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Özelleştirilmiş menüler bir üst menüye bağlant
 NewMenu=Yeni menü
 MenuHandler=Menü işleyicisi
 MenuModule=Kaynak modül
-HideUnauthorizedMenu= Yetkisiz menüleri gizle (gri)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Kimlik menüsü
 DetailMenuHandler=Yeni menü göstermek için menü işleyicisi
 DetailMenuModule=Eğer menü girişi bir modülden geliyorsa modül adı
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Şimdi topla
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=En son sonuç
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Posta Kodu
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Otomatik ECM ağacını göster
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/tr_TR/banks.lang b/htdocs/langs/tr_TR/banks.lang
index 00371009950..baae642393d 100644
--- a/htdocs/langs/tr_TR/banks.lang
+++ b/htdocs/langs/tr_TR/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA yetkisi
 YourSEPAMandate=SEPA yetkiniz
 FindYourSEPAMandate=Bu, firmamızın bankanıza otomatik ödeme talimatı verebilme yetkisi için SEPA yetkinizdir. İmzalayarak iade edin (imzalı belgeyi tarayarak) veya e-mail ile gönderin
 AutoReportLastAccountStatement=Uzlaşma yaparken 'banka hesap özeti numarasını' en son hesap özeti numarası ile otomatik olarak doldur
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Hareketleri renklendir
 BankColorizeMovementDesc=Bu işlev etkinleştirilirse, borçlandırma veya kredi hareketleri için belirli bir arka plan rengi seçebilirsiniz
 BankColorizeMovementName1=Borç hareketi için arka plan rengi
diff --git a/htdocs/langs/tr_TR/blockedlog.lang b/htdocs/langs/tr_TR/blockedlog.lang
index 072bf60a6d8..14db1cc265b 100644
--- a/htdocs/langs/tr_TR/blockedlog.lang
+++ b/htdocs/langs/tr_TR/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Müşteri faturası indir
 BlockedLogBillPreview=Müşteri faturası önizlemesi
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/tr_TR/boxes.lang b/htdocs/langs/tr_TR/boxes.lang
index f374d3c9080..86d42f8536e 100644
--- a/htdocs/langs/tr_TR/boxes.lang
+++ b/htdocs/langs/tr_TR/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Değiştirilen son %s bağış
 BoxTitleLastModifiedExpenses=Değiştirilen son %s gider raporu
 BoxTitleLatestModifiedBoms=Değiştirilen son %s BOM
 BoxTitleLatestModifiedMos=Değiştirilen son %s Üretim Siparişleri
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Genel etkinlik (faturalar, teklifler, siparişler)
 BoxGoodCustomers=İyi müşteriler
 BoxTitleGoodCustomers=%s İyi müşteri
+BoxScheduledJobs=Planlı İşler
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=RSS akışı yenilenemedi. Son başarılı yenileme tarihi: %s
 LastRefreshDate=Son yenileme tarihi
 NoRecordedBookmarks=Tanımlanmış yerimi yok.
@@ -83,8 +86,8 @@ BoxTitleLatestModifiedSupplierOrders=Tedarikçi Siparişleri: değiştirilen son
 BoxTitleLastModifiedCustomerBills=Müşteri Faturaları: değiştirilen son %s
 BoxTitleLastModifiedCustomerOrders=Müşteri Siparişleri: son değiştirilen %s
 BoxTitleLastModifiedPropals=Değiştirilen son %s teklif
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=En son %s değiştirilmiş iş
+BoxTitleLatestModifiedCandidatures=En son %s değiştirilmiş aday
 ForCustomersInvoices=Müşteri faturaları
 ForCustomersOrders=Müşteri siparişleri
 ForProposals=Teklifler
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Askı hesabı tanımlanmamış
 BoxLastCustomerShipments=Son müşteri gönderileri
 BoxTitleLastCustomerShipments=Son %s müşteri gönderileri
 NoRecordedShipments=Kayıtlı müşteri gönderimi yok
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Muhasebe
+ValidatedProjects=Doğrulanmış projeler
diff --git a/htdocs/langs/tr_TR/cashdesk.lang b/htdocs/langs/tr_TR/cashdesk.lang
index 1c52f025daf..f9c0a22ebd4 100644
--- a/htdocs/langs/tr_TR/cashdesk.lang
+++ b/htdocs/langs/tr_TR/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Teorik tutar
 RealAmount=Gerçek tutar
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Fatura sayısı
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/tr_TR/categories.lang b/htdocs/langs/tr_TR/categories.lang
index 94a510df93f..5369ebbec99 100644
--- a/htdocs/langs/tr_TR/categories.lang
+++ b/htdocs/langs/tr_TR/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Proje etiket/kategori alanı
 UsersCategoriesArea=Kullanıcı Etiketleri/Kategorileri Alanı
 SubCats=Alt kategoriler
 CatList= Etiketler/kategoriler listesi
+CatListAll=List of tags/categories (all types)
 NewCategory=Yeni etiket/kategori
 ModifCat=Etiket/kategori değiştir
 CatCreated=Etiket/kategori oluşturuldu
@@ -65,16 +66,22 @@ UsersCategoriesShort=Kullanıcı etiketleri/kategorileri
 StockCategoriesShort=Depo etiketleri / kategorileri
 ThisCategoryHasNoItems=Bu kategori herhangi bir öğe içermiyor.
 CategId=Etiket/kategori kimliği
-CatSupList=Tedarikçi etiketleri/kategorileri listesi
-CatCusList=Müşteri/beklenti etiketleri/kategorileri listesi
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Ürün etiketleri/kategorileri listesi
 CatMemberList=Üye etiketleri/kategorileri listesi
-CatContactList=Kişi etiketleri/kategorileri listesi
-CatSupLinks=Tedarikçiler ve etiketler/kategoriler arasındaki bağlantılar
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Müşteriler/beklentiler ve etiketler/kategoriler arasındaki bağlantılar
 CatContactsLinks=Kişiler/adresler ve etiketler/kategoriler arasındaki bağlantılar
 CatProdLinks=Ürünler/hizmetler ve etiketler/kategoriler arasındaki bağlantılar
-CatProJectLinks=Projeler ve etiketler/kategoriler arasındaki bağlantılar
+CatMembersLinks=Üyeler ve etiketler/kategoriler arasındaki bağlantılar
+CatProjectsLinks=Projeler ve etiketler/kategoriler arasındaki bağlantılar
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Etiketlerden/kategorilerden kaldır
 ExtraFieldsCategories=Tamamlayıcı öznitelikler
 CategoriesSetup=Etiket/kategori ayarları
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index 1a0b08308e6..b27fea49898 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Avrupa Komisyonu web sitesinden topluluk içi Vergi Nu
 VATIntraManualCheck=Avrupa Komisyonu'nun <a href="%s" target="_blank">%s</a> web adresinden de manuel olarak kontrol edebilirsiniz
 ErrorVATCheckMS_UNAVAILABLE=Denetlemiyor. Denetim hizmeti üye ülke (%s) tarafından sağlanmıyor.
 NorProspectNorCustomer=Ne aday ne de müşteri
-JuridicalStatus=Tüzel Kişilik Türü
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Çalışan sayısı
 ProspectLevelShort=Potansiyel
diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang
index 2623f2bdb57..5889d98d6bd 100644
--- a/htdocs/langs/tr_TR/compta.lang
+++ b/htdocs/langs/tr_TR/compta.lang
@@ -111,7 +111,7 @@ Refund=İade
 SocialContributionsPayments=Sosyal/mali vergi ödemeleri
 ShowVatPayment=KDV ödemesi göster
 TotalToPay=Ödenecek toplam
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Müşteri muhasebe kodu
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Müşt. hesap kodu
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Bu sosyal/mali vergiyi silmek istediğinizden em
 ExportDataset_tax_1=Sosyal ve mali vergiler ve ödemeleri
 CalcModeVATDebt=Mod <b>%sKDV, taahhüt hesabı%s için</b>.
 CalcModeVATEngagement=Mod <b>%sKDV, gelirler-giderler%s için</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Henüz kayıtlı hesapta olmasa bile, bilinen kayıtlı ödemelerin analizi.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Müşteri faturaları için mod <b>%sRE tedrikçi faturaları için mod %s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Gelir ve gider bilançosu, yıllık özet
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=Henüz kayıtlı defterde yer almamış olsalar bile, bilinen kayıtlı faturalara dayalı bir hesaplama için  %s analizinin %s faturasına bakın.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Gösterilen tutarlara tüm vergiler dahildir
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- Faturalarda, giderlerde, KDV inde ve maaşlarda yapılan gerçek ödemeleri içerir. <br>- Faturaların, giderleri, KDV nin ve maaşların ödeme tarihleri baz alınır. Bağışlar için bağış tarihi.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Peşinat faturaları dahil değildir
 DepositsAreIncluded=- Peşinat faturaları dahildir
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=RE Üçüncü partiye göre rapor
 LT2ReportByCustomersES=Üçüncü parti IRPF Raporu
 VATReport=Satış vergisi raporu
 VATReportByPeriods=Döneme göre satış vergisi raporu
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Oranlara göre satış vergisi raporu
 VATReportByThirdParties=Üçüncü taraflara göre satış vergisi raporu
 VATReportByCustomers=Müşteriye göre satış vergisi raporu
diff --git a/htdocs/langs/tr_TR/cron.lang b/htdocs/langs/tr_TR/cron.lang
index 34939dd94f3..3c20bddb891 100644
--- a/htdocs/langs/tr_TR/cron.lang
+++ b/htdocs/langs/tr_TR/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Planlı iş sil
 Permission23104 = Planlı iş yürüt
 # Admin
 CronSetup=Planlı iş yönetimi ayarları
-URLToLaunchCronJobs=Nitelikli cron işlerini kontrol etmek ve başlatmak için URL
-OrToLaunchASpecificJob=Ya da özel bir işi denetlemek ve başlatmak için
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Cron işlerini başlatacak URL için güvenlik anahtarı
 FileToLaunchCronJobs=Nitelikli cron işlerini kontrol etmek ve başlatmak için komut satırı
 CronExplainHowToRunUnix=Unix ortamında komut satırını her 5 dakikada bir çalıştırmak için kron sekmesi girişini kullanmalısınız
 CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Sınıf %s hiçbir %s yöntemi içermiyor
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=Önceden tanımlanmış cron görevi profillerinin listesi
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Number of launches
 CronMaxRun=Maximum number of launches
 CronEach=Her
 JobFinished=İş başlatıldı ve bitirildi
+Scheduled=Scheduled
 #Page card
 CronAdd= İş ekle
 CronEvery=İş yürütme zamanı
@@ -56,7 +58,7 @@ CronNote=Yorum
 CronFieldMandatory=%s alanı zorunludur
 CronErrEndDateStartDt=Bitiş tarihi başlama tarihinden önce olamaz
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Etkin
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Engelle
 CronTaskInactive=Bu iş devre dışı
 CronId=Kimlik
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Kabuk komutu
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Planlı işleri görmek ve düzenlemek için "Giriş - Yönetici Araçları - Planlı İşler" menüsüne git.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=İş engellendi
 MakeLocalDatabaseDumpShort=Yerel veritabanı yedeklemesi
 MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Dikkat: Performans amaçlı olarak etkinleştirilmiş işlerin bir sonraki yürütme tarihi ne olursa olsun, işleriniz çalıştırılmadan önce maksimum %s saat ertelenebilir.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index 8753b1ee175..8cc4092af00 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Hata yok, taahüt ediyoruz
 # Errors
 ErrorButCommitIsDone=Hatalar bulundu, buna rağmen doğruluyoruz
 ErrorBadEMail=%s e-postası hatalı
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=URL %s yanlış
 ErrorBadValueForParamNotAString=Parametreniz için hatalı değer. Genellikle çeviri eksik olduğunda eklenir.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=%s kullanıcı adı zaten var.
 ErrorGroupAlreadyExists=%s Grubu zaten var.
 ErrorRecordNotFound=Kayıt bulunamadı.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Bazı gerekli alanlar doldurulmamış.
 ErrorSubjectIsRequired=E-posta konusu zorunludur
 ErrorFailedToCreateDir=Dizin oluşturulamadı. Web sunucusu kullanıcısının Dolibarr belgeleri dizinine yazma izinlerini denetleyin. Eğer bu parametre <b>guvenli_mod</b> bu PHP üzerinde etkinleştirilmişse, Dolibarr php dosyalarının web sunucusu kullanıcısına (ya da grubuna) sahip olduğunu denetleyin.
 ErrorNoMailDefinedForThisUser=Bu kullanıcı için tanımlı posta yok
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Bu özelliğin çalışması için JavaScriptin etkinleştirilmesi gerekir. Bunu Kurulum - Ekran menüsünden değiştirebilirsiniz.
 ErrorTopMenuMustHaveAParentWithId0='Üst' menü tipi menünün bir ana menüsü olamaz. Ana menüye 0 koyun ya da 'Sol' menü türünü seçin.
 ErrorLeftMenuMustHaveAParentId='Sol' tipli bir menünün bir üst tanımı olmalıdır.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Bu profil adı, bu dışa aktarma grubu için zaten m
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP eşleşmesi tamamlanmamış.
 ErrorLDAPMakeManualTest=A. Ldif dosyası %s dizininde oluşturuldu. Hatalar hakkında daha fazla bilgi almak için komut satırından elle yüklemeyi deneyin.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Oluşturulması için kullanılan referans zaten var.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Kayıt bazı alt kayıtlar içerdiği için silinemedi
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=Dosya bulunamadı. Paylaşım anahtarı değiştirilmiş veya dosya yakın bir zamanda kaldırılmış olabilir.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP'nizdeki upload_max_filesize (%s) parametresi, post_max_size (%s) PHP parametresinden daha yüksek. Bu tutarlı bir kurulum değil.
 WarningPasswordSetWithNoAccount=Bu üye için bir parola ayarlıdır. Ancak, hiçbir kullanıcı hesabı oluşturulmamıştır. Yani bu şifre saklanır ama Dolibarr'a giriş için kullanılamaz. Dış bir modül/arayüz tarafından kullanılıyor olabilir, ama bir üye için ne bir kullanıcı adı ne de parola tanımlamanız gerekmiyorsa "Her üye için bir kullanıcı adı yönet" seçeneğini devre dışı bırakabilirsiniz. Bir kullanıcı adı yönetmeniz gerekiyorsa ama herhangi bir parolaya gereksinim duymuyorsanız bu uyarıyı engellemek için bu alanı boş bırakabilirsiniz. Not: Eğer bir üye bir kullanıcıya bağlıysa kullanıcı adı olarak e-posta adresi de kullanılabilir.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Kullanıcı adınız değiştirilmiştir.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/tr_TR/exports.lang b/htdocs/langs/tr_TR/exports.lang
index 3818365af40..a909d78355e 100644
--- a/htdocs/langs/tr_TR/exports.lang
+++ b/htdocs/langs/tr_TR/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Alan başlğı
 NowClickToGenerateToBuildExportFile=Şimdi açılan kutudan dosya biçimini seçin ve dışa aktarma dosyasını oluşturmak için "Oluştur" linkine tıklayın...
 AvailableFormats=Mevcut Formatlar
 LibraryShort=Kitaplık
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Adım
 FormatedImport=İçe Aktarma Yardımcısı
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Eklenen satır sayısı: %s
 NbUpdate=Güncellenmiş satır sayısı: %s
 MultipleRecordFoundWithTheseFilters=Bu filtrelerle birden çok kayıt bulundu: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang
index 85fe5c91d72..fd55d217c3a 100644
--- a/htdocs/langs/tr_TR/mails.lang
+++ b/htdocs/langs/tr_TR/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Kullanıcı tarafından girilen e-postalar
 MailingModuleDescDolibarrUsers=E-postaları olan kullanıcılar
 MailingModuleDescThirdPartiesByCategories=Üçüncü taraflar (kategorilere göre)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Satır %s dosyası
@@ -125,12 +126,13 @@ TagMailtoEmail=Alıcı E-posta Adresi ("kime:" html linkini içeren)
 NoEmailSentBadSenderOrRecipientEmail=Gönderilen e-posta yok. Hatalı gönderici ya da alıcı epostası. Kullanıcı profilini doğrula.
 # Module Notifications
 Notifications=Bildirimler
-NoNotificationsWillBeSent=Bu etkinlik ve firma için hiçbir e-posta bildirimi planlanmamış
-ANotificationsWillBeSent=E-posta ile 1 bildirim gönderilecektir
-SomeNotificationsWillBeSent=%s bildirim e-posta ile gönderilecektir
-AddNewNotification=Yeni bir e-posta bildirim hedefi/etkinliği oluştur
-ListOfActiveNotifications=E-posta bildirimi için aktif olan hedef/etkinlik listesi
-ListOfNotificationsDone=Gönderilen tüm e-posta bildirimleri listesi
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=E-posta gönderme yapılandırması '%s'ye ayarlandı. Bu mod toplu e-postalama için kullanılamaz.
 MailSendSetupIs2='%s' Modunu kullanmak için <strong>'%s'</strong> parametresini değiştirecekseniz, önce yönetici hesabı ile %sGiriş - Ayarlar - E-postalar%s menüsüne gitmelisiniz. Bu mod ile İnternet Servis Sağlayıcınız tarafından sağlanan SMTP sunucusu ayarlarını girebilir ve Toplu e-posta özelliğini kullanabilirsiniz.
 MailSendSetupIs3=SMTP sunucusunun nasıl yapılandırılacağı konusunda sorunuz varsa, %s e sorabilirsiniz.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Alıcılar (gelişmiş seçim)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Tam sayı veya kayan değer seçmek için aralık kullanın
 AdvTgtMinVal=En düşük değer
 AdvTgtMaxVal=En yüksek değer
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Süzgeç oluştur
 AdvTgtOrCreateNewFilter=Yeni süzgeç adı
 NoContactWithCategoryFound=Kategorisi olan hiç bir kişi/adres bulunamadı
 NoContactLinkedToThirdpartieWithCategoryFound=Kategorisi olan hiç bir kişi/adres bulunamadı
-OutGoingEmailSetup=Giden e-posta kurulumu
-InGoingEmailSetup=Gelen e-posta kurulumu
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Varsayılan giden e-posta kurulumu
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Bilgi
 ContactsWithThirdpartyFilter=Üçüncü parti filtreli kişiler
 Unanswered=Unanswered
 Answered=Cevaplandı
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index ecc538bf1dc..ff53f4a6141 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Bu e-posta türü için mevcut şablon yok
 AvailableVariables=Mevcut yedek değişkenler
 NoTranslation=Çeviri yok
 Translation=Çeviri
+CurrentTimeZone=PHP Saat Dilimi (sunucu)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Kayıt bulunamadı
 NoRecordDeleted=Hiç kayıt silinmedi
 NotEnoughDataYet=Yeterli bilgi yok
@@ -85,6 +87,8 @@ FileWasNotUploaded=Bu ekleme için bir dosya seçildi ama henüz gönderilmedi.
 NbOfEntries=Kayıt sayısı
 GoToWikiHelpPage=Çevrimiçi yardım oku (Internet erişimi gerekir)
 GoToHelpPage=Yardım oku
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Ana Sayfa
 RecordSaved=Kayıt kaydedildi
 RecordDeleted=Kayıt silindi
 RecordGenerated=Kayıt oluşturuldu
@@ -433,6 +437,7 @@ RemainToPay=Kalan ödeme
 Module=Modül/Uygulama
 Modules=Modüller/Uygulamalar
 Option=Seçenek
+Filters=Filters
 List=Liste
 FullList=Tüm liste
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=E-posta gönder
 Email=E-posta
 NoEMail=E-posta yok
 AlreadyRead=Zaten okundu
-NotRead=Okunmayan
+NotRead=Okunmamış
 NoMobilePhone=Cep telefonu yok
 Owner=Sahibi
 FollowingConstantsWillBeSubstituted=Aşağıdaki değişmezler uygun değerlerin yerine konacaktır
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=Beklemede
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/tr_TR/modulebuilder.lang b/htdocs/langs/tr_TR/modulebuilder.lang
index 93b4879a0d0..c80a020642b 100644
--- a/htdocs/langs/tr_TR/modulebuilder.lang
+++ b/htdocs/langs/tr_TR/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=Bir kaydı oluşturmak/düzenlemek/görüntülemek için P
 PageForAgendaTab=Etkinlik sekmesi için PHP sayfası
 PageForDocumentTab=Belge sekmesi için PHP sayfası
 PageForNoteTab=Not sekmesi için PHP sayfası
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Modül/uygulama dökümantasyon dosyasına yol (%s)
 SpaceOrSpecialCharAreNotAllowed=Boşluklara veya özel karakterlere izin verilmez.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Taranan dizin
 NoTrigger=No trigger
 NoWidget=Ekran etiketi yok
-GoToApiExplorer=API gezginine git
+GoToApiExplorer=API explorer
 ListOfMenusEntries=Menü kayıtlarının listesi
 ListOfDictionariesEntries=Sözlük girişlerinin listesi
 ListOfPermissionsDefined=Tanımlanan izinlerin listesi
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Eğer SQL ve PHP hakkında bilginiz varsa, yerel modül
 SeeTopRightMenu=Sağ üst menüde yer alan <span class="fa fa-bug"></span> simgesine bakın
 AddLanguageFile=Dil dosyası ekle
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Boşsa tabloyu sil)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=%s tablosu mevcut değil
 TableDropped=%s tablosu silindi
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Spesifik bir editör URL'si kullanın
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Spesifik bir yazar kullanın
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=Önce modül/uygulama etkinleştirilmelidir
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=Nesneden bazı belgeler oluşturmak istiyorum
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang
index 1ac66fd963c..3b32b32bc93 100644
--- a/htdocs/langs/tr_TR/other.lang
+++ b/htdocs/langs/tr_TR/other.lang
@@ -5,8 +5,6 @@ Tools=Araçlar
 TMenuTools=Araçlar
 ToolsDesc=Diğer menü girişlerinde bulunmayan tüm araçlar burada gruplandırılmıştır.<br>Tüm araçlara sol menüden erişilebilir.
 Birthday=Doğumgünü
-BirthdayDate=Doğumgünü tarihi
-DateToBirth=Doğum günü
 BirthdayAlertOn=doğum günü uyarısı etkin
 BirthdayAlertOff=doğumgünü uyarısı etkin değil
 TransKey=TransKey anahtarının çevirisi
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Fatura tarihinden önceki ay (sayı 1-12)
 TextPreviousMonthOfInvoice=Fatura tarihinden önceki ay (metin)
 NextMonthOfInvoice=Fatura tarihinden sonraki ay (sayı 1-12)
 TextNextMonthOfInvoice=Fatura tarihinden sonraki ay (metin)
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip dosyası <b>%s</b> içinde oluşturuldu.
 DocFileGeneratedInto=Doc dosyası <b>%s</b> içinde oluşturuldu.
 JumpToLogin=Bağlantı kesildi. Giriş sayfasına git...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\n__REF__ referans numaralı sevk
 PredefinedMailContentSendFichInter=__(Hello)__\n\n__REF__ referans numaralı müdahaleyi ekte bulabilirsiniz\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Ödemeniz yapılmadıysa ödemenizi yapmak için aşağıdaki bağlantıyı tıklayabilirsiniz.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr, çeşitli iş modüllerini destekleyen kompakt bir ERP/CRM çözümüdür. Tüm modüllerin sergilendiği bir demonun mantığı yoktur, çünkü böyle bir senaryo asla gerçekleşmez (birkaç yüz adet mevcut). Bu nedenle birkaç demo profili vardır.
 ChooseYourDemoProfil=İşlemlerinize uyan demo profilini seçin...
 ChooseYourDemoProfilMore=...veya kendi profilinizi oluşturun<br>(manuel modül seçimi)
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Dışa aktarma alanı
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index a5c62b2b2d2..8474ac1176c 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Ürün/hizmet başına çoklu fiyat segmenti (her müşteri bir fiyat segmentinde)
 MultiPricesNumPrices=Fiyat sayısı
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Ana paket ürünü sayısı
@@ -167,8 +168,10 @@ BuyingPrices=Alış fiyatları
 CustomerPrices=Müşteri fiyatları
 SuppliersPrices=Tedarikçi fiyatları
 SuppliersPricesOfProductsOrServices=Tedarikçi fiyatları (ürün veya hizmetlerin)
-CustomCode=G.T.İ.P Numarası
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Menşei ülke
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Sabit fiyatı kullan
 PriceByQuantity=Miktara göre değişen fiyatlar
 DisablePriceByQty=Fiyatları miktara göre devre dışı bırak
 PriceByQuantityRange=Miktar aralığı
-MultipriceRules=Fiyat seviyesi kuralları
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=İlk segmente göre diğer tüm segmentlerin fiyatlarını otomatik olarak hesaplamak için fiyat segmenti kurallarını (ürün modülü kurulumunda tanımlanan) kullan
 PercentVariationOver=%s üzerindeki %% değişim
 PercentDiscountOver=%s üzerindeki %% indirim
diff --git a/htdocs/langs/tr_TR/recruitment.lang b/htdocs/langs/tr_TR/recruitment.lang
index 7d2ea6182f2..caede8f42a0 100644
--- a/htdocs/langs/tr_TR/recruitment.lang
+++ b/htdocs/langs/tr_TR/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/tr_TR/sendings.lang b/htdocs/langs/tr_TR/sendings.lang
index a56954de001..cdbc562d1ac 100644
--- a/htdocs/langs/tr_TR/sendings.lang
+++ b/htdocs/langs/tr_TR/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Bu sipariş için diğer sevkiyatlar
 SendingsAndReceivingForSameOrder=Bu sipariş için gönderiler ve makbuzlar
 SendingsToValidate=Doğrulanacak sevkiyatlar
 StatusSendingCanceled=İptal edildi
+StatusSendingCanceledShort=İptal edildi
 StatusSendingDraft=Taslak
 StatusSendingValidated=Doğrulanmış (sevkedilecek ürünler veya halihazırda sevkedilmişler)
 StatusSendingProcessed=İşlenmiş
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Sevkiyatları yapabilmek için önce siparişi
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Teslimat makbuzları için daha fazla eksiksiz doküman modeli (logo. ..)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER değişmezi tanımlanmamış
 SumOfProductVolumes=Ürün hacimleri toplamı
 SumOfProductWeights=Ürün ağırlıkları toplamı
diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang
index be4eb25d528..0c5e145043e 100644
--- a/htdocs/langs/tr_TR/stocks.lang
+++ b/htdocs/langs/tr_TR/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/tr_TR/ticket.lang b/htdocs/langs/tr_TR/ticket.lang
index 55746ab9f31..86bfb2ce139 100644
--- a/htdocs/langs/tr_TR/ticket.lang
+++ b/htdocs/langs/tr_TR/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Destek Bildirimi - Türler
 TicketDictCategory=Destek Bildirimi - Gruplar
 TicketDictSeverity=Destek Bildirimi - Önemler
 TicketDictResolution=Destek Bildirimi - Çözüm
-TicketTypeShortBUGSOFT=Yazılım arızası
-TicketTypeShortBUGHARD=Donanım arızası
-TicketTypeShortCOM=Ticari soru
 
+TicketTypeShortCOM=Ticari soru
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Diğer
 TicketSeverityShortLOW=Düşük
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Yüksek
-TicketSeverityShortBLOCKING=Kritik/Engelleyici
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress='%s' alanı hatalı
 MenuTicketMyAssign=Destek bildirimlerim
@@ -60,7 +58,6 @@ OriginEmail=E-posta kaynağı
 Notify_TICKET_SENTBYMAIL=Destek bildirimini e-posta ile gönderil
 
 # Status
-NotRead=Okunmayan
 Read=Okundu
 Assigned=Atanan
 InProgress=Devam etmekte
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Genel arayüz, ziyaretçilerin destek bildiri
 TicketsAutoAssignTicket=Destek bildirimini oluşturan kullanıcıyı otomatik olarak atayın
 TicketsAutoAssignTicketHelp=Bir destek bildirimi oluştururken, kullanıcı otomatik olarak destek bildirimine atanabilir.
 TicketNumberingModules=Destek bildirimi numaralandırma modülü
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Oluşturunca üçüncü tarafa bildir
 TicketsDisableCustomerEmail=Bir destek bildirimi ortak arayüzden oluşturulduğunda e-postaları her zaman devre dışı bırak
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Okunmamış
 TicketNotCreatedFromPublicInterface=Mevcut değil. Destek bildirimi genel arayüzden oluşturulmadı.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Destek bildirimi referans adı gerekli
 
 #
diff --git a/htdocs/langs/tr_TR/website.lang b/htdocs/langs/tr_TR/website.lang
index 65378d92d62..38b93f9cc3a 100644
--- a/htdocs/langs/tr_TR/website.lang
+++ b/htdocs/langs/tr_TR/website.lang
@@ -30,7 +30,6 @@ EditInLine=Satır içi düzenle
 AddWebsite=Web sitesi ekle
 Webpage=Web sayfası/kapsayıcı
 AddPage=Sayfa/kapsayıcı ekle
-HomePage=Ana Sayfa
 PageContainer=Sayfa
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=İstenen %s kimlik numaralı sayfa henüz bir içeriğe sahip değil, önbellek dosyası .tpl.php kaldırıldı. Bu sorunu çözmek için sayfa içeriğini düzenleyin.
@@ -101,7 +100,7 @@ EmptyPage=Boş sayfa
 ExternalURLMustStartWithHttp=Harici URL http:// veya https:// ile başlamalıdır
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Dinamik içeriği dahil et
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Sayfanın iç URL'si
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=Bu sayfa/kapsayıcı'nın çevirisi mevcut
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/tr_TR/withdrawals.lang b/htdocs/langs/tr_TR/withdrawals.lang
index 04b9a4a8498..9d5d4140075 100644
--- a/htdocs/langs/tr_TR/withdrawals.lang
+++ b/htdocs/langs/tr_TR/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Otomatik ödeme talebi oluşturun
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Üçüncü parti banka kodu
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Alacak olarak sınıflandır
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Otomatik ödeme dosyası oluşturun
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Merhaba, <br> <br> fatura %s, ait olduğu firma %s, tutarı %s olan otomatik ödeme talimatı banka tarafından reddedilmiştir.  <br> - <br> -- <br> %s
 ModeWarning=Gerçek mod için seçenek ayarlanmamış, bu simülasyondan sonra durdururuz
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
index f99b2780e48..a4b4a1f90cb 100644
--- a/htdocs/langs/uk_UA/accountancy.lang
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index d04882db68a..778d6d5ee2c 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Зовнішній вигляд
 SetupArea=Налаштування
 UploadNewTemplate=Завантажити новий шаблон(и)
 FormToTestFileUploadForm=Форма для тестування завантаження файлу (відповідно до налаштування)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Примітка: так діє, лише якщо модуль <b> %s </b> увімкнено
 RemoveLock=Видаліть або перейменуйте файл <b> %s </b>, якщо він існує, щоб дозволити використання інструменту "Оновити / Встановити".
 RestoreLock=Відновіть файл <b> %s </b>, лише з дозволом для читання, щоб відключити подальше використання інструменту "Оновити / Встановити".
@@ -85,7 +87,6 @@ ShowPreview=Показати попередній перегляд
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Попередній перегляд недоступний
 ThemeCurrentlyActive=Тема наразі активна
-CurrentTimeZone=PHP TimeZone (сервер)
 MySQLTimeZone=TimeZone MySql (база даних)
 TZHasNoEffect=Дати зберігаються та повертаються сервером баз даних так, ніби вони зберігаються як подані рядки. Часовий пояс діє лише при використанні функції UNIX_TIMESTAMP (яку не використовує Dolibarr, тому часовий пояс бази даних не повинен мати ніякого ефекту, навіть якщо він був змінений після введення даних).
 Space=Простір
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Ця область забезпечує функції ад
 Purge=Чистка
 PurgeAreaDesc=Ця сторінка дозволяє видалити всі файли, що були створені або зберігаються Dolibarr (тимчасові файли або всі файли в каталозі <b> %s </b>). Використовувати цю функцію зазвичай не потрібно. Вона надається як рішення для користувачів, у яких Dolibarr розміщений у провайдера, що не надає дозволу на видалення файлів, створених веб-сервером.
 PurgeDeleteLogFile=Видалення файлів журналів, включаючи <b> %s </b>, визначених для модуля Syslog (немає ризику втрати даних)
-PurgeDeleteTemporaryFiles=Видаліть усі тимчасові файли (без ризику втрати даних). Примітка: Видалення робиться лише в тому випадку, якщо тимчасовий каталог був створений 24 години тому.
-PurgeDeleteTemporaryFilesShort=Видалення тимчасових файлів
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Видалить усі файли в каталозі: <b> %s </b>. <br> Це видалить усі згенеровані документи, пов'язані з елементами (контрагенти, рахунки тощо), файли, завантажені в модуль ECM, резервні копії бази даних та тимчасові файли.
 PurgeRunNow=Очистити зараз
 PurgeNothingToDelete=Немає каталогів або файлів для видалення.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Партнери
 OtherResources=Інші ресурси
 ExternalResources=Додаткові ресурси
 SocialNetworks=Соціальні мережі
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=Для перегляду довідки користувача або документації розробника (Doc, FAQ...), <br> перейдіть на Dolibarr Wiki: <br> <b> <a href="%s" target="_blank"> %s </a> </b>
 ForAnswersSeeForum=Для будь-яких інших питань/допомоги ви можете скористатися форумом Dolibarr: <br> <b> <a href="%s" target="_blank"> %s </a> </b>
 HelpCenterDesc1=Ось деякі ресурси для отримання допомоги та підтримки з Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Приклади з поточною конфігура
 ListOfDirectories=Список каталогів шаблонів OpenDocument
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Кількість файлів шаблонів ODT/ODS, знайдених у цих каталогах
-ExampleOfDirectoriesForModelGen=Приклади синтаксису:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed= <br> Щоб дізнатися, як створити шаблони odt-документів, перш ніж зберігати їх у цих каталогах, прочитайте документацію на wiki:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Розміщення імені та прізвища
@@ -406,7 +408,7 @@ UrlGenerationParameters=Параметри безпеки URL
 SecurityTokenIsUnique=Використовувати унікальний ключ безпеки для кожної URL-адреси
 EnterRefToBuildUrl=Введіть характеристику для об'єкта %s
 GetSecuredUrl=Отримати обчислену URL-адресу
-ButtonHideUnauthorized=Заховати для звичайних користувачів кнопки привілейованих функцій, замість того щоб відображати їх затемненими.
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Старе значення комісії
 NewVATRates=Нове значення комісії
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu handler where to show new menu
 DetailMenuModule=Module name if menu entry come from a module
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/uk_UA/banks.lang b/htdocs/langs/uk_UA/banks.lang
index 676fdcd7500..c7541254c41 100644
--- a/htdocs/langs/uk_UA/banks.lang
+++ b/htdocs/langs/uk_UA/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/uk_UA/blockedlog.lang b/htdocs/langs/uk_UA/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/uk_UA/blockedlog.lang
+++ b/htdocs/langs/uk_UA/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/uk_UA/boxes.lang b/htdocs/langs/uk_UA/boxes.lang
index 187fb5abbfe..7589adeeb95 100644
--- a/htdocs/langs/uk_UA/boxes.lang
+++ b/htdocs/langs/uk_UA/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/uk_UA/cashdesk.lang b/htdocs/langs/uk_UA/cashdesk.lang
index a77e6f6893f..a7372bb3b86 100644
--- a/htdocs/langs/uk_UA/cashdesk.lang
+++ b/htdocs/langs/uk_UA/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=К-ть рахунків-фактур
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/uk_UA/categories.lang b/htdocs/langs/uk_UA/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/uk_UA/categories.lang
+++ b/htdocs/langs/uk_UA/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/uk_UA/companies.lang b/htdocs/langs/uk_UA/companies.lang
index 7bb65732df0..e788c649905 100644
--- a/htdocs/langs/uk_UA/companies.lang
+++ b/htdocs/langs/uk_UA/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang
index f7643379a98..717985b9ddc 100644
--- a/htdocs/langs/uk_UA/compta.lang
+++ b/htdocs/langs/uk_UA/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/uk_UA/cron.lang b/htdocs/langs/uk_UA/cron.lang
index 87dc53e8b69..46c3b30f128 100644
--- a/htdocs/langs/uk_UA/cron.lang
+++ b/htdocs/langs/uk_UA/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Create/update Scheduled job
 Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
-CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+CronSetup=Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -56,16 +58,16 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=Продавець
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Shell command
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
 ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/uk_UA/exports.lang b/htdocs/langs/uk_UA/exports.lang
index 50ef674d821..e075edfbcbe 100644
--- a/htdocs/langs/uk_UA/exports.lang
+++ b/htdocs/langs/uk_UA/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/uk_UA/mails.lang b/htdocs/langs/uk_UA/mails.lang
index 754ce0cee4b..0a8fe1c73ca 100644
--- a/htdocs/langs/uk_UA/mails.lang
+++ b/htdocs/langs/uk_UA/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Оповіщення
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index 2f257767cd7..18a6c5aab6e 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=Немає перекладу
 Translation=Translation
+CurrentTimeZone=PHP TimeZone (сервер)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Записів не знайдено
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/uk_UA/modulebuilder.lang b/htdocs/langs/uk_UA/modulebuilder.lang
index 2ac06ba7f55..7a72508aa33 100644
--- a/htdocs/langs/uk_UA/modulebuilder.lang
+++ b/htdocs/langs/uk_UA/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang
index c6472c143db..b8091218ad9 100644
--- a/htdocs/langs/uk_UA/other.lang
+++ b/htdocs/langs/uk_UA/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index de32e4bd5dc..3f4c3573801 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/uk_UA/recruitment.lang b/htdocs/langs/uk_UA/recruitment.lang
index a160e956958..04e0a8bb779 100644
--- a/htdocs/langs/uk_UA/recruitment.lang
+++ b/htdocs/langs/uk_UA/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/uk_UA/sendings.lang b/htdocs/langs/uk_UA/sendings.lang
index 43fa631631e..364df1eb8c9 100644
--- a/htdocs/langs/uk_UA/sendings.lang
+++ b/htdocs/langs/uk_UA/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Other shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Shipments to validate
 StatusSendingCanceled=Canceled
+StatusSendingCanceledShort=Canceled
 StatusSendingDraft=Проект
 StatusSendingValidated=Validated (products to ship or already shipped)
 StatusSendingProcessed=Оброблений
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/uk_UA/stocks.lang b/htdocs/langs/uk_UA/stocks.lang
index fddb3382b60..3ede617d1cc 100644
--- a/htdocs/langs/uk_UA/stocks.lang
+++ b/htdocs/langs/uk_UA/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/uk_UA/ticket.lang b/htdocs/langs/uk_UA/ticket.lang
index cc7caade32a..aa2c156c056 100644
--- a/htdocs/langs/uk_UA/ticket.lang
+++ b/htdocs/langs/uk_UA/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Заявка-Типи
 TicketDictCategory=Заявка-Групи
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Комерційне питання
 
+TicketTypeShortCOM=Комерційне питання
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Інший
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=Мої заявки
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Не читаються
 Read=Прочитані
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Непрочитані
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/uk_UA/website.lang b/htdocs/langs/uk_UA/website.lang
index ebd59dac2fa..447d9de9a65 100644
--- a/htdocs/langs/uk_UA/website.lang
+++ b/htdocs/langs/uk_UA/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/uk_UA/withdrawals.lang b/htdocs/langs/uk_UA/withdrawals.lang
index 533989bdd30..f419bdff0a5 100644
--- a/htdocs/langs/uk_UA/withdrawals.lang
+++ b/htdocs/langs/uk_UA/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
index 3211a0b62df..33ba4d9fea7 100644
--- a/htdocs/langs/uz_UZ/accountancy.lang
+++ b/htdocs/langs/uz_UZ/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index f1c41a3b62b..189b0b5186a 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=List of OpenDocument templates directories
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Position of Name/Lastname
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu handler where to show new menu
 DetailMenuModule=Module name if menu entry come from a module
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/uz_UZ/banks.lang b/htdocs/langs/uz_UZ/banks.lang
index 9500a5b8b2e..a0dc27f86c4 100644
--- a/htdocs/langs/uz_UZ/banks.lang
+++ b/htdocs/langs/uz_UZ/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/uz_UZ/blockedlog.lang b/htdocs/langs/uz_UZ/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/uz_UZ/blockedlog.lang
+++ b/htdocs/langs/uz_UZ/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/uz_UZ/boxes.lang b/htdocs/langs/uz_UZ/boxes.lang
index d6fd298a3a7..7db4ea8aa17 100644
--- a/htdocs/langs/uz_UZ/boxes.lang
+++ b/htdocs/langs/uz_UZ/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/uz_UZ/cashdesk.lang b/htdocs/langs/uz_UZ/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/uz_UZ/cashdesk.lang
+++ b/htdocs/langs/uz_UZ/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/uz_UZ/categories.lang b/htdocs/langs/uz_UZ/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/uz_UZ/categories.lang
+++ b/htdocs/langs/uz_UZ/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/uz_UZ/companies.lang b/htdocs/langs/uz_UZ/companies.lang
index dadff6a7894..8dc815b522e 100644
--- a/htdocs/langs/uz_UZ/companies.lang
+++ b/htdocs/langs/uz_UZ/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/uz_UZ/compta.lang
+++ b/htdocs/langs/uz_UZ/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/uz_UZ/cron.lang b/htdocs/langs/uz_UZ/cron.lang
index d2da7ded67e..2ebdda1e685 100644
--- a/htdocs/langs/uz_UZ/cron.lang
+++ b/htdocs/langs/uz_UZ/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Create/update Scheduled job
 Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
-CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+CronSetup=Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -56,16 +58,16 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Shell command
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
 ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/uz_UZ/exports.lang b/htdocs/langs/uz_UZ/exports.lang
index 2dcf4317e00..a0eb7161ef2 100644
--- a/htdocs/langs/uz_UZ/exports.lang
+++ b/htdocs/langs/uz_UZ/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Step
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/uz_UZ/mails.lang b/htdocs/langs/uz_UZ/mails.lang
index 1235eef3b27..7fd93be7b71 100644
--- a/htdocs/langs/uz_UZ/mails.lang
+++ b/htdocs/langs/uz_UZ/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index cc76ba88d89..d1ad00f4463 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/uz_UZ/modulebuilder.lang b/htdocs/langs/uz_UZ/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/uz_UZ/modulebuilder.lang
+++ b/htdocs/langs/uz_UZ/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang
index 54c0572d453..0a7b3723ab1 100644
--- a/htdocs/langs/uz_UZ/other.lang
+++ b/htdocs/langs/uz_UZ/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index 97db059594f..f0c4a5362b8 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/uz_UZ/recruitment.lang b/htdocs/langs/uz_UZ/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/uz_UZ/recruitment.lang
+++ b/htdocs/langs/uz_UZ/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/uz_UZ/sendings.lang b/htdocs/langs/uz_UZ/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/uz_UZ/sendings.lang
+++ b/htdocs/langs/uz_UZ/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Other shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Shipments to validate
 StatusSendingCanceled=Canceled
+StatusSendingCanceledShort=Canceled
 StatusSendingDraft=Draft
 StatusSendingValidated=Validated (products to ship or already shipped)
 StatusSendingProcessed=Processed
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang
index 660443bcded..6cf089096dd 100644
--- a/htdocs/langs/uz_UZ/stocks.lang
+++ b/htdocs/langs/uz_UZ/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/uz_UZ/ticket.lang b/htdocs/langs/uz_UZ/ticket.lang
index 59519282c80..982fff90ffa 100644
--- a/htdocs/langs/uz_UZ/ticket.lang
+++ b/htdocs/langs/uz_UZ/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/uz_UZ/website.lang b/htdocs/langs/uz_UZ/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/uz_UZ/website.lang
+++ b/htdocs/langs/uz_UZ/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/uz_UZ/withdrawals.lang b/htdocs/langs/uz_UZ/withdrawals.lang
index 114a8d9dd6c..e3bec6f9cb8 100644
--- a/htdocs/langs/uz_UZ/withdrawals.lang
+++ b/htdocs/langs/uz_UZ/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index 0426ce8fd0b..ed5a2ce191c 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=Tất cả các quốc gia trừ %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Tài khoản kế toán chính cho khách hàng không được định nghĩa trong thiết lập
 MainAccountForSuppliersNotDefined=Tài khoản kế toán chính cho các nhà cung cấp không được định nghĩa trong thiết lập
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Không liên kết với tài khoản kế toán
 XLineSuccessfullyBinded=%s sản phẩm/ dịch vụ được liên kết thành công với tài khoản kế toán
 XLineFailedToBeBinded=%s sản phẩm/ dịch vụ không bị ràng buộc với bất kỳ tài khoản kế toán nào
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Số phần tử để liên kết được hiển thị theo trang (khuyến nghị tối đa: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Bắt đầu sắp xếp trang "Liên kết cần làm" theo các yếu tố gần đây nhất
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Bắt đầu sắp xếp trang "Liên kết" theo các yếu tố gần đây nhất
 
@@ -198,7 +199,8 @@ Docdate=Ngày
 Docref=Tham chiếu
 LabelAccount=Nhãn tài khoản
 LabelOperation=Nhãn hoạt động
-Sens=Ý nghĩa
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Mã sắp đặt chữ
 Lettering=Sắp đặt chữ
 Codejournal=Nhật ký
@@ -206,7 +208,8 @@ JournalLabel=Mã nhật ký
 NumPiece=Số lượng cái
 TransactionNumShort=Số Giao dịch
 AccountingCategory=Nhóm cá nhân hóa
-GroupByAccountAccounting=Nhóm theo tài khoản kế toán
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Bạn có thể định nghĩa ở đây một số nhóm tài khoản kế toán. Chúng sẽ được sử dụng cho các báo cáo kế toán đã cá nhân hóa.
 ByAccounts=Theo tài khoản
 ByPredefinedAccountGroups=Theo nhóm được xác định trước
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Thanh toán không được liên kết với bất k
 OpeningBalance=Opening balance
 ShowOpeningBalance=Xem số dư 
 HideOpeningBalance=Ẩn số dư
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Nhóm tài khoản
 PcgtypeDesc=Nhóm tài khoản được sử dụng làm tiêu chí 'bộ lọc' và 'nhóm' được xác định trước cho một số báo cáo kế toán. Ví dụ: 'THU NHẬP' hoặc 'CHI PHÍ' được sử dụng làm nhóm cho tài khoản kế toán của các sản phẩm để xây dựng báo cáo chi phí / thu nhập.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Tham khảo tại đây danh sách các dòng báo cáo
 DescVentilExpenseReportMore=Nếu bạn thiết lập tài khoản kế toán theo kiểu dòng báo cáo chi phí, ứng dụng sẽ có thể thực hiện tất cả các ràng buộc giữa các dòng báo cáo chi phí và tài khoản kế toán của hệ thống đồ tài khoản của bạn, chỉ bằng một cú nhấp chuột với nút <strong>"%s"</strong> . Nếu tài khoản không được đặt trong từ điển phí hoặc nếu bạn vẫn có một số dòng không bị ràng buộc với bất kỳ tài khoản nào, bạn sẽ phải thực hiện ràng buộc thủ công từ menu " <strong>%s</strong> ".
 DescVentilDoneExpenseReport=Tham khảo tại đây danh sách các dòng báo cáo chi phí và tài khoản kế toán phí của họ
 
+Closure=Annual closure
 DescClosure=Tham khảo tại đây số lượng kết chuyển theo tháng không được xác nhận và năm tài chính đã mở
 OverviewOfMovementsNotValidated=Bước 1 / Tổng quan về các kết chuyển không được xác nhận. (Cần thiết để đóng một năm tài chính)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Xác nhận các kết chuyển
 DescValidateMovements=Bất kỳ sửa đổi hoặc xóa viết, chữ và xóa sẽ bị cấm. Tất cả các mục cho một thi hành phải được xác nhận nếu không việc đóng sẽ không thể thực hiện được
-SelectMonthAndValidate=Chọn tháng và xác nhận các kết chuyển
 
 ValidateHistory=Tự động ràng buộc
 AutomaticBindingDone=Tự động ràng buộc thực hiện xong
@@ -293,6 +298,7 @@ Accounted=Tài khoản trên Sổ cái
 NotYetAccounted=Chưa hạch toán vào Sổ cái
 ShowTutorial=Chương trình hướng dẫn
 NotReconciled=Chưa đối chiếu
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Xuất cho chuẩn LD Compta (v10 hoặc cao hơn)
 Modelcsv_openconcerto=Xuất dữ liệu cho OpenConcerto (Kiểm tra)
 Modelcsv_configurable=Xuất dữ liệu cấu hình CSV
 Modelcsv_FEC=Xuất dữ liệu FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Xuất dữ liệu cho Sage 50 Thụy Sĩ
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index ef784047979..b6e2a4ac6f2 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Hiển thị
 SetupArea=Thiết lập
 UploadNewTemplate=Tải lên (các) mẫu mới
 FormToTestFileUploadForm=Mẫu để thử nghiệm việc tải lên tập tin (dựa theo thiết lập)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Ghi chú: Yes chỉ có tác dụng nếu module <b>%s</b> được mở
 RemoveLock=Xóa / đổi tên tệp <b>%s</b> nếu nó tồn tại, để cho phép sử dụng công cụ Cập nhật / Cài đặt.
 RestoreLock=Khôi phục tệp <b>%s</b> , chỉ với quyền đọc, để vô hiệu hóa bất kỳ việc sử dụng thêm công cụ Cập nhật / Cài đặt nào.
@@ -85,7 +87,6 @@ ShowPreview=Hiển thị xem trước
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Xem trước không sẵn có
 ThemeCurrentlyActive=Giao diện hiện đã kích hoạt
-CurrentTimeZone=Mã vùng thời gian PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Ngày được lưu trữ và trả về bởi máy chủ cơ sở dữ liệu như thể chúng được giữ dưới dạng chuỗi đã gửi. Múi giờ chỉ có hiệu lực khi sử dụng hàm UNIX_TIMESTAMP (không nên sử dụng bởi Dolibarr, vì vậy TZ cơ sở dữ liệu sẽ không có hiệu lực, ngay cả khi đã thay đổi sau khi nhập dữ liệu).
 Space=Khoảng trống
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Khu vực này cung cấp các chức năng quản trị. S
 Purge=Thanh lọc
 PurgeAreaDesc=Trang này cho phép bạn xóa tất cả các tệp được tạo hoặc lưu trữ bởi Dolibarr (các tệp tạm thời hoặc tất cả các tệp trong thư mục <b>%s</b> ). Sử dụng tính năng này thường không cần thiết. Nó được cung cấp như một cách giải quyết cho người dùng có Dolibarr được lưu trữ bởi nhà cung cấp không cung cấp quyền xóa các tệp được tạo bởi máy chủ web.
 PurgeDeleteLogFile=Xóa tập tin nhật ký <b>%s</b> được tạo bởi mô-đun Syslog (không gây nguy hiểm mất dữ liệu)
-PurgeDeleteTemporaryFiles=Xóa tất cả các tệp tạm thời (không có nguy cơ mất dữ liệu). Lưu ý: Việc xóa chỉ được thực hiện nếu thư mục tạm thời được tạo 24 giờ trước.
-PurgeDeleteTemporaryFilesShort=Xóa các tập tin tạm thời
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Xóa tất cả các tệp trong thư mục: <b>%s</b> . <br> Việc này sẽ xóa tất cả các tài liệu được tạo liên quan đến các yếu tố (bên thứ ba, hóa đơn, v.v.), các tệp được tải lên mô-đun ECM, các bản sao lưu cơ sở dữ liệu và các tệp tạm thời.
 PurgeRunNow=Thanh lọc bây giờ
 PurgeNothingToDelete=Không có thư mục hoặc tập tin để xóa.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Đối tác ưu tiên
 OtherResources=Các tài nguyên khác
 ExternalResources=Tài nguyên bên ngoài
 SocialNetworks=Mạng xã hội
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Dưới đây là một số tài nguyên để nhận trợ giúp và hỗ trợ với Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Ví dụ với cấu hình hiện tại
 ListOfDirectories=List of OpenDocument templates directories
 ListOfDirectoriesForModelGenODT=Danh sách các thư mục chứa các tệp mẫu với định dạng OpenDocument. <br><br> Đặt ở đây đường dẫn đầy đủ của các thư mục. <br> Thêm một trở lại đầu giữa thư mục eah. <br> Để thêm một thư mục của mô-đun GED, thêm ở đây <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br> Các tệp trong các thư mục đó phải kết thúc bằng <b>.odt</b> hoặc <b>.ods</b>.
 NumberOfModelFilesFound=Số tệp mẫu ODT / ODS được tìm thấy trong các thư mục này
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Chức vụ của Tên/Họ
@@ -406,7 +408,7 @@ UrlGenerationParameters=Các thông số để bảo mật URL
 SecurityTokenIsUnique=Sử dụng một tham số securekey duy nhất cho mỗi URL
 EnterRefToBuildUrl=Nhập tham chiếu cho đối tượng %s
 GetSecuredUrl=Nhận URL được tính
-ButtonHideUnauthorized=Ẩn các nút cho người dùng không phải quản trị viên cho các hành động không được phép thay vì hiển thị các nút bị tắt màu xám
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Thuế suất VAT cũ
 NewVATRates=Thuế suất VAT mới
 PriceBaseTypeToChange=Sửa đổi về giá với giá trị tham chiếu cơ sở được xác định trên
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Các menu được cá nhân hóa không được li
 NewMenu=Menu mới
 MenuHandler=Xử lý menu
 MenuModule=Module nguồn
-HideUnauthorizedMenu= Ẩn menu không được phép (màu xám)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=ID menu
 DetailMenuHandler=Xử lý menu nơi hiển thị menu mới
 DetailMenuModule=Tên module nếu menu vào đến từ một module
@@ -1983,11 +1985,12 @@ EMailHost=Máy chủ email IMAP
 MailboxSourceDirectory=Thư mục nguồn hộp thư
 MailboxTargetDirectory=Thư mục đích hộp thư
 EmailcollectorOperations=Hoạt động để làm bởi trình thu thập
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Số lượng email tối đa được thu thập trên mỗi thu thập
 CollectNow=Thu thập ngay bây giờ
 ConfirmCloneEmailCollector=Bạn có chắc chắn muốn sao chép trình thu thập Email %s không?
-DateLastCollectResult=Ngày thu thập mới nhất đã thử
-DateLastcollectResultOk=Ngày thu thập mới nhất thành công
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Kết quả mới nhất
 EmailCollectorConfirmCollectTitle=Email xác nhận thu thập
 EmailCollectorConfirmCollect=Bạn có muốn chạy trình thu thập cho thu thập này bây giờ không?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Mã mục nhập menu (mainmenu)
 ECMAutoTree=Hiển thị cây ECM tự động
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/vi_VN/banks.lang b/htdocs/langs/vi_VN/banks.lang
index 162d7062272..21917a81833 100644
--- a/htdocs/langs/vi_VN/banks.lang
+++ b/htdocs/langs/vi_VN/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=Ủy quyền SEPA
 YourSEPAMandate=Ủy quyền SEPA của bạn
 FindYourSEPAMandate=Đây là ủy quyền SEPA của bạn để ủy quyền cho công ty chúng tôi thực hiện lệnh ghi nợ trực tiếp vào ngân hàng của bạn. Trả lại nó đã ký (quét tài liệu đã ký) hoặc gửi thư đến
 AutoReportLastAccountStatement=Tự động điền vào trường "số báo cáo ngân hàng" với số sao kê cuối cùng khi thực hiện đối chiếu
-CashControl=Rào cản tiền mặt POS
-NewCashFence=Rào cản tiền mặt mới
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Tô màu cho các kết chuyển
 BankColorizeMovementDesc=Nếu chức năng này được bật, bạn có thể chọn màu nền cụ thể cho các kết chuyển ghi nợ hoặc tín dụng
 BankColorizeMovementName1=Màu nền cho kết chuyển ghi nợ
diff --git a/htdocs/langs/vi_VN/blockedlog.lang b/htdocs/langs/vi_VN/blockedlog.lang
index d0ed0570da4..9b3a20f1438 100644
--- a/htdocs/langs/vi_VN/blockedlog.lang
+++ b/htdocs/langs/vi_VN/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Nhật ký không thể thay đổi
 ShowAllFingerPrintsMightBeTooLong=Hiển thị tất cả các nhật ký lưu trữ (có thể dài)
 ShowAllFingerPrintsErrorsMightBeTooLong=Hiển thị tất cả các nhật ký lưu trữ không hợp lệ (có thể dài)
 DownloadBlockChain=Tải dấu vân tay
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Lưu trữ nhật ký không hợp lệ. Nó có nghĩa là ai đó (một hacker?) Đã sửa đổi một số dữ liệu của lần này sau khi nó được ghi lại hoặc đã xóa bản ghi lưu trữ trước đó (kiểm tra dòng đó với # tồn tại trước đó).
 OkCheckFingerprintValidity=Bản ghi nhật ký lưu trữ là hợp lệ. Dữ liệu trên dòng này không được sửa đổi và mục nhập theo sau.
 OkCheckFingerprintValidityButChainIsKo=Nhật ký lưu trữ có vẻ hợp lệ so với trước đó nhưng chuỗi đã bị hỏng trước đó.
 AddedByAuthority=Lưu trữ vào ủy quyền từ xa
@@ -35,7 +35,7 @@ logDON_DELETE=Đóng góp được xóa logic
 logMEMBER_SUBSCRIPTION_CREATE=Đăng ký thành viên đã tạo
 logMEMBER_SUBSCRIPTION_MODIFY=Đăng ký thành viên đã sửa đổi
 logMEMBER_SUBSCRIPTION_DELETE=Đăng ký thành viên đã xóa logic
-logCASHCONTROL_VALIDATE=Hàng rào tiền mặt ghi lại
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Tải hóa đơn khách hàng
 BlockedLogBillPreview=Xem trước hóa đơn khách hàng
 BlockedlogInfoDialog=Chi tiết nhật ký
diff --git a/htdocs/langs/vi_VN/boxes.lang b/htdocs/langs/vi_VN/boxes.lang
index a92b40fb524..b0df817ba6e 100644
--- a/htdocs/langs/vi_VN/boxes.lang
+++ b/htdocs/langs/vi_VN/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Đóng góp sửa đổi mới nhất %s
 BoxTitleLastModifiedExpenses=Báo cáo chi phí sửa đổi mới nhất %s 
 BoxTitleLatestModifiedBoms=BOMs sửa đổi mới nhất %s 
 BoxTitleLatestModifiedMos=Đơn đặt hàng sản xuất sửa đổi mới nhất %s 
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Hoạt động toàn cầu (hoá đơn, đề xuất, đơn đặt hàng)
 BoxGoodCustomers=Khách hàng thân thiết
 BoxTitleGoodCustomers=%s Khách hàng thân thiết
+BoxScheduledJobs=Công việc theo lịch trình
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Không thể làm mới thông lượng RSS. Ngày làm mới thành công mới nhất: %s
 LastRefreshDate=Ngày làm tươi mới nhất
 NoRecordedBookmarks=Không có dấu trang được xác định.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Tài khoản bị đình chỉ không được xác đ
 BoxLastCustomerShipments=Lô hàng cuối cùng của khách hàng
 BoxTitleLastCustomerShipments=Lô hàng mới nhất của khách hàng %s
 NoRecordedShipments=Không ghi nhận lô hàng của khách hàng
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Kế toán
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/vi_VN/cashdesk.lang b/htdocs/langs/vi_VN/cashdesk.lang
index b71e1adb3c9..e988007469f 100644
--- a/htdocs/langs/vi_VN/cashdesk.lang
+++ b/htdocs/langs/vi_VN/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Chân trang
 AmountAtEndOfPeriod=Số tiền cuối kỳ (ngày, tháng hoặc năm)
 TheoricalAmount=Số lượng lý thuyết
 RealAmount=Số tiền thực tế
-CashFence=Cash fence
-CashFenceDone=Rào cản tiền mặt được thực hiện trong kỳ
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb của hoá đơn
 Paymentnumpad=Loại Bảng để nhập thanh toán
 Numberspad=Bảng số
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b>được sử dụng để thêm số thiết bị đầu cuối
 TakeposGroupSameProduct=Nhóm sản phẩm cùng dòng
 StartAParallelSale=Bắt đầu bán hàng mới
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Báo cáo tiền mặt
 MainPrinterToUse=Máy in chính để dùng
 OrderPrinterToUse=Máy in đơn hàng để dùng
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/vi_VN/categories.lang b/htdocs/langs/vi_VN/categories.lang
index bb15ed66bb6..c7947d9a0d0 100644
--- a/htdocs/langs/vi_VN/categories.lang
+++ b/htdocs/langs/vi_VN/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Khu vực thẻ/ danh mục dự án
 UsersCategoriesArea=Khu vực thẻ/ danh mục người dùng
 SubCats=Danh mục con
 CatList=Danh sách thẻ/danh mục
+CatListAll=List of tags/categories (all types)
 NewCategory=Thẻ/danh mục mới
 ModifCat=Sửa thẻ/ danh mục
 CatCreated=Thẻ/danh mục đã tạo
@@ -65,16 +66,22 @@ UsersCategoriesShort=thẻ/ danh mục Người dùng
 StockCategoriesShort=thẻ/ danh mục Kho
 ThisCategoryHasNoItems=Danh mục này không có dữ liệu nào
 CategId=ID thẻ/ danh mục
-CatSupList=Danh sách Nhà cung cấp thẻ/ danh mục
-CatCusList=Danh sách khách hàng/ tiềm năng thẻ/ danh mục
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Danh sách sản phẩm thẻ/danh mục
 CatMemberList=Danh sách thành viên thẻ/ danh mục
-CatContactList=Danh sách liên lạc thẻ/ danh mục
-CatSupLinks=Liên kết giữa nhà cung cấp và thẻ/ danh mục
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Liên kết giữa khách hàng/ tiềm năng và thẻ/ danh mục
 CatContactsLinks=Liên kết Liên hệ/địa chỉ với danh mục
 CatProdLinks=Liên kết giữa sản phẩm/ dịch vụ và thẻ/ danh mục
-CatProJectLinks=Liên kết giữa dự án và thẻ/ danh mục
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Liên kết giữa dự án và thẻ/ danh mục
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Xóa khỏi thẻ/ danh mục
 ExtraFieldsCategories=Thuộc tính bổ sung
 CategoriesSetup=Thiết lập thẻ/ danh mục
diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang
index e559f40ecb5..38e3c5dad27 100644
--- a/htdocs/langs/vi_VN/companies.lang
+++ b/htdocs/langs/vi_VN/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Kiểm tra ID VAT nội bộ cộng đồng trên tran
 VATIntraManualCheck=Bạn cũng có thể kiểm tra thủ công trên trang web của Ủy ban Châu Âu <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Không phải triển vọng, cũng không phải khách hàng
-JuridicalStatus=Loại pháp nhân
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Nhân viên
 ProspectLevelShort=Tiềm năng
diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang
index f1cc23cf244..fda16aecf93 100644
--- a/htdocs/langs/vi_VN/compta.lang
+++ b/htdocs/langs/vi_VN/compta.lang
@@ -111,7 +111,7 @@ Refund=Hoàn thuế
 SocialContributionsPayments=Thanh toán thuế xã hội / tài chính
 ShowVatPayment=Hiện nộp thuế GTGT
 TotalToPay=Tổng số trả
-BalanceVisibilityDependsOnSortAndFilters=Số dư chỉ hiển thị trong danh sách này nếu bảng được sắp xếp tăng dần trên %s và được lọc cho 1 tài khoản ngân hàng
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Mã kế toán khách hàng
 SupplierAccountancyCode=Mã kế toán nhà cung cấp
 CustomerAccountancyCodeShort=Mã K.toán K.H
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Bạn có chắc chắn muốn xóa khoản than
 ExportDataset_tax_1=Thuế và tài chính xã hội và thanh toán
 CalcModeVATDebt=Chế độ <b>%sVAT về kế toán cam kết%s</b>.
 CalcModeVATEngagement=Chế độ <b>%sVAT đối với thu nhập-chi phí%s.</b>
-CalcModeDebt=Phân tích các hóa đơn được ghi lại ngay cả khi chúng chưa được hạch toán vào sổ cái.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Phân tích các khoản thanh toán được ghi lại, ngay cả khi chúng chưa được hạch toán vào sổ cái.
 CalcModeBookkeeping=Phân tích dữ liệu được báo cáo trong bảng Sổ sách kế toán.
 CalcModeLT1= Chế độ <b>%sRE trên hoá đơn của khách hàng - nhà cung cấp hoá đơn%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Cán cân thu nhập và chi phí, tổng kết hà
 AnnualByCompanies=Cân đối thu nhập và chi phí, theo các nhóm tài khoản được xác định trước
 AnnualByCompaniesDueDebtMode=Cân đối thu nhập và chi phí, chi tiết theo các nhóm được xác định trước, chế độ <b>%sKhiếu nại - Nợ%s</b> cho biết <b>Kế toán cam kết</b> .
 AnnualByCompaniesInputOutputMode=Cân đối thu nhập và chi phí, chi tiết theo các nhóm được xác định trước, chế độ <b>%sThu nhập - Chi phí %s</b> cho biết <b>kế toán tiền mặt</b> .
-SeeReportInInputOutputMode=Xem %s Phân tích thanh toán %s để biết tính toán về các khoản thanh toán thực tế được thực hiện ngay cả khi chúng chưa được hạch toán vào Sổ cái.
-SeeReportInDueDebtMode=Xem %s phân tích hóa đơn%s để biết cách tính toán dựa trên hóa đơn đã ghi ngay cả khi chúng chưa được hạch toán vào Sổ cái.
-SeeReportInBookkeepingMode=Xem <b>%s Sổ sách báo cáo %s</b> để biết tính toán trên <b>bảng Sổ sách kế toán</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Các khoản hiển thị là với tất cả các loại thuế bao gồm
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- Nó bao gồm các khoản thanh toán thực tế được thực hiện trên hóa đơn, chi phí, VAT và tiền lương. <br> - Nó dựa trên ngày thanh toán của hóa đơn, chi phí, VAT và tiền lương. Ngày quyên góp.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Nó hiển thị ghi nhận trong Sổ cái c
 SeePageForSetup=Xem menu <a href="%s">%s</a> để thiết lập
 DepositsAreNotIncluded=- Không bao gồm hóa đơn giảm thanh toán
 DepositsAreIncluded=- Bao gồm hóa đơn giảm thanh toán
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Báo cáo thuế 2 của bên thứ ba
 LT2ReportByCustomers=Báo cáo thuế 3 của bên thứ ba
 LT1ReportByCustomersES=Báo cáo của bên thứ ba RE
 LT2ReportByCustomersES=Báo cáo của bên thứ ba IRPF
 VATReport=Báo cáo thuế bán hàng
 VATReportByPeriods=Báo cáo thuế bán theo kỳ
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Báo cáo thuế bán hàng theo thuế suất
 VATReportByThirdParties=Báo cáo thuế bán hàng của bên thứ ba
 VATReportByCustomers=Báo cáo thuế bán hàng của khách hàng
diff --git a/htdocs/langs/vi_VN/cron.lang b/htdocs/langs/vi_VN/cron.lang
index 0a3630cf45d..3ea052d3289 100644
--- a/htdocs/langs/vi_VN/cron.lang
+++ b/htdocs/langs/vi_VN/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Xóa công việc theo lịch trình
 Permission23104 = Thực hiện công việc theo lịch trình
 # Admin
 CronSetup=Thiết lập quản lý công việc theo lịch trình
-URLToLaunchCronJobs=URL để kiểm tra và khởi chạy các công việc định kỳ đủ điều kiện
-OrToLaunchASpecificJob=Hoặc để kiểm tra và khởi động một công việc cụ thể
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Khóa bảo mật cho URL để khởi chạy các công việc định kỳ
 FileToLaunchCronJobs=Dòng lệnh để kiểm tra và khởi chạy các công việc định kỳ đủ điều kiện
 CronExplainHowToRunUnix=Trên môi trường Unix, bạn nên sử dụng mục crontab sau để chạy dòng lệnh mỗi 5 phút
 CronExplainHowToRunWin=Trên môi trường Microsoft (tm) Windows, bạn có thể sử dụng các công cụ Tác vụ theo lịch để chạy dòng lệnh mỗi 5 phút
 CronMethodDoesNotExists=Lớp %s không chứa bất kỳ phương thức nào %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Hồ sơ công việc theo định kỳ được xác định vào tập tin mô tả mô-đun. Khi mô-đun được kích hoạt, chúng được tải và có sẵn để bạn có thể quản lý các công việc từ menu công cụ quản trị %s.
 CronJobProfiles=Danh sách hồ sơ công việc định kỳ được xác định trước
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Số lần khởi chạy
 CronMaxRun=Số lần khởi chạy tối đa
 CronEach=Mỗi
 JobFinished=Công việc khởi chạy và kết thúc
+Scheduled=Scheduled
 #Page card
 CronAdd= Thêm công việc
 CronEvery=Thực hiện mỗi công việc
@@ -56,7 +58,7 @@ CronNote=Nhận xét
 CronFieldMandatory=Các trường %s là bắt buộc
 CronErrEndDateStartDt=Ngày kết thúc không thể trước ngày bắt đầu
 StatusAtInstall=Trạng thái khi cài đặt mô-đun
-CronStatusActiveBtn=Kích hoạt
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Vô hiệu hoá
 CronTaskInactive=Công việc này bị vô hiệu hóa
 CronId=Id
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=Sao lưu cơ sở dữ liệu cục bộ
 MakeLocalDatabaseDump=Tạo một kết xuất cơ sở dữ liệu cục bộ. Các tham số là:  nén('gz' hoặc 'bz' hoặc 'none'), loại sao lưu ('mysql', 'pssql', 'auto'), 1, 'auto' hoặc tên tệp để tạo, số lượng tệp sao lưu cần giữ
 WarningCronDelayed=Chú ý, vì mục đích hiệu suất, bất kể ngày nào là ngày thực hiện các công việc được kích hoạt, công việc của bạn có thể bị trì hoãn tối đa là %s giờ trước khi được chạy.
 DATAPOLICYJob=Trình dọn dẹp dữ liệu và ẩn danh
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index 5c97da8e340..1413520f21d 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Không có lỗi, chúng tôi cam kết
 # Errors
 ErrorButCommitIsDone=Lỗi được tìm thấy nhưng chúng tôi xác nhận mặc dù điều này
 ErrorBadEMail=Email %s là sai
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url% s là sai
 ErrorBadValueForParamNotAString=Giá trị xấu cho tham số của bạn. Nói chung khi dịch bị thiếu.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Đăng nhập% s đã tồn tại.
 ErrorGroupAlreadyExists=Nhóm% s đã tồn tại.
 ErrorRecordNotFound=Ghi lại không tìm thấy.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Một số trường yêu cầu không được lấp đầy
 ErrorSubjectIsRequired=Chủ đề email là bắt buộc
 ErrorFailedToCreateDir=Không thể tạo một thư mục. Kiểm tra xem người sử dụng máy chủ web có quyền ghi vào thư mục tài liệu Dolibarr. Nếu tham số <b>safe_mode</b> được kích hoạt trên PHP này, hãy kiểm tra các tập tin php Dolibarr sở hữu cho người sử dụng máy chủ web (hoặc một nhóm).
 ErrorNoMailDefinedForThisUser=Không có thư xác định cho người dùng này
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Tính năng này cần javascript để được kích hoạt để làm việc. Thay đổi điều này trong thiết lập - hiển thị.
 ErrorTopMenuMustHaveAParentWithId0=Một thực đơn của loại 'Top' không thể có một trình đơn phụ huynh. Đặt 0 trong trình đơn phụ huynh hoặc chọn một trình đơn của loại 'trái'.
 ErrorLeftMenuMustHaveAParentId=Một thực đơn của loại 'trái' phải có một id cha mẹ.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Tên hồ sơ này đã tồn tại cho bộ xuất k
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP phù hợp là không đầy đủ.
 ErrorLDAPMakeManualTest=Một tập tin .ldif đã được tạo ra trong thư mục% s. Hãy thử để tải nó bằng tay từ dòng lệnh để có thêm thông tin về lỗi.
 ErrorCantSaveADoneUserWithZeroPercentage=Không thể lưu một hành động với "trạng thái chưa bắt đầu" nếu trường "được thực hiện bởi" cũng được điền.
-ErrorRefAlreadyExists=Tài liệu tham khảo dùng để tạo đã tồn tại.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Vui lòng nhập tên sao kê ngân hàng nơi mục nhập phải được báo cáo (Định dạng YYYYMM hoặc YYYYMMDD)
 ErrorRecordHasChildren=Không thể xóa hồ sơ vì nó có một số hồ sơ con.
 ErrorRecordHasAtLeastOneChildOfType=Đối tượng có ít nhất một con của loại %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Bạn phải chọn nếu sản p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=Giảm giá bạn cố gắng áp dụng là lớn hơn tiền còn lại để trả. Chia giảm giá trong 2 giảm giá nhỏ hơn trước.
 ErrorFileNotFoundWithSharedLink=Tập tin không được tìm thấy. Có thể là khóa chia sẻ đã được sửa đổi hoặc tập tin đã bị xóa gần đây.
 ErrorProductBarCodeAlreadyExists=Mã vạch sản phẩm %s đã tồn tại trên một tham chiếu sản phẩm khác.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Cũng lưu ý rằng việc sử dụng sản phẩm ảo để tự động tăng / giảm sản phẩm con là không thể khi ít nhất một sản phẩm phụ (hoặc sản phẩm phụ của sản phẩm phụ) cần số sê-ri/ lô.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Mô tả là bắt buộc đối với các dòng có sản phẩm miễn phí
 ErrorAPageWithThisNameOrAliasAlreadyExists=Trang/ khung chứa <strong>%s</strong> có cùng tên hoặc bí danh thay thế mà bạn cố gắng sử dụng
 ErrorDuringChartLoad=Lỗi khi tải hệ thống tài khoản. Nếu một vài tài khoản chưa được tải, bạn vẫn có thể nhập chúng theo cách thủ công.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Lỗi, cụm từ để thay thế đang trống
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Giao diện công cộng không được kích hoạt
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Tham số PHP của bạn upload_max_filesize (%s) cao hơn tham số PHP post_max_size (%s). Đây không phải là một thiết lập phù hợp.
 WarningPasswordSetWithNoAccount=Một mật khẩu đã được đặt cho thành viên này. Tuy nhiên, không có tài khoản người dùng nào được tạo. Vì vậy, mật khẩu này được lưu trữ nhưng không thể được sử dụng để đăng nhập vào Dolibarr. Nó có thể được sử dụng bởi một mô-đun / giao diện bên ngoài nhưng nếu bạn không cần xác định bất kỳ thông tin đăng nhập hay mật khẩu nào cho thành viên, bạn có thể tắt tùy chọn "Quản lý đăng nhập cho từng thành viên" từ thiết lập mô-đun Thành viên. Nếu bạn cần quản lý thông tin đăng nhập nhưng không cần bất kỳ mật khẩu nào, bạn có thể để trống trường này để tránh cảnh báo này. Lưu ý: Email cũng có thể được sử dụng làm thông tin đăng nhập nếu thành viên được liên kết với người dùng.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Đăng nhập của bạn đã được s
 WarningAnEntryAlreadyExistForTransKey=Một mục đã tồn tại cho khóa dịch của ngôn ngữ này
 WarningNumberOfRecipientIsRestrictedInMassAction=Cảnh báo, số lượng người nhận khác nhau được giới hạn ở <b>%s</b> khi sử dụng các hành động hàng loạt trong danh sách
 WarningDateOfLineMustBeInExpenseReportRange=Cảnh báo, ngày của dòng không nằm trong phạm vi của báo cáo chi phí
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Dự án đã đóng. Bạn phải mở lại nó trước.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Một số giao dịch ngân hàng đã bị xóa sau đó biên nhận bao gồm cả chúng được tạo ra. Vì vậy, số lượng séc và tổng số hóa đơn có thể khác với số lượng và tổng số trong danh sách.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/vi_VN/exports.lang b/htdocs/langs/vi_VN/exports.lang
index 81f0901f077..f15be790dc6 100644
--- a/htdocs/langs/vi_VN/exports.lang
+++ b/htdocs/langs/vi_VN/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Tiêu đề trường
 NowClickToGenerateToBuildExportFile=Bây giờ, chọn định dạng tệp trong hộp combo và nhấp vào "Tạo" để tạo tệp xuất ...
 AvailableFormats=Các định dạng có sẵn
 LibraryShort=Thư viện
+ExportCsvSeparator=Phân cách thập phân
+ImportCsvSeparator=Phân cách thập phân
 Step=Bước
 FormatedImport=Trợ lý nhập dữ liệu
 FormatedImportDesc1=Mô-đun này cho phép bạn cập nhật dữ liệu hiện có hoặc thêm các đối tượng mới vào cơ sở dữ liệu từ một tệp mà không có kiến ​​thức kỹ thuật, sử dụng trợ lý.
@@ -37,7 +39,7 @@ FormatedExportDesc3=Khi dữ liệu cần xuất được chọn, bạn có th
 Sheet=Bảng
 NoImportableData=Không có dữ liệu có thể nhập (không có mô-đun với định nghĩa để cho phép nhập dữ liệu)
 FileSuccessfullyBuilt=Tập tin được tạo
-SQLUsedForExport=SQL Request used to extract data
+SQLUsedForExport=Yêu cầu SQL để xuất liệu
 LineId=Id của dòng
 LineLabel=Nhãn của dòng
 LineDescription=Mô tả của dòng
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Khóa (cột) được sử dụng cho <b>cập nhật</b> d
 NbInsert=Số dòng được chèn: %s
 NbUpdate=Số dòng cập nhật: %s
 MultipleRecordFoundWithTheseFilters=Nhiều bản ghi đã được tìm thấy với các bộ lọc này: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/vi_VN/mails.lang b/htdocs/langs/vi_VN/mails.lang
index 200b7eae30b..31d9c0e0372 100644
--- a/htdocs/langs/vi_VN/mails.lang
+++ b/htdocs/langs/vi_VN/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Email đầu vào của người dùng
 MailingModuleDescDolibarrUsers=Người dùng có email
 MailingModuleDescThirdPartiesByCategories=Các bên thứ ba (theo danh mục)
 SendingFromWebInterfaceIsNotAllowed=Gửi từ giao diện web không được phép.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Dòng %s trong tập tin
@@ -125,12 +126,13 @@ TagMailtoEmail=Email người nhận (bao gồm liên kết "mailto:" html)
 NoEmailSentBadSenderOrRecipientEmail=Không có email nào được gửi. Người gửi hoặc người nhận email xấu. Xác nhận hồ sơ người dùng.
 # Module Notifications
 Notifications=Thông báo
-NoNotificationsWillBeSent=Không có thông báo email được lên kế hoạch cho sự kiện này và công ty
-ANotificationsWillBeSent=1 thông báo sẽ được gửi qua email
-SomeNotificationsWillBeSent=Thông báo %s sẽ được gửi qua email
-AddNewNotification=Kích hoạt email mới thông báo mục tiêu/sự kiện 
-ListOfActiveNotifications=Liệt kê tất cả các mục tiêu/sự kiện đang hoạt động để thông báo qua email
-ListOfNotificationsDone=Liệt kê tất cả các thông báo email đã gửi
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Cấu hình gửi email đã được thiết lập thành '%s'. Chế độ này không thể được sử dụng để gửi email hàng loạt.
 MailSendSetupIs2=Trước tiên, bạn phải đi, với tài khoản quản trị viên, vào menu %sNhà - Cài đặt - EMails %s để thay đổi tham số <strong>'%s'</strong> để sử dụng chế độ '%s' . Với chế độ này, bạn có thể nhập thiết lập máy chủ SMTP do Nhà cung cấp dịch vụ Internet của bạn cung cấp và sử dụng tính năng gửi email hàng loạt.
 MailSendSetupIs3=Nếu bạn có bất kỳ câu hỏi nào về cách thiết lập máy chủ SMTP của mình, bạn có thể hỏi %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Tệp đã nhập phải có định dạng <strong>e
 UseFormatInputEmailToTarget=Nhập một chuỗi với định dạng <strong>email;tên;họ;tênkhác</strong>
 MailAdvTargetRecipients=Người nhận (lựa chọn nâng cao)
 AdvTgtTitle=Điền vào các trường đầu vào để chọn trước bên thứ ba hoặc liên hệ / địa chỉ để nhắm mục tiêu
-AdvTgtSearchTextHelp=Sử dụng %% làm ký tự đại diện. Ví dụ: để tìm tất cả các mục như <b>jean, joe, jim</b> , bạn có thể nhập <b>j%%</b> , bạn cũng có thể sử dụng; như dấu phân cách cho giá trị, và sử dụng! ngoại trừ giá trị này. Ví dụ: <b>jean; joe;jim%% ;!Jimo;!Jima%</b> sẽ nhắm mục tiêu tất cả jean, joe, bắt đầu với jim nhưng không phải jimo và không phải mọi thứ bắt đầu bằng jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Sử dụng khoảng để chọn giá trị int hoặc float
 AdvTgtMinVal=Giá trị tối thiểu
 AdvTgtMaxVal=Gia trị tối đa
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Tạo bộ lọc
 AdvTgtOrCreateNewFilter=Tên bộ lọc mới
 NoContactWithCategoryFound=Không có liên lạc/địa chỉ với một danh mục được tìm thấy
 NoContactLinkedToThirdpartieWithCategoryFound=Không có liên lạc/địa chỉ với một danh mục được tìm thấy
-OutGoingEmailSetup=Thiết lập email đi
-InGoingEmailSetup=Thiết lập email đến
-OutGoingEmailSetupForEmailing=Thiết lập email gửi đi (cho module %s)
-DefaultOutgoingEmailSetup=Thiết lập email gửi đi mặc định
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Thông tin
 ContactsWithThirdpartyFilter=Danh bạ với bộ lọc của bên thứ ba
 Unanswered=Unanswered
 Answered=Đã trả lời
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index 4a0fe321d58..9b1e11a6ac2 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Không có sẵn mẫu nào cho loại email này
 AvailableVariables=Các biến thay thế có sẵn
 NoTranslation=Không dịch
 Translation=Dịch
+CurrentTimeZone=Mã vùng thời gian PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Không tìm thấy bản ghi
 NoRecordDeleted=Không có bản ghi nào bị xóa
 NotEnoughDataYet=Không đủ dữ liệu
@@ -85,6 +87,8 @@ FileWasNotUploaded=Một tập tin được chọn để đính kèm nhưng vẫ
 NbOfEntries=Số lượng các mục
 GoToWikiHelpPage=Đọc trợ giúp trực tuyến (Cần truy cập Internet)
 GoToHelpPage=Đọc giúp đỡ
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Trang chủ
 RecordSaved=Bản ghi đã lưu
 RecordDeleted=Bản ghi đã xóa
 RecordGenerated=Bản ghi được tạo
@@ -433,6 +437,7 @@ RemainToPay=Còn lại để trả tiền
 Module=Mô-đun / Ứng dụng
 Modules=Mô-đun / Ứng dụng
 Option=Tùy chọn
+Filters=Filters
 List=Danh sách
 FullList=Danh mục đầy đủ
 FullConversation=Full conversation
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/vi_VN/modulebuilder.lang b/htdocs/langs/vi_VN/modulebuilder.lang
index f2aa036ec7d..d8c8e376b9b 100644
--- a/htdocs/langs/vi_VN/modulebuilder.lang
+++ b/htdocs/langs/vi_VN/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=Trang PHP để tạo/chỉnh sửa/xem bản ghi
 PageForAgendaTab=Trang PHP cho tab sự kiện
 PageForDocumentTab=Trang PHP cho tab tài liệu
 PageForNoteTab=Trang PHP cho tab ghi chú
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Đường dẫn đến zip của gói mô-đun/ứng dụng
 PathToModuleDocumentation=Đường dẫn đến tệp tài liệu mô-đun/ứng dụng (%s)
 SpaceOrSpecialCharAreNotAllowed=Khoảng trắng hoặc ký tự đặc biệt không được phép.
@@ -77,7 +78,7 @@ IsAMeasure=Là một phép do
 DirScanned=Thư mục được quét
 NoTrigger=Không trigger
 NoWidget=Không có widget
-GoToApiExplorer=Đi tới trình khám phá API
+GoToApiExplorer=API explorer
 ListOfMenusEntries=Danh sách các mục menu
 ListOfDictionariesEntries=Danh sách các mục từ điển
 ListOfPermissionsDefined=Danh sách các quyền được định nghĩa
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Nếu bạn có kiến thức về SQL và PHP, bạn c
 SeeTopRightMenu=Xem <span class="fa fa-bug"></span> trên menu bên phải
 AddLanguageFile=Thêm tập tin ngôn ngữ
 YouCanUseTranslationKey=Bạn có thể sử dụng ở đây một khóa là khóa dịch được tìm thấy trong tệp ngôn ngữ (xem tab "Ngôn ngữ")
-DropTableIfEmpty=(Xóa bảng nếu trống)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=Bảng %s không tồn tại
 TableDropped=Bảng %s đã bị xóa
 InitStructureFromExistingTable=Xây dựng cấu trúc mảng chuỗi của một bảng hiện có
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Sử dụng một URL biên tập cụ thể
 UseSpecificFamily = Sử dụng một họ cụ thể
 UseSpecificAuthor = Sử dụng một tác giả cụ thể
 UseSpecificVersion = Sử dụng một phiên bản mở đầu cụ thể
-ModuleMustBeEnabled=Mô-đun / ứng dụng phải được bật trước
 IncludeRefGeneration=Tham chiếu của đối tượng phải được tạo tự động
 IncludeRefGenerationHelp=Kiểm tra điều này nếu bạn muốn bao gồm mã để quản lý việc tạo tự động của tham chiếu
 IncludeDocGeneration=Tôi muốn tạo một số tài liệu từ đối tượng
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Kiểu trường: <br> varchar (99), double (24,8), real, text,
 AsciiToHtmlConverter=Chuyển mã ASCII sang HTML
 AsciiToPdfConverter=Chuyển ASCII sang PDF
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang
index a5a94478621..cff053ec923 100644
--- a/htdocs/langs/vi_VN/other.lang
+++ b/htdocs/langs/vi_VN/other.lang
@@ -5,8 +5,6 @@ Tools=Công cụ
 TMenuTools=Công cụ
 ToolsDesc=Tất cả các công cụ không bao gồm trong các mục menu khác được nhóm ở đây. <br> Tất cả các công cụ có thể được truy cập thông qua menu bên trái.
 Birthday=Sinh nhật
-BirthdayDate=Ngày sinh nhật
-DateToBirth=Ngày sinh
 BirthdayAlertOn=sinh nhật cảnh báo hoạt động
 BirthdayAlertOff=sinh nhật không hoạt động cảnh báo
 TransKey=Dịch khóa TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Tháng trước (số 1-12) ngày hóa đơn
 TextPreviousMonthOfInvoice=Tháng trước (chữ) của ngày hóa đơn
 NextMonthOfInvoice=Tháng sau (số 1-12) của ngày hóa đơn
 TextNextMonthOfInvoice=Tháng sau (chữ) của ngày hóa đơn
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Tệp zip được tạo vào <b>%s</b> .
 DocFileGeneratedInto=Tệp doc được tạo vào <b>%s</b> .
 JumpToLogin=Ngắt kết nối. Chuyển đến trang đăng nhập ...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__ (Xin chào) __ \n\nVui lòng tìm vận chu
 PredefinedMailContentSendFichInter=__ (Xin chào) __ \n\nVui lòng tìm sự can thiệp __REF__ đính kèm \n\n\n__ (Trân trọng) __ \n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Bạn có thể nhấp vào liên kết bên dưới để thực hiện thanh toán nếu chưa được thực hiện.\n\n %s\n\n
 PredefinedMailContentGeneric=__ (Xin chào) __ \n\n\n__ (Trân trọng) __ \n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr là một ERP / CRM nhỏ gọn hỗ trợ một số mô-đun kinh doanh. Một bản demo giới thiệu tất cả các mô-đun không có ý nghĩa vì kịch bản này không bao giờ xảy ra (có sẵn hàng trăm). Vì vậy, một số hồ sơ demo là có sẵn.
 ChooseYourDemoProfil=Chọn hồ sơ demo phù hợp nhất với nhu cầu của bạn ...
 ChooseYourDemoProfilMore=... hoặc xây dựng hồ sơ của riêng bạn <br> (lựa chọn mô-đun thủ công)
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Liên hệ / địa chỉ được tạo bởi tr
 ProjectCreatedByEmailCollector=Dự án được tạo bởi trình thu thập email từ email MSGID %s
 TicketCreatedByEmailCollector=Vé được tạo bởi trình thu thập email từ email MSGID %s
 OpeningHoursFormatDesc=Sử dụng một - để tách giờ mở và đóng cửa. <br> Sử dụng một khoảng trắng để nhập các phạm vi khác nhau. <br> Ví dụ: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Khu vực xuất khẩu
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index d2ec4ce1cdc..a00697ef8f0 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Nhiều phân khúc giá cho mỗi sản phẩm/ dịch vụ (mỗi khách hàng một phân khúc giá)
 MultiPricesNumPrices=Số lượng Giá
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Số lượng của gói sản phẩm gốc
@@ -167,8 +168,10 @@ BuyingPrices=Giá mua
 CustomerPrices=Giá khách hàng
 SuppliersPrices=Giá nhà cung cấp
 SuppliersPricesOfProductsOrServices=Giá nhà cung cấp (của sản phẩm hoặc dịch vụ)
-CustomCode=Hải quan / Hàng hóa / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Nước xuất xứ
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Loại sản phẩm  (nguyên liệu / thành phẩm)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Sử dụng giá cố định
 PriceByQuantity=Giá thay đổi theo số lượng
 DisablePriceByQty=Vô hiệu giá theo số lượng
 PriceByQuantityRange=Phạm vi số lượng
-MultipriceRules=Quy tắc giá thành phần
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Sử dụng các quy tắc phân khúc giá (được định nghĩa bên trong thiết lập module sản phẩm) để tự động tính giá của tất cả phân khúc giá khác dựa theo phân khúc đầu tiên
 PercentVariationOver=%% biến đổi hơn %s
 PercentDiscountOver=%% giảm giá hơn %s
diff --git a/htdocs/langs/vi_VN/recruitment.lang b/htdocs/langs/vi_VN/recruitment.lang
index c0feca4d244..c62da50ed0c 100644
--- a/htdocs/langs/vi_VN/recruitment.lang
+++ b/htdocs/langs/vi_VN/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/vi_VN/sendings.lang b/htdocs/langs/vi_VN/sendings.lang
index 9bf1264e824..0311215ed2a 100644
--- a/htdocs/langs/vi_VN/sendings.lang
+++ b/htdocs/langs/vi_VN/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Lô hàng khác về đơn hàng này
 SendingsAndReceivingForSameOrder=Lô hàng và biên nhận cho đơn đặt hàng này
 SendingsToValidate=Xác nhận lô hàng
 StatusSendingCanceled=Hủy bỏ
+StatusSendingCanceledShort=Đã hủy
 StatusSendingDraft=Dự thảo
 StatusSendingValidated=Xác nhận (sản phẩm để vận chuyển hoặc đã được vận chuyển)
 StatusSendingProcessed=Xử lý
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Trước tiên, bạn phải xác nhận đơn
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Mô hình tài liệu đầy đủ hơn cho hóa đơn giao hàng (logo ...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER liên tục không được xác định
 SumOfProductVolumes=Tổng khối lượng sản phẩm
 SumOfProductWeights=Tổng trọng lượng sản phẩm
diff --git a/htdocs/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang
index b2c7c324651..3e9bf9a66cd 100644
--- a/htdocs/langs/vi_VN/stocks.lang
+++ b/htdocs/langs/vi_VN/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/vi_VN/ticket.lang b/htdocs/langs/vi_VN/ticket.lang
index ea5424e4654..572f49247ce 100644
--- a/htdocs/langs/vi_VN/ticket.lang
+++ b/htdocs/langs/vi_VN/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Vé - Các loại
 TicketDictCategory=Vé - Nhóm
 TicketDictSeverity=Vé - Mức độ nghiêm trọng
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Sự cố phần mềm
-TicketTypeShortBUGHARD=Sự cố phần cứng
-TicketTypeShortCOM=Câu hỏi thương mại
 
+TicketTypeShortCOM=Câu hỏi thương mại
 TicketTypeShortHELP=Yêu cầu trợ giúp chức năng
 TicketTypeShortISSUE=Sự cố, lỗi hoặc vấn đề
 TicketTypeShortREQUEST=Yêu cầu thay đổi hoặc nâng cao
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Khác
 TicketSeverityShortLOW=Thấp
 TicketSeverityShortNORMAL=Bình thường
 TicketSeverityShortHIGH=Cao
-TicketSeverityShortBLOCKING=Quan trọng / Chặn
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Trường '%s' không chính xác
 MenuTicketMyAssign=Vé của tôi
@@ -60,7 +58,6 @@ OriginEmail=Nguồn email
 Notify_TICKET_SENTBYMAIL=Gửi tin nhắn vé qua email
 
 # Status
-NotRead=Chưa đọc
 Read=Đọc
 Assigned=Phân công
 InProgress=Trong tiến trình xử lý
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Giao diện công cộng cho phép bất kỳ
 TicketsAutoAssignTicket=Tự động chỉ định người dùng đã tạo vé
 TicketsAutoAssignTicketHelp=Khi tạo vé, người dùng có thể được tự động chỉ định cho vé.
 TicketNumberingModules=Mô-đun đánh số vé
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Thông báo cho bên thứ ba khi tạo
 TicketsDisableCustomerEmail=Luôn vô hiệu hóa email khi vé được tạo từ giao diện công cộng
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Trạng thái đã thay đổi: %s thành %s
 TicketNotNotifyTiersAtCreate=Không thông báo cho công ty khi tạo
 Unread=Chưa đọc
 TicketNotCreatedFromPublicInterface=Không có sẵn. Vé không được tạo từ giao diện công cộng.
-PublicInterfaceNotEnabled=Giao diện công cộng không được kích hoạt
 ErrorTicketRefRequired=Tên tham chiếu vé là bắt buộc
 
 #
diff --git a/htdocs/langs/vi_VN/website.lang b/htdocs/langs/vi_VN/website.lang
index 5d047fe8420..5f40936142b 100644
--- a/htdocs/langs/vi_VN/website.lang
+++ b/htdocs/langs/vi_VN/website.lang
@@ -30,7 +30,6 @@ EditInLine=Chỉnh sửa nội tuyến
 AddWebsite=Thêm trang web
 Webpage=Trang web / vùng chứa
 AddPage=Thêm trang / vùng chứa
-HomePage=Trang chủ
 PageContainer=Trang
 PreviewOfSiteNotYetAvailable=Xem trước trang web của bạn <strong>%s</strong> chưa có sẵn. Trước tiên, bạn phải ' <strong>Nhập mẫu trang web đầy đủ</strong> ' hoặc chỉ ' <strong>Thêm trang / vùng chứa</strong> '.
 RequestedPageHasNoContentYet=Trang được yêu cầu có id %s chưa có nội dung hoặc tệp bộ đệm .tpl.php đã bị xóa. Chỉnh sửa nội dung của trang để giải quyết điều này.
@@ -101,7 +100,7 @@ EmptyPage=Trang trống
 ExternalURLMustStartWithHttp=URL bên ngoài phải bắt đầu bằng http:// hoặc https://
 ZipOfWebsitePackageToImport=Tải lên tệp Zip của gói mẫu trang web
 ZipOfWebsitePackageToLoad=hoặc Chọn gói mẫu trang web nhúng có sẵn
-ShowSubcontainers=Bao gồm nội dung động
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=URL nội bộ của trang
 ThisPageIsTranslationOf=Trang / vùng chứa này là bản dịch của
 ThisPageHasTranslationPages=Trang / vùng chứa này có bản dịch
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/vi_VN/withdrawals.lang b/htdocs/langs/vi_VN/withdrawals.lang
index c3e19547427..089996b01ef 100644
--- a/htdocs/langs/vi_VN/withdrawals.lang
+++ b/htdocs/langs/vi_VN/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Biên nhận ghi nợ trực tiếp mới nhất %s
 MakeWithdrawRequest=Tạo một yêu cầu thanh toán ghi nợ trực tiếp
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s yêu cầu thanh toán ghi nợ trực tiếp được ghi lại
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Mã ngân hàng của bên thứ ba
 NoInvoiceCouldBeWithdrawed=Không có hóa đơn ghi nợ thành công. Kiểm tra xem hóa đơn có trên các công ty có IBAN hợp lệ không và IBAN có UMR (Tham chiếu ủy quyền duy nhất) với chế độ <strong>%s</strong> .
 ClassCredited=Phân loại tín dụng
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Ngày thi hành
 CreateForSepa=Tạo tập tin ghi nợ trực tiếp
-ICS=Định danh chủ nợ CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END=Thẻ SEPA XML "EndToEndId" - Id duy nhất được gán cho mỗi giao dịch
 USTRD=Thẻ SEPA XML "không cấu trúc"
 ADDDAYS=Thêm ngày vào Ngày thực hiện
@@ -146,3 +148,4 @@ InfoRejectSubject=Lệnh thanh toán ghi nợ trực tiếp bị từ chối
 InfoRejectMessage=Xin chào, <br><br> lệnh thanh toán ghi nợ trực tiếp của hóa đơn %s liên quan đến công ty %s, với số tiền %s đã bị ngân hàng từ chối. <br><br> - <br> %s
 ModeWarning=Tùy chọn cho chế độ thực không được đặt, chúng tôi dừng lại sau mô phỏng này
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
index 9a49f373c52..8ef67e2a7ba 100644
--- a/htdocs/langs/zh_CN/accountancy.lang
+++ b/htdocs/langs/zh_CN/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=除%s以外的所有国家/地区
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=未在设置中定义的顾客的主要会计科目
 MainAccountForSuppliersNotDefined=未在设置中定义的供应商的主要会计科目
@@ -144,7 +145,7 @@ NotVentilatedinAccount=未绑定到会计科目
 XLineSuccessfullyBinded=%s产品/服务绑定到会计科目
 XLineFailedToBeBinded=%s产品/服务未绑定到会计科目
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=按“最近"对“即将绑定”页面进行排序
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=按"最近"对"绑定完成"页面进行排序
 
@@ -198,7 +199,8 @@ Docdate=日期
 Docref=参考
 LabelAccount=标签帐户
 LabelOperation=标签操作
-Sens=SENS
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=刻字代码
 Lettering=Lettering
 Codejournal=日记帐
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=件数
 TransactionNumShort=Num. transaction
 AccountingCategory=会计分类
-GroupByAccountAccounting=按会计科目分组
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=您可以在此处定义一些会计科目组。它们将用于会计分类报告。
 ByAccounts=按帐户
 ByPredefinedAccountGroups=按预定义的组
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=付款未与任何产品/服务相关联
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=帐户组
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=请在此处查看费用会计帐户绑定（或不绑
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=请在此查询费用报表行及其费用会计帐户清单
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=自动绑定
 AutomaticBindingDone=自动绑定完成
@@ -293,6 +298,7 @@ Accounted=占总账
 NotYetAccounted=尚未计入分类帐
 ShowTutorial=Show Tutorial
 NotReconciled=未调解
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=导出CSV可配置
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index c84a23958aa..845d076738d 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -56,6 +56,8 @@ GUISetup=主题
 SetupArea=设置
 UploadNewTemplate=上传新模板
 FormToTestFileUploadForm=文件上传功能测试
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=注：“是”仅在模块 <b>%s</b> 启用时有效
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=显示预览
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=无预览
 ThemeCurrentlyActive=当前使用的主题
-CurrentTimeZone=PHP 服务器的时区
 MySQLTimeZone=MySql 服务器的时区
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=空间
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=清空
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=删除系统日志模块定义的日志文件<b>%s</b>(无数据丢失风险)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=删除临时文件
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=立即清空
 PurgeNothingToDelete=未删除目录或文件
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=首选合作伙伴
 OtherResources=其他资源
 ExternalResources=External Resources
 SocialNetworks=社交网络
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=用户或开发人员用文档(文档，常见问题…)，<br>参见 Dolibarr 百科：<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=您有任何其他问题/帮助，可以到 Dolibarr 论坛： <br> <b><a href="%s" target="_blank">%s</a></b>简体中文翻译可到Dolibarr爱好者交流Q群技术交流：206239089
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=开源办公软件文档模板目录列表
 ListOfDirectoriesForModelGenODT=包含开源办公软件的格式的文档的模板目录列表。<br><br>请在此填写完整的目录路径。<br>每填写一个目录路径结尾按回车换行。<br>添加一个 GED 模块目录, 如下 <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>。<br><br>该目录中的文件格式必须是 <b>.odt</b> 格式或 <b>.ods</b>格式。
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=参考语法格式:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>要知道如何建立您的ODT文件范本并储存在指定目录，请至wiki网站：
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=姓 /名 位置顺序
@@ -406,7 +408,7 @@ UrlGenerationParameters=URL地址的保护参数
 SecurityTokenIsUnique=为每个URL使用唯一的securekey参数值
 EnterRefToBuildUrl=输入对象 %s 的编号
 GetSecuredUrl=获取算得的URL地址
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=以前的增值税率(VAT)
 NewVATRates=新建增值税率(VAT)
 PriceBaseTypeToChange=设置了基本参考价值的产品的价格
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=个性化菜单未链接到顶部菜单条目
 NewMenu=新建菜单
 MenuHandler=菜单处理程序
 MenuModule=源模块
-HideUnauthorizedMenu= 是否隐藏未经授权的菜单 (灰色为不可用)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=菜单编号
 DetailMenuHandler=菜单处理程序 (决定何处显示新菜单)
 DetailMenuModule=模块名称 (如果菜单项来自模块)
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=邮编
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/zh_CN/banks.lang b/htdocs/langs/zh_CN/banks.lang
index 6f2afe060cc..6af69e844c0 100644
--- a/htdocs/langs/zh_CN/banks.lang
+++ b/htdocs/langs/zh_CN/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA授权
 YourSEPAMandate=您的SEPA授权
 FindYourSEPAMandate=这是您的SEPA授权，授权我们公司向您的银行直接扣款。返回签名（扫描签名文档）或通过邮件发送给
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/zh_CN/blockedlog.lang b/htdocs/langs/zh_CN/blockedlog.lang
index ce7718f76c4..37ec67f2a06 100644
--- a/htdocs/langs/zh_CN/blockedlog.lang
+++ b/htdocs/langs/zh_CN/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/zh_CN/boxes.lang b/htdocs/langs/zh_CN/boxes.lang
index 99c36d31a7c..f81391bc8fd 100644
--- a/htdocs/langs/zh_CN/boxes.lang
+++ b/htdocs/langs/zh_CN/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=最近变更的 %s 份捐款
 BoxTitleLastModifiedExpenses=最近变更的 %s 份费用报表
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=全局活动(账单,报价,订单)
 BoxGoodCustomers=优质客户
 BoxTitleGoodCustomers=%s 优质客户
+BoxScheduledJobs=计划任务
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=最后刷新日期
 NoRecordedBookmarks=未设置任何书签。
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=会计
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/zh_CN/cashdesk.lang b/htdocs/langs/zh_CN/cashdesk.lang
index 4ddbad3d082..bcaf0780474 100644
--- a/htdocs/langs/zh_CN/cashdesk.lang
+++ b/htdocs/langs/zh_CN/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=发票数
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/zh_CN/categories.lang b/htdocs/langs/zh_CN/categories.lang
index dbd3530d85b..355be943e79 100644
--- a/htdocs/langs/zh_CN/categories.lang
+++ b/htdocs/langs/zh_CN/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=项目标签/分类区
 UsersCategoriesArea=Users tags/categories area
 SubCats=子类别
 CatList=标签/分类列表
+CatListAll=List of tags/categories (all types)
 NewCategory=新建标签/分类
 ModifCat=变更标签/分类
 CatCreated=标签/分类已创建
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=标签/分类id号码
-CatSupList=List of vendor tags/categories
-CatCusList=客户/准客户标签/分类列表
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=产品标签/分类列表
 CatMemberList=会员标签/分类列表
-CatContactList=联系人标签/分类列表
-CatSupLinks=链接供应商与标签/分类
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=链接客户/准客户与标签/分类
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=链接产品/服务与标签/分类
-CatProJectLinks=链接项目与标签/分类
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=链接项目与标签/分类
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=从标签/分类移除
 ExtraFieldsCategories=自定义属性
 CategoriesSetup=标签/分类设置
diff --git a/htdocs/langs/zh_CN/companies.lang b/htdocs/langs/zh_CN/companies.lang
index d2a0362c3fa..8f852619ac3 100644
--- a/htdocs/langs/zh_CN/companies.lang
+++ b/htdocs/langs/zh_CN/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=检查不可能的。检查服务是没有提供的会员国（%s）中。
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=雇员
 ProspectLevelShort=潜力
diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang
index 6372c1186e3..4ae180df234 100644
--- a/htdocs/langs/zh_CN/compta.lang
+++ b/htdocs/langs/zh_CN/compta.lang
@@ -111,7 +111,7 @@ Refund=退
 SocialContributionsPayments=社会/财政税款
 ShowVatPayment=显示增值税纳税
 TotalToPay=共支付
-BalanceVisibilityDependsOnSortAndFilters=仅当表格在%s上按升序排序并过滤为1个银行帐户时，才会在此列表中显示余额
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=客户科目代码
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=客户账户代码
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=你确定要删除这个社会/财政税款吗
 ExportDataset_tax_1=社会和财政税和付款
 CalcModeVATDebt=模式 <b>%sVAT 关于承诺债务%s</b>.
 CalcModeVATEngagement=模式 <b>%s 增值税收入，支出 %s</b>.
-CalcModeDebt=分析已知的已记录发票，即使它们尚未计入分类帐。
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=分析已知的记录付款，即使它们尚未计入分类帐。
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= 模式 <b>%sRE 客户发票 - 供应商发票%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=年度总结的收支平衡表
 AnnualByCompanies=按预定义的帐户组划分的收入和支出余额
 AnnualByCompaniesDueDebtMode=收支平衡，详细按合作方，模式<b>%sClaims-Debts%s</b>，据说<b>承诺债务</b>。
 AnnualByCompaniesInputOutputMode=收支平衡，详细按合作方，模式<b>%sIncomes-Expenses%s</b>，据说<b>现金会计</b>。
-SeeReportInInputOutputMode=有关实际付款的计算，请参阅%s of payments%s，即使它们尚未在Ledger中计算。
-SeeReportInDueDebtMode=请参阅%s对invoices%s的分析，以便根据已知的记录发票进行计算，即使它们尚未计入分类帐。
-SeeReportInBookkeepingMode=有关<b>簿记分类帐表</b>的计算，请参阅<b> %sBookeeping report%s </b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- 所示金额均含税
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- 它包括发票，费用，增值税和工资的实际付款。 <br>  - 它基于发票，费用，增值税和工资的付款日期。捐赠的捐赠日期。
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=它在您的分类帐中显示记录，其中
 SeePageForSetup=请参阅菜单<a href="%s"> %s </a>进行设置
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- 包括预付款发票
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=由合作方报告税2
 LT2ReportByCustomers=由合作方报告税3
 LT1ReportByCustomersES=按合作方 RE 报表
 LT2ReportByCustomersES=按合作方IRPF的报表
 VATReport=销售税报告
 VATReportByPeriods=按期间的销售税报告
+VATReportByMonth=Sale tax report by month
 VATReportByRates=销售税报告按费率计算
 VATReportByThirdParties=第三方销售税报告
 VATReportByCustomers=客户销售税报告
diff --git a/htdocs/langs/zh_CN/cron.lang b/htdocs/langs/zh_CN/cron.lang
index b0b151ccf45..63b93692f0e 100644
--- a/htdocs/langs/zh_CN/cron.lang
+++ b/htdocs/langs/zh_CN/cron.lang
@@ -6,28 +6,29 @@ Permission23102 = 创建/更新计划任务
 Permission23103 = 删除计划任务
 Permission23104 = 执行计划任务
 # Admin
-CronSetup= 计划任务管理设置
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=或者检查并启动一个特别计划任务
+CronSetup=计划任务管理设置
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=启动计划任务的URL网址的安全密钥
-FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
+FileToLaunchCronJobs=用于检查和启动合格的cron作业的命令行
 CronExplainHowToRunUnix=在Unix环境你可以在命令行下每5分钟执行以下计划任务
-CronExplainHowToRunWin=在微软(tm)Windows操作系统环境下你可以使用控制面板中的计划任务工具每5分钟运行
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class类 %s 没有包含任何方法 %s
-CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
-CronJobProfiles=List of predefined cron job profiles
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
+CronJobDefDesc=Cron作业配置文件定义在模块描述符文件中。激活模块后，它们将被加载并可用，因此您可以从管理工具菜单%s管理作业。
+CronJobProfiles=预定义的cron作业配置文件列表
 # Menu
 EnabledAndDisabled=启用和禁用
 # Page list
-CronLastOutput=Latest run output
-CronLastResult=Latest result code
+CronLastOutput=最新的运行输出
+CronLastResult=最新结果代码
 CronCommand=命令
 CronList=计划任务
 CronDelete=删除计划任务
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
+CronConfirmDelete=您确定要删除这些预定作业吗？
 CronExecute=安排计划工作
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
+CronConfirmExecute=您确定要立即执行这些预定作业吗？
+CronInfo=计划作业模块允许计划作业以自动执行它们。也可以手动启动作业。
 CronTask=工作
 CronNone=无
 CronDtStart=之前
@@ -42,10 +43,11 @@ CronModule=模块
 CronNoJobs=没有工作注册
 CronPriority=优先级
 CronLabel=标签
-CronNbRun=运行编号
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=每
 JobFinished=工作启动和完成
+Scheduled=Scheduled
 #Page card
 CronAdd= 添加工作
 CronEvery=执行每个工作
@@ -55,29 +57,35 @@ CronSaveSucess=保存成功
 CronNote=说明
 CronFieldMandatory=栏位 %s 为必填
 CronErrEndDateStartDt=结束日期不能早过开始日期啊，时光不能倒流呀魂淡
-StatusAtInstall=Status at module installation
-CronStatusActiveBtn=生效
+StatusAtInstall=模块安装时的状态
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=禁用
 CronTaskInactive=这个工作已失效
 CronId=Id
-CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronClassFile=带有类的文件名
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=系统命令行执行。
 CronCreateJob=创建新的计划任务
 CronFrom=From
 # Info
 # Common
 CronType=工作类型
-CronType_method=Call method of a PHP Class
+CronType_method=调用PHP类的方法
 CronType_command=命令行
-CronCannotLoadClass=Cannot load class file %s (to use class %s)
-CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=请到菜单 "主页 - 管理员工具 - 计划任务" 查看和修改计划任务。
+CronCannotLoadClass=无法加载类文件%s（使用类%s）
+CronCannotLoadObject=已加载类文件%s，但未找到对象%s
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=岗位无效
 MakeLocalDatabaseDumpShort=本地数据库备份
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
+WarningCronDelayed=注意，出于性能目的，无论启用作业的下一个执行日期是什么，您的作业可能会在运行之前延迟到最大值%s小时。
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index 33ed9cea573..a7705c06513 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=没有错误，我们承诺
 # Errors
 ErrorButCommitIsDone=发现错误我们将进行验证
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=网址 %s 有误
 ErrorBadValueForParamNotAString=参数值不正确。它通常在缺少翻译时附加。
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=登陆%s已经存在。
 ErrorGroupAlreadyExists=组%s已经存在。
 ErrorRecordNotFound=记录没有找到。
@@ -48,6 +50,7 @@ ErrorFieldsRequired=一些必要的栏位都没有填补。
 ErrorSubjectIsRequired=电子邮件主题是必需的
 ErrorFailedToCreateDir=无法创建一个目录。检查Web服务器的用户有权限写入Dolibarr文件目录。如果参数<b>safe_mode设置</b>为启用这个PHP，检查Dolibarr php文件到Web服务器的用户拥有（或组）。
 ErrorNoMailDefinedForThisUser=没有邮件定义该用户
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=此功能需要Javascript被激活才能工作。更改此设置 - 显示。
 ErrorTopMenuMustHaveAParentWithId0=一个类型'顶'不能有一个父菜单中的菜单。放在父菜单0或选择一个类型为'左'菜单。
 ErrorLeftMenuMustHaveAParentId=一个类型为'左'必须有一个父菜单的ID。
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=导出设定配置名称已存在
 ErrorLDAPSetupNotComplete=Dolibarr - LDAP的匹配是不完整的。
 ErrorLDAPMakeManualTest=甲。LDIF文件已经生成在目录%s的尝试加载命令行手动有更多的错误信息。
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=号的创作已经存在。
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=请输入必须报告条目的银行对账单名称（格式YYYYMM或YYYYMMDD）
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=对象至少有一个类型为%s的子项
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=您必须选择文章是否为预
 ErrorDiscountLargerThanRemainToPaySplitItBefore=您尝试申请的折扣大于剩余支付。之前将折扣分为2个较小的折扣。
 ErrorFileNotFoundWithSharedLink=找不到档案。可能是修改了共享密钥或最近删除了文件。
 ErrorProductBarCodeAlreadyExists=产品条形码%s已存在于其他产品参考中。
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=还要注意，当至少一个子产品（或子产品的子产品）需要序列号/批号时，使用虚拟产品来自动增加/减少子产品是不可能的。
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=对于包含免费产品的行，必须说明
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=为此成员设置了密码。但是，未创建任何用户帐户。因此，此密码已存储，但无法用于登录Dolibarr。它可以由外部模块/接口使用，但如果您不需要为成员定义任何登录名或密码，则可以从成员模块设置中禁用“管理每个成员的登录名”选项。如果您需要管理登录但不需要任何密码，则可以将此字段保留为空以避免此警告。注意：如果成员链接到用户，则电子邮件也可用作登录。
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=您的登录已被修改。出于安全
 WarningAnEntryAlreadyExistForTransKey=此语言的翻译密钥已存在条目
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=警告，行日期不在费用报表范围内
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/zh_CN/exports.lang b/htdocs/langs/zh_CN/exports.lang
index 2117c02d285..11cfd2fcb7e 100644
--- a/htdocs/langs/zh_CN/exports.lang
+++ b/htdocs/langs/zh_CN/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=字段标题
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=资料库
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=步
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=插入行数：%s
 NbUpdate=更新行数：%s
 MultipleRecordFoundWithTheseFilters=使用这些过滤器找到了多条记录：%s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/zh_CN/mails.lang b/htdocs/langs/zh_CN/mails.lang
index c6a2af28558..f2273401207 100644
--- a/htdocs/langs/zh_CN/mails.lang
+++ b/htdocs/langs/zh_CN/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=用户输入的电子邮件
 MailingModuleDescDolibarrUsers=用户使用电子邮件
 MailingModuleDescThirdPartiesByCategories=第三方（按类别）
 SendingFromWebInterfaceIsNotAllowed=不允许从Web界面发送。
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=在文件%s的线
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=没有发送电子邮件发件人或收件人电子邮件错验证用户配置文件
 # Module Notifications
 Notifications=通知
-NoNotificationsWillBeSent=没有电子邮件通知此事件的计划和公司
-ANotificationsWillBeSent=1通知将通过电子邮件发送
-SomeNotificationsWillBeSent=%s的通知将通过电子邮件发送
-AddNewNotification=激活新的电子邮件通知目标/事件
-ListOfActiveNotifications=列出电子邮件通知的所有活动目标/事件
-ListOfNotificationsDone=列出所有发送电子邮件通知
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Email电子邮箱配置设定 '%s'. 这个模式无法用于邮件群发。
 MailSendSetupIs2=首先您得这么地, 得先有个管理员账号吧 admin , 进入菜单 %s主页 - 设置 - EMails%s 修改参数 <strong>'%s'</strong> 用 '%s'模式。 在此模式下， 您才可输入一个 SMTP 服务器地址 来供您收发邮件。
 MailSendSetupIs3=如果你对 SMTP 服务器的配置方面有疑问, 你可到这里询问 %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=导入的文件必须具有格式<strong>电子邮件
 UseFormatInputEmailToTarget=输入格式为<strong>电子邮件;名称;名字;其他</strong>的字符串
 MailAdvTargetRecipients=收件人（高级选择）
 AdvTgtTitle=填写输入字段以预先选择要定位的第三方或联系人/地址
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=使用interval选择int或float值
 AdvTgtMinVal=最小值
 AdvTgtMaxVal=最大值
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=创建筛选
 AdvTgtOrCreateNewFilter=新筛选器的名称
 NoContactWithCategoryFound=分类没有联系人/地址
 NoContactLinkedToThirdpartieWithCategoryFound=分类没有联系人/地址
-OutGoingEmailSetup=发件服务器设置
-InGoingEmailSetup=传入电子邮件设置
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=默认外发电子邮件设置
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=信息
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index ba5ab7c1706..1fbcea452cd 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=此电子邮件类型没有可用的模板
 AvailableVariables=可用的替代变量
 NoTranslation=没有翻译
 Translation=翻译
+CurrentTimeZone=PHP 服务器的时区
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=空空如也——没有找到记录
 NoRecordDeleted=未删除记录
 NotEnoughDataYet=数据不足
@@ -85,6 +87,8 @@ FileWasNotUploaded=一个文件被选中的附件，但还没有上传。点击
 NbOfEntries=No. of entries
 GoToWikiHelpPage=阅读在线帮助文档 (需要访问外网)
 GoToHelpPage=阅读帮助
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=记录已保存
 RecordDeleted=记录已删除
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=继续付钱
 Module=模块/应用程序
 Modules=模块/应用
 Option=选项
+Filters=Filters
 List=列表
 FullList=全部列表
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=发送电子邮件
 Email=电子邮件
 NoEMail=没有电子邮件
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=没有手机号码
 Owner=拥有者
 FollowingConstantsWillBeSubstituted=以下常量将与相应的值代替。
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/zh_CN/modulebuilder.lang b/htdocs/langs/zh_CN/modulebuilder.lang
index 5c6573c3299..520c9966786 100644
--- a/htdocs/langs/zh_CN/modulebuilder.lang
+++ b/htdocs/langs/zh_CN/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=用于创建/编辑/查看记录的PHP页面
 PageForAgendaTab=事件选项卡的PHP页面
 PageForDocumentTab=文档选项卡的PHP页面
 PageForNoteTab=注释选项卡的PHP页面
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=zip /模块/应用程序包的路径
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=不允许使用空格或特殊字符。
@@ -77,7 +78,7 @@ IsAMeasure=是衡量标准
 DirScanned=扫描目录
 NoTrigger=没有触发器
 NoWidget=无插件
-GoToApiExplorer=转到API资源管理器
+GoToApiExplorer=API explorer
 ListOfMenusEntries=菜单条目列表
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=已定义权限的列表
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=请参阅右上方菜单中的<span class="fa fa-bug"></span>
 AddLanguageFile=添加语言文件
 YouCanUseTranslationKey=你可以在这里使用一个密钥，它是在语言文件中找到的翻译密钥（参见“语言”选项卡）
-DropTableIfEmpty=（删除表格如果为空）
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=表%s不存在
 TableDropped=表%s已删除
 InitStructureFromExistingTable=构建现有表的结构数组字符串
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang
index 4671a563cb1..d0ef798fabf 100644
--- a/htdocs/langs/zh_CN/other.lang
+++ b/htdocs/langs/zh_CN/other.lang
@@ -5,8 +5,6 @@ Tools=工具
 TMenuTools=工具
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=生日
-BirthdayDate=生日
-DateToBirth=Birth date
 BirthdayAlertOn=生日提醒活跃
 BirthdayAlertOff=生日提醒无效
 TransKey=关键TransKey的翻译
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=发票日期的上个月（编号1-12）
 TextPreviousMonthOfInvoice=发票日期的上个月（文本）
 NextMonthOfInvoice=发票日期的下个月（编号1-12）
 TextNextMonthOfInvoice=发票日期的月份（文本）
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip文件生成<b> %s </b>。
 DocFileGeneratedInto=Doc文件生成<b> %s </b>。
 JumpToLogin=断开。转到登录页面...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=如果尚未完成，您可以点击下面的链接进行付款。\n\n%s\n\n
 PredefinedMailContentGeneric=__（你好）__\n\n\n__（此致）__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr是一款具有几百种业务模块支撑的紧凑型ERP / CRM系统。如若所有的业务模块统统向您展示演示我们认为这么做没有任何意义，假如真发生了这样的情况：这几百个业务贵公司统统都涉足到了那么请您直接包养我们吧，土豪请直接 (加我们中国社区QQ群206239089)赞助我们吧，让Dolibarr在中国推得更广走得更远！以下您有几个选择。
 ChooseYourDemoProfil=请选择最贴近贵企业需求的演示…
 ChooseYourDemoProfilMore=...自定义配置<br>（手动选择模块）
@@ -137,7 +138,7 @@ Right=右键
 CalculatedWeight=计算重量
 CalculatedVolume=计算量
 Weight=重量
-WeightUnitton=吨
+WeightUnitton=ton
 WeightUnitkg=公斤
 WeightUnitg=克
 WeightUnitmg=毫克
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=导出区
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index e9ad7c64214..2501a848510 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=价格个数
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=父级包装产品的数量
@@ -167,8 +168,10 @@ BuyingPrices=买价
 CustomerPrices=客户价格
 SuppliersPrices=供应商价格
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=海关/商品/ HS编码
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=产地国
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=使用固定价格
 PriceByQuantity=不同数量价格
 DisablePriceByQty=按数量禁用价格
 PriceByQuantityRange=定量范围
-MultipriceRules=市场价格规则
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% 变化 %s
 PercentDiscountOver=%%折扣超过%s
diff --git a/htdocs/langs/zh_CN/recruitment.lang b/htdocs/langs/zh_CN/recruitment.lang
index 1fd9b48e629..02e8dce6590 100644
--- a/htdocs/langs/zh_CN/recruitment.lang
+++ b/htdocs/langs/zh_CN/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/zh_CN/sendings.lang b/htdocs/langs/zh_CN/sendings.lang
index 265e417e1ae..3abc9d1f869 100644
--- a/htdocs/langs/zh_CN/sendings.lang
+++ b/htdocs/langs/zh_CN/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=这个订单的其他运输
 SendingsAndReceivingForSameOrder=此订单的发货和收货
 SendingsToValidate=运输验证
 StatusSendingCanceled=取消
+StatusSendingCanceledShort=已取消
 StatusSendingDraft=草稿
 StatusSendingValidated=验证（产品出货或已经出货）
 StatusSendingProcessed=加工
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=您必须先验证订单才能发货。
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=更多的送货单(logo. ..完整的文档模板)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=没有定义的常数EXPEDITION_ADDON_NUMBER
 SumOfProductVolumes=产品总数
 SumOfProductWeights=产品总重
diff --git a/htdocs/langs/zh_CN/stocks.lang b/htdocs/langs/zh_CN/stocks.lang
index 2a32f22f414..7074dc7ed0d 100644
--- a/htdocs/langs/zh_CN/stocks.lang
+++ b/htdocs/langs/zh_CN/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/zh_CN/ticket.lang b/htdocs/langs/zh_CN/ticket.lang
index 2d2ab96304e..4cd03733e48 100644
--- a/htdocs/langs/zh_CN/ticket.lang
+++ b/htdocs/langs/zh_CN/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=软件故障
-TicketTypeShortBUGHARD=硬件故障
-TicketTypeShortCOM=商业问题
 
+TicketTypeShortCOM=商业问题
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=其他
 TicketSeverityShortLOW=低
 TicketSeverityShortNORMAL=正常
 TicketSeverityShortHIGH=高
-TicketSeverityShortBLOCKING=临界/阻塞
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=字段'%s'不正确
 MenuTicketMyAssign=我的票据
@@ -60,7 +58,6 @@ OriginEmail=电邮来源
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=没看过
 Read=阅读
 Assigned=分配
 InProgress=进行中
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=公共接口允许任何访问者创建票证
 TicketsAutoAssignTicket=自动分配创建故障单的用户
 TicketsAutoAssignTicketHelp=创建故障单时，可以自动将用户分配给故障单。
 TicketNumberingModules=票据编号模块
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=不在创建时通知公司
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/zh_CN/website.lang b/htdocs/langs/zh_CN/website.lang
index 847c0ea30c2..2b160b7e674 100644
--- a/htdocs/langs/zh_CN/website.lang
+++ b/htdocs/langs/zh_CN/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=添加网站
 Webpage=网页/容器
 AddPage=添加页面/容器
-HomePage=主页
 PageContainer=页面
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=ID为%s的请求页面尚无内容，或者删除了缓存文件.tpl.php。编辑页面内容以解决此问题。
@@ -101,7 +100,7 @@ EmptyPage=空页面
 ExternalURLMustStartWithHttp=外部URL必须以http：//或https：//开头
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/zh_CN/withdrawals.lang b/htdocs/langs/zh_CN/withdrawals.lang
index 952c2388f85..7954b92e88b 100644
--- a/htdocs/langs/zh_CN/withdrawals.lang
+++ b/htdocs/langs/zh_CN/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=最新的%s直接借记收据
 MakeWithdrawRequest=直接付款请求
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s记录了直接付款请求
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=分类记
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=执行日期
 CreateForSepa=创建直接付款文件
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=直接付款订单被拒绝
 InfoRejectMessage=您好，<br> <br>与公司%s相关的发票%s的直接借记支付订单，金额已被%s拒绝了。<br> <br> <br> <br> %s
 ModeWarning=实模式下的选项没有设置，这个模拟后，我们停止
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/zh_HK/accountancy.lang b/htdocs/langs/zh_HK/accountancy.lang
index 3211a0b62df..33ba4d9fea7 100644
--- a/htdocs/langs/zh_HK/accountancy.lang
+++ b/htdocs/langs/zh_HK/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -144,7 +145,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
@@ -198,7 +199,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +208,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +298,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/zh_HK/admin.lang b/htdocs/langs/zh_HK/admin.lang
index f1c41a3b62b..189b0b5186a 100644
--- a/htdocs/langs/zh_HK/admin.lang
+++ b/htdocs/langs/zh_HK/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Display
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=List of OpenDocument templates directories
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Position of Name/Lastname
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu handler where to show new menu
 DetailMenuModule=Module name if menu entry come from a module
@@ -1983,11 +1985,12 @@ EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/zh_HK/banks.lang b/htdocs/langs/zh_HK/banks.lang
index 9500a5b8b2e..a0dc27f86c4 100644
--- a/htdocs/langs/zh_HK/banks.lang
+++ b/htdocs/langs/zh_HK/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/zh_HK/blockedlog.lang b/htdocs/langs/zh_HK/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/zh_HK/blockedlog.lang
+++ b/htdocs/langs/zh_HK/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logical deletion
 logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
 logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
 logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/zh_HK/boxes.lang b/htdocs/langs/zh_HK/boxes.lang
index d6fd298a3a7..7db4ea8aa17 100644
--- a/htdocs/langs/zh_HK/boxes.lang
+++ b/htdocs/langs/zh_HK/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/zh_HK/cashdesk.lang b/htdocs/langs/zh_HK/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/zh_HK/cashdesk.lang
+++ b/htdocs/langs/zh_HK/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/zh_HK/categories.lang b/htdocs/langs/zh_HK/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/zh_HK/categories.lang
+++ b/htdocs/langs/zh_HK/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
 NewCategory=New tag/category
 ModifCat=Modify tag/category
 CatCreated=Tag/category created
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=List of products tags/categories
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Links between products/services and tags/categories
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/zh_HK/companies.lang b/htdocs/langs/zh_HK/companies.lang
index dadff6a7894..8dc815b522e 100644
--- a/htdocs/langs/zh_HK/companies.lang
+++ b/htdocs/langs/zh_HK/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/zh_HK/compta.lang b/htdocs/langs/zh_HK/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/zh_HK/compta.lang
+++ b/htdocs/langs/zh_HK/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/zh_HK/cron.lang b/htdocs/langs/zh_HK/cron.lang
index 1de1251831a..2ebdda1e685 100644
--- a/htdocs/langs/zh_HK/cron.lang
+++ b/htdocs/langs/zh_HK/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup=Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
 CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Number of launches
 CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -56,7 +58,7 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
 DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/zh_HK/errors.lang b/htdocs/langs/zh_HK/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/zh_HK/errors.lang
+++ b/htdocs/langs/zh_HK/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
 ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref used for creation already exists.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Error, the string to replace into is empty
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/zh_HK/exports.lang b/htdocs/langs/zh_HK/exports.lang
index 3549e3f8b23..a0eb7161ef2 100644
--- a/htdocs/langs/zh_HK/exports.lang
+++ b/htdocs/langs/zh_HK/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/zh_HK/mails.lang b/htdocs/langs/zh_HK/mails.lang
index 1235eef3b27..7fd93be7b71 100644
--- a/htdocs/langs/zh_HK/mails.lang
+++ b/htdocs/langs/zh_HK/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
diff --git a/htdocs/langs/zh_HK/main.lang b/htdocs/langs/zh_HK/main.lang
index 96c68cdcfa3..e196120c27d 100644
--- a/htdocs/langs/zh_HK/main.lang
+++ b/htdocs/langs/zh_HK/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -433,6 +437,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -671,7 +676,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1112,8 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/zh_HK/modulebuilder.lang b/htdocs/langs/zh_HK/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/zh_HK/modulebuilder.lang
+++ b/htdocs/langs/zh_HK/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP page to create/edit/view a record
 PageForAgendaTab=PHP page for event tab
 PageForDocumentTab=PHP page for document tab
 PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
 AddLanguageFile=Add language file
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Delete table if empty)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/zh_HK/other.lang b/htdocs/langs/zh_HK/other.lang
index 54c0572d453..0a7b3723ab1 100644
--- a/htdocs/langs/zh_HK/other.lang
+++ b/htdocs/langs/zh_HK/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +138,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/zh_HK/products.lang b/htdocs/langs/zh_HK/products.lang
index 97db059594f..f0c4a5362b8 100644
--- a/htdocs/langs/zh_HK/products.lang
+++ b/htdocs/langs/zh_HK/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/zh_HK/recruitment.lang b/htdocs/langs/zh_HK/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/zh_HK/recruitment.lang
+++ b/htdocs/langs/zh_HK/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/zh_HK/sendings.lang b/htdocs/langs/zh_HK/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/zh_HK/sendings.lang
+++ b/htdocs/langs/zh_HK/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Other shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Shipments to validate
 StatusSendingCanceled=Canceled
+StatusSendingCanceledShort=Canceled
 StatusSendingDraft=Draft
 StatusSendingValidated=Validated (products to ship or already shipped)
 StatusSendingProcessed=Processed
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/zh_HK/stocks.lang b/htdocs/langs/zh_HK/stocks.lang
index 660443bcded..6cf089096dd 100644
--- a/htdocs/langs/zh_HK/stocks.lang
+++ b/htdocs/langs/zh_HK/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/zh_HK/ticket.lang b/htdocs/langs/zh_HK/ticket.lang
index 59519282c80..982fff90ffa 100644
--- a/htdocs/langs/zh_HK/ticket.lang
+++ b/htdocs/langs/zh_HK/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ 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
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/zh_HK/website.lang b/htdocs/langs/zh_HK/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/zh_HK/website.lang
+++ b/htdocs/langs/zh_HK/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/zh_HK/withdrawals.lang b/htdocs/langs/zh_HK/withdrawals.lang
index 114a8d9dd6c..e3bec6f9cb8 100644
--- a/htdocs/langs/zh_HK/withdrawals.lang
+++ b/htdocs/langs/zh_HK/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
index bf49bbd2fba..9a47b96d1dc 100644
--- a/htdocs/langs/zh_TW/accountancy.lang
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -48,6 +48,7 @@ CountriesExceptMe=除了%s以外的所有國家
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=在設定中客戶的主要會計帳戶尚未定義
 MainAccountForSuppliersNotDefined=在設定中供應商的主要會計帳戶尚未定義
@@ -144,7 +145,7 @@ NotVentilatedinAccount=不受會計項目約束
 XLineSuccessfullyBinded=%s 產品/服務成功地指定會計項目
 XLineFailedToBeBinded=%s 產品/服務沒指定任何會計項目
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=頁面顯示要綁定的元件數（建議的最大值：50）
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=開始按最新元件對“待綁定”頁面進行排序
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=開始按最新元件對“完成綁定”頁面進行排序
 
@@ -198,7 +199,8 @@ Docdate=日期
 Docref=參考
 LabelAccount=標籤帳戶
 LabelOperation=標籤操作
-Sens=意義
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=字元編碼
 Lettering=字元
 Codejournal=日記帳
@@ -206,7 +208,8 @@ JournalLabel=日記帳標籤
 NumPiece=件數
 TransactionNumShort=交易編號
 AccountingCategory=個人化群組
-GroupByAccountAccounting=按會計科目分組
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=您可定義某些會計科目大類。他們可以在個人化會計報表中使用。
 ByAccounts=依帳戶
 ByPredefinedAccountGroups=依大類
@@ -248,7 +251,7 @@ PaymentsNotLinkedToProduct=付款未連結到任何產品/服務
 OpeningBalance=初期餘額
 ShowOpeningBalance=顯示初期餘額
 HideOpeningBalance=隱藏初期餘額
-ShowSubtotalByGroup=依組顯示小計
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=會計項目大類
 PcgtypeDesc=用作某些會計報告的預定義“過濾器”和“分組”標準的科目組。例如“ INCOME”或“ EXPENSE”用作產品的會計科目組，以建立費用/收入報告。
@@ -271,11 +274,13 @@ DescVentilExpenseReport=在此查閱費用報表行數是否關聯到費用會
 DescVentilExpenseReportMore=如果您在費用報告類型上設定會計帳戶，則應用程序將能夠在費用報告和會計科目表的會計帳戶之間進行所有綁定，只需點擊按鈕<strong>“ %s”即可</strong> 。如果未在費用字典中設定帳戶，或者您仍有某些行未綁定到任何帳戶，則必須從選單“ <strong>%s</strong> ”進行手動綁定。
 DescVentilDoneExpenseReport=在此查閱費用報表的清單及其費用會計項目。
 
+Closure=Annual closure
 DescClosure=請在此處查詢依照月份的未經驗證活動數和已經開放的會計年度
 OverviewOfMovementsNotValidated=第1步/未驗證移動總覽。 （需要關閉一個會計年度）
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=驗證動作
 DescValidateMovements=禁止修改，刪除任何文字內容。所有條目都必須經過驗證，否則將無法結案
-SelectMonthAndValidate=選擇月份並驗證移動
 
 ValidateHistory=自動關聯
 AutomaticBindingDone=自動關聯已完成
@@ -293,6 +298,7 @@ Accounted=計入總帳
 NotYetAccounted=尚未記入總帳
 ShowTutorial=顯示教程
 NotReconciled=未對帳
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +343,7 @@ Modelcsv_LDCompta10=LD Compta用之匯出（v10及更高版本）
 Modelcsv_openconcerto=匯出為OpenConcerto（測試）
 Modelcsv_configurable=匯出為可設置CSV
 Modelcsv_FEC=匯出為FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=匯出為Sage 50 Switzerland
 Modelcsv_winfic=匯出Winfic-eWinfic-WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index 833e0197a6b..f022316f9da 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -37,8 +37,8 @@ UnlockNewSessions=移除連線鎖定
 YourSession=您的程序
 Sessions=用戶程序
 WebUserGroup=網頁伺服器用戶/組別
-PermissionsOnFilesInWebRoot=Permissions on files in web root directory
-PermissionsOnFile=Permissions on file %s
+PermissionsOnFilesInWebRoot=網站根目錄中檔案的權限
+PermissionsOnFile=檔案%s的權限
 NoSessionFound=您的PHP設定似乎不允許列出活動程序。用於保存程序的資料夾（ <b>%s</b> ）可能受到保護（例如，通過OS權限或PHP指令open_basedir）。
 DBStoringCharset=儲存資料的資料庫字集
 DBSortingCharset=資料排序以資料庫字集
@@ -56,6 +56,8 @@ GUISetup=顯示設定
 SetupArea=設定
 UploadNewTemplate=上傳新的範本
 FormToTestFileUploadForm=用於測試檔案上傳的表格（根據設定）
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=註：若模組<b>%s</b>啓用時，「是的」有效。
 RemoveLock=如果存在<b>%s</b>檔案,刪除/重新命名文件以允許使用更新/安裝工具。
 RestoreLock=還原檔案唯讀權限檔案<b>%s</b> ，以禁止使用更新/安裝工具。
@@ -73,7 +75,7 @@ DisableJavascriptNote=注意：用於測試或調整目的。為了優化盲人
 UseSearchToSelectCompanyTooltip=另外您若有大量合作方 (> 100,000), 您可在 "設定 -> 其他" 設定常數 COMPANY_DONOTSEARCH_ANYWHERE 為 1 增加速度。搜尋則會只限制在字串的開頭。
 UseSearchToSelectContactTooltip=另外您若有大量合作方 (> 100,000), 您可在 " 設定 -> 其他" 中設定常數 CONTACT_DONOTSEARCH_ANYWHERE 為 1 以增加速度。搜尋則會只限制在字串的開頭。
 DelaiedFullListToSelectCompany=等待直到按下任一鍵，然後再加載合作方組合清單的內容。 <br>如果您有大量的合作方，這可能會提高性能，但是不太方便。
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
+DelaiedFullListToSelectContact=載入“聯絡人”組合清單的內容前一直等待到按下任一按鍵。 <br>如果您有大量聯絡人的通訊錄，這可能會提高性能，但不太方便.
 NumberOfKeyToSearch=觸發搜尋的字元號：%s
 NumberOfBytes=位元數
 SearchString=尋找字串
@@ -82,10 +84,9 @@ AllowToSelectProjectFromOtherCompany=在合作方的文件上，可選擇已連
 JavascriptDisabled=JavaScript 不啓動
 UsePreviewTabs=使用預覽分頁
 ShowPreview=顯示預覽
-ShowHideDetails=Show-Hide details
+ShowHideDetails=顯示-隱藏詳細訊息
 PreviewNotAvailable=無法預覽
 ThemeCurrentlyActive=目前可用主題
-CurrentTimeZone=PHP (伺服器)時區
 MySQLTimeZone=MySql (資料庫)時區
 TZHasNoEffect=日期由資料庫伺服器已儲存和已返回，就像它們被保存為提交的字串一樣。時區僅在使用UNIX_TIMESTAMP函數時才有效（Dolibarr不應使用，因此即使輸入資料後更改資料庫TZ也不起作用）。
 Space=空間
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=此區域提供管理功能。使用選單選擇所需的功
 Purge=清除
 PurgeAreaDesc=此頁面允許您刪除Dolibarr產生或儲存的所有文件（暫存檔案或<b>%s</b>目錄中的所有文件）。通常不需要使用此功能。此功能提供無權限刪除Web服務器產生之文件的Dolibarr用戶提供了一種解決方法。
 PurgeDeleteLogFile=刪除 log 檔案，包含Syslog 模組的 <b>%s</b> (沒有遺失資料風險)
-PurgeDeleteTemporaryFiles=刪除所有暫存檔案（沒有丟失資料的風險）。注意：僅對於24小時前於temp目錄產生的檔案才執行刪除操作。
-PurgeDeleteTemporaryFilesShort=刪除範本檔案
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=刪除資料夾中的所有檔案： <b>%s</b> 。 <br>這將刪除所有與元件（合作方，發票等）相關的所有產生文件，上傳到ECM模組中的檔案，資料庫備份轉存和臨時文件。
 PurgeRunNow=立即清除
 PurgeNothingToDelete=沒有可以刪除的資料夾或檔案。
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=首選合作夥伴
 OtherResources=其他資源
 ExternalResources=外部資源
 SocialNetworks=社交網路
+SocialNetworkId=社群網路 ID
 ForDocumentationSeeWiki=有關用戶或開發人員的文件（文件，常見問題...), <br>可在Dolibarr維基查閱： <br> <a href="%s" target="_blank"><b>%s</b></a>
 ForAnswersSeeForum=有關任何其他問題/幫助，您可以使用Dolibarr論壇： <br> <a href="%s" target="_blank"><b>%s</b></a>
 HelpCenterDesc1=以下是獲得Dolibarr幫助和支持的一些資源。
@@ -274,7 +276,7 @@ NoticePeriod=通知期
 NewByMonth=依月份的新通知
 Emails=電子郵件
 EMailsSetup=電子郵件設定
-EMailsDesc=This page allows you to set parameters or options for email sending.
+EMailsDesc=此頁面允許您設定電子郵件傳送的參數或選項。
 EmailSenderProfiles=電子郵件寄件者資訊
 EMailsSenderProfileDesc=您可以將此部分保留空白。如果您在此處輸入一些電子郵件，當您編寫新電子郵件時，它們將被增加到組合框中的可能寄件人清單中。
 MAIN_MAIL_SMTP_PORT=SMTP / SMTPS連接埠（php.ini中的預設值： <b>%s</b> ）
@@ -292,7 +294,7 @@ MAIN_MAIL_SMTPS_ID=SMTP 帳號（如果發送服務器需要身份驗證）
 MAIN_MAIL_SMTPS_PW=SMTP密碼（如果發送伺服器需要身份驗證）
 MAIN_MAIL_EMAIL_TLS=使用TLS（SSL）加密
 MAIN_MAIL_EMAIL_STARTTLS=使用TLS（STARTTLS）加密
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=授權自動簽署證書
 MAIN_MAIL_EMAIL_DKIM_ENABLED=使用數位簽章產生電子郵件簽名
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=使用數位簽章的電子郵件網域
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=數位簽章選擇器名稱
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=目前設定的範例
 ListOfDirectories=OpenDocument 範本資料夾下的清單
 ListOfDirectoriesForModelGenODT=包含具有OpenDocument格式的範本文件的資料夾清單。 <br><br>在這裡放置資料夾的完整路徑。 <br>在eah資料夾之間增加Enter符號。 <br>要增加GED模組的資料夾，請在此處增加<b>DOL_DATA_ROOT/ecm/yourdirectoryname</b> 。 <br><br>這些資料夾中的文件必須以<b>.odt</b>或<b>.ods</b>結尾。
 NumberOfModelFilesFound=在這些資料夾中找到的ODT / ODS範本文件數
-ExampleOfDirectoriesForModelGen=語法範例:<br> ç:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>要了解如何建立odt文件範本，然後將它們存儲在那些資料夾中，請參閱Wiki文件：
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=名字/姓氏的位置
@@ -406,7 +408,7 @@ UrlGenerationParameters=保護網址參數
 SecurityTokenIsUnique=為每個網址使用唯一的安全金鑰參數
 EnterRefToBuildUrl=輸入項目%s的參考值
 GetSecuredUrl=取得計算後網址
-ButtonHideUnauthorized=隱藏非管理員用戶的按鈕以執行未經授權的操作，而不是顯示禁用的灰色按鈕
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=舊營業稅率
 NewVATRates=新營業稅率
 PriceBaseTypeToChange=根據已定義的基礎參考價參修改價格
@@ -555,7 +557,7 @@ Module55Name=條碼
 Module55Desc=條碼管理
 Module56Name=信用轉帳付款
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Payments by Direct Debit
+Module57Name=銀行直接轉帳付款
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=點選撥打
 Module58Desc=點選撥打系統(Asterisk, ...)的整合
@@ -677,7 +679,7 @@ Module63000Name=資源
 Module63000Desc=管理用於分配給事件的資源（印表機，汽車，房間等）
 Permission11=讀取客戶發票
 Permission12=建立/修改客戶發票
-Permission13=Invalidate customer invoices
+Permission13=無效的客戶發票
 Permission14=驗證客戶發票
 Permission15=以電子郵件寄送客戶發票
 Permission16=為客戶發票建立付款
@@ -694,7 +696,7 @@ Permission32=建立/修改產品資訊
 Permission34=刪除產品
 Permission36=查看/管理隱藏的產品
 Permission38=匯出產品資訊
-Permission39=Ignore minimum price
+Permission39=忽略最低價格
 Permission41=讀取專案及任務（已分享專案及以我擔任連絡人的專案）。也可在被指派的任務對自已或等級中輸入耗用的時間（時間表）
 Permission42=建立/修改專案（已分享專案及以我擔任連絡人的專案）。也可以建立任務及指派用戶到專案及任務
 Permission44=刪除專案（已分享專案及以我擔任連絡人的專案）
@@ -703,9 +705,9 @@ Permission61=讀取干預
 Permission62=建立/修改干預
 Permission64=刪除干預
 Permission67=匯出干預
-Permission68=Send interventions by email
-Permission69=Validate interventions
-Permission70=Invalidate interventions
+Permission68=使用電子郵件傳送干預措施
+Permission69=驗證干預措施
+Permission70=無效的干預措施
 Permission71=讀取會員
 Permission72=建立/修改會員
 Permission74=刪除會員
@@ -728,7 +730,7 @@ Permission95=讀取報告
 Permission101=讀取出貨資訊
 Permission102=建立/修改出貨單
 Permission104=驗證出貨單
-Permission105=Send sendings by email
+Permission105=使用電子郵件傳送傳送
 Permission106=匯出出貨單
 Permission109=刪除出貨單
 Permission111=讀取財務帳戶
@@ -836,10 +838,10 @@ Permission402=建立/修改折扣
 Permission403=驗證折扣
 Permission404=刪除折扣
 Permission430=使用除錯欄
-Permission511=Read payments of salaries (yours and subordinates)
+Permission511=讀取薪資支付（您和您的下屬）
 Permission512=建立/修改薪水支付
 Permission514=刪除薪水支付
-Permission517=Read payments of salaries of everybody
+Permission517=讀取每個人的薪資支付
 Permission519=匯出薪水
 Permission520=讀取借款
 Permission522=建立/修改借款
@@ -851,19 +853,19 @@ Permission532=建立/修改服務
 Permission534=刪除服務
 Permission536=查看/管理隱藏服務
 Permission538=匯出服務
-Permission561=Read payment orders by credit transfer
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
-Permission564=Record Debits/Rejections of credit transfer
-Permission601=Read stickers
-Permission602=Create/modify stickers
-Permission609=Delete stickers
+Permission561=讀取以直接轉帳的付款單
+Permission562=建立/修改直接轉帳的付款單
+Permission563=傳送/傳遞直接轉帳的付款單
+Permission564=記錄借方/拒絕的直接轉帳
+Permission601=讀取標籤
+Permission602=建立/修改標籤
+Permission609=刪除標籤
 Permission650=讀取物料清單
 Permission651=新增/更新物料清單
 Permission652=刪除物料清單
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
+Permission660=讀取製造訂單（MO）
+Permission661=建立/更新製造訂單（MO）
+Permission662=刪除製造訂單（MO）
 Permission701=讀取捐款
 Permission702=建立/修改捐款
 Permission703=刪除捐款
@@ -873,8 +875,8 @@ Permission773=刪除費用報告
 Permission774=讀取全部費用報告(甚至非屬於用戶的下屬)
 Permission775=核准費用報告
 Permission776=支付費用報告
-Permission777=Read expense reports of everybody
-Permission778=Create/modify expense reports of everybody
+Permission777=讀取每個人的費用報表
+Permission778=建立/修改每個人的費用報表
 Permission779=匯出費用報告
 Permission1001=讀取庫存資訊
 Permission1002=建立/修改倉庫
@@ -899,9 +901,9 @@ Permission1185=批准採購訂單
 Permission1186=訂購採購訂單
 Permission1187=確認收到採購訂單
 Permission1188=刪除採購訂單
-Permission1189=Check/Uncheck a purchase order reception
+Permission1189=選取/反選取採購訂單接收
 Permission1190=批准（第二次批准）採購訂單
-Permission1191=Export supplier orders and their attributes
+Permission1191=匯出供應商訂單及其屬性
 Permission1201=取得匯出結果
 Permission1202=建立/修改匯出
 Permission1231=讀取供應商發票
@@ -915,8 +917,8 @@ Permission1251=執行從外部資料批次匯入到資料庫的功能 (載入資
 Permission1321=匯出客戶發票、屬性及付款資訊
 Permission1322=重啟已付帳單
 Permission1421=匯出銷售訂單和屬性
-Permission1521=Read documents
-Permission1522=Delete documents
+Permission1521=讀取文件
+Permission1522=刪除文件
 Permission2401=連結到他的用戶帳戶的讀取操作（事件或任務）（如果是事件的所有者或僅被分配）
 Permission2402=建立/修改連結到自己的用戶帳戶（如果是事件所有者）的活動（事件或任務）
 Permission2403=刪除連結到自己用戶帳戶的行動（事件或任務）（如果是事件所有者）
@@ -931,7 +933,7 @@ Permission2515=設定文件資料夾
 Permission2801=在唯讀模式下使用 FTP 客戶端 (僅瀏覽及下載)
 Permission2802=在寫入模式下使用 FTP 客戶端 (可刪除或上傳檔案)
 Permission3200=讀取存檔的事件和指紋
-Permission3301=Generate new modules
+Permission3301=產生新模組
 Permission4001=查看員工
 Permission4002=建立員工
 Permission4003=刪除員工
@@ -951,13 +953,13 @@ Permission23001=讀取預定工作
 Permission23002=建立/更新預定工作
 Permission23003=刪除預定工作
 Permission23004=執行預定工作
-Permission50101=Use Point of Sale (SimplePOS)
-Permission50151=Use Point of Sale (TakePOS)
+Permission50101=使用銷售點（SimplePOS）
+Permission50151=使用銷售點（TakePOS）
 Permission50201=讀取交易
 Permission50202=匯入交易
-Permission50330=Read objects of Zapier
-Permission50331=Create/Update objects of Zapier
-Permission50332=Delete objects of Zapier
+Permission50330=讀取Zapier的物件
+Permission50331=建立/更新Zapier的物件
+Permission50332=刪除Zapier的物件
 Permission50401=將產品和發票與會計科目綁定
 Permission50411=讀取分類帳中的操作
 Permission50412=分類帳中的寫入/編輯操作
@@ -981,17 +983,17 @@ Permission63001=讀取資源
 Permission63002=建立/修改資源
 Permission63003=刪除資源
 Permission63004=連結資源到行程事件
-Permission64001=Allow direct printing
-Permission67000=Allow printing of receipts
-Permission68001=Read intracomm report
-Permission68002=Create/modify intracomm report
-Permission68004=Delete intracomm report
-Permission941601=Read receipts
-Permission941602=Create and modify receipts
-Permission941603=Validate receipts
-Permission941604=Send receipts by email
-Permission941605=Export receipts
-Permission941606=Delete receipts
+Permission64001=允許直接列印
+Permission67000=允許列印收據
+Permission68001=讀取通訊報告
+Permission68002=建立/修改通訊報告
+Permission68004=刪除通訊報告
+Permission941601=讀取收據
+Permission941602=建立和修改收據
+Permission941603=驗證收據
+Permission941604=以電子郵件傳送收據
+Permission941605=匯出收據
+Permission941606=刪除收據
 DictionaryCompanyType=合作方類型
 DictionaryCompanyJuridicalType=法人合作方
 DictionaryProspectLevel=Prospect potential level for companies
@@ -1032,7 +1034,7 @@ DictionaryOpportunityStatus=專案/潛在的潛在狀態
 DictionaryExpenseTaxCat=費用報表 -交通類別
 DictionaryExpenseTaxRange=費用報表 - 依交通類別劃分範圍
 DictionaryTransportMode=Intracomm report - Transport mode
-TypeOfUnit=Type of unit
+TypeOfUnit=單位類型
 SetupSaved=設定已儲存
 SetupNotSaved=設定未儲存
 BackToModuleList=返回模組清單
@@ -1083,7 +1085,7 @@ LabelUsedByDefault=若代號沒有找翻譯字句，則使用預設標籤
 LabelOnDocuments=文件標籤
 LabelOrTranslationKey=標籤或翻譯秘鑰
 ValueOfConstantKey=常數設置的值
-ConstantIsOn=Option %s is on
+ConstantIsOn= 選項%s啟用中
 NbOfDays=天數
 AtEndOfMonth=月底
 CurrentNext=現在/下一個
@@ -1128,7 +1130,7 @@ LoginPage=登入頁面
 BackgroundImageLogin=背景圖片
 PermanentLeftSearchForm=左側選單上的永久搜尋表格
 DefaultLanguage=預設語言
-EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
+EnableMultilangInterface=為客戶或供應商關係啟用多語言支援
 EnableShowLogo=在選單中顯示公司logo
 CompanyInfo=公司/組織
 CompanyIds=公司/組織身分
@@ -1182,7 +1184,7 @@ InfoWebServer=關於網頁伺服器
 InfoDatabase=關於資料庫
 InfoPHP=關於 PHP
 InfoPerf=關於效能
-InfoSecurity=About Security
+InfoSecurity=關於安全性
 BrowserName=瀏覽器名稱
 BrowserOS=瀏覽器系統
 ListOfSecurityEvents=Dolibarr 安全事件清單
@@ -1233,7 +1235,7 @@ RestoreDesc2=將“ 文件”資料夾的備份文件（例如zip文件）還原
 RestoreDesc3=將資料庫結構和數據從備份檔案還原到新Dolibarr安裝的資料庫或目前安裝的資料庫 (<b>%s</b>)中。警告，還原完成後，您必須使用備份時間/安裝中存在的登入名稱/密碼才能再次連接。 <br>要將備份數據庫還原到目前安裝中，可以依照此助手進行操作。
 RestoreMySQL=MySQL匯入
 ForcedToByAModule=有一啟動模組強制<b>%s</b>適用此規則
-ValueIsForcedBySystem=This value is forced by the system. You can't change it.
+ValueIsForcedBySystem=此數值由系統設定。您無法更改。
 PreviousDumpFiles=現有備份檔案
 PreviousArchiveFiles=現有壓縮檔案
 WeekStartOnDay=一周的第一天
@@ -1294,8 +1296,8 @@ WarningAtLeastKeyOrTranslationRequired=搜索條件至少要有一個值或翻
 NewTranslationStringToShow=顯示新翻譯字串
 OriginalValueWas=已覆蓋原始翻譯。 原始翻譯是：<br><br>%s
 TransKeyWithoutOriginalValue=您為任何語言文件中都不存在的翻譯密鑰'<strong>%s</strong>'強制進行了新翻譯
-TitleNumberOfActivatedModules=Activated modules
-TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=已啟用模組
+TotalNumberOfActivatedModules=已啟用模組: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=您至少要啟用 1 個模組
 ClassNotFoundIntoPathWarning=在PHP路徑中找不到類別%s
 YesInSummer=是的，在夏天
@@ -1564,7 +1566,7 @@ LDAPDescValues=範例值是為具有以下載入模式的<b>OpenLDAP</b>設計
 ForANonAnonymousAccess=已驗證存取(例如寫入存取)
 PerfDolibarr=效能設定/最佳化報告
 YouMayFindPerfAdviceHere=此頁面提供了一些與性能有關的檢查或建議。
-NotInstalled=Not installed.
+NotInstalled=未安裝。
 NotSlowedDownByThis=Not slowed down by this.
 NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=應用程式快取
@@ -1689,7 +1691,7 @@ NotTopTreeMenuPersonalized=個人化選單沒有連結到頂端選單項目
 NewMenu=新選單
 MenuHandler=選單處理程式
 MenuModule=原始碼模組
-HideUnauthorizedMenu= 隱藏未經授權的選單（灰色）
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=選單編號
 DetailMenuHandler=顯示新的選單的選單處理程式
 DetailMenuModule=若選單項目來自一個模組則為模組名稱
@@ -1983,11 +1985,12 @@ EMailHost=IMAP伺服器主機
 MailboxSourceDirectory=信箱來源資料夾
 MailboxTargetDirectory=信箱目標資料夾
 EmailcollectorOperations=收集器要做的操作
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=每次收集電子郵件的最大數量
 CollectNow=立刻收集
 ConfirmCloneEmailCollector=您確定要複製電子郵件收集器%s嗎？
-DateLastCollectResult=最新嘗試收集日期
-DateLastcollectResultOk=最新收集成功日期
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=最新結果
 EmailCollectorConfirmCollectTitle=郵件收集確認
 EmailCollectorConfirmCollect=您是否要立即執行此收集器的收集？
@@ -2005,7 +2008,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=選單輸入代碼（主選單）
 ECMAutoTree=顯示自動ECM樹狀圖
@@ -2073,9 +2076,9 @@ RssNote=注意：每個RSS feed定義都提供一個小部件，您必須啟用
 JumpToBoxes=跳至設定 -> 小部件
 MeasuringUnitTypeDesc=使用值例如 "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=比例尺是您必須移動小數部分以匹配默認參考單位的位數。對於“時間”單位類型，它是秒數。 80到99之間的值是保留值。
-TemplateAdded=Template added
-TemplateUpdated=Template updated
-TemplateDeleted=Template deleted
+TemplateAdded=範本已增加
+TemplateUpdated=範本已更新
+TemplateDeleted=範本已刪除
 MailToSendEventPush=Event reminder email
 SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
 DictionaryProductNature= 產品性質
@@ -2083,3 +2086,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
diff --git a/htdocs/langs/zh_TW/agenda.lang b/htdocs/langs/zh_TW/agenda.lang
index dbc8cb5e692..068e61c9e43 100644
--- a/htdocs/langs/zh_TW/agenda.lang
+++ b/htdocs/langs/zh_TW/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=事件集數量
 ListOfActions=事件清單
 EventReports=事件報表
 Location=位置
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=整天事件
 MenuToDoActions=全部未完成事件
 MenuDoneActions=全部已停止事件
@@ -86,8 +86,8 @@ ProposalDeleted=提案/建議書已刪除
 OrderDeleted=訂單已刪除
 InvoiceDeleted=發票已刪除
 DraftInvoiceDeleted=發票草稿已刪除
-CONTACT_CREATEInDolibarr=Contact %s created
-CONTACT_DELETEInDolibarr=Contact %s deleted
+CONTACT_CREATEInDolibarr=聯絡人%s已建立
+CONTACT_DELETEInDolibarr=聯絡人%s已刪除
 PRODUCT_CREATEInDolibarr=產品 %s 已建立
 PRODUCT_MODIFYInDolibarr=產品 %s 已修改
 PRODUCT_DELETEInDolibarr=產品 %s 已刪除
@@ -111,7 +111,7 @@ TICKET_CLOSEInDolibarr=服務單%s已關閉
 TICKET_DELETEInDolibarr=服務單%s已刪除
 BOM_VALIDATEInDolibarr=物料清單(BOM)已驗證
 BOM_UNVALIDATEInDolibarr=物料清單(BOM)未驗證
-BOM_CLOSEInDolibarr=物料清單(BOM)已禁用
+BOM_CLOSEInDolibarr=物料清單已停用
 BOM_REOPENInDolibarr=物料清單(BOM)重新打開
 BOM_DELETEInDolibarr=物料清單(BOM)已刪除
 MRP_MO_VALIDATEInDolibarr=MO已驗證
@@ -152,6 +152,7 @@ ActionType=事件類別
 DateActionBegin=事件開始日期
 ConfirmCloneEvent=您確定要複製事件 <b>%s</b>?
 RepeatEvent=重覆事件
+OnceOnly=只有一次
 EveryWeek=每周
 EveryMonth=每月
 DayOfMonth=一個月中的某天
@@ -165,4 +166,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/zh_TW/banks.lang b/htdocs/langs/zh_TW/banks.lang
index 9efdccb1287..7faa8119c1d 100644
--- a/htdocs/langs/zh_TW/banks.lang
+++ b/htdocs/langs/zh_TW/banks.lang
@@ -173,8 +173,8 @@ SEPAMandate=歐洲統一支付區要求
 YourSEPAMandate=您的歐洲統一支付區要求
 FindYourSEPAMandate=這是您SEPA的授權，授權我們公司向您的銀行直接付款。退還已簽名（掃描已簽名文檔）或通過郵件發送至
 AutoReportLastAccountStatement=進行對帳時，自動用最後一個對帳單編號填寫“銀行對帳單編號”欄位
-CashControl=POS現金圍欄
-NewCashFence=新現金圍欄
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=動作顏色
 BankColorizeMovementDesc=如果啟用此功能，則可以為借款方或貸款方動作選擇特定的背景顏色
 BankColorizeMovementName1=借款方動作的背景顏色
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index 6ff4433dde0..605092ba14d 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/bills.lang
@@ -11,9 +11,9 @@ BillsSuppliersUnpaidForCompany=%s的未付款供應商發票
 BillsLate=逾期付款
 BillsStatistics=客戶發票統計
 BillsStatisticsSuppliers=供應商發票統計
-DisabledBecauseDispatchedInBookkeeping=已經停用,因為發票已發送到記帳簿中
-DisabledBecauseNotLastInvoice=已停用，因為發票不可清除。在這之後一些發票已被紀錄，並且會在記數器上產生空洞。
-DisabledBecauseNotErasable=已停用,因為無法清除
+DisabledBecauseDispatchedInBookkeeping=已關閉,因為發票已發送到記帳簿中
+DisabledBecauseNotLastInvoice=已關閉,因為發票無法抹除。已有一些發票已在這之後被紀錄，並且會在計數器中產生破洞。
+DisabledBecauseNotErasable=已關閉,因為無法清除
 InvoiceStandard=標準發票
 InvoiceStandardAsk=標準發票
 InvoiceStandardDesc=此種發票為一般性發票。
@@ -22,16 +22,16 @@ InvoiceDepositAsk=預付款發票
 InvoiceDepositDesc=當收到預付款後，這種發票便完成了。
 InvoiceProForma=形式發票
 InvoiceProFormaAsk=形式發票
-InvoiceProFormaDesc=<b>形式發票</b>是發票的形式，但沒有真實的會計價值。
+InvoiceProFormaDesc=<b>預編發票</b>是真實發票的影像但沒有真實的會計值。
 InvoiceReplacement=替換發票
 InvoiceReplacementAsk=替換發票的發票
 InvoiceReplacementDesc=<b>替換發票</b>用於完全替換尚未收到付款的發票。 <br><br>注意：只能替換沒有付款的發票。如果您要替換的發票尚未關閉，它將自動關閉為“放棄”。
-InvoiceAvoir=信用票據(折讓單-credit notes)
-InvoiceAvoirAsk=信用票據(credit notes)用來更正發票
-InvoiceAvoirDesc=<b>信用票據</b>(折讓單-credit notes)是一種負值發票，用於更正發票顯示的金額與實際支付的金額不同的事實（例如，客戶誤付了太多，或者由於退還了某些產品而無法支付全部金額）`。
-invoiceAvoirWithLines=從原始發票中的行建立信用票據(折讓單-credit notes)
-invoiceAvoirWithPaymentRestAmount=建立有未付款提醒原始發票的信用票據(折讓單-credit notes)
-invoiceAvoirLineWithPaymentRestAmount=未付款提醒餘額的信用票據(折讓單-credit notes)
+InvoiceAvoir=同意折讓照會通知
+InvoiceAvoirAsk=同意折讓照會通知來更正發票
+InvoiceAvoirDesc=<b>同意折讓照會通知</b>就是交易中如有積欠對方款項，例如出貨的損害或錯誤的賠償等等，均可開立 Credit Note 給對方，表示我方願意賠償與還款的誠意，亦即我方欠對方多少錢的意思。（例如，客戶誤付了太多，或者由於退還了某些產品而無法支付全部金額）`。
+invoiceAvoirWithLines=從原始發票項目中建立同意折讓照會通知
+invoiceAvoirWithPaymentRestAmount=建立原始發票尚有未付款的同意折讓照會通知
+invoiceAvoirLineWithPaymentRestAmount=尚未付款金額的同意折讓照會通知
 ReplaceInvoice=替換發票%s
 ReplacementInvoice=替換發票
 ReplacedByInvoice=依發票%s替換
@@ -39,17 +39,17 @@ ReplacementByInvoice=依發票替換
 CorrectInvoice=正確發票%s
 CorrectionInvoice=更正發票
 UsedByInvoice=被用於支付發票%s
-ConsumedBy=消耗者
+ConsumedBy=消耗由
 NotConsumed=非消耗品
-NoReplacableInvoice=沒有可替換的發票
-NoInvoiceToCorrect=沒有任何發票(invoice)可以更正
-InvoiceHasAvoir=是一個或幾個信用票據(折讓單-credit notes)的來源
+NoReplacableInvoice=無可替換發票
+NoInvoiceToCorrect=無發票可更正
+InvoiceHasAvoir=是一個或幾個同意折讓照會通知的來源
 CardBill=發票卡
-PredefinedInvoices=預定義的發票
+PredefinedInvoices=預定義之發票
 Invoice=發票
 PdfInvoiceTitle=發票
 Invoices=發票
-InvoiceLine=發票行
+InvoiceLine=發票項目
 InvoiceCustomer=客戶發票
 CustomerInvoice=客戶發票
 CustomersInvoices=客戶發票
@@ -61,20 +61,20 @@ Payment=付款
 PaymentBack=退款
 CustomerInvoicePaymentBack=退款
 Payments=付款
-PaymentsBack=退回付款
+PaymentsBack=退款
 paymentInInvoiceCurrency=發票幣別
-PaidBack=退款
+PaidBack=償還
 DeletePayment=刪除付款
 ConfirmDeletePayment=您確定要刪除此付款？
-ConfirmConvertToReduc=您是否要將%s轉換為可用信用？
+ConfirmConvertToReduc=您是否要將%s轉換為可用貸項？
 ConfirmConvertToReduc2=此金額將保存在所有折扣中，並可用作此客戶目前或未來發票的折扣。
-ConfirmConvertToReducSupplier=您是否要將%s轉換為可用信用？
+ConfirmConvertToReducSupplier=您是否要將%s轉換為貸項？
 ConfirmConvertToReducSupplier2=此金額將保存在所有折扣中，並可用作此供應商目前或未來發票的折扣。
 SupplierPayments=供應商付款
 ReceivedPayments=收到付款
 ReceivedCustomersPayments=從客戶收到的付款
 PayedSuppliersPayments=支付給供應商的款項
-ReceivedCustomersPaymentsToValid=待驗證的客戶已付款單據
+ReceivedCustomersPaymentsToValid=收到客戶已付款去驗證
 PaymentsReportsForYear=%s的付款報告
 PaymentsReports=付款報告
 PaymentsAlreadyDone=付款已完成
@@ -83,27 +83,27 @@ PaymentRule=付款條件
 PaymentMode=付款類型
 PaymentTypeDC=借/貸卡片
 PaymentTypePP=PayPal
-IdPaymentMode=付款類型（ID）
+IdPaymentMode=付款類型 (id)
 CodePaymentMode=付款類型（編碼）
 LabelPaymentMode=付款類型（標籤）
 PaymentModeShort=付款類型
-PaymentTerm=付款期限
+PaymentTerm=付款條件
 PaymentConditions=付款條件
 PaymentConditionsShort=付款條件
 PaymentAmount=付款金額
-PaymentHigherThanReminderToPay=付款高於提醒付款金額
-HelpPaymentHigherThanReminderToPay=注意，一張或多張帳單的付款金額高於未付金額。<br>編輯您的輸入，否則請確認並考慮為每張超額支付的發票建立信用票據(折讓單-credit notes)。
-HelpPaymentHigherThanReminderToPaySupplier=注意，一張或多張帳單的付款金額高於未付金額。<br>編輯您的輸入，否則請確認並考慮為每張超額支付的發票建立信用票據(折讓單-credit notes)。
-ClassifyPaid=分類'已付款'
-ClassifyUnPaid=分類'未付款'
-ClassifyPaidPartially=分類'部份支付'
-ClassifyCanceled=分類'已放棄'
-ClassifyClosed=分類'已關閉'
-ClassifyUnBilled=分類'未開票'
+PaymentHigherThanReminderToPay=付款高於付款提醒金額
+HelpPaymentHigherThanReminderToPay=注意，一張或多張帳單的付款金額高於未付金額。<br>編輯您的輸入，否則請確認並考慮為每張超額支付的發票建立同意折讓照會通知。
+HelpPaymentHigherThanReminderToPaySupplier=注意，一張或多張帳單的付款金額高於未付金額。<br>編輯您的輸入，否則請確認並考慮為每張超額支付的發票建立同意折讓照會通知。
+ClassifyPaid=分類 '已付款'
+ClassifyUnPaid=分類 '未付款'
+ClassifyPaidPartially=分類 '部份支付'
+ClassifyCanceled=分類 '已放棄'
+ClassifyClosed=分類 '已結'
+ClassifyUnBilled=分類 '未支付'
 CreateBill=建立發票
-CreateCreditNote=建立信用票據(折讓單-credit notes)
-AddBill=建立發票或信用票據(折讓單-credit notes)
-AddToDraftInvoices=增加到草稿發票
+CreateCreditNote=建立同意折讓照會通知
+AddBill=建立發票或同意折讓照會通知
+AddToDraftInvoices=增加至發票草稿
 DeleteBill=刪除發票
 SearchACustomerInvoice=搜尋客戶發票
 SearchASupplierInvoice=搜尋供應商發票
@@ -116,13 +116,13 @@ ConvertExcessReceivedToReduc=將超額付款轉換為可用信用額
 ConvertExcessPaidToReduc=將超額付款轉換為可用折扣
 EnterPaymentReceivedFromCustomer=輸入從客戶收到的付款
 EnterPaymentDueToCustomer=應付客戶款項
-DisabledBecauseRemainderToPayIsZero=已禁用，因為剩餘的未付餘額為零
+DisabledBecauseRemainderToPayIsZero=已關閉,因為剩餘的未付餘額為零
 PriceBase=價格基準
 BillStatus=發票狀態
 StatusOfGeneratedInvoices=已產生發票的狀態
 BillStatusDraft=草稿（等待驗證）
 BillStatusPaid=已付款
-BillStatusPaidBackOrConverted=信用票據(折讓單-credit notes)退款或已標記為可貸
+BillStatusPaidBackOrConverted=同意折讓照會通知退款或已標記為貸項
 BillStatusConverted=已付款（已可在最終發票中消費）
 BillStatusCanceled=已放棄
 BillStatusValidated=已驗證（需要付費）
@@ -184,10 +184,10 @@ ConfirmCancelBill=您確定要取消發票<b>%s</b>嗎？
 ConfirmCancelBillQuestion=您為什麼要將此發票分類為“廢棄”？
 ConfirmClassifyPaidPartially=您確定要將發票<b>%s</b>更改為已付款狀態嗎？
 ConfirmClassifyPaidPartiallyQuestion=該發票尚未完全支付。關閉此發票的原因是什麼？
-ConfirmClassifyPaidPartiallyReasonAvoir=剩餘的未付款項<b>（%s %s）</b>是折扣，因為付款是在到期日前進行的。我用固定營業稅在信用票據(折讓單-credit notes)上。
+ConfirmClassifyPaidPartiallyReasonAvoir=剩餘未付款項<b>（%s %s）</b>同意為折扣，因為付款是在到期日前完成的。我調整了固定營業稅在同意折讓照會通知上。
 ConfirmClassifyPaidPartiallyReasonDiscount=未付款餘額<b>（%s %s）</b>是折扣，因為付款是在付款到期日前進行的。
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=未付款餘額<b>（%s %s）</b>是折扣，因為付款是在付款到期日前進行的。。我司接受此折扣不加營業稅。
-ConfirmClassifyPaidPartiallyReasonDiscountVat=未付款餘額<b>（%s %s）</b>是折扣，因為付款是在付款到期日前進行的。我可以在沒有信用票據(折讓單-credit notes)的情況下以這種折扣方式回復營業稅。
+ConfirmClassifyPaidPartiallyReasonDiscountVat=剩餘未付款項<b>(%s %s)</b>同意為折扣，因為付款是在付款到期日前完成的。我在沒有同意折讓照會通知的情況下以這種折扣方式恢復營業稅。
 ConfirmClassifyPaidPartiallyReasonBadCustomer=壞客戶
 ConfirmClassifyPaidPartiallyReasonProductReturned=產品部分退貨
 ConfirmClassifyPaidPartiallyReasonOther=因其他原因而放棄的金額
@@ -196,7 +196,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=在某些國家/地區，只
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=如果其他所有條件都不適合，請使用此選項
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>壞客戶</b>是拒絕付款的客戶。
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=由於部分產品已退還而付款未完成時，使用此選項
-ConfirmClassifyPaidPartiallyReasonOtherDesc=如果其他所有條件都不適合，請使用此選項，例如在以下情況下： <br> -付款不完整，因為一些產品被運回<br> -聲稱金額太重要，因為忘記了折扣<br>在所有情況下，都必須通過建立信用票據(折讓單-credit notes)在會計系統中更正超額的金額。
+ConfirmClassifyPaidPartiallyReasonOtherDesc=如果其他所有選項都不適用，請使用此選擇，例如在以下情況下: <br> - 付款不完整因為一些產品被運回<br> - 聲稱金額太重要因為忘記了折扣<br>在所有情況下，都必須建立同意折讓照會通知在會計系統中更正超額的金額。
 ConfirmClassifyAbandonReasonOther=其他
 ConfirmClassifyAbandonReasonOtherDesc=此選擇將在所有其他情況下使用。例如，因為您計劃建立替換發票。
 ConfirmCustomerPayment=您確認此為<b>%s</b> %s的付款金額？
@@ -210,7 +210,7 @@ AmountOfBills=發票金額
 AmountOfBillsHT=發票金額（稅後）
 AmountOfBillsByMonthHT=每月發票(invoice)金額（稅後）
 UseSituationInvoices=允許發票狀況
-UseSituationInvoicesCreditNote=允許發票狀況信用票據(折讓單-credit notes)
+UseSituationInvoicesCreditNote=允許狀況開立同意折讓照會通知
 Retainedwarranty=有保修
 AllowedInvoiceForRetainedWarranty=保留保固，可用於以下類型的發票
 RetainedwarrantyDefaultPercent=有保修預設百分比
@@ -228,7 +228,7 @@ RetainedWarrantyDateLimit=保修期限制
 RetainedWarrantyNeed100Percent=發票情況需要以100%%的進度顯示在PDF上
 AlreadyPaid=已付款
 AlreadyPaidBack=已償還
-AlreadyPaidNoCreditNotesNoDeposits=已付款（無信用票據(折讓單-credit notes)和預付款）
+AlreadyPaidNoCreditNotesNoDeposits=已付款 (無同意折讓照會通知及訂金）
 Abandoned=已放棄
 RemainderToPay=未付款餘額
 RemainderToTake=剩餘金額
@@ -287,18 +287,18 @@ AddRelativeDiscount=建立相對折扣
 EditRelativeDiscount=編輯相對折扣
 AddGlobalDiscount=新增絕對折扣
 EditGlobalDiscounts=編輯絕對折扣
-AddCreditNote=建立信用票據(折讓單-credit notes)
+AddCreditNote=建立同意折讓照會通知
 ShowDiscount=顯示折扣
 ShowReduc=顯示折扣
 ShowSourceInvoice=顯示來源發票
 RelativeDiscount=相對折扣
 GlobalDiscount=全域折扣
-CreditNote=信用票據(折讓單-credit notes)
-CreditNotes=信用票據(折讓單-credit notes)
-CreditNotesOrExcessReceived=信用票據(折讓單-credit notes)或收到的超額款項
+CreditNote=同意折讓照會通知
+CreditNotes=同意折讓照會通知
+CreditNotesOrExcessReceived=同意折讓照會通知或收到的超額款項
 Deposit=預付款
 Deposits=預付款
-DiscountFromCreditNote=信用票據(折讓單-credit notes)%s的折扣
+DiscountFromCreditNote=從同意折讓照會通知 %s的折扣
 DiscountFromDeposit=發票%s的預付款
 DiscountFromExcessReceived=付款超過發票%s
 DiscountFromExcessPaid=付款超過發票%s
@@ -336,7 +336,7 @@ RemoveDiscount=取消折扣
 WatermarkOnDraftBill=草案發票上的水印（如果為空，則一無所有）
 InvoiceNotChecked=未選擇發票
 ConfirmCloneInvoice=您確定要複製此發票<b>%s</b>嗎？
-DisabledBecauseReplacedInvoice=由於發票已被替換，因此操作被禁用
+DisabledBecauseReplacedInvoice=由於發票已被替換，因此操作被關閉
 DescTaxAndDividendsArea=該區域提供了所有特殊費用付款的摘要。這裡僅包括在固定年度內付款的記錄。
 NbOfPayments=付款編號
 SplitDiscount=將折扣分為兩部份
@@ -358,7 +358,7 @@ ListOfPreviousSituationInvoices=舊狀況發票清單
 ListOfNextSituationInvoices=下個狀況發票清單
 ListOfSituationInvoices=狀況發票的清單
 CurrentSituationTotal=目前狀況總數
-DisabledBecauseNotEnouthCreditNote=要從周期中刪除狀況發票，此發票的信用票據(折讓單-credit notes)總計必須涵蓋該發票總計
+DisabledBecauseNotEnouthCreditNote=要從周期中刪除狀況發票，發票的同意折讓照會通知總和必須補足此發票的總和
 RemoveSituationFromCycle=從周期中刪除此發票
 ConfirmRemoveSituationFromCycle=從周期中刪除此%s發票？
 ConfirmOuting=確認中
@@ -441,8 +441,8 @@ BankAccountNumberKey=校驗碼
 Residence=地址
 IBANNumber=IBAN帳號
 IBAN=IBAN
-CustomerIBAN=IBAN of customer
-SupplierIBAN=IBAN of vendor
+CustomerIBAN=客戶國際銀行帳戶號碼
+SupplierIBAN=供應商國際銀行帳戶號碼
 BIC=BIC / SWIFT
 BICNumber=BIC / SWIFT代碼
 ExtraInfos=額外信息
@@ -498,7 +498,7 @@ ExpectedToPay=預期付款
 CantRemoveConciliatedPayment=無法刪除對帳款
 PayedByThisPayment=支付這筆款項
 ClosePaidInvoicesAutomatically=完全付款後，將所有標準，預付款或替換發票自動分類為“已付款”。
-ClosePaidCreditNotesAutomatically=完全退款後，將所有信用票據(折讓單-credit notes)自動分類為“已付款”。
+ClosePaidCreditNotesAutomatically=當已完全退款後將所有同意折讓照會通知自動分類為 "已付款"。
 ClosePaidContributionsAutomatically=完全付款後，將所有社會或財政捐款自動分類為“已付款”。
 AllCompletelyPayedInvoiceWillBeClosed=所有沒有餘款的發票將自動關閉，狀態為“已付款”。
 ToMakePayment=付款
@@ -512,10 +512,10 @@ YouMustCreateStandardInvoiceFirstDesc=您必須先建立標準發票，然後將
 PDFCrabeDescription=發票PDF範本Crabe。完整的發票範本（Sponge範本的舊範本）
 PDFSpongeDescription=發票PDF範本Sponge。完整的發票範本
 PDFCrevetteDescription=發票PDF範本Crevette。狀況發票的完整發票範本
-TerreNumRefModelDesc1=退回編號格式，標準發票為%syymm-nnnn，信用票據(折讓單-credit notes)是%syymm-nnnn的格式，其中yy是年，mm是月，nnnn是不間斷且不返回0的序列
-MarsNumRefModelDesc1=退回編號格式,標準發票退回格式為%syymm-nnnn，替換發票為%syymm-nnnn，預付款發票為%syymm-nnnn，信用票據(折讓單-credit notes)為 %syymm-nnnn，其中yy是年,mm是月,nnnn不間斷且不返回0的序列
+TerreNumRefModelDesc1=轉回數字的格式，標準發票為%syymm-nnnn 及同意折讓照會通知是%syymm-nnnn，其中 yy 是年，mm 是月，nnnn 是無空白且不返回 0 的序列
+MarsNumRefModelDesc1=轉回數字格式，標準發票為%syymm-nnnn，替換發票為%syymm-nnnn，訂金發票為%syymm-nnnn，同意折讓照會通知為 %syymm-nnnn，其中 yy 是年，mm 是月，nnnn 為無空白且不返回 0 的序列
 TerreNumRefModelError=以$ syymm開頭的帳單已經存在，並且與該序列模型不符合。將其刪除或重新命名以啟動此模組。
-CactusNumRefModelDesc1=退回編號格式，標準發票的退回格式為%syymm-nnnn，信用票據(折讓單-credit notes)格式為%syymm-nnnn，預付款發票格式為%syymm-nnnn，其中yy為年，mm為月，nnnn為不間斷且不返回0的序列
+CactusNumRefModelDesc1=轉回數字格式，標準發票為%syymm-nnnn，同意折讓照會通知為%syymm-nnnn，訂金發票格式為%syymm-nnnn，其中 yy 為年，mm 為月，nnnn 為無空白且不返回0的序列
 EarlyClosingReason=提前關閉原因
 EarlyClosingComment=提前關閉註記
 ##### Types de contacts #####
@@ -531,6 +531,7 @@ TypeContact_invoice_supplier_external_SERVICE=供應商服務聯絡人
 InvoiceFirstSituationAsk=第一張狀況發票
 InvoiceFirstSituationDesc=<b>狀況發票</b>與進度（例如建築進度）相關的狀況相關聯。每種狀況都與發票相關。
 InvoiceSituation=狀況發票
+PDFInvoiceSituation=狀況發票
 InvoiceSituationAsk=根據狀況開具發票
 InvoiceSituationDesc=在已經存在的狀況下建立新的狀況
 SituationAmount=狀況發票金額（淨額）
@@ -539,7 +540,7 @@ ModifyAllLines=修改所有行
 CreateNextSituationInvoice=建立下一個狀況
 ErrorFindNextSituationInvoice=錯誤,無法找到下一個狀況周期參考
 ErrorOutingSituationInvoiceOnUpdate=無法為此狀況開票。
-ErrorOutingSituationInvoiceCreditNote=無法開立已連結的信用票據(折讓單-credit notes)。
+ErrorOutingSituationInvoiceCreditNote=無法開立已連結的同意折讓照會通知。
 NotLastInCycle=此發票不是周期中最新的，不能修改。
 DisabledBecauseNotLastInCycle=下一個狀況已經存在。
 DisabledBecauseFinal=此為最後狀況。
@@ -575,3 +576,7 @@ BILL_SUPPLIER_DELETEInDolibarr=供應商發票已刪除
 UnitPriceXQtyLessDiscount=單價 x 數量 - 折讓
 CustomersInvoicesArea=客戶計費區
 SupplierInvoicesArea=供應商付款區
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/zh_TW/blockedlog.lang b/htdocs/langs/zh_TW/blockedlog.lang
index 98a1bcf5d5c..2dc2c84cd6e 100644
--- a/htdocs/langs/zh_TW/blockedlog.lang
+++ b/htdocs/langs/zh_TW/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=不可更改的日誌
 ShowAllFingerPrintsMightBeTooLong=顯示所有存檔的日誌（可能很長）
 ShowAllFingerPrintsErrorsMightBeTooLong=顯示所有無效的歸檔日誌（可能很長）
 DownloadBlockChain=下載指紋
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=歸檔的日誌條目無效。這意味著某人（黑客？）在記錄後已經修改了該記錄的某些數據，或者刪除了先前的存檔記錄（檢查是否存在具有先前＃號的行）。
 OkCheckFingerprintValidity=歸檔日誌記錄有效。此行上的數據未修改，並且該條目位於上一個條目之後。
 OkCheckFingerprintValidityButChainIsKo=與以前的日誌相比，已歸檔的日誌似乎有效，但是先前的鏈已損壞。
 AddedByAuthority=已儲存到遠端授權中
@@ -35,7 +35,7 @@ logDON_DELETE=捐贈邏輯刪除
 logMEMBER_SUBSCRIPTION_CREATE=會員訂閱已建立
 logMEMBER_SUBSCRIPTION_MODIFY=會員訂閱已修改
 logMEMBER_SUBSCRIPTION_DELETE=會員訂閱邏輯刪除
-logCASHCONTROL_VALIDATE=現金圍欄記錄
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=客戶發票下載
 BlockedLogBillPreview=客戶發票預覽
 BlockedlogInfoDialog=日誌詳細訊息
@@ -46,9 +46,9 @@ logDOC_PREVIEW=預覽經過驗證的文件以進行列印或下載
 logDOC_DOWNLOAD=下載經過驗證的文件以進行列印或發送
 DataOfArchivedEvent=存檔事件的完整數據
 ImpossibleToReloadObject=未連結原始項目（類型為%s，編號為%s）（請參閱“完整數據”列以獲取不可更改的保存數據）
-BlockedLogAreRequiredByYourCountryLegislation=您所在國家/地區的法規可能要求使用不可更改的日誌模組。禁用此模組可能會使任何未來的交易在法律和法律軟件使用方面均無效，因為它們無法通過稅務審核進行驗證。
-BlockedLogActivatedBecauseRequiredByYourCountryLegislation=由於您所在國家/地區的法律，“不可更改的日誌”模組已啟用。禁用此模組可能會使任何未來的交易在法律和使用合法軟件方面均無效，因為它們無法通過稅務審核進行驗證。
-BlockedLogDisableNotAllowedForCountry=強制使用此模組的國家/地區清單（為防止錯誤地禁用此模組，如果您所在的國家/地區位於此清單中，則必須先編輯此清單才能禁用此模組。另外請注意，啟用/禁用此模組將被記錄到不可更改的日誌）。
+BlockedLogAreRequiredByYourCountryLegislation=您所在國家/地區的法規可能要求使用不可更改的日誌模組。關閉此模組可能會使任何未來的交易在法律和法律軟件使用方面均無效，因為它們無法通過稅務審核進行驗證。
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=由於您所在國家/地區的法律，“不可更改的日誌”模組已啟用。關閉此模組可能會使任何未來的交易在法律和使用合法軟件方面均無效，因為它們無法通過稅務審核進行驗證。
+BlockedLogDisableNotAllowedForCountry=強制使用此模組的國家/地區清單（為防止錯誤地關閉此模組，如果您所在的國家/地區位於此清單中，則必須先編輯此清單才能關閉此模組。另外請注意，啟用/關閉此模組將被記錄到不可更改的日誌）。
 OnlyNonValid=無效的
 TooManyRecordToScanRestrictFilters=記錄太多，無法掃描/分析。請使用更嚴格的過濾條件來限制清單。
 RestrictYearToExport=限制月/年匯出
diff --git a/htdocs/langs/zh_TW/boxes.lang b/htdocs/langs/zh_TW/boxes.lang
index 9dcff47deff..96c537c645e 100644
--- a/htdocs/langs/zh_TW/boxes.lang
+++ b/htdocs/langs/zh_TW/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=最新%s筆已修改捐贈
 BoxTitleLastModifiedExpenses=最新%s份已修改費用報告
 BoxTitleLatestModifiedBoms=最新%s筆已修改BOM
 BoxTitleLatestModifiedMos=最新%s筆已修改製造訂單
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=全球活動(發票、提案/建議書、訂單)
 BoxGoodCustomers=好客戶
 BoxTitleGoodCustomers=%s位好客戶
+BoxScheduledJobs=排程工作
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=無法更新RSS流量。最近成功更新的日期：%s
 LastRefreshDate=最新更新日期
 NoRecordedBookmarks=未定義書籤。
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=未定義暫記帳戶
 BoxLastCustomerShipments=上次客戶發貨
 BoxTitleLastCustomerShipments=最新%s筆客戶發貨
 NoRecordedShipments=沒有已記錄的客戶發貨
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=會計
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/zh_TW/cashdesk.lang b/htdocs/langs/zh_TW/cashdesk.lang
index 59713d97ac3..78fb2b628ae 100644
--- a/htdocs/langs/zh_TW/cashdesk.lang
+++ b/htdocs/langs/zh_TW/cashdesk.lang
@@ -12,16 +12,16 @@ CashDeskOn=在
 CashDeskThirdParty=合作方
 ShoppingCart=購物車
 NewSell=新銷售
-AddThisArticle=加入此文章
+AddThisArticle=加入此物品
 RestartSelling=回到銷售
 SellFinished=銷售完成
 PrintTicket=列印銷售單
 SendTicket=送出銷售單
-NoProductFound=未找到文章
+NoProductFound=未找到物品
 ProductFound=找到產品
-NoArticle=無文章
+NoArticle=沒有物品
 Identification=證明
-Article=文章
+Article=物品
 Difference=差異
 TotalTicket=全部銷售單
 NoVAT=此銷售沒有營業稅
@@ -29,7 +29,7 @@ Change=超額已收到
 BankToPay=付款帳戶
 ShowCompany=顯示公司
 ShowStock=顯示倉庫
-DeleteArticle=點擊刪除此文章
+DeleteArticle=點擊刪除此物品
 FilterRefOrLabelOrBC=搜索（參考/標籤）
 UserNeedPermissionToEditStockToUsePos=您要求減少由發票建立的庫存，所以使用POS的使用者需要具有編輯庫存的權限。
 DolibarrReceiptPrinter=Dolibarr 收據印表機
@@ -46,11 +46,11 @@ SearchProduct=搜尋商品
 Receipt=收據
 Header=頁首
 Footer=頁尾
-AmountAtEndOfPeriod=結束的金額（天，月或年）
+AmountAtEndOfPeriod=結算金額（天，月或年）
 TheoricalAmount=理論金額
 RealAmount=實際金額
-CashFence=現金圍欄
-CashFenceDone=本期現金圍欄完成
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=發票數
 Paymentnumpad=輸入付款的便籤類型
 Numberspad=號碼便籤
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=POS銷售編號模組
 CashDeskGenericMaskCodes6 = <br> <b> {TN} </b>標籤用於增加站台
 TakeposGroupSameProduct=群組相同產品線
 StartAParallelSale=開啟新的平行銷售
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=關閉現金圍籬
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=現金報告
 MainPrinterToUse=要使用的主印表機
 OrderPrinterToUse=要使用的訂單印表機
@@ -122,3 +123,4 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
diff --git a/htdocs/langs/zh_TW/categories.lang b/htdocs/langs/zh_TW/categories.lang
index 6935e5275bb..6c462752097 100644
--- a/htdocs/langs/zh_TW/categories.lang
+++ b/htdocs/langs/zh_TW/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=專案標籤/類別區域
 UsersCategoriesArea=用戶標籤/類別區域
 SubCats=子類別
 CatList=標籤/類別清單
+CatListAll=List of tags/categories (all types)
 NewCategory=新標籤/類別
 ModifCat=修改標籤/類別
 CatCreated=標籤/類別已建立
@@ -65,28 +66,34 @@ UsersCategoriesShort=用戶標籤/類別
 StockCategoriesShort=倉庫標籤/類別
 ThisCategoryHasNoItems=此類別內沒有任何項目。
 CategId=標籤/類別編號
-CatSupList=供應商標籤/類別清單
-CatCusList=客戶/潛在方標籤/類別清單
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=產品標籤/類別清單
 CatMemberList=會員標籤/類別清單
-CatContactList=聯絡人標籤/類別清單
-CatSupLinks=供應商與標籤/類別之間的連結
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=客戶/潛在方與標籤/類別之間的連結
 CatContactsLinks=聯絡人/地址與標籤/類別之間的連結
 CatProdLinks=產品/服務與標籤/類別之間的連結
-CatProJectLinks=專案與標籤/類別之間的連結
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=專案與標籤/類別之間的連結
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=從標籤/類別中刪除
 ExtraFieldsCategories=補充屬性
 CategoriesSetup=標籤/類別設定
 CategorieRecursiv=自動連結到母標籤/母類別
 CategorieRecursivHelp=如果啟用此選項，當將產品增加到子類別時，產品也會增加到母類別中。
 AddProductServiceIntoCategory=新增以下產品/服務
-AddCustomerIntoCategory=Assign category to customer
-AddSupplierIntoCategory=Assign category to supplier
+AddCustomerIntoCategory=分配類別給客戶
+AddSupplierIntoCategory=分配類別給供應商
 ShowCategory=顯示標籤/類別
 ByDefaultInList=預設在清單中
 ChooseCategory=選擇類別
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
-WebsitePagesCategoriesArea=Page-Container Categories
+StocksCategoriesArea=倉庫類別
+ActionCommCategoriesArea=事件類別
+WebsitePagesCategoriesArea=頁面容器類別
 UseOrOperatorForCategories=類別的使用或運算
diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang
index 1d83ed486ae..82cd94f4c0b 100644
--- a/htdocs/langs/zh_TW/companies.lang
+++ b/htdocs/langs/zh_TW/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (商業登記號碼)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=歐盟增值稅號
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (專業號碼)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=歐盟增值稅號
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (國家註冊)
@@ -148,7 +148,7 @@ ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1（聯邦碼）
 ProfId4CH=Prof Id 2（商業記錄碼）
-ProfId5CH=EORI number
+ProfId5CH=歐盟增值稅號
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (商業登記號碼)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=歐盟增值稅號
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 （社會安全號碼）
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (學院編號)
-ProfId5ES=EORI number
+ProfId5ES=歐盟增值稅號
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=歐盟增值稅號
 ProfId6FR=-
 ProfId1GB=註冊號
 ProfId2GB=-
@@ -202,12 +202,12 @@ ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=歐盟增值稅號
 ProfId1LU=Id. prof. 1 (R.C.S.盧森堡)
 ProfId2LU=Id. prof. 2 (營業執照)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=歐盟增值稅號
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
@@ -225,13 +225,13 @@ ProfId1NL=KVK數字
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL=EORI number
+ProfId5NL=歐盟增值稅號
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2（社會安全號碼）
 ProfId3PT=Prof Id 3（商業記錄碼）
 ProfId4PT=Prof Id 4 (音樂學院)
-ProfId5PT=EORI number
+ProfId5PT=歐盟增值稅號
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +255,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=歐盟增值稅號
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -358,8 +358,8 @@ VATIntraCheckableOnEUSite=檢查在歐盟區網站內的區內營業稅
 VATIntraManualCheck=您也可在歐盟網站以人工方式確認<a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=無法檢查。無法使用會員國家（%s）進行檢查服務。
 NorProspectNorCustomer=非潛在方或客戶
-JuridicalStatus=法人類型
-Workforce=Workforce
+JuridicalStatus=Business entity type
+Workforce=員工
 Staff=僱員
 ProspectLevelShort=潛在等級
 ProspectLevel=潛在方的可能性
@@ -462,8 +462,8 @@ PaymentTermsSupplier=付款條件-供應商
 PaymentTypeBoth=付款方式-客戶和供應商
 MulticurrencyUsed=使用多幣種
 MulticurrencyCurrency=貨幣
-InEEC=Europe (EEC)
-RestOfEurope=Rest of Europe (EEC)
-OutOfEurope=Out of Europe (EEC)
-CurrentOutstandingBillLate=Current outstanding bill late
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
+InEEC=歐洲（EEC）
+RestOfEurope=歐洲其他地區（EEC）
+OutOfEurope=歐洲以外（EEC）
+CurrentOutstandingBillLate=目前拖欠帳單
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=請注意，根據您的產品價格設定，應在將產品增加到POS之前更改合作方。
diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang
index 5465526e4ed..82b499908a9 100644
--- a/htdocs/langs/zh_TW/compta.lang
+++ b/htdocs/langs/zh_TW/compta.lang
@@ -69,7 +69,7 @@ SocialContribution=社會稅或財政稅
 SocialContributions=社會稅或財政稅
 SocialContributionsDeductibles=可抵扣的社會稅或財政稅
 SocialContributionsNondeductibles=不可抵扣的社會稅或財政稅
-DateOfSocialContribution=Date of social or fiscal tax
+DateOfSocialContribution=社會稅或財政稅的日期
 LabelContrib=捐助標籤
 TypeContrib=捐助類型
 MenuSpecialExpenses=特別支出
@@ -111,7 +111,7 @@ Refund=退款
 SocialContributionsPayments=社會/財政稅金
 ShowVatPayment=顯示營業稅稅金
 TotalToPay=支付總額
-BalanceVisibilityDependsOnSortAndFilters=當表格依%s升序排列並且已過濾為一個銀行帳戶時餘額才可顯示
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=客戶會計代碼
 SupplierAccountancyCode=供應商會計代碼
 CustomerAccountancyCodeShort=客戶帳戶代碼
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=您確定要刪除此社會/財政稅金嗎？
 ExportDataset_tax_1=社會和財政稅金及繳稅
 CalcModeVATDebt=<b>%s承諾會計營業稅%s</b>模式.
 CalcModeVATEngagement=<b>%s收入-支出營業稅%s</b>模式.
-CalcModeDebt=分析已知並已記錄發票，即使尚未在分類帳中進行核算。
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=分析已知並已記錄付款，即使尚未在分類帳中。
 CalcModeBookkeeping=分析記帳簿表中記錄的數據。
 CalcModeLT1= <b>客戶發票-供應商發票%s中的%sRE</b>模式
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=收支平衡表，年度匯總
 AnnualByCompanies=收入和支出餘額，依預定義帳戶組別
 AnnualByCompaniesDueDebtMode=收支平衡表，依預定義組別明細，模式<b>%s債權-債務%s</b>表示<b>承諾會計</b> 。
 AnnualByCompaniesInputOutputMode=收支平衡表，依預定義組別明細，方式<b>%s收入-支出%s</b>表示<b>現金會計</b> 。
-SeeReportInInputOutputMode=有關實際付款(即使尚未在分類帳中實際付款)的計算，請參閱%s付款分析%s。
-SeeReportInDueDebtMode=有關基於已記錄發票(即使尚未在分類帳中進行核算)的計算，請參閱%s發票分析%s。
-SeeReportInBookkeepingMode=請參閱<b>%s簿記報告%s</b>了解關於<b>簿記分類帳表</b>的計算
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=-顯示的金額包括所有稅費
 RulesResultDue=-包括無論是否付款的未結發票，費用，增值稅，捐贈。還包括已付款薪資。 <br>-它基於發票的開票日期以及費用或稅款的到期日。對於使用“薪資”模組定義的薪資，將使用付款的起息日。
 RulesResultInOut=-它包括發票，費用，營業稅和薪水的實際付款。 <br> -它基於發票，費用，營業稅和薪水的付款日期。捐贈的捐贈日期。
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=它顯示會計帳戶分類帳中的記錄，
 SeePageForSetup=請參考選單<a href="%s">%s</a>進行設定
 DepositsAreNotIncluded=-未包含預付款發票
 DepositsAreIncluded=-包含預付款發票
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=合作方稅率2報告
 LT2ReportByCustomers=合作方稅率3報告
 LT1ReportByCustomersES=合作方RE報告
 LT2ReportByCustomersES=合作方IRPF報告
 VATReport=營業稅報告
 VATReportByPeriods=分期營業稅報告
+VATReportByMonth=每月營業稅報告
 VATReportByRates=營業稅率報告
 VATReportByThirdParties=合作方營業稅報告
 VATReportByCustomers=客戶銷售稅報告
diff --git a/htdocs/langs/zh_TW/cron.lang b/htdocs/langs/zh_TW/cron.lang
index b988bac33aa..33ea6c545f6 100644
--- a/htdocs/langs/zh_TW/cron.lang
+++ b/htdocs/langs/zh_TW/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = 刪除預定工作
 Permission23104 = 執行預定工作
 # Admin
 CronSetup=預定工作管理設定
-URLToLaunchCronJobs=用於檢查和啟動合格cron作業的URL
-OrToLaunchASpecificJob=或是檢查並啟動特定工作
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=用於啟動cron作業URL的安全密鑰
 FileToLaunchCronJobs=命令列檢查並啟動合格的cron作業
 CronExplainHowToRunUnix=在Unix環境中，您應該使用以下crontab條目以每隔5分鐘執行命令行
 CronExplainHowToRunWin=在Microsoft（tm）Windows環境中，您可以使用“計劃任務”工具每5分鐘執行命令行
 CronMethodDoesNotExists=類別%s不包含任何方法%s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron工作設定文件定義在模組描述符檔案中。啟動模組後，它們將被載入使用，因此您可以從管理員工具選單%s管理作業。
 CronJobProfiles=預定義cron工作配置文件清單
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=啟動次數
 CronMaxRun=最大啟動次數
 CronEach=每一個
 JobFinished=工作已啟動並完成
+Scheduled=Scheduled
 #Page card
 CronAdd= 新增工作
 CronEvery=執行每個工作
@@ -56,7 +58,7 @@ CronNote=註解
 CronFieldMandatory=欄位%s為必填
 CronErrEndDateStartDt=結束日期不能早於開始日期
 StatusAtInstall=模組安裝狀態
-CronStatusActiveBtn=啓用
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=停用
 CronTaskInactive=此工作已停用
 CronId=Id
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=本地資料庫備份
 MakeLocalDatabaseDump=建立本地資料庫備份。參數為：壓縮（“ gz”或“ bz”或“none”），備份類型（“ mysql”，“ pgsql”，“ auto”），1，"自動"或建立檔案名稱，要保留的備份檔案數
 WarningCronDelayed=請注意，出於性能目的，無論下一次執行已啟動工作的日期如何，您的工作執行最多可能會延遲%s小時。
 DATAPOLICYJob=資料清理器和匿名器
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index 4eebe27f1aa..f4f7a6ed0cc 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=我們保證沒有錯誤
 # Errors
 ErrorButCommitIsDone=發現錯誤，但儘管如此我們仍進行驗證
 ErrorBadEMail=電子郵件%s錯誤
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=網址%s錯誤
 ErrorBadValueForParamNotAString=您的參數值錯誤。一般在轉譯遺失時產生。
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=登入者%s已經存在。
 ErrorGroupAlreadyExists=群組%s已經存在。
 ErrorRecordNotFound=記錄沒有找到。
@@ -48,6 +50,7 @@ ErrorFieldsRequired=一些必要的欄位都沒有填入。
 ErrorSubjectIsRequired=電子郵件主題為必填
 ErrorFailedToCreateDir=無法建立資料夾。檢查網頁伺服器中的用戶有權限寫入Dolibarr檔案資料夾。如果PHP使用了參數<b>safe_mode</b>，檢查網頁伺服器的用戶（或群組）擁有Dolibarr php檔案。
 ErrorNoMailDefinedForThisUser=沒有此用戶的定義郵件
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=此功能需要啟動Javascript。需要變更請前往設定 - 顯示。
 ErrorTopMenuMustHaveAParentWithId0=一個類型'頂部'選單不能有一個母選單。在母選單填入0或選擇一個類型為'左'的選單。
 ErrorLeftMenuMustHaveAParentId=一個類型為'左'的選單必須有一個母選單的ID。
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=此匯出設定已存在此設定檔案名稱。
 ErrorLDAPSetupNotComplete=Dolibarr與LDAP的匹配不完整。
 ErrorLDAPMakeManualTest=.ldif檔案已在資料夾%s中.請以命令行手動讀取以得到更多的錯誤信息。
 ErrorCantSaveADoneUserWithZeroPercentage=如果填寫了“完成者”欄位，則無法使用“狀態未開始”保存操作。
-ErrorRefAlreadyExists=建立參考已經存在。
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=請輸入必須在報告條目中的銀行對帳單名稱（格式YYYYMM或YYYYMMDD）
 ErrorRecordHasChildren=因為有子記錄所以刪除失敗。
 ErrorRecordHasAtLeastOneChildOfType=項目至少有一個子類別%s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=您必須選擇商品是否為預
 ErrorDiscountLargerThanRemainToPaySplitItBefore=您嘗試使用的折扣大於剩餘的折扣。將之前的折扣分成2個較小的折扣。
 ErrorFileNotFoundWithSharedLink=找不到檔案。可能是共享金鑰最近被修改或檔案被刪除了。
 ErrorProductBarCodeAlreadyExists=產品條碼%s已存在於另一個產品參考上。
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=另請注意，當至少一個子產品（或子產品的子產品）需要序列號/批號時，無法使用虛擬產品自動增加/減少子產品。
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=對於帶有免費產品的行，必須進行描述說明
 ErrorAPageWithThisNameOrAliasAlreadyExists=此頁面/容器<strong>%s</strong>與您嘗試使用的名稱/別名相同
 ErrorDuringChartLoad=載入會計科目表時出錯。如果幾個帳戶沒有被載入，您仍然可以手動輸入。
@@ -226,8 +229,8 @@ ErrorURLMustStartWithHttp=網址 %s 必須以 http://或https://開始
 ErrorNewRefIsAlreadyUsed=錯誤，新參考已被使用
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=錯誤，無法刪除連結到已關閉發票的付款。
 ErrorSearchCriteriaTooSmall=搜尋條件太小。
-ErrorObjectMustHaveStatusActiveToBeDisabled=項目必須具有“活動”狀態才能被禁用
-ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=要啟用的項目必須具有“草稿”或“已禁用”狀態
+ErrorObjectMustHaveStatusActiveToBeDisabled=項目必須具有“啟用”狀態才能被關閉
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=要啟用的項目必須具有“草稿”或“已關閉”狀態
 ErrorNoFieldWithAttributeShowoncombobox=沒有欄位在項目“ %s”的定義中具有屬性“ showoncombobox”。無法顯示組合清單。
 ErrorFieldRequiredForProduct=產品%s必須有欄位'%s'
 ProblemIsInSetupOfTerminal=問題在於站台%s的設定。
@@ -243,9 +246,19 @@ ErrorReplaceStringEmpty=錯誤，要替換的字串為空
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=未啟用公共界面
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=您的PHP參數upload_max_filesize（%s）高於PHP參數post_max_size（%s）。這不是相同的設定。
-WarningPasswordSetWithNoAccount=為此會員設定了密碼。但是，沒有建立用戶帳戶。因此，雖然密碼已儲存，但不能用於登入Dolibarr。外部模組/界面可以使用它，但是如果您不需要為會員定義任何登入名稱或密碼，則可以從會員模組設定中禁用選項“管理每個會員的登入名稱”。如果您需要管理登入名稱但不需要任何密碼，則可以將此欄位保留為空白以避免此警告。注意：如果會員連結到用戶，電子郵件也可以用作登入名稱。
+WarningPasswordSetWithNoAccount=為此會員設定了密碼。但是，沒有建立用戶帳戶。因此，雖然密碼已儲存，但不能用於登入Dolibarr。外部模組/界面可以使用它，但是如果您不需要為會員定義任何登入名稱或密碼，則可以從會員模組設定中關閉選項“管理每個會員的登入名稱”。如果您需要管理登入名稱但不需要任何密碼，則可以將此欄位保留為空白以避免此警告。注意：如果會員連結到用戶，電子郵件也可以用作登入名稱。
 WarningMandatorySetupNotComplete=點擊此處設定必填參數
 WarningEnableYourModulesApplications=點擊此處啟用您的模組和應用程式
 WarningSafeModeOnCheckExecDir=警告，PHP選項<b>safe_mode</b>處於開啟狀態，因此命令必須儲存在php參數<b>safe_mode_exec_dir</b>聲明的資料夾內。
@@ -259,7 +272,7 @@ WarningUntilDirRemoved=只要存在此漏洞（或在設定->其他設定中增
 WarningCloseAlways=警告，即使來源元件和目標元件之間的數量不同，也將關閉。請謹慎啟用此功能。
 WarningUsingThisBoxSlowDown=警告，使用此框會嚴重降低顯示此框所有頁面的速度。
 WarningClickToDialUserSetupNotComplete=您用戶的ClickToDial資訊設定尚未完成（請參閱用戶卡上的ClickToDial分頁）。
-WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=當針對盲人或文字瀏覽器優化了顯示設定時，此功能將被禁用。
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=當針對盲人或文字瀏覽器優化了顯示設定時，此功能將被關閉。
 WarningPaymentDateLowerThanInvoiceDate=付款日期（%s）早於發票%s的發票日期（%s）。
 WarningTooManyDataPleaseUseMoreFilters= 資料太多（超過%s行）。請使用更多過濾器或將常數%s設定為更高的上限。
 WarningSomeLinesWithNullHourlyRate=某些用戶記錄了某些時間，但未定義其小時費率。%s每小時使用的值為0 ，但這可能會導致錯誤的花費時間評估。
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=您的登入名稱已修改。為了安
 WarningAnEntryAlreadyExistForTransKey=此語言的翻譯密鑰條目已存在
 WarningNumberOfRecipientIsRestrictedInMassAction=警告，在清單上使用批次操作時，其他收件人的數量限制為<b>%s</b>
 WarningDateOfLineMustBeInExpenseReportRange=警告，行的日期不在費用報告的範圍內
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=專案已關閉。您必須先重新打開它。
 WarningSomeBankTransactionByChequeWereRemovedAfter=在產生包括它們的收據之後，一些銀行交易將被刪除。因此支票的數量和收據的數量可能與清單中的數量和總數有所不同。
-WarningFailedToAddFileIntoDatabaseIndex=警告，無法將檔案項目增加到ECM資料庫索引表中
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/zh_TW/exports.lang b/htdocs/langs/zh_TW/exports.lang
index 7c8d3f0d1dd..951fb75a8c7 100644
--- a/htdocs/langs/zh_TW/exports.lang
+++ b/htdocs/langs/zh_TW/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=欄位標題
 NowClickToGenerateToBuildExportFile=現在，在組合框中選擇檔案格式，然後點擊“產生”以建立匯出檔案...
 AvailableFormats=可用格式
 LibraryShort=程式庫
+ExportCsvSeparator=CSV字符分隔器
+ImportCsvSeparator=CSV字符分隔器
 Step=步驟
 FormatedImport=匯入小幫手
 FormatedImportDesc1=此模組允許您更新現有資料或增加新項目到資料庫中而不需要專業技術知識,只須使用小幫手。
@@ -131,3 +133,4 @@ KeysToUseForUpdates=用於<b>更新</b>現有資料的鍵（欄）
 NbInsert=已插入的行數：%s
 NbUpdate=已更新的行數：%s
 MultipleRecordFoundWithTheseFilters=使用過濾器找到了多個記錄：%s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/zh_TW/hrm.lang b/htdocs/langs/zh_TW/hrm.lang
index 3e8d938470d..e62a5430c67 100644
--- a/htdocs/langs/zh_TW/hrm.lang
+++ b/htdocs/langs/zh_TW/hrm.lang
@@ -16,4 +16,4 @@ DictionaryFunction=人力資源管理-職位
 Employees=員工
 Employee=員工
 NewEmployee=新員工
-ListOfEmployees=List of employees
+ListOfEmployees=員工名單
diff --git a/htdocs/langs/zh_TW/install.lang b/htdocs/langs/zh_TW/install.lang
index c785b848207..a717552589b 100644
--- a/htdocs/langs/zh_TW/install.lang
+++ b/htdocs/langs/zh_TW/install.lang
@@ -209,7 +209,7 @@ MigrationResetBlockedLog=為v7 algorithm重置模組"被阻止的日誌(Blocked
 ShowNotAvailableOptions=顯示不可用的選項
 HideNotAvailableOptions=隱藏不可用的選項
 ErrorFoundDuringMigration=在移轉過程中出現了錯誤，因此無法進行下一步。要忽略錯誤，可以<a href="%s">點擊此處</a> ，但是在解決錯誤之前，該應用程序或某些功能可能無法正常運行。
-YouTryInstallDisabledByDirLock=該應用程式嘗試進行自我升級，但是出於安全性考慮，已禁用了安裝/升級頁面（使用.lock後綴重命名資料夾）。 <br>
+YouTryInstallDisabledByDirLock=該應用程式嘗試進行自我升級，但是出於安全性考慮，已禁用了安裝/升級頁面（使用.lock副檔名重新命名資料夾）。 <br>
 YouTryInstallDisabledByFileLock=此應用程式嘗試進行自我升級，但是出於安全性考慮，已禁用了安裝/升級頁面（由於dolibarr檔案資料夾中存在鎖定文件<strong>install.lock</strong> ）。 <br>
 ClickHereToGoToApp=點擊此處前往您的應用程式
 ClickOnLinkOrRemoveManualy=如果正在進行升級，請等待。如果沒有，請點擊以下連結。如果始終看到同一頁面，則必須在documents資料夾中刪除/重新命名install.lock檔案。
diff --git a/htdocs/langs/zh_TW/intracommreport.lang b/htdocs/langs/zh_TW/intracommreport.lang
index f6373cf6009..1cb77c19dc7 100644
--- a/htdocs/langs/zh_TW/intracommreport.lang
+++ b/htdocs/langs/zh_TW/intracommreport.lang
@@ -1,4 +1,4 @@
-Module68000Name = Intracomm report
+Module68000Name = 通訊報告
 Module68000Desc = Intracomm report management (Support for French DEB/DES format)
 IntracommReportSetup = Intracommreport module setup
 IntracommReportAbout = About intracommreport
@@ -14,16 +14,16 @@ INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
 INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
 
 # Menu
-MenuIntracommReport=Intracomm report
+MenuIntracommReport=通訊報告
 MenuIntracommReportNew=New declaration
 MenuIntracommReportList=清單
 
 # View
 NewDeclaration=New declaration
 Declaration=Declaration
-AnalysisPeriod=Analysis period
+AnalysisPeriod=分析期間
 TypeOfDeclaration=Type of declaration
-DEB=Goods exchange declaration (DEB)
+DEB=貨物交換報關單（DEB）
 DES=Services exchange declaration (DES)
 
 # Export page
@@ -32,7 +32,7 @@ IntracommReportTitle=Preparation of an XML file in ProDouane format
 # List
 IntracommReportList=List of generated declarations
 IntracommReportNumber=Numero of declaration
-IntracommReportPeriod=Period of nalysis
+IntracommReportPeriod=Period of analysis
 IntracommReportTypeDeclaration=Type of declaration
 IntracommReportDownload=download XML file
 
diff --git a/htdocs/langs/zh_TW/mails.lang b/htdocs/langs/zh_TW/mails.lang
index 1ca5e5ccdb1..4692e0bcb59 100644
--- a/htdocs/langs/zh_TW/mails.lang
+++ b/htdocs/langs/zh_TW/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=用戶輸入的電子郵件
 MailingModuleDescDolibarrUsers=擁有電子郵件的用戶
 MailingModuleDescThirdPartiesByCategories=合作方（依類別）
 SendingFromWebInterfaceIsNotAllowed=不允許從Web界面發送。
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=在檔案%s的行
@@ -125,12 +126,13 @@ TagMailtoEmail=收件人電子郵件（包括html“ mailto：”連結）
 NoEmailSentBadSenderOrRecipientEmail=沒有發送電子郵件。寄件人或收件人的電子郵件不正確。驗證用戶資料。
 # Module Notifications
 Notifications=通知
-NoNotificationsWillBeSent=沒有為此事件和公司計畫的電子郵件通知
-ANotificationsWillBeSent=1個通知將通過電子郵件發送
-SomeNotificationsWillBeSent=%s的通知將通過電子郵件發送
-AddNewNotification=啟動新的電子郵件通知目標/事件
-ListOfActiveNotifications=列出所有活動目標/事件以進行電子郵件通知
-ListOfNotificationsDone=列出所有發送電子郵件通知
+NotificationsAuto=自動通知。
+NoNotificationsWillBeSent=沒有為此類型事件和公司計畫的自動電子郵件通知
+ANotificationsWillBeSent=1條自動通知將以電子郵件寄送
+SomeNotificationsWillBeSent=%s的自動通知將以電子郵件寄送
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=列出所有已寄送的自動電子郵件通知
 MailSendSetupIs=電子郵件發送的設定已設定為“ %s”。此模式不能用於發送批次電子郵件。
 MailSendSetupIs2=您必須先使用管理員帳戶進入選單%s首頁-設定-EMails%s以將參數<strong>'%s'</strong>更改為使用模式 '%s'。使用此模式 ，您可以輸入Internet服務供應商提供的SMTP伺服器的設定，並使用批次電子郵件功能。
 MailSendSetupIs3=如果對如何設定SMTP伺服器有任何疑問，可以詢問%s。
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=匯入檔案的格式必須為<strong>電子郵件; 
 UseFormatInputEmailToTarget=輸入字串格式為<strong>電子郵件; 姓;名;其他</strong>
 MailAdvTargetRecipients=收件人（進階選項）
 AdvTgtTitle=填寫輸入欄位以預先選擇合作方或聯絡人/地址
-AdvTgtSearchTextHelp=使用%%作為通用字元。例如，要尋找像是<b>jean，joe，jim</b>的所有項目，可以輸入 <b>j%%</b> ，也可以使用;作為數值的分隔字元，並使用！排除此值。例如 <b>jean;joe;jim%%;!jimo;!jima%</b> 將會指向所有沒有jimo與所有以jima開始的jean,joe
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=使用空格選擇整數或浮點值
 AdvTgtMinVal=最小值
 AdvTgtMaxVal=最大值
@@ -162,13 +164,14 @@ AdvTgtCreateFilter=建立過濾器
 AdvTgtOrCreateNewFilter=新過濾器名稱
 NoContactWithCategoryFound=找不到具有類別的聯絡人/地址
 NoContactLinkedToThirdpartieWithCategoryFound=找不到具有類別的聯絡人/地址
-OutGoingEmailSetup=發送電子郵件設定
-InGoingEmailSetup=接收電子郵件設定
-OutGoingEmailSetupForEmailing=外送電子郵件設定（用於模組%s）
-DefaultOutgoingEmailSetup=預設發送電子郵件設定
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=與全域寄送電子郵件設定相同的配置
 Information=資訊
 ContactsWithThirdpartyFilter=帶有合作方過濾器的聯絡人
-Unanswered=Unanswered
+Unanswered=未回應
 Answered=已回覆
-IsNotAnAnswer=Is not answer (initial email)
-IsAnAnswer=Is an answer of an initial email
+IsNotAnAnswer=未回應（原始電子郵件）
+IsAnAnswer=是一封原始電子郵件的回應
+RecordCreatedByEmailCollector=由電子郵件收集器%s從電子郵件%s建立的記錄
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index abc5ed6e22c..c9a3ab89c26 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=此電子郵件類別沒有可用的範本
 AvailableVariables=可用的替代變數
 NoTranslation=沒有翻譯
 Translation=翻譯
+CurrentTimeZone=PHP (伺服器)時區
 EmptySearchString=輸入非空白的搜索字串
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=沒有找到任何紀錄
 NoRecordDeleted=沒有刪除記錄
 NotEnoughDataYet=沒有足夠資料
@@ -85,6 +87,8 @@ FileWasNotUploaded=所選定的檔案尚未上傳。點選 "附加檔案"。
 NbOfEntries=項目數量
 GoToWikiHelpPage=讀取線上幫助 (需要連上網路)
 GoToHelpPage=讀取幫助
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=首頁
 RecordSaved=記錄已儲存
 RecordDeleted=記錄已刪除
 RecordGenerated=記錄已產生
@@ -147,8 +151,8 @@ NotClosed=尚未關閉
 Enabled=已啟用
 Enable=啓用
 Deprecated=已棄用
-Disable=禁用
-Disabled=已禁用
+Disable=關閉
+Disabled=已關閉
 Add=新增
 AddLink=新增連結
 RemoveLink=移除連結
@@ -197,7 +201,7 @@ ReOpen=重新公開
 Upload=上傳
 ToLink=連線
 Select=選擇
-SelectAll=Select all
+SelectAll=全選
 Choose=選擇
 Resize=調整大小
 ResizeOrCrop=調整大小或裁剪
@@ -210,7 +214,7 @@ Groups=群組
 NoUserGroupDefined=未定義用戶群組
 Password=密碼
 PasswordRetype=重新輸入您的密碼
-NoteSomeFeaturesAreDisabled=請注意在這個示範中多項功能/模組已禁用。
+NoteSomeFeaturesAreDisabled=請注意在這個示範中多項功能/模組已關閉。
 Name=名稱
 NameSlashCompany=姓名/公司
 Person=人員
@@ -258,7 +262,7 @@ Cards=資訊卡
 Card=資訊卡
 Now=現在
 HourStart=開始(時)
-Deadline=Deadline
+Deadline=最後期限
 Date=日期
 DateAndHour=日期及小時
 DateToday=今日日期
@@ -433,6 +437,7 @@ RemainToPay=保持付款
 Module=模組/應用程式
 Modules=模組/應用程式
 Option=選項
+Filters=Filters
 List=清單
 FullList=全部清單
 FullConversation=全部轉換
@@ -494,7 +499,7 @@ By=由
 From=從
 FromDate=從
 FromLocation=從
-at=at
+at=在
 to=至
 To=至
 and=和
@@ -689,7 +694,7 @@ RecordsModified=%s記錄已修改
 RecordsDeleted=%s記錄已刪除
 RecordsGenerated=%s記錄已產生
 AutomaticCode=自動代碼
-FeatureDisabled=功能已禁用
+FeatureDisabled=功能已關閉
 MoveBox=移動小工具
 Offered=已提供
 NotEnoughPermissions=您沒有權限執行這個動作
@@ -709,7 +714,7 @@ YouCanSetDefaultValueInModuleSetup=您可以設定一個當在模組設定中產
 Color=色彩
 Documents=已連結檔案
 Documents2=文件
-UploadDisabled=禁用上傳
+UploadDisabled=上傳已關閉
 MenuAccountancy=會計
 MenuECM=文件
 MenuAWStats=AWStats 軟體
@@ -724,7 +729,7 @@ CurrentMenuManager=目前選單管理器
 Browser=瀏覽器
 Layout=外觀
 Screen=畫面
-DisabledModules=已禁用模組
+DisabledModules=已關閉模組
 For=為
 ForCustomer=客戶
 Signature=簽名
@@ -749,7 +754,7 @@ PrintContentArea=顯示列印頁面的主要內容區域
 MenuManager=選單管理器
 WarningYouAreInMaintenanceMode=警告，您處於維護模式：僅允許<b>%s</b>登入且在此模式下使用應用程序。
 CoreErrorTitle=系統錯誤
-CoreErrorMessage=很抱歉，發生錯誤。連絡您的系統管理員以確認記錄檔或禁用 $dolibarr_main_prod=1 以取得更多資訊。
+CoreErrorMessage=很抱歉，發生錯誤。連絡您的系統管理員以確認記錄檔或關閉 $dolibarr_main_prod=1 以取得更多資訊。
 CreditCard=信用卡
 ValidatePayment=驗證付款
 CreditOrDebitCard=信用卡或金融信用卡
@@ -888,8 +893,8 @@ Miscellaneous=雜項
 Calendar=行事曆
 GroupBy=群組依...
 ViewFlatList=檢視平面清單
-ViewAccountList=View ledger
-ViewSubAccountList=View subaccount ledger
+ViewAccountList=檢視總帳
+ViewSubAccountList=檢視子帳戶總帳
 RemoveString=移除字串‘%s’
 SomeTranslationAreUncomplete=提供的某些語言可能僅被部分翻譯，或者可能包含錯誤。請通過註冊<a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>來進行改進，以幫助修正您的語言。
 DirectDownloadLink=直接下載連結(公共/外部)
@@ -1105,5 +1110,10 @@ DateOfBirth=出生日期
 SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=安全許可證已過期，因此操作已被取消。請再試一次。
 UpToDate=最新
 OutOfDate=過期
-EventReminder=Event Reminder
-UpdateForAllLines=Update for all lines
+EventReminder=事件提醒
+UpdateForAllLines=更新所有行
+OnHold=On hold
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/zh_TW/modulebuilder.lang b/htdocs/langs/zh_TW/modulebuilder.lang
index b92626cee0e..bffd8ecac21 100644
--- a/htdocs/langs/zh_TW/modulebuilder.lang
+++ b/htdocs/langs/zh_TW/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=建立/編輯/檢視記錄PHP頁面
 PageForAgendaTab=事件分頁的PHP頁面
 PageForDocumentTab=文件分頁的PHP頁面
 PageForNoteTab=註記分頁的PHP頁面
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=模組/應用程式包的zip路徑
 PathToModuleDocumentation=模組/應用程式檔案的文件路徑(%s)
 SpaceOrSpecialCharAreNotAllowed=不允許使用空格或特殊符號。
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=資料夾已掃描
 NoTrigger=沒有觸發器
 NoWidget=沒有小工具
-GoToApiExplorer=前往API資源管理器
+GoToApiExplorer=API explorer
 ListOfMenusEntries=選單條目清單
 ListOfDictionariesEntries=分類條目清單
 ListOfPermissionsDefined=已定義權限清單
@@ -105,11 +106,11 @@ TryToUseTheModuleBuilder=如果您具有SQL和PHP的知識，則可以使用本
 SeeTopRightMenu=請參閱右上方選單中的<span class="fa fa-bug"> </span>
 AddLanguageFile=增加語言檔案
 YouCanUseTranslationKey=您可以在此處使用一個key，此key是在語言檔案中找到的翻譯key（請參見“語言”分頁）
-DropTableIfEmpty=（如果為空，則刪除表）
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=表%s不存在
 TableDropped=表%s已刪除
 InitStructureFromExistingTable=建立現有表的結構數組字串
-UseAboutPage=禁用關於頁面
+UseAboutPage=關閉關於頁面
 UseDocFolder=禁用文件資料夾
 UseSpecificReadme=使用特定的ReadMe檔案
 ContentOfREADMECustomized=注意：README.md檔案的內容已替換為ModuleBuilder設定中定義的特定值。
@@ -126,7 +127,6 @@ UseSpecificEditorURL = 使用特定的編輯器網址
 UseSpecificFamily = 使用特定的家族
 UseSpecificAuthor = 使用特定作者
 UseSpecificVersion = 使用特定的初始版本
-ModuleMustBeEnabled=必須先啟用模組/應用程式
 IncludeRefGeneration=項目參考必須自動產生
 IncludeRefGenerationHelp=如果要包含代碼以自動管理參考的產生成，請點選此選框
 IncludeDocGeneration=我想從項目產生一些文件
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=ASCII到HTML轉換器
 AsciiToPdfConverter=ASCII到PDF轉換器
 TableNotEmptyDropCanceled=表不為空。刪除已被取消。
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang
index 0e643a6518f..058ef4a3c1e 100644
--- a/htdocs/langs/zh_TW/other.lang
+++ b/htdocs/langs/zh_TW/other.lang
@@ -5,8 +5,6 @@ Tools=工具
 TMenuTools=工具
 ToolsDesc=所有在其他選單項目中未包含的工具都在此處。 <br>所有工具均可通過左側選單使用。
 Birthday=生日
-BirthdayDate=生日日期
-DateToBirth=生日
 BirthdayAlertOn=生日提醒啟動中
 BirthdayAlertOff=生日提醒停用中
 TransKey=密鑰TransKey的翻譯
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=發票日期的前一個月（1-12）
 TextPreviousMonthOfInvoice=發票日期的前一個月（文字）
 NextMonthOfInvoice=發票日期的下個月（1-12）
 TextNextMonthOfInvoice=發票日期的下個月（文字）
+PreviousMonth=前一個月
+CurrentMonth=目前月份
 ZipFileGeneratedInto=壓縮檔案已產生到<b> %s </b>中。
 DocFileGeneratedInto=DOC檔案已產生到<b> %s </b>中。
 JumpToLogin=已斷線。請前往登入頁面...
@@ -99,6 +99,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\n請查看已附上之發貨__RE
 PredefinedMailContentSendFichInter=__(Hello)__\n\n請查看已附上之干預__REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=如果付款尚未完成您可以點擊以下連結.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=活動提醒 "__EVENT_LABEL__" 在 __EVENT_DATE__ 的 __EVENT_TIME__<br><br>\n此為自動提醒訊息,請勿回覆.
 DemoDesc=Dolibarr是一個嚴謹的ERP / CRM，支援多個業務模組。展示所有模組的DEMO沒有意義，因為這種情況永遠不會發生（有數百種可用）。因此，有幾個DEMO設定檔案可用。
 ChooseYourDemoProfil=選擇最適合您需求的DEMO設定檔案...
 ChooseYourDemoProfilMore=...或建立您自己的設定檔案<br>（手動選擇模組）
@@ -137,7 +138,7 @@ Right=右
 CalculatedWeight=已計算重量
 CalculatedVolume=已計算體積
 Weight=重量
-WeightUnitton=公噸
+WeightUnitton=噸
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -258,6 +259,7 @@ ContactCreatedByEmailCollector=電子郵件收集器從電子郵件MSGID %s建
 ProjectCreatedByEmailCollector=電子郵件收集器從電子郵件MSGID %s建立的專案
 TicketCreatedByEmailCollector=電子郵件收集器從電子郵件MSGID %s建立的服務單
 OpeningHoursFormatDesc=使用-分隔營業開始時間和營業結束時間。 <br>使用空格輸入不同的範圍。 <br>範例：8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=出口地區
@@ -278,9 +280,9 @@ LinesToImport=要匯入的行
 
 MemoryUsage=記憶體使用率
 RequestDuration=請求期限
-ProductsPerPopularity=Products/Services by popularity
+ProductsPerPopularity=依受歡迎程度的產品/服務
 PopuProp=依照在提案中受歡迎程度列出的產品/服務
 PopuCom=依照在訂單中受歡迎程度列出的產品/服務
 ProductStatistics=產品/服務統計
 NbOfQtyInOrders=訂單數量
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=選擇要分析的項目類型...
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index bcff540d70c..5900bdbc3c2 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=每個產品/服務有多個價格區段（每個客戶屬於一個價格區段）
 MultiPricesNumPrices=價格數量
 DefaultPriceType=增加新銷售價格時的每個預設價格（含稅和不含稅）基準
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of other products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=母套裝產品數
@@ -167,8 +168,10 @@ BuyingPrices=採購價格
 CustomerPrices=客戶價格
 SuppliersPrices=供應商價格
 SuppliersPricesOfProductsOrServices=供應商價格（產品或服務）
-CustomCode=海關/商品/ HS編碼
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=原產地
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=產品性質（材料/成品）
 NatureOfProductShort=產品性質
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=使用固定價格
 PriceByQuantity=數量不同的價格
 DisablePriceByQty=停用數量價格
 PriceByQuantityRange=數量範圍
-MultipriceRules=價格區段規則
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=使用價格區段規則（在產品模組設定中定義），根據第一區段自動計算所有其他區段的價格
 PercentVariationOver=%%超過%s上的變化
 PercentDiscountOver=%%超過%s的折扣
diff --git a/htdocs/langs/zh_TW/recruitment.lang b/htdocs/langs/zh_TW/recruitment.lang
index 5302409b57c..784c73b1a45 100644
--- a/htdocs/langs/zh_TW/recruitment.lang
+++ b/htdocs/langs/zh_TW/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/zh_TW/sendings.lang b/htdocs/langs/zh_TW/sendings.lang
index 42c24671414..0a422561415 100644
--- a/htdocs/langs/zh_TW/sendings.lang
+++ b/htdocs/langs/zh_TW/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=此訂單的其他出貨清單
 SendingsAndReceivingForSameOrder=此訂單的出貨貨品和收據
 SendingsToValidate=出貨驗證
 StatusSendingCanceled=已取消
+StatusSendingCanceledShort=已取消
 StatusSendingDraft=草案
 StatusSendingValidated=已驗證（產品出貨或已經出貨）
 StatusSendingProcessed=已處理
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=您必須先驗證訂單，然後才能進行
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=交貨收據的更完整文件模型（商標...）
+DocumentModelStorm=更完整的文件模型，可用於交貨單和域外兼容性（logo...）
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=常數EXPEDITION_ADDON_NUMBER未定義
 SumOfProductVolumes=產品體積總和
 SumOfProductWeights=產品重量總和
diff --git a/htdocs/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang
index d2936453e9f..5d4d31c612d 100644
--- a/htdocs/langs/zh_TW/stocks.lang
+++ b/htdocs/langs/zh_TW/stocks.lang
@@ -240,3 +240,4 @@ InventoryRealQtyHelp=將值設定為0以重置數量<br>保持欄位為空或刪
 UpdateByScaning=以掃描更新
 UpdateByScaningProductBarcode=掃描更新（產品條碼）
 UpdateByScaningLot=掃描更新（批次|序列條碼）
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/zh_TW/ticket.lang b/htdocs/langs/zh_TW/ticket.lang
index d591079e2f6..8ce934d6b3e 100644
--- a/htdocs/langs/zh_TW/ticket.lang
+++ b/htdocs/langs/zh_TW/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=服務單-類型
 TicketDictCategory=服務單-組別
 TicketDictSeverity=服務單-嚴重程度
 TicketDictResolution=服務單-決議
-TicketTypeShortBUGSOFT=軟體故障
-TicketTypeShortBUGHARD=設備故障
-TicketTypeShortCOM=商業問題
 
+TicketTypeShortCOM=商業問題
 TicketTypeShortHELP=請求有用的幫助
 TicketTypeShortISSUE=錯誤或問題
 TicketTypeShortREQUEST=變更或增強要求
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=其他
 TicketSeverityShortLOW=低
 TicketSeverityShortNORMAL=正常
 TicketSeverityShortHIGH=高
-TicketSeverityShortBLOCKING=嚴重/阻止
+TicketSeverityShortBLOCKING=嚴重，阻止中
 
 ErrorBadEmailAddress=欄位'%s'不正確
 MenuTicketMyAssign=我的服務單
@@ -60,7 +58,6 @@ OriginEmail=電子郵件來源
 Notify_TICKET_SENTBYMAIL=以電子郵件發送服務單訊息
 
 # Status
-NotRead=未讀
 Read=已讀
 Assigned=已分配
 InProgress=進行中
@@ -109,7 +106,7 @@ TicketPublicInterfaceTextHelpMessageHelpAdmin=此段文字將出現在用戶的
 ExtraFieldsTicket=額外屬性
 TicketCkEditorEmailNotActivated=HTML編輯器未啟動。請將FCKEDITOR_ENABLE_MAIL內容設為1即可啟動。
 TicketsDisableEmail=不要為服務單建立或訊息紀錄發送電子郵件
-TicketsDisableEmailHelp=預設情況下，在建立新服務單或訊息時會發送電子郵件。啟用此選項可禁用*所有*電子郵件通知
+TicketsDisableEmailHelp=預設情況下，在建立新服務單或訊息時會發送電子郵件。啟用此選項可關閉*所有*電子郵件通知
 TicketsLogEnableEmail=通過電子郵件啟用日誌
 TicketsLogEnableEmailHelp=每次更改時，都會向與此服務單有關的**每個聯絡人**發送電子郵件。
 TicketParams=參數
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=公共界面允許任何訪客建立服務單
 TicketsAutoAssignTicket=自動分配建立服務單的用戶
 TicketsAutoAssignTicketHelp=建立服務單時，可以自動將用戶分配給服務單。
 TicketNumberingModules=服務單編號模組
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=建立時通知合作方
 TicketsDisableCustomerEmail=從公共界面建立服務單時，始終禁用電子郵件
 TicketsPublicNotificationNewMessage=當有新訊息時寄送電子郵件
@@ -135,7 +133,7 @@ TicketPublicNotificationNewMessageDefaultEmailHelp=如果沒有分配服務單
 #
 # Index & list page
 #
-TicketsIndex=門票區
+TicketsIndex=服務單區域
 TicketList=服務單清單
 TicketAssignedToMeInfos=此頁面顯示由目前用戶建立或分配給目前用戶的服務單清單
 NoTicketsFound=找不到服務單
@@ -233,7 +231,6 @@ TicketLogStatusChanged=狀態已更改：%s到%s
 TicketNotNotifyTiersAtCreate=建立時不通知公司
 Unread=未讀
 TicketNotCreatedFromPublicInterface=無法使用。服務單不是從公共界面建立的。
-PublicInterfaceNotEnabled=未啟用公共界面
 ErrorTicketRefRequired=服務單參考名稱為必填
 
 #
diff --git a/htdocs/langs/zh_TW/users.lang b/htdocs/langs/zh_TW/users.lang
index 0ae2e4c036f..26680ee4029 100644
--- a/htdocs/langs/zh_TW/users.lang
+++ b/htdocs/langs/zh_TW/users.lang
@@ -20,7 +20,7 @@ DeleteAUser=刪除一位用戶
 EnableAUser=啟用用戶
 DeleteGroup=刪除
 DeleteAGroup=刪除一群組
-ConfirmDisableUser=您確定要禁用用戶 <b>%s</b> ?
+ConfirmDisableUser=您確定要關閉用戶 <b>%s</b> ?
 ConfirmDeleteUser=您確定要刪除用戶 <b>%s</b> ?
 ConfirmDeleteGroup=您確定要刪除群組 <b>%s</b>?
 ConfirmEnableUser=您確定要啟用用戶 <b>%s</b>?
@@ -46,6 +46,8 @@ RemoveFromGroup=從群組中刪除
 PasswordChangedAndSentTo=密碼更改，發送到<b>%s</b>。
 PasswordChangeRequest=<b>%s</b>要求變更密碼
 PasswordChangeRequestSent=<b>%s</b> 傳送給 <b>%s</b> 要求更改密碼。
+IfLoginExistPasswordRequestSent=如果此登入名稱為有效帳戶，則已發送一封電子郵件以重置密碼。
+IfEmailExistPasswordRequestSent=如果此電子郵件為有效帳戶，則已發送一封用於重置密碼的電子郵件。
 ConfirmPasswordReset=確認密碼重設
 MenuUsersAndGroups=用戶和群組
 LastGroupsCreated=最新建立的%s個群組
@@ -63,7 +65,7 @@ LinkedToDolibarrUser=連線成為 Dolibarr 用戶
 LinkedToDolibarrThirdParty=連線成為 Dolibarr 的合作方
 CreateDolibarrLogin=建立一位用戶
 CreateDolibarrThirdParty=建立一位合作方(客戶/供應商)
-LoginAccountDisableInDolibarr=在 Dolibarr 中帳戶已禁用。
+LoginAccountDisableInDolibarr=在 Dolibarr 中帳戶已關閉。
 UsePersonalValue=使用個人設定值
 InternalUser=內部用戶
 ExportDataset_user_1=用戶及其屬性
@@ -73,6 +75,7 @@ CreateInternalUserDesc=此表單使您可以在公司/組織中建立內部用
 InternalExternalDesc=一位 <b>內部</b> 使用者是您 公司/組織 的一部分。<br>一位 <b>外部</b> 使用者是顧客，供應商或是其他 (可從第三方的聯絡人紀錄為第三方建立一位外部使用者)。<br><br>以上兩種情形，在 Dolibarr 權限定義權利，外部使用者可以使用一個跟內部使用者不同的選單管理器 (見 首頁 - 設定 - 顯示)
 PermissionInheritedFromAGroup=因為從權限授予一個用戶的一組繼承。
 Inherited=繼承
+UserWillBe=Created user will be
 UserWillBeInternalUser=建立的用戶將是一個內部用戶（因為沒有連結到一個特定的第三方）
 UserWillBeExternalUser=建立的用戶將是外部用戶（因為連結到一個特定的第三方）
 IdPhoneCaller=手機來電者身份
@@ -80,7 +83,7 @@ NewUserCreated=建立用戶%s
 NewUserPassword=%變動的密碼
 NewPasswordValidated=您的新密碼已通過驗證，必須立即用於登錄。
 EventUserModified=用戶%s修改
-UserDisabled=用戶%s禁用
+UserDisabled=用戶%s已關閉
 UserEnabled=用戶%s啟動
 UserDeleted=使用者%s刪除
 NewGroupCreated=集團建立%s的
@@ -104,17 +107,19 @@ LoginUsingOpenID=使用OpenID登入
 WeeklyHours=工作小時數（每週）
 ExpectedWorkedHours=預計每週工作時間
 ColorUser=用戶顏色
-DisabledInMonoUserMode=在維護模式下禁用
+DisabledInMonoUserMode=在維護模式下已關閉
 UserAccountancyCode=用戶帳號
 UserLogoff=用戶登出
 UserLogged=用戶登入
-DateOfEmployment=Employment date
-DateEmployment=入職日期
+DateOfEmployment=到職日期
+DateEmployment=就業機會
+DateEmploymentstart=入職日期
 DateEmploymentEnd=離職日期
-CantDisableYourself=您不能禁用自己的用戶記錄
+RangeOfLoginValidity=登入的有效日期範圍
+CantDisableYourself=您不能關閉自己的用戶記錄
 ForceUserExpenseValidator=強制使用費用報告表驗證
 ForceUserHolidayValidator=強制使用休假請求驗證
 ValidatorIsSupervisorByDefault=預設情況下，驗證者是用戶的主管。保持空白狀態以保持這種行為。
 UserPersonalEmail=私人信箱
 UserPersonalMobile=私人手機
-WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
+WarningNotLangOfInterface=警告，這是用戶使用的主要語言，而不是他選擇查看的界面語言。要更改該用戶可見的界面語言，請前往分頁%s
diff --git a/htdocs/langs/zh_TW/website.lang b/htdocs/langs/zh_TW/website.lang
index 6a62024abd5..f83dc275c73 100644
--- a/htdocs/langs/zh_TW/website.lang
+++ b/htdocs/langs/zh_TW/website.lang
@@ -30,7 +30,6 @@ EditInLine=編輯嵌入
 AddWebsite=新增網站
 Webpage=網頁/容器
 AddPage=新增 頁面/容器
-HomePage=首頁
 PageContainer=頁面
 PreviewOfSiteNotYetAvailable=您的網站<strong>%s</strong>預覽尚不可用。您必須先“ <strong>導入完整的網站模板</strong> ”或僅“ <strong>新增頁面/容器</strong> ”。
 RequestedPageHasNoContentYet=要求ID為%s的頁面尚無內容，或暫存檔案.tpl.php被刪除。編輯頁面內容以解決此問題。
@@ -101,7 +100,7 @@ EmptyPage=空白頁
 ExternalURLMustStartWithHttp=外部網址必須以http://或https://開始
 ZipOfWebsitePackageToImport=上傳網站模板包的Zip檔案
 ZipOfWebsitePackageToLoad=或選擇一個可用的嵌入式網站模板包
-ShowSubcontainers=包含動態內容
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=頁面的內部網址
 ThisPageIsTranslationOf=該頁面/內容是以下內容的翻譯：
 ThisPageHasTranslationPages=此頁面/內容已翻譯
@@ -137,3 +136,4 @@ RSSFeedDesc=您可以使用此網址獲得類型為“ blogpost”的最新文
 PagesRegenerated=已重新產生%s頁面/容器
 RegenerateWebsiteContent=重新產生網站快取檔案
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/zh_TW/withdrawals.lang b/htdocs/langs/zh_TW/withdrawals.lang
index b4c32e4de5a..6bfc7053a79 100644
--- a/htdocs/langs/zh_TW/withdrawals.lang
+++ b/htdocs/langs/zh_TW/withdrawals.lang
@@ -11,7 +11,7 @@ PaymentByBankTransferLines=信用轉帳訂單行
 WithdrawalsReceipts=直接轉帳付款訂單
 WithdrawalReceipt=直接轉帳付款訂單
 BankTransferReceipts=信用轉帳訂單行
-BankTransferReceipt=Credit transfer order
+BankTransferReceipt=貸方轉帳訂單
 LatestBankTransferReceipts=最新%s筆信用轉帳訂單
 LastWithdrawalReceipts=最新%s個直接轉帳付款檔案
 WithdrawalsLine=直接轉帳訂單行
@@ -40,8 +40,9 @@ CreditTransferStatistics=信用轉帳統計
 Rejects=拒絕
 LastWithdrawalReceipt=最新%s張直接轉帳付款收據
 MakeWithdrawRequest=提出直接轉帳付款請求
-MakeBankTransferOrder=Make a credit transfer request
+MakeBankTransferOrder=提出貸記轉帳請求
 WithdrawRequestsDone=已記錄%s直接轉帳付款請求
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=合作方銀行代碼
 NoInvoiceCouldBeWithdrawed=沒有直接轉帳成功的發票。檢查發票上是否有有效IBAN的公司，以及IBAN是否具有模式為<strong> %s </strong>的UMR（唯一授權參考）。
 ClassCredited=分類為已記入
@@ -63,7 +64,7 @@ InvoiceRefused=發票被拒絕（向客戶收取拒絕費用）
 StatusDebitCredit=借項/貸項狀況
 StatusWaiting=等候
 StatusTrans=傳送
-StatusDebited=Debited
+StatusDebited=借貸方
 StatusCredited=已記入
 StatusPaid=已付款
 StatusRefused=已拒絕
@@ -79,13 +80,13 @@ StatusMotif8=其他原因
 CreateForSepaFRST=建立直接轉帳付款檔案(SEPA FRST)
 CreateForSepaRCUR=建立直接轉帳付款檔案(SEPA RCUR)
 CreateAll=建立直接轉帳付款檔案(全部)
-CreateFileForPaymentByBankTransfer=Create file for credit transfer
+CreateFileForPaymentByBankTransfer=建立用於信用轉移的檔案
 CreateSepaFileForPaymentByBankTransfer=建立信用轉帳文件（SEPA）
 CreateGuichet=只有辦公室
 CreateBanque=只有銀行
 OrderWaiting=等待處理
-NotifyTransmision=Record file transmission of order
-NotifyCredit=Record credit of order
+NotifyTransmision=訂單的檔案傳輸記錄
+NotifyCredit=訂單信用記錄
 NumeroNationalEmetter=國際轉帳編號
 WithBankUsingRIB=用於RIB的銀行帳戶
 WithBankUsingBANBIC=用於IBAN / BIC / SWIFT的銀行帳戶
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=執行日期
 CreateForSepa=建立直接轉帳付款檔案
-ICS=債權人識別碼
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML標籤- 每筆交易分配的唯一ID
 USTRD="Unstructured" SEPA XML標籤
 ADDDAYS=將天數加到執行日期
@@ -146,3 +148,4 @@ InfoRejectSubject=直接轉帳付款訂單已被拒絕
 InfoRejectMessage=您好，<br><br>銀行拒絕了與公司%s相關的發票%s的直接轉帳付款訂單 。%s的金額已被銀行拒絕 <br> <br>--<br> %s
 ModeWarning=未設定實際模式選項，我們將在此模擬後停止
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s

From b3461161ecece0f8971366aefc3c66cdc36f0b3c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 9 Jan 2021 02:28:50 +0100
Subject: [PATCH 887/888] Add option MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH

---
 htdocs/core/boxes/box_graph_invoices_permonth.php          | 3 ++-
 htdocs/core/boxes/box_graph_invoices_supplier_permonth.php | 3 ++-
 htdocs/core/boxes/box_graph_orders_permonth.php            | 3 ++-
 htdocs/core/boxes/box_graph_orders_supplier_permonth.php   | 3 ++-
 htdocs/core/boxes/box_graph_propales_permonth.php          | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index 983bb75cbc3..71c750c3e73 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -120,7 +120,8 @@ class box_graph_invoices_permonth extends ModeleBoxes
 			if (empty($shownb) && empty($showtot)) { $shownb = 1; $showtot = 1; }
 			$nowarray = dol_getdate(dol_now(), true);
 			if (empty($endyear)) $endyear = $nowarray['year'];
-			$startyear = $endyear - 1;
+			$startyear = $endyear - (empty($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH) ? 1 : $conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH);
+
 			$mode = 'customer';
 			$WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '256' : '320';
 			$HEIGHT = '192';
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index 1490f5ea6e9..e249900afab 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -117,7 +117,8 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 			if (empty($shownb) && empty($showtot)) { $shownb = 1; $showtot = 1; }
 			$nowarray = dol_getdate(dol_now(), true);
 			if (empty($endyear)) $endyear = $nowarray['year'];
-			$startyear = $endyear - 1;
+			$startyear = $endyear - (empty($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH) ? 1 : $conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH);
+
 			$mode = 'supplier';
 			$WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '256' : '320';
 			$HEIGHT = '192';
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index d9c26620553..df6a9f5c18e 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -120,7 +120,8 @@ class box_graph_orders_permonth extends ModeleBoxes
 			if (empty($shownb) && empty($showtot)) { $shownb = 1; $showtot = 1; }
 			$nowarray = dol_getdate(dol_now(), true);
 			if (empty($endyear)) $endyear = $nowarray['year'];
-			$startyear = $endyear - 1;
+			$startyear = $endyear - (empty($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH) ? 1 : $conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH);
+
 			$mode = 'customer';
 			$WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '256' : '320';
 			$HEIGHT = '192';
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index 765c6324516..eda3d32f250 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -119,7 +119,8 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 			if (empty($shownb) && empty($showtot)) { $shownb = 1; $showtot = 1; }
 			$nowarray = dol_getdate(dol_now(), true);
 			if (empty($endyear)) $endyear = $nowarray['year'];
-			$startyear = $endyear - 1;
+			$startyear = $endyear - (empty($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH) ? 1 : $conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH);
+
 			$mode = 'supplier';
 			$WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '256' : '320';
 			$HEIGHT = '192';
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index de1a1f8de83..7ca9740d8e5 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -120,7 +120,8 @@ class box_graph_propales_permonth extends ModeleBoxes
 			if (empty($shownb) && empty($showtot)) { $shownb = 1; $showtot = 1; }
 			$nowarray = dol_getdate(dol_now(), true);
 			if (empty($endyear)) $endyear = $nowarray['year'];
-			$startyear = $endyear - 1;
+			$startyear = $endyear - (empty($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH) ? 1 : $conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH);
+
 			$WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '256' : '320';
 			$HEIGHT = '192';
 

From 53f09e31cc5aedc3ee5af6bf37ca8e9f8d4a064d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 9 Jan 2021 13:24:03 +0100
Subject: [PATCH 888/888] Update doc

---
 build/README   | 10 ++++------
 dev/README     | 15 ++++++++-------
 doc/index.html | 13 +++++--------
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/build/README b/build/README
index 14f2b92ae39..626953f9376 100644
--- a/build/README
+++ b/build/README
@@ -7,6 +7,9 @@ Building packages
 ##################################################
 
 All sub-directories of "build" directory contains files (setup or binary tools) required to build automatically Dolibarr packages.
+The build directory and all its contents is absolutely not required to make Dolibarr working. 
+It is here only to build Dolibarr packages, and those generated packages will not contains this "build" directory.
+
 
 There are several tools:
 
@@ -17,8 +20,7 @@ There are several tools:
 --------------------------------------------------------------------------------------------------
 
 
-Prerequisites to build tgz, debian, rpm package:
-
+Prerequisites to build tgz, debian and rpm packages:
 > apt-get install tar dpkg dpatch p7zip-full rpm zip
 
 
@@ -58,10 +60,6 @@ Prerequisites to build autoexe DoliWamp package:
 
 --------------------------------------------------------------------------------------------------
 
-Note: 
-The build directory and all its contents is absolutely not required to make Dolibarr working. 
-It is here only to build Dolibarr packages, and those generated packages will not contains this "build" directory.
-
 
 You can find in "build", following sub-directories:
 
diff --git a/dev/README b/dev/README
index 337928507fc..78666d77f3a 100644
--- a/dev/README
+++ b/dev/README
@@ -1,13 +1,14 @@
 README (English)
 --------------------------------
-This directory contains sub-directories to provide tools or
-documentation for developers.
-Note: All files in this directory are in VCS only and are not
-provided with a standard release.
 
+This directory contains sub-directories to provide tools or documentation for developers.
+
+Note: All files in this directory are in the source repository only and are not provided with a standard release. They are useless to make Dolibarr working.
+
+You may find a more complete documentation on Dolibarr on the wiki:
 
-There is also some documentation on Dolibarr Wiki:
 https://wiki.dolibarr.org/
-and
-https://doxygen.dolibarr.org/
 
+and on
+
+https://doxygen.dolibarr.org/
diff --git a/doc/index.html b/doc/index.html
index 5c655136e3e..333f96099c3 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -6,18 +6,15 @@
 </head>
 <body>
 
-This directory contains several subdirectories with entries for 
-informations on Dolibarr.<br>
-But if you are looking for other resources (downloads, documentation, addons, ...), you can find this
-on Internet on web following sites:<br>
-<br>
-* <a href="https://wiki.dolibarr.org">Dolibarr wiki (documentation)</a><br>
+This directory contains several subdirectories with entries for informations on Dolibarr.<br>
+But if you are looking for other resources (downloads, documentation, addons, ...), you can find this on Internet on web following sites:<br>
+
 <br>
 * <a href="https://www.dolibarr.org">Dolibarr portal (official website)</a><br>
 <br>
-* <a href="https://demo.dolibarr.org">Dolibarr demo (online)</a><br>
+* <a href="https://wiki.dolibarr.org">Dolibarr wiki (documentation)</a><br>
 <br>
-* <a href="https://www.nltechno.com/pages/dolibarrwinbin.php">DoliWamp, the Dolibarr for Windows</a><br>
+* <a href="https://demo.dolibarr.org">Dolibarr demo (online)</a><br>
 <br>
 * <a href="https://www.dolistore.com">DoliStore (official addons/plugins market place)</a><br>